From 11fba9015c645fc262ca27c0e91ca28245f4ba64 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Sat, 28 Feb 2015 08:57:21 +0100
Subject: [PATCH 0001/2285] tlsdate: blacklist darwin

refs http://hydra.nixos.org/build/19975753
---
 pkgs/tools/networking/tlsdate/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/tlsdate/default.nix b/pkgs/tools/networking/tlsdate/default.nix
index eea7dfcccacf..ae23978a7563 100644
--- a/pkgs/tools/networking/tlsdate/default.nix
+++ b/pkgs/tools/networking/tlsdate/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation {
   meta = {
     description = "Secure parasitic rdate replacement";
     homepage = https://github.com/ioerror/tlsdate;
-    platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.tv ];
+    platforms = stdenv.lib.platforms.allBut [ "darwin" ];
   };
 }

From 0cb17b0505f7a8aa522a7901d93190b50099b73e Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetopon.nl>
Date: Wed, 27 May 2015 20:55:12 +0200
Subject: [PATCH 0002/2285] lv2bm init at git-2015-04-10

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

diff --git a/pkgs/applications/audio/lv2bm/default.nix b/pkgs/applications/audio/lv2bm/default.nix
new file mode 100644
index 000000000000..32a4f255abee
--- /dev/null
+++ b/pkgs/applications/audio/lv2bm/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, glib, lilv, lv2, pkgconfig, serd, sord, sratom }:
+
+stdenv.mkDerivation rec {
+  name = "lv2bm-${version}";
+  version = "git-2015-04-10";
+
+  src = fetchFromGitHub {
+    owner = "portalmod";
+    repo = "lv2bm";
+    rev = "08681624fc13eb700ec2b5cabedbffdf095e28b3";
+    sha256 = "11pi97jy4f4c3vsaizc8a6sw9hnhnanj6y1fil33yd9x7f8f0kbj";
+  };
+
+  buildInputs = [ glib lilv lv2 pkgconfig serd sord sratom ];
+
+  installPhase = ''
+    make install PREFIX=$out
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/portalmod/lv2bm;
+    description = "A benchmark tool for LV2 plugins";
+    license = licenses.gpl3;
+    maintainers = [ maintainers.magnetophon ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 368ec616654a..a52e04ef6e98 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11655,6 +11655,8 @@ let
     gtk = gtk2;
   };
 
+  lv2bm = callPackage ../applications/audio/lv2bm { };
+
   lynx = callPackage ../applications/networking/browsers/lynx { };
 
   lyx = callPackage ../applications/misc/lyx { };

From d596c3c4c26d8b8cd9732476945b07f7a102b3a4 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Sun, 28 Jun 2015 21:35:43 +0200
Subject: [PATCH 0003/2285] Fix detection of clang toolset

This makes boost buildable under clangStdenv and libcxxStdenv on non-darwin.
---
 pkgs/development/libraries/boost/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix
index cd98c0a312be..727aa743f4f8 100644
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -1,5 +1,5 @@
 { stdenv, icu, expat, zlib, bzip2, python, fixDarwinDylibNames
-, toolset ? if stdenv.isDarwin then "clang" else null
+, toolset ? if stdenv.cc.isClang then "clang" else null
 , enableRelease ? true
 , enableDebug ? false
 , enableSingleThreaded ? false

From 91a2973dc3a33f76fa212be1258c00ea81c2d21e Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Tue, 30 Jun 2015 18:57:21 +0100
Subject: [PATCH 0004/2285] Add --ext option to nix-prefetch-zip

---
 pkgs/build-support/fetchzip/nix-prefetch-zip | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchzip/nix-prefetch-zip b/pkgs/build-support/fetchzip/nix-prefetch-zip
index ccc03e087e52..aeea134f1922 100755
--- a/pkgs/build-support/fetchzip/nix-prefetch-zip
+++ b/pkgs/build-support/fetchzip/nix-prefetch-zip
@@ -6,6 +6,7 @@ usage(){
 Options:
       --url         url    The url of the archive to fetch.
       --name        name   The name to use for the store path (defaults to \`basename \$url\`).
+      --ext         ext    The file extension (.zip, .tar.gz, ...) to be REMOVED from name
       --hash        hash   The hash of unpacked archive.
       --hash-type   type   Use the specified cryptographic hash algorithm, which can be one of md5, sha1, and sha256.
       --leave-root         Keep the root directory of the archive.
@@ -16,6 +17,7 @@ Options:
 
 
 name=""
+ext=""
 argi=0
 argfun=""
 for arg; do
@@ -23,6 +25,7 @@ for arg; do
     case $arg in
       --url) argfun=set_url;;
       --name) argfun=set_name;;
+      --ext) argfun=set_ext;;
       --hash) argfun=set_expHash;;
       --hash-type) argfun=set_hashType;;
       --leave-root) leaveRoot=true;;
@@ -67,10 +70,12 @@ hashFormat="--base32"
 tmp=$(mktemp -d 2>/dev/null || mktemp -d -t "$$")
 trap "rm -rf '$tmp'" EXIT
 
-unpackDirTmp=$tmp/unpacked-tmp/$name
+dirname=$(basename -s "$ext" "$name")
+
+unpackDirTmp=$tmp/unpacked-tmp/$dirname
 mkdir -p $unpackDirTmp
 
-unpackDir=$tmp/unpacked/$name
+unpackDir=$tmp/unpacked/$dirname
 mkdir -p $unpackDir
 
 downloadedFile=$tmp/$name

From 85898da27a9141188c11088077f11bdeb759a6ad Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 8 Sep 2015 18:12:17 +0200
Subject: [PATCH 0005/2285] Remove desktopManagerHandlesLidAndPower

As discussed on https://github.com/NixOS/nixpkgs/pull/9642, the option
is not necessary because all desktop managers already stopped handling
it (and delegated to systemd).
---
 .../services/x11/display-managers/default.nix | 23 -------------------
 1 file changed, 23 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index fc0803f2acaf..d73a99bfe589 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -56,18 +56,6 @@ let
         fi
       ''}
 
-      ${optionalString cfg.displayManager.desktopManagerHandlesLidAndPower ''
-        # Stop systemd from handling the power button and lid switch,
-        # since presumably the desktop environment will handle these.
-        if [ -z "$_INHIBITION_LOCK_TAKEN" ]; then
-          export _INHIBITION_LOCK_TAKEN=1
-          if ! ${config.systemd.package}/bin/loginctl show-session $XDG_SESSION_ID | grep -q '^RemoteHost='; then
-            exec ${config.systemd.package}/bin/systemd-inhibit --what=handle-lid-switch:handle-power-key --why="Desktop environment handles power events" "$0" "$sessionType"
-          fi
-        fi
-
-      ''}
-
       ${optionalString cfg.startGnuPGAgent ''
         if test -z "$SSH_AUTH_SOCK"; then
             # Restart this script as a child of the GnuPG agent.
@@ -227,17 +215,6 @@ in
         '';
       };
 
-      desktopManagerHandlesLidAndPower = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether the display manager should prevent systemd from handling
-          lid and power events. This is normally handled by the desktop
-          environment's power manager. Turn this off when using a minimal
-          X11 setup without a full power manager.
-        '';
-      };
-
       session = mkOption {
         default = [];
         example = literalExample

From de88ff99124dcc15ddef7743b1c6bc1ffd7d36f6 Mon Sep 17 00:00:00 2001
From: Chris Martin <ch.martin@gmail.com>
Date: Fri, 18 Sep 2015 02:26:45 -0700
Subject: [PATCH 0006/2285] synaptics: add palmDetect tuning options

---
 .../services/x11/hardware/synaptics.nix        | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix
index e50ed08a218a..29cc31d70a09 100644
--- a/nixos/modules/services/x11/hardware/synaptics.nix
+++ b/nixos/modules/services/x11/hardware/synaptics.nix
@@ -122,6 +122,20 @@ in {
         description = "Whether to enable palm detection (hardware support required)";
       };
 
+      palmMinWidth = mkOption {
+        type = types.nullOr types.int;
+        default = null;
+        example = 5;
+        description = "Minimum finger width at which touch is considered a palm";
+      };
+
+      palmMinZ = mkOption {
+        type = types.nullOr types.int;
+        default = null;
+        example = 20;
+        description = "Minimum finger pressure at which touch is considered a palm";
+      };
+
       horizontalScroll = mkOption {
         type = types.bool;
         default = true;
@@ -174,7 +188,9 @@ in {
           Option "HorizTwoFingerScroll" "${if cfg.horizTwoFingerScroll then "1" else "0"}"
           Option "VertEdgeScroll" "${if cfg.vertEdgeScroll then "1" else "0"}"
           Option "HorizEdgeScroll" "${if cfg.horizEdgeScroll then "1" else "0"}"
-          ${if cfg.palmDetect then ''Option "PalmDetect" "1"'' else ""}
+          ${optionalString cfg.palmDetect ''Option "PalmDetect" "1"''}
+          ${optionalString (cfg.palmMinWidth != null) ''Option "PalmMinWidth" "${toString cfg.palmMinWidth}"''}
+          ${optionalString (cfg.palmMinZ != null) ''Option "PalmMinZ" "${toString cfg.palmMinZ}"''}
           ${if cfg.horizontalScroll then "" else ''Option "HorizScrollDelta" "0"''}
           ${cfg.additionalOptions}
         EndSection

From f8581a5a955cc279e6c951f1b001df49adfaaf73 Mon Sep 17 00:00:00 2001
From: Chris Martin <ch.martin@gmail.com>
Date: Fri, 18 Sep 2015 02:42:09 -0700
Subject: [PATCH 0007/2285] synaptics: add scrollDelta option

---
 nixos/modules/services/x11/hardware/synaptics.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/hardware/synaptics.nix b/nixos/modules/services/x11/hardware/synaptics.nix
index 29cc31d70a09..2981e7545e81 100644
--- a/nixos/modules/services/x11/hardware/synaptics.nix
+++ b/nixos/modules/services/x11/hardware/synaptics.nix
@@ -62,6 +62,13 @@ in {
         description = "Cursor speed factor for highest-speed finger motion.";
       };
 
+      scrollDelta = mkOption {
+        type = types.nullOr types.int;
+        default = null;
+        example = 75;
+        description = "Move distance of the finger for a scroll event.";
+      };
+
       twoFingerScroll = mkOption {
         type = types.bool;
         default = false;
@@ -191,7 +198,9 @@ in {
           ${optionalString cfg.palmDetect ''Option "PalmDetect" "1"''}
           ${optionalString (cfg.palmMinWidth != null) ''Option "PalmMinWidth" "${toString cfg.palmMinWidth}"''}
           ${optionalString (cfg.palmMinZ != null) ''Option "PalmMinZ" "${toString cfg.palmMinZ}"''}
-          ${if cfg.horizontalScroll then "" else ''Option "HorizScrollDelta" "0"''}
+          ${optionalString (cfg.scrollDelta != null) ''Option "VertScrollDelta" "${toString cfg.scrollDelta}"''}
+          ${if !cfg.horizontalScroll then ''Option "HorizScrollDelta" "0"''
+            else (optionalString (cfg.scrollDelta != null) ''Option "HorizScrollDelta" "${toString cfg.scrollDelta}"'')}
           ${cfg.additionalOptions}
         EndSection
       '';

From f5f039eeb4b3a707bed82b3abecd16779e7c2bf5 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 4 Oct 2015 22:13:50 +0100
Subject: [PATCH 0008/2285] apache-httpd: harden default SSL cipher list

A couple of tweaks on the SSL cipher list.

Disabled RC4 which is now considered broken.
https://community.qualys.com/blogs/securitylabs/2013/03/19/rc4-in-tls-is-broken-now-what

Enabled Forward Secrecy for modern browsers.
https://en.wikipedia.org/wiki/Forward_secrecy

Without the change, NixOS servers are capped at Grade B on
https://www.ssllabs.com/ssltest/index.html
---
 nixos/modules/services/web-servers/apache-httpd/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 7350a6a68c70..2b0bb0c38734 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -173,7 +173,8 @@ let
     SSLRandomSeed connect builtin
 
     SSLProtocol All -SSLv2 -SSLv3
-    SSLCipherSuite HIGH:MEDIUM:!aNULL:!MD5:!EXP
+    SSLCipherSuite HIGH:!aNULL:!MD5:!EXP
+    SSLHonorCipherOrder on
   '';
 
 

From fda9d83ddfe833c95ca630064bb6d2cbaad2da6b Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@brianmckenna.org>
Date: Fri, 16 Oct 2015 22:20:30 +1100
Subject: [PATCH 0009/2285] initrd: add mmc_block to default available modules

mmc_block and sdhci_acpi are both necessary for a Bay Trail Chromebook with an
internal eMMC drive. The sdhci_acpi module is detectable but I can not figure
out a way to check whether the mmc_block module is needed by just looking at
/sys/
---
 nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix | 3 +--
 nixos/modules/installer/cd-dvd/system-tarball.nix            | 2 +-
 nixos/modules/system/boot/kernel.nix                         | 3 +++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
index 46dc1c705022..954cc6b2f49d 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball-sheevaplug.nix
@@ -86,8 +86,7 @@ in
   system.boot.loader.kernelFile = "uImage";
 
   boot.initrd.availableKernelModules =
-    [ "mvsdio" "mmc_block" "reiserfs" "ext3" "ums-cypress" "rtc_mv"
-      "ext4" ];
+    [ "mvsdio" "reiserfs" "ext3" "ums-cypress" "rtc_mv" "ext4" ];
 
   boot.postBootCommands =
     ''
diff --git a/nixos/modules/installer/cd-dvd/system-tarball.nix b/nixos/modules/installer/cd-dvd/system-tarball.nix
index c24fe97fba46..90e9b98a4575 100644
--- a/nixos/modules/installer/cd-dvd/system-tarball.nix
+++ b/nixos/modules/installer/cd-dvd/system-tarball.nix
@@ -43,7 +43,7 @@ in
     # so that we don't need to know its device.
     fileSystems = [ ];
 
-    # boot.initrd.availableKernelModules = [ "mvsdio" "mmc_block" "reiserfs" "ext3" "ext4" ];
+    # boot.initrd.availableKernelModules = [ "mvsdio" "reiserfs" "ext3" "ext4" ];
 
     # boot.initrd.kernelModules = [ "rtc_mv" ];
 
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index ac40e8a49acf..9dcbce30f7b9 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -184,6 +184,9 @@ in
         "ide_disk"
         "ide_generic"
 
+        # SD cards and internal eMMC drives.
+        "mmc_block"
+
         # Support USB keyboards, in case the boot fails and we only have
         # a USB keyboard.
         "uhci_hcd"

From 26963cfc2dfd8ba6bce927535317d799dda15102 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 22 Oct 2015 19:40:00 +0200
Subject: [PATCH 0010/2285] switch-to-configuration: Fix unit name quoting.

Clearly it would be the best if we'd directly generate mount units
instead of converting /etc/fstab. But in order to do that we need to
test it throughly so this approach is for the next stable release.

This fix however is intended for inclusion into release-14.12 and
release-15.09.

Using a simple regular expression unfortunately isn't sufficient for
proper mount unit name quoting/escaping and there is a utility in
systemd called systemd-escape which does nothing less than that.

Of course, using an external program to escape the unit name is way more
expensive and causes us to fork for each mount point.

But given that we already do quite a lot of forks just for unit starting
and stopping, I think it doesn't matter that much. Well, except if you
have a whole bunch of mount points.

However, if the latter is the case and you have thousands of mount
points, you probably have stumbled over this already if your mount point
contains a dash.

As for my motivation to fix this: I've stumbled on this while trying to
fix the "none" backend test for NixOps (see NixOS/nixops#350), where the
target machines use /nix/.ro-store and /nix/.rw-store as mount points.

The implementation we had so far did improperly escape it so those mount
points got the following unit files:

 * nix-.ro-store.mount
 * nix-.rw-store.mount

The correct names for these units are however:

 * nix-.ro\x2dstore.mount
 * nix-.rw\x2dstore.mount

So using systemd-escape now properly generates these names.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../system/activation/switch-to-configuration.pl   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 655fbab2a843..747de89905dc 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -261,12 +261,12 @@ while (my ($unit, $state) = each %{$activePrev}) {
 
 sub pathToUnitName {
     my ($path) = @_;
-    die unless substr($path, 0, 1) eq "/";
-    return "-" if $path eq "/";
-    $path = substr($path, 1);
-    $path =~ s/\//-/g;
-    # FIXME: handle - and unprintable characters.
-    return $path;
+    open my $cmd, "-|", "systemd-escape", "--suffix=mount", "-p", $path
+        or die "Unable to escape $path!\n";
+    my $escaped = join "", <$cmd>;
+    chomp $escaped;
+    close $cmd or die;
+    return $escaped;
 }
 
 sub unique {
@@ -290,7 +290,7 @@ my ($newFss, $newSwaps) = parseFstab "$out/etc/fstab";
 foreach my $mountPoint (keys %$prevFss) {
     my $prev = $prevFss->{$mountPoint};
     my $new = $newFss->{$mountPoint};
-    my $unit = pathToUnitName($mountPoint) . ".mount";
+    my $unit = pathToUnitName($mountPoint);
     if (!defined $new) {
         # Filesystem entry disappeared, so unmount it.
         $unitsToStop{$unit} = 1;

From 80fb17b251d163345ddf8aa14be283dd2f9cbcc5 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 22 Oct 2015 19:50:12 +0200
Subject: [PATCH 0011/2285] nixos/nix-daemon: Require .mount for /nix/store.

Also related to NixOS/nixops#350, because while switching to the new
configuration, depending on /nix/store also propagates to the mount
points for /nix/.ro-store and /nix/.rw-store and we don't get an error
while trying to unmount them (because nix-daemon needs to be stopped for
unmounting these paths).

While Nix does have the option to set a different store path, I've found
only hardcoded references in nix-daemon.nix, so I'm using a hardcoded
reference here as well, because after all customizing the store path
will probably only make sense on non-NixOS systems.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/services/misc/nix-daemon.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index 4aed91c34978..5f73191c639f 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -366,6 +366,8 @@ in
           // { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; }
           // config.networking.proxy.envVars;
 
+        unitConfig.RequiresMountsFor = "/nix/store";
+
         serviceConfig =
           { Nice = cfg.daemonNiceLevel;
             IOSchedulingPriority = cfg.daemonIONiceLevel;

From 5b4fa99f1d5c035f1ccfa4f8d08694edb3523888 Mon Sep 17 00:00:00 2001
From: Murad Ulityonok <mooooorad@gmail.com>
Date: Fri, 6 Nov 2015 05:41:35 -0800
Subject: [PATCH 0012/2285] modularized Eclipse package

---
 .../editors/eclipse/buildEclipse.nix          | 54 ++++++++++++++++++
 pkgs/applications/editors/eclipse/default.nix | 56 +------------------
 2 files changed, 56 insertions(+), 54 deletions(-)
 create mode 100644 pkgs/applications/editors/eclipse/buildEclipse.nix

diff --git a/pkgs/applications/editors/eclipse/buildEclipse.nix b/pkgs/applications/editors/eclipse/buildEclipse.nix
new file mode 100644
index 000000000000..558c9fa3de5f
--- /dev/null
+++ b/pkgs/applications/editors/eclipse/buildEclipse.nix
@@ -0,0 +1,54 @@
+{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jre, glib, gtk, libXtst, webkitgtk2, makeWrapper, ... }:
+
+{ name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }:
+
+stdenv.mkDerivation rec {
+  inherit name src;
+
+  desktopItem = makeDesktopItem {
+    name = "Eclipse";
+    exec = "eclipse";
+    icon = "eclipse";
+    comment = "Integrated Development Environment";
+    desktopName = "Eclipse IDE";
+    genericName = "Integrated Development Environment";
+    categories = "Application;Development;";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  buildCommand = ''
+    # Unpack tarball.
+    mkdir -p $out
+    tar xfvz $src -C $out
+
+    # Patch binaries.
+    interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)
+    libCairo=$out/eclipse/libcairo-swt.so
+    patchelf --set-interpreter $interpreter $out/eclipse/eclipse
+    [ -f $libCairo ] && patchelf --set-rpath ${freetype}/lib:${fontconfig}/lib:${libX11}/lib:${libXrender}/lib:${zlib}/lib $libCairo
+
+    # Create wrapper script.  Pass -configuration to store
+    # settings in ~/.eclipse/org.eclipse.platform_<version> rather
+    # than ~/.eclipse/org.eclipse.platform_<version>_<number>.
+    productId=$(sed 's/id=//; t; d' $out/eclipse/.eclipseproduct)
+    productVersion=$(sed 's/version=//; t; d' $out/eclipse/.eclipseproduct)
+
+    makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
+      --prefix PATH : ${jre}/bin \
+      --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib${stdenv.lib.optionalString (webkitgtk2 != null) ":${webkitgtk2}/lib"} \
+      --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"
+
+    # Create desktop item.
+    mkdir -p $out/share/applications
+    cp ${desktopItem}/share/applications/* $out/share/applications
+    mkdir -p $out/share/pixmaps
+    ln -s $out/eclipse/icon.xpm $out/share/pixmaps/eclipse.xpm
+  ''; # */
+
+  meta = {
+    homepage = http://www.eclipse.org/;
+    inherit description;
+  };
+
+}
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 7d543c4ed55f..693e2b9babec 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -4,66 +4,14 @@
 , webkitgtk2 ? null  # for internal web browser
 , buildEnv, writeText, runCommand
 , callPackage
-}:
+} @ args:
 
 assert stdenv ? glibc;
 
 let
 
-  buildEclipse =
-    { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }:
+  buildEclipse = import ./buildEclipse.nix args;
 
-    stdenv.mkDerivation rec {
-      inherit name src;
-
-      desktopItem = makeDesktopItem {
-        name = "Eclipse";
-        exec = "eclipse";
-        icon = "eclipse";
-        comment = "Integrated Development Environment";
-        desktopName = "Eclipse IDE";
-        genericName = "Integrated Development Environment";
-        categories = "Application;Development;";
-      };
-
-      buildInputs = [ makeWrapper ];
-
-      buildCommand = ''
-        # Unpack tarball.
-        mkdir -p $out
-        tar xfvz $src -C $out
-
-        # Patch binaries.
-        interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)
-        libCairo=$out/eclipse/libcairo-swt.so
-        patchelf --set-interpreter $interpreter $out/eclipse/eclipse
-        [ -f $libCairo ] && patchelf --set-rpath ${freetype}/lib:${fontconfig}/lib:${libX11}/lib:${libXrender}/lib:${zlib}/lib $libCairo
-
-        # Create wrapper script.  Pass -configuration to store
-        # settings in ~/.eclipse/org.eclipse.platform_<version> rather
-        # than ~/.eclipse/org.eclipse.platform_<version>_<number>.
-        productId=$(sed 's/id=//; t; d' $out/eclipse/.eclipseproduct)
-        productVersion=$(sed 's/version=//; t; d' $out/eclipse/.eclipseproduct)
-        
-        makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
-          --prefix PATH : ${jre}/bin \
-          --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib${stdenv.lib.optionalString (webkitgtk2 != null) ":${webkitgtk2}/lib"} \
-          --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"
-
-        # Create desktop item.
-        mkdir -p $out/share/applications
-        cp ${desktopItem}/share/applications/* $out/share/applications
-        mkdir -p $out/share/pixmaps
-        ln -s $out/eclipse/icon.xpm $out/share/pixmaps/eclipse.xpm
-      ''; # */
-
-      meta = {
-        homepage = http://www.eclipse.org/;
-        inherit description;
-      };
-
-    };
-    
 in {
 
   eclipse_sdk_35 = buildEclipse {

From 2a8129924bfe0c0e56f8a9aca0df43a1d74da75a Mon Sep 17 00:00:00 2001
From: Murad Ulityonok <mooooorad@gmail.com>
Date: Fri, 6 Nov 2015 06:26:34 -0800
Subject: [PATCH 0013/2285] added Eclipse Mars SDK 4.5.1

---
 pkgs/applications/editors/eclipse/default.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 693e2b9babec..177e70461329 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -285,6 +285,21 @@ in {
     };
   };
 
+  eclipse_sdk_451 = buildEclipse {
+    name = "eclipse-sdk-4.5.1";
+    description = "Eclipse Mars Classic";
+    sources = {
+      "x86_64-linux" = fetchurl {
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.1-201509040015/eclipse-SDK-4.5.1-linux-gtk-x86_64.tar.gz;
+          sha256 = "b56503ab4b86f54e1cdc93084ef8c32fb1eaabc6f6dad9ef636153b14c928e02";
+        };
+      "i686-linux" = fetchurl {
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.1-201509040015/eclipse-SDK-4.5.1-linux-gtk.tar.gz;
+          sha256 = "f2e41da52e138276f8f121fd4d57c3f98839817836b56f8424e99b63c9b1b025";
+        };
+    };
+  };
+
   eclipse-platform = buildEclipse {
     name = "eclipse-platform-4.5";
     description = "Eclipse platform";

From ace6ed9127bd83e3552d84a27ebeddee8b8e4947 Mon Sep 17 00:00:00 2001
From: Murad Ulityonok <mooooorad@gmail.com>
Date: Fri, 6 Nov 2015 06:32:30 -0800
Subject: [PATCH 0014/2285] homogenized style

---
 pkgs/applications/editors/eclipse/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 177e70461329..3dc28fce6b4f 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -260,7 +260,6 @@ in {
       "x86_64-linux" = fetchurl {
           url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk-x86_64.tar.gz;
           sha256 = "0g00alsixfaakmn4khr0m9fxvkrbhbg6qqfa27xr6a9np6gzg98l";
-
         };
       "i686-linux" = fetchurl {
           url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.4.2-201502041700/eclipse-SDK-4.4.2-linux-gtk.tar.gz;
@@ -276,7 +275,6 @@ in {
       "x86_64-linux" = fetchurl {
           url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-SDK-4.5-linux-gtk-x86_64.tar.gz;
           sha256 = "0vfql4gh263ms8bg7sgn05gnjajplx304cn3nr03jlacgr3pkarf";
-
         };
       "i686-linux" = fetchurl {
           url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-SDK-4.5-linux-gtk.tar.gz;
@@ -305,12 +303,11 @@ in {
     description = "Eclipse platform";
     sources = {
       "x86_64-linux" = fetchurl {
-          url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-platform-4.5-linux-gtk-x86_64.tar.gz";
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-platform-4.5-linux-gtk-x86_64.tar.gz;
           sha256 = "1510j41yr86pbzwf48kjjdd46nkpkh8zwn0hna0cqvsw1gk2vqcg";
-
         };
       "i686-linux" = fetchurl {
-          url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-platform-4.5-linux-gtk.tar.gz";
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/eclipse-platform-4.5-linux-gtk.tar.gz;
           sha256 = "1f97jd3qbi3830y3djk8bhwzd9whsq8gzfdk996chxc55prn0qbd";
         };
     };

From 42ff8ad780522111fd597f94ee40beae5aeb6ac3 Mon Sep 17 00:00:00 2001
From: Andrew Rynhard <andrewrynhard@autonomy.io>
Date: Thu, 12 Nov 2015 15:10:56 -0800
Subject: [PATCH 0015/2285] Add help flag to nix-prefetch-git

---
 pkgs/build-support/fetchgit/nix-prefetch-git | 34 ++++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 22d46257075e..736cf0194163 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -22,6 +22,22 @@ else
     leaveDotGit=true
 fi
 
+usage(){
+    echo  >&2 "syntax: nix-prefetch-git [options] [URL [REVISION [EXPECTED-HASH]]]
+
+Options:
+      --out path      Path where the output would be stored.
+      --url url       Any url understand by 'git clone'.
+      --rev ref       Any sha1 or references (such as refs/heads/master)
+      --hash h        Expected hash.
+      --deepClone     Clone submodules recursively.
+      --no-deepClone  Do not clone submodules.
+      --leave-dotGit  Keep the .git directories.
+      --fetch-submodules Fetch submodules.
+      --builder       Clone as fetchgit does, but url, rev, and out option are mandatory.
+"
+    exit 1
+}
 
 argi=0
 argfun=""
@@ -38,6 +54,7 @@ for arg; do
             --leave-dotGit) leaveDotGit=true;;
             --fetch-submodules) fetchSubmodules=true;;
             --builder) builder=true;;
+            --help) usage; exit;;
             *)
                 argi=$(($argi + 1))
                 case $argi in
@@ -59,23 +76,6 @@ for arg; do
     fi
 done
 
-usage(){
-    echo  >&2 "syntax: nix-prefetch-git [options] [URL [REVISION [EXPECTED-HASH]]]
-
-Options:
-      --out path      Path where the output would be stored.
-      --url url       Any url understand by 'git clone'.
-      --rev ref       Any sha1 or references (such as refs/heads/master)
-      --hash h        Expected hash.
-      --deepClone     Clone submodules recursively.
-      --no-deepClone  Do not clone submodules.
-      --leave-dotGit  Keep the .git directories.
-      --fetch-submodules Fetch submodules.
-      --builder       Clone as fetchgit does, but url, rev, and out option are mandatory.
-"
-    exit 1
-}
-
 if test -z "$url"; then
     usage
 fi

From 8b3d03a05875c0e67f930000b6450cd01b3509b8 Mon Sep 17 00:00:00 2001
From: Marcus Crestani <marcus@crestani.de>
Date: Thu, 19 Nov 2015 08:38:11 +0100
Subject: [PATCH 0016/2285] msmtp: Enable on OS X with Keychain integration.

---
 pkgs/applications/networking/msmtp/default.nix | 10 +++++++---
 pkgs/top-level/all-packages.nix                |  4 +++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/msmtp/default.nix b/pkgs/applications/networking/msmtp/default.nix
index 363e98d46d25..e78605392be2 100644
--- a/pkgs/applications/networking/msmtp/default.nix
+++ b/pkgs/applications/networking/msmtp/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn }:
+{ stdenv, fetchurl, openssl, pkgconfig, gnutls, gsasl, libidn, Security }:
 
 stdenv.mkDerivation rec {
   version = "1.6.2";
@@ -9,7 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "12c7ljahb06pgn8yvvw526xvr11vnr6d4nr0apylixddpxycsvig";
   };
 
-  buildInputs = [ openssl pkgconfig gnutls gsasl libidn ];
+  buildInputs = [ openssl pkgconfig gnutls gsasl libidn ]
+    ++ stdenv.lib.optional stdenv.isDarwin Security;
+
+  configureFlags =
+    stdenv.lib.optional stdenv.isDarwin [ "--with-macosx-keyring" ];
 
   postInstall = ''
     cp scripts/msmtpq/msmtp-queue scripts/msmtpq/msmtpq $prefix/bin/
@@ -21,6 +25,6 @@ stdenv.mkDerivation rec {
       homepage = "http://msmtp.sourceforge.net/";
       license = stdenv.lib.licenses.gpl3;
       maintainers = [ stdenv.lib.maintainers.garbas ];
-      platforms = stdenv.lib.platforms.linux;
+      platforms = stdenv.lib.platforms.unix;
     };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b206ad644c0..7d8552956c72 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12468,7 +12468,9 @@ let
 
   sxhkd = callPackage ../applications/window-managers/sxhkd { };
 
-  msmtp = callPackage ../applications/networking/msmtp { };
+  msmtp = callPackage ../applications/networking/msmtp {
+    inherit (darwin.apple_sdk.frameworks) Security;
+  };
 
   imapfilter = callPackage ../applications/networking/mailreaders/imapfilter.nix {
     lua = lua5;

From fb9a2f6c12f87e77305f96ce6c93d5d2b721fcc7 Mon Sep 17 00:00:00 2001
From: Marcus Crestani <marcus@crestani.de>
Date: Thu, 19 Nov 2015 08:45:54 +0100
Subject: [PATCH 0017/2285] sshpass: Enable on OS X.

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

diff --git a/pkgs/tools/networking/sshpass/default.nix b/pkgs/tools/networking/sshpass/default.nix
index 3a8e106155f3..95212b00beb1 100644
--- a/pkgs/tools/networking/sshpass/default.nix
+++ b/pkgs/tools/networking/sshpass/default.nix
@@ -13,6 +13,6 @@ stdenv.mkDerivation rec {
     homepage = http://sourceforge.net/projects/sshpass/;
     description = "Non-interactive ssh password auth";
     maintainers = [ stdenv.lib.maintainers.madjar ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From a1ca4985e3f052302fc422f53acafc8eac73fc38 Mon Sep 17 00:00:00 2001
From: Mitch Tishmack <mitch.tishmack@gmail.com>
Date: Wed, 28 Oct 2015 11:22:40 -0500
Subject: [PATCH 0018/2285] Munge is buildable/usable on osx.

Also update the url to point to the migrated from google code url to
github.
---
 pkgs/tools/security/munge/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/security/munge/default.nix b/pkgs/tools/security/munge/default.nix
index f94eaabd2a4b..96847c983f12 100644
--- a/pkgs/tools/security/munge/default.nix
+++ b/pkgs/tools/security/munge/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, fetchurl, gnused, perl, libgcrypt, zlib, bzip2 }:
+{ stdenv, fetchFromGitHub, gnused, perl, libgcrypt, zlib, bzip2 }:
 
 stdenv.mkDerivation rec {
   name = "munge-0.5.11";
 
-  src = fetchurl {
-    url = "http://munge.googlecode.com/files/${name}.tar.bz2";
-    sha256 = "19aijdrjij2g0xpqgl198jh131j94p4gvam047gsdc0wz0a5c1wf";
+  src = fetchFromGitHub {
+    owner = "dun";
+    repo = "munge";
+    rev = "${name}";
+    sha256 = "02847p742nq3cb8ayf5blrdicybq72nfsnggqkxr33cpppmsfwg9";
   };
 
   buildInputs = [ gnused perl libgcrypt zlib bzip2 ];
@@ -20,11 +22,10 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    homepage = http://code.google.com/p/munge/;
     description = ''
       An authentication service for creating and validating credentials
     '';
     maintainers = [ stdenv.lib.maintainers.rickynils ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 }

From aa196067b1022b4cac877f4d9c6a533f9e2db6b6 Mon Sep 17 00:00:00 2001
From: Robert Glossop <robgssp@gmail.com>
Date: Mon, 9 Nov 2015 15:56:44 -0500
Subject: [PATCH 0019/2285] ldap-client: don't break on test failures

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index edafbe5eab6e..5e25ce29d864 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -422,6 +422,7 @@ self: super: {
   itanium-abi = dontCheck super.itanium-abi;
   katt = dontCheck super.katt;
   language-slice = dontCheck super.language-slice;
+  ldap-client = dontCheck super.ldap-client;
   lensref = dontCheck super.lensref;
   liquidhaskell = dontCheck super.liquidhaskell;
   lucid = dontCheck super.lucid; #https://github.com/chrisdone/lucid/issues/25

From bf0725ac7de5bb7a274e85e032a06ef8644c82be Mon Sep 17 00:00:00 2001
From: Anders Papitto <anderspapitto@gmail.com>
Date: Fri, 27 Nov 2015 20:07:31 -0800
Subject: [PATCH 0020/2285] FlameGraph: init at 182b24fb

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

diff --git a/pkgs/development/tools/flamegraph/default.nix b/pkgs/development/tools/flamegraph/default.nix
new file mode 100644
index 000000000000..1a57afbfa904
--- /dev/null
+++ b/pkgs/development/tools/flamegraph/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, perl }:
+
+stdenv.mkDerivation {
+  name = "FlameGraph-2015-10-10";
+
+  src = fetchFromGitHub {
+    owner = "brendangregg";
+    repo = "FlameGraph";
+    rev = "182b24fb635345d48c91ed1de58a08b620312f3d";
+    sha256 = "1djz0wl8202a6j87ka9j3d8iw3bli056lrn73gv2i65p16rwk9kc";
+  };
+
+  buildInputs = [ perl ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    for x in $src/*.pl $src/*.awk $src/dev/*.pl $src/dev/*.d; do
+      cp $x $out/bin
+    done
+  '';
+
+  meta = with stdenv.lib; {
+    license = licenses.cddl;
+    homepage = http://www.brendangregg.com/flamegraphs.html;
+    description = "Visualization for profiled code";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3acd586706c3..70ef13ed928b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1504,6 +1504,8 @@ let
 
   fdk_aac = callPackage ../development/libraries/fdk-aac { };
 
+  flameGraph = callPackage ../development/tools/flamegraph { };
+
   flvtool2 = callPackage ../tools/video/flvtool2 { };
 
   fontforge = lowPrio (callPackage ../tools/misc/fontforge { });

From 316406269d90c7aeb3194e94e1066fe3e2d95f57 Mon Sep 17 00:00:00 2001
From: Bojan Nikolic <bojan@bnikolic.co.uk>
Date: Fri, 18 Dec 2015 11:51:10 +0000
Subject: [PATCH 0021/2285] recoll: Enable parallel builds

---
 pkgs/applications/search/recoll/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 555da3de6d53..1867fa532534 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -48,6 +48,8 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "A full-text search tool";
     longDescription = ''

From 98d1abd46b19da84d55bd5ce13431305751f571c Mon Sep 17 00:00:00 2001
From: Bojan Nikolic <bojan@bnikolic.co.uk>
Date: Fri, 18 Dec 2015 13:51:58 +0000
Subject: [PATCH 0022/2285] recoll: Disable --install-layout

---
 pkgs/applications/search/recoll/default.nix       |  2 ++
 pkgs/applications/search/recoll/nodeblayout.patch | 12 ++++++++++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/applications/search/recoll/nodeblayout.patch

diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 1867fa532534..ff75aa0e9237 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -15,6 +15,8 @@ stdenv.mkDerivation rec {
     sha256 = "0ympk2w21cxfvysyx96p0npsa54csfc84cicpi8nsj1qp824zxwq";
   };
 
+  patches = [ ./nodeblayout.patch ];
+
   configureFlags = [ "--with-inotify" ];
 
   buildInputs = [ qt4 xapian file python ];
diff --git a/pkgs/applications/search/recoll/nodeblayout.patch b/pkgs/applications/search/recoll/nodeblayout.patch
new file mode 100644
index 000000000000..39988423ae1f
--- /dev/null
+++ b/pkgs/applications/search/recoll/nodeblayout.patch
@@ -0,0 +1,12 @@
+diff -ru recoll-1.21.3-orig/recollinstall.in recoll-1.21.3/recollinstall.in
+--- recoll-1.21.3-orig/recollinstall.in	2015-09-28 08:08:42.000000000 +0100
++++ recoll-1.21.3/recollinstall.in	2015-12-13 22:48:30.361776374 +0000
+@@ -45,9 +45,6 @@
+    mandir=$DESTDIR/$mandir
+    ROOTFORPYTHON="--root=${DESTDIR}"
+ fi
+-if test -f /etc/debian_version ; then
+-   OPTSFORPYTHON=--install-layout=deb
+-fi
+ 
+ echo "Installing to $PREFIX"

From d71b1294dcaf05faea752254fec039b00bd2d36d Mon Sep 17 00:00:00 2001
From: Bojan Nikolic <bojan@bnikolic.co.uk>
Date: Fri, 18 Dec 2015 14:09:28 +0000
Subject: [PATCH 0023/2285] recoll: 1.20.6 -> 1.21.3

Add dependency on bison. Correct corruption caused by substituteInPlace
replacing non-commands in the filters
---
 pkgs/applications/search/recoll/default.nix      | 12 ++++++------
 pkgs/applications/search/recoll/versionawk.patch | 12 ++++++++++++
 2 files changed, 18 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/applications/search/recoll/versionawk.patch

diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index ff75aa0e9237..c396870f9e5b 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, bison
 , qt4, xapian, file, python, perl
 , djvulibre, groff, libxslt, unzip, poppler_utils, antiword, catdoc, lyx
 , libwpd, unrtf, untex
@@ -7,19 +7,19 @@
 assert stdenv.system != "powerpc-linux";
 
 stdenv.mkDerivation rec {
-  ver = "1.20.6";
+  ver = "1.21.3";
   name = "recoll-${ver}";
 
   src = fetchurl {
     url = "http://www.lesbonscomptes.com/recoll/${name}.tar.gz";
-    sha256 = "0ympk2w21cxfvysyx96p0npsa54csfc84cicpi8nsj1qp824zxwq";
+    sha256 = "66f039f08b149d5e4840664d4a636f6b55145b02072f87aab83282ebe0cd593a";
   };
 
-  patches = [ ./nodeblayout.patch ];
+  patches = [ ./nodeblayout.patch ./versionawk.patch ];
 
   configureFlags = [ "--with-inotify" ];
 
-  buildInputs = [ qt4 xapian file python ];
+  buildInputs = [ qt4 xapian file python bison];
 
   # the filters search through ${PATH} using a sh proc 'checkcmds' for the
   # filtering utils. Short circuit this by replacing the filtering command with
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
       substituteInPlace  $f --replace catppt        ${catdoc}/bin/catppt
       substituteInPlace  $f --replace djvused       ${djvulibre}/bin/djvused
       substituteInPlace  $f --replace djvutxt       ${djvulibre}/bin/djvutxt
-      substituteInPlace  $f --replace grep          ${gnugrep}/bin/grep
+      substituteInPlace  $f --replace egrep         ${gnugrep}/bin/egrep
       substituteInPlace  $f --replace groff         ${groff}/bin/groff
       substituteInPlace  $f --replace gunzip        ${gzip}/bin/gunzip
       substituteInPlace  $f --replace iconv         ${libiconv}/bin/iconv
diff --git a/pkgs/applications/search/recoll/versionawk.patch b/pkgs/applications/search/recoll/versionawk.patch
new file mode 100644
index 000000000000..a03ffbc16df1
--- /dev/null
+++ b/pkgs/applications/search/recoll/versionawk.patch
@@ -0,0 +1,12 @@
+diff -ru recoll-1.21.3-orig/filters/rclpdf recoll-1.21.3/filters/rclpdf
+--- recoll-1.21.3-orig/filters/rclpdf	2015-09-28 08:08:15.000000000 +0100
++++ recoll-1.21.3/filters/rclpdf	2015-12-14 21:37:01.984945925 +0000
+@@ -129,7 +129,7 @@
+ {
+     # Test poppler version: at some point before 0.24, poppler began
+     # to properly escape text inside the header (but not the body).
+-    XYZ=`pdftotext -v 2>&1 | awk '/pdftotext/{print $3}'`
++    XYZ=`pdftotext -v 2>&1 | awk '/version/{print $3}'`
+     MAJOR=`echo $XYZ | cut -d. -f 1`
+     MINOR=`echo $XYZ | cut -d. -f 2`
+     escapeheader=1

From 2307d2454481d26e22a02456a8e988c7b1196a27 Mon Sep 17 00:00:00 2001
From: Christian Albrecht <christian.albrecht@mayflower.de>
Date: Wed, 23 Dec 2015 06:02:59 +0100
Subject: [PATCH 0024/2285] networkd: add IPForward and IPMasquerade options

to Network config section
---
 nixos/modules/system/boot/networkd.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index 34eea9af83b1..b9fb4b12e7d2 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -93,11 +93,13 @@ let
 
   checkNetwork = checkUnitConfig "Network" [
     (assertOnlyFields [
-      "Description" "DHCP" "DHCPServer" "IPv4LL" "IPv4LLRoute"
+      "Description" "DHCP" "DHCPServer" "IPForward" "IPMasquerade" "IPv4LL" "IPv4LLRoute"
       "LLMNR" "Domains" "Bridge" "Bond"
     ])
     (assertValueOneOf "DHCP" ["both" "none" "v4" "v6"])
     (assertValueOneOf "DHCPServer" boolValues)
+    (assertValueOneOf "IPForward" ["yes" "no" "ipv4" "ipv6"])
+    (assertValueOneOf "IPMasquerade" boolValues)
     (assertValueOneOf "IPv4LL" boolValues)
     (assertValueOneOf "IPv4LLRoute" boolValues)
     (assertValueOneOf "LLMNR" boolValues)

From 83a64cecc9fbe62d187428535774b2a1293afeaf Mon Sep 17 00:00:00 2001
From: Christian Albrecht <christian.albrecht@mayflower.de>
Date: Wed, 23 Dec 2015 06:04:39 +0100
Subject: [PATCH 0025/2285] networkd: add DHCPServer config section

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

diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix
index b9fb4b12e7d2..ab7485500261 100644
--- a/nixos/modules/system/boot/networkd.nix
+++ b/nixos/modules/system/boot/networkd.nix
@@ -131,6 +131,16 @@ let
     (assertValueOneOf "RequestBroadcast" boolValues)
   ];
 
+  checkDhcpServer = checkUnitConfig "DHCPServer" [
+    (assertOnlyFields [
+      "PoolOffset" "PoolSize" "DefaultLeaseTimeSec" "MaxLeaseTimeSec"
+      "EmitDNS" "DNS" "EmitNTP" "NTP" "EmitTimezone" "Timezone"
+    ])
+    (assertValueOneOf "EmitDNS" boolValues)
+    (assertValueOneOf "EmitNTP" boolValues)
+    (assertValueOneOf "EmitTimezone" boolValues)
+  ];
+
   commonNetworkOptions = {
 
     enable = mkOption {
@@ -343,6 +353,18 @@ let
       '';
     };
 
+    dhcpServerConfig = mkOption {
+      default = {};
+      example = { PoolOffset = 50; EmitDNS = false; };
+      type = types.addCheck (types.attrsOf unitOption) checkDhcpServer;
+      description = ''
+        Each attribute in this set specifies an option in the
+        <literal>[DHCPServer]</literal> section of the unit.  See
+        <citerefentry><refentrytitle>systemd.network</refentrytitle>
+        <manvolnum>5</manvolnum></citerefentry> for details.
+      '';
+    };
+
     name = mkOption {
       type = types.nullOr types.str;
       default = null;
@@ -567,6 +589,11 @@ let
             [DHCP]
             ${attrsToSection def.dhcpConfig}
 
+          ''}
+          ${optionalString (def.dhcpServerConfig != { }) ''
+            [DHCPServer]
+            ${attrsToSection def.dhcpServerConfig}
+
           ''}
           ${flip concatMapStrings def.addresses (x: ''
             [Address]

From e3068d7309b788a27534f038370133396c2b377d Mon Sep 17 00:00:00 2001
From: Adam Boseley <adam.boseley@gmail.com>
Date: Wed, 23 Dec 2015 20:57:34 +1000
Subject: [PATCH 0026/2285] flex: disable tests when cross compiling

When cross compiling we can't run the test executables
on the build machine
---
 pkgs/development/tools/parsing/flex/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix
index 57ce29f51753..dc25633005b6 100644
--- a/pkgs/development/tools/parsing/flex/default.nix
+++ b/pkgs/development/tools/parsing/flex/default.nix
@@ -17,6 +17,12 @@ stdenv.mkDerivation rec {
   '';
 
   crossAttrs = {
+
+    # disable tests which can't run on build machine
+    postPatch = ''
+      substituteInPlace Makefile.in --replace "tests" " ";
+    '';
+
     preConfigure = ''
       export ac_cv_func_malloc_0_nonnull=yes
       export ac_cv_func_realloc_0_nonnull=yes

From c8368cf124c61e0b252b5e05c88c56d274424de0 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Mon, 28 Dec 2015 00:31:48 -0800
Subject: [PATCH 0027/2285] google-chrome: add -beta and -unstable variants

It is a little weird that chromium has chromium, chromiumBeta,
chromiumDev but this one is google-chrome, google-chrome-beta,
google-chrome-dev.  Not quite sure what the best resolution is, if any.
---
 .../browsers/google-chrome/default.nix        | 32 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix
index b05da9c67000..89e545d12e4b 100644
--- a/pkgs/applications/networking/browsers/google-chrome/default.nix
+++ b/pkgs/applications/networking/browsers/google-chrome/default.nix
@@ -35,8 +35,6 @@ with (import ../chromium/source/update.nix {
 }).getChannel channel;
 
 let
-  dist = if channel == "dev" then "unstable" else channel;
-
   opusWithCustomModes = libopus.override {
     withCustomModes = true;
   };
@@ -71,7 +69,13 @@ in stdenv.mkDerivation rec {
   '';
 
   installPhase = ''
-    exe=$out/bin/google-chrome-${dist}
+    case ${channel} in
+      beta) appname=chrome-beta      dist=beta     ;;
+      dev)  appname=chrome-unstable  dist=unstable ;;
+      *)    appname=chrome           dist=stable   ;;
+    esac
+
+    exe=$out/bin/google-chrome-$dist
     rpath="${env}/lib:${env}/lib64"
 
     mkdir -p $out/bin $out/share
@@ -79,32 +83,32 @@ in stdenv.mkDerivation rec {
     cp -a opt/* $out/share
     cp -a usr/share/* $out/share
 
-    substituteInPlace $out/share/applications/google-chrome.desktop \
-      --replace /usr/bin/google-chrome-${dist} $exe
-    substituteInPlace $out/share/gnome-control-center/default-apps/google-chrome.xml \
-      --replace /opt/google/chrome/google-chrome $exe
-    substituteInPlace $out/share/menu/google-chrome.menu \
+    substituteInPlace $out/share/applications/google-$appname.desktop \
+      --replace /usr/bin/google-chrome-$dist $exe
+    substituteInPlace $out/share/gnome-control-center/default-apps/google-$appname.xml \
+      --replace /opt/google/$appname/google-$appname $exe
+    substituteInPlace $out/share/menu/google-$appname.menu \
       --replace /opt $out/share \
-      --replace $out/share/google/chrome/google-chrome $exe
+      --replace $out/share/google/chrome/google-$appname $exe
 
-    for icon_file in $out/share/google/chrome/product_logo_*[0-9].png; do
+    for icon_file in $out/share/google/chrome*/product_logo_*[0-9].png; do
       num_and_suffix="''${icon_file##*logo_}"
       icon_size="''${num_and_suffix%.*}"
       logo_output_prefix="$out/share/icons/hicolor"
       logo_output_path="$logo_output_prefix/''${icon_size}x''${icon_size}/apps"
       mkdir -p "$logo_output_path"
-      mv "$icon_file" "$logo_output_path/google-chrome.png"
+      mv "$icon_file" "$logo_output_path/google-$appname.png"
     done
 
     cat > $exe << EOF
     #!${bash}/bin/sh
     export LD_LIBRARY_PATH=$rpath\''${LD_LIBRARY_PATH:+:\$LD_LIBRARY_PATH}
     export PATH=${env}/bin\''${PATH:+:\$PATH}
-    $out/share/google/chrome/google-chrome "\$@"
+    $out/share/google/$appname/google-$appname "\$@"
     EOF
     chmod +x $exe
 
-    for elf in $out/share/google/chrome/{chrome,chrome-sandbox,nacl_helper}; do
+    for elf in $out/share/google/$appname/{chrome,chrome-sandbox,nacl_helper}; do
       patchelf --set-rpath $rpath $elf
       patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf
     done
@@ -112,7 +116,7 @@ in stdenv.mkDerivation rec {
 
   meta = {
     description = "A freeware web browser developed by Google";
-    homepage = "https://www.google.com/chrome/browser/";
+    homepage = https://www.google.com/chrome/browser/;
     license = licenses.unfree;
     maintainers = [ maintainers.msteen ];
     platforms = platforms.linux;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 092f03d777e1..0a92461c3c6f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12025,6 +12025,10 @@ let
 
   google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome.GConf; };
 
+  google-chrome-beta = google-chrome.override { channel = "beta"; };
+
+  google-chrome-dev = google-chrome.override { channel = "dev"; };
+
   googleearth = callPackage_i686 ../applications/misc/googleearth { };
 
   google_talk_plugin = callPackage ../applications/networking/browsers/mozilla-plugins/google-talk-plugin {

From 0397da7ec4e3e29253e194c7373b9d14ed70d331 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 7 Jan 2016 15:43:09 +0100
Subject: [PATCH 0028/2285] mopidy: Fix fetching songs over HTTPS

The gstreamer plugin needs glib-networking to support HTTPS. Refactored
to use wrapGAppsHook to wrap the gstreamer plugins and glib-networking.
---
 pkgs/applications/audio/mopidy/default.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index 91fc9d6f3fc9..a6209884aa3a 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pythonPackages, pygobject, gst_python
-, gst_plugins_good, gst_plugins_base, gst_plugins_ugly
+{ stdenv, fetchurl, pythonPackages, pygobject, gst_python, wrapGAppsHook
+, glib_networking, gst_plugins_good, gst_plugins_base, gst_plugins_ugly
 }:
 
 pythonPackages.buildPythonPackage rec {
@@ -12,16 +12,19 @@ pythonPackages.buildPythonPackage rec {
     sha256 = "1xfyg8xqgnrb98wx7a4fzr4vlzkffjhkc1s36ka63rwmx86vqhyw";
   };
 
+  buildInputs = [
+    wrapGAppsHook gst_plugins_base gst_plugins_good gst_plugins_ugly glib_networking
+  ];
+
   propagatedBuildInputs = with pythonPackages; [
-    gst_python pygobject pykka tornado requests2 gst_plugins_base gst_plugins_good gst_plugins_ugly
+    gst_python pygobject pykka tornado requests2
   ];
 
   # There are no tests
   doCheck = false;
 
-  postInstall = ''
-    wrapProgram $out/bin/mopidy \
-      --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
+  preFixup = ''
+    gappsWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH")
   '';
 
   meta = with stdenv.lib; {

From a04caed0b3e50535cc826925bd06d5325e720370 Mon Sep 17 00:00:00 2001
From: Yuri Albuquerque <yuridenommus@gmail.com>
Date: Fri, 8 Jan 2016 09:56:40 -0400
Subject: [PATCH 0029/2285] python-cerberus: init at 0.9.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 662ff4d83860..c41e89a3a950 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2492,6 +2492,21 @@ in modules // {
     };
   };
 
+  cerberus = buildPythonPackage rec {
+    name = "Cerberus-${version}";
+    version = "0.9.2";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/C/Cerberus/${name}.tar.gz";
+      sha256 = "1km7hvns1snrmcwz58bssi4wv3gwd34zm1z1hwjylmpqrfrcf8mi";
+    };
+
+    meta = {
+      homepage = http://python-cerberus.org/;
+      description = "Lightweight, extensible schema and data validation tool for Python dictionaries";
+      license = licenses.mit;
+    };
+  };
 
   certifi = buildPythonPackage rec {
     name = "certifi-${version}";

From 295b0534e8b34e62c42657e5925cd326c6c7fc51 Mon Sep 17 00:00:00 2001
From: Yuri Albuquerque <yuridenommus@gmail.com>
Date: Fri, 8 Jan 2016 09:57:03 -0400
Subject: [PATCH 0030/2285] python-events: init at 0.2.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c41e89a3a950..784b4919ed93 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4557,6 +4557,22 @@ in modules // {
     };
   };
 
+  events = buildPythonPackage rec {
+    name = "Events-${version}";
+    version = "0.2.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/E/Events/${name}.tar.gz";
+      sha256 = "0rymyfvarjdi2fdhfz2iqmp4wgd2n2sm0p2mx44c3spm7ylnqzqa";
+    };
+
+    meta = {
+      homepage = "http://events.readthedocs.org";
+      description = "Bringing the elegance of C# EventHanlder to Python";
+      license = licenses.bsd3;
+    };
+  };
+
 
   eyeD3 = buildPythonPackage rec {
     version = "0.7.8";

From 96ce26580c7307a628d181571dbf002936cabc4a Mon Sep 17 00:00:00 2001
From: Yuri Albuquerque <yuridenommus@gmail.com>
Date: Fri, 8 Jan 2016 09:59:11 -0400
Subject: [PATCH 0031/2285] python-pymongo: adding version 2.9.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 784b4919ed93..d6b6b872e9f5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15951,6 +15951,25 @@ in modules // {
     };
   };
 
+  pymongo_2_9_1 = buildPythonPackage rec {
+    name = "pymongo-2.9.1";
+    version = "2.9.1";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pymongo/${name}.tar.gz";
+      sha256 = "1nrr1fxyrlxd69bgxl7bvaj2j4z7v3zaciij5sbhxg0vqiz6ny50";
+    };
+
+    # Tests call a running mongodb instance
+    doCheck = false;
+
+    meta = {
+      homepage = "http://github.com/mongodb/mongo-python-driver";
+      license = licenses.asl20;
+      description = "Python driver for MongoDB ";
+    };
+  };
+
   pyperclip = buildPythonPackage rec {
     version = "1.5.11";
     name = "pyperclip-${version}";

From 50cd9120ecba35eb989af3ab781afe6993d7c6a8 Mon Sep 17 00:00:00 2001
From: Yuri Albuquerque <yuridenommus@gmail.com>
Date: Fri, 8 Jan 2016 10:01:25 -0400
Subject: [PATCH 0032/2285] python-flask-pymongo: init at 0.3.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d6b6b872e9f5..a0e4d5b07880 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7866,6 +7866,24 @@ in modules // {
     };
   };
 
+  flask-pymongo = buildPythonPackage rec {
+    name = "Flask-PyMongo-${version}";
+    version = "0.3.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/F/Flask-PyMongo/${name}.tar.gz";
+      sha256 = "0305qngvjrjyyabf8gxqgqvd9ffh00gr5yfrjf4nncr2my9svbyd";
+    };
+
+    propagatedBuildInputs = with self; [ flask pymongo_2_9_1 ];
+
+    meta = {
+      homepage = "http://flask-pymongo.readthedocs.org/";
+      description = "PyMongo support for Flask applications";
+      license = licenses.bsd2;
+    };
+  };
+
   wtforms = buildPythonPackage rec {
     version = "2.0.2";
     name = "wtforms-${version}";

From a28060eebd04f70358d50d368140ffac006b4cb3 Mon Sep 17 00:00:00 2001
From: Yuri Albuquerque <yuridenommus@gmail.com>
Date: Fri, 8 Jan 2016 10:02:09 -0400
Subject: [PATCH 0033/2285] python-eve: init at 0.6.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a0e4d5b07880..9b351fade456 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4537,6 +4537,39 @@ in modules // {
     };
   };
 
+  eve = buildPythonPackage rec {
+    version = "0.6.1";
+    name = "Eve-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/E/Eve/${name}.tar.gz";
+      sha256 = "0wf1x8qixkld6liz5syqi8i9nrfrhq4lpmh0p9cy3jbkhk34km69";
+    };
+
+    propagatedBuildInputs = with self; [
+      cerberus
+      events
+      flask-pymongo
+      flask
+      itsdangerous
+      jinja2
+      markupsafe
+      pymongo_2_9_1
+      simplejson
+      werkzeug
+
+    ];
+
+    # tests call a running mongodb instance
+    doCheck = false;
+
+    meta = {
+      homepage = "http://python-eve.org/";
+      description = "open source Python REST API framework designed for human beings";
+      license = licenses.bsd3;
+    };
+  };
+
 
   eventlib = buildPythonPackage rec {
     name = "python-eventlib-${version}";

From 4c0988b15deffa5762aa293f13c90dc47ee600d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steve=20M=C3=BCller?= <st.mueller@dzh-online.de>
Date: Fri, 8 Jan 2016 13:30:27 +0100
Subject: [PATCH 0034/2285] phpPackages: init php56Packages and php70Packages

---
 pkgs/top-level/all-packages.nix |  10 ++-
 pkgs/top-level/php-packages.nix | 132 +++++++++++++++++++++++++++-----
 2 files changed, 122 insertions(+), 20 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef326cd0c5d8..902e181e1429 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5201,12 +5201,20 @@ let
 
   php = php56;
 
-  phpPackages = recurseIntoAttrs (callPackage ./php-packages.nix {});
+  phpPackages = php56Packages;
 
   php55Packages = recurseIntoAttrs (callPackage ./php-packages.nix {
     php = php55;
   });
 
+  php56Packages = recurseIntoAttrs (callPackage ./php-packages.nix {
+    php = php56;
+  });
+
+  php70Packages = recurseIntoAttrs (callPackage ./php-packages.nix {
+    php = php70;
+  });
+
   inherit (callPackages ../development/interpreters/php { })
     php54
     php55
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 02ff5a3653ec..700069220793 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -1,25 +1,46 @@
-{ pkgs, php }:
+{ pkgs, fetchgit, php }:
 
-let self = with self; {
-  buildPecl = import ../build-support/build-pecl.nix {
-    inherit php;
-    inherit (pkgs) stdenv autoreconfHook fetchurl;
-  };
+let
+  self = with self; {
+    buildPecl = import ../build-support/build-pecl.nix {
+      inherit php;
+      inherit (pkgs) stdenv autoreconfHook fetchurl;
+    };
+  isPhpOlder55 = pkgs.lib.versionOlder php.version "5.5";
+  isPhp7 = pkgs.lib.versionAtLeast php.version "7.0";
 
-  apcu = buildPecl {
+  apcu = if isPhp7 then apcu51 else apcu40;
+
+  apcu40 = assert !isPhp7; buildPecl {
     name = "apcu-4.0.7";
 
     sha256 = "1mhbz56mbnq7dryf2d64l84lj3fpr5ilmg2424glans3wcg772hp";
   };
 
-  imagick = buildPecl {
+  apcu51 = assert isPhp7; buildPecl {
+    name = "apcu-5.1.2";
+
+    sha256 = "0r5pfbjbmdj46h20jm3iqmy969qd27ajyf0phjhgykv6j0cqjlgd";
+  };
+
+  imagick = if isPhp7 then imagick34 else imagick31;
+
+  imagick31 = assert !isPhp7; buildPecl {
     name = "imagick-3.1.2";
     sha256 = "14vclf2pqcgf3w8nzqbdw0b9v30q898344c84jdbw2sa62n6k1sj";
     configureFlags = "--with-imagick=${pkgs.imagemagick}";
     buildInputs = [ pkgs.pkgconfig ];
   };
 
-  memcache = buildPecl {
+  imagick34 = buildPecl {
+    name = "imagick-3.4.0RC4";
+    sha256 = "0fdkzdv3r8sm6y1x11kp3rxsimq6zf15xvi0mhn57svmnan4zh0i";
+    configureFlags = "--with-imagick=${pkgs.imagemagick}";
+    buildInputs = [ pkgs.pkgconfig ];
+  };
+
+  # No support for PHP 7 yet
+  memcache = assert !isPhp7; buildPecl {
     name = "memcache-3.0.8";
 
     sha256 = "04c35rj0cvq5ygn2jgmyvqcb0k8d03v4k642b6i37zgv7x15pbic";
@@ -27,7 +48,9 @@ let self = with self; {
     configureFlags = "--with-zlib-dir=${pkgs.zlib}";
   };
 
-  memcached = buildPecl {
+  memcached = if isPhp7 then memcachedPhp7 else memcached22;
+
+  memcached22 = assert !isPhp7; buildPecl {
     name = "memcached-2.2.0";
 
     sha256 = "0n4z2mp4rvrbmxq079zdsrhjxjkmhz6mzi7mlcipz02cdl7n1f8p";
@@ -40,7 +63,27 @@ let self = with self; {
     buildInputs = with pkgs; [ pkgconfig cyrus_sasl ];
   };
 
-  xdebug = buildPecl {
+  # Not released yet
+  memcachedPhp7 = assert isPhp7; buildPecl rec {
+    name = "memcached-php7";
+
+    src = fetchgit {
+      url = "https://github.com/php-memcached-dev/php-memcached";
+      rev = "e573a6e8fc815f12153d2afd561fc84f74811e2f";
+      sha256 = "f7acfdae04ef2ef9ece67b6d009aaf6604db64735fc7619f7169929aabb9c58f";
+    };
+
+    configureFlags = [
+      "--with-zlib-dir=${pkgs.zlib}"
+      "--with-libmemcached-dir=${pkgs.libmemcached}"
+    ];
+
+    buildInputs = with pkgs; [ pkgconfig cyrus_sasl ];
+  };
+
+  xdebug = if isPhp7 then xdebug24 else xdebug23;
+
+  xdebug23 = assert !isPhp7; buildPecl {
     name = "xdebug-2.3.1";
 
     sha256 = "0k567i6w7cw14m13s7ip0946pvy5ii16cjwjcinnviw9c24na0xm";
@@ -49,13 +92,25 @@ let self = with self; {
     checkTarget = "test";
   };
 
-  zendopcache = buildPecl {
+  xdebug24 = buildPecl {
+    name = "xdebug-2.4.0RC3";
+
+    sha256 = "06ppsihw4cl8kxmywvic6wsm4ps9pvsns2vbab9ivrfyp8b6h5dy";
+
+    doCheck = true;
+    checkTarget = "test";
+  };
+
+  # Since PHP 5.5 OPcache is integrated in the core and has to be enabled via --enable-opcache during compilation.
+  zendopcache = assert isPhpOlder55; buildPecl {
     name = "zendopcache-7.0.3";
 
     sha256 = "0qpfbkfy4wlnsfq4vc4q5wvaia83l89ky33s08gqrcfp3p1adn88";
   };
 
-  zmq = buildPecl {
+  zmq = if isPhp7 then zmqPhp7 else zmq11;
+
+  zmq11 = assert !isPhp7; buildPecl {
     name = "zmq-1.1.2";
 
     sha256 = "0ccz73p8pkda3y9p9qbr3m19m0yrf7k2bvqgbaly3ibgh9bazc69";
@@ -67,7 +122,25 @@ let self = with self; {
     buildInputs = [ pkgs.pkgconfig ];
   };
 
-  xcache = buildPecl rec {
+  # Not released yet
+  zmqPhp7 = assert isPhp7; buildPecl rec {
+    name = "zmq-php7";
+
+    src = fetchgit {
+      url = "https://github.com/mkoppanen/php-zmq";
+      rev = "94d2b87d195f870775b153b42c29f30da049f4db";
+      sha256 = "51a25b1029800d8abe03c5c08c50d6aee941c95c741dc22d2f853052511f4296";
+    };
+
+    configureFlags = [
+      "--with-zmq=${pkgs.zeromq2}"
+    ];
+
+    buildInputs = [ pkgs.pkgconfig ];
+  };
+
+  # No support for PHP 7 and probably never will be
+  xcache = assert !isPhp7; buildPecl rec {
     name = "xcache-${version}";
 
     version = "3.2.0";
@@ -92,14 +165,22 @@ let self = with self; {
     buildInputs = [ pkgs.m4 ];
   };
 
-  pthreads = assert pkgs.config.php.zts or false; buildPecl {
-    #pthreads requires a build of PHP with ZTS (Zend Thread Safety) enabled
-    #--enable-maintainer-zts or --enable-zts on Windows
+  #pthreads requires a build of PHP with ZTS (Zend Thread Safety) enabled
+  #--enable-maintainer-zts or --enable-zts on Windows
+  pthreads = if isPhp7 then pthreads31 else pthreads20;
+
+  pthreads20 = assert (pkgs.config.php.zts or false) && (!isPhp7); buildPecl {
     name = "pthreads-2.0.10";
     sha256 = "1xlcb1b1g10jd0xhm3c01a06yqpb5qln47pd1k522138324qvpwb";
   };
 
-  geoip = buildPecl {
+  pthreads31 = assert (pkgs.config.php.zts or false) && isPhp7; buildPecl {
+    name = "pthreads-3.1.5";
+    sha256 = "1ziap0py3zrc7qj9lw4nzq6wx1viyj8v9y1babchizzan014x6p5";
+  };
+
+  # No support for PHP 7 yet
+  geoip = assert !isPhp7; buildPecl {
     name = "geoip-1.1.0";
     sha256 = "1fcqpsvwba84gqqmwyb5x5xhkazprwkpsnn4sv2gfbsd4svxxil2";
 
@@ -108,11 +189,24 @@ let self = with self; {
     buildInputs = [ pkgs.geoip ];
   };
 
-  redis = buildPecl {
+  redis = if isPhp7 then redisPhp7 else redis22;
+
+  redis22 = buildPecl {
     name = "redis-2.2.7";
     sha256 = "00n9dpk9ak0bl35sbcd3msr78sijrxdlb727nhg7f2g7swf37rcm";
   };
 
+  # Not released yet
+  redisPhp7 = assert isPhp7; buildPecl rec {
+    name = "redis-php7";
+
+    src = fetchgit {
+      url = "https://github.com/phpredis/phpredis";
+      rev = "4a37e47d0256581ce2f7a3b15b5bb932add09f36";
+      sha256 = "ac5894d168e22ae4a770ce252cfbd07d0f9f1a5b48b084c0559b67fe4d3e51cb";
+    };
+  };
+
   composer = pkgs.stdenv.mkDerivation rec {
     name = "composer-${version}";
     version = "1.0.0-alpha11";

From 75358ad0e7a143ad6849882a1967ef6a5c2e6e68 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 6 Jan 2016 21:43:22 +0300
Subject: [PATCH 0035/2285] bundlerEnv: add wrapper

---
 .../interpreters/ruby/bundler-env/default.nix | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/bundler-env/default.nix b/pkgs/development/interpreters/ruby/bundler-env/default.nix
index c7570d815e3b..fdafa5f8f126 100644
--- a/pkgs/development/interpreters/ruby/bundler-env/default.nix
+++ b/pkgs/development/interpreters/ruby/bundler-env/default.nix
@@ -65,8 +65,24 @@ let
         "${bundler}/${ruby.gemPath}" \
         ${shellEscape (toString envPaths)}
     '' + lib.optionalString (postBuild != null) postBuild;
-    passthru = {
+    passthru = rec {
       inherit ruby bundler meta gems;
+
+      wrapper = stdenv.mkDerivation {
+        name = "wrapper-${name}";
+        nativeBuildInputs = [ makeWrapper ];
+        buildCommand = ''
+          mkdir -p $out/bin
+          for i in ${ruby}/bin/*; do
+            makeWrapper "$i" $out/bin/$(basename "$i") \
+              --set BUNDLE_GEMFILE ${confFiles}/Gemfile \
+              --set BUNDLE_PATH ${bundlerEnv}/${ruby.gemPath} \
+              --set GEM_HOME ${bundlerEnv}/${ruby.gemPath} \
+              --set GEM_PATH ${bundlerEnv}/${ruby.gemPath}
+          done
+        '';
+      };
+
       env = let
         irbrc = builtins.toFile "irbrc" ''
           if !(ENV["OLD_IRBRC"].nil? || ENV["OLD_IRBRC"].empty?)
@@ -77,12 +93,8 @@ let
         '';
         in stdenv.mkDerivation {
           name = "interactive-${name}-environment";
-          nativeBuildInputs = [ ruby bundlerEnv ];
+          nativeBuildInputs = [ wrapper bundlerEnv ];
           shellHook = ''
-            export BUNDLE_GEMFILE=${confFiles}/Gemfile
-            export BUNDLE_PATH=${bundlerEnv}/${ruby.gemPath}
-            export GEM_HOME=${bundlerEnv}/${ruby.gemPath}
-            export GEM_PATH=${bundlerEnv}/${ruby.gemPath}
             export OLD_IRBRC="$IRBRC"
             export IRBRC=${irbrc}
           '';

From b9f6dfe8c5c8da09b6c2d8a8e168bdcf50a0aabd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 13 Jan 2016 11:49:19 +0100
Subject: [PATCH 0036/2285] nixos manuals: allow displaying package references

The manuals are now evaluated with each derivation in `pkgs` (recursively)
replaced by a fake with path "\${pkgs.path.to.the.attribute}".
It isn't perfect, but it seems to cover a vast majority of use cases.
Caveat: even if the package is reached by a different means,
the path above will be shown and not e.g. `${config.services.foo.package}`.

As before, defaults created by `mkDefault` aren't displayed,
but documentation shouldn't (mostly) be a reason to use that anymore.

Note: t wouldn't be enough to just use `lib.mapAttrsRecursive`,
because derivations are also (special) attribute sets.
---
 lib/attrsets.nix  |  2 +-
 nixos/release.nix | 28 +++++++++++++++++++++++-----
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index 84f6cb3658b9..e3721bd1e94c 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -207,7 +207,7 @@ rec {
 
 
   /* Like `mapAttrsRecursive', but it takes an additional predicate
-     function that tells it whether to recursive into an attribute
+     function that tells it whether to recurse into an attribute
      set.  If it returns false, `mapAttrsRecursiveCond' does not
      recurse, but does apply the map function.  It is returns true, it
      does recurse, and does not apply the map function.
diff --git a/nixos/release.nix b/nixos/release.nix
index 8a502ae2baa1..780ac56edf11 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -92,15 +92,33 @@ let
   }).config));
 
 
+  cleanConfig = import ./lib/eval-config.nix {
+    system = "x86_64-linux";
+    modules = [ ];
+    pkgs = with pkgs.lib;
+      let
+        scrubDerivations = namePrefix: pkgSet: mapAttrs
+          (name: value:
+            let wholeName = "${namePrefix}.${name}"; in
+            if isAttrs value then
+              scrubDerivations wholeName value
+              // (optionalAttrs (isDerivation value) { outPath = "\${${wholeName}}"; })
+            else value
+          )
+          pkgSet;
+      in scrubDerivations "pkgs" pkgs;
+  };
+  docs = (import ./doc/manual) {
+    inherit pkgs version;
+    revision = versionModule.system.nixosRevision;
+    inherit (cleanConfig) options;
+  };
+
 in rec {
 
   channel = import lib/make-channel.nix { inherit pkgs nixpkgs version versionSuffix; };
 
-  manual = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manual);
-  manualPDF = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manualPDF)).x86_64-linux;
-  manpages = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manpages);
-  options = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux;
-
+  inherit (docs) manual manualPDF manpages optionsJSON;
 
   # Build the initial ramdisk so Hydra can keep track of its size over time.
   initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk);

From 3bcf8ae8795ede9909df07fb97e049442b38c231 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 13 Jan 2016 11:48:11 +0100
Subject: [PATCH 0037/2285] nixos manuals: bring back package references

This reverts most of 89e983786a, as those references are sanitized now.
Fixes #10039, at least most of it.

The `sane` case wasn't fixed, as it calls a *function* in pkgs to get
the default value.
---
 nixos/modules/programs/ssh.nix                          | 3 +--
 nixos/modules/programs/venus.nix                        | 3 +--
 nixos/modules/services/amqp/activemq/default.nix        | 3 +--
 nixos/modules/services/misc/nixos-manual.nix            | 3 +--
 nixos/modules/services/misc/subsonic.nix                | 4 +---
 nixos/modules/services/monitoring/grafana.nix           | 4 +---
 nixos/modules/services/networking/dnscrypt-proxy.nix    | 5 ++++-
 nixos/modules/services/web-servers/phpfpm.nix           | 5 ++---
 nixos/modules/services/x11/display-managers/lightdm.nix | 4 +---
 9 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 87a7bac208b7..cf7ef455eb85 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -36,6 +36,7 @@ in
 
       askPassword = mkOption {
         type = types.str;
+        default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
         description = ''Program used by SSH to ask for passwords.'';
       };
 
@@ -222,7 +223,5 @@ in
         export SSH_ASKPASS=${askPassword}
       '';
 
-    programs.ssh.askPassword = mkDefault "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
-
   };
 }
diff --git a/nixos/modules/programs/venus.nix b/nixos/modules/programs/venus.nix
index 8f85b602fe2c..ca3188b18199 100644
--- a/nixos/modules/programs/venus.nix
+++ b/nixos/modules/programs/venus.nix
@@ -99,6 +99,7 @@ in
       };
 
       outputTheme = mkOption {
+        default = "${pkgs.venus}/themes/classic_fancy";
         type = types.path;
         description = ''
           Directory containing a config.ini file which is merged with this one.
@@ -169,7 +170,5 @@ in
         startAt = cfg.dates;
       };
 
-    services.venus.outputTheme = mkDefault "${pkgs.venus}/themes/classic_fancy";
-
   };
 }
diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix
index 56ff388f8a9e..261f97617664 100644
--- a/nixos/modules/services/amqp/activemq/default.nix
+++ b/nixos/modules/services/amqp/activemq/default.nix
@@ -32,6 +32,7 @@ in {
         '';
       };
       configurationDir = mkOption {
+        default = "${activemq}/conf";
         description = ''
           The base directory for ActiveMQ's configuration.
           By default, this directory is searched for a file named activemq.xml,
@@ -125,8 +126,6 @@ in {
       '';
     };
 
-    services.activemq.configurationDir = mkDefault "${activemq}/conf";
-
   };
 
 }
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 3e1f53e79f3e..2aa8f4a06cc9 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -80,6 +80,7 @@ in
 
     services.nixosManual.browser = mkOption {
       type = types.path;
+      default = "${pkgs.w3m-nox}/bin/w3m";
       description = ''
         Browser used to show the manual.
       '';
@@ -117,8 +118,6 @@ in
     services.mingetty.helpLine = mkIf cfg.showManual
       "\nPress <Alt-F${toString cfg.ttyNumber}> for the NixOS manual.";
 
-    services.nixosManual.browser = mkDefault "${pkgs.w3m-nox}/bin/w3m";
-
   };
 
 }
diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix
index 2831e95b9480..020d53a481de 100644
--- a/nixos/modules/services/misc/subsonic.nix
+++ b/nixos/modules/services/misc/subsonic.nix
@@ -97,6 +97,7 @@ in
 
       transcoders = mkOption {
         type = types.listOf types.path;
+        default = [ "${pkgs.ffmpeg}/bin/ffmpeg" ];
         description = ''
           List of paths to transcoder executables that should be accessible
           from Subsonic. Symlinks will be created to each executable inside
@@ -152,8 +153,5 @@ in
     };
 
     users.extraGroups.subsonic.gid = config.ids.gids.subsonic;
-
-    services.subsonic.transcoders = mkDefault [ "${pkgs.ffmpeg}/bin/ffmpeg" ];
-
   };
 }
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index 6053990e8d3b..a92ca4a54606 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -87,6 +87,7 @@ in {
 
     staticRootPath = mkOption {
       description = "Root path for static assets.";
+      default = "${cfg.package.out}/share/grafana/public";
       type = types.str;
     };
 
@@ -231,8 +232,5 @@ in {
       home = cfg.dataDir;
       createHome = true;
     };
-
-    services.grafana.staticRootPath = mkDefault "${cfg.package}/share/grafana/public";
-
   };
 }
diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 218bce2dbb31..c724ee979c2d 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -52,7 +52,10 @@ in
         default = "opendns";
         type = types.nullOr types.string;
         description = ''
-          The name of the upstream DNSCrypt resolver to use.
+          The name of the upstream DNSCrypt resolver to use. See
+          <literal>${resolverListFile}</literal> for alternative resolvers
+          (e.g., if you are concerned about logging and/or server
+          location).
         '';
       };
       customResolver = mkOption {
diff --git a/nixos/modules/services/web-servers/phpfpm.nix b/nixos/modules/services/web-servers/phpfpm.nix
index 82398948bfaa..41dbfff41cfe 100644
--- a/nixos/modules/services/web-servers/phpfpm.nix
+++ b/nixos/modules/services/web-servers/phpfpm.nix
@@ -44,7 +44,8 @@ in {
 
       phpIni = mkOption {
         type = types.path;
-        description = "PHP configuration file to use.";
+        default = "${cfg.phpPackage}/etc/php-recommended.ini";
+        description = "php.ini file to use.";
       };
 
       poolConfigs = mkOption {
@@ -85,7 +86,5 @@ in {
       };
     };
 
-    services.phpfpm.phpIni = mkDefault "${cfg.phpPackage}/etc/php-recommended.ini";
-
   };
 }
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index ded694d90d50..c45769119db9 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -86,6 +86,7 @@ in
       };
 
       background = mkOption {
+        default = "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png";
         description = ''
           The background image or color to use.
         '';
@@ -151,9 +152,6 @@ in
     };
 
     users.extraGroups.lightdm.gid = config.ids.gids.lightdm;
-
-    services.xserver.displayManager.lightdm.background = mkDefault "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png";
-
     services.xserver.tty     = null; # We might start multiple X servers so let the tty increment themselves..
     services.xserver.display = null; # We specify our own display (and logfile) in xserver-wrapper up there
   };

From 98fcbb7151edc5075a727c0e9e324bcc2014f91c Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 17 Dec 2015 04:42:29 +0300
Subject: [PATCH 0038/2285] yakuake: 2.9.8 -> 2.9.9

---
 pkgs/applications/misc/yakuake/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/yakuake/default.nix b/pkgs/applications/misc/yakuake/default.nix
index 10b63d1db514..e48201b914c5 100644
--- a/pkgs/applications/misc/yakuake/default.nix
+++ b/pkgs/applications/misc/yakuake/default.nix
@@ -3,23 +3,21 @@
 
 let
   pname = "yakuake";
-  version = "2.9.8";
+  version = "2.9.9";
 in
 stdenv.mkDerivation {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.bz2";
-    sha256 = "0a9x3nmala8nl4xl3h7rcd76f5j7b7r74jc5cfbayc6jgkjdynd3";
+    url = "mirror://kde/stable/${pname}/${version}/src/${pname}-${version}.tar.xz";
+    sha256 = "0e0e4994c568f8091c9424e4aab35645436a9ff341c00b1cd1eab0ada0bf61ce";
   };
 
   buildInputs = [ kdelibs ];
 
   nativeBuildInputs = [ automoc4 cmake gettext perl pkgconfig ];
 
-  patchPhase = ''
-    substituteInPlace app/terminal.cpp --replace \"konsolepart\" "\"${konsole}/lib/kde4/libkonsolepart.so\""
-  '';
+  propagatedUserEnvPkgs = [ konsole ];
 
   meta = {
     homepage = http://yakuake.kde.org;

From ee9e7b7224397d77dfb80462b4bf420a0aac8a06 Mon Sep 17 00:00:00 2001
From: Al Zohali <zohl@fmap.me>
Date: Sun, 10 Jan 2016 22:07:45 +0300
Subject: [PATCH 0039/2285] linux_chromiumos_3_18: init at 3.18.0

Co-authored-by: Nikolay Amiantov <ab@fmap.me>
---
 .../fix-double-Kconfig-entry-3.18.patch       | 48 ++++++++++++++
 .../no-link-restrictions.patch                | 15 +++++
 .../linux/kernel/common-config.nix            | 63 ++++++++++++++++++-
 .../linux/kernel/genksyms-fix-segfault.patch  | 19 ++++++
 .../linux/kernel/linux-chromiumos-3.18.nix    | 21 +++++++
 pkgs/os-specific/linux/kernel/patches.nix     | 15 +++++
 pkgs/top-level/all-packages.nix               | 13 ++++
 7 files changed, 193 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.18.patch
 create mode 100644 pkgs/os-specific/linux/kernel/chromiumos-patches/no-link-restrictions.patch
 create mode 100644 pkgs/os-specific/linux/kernel/genksyms-fix-segfault.patch
 create mode 100644 pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix

diff --git a/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.18.patch b/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.18.patch
new file mode 100644
index 000000000000..2d8af8fa7459
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.18.patch
@@ -0,0 +1,48 @@
+diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
+index 48398b4..0e37f7d 100644
+--- a/drivers/base/Kconfig
++++ b/drivers/base/Kconfig
+@@ -198,30 +198,6 @@ config DEV_COREDUMP
+ 	default y if WANT_DEV_COREDUMP
+ 	depends on ALLOW_DEV_COREDUMP
+ 
+-config WANT_DEV_COREDUMP
+-	bool
+-	help
+-	  Drivers should "select" this option if they desire to use the
+-	  device coredump mechanism.
+-
+-config ALLOW_DEV_COREDUMP
+-	bool "Allow device coredump" if EXPERT
+-	default y
+-	help
+-	  This option controls if the device coredump mechanism is available or
+-	  not; if disabled, the mechanism will be omitted even if drivers that
+-	  can use it are enabled.
+-	  Say 'N' for more sensitive systems or systems that don't want
+-	  to ever access the information to not have the code, nor keep any
+-	  data.
+-
+-	  If unsure, say Y.
+-
+-config DEV_COREDUMP
+-	bool
+-	default y if WANT_DEV_COREDUMP
+-	depends on ALLOW_DEV_COREDUMP
+-
+ config DEBUG_DRIVER
+ 	bool "Driver Core verbose debug messages"
+ 	depends on DEBUG_KERNEL
+diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
+index 58154a9..53a0d73 100644
+--- a/drivers/mfd/Kconfig
++++ b/drivers/mfd/Kconfig
+@@ -81,7 +81,7 @@ config MFD_AXP20X
+ 
+ config MFD_CROS_EC
+ 	tristate "Support ChromeOS Embedded Controller"
+-	depends on MFD_CORE
++	select MFD_CORE
+ 	help
+ 	  If you say Y here you get support for the ChromeOS Embedded
+ 	  Controller (EC) providing keyboard, battery and power services.
diff --git a/pkgs/os-specific/linux/kernel/chromiumos-patches/no-link-restrictions.patch b/pkgs/os-specific/linux/kernel/chromiumos-patches/no-link-restrictions.patch
new file mode 100644
index 000000000000..ce19dd5d1696
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/chromiumos-patches/no-link-restrictions.patch
@@ -0,0 +1,15 @@
+diff --git a/fs/namei.c b/fs/namei.c
+index d999a86..eb6e530 100644
+--- a/fs/namei.c
++++ b/fs/namei.c
+@@ -703,8 +703,8 @@ static inline void put_link(struct nameidata *nd, struct path *link, void *cooki
+ 	path_put(link);
+ }
+ 
+-int sysctl_protected_symlinks __read_mostly = 1;
+-int sysctl_protected_hardlinks __read_mostly = 1;
++int sysctl_protected_symlinks __read_mostly = 0;
++int sysctl_protected_hardlinks __read_mostly = 0;
+ 
+ /**
+  * may_follow_link - Check symlink following for unsafe situations
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index cb6e45e52c8b..62a824415080 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -147,7 +147,7 @@ with stdenv.lib;
 
   # Video configuration.
   # Enable KMS for devices whose X.org driver supports it.
-  ${optionalString (versionOlder version "4.3") ''
+  ${optionalString (versionOlder version "4.3" && !(features.chromiumos or false)) ''
     DRM_I915_KMS y
   ''}
   # Allow specifying custom EDID on the kernel command line
@@ -503,6 +503,67 @@ with stdenv.lib;
   # Disable the firmware helper fallback, udev doesn't implement it any more
   FW_LOADER_USER_HELPER_FALLBACK? n
 
+  # ChromiumOS support
+  ${optionalString (features.chromiumos or false) ''
+    CHROME_PLATFORMS y
+    VGA_SWITCHEROO n
+    MMC_SDHCI_PXAV2 n
+    NET_IPVTI n
+    IPV6_VTI n
+    REGULATOR_FIXED_VOLTAGE n
+    TPS6105X n
+    CPU_FREQ_STAT y
+    IPV6 y
+    MFD_CROS_EC y
+    MFD_CROS_EC_LPC y
+    MFD_CROS_EC_DEV y
+    CHARGER_CROS_USB_PD y
+    I2C y
+    MEDIA_SUBDRV_AUTOSELECT n
+    VIDEO_IR_I2C n
+    BLK_DEV_DM y
+    ANDROID_PARANOID_NETWORK n
+    DM_VERITY n
+    DRM_VGEM n
+    CPU_FREQ_GOV_INTERACTIVE n
+    INPUT_KEYRESET n
+    DM_BOOTCACHE n
+    UID_CPUTIME n
+
+    ${optionalString (versionAtLeast version "3.18") ''
+      CPUFREQ_DT n
+      EXTCON_CROS_EC n
+      DRM_POWERVR_ROGUE n
+      CHROMEOS_OF_FIRMWARE y
+      TEST_RHASHTABLE n
+      BCMDHD n
+      TRUSTY n
+    ''}
+
+    ${optionalString (versionOlder version "3.18") ''
+      MALI_MIDGARD n
+      DVB_USB_DIB0700 n
+      DVB_USB_DW2102 n
+      DVB_USB_PCTV452E n
+      DVB_USB_TTUSB2 n
+      DVB_USB_AF9015 n
+      DVB_USB_AF9035 n
+      DVB_USB_ANYSEE n
+      DVB_USB_AZ6007 n
+      DVB_USB_IT913X n
+      DVB_USB_LME2510 n
+      DVB_USB_RTL28XXU n
+      USB_S2255 n
+      VIDEO_EM28XX n
+      VIDEO_TM6000 n
+      USB_DWC2 n
+      USB_GSPCA n
+      SPEAKUP n
+      XO15_EBOOK n
+      USB_GADGET n
+    ''}
+  ''}
+
   ${kernelPlatform.kernelExtraConfig or ""}
   ${extraConfig}
 ''
diff --git a/pkgs/os-specific/linux/kernel/genksyms-fix-segfault.patch b/pkgs/os-specific/linux/kernel/genksyms-fix-segfault.patch
new file mode 100644
index 000000000000..47ae77a5a54d
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/genksyms-fix-segfault.patch
@@ -0,0 +1,19 @@
+diff --git a/scripts/genksyms/genksyms.c b/scripts/genksyms/genksyms.c
+index 88632df..ba6cfa9 100644
+--- a/scripts/genksyms/genksyms.c
++++ b/scripts/genksyms/genksyms.c
+@@ -233,11 +233,11 @@ static struct symbol *__add_symbol(const char *name, enum symbol_type type,
+ 		free_list(last_enum_expr, NULL);
+ 		last_enum_expr = NULL;
+ 		enum_counter = 0;
+-		if (!name)
+-			/* Anonymous enum definition, nothing more to do */
+-			return NULL;
+ 	}
+ 
++	if (!name)
++		return NULL;
++
+ 	h = crc32(name) % HASH_BUCKETS;
+ 	for (sym = symtab[h]; sym; sym = sym->hash_next) {
+ 		if (map_to_ns(sym->type) == map_to_ns(type) &&
diff --git a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix
new file mode 100644
index 000000000000..9ab3f70c97fc
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.18.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchgit, perl, buildLinux, ncurses, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "3.18.0";
+  extraMeta.branch = "3.18";
+
+  src = fetchgit {
+    url = "https://chromium.googlesource.com/chromiumos/third_party/kernel";
+    rev = "3179ec7e3f07fcc3ca35817174c5fc6584030ab3";
+    sha256 = "0hfa97fs216x8q20fsmw02kvf6mw6c6zczfjk2bpym6v7zxdzj28";
+  };
+
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.canDisableNetfilterConntrackHelpers = true;
+  features.netfilterRPFilter = true;
+  features.chromiumos = true;
+  
+  extraMeta.hydraPlatforms = [];
+} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index cd34819a8489..ed931201c947 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -103,4 +103,19 @@ rec {
       patch = ./crc-regression.patch;
     };
 
+  genksyms_fix_segfault =
+    { name = "genksyms-fix-segfault";
+      patch = ./genksyms-fix-segfault.patch;
+    };
+
+
+  chromiumos_Kconfig_fix_entries_3_18 =
+    { name = "Kconfig_fix_entries_3_18";
+      patch = ./chromiumos-patches/fix-double-Kconfig-entry-3.18.patch;
+    };
+
+  chromiumos_no_link_restrictions =
+    { name = "chromium-no-link-restrictions";
+      patch = ./chromiumos-patches/no-link-restrictions.patch;
+    };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb2f0e4f10d9..201c21833eed 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10057,6 +10057,15 @@ let
       ];
   };
 
+  linux_chromiumos_3_18 = callPackage ../os-specific/linux/kernel/linux-chromiumos-3.18.nix {
+    kernelPatches = [ kernelPatches.chromiumos_Kconfig_fix_entries_3_18
+                      kernelPatches.chromiumos_no_link_restrictions
+                      kernelPatches.genksyms_fix_segfault
+                    ];
+  };
+
+  linux_chromiumos_latest = linux_chromiumos_3_18;
+
   /* grsec configuration
 
      We build several flavors of 'default' grsec kernels. These are
@@ -10244,6 +10253,10 @@ let
   linuxPackages_grsec_testing_server  = grPackage grFlavors.linux_grsec_testing_server;
   linuxPackages_grsec_testing_server_xen = grPackage grFlavors.linux_grsec_testing_server_xen;
 
+  # ChromiumOS kernels
+  linuxPackages_chromiumos_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_18 linuxPackages_chromiumos_3_18);
+  linuxPackages_chromiumos_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_latest linuxPackages_chromiumos_latest);
+
   # A function to build a manually-configured kernel
   linuxManualConfig = pkgs.buildLinux;
   buildLinux = callPackage ../os-specific/linux/kernel/manual-config.nix {};

From a3a5bc60954774a0f18341a72f66c5102bc9a457 Mon Sep 17 00:00:00 2001
From: Al Zohali <zohl@fmap.me>
Date: Sun, 10 Jan 2016 22:10:11 +0300
Subject: [PATCH 0040/2285] linux_chromiumos_3_14: init at 3.14.0

Co-authored-by: Nikolay Amiantov <ab@fmap.me>
---
 .../fix-double-Kconfig-entry-3.14.patch       | 47 +++++++++++++++++++
 .../mfd-fix-dependency.patch                  | 25 ++++++++++
 .../linux/kernel/linux-chromiumos-3.14.nix    | 19 ++++++++
 pkgs/os-specific/linux/kernel/patches.nix     | 10 ++++
 pkgs/top-level/all-packages.nix               |  9 ++++
 5 files changed, 110 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.14.patch
 create mode 100644 pkgs/os-specific/linux/kernel/chromiumos-patches/mfd-fix-dependency.patch
 create mode 100644 pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix

diff --git a/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.14.patch b/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.14.patch
new file mode 100644
index 000000000000..7fdcafa62d9d
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/chromiumos-patches/fix-double-Kconfig-entry-3.14.patch
@@ -0,0 +1,47 @@
+From de6299c1627d80ea6742a0bef15bdb6981e5cfd7 Mon Sep 17 00:00:00 2001
+From: Nikolay Amiantov <ab@fmap.me>
+Date: Fri, 25 Dec 2015 17:11:40 +0300
+Subject: [PATCH 1/2] drivers_base: fix double Kconfig entry
+
+---
+ drivers/base/Kconfig | 24 ------------------------
+ 1 file changed, 24 deletions(-)
+
+diff --git a/drivers/base/Kconfig b/drivers/base/Kconfig
+index 946ced4..fc3405e1 100644
+--- a/drivers/base/Kconfig
++++ b/drivers/base/Kconfig
+@@ -163,30 +163,6 @@ config FW_LOADER_USER_HELPER
+ 	  no longer required unless you have a special firmware file that
+ 	  resides in a non-standard path.
+ 
+-config WANT_DEV_COREDUMP
+-	bool
+-	help
+-	  Drivers should "select" this option if they desire to use the
+-	  device coredump mechanism.
+-
+-config ALLOW_DEV_COREDUMP
+-	bool "Allow device coredump" if EXPERT
+-	default y
+-	help
+-	  This option controls if the device coredump mechanism is available or
+-	  not; if disabled, the mechanism will be omitted even if drivers that
+-	  can use it are enabled.
+-	  Say 'N' for more sensitive systems or systems that don't want
+-	  to ever access the information to not have the code, nor keep any
+-	  data.
+-
+-	  If unsure, say Y.
+-
+-config DEV_COREDUMP
+-	bool
+-	default y if WANT_DEV_COREDUMP
+-	depends on ALLOW_DEV_COREDUMP
+-
+ config DEBUG_DRIVER
+ 	bool "Driver Core verbose debug messages"
+ 	depends on DEBUG_KERNEL
+-- 
+2.6.3
+
diff --git a/pkgs/os-specific/linux/kernel/chromiumos-patches/mfd-fix-dependency.patch b/pkgs/os-specific/linux/kernel/chromiumos-patches/mfd-fix-dependency.patch
new file mode 100644
index 000000000000..f17ecce92d1c
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/chromiumos-patches/mfd-fix-dependency.patch
@@ -0,0 +1,25 @@
+From 65c5b603489d230b1f1775b01ba1529843cfeba6 Mon Sep 17 00:00:00 2001
+From: Nikolay Amiantov <ab@fmap.me>
+Date: Fri, 25 Dec 2015 17:11:56 +0300
+Subject: [PATCH 2/2] mfd: fix dependency for MFD_CROS_EC
+
+---
+ drivers/mfd/Kconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
+index f425dce..a62a285 100644
+--- a/drivers/mfd/Kconfig
++++ b/drivers/mfd/Kconfig
+@@ -61,7 +61,7 @@ config MFD_AAT2870_CORE
+ 
+ config MFD_CROS_EC
+ 	tristate "Support ChromeOS Embedded Controller"
+-	depends on MFD_CORE
++	select MFD_CORE
+ 	help
+ 	  If you say Y here you get support for the ChromeOS Embedded
+ 	  Controller (EC) providing keyboard, battery and power services.
+-- 
+2.6.3
+
diff --git a/pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix
new file mode 100644
index 000000000000..fb52b14c9ae3
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-chromiumos-3.14.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchgit, perl, buildLinux, ncurses, openssh, ... } @ args:
+
+import ./generic.nix (args // rec {
+  version = "3.14.0";
+  extraMeta.branch = "3.14";
+
+  src = fetchgit {
+    url = "https://chromium.googlesource.com/chromiumos/third_party/kernel";
+    rev = "63a768b40c91c6f3518ea1f20d0cb664ed4e6a57";
+    sha256 = "613527a032699be32c18d3f5d8d4c215d7718279a1c372c9f371d4e6c0b9cc34";
+  };
+
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.canDisableNetfilterConntrackHelpers = true;
+  features.netfilterRPFilter = true;
+  features.chromiumos = true;
+} // (args.argsOverride or {}))
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index ed931201c947..93b11ed892ba 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -109,6 +109,11 @@ rec {
     };
 
 
+  chromiumos_Kconfig_fix_entries_3_14 =
+    { name = "Kconfig_fix_entries_3_14";
+      patch = ./chromiumos-patches/fix-double-Kconfig-entry-3.14.patch;
+    };
+
   chromiumos_Kconfig_fix_entries_3_18 =
     { name = "Kconfig_fix_entries_3_18";
       patch = ./chromiumos-patches/fix-double-Kconfig-entry-3.18.patch;
@@ -118,4 +123,9 @@ rec {
     { name = "chromium-no-link-restrictions";
       patch = ./chromiumos-patches/no-link-restrictions.patch;
     };
+
+  chromiumos_mfd_fix_dependency =
+    { name = "mfd_fix_dependency";
+      patch = ./chromiumos-patches/mfd-fix-dependency.patch;
+    };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 201c21833eed..a7a2657a5501 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10057,6 +10057,14 @@ let
       ];
   };
 
+  linux_chromiumos_3_14 = callPackage ../os-specific/linux/kernel/linux-chromiumos-3.14.nix {
+    kernelPatches = [ kernelPatches.chromiumos_Kconfig_fix_entries_3_14
+                      kernelPatches.chromiumos_mfd_fix_dependency
+                      kernelPatches.chromiumos_no_link_restrictions
+                      kernelPatches.genksyms_fix_segfault
+                    ];
+  };
+
   linux_chromiumos_3_18 = callPackage ../os-specific/linux/kernel/linux-chromiumos-3.18.nix {
     kernelPatches = [ kernelPatches.chromiumos_Kconfig_fix_entries_3_18
                       kernelPatches.chromiumos_no_link_restrictions
@@ -10254,6 +10262,7 @@ let
   linuxPackages_grsec_testing_server_xen = grPackage grFlavors.linux_grsec_testing_server_xen;
 
   # ChromiumOS kernels
+  linuxPackages_chromiumos_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_14 linuxPackages_chromiumos_3_14);
   linuxPackages_chromiumos_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_18 linuxPackages_chromiumos_3_18);
   linuxPackages_chromiumos_latest = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_latest linuxPackages_chromiumos_latest);
 

From d28eeb8ad4ad33ae32b121059737a9de09a6b197 Mon Sep 17 00:00:00 2001
From: Al Zohali <zohl@fmap.me>
Date: Sun, 10 Jan 2016 18:24:34 +0300
Subject: [PATCH 0041/2285] maintainers: add zohl

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 9a8e1d685ddb..4fda2ac13a12 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -337,6 +337,7 @@
   z77z = "Marco Maggesi <maggesi@math.unifi.it>";
   zef = "Zef Hemel <zef@zef.me>";
   zimbatm = "zimbatm <zimbatm@zimbatm.com>";
+  zohl = "Al Zohali <zohl@fmap.me>";
   zoomulator = "Kim Simmons <zoomulator@gmail.com>";
   Gonzih = "Max Gonzih <gonzih@gmail.com>";
 }

From 860d8c3a55d2e328adb042e9b6b9b9cf00448818 Mon Sep 17 00:00:00 2001
From: Al Zohali <zohl@fmap.me>
Date: Sun, 10 Jan 2016 14:02:35 +0300
Subject: [PATCH 0042/2285] rt5677-firmware: init at 20160110

---
 .../linux/firmware/rt5677/default.nix         | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/os-specific/linux/firmware/rt5677/default.nix

diff --git a/pkgs/os-specific/linux/firmware/rt5677/default.nix b/pkgs/os-specific/linux/firmware/rt5677/default.nix
new file mode 100644
index 000000000000..46716b3f4900
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/rt5677/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation {
+  name = "rt5677-firmware";
+
+  src = fetchgit {
+    url = "https://github.com/raphael/linux-samus";
+    rev = "995de6c2093797905fbcd79f1a3625dd3f50be37";
+    sha256 = "6e59f7ce24122eb9474e7863e63729de632e4c7afcb8f08534cb2102007f8381";
+  };
+
+
+  installPhase = ''
+    mkdir -p $out/lib/firmware
+    cp ./firmware/rt5677_elf_vad $out/lib/firmware
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Firmware for Realtek rt5677 device";
+    license = licenses.unfreeRedistributableFirmware;
+    maintainers = [ maintainers.zohl ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7a2657a5501..11e8fd5e2eba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10456,6 +10456,8 @@ let
 
   rtkit = callPackage ../os-specific/linux/rtkit { };
 
+  rt5677-firmware = callPackage ../os-specific/linux/firmware/rt5677 { };
+
   s3ql = callPackage ../tools/backup/s3ql { };
 
   sassc = callPackage ../development/tools/sassc { };

From 5acaa993f39104ce9f7b4c5718381b0e59fb52b5 Mon Sep 17 00:00:00 2001
From: codsl <codsl@riseup.net>
Date: Sun, 27 Dec 2015 08:32:28 +0000
Subject: [PATCH 0043/2285] maintainers: add myself

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 9a8e1d685ddb..733b010352a2 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -64,6 +64,7 @@
   chattered = "Phil Scott <me@philscotted.com>";
   christopherpoole = "Christopher Mark Poole <mail@christopherpoole.net>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
+  codsl = "codsl <codsl@riseup.net>";
   codyopel = "Cody Opel <codyopel@gmail.com>";
   copumpkin = "Dan Peebles <pumpkingod@gmail.com>";
   coroa = "Jonas Hörsch <jonas@chaoflow.net>";

From 7ff4973d79dc6861637fb4e3cc4b3ce797c8a34f Mon Sep 17 00:00:00 2001
From: codsl <codsl@riseup.net>
Date: Sun, 27 Dec 2015 08:33:05 +0000
Subject: [PATCH 0044/2285] xmpp-client: init at dc9d6be

---
 pkgs/top-level/all-packages.nix |  2 ++
 pkgs/top-level/go-packages.nix  | 16 ++++++++++++++++
 2 files changed, 18 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a07b7d2a98e..c4c05e62611e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13863,6 +13863,8 @@ let
     GConf2 = gnome2.GConf;
   };
 
+  xmpp-client = go15Packages.xmpp-client.bin // { outputs = [ "bin" ]; };
+
   libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
 
   xpra = callPackage ../tools/X11/xpra { inherit (texFunctions) fontsConf; };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 3efbc526b628..a2d112b922cc 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3361,6 +3361,22 @@ let
     sha256 = "0gljdfxqc94yb1kpqqrm5p94ph9dsxrzcixhdj6m92cwwa7z7p99";
   };
 
+  xmpp-client = buildFromGitHub {
+    rev      = "dc9d6be127f7c044ca0d56e5681c717a440ac177";
+    owner    = "agl";
+    repo     = "xmpp-client";
+    sha256   = "1zxh88mfzvq7fzf0536qy8kpcl82nw4jwrvyb9z6lhwk05gmi3vi";
+    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 79cc97c63740c045b9716893a3b5cd7a4fa94c59 Mon Sep 17 00:00:00 2001
From: codsl <codsl@riseup.net>
Date: Sun, 27 Dec 2015 19:35:27 +0000
Subject: [PATCH 0045/2285] ricochet: init at 1.1.1

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

diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
new file mode 100644
index 000000000000..58f2789679d6
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, pkgconfig
+, qtbase, qttools, makeQtWrapper
+, qtmultimedia, qtquick1, qtquickcontrols
+, openssl, protobuf
+}:
+
+stdenv.mkDerivation rec {
+  name = "ricochet-${version}";
+  version = "1.1.1";
+
+  src = fetchurl {
+    url = "https://github.com/ricochet-im/ricochet/archive/v${version}.tar.gz";
+    sha256 = "0y79igzgl9xn00981zcyxdlks7vnqxhb4rq3x8gwxm0yr98p39ms";
+  };
+
+  buildInputs =
+    [
+      qtbase qttools qtmultimedia qtquick1 qtquickcontrols
+      openssl protobuf
+    ];
+
+  nativeBuildInputs = [ pkgconfig makeQtWrapper ];
+
+  preConfigure = ''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags openssl)"
+  '';
+
+  configureScript = "qmake";
+  dontAddPrefix = true;
+  configureFlags = [ "PREFIX=$(out)" "DEFINES+=RICOCHET_NO_PORTABLE" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ricochet $out/bin
+    wrapQtProgram $out/bin/ricochet
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Anonymous peer-to-peer instant messaging";
+    homepage = "https://ricochet.im";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.codsl ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4c05e62611e..0c04a0c12a14 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13000,6 +13000,8 @@ let
 
   RhythmDelay = callPackage ../applications/audio/RhythmDelay { };
 
+  ricochet = qt5.callPackage ../applications/networking/instant-messengers/ricochet { };
+
   rkt = callPackage ../applications/virtualization/rkt { };
 
   rofi = callPackage ../applications/misc/rofi {

From c37c8e1c0017aeffdf1084948ea2bc846b42bf25 Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Tue, 5 Jan 2016 16:28:15 +0200
Subject: [PATCH 0046/2285] ycmd: Init at 2016-01-12

---
 pkgs/development/tools/misc/ycmd/default.nix | 37 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 pkgs/top-level/python-packages.nix           | 15 ++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/tools/misc/ycmd/default.nix

diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
new file mode 100644
index 000000000000..029e76e0c996
--- /dev/null
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchgit, cmake, python, llvmPackages, boost, pythonPackages, buildPythonPackage, makeWrapper
+}:
+
+stdenv.mkDerivation rec {
+  name = "ycmd-2016-01-12";
+
+  src = fetchgit {
+    url = "git://github.com/Valloric/ycmd.git";
+    rev = "f982f6251c5ff85e3abe6e862aad8bcd19e85ece";
+    sha256 = "1qp3ip6ab34610rfy0x85xsjg7blfkiy025vskwk9zw6gqglf3b3";
+  };
+
+  buildInputs = [ python cmake llvmPackages.clang boost makeWrapper ];
+
+  propagatedBuildInputs = with pythonPackages; [ waitress frozendict bottle ];
+
+  buildPhase = ''
+    python build.py --clang-completer --system-libclang --system-boost
+  '';
+
+  configurePhase = ":";
+
+  installPhase = with pythonPackages; ''
+    mkdir -p $out/lib/ycmd/third_party $out/bin
+    cp -r ycmd/ CORE_VERSION libclang.so.* ycm_client_support.so ycm_core.so $out/lib/ycmd/
+    wrapProgram $out/lib/ycmd/ycmd/__main__.py \
+      --prefix PYTHONPATH : "$(toPythonPath ${waitress}):$(toPythonPath ${frozendict}):$(toPythonPath ${bottle})"
+    ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd
+  '';
+
+  meta = {
+    description = "A code-completion and comprehension server";
+    homepage = "https://github.com/Valloric/ycmd";
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 57b0cc686ac8..e71f9fe77b22 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6070,6 +6070,8 @@ let
 
   yacc = bison;
 
+  ycmd = callPackage ../development/tools/misc/ycmd { };
+
   yodl = callPackage ../development/tools/misc/yodl { };
 
   winpdb = callPackage ../development/tools/winpdb { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1accefcfab6e..a51bb3198acf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4678,6 +4678,21 @@ in modules // {
     propagatedBuildInputs = with self; [ rpkg offtrac urlgrabber fedora_cert ];
   });
 
+  frozendict = buildPythonPackage rec {
+    name = "frozendict-0.5";
+  
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/f/frozendict/${name}.tar.gz";
+      sha256 = "0m4kg6hbadvf99if78nx01q7qnbyhdw3x4znl5dasgciyi54432n";
+    };
+  
+    meta = {
+      homepage = https://github.com/slezica/python-frozendict;
+      description = "An immutable dictionary";
+      license = stdenv.lib.licenses.mit;
+    };
+  };
+
   fudge = buildPythonPackage rec {
     name = "fudge-0.9.6";
     src = pkgs.fetchurl {

From 6309f4813717e426084c127c5659aad7a66cf8b0 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Fri, 15 Jan 2016 13:11:08 +0000
Subject: [PATCH 0047/2285] rkt: 0.14.0 -> 0.15.0

---
 nixos/modules/virtualisation/rkt.nix           |  2 ++
 .../virtualization/rkt/default.nix             | 18 ++++++++++++------
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/virtualisation/rkt.nix b/nixos/modules/virtualisation/rkt.nix
index 7b4d46e0749e..c4c5cb3380e8 100644
--- a/nixos/modules/virtualisation/rkt.nix
+++ b/nixos/modules/virtualisation/rkt.nix
@@ -58,5 +58,7 @@ in
         ExecStart = "${pkgs.rkt}/bin/rkt gc ${cfg.gc.options}";
       };
     };
+
+    users.extraGroups.rkt = {};
   };
 }
diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index abdbb46bc5b1..43228b255a24 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, lib, autoconf, automake, go, file, git, wget, gnupg1, squashfsTools, cpio
-, fetchurl, fetchFromGitHub }:
+{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg1, squashfsTools,
+  cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper }:
 
 let
   coreosImageRelease = "794.1.0";
   coreosImageSystemdVersion = "222";
 
   # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor.
-  stage1Flavours = [ "coreos" "fly" ];
+  stage1Flavours = [ "coreos" "fly" "host" ];
 
 in stdenv.mkDerivation rec {
-  version = "0.14.0";
+  version = "0.15.0";
   name = "rkt-${version}";
   BUILDDIR="build-${name}";
 
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
       rev = "v${version}";
       owner = "coreos";
       repo = "rkt";
-      sha256 = "0dmgs9s40xhan2rh9f5n0k5gv8p2dn946zffq02sq35qqvi67s71";
+      sha256 = "1pw14r38p8sdkma37xx0yy3zx5yxqc12zj35anmlbmrgw4vdgavf";
   };
 
   stage1BaseImage = fetchurl {
@@ -25,7 +25,10 @@ in stdenv.mkDerivation rec {
     sha256 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym";
   };
 
-  buildInputs = [ autoconf automake go file git wget gnupg1 squashfsTools cpio ];
+  buildInputs = [
+    autoreconfHook go file git wget gnupg1 squashfsTools cpio acl systemd
+    makeWrapper
+  ];
 
   preConfigure = ''
     ./autogen.sh
@@ -45,6 +48,9 @@ in stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     cp -Rv $BUILDDIR/bin/* $out/bin
+    wrapProgram $out/bin/rkt \
+      --prefix LD_LIBRARY_PATH : ${systemd}/lib \
+      --prefix PATH : ${iptables}/bin
   '';
 
   meta = with lib; {

From dbd3a5ff20d446c134740a9e8d98bc1a0cf7f9b4 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 10 Jan 2016 11:07:15 +0100
Subject: [PATCH 0048/2285] qutebrowser: use correct plugin versions

Since PyQt uses Qt 5.5, we need to use the Qt plugins from 5.5 as well,
and gstreamer plugins from 1.0.
---
 .../networking/browsers/qutebrowser/default.nix        | 10 ++++++----
 pkgs/top-level/all-packages.nix                        |  3 ++-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index c1c7a1297ce2..957ba9885788 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, python, buildPythonPackage, qtmultimedia, pyqt5
-, jinja2, pygments, pyyaml, pypeg2, gst_plugins_base, gst_plugins_good
-, gst_ffmpeg }:
+, jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good
+, gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking }:
 
 let version = "0.4.1"; in
 
@@ -17,13 +17,15 @@ buildPythonPackage {
   # Needs tox
   doCheck = false;
 
+  buildInputs = [ wrapGAppsHook
+    gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav
+    glib_networking ];
+
   propagatedBuildInputs = [
     python pyyaml pyqt5 jinja2 pygments pypeg2
   ];
 
   makeWrapperArgs = ''
-    --prefix GST_PLUGIN_PATH : "${stdenv.lib.makeSearchPath "lib/gstreamer-0.10"
-       [ gst_plugins_base gst_plugins_good gst_ffmpeg ]}"
     --prefix QT_PLUGIN_PATH : "${qtmultimedia}/lib/qt5/plugins"
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85780ec218b1..009bb39761e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12974,8 +12974,9 @@ let
     gst_plugins_bad = null;
   };
 
-  qutebrowser = qt5.callPackage ../applications/networking/browsers/qutebrowser {
+  qutebrowser = qt55.callPackage ../applications/networking/browsers/qutebrowser {
     inherit (python34Packages) buildPythonPackage python pyqt5 jinja2 pygments pyyaml pypeg2;
+    inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav;
   };
 
   rabbitvcs = callPackage ../applications/version-management/rabbitvcs {};

From 23b3e6430ebb6f69b91d699b705a66cbecd14e41 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 10 Jan 2016 12:04:16 +0100
Subject: [PATCH 0049/2285] qutebrowser: 0.4.1 -> 0.5.0

Fixes #8568 by using the release tarballs.
---
 .../networking/browsers/qutebrowser/default.nix     | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 957ba9885788..1d53ea2aceb3 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -1,17 +1,16 @@
-{ stdenv, fetchgit, python, buildPythonPackage, qtmultimedia, pyqt5
+{ stdenv, fetchurl, python, buildPythonPackage, qtmultimedia, pyqt5
 , jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good
 , gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking }:
 
-let version = "0.4.1"; in
+let version = "0.5.0"; in
 
-buildPythonPackage {
+buildPythonPackage rec {
   name = "qutebrowser-${version}";
   namePrefix = "";
 
-  src = fetchgit {
-    url = "https://github.com/The-Compiler/qutebrowser.git";
-    rev = "8d9e9851f1dcff5deb6363586ad0f1edec040b72";
-    sha256 = "1qsdad10swnk14qw4pfyvb94y6valhkscyvl46zbxxs7ck6llsm2";
+  src = fetchurl {
+    url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz";
+    sha256 = "16cyw0jg6qg9ksr6xwgnkm1a2bwgii2s35nrgk3g705ywfsf02j7";
   };
 
   # Needs tox

From 6a24c20744212d6142a1900502ec7a1f8337f087 Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Fri, 15 Jan 2016 15:15:59 +0100
Subject: [PATCH 0050/2285] ricochet: add desktop file, cleanups

closes #11979, #11974
---
 .../instant-messengers/ricochet/default.nix   | 32 +++++++++++++------
 pkgs/top-level/go-packages.nix                |  5 +--
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
index 58f2789679d6..89487e5bf27e 100644
--- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
@@ -1,6 +1,5 @@
-{ stdenv, fetchurl, pkgconfig
-, qtbase, qttools, makeQtWrapper
-, qtmultimedia, qtquick1, qtquickcontrols
+{ stdenv, fetchurl, pkgconfig, makeDesktopItem, unzip
+, qtbase, qttools, makeQtWrapper, qtmultimedia, qtquick1, qtquickcontrols
 , openssl, protobuf
 }:
 
@@ -13,11 +12,20 @@ stdenv.mkDerivation rec {
     sha256 = "0y79igzgl9xn00981zcyxdlks7vnqxhb4rq3x8gwxm0yr98p39ms";
   };
 
-  buildInputs =
-    [
-      qtbase qttools qtmultimedia qtquick1 qtquickcontrols
-      openssl protobuf
-    ];
+  desktopItem = makeDesktopItem {
+    name = "ricochet";
+    exec = "ricochet";
+    icon = "ricochet";
+    desktopName = "Ricochet";
+    genericName = "Ricochet";
+    comment = meta.description;
+    categories = "Office;Email;";
+  };
+
+  buildInputs = [
+    qtbase qttools qtmultimedia qtquick1 qtquickcontrols
+    openssl protobuf
+  ];
 
   nativeBuildInputs = [ pkgconfig makeQtWrapper ];
 
@@ -33,12 +41,18 @@ stdenv.mkDerivation rec {
     mkdir -p $out/bin
     cp ricochet $out/bin
     wrapQtProgram $out/bin/ricochet
+
+    mkdir -p $out/share/applications
+    cp $desktopItem/share/applications"/"* $out/share/applications
+
+    mkdir -p $out/share/pixmaps
+    cp icons/ricochet.png $out/share/pixmaps/ricochet.png
   '';
 
   meta = with stdenv.lib; {
     description = "Anonymous peer-to-peer instant messaging";
     homepage = "https://ricochet.im";
     license = licenses.bsd3;
-    maintainers = [ maintainers.codsl ];
+    maintainers = [ maintainers.codsl maintainers.jgillich ];
   };
 }
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index a2d112b922cc..f363dea9db47 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3362,10 +3362,11 @@ let
   };
 
   xmpp-client = buildFromGitHub {
-    rev      = "dc9d6be127f7c044ca0d56e5681c717a440ac177";
+    rev      = "525bd26cf5f56ec5aee99464714fd1d019c119ff";
+    date     = "2016-01-10";
     owner    = "agl";
     repo     = "xmpp-client";
-    sha256   = "1zxh88mfzvq7fzf0536qy8kpcl82nw4jwrvyb9z6lhwk05gmi3vi";
+    sha256   = "0a1r08zs723ikcskmn6ylkdi3frcd0i0lkx30i9q39ilf734v253";
     disabled = isGo14;
     buildInputs = [ crypto net ];
 

From e8980608c6c404fb4d41aff589d4e4a9a4a6287b Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 15 Jan 2016 19:55:40 +0100
Subject: [PATCH 0051/2285] glib-networking: 2.44.0 -> 2.46.1

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

diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index a17b7a21409b..6bb3c8c1e5a2 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/pkgs/development/libraries/glib-networking/default.nix
@@ -2,15 +2,15 @@
 , gsettings_desktop_schemas }:
 
 let
-  ver_maj = "2.44";
-  ver_min = "0";
+  ver_maj = "2.46";
+  ver_min = "1";
 in
 stdenv.mkDerivation rec {
   name = "glib-networking-${ver_maj}.${ver_min}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/glib-networking/${ver_maj}/${name}.tar.xz";
-    sha256 = "8f8a340d3ba99bfdef38b653da929652ea6640e27969d29f7ac51fbbe11a4346";
+    sha256 = "1cchmi08jpjypgmm9i7xzh5qfg2q5k61kry9ns8mhw3z44a440ym";
   };
 
   configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";

From c7e48a3eb8bea1feaa71fc70a6daa0a2e6bcfd71 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 15 Jan 2016 19:56:12 +0100
Subject: [PATCH 0052/2285] libsoup: 2.50.0 -> 2.52.2

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

diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
index f71cc77321a5..3d10e6135055 100644
--- a/pkgs/development/libraries/libsoup/default.nix
+++ b/pkgs/development/libraries/libsoup/default.nix
@@ -3,15 +3,15 @@
 , libintlOrEmpty
 , intltool, python }:
 let
-  majorVersion = "2.50";
-  version = "${majorVersion}.0";
+  majorVersion = "2.52";
+  version = "${majorVersion}.2";
 in
 stdenv.mkDerivation {
   name = "libsoup-${version}";
 
   src = fetchurl {
     url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz";
-    sha256 = "1e01365ac4af3817187ea847f9d3588c27eee01fc519a5a7cb212bb78b0f667b";
+    sha256 = "1p4k40y2gikr6m8p3hm0vswdzj2pj133dckipd2jk5bxbj5n4mfv";
   };
 
   patchPhase = ''
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
   passthru.propagatedUserEnvPackages = [ glib_networking ];
 
   # glib_networking is a runtime dependency, not a compile-time dependency
-  configureFlags = "--disable-tls-check" + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome";
+  configureFlags = "--disable-tls-check --enable-vala=no" + stdenv.lib.optionalString (!gnomeSupport) " --without-gnome";
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-lintl";
 

From 6115684b73e55f196ad8d58c755851ffd96d0697 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Sat, 16 Jan 2016 18:35:35 +0100
Subject: [PATCH 0053/2285] Avoid CamelCase in filenames and add buildEclipse

---
 .../editors/eclipse/{buildEclipse.nix => build-eclipse.nix} | 0
 pkgs/applications/editors/eclipse/default.nix               | 6 ++----
 2 files changed, 2 insertions(+), 4 deletions(-)
 rename pkgs/applications/editors/eclipse/{buildEclipse.nix => build-eclipse.nix} (100%)

diff --git a/pkgs/applications/editors/eclipse/buildEclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix
similarity index 100%
rename from pkgs/applications/editors/eclipse/buildEclipse.nix
rename to pkgs/applications/editors/eclipse/build-eclipse.nix
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 3dc28fce6b4f..3fed254d6e92 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -8,11 +8,9 @@
 
 assert stdenv ? glibc;
 
-let
+rec {
 
-  buildEclipse = import ./buildEclipse.nix args;
-
-in {
+  buildEclipse = import ./build-eclipse.nix args;
 
   eclipse_sdk_35 = buildEclipse {
     name = "eclipse-sdk-3.5.2";

From 18b64f05c9e4637bbbb516d759da333e2721c6a6 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 Jan 2016 19:07:21 +0300
Subject: [PATCH 0054/2285] ijs: 9.16 -> 9.18

---
 pkgs/development/libraries/ijs/default.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/ijs/default.nix b/pkgs/development/libraries/ijs/default.nix
index fbba11c10c93..0c7d412fee65 100644
--- a/pkgs/development/libraries/ijs/default.nix
+++ b/pkgs/development/libraries/ijs/default.nix
@@ -1,16 +1,25 @@
-{ stdenv, fetchurl, autoreconfHook }:
+{ stdenv, fetchurl, fetchpatch, autoreconfHook }:
 
-let version = "9.16";
+let version = "9.18";
 in
 stdenv.mkDerivation {
   name = "ijs-${version}";
 
   src = fetchurl {
     url = "http://downloads.ghostscript.com/public/ghostscript-${version}.tar.bz2";
-    sha256 = "0vdqbjkickb0109lk6397bb2zjmg1s46dac5p5j4gfxa4pwl8b9y";
+    sha256 = "18ad90za28dxybajqwf3y3dld87cgkx1ljllmcnc7ysspfxzbnl3";
   };
 
-  prePatch = "cd ijs";
+  patches = [
+    # http://bugs.ghostscript.com/show_bug.cgi?id=696246
+    (fetchpatch {
+      name = "devijs-account-for-device-subclassing.patch";
+      url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=b68e05c3";
+      sha256 = "1c3fzfjzvf15z533vpw3l3da8wcxw98qi3p1lc6lf13940a57c7n";
+    })
+  ];
+
+  postPatch = "cd ijs";
 
   enableParallelBuilding = true;
 

From 1967f19f7db4029120b2df3e0ec5bc30e5144598 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 Jan 2016 19:07:42 +0300
Subject: [PATCH 0055/2285] qpdf: 5.1.3 -> 6.0.0

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

diff --git a/pkgs/development/libraries/qpdf/default.nix b/pkgs/development/libraries/qpdf/default.nix
index 340f4558f819..8f886421d55b 100644
--- a/pkgs/development/libraries/qpdf/default.nix
+++ b/pkgs/development/libraries/qpdf/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pcre, zlib, perl }:
 
-let version = "5.1.3";
+let version = "6.0.0";
 in
 stdenv.mkDerivation rec {
   name = "qpdf-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/qpdf/qpdf/${version}/${name}.tar.gz";
-    sha256 = "1lq1v7xghvl6p4hgrwbps3a13ad6lh4ib3myimb83hxgsgd4n5nm";
+    sha256 = "0csj2p2gkxrc0rk8ykymlsdgfas96vzf1dip3y1x7z1q9plwgzd9";
   };
 
   nativeBuildInputs = [ perl ];
@@ -23,6 +23,7 @@ stdenv.mkDerivation rec {
   '';
 
   doCheck = true;
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     homepage = http://qpdf.sourceforge.net/; 

From 35e1f4954555f465fb4499880dcb6a68417fb959 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 Jan 2016 19:46:41 +0300
Subject: [PATCH 0056/2285] cups: 2.0.4 -> 2.1.2

Also enable parallel building and don't install rc.d scripts.
---
 pkgs/misc/cups/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 8fa111ecc023..7dedf26096df 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -3,7 +3,7 @@
 , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
 }:
 
-let version = "2.0.4"; in
+let version = "2.1.2"; in
 
 with stdenv.lib;
 stdenv.mkDerivation {
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2";
-    sha256 = "1gaakz24k6x5nc09rmpiq0xq20j1qdjc3szag8qwmyi4ky6ydmg1";
+    sha256 = "1bc1y8fjgh54ryh520gk63i5rbagn6jijsrskcqlibhfm0xwmc5s";
   };
 
   buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls libpaper ]
@@ -51,7 +51,6 @@ stdenv.mkDerivation {
       # Idem for /etc.
       "PAMDIR=$(out)/etc/pam.d"
       "DBUSDIR=$(out)/etc/dbus-1"
-      "INITDIR=$(out)/etc/rc.d"
       "XINETD=$(out)/etc/xinetd.d"
       "SERVERROOT=$(out)/etc/cups"
       # Idem for /usr.
@@ -61,6 +60,8 @@ stdenv.mkDerivation {
       "CUPS_PRIMARY_SYSTEM_GROUP=root"
     ];
 
+  enableParallelBuilding = true;
+
   postInstall = ''
       # Delete obsolete stuff that conflicts with cups-filters.
       rm -rf $out/share/cups/banners $out/share/cups/data/testprint

From a814e243b5f330267e779b6f037791da49f8d0e5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 Jan 2016 19:47:07 +0300
Subject: [PATCH 0057/2285] ghostscript: 9.15 -> 9.18

---
 pkgs/misc/ghostscript/CVE-2015-3228.patch | 20 ---------
 pkgs/misc/ghostscript/default.nix         | 50 ++++++++++++++++++-----
 2 files changed, 40 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/misc/ghostscript/CVE-2015-3228.patch

diff --git a/pkgs/misc/ghostscript/CVE-2015-3228.patch b/pkgs/misc/ghostscript/CVE-2015-3228.patch
deleted file mode 100644
index 7be18b0a7302..000000000000
--- a/pkgs/misc/ghostscript/CVE-2015-3228.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Sanity check for memory allocation.
- In gs_heap_alloc_bytes(), add a sanity check to ensure we don't overflow the
- variable holding the actual number of bytes we allocate.
-Origin: upstream, http://git.ghostscript.com/?p=ghostpdl.git;a=commit;h=0c0b085
-Author: Chris Liddell <chris.liddell@artifex.com>
-Forwarded: yes
-Bug-Debian: http://bugs.debian.org/793489
-Last-Update: 2015-07-26
-
---- a/base/gsmalloc.c
-+++ b/base/gsmalloc.c
-@@ -178,7 +178,7 @@
-     } else {
-         uint added = size + sizeof(gs_malloc_block_t);
- 
--        if (mmem->limit - added < mmem->used)
-+        if (added <= size || mmem->limit - added < mmem->used)
-             set_msg("exceeded limit");
-         else if ((ptr = (byte *) Memento_label(malloc(added), cname)) == 0)
-             set_msg("failed");
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 53b5caf93122..658fa346f1ea 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, zlib, expat, openssl
+{ stdenv, fetchurl, fetchpatch, pkgconfig, zlib, expat, openssl, autoconf
 , libjpeg, libpng, libtiff, freetype, fontconfig, lcms2, libpaper, jbig2dec
-, libiconv
+, libiconv, ijs
 , x11Support ? false, xlibsWrapper ? null
 , cupsSupport ? false, cups ? null
 }:
@@ -8,8 +8,8 @@
 assert x11Support -> xlibsWrapper != null;
 assert cupsSupport -> cups != null;
 let
-  version = "9.15";
-  sha256 = "0p1isp6ssfay141klirn7n9s8b546vcz6paksfmksbwy0ljsypg6";
+  version = "9.18";
+  sha256 = "18ad90za28dxybajqwf3y3dld87cgkx1ljllmcnc7ysspfxzbnl3";
 
   fonts = stdenv.mkDerivation {
     name = "ghostscript-fonts";
@@ -45,28 +45,58 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  nativeBuildInputs = [ pkgconfig autoconf ];
   buildInputs =
-    [ pkgconfig zlib expat openssl
+    [ zlib expat openssl
       libjpeg libpng libtiff freetype fontconfig lcms2 libpaper jbig2dec
-      libiconv
+      libiconv ijs
     ]
     ++ stdenv.lib.optional x11Support xlibsWrapper
     ++ stdenv.lib.optional cupsSupport cups
-    # [] # maybe sometimes jpeg2000 support
     ;
 
   patches = [
     ./urw-font-files.patch
-    # fetched from debian's ghostscript 9.15_dfsg-1 (called 020150707~0c0b085.patch there)
-    ./CVE-2015-3228.patch
+    # http://bugs.ghostscript.com/show_bug.cgi?id=696281
+    (fetchpatch {
+      name = "fix-check-for-using-shared-freetype-lib.patch";
+      url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=8f5d285";
+      sha256 = "1f0k043rng7f0rfl9hhb89qzvvksqmkrikmm38p61yfx51l325xr";
+    })
+    # http://bugs.ghostscript.com/show_bug.cgi?id=696301
+    (fetchpatch {
+      name = "add-gserrors.h-to-the-installed-files.patch";
+      url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=feafe5e5";
+      sha256 = "0s4ayzakjv809dkn7vilxwvs4dw35p3pw942ml91bk9z4kkaxyz7";
+    })
+    # http://bugs.ghostscript.com/show_bug.cgi?id=696246
+    (fetchpatch {
+      name = "guard-against-NULL-base-for-non-clist-devices.patch";
+      url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=007bd77d08d800e6b07274d62e3c91be7c4a3f47";
+      sha256 = "1la53273agl92lpy7qd0qhgzynx8b90hrk8g9jsj3055ssn6rqwh";
+    })
+    (fetchpatch {
+      name = "ensure-plib-devices-always-use-the-clist.patch";
+      url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1bdbe4f87dc57648821e613ebcc591b84e8b35b3";
+      sha256 = "1cq83fgyvrycapxm69v4r9f9qhzsr40ygrc3bkp8pk15wsmvq0k7";
+    })
+    (fetchpatch {
+      name = "prevent-rinkj-device-crash-when-misconfigured.patch";
+      url = "http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=5571ddfa377c5d7d98f55af40e693814ac287ae4";
+      sha256 = "08iqdlrngi6k0ml2b71dj5q136fyp1s9g0rr87ayyshn0k0lxwkv";
+    })
   ];
 
   makeFlags = [ "cups_serverroot=$(out)" "cups_serverbin=$(out)/lib/cups" ];
 
   preConfigure = ''
-    rm -rf jpeg libpng zlib jasper expat tiff lcms{,2} jbig2dec openjpeg freetype cups/libs
+    # requires in-tree (heavily patched) openjpeg
+    rm -rf jpeg libpng zlib jasper expat tiff lcms{,2} jbig2dec freetype cups/libs ijs
 
     sed "s@if ( test -f \$(INCLUDE)[^ ]* )@if ( true )@; s@INCLUDE=/usr/include@INCLUDE=/no-such-path@" -i base/unix-aux.mak
+    sed "s@^ZLIBDIR=.*@ZLIBDIR=${zlib}/include@" -i configure.ac
+
+    autoconf
   '';
 
   configureFlags =

From eaaf988d4552703be38c8acd2597ddf5eae2b181 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 Jan 2016 19:07:59 +0300
Subject: [PATCH 0058/2285] cups_filters: 1.0.71 -> 1.5.0

Also wrap filters adding necessary utils to PATH and enable parallel building.
---
 pkgs/misc/cups/filters.nix             | 35 +++++++++++++-------------
 pkgs/misc/cups/longer-shell-path.patch | 13 ----------
 2 files changed, 18 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/misc/cups/longer-shell-path.patch

diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix
index b4b3a5a06247..7118511f16d3 100644
--- a/pkgs/misc/cups/filters.nix
+++ b/pkgs/misc/cups/filters.nix
@@ -1,26 +1,24 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, cups, poppler, poppler_utils, fontconfig
-, libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash, avahi }:
+{ stdenv, fetchurl, pkgconfig, cups, poppler, poppler_utils, fontconfig
+, libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash, avahi
+, makeWrapper, coreutils, gnused, bc, gawk, gnugrep, which
+}:
 
-stdenv.mkDerivation rec {
+let
+  binPath = stdenv.lib.makeSearchPath "bin" [ coreutils gnused bc gawk gnugrep which ];
+
+in stdenv.mkDerivation rec {
   name = "cups-filters-${version}";
-  version = "1.0.71";
+  version = "1.5.0";
 
   src = fetchurl {
     url = "http://openprinting.org/download/cups-filters/${name}.tar.xz";
-    sha256 = "07wwlqcykfjfqcwj1bxk60ggahyaw7wcx32n5s104d1qkhham01i";
+    sha256 = "0cjrh4wpdhkvmahfkg8f2a2qzilcq12i78q5arwr7dnmx1j8hapj";
   };
 
-  patches = [
-    ./longer-shell-path.patch
-    (fetchpatch { # drop on update
-      name = "poppler-0.34.patch";
-      url = "https://bugs.linuxfoundation.org/attachment.cgi?id=493";
-      sha256 = "18za83q0b0n4hpvvw76jsv0hm89zmijvps2z5kg1srickqlxj891";
-    })
-  ];
+  nativeBuildInputs = [ pkgconfig makeWrapper ];
 
   buildInputs = [
-    pkgconfig cups poppler poppler_utils fontconfig libjpeg libpng perl
+    cups poppler poppler_utils fontconfig libjpeg libpng perl
     ijs qpdf dbus avahi
   ];
 
@@ -29,9 +27,10 @@ stdenv.mkDerivation rec {
     "--enable-imagefilters"
     "--with-rcdir=no"
     "--with-shell=${stdenv.shell}"
+    "--with-test-font-path=/path-does-not-exist"
   ];
 
-  makeFlags = "CUPS_SERVERBIN=$(out)/lib/cups CUPS_DATADIR=$(out)/share/cups CUPS_SERVERROOT=$(out)/etc/cups";
+  makeFlags = [ "CUPS_SERVERBIN=$(out)/lib/cups" "CUPS_DATADIR=$(out)/share/cups" "CUPS_SERVERROOT=$(out)/etc/cups" ];
 
   postConfigure =
     ''
@@ -46,11 +45,13 @@ stdenv.mkDerivation rec {
 
   postInstall =
     ''
-      for i in $out/lib/cups/filter/{pstopdf,texttops,imagetops}; do
-        substituteInPlace $i --replace 'which ' 'type -p '
+      for i in $out/lib/cups/filter/*; do
+        wrapProgram "$i" --prefix PATH ':' ${binPath}
       done
     '';
 
+  enableParallelBuilding = true;
+
   meta = {
     homepage = http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters;
     description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc";
diff --git a/pkgs/misc/cups/longer-shell-path.patch b/pkgs/misc/cups/longer-shell-path.patch
deleted file mode 100644
index 397cc681732b..000000000000
--- a/pkgs/misc/cups/longer-shell-path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/filter/foomatic-rip/foomaticrip.c b/filter/foomatic-rip/foomaticrip.c
-index 90a851c..689a2bd 100644
---- a/filter/foomatic-rip/foomaticrip.c
-+++ b/filter/foomatic-rip/foomaticrip.c
-@@ -174,7 +174,7 @@ char cupsfilterpath[PATH_MAX] = "/usr/local/lib/cups/filter:"
-                                 "/opt/cups/filter:"
-                                 "/usr/lib/cups/filter";
-
--char modern_shell[64] = SHELL;
-+char modern_shell[] = SHELL;
-
- void config_set_option(const char *key, const char *value)
- {

From d34a72dfba19e6db6f70023b92544b54e88b81f4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 Jan 2016 20:48:28 +0300
Subject: [PATCH 0059/2285] libspectre: fix for ghostscript 9.18

---
 .../libraries/libspectre/default.nix          |  2 +
 .../libspectre/libspectre-0.2.7-gs918.patch   | 42 +++++++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/libraries/libspectre/libspectre-0.2.7-gs918.patch

diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix
index 0e5f976c1224..5c10fff50ad3 100644
--- a/pkgs/development/libraries/libspectre/default.nix
+++ b/pkgs/development/libraries/libspectre/default.nix
@@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1v63lqc6bhhxwkpa43qmz8phqs8ci4dhzizyy16d3vkb20m846z8";
   };
 
+  patches = [ ./libspectre-0.2.7-gs918.patch ];
+
   buildInputs = [
     # Need `libgs.so'.
     pkgconfig ghostscript cairo /*for tests*/
diff --git a/pkgs/development/libraries/libspectre/libspectre-0.2.7-gs918.patch b/pkgs/development/libraries/libspectre/libspectre-0.2.7-gs918.patch
new file mode 100644
index 000000000000..e9a4eda192ba
--- /dev/null
+++ b/pkgs/development/libraries/libspectre/libspectre-0.2.7-gs918.patch
@@ -0,0 +1,42 @@
+Fixed error namespace for >=ghostscript-gpl-9.18
+
+https://bugs.gentoo.org/563540
+
+--- libspectre-0.2.7/libspectre/spectre-gs.c
++++ libspectre-0.2.7/libspectre/spectre-gs.c
+@@ -43,12 +43,12 @@
+ 	
+ 	if (code <= -100) {
+ 		switch (code) {
+-			case e_Fatal:
++			case gs_error_Fatal:
+ 				fprintf (stderr, "fatal internal error %d", code);
+ 				return TRUE;
+ 				break;
+ 
+-			case e_ExecStackUnderflow:
++			case gs_error_ExecStackUnderflow:
+ 				fprintf (stderr, "stack overflow %d", code);
+ 				return TRUE;
+ 				break;
+@@ -109,9 +109,9 @@
+ 		set = _spectre_strdup_printf ("%d %d translate\n", -x, -y);
+ 		error = gsapi_run_string_continue (ghostscript_instance, set, strlen (set),
+ 						   0, &exit_code);
+-		error = error == e_NeedInput ? 0 : error;
++		error = error == gs_error_NeedInput ? 0 : error;
+ 		free (set);
+-		if (error != e_NeedInput && critic_error_code (error)) {
++		if (error != gs_error_NeedInput && critic_error_code (error)) {
+ 			fclose (fd);
+ 			return FALSE;
+ 		}
+@@ -126,7 +126,7 @@
+ 		read = fread (buf, sizeof (char), to_read, fd);
+ 		error = gsapi_run_string_continue (ghostscript_instance,
+ 						   buf, read, 0, &exit_code);
+-		error = error == e_NeedInput ? 0 : error;
++		error = error == gs_error_NeedInput ? 0 : error;
+ 		left -= read;
+ 	}
+ 	

From fbd3ad83e513e394698e71c0371ffc712a6da79f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 17 Jan 2016 03:28:58 +0300
Subject: [PATCH 0060/2285] gimp: enable parallel building

---
 pkgs/applications/graphics/gimp/2.8.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index 954a1d4c19c9..96d6dbd52857 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
 
   #configureFlags = [ "--disable-print" ];
 
+  enableParallelBuilding = true;
+
   # "screenshot" needs this.
   NIX_LDFLAGS = "-rpath ${xorg.libX11}/lib"
     + stdenv.lib.optionalString stdenv.isDarwin " -lintl";

From a8b3e686d0f1c4fe4a8836f7cbd79639fe34fede Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 17 Jan 2016 03:29:56 +0300
Subject: [PATCH 0061/2285] gutenprint: 5.2.10 -> 5.2.11

Rework gutenprint derivation:

* Convert to regular stdenv.mkDerivation;
* Enable IJS driver;
* Fix cups-genppdupdate;
* Move things around to the proper directories;
* Enable parallel building;
* Clean from old hacks.
---
 pkgs/misc/drivers/gutenprint/default.nix | 91 +++++++-----------------
 1 file changed, 27 insertions(+), 64 deletions(-)

diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix
index 98776c0c42b0..5be7f5ecff4d 100644
--- a/pkgs/misc/drivers/gutenprint/default.nix
+++ b/pkgs/misc/drivers/gutenprint/default.nix
@@ -1,78 +1,41 @@
 # this package was called gimp-print in the past
-{ fetchurl, stdenv, pkgconfig, composableDerivation, cups
-, libtiff, libpng, makeWrapper, openssl, gimp }:
+{ stdenv, lib, fetchurl, pkgconfig
+, ijs, makeWrapper
+, gimp2Support ? true, gimp
+, cupsSupport ? true, cups, libusb, perl
+}:
 
-let
-   version = "5.2.10";
-   inherit (composableDerivation) edf wwf;
-in
-
-composableDerivation.composableDerivation {} {
-  name = "gutenprint-${version}";
+stdenv.mkDerivation rec {
+  name = "gutenprint-5.2.11";
 
   src = fetchurl {
-    url = "mirror://sourceforge/gimp-print/gutenprint-${version}.tar.bz2";
-    sha256 = "0n8f6vpadnagrp6yib3mca1c3lgwl4vmma16s44riyrd84mka7s3";
+    url = "mirror://sourceforge/gimp-print/${name}.tar.bz2";
+    sha256 = "1yadw96rgp1z0jv1wxrz6cds36nb693w3xlv596xw9r5w394r8y1";
   };
 
-  # gimp, gui is still not working (TODO)
-  buildInputs = [ makeWrapper openssl pkgconfig ];
+  nativeBuildInputs = [ makeWrapper pkgconfig ];
+  buildInputs =
+    [ ijs ]
+    ++ lib.optionals gimp2Support [ gimp.gtk gimp ]
+    ++ lib.optionals cupsSupport [ cups libusb perl ];
 
-  configureFlags = ["--enable-static-genppd"];
-  NIX_CFLAGS_COMPILE="-include stdio.h";
-  
-  #preConfigure = ''
-  #  configureFlags="--with-cups=$out/usr-cups $configureFlags"
-  #'';
-  
-  /*
-     is this recommended? without it this warning is printed:
+  configureFlags = lib.optionals cupsSupport [
+    "--disable-static-genppd" # should be harmless on NixOS
+  ];
 
-            ***WARNING: Use of --disable-static-genppd or --disable-static
-                        when building CUPS is very dangerous.  The build may
-                        fail when building the PPD files, or may *SILENTLY*
-                        build incorrect PPD files or cause other problems.
-                        Please review the README and release notes carefully!
-  */
+  enableParallelBuilding = true;
 
-  installPhase = ''
-    eval "make install $installArgs"
-    mkdir -p $out/lib/cups
-    ln -s $out/filter $out/lib/cups/
-    wrapProgram $out/filter/rastertogutenprint.5.2 --prefix LD_LIBRARY_PATH : $out/lib
-    wrapProgram $out/sbin/cups-genppd.5.2 --prefix LD_LIBRARY_PATH : $out/lib
-  '';
+  # Testing is very, very long.
+  # doCheck = true;
 
-  meta = { 
+  installFlags =
+    lib.optionals cupsSupport [ "cups_conf_datadir=$(out)/share/cups" "cups_conf_serverbin=$(out)/lib/cups" "cups_conf_serverroot=$(out)/etc/cups" ]
+    ++ lib.optionals gimp2Support [ "gimp2_plug_indir=$(out)/${gimp.name}-plugins" ];
+
+  meta = with stdenv.lib; {
     description = "Ghostscript and cups printer drivers";
     homepage = http://sourceforge.net/projects/gimp-print/;
-    license = "GPL";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
   };
-
-  mergeAttrBy = { installArgs = stdenv.lib.concat; };
-
-  # most interpreters aren't tested yet.. (see python for example how to do it)
-  flags =
-      wwf {
-        name = "gimp2";
-        enable = {
-          buildInputs = [gimp gimp.gtk];
-          installArgs = [ "gimp2_plug_indir=$out/${gimp.name}-plugins" ];
-        };
-      }
-      // {
-        cups = {
-          set = {
-           buildInputs = [cups libtiff libpng ];
-           installArgs = [ "cups_conf_datadir=$out cups_conf_serverbin=$out cups_conf_serverroot=$out"];
-          };
-        };
-      }
-    ;
-
-  cfg = {
-    gimp2Support = true;
-    cupsSupport = true;
-  };
-
 }

From 06865208e8516099c5ae54cfcd0c0be24ac9d0b9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 17 Jan 2016 03:34:39 +0300
Subject: [PATCH 0062/2285] cupsd service: use cups-pk-helper is policykit is
 enabled

---
 nixos/modules/services/printing/cupsd.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 0fe25b66da08..6f5df23f3427 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -4,10 +4,13 @@ with lib;
 
 let
 
-  inherit (pkgs) cups cups_filters;
+  inherit (pkgs) cups cups-pk-helper cups_filters;
 
   cfg = config.services.printing;
 
+  avahiEnabled = config.services.avahi.enable;
+  polkitEnabled = config.security.polkit.enable;
+
   additionalBackends = pkgs.runCommand "additional-cups-backends" { }
     ''
       mkdir -p $out
@@ -204,7 +207,7 @@ in
         description = "CUPS printing services";
       };
 
-    environment.systemPackages = [ cups ];
+    environment.systemPackages = [ cups ] ++ optional polkitEnabled cups-pk-helper;
 
     environment.etc."cups/client.conf".text = cfg.clientConf;
     environment.etc."cups/cups-files.conf".text = cfg.cupsFilesConf;
@@ -212,7 +215,7 @@ in
     environment.etc."cups/cups-browsed.conf".text = cfg.browsedConf;
     environment.etc."cups/snmp.conf".text = cfg.snmpConf;
 
-    services.dbus.packages = [ cups ];
+    services.dbus.packages = [ cups ] ++ optional polkitEnabled cups-pk-helper;
 
     # Cups uses libusb to talk to printers, and does not use the
     # linux kernel driver. If the driver is not in a black list, it
@@ -242,7 +245,7 @@ in
           ];
       };
 
-    systemd.services.cups-browsed = mkIf config.services.avahi.enable
+    systemd.services.cups-browsed = mkIf avahiEnabled
       { description = "CUPS Remote Printer Discovery";
 
         wantedBy = [ "multi-user.target" ];

From 8377b4e5d6e008ba528e54d0760f0aea7707d087 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 17 Jan 2016 03:38:52 +0300
Subject: [PATCH 0063/2285] cupsd service: move all default drivers to the
 bindir directly

---
 nixos/modules/services/printing/cupsd.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 6f5df23f3427..06de71316ecc 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -33,7 +33,9 @@ let
   # cupsd.conf tells cupsd to use this tree.
   bindir = pkgs.buildEnv {
     name = "cups-progs";
-    paths = cfg.drivers;
+    paths =
+      [ cups additionalBackends cups_filters pkgs.ghostscript ]
+      ++ cfg.drivers;
     pathsToLink = [ "/lib/cups" "/share/cups" "/bin" "/etc/cups" ];
     postBuild = cfg.bindirCmds;
     ignoreCollisions = true;
@@ -176,6 +178,7 @@ in
 
       drivers = mkOption {
         type = types.listOf types.path;
+        default = [];
         example = literalExample "[ pkgs.splix ]";
         description = ''
           CUPS drivers to use. Drivers provided by CUPS, cups-filters, Ghostscript
@@ -263,11 +266,6 @@ in
           ];
       };
 
-    services.printing.drivers =
-      [ cups pkgs.ghostscript pkgs.cups_filters additionalBackends
-        pkgs.perl pkgs.coreutils pkgs.gnused pkgs.bc pkgs.gawk pkgs.gnugrep
-      ];
-
     services.printing.cupsFilesConf =
       ''
         SystemGroup root wheel

From d93f866f55adb6831e054e717253ee94071240b0 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 17 Jan 2016 04:05:02 +0300
Subject: [PATCH 0064/2285] cupsd service: add gutenprint support

---
 nixos/modules/services/printing/cupsd.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 06de71316ecc..5964b62cc214 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -4,7 +4,7 @@ with lib;
 
 let
 
-  inherit (pkgs) cups cups-pk-helper cups_filters;
+  inherit (pkgs) cups cups-pk-helper cups_filters gutenprint;
 
   cfg = config.services.printing;
 
@@ -35,6 +35,7 @@ let
     name = "cups-progs";
     paths =
       [ cups additionalBackends cups_filters pkgs.ghostscript ]
+      ++ optional cfg.gutenprint gutenprint
       ++ cfg.drivers;
     pathsToLink = [ "/lib/cups" "/share/cups" "/bin" "/etc/cups" ];
     postBuild = cfg.bindirCmds;
@@ -176,6 +177,15 @@ in
         '';
       };
 
+      gutenprint = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Whether to enable Gutenprint drivers for CUPS. This includes auto-updating
+          Gutenprint PPD files.
+        '';
+      };
+
       drivers = mkOption {
         type = types.listOf types.path;
         default = [];
@@ -240,6 +250,9 @@ in
             mkdir -m 0700 -p /var/cache/cups
             mkdir -m 0700 -p /var/spool/cups
             mkdir -m 0755 -p ${cfg.tempDir}
+            ${optionalString cfg.gutenprint ''
+              ${gutenprint}/bin/cups-genppdupdate
+            ''}
           '';
 
         restartTriggers =

From c311901810ab8ddefd38d94e5f625212a86e1c6b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 17 Jan 2016 04:10:29 +0300
Subject: [PATCH 0065/2285] cupsd service: don't allow overriding necessary
 configuration options

---
 nixos/modules/rename.nix                  |   2 +
 nixos/modules/services/printing/cupsd.nix | 112 ++++++++++------------
 2 files changed, 55 insertions(+), 59 deletions(-)

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 010d44c40d19..cc7557c06eb4 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -99,6 +99,8 @@ with lib;
     (mkRemovedOptionModule [ "services" "syslog-ng" "listenToJournal" ])
     (mkRemovedOptionModule [ "ec2" "metadata" ])
     (mkRemovedOptionModule [ "services" "openvpn" "enable" ])
+    (mkRemovedOptionModule [ "services" "printing" "cupsFilesConf" ])
+    (mkRemovedOptionModule [ "services" "printing" "cupsdConf" ])
 
   ];
 }
diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 5964b62cc214..58d541dbcba6 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -42,6 +42,52 @@ let
     ignoreCollisions = true;
   };
 
+  writeConf = name: text: pkgs.writeTextFile {
+    inherit name text;
+    destination = "/etc/cups/${name}";
+  };
+
+  cupsFilesFile = writeConf "cups-files.conf" ''
+    SystemGroup root wheel
+
+    ServerBin ${bindir}/lib/cups
+    DataDir ${bindir}/share/cups
+
+    AccessLog syslog
+    ErrorLog syslog
+    PageLog syslog
+
+    TempDir ${cfg.tempDir}
+
+    # User and group used to run external programs, including
+    # those that actually send the job to the printer.  Note that
+    # Udev sets the group of printer devices to `lp', so we want
+    # these programs to run as `lp' as well.
+    User cups
+    Group lp
+
+    ${cfg.extraFilesConf}
+  '';
+
+  cupsdFile = writeConf "cupsd.conf" ''
+    ${concatMapStrings (addr: ''
+      Listen ${addr}
+    '') cfg.listenAddresses}
+    Listen /var/run/cups/cups.sock
+
+    SetEnv PATH ${bindir}/lib/cups/filter:${bindir}/bin
+
+    DefaultShared ${if cfg.defaultShared then "Yes" else "No"}
+
+    Browsing ${if cfg.browsing then "Yes" else "No"}
+
+    WebInterface ${if cfg.webInterface then "Yes" else "No"}
+
+    ${cfg.extraConf}
+  '';
+
+  browsedFile = writeConf "cups-browsed.conf" cfg.browsedConf;
+
 in
 
 {
@@ -102,25 +148,11 @@ in
         '';
       };
 
-      cupsdConf = mkOption {
-        type = types.lines;
-        default = "";
-        example =
-          ''
-            BrowsePoll cups.example.com
-            LogLevel debug
-          '';
-        description = ''
-          The contents of the configuration file of the CUPS daemon
-          (<filename>cupsd.conf</filename>).
-        '';
-      };
-
-      cupsFilesConf = mkOption {
+      extraFilesConf = mkOption {
         type = types.lines;
         default = "";
         description = ''
-          The contents of the configuration file of the CUPS daemon
+          Extra contents of the configuration file of the CUPS daemon
           (<filename>cups-files.conf</filename>).
         '';
       };
@@ -223,9 +255,9 @@ in
     environment.systemPackages = [ cups ] ++ optional polkitEnabled cups-pk-helper;
 
     environment.etc."cups/client.conf".text = cfg.clientConf;
-    environment.etc."cups/cups-files.conf".text = cfg.cupsFilesConf;
-    environment.etc."cups/cupsd.conf".text = cfg.cupsdConf;
-    environment.etc."cups/cups-browsed.conf".text = cfg.browsedConf;
+    environment.etc."cups/cups-files.conf".source = cupsFilesFile;
+    environment.etc."cups/cupsd.conf".source = cupsdFile;
+    environment.etc."cups/cups-browsed.conf".source = browsedFile;
     environment.etc."cups/snmp.conf".text = cfg.snmpConf;
 
     services.dbus.packages = [ cups ] ++ optional polkitEnabled cups-pk-helper;
@@ -274,49 +306,13 @@ in
 
         serviceConfig.ExecStart = "${cups_filters}/bin/cups-browsed";
 
-        restartTriggers =
-          [ config.environment.etc."cups/cups-browsed.conf".source
-          ];
+        restartTriggers = [ browsedFile ];
       };
 
-    services.printing.cupsFilesConf =
-      ''
-        SystemGroup root wheel
-
-        ServerBin ${bindir}/lib/cups
-        DataDir ${bindir}/share/cups
-
-        AccessLog syslog
-        ErrorLog syslog
-        PageLog syslog
-
-        TempDir ${cfg.tempDir}
-
-        # User and group used to run external programs, including
-        # those that actually send the job to the printer.  Note that
-        # Udev sets the group of printer devices to `lp', so we want
-        # these programs to run as `lp' as well.
-        User cups
-        Group lp
-      '';
-
-    services.printing.cupsdConf =
+    services.printing.extraConf =
       ''
         LogLevel info
 
-        ${concatMapStrings (addr: ''
-          Listen ${addr}
-        '') cfg.listenAddresses}
-        Listen /var/run/cups/cups.sock
-
-        SetEnv PATH ${bindir}/lib/cups/filter:${bindir}/bin:${bindir}/sbin
-
-        DefaultShared ${if cfg.defaultShared then "Yes" else "No"}
-
-        Browsing ${if cfg.browsing then "Yes" else "No"}
-
-        WebInterface ${if cfg.webInterface then "Yes" else "No"}
-
         DefaultAuthType Basic
 
         <Location />
@@ -357,8 +353,6 @@ in
             Order deny,allow
           </Limit>
         </Policy>
-
-        ${cfg.extraConf}
       '';
 
     security.pam.services.cups = {};

From 47017474fd75a75d747cdb5600b14b9203801984 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 17 Jan 2016 04:12:11 +0300
Subject: [PATCH 0066/2285] cupsd service: move root directory to /var/lib/cups

---
 nixos/modules/services/printing/cupsd.nix | 48 +++++++++++++++++------
 1 file changed, 35 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 58d541dbcba6..98fb33e3256c 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -37,7 +37,7 @@ let
       [ cups additionalBackends cups_filters pkgs.ghostscript ]
       ++ optional cfg.gutenprint gutenprint
       ++ cfg.drivers;
-    pathsToLink = [ "/lib/cups" "/share/cups" "/bin" "/etc/cups" ];
+    pathsToLink = [ "/lib/cups" "/share/cups" "/bin" ];
     postBuild = cfg.bindirCmds;
     ignoreCollisions = true;
   };
@@ -88,6 +88,20 @@ let
 
   browsedFile = writeConf "cups-browsed.conf" cfg.browsedConf;
 
+  rootdir = pkgs.buildEnv {
+    name = "cups-progs";
+    paths = [
+      cupsFilesFile
+      cupsdFile
+      (writeConf "client.conf" cfg.clientConf)
+      (writeConf "snmp.conf" cfg.snmpConf)
+    ] ++ optional avahiEnabled browsedFile
+      ++ optional cfg.gutenprint gutenprint
+      ++ cfg.drivers;
+    pathsToLink = [ "/etc/cups" ];
+    ignoreCollisions = true;
+  };
+
 in
 
 {
@@ -253,12 +267,7 @@ in
       };
 
     environment.systemPackages = [ cups ] ++ optional polkitEnabled cups-pk-helper;
-
-    environment.etc."cups/client.conf".text = cfg.clientConf;
-    environment.etc."cups/cups-files.conf".source = cupsFilesFile;
-    environment.etc."cups/cupsd.conf".source = cupsdFile;
-    environment.etc."cups/cups-browsed.conf".source = browsedFile;
-    environment.etc."cups/snmp.conf".text = cfg.snmpConf;
+    environment.etc."cups".source = "/var/lib/cups";
 
     services.dbus.packages = [ cups ] ++ optional polkitEnabled cups-pk-helper;
 
@@ -278,19 +287,32 @@ in
 
         preStart =
           ''
-            mkdir -m 0755 -p /etc/cups
             mkdir -m 0700 -p /var/cache/cups
             mkdir -m 0700 -p /var/spool/cups
             mkdir -m 0755 -p ${cfg.tempDir}
+
+            mkdir -m 0755 -p /var/lib/cups
+            # Backwards compatibility
+            if [ ! -L /etc/cups ]; then
+              mv /etc/cups/* /var/lib/cups
+              rmdir /etc/cups
+              ln -s /var/lib/cups /etc/cups
+            fi
+            # First, clean existing symlinks
+            if [ -n "$(ls /var/lib/cups)" ]; then
+              for i in /var/lib/cups/*; do
+                [ -L "$i" ] && rm "$i"
+              done
+            fi
+            # Then, populate it with static files
+            cd ${rootdir}/etc/cups
+            for i in *; do
+              [ ! -e "/var/lib/cups/$i" ] && ln -s "${rootdir}/etc/cups/$i" "/var/lib/cups/$i"
+            done
             ${optionalString cfg.gutenprint ''
               ${gutenprint}/bin/cups-genppdupdate
             ''}
           '';
-
-        restartTriggers =
-          [ config.environment.etc."cups/cups-files.conf".source
-            config.environment.etc."cups/cupsd.conf".source
-          ];
       };
 
     systemd.services.cups-browsed = mkIf avahiEnabled

From 03353ce6ff738acce3d535f6a414895751967a05 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 17 Jan 2016 14:54:28 +0300
Subject: [PATCH 0067/2285] system-config-printer: 1.3.12 -> 1 5.7

---
 .../misc/system-config-printer/default.nix    | 27 ++++++++++++++-----
 .../detect_serverbindir.patch                 | 17 ++++++++++++
 2 files changed, 38 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/tools/misc/system-config-printer/detect_serverbindir.patch

diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix
index 6b0be9d2f6e8..7ed25fb549b0 100644
--- a/pkgs/tools/misc/system-config-printer/default.nix
+++ b/pkgs/tools/misc/system-config-printer/default.nix
@@ -5,16 +5,20 @@
 , withGUI ? true
 }:
 
-stdenv.mkDerivation rec {
-  name = "system-config-printer-1.3.12";
+let majorVersion = "1.5";
+
+in stdenv.mkDerivation rec {
+  name = "system-config-printer-${majorVersion}.7";
 
   src = fetchurl {
-    url = "http://cyberelk.net/tim/data/system-config-printer/1.3/${name}.tar.xz";
+    url = "http://cyberelk.net/tim/data/system-config-printer/${majorVersion}/${name}.tar.xz";
     sha256 = "1cg9n75rg5l9vr1925n2g771kga33imikyl0mf70lww2sfgvs18r";
   };
 
   propagatedBuildInputs = [ pythonPackages.pycurl ];
 
+  patches = [ ./detect_serverbindir.patch ];
+
   buildInputs =
     [ intltool pkgconfig glib udev libusb1 cups xmlto
       libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils
@@ -32,17 +36,28 @@ stdenv.mkDerivation rec {
 
   postInstall =
     ''
+      export makeWrapperArgs="--set prefix $out"
       wrapPythonPrograms
+      # The program imports itself, so we need to move shell wrappers to a proper place.
+      fixupWrapper() {
+        mv "$out/share/system-config-printer/$2.py" \
+           "$out/bin/$1"
+        sed -i "s/.$2.py-wrapped/$2.py/g" "$out/bin/$1"
+        mv "$out/share/system-config-printer/.$2.py-wrapped" \
+           "$out/share/system-config-printer/$2.py"
+      }
+      fixupWrapper scp-dbus-service scp-dbus-service
+      fixupWrapper system-config-printer system-config-printer
+      fixupWrapper system-config-printer-applet applet
+      # This __init__.py is both executed and imported.
       ( cd $out/share/system-config-printer/troubleshoot
         mv .__init__.py-wrapped __init__.py
       )
-
-      # Upstream issue: https://github.com/twaugh/system-config-printer/issues/28
-      sed -i -e "s|/usr/bin|$out/bin|" "$out/share/dbus-1/services/org.fedoraproject.Config.Printing.service"
     '';
 
   meta = {
     homepage = http://cyberelk.net/tim/software/system-config-printer/;
     platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl2;
   };
 }
diff --git a/pkgs/tools/misc/system-config-printer/detect_serverbindir.patch b/pkgs/tools/misc/system-config-printer/detect_serverbindir.patch
new file mode 100644
index 000000000000..2cd3058f2330
--- /dev/null
+++ b/pkgs/tools/misc/system-config-printer/detect_serverbindir.patch
@@ -0,0 +1,17 @@
+diff --git a/cupshelpers/config.py.in b/cupshelpers/config.py.in
+index 55abbfc..1244327 100644
+--- a/cupshelpers/config.py.in
++++ b/cupshelpers/config.py.in
+@@ -22,3 +22,12 @@
+ prefix="@prefix@"
+ sysconfdir="@sysconfdir@"
+ cupsserverbindir="@cupsserverbindir@"
++
++try:
++    with open("/etc/cups/cups-files.conf") as config:
++        for cfgline in config:
++            args = cfgline.split(" ")
++            if len(args) == 2 and args[0] == "ServerBin":
++                cupsserverbindir = args[1].strip()
++except OSError:
++    pass

From 4529ed12590d7f814e40223437c7df4fea492e2d Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 23 Nov 2014 20:42:14 +0100
Subject: [PATCH 0068/2285] buildEnv: Check the content of colliding paths.

Originally wanted to include ignoreCollisions in cups-progs, but I think
it's better if we use ignoreCollisions only if there are _real_
collisions between files with different contents.

Of course, we also check whether the file permissions match, so you get
a collision if contents are the same but the permissions are different.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/buildenv/builder.pl  | 41 +++++++++++++++++++------
 pkgs/build-support/buildenv/default.nix |  8 ++++-
 2 files changed, 39 insertions(+), 10 deletions(-)

diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index 155af314397b..7f1be3925443 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -5,6 +5,7 @@ use Cwd 'abs_path';
 use IO::Handle;
 use File::Path;
 use File::Basename;
+use File::Compare;
 use JSON::PP;
 
 STDOUT->autoflush(1);
@@ -38,7 +39,7 @@ for my $p (@pathsToLink) {
 sub findFiles;
 
 sub findFilesInDir {
-    my ($relName, $target, $ignoreCollisions, $priority) = @_;
+    my ($relName, $target, $ignoreCollisions, $checkCollisionContents, $priority) = @_;
 
     opendir DIR, "$target" or die "cannot open `$target': $!";
     my @names = readdir DIR or die;
@@ -46,12 +47,28 @@ sub findFilesInDir {
 
     foreach my $name (@names) {
         next if $name eq "." || $name eq "..";
-        findFiles("$relName/$name", "$target/$name", $name, $ignoreCollisions, $priority);
+        findFiles("$relName/$name", "$target/$name", $name, $ignoreCollisions, $checkCollisionContents, $priority);
     }
 }
 
+sub checkCollision {
+    my ($path1, $path2) = @_;
+
+    my $stat1 = (stat($path1))[2];
+    my $stat2 = (stat($path2))[2];
+
+    if ($stat1 != $stat2) {
+        warn "different permissions in `$path1' and `$path2': "
+           . sprintf("%04o", $stat1 & 07777) . " <-> "
+           . sprintf("%04o", $stat2 & 07777);
+        return 0;
+    }
+
+    return compare($path1, $path2) == 0;
+}
+
 sub findFiles {
-    my ($relName, $target, $baseName, $ignoreCollisions, $priority) = @_;
+    my ($relName, $target, $baseName, $ignoreCollisions, $checkCollisionContents, $priority) = @_;
 
     # Urgh, hacky...
     return if
@@ -79,7 +96,9 @@ sub findFiles {
     }
 
     unless (-d $target && ($oldTarget eq "" || -d $oldTarget)) {
-        if ($ignoreCollisions) {
+        if ($checkCollisionContents && checkCollision($oldTarget, $target)) {
+            return;
+        } elsif ($ignoreCollisions) {
             warn "collision between `$target' and `$oldTarget'\n" if $ignoreCollisions == 1;
             return;
         } else {
@@ -87,8 +106,8 @@ sub findFiles {
         }
     }
 
-    findFilesInDir($relName, $oldTarget, $ignoreCollisions, $oldPriority) unless $oldTarget eq "";
-    findFilesInDir($relName, $target, $ignoreCollisions, $priority);
+    findFilesInDir($relName, $oldTarget, $ignoreCollisions, $checkCollisionContents, $oldPriority) unless $oldTarget eq "";
+    findFilesInDir($relName, $target, $ignoreCollisions, $checkCollisionContents, $priority);
 
     $symlinks{$relName} = ["", $priority]; # denotes directory
 }
@@ -98,12 +117,12 @@ my %done;
 my %postponed;
 
 sub addPkg {
-    my ($pkgDir, $ignoreCollisions, $priority)  = @_;
+    my ($pkgDir, $ignoreCollisions, $checkCollisionContents, $priority)  = @_;
 
     return if (defined $done{$pkgDir});
     $done{$pkgDir} = 1;
 
-    findFiles("", $pkgDir, "", $ignoreCollisions, $priority);
+    findFiles("", $pkgDir, "", $ignoreCollisions, $checkCollisionContents, $priority);
 
     my $propagatedFN = "$pkgDir/nix-support/propagated-user-env-packages";
     if (-e $propagatedFN) {
@@ -132,7 +151,11 @@ if (exists $ENV{"pkgsPath"}) {
 # user.
 for my $pkg (@{decode_json $pkgs}) {
     for my $path (@{$pkg->{paths}}) {
-        addPkg($path, $ENV{"ignoreCollisions"} eq "1", $pkg->{priority}) if -e $path;
+        addPkg($path,
+               $ENV{"ignoreCollisions"} eq "1",
+               $ENV{"checkCollisionContents"} eq "1",
+               $pkg->{priority})
+           if -e $path;
     }
 }
 
diff --git a/pkgs/build-support/buildenv/default.nix b/pkgs/build-support/buildenv/default.nix
index 9b8b9daad94d..a9a4d95d7d8f 100644
--- a/pkgs/build-support/buildenv/default.nix
+++ b/pkgs/build-support/buildenv/default.nix
@@ -16,6 +16,10 @@
 , # Whether to ignore collisions or abort.
   ignoreCollisions ? false
 
+, # If there is a collision, check whether the contents and permissions match
+  # and only if not, throw a collision error.
+  checkCollisionContents ? true
+
 , # The paths (relative to each element of `paths') that we want to
   # symlink (e.g., ["/bin"]).  Any file not inside any of the
   # directories in the list is not symlinked.
@@ -39,7 +43,9 @@
 }:
 
 runCommand name
-  rec { inherit manifest ignoreCollisions passthru meta pathsToLink extraPrefix postBuild buildInputs;
+  rec {
+    inherit manifest ignoreCollisions checkCollisionContents passthru
+            meta pathsToLink extraPrefix postBuild buildInputs;
     pkgs = builtins.toJSON (map (drv: {
       paths =
         [ drv ]

From bfb11fd0301c1c583319bd2e8211ef434e078792 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sun, 23 Nov 2014 23:11:06 +0100
Subject: [PATCH 0069/2285] buildEnv: Skip content check on ignoreCollisions.

Checking file contents is redundant in this case, because we will go
ahead anyway, regardless of whether the content is the same.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/build-support/buildenv/builder.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index 7f1be3925443..c505473ee722 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -96,11 +96,11 @@ sub findFiles {
     }
 
     unless (-d $target && ($oldTarget eq "" || -d $oldTarget)) {
-        if ($checkCollisionContents && checkCollision($oldTarget, $target)) {
-            return;
-        } elsif ($ignoreCollisions) {
+        if ($ignoreCollisions) {
             warn "collision between `$target' and `$oldTarget'\n" if $ignoreCollisions == 1;
             return;
+        } elsif ($checkCollisionContents && checkCollision($oldTarget, $target)) {
+            return;
         } else {
             die "collision between `$target' and `$oldTarget'\n";
         }

From b01b11c657591233a8973603ebb9c058dff7a5c8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 18 Jan 2016 03:56:59 +0100
Subject: [PATCH 0070/2285] virtualbox: 5.0.10 -> 5.0.12

This is a maintenance release.
Changes: https://www.virtualbox.org/wiki/Changelog.
---
 pkgs/applications/virtualization/virtualbox/default.nix   | 8 ++++----
 .../virtualization/virtualbox/guest-additions/default.nix | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index bc777c962d52..855694e04120 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -18,7 +18,7 @@ let
   # revision/hash as well. See
   # http://download.virtualbox.org/virtualbox/${version}/SHA256SUMS
   # for hashes.
-  version = "5.0.10";
+  version = "5.0.12";
 
   forEachModule = action: ''
     for mod in \
@@ -39,12 +39,12 @@ let
   '';
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
-  extpackRevision = "104061";
+  extpackRevision = "104815";
   extensionPack = requireFile rec {
     name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
     # IMPORTANT: Hash must be base16 encoded because it's used as an input to
     # VBoxExtPackHelperApp!
-    sha256 = "c846fa26fec8587e57180c85c408cad377c48ad26830b0dc839ebf9025e3d29c";
+    sha256 = "ac1bc8452b7fdf183325272149e9f18b9810cc07adf18e48755385a9cd1b236d";
     message = ''
       In order to use the extension pack, you need to comply with the VirtualBox Personal Use
       and Evaluation License (PUEL) by downloading the related binaries from:
@@ -63,7 +63,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "56eafae439b91ea3c3748f2128b2969ba76983acf821acaa08e043c129b45a89";
+    sha256 = "de0362b1d404d1ca0298db1984acb6f0f1c6210313aeb744fea345ad9201e86e";
   };
 
   buildInputs =
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index b6b05806a007..43f591cf6aad 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "8f7ffee3fac75793e48d1859b65a95879b3ed5bc1c3164c967e85d69244c594b";
+    sha256 = "61a19c9ec4b449cbc6bb41b636b03a16bf5a47ffa4943423d262863017e8bc9b";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";

From 0e55c43718503e7d4324e9d9672c606c8971d4e9 Mon Sep 17 00:00:00 2001
From: Eduard Bachmakov <e.bachmakov@gmail.com>
Date: Sun, 17 Jan 2016 22:53:25 -0500
Subject: [PATCH 0071/2285] photoqt: fix breakage from qt infrastucture
 transition

---
 pkgs/applications/graphics/photoqt/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/photoqt/default.nix b/pkgs/applications/graphics/photoqt/default.nix
index c96b0c182a62..9d68a44821a5 100644
--- a/pkgs/applications/graphics/photoqt/default.nix
+++ b/pkgs/applications/graphics/photoqt/default.nix
@@ -17,7 +17,9 @@ stdenv.mkDerivation rec {
     sha256 = "0j2kvxfb5pd9abciv161nkcsyam6n8kfqs8ymwj2mxiqflwbmfl1";
   };
 
-  buildInputs = [ cmake makeWrapper qtbase qttools exiv2 graphicsmagick ];
+  buildInputs = [
+    cmake makeWrapper qtbase qtquickcontrols qttools exiv2 graphicsmagick
+  ];
 
   preConfigure = ''
     export MAGICK_LOCATION="${graphicsmagick}/include/GraphicsMagick"

From 352ff0be29e9f2784a94bcac4b853703eebca6fc Mon Sep 17 00:00:00 2001
From: Eduard Bachmakov <e.bachmakov@gmail.com>
Date: Thu, 14 Jan 2016 20:24:54 -0500
Subject: [PATCH 0072/2285] protobuf: 3.0.0-alpha-3.1 -> 3.0.0-beta-2

Also split out gmock's source so that it can be copied into protobuf's
source. Hopefull this hack can be removed again once gmock is replaced
by gtest.

This does not include python bindings.
---
 pkgs/development/libraries/gmock/default.nix  | 18 ++++-----
 pkgs/development/libraries/gmock/source.nix   | 20 ++++++++++
 pkgs/development/libraries/protobuf/3.0.nix   | 39 ++++++++++++++++---
 .../libraries/protobuf/generic.nix            |  2 +-
 4 files changed, 64 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/libraries/gmock/source.nix

diff --git a/pkgs/development/libraries/gmock/default.nix b/pkgs/development/libraries/gmock/default.nix
index 71ac281195b6..23a7ef43625c 100644
--- a/pkgs/development/libraries/gmock/default.nix
+++ b/pkgs/development/libraries/gmock/default.nix
@@ -1,15 +1,13 @@
-{ stdenv, fetchurl, unzip, cmake}:
-
+{ stdenv, cmake, callPackage }:
+let
+  source = callPackage ./source.nix { };
+in
 stdenv.mkDerivation rec {
-  version = "1.7.0";
-  name = "gmock-${version}";
+  name = "gmock-${source.version}";
 
-  src = fetchurl {
-    url = "https://googlemock.googlecode.com/files/${name}.zip";
-    sha256="26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492eb97e85a8a6d2f43095b";
-  };
+  src = source;
 
-  buildInputs = [ unzip cmake ];
+  buildInputs = [ cmake ];
 
   buildPhase = ''
     # avoid building gtest
@@ -29,4 +27,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.bsd3;
     maintainers = [ stdenv.lib.maintainers.auntie ];
   };
+
+  passthru = { inherit source; };
 }
diff --git a/pkgs/development/libraries/gmock/source.nix b/pkgs/development/libraries/gmock/source.nix
new file mode 100644
index 000000000000..c40a7cc5d4da
--- /dev/null
+++ b/pkgs/development/libraries/gmock/source.nix
@@ -0,0 +1,20 @@
+{ fetchzip, stdenv, unzip, ... }:
+
+stdenv.mkDerivation rec {
+  name = "gmock-src-${version}";
+  version = "1.7.0";
+
+  src = fetchzip {
+    url = "https://googlemock.googlecode.com/files/gmock-${version}.zip";
+    sha256="04n9p6pf3mrqsabrsncv32d3fqvd86zmcdq3gyni7liszgfk0paz";
+  };
+
+  buildInputs = [ unzip ];
+
+  installPhase = ''
+    mkdir $out
+    cp -r * $out
+  '';
+
+  passthru = { inherit version; };
+}
diff --git a/pkgs/development/libraries/protobuf/3.0.nix b/pkgs/development/libraries/protobuf/3.0.nix
index 900c9dc5a512..f0bc0ca79f2b 100644
--- a/pkgs/development/libraries/protobuf/3.0.nix
+++ b/pkgs/development/libraries/protobuf/3.0.nix
@@ -1,12 +1,41 @@
-{ callPackage, fetchFromGitHub, ... } @ args:
+{ stdenv, fetchFromGitHub , autoreconfHook, zlib, gmock }:
 
-callPackage ./generic.nix (args // rec {
-  version = "3.0.0-alpha-3.1";
+stdenv.mkDerivation rec {
+  name = "protobuf-${version}";
+
+  version = "3.0.0-beta-2";
   # make sure you test also -A pythonPackages.protobuf
   src = fetchFromGitHub {
     owner = "google";
     repo = "protobuf";
     rev = "v${version}";
-    sha256 = "0vzw20ymjmjrrmg84f822qslclsb2q0wf0qdj2da198gmkkbrw45";
+    sha256 = "0cbr1glgma5vakabsjwcs41pcnn8yphhn037l0zd121zb9gdaqc1";
   };
-})
+
+  postPatch = ''
+    rm -rf gmock
+    cp -r ${gmock.source} gmock
+    chmod -R a+w gmock
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    substituteInPlace src/google/protobuf/testing/googletest.cc \
+      --replace 'tmpnam(b)' '"'$TMPDIR'/foo"'
+  '';
+
+  buildInputs = [ autoreconfHook zlib ];
+
+  doCheck = true;
+
+  meta = {
+    description = "Google's data interchange format";
+    longDescription =
+      ''Protocol Buffers are a way of encoding structured data in an efficient
+        yet extensible format. Google uses Protocol Buffers for almost all of
+        its internal RPC protocols and file formats.
+      '';
+    license = stdenv.lib.licenses.bsd3;
+    platforms = stdenv.lib.platforms.unix;
+    homepage = https://developers.google.com/protocol-buffers/;
+  };
+
+  passthru.version = version;
+}
diff --git a/pkgs/development/libraries/protobuf/generic.nix b/pkgs/development/libraries/protobuf/generic.nix
index fc41187a931e..51136c31aa13 100644
--- a/pkgs/development/libraries/protobuf/generic.nix
+++ b/pkgs/development/libraries/protobuf/generic.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
 
     license = "mBSD";
 
-    homepage = http://code.google.com/p/protobuf/;
+    homepage = https://developers.google.com/protocol-buffers/;
   };
 
   passthru.version = version;

From fba7544812663097668e27c2a0ba7c50267fe1d4 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sat, 16 Jan 2016 16:11:04 +0900
Subject: [PATCH 0073/2285] firefox-bin: wrap firefox-bin (close #12416)

---
 .../networking/browsers/firefox-bin/default.nix          | 2 +-
 pkgs/top-level/all-packages.nix                          | 9 ++++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix
index 28d342384d7e..d2d6fcb59342 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/default.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix
@@ -60,7 +60,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "firefox-bin-${version}";
+  name = "firefox-bin-unwrapped-${version}";
 
   src = fetchurl {
     url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/${version}/${source.arch}/${source.locale}/firefox-${version}.tar.bz2";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b9962f495d19..7561a1976cf5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11864,11 +11864,18 @@ let
   firefox = wrapFirefox firefox-unwrapped { };
   firefox-esr = wrapFirefox firefox-esr-unwrapped { };
 
-  firefox-bin = callPackage ../applications/networking/browsers/firefox-bin {
+  firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin {
     gconf = pkgs.gnome.GConf;
     inherit (pkgs.gnome) libgnome libgnomeui;
   };
 
+  firefox-bin = wrapFirefox firefox-bin-unwrapped {
+    browserName = "firefox";
+    name = "firefox-bin-" +
+      (builtins.parseDrvName firefox-bin-unwrapped.name).version;
+    desktopName = "Firefox";
+  };
+
   firestr = qt5.callPackage ../applications/networking/p2p/firestr
     { boost = boost155;
     };

From 9fc8766eaf14a484403ae6b783a8f400740c676f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 18 Jan 2016 12:25:27 +0100
Subject: [PATCH 0074/2285] telepathy-qt: fixup build with qt5

I only tested building with qt4, which turned out to be a mistake.
---
 pkgs/development/libraries/telepathy/qt/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix
index 49745e23fcaf..441d9385f736 100644
--- a/pkgs/development/libraries/telepathy/qt/default.nix
+++ b/pkgs/development/libraries/telepathy/qt/default.nix
@@ -35,7 +35,8 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = "-DDESIRED_QT_VERSION=${builtins.substring 0 1 qtbase.version}";
 
-  NIX_CFLAGS_COMPILE = [ "-Wno-error=cpp" ]; # remove after the next update
+  # should be removable after the next update
+  NIX_CFLAGS_COMPILE = [ "-Wno-error=cpp" "-Wno-error=unused-but-set-variable" ];
 
   preBuild = ''
     NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`"

From ca3af3ce88b95f878f048c71285382de0da011a8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 18 Jan 2016 14:19:56 +0100
Subject: [PATCH 0075/2285] pythonPackages.frozendict: Remove duplicate
 declaration

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3ca87e9d9b67..41f0afd9e705 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4990,12 +4990,12 @@ in modules // {
 
   frozendict = buildPythonPackage rec {
     name = "frozendict-0.5";
-  
+
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/f/frozendict/${name}.tar.gz";
       sha256 = "0m4kg6hbadvf99if78nx01q7qnbyhdw3x4znl5dasgciyi54432n";
     };
-  
+
     meta = {
       homepage = https://github.com/slezica/python-frozendict;
       description = "An immutable dictionary";
@@ -22931,16 +22931,6 @@ in modules // {
     };
   };
 
-  frozendict = buildPythonPackage rec {
-    name = "frozendict-${version}";
-    version = "0.5";
-
-    src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/f/frozendict/frozendict-0.5.tar.gz";
-      sha256 = "0m4kg6hbadvf99if78nx01q7qnbyhdw3x4znl5dasgciyi54432n";
-    };
-  };
-
   pydenticon = buildPythonPackage rec {
     name = "pydenticon-${version}";
     version = "0.2";

From 9609eb8d10422edf6a7ad9d74a144e20f98098ca Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 18 Jan 2016 14:42:27 +0100
Subject: [PATCH 0076/2285] btrfs-progs: 4.3.1 -> 4.4

Bugfixes:
- chunk recovery: fix floating point exception
- chunk recovery: endianity bugfix during rebuild
- mkfs with 64K pages and nodesize reported superblock checksum mismatch
- check: properly reset nlink of multi-linked file

Too many changes to list here. See:
https://btrfs.wiki.kernel.org/index.php/Changelog#By_version_.28btrfs-progs.29
---
 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 53da1607087b..536cc26779b9 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.3.1"; in
+let version = "4.4"; 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 = "0fpxi9pd297lrrynnsyggdwdcb4xvjvn2gvzlzsws0gdvqazzd8c";
+    sha256 = "0jssv1ys4nw2jf7mkp58c19yspaa8ybf48fxsrhhp0683mzpr73p";
   };
 
   buildInputs = [

From 87c3063d686ffa8a8eb928e23c8db70f61e45b7b Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Thu, 7 Jan 2016 07:55:09 +0100
Subject: [PATCH 0077/2285] torbrowser: 5.0.6 -> 5.0.7, add desktop file

---
 pkgs/tools/security/tor/torbrowser.nix | 31 +++++++++++++++++++-------
 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index ccfd4ae044d6..ca3e3aa10566 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildEnv
+{ stdenv, fetchurl, buildEnv, makeDesktopItem
 , xorg, alsaLib, dbus, dbus_glib, glib, gtk, atk, pango, freetype, fontconfig
 , gdk_pixbuf, cairo, zlib}:
 let
@@ -16,13 +16,23 @@ let
 
 in stdenv.mkDerivation rec {
   name = "tor-browser-${version}";
-  version = "5.0.6";
+  version = "5.0.7";
 
   src = fetchurl {
     url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz";
     sha256 = if stdenv.is64bit then
-      "1ix05760l9j6bwbswd2fnk4b6nrrzxp3b8abvm4y4979pkkmasfw" else
-      "1q5mf91xxj1xs4ajj9i6mdhnzqycbdvprkzskx8pl6j9ll2hlsyh";
+      "0igqh02bcdr0b4m6df46l1l1z38d4nh4pyfn6jqsvahacdl2qbsg" else
+      "1401j340348rqwd5c1m8hnxw7qkwpzqfa64q01cp08lz9cxxml4r";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "torbrowser";
+    exec = "tor-browser";
+    icon = "torbrowser";
+    desktopName = "Tor Browser";
+    genericName = "Tor Browser";
+    comment = meta.description;
+    categories = "Network;WebBrowser;Security;";
   };
 
   patchPhase = ''
@@ -57,15 +67,20 @@ in stdenv.mkDerivation rec {
     $out/share/tor-browser/Browser/firefox -no-remote -profile ~/Data/Browser/profile.default "$@"
     EOF
     chmod +x $out/bin/tor-browser
+
+    mkdir -p $out/share/applications
+    cp $desktopItem/share/applications"/"* $out/share/applications
+
+    mkdir -p $out/share/pixmaps
+    cp Browser/browser/icons/mozicon128.png $out/share/pixmaps/torbrowser.png
   '';
 
   buildInputs = [ stdenv ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Tor Browser Bundle";
     homepage    = https://www.torproject.org/;
-    platforms   = stdenv.lib.platforms.linux;
-    maintainers = with stdenv.lib.maintainers;
-      [ offline matejc doublec thoughtpolice ];
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ offline matejc doublec thoughtpolice ];
   };
 }

From 0cf5c65511c2f7a003e7f4be4af8cc8aed1373f7 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Mon, 18 Jan 2016 13:56:28 +0000
Subject: [PATCH 0078/2285] nixops: 1.3 -> 1.3.1

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

diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index 4388cbc5b3da..5bf156b62e37 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -1,9 +1,9 @@
 { callPackage, fetchurl }:
 
 callPackage ./generic.nix (rec {
-  version = "1.3";
+  version = "1.3.1";
   src = fetchurl {
     url = "http://nixos.org/releases/nixops/nixops/nixops-${version}.tar.bz2";
-    sha256 = "d80b0fe3bb31bb84a8545f9ea804ec8137172c8df44f03326ed7639e5a4bad55";
+    sha256 = "04j8s0gg1aj3wmj1bs7dwscfmlzk2xpwfw9rk4xzxwxw1y0j64nd";
   };
 })

From 72e6e6a4833e3ea481f3573034011cb07abd2c8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 18 Jan 2016 15:00:39 +0100
Subject: [PATCH 0079/2285] tarball: fix evaluation of mdadm on darwin

It probably doesn't make any sense to have mdadm on darwin,
but we have to "fail in a right way".
---
 pkgs/os-specific/linux/mdadm/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix
index dc1697b9e9b2..465dc58199ed 100644
--- a/pkgs/os-specific/linux/mdadm/default.nix
+++ b/pkgs/os-specific/linux/mdadm/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, groff }:
 
+assert stdenv.isLinux;
+
 stdenv.mkDerivation rec {
   name = "mdadm-3.3.4";
 

From 5cf03589a4087901e7957c06221ea29917ec9189 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 18 Jan 2016 15:22:40 +0100
Subject: [PATCH 0080/2285] geolite-legacy 2016-01-11 -> 2016-01-18

---
 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 581d1db5088b..c5510b79cc3e 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,7 +8,7 @@ let
 
   # Annoyingly, these files are updated without a change in URL. This means that
   # builds will start failing every month or so, until the hashes are updated.
-  version = "2016-01-11";
+  version = "2016-01-18";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
@@ -27,10 +27,10 @@ stdenv.mkDerivation {
     "1fksbnmda2a05cpax41h9r7jhi8102q41kl5nij4ai42d6yqy73x";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "06lhgkycyxisnvcrcdqcxlbhawyqw302yv1p3836bm0fjhyr7v4r";
+    "00x6d11l8jxc1dj7p1kwmr3x1zwxwbv7xqbxj17j30s4qjmkb2i1";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "1scn63zd8di5jzxx4nfic4ggfy4jas9l56h0mcyvgypzlyvxgz43";
+    "0r84ji86q4f6maw3scx9i054nzhjg4kb26r6fp1jdbiqjp8mhkyw";
 
   meta = with stdenv.lib; {
     inherit version;

From 45bf78373edb67b229ab9c087555b7a2d5a9d0a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 18 Jan 2016 15:54:11 +0100
Subject: [PATCH 0081/2285] termite: fix up the business with vte patching

I didn't see nice patches to apply,
so I exchanged the whole source (-> autoreconf).

/cc maintainer: k0ral. BTW, it's practical to have the maintainers attribute
match the github name exactly so that people know how to /cc you.
---
 pkgs/applications/misc/termite/default.nix    |  8 ++---
 .../gnome-3/3.18/core/vte/default.nix         | 34 +++++++++++++++----
 pkgs/top-level/all-packages.nix               |  3 +-
 3 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix
index ba3d3db3267d..d37f2c947c95 100644
--- a/pkgs/applications/misc/termite/default.nix
+++ b/pkgs/applications/misc/termite/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, pkgconfig, vte, gtk, ncurses }:
+{ stdenv, fetchgit, pkgconfig, vte, gtk3, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "termite-${version}";
@@ -10,11 +10,9 @@ stdenv.mkDerivation rec {
     sha256 = "107v59x8q2m1cx1x3i5ciibw4nl1qbq7p58bfw0irkhp7sl7kjk2";
   };
 
-  makeFlags = "VERSION=v${version}";
+  makeFlags = [ "VERSION=v${version}" "PREFIX=$(out)" ];
 
-  buildInputs = [pkgconfig vte gtk ncurses];
-
-  installFlags = "PREFIX=$(out)";
+  buildInputs = [ pkgconfig vte gtk3 ncurses ];
 
   meta = with stdenv.lib; {
     description = "A simple VTE-based terminal";
diff --git a/pkgs/desktops/gnome-3/3.18/core/vte/default.nix b/pkgs/desktops/gnome-3/3.18/core/vte/default.nix
index b47381cf61b8..86dfd953b48f 100644
--- a/pkgs/desktops/gnome-3/3.18/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/vte/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection, vala, libxml2
-, gnutls, selectTextPatch ? false }:
+{ stdenv, fetchurl, intltool, pkgconfig
+, gnome3, ncurses, gobjectIntrospection, vala, libxml2, gnutls
 
-stdenv.mkDerivation rec {
+, selectTextPatch ? false
+, fetchFromGitHub, autoconf, automake, libtool, gtk_doc, gperf
+}:
+
+let baseAttrs = rec {
   inherit (import ./src.nix fetchurl) name src;
 
-  patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.0.40.0.patch;
-
-  buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib 
+  buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib
                   gnome3.gtk3 ncurses vala libxml2 ];
 
   propagatedBuildInputs = [ gnutls ];
@@ -36,4 +38,22 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ astsmtl antono lethalman ];
     platforms = platforms.linux;
   };
-}
+};
+
+in stdenv.mkDerivation ( baseAttrs
+  // stdenv.lib.optionalAttrs selectTextPatch rec {
+      name = "vte-ng-${version}";
+      version = "0.42.1.a";
+      src = fetchFromGitHub {
+        owner = "thestinger";
+        repo = "vte-ng";
+        rev = version;
+        sha256 = "1296rvngixi6l31mhhaks6vr1xyqw8h6n5hwknadrlk95nknrpxm";
+      };
+      # slightly hacky; I couldn't make it work with autoreconfHook
+      configureScript = "./autogen.sh";
+      nativeBuildInputs = (baseAttrs.nativeBuildInputs or [])
+        ++ [ gtk_doc autoconf automake libtool gperf ];
+  }
+)
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3af09600c767..aa24c4bbf754 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13357,9 +13357,8 @@ let
   };
 
   termite = callPackage ../applications/misc/termite {
-    gtk = gtk3;
     vte = gnome3.vte-select-text;
-   };
+  };
 
   tesseract = callPackage ../applications/graphics/tesseract { };
 

From d6f9f135120301f2d297d52336b5182e7ebc6122 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 18 Jan 2016 15:57:25 +0100
Subject: [PATCH 0082/2285] bosun: Create ledisDir in pre-start script

---
 nixos/modules/services/monitoring/bosun.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix
index 46273fc12187..51d38e8db4de 100644
--- a/nixos/modules/services/monitoring/bosun.nix
+++ b/nixos/modules/services/monitoring/bosun.nix
@@ -129,17 +129,19 @@ in {
       description = "bosun metrics collector (part of Bosun)";
       wantedBy = [ "multi-user.target" ];
 
-      preStart =
-        ''
-        mkdir -p `dirname ${cfg.stateFile}`;
-        touch ${cfg.stateFile}
-        touch ${cfg.stateFile}.tmp
+      preStart = ''
+        mkdir -p "$(dirname "${cfg.stateFile}")";
+        touch "${cfg.stateFile}"
+        touch "${cfg.stateFile}.tmp"
+
+        mkdir -p "${cfg.ledisDir}";
 
         if [ "$(id -u)" = 0 ]; then
-          chown ${cfg.user}:${cfg.group} ${cfg.stateFile}
-          chown ${cfg.user}:${cfg.group} ${cfg.stateFile}.tmp
+          chown ${cfg.user}:${cfg.group} "${cfg.stateFile}"
+          chown ${cfg.user}:${cfg.group} "${cfg.stateFile}.tmp"
+          chown ${cfg.user}:${cfg.group} "${cfg.ledisDir}"
         fi
-        '';
+      '';
 
       serviceConfig = {
         PermissionsStartOnly = true;

From ce543ebf27a619ba62e16b95a8090800a7050c53 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 18 Jan 2016 15:57:52 +0100
Subject: [PATCH 0083/2285] elasticsearch: Fix some startup warnings

---
 nixos/modules/services/search/elasticsearch.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index ea0cf1dcd78f..356cfd409ad4 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@@ -128,6 +128,7 @@ in {
       description = "Elasticsearch Daemon";
       wantedBy = [ "multi-user.target" ];
       after = [ "network-interfaces.target" ];
+      path = [ pkgs.inetutils ];
       environment = { ES_HOME = cfg.dataDir; };
       serviceConfig = {
         ExecStart = "${cfg.package}/bin/elasticsearch -Des.path.conf=${configDir} ${toString cfg.extraCmdLineOptions}";
@@ -139,8 +140,7 @@ in {
         if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi
 
         # Install plugins
-        rm ${cfg.dataDir}/plugins || true
-        ln -s ${esPlugins}/plugins ${cfg.dataDir}/plugins
+        ln -sfT ${esPlugins}/plugins ${cfg.dataDir}/plugins
       '';
       postStart = mkBefore ''
         until ${pkgs.curl}/bin/curl -s -o /dev/null ${cfg.listenAddress}:${toString cfg.port}; do

From b4052f0a1e7dd60a900de0c78f6673621b291beb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 18 Jan 2016 16:03:33 +0100
Subject: [PATCH 0084/2285] vte: remove the forgotten patch

---
 .../core/vte/expose_select_text.0.40.0.patch  | 226 ------------------
 1 file changed, 226 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/3.18/core/vte/expose_select_text.0.40.0.patch

diff --git a/pkgs/desktops/gnome-3/3.18/core/vte/expose_select_text.0.40.0.patch b/pkgs/desktops/gnome-3/3.18/core/vte/expose_select_text.0.40.0.patch
deleted file mode 100644
index c18f1b76b410..000000000000
--- a/pkgs/desktops/gnome-3/3.18/core/vte/expose_select_text.0.40.0.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-Only in vte-0.40.0.new: .git
-diff --unified -aur vte-0.40.0/src/vteaccess.c vte-0.40.0.new/src/vteaccess.c
---- vte-0.40.0/src/vteaccess.c	2015-03-16 06:34:37.000000000 -0400
-+++ vte-0.40.0.new/src/vteaccess.c	2015-04-10 00:08:53.146853382 -0400
-@@ -1444,7 +1444,7 @@
- 	*start_offset = offset_from_xy (priv, start_x, start_y);
- 	_vte_terminal_get_end_selection (terminal, &end_x, &end_y);
- 	*end_offset = offset_from_xy (priv, end_x, end_y);
--	return _vte_terminal_get_selection (terminal);
-+	return vte_terminal_get_selection (terminal);
- }
- 
- static gboolean
-diff --unified -aur vte-0.40.0/src/vte.c vte-0.40.0.new/src/vte.c
---- vte-0.40.0/src/vte.c	2015-03-18 12:38:09.000000000 -0400
-+++ vte-0.40.0.new/src/vte.c	2015-04-10 00:08:53.150186722 -0400
-@@ -123,7 +123,6 @@
- 						 gpointer data,
- 						 GArray *attributes,
- 						 gboolean include_trailing_spaces);
--static void _vte_terminal_disconnect_pty_read(VteTerminal *terminal);
- static void _vte_terminal_disconnect_pty_write(VteTerminal *terminal);
- static void vte_terminal_stop_processing (VteTerminal *terminal);
- 
-@@ -3344,9 +3343,10 @@
- 	_vte_debug_print (VTE_DEBUG_IO, "removed poll of vte_terminal_io_read\n");
- 	terminal->pvt->pty_input_source = 0;
- }
--static void
--_vte_terminal_connect_pty_read(VteTerminal *terminal)
-+void
-+vte_terminal_connect_pty_read(VteTerminal *terminal)
- {
-+	g_return_if_fail(VTE_IS_TERMINAL(terminal));
- 	if (terminal->pvt->pty_channel == NULL) {
- 		return;
- 	}
-@@ -3398,9 +3398,10 @@
- 	}
- }
- 
--static void
--_vte_terminal_disconnect_pty_read(VteTerminal *terminal)
-+void
-+vte_terminal_disconnect_pty_read(VteTerminal *terminal)
- {
-+	g_return_if_fail(VTE_IS_TERMINAL(terminal));
- 	if (terminal->pvt->pty_input_source != 0) {
- 		_vte_debug_print (VTE_DEBUG_IO, "disconnecting poll of vte_terminal_io_read\n");
- 		g_source_remove(terminal->pvt->pty_input_source);
-@@ -6302,6 +6303,28 @@
- 	}
- }
- 
-+/**
-+ * vte_terminal_set_cursor_position:
-+ * @terminal: a #VteTerminal
-+ * @column: the new cursor column
-+ * @row: the new cursor row
-+ *
-+ * Set the location of the cursor.
-+ */
-+void
-+vte_terminal_set_cursor_position(VteTerminal *terminal,
-+				 long column, long row)
-+{
-+	g_return_if_fail(VTE_IS_TERMINAL(terminal));
-+
-+	_vte_invalidate_cursor_once(terminal, FALSE);
-+	terminal->pvt->cursor.col = column;
-+	terminal->pvt->cursor.row = row;
-+	_vte_invalidate_cursor_once(terminal, FALSE);
-+	_vte_check_cursor_blink(terminal);
-+	vte_terminal_queue_cursor_moved(terminal);
-+}
-+
- static GtkClipboard *
- vte_terminal_clipboard_get(VteTerminal *terminal, GdkAtom board)
- {
-@@ -6465,7 +6488,7 @@
-         vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE);
- 
- 	/* Temporarily stop caring about input from the child. */
--	_vte_terminal_disconnect_pty_read(terminal);
-+	vte_terminal_disconnect_pty_read(terminal);
- }
- 
- static gboolean
-@@ -6482,7 +6505,7 @@
- 		terminal->pvt->selecting = FALSE;
- 
- 		/* Reconnect to input from the child if we paused it. */
--		_vte_terminal_connect_pty_read(terminal);
-+		vte_terminal_connect_pty_read(terminal);
- 
- 		return TRUE;
- 	}
-@@ -6982,6 +7005,50 @@
- 	vte_terminal_deselect_all (terminal);
- }
- 
-+/**
-+ * vte_terminal_get_selection_block_mode:
-+ * @terminal: a #VteTerminal
-+ *
-+ * Checks whether or not block selection is enabled.
-+ *
-+ * Returns: %TRUE if block selection is enabled, %FALSE if not
-+ */
-+gboolean
-+vte_terminal_get_selection_block_mode(VteTerminal *terminal) {
-+	g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
-+	return terminal->pvt->selection_block_mode;
-+}
-+
-+/**
-+ * vte_terminal_set_selection_block_mode:
-+ * @terminal: a #VteTerminal
-+ * @block_mode: whether block selection is enabled
-+ *
-+ * Sets whether or not block selection is enabled.
-+ */
-+void
-+vte_terminal_set_selection_block_mode(VteTerminal *terminal, gboolean block_mode) {
-+	g_return_if_fail(VTE_IS_TERMINAL(terminal));
-+	terminal->pvt->selection_block_mode = block_mode;
-+}
-+
-+/**
-+ * vte_terminal_select_text:
-+ * @terminal: a #VteTerminal
-+ * @start_col: the starting column for the selection
-+ * @start_row: the starting row for the selection
-+ * @end_col: the end column for the selection
-+ * @end_row: the end row for the selection
-+ *
-+ * Sets the current selection region.
-+ */
-+void
-+vte_terminal_select_text(VteTerminal *terminal,
-+			 long start_col, long start_row,
-+			 long end_col, long end_row) {
-+	_vte_terminal_select_text(terminal, start_col, start_row, end_col, end_row, 0, 0);
-+}
-+
- /* Autoscroll a bit. */
- static gboolean
- vte_terminal_autoscroll(VteTerminal *terminal)
-@@ -8631,7 +8698,7 @@
- #endif
- 		kill(terminal->pvt->pty_pid, SIGHUP);
- 	}
--	_vte_terminal_disconnect_pty_read(terminal);
-+	vte_terminal_disconnect_pty_read(terminal);
- 	_vte_terminal_disconnect_pty_write(terminal);
- 	if (terminal->pvt->pty_channel != NULL) {
- 		g_io_channel_unref (terminal->pvt->pty_channel);
-@@ -12188,7 +12255,7 @@
-         g_object_freeze_notify(object);
- 
-         if (pvt->pty != NULL) {
--                _vte_terminal_disconnect_pty_read(terminal);
-+                vte_terminal_disconnect_pty_read(terminal);
-                 _vte_terminal_disconnect_pty_write(terminal);
- 
-                 if (terminal->pvt->pty_channel != NULL) {
-@@ -12243,7 +12310,7 @@
-         _vte_terminal_setup_utf8 (terminal);
- 
-         /* Open channels to listen for input on. */
--        _vte_terminal_connect_pty_read (terminal);
-+        vte_terminal_connect_pty_read (terminal);
- 
-         g_object_notify(object, "pty");
- 
-@@ -12276,7 +12343,7 @@
- }
- 
- char *
--_vte_terminal_get_selection(VteTerminal *terminal)
-+vte_terminal_get_selection(VteTerminal *terminal)
- {
- 	g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
- 
-diff --unified -aur vte-0.40.0/src/vteint.h vte-0.40.0.new/src/vteint.h
---- vte-0.40.0/src/vteint.h	2014-05-28 08:22:48.000000000 -0400
-+++ vte-0.40.0.new/src/vteint.h	2015-04-10 00:08:53.153520062 -0400
-@@ -25,7 +25,6 @@
- G_BEGIN_DECLS
- 
- void _vte_terminal_accessible_ref(VteTerminal *terminal);
--char* _vte_terminal_get_selection(VteTerminal *terminal);
- void _vte_terminal_get_start_selection(VteTerminal *terminal, long *x, long *y);
- void _vte_terminal_get_end_selection(VteTerminal *terminal, long *x, long *y);
- void _vte_terminal_select_text(VteTerminal *terminal, long start_x, long start_y, long end_x, long end_y, int start_offset, int end_offset);
-diff --unified -aur vte-0.40.0/src/vteterminal.h vte-0.40.0.new/src/vteterminal.h
---- vte-0.40.0/src/vteterminal.h	2015-03-18 12:38:09.000000000 -0400
-+++ vte-0.40.0.new/src/vteterminal.h	2015-04-10 00:08:53.150186722 -0400
-@@ -169,6 +169,18 @@
- 
- void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
- void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
-+gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
-+void vte_terminal_set_selection_block_mode(VteTerminal *terminal,
-+                                           gboolean block_mode) _VTE_GNUC_NONNULL(1);
-+void vte_terminal_select_text(VteTerminal *terminal,
-+                              long start_col, long start_row,
-+                              long end_col, long end_row) _VTE_GNUC_NONNULL(1);
-+char *
-+vte_terminal_get_selection(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
-+
-+/* pause and unpause output */
-+void vte_terminal_disconnect_pty_read(VteTerminal *vte);
-+void vte_terminal_connect_pty_read(VteTerminal *vte);
- 
- /* By-word selection */
- void vte_terminal_set_word_char_exceptions(VteTerminal *terminal,
-@@ -280,6 +292,8 @@
- void vte_terminal_get_cursor_position(VteTerminal *terminal,
- 				      glong *column,
-                                       glong *row) _VTE_GNUC_NONNULL(1);
-+void vte_terminal_set_cursor_position(VteTerminal *terminal,
-+				      long column, long row) _VTE_GNUC_NONNULL(1);
- 
- /* Add a matching expression, returning the tag the widget assigns to that
-  * expression. */

From 9a1f430e53b7aad436d8eb2755cc90e2f4fee9f6 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 18 Jan 2016 16:16:29 +0100
Subject: [PATCH 0085/2285] snapper: 0.2.4 -> 0.2.8

---
 pkgs/tools/misc/snapper/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
index 41a5a6797d14..9f304a75a65c 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -1,12 +1,14 @@
-{ stdenv, fetchgit, autoconf, automake, boost, pkgconfig, libtool, acl, libxml2, btrfs-progs, dbus_libs, docbook_xsl, libxslt, docbook_xml_dtd_45,  diffutils, pam, utillinux, attr, gettext }:
+{ stdenv, fetchFromGitHub, autoconf, automake, boost, pkgconfig, libtool, acl, libxml2, btrfs-progs, dbus_libs, docbook_xsl, libxslt, docbook_xml_dtd_45,  diffutils, pam, utillinux, attr, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "snapper-0.2.4";
+  name = "snapper-${ver}";
+  ver = "0.2.8";
 
-  src = fetchgit {
-    url = "https://github.com/openSUSE/snapper";
-    rev = "24e18153f7a32d0185dcfb20f8b8a4709ba8fe4a";
-    sha256 = "ec4b829430bd7181995e66a26ac86e8ac71c27e77faf8eb06db71d645c6f859b";
+  src = fetchFromGitHub {
+    owner = "openSUSE";
+    repo = "snapper";
+    rev = "v${ver}";
+    sha256 = "1rj8vy6hq140pbnc7mjjb34mfqdgdah1dmlv2073izdgakh7p38j";
   };
 
   buildInputs = [ autoconf automake boost pkgconfig libtool acl libxml2 btrfs-progs dbus_libs docbook_xsl libxslt docbook_xml_dtd_45 diffutils pam utillinux attr gettext ];
@@ -18,8 +20,6 @@ stdenv.mkDerivation rec {
     substituteInPlace snapper/Makefile.am --replace \
       "libsnapper_la_LIBADD = -lboost_thread-mt -lboost_system-mt -lxml2 -lacl -lz -lm" \
       "libsnapper_la_LIBADD = -lboost_thread -lboost_system -lxml2 -lacl -lz -lm";
-    # general cleanup
-    sed -i 's/^INCLUDES/AM_CPPFLAGS/' $(grep -rl ^INCLUDES .|grep "\.am$")
     '';
 
   configurePhase = ''

From 8021b5241c550c6b81f657421874db12327473a7 Mon Sep 17 00:00:00 2001
From: Eric Merritt <eric@merritt.tech>
Date: Sat, 16 Jan 2016 13:47:21 -0800
Subject: [PATCH 0086/2285] rebar3: refactor to make hermetic

This adds changes to the rebar3 expression that patch rebar3 to force it
to be hermetic. Now, by default, rebar3 literally can't download
anything. A 'rebar3-open' expression was added for those folks whe want
the normal rebar3.
---
 doc/erlang-users-guide.xml                    |  17 +++
 .../erlang-modules/hex-packages.nix           | 120 ++----------------
 .../tools/build-managers/rebar3/default.nix   |  14 +-
 .../rebar3/hermetic-rebar3.patch              | 108 ++++++++++++++++
 pkgs/top-level/all-packages.nix               |   3 +-
 5 files changed, 153 insertions(+), 109 deletions(-)
 create mode 100644 pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch

diff --git a/doc/erlang-users-guide.xml b/doc/erlang-users-guide.xml
index 778d6e709b14..074ae50b1c05 100644
--- a/doc/erlang-users-guide.xml
+++ b/doc/erlang-users-guide.xml
@@ -3,6 +3,23 @@
          xml:id="users-guide-to-the-erlang-infrastructure">
 
 <title>User's Guide to the Erlang Infrastructure</title>
+<section xml:id="build-tools">
+  <title>Build Tools</title>
+  <para>
+    By default Rebar3 wants to manage it's own dependencies. In the
+    normal non-Nix, this is perfectly acceptable. In the Nix world it
+    is not. To support this we have created two versions of rebar3,
+    <literal>rebar3</literal> and <literal>rebar3-open</literal>. The
+    <literal>rebar3</literal> version has been patched to remove the
+    ability to download anything from it. If you are not running it a
+    nix-shell or a nix-build then its probably not going to work for
+    you. <literal>rebar3-open</literal> is the normal, un-modified
+    rebar3. It should work exactly as would any other version of
+    rebar3. Any Erlang package should rely on
+    <literal>rebar3</literal> and thats really what you should be
+    using too.
+  </para>
+</section>
 
 <section xml:id="how-to-install-erlang-packages">
   <title>How to install Erlang packages</title>
diff --git a/pkgs/development/erlang-modules/hex-packages.nix b/pkgs/development/erlang-modules/hex-packages.nix
index 9a165503b796..0bceb47452f9 100644
--- a/pkgs/development/erlang-modules/hex-packages.nix
+++ b/pkgs/development/erlang-modules/hex-packages.nix
@@ -99,33 +99,14 @@
 * ucol_nif_1_1_5
 * katipo_0_2_4
 * xref_runner_0_2_4
+* erlexec_1_0_1
+* exec_1_0_1
 */
 { stdenv, callPackage }:
 
 let
   self = rec {
 
-    aws_http_0_2_4 = callPackage
-      (
-        {  buildHex, barrel_jiffy_0_14_4, lhttpc_1_3_0 }:
-          buildHex {
-            name = "aws_http";
-            version = "0.2.4";
-            sha256 =
-              "96065da0d348a8e47e01531cfa720615e15a21c1bd4e5c82decf56026cde128f";
-
-            erlangDeps = [ barrel_jiffy_0_14_4 lhttpc_1_3_0 ];
-
-            meta = {
-              description = "Amazon AWS HTTP helpers";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/anha0825/erl_aws_http";
-            };
-          }
-      ) {};
-
-    aws_http = aws_http_0_2_4;
-
     backoff_1_1_3 = callPackage
       (
         {  buildHex }:
@@ -625,13 +606,15 @@ let
 
     denrei_0_2_3 = callPackage
       (
-        {  buildHex }:
+        {  buildHex, lager_3_0_1, ranch }:
           buildHex {
             name = "denrei";
             version = "0.2.3";
             sha256 =
               "bc0e8cf7e085dda6027df83ef5d63c41b93988bcd7f3db7c68e4dad3cd599744";
 
+            erlangDeps = [ lager_3_0_1 ranch ];
+
             meta = {
               description = "Denrei - a lightweight Erlang messaging system.";
               license = stdenv.lib.licenses.mit;
@@ -1072,26 +1055,6 @@ let
 
     erldn = erldn_1_0_2;
 
-    erlexec_1_0_1 = callPackage
-      (
-        {  buildHex }:
-          buildHex {
-            name = "erlexec";
-            version = "1.0.1";
-            sha256 =
-              "eb1e11f16288db4ea35af08503eabf1250d5540c1e8bd35ba04312f5f703e14f";
-            compilePort = true;
-
-            meta = {
-              description = "OS Process Manager";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/saleyn/erlexec";
-            };
-          }
-      ) {};
-
-    erlexec = erlexec_1_0_1;
-
     erlsh_0_1_0 = callPackage
       (
         {  buildHex }:
@@ -1250,26 +1213,6 @@ let
 
     ex_bitcask = ex_bitcask_0_1_0;
 
-    exec_1_0_1 = callPackage
-      (
-        {  buildHex }:
-          buildHex {
-            name = "exec";
-            version = "1.0.1";
-            sha256 =
-              "87c7ef2dea2bb503bb0eec8cb34776172999aecc6e12d90f7629796a7a3ccb1f";
-            compilePort = true;
-
-            meta = {
-              description = "OS Process Manager";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/saleyn/erlexec";
-            };
-          }
-      ) {};
-
-    exec = exec_1_0_1;
-
     exmerl_0_1_1 = callPackage
       (
         {  buildHex }:
@@ -1796,13 +1739,15 @@ let
 
     jc_1_0_4 = callPackage
       (
-        {  buildHex }:
+        {  buildHex, jsone_1_2_0, jwalk_1_1_0, lager_3_0_1, ranch }:
           buildHex {
             name = "jc";
             version = "1.0.4";
             sha256 =
               "8bcfe202084109fc80fcf521e630466fc53cbb909aff4283bed43252664023df";
 
+            erlangDeps = [ jsone_1_2_0 jwalk_1_1_0 lager_3_0_1 ranch ];
+
             meta = {
               description = "A simple, distributed, in-memory caching system";
               license = stdenv.lib.licenses.mit;
@@ -2012,13 +1957,15 @@ let
 
     key2value_1_4_0 = callPackage
       (
-        {  buildHex }:
+        {  buildHex, lager_3_0_1, barrel_jiffy }:
           buildHex {
             name = "key2value";
             version = "1.4.0";
             sha256 =
               "ad63453fcf54ab853581b78c6d2df56be41ea691ba4bc05920264c19f35a0ded";
 
+            erlangDeps = [ lager_3_0_1 barrel_jiffy ];
+
             meta = {
               description = "Erlang 2-way Map";
               license = stdenv.lib.licenses.bsd3;
@@ -2029,13 +1976,15 @@ let
 
     key2value_1_5_1 = callPackage
       (
-        {  buildHex }:
+        {  buildHex, lager_3_0_1, barrel_jiffy }:
           buildHex {
             name = "key2value";
             version = "1.5.1";
             sha256 =
               "2a40464b9f8ef62e8828d869ac8d2bf9135b4956d29ba4eb044e8522b2d35ffa";
 
+            erlangDeps = [ lager_3_0_1 barrel_jiffy ];
+
             meta = {
               description = "Erlang 2-way Map";
               license = stdenv.lib.licenses.bsd3;
@@ -2432,27 +2381,6 @@ let
 
     neotoma = neotoma_1_7_3;
 
-    observer_cli_1_0_3 = callPackage
-      (
-        {  buildHex, recon_2_2_1 }:
-          buildHex {
-            name = "observer_cli";
-            version = "1.0.3";
-            sha256 =
-              "18e5d9aa5412ec063cf9719bcfe73bf990c5fed5c9a3c8422c2b5d9529fc8b0d";
-
-            erlangDeps = [ recon_2_2_1 ];
-
-            meta = {
-              description = "Visualize Erlang Nodes On The Command Line";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/zhongwencool/observer_cli";
-            };
-          }
-      ) {};
-
-    observer_cli = observer_cli_1_0_3;
-
     p1_stringprep_1_0_0 = callPackage
       (
         {  buildHex, p1_utils_1_0_1 }:
@@ -2702,26 +2630,6 @@ let
 
     pqueue = pqueue_1_5_1;
 
-    proper_1_1_1_beta = callPackage
-      (
-        {  buildHex }:
-          buildHex {
-            name = "proper";
-            version = "1.1.1-beta";
-            sha256 =
-              "bde5c0fef0f8d804a7c06aab4f293d19f42149e5880b3412b75efa608e86d342";
-
-            meta = {
-              description =
-                "QuickCheck-inspired property-based testing tool for Erlang.";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/manopapad/proper";
-            };
-          }
-      ) {};
-
-    proper = proper_1_1_1_beta;
-
     providers_1_6_0 = callPackage
       (
         {  buildHex, getopt_0_8_2 }:
diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix
index dccb67efaf4c..35a5b1b4d405 100644
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -1,5 +1,5 @@
 { stdenv, writeText, callPackage, fetchurl,
-  fetchHex, erlang, rebar3-nix-bootstrap, tree, fetchFromGitHub }:
+  fetchHex, erlang, hermeticRebar3 ? true, rebar3-nix-bootstrap, tree, fetchFromGitHub }:
 
 
 let
@@ -67,6 +67,12 @@ let
     version = "0.2.0";
     sha256 = "03kiszlbgzscfd2ns7na6bzbfzmcqdb5cx3p6qy3657jk2fai332";
   };
+  # {eunit_formatters,    "0.2.0"}
+  rebar3_hex = fetchHex {
+    pkg = "rebar3_hex";
+    version = "1.12.0";
+    sha256 = "45467e93ae8d776c6038fdaeaffbc55d8f2f097f300a54dab9b81c6d1cf21f73";
+  };
 
 in
 stdenv.mkDerivation {
@@ -78,7 +84,9 @@ stdenv.mkDerivation {
     sha256 = "0px66scjdia9aaa5z36qzxb848r56m0k98g0bxw065a2narsh4xy";
   };
 
-  patches = [ ./hermetic-bootstrap.patch ];
+  patches = if hermeticRebar3 == true
+  then  [ ./hermetic-bootstrap.patch ./hermetic-rebar3.patch ]
+  else [];
 
   buildInputs = [ erlang tree  ];
   propagatedBuildInputs = [ registrySnapshot rebar3-nix-bootstrap ];
@@ -88,6 +96,7 @@ stdenv.mkDerivation {
     rebar3-nix-bootstrap registry-only
     echo "$ERL_LIBS"
     mkdir -p _build/default/lib/
+    mkdir -p _build/default/plugins
     cp --no-preserve=mode -R ${erlware_commons} _build/default/lib/erlware_commons
     cp --no-preserve=mode -R ${providers} _build/default/lib/providers
     cp --no-preserve=mode -R ${getopt} _build/default/lib/getopt
@@ -98,6 +107,7 @@ stdenv.mkDerivation {
     cp --no-preserve=mode -R ${eunit_formatters} _build/default/lib/eunit_formatters
     cp --no-preserve=mode -R ${relx} _build/default/lib/relx
     cp --no-preserve=mode -R ${ssl_verify_hostname} _build/default/lib/ssl_verify_hostname
+    cp --no-preserve=mode -R ${rebar3_hex} _build/default/plugins/rebar3_hex
   '';
 
   buildPhase = ''
diff --git a/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch b/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch
new file mode 100644
index 000000000000..8da323ab8235
--- /dev/null
+++ b/pkgs/development/tools/build-managers/rebar3/hermetic-rebar3.patch
@@ -0,0 +1,108 @@
+diff --git a/src/rebar3.erl b/src/rebar3.erl
+index 2b73844..af1d871 100644
+--- a/src/rebar3.erl
++++ b/src/rebar3.erl
+@@ -282,9 +282,11 @@ start_and_load_apps(Caller) ->
+     ensure_running(crypto, Caller),
+     ensure_running(asn1, Caller),
+     ensure_running(public_key, Caller),
+-    ensure_running(ssl, Caller),
+-    inets:start(),
+-    inets:start(httpc, [{profile, rebar}]).
++    ensure_running(ssl, Caller).
++%%    Removed due to the hermicity requirements of Nix
++%%
++%%    inets:start(),
++%%    inets:start(httpc, [{profile, rebar}]).
+ 
+ ensure_running(App, Caller) ->
+     case application:start(App) of
+@@ -339,4 +341,4 @@ safe_define_test_macro(Opts) ->
+ test_defined([{d, 'TEST'}|_]) -> true;
+ test_defined([{d, 'TEST', true}|_]) -> true;
+ test_defined([_|Rest]) -> test_defined(Rest);
+-test_defined([]) -> false.
+\ No newline at end of file
++test_defined([]) -> false.
+diff --git a/src/rebar_hermicity.erl b/src/rebar_hermicity.erl
+new file mode 100644
+index 0000000..d814e2a
+--- /dev/null
++++ b/src/rebar_hermicity.erl
+@@ -0,0 +1,42 @@
++%% -*- erlang-indent-level: 4;indent-tabs-mode: nil -*-
++%% ex: ts=4 sw=4 et
++%% -------------------------------------------------------------------
++%%
++%% rebar: Erlang Build Tools
++%%
++%% Copyright (c) 2016 Eric Merritt (eric@merritt.tech)
++%%
++%% Permission is hereby granted, free of charge, to any person obtaining a copy
++%% of this software and associated documentation files (the "Software"), to deal
++%% in the Software without restriction, including without limitation the rights
++%% to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
++%% copies of the Software, and to permit persons to whom the Software is
++%% furnished to do so, subject to the following conditions:
++%%
++%% The above copyright notice and this permission notice shall be included in
++%% all copies or substantial portions of the Software.
++%%
++%% THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
++%% IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
++%% FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
++%% AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
++%% LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
++%% OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
++%% THE SOFTWARE.
++%% -------------------------------------------------------------------
++-module(rebar_hermicity).
++
++-export([request/5]).
++
++-include("rebar.hrl").
++
++%% ====================================================================
++%% Public API
++%% ====================================================================
++
++request(Method, {Url, _Headers}, _HTTPOptions, _Options, _Profile) ->
++    ?ERROR("A request is being made that violates Nix hermicity "
++           "This request has been stopped. Details of the request "
++           "are as follows:", []),
++    ?ERROR("Requesnt: ~p ~s", [Method, Url]),
++    erlang:halt(1).
+diff --git a/src/rebar_pkg_resource.erl b/src/rebar_pkg_resource.erl
+index 4f55ad1..f76fd5d 100644
+--- a/src/rebar_pkg_resource.erl
++++ b/src/rebar_pkg_resource.erl
+@@ -100,10 +100,10 @@ make_vsn(_) ->
+     {error, "Replacing version of type pkg not supported."}.
+ 
+ request(Url, ETag) ->
+-    case httpc:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]},
+-                       [{ssl, ssl_opts(Url)}, {relaxed, true}],
+-                       [{body_format, binary}],
+-                       rebar) of
++    case rebar_hermicity:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]},
++                                 [{ssl, ssl_opts(Url)}, {relaxed, true}],
++                                 [{body_format, binary}],
++                                 rebar) of
+         {ok, {{_Version, 200, _Reason}, Headers, Body}} ->
+             ?DEBUG("Successfully downloaded ~s", [Url]),
+             {"etag", ETag1} = lists:keyfind("etag", 1, Headers),
+diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl
+index 6637ebe..d82c1d8 100644
+--- a/src/rebar_prv_update.erl
++++ b/src/rebar_prv_update.erl
+@@ -44,8 +44,8 @@ do(State) ->
+         TmpFile = filename:join(TmpDir, "packages.gz"),
+ 
+         Url = rebar_state:get(State, rebar_packages_cdn, ?DEFAULT_HEX_REGISTRY),
+-        case httpc:request(get, {Url, []},
+-                           [], [{stream, TmpFile}, {sync, true}],
++        case rebar_hermicity:request(get, {Url, []},
++                                     [], [{stream, TmpFile}, {sync, true}],
+                            rebar) of
+             {ok, saved_to_file} ->
+                 {ok, Data} = file:read_file(TmpFile),
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa24c4bbf754..e75fb32dbda4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5096,7 +5096,8 @@ let
   erlang_odbc_javac = erlangR18_odbc_javac;
 
   rebar = callPackage ../development/tools/build-managers/rebar { };
-  rebar3 = callPackage ../development/tools/build-managers/rebar3 { };
+  rebar3-open = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = false; };
+  rebar3 = callPackage ../development/tools/build-managers/rebar3 { hermeticRebar3 = true; };
   rebar3-nix-bootstrap = callPackage ../development/tools/erlang/rebar3-nix-bootstrap { };
   fetchHex = callPackage ../development/tools/build-managers/rebar3/fetch-hex.nix { };
 

From 148396c02219f1c6fcdb5991a7de7716cefaa1d8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 18 Jan 2016 02:46:21 +0300
Subject: [PATCH 0087/2285] systemd service: add *.busname upstream units

---
 nixos/modules/system/boot/systemd.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index 211e0423216e..c5ee95f4c9a4 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -61,6 +61,8 @@ let
       "systemd-user-sessions.service"
       "dbus-org.freedesktop.login1.service"
       "dbus-org.freedesktop.machine1.service"
+      "org.freedesktop.login1.busname"
+      "org.freedesktop.machine1.busname"
       "user@.service"
 
       # Journal.
@@ -147,10 +149,14 @@ let
       "systemd-tmpfiles-setup-dev.service"
 
       # Misc.
+      "org.freedesktop.systemd1.busname"
       "systemd-sysctl.service"
       "dbus-org.freedesktop.timedate1.service"
       "dbus-org.freedesktop.locale1.service"
       "dbus-org.freedesktop.hostname1.service"
+      "org.freedesktop.timedate1.busname"
+      "org.freedesktop.locale1.busname"
+      "org.freedesktop.hostname1.busname"
       "systemd-timedated.service"
       "systemd-localed.service"
       "systemd-hostnamed.service"

From 4c1e9ffd12fc5d40cfbaca40346f3d81f4259c71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 18 Jan 2016 18:45:03 +0100
Subject: [PATCH 0088/2285] gmock: refactor source

---
 pkgs/development/libraries/gmock/default.nix | 18 ++++++++++--------
 pkgs/development/libraries/gmock/source.nix  | 20 --------------------
 2 files changed, 10 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/development/libraries/gmock/source.nix

diff --git a/pkgs/development/libraries/gmock/default.nix b/pkgs/development/libraries/gmock/default.nix
index 23a7ef43625c..926832dbada6 100644
--- a/pkgs/development/libraries/gmock/default.nix
+++ b/pkgs/development/libraries/gmock/default.nix
@@ -1,11 +1,13 @@
-{ stdenv, cmake, callPackage }:
-let
-  source = callPackage ./source.nix { };
-in
-stdenv.mkDerivation rec {
-  name = "gmock-${source.version}";
+{ stdenv, cmake, fetchzip }:
 
-  src = source;
+stdenv.mkDerivation rec {
+  name = "gmock-${version}";
+  version = "1.7.0";
+
+  src = fetchzip {
+    url = "https://googlemock.googlecode.com/files/gmock-${version}.zip";
+    sha256 = "04n9p6pf3mrqsabrsncv32d3fqvd86zmcdq3gyni7liszgfk0paz";
+  };
 
   buildInputs = [ cmake ];
 
@@ -28,5 +30,5 @@ stdenv.mkDerivation rec {
     maintainers = [ stdenv.lib.maintainers.auntie ];
   };
 
-  passthru = { inherit source; };
+  passthru = { source = src; };
 }
diff --git a/pkgs/development/libraries/gmock/source.nix b/pkgs/development/libraries/gmock/source.nix
deleted file mode 100644
index c40a7cc5d4da..000000000000
--- a/pkgs/development/libraries/gmock/source.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ fetchzip, stdenv, unzip, ... }:
-
-stdenv.mkDerivation rec {
-  name = "gmock-src-${version}";
-  version = "1.7.0";
-
-  src = fetchzip {
-    url = "https://googlemock.googlecode.com/files/gmock-${version}.zip";
-    sha256="04n9p6pf3mrqsabrsncv32d3fqvd86zmcdq3gyni7liszgfk0paz";
-  };
-
-  buildInputs = [ unzip ];
-
-  installPhase = ''
-    mkdir $out
-    cp -r * $out
-  '';
-
-  passthru = { inherit version; };
-}

From 2ad985f3edcd181dac7a083939100d08c1e70d04 Mon Sep 17 00:00:00 2001
From: Slawomir Gonet <slawek@otwiera.cz>
Date: Mon, 18 Jan 2016 19:03:35 +0100
Subject: [PATCH 0089/2285] pioneer: nixpkg added

---
 pkgs/games/pioneer/default.nix  | 42 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/games/pioneer/default.nix

diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix
new file mode 100644
index 000000000000..fc5bfbb4b705
--- /dev/null
+++ b/pkgs/games/pioneer/default.nix
@@ -0,0 +1,42 @@
+{ fetchFromGitHub, stdenv, automake, curl, libsigcxx, SDL2
+, SDL2_image, freetype, libvorbis, libpng, assimp, mesa
+, autoconf, pkgconfig }:
+
+let
+  version = "20160116";
+  checksum = "07w5yin2xhb0fdlj1aipi64yx6vnr1siahsy0bxvzi06d73ffj6r";
+in
+stdenv.mkDerivation rec {
+  name = "pioneer-${version}";
+
+  src = fetchFromGitHub{
+    owner = "pioneerspacesim";
+    repo = "pioneer";
+    rev = version;
+    sha256 = checksum;
+  };
+
+  buildInputs = [
+    automake curl libsigcxx SDL2 SDL2_image freetype libvorbis
+    libpng assimp mesa autoconf pkgconfig
+  ];
+
+  NIX_CFLAGS_COMPILE = [
+    "-I${SDL2}/include/SDL2"
+  ];
+
+
+  preConfigure = ''
+     export PIONEER_DATA_DIR="$out/share/pioneer/data";
+    ./bootstrap
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Pioneer is a space adventure game set in the Milky Way galaxy at the turn of the 31st century.";
+    homepage = "http://pioneerspacesim.net";
+    license = with licenses; [
+        gpl3 cc-by-sa-30
+    ];
+    platforms = [ "x86_64-linux" "i686-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db389d42c351..7b24a4978f52 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14220,6 +14220,8 @@ let
 
   pingus = callPackage ../games/pingus {};
 
+  pioneer = callPackage ../games/pioneer { };
+
   pioneers = callPackage ../games/pioneers { };
 
   planetary_annihilation = callPackage ../games/planetaryannihilation { };

From a07e5839af36f6e384821a9d0751003568ae90f4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 18 Jan 2016 19:24:54 +0100
Subject: [PATCH 0090/2285] snapper: use autoreconfHook

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

diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
index 9f304a75a65c..111cf1b75d28 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchFromGitHub, autoconf, automake, boost, pkgconfig, libtool, acl, libxml2, btrfs-progs, dbus_libs, docbook_xsl, libxslt, docbook_xml_dtd_45,  diffutils, pam, utillinux, attr, gettext }:
+{ stdenv, fetchFromGitHub
+, autoreconfHook, diffutils, pkgconfig, docbook_xsl, libxml2, libxslt, docbook_xml_dtd_45
+, acl, attr, boost, btrfs-progs, dbus_libs, pam, utillinux }:
 
 stdenv.mkDerivation rec {
   name = "snapper-${ver}";
@@ -11,7 +13,13 @@ stdenv.mkDerivation rec {
     sha256 = "1rj8vy6hq140pbnc7mjjb34mfqdgdah1dmlv2073izdgakh7p38j";
   };
 
-  buildInputs = [ autoconf automake boost pkgconfig libtool acl libxml2 btrfs-progs dbus_libs docbook_xsl libxslt docbook_xml_dtd_45 diffutils pam utillinux attr gettext ];
+  buildInputs = [
+    acl attr boost btrfs-progs dbus_libs pam utillinux
+  ];
+  nativeBuildInputs = [
+    autoreconfHook diffutils pkgconfig
+    docbook_xsl libxml2 libxslt docbook_xml_dtd_45
+  ];
 
   patchPhase = ''
     # work around missing btrfs/version.h; otherwise, use "-DHAVE_BTRFS_VERSION_H"
@@ -23,12 +31,6 @@ stdenv.mkDerivation rec {
     '';
 
   configurePhase = ''
-    aclocal
-    libtoolize --force --automake --copy
-    autoheader
-    automake --add-missing --copy
-    autoconf
-
     ./configure --disable-silent-rules --disable-ext4 --disable-btrfs-quota --prefix=$out
     '';
 

From 34c1f87750a34f6c0b089e5e76eb9370a341f72b Mon Sep 17 00:00:00 2001
From: Matthew O'Gorman <mog@rldn.net>
Date: Mon, 18 Jan 2016 13:35:07 -0500
Subject: [PATCH 0091/2285] paho-mqtt: init at 1.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 41f0afd9e705..598863c31d75 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13788,6 +13788,25 @@ in modules // {
     propagatedBuildInputs = [self.numpy];
   };
 
+  paho-mqtt = buildPythonPackage rec {
+    name = "paho-mqtt-${version}";
+    version = "1.1";
+
+    disabled = isPyPy || isPy26;
+
+    src = pkgs.fetchurl {
+        url = "https://pypi.python.org/packages/source/p/paho-mqtt/${name}.tar.gz";
+        sha256 = "07i6k9mw66kgbvjgsrcsd2sjji9ckym50dcxnmhjqfkfzsg64yhg";
+    };
+
+    meta = {
+      homepage = "https://eclipse.org/paho/";
+      description = "mqtt library for machine to machine and internet of things";
+      license = licenses.epl10;
+      maintainers = with maintainers; [ mog ];
+    };
+  };
+
   parsedatetime = buildPythonPackage rec {
     name = "parsedatetime-${version}";
     version = "1.4";

From d422861055701d28427e2680921fdc5f44f9eda0 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Sat, 16 Jan 2016 16:28:12 +0100
Subject: [PATCH 0092/2285] Refactor Pharo to allow co-installation of VMs

---
 pkgs/development/pharo/vm/build-vm.nix        | 51 ++++++++-----------
 pkgs/development/pharo/vm/default.nix         |  6 +--
 .../share/applications/pharo-vm.desktop       | 11 ----
 pkgs/development/pharo/vm/share.nix           | 48 +++++++++++++++++
 4 files changed, 72 insertions(+), 44 deletions(-)
 delete mode 100644 pkgs/development/pharo/vm/resources/share/applications/pharo-vm.desktop
 create mode 100644 pkgs/development/pharo/vm/share.nix

diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix
index b5fa7a97e133..d18f64c9aba3 100644
--- a/pkgs/development/pharo/vm/build-vm.nix
+++ b/pkgs/development/pharo/vm/build-vm.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo }:
+{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, makeDesktopItem }:
 
 { name, src, binary-basename, ... }:
 
@@ -6,24 +6,19 @@ stdenv.mkDerivation rec {
 
   inherit name src binary-basename;
 
-  sources10Zip = fetchurl {
-    url = http://files.pharo.org/sources/PharoV10.sources.zip;
-    sha256 = "0aijhr3w5w3jzmnpl61g6xkwyi2l1mxy0qbvr9k3whz8zlrsijh2";
-  };
+  pharo-share = import ./share.nix { inherit stdenv fetchurl unzip; };
 
-  sources20Zip = fetchurl {
-    url = http://files.pharo.org/sources/PharoV20.sources.zip;
-    sha256 = "1xsc0p361pp8iha5zckppw29sbapd706wbvzvgjnkv2n6n1q5gj7";
-  };
-
-  sources30Zip = fetchurl {
-    url = http://files.pharo.org/sources/PharoV30.sources.zip;
-    sha256 = "08d9a7gggwpwgrfbp7iv5896jgqz3vgjfrq19y3jw8k10pva98ak";
-  };
-
-  sources40Zip = fetchurl {
-    url = http://files.pharo.org/sources/PharoV40.sources.zip;
-    sha256 = "1xq1721ql19hpgr8ir372h92q7g8zwd6k921b21dap4wf8djqnpd";
+  desktopItem = makeDesktopItem {
+    inherit name;
+    desktopName = "Pharo VM";
+    genericName = "Pharo Virtual Machine";
+    exec = "${binary-basename}-x %F";
+    icon = "pharo";
+    terminal = "false";
+    type="Application";
+    startupNotify = "false";
+    categories = "Development;";
+    mimeType = "application/x-pharo-image";
   };
 
   # Building
@@ -32,9 +27,7 @@ stdenv.mkDerivation rec {
   '';
   resources = ./resources;
   installPhase = ''
-    echo Current directory $(pwd)
-    echo Creating prefix "$prefix"
-    mkdir -p "$prefix/lib/pharo-vm"
+    mkdir -p "$prefix/lib/$name"
 
     cd ../../results
 
@@ -44,9 +37,10 @@ stdenv.mkDerivation rec {
     mv vm-sound-ALSA vm-sound-ALSA.so
     mv pharo pharo-vm
 
-    cp * "$prefix/lib/pharo-vm"
+    cp * "$prefix/lib/$name"
 
-    cp -R "$resources/"* "$prefix/"
+    mkdir -p "$prefix/share/applications"
+    cp "${desktopItem}/share/applications/"* $prefix/share/applications
 
     mkdir $prefix/bin
 
@@ -57,7 +51,7 @@ stdenv.mkDerivation rec {
     # disable parameter expansion to forward all arguments unprocessed to the VM
     set -f
 
-    exec $prefix/lib/pharo-vm/pharo-vm "\$@"
+    exec $prefix/lib/$name/pharo-vm "\$@"
     EOF
 
     cat > $prefix/bin/${binary-basename}-nox <<EOF
@@ -66,18 +60,15 @@ stdenv.mkDerivation rec {
     # disable parameter expansion to forward all arguments unprocessed to the VM
     set -f
 
-    exec $prefix/lib/pharo-vm/pharo-vm -vm-display-null "\$@"
+    exec $prefix/lib/$name/pharo-vm -vm-display-null "\$@"
     EOF
 
     chmod +x $prefix/bin/${binary-basename}-x $prefix/bin/${binary-basename}-nox
 
-    unzip ${sources10Zip} -d $prefix/lib/pharo-vm/
-    unzip ${sources20Zip} -d $prefix/lib/pharo-vm/
-    unzip ${sources30Zip} -d $prefix/lib/pharo-vm/
-    unzip ${sources40Zip} -d $prefix/lib/pharo-vm/
+    ln -s "${pharo-share}/lib/"*.sources $prefix/lib/$name
   '';
 
-  buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo ];
+  buildInputs = [ bash unzip cmake glibc openssl gcc mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ];
 
   meta = {
     description = "Clean and innovative Smalltalk-inspired environment";
diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix
index f23bb900ae94..9af1b5ad5ba1 100644
--- a/pkgs/development/pharo/vm/default.nix
+++ b/pkgs/development/pharo/vm/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo } @args:
+{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, makeDesktopItem } @args:
 
 rec {
   pharo-vm-build = import ./build-vm.nix args;
@@ -10,7 +10,7 @@ rec {
     name = "pharo-vm-i386-${version}";
     binary-basename = "pharo-vm";
     src = fetchurl {
-      url = "$base-url/pharo-vm-${version}.tar.bz2";
+      url = "${base-url}/pharo-vm-${version}.tar.bz2";
       sha256 = "1kmb6phxb94d37awwldwbkj704l6m0c6sv0m54mcz6d4rx41fqgp";
     };
   };
@@ -20,7 +20,7 @@ rec {
     name = "pharo-vm-spur-i386-${version}";
     binary-basename = "pharo-spur-vm";
     src = fetchurl {
-      url = "$base-url/pharo-vm-spur-${version}.tar.bz2";
+      url = "${base-url}/pharo-vm-spur-${version}.tar.bz2";
       sha256 = "1746kisa3wkhg1kwgjs544s3f17r8h99kr728qc4nk035dxkjfbx";
     };
   };
diff --git a/pkgs/development/pharo/vm/resources/share/applications/pharo-vm.desktop b/pkgs/development/pharo/vm/resources/share/applications/pharo-vm.desktop
deleted file mode 100644
index 9061ec9b8e50..000000000000
--- a/pkgs/development/pharo/vm/resources/share/applications/pharo-vm.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Pharo VM
-GenericName=Pharo Virtual Machine
-Exec=pharo-vm-x %F
-Icon=pharo
-Terminal=false
-Type=Application
-StartupNotify=false
-Categories=Development;
-MimeType=application/x-pharo-image;
-NoDisplay=true
diff --git a/pkgs/development/pharo/vm/share.nix b/pkgs/development/pharo/vm/share.nix
new file mode 100644
index 000000000000..27485af6f989
--- /dev/null
+++ b/pkgs/development/pharo/vm/share.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchurl, unzip }:
+
+stdenv.mkDerivation rec {
+  version = "1.0";
+  name = "pharo-share-${version}";
+
+  src = ./resources;
+
+  sources10Zip = fetchurl {
+    url = http://files.pharo.org/sources/PharoV10.sources.zip;
+    sha256 = "0aijhr3w5w3jzmnpl61g6xkwyi2l1mxy0qbvr9k3whz8zlrsijh2";
+  };
+
+  sources20Zip = fetchurl {
+    url = http://files.pharo.org/sources/PharoV20.sources.zip;
+    sha256 = "1xsc0p361pp8iha5zckppw29sbapd706wbvzvgjnkv2n6n1q5gj7";
+  };
+
+  sources30Zip = fetchurl {
+    url = http://files.pharo.org/sources/PharoV30.sources.zip;
+    sha256 = "08d9a7gggwpwgrfbp7iv5896jgqz3vgjfrq19y3jw8k10pva98ak";
+  };
+
+  sources40Zip = fetchurl {
+    url = http://files.pharo.org/sources/PharoV40.sources.zip;
+    sha256 = "1xq1721ql19hpgr8ir372h92q7g8zwd6k921b21dap4wf8djqnpd";
+  };
+
+  buildInputs = [ unzip ];
+
+  installPhase = ''
+    mkdir -p $prefix/lib
+
+    cp -R "$src/"* "$prefix/"
+
+    unzip ${sources10Zip} -d $prefix/lib/
+    unzip ${sources20Zip} -d $prefix/lib/
+    unzip ${sources30Zip} -d $prefix/lib/
+    unzip ${sources40Zip} -d $prefix/lib/
+  '';
+
+  meta = {
+    description = "Shared files for Pharo";
+    homepage = http://pharo.org;
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.DamienCassou ];
+  };
+}

From 93bd5a2c3216f203b86fd9f4c970514c89bf2611 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 14 Jan 2016 21:52:31 -0600
Subject: [PATCH 0093/2285] elpa-packages 2016-01-18

The ELPA package expressions are now generated as a single file to
improve evaluation performance.
---
 .../editors/emacs-modes/elpa-generated.nix    | 1822 +++++++++++++++++
 .../editors/emacs-modes/elpa-packages.json    | 1337 ------------
 .../editors/emacs-modes/elpa-packages.nix     |   46 +-
 3 files changed, 1832 insertions(+), 1373 deletions(-)
 create mode 100644 pkgs/applications/editors/emacs-modes/elpa-generated.nix
 delete mode 100644 pkgs/applications/editors/emacs-modes/elpa-packages.json

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
new file mode 100644
index 000000000000..409e05748fa3
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -0,0 +1,1822 @@
+{ callPackage }: {
+    ace-window = callPackage ({ avy, elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "ace-window";
+        version = "0.9.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/ace-window-0.9.0.el";
+          sha256 = "1m7fc4arcxn7fp0hnzyp20czjp4zx3rjaspfzpxzgc8sbghi81a3";
+        };
+        packageRequires = [ avy ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/ace-window.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ack = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "ack";
+        version = "1.5";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/ack-1.5.tar";
+          sha256 = "0sljshiy44z27idy0rxjs2fx4smlm4v607wic7md1vihp6qp4l9r";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/ack.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ada-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, wisi }:
+    elpaBuild {
+        pname = "ada-mode";
+        version = "5.1.8";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/ada-mode-5.1.8.tar";
+          sha256 = "015lmliwk4qa2sbs9spxik6dnwsf1a34py6anklf92qnmzhjicy6";
+        };
+        packageRequires = [ cl-lib emacs wisi ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/ada-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ada-ref-man = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "ada-ref-man";
+        version = "2012.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/ada-ref-man-2012.0.tar";
+          sha256 = "1g97892h8d1xa7cfxgg4i232i15hhci7gijj0dzc31yd9vbqayx8";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/ada-ref-man.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    adaptive-wrap = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "adaptive-wrap";
+        version = "0.5";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/adaptive-wrap-0.5.el";
+          sha256 = "0frgmp8vrrml4iykm60j4d6cl9rbcivy9yh24q6kd10bcyx59ypy";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/adaptive-wrap.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    adjust-parens = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "adjust-parens";
+        version = "3.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/adjust-parens-3.0.tar";
+          sha256 = "16gmrgdfyqs7i617669f7xy5mds1svbyfv12xhdjk96rbssfngzg";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/adjust-parens.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    aggressive-indent = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+    elpaBuild {
+        pname = "aggressive-indent";
+        version = "1.4";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/aggressive-indent-1.4.el";
+          sha256 = "0qdpvdzmw4hq2g8krx93fbb352nkg731p7v82zhqw76y79khdpka";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/aggressive-indent.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+    elpaBuild {
+        pname = "ahungry-theme";
+        version = "1.0.12";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/ahungry-theme-1.0.12.tar";
+          sha256 = "0a6mlxka1b7vja4wxd8gvfhfk5i1jdj3a851c7dn34hz1lkgvnx8";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/ahungry-theme.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    all = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "all";
+        version = "1.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/all-1.0.el";
+          sha256 = "17h4cp0xnh08szh3snbmn1mqq2smgqkn45bq7v0cpsxq1i301hi3";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/all.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ascii-art-to-unicode = callPackage ({ elpaBuild, fetchurl, lib }:
+    elpaBuild {
+        pname = "ascii-art-to-unicode";
+        version = "1.9";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/ascii-art-to-unicode-1.9.el";
+          sha256 = "0lfgfkx81s4dd318xcxsl7hdgpi0dc1fv3d00m3xg8smyxcf3adv";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/ascii-art-to-unicode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    async = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "async";
+        version = "1.6";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/async-1.6.tar";
+          sha256 = "17psvz75n42x33my967wkgi7r0blx46n3jdv510j0z5jswv66039";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/async.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "auctex";
+        version = "11.89";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/auctex-11.89.tar";
+          sha256 = "0ggk2q17wq4y9yw5b9mykk153ihphazjdj1fl4lv0zblgnrxz5l5";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/auctex.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    aumix-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "aumix-mode";
+        version = "7";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/aumix-mode-7.el";
+          sha256 = "0qyjw2g3pzcxqdg1cpp889nmb524jxqq32dz7b7cg2m903lv5gmv";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/aumix-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-overlays = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "auto-overlays";
+        version = "0.10.9";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/auto-overlays-0.10.9.tar";
+          sha256 = "0aqjp3bkd7mi191nm971z857s09py390ikcd93hyhmknblk0v14p";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/auto-overlays.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    avy = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+    elpaBuild {
+        pname = "avy";
+        version = "0.3.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/avy-0.3.0.tar";
+          sha256 = "1ycfqabx949s7dgp9vhyb9phpxw83gjw4cc7914gr84bqlkj0458";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/avy.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }: elpaBuild {
+        pname = "beacon";
+        version = "0.6.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/beacon-0.6.1.el";
+          sha256 = "0zg3gzfx06f3pj7mipfdmhmafvcil0idha3wdi068cza7akmyiwb";
+        };
+        packageRequires = [ seq ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/beacon.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bug-hunter = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, seq }:
+    elpaBuild {
+        pname = "bug-hunter";
+        version = "1.0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/bug-hunter-1.0.1.el";
+          sha256 = "0c0pg542y09c1k25dxk2062pj3cj12i73kqxbpq0m6af0qm7wy9d";
+        };
+        packageRequires = [ cl-lib seq ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/bug-hunter.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    caps-lock = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "caps-lock";
+        version = "1.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/caps-lock-1.0.el";
+          sha256 = "1i4hwam81p4dr0bk8257fkiz4xmv6knkjxj7a00fa35kgx5blpva";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/caps-lock.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    chess = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    elpaBuild {
+        pname = "chess";
+        version = "2.0.4";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/chess-2.0.4.tar";
+          sha256 = "1sq1bjmp513vldfh7hc2bbfc54665abqiz0kqgqq3gijckaxn5js";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/chess.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cl-generic = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "cl-generic";
+        version = "0.2";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/cl-generic-0.2.el";
+          sha256 = "0b2y114f14fdlk5hkb0fvdbv6pqm9ifw0vwzri1vqp1xq1l1f9p3";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/cl-generic.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cl-lib = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "cl-lib";
+        version = "0.5";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/cl-lib-0.5.el";
+          sha256 = "1z4ffcx7b95bxz52586lhvdrdm5vp473g3afky9h5my3jp5cd994";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/cl-lib.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    coffee-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "coffee-mode";
+        version = "0.4.1.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/coffee-mode-0.4.1.1.el";
+          sha256 = "1jffd8rqmc3l597db26rggis6apf91glyzm1qvpf5g3iz55g6slz";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/coffee-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+    elpaBuild {
+        pname = "company";
+        version = "0.8.12";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/company-0.8.12.tar";
+          sha256 = "1r7q813rjs4dgknsfqi354ahsvk8k4ld4xh1fkp8lbxb13da6gqx";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/company.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-math = callPackage ({ company, elpaBuild, fetchurl, lib, math-symbol-lists }:
+    elpaBuild {
+        pname = "company-math";
+        version = "1.0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/company-math-1.0.1.el";
+          sha256 = "1lkj9cqhmdf3h5zvr94hszkz1251i2rq2mycnhscsnzrk5ll3gck";
+        };
+        packageRequires = [ company math-symbol-lists ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/company-math.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-statistics = callPackage ({ company, elpaBuild, emacs, fetchurl, lib }:
+    elpaBuild {
+        pname = "company-statistics";
+        version = "0.2.2";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/company-statistics-0.2.2.tar";
+          sha256 = "0h1k0dbb7ngk6pghli2csfpzpx37si0wg840jmay0jlb80q6vw73";
+        };
+        packageRequires = [ company emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/company-statistics.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    context-coloring = callPackage ({ elpaBuild, emacs, fetchurl, js2-mode, lib }:
+    elpaBuild {
+        pname = "context-coloring";
+        version = "7.2.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/context-coloring-7.2.0.el";
+          sha256 = "0l7mzmnhqh6sri1fhhv51khi0fnpfp51drzy725s6zfmpbrcn7vn";
+        };
+        packageRequires = [ emacs js2-mode ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/context-coloring.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    crisp = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "crisp";
+        version = "1.3.4";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/crisp-1.3.4.el";
+          sha256 = "1xbnf7xlw499zsnr5ky2bghb2fzg3g7cf2ldmbb7c3b84raryn0i";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/crisp.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    csv-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "csv-mode";
+        version = "1.5";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/csv-mode-1.5.el";
+          sha256 = "1dmc6brb6m9s29wsr6giwpf77yindfq47344l9jr31hqgg82x1xc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/csv-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    darkroom = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    elpaBuild {
+        pname = "darkroom";
+        version = "0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/darkroom-0.1.el";
+          sha256 = "0fif8fm1h7x7g16949shfnaik5f5488clsvkf8bi5izpqp3vi6ak";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/darkroom.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dash = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "dash";
+        version = "2.12.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/dash-2.12.0.tar";
+          sha256 = "02r547vian59zr55z6ri4p2b7q5y5k256wi9j8a317vjzyh54m05";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/dash.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dbus-codegen = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    elpaBuild {
+        pname = "dbus-codegen";
+        version = "0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/dbus-codegen-0.1.el";
+          sha256 = "1gi7jc6rn6hlgh01zfwb7cczb5hi3c05wlnzw6akj1h9kai1lmzw";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/dbus-codegen.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    debbugs = callPackage ({ async, elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "debbugs";
+        version = "0.8";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/debbugs-0.8.tar";
+          sha256 = "1wp5wa2a0rwvpfdzd2b78k6vd26qbyqwl4p2c2s5l7zkqy258in5";
+        };
+        packageRequires = [ async ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/debbugs.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dict-tree = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA, trie }:
+    elpaBuild {
+        pname = "dict-tree";
+        version = "0.12.8";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/dict-tree-0.12.8.el";
+          sha256 = "08jaifqaq9cfz1z4fr4ib9l6lbx4x60q7d6gajx1cdhh18x6nys5";
+        };
+        packageRequires = [ heap tNFA trie ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/dict-tree.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    diff-hl = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    elpaBuild {
+        pname = "diff-hl";
+        version = "1.8.2";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/diff-hl-1.8.2.tar";
+          sha256 = "1y0v5fiizkmhzafiscrcqjzxpwjcag5rx79lq3iplh58vxlmb65w";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/diff-hl.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dismal = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    elpaBuild {
+        pname = "dismal";
+        version = "1.5";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/dismal-1.5.tar";
+          sha256 = "1vhs6w6c2klsrfjpw8vr5c4gwiw83ppdjhsn2la0fvkm60jmc476";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/dismal.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    djvu = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "djvu";
+        version = "0.5";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/djvu-0.5.el";
+          sha256 = "1wpyv4ismfsz5hfaj75j3h3nni1mnk33czhw3rd45cf32a2zkqsj";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/djvu.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    docbook = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "docbook";
+        version = "0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/docbook-0.1.el";
+          sha256 = "01x0g8dhw65mzp9mk6qhx9p2bsvkw96hz1awrrf2ji17sp8hd1v6";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/docbook.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dts-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "dts-mode";
+        version = "0.1.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/dts-mode-0.1.0.el";
+          sha256 = "08xwqbdg0gwipc3gfacs3gpc6zz6lhkw7pyj7n9qhg020c4qv7hq";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/dts-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    easy-kill = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+    elpaBuild {
+        pname = "easy-kill";
+        version = "0.9.3";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/easy-kill-0.9.3.tar";
+          sha256 = "17nw0mglmg877axwg1d0gs03yc0p04lzmd3pl0nsnqbh3303fnqb";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/easy-kill.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ediprolog = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "ediprolog";
+        version = "1.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/ediprolog-1.1.el";
+          sha256 = "19qaciwhzr7k624z455fi8i0v5kl10587ha2mfx1bdsym7y376yd";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/ediprolog.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    el-search = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+        pname = "el-search";
+        version = "0.1.3";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/el-search-0.1.3.el";
+          sha256 = "1iwglpzs78zy07k3ijbwgv9781bs5cpf088giyz6bn5amfpp1jks";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/el-search.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eldoc-eval = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "eldoc-eval";
+        version = "0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/eldoc-eval-0.1.el";
+          sha256 = "1mnhxdsn9h43iq941yqmg92v3hbzwyg7acqfnz14q5g52bnagg19";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/eldoc-eval.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    electric-spacing = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "electric-spacing";
+        version = "5.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/electric-spacing-5.0.el";
+          sha256 = "1jk6v84z0n8jljzsz4wk7rgzh7drpfvxf4bp6xis8gapnd3ycfyv";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/electric-spacing.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    enwc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "enwc";
+        version = "1.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/enwc-1.0.tar";
+          sha256 = "19mjkcgnacygzwm5dsayrwpbzfxadp9kdmmghrk1vir2hwixgv8y";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/enwc.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    epoch-view = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "epoch-view";
+        version = "0.0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/epoch-view-0.0.1.el";
+          sha256 = "1wy25ryyg9f4v83qjym2pwip6g9mszhqkf5a080z0yl47p71avfx";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/epoch-view.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ergoemacs-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib, undo-tree }:
+    elpaBuild {
+        pname = "ergoemacs-mode";
+        version = "5.14.7.3";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/ergoemacs-mode-5.14.7.3.tar";
+          sha256 = "0lqqrnw6z9w7js8r40khckjc1cyxdiwx8kapf5pvyfs09gs89i90";
+        };
+        packageRequires = [ emacs undo-tree ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/ergoemacs-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild {
+        pname = "exwm";
+        version = "0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/exwm-0.1.tar";
+          sha256 = "18w9a37v8lyyjj8ll2f5mw8fw14g54b887cflzv5d576k5f606f5";
+        };
+        packageRequires = [ xelb ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/exwm.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    f90-interface-browser = callPackage ({ elpaBuild, fetchurl, lib }:
+    elpaBuild {
+        pname = "f90-interface-browser";
+        version = "1.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/f90-interface-browser-1.1.el";
+          sha256 = "0mf32w2bgc6b43k0r4a11bywprj7y3rvl21i0ry74v425r6hc3is";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/f90-interface-browser.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flylisp = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+    elpaBuild {
+        pname = "flylisp";
+        version = "0.2";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/flylisp-0.2.el";
+          sha256 = "0hh09qy1xwlv52lsh49nr11h4lk8qlmk06b669q494d79hxyv4v6";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/flylisp.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fsm = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+    elpaBuild {
+        pname = "fsm";
+        version = "0.2";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/fsm-0.2.el";
+          sha256 = "1kh1r5by1q2x8bbg0z2jzmb5i6blvlf105mavrnbcxa6ghbiz6iy";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/fsm.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ggtags = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+    elpaBuild {
+        pname = "ggtags";
+        version = "0.8.11";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/ggtags-0.8.11.el";
+          sha256 = "1q2bp2b7lylf7n6c1psfn5swyjg0y78ykm0ak2kd84pbyhqak2mq";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/ggtags.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    elpaBuild {
+        pname = "gnorb";
+        version = "1.1.2";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/gnorb-1.1.2.tar";
+          sha256 = "18d5wdv33lcg96m3ljnv9zn98in27apm7bjycgq0asd2f31dvcvx";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/gnorb.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gnugo = callPackage ({ ascii-art-to-unicode, cl-lib ? null, elpaBuild, fetchurl, lib, xpm }:
+    elpaBuild {
+        pname = "gnugo";
+        version = "3.0.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/gnugo-3.0.0.tar";
+          sha256 = "0b94kbqxir023wkmqn9kpjjj2v0gcz856mqipz30gxjbjj42w27x";
+        };
+        packageRequires = [ ascii-art-to-unicode cl-lib xpm ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/gnugo.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    heap = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "heap";
+        version = "0.3";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/heap-0.3.el";
+          sha256 = "1347s06nv88zyhmbimvn13f13d1r147kn6kric1ki6n382zbw6k6";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/heap.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    html5-schema = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "html5-schema";
+        version = "0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/html5-schema-0.1.tar";
+          sha256 = "19k1jal6j64zq78w8h0lw7cljivmp2jzs5sa1ppc0mqkpn2hyq1i";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/html5-schema.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hydra = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    elpaBuild {
+        pname = "hydra";
+        version = "0.13.4";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/hydra-0.13.4.tar";
+          sha256 = "11msy6n075iv00c2r9f85bzx3srnj403rhlga1rgsl6vsryf21fj";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/hydra.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ioccur = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "ioccur";
+        version = "2.4";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/ioccur-2.4.el";
+          sha256 = "1isid3kgsi5qkz27ipvmp9v5knx0qigmv7lz12mqdkwv8alns1p9";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/ioccur.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    iterators = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+        pname = "iterators";
+        version = "0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/iterators-0.1.el";
+          sha256 = "0rljqdaj88cbhngj4ddd2z3bfd35r84aivq4h10mk4n4h8whjpj4";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/iterators.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    javaimp = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "javaimp";
+        version = "0.6";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/javaimp-0.6.el";
+          sha256 = "00a37jv9wbzy521a15vk7a66rsf463zzr57adc8ii2m4kcyldpqh";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/javaimp.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jgraph-mode = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    elpaBuild {
+        pname = "jgraph-mode";
+        version = "1.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/jgraph-mode-1.1.el";
+          sha256 = "0479irjz5r79x6ngl3lfkl1gqsmvcw8kn6285sm6nkn66m1dfs8l";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/jgraph-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    js2-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+    elpaBuild {
+        pname = "js2-mode";
+        version = "20150909";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/js2-mode-20150909.tar";
+          sha256 = "1ha696jl9k1325r3xlr11rx6lmd545p42f8biw4hb0q1zsr2306h";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/js2-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jumpc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "jumpc";
+        version = "3.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/jumpc-3.0.el";
+          sha256 = "1vhggw3mzaq33al8f16jbg5qq5f95s8365is9qqyb8yq77gqym6a";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/jumpc.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    landmark = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "landmark";
+        version = "1.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/landmark-1.0.el";
+          sha256 = "0mz1l9zc1nvggjhg4jcly8ncw38xkprlrha8l8vfl9k9rg7s1dv4";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/landmark.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    let-alist = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "let-alist";
+        version = "1.0.4";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/let-alist-1.0.4.el";
+          sha256 = "07312bvvyz86lf64vdkxg2l1wgfjl25ljdjwlf1bdzj01c4hm88x";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/let-alist.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "lex";
+        version = "1.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/lex-1.1.tar";
+          sha256 = "1i6ri3k2b2nginhnmwy67mdpv5p75jkxjfwbf42wymza8fxzwbb7";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/lex.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lmc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "lmc";
+        version = "1.3";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/lmc-1.3.el";
+          sha256 = "0s5dkksgfbfbhc770z1n7d4jrkpcb8z1935abgrw80icxgsrc01p";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/lmc.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    load-dir = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "load-dir";
+        version = "0.0.3";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/load-dir-0.0.3.el";
+          sha256 = "0w5rdc6gr7nm7r0d258mp5sc06n09mmz7kjg8bd3sqnki8iz7s32";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/load-dir.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    load-relative = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "load-relative";
+        version = "1.2";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/load-relative-1.2.el";
+          sha256 = "0vmfal05hznb10k2y3j9mychi9ra4hxcm6qf7j1r8aw9j7af6riw";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/load-relative.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    loc-changes = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "loc-changes";
+        version = "1.2";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/loc-changes-1.2.el";
+          sha256 = "1x8fn8vqasayf1rb8a6nma9n6nbvkx60krmiahyb05vl5rrsw6r3";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/loc-changes.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    markchars = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "markchars";
+        version = "0.2.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/markchars-0.2.0.el";
+          sha256 = "1wn9v9jzcyq5wxhw5839jsggfy97955ngspn2gn6jmvz6zdgy4hv";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/markchars.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    math-symbol-lists = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "math-symbol-lists";
+        version = "1.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/math-symbol-lists-1.0.el";
+          sha256 = "1rry9x4pl7i0sij051i76zp1ypvnj1qbwm40a7bs462c74q4jlwn";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/math-symbol-lists.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    memory-usage = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "memory-usage";
+        version = "0.2";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/memory-usage-0.2.el";
+          sha256 = "03qwb7sprdh1avxv3g7hhnhl41pwvnpxcpnqrikl7picy78h1gwj";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/memory-usage.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    metar = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    elpaBuild {
+        pname = "metar";
+        version = "0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/metar-0.1.el";
+          sha256 = "0s9zyzps022h5xax574bwsvsyp893x5w74kznnhfm63sxrifbi18";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/metar.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    midi-kbd = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+        pname = "midi-kbd";
+        version = "0.2";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/midi-kbd-0.2.el";
+          sha256 = "1783k07gyiaq784wqv8qqc89cw5d6q1bdqz68b7n1lx4vmvfrhmh";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/midi-kbd.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    minibuffer-line = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "minibuffer-line";
+        version = "0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/minibuffer-line-0.1.el";
+          sha256 = "1ny4iirp26na5118wfgxlv6fxlrdclzdbd9m0lkrv51w0qw7spil";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/minibuffer-line.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    minimap = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "minimap";
+        version = "1.2";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/minimap-1.2.el";
+          sha256 = "1vcxdxy7mv8mi4lrri3kmyf9kly3rb02z4kpfx5d1xv493havvb8";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/minimap.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    multishell = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "multishell";
+        version = "1.0.4";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/multishell-1.0.4.el";
+          sha256 = "11nx9h1c039h7md7pr1xlc3kla8n0vq6pa54i25wakf5n30019f4";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/multishell.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    muse = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "muse";
+        version = "3.20";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/muse-3.20.tar";
+          sha256 = "0i5gfhgxdm1ripw7j3ixqlfkinx3fxjj2gk5md99h70iigrhcnm9";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/muse.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nameless = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+        pname = "nameless";
+        version = "0.5.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/nameless-0.5.1.el";
+          sha256 = "0vv4zpqb56w9xy9wljchwilcwpw7zdmqrwfwffxp0pgbhf4w41y9";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/nameless.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    names = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+    elpaBuild {
+        pname = "names";
+        version = "20151201.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/names-20151201.0.tar";
+          sha256 = "13smsf039x4yd7pzvllgn1vz8lhkwghnhip9y2bka38vk37w912d";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/names.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nhexl-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "nhexl-mode";
+        version = "0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/nhexl-mode-0.1.el";
+          sha256 = "0h4kl5d8rj9aw4xxrmv4a9fdcqvkk74ia7bq8jgmjp11pwpzww9j";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/nhexl-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nlinum = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "nlinum";
+        version = "1.6";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/nlinum-1.6.el";
+          sha256 = "1hr5waxbq0fcys8x2nfdl84mp2v8v9qi08f1kqdray2hzmnmipcw";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/nlinum.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    notes-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "notes-mode";
+        version = "1.30";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/notes-mode-1.30.tar";
+          sha256 = "1aqivlfa0nk0y27gdv68k5rg3m5wschh8cw196a13qb7kaghk9r6";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/notes-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ntlm = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "ntlm";
+        version = "2.0.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/ntlm-2.0.0.el";
+          sha256 = "1n602yi60rwsacqw20kqbm97x6bhzjxblxbdprm36f31qmym8si4";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/ntlm.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    num3-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "num3-mode";
+        version = "1.2";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/num3-mode-1.2.el";
+          sha256 = "1nm3yjp5qs6rq4ak47gb6325vjfw0dnkryfgybgly0m6h4hhpbd8";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/num3-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    oauth2 = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "oauth2";
+        version = "0.10";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/oauth2-0.10.el";
+          sha256 = "0rlxmbb88dp0yqw9d5mdx0nxv5l5618scmg5872scbnc735f2yna";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/oauth2.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    omn-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "omn-mode";
+        version = "1.2";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/omn-mode-1.2.el";
+          sha256 = "0p7lmqabdcn625q9z7libn7q1b6mjc74bkic2kjhhckzvlfjk742";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/omn-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    on-screen = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    elpaBuild {
+        pname = "on-screen";
+        version = "1.3.2";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/on-screen-1.3.2.el";
+          sha256 = "15d18mjgv1pnwl6kf3pr5w64q1322p1l1qlfvnckglwmzy5sl2qv";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/on-screen.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "org";
+        version = "20160118";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/org-20160118.tar";
+          sha256 = "107jzpykg5fgd4wzppn2ayvrg2l6z7mnlq8v7r52x15400k9xnxr";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/org.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    osc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "osc";
+        version = "0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/osc-0.1.el";
+          sha256 = "09nzbbzvxfrjm91wawbv6bg6fqlcx1qi0711qc73yfrbc8ndsnsb";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/osc.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    other-frame-window = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
+    elpaBuild {
+        pname = "other-frame-window";
+        version = "1.0.2";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/other-frame-window-1.0.2.el";
+          sha256 = "0gr4vn7ld4fx372091wxnzm1rhq6rc4ycim4fwz5bxnpykz83l7d";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/other-frame-window.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pabbrev = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "pabbrev";
+        version = "4.2.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/pabbrev-4.2.1.el";
+          sha256 = "19v5adk61y8fpigw7k6wz6dj79jwr450hnbi7fj0jvb21cvjmfxh";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/pabbrev.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pinentry = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "pinentry";
+        version = "0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/pinentry-0.1.el";
+          sha256 = "0iiw11prk4w32czk69mvc3x6ja9xbhbvpg9b0nidrsg5njjjh76d";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/pinentry.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    poker = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "poker";
+        version = "0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/poker-0.1.el";
+          sha256 = "0gbm59m6bs0766r7v8dy9gdif1pb89xj1h8h76bh78hr65yh7gg0";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/poker.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    python = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+    elpaBuild {
+        pname = "python";
+        version = "0.25.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/python-0.25.1.el";
+          sha256 = "16r1sjq5fagrvlnrnbxmf6h2yxrcbhqlaa3ppqsa14vqrj09gisd";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/python.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    quarter-plane = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "quarter-plane";
+        version = "0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/quarter-plane-0.1.el";
+          sha256 = "0hj3asdzf05h8j1fsxx9y71arnprg2xwk2dcb81zj04hzggzpwmm";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/quarter-plane.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    queue = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "queue";
+        version = "0.1.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/queue-0.1.1.el";
+          sha256 = "0jw24fxqnf9qcaf2nh09cnds1kqfk7hal35dw83x1ari95say391";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/queue.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rainbow-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "rainbow-mode";
+        version = "0.12";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/rainbow-mode-0.12.el";
+          sha256 = "10a7qs7fvw4qi4vxj9n56j26gjk61bl79dgz4md1d26slb2j1c04";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/rainbow-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    register-list = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "register-list";
+        version = "0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/register-list-0.1.el";
+          sha256 = "1azgfm4yvhp2bqqplmfbz1fij8gda527lks82bslnpnabd8m6sjh";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/register-list.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rich-minority = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    elpaBuild {
+        pname = "rich-minority";
+        version = "1.0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/rich-minority-1.0.1.el";
+          sha256 = "1pr89k3jz044vf582klphl1zf0r7hj2g7ga8j1dwbrpr9ngiicgc";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/rich-minority.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rudel = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "rudel";
+        version = "0.3";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/rudel-0.3.tar";
+          sha256 = "041yac9a7hbz1fpmjlmc31ggcgg90fmw08z6bkzly2141yky8yh1";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/rudel.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scroll-restore = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "scroll-restore";
+        version = "1.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/scroll-restore-1.0.el";
+          sha256 = "0h55szlmkmzmcvd6gvv8l74n7y64i0l78nwwmq7xsbzprlmj6khn";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/scroll-restore.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    seq = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "seq";
+        version = "1.11";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/seq-1.11.el";
+          sha256 = "1qpam4cxpy6x6gibln21v29mif71kifyvdfymjsidlnjqqnvdk1h";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/seq.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shen-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "shen-mode";
+        version = "0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/shen-mode-0.1.tar";
+          sha256 = "1dr24kkah4hr6vrfxwhl9vzjnwn4n773bw23c3j9bkmlgnbvn0kz";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/shen-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sisu-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "sisu-mode";
+        version = "3.0.3";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/sisu-mode-3.0.3.el";
+          sha256 = "0ay9hfix3x53f39my02071dzxrw69d4zx5zirxwmmmyxmkaays3r";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/sisu-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sml-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "sml-mode";
+        version = "6.7";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/sml-mode-6.7.el";
+          sha256 = "041dmxx7imiy99si9pscwjh5y4h02y3lirzhv1cfxqr3ghxngf9x";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/sml-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    soap-client = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    elpaBuild {
+        pname = "soap-client";
+        version = "3.0.2";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/soap-client-3.0.2.tar";
+          sha256 = "0yx7lnag6fqrnm3a4j77w1lq63izn43sms0n3d4504yr3p826sci";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/soap-client.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sokoban = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "sokoban";
+        version = "1.4";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/sokoban-1.4.tar";
+          sha256 = "1yfkaw8rjris03qpj32vqhg5lfml4hz9v3adka6sw6dv4n67j9w1";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/sokoban.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sotlisp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+        pname = "sotlisp";
+        version = "1.4.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/sotlisp-1.4.1.el";
+          sha256 = "1v99pcj5lp1xxavghwv03apwpc589y7wb8vv6w3kai7483p13z5j";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/sotlisp.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    spinner = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "spinner";
+        version = "1.4";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/spinner-1.4.el";
+          sha256 = "0j4x8hbnhda83yyb31mm9b014pfb81gdfsr026rhn8ls3y163dbf";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/spinner.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+        pname = "stream";
+        version = "2.1.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/stream-2.1.0.el";
+          sha256 = "05fihjd8gm5w4xbdcvah1g9srcgmk87ymk3i7wwa6961w5s01d5y";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/stream.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    svg = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+        pname = "svg";
+        version = "0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/svg-0.1.el";
+          sha256 = "0v27casnjvjjaalmrbw494sk0zciws037cn6cmcc6rnhj30lzbv5";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/svg.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    svg-clock = callPackage ({ elpaBuild, emacs, fetchurl, lib, svg }:
+    elpaBuild {
+        pname = "svg-clock";
+        version = "0.5";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/svg-clock-0.5.el";
+          sha256 = "1i77c7nyqcwc6b6n7vdh95xbmwv5kpdds6j7pklp4c9vbvm8axgp";
+        };
+        packageRequires = [ emacs svg ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/svg-clock.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    swiper = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+        pname = "swiper";
+        version = "0.7.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/swiper-0.7.0.tar";
+          sha256 = "1bzzx41zcf3yk6r6csqzlffwwrw9gyk8ab026r55l6416b6rcynx";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/swiper.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tNFA = callPackage ({ elpaBuild, fetchurl, lib, queue }: elpaBuild {
+        pname = "tNFA";
+        version = "0.1.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/tNFA-0.1.1.el";
+          sha256 = "01n4p8lg8f2k55l2z77razb2sl202qisjqm5lff96a2kxnxinsds";
+        };
+        packageRequires = [ queue ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/tNFA.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    temp-buffer-browse = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "temp-buffer-browse";
+        version = "1.4";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/temp-buffer-browse-1.4.el";
+          sha256 = "055z7hm8b2s8z1kd6hahjz0crz9qx8k9qb5pwdwdxcsh2j70pmcw";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/temp-buffer-browse.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    test-simple = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    elpaBuild {
+        pname = "test-simple";
+        version = "1.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/test-simple-1.1.el";
+          sha256 = "0s8r6kr0a6n1c20fraif2ngis436a7d3gsj351s6icx6bbcjdalw";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/test-simple.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    timerfunctions = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    elpaBuild {
+        pname = "timerfunctions";
+        version = "1.4.2";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/timerfunctions-1.4.2.el";
+          sha256 = "122q8nv08pz1mkgilvi9qfrs7rsnc5picr7jyz2jpnvpd9qw6jw5";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/timerfunctions.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tiny = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "tiny";
+        version = "0.1.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/tiny-0.1.1.tar";
+          sha256 = "1nhg8375qdn457wj0xmfaj72s87xbabk2w1nl6q7rjvwxv08yyn7";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/tiny.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    transcribe = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "transcribe";
+        version = "1.0.2";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/transcribe-1.0.2.el";
+          sha256 = "0b0qaq0b3l37h6wfs4j80csmfcbidcd8a8wk6mwn6p4cdi7msr15";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/transcribe.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    trie = callPackage ({ elpaBuild, fetchurl, heap, lib, tNFA }: elpaBuild {
+        pname = "trie";
+        version = "0.2.6";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/trie-0.2.6.el";
+          sha256 = "1q3i1dhq55c3b1hqpvmh924vzvhrgyp76hr1ci7bhjqvjmjx24ii";
+        };
+        packageRequires = [ heap tNFA ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/trie.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    undo-tree = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "undo-tree";
+        version = "0.6.5";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/undo-tree-0.6.5.el";
+          sha256 = "0bs97xyxwfkjvzax9llg0zsng0vyndnrxj5d2n5mmynaqcn89d37";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/undo-tree.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    uni-confusables = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "uni-confusables";
+        version = "0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/uni-confusables-0.1.tar";
+          sha256 = "0s3scvzhd4bggk0qafcspf97cmcvdw3w8bbf5ark4p22knvg80zp";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/uni-confusables.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vlf = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "vlf";
+        version = "1.7";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/vlf-1.7.tar";
+          sha256 = "007zdr5szimr6nwwrqz9s338s0qq82r006pdwgcm8nc41jsmsx7r";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/vlf.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    w3 = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "w3";
+        version = "4.0.49";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/w3-4.0.49.tar";
+          sha256 = "01n334b3gwx288xysa1vxsvb14avsz3syfigw85i7m5nizhikqbb";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/w3.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wcheck-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "wcheck-mode";
+        version = "2016.1.5";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/wcheck-mode-2016.1.5.el";
+          sha256 = "0axd32sw1papxz4yscjg85a2li8a8m8z5fn2jzb3620700j86jb3";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/wcheck-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wconf = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+        pname = "wconf";
+        version = "0.2.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/wconf-0.2.0.el";
+          sha256 = "07adnx2ni7kprxw9mx1nywzs1a2h43rszfa8r8i0s9j16grvgphk";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/wconf.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    web-server = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+        pname = "web-server";
+        version = "0.1.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/web-server-0.1.1.tar";
+          sha256 = "1q51fhqw5al4iycdlighwv7jqgdpjb1a66glwd5jnc9b651yk42n";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/web-server.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    websocket = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "websocket";
+        version = "1.5";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/websocket-1.5.tar";
+          sha256 = "0plgc8an229cqbghrxd6wh73b081dc17fx1r940dqhgi284pcjsy";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/websocket.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    windresize = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "windresize";
+        version = "0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/windresize-0.1.el";
+          sha256 = "0b5bfs686nkp7s05zgfqvr1mpagmkd74j1grq8kp2w9arj0qfi3x";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/windresize.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
+    elpaBuild {
+        pname = "wisi";
+        version = "1.1.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/wisi-1.1.1.tar";
+          sha256 = "14bpir7kng8b4m1yna4iahhp2z0saagc2i8z53apd39msbplay3r";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/wisi.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wpuzzle = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "wpuzzle";
+        version = "1.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/wpuzzle-1.1.el";
+          sha256 = "1wjg411dc0fvj2n8ak73igfrzc31nizzvvr2qa87fhq99bgh62kj";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/wpuzzle.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xclip = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "xclip";
+        version = "1.3";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/xclip-1.3.el";
+          sha256 = "1zlqr4sp8588sjga5c9b4prnsbpv3lr2wv8sih2p0s5qmjghc947";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/xclip.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }:
+    elpaBuild {
+        pname = "xelb";
+        version = "0.4";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/xelb-0.4.tar";
+          sha256 = "1m3wmlzcnbv1akncdaakfy4xmxyjnfb6yl1nfahwf4lfxlsvnwzd";
+        };
+        packageRequires = [ cl-generic emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/xelb.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xpm = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "xpm";
+        version = "1.0.3";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/xpm-1.0.3.tar";
+          sha256 = "0qckb93xwzcg8iwiv4bd08r60jn0n853czmilz0hyyb1lfi82lp4";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/xpm.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yasnippet = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "yasnippet";
+        version = "0.8.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/yasnippet-0.8.0.tar";
+          sha256 = "1syb9sc6xbw4vjhaix8b41lbm5zq6myrljl4r72yi6ndj5z9bmpr";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/yasnippet.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ztree = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "ztree";
+        version = "1.0.2";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/ztree-1.0.2.tar";
+          sha256 = "0rm9b7cw5md9zbgbq89kh8wb5jdjrqy9g43psdws19z6j532g665";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/ztree.html";
+          license = lib.licenses.free;
+        };
+      }) {};
+  }
\ No newline at end of file
diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.json b/pkgs/applications/editors/emacs-modes/elpa-packages.json
deleted file mode 100644
index 479808d1d03c..000000000000
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.json
+++ /dev/null
@@ -1,1337 +0,0 @@
-{
-    "stream": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/stream-2.1.0.el",
-            "sha256": "05fihjd8gm5w4xbdcvah1g9srcgmk87ymk3i7wwa6961w5s01d5y"
-        },
-        "version": "2.1.0",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "load-dir": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/load-dir-0.0.3.el",
-            "sha256": "0w5rdc6gr7nm7r0d258mp5sc06n09mmz7kjg8bd3sqnki8iz7s32"
-        },
-        "version": "0.0.3",
-        "deps": []
-    },
-    "w3": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/w3-4.0.49.tar",
-            "sha256": "01n334b3gwx288xysa1vxsvb14avsz3syfigw85i7m5nizhikqbb"
-        },
-        "version": "4.0.49",
-        "deps": []
-    },
-    "diff-hl": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/diff-hl-1.8.1.tar",
-            "sha256": "09yqa71xmkikkzddg9f6ah92444wwf14aial9fxv2cxqavisdj64"
-        },
-        "version": "1.8.1",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "sml-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/sml-mode-6.7.el",
-            "sha256": "041dmxx7imiy99si9pscwjh5y4h02y3lirzhv1cfxqr3ghxngf9x"
-        },
-        "version": "6.7",
-        "deps": []
-    },
-    "gnugo": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/gnugo-3.0.0.tar",
-            "sha256": "0b94kbqxir023wkmqn9kpjjj2v0gcz856mqipz30gxjbjj42w27x"
-        },
-        "version": "3.0.0",
-        "deps": [
-            "ascii-art-to-unicode",
-            "cl-lib",
-            "xpm"
-        ]
-    },
-    "python": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/python-0.25.1.el",
-            "sha256": "16r1sjq5fagrvlnrnbxmf6h2yxrcbhqlaa3ppqsa14vqrj09gisd"
-        },
-        "version": "0.25.1",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "vlf": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/vlf-1.7.tar",
-            "sha256": "007zdr5szimr6nwwrqz9s338s0qq82r006pdwgcm8nc41jsmsx7r"
-        },
-        "version": "1.7",
-        "deps": []
-    },
-    "minimap": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/minimap-1.2.el",
-            "sha256": "1vcxdxy7mv8mi4lrri3kmyf9kly3rb02z4kpfx5d1xv493havvb8"
-        },
-        "version": "1.2",
-        "deps": []
-    },
-    "load-relative": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/load-relative-1.2.el",
-            "sha256": "0vmfal05hznb10k2y3j9mychi9ra4hxcm6qf7j1r8aw9j7af6riw"
-        },
-        "version": "1.2",
-        "deps": []
-    },
-    "quarter-plane": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/quarter-plane-0.1.el",
-            "sha256": "0hj3asdzf05h8j1fsxx9y71arnprg2xwk2dcb81zj04hzggzpwmm"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "context-coloring": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/context-coloring-7.2.0.el",
-            "sha256": "0l7mzmnhqh6sri1fhhv51khi0fnpfp51drzy725s6zfmpbrcn7vn"
-        },
-        "version": "7.2.0",
-        "deps": [
-            "emacs",
-            "js2-mode"
-        ]
-    },
-    "svg-clock": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/svg-clock-0.5.el",
-            "sha256": "1i77c7nyqcwc6b6n7vdh95xbmwv5kpdds6j7pklp4c9vbvm8axgp"
-        },
-        "version": "0.5",
-        "deps": [
-            "emacs",
-            "svg"
-        ]
-    },
-    "math-symbol-lists": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/math-symbol-lists-1.0.el",
-            "sha256": "1rry9x4pl7i0sij051i76zp1ypvnj1qbwm40a7bs462c74q4jlwn"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "osc": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/osc-0.1.el",
-            "sha256": "09nzbbzvxfrjm91wawbv6bg6fqlcx1qi0711qc73yfrbc8ndsnsb"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "electric-spacing": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/electric-spacing-5.0.el",
-            "sha256": "1jk6v84z0n8jljzsz4wk7rgzh7drpfvxf4bp6xis8gapnd3ycfyv"
-        },
-        "version": "5.0",
-        "deps": []
-    },
-    "exwm": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/exwm-0.1.tar",
-            "sha256": "18w9a37v8lyyjj8ll2f5mw8fw14g54b887cflzv5d576k5f606f5"
-        },
-        "version": "0.1",
-        "deps": [
-            "xelb"
-        ]
-    },
-    "ada-ref-man": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/ada-ref-man-2012.0.tar",
-            "sha256": "1g97892h8d1xa7cfxgg4i232i15hhci7gijj0dzc31yd9vbqayx8"
-        },
-        "version": "2012.0",
-        "deps": []
-    },
-    "landmark": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/landmark-1.0.el",
-            "sha256": "0mz1l9zc1nvggjhg4jcly8ncw38xkprlrha8l8vfl9k9rg7s1dv4"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "rudel": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/rudel-0.3.tar",
-            "sha256": "041yac9a7hbz1fpmjlmc31ggcgg90fmw08z6bkzly2141yky8yh1"
-        },
-        "version": "0.3",
-        "deps": []
-    },
-    "tiny": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/tiny-0.1.1.tar",
-            "sha256": "1nhg8375qdn457wj0xmfaj72s87xbabk2w1nl6q7rjvwxv08yyn7"
-        },
-        "version": "0.1.1",
-        "deps": []
-    },
-    "coffee-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/coffee-mode-0.4.1.1.el",
-            "sha256": "1jffd8rqmc3l597db26rggis6apf91glyzm1qvpf5g3iz55g6slz"
-        },
-        "version": "0.4.1.1",
-        "deps": []
-    },
-    "sisu-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/sisu-mode-3.0.3.el",
-            "sha256": "0ay9hfix3x53f39my02071dzxrw69d4zx5zirxwmmmyxmkaays3r"
-        },
-        "version": "3.0.3",
-        "deps": []
-    },
-    "lmc": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/lmc-1.3.el",
-            "sha256": "0s5dkksgfbfbhc770z1n7d4jrkpcb8z1935abgrw80icxgsrc01p"
-        },
-        "version": "1.3",
-        "deps": []
-    },
-    "temp-buffer-browse": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/temp-buffer-browse-1.4.el",
-            "sha256": "055z7hm8b2s8z1kd6hahjz0crz9qx8k9qb5pwdwdxcsh2j70pmcw"
-        },
-        "version": "1.4",
-        "deps": []
-    },
-    "org": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/org-20151221.tar",
-            "sha256": "01p8c70bd2mp3w08vpha0dvpljhj4r5797b0m9q16z4zhxqaqbqx"
-        },
-        "version": "20151221",
-        "deps": []
-    },
-    "bug-hunter": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/bug-hunter-1.0.1.el",
-            "sha256": "0c0pg542y09c1k25dxk2062pj3cj12i73kqxbpq0m6af0qm7wy9d"
-        },
-        "version": "1.0.1",
-        "deps": [
-            "cl-lib",
-            "seq"
-        ]
-    },
-    "test-simple": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/test-simple-1.1.el",
-            "sha256": "0s8r6kr0a6n1c20fraif2ngis436a7d3gsj351s6icx6bbcjdalw"
-        },
-        "version": "1.1",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "notes-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/notes-mode-1.30.tar",
-            "sha256": "1aqivlfa0nk0y27gdv68k5rg3m5wschh8cw196a13qb7kaghk9r6"
-        },
-        "version": "1.30",
-        "deps": []
-    },
-    "nlinum": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/nlinum-1.6.el",
-            "sha256": "1hr5waxbq0fcys8x2nfdl84mp2v8v9qi08f1kqdray2hzmnmipcw"
-        },
-        "version": "1.6",
-        "deps": []
-    },
-    "sokoban": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/sokoban-1.4.tar",
-            "sha256": "1yfkaw8rjris03qpj32vqhg5lfml4hz9v3adka6sw6dv4n67j9w1"
-        },
-        "version": "1.4",
-        "deps": []
-    },
-    "tNFA": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/tNFA-0.1.1.el",
-            "sha256": "01n4p8lg8f2k55l2z77razb2sl202qisjqm5lff96a2kxnxinsds"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "queue"
-        ]
-    },
-    "js2-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/js2-mode-20150909.tar",
-            "sha256": "1ha696jl9k1325r3xlr11rx6lmd545p42f8biw4hb0q1zsr2306h"
-        },
-        "version": "20150909",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "other-frame-window": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/other-frame-window-1.0.2.el",
-            "sha256": "0gr4vn7ld4fx372091wxnzm1rhq6rc4ycim4fwz5bxnpykz83l7d"
-        },
-        "version": "1.0.2",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "flylisp": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/flylisp-0.2.el",
-            "sha256": "0hh09qy1xwlv52lsh49nr11h4lk8qlmk06b669q494d79hxyv4v6"
-        },
-        "version": "0.2",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "yasnippet": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/yasnippet-0.8.0.tar",
-            "sha256": "1syb9sc6xbw4vjhaix8b41lbm5zq6myrljl4r72yi6ndj5z9bmpr"
-        },
-        "version": "0.8.0",
-        "deps": []
-    },
-    "cl-lib": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/cl-lib-0.5.el",
-            "sha256": "1z4ffcx7b95bxz52586lhvdrdm5vp473g3afky9h5my3jp5cd994"
-        },
-        "version": "0.5",
-        "deps": []
-    },
-    "dts-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/dts-mode-0.1.0.el",
-            "sha256": "08xwqbdg0gwipc3gfacs3gpc6zz6lhkw7pyj7n9qhg020c4qv7hq"
-        },
-        "version": "0.1.0",
-        "deps": []
-    },
-    "djvu": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/djvu-0.5.el",
-            "sha256": "1wpyv4ismfsz5hfaj75j3h3nni1mnk33czhw3rd45cf32a2zkqsj"
-        },
-        "version": "0.5",
-        "deps": []
-    },
-    "javaimp": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/javaimp-0.6.el",
-            "sha256": "00a37jv9wbzy521a15vk7a66rsf463zzr57adc8ii2m4kcyldpqh"
-        },
-        "version": "0.6",
-        "deps": []
-    },
-    "loc-changes": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/loc-changes-1.2.el",
-            "sha256": "1x8fn8vqasayf1rb8a6nma9n6nbvkx60krmiahyb05vl5rrsw6r3"
-        },
-        "version": "1.2",
-        "deps": []
-    },
-    "scroll-restore": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/scroll-restore-1.0.el",
-            "sha256": "0h55szlmkmzmcvd6gvv8l74n7y64i0l78nwwmq7xsbzprlmj6khn"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "web-server": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/web-server-0.1.1.tar",
-            "sha256": "1q51fhqw5al4iycdlighwv7jqgdpjb1a66glwd5jnc9b651yk42n"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "debbugs": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/debbugs-0.8.tar",
-            "sha256": "1wp5wa2a0rwvpfdzd2b78k6vd26qbyqwl4p2c2s5l7zkqy258in5"
-        },
-        "version": "0.8",
-        "deps": []
-    },
-    "on-screen": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/on-screen-1.3.2.el",
-            "sha256": "15d18mjgv1pnwl6kf3pr5w64q1322p1l1qlfvnckglwmzy5sl2qv"
-        },
-        "version": "1.3.2",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "pabbrev": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/pabbrev-4.2.1.el",
-            "sha256": "19v5adk61y8fpigw7k6wz6dj79jwr450hnbi7fj0jvb21cvjmfxh"
-        },
-        "version": "4.2.1",
-        "deps": []
-    },
-    "fsm": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/fsm-0.2.el",
-            "sha256": "1kh1r5by1q2x8bbg0z2jzmb5i6blvlf105mavrnbcxa6ghbiz6iy"
-        },
-        "version": "0.2",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "jgraph-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/jgraph-mode-1.1.el",
-            "sha256": "0479irjz5r79x6ngl3lfkl1gqsmvcw8kn6285sm6nkn66m1dfs8l"
-        },
-        "version": "1.1",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "wpuzzle": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/wpuzzle-1.1.el",
-            "sha256": "1wjg411dc0fvj2n8ak73igfrzc31nizzvvr2qa87fhq99bgh62kj"
-        },
-        "version": "1.1",
-        "deps": []
-    },
-    "darkroom": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/darkroom-0.1.el",
-            "sha256": "0fif8fm1h7x7g16949shfnaik5f5488clsvkf8bi5izpqp3vi6ak"
-        },
-        "version": "0.1",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "let-alist": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/let-alist-1.0.4.el",
-            "sha256": "07312bvvyz86lf64vdkxg2l1wgfjl25ljdjwlf1bdzj01c4hm88x"
-        },
-        "version": "1.0.4",
-        "deps": []
-    },
-    "wconf": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/wconf-0.2.0.el",
-            "sha256": "07adnx2ni7kprxw9mx1nywzs1a2h43rszfa8r8i0s9j16grvgphk"
-        },
-        "version": "0.2.0",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "ntlm": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/ntlm-2.0.0.el",
-            "sha256": "1n602yi60rwsacqw20kqbm97x6bhzjxblxbdprm36f31qmym8si4"
-        },
-        "version": "2.0.0",
-        "deps": []
-    },
-    "cl-generic": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/cl-generic-0.2.el",
-            "sha256": "0b2y114f14fdlk5hkb0fvdbv6pqm9ifw0vwzri1vqp1xq1l1f9p3"
-        },
-        "version": "0.2",
-        "deps": []
-    },
-    "undo-tree": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/undo-tree-0.6.5.el",
-            "sha256": "0bs97xyxwfkjvzax9llg0zsng0vyndnrxj5d2n5mmynaqcn89d37"
-        },
-        "version": "0.6.5",
-        "deps": []
-    },
-    "muse": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/muse-3.20.tar",
-            "sha256": "0i5gfhgxdm1ripw7j3ixqlfkinx3fxjj2gk5md99h70iigrhcnm9"
-        },
-        "version": "3.20",
-        "deps": []
-    },
-    "aumix-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/aumix-mode-7.el",
-            "sha256": "0qyjw2g3pzcxqdg1cpp889nmb524jxqq32dz7b7cg2m903lv5gmv"
-        },
-        "version": "7",
-        "deps": []
-    },
-    "avy": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/avy-0.3.0.tar",
-            "sha256": "1ycfqabx949s7dgp9vhyb9phpxw83gjw4cc7914gr84bqlkj0458"
-        },
-        "version": "0.3.0",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "markchars": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/markchars-0.2.0.el",
-            "sha256": "1wn9v9jzcyq5wxhw5839jsggfy97955ngspn2gn6jmvz6zdgy4hv"
-        },
-        "version": "0.2.0",
-        "deps": []
-    },
-    "rich-minority": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/rich-minority-1.0.1.el",
-            "sha256": "1pr89k3jz044vf582klphl1zf0r7hj2g7ga8j1dwbrpr9ngiicgc"
-        },
-        "version": "1.0.1",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "hydra": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/hydra-0.13.4.tar",
-            "sha256": "11msy6n075iv00c2r9f85bzx3srnj403rhlga1rgsl6vsryf21fj"
-        },
-        "version": "0.13.4",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "dismal": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/dismal-1.5.tar",
-            "sha256": "1vhs6w6c2klsrfjpw8vr5c4gwiw83ppdjhsn2la0fvkm60jmc476"
-        },
-        "version": "1.5",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "xclip": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/xclip-1.3.el",
-            "sha256": "1zlqr4sp8588sjga5c9b4prnsbpv3lr2wv8sih2p0s5qmjghc947"
-        },
-        "version": "1.3",
-        "deps": []
-    },
-    "nameless": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/nameless-0.5.1.el",
-            "sha256": "0vv4zpqb56w9xy9wljchwilcwpw7zdmqrwfwffxp0pgbhf4w41y9"
-        },
-        "version": "0.5.1",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "sotlisp": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/sotlisp-1.4.1.el",
-            "sha256": "1v99pcj5lp1xxavghwv03apwpc589y7wb8vv6w3kai7483p13z5j"
-        },
-        "version": "1.4.1",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "register-list": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/register-list-0.1.el",
-            "sha256": "1azgfm4yvhp2bqqplmfbz1fij8gda527lks82bslnpnabd8m6sjh"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "f90-interface-browser": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/f90-interface-browser-1.1.el",
-            "sha256": "0mf32w2bgc6b43k0r4a11bywprj7y3rvl21i0ry74v425r6hc3is"
-        },
-        "version": "1.1",
-        "deps": []
-    },
-    "ediprolog": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/ediprolog-1.1.el",
-            "sha256": "19qaciwhzr7k624z455fi8i0v5kl10587ha2mfx1bdsym7y376yd"
-        },
-        "version": "1.1",
-        "deps": []
-    },
-    "queue": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/queue-0.1.1.el",
-            "sha256": "0jw24fxqnf9qcaf2nh09cnds1kqfk7hal35dw83x1ari95say391"
-        },
-        "version": "0.1.1",
-        "deps": []
-    },
-    "iterators": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/iterators-0.1.el",
-            "sha256": "0rljqdaj88cbhngj4ddd2z3bfd35r84aivq4h10mk4n4h8whjpj4"
-        },
-        "version": "0.1",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "all": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/all-1.0.el",
-            "sha256": "17h4cp0xnh08szh3snbmn1mqq2smgqkn45bq7v0cpsxq1i301hi3"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "docbook": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/docbook-0.1.el",
-            "sha256": "01x0g8dhw65mzp9mk6qhx9p2bsvkw96hz1awrrf2ji17sp8hd1v6"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "dict-tree": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/dict-tree-0.12.8.el",
-            "sha256": "08jaifqaq9cfz1z4fr4ib9l6lbx4x60q7d6gajx1cdhh18x6nys5"
-        },
-        "version": "0.12.8",
-        "deps": [
-            "heap",
-            "tNFA",
-            "trie"
-        ]
-    },
-    "memory-usage": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/memory-usage-0.2.el",
-            "sha256": "03qwb7sprdh1avxv3g7hhnhl41pwvnpxcpnqrikl7picy78h1gwj"
-        },
-        "version": "0.2",
-        "deps": []
-    },
-    "ggtags": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/ggtags-0.8.11.el",
-            "sha256": "1q2bp2b7lylf7n6c1psfn5swyjg0y78ykm0ak2kd84pbyhqak2mq"
-        },
-        "version": "0.8.11",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "soap-client": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/soap-client-3.0.2.tar",
-            "sha256": "0yx7lnag6fqrnm3a4j77w1lq63izn43sms0n3d4504yr3p826sci"
-        },
-        "version": "3.0.2",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "ack": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/ack-1.5.tar",
-            "sha256": "0sljshiy44z27idy0rxjs2fx4smlm4v607wic7md1vihp6qp4l9r"
-        },
-        "version": "1.5",
-        "deps": []
-    },
-    "wisi": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/wisi-1.1.1.tar",
-            "sha256": "14bpir7kng8b4m1yna4iahhp2z0saagc2i8z53apd39msbplay3r"
-        },
-        "version": "1.1.1",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "beacon": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/beacon-0.5.1.el",
-            "sha256": "1xzypqprlx23kxlkc1waranyq378ipxr8i6fv6hnhg4ys5j8ksj4"
-        },
-        "version": "0.5.1",
-        "deps": [
-            "seq"
-        ]
-    },
-    "names": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/names-20151201.0.tar",
-            "sha256": "13smsf039x4yd7pzvllgn1vz8lhkwghnhip9y2bka38vk37w912d"
-        },
-        "version": "20151201.0",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "dbus-codegen": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/dbus-codegen-0.1.el",
-            "sha256": "1gi7jc6rn6hlgh01zfwb7cczb5hi3c05wlnzw6akj1h9kai1lmzw"
-        },
-        "version": "0.1",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "ztree": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/ztree-1.0.2.tar",
-            "sha256": "0rm9b7cw5md9zbgbq89kh8wb5jdjrqy9g43psdws19z6j532g665"
-        },
-        "version": "1.0.2",
-        "deps": []
-    },
-    "heap": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/heap-0.3.el",
-            "sha256": "1347s06nv88zyhmbimvn13f13d1r147kn6kric1ki6n382zbw6k6"
-        },
-        "version": "0.3",
-        "deps": []
-    },
-    "uni-confusables": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/uni-confusables-0.1.tar",
-            "sha256": "0s3scvzhd4bggk0qafcspf97cmcvdw3w8bbf5ark4p22knvg80zp"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "enwc": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/enwc-1.0.tar",
-            "sha256": "19mjkcgnacygzwm5dsayrwpbzfxadp9kdmmghrk1vir2hwixgv8y"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "ascii-art-to-unicode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/ascii-art-to-unicode-1.9.el",
-            "sha256": "0lfgfkx81s4dd318xcxsl7hdgpi0dc1fv3d00m3xg8smyxcf3adv"
-        },
-        "version": "1.9",
-        "deps": []
-    },
-    "company": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/company-0.8.12.tar",
-            "sha256": "1r7q813rjs4dgknsfqi354ahsvk8k4ld4xh1fkp8lbxb13da6gqx"
-        },
-        "version": "0.8.12",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "seq": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/seq-1.11.el",
-            "sha256": "1qpam4cxpy6x6gibln21v29mif71kifyvdfymjsidlnjqqnvdk1h"
-        },
-        "version": "1.11",
-        "deps": []
-    },
-    "company-statistics": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/company-statistics-0.2.2.tar",
-            "sha256": "0h1k0dbb7ngk6pghli2csfpzpx37si0wg840jmay0jlb80q6vw73"
-        },
-        "version": "0.2.2",
-        "deps": [
-            "company",
-            "emacs"
-        ]
-    },
-    "metar": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/metar-0.1.el",
-            "sha256": "0s9zyzps022h5xax574bwsvsyp893x5w74kznnhfm63sxrifbi18"
-        },
-        "version": "0.1",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "caps-lock": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/caps-lock-1.0.el",
-            "sha256": "1i4hwam81p4dr0bk8257fkiz4xmv6knkjxj7a00fa35kgx5blpva"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "wcheck-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/wcheck-mode-2014.6.21.el",
-            "sha256": "0qgyj9mrg4b4rkbm0sdhysrzqr1adri4xpjh33zkpy70vln1qnc7"
-        },
-        "version": "2014.6.21",
-        "deps": []
-    },
-    "ahungry-theme": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/ahungry-theme-1.0.12.tar",
-            "sha256": "0a6mlxka1b7vja4wxd8gvfhfk5i1jdj3a851c7dn34hz1lkgvnx8"
-        },
-        "version": "1.0.12",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "el-search": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/el-search-0.1.1.el",
-            "sha256": "1q5nscxajqc2qvqksh2glq106749bx6cnz97ysfjh2i78vps4z36"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "company-math": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/company-math-1.0.1.el",
-            "sha256": "1lkj9cqhmdf3h5zvr94hszkz1251i2rq2mycnhscsnzrk5ll3gck"
-        },
-        "version": "1.0.1",
-        "deps": [
-            "company",
-            "math-symbol-lists"
-        ]
-    },
-    "swiper": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/swiper-0.7.0.tar",
-            "sha256": "1bzzx41zcf3yk6r6csqzlffwwrw9gyk8ab026r55l6416b6rcynx"
-        },
-        "version": "0.7.0",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "eldoc-eval": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/eldoc-eval-0.1.el",
-            "sha256": "1mnhxdsn9h43iq941yqmg92v3hbzwyg7acqfnz14q5g52bnagg19"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "ada-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/ada-mode-5.1.8.tar",
-            "sha256": "015lmliwk4qa2sbs9spxik6dnwsf1a34py6anklf92qnmzhjicy6"
-        },
-        "version": "5.1.8",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "wisi"
-        ]
-    },
-    "svg": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/svg-0.1.el",
-            "sha256": "0v27casnjvjjaalmrbw494sk0zciws037cn6cmcc6rnhj30lzbv5"
-        },
-        "version": "0.1",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "omn-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/omn-mode-1.2.el",
-            "sha256": "0p7lmqabdcn625q9z7libn7q1b6mjc74bkic2kjhhckzvlfjk742"
-        },
-        "version": "1.2",
-        "deps": []
-    },
-    "trie": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/trie-0.2.6.el",
-            "sha256": "1q3i1dhq55c3b1hqpvmh924vzvhrgyp76hr1ci7bhjqvjmjx24ii"
-        },
-        "version": "0.2.6",
-        "deps": [
-            "heap",
-            "tNFA"
-        ]
-    },
-    "transcribe": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/transcribe-1.0.2.el",
-            "sha256": "0b0qaq0b3l37h6wfs4j80csmfcbidcd8a8wk6mwn6p4cdi7msr15"
-        },
-        "version": "1.0.2",
-        "deps": []
-    },
-    "websocket": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/websocket-1.5.tar",
-            "sha256": "0plgc8an229cqbghrxd6wh73b081dc17fx1r940dqhgi284pcjsy"
-        },
-        "version": "1.5",
-        "deps": []
-    },
-    "aggressive-indent": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/aggressive-indent-1.4.el",
-            "sha256": "0qdpvdzmw4hq2g8krx93fbb352nkg731p7v82zhqw76y79khdpka"
-        },
-        "version": "1.4",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "xpm": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/xpm-1.0.3.tar",
-            "sha256": "0qckb93xwzcg8iwiv4bd08r60jn0n853czmilz0hyyb1lfi82lp4"
-        },
-        "version": "1.0.3",
-        "deps": []
-    },
-    "oauth2": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/oauth2-0.10.el",
-            "sha256": "0rlxmbb88dp0yqw9d5mdx0nxv5l5618scmg5872scbnc735f2yna"
-        },
-        "version": "0.10",
-        "deps": []
-    },
-    "spinner": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/spinner-1.4.el",
-            "sha256": "0j4x8hbnhda83yyb31mm9b014pfb81gdfsr026rhn8ls3y163dbf"
-        },
-        "version": "1.4",
-        "deps": []
-    },
-    "ergoemacs-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/ergoemacs-mode-5.14.7.3.tar",
-            "sha256": "0lqqrnw6z9w7js8r40khckjc1cyxdiwx8kapf5pvyfs09gs89i90"
-        },
-        "version": "5.14.7.3",
-        "deps": [
-            "emacs",
-            "undo-tree"
-        ]
-    },
-    "minibuffer-line": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/minibuffer-line-0.1.el",
-            "sha256": "1ny4iirp26na5118wfgxlv6fxlrdclzdbd9m0lkrv51w0qw7spil"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "rainbow-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/rainbow-mode-0.12.el",
-            "sha256": "10a7qs7fvw4qi4vxj9n56j26gjk61bl79dgz4md1d26slb2j1c04"
-        },
-        "version": "0.12",
-        "deps": []
-    },
-    "csv-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/csv-mode-1.5.el",
-            "sha256": "1dmc6brb6m9s29wsr6giwpf77yindfq47344l9jr31hqgg82x1xc"
-        },
-        "version": "1.5",
-        "deps": []
-    },
-    "adjust-parens": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/adjust-parens-3.0.tar",
-            "sha256": "16gmrgdfyqs7i617669f7xy5mds1svbyfv12xhdjk96rbssfngzg"
-        },
-        "version": "3.0",
-        "deps": []
-    },
-    "crisp": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/crisp-1.3.4.el",
-            "sha256": "1xbnf7xlw499zsnr5ky2bghb2fzg3g7cf2ldmbb7c3b84raryn0i"
-        },
-        "version": "1.3.4",
-        "deps": []
-    },
-    "poker": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/poker-0.1.el",
-            "sha256": "0gbm59m6bs0766r7v8dy9gdif1pb89xj1h8h76bh78hr65yh7gg0"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "auto-overlays": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/auto-overlays-0.10.9.tar",
-            "sha256": "0aqjp3bkd7mi191nm971z857s09py390ikcd93hyhmknblk0v14p"
-        },
-        "version": "0.10.9",
-        "deps": []
-    },
-    "pinentry": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/pinentry-0.1.el",
-            "sha256": "0iiw11prk4w32czk69mvc3x6ja9xbhbvpg9b0nidrsg5njjjh76d"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "adaptive-wrap": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/adaptive-wrap-0.5.el",
-            "sha256": "0frgmp8vrrml4iykm60j4d6cl9rbcivy9yh24q6kd10bcyx59ypy"
-        },
-        "version": "0.5",
-        "deps": []
-    },
-    "xelb": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/xelb-0.4.tar",
-            "sha256": "1m3wmlzcnbv1akncdaakfy4xmxyjnfb6yl1nfahwf4lfxlsvnwzd"
-        },
-        "version": "0.4",
-        "deps": [
-            "cl-generic",
-            "emacs"
-        ]
-    },
-    "num3-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/num3-mode-1.2.el",
-            "sha256": "1nm3yjp5qs6rq4ak47gb6325vjfw0dnkryfgybgly0m6h4hhpbd8"
-        },
-        "version": "1.2",
-        "deps": []
-    },
-    "gnorb": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/gnorb-1.1.1.tar",
-            "sha256": "1ni2gcnnpdm9pi3y9jap88nic1k0viv865w413xarw6w0jjpdpxa"
-        },
-        "version": "1.1.1",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "auctex": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/auctex-11.89.tar",
-            "sha256": "0ggk2q17wq4y9yw5b9mykk153ihphazjdj1fl4lv0zblgnrxz5l5"
-        },
-        "version": "11.89",
-        "deps": []
-    },
-    "dash": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/dash-2.12.0.tar",
-            "sha256": "02r547vian59zr55z6ri4p2b7q5y5k256wi9j8a317vjzyh54m05"
-        },
-        "version": "2.12.0",
-        "deps": []
-    },
-    "windresize": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/windresize-0.1.el",
-            "sha256": "0b5bfs686nkp7s05zgfqvr1mpagmkd74j1grq8kp2w9arj0qfi3x"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "timerfunctions": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/timerfunctions-1.4.2.el",
-            "sha256": "122q8nv08pz1mkgilvi9qfrs7rsnc5picr7jyz2jpnvpd9qw6jw5"
-        },
-        "version": "1.4.2",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "chess": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/chess-2.0.4.tar",
-            "sha256": "1sq1bjmp513vldfh7hc2bbfc54665abqiz0kqgqq3gijckaxn5js"
-        },
-        "version": "2.0.4",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "ace-window": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/ace-window-0.9.0.el",
-            "sha256": "1m7fc4arcxn7fp0hnzyp20czjp4zx3rjaspfzpxzgc8sbghi81a3"
-        },
-        "version": "0.9.0",
-        "deps": [
-            "avy"
-        ]
-    },
-    "shen-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/shen-mode-0.1.tar",
-            "sha256": "1dr24kkah4hr6vrfxwhl9vzjnwn4n773bw23c3j9bkmlgnbvn0kz"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "easy-kill": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/easy-kill-0.9.3.tar",
-            "sha256": "17nw0mglmg877axwg1d0gs03yc0p04lzmd3pl0nsnqbh3303fnqb"
-        },
-        "version": "0.9.3",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "jumpc": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/jumpc-3.0.el",
-            "sha256": "1vhggw3mzaq33al8f16jbg5qq5f95s8365is9qqyb8yq77gqym6a"
-        },
-        "version": "3.0",
-        "deps": []
-    },
-    "epoch-view": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/epoch-view-0.0.1.el",
-            "sha256": "1wy25ryyg9f4v83qjym2pwip6g9mszhqkf5a080z0yl47p71avfx"
-        },
-        "version": "0.0.1",
-        "deps": []
-    },
-    "midi-kbd": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/midi-kbd-0.2.el",
-            "sha256": "1783k07gyiaq784wqv8qqc89cw5d6q1bdqz68b7n1lx4vmvfrhmh"
-        },
-        "version": "0.2",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "nhexl-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/nhexl-mode-0.1.el",
-            "sha256": "0h4kl5d8rj9aw4xxrmv4a9fdcqvkk74ia7bq8jgmjp11pwpzww9j"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "lex": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/lex-1.1.tar",
-            "sha256": "1i6ri3k2b2nginhnmwy67mdpv5p75jkxjfwbf42wymza8fxzwbb7"
-        },
-        "version": "1.1",
-        "deps": []
-    },
-    "ioccur": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://elpa.gnu.org/packages/ioccur-2.4.el",
-            "sha256": "1isid3kgsi5qkz27ipvmp9v5knx0qigmv7lz12mqdkwv8alns1p9"
-        },
-        "version": "2.4",
-        "deps": []
-    }
-}
\ No newline at end of file
diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index e88206fc8b73..60cd4251888f 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@@ -13,44 +13,15 @@ To update the list of packages from ELPA,
 
 { fetchurl, lib, stdenv, texinfo }:
 
-let
-
-  inherit (lib) makeScope mapAttrs;
-
-  json = builtins.readFile ./elpa-packages.json;
-  manifest = builtins.fromJSON json;
-
-  mkPackage = self: name: recipe:
-    let drv =
-          { elpaBuild, stdenv, fetchurl }:
-          let
-            unknownFetcher =
-              abort "emacs-${name}: unknown fetcher '${recipe.fetch.tag}'";
-            fetch =
-              { inherit fetchurl; }."${recipe.fetch.tag}"
-              or unknownFetcher;
-            args = builtins.removeAttrs recipe.fetch [ "tag" ];
-            src = fetch args;
-          in elpaBuild {
-            pname = name;
-            inherit (recipe) version;
-            inherit src;
-            packageRequires =
-              let lookupDep = d: self."${d}" or null;
-              in map lookupDep recipe.deps;
-            meta = {
-              homepage = "http://elpa.gnu.org/packages/${name}.html";
-              license = stdenv.lib.licenses.free;
-            };
-          };
-    in self.callPackage drv {};
-
-in
-
 self:
 
   let
-    super = removeAttrs (mapAttrs (mkPackage self) manifest) [ "dash" ];
+
+    imported = import ./elpa-generated.nix {
+      inherit (self) callPackage;
+    };
+
+    super = removeAttrs imported [ "dash" ];
 
     elpaBuild = import ../../../build-support/emacs/melpa.nix {
       inherit fetchurl lib stdenv texinfo;
@@ -63,11 +34,14 @@ self:
       });
     };
 
-    elpaPackages = super // {
+    overrides = {
       # These packages require emacs-25
       el-search = markBroken super.el-search;
       iterators = markBroken super.iterators;
       midi-kbd = markBroken super.midi-kbd;
       stream = markBroken super.stream;
     };
+
+    elpaPackages = super // overrides;
+
   in elpaPackages // { inherit elpaBuild elpaPackages; }

From 3bd6edf0e229036d96df24a0f605aa4afa45236f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 15 Jan 2016 15:01:09 -0600
Subject: [PATCH 0094/2285] melpa-packages 2016-01-18

The MELPA package expressions are now generated in a single file to
improve evaluation performance.
---
 .../editors/emacs-modes/melpa-generated.nix   | 60036 ++++++++++++++++
 .../editors/emacs-modes/melpa-packages.json   | 46627 ------------
 .../editors/emacs-modes/melpa-packages.nix    |   209 +-
 3 files changed, 60195 insertions(+), 46677 deletions(-)
 create mode 100644 pkgs/applications/editors/emacs-modes/melpa-generated.nix
 delete mode 100644 pkgs/applications/editors/emacs-modes/melpa-packages.json

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
new file mode 100644
index 000000000000..ea8ffb52f152
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -0,0 +1,60036 @@
+{ callPackage }: {
+    _0blayout = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "_0blayout";
+        version = "20151021.549";
+        src = fetchFromGitHub {
+          owner = "etu";
+          repo = "0blayout-mode";
+          rev = "e256da71d4e0f126a0fd8a9b8fb77f54931f4dfc";
+          sha256 = "1xigpz2aswlmpcsc1f7gfakyw7041pbyl9zfd8nz38iq036n5b96";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/0blayout";
+          sha256 = "027k85h34998i8vmbg2hi4q1m4f7jfva5jm38k0g9m1db700gk92";
+          name = "_0blayout";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/0blayout";
+          license = lib.licenses.free;
+        };
+      }) {};
+    _2048-game = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "_2048-game";
+        version = "20151026.1433";
+        src = fetchhg {
+          url = "https://bitbucket.com/zck/2048.el";
+          rev = "ea6c3bce8ac1";
+          sha256 = "1p9qn9n8mfb4z62h1s94mlg0vshpzafbhsxgzvx78sqlf6bfc80l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/2048-game";
+          sha256 = "0z7x9bnyi3qlq7l0fskb61i6yr9gm7w7wplqd28wz8p1j5yw8aa0";
+          name = "_2048-game";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/2048-game";
+          license = lib.licenses.free;
+        };
+      }) {};
+    _4clojure = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "_4clojure";
+        version = "20131014.1707";
+        src = fetchFromGitHub {
+          owner = "joshuarh";
+          repo = "4clojure.el";
+          rev = "3cdfd356c24cd3518397d29ae833f56a4d20b4ca";
+          sha256 = "1fybicg46fc5jjqv7g2d3dnj1x9n58m2fg9x6qxn9l8qlzk9yxkq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/4clojure";
+          sha256 = "1w9zxy6jwiln28cmdgkbbdfk3pdscqlfahrqi6lbgpjvkw9z44mb";
+          name = "_4clojure";
+        };
+        packageRequires = [ json request ];
+        meta = {
+          homepage = "http://melpa.org/#/4clojure";
+          license = lib.licenses.free;
+        };
+      }) {};
+    abc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "abc-mode";
+        version = "20140225.1144";
+        src = fetchFromGitHub {
+          owner = "mkjunker";
+          repo = "abc-mode";
+          rev = "1dd6e1217136a6f986917a3e5f41c1007bac908d";
+          sha256 = "1h4gwp2gyd4jhbkb8ai1zbzhhmlhmihbwzr0wsxg5yq074n72ifs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/abc-mode";
+          sha256 = "0qf5lbszyscmagiqhc0d05vzkhdky7ini4w33z1h3j5417sscrcx";
+          name = "abc-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/abc-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    abl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "abl-mode";
+        version = "20151125.335";
+        src = fetchFromGitHub {
+          owner = "afroisalreadyinu";
+          repo = "abl-mode";
+          rev = "5a2a65cc5eb1dc2ee80c8b64a7ea352a444abfdb";
+          sha256 = "081rz6q46wdpnlzd3ddcw425434vz54q7xw29z2nnaxsqckmim8f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/abl-mode";
+          sha256 = "0h25lc87pa8irgxflnmnmkr9dcv4kz841nfc45fcz4awrn75kkzb";
+          name = "abl-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/abl-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    abyss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "abyss-theme";
+        version = "20151007.608";
+        src = fetchFromGitHub {
+          owner = "mgrbyte";
+          repo = "emacs-abyss-theme";
+          rev = "7971da041f5fb608e32cdac9259b53c87013c04f";
+          sha256 = "12cgjc01k3ivy02381py2g87n2wzwnv153favw2raw4gwl2sfwhs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/abyss-theme";
+          sha256 = "0ckrgfd7fjls6g510v8fqpkd0fd18lr0spg3lf5s88gky8ihdg6c";
+          name = "abyss-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/abyss-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-alchemist = callPackage ({ alchemist, auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-alchemist";
+        version = "20150908.156";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-ac-alchemist";
+          rev = "b1891c3d41aed83f61d78a609ea97be5cc2758d9";
+          sha256 = "19msfx3f3px1maj41bzh139s6sv2pjk9vm3bphn7758fqhzyin0f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-alchemist";
+          sha256 = "02ll3hcixgdb8zyszn78714gy1h2q0vkhpbnwap9302mr2racwl0";
+          name = "ac-alchemist";
+        };
+        packageRequires = [ alchemist auto-complete cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-alchemist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-anaconda = callPackage ({ anaconda-mode, auto-complete, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-anaconda";
+        version = "20150912.308";
+        src = fetchFromGitHub {
+          owner = "proofit404";
+          repo = "ac-anaconda";
+          rev = "d0dec5c026235f65f9fd6594540df8886ed1b6a8";
+          sha256 = "0vrd6g9cl02jjxrjxpshq4pd748b5xszhpmakywrw8s08nh8jf44";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-anaconda";
+          sha256 = "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf";
+          name = "ac-anaconda";
+        };
+        packageRequires = [ anaconda-mode auto-complete dash ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-anaconda";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-c-headers = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-c-headers";
+        version = "20151021.334";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "ac-c-headers";
+          rev = "de13a1d35b311e6601556d8ef163de102057deea";
+          sha256 = "1z6rj15p5gjv0jwnnck8789n9csf1pwxfvsz37graihgfy2khj0y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-c-headers";
+          sha256 = "1cq5rz2w79bj185va7y13x7bciihrpsvyxwk6msmcxb4g86s9phv";
+          name = "ac-c-headers";
+        };
+        packageRequires = [ auto-complete ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-c-headers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-cake = callPackage ({ auto-complete, cake, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-cake";
+        version = "20140315.1129";
+        src = fetchFromGitHub {
+          owner = "k1LoW";
+          repo = "emacs-ac-cake";
+          rev = "f34c9e3ba8cb962e4708c8f53b623e1922500176";
+          sha256 = "1llpnb9vy612sg214i76rxnzcl3qx8pqnixczc5pik9kd3fdaz5f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-cake";
+          sha256 = "0s2pgf0m98ixgadsnn201vm5gnawanpvxv56sf599f33krqnxzkl";
+          name = "ac-cake";
+        };
+        packageRequires = [ auto-complete cake ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-cake";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-cake2 = callPackage ({ auto-complete, cake2, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-cake2";
+        version = "20140320.208";
+        src = fetchFromGitHub {
+          owner = "k1LoW";
+          repo = "emacs-ac-cake2";
+          rev = "ffbb679c0d5c261b05abde06d8d1d1e5d5990b6a";
+          sha256 = "0mlmhdl9s28z981y8bnpj8jpfzm6bgfiyl0zmpgvhyqw1wzqywwv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-cake2";
+          sha256 = "0qxilldx23wqf8ilif2nin119bvd0l7b6f6wifixx28a6kl1vsgy";
+          name = "ac-cake2";
+        };
+        packageRequires = [ auto-complete cake2 ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-cake2";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-capf = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-capf";
+        version = "20151031.2117";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-ac-capf";
+          rev = "17571dba0a8f98111f2ab758e9bea285b263781b";
+          sha256 = "0nyq34yq4jcp3p30ygma3iz1h0q551p33792byj76pa5ps09g1da";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-capf";
+          sha256 = "1drgk5iz2wp3rxzd39pj0n4cfmm5z8zqlp50jw5z7ffbbg35qxbm";
+          name = "ac-capf";
+        };
+        packageRequires = [ auto-complete cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-capf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-cider = callPackage ({ auto-complete, cider, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-cider";
+        version = "20151012.508";
+        src = fetchFromGitHub {
+          owner = "clojure-emacs";
+          repo = "ac-cider";
+          rev = "eeb4b3ae1e91d03d765f6c39994792e4f05f6600";
+          sha256 = "1k4zk27zvxmcffwwg0zx19rcy2ysd65nnrifwspdw699glpwx2l5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-cider";
+          sha256 = "1dszpb706h34miq2bxqyq1ycbran5ax36vcniwp8vvhgcjsw5sz6";
+          name = "ac-cider";
+        };
+        packageRequires = [ auto-complete cider cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-cider";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }:
+    melpaBuild {
+        pname = "ac-clang";
+        version = "20150906.1208";
+        src = fetchFromGitHub {
+          owner = "yaruopooner";
+          repo = "ac-clang";
+          rev = "6b3365063ddfb88d5527618217bb56166349ad4e";
+          sha256 = "0n9zagwh3rz7b76irj4ya8wskffns9v1c1pivsdqgpd76spvl7n5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-clang";
+          sha256 = "070s06xhkzaqfc3j8c4i44rks6gn8z66lwd54j17p8d91x3qjpr4";
+          name = "ac-clang";
+        };
+        packageRequires = [ auto-complete cl-lib emacs pos-tip yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-clang";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-dabbrev = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "ac-dabbrev";
+        version = "20130906.18";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/ac-dabbrev.el";
+          sha256 = "0q0lbhdng5s5hqa342yyvg02hf2bfbwq513lj1rlaqz4ykvpd7fh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-dabbrev";
+          sha256 = "03lndw7y55bzz4rckl80j0kh66qa82xxxhfakzs1dh1h9f1f0azh";
+          name = "ac-dabbrev";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ac-dabbrev";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-dcd = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, flycheck-dmd-dub, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-dcd";
+        version = "20150702.924";
+        src = fetchFromGitHub {
+          owner = "atilaneves";
+          repo = "ac-dcd";
+          rev = "8fe1a48fcfeeafa1970e5041b0e71a4fcd10f336";
+          sha256 = "1dydjkilvyzxl7wwy3afmn1cjf8jv0385im4nhn8c3xr8iiil7yv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-dcd";
+          sha256 = "086jp9c6bilc361n1hscza3pbhgvqlq944z7cil2jm1kicsf8s7r";
+          name = "ac-dcd";
+        };
+        packageRequires = [ auto-complete flycheck-dmd-dub ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-dcd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-emmet = callPackage ({ auto-complete, emmet-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-emmet";
+        version = "20131015.1058";
+        src = fetchFromGitHub {
+          owner = "yasuyk";
+          repo = "ac-emmet";
+          rev = "88f24876ee3b759978d4614a758280b5d512d543";
+          sha256 = "1lkhqmfkjga7qi4r1m7mjax3pyf9m6minsn57cbzm2z2kvkhq22g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-emmet";
+          sha256 = "09ycjllfpdgqaf5iis5bkkhal1vxvl3qkxrn2759p67s97c49f3x";
+          name = "ac-emmet";
+        };
+        packageRequires = [ auto-complete emmet-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-emmet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-emoji = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-emoji";
+        version = "20150823.211";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-ac-emoji";
+          rev = "f4b3a5b3548dc36f69daeff742f53b5bda538bae";
+          sha256 = "19981mzxnqqdb8dsdizy2i8byb8sx9138x3nrvi6ap2qbcsabjmz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-emoji";
+          sha256 = "0msh3dh89jzk6hxva34gp9d5pazchgdknxjbi72z26rss9bkp1mw";
+          name = "ac-emoji";
+        };
+        packageRequires = [ auto-complete cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-emoji";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-etags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-etags";
+        version = "20151031.2121";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-ac-etags";
+          rev = "e53cb3a8dd44e41fba3d2b737f90a8cfc529e2a6";
+          sha256 = "140i02b2ipyfmki945l1xd1nsqdpganhmi3bmwj1h9w8cg078bd4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-etags";
+          sha256 = "0ag49k9izrs4ikzac9lifvvwhcn5n89lr2vb20pngsvg1czdyhzb";
+          name = "ac-etags";
+        };
+        packageRequires = [ auto-complete ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-etags";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-geiser = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, geiser, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-geiser";
+        version = "20130929.147";
+        src = fetchFromGitHub {
+          owner = "xiaohanyu";
+          repo = "ac-geiser";
+          rev = "0e2e36532336f27e3dc3b01fff55ad1a4329817d";
+          sha256 = "02ifz25rq64z0ifxs52aqdz0iz4mi6xvj88hcn3aakkmsj749vvn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-geiser";
+          sha256 = "0v558qz1mp8b1bgk8kgdk5sx5mpd353mw77n5b0pw4b2ikzpz2mx";
+          name = "ac-geiser";
+        };
+        packageRequires = [ auto-complete geiser ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-geiser";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-haskell-process = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-haskell-process";
+        version = "20150423.902";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "ac-haskell-process";
+          rev = "0362d4323511107ec70e7165cb612f3ab01b712f";
+          sha256 = "0m33v9iy3y37sicfmpx7kvmn8v1a8k6cs7d0v9v5k93p4d5ila41";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-haskell-process";
+          sha256 = "0kv4z850kv03wiax1flnrp6sgqja25j23l719w7rkr7ck110q8rw";
+          name = "ac-haskell-process";
+        };
+        packageRequires = [ auto-complete haskell-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-haskell-process";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-helm = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "ac-helm";
+        version = "20140919.1117";
+        src = fetchFromGitHub {
+          owner = "yasuyk";
+          repo = "ac-helm";
+          rev = "0cde22dac4726d08c27801c926cf40b1165c8a07";
+          sha256 = "1ycchpiiavxw8n08gra0bsp9pxp6ln8cgjrkz9jjq7i6ixi8f9d6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-helm";
+          sha256 = "16ajxlhcah5zbvywpc6l4l1arr308gjpgvdx6l1nrv2zvpckhlwq";
+          name = "ac-helm";
+        };
+        packageRequires = [ auto-complete cl-lib helm popup ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-helm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-html = callPackage ({ auto-complete, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "ac-html";
+        version = "20151005.231";
+        src = fetchFromGitHub {
+          owner = "cheunghy";
+          repo = "ac-html";
+          rev = "3de94a46d8cb93e8e62a1b6bdebbde4d65dc7cc2";
+          sha256 = "1sip87j4wvlf9pfnpr0zyyhys1dd9smh6hy3zs08ihbdh98krgs5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-html";
+          sha256 = "0qf8f75b6dvy844dq8vh8d9c6k599rh1ynjcif9bwvdpf6pxwvqa";
+          name = "ac-html";
+        };
+        packageRequires = [ auto-complete dash f s ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-html-angular = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }:
+    melpaBuild {
+        pname = "ac-html-angular";
+        version = "20151225.119";
+        src = fetchFromGitHub {
+          owner = "osv";
+          repo = "ac-html-angular";
+          rev = "6bafe09afe03112ca4183d58461c1a6f6c2b3c67";
+          sha256 = "1v3ia439h4n2i204n0sazzbwwm0l5k6j31gq58iv2rqrq2ysikny";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-html-angular";
+          sha256 = "05rbxf5kbr4jlskrhvfvhf82qvb55zl5cb6z1ymfh9l3h9j9xk3s";
+          name = "ac-html-angular";
+        };
+        packageRequires = [ web-completion-data ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-html-angular";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-html-bootstrap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }:
+    melpaBuild {
+        pname = "ac-html-bootstrap";
+        version = "20151222.1512";
+        src = fetchFromGitHub {
+          owner = "osv";
+          repo = "ac-html-bootstrap";
+          rev = "ea9f7e351e1f39e0c2da5f518948db5ee751d15b";
+          sha256 = "0v33p6lnsq1nwyxfbgs6vg6fidfyqwxd5wls2yza95yxzl30m9r7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-html-bootstrap";
+          sha256 = "0z71m6xws0k9smhsswaivpikr64mv0wh6klnmi5cwhwcqas6kdi1";
+          name = "ac-html-bootstrap";
+        };
+        packageRequires = [ web-completion-data ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-html-bootstrap";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-html-csswatcher = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }:
+    melpaBuild {
+        pname = "ac-html-csswatcher";
+        version = "20151208.1513";
+        src = fetchFromGitHub {
+          owner = "osv";
+          repo = "ac-html-csswatcher";
+          rev = "b0f3e7e1a3fe49e88b6eb6432377232fc715f221";
+          sha256 = "0swbw62zh5rjjf73pvmp8brrrmk6bp061k793z4z83v7ic0cicrr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-html-csswatcher";
+          sha256 = "0jb9dnm2lxadrxssf0rjqw8yvvskcq4hys8c21shjyj3gkvwbfqn";
+          name = "ac-html-csswatcher";
+        };
+        packageRequires = [ web-completion-data ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-html-csswatcher";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-inf-ruby = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-inf-ruby";
+        version = "20131115.550";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "ac-inf-ruby";
+          rev = "3a1e741b40b8dba0e9c235dad4b9907411d9dcd3";
+          sha256 = "0xdqk0qr1mmm5q3049ldwlmrcfgz6rzk4yxc8qgz6kll27kciia0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-inf-ruby";
+          sha256 = "04jclf0yxz78x1fsaf5sh1p466947nqrcx337kyhqn0nkj3hplqr";
+          name = "ac-inf-ruby";
+        };
+        packageRequires = [ auto-complete inf-ruby ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-inf-ruby";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-ispell = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-ispell";
+        version = "20151031.2126";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-ac-ispell";
+          rev = "22bace7387e9012002a6a444922f75f9913077b0";
+          sha256 = "1cq73bdv3lkn8v3nx6aznygqaac9s5i7pvirl8wz9ib31hsgwpbk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-ispell";
+          sha256 = "1vsy2qjh60n5lavivpqhhcpg5pk8zz2r0wy1sb65capn841zdi67";
+          name = "ac-ispell";
+        };
+        packageRequires = [ auto-complete cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-ispell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-js2 = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, skewer-mode }:
+    melpaBuild {
+        pname = "ac-js2";
+        version = "20140906.642";
+        src = fetchFromGitHub {
+          owner = "ScottyB";
+          repo = "ac-js2";
+          rev = "721c482e1d4a08f4a29a74437257d573e8f69969";
+          sha256 = "0yn9333rjs2pzb1wk1japclsqagdcl28j0yjl3q5b70g5gi5vx7k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-js2";
+          sha256 = "0gcr0xdi89nj3854v2z3nndfgazmcdzmd6wdndl0i4s7pdfl96fa";
+          name = "ac-js2";
+        };
+        packageRequires = [ js2-mode skewer-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-js2";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-math = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
+    melpaBuild {
+        pname = "ac-math";
+        version = "20141116.1527";
+        src = fetchFromGitHub {
+          owner = "vitoshka";
+          repo = "ac-math";
+          rev = "c012a8f620a48cb18db7d78995035d65eae28f11";
+          sha256 = "0p5cdaw9v8jgnmjqpb95bxy4khwbdgg19wzg8jkr2j2p55dpfbd6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-math";
+          sha256 = "1gx35m0wv60cfgm87y2c7vrpwdsqjzk9bz4pp9dbs8dhxvji0ay4";
+          name = "ac-math";
+        };
+        packageRequires = [ auto-complete math-symbol-lists ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-math";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-mozc = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, mozc }:
+    melpaBuild {
+        pname = "ac-mozc";
+        version = "20150227.1019";
+        src = fetchFromGitHub {
+          owner = "igjit";
+          repo = "ac-mozc";
+          rev = "4c6c8be4701010d9362184437c0f783e0335c631";
+          sha256 = "19cb8kq8gmrplkxil22ahvbyq5cng1l2vh2lrfiyqpjsap7zfjz5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-mozc";
+          sha256 = "1v3iiid8cq50i076q98ycks9m827xzncgxqwqs2rqhab0ncy3h0f";
+          name = "ac-mozc";
+        };
+        packageRequires = [ auto-complete cl-lib mozc ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-mozc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-octave = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-octave";
+        version = "20150111.1908";
+        src = fetchFromGitHub {
+          owner = "coldnew";
+          repo = "ac-octave";
+          rev = "28dfce296dd2aa0ea46b51803109f3fdd1e5c379";
+          sha256 = "16bg2zg08223x7q54rmfjziaccgm64h9vc8z59sjljkw1bgx9m7q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-octave";
+          sha256 = "1g5s4dk1rcgkjn17jfw6g201pw0vfhqcx1nhigmnizpnzy0man9z";
+          name = "ac-octave";
+        };
+        packageRequires = [ auto-complete ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-octave";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-php = callPackage ({ auto-complete, company, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope, yasnippet }:
+    melpaBuild {
+        pname = "ac-php";
+        version = "20160117.48";
+        src = fetchFromGitHub {
+          owner = "xcwen";
+          repo = "ac-php";
+          rev = "3147e2f10a3959c0f54fcc71f87a0a2ef64043d0";
+          sha256 = "11v45azd544fs4v5ndxxc2d6rbqh9r6mqx8gk1487jw7j290j6v8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-php";
+          sha256 = "0p9qq8nszp5jb71s35cxnmcxp50b62y2jv1ha7vvqfz5p8miallk";
+          name = "ac-php";
+        };
+        packageRequires = [
+          auto-complete
+          company
+          dash
+          emacs
+          f
+          php-mode
+          popup
+          s
+          xcscope
+          yasnippet
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-php";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-racer = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, racer }:
+    melpaBuild {
+        pname = "ac-racer";
+        version = "20150831.341";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-ac-racer";
+          rev = "2708b0a49afc89fb99a6d74a016cff6b94138ed0";
+          sha256 = "0g7xbfsfqpmcay56y8xbmif52ccz430s3rjxf5bgl9ahkk7zgkzl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-racer";
+          sha256 = "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp";
+          name = "ac-racer";
+        };
+        packageRequires = [ auto-complete cl-lib racer ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-racer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-skk = callPackage ({ auto-complete, cl-lib ? null, ddskk, fetchFromGitHub, fetchurl, lib, melpaBuild, tinysegmenter }:
+    melpaBuild {
+        pname = "ac-skk";
+        version = "20141229.1919";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "ac-skk.el";
+          rev = "d25a265930430d080329789fb253d786c01dfa24";
+          sha256 = "1nvz0jfz4x99xc5ywspl8fdpyqns5zd0j7i4bwzlwplmy3qakjwm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-skk";
+          sha256 = "0iycyfgv8v15ygngvyx66m3w3sv8p9h6q6j1hbpzwd8azl8fzj5z";
+          name = "ac-skk";
+        };
+        packageRequires = [ auto-complete cl-lib ddskk tinysegmenter ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-skk";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-slime = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
+    melpaBuild {
+        pname = "ac-slime";
+        version = "20150729.2235";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "ac-slime";
+          rev = "df6c4e88b5ba2d15d47a651ecf7edc0986624112";
+          sha256 = "13yghv7p6c91fn8mrxbwrb6ldk5n3b6nj6a7pwsvks1q73i1pl88";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-slime";
+          sha256 = "0mk3k1lcbqa16xvsbgk28x09vzqyaidqaqpq934xdbrwhdgwgckg";
+          name = "ac-slime";
+        };
+        packageRequires = [ auto-complete cl-lib slime ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-slime";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-sly = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
+    melpaBuild {
+        pname = "ac-sly";
+        version = "20150421.1522";
+        src = fetchFromGitHub {
+          owner = "qoocku";
+          repo = "ac-sly";
+          rev = "b37a1ecfaab10a6d81c6d894417176d3bb4c5285";
+          sha256 = "0mif35chyj4ai1bj4gq8qi38dyfsp72yi1xchhzy9zi2plpvqa7a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-sly";
+          sha256 = "1ng81b5f8w2s9mm9s7h5kwyx8fdwndnlsbzx50slmqyaz2ad15mx";
+          name = "ac-sly";
+        };
+        packageRequires = [ auto-complete cl-lib sly ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-sly";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ace-flyspell = callPackage ({ ace-jump-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ace-flyspell";
+        version = "20150523.1315";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "ace-flyspell";
+          rev = "76c255d91c86b57a07cc7660450e37107d73505f";
+          sha256 = "1msj0dbzfan0jax5wh5rmv4l7cp5zhrp5wy5k1n9s7xdgz2dprzj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-flyspell";
+          sha256 = "0f24qrpcvyg7h6ylyggn4zrbydci537iigshac1d8yywsr0j47gd";
+          name = "ace-flyspell";
+        };
+        packageRequires = [ ace-jump-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/ace-flyspell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ace-isearch = callPackage ({ ace-jump-mode, avy, emacs, fetchFromGitHub, fetchurl, helm-swoop, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ace-isearch";
+        version = "20150808.756";
+        src = fetchFromGitHub {
+          owner = "tam17aki";
+          repo = "ace-isearch";
+          rev = "9a32a039623e3907a4fce959aa48c26a79fb249b";
+          sha256 = "02i3gxk7kfv3a0pcc82z69hgvjw8bvn40y8h7d59chg8bixcwbyr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-isearch";
+          sha256 = "0n8qf08z9n8c2sp5ks29nxcfks5mil1jj6wq348apda8safk36hm";
+          name = "ace-isearch";
+        };
+        packageRequires = [ ace-jump-mode avy emacs helm-swoop ];
+        meta = {
+          homepage = "http://melpa.org/#/ace-isearch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ace-jump-buffer = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ace-jump-buffer";
+        version = "20150215.34";
+        src = fetchFromGitHub {
+          owner = "waymondo";
+          repo = "ace-jump-buffer";
+          rev = "9299ebd4bbbf6ba78dcb40440b3aadd7b540375c";
+          sha256 = "11c9jfrh9mzi0qwbvgcjia6s1gkwb76ssiraka3f4k7rc8dli11y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-jump-buffer";
+          sha256 = "0hkxa0ps0v1hwmjafqbnyr6rc4s0w95igk8y3w53asl7f5sj5mpi";
+          name = "ace-jump-buffer";
+        };
+        packageRequires = [ ace-jump-mode dash ];
+        meta = {
+          homepage = "http://melpa.org/#/ace-jump-buffer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ace-jump-helm-line = callPackage ({ avy, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ace-jump-helm-line";
+        version = "20151113.1300";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "ace-jump-helm-line";
+          rev = "8400dbdd93d0442493f74f4030b09bbfac2d5700";
+          sha256 = "0yfhny921krpl9j8x7xflj8jzbrj8fkabc8373b8q5hyz20d332k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-jump-helm-line";
+          sha256 = "04q8wh6jskvbiq6y2xsp2ir23vgz5zw09rm127sgiqrmn0jc61b9";
+          name = "ace-jump-helm-line";
+        };
+        packageRequires = [ avy helm ];
+        meta = {
+          homepage = "http://melpa.org/#/ace-jump-helm-line";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ace-jump-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ace-jump-mode";
+        version = "20140616.315";
+        src = fetchFromGitHub {
+          owner = "winterTTr";
+          repo = "ace-jump-mode";
+          rev = "8351e2df4fbbeb2a4003f2fb39f46d33803f3dac";
+          sha256 = "17axrgd99glnl6ma4ls3k01ysdqmiqr581wnrbsn3s4gp53mm2x6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-jump-mode";
+          sha256 = "0yk0kppjyblr5wamncrjm3ym3n8jcl0r0g0cbnwni89smvpngij6";
+          name = "ace-jump-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ace-jump-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ace-jump-zap = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ace-jump-zap";
+        version = "20150330.1542";
+        src = fetchFromGitHub {
+          owner = "waymondo";
+          repo = "ace-jump-zap";
+          rev = "c60af83a857955b68c568c274a3c80cbe93f3150";
+          sha256 = "0z0rblr41r94l4b2gh9fcw50nk82ifxrr3ilxqzbb8wmvil54gh4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-jump-zap";
+          sha256 = "07bkmly3lvlbby2m13nj3m1q0gcnwy5sas7d6ws6vr9jh0d36byb";
+          name = "ace-jump-zap";
+        };
+        packageRequires = [ ace-jump-mode dash ];
+        meta = {
+          homepage = "http://melpa.org/#/ace-jump-zap";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ace-link = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ace-link";
+        version = "20160105.2354";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "ace-link";
+          rev = "bfcfb9bf3ae003dc343d3c69ff31553d0f532737";
+          sha256 = "1vs5rwd3gwpydr2fyszjxdkvpzl0vrr48g8f0180fz5b3phh1h1i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-link";
+          sha256 = "1jl805r2s3wa0xyhss1q28rcy6y2fngf0yfcrcd9wf8kamhpajk5";
+          name = "ace-link";
+        };
+        packageRequires = [ avy ];
+        meta = {
+          homepage = "http://melpa.org/#/ace-link";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ace-pinyin = callPackage ({ ace-jump-mode, avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ace-pinyin";
+        version = "20151126.1517";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "ace-pinyin";
+          rev = "d7c8fed8ab6f6fbbbcb95bcd74516c30d05dcdfa";
+          sha256 = "00pcdf2nz27f7zbpyrgqr9nh8pd4nhxvsz885b6mq263s0qyykzx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-pinyin";
+          sha256 = "18gmj71zd0i6yx8ifjxsqz2v81jx0j37f5kxllf31w7fj32ymbkc";
+          name = "ace-pinyin";
+        };
+        packageRequires = [ ace-jump-mode avy ];
+        meta = {
+          homepage = "http://melpa.org/#/ace-pinyin";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ace-popup-menu = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ace-popup-menu";
+        version = "20150910.727";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "ace-popup-menu";
+          rev = "92cac2f656b5000d2f267ffaa92a275f40a2719d";
+          sha256 = "0ffkdq94slfy8w73bznc7bcy4amylhsh2nk2vvdwwqmxmviirlnq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-popup-menu";
+          sha256 = "1cq1mpv7v98bqrpsm598krq1741b6rwih71cx3yjifpbagrv4m5s";
+          name = "ace-popup-menu";
+        };
+        packageRequires = [ avy cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ace-popup-menu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ace-window";
+        version = "20150803.1037";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "ace-window";
+          rev = "f6653fb5d8bfe8d7bcad94fc72ca9561e28180f0";
+          sha256 = "053074jyinr3a2zkr1jfgmizdbhk5s37vrvf490x2hwf19dzis4a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-window";
+          sha256 = "1k0x8m1phmvgdxb5aj841iai9q96a5lfq8i4b5vnlbc3w888n3xa";
+          name = "ace-window";
+        };
+        packageRequires = [ avy ];
+        meta = {
+          homepage = "http://melpa.org/#/ace-window";
+          license = lib.licenses.free;
+        };
+      }) {};
+    achievements = callPackage ({ fetchhg, fetchurl, keyfreq, lib, melpaBuild }:
+    melpaBuild {
+        pname = "achievements";
+        version = "20150530.1326";
+        src = fetchhg {
+          url = "https://bitbucket.com/gvol/emacs-achievements";
+          rev = "5b4b7b6816aa";
+          sha256 = "0zjncby2884cv8nz2ss7i0p17l15lsk88zwvb7b0gr3apbfpcpa3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/achievements";
+          sha256 = "1pwlibq87ph20z2pssk5hbgs6v8kdym9193jjdx2rxp0nic4k0cr";
+          name = "achievements";
+        };
+        packageRequires = [ keyfreq ];
+        meta = {
+          homepage = "http://melpa.org/#/achievements";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ack-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, mag-menu, melpaBuild }:
+    melpaBuild {
+        pname = "ack-menu";
+        version = "20150504.1522";
+        src = fetchFromGitHub {
+          owner = "chumpage";
+          repo = "ack-menu";
+          rev = "f77be93a4697926ecf3195a355eb69580f695f4d";
+          sha256 = "02ba4d8qkvgy52g0zcbyfvsnhr9685gq569nkwa2as30xdcq3khm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ack-menu";
+          sha256 = "1d2kw04ndxji2qjcm1b65qnxpp08zx8gbia8bl6x6mnjb2isc2d9";
+          name = "ack-menu";
+        };
+        packageRequires = [ mag-menu ];
+        meta = {
+          homepage = "http://melpa.org/#/ack-menu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    actionscript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "actionscript-mode";
+        version = "20140605.1328";
+        src = fetchFromGitHub {
+          owner = "austinhaas";
+          repo = "actionscript-mode";
+          rev = "f7dd1d77322b49d259919d58ffcdf64073ba6c09";
+          sha256 = "1rxx2j7kkzjdsk06zgisiydg8dc18vqll4wl6q9mfhrg2y12lq94";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/actionscript-mode";
+          sha256 = "1dkiay9jmizvslji5kzab4dxm1dq0jm8ps7sjq6710g7a5aqdvwq";
+          name = "actionscript-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/actionscript-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    addressbook-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "addressbook-bookmark";
+        version = "20160108.1008";
+        src = fetchFromGitHub {
+          owner = "thierryvolpiatto";
+          repo = "addressbook-bookmark";
+          rev = "a1de09c69666195f53532e652706b1cec86b9c0d";
+          sha256 = "1ag8zs8bkazblvgxm0q4lnpvdlnzswx1jb4jjbrs2bmq7qmmwvns";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/addressbook-bookmark";
+          sha256 = "15p00v4ndrsbadal0ss176mks4ynj39786bmrnil29b6sqibd43r";
+          name = "addressbook-bookmark";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/addressbook-bookmark";
+          license = lib.licenses.free;
+        };
+      }) {};
+    adoc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markup-faces, melpaBuild }:
+    melpaBuild {
+        pname = "adoc-mode";
+        version = "20151119.1114";
+        src = fetchFromGitHub {
+          owner = "sensorflo";
+          repo = "adoc-mode";
+          rev = "168ffa3f8efc3a635cc8f9422b7117a3a99af804";
+          sha256 = "01fn73vyhdcy84s60r2jjy9a0xm3zwagpzi6b4qlankbvswypask";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/adoc-mode";
+          sha256 = "0wgagcsh0fkb51fy17ilrs20z2vzdpmz97vpwijcfy2b9rypxq15";
+          name = "adoc-mode";
+        };
+        packageRequires = [ markup-faces ];
+        meta = {
+          homepage = "http://melpa.org/#/adoc-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "aes";
+        version = "20151211.1603";
+        src = fetchFromGitHub {
+          owner = "Sauermann";
+          repo = "emacs-aes";
+          rev = "61d0da553ad980e5b9079444aed8214a28b409d9";
+          sha256 = "0jlqk3kn2920b0dfmwy511x83hkmclb646qws3im0p75qcnyr4s1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aes";
+          sha256 = "11vl9x3ldrv7q7rd29xk4xmlvfxs0m6iys84f6mlgf00190l5r5v";
+          name = "aes";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/aes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    afternoon-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "afternoon-theme";
+        version = "20140104.1259";
+        src = fetchFromGitHub {
+          owner = "osener";
+          repo = "emacs-afternoon-theme";
+          rev = "89b1d778a1f8b385775c122f2bd1c62f0fbf931a";
+          sha256 = "19d5d6qs5nwmpf26rsb86ranb5p4236qp7p2b4i88cimcmzspylb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/afternoon-theme";
+          sha256 = "13xgdw8px58sxpl7nyhkcdxwqdpp13i8wghvlb3l4471plw3vqgj";
+          name = "afternoon-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/afternoon-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "ag";
+        version = "20151226.1805";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "ag.el";
+          rev = "4894b38feffc4c044f8cbaabf3033f49084dba2c";
+          sha256 = "03157dyw4in7hazw2glc9dz9509097s76x8g79w9cr9cyjwax42p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ag";
+          sha256 = "1r4ai09vdckkg4h4i7dp781qqmm4kky53p4q8azp3n2c78i1vz6g";
+          name = "ag";
+        };
+        packageRequires = [ cl-lib dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/ag";
+          license = lib.licenses.free;
+        };
+      }) {};
+    aggressive-fill-paragraph = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "aggressive-fill-paragraph";
+        version = "20151112.141";
+        src = fetchFromGitHub {
+          owner = "davidshepherd7";
+          repo = "aggressive-fill-paragraph-mode";
+          rev = "9af6a31b7c47306fb524bcc8582e0a3738701f25";
+          sha256 = "18zlxgwcvqhlw9y7zn6fywmy04f7rs71fd5ihcx28j4rx9ay929c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aggressive-fill-paragraph";
+          sha256 = "1df4bk3ks09805y67af6z1gpfln0lz773jzbbckfl0fy3yli0dja";
+          name = "aggressive-fill-paragraph";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/aggressive-fill-paragraph";
+          license = lib.licenses.free;
+        };
+      }) {};
+    aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "aggressive-indent";
+        version = "20160115.1614";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "aggressive-indent-mode";
+          rev = "651812f8fca9c0beb337a04438949bbfb879b5f7";
+          sha256 = "1mymlsm469nl4jaxkjgn26ij37mdf4rjv7kswjwf626bxq9s3136";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aggressive-indent";
+          sha256 = "1qi8jbr28gax35siim3hnnkiy8pa2vcrzqzc6axr98wzny46x0i2";
+          name = "aggressive-indent";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/aggressive-indent";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ahg = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "ahg";
+        version = "20151223.501";
+        src = fetchhg {
+          url = "https://bitbucket.com/agriggio/ahg";
+          rev = "e8eda2f41471";
+          sha256 = "0fnn52b2prai8dlsj4759mbcgbbbvhr2lbqs3f0k5d2q8vvqrch1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ahg";
+          sha256 = "0kw138lfzwp54fmly3jzzml11y7fhcjp3w0irmwdzr68lc206lr4";
+          name = "ahg";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ahg";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ahk-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ahk-mode";
+        version = "20151104.1737";
+        src = fetchFromGitHub {
+          owner = "ralesi";
+          repo = "ahk-mode";
+          rev = "e08a1b467d42b9d5e719c39407908152011b4573";
+          sha256 = "122as0ssc6xzmxb5hlvhx6dlx6gq2f70xisz0z8pxgm3bpf9h6mx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ahk-mode";
+          sha256 = "066l4hsb49wbyv381qgn9k4hn8gxlzi20h3qaim9grngjj5ljbni";
+          name = "ahk-mode";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ahk-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ahungry-theme";
+        version = "20151014.2138";
+        src = fetchFromGitHub {
+          owner = "ahungry";
+          repo = "color-theme-ahungry";
+          rev = "52b050992ef6fe0e6e57b51bcb5c98e02c616541";
+          sha256 = "0dlk53zij907413fl6wh02i8nwzrbbrm22nn3i9h5sc8x9dhzazg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ahungry-theme";
+          sha256 = "0fhim0qscpqx9siprp3ax1azxzmqkzvrjx517d9bnd68z7xxbpqy";
+          name = "ahungry-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ahungry-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
+    melpaBuild {
+        pname = "airline-themes";
+        version = "20160112.1415";
+        src = fetchFromGitHub {
+          owner = "AnthonyDiGirolamo";
+          repo = "airline-themes";
+          rev = "0bf80e3f5a6acee18455c8d3f3fe7072d13add70";
+          sha256 = "1wgqnafvb9h09lcqkj1kasps1ikngcfwfvlny1ipia0k2l2qivz9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/airline-themes";
+          sha256 = "0jkhb6nigyjmwqny7g59h4ssfy64vl3qnwcw46wnx5k9i73cjyih";
+          name = "airline-themes";
+        };
+        packageRequires = [ powerline ];
+        meta = {
+          homepage = "http://melpa.org/#/airline-themes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    airplay = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request, simple-httpd }:
+    melpaBuild {
+        pname = "airplay";
+        version = "20130212.626";
+        src = fetchFromGitHub {
+          owner = "gongo";
+          repo = "airplay-el";
+          rev = "bd690aafcae3a887946e1bba8327597932d964ad";
+          sha256 = "1lxpfswp1bjrz192px79f155dycf2kazpr7dfrcr1gyshlgxkpf7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/airplay";
+          sha256 = "095nibgs197iplphk6csvkgsrgh1fcfyy33py860v6qmihvk538f";
+          name = "airplay";
+        };
+        packageRequires = [ deferred request simple-httpd ];
+        meta = {
+          homepage = "http://melpa.org/#/airplay";
+          license = lib.licenses.free;
+        };
+      }) {};
+    alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
+    melpaBuild {
+        pname = "alchemist";
+        version = "20160112.140";
+        src = fetchFromGitHub {
+          owner = "tonini";
+          repo = "alchemist.el";
+          rev = "5d579873da06a1a0fccde1decaf9f7d7e1d09d76";
+          sha256 = "1g5wdcmr6qpscnjk7fzzna4jplcyfl49fq20l7nmr6bq5phsilz6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/alchemist";
+          sha256 = "18jxw0zb7y34qbm4bcpfpb2656f0h9grmrbfskgp4ra4q5q3n369";
+          name = "alchemist";
+        };
+        packageRequires = [ company dash elixir-mode emacs pkg-info ];
+        meta = {
+          homepage = "http://melpa.org/#/alchemist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "alect-themes";
+        version = "20150920.1324";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "alect-themes";
+          rev = "05d7515d936bbf48ad3fa961220f076d2e5d2312";
+          sha256 = "0hvf7ydd2p3dfk5hqjqcbaajhgihkyvlwvqcr97a8jknznk7hfzp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/alect-themes";
+          sha256 = "04fq65qnxlvl5nc2q037c6yb4nf422dfw2913gv6zfh9rdmxsks8";
+          name = "alect-themes";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/alect-themes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }:
+    melpaBuild {
+        pname = "alert";
+        version = "20151123.959";
+        src = fetchFromGitHub {
+          owner = "jwiegley";
+          repo = "alert";
+          rev = "dfb003476aeb26d08782c17257f3a81934bcf6ce";
+          sha256 = "0z7yfjg14bzndpm9ski1a1mdixvrykg7d08cd86dc82bghb3px2z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/alert";
+          sha256 = "0x3cvczq09jvshz435jw2fjm69457x2wxdvvbbjq46nfnybhi118";
+          name = "alert";
+        };
+        packageRequires = [ gntp log4e ];
+        meta = {
+          homepage = "http://melpa.org/#/alert";
+          license = lib.licenses.free;
+        };
+      }) {};
+    align-cljlet = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "align-cljlet";
+        version = "20160112.1501";
+        src = fetchFromGitHub {
+          owner = "gstamp";
+          repo = "align-cljlet";
+          rev = "602d72a7ad52788a0265e3c6da519464a98166b8";
+          sha256 = "0l2rgs0rd4nmv4v7m10zhf2znzfvdifv1vlhpa3zbppg0fj8zph1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/align-cljlet";
+          sha256 = "0pnhhv33rvlmb3823xpy9v5h6q99fa7fn38djbwry4rymi4jmlih";
+          name = "align-cljlet";
+        };
+        packageRequires = [ clojure-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/align-cljlet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    all-ext = callPackage ({ all, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "all-ext";
+        version = "20130824.706";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/all-ext.el";
+          sha256 = "10j70bwa28xpmqwigvls76jg6vz0iky88lmkq4pk35bg3rz09r4m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/all-ext";
+          sha256 = "1zi266cm5hpfhnnnzbsm4s1w0lsy4sj5z8d020y0cg57yn2v62dv";
+          name = "all-ext";
+        };
+        packageRequires = [ all ];
+        meta = {
+          homepage = "http://melpa.org/#/all-ext";
+          license = lib.licenses.free;
+        };
+      }) {};
+    amd-mode = callPackage ({ dash, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s }:
+    melpaBuild {
+        pname = "amd-mode";
+        version = "20151214.318";
+        src = fetchFromGitHub {
+          owner = "NicolasPetton";
+          repo = "amd-mode.el";
+          rev = "17eefc009e26769fa0e81936bcbea9d9ea42954f";
+          sha256 = "12vjjdyxmm6ky8d7xbsg0pmfam12vzghzzr3j6klji01i8lxmh74";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/amd-mode";
+          sha256 = "17ry6vm5xlmdfs0mykdyn05cik38yswq5axdgn8hxrvvb6f58d06";
+          name = "amd-mode";
+        };
+        packageRequires = [ dash f js2-mode js2-refactor makey projectile s ];
+        meta = {
+          homepage = "http://melpa.org/#/amd-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ample-regexps = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ample-regexps";
+        version = "20151023.500";
+        src = fetchFromGitHub {
+          owner = "immerrr";
+          repo = "ample-regexps.el";
+          rev = "884c712a82773d3af500e71d20bebe52340352c5";
+          sha256 = "18cicz11i19cpabrq6khnl9ks1khn6gw5a4ckaq4y65r40x0cr6g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ample-regexps";
+          sha256 = "00y07pd438v7ldkn5f1w84cpxa1mvcnzjkj6sf5l5pm97xqiz7j2";
+          name = "ample-regexps";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ample-regexps";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ample-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ample-theme";
+        version = "20150814.1301";
+        src = fetchFromGitHub {
+          owner = "jordonbiondo";
+          repo = "ample-theme";
+          rev = "8259da1cc14e7f7dd3ee0fb01245c58110a95382";
+          sha256 = "0x72czw5rmz89w5fa27z54bz8qirrr882g0r37pb8li04j1hk7kw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ample-theme";
+          sha256 = "055c6jy2q761za4cl1vlqdskcd3mc1j58k8b4418q7h2lv2zc0ry";
+          name = "ample-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ample-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ample-zen-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ample-zen-theme";
+        version = "20150119.1554";
+        src = fetchFromGitHub {
+          owner = "mjwall";
+          repo = "ample-zen";
+          rev = "b277bb7abd4b6624e8d59f02474b79af50a007bd";
+          sha256 = "18z9jl5d19a132k6g1dvwqfbbdh5cx66b2qxlcjsfiqxlxglc2sa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ample-zen-theme";
+          sha256 = "0xygk80mh05qssrbfj4h6k50pg557dyj6kzc2pdlmnr5r4gnzdn3";
+          name = "ample-zen-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ample-zen-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
+    melpaBuild {
+        pname = "anaconda-mode";
+        version = "20150922.737";
+        src = fetchFromGitHub {
+          owner = "proofit404";
+          repo = "anaconda-mode";
+          rev = "e8f6d910993ac1ecaa41b07abc4cdc9e76e66fb8";
+          sha256 = "01a9l785chmcf6d7fsyc72gapapb4gddgqmpps705zpkhjm8f6wj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anaconda-mode";
+          sha256 = "0gz16aam4zrm3s9ms13h4qcdflf55506kgkpyncq3bi54cvv8n1r";
+          name = "anaconda-mode";
+        };
+        packageRequires = [ dash emacs f pythonic s ];
+        meta = {
+          homepage = "http://melpa.org/#/anaconda-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anaphora = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "anaphora";
+        version = "20140728.1736";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "anaphora";
+          rev = "ed99ad4502e6fccde76050496984c6454676a410";
+          sha256 = "1ym43y0wqifkzpkm7ayf8cq2wz8pc2wgg9zvdyi0cn9lr9mwpbav";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anaphora";
+          sha256 = "1wb7fb3pc4gxvpjlm6gjbyx0rbhjiwd93qwc4vfw6p865ikl19y2";
+          name = "anaphora";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/anaphora";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anchored-transpose = callPackage ({ fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "anchored-transpose";
+        version = "20080905.54";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/anchored-transpose.el";
+          sha256 = "1hklypbp79pgaf1yklbm3qx4skm3xlml0cm1r9b9js3dbqyha651";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anchored-transpose";
+          sha256 = "19dgj1605qxc2znvzj0cj6x29zyrh00qnzk2rlwpn9hvzypg9v7w";
+          name = "anchored-transpose";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/anchored-transpose";
+          license = lib.licenses.free;
+        };
+      }) {};
+    android-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "android-mode";
+        version = "20150106.744";
+        src = fetchFromGitHub {
+          owner = "remvee";
+          repo = "android-mode";
+          rev = "80629ff38e4c2f72ba1dbebd4a0abadb94d8a231";
+          sha256 = "1ms338qq17nwivpq8c1xsnld5k532rfhgvfxx1zg3l8wrjh235d2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/android-mode";
+          sha256 = "1nqrvq411yg4b9xb5cvc7ai7lfalwc2rfhclzprvymc4vxh6k4cc";
+          name = "android-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/android-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    angry-police-captain = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "angry-police-captain";
+        version = "20120829.752";
+        src = fetchFromGitHub {
+          owner = "rolando2424";
+          repo = "angry-police-captain-el";
+          rev = "d11931c5cb63368dcc4a48797962428cca6d3e9d";
+          sha256 = "1m0c7ns7aiycg86cgglir8bkw730fslyg1n15m9ki0da4cnmm97a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/angry-police-captain";
+          sha256 = "1cshhd4bkgbkg0n6m8gz53z47z4nq0hcriz2qh3v7m4cqgkw1m9r";
+          name = "angry-police-captain";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/angry-police-captain";
+          license = lib.licenses.free;
+        };
+      }) {};
+    angular-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "angular-mode";
+        version = "20151201.1527";
+        src = fetchFromGitHub {
+          owner = "omouse";
+          repo = "angularjs-mode";
+          rev = "8720cde86af0f1859ccc8580571e8d0ad1c52cff";
+          sha256 = "04kg2x0lif91knmkkh05mj42xw3dkzsnysjda6ian95v57wfg377";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/angular-mode";
+          sha256 = "1bwfmjldnxki0lqi3ys6r2a3nlhbwm1dibsg2dvzirq8qql02w1i";
+          name = "angular-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/angular-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    angular-snippets = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "angular-snippets";
+        version = "20140514.23";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "angular-snippets.el";
+          rev = "af5ae0a4a8603b040446c28afcf6ca01a8b4bd7b";
+          sha256 = "0hdm1a323mzxjfdply8ri3addk146f21d8cmpd18r7dw3j3cdfrn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/angular-snippets";
+          sha256 = "057phgizn1c6njvdfigb23ljs31knq247gr0rcpqfrdaxsnnzm5c";
+          name = "angular-snippets";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/angular-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    annotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "annotate";
+        version = "20151227.1022";
+        src = fetchFromGitHub {
+          owner = "bastibe";
+          repo = "annotate.el";
+          rev = "e8c9b33b4d9bd428c24058a63c0781ba85498242";
+          sha256 = "08gs96r9mbdg0s5l504yp6i5nmi9qr4nwxq3xprsbx9bdzv5l2dx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/annotate";
+          sha256 = "1ajykgara2m713blj2kfmdz12fzm8jw7klyakkyi6i3c3a9m44jy";
+          name = "annotate";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/annotate";
+          license = lib.licenses.free;
+        };
+      }) {};
+    annoying-arrows-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "annoying-arrows-mode";
+        version = "20151113.1102";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "annoying-arrows-mode.el";
+          rev = "fe59f3fd464e7a87cc43fb8a1f135b3bdf8a2fb3";
+          sha256 = "1ppq3kszzj2fgr7mwj565bjs8bs285ymy384cnnw7paddgcr9z02";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/annoying-arrows-mode";
+          sha256 = "13bwqv3mv7kgi1gms58f5g03q5g7q98n4vv6n28zqmppxm5z33s7";
+          name = "annoying-arrows-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/annoying-arrows-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ansi = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "ansi";
+        version = "20150703.326";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "ansi";
+          rev = "12b4c5d91b3da1902838f421e5af6d40e2cd57dd";
+          sha256 = "19k71dj83kvc8mks6zhl45vsrsb61via53dqxjv9bny1ybh2av85";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ansi";
+          sha256 = "04n0kvaqq8214prdk20bplqyzlsnlzfzsg23ifkrzjgqjjpdcyi1";
+          name = "ansi";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/ansi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ansible = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "ansible";
+        version = "20151123.1953";
+        src = fetchFromGitHub {
+          owner = "k1LoW";
+          repo = "emacs-ansible";
+          rev = "e9b9431738de4808d8ef70871069f68885cc0d98";
+          sha256 = "03d240jngxw51ybrsjw8kdxygrr0ymdckzwga2jr1bqf26v559j2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ansible";
+          sha256 = "1xdc05fdglqfbizra6s1zl6knnvaq526dkxqnw9g7w269j8f4z8g";
+          name = "ansible";
+        };
+        packageRequires = [ f s ];
+        meta = {
+          homepage = "http://melpa.org/#/ansible";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ansible-doc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ansible-doc";
+        version = "20150524.1205";
+        src = fetchFromGitHub {
+          owner = "lunaryorn";
+          repo = "ansible-doc.el";
+          rev = "d0ce210674b5bee9836e6773c4e823747a6f1946";
+          sha256 = "1h3rqrjrl8wx7xvvd631jkbbczq3srd4mgz7y9wh3cvz1njdpy62";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ansible-doc";
+          sha256 = "03idvnn79fr9id81aivkm7g7cmlsg0c520wcq4da8g013xvi342w";
+          name = "ansible-doc";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ansible-doc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ant = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ant";
+        version = "20131228.107";
+        src = fetchFromGitHub {
+          owner = "apgwoz";
+          repo = "ant-el";
+          rev = "8afe6cd0ee4674911ce6b9381b551ab22c567c49";
+          sha256 = "1g4ah0iwqrvvzcxr0ss6il5kign73gzcz1dbc22wdgprlfa4hah7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ant";
+          sha256 = "03rxn2dh0xj89kl24jd19q7kmrn1hnr2cdl3519bpng298kxwni6";
+          name = "ant";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ant";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anti-zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "anti-zenburn-theme";
+        version = "20160113.1944";
+        src = fetchFromGitHub {
+          owner = "m00natic";
+          repo = "anti-zenburn-theme";
+          rev = "dd495097cc06e27c30694c2eb4f1f406349b812b";
+          sha256 = "1qx4m12m0drdd553ma0hg6s5hw9njy9v94xav09lx578c7bdfmf8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anti-zenburn-theme";
+          sha256 = "1sp9p6m2jy4m9fdn1hz25cmasy0mwwgn46qmvm92i56f5x6jlzzk";
+          name = "anti-zenburn-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/anti-zenburn-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anx-api = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "anx-api";
+        version = "20140208.914";
+        src = fetchFromGitHub {
+          owner = "rmloveland";
+          repo = "emacs-appnexus-api";
+          rev = "b2411ebc966ac32c3ffc61bc22bf183834df0fa0";
+          sha256 = "0fzxzar8m9qznfxv3wr7vfj9y2110wf6mm5cj55k3sd5djdjhmf1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anx-api";
+          sha256 = "1vzg3wsqyfb9rsfxrpz8k2gazjlz2nwnf4gnn1dypsjspjnzcb8r";
+          name = "anx-api";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/anx-api";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anybar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "anybar";
+        version = "20160112.1002";
+        src = fetchFromGitHub {
+          owner = "tie-rack";
+          repo = "anybar-el";
+          rev = "852ce3821e8939a9e527847f86bfc7613a3087d7";
+          sha256 = "0qy5q4rq68nb21k7w3xpil8k8k5awcpjrjlxjwnhcklwb83w3dhf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anybar";
+          sha256 = "0prnr8wjhishpf2zmn4b7054vfahk10w05nzsg2p6whaxywcachm";
+          name = "anybar";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/anybar";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anyins = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "anyins";
+        version = "20131229.441";
+        src = fetchFromGitHub {
+          owner = "antham";
+          repo = "anyins";
+          rev = "83844c17ac9b5b6c7655ee556b75689e4c8ea663";
+          sha256 = "05lq0bllgn44zs85mgnfdcyjasm6j8m70jdcxksf798i0qdqnk7n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anyins";
+          sha256 = "0ncf3kn8rackcidkgda2zs60km3hx87rwr9daj7ksmbb6am09s7c";
+          name = "anyins";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/anyins";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anything = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "anything";
+        version = "20151018.2103";
+        src = fetchgit {
+          url = "http://repo.or.cz/r/anything-config.git";
+          rev = "2d7e0450e13ab04b20f4dff08f32936e78677e58";
+          sha256 = "e90ded84609e59a4cef22bfd9d9a543ec6b677b78ab44fb4eb6cbae9eb248669";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything";
+          sha256 = "13pmks0bsby57v3vp6jcvvzwb771d4qq62djgvrw4ykxqzkcb8fj";
+          name = "anything";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/anything";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anything-exuberant-ctags = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "anything-exuberant-ctags";
+        version = "20140316.1837";
+        src = fetchFromGitHub {
+          owner = "k1LoW";
+          repo = "anything-exuberant-ctags";
+          rev = "8ed688fd526751e044435bb77135f5315c8167e5";
+          sha256 = "0dbf510gcd0m191samih0r4lx6d7sgk0ls0sx2jrdkyacy82ridy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-exuberant-ctags";
+          sha256 = "0p0jq2ggdgaxv2gd9m5iza0y3mjjc82xmgp899yr15pfffa4wihk";
+          name = "anything-exuberant-ctags";
+        };
+        packageRequires = [ anything ];
+        meta = {
+          homepage = "http://melpa.org/#/anything-exuberant-ctags";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anything-git-files = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "anything-git-files";
+        version = "20130609.443";
+        src = fetchFromGitHub {
+          owner = "tarao";
+          repo = "anything-git-files-el";
+          rev = "efeec4f8001e2a95f36a9c31181bb30f7561015c";
+          sha256 = "0gj0p7420wx5c186kdccjb9icn656sg5b0zwnwy3fjvhsbbvrb2r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-git-files";
+          sha256 = "13giasg8lh5968plva449ki9nc3478a63700f8c0yghnwjb77asw";
+          name = "anything-git-files";
+        };
+        packageRequires = [ anything ];
+        meta = {
+          homepage = "http://melpa.org/#/anything-git-files";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anything-git-grep = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "anything-git-grep";
+        version = "20130608.2140";
+        src = fetchFromGitHub {
+          owner = "mechairoi";
+          repo = "anything-git-grep";
+          rev = "6ee26e68bb8ec23ffacf5c5f9698c451a4bc905c";
+          sha256 = "06fyvk7cjz1aag6fj52qraqmr23b0fqwml41yyid8gjxl4ygmkpv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-git-grep";
+          sha256 = "1kw88fvxil9l80w8zn16az7avqplyf2m0l7kp431wb5b1b1508jl";
+          name = "anything-git-grep";
+        };
+        packageRequires = [ anything ];
+        meta = {
+          homepage = "http://melpa.org/#/anything-git-grep";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anything-milkode = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild, milkode }:
+    melpaBuild {
+        pname = "anything-milkode";
+        version = "20140518.943";
+        src = fetchFromGitHub {
+          owner = "ongaeshi";
+          repo = "anything-milkode";
+          rev = "d6b2be13a351c41793e9cc13c1320953939d3ac9";
+          sha256 = "1jw6gqwcl3fx1m7w0a15w2pnzzlqyr1fbg0m81ay358s4w3jn6v7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-milkode";
+          sha256 = "1apc865a01jyx602ldzj32rrjk6xmgnxdccpjpcfgh24h2aqpdan";
+          name = "anything-milkode";
+        };
+        packageRequires = [ anything milkode ];
+        meta = {
+          homepage = "http://melpa.org/#/anything-milkode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anything-project = callPackage ({ anything, fetchFromGitHub, fetchurl, imakado, lib, melpaBuild }:
+    melpaBuild {
+        pname = "anything-project";
+        version = "20141024.427";
+        src = fetchFromGitHub {
+          owner = "imakado";
+          repo = "anything-project";
+          rev = "9f6f04bc1911474e97e99faf52e204cf159add83";
+          sha256 = "16a7i01q8qqkgph1s3jnwdr2arjq3cm3jpv5bk5sqs29c003q0pp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-project";
+          sha256 = "10crwm34igb4kjh97alni15xzhsb2s0d4ghva86f2gpjidka9fhr";
+          name = "anything-project";
+        };
+        packageRequires = [ anything imakado ];
+        meta = {
+          homepage = "http://melpa.org/#/anything-project";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anything-prosjekt = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild, prosjekt }:
+    melpaBuild {
+        pname = "anything-prosjekt";
+        version = "20140129.204";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "prosjekt";
+          rev = "a864a8be5842223043702395f311e3350c28e9db";
+          sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-prosjekt";
+          sha256 = "15kgn0wrnbh666kchijdlssf2gp7spgbymr2nwgv6k730cb4mfa8";
+          name = "anything-prosjekt";
+        };
+        packageRequires = [ anything prosjekt ];
+        meta = {
+          homepage = "http://melpa.org/#/anything-prosjekt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anything-replace-string = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "anything-replace-string";
+        version = "20140317.536";
+        src = fetchFromGitHub {
+          owner = "k1LoW";
+          repo = "anything-replace-string";
+          rev = "1962f24243d6013bcef7e8d23136277d42e13130";
+          sha256 = "1834yj2vgs4dasdfnppc8iw8ll3yif948biq9hj0sbpsa2d8y44k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-replace-string";
+          sha256 = "1fagi6cn88p6sf1yhx1qsi7nw9zpyx9hdfl66iyskqwddfvywp71";
+          name = "anything-replace-string";
+        };
+        packageRequires = [ anything ];
+        meta = {
+          homepage = "http://melpa.org/#/anything-replace-string";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anything-sage = callPackage ({ anything, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sage-shell-mode }:
+    melpaBuild {
+        pname = "anything-sage";
+        version = "20141005.613";
+        src = fetchFromGitHub {
+          owner = "stakemori";
+          repo = "anything-sage";
+          rev = "370b4248935dd4527127954788a028399644f578";
+          sha256 = "08xr6fkk1r4r5jqh349d4dfal9nbs2a8y2fp8zn3zlrj2cd0g80k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-sage";
+          sha256 = "1878vj8hzrwfyd2yvxcm0f1vm9m0ndwnj0pcq7j8zm9lxj0w48p3";
+          name = "anything-sage";
+        };
+        packageRequires = [ anything cl-lib sage-shell-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/anything-sage";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anzu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "anzu";
+        version = "20160116.38";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-anzu";
+          rev = "ff54963946b12b3fe94b0deed4c6e695ef9be4dd";
+          sha256 = "0qyycm8bp2yw0h6dr9jkfjxpkl7if8gy6c64km54hc9agg1pbfgp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anzu";
+          sha256 = "0i2ia0jisj31vc2pjx9bhv8jccbp24q7c406x3nhh9hxjzs1f41i";
+          name = "anzu";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/anzu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    aok = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "aok";
+        version = "20130824.627";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/aok.el";
+          sha256 = "10vdmxzifxx3fkpyg76ngnj79k3d2pq0f322rd8ssc66alxhkz3g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aok";
+          sha256 = "1nkkbfwqp5r44wjwl902gm0xc8p3d2qj5mk1cchilr2rib52zd46";
+          name = "aok";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/aok";
+          license = lib.licenses.free;
+        };
+      }) {};
+    aozora-view = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "aozora-view";
+        version = "20140310.817";
+        src = fetchFromGitHub {
+          owner = "kawabata";
+          repo = "aozora-view";
+          rev = "b0390616d19e45f15f9a2f5d5688274831e721fd";
+          sha256 = "0528z3axjmplg2fdbv4jxgy1p39vr4rnsm4a3ps2fanf8bwsyx3l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aozora-view";
+          sha256 = "0pd2574a6dkhrfr0jf5gvv34ganp6ddylyb6cfpg2d4znwbc2r2w";
+          name = "aozora-view";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/aozora-view";
+          license = lib.licenses.free;
+        };
+      }) {};
+    apache-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "apache-mode";
+        version = "20150828.914";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/apache-mode.el";
+          sha256 = "1jndhcjvj6s1clmyyphl5ss5267c7b5a58fz8gbp1ffk1d9ylfik";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/apache-mode";
+          sha256 = "1a1pj3bk0gplfx217yd6qdn7qrhfbkx2bhkk33k0gq5sia6rzs44";
+          name = "apache-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/apache-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    apel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "apel";
+        version = "20141024.1842";
+        src = fetchFromGitHub {
+          owner = "wanderlust";
+          repo = "apel";
+          rev = "8402e59eadb580f59969114557b331b4d9364f95";
+          sha256 = "0sdxnf4b8rqs1cbjxh23wvxmj7ll3zddv8yfdgif6zmgyy8xhc9m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/apel";
+          sha256 = "0zhlm8lfri3zkhj62cycvdhkkgrn72lqb0dalh8qgr049bdv816y";
+          name = "apel";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/apel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    apples-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "apples-mode";
+        version = "20110120.2218";
+        src = fetchFromGitHub {
+          owner = "tequilasunset";
+          repo = "apples-mode";
+          rev = "83a9ab0d6ba82496e2f7df386909b1a55701fccb";
+          sha256 = "0br0jl6xnajdx37s5cvs13srn9lldg58y9587a11s3s651xjdq0z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/apples-mode";
+          sha256 = "05ssnxs9ybc26jhr69xl9jpb41bz1688minmlc9msq2nvyfnj97s";
+          name = "apples-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/apples-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    applescript-mode = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "applescript-mode";
+        version = "20120205.507";
+        src = fetchsvn {
+          url = "http://svn.osdn.jp/svnroot/macemacsjp/applescript-mode/trunk";
+          rev = "584";
+          sha256 = "0n3y0314ajqhn5hzih09gl72110ifw4vzcgdxm8n6npjbx7irbml";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/applescript-mode";
+          sha256 = "1ya0dh7gz7qfflhn6dq43rapb2zg7djvxwn7p4jajyjnwbxmk611";
+          name = "applescript-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/applescript-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    aproject = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "aproject";
+        version = "20150605.406";
+        src = fetchFromGitHub {
+          owner = "vietor";
+          repo = "aproject";
+          rev = "3c7d23c341862dfd77fd0a64775df12ddb44ab54";
+          sha256 = "1wyz8jvdy4m0cn75mm3zvxagm2gl10q51479f91gnqv14b4rndfc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aproject";
+          sha256 = "0v3gx2mff2s7knm69y253pm1yr4svy8w00pqbn1chrvymb62jhp2";
+          name = "aproject";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/aproject";
+          license = lib.licenses.free;
+        };
+      }) {};
+    apropos-fn-plus-var = callPackage ({ fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "apropos-fn-plus-var";
+        version = "20151231.1405";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/apropos-fn+var.el";
+          sha256 = "0wc9zg30a48cj2ssfj9wc7ga0ip9igcxcdbn1wr0qmndzxxa7x5k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/apropos-fn+var";
+          sha256 = "1s5gnsipsj7dhc8ca806grg32i6vlwm78hcxhrbs830vx9k84g5x";
+          name = "apropos-fn-plus-var";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/apropos-fn+var";
+          license = lib.licenses.free;
+        };
+      }) {};
+    apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "apropospriate-theme";
+        version = "20151224.956";
+        src = fetchFromGitHub {
+          owner = "waymondo";
+          repo = "apropospriate-theme";
+          rev = "fdd70f890c2fd25882de011c1327ddab143937ce";
+          sha256 = "1jw6am5c8szrrlff1qfh0hpyi5p5nqnhs8kywl5s4bpj1gxgq8dh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/apropospriate-theme";
+          sha256 = "10bj2bsi7b104m686z8mgvbh493liidsvivxfvfxzbndc8wyjsw9";
+          name = "apropospriate-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/apropospriate-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    apu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "apu";
+        version = "20151231.1408";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/apu.el";
+          sha256 = "1xbvky0mspmbi8ghqhqhgbjn70acipwf0qwn6s5zdarwch10nljj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/apu";
+          sha256 = "0399rmjwcs7fykj10s9m0lm2wb1cr2bzw2bkgm5rp4n3va0rzaa2";
+          name = "apu";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/apu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    archive-region = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "archive-region";
+        version = "20140201.1745";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/archive-region.el";
+          sha256 = "1mhj6x0n2ya3xd7gykmkcf70ji5g8qd8xawz764ykdlcribpsq52";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/archive-region";
+          sha256 = "03x2fqhx4w0c7xd8x8zlnyzdwyay6r2yxf4jzgkcg87q7rqjk9nd";
+          name = "archive-region";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/archive-region";
+          license = lib.licenses.free;
+        };
+      }) {};
+    arduino-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "arduino-mode";
+        version = "20151018.135";
+        src = fetchFromGitHub {
+          owner = "bookest";
+          repo = "arduino-mode";
+          rev = "3e2bad4569ad26e929e6db2cbcff0d6d36812698";
+          sha256 = "1yvaqjc9hadbnnay5fprnh890xsp53kidad1zpb4a5z4a5z61n3c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/arduino-mode";
+          sha256 = "1lpsjpc7par12zsmg9sf4r1h039kxa4n68anjr3mhpp3d6rapjcx";
+          name = "arduino-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/arduino-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    aria2 = callPackage ({ emacs, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "aria2";
+        version = "20141107.1717";
+        src = fetchgit {
+          url = "https://bitbucket.org/ukaszg/aria2.git";
+          rev = "3c54254e424c6c8b4eb0d8e7c4907b094c27a3f0";
+          sha256 = "2713755e56b03e28a5a6e10c85865c1ace0247e71caeb8b89ec65d5618addafc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aria2";
+          sha256 = "10x2k99m3kl6y0k0mw590gq1ac162nmdwk58i8i7a4mb72zmsmhc";
+          name = "aria2";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/aria2";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ariadne = callPackage ({ bert, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ariadne";
+        version = "20131117.1111";
+        src = fetchFromGitHub {
+          owner = "manzyuk";
+          repo = "ariadne-el";
+          rev = "6fe401c7f996bcbc2f685e7971324c6f5e5eaf15";
+          sha256 = "0vh9wfc3657sd12ybjcrxpg6f757x2ghkcl1lw01szmyy5vmj27h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ariadne";
+          sha256 = "0lfhving19wcfr40gjb2gnginiz8cncixiyyxhwx08lm84qb3a7p";
+          name = "ariadne";
+        };
+        packageRequires = [ bert ];
+        meta = {
+          homepage = "http://melpa.org/#/ariadne";
+          license = lib.licenses.free;
+        };
+      }) {};
+    arjen-grey-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "arjen-grey-theme";
+        version = "20150731.845";
+        src = fetchFromGitHub {
+          owner = "credmp";
+          repo = "arjen-grey-theme";
+          rev = "d67a1da021269cb1aeb25ff1aa56249d67371266";
+          sha256 = "1i6y3kv2vii6f8gpd845vv6h832hqx0vxb3fmb1x80kwx3gda682";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/arjen-grey-theme";
+          sha256 = "18q66f7hhys2ab9ljsdp9013mp7d6v6d1lrb0d1bb035r1b4pfj7";
+          name = "arjen-grey-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/arjen-grey-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    artbollocks-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "artbollocks-mode";
+        version = "20141212.1532";
+        src = fetchFromGitHub {
+          owner = "sachac";
+          repo = "artbollocks-mode";
+          rev = "583c7048a1b09cd79554423d5115f5ddd129d190";
+          sha256 = "133c1n4ra7z3vb6y47400y71a6ac19pyji0bgd4kr9fcbx0flx91";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/artbollocks-mode";
+          sha256 = "0dlnxicn6nzyiz44y92pbl4nzr9jxfb9a99wacjrwq2ahdrwhhjp";
+          name = "artbollocks-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/artbollocks-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ascii = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "ascii";
+        version = "20130824.700";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/ascii.el";
+          sha256 = "05fjsj5nmc05cmsi0qj914dqdwk8rll1d4dwhn0crw36p2ivql75";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ascii";
+          sha256 = "0jb63f7qwhfbz0n4yrvnvx03cjqly3mqsc3rq9mgf4svy2zw702r";
+          name = "ascii";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ascii";
+          license = lib.licenses.free;
+        };
+      }) {};
+    asilea = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "asilea";
+        version = "20150105.925";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "asilea";
+          rev = "2aab1cc63b64ef08d12e84fd7ba5c94065f6039f";
+          sha256 = "1s973vzivibaqjb8acn4ylrdasxh17jcfmmvqp4wm05nwhg75597";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/asilea";
+          sha256 = "1lb8nr6r6yy06m4pxg8w9ja4zv8k5xwhl95v2wv95y1qwhgnwg3j";
+          name = "asilea";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/asilea";
+          license = lib.licenses.free;
+        };
+      }) {};
+    asn1-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "asn1-mode";
+        version = "20151124.28";
+        src = fetchFromGitHub {
+          owner = "kawabata";
+          repo = "asn1-mode";
+          rev = "f8acc7e79306ca416f28ff4dc308d8ec47af51a5";
+          sha256 = "0h18x9nh152dnyqjv5b1zjksl8wb75s8zmx3v8vvmwqyy6ql8gcj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/asn1-mode";
+          sha256 = "0iswisb08dqz7jc5ra4wcdhbmglildgyrb547dm5362xmvm9ifmy";
+          name = "asn1-mode";
+        };
+        packageRequires = [ emacs s ];
+        meta = {
+          homepage = "http://melpa.org/#/asn1-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "async";
+        version = "20160108.1449";
+        src = fetchFromGitHub {
+          owner = "jwiegley";
+          repo = "emacs-async";
+          rev = "22de0f5792c9140f1da7c7459f30da0863b07e78";
+          sha256 = "074wdciq62jfc41f829590p4y52dnkn3nxicj9lcabgxwz7cahjp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/async";
+          sha256 = "063ci4f35x1zm9ixy110i5ds0vsrcafpixrz3xkvpnfqdn29si3f";
+          name = "async";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/async";
+          license = lib.licenses.free;
+        };
+      }) {};
+    at = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, queue }:
+    melpaBuild {
+        pname = "at";
+        version = "20140707.720";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "at-el";
+          rev = "114dfe3761bf0c9dd89f794106c3a6a436ed06cc";
+          sha256 = "0rnnvr8x1czphbinby2z2dga7ikwgd13d7zhgmp3ggamzyaz6nf1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/@";
+          sha256 = "0w91qx955z67w2yh8kf86b58bb3b6s6490mmbky8467knf2q83qz";
+          name = "at";
+        };
+        packageRequires = [ emacs queue ];
+        meta = {
+          homepage = "http://melpa.org/#/@";
+          license = lib.licenses.free;
+        };
+      }) {};
+    atom-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "atom-dark-theme";
+        version = "20151120.135";
+        src = fetchFromGitHub {
+          owner = "whitlockjc";
+          repo = "atom-dark-theme-emacs";
+          rev = "b6963e486d27eae7cd472736c106c7079c2a3d3c";
+          sha256 = "0jfpzv8dmvl4nr6kvq5aii830s5h632bq2q3jbnfc4zdql7id464";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/atom-dark-theme";
+          sha256 = "1ci61blm7wc83wm2iyax017ai4jljyag5j1mvw86rimmmjzr0v8f";
+          name = "atom-dark-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/atom-dark-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    atom-one-dark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "atom-one-dark-theme";
+        version = "20160105.948";
+        src = fetchFromGitHub {
+          owner = "jonathanchu";
+          repo = "atom-one-dark-theme";
+          rev = "1297cfb3d01b7ea051cf4abaa27ed4c3b4aca282";
+          sha256 = "027j027w2nbplg1gi28hg9iyiirigydj5n4npf7y9a6g626snxz0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/atom-one-dark-theme";
+          sha256 = "0wwnkhq7vyysqiqcxc1jsn98155ri4mf4w03k7inl1f8ffpwahvw";
+          name = "atom-one-dark-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/atom-one-dark-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auctex-latexmk = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auctex-latexmk";
+        version = "20151217.757";
+        src = fetchFromGitHub {
+          owner = "tom-tan";
+          repo = "auctex-latexmk";
+          rev = "b7d36658c8a9102055a720e9102e1d3514089659";
+          sha256 = "1h0044zfzklc9sy0a02vcdr75ly6wlhjx3n5bvq7yiicqd012316";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auctex-latexmk";
+          sha256 = "1rdlgkiwlgm06i1gjxcfciz6wgdskfhln8qhixyfxk7pnz0ax327";
+          name = "auctex-latexmk";
+        };
+        packageRequires = [ auctex ];
+        meta = {
+          homepage = "http://melpa.org/#/auctex-latexmk";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auctex-lua = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild }:
+    melpaBuild {
+        pname = "auctex-lua";
+        version = "20151121.1010";
+        src = fetchFromGitHub {
+          owner = "vermiculus";
+          repo = "auctex-lua";
+          rev = "799cd8ac10c96991bb63d9aa60528ae5d8c786b5";
+          sha256 = "0lgfgvnaln5rhhwgcrzwrhbj0gz8sgaf6xxdl7njf3sa6bfgngsz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auctex-lua";
+          sha256 = "0v999jvinljkvhbn205p36a6jfzppn0xvflvzr8mid1hnqlrpjhf";
+          name = "auctex-lua";
+        };
+        packageRequires = [ auctex lua-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/auctex-lua";
+          license = lib.licenses.free;
+        };
+      }) {};
+    audio-notes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "audio-notes-mode";
+        version = "20140204.1354";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "audio-notes-mode";
+          rev = "2158b2e8d20df3184bbe273a7fd5aa693e98baa9";
+          sha256 = "0q79kblcbz5vlzj0f49vpc1902767ydmvkmwwjs60x3w2f3aq3cm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/audio-notes-mode";
+          sha256 = "0q88xmi7jbrx47nvbbmwggbm6i7agzpnv5y7cpdh73lg165xsz2h";
+          name = "audio-notes-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/audio-notes-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    aurel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "aurel";
+        version = "20151219.2340";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "aurel";
+          rev = "bcabf49c1410b89d592d8aa78f896428c492879a";
+          sha256 = "0z0wq79ks8251fflk2iwrhd885h5qbki2m19f0jy4a8c00ydmxyz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aurel";
+          sha256 = "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl";
+          name = "aurel";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/aurel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "aurora-config-mode";
+        version = "20140520.403";
+        src = fetchFromGitHub {
+          owner = "bdd";
+          repo = "aurora-config.el";
+          rev = "0a7ca7987c3a0824e25470389c7d25c337a81593";
+          sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aurora-config-mode";
+          sha256 = "0yqmpwj1vp0d5w9zw1hbyxzsbvw165dsgk1v1dxizkqwn7b1v7jm";
+          name = "aurora-config-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/aurora-config-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    aurora-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "aurora-theme";
+        version = "20151015.1302";
+        src = fetchFromGitHub {
+          owner = "xzerocode";
+          repo = "aurora-theme";
+          rev = "3cd8c3359b7b15148e5cea503f3d071e1ed7fc79";
+          sha256 = "1z2n6gd63mgj2wj45n6g1gmfrk0iwzlrzb6g1rdd9r9a03c03qi6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aurora-theme";
+          sha256 = "1fhlng30v25ycr502vfvajl70vimscqkipva6ghr670j35ac5vz5";
+          name = "aurora-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/aurora-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }:
+    melpaBuild {
+        pname = "auth-password-store";
+        version = "20151112.1547";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "auth-password-store";
+          rev = "d7fc1f026c3f43190cacedfa6eff8da916e607f5";
+          sha256 = "0gi65n1np63zi2ylc4y1licwvk97jl92s1v98fv5y61kppi1d8sq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auth-password-store";
+          sha256 = "118ll12dhhxmlsp2mxmy5cd91166a1qsk406yhap5zw1qvyg58w5";
+          name = "auth-password-store";
+        };
+        packageRequires = [ cl-lib emacs password-store seq ];
+        meta = {
+          homepage = "http://melpa.org/#/auth-password-store";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-async-byte-compile = callPackage ({ fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-async-byte-compile";
+        version = "20151029.916";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/auto-async-byte-compile.el";
+          sha256 = "1c8nm4sz9a67q8w0b1jahg5ldy185zws7nilj9yv3miklg07zq17";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-async-byte-compile";
+          sha256 = "108jhrdx67chbdd4h824072i2wrn90zdh2hw5vqd4a5svhhf28jj";
+          name = "auto-async-byte-compile";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/auto-async-byte-compile";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-auto-indent = callPackage ({ cl-lib ? null, es-lib, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-auto-indent";
+        version = "20131106.1303";
+        src = fetchFromGitHub {
+          owner = "sabof";
+          repo = "auto-auto-indent";
+          rev = "0139378577f936d34b20276af6f022fb457af490";
+          sha256 = "1whbvqylwnxg8d8gn55kcky39rgyc49rakyxlbkplh813lk6lxb7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-auto-indent";
+          sha256 = "08s73pnyrmklb660jl5rshncpq31z3m9fl55v7453ch8syp7gzh7";
+          name = "auto-auto-indent";
+        };
+        packageRequires = [ cl-lib es-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-auto-indent";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-capitalize = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "auto-capitalize";
+        version = "20131014.5";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/auto-capitalize.el";
+          sha256 = "1lk9zwng7wkjvb8hprlgyrab1s56n8a61xjva931h0bgypwl1dfi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-capitalize";
+          sha256 = "18fygc71n9bc0vrpymz2f7sw9hzkpqxzfglh53shmbm1zns3wkw0";
+          name = "auto-capitalize";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/auto-capitalize";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-compile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }:
+    melpaBuild {
+        pname = "auto-compile";
+        version = "20151107.1608";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "auto-compile";
+          rev = "90eddfb63bd2b58be8a3fe9400b67ea45f67bb29";
+          sha256 = "07vnk8az4lcxncqn01jvks38b4hpdmg43nbby2b39zy50agqnwsg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-compile";
+          sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks";
+          name = "auto-compile";
+        };
+        packageRequires = [ dash emacs packed ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-compile";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-complete = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "auto-complete";
+        version = "20160107.208";
+        src = fetchFromGitHub {
+          owner = "auto-complete";
+          repo = "auto-complete";
+          rev = "ab01ce9fe07fb30f156276dcb2ce795fdc54e241";
+          sha256 = "07ib2pd3apm97v7kalavpc6fyk00cjky8kfwahn37zmw2j2fdhpf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete";
+          sha256 = "1c4ij5bnclg94jdzhkqvq2vxwv6wvs051mbki1ibjm5f2hlacvh3";
+          name = "auto-complete";
+        };
+        packageRequires = [ cl-lib popup ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-complete";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-complete-auctex = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "auto-complete-auctex";
+        version = "20140223.1158";
+        src = fetchFromGitHub {
+          owner = "monsanto";
+          repo = "auto-complete-auctex";
+          rev = "855633f668bcc4b9408396742a7cb84e0c4a2f77";
+          sha256 = "1wri8q5llpy1q1h4ac4kjnnkgj6fby8i9vrpr6mrb13d4gnk4gr2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-auctex";
+          sha256 = "00npvryds5wd3d5a13r9prlvw6vvjlag8d32x5xf9bfmmvs0fgqh";
+          name = "auto-complete-auctex";
+        };
+        packageRequires = [ auto-complete yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-complete-auctex";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-complete-c-headers = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-complete-c-headers";
+        version = "20150911.2223";
+        src = fetchFromGitHub {
+          owner = "mooz";
+          repo = "auto-complete-c-headers";
+          rev = "52fef720c6f274ad8de52bef39a343421006c511";
+          sha256 = "12mzi6bwg702sp0f0wd1ag555blbpk252rr9rqs03bn8pkw89h4n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-c-headers";
+          sha256 = "02pkrxvzrpyjrr2fkxnl1qw06aspzv8jlp2c1piln6zcjd92l3j7";
+          name = "auto-complete-c-headers";
+        };
+        packageRequires = [ auto-complete ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-complete-c-headers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-complete-chunk = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-complete-chunk";
+        version = "20140225.346";
+        src = fetchFromGitHub {
+          owner = "tkf";
+          repo = "auto-complete-chunk";
+          rev = "a9aa77ffb84a1037984a7ce4dda25074272f13fe";
+          sha256 = "1zhbpxpl443ghpkl9i68jcjfcw1vnf8ky06pf5qjjmqbxlcyd9li";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-chunk";
+          sha256 = "1937j1xm20vfcqm9ig4nvciqfkz7rpw0nsfhlg69gkmv0nqszdr3";
+          name = "auto-complete-chunk";
+        };
+        packageRequires = [ auto-complete ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-complete-chunk";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-complete-clang = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-complete-clang";
+        version = "20140409.252";
+        src = fetchFromGitHub {
+          owner = "brianjcj";
+          repo = "auto-complete-clang";
+          rev = "a195db1d0593b4fb97efe50885e12aa6764d998c";
+          sha256 = "12y6f47xbjl4gy14j2f5wlisy5vl6rhx74n27w61pjv38m0a7mi1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-clang";
+          sha256 = "1rnmphl7ml5ryjl5ka2l58hddir8b34iz1rm905wdwh164piljva";
+          name = "auto-complete-clang";
+        };
+        packageRequires = [ auto-complete ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-complete-clang";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-complete-clang-async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-complete-clang-async";
+        version = "20130526.1014";
+        src = fetchFromGitHub {
+          owner = "Golevka";
+          repo = "emacs-clang-complete-async";
+          rev = "5d9c5cabbb6b31e0ac3637631c0c8b25184aa8b4";
+          sha256 = "1sw0wxrjcjqk0w1llfj376g6axa5bnk2lq2vv66746bkz14h0s8f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-clang-async";
+          sha256 = "1jj0jn1v3070g7g0j5gvpybv145kki8nsjxqb8fjf9qag8ilfkjh";
+          name = "auto-complete-clang-async";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/auto-complete-clang-async";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-complete-exuberant-ctags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-complete-exuberant-ctags";
+        version = "20140320.224";
+        src = fetchFromGitHub {
+          owner = "k1LoW";
+          repo = "auto-complete-exuberant-ctags";
+          rev = "ff6121ff8b71beb5aa606d28fd389c484ed49765";
+          sha256 = "1fqgyg986fg1dzac5wa97bx82mfddqb6qrfnpr3zksmw3vgykxr0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-exuberant-ctags";
+          sha256 = "1i2s3ycc8jafkzdsz3kbvx1hh95ydi5s6rq6n0wzw1kyy3km35gd";
+          name = "auto-complete-exuberant-ctags";
+        };
+        packageRequires = [ auto-complete ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-complete-exuberant-ctags";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-complete-nxml = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-complete-nxml";
+        version = "20140220.2258";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "auto-complete-nxml";
+          rev = "ac7b09a23e45f9bd02affb31847263de4180163a";
+          sha256 = "18bf1kw85mab0zp7rn85cm1nxjxg5c1dmiv0j0mjwzsv8an4px5y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-nxml";
+          sha256 = "0viscr5k1carn9vhflry16kgihr6fvh6h36b049pgnk6ww085k6a";
+          name = "auto-complete-nxml";
+        };
+        packageRequires = [ auto-complete ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-complete-nxml";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-complete-pcmp = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
+    melpaBuild {
+        pname = "auto-complete-pcmp";
+        version = "20140227.51";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "auto-complete-pcmp";
+          rev = "2595d3dab1ef3549271ca922f212928e9d830eec";
+          sha256 = "1hf2f903hy9afahrgy2fx9smgn631drs6733188zgqi3nkyizj26";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-pcmp";
+          sha256 = "1mpgkwj8jwpvxphlm6iaprwjrldmihbgg97jav0fbm1kjnm4azna";
+          name = "auto-complete-pcmp";
+        };
+        packageRequires = [ auto-complete log4e yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-complete-pcmp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-complete-rst = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-complete-rst";
+        version = "20140225.344";
+        src = fetchFromGitHub {
+          owner = "tkf";
+          repo = "auto-complete-rst";
+          rev = "4803ce41a96224e6fa54e6741a5b5f40ebed7351";
+          sha256 = "107svb82cgfns9kcrmy3hh56cab81782jkbz5i9959ms81xizfb8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-rst";
+          sha256 = "0dazkpnzzr0imb2a01qq8l60jxhhlknzjx7wccnbm7d2rk3338m6";
+          name = "auto-complete-rst";
+        };
+        packageRequires = [ auto-complete ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-complete-rst";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-complete-sage = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, sage-shell-mode }:
+    melpaBuild {
+        pname = "auto-complete-sage";
+        version = "20151201.1257";
+        src = fetchFromGitHub {
+          owner = "stakemori";
+          repo = "auto-complete-sage";
+          rev = "a61a4e58b14134712e0737280281c0b10e56da93";
+          sha256 = "0l49ciic7g30vklxq6l1ny3mz87l5p8qc30rmkjvkzvg8r52ksn3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-sage";
+          sha256 = "02sxbir3arvmnkvxgndlkln9y05jnlv6i8czd6a0wcxk4nj43lq1";
+          name = "auto-complete-sage";
+        };
+        packageRequires = [ auto-complete sage-shell-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-complete-sage";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-dictionary = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-dictionary";
+        version = "20150410.1110";
+        src = fetchFromGitHub {
+          owner = "nschum";
+          repo = "auto-dictionary-mode";
+          rev = "b364e08009fe0062cf0927d8a0582fad5a12b8e7";
+          sha256 = "0rfjx0x2an28821shgb4v5djza4kwn5nnrsl2cvh3px4wrvw3izp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-dictionary";
+          sha256 = "1va485a8lxvb3507kr83cr6wpssxnf8y4l42mamn9daa8sjx3q16";
+          name = "auto-dictionary";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/auto-dictionary";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-dim-other-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-dim-other-buffers";
+        version = "20140619.1102";
+        src = fetchFromGitHub {
+          owner = "mina86";
+          repo = "auto-dim-other-buffers.el";
+          rev = "8b909cb210a9e4482bcc43858cf8d15da4ecd1d2";
+          sha256 = "1j3ygbask2vsrh6ia6y86348lg6vl68gsraryxn25mr0c2b41811";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-dim-other-buffers";
+          sha256 = "0n9d23sfcmkjfqlm80vrgf856wy08ak4n4rk0z7vadq07yj46zxh";
+          name = "auto-dim-other-buffers";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/auto-dim-other-buffers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-highlight-symbol = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-highlight-symbol";
+        version = "20130313.443";
+        src = fetchFromGitHub {
+          owner = "gennad";
+          repo = "auto-highlight-symbol";
+          rev = "26573de912d760e04321b350897aea70958cee8b";
+          sha256 = "0jfiax1qqnyznhlnqkjsr9nnv7fpjywvfhj9jq59460j0nbrgs5c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-highlight-symbol";
+          sha256 = "02mkji4sxym07jf5ww5kgv1c18x0xdfn8cmvgns5h4gij64lnr66";
+          name = "auto-highlight-symbol";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/auto-highlight-symbol";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-indent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-indent-mode";
+        version = "20140505.855";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "auto-indent-mode.el";
+          rev = "1a12448ce3a030ed905226450dfb01bba37f127c";
+          sha256 = "1hlsgsdxpx42kmqkjgy9b9ldz5i4dbi879v87pjd2qbkj8iywb6y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-indent-mode";
+          sha256 = "1nk78p8lqs8cx90asfs8iaqnwwyy8fi5bafaprm9c0nrxz299ibz";
+          name = "auto-indent-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/auto-indent-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-install = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "auto-install";
+        version = "20150418.1902";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/auto-install.el";
+          sha256 = "043pb2wk7jh0jgxphdl4848rjyabna26gj0vlhpiyd8zc361pg9d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-install";
+          sha256 = "1gaxc2ya4r903k0jf3319wg7wg5kzq7k8rfy8ac9b0wfzv247ixk";
+          name = "auto-install";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/auto-install";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-package-update = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-package-update";
+        version = "20151026.111";
+        src = fetchFromGitHub {
+          owner = "rranelli";
+          repo = "auto-package-update.el";
+          rev = "cdef79f9fc6f8347fdd05664978fb9a948ea0410";
+          sha256 = "05llpa6g4nb4qswmcn7j3bs7hnmkrkax7hsk7wvklr0wrljyg9a2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-package-update";
+          sha256 = "0fdcniq5mrwbc7yvma4088r0frdfvc2ydfil0s003faz0nrjcp8k";
+          name = "auto-package-update";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-package-update";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-save-buffers-enhanced = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-save-buffers-enhanced";
+        version = "20130607.2149";
+        src = fetchFromGitHub {
+          owner = "kentaro";
+          repo = "auto-save-buffers-enhanced";
+          rev = "caf594120781a323ac37eab82bcf87f1ed4c9c42";
+          sha256 = "10aw3bpvawkqj1l8brvzq057wx3mkzpxs4zc3yhppkhq2cpvx7i2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-save-buffers-enhanced";
+          sha256 = "123vf6nnvdhrrfjn8n8h8a11mkqmy2zm3w3yn99np0zj31x8z7bb";
+          name = "auto-save-buffers-enhanced";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/auto-save-buffers-enhanced";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-shell-command = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }:
+    melpaBuild {
+        pname = "auto-shell-command";
+        version = "20150416.1257";
+        src = fetchFromGitHub {
+          owner = "ongaeshi";
+          repo = "auto-shell-command";
+          rev = "59d4abce779a3ce3e920592bf5696b54b2e192c7";
+          sha256 = "1h8zsgw30axprs7a5kkygbhvilillzazxgqz01ng36il65fi28s6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-shell-command";
+          sha256 = "1i78fh72i8yv91rnabf0vs78r43qrjkr36hndmn5ya2xs3b1g41j";
+          name = "auto-shell-command";
+        };
+        packageRequires = [ deferred popwin ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-shell-command";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-yasnippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "auto-yasnippet";
+        version = "20151218.1031";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "auto-yasnippet";
+          rev = "9e126461d4473fb734f7e33dc2019cd71856dc42";
+          sha256 = "14qr8c4i4644vwqvlh5d3xhw1dzmqz3v74hqlp7g8991yaka72va";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-yasnippet";
+          sha256 = "02281gyy07cy72a29fjsixg9byqq3izb9m1jxv98ni8pcy3bpsqa";
+          name = "auto-yasnippet";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-yasnippet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    autobookmarks = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "autobookmarks";
+        version = "20151120.1645";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "autobookmarks";
+          rev = "cec3a2ac60a382ee61996c17bd962bc5a2e45c4b";
+          sha256 = "01q3k8i8vrs7pcr507kh48np0bc6smanh0ald1hv9h4dylkq89k7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autobookmarks";
+          sha256 = "11zhg3y9fb5mq67fwsnjrql9mnwkp3hwib7fpllb3yyf2yywc8zp";
+          name = "autobookmarks";
+        };
+        packageRequires = [ cl-lib dash ];
+        meta = {
+          homepage = "http://melpa.org/#/autobookmarks";
+          license = lib.licenses.free;
+        };
+      }) {};
+    autodisass-java-bytecode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "autodisass-java-bytecode";
+        version = "20151005.1112";
+        src = fetchFromGitHub {
+          owner = "gbalats";
+          repo = "autodisass-java-bytecode";
+          rev = "3d61dbe266133c950b39e880f78d142751c7dc4c";
+          sha256 = "1pf2mwnicj5x2kksxwmrzz2vfxj9y9r6rzgc1fl8028mfrmrmg8s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autodisass-java-bytecode";
+          sha256 = "1k19nkbxnysm3qkpdhz4gv2x9nnrp94xl40x84q8n84s6xaan4dc";
+          name = "autodisass-java-bytecode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/autodisass-java-bytecode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    autodisass-llvm-bitcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "autodisass-llvm-bitcode";
+        version = "20150410.2025";
+        src = fetchFromGitHub {
+          owner = "gbalats";
+          repo = "autodisass-llvm-bitcode";
+          rev = "d2579e3a1427af2dc947c343e49eb3434078bf04";
+          sha256 = "1fq4h5fmamyh7z8nq6pigx74p5v8k3qfm64k66vwsm8bl5jdkw17";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autodisass-llvm-bitcode";
+          sha256 = "0bh73nzll9jp7kiqfnb5dwkipw85p3c3cyq58s0nghig02z63j01";
+          name = "autodisass-llvm-bitcode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/autodisass-llvm-bitcode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    autofit-frame = callPackage ({ fetchurl, fit-frame, lib, melpaBuild }:
+    melpaBuild {
+        pname = "autofit-frame";
+        version = "20151231.1409";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/autofit-frame.el";
+          sha256 = "1af45z1w69dkdk4mzjphwn420m9rrkc3djv5kpp6lzbxxnmswbqw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autofit-frame";
+          sha256 = "0p24qqnfa1vfn5pgnpvbxwi11zjkd6f3cv5igwg6h0pr5s7spnvw";
+          name = "autofit-frame";
+        };
+        packageRequires = [ fit-frame ];
+        meta = {
+          homepage = "http://melpa.org/#/autofit-frame";
+          license = lib.licenses.free;
+        };
+      }) {};
+    automargin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "automargin";
+        version = "20131112.214";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "automargin";
+          rev = "4901d969ad69f5244e6300baab4ba04efed800c3";
+          sha256 = "02nnyncfh6g0xizy7wa8721ahpnwk451kngd6n0y0249f50p3962";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/automargin";
+          sha256 = "0llqz01wmacc0f8j3h7r0j57vkmzksl9vj1h0igfxzpm347mm9q8";
+          name = "automargin";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/automargin";
+          license = lib.licenses.free;
+        };
+      }) {};
+    autopair = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "autopair";
+        version = "20140825.627";
+        src = fetchFromGitHub {
+          owner = "capitaomorte";
+          repo = "autopair";
+          rev = "4f4bd30b341e7fb15a452b59f3e5c34cbd5c97d8";
+          sha256 = "1z3hd2jkibwz2ijvyh066ki5g30pdqgh2vj2r35prpp12bqabw4a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autopair";
+          sha256 = "161qhk8rc1ldj9hpg0k9phka0gflz9vny7gc8rnylk90p6asmr28";
+          name = "autopair";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/autopair";
+          license = lib.licenses.free;
+        };
+      }) {};
+    autotest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "autotest";
+        version = "20150130.425";
+        src = fetchFromGitHub {
+          owner = "zenspider";
+          repo = "elisp";
+          rev = "ec4ef9dc2d018053bed7fb44837b4c66f1a14c36";
+          sha256 = "109il2s5ynfam510yli4xmi5zgw7xhr5gv096li24idqdp0gpf9n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autotest";
+          sha256 = "0f46m5pc40i531dzfnhkcn192dcs1q20y083c1c0wg2zhjcdr5iy";
+          name = "autotest";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/autotest";
+          license = lib.licenses.free;
+        };
+      }) {};
+    autotetris-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "autotetris-mode";
+        version = "20141114.1046";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "autotetris-mode";
+          rev = "dd490d5ad6d84bd964ab349484f6a2d05651ede1";
+          sha256 = "162zay36mmkkpbfvp0lagv2js4cr1z75dc1z5l2505814m5sx3az";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autotetris-mode";
+          sha256 = "0k4yq4pvrs1zaf9aqxmlb6l2v4k774zbxj4zcx49w3l1h8gwxpbb";
+          name = "autotetris-mode";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/autotetris-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    autumn-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "autumn-light-theme";
+        version = "20150515.947";
+        src = fetchFromGitHub {
+          owner = "aalpern";
+          repo = "emacs-color-theme-autumn-light";
+          rev = "1e3b2a43a3001e4a97a5ff073ba3f0d2ea3888f9";
+          sha256 = "1lip7282g41ghn64dvx2ab437s83cj9l8ps1rd8rbhqyz4bx5wb9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autumn-light-theme";
+          sha256 = "0g3wqv1yw3jycq30mcj3w4sn9nj6i6gyd2ljzimf547ggcai536a";
+          name = "autumn-light-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/autumn-light-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "avy";
+        version = "20160106.923";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "avy";
+          rev = "15d0679385fdf3f1d20904ff68ebcb522c4a87d4";
+          sha256 = "171mjcv0hc7gybjsdfqayxid2dbxmd03zsp16i8fhq624277m9m8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/avy";
+          sha256 = "0gjq79f8jagbngp0shkcqmwhisc3hpgwfk34kq30nb929nbnlmag";
+          name = "avy";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/avy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
+    melpaBuild {
+        pname = "avy-migemo";
+        version = "20160110.2233";
+        src = fetchFromGitHub {
+          owner = "momomo5717";
+          repo = "avy-migemo";
+          rev = "dc951e4c1cca64b97934bed1e7512859d8ff27ac";
+          sha256 = "0d8s16f8y9kypl083hgz5rbv47fkb3hvimgw57czf6hlcaaldy75";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/avy-migemo";
+          sha256 = "1zvgkhma445gj1zjl8j25prw95bdpjbvfy8yr0r5liay6g2hf296";
+          name = "avy-migemo";
+        };
+        packageRequires = [ avy emacs migemo ];
+        meta = {
+          homepage = "http://melpa.org/#/avy-migemo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    avy-zap = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "avy-zap";
+        version = "20151211.1348";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "avy-zap";
+          rev = "ee3a2ad9911384e21537bc641a2f794dd192bbe8";
+          sha256 = "0s7lhls6gs055kw0893nkb9myv7m2q2p251lq9wh2r3bmia9d6pg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/avy-zap";
+          sha256 = "1zbkf21ggrmg1w0xaw40i3swgc1g4fz0j8p0r9djm9j120d94zkx";
+          name = "avy-zap";
+        };
+        packageRequires = [ avy ];
+        meta = {
+          homepage = "http://melpa.org/#/avy-zap";
+          license = lib.licenses.free;
+        };
+      }) {};
+    awk-it = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "awk-it";
+        version = "20130917.1348";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/awk-it.el";
+          sha256 = "1r1vbi1r3rdbkyb2naciqwja7hxigjhqfxsfcinnygabsi7fw9aw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/awk-it";
+          sha256 = "1rnrm9jf9wvfrwyylhj0bfrz9140945lc87lrh21caf7q88fpvkw";
+          name = "awk-it";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/awk-it";
+          license = lib.licenses.free;
+        };
+      }) {};
+    axiom-environment = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "axiom-environment";
+        version = "20151126.1509";
+        src = fetchhg {
+          url = "https://bitbucket.com/pdo/axiom-environment";
+          rev = "d7ea57a27527";
+          sha256 = "1vk7jjbf8wp183c4nagkgxvzcyrdlr53avzsxl111rm5rsxbvdli";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/axiom-environment";
+          sha256 = "1d3h1fn5zfbh7kpm2i02kza3bq9s6if4yd2vvfjdhgrykvl86h66";
+          name = "axiom-environment";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/axiom-environment";
+          license = lib.licenses.free;
+        };
+      }) {};
+    babel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "babel";
+        version = "20131231.925";
+        src = fetchFromGitHub {
+          owner = "juergenhoetzel";
+          repo = "babel";
+          rev = "9bc1c3cf6de50b0e34fa1a7640eb68c650e72fd6";
+          sha256 = "140lbpqq4qz45ykycdn8nvcn8pv0xqfwpapgprvyg8z5fjkyc4sg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/babel";
+          sha256 = "0sdpp4iym61ni32zv75n48ylj4jib8ca6n9hyqwj1b7nqg76mm1c";
+          name = "babel";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/babel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    babel-repl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "babel-repl";
+        version = "20160114.1210";
+        src = fetchFromGitHub {
+          owner = "hung-phan";
+          repo = "babel-repl";
+          rev = "52ea173be190d68dce4bb001d748e63ce7574171";
+          sha256 = "1wfssdv6ag36ww6v7al2x04mbpaajlx92wfm8rbq8rp8887724s5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/babel-repl";
+          sha256 = "0h11i8w8s4ia1x0lm5n7bnc3db4bv0a7f7hzl27qrg38m3c7dl6x";
+          name = "babel-repl";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/babel-repl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    back-button = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, nav-flash, pcache, persistent-soft, smartrep, ucs-utils }:
+    melpaBuild {
+        pname = "back-button";
+        version = "20150804.1504";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "back-button";
+          rev = "98d92984a740acd1547bd7ed05cca0affdb21c3e";
+          sha256 = "0rj6a8rdwa0h2ckz7h4d91hnxqcin98l4ikbfyak2whfb47z909l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/back-button";
+          sha256 = "0vyhvm445d0rs14j5xi419akk5nd88d4hvm4251z62fmnvs50j85";
+          name = "back-button";
+        };
+        packageRequires = [
+          list-utils
+          nav-flash
+          pcache
+          persistent-soft
+          smartrep
+          ucs-utils
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/back-button";
+          license = lib.licenses.free;
+        };
+      }) {};
+    backup-each-save = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "backup-each-save";
+        version = "20130704.932";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/backup-each-save.el";
+          sha256 = "0b9vvi2m0fdv36wj8mvawl951gjmg3pypg08a8n6rzn3rwg0fwz7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/backup-each-save";
+          sha256 = "1fv9sf6vkjyv93vil4l9hjm2fg73zlxbnif0xfm3kpmva9xin337";
+          name = "backup-each-save";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/backup-each-save";
+          license = lib.licenses.free;
+        };
+      }) {};
+    backup-walker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "backup-walker";
+        version = "20130720.1016";
+        src = fetchFromGitHub {
+          owner = "lewang";
+          repo = "backup-walker";
+          rev = "934a4128c122972ac32bb9952addf279a60a94da";
+          sha256 = "0z4d8x9lkad50720lgvr8f85p1ligv07865i30lgr9ck0q04w68v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/backup-walker";
+          sha256 = "0hfr27yiiblrd0p3zhpapbj4vijfdk7wqh406xnlwf2yvnfsqycd";
+          name = "backup-walker";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/backup-walker";
+          license = lib.licenses.free;
+        };
+      }) {};
+    badger-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "badger-theme";
+        version = "20140716.2132";
+        src = fetchFromGitHub {
+          owner = "ccann";
+          repo = "badger-theme";
+          rev = "80fb9f8ace37b2e8807da639f7da499a53ffefd4";
+          sha256 = "0g8smx6pi2wqv78mhxfgwg51mx5msqsgcc55xcz29aq0q3naw4z1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/badger-theme";
+          sha256 = "01h5bsqllgn6gs0wpl0y2h041007mn3ldjswkz6f3mayrgl4c6yf";
+          name = "badger-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/badger-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    badwolf-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "badwolf-theme";
+        version = "20160108.1629";
+        src = fetchFromGitHub {
+          owner = "bkruczyk";
+          repo = "badwolf-emacs";
+          rev = "a0b4e1bd6014800eacd2c90bdaa9478d955642f7";
+          sha256 = "0bwai3b5g3ksxg8i9fdby5zkca56qpsc7fyj2hl6arcfwnc68nhc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/badwolf-theme";
+          sha256 = "03plkzpmlh0pgfp1c9padsh4w2g23clsznym8x4jabxnk0ynhq41";
+          name = "badwolf-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/badwolf-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    baidu-life = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "baidu-life";
+        version = "20151210.615";
+        src = fetchFromGitHub {
+          owner = "lujun9972";
+          repo = "el-baidu-life";
+          rev = "4cb251d44e97da54306af9d99444d9b8525f043e";
+          sha256 = "00skx1aywzvnqqsm41n2mwry5i6ifib8kzq5klymbrc7qfnbb55f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/baidu-life";
+          sha256 = "0rib50hja33qk8dmw5i62gaxhx7mscj2y0n25jmnds7k88ms8z19";
+          name = "baidu-life";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/baidu-life";
+          license = lib.licenses.free;
+        };
+      }) {};
+    base16-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "base16-theme";
+        version = "20151019.911";
+        src = fetchFromGitHub {
+          owner = "mkaito";
+          repo = "base16-emacs";
+          rev = "18693adea42ec2667534651c28c32934bc1bcec0";
+          sha256 = "16240dj0hvxkljas9973wjdgkbx213sqws77j167yr5xf761dlsr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/base16-theme";
+          sha256 = "1zxbvfj6gvz1ynhj6i9q9y65hq7aq41qx4vnx738cjizcq0rc8bs";
+          name = "base16-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/base16-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bash-completion";
+        version = "20150514.928";
+        src = fetchFromGitHub {
+          owner = "szermatt";
+          repo = "emacs-bash-completion";
+          rev = "1659c7ca38e2cf591525a3d0b9d97461de33916d";
+          sha256 = "06c42531dy5ngscwfvg8rksg6jcsakfn7104hmlg1jp4kvfiy1kg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bash-completion";
+          sha256 = "0l41yj0sb87i27hw6dh35l32hg4qkka6r3bpkckjnfm0xifrd9hj";
+          name = "bash-completion";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bash-completion";
+          license = lib.licenses.free;
+        };
+      }) {};
+    basic-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "basic-theme";
+        version = "20151010.307";
+        src = fetchFromGitHub {
+          owner = "fgeller";
+          repo = "basic-theme.el";
+          rev = "e3c32e1285749b4135d4d593f06566c631c26456";
+          sha256 = "1pbnw6ccphxynbhnc4g687jfcg33p1sa7a0mfxc2ai0i3z59gn78";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/basic-theme";
+          sha256 = "16rgff1d0s65alh328lr93zc06zmgbzgwx1rf3k3l4d10ki4cc27";
+          name = "basic-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/basic-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    batch-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "batch-mode";
+        version = "20140807.1550";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/batch-mode.el";
+          sha256 = "1aa611jrzw4svmxvw1ghgh53x4nry0sl7mxmp4kxiaybqqvz6a1p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/batch-mode";
+          sha256 = "1p0rh5r8w00jag64sbjy8xb9g6lqhm2fz476v201kbrj9ggp643x";
+          name = "batch-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/batch-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bats-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bats-mode";
+        version = "20141115.901";
+        src = fetchFromGitHub {
+          owner = "dougm";
+          repo = "bats-mode";
+          rev = "9469a9a9de4fe7d1aab4600294c43898bf5cf638";
+          sha256 = "1fy9qnwsxvb8qnyk13bnjjbnlhdads5qf1byg5agg6lq5np3w5jf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bats-mode";
+          sha256 = "1l5winy30w8fs3f5cylc3a3j3mfkvchwanlgsin7q76jivn87h7w";
+          name = "bats-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bats-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bbcode-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bbcode-mode";
+        version = "20141103.1541";
+        src = fetchFromGitHub {
+          owner = "ejmr";
+          repo = "bbcode-mode";
+          rev = "b6ff1bfb8041b1435ebfc0a7d8e5e34eeb1b6aae";
+          sha256 = "17ip24fk13aj9zldn2qsr4naa8anqhm484m1an5l5i9m9awfiyn7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbcode-mode";
+          sha256 = "0ixxavmilr6na56yc148prbh3nlhcwir6rxqvh332cr8vr9gmp89";
+          name = "bbcode-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bbcode-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bbdb = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "bbdb";
+        version = "20151114.1741";
+        src = fetchgit {
+          url = "git://git.savannah.nongnu.org/bbdb.git";
+          rev = "8fce6df3ab09250d545a2ed373ae64e68d12ff4c";
+          sha256 = "e20dfe8085782948c1411685d45bad0cb7ff088bc2d1d2c1654c276356382b26";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb";
+          sha256 = "0zhs4psa9b9yf9hxm19q5znsny11cdp23pya3rrlmj39j4jfn73j";
+          name = "bbdb";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bbdb";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bbdb- = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
+    melpaBuild {
+        pname = "bbdb-";
+        version = "20140221.1754";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "bbdb-";
+          rev = "2839e84c894de2513af41053e80a277a1b483d22";
+          sha256 = "17nbnkg0zn6p89r27mk9hl6qhv6xscwdsq8iyikdw03svpr16lnp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-";
+          sha256 = "1vzbalcchay4pxl9f1sxg0zclgc095f59dlj15pj0bqq61sbl9jf";
+          name = "bbdb-";
+        };
+        packageRequires = [ bbdb log4e yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/bbdb-";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bbdb-android = callPackage ({ bbdb-vcard, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bbdb-android";
+        version = "20150706.24";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "bbdb-android";
+          rev = "60641acf8b90e34b70f783b3d6e7789a4272f2b4";
+          sha256 = "0m80k87dahzdpfa4snbl4p9zm5d5anc8s91535mwzsnfbr98qmhm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-android";
+          sha256 = "0v3njygqkcrwjkf7jrqmza6bwk2jp3956cx1qvf9ph7dfxsq7rn3";
+          name = "bbdb-android";
+        };
+        packageRequires = [ bbdb-vcard ];
+        meta = {
+          homepage = "http://melpa.org/#/bbdb-android";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bbdb-china = callPackage ({ bbdb-vcard, chinese-pyim, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bbdb-china";
+        version = "20150615.2056";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "bbdb-china";
+          rev = "a64725ca6dbb5ec1825f3a9112df9aa54bb14f6c";
+          sha256 = "07plwm5nh58qya03l8z0iaqh8bmyhywx7qiffkf803n8wwjb3kdn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-china";
+          sha256 = "111lf256zxlnylfmwis0pngbpj73p59s520v8abbm7pn82k2m72b";
+          name = "bbdb-china";
+        };
+        packageRequires = [ bbdb-vcard chinese-pyim ];
+        meta = {
+          homepage = "http://melpa.org/#/bbdb-china";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bbdb-csv-import = callPackage ({ bbdb, dash, fetchFromGitLab, fetchurl, lib, melpaBuild, pcsv }:
+    melpaBuild {
+        pname = "bbdb-csv-import";
+        version = "20140802.642";
+        src = fetchFromGitLab {
+          owner = "iankelling";
+          repo = "bbdb-csv-import";
+          rev = "7739d10ebe1787a72aa74085e9baedd0f4988b00";
+          sha256 = "1h9vi9wb3dzzjrw5zfypk60afzzshxa3qmnbc24ypby5dr7qy91l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-csv-import";
+          sha256 = "0r7pc2ypd1ydqrnvcqmsg69rm047by7k0zhm563538ra82597wnm";
+          name = "bbdb-csv-import";
+        };
+        packageRequires = [ bbdb dash pcsv ];
+        meta = {
+          homepage = "http://melpa.org/#/bbdb-csv-import";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bbdb-ext = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bbdb-ext";
+        version = "20151220.1413";
+        src = fetchFromGitHub {
+          owner = "vapniks";
+          repo = "bbdb-ext";
+          rev = "fee97b1b3faa83edaea00fbc5ad3cbca5e791a55";
+          sha256 = "1ydf89mmp3zjfqdymnrwg18wclyf7psarz9f2k82pl58h0khh71g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-ext";
+          sha256 = "0fnxcvzdyh0602rdfz3lz3vmvza4s0syz1vn2fgsn2lg3afqq7li";
+          name = "bbdb-ext";
+        };
+        packageRequires = [ bbdb ];
+        meta = {
+          homepage = "http://melpa.org/#/bbdb-ext";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bbdb-handy = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bbdb-handy";
+        version = "20150707.1952";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "bbdb-handy";
+          rev = "67936204488b539fac9b4a7bfbf11546f3b13de2";
+          sha256 = "04yxky7qxh0s4y4addry85qd1074l97frhp0hw77xd1bc7n5zzg0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-handy";
+          sha256 = "0qv1lw4fv9w9c1ypzpbnvkm6ypqrzqpwyw5gpi7n9almxpd8d68z";
+          name = "bbdb-handy";
+        };
+        packageRequires = [ bbdb ];
+        meta = {
+          homepage = "http://melpa.org/#/bbdb-handy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bbdb-vcard = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bbdb-vcard";
+        version = "20150713.1550";
+        src = fetchFromGitHub {
+          owner = "tohojo";
+          repo = "bbdb-vcard";
+          rev = "c3aafd4160854a38fd92afcdade32b9a13abe82c";
+          sha256 = "1zlf9xhpirln72xr7v6kgndkg5wyz5ipsl4gpq9lbmp92jlgbwlj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-vcard";
+          sha256 = "1kn98b7mh9a28933r4yl8qfl9p92rpix4vkp71sar9cka0m71ilj";
+          name = "bbdb-vcard";
+        };
+        packageRequires = [ bbdb ];
+        meta = {
+          homepage = "http://melpa.org/#/bbdb-vcard";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bbdb2erc = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bbdb2erc";
+        version = "20130607.129";
+        src = fetchFromGitHub {
+          owner = "unhammer";
+          repo = "bbdb2erc";
+          rev = "f39a36351e1e6f1105c9e32970e7502b77b0dbcd";
+          sha256 = "1zkh7dcas80wwjvigl27wj8sp4b5z6lh3qj7zkziinwamwnxbdbs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb2erc";
+          sha256 = "0k1f6mq9xd3568vg01dqqvcdbdshbdsi4ivkjyxis6dqfnqhlfdd";
+          name = "bbdb2erc";
+        };
+        packageRequires = [ bbdb ];
+        meta = {
+          homepage = "http://melpa.org/#/bbdb2erc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bbyac = callPackage ({ browse-kill-ring, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bbyac";
+        version = "20150316.501";
+        src = fetchFromGitHub {
+          owner = "baohaojun";
+          repo = "bbyac";
+          rev = "8dc5a7c0ada7ac729a87343149970ced139bb659";
+          sha256 = "1cdm4d6fjf3m495phynq0dzvv0wc0gfsw6fdq4d47iyxs0p4q2dl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbyac";
+          sha256 = "19s9fqcdyqz22m981vr0p8jwghbs267yrlxsv9xkfzd7fccnx170";
+          name = "bbyac";
+        };
+        packageRequires = [ browse-kill-ring cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/bbyac";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bdo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bdo";
+        version = "20140126.301";
+        src = fetchFromGitHub {
+          owner = "chrisdone";
+          repo = "bdo";
+          rev = "c96cb6aa9e97fa3491185c50dee0f77a13241010";
+          sha256 = "0d5b7zyl2vg621w1ll2lw3kjz5hx6lqxc0jivh0i449gckk5pzkm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bdo";
+          sha256 = "0vp8am2x11abxganw90025w9qxnqjdkj015592glbbzpa6338nfl";
+          name = "bdo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bdo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
+    melpaBuild {
+        pname = "beacon";
+        version = "20160116.1019";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "beacon";
+          rev = "d4a9dad594473c511f975017d792efc8a8339671";
+          sha256 = "12nhpn79ahqm1pg2wxmv7y0d22yxb67apm1rlk0zm92nz0y2jip6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/beacon";
+          sha256 = "1pwxvdfzs9qjd44wvgimipi2hg4qw5sh5wlsl8h8mq2kyx09s7hq";
+          name = "beacon";
+        };
+        packageRequires = [ seq ];
+        meta = {
+          homepage = "http://melpa.org/#/beacon";
+          license = lib.licenses.free;
+        };
+      }) {};
+    beeminder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "beeminder";
+        version = "20150104.1634";
+        src = fetchFromGitHub {
+          owner = "sodaware";
+          repo = "beeminder.el";
+          rev = "92fa1a8d1df3e2fd0698192008f604b1794ee5f8";
+          sha256 = "1ckbl8z59p81jsq8xsgcwqqrpzv1apzjr594w3dyp9bzqb7h2acm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/beeminder";
+          sha256 = "0aj7ix7nrsl89f9c449kik8fbzhfk9li50wrh50cdwgfh8gda0fx";
+          name = "beeminder";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "http://melpa.org/#/beeminder";
+          license = lib.licenses.free;
+        };
+      }) {};
+    beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "beginend";
+        version = "20150607.1201";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "beginend";
+          rev = "c5bfdc3bb77a8c019aa4433cf12d3c45690c27bd";
+          sha256 = "1hyiz7iwnzbg1616q0w7fndllbnx4m98kakgxn04bsqib5fqk78p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/beginend";
+          sha256 = "1y81kr9q0zrsr3c3s14rm6l86y5wf1a0kia6d98112fy4fwdm7kq";
+          name = "beginend";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/beginend";
+          license = lib.licenses.free;
+        };
+      }) {};
+    benchmark-init = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "benchmark-init";
+        version = "20150905.438";
+        src = fetchFromGitHub {
+          owner = "dholm";
+          repo = "benchmark-init-el";
+          rev = "8e4c32f32ec869fe521fb4d3c0a69406830b4178";
+          sha256 = "058mic9jkwiqvmp3k9sfd6gb70ysdphnb1iynlszhixbrz5w7zs2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/benchmark-init";
+          sha256 = "0dknch4b1j7ff1079z2fhqng7kp4903b3v7mhj15b5vzspbp3wal";
+          name = "benchmark-init";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/benchmark-init";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bert";
+        version = "20131117.414";
+        src = fetchFromGitHub {
+          owner = "manzyuk";
+          repo = "bert-el";
+          rev = "a3eec6980a725aa4abd2019e4c00246450260490";
+          sha256 = "06izbc0ksyhgh4gsjiifhj11v0gx9x5xjx9aqci5mc4kc6mg05sf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bert";
+          sha256 = "1zhz1dcy1nf84p244x6lc4ajancv5fgmqmbrm080yhb2ral1z8x7";
+          name = "bert";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bert";
+          license = lib.licenses.free;
+        };
+      }) {};
+    better-defaults = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "better-defaults";
+        version = "20150404.423";
+        src = fetchFromGitHub {
+          owner = "technomancy";
+          repo = "better-defaults";
+          rev = "b7888289ed702aff1616cbff832c97d4e5fc2463";
+          sha256 = "0j3wpw43q262wnq5214r20r15sy2hihbiak5j7ag23lq9jx2jvva";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/better-defaults";
+          sha256 = "13bqcmx2gagm2ykg921ik3awp8zvw5d4lb69rr6gkpjlqp7nq2cm";
+          name = "better-defaults";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/better-defaults";
+          license = lib.licenses.free;
+        };
+      }) {};
+    better-registers = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "better-registers";
+        version = "20140813.319";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/better-registers.el";
+          sha256 = "05dlhhvd1m9q642gqqj6klif13shbinqi6bi72fldidi1z6wcqlh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/better-registers";
+          sha256 = "01i0qjrwsc5way2h9z3pmsgccsbdifsq1dh6zhka4h6qfgrmn3bx";
+          name = "better-registers";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/better-registers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bf-mode";
+        version = "20130403.942";
+        src = fetchFromGitHub {
+          owner = "emacs-jp";
+          repo = "bf-mode";
+          rev = "7cc4d09aed64d9db6be95646f5f5067de68f8895";
+          sha256 = "02b2m0cq04ynjcmr4j8gpdzjv9mpf1fysn736xv724xgaymj396n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bf-mode";
+          sha256 = "0b1yf9bx1ldkzry7v5qvcnl059rq62a50dvpa10i2f5v0y96n1q9";
+          name = "bf-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bf-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bfbuilder = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bfbuilder";
+        version = "20150924.1150";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "bfbuilder";
+          rev = "49560bdef131fa5672dab660e0c62376dbdcd906";
+          sha256 = "1y9fxs1nbf0xsn8mw45m9ghmji3h64wdbfnyr1npmf5fb27rmd17";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bfbuilder";
+          sha256 = "16ckybqd0a8l75ascm3k4cdzp969lzq7m050aymdyjhwif6ld2r7";
+          name = "bfbuilder";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/bfbuilder";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bibretrieve = callPackage ({ auctex, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bibretrieve";
+        version = "20131013.1332";
+        src = fetchFromGitHub {
+          owner = "pzorin";
+          repo = "bibretrieve";
+          rev = "aff34c6e1a074ac4fd574d8e66fd9e0760585419";
+          sha256 = "0rwy4k06nd9a31hpyqs0fxp45dpddbvbhwcw1gzx4f73qmgawq9b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bibretrieve";
+          sha256 = "1mf884c6adx7rq5c2z5wrnjpb6znljy30mscxskwqiyfs8c62mii";
+          name = "bibretrieve";
+        };
+        packageRequires = [ auctex emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/bibretrieve";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bibslurp = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "bibslurp";
+        version = "20151202.1746";
+        src = fetchFromGitHub {
+          owner = "mkmcc";
+          repo = "bibslurp";
+          rev = "aeba96368f2a06959e4fe945375ce2a54d34b189";
+          sha256 = "077shjz9sd0k0akvxzzgjd8a626ck650xxlhp2ws4gs7rjd7a823";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bibslurp";
+          sha256 = "178nhng87bdi8s0r2bdh2gk31w9mmjkyi6ncnddk3v7p8fsh4jjp";
+          name = "bibslurp";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/bibslurp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bibtex-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bibtex-utils";
+        version = "20150924.847";
+        src = fetchFromGitHub {
+          owner = "plantarum";
+          repo = "bibtex-utils";
+          rev = "1695db9f4f9198bb27f219bd4da7d34a9ae58069";
+          sha256 = "1qf45s53vcbd90v2d2brynv3xmp8sy9w9jp611cf0dzfl1k7x8p8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bibtex-utils";
+          sha256 = "13llsyyvy0xc9s51cqqc1rz13m3qdqh8jw07gwywfbixlma59z8l";
+          name = "bibtex-utils";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bibtex-utils";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bind-chord = callPackage ({ bind-key, fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bind-chord";
+        version = "20151111.1007";
+        src = fetchFromGitHub {
+          owner = "waymondo";
+          repo = "use-package-chords";
+          rev = "cbf623c867f911732077b026692f9312401791ad";
+          sha256 = "05lhxbrgwbyz0nkb19yln9a46jh91ic685943hd58cn91lxsw3al";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bind-chord";
+          sha256 = "01a3c298kq8cfsxsscpic0shkjm77adiamgbgk8laqkbrlsrrcsb";
+          name = "bind-chord";
+        };
+        packageRequires = [ bind-key key-chord ];
+        meta = {
+          homepage = "http://melpa.org/#/bind-chord";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bind-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bind-key";
+        version = "20160112.958";
+        src = fetchFromGitHub {
+          owner = "jwiegley";
+          repo = "use-package";
+          rev = "2a50241538b8ead3d620be33bd8e0087f98f42c5";
+          sha256 = "0wiv5xh2hik76x0i4a6amq5648akm5kvr4llnkh190riibnwkwx6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bind-key";
+          sha256 = "1qw2c27016d3yfg0w10is1v72y2jvzhq07ca4h6v17yi94ahj5xm";
+          name = "bind-key";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bind-key";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bind-map = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bind-map";
+        version = "20160117.2028";
+        src = fetchFromGitHub {
+          owner = "justbur";
+          repo = "emacs-bind-map";
+          rev = "cc1db8958c8fe913f562a59bd7a1a58dac33444b";
+          sha256 = "0ch7dpd96skbhnfm8an3gpqk2bccyrvl6plinfgrhp37jpkrsa5a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bind-map";
+          sha256 = "1jzkp010b4vs1bdhccf5igmymfxab4vxs1pccpk9n5n5a4xaa358";
+          name = "bind-map";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/bind-map";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bing-dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bing-dict";
+        version = "20160105.2302";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "bing-dict.el";
+          rev = "e94975ac63ba87225b56eec13a153ce169e4ec94";
+          sha256 = "0pmpg54faq0l886f2cmnmwm28d2yfg8adk7gp7623gx0ifggn332";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bing-dict";
+          sha256 = "0s5pd08rcnvmgi1hw17xbzvswlv0yni6h2h2gccrjmf6izi8whh1";
+          name = "bing-dict";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bing-dict";
+          license = lib.licenses.free;
+        };
+      }) {};
+    birds-of-paradise-plus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "birds-of-paradise-plus-theme";
+        version = "20130419.1629";
+        src = fetchFromGitHub {
+          owner = "jimeh";
+          repo = "birds-of-paradise-plus-theme.el";
+          rev = "bb9f9d4ef7f7872a388ec4eee1253069adcadb6f";
+          sha256 = "1n5icy29ks5rxrxp7v4sf0523z7wxn0fh9lx4y6jb7ppdjnff12s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/birds-of-paradise-plus-theme";
+          sha256 = "0vdv2siy30kf1qhzrc39sygjk17lwm3ix58pcs3shwkg1y5amj3m";
+          name = "birds-of-paradise-plus-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/birds-of-paradise-plus-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bison-mode";
+        version = "20141119.243";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "bison-mode";
+          rev = "bb48d82f296bbe9f8b4a5651fab6610525fdbfcf";
+          sha256 = "0iccafawm9ah62f7qq1k77kjpafhcpjcaiqh5xjig1wxnpc43ck7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bison-mode";
+          sha256 = "097gimlzmyrsfnl76cbzyyi9dm0d2y3f9107672h56ncri35mh66";
+          name = "bison-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bison-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bitbake = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode, s }:
+    melpaBuild {
+        pname = "bitbake";
+        version = "20160104.254";
+        src = fetchFromGitHub {
+          owner = "canatella";
+          repo = "bitbake-el";
+          rev = "d37d6e39d557f77ea329b0b40f88490b002d1f33";
+          sha256 = "14dsjbw4ss3i6ydynm121v5j3idvy85sk1vqbr5r871d32179xan";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bitbake";
+          sha256 = "1k2n1i8g0jc78sp1icm64rlhi1q0vqar2a889nldp134a1l7bfah";
+          name = "bitbake";
+        };
+        packageRequires = [ dash emacs mmm-mode s ];
+        meta = {
+          homepage = "http://melpa.org/#/bitbake";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bitlbee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bitlbee";
+        version = "20130328.1218";
+        src = fetchFromGitHub {
+          owner = "pjones";
+          repo = "elisp";
+          rev = "5eafcd3ff0725b5826d1e01bfe4c7ed01563b75e";
+          sha256 = "1cnx5kr0hah4h4b6arp7hb2i556vpx1dwmziny2csil39hkcjgbs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bitlbee";
+          sha256 = "15xb0vjamnfwi25yqd37zwfm6xb6p71if88hk2ymxikza4i47x0f";
+          name = "bitlbee";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bitlbee";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bitly = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bitly";
+        version = "20151125.1048";
+        src = fetchFromGitHub {
+          owner = "jorgenschaefer";
+          repo = "bitly-el";
+          rev = "fca9d8da070402fa62d9289e56f7f1c5ce40f664";
+          sha256 = "09blh9cbcbqr3pdaiwm9fmh5kzqm1v9mffy623z3jn87g5wadrmb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bitly";
+          sha256 = "032s7ax8qp3qzcj1njbyyxiyadjirphswqdlr45zj6hzajfsr247";
+          name = "bitly";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bitly";
+          license = lib.licenses.free;
+        };
+      }) {};
+    blank-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "blank-mode";
+        version = "20130824.659";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/blank-mode.el";
+          sha256 = "1wdplnmdllbydwr9gyyq4fbkxl5xjh7220vd4iajyv74pg2jkkkv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/blank-mode";
+          sha256 = "1pyx5xwflnni9my5aqpgf8xz4q4rvmj67pwb4zxx1lghrca97z87";
+          name = "blank-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/blank-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    blgrep = callPackage ({ clmemo, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "blgrep";
+        version = "20150401.916";
+        src = fetchFromGitHub {
+          owner = "ataka";
+          repo = "blgrep";
+          rev = "605beda210610a5829750a987f5fcebea97af546";
+          sha256 = "1pslwyaq18d1z7fay2ih3n27i6b49ss62drqqb095l1jxk42xxm0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/blgrep";
+          sha256 = "0w7453vh9c73hdfgr06693kwvhznn9xr1hqa65izlsx2fjhqc9gm";
+          name = "blgrep";
+        };
+        packageRequires = [ clmemo ];
+        meta = {
+          homepage = "http://melpa.org/#/blgrep";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bliss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bliss-theme";
+        version = "20141116.101";
+        src = fetchFromGitHub {
+          owner = "emacsfodder";
+          repo = "emacs-bliss-theme";
+          rev = "2c6922cb24118722819bea79a981f066039d34a3";
+          sha256 = "0dn0i3nxrqd82b9d17p1v0ddlpxnlfclkc8sqzrwq6cf19wcrmdr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bliss-theme";
+          sha256 = "1kzvi6zymfgirr41l8r2kazfz1y4xkigbp5qa1fafcdmw81anmdh";
+          name = "bliss-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/bliss-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bm";
+        version = "20151222.1803";
+        src = fetchFromGitHub {
+          owner = "joodland";
+          repo = "bm";
+          rev = "b91f87c8f78d2430edc376830d5ba15f45d28637";
+          sha256 = "1ggqg0lgvxg2adq91damvh55m36qsa23n3z6zyf5z6855ilzaa4x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bm";
+          sha256 = "07459r7m12j2nsb7qrb26bx32alylhaaq3z448n42lz02a8dc63g";
+          name = "bm";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bog";
+        version = "20160117.1615";
+        src = fetchFromGitHub {
+          owner = "kyleam";
+          repo = "bog";
+          rev = "a13b6305f0b6a73373809fb71595194aa284696c";
+          sha256 = "1j2ar9sinbrraqvymqmjray48xbr1arhpigzgkgnhkc2zzqv8dwb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bog";
+          sha256 = "1ci8xxca7dclmi5v37y5k45qlmzs6a9hi6m7czgiwxii902w5pkl";
+          name = "bog";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/bog";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bongo = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bongo";
+        version = "20151205.1009";
+        src = fetchFromGitHub {
+          owner = "dbrock";
+          repo = "bongo";
+          rev = "4cdacc10a530d4edbfdf6c95891f3cf229518e9d";
+          sha256 = "0ghjfrwc2i04rxg3nqc5fg2kgfyjlhk8n2qcz53p9i7ncc3zgpha";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bongo";
+          sha256 = "07i9gw067r2igp6s2g2iakm1ybvw04q6zznna2cfdf08nax64ghv";
+          name = "bongo";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/bongo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bonjourmadame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bonjourmadame";
+        version = "20160112.356";
+        src = fetchFromGitHub {
+          owner = "pierre-lecocq";
+          repo = "bonjourmadame";
+          rev = "4b4baaec19d8893268a2c93b3c35ac2581d02ba4";
+          sha256 = "06cpbjbv8ysz81szwgglgy5r1aay8rrzw5k86wyqg9jdzwpmilpn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bonjourmadame";
+          sha256 = "0d36yradh37359fjk59s54hxkbh4qcc17sblj2ylcdyw7181iwfn";
+          name = "bonjourmadame";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bonjourmadame";
+          license = lib.licenses.free;
+        };
+      }) {};
+    boogie-friends = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "boogie-friends";
+        version = "20151121.1549";
+        src = fetchFromGitHub {
+          owner = "boogie-org";
+          repo = "boogie-friends";
+          rev = "d7b67730e9d4ac2ad5dc886bdc27e9b441497b96";
+          sha256 = "11m0w8i2nq0nqrpg6m7vnn9sd3v1ln5b3rka7m9fnasadf77nmpv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/boogie-friends";
+          sha256 = "0cfs7gvjxsx2027dbzh4yypz500nmk503ikiiprbww8jyvc8grk7";
+          name = "boogie-friends";
+        };
+        packageRequires = [ cl-lib company dash flycheck yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/boogie-friends";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bookmark-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "bookmark-plus";
+        version = "20151231.1419";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/bookmark+.el";
+          sha256 = "06621js3bvslfmzmkphzzcrd8hbixin2nx30ammcqaa6572y14ad";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bookmark+";
+          sha256 = "0121xx7dp2pakk9g7sg6par4mkxd9ky746yk4wh2wrhprc9dqzni";
+          name = "bookmark-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bookmark+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    boon = callPackage ({ emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
+    melpaBuild {
+        pname = "boon";
+        version = "20151229.1340";
+        src = fetchFromGitHub {
+          owner = "jyp";
+          repo = "boon";
+          rev = "9604996c148f2bacf6e95502c33a3f154d6ab7f9";
+          sha256 = "1khl5798a9vp4f89x3f5mvh6m1yk3p07kqz7x8c2kvq58w32a6yj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/boon";
+          sha256 = "0gryw7x97jd46jgrm93cjagj4p7w93cjc36i2ps9ajf0d8m4gajb";
+          name = "boon";
+        };
+        packageRequires = [ emacs expand-region multiple-cursors ];
+        meta = {
+          homepage = "http://melpa.org/#/boon";
+          license = lib.licenses.free;
+        };
+      }) {};
+    borland-blue-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "borland-blue-theme";
+        version = "20160117.721";
+        src = fetchFromGitHub {
+          owner = "fourier";
+          repo = "borland-blue-theme";
+          rev = "db74eefebbc89d3c62575f8f50b319e87b4a3470";
+          sha256 = "0yzfxxv2bw4x320268bixfc7yf97851804bz3829vbdhnr4kp6y5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/borland-blue-theme";
+          sha256 = "1sc8qngm40bwdym8k1dgbahg48i73c00zxd99kqqwm9fnd6nm7qx";
+          name = "borland-blue-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/borland-blue-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    boron-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "boron-theme";
+        version = "20150117.1152";
+        src = fetchFromGitHub {
+          owner = "emacsfodder";
+          repo = "emacs-boron-theme";
+          rev = "ea5873139424d6ca013b915876daf0399432015b";
+          sha256 = "1gys5ri56s2s525wdji3m72sxzswmb8cmhmw5iha84v7hlqkrahb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/boron-theme";
+          sha256 = "1rrqlq08jnh9ihb99ji1vvmamj742assnm4a7xqz6gp7f248nb81";
+          name = "boron-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/boron-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    boxquote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "boxquote";
+        version = "20081011.1526";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "boxquote.el";
+          rev = "4c49b2046647ed187920c885e175ed388f4833dc";
+          sha256 = "0235l4f1cxj7nysfnay4fz52mg0c13pzqxbhw65vdpfzz1gl1p73";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/boxquote";
+          sha256 = "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s";
+          name = "boxquote";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/boxquote";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bpe = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bpe";
+        version = "20141228.1605";
+        src = fetchFromGitHub {
+          owner = "yuutayamada";
+          repo = "bpe";
+          rev = "7b5b25f83506e6c9f4075d3803fa32404943a189";
+          sha256 = "0chmarbpqingdma54d6chbr6v6jg8lapbw56cpvcpbl04fz980r0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bpe";
+          sha256 = "08zfqcgs7i2ram2qpy8vrzksx5722aahr66vdi4d9bcxm03s19fm";
+          name = "bpe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/bpe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bpr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bpr";
+        version = "20151206.1415";
+        src = fetchFromGitHub {
+          owner = "ilya-babanov";
+          repo = "emacs-bpr";
+          rev = "1c8ffe083df2bb1e8a9aa44c9ed450f631081ae4";
+          sha256 = "01bh371c0ln0qw1wixw28gdyjk4v8griw464d671r26wsxjdiwqy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bpr";
+          sha256 = "0rjxn40n4s4xdq51bq0w3455g9pli2pvcf1gnbr96zawbngrw6x2";
+          name = "bpr";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/bpr";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bracketed-paste = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bracketed-paste";
+        version = "20140222.2001";
+        src = fetchFromGitHub {
+          owner = "hchbaw";
+          repo = "bracketed-paste.el";
+          rev = "6c2aee346e2f5cdb4ed1386c3e3c853cecd72eff";
+          sha256 = "00463z740xrkr4yz46g9zxz23zy878jgvba81pnwvg4l6hd3kc8s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bracketed-paste";
+          sha256 = "1v7zwi29as0218vy6ch21iqqcxfhyh373m3dbcdzm2pb8bpcg58j";
+          name = "bracketed-paste";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/bracketed-paste";
+          license = lib.licenses.free;
+        };
+      }) {};
+    brainfuck-mode = callPackage ({ fetchFromGitHub, fetchurl, langdoc, lib, melpaBuild }:
+    melpaBuild {
+        pname = "brainfuck-mode";
+        version = "20150113.242";
+        src = fetchFromGitHub {
+          owner = "tom-tan";
+          repo = "brainfuck-mode";
+          rev = "36e69552bb3b97a4f888d362c59845651bd0d492";
+          sha256 = "1nzgjgzidyrplfs4jl8nikd5wwvb4rmrnm51qxmw9y2if0hpq0jd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/brainfuck-mode";
+          sha256 = "08jzx329mrr3c2pifs3hb4i79dsw606b0iviagaaja8s808m40cd";
+          name = "brainfuck-mode";
+        };
+        packageRequires = [ langdoc ];
+        meta = {
+          homepage = "http://melpa.org/#/brainfuck-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    broadcast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "broadcast";
+        version = "20151204.2012";
+        src = fetchFromGitHub {
+          owner = "killdash9";
+          repo = "broadcast.el";
+          rev = "f6f9cd2e0e3f8c31d6b8e7446c27eb0e50b25f16";
+          sha256 = "0w6b9rxdciy1365kgf6fh3vgrjr8xd5ar6xcn0g4h56f2zg9hdmj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/broadcast";
+          sha256 = "1h2c3mb49q3vlpalrsrx8q3rmy1zg0y45ayvzbvzdkfgs8idgbib";
+          name = "broadcast";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/broadcast";
+          license = lib.licenses.free;
+        };
+      }) {};
+    browse-at-remote = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "browse-at-remote";
+        version = "20151226.1628";
+        src = fetchFromGitHub {
+          owner = "rmuslimov";
+          repo = "browse-at-remote";
+          rev = "d7e155e9ea7acfc9dadd334fe41ac57e93f38674";
+          sha256 = "0q71ah62q6acivhxzsw9j1ky54i9hhlnj97sjn8bxrxx7nw01gf7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/browse-at-remote";
+          sha256 = "1d40b9j3pc6iy3l25062k7f52aq0vk9sizdwd7wii3v5nciczv6w";
+          name = "browse-at-remote";
+        };
+        packageRequires = [ cl-lib f s ];
+        meta = {
+          homepage = "http://melpa.org/#/browse-at-remote";
+          license = lib.licenses.free;
+        };
+      }) {};
+    browse-kill-ring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "browse-kill-ring";
+        version = "20150829.832";
+        src = fetchFromGitHub {
+          owner = "browse-kill-ring";
+          repo = "browse-kill-ring";
+          rev = "66b5a0872b4278b49a815fc759c3eb48aebe10bf";
+          sha256 = "06mdrjc4jq7pj8vmg91dair138kmhvaa9gi5icc56120jmfb6kn2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/browse-kill-ring";
+          sha256 = "1d97ap0vrg5ymp96z7y6si98fspxzy02jh1i4clvw5lggjfibhq4";
+          name = "browse-kill-ring";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/browse-kill-ring";
+          license = lib.licenses.free;
+        };
+      }) {};
+    browse-kill-ring-plus = callPackage ({ browse-kill-ring, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "browse-kill-ring-plus";
+        version = "20151231.1421";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/browse-kill-ring+.el";
+          sha256 = "1z6pix1ml3s97jh34fwjj008ihlrz4hkipdh5yzcvc6nhrimjw2f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/browse-kill-ring+";
+          sha256 = "1flw7vmqgsjjvr2zlgz2909gvpq9mhz8qkg6hvsrzwg95f4l548w";
+          name = "browse-kill-ring-plus";
+        };
+        packageRequires = [ browse-kill-ring ];
+        meta = {
+          homepage = "http://melpa.org/#/browse-kill-ring+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    browse-url-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }:
+    melpaBuild {
+        pname = "browse-url-dwim";
+        version = "20140731.1422";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "browse-url-dwim";
+          rev = "3d611dbb167c286109ac53995ad68286d87aafb9";
+          sha256 = "1rcihwdxrzhgcz573rh1yp3770ihkwqjqvd39yhic1d3sgwxz2hy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/browse-url-dwim";
+          sha256 = "13bv2ka5pp9k4kwrxfqfawwxzsqlakvpi9a32gxgx7qfi0dcb1rf";
+          name = "browse-url-dwim";
+        };
+        packageRequires = [ string-utils ];
+        meta = {
+          homepage = "http://melpa.org/#/browse-url-dwim";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bs-ext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "bs-ext";
+        version = "20130824.659";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/bs-ext.el";
+          sha256 = "1yslzlx54n17330sf6b2pynz01y6ifnkhipz4hggn1i55bz8hvrw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bs-ext";
+          sha256 = "0dddligqr71qdakgfkx0r45k9py85qlym7y5f204bxppyw5jmwb6";
+          name = "bs-ext";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bs-ext";
+          license = lib.licenses.free;
+        };
+      }) {};
+    btc-ticker = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "btc-ticker";
+        version = "20151113.859";
+        src = fetchFromGitHub {
+          owner = "niedbalski";
+          repo = "emacs-btc-ticker";
+          rev = "845235b545f070d0812cd1654cbaa4997565824f";
+          sha256 = "022j0gw5qkxjz8f70vqjxysifv2mz6cigf9n5z03zmpvwwvxmx2z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/btc-ticker";
+          sha256 = "1vfnx114bvnly1k3fmcpkqq4m9558wqr5c9k9yj8f046dgfh8dp1";
+          name = "btc-ticker";
+        };
+        packageRequires = [ json request ];
+        meta = {
+          homepage = "http://melpa.org/#/btc-ticker";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bts = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, pos-tip, s, widget-mvc, yaxception }:
+    melpaBuild {
+        pname = "bts";
+        version = "20151109.733";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "emacs-bts";
+          rev = "df42d58a36447697f93b56e69f5e700b2baef1f9";
+          sha256 = "1qgasaqhqm0birjmb6k6isd2f5pn58hva8db8qfhva9g5kg1f38w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bts";
+          sha256 = "1i1lbjracrgdxr52agxhxxgkra4w291dmz85s195lcx38rva7ib3";
+          name = "bts";
+        };
+        packageRequires = [ dash log4e pos-tip s widget-mvc yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/bts";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bts-github = callPackage ({ bts, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bts-github";
+        version = "20150108.227";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "emacs-bts-github";
+          rev = "57c23f2b842f6775f0bbbdff97eeec78474be6bc";
+          sha256 = "1sfr3j11jz4k9jnfa9i05bp4v5vkil38iyrgsp3kxf15797b9dg9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bts-github";
+          sha256 = "03lz12bbkjqbs82alc97k6s1pmk721qip3h9cifq8a5ww5cbq9ln";
+          name = "bts-github";
+        };
+        packageRequires = [ bts gh ];
+        meta = {
+          homepage = "http://melpa.org/#/bts-github";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bubbleberry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bubbleberry-theme";
+        version = "20141017.444";
+        src = fetchFromGitHub {
+          owner = "jasonm23";
+          repo = "emacs-bubbleberry-theme";
+          rev = "22e9adf4586414024e4592972022ec297321b320";
+          sha256 = "1aha8rzilv4k300rr4l9qjfygydfwllkbw17lhm8jz0kh9w6bd28";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bubbleberry-theme";
+          sha256 = "056pcr9ynsl34wqa2pw6sh4bdl5kpp1r0pl1vvw15p4866l9bdz3";
+          name = "bubbleberry-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/bubbleberry-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    buffer-buttons = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "buffer-buttons";
+        version = "20150106.839";
+        src = fetchFromGitHub {
+          owner = "rpav";
+          repo = "buffer-buttons";
+          rev = "2feb8494fa7863b98256bc85da670d74a3a8a975";
+          sha256 = "1p5a29bpjqr1gs6sb6rr7y0j06nlva23wxkwfskap25zvjpgwbvq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buffer-buttons";
+          sha256 = "1p0ydbrff9197sann3s0d7hpav7r9g461w4llncafmy31w7m1dn6";
+          name = "buffer-buttons";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/buffer-buttons";
+          license = lib.licenses.free;
+        };
+      }) {};
+    buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }:
+    melpaBuild {
+        pname = "buffer-flip";
+        version = "20160109.2054";
+        src = fetchFromGitHub {
+          owner = "killdash9";
+          repo = "buffer-flip.el";
+          rev = "f6c67d87717e3171156b78406ab5a0eeb048905c";
+          sha256 = "0s43cvkr1za5sd2cvl55ig34wbp8xyjf85snmf67ps04swyyk92q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buffer-flip";
+          sha256 = "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098";
+          name = "buffer-flip";
+        };
+        packageRequires = [ key-chord ];
+        meta = {
+          homepage = "http://melpa.org/#/buffer-flip";
+          license = lib.licenses.free;
+        };
+      }) {};
+    buffer-move = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "buffer-move";
+        version = "20160108.908";
+        src = fetchFromGitHub {
+          owner = "lukhas";
+          repo = "buffer-move";
+          rev = "ac7dddff5e6b8a1de65616bdc74a821f891bada5";
+          sha256 = "1yzga2zs9flbarsh704hh7k4l3w09g4li9a7r3fsvl4kll80x393";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buffer-move";
+          sha256 = "0wysywff2bggrha7lpl83c8x6ln7zgdj9gsqmjva6gramqb260fg";
+          name = "buffer-move";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/buffer-move";
+          license = lib.licenses.free;
+        };
+      }) {};
+    buffer-stack = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "buffer-stack";
+        version = "20101223.420";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/buffer-stack.el";
+          sha256 = "0d87cl7a4rcd6plbjyf26vaar7imwd18z24xdi4dz734m9zbkg6r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buffer-stack";
+          sha256 = "00vxfd4ki5pqf9n9vbmn1441vn2y14bdr1v05h46hswf13b4hzrn";
+          name = "buffer-stack";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/buffer-stack";
+          license = lib.licenses.free;
+        };
+      }) {};
+    buffer-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "buffer-utils";
+        version = "20140512.900";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "buffer-utils";
+          rev = "685b13457e3a2085b7584e41365d2aa0779a1b6f";
+          sha256 = "1mnf0dgr6g58k0jyia7985jsinrla04vm5sjl2iajwphbhadjk8p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buffer-utils";
+          sha256 = "0cfipdn4fc4fvz513mwiaihvbdi05mza3z5z1379wlljw6r539z2";
+          name = "buffer-utils";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/buffer-utils";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bufshow = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bufshow";
+        version = "20130711.1239";
+        src = fetchFromGitHub {
+          owner = "pjones";
+          repo = "bufshow";
+          rev = "afabb87e07da7f035ca0ca85ed95e3936ea64547";
+          sha256 = "1plh77xzpbhgmjdagm5rhqx6nkhc0g39ir0b6s5yh003wmx6r1hh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bufshow";
+          sha256 = "027cd0jzb8yxm66q1bhyi75f2m9f2pq3aswgav1d18na3ybwg65h";
+          name = "bufshow";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/bufshow";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bug-reference-github = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bug-reference-github";
+        version = "20131202.1503";
+        src = fetchFromGitHub {
+          owner = "arnested";
+          repo = "bug-reference-github";
+          rev = "6f693e1f659d9a75abea3f23e95946c7f67138cd";
+          sha256 = "0zr1raf0q5wi3vr66kglxcfxswlm8g2l501adm8c27clvqizpnrr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bug-reference-github";
+          sha256 = "18yzxwanbrxsab6ba75z1196x0m6dapdhbvy6df5b5x5viz99cf6";
+          name = "bug-reference-github";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bug-reference-github";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bundler = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bundler";
+        version = "20151111.912";
+        src = fetchFromGitHub {
+          owner = "tobiassvn";
+          repo = "bundler.el";
+          rev = "9be0c4601a4d1a35de22f818637ce029830272d3";
+          sha256 = "0cldbyc7qsyxszzfbdcw8n8a15hvj343acsjir29n6d9nnpmvjgp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bundler";
+          sha256 = "0i5ybc6i8ackxpaa75kwrg44zdq3jkvy48c42vaaafpddjwjnsy4";
+          name = "bundler";
+        };
+        packageRequires = [ cl-lib inf-ruby ];
+        meta = {
+          homepage = "http://melpa.org/#/bundler";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bury-successful-compilation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bury-successful-compilation";
+        version = "20150328.1928";
+        src = fetchFromGitHub {
+          owner = "EricCrosson";
+          repo = "bury-successful-compilation";
+          rev = "0c05c006ab5d0a7262701d003aed5cf5fc9dd621";
+          sha256 = "1bzilpjibyyj97z5j7zz89jx0kfqr842lrjlnq1qki8r5kj18p4j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bury-successful-compilation";
+          sha256 = "1gkq4r1573m6m57fp7x69k7kcpqchpcqfcz3792v0wxr22zhkwr3";
+          name = "bury-successful-compilation";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bury-successful-compilation";
+          license = lib.licenses.free;
+        };
+      }) {};
+    buster-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "buster-mode";
+        version = "20140928.713";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "buster-mode";
+          rev = "de6958ef8369400922618b8d1e99abfa91b97ac5";
+          sha256 = "1viq7cb41r8klr8i38c5zjrhdnww31gh4j51xdgy4v2lc3z321zi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buster-mode";
+          sha256 = "1qndhchc8y27x49znhnc4rny1ynfcplr64rczrlbj53qmkxn5am7";
+          name = "buster-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/buster-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    buster-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "buster-snippets";
+        version = "20151125.410";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "buster-snippets.el";
+          rev = "bb8769dae132659858e74d52f3f4e8790399423a";
+          sha256 = "11djqlw4qf3qs2rwiz7dn5q2zw5i8sykwdf4hg4awsgv8g0bbxn6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buster-snippets";
+          sha256 = "0k36c2k7wwix10rgmjxipc77fkn9jahjyvl191af6w41wla47x4x";
+          name = "buster-snippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/buster-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    busybee-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "busybee-theme";
+        version = "20130920.1142";
+        src = fetchFromGitHub {
+          owner = "mswift42";
+          repo = "busybee-theme";
+          rev = "70850d1781ff91c4ce125a31ed451d080f8da643";
+          sha256 = "11z987frzswnsym8g3l0s9wwdly1zn5inl2l558m6kcvfy7g59cx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/busybee-theme";
+          sha256 = "0w0z5x2fbnalv404av3mapfkqbfgyk81a1mzvngll8x0pirbyi10";
+          name = "busybee-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/busybee-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    butler = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "butler";
+        version = "20150811.1908";
+        src = fetchFromGitHub {
+          owner = "AshtonKem";
+          repo = "Butler";
+          rev = "8ceb35737107572455cca9a61ff46b3ff78f1016";
+          sha256 = "0pp604r2gzzdpfajw920607pklwflk842difdyl4hy9w87fgc0jg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/butler";
+          sha256 = "1jv74l9jy55qpwf5np9nlj6a1wqsm3xirm7wm89d1h2mbsfcr0mq";
+          name = "butler";
+        };
+        packageRequires = [ deferred emacs json ];
+        meta = {
+          homepage = "http://melpa.org/#/butler";
+          license = lib.licenses.free;
+        };
+      }) {};
+    buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "buttercup";
+        version = "20160109.213";
+        src = fetchFromGitHub {
+          owner = "jorgenschaefer";
+          repo = "emacs-buttercup";
+          rev = "d00c1642a664f57d4a7d257a9f0edf6ba7e84b2c";
+          sha256 = "12ay9qimw569x9jcch4sirjyak90w6rf5hlsiadffw3bl445sqv7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buttercup";
+          sha256 = "1grrrdk5pl9l1jvnwzl8g0102gipvxb5qn6k2nmv28jpl57v8dkb";
+          name = "buttercup";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/buttercup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    button-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "button-lock";
+        version = "20150223.754";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "button-lock";
+          rev = "f9082feb329432fcf2ac49a95e64bed9fda24d58";
+          sha256 = "06qjvybf65ffrcnhhbqs333lg51fawaxnva3jvdg7zbrsv4m9acl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/button-lock";
+          sha256 = "1arrdmb3nm570hgs18y9sz3z9v0wlkr3vwa2zgfnc15lmf0y34mp";
+          name = "button-lock";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/button-lock";
+          license = lib.licenses.free;
+        };
+      }) {};
+    c-c-combo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "c-c-combo";
+        version = "20151223.2055";
+        src = fetchFromGitHub {
+          owner = "CestDiego";
+          repo = "c-c-combo.el";
+          rev = "a261a833499a7fdc29610863b3aafc74818770ba";
+          sha256 = "040mcq2cwzbrf96f9mghb4314cd8xwp7ki2ix9fxpmbwiy323ld5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/c-c-combo";
+          sha256 = "09rvh6n2hqls7qki5dc34s2hmcmlvdsbgzcxgglhcmrhwx5w4vxn";
+          name = "c-c-combo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/c-c-combo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    c-eldoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "c-eldoc";
+        version = "20150904.332";
+        src = fetchFromGitHub {
+          owner = "nflath";
+          repo = "c-eldoc";
+          rev = "3baef9b6300370bd8db3ea7636084afcdebc6e85";
+          sha256 = "0mlm5f66541namqn04vx6csf14mxhsiknbm36yqdnp1lxb7knv7a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/c-eldoc";
+          sha256 = "13grkww14w39y2x6mrbfa9nzljsnl5l7il8dnj6sjdyv0hz9x8vm";
+          name = "c-eldoc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/c-eldoc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    c0-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "c0-mode";
+        version = "20151110.1252";
+        src = fetchFromGitHub {
+          owner = "catern";
+          repo = "c0-mode";
+          rev = "c214093c36864d6208fcb9e6a72413ed17ed5d60";
+          sha256 = "10k90r4ckkkdjn9pqcbfyp6ynvrd5k0ngqcn5d0v1qvkn6jifxjx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/c0-mode";
+          sha256 = "0s3h4b3lpz4jsk222yyfdxh780dvykhaqgyv6r3ambz95vrmmpl4";
+          name = "c0-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/c0-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cache = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cache";
+        version = "20111019.1800";
+        src = fetchFromGitHub {
+          owner = "nflath";
+          repo = "cache";
+          rev = "7499586b6c8224df9f5c5bc4dec96b008258d580";
+          sha256 = "1hp6dk84vvgkmj5lzghvqlpq3axwzgx9c7gly2yx6497fgf9jlby";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cache";
+          sha256 = "0lzj0h23g6alqcmd20ack53p72g9i09dp9x0bp3rdw5izcfkvhh3";
+          name = "cache";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cache";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cacoo = callPackage ({ concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cacoo";
+        version = "20120319.1859";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-cacoo";
+          rev = "c9fa04fbe97639b24698709530361c2bb5f3273c";
+          sha256 = "07kzhyqr8ycjvkknijqhsfr26zd5jc8wxm9sl8bp6pzn4jbs1dmx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cacoo";
+          sha256 = "0kri4vi6dpsf0zk24psm16f3aa27cq5b54ga7zygmr02csq24a6z";
+          name = "cacoo";
+        };
+        packageRequires = [ concurrent ];
+        meta = {
+          homepage = "http://melpa.org/#/cacoo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cake = callPackage ({ anything, cake-inflector, fetchFromGitHub, fetchurl, historyf, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cake";
+        version = "20140603.2331";
+        src = fetchFromGitHub {
+          owner = "k1LoW";
+          repo = "emacs-cake";
+          rev = "a7c9f3bee71eb3865060123d4d98e5397c2f967e";
+          sha256 = "0bvrwzjx93qyx97qqw0imvnkkx4w91yk99rnhcmk029zj1fy0kzg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cake";
+          sha256 = "06qlqrazz2jr08g44q73hx9vpp6xnjvkpd6ky108g0xc5p9q2hcr";
+          name = "cake";
+        };
+        packageRequires = [ anything cake-inflector historyf ];
+        meta = {
+          homepage = "http://melpa.org/#/cake";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cake-inflector = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "cake-inflector";
+        version = "20140415.358";
+        src = fetchFromGitHub {
+          owner = "k1LoW";
+          repo = "emacs-cake-inflector";
+          rev = "a91cecd533930bacf1dc30f5209831f79847abda";
+          sha256 = "0xq10jkbk3crdhbh4lab39xhfw6vvcqz3if5q3yy4gzhx7zp94i4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cake-inflector";
+          sha256 = "04mrqcm1igb638skaq2b3nr5yzxnck2vwhln61rnh7lkfxq7wbwf";
+          name = "cake-inflector";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "http://melpa.org/#/cake-inflector";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cake2 = callPackage ({ anything, cake-inflector, dash, f, fetchFromGitHub, fetchurl, historyf, ht, json ? null, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "cake2";
+        version = "20140626.742";
+        src = fetchFromGitHub {
+          owner = "k1LoW";
+          repo = "emacs-cake2";
+          rev = "0a9d0b3a1c49ba1730088416f50507f53221c70b";
+          sha256 = "15w21r0gqblbn9wlvb4wlm3706wf01r38mp465snjzi839f6sazb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cake2";
+          sha256 = "03q8vqqjlhahgnyy976c46x52splwdjpmb9ngrj5c2z7d8n9145x";
+          name = "cake2";
+        };
+        packageRequires = [ anything cake-inflector dash f historyf ht json s ];
+        meta = {
+          homepage = "http://melpa.org/#/cake2";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cal-china-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cal-china-x";
+        version = "20160102.324";
+        src = fetchFromGitHub {
+          owner = "xwl";
+          repo = "cal-china-x";
+          rev = "5014bc0bf086c1326feedf9a3717c748f51264b0";
+          sha256 = "03hi0ggq81nm1kd0mcf8fwnya4axzd80vfdjdbhgpxbkvnxldzpv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cal-china-x";
+          sha256 = "06mh2p14m2axci8vy1hr7jpy53jj215z0djyn8h7zpr0k62ajhka";
+          name = "cal-china-x";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/cal-china-x";
+          license = lib.licenses.free;
+        };
+      }) {};
+    calfw = callPackage ({ fetchFromGitHub, fetchurl, google-maps, lib, melpaBuild }:
+    melpaBuild {
+        pname = "calfw";
+        version = "20150923.2149";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-calfw";
+          rev = "50e0e0261568f84f31fe7f87c9f863e21d30132f";
+          sha256 = "1rv6slk3a7ca2q16isjlkmgxbxmbqx4lx2ip7z33fvnq10r5h60n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/calfw";
+          sha256 = "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8";
+          name = "calfw";
+        };
+        packageRequires = [ google-maps ];
+        meta = {
+          homepage = "http://melpa.org/#/calfw";
+          license = lib.licenses.free;
+        };
+      }) {};
+    calfw-gcal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "calfw-gcal";
+        version = "20120111.400";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "calfw-gcal.el";
+          rev = "14aab20687d6cc9e6c5ddb9e11984c4e14c3d870";
+          sha256 = "14n5rci4bkbl7037xvkd69gfxnjlgvd2j1xzciqcgz92f06ir3xi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/calfw-gcal";
+          sha256 = "182p56wiycrm2cjzmlqabksyshpk7nga68jf80vjjmaavp5xqsq8";
+          name = "calfw-gcal";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/calfw-gcal";
+          license = lib.licenses.free;
+        };
+      }) {};
+    calmer-forest-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "calmer-forest-theme";
+        version = "20130926.10";
+        src = fetchFromGitHub {
+          owner = "caldwell";
+          repo = "calmer-forest-theme";
+          rev = "87ba7bae389084d13fe3bc34e0c923017eda6ba0";
+          sha256 = "0n6y4z3qg04qnlsrjysf8ldxl2f2bk7n8crijydwabyy672qxd9h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/calmer-forest-theme";
+          sha256 = "0riz5n8fzvxdnzgg650xqc2zwc4xvhwjlrrzls5h0pl5adaxz96p";
+          name = "calmer-forest-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/calmer-forest-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    camcorder = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
+    melpaBuild {
+        pname = "camcorder";
+        version = "20151208.1012";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "camcorder.el";
+          rev = "bfef46deae617825089fb06591e5c25c82a2d4be";
+          sha256 = "1fxmk9ykvxkd0ldmldqnwdn5grzzzigla7zsw1yqqmlfwd48ggf8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/camcorder";
+          sha256 = "1kbnpz3kn8ycpy8nlp8bsnnd1k1h7m02h7w5f7raw97sk4cnpvbi";
+          name = "camcorder";
+        };
+        packageRequires = [ cl-lib emacs names ];
+        meta = {
+          homepage = "http://melpa.org/#/camcorder";
+          license = lib.licenses.free;
+        };
+      }) {};
+    caml = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "caml";
+        version = "20150911.658";
+        src = fetchsvn {
+          url = "http://caml.inria.fr/svn/ocaml/trunk/emacs/";
+          rev = "16549";
+          sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/caml";
+          sha256 = "0kxrn9s1h2l05akcdcj6fd3g6x5wbi511mf14g9glcn8azyfs698";
+          name = "caml";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/caml";
+          license = lib.licenses.free;
+        };
+      }) {};
+    capture = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "capture";
+        version = "20130828.1144";
+        src = fetchFromGitHub {
+          owner = "pashinin";
+          repo = "capture.el";
+          rev = "1bb26060311da76767f70096218313fc93b0c806";
+          sha256 = "08cp45snhyir5w8gyp6xws1q7c54pz06q099l0m3zmwn9277g68z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/capture";
+          sha256 = "1hxrvyq8my5886q7wj5w3mhyja7d6cf19gyclap492ci7kmrkdk2";
+          name = "capture";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/capture";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
+    melpaBuild {
+        pname = "cargo";
+        version = "20160109.627";
+        src = fetchFromGitHub {
+          owner = "kwrooijen";
+          repo = "cargo.el";
+          rev = "e6a02346fc033d6342183a76a49156d4091ef402";
+          sha256 = "152d5ym4bqnlnp6rafgy8fafx8246n78ymlcx9k2nyfar4c0lir2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cargo";
+          sha256 = "06zq657cxfk5l4867qqsvhskcqc9wswyl030wj27a43idj8n41jx";
+          name = "cargo";
+        };
+        packageRequires = [ emacs rust-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/cargo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    caroline-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "caroline-theme";
+        version = "20151030.1804";
+        src = fetchFromGitHub {
+          owner = "xjackk";
+          repo = "caroline-theme";
+          rev = "742bf4ac4521ff9905294812919051cec768b1a0";
+          sha256 = "14ijcb9qp1gv8ianqm7cdvwjkgpwdaw3lz34j29c3rmg5ir26bjb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/caroline-theme";
+          sha256 = "07flxggnf0lb1fnvprac1daplgx4bi5fnnkgfc58wnw805s12k32";
+          name = "caroline-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/caroline-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    caseformat = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "caseformat";
+        version = "20160115.1015";
+        src = fetchFromGitHub {
+          owner = "HKey";
+          repo = "caseformat";
+          rev = "1cff5ee7a6938a0493a2b335628c7661c71e983d";
+          sha256 = "1nibzay3nb1n7z36w55m6kjqsj5yqj89way81f647jgbjggr6bih";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/caseformat";
+          sha256 = "1qwyr74jbx4jpfcw8sccg47q1vdg094rr06m111gsz2yaj9m0gfk";
+          name = "caseformat";
+        };
+        packageRequires = [ cl-lib dash emacs s ];
+        meta = {
+          homepage = "http://melpa.org/#/caseformat";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }:
+    melpaBuild {
+        pname = "cask";
+        version = "20151123.728";
+        src = fetchFromGitHub {
+          owner = "cask";
+          repo = "cask";
+          rev = "acd19283ff2da1c37c30015bcd83b012b33cf3c5";
+          sha256 = "0zky8d9kdrcfh4vh8v6wbzs80nixr1xnnyjgg1zdingyklrxl79y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cask";
+          sha256 = "11nr6my3vlb1xiyai7qwii3nszda2mnkhkjlbh3d0699h0yw7dk5";
+          name = "cask";
+        };
+        packageRequires = [ cl-lib dash epl f package-build s shut-up ];
+        meta = {
+          homepage = "http://melpa.org/#/cask";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cask-package-toolset = callPackage ({ ansi, cl-lib ? null, commander, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
+    melpaBuild {
+        pname = "cask-package-toolset";
+        version = "20160102.337";
+        src = fetchFromGitHub {
+          owner = "AdrieanKhisbe";
+          repo = "cask-package-toolset.el";
+          rev = "24fb0cf745d5e10342dbd2cdcd3d6c9910167726";
+          sha256 = "1m40s9q00l06fz525m3zrvwd6s60lggdqls5k5njkn671aa3h71s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cask-package-toolset";
+          sha256 = "13ix093c0a58rjqj7zfp3914xj3hvj276gb2d8zhvrx9vvs1345g";
+          name = "cask-package-toolset";
+        };
+        packageRequires = [ ansi cl-lib commander dash emacs f s shut-up ];
+        meta = {
+          homepage = "http://melpa.org/#/cask-package-toolset";
+          license = lib.licenses.free;
+        };
+      }) {};
+    caskxy = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
+    melpaBuild {
+        pname = "caskxy";
+        version = "20140513.1039";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "caskxy";
+          rev = "dc18dcab7ed526070ab76de071c9c5272e6ac40e";
+          sha256 = "15sq5vrkhb7c5j6ny6wy4bkyl5pggch4l7zw46an29rzni3pffr3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/caskxy";
+          sha256 = "0x4s3c8m75zxsvqpgfc5xwll0489zzdnngmnq048z9gkgcd7pd2s";
+          name = "caskxy";
+        };
+        packageRequires = [ log4e yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/caskxy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cbm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cbm";
+        version = "20150715.1404";
+        src = fetchFromGitHub {
+          owner = "akermu";
+          repo = "cbm.el";
+          rev = "40ae4f6ed075889346b4ba7cf991f5ad6dd6d1b7";
+          sha256 = "1b3cjb27z0nypn9nsmi93b61j7a252fb7sclh1mrsnanhvbwl0zx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cbm";
+          sha256 = "02ch0gdw610c8dfxxjxs7ijsc9lzbhklj7hqgwfwksnyc36zcjmn";
+          name = "cbm";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cbm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ccc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ccc";
+        version = "20151205.743";
+        src = fetchFromGitHub {
+          owner = "skk-dev";
+          repo = "ddskk";
+          rev = "337b29c3c2cac8920f7066ec457aeb5f62644297";
+          sha256 = "1a42bwarhciccl0yhh9i24bc9f3n5c0wlnwqfcwkb7wzqy9gd55q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ccc";
+          sha256 = "0fckhmz4svcg059v4acbn13yf3ijs09fxmq1axc1b9bm3xxig2cq";
+          name = "ccc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ccc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cd-compile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cd-compile";
+        version = "20141108.1357";
+        src = fetchFromGitHub {
+          owner = "jamienicol";
+          repo = "emacs-cd-compile";
+          rev = "10284ccae86afda4a37b09ba90acd1e2efedec9f";
+          sha256 = "1a93cim1w96aaj81clhjv25r7v9bwqm9a818mn8lk4aj1bmhgc4c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cd-compile";
+          sha256 = "1a24rv1jbb883vwhjkw6qxv3h3qy039iqkhkx3jkq1ydidr9f0hv";
+          name = "cd-compile";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cd-compile";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cdb";
+        version = "20151205.743";
+        src = fetchFromGitHub {
+          owner = "skk-dev";
+          repo = "ddskk";
+          rev = "337b29c3c2cac8920f7066ec457aeb5f62644297";
+          sha256 = "1a42bwarhciccl0yhh9i24bc9f3n5c0wlnwqfcwkb7wzqy9gd55q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cdb";
+          sha256 = "1gx34062h25gqsl3j1fjlklha19snvmfaw068q6bv6x9r92niqnf";
+          name = "cdb";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cdb";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cdlatex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cdlatex";
+        version = "20140707.626";
+        src = fetchFromGitHub {
+          owner = "cdominik";
+          repo = "cdlatex";
+          rev = "b7183c2200392b6d85fca69390f4a65fac7a7b19";
+          sha256 = "1jj9vmhc4s3ych08bjm1c2xwi81z1p20rj7bvxrgvb5aga2ghi9d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cdlatex";
+          sha256 = "1jsfmzl13fykbg7l4wv9si7z11ai5lzvkndzbxh9cyqlvznq0m64";
+          name = "cdlatex";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cdlatex";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cdnjs = callPackage ({ cl-lib ? null, dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
+    melpaBuild {
+        pname = "cdnjs";
+        version = "20140217.1512";
+        src = fetchFromGitHub {
+          owner = "yasuyk";
+          repo = "cdnjs.el";
+          rev = "eac2b4d150907aeb2d568327d04775578c82887f";
+          sha256 = "0aspci0zg8waa3l234l0f8fjfzm67z2gydfdwwpxksz49sm2s1jk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cdnjs";
+          sha256 = "1clm86n643z1prxrlxlg59jg43l9wwm34x5d88bj6yvix8g6wkb7";
+          name = "cdnjs";
+        };
+        packageRequires = [ cl-lib dash deferred f pkg-info ];
+        meta = {
+          homepage = "http://melpa.org/#/cdnjs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cedit";
+        version = "20141231.1014";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "cedit";
+          rev = "0878d851b6307c162bfbddd2bb02789e5e27bc2c";
+          sha256 = "1f8gdj3p54q3410c66716y3l7i7nnkmq6hqz0dg1a1sc6jwdij3v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cedit";
+          sha256 = "169sy7a1bgczwfxkkzjiggb7vdjxhrx7i3a39g6zv9f1zs6byk6m";
+          name = "cedit";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cedit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    celery = callPackage ({ dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "celery";
+        version = "20150812.347";
+        src = fetchFromGitHub {
+          owner = "ardumont";
+          repo = "emacs-celery";
+          rev = "5b5b1968fd258c444dc2372e989aab82830004c3";
+          sha256 = "0974bxy85rcxia6dkfryas2g46nanjdf8fv90adbc7kyj07xsf7c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/celery";
+          sha256 = "0m3hmvp6xz2m7z1kbb0ii0j3c95zi19652gfixq5a5x23kz8y59h";
+          name = "celery";
+        };
+        packageRequires = [ dash-functional deferred emacs s ];
+        meta = {
+          homepage = "http://melpa.org/#/celery";
+          license = lib.licenses.free;
+        };
+      }) {};
+    centered-cursor-mode = callPackage ({ fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "centered-cursor-mode";
+        version = "20151001.834";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/centered-cursor-mode.el";
+          sha256 = "15psyizjz8wf9wfxwwcdmg1bxf8jbv0qy40rskz7si7vxin8hhxl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/centered-cursor-mode";
+          sha256 = "0a5mymnkwjvpra8iffxjwa5fq3kq4vc8fw7pr7gmrwq8ml7il5zl";
+          name = "centered-cursor-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/centered-cursor-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    centered-window-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "centered-window-mode";
+        version = "20140730.447";
+        src = fetchFromGitHub {
+          owner = "ikame";
+          repo = "centered-window-mode";
+          rev = "3107c8942d06e9fea180d9340828ee58ad5cb2fd";
+          sha256 = "09jrcyc1dk2cdfi7ajk8xh2c9jw0f712j6gyvpaklvijakhvgsg7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/centered-window-mode";
+          sha256 = "0f5qwv4f8gn5nxsqn57bbb3y0w5whjvhv3pls88d5n68lkd1k4si";
+          name = "centered-window-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/centered-window-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    centimacro = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "centimacro";
+        version = "20140306.827";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "centimacro";
+          rev = "1b97a9b558ed9c49d5da1bfbf29b2506575c2742";
+          sha256 = "0zqrpaq9c3lm12jxnvysh8f3m3193k22zaj0ycscdqd1jpq4wcgh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/centimacro";
+          sha256 = "1qbyfi6s4hdp5sv394w3sib8g2kx06i06q8gh6hdv5pis5kq9fx6";
+          name = "centimacro";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/centimacro";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cerbere = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
+    melpaBuild {
+        pname = "cerbere";
+        version = "20140418.915";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "cerbere";
+          rev = "ef573b05f4c2a067b8234003aaa4b2a76fffea5c";
+          sha256 = "17jg5d5afh9zpnjx8wkys8bjllxq99j0yhz8j3fvkskisvhkz1im";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cerbere";
+          sha256 = "1g3svmh5dlh5mvyag3hmiy90dfkk6f7ppd9qpwckxqyll9vl7r06";
+          name = "cerbere";
+        };
+        packageRequires = [ f pkg-info s ];
+        meta = {
+          homepage = "http://melpa.org/#/cerbere";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cfengine-code-style";
+        version = "20131209.611";
+        src = fetchFromGitHub {
+          owner = "cfengine";
+          repo = "core";
+          rev = "f1e78372d5a513a8ef8730942db05873f7132ebc";
+          sha256 = "1pgq17zp0qar587nrxhybddbv33dw3a2x4agqxpgv4wmci4w50s6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cfengine-code-style";
+          sha256 = "1ny8xvdnz740qmw9m81xnwd0gh0a516arpvl3nfimglaai5bfc9a";
+          name = "cfengine-code-style";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cfengine-code-style";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cff = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cff";
+        version = "20160118.1418";
+        src = fetchFromGitHub {
+          owner = "fourier";
+          repo = "cff";
+          rev = "b6ab2a28e64ef06f281ec74cfe3114e450644dfa";
+          sha256 = "019vqjmq6hb2f5lddqy0ya5q0fd47xix29cashlchz0r034rc32r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cff";
+          sha256 = "04b2ck1jkhsrka6dbyn6rpsmmc2bn13kpyhzibd781hj73d93jgc";
+          name = "cff";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/cff";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cg = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "cg";
+        version = "20150819.604";
+        src = fetchsvn {
+          url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
+          rev = "11220";
+          sha256 = "1v8wgm3cvz4xx2jlx95ipd9340mxfxgk5hqialp76y74x03vfzq1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cg";
+          sha256 = "0ra6mxf8l9fjn1vszjj71fs6f6l08hwypka8zsb3si96fzb6sgjh";
+          name = "cg";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cg";
+          license = lib.licenses.free;
+        };
+      }) {};
+    change-inner = callPackage ({ expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "change-inner";
+        version = "20150707.1044";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "change-inner.el";
+          rev = "52c543a4b9808c0d15b565fcdf646c9779de33e8";
+          sha256 = "1m9sq93bwajbld3lnlzkjbsby5zlm9sxjzqynryyvsb9zr1d0a9z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/change-inner";
+          sha256 = "0r693056wykg4bs7inbfzfniyawmb91igk6kjjpq3njk0v84y1sj";
+          name = "change-inner";
+        };
+        packageRequires = [ expand-region ];
+        meta = {
+          homepage = "http://melpa.org/#/change-inner";
+          license = lib.licenses.free;
+        };
+      }) {};
+    character-fold-plus = callPackage ({ fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "character-fold-plus";
+        version = "20151231.1429";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/character-fold+.el";
+          sha256 = "00b0jv58wkvhahfnqwbfawz1z3nbm6d8s8cq0nn631w4m509kgq0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/character-fold+";
+          sha256 = "01ibdwd7vap9m64w0bhyknxa3iank3wfss49gsgg4xbbxibyrjh3";
+          name = "character-fold-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/character-fold+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    charmap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "charmap";
+        version = "20131019.2358";
+        src = fetchFromGitHub {
+          owner = "lateau";
+          repo = "charmap";
+          rev = "165193d91ef96f563ae8366ed4c1a2df5a4eaed2";
+          sha256 = "0crnd64cnsnaj5mcy55q0sc1rnamxa1xbpwpmirhyhxz780klww6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/charmap";
+          sha256 = "1j7762d2i17ysn9ys8j7wfv989avmax8iylml2hc26mwbpyfpm84";
+          name = "charmap";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/charmap";
+          license = lib.licenses.free;
+        };
+      }) {};
+    chatwork = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "chatwork";
+        version = "20150807.2148";
+        src = fetchFromGitHub {
+          owner = "ataka";
+          repo = "chatwork";
+          rev = "7a1def04735423d47e058a8137e859391a6aaf7e";
+          sha256 = "1r2s3fszblk5wa6v3hnbzsri550gi5qsmp2w1spvmf1726n900cb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chatwork";
+          sha256 = "0p71swcpfqbx2zmp5nh57f0m30cn68g3019005wa5x4fg7dx746p";
+          name = "chatwork";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/chatwork";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cheatsheet = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cheatsheet";
+        version = "20151203.351";
+        src = fetchFromGitHub {
+          owner = "darksmile";
+          repo = "cheatsheet";
+          rev = "80e58c1783571e2907dfe25a32ae46ad3da1bcf1";
+          sha256 = "1v2r7b6dbnxfhacg8cbb0wkymsnxnr2qgxsdbzqb4lh7r282vxxn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cheatsheet";
+          sha256 = "11z3svlzvmhdy0pkxbx9qz9bnq056cgkbfyw9z34aq1yxazi2cpq";
+          name = "cheatsheet";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/cheatsheet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    checkbox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "checkbox";
+        version = "20141116.1858";
+        src = fetchFromGitHub {
+          owner = "camdez";
+          repo = "checkbox.el";
+          rev = "335afa4404adf72973195a580458927004664d98";
+          sha256 = "0660ix17ksxy5a5v8yqy7adr9d4bs6p1mnkc6lpyw96k4pn62h45";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/checkbox";
+          sha256 = "17gw6w1m6bs3sfx8nqa8nzdq26m8w85a0fca5qw3bmd18bcmknqa";
+          name = "checkbox";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/checkbox";
+          license = lib.licenses.free;
+        };
+      }) {};
+    chef-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "chef-mode";
+        version = "20111121.900";
+        src = fetchFromGitHub {
+          owner = "mpasternacki";
+          repo = "chef-mode";
+          rev = "c333dd3f9229c4f35fe8c4495b21049ba730cc42";
+          sha256 = "1mnskri5r1lyzzcag60x7amn00613jyl7by7hd4sqm2a7zd4r5aa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chef-mode";
+          sha256 = "1pz82s82d4z3vkm8mpmwdxb9pd11kq09g23mg461lzqxjjw734rr";
+          name = "chef-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/chef-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cherry-blossom-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cherry-blossom-theme";
+        version = "20150621.2242";
+        src = fetchFromGitHub {
+          owner = "inlinestyle";
+          repo = "emacs-cherry-blossom-theme";
+          rev = "eea7653e00f35973857ee23b27bc2fae5e753e50";
+          sha256 = "0m97xr6lddy2jdmd4bl4kbp2568p4n110yfa9k7fqc20ihq8jkyd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cherry-blossom-theme";
+          sha256 = "1i3kafj3m7iij5mr0vhg45zdnkl9pg9ndrq0b0i3k3mw7d5siq7w";
+          name = "cherry-blossom-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/cherry-blossom-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    chicken-scheme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "chicken-scheme";
+        version = "20141116.1339";
+        src = fetchFromGitHub {
+          owner = "dleslie";
+          repo = "chicken-scheme.el";
+          rev = "19b0b08b5592063e852cae094b394c7d1f923639";
+          sha256 = "0j61lvr99viaharg4553whcppp7lxhimkk5lps0izz9mnd8y2wm5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chicken-scheme";
+          sha256 = "0ns49p7nsifpi7wrzr02ljrr0p6hxanrg54zaixakvjkxwcgfabr";
+          name = "chicken-scheme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/chicken-scheme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "chinese-fonts-setup";
+        version = "20160102.553";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "chinese-fonts-setup";
+          rev = "4deafe82b792b28fb640c2bd3388ece8852cad73";
+          sha256 = "08ln66kx73019klzw0rsvlz3cs4ch8wxjfljmkyswjjd179h882c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chinese-fonts-setup";
+          sha256 = "141ri6a6mnxf7fn17gw48kxk8pvl3khdxkb4pw8brxwrr9rx0xd5";
+          name = "chinese-fonts-setup";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/chinese-fonts-setup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    chinese-pyim = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
+    melpaBuild {
+        pname = "chinese-pyim";
+        version = "20160118.50";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "chinese-pyim";
+          rev = "d6dad5aad01e2be007609a6b3aaa8b0a9e017a7a";
+          sha256 = "1did95bkrzq3dr4y8jxw1pc3cv9ryhpc1ch5wqymh88h9cazy6hc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chinese-pyim";
+          sha256 = "0zdx5zhgj1ly89pl48vigjzd8g74fxnxcd9bxrqykcn7y5qvim8l";
+          name = "chinese-pyim";
+        };
+        packageRequires = [ cl-lib popup pos-tip ];
+        meta = {
+          homepage = "http://melpa.org/#/chinese-pyim";
+          license = lib.licenses.free;
+        };
+      }) {};
+    chinese-remote-input = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "chinese-remote-input";
+        version = "20150110.2303";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "chinese-remote-input";
+          rev = "d05d0bd116421e6fd19f52e9e576431ee5de0858";
+          sha256 = "06k13wk659qw40aczq3i9gj0nyz6vb9z1nwsz7c1bgjbl2lh6hcv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chinese-remote-input";
+          sha256 = "0nnccm6w9i0qsgiif22hi1asr0xqdivk8fgg76mp26a2fv8d3dag";
+          name = "chinese-remote-input";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/chinese-remote-input";
+          license = lib.licenses.free;
+        };
+      }) {};
+    chinese-wbim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "chinese-wbim";
+        version = "20150623.2250";
+        src = fetchFromGitHub {
+          owner = "zilongshanren";
+          repo = "chinese-wbim";
+          rev = "57ff61ff3895d77335709d24b40cefc4d10b0095";
+          sha256 = "0cx1g6drkr8gyqqdxjf7j4wprxcbq30gam2racgnvdicgij0apwg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chinese-wbim";
+          sha256 = "1pax3kpmvg170mpvfrjbpj9czq0xykmfbany2f7vbn96jb5xfmsb";
+          name = "chinese-wbim";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/chinese-wbim";
+          license = lib.licenses.free;
+        };
+      }) {};
+    chinese-word-at-point = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "chinese-word-at-point";
+        version = "20150618.2038";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "chinese-word-at-point.el";
+          rev = "36a03cce32fe059d2b581cb2e029715c0be81074";
+          sha256 = "1jsy43avingxxccs0zw2qm5ysx8g76xhhh1mnyypxskl9m60qb4j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chinese-word-at-point";
+          sha256 = "0pjs4ckncv84qrdj0pyibrbiy86f1gmjla9n2cgh10xbc7j9y0c4";
+          name = "chinese-word-at-point";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/chinese-word-at-point";
+          license = lib.licenses.free;
+        };
+      }) {};
+    chinese-yasdcv = callPackage ({ chinese-pyim, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "chinese-yasdcv";
+        version = "20150702.816";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "chinese-yasdcv";
+          rev = "619e4d701ed995ad2c95f35072c638cfb3933afb";
+          sha256 = "14yzmyzkf846yjrwnqrbzmvyhfav39qa5fr8jnb7lyz8rm7y9pnq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chinese-yasdcv";
+          sha256 = "1y2qywldf8b8b0km1lcf74p0w6rd8gr86qcj7ikwhhbvd19dfglm";
+          name = "chinese-yasdcv";
+        };
+        packageRequires = [ chinese-pyim cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/chinese-yasdcv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    chm-view = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "chm-view";
+        version = "20110616.1219";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/chm-view.el";
+          sha256 = "1r274pf0xrcdml4sy2nhhp3v5pr3y3s4lvk45hd3pmw1i4pw2fd8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chm-view";
+          sha256 = "1acz0fvl3inn7g4himq680yf64bgm7n61hsv2zpm1k6smrdl78nz";
+          name = "chm-view";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/chm-view";
+          license = lib.licenses.free;
+        };
+      }) {};
+    chronos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "chronos";
+        version = "20150602.1029";
+        src = fetchFromGitHub {
+          owner = "dxknight";
+          repo = "chronos";
+          rev = "b360d9dae57aa553cf2a14ffa0756a51ad71de09";
+          sha256 = "1mqdz3rvx0jm80fgzw3s3lqn448kqrlrifdwcg36cqq4qmkpalq4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chronos";
+          sha256 = "1fwpll0mk6pc37qagbq3b3z32d2qwz993nxp9pjw4qbmlnq6sy9d";
+          name = "chronos";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/chronos";
+          license = lib.licenses.free;
+        };
+      }) {};
+    chruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "chruby";
+        version = "20151204.630";
+        src = fetchFromGitHub {
+          owner = "plexus";
+          repo = "chruby.el";
+          rev = "0b210f5bb8c38dbe4581e660055cf9bac93304d0";
+          sha256 = "0gx0bd7j71rlniq64vw8k59yzl070mdia05ry18br8kpsbk3bhrl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chruby";
+          sha256 = "0pk6vdvmifiq52n452lbrkklxa69c40bfyzra9qhrghxr2q5v3mk";
+          name = "chruby";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/chruby";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
+    melpaBuild {
+        pname = "cider";
+        version = "20160117.142";
+        src = fetchFromGitHub {
+          owner = "clojure-emacs";
+          repo = "cider";
+          rev = "5ad457b5acd7cce3f8b7d8242eab9bdbc17954a5";
+          sha256 = "1chj5j8p1shw1cqrcnf97m6d5zjixawg1pf9wi6lsl9v6i42nssd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cider";
+          sha256 = "1a6hb728a3ir18c2dn9zfd3jn79fi5xjn5gqr7ljy6qb063xd4qx";
+          name = "cider";
+        };
+        packageRequires = [ clojure-mode emacs pkg-info queue seq spinner ];
+        meta = {
+          homepage = "http://melpa.org/#/cider";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cider-decompile = callPackage ({ cider, fetchFromGitHub, fetchurl, javap-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cider-decompile";
+        version = "20151121.2337";
+        src = fetchFromGitHub {
+          owner = "clojure-emacs";
+          repo = "cider-decompile";
+          rev = "5d87035f3c3c14025e8f01c0c53d0ce2c8f56651";
+          sha256 = "1w4y65s3m2irga4iqfqqkcmvl6ss24zmaxqzbfib8jmi84r4lpac";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cider-decompile";
+          sha256 = "0jhsm31zcfwkbpsdh1lvmjm1fv2m7y849930sjvf5nxv3ffhx3b4";
+          name = "cider-decompile";
+        };
+        packageRequires = [ cider javap-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/cider-decompile";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cider-eval-sexp-fu = callPackage ({ emacs, eval-sexp-fu, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cider-eval-sexp-fu";
+        version = "20150320.2215";
+        src = fetchFromGitHub {
+          owner = "clojure-emacs";
+          repo = "cider-eval-sexp-fu";
+          rev = "7c54327e6ff8914c7dbc9f8de289e1b255d01fbc";
+          sha256 = "1gpklkrw6iishfb3yilnqysh6zij67l1sl3ixq1bi3f6r237v1pg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cider-eval-sexp-fu";
+          sha256 = "1n4sgv042qd9560pllabysx0c5snly6i22bk126y8f8rn0zj58iq";
+          name = "cider-eval-sexp-fu";
+        };
+        packageRequires = [ emacs eval-sexp-fu highlight ];
+        meta = {
+          homepage = "http://melpa.org/#/cider-eval-sexp-fu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cider-profile = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cider-profile";
+        version = "20141120.825";
+        src = fetchFromGitHub {
+          owner = "thunknyc";
+          repo = "nrepl-profile";
+          rev = "9aa7e404f53f5136ac8d15301ce8ca2924785cb3";
+          sha256 = "0lgq4p7rs4prqfqd83v1l36xxacrd65jsfzbp7q62b2pjqikpgk0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cider-profile";
+          sha256 = "14jc98h4r9rb7pxfb60ps4ss8p0bm66wdl6n8z1357hk93h9kmfs";
+          name = "cider-profile";
+        };
+        packageRequires = [ cider ];
+        meta = {
+          homepage = "http://melpa.org/#/cider-profile";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cider-spy = callPackage ({ cider, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cider-spy";
+        version = "20151123.946";
+        src = fetchFromGitHub {
+          owner = "jonpither";
+          repo = "cider-spy";
+          rev = "6913a52c4ee781c5325074af05fcdfab864d6c41";
+          sha256 = "1hvvfp58x269yapnayxwyclgqy52azf76rb703mlfqivj1gzd7p3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cider-spy";
+          sha256 = "0478jlg76h0mrjwk2b1kdj16s1q1b03b7ygacai45jh89bc025fh";
+          name = "cider-spy";
+        };
+        packageRequires = [ cider cl-lib dash ];
+        meta = {
+          homepage = "http://melpa.org/#/cider-spy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cil-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cil-mode";
+        version = "20150223.450";
+        src = fetchFromGitHub {
+          owner = "ForNeVeR";
+          repo = "cil-mode";
+          rev = "fcd2e407aeefab9ae465b072eea33dc115506fff";
+          sha256 = "1w0ya0446rqsg1j59fd1mp4wavv2f3h1k3mw9svm5glymdirw4d1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cil-mode";
+          sha256 = "1h18r086bqspyn5n252yzw8x2zgyaqzdd8pbcf5gqlh1w8kapq4y";
+          name = "cil-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cil-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cinspect = callPackage ({ cl-lib ? null, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, python-environment }:
+    melpaBuild {
+        pname = "cinspect";
+        version = "20150715.2133";
+        src = fetchFromGitHub {
+          owner = "inlinestyle";
+          repo = "cinspect-mode";
+          rev = "4e199a90f89b335cccda1518aa0963e0a1d4fbab";
+          sha256 = "190n4kdcqdwglhnawnj9mqjarmcaqylxipc07whmrii0jv279kjw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cinspect";
+          sha256 = "0djh61mrfgcm3767ll1l5apw6646j4fdcaripksrmvn5aqfn8rjj";
+          name = "cinspect";
+        };
+        packageRequires = [ cl-lib deferred emacs python-environment ];
+        meta = {
+          homepage = "http://melpa.org/#/cinspect";
+          license = lib.licenses.free;
+        };
+      }) {};
+    circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "circe";
+        version = "20151207.344";
+        src = fetchFromGitHub {
+          owner = "jorgenschaefer";
+          repo = "circe";
+          rev = "c9862e432d2dad7cd568d79dbe49849245333fb1";
+          sha256 = "1l6lm3i02r0b8ng0n3rckgk0q38wjng41dqbx148bjxfq44cpghz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/circe";
+          sha256 = "1f54d8490gfx0r0cdvgmcjdxqpni43msy0k2mgqd1qz88a4b5l07";
+          name = "circe";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/circe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cl-lib-highlight = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cl-lib-highlight";
+        version = "20140127.1512";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "cl-lib-highlight";
+          rev = "fd1b308e6e989791d1df14438efa6b77d20f7c7e";
+          sha256 = "1mc8kayw8fmvpl0z09v6i68s2lharlwpzff0cvcsfn0an2imj2d0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cl-lib-highlight";
+          sha256 = "13qdrvpxq928p27b1xdcbsscyhqk042rwfa17037gp9h02fd42j8";
+          name = "cl-lib-highlight";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/cl-lib-highlight";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clang-format = callPackage ({ cl-lib ? null, fetchsvn, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "clang-format";
+        version = "20151116.638";
+        src = fetchsvn {
+          url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
+          rev = "258069";
+          sha256 = "1rzax55darnj4h8i3qyrm2rqdwcvqggsz7kv6gi2i174fbdkbzfr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clang-format";
+          sha256 = "19qaihb0lqnym2in4465lv8scw6qba6fdn8rcbkpsq09hpzikbah";
+          name = "clang-format";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/clang-format";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clean-aindent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "clean-aindent-mode";
+        version = "20150816.2229";
+        src = fetchFromGitHub {
+          owner = "pmarinov";
+          repo = "clean-aindent-mode";
+          rev = "9ae15997cd75c5625a4f759a3aff39bf202fc36f";
+          sha256 = "1h6k6kzim1zb87y1kzpqjzk3ip9bmfxyg54kdh2sfp4xy0g5h3p0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clean-aindent-mode";
+          sha256 = "1whzbs2gg2ar24kw29ffv94dgvrlfy2v4zdn0g7ksjjmmdr8ahh4";
+          name = "clean-aindent-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/clean-aindent-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clean-buffers = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "clean-buffers";
+        version = "20151226.922";
+        src = fetchFromGitHub {
+          owner = "lujun9972";
+          repo = "clean-buffers";
+          rev = "f9fdc31746e0b31661af53b63f68d436d0c6bec4";
+          sha256 = "03dbxg51zs4wbfwjv1qxlm5w06j89mvniisnyyahjkvpiqrp96yd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clean-buffers";
+          sha256 = "025sxrqxm24yg1wpfncrjw1nm91h0h7jy2xd5g20xqlinqqvdihj";
+          name = "clean-buffers";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/clean-buffers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clevercss = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "clevercss";
+        version = "20131228.1955";
+        src = fetchFromGitHub {
+          owner = "jschaf";
+          repo = "CleverCSS-Mode";
+          rev = "b8a3c0dd674367c62b1a1ffec84d88fe0c0219bc";
+          sha256 = "19q6zbnl9fg4cwgi56d7p4qp6y3g0fdyihinpakby49xv2n2k8dx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clevercss";
+          sha256 = "189f2l4za1j9ds0bhxrzyp7da9p6svh5dx2vnzf4vql7qhjk3gf0";
+          name = "clevercss";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/clevercss";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "cliphist";
+        version = "20151012.729";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "cliphist";
+          rev = "c0db2da95fa3d3a58160f465c636989bb4b251d5";
+          sha256 = "11c0zpk8gg70d4xiiyjc7v13knwb2ihbrxnlaxzh3rdg2c12676q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cliphist";
+          sha256 = "0mg6pznijba3kvp3r57pi54v6mgih2vfwj2kg6qmcy1abrc0xq29";
+          name = "cliphist";
+        };
+        packageRequires = [ popup ];
+        meta = {
+          homepage = "http://melpa.org/#/cliphist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clipmon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "clipmon";
+        version = "20151224.1147";
+        src = fetchFromGitHub {
+          owner = "bburns";
+          repo = "clipmon";
+          rev = "a531c3e5d3cf760b00d3f00726a4e60e226aae99";
+          sha256 = "1xqszj16yim89pln9aw17lji5knxm3pklaihydagd7a1f99hr51w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clipmon";
+          sha256 = "1gvy1722px4fh88jyb8xx7k1dgyjgq7zjadr5fghdir42l0byw7i";
+          name = "clipmon";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/clipmon";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clippy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }:
+    melpaBuild {
+        pname = "clippy";
+        version = "20140417.614";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "clippy.el";
+          rev = "23ba8772056a103267611b3757722730740d9f00";
+          sha256 = "0msmigzip7hpjxwkz0khhlc2lj9wgb2919i4k0kv8ppi9j2f9hjc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clippy";
+          sha256 = "0nqmc8f2qrsp25vzc66xw6b232n7fyw6g06mwn2cdpm3d2pgb7rg";
+          name = "clippy";
+        };
+        packageRequires = [ pos-tip ];
+        meta = {
+          homepage = "http://melpa.org/#/clippy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "clips-mode";
+        version = "20131012.1601";
+        src = fetchFromGitHub {
+          owner = "grettke";
+          repo = "clips-mode";
+          rev = "a3ab4a3e958d54a16544ec38fe6338f27df20817";
+          sha256 = "0i6sj5rs4b9v8aqq9l6wr15080qb101hdxspx6innhijhajgmssd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clips-mode";
+          sha256 = "083wrhjn04rg8vr6j0ziffdbdhbfn63wzl4q7yzpkf8qckh6mxhf";
+          name = "clips-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/clips-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clj-refactor = callPackage ({ cider, dash, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }:
+    melpaBuild {
+        pname = "clj-refactor";
+        version = "20160118.646";
+        src = fetchFromGitHub {
+          owner = "clojure-emacs";
+          repo = "clj-refactor.el";
+          rev = "7cfef55fa0c0c9246ad437f30b1542e288176075";
+          sha256 = "1nplb95aiwxy9flqjyjqfdpr0vzykckr05n7zahv1ig2rnra2vcs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clj-refactor";
+          sha256 = "1qvds6dylazvrzz1ji2z2ldw72pa2nxqacb9d04gasmkqc32ipvz";
+          name = "clj-refactor";
+        };
+        packageRequires = [
+          cider
+          dash
+          edn
+          emacs
+          hydra
+          inflections
+          multiple-cursors
+          paredit
+          s
+          yasnippet
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/clj-refactor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cljr-helm = callPackage ({ clj-refactor, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cljr-helm";
+        version = "20150425.1507";
+        src = fetchFromGitHub {
+          owner = "philjackson";
+          repo = "cljr-helm";
+          rev = "99c6dcc5228ecd2fe9e6e28a9512cbc3df0770ef";
+          sha256 = "0ydv2prnw1j3m5nk23fqn4iv202kjswr8z0ip4zacdm8bl0q25ln";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cljr-helm";
+          sha256 = "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc";
+          name = "cljr-helm";
+        };
+        packageRequires = [ clj-refactor helm ];
+        meta = {
+          homepage = "http://melpa.org/#/cljr-helm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cljsbuild-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cljsbuild-mode";
+        version = "20140619.326";
+        src = fetchFromGitHub {
+          owner = "kototama";
+          repo = "cljsbuild-mode";
+          rev = "7edfc199b5daf972f6b2110d13a96e0bd974cd65";
+          sha256 = "1cdim8fancrsrm9avzv4m2v384i7n4632nibyfnxkhq03bj00j1z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cljsbuild-mode";
+          sha256 = "0qvb990dgq4v75lwnd661wxszbdbhlgxpsyv4zaj6h10gp1vi214";
+          name = "cljsbuild-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cljsbuild-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clmemo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "clmemo";
+        version = "20150220.747";
+        src = fetchFromGitHub {
+          owner = "ataka";
+          repo = "clmemo";
+          rev = "553d62f80b6c3e0f281e09d377d490795bdcaabf";
+          sha256 = "0za8j7pwcmvjm2ls62z9f8sjryzzsmms4slikzixc0rxyiqnqyd1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clmemo";
+          sha256 = "03qa79ip0gqinj1kk898lcvixk98hf6gknz0yc2fnqcrm642k2vs";
+          name = "clmemo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/clmemo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cloc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cloc";
+        version = "20151007.401";
+        src = fetchFromGitHub {
+          owner = "cosmicexplorer";
+          repo = "cloc-emacs";
+          rev = "15e63b83dd6261f543d25aac4c72e764e3274d53";
+          sha256 = "1rflc00yrbb7xzfh8c54ajf4qnhsp3mq07gkr257gjyrwsdw762v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cloc";
+          sha256 = "1ny5wixa9x4fq5jvhs01jmyvwkfvwwi9aamrcqsl42s9sx6ygz7a";
+          name = "cloc";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/cloc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clocker = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+    melpaBuild {
+        pname = "clocker";
+        version = "20150505.1043";
+        src = fetchFromGitHub {
+          owner = "roman";
+          repo = "clocker.el";
+          rev = "9cb1440ca1fa4f82597f8b053c7f8e44f4682229";
+          sha256 = "0hw6i92k651p71am578p02lqp1dj9pic880n6x4z0ydz4xyjhmfw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clocker";
+          sha256 = "0cckrk40k1labiqjh7ghzpx5zi136xz70j3ipp117x52qf24k10k";
+          name = "clocker";
+        };
+        packageRequires = [ dash projectile ];
+        meta = {
+          homepage = "http://melpa.org/#/clocker";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clojars = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "clojars";
+        version = "20151215.1433";
+        src = fetchFromGitHub {
+          owner = "joshuamiller";
+          repo = "clojars.el";
+          rev = "b500b243c92d4311c4041ff3ecbb6a1dbbf8090f";
+          sha256 = "1r189c0xm6vh05k0y715i5ldj1pxzvwkxqbq0n85m489mjnf2wv6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojars";
+          sha256 = "1skvd29347hwapgdqznbzwfcp2nf077qkdzknxc8ylmqa32yf5w1";
+          name = "clojars";
+        };
+        packageRequires = [ cl-lib request ];
+        meta = {
+          homepage = "http://melpa.org/#/clojars";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clojure-cheatsheet = callPackage ({ cider, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "clojure-cheatsheet";
+        version = "20151112.717";
+        src = fetchFromGitHub {
+          owner = "clojure-emacs";
+          repo = "clojure-cheatsheet";
+          rev = "7f1ee3facf131609ac1b987439b9b14daa4d7402";
+          sha256 = "1ljb0g4yvrqgjqgmz8qz0c0swbx1m6gldmcdqnmxd72bs3w9p0k8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-cheatsheet";
+          sha256 = "05sw3bkdcadslpsk64ds0ciavmdgqk7fr5q3z505vvafmszfnaqv";
+          name = "clojure-cheatsheet";
+        };
+        packageRequires = [ cider helm ];
+        meta = {
+          homepage = "http://melpa.org/#/clojure-cheatsheet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "clojure-mode";
+        version = "20160117.650";
+        src = fetchFromGitHub {
+          owner = "clojure-emacs";
+          repo = "clojure-mode";
+          rev = "1c5f3fb88ca216674eeeb9def773627deeea01df";
+          sha256 = "0xm2hplzid14ymrbgnypl1qsb22ird1bbilpq23nrgvwg0jyd9hj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-mode";
+          sha256 = "11n0rjhs1mmlzdqy711g432an5ybdka5xj0ipsk8dx6xcyab70np";
+          name = "clojure-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/clojure-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "clojure-mode-extra-font-locking";
+        version = "20160116.521";
+        src = fetchFromGitHub {
+          owner = "clojure-emacs";
+          repo = "clojure-mode";
+          rev = "1c5f3fb88ca216674eeeb9def773627deeea01df";
+          sha256 = "0xm2hplzid14ymrbgnypl1qsb22ird1bbilpq23nrgvwg0jyd9hj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-mode-extra-font-locking";
+          sha256 = "00nff9mkj61i76dj21x87vhz0bbkzgvkx1ypkxcv6yf3pfhq7r8n";
+          name = "clojure-mode-extra-font-locking";
+        };
+        packageRequires = [ clojure-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/clojure-mode-extra-font-locking";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clojure-quick-repls = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "clojure-quick-repls";
+        version = "20150814.236";
+        src = fetchFromGitHub {
+          owner = "symfrog";
+          repo = "clojure-quick-repls";
+          rev = "b543c6c35bb1bacb278f92a6e0f4d2128c0c3db9";
+          sha256 = "1vgahik2q2sn6vqm9wg5b9jc74mkbc1md8pl69apz4cg397kjkzr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-quick-repls";
+          sha256 = "10glzyd4y3918pwp048pc1y7y7fa34fkqckn1nbys841dbssmay0";
+          name = "clojure-quick-repls";
+        };
+        packageRequires = [ cider dash ];
+        meta = {
+          homepage = "http://melpa.org/#/clojure-quick-repls";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clojure-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "clojure-snippets";
+        version = "20150504.344";
+        src = fetchFromGitHub {
+          owner = "mpenet";
+          repo = "clojure-snippets";
+          rev = "24ebfd34665e1a3b74aaa823f8b2e3e4a5e0b827";
+          sha256 = "1w8izhrj23b8kqcsqalgrzxqnq18nvdxl48305p8cnwll646xjl2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-snippets";
+          sha256 = "15622mdd6b3fpwp22d32p78yap08pyscs2vc83sv1xz4338i0lij";
+          name = "clojure-snippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/clojure-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    closure-lint-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "closure-lint-mode";
+        version = "20101118.1524";
+        src = fetchFromGitHub {
+          owner = "r0man";
+          repo = "closure-lint-mode";
+          rev = "bc3d2fd5c35580bf1b8af43b12484c95a343b4b5";
+          sha256 = "0v0wdq0b5jz4x0d7dl3ilgf3aqp2hk375db366ij6gxwd0b9i3na";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/closure-lint-mode";
+          sha256 = "1xmi1gjgayd5xbm3xx721xv57ns3x56r8ps94zpwyf2znpdchqfy";
+          name = "closure-lint-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/closure-lint-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cloud-to-butt-erc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cloud-to-butt-erc";
+        version = "20130627.1808";
+        src = fetchFromGitHub {
+          owner = "leathekd";
+          repo = "cloud-to-butt-erc";
+          rev = "6710c03d1bc91736435cbfe845924940cae34e5c";
+          sha256 = "07kvnb6p35swkyj92c4wymsqq4r2885wdpqhv7nhicvi6n658kpf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cloud-to-butt-erc";
+          sha256 = "061mmw39dq8sqzi2589lf7svy15n2iyiwbfiram48r2yhma5dd0f";
+          name = "cloud-to-butt-erc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cloud-to-butt-erc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clues-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "clues-theme";
+        version = "20140922.2256";
+        src = fetchFromGitHub {
+          owner = "jasonm23";
+          repo = "emacs-clues-theme";
+          rev = "69d873c90fbf24590c765309b7fb55cd14bb6bda";
+          sha256 = "0fnl3b62clg9llcs2l511sxp4yishan4pqk45sqp8ih4rdzvy7ar";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clues-theme";
+          sha256 = "12g7373js5a2fa0m396k9kjhxvx3qws7n1r435nr9zgwaw7xvciy";
+          name = "clues-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/clues-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cm-mode";
+        version = "20160113.523";
+        src = fetchFromGitHub {
+          owner = "joostkremers";
+          repo = "criticmarkup-emacs";
+          rev = "c38624070235ce25129516203f3bf6ac6f509846";
+          sha256 = "0m94692gkq299sf56m4c637j5xp78dvgv0ad1hv4ys1hzp1qw1l5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cm-mode";
+          sha256 = "1rgfpxbnp8wiq9j8aywm2n07rxzkhqljigwynrkyvrnsgxlq2a9x";
+          name = "cm-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cm-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cmake-font-lock = callPackage ({ cmake-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cmake-font-lock";
+        version = "20150828.1527";
+        src = fetchFromGitHub {
+          owner = "Lindydancer";
+          repo = "cmake-font-lock";
+          rev = "982b753e0228bb5189e3bf2283afad9197d93c37";
+          sha256 = "030kg3m546gcm6cf1k928ld51znsfrzhlpm005dvqap3gkcrg4sf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmake-font-lock";
+          sha256 = "0ws4kd94m8fh55d7whsf3rj9qrxjp1wsgxh0valsjxyp2ck9zrz0";
+          name = "cmake-font-lock";
+        };
+        packageRequires = [ cmake-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/cmake-font-lock";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }:
+    melpaBuild {
+        pname = "cmake-ide";
+        version = "20160114.1000";
+        src = fetchFromGitHub {
+          owner = "atilaneves";
+          repo = "cmake-ide";
+          rev = "6ce362f3fbea23e1c8e1831b73bc085ea2eabfd5";
+          sha256 = "0i4d99r3mwrfz1zjrh0wajgjyr5kskxn4s9k0rwk5l37an4130ml";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmake-ide";
+          sha256 = "0xvy7l80zw67jgvk1rkhwzjvsqjqckmd8zj6s67rgbm56z6ypmcg";
+          name = "cmake-ide";
+        };
+        packageRequires = [ cl-lib emacs levenshtein seq ];
+        meta = {
+          homepage = "http://melpa.org/#/cmake-ide";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cmake-mode";
+        version = "20151012.926";
+        src = fetchFromGitHub {
+          owner = "Kitware";
+          repo = "CMake";
+          rev = "03c0303d2e4bc07b9c5df1ecdbf89da6e36259d9";
+          sha256 = "198lvzy9zjdyrys5hcbhb1c5hnj01sh52xvjq0k6n8yvnnd3gmbr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmake-mode";
+          sha256 = "0zbn8syb5lw5xp1qcy3qcl75zfiyik30xvqyl38gdqddm9h7qmz7";
+          name = "cmake-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cmake-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cmake-project = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cmake-project";
+        version = "20150720.1559";
+        src = fetchFromGitHub {
+          owner = "alamaison";
+          repo = "emacs-cmake-project";
+          rev = "5212063b6276f8b9af8b48b4052e5ec97721c08b";
+          sha256 = "0fyzi8xac80wnhnwwm1j6yxpvpg1n4diq2lcl3qkj8klvk5gpxr6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmake-project";
+          sha256 = "13n6j9ljvzjzkknbm9zkhxljcn12avl39gxqq95hah44dr11rns3";
+          name = "cmake-project";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cmake-project";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cmds-menu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "cmds-menu";
+        version = "20151231.1430";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/cmds-menu.el";
+          sha256 = "13r8pjxknsfd6ywzlgcy4bm7fvr768ba34k6b7y365y3c1asz6y3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmds-menu";
+          sha256 = "12s75y9d75cxqgg3hj0s4w0d10zy8y230b5gy09685ab5lcajfks";
+          name = "cmds-menu";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cmds-menu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cmm-mode";
+        version = "20150225.146";
+        src = fetchFromGitHub {
+          owner = "bgamari";
+          repo = "cmm-mode";
+          rev = "c3ad514dff3eb30434f6b20d953276d4c00de1ee";
+          sha256 = "0xdcw329d2gssx86iajwrgpr7yv69b9nflmzjgb4jvg4pskj4pgx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmm-mode";
+          sha256 = "184b8x19cnvx8z4dr9alv62wchzc7vr7crzz8jiyqw9d544zs50h";
+          name = "cmm-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cmm-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cn-outline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cn-outline";
+        version = "20100321.1114";
+        src = fetchFromGitHub {
+          owner = "mori-dev";
+          repo = "cn-outline";
+          rev = "47d33a99b7ae26b1cd456441970b4bab2173d981";
+          sha256 = "1635k51ppivq6v2702fihq8dvi33445smds9zhqm0drnpv9rv5cr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cn-outline";
+          sha256 = "0cw1rr56hdngvhmx59j76hvkfzgybasn0fwhd6vwm709jqiiiwiz";
+          name = "cn-outline";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cn-outline";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cobra-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cobra-mode";
+        version = "20140116.1516";
+        src = fetchFromGitHub {
+          owner = "Nekroze";
+          repo = "cobra-mode";
+          rev = "acd6e53f6286af5176471d01f25257e5ddb6dd01";
+          sha256 = "1sx8grp3j7zcma3nb7zj6kijkdqx166vw1qgmm29hvx48bys6vlp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cobra-mode";
+          sha256 = "11jscpbclxlq2xqy2nsfa4y575bp8h0kpkp8cfjqb05lm5ybcp89";
+          name = "cobra-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cobra-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    code-library = callPackage ({ fetchFromGitHub, fetchurl, gist, lib, melpaBuild }:
+    melpaBuild {
+        pname = "code-library";
+        version = "20151216.1011";
+        src = fetchFromGitHub {
+          owner = "lujun9972";
+          repo = "code-library";
+          rev = "6004c12b199f0a78bc6c11adaa5091a90bc6926b";
+          sha256 = "0mcf0xyh4p6pk2hf1f554vy4amd0qcimspgnncff2a0qc2bsg5sy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/code-library";
+          sha256 = "0gi8lz2q0vis4nyziykq15jp3m3vykfwycbk6amhf1ybkn9k3ywj";
+          name = "code-library";
+        };
+        packageRequires = [ gist ];
+        meta = {
+          homepage = "http://melpa.org/#/code-library";
+          license = lib.licenses.free;
+        };
+      }) {};
+    codebug = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "codebug";
+        version = "20140929.1637";
+        src = fetchFromGitHub {
+          owner = "shano";
+          repo = "emacs-codebug";
+          rev = "ac0e4331ba94ccb5203fa492570e1ca6b90c3d52";
+          sha256 = "11v671c4338bsizbmm7ypp4x9s5hiwyddsg2ig6h157gfv2597pp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/codebug";
+          sha256 = "1cb2wvawp3wqslhgbmbw9xwcqgwfscqg0jfgqzi3nr42mjp9zgqj";
+          name = "codebug";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/codebug";
+          license = lib.licenses.free;
+        };
+      }) {};
+    codesearch = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "codesearch";
+        version = "20160111.855";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "codesearch.el";
+          rev = "09cf7c4275c51a5aafe84f700abea7b48ee0c145";
+          sha256 = "0ch3naqp3ji0q4blpjfr1xbzgzxhw10h08y2akik96kk1pnkwism";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/codesearch";
+          sha256 = "0z7zvain9n0rm6bvrh3j7z275l32fmp46p4b33mizqd1y86w89nx";
+          name = "codesearch";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/codesearch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    codic = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "codic";
+        version = "20150926.627";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-codic";
+          rev = "52bbb6997ef4ab9fb7fea43bbfff7f04671aa557";
+          sha256 = "14jcxrs3b02pbppvdsabr7c74i3c6d1lmd6l1p9dj8gv413pghsz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/codic";
+          sha256 = "0fq2qfqhkd6injgl66vcpd61j67shl9xj260aj6cgb2nriq0jxgn";
+          name = "codic";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/codic";
+          license = lib.licenses.free;
+        };
+      }) {};
+    coffee-fof = callPackage ({ coffee-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "coffee-fof";
+        version = "20131012.730";
+        src = fetchFromGitHub {
+          owner = "yasuyk";
+          repo = "coffee-fof";
+          rev = "211529594bc074721c6cbc4edb73a63cc05f89ac";
+          sha256 = "010v886ak0rbbhqwxwj6m0mkgh19s232igy7wwbv07l2pdqszf3p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/coffee-fof";
+          sha256 = "02cqza46qp8y69jd33cg4nmcgvrpwz23vyxqnmzwwvlmnbky96yc";
+          name = "coffee-fof";
+        };
+        packageRequires = [ coffee-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/coffee-fof";
+          license = lib.licenses.free;
+        };
+      }) {};
+    coffee-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "coffee-mode";
+        version = "20160111.532";
+        src = fetchFromGitHub {
+          owner = "defunkt";
+          repo = "coffee-mode";
+          rev = "c741811a96b20a939612f3affa678a576f0ad9f1";
+          sha256 = "0r0615q30awj77dwhvgz2cjmnfmvff9clg3krzr9zpskdkhdib8h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/coffee-mode";
+          sha256 = "1px50hs0x30psa5ljndpcc22c0qwcaxslpjf28cfgxinawnp74g1";
+          name = "coffee-mode";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/coffee-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    col-highlight = callPackage ({ fetchurl, lib, melpaBuild, vline }:
+    melpaBuild {
+        pname = "col-highlight";
+        version = "20151231.1433";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/col-highlight.el";
+          sha256 = "1fpkymmgv58b734d2rr7cfj2j2if1qkwgrpk3yp2ibw2n2567y0s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/col-highlight";
+          sha256 = "1kycjdlrg7a5x37b0pzqhg56yn7kaisryrk303qx1084kwq9464i";
+          name = "col-highlight";
+        };
+        packageRequires = [ vline ];
+        meta = {
+          homepage = "http://melpa.org/#/col-highlight";
+          license = lib.licenses.free;
+        };
+      }) {};
+    colemak-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "colemak-evil";
+        version = "20140508.1812";
+        src = fetchFromGitHub {
+          owner = "patbl";
+          repo = "colemak-evil";
+          rev = "cd2c75848ab0ad1aec42ca421d03a923166fa228";
+          sha256 = "0jjj1miwc7hw2fbb1fnmfnydim81djswla8iy4waam9014yraqci";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/colemak-evil";
+          sha256 = "1bfzs5px1k6g3cnwjdaq2m78bbnfy3lxhjzkcch7zdv3nyacwl5z";
+          name = "colemak-evil";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "http://melpa.org/#/colemak-evil";
+          license = lib.licenses.free;
+        };
+      }) {};
+    colonoscopy-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "colonoscopy-theme";
+        version = "20141116.101";
+        src = fetchFromGitHub {
+          owner = "emacsfodder";
+          repo = "emacs-colonoscopy-theme";
+          rev = "7b873d7e7e091b71bf4fdd23ded19e261a1e3936";
+          sha256 = "1k3sd07ffgpfhzg7d9mb1gc3n02zsvilxc30bgiycbjrbjgqq0i6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/colonoscopy-theme";
+          sha256 = "0x9bfr4j0sp41jkgnyjlaxnnjjrc102x6sznn6cgcmqk5qhswl4q";
+          name = "colonoscopy-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/colonoscopy-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    color-identifiers-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "color-identifiers-mode";
+        version = "20150602.2004";
+        src = fetchFromGitHub {
+          owner = "ankurdave";
+          repo = "color-identifiers-mode";
+          rev = "e35ee05588d84517193db07d94ce7f29ace10ef6";
+          sha256 = "0m98i8w513zdzkskw9a96dd73lnfbfwvr947b0djsrazn8grh6hv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-identifiers-mode";
+          sha256 = "1hxp8lzn7kfckn5ngxic6qiz3nbynilqlxhlq9k1n1llfg216gfq";
+          name = "color-identifiers-mode";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/color-identifiers-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    color-moccur = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "color-moccur";
+        version = "20141222.1835";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "color-moccur.el";
+          rev = "4f1c59ffd1ccc2ab1a171cd6b721e8cb9e002fb7";
+          sha256 = "1p1f30qz4nd5a8ym2iwrgp6vhws0dls2qlc0apblj9nj3b0ziv0x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-moccur";
+          sha256 = "17b9walfc5c9qfdvl9pcwb2gjikc3wxk1d3v878ckypmxd38vciq";
+          name = "color-moccur";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/color-moccur";
+          license = lib.licenses.free;
+        };
+      }) {};
+    color-theme = callPackage ({ fetchbzr, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "color-theme";
+        version = "20080305.234";
+        src = fetchbzr {
+          url = "http://bzr.savannah.gnu.org/r/color-theme/trunk";
+          rev = "57";
+          sha256 = "17bidzq9kiz250gal1fn9mg8gf8l749nz69z0awpc4x2222wxxiz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme";
+          sha256 = "1p4bjh8a9f6ixmwwnyjb520myk3bww1v9w6427za07v68m9cdh79";
+          name = "color-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/color-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    color-theme-approximate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "color-theme-approximate";
+        version = "20140227.2236";
+        src = fetchFromGitHub {
+          owner = "tungd";
+          repo = "color-theme-approximate";
+          rev = "f54301ca39bc5d2ffb000f233f8114184a3e7d71";
+          sha256 = "1b0ymwszqsjcihcbfp7s4fjam983ixh3yb7sdc0rmqlyric1zwxq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-approximate";
+          sha256 = "1wdnia9q42x7vky3ks555iic5s50g4mx7ss5ppaljvgxvbxyxqh1";
+          name = "color-theme-approximate";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/color-theme-approximate";
+          license = lib.licenses.free;
+        };
+      }) {};
+    color-theme-buffer-local = callPackage ({ color-theme, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "color-theme-buffer-local";
+        version = "20151012.1828";
+        src = fetchFromGitHub {
+          owner = "vic";
+          repo = "color-theme-buffer-local";
+          rev = "ca8470bc34c65a026a6bca1707d95240bfd019af";
+          sha256 = "0gvc9jy34a8wvzwjpmqhshbx2kpk6ckmdrdj5v00iya7c4afnckx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-buffer-local";
+          sha256 = "1448rffyzn5k5mr31hwd28wlj7if7rp5sjlqcsvbxd2mnbgkgjz0";
+          name = "color-theme-buffer-local";
+        };
+        packageRequires = [ color-theme ];
+        meta = {
+          homepage = "http://melpa.org/#/color-theme-buffer-local";
+          license = lib.licenses.free;
+        };
+      }) {};
+    color-theme-modern = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "color-theme-modern";
+        version = "20151109.2106";
+        src = fetchFromGitHub {
+          owner = "emacs-jp";
+          repo = "replace-colorthemes";
+          rev = "0a804c611da57b2d7c02c95f26eb8a7fc305f159";
+          sha256 = "0q9ss11i31iiv0vn8238922fkic7j6d02f9ykbip04sm46p5k6kj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-modern";
+          sha256 = "0f662ham430fgxpqw96zcl1whcm28cv710g6wvg4fma60sblaxcm";
+          name = "color-theme-modern";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/color-theme-modern";
+          license = lib.licenses.free;
+        };
+      }) {};
+    color-theme-sanityinc-solarized = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "color-theme-sanityinc-solarized";
+        version = "20150803.1620";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "color-theme-sanityinc-solarized";
+          rev = "14beb86aeb5b17451980f192bad72d7edb17321c";
+          sha256 = "07703v8xyia1vx9s636aaql99i29a4r5v9z0lvaypixgsidshx10";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-sanityinc-solarized";
+          sha256 = "0xg79hgb893f1nqx6q4q6hp4w6rvgp1aah1v2r3scg2jk057qxkf";
+          name = "color-theme-sanityinc-solarized";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/color-theme-sanityinc-solarized";
+          license = lib.licenses.free;
+        };
+      }) {};
+    color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "color-theme-sanityinc-tomorrow";
+        version = "20151215.2305";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "color-theme-sanityinc-tomorrow";
+          rev = "e309cb5a26228633797209276c5d48c070b90767";
+          sha256 = "1qs6n30amzv47d4d12z6jj506jsm5janp639jg9w65zibbp2dy7a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-sanityinc-tomorrow";
+          sha256 = "1k8iwjc7iidq5sxybs47rnswa6c5dwqfdzfw7w0by2h1id2z6nqd";
+          name = "color-theme-sanityinc-tomorrow";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/color-theme-sanityinc-tomorrow";
+          license = lib.licenses.free;
+        };
+      }) {};
+    color-theme-solarized = callPackage ({ color-theme, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "color-theme-solarized";
+        version = "20160108.1741";
+        src = fetchFromGitHub {
+          owner = "sellout";
+          repo = "emacs-color-theme-solarized";
+          rev = "d7f9165adf02c01ea67a2ecc31df56c7495199e6";
+          sha256 = "1ddscmxn6k00ip3mb4bjy4zxfklxv3jjnlbgwwr793qzwsi64vi7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-solarized";
+          sha256 = "011rzq38ffmq7f2nzwrq96wwz67p82p1f0p5nib4nwqa47xlx7kf";
+          name = "color-theme-solarized";
+        };
+        packageRequires = [ color-theme ];
+        meta = {
+          homepage = "http://melpa.org/#/color-theme-solarized";
+          license = lib.licenses.free;
+        };
+      }) {};
+    colorsarenice-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "colorsarenice-theme";
+        version = "20150421.1536";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "colorsarenice-theme";
+          rev = "3cae55d0c7aeda3a8ef731ebc3886b2449ad87e6";
+          sha256 = "18hzm7yzwlfjlbkx46rgdl31p9xyfqnxlvg8337h2bicpks7kjia";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/colorsarenice-theme";
+          sha256 = "09zlglldjbjr97clwyzyz7c0k8hswclnk2zbkm03nnn9n9yyg2qi";
+          name = "colorsarenice-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/colorsarenice-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    column-enforce-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "column-enforce-mode";
+        version = "20140902.1149";
+        src = fetchFromGitHub {
+          owner = "jordonbiondo";
+          repo = "column-enforce-mode";
+          rev = "f43263e50ae83db099d83ea445f93e248a3207a0";
+          sha256 = "0ay4wrnyrdp4v3vjxr99hy8fpq6zsyh246c0gbp7bh63l5fx8nwr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/column-enforce-mode";
+          sha256 = "1qh7kwr65spbbnzvq744gkksx50x04zs0nwn5ly60swc05d05lcg";
+          name = "column-enforce-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/column-enforce-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    column-marker = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "column-marker";
+        version = "20121128.243";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/column-marker.el";
+          sha256 = "05bv198zhqw5hqq6cr11mhz02dpca74hhp1ycwq369m0yb2naxy9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/column-marker";
+          sha256 = "1xgfsiw46aib2vb9bbjlgnhcgfnlfhdcxd0cl0jqj4fjfxzbz0bq";
+          name = "column-marker";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/column-marker";
+          license = lib.licenses.free;
+        };
+      }) {};
+    command-log-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "command-log-mode";
+        version = "20150615.916";
+        src = fetchFromGitHub {
+          owner = "lewang";
+          repo = "command-log-mode";
+          rev = "7408c0cb96709b8449f25a58a2203ed90bb5b850";
+          sha256 = "0fnyksbynlmmvl39f4is0xjp6b13yshfazigbksv012hxp0whslm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/command-log-mode";
+          sha256 = "11jq6055bvpwvrm0b8cgab25wa2mcyylpz4j56h1nqj7cnhb6ppj";
+          name = "command-log-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/command-log-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    commander = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "commander";
+        version = "20140120.1252";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "commander.el";
+          rev = "2a4f1fd6cf9aa1798559dbdd5fbd9dcd327cd859";
+          sha256 = "06y7ika4781gkh94ygdaz7a760s7ahrma6af6n7cqhgjyikz7lg1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/commander";
+          sha256 = "17y0hg6a90hflgwn24ww23qmvc1alzivpipca8zvpf0nih4fl393";
+          name = "commander";
+        };
+        packageRequires = [ cl-lib dash f s ];
+        meta = {
+          homepage = "http://melpa.org/#/commander";
+          license = lib.licenses.free;
+        };
+      }) {};
+    comment-dwim-2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "comment-dwim-2";
+        version = "20150825.1749";
+        src = fetchFromGitHub {
+          owner = "remyferre";
+          repo = "comment-dwim-2";
+          rev = "8cedecde018b5872195bfead6511af822776a430";
+          sha256 = "0kzlv2my0cc7d3nki2rlm32nmb2nyjb38inmvlf13z0m2kybg2ps";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/comment-dwim-2";
+          sha256 = "1w9w2a72ygsj5w47vjqcljajmmbz0mi8dhz5gjnpwxjwsr6fn6lj";
+          name = "comment-dwim-2";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/comment-dwim-2";
+          license = lib.licenses.free;
+        };
+      }) {};
+    commify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "commify";
+        version = "20151110.338";
+        src = fetchFromGitHub {
+          owner = "ddoherty03";
+          repo = "commify";
+          rev = "921467f666c05ccec9cf3bc0a8168eade20bcb6a";
+          sha256 = "04bma9sdn7h8fjz62wlcwayzhr7lvzhidh48wc5rk195zlbgagwa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/commify";
+          sha256 = "1jc6iqa4hna3277hx13scfcqzkr43yv6gndbxv7qf4ydi01ysd0m";
+          name = "commify";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "http://melpa.org/#/commify";
+          license = lib.licenses.free;
+        };
+      }) {};
+    common-lisp-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "common-lisp-snippets";
+        version = "20150910.547";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "common-lisp-snippets";
+          rev = "3b2b50fda8b1526d45a74e3d30f560d6b6bbb284";
+          sha256 = "1cc9ak9193m92g6l4mrfxbkkmvljl3c51d0xzdidwww978q3x6ad";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/common-lisp-snippets";
+          sha256 = "0ig8cz00cbfx0jckqk1xhsvm18ivl2mjvcn65s941nblsywfvxjl";
+          name = "common-lisp-snippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/common-lisp-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company";
+        version = "20160117.521";
+        src = fetchFromGitHub {
+          owner = "company-mode";
+          repo = "company-mode";
+          rev = "faa8f84f19e786230858a4325625c7bcb18804f3";
+          sha256 = "1zhhp2vps5l5vxcza45cjwka4khhx2ar49jzhylj8iqcrgyml5gv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company";
+          sha256 = "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4";
+          name = "company";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/company";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-anaconda = callPackage ({ anaconda-mode, cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "company-anaconda";
+        version = "20151230.1303";
+        src = fetchFromGitHub {
+          owner = "proofit404";
+          repo = "company-anaconda";
+          rev = "991621d2c3d4d57eb9a6caa2e27588376d55defb";
+          sha256 = "0r8ip22gr2ihicznyl2vbwgy3gsp5b5gy0m2i60001kyhssgmg6v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-anaconda";
+          sha256 = "1s7y47ghy7q35qpfqavh4p9wr91i6r579mdbpvv6h5by856yn4gl";
+          name = "company-anaconda";
+        };
+        packageRequires = [ anaconda-mode cl-lib company dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/company-anaconda";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-ansible";
+        version = "20150901.450";
+        src = fetchFromGitHub {
+          owner = "krzysztof-magosa";
+          repo = "company-ansible";
+          rev = "cfe1c915f49d716f30eec654c54db761f662952c";
+          sha256 = "06gh33qzglv40r62dsapzhxwparw8ciblv80g7h6y6ilyazwcidn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-ansible";
+          sha256 = "084l9dr2hvm00952y4m3jhchzxjhcd61sfn5ywj9b9a1d4sr110d";
+          name = "company-ansible";
+        };
+        packageRequires = [ company emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/company-ansible";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-arduino = callPackage ({ arduino-mode, cl-lib ? null, company, company-c-headers, company-irony, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-arduino";
+        version = "20150614.326";
+        src = fetchFromGitHub {
+          owner = "yuutayamada";
+          repo = "company-arduino";
+          rev = "fd31103ab73acd6c77e4361db86e472619903f80";
+          sha256 = "067xb4mwfnmbqjyfv4717417fg7ysvz9flnx1nrk6iv96gnf4vfx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-arduino";
+          sha256 = "1bch447lllikip1xd90kdgssgc67sl04a70fxqkqlrc1bs6gkkws";
+          name = "company-arduino";
+        };
+        packageRequires = [
+          arduino-mode
+          cl-lib
+          company
+          company-c-headers
+          company-irony
+          emacs
+          irony
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/company-arduino";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-auctex = callPackage ({ auctex, company, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "company-auctex";
+        version = "20151102.843";
+        src = fetchFromGitHub {
+          owner = "alexeyr";
+          repo = "company-auctex";
+          rev = "780ba68b4154ecac4f20dbd4b1ba561ba40f248b";
+          sha256 = "0mkyg9y1rhl6hdzhr51psnvy2q0zw4y29m9p0ivb7s643k3fjjp5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-auctex";
+          sha256 = "1jia80sqmm83kzjcf1h1d9iz2k4k9albzvfka5hx6hpa4h8nm5q4";
+          name = "company-auctex";
+        };
+        packageRequires = [ auctex company yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/company-auctex";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-c-headers = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-c-headers";
+        version = "20150801.1101";
+        src = fetchFromGitHub {
+          owner = "randomphrase";
+          repo = "company-c-headers";
+          rev = "0b8c63cdc7864c3e3939c4b8cda314d05ae0a352";
+          sha256 = "16cva7ccc0hrc6yf659kpsznlk1bkgv525lqr4nj8a12q0avjdxf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-c-headers";
+          sha256 = "1715vnjr5cjiq8gjcd3idnpnijg5cg3sw3f8gr5x2ixcrip1hx3a";
+          name = "company-c-headers";
+        };
+        packageRequires = [ company emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/company-c-headers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-cabal = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-cabal";
+        version = "20151216.920";
+        src = fetchFromGitHub {
+          owner = "iquiw";
+          repo = "company-cabal";
+          rev = "f458de88cad16ed48a605e8347e56433e73dcef8";
+          sha256 = "0ll9dxzsgrpy4psz3dqhzny990lfccn63swcyfvl8mnqgwbrq8k0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-cabal";
+          sha256 = "0pbjidj88c9qri6xw8023yqwnczad5ig224cbsz6vsmdla2nlxra";
+          name = "company-cabal";
+        };
+        packageRequires = [ cl-lib company emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/company-cabal";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "company-coq";
+        version = "20160118.1109";
+        src = fetchFromGitHub {
+          owner = "cpitclaudel";
+          repo = "company-coq";
+          rev = "e8c1fe9ad3b1197077d33b25bbe7615f695a49b6";
+          sha256 = "1vq9n68ls4a4gmqk9fkysrnlxl2shpz5wjpjcphjs42h93vr7nqs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-coq";
+          sha256 = "1iagm07ckf60kg4i8m4n0gfmv0brqc4dcn7lkcz229r3f4kyqksa";
+          name = "company-coq";
+        };
+        packageRequires = [ cl-lib company company-math dash yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/company-coq";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-dcd = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, flycheck-dmd-dub, helm, lib, melpaBuild, popwin, yasnippet }:
+    melpaBuild {
+        pname = "company-dcd";
+        version = "20150901.604";
+        src = fetchFromGitHub {
+          owner = "tsukimizake";
+          repo = "company-dcd";
+          rev = "1d121dc42906fc58fa3a7febff8dabd29fba34f2";
+          sha256 = "0qbis9jqcrgj71cf8i9yfxsm7yj6d546gxw6linqd7slqn97l8rl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-dcd";
+          sha256 = "03849k4jzs23iglk9ghcq6283c9asffcq4dznypcjax7y4x113vd";
+          name = "company-dcd";
+        };
+        packageRequires = [
+          cl-lib
+          company
+          flycheck-dmd-dub
+          helm
+          popwin
+          yasnippet
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/company-dcd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-edbi = callPackage ({ cl-lib ? null, company, edbi, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "company-edbi";
+        version = "20151230.1251";
+        src = fetchFromGitHub {
+          owner = "proofit404";
+          repo = "company-edbi";
+          rev = "7debb5a700ab36fa86e78c3decd8ad16fc028c8a";
+          sha256 = "1fx9hch42kax95nd8zadsbnadq9cylrna0qf0q4bx5yj1afz91p1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-edbi";
+          sha256 = "067ff1xdyqy4qzgk5pmqf4kksfjk1glkrslcj3rk4zmhcalwrfrm";
+          name = "company-edbi";
+        };
+        packageRequires = [ cl-lib company edbi s ];
+        meta = {
+          homepage = "http://melpa.org/#/company-edbi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-emoji";
+        version = "20151108.20";
+        src = fetchFromGitHub {
+          owner = "dunn";
+          repo = "company-emoji";
+          rev = "c3665bf150c43a1c9830e817cf6de950be8c0fde";
+          sha256 = "1lm26av6z18p70gxz23h87l25airawljr5lm7hw6krg706cp3aq6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-emoji";
+          sha256 = "1mflqqw9gnfcqjb6g8ivdfl7s4mdyjg7j0457hamgyvgvpxsh8x3";
+          name = "company-emoji";
+        };
+        packageRequires = [ cl-lib company ];
+        meta = {
+          homepage = "http://melpa.org/#/company-emoji";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-flx = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-flx";
+        version = "20160110.1904";
+        src = fetchFromGitHub {
+          owner = "PythonNut";
+          repo = "company-flx";
+          rev = "411f6b8cc6dd6bfd37b04684b6aade643706a1a1";
+          sha256 = "1rg6jynzp37qnaq4lj48sfrhmv7mgcd2rzkixbpb3hgsy10dj9j0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-flx";
+          sha256 = "1r4jcfzrhdpclblfrmi4qbl8dnhc2d7d4c1425xnslg7bhwd2vxn";
+          name = "company-flx";
+        };
+        packageRequires = [ company emacs flx ];
+        meta = {
+          homepage = "http://melpa.org/#/company-flx";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-ghc = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, ghc, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-ghc";
+        version = "20151217.859";
+        src = fetchFromGitHub {
+          owner = "iquiw";
+          repo = "company-ghc";
+          rev = "d78fcee6c8fa4f786a1e15a3bb78d2dd2c56b6af";
+          sha256 = "06ljm0ysz8czdr32gfq1y3nm3jcywihdszgnc2alx1hcgqiq0ds6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-ghc";
+          sha256 = "07adykza4dqs64bk8vjmgryr54khxmcy28hms5z8i1qpsk9vmvnn";
+          name = "company-ghc";
+        };
+        packageRequires = [ cl-lib company emacs ghc ];
+        meta = {
+          homepage = "http://melpa.org/#/company-ghc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-ghci = callPackage ({ company, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-ghci";
+        version = "20160118.924";
+        src = fetchFromGitHub {
+          owner = "juiko";
+          repo = "company-ghci";
+          rev = "3ba0dd5607dc4b90e4ad32a4e23176882405d3b7";
+          sha256 = "0jsnf60nz37s4csk8pnyr45fjdsac1ls64fvsh5gzi6hipxz5y6z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-ghci";
+          sha256 = "0h9hqfb8fm90h87bi3myl84nppbbminhnvv6jqg62qi9k6snn1iq";
+          name = "company-ghci";
+        };
+        packageRequires = [ company haskell-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/company-ghci";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-go = callPackage ({ company, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-go";
+        version = "20151211.1224";
+        src = fetchFromGitHub {
+          owner = "nsf";
+          repo = "gocode";
+          rev = "9779bffba5e4e87b4750f718b6fa7f088c1fa6e3";
+          sha256 = "0b25iczbg72pg1525ql6hb6jyx5vck8bqn5z8f4dy9a94qpgxszl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-go";
+          sha256 = "1ncy5wlg3ywr17zrxb1d1bap4gdvwr35w9a8b0crz5h3l3y4cp29";
+          name = "company-go";
+        };
+        packageRequires = [ company go-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/company-go";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-inf-ruby = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-inf-ruby";
+        version = "20140805.1554";
+        src = fetchFromGitHub {
+          owner = "company-mode";
+          repo = "company-inf-ruby";
+          rev = "fe3e4863bc971fbb81edad447efad5795ead1b17";
+          sha256 = "0fnv4rvvs9rqzrs86g23jcrpg0rcgk25299hm6jm08ia0kjjby1m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-inf-ruby";
+          sha256 = "0cb1w0sxgb5jf0p2a5s2i4d511lsjjhyaqkqlwjz8nk4w14n0zxm";
+          name = "company-inf-ruby";
+        };
+        packageRequires = [ company emacs inf-ruby ];
+        meta = {
+          homepage = "http://melpa.org/#/company-inf-ruby";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-irony";
+        version = "20150810.439";
+        src = fetchFromGitHub {
+          owner = "Sarcasm";
+          repo = "company-irony";
+          rev = "09f16eade551201548455285a2d977a0889761da";
+          sha256 = "0y1a9wxk9w2jk4177hkqzgqzknswikxc1dc60hzj4samyp2jhvfl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-irony";
+          sha256 = "15adamk1b9y1i6k06i5ahf1wn70cgwlhgk0x6fk8pl5izg05z1km";
+          name = "company-irony";
+        };
+        packageRequires = [ cl-lib company emacs irony ];
+        meta = {
+          homepage = "http://melpa.org/#/company-irony";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-irony-c-headers = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-irony-c-headers";
+        version = "20151018.409";
+        src = fetchFromGitHub {
+          owner = "hotpxl";
+          repo = "company-irony-c-headers";
+          rev = "ba304fe7eebdff90bbc7dea063b45b82638427fa";
+          sha256 = "1x2dfjmy86icyv2g1y5bjlr87w8rixqdcndkwm1sba6ha277wp9i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-irony-c-headers";
+          sha256 = "0kiag5ggmc2f5c3gd8nn40x16i686jpdrfrflgrz2aih8p3g6af8";
+          name = "company-irony-c-headers";
+        };
+        packageRequires = [ cl-lib company irony ];
+        meta = {
+          homepage = "http://melpa.org/#/company-irony-c-headers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-jedi = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, jedi-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-jedi";
+        version = "20151216.2121";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-company-jedi";
+          rev = "ad49407451c7f28fe137f9c8f3a7fc89e8693a1b";
+          sha256 = "1ihqapp4dv92794rsgyq0rmhwika60cmradqd4bn9b72ss6plxs1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-jedi";
+          sha256 = "1krrgrjq967c3j02y0i345yx6w4crisnj1k3bhih6j849fvy3fvj";
+          name = "company-jedi";
+        };
+        packageRequires = [ cl-lib company emacs jedi-core ];
+        meta = {
+          homepage = "http://melpa.org/#/company-jedi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
+    melpaBuild {
+        pname = "company-math";
+        version = "20150830.1837";
+        src = fetchFromGitHub {
+          owner = "vspinu";
+          repo = "company-math";
+          rev = "f5cedcfa73e5ddd445167969e87ddf8e1bbd2bc1";
+          sha256 = "0pxg9851pl7ck58qiz4swj2c0by914d4bn14c5imfvdn5hxnq19i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-math";
+          sha256 = "0chig8k8l65bnd0a6734fiy0ikl20k9v2wlndh3ckz5a8h963g87";
+          name = "company-math";
+        };
+        packageRequires = [ company math-symbol-lists ];
+        meta = {
+          homepage = "http://melpa.org/#/company-math";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-nand2tetris = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, names, nand2tetris }:
+    melpaBuild {
+        pname = "company-nand2tetris";
+        version = "20151027.1636";
+        src = fetchFromGitHub {
+          owner = "CestDiego";
+          repo = "nand2tetris.el";
+          rev = "0297cd8d76cad072cb64318ffacdc65d8a1ad948";
+          sha256 = "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-nand2tetris";
+          sha256 = "1g2i33jjh7kbpzk835kbnqicf0w4cq5rqv934bqzz5kavj9cg886";
+          name = "company-nand2tetris";
+        };
+        packageRequires = [ cl-lib company names nand2tetris ];
+        meta = {
+          homepage = "http://melpa.org/#/company-nand2tetris";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-nixos-options = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, nixos-options }:
+    melpaBuild {
+        pname = "company-nixos-options";
+        version = "20151013.1809";
+        src = fetchFromGitHub {
+          owner = "travisbhartwell";
+          repo = "nix-emacs";
+          rev = "6b1418611b49a6cf77380a76f7e6236bbb5df83a";
+          sha256 = "0ia9wgn33znaviy7ilfm83yfalc2dbpm1g7nvss5s4rznqkdfhn3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-nixos-options";
+          sha256 = "1yrqqdadmf7qfxpqp8wwb325zjnwwjmn2hhnl7i3j0ckg6hqyqf0";
+          name = "company-nixos-options";
+        };
+        packageRequires = [ cl-lib company nixos-options ];
+        meta = {
+          homepage = "http://melpa.org/#/company-nixos-options";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-qml = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, qml-mode }:
+    melpaBuild {
+        pname = "company-qml";
+        version = "20151027.1035";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "company-qml";
+          rev = "ae4a5f1ac30eb31e74e2eebf98c895c2cb5a51df";
+          sha256 = "07vcxwqynji7ggy9sb8lgpinkfjdiav0aybn5pnb0v8ck9v1w6k3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-qml";
+          sha256 = "0sva7i93dam8mc2z3cp785vmgcg7cphrpkwyvqyqhq8w51qg8mxx";
+          name = "company-qml";
+        };
+        packageRequires = [ company qml-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/company-qml";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }:
+    melpaBuild {
+        pname = "company-quickhelp";
+        version = "20150804.519";
+        src = fetchFromGitHub {
+          owner = "expez";
+          repo = "company-quickhelp";
+          rev = "05e0ee9b854f90ff2b007b3e19446a02513f43dc";
+          sha256 = "0hg3wrfhz3qlfb6zv6j5a4xzmm4jk25pkv8h3ryg7sl7h602idgl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-quickhelp";
+          sha256 = "042bwv0wd4hksbm528zb7pbllzk83p8qjq5f8z46p84c8mmxfp9g";
+          name = "company-quickhelp";
+        };
+        packageRequires = [ company emacs pos-tip ];
+        meta = {
+          homepage = "http://melpa.org/#/company-quickhelp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-racer = callPackage ({ cl-lib ? null, company, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-racer";
+        version = "20150628.2133";
+        src = fetchFromGitHub {
+          owner = "emacs-pe";
+          repo = "company-racer";
+          rev = "c31f7cab8c2f9c376ff0bd48e56dbc30a32e4b00";
+          sha256 = "1lk3fqsgbi6mg4hrpc9gy4hbfp9snyj4yvc0zh8iqqw5nx12dab4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-racer";
+          sha256 = "0zc8dzvsjz5qsrwhv7x9f7djzvb9awacc3pgjirsv8f8sp7p3am4";
+          name = "company-racer";
+        };
+        packageRequires = [ cl-lib company deferred emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/company-racer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-restclient = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, know-your-http-well, lib, melpaBuild, restclient }:
+    melpaBuild {
+        pname = "company-restclient";
+        version = "20151202.601";
+        src = fetchFromGitHub {
+          owner = "iquiw";
+          repo = "company-restclient";
+          rev = "752f39490178832f6a09abd82e10d9356636350a";
+          sha256 = "04829y7510zxjww9pq8afvnzwyyv30c0b3a71mxwf6ympfxb9rx5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-restclient";
+          sha256 = "1md0n4k4wmbh9rmbwqh3kg2fj0c34rzqfd56jsq8lcdg14k0kdcb";
+          name = "company-restclient";
+        };
+        packageRequires = [
+          cl-lib
+          company
+          emacs
+          know-your-http-well
+          restclient
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/company-restclient";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }:
+    melpaBuild {
+        pname = "company-sourcekit";
+        version = "20151209.714";
+        src = fetchFromGitHub {
+          owner = "nathankot";
+          repo = "company-sourcekit";
+          rev = "5e1adf8d201fd94a942b40983415db1b28b6eef1";
+          sha256 = "1xzwalchl9lnq9848dlvhhbzyh1wkwbciz20d1iw0fsigj5g156c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-sourcekit";
+          sha256 = "0hr5j1ginf43h4qf3fvsh3z53z0c7w5a9lhrvdwmlzj396qhqmzs";
+          name = "company-sourcekit";
+        };
+        packageRequires = [ company dash dash-functional emacs sourcekit ];
+        meta = {
+          homepage = "http://melpa.org/#/company-sourcekit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-tern = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tern }:
+    melpaBuild {
+        pname = "company-tern";
+        version = "20151230.1300";
+        src = fetchFromGitHub {
+          owner = "proofit404";
+          repo = "company-tern";
+          rev = "0c5fa13381915d21b62a70818d25901efb0f4a05";
+          sha256 = "1b7p6g478para62bnpz5aqijaim8j72c9b27c2qahjmy2zj2f460";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-tern";
+          sha256 = "17pw4jx3f1hymj6sc0ri18jz9ngggj4a41kxx14fnmmm8adqn6wh";
+          name = "company-tern";
+        };
+        packageRequires = [ cl-lib company dash dash-functional s tern ];
+        meta = {
+          homepage = "http://melpa.org/#/company-tern";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-try-hard = callPackage ({ company, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-try-hard";
+        version = "20150902.1706";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "company-try-hard";
+          rev = "0401e8afa6bd4d3e9d2cf18e58955b83aef93005";
+          sha256 = "18hy60fm3b3dmp29cmzbs6grlihkwifjbzv30gprwj5f6x7m8knf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-try-hard";
+          sha256 = "1rwn521dc8kxh43vcd3rf0h8jc53d4gmid3szj2msi0da1sk0mmj";
+          name = "company-try-hard";
+        };
+        packageRequires = [ company dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/company-try-hard";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-web = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }:
+    melpaBuild {
+        pname = "company-web";
+        version = "20151219.517";
+        src = fetchFromGitHub {
+          owner = "osv";
+          repo = "company-web";
+          rev = "2b426fc09b45b0e6bb95bb27d8ef22789c72a1d8";
+          sha256 = "1a9qx041w7i1ahg6rmi82hv161k57z4aljzm8wpa9wrfj8a6df2q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-web";
+          sha256 = "0dj0m6wcc8cyvblp9b5b3am95gc18j9y4va44hvljxv1h7l5hhvy";
+          name = "company-web";
+        };
+        packageRequires = [ cl-lib company dash web-completion-data ];
+        meta = {
+          homepage = "http://melpa.org/#/company-web";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-ycm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ycm }:
+    melpaBuild {
+        pname = "company-ycm";
+        version = "20140904.1317";
+        src = fetchFromGitHub {
+          owner = "neuromage";
+          repo = "ycm.el";
+          rev = "4da8a14abcd0f4fa3235042ade2e12b5068c0601";
+          sha256 = "0znchya89zzk30mwl4qfm0q9sfa5m3jspapb892ydj0mck5n4nyj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-ycm";
+          sha256 = "1q4d63c7nr3g7q0smd55pp636vqa9lf1pkwjn9iq265369npvina";
+          name = "company-ycm";
+        };
+        packageRequires = [ ycm ];
+        meta = {
+          homepage = "http://melpa.org/#/company-ycm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-ycmd = callPackage ({ company, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, s, ycmd }:
+    melpaBuild {
+        pname = "company-ycmd";
+        version = "20160106.834";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "emacs-ycmd";
+          rev = "80c6d7c663b6ccc32b851348f1099790ac4c9736";
+          sha256 = "1c3c3frd9fdb77wkhg8f8g29dvr86ryzf9prg4pm8wvhifa4yhvg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-ycmd";
+          sha256 = "0fqmkb0q8ai605jzn2kwd585b2alwxbmnb3yqnn9fgkcvyc9f0pk";
+          name = "company-ycmd";
+        };
+        packageRequires = [ company dash deferred s ycmd ];
+        meta = {
+          homepage = "http://melpa.org/#/company-ycmd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    concurrent = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "concurrent";
+        version = "20160109.2246";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-deferred";
+          rev = "8827106c83f0fc773bc406d381ea25a29a5965e1";
+          sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/concurrent";
+          sha256 = "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf";
+          name = "concurrent";
+        };
+        packageRequires = [ deferred ];
+        meta = {
+          homepage = "http://melpa.org/#/concurrent";
+          license = lib.licenses.free;
+        };
+      }) {};
+    config-parser = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "config-parser";
+        version = "20160112.544";
+        src = fetchFromGitHub {
+          owner = "lujun9972";
+          repo = "el-config-parser";
+          rev = "3e42c2a61902b9de268e491efd0fe3b1a68fd4f9";
+          sha256 = "0zz1k4h16pjdwiqavfbfbrbvi83ww93kgf838ap4f3n034hqfx20";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/config-parser";
+          sha256 = "0wncg1v4wccb9j16rcmwz8fcmrscj7knfisq0r4qqx3skrmpccah";
+          name = "config-parser";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/config-parser";
+          license = lib.licenses.free;
+        };
+      }) {};
+    confluence = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild, xml-rpc }:
+    melpaBuild {
+        pname = "confluence";
+        version = "20130808.2150";
+        src = fetchsvn {
+          url = "http://confluence-el.googlecode.com/svn/trunk/";
+          rev = "170";
+          sha256 = "1l6970ng046hw2izzb15cbbbf83l6m8c9mvic8fzjixfi3g1dl55";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/confluence";
+          sha256 = "003lykwd3ya0xwlahmm35nx9p6mk8vylq57yxrmgdcc64630bdpf";
+          name = "confluence";
+        };
+        packageRequires = [ xml-rpc ];
+        meta = {
+          homepage = "http://melpa.org/#/confluence";
+          license = lib.licenses.free;
+        };
+      }) {};
+    conkeror-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "conkeror-minor-mode";
+        version = "20150114.1004";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "conkeror-minor-mode";
+          rev = "476e81c27b056e21c192391fe674a2bf875466b0";
+          sha256 = "0sz3qx1bn0lwjhka2l6wfl4b5486ji9dklgjs7fdlkg3dgpp1ahx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/conkeror-minor-mode";
+          sha256 = "1ch108f20k7xbf79azsp31hh4wmw7iycsxddcszgxkbm7pj11933";
+          name = "conkeror-minor-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/conkeror-minor-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    connection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "connection";
+        version = "20140717.2229";
+        src = fetchFromGitHub {
+          owner = "myrkr";
+          repo = "dictionary-el";
+          rev = "a23b8f4a422d0de69a006ed010eff5795319db98";
+          sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/connection";
+          sha256 = "1y68d2kay8p5vapailxhrc5dl7b8k8nkvp7pa54md3fsivwp1d0q";
+          name = "connection";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/connection";
+          license = lib.licenses.free;
+        };
+      }) {};
+    control-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "control-mode";
+        version = "20140218.807";
+        src = fetchFromGitHub {
+          owner = "stephendavidmarsh";
+          repo = "control-mode";
+          rev = "52c43d198f423eb00e5de6e44f2f3dd70893a6bc";
+          sha256 = "1qsq543rb0z2fq716a2khs8zqyh13npzmbj58f00s8b3w3andpbh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/control-mode";
+          sha256 = "1biq4p2w8rqcbvr09gxbchjqlaixjf1fzv7xv8lpv81dlhi7dgz6";
+          name = "control-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/control-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    corral = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "corral";
+        version = "20151120.1809";
+        src = fetchFromGitHub {
+          owner = "nivekuil";
+          repo = "corral";
+          rev = "9a5ab7f293a23a4fec77ab4fb442d69ecfcc293f";
+          sha256 = "1q9jxg9khvjm7lqjhgfhdnb9j9620bq1k5b2cj74q8k4paa6kyyw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/corral";
+          sha256 = "1drccqk4qzkgvkgkzlrrfd1dcgj8ziqriijrjihrzjgjsbpzv6da";
+          name = "corral";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/corral";
+          license = lib.licenses.free;
+        };
+      }) {};
+    counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
+    melpaBuild {
+        pname = "counsel";
+        version = "20160112.927";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "swiper";
+          rev = "bcb81dde6e1abba02256d716426797a3e1b306f1";
+          sha256 = "0r1i6ck37yq92h7hc9pm6kqlh0751j8jj7vqrligghxk9d42r479";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/counsel";
+          sha256 = "0y8cb2q4mqvzan5n8ws5pjpm7bkjcghg5q19mzc3gqrq9vrvyzi6";
+          name = "counsel";
+        };
+        packageRequires = [ emacs swiper ];
+        meta = {
+          homepage = "http://melpa.org/#/counsel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cp5022x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cp5022x";
+        version = "20120323.1835";
+        src = fetchFromGitHub {
+          owner = "awasira";
+          repo = "cp5022x.el";
+          rev = "ea7327dd75e54539576916f592ae1be98179ae35";
+          sha256 = "1z67x4a0aricd9q6i2w33k74alddl6w0rijjhzyxwml7ibhbvphz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cp5022x";
+          sha256 = "0v1jhkix01l299m67jag43rnps68m19zy83vvdglxa8dj3naz5dl";
+          name = "cp5022x";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cp5022x";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cpputils-cmake = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cpputils-cmake";
+        version = "20151030.603";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "cpputils-cmake";
+          rev = "9a496c9c14d1f287d9819aa0ed017be9fad9d3f4";
+          sha256 = "0kjkqylg0fncizrgcr8xx2qgjr8id41904n2pip0gicbry1n8bqg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cpputils-cmake";
+          sha256 = "0fswmmmrjv897n51nidmn8gs8yp00595g35vwjafsq6rzfg58j60";
+          name = "cpputils-cmake";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cpputils-cmake";
+          license = lib.licenses.free;
+        };
+      }) {};
+    crab = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, websocket }:
+    melpaBuild {
+        pname = "crab";
+        version = "20150126.2337";
+        src = fetchFromGitHub {
+          owner = "puffnfresh";
+          repo = "crab-emacs";
+          rev = "6d66844856c1864157cef3dea9332c319b05d7d5";
+          sha256 = "0y37fx4ghx8a74cp7ci6p5yfpji8g42hlah2xcwfnyw0qlpqfbnl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/crab";
+          sha256 = "1jz26bw2h7ahcb7y2qhpqrlfald244c92m6pvfrb0jg0z384i6aj";
+          name = "crab";
+        };
+        packageRequires = [ json websocket ];
+        meta = {
+          homepage = "http://melpa.org/#/crab";
+          license = lib.licenses.free;
+        };
+      }) {};
+    crappy-jsp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "crappy-jsp-mode";
+        version = "20140311.431";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "crappy-jsp-mode";
+          rev = "6c45ab92b452411cc0fab9bcee2f456276b4fc40";
+          sha256 = "12g6l6xlbs9h24q5lk8yjgk91xqd7r3v7r6czy10r09cmfjmkxbb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/crappy-jsp-mode";
+          sha256 = "00wj61maib77qldzq06l9v0pbvp9jih75w1xw0ry9mij0r6ca8ii";
+          name = "crappy-jsp-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/crappy-jsp-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    creds = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "creds";
+        version = "20140510.1206";
+        src = fetchFromGitHub {
+          owner = "ardumont";
+          repo = "emacs-creds";
+          rev = "b059397a7d59481f05fbb1bb9c8d3c2c69226482";
+          sha256 = "0l4bvk3m355b25d7pdnhczn3fckbq0rg2l4r0a0d94004ksvylqa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/creds";
+          sha256 = "0n11xxaf93bbc9ih25wj09zzw4sj32wb99qig4zcy8bpkl5y3llk";
+          name = "creds";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/creds";
+          license = lib.licenses.free;
+        };
+      }) {};
+    creole = callPackage ({ fetchFromGitHub, fetchurl, kv, lib, melpaBuild, noflet }:
+    melpaBuild {
+        pname = "creole";
+        version = "20140924.1000";
+        src = fetchFromGitHub {
+          owner = "nicferrier";
+          repo = "elwikicreole";
+          rev = "7d5cffe93857f6c75ca09ac79c0e47b8d4410e53";
+          sha256 = "18c4jfjnhb7asdhwj41g06cp9rz5xd7bbx2s1xvk6gahay27rlrv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/creole";
+          sha256 = "1pqgm7m2gzkn65v3qic71c38qiira29cwx11l96qph8h8sf47zw5";
+          name = "creole";
+        };
+        packageRequires = [ kv noflet ];
+        meta = {
+          homepage = "http://melpa.org/#/creole";
+          license = lib.licenses.free;
+        };
+      }) {};
+    creole-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "creole-mode";
+        version = "20130721.1950";
+        src = fetchFromGitHub {
+          owner = "nicferrier";
+          repo = "creole-mode";
+          rev = "b5e79b2ec5f19fb5aacf689b5febc3e0b61515c4";
+          sha256 = "0japww5x89vd1ahjm2bc3biz6wxv94vvqq5fyyzkqsblgk5bys0h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/creole-mode";
+          sha256 = "1lj9a0bgn7lmc2wyjzzvmpaz1f1spj02l51ki2wydjbfhxq61k0s";
+          name = "creole-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/creole-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    crm-custom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "crm-custom";
+        version = "20160116.1806";
+        src = fetchFromGitHub {
+          owner = "DarwinAwardWinner";
+          repo = "crm-custom";
+          rev = "f1aaccf64306a5f99d9bf7ba815d7ea41c15518d";
+          sha256 = "1kl6blr4dlz40gfc845071nhfms4fm59284ja2177bhghy3wmw6r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/crm-custom";
+          sha256 = "14w15skxr44p9ilhpswlgdbqfw8jghxi69l37yk4m449m7g9694c";
+          name = "crm-custom";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/crm-custom";
+          license = lib.licenses.free;
+        };
+      }) {};
+    crontab-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "crontab-mode";
+        version = "20090510.1555";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "crontab-mode";
+          rev = "68341c82b26462a6af4a5e2b624b1c2165243b8e";
+          sha256 = "1r9dhk8h8lq18vi0hjai8y4z42yjxg18786mcr2qs5m3q1ampf9d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/crontab-mode";
+          sha256 = "16qc2isvf6cgl5ihdbwmvv0gbhns4mkhd5lxkl6f8f6h0za054ci";
+          name = "crontab-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/crontab-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    crosshairs = callPackage ({ col-highlight, fetchurl, hl-line-plus, lib, melpaBuild, vline }:
+    melpaBuild {
+        pname = "crosshairs";
+        version = "20151231.1438";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/crosshairs.el";
+          sha256 = "120hxk82i0r4qan4hfk9ldmw5a8bzv7p683lrnlcx9gyxgkia3am";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/crosshairs";
+          sha256 = "1gf73li6q5rg1dimzihxq0rdxiqzbl2w78r1qzc9mxw3qj7azxqp";
+          name = "crosshairs";
+        };
+        packageRequires = [ col-highlight hl-line-plus vline ];
+        meta = {
+          homepage = "http://melpa.org/#/crosshairs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "crux";
+        version = "20160110.1501";
+        src = fetchFromGitHub {
+          owner = "bbatsov";
+          repo = "crux";
+          rev = "93304680ec4beea168651399b622e1ee4bff05aa";
+          sha256 = "1javwbj7kvwjff05m1w6v5nmbnk1p4x11c4k2ljx7349qjciw6af";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/crux";
+          sha256 = "10lim1sngqbdqqwyq6ksqjjqpkm97aj1jk550sgwj28338lnw73c";
+          name = "crux";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/crux";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cryptol-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cryptol-mode";
+        version = "20140426.1204";
+        src = fetchFromGitHub {
+          owner = "thoughtpolice";
+          repo = "cryptol-mode";
+          rev = "a54d000d24757fad2a91ae2853b16a97ebe52771";
+          sha256 = "00wgbcw09xn9xi52swi4wyi9dj9p9hyin7i431xi6zkhxysw4q7w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cryptol-mode";
+          sha256 = "08iq69gqmps8cckybhj9065b8a2a49p0rpzgx883qxnypsmjfmf2";
+          name = "cryptol-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cryptol-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cryptsy-public-api = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cryptsy-public-api";
+        version = "20141008.728";
+        src = fetchFromGitHub {
+          owner = "sodaware";
+          repo = "cryptsy-public-api.el";
+          rev = "59bdf2425dccc27cc1598868a1a810885508cff5";
+          sha256 = "0ry0087g1br3397js7a9iy6k2x6p0dgqlggxx9gaqhms7pmpq14b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cryptsy-public-api";
+          sha256 = "1v78rm44af3vgsml5f6kpwvnb4ks6n49br2fhjgh6nc7g3jmz97n";
+          name = "cryptsy-public-api";
+        };
+        packageRequires = [ json ];
+        meta = {
+          homepage = "http://melpa.org/#/cryptsy-public-api";
+          license = lib.licenses.free;
+        };
+      }) {};
+    csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "csharp-mode";
+        version = "20160117.1521";
+        src = fetchFromGitHub {
+          owner = "josteink";
+          repo = "csharp-mode";
+          rev = "bc3bd2a2e2e14f81f3e297841fbb6a761c35b417";
+          sha256 = "09b5n36z99asa81k7h7xr7906g1vpr3sg3kdcq2fdbznbpjydnvl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/csharp-mode";
+          sha256 = "17j84qrprq492dsn103dji8mvh29mbdlqlpsszbgfdgnpvfr1rv0";
+          name = "csharp-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/csharp-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    css-comb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "css-comb";
+        version = "20150502.1528";
+        src = fetchFromGitHub {
+          owner = "channikhabra";
+          repo = "css-comb.el";
+          rev = "980251dc5d3ce0e607498f8a793f6d67a77d9cda";
+          sha256 = "0ljhar80kk7k54jz1xiq4r0w6s1wkacl7qz9wkvvbzhjb0z049hq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/css-comb";
+          sha256 = "1axwrvbc3xl1ixhh72bii3hhbi9d96y6i1my1rpvwqyd6f7wb2cf";
+          name = "css-comb";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/css-comb";
+          license = lib.licenses.free;
+        };
+      }) {};
+    css-eldoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "css-eldoc";
+        version = "20150124.2123";
+        src = fetchFromGitHub {
+          owner = "zenozeng";
+          repo = "css-eldoc";
+          rev = "c558ac4c470742c98a37290e6b409db28183df30";
+          sha256 = "1mgc6bd0dzrp1dq1yj8m2qxjnpysd8ppdk2yp96d3zd07zllw4rx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/css-eldoc";
+          sha256 = "1f079q3ccrr4drk2hvn4xs4vbrd3hg87xqbk3r9mmjvkagd1v7rf";
+          name = "css-eldoc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/css-eldoc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cssfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cssfmt";
+        version = "20150818.2328";
+        src = fetchFromGitHub {
+          owner = "KeenS";
+          repo = "cssfmt.el";
+          rev = "802c82a1aa8d433ec473e253ae1fa4ecad3fb4b0";
+          sha256 = "0hyf4im7b8zka065daw7yxrb3670dpp8q92vd2gcsva1jla92h9y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cssfmt";
+          sha256 = "12yq4dhyv3p5gxnd2w193ilpj2d3gx5ns09w0z1zkg7ax3a4q4b8";
+          name = "cssfmt";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cssfmt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cssh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cssh";
+        version = "20150810.1209";
+        src = fetchFromGitHub {
+          owner = "dimitri";
+          repo = "cssh";
+          rev = "2fe2754235225a59b63f08b130cfd4352e2e1c3f";
+          sha256 = "1xf2hy077frfz8qf91c0l0qppcjxzr4bsbb622bx6fidqkpa3a1a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cssh";
+          sha256 = "10yvvyzqr06jvijmzis9clb1slzp2mn80yclis8wvrmg4p8djljk";
+          name = "cssh";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cssh";
+          license = lib.licenses.free;
+        };
+      }) {};
+    csv-nav = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "csv-nav";
+        version = "20130407.1320";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/csv-nav.el";
+          sha256 = "15rfg3326xcs3zj3siy9rn7yff101vfch1srskdi2650c3l3krva";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/csv-nav";
+          sha256 = "0626vsm2f5zc2wi5pyx4xrwcr4ai8w9a3l7gi9883smvayr619sj";
+          name = "csv-nav";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/csv-nav";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ctable = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ctable";
+        version = "20140304.1859";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-ctable";
+          rev = "cd673a09a80ce4e9e102ffe2e3d7e6bfb9d652b0";
+          sha256 = "07vasdlai49qs0nsmq2cz1kcq1adqyarv8199imgwwcbh4vn7dqb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctable";
+          sha256 = "040qmlgfvjc1f908n52m5ll2fizbrhjzbd0kgrsw37bvm3029rx1";
+          name = "ctable";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ctable";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ctags = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "ctags";
+        version = "20110911.504";
+        src = fetchhg {
+          url = "https://bitbucket.com/semente/ctags.el";
+          rev = "afb16c5b2530";
+          sha256 = "1xgrb4ivgz7gmingfafmclqqflxdvkarmfkqqv1zjk6yrjhlcvwf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctags";
+          sha256 = "11fp8l99rj4fmi0vd3hkffgpfhk1l82ggglzb74jr3qfzv3dcn6y";
+          name = "ctags";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ctags";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ctags-update = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ctags-update";
+        version = "20150427.2214";
+        src = fetchFromGitHub {
+          owner = "jixiuf";
+          repo = "helm-etags-plus";
+          rev = "eeed834b25a1c084b2c672bf15e4f96ee3df6a4e";
+          sha256 = "1va394nls4yi77rgm0kz5r00xiidj6lwcabhqxisz08m3h8gfkh2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctags-update";
+          sha256 = "1k43l667mvr2y33nblachdlvdqvn256gysc1iwv5zgv7gj9i65qf";
+          name = "ctags-update";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ctags-update";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ctl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ctl-mode";
+        version = "20151202.406";
+        src = fetchFromGitHub {
+          owner = "yyr";
+          repo = "emacs-grads";
+          rev = "1a13051db21b999c7682a015b33a03096ff9d891";
+          sha256 = "1d89gxyzv0z0nk7v1aa4qa0xfms2g2dsrr07cw0d99xsnyxfky31";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctl-mode";
+          sha256 = "0fydq779b0y6hmh8srfdimr5rl9mk3sj08rbvlljxv3kqv5ajczj";
+          name = "ctl-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ctl-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ctxmenu = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, popup, yaxception }:
+    melpaBuild {
+        pname = "ctxmenu";
+        version = "20140303.1542";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "emacs-ctxmenu";
+          rev = "5c2376859562b98c07c985d2b483658e4c0e888e";
+          sha256 = "1jlr2miwqsg06hk2clvsrw9fa98m2n76qfq8qv5svrb8dpil04wb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctxmenu";
+          sha256 = "03g9px858mg19wapqszwav3599slljdyam8bvn1ri85fpa5ydvdp";
+          name = "ctxmenu";
+        };
+        packageRequires = [ log4e popup yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/ctxmenu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cucumber-goto-step = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el }:
+    melpaBuild {
+        pname = "cucumber-goto-step";
+        version = "20131209.2319";
+        src = fetchFromGitHub {
+          owner = "gstamp";
+          repo = "cucumber-goto-step";
+          rev = "f2713ffb26ebe1b757d1f2ea80e900b55e5895aa";
+          sha256 = "184plai32sn0indvi1dma6ykz907zgnrdyxdw6f5mghwca96g5kx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cucumber-goto-step";
+          sha256 = "1ydsd455dvaw6a180b6570bfgg0kxn01sn6cb57smqj835am6gx8";
+          name = "cucumber-goto-step";
+        };
+        packageRequires = [ pcre2el ];
+        meta = {
+          homepage = "http://melpa.org/#/cucumber-goto-step";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cuda-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cuda-mode";
+        version = "20151213.2121";
+        src = fetchFromGitHub {
+          owner = "chachi";
+          repo = "cuda-mode";
+          rev = "9ae9eacfdba3559b5456342d0d03296290df8ff5";
+          sha256 = "1ms0z5zplcbdwwdbgsjsbm32i57z9i2i8j9y3wm0pwzyz4zr36zy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cuda-mode";
+          sha256 = "0ip4vax93x72bjrh6prik6ddmrvszpsmgm0fxfz772rp24smc300";
+          name = "cuda-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cuda-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cursor-chg = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "cursor-chg";
+        version = "20151231.1440";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/cursor-chg.el";
+          sha256 = "1w0msh4mfhwglkwgb8ksqfdzbd1bvspllydnjzhc0yl3s7qrifbd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cursor-chg";
+          sha256 = "0d1ilall8c1y4w014wks9yx4fz743hvx5lc8jqxxlrq7pmqyqdxk";
+          name = "cursor-chg";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cursor-chg";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cursor-test = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cursor-test";
+        version = "20131207.1132";
+        src = fetchFromGitHub {
+          owner = "ainame";
+          repo = "cursor-test.el";
+          rev = "e09956e048b88fd2ee8dd90b5678baed8b04d31b";
+          sha256 = "0wmnhizv4jfcl1w9za4ydxf6xwxgm5vwmn1zi5vn70zmv4d6r49l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cursor-test";
+          sha256 = "1c1d5xq4alamlwyqxjx557aykz5dw87acp0lyglsrzzkdynbwlb1";
+          name = "cursor-test";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/cursor-test";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cus-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "cus-edit-plus";
+        version = "20151231.1441";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/cus-edit+.el";
+          sha256 = "1p0kacbw5zfrd7zplhlh7j1890spvn8p0bryvqqmyf8w5873pcmh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cus-edit+";
+          sha256 = "1kazcdfajcnrzvhsgsmwwx96rkry0dglprrc02hbd7ky1fppp4sz";
+          name = "cus-edit-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cus-edit+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cyberpunk-theme";
+        version = "20151215.1153";
+        src = fetchFromGitHub {
+          owner = "n3mo";
+          repo = "cyberpunk-theme.el";
+          rev = "5fee81bccb07d40ff1d41aa2342ca29639b057b0";
+          sha256 = "1zx93qb83ji2jf3dya9m7prii58aj4y94h10ynldls45cqk3chz4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cyberpunk-theme";
+          sha256 = "0l2bwb5afkkhrbh99v2gns1vil9s5911hbnlq5w35nmg1wvbmbc9";
+          name = "cyberpunk-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cyberpunk-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cycbuf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cycbuf";
+        version = "20131203.1437";
+        src = fetchFromGitHub {
+          owner = "martinp26";
+          repo = "cycbuf";
+          rev = "1079b41c3eb27d65b66d4399959bb6253f84858e";
+          sha256 = "1d5i8sm1xrsp4v4myidfyb40hm3wp7hgva7dizg9gbb7prmn1p5w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cycbuf";
+          sha256 = "0gyj48h5wgjawqq3j4hgk5a8d23nffmhd1q53kg7b9vfsda51hbw";
+          name = "cycbuf";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cycbuf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cycle-resize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cycle-resize";
+        version = "20150602.1423";
+        src = fetchFromGitHub {
+          owner = "pierre-lecocq";
+          repo = "cycle-resize";
+          rev = "1a5ed3ff6f7f5dc097c38b4361708b6882af692c";
+          sha256 = "0hf3r89n9zn7wkay71drxadsnd9zm6p6kvg5mvwzdy3x3z4cfyi3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cycle-resize";
+          sha256 = "0vp57plwqx4nf3pbv5g4frjriq8niiia9xc3bv6c3gzd4a0zm7xi";
+          name = "cycle-resize";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cycle-resize";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cycle-themes = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cycle-themes";
+        version = "20150402.2209";
+        src = fetchFromGitHub {
+          owner = "toroidal-code";
+          repo = "cycle-themes.el";
+          rev = "6e125d11fdbc6b78fc9f219eb2609a5e29815898";
+          sha256 = "125s6vwbb9zpx6h3vrxnn7nr8pb45vhxd70ba2r3f87dlxah93am";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cycle-themes";
+          sha256 = "1whp9q26sgyf59wygbrvdf9gc94bn4dmhr2f2qivpajx550fjfbc";
+          name = "cycle-themes";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/cycle-themes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cygwin-mount = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "cygwin-mount";
+        version = "20131111.1546";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/cygwin-mount.el";
+          sha256 = "09my4gj3qm9rdpk8lg6n6ki8ywj7kwzwd4hhgwascfnfi1hzwdvw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cygwin-mount";
+          sha256 = "0ik2c8ab9bsx58mgcv511p50h45cpv7455n4b0kri83sx9xf5abb";
+          name = "cygwin-mount";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cygwin-mount";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cyphejor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cyphejor";
+        version = "20160106.44";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "cyphejor";
+          rev = "86b53dcc66aa0c10132392161999ae52d76a6fe1";
+          sha256 = "1xcd8j5chh5j3fibi8bg2il6r09vza5xlb5fqm9j8sg3vkab26z8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cyphejor";
+          sha256 = "18l5km4xm5j3vv19k3fxs8i3rg4qnhrvx7b62vmyfcqmpiasrh6g";
+          name = "cyphejor";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/cyphejor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cypher-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cypher-mode";
+        version = "20151110.542";
+        src = fetchFromGitHub {
+          owner = "fxbois";
+          repo = "cypher-mode";
+          rev = "ce8543d7877c736c574a17b49874c9dcdc7a06d6";
+          sha256 = "0vbcq807jpjssabmyjcdkpp6nnx1288is2c6x79dkrviw2xxw3qf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cypher-mode";
+          sha256 = "174rfbm7yzkznkfjmh9bdnm5fgqv9bjwm85h39317pv1g8c3mgv0";
+          name = "cypher-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cypher-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cython-mode";
+        version = "20140705.1429";
+        src = fetchFromGitHub {
+          owner = "cython";
+          repo = "cython";
+          rev = "dace1e6c1475fdd3e5ea9c66b91caf93a8cbd215";
+          sha256 = "0a1r73qf43n9h5r4ikc250588l64z1zvdb3kjmlwzyhlpzszmll5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cython-mode";
+          sha256 = "0asai1f1pncrfxx296fn6ky09hj1qam5j0dpxxkzhy0a34xz0k2i";
+          name = "cython-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cython-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    czech-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "czech-holidays";
+        version = "20160113.1152";
+        src = fetchFromGitHub {
+          owner = "hydandata";
+          repo = "czech-holidays";
+          rev = "d136fa09a152b3cd80db6d55c7b4ddfe07b90fbf";
+          sha256 = "1ck1a61m0kjynqwzbw9hnc7y2a6gd6l1430wm7mw3qqsq959qwm6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/czech-holidays";
+          sha256 = "10c0zscbn7pr9xqdqksy4kh0cxjg9bhw8p4qzlk18fd4c8rhqn84";
+          name = "czech-holidays";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/czech-holidays";
+          license = lib.licenses.free;
+        };
+      }) {};
+    d-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "d-mode";
+        version = "20151206.154";
+        src = fetchFromGitHub {
+          owner = "Emacs-D-Mode-Maintainers";
+          repo = "Emacs-D-Mode";
+          rev = "5501b77a1e212e27dd78e8c0e86424064b439cbb";
+          sha256 = "0fqirypxhbvnhz86rznwdx553ppg0z0hxh1h04qg7y58g01vpsdq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/d-mode";
+          sha256 = "060k9ndjx0n5vlpzfxlv5zxnizx72d7y9vk7gz7gdvpm6w2ha0a2";
+          name = "d-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/d-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dactyl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dactyl-mode";
+        version = "20140906.1225";
+        src = fetchFromGitHub {
+          owner = "luxbock";
+          repo = "dactyl-mode";
+          rev = "cc55fe6b987271d9647492b8df4c812d884f661f";
+          sha256 = "0fp40cyamchc9qq5vbpxgq3yp6vs8p3ncg46mjzr54psy3fc86dm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dactyl-mode";
+          sha256 = "0ppcabddcpwshfd04x42nbrbkagbyi1bg4vslysnlxn4kaxjs7pm";
+          name = "dactyl-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dactyl-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dakrone-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dakrone-theme";
+        version = "20140211.2245";
+        src = fetchFromGitHub {
+          owner = "dakrone";
+          repo = "dakrone-theme";
+          rev = "281ac9f9080a94bf9dada2f40cdba58e50f94235";
+          sha256 = "0fd0h07m42q2h1ggsjra20kzv209rpb4apjv408h2dxqm8sy0jiy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dakrone-theme";
+          sha256 = "0ma4rfmgwd6k24jzn6pgk46b88jfix7mz0ib7c7r90h5vmpiq814";
+          name = "dakrone-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dakrone-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    darcula-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "darcula-theme";
+        version = "20160106.1552";
+        src = fetchFromGitHub {
+          owner = "fommil";
+          repo = "darcula-theme-emacs";
+          rev = "52ab72417b510778946d98d560213ecb5c9ec5cc";
+          sha256 = "1029m6iyg2j6rvjz7kq23zj7fws2j7ilqkicws5wyjcznz0ijan1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/darcula-theme";
+          sha256 = "13d21gwzv66ibn0gs56ff3sn76sa2mkjvjmpd2ncxq3mcgxajnjg";
+          name = "darcula-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/darcula-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dark-krystal-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dark-krystal-theme";
+        version = "20141116.101";
+        src = fetchFromGitHub {
+          owner = "emacsfodder";
+          repo = "emacs-dark-krystal-theme";
+          rev = "bcb3c4ccf17db541e319d60e2eca38a5b22d5664";
+          sha256 = "07w5aycgaps904q8lk52d0g28wxq41c82xgl5mw2q56n3s5iixfx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dark-krystal-theme";
+          sha256 = "056aql35502sgvdpbgphpqdxzbjf4ay01rra6pm11c1dya8avv0j";
+          name = "dark-krystal-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/dark-krystal-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dark-souls = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dark-souls";
+        version = "20140314.628";
+        src = fetchFromGitHub {
+          owner = "tomjakubowski";
+          repo = "dark-souls.el";
+          rev = "94122b1215423e58dcf18584a2bd022029d54d4b";
+          sha256 = "1w0y2j0j9n107dbk7ksr9bipshjfs9dk08qbs9m6h5aqh4hmwa4r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dark-souls";
+          sha256 = "1ilsn657mpl7v8vkbzqf3gp0gmvy0dgynfsn8w4cb49qaiy337xc";
+          name = "dark-souls";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dark-souls";
+          license = lib.licenses.free;
+        };
+      }) {};
+    darkburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "darkburn-theme";
+        version = "20151003.300";
+        src = fetchFromGitHub {
+          owner = "gorauskas";
+          repo = "darkburn-theme";
+          rev = "a0151684ae4fa7c364115188422f6c3425d1594c";
+          sha256 = "19vrxfzhi0sqf7frzjx5z02d65r2jp1w2nhhf0527g7baid5hqvf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/darkburn-theme";
+          sha256 = "18hwdnwmkf640vcyx8d66i424wwazbzjq3k0w0xjmwsn2mpyhm9w";
+          name = "darkburn-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/darkburn-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    darkmine-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "darkmine-theme";
+        version = "20151216.832";
+        src = fetchFromGitHub {
+          owner = "pierre-lecocq";
+          repo = "darkmine-theme";
+          rev = "8cd5ff16bede4c8e1d063bc46fc1089a36a05bd3";
+          sha256 = "0ajxlrnz1228w8ldgraw6a4s605isbr67p8s382jvia2zf821fmp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/darkmine-theme";
+          sha256 = "06vzldyqlmfd11g8dqrqh5x244ikfa20qwpsmbgsiry3041k8iw5";
+          name = "darkmine-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/darkmine-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "darktooth-theme";
+        version = "20151121.1922";
+        src = fetchFromGitHub {
+          owner = "emacsfodder";
+          repo = "emacs-theme-darktooth";
+          rev = "ce2d8d5faeb72205bdcb192dfc1e4769e7088fa3";
+          sha256 = "1p7ih9fmcxnnxkj2mz56xa403m828wyyqvliabf5amklzjlhb3z9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/darktooth-theme";
+          sha256 = "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs";
+          name = "darktooth-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/darktooth-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dart-mode";
+        version = "20150721.1854";
+        src = fetchFromGitHub {
+          owner = "nex3";
+          repo = "dart-mode";
+          rev = "1b7562262c83de94a5118ffc55b495dae8aa7367";
+          sha256 = "1pd7a76znzypwi0khssdlas5kcma8r865d68jmr3n6xvwdmy8dlc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dart-mode";
+          sha256 = "0wxfh8v716dhrmx1klhpnsrlsj66llk8brmwryjg2h7c391sb5ff";
+          name = "dart-mode";
+        };
+        packageRequires = [ cl-lib dash flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/dart-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dash";
+        version = "20151216.1515";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "dash.el";
+          rev = "8a46d3c7c126d3e979f7f9b36867a413694cd8df";
+          sha256 = "1g7vrfhafmkqwdpfllfiwirl4pi437pyaws38jsd8laxmsa4m4wb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dash";
+          sha256 = "0azm47900bk2frpjsgy108fr3p1jk4h9kmp4b5j5pibgsm26azgz";
+          name = "dash";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dash";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dash-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dash-at-point";
+        version = "20140626.235";
+        src = fetchFromGitHub {
+          owner = "stanaka";
+          repo = "dash-at-point";
+          rev = "ed872b4fcbe02ef1a5bac0337afe19a7a747f34c";
+          sha256 = "0zd50sr51mmvndjb9qfc3sn502nhc939rhd454jbkmlrzqsxvphj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dash-at-point";
+          sha256 = "0x4nq42nbh2qgbg111lgbknc7w7m7lxd14mp9s8dcrpwsaxz960m";
+          name = "dash-at-point";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dash-at-point";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dash-functional = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dash-functional";
+        version = "20150828.613";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "dash.el";
+          rev = "8a46d3c7c126d3e979f7f9b36867a413694cd8df";
+          sha256 = "1g7vrfhafmkqwdpfllfiwirl4pi437pyaws38jsd8laxmsa4m4wb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dash-functional";
+          sha256 = "0hx36hs12mf4nmskaaqrqpcgwrfjdqj6qcxn6bwb0s5m2jf9hs8p";
+          name = "dash-functional";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/dash-functional";
+          license = lib.licenses.free;
+        };
+      }) {};
+    date-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "date-at-point";
+        version = "20150108.618";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "date-at-point.el";
+          rev = "65733210479812a70a6dd5978ba0e2a4a6fcd08b";
+          sha256 = "0l4z9rjla4xvm2hmp07xil69q1cg0v8iff0ya41svaqr944qf7hf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/date-at-point";
+          sha256 = "0r26df6px6q5jlxj29nhl3qbp6kzy9hs5vd72kpiirgn4wlmagp0";
+          name = "date-at-point";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/date-at-point";
+          license = lib.licenses.free;
+        };
+      }) {};
+    date-field = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
+    melpaBuild {
+        pname = "date-field";
+        version = "20141128.1905";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "emacs-date-field";
+          rev = "11c9170d1f7b343233f7716d4c0a62be024c1654";
+          sha256 = "1lmwnj2fnvijj9qp4rjggl7c4x91vnpb47rqaam6m2wmr5wbrx3w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/date-field";
+          sha256 = "0fmw13sa4ajs1xkrkdpcjpbp0jl9d81cgvwh93myg8yjjn7wbmvk";
+          name = "date-field";
+        };
+        packageRequires = [ dash log4e yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/date-field";
+          license = lib.licenses.free;
+        };
+      }) {};
+    datomic-snippets = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s, yasnippet }:
+    melpaBuild {
+        pname = "datomic-snippets";
+        version = "20130707.1515";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "datomic-snippets";
+          rev = "7116eac8e15a16fc72973b96fa855fd9784bbbb8";
+          sha256 = "0ry7magy9x63xv2apjbpgszp0slch92g23gqwl4rd564qafajmf0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/datomic-snippets";
+          sha256 = "0lax0pj4k9c9n0gmrvil240pc9p25535q3n5m8nb2ar4sli8dn8r";
+          name = "datomic-snippets";
+        };
+        packageRequires = [ dash s yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/datomic-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dayone = callPackage ({ fetchFromGitHub, fetchurl, ht, lib, melpaBuild, mustache, uuid }:
+    melpaBuild {
+        pname = "dayone";
+        version = "20160105.640";
+        src = fetchFromGitHub {
+          owner = "mori-dev";
+          repo = "emacs-dayone";
+          rev = "ab628274f0806451f23bce16f62a6a11cbf91a2b";
+          sha256 = "1j0mk8vyr6sniliq0ix77jldx8vzl73nd5yhh82klzgyymal58ms";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dayone";
+          sha256 = "0hi09dj00h6g5r84jxglwkgbijhfxknx4mq5gcl5jzjis5affk8l";
+          name = "dayone";
+        };
+        packageRequires = [ ht mustache uuid ];
+        meta = {
+          homepage = "http://melpa.org/#/dayone";
+          license = lib.licenses.free;
+        };
+      }) {};
+    db = callPackage ({ fetchFromGitHub, fetchurl, kv, lib, melpaBuild }:
+    melpaBuild {
+        pname = "db";
+        version = "20140421.1611";
+        src = fetchFromGitHub {
+          owner = "nicferrier";
+          repo = "emacs-db";
+          rev = "b3a423fb8e72f9013009cbe033d654df2ce31438";
+          sha256 = "0syv4kr319d34yqi4q61b8jh5yy22wvd148x1m3pc511znh2ry5k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/db";
+          sha256 = "05jhga9n6gh1bmj8gda14sb703gn7jgjlvy55mlr5kdb2z3rqw1n";
+          name = "db";
+        };
+        packageRequires = [ kv ];
+        meta = {
+          homepage = "http://melpa.org/#/db";
+          license = lib.licenses.free;
+        };
+      }) {};
+    db-pg = callPackage ({ db, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }:
+    melpaBuild {
+        pname = "db-pg";
+        version = "20130131.1302";
+        src = fetchFromGitHub {
+          owner = "nicferrier";
+          repo = "emacs-db-pg";
+          rev = "7d5ab86b74b05fe003b3b434d4835f37f3f3eded";
+          sha256 = "15r0qwjkl33p8kh2k5kxz9wnbkv1k470b1h0i6svvljkx9ynk68a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/db-pg";
+          sha256 = "06nfibw01ijv7nr0m142y80jbbpg9kk1dh19s5wq7i6fqf7g08xg";
+          name = "db-pg";
+        };
+        packageRequires = [ db pg ];
+        meta = {
+          homepage = "http://melpa.org/#/db-pg";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ddskk";
+        version = "20160117.27";
+        src = fetchFromGitHub {
+          owner = "skk-dev";
+          repo = "ddskk";
+          rev = "337b29c3c2cac8920f7066ec457aeb5f62644297";
+          sha256 = "1a42bwarhciccl0yhh9i24bc9f3n5c0wlnwqfcwkb7wzqy9gd55q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ddskk";
+          sha256 = "1wj3z6ldlkaj99xqh7a497in1syn7shf2w1ffcn6aiskxjrzmpiq";
+          name = "ddskk";
+        };
+        packageRequires = [ ccc cdb ];
+        meta = {
+          homepage = "http://melpa.org/#/ddskk";
+          license = lib.licenses.free;
+        };
+      }) {};
+    debpaste = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
+    melpaBuild {
+        pname = "debpaste";
+        version = "20160113.1747";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "debpaste.el";
+          rev = "038f0ff7824f4e3dd455e2232eeca70fa8abcec5";
+          sha256 = "1darxggvyv100cfb7imyzvgif8a09pnky62pf3bl2612hhvaijfb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/debpaste";
+          sha256 = "1vgirfy4vdqkhllnnmcplhwmzqqwca3la5jfvvansykqriwbq9lw";
+          name = "debpaste";
+        };
+        packageRequires = [ xml-rpc ];
+        meta = {
+          homepage = "http://melpa.org/#/debpaste";
+          license = lib.licenses.free;
+        };
+      }) {};
+    debug-print = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "debug-print";
+        version = "20140125.1819";
+        src = fetchFromGitHub {
+          owner = "kenoss";
+          repo = "debug-print";
+          rev = "d817fd9ea2d3f8d2c1ace4d8af155684f3a99dc5";
+          sha256 = "1n99nrp42slmyp5228d1nz174bysjn122jgs8fn1x0qxywg7jyxp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/debug-print";
+          sha256 = "01dsqq2qdsbxny6j9dhvg770493awxjhk1m85c14ysgh6sl199rm";
+          name = "debug-print";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/debug-print";
+          license = lib.licenses.free;
+        };
+      }) {};
+    decl = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "decl";
+        version = "20151231.2223";
+        src = fetchFromGitHub {
+          owner = "preetpalS";
+          repo = "decl.el";
+          rev = "95cea9e09f3ee09a174ef72df025692b6e8a296d";
+          sha256 = "01bafkc99g9vi45y95mi3sqin2lsfw885z63f7llpqvnfav86n4y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/decl";
+          sha256 = "0wdhmp226wmrjvjgpbz8ihvhxxv3rrxh97sdqm3mgsav3n071n6k";
+          name = "decl";
+        };
+        packageRequires = [ cl-lib dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/decl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dedicated = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dedicated";
+        version = "20090428.1431";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "dedicated";
+          rev = "8275fb672f9cc4ba6682ebda0ef91db827e32992";
+          sha256 = "0pba9s0h37sxyqh733vi6k5raa4cs7aradipf3826inw36jcw414";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dedicated";
+          sha256 = "1ka8n02r3nd2ksbid23g2qd6707c7xsjx7lbbdi6pcmwam5mglw9";
+          name = "dedicated";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dedicated";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dedukti-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dedukti-mode";
+        version = "20150820.908";
+        src = fetchFromGitHub {
+          owner = "rafoo";
+          repo = "dedukti-mode";
+          rev = "7d9f459c87c84f1067eb87542da4549de5e38650";
+          sha256 = "1haixiy94r50rfza64dypb7fi256231pf06g6p2il9kyscqg0zz2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dedukti-mode";
+          sha256 = "17adfmrhfks5f45ddr6ygjq870ac50vfzc5872ycv414zg0w4sa9";
+          name = "dedukti-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dedukti-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    default-text-scale = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "default-text-scale";
+        version = "20150227.1156";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "default-text-scale";
+          rev = "c680861a459e5a1b4cea0da1b99d2a22f08fdcd2";
+          sha256 = "1ysv1q7n7k2l4x8x7hlzmxmawyxl5lx627sbdv3phkvjh5zccsm8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/default-text-scale";
+          sha256 = "18r90ic38fnlsbg4gi3r962vban398x2bf3rqhrc6z4jk4aiv3mi";
+          name = "default-text-scale";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/default-text-scale";
+          license = lib.licenses.free;
+        };
+      }) {};
+    deferred = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "deferred";
+        version = "20160109.2246";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-deferred";
+          rev = "8827106c83f0fc773bc406d381ea25a29a5965e1";
+          sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/deferred";
+          sha256 = "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr";
+          name = "deferred";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/deferred";
+          license = lib.licenses.free;
+        };
+      }) {};
+    define-word = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "define-word";
+        version = "20150709.1423";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "define-word";
+          rev = "64d98b7748686c51261fe6e8d42078c6284feb13";
+          sha256 = "02i621yq2ih0zp7mna8iykj41prv77hvcadz7rx8c942zyvjzxqd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/define-word";
+          sha256 = "035fdfwnxw0mir1dyvrimygx2gafcgnvlcsmwmry1rsfh39n5b9a";
+          name = "define-word";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/define-word";
+          license = lib.licenses.free;
+        };
+      }) {};
+    defproject = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "defproject";
+        version = "20151201.1619";
+        src = fetchFromGitHub {
+          owner = "kotfic";
+          repo = "defproject";
+          rev = "674d48a5e34cb4bba76faa38ee901322ec649086";
+          sha256 = "07jzr571q02l0lg5d40rnmzg16hmybi1nkjgslmvlx46z3c4xvyr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/defproject";
+          sha256 = "1gld2fkssrjh4smpp54017549d6aw3n1zisp5s4kkb6cmszwj5gm";
+          name = "defproject";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/defproject";
+          license = lib.licenses.free;
+        };
+      }) {};
+    deft = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "deft";
+        version = "20151222.725";
+        src = fetchgit {
+          url = "git://jblevins.org/git/deft.git";
+          rev = "2dd64ddc798a009e62289d65abfa621735461b7a";
+          sha256 = "15c3ec6fcfae63201652394205fee951f3c1db8d3c6fc5f48c306b9b775c8e63";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/deft";
+          sha256 = "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p";
+          name = "deft";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/deft";
+          license = lib.licenses.free;
+        };
+      }) {};
+    delight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "delight";
+        version = "20141128.837";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/delight.el";
+          sha256 = "1gap2icsqi7cryfvcffh41zqg2ghl4y7kg9pngzdfjrc3m7sf635";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/delight";
+          sha256 = "1d9m5k18k73vhidwd50mcbq7mlvwdn4sb9ih8r5gri9a9whi2nkj";
+          name = "delight";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/delight";
+          license = lib.licenses.free;
+        };
+      }) {};
+    delim-kill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "delim-kill";
+        version = "20100517.120";
+        src = fetchFromGitHub {
+          owner = "thomas11";
+          repo = "delim-kill";
+          rev = "1dbe47344f2d2cbc8c54beedf0cf0bf10fd203c1";
+          sha256 = "06a20sd8nc273azrgha40l1fbqvv9qmxsmkjiqbf6dcf1blkwjyf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/delim-kill";
+          sha256 = "1pplc456771hi52ap1p87y7pabxlvm6raszcxjvnxff3xzw56pig";
+          name = "delim-kill";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/delim-kill";
+          license = lib.licenses.free;
+        };
+      }) {};
+    demangle-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "demangle-mode";
+        version = "20151109.1453";
+        src = fetchFromGitHub {
+          owner = "liblit";
+          repo = "demangle-mode";
+          rev = "07e62a7f976f6c7366b4b0475bbb5cff881452b8";
+          sha256 = "13jfhc9gavvb9dxmgi3k7ivp5iwh4yw4m11r2s8wpwn6p056bmfl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/demangle-mode";
+          sha256 = "0ky0bb6rc99vrdli4lhs656qjndnla9b7inc2ji9l4n1zki5qxzk";
+          name = "demangle-mode";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/demangle-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    demo-it = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "demo-it";
+        version = "20160116.2141";
+        src = fetchFromGitHub {
+          owner = "howardabrams";
+          repo = "demo-it";
+          rev = "ca0e5b93d104d31152da13ee4c8d4d48c910a29f";
+          sha256 = "1hdnjwsmwbwn0ziyw805jjpaj3zpm374g9y4yn5ip4l9x4vq73xv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/demo-it";
+          sha256 = "063v115xy9mcga4qv16v538k12rn9maz92khzwa35wx56bwz4gg7";
+          name = "demo-it";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/demo-it";
+          license = lib.licenses.free;
+        };
+      }) {};
+    describe-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yabin }:
+    melpaBuild {
+        pname = "describe-number";
+        version = "20151031.1955";
+        src = fetchFromGitHub {
+          owner = "netromdk";
+          repo = "describe-number";
+          rev = "40618345a37831804b29589849a785ef5aa5ac24";
+          sha256 = "13fasbhdjwc4jh3cy25gm5sbbg56hq8la271098qpx6dhqm2wycq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/describe-number";
+          sha256 = "0gvriailni2ppz69g0bwnb1ik1ghjkj341k45vllz30j0frp9iji";
+          name = "describe-number";
+        };
+        packageRequires = [ yabin ];
+        meta = {
+          homepage = "http://melpa.org/#/describe-number";
+          license = lib.licenses.free;
+        };
+      }) {};
+    desktop-plus = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "desktop-plus";
+        version = "20151004.1440";
+        src = fetchFromGitHub {
+          owner = "ffevotte";
+          repo = "desktop-plus";
+          rev = "8ef242d0aa6f715ff4c5abbc4ee6be66a90ffedd";
+          sha256 = "18k5898r4n96h93xsvjrpm90hz3rd0ir6x3axjzqwwrgs2ik7pj2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/desktop+";
+          sha256 = "0w7i6k4814hwb19l7ly9yq59674xiw57ylrwxq7yprwx52sgs2r8";
+          name = "desktop-plus";
+        };
+        packageRequires = [ dash emacs f ];
+        meta = {
+          homepage = "http://melpa.org/#/desktop+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    desktop-registry = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "desktop-registry";
+        version = "20140119.1543";
+        src = fetchgit {
+          url = "git://ryuslash.org/desktop-registry.git";
+          rev = "244c2e7f9f0a1050aa8a47ad0b38f4e4584682dd";
+          sha256 = "7c7727dd1d63be98e428700bfe340f2c4e7ff713fcc9b2b743a3366d786ae02d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/desktop-registry";
+          sha256 = "02mj0nlawx6vpksqsvp1q7l8rd6b1bs8f9c8c2rmda46jaf5npyr";
+          name = "desktop-registry";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/desktop-registry";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dic-lookup-w3m = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild, stem, w3m }:
+    melpaBuild {
+        pname = "dic-lookup-w3m";
+        version = "20140513.1941";
+        src = fetchsvn {
+          url = "http://svn.sourceforge.jp/svnroot/dic-lookup-w3m/";
+          rev = "79";
+          sha256 = "0lg6i9vw6xsnaamfjczz0cr41vlv1bs03h8c8y2jxpdkgaab31nc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dic-lookup-w3m";
+          sha256 = "0myv7sns9ajyr7fzn6kd8a64pfapjdksgby5ilh9mr99imm8dcfv";
+          name = "dic-lookup-w3m";
+        };
+        packageRequires = [ stem w3m ];
+        meta = {
+          homepage = "http://melpa.org/#/dic-lookup-w3m";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dictcc = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "dictcc";
+        version = "20151221.557";
+        src = fetchFromGitHub {
+          owner = "cqql";
+          repo = "dictcc.el";
+          rev = "1fd76499cf5d2045e8594aec3c0b62168802f887";
+          sha256 = "0b8yg03h5arfl5rlzlg2a6q7nhx452mdyngizjzxlvkmrqnlra4v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dictcc";
+          sha256 = "0x1y742hb3dm7xmh5810dlqki38kybw68rmg9adcchm2rn86jqlm";
+          name = "dictcc";
+        };
+        packageRequires = [ cl-lib dash emacs helm s ];
+        meta = {
+          homepage = "http://melpa.org/#/dictcc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dictionary = callPackage ({ connection, fetchFromGitHub, fetchurl, lib, link, melpaBuild }:
+    melpaBuild {
+        pname = "dictionary";
+        version = "20140717.2229";
+        src = fetchFromGitHub {
+          owner = "myrkr";
+          repo = "dictionary-el";
+          rev = "a23b8f4a422d0de69a006ed010eff5795319db98";
+          sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dictionary";
+          sha256 = "0zr9sm5rmr0frxdr0za72wiffip9391fn9dm5y5x0aj1z4c1n28w";
+          name = "dictionary";
+        };
+        packageRequires = [ connection link ];
+        meta = {
+          homepage = "http://melpa.org/#/dictionary";
+          license = lib.licenses.free;
+        };
+      }) {};
+    diff-hl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "diff-hl";
+        version = "20160114.1759";
+        src = fetchFromGitHub {
+          owner = "dgutov";
+          repo = "diff-hl";
+          rev = "167a2dd16bbf963773c9198b391921ce05324fc8";
+          sha256 = "020dhrdy375w4myinhm6hs391r9bsmxcndrlzj8hp8qqa2ilk5w7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/diff-hl";
+          sha256 = "0kw0v9xcqidhf26qzrqwdlav2zhq32xx91k7akd2536jpji5pbn6";
+          name = "diff-hl";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/diff-hl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    diffscuss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "diffscuss-mode";
+        version = "20141014.1857";
+        src = fetchFromGitHub {
+          owner = "hut8labs";
+          repo = "diffscuss";
+          rev = "e0aacd8b3d9f886f27222c1397f0655e849e0af7";
+          sha256 = "14ccak3cmv36pd085188lypal9gd3flyikcrxn0wi6hn60w2dgvr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/diffscuss-mode";
+          sha256 = "06jd7wh4yzryz0yjwa4a0xddz7srl5mif8ff1wvcpxsb66m2zbvh";
+          name = "diffscuss-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/diffscuss-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    diffview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "diffview";
+        version = "20150929.11";
+        src = fetchFromGitHub {
+          owner = "mgalgs";
+          repo = "diffview-mode";
+          rev = "031b70913e755c5e55222680f80185032a7d1728";
+          sha256 = "0diw887x4q7kbgdvxbbnxdw51z33kqwxw3v9m45fczxbywyi4cxf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/diffview";
+          sha256 = "0vlzmykvxjwjww313brl1nr13kz41jypsk0s3l8q3rbsnkpfic5k";
+          name = "diffview";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/diffview";
+          license = lib.licenses.free;
+        };
+      }) {};
+    digistar-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "digistar-mode";
+        version = "20150402.1922";
+        src = fetchFromGitHub {
+          owner = "retroj";
+          repo = "digistar-mode";
+          rev = "fcc0447b9ad97ac76f86de7485e0947440966d3f";
+          sha256 = "0rjqfpya6wkf8nv00q2d40fcnssnsr3p07j9blbpcrqalkdm27ds";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/digistar-mode";
+          sha256 = "0khzxlrm09h31i1nqz6rnzhrdssb3kppc4klpxza612l306fih0s";
+          name = "digistar-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/digistar-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dim = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dim";
+        version = "20151226.315";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "dim.el";
+          rev = "78eaf6dda704f7abbb3257021938b732006922eb";
+          sha256 = "17jfmgyras32w9xr8fldqj924bijgng4bjg9fy6ckwb3mgihyil8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dim";
+          sha256 = "0gsyily47g3g55qmhp1wzfz319l1pkgjz4lbigafjzlzqxyclz52";
+          name = "dim";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/dim";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dim-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dim-autoload";
+        version = "20150815.1032";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "dim-autoload";
+          rev = "d68ef0d2f9204ffe0d521e2647e6d8f473588fd3";
+          sha256 = "0bw1gkaycbbv2glnaa36gwzkl1l6lsq7i2i7jinka92b27zvrans";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dim-autoload";
+          sha256 = "0lhzzjrgfvbqnzwhjywrk3skdb7x10xdq7d21q6kdk3h5r0np9f9";
+          name = "dim-autoload";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dim-autoload";
+          license = lib.licenses.free;
+        };
+      }) {};
+    diminish = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "diminish";
+        version = "20151215.1115";
+        src = fetchFromGitHub {
+          owner = "myrjola";
+          repo = "diminish.el";
+          rev = "826e19186bef91d2241739cb8b48b8cfba14c17a";
+          sha256 = "04vfc5zgcjp0pax5zk1x98ivx5g349c5g3748lb9pgsijqaprgg4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/diminish";
+          sha256 = "1h6a31jllypk47akjflz89xk6h47na96pim17d6g4rpqcafc2k43";
+          name = "diminish";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/diminish";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dionysos = callPackage ({ alert, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild, pkg-info, s }:
+    melpaBuild {
+        pname = "dionysos";
+        version = "20151013.303";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "dionysos";
+          rev = "98907a38e98ff1b02171a1ad8df246a291e04750";
+          sha256 = "1ldqxdwy6r0fd2vh0ckkhgpincvybghavi8c7vvyd24j91i57y2f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dionysos";
+          sha256 = "1wjgj74dnlwd79gc3l7ymbx75jka8rw9smzbb10dsfppw3rrzfmz";
+          name = "dionysos";
+        };
+        packageRequires = [ alert cl-lib dash libmpdee pkg-info s ];
+        meta = {
+          homepage = "http://melpa.org/#/dionysos";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dircmp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dircmp";
+        version = "20141204.1156";
+        src = fetchFromGitHub {
+          owner = "matthewlmcclure";
+          repo = "dircmp-mode";
+          rev = "558ee0b601c2de9d247612085aafe2926f56a09f";
+          sha256 = "0mcsfsybpsxhzkd2m9bzc0np49azm6qf5x4x9h9lbxc8vfgh4z8s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dircmp";
+          sha256 = "0cnj7b0s8vc83sh9sai1cldw54krk5qbz1qmlvvd1whryf2pc95c";
+          name = "dircmp";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dircmp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-avfs = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-avfs";
+        version = "20141203.932";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "dired-hacks";
+          rev = "1e174c9d53a8d65bd927334aaaf4d47e1bf34c72";
+          sha256 = "1n138flpqqgr64iyzdi8xhnz03kpczcprnmnir48jnpb90cir7bj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-avfs";
+          sha256 = "1q42pvrpmd525887iicd3m5gw4w2a78xb72v7fjfl30ay1kir4bm";
+          name = "dired-avfs";
+        };
+        packageRequires = [ dash dired-hacks-utils ];
+        meta = {
+          homepage = "http://melpa.org/#/dired-avfs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-details = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "dired-details";
+        version = "20130824.658";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/dired-details.el";
+          sha256 = "1ddrhj1kw0wl7jbs9jn067vfffsvqhz4izfw9f7ihxz34fdl2iza";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-details";
+          sha256 = "1390vl3i4qbnl7lbia98wznhf6x887d24f8p7146fpqjsiwbm5ck";
+          name = "dired-details";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dired-details";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-details-plus = callPackage ({ dired-details, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-details-plus";
+        version = "20151231.1450";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/dired-details+.el";
+          sha256 = "07z4h5l8763ks6b6m8dcmq78jiyq4xvan1mb0z8fbasmi1bsrya4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-details+";
+          sha256 = "1gzr3z4nyzip299z08mignhigxr7drak7rv9z6gmdjrika9a29lx";
+          name = "dired-details-plus";
+        };
+        packageRequires = [ dired-details ];
+        meta = {
+          homepage = "http://melpa.org/#/dired-details+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-dups = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-dups";
+        version = "20130527.1625";
+        src = fetchFromGitHub {
+          owner = "vapniks";
+          repo = "dired-dups";
+          rev = "694ad128c822c59348ced16c4a0c1356d43da47a";
+          sha256 = "1lcmpzwj43gix2q56bh2gw3gfqh8vl5j3mqr8s7v3k0aw816j0ni";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-dups";
+          sha256 = "05s02gw8b339yvsr7vvka1r2140y7mbjzs8px4kn4acgb5y7rk71";
+          name = "dired-dups";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dired-dups";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-efap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-efap";
+        version = "20140122.1056";
+        src = fetchFromGitHub {
+          owner = "juan-leon";
+          repo = "dired-efap";
+          rev = "624757b2e54d9a13e2183118d6c113e37684b90c";
+          sha256 = "0jj9da880b4zwxba140fldai1x9p2sxc6hdf3wz6lnbvz1pyn1mv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-efap";
+          sha256 = "01j5v6584qi8ia7zmk03kx3i3kmm6hn6ycfgqlh5va6lp2h9sr00";
+          name = "dired-efap";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dired-efap";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-fdclone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-fdclone";
+        version = "20150417.332";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "dired-fdclone.el";
+          rev = "e9bf4f16248cb5d187a323b7887d236a4a203c59";
+          sha256 = "1lnqjkbzryv655n16xj1c5bxck2jb5ccy8yckz1wp5yikkr06ba8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-fdclone";
+          sha256 = "11aikq2q3m9h4zpgl24f8npvpwd98jgh8ygjwy2x5q8as8i89vf9";
+          name = "dired-fdclone";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dired-fdclone";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-filetype-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-filetype-face";
+        version = "20151216.2057";
+        src = fetchFromGitHub {
+          owner = "jixiuf";
+          repo = "dired-filetype-face";
+          rev = "c51bb2d5fba8964b86e63242c247c4688441b9db";
+          sha256 = "0v6n4ymlnphzmqaqlfbxvf24dh1pa0xy37xhz9xfjkk02l02wsgf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-filetype-face";
+          sha256 = "1g9wzkkqmlkxlxwx43446q9mlam035zwq0wzpf7m6394rw2xlwx6";
+          name = "dired-filetype-face";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dired-filetype-face";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-filter = callPackage ({ cl-lib ? null, dash, dired-hacks-utils, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-filter";
+        version = "20160117.930";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "dired-hacks";
+          rev = "1e174c9d53a8d65bd927334aaaf4d47e1bf34c72";
+          sha256 = "1n138flpqqgr64iyzdi8xhnz03kpczcprnmnir48jnpb90cir7bj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-filter";
+          sha256 = "1mw94210i57wrqfyif6rh689xbwbpv1qp6bgc0j7z6g4xypvd52p";
+          name = "dired-filter";
+        };
+        packageRequires = [ cl-lib dash dired-hacks-utils f ];
+        meta = {
+          homepage = "http://melpa.org/#/dired-filter";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-hacks-utils = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-hacks-utils";
+        version = "20150819.1148";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "dired-hacks";
+          rev = "1e174c9d53a8d65bd927334aaaf4d47e1bf34c72";
+          sha256 = "1n138flpqqgr64iyzdi8xhnz03kpczcprnmnir48jnpb90cir7bj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-hacks-utils";
+          sha256 = "1vgl0wqf7gc2nbiqjn0rkrdlnxfm3wrgspx5b3cixv2n8rqx8kyi";
+          name = "dired-hacks-utils";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/dired-hacks-utils";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-imenu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-imenu";
+        version = "20140109.1010";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "dired-imenu";
+          rev = "610e21fe0988c85931d34894d3eee2442c79ab0a";
+          sha256 = "088h9yn6wndq4pq6f7q4iz17f9f4ci29z9nh595idljp3vwr7qid";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-imenu";
+          sha256 = "09yix4fkr03jq6j2rmvyg6gkmcnraw49a8m9649r3m525qdnhxs1";
+          name = "dired-imenu";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dired-imenu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-k = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-k";
+        version = "20151107.2036";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-dired-k";
+          rev = "4c5ae87f0198eaa4789a1fe85e9ef7cf5a8633e7";
+          sha256 = "13xpbbdd190lklz8jmj8nw8qm414kpkij9wrd7a9ws9j1jzj8x6s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-k";
+          sha256 = "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8";
+          name = "dired-k";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/dired-k";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-narrow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-narrow";
+        version = "20160103.622";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "dired-hacks";
+          rev = "1e174c9d53a8d65bd927334aaaf4d47e1bf34c72";
+          sha256 = "1n138flpqqgr64iyzdi8xhnz03kpczcprnmnir48jnpb90cir7bj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-narrow";
+          sha256 = "1rgqiscbizalh78jwc53zbj599dd13a6vzdgf75vzllc1w7jsg6d";
+          name = "dired-narrow";
+        };
+        packageRequires = [ dash dired-hacks-utils ];
+        meta = {
+          homepage = "http://melpa.org/#/dired-narrow";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-open = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-open";
+        version = "20150819.1148";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "dired-hacks";
+          rev = "1e174c9d53a8d65bd927334aaaf4d47e1bf34c72";
+          sha256 = "1n138flpqqgr64iyzdi8xhnz03kpczcprnmnir48jnpb90cir7bj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-open";
+          sha256 = "0a4ksz2jkva4gvhprywjc1fzrbf95xdk8gn25nv1h1c1ckhr91qx";
+          name = "dired-open";
+        };
+        packageRequires = [ dash dired-hacks-utils ];
+        meta = {
+          homepage = "http://melpa.org/#/dired-open";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "dired-plus";
+        version = "20151231.1449";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/dired+.el";
+          sha256 = "0d92kx5rr899cjpr280fwcisxlivq2jx1sm5w11mg82qmpsf31nx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired+";
+          sha256 = "1dmp6wcynran03nsa0fd26b9q0zj9wp8ngaafx1i1ybwn2gx32g5";
+          name = "dired-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dired+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-rainbow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-rainbow";
+        version = "20141214.743";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "dired-hacks";
+          rev = "1e174c9d53a8d65bd927334aaaf4d47e1bf34c72";
+          sha256 = "1n138flpqqgr64iyzdi8xhnz03kpczcprnmnir48jnpb90cir7bj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-rainbow";
+          sha256 = "1b9yh8p2x1dg7dyqhjhnqqiiymyl6bwsam65j0lpvbdx8r4iw882";
+          name = "dired-rainbow";
+        };
+        packageRequires = [ dash dired-hacks-utils ];
+        meta = {
+          homepage = "http://melpa.org/#/dired-rainbow";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-ranger = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-ranger";
+        version = "20150819.1148";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "dired-hacks";
+          rev = "1e174c9d53a8d65bd927334aaaf4d47e1bf34c72";
+          sha256 = "1n138flpqqgr64iyzdi8xhnz03kpczcprnmnir48jnpb90cir7bj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-ranger";
+          sha256 = "19lbbzqflqda5b0alqfzdhpbgqssghqb4n4viq8x4l1fac8mby6h";
+          name = "dired-ranger";
+        };
+        packageRequires = [ dash dired-hacks-utils ];
+        meta = {
+          homepage = "http://melpa.org/#/dired-ranger";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-single = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-single";
+        version = "20151230.1958";
+        src = fetchFromGitHub {
+          owner = "crocket";
+          repo = "dired-single";
+          rev = "71ffc5decd048d3c420d9cdd5ac66e72ca18e934";
+          sha256 = "01xvaqckyr31ywsn1fp9sz9wq4h4dd1hgghfqypc9s4akrxmgnf2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-single";
+          sha256 = "13h8dsn7bkz8ji2rrb7vyrqb2znxarpiynqi65mfli7dn5k086vf";
+          name = "dired-single";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dired-single";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-sort = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "dired-sort";
+        version = "20090208.2238";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/dired-sort.el";
+          sha256 = "1dpxkxxfs14sdm3hwxv0j26lq0qzx4gryw42vrcdi680aj24962z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-sort";
+          sha256 = "1dzy2601yikmmbfqivf9s5xi4vd1f5g3c53f8rc74kfnxr1qn59x";
+          name = "dired-sort";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dired-sort";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-sort-menu = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "dired-sort-menu";
+        version = "20130824.707";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/dired-sort-menu.el";
+          sha256 = "1i42r7j1c8677qf79ig33bia24d2yvcj26y92migfvrlbi03w4qi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-sort-menu";
+          sha256 = "0n7zh8s3vdw3pcax8wkas9rykf917wn2dzikdlyrl5bbil9ijblb";
+          name = "dired-sort-menu";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dired-sort-menu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-sort-menu-plus = callPackage ({ dired-sort-menu, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-sort-menu-plus";
+        version = "20151231.1451";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/dired-sort-menu+.el";
+          sha256 = "1hjci4zfzig04ji1jravxg9n67rdr4wyhmxmahbrzq9kjnql510i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-sort-menu+";
+          sha256 = "19ah8qgbfdvyhfszdr6hlw8l01lbdb84vf5snldw8qh3x6lw8cfq";
+          name = "dired-sort-menu-plus";
+        };
+        packageRequires = [ dired-sort-menu ];
+        meta = {
+          homepage = "http://melpa.org/#/dired-sort-menu+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-subtree = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-subtree";
+        version = "20150908.1233";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "dired-hacks";
+          rev = "1e174c9d53a8d65bd927334aaaf4d47e1bf34c72";
+          sha256 = "1n138flpqqgr64iyzdi8xhnz03kpczcprnmnir48jnpb90cir7bj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-subtree";
+          sha256 = "1vqcnkh3g6dwi2hwfkb534q0j19pkqzqk3yb7ah8ck4z4ln4ppfk";
+          name = "dired-subtree";
+        };
+        packageRequires = [ dash dired-hacks-utils ];
+        meta = {
+          homepage = "http://melpa.org/#/dired-subtree";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-toggle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-toggle";
+        version = "20140907.1549";
+        src = fetchFromGitHub {
+          owner = "fasheng";
+          repo = "dired-toggle";
+          rev = "84efb9ec9c327e4da53cdb7cda5b51dcd0ede0e5";
+          sha256 = "1yx20h16hc1b04knsqhrxni0j8qgwnq7i5b0dlggq3dakcvqfxma";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-toggle";
+          sha256 = "18v571kp440n5g1d7pj86rr8dgbbm324f9vblkdbdvn13c5dczf5";
+          name = "dired-toggle";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dired-toggle";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-toggle-sudo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-toggle-sudo";
+        version = "20151109.406";
+        src = fetchFromGitHub {
+          owner = "renard";
+          repo = "dired-toggle-sudo";
+          rev = "02449dbda4e168f99fe5352c9628df5d39e11483";
+          sha256 = "0ajj8d6k5in2hclcrqckinfh80ylddplva0ryfbkzsjkfq167cv2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-toggle-sudo";
+          sha256 = "0fy05af9aq9791ij4j9pscdk5j44pbg0kmhpqli41qiazjw7v2va";
+          name = "dired-toggle-sudo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dired-toggle-sudo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    diredful = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "diredful";
+        version = "20151118.1500";
+        src = fetchFromGitHub {
+          owner = "thamer";
+          repo = "diredful";
+          rev = "e814fa3ffc7ec7b2455112c3d98e905674a6006b";
+          sha256 = "1rx7vq6yl83fbmb76sczbb1bv972s4cyg160sm2yap1i6nzhd10p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/diredful";
+          sha256 = "0y8x6q1yfsk0srxsh4g5nbsms1g9pk9d103jx7cfdac79mcigw7x";
+          name = "diredful";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/diredful";
+          license = lib.licenses.free;
+        };
+      }) {};
+    direx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "direx";
+        version = "20151023.1806";
+        src = fetchFromGitHub {
+          owner = "m2ym";
+          repo = "direx-el";
+          rev = "9497231cf50767987494718db073731b05a4f970";
+          sha256 = "0mis3m6lg3vlvp8qm8iajprgx3pm3gcbhdszsm9mvrcgkahdjqnr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/direx";
+          sha256 = "1x3rnrhhyrrvgry9n7kc0734la1zp4gc4bpy50f2qpfd452jwqdm";
+          name = "direx";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/direx";
+          license = lib.licenses.free;
+        };
+      }) {};
+    direx-grep = callPackage ({ direx, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "direx-grep";
+        version = "20140515.1006";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "direx-grep";
+          rev = "1109a512a80b2673a70b18b8568514049017faad";
+          sha256 = "0swdh0qynpijsv6a2d308i42hfa0jwqsnmf4sm8vrhaf3vv25f5h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/direx-grep";
+          sha256 = "0y2wrzq06prm55akwgaqjg56znknyvbayav13asirqzg258skvm2";
+          name = "direx-grep";
+        };
+        packageRequires = [ direx ];
+        meta = {
+          homepage = "http://melpa.org/#/direx-grep";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dirtree = callPackage ({ fetchurl, lib, melpaBuild, tree-mode, windata }:
+    melpaBuild {
+        pname = "dirtree";
+        version = "20140129.232";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/dirtree.el";
+          sha256 = "1q03q4j0wkbg9p2nzf1kb7l517b21mskp2v52i95jbxh09igbjjx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dirtree";
+          sha256 = "0wfz9ks5iha2n0rya9yjmrb6f9lhp620iaqi92lw9smm7w83zj29";
+          name = "dirtree";
+        };
+        packageRequires = [ tree-mode windata ];
+        meta = {
+          homepage = "http://melpa.org/#/dirtree";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dirtree-prosjekt = callPackage ({ dirtree, fetchFromGitHub, fetchurl, lib, melpaBuild, prosjekt }:
+    melpaBuild {
+        pname = "dirtree-prosjekt";
+        version = "20140129.304";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "prosjekt";
+          rev = "a864a8be5842223043702395f311e3350c28e9db";
+          sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dirtree-prosjekt";
+          sha256 = "0pyb6c0gvc16z5rc5h0kpl8021hz2hzv86cmjsd20gbhz7imrqwk";
+          name = "dirtree-prosjekt";
+        };
+        packageRequires = [ dirtree prosjekt ];
+        meta = {
+          homepage = "http://melpa.org/#/dirtree-prosjekt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    disaster = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "disaster";
+        version = "20130509.1255";
+        src = fetchFromGitHub {
+          owner = "jart";
+          repo = "disaster";
+          rev = "8d8fc67af5b3d876b0056562ece0478e6e2367f0";
+          sha256 = "1srlz63pncxndh1kmb6dl5sxaanspxa444wg998dld3dkdflwavq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/disaster";
+          sha256 = "1ad8q81n0s13cwmm216wqx3s92195pda1amc4wxvpb3lq7dbd3yn";
+          name = "disaster";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/disaster";
+          license = lib.licenses.free;
+        };
+      }) {};
+    discover = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }:
+    melpaBuild {
+        pname = "discover";
+        version = "20140103.1539";
+        src = fetchFromGitHub {
+          owner = "mickeynp";
+          repo = "discover.el";
+          rev = "7b0044bbb3b3bd5d811fdfb0f5ac6ec8de1239df";
+          sha256 = "0f7h2rhh37lrs6xclj182li6s1fawv5m8w3hgy6qgm06dam45lka";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/discover";
+          sha256 = "1hf57p90jn1zzhjl63zv9ascbgkcbr0p0zmd3fvzpjsw84235dga";
+          name = "discover";
+        };
+        packageRequires = [ makey ];
+        meta = {
+          homepage = "http://melpa.org/#/discover";
+          license = lib.licenses.free;
+        };
+      }) {};
+    discover-clj-refactor = callPackage ({ clj-refactor, discover, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "discover-clj-refactor";
+        version = "20150328.959";
+        src = fetchFromGitHub {
+          owner = "maio";
+          repo = "discover-clj-refactor.el";
+          rev = "3fbd5c1162739e606d7cf5d4f5d7426547d99647";
+          sha256 = "0l2g58f55p8zmzv2q2hf163ggm9p0wk8hg93wlkyldrgyb94dgf4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/discover-clj-refactor";
+          sha256 = "08bz60fxcgzab77690mmv0f7wdxcpygmasazcss427k37z9ysm7r";
+          name = "discover-clj-refactor";
+        };
+        packageRequires = [ clj-refactor discover ];
+        meta = {
+          homepage = "http://melpa.org/#/discover-clj-refactor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    discover-js2-refactor = callPackage ({ discover, fetchFromGitHub, fetchurl, js2-refactor, lib, melpaBuild }:
+    melpaBuild {
+        pname = "discover-js2-refactor";
+        version = "20140129.952";
+        src = fetchFromGitHub {
+          owner = "NicolasPetton";
+          repo = "discover-js2-refactor";
+          rev = "3812abf61f39f3e73a9f3daefa6fed4f21a429ba";
+          sha256 = "1vnbn4asz3lifscvy4shzisl6r0gkgq0qsa3kpgif3853wcd2rvn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/discover-js2-refactor";
+          sha256 = "139zq66cpcn4dnidf22h7x88p812ywrrz4c3c62w3915b75f71ki";
+          name = "discover-js2-refactor";
+        };
+        packageRequires = [ discover js2-refactor ];
+        meta = {
+          homepage = "http://melpa.org/#/discover-js2-refactor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    discover-my-major = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }:
+    melpaBuild {
+        pname = "discover-my-major";
+        version = "20160108.1241";
+        src = fetchFromGitHub {
+          owner = "steckerhalter";
+          repo = "discover-my-major";
+          rev = "af36998444ac6844ba85f72abbc8575040cb4cc2";
+          sha256 = "0b73nc4jkf9bggnlp0l34jfcgx91vxbpavz6bpnf5rjvm0v1bil9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/discover-my-major";
+          sha256 = "0ch2y4grdjp7pvw2kxqnqdl7jd3q609n3pm3r0gn6k0xmcw85fgg";
+          name = "discover-my-major";
+        };
+        packageRequires = [ makey ];
+        meta = {
+          homepage = "http://melpa.org/#/discover-my-major";
+          license = lib.licenses.free;
+        };
+      }) {};
+    disk = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "disk";
+        version = "20081128.906";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/disk.el";
+          sha256 = "1c0pgqvl1z2f5hprszln53pn2v2pqy110r3wx3g84v71w6378bbv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/disk";
+          sha256 = "0bij9gr4zv6jmc6dwsy3lb06vsxvmyzl8xrm8wzasxisk1qd2l6n";
+          name = "disk";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/disk";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dispass = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dispass";
+        version = "20140202.931";
+        src = fetchFromGitHub {
+          owner = "ryuslash";
+          repo = "dispass.el";
+          rev = "b6e8f89040ebaaf0e7609b04bc27a8979f0ae861";
+          sha256 = "075gj81rnhrvv061wnldixpfmlsyfbnvacnk107z6f9v3m2m3vl1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dispass";
+          sha256 = "08c1s4zgl4rha10mva48cfkxzrqnpdhy03pxq51ihw94v6vxzg3z";
+          name = "dispass";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/dispass";
+          license = lib.licenses.free;
+        };
+      }) {};
+    display-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "display-theme";
+        version = "20140115.956";
+        src = fetchFromGitHub {
+          owner = "kawabata";
+          repo = "emacs-display-theme";
+          rev = "b180b3be7a74ae4799a14e7e4bc2fe10e3ff7a15";
+          sha256 = "0r560bpgw5p2pfcgkgcrlpp1bprv1f23dl4y5fjk06dg93fgaysa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/display-theme";
+          sha256 = "07nqscmfa6iykll1m6gyiqca1g5ncx3rx468iyf2ahygpvqvnbxa";
+          name = "display-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/display-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    distinguished-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "distinguished-theme";
+        version = "20151216.1415";
+        src = fetchFromGitHub {
+          owner = "Lokaltog";
+          repo = "distinguished-theme";
+          rev = "9b1d25ac59465a5016d187ea84b7614c95a29b3b";
+          sha256 = "03d8zb2is7n2y2z0k6j37cijjc3ndgasxsm9gqyq7drlq9bqwzsm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/distinguished-theme";
+          sha256 = "0h03aqgijrmisbgqga42zlb5yz4x3jn9jgr29rq8canyhayr3rk4";
+          name = "distinguished-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/distinguished-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dizzee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dizzee";
+        version = "20111009.816";
+        src = fetchFromGitHub {
+          owner = "davidmiller";
+          repo = "dizzee";
+          rev = "37629f390afb8da03ef0ce81c2b3caff660e12f6";
+          sha256 = "120zgp38nz4ssid6bv0zy5rnf2claa5s880incgljqyl0vmj9nq5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dizzee";
+          sha256 = "1axydags80jkyhpzp3m4gyplwr9k3a13w6vmrrzcv161nln7jhhs";
+          name = "dizzee";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dizzee";
+          license = lib.licenses.free;
+        };
+      }) {};
+    django-manage = callPackage ({ fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
+    melpaBuild {
+        pname = "django-manage";
+        version = "20151025.130";
+        src = fetchFromGitHub {
+          owner = "gopar";
+          repo = "django-manage";
+          rev = "91ce758c830f06b33b7d04cc66dd5ec131bd4398";
+          sha256 = "15i25zh54b2fqji0qmkg502051ymccih6pgqnzq02c43dpnsqhqv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/django-manage";
+          sha256 = "0j95g7fps28xhlrikkg61xgpbpf52xb56swmns2qdib6x1xzd6rh";
+          name = "django-manage";
+        };
+        packageRequires = [ hydra ];
+        meta = {
+          homepage = "http://melpa.org/#/django-manage";
+          license = lib.licenses.free;
+        };
+      }) {};
+    django-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "django-mode";
+        version = "20150207.717";
+        src = fetchFromGitHub {
+          owner = "myfreeweb";
+          repo = "django-mode";
+          rev = "3d82a62a7faeb2c124ac4c109e075f581c175508";
+          sha256 = "0dw0m77w7kdwxxh53b4k15jjkpfl5vha17hw9dn29ap77pf820va";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/django-mode";
+          sha256 = "1rdkzqvicjpfh9k66m31ky6jshx9fqw7pza7add36bk6xg8lbara";
+          name = "django-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/django-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    django-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "django-snippets";
+        version = "20131229.1011";
+        src = fetchFromGitHub {
+          owner = "myfreeweb";
+          repo = "django-mode";
+          rev = "3d82a62a7faeb2c124ac4c109e075f581c175508";
+          sha256 = "0dw0m77w7kdwxxh53b4k15jjkpfl5vha17hw9dn29ap77pf820va";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/django-snippets";
+          sha256 = "1qs9fw104kidbr5zbxc1q71yy033nq3wxh98vvzk4z4fppnd29sw";
+          name = "django-snippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/django-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    django-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "django-theme";
+        version = "20131022.402";
+        src = fetchFromGitHub {
+          owner = "andrzejsliwa";
+          repo = "django-theme.el";
+          rev = "86c8142b3eb1addd94a43aa6f1d98dab06401af0";
+          sha256 = "1azf4p6salga7269l0kf13bqlxf9idp0ys8mm20qpyjpj79p5g9w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/django-theme";
+          sha256 = "1rydl857zfpbvd7aziz6h7n3rrh584z2cbfxlss3wgfclzmbyhgf";
+          name = "django-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/django-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dkdo = callPackage ({ dkmisc, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dkdo";
+        version = "20131110.519";
+        src = fetchFromGitHub {
+          owner = "davidkeegan";
+          repo = "dkdo";
+          rev = "fd6bb105e8331fafb6385c5238c988c4c5bbe2da";
+          sha256 = "1nbvdnw9g3zbbb0n2sn2kxfzs5wichhl9qid3qjp8dsiq1wpv459";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dkdo";
+          sha256 = "0p7ybgldjs046jrkkbpli1iicfmblpxfz9lql8m8sz7lpjn7h300";
+          name = "dkdo";
+        };
+        packageRequires = [ dkmisc emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/dkdo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dklrt = callPackage ({ dkmisc, emacs, fetchFromGitHub, fetchurl, ledger-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dklrt";
+        version = "20131110.741";
+        src = fetchFromGitHub {
+          owner = "davidkeegan";
+          repo = "dklrt";
+          rev = "5d6c99f8018335256ab934b4c1049708ae2d48ba";
+          sha256 = "063nnln5m42qf190vr2z0ibacyn7n0xkxm3v5vaa4gxdvdwzhshs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dklrt";
+          sha256 = "11ss5x9sxgxp1wx2r1m0vsp5z5qm8m4ww20ybr6bqjw0a1gax561";
+          name = "dklrt";
+        };
+        packageRequires = [ dkmisc emacs ledger-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/dklrt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dkmisc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dkmisc";
+        version = "20131110.515";
+        src = fetchFromGitHub {
+          owner = "davidkeegan";
+          repo = "dkmisc";
+          rev = "fe3d49c6f8322b6f89466361acd97585bdfe0608";
+          sha256 = "1nz71g8pb19aqjcb4s94hhn6j30cc04q05kmwvcbxpjb11qqrv49";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dkmisc";
+          sha256 = "0nnbl272hldcmhyj47r463yvj7b06rjdkpkl5xk0gw9ikyja7w0z";
+          name = "dkmisc";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/dkmisc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dmenu = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dmenu";
+        version = "20151220.702";
+        src = fetchFromGitHub {
+          owner = "lujun9972";
+          repo = "el-dmenu";
+          rev = "b9be62dc33b59fdd34b449699801c1772af84284";
+          sha256 = "0spj80vq6m2kqbdy6y1vh9fzwqyqkij30457d2n39kjn2gzbyar8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dmenu";
+          sha256 = "1w1pgaj2yasfhsd1ibvrwy11ykq8v17h913g298h3ycsvqv8gic0";
+          name = "dmenu";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/dmenu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dna-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dna-mode";
+        version = "20130821.1305";
+        src = fetchFromGitHub {
+          owner = "jhgorrell";
+          repo = "dna-mode-el";
+          rev = "c3fed6b9d98deafbc1525d445a920b969120fe6a";
+          sha256 = "0z28j7x7wgkc1cg1q1kz1lhdx1v1n6s88ixgkm8hn458h9bfnr3n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dna-mode";
+          sha256 = "0ak3g152q3xxkiz1a4pl5y2vgbigbbmbc95fggirbcrh52zkzgk9";
+          name = "dna-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dna-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    docbook-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "docbook-snippets";
+        version = "20150714.1125";
+        src = fetchFromGitHub {
+          owner = "jhradilek";
+          repo = "emacs-docbook-snippets";
+          rev = "b06297fdec039a541aaa6312cb328a11062cfab4";
+          sha256 = "1nbm3wzd12rsrhnwlcc6b72b1ala328mfpcp5bwlfcdshw6mfcrq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/docbook-snippets";
+          sha256 = "1ipqfylgiw9iyjc1nckbay890clfkhda81nr00cq06sjmm71iniq";
+          name = "docbook-snippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/docbook-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    docean = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "docean";
+        version = "20150927.1318";
+        src = fetchFromGitHub {
+          owner = "emacs-pe";
+          repo = "docean.el";
+          rev = "dcc296782b08531b768d3cf851cc7959ec486bf1";
+          sha256 = "055kr0qknjgnjs7dn6gdmahrdbs8piwldbz7vg1hgq3b046x8lky";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/docean";
+          sha256 = "1mqmn2i9axnv5vnkg9gwfdjpzr6gxx4ia9mcdpm200ix297dg7x9";
+          name = "docean";
+        };
+        packageRequires = [ cl-lib emacs request ];
+        meta = {
+          homepage = "http://melpa.org/#/docean";
+          license = lib.licenses.free;
+        };
+      }) {};
+    docker = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, s }:
+    melpaBuild {
+        pname = "docker";
+        version = "20151126.413";
+        src = fetchFromGitHub {
+          owner = "Silex";
+          repo = "docker.el";
+          rev = "c6abb2fceaaab92a722eade09306643dae3b5f1a";
+          sha256 = "12n63z4kkgfzkc2xji1z0k924af0v633qhvrr0rm83db9hz9j318";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/docker";
+          sha256 = "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk";
+          name = "docker";
+        };
+        packageRequires = [ dash emacs magit-popup s ];
+        meta = {
+          homepage = "http://melpa.org/#/docker";
+          license = lib.licenses.free;
+        };
+      }) {};
+    docker-tramp = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "docker-tramp";
+        version = "20160113.2152";
+        src = fetchFromGitHub {
+          owner = "emacs-pe";
+          repo = "docker-tramp.el";
+          rev = "769a5c87bfe16549ebc981e3bd85806290f55e7a";
+          sha256 = "0bvnvs17cbisymiqp96q4y2w2jqy5hd0zyk6rv7mihr9p97ak9kv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/docker-tramp";
+          sha256 = "19kky80qm68n2izpjfyiy4gjywav7ljcmp101kmziklpqdldgh1w";
+          name = "docker-tramp";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/docker-tramp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dockerfile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dockerfile-mode";
+        version = "20151123.1057";
+        src = fetchFromGitHub {
+          owner = "spotify";
+          repo = "dockerfile-mode";
+          rev = "40be396417535c6721c1b13ca9f99c46192f1d73";
+          sha256 = "08pd42vv2c3l19nfib1hd7i7sy9dqwar1wfrvsnm5dkxcwlsm99j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dockerfile-mode";
+          sha256 = "1dxvzn35a9qd3x8pjvrvb2g71yf84404g6vz81y0p353rf2zknpa";
+          name = "dockerfile-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dockerfile-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dokuwiki-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dokuwiki-mode";
+        version = "20140130.1136";
+        src = fetchFromGitHub {
+          owner = "kbkbkbkb1";
+          repo = "emacs-dokuwiki-mode";
+          rev = "e0cecc9551f490318e7a23ed9e0a3082c7196bc7";
+          sha256 = "104nnvp2mhsm9iwnya6k9s6mlgcg47ndshppnz0hbh556pcdyagr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dokuwiki-mode";
+          sha256 = "0q5ybyj35dyh8k0nfvbglsq3ad2apc8cdijw4wqczc5180fckgy9";
+          name = "dokuwiki-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dokuwiki-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dollaro = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "dollaro";
+        version = "20151123.702";
+        src = fetchFromGitHub {
+          owner = "laynor";
+          repo = "dollaro";
+          rev = "500127f0172ac7a1eec627e026b59136580a74ac";
+          sha256 = "1xyqsnymgdd8ic3az2lgwv7s7vld6d4pcycb234bxm4in9fixgdj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dollaro";
+          sha256 = "06kaqzb0nh8sndhk7p5n4acn5nc27dyxw3ldgcbp81wj6ipii26h";
+          name = "dollaro";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "http://melpa.org/#/dollaro";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dom";
+        version = "20150414.1810";
+        src = fetchFromGitHub {
+          owner = "toroidal-code";
+          repo = "dom.el";
+          rev = "19a3cadd02ef2cafc258b7ddb1f1609eec894ed6";
+          sha256 = "165d22qkkdxd8zsbln0991r5n7aklz92f2snf6d8578flkqvdmm2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dom";
+          sha256 = "0cpd12vhshlk2v3w42n769gc0b3rsqc8wb7g84846v9r05ypinj2";
+          name = "dom";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/dom";
+          license = lib.licenses.free;
+        };
+      }) {};
+    doremi = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "doremi";
+        version = "20151231.1455";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/doremi.el";
+          sha256 = "0201clwq9nbl8336lddcbwah8d6xipr7q8135yq79szfxq2bdg6v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/doremi";
+          sha256 = "11i4cdxgrspx44p44zz5py89ypji5li6p5w77wy0b07i8a5gq2gb";
+          name = "doremi";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/doremi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    doremi-cmd = callPackage ({ doremi, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "doremi-cmd";
+        version = "20151231.1452";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/doremi-cmd.el";
+          sha256 = "1m7jn80apya6s9d8phd859rq1m13xf2wz9664pqpr1p65yz2pyvl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/doremi-cmd";
+          sha256 = "1qzspirn1abqps0dn5z8w6ymffc6b02dyki5hr8v74wfs8fhzx05";
+          name = "doremi-cmd";
+        };
+        packageRequires = [ doremi ];
+        meta = {
+          homepage = "http://melpa.org/#/doremi-cmd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    doremi-frm = callPackage ({ doremi, faces-plus, fetchurl, frame-fns, hexrgb, lib, melpaBuild }:
+    melpaBuild {
+        pname = "doremi-frm";
+        version = "20151231.1453";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/doremi-frm.el";
+          sha256 = "0v7ycmddh1ds64m1y5yai5nh34bd32q3wcm5y2pdzhj6jk7nj5wz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/doremi-frm";
+          sha256 = "1rj3p665q32acsxxwygv1j5nbmjqrhi0b4glzrk88xki4lyz0ihz";
+          name = "doremi-frm";
+        };
+        packageRequires = [ doremi faces-plus frame-fns hexrgb ];
+        meta = {
+          homepage = "http://melpa.org/#/doremi-frm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    doremi-mac = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "doremi-mac";
+        version = "20151231.1454";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/doremi-mac.el";
+          sha256 = "157kvlb4dqiyk1h7b4p0dhrr6crdakwnrxydyl6yh51w2hdnnigw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/doremi-mac";
+          sha256 = "0n9fffgxnpqc7cch7aci5kxbwzk36iljdz2r8gcp5y5n1p7aamls";
+          name = "doremi-mac";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/doremi-mac";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dos = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "dos";
+        version = "20140808.1635";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/dos.el";
+          sha256 = "0sfmcd1rq6wih9q7d9vkcfrw6gf7309mm7491jx091ij8m4p8ypp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dos";
+          sha256 = "0cpijbqpci96s0d6rwqz5bbi9b0zkan1bg8vdgib1f87r7g980nc";
+          name = "dos";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dos";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dot-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "dot-mode";
+        version = "20151029.855";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/dot-mode.el";
+          sha256 = "0xhbzq3yvfvvvl6mfihrzkd3pn5p5yxvbcyf2jhsppk7lscifsgk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dot-mode";
+          sha256 = "1fik32635caq3r5f9k62qbj2dkwczz2z1v28mc7bcj7jv2p93nvh";
+          name = "dot-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dot-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    download-region = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "download-region";
+        version = "20150807.232";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "download-region";
+          rev = "51fc808e10803f695ea3d24c22e1af27e080903d";
+          sha256 = "0gc7z5ribp5yvadclq07l731m65pja00wgch4bgxsihiy7wvwknr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/download-region";
+          sha256 = "1mrl2x6j708nchyh9y5avbf2cq10kpnhfj553l6akarvl5n5pvkl";
+          name = "download-region";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/download-region";
+          license = lib.licenses.free;
+        };
+      }) {};
+    downplay-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "downplay-mode";
+        version = "20151125.1409";
+        src = fetchFromGitHub {
+          owner = "tobias";
+          repo = "downplay-mode";
+          rev = "4a2c3addc73c8ca3816345c3c11c08af265baedb";
+          sha256 = "0s7swvfd7h8r0n3cjmkps6ary9vwg61jylfm4qrkp3idsz6is548";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/downplay-mode";
+          sha256 = "1v6nga101ljzza8qj3lkmkzzl0vvzj4lsh1m69698s8prnczxr9b";
+          name = "downplay-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/downplay-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dpaste = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dpaste";
+        version = "20150528.800";
+        src = fetchFromGitHub {
+          owner = "gregnewman";
+          repo = "dpaste.el";
+          rev = "d073030e6b7feae84f0e2118e5fc454833848629";
+          sha256 = "11s4vxr6waswyx4lz3q70s8xdz0v7354sn0pfwj42mmww4pzkizs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dpaste";
+          sha256 = "17mrdkldv4gfwm6ggc047l4a69xg2fy9f9mjbphkjl0p5nr6b4kz";
+          name = "dpaste";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dpaste";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dpaste_de = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web }:
+    melpaBuild {
+        pname = "dpaste_de";
+        version = "20131015.725";
+        src = fetchFromGitHub {
+          owner = "theju";
+          repo = "dpaste_de.el";
+          rev = "f0c39e8864299f735642f7d9fa490689398ce39d";
+          sha256 = "1avpg0cgzk8d6g1q0ryx41lkcdgkm0mkzr5xr32xm28dzrfmgd4z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dpaste_de";
+          sha256 = "0dql9qsl5gj51i3l2grl7nhw0ign8h4xa4jnhwn196j71c0rdwwp";
+          name = "dpaste_de";
+        };
+        packageRequires = [ web ];
+        meta = {
+          homepage = "http://melpa.org/#/dpaste_de";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dracula-theme";
+        version = "20151109.1045";
+        src = fetchFromGitHub {
+          owner = "zenorocha";
+          repo = "dracula-theme";
+          rev = "ee065fed126eecdfe33a1a578d9f1e20687d2f3a";
+          sha256 = "1x7hyj5qi9f222zwhwjqr98zzcvqjqfwxlglph8nsbadkv4s8c3v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dracula-theme";
+          sha256 = "0ayv00wvajia8kbfrqkrkpb3qp3k70qcnqkav7am16p5kbvzp10r";
+          name = "dracula-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/dracula-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    draft-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "draft-mode";
+        version = "20140609.956";
+        src = fetchFromGitHub {
+          owner = "gaudecker";
+          repo = "draft-mode";
+          rev = "4779fb32daf53746459da2def7e08004492d4f18";
+          sha256 = "0z3w58zplm5ks195zfsaq8kwbc944p3kbzs702jgz02wcrm4c28y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/draft-mode";
+          sha256 = "1wg9cx39f4dhrykb4zx4fh0x5cfrh5aicwwfh1h3yzpc4zlr7xfh";
+          name = "draft-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/draft-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    drag-stuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "drag-stuff";
+        version = "20150717.732";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "drag-stuff";
+          rev = "0d7e28bf234037380dbcb24b9175b96ae34ef8fb";
+          sha256 = "08kkiqhfy1i6j9156gbl85jvyj592vd08qy24ng2dj0prjvap8w1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/drag-stuff";
+          sha256 = "0hzbh58ijv1akamav8r0zs76pwda2zd9mjaj31ffalzhhsm5jnyc";
+          name = "drag-stuff";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/drag-stuff";
+          license = lib.licenses.free;
+        };
+      }) {};
+    drawille = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "drawille";
+        version = "20160114.607";
+        src = fetchFromGitHub {
+          owner = "sshbio";
+          repo = "drawille";
+          rev = "79ba6bf4f7e4a98063afbac47034a3248535e1d6";
+          sha256 = "1yvg3w9gm5vs26qhw3xb72v9fgdhqq9w5pksiz2gj5m19l81irar";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/drawille";
+          sha256 = "01rl21hbj3hwy072yr27jl6iql331v131d3mr9zifg9v6f3jqbil";
+          name = "drawille";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/drawille";
+          license = lib.licenses.free;
+        };
+      }) {};
+    drill-instructor-AZIK-force = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "drill-instructor-AZIK-force";
+        version = "20151122.2314";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "drill-instructor-AZIK-force.el";
+          rev = "008cea202dc31d7d6fb1e7d8e6334d516403b7a5";
+          sha256 = "0lzq0mkhhj3s5yrcbs576qxkd8h0m2ikc4iplk97ddpzh4nz4127";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/drill-instructor-AZIK-force";
+          sha256 = "1bb698r11m58csd2rm17fmiw691p25npphzqgjiiqbn4vx35ja7f";
+          name = "drill-instructor-AZIK-force";
+        };
+        packageRequires = [ popup ];
+        meta = {
+          homepage = "http://melpa.org/#/drill-instructor-AZIK-force";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dropbox = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, oauth }:
+    melpaBuild {
+        pname = "dropbox";
+        version = "20130513.1737";
+        src = fetchFromGitHub {
+          owner = "pavpanchekha";
+          repo = "dropbox.el";
+          rev = "fb71a2787030f911b569426596c081a89241056e";
+          sha256 = "1s4cz5s0mw733ak9ps62fs150y3psqmb6v5s6s88jjfsi0r03c0s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dropbox";
+          sha256 = "0ak6g2d2sq026ml6cmn6v1qz7sczkplgv2j9zq9zgzafihyyzs5f";
+          name = "dropbox";
+        };
+        packageRequires = [ json oauth ];
+        meta = {
+          homepage = "http://melpa.org/#/dropbox";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dropdown-list = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "dropdown-list";
+        version = "20120329.1136";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/dropdown-list.el";
+          sha256 = "1szy46sk3nvlbb3yzk1s983281kkf507xr3fkclkki3d3x31n08a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dropdown-list";
+          sha256 = "14i9w897gnb3mvnkbzhzij04bgr551r8km310mbrmzzag54w077z";
+          name = "dropdown-list";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dropdown-list";
+          license = lib.licenses.free;
+        };
+      }) {};
+    drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }:
+    melpaBuild {
+        pname = "drupal-mode";
+        version = "20150830.1427";
+        src = fetchFromGitHub {
+          owner = "arnested";
+          repo = "drupal-mode";
+          rev = "b4a66092bddc471884b2746d69fd7e8853b4b79f";
+          sha256 = "0am3n25qcfjkqfp4wjj1d2zigrmi8hg7p5sy2h91zg3blypqmpsr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/drupal-mode";
+          sha256 = "14jvk4phq3wcff3yvhygix0c9cpbphh0dvm961i93jpsx7g9awgn";
+          name = "drupal-mode";
+        };
+        packageRequires = [ php-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/drupal-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    drupal-spell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "drupal-spell";
+        version = "20130520.1155";
+        src = fetchFromGitHub {
+          owner = "arnested";
+          repo = "drupal-spell";
+          rev = "a69f5e3b62c4c0da74ce26c1d00d5b8f7395e4ae";
+          sha256 = "156cscpavrp695lp8pgjg5jnq3b8n9c2h8qg8w89dd4vfkc3iikd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/drupal-spell";
+          sha256 = "117rr2bfnc99g3qsr127grxwaqp54cxjaj3nl2nr6z78nja0fij3";
+          name = "drupal-spell";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/drupal-spell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dsvn = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "dsvn";
+        version = "20130120.1457";
+        src = fetchsvn {
+          url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
+          rev = "1725340";
+          sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dsvn";
+          sha256 = "12cviq6v08anif762a5qav3l8ircp81kmnl9q4yl6bkh9zxv7vy6";
+          name = "dsvn";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dsvn";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dtrace-script-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dtrace-script-mode";
+        version = "20150214.23";
+        src = fetchFromGitHub {
+          owner = "dotemacs";
+          repo = "dtrace-script-mode";
+          rev = "801af1ef16075d31a19830ebb8404bbf3a322f10";
+          sha256 = "1blfx3r2xd3idbfjrx44ma3x1d83xp67il2s2bmdwa8qz92z99lf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dtrace-script-mode";
+          sha256 = "0v29rzlyccrc37052w2qmvjaii84jihhp736l807b0hjjfryras4";
+          name = "dtrace-script-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dtrace-script-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dtrt-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dtrt-indent";
+        version = "20151013.414";
+        src = fetchFromGitHub {
+          owner = "jscheid";
+          repo = "dtrt-indent";
+          rev = "7f212888fbacc262080ab2740eda673b376c6b7b";
+          sha256 = "0x8c3h3jvyn2462r0sagz63vv9pr5ivfzkshr69603ibyfgqxxkp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dtrt-indent";
+          sha256 = "1npn2jngy1wq0jpwmg1hkn8lx6ncbqsi587jl38lyp2xwchshfk5";
+          name = "dtrt-indent";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dtrt-indent";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dts-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dts-mode";
+        version = "20150403.1804";
+        src = fetchFromGitHub {
+          owner = "bgamari";
+          repo = "dts-mode";
+          rev = "6ec1443ead16105234765f9b48df9b4aca562e61";
+          sha256 = "0cafvhbpfqd8ajqg2757fs64kryrl2ckvbp5abldb4y8fa14pb9l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dts-mode";
+          sha256 = "1k8cbiayajbzwkm0s0kyin0qpq9yhymidz0srs4hbvsnb6hvp234";
+          name = "dts-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dts-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ducpel = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ducpel";
+        version = "20140419.16";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "ducpel";
+          rev = "4a1671fc45ab92d44dee85a1a223122d5a43cb32";
+          sha256 = "1ixb78dv66lmqlbv4zl5ysvv1xqafvqh1h5cfdv03jdkqlfk34jz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ducpel";
+          sha256 = "1cqrkgg7n9bhjswnpl7yc6w6yjs4gfbliaqsimmf9z43wk2ml4pc";
+          name = "ducpel";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/ducpel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dummy-h-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "dummy-h-mode";
+        version = "20140816.733";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/dummy-h-mode.el";
+          sha256 = "0zq94x4br3sk6n4chrfnw7hpnsicxa02fcpk8hw1hfsaq3327n6v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dummy-h-mode";
+          sha256 = "1h2pm37y9kz62id0rm0zzgh1hpkhd9gvq95kjd29w0awsp9b6ca4";
+          name = "dummy-h-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dummy-h-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dummyparens = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dummyparens";
+        version = "20141009.524";
+        src = fetchFromGitHub {
+          owner = "snosov1";
+          repo = "dummyparens";
+          rev = "9798ef1d0eaa24e4fe66f8aa6022a8c62714cc89";
+          sha256 = "0g72nnz0j6dvllyxyrw20z1vg6p7sy46yy0fq017pa77sgqm0xzh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dummyparens";
+          sha256 = "1yah8kpqkk9ygm73iy51fzwc8q5nw0xlwqir2qld1fc5y1lkb7dk";
+          name = "dummyparens";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dummyparens";
+          license = lib.licenses.free;
+        };
+      }) {};
+    duplicate-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "duplicate-thing";
+        version = "20120515.1148";
+        src = fetchFromGitHub {
+          owner = "ongaeshi";
+          repo = "duplicate-thing";
+          rev = "f6ed0232fd0653621afe450d53775a32a9d0e328";
+          sha256 = "1qaiwm8mf4656gc1pdj8ivgy4abkjsypr52pvf4nrdkkln9qzfli";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/duplicate-thing";
+          sha256 = "1jx2b6h23dj561xhizzbpxp3av69ic8zdw4kkf0py1jm3gnrmlm4";
+          name = "duplicate-thing";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/duplicate-thing";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dyalog-mode";
+        version = "20151111.854";
+        src = fetchhg {
+          url = "https://bitbucket.com/harsman/dyalog-mode";
+          rev = "ce795beb8747";
+          sha256 = "0ghxnzi2iy1g633fshl9wdpg2asrcl0v5rkk61gqd6axm7fjaxcj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dyalog-mode";
+          sha256 = "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq";
+          name = "dyalog-mode";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/dyalog-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dylan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dylan-mode";
+        version = "20140611.37";
+        src = fetchFromGitHub {
+          owner = "dylan-lang";
+          repo = "dylan-mode";
+          rev = "2a5b8a65a3e3e9543e935dceea1a121e69e78c8e";
+          sha256 = "011423kvbfcd7jifg9425j89hlzmnw4j751s4mdz9wyr979k19ny";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dylan-mode";
+          sha256 = "0kimvz8vmcvgxi0wvf7dqv6plj31xlksmvgip8h3bhyy7slxj3yy";
+          name = "dylan-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dylan-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dynamic-fonts = callPackage ({ fetchFromGitHub, fetchurl, font-utils, lib, melpaBuild, pcache, persistent-soft }:
+    melpaBuild {
+        pname = "dynamic-fonts";
+        version = "20140731.726";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "dynamic-fonts";
+          rev = "ab0c65accbdb59acaed5b263327e22ec019b3e82";
+          sha256 = "150dj1g49q9x9zx9wkymq30l5gc8c4mhsq91fm6q0yj6ip7hlfxh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dynamic-fonts";
+          sha256 = "0a210ca41maa755lv1n7hhpxp0f7lfxrxbi0x34icbkfkmijhl6q";
+          name = "dynamic-fonts";
+        };
+        packageRequires = [ font-utils pcache persistent-soft ];
+        meta = {
+          homepage = "http://melpa.org/#/dynamic-fonts";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dynamic-ruler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dynamic-ruler";
+        version = "20150826.1609";
+        src = fetchFromGitHub {
+          owner = "rocher";
+          repo = "dynamic-ruler";
+          rev = "06318152d6831b1b0cfd814b4f4150a00b47ef67";
+          sha256 = "1jsjk4fkisgprn2w1d1385kbc9w1bd707biapd1y453k20q5c4h5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dynamic-ruler";
+          sha256 = "13jc3xbsyc3apkdfy0iafmsfvgqs0zfa5w8jxp7zj4dhb7pxpnmc";
+          name = "dynamic-ruler";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dynamic-ruler";
+          license = lib.licenses.free;
+        };
+      }) {};
+    e2ansi = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "e2ansi";
+        version = "20150220.1713";
+        src = fetchFromGitHub {
+          owner = "Lindydancer";
+          repo = "e2ansi";
+          rev = "bd047d3d6ad02a0679582d5786afe9aee656da90";
+          sha256 = "0d18kdpw4zfbq4bkqh19cf42xlinxqa71lr2d994phaxqxqq195w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2ansi";
+          sha256 = "0ns1sldipx5kyqpi0bw79kdmhi1ry5glwxfzfx8r01hbbkf0cc94";
+          name = "e2ansi";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/e2ansi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    e2wm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, window-layout }:
+    melpaBuild {
+        pname = "e2wm";
+        version = "20150608.1923";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-window-manager";
+          rev = "71543ce4502bdb09c888e24b3a80e47786785b88";
+          sha256 = "1lx0c7s810x6prf7x1lnx412gll8nn8gqpmi56n319n406cxhnhw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm";
+          sha256 = "0dp360jr3fgxqywkp7g88cp02g37kw2hdsc0f70hjak9n3sy03la";
+          name = "e2wm";
+        };
+        packageRequires = [ window-layout ];
+        meta = {
+          homepage = "http://melpa.org/#/e2wm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    e2wm-R = callPackage ({ e2wm, ess, fetchFromGitHub, fetchurl, inlineR, lib, melpaBuild }:
+    melpaBuild {
+        pname = "e2wm-R";
+        version = "20151230.326";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "e2wm-R.el";
+          rev = "4350601ee1a96bf89777b3f09f1b79b88e2e6e4d";
+          sha256 = "1g77gf24abwcvf7z52vs762s6jp978pnvza8zmzwkwfvp1mkx233";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-R";
+          sha256 = "09v4fz178lch4d6m801ipclfxm2qrap5601aysnzyvc2apvyr3sh";
+          name = "e2wm-R";
+        };
+        packageRequires = [ e2wm ess inlineR ];
+        meta = {
+          homepage = "http://melpa.org/#/e2wm-R";
+          license = lib.licenses.free;
+        };
+      }) {};
+    e2wm-bookmark = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "e2wm-bookmark";
+        version = "20151122.2321";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "e2wm-bookmark.el";
+          rev = "bad816b6d8049984d69bcd277b7d325fb84d55eb";
+          sha256 = "121vd44f42bxqvdjswmjlghf1jalbs974b6cip2i049k1n08xgh0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-bookmark";
+          sha256 = "1myaqxzrgff5gxcn3zn1bsmyf5122ql1mwr05wamd450lq8nmbw5";
+          name = "e2wm-bookmark";
+        };
+        packageRequires = [ e2wm ];
+        meta = {
+          homepage = "http://melpa.org/#/e2wm-bookmark";
+          license = lib.licenses.free;
+        };
+      }) {};
+    e2wm-direx = callPackage ({ direx, e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "e2wm-direx";
+        version = "20140815.1813";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "e2wm-direx";
+          rev = "f319625b56c44e601af7c17fc6dbb88e5d70ebae";
+          sha256 = "09i7d2rc9zd4s3nqrhd3ggs1ykdpxf0pyhxixxw2xy0q6nbswjia";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-direx";
+          sha256 = "0nv8aciq0swxi9ahwc2pvk9c7i3rmlp7vrzqcan58ml0i3nm17wg";
+          name = "e2wm-direx";
+        };
+        packageRequires = [ direx e2wm ];
+        meta = {
+          homepage = "http://melpa.org/#/e2wm-direx";
+          license = lib.licenses.free;
+        };
+      }) {};
+    e2wm-pkgex4pl = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild, plsense-direx }:
+    melpaBuild {
+        pname = "e2wm-pkgex4pl";
+        version = "20140525.547";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "e2wm-pkgex4pl";
+          rev = "7ea994450727190c4f3cb46cb429ba41b692ecc0";
+          sha256 = "1vrlfzy1wynm7x4m7pl8vim7ykqd6qkcilwz7sjc1lbckz11ig0d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-pkgex4pl";
+          sha256 = "0hgdbqfw3015fr929m36kfiqqzsid6afs3222iqq0apg7gfj7jil";
+          name = "e2wm-pkgex4pl";
+        };
+        packageRequires = [ e2wm plsense-direx ];
+        meta = {
+          homepage = "http://melpa.org/#/e2wm-pkgex4pl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    e2wm-svg-clock = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild, svg-clock }:
+    melpaBuild {
+        pname = "e2wm-svg-clock";
+        version = "20150106.706";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "e2wm-svg-clock.el";
+          rev = "d425925e3afffcbe2ff74edc80b714e4319d4c94";
+          sha256 = "0h1fnlpvy2mqfxjv64znghmiadh9qimj9q9a60cxhyc0bq0prz6f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-svg-clock";
+          sha256 = "0q02lksrbn43s8d9rzpglqybalglpi6qi9lix0cllag6i7fzcbms";
+          name = "e2wm-svg-clock";
+        };
+        packageRequires = [ e2wm svg-clock ];
+        meta = {
+          homepage = "http://melpa.org/#/e2wm-svg-clock";
+          license = lib.licenses.free;
+        };
+      }) {};
+    e2wm-sww = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "e2wm-sww";
+        version = "20140524.358";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "e2wm-sww";
+          rev = "1063f9854bd34db5ac771cd1036cecc89834729d";
+          sha256 = "0mz43mwcgyc1c9p9b7nflnjxdxjm2nxbhl0scj6llzphikicr35g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-sww";
+          sha256 = "0x45j62cjivf9v7jp1b41yya3f9akp92md6cbv0v7bwz98g2vsk8";
+          name = "e2wm-sww";
+        };
+        packageRequires = [ e2wm ];
+        meta = {
+          homepage = "http://melpa.org/#/e2wm-sww";
+          license = lib.licenses.free;
+        };
+      }) {};
+    e2wm-term = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
+    melpaBuild {
+        pname = "e2wm-term";
+        version = "20141009.808";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "e2wm-term";
+          rev = "65b5ac88043d5c4048920a048f3599904ca55981";
+          sha256 = "0qv3kh6q3q7vgfsd8x25x8agi3fp96dkpjnxdidkwk6k8h9n0jzw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-term";
+          sha256 = "0wrq06yap80a96l9l0hs7x7rng7sx6vi1hz778kknb6il4f2f45g";
+          name = "e2wm-term";
+        };
+        packageRequires = [ e2wm log4e yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/e2wm-term";
+          license = lib.licenses.free;
+        };
+      }) {};
+    easy-after-load = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "easy-after-load";
+        version = "20121224.2049";
+        src = fetchFromGitHub {
+          owner = "pd";
+          repo = "easy-after-load";
+          rev = "f8e6e10725d80d3b7e8b1ca966de6190089d8f12";
+          sha256 = "09ikwg5s42b50lfj0796pa2h32larkf5j6cy042dzh8c441vgih4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-after-load";
+          sha256 = "1mn4hpx82nifphzx71yw3rbixbgis8bhvl3iyxcgcd88n5hqwvys";
+          name = "easy-after-load";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/easy-after-load";
+          license = lib.licenses.free;
+        };
+      }) {};
+    easy-escape = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "easy-escape";
+        version = "20150718.2133";
+        src = fetchFromGitHub {
+          owner = "cpitclaudel";
+          repo = "easy-escape";
+          rev = "c87d76e5001f36fbbf975e9ce7e776acd2dd7776";
+          sha256 = "1qn0givyh07w41sv5xayfzlwbpbq7p39wbhmwsgffgfqzzz5r2ys";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-escape";
+          sha256 = "1zspb79x6s151wwiian45j1nh0xps8y8yd98byyn5lbwbj2pp2gk";
+          name = "easy-escape";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/easy-escape";
+          license = lib.licenses.free;
+        };
+      }) {};
+    easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "easy-kill";
+        version = "20151031.29";
+        src = fetchFromGitHub {
+          owner = "leoliu";
+          repo = "easy-kill";
+          rev = "e2b667f651a3531164d24ea4cbcd8c34fba0e17f";
+          sha256 = "0i2plbvaalapx3svryn5lrc68m0qj1xm0z577xxzq7i9z91nanq7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-kill";
+          sha256 = "10jcv7a4vcnaj3wkabip2xwzcwlmvdlqkl409a9lnzfasxcpf32i";
+          name = "easy-kill";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/easy-kill";
+          license = lib.licenses.free;
+        };
+      }) {};
+    easy-kill-extras = callPackage ({ easy-kill, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "easy-kill-extras";
+        version = "20151209.2117";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "easy-kill-extras.el";
+          rev = "aff957b4fd699331d21648780b2f0f6ffc3cb70b";
+          sha256 = "18fn9qnm0cwdy47nv6wafiy6cf7rnv4av4w8zmjwjj0n8ql4jl08";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-kill-extras";
+          sha256 = "0xzlzv57nvrc142saydwfib51fyqcdzjccc1hj6xvgcdbwadlnjy";
+          name = "easy-kill-extras";
+        };
+        packageRequires = [ easy-kill ];
+        meta = {
+          homepage = "http://melpa.org/#/easy-kill-extras";
+          license = lib.licenses.free;
+        };
+      }) {};
+    easy-lentic = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lentic, lib, melpaBuild }:
+    melpaBuild {
+        pname = "easy-lentic";
+        version = "20151227.357";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "easy-lentic";
+          rev = "1b59ebe748e80488512034f885ad6540ad037382";
+          sha256 = "0qpabig0qrkyhhiifjpq9a7qv7h3nlqmpz79xy8lk58xy6rj0zk0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-lentic";
+          sha256 = "1j141lncgcgfpa42m505xndiy6lh848xymfvb3cz4d6h73421khg";
+          name = "easy-lentic";
+        };
+        packageRequires = [ cl-lib lentic ];
+        meta = {
+          homepage = "http://melpa.org/#/easy-lentic";
+          license = lib.licenses.free;
+        };
+      }) {};
+    easy-repeat = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "easy-repeat";
+        version = "20150516.348";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "easy-repeat.el";
+          rev = "060f0e6801c82c40c06961dc0528a00e18947a8c";
+          sha256 = "18bm5ns1qrxq0rrz9sylshr62wkymh1m6b7ch2y74f8rcwdwjgnq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-repeat";
+          sha256 = "1vx57gpw0nbxh976s18va4ali1nqxqffhaxv1c5rhf4pwlk2fa06";
+          name = "easy-repeat";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/easy-repeat";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ebal";
+        version = "20151211.15";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "ebal";
+          rev = "ef0a288d9b6e557532d772c146ff02aa82771f13";
+          sha256 = "0l2nhf6m6m01y2gw1fkn3zsjvmm1w02qj9zp4nmhgdl0qkllhdz5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ebal";
+          sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg";
+          name = "ebal";
+        };
+        packageRequires = [ emacs f ido-completing-read-plus ];
+        meta = {
+          homepage = "http://melpa.org/#/ebal";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }:
+    melpaBuild {
+        pname = "ebib";
+        version = "20160115.1735";
+        src = fetchFromGitHub {
+          owner = "joostkremers";
+          repo = "ebib";
+          rev = "b89f58493b6b544ddd80a6eea433987aa5c92b50";
+          sha256 = "03v17vbfdsv1rf3ja9k1d6mb338f8531w76f7rk5c7jyhlxi4ipl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ebib";
+          sha256 = "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid";
+          name = "ebib";
+        };
+        packageRequires = [ dash emacs parsebib ];
+        meta = {
+          homepage = "http://melpa.org/#/ebib";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ecb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ecb";
+        version = "20140215.314";
+        src = fetchFromGitHub {
+          owner = "alexott";
+          repo = "ecb";
+          rev = "071706b22efcfeb65da8381e317220d7f9d8cb54";
+          sha256 = "1hs069m4m6vhb37ac2x6hzbp9mfmpd3zhp4m631lx8dlmx11rydz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ecb";
+          sha256 = "097hdskhfh255znrqamcssx4ns1sgkxchlbc7pjqwzpflsi0fx89";
+          name = "ecb";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ecb";
+          license = lib.licenses.free;
+        };
+      }) {};
+    echo-bell = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "echo-bell";
+        version = "20151231.1456";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/echo-bell.el";
+          sha256 = "0jk7pb2sr4qbxwcn4ipcjc9phl9zjmgg8sf91qj113112xx7vvxa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/echo-bell";
+          sha256 = "0adhdfbcpmdhd9252rh0jik2z3v9bzf0brpzfvcjn5py2x6724ws";
+          name = "echo-bell";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/echo-bell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eclipse-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eclipse-theme";
+        version = "20150929.801";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "eclipse-theme";
+          rev = "222f5b37d9c0573f752aa6097c677c91af9d2427";
+          sha256 = "1vxa6d8kp4h1havr9cq7zqgqm1xsjxhbgbi4hvi842ma6xwh4m5w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eclipse-theme";
+          sha256 = "0mww0jysxqky1zkkhvhj7fn20w970n2w6501rdm5jwqfb58ivxfx";
+          name = "eclipse-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/eclipse-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "ecukes";
+        version = "20150717.848";
+        src = fetchFromGitHub {
+          owner = "ecukes";
+          repo = "ecukes";
+          rev = "7dad2da09da33d8540f25bf7bb7dd62900669b80";
+          sha256 = "0h6vh719ai0cxyja6wpfi6m76d42vskj56wg666j0h6j0qw6h3i2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ecukes";
+          sha256 = "0ava8hrc7r1mzv6xgbrb84qak5xrf6fj8g9qr4i4g0cr7843nrw0";
+          name = "ecukes";
+        };
+        packageRequires = [ ansi commander dash espuds f s ];
+        meta = {
+          homepage = "http://melpa.org/#/ecukes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    edbi = callPackage ({ concurrent, ctable, epc, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "edbi";
+        version = "20140920.235";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-edbi";
+          rev = "3edb409245d8a3bca7a5b25c70c98954c0ab42b2";
+          sha256 = "1x5y1d5crc48iddlsf6irkr017p32a9xjcmlm9wf3zggmr95fr3s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edbi";
+          sha256 = "0qq0j16n8lyvkqqlcsrq1m7r7f0in6b92d74mpx5c6siv6z2vxlr";
+          name = "edbi";
+        };
+        packageRequires = [ concurrent ctable epc ];
+        meta = {
+          homepage = "http://melpa.org/#/edbi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    edbi-database-url = callPackage ({ edbi, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "edbi-database-url";
+        version = "20150126.603";
+        src = fetchFromGitHub {
+          owner = "proofit404";
+          repo = "edbi-database-url";
+          rev = "08b833584460ddfd4d0d76e5b159625dde684bcf";
+          sha256 = "1l5lkdgcy1z6fkjh3zrhf0f4f26bzhpqy33ak1xacvm9fyf54s2x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edbi-database-url";
+          sha256 = "018rxijmy0lvisy281d501ra9lnh5xi0wmvz5avbjpb0fi4q1zdn";
+          name = "edbi-database-url";
+        };
+        packageRequires = [ edbi emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/edbi-database-url";
+          license = lib.licenses.free;
+        };
+      }) {};
+    edbi-django = callPackage ({ edbi, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "edbi-django";
+        version = "20150115.1301";
+        src = fetchFromGitHub {
+          owner = "proofit404";
+          repo = "edbi-django";
+          rev = "9cdf6d7a45402d41551c1e17edd7a29a8520f102";
+          sha256 = "0jlr1da26jkrgadaznxjynjqbg4cpnq7gda3qab2qqrjzzi8cfia";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edbi-django";
+          sha256 = "1s59hab35hwnspyklxbhi0js0sgdn0rc7y33dqjk0psjcikqymg1";
+          name = "edbi-django";
+        };
+        packageRequires = [ edbi emacs f ];
+        meta = {
+          homepage = "http://melpa.org/#/edbi-django";
+          license = lib.licenses.free;
+        };
+      }) {};
+    edbi-minor-mode = callPackage ({ edbi, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "edbi-minor-mode";
+        version = "20150421.703";
+        src = fetchFromGitHub {
+          owner = "proofit404";
+          repo = "edbi-minor-mode";
+          rev = "afcbaf9e8264278e8526ca7509e6fc6bfd0d7937";
+          sha256 = "1lndz0qlmjvi9r2f1yzw217b971ym5jzfrddcd6rind1asrzl32a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edbi-minor-mode";
+          sha256 = "0p7vdf9cp6i7mhjxj82670pfflf1kacalmakb7ssgigs1nsf3spi";
+          name = "edbi-minor-mode";
+        };
+        packageRequires = [ edbi ];
+        meta = {
+          homepage = "http://melpa.org/#/edbi-minor-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    edbi-sqlite = callPackage ({ edbi, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "edbi-sqlite";
+        version = "20150115.1301";
+        src = fetchFromGitHub {
+          owner = "proofit404";
+          repo = "edbi-sqlite";
+          rev = "929009365529b56daec172b87d7632240b15be1f";
+          sha256 = "0xnaj2f9zvnc6abjkaa23j6ga4anmq676aplws0n01y7qz6w0xk8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edbi-sqlite";
+          sha256 = "1w53ypz3pdqaml3vq9j3f1w443n8s9hb2ys090kxvjqnb8x8v44y";
+          name = "edbi-sqlite";
+        };
+        packageRequires = [ edbi emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/edbi-sqlite";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ede-compdb = callPackage ({ cl-lib ? null, ede ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, semantic ? null }:
+    melpaBuild {
+        pname = "ede-compdb";
+        version = "20150920.1533";
+        src = fetchFromGitHub {
+          owner = "randomphrase";
+          repo = "ede-compdb";
+          rev = "d6d8466cd62876fc90adeff5875a1a584fd846cd";
+          sha256 = "1cfjw9b1lm29s5cbh0qqmkchbq2382s71w4rpb0gyf603s0yg13m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ede-compdb";
+          sha256 = "1ypi7rxbgg2qck1b571hcw5m4ipllb48g6sindpdf180kbfbfpn7";
+          name = "ede-compdb";
+        };
+        packageRequires = [ cl-lib ede semantic ];
+        meta = {
+          homepage = "http://melpa.org/#/ede-compdb";
+          license = lib.licenses.free;
+        };
+      }) {};
+    edebug-x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "edebug-x";
+        version = "20130616.125";
+        src = fetchFromGitHub {
+          owner = "ScottyB";
+          repo = "edebug-x";
+          rev = "a2c2c42553d3bcbd5ac11898554865acbed1bc46";
+          sha256 = "1zgiifi1k2d9g8sarfpjzamk8g1yx4ilgn60mqhy2pznp30b5qb2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edebug-x";
+          sha256 = "0mzrip6y346mix4ny1xj8rkji1w531ix24k3cczmlmm4hm7l29ql";
+          name = "edebug-x";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/edebug-x";
+          license = lib.licenses.free;
+        };
+      }) {};
+    edit-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "edit-at-point";
+        version = "20150716.824";
+        src = fetchFromGitHub {
+          owner = "enoson";
+          repo = "edit-at-point.el";
+          rev = "3b800c11685102e1eab62ec71c5fc1589ebb81a7";
+          sha256 = "0crwdgng377sy1zbq7kqkz24v697mlzgdsvkdp1m8r7ympikkj6w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-at-point";
+          sha256 = "0sn5a644zm165li44yffcpcai8bhl3yfvqcljghlwaa0w45sc9im";
+          name = "edit-at-point";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/edit-at-point";
+          license = lib.licenses.free;
+        };
+      }) {};
+    edit-color-stamp = callPackage ({ cl-lib ? null, es-lib, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "edit-color-stamp";
+        version = "20130529.1233";
+        src = fetchFromGitHub {
+          owner = "sabof";
+          repo = "edit-color-stamp";
+          rev = "32dc1ca5bcf3dcf83fad5e39b55dc5b77becb3d3";
+          sha256 = "0vk954f44m2bq7qb122pzlb8fibrisx47ihvn3h96m8nmx0fv32r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-color-stamp";
+          sha256 = "1f8v8w3w7vb8jv29w06mplah8yfcs5qfjz2w4irv0rg7dwzy3zk8";
+          name = "edit-color-stamp";
+        };
+        packageRequires = [ cl-lib es-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/edit-color-stamp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    edit-indirect = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "edit-indirect";
+        version = "20141213.1205";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "edit-indirect";
+          rev = "d1ab87fdfbc2a894a7eaac8b289a5af2d7c835b0";
+          sha256 = "10c84aad1lnr7z9f75k5ylgchykr3srcdmn88hlcx2n2c4jfbkds";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-indirect";
+          sha256 = "0q5jjmrvx5kaajllmhaxihsab2kr1vmcsfqrhxdhw3x3nf41s439";
+          name = "edit-indirect";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/edit-indirect";
+          license = lib.licenses.free;
+        };
+      }) {};
+    edit-list = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "edit-list";
+        version = "20100930.943";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "edit-list";
+          rev = "f460d3f9e208a4e606fe6ded307f1b011916ca71";
+          sha256 = "0981hy1n50yizc3k06vbxqrpfml817a67kab1hkgkw5v6ymm1hc9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-list";
+          sha256 = "0mi12jfgx06i0yr8k5nk80xryqszjv0xykdnri505862rb90xakv";
+          name = "edit-list";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/edit-list";
+          license = lib.licenses.free;
+        };
+      }) {};
+    edit-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "edit-server";
+        version = "20141231.1558";
+        src = fetchFromGitHub {
+          owner = "stsquad";
+          repo = "emacs_chrome";
+          rev = "0a50fbb524fe256560f481701c000309c627b9ca";
+          sha256 = "0ssmhwg4wfh5cxgqv8bl55449204h4zi863m7jhvas4c9zq005kd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-server";
+          sha256 = "0ffxcgmnz0f2c1i3vfwm8vlm6jyd7ibf4kq5z8c6n50zkwfdmns0";
+          name = "edit-server";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/edit-server";
+          license = lib.licenses.free;
+        };
+      }) {};
+    edit-server-htmlize = callPackage ({ edit-server, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "edit-server-htmlize";
+        version = "20130329.1748";
+        src = fetchFromGitHub {
+          owner = "frobtech";
+          repo = "edit-server-htmlize";
+          rev = "e7f8dadfabe869c77ca241cd6fbd4c52bd908392";
+          sha256 = "174xq45xc632zrb916aw7q4bch96pbi6zgy3dk77qla3ky9cfpl3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-server-htmlize";
+          sha256 = "007lv3698a88wxan7kplz2117azxxpzzgshin9c1aabg059hszlj";
+          name = "edit-server-htmlize";
+        };
+        packageRequires = [ edit-server ];
+        meta = {
+          homepage = "http://melpa.org/#/edit-server-htmlize";
+          license = lib.licenses.free;
+        };
+      }) {};
+    editorconfig = callPackage ({ editorconfig-core, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "editorconfig";
+        version = "20160116.2341";
+        src = fetchFromGitHub {
+          owner = "editorconfig";
+          repo = "editorconfig-emacs";
+          rev = "765797d42784f15d207b5a4bfddce780eae2fbb3";
+          sha256 = "0002i69r4cpka73b8mvnkvh4lpyrrrnj07aq0zs0v62b3xlci22y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/editorconfig";
+          sha256 = "0na5lfi9bs4k1q73pph3ff0v8k8vzrfpzh47chyzk8nxsmvklw35";
+          name = "editorconfig";
+        };
+        packageRequires = [ editorconfig-core ];
+        meta = {
+          homepage = "http://melpa.org/#/editorconfig";
+          license = lib.licenses.free;
+        };
+      }) {};
+    editorconfig-core = callPackage ({ cl-lib ? null, editorconfig-fnmatch, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "editorconfig-core";
+        version = "20160116.2341";
+        src = fetchFromGitHub {
+          owner = "editorconfig";
+          repo = "editorconfig-emacs";
+          rev = "765797d42784f15d207b5a4bfddce780eae2fbb3";
+          sha256 = "0002i69r4cpka73b8mvnkvh4lpyrrrnj07aq0zs0v62b3xlci22y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/editorconfig-core";
+          sha256 = "18d7byqkxn6lyw3nqsvqs5vyj9alh9wjd2mim44a3zcc9r2j061r";
+          name = "editorconfig-core";
+        };
+        packageRequires = [ cl-lib editorconfig-fnmatch ];
+        meta = {
+          homepage = "http://melpa.org/#/editorconfig-core";
+          license = lib.licenses.free;
+        };
+      }) {};
+    editorconfig-fnmatch = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "editorconfig-fnmatch";
+        version = "20160116.2341";
+        src = fetchFromGitHub {
+          owner = "editorconfig";
+          repo = "editorconfig-emacs";
+          rev = "765797d42784f15d207b5a4bfddce780eae2fbb3";
+          sha256 = "0002i69r4cpka73b8mvnkvh4lpyrrrnj07aq0zs0v62b3xlci22y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/editorconfig-fnmatch";
+          sha256 = "0ji243vrw527jc3alsgmqi9rdnslxyq48zzx33rbpkqcjssm11iv";
+          name = "editorconfig-fnmatch";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/editorconfig-fnmatch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    edn = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, peg, s }:
+    melpaBuild {
+        pname = "edn";
+        version = "20150929.346";
+        src = fetchFromGitHub {
+          owner = "expez";
+          repo = "edn.el";
+          rev = "501a69696bec2fc09bf5d61e38a3ea344ed77a47";
+          sha256 = "107ljwqibnd247h4iyav37y75zcgl0j2yav09s38kl3nbxmaad2y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edn";
+          sha256 = "00cy8axhy2p3zalzl8k2083l5a7s3aswb9qfk9wsmf678m8pqwqg";
+          name = "edn";
+        };
+        packageRequires = [ cl-lib dash emacs peg s ];
+        meta = {
+          homepage = "http://melpa.org/#/edn";
+          license = lib.licenses.free;
+        };
+      }) {};
+    edts = callPackage ({ auto-complete, auto-highlight-symbol, dash, eproject, erlang, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s }:
+    melpaBuild {
+        pname = "edts";
+        version = "20150830.710";
+        src = fetchFromGitHub {
+          owner = "tjarvstrand";
+          repo = "edts";
+          rev = "70dfcfd8cc448c854fb67d65e005ba00e77384c5";
+          sha256 = "0vsrcvrd02nx647gxp65r548qlxg50w73dy0rs1lxwy6mdgp0npv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edts";
+          sha256 = "0f0rbd0mqqwn743qmr1g5mmi1sbmlcglclww8jxvbvb61jq8vspr";
+          name = "edts";
+        };
+        packageRequires = [
+          auto-complete
+          auto-highlight-symbol
+          dash
+          eproject
+          erlang
+          f
+          popup
+          s
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/edts";
+          license = lib.licenses.free;
+        };
+      }) {};
+    efire = callPackage ({ circe, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "efire";
+        version = "20151009.1531";
+        src = fetchFromGitHub {
+          owner = "capitaomorte";
+          repo = "efire";
+          rev = "91a644662afb352475efad0b377713656f131e5c";
+          sha256 = "1c2iyv392ap35nss4j901h33d3lx9lmq5v43flf2rid1766pam6v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/efire";
+          sha256 = "1c8vdc58i0k7vvanwhckfc31226d3rb5xq77lh9ydgnd4i97gq2w";
+          name = "efire";
+        };
+        packageRequires = [ circe ];
+        meta = {
+          homepage = "http://melpa.org/#/efire";
+          license = lib.licenses.free;
+        };
+      }) {};
+    egg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "egg";
+        version = "20160111.231";
+        src = fetchFromGitHub {
+          owner = "byplayer";
+          repo = "egg";
+          rev = "d0721515131f9a9bdfa55c22dae817dd6b1a4585";
+          sha256 = "1l9p8nairqr3ym5ydy0rwczcmkx2jq9b2g9r0r96n0vnjpybk6q2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/egg";
+          sha256 = "144g1fvs2cmn3px0a98nvxl5cz70kx30v936k5ppyi8gvbj0md5i";
+          name = "egg";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/egg";
+          license = lib.licenses.free;
+        };
+      }) {};
+    egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "egison-mode";
+        version = "20150827.2329";
+        src = fetchFromGitHub {
+          owner = "egisatoshi";
+          repo = "egison3";
+          rev = "dbb8773f8a47655f3b5311e0a87f63c7b39f60db";
+          sha256 = "0sz506yx59gjkphyi3fp07i8h0mkm7gr73xfbjdhn29dss0xl7x0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/egison-mode";
+          sha256 = "0x11fhv8kkx34h831k2q70y5qfz7wnfia4ka5mbmps7mpr68zcwi";
+          name = "egison-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/egison-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "eide";
+        version = "20151212.1406";
+        src = fetchgit {
+          url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git";
+          rev = "524494fd2b23217c6807b30b43bb95b5724f809e";
+          sha256 = "3f41ade3332a3f1dc5cfb0b33077396feb7b683b2cf2c235b7a5f07f0b2e3271";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eide";
+          sha256 = "16cf32n2l4wy1px7fm6x4vxx7pbqdp7zh2jn3bymg0b40i2321sz";
+          name = "eide";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/eide";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eimp = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "eimp";
+        version = "20140630.947";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/eimp.el";
+          sha256 = "024qyipwlj3g0fff06cgq357blkh3hyr14vpmkqsv15x6gb9snir";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eimp";
+          sha256 = "11z23kx89yy03hzs1xlbcih70lsp2lplxs8nkc8jvfcpsjwypsl0";
+          name = "eimp";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/eimp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ein = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
+    melpaBuild {
+        pname = "ein";
+        version = "20160114.1641";
+        src = fetchFromGitHub {
+          owner = "millejoh";
+          repo = "emacs-ipython-notebook";
+          rev = "6d66cc5a2efedf614b62f012fad2023c8b95189c";
+          sha256 = "1003gavr7bbsff256k2wickbvlr6xflwl6msdipxjdww66wa3gsh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ein";
+          sha256 = "1nksj1cpf4d9brr3rb80bgp2x05qdq9xmlp8mwbic1s27mw80bpp";
+          name = "ein";
+        };
+        packageRequires = [ request websocket ];
+        meta = {
+          homepage = "http://melpa.org/#/ein";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ein-mumamo = callPackage ({ ein, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ein-mumamo";
+        version = "20150301.1828";
+        src = fetchFromGitHub {
+          owner = "millejoh";
+          repo = "ein-mumamo";
+          rev = "028fefec499598add1a87b92ed991891f38f0c7b";
+          sha256 = "1w0b3giy9ca35pp2ni4afnqas64a2vriilab7jiw9anp3ryh6570";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ein-mumamo";
+          sha256 = "029sk90xz9fhv2s56f5hp0aks1d6ybz517009vv4892bbzkpjv1w";
+          name = "ein-mumamo";
+        };
+        packageRequires = [ ein ];
+        meta = {
+          homepage = "http://melpa.org/#/ein-mumamo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    el-autoyas = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "el-autoyas";
+        version = "20120918.817";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "el-autoyas.el";
+          rev = "bde0251ecb504f585dfa27c205c8e312655310cc";
+          sha256 = "0dbp2zz993cm7mrd58c4iflbzqwg50wzgn2cpwfivk14w1mznh4n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-autoyas";
+          sha256 = "0hh5j79f3z82nmb3kqry8k8lgc1qswk6ni3g9jg60pasc3wkbh6c";
+          name = "el-autoyas";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/el-autoyas";
+          license = lib.licenses.free;
+        };
+      }) {};
+    el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "el-get";
+        version = "20151117.1015";
+        src = fetchFromGitHub {
+          owner = "dimitri";
+          repo = "el-get";
+          rev = "6b10697216f2de7fc836452a29d13ef4182ae3e1";
+          sha256 = "06b3ma4chsjpzwwxfy9as7sanvlpp1j4fsmxpaphjv2d8gvw98zn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-get";
+          sha256 = "1438v2sw5n67q404c93y2py226v469nagqwp4w9l6yyy40h4myhz";
+          name = "el-get";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/el-get";
+          license = lib.licenses.free;
+        };
+      }) {};
+    el-init = callPackage ({ anaphora, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "el-init";
+        version = "20150728.420";
+        src = fetchFromGitHub {
+          owner = "HKey";
+          repo = "el-init";
+          rev = "a23cc95dd67fe63e131da211caa48eae804b11c5";
+          sha256 = "140afbksvm1kvam7pyaibay8rqhfhmb22rrh39mvdnqskqfnlqgr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-init";
+          sha256 = "121n6z8p9kzi7axp4i2kyi621gw20635w4j81i1bryblaqrv5kl5";
+          name = "el-init";
+        };
+        packageRequires = [ anaphora cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/el-init";
+          license = lib.licenses.free;
+        };
+      }) {};
+    el-init-viewer = callPackage ({ anaphora, cl-lib ? null, ctable, dash, el-init, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "el-init-viewer";
+        version = "20150303.228";
+        src = fetchFromGitHub {
+          owner = "HKey";
+          repo = "el-init-viewer";
+          rev = "6e1aaab3e49d87253763e5b437d4f43f445b7774";
+          sha256 = "13cc7nnslij28fa1469s9pfmnz8j0m6bayhrqxckd0xplvwwipnx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-init-viewer";
+          sha256 = "0kkmsml9xf2n8nlrcicfg2l78s3dlhd6ssx0s62v77v4wdpl297m";
+          name = "el-init-viewer";
+        };
+        packageRequires = [ anaphora cl-lib ctable dash el-init emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/el-init-viewer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    el-mock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "el-mock";
+        version = "20150906.521";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "el-mock.el";
+          rev = "5cb160b9bd2c9b909a2b64adcc9ec947da643c39";
+          sha256 = "1jiq2hpym3wpk80zsl4lffpv4kgkykc2zp08sb01wa7pl8d1knmm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-mock";
+          sha256 = "07m7w7n202nijnxidy0j0r4nbcvlnbkm9b0n8qb2bwi3d4cfp77l";
+          name = "el-mock";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/el-mock";
+          license = lib.licenses.free;
+        };
+      }) {};
+    el-pocket = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web }:
+    melpaBuild {
+        pname = "el-pocket";
+        version = "20150202.1728";
+        src = fetchFromGitHub {
+          owner = "pterygota";
+          repo = "el-pocket";
+          rev = "e79b5a4c7762be4ea88f43f17203d44a5c8ad310";
+          sha256 = "1iykhicc1ic1r6h4vj3701rm0vfy41b16w3d98amf8jjypv54wv7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-pocket";
+          sha256 = "0fgylpfixsx5l1nrgz6n1c2ayf52p60f9q290hmkn36siyx5hixw";
+          name = "el-pocket";
+        };
+        packageRequires = [ emacs web ];
+        meta = {
+          homepage = "http://melpa.org/#/el-pocket";
+          license = lib.licenses.free;
+        };
+      }) {};
+    el-spec = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "el-spec";
+        version = "20121018.204";
+        src = fetchFromGitHub {
+          owner = "uk-ar";
+          repo = "el-spec";
+          rev = "1dbc465401d4aea5560318c4f13ff30920a0718d";
+          sha256 = "1lsq7980pwcwlg7z37hrig8ddm9nyvaqrlczv1w0vy631vc5z2az";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-spec";
+          sha256 = "017syizs8qw5phwvpzzffzdnj6rh9q4n7s51qjvj8qfb3088igkh";
+          name = "el-spec";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/el-spec";
+          license = lib.licenses.free;
+        };
+      }) {};
+    el-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, thingatpt-plus }:
+    melpaBuild {
+        pname = "el-spice";
+        version = "20140805.1338";
+        src = fetchFromGitHub {
+          owner = "vedang";
+          repo = "el-spice";
+          rev = "65d9ec84b581a5867eebbc58de93958e992ca80d";
+          sha256 = "1sba405h1sy5vxg4ki631p4979gyaqv8wnwbgca5jp2pm8l3viri";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-spice";
+          sha256 = "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg";
+          name = "el-spice";
+        };
+        packageRequires = [ thingatpt-plus ];
+        meta = {
+          homepage = "http://melpa.org/#/el-spice";
+          license = lib.licenses.free;
+        };
+      }) {};
+    el-sprunge = callPackage ({ emacs, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, web-server }:
+    melpaBuild {
+        pname = "el-sprunge";
+        version = "20140106.1939";
+        src = fetchFromGitHub {
+          owner = "eschulte";
+          repo = "el-sprunge";
+          rev = "37855ec60aeb4d565c49a4d711edc7341e9a22cb";
+          sha256 = "04k1fz0ypmfzgwamncp2vz0lq54bq6y7c8k9nm39csp2564vmbbc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-sprunge";
+          sha256 = "0rb1cr7zrfl1s5prxy3xwdqgnm8ddw33pcvk049km2qbccb08v6a";
+          name = "el-sprunge";
+        };
+        packageRequires = [ emacs htmlize web-server ];
+        meta = {
+          homepage = "http://melpa.org/#/el-sprunge";
+          license = lib.licenses.free;
+        };
+      }) {};
+    el-spy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "el-spy";
+        version = "20131226.1408";
+        src = fetchFromGitHub {
+          owner = "uk-ar";
+          repo = "el-spy";
+          rev = "b1dead9d1877660856ada22d906ac4e54695aec7";
+          sha256 = "016l3inzb7dby0w58najj2pvymwk6gllsxvqj2fkz3599i36p1pn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-spy";
+          sha256 = "1bgv4mgsnkmjdyay7lhkqdszvnwpjy4dxxw11kq45w866ba8645n";
+          name = "el-spy";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/el-spy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    el-swank-fuzzy = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "el-swank-fuzzy";
+        version = "20130824.657";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/el-swank-fuzzy.el";
+          sha256 = "1g2jhm9m5qcj6a231n5ch6b8bqwzq3kj275nd4s89p89v1252qhn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-swank-fuzzy";
+          sha256 = "1m7y4c0r1w8ndmr1wgc2llrbfawbbxnvcvgjpsckb3704s87yxr1";
+          name = "el-swank-fuzzy";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/el-swank-fuzzy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    el-x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "el-x";
+        version = "20140111.1601";
+        src = fetchFromGitHub {
+          owner = "sigma";
+          repo = "el-x";
+          rev = "e96541c1f32e0a3aca4ad0a0eb382bd898250163";
+          sha256 = "1i6j44ssxm1xdg0mf91nh1lnprwsaxsx8vsrf720nan7mfr283h5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-x";
+          sha256 = "1721d9mljlcbdwb5b9934q7a48y30x6706pp4bjvgys0r64dml5g";
+          name = "el-x";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/el-x";
+          license = lib.licenses.free;
+        };
+      }) {};
+    el2markdown = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "el2markdown";
+        version = "20150516.1538";
+        src = fetchFromGitHub {
+          owner = "Lindydancer";
+          repo = "el2markdown";
+          rev = "875648f9a65ed18fe71fc72872a0db70aab5253d";
+          sha256 = "03xlxx57z1id9mr7afkvf77m2f9rrknrm1380p51vka84v2hl3mh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el2markdown";
+          sha256 = "1a52qm0jrcvvpb01blr5l7apaxqn4bvhkgha53cr48rdkmmq318g";
+          name = "el2markdown";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/el2markdown";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
+    melpaBuild {
+        pname = "elang";
+        version = "20160104.856";
+        src = fetchFromGitHub {
+          owner = "vkazanov";
+          repo = "elang";
+          rev = "30dc30c2c55e902fb213865aa79e2cbbc0dbc88e";
+          sha256 = "1wikmzl9gi72h6fxawj0h20828n4vypw9rrv35kqnl4gfrdmxzkk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elang";
+          sha256 = "0frhn3hm8351qzljicpzars28af1fghgv45717ml79rwb4vi6yiy";
+          name = "elang";
+        };
+        packageRequires = [ names ];
+        meta = {
+          homepage = "http://melpa.org/#/elang";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eldoc-eval";
+        version = "20150512.706";
+        src = fetchFromGitHub {
+          owner = "thierryvolpiatto";
+          repo = "eldoc-eval";
+          rev = "e87b89f89a2aed0bb3b31c014fc1b72f00413866";
+          sha256 = "0vppa9xihn8777rphiw1aqp96xn16vgjwff1dwvp8z861silp8ar";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eldoc-eval";
+          sha256 = "0z4scgi2xgrgd47aqqmyv1ww8alh43s0qny5qmh3f1nnppz3nd7c";
+          name = "eldoc-eval";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/eldoc-eval";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eldoc-extension = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "eldoc-extension";
+        version = "20140306.845";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/eldoc-extension.el";
+          sha256 = "13ncpp3hrwk0h030c5nnm2zfiingilr5b876jsf2wxmylg57nbch";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eldoc-extension";
+          sha256 = "0azkdx4ncjhb7qyhyg1a5pxgqqf2z1wq9iz802j0nxxnjzh9ny24";
+          name = "eldoc-extension";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/eldoc-extension";
+          license = lib.licenses.free;
+        };
+      }) {};
+    electric-case = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "electric-case";
+        version = "20150417.612";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "electric-case";
+          rev = "bac64e772107e3dc721a9819f63b9ebdc28a81f7";
+          sha256 = "0s4y1319sr4xc0k6h2zhzzxsx2kc3pc2m6saah18y4kip0hjyhr8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/electric-case";
+          sha256 = "11mab7799kxs3w47srmds5prmwh6ldxzial9kqbqy33vybpkprmd";
+          name = "electric-case";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/electric-case";
+          license = lib.licenses.free;
+        };
+      }) {};
+    electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
+    melpaBuild {
+        pname = "electric-operator";
+        version = "20160116.814";
+        src = fetchFromGitHub {
+          owner = "davidshepherd7";
+          repo = "electric-operator";
+          rev = "6c2c8e3e1bb25e6b4f1cf78a2e4bc327b99a5579";
+          sha256 = "1kzg7axqdwi9s4gzcz7iyw8mw5jm9i4slijk1x398cskwrijfh9h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/electric-operator";
+          sha256 = "043bkpvvk42lmkll5jnz4q8i0m44y4wdxvkz6hiqhqcp1rv03nw2";
+          name = "electric-operator";
+        };
+        packageRequires = [ dash emacs names ];
+        meta = {
+          homepage = "http://melpa.org/#/electric-operator";
+          license = lib.licenses.free;
+        };
+      }) {};
+    electric-spacing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "electric-spacing";
+        version = "20151209.936";
+        src = fetchFromGitHub {
+          owner = "xwl";
+          repo = "electric-spacing";
+          rev = "78e4ccbb0a924a3062fa16c9b24823bb79bb1f3e";
+          sha256 = "0q1pb01h48wdbjgi04a6ck2jn7yfh92wpq1vka5pg54wv2k9b5fn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/electric-spacing";
+          sha256 = "0fcsz9wmibqp6ci0pa5r4gzlrsyj5klajxpgfksa0nfj3dc94cvg";
+          name = "electric-spacing";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/electric-spacing";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elein = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elein";
+        version = "20120120.516";
+        src = fetchFromGitHub {
+          owner = "remvee";
+          repo = "elein";
+          rev = "d4c0c0491dbb7c90e953d7a16172107c37103605";
+          sha256 = "1ijrhm9vrzh5wl1rr9ayl11dwm05bh1i43fnbz3ga58l6whgkfpw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elein";
+          sha256 = "0af263zq4xxaxhpypn769q8h1dla0ygpnd6l8xc13zlni6jjwdsg";
+          name = "elein";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/elein";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elfeed";
+        version = "20151227.1117";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "elfeed";
+          rev = "2f84bb271559e8363286c5fcfd70246940058709";
+          sha256 = "1a3mwn0k6ib4sg63nhl29vsh0ji30zcyfcji161zfan6v5asrg8v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elfeed";
+          sha256 = "1psga7fcjk2b8xjg10fndp9l0ib72l5ggf43gxp62i4lxixzv8f9";
+          name = "elfeed";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/elfeed";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elfeed-goodies = callPackage ({ ace-jump-mode, cl-lib ? null, elfeed, fetchFromGitHub, fetchurl, lib, melpaBuild, noflet, popwin, powerline }:
+    melpaBuild {
+        pname = "elfeed-goodies";
+        version = "20151224.358";
+        src = fetchFromGitHub {
+          owner = "algernon";
+          repo = "elfeed-goodies";
+          rev = "5983e70a3ed5d62d218e1149cfe777b10c3168e5";
+          sha256 = "1r2liqjww0yscxjpg13dsfhhv3yjahlbas0dabqlh4f9q0jdrgj4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elfeed-goodies";
+          sha256 = "0zpk6nx757hasgzcww90fzkcdn078my33p7yax7xslvi4msm37bi";
+          name = "elfeed-goodies";
+        };
+        packageRequires = [
+          ace-jump-mode
+          cl-lib
+          elfeed
+          noflet
+          popwin
+          powerline
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/elfeed-goodies";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elfeed-org = callPackage ({ dash, elfeed, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
+    melpaBuild {
+        pname = "elfeed-org";
+        version = "20151003.531";
+        src = fetchFromGitHub {
+          owner = "remyhonig";
+          repo = "elfeed-org";
+          rev = "e5206bc983d04c68310181da83147908682de295";
+          sha256 = "0cp8sbhym83db88ii7gyab6iqxppinjlrkzb9627gq7xgb5mqj5j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elfeed-org";
+          sha256 = "0xf2r5ca3gnx2cv9f8rr4s1hds2ggqsbllvfr229gznkcqjnglik";
+          name = "elfeed-org";
+        };
+        packageRequires = [ dash elfeed org s ];
+        meta = {
+          homepage = "http://melpa.org/#/elfeed-org";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }:
+    melpaBuild {
+        pname = "elfeed-web";
+        version = "20151222.1322";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "elfeed";
+          rev = "2f84bb271559e8363286c5fcfd70246940058709";
+          sha256 = "1a3mwn0k6ib4sg63nhl29vsh0ji30zcyfcji161zfan6v5asrg8v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elfeed-web";
+          sha256 = "14ydwvjjc6wbhkj4g4xdh0c3nh4asqsz8ln7my5vjib881vmaq1n";
+          name = "elfeed-web";
+        };
+        packageRequires = [ elfeed emacs simple-httpd ];
+        meta = {
+          homepage = "http://melpa.org/#/elfeed-web";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elhome = callPackage ({ fetchFromGitHub, fetchurl, initsplit, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elhome";
+        version = "20131202.1308";
+        src = fetchFromGitHub {
+          owner = "demyanrogozhin";
+          repo = "elhome";
+          rev = "af112592fbc41a625d1d17828db78357df23c127";
+          sha256 = "0rdhnnyn0xsmnshnf289kxk974r57i6nx0vii1w36j6p6q0b7f9h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elhome";
+          sha256 = "1k7936wxgslr29511dz9az38i9vi35rcxk68gzv35v9lpj89lalh";
+          name = "elhome";
+        };
+        packageRequires = [ initsplit ];
+        meta = {
+          homepage = "http://melpa.org/#/elhome";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elisp-depend = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "elisp-depend";
+        version = "20120426.2023";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/elisp-depend.el";
+          sha256 = "0khc3gacw27aw9pkfrnla9844lqbspgm0hrz7q0h5nr73d9pnc02";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elisp-depend";
+          sha256 = "08zxzvj60v23b7d5q0hvgffm1jxq7lc5y9w22m6nv2fp29yadyiy";
+          name = "elisp-depend";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/elisp-depend";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elisp-lint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elisp-lint";
+        version = "20150430.1758";
+        src = fetchFromGitHub {
+          owner = "nschum";
+          repo = "elisp-lint";
+          rev = "1168b12575f1ed54ee523d34a90757459a6e42a3";
+          sha256 = "1ci6nyk1vvb3wgxzarbf6448i9rjb74zzrhcmls634gfxbryxdyy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elisp-lint";
+          sha256 = "102hrxdw72bm11a29i15g09lv7jlnd7vkv7292fm3mcxf5f4hkw9";
+          name = "elisp-lint";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/elisp-lint";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elisp-sandbox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elisp-sandbox";
+        version = "20131116.1242";
+        src = fetchFromGitHub {
+          owner = "joelmccracken";
+          repo = "elisp-sandbox";
+          rev = "523aed6110ad09a42306eb3b9dde33f955520c20";
+          sha256 = "168ljhscqyvp24lw70ylv4a3c0y51sx4f66lfahbs7zpjvwf25x0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elisp-sandbox";
+          sha256 = "1bazm1cf9ghh9b7jzqqgyfcalnrfg7vmxqbn4fiy2c76gbzlr2bp";
+          name = "elisp-sandbox";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/elisp-sandbox";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elisp-slime-nav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elisp-slime-nav";
+        version = "20150805.1448";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "elisp-slime-nav";
+          rev = "f6d241b11abbc4064e17e02dbd0bc6c61db256cc";
+          sha256 = "184yxv2qhqc2g5v259kprihppvcwsd52idjay2c01lkmk1i3qnj5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elisp-slime-nav";
+          sha256 = "009zgp68i4naprpjr8lcp06lh3i5ickn0nh0lgvrqs0niprnzh8c";
+          name = "elisp-slime-nav";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/elisp-slime-nav";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elixir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
+    melpaBuild {
+        pname = "elixir-mode";
+        version = "20160103.254";
+        src = fetchFromGitHub {
+          owner = "elixir-lang";
+          repo = "emacs-elixir";
+          rev = "344d77dd0d23e17a4438171d3194184b209a0de6";
+          sha256 = "18dhijvgnx2hr9vnprcc1fl0k49bb3lpnghrqbkf7fj599kcjl7b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elixir-mode";
+          sha256 = "1dba3jfg210i2rw8qy866396xn2xjgmbcyl006d6fibpr3j4lxaf";
+          name = "elixir-mode";
+        };
+        packageRequires = [ emacs pkg-info ];
+        meta = {
+          homepage = "http://melpa.org/#/elixir-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elixir-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "elixir-yasnippets";
+        version = "20150417.739";
+        src = fetchFromGitHub {
+          owner = "hisea";
+          repo = "elixir-yasnippets";
+          rev = "980ca7626c14ef0573bec0035ec7942796062783";
+          sha256 = "1sdq4372i19wdxpdp3347a1rf5zf5w6sa0da6lr511m7ri0lj6hd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elixir-yasnippets";
+          sha256 = "0927znqd9j91wc51hdwcl2rxb66i1h549nyr1h39r13353gbwk3a";
+          name = "elixir-yasnippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/elixir-yasnippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "elm-mode";
+        version = "20160117.458";
+        src = fetchFromGitHub {
+          owner = "jcollard";
+          repo = "elm-mode";
+          rev = "6796f031bd1452a9a1c474152df7720f4e700f38";
+          sha256 = "035awxgwj8jy6c4ihfqwvjhqpg3i00qshrslhggyclab9i784axw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elm-mode";
+          sha256 = "1gw9szkyr1spcx7qijddhxlm36h0hmfd53b4yzp1336yx44mlnd1";
+          name = "elm-mode";
+        };
+        packageRequires = [ emacs f let-alist s ];
+        meta = {
+          homepage = "http://melpa.org/#/elm-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elmacro = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "elmacro";
+        version = "20141109.1006";
+        src = fetchFromGitHub {
+          owner = "Silex";
+          repo = "elmacro";
+          rev = "ff5d8a0d7f5154707f1d0a2b22894c6c0b0b9f94";
+          sha256 = "181hcyg5v62nxrgmb7pl9672rm9fy8crc4lqhdwvdvd7ngki1fiz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elmacro";
+          sha256 = "0644rgwawivrq1shsjx1x2p53z7jgr6bxqgn2smzql8pp6azy7xz";
+          name = "elmacro";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/elmacro";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elmine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "elmine";
+        version = "20151121.623";
+        src = fetchFromGitHub {
+          owner = "leoc";
+          repo = "elmine";
+          rev = "60639f46a5f45653f490cdd30732beb2dca47ada";
+          sha256 = "1463y4zc6yabd30k6806yw0am18fjv0bkxm56p2siqrwn9pbsh8k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elmine";
+          sha256 = "1gi94dyz9x50swkvryd4vj36rqgz4s58nrb4h4vwwviiiqmc8fvz";
+          name = "elmine";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "http://melpa.org/#/elmine";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elnode = callPackage ({ creole, dash, db, fakir, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, noflet, s, web }:
+    melpaBuild {
+        pname = "elnode";
+        version = "20140203.1706";
+        src = fetchFromGitHub {
+          owner = "nicferrier";
+          repo = "elnode";
+          rev = "3f2bf225853e40a2a10386ee5ae0bd6ba5d44ce9";
+          sha256 = "0p3cj5vgka388i4dk9r7bx8pv8mywnfij9ahgqak5jlsddflh8hw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elnode";
+          sha256 = "0piy5gy9a7c8s10b99fmdyh6glhvjvdyrz0x2bv30h7wplx5szi6";
+          name = "elnode";
+        };
+        packageRequires = [ creole dash db fakir kv noflet s web ];
+        meta = {
+          homepage = "http://melpa.org/#/elnode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elog = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elog";
+        version = "20151116.1937";
+        src = fetchFromGitHub {
+          owner = "lujun9972";
+          repo = "elog";
+          rev = "03c275877301c72fbc61d5fdd72efe5fdc0b6e98";
+          sha256 = "19yvhyg34w1idsh712cahmcy1pzbxcipw9j6xk567lvkqkinqg7s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elog";
+          sha256 = "0hixsi60nf0khm9xmya3saf95ahn1gydp0l5wxawsc491qwg4vqd";
+          name = "elog";
+        };
+        packageRequires = [ eieio ];
+        meta = {
+          homepage = "http://melpa.org/#/elog";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elogcat = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "elogcat";
+        version = "20151120.1841";
+        src = fetchFromGitHub {
+          owner = "youngker";
+          repo = "elogcat.el";
+          rev = "4f311b7a07565b0d060334bc68edb36f2bff703f";
+          sha256 = "1jcr8bxffvnfs0ym6zkgs79hd6a0m81r4x4jr3v5l9zwxw04sy15";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elogcat";
+          sha256 = "0sqdqlpg4firswr742nrb6b8sz3bpijf6pbxvandq3ddpm0rx9ia";
+          name = "elogcat";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/elogcat";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elpa-audit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elpa-audit";
+        version = "20141023.831";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "elpa-audit";
+          rev = "1ca4e6073f8c4cbb41688b69d3b3feaa1a392efc";
+          sha256 = "1dadf24x6v1vk57bp6w0g2dysigy5cqjzwldc8dn129f4pfrhipy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elpa-audit";
+          sha256 = "0l8har14zrlh9kdkh9vlmkmzg49vb0r8j1wnznryaidalvk84a52";
+          name = "elpa-audit";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/elpa-audit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elpa-mirror";
+        version = "20151123.653";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "elpa-mirror";
+          rev = "6c32875c2317736e590e067820996010b21acb1d";
+          sha256 = "1hjmvn3kls63alh0ihb5c8gf90lrfvq1hxrlf4162qiaa0s15f8a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elpa-mirror";
+          sha256 = "1jnviav2ybr13cgllg26kfjrwrl25adggnqiiwyjwgbbzxfycah8";
+          name = "elpa-mirror";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/elpa-mirror";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }:
+    melpaBuild {
+        pname = "elpy";
+        version = "20151101.601";
+        src = fetchFromGitHub {
+          owner = "jorgenschaefer";
+          repo = "elpy";
+          rev = "96fa05708629600fd79c4b0fcafe63ec97f5ce07";
+          sha256 = "0kzara7r6gvgf3p06xswxbhq01dbhmwx1pldx3mmv7knvm2mdxq8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elpy";
+          sha256 = "051irp7k0cp1hqp3hzrmapllf2iim7cq0iz38489g4fkh2ybk709";
+          name = "elpy";
+        };
+        packageRequires = [
+          company
+          find-file-in-project
+          highlight-indentation
+          pyvenv
+          yasnippet
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/elpy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elscreen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elscreen";
+        version = "20151025.2000";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "elscreen";
+          rev = "249653a4a4b47c9b6306c2c29fa3753bc7342e61";
+          sha256 = "055kam18k4ni1zw3310cpsvdnrp62d579r30lq67ig2lq3yxzc1m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elscreen";
+          sha256 = "1mlqbw14ilk6d3ba38kfw50pnlhb9f6sm5hy9dw58gp59siark5s";
+          name = "elscreen";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/elscreen";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elscreen-buffer-group = callPackage ({ cl-lib ? null, elscreen, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elscreen-buffer-group";
+        version = "20160105.1003";
+        src = fetchFromGitHub {
+          owner = "jeffgran";
+          repo = "elscreen-buffer-group";
+          rev = "06ea9384a642ff5c3a93f36aee9f5d6b5c17657e";
+          sha256 = "0bbashrqpyhs282w5i15rzravvj0fjnydbh9vfnfnfnk8a9sssxz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elscreen-buffer-group";
+          sha256 = "1clmhpk9zp6hsgz6a4jpmbrr9fr6k8b324s0x61n5yi4yzgdmc0v";
+          name = "elscreen-buffer-group";
+        };
+        packageRequires = [ cl-lib elscreen emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/elscreen-buffer-group";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elscreen-mew = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elscreen-mew";
+        version = "20140629.1016";
+        src = fetchFromGitHub {
+          owner = "masutaka";
+          repo = "elscreen-mew";
+          rev = "f66a2a5a8dd904791ede5133fdd183522b061bba";
+          sha256 = "091dxsb73bhqmrddwnmvblmfpwa7v7fa0ha18daxc8j0lrhzdhlh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elscreen-mew";
+          sha256 = "06g4wcfjs036nn64ac0zsvr08cfmak2hyj83y7a0r35yxr1853w4";
+          name = "elscreen-mew";
+        };
+        packageRequires = [ elscreen ];
+        meta = {
+          homepage = "http://melpa.org/#/elscreen-mew";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elscreen-multi-term = callPackage ({ elscreen, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi-term }:
+    melpaBuild {
+        pname = "elscreen-multi-term";
+        version = "20151021.2133";
+        src = fetchFromGitHub {
+          owner = "wamei";
+          repo = "elscreen-multi-term";
+          rev = "7b6048a0dd80f69460a62bbc6f1af8856141a5ea";
+          sha256 = "1cninrbgxzg0gykkpjx0i8pk2yc7sgr2kliqd35lgcxz2q4jlr51";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elscreen-multi-term";
+          sha256 = "1zwrzblkag1d18xz450b7khsdssvsxyl1x6a682vy0dkn1y5qh1n";
+          name = "elscreen-multi-term";
+        };
+        packageRequires = [ elscreen emacs multi-term ];
+        meta = {
+          homepage = "http://melpa.org/#/elscreen-multi-term";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elscreen-persist = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild, revive }:
+    melpaBuild {
+        pname = "elscreen-persist";
+        version = "20151218.126";
+        src = fetchFromGitHub {
+          owner = "robario";
+          repo = "elscreen-persist";
+          rev = "652b4c738f92c518ead69343ebfcf66bc2a0254c";
+          sha256 = "06g7fl2c7cvwsrgi462wf6j13ny56y6zvgkizz9f256xjjq77ymf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elscreen-persist";
+          sha256 = "1rjfvpsx0y5l9b76wa1ilj5lx39jd0m78nb1a4bqn81z0rkfpl4k";
+          name = "elscreen-persist";
+        };
+        packageRequires = [ elscreen revive ];
+        meta = {
+          homepage = "http://melpa.org/#/elscreen-persist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elscreen-separate-buffer-list = callPackage ({ elscreen, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elscreen-separate-buffer-list";
+        version = "20150522.145";
+        src = fetchFromGitHub {
+          owner = "wamei";
+          repo = "elscreen-separate-buffer-list";
+          rev = "1aa66cdbf2b1dc87689725aef004a29bb79dd0f9";
+          sha256 = "1w34nnl4zalxzmyfbc81qd82m7qp3zvz608dx6hfi44pjz0dp36f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elscreen-separate-buffer-list";
+          sha256 = "1d8kc137cd8i3wglir1rlvk7w8mrdhd3xvcihi2f2f2g5nh2n5jk";
+          name = "elscreen-separate-buffer-list";
+        };
+        packageRequires = [ elscreen emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/elscreen-separate-buffer-list";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elwm = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elwm";
+        version = "20150817.507";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "elwm";
+          rev = "c33b183f006ad476c3a44dab316f580f8b369930";
+          sha256 = "1k7npf93xbmrsq607x8zlgrpzqvplgia3ixz5w1lr1jlv1m2m8x2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elwm";
+          sha256 = "0rf663ih3lfg4n4pj4dpp133967zha5m1wr46riaxpha7xr59al9";
+          name = "elwm";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/elwm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elx";
+        version = "20151215.639";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "elx";
+          rev = "a8dff14f0626f729e745092dd88a1801c6239710";
+          sha256 = "1mchc4d61li5gfsf05dwhgb694fjj9hljnbvwvc12c1iik0zavq0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elx";
+          sha256 = "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x";
+          name = "elx";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/elx";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emacs-eclim = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s }:
+    melpaBuild {
+        pname = "emacs-eclim";
+        version = "20151226.1815";
+        src = fetchFromGitHub {
+          owner = "emacs-eclim";
+          repo = "emacs-eclim";
+          rev = "968da3c06d674417a46b2f6db7d0e8277c35141d";
+          sha256 = "171xgznpgvwl03kzqa9nbpvj3mfznnf050pl2wih390nk5djpg12";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacs-eclim";
+          sha256 = "1l55jhz5mb3bqw90cbf4jhcqgwj962br706qhm2wn5i2a1mg8xlv";
+          name = "emacs-eclim";
+        };
+        packageRequires = [ cl-lib dash json popup s ];
+        meta = {
+          homepage = "http://melpa.org/#/emacs-eclim";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emacs-setup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emacs-setup";
+        version = "20120727.926";
+        src = fetchFromGitHub {
+          owner = "echosa";
+          repo = "emacs-setup";
+          rev = "cc36ad5318c6c0e65d1b9ff8dff5ea2437675de2";
+          sha256 = "15l3ab11vcmzqibkd6h5zqw5a83k8dmgcp4n26px29c0gv6bkpy8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacs-setup";
+          sha256 = "1x4rh8vx6fsb2d6dz2g9j6jamin1vmpppwy3yzbl1dnf7w4hx4kh";
+          name = "emacs-setup";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/emacs-setup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emacsagist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emacsagist";
+        version = "20140331.1330";
+        src = fetchFromGitHub {
+          owner = "echosa";
+          repo = "emacsagist";
+          rev = "aba342ba59c254a88017f25e9fb7a8cd6f2fda83";
+          sha256 = "0ciqxyahlzaxq854jm25zbrbmrhcaj5csdhxa0az9crwha8wkmw2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsagist";
+          sha256 = "1cyz7nf0zxa21979jf5kdmkgwiyd17vsmpcmrw1af37ly27l8l64";
+          name = "emacsagist";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/emacsagist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emacsc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emacsc";
+        version = "20150807.457";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "emacsc";
+          rev = "02325c640232ee184314eb58d0051f365f7f085c";
+          sha256 = "1rqr08gj07hw37mqd0flmq4a10wn16vy7wg0msqq0ab2smwjhns7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsc";
+          sha256 = "1fbf9al3yds0il18jz6hbpj1fsjlpb1kgp450gb6r09lc46x77mk";
+          name = "emacsc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/emacsc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emacsql = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emacsql";
+        version = "20151003.2131";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "emacsql";
+          rev = "74bd11bc0998d7019a05eecc0486fee09c84a93b";
+          sha256 = "0ld5qpl7b3iksgxcfysznf88wj019l5271kdz4nalqi4kchf5xad";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsql";
+          sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax";
+          name = "emacsql";
+        };
+        packageRequires = [ cl-lib emacs finalize ];
+        meta = {
+          homepage = "http://melpa.org/#/emacsql";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emacsql-mysql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emacsql-mysql";
+        version = "20151004.915";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "emacsql";
+          rev = "74bd11bc0998d7019a05eecc0486fee09c84a93b";
+          sha256 = "0ld5qpl7b3iksgxcfysznf88wj019l5271kdz4nalqi4kchf5xad";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsql-mysql";
+          sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy";
+          name = "emacsql-mysql";
+        };
+        packageRequires = [ cl-lib emacs emacsql ];
+        meta = {
+          homepage = "http://melpa.org/#/emacsql-mysql";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emacsql-psql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }:
+    melpaBuild {
+        pname = "emacsql-psql";
+        version = "20151004.915";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "emacsql";
+          rev = "74bd11bc0998d7019a05eecc0486fee09c84a93b";
+          sha256 = "0ld5qpl7b3iksgxcfysznf88wj019l5271kdz4nalqi4kchf5xad";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsql-psql";
+          sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3";
+          name = "emacsql-psql";
+        };
+        packageRequires = [ cl-lib emacs emacsql pg ];
+        meta = {
+          homepage = "http://melpa.org/#/emacsql-psql";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emacsql-sqlite = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emacsql-sqlite";
+        version = "20151004.915";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "emacsql";
+          rev = "74bd11bc0998d7019a05eecc0486fee09c84a93b";
+          sha256 = "0ld5qpl7b3iksgxcfysznf88wj019l5271kdz4nalqi4kchf5xad";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsql-sqlite";
+          sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i";
+          name = "emacsql-sqlite";
+        };
+        packageRequires = [ cl-lib emacs emacsql ];
+        meta = {
+          homepage = "http://melpa.org/#/emacsql-sqlite";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emacsshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emacsshot";
+        version = "20150516.1633";
+        src = fetchFromGitHub {
+          owner = "marcowahl";
+          repo = "emacsshot";
+          rev = "8615aa841a37c20f8cc0f0efdc89c8d79acbb84b";
+          sha256 = "0jn4xj206idh5kgbklgcrngx6wvz9gwfm61wygar6pbfzqyx1y9b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsshot";
+          sha256 = "08xqx017yfizdj8wz7nbh9i7qpar6398sri78abzf78inv828s9j";
+          name = "emacsshot";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/emacsshot";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emagician-fix-spell-memory = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emagician-fix-spell-memory";
+        version = "20141229.1634";
+        src = fetchFromGitHub {
+          owner = "jonnay";
+          repo = "emagicians-starter-kit";
+          rev = "5fadbf1bf84091b6ffe6cd1bff48f30e3da6c479";
+          sha256 = "00iklf97mszrsdv20q55qhml1dscvmmalpfnlkwi9mabklyq3i6z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emagician-fix-spell-memory";
+          sha256 = "0ffjrpiph21dn8bplklsz3hrsai25l67yyr7n8qjxlwlibwqzv6j";
+          name = "emagician-fix-spell-memory";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/emagician-fix-spell-memory";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emamux = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emamux";
+        version = "20160101.817";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-emamux";
+          rev = "92420150f7951dc867fd6e18c262d778e6456a4e";
+          sha256 = "0j9vpiybpklf7kgmwpkdyywk29vpigzbn39d0m54z1kvy23xvx6x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emamux";
+          sha256 = "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz";
+          name = "emamux";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/emamux";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emamux-ruby-test = callPackage ({ emamux, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+    melpaBuild {
+        pname = "emamux-ruby-test";
+        version = "20130812.1139";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emamux-ruby-test";
+          rev = "23b73c650573b340351a919da3da416acfc2ac84";
+          sha256 = "1idsvilsvlxh72waalhl8vrsmh0vfvz56qcv56fc2c0pb1i90icn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emamux-ruby-test";
+          sha256 = "1l1hp2dggjlc287qkfyj21w9lri4agh91g5x707qqq8nicdlv3xm";
+          name = "emamux-ruby-test";
+        };
+        packageRequires = [ emamux projectile ];
+        meta = {
+          homepage = "http://melpa.org/#/emamux-ruby-test";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ember-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ember-mode";
+        version = "20151103.421";
+        src = fetchFromGitHub {
+          owner = "madnificent";
+          repo = "ember-mode";
+          rev = "e82d88eee1882ac104857ec42a4fed731a99c13e";
+          sha256 = "0cv8y6hr719648yxr2fbgb1hyg36m60bsbd57f2vvvqvg87si4jz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ember-mode";
+          sha256 = "0fwd34cim29dg802ibsfd120px9sj54d4wzp3ggmjjzwkl9ky7dx";
+          name = "ember-mode";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/ember-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ember-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "ember-yasnippets";
+        version = "20160111.1107";
+        src = fetchFromGitHub {
+          owner = "ronco";
+          repo = "ember-yasnippets.el";
+          rev = "564130ddc4d4b93c281f2221c736c6d0f3066e2f";
+          sha256 = "1v4dac3v0hkq80fpkiih2pcji3j7fw634l3caalxv36dsixmz22y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ember-yasnippets";
+          sha256 = "1alqrv9yhc1f8dhvh2kjcv8qbn1hdgza5iasmchr1wggxds3s50i";
+          name = "ember-yasnippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/ember-yasnippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emmet-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emmet-mode";
+        version = "20151213.938";
+        src = fetchFromGitHub {
+          owner = "smihica";
+          repo = "emmet";
+          rev = "3a29a1ae17271a3dfe3cd47db034ee4036b2b144";
+          sha256 = "0037nikvlcw6i228jym76pl1mgw4fn5dpz8hfr86b3m0zb012inj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emmet-mode";
+          sha256 = "0w5nnhha70mndpk2a58raaxqanv868z05mfy1a8prgapm56mm819";
+          name = "emmet-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/emmet-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "emms";
+        version = "20151211.1353";
+        src = fetchgit {
+          url = "git://git.sv.gnu.org/emms.git";
+          rev = "489df29303fc89d4f80bffae91ad53f937ccd59a";
+          sha256 = "6e653c3b44442e21ec6e4410d8b9c0e51b2f03ed1ae62c1bb1a2ffa6c8c144da";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms";
+          sha256 = "0kzli8b0z5maizfwhlhph1f5w3v6pwxvs2dfs90l8c0h97m4yy2m";
+          name = "emms";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/emms";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emms-info-mediainfo = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emms-info-mediainfo";
+        version = "20131223.700";
+        src = fetchFromGitHub {
+          owner = "fgallina";
+          repo = "emms-info-mediainfo";
+          rev = "bce16eae9eacd38719fea62a9755225a888da59d";
+          sha256 = "07qbbs2i05bqndr4dxb84z50wav8ffbc56f6saw6pdx6n0sw6n6n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-info-mediainfo";
+          sha256 = "17x8vvfhx739hcj9j1nh6j4r6zqnwa5zq9zpi9b6lxc8979k3m4w";
+          name = "emms-info-mediainfo";
+        };
+        packageRequires = [ emms ];
+        meta = {
+          homepage = "http://melpa.org/#/emms-info-mediainfo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emms-mark-ext = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emms-mark-ext";
+        version = "20130528.2227";
+        src = fetchFromGitHub {
+          owner = "vapniks";
+          repo = "emms-mark-ext";
+          rev = "ec68129e3e9e469e5bf160c6a1b7030e322f3541";
+          sha256 = "03a7sn8pl0pnr05rmrrbw4hjyi8vpjqbvkvh0fqnij913a6qc64l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-mark-ext";
+          sha256 = "13h6hy8y0as0xfc1cg8balw63as81fzar32q9h4zhnndl3hc1081";
+          name = "emms-mark-ext";
+        };
+        packageRequires = [ emms ];
+        meta = {
+          homepage = "http://melpa.org/#/emms-mark-ext";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emms-mode-line-cycle = callPackage ({ emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emms-mode-line-cycle";
+        version = "20151009.946";
+        src = fetchFromGitHub {
+          owner = "momomo5717";
+          repo = "emms-mode-line-cycle";
+          rev = "0488de1f9b4d0be6aa7dfe2fe0231cfd9b4d4295";
+          sha256 = "1pz2xvv5hzfg4a8s6xnbr14mpwnr94cwsa1bpk83i7x15hmxj938";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-mode-line-cycle";
+          sha256 = "1jdmfh1i9v84iy7bj2dbc3s2wfzkrby3pabd99gnqzd9gn1cn8ca";
+          name = "emms-mode-line-cycle";
+        };
+        packageRequires = [ emacs emms ];
+        meta = {
+          homepage = "http://melpa.org/#/emms-mode-line-cycle";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emms-player-mpv";
+        version = "20151208.102";
+        src = fetchFromGitHub {
+          owner = "dochang";
+          repo = "emms-player-mpv";
+          rev = "a1be1d266530ede3780dd69a7243d898f1016127";
+          sha256 = "1yy4dmjp53l2df5qix31g4vizhv80wm88vjqq6qqa9p822732n0m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-player-mpv";
+          sha256 = "175rmqx3bgys4chw8ylyf9rk07sg0llwbs9ivrv2d3ayhcz1lg9y";
+          name = "emms-player-mpv";
+        };
+        packageRequires = [ emms ];
+        meta = {
+          homepage = "http://melpa.org/#/emms-player-mpv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emms-player-mpv-jp-radios";
+        version = "20151228.912";
+        src = fetchFromGitHub {
+          owner = "momomo5717";
+          repo = "emms-player-mpv-jp-radios";
+          rev = "d68017dfcfdd95a75cbda625628af02727cdd827";
+          sha256 = "0ckd440vbb2gh8cr144hq2f120fzwhfrby9hnd1qkl60pw98b0cb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-player-mpv-jp-radios";
+          sha256 = "0gdap5cv08pz370fl92v9lyvgkbbyjhp9wsc4kyjm4f4pwx9fybv";
+          name = "emms-player-mpv-jp-radios";
+        };
+        packageRequires = [ cl-lib emacs emms emms-player-simple-mpv ];
+        meta = {
+          homepage = "http://melpa.org/#/emms-player-mpv-jp-radios";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emms-player-simple-mpv = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emms-player-simple-mpv";
+        version = "20151020.801";
+        src = fetchFromGitHub {
+          owner = "momomo5717";
+          repo = "emms-player-simple-mpv";
+          rev = "92be36ef158df3db3a2f9e2d0186a609fc2d3702";
+          sha256 = "0ajxyv7yx4ni8dizs7acpsxnmy3c9s0dx28vw9y1ym0bxkgfyzrf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-player-simple-mpv";
+          sha256 = "15aljprjd74ha7wpzsmv3d873i6fy3x1jwhzm03hvw0sw18m25i1";
+          name = "emms-player-simple-mpv";
+        };
+        packageRequires = [ cl-lib emacs emms ];
+        meta = {
+          homepage = "http://melpa.org/#/emms-player-simple-mpv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emms-soundcloud = callPackage ({ emms, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emms-soundcloud";
+        version = "20131221.545";
+        src = fetchFromGitHub {
+          owner = "osener";
+          repo = "emms-soundcloud";
+          rev = "87e5cbf9609d1f26c24dc834fdeb78b33d453c2b";
+          sha256 = "0nx5bb5fjmaa1nhkbfnhd1aydqrq390x4rl1vfh11ilnf52wzzld";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-soundcloud";
+          sha256 = "0nf1f719m4pvxn0mf4qyx8mzwhrhv6kchnrpiy9clx520y8x3dqi";
+          name = "emms-soundcloud";
+        };
+        packageRequires = [ emms json ];
+        meta = {
+          homepage = "http://melpa.org/#/emms-soundcloud";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emoji-cheat-sheet-plus = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emoji-cheat-sheet-plus";
+        version = "20150617.831";
+        src = fetchFromGitHub {
+          owner = "syl20bnr";
+          repo = "emacs-emoji-cheat-sheet-plus";
+          rev = "96a003127d646a2683d81ca906a17eace0a6413e";
+          sha256 = "1rk7am0xvpnv98yi7a62wlyh576md4n2ddj7nm201bjd4wdl2yxk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emoji-cheat-sheet-plus";
+          sha256 = "1ciwlbw0ihm0p5gnnl3safcj7dxwiy53bkj8cmw3i334al0gjnnv";
+          name = "emoji-cheat-sheet-plus";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/emoji-cheat-sheet-plus";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emoji-display = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emoji-display";
+        version = "20140117.413";
+        src = fetchFromGitHub {
+          owner = "ikazuhiro";
+          repo = "emoji-display";
+          rev = "bb4217f6400151a9cfa6d4524b8427f01feb5193";
+          sha256 = "0sh4q4sb4j58ryvvmlsx7scry9inzgv2ssa87vbyzpxq0435l229";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emoji-display";
+          sha256 = "04cf18z26d64l0sv8qkbxjixi2wbw23awd5fznvg1cs8ixss01j9";
+          name = "emoji-display";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/emoji-display";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emoji-fontset = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emoji-fontset";
+        version = "20151107.2247";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "emoji-fontset.el";
+          rev = "3b8c2204284b95934383836b5b36efeefb65663b";
+          sha256 = "0qi7p1grann3mhaq8kc0yc27cp9fm983g2gaqddljchn7lmgagrr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emoji-fontset";
+          sha256 = "19affsvlm1rzrzdh1k6xsv79icdkzx4izxivrd2ia6y2wcg9wc5d";
+          name = "emoji-fontset";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/emoji-fontset";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }:
+    melpaBuild {
+        pname = "emojify";
+        version = "20151230.521";
+        src = fetchFromGitHub {
+          owner = "iqbalansari";
+          repo = "emacs-emojify";
+          rev = "0dfe1bb23c5035eca15a92ea7e9925f384ad9395";
+          sha256 = "1fqhydv9anhw0z8zjbz17kbl01bdzif9ncd25vdaa5dzddd16rb1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emojify";
+          sha256 = "15v2h5jfksfc208qphiczplg56yka07qv4w4482c10yzwq76zp17";
+          name = "emojify";
+        };
+        packageRequires = [ emacs ht seq ];
+        meta = {
+          homepage = "http://melpa.org/#/emojify";
+          license = lib.licenses.free;
+        };
+      }) {};
+    empos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "empos";
+        version = "20151011.1416";
+        src = fetchFromGitHub {
+          owner = "dimalik";
+          repo = "empos";
+          rev = "7b99ad30e56937adb7e6349777e5a2045597d564";
+          sha256 = "0bm0cxnv7g2dzfvfhkyy16kzn6shvy9gzypiqyjj42ng54xmhs0n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/empos";
+          sha256 = "0wbrszl9rq4is0ymxq9lxpqzlfg93gljh6almjy0hp3cs7pkzyl4";
+          name = "empos";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/empos";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emr = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, paredit, popup, projectile, redshank, s }:
+    melpaBuild {
+        pname = "emr";
+        version = "20140817.1804";
+        src = fetchFromGitHub {
+          owner = "chrisbarrett";
+          repo = "emacs-refactor";
+          rev = "fd20fc1887e2ebcf752f0170b1f3bf697043fd4b";
+          sha256 = "0pl7i2a0mf2s33qpsc14dcvqbl6jm5xrvcnrhfr7visvnih29cy4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emr";
+          sha256 = "05vpfxg6lviclnms2zyrza8dc87m60mimlwd11ihvsbngi9gcw8x";
+          name = "emr";
+        };
+        packageRequires = [
+          cl-lib
+          dash
+          emacs
+          list-utils
+          paredit
+          popup
+          projectile
+          redshank
+          s
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/emr";
+          license = lib.licenses.free;
+        };
+      }) {};
+    enclose = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "enclose";
+        version = "20121008.1114";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "enclose";
+          rev = "2747653e84af39017f503064bc66ed1812a77259";
+          sha256 = "0dz5xm05d7irh1j8iy08jk521p19cjai1kw68z2nngnyf1az7cim";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/enclose";
+          sha256 = "04gs468qqhdc9avx7lgibr0f1i444714i7rifad37dfmim8qk759";
+          name = "enclose";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/enclose";
+          license = lib.licenses.free;
+        };
+      }) {};
+    encourage-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "encourage-mode";
+        version = "20151128.305";
+        src = fetchFromGitHub {
+          owner = "halbtuerke";
+          repo = "encourage-mode.el";
+          rev = "99edacf2d94d168d3da0609860dc7253db7c9815";
+          sha256 = "0k5ns40s5nskn0zialwq96qll1v5k50lfa5xh8hxbpcamsfym6h8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/encourage-mode";
+          sha256 = "0fwn6w7s61c08z0d8z3awclqrhszia9is30gm2kx4hwr9dhhwh63";
+          name = "encourage-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/encourage-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    engine-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "engine-mode";
+        version = "20150902.1235";
+        src = fetchFromGitHub {
+          owner = "hrs";
+          repo = "engine-mode";
+          rev = "98020c5c8fcc3c675999fc6215af6a6259c5c017";
+          sha256 = "1k17z1dy9m9lx2fy78ack8fyf5vqb79fwjn078f93bcjl5mc7d4k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/engine-mode";
+          sha256 = "1gg7i93163m7k7lr3pnal1svymnhzwrfpfcdc0798d7ybv26gg8c";
+          name = "engine-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/engine-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    enh-ruby-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "enh-ruby-mode";
+        version = "20151123.341";
+        src = fetchFromGitHub {
+          owner = "zenspider";
+          repo = "enhanced-ruby-mode";
+          rev = "73d949ab1de16a4d3f368cde94dd5403c0402ab4";
+          sha256 = "008wggl6xxk339njrgpj2fndbil7k9f3i2hg1mjwqk033j87nbz7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/enh-ruby-mode";
+          sha256 = "0r486yajjf7vsaz92ypxpfmz2nsvw9giffpxb9szj7fcry3nfdns";
+          name = "enh-ruby-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/enh-ruby-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    enlive = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "enlive";
+        version = "20150824.749";
+        src = fetchFromGitHub {
+          owner = "zweifisch";
+          repo = "enlive";
+          rev = "0f6646adda3974e7fe9a42339a4ec3daa532eda5";
+          sha256 = "0vd7zy06nqb1ayjlnf2wl0bfv1cqv2qcb3cgy3zr9k9c4whcd8jh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/enlive";
+          sha256 = "1dyayk37zik12qfh8zbjmhsch64yqsx3acrlm7hcnavx465hmhnz";
+          name = "enlive";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/enlive";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eno = callPackage ({ dash, edit-at-point, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eno";
+        version = "20160110.434";
+        src = fetchFromGitHub {
+          owner = "enoson";
+          repo = "eno.el";
+          rev = "c07674329f66d6b4ea6c3a3944f801ab77ccb7e6";
+          sha256 = "0var9h1nslww3zlqbl9mvrkz7c9i2g8ka22mwqc1iv92ka3w0czv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eno";
+          sha256 = "0k4n4vw261v3bcxg7pqhxr99vh673l963yjridl0dp1663gcrfpk";
+          name = "eno";
+        };
+        packageRequires = [ dash edit-at-point ];
+        meta = {
+          homepage = "http://melpa.org/#/eno";
+          license = lib.licenses.free;
+        };
+      }) {};
+    enotify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "enotify";
+        version = "20130407.848";
+        src = fetchFromGitHub {
+          owner = "laynor";
+          repo = "enotify";
+          rev = "7fd2f48ef4ff32c8f013c634ea2dd6b1d1409f80";
+          sha256 = "0v5p97dvzrk3j59yjc6iny71j3fdw9bb8737wnnzm098ff42dfmd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/enotify";
+          sha256 = "0mii6m6zw9y8njgzi79rcf1n251iw7qz3yqjjij3c19rk3zpm5qi";
+          name = "enotify";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/enotify";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode2, yasnippet }:
+    melpaBuild {
+        pname = "ensime";
+        version = "20160109.1359";
+        src = fetchFromGitHub {
+          owner = "ensime";
+          repo = "ensime-emacs";
+          rev = "14b0384ee5147ba9c22c33e21e56b9ef1de9b377";
+          sha256 = "0rki36vi3ndb295rxg5jr3fbd2lc0ns518s4hzm6p9gnjw83hvik";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ensime";
+          sha256 = "1d8y72l7bh93x9zdj3d3qjhrrzr804rgi6kjifyrin772dffjwby";
+          name = "ensime";
+        };
+        packageRequires = [
+          company
+          dash
+          popup
+          s
+          sbt-mode
+          scala-mode2
+          yasnippet
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/ensime";
+          license = lib.licenses.free;
+        };
+      }) {};
+    envdir = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "envdir";
+        version = "20150519.955";
+        src = fetchFromGitHub {
+          owner = "proofit404";
+          repo = "envdir-mode";
+          rev = "efbfc45de320d33cd5c52edfa73a399a8b4dc34b";
+          sha256 = "0jb8hf4v02b0zd02749533arrypjr3b3k88129grfks2kf29ybhb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/envdir";
+          sha256 = "085bfm4w7flrv8jvzdnzbdg3j5n29xfzbs1wlrr29mg9dja6s8g8";
+          name = "envdir";
+        };
+        packageRequires = [ dash emacs f ];
+        meta = {
+          homepage = "http://melpa.org/#/envdir";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eopengrok = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, s }:
+    melpaBuild {
+        pname = "eopengrok";
+        version = "20160102.429";
+        src = fetchFromGitHub {
+          owner = "youngker";
+          repo = "eopengrok.el";
+          rev = "30154a083b2fd8cbb9336d0d2134f790efd4163b";
+          sha256 = "1yn9jn6jl6rmknj50g18z5yvpa1d8mzzx3j1pfdwfn36ak4nc9ba";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eopengrok";
+          sha256 = "0756x78113286hwk1i1m5s8xq04gh7zxb4fkmw58lg2ssff8q6av";
+          name = "eopengrok";
+        };
+        packageRequires = [ cl-lib dash magit s ];
+        meta = {
+          homepage = "http://melpa.org/#/eopengrok";
+          license = lib.licenses.free;
+        };
+      }) {};
+    epc = callPackage ({ concurrent, ctable, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "epc";
+        version = "20140610.34";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-epc";
+          rev = "76fe6847a341f78c635164c18908a0b691f7212c";
+          sha256 = "11z08y61xd00rlw5mcyrix8nx41mqs127wighhjsxsyzbfqydxdr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/epc";
+          sha256 = "1l9rcx07pa4b9z5654gyw6b64c95lcigzg15amphwr56v2g3rbzx";
+          name = "epc";
+        };
+        packageRequires = [ concurrent ctable ];
+        meta = {
+          homepage = "http://melpa.org/#/epc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    epic = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }:
+    melpaBuild {
+        pname = "epic";
+        version = "20150503.237";
+        src = fetchFromGitHub {
+          owner = "yoshinari-nomura";
+          repo = "epic";
+          rev = "02f6472bb490a39d42ed49c0364972173202f6e1";
+          sha256 = "18gfi1287skv5xvh12arkvxy2c4fism8bdk42wc5q3y21h8nsiim";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/epic";
+          sha256 = "0gfl8if83jbs0icz6gcjkwxvcz5v744k1kvqnbx3ga481kds9rqf";
+          name = "epic";
+        };
+        packageRequires = [ htmlize ];
+        meta = {
+          homepage = "http://melpa.org/#/epic";
+          license = lib.licenses.free;
+        };
+      }) {};
+    epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "epl";
+        version = "20150517.633";
+        src = fetchFromGitHub {
+          owner = "cask";
+          repo = "epl";
+          rev = "a5ad061d0a5eb42f66c384e55d102da7d52c96b0";
+          sha256 = "0s4k2grikhibd075435giv3bmba1mx71ndxlr0k1i0q0xawpyyb4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/epl";
+          sha256 = "0zr3r2hn9jaxscrl83hyixznb8l5dzfr6fsac76aa8x12xgsc5hn";
+          name = "epl";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/epl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    epresent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "epresent";
+        version = "20150324.810";
+        src = fetchFromGitHub {
+          owner = "eschulte";
+          repo = "epresent";
+          rev = "c185826a464f780467dff240fd63ec385bd1d9c2";
+          sha256 = "1a8gzf7abda0zgcllyl351m47avnf995i9lvwjf05nyx2jb31dnw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/epresent";
+          sha256 = "1x16wqfjfrh7kaqar5px61bf3lnlibvcbr5xaf3mcgph37sgi6la";
+          name = "epresent";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/epresent";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eprime-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eprime-mode";
+        version = "20140513.1316";
+        src = fetchFromGitHub {
+          owner = "AndrewHynes";
+          repo = "eprime-mode";
+          rev = "17a481af26496be91c07139a9bfc05cfe722506f";
+          sha256 = "1wwg46xdb488wxvglwvsy08vznrnmdmmbcvm9vb60dy3gqjmz7cw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eprime-mode";
+          sha256 = "0vswjcs24f3mdyw6ai7p21ab8pdn327lr2d6css0a5nrg539cn2g";
+          name = "eprime-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/eprime-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eproject = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eproject";
+        version = "20151205.2330";
+        src = fetchFromGitHub {
+          owner = "jrockway";
+          repo = "eproject";
+          rev = "fdff000d601eb8bdb165db3dc4925c6797308b78";
+          sha256 = "13ds5z2nvanx8cvxrzi0da6ixx7kw222z6mrlbs8cldqcmzm7xh2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eproject";
+          sha256 = "0kpg4r57khbyinc73v9kj32b9m3b4nb5014r5fkl5mzzpzmd85b4";
+          name = "eproject";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/eproject";
+          license = lib.licenses.free;
+        };
+      }) {};
+    erc-colorize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "erc-colorize";
+        version = "20160108.420";
+        src = fetchFromGitHub {
+          owner = "thisirs";
+          repo = "erc-colorize";
+          rev = "391391582b3c34750d56a3b3e819e03ad7c3bd42";
+          sha256 = "18r66yl52xm1gjbn0dm8z80gv4p3794pi91qa8i2sri4grbsyi5r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-colorize";
+          sha256 = "1m941q7ql3yb71s71783nvz822bwhn1krmin18fvh0fbsbbnck2a";
+          name = "erc-colorize";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/erc-colorize";
+          license = lib.licenses.free;
+        };
+      }) {};
+    erc-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "erc-crypt";
+        version = "20151030.1257";
+        src = fetchFromGitHub {
+          owner = "atomontage";
+          repo = "erc-crypt";
+          rev = "5d548bab298a27ca5886392c129b14d0e93067be";
+          sha256 = "1hzp42x6f73wsjr5n01i3dzsfrl5pym2l53rzlca11prcccvklfr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-crypt";
+          sha256 = "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3";
+          name = "erc-crypt";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/erc-crypt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    erc-hl-nicks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "erc-hl-nicks";
+        version = "20140619.722";
+        src = fetchFromGitHub {
+          owner = "leathekd";
+          repo = "erc-hl-nicks";
+          rev = "e536ea57f842f85ecda5a28ceed24cd506b7be2c";
+          sha256 = "0h2hfa5qpszg0pzi1gc7qfkn9kb37pfg0vlj30049xnryh80r9br";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-hl-nicks";
+          sha256 = "1lhw77n2nrjnb5yhnpm6yhbcp022xxjcmdgqf21z9rd0igss9mja";
+          name = "erc-hl-nicks";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/erc-hl-nicks";
+          license = lib.licenses.free;
+        };
+      }) {};
+    erc-image = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "erc-image";
+        version = "20150914.514";
+        src = fetchFromGitHub {
+          owner = "kidd";
+          repo = "erc-image.el";
+          rev = "270a60706e3e0669350bb7aaea465570ef5074cf";
+          sha256 = "03r13x2hxy4hk0n0ri5wld8rp8frx4j3mig6mn2v25k0cr52689f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-image";
+          sha256 = "1cgzygkysjyrsdr6jwqkxlnisxccsvh4kxgn19rk4n61ms7bafvf";
+          name = "erc-image";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/erc-image";
+          license = lib.licenses.free;
+        };
+      }) {};
+    erc-social-graph = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "erc-social-graph";
+        version = "20150508.704";
+        src = fetchFromGitHub {
+          owner = "vibhavp";
+          repo = "erc-social-graph";
+          rev = "e6ef3416a1c5064054bf054d9f0c1c7bf54a9cd0";
+          sha256 = "0k3gp4c74g5awk7v9lzb6py3dvf59nggh6dw7530cswxb6kg2psa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-social-graph";
+          sha256 = "07arn3k89cqxab5x5lczv8bpgrbirmlw9p6c37fgrl3df6f46h4h";
+          name = "erc-social-graph";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/erc-social-graph";
+          license = lib.licenses.free;
+        };
+      }) {};
+    erc-terminal-notifier = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "erc-terminal-notifier";
+        version = "20140115.424";
+        src = fetchFromGitHub {
+          owner = "julienXX";
+          repo = "erc-terminal-notifier.el";
+          rev = "a3dacb935845e4a20031212bbd82b2170f68d2a8";
+          sha256 = "0cfqbqskh260zfq1lx1s8jz2351w2ij9m73rqim16fy7zr0s0670";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-terminal-notifier";
+          sha256 = "0vrxkg62qr3ki8n9mdn02sdni5fkj79fpkn0drx0a4kqp0nrrj7c";
+          name = "erc-terminal-notifier";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/erc-terminal-notifier";
+          license = lib.licenses.free;
+        };
+      }) {};
+    erc-track-score = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "erc-track-score";
+        version = "20130328.715";
+        src = fetchFromGitHub {
+          owner = "jd";
+          repo = "erc-track-score.el";
+          rev = "5b27531ea6b1a4c4b703b270dfa9128cb5bfdaa3";
+          sha256 = "0n107d77z04ahypa7hn2165kkb6490v4vkzdm5zwm4lfhvlmp0x2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-track-score";
+          sha256 = "19wjwah2n8ri6gyrsbzxnrvxwr5cj48sxrar1226n9miqvgj5whx";
+          name = "erc-track-score";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/erc-track-score";
+          license = lib.licenses.free;
+        };
+      }) {};
+    erc-tweet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "erc-tweet";
+        version = "20150920.758";
+        src = fetchFromGitHub {
+          owner = "kidd";
+          repo = "erc-tweet.el";
+          rev = "91fed61e139fa788d66a7358f0d50acc896414b8";
+          sha256 = "118q4zj9dh5xnimcsi229j5pflhcd8qz0p212kc4p9dmyrx2iw0n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-tweet";
+          sha256 = "0bazwq21mah4qrzwaji6w13m91l6v9dqh9svxrd13ij8yycr184b";
+          name = "erc-tweet";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/erc-tweet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    erc-view-log = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "erc-view-log";
+        version = "20140227.1439";
+        src = fetchFromGitHub {
+          owner = "Niluge-KiWi";
+          repo = "erc-view-log";
+          rev = "c5a25f0cbca84ed2e4f72068c02b66bd0ea3b266";
+          sha256 = "0bzi2sh2fhrz49j5y53h6jgf41av6rx78smb3bbk6m74is8vim2y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-view-log";
+          sha256 = "1k6fawblz0d7kz1y7sa3q43s7ci28jsmzkp9vnl1nf55p9xvv4cf";
+          name = "erc-view-log";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/erc-view-log";
+          license = lib.licenses.free;
+        };
+      }) {};
+    erc-youtube = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "erc-youtube";
+        version = "20150603.1636";
+        src = fetchFromGitHub {
+          owner = "kidd";
+          repo = "erc-youtube.el";
+          rev = "97054ba8475b442e2aa81e5a291f668b7f28697f";
+          sha256 = "0kh4amx3l3a14qaiyvjyak1jbybs6n49mdvzjrd1i2vd1y74zj5w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-youtube";
+          sha256 = "12ylxkskkgfv5x7vlkib963ichb3rlmdzkf4zh8a39cgl8wsmacx";
+          name = "erc-youtube";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/erc-youtube";
+          license = lib.licenses.free;
+        };
+      }) {};
+    erc-yt = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "erc-yt";
+        version = "20150426.749";
+        src = fetchFromGitHub {
+          owner = "yhvh";
+          repo = "erc-yt";
+          rev = "43e7d49325b17a3217a6ffb4a9daf75c5ff4e6f8";
+          sha256 = "1dlw34kaslyvnsrahf4rm76r2b7qqqn589i4mmhr23prl8xbz9z9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-yt";
+          sha256 = "0yrwvahv4l2s1aavy6y6mjlrw8l11i00a249825ab5yaxrkzz7xc";
+          name = "erc-yt";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/erc-yt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ercn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ercn";
+        version = "20150523.1003";
+        src = fetchFromGitHub {
+          owner = "leathekd";
+          repo = "ercn";
+          rev = "79a4df5609046ae2e2e3375998287be6dda80615";
+          sha256 = "0xw3d9fz4kmn1myrsy44ki4bgg0aclv41wldl6r9nhvkrnri41cv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ercn";
+          sha256 = "0yvis02bypw6v1zv7i326y8s6j0id558n0bdri52hr5pw85imnlp";
+          name = "ercn";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ercn";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eredis = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "eredis";
+        version = "20120808.2207";
+        src = fetchsvn {
+          url = "http://eredis.googlecode.com/svn/trunk/";
+          rev = "28";
+          sha256 = "0cdyhklmsv0xfcq97c3wqh8scs6910jzvvp04w0jxlayd1dbzx49";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eredis";
+          sha256 = "1j0y4h97pqsw6k18w6r3rza3ql04ag3cixyndji7i1smbfsh4v95";
+          name = "eredis";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/eredis";
+          license = lib.licenses.free;
+        };
+      }) {};
+    erefactor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "erefactor";
+        version = "20150620.1943";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-erefactor";
+          rev = "fde3fd42c815c76e8015f69518a92f6bfcfde990";
+          sha256 = "17i567nfm0rykimh6bpcc5f2l7wsf8zcdy2jzd7sgrl54dvb0g9i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erefactor";
+          sha256 = "0ma9sbrq4n8y5w7vvbhhgmw25aiykbq5yhxzm0knj32bgpviprw7";
+          name = "erefactor";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/erefactor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ergoemacs-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
+    melpaBuild {
+        pname = "ergoemacs-mode";
+        version = "20160114.1228";
+        src = fetchFromGitHub {
+          owner = "ergoemacs";
+          repo = "ergoemacs-mode";
+          rev = "cac19fd1e79f46549e9e6b0ecd2d7a6e3104dd28";
+          sha256 = "0ngbxdasf5sbr0rqki6vakx0p1bcik8bivcwwn7rg77j7v7kflhi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ergoemacs-mode";
+          sha256 = "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62";
+          name = "ergoemacs-mode";
+        };
+        packageRequires = [ emacs undo-tree ];
+        meta = {
+          homepage = "http://melpa.org/#/ergoemacs-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "erlang";
+        version = "20151013.357";
+        src = fetchFromGitHub {
+          owner = "erlang";
+          repo = "otp";
+          rev = "427c9f4f7777dd00e0a03a42b9834a4d669305b6";
+          sha256 = "1695js0ws73d21my269hm1s59vgkyjn6w1rxsc45q40zpj88l83x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erlang";
+          sha256 = "1gmrdkfanivb9l5lmkl0853snlhl62w34537r82w11z2fbk9lxhc";
+          name = "erlang";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/erlang";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ert-async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ert-async";
+        version = "20151011.859";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "ert-async.el";
+          rev = "f64a7ed5b0d2900c9a3d8cc33294bf8a79bc8526";
+          sha256 = "0hn9i405nfhjd1h9vnwj43nxbbz00khrwkjq0acfyxjaz1shfac9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ert-async";
+          sha256 = "004798ckri5j72j0xvzkyciss1iz4lw9gya2749hkjxlamg14cn5";
+          name = "ert-async";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ert-async";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ert-expectations = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "ert-expectations";
+        version = "20130824.700";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/ert-expectations.el";
+          sha256 = "0cwy3ilsid90abzzjb7ha2blq9kmv3gfp3icwwfcz6qczgirq6g7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ert-expectations";
+          sha256 = "094lkf1h83rc0dkvdv8923xjrzj5pnpnsb4izk8n5n7g0rbz1l9w";
+          name = "ert-expectations";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ert-expectations";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ert-junit = callPackage ({ ert ? null, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ert-junit";
+        version = "20140830.1721";
+        src = fetchgit {
+          url = "https://bitbucket.org/olanilsson/ert-junit";
+          rev = "c303c04da7a3ba4d2c46b00b79b67ff7ec57cc6d";
+          sha256 = "eedfdd6753c32d16baa341e6d20abee8713921d8eb850d16782cde55bdbeec46";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ert-junit";
+          sha256 = "0bv22mhh1ahbjwi6s1csxkh11dmy0srabkddjd33l4havykxlg6g";
+          name = "ert-junit";
+        };
+        packageRequires = [ ert ];
+        meta = {
+          homepage = "http://melpa.org/#/ert-junit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ert-modeline = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, s }:
+    melpaBuild {
+        pname = "ert-modeline";
+        version = "20140115.415";
+        src = fetchFromGitHub {
+          owner = "chrisbarrett";
+          repo = "ert-modeline";
+          rev = "e7be2b81191afb437b70368a819770f8f750e4af";
+          sha256 = "08yfq3qzscxvzyxvyvdqpkrm787278yhkdd9prbvrgjj80p8n7vq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ert-modeline";
+          sha256 = "06pc50q9ggin20cbfafxd53x35ac3kh85dap0nbws7514f473m7b";
+          name = "ert-modeline";
+        };
+        packageRequires = [ dash emacs projectile s ];
+        meta = {
+          homepage = "http://melpa.org/#/ert-modeline";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ert-runner = callPackage ({ ansi, commander, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
+    melpaBuild {
+        pname = "ert-runner";
+        version = "20151023.313";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "ert-runner.el";
+          rev = "0a88a6cc9d970660c9f1205a623bc80d9bd5a05b";
+          sha256 = "0ivnfc42pw9pc9glx2m4klzx4csy4m60hj1x12js7492bd0ri933";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ert-runner";
+          sha256 = "0fnb8rmjr5lvc3dq0fnyxhws8ync1lj5xp8ycs63z4ax6gmdqr48";
+          name = "ert-runner";
+        };
+        packageRequires = [ ansi commander dash f s shut-up ];
+        meta = {
+          homepage = "http://melpa.org/#/ert-runner";
+          license = lib.licenses.free;
+        };
+      }) {};
+    es-lib = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "es-lib";
+        version = "20141111.1230";
+        src = fetchFromGitHub {
+          owner = "sabof";
+          repo = "es-lib";
+          rev = "753b27363e39c10edc9e4e452bdbbbe4d190df4a";
+          sha256 = "0jq4yp80wiphlpsc0429rg8n50g8l4lf78q0l3nywz2p93smjy9b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/es-lib";
+          sha256 = "0mwvgf5385qsp91zsdw75ipif1h90xy277xdmrpwixsxd7abbn0n";
+          name = "es-lib";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/es-lib";
+          license = lib.licenses.free;
+        };
+      }) {};
+    es-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "es-mode";
+        version = "20150916.2233";
+        src = fetchFromGitHub {
+          owner = "dakrone";
+          repo = "es-mode";
+          rev = "c5dd41e453e83da2e841894d9a51598f03318f7c";
+          sha256 = "1cc2k52vq2m4hzmrpb51xd5pjnxzv3iy8rf2y02c6f3a5xpilj9k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/es-mode";
+          sha256 = "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp";
+          name = "es-mode";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/es-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    es-windows = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "es-windows";
+        version = "20140211.304";
+        src = fetchFromGitHub {
+          owner = "sabof";
+          repo = "es-windows";
+          rev = "239e30408cb1adb4bc8bd63e2df34711fa910b4f";
+          sha256 = "14rsifcx2kwdmwq9zh41fkb848l0f4igp5v9pk3x4jd2yw9gay7m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/es-windows";
+          sha256 = "112ngkan0hv3y7m71479f46x5gwdmf0vhbqrzs5kcjwlacqlrahx";
+          name = "es-windows";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/es-windows";
+          license = lib.licenses.free;
+        };
+      }) {};
+    escreen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "escreen";
+        version = "20091203.1213";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "escreen";
+          rev = "e3fd46225fec70943024d950c6b6c2eb88e00b96";
+          sha256 = "0id7820vjbprlpprj4fyhylkjvx00b87mw4n7jnxn1gczvjgafmc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/escreen";
+          sha256 = "0yis27362jc63jkzdndz1wpysmf1b51rrbv3swvi6b36da5i6b54";
+          name = "escreen";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/escreen";
+          license = lib.licenses.free;
+        };
+      }) {};
+    esh-buf-stack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "esh-buf-stack";
+        version = "20140107.418";
+        src = fetchFromGitHub {
+          owner = "tom-tan";
+          repo = "esh-buf-stack";
+          rev = "ce0ea5aadca3150eaa9d2e6ec20296add4e99176";
+          sha256 = "1k8k9hl9m4vjqdw3x9wg04cy2lb9x64mq0mm0i3i6w59zrsnkn4q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/esh-buf-stack";
+          sha256 = "0zmwlsm98m9vbjk9mldfj2nf6cip7mlvb71j33ddix76yqggp4qg";
+          name = "esh-buf-stack";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/esh-buf-stack";
+          license = lib.licenses.free;
+        };
+      }) {};
+    esh-help = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "esh-help";
+        version = "20140107.422";
+        src = fetchFromGitHub {
+          owner = "tom-tan";
+          repo = "esh-help";
+          rev = "3dc15f2f6086d4e4da977468fda67229a859c927";
+          sha256 = "1yfvdx763xxhxf2r6kjjjyafaxrj1lpgrz1sgbhzkyj6nspmm9ms";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/esh-help";
+          sha256 = "1k925wmn8jy9rxxsxxawasxq6r4yzwl116digdx314gd3i04sh3w";
+          name = "esh-help";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/esh-help";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eshell-autojump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eshell-autojump";
+        version = "20150927.224";
+        src = fetchFromGitHub {
+          owner = "coldnew";
+          repo = "eshell-autojump";
+          rev = "c6a8b81a16576df9875e721fbbfe6690d04e7e43";
+          sha256 = "13crzgkx1lham1nfsg6hj2zg875majvnig0v4ydg691zk1qi4hc2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eshell-autojump";
+          sha256 = "09l2680hknmdbwr4cncv1v4b0adik0c3sm5i9m3qbwyyxm8m41i5";
+          name = "eshell-autojump";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/eshell-autojump";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eshell-did-you-mean = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eshell-did-you-mean";
+        version = "20150915.1452";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "eshell-did-you-mean";
+          rev = "7cb6ef8e2274d0a50a9e114d412307a6543533d5";
+          sha256 = "0v0wshck5n4hspcv1zk1g2nm6xiigcjp16lx0dc8wzkl6ymljvbg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eshell-did-you-mean";
+          sha256 = "1z1wpn3sj1gi5nn0a71wg0i3av0dijnk79dc32zh3qlh500kz8mz";
+          name = "eshell-did-you-mean";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/eshell-did-you-mean";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eshell-git-prompt = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "eshell-git-prompt";
+        version = "20150929.47";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "eshell-git-prompt";
+          rev = "1751dd26dab245fd9567ed5eb09ba0b312699eac";
+          sha256 = "1b94pamb92a26lvlbwyr7kgaiwax4hkgmmalh8l5ldcwxkscq09c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eshell-git-prompt";
+          sha256 = "0a8pyppqvnavvb8rwsjxagb76hra9zhs5gwa0ylyznmql83f8w8s";
+          name = "eshell-git-prompt";
+        };
+        packageRequires = [ cl-lib dash emacs s ];
+        meta = {
+          homepage = "http://melpa.org/#/eshell-git-prompt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eshell-prompt-extras";
+        version = "20150726.159";
+        src = fetchFromGitHub {
+          owner = "kaihaosw";
+          repo = "eshell-prompt-extras";
+          rev = "0b7670972b6b424b4a15a88b1733b99324dcf387";
+          sha256 = "0r2fbz5z935vny9cbi857ryddhbg9v8i93jrzn2xvqs3h5wj9jn9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eshell-prompt-extras";
+          sha256 = "1plvc8azpmb3phlrxhw3y18dv5y0xljsr5fqym4w84m66lq5csfj";
+          name = "eshell-prompt-extras";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/eshell-prompt-extras";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eshell-z";
+        version = "20151110.2246";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "eshell-z";
+          rev = "5a1317a58d9761c200d0ad49dc4793dec9f9490f";
+          sha256 = "0znk2wmvk7b5mi727cawbddvzx74dlm1lwsxgkiylx2qp299ark0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eshell-z";
+          sha256 = "14ixazj0nscyqsdv7brqnfr0q8llir1pwb91yhl9jdqypmadpm6d";
+          name = "eshell-z";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/eshell-z";
+          license = lib.licenses.free;
+        };
+      }) {};
+    espresso-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "espresso-theme";
+        version = "20130301.148";
+        src = fetchFromGitHub {
+          owner = "dgutov";
+          repo = "espresso-theme";
+          rev = "c3a524e873f33923fe511791197a66dea5156687";
+          sha256 = "0ir7j4dgy0fq9ybixaqs52kiqk73p9v6prgqzjs8nyicjrpmnpyq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/espresso-theme";
+          sha256 = "1bsff8fnq5z0f6cwg6wprz8qi3ivsqxpxx6v6fxfammn74qqyvb5";
+          name = "espresso-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/espresso-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    espuds = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "espuds";
+        version = "20151114.959";
+        src = fetchFromGitHub {
+          owner = "ecukes";
+          repo = "espuds";
+          rev = "1405972873339e056517217136de4ad3202d744a";
+          sha256 = "16r4j27j9yfdiy841w9q5ykkc6n3wrm7hvfacagb32mydk821ijg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/espuds";
+          sha256 = "16yzw9l64ahf5v92jzb7vyb4zqxxplq6qh0y9rkfmvm59s4nhk6c";
+          name = "espuds";
+        };
+        packageRequires = [ dash f s ];
+        meta = {
+          homepage = "http://melpa.org/#/espuds";
+          license = lib.licenses.free;
+        };
+      }) {};
+    esqlite = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcsv }:
+    melpaBuild {
+        pname = "esqlite";
+        version = "20151206.606";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-esqlite";
+          rev = "fae9826cbc255b0f0686a801288f1441bda5f631";
+          sha256 = "0ag444hfrpdrf3lnaz7l2plj392xgh7a2080421z3g0alc74m8h3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/esqlite";
+          sha256 = "1dny5qjzl9gaj90ihzbhliwk0n0x7jz333hzf6gaw7wsjmx91wlh";
+          name = "esqlite";
+        };
+        packageRequires = [ pcsv ];
+        meta = {
+          homepage = "http://melpa.org/#/esqlite";
+          license = lib.licenses.free;
+        };
+      }) {};
+    esqlite-helm = callPackage ({ esqlite, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "esqlite-helm";
+        version = "20151116.250";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-esqlite";
+          rev = "fae9826cbc255b0f0686a801288f1441bda5f631";
+          sha256 = "0ag444hfrpdrf3lnaz7l2plj392xgh7a2080421z3g0alc74m8h3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/esqlite-helm";
+          sha256 = "00y2nwyx13xlny40afczr31lvbpnw1cgmj5wc3iycyznizg5kvhq";
+          name = "esqlite-helm";
+        };
+        packageRequires = [ esqlite helm ];
+        meta = {
+          homepage = "http://melpa.org/#/esqlite-helm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ess";
+        version = "20160118.315";
+        src = fetchFromGitHub {
+          owner = "emacs-ess";
+          repo = "ESS";
+          rev = "6d05ba7c89371764c43e30a436d7166417cabd4d";
+          sha256 = "0sdg3ai9lw2cwf93qwb5pfwydrdlys0nfcx07mxn9h7k0vsxmjfx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess";
+          sha256 = "02kz4fjxr0vrj5mg13cq758nzykizq4dmsijraxv46snvh337v5i";
+          name = "ess";
+        };
+        packageRequires = [ julia-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/ess";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ess-R-data-view = callPackage ({ ctable, ess, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "ess-R-data-view";
+        version = "20130509.658";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "ess-R-data-view.el";
+          rev = "d6e98d3ae1e2a2ea39a56eebcdb73e99d29562e9";
+          sha256 = "1ya2ay52gkrd31pmw45ban8kkxgnzhhwkzkypwdhjfccq3ys835x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess-R-data-view";
+          sha256 = "0r2fzwayf3yb7fqk6f31x4xfqiiczwik8qw4rrvkqx2h3s1kz7i0";
+          name = "ess-R-data-view";
+        };
+        packageRequires = [ ctable ess popup ];
+        meta = {
+          homepage = "http://melpa.org/#/ess-R-data-view";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ess-R-object-popup = callPackage ({ ess, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "ess-R-object-popup";
+        version = "20130302.536";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "ess-R-object-popup.el";
+          rev = "7e1f601bfba72de0fda44d9c82f96028ecbb9948";
+          sha256 = "0q8pbaa6wahli6fh0kng5zmnypsxi1fr2bzs2mfk3h8vf4nikpv0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess-R-object-popup";
+          sha256 = "1dxwgahfki6d6ywh85ifk3kq6f2a1114kkd8xcv4lcpzqykp93zj";
+          name = "ess-R-object-popup";
+        };
+        packageRequires = [ ess popup ];
+        meta = {
+          homepage = "http://melpa.org/#/ess-R-object-popup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ess-smart-equals = callPackage ({ emacs, ess, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ess-smart-equals";
+        version = "20150202.1";
+        src = fetchFromGitHub {
+          owner = "genovese";
+          repo = "ess-smart-equals";
+          rev = "e0f5f18f01ed252fde50d051adf1fa6254a254c9";
+          sha256 = "0ici253mllqyzcbhxrazfj2kl50brr8qid99fk9nlyfgh516ms1x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess-smart-equals";
+          sha256 = "0mfmxmsqr2byj56psx4h08cjc2j3aac3xqr04yd47k2mlivnyrxp";
+          name = "ess-smart-equals";
+        };
+        packageRequires = [ emacs ess ];
+        meta = {
+          homepage = "http://melpa.org/#/ess-smart-equals";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ess-smart-underscore = callPackage ({ ess, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ess-smart-underscore";
+        version = "20131229.2051";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "ess-smart-underscore.el";
+          rev = "f3bbee01754888452232b337173b57c6c266de49";
+          sha256 = "01xa98q0pqsf4gyl6ixlpjjdqazqsxg1sf7a3j2wbh7196ps61v5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess-smart-underscore";
+          sha256 = "01pki1xa8zpgvldcbjwg6vmslj7ddf44hsx976xipc95vrdk15r2";
+          name = "ess-smart-underscore";
+        };
+        packageRequires = [ ess ];
+        meta = {
+          homepage = "http://melpa.org/#/ess-smart-underscore";
+          license = lib.licenses.free;
+        };
+      }) {};
+    esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "esup";
+        version = "20151227.1150";
+        src = fetchFromGitHub {
+          owner = "jschaf";
+          repo = "esup";
+          rev = "fc061f30c5c68a4104333b65a55c51589a89f231";
+          sha256 = "034rs6mmc5f6y8ply2a90b5s4pi4qx9m49wsxc9v0zwa9i5skmx1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/esup";
+          sha256 = "0cv3zc2zzm38ki3kxq58g9sp4gsk3dffa398wky6z83a3zc02zs0";
+          name = "esup";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/esup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    esxml = callPackage ({ fetchFromGitHub, fetchurl, kv, lib, melpaBuild }:
+    melpaBuild {
+        pname = "esxml";
+        version = "20151013.1328";
+        src = fetchFromGitHub {
+          owner = "tali713";
+          repo = "esxml";
+          rev = "ca09423c3172820ba97dcc68204911d06f55f851";
+          sha256 = "0mrfkq3jcsjfccqir02yijl24hllc347b02y7gk3b2yn0b676dv3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/esxml";
+          sha256 = "0nn074abkxz7p4w59l1za586p5ya392xhl3sx92yys8a3194n6hz";
+          name = "esxml";
+        };
+        packageRequires = [ kv ];
+        meta = {
+          homepage = "http://melpa.org/#/esxml";
+          license = lib.licenses.free;
+        };
+      }) {};
+    etable = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, interval-list, lib, melpaBuild }:
+    melpaBuild {
+        pname = "etable";
+        version = "20150327.1216";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "ETable";
+          rev = "8c9a32a92e7f808874c150c851f1605b2dd83d6e";
+          sha256 = "1k361bbwd9z17qlycymb1x7scidvgvrh9bdp06rhwfh9j3slrbxy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/etable";
+          sha256 = "0m4h24mmhp680wfhb90im228mrcyxapzyi4kla8xdmss83gc0c32";
+          name = "etable";
+        };
+        packageRequires = [ dash emacs interval-list ];
+        meta = {
+          homepage = "http://melpa.org/#/etable";
+          license = lib.licenses.free;
+        };
+      }) {};
+    etags-select = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "etags-select";
+        version = "20130824.700";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/etags-select.el";
+          sha256 = "0gmlmxlwfsfk5axn3x5cfvqy9bx26ynpbg50mdxiljk7wzqs5dyb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/etags-select";
+          sha256 = "0j6mxj10n7jf087l7j86s3a8si5hzpwmvrpqisfvlnvn6a0rdy7h";
+          name = "etags-select";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/etags-select";
+          license = lib.licenses.free;
+        };
+      }) {};
+    etags-table = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "etags-table";
+        version = "20130824.657";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/etags-table.el";
+          sha256 = "0apm8as606bbkpa7i1hkwcbajzsmsyxn6cwfk9dkkll5bh4vglqf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/etags-table";
+          sha256 = "1jzij9jknab42jmx358g7f1c0d8lsp9baxbk3xsy7w4nl0l53d84";
+          name = "etags-table";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/etags-table";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ethan-wspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ethan-wspace";
+        version = "20151217.2010";
+        src = fetchFromGitHub {
+          owner = "glasserc";
+          repo = "ethan-wspace";
+          rev = "477444d95adc2cb86c82e498cbaa5fbb1fc293a8";
+          sha256 = "098mfyw63b23h7jajaik1rfj307sxs82nnwf6b81j550kl2n05y6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ethan-wspace";
+          sha256 = "0k4kqkf5c6ysyhh1vpi9v4220yxm5ir3ippq2gmvvhnk77pg6hws";
+          name = "ethan-wspace";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ethan-wspace";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
+    melpaBuild {
+        pname = "eval-in-repl";
+        version = "20160117.957";
+        src = fetchFromGitHub {
+          owner = "kaz-yos";
+          repo = "eval-in-repl";
+          rev = "c5072e60bff11de48944476ef361e9d48a55e2ff";
+          sha256 = "0vd2crs261na9a682d74ycz1il661kavsz1bvs0bkak09lplc1qz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eval-in-repl";
+          sha256 = "10h5vy9wdiqf9dgk1d1bsvp93y8sfcxghzg8zbhhn7m5cqg2wh63";
+          name = "eval-in-repl";
+        };
+        packageRequires = [ ace-window dash paredit ];
+        meta = {
+          homepage = "http://melpa.org/#/eval-in-repl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eval-sexp-fu = callPackage ({ fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eval-sexp-fu";
+        version = "20131230.1551";
+        src = fetchFromGitHub {
+          owner = "hchbaw";
+          repo = "eval-sexp-fu.el";
+          rev = "6cffd33155d10c3e58b39cbb170f42e910fd8595";
+          sha256 = "1syqakdyg3ydnq9gvkjf2rw9rz3kyhzp7avhy6dvyy65pv2ndyc2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eval-sexp-fu";
+          sha256 = "17cazf81z4cszflnfp66zyq2cclw5sp9539pxskdf267cf7r0ycs";
+          name = "eval-sexp-fu";
+        };
+        packageRequires = [ highlight ];
+        meta = {
+          homepage = "http://melpa.org/#/eval-sexp-fu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil = callPackage ({ fetchhg, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
+    melpaBuild {
+        pname = "evil";
+        version = "20160118.117";
+        src = fetchhg {
+          url = "https://bitbucket.com/lyro/evil";
+          rev = "e2c001ecfded";
+          sha256 = "1by2b0qa5hk2jvkxg8j4b0wpnw3mbg0vdggp4nh33m61290jsn5k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil";
+          sha256 = "09qrhy7l229w0qk3ba1i2xg4vqz8525v8scrbm031lqp30jp54hc";
+          name = "evil";
+        };
+        packageRequires = [ goto-chg undo-tree ];
+        meta = {
+          homepage = "http://melpa.org/#/evil";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-annoying-arrows = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-annoying-arrows";
+        version = "20150509.1618";
+        src = fetchFromGitHub {
+          owner = "endrebak";
+          repo = "evil-annoying-arrows";
+          rev = "1ec60cea0e67d782e5b8d093d19da6d0d4fd1e7f";
+          sha256 = "05fba10yvxl82g2xl48mxwz7cwjp4pylb7n8a4b08i8f9xasny7f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-annoying-arrows";
+          sha256 = "024zz9l43y1kk2hm8l96h1ahril23cj35f0x72jrcfjysid7wpry";
+          name = "evil-annoying-arrows";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-annoying-arrows";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-anzu = callPackage ({ anzu, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-anzu";
+        version = "20150124.1809";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-evil-anzu";
+          rev = "a041db15bd6e2eb353b24f6f984f6c5ee618d460";
+          sha256 = "0cnj91lwpmk4c8nf3xi80yvv6anvkg8h1kbzbp16glkgmy6jpmy8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-anzu";
+          sha256 = "19cmc61l370mm4h2m6jw5pdcsvj4wcv9zpa8z7k1fjg57mwmmn70";
+          name = "evil-anzu";
+        };
+        packageRequires = [ anzu evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-anzu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-args = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-args";
+        version = "20140329.1629";
+        src = fetchFromGitHub {
+          owner = "wcsmith";
+          repo = "evil-args";
+          rev = "2a88b4d19953a11227cc1e91973b92149116f44c";
+          sha256 = "1nh7wa4ynr7ln42x32znzqsmh7ijzy5ymd7rszf49l8677alvazq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-args";
+          sha256 = "1bwdvf1i3jc77bw2as1wr1djm8z3a7wms60694xkyqh0m909hs2w";
+          name = "evil-args";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-args";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-avy = callPackage ({ avy, cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-avy";
+        version = "20150908.248";
+        src = fetchFromGitHub {
+          owner = "louy2";
+          repo = "evil-avy";
+          rev = "2dd955cc3ecaa7ddeb67b295298abdc6d16dd3a5";
+          sha256 = "1q6znbnshk45mdglx519qlbfhb7g47qsm245i93ka4djsjy55j9l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-avy";
+          sha256 = "1hc96dd78yxgr8cs9sk9y1i5h1qnyk110vlb3wnlxv1hwn92qvrd";
+          name = "evil-avy";
+        };
+        packageRequires = [ avy cl-lib emacs evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-avy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-cleverparens = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit, smartparens }:
+    melpaBuild {
+        pname = "evil-cleverparens";
+        version = "20151201.2238";
+        src = fetchFromGitHub {
+          owner = "luxbock";
+          repo = "evil-cleverparens";
+          rev = "60ffddad2ff0bce3d8afdec4d198daa2fad6c46b";
+          sha256 = "08cpgbwsrk8n88qiq2z90s6wx0ayvrrb38m8dks595x2qzzpa1gi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-cleverparens";
+          sha256 = "10zkyaxy52ixh26hzm9v1y0gakcn5sdwz4ny8v1vcmjqjphnk799";
+          name = "evil-cleverparens";
+        };
+        packageRequires = [ dash emacs evil paredit smartparens ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-cleverparens";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-commentary";
+        version = "20151210.527";
+        src = fetchFromGitHub {
+          owner = "linktohack";
+          repo = "evil-commentary";
+          rev = "122880a6721fcf16479f406c78c6e490a25efab0";
+          sha256 = "1qiym8f56a18j5swrxx5is48nz7z76531k8cw2c7czr6611l8l5a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-commentary";
+          sha256 = "151iiimmkpn58pl9zn40qssfahbrqy83axyl9dcd6kx2ywv5gcxz";
+          name = "evil-commentary";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-commentary";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-dvorak = callPackage ({ ace-jump-mode, evil, evil-surround, fetchFromGitHub, fetchurl, helm, helm-swoop, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-dvorak";
+        version = "20151104.726";
+        src = fetchFromGitHub {
+          owner = "jbranso";
+          repo = "evil-dvorak";
+          rev = "c193913839e153b0f2c973fae5e6b1fe51809d2b";
+          sha256 = "0jbb0ln54p43rqyw188ggrc848v24mhwdj9xna16y4g41g00i105";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-dvorak";
+          sha256 = "1iq9wzcb625vs942khja39db1js8r46vrdiqcm47yfji98g39gsn";
+          name = "evil-dvorak";
+        };
+        packageRequires = [ ace-jump-mode evil evil-surround helm helm-swoop ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-dvorak";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-easymotion = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-easymotion";
+        version = "20160105.1418";
+        src = fetchFromGitHub {
+          owner = "PythonNut";
+          repo = "evil-easymotion";
+          rev = "b39fc6250a3893acbf98cafbf028a0f4abb1a8a2";
+          sha256 = "17dng6iik4jzri6f435icrfb5g9zs2zqc6jgwkpphsgjcc12izrr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-easymotion";
+          sha256 = "0zixgdhc228y6yqr044cbyls0pihzacqsgvybhhar916p4h8izgv";
+          name = "evil-easymotion";
+        };
+        packageRequires = [ avy emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-easymotion";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-ediff = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-ediff";
+        version = "20160118.1118";
+        src = fetchFromGitHub {
+          owner = "justbur";
+          repo = "evil-ediff";
+          rev = "1df82b66e16794987d8cd3e5fa05ab1920ae48dd";
+          sha256 = "1qf94jfp6vgm3lg8wsmpk137rdv0q0n3d6xcc54afhm9qi84gzkn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-ediff";
+          sha256 = "1xwl2511byb00ybfnm6q6mbkgzarrq8bfv5rbip67zqbw2qgmb6i";
+          name = "evil-ediff";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-ediff";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-escape";
+        version = "20151214.1311";
+        src = fetchFromGitHub {
+          owner = "syl20bnr";
+          repo = "evil-escape";
+          rev = "32a6c6c31eaa5678205ce658baaab7eb5ca9c9e3";
+          sha256 = "1dl201jx7kfmkhd7ism6wlmlnbgfg1qn17faryz7kc5v2mms69b4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-escape";
+          sha256 = "0rlwnnshcvsb5kn7db5qy39s89qmqlllvg2z8cnxyri8bsssks4k";
+          name = "evil-escape";
+        };
+        packageRequires = [ cl-lib emacs evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-escape";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-exchange = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-exchange";
+        version = "20160117.2202";
+        src = fetchFromGitHub {
+          owner = "Dewdrops";
+          repo = "evil-exchange";
+          rev = "55375945729140ce6bd8806c3da1536801fbf0f5";
+          sha256 = "0gbpd1wmlcvddiym0r410rch8bjg4gxslynwmfqywwgbva8zm46c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-exchange";
+          sha256 = "1mvw7w23yfbfmhzj6wimslbryb0gppryw24ac0wh4fzl9rdcma4r";
+          name = "evil-exchange";
+        };
+        packageRequires = [ cl-lib evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-exchange";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-god-state = callPackage ({ evil, fetchFromGitHub, fetchurl, god-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-god-state";
+        version = "20141116.2055";
+        src = fetchFromGitHub {
+          owner = "gridaphobe";
+          repo = "evil-god-state";
+          rev = "3d44197dc0a1fb40e7b7ff8717f8a8c339ce1d40";
+          sha256 = "1cv24qnxxf6n1grf4n5969v8y9xll5zb9mbfdnq9iavdvhnndk2h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-god-state";
+          sha256 = "1g547d58zf11qw0zz3fk5kmrzmfx1rhawyh5d2h8bll8hwygnrxf";
+          name = "evil-god-state";
+        };
+        packageRequires = [ evil god-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-god-state";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-iedit-state = callPackage ({ evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-iedit-state";
+        version = "20141217.1934";
+        src = fetchFromGitHub {
+          owner = "syl20bnr";
+          repo = "evil-iedit-state";
+          rev = "153de161d5a272e3740dd862a3b7530b4240bcf8";
+          sha256 = "1kdigwpl9pp88l11bkpxkw91pvs8z3gachxccibivzgjxd2pnvfl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-iedit-state";
+          sha256 = "1dihyh7vqcp7kvfic613k7v33czr93hz04d635awrsyzgy8savhl";
+          name = "evil-iedit-state";
+        };
+        packageRequires = [ evil iedit ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-iedit-state";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-indent-plus = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-indent-plus";
+        version = "20151109.1306";
+        src = fetchFromGitHub {
+          owner = "TheBB";
+          repo = "evil-indent-plus";
+          rev = "0c7501e6efed661242c3a20e0a6c79a6455c2c40";
+          sha256 = "1g6r1ydscwjvmhh1zg4q3nap4avk8lb9msdqrh7dff6pla0r2qs6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-indent-plus";
+          sha256 = "15vnvch0qsaram22d44k617bqhr9rrf8qc86sf20yvdyy3gi5j12";
+          name = "evil-indent-plus";
+        };
+        packageRequires = [ cl-lib evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-indent-plus";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-indent-textobject = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-indent-textobject";
+        version = "20130831.1719";
+        src = fetchFromGitHub {
+          owner = "cofi";
+          repo = "evil-indent-textobject";
+          rev = "70a1154a531b7cfdbb9a31d6922482791e20a3a7";
+          sha256 = "0nghisnc49ivh56mddfdlcbqv3y2vqzjvkpgwv3zp80ga6ghvdmz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-indent-textobject";
+          sha256 = "172a3krid5lrx1w9xcifkhjnvlxg1nbz4w102d99d0grr9465r09";
+          name = "evil-indent-textobject";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-indent-textobject";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-jumper = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-jumper";
+        version = "20160114.1429";
+        src = fetchFromGitHub {
+          owner = "bling";
+          repo = "evil-jumper";
+          rev = "b57b706a3a983462c9c764da1670f7bde5eb0471";
+          sha256 = "1h8v78wlr1v5k6fdk8v8nkx3xqp9yf5gpzyn1f3k9wn8rp7bbjhb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-jumper";
+          sha256 = "0zwsk7slzvcgvgh8fjrwangylishrwc1w0glxcr71sybxph2g46x";
+          name = "evil-jumper";
+        };
+        packageRequires = [ cl-lib evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-jumper";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-leader = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-leader";
+        version = "20140606.743";
+        src = fetchFromGitHub {
+          owner = "cofi";
+          repo = "evil-leader";
+          rev = "39f7014bcf8b36463e0c7512c638bda4bac6c2cf";
+          sha256 = "10xrlimsxk09z9cw6rxdz8qvvn1i0vhc1gdicwxri0j10p0hacl3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-leader";
+          sha256 = "154s2nb170hzksmc87wnzlwg3ic3w3ravgsfvwkyfi2q285vmra6";
+          name = "evil-leader";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-leader";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-lisp-state = callPackage ({ bind-map, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
+    melpaBuild {
+        pname = "evil-lisp-state";
+        version = "20151201.924";
+        src = fetchFromGitHub {
+          owner = "syl20bnr";
+          repo = "evil-lisp-state";
+          rev = "f4da21900563f4ac1abf79f3fe73eaf1edcd633d";
+          sha256 = "0lvjqs40caxj3781cs41qavk10vlz2mjw0r6fmxa2z3c087cxnxw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-lisp-state";
+          sha256 = "117irac05fs73n7sgja3zd7yh4nz9h0gw5b1b57lfkav6y3ndgcy";
+          name = "evil-lisp-state";
+        };
+        packageRequires = [ bind-map evil smartparens ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-lisp-state";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "evil-magit";
+        version = "20160117.2026";
+        src = fetchFromGitHub {
+          owner = "justbur";
+          repo = "evil-magit";
+          rev = "233d0bd6c87c8113e4ed4684b50c3eb5a5d91a67";
+          sha256 = "00ly0p93l9li2hydpkijyp7mi00kwjw4nyzw2ibxabqsv4071clz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-magit";
+          sha256 = "10mhq6mzpklk5sj28lvd478dv9k84s81ax5jkwwxj26mqdw1ybg6";
+          name = "evil-magit";
+        };
+        packageRequires = [ evil magit ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-magit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-mark-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-mark-replace";
+        version = "20150424.218";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "evil-mark-replace";
+          rev = "56cf191724a3e82239ca47a17b071c20aedb0617";
+          sha256 = "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-mark-replace";
+          sha256 = "03cq43vlv1b53w4kw7mjvk026i8rzhhryfb27ddn6ipgc6xh68a0";
+          name = "evil-mark-replace";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-mark-replace";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-matchit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-matchit";
+        version = "20151120.535";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "evil-matchit";
+          rev = "8b80b3df9472217d55962981025539f2da603296";
+          sha256 = "0kf4m1ghpxfalqx2zwm1d8xav4d6l6bpk79g5cvssk5jz5913fbi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-matchit";
+          sha256 = "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq";
+          name = "evil-matchit";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/evil-matchit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-mc";
+        version = "20151230.1042";
+        src = fetchFromGitHub {
+          owner = "gabesoft";
+          repo = "evil-mc";
+          rev = "6b2ec63d4824243e6eec75618365a45620af2957";
+          sha256 = "1idngl8b3k7mpyxkrg3hg87w7iz2p5smbcl9lsckm1c01z0siwjr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-mc";
+          sha256 = "0cq4xg6svb5gz4ra607wy768as2igla4h1xcrfnxldknk476fqqs";
+          name = "evil-mc";
+        };
+        packageRequires = [ cl-lib emacs evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-mc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-nerd-commenter";
+        version = "20160111.444";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "evil-nerd-commenter";
+          rev = "981c80bb53384f93987d03c1b307767f2a68791a";
+          sha256 = "16wn74690572n3xpxvnvka524fzswxxni3dy98bwpvsqj6yx2ds5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-nerd-commenter";
+          sha256 = "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d";
+          name = "evil-nerd-commenter";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/evil-nerd-commenter";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-numbers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-numbers";
+        version = "20140606.751";
+        src = fetchFromGitHub {
+          owner = "cofi";
+          repo = "evil-numbers";
+          rev = "6ea1c8c3a9b37bed63d48f1128e9a4910e68187e";
+          sha256 = "1aq95hj8x13py0pwsnc6wvd8cc5yv5qin8ym9js42y5966vwj4np";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-numbers";
+          sha256 = "1lpmkklwjdf7ayhv99g9zh3l9hzrwm0hr0ijvbc7yz3n398zn1b2";
+          name = "evil-numbers";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/evil-numbers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-org = callPackage ({ evil, evil-leader, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "evil-org";
+        version = "20151203.147";
+        src = fetchFromGitHub {
+          owner = "edwtjo";
+          repo = "evil-org-mode";
+          rev = "61319f85979e8768c930983595caa2483c0fb319";
+          sha256 = "0pir7a3xxbcp5f3q9pi36rpdpi8pbx18afmh0r3501ynssyjfq53";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-org";
+          sha256 = "18w07fbafry3wb87f55kd8y0yra3s18a52f3m5kkdlcz5zwagi1c";
+          name = "evil-org";
+        };
+        packageRequires = [ evil evil-leader org ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-org";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-paredit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
+    melpaBuild {
+        pname = "evil-paredit";
+        version = "20150413.1548";
+        src = fetchFromGitHub {
+          owner = "roman";
+          repo = "evil-paredit";
+          rev = "e058fbdcf9dbf7ad6cc77f0172d7517ef233d55f";
+          sha256 = "0b08y4spapl4g2292j3l4cr84gjlvm3rpma3gqld4yb1sxd7v78p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-paredit";
+          sha256 = "0xvxxa3gjgsrv10a61y0591bn3gj8v1ff2wck8s0svwfl076gyfy";
+          name = "evil-paredit";
+        };
+        packageRequires = [ evil paredit ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-paredit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-quickscope = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-quickscope";
+        version = "20150929.1448";
+        src = fetchFromGitHub {
+          owner = "blorbx";
+          repo = "evil-quickscope";
+          rev = "d2f512fa4bd0b0603529a441e474ca551f621650";
+          sha256 = "0yx5ry102hzhqx1aql58fkd986xgj250bbcxabpnvy27gim2b977";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-quickscope";
+          sha256 = "0xym1mh4p68i00l1lshywf5fdg1vw3szxp3fk9fwfcg04z6vd489";
+          name = "evil-quickscope";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-quickscope";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-rails = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile-rails }:
+    melpaBuild {
+        pname = "evil-rails";
+        version = "20150803.646";
+        src = fetchFromGitHub {
+          owner = "antono";
+          repo = "evil-rails";
+          rev = "6a9375bf7f5823c8138e679249c4e2ce58f2e93a";
+          sha256 = "12rdx5zjp5pck008cykpw200rr1y0b3lj2dpzf82llfyfaxzh7wi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-rails";
+          sha256 = "0ah0nvzl30z19566kacyrsznsdm3cpij8n3bw3dfng7263rh60gj";
+          name = "evil-rails";
+        };
+        packageRequires = [ evil projectile-rails ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-rails";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-rsi = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-rsi";
+        version = "20151027.1719";
+        src = fetchFromGitHub {
+          owner = "linktohack";
+          repo = "evil-rsi";
+          rev = "efba0e191a71198bff118d29c0766ee2b351377a";
+          sha256 = "176rdp7mp9p0w5s7539jgldfn3r79q653g8yzcp99y59b8dycbh5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-rsi";
+          sha256 = "0mc39n72420n36kwyf9zpw1pgyih0aigfnmkbywb0yxgj7myc345";
+          name = "evil-rsi";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-rsi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-search-highlight-persist = callPackage ({ fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-search-highlight-persist";
+        version = "20151215.438";
+        src = fetchFromGitHub {
+          owner = "juanjux";
+          repo = "evil-search-highlight-persist";
+          rev = "0e2b3d4e3dec5f38ae95f62519eb2736f73c0b85";
+          sha256 = "1jfi2k9dm0cc9bx8klppm965ydhdw17a2n664199vhxrap6g27yk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-search-highlight-persist";
+          sha256 = "0iia136js364iygi1mydyzwvizhic6w5z9pbwmhva4654pq8dzqy";
+          name = "evil-search-highlight-persist";
+        };
+        packageRequires = [ highlight ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-search-highlight-persist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-smartparens = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
+    melpaBuild {
+        pname = "evil-smartparens";
+        version = "20151126.324";
+        src = fetchFromGitHub {
+          owner = "expez";
+          repo = "evil-smartparens";
+          rev = "0e89b23924b2e0baa0d11841ea5126967a072fa8";
+          sha256 = "0xwrg03w40pncdy5ppn7f77ravcbimj1ylc1r4clpqiha1d4xkhi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-smartparens";
+          sha256 = "1viwrd6gfqmwhlil80pk68dikn3cjf9ddsy0z781z3qfx0j35qza";
+          name = "evil-smartparens";
+        };
+        packageRequires = [ emacs evil smartparens ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-smartparens";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-snipe = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-snipe";
+        version = "20151106.1602";
+        src = fetchFromGitHub {
+          owner = "hlissner";
+          repo = "evil-snipe";
+          rev = "71f0f7df2300be390227e3f78619630c32bddbe9";
+          sha256 = "0iyk8pn7pc3js3ppn46myzfr2i0b47wwrzv72939aydpw64rx76q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-snipe";
+          sha256 = "0gcmpjw3iw7rjk86b2k6clfigp48vakfjd1a9n8qramhnc85rgkn";
+          name = "evil-snipe";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-snipe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-space = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-space";
+        version = "20151208.628";
+        src = fetchFromGitHub {
+          owner = "linktohack";
+          repo = "evil-space";
+          rev = "a9c07284d308425deee134c9d88a2d538dd229e6";
+          sha256 = "1x4nphjq8lvg8qsm1pj04mk9n59xc6jlxiv5s3bih1nl4xkssrxy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-space";
+          sha256 = "1asvh873r1xgffvz3nr653yn8h5ifaphnafp6wf1b1mja6as7f23";
+          name = "evil-space";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-space";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-surround = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-surround";
+        version = "20151210.1418";
+        src = fetchFromGitHub {
+          owner = "timcharper";
+          repo = "evil-surround";
+          rev = "9f1ab3c302d585c3489f0429b904e7e6e3204e94";
+          sha256 = "15vy2l6q0zm50wknw4fnz2v3j81p77y4ya7clk66lia3qdca4z9v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-surround";
+          sha256 = "1bcjxw0yrk2bqj5ihl5r2c4id0m9wbnj7fpd0wwmw9444xvwp8ag";
+          name = "evil-surround";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/evil-surround";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-tabs = callPackage ({ elscreen, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-tabs";
+        version = "20150127.1546";
+        src = fetchFromGitHub {
+          owner = "krisajenkins";
+          repo = "evil-tabs";
+          rev = "93eba393e86ea4574aebaf4edbd27dce4fd7b2e6";
+          sha256 = "1rjpgcl9m23fzlw9gfp0yyf5k5dcgn88pjm8glmmdpx1b08ymk79";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-tabs";
+          sha256 = "0qgvpv5hcai8wmkv2fp6i2vdy7qp4gwidwpzz8j6vl9519x73s62";
+          name = "evil-tabs";
+        };
+        packageRequires = [ elscreen evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-tabs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-terminal-cursor-changer = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-terminal-cursor-changer";
+        version = "20150827.2151";
+        src = fetchFromGitHub {
+          owner = "7696122";
+          repo = "evil-terminal-cursor-changer";
+          rev = "2735a11a2a0c8d327b730cefef2794834263c413";
+          sha256 = "10aic2r1akk38hh761hr5vp9fjlh1m5nimag0nzdq5x9g9467cc8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-terminal-cursor-changer";
+          sha256 = "1300ch6f8mkz45na1hdffglhw0cdrrxmwnbd3g4m3sl5z4midian";
+          name = "evil-terminal-cursor-changer";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-terminal-cursor-changer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-textobj-anyblock = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-textobj-anyblock";
+        version = "20151017.1617";
+        src = fetchFromGitHub {
+          owner = "noctuid";
+          repo = "evil-textobj-anyblock";
+          rev = "a9e1fdd546312fa787cd0a0acc7ca5e0253de945";
+          sha256 = "1v4z2snllgg32cy8glv7xl0m9ib7rwi5ixgdydz1d0sx0z62jyhw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-textobj-anyblock";
+          sha256 = "03vk30s2wkcszcjxmh5ww39rihnag9cp678wdzq4bnqy0c6rnjwa";
+          name = "evil-textobj-anyblock";
+        };
+        packageRequires = [ cl-lib evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-textobj-anyblock";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-textobj-column = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
+    melpaBuild {
+        pname = "evil-textobj-column";
+        version = "20151228.1544";
+        src = fetchFromGitHub {
+          owner = "noctuid";
+          repo = "evil-textobj-column";
+          rev = "d45a0f2831e6da51435abe27294222055f04ab32";
+          sha256 = "0nff90v6d97n2xizvfz126ksrf7ngd5rp0j7k7lhbv0v5zcqgxiv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-textobj-column";
+          sha256 = "13q3nawx05rn3k6kzq1889vxjznr454cib96pc9lmrq7h65lym2h";
+          name = "evil-textobj-column";
+        };
+        packageRequires = [ emacs evil names ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-textobj-column";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-tutor = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-tutor";
+        version = "20150103.50";
+        src = fetchFromGitHub {
+          owner = "syl20bnr";
+          repo = "evil-tutor";
+          rev = "4e124cd3911dc0d1b6817ad2c9e59b4753638f28";
+          sha256 = "00yfq8aflxvp2nnz7smgq0c5wlb7cips5irj8qs6193ixlkpffvx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-tutor";
+          sha256 = "1hvc2w5ykrgh62n4sxqqqcdk5sd7nmh6xzv4mir5vf9y2dgqcvsn";
+          name = "evil-tutor";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-tutor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-vimish-fold = callPackage ({ emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, vimish-fold }:
+    melpaBuild {
+        pname = "evil-vimish-fold";
+        version = "20151006.2326";
+        src = fetchFromGitHub {
+          owner = "alexmurray";
+          repo = "evil-vimish-fold";
+          rev = "d187a685d9610ec8159040c90030cb8ada4f54a5";
+          sha256 = "0m4ipz3x5k3gbyjgsnhl6rr4jvhqn61cyc1gmv0mkc2pbqqs1ijq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-vimish-fold";
+          sha256 = "01wp4h97hjyzbpd7iighjj26m79499wp5pn8m4pa7v59f6r3sdk6";
+          name = "evil-vimish-fold";
+        };
+        packageRequires = [ emacs evil vimish-fold ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-vimish-fold";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-visual-mark-mode = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-visual-mark-mode";
+        version = "20150202.1200";
+        src = fetchFromGitHub {
+          owner = "roman";
+          repo = "evil-visual-mark-mode";
+          rev = "094ee37599492885ff3144918fcdd9b74dadaaa0";
+          sha256 = "07cmql8zsqz1qchq2mp3qybbay499dk1yglisig6jfddcmrbbggz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-visual-mark-mode";
+          sha256 = "1qgr2dfhfz6imnlznicl7lplajd1s8wny7mlxs1bkms3xjcjfi48";
+          name = "evil-visual-mark-mode";
+        };
+        packageRequires = [ dash evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-visual-mark-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-visualstar = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-visualstar";
+        version = "20150514.1610";
+        src = fetchFromGitHub {
+          owner = "bling";
+          repo = "evil-visualstar";
+          rev = "eb996eca0081b6e8bab70b2c0a86ef1c71087bf6";
+          sha256 = "11y2jrwbsw4fcx77zkhj1cn2hl1zcdqy00bv3mpbcrs03jywssrk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-visualstar";
+          sha256 = "135l9hjfbpn0a6p53picnpydi9qs5vrk2rfn64gxa5ag2apcyycy";
+          name = "evil-visualstar";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-visualstar";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evm = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evm";
+        version = "20141007.656";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "evm.el";
+          rev = "d0623b2355436a5fd9f7238b419782080c79196b";
+          sha256 = "0739v0m9vj70a55z0canslyqgafzys815i7a0r6bxj2f9iwq6rhb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evm";
+          sha256 = "19l6cs5schbnph0pwhhj66gkxsswd4bmjpy79l9kxzpjf107wc03";
+          name = "evm";
+        };
+        packageRequires = [ dash f ];
+        meta = {
+          homepage = "http://melpa.org/#/evm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ewmctrl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ewmctrl";
+        version = "20150630.338";
+        src = fetchFromGitHub {
+          owner = "flexibeast";
+          repo = "ewmctrl";
+          rev = "4e1ad0d54bccf2eddb7844eefb8253440aa80f28";
+          sha256 = "1frhcgkiys0pqrlcsi5zcl3ngblr38wrwfi6wzqk75x21rnwnbqv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ewmctrl";
+          sha256 = "1w60pb7szai1kh06jd3qvgpzq3z1ci4a77ysnpqjfk326s6zv7hl";
+          name = "ewmctrl";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ewmctrl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eww-lnum = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eww-lnum";
+        version = "20150102.912";
+        src = fetchFromGitHub {
+          owner = "m00natic";
+          repo = "eww-lnum";
+          rev = "4b0ecec769919ecb05ca4fb15ec51911ba589929";
+          sha256 = "1i6zf17rwa390c33cbspz81dz86vwlphyhjjsia4gp205nfk3s20";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eww-lnum";
+          sha256 = "1y745z4wa90snizq2g0amdwwgjafd6hkrayn93ca50f1wghdbk79";
+          name = "eww-lnum";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/eww-lnum";
+          license = lib.licenses.free;
+        };
+      }) {};
+    exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "exec-path-from-shell";
+        version = "20160113.46";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "exec-path-from-shell";
+          rev = "4d6a6aa18031a4bbdd5b3bfad8686dc5ff942ab2";
+          sha256 = "0n86zj350jw1lxnaa450qmggza0za3a1zg9k9clwb9cjz4wwghsi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/exec-path-from-shell";
+          sha256 = "1j6f52qs1m43878ikl6nplgb72pdbxfznkfn66wyzcfiz2hrvvm9";
+          name = "exec-path-from-shell";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/exec-path-from-shell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    expand-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "expand-line";
+        version = "20151005.2107";
+        src = fetchFromGitHub {
+          owner = "cheunghy";
+          repo = "expand-line";
+          rev = "75a5d0241f35dd0748ab8ecb4ff16891535be372";
+          sha256 = "0wz4h5hrr5ci0w8pynd2nr1b2zl5hl4pa8gc16mcabik5927rf7z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/expand-line";
+          sha256 = "07nfgp6jlrb9wxqy835j79i4g88714zndidkda84z16qn2y901a9";
+          name = "expand-line";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/expand-line";
+          license = lib.licenses.free;
+        };
+      }) {};
+    expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "expand-region";
+        version = "20150902.758";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "expand-region.el";
+          rev = "59f67115263676de5345581216640019975c4fda";
+          sha256 = "0qqqv0pp25xg1zh72i6fsb7l9vi14nd96rx0qdj1f3pdwfidqms1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/expand-region";
+          sha256 = "1c7f1nqsqdc75h22fxxnyg0m4yxj6l23sirk3c71fqj14paxqnwg";
+          name = "expand-region";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/expand-region";
+          license = lib.licenses.free;
+        };
+      }) {};
+    express = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }:
+    melpaBuild {
+        pname = "express";
+        version = "20140508.1541";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "express";
+          rev = "93dae7377eace4a5413ba99aecb6f26f90798725";
+          sha256 = "0ah8zayipwp760909llb9whcdvmbsdgkg0x5y4qlcicm1r9kwcc7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/express";
+          sha256 = "0lhisy4ds96bwpc7k8w9ws1zi1qh0d36nhxsp36bqzfi09ig0nb9";
+          name = "express";
+        };
+        packageRequires = [ string-utils ];
+        meta = {
+          homepage = "http://melpa.org/#/express";
+          license = lib.licenses.free;
+        };
+      }) {};
+    extempore-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "extempore-mode";
+        version = "20151225.51";
+        src = fetchFromGitHub {
+          owner = "extemporelang";
+          repo = "extempore-emacs-mode";
+          rev = "a08be9f0cec32c2818f93a6f7633c14fc2013e61";
+          sha256 = "0nry653cd3qzsj6asrf9hh4zkzhz8nnwjrg1wp17f5ggzpjyybjw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/extempore-mode";
+          sha256 = "1z8nzpcj27s74kxfjz7wyr3848jpd6mbyjkssd06ri5p694j9php";
+          name = "extempore-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/extempore-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    extend-dnd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "extend-dnd";
+        version = "20151122.1250";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "extend-dnd";
+          rev = "80c966c93b82c9bb5c6225a432557c39144fc602";
+          sha256 = "15dwl1rb3186k328a83dz9xmslc0px60ah16fifvmr3migis9hwz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/extend-dnd";
+          sha256 = "0rknpvp8yw051pg3blvmjpp3c9a82jw7f10mq67ggbz98w227417";
+          name = "extend-dnd";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/extend-dnd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eyebrowse";
+        version = "20160102.1649";
+        src = fetchFromGitHub {
+          owner = "wasamasa";
+          repo = "eyebrowse";
+          rev = "cd25e8785077480f1a948731cb38de512ebe7843";
+          sha256 = "0w2g7rpw26j65j4r23w6j8nw3arw73l601kyy6qv9p9bkk1yc072";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eyebrowse";
+          sha256 = "09fkzm8z8nkr4s9fbmfcjc80h50051f48v6n14l76xicglr5p861";
+          name = "eyebrowse";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/eyebrowse";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eyedropper = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eyedropper";
+        version = "20151231.1501";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/eyedropper.el";
+          sha256 = "1fg3j0jlww2rqc6k2nq95hcg6i26nqdp043h7kyjcwrgqbjfsigl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eyedropper";
+          sha256 = "07kdn90vm2nbdprw9hwdgi4py6gqzmrad09y1fwqdy49hrvbwdzk";
+          name = "eyedropper";
+        };
+        packageRequires = [ hexrgb ];
+        meta = {
+          homepage = "http://melpa.org/#/eyedropper";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eyuml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
+    melpaBuild {
+        pname = "eyuml";
+        version = "20141028.1727";
+        src = fetchFromGitHub {
+          owner = "antham";
+          repo = "eyuml";
+          rev = "2f259c201c6cc63ee608f75cd85c1ae27f9d2532";
+          sha256 = "1rgzydxv7c455vj1jm44vvs6xc4qgivqqb0g6zh5x4wdcpgdi2g9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eyuml";
+          sha256 = "0ada2gcl8bw9nn0fz8g9lbqy8a8w1554q03fzd7lv8qla33ri3wx";
+          name = "eyuml";
+        };
+        packageRequires = [ request s ];
+        meta = {
+          homepage = "http://melpa.org/#/eyuml";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ez-query-replace = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ez-query-replace";
+        version = "20140810.717";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "ez-query-replace.el";
+          rev = "1c0cab96d65105b780e32fdd29d2c6933be72ef6";
+          sha256 = "15qa09x206s7rxmk35rslqniydh6hdb3n2kbspm5zrndcmsqz4zi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ez-query-replace";
+          sha256 = "1h9ijr1qagwp9vvikh7ajby0dqgfypjgc45s7d93zb9jrg2n5cgx";
+          name = "ez-query-replace";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/ez-query-replace";
+          license = lib.licenses.free;
+        };
+      }) {};
+    f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "f";
+        version = "20151113.323";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "f.el";
+          rev = "e0259ee060ff9a3f12204adcc8630869080acd68";
+          sha256 = "0lzqfr5xgc3qvpbs6vf63yiw7pc2mybfvsrhczf9ghlmlawqa6k1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/f";
+          sha256 = "0s7fqav0dc9g4y5kqjjyqjs90gi34cahaxyx2s0kf9fwcgn23ja2";
+          name = "f";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/f";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fabric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fabric";
+        version = "20141024.522";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "fabric.el";
+          rev = "004934318f63d8cf955022f87b2c33eb97ada280";
+          sha256 = "0crhkdbxz1ldbrvppi95g005ni5zg99z1271rkrnk5i6cvc4hlq5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fabric";
+          sha256 = "1mkblsakdhvi10b67bv3j0jsf7hr8lf9sibmprvx8smqsih7l88m";
+          name = "fabric";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fabric";
+          license = lib.licenses.free;
+        };
+      }) {};
+    face-remap-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "face-remap-plus";
+        version = "20151231.1502";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/face-remap+.el";
+          sha256 = "0yr3fqpn9pj6y8bsb6g7hkg75sl703pzngn8gp0sgs3v90c180l5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/face-remap+";
+          sha256 = "0vq6xjrv3qic89pxzi6mx1s08k4ba27g8wqm1ap4fxh3l14wkg0y";
+          name = "face-remap-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/face-remap+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    facemenu-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "facemenu-plus";
+        version = "20151231.1505";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/facemenu+.el";
+          sha256 = "1kayc4hsalvqnn577y3f97w9kz94c53vcxwx01s0k34ffav919c2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/facemenu+";
+          sha256 = "0lbggalgkj59wj67z95949jmppmqrzrp63mdhw42r2x0fz1ir0iv";
+          name = "facemenu-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/facemenu+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    faces-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "faces-plus";
+        version = "20151231.1505";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/faces+.el";
+          sha256 = "0sqrymmr583cgqmv4bs6rjms5ij5cm8vvxjrfc9alacwyz5f7w8m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/faces+";
+          sha256 = "0k3m434f3d3061pvir0dnykmv6r9jswl7pzybzja3afiy591hh92";
+          name = "faces-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/faces+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    faceup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "faceup";
+        version = "20150215.1548";
+        src = fetchFromGitHub {
+          owner = "Lindydancer";
+          repo = "faceup";
+          rev = "70fa6be83768adf78f20425d0d76fe809dc44d79";
+          sha256 = "0sjmjydapfnv979dx8dwiz67wffamiaf41s4skkwa0wn2h4p6wja";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/faceup";
+          sha256 = "0l41xp38iji55dv20lk7r187ywcz8s1g2jmwbjwkspzmcf763xvx";
+          name = "faceup";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/faceup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    factlog = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "factlog";
+        version = "20130209.1940";
+        src = fetchFromGitHub {
+          owner = "tkf";
+          repo = "factlog";
+          rev = "6503d77ea882c995b051d22e72db336fb28770fc";
+          sha256 = "19zm9my7fl1r3q48axjv2f8x9hcjk6qah4y4r92b90bzfmcdc30y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/factlog";
+          sha256 = "163482vfpa52b5ya5xps4qnclbaql1x0q54gqdwwmm04as8qbfz7";
+          name = "factlog";
+        };
+        packageRequires = [ deferred ];
+        meta = {
+          homepage = "http://melpa.org/#/factlog";
+          license = lib.licenses.free;
+        };
+      }) {};
+    faff-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "faff-theme";
+        version = "20151027.717";
+        src = fetchFromGitHub {
+          owner = "WJCFerguson";
+          repo = "emacs-faff-theme";
+          rev = "8ec2bee09b386c711b0753ab12ace926d06fca7e";
+          sha256 = "1sc5f867h7i0n2gd9qcydqn1b2pk227l92ad4bf9nnpl3jmdr26v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/faff-theme";
+          sha256 = "1dmwbkp94zsddy0brs3mkdjr09n69maw2mrdfhriqcdk56qpwp4g";
+          name = "faff-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/faff-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fakespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fakespace";
+        version = "20120817.1906";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "elisp-fakespace";
+          rev = "d1bd1f4b14b2690d7a67f9a52622ec51ed84813a";
+          sha256 = "11fm0h9rily5731s137mgv8rdbfqi99s6f36bgr0arwbq3f2j3fs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fakespace";
+          sha256 = "09dsmrqax4wfcw8fd5jf07bjxm5dizpc2qvjkqwg74j2n352wv27";
+          name = "fakespace";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fakespace";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fakir = callPackage ({ dash, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, noflet }:
+    melpaBuild {
+        pname = "fakir";
+        version = "20140729.1152";
+        src = fetchFromGitHub {
+          owner = "nicferrier";
+          repo = "emacs-fakir";
+          rev = "1fca406ad7de80fece6319ff75d4230b648534b0";
+          sha256 = "1w5apzbzr1jd983b0rzsy9ldb0z0zcq6mpyb5r8czl5wd4vvj69h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fakir";
+          sha256 = "07bicglgpm6qkcsxwj6rswhx4hgh27rfg8s1cki7g8qcvk2f7b25";
+          name = "fakir";
+        };
+        packageRequires = [ dash kv noflet ];
+        meta = {
+          homepage = "http://melpa.org/#/fakir";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fancy-battery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fancy-battery";
+        version = "20150101.604";
+        src = fetchFromGitHub {
+          owner = "lunaryorn";
+          repo = "fancy-battery.el";
+          rev = "bcc2d7960ba207b5b4db96fe40f7d72670fdbb68";
+          sha256 = "0m7rjzl9js2gjfcaqp2n5pn5ykpqnv8qfv35l5m5kpfigsi9cbb0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fancy-battery";
+          sha256 = "03rkfdkrzyal9abdiv8c73w10sm974hxf3xg5015hibfi6kzg8ii";
+          name = "fancy-battery";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/fancy-battery";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fancy-narrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fancy-narrow";
+        version = "20151021.533";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "fancy-narrow";
+          rev = "5196dc6066d354883fa21090266b6cebccc9f6fd";
+          sha256 = "1i6xq03fhkffahrlfjcds5mvk4rsipia9diaqv7qfbhzrfwvn665";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fancy-narrow";
+          sha256 = "15i86jz6rdpva1az7gqp1wbm8kispcfc8h6v9fqsbag9sbzvgcyv";
+          name = "fancy-narrow";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fancy-narrow";
+          license = lib.licenses.free;
+        };
+      }) {};
+    farmhouse-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "farmhouse-theme";
+        version = "20150506.2327";
+        src = fetchFromGitHub {
+          owner = "mattly";
+          repo = "emacs-farmhouse-theme";
+          rev = "a09e7cd5b12542d27474aad7e118c8ede3edbea1";
+          sha256 = "08lgfa2k42qpcs4999b77ycsg76zb56qbcxbsvmg0pcwjwa1ambz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/farmhouse-theme";
+          sha256 = "0hbqdrw6x25b331qhbg3yaaa45c2b896wknsjm0a1kg142klq229";
+          name = "farmhouse-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/farmhouse-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fasd = callPackage ({ fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fasd";
+        version = "20151208.116";
+        src = fetchFromGitHub {
+          owner = "steckerhalter";
+          repo = "emacs-fasd";
+          rev = "8726a367048054add81ecea7543de00688056735";
+          sha256 = "0m2qn3rd16s7ahyw6f9a4jb73sdc8bqp6d03p450yzcn36lw78z5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fasd";
+          sha256 = "0i49z50bpi7fx0dm5jywlndnq9hb0dm5a906k4017w8y7sfpfl6c";
+          name = "fasd";
+        };
+        packageRequires = [ grizzl ];
+        meta = {
+          homepage = "http://melpa.org/#/fasd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fastnav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fastnav";
+        version = "20120211.857";
+        src = fetchFromGitHub {
+          owner = "gleber";
+          repo = "fastnav.el";
+          rev = "1019ba2b61d1a070204099b23da347278a61bc89";
+          sha256 = "0y95lrdqd9i2kbb266s1wdiim4m8vrn3br19d8s55ib6xlywf8cx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fastnav";
+          sha256 = "08hg256w8k9f5nzgpyl1jykbf28vmvv09kkhzs0s2zhwbl2158a5";
+          name = "fastnav";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fastnav";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fcitx";
+        version = "20160107.2318";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "fcitx.el";
+          rev = "5e216df6df652599d921e00afb6e52a050f8cb50";
+          sha256 = "03w68zbgprly45i6ps7iviwvjf3acbc7f7acvjpzj2plf0g5i19z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fcitx";
+          sha256 = "0a8wd588c26p3czfp5hn2n46f2vwyg5v301sv0y07b55b1i3ynmx";
+          name = "fcitx";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fcitx";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fcopy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fcopy";
+        version = "20150304.803";
+        src = fetchFromGitHub {
+          owner = "ataka";
+          repo = "fcopy";
+          rev = "e355f6ec889d8ecbdb096019c2dc660b1cec4941";
+          sha256 = "0c56j8ip2fyma9yvwaanz89jyzgi9k11xwwkflzlzc4smnvgfibr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fcopy";
+          sha256 = "13337ymf8vlbk8c4jpj6paqi06xdmk39yf72s40kmfrbvgmi8qy1";
+          name = "fcopy";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fcopy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    feature-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "feature-mode";
+        version = "20141121.1230";
+        src = fetchFromGitHub {
+          owner = "michaelklishin";
+          repo = "cucumber.el";
+          rev = "40886bc4cc5b1e855d6bb78505ebc651593d409d";
+          sha256 = "18b27xfajhd0vi7dcaky7pi7vmnlmdb88gkx3hwangj78d24as5d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/feature-mode";
+          sha256 = "0ryinmpqb3c91qcna6gbijcmqv3skxdc947dlr5s1w623z9nxgqg";
+          name = "feature-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/feature-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fetch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fetch";
+        version = "20131201.130";
+        src = fetchFromGitHub {
+          owner = "crshd";
+          repo = "fetch.el";
+          rev = "3f2793afcbbc32f320e572453166f9354ecc6d06";
+          sha256 = "0pjw9fb3n08yd38680ifdn2wlnw2k6q97lzhqb2259mywsycyqy8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fetch";
+          sha256 = "1jqc6pspgcrdzm7ij46r1q6vpjq7il5dy2xyxwn2c1ky5a80paby";
+          name = "fetch";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fetch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fic-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "fic-mode";
+        version = "20140421.1122";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/fic-mode.el";
+          sha256 = "110h0ff7bkwx7icph0j997hq53zpyz426dji4vs89zf75cf1nl7s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fic-mode";
+          sha256 = "037f2jr8bs2sfxw28cal2d49bsbrg0zkz2xdham627l04qnkgv8x";
+          name = "fic-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fic-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    figlet = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "figlet";
+        version = "20141104.1037";
+        src = fetchhg {
+          url = "https://bitbucket.com/jpkotta/figlet";
+          rev = "255e7570a3e2";
+          sha256 = "0xnr709vmwbryyfxngxs80gjfxv009ik6wcs4jd74ph5lm6gqh4f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/figlet";
+          sha256 = "1m7hw56awdbvgzdnjysb3wqkhkjqy68jxsxh9f7fx266wjqhp6yj";
+          name = "figlet";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/figlet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    files-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "files-plus";
+        version = "20151231.1507";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/files+.el";
+          sha256 = "0s79b5jj3jfl3aih6r3fa0zix40arysk6mz4fijapd8ybaflz25n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/files+";
+          sha256 = "1m1pxf6knrnyc9ygmyr27gm709ydxf0kkh1xrfcza6n476frmwr8";
+          name = "files-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/files+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    filesets-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "filesets-plus";
+        version = "20151231.1508";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/filesets+.el";
+          sha256 = "020rpjrjp2gh4w6mrphrvk27kdizfqbjsw2sxraf8jz0dibg9gfg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/filesets+";
+          sha256 = "06n8pw8c65bmrkxda2akvv57ndfijgbp95l40j7sjg8bjp385spn";
+          name = "filesets-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/filesets+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fill-column-indicator";
+        version = "20151030.1433";
+        src = fetchFromGitHub {
+          owner = "alpaker";
+          repo = "Fill-Column-Indicator";
+          rev = "0e755319451dd9c6c99c2a2ef82c890ba93343b6";
+          sha256 = "0gbqspqn4y7f2fwqq8210b6k5q22c0zr7b4ws8qgz9swav8g3vrq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fill-column-indicator";
+          sha256 = "0w8cmijv7ihij9yyncz6lixb6awzzl7n9qpjj2bks1d5rx46blma";
+          name = "fill-column-indicator";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fill-column-indicator";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fillcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fillcode";
+        version = "20150812.1141";
+        src = fetchFromGitHub {
+          owner = "snarfed";
+          repo = "fillcode";
+          rev = "ae5f6c6de81a7681c8f883e7fce36fd0f2b3c1e8";
+          sha256 = "1x9wmxbcmd6qgdyzrl978nczfqrgyk6xz3rnh5hffbapy1v1rw47";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fillcode";
+          sha256 = "0bfsw55vjhx88jpy6npnzfwinvggivbvkk7fa3iwzq19005fkag2";
+          name = "fillcode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fillcode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    finalize = callPackage ({ cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "finalize";
+        version = "20140127.1246";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "elisp-finalize";
+          rev = "9ac589cf487f5d37163dc9e7ca8c52800710805e";
+          sha256 = "0f76cgh97z0rbbg2bp217nqmxfimzkvw85k9mx8bj78i9s2cdmwa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/finalize";
+          sha256 = "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq";
+          name = "finalize";
+        };
+        packageRequires = [ cl-lib eieio emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/finalize";
+          license = lib.licenses.free;
+        };
+      }) {};
+    find-by-pinyin-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "find-by-pinyin-dired";
+        version = "20150202.416";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "find-by-pinyin-dired";
+          rev = "d049cc7f507a6f801c497a3d401b260300874f58";
+          sha256 = "18a4ydp30ycx5w80j3xgghclzmzbvrkl2awxixy4aj68nmljk480";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-by-pinyin-dired";
+          sha256 = "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq";
+          name = "find-by-pinyin-dired";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/find-by-pinyin-dired";
+          license = lib.licenses.free;
+        };
+      }) {};
+    find-dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "find-dired-plus";
+        version = "20151231.1510";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/find-dired+.el";
+          sha256 = "1pch1kjbgnbf8zmlxh6wg4ch9bpfg7hmwkw1mrr1hiym05xvza0m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-dired+";
+          sha256 = "06a6lwx61xindlchh3ps8khhxc6sr7i9d7i60rjw1h07nxmh0fli";
+          name = "find-dired-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/find-dired+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
+    melpaBuild {
+        pname = "find-file-in-project";
+        version = "20151216.2050";
+        src = fetchFromGitHub {
+          owner = "technomancy";
+          repo = "find-file-in-project";
+          rev = "908cc56c0fd715001da4d97b30cba5eb7af3a609";
+          sha256 = "0bf32nhpmjvvgnr6g9xqh8pqnhr3dl24y3g40lsv4pc8ffs70ydm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-file-in-project";
+          sha256 = "0aznnv82xhnilc9j4cdmcgh6ksv7bhjjm3pa76hynnyrfn7kq7wy";
+          name = "find-file-in-project";
+        };
+        packageRequires = [ emacs swiper ];
+        meta = {
+          homepage = "http://melpa.org/#/find-file-in-project";
+          license = lib.licenses.free;
+        };
+      }) {};
+    find-file-in-repository = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "find-file-in-repository";
+        version = "20151113.719";
+        src = fetchFromGitHub {
+          owner = "hoffstaetter";
+          repo = "find-file-in-repository";
+          rev = "8a8c84a6dbe7a2bba4564c3b58c92d157abfa3f8";
+          sha256 = "090m5647dpc8r8fwi3mszvc8kp0420ma5sv0lmqr2fpxyn9ybkjh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-file-in-repository";
+          sha256 = "0q1ym06w2yn3nzpj018dj6h68f7rmkxczyl061mirjp8z9c6a9q6";
+          name = "find-file-in-repository";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/find-file-in-repository";
+          license = lib.licenses.free;
+        };
+      }) {};
+    find-temp-file = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "find-temp-file";
+        version = "20160108.413";
+        src = fetchFromGitHub {
+          owner = "thisirs";
+          repo = "find-temp-file";
+          rev = "c6c44c69b3edf2a56cc56b1fc166dc8ce4144228";
+          sha256 = "1d6zn3qsg4lpk13cvn5r1w88dnhfydnhwf59x6cb4sy5q1ihk0g3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-temp-file";
+          sha256 = "0c98zm94958rb9kdvqr3pad744nh63y3vy3lshfm0lsg85k9j62p";
+          name = "find-temp-file";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/find-temp-file";
+          license = lib.licenses.free;
+        };
+      }) {};
+    find-things-fast = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "find-things-fast";
+        version = "20150519.1726";
+        src = fetchFromGitHub {
+          owner = "eglaysher";
+          repo = "find-things-fast";
+          rev = "efc7c189019ed65430e2f9e910e8e0a5ca9d2d03";
+          sha256 = "1r6cs7p43pi6n2inbrv9q924m679izxwxqgyr4sjjj3lg6an4cnx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-things-fast";
+          sha256 = "1fs3wf61lzm1hxh5sx8pr74g7g9np3npdwg7xmk81b5f2jx2vy6m";
+          name = "find-things-fast";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/find-things-fast";
+          license = lib.licenses.free;
+        };
+      }) {};
+    finder-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "finder-plus";
+        version = "20151231.1513";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/finder+.el";
+          sha256 = "0x3f9qygp26c4yw32cgyy35bb4f1fq0fg7q8s9vs777skyl3rvp4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/finder+";
+          sha256 = "1ichxghp2vzx01n129fmjm6iwx4b98ay3xk1ja1i8vzyd2p0z8vh";
+          name = "finder-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/finder+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    findr = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "findr";
+        version = "20130824.707";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/findr.el";
+          sha256 = "0a04mgya59w468jv2bmkqlayzgh0r8sdz0qg3n70wn9rhdcwnl9q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/findr";
+          sha256 = "0pxyfnn3f70gknxv09mfkjixqkzn77rdbql703wsslrj2v1l7bfq";
+          name = "findr";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/findr";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fingers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fingers";
+        version = "20150809.1916";
+        src = fetchFromGitHub {
+          owner = "fgeller";
+          repo = "fingers.el";
+          rev = "8fc8ae143736c4761fef69cb53c6083c5be5d914";
+          sha256 = "1vjgcxyzv2p74igr3y0z6hk7bj6yqwjawx90xvvmp9z7m91d4yrg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fingers";
+          sha256 = "1r8fy6q6isjxz9mvaa8in4imdghzla3gg1l93dfm1v2rlr7bhzbg";
+          name = "fingers";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fingers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fiplr = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fiplr";
+        version = "20140724.145";
+        src = fetchFromGitHub {
+          owner = "d11wtq";
+          repo = "fiplr";
+          rev = "bb6b90ba3c558988c195048c4c40140b2ee17530";
+          sha256 = "14yy7kr2iv549xaf5gkav48lk2hzmvipwbs0rzljzw60il6k05hk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fiplr";
+          sha256 = "0l68rl5cy2maynny6iq6c4qr6c99y44i0i1z613k9rk08z7h0k5i";
+          name = "fiplr";
+        };
+        packageRequires = [ cl-lib grizzl ];
+        meta = {
+          homepage = "http://melpa.org/#/fiplr";
+          license = lib.licenses.free;
+        };
+      }) {};
+    firebelly-theme = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "firebelly-theme";
+        version = "20140410.355";
+        src = fetchFromGitHub {
+          owner = "startling";
+          repo = "firebelly";
+          rev = "5fd621102c676196319579b168da1476e8552d00";
+          sha256 = "02ajday0lnk37dnzf4747ha3w0azisq35fmdhq322hx0hfb1c66x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/firebelly-theme";
+          sha256 = "0lns846l70wcrzqb6p5cy5hpd0szh4gvjxd4xq4zsb0z5nfz97jr";
+          name = "firebelly-theme";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/firebelly-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    firecode-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "firecode-theme";
+        version = "20141116.102";
+        src = fetchFromGitHub {
+          owner = "emacsfodder";
+          repo = "emacs-firecode-theme";
+          rev = "73573192e5e9d14d94dfc5131dd2b7a780b89626";
+          sha256 = "0v8liv6aq10f8dxbl3d4rph1qk891dlxm9wqdc6w8aj318750hfm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/firecode-theme";
+          sha256 = "10lxd93lkrvz8884dv4sh6fzzg355j7ab4p5dpvwry79rhs7f739";
+          name = "firecode-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/firecode-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    firefox-controller = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, moz, popwin }:
+    melpaBuild {
+        pname = "firefox-controller";
+        version = "20160104.1725";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "emacs-firefox-controller";
+          rev = "26a2e4b9246a7b5415032799b742b998529fce9e";
+          sha256 = "1rz56n2gmw11w2yxlhn0i8xmig9m8lxihgaikg65xmy9nqa5j7bj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/firefox-controller";
+          sha256 = "03y96b3l75w9al8ylijnlb8pcfkwddyfnh8xwig1b6k08zxfgal6";
+          name = "firefox-controller";
+        };
+        packageRequires = [ cl-lib moz popwin ];
+        meta = {
+          homepage = "http://melpa.org/#/firefox-controller";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fireplace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fireplace";
+        version = "20160101.1247";
+        src = fetchFromGitHub {
+          owner = "johanvts";
+          repo = "emacs-fireplace";
+          rev = "71976303d7826e184157826265c7ec45d3075cfc";
+          sha256 = "1smg4mqc5qdwzk5mp2hfm6l4s7k408x46xfl7fl45csb18islmrp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fireplace";
+          sha256 = "1apcypznq23fc7xgy4xy1c5hvfvjx1xhyq3aaq1lf59v99zchciw";
+          name = "fireplace";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fireplace";
+          license = lib.licenses.free;
+        };
+      }) {};
+    firestarter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "firestarter";
+        version = "20151213.815";
+        src = fetchFromGitHub {
+          owner = "wasamasa";
+          repo = "firestarter";
+          rev = "4b7428477980e12578ebbbb121115696b352d6b2";
+          sha256 = "0s8rml5xbskvnjpi8qp7vqflxhh5yis6zr6ay2bxmd2chjlhli55";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/firestarter";
+          sha256 = "1cpx664hyrdnpb1jps1x6lm7idwlfjblkfygj48cjz9pzd6ld5mp";
+          name = "firestarter";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/firestarter";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fish-mode";
+        version = "20160117.106";
+        src = fetchFromGitHub {
+          owner = "wwwjfy";
+          repo = "emacs-fish";
+          rev = "22aabbccd564883684f6d224b8e0a512f334be41";
+          sha256 = "17djaz79spms9il71m4xdfjhm58dzswb6fpncngkgx8kxvcy9y24";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fish-mode";
+          sha256 = "0l6k06bs0qdhj3h8vf5fv8c3rbhiqfwszrpb0v2cgnb6xhwzmq14";
+          name = "fish-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/fish-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fit-frame = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "fit-frame";
+        version = "20151231.1514";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/fit-frame.el";
+          sha256 = "082c6yyb1269va6k602hxpdf7ylfxz8gq8swqzwf07qaas0b5qxd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fit-frame";
+          sha256 = "1xcq4n9gj0npjjl98vqacms0a0wnzw62a9iplyf7bgj7n77pgkjb";
+          name = "fit-frame";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fit-frame";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fix-word = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fix-word";
+        version = "20150716.802";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "fix-word";
+          rev = "3e6aa7e3e2625efdac2c0f7d715959dabf01560f";
+          sha256 = "17f11v9sd5fay3i4k6lmpsjicdw9j3zvx3fvhx0a86mp7ay2ywwf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fix-word";
+          sha256 = "0a8w09cx8p5pkkd4533nd199axkhdhs2a7blp7syfn40bkscx6xc";
+          name = "fix-word";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/fix-word";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fixmee = callPackage ({ back-button, button-lock, fetchFromGitHub, fetchurl, lib, melpaBuild, nav-flash, smartrep, string-utils, tabulated-list ? null }:
+    melpaBuild {
+        pname = "fixmee";
+        version = "20150223.755";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "fixmee";
+          rev = "1b8b3460f1e3c3c1784b2a63fb9f4fb3bb4dc084";
+          sha256 = "1x4k8890pzdcizzl0p6v96ylrx5xid9ykgrmggx0b3y0gx0vhwic";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fixmee";
+          sha256 = "0wnp6h8f547fsi1lkk4ajny7g21dnr76qfhxl82n0l5h1ps4w8mp";
+          name = "fixmee";
+        };
+        packageRequires = [
+          back-button
+          button-lock
+          nav-flash
+          smartrep
+          string-utils
+          tabulated-list
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/fixmee";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flappymacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flappymacs";
+        version = "20140715.1101";
+        src = fetchFromGitHub {
+          owner = "taksatou";
+          repo = "flappymacs";
+          rev = "bbc69405f62e1bc488533709d4ab0b5eba919dbd";
+          sha256 = "07hv6l80ka10qszm16fpan8sas4b0qvl5s6qixxlz02fm7m0s7m5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flappymacs";
+          sha256 = "0dcpl5n7wwsk62ddgfrkq5dkm91569y4i4f0yqa61pdmzhgllx7d";
+          name = "flappymacs";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/flappymacs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flash-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flash-region";
+        version = "20130923.1317";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "flash-region";
+          rev = "261b3597b23cdd40e5c14262a5687bcc6c1d0901";
+          sha256 = "0z77lm6jv2w5z551pwarcx6xg9kx8fgms9dlskngfvnzbqkldj1f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flash-region";
+          sha256 = "1rgg7j34ka0nj1yjl688asim07bbz4aavh67kly6dzzwndr0nw8c";
+          name = "flash-region";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/flash-region";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flatland-black-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flatland-black-theme";
+        version = "20141116.30";
+        src = fetchFromGitHub {
+          owner = "emacsfodder";
+          repo = "emacs-flatland-black-theme";
+          rev = "75fc4f1815feb23563a60477c02d70326b45c59e";
+          sha256 = "0ib6r6q4wbkkxdwgqsd25nx7ccxhk16lqkvwikign80j9n11g7s1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flatland-black-theme";
+          sha256 = "0cl2qbry56nb4prbsczffx8h35x91pgicw5pld0ndw3pxid9h2da";
+          name = "flatland-black-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/flatland-black-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flatland-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flatland-theme";
+        version = "20140805.505";
+        src = fetchFromGitHub {
+          owner = "gchp";
+          repo = "flatland-emacs";
+          rev = "b2c2df1fc20a3a23787644f91f8121d9353f9bf9";
+          sha256 = "0cl8m1i1aaw4zmkrkhfchhp0gxhpvhcmpjglsisjni47y5mydypf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flatland-theme";
+          sha256 = "14drqwcp9nv269aqm34d426a7gx1a7kr9ygnqa2c8ia1fsizybl3";
+          name = "flatland-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/flatland-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flatui-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flatui-theme";
+        version = "20150531.343";
+        src = fetchFromGitHub {
+          owner = "john2x";
+          repo = "flatui-theme.el";
+          rev = "80d1967ea73c10aa8aa10620c2b343010e9ce5b9";
+          sha256 = "0j8pklgd2sk01glgkr24b5n5521425vws8zwdi4sxcv74922j5zr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flatui-theme";
+          sha256 = "0s88xihw44ks4b07wcb9swr52f3l1ls0jn629mxvfkv4a6hn7rmz";
+          name = "flatui-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/flatui-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flex-autopair = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flex-autopair";
+        version = "20120809.718";
+        src = fetchFromGitHub {
+          owner = "uk-ar";
+          repo = "flex-autopair";
+          rev = "4bb757f2556a4a51828e2fed8fb81e31e83052cb";
+          sha256 = "187ah7yhmr3ckw23bf4fivx8v79yj0zmilrkjj7k6l198w8wmvql";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flex-autopair";
+          sha256 = "0hphrqwryp3c0wwyf2f16hj8nc7jlg2dkvljgm2rdvmh2kgj3007";
+          name = "flex-autopair";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/flex-autopair";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flex-isearch = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flex-isearch";
+        version = "20130508.1703";
+        src = fetchhg {
+          url = "https://bitbucket.com/jpkotta/flex-isearch";
+          rev = "bb9c3502057d";
+          sha256 = "02z1w8z9fqdshyyf03c26zjwhmmclb02caw3b6nhhk4w1rkbh6is";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flex-isearch";
+          sha256 = "1msgrimi2a0xm5h23p78jflh00bl5bx44xpc3sc9pspznjv1d0k3";
+          name = "flex-isearch";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/flex-isearch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flim = callPackage ({ apel, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flim";
+        version = "20151213.150";
+        src = fetchFromGitHub {
+          owner = "wanderlust";
+          repo = "flim";
+          rev = "60fa2c74a72358658603480addc75b1d23f6431a";
+          sha256 = "1w913kw4b3dipawn567847jxl89j0prnf6656yqi2rp96axx3lhp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flim";
+          sha256 = "1gkaq549svflx8qyqrk0ccb52b7wp17wmd5jgzkw1109bpc4k6jc";
+          name = "flim";
+        };
+        packageRequires = [ apel ];
+        meta = {
+          homepage = "http://melpa.org/#/flim";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fliptext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "fliptext";
+        version = "20131113.2018";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/fliptext.el";
+          sha256 = "1viigj04kla20dk46xm913jzqrmx05rpjrpghnc0ylbqppqdwzpw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fliptext";
+          sha256 = "0cmyan9hckjsv5wk1mvjzif9nrc07frhzkhhl6pkgm0j0f1q30ji";
+          name = "fliptext";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fliptext";
+          license = lib.licenses.free;
+        };
+      }) {};
+    floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "floobits";
+        version = "20160111.2348";
+        src = fetchFromGitHub {
+          owner = "Floobits";
+          repo = "floobits-emacs";
+          rev = "9c052942524169c1ba98e644ccbeaea583275530";
+          sha256 = "12b1b7avjdbfm184mcg3bh3s6k0ygfz1sraz8q7qnrsyw4170893";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/floobits";
+          sha256 = "1jpk0q4mkf9ag1rqyai993nz5ngzfvxq9n9avmaaq59gkk9cjraf";
+          name = "floobits";
+        };
+        packageRequires = [ highlight json ];
+        meta = {
+          homepage = "http://melpa.org/#/floobits";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flx = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flx";
+        version = "20151030.1312";
+        src = fetchFromGitHub {
+          owner = "lewang";
+          repo = "flx";
+          rev = "807d69455585d89804ecef233a9462db7d0524d8";
+          sha256 = "10f9135i9z2y4k0x6fbwm0g6vhsj6ag41xq504zpygqzp6y6ikmz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flx";
+          sha256 = "04plfhrnw7jx2jaxhbhw4ypydfcb8v0x2m5hyacvrli1mca2iyf9";
+          name = "flx";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/flx";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flx-ido = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flx-ido";
+        version = "20151030.1312";
+        src = fetchFromGitHub {
+          owner = "lewang";
+          repo = "flx";
+          rev = "807d69455585d89804ecef233a9462db7d0524d8";
+          sha256 = "10f9135i9z2y4k0x6fbwm0g6vhsj6ag41xq504zpygqzp6y6ikmz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flx-ido";
+          sha256 = "00wcwbvfjbcx8kyap7rl1b6nsgqdwjzlpv6al2cdpdd19rm1vgdc";
+          name = "flx-ido";
+        };
+        packageRequires = [ cl-lib flx ];
+        meta = {
+          homepage = "http://melpa.org/#/flx-ido";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flx-isearch = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flx-isearch";
+        version = "20160105.1417";
+        src = fetchFromGitHub {
+          owner = "PythonNut";
+          repo = "flx-isearch";
+          rev = "54ae0a5a31e6a07b68823d486ff4ec9e4c558588";
+          sha256 = "1cmjw1zrb1nq9nx0d634ajli1di8x48k6s88zi2s2q0mbi28lzz1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flx-isearch";
+          sha256 = "14cshv5xb57ch5g3m3hfhawnnabdnbacp4kx40d0pw6jxw677gqd";
+          name = "flx-isearch";
+        };
+        packageRequires = [ cl-lib emacs flx ];
+        meta = {
+          homepage = "http://melpa.org/#/flx-isearch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
+    melpaBuild {
+        pname = "flycheck";
+        version = "20160117.1229";
+        src = fetchFromGitHub {
+          owner = "flycheck";
+          repo = "flycheck";
+          rev = "fe8b311cd90a7dc5cbfe1548104ca0b9f9212e9f";
+          sha256 = "0x5cw5qfchrj9bc5iaryrm2gnbm1liwjc7qdybgjhd1mbywpf4qh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck";
+          sha256 = "045k214dq8bmrai13da6gwdz97a2i998gggxqswqs4g52l1h6hvr";
+          name = "flycheck";
+        };
+        packageRequires = [ dash emacs let-alist pkg-info seq ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-ats2 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-ats2";
+        version = "20151130.807";
+        src = fetchFromGitHub {
+          owner = "drvink";
+          repo = "flycheck-ats2";
+          rev = "431e46d5bbd20941c26270c7ba6872c86451348b";
+          sha256 = "0fh5z68gnggm0qjb8ncmfngv195lbp1dxz9jbmdi418d47mlba9c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-ats2";
+          sha256 = "0xm7zzz6hs5qnqkmv7hwxpvp3jjca57agx71sj0m12v0h53gbzhr";
+          name = "flycheck-ats2";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-ats2";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-cask = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-cask";
+        version = "20150920.653";
+        src = fetchFromGitHub {
+          owner = "flycheck";
+          repo = "flycheck-cask";
+          rev = "f2cebedacaa96ef30262fbb67068d1df489ff238";
+          sha256 = "0klnhq0zfn5zbkwl7y9kja7x49n1w6r1qbphk7a7v9svgm3h9s7n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-cask";
+          sha256 = "1lq559nyhkpnagncj68h84i3cq85vhdikr534kj018n2zcilsyw7";
+          name = "flycheck-cask";
+        };
+        packageRequires = [ dash emacs flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-cask";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-checkbashisms = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-checkbashisms";
+        version = "20160103.2026";
+        src = fetchFromGitHub {
+          owner = "Gnouc";
+          repo = "flycheck-checkbashisms";
+          rev = "e7941394f016a1363698f129cad8340a396c9fb8";
+          sha256 = "159r4bdfwn6s88j2ky85x2m4hs7y55kfkr0jd1fvc60zpy8xcqqy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-checkbashisms";
+          sha256 = "1rq0ymlr1dl39v0sfyjmdv4pq3q9116cz9wvgpvfgalq8759q5sz";
+          name = "flycheck-checkbashisms";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-checkbashisms";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-clangcheck = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, seq }:
+    melpaBuild {
+        pname = "flycheck-clangcheck";
+        version = "20150712.210";
+        src = fetchFromGitHub {
+          owner = "kumar8600";
+          repo = "flycheck-clangcheck";
+          rev = "24a9424c484420073a24443a829fd5779752362b";
+          sha256 = "1ckzs32wzqpnw89rrw3l7i4gbyn25wagbadsc4mcrixml5nf0mck";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-clangcheck";
+          sha256 = "1316cj3ynl80j39ha0371ss7cqw5hcr3m8944pdacdzbmp2sak2m";
+          name = "flycheck-clangcheck";
+        };
+        packageRequires = [ cl-lib flycheck seq ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-clangcheck";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-clojure = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-clojure";
+        version = "20150831.831";
+        src = fetchFromGitHub {
+          owner = "clojure-emacs";
+          repo = "squiggly-clojure";
+          rev = "98c6362a131c777e81624aaeb7eda9da5c7f6b5d";
+          sha256 = "0ndhhcfgpd5yg95jg64785mc9g6cgm1k7dwakzb3qlqnynbrjrcp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-clojure";
+          sha256 = "1b20gcs6fvq9pm4nl2qwsf34sg6wxngdql921q2pyh5n1xsxhm28";
+          name = "flycheck-clojure";
+        };
+        packageRequires = [ cider emacs flycheck let-alist ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-clojure";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-color-mode-line = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-color-mode-line";
+        version = "20131125.2338";
+        src = fetchFromGitHub {
+          owner = "flycheck";
+          repo = "flycheck-color-mode-line";
+          rev = "c85319f8d2579e770c9060bfef11bedc1370d8be";
+          sha256 = "11xc08xld758xx9myqjsiqz8vk3gh4d9c4yswswvky6mrx34c0y5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-color-mode-line";
+          sha256 = "0hw19nsh5h2l8qbp7brqmml2fhs8a0x850vlvq3qfd7z248gvhrq";
+          name = "flycheck-color-mode-line";
+        };
+        packageRequires = [ dash emacs flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-color-mode-line";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-css-colorguard = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-css-colorguard";
+        version = "20151122.347";
+        src = fetchFromGitHub {
+          owner = "Simplify";
+          repo = "flycheck-css-colorguard";
+          rev = "8c2061c11d5465eec77ad471bef413eb14d122da";
+          sha256 = "073vkjgcyqp8frsi05s6x8ml3ar6hwjmn2c7ryfab5b35kp9gmdi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-css-colorguard";
+          sha256 = "1n56j5nicac94jl7kp8fbqxmd115vbhzklzgfz5jbib2ab8y60jc";
+          name = "flycheck-css-colorguard";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-css-colorguard";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-d-unittest = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-d-unittest";
+        version = "20150709.109";
+        src = fetchFromGitHub {
+          owner = "flycheck";
+          repo = "flycheck-d-unittest";
+          rev = "f2255abf6a5cd9268b1576d9b46356f8151a7311";
+          sha256 = "1r71alxbxwcrdf3r5rg7f0bdwh0ylvayp5g97i9biyxdg59az4ad";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-d-unittest";
+          sha256 = "0n4m4f0zqcx966582af1nqff5sla7jcr0wrmgzzxnn97yjrlnzk2";
+          name = "flycheck-d-unittest";
+        };
+        packageRequires = [ dash flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-d-unittest";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-dedukti = callPackage ({ dedukti-mode, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-dedukti";
+        version = "20150106.851";
+        src = fetchFromGitHub {
+          owner = "rafoo";
+          repo = "flycheck-dedukti";
+          rev = "717977c0ead0dc6e267ba2164781d92ee016b7b2";
+          sha256 = "1hw875dirz041vzw1pxjpk5lr1zmrp2kp9m6pazs9j19d686hyn6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-dedukti";
+          sha256 = "00nc18w4nsi6vicpbqqpr4xcdh48g95vnay3kirb2xp5hc2rw3x8";
+          name = "flycheck-dedukti";
+        };
+        packageRequires = [ dedukti-mode flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-dedukti";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-dialyzer = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-dialyzer";
+        version = "20151024.37";
+        src = fetchFromGitHub {
+          owner = "lbolla";
+          repo = "emacs-flycheck-dialyzer";
+          rev = "3560214658cbdbd454f8b3d4f108cb51537afa36";
+          sha256 = "15dc76r047pnxll229z0pmpn76zw3cc6qs81b7wg7yc5czsk8axh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-dialyzer";
+          sha256 = "0bn81yzijmnfg5xcnvcvxvqxz995iaafhgbfckgcal974s229kd2";
+          name = "flycheck-dialyzer";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-dialyzer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-dmd-dub = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-dmd-dub";
+        version = "20151019.822";
+        src = fetchFromGitHub {
+          owner = "atilaneves";
+          repo = "flycheck-dmd-dub";
+          rev = "1acd7e3683ed55ac11f013e325c1cbf19be8ad66";
+          sha256 = "0dqkd9h54qmr9cv2gmic010j2h03i80psajrv4wq3c4pvxyqyn2j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-dmd-dub";
+          sha256 = "0pg3sf7h6xqv65yqclhlb7fx1mp2w0m3qk4vji6m438kxy6fhzqm";
+          name = "flycheck-dmd-dub";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-dmd-dub";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-elm = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-elm";
+        version = "20151204.924";
+        src = fetchFromGitHub {
+          owner = "bsermons";
+          repo = "flycheck-elm";
+          rev = "d1395ce80dcad5ed8931b4901471a8980fd3f2b8";
+          sha256 = "08dlm3g2d8rl53hq0b4z7gp8529almlkyf69d3c8f9didmlhizk7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-elm";
+          sha256 = "06dpv19wgbw48gbf701c77vw1dkpddx8056wpim3zbvwwfwk8ra4";
+          name = "flycheck-elm";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-elm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-flow = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-flow";
+        version = "20151218.604";
+        src = fetchFromGitHub {
+          owner = "lbolla";
+          repo = "emacs-flycheck-flow";
+          rev = "6a6307a3998531279feab742321192cfc0c6e90a";
+          sha256 = "0lk7da7axn9fm0kzlzx10ir014rsdsycffi8jcy4biqllw6yi4dx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-flow";
+          sha256 = "0p4vvk09vjgk98dwzr2qzldvij3v6af56pradssi6sm3shbqhkk3";
+          name = "flycheck-flow";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-flow";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-ghcmod = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-ghcmod";
+        version = "20150114.32";
+        src = fetchFromGitHub {
+          owner = "scturtle";
+          repo = "flycheck-ghcmod";
+          rev = "6bb7b7d879f05bbae54e99eb04806c877adf3ccc";
+          sha256 = "0q1m1f3vhw1wy0pa3njy55z28psznbw2xwmwk2v1p5c86n74ns8d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-ghcmod";
+          sha256 = "0mqxg622lqnkb52a0wff7h8b0k6mm1k7fhkfi95fi5sahclja0rp";
+          name = "flycheck-ghcmod";
+        };
+        packageRequires = [ dash flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-ghcmod";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-gometalinter = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-gometalinter";
+        version = "20160113.2221";
+        src = fetchFromGitHub {
+          owner = "favadi";
+          repo = "flycheck-gometalinter";
+          rev = "4b6f26aa5062f9d4164b24ce021bc18d00f9308e";
+          sha256 = "0j2mvf3zjznwkm8dykcgs1v5sz0i882mrivghxqr3h6n3ni4wag4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-gometalinter";
+          sha256 = "1bnvj5kwgbh0dv989rsjcvmcij1ahwcz0vpr6a8f2p6wwvksw1h2";
+          name = "flycheck-gometalinter";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-gometalinter";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-google-cpplint = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-google-cpplint";
+        version = "20140806.1125";
+        src = fetchFromGitHub {
+          owner = "flycheck";
+          repo = "flycheck-google-cpplint";
+          rev = "dc23300757c6762c018d536a5831aef2486f7a17";
+          sha256 = "0fykawnq9ch1vj76rsimwbmn2xxdamsnvbj4ahqaqhq7adb2wyrq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-google-cpplint";
+          sha256 = "0llrvg6mhcsj5aascsndhbv99122zj32agxk1w6s8xn8ksk2i90b";
+          name = "flycheck-google-cpplint";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-google-cpplint";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild, seq }:
+    melpaBuild {
+        pname = "flycheck-haskell";
+        version = "20160118.1051";
+        src = fetchFromGitHub {
+          owner = "flycheck";
+          repo = "flycheck-haskell";
+          rev = "7ff353c8bc7e1a02fe2c14b0b8f9cecb748e0025";
+          sha256 = "01y3nv4h5zz4w2bydw7f2w98rbyhbyq80w5w5y5nal5w4vd76qb7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-haskell";
+          sha256 = "12lgirz3j6n5ns2ikq4n41z0d33qp1lb5lfz1q11qvpbpn9d0jn7";
+          name = "flycheck-haskell";
+        };
+        packageRequires = [ dash emacs flycheck haskell-mode let-alist seq ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-haskell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-hdevtools = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-hdevtools";
+        version = "20160109.2014";
+        src = fetchFromGitHub {
+          owner = "flycheck";
+          repo = "flycheck-hdevtools";
+          rev = "ee311ac8d8be5803f13c649b8260839c0024e729";
+          sha256 = "1x61q0fqr1jbqs9kk59f565a02qjxh1gnp1aigys0yz6qnshvzbb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-hdevtools";
+          sha256 = "0ahvai1q4x59ryiyccvqvjisgqbaiahx4gk8ssaxhblhj0sqga93";
+          name = "flycheck-hdevtools";
+        };
+        packageRequires = [ dash flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-hdevtools";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-irony = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, irony, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-irony";
+        version = "20150728.1431";
+        src = fetchFromGitHub {
+          owner = "Sarcasm";
+          repo = "flycheck-irony";
+          rev = "b92e881fdf9c9cea192bfb8fa228784af5e27ea4";
+          sha256 = "1ax55yhf9q8i8z1f97zp3r08dqv8npd2llllbwa67d1bj49bsf2h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-irony";
+          sha256 = "0qk814m5s7mjba659llml0gy1g3045w8l1g73w2pnm1pbpqdfn3z";
+          name = "flycheck-irony";
+        };
+        packageRequires = [ emacs flycheck irony ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-irony";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-ledger = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-ledger";
+        version = "20140605.1346";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flycheck-ledger";
+          rev = "78392ba2c0c177c47bb795a1a191c29846837f57";
+          sha256 = "15cgqbl6n3nyqiizgs2zvcvfs6bcnjk3bj81lhhwrzizbjvap3rv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-ledger";
+          sha256 = "0807pd2km4r60wgd6jakscbx63ab22d9kvf1cml0ad8wynsap7jl";
+          name = "flycheck-ledger";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-ledger";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-mercury = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "flycheck-mercury";
+        version = "20151123.134";
+        src = fetchFromGitHub {
+          owner = "flycheck";
+          repo = "flycheck-mercury";
+          rev = "fa9e433a0a912f0fae9e4dec9ea616ef99fcf861";
+          sha256 = "0isqa6ybdd4166h3rdcg0b8pcxn00v8dav58xwfcj92nhzvs0qca";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-mercury";
+          sha256 = "1z2y6933f05yv9y2aapmn876jnsydh642zqid3j88bb9kqi67x0h";
+          name = "flycheck-mercury";
+        };
+        packageRequires = [ dash flycheck s ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-mercury";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-mypy = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-mypy";
+        version = "20150915.333";
+        src = fetchFromGitHub {
+          owner = "lbolla";
+          repo = "emacs-flycheck-mypy";
+          rev = "263339e6e44c3d0d4c10ff3528e5575db97a353f";
+          sha256 = "1vdnw6hnhg8aqcsdqcd2rqz4fsfgxn2xr3xixkvwmpplb4x40c8k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-mypy";
+          sha256 = "1w418jm6x3vcg2x31nzc8a3b8asx6gznl6m76ip8w98riz7vy02f";
+          name = "flycheck-mypy";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-mypy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-nim = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-nim";
+        version = "20150911.1847";
+        src = fetchFromGitHub {
+          owner = "ALSchwalm";
+          repo = "flycheck-nim";
+          rev = "4cf6a70864e594c24b33c1032e2692ad1b310d6c";
+          sha256 = "06hs41l41hm08dv93wldd98hmnd3jqbg58pj5ymn15kgdsy1rirg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-nim";
+          sha256 = "0w6f6998rqx8a3i4xhga7mrmvhxrm690wkqwfzspidid2z7v71az";
+          name = "flycheck-nim";
+        };
+        packageRequires = [ dash flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-nim";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, merlin }:
+    melpaBuild {
+        pname = "flycheck-ocaml";
+        version = "20151103.412";
+        src = fetchFromGitHub {
+          owner = "flycheck";
+          repo = "flycheck-ocaml";
+          rev = "e4412025f27850918762237fa80b33e285a63e7c";
+          sha256 = "0fm8w7126vf04n76qhh33rzybvl1n7va2whbqzafbvmv2nny3v94";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-ocaml";
+          sha256 = "1cv2bb66aql2kj1y1gsl4xji8yrzrq6rd8hxxs5vpfsk47052lf7";
+          name = "flycheck-ocaml";
+        };
+        packageRequires = [ emacs flycheck let-alist merlin ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-ocaml";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-package = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-package";
+        version = "20151029.1338";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flycheck-package";
+          rev = "ff93e8986a1021daf542c441c1fd50436ee83cba";
+          sha256 = "0aa8cnh9f0f2zr2kkba2kf9djzjnsd51fzj8l578pbj016zdarwd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-package";
+          sha256 = "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d";
+          name = "flycheck-package";
+        };
+        packageRequires = [ cl-lib emacs flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-package";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-perl6 = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-perl6";
+        version = "20150414.2032";
+        src = fetchFromGitHub {
+          owner = "hinrik";
+          repo = "flycheck-perl6";
+          rev = "6a9a929ffb58595bbe9fe3d7c2e78617c8e9bb5a";
+          sha256 = "0ffas4alqhijvm8wl1p5nqjhnxki8gs6b5bxb4nsqwnma8qmlcx3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-perl6";
+          sha256 = "0czc0fqx7g543afzkbjyz4bhxfl4s3v5swn9xrkayv8cgk8acvp4";
+          name = "flycheck-perl6";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-perl6";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-pos-tip = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }:
+    melpaBuild {
+        pname = "flycheck-pos-tip";
+        version = "20160115.453";
+        src = fetchFromGitHub {
+          owner = "flycheck";
+          repo = "flycheck-pos-tip";
+          rev = "a42e15a2965bf086228375ab7a4db3603b862c5a";
+          sha256 = "1kcjw0s8lx4lbkfqksf92i0iz509l2vbrkknyd7xx0yqlkvxfkyf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-pos-tip";
+          sha256 = "09i2jmwj8b915fhyczwdb1j7c551ggbva33avis77ga1s9v3nsf9";
+          name = "flycheck-pos-tip";
+        };
+        packageRequires = [ dash flycheck pos-tip ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-pos-tip";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-protobuf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, protobuf-mode }:
+    melpaBuild {
+        pname = "flycheck-protobuf";
+        version = "20150731.512";
+        src = fetchFromGitHub {
+          owner = "edvorg";
+          repo = "flycheck-protobuf";
+          rev = "2f0ab48b1b2e8f6c4b86ce876598f9ac9868d1da";
+          sha256 = "0dq4ikqskkpcl3z4s5vl6h4f4bx4dsgyn2knlr3x4wjcgzyrv0qn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-protobuf";
+          sha256 = "0cn5b9pr9i9hrix7dbrylwb2812al8ipbpqvlb9bm2f8hc9kgsmc";
+          name = "flycheck-protobuf";
+        };
+        packageRequires = [ protobuf-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-protobuf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-purescript = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }:
+    melpaBuild {
+        pname = "flycheck-purescript";
+        version = "20160117.1049";
+        src = fetchFromGitHub {
+          owner = "emacs-pe";
+          repo = "flycheck-purescript";
+          rev = "6716f7b193b18d92082edd8ebfbd137ed92aec93";
+          sha256 = "12bjlrzkfz2ixi0d7jzbasgaliswdpkqi5j32rg8mac8hncgq5jr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-purescript";
+          sha256 = "05j1iscyg9khw0zq63676zrisragklxp48hmbc7vrbmbiy964lwd";
+          name = "flycheck-purescript";
+        };
+        packageRequires = [ dash emacs flycheck let-alist seq ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-purescript";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-pyflakes";
+        version = "20140630.1721";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "flycheck-pyflakes";
+          rev = "026ef070f1589bc0ae8f86a02072fa36e57b9912";
+          sha256 = "16albss527dq4ncpiy8p326fib038qc6wjbh985lw2p1f9babswa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-pyflakes";
+          sha256 = "186h5ky48i1xmjbvvhn1i0rzhsy8bgdv1d8f7rlr2z4brb52f9c1";
+          name = "flycheck-pyflakes";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-pyflakes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-rust = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-rust";
+        version = "20151225.913";
+        src = fetchFromGitHub {
+          owner = "flycheck";
+          repo = "flycheck-rust";
+          rev = "e03c895ef1ce514f7cefcd86f10e6bde97ff1c73";
+          sha256 = "08ar85p5llk0lxlm2rd7rfc8s449vrknsrzzxqg8kvakgpd0nx7q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-rust";
+          sha256 = "1k0n0y6lbp71v4465dwq7864vp1qqyx7zjz0kssszcpx5gl1596w";
+          name = "flycheck-rust";
+        };
+        packageRequires = [ dash emacs flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-rust";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-status-emoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-status-emoji";
+        version = "20150924.1314";
+        src = fetchFromGitHub {
+          owner = "liblit";
+          repo = "flycheck-status-emoji";
+          rev = "a6ae7b108110acc4dba32e616c8b02555455ea67";
+          sha256 = "17mhsxnixw37x9jpy59nn3npw93r1rza2zcw6jmqzandmj0jyvm4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-status-emoji";
+          sha256 = "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p";
+          name = "flycheck-status-emoji";
+        };
+        packageRequires = [ emacs flycheck let-alist ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-status-emoji";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "flycheck-tip";
+        version = "20150726.356";
+        src = fetchFromGitHub {
+          owner = "yuutayamada";
+          repo = "flycheck-tip";
+          rev = "9eefbea4ccc9e348d356faf28c9a1902ba28f29e";
+          sha256 = "0hn3qjff1lcpd2ghjixkkq2bpmrmqab3860vy38yw201yy4xmn5r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-tip";
+          sha256 = "0zab1zknrnsw5xh5pwzzcpz7p40bbywkf9zx99sgsd6b5j1jz656";
+          name = "flycheck-tip";
+        };
+        packageRequires = [ emacs flycheck popup ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-tip";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-typescript-tslint = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-typescript-tslint";
+        version = "20151209.1647";
+        src = fetchFromGitHub {
+          owner = "Simplify";
+          repo = "flycheck-typescript-tslint";
+          rev = "79d33ba8fbc23df604c239cfc32c21e07339faa1";
+          sha256 = "0m9fjfpand20qy9d196z5khiznn25n95zbmgs8q2s2wcn4f7022p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-typescript-tslint";
+          sha256 = "141x4scl13gqxyg0nlc8vig1iaybc3g95il5r51k4k83isi62iyq";
+          name = "flycheck-typescript-tslint";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-typescript-tslint";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, ycmd }:
+    melpaBuild {
+        pname = "flycheck-ycmd";
+        version = "20160114.429";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "emacs-ycmd";
+          rev = "80c6d7c663b6ccc32b851348f1099790ac4c9736";
+          sha256 = "1c3c3frd9fdb77wkhg8f8g29dvr86ryzf9prg4pm8wvhifa4yhvg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-ycmd";
+          sha256 = "0m99ssynrqxgzf32d35n17iqyh1lyc6948inxpnwgcb98rfamchv";
+          name = "flycheck-ycmd";
+        };
+        packageRequires = [ dash emacs flycheck ycmd ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-ycmd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-coffee = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-coffee";
+        version = "20140809.524";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-coffee";
+          rev = "325ab379592fdf9017d7c19625c7a978f6f3af3b";
+          sha256 = "10i0rbvk6vyifgbgskdyspmw9q64x99fzi8i1h8bgv58xhfx6pm7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-coffee";
+          sha256 = "1aig1d4fgjdg31vrg8k43z5hbqiydgfvxi45p1695s3kbdm8pr2d";
+          name = "flymake-coffee";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-coffee";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-cppcheck = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-cppcheck";
+        version = "20140415.757";
+        src = fetchFromGitHub {
+          owner = "senda-akiha";
+          repo = "flymake-cppcheck";
+          rev = "9554f504d425a04fa6a875f7e3179bc7cf07dd03";
+          sha256 = "1dlxn8hhz3gfrhvkwhlxjmby6zc0g8yy9n9j9dn8c4cbi2fhyx5m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-cppcheck";
+          sha256 = "11brzgq2zl32a8a2dgj2imsldjqaqvxwk2jypf4bmfwa3mkcqh3d";
+          name = "flymake-cppcheck";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-cppcheck";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-css = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-css";
+        version = "20121104.1304";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-css";
+          rev = "4649fc209836498d709bb627e8aa6e50189a06ec";
+          sha256 = "00cnz3snhs44aknq6wmf19hq9bzb5pj0hvfzz93l6n7ngd8vvpzy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-css";
+          sha256 = "0kqm3wn9symqc9ivnh11gqgq8ql2bhpqvxfm86d8vwm082hd92c5";
+          name = "flymake-css";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-css";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-cursor = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "flymake-cursor";
+        version = "20130822.532";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/flymake-cursor.el";
+          sha256 = "10cpzrd588ya52blghxss5zkn6x8hc7bx1h0qbcdlybbmkjgpkxr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-cursor";
+          sha256 = "1s065w0z3sfv3d348w4zhlw96xf3j28bcz14sl46963mj2dm90lr";
+          name = "flymake-cursor";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-cursor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-easy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-easy";
+        version = "20140818.255";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-easy";
+          rev = "de41ea49503f71f997e5c359a2ad08df696c0147";
+          sha256 = "1mylcsklnv3q27q1gvf7wrila39rmxab1ypmvjh5p56d91y6pszc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-easy";
+          sha256 = "19p6s9fllgvs35v167xf624k5dn16l9fnvaqcj9ks162gl9vymn7";
+          name = "flymake-easy";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-easy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-elixir = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-elixir";
+        version = "20130810.917";
+        src = fetchFromGitHub {
+          owner = "syl20bnr";
+          repo = "flymake-elixir";
+          rev = "3810566cffe35d04cc3f01e27fe397d68d52f802";
+          sha256 = "04w6g4wixrpfidxbk2bwazhvf0cx3c2v2mxnycqqlqkg0m0sb0fn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-elixir";
+          sha256 = "15r3m58hnc75l3j02xdr8yg25fbn2sbz1295ac44widzis82m792";
+          name = "flymake-elixir";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-elixir";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-gjshint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-gjshint";
+        version = "20130327.732";
+        src = fetchFromGitHub {
+          owner = "yasuyk";
+          repo = "flymake-gjshint-el";
+          rev = "dc957c14cb060819585de8aedb330e24efa4b784";
+          sha256 = "14kbqyw4v1c51dx7pfgqbn8x4j8j3rgyyq2fa9klqzxpldcskl24";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-gjshint";
+          sha256 = "19jcd5z4883z3fzlrdn4fzmsvn16f4hfnhgw4vbs5b0ma6a8ka44";
+          name = "flymake-gjshint";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-gjshint";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-go = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-go";
+        version = "20150714.233";
+        src = fetchFromGitHub {
+          owner = "robert-zaremba";
+          repo = "flymake-go";
+          rev = "ae83761aa908c1a50ff34af04f00dcc46bca2ce9";
+          sha256 = "03gh0y988pksghmmvb5av2vnlbcsncafvn4nwihsis0bhys8k28q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-go";
+          sha256 = "030m67d8g60ljm7ny3jh4vwj3cshypsklgbjpcvh32y109ga1hy1";
+          name = "flymake-go";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-go";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-google-cpplint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-google-cpplint";
+        version = "20140205.725";
+        src = fetchFromGitHub {
+          owner = "senda-akiha";
+          repo = "flymake-google-cpplint";
+          rev = "905d32e84a27f18a78bec455ca930ab1ff9ae31e";
+          sha256 = "0zldhlvxmk0xcjmj4ns48pp4h3bvijrzs1md69ya7m3dmsbayfrc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-google-cpplint";
+          sha256 = "0q7v70xbprh03f1yabq216q4q82a58s2c1ykr6ig49cg1jdgzkf3";
+          name = "flymake-google-cpplint";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-google-cpplint";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-haml = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-haml";
+        version = "20130324.551";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-haml";
+          rev = "3117d94ecad908710502e8def42dbae5748e9c1d";
+          sha256 = "08rcsg76qdq2l6z8q339yw770kv1q657ywqvq6a20pxxz2158a8l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-haml";
+          sha256 = "0dmdhh12h4xrx6mc0qrwavngk2sx0l4pfqkjjyavabsgcs9wlgp1";
+          name = "flymake-haml";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-haml";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-haskell-multi = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-haskell-multi";
+        version = "20130620.622";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-haskell-multi";
+          rev = "6183620ffee429b33c886fffd6106b876245ea47";
+          sha256 = "0hwcgas83wwhk0szwgw7abf70400knb8dfabknwv0qrcsk4gqffd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-haskell-multi";
+          sha256 = "0cyzmmghwkkv6020s6n436lwymi6dr49i7gkci5n0hw5pdywcaij";
+          name = "flymake-haskell-multi";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-haskell-multi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-hlint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-hlint";
+        version = "20130309.345";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-hlint";
+          rev = "fae0c16f938129fb933e4c4625287816e8e160f0";
+          sha256 = "003fdrgxlyhs595ndcdzhmdkcpsf9bpw53hrlrrrh07qlnqxwrvp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-hlint";
+          sha256 = "0wq1ijhn3ypy31yk8jywl5hnz0r0vlhcxjyznzccwqbdc5vf7b2x";
+          name = "flymake-hlint";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-hlint";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-jshint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-jshint";
+        version = "20140319.1700";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "flymake-jshint.el";
+          rev = "79dd554c227883c487db38ac111306c8d5382c95";
+          sha256 = "0ywm9fpb7d7ry2fly8719fa41q97yj9za3phqhv6j1chzaxvcv3a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-jshint";
+          sha256 = "0j4djylz6mrq14qmbm35k3gvvsw6i9qc4gd9ma4fykiqzkdjsg7j";
+          name = "flymake-jshint";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-jshint";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-jslint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-jslint";
+        version = "20130613.402";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-jslint";
+          rev = "68ca28a88cffdd317f50c712b09abd2ccda8d7bc";
+          sha256 = "0y01albwwcnhj4pnpvcry0zw7z2g9py9q2p3sw5zhgw3g0v5p9ls";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-jslint";
+          sha256 = "1cq8fni4p0qhigx0qh34ypmcsbnilra1ixgnrn9mgg8x3cvcm4cm";
+          name = "flymake-jslint";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-jslint";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-json = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-json";
+        version = "20130424.157";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-json";
+          rev = "36084b67830bdc6c226115ea8287ea88d14b05dd";
+          sha256 = "1qn15pr7c07fmki484z5xpqyn8546qb5dr9gcp5n1172wnh2a534";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-json";
+          sha256 = "1p5kajiycpqy2id664bs0fb1mbf73a43qqfdi4c57n6j9x7fxp4d";
+          name = "flymake-json";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-json";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-less = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, less-css-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-less";
+        version = "20151111.138";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-less";
+          rev = "32d3c28a9a5c52b82d1741ff9d715013b6498421";
+          sha256 = "0ggi8a4j4glpsar0sqg8q06rscajjaziis5ann31wphx88rc5wd7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-less";
+          sha256 = "05k5daphxy94164c73ia7f4l1gv2cmlw8xzs8xnddg7ly22gjhi0";
+          name = "flymake-less";
+        };
+        packageRequires = [ flymake-easy less-css-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-less";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-lua = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-lua";
+        version = "20140310.430";
+        src = fetchFromGitHub {
+          owner = "sroccaserra";
+          repo = "emacs";
+          rev = "ee23c427a8eb01773c87e215d0e61cd8b5b5fe76";
+          sha256 = "1fz7kywp1y2nhp50b2v961wz604sw1gzqcid4k8igz9aii3ygxcv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-lua";
+          sha256 = "0pa66ymhazcfgd9jmxizq5w2sgj008hph42wsa9ljr2rina1gai6";
+          name = "flymake-lua";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-lua";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-perlcritic = callPackage ({ fetchFromGitHub, fetchurl, flymake ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-perlcritic";
+        version = "20120328.314";
+        src = fetchFromGitHub {
+          owner = "illusori";
+          repo = "emacs-flymake-perlcritic";
+          rev = "edfaa86500ddfa8a6a6f51f5581a81a821277df6";
+          sha256 = "1f4l2r4gp03s18255jawc7s5abpjjrw54937wzygmvzvqvmaiikj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-perlcritic";
+          sha256 = "0hibnh463wzhvpix7gygpgs04gi6salwjrsjc6d43lxlsn3y1im8";
+          name = "flymake-perlcritic";
+        };
+        packageRequires = [ flymake ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-perlcritic";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-php = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-php";
+        version = "20121104.1302";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-php";
+          rev = "93abe12d62b13f1d035a0df01e53e4bacdac2c66";
+          sha256 = "09mibjdji5mf3qvngspv1zmik1zd9jwp4mb4c1w4256202359sf4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-php";
+          sha256 = "12ds2l5kvs7fz38syp4amasbjkpqd36rlpajnb3xxll0hbk6vffk";
+          name = "flymake-php";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-php";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-phpcs = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-phpcs";
+        version = "20140713.131";
+        src = fetchFromGitHub {
+          owner = "senda-akiha";
+          repo = "flymake-phpcs";
+          rev = "a4d383474e055e554aaf1cd617055d5d7181aa50";
+          sha256 = "140rlp6m0aqibwa0bhv8w6l3giziybqdw7x271nq8f3r60ch13bi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-phpcs";
+          sha256 = "0zzxi3c203fiw6jp1ar9bb9f28x2lg23bczgy8n5cicrq59jfsn9";
+          name = "flymake-phpcs";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-phpcs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-puppet = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-puppet";
+        version = "20141006.2055";
+        src = fetchFromGitHub {
+          owner = "benprew";
+          repo = "flymake-puppet";
+          rev = "fc4cd25aeac37ed5722bc586d5350fd06ee3067c";
+          sha256 = "1r3yjqxig2j7l50l787qsi96mkvjcgqll9vb4ci51j7b43d53c5m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-puppet";
+          sha256 = "1izq6s33p74dy4wzfnjii8wjs723bm5ggl0w6hkvzgbmyjc01hxv";
+          name = "flymake-puppet";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-puppet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-python-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-python-pyflakes";
+        version = "20131127.206";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-python-pyflakes";
+          rev = "f09ec573d7580a69f8bd49778c26da9ab6d5ec5a";
+          sha256 = "1aijapvpw4skfhfmz09v5kpaxay6b0bp77bbjkrvgyizsqdd39vp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-python-pyflakes";
+          sha256 = "0asbjxv03zkbcjayanv13qzbv4z7b6fi0z1j6yv7fl6q9mgvm497";
+          name = "flymake-python-pyflakes";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-python-pyflakes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-ruby = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-ruby";
+        version = "20121104.1259";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-ruby";
+          rev = "8dc4ca44ec2acfaab25f5501fca1bd687fae94f2";
+          sha256 = "13yk9cncp3zw6d7zkgdpgprpw6wrirk2gxgjvkr15dwcyx1g3109";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-ruby";
+          sha256 = "1shr6d03vx85nmyxnysglzlc1pz0zy3n28nrcmxqgdm02g197bzr";
+          name = "flymake-ruby";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-ruby";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-rust = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-rust";
+        version = "20141004.1752";
+        src = fetchFromGitHub {
+          owner = "joaoxsouls";
+          repo = "flymake-rust";
+          rev = "72ec92c261670b7384ee2593d0f1946ea29f429a";
+          sha256 = "1qxb3vhh83ikhmm89ms7irdip2l03hnjcq5ncmgywkaqkpslaacv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-rust";
+          sha256 = "080cvgl2cg08kyvmgg080zqb6k6bngga3m5lfwb2dpmi1bajywc1";
+          name = "flymake-rust";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-rust";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-sass = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-sass";
+        version = "20140308.525";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-sass";
+          rev = "748f13caa399c27c41ba797da9e214b814f5a30f";
+          sha256 = "0rwjiplpqw3rrh76llnx2fn78f6avxsg0la5br46q1rgw4n8r1w1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-sass";
+          sha256 = "0sz6n5r9pdphgvvaljg9zdwj3dqayaxzxmb4s8x4b05c8yx3ba0d";
+          name = "flymake-sass";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-sass";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-shell = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-shell";
+        version = "20121104.1300";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-shell";
+          rev = "ec097bd77db5523a04ceb15a128e01689d36fb90";
+          sha256 = "0c2lz1p91yhprmlbmp0756d96yiy0w92zf0c9vlp0i9abvd0cvkc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-shell";
+          sha256 = "13ff4r0k29yqgx8ybxz7hh50cjsadcjb7pd0075s9xcrzia5x63i";
+          name = "flymake-shell";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-shell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-vala = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-vala";
+        version = "20150326.31";
+        src = fetchFromGitHub {
+          owner = "daniellawrence";
+          repo = "flymake-vala";
+          rev = "c3674f461fc84fb0300cd3a562fb903a59782745";
+          sha256 = "0qpr0frcn3w0f6yz8vgavwbxvn6wb0qkfk653v4cfy57dvslr4wf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-vala";
+          sha256 = "0yp81phd96z594ckav796qrjm0wlkrfsl0rwpmgg840qn49w71vx";
+          name = "flymake-vala";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-vala";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-yaml = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-yaml";
+        version = "20130423.1048";
+        src = fetchFromGitHub {
+          owner = "yasuyk";
+          repo = "flymake-yaml";
+          rev = "24cb5b744a1796e554e6dbfc6eeb237d06a00b10";
+          sha256 = "0mdam39a85csi9b90wak9j3zkd25lj6x54affwkg3fym8yphmplm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-yaml";
+          sha256 = "17wghm797np4hlidf3wwb47w4klwc6qyk6ry1z05psl3nykws1g7";
+          name = "flymake-yaml";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-yaml";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flyparens = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flyparens";
+        version = "20140723.1346";
+        src = fetchFromGitHub {
+          owner = "jiyoo";
+          repo = "flyparens";
+          rev = "af9b8cfd647d0e5f97684d613dc2eea7cfc19398";
+          sha256 = "07hy1kyw4cbxydmhp4scsy3dcbk2s50rmdp8rch1vbcjk5lj4mvb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flyparens";
+          sha256 = "1mvbfq062qj8vmgzk6rymg3idlfc1makfp1scmjvpw98h30j2a0a";
+          name = "flyparens";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/flyparens";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flyspell-lazy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flyspell-lazy";
+        version = "20141222.852";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "flyspell-lazy";
+          rev = "31786fe04a4732d2f845e1c7e96fcb030182ef10";
+          sha256 = "1g09s57b773nm9xqslzbin5i2h18k55nx00s5nnkvx1qg0n0mzkm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flyspell-lazy";
+          sha256 = "0lzazrhsfh5m7n57dzx0v46d5mg87wpwwkjzf5j9gpv1mc1xfg1y";
+          name = "flyspell-lazy";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/flyspell-lazy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flyspell-popup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "flyspell-popup";
+        version = "20150926.1003";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "flyspell-popup";
+          rev = "f31d89ec60364ee24f89c90e9acc110bd86ea67f";
+          sha256 = "1rdpggnw9mz3qr4kp5gh9nvwncivj446vdhpc04d4jgrl568bhqb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flyspell-popup";
+          sha256 = "0wp15ra1ry6xpwal6mb53ixh3f0s4nps0rdyfli7hhaiwbr9bhql";
+          name = "flyspell-popup";
+        };
+        packageRequires = [ popup ];
+        meta = {
+          homepage = "http://melpa.org/#/flyspell-popup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fm";
+        version = "20130126.1818";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "fm";
+          rev = "555bcebdf47ea3b1d9d1e152af7237b9daa62d59";
+          sha256 = "1fk4zsb4jliwz10sqz5bpqgj1p479mc506dmvy4zq3vqnpbypqvs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fm";
+          sha256 = "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f";
+          name = "fm";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fm-bookmarks = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fm-bookmarks";
+        version = "20151203.803";
+        src = fetchFromGitHub {
+          owner = "kuanyui";
+          repo = "fm-bookmarks.el";
+          rev = "e1440334a4fe161bd8872996b6862d079d8eb24e";
+          sha256 = "0984fhf1nlpdh9mh3gd2xak3v2rlv76qxppqvr6a4kl1dxwg37r3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fm-bookmarks";
+          sha256 = "12ami0k6rfwhrr6xgj0dls4mkk6dp0r9smwzhr4897dv0lw89bdj";
+          name = "fm-bookmarks";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/fm-bookmarks";
+          license = lib.licenses.free;
+        };
+      }) {};
+    focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "focus";
+        version = "20160111.722";
+        src = fetchFromGitHub {
+          owner = "larstvei";
+          repo = "Focus";
+          rev = "307df45c69d3a830b4caee8c418a3feff522f13a";
+          sha256 = "11ya3pfqfx8jpib1p6pys8vwn10q8ac5wla35d2nl6glnijx3cj5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/focus";
+          sha256 = "0jw26j8npyl3dgsrs7ap2djxmkafn2hl6gfqvi7v76bccs4jkyv8";
+          name = "focus";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/focus";
+          license = lib.licenses.free;
+        };
+      }) {};
+    focus-autosave-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "focus-autosave-mode";
+        version = "20151012.442";
+        src = fetchFromGitHub {
+          owner = "vifon";
+          repo = "focus-autosave-mode.el";
+          rev = "592e2c0642ee86b2000b728ea346de084447dda8";
+          sha256 = "1k5xhnr1jkfw8896kf2nl4633r6ni5bnc53rs6lxn8y9lj0srafb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/focus-autosave-mode";
+          sha256 = "1zwp99mk360mqk4mjnnjr6islavginc9732p0jn9g5yz62xypxpc";
+          name = "focus-autosave-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/focus-autosave-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fold-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fold-dwim";
+        version = "20140208.1037";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "fold-dwim";
+          rev = "c46f4bb2ce91b4e307136320e72c28dd50b6cd8b";
+          sha256 = "1yz1wis31asw6xa5maliyd1ck2q02xnnh7dc6swgj9cb4wi7k6i1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fold-dwim";
+          sha256 = "0c9yxx45zlhb1h4ldgkjv7bndwlagpyingaaqn9dcsxidrvp3p5x";
+          name = "fold-dwim";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fold-dwim";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fold-dwim-org = callPackage ({ fetchFromGitHub, fetchurl, fold-dwim, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fold-dwim-org";
+        version = "20131203.751";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "fold-dwim-org";
+          rev = "c09bb2b46d65afbd1d0febc6fded7495be7a3037";
+          sha256 = "14jvbkahwvv4wb0s9vp8gqmlpv1d4269j5rsjxn79q5pawjzslxw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fold-dwim-org";
+          sha256 = "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn";
+          name = "fold-dwim-org";
+        };
+        packageRequires = [ fold-dwim ];
+        meta = {
+          homepage = "http://melpa.org/#/fold-dwim-org";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fold-this = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fold-this";
+        version = "20150601.542";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "fold-this.el";
+          rev = "90b41d7b588ab1c3295bf69f7dd87bf31b543a6a";
+          sha256 = "1cbabpyp66nl5j8yhyj2jih4mhaljxvjh9ij05clai71z4598ahn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fold-this";
+          sha256 = "1iri4a6ixw3q7qr803cj2ik7rvmww1b6ybj5q2pvkf1v25r8655d";
+          name = "fold-this";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fold-this";
+          license = lib.licenses.free;
+        };
+      }) {};
+    folding = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "folding";
+        version = "20140401.203";
+        src = fetchFromGitHub {
+          owner = "jaalto";
+          repo = "project-emacs--folding-mode";
+          rev = "f738e28cd90d794aff698bcd44bf4f5027c92839";
+          sha256 = "1z2dkyzj1gq3gp9cc3lhi240f8f3yjpjnw520xszm0wvx1rp06ny";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/folding";
+          sha256 = "0rb4f4llc4z502znmmc0hfi7n07lp01msx4y1iyqijvqzlq2i93y";
+          name = "folding";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/folding";
+          license = lib.licenses.free;
+        };
+      }) {};
+    font-lock-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "font-lock-plus";
+        version = "20151231.1519";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/font-lock+.el";
+          sha256 = "04j9xybn9an3bm2p2aqmqnswxxg3gwq2mc96brkgxkr88h316d4q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/font-lock+";
+          sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g";
+          name = "font-lock-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/font-lock+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    font-lock-studio = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "font-lock-studio";
+        version = "20141201.1858";
+        src = fetchFromGitHub {
+          owner = "Lindydancer";
+          repo = "font-lock-studio";
+          rev = "35d510e4b16939621d7200bf67021f773cdb4ae5";
+          sha256 = "04n32rgdz7m24jji8p0j42zmf2r60sdbbr4mkr6435fqyvmdd20k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/font-lock-studio";
+          sha256 = "0swwbfaypc78cg4ak24cc92kgxmr1x9vcpaw3jz4zgpm2wzbgmrq";
+          name = "font-lock-studio";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/font-lock-studio";
+          license = lib.licenses.free;
+        };
+      }) {};
+    font-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, persistent-soft }:
+    melpaBuild {
+        pname = "font-utils";
+        version = "20150806.1251";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "font-utils";
+          rev = "9192d3f8ee6a4e75f34c3fed10378674cc2b11d3";
+          sha256 = "1k90w8v5rpswqb8fn1cc8sq5w12gf4sn6say5dhvqd63512b0055";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/font-utils";
+          sha256 = "0k33jdchjkj7j211a23kfp5axg74cfsrrq4axsb1pfp124swh2n5";
+          name = "font-utils";
+        };
+        packageRequires = [ pcache persistent-soft ];
+        meta = {
+          homepage = "http://melpa.org/#/font-utils";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fontawesome = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fontawesome";
+        version = "20151202.830";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-fontawesome";
+          rev = "66650efea4a044afe0e5f482ccac465082cd5e62";
+          sha256 = "103xz042h8w6c85hn19cglfsa34syjh18asm41rjhr9krp15sdl1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fontawesome";
+          sha256 = "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3";
+          name = "fontawesome";
+        };
+        packageRequires = [ cl-lib helm-core ];
+        meta = {
+          homepage = "http://melpa.org/#/fontawesome";
+          license = lib.licenses.free;
+        };
+      }) {};
+    forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "forecast";
+        version = "20151105.1635";
+        src = fetchFromGitHub {
+          owner = "cadadr";
+          repo = "forecast.el";
+          rev = "51526906140700f076bd329753abe7ae31b6da90";
+          sha256 = "1jw888nqmbi9kcd9ycl2fqrmrnqxnmkx72n0b3nf3hp7j956yb21";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/forecast";
+          sha256 = "0whag2n1120384w304g0w4bqr7svdxxncdhnz4rznfpxlgiw2rsc";
+          name = "forecast";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/forecast";
+          license = lib.licenses.free;
+        };
+      }) {};
+    foreign-regexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "foreign-regexp";
+        version = "20140823.1942";
+        src = fetchFromGitHub {
+          owner = "k-talo";
+          repo = "foreign-regexp.el";
+          rev = "c7251fce89c8585f2595e687d8d7bc65cf465b5e";
+          sha256 = "1fczg710a0rjs932yv6vv9rwr9g5ii6cwva82nqfzyhlkf0b1sn5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/foreign-regexp";
+          sha256 = "189cq8n759f28nx10fn3w4qbq7q49bb788kp9l70pj38jgnjn7n7";
+          name = "foreign-regexp";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/foreign-regexp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    foreman-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "foreman-mode";
+        version = "20150611.356";
+        src = fetchFromGitHub {
+          owner = "zweifisch";
+          repo = "foreman-mode";
+          rev = "9496018b0c202442248d4983ec5345501ea18a84";
+          sha256 = "00wqn8h50xr90pyvwk4sv552yiajlzq56wh6f6lad5w90j47q1lx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/foreman-mode";
+          sha256 = "0p3kwbld05wf3dwcv0k6ynz727fiy0ik2srx4js9wvagy57x98kv";
+          name = "foreman-mode";
+        };
+        packageRequires = [ dash dash-functional emacs f s ];
+        meta = {
+          homepage = "http://melpa.org/#/foreman-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    form-feed = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "form-feed";
+        version = "20160102.1653";
+        src = fetchFromGitHub {
+          owner = "wasamasa";
+          repo = "form-feed";
+          rev = "799ca3e72b20a59a755a094b8cead57f654f3170";
+          sha256 = "0nj056x87gcpdqkgx3li5syp6wbj58a1mw2aqa48zflbqwyvs03i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/form-feed";
+          sha256 = "1abwjkzi3irw0jwpv3f584zc72my9n8iq8zp5s0354xk6iwrl1rh";
+          name = "form-feed";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/form-feed";
+          license = lib.licenses.free;
+        };
+      }) {};
+    format-sql = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "format-sql";
+        version = "20150422.833";
+        src = fetchFromGitHub {
+          owner = "paetzke";
+          repo = "format-sql.el";
+          rev = "97f475c245cd6c81a72a265678e2087cee66ac7b";
+          sha256 = "0mikksamljps1czacgqavlnzzhgs8s3f8q4jza6v3csf8kgp5zd0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/format-sql";
+          sha256 = "0684xqzs933vj9d3n3lv7afk4gii41kaqykbb05cribaswapsanj";
+          name = "format-sql";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/format-sql";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fortpy = callPackage ({ auto-complete, epc, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, python-environment }:
+    melpaBuild {
+        pname = "fortpy";
+        version = "20150715.1532";
+        src = fetchFromGitHub {
+          owner = "rosenbrockc";
+          repo = "fortpy-el";
+          rev = "c614517e9396ef7a78be3b8786fbf303879cf43b";
+          sha256 = "1nqx2igxmwswjcrnzdjpx5qcjr60zjy3q9cadq5disms17wdcr6y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fortpy";
+          sha256 = "1nn5vx1rspfsijwhilnjhiy0mjw154ds3lwxvkpwxpchygirlyxj";
+          name = "fortpy";
+        };
+        packageRequires = [ auto-complete epc pos-tip python-environment ];
+        meta = {
+          homepage = "http://melpa.org/#/fortpy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fortune-cookie = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fortune-cookie";
+        version = "20151111.35";
+        src = fetchFromGitHub {
+          owner = "andschwa";
+          repo = "fortune-cookie";
+          rev = "9bf0d29358989e1aee61c472bd5204b9bdf46465";
+          sha256 = "1kk04hl2y2svrs07w4pq9f4g7vs9qzy2qpw9prvi1gravmnfrzc4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fortune-cookie";
+          sha256 = "0xg0zk7hnyhnbhqpxnzrgqs5yz0sy6wb0n9982qc0pa6jqnl9z78";
+          name = "fortune-cookie";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fortune-cookie";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "fountain-mode";
+        version = "20160105.2011";
+        src = fetchFromGitHub {
+          owner = "rnkn";
+          repo = "fountain-mode";
+          rev = "8aab9a3020846f48baf1e22500d1cfde95bab353";
+          sha256 = "0mwsmqfm2y5158kkaf91m5c616fxx5467649wdi9zl21izmc04d4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fountain-mode";
+          sha256 = "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840";
+          name = "fountain-mode";
+        };
+        packageRequires = [ emacs s ];
+        meta = {
+          homepage = "http://melpa.org/#/fountain-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    frame-cmds = callPackage ({ fetchurl, frame-fns, lib, melpaBuild }:
+    melpaBuild {
+        pname = "frame-cmds";
+        version = "20151231.1522";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/frame-cmds.el";
+          sha256 = "190qkf856b769qzkpbrjnfl8sw9x7nwzacf9mr6adxnav07v0fay";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/frame-cmds";
+          sha256 = "0xwzp6sgcb5ap76hpzm8g4kl08a8cgq7i2x9w64njyfink7frwc0";
+          name = "frame-cmds";
+        };
+        packageRequires = [ frame-fns ];
+        meta = {
+          homepage = "http://melpa.org/#/frame-cmds";
+          license = lib.licenses.free;
+        };
+      }) {};
+    frame-fns = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "frame-fns";
+        version = "20151231.1522";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/frame-fns.el";
+          sha256 = "0lvlyxb62sgrm37hc21dn7qzlrq2yagiwpspa926q6dpzcsbam15";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/frame-fns";
+          sha256 = "1wq8wva9q1hdzkvjk582a3fgig0lpqz9ch1p2jd6p29kb1i15f5p";
+          name = "frame-fns";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/frame-fns";
+          license = lib.licenses.free;
+        };
+      }) {};
+    frame-restore = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "frame-restore";
+        version = "20140811.1609";
+        src = fetchFromGitHub {
+          owner = "lunaryorn";
+          repo = "frame-restore.el";
+          rev = "6346cf157d5e1b487a16839d998258b7e693cbc8";
+          sha256 = "0n6jhm1198c8slvdymsfjif0dfx3wlf8q4mm0yvpiln46shhwldx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/frame-restore";
+          sha256 = "0b321iyf57nkrm6xv8d1aydivrdapdgng35zcnrg298ws2naysvm";
+          name = "frame-restore";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/frame-restore";
+          license = lib.licenses.free;
+        };
+      }) {};
+    frame-tag = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "frame-tag";
+        version = "20151121.118";
+        src = fetchFromGitHub {
+          owner = "liangzan";
+          repo = "frame-tag.el";
+          rev = "7018490dbc3c39f2c959e38c448001d1864bfa17";
+          sha256 = "1vvkdgj8warl40kqmd0408q46dxy9qp2sclq4q92b6falry9qy30";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/frame-tag";
+          sha256 = "1n13xcc3ny9j9h1h4vslpjl6k9mqksr73kgmqrmkq301p8zps94q";
+          name = "frame-tag";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/frame-tag";
+          license = lib.licenses.free;
+        };
+      }) {};
+    framemove = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "framemove";
+        version = "20130328.633";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/framemove.el";
+          sha256 = "03ll68d0j0b55rfxymzcirdigkmxcy8556d0i67ghdzmcqfwily7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/framemove";
+          sha256 = "10qf017j0zfnzmcs1i56pznhbvgw7mv4232p8znqaaxphgh6r0ar";
+          name = "framemove";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/framemove";
+          license = lib.licenses.free;
+        };
+      }) {};
+    framesize = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }:
+    melpaBuild {
+        pname = "framesize";
+        version = "20131017.1632";
+        src = fetchFromGitHub {
+          owner = "nicferrier";
+          repo = "emacs-framesize";
+          rev = "f2dbf5d2513b2bc45f2085370a55c1754b6025da";
+          sha256 = "11h9xw6jnw7dacyv1jch2a77xp7hfb93690m7hhazy6l87xmm4dk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/framesize";
+          sha256 = "1rwiwx3n7gkpfihbf6ndl1lxza4zi2rlj5av6lfp5qypbw9wddkf";
+          name = "framesize";
+        };
+        packageRequires = [ key-chord ];
+        meta = {
+          homepage = "http://melpa.org/#/framesize";
+          license = lib.licenses.free;
+        };
+      }) {};
+    free-keys = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "free-keys";
+        version = "20151202.522";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "free-keys";
+          rev = "368820cb361161f10a2ae7a839ab758146fd222c";
+          sha256 = "12rmwf7gm9ib2c99jangygh2yswy41vxlp90rg0hvlhdfmbqa8p0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/free-keys";
+          sha256 = "0j9cfgy2nkbska4lm5z32p804i9n8pdgn50bs5zzk1ilwd5vbalj";
+          name = "free-keys";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/free-keys";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fringe-current-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fringe-current-line";
+        version = "20140110.2211";
+        src = fetchFromGitHub {
+          owner = "kyanagi";
+          repo = "fringe-current-line";
+          rev = "0ef000bac76abae30601222e6f06c7d133ab4942";
+          sha256 = "0zwlnzbi91hkfz1jgj9s9pxwi21s21cwp6psdm687wj2a3wy4231";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fringe-current-line";
+          sha256 = "125yn0wbrrxrmdn7qfxj0f4538sb3xnqb3r2inz3gpblc1vxnqb8";
+          name = "fringe-current-line";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fringe-current-line";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fringe-helper = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fringe-helper";
+        version = "20140620.1609";
+        src = fetchFromGitHub {
+          owner = "nschum";
+          repo = "fringe-helper.el";
+          rev = "ef4a9c023bae18ec1ddd7265f1f2d6d2e775efdd";
+          sha256 = "0ra9rc53l1gvkqank8apasl3r7wz2yfjrcvmfk3wpxhh24ppxv9d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fringe-helper";
+          sha256 = "1vki5jd8jfrlrjcfd12gisgk12y20q3943i2qjgg4qvcj9k28cbv";
+          name = "fringe-helper";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fringe-helper";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fsharp-mode = callPackage ({ auto-complete, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, s }:
+    melpaBuild {
+        pname = "fsharp-mode";
+        version = "20160108.450";
+        src = fetchFromGitHub {
+          owner = "rneatherway";
+          repo = "emacs-fsharp-mode-bin";
+          rev = "9169baa9290e92d2e0ccc3cfd9c2a423136eb251";
+          sha256 = "1ckq45szq8lfg4spmvrj53s3p1hfl7x8k86cgq254gbs7kq8w7p2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fsharp-mode";
+          sha256 = "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z";
+          name = "fsharp-mode";
+        };
+        packageRequires = [ auto-complete dash popup pos-tip s ];
+        meta = {
+          homepage = "http://melpa.org/#/fsharp-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fstar-mode = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fstar-mode";
+        version = "20151023.953";
+        src = fetchFromGitHub {
+          owner = "FStarLang";
+          repo = "fstar-mode.el";
+          rev = "5e7c3d5a4b5422284d8ef4b69023b1fd71952b81";
+          sha256 = "0qq2gradcibjhn477sljy4lnsmi3pzlac42hpa92c6ca1srh3lc4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fstar-mode";
+          sha256 = "0kyzkghdkrnqqbd5b969pjyz9jxgq0j8hkmvlcwikl7ynnhm9lgy";
+          name = "fstar-mode";
+        };
+        packageRequires = [ cl-lib dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/fstar-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fuel = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fuel";
+        version = "20151204.543";
+        src = fetchgit {
+          url = "git://factorcode.org/git/factor.git";
+          rev = "fffb501486083871377237b9320159de140a943a";
+          sha256 = "e2bddf41eacdf63ce42ff433b0a23da3a8de21a6e6b11ab8405ae5a17e09b493";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fuel";
+          sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756";
+          name = "fuel";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/fuel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    full-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "full-ack";
+        version = "20140223.1132";
+        src = fetchFromGitHub {
+          owner = "nschum";
+          repo = "full-ack";
+          rev = "761d846e105b150f8e6d13d7a8983f0248313a45";
+          sha256 = "0bjny4ryrs788myhiaf3ir99vadf2v4swa5gkz9i36a7j6wzpgk5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/full-ack";
+          sha256 = "09ikhyhpvkcl6yl6pa4abnw6i7yfsx5jkmzypib94w7khikvb309";
+          name = "full-ack";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/full-ack";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fullframe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fullframe";
+        version = "20160118.816";
+        src = fetchFromGitHub {
+          owner = "tomterl";
+          repo = "fullframe";
+          rev = "73b945389e021aa43dbb4edde09a8ae404a6a79b";
+          sha256 = "0f0k37kl85j9373i2bdsy6g2lspar794x46di36sccr84719946r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fullframe";
+          sha256 = "08sh8lmb6g8asv28fcb36ilcn0ka4fc6ka0pnslid0h4c32fxp2a";
+          name = "fullframe";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/fullframe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    function-args = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
+    melpaBuild {
+        pname = "function-args";
+        version = "20151022.751";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "function-args";
+          rev = "25e447d8a8930a8c515077de57a7693c6a642514";
+          sha256 = "0m7fcw0cswypiwi5abg6vhw7a3agx9vhp10flbbbji6lblb0fya8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/function-args";
+          sha256 = "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak";
+          name = "function-args";
+        };
+        packageRequires = [ swiper ];
+        meta = {
+          homepage = "http://melpa.org/#/function-args";
+          license = lib.licenses.free;
+        };
+      }) {};
+    furl = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "furl";
+        version = "20110112.1907";
+        src = fetchhg {
+          url = "https://code.google.com/p/furl-el/";
+          rev = "9a96eeea0046";
+          sha256 = "109z1d0zrya1s9wy28nz5ynpg4zl7i1p6q1n57m1b1kkhhckjcv5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/furl";
+          sha256 = "15njmanpj3qb8ic3k4sbrngqnsg85lvlj32dmii3y9bpgvis3k6f";
+          name = "furl";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/furl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fuzzy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fuzzy";
+        version = "20150729.2237";
+        src = fetchFromGitHub {
+          owner = "auto-complete";
+          repo = "fuzzy-el";
+          rev = "534d723ad2e06322ff8d9bd0ba4863d243f698e7";
+          sha256 = "0rzp8c2164w775ggm2fs4j5dz33vqcah84ysp81majirwfql1niv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fuzzy";
+          sha256 = "1hwdh9bx4g4vzzyc20vdwxsii611za37kc9ik40kwjjk62qmll8h";
+          name = "fuzzy";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fuzzy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fuzzy-format = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "fuzzy-format";
+        version = "20130824.700";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/fuzzy-format.el";
+          sha256 = "1iv0x1cb12kknnxyq2gca7m3c3rg9s4cxz397sazkh1csrn0b2i7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fuzzy-format";
+          sha256 = "055b8710yxbi2sdqsqk6jqgnzky4nykv8jgqgwy8q2isgj6q98jb";
+          name = "fuzzy-format";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fuzzy-format";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fuzzy-match = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "fuzzy-match";
+        version = "20151231.1523";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/fuzzy-match.el";
+          sha256 = "1q3gbv9xp2jxrf9vfarjqk9k805xc9z72zbaw7aqdxrj1bafxwnz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fuzzy-match";
+          sha256 = "0mpy84f2zdyzmipzhs06b8rl2pxiypazf35ls1nc1yj8r16ijrds";
+          name = "fuzzy-match";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fuzzy-match";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fvwm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fvwm-mode";
+        version = "20141105.2236";
+        src = fetchFromGitHub {
+          owner = "theBlackDragon";
+          repo = "fvwm-mode";
+          rev = "cfd14546b6905806e0f2ad3df58b08de2401be3c";
+          sha256 = "0w2kqmx38ji5273mzhn9sp4r6vn7jfwb5qpsf2w8d46avpf8rj5i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fvwm-mode";
+          sha256 = "07y32cnp4qfhncp7s24gmlxljdrj5miicinfaf4gc7hihb4bkrkb";
+          name = "fvwm-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fvwm-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fwb-cmds = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fwb-cmds";
+        version = "20131209.1800";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "fwb-cmds";
+          rev = "93504c2022799a84cc14d598e1413f8d9df4ee0e";
+          sha256 = "08qnyr945938hwjg1ypkf2x4mfxbh3bbf1xrgz1rk2ddrfv7hmkm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fwb-cmds";
+          sha256 = "0wnjvi0v0l2h1mhwlsk2d8ggwh3nk7pks48l55gp18nmj00jxycx";
+          name = "fwb-cmds";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fwb-cmds";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "fxrd-mode";
+        version = "20151220.1444";
+        src = fetchFromGitHub {
+          owner = "msherry";
+          repo = "fxrd-mode";
+          rev = "e8c93535cc04083d3b63a1944770488984bc19ce";
+          sha256 = "1n2cvingj7li61k1ff4kmf2gf591fdkslvqsqk0lh71nz59c543j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fxrd-mode";
+          sha256 = "17zimg64lqc1yh9gnp5izshkvviz996aym7q6n9p61a4kqq37z4r";
+          name = "fxrd-mode";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "http://melpa.org/#/fxrd-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fyure = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fyure";
+        version = "20130216.714";
+        src = fetchFromGitHub {
+          owner = "mooz";
+          repo = "fyure";
+          rev = "b6977f1eb148e8b63259f7233b55bb050e44d9b8";
+          sha256 = "08x5li0mshrlamr7vswy7xh358bqhh3pngjr4ckswfi0l2r5fjbd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fyure";
+          sha256 = "0k5z2xqlrzp5lyvp2lr462x38kqdmqld845bvyvkfjd2k4yri71x";
+          name = "fyure";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fyure";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fzf";
+        version = "20151129.833";
+        src = fetchFromGitHub {
+          owner = "bling";
+          repo = "fzf.el";
+          rev = "bfc157a682b53927af633fd919c2e03235ea6599";
+          sha256 = "0rjn4z7ssl1jy0brvsci44mhpig3zkdbcj8gcylzznhz0qfk1ljj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fzf";
+          sha256 = "0jjzm1gq85fx1gmj6nqaijnjws9bm8hmk40ws3x7fmsp41qq5py0";
+          name = "fzf";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/fzf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gandalf-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gandalf-theme";
+        version = "20130809.447";
+        src = fetchFromGitHub {
+          owner = "ptrv";
+          repo = "gandalf-theme-emacs";
+          rev = "4e472fc851431458537d458d09c1f5895e338536";
+          sha256 = "0sn3y1ilbg532mg941qmzipvzq86q31x86ypaf0h0m4015r7l59v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gandalf-theme";
+          sha256 = "0wkmsg3pdw98gyp3q508wsqkzw821qsqi796ynm53zd7a4jfap4p";
+          name = "gandalf-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gandalf-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gap-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "gap-mode";
+        version = "20160109.2332";
+        src = fetchhg {
+          url = "https://bitbucket.com/gvol/gap-mode";
+          rev = "605c441c15b6";
+          sha256 = "0ff0p86j59ki4dy2cd0iwy0lp577bfl2izh1xbnz623kn4nwzvid";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gap-mode";
+          sha256 = "07whab3gi4b8gsvy5ijmjnj700lw0rm3bnr1769byhnpi7qpqin2";
+          name = "gap-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gap-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gather = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gather";
+        version = "20141230.738";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-gather";
+          rev = "50809fbc22d70a1c724c2dd99ac5a1f818ffeb6b";
+          sha256 = "0j0dg7nl9kmanayvw0712x5c5x9h48qmqdsyi0pijvgmv8l5slg5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gather";
+          sha256 = "1f0cqqp1a7w8g1pfvzxxb0hjrxq4m79a4n85dncqj2xhjxrkm0xk";
+          name = "gather";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gather";
+          license = lib.licenses.free;
+        };
+      }) {};
+    geben = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "geben";
+        version = "20100330.543";
+        src = fetchsvn {
+          url = "http://geben-on-emacs.googlecode.com/svn/trunk/";
+          rev = "124";
+          sha256 = "01kbvmylymm6qww45mbjjxmb8ccdl9c2pxdyqfq3g73vwzrvndk4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/geben";
+          sha256 = "1hvvy1kp8wrb1qasm42fslgdkg095g4jxgzbnwpa4vp5cq270qbm";
+          name = "geben";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/geben";
+          license = lib.licenses.free;
+        };
+      }) {};
+    geeknote = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "geeknote";
+        version = "20150223.1015";
+        src = fetchFromGitHub {
+          owner = "avendael";
+          repo = "emacs-geeknote";
+          rev = "e0d25cddc35e9a0f5986a04df2c3d11f78dd3ad9";
+          sha256 = "14v5gm931dcsfflhsvijr4ihx7cs6jymvnjzph3arvhvqwyqhwgq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/geeknote";
+          sha256 = "1ci82fj3layd95lqj2w40y87xps6bs7x05z8ai9m59k244g26m8v";
+          name = "geeknote";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/geeknote";
+          license = lib.licenses.free;
+        };
+      }) {};
+    geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "geiser";
+        version = "20160107.1832";
+        src = fetchFromGitHub {
+          owner = "jaor";
+          repo = "geiser";
+          rev = "296c3b687d8eeb520c7ccf52282e46dfe1ef3a4e";
+          sha256 = "0hkqv2cm0559aihy0kazra48jr4icy43vc46mmcs4gf99lpzdd4x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/geiser";
+          sha256 = "067rrjvyn5sz60w9h7qn542d9iycm2q4ryvx3n6xlard0dky5596";
+          name = "geiser";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/geiser";
+          license = lib.licenses.free;
+        };
+      }) {};
+    general-close = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "general-close";
+        version = "20151222.343";
+        src = fetchFromGitHub {
+          owner = "emacs-berlin";
+          repo = "general-close";
+          rev = "e12d26ffc59f62aeee31ad16a823cb4a390d85c8";
+          sha256 = "1l3ps28a1wdrg2fgvvkdxdadfgpplijs4ig1yqq8yi7k13k046p4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/general-close";
+          sha256 = "17v0aprfvxbygx5517a8hrl88qm5lb9k7523yd0ps5p9l5x96964";
+          name = "general-close";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/general-close";
+          license = lib.licenses.free;
+        };
+      }) {};
+    genrnc = callPackage ({ concurrent, deferred, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
+    melpaBuild {
+        pname = "genrnc";
+        version = "20140612.737";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "emacs-genrnc";
+          rev = "da75b1966a73ad215ec2ced4522c25f4d0bf1f9a";
+          sha256 = "08cw1fa25kbhbq2sp1cpn90bz38i9hjfdj93xf6wvki55b52s0nn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/genrnc";
+          sha256 = "1nwbdscl0yh9j1n421can93m6s8j9dkyb3xmpampr6x528g6z0lm";
+          name = "genrnc";
+        };
+        packageRequires = [ concurrent deferred log4e yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/genrnc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    german-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "german-holidays";
+        version = "20151102.943";
+        src = fetchFromGitHub {
+          owner = "rudolfochrist";
+          repo = "german-holidays";
+          rev = "8388b3bf5b5c38f9b9fcc9216ca26ef0640c6edc";
+          sha256 = "0344w4sbd6wlgl13j163v0hzjw9nwhvpr5s7658xsdd90wp4i701";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/german-holidays";
+          sha256 = "0fgrxdgyl6va6axjc5l4sp90pyqaz5zha1g73xyhbxblshm5dwxn";
+          name = "german-holidays";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/german-holidays";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gerrit-download = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "gerrit-download";
+        version = "20150714.908";
+        src = fetchFromGitHub {
+          owner = "chmouel";
+          repo = "gerrit-download.el";
+          rev = "d568acc7c5935188c9bc19ba72719a6092d9f6fd";
+          sha256 = "1ch8yp0mgk57x0pny9bvkknsqj27fd1rcmpm9s7qpryrwqkp1ix4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gerrit-download";
+          sha256 = "1rlz0iqgvr8yxnv5qmk29xs1jwf0g0ckzanlyldcxvs7n6mhkjjp";
+          name = "gerrit-download";
+        };
+        packageRequires = [ emacs magit ];
+        meta = {
+          homepage = "http://melpa.org/#/gerrit-download";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ggo-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ggo-mode";
+        version = "20130524.643";
+        src = fetchFromGitHub {
+          owner = "mkjunker";
+          repo = "ggo-mode";
+          rev = "e326899d9ed8217c7a4ea6cfdc4dd7aea61d6c1b";
+          sha256 = "0bwjiq4a4f5pg0ngvc3lmkk7aki8n9zqfa1dym0lk4vy6yfhcbhp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ggo-mode";
+          sha256 = "1403x530n90jlfz3lq2vfiqx84cxsrhgs6hhmniq960cjj31q35p";
+          name = "ggo-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ggo-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ggtags";
+        version = "20151214.1544";
+        src = fetchFromGitHub {
+          owner = "leoliu";
+          repo = "ggtags";
+          rev = "d4fb6d40b71cad3fd5a2141b8456f27e2b2dc731";
+          sha256 = "1qjh7av046ax4240iw40hv5fc0k23c36my9hili7fp4y2ak99l8n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ggtags";
+          sha256 = "1cmry4knxbx9257ivhfxsd09z07z3g3wjihi99nrwmhb9h4mpqyw";
+          name = "ggtags";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ggtags";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gh = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, logito, melpaBuild, pcache }:
+    melpaBuild {
+        pname = "gh";
+        version = "20151216.946";
+        src = fetchFromGitHub {
+          owner = "sigma";
+          repo = "gh.el";
+          rev = "3ceef078d9418cf19e1fe6be15cf34794a14880a";
+          sha256 = "0fkq3yl9jpakfnahymjv28fcal38c210garnq055rgmyhyhhpdwd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gh";
+          sha256 = "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0";
+          name = "gh";
+        };
+        packageRequires = [ emacs logito pcache ];
+        meta = {
+          homepage = "http://melpa.org/#/gh";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gh-md = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gh-md";
+        version = "20151207.1140";
+        src = fetchFromGitHub {
+          owner = "emacs-pe";
+          repo = "gh-md.el";
+          rev = "693cb0dcadff70e813e1a9d303d227aff7898557";
+          sha256 = "0g3bjpnwgqczw6ddh4mv7pby0zyqzqgywjrjz2ib6hwmdqzyp1s0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gh-md";
+          sha256 = "0b72fl1hj7gkqlqrr8hklq0w3ryqqqfn5qpb7a9i6q0vh98652xm";
+          name = "gh-md";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/gh-md";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ghc";
+        version = "20160108.901";
+        src = fetchFromGitHub {
+          owner = "kazu-yamamoto";
+          repo = "ghc-mod";
+          rev = "566dbebe298f1e75254a4c3aa07d7410612659d4";
+          sha256 = "01qf3xjqybk9ligaqyarzhdgmwgfkgi19mw9aiggg15fgrix977k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ghc";
+          sha256 = "0xqriwggd1ahla5aff7k0j4admx6q18rmqsx3ipn4nfk86wrhb8g";
+          name = "ghc";
+        };
+        packageRequires = [ haskell-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/ghc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ghc-imported-from = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ghc-imported-from";
+        version = "20141124.1332";
+        src = fetchFromGitHub {
+          owner = "david-christiansen";
+          repo = "ghc-imported-from-el";
+          rev = "fcff08628a19f5d26151564659218cc677779b79";
+          sha256 = "1ywwyc2kz1c1s26c412nmzh55cinh84cfiazyyi3jsy5zzwhrbhi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ghc-imported-from";
+          sha256 = "10cxz4c341lknyz4ns63bri00mya39278xav12c73if03llsyzy5";
+          name = "ghc-imported-from";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ghc-imported-from";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ghci-completion = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ghci-completion";
+        version = "20151125.657";
+        src = fetchFromGitHub {
+          owner = "manzyuk";
+          repo = "ghci-completion";
+          rev = "c47e23d585d2a3c7b13aac163693fdc4f2bb90e5";
+          sha256 = "17fl3k2sqiavbv3bp6rnp3p89j6pnpkkp7wi26pzzk4675r5k45q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ghci-completion";
+          sha256 = "1a6k47z5kmacj1s5479393jyj27bjx0911yaqfmmwg2hr0yz7vll";
+          name = "ghci-completion";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ghci-completion";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gherkin-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gherkin-mode";
+        version = "20140107.1004";
+        src = fetchFromGitHub {
+          owner = "candera";
+          repo = "gherkin-mode";
+          rev = "d84a2977a536f2f8bf4836aebc33a4e86925673d";
+          sha256 = "0lcbyw6yrl6c8py5v2hqghcbsf9cbiplzil90al4lwqps7rw09a8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gherkin-mode";
+          sha256 = "0dhrsz24hn0sdf22wpmzbkn66g4540vdkl03pc27kv21gwa9ixxv";
+          name = "gherkin-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gherkin-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ghq = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ghq";
+        version = "20151130.318";
+        src = fetchFromGitHub {
+          owner = "rcoedo";
+          repo = "emacs-ghq";
+          rev = "bfbf9245075f710ffc7dc2c6bf584dd2ca7bde24";
+          sha256 = "1aj5j0y244r1fbbbl0lzb53wnyhljw91kb4n3hi2gagm7zwp8jcf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ghq";
+          sha256 = "0prvywcgwdhx5pw66rv5kkfriahal2mli2ibam5np3z6bwcq4ngh";
+          name = "ghq";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ghq";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gildas-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, polymode }:
+    melpaBuild {
+        pname = "gildas-mode";
+        version = "20150919.1701";
+        src = fetchFromGitHub {
+          owner = "smaret";
+          repo = "gildas-mode";
+          rev = "23e8a2e6066ff74af592de6d5d0d858442e2bf8a";
+          sha256 = "1na8pp1g940zi22jgqi6drsm12db0hyw99v493i5j1p2y67c4hxw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gildas-mode";
+          sha256 = "0bc3d8bnvg1w2chrr4rp9daq1x8p41qgklrniq0bbkr2h93cmkgv";
+          name = "gildas-mode";
+        };
+        packageRequires = [ emacs polymode ];
+        meta = {
+          homepage = "http://melpa.org/#/gildas-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gist = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gist";
+        version = "20151228.2141";
+        src = fetchFromGitHub {
+          owner = "defunkt";
+          repo = "gist.el";
+          rev = "8219359f88644ebf3a00e7011a39426416336939";
+          sha256 = "1xiwb6m5ibz228aiizhavkd0w7vcxsx6nlk8kkhhdwffj8cglf2d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gist";
+          sha256 = "053fl8aw0ram9wsabzvmlm5w2klwd2pgcn2w9r1yqfs4xqja5sd3";
+          name = "gist";
+        };
+        packageRequires = [ emacs gh ];
+        meta = {
+          homepage = "http://melpa.org/#/gist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "git";
+        version = "20140128.441";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "git.el";
+          rev = "2b523c1975d4f258effaf826656c4b7120b2a19f";
+          sha256 = "0471xm0h6jkmxnrcqy5agq42i8immdb2qpnw7q7czrbsl521al8d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git";
+          sha256 = "1nd2yvfgin13m368gjn7xah99glspnam4g4fh348x4makxcaw8w5";
+          name = "git";
+        };
+        packageRequires = [ dash f s ];
+        meta = {
+          homepage = "http://melpa.org/#/git";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-annex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "git-annex";
+        version = "20131119.1645";
+        src = fetchFromGitHub {
+          owner = "jwiegley";
+          repo = "git-annex-el";
+          rev = "a37648ae83783bb48221ef6299aa4ef5ceccf51b";
+          sha256 = "0yxmrcrvl9pbwhd7w4vnrv2jqyskzvqp17sr3vzjlvv694jd4dms";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-annex";
+          sha256 = "0194y24vq1w6m2cjgqgx9dqp99cq8y9licyry2zxa5brbrsxi94l";
+          name = "git-annex";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/git-annex";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-auto-commit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "git-auto-commit-mode";
+        version = "20150404.951";
+        src = fetchFromGitHub {
+          owner = "ryuslash";
+          repo = "git-auto-commit-mode";
+          rev = "075e5f9ded66c2035581a7b216896556cc586814";
+          sha256 = "0psmr7749nzxln4b500sl3vrf24x3qijp12ir0i5z4x25k72hrlh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-auto-commit-mode";
+          sha256 = "0nf4n63xnzcsizjk1yl8qvqj9wjdqy57kvn6r736xvsxwzd44xgl";
+          name = "git-auto-commit-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/git-auto-commit-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-blame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "git-blame";
+        version = "20110509.1126";
+        src = fetchFromGitHub {
+          owner = "tsgates";
+          repo = "git-emacs";
+          rev = "5c7e8c546c7e99a2424d484b253c1581bfd7ff7d";
+          sha256 = "0g839pzmipjlv32r0gh166jn3na5d0wh2w1sia2k4yx1w0ch1bsx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-blame";
+          sha256 = "0glmnj77vya8ivjin4qja7lis67wyibzy9k6z8b54z7mqf9ikx06";
+          name = "git-blame";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/git-blame";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-command = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, term-run, with-editor }:
+    melpaBuild {
+        pname = "git-command";
+        version = "20160111.703";
+        src = fetchFromGitHub {
+          owner = "10sr";
+          repo = "git-command-el";
+          rev = "a2c192aa779f81a99a10f0eb6dd018f13b2ff949";
+          sha256 = "1irqmypgc4l1jlzj4g65ihpic3ffnnkcg1hlysj7qpip5nbflqgl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-command";
+          sha256 = "1hsxak63y6648n0jkzl5ajxg45w84qq8vljvjh0bmwfrbb67kwbg";
+          name = "git-command";
+        };
+        packageRequires = [ term-run with-editor ];
+        meta = {
+          homepage = "http://melpa.org/#/git-command";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
+    melpaBuild {
+        pname = "git-commit";
+        version = "20160118.58";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "magit";
+          rev = "45b06a7b8664046fd1aecb3f07db535edd80d013";
+          sha256 = "1c6x10nm5syahn85vrgg9i6i7kzy4h7l9alahaxb71w6jwf91rsg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-commit";
+          sha256 = "1i7122fydqga68cilgzir80xfq77hnrw75zrvn52mjymfli6aza2";
+          name = "git-commit";
+        };
+        packageRequires = [ dash emacs with-editor ];
+        meta = {
+          homepage = "http://melpa.org/#/git-commit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-commit-insert-issue = callPackage ({ fetchFromGitLab, fetchurl, github-issues, helm, lib, melpaBuild, projectile, s }:
+    melpaBuild {
+        pname = "git-commit-insert-issue";
+        version = "20151204.619";
+        src = fetchFromGitLab {
+          owner = "emacs-stuff";
+          repo = "git-commit-insert-issue";
+          rev = "1bdfd1960bc279ca830e034a6708b25493b3f460";
+          sha256 = "0axy8r0cs8mdsxvs57p7gqyp4lpr5a2d49947j8ri7xmxp77jwp1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-commit-insert-issue";
+          sha256 = "0mhpszm2y178dxgjv3kh2n744hg2kd60h16zbgmjf4f8228xw8j3";
+          name = "git-commit-insert-issue";
+        };
+        packageRequires = [ github-issues helm projectile s ];
+        meta = {
+          homepage = "http://melpa.org/#/git-commit-insert-issue";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-dwim = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "git-dwim";
+        version = "20130130.1550";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/git-dwim.el";
+          sha256 = "074k1r8rkvyhhwnqy4gnyd7shidxgc25l1xq4hmnwjn13nsyqfnv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-dwim";
+          sha256 = "0vdd2cksiqbnxplqbpb16bcmp137fj3p9a7pa0622wx8vd5p0rkr";
+          name = "git-dwim";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/git-dwim";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "git-gutter";
+        version = "20160116.100";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-git-gutter";
+          rev = "88b526b6611e9847ef0a55075930565c61e5a220";
+          sha256 = "0mim9gvyh7rfp4k4y1y10pwpdpiik2xnw5lkvsv6259cs1fqyv8s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-gutter";
+          sha256 = "12yjl9hsd72dwzl42hdcmjfdbxyi356jcq0kz8k7jvcsn57z4p2k";
+          name = "git-gutter";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/git-gutter";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-gutter-fringe = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, fringe-helper, git-gutter, lib, melpaBuild }:
+    melpaBuild {
+        pname = "git-gutter-fringe";
+        version = "20150331.2339";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-git-gutter-fringe";
+          rev = "62accbd227b17073d623faa4cc472280fc45f53e";
+          sha256 = "0vc1da72vwlys723xi7xvv4ii43sjxgsywb2ss0l0kcm0rays6lv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-gutter-fringe";
+          sha256 = "14wyiyyi2rram2sz3habvmygy5a5m2jfi6x9fqcyfr3vpcjn1k4i";
+          name = "git-gutter-fringe";
+        };
+        packageRequires = [ cl-lib emacs fringe-helper git-gutter ];
+        meta = {
+          homepage = "http://melpa.org/#/git-gutter-fringe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-gutter-fringe-plus = callPackage ({ fetchFromGitHub, fetchurl, fringe-helper, git-gutter-plus, lib, melpaBuild }:
+    melpaBuild {
+        pname = "git-gutter-fringe-plus";
+        version = "20140729.603";
+        src = fetchFromGitHub {
+          owner = "nonsequitur";
+          repo = "git-gutter-fringe-plus";
+          rev = "7a2f49d2455a3a872e90e5f7dd4e6b27f1d96cfc";
+          sha256 = "1rsj193zpblndki4khjjlwl2njxb329d42l75ki55msxifqrn4fi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-gutter-fringe+";
+          sha256 = "1zkjb8p08cq2nqskn79rjszlhp9mrblplgamgi66yskz8qb1bgcc";
+          name = "git-gutter-fringe-plus";
+        };
+        packageRequires = [ fringe-helper git-gutter-plus ];
+        meta = {
+          homepage = "http://melpa.org/#/git-gutter-fringe+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-gutter-plus = callPackage ({ dash, fetchFromGitHub, fetchurl, git-commit, lib, melpaBuild }:
+    melpaBuild {
+        pname = "git-gutter-plus";
+        version = "20151204.1123";
+        src = fetchFromGitHub {
+          owner = "nonsequitur";
+          repo = "git-gutter-plus";
+          rev = "b7726997806d9a2da9fe84ff00ecf21d62b6f975";
+          sha256 = "0bhrrgdzzj8gwxjx7b2kibp1b6s0vgvykfg0n47iq49m6rqkgi5q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-gutter+";
+          sha256 = "1w78p5cz6kyl9kmndgvwnfrs80ha707s8952hycrihgfb6lixmp0";
+          name = "git-gutter-plus";
+        };
+        packageRequires = [ dash git-commit ];
+        meta = {
+          homepage = "http://melpa.org/#/git-gutter+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "git-lens";
+        version = "20150817.214";
+        src = fetchFromGitHub {
+          owner = "pidu";
+          repo = "git-lens";
+          rev = "1feacc217c58fd4a41f9378eb09658f664036509";
+          sha256 = "0s1adgsigaq47vx8bfbmr5z8jq9y230ykwbw0jqka61n4ibg9ish";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-lens";
+          sha256 = "1vv3s89vk5ncinqh2f724z0qbbzp8g4y5y670ryy56w1l6v2acfb";
+          name = "git-lens";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/git-lens";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "git-link";
+        version = "20150927.1225";
+        src = fetchFromGitHub {
+          owner = "sshaw";
+          repo = "git-link";
+          rev = "00a8ed924d837d43bfdc486ab389ee400b6c2a8f";
+          sha256 = "1la3zzcjnmzgxkd4ljr9b5335ddbrvid47kfzp2s358xknzmbsdf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-link";
+          sha256 = "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7";
+          name = "git-link";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/git-link";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-messenger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "git-messenger";
+        version = "20150314.802";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-git-messenger";
+          rev = "7b16fdc9f6fd1a3b9c9f212b1633291c4c18fc9b";
+          sha256 = "038m4fjva8ynlms6dbh55w8x8wsn9c3z02rh4782ck2zi51q0d8g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-messenger";
+          sha256 = "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn";
+          name = "git-messenger";
+        };
+        packageRequires = [ cl-lib popup ];
+        meta = {
+          homepage = "http://melpa.org/#/git-messenger";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-ps1-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "git-ps1-mode";
+        version = "20151228.302";
+        src = fetchFromGitHub {
+          owner = "10sr";
+          repo = "git-ps1-mode-el";
+          rev = "bb177a87a06ec928a008fc50b06ed1967b68867a";
+          sha256 = "1v0jk35ynfg9hivw9gdz2snk73pac67xlfx7av8argdcss1bmyb0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-ps1-mode";
+          sha256 = "15gswi9s0m3hrsl1qqyjnjgbglsai95klbdp51h3pcq7zj22wkn6";
+          name = "git-ps1-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/git-ps1-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-timemachine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "git-timemachine";
+        version = "20160105.506";
+        src = fetchFromGitHub {
+          owner = "pidu";
+          repo = "git-timemachine";
+          rev = "87804bbf6e633f42a48567f21bca52019632f64f";
+          sha256 = "1fq9lzn8vvjh0ayl5h0lywxr6zfg3k41xa66vqrf1hdan3a7ax1j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-timemachine";
+          sha256 = "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq";
+          name = "git-timemachine";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/git-timemachine";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-wip-timemachine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "git-wip-timemachine";
+        version = "20150408.506";
+        src = fetchFromGitHub {
+          owner = "itsjeyd";
+          repo = "git-wip-timemachine";
+          rev = "ed4c7931a5f5233bf3e358b1e81647d063526460";
+          sha256 = "1ivnf4vsqk6c7iw1cid7q1hxp7047ajd1mpg0fl002d7m7ginhyl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-wip-timemachine";
+          sha256 = "02fi51k6l23cgnwjp507ylkiwb8azmnhc0fips68nwn9dghzp6dw";
+          name = "git-wip-timemachine";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "http://melpa.org/#/git-wip-timemachine";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gitattributes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gitattributes-mode";
+        version = "20150330.1248";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "git-modes";
+          rev = "9d8f6eda6ee97963e4085da8988cad2c0547b8df";
+          sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitattributes-mode";
+          sha256 = "1gjs0pjh6ap0h54savamzx94lq6vqrg58jxqaq5n5qplrbg15a6x";
+          name = "gitattributes-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gitattributes-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gitconfig = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gitconfig";
+        version = "20130718.435";
+        src = fetchFromGitHub {
+          owner = "tonini";
+          repo = "gitconfig.el";
+          rev = "7612a37ca14009cac8fb8d6b6f54adad739a5741";
+          sha256 = "184q3vsxa9rvhc1n57ms47r73f3zap25wswzi66rm6rmfi2k7678";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitconfig";
+          sha256 = "126znl1c4vwgskj7ka9id8v2bdrdn5nkyx3mmc6cz9ylc27ainm7";
+          name = "gitconfig";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gitconfig";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gitconfig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gitconfig-mode";
+        version = "20150330.1248";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "git-modes";
+          rev = "9d8f6eda6ee97963e4085da8988cad2c0547b8df";
+          sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitconfig-mode";
+          sha256 = "0hqky40kcgxdnghnf56gpi0xp7ik45ssia1x84v0mvfwqc50dgn1";
+          name = "gitconfig-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gitconfig-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    github-browse-file = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "github-browse-file";
+        version = "20151112.1825";
+        src = fetchFromGitHub {
+          owner = "osener";
+          repo = "github-browse-file";
+          rev = "fa5cc00a40869430fb44596792961a4cddf9c265";
+          sha256 = "07vgnmfn0kbg3h3vhf3xk443yi1b55761x881xlmw9sr9nraa578";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/github-browse-file";
+          sha256 = "03xvgxlw7wmfby898din7dfcg87ihahkhlav1n7qklw6qi7skjcr";
+          name = "github-browse-file";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/github-browse-file";
+          license = lib.licenses.free;
+        };
+      }) {};
+    github-clone = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "github-clone";
+        version = "20160114.853";
+        src = fetchFromGitHub {
+          owner = "dgtized";
+          repo = "github-clone.el";
+          rev = "f51340358e957c46faab5278cbb83cd6c6eb38c6";
+          sha256 = "000m6w2akx1z1lb32nvy6qzyggpcvlbdjh1i8419rzaidxf5gaxg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/github-clone";
+          sha256 = "0ffrm4lmcj3d9kx3g2d5xbiih7hn4frs0prjrvcjq8acvsbc50q9";
+          name = "github-clone";
+        };
+        packageRequires = [ emacs gh magit ];
+        meta = {
+          homepage = "http://melpa.org/#/github-clone";
+          license = lib.licenses.free;
+        };
+      }) {};
+    github-issues = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "github-issues";
+        version = "20120425.1735";
+        src = fetchFromGitHub {
+          owner = "inkel";
+          repo = "github-issues.el";
+          rev = "ebe83ec18e7b874b05e7bc9c25b8cf0800ad20c1";
+          sha256 = "065gpnllsk4x574fn9d6m4ajxl7mj5w2w5g9in421sp5r80fp9fv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/github-issues";
+          sha256 = "12c6yb3v7xwkzc51binfgl4jb3sm3al5nlrklbsxhn44alazsvb0";
+          name = "github-issues";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/github-issues";
+          license = lib.licenses.free;
+        };
+      }) {};
+    github-notifier = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "github-notifier";
+        version = "20160101.1112";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "github-notifier.el";
+          rev = "2db60c00bba0801a3790b8ea51dfd8ce2b1ee0d1";
+          sha256 = "11nfpy39xdkjxaxbfn8rppj4rcz57wl15gyibp01j9w7wmb5b4pr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/github-notifier";
+          sha256 = "1jqc2wx1pvkca8syj97ds32404szm0wn12b7zpa98265sg3n64nw";
+          name = "github-notifier";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/github-notifier";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gitignore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gitignore-mode";
+        version = "20150330.1248";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "git-modes";
+          rev = "9d8f6eda6ee97963e4085da8988cad2c0547b8df";
+          sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitignore-mode";
+          sha256 = "1i98ribmnxr4hwphd95f9hcfm5wfwgdbcxw3g0w17ws7z0ir61mn";
+          name = "gitignore-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gitignore-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
+    melpaBuild {
+        pname = "gitlab";
+        version = "20151202.238";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "emacs-gitlab";
+          rev = "78deece7f314f9652b50117605e93be9f8c860f4";
+          sha256 = "07i4j9yl1yag70sl89n7v4yg4jvh5mrifhrf1xswlb29by6najdx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitlab";
+          sha256 = "0vxsqfnipgapnd2ijvdnkspk68dlnki3pkpkzg2h6hyazmzrsqnq";
+          name = "gitlab";
+        };
+        packageRequires = [ dash pkg-info request s ];
+        meta = {
+          homepage = "http://melpa.org/#/gitlab";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gitolite-clone = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }:
+    melpaBuild {
+        pname = "gitolite-clone";
+        version = "20150819.839";
+        src = fetchFromGitHub {
+          owner = "IvanMalison";
+          repo = "gitolite-clone";
+          rev = "36e8dbc2906b7bfce382db64211d982c9719ab59";
+          sha256 = "1h66wywhl5ipryx0s0w1vxp3ydg57zpizjz61wvf6qd8zn07nhng";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitolite-clone";
+          sha256 = "1la1nrfns9j6wii6lriwwsd44cx3ksyhh09h8lf9dai6wp67kjac";
+          name = "gitolite-clone";
+        };
+        packageRequires = [ dash emacs pcache s ];
+        meta = {
+          homepage = "http://melpa.org/#/gitolite-clone";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gitty = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gitty";
+        version = "20151121.148";
+        src = fetchFromGitHub {
+          owner = "jorgenschaefer";
+          repo = "gitty";
+          rev = "c7c3d622d59531d023b9184d2479316c28045ca2";
+          sha256 = "0y8msn22lzfwh7d417abay9by2zhs9zswhcj8a0l7ln2ksljl500";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitty";
+          sha256 = "1z6w4vbn0aaajyqanc7h1m5ali7dbrnh4ngw87a2x2pkxarx6x16";
+          name = "gitty";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gitty";
+          license = lib.licenses.free;
+        };
+      }) {};
+    glsl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "glsl-mode";
+        version = "20150114.1033";
+        src = fetchFromGitHub {
+          owner = "jimhourihan";
+          repo = "glsl-mode";
+          rev = "6bd83d429307d682fef0efd46c78b3e055e2caf1";
+          sha256 = "0b6ldcfzbdn0mzrcl08zm9kx1hap3djsbzd1qvph1pa2gab25n8j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/glsl-mode";
+          sha256 = "0d05qb60k5f7wwpsp3amzghayfbwcha6rh8nrslhnklpjbg87aw5";
+          name = "glsl-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/glsl-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gmail-message-mode = callPackage ({ fetchFromGitHub, fetchurl, ham-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gmail-message-mode";
+        version = "20140815.1016";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "gmail-mode";
+          rev = "2e0286e4a3c80889692f8da63a3b15d7a96abdea";
+          sha256 = "0j3pay3gd1wdnpc853gy5j68hbavrwy6cc2bgmd12ag29xki3hcg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gmail-message-mode";
+          sha256 = "0py0i7b893ihb8l1hmk3jfl0xil450znadcd18q7svr3zl2m0gkk";
+          name = "gmail-message-mode";
+        };
+        packageRequires = [ ham-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/gmail-message-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gmail2bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gmail2bbdb";
+        version = "20150909.2039";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "gmail2bbdb";
+          rev = "f0e23a1262bb683285b381b1d142478ba345af1a";
+          sha256 = "01hhanijqlh741f9wh6xn88qvghwqnfj5j0rvys5mghssfspqs3z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gmail2bbdb";
+          sha256 = "03jhrk4vpjim3ybzjxy7s9r1cgjysj9vlc4criz5k0w7vqz3r28j";
+          name = "gmail2bbdb";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gmail2bbdb";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gmpl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gmpl-mode";
+        version = "20151116.1349";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "gmpl-mode";
+          rev = "c4cf8896aef89b4c08c0c8764c9f2330fc987f9e";
+          sha256 = "08d6j5wws2ngngf3p31ic0lrsrp9i9lkpr3nxgmiiadm617x8hv4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gmpl-mode";
+          sha256 = "1f60xim8h85jmqpvgfg402ff8mjd66gla8fa0cwi7l18ijnjblpz";
+          name = "gmpl-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/gmpl-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gnome-calendar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gnome-calendar";
+        version = "20140112.559";
+        src = fetchFromGitHub {
+          owner = "NicolasPetton";
+          repo = "gnome-calendar.el";
+          rev = "58c3a3c32aff9901c679bdf9091ed934897b84a0";
+          sha256 = "160qm8xf0yghygb52p8cykhb5vpg9ww3gjprcdkcxplr4b230nnc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnome-calendar";
+          sha256 = "00clamlm5b42zqggxywdqrf6s2dnsxir5rpd8mjpyc502kqmsfn6";
+          name = "gnome-calendar";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gnome-calendar";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gnomenm = callPackage ({ dash, fetchFromGitHub, fetchurl, kv, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "gnomenm";
+        version = "20150316.1418";
+        src = fetchFromGitHub {
+          owner = "nicferrier";
+          repo = "emacs-nm";
+          rev = "9065cda44ffc9e06239b8189a0154d31314c3b4d";
+          sha256 = "1svnvm9fqqx4mrk9jjn11pzqwk71w8kyyd9wwxam8gz22ykw5jb2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnomenm";
+          sha256 = "01vmr64j6hcvdbzg945c5a2g4fiidl18dsk4px7mdf85cv45kzqm";
+          name = "gnomenm";
+        };
+        packageRequires = [ dash kv s ];
+        meta = {
+          homepage = "http://melpa.org/#/gnomenm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gntp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gntp";
+        version = "20141024.2150";
+        src = fetchFromGitHub {
+          owner = "tekai";
+          repo = "gntp.el";
+          rev = "767571135e2c0985944017dc59b0be79af222ef5";
+          sha256 = "1nvyjjjydrimpxy4cpg90si7sr8lmldbhlcm2mx8npklp9pn5y3a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gntp";
+          sha256 = "1ywj3p082g54dcpy8q4jnkqfr12npikx8yz14r0njxdlr0janh4f";
+          name = "gntp";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gntp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gnu-apl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gnu-apl-mode";
+        version = "20151224.1059";
+        src = fetchFromGitHub {
+          owner = "lokedhs";
+          repo = "gnu-apl-mode";
+          rev = "fb1686403e4842b6f44eebe80e5acf86a5151d88";
+          sha256 = "1dfkjzx33wzafj9cfm1bpj99bmnq5a8qrvzmhjykr7mfkca79ymz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnu-apl-mode";
+          sha256 = "0971pzc14gw8f0b4lzvicxww1k3wc58gbr3fd0qvdra2jifk2is6";
+          name = "gnu-apl-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/gnu-apl-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gnuplot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gnuplot";
+        version = "20141231.1537";
+        src = fetchFromGitHub {
+          owner = "bruceravel";
+          repo = "gnuplot-mode";
+          rev = "21f9046e3f5caad41b750b5c9cee02fa4fd20fb9";
+          sha256 = "1gm116479gdwc4hr3nyv1id692dcd1sx7w2a80pvmgr35ybccn7c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnuplot";
+          sha256 = "06c5gqf02fkra8c52xck1lqvf4yg45zfibyf9zqmnbwk7p2jxrds";
+          name = "gnuplot";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gnuplot";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gnuplot-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gnuplot-mode";
+        version = "20151123.139";
+        src = fetchFromGitHub {
+          owner = "mkmcc";
+          repo = "gnuplot-mode";
+          rev = "296ff8d263513cdfb8e85b06e2441c751565b793";
+          sha256 = "1pss9a60dh6i277pkp8j5g1v5h7qlh11w2fki50qcp0zglyw1kaq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnuplot-mode";
+          sha256 = "1avpik06cmi4h6v6039c64b4zw1r1nsg3nrryl254gl881pysfxg";
+          name = "gnuplot-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gnuplot-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gnus-alias = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gnus-alias";
+        version = "20150315.1942";
+        src = fetchFromGitHub {
+          owner = "hexmode";
+          repo = "gnus-alias";
+          rev = "9447d3ccb4c0e75d0468899cccff7aa249657bac";
+          sha256 = "1i278npayv3kfxxd1ypi9n83q5l402sbc1zkm11pf8g006ifqsp4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnus-alias";
+          sha256 = "0mbq9v8fiqqyldpb66v9bc777mzxywaq2dabivabxjg6554s8chf";
+          name = "gnus-alias";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gnus-alias";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gnus-desktop-notify = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gnus-desktop-notify";
+        version = "20150703.854";
+        src = fetchFromGitHub {
+          owner = "wavexx";
+          repo = "gnus-desktop-notify";
+          rev = "cbd5352d7cb5209a410db7f0faa60b4585f8647b";
+          sha256 = "0ylcphnf4lv78kiazdkl5izn7ql402fpvv82n7n1gpjiqq4ylalr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnus-desktop-notify";
+          sha256 = "0hf2dszk5d7vn80bm0msaqv7iji384n85dxgw8ng64c0f9f6752b";
+          name = "gnus-desktop-notify";
+        };
+        packageRequires = [ gnus ];
+        meta = {
+          homepage = "http://melpa.org/#/gnus-desktop-notify";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gnus-spotlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "gnus-spotlight";
+        version = "20130901.935";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/gnus-spotlight.el";
+          sha256 = "1r6bck1hsvk39ccri1h128jj8zd0fh9bsrlp8ijb0v9f6x3cysw4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnus-spotlight";
+          sha256 = "065jcix6a4mxwq8wc8gkr0x9lxmn6hlvf0rqmhi8hb840km1syjx";
+          name = "gnus-spotlight";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gnus-spotlight";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gnus-summary-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gnus-summary-ext";
+        version = "20150119.2033";
+        src = fetchFromGitHub {
+          owner = "vapniks";
+          repo = "gnus-summary-ext";
+          rev = "6be01a82819dc73b0650d726e17d0adb44b72c2b";
+          sha256 = "1dzb3h5swvmwwy7x1lhz79cq2kpmamk35jb4dwmmxz6j248kmv6b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnus-summary-ext";
+          sha256 = "0svyz8fy4k9ba6gpdymf4cf8zjjpgm71y48vlybxbv507xjm17qf";
+          name = "gnus-summary-ext";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gnus-summary-ext";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gnus-x-gm-raw = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
+    melpaBuild {
+        pname = "gnus-x-gm-raw";
+        version = "20140610.231";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "gnus-x-gm-raw";
+          rev = "978bdfcecc8844465b71641c2e909fcdc66b22be";
+          sha256 = "1i3f67x2l9l5c5agspbkxr2mmh3rpq3009d8yzh6r1lih0b4hril";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnus-x-gm-raw";
+          sha256 = "1a5iccghzqmcndql2bppvr48535sf6jbvc83iypr1031z1b5k4wg";
+          name = "gnus-x-gm-raw";
+        };
+        packageRequires = [ log4e yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/gnus-x-gm-raw";
+          license = lib.licenses.free;
+        };
+      }) {};
+    go-autocomplete = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "go-autocomplete";
+        version = "20150903.2140";
+        src = fetchFromGitHub {
+          owner = "nsf";
+          repo = "gocode";
+          rev = "9779bffba5e4e87b4750f718b6fa7f088c1fa6e3";
+          sha256 = "0b25iczbg72pg1525ql6hb6jyx5vck8bqn5z8f4dy9a94qpgxszl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-autocomplete";
+          sha256 = "1ldsq81a167dk2r2mvzyp3v3j2mxc4l9p6b12i7pv8zrjlkhma5a";
+          name = "go-autocomplete";
+        };
+        packageRequires = [ auto-complete ];
+        meta = {
+          homepage = "http://melpa.org/#/go-autocomplete";
+          license = lib.licenses.free;
+        };
+      }) {};
+    go-complete = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "go-complete";
+        version = "20151015.428";
+        src = fetchFromGitHub {
+          owner = "vibhavp";
+          repo = "go-complete";
+          rev = "e39efc356f6e19f17db3f3d2c81f28d38b31a55e";
+          sha256 = "0phy24cra8cza89xrqsx9xrwg98v9qwqx0fzgm1gwlf333zb3hha";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-complete";
+          sha256 = "0dl0ibw145f84kd709r5i2kaw07z1sjzn3dmsiqn8dncspcf2vb4";
+          name = "go-complete";
+        };
+        packageRequires = [ cl-lib go-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/go-complete";
+          license = lib.licenses.free;
+        };
+      }) {};
+    go-direx = callPackage ({ cl-lib ? null, direx, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "go-direx";
+        version = "20150315.2043";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-go-direx";
+          rev = "8f2206469328ee932c7f1892f5e1fb02dec98432";
+          sha256 = "09rxz40bkr0l75v3lmf8lcwqsgjiv5c8zjmwzy2d4syj4qv69c5y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-direx";
+          sha256 = "0dq5d7fsld4hww8fl68c18qp6fl3781dqqwd98cg68bihw2wwni7";
+          name = "go-direx";
+        };
+        packageRequires = [ cl-lib direx ];
+        meta = {
+          homepage = "http://melpa.org/#/go-direx";
+          license = lib.licenses.free;
+        };
+      }) {};
+    go-dlv = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "go-dlv";
+        version = "20151030.259";
+        src = fetchFromGitHub {
+          owner = "benma";
+          repo = "go-dlv.el";
+          rev = "8d5a0076b3d43e7af61149370e583c0d15cb2dd1";
+          sha256 = "0wha1h5mnnh3nsiaf5q1drrvk1gj2cn18bapi8ysy5jdpzi4xqsv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-dlv";
+          sha256 = "13mk7mg2xk7v65r1rs6rmvi4g5nvm8jqg3p9nhk62d46i7dzp61i";
+          name = "go-dlv";
+        };
+        packageRequires = [ go-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/go-dlv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    go-eldoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "go-eldoc";
+        version = "20151028.210";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-go-eldoc";
+          rev = "684f1414913c85695eb8ca4a2643cea04ee60527";
+          sha256 = "1jwh5rqk7vr6kna6i0p3fl3wjk3mhlr6gxklc3xij4r2zdyfj8na";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-eldoc";
+          sha256 = "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk";
+          name = "go-eldoc";
+        };
+        packageRequires = [ cl-lib go-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/go-eldoc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    go-errcheck = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "go-errcheck";
+        version = "20150828.1335";
+        src = fetchFromGitHub {
+          owner = "dominikh";
+          repo = "go-errcheck.el";
+          rev = "1b0cd6af048a8b2074ace14ab51fb6c987beb430";
+          sha256 = "1fm6xd3vsi8mqh0idddjpfxlsmz1ljmjppw3qkxl1vr0qz3598k3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-errcheck";
+          sha256 = "11a75h32cd5h5xjv30x83k60s49k9fhgis31358q46y2gbvqp5bs";
+          name = "go-errcheck";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/go-errcheck";
+          license = lib.licenses.free;
+        };
+      }) {};
+    go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "go-mode";
+        version = "20151226.1424";
+        src = fetchFromGitHub {
+          owner = "dominikh";
+          repo = "go-mode.el";
+          rev = "dccb56c1b1b85c3d7b3184a6606024077d4e1775";
+          sha256 = "0wsh3rgay1k6ncayhqnnsnl5v2xwl60k6qyanmps0jgyshdv67zj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-mode";
+          sha256 = "1852zjxandmq0cpbf7m56ar3rbdi7bx613gdgsf1bg8hsdvkgzfx";
+          name = "go-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/go-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    go-playground = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, gotest, lib, melpaBuild }:
+    melpaBuild {
+        pname = "go-playground";
+        version = "20151031.1610";
+        src = fetchFromGitHub {
+          owner = "grafov";
+          repo = "go-playground";
+          rev = "6de119fe6d1ecb8db2dad1f70831561695c5da58";
+          sha256 = "1hpxvp0slqafbxhkashnmfjssb0ccjq67x01b4p7gznf6rwji166";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-playground";
+          sha256 = "1rabwc80qwkafq833m6a199zfiwwmf0hha89721gc7i0myk9pac6";
+          name = "go-playground";
+        };
+        packageRequires = [ emacs go-mode gotest ];
+        meta = {
+          homepage = "http://melpa.org/#/go-playground";
+          license = lib.licenses.free;
+        };
+      }) {};
+    go-playground-cli = callPackage ({ cl-lib ? null, deferred, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, names, request, s }:
+    melpaBuild {
+        pname = "go-playground-cli";
+        version = "20151223.2120";
+        src = fetchFromGitHub {
+          owner = "kosh04";
+          repo = "emacs-go-playground";
+          rev = "8ba174da0f47b3a6f7d12dc15575c3590b0c9e82";
+          sha256 = "0xm3v6snsxv1x8i4jdq3k2aax7v1xm4zvgc9khabwhc2y63xja46";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-playground-cli";
+          sha256 = "00h89rh8d7lq1di77nv609xbzxmjmffq6mz3cmagylxncflg81jc";
+          name = "go-playground-cli";
+        };
+        packageRequires = [ cl-lib deferred emacs f let-alist names request s ];
+        meta = {
+          homepage = "http://melpa.org/#/go-playground-cli";
+          license = lib.licenses.free;
+        };
+      }) {};
+    go-projectile = callPackage ({ fetchFromGitHub, fetchurl, go-eldoc, go-mode, go-rename, lib, melpaBuild, projectile }:
+    melpaBuild {
+        pname = "go-projectile";
+        version = "20151215.1058";
+        src = fetchFromGitHub {
+          owner = "dougm";
+          repo = "go-projectile";
+          rev = "0a974097ef74b6045585c6120309c208b002f6e6";
+          sha256 = "16n8655i7qidakxijymx1n84pnkn3hxpj7lsr901j03blxdrij5y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-projectile";
+          sha256 = "07diik27gr82n11a8k62v1jxq8rhi16f02ybk548f6cn7iqgp2ml";
+          name = "go-projectile";
+        };
+        packageRequires = [ go-eldoc go-mode go-rename projectile ];
+        meta = {
+          homepage = "http://melpa.org/#/go-projectile";
+          license = lib.licenses.free;
+        };
+      }) {};
+    go-rename = callPackage ({ fetchgit, fetchurl, go-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "go-rename";
+        version = "20151027.838";
+        src = fetchgit {
+          url = "https://go.googlesource.com/tools";
+          rev = "3c782264fbde3108fd1eae9abcc4015edfd79e65";
+          sha256 = "10de1525f4d37081db8f8d9c70d7c9d8f918f1650c4218ccbdafa2d6d34305b1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-rename";
+          sha256 = "1sc3iwxiydgs787a6pi778i0qzqv3bf498r47jwiw5b6mmib3fah";
+          name = "go-rename";
+        };
+        packageRequires = [ go-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/go-rename";
+          license = lib.licenses.free;
+        };
+      }) {};
+    go-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "go-scratch";
+        version = "20150809.2340";
+        src = fetchFromGitHub {
+          owner = "shosti";
+          repo = "go-scratch.el";
+          rev = "3f68cbcce04f59eb8e83af109164731ec0454be0";
+          sha256 = "1a6vg2vwgnafb61pwrd837fwlq5gs80wawbzjsnykawnmcaag8pm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-scratch";
+          sha256 = "11ahvmxbh67wa39cymymxmcpkq0kcn5jz0rrvazjy2p1hx3x1ma5";
+          name = "go-scratch";
+        };
+        packageRequires = [ emacs go-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/go-scratch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    go-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "go-snippets";
+        version = "20151122.57";
+        src = fetchFromGitHub {
+          owner = "toumorokoshi";
+          repo = "go-snippets";
+          rev = "983eb74025030bf6d405f1ed63be3162cc28a528";
+          sha256 = "0di6xwpl6pi0430q208gliz8dgrzwqnmp997q7xcczbkk8zfwn0n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-snippets";
+          sha256 = "1wcbnfzxailv18spxyv4a0nwlqh9l7yf5vxg0qcjcp5ajd2w12kn";
+          name = "go-snippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/go-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    go-stacktracer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "go-stacktracer";
+        version = "20150430.1642";
+        src = fetchFromGitHub {
+          owner = "samertm";
+          repo = "go-stacktracer.el";
+          rev = "a2ac6d801b389f80ca4e2fcc1ab44513a9e55976";
+          sha256 = "0n5nsyfwx2pdlwx6bl35wrfyady5dwraimv92f58mhc344ajd70y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-stacktracer";
+          sha256 = "1laz2ggqydnyr7b36ggb7sphlib79dhp7nszw42wssmv212v94cy";
+          name = "go-stacktracer";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/go-stacktracer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    god-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "god-mode";
+        version = "20151005.1125";
+        src = fetchFromGitHub {
+          owner = "chrisdone";
+          repo = "god-mode";
+          rev = "6cf0807b6555eb6fcf8387a4e3b667071ef38964";
+          sha256 = "1am415k4xxcva6y3vbvyvknzc6bma49pq3p85zmpjsdmsp18qdix";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/god-mode";
+          sha256 = "01xx2byjh6vlckaxamm2x2qzicd9qc8h6amyjg0bxz3932a4llaa";
+          name = "god-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/god-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gold-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sws-mode }:
+    melpaBuild {
+        pname = "gold-mode";
+        version = "20140606.2106";
+        src = fetchFromGitHub {
+          owner = "yuutayamada";
+          repo = "gold-mode-el";
+          rev = "6d3aa59602b1b835495271c8c9741ac344c2eab1";
+          sha256 = "1k4i9z9h4m0h0y92mncr96jir63q5h1bix5bpnlfxhxl5w8pvk1q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gold-mode";
+          sha256 = "1b67hd1fp6xcj65xxp5jcpdjspxsbzxy26v6lqg5kiy8knls57kf";
+          name = "gold-mode";
+        };
+        packageRequires = [ sws-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/gold-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    golden-ratio = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "golden-ratio";
+        version = "20150819.620";
+        src = fetchFromGitHub {
+          owner = "roman";
+          repo = "golden-ratio.el";
+          rev = "72b028808b41d23fa3f7e8c0d23d2c475e7b46ae";
+          sha256 = "0wdw89n7ngxpcdigv8c01h4i84hsdh0y7xq6jdj1i6mnajl8gk92";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/golden-ratio";
+          sha256 = "15fkrv0sgpzmnw2h4fp2gb83d8s42khkfq1h76l241njjayk1f81";
+          name = "golden-ratio";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/golden-ratio";
+          license = lib.licenses.free;
+        };
+      }) {};
+    golden-ratio-scroll-screen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "golden-ratio-scroll-screen";
+        version = "20151211.430";
+        src = fetchFromGitHub {
+          owner = "jixiuf";
+          repo = "golden-ratio-scroll-screen";
+          rev = "585ca16851ac543da75d6ff61872565fb851a118";
+          sha256 = "18a7dv8yshspyq4bi30j0l4ap9qp696syfc29mgvly4xyqh9x4qm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/golden-ratio-scroll-screen";
+          sha256 = "1ygh104vr65s7frlkzyhrfi6shrbvp2b2j3ynj5dip253v85xki5";
+          name = "golden-ratio-scroll-screen";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/golden-ratio-scroll-screen";
+          license = lib.licenses.free;
+        };
+      }) {};
+    golint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "golint";
+        version = "20150414.1930";
+        src = fetchFromGitHub {
+          owner = "golang";
+          repo = "lint";
+          rev = "32a87160691b3c96046c0c678fe57c5bef761456";
+          sha256 = "16lghkdi0rd7l1fph0a254k6axxivmpmc6grx4ryvza3f4yf7483";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/golint";
+          sha256 = "1q4y6mgll8wyp0c7zx810nzsm0k4wvz0wkly1fbja9z63sjzzxwb";
+          name = "golint";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/golint";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gom-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gom-mode";
+        version = "20131007.2153";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-gom-mode";
+          rev = "972e33df1d38ff323bc97de87477305826013701";
+          sha256 = "1anjzlg53kjdqfjcdahbxy8zk9hdha075c1f9nzrnnbbqvmirbbb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gom-mode";
+          sha256 = "07zr38gzqb3ds9mpf94c1vhl1rqd0cjh4g4j2bz86q16c0rnmp7m";
+          name = "gom-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gom-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    google = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "google";
+        version = "20140330.1056";
+        src = fetchFromGitHub {
+          owner = "steckerhalter";
+          repo = "google-el";
+          rev = "1ec11138bdd237e668ced1470c54f740e6c629a4";
+          sha256 = "06p1dpnmg7lhdff1g7c04qq8f9srgkmnm42jlqy85k87j3p5ys2i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/google";
+          sha256 = "15z8l3adw8il0simk8phjgksh0v88cffb6gg3hv8a7nf5bla43my";
+          name = "google";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/google";
+          license = lib.licenses.free;
+        };
+      }) {};
+    google-c-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "google-c-style";
+        version = "20140929.1318";
+        src = fetchFromGitHub {
+          owner = "google";
+          repo = "styleguide";
+          rev = "2a576b1397e7f983940d75f1219813ea1d591da9";
+          sha256 = "12m3hxfwp9r86xdwbslvfxcanpxszcg6x0kcgv5i1k6aygrim9h2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/google-c-style";
+          sha256 = "10gsbg880jbvxs4291vi2ww30ird2f313lbgcb11lswivmhrmd1r";
+          name = "google-c-style";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/google-c-style";
+          license = lib.licenses.free;
+        };
+      }) {};
+    google-contacts = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2 }:
+    melpaBuild {
+        pname = "google-contacts";
+        version = "20160111.411";
+        src = fetchFromGitHub {
+          owner = "jd";
+          repo = "google-contacts.el";
+          rev = "bb1a149bbcc5627250be8267481e884795b448cb";
+          sha256 = "1h7nj570drp2l9x6475gwzcjrp75ms8dkixa7qsgszjdk58qyhnb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/google-contacts";
+          sha256 = "0wgi244zy2am90alimgzazshk2z756bk1hchphssfa4j15n16jgn";
+          name = "google-contacts";
+        };
+        packageRequires = [ oauth2 ];
+        meta = {
+          homepage = "http://melpa.org/#/google-contacts";
+          license = lib.licenses.free;
+        };
+      }) {};
+    google-maps = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "google-maps";
+        version = "20130412.430";
+        src = fetchFromGitHub {
+          owner = "jd";
+          repo = "google-maps.el";
+          rev = "90151ab59e693243ca8da660ce7b9ce361ea5126";
+          sha256 = "183igr5lp20zcqi7rc01fk76sfxdhksd74i11v16gdsifdkjimd0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/google-maps";
+          sha256 = "0a0wqs3cnlpar2dzdi6h14isw78vgqr2r6psmrzbdl00s4fcyxwx";
+          name = "google-maps";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/google-maps";
+          license = lib.licenses.free;
+        };
+      }) {};
+    google-this = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "google-this";
+        version = "20150522.440";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "emacs-google-this";
+          rev = "5274167553071fadaebe9c2d3b061470a684ae22";
+          sha256 = "0r6hngf3h5x55lk2qwfgd6bhjhkax5nz8ml43d1x23y5bjnrricq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/google-this";
+          sha256 = "0hg9y1b03aiamyn3mam3hyxmxy21wygxrnrww91zcbwlzgp4dd2c";
+          name = "google-this";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/google-this";
+          license = lib.licenses.free;
+        };
+      }) {};
+    google-translate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "google-translate";
+        version = "20160111.854";
+        src = fetchFromGitHub {
+          owner = "atykhonov";
+          repo = "google-translate";
+          rev = "109024fe437c3484160e82eb775343bc149a4446";
+          sha256 = "0hvxyqkxv5hfsa9sv71m7d98g25a1xc962r961nw6vmbvsf64z6b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/google-translate";
+          sha256 = "1crgzdd32mk6hrawdypg496dwh51wzwfb5wqw4a2j5l8y958xf47";
+          name = "google-translate";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/google-translate";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gore-mode = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gore-mode";
+        version = "20151123.1327";
+        src = fetchFromGitHub {
+          owner = "sergey-pashaev";
+          repo = "gore-mode";
+          rev = "94d7f3e99104e06167967c98fdc201049c433c2d";
+          sha256 = "0l022aqpnb38q6kgdqpbxrc1r7fljwl7xq14yi5jb7qgzw2v43cz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gore-mode";
+          sha256 = "0nljybh2pw8pbbajfsz57r11rs4bvzfxmwpbm5qrdn6dzzv65nq3";
+          name = "gore-mode";
+        };
+        packageRequires = [ go-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/gore-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gorepl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gorepl-mode";
+        version = "20151121.622";
+        src = fetchFromGitHub {
+          owner = "manute";
+          repo = "gorepl-mode";
+          rev = "17e025951f5964a0542a4b353ddddbc734c01eed";
+          sha256 = "1abb78xxsggawl43hspl0cr0f7i1b3jd9r6xl1nl5jg97i4byg0b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gorepl-mode";
+          sha256 = "12h9r4kf9y2v601myhzzdw2c4jc5cb7s94r5dkzriq578digxphl";
+          name = "gorepl-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/gorepl-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "gotest";
+        version = "20151218.249";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "gotest.el";
+          rev = "ab0da939aad5cec301126c59b7718cd3158b3233";
+          sha256 = "1b6zn1fmqvfb7bcpmhzkgcy5003dl22w3f293arlsd1xkbjgkxa2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gotest";
+          sha256 = "1kan3gykhci33jgg67jjiiz7rqlz5mpxp8sh6mb0n6kpfmgb4ly9";
+          name = "gotest";
+        };
+        packageRequires = [ emacs f go-mode s ];
+        meta = {
+          homepage = "http://melpa.org/#/gotest";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gotham-theme";
+        version = "20160102.1654";
+        src = fetchFromGitHub {
+          owner = "wasamasa";
+          repo = "gotham-theme";
+          rev = "3cc07bd3cf1406d41cfc0a422673d524d52c22d3";
+          sha256 = "12lglll20w321vvl6zpqd8r9745y58g6zzfm83iifyzd9hzx7v30";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gotham-theme";
+          sha256 = "0jars6rvf7hkyf71vq06mqki1r840i1dvv43dissqjg5i4lr79cl";
+          name = "gotham-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gotham-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    goto-chg = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "goto-chg";
+        version = "20131228.859";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/goto-chg.el";
+          sha256 = "078d6p4br5vips7b9x4v6cy0wxf6m5ij9gpqd4g33bryn22gnpij";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/goto-chg";
+          sha256 = "0fs0fc1mksbb1266sywasl6pppdn1f9a4q9dwycl9zycr588yjyv";
+          name = "goto-chg";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/goto-chg";
+          license = lib.licenses.free;
+        };
+      }) {};
+    goto-gem = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "goto-gem";
+        version = "20140729.1345";
+        src = fetchFromGitHub {
+          owner = "pidu";
+          repo = "goto-gem";
+          rev = "e3206f11f48bb7e798514a4ca2c2f60649613e5e";
+          sha256 = "0j2hdxqfsifm0d8ilwcw7np6mvn4xm58xglzh42gigj2fxv87g99";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/goto-gem";
+          sha256 = "06vy9m01qccvahxr5xn0plzw9knl5ig7gi5q5r1smfx92bmzkg3a";
+          name = "goto-gem";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "http://melpa.org/#/goto-gem";
+          license = lib.licenses.free;
+        };
+      }) {};
+    goto-last-change = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "goto-last-change";
+        version = "20150109.1223";
+        src = fetchFromGitHub {
+          owner = "camdez";
+          repo = "goto-last-change.el";
+          rev = "58b0928bc255b47aad318cd183a5dce8f62199cc";
+          sha256 = "1f0zlvva7d7iza1v79yjp0bm7vd011q4cy14g1saryll32z115z5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/goto-last-change";
+          sha256 = "1yl9p95ls04bkmf4d6az72pycp27bv7q7wxxzvj8sj97bgwvwajx";
+          name = "goto-last-change";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/goto-last-change";
+          license = lib.licenses.free;
+        };
+      }) {};
+    govet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "govet";
+        version = "20150428.1359";
+        src = fetchFromGitHub {
+          owner = "meshelton";
+          repo = "govet";
+          rev = "736f11850f2d1d62bd417fb57d4f8bb55a176b70";
+          sha256 = "1fzf43my7qs4n37yh1jm6fyp76dfgknc5g4zin7x5b5lc63g0wxb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/govet";
+          sha256 = "1rpgngixf1xnnqf0l2vvh6y9q3395qyj9ln1rh0xz5lm7d4pq4hy";
+          name = "govet";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/govet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gplusify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gplusify";
+        version = "20150312.1444";
+        src = fetchFromGitHub {
+          owner = "jorgenschaefer";
+          repo = "gplusify";
+          rev = "bd6237ae671db2fbf406dcc6225839dcbd2475b2";
+          sha256 = "1l43h008l7n6waclb2km32dy8aj7m5yavm1pkq38p9ppzayfxqq1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gplusify";
+          sha256 = "0fgkcvppkq6pba1giddkfxp9z4c8v2cid9nb8a190b3g85wcwycr";
+          name = "gplusify";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gplusify";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gradle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "gradle-mode";
+        version = "20150313.1405";
+        src = fetchFromGitHub {
+          owner = "jacobono";
+          repo = "emacs-gradle-mode";
+          rev = "e4d665d5784ecda7ddfba015f07c69be3cfc45f2";
+          sha256 = "0xs2278gamzg0710bm1fkhjh1p75m2l1jcl98ldhyjhvaf9d0ysc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gradle-mode";
+          sha256 = "0lx9qi93wmiy9pxjxqp68scbcb4bx88b6jiqk3y8jg5cajizh24g";
+          name = "gradle-mode";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "http://melpa.org/#/gradle-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    grails-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "grails-mode";
+        version = "20151206.154";
+        src = fetchFromGitHub {
+          owner = "Groovy-Emacs-Modes";
+          repo = "groovy-emacs-modes";
+          rev = "792b0c5a72f7500c8e07f37b77b96fd1f91ac61b";
+          sha256 = "03dranmbrq9gkvlcvzlrvv0nvpkgk02hcwfcjkdifql2j8h23jgy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grails-mode";
+          sha256 = "1zdlmdkwyaj2zns3xwmqpil83j7857aj2070kvx8xza66dxcnlm4";
+          name = "grails-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/grails-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    grails-projectile-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+    melpaBuild {
+        pname = "grails-projectile-mode";
+        version = "20141229.1329";
+        src = fetchFromGitHub {
+          owner = "yveszoundi";
+          repo = "grails-projectile-mode";
+          rev = "6cb3b7890ce869a911a7b1d5892a6eef7992c199";
+          sha256 = "11ry4p5r0hg3jlmfhp6hfkryzrp6snl38v8j7ds8limhbpdh5wr4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grails-projectile-mode";
+          sha256 = "0dy8v2mila7ccvb7j5jlfkhfjsjfk3bm3rcy84m0rgbqjai67amn";
+          name = "grails-projectile-mode";
+        };
+        packageRequires = [ cl-lib emacs projectile ];
+        meta = {
+          homepage = "http://melpa.org/#/grails-projectile-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "grandshell-theme";
+        version = "20150404.701";
+        src = fetchFromGitHub {
+          owner = "steckerhalter";
+          repo = "grandshell-theme";
+          rev = "6bf34fb1a3117244629a7fb23daf610f50854bed";
+          sha256 = "1202fwwwdr74q6s5jv1n0mvmq4n9mra85l14hdhwh2kks513s6vs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grandshell-theme";
+          sha256 = "1mnnjsw1kx40b6ws8wmk25fz9rq8rd70xia9cjpwdfkg7kh8xvsa";
+          name = "grandshell-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/grandshell-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-ubiquitous, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }:
+    melpaBuild {
+        pname = "graphene";
+        version = "20151109.140";
+        src = fetchFromGitHub {
+          owner = "rdallasgray";
+          repo = "graphene";
+          rev = "dcc0e34c6c4632d5d5445ec023f5b1ca04c7d1b7";
+          sha256 = "1f34bhjxmbf2jjrkpdvqg2gwp83ka6d5vrxmsxdl3r57yc6rbrwa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/graphene";
+          sha256 = "1wz3rvd8b7gx5d0k7yi4dd69ax5bybcm10vdc7xp4yn296lmyl9k";
+          name = "graphene";
+        };
+        packageRequires = [
+          company
+          dash
+          exec-path-from-shell
+          flycheck
+          graphene-meta-theme
+          ido-ubiquitous
+          ppd-sr-speedbar
+          smartparens
+          smex
+          sr-speedbar
+          web-mode
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/graphene";
+          license = lib.licenses.free;
+        };
+      }) {};
+    graphene-meta-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "graphene-meta-theme";
+        version = "20151108.400";
+        src = fetchFromGitHub {
+          owner = "rdallasgray";
+          repo = "graphene-meta-theme";
+          rev = "5d848233ac91c1e3560160a4eba60944f5837d35";
+          sha256 = "1bidfn4x5lb6dylhadyf05g4l2k7jg83mi058cmv76av1glawk17";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/graphene-meta-theme";
+          sha256 = "1cqdr93lccdpxkzgap3r3qc92dh8vqgdlnxvqkw7lrcbs31fvf3q";
+          name = "graphene-meta-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/graphene-meta-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    graphviz-dot-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "graphviz-dot-mode";
+        version = "20151127.821";
+        src = fetchFromGitHub {
+          owner = "ppareit";
+          repo = "graphviz-dot-mode";
+          rev = "ca0f15158c3bbd516549532be1dd35bc51462c84";
+          sha256 = "12r6a3hikzqcdbplmraa4p4w136c006yamylxfjf8580v15xngrf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/graphviz-dot-mode";
+          sha256 = "04rkynsrsk6w4sxn1pc0b9b6pij1p7yraywbrk7qvv05fv69kri2";
+          name = "graphviz-dot-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/graphviz-dot-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    grapnel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "grapnel";
+        version = "20131001.1034";
+        src = fetchFromGitHub {
+          owner = "leathekd";
+          repo = "grapnel";
+          rev = "fbd0f9a51139973d35e4014855964fa435e8ecaf";
+          sha256 = "0nvl8mh7jxailisq31h5bi64s9b74ah1465wiwh18x502swr2s3c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grapnel";
+          sha256 = "019cdx1wdx8sc2ibqwgp1akgckzxxvrayyp2sv806gha0kn6yf6r";
+          name = "grapnel";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/grapnel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    grass-mode = callPackage ({ cl-lib ? null, dash, fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "grass-mode";
+        version = "20151030.1120";
+        src = fetchhg {
+          url = "https://bitbucket.com/tws/grass-mode.el";
+          rev = "aa8cc5eff764";
+          sha256 = "0djv2ps2ahw9b1b5i45hgy7l7cch7cgh7rzq601c0r6vi7gm2ac5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grass-mode";
+          sha256 = "1lq6bk4bwgcy4ra3d9rlca3fk87ydg7xnnqcqjg0pw4m9xnr3f7v";
+          name = "grass-mode";
+        };
+        packageRequires = [ cl-lib dash ];
+        meta = {
+          homepage = "http://melpa.org/#/grass-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    green-phosphor-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "green-phosphor-theme";
+        version = "20150515.947";
+        src = fetchFromGitHub {
+          owner = "aalpern";
+          repo = "emacs-color-theme-green-phosphor";
+          rev = "fa42f598626adfdc5450e5c380fa2d5df6110f28";
+          sha256 = "0rgv96caigcjffg1983274p4ff1icx1xh5bj7rcd53hai5ag16mp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/green-phosphor-theme";
+          sha256 = "1p4l75lahmbjcx74ca5jcyc04828vlcahk7gzv5lr7z9mhvq6fbh";
+          name = "green-phosphor-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/green-phosphor-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gregorio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gregorio-mode";
+        version = "20151026.920";
+        src = fetchFromGitHub {
+          owner = "cajetanus";
+          repo = "gregorio-mode.el";
+          rev = "5b618a8d05cc073bd8e6f1e4e56eceb4de60eab3";
+          sha256 = "1670pxgmqflzw5d02mzsmqjf3gp0c4wf25z0crmaamyfmwdz9pag";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gregorio-mode";
+          sha256 = "0f226l67bqqc6m8wb97m7lkxvwrfbw74b1riasirca1anzjl8jfx";
+          name = "gregorio-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gregorio-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    grep-a-lot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "grep-a-lot";
+        version = "20131006.847";
+        src = fetchFromGitHub {
+          owner = "ZungBang";
+          repo = "emacs-grep-a-lot";
+          rev = "9f9f645b9e308a0d887b66864ff97d0fca1ba4ad";
+          sha256 = "1f8262mrlinzgnn4m49hbj1hm3c1mvzza24py4b37sasn49546lw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grep-a-lot";
+          sha256 = "1513vnm5b587r15hcbnplgsfv7kv8g5fd0w4nwb6pq7myzv53ra1";
+          name = "grep-a-lot";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/grep-a-lot";
+          license = lib.licenses.free;
+        };
+      }) {};
+    grep-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "grep-plus";
+        version = "20151231.1524";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/grep+.el";
+          sha256 = "1pqx01c61i3rxvq2qf8l6gcla8jsmc1af5780s78clqfi51kbg2g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grep+";
+          sha256 = "1qj4f6d3l88bdcnq825pylnc76m22x2i15yxdhc2b6rv80df7zsx";
+          name = "grep-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/grep+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    greymatters-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "greymatters-theme";
+        version = "20150621.623";
+        src = fetchFromGitHub {
+          owner = "mswift42";
+          repo = "greymatters-theme";
+          rev = "a7220a8c6cf18ccae2b76946b6f01188a7c9d5d1";
+          sha256 = "14c09m9p6556rrf0qfad4zsv7qxa5flamzg6fa83cxh0qfg7wjbp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/greymatters-theme";
+          sha256 = "10cxajyws5rwk62i4vk26c1ih0dq490kcfx7gijw38q3b5r1l8nr";
+          name = "greymatters-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/greymatters-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    grin = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "grin";
+        version = "20110806.158";
+        src = fetchhg {
+          url = "https://bitbucket.com/dariusp686/emacs-grin";
+          rev = "f541aa22da52";
+          sha256 = "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grin";
+          sha256 = "0mvzwmws5pi6hpzgkc43fjxs98ngkr0jvqbclza2jbbqawifzzbk";
+          name = "grin";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/grin";
+          license = lib.licenses.free;
+        };
+      }) {};
+    grizzl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "grizzl";
+        version = "20151223.1358";
+        src = fetchFromGitHub {
+          owner = "d11wtq";
+          repo = "grizzl";
+          rev = "38b819b8f132962e24eb6a2cff33d571e848776d";
+          sha256 = "1v5xh0hana9wqc73g0yrzk5ip9zxbqg9xi8k7972nzj3fnma77bh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grizzl";
+          sha256 = "1klds0w9qrsgfppq105qr69c26zi91y575db2hxr6h9vypf2rq24";
+          name = "grizzl";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/grizzl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    groovy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "groovy-mode";
+        version = "20151228.1151";
+        src = fetchFromGitHub {
+          owner = "Groovy-Emacs-Modes";
+          repo = "groovy-emacs-modes";
+          rev = "792b0c5a72f7500c8e07f37b77b96fd1f91ac61b";
+          sha256 = "03dranmbrq9gkvlcvzlrvv0nvpkgk02hcwfcjkdifql2j8h23jgy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/groovy-mode";
+          sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal";
+          name = "groovy-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/groovy-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gruber-darker-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gruber-darker-theme";
+        version = "20151223.252";
+        src = fetchFromGitHub {
+          owner = "rexim";
+          repo = "gruber-darker-theme";
+          rev = "60d8262d8e38103568bbe58e2ece1d9a970fc15a";
+          sha256 = "0l6gkhzg0dn4q223gljh1jh305aa9n8rbf9h5gg5d1aygs7cb3ha";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gruber-darker-theme";
+          sha256 = "0vn4msixb77xj6p5mlfchjyyjhzah0lcmp0z82s8849zd194fxqi";
+          name = "gruber-darker-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gruber-darker-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    grunt = callPackage ({ ansi-color ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "grunt";
+        version = "20151110.1029";
+        src = fetchFromGitHub {
+          owner = "gempesaw";
+          repo = "grunt.el";
+          rev = "42bcab2990a27e0f8cf22eee87089c95eb9fae29";
+          sha256 = "1js849s8b9x0n6ak2qwv90lk6zr71mgkk9f0xccdhikz4c8vxk0r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grunt";
+          sha256 = "1qdzqcrff9x97kyy0d4j636d5i751qja10liw8i0lf4lk6n0lywz";
+          name = "grunt";
+        };
+        packageRequires = [ ansi-color dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/grunt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gruvbox-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gruvbox-theme";
+        version = "20151227.313";
+        src = fetchFromGitHub {
+          owner = "Greduan";
+          repo = "emacs-theme-gruvbox";
+          rev = "6af232a46073235ccf81cf99f46ee600fea7ba3e";
+          sha256 = "04jknwkax9gdmzz0yq0m21grl9c43vr3abdam3g8zjh5sjx5gs14";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gruvbox-theme";
+          sha256 = "042mnwlmixygk2mf24ygk7rkv1rfavc5a36hs9x8b68jnf3khj32";
+          name = "gruvbox-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gruvbox-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gs-mode";
+        version = "20151202.406";
+        src = fetchFromGitHub {
+          owner = "yyr";
+          repo = "emacs-grads";
+          rev = "1a13051db21b999c7682a015b33a03096ff9d891";
+          sha256 = "1d89gxyzv0z0nk7v1aa4qa0xfms2g2dsrr07cw0d99xsnyxfky31";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gs-mode";
+          sha256 = "02ldd92fv1k28nygl34i8gv0b0i1v5qd7nl1l17cf5f3akdwc6iq";
+          name = "gs-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gs-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gscholar-bibtex";
+        version = "20151022.1225";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "gscholar-bibtex";
+          rev = "00b32521de3aa689bc58516ae10ba7f3ef1b6c92";
+          sha256 = "1dfd22629gz0c8r4wplvbn0n7bm20549mg5chq289s826ca0kxqk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gscholar-bibtex";
+          sha256 = "0d41gr9amf9vdn9pl9lamhp2swqllxslv9r3wsgzqvjl7zayd1az";
+          name = "gscholar-bibtex";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gscholar-bibtex";
+          license = lib.licenses.free;
+        };
+      }) {};
+    guide-key = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin, s }:
+    melpaBuild {
+        pname = "guide-key";
+        version = "20150108.35";
+        src = fetchFromGitHub {
+          owner = "kai2nenobu";
+          repo = "guide-key";
+          rev = "9236d287a7272e307fb941237390a96037c8c0a2";
+          sha256 = "14sx5m6fpkm2q8ljkicl1yy1sw003k4rzz9hi7lm1nfqr2l4n6q0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/guide-key";
+          sha256 = "0zjrdvppcg8b2k6hfdj45rswc1ks9xgimcr2yvgpc8prrwk1yjsf";
+          name = "guide-key";
+        };
+        packageRequires = [ dash popwin s ];
+        meta = {
+          homepage = "http://melpa.org/#/guide-key";
+          license = lib.licenses.free;
+        };
+      }) {};
+    guide-key-tip = callPackage ({ fetchFromGitHub, fetchurl, guide-key, lib, melpaBuild, pos-tip }:
+    melpaBuild {
+        pname = "guide-key-tip";
+        version = "20140406.2020";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "guide-key-tip";
+          rev = "d1773156b62566e1245f39936abd151844bd471c";
+          sha256 = "1s6p4ysdbqx5fk68s317ckj5rjmpkwwb0324sbqqa6byhw3j0xyj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/guide-key-tip";
+          sha256 = "0h2vkkbxq361dkn6irm1v19qj7bkhxcjljiksd5wwlq5zsq6bd06";
+          name = "guide-key-tip";
+        };
+        packageRequires = [ guide-key pos-tip ];
+        meta = {
+          homepage = "http://melpa.org/#/guide-key-tip";
+          license = lib.licenses.free;
+        };
+      }) {};
+    guru-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "guru-mode";
+        version = "20151028.28";
+        src = fetchFromGitHub {
+          owner = "bbatsov";
+          repo = "guru-mode";
+          rev = "062a41794431d5e263f9f0e6ae1ec4a8d79980dd";
+          sha256 = "16h1g88y4q737sxcjkm1kxirv5m2x3l9wgmz0s4hlxjzli8fc7jr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/guru-mode";
+          sha256 = "0j25nxs3ndybq1ik36qyqdprmhav4ba8ny7v2z61s23id8hz3xjs";
+          name = "guru-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/guru-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gvpr-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gvpr-mode";
+        version = "20131208.1118";
+        src = fetchFromGitHub {
+          owner = "rodw";
+          repo = "gvpr-lib";
+          rev = "3d6cc6f4416faf2a1913821d12ba6eb624362af0";
+          sha256 = "0060qw4gr9fv6db20xf3spgl2fwg2iid5ckfjm3vj3ydyv62q13s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gvpr-mode";
+          sha256 = "19p6f06qdjvh2vmgbabajvkfxpn13j899jrivw9mqyssz0cyvzgw";
+          name = "gvpr-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gvpr-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hackernews";
+        version = "20150901.1017";
+        src = fetchFromGitHub {
+          owner = "clarete";
+          repo = "hackernews.el";
+          rev = "676d72da9fa4743dae34da95138fd022a51fbfdd";
+          sha256 = "15d7zjxjp9h8jmxq3dqakwzlymqk6hqsg7zklkjs0ih7fz0d25pl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hackernews";
+          sha256 = "1x1jf5gkhmpiby5rmy0sziywh6c1f1n0p4f6dlz6ifbwns7har6a";
+          name = "hackernews";
+        };
+        packageRequires = [ json ];
+        meta = {
+          homepage = "http://melpa.org/#/hackernews";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ham-mode = callPackage ({ fetchFromGitHub, fetchurl, html-to-markdown, lib, markdown-mode, melpaBuild }:
+    melpaBuild {
+        pname = "ham-mode";
+        version = "20150811.806";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "ham-mode";
+          rev = "3a141986a21c2aa6eefb428983352abb8b7907d2";
+          sha256 = "0d3xmagl18pas19zbpg27j0lmdiry23df48z4vkjsrcllqg25v5g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ham-mode";
+          sha256 = "000qrdby7d6zmp5066vs4gjlc9ik0ybrgcwzcbfgxb16w1g9xpmz";
+          name = "ham-mode";
+        };
+        packageRequires = [ html-to-markdown markdown-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/ham-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    haml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
+    melpaBuild {
+        pname = "haml-mode";
+        version = "20150508.2211";
+        src = fetchFromGitHub {
+          owner = "nex3";
+          repo = "haml-mode";
+          rev = "7717db6fa4a90d618b4a5e3fef2ac1d24ce39be3";
+          sha256 = "0fmcm4pcivigz9xhf7z9wsxz9pg1yfx9qv8na2dxj426bibk0a6w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haml-mode";
+          sha256 = "0ih0m7zr6kgn6zd45zbp1jgs1ydc5i5gmq6l080wma83v5w1436f";
+          name = "haml-mode";
+        };
+        packageRequires = [ ruby-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/haml-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hamlet-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "hamlet-mode";
+        version = "20131208.124";
+        src = fetchFromGitHub {
+          owner = "lightquake";
+          repo = "hamlet-mode";
+          rev = "7362b955e556a3d007fa06945a27e5b99349527d";
+          sha256 = "1njrpb1s2v9skyfbgb28clrxyvyp8i4b8kwa68ynvq3vjb4fnws6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hamlet-mode";
+          sha256 = "0ils4w8ry1inlfj4931ypibj3n60xq6ah74hig62y4vrs4d47gyx";
+          name = "hamlet-mode";
+        };
+        packageRequires = [ cl-lib dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/hamlet-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    handlebars-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "handlebars-mode";
+        version = "20150211.1149";
+        src = fetchFromGitHub {
+          owner = "danielevans";
+          repo = "handlebars-mode";
+          rev = "81f6b73fea8f397807781a1b51568397af21a6ef";
+          sha256 = "0w443knp6kvjm2m79cni5d17plyhbsl0a4kip7yrpv5nmg370q3p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/handlebars-mode";
+          sha256 = "11ahrm4n588v7ir2r7sp4dkbypl5nhnr22px849hdxjcrwal24vj";
+          name = "handlebars-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/handlebars-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    handlebars-sgml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "handlebars-sgml-mode";
+        version = "20130623.1833";
+        src = fetchFromGitHub {
+          owner = "jacott";
+          repo = "handlebars-sgml-mode";
+          rev = "c76df93a9a8c1b1b3efdcc4add32bf93304192a4";
+          sha256 = "1z37di9vk1l35my8kl8jnyqlkr1rnp0iz13hpc0r065mib67v58k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/handlebars-sgml-mode";
+          sha256 = "10sxm7v94yxa92mqbwj3shqjs6f3zbxjvwgbvg9m2fh3b7xj617w";
+          name = "handlebars-sgml-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/handlebars-sgml-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    handoff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "handoff";
+        version = "20150917.100";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "handoff.el";
+          rev = "75dc7a7e352f38679f65d0ca80ad158798e168bd";
+          sha256 = "0whn8rc98dhncgizzrb22nx6b6cm655q1cf2fpn6g3knq1c2471r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/handoff";
+          sha256 = "0iqqvygx50wi2vcbs6bfgqzhcz9a89zrwb7sg0ang9qrkiz5k36w";
+          name = "handoff";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/handoff";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hardcore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hardcore-mode";
+        version = "20151114.101";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "hardcore-mode.el";
+          rev = "b1dda19692b4a7a58a689e81784a9b35be39e70d";
+          sha256 = "124k803pgxc7fz325yy6jcyam69f5fk9kdwfgmnwwca9ablq4cfb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hardcore-mode";
+          sha256 = "1bgi1acpw4z7i03d0i8mrd2hpjn6hyvkdsk0ks9q380yp9mqmiwd";
+          name = "hardcore-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hardcore-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hardhat = callPackage ({ fetchFromGitHub, fetchurl, ignoramus, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hardhat";
+        version = "20140827.2056";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "hardhat";
+          rev = "9355d174d49a514f3e176995ba93d5da7a25cbba";
+          sha256 = "13pgxskddir74lqknkkflzkrv6q455cf5s7wjww1zgvw95j7q50v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hardhat";
+          sha256 = "16pdbpm647ag9cadmdm75nwwyzrqsd9y1b4zgkl3pg669mi5vl5z";
+          name = "hardhat";
+        };
+        packageRequires = [ ignoramus ];
+        meta = {
+          homepage = "http://melpa.org/#/hardhat";
+          license = lib.licenses.free;
+        };
+      }) {};
+    haskell-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "haskell-emacs";
+        version = "20160104.1652";
+        src = fetchFromGitHub {
+          owner = "knupfer";
+          repo = "haskell-emacs";
+          rev = "73dbda903b3fcb1225bf69d5ed7f9d013d7ae1fd";
+          sha256 = "1l08d6qn7ixs3yg6svh8fd2x6zwjkbv0s34vm5aa7krx7yhydblx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-emacs";
+          sha256 = "1wkh7qws35c32hha0p9rpjz5pls2844920nh919lvp2wmq9l6jd6";
+          name = "haskell-emacs";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/haskell-emacs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    haskell-emacs-base = callPackage ({ fetchFromGitHub, fetchurl, haskell-emacs, lib, melpaBuild }:
+    melpaBuild {
+        pname = "haskell-emacs-base";
+        version = "20150714.1059";
+        src = fetchFromGitHub {
+          owner = "knupfer";
+          repo = "haskell-emacs";
+          rev = "73dbda903b3fcb1225bf69d5ed7f9d013d7ae1fd";
+          sha256 = "1l08d6qn7ixs3yg6svh8fd2x6zwjkbv0s34vm5aa7krx7yhydblx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-emacs-base";
+          sha256 = "1fwkds6qyhbxxdgxfzmgd7dlcxr08ynrrg5jdp9r7f924pd536vb";
+          name = "haskell-emacs-base";
+        };
+        packageRequires = [ haskell-emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/haskell-emacs-base";
+          license = lib.licenses.free;
+        };
+      }) {};
+    haskell-emacs-text = callPackage ({ fetchFromGitHub, fetchurl, haskell-emacs, lib, melpaBuild }:
+    melpaBuild {
+        pname = "haskell-emacs-text";
+        version = "20150713.916";
+        src = fetchFromGitHub {
+          owner = "knupfer";
+          repo = "haskell-emacs";
+          rev = "73dbda903b3fcb1225bf69d5ed7f9d013d7ae1fd";
+          sha256 = "1l08d6qn7ixs3yg6svh8fd2x6zwjkbv0s34vm5aa7krx7yhydblx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-emacs-text";
+          sha256 = "1j18fhhra6lv32xrq8jc6l8i56fgn68da81wymcimpmpbp0hl5fy";
+          name = "haskell-emacs-text";
+        };
+        packageRequires = [ haskell-emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/haskell-emacs-text";
+          license = lib.licenses.free;
+        };
+      }) {};
+    haskell-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "haskell-mode";
+        version = "20160117.1545";
+        src = fetchFromGitHub {
+          owner = "haskell";
+          repo = "haskell-mode";
+          rev = "a5d18dacca2d2df14a2b786efab766f72ec8cfbf";
+          sha256 = "0a94zkns55jv0rqf1mf1x5ss0waw64yg4428838n4qiqlqrgdz44";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-mode";
+          sha256 = "0wijvcpfdbl17iwzy47vf8brkj2djarfr8y28rw0wqvbs381zzwp";
+          name = "haskell-mode";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/haskell-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    haskell-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "haskell-snippets";
+        version = "20150612.1439";
+        src = fetchFromGitHub {
+          owner = "haskell";
+          repo = "haskell-snippets";
+          rev = "bcf12cf33a67ddc2f023a55072859e637fe4fa25";
+          sha256 = "0b3d7rvqvvcsp51aqfhl0zg9zg8j0p6vlfvga6jp9xc7626vh6f6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-snippets";
+          sha256 = "10bvv7q694fahcpm83v8lpqihg1gvfzrp1hdzwiffxydfvdbalh2";
+          name = "haskell-snippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/haskell-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    haskell-tab-indent = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "haskell-tab-indent";
+        version = "20151205.1359";
+        src = fetchgit {
+          url = "https://git.spwhitton.name/haskell-tab-indent";
+          rev = "150f52176242ba3bc4f58179cd2dbee4d89580f4";
+          sha256 = "7e41c910d6901638b9dfb697206659f5441e26e0558f9227c4ba7c6f2f47d841";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-tab-indent";
+          sha256 = "0vdfmy56w5yi202nbd28v1bzj97v1wxnfnb5z3dh9687p2abgnr7";
+          name = "haskell-tab-indent";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/haskell-tab-indent";
+          license = lib.licenses.free;
+        };
+      }) {};
+    haste = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "haste";
+        version = "20141030.1534";
+        src = fetchFromGitHub {
+          owner = "rlister";
+          repo = "emacs-haste-client";
+          rev = "22d05aacc3296ab50a7361222ab139fb4d447c25";
+          sha256 = "1gmh455ahd9if11f8mrqbfky24c784bb4fgdl3pj8i0n5sl51i88";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haste";
+          sha256 = "0wz15p58g4mxvwbpy9k60gixs1g4jw7pay5pbxnlggc39x1py8nf";
+          name = "haste";
+        };
+        packageRequires = [ json ];
+        meta = {
+          homepage = "http://melpa.org/#/haste";
+          license = lib.licenses.free;
+        };
+      }) {};
+    haxe-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "haxe-mode";
+        version = "20131004.342";
+        src = fetchhg {
+          url = "https://bitbucket.com/jpsecher/haxe-mode";
+          rev = "850f29d9f70e";
+          sha256 = "106a7kpjj4laxl7x8aqpv75ih54569b3bs2a1b8z4rghmikqc4aw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haxe-mode";
+          sha256 = "032h0nxlsrk30bsqb02by842ycrw1qscpfprifjjkaiq08wigh1l";
+          name = "haxe-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/haxe-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    haxor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "haxor-mode";
+        version = "20160111.1400";
+        src = fetchFromGitHub {
+          owner = "krzysztof-magosa";
+          repo = "haxor-mode";
+          rev = "2c5537bc50d35414b66cc5fad0d8ec90e085be78";
+          sha256 = "1si5r86zvnp4wbzvvqyc4zhap14k8pcq5nqigx45mgvpdnwdvzln";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haxor-mode";
+          sha256 = "1y4m058whdqnkkf9s6hzi0h6w0fc8ajfawhpjj0wqjam4adnfkq5";
+          name = "haxor-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/haxor-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hayoo = callPackage ({ emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hayoo";
+        version = "20140831.721";
+        src = fetchFromGitHub {
+          owner = "benma";
+          repo = "hayoo.el";
+          rev = "3ca2fb0c4d5f337d0410c21b2702dd147014e984";
+          sha256 = "0pjxyhh8a02i54a9jsqr8p1mcqfl6k9b8gv9lnzb242gy4518y3l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hayoo";
+          sha256 = "1rqvnv5nxlsyvsa5my1wpfm82sw21s7kfbg80vrjmxh0mwlyv4p9";
+          name = "hayoo";
+        };
+        packageRequires = [ emacs json ];
+        meta = {
+          homepage = "http://melpa.org/#/hayoo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hc-zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hc-zenburn-theme";
+        version = "20150928.1133";
+        src = fetchFromGitHub {
+          owner = "edran";
+          repo = "hc-zenburn-emacs";
+          rev = "fd0024a5191cdce204d91c8f1db99ba31640f6e9";
+          sha256 = "0rgcj47h7a67qkw6696pcm1a4g4ryx8nrz55s69fw86958fp08hk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hc-zenburn-theme";
+          sha256 = "0jcddk9ppgcizyyciabj3sgk1pmingl97knf9nmr0mi89h7n2g5y";
+          name = "hc-zenburn-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hc-zenburn-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hcl-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hcl-mode";
+        version = "20151002.2249";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-hcl-mode";
+          rev = "5a5e490509452a1882bea43952e248682577ed2d";
+          sha256 = "1vf5130bj1ii9j8qq9vdw0ga0qgfk8brjz34ysfmz9l2ihlcxvl0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hcl-mode";
+          sha256 = "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin";
+          name = "hcl-mode";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/hcl-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    header2 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "header2";
+        version = "20151231.1526";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/header2.el";
+          sha256 = "00j74cqdnaf5rl7w4wabm4z88cm20s152y0yxnv73z9pvqbknrmm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/header2";
+          sha256 = "1dg25krx3wxma2l5vb2ji7rpfp17qbrl62jyjpa52cjfsvyp6v06";
+          name = "header2";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/header2";
+          license = lib.licenses.free;
+        };
+      }) {};
+    headlong = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "headlong";
+        version = "20150417.1026";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "headlong";
+          rev = "f6830f87f236eee88263cb6976125f72422abe72";
+          sha256 = "06hq6p6a4fzprbj4r885vsvzddlvx0wxqk5kik06v5bm7hjmnyrq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/headlong";
+          sha256 = "042ybplkqjb30qf5cpbw5d91j1rdc71b789v277h036bri7hgxz6";
+          name = "headlong";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/headlong";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm";
+        version = "20160118.1311";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm";
+          rev = "a046a6c645a04745fb352ce4b6a85ecb532b59f3";
+          sha256 = "16daffw6kk39d1d0vy9mc2n62wlq6b7qd6sbnq1l1a89q57lw646";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm";
+          sha256 = "0xsf4rg7kn0m5wjlbwhd1mc38lg2822037dyd0h66h6x2gbs3fd9";
+          name = "helm";
+        };
+        packageRequires = [ async cl-lib emacs helm-core ];
+        meta = {
+          homepage = "http://melpa.org/#/helm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-R = callPackage ({ ess, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-R";
+        version = "20120819.1914";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "helm-R.el";
+          rev = "b0eb9d5f6a483a9dbe6eb6cf1f2024d4f5938bc2";
+          sha256 = "0nip0zrmn944wy0x2dc5ryr0m7a948rn2a8cbaajghs7a7zai4cr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-R";
+          sha256 = "0zq9f2xhgap3ihnrlsrsaxaz0nx014k0820bfsq7lckwcnm0mng1";
+          name = "helm-R";
+        };
+        packageRequires = [ ess helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-R";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-ack = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-ack";
+        version = "20141030.726";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-helm-ack";
+          rev = "889bc225318d14c6e3be80e73b1d9d6fb30e48c3";
+          sha256 = "04rvbafa77blps7x7cmlsciys8fgmvhfhq4v51pk8z5q3j1lrgc5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ack";
+          sha256 = "1a8sc5gd2g57dl9g18wyydfmihy74yniwhjr27h7vxylnf2g3pni";
+          name = "helm-ack";
+        };
+        packageRequires = [ cl-lib helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-ack";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-ad = callPackage ({ dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-ad";
+        version = "20151209.415";
+        src = fetchFromGitHub {
+          owner = "tnoda";
+          repo = "helm-ad";
+          rev = "8ac044705d8620ee354a9cfa8cc1b865e83c0d55";
+          sha256 = "0hxfgdn56c7qr64r59g9hvxxwa4mw0ad9c9m0z5cj85bsdd7rlx4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ad";
+          sha256 = "0h2zjfj9hy7bkpmmjjs0a4a06asbw0yww8mw9rk2xi1gc2aqq4hi";
+          name = "helm-ad";
+        };
+        packageRequires = [ dash helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-ad";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-ag = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-ag";
+        version = "20160116.1851";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-helm-ag";
+          rev = "0c99d821e4feebfeb62dabea9cded72664c083af";
+          sha256 = "0qar85n14iifm5ijrqlg5r4x7aq5cng7s4nzw5dlzgcbvsrcizs0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ag";
+          sha256 = "023zvgmi5b5b2qga3jqd7jrq9ap8n3rhvl6jrv9fsi565sg1fv43";
+          name = "helm-ag";
+        };
+        packageRequires = [ cl-lib helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-ag";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-ag-r = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-ag-r";
+        version = "20131123.931";
+        src = fetchFromGitHub {
+          owner = "yuutayamada";
+          repo = "helm-ag-r";
+          rev = "67de4ebafe9b088db950eefa5ef590a6d78b4ac8";
+          sha256 = "1rifdkhzvf7xd2npban0i8v3rjcji69063dw9rs1d32w4n7fzlfa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ag-r";
+          sha256 = "0ivh7f021lbmbaj6gs4y8m99s63js57w04q7cwx7v4i32cpas7r9";
+          name = "helm-ag-r";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-ag-r";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-anything = callPackage ({ anything, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-anything";
+        version = "20141126.431";
+        src = fetchFromGitHub {
+          owner = "rubikitch";
+          repo = "helm-anything";
+          rev = "0ec578922928b7c75cf034d1b7a956b5f36107ea";
+          sha256 = "153zq1q3s3ihjh15wyci9qdic3pin8f1j1gq2qlzyhmy0njlvgjb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-anything";
+          sha256 = "0yjlwsiahb7n4q3522d68xrdb8caad9gpnglz5php245yqy3n5vx";
+          name = "helm-anything";
+        };
+        packageRequires = [ anything helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-anything";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-aws = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "helm-aws";
+        version = "20151124.333";
+        src = fetchFromGitHub {
+          owner = "istib";
+          repo = "helm-aws";
+          rev = "512fb7edcdc6c65303b9641bfc737f836939e5e9";
+          sha256 = "1bnypr906gfc1fbyrqfsfilsl6wiacrnhr8flpa0gmdjhvmrw7af";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-aws";
+          sha256 = "0sjgdjpznjxsf6nlv2ah45fw17j8j5apdphd1fp43rjv1lskkgc5";
+          name = "helm-aws";
+        };
+        packageRequires = [ cl-lib helm s ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-aws";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "helm-backup";
+        version = "20151213.1247";
+        src = fetchFromGitHub {
+          owner = "antham";
+          repo = "helm-backup";
+          rev = "184026b9fe454aab8e7730106b4ca494fe307769";
+          sha256 = "0d6h4gbb69abxxgm85pdi5rsaf9h72yryg72ykd5633i1g4s8a76";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-backup";
+          sha256 = "182jbm36yzayxi9y3vhpyn25ivrgay37sncqvah35vbw52lnjcn3";
+          name = "helm-backup";
+        };
+        packageRequires = [ cl-lib helm s ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-backup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-bibtex = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
+    melpaBuild {
+        pname = "helm-bibtex";
+        version = "20160108.1107";
+        src = fetchFromGitHub {
+          owner = "tmalsburg";
+          repo = "helm-bibtex";
+          rev = "55ac5ce0b49893c8c46ce6a5074ba2df9f60d0d3";
+          sha256 = "1fbsp7h35bwz802y0mksrlilm2da2l9hs72iimrdf886vh1wifxl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-bibtex";
+          sha256 = "1rsplnh18w1fqr6da79vj8x9q2lyss9sssy8pfz3hfw7p6qi6zkg";
+          name = "helm-bibtex";
+        };
+        packageRequires = [ cl-lib dash f helm parsebib s ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-bibtex";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-bibtexkey = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-bibtexkey";
+        version = "20140214.904";
+        src = fetchFromGitHub {
+          owner = "kenbeese";
+          repo = "helm-bibtexkey";
+          rev = "aa1637ea5c8c5f1817e480fc2a3750cafab3d99f";
+          sha256 = "10k7hjfz9jmfpbmsv20jy9vr6fqxx1yp8v115hprqvw057iifsl9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-bibtexkey";
+          sha256 = "00i7ni4r73mmxavhfcm0fd7jhx6gxvxx7prax1yxmhs46fpz8jwj";
+          name = "helm-bibtexkey";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-bibtexkey";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-bind-key = callPackage ({ bind-key, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-bind-key";
+        version = "20141108.2315";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "helm-bind-key.el";
+          rev = "9da6ad8b7530e72fb4ac67be8c6a482898dddc25";
+          sha256 = "1wmcy7q4ys2sf8ya5l4n7a6bq5m9d6m19amjfwkmkh4ajkwl041y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-bind-key";
+          sha256 = "1yfj6mmxc165in1i85ccanssch6bg19ib1fcm7sa4i4hv0mgwaid";
+          name = "helm-bind-key";
+        };
+        packageRequires = [ bind-key helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-bind-key";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-bm = callPackage ({ bm, cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "helm-bm";
+        version = "20131224.905";
+        src = fetchFromGitHub {
+          owner = "yasuyk";
+          repo = "helm-bm";
+          rev = "1764c0139cb2f04b9fd520c7aca0b6d0152913bd";
+          sha256 = "1gcx7imq9gxfgmh188a8xlpmmlrdif1vsnnff49qvk82082ghbfz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-bm";
+          sha256 = "1dnlcvn0zv4qv4ii4j0h9r8w6vhi3l0c5aa768kblh5r2rf4bjjh";
+          name = "helm-bm";
+        };
+        packageRequires = [ bm cl-lib helm s ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-bm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-bundle-show = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-bundle-show";
+        version = "20151221.630";
+        src = fetchFromGitHub {
+          owner = "masutaka";
+          repo = "emacs-helm-bundle-show";
+          rev = "b34523aa8a7f82ed9a1bf3643c35b65866a7877a";
+          sha256 = "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-bundle-show";
+          sha256 = "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7";
+          name = "helm-bundle-show";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-bundle-show";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-c-moccur = callPackage ({ color-moccur, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-c-moccur";
+        version = "20151230.324";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "helm-c-moccur.el";
+          rev = "b0a906f85fa352db091f88b91a9c510de607dfe9";
+          sha256 = "0w4svbg32y63v049plvk7djc1m2amjzrr1v979d9s6jbnnpzlb5c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-c-moccur";
+          sha256 = "1i6a4jqjy9amlhdbj5d26wzagndfgszha09vs5qf4760vjl7kn4b";
+          name = "helm-c-moccur";
+        };
+        packageRequires = [ color-moccur helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-c-moccur";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-c-yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "helm-c-yasnippet";
+        version = "20151231.210";
+        src = fetchFromGitHub {
+          owner = "emacs-jp";
+          repo = "helm-c-yasnippet";
+          rev = "2833bff9427f6d06531cf798e9152141e6b2fc83";
+          sha256 = "03c4w34r0q7xpz1ny8dya8f96rhjpc9r2c24n7vg9x6x4i2wl204";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-c-yasnippet";
+          sha256 = "0jwj4giv6lxb3h7vqqb2alkwq5kp0shy2nraik33956p4l8dfs90";
+          name = "helm-c-yasnippet";
+        };
+        packageRequires = [ cl-lib helm yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-c-yasnippet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-chrome = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-chrome";
+        version = "20151222.1958";
+        src = fetchFromGitHub {
+          owner = "kawabata";
+          repo = "helm-chrome";
+          rev = "4591cc760d3e721094c70b913b91138776f0e52e";
+          sha256 = "0wkskm0d1mvh49l65xg6pgwd7yxy02llflkzx59ayqv4wjvsyayb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-chrome";
+          sha256 = "0p3n2pna83mp4ym8x69lk4r3q4apbj5v2blg2mwcsd9zij153nxz";
+          name = "helm-chrome";
+        };
+        packageRequires = [ cl-lib emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-chrome";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-chronos = callPackage ({ chronos, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-chronos";
+        version = "20150528.1536";
+        src = fetchFromGitHub {
+          owner = "dxknight";
+          repo = "helm-chronos";
+          rev = "a14fc3d65dd96ce6616234b3f7b8b08b4c1817ef";
+          sha256 = "1dmj4f8pris1i7wvfplp4dbnyfm403l6rplxfrfi0cd9afg7m68i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-chronos";
+          sha256 = "1a65b680741cx4cyyizyl2c3bss36x3j2m9sh9hjc87xrzarg0s3";
+          name = "helm-chronos";
+        };
+        packageRequires = [ chronos helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-chronos";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-cider-history = callPackage ({ cider, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-cider-history";
+        version = "20150719.1620";
+        src = fetchFromGitHub {
+          owner = "Kungi";
+          repo = "helm-cider-history";
+          rev = "c391fcb2e162a02001605a0b9449783575a831fd";
+          sha256 = "18j4ikb3q8ygdq74zqzm83wgb39x7w209n3186mm051n8lfmkaif";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-cider-history";
+          sha256 = "12l8jyl743zqk8m2xzcz75y1ybdkbkvcbvfkn1k88k09s31kdq4h";
+          name = "helm-cider-history";
+        };
+        packageRequires = [ cider helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-cider-history";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-circe = callPackage ({ circe, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-circe";
+        version = "20150317.44";
+        src = fetchFromGitHub {
+          owner = "lesharris";
+          repo = "helm-circe";
+          rev = "0b7ecf5380971ee7b6291fca6a2805c320638238";
+          sha256 = "1iqjc15pz5qr8zjxaxz1b2vys2689ri76jacmipxvgjk0y7vc5f0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-circe";
+          sha256 = "12jfzg03573lih2aapvv5h2mi3pwqc9nrmv538ivjywix5117k3v";
+          name = "helm-circe";
+        };
+        packageRequires = [ circe cl-lib emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-circe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-cmd-t = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-cmd-t";
+        version = "20150823.1357";
+        src = fetchFromGitHub {
+          owner = "lewang";
+          repo = "helm-cmd-t";
+          rev = "8749f0b2b8527423cd146fa2d5c0e7a9e159eefb";
+          sha256 = "10cp21v8vwgp8hv2rkdn9x8v2n8wqbphgslb561rlwc2rfpvzqvs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-cmd-t";
+          sha256 = "04fmhravd3ld4n1n820wlnr1jvmk7c7cdazd15gazixrlz6fm4fk";
+          name = "helm-cmd-t";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/helm-cmd-t";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "helm-codesearch";
+        version = "20160105.727";
+        src = fetchFromGitHub {
+          owner = "youngker";
+          repo = "helm-codesearch.el";
+          rev = "093ca750b77ca07ed64f89f8d9ba1d3fd9f61ea6";
+          sha256 = "1c2fn86sbdh91i95glfbazv0g11rg38xras8ddk8ijcxg2c4jl0v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-codesearch";
+          sha256 = "1v21zwcyx73bc1lcfk60v8xim31bwdk4p06g9i4qag3cijdlli9q";
+          name = "helm-codesearch";
+        };
+        packageRequires = [ cl-lib dash helm s ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-codesearch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-commandlinefu = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, json ? null, let-alist, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-commandlinefu";
+        version = "20150611.45";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "helm-commandlinefu";
+          rev = "9ee7e018c5db23ae9c8d1c8fa969876f15b7280d";
+          sha256 = "0fxrmvb64lav4aqs61z3a4d2mcp9s2nw7fvysyjn0r1291pkzk9j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-commandlinefu";
+          sha256 = "150nqib0sr4n35vdj1xrxcja8gkv3chzhdbgkjxqgkz2yq10xxnd";
+          name = "helm-commandlinefu";
+        };
+        packageRequires = [ emacs helm json let-alist ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-commandlinefu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-company = callPackage ({ company, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-company";
+        version = "20151216.209";
+        src = fetchFromGitHub {
+          owner = "manuel-uberti";
+          repo = "helm-company";
+          rev = "13f87befb1a427295eeeeb49f0c2e4847bc81e10";
+          sha256 = "189qmc6fdj5a01a7w45r0qpn9qjf2q9g83qic9sgnrccc841zpyg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-company";
+          sha256 = "1pbsg7zrz447siwd8pasw2hz5z21wa1xpqs5nrylhbghsk076ld3";
+          name = "helm-company";
+        };
+        packageRequires = [ company helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-company";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-core = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-core";
+        version = "20160118.1220";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm";
+          rev = "a046a6c645a04745fb352ce4b6a85ecb532b59f3";
+          sha256 = "16daffw6kk39d1d0vy9mc2n62wlq6b7qd6sbnq1l1a89q57lw646";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-core";
+          sha256 = "1dyv8rv1728vwsp6vfdq954sp878jbp3srbfxl9gsgjnv1l6vjda";
+          name = "helm-core";
+        };
+        packageRequires = [ async cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-core";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-cscope = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, xcscope }:
+    melpaBuild {
+        pname = "helm-cscope";
+        version = "20150609.849";
+        src = fetchFromGitHub {
+          owner = "alpha22jp";
+          repo = "helm-cscope.el";
+          rev = "ddc3f750a92044d6712585e29d3dbaface2e34db";
+          sha256 = "0nhi8xhcf7qpsibpyy5v364xx7lqkhskzai7awkg0xcdq8b5090x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-cscope";
+          sha256 = "13a76wc1ia4c0v701dxqc9ycbb43d5k09m5pfsvs8mccisfzk9y4";
+          name = "helm-cscope";
+        };
+        packageRequires = [ cl-lib emacs helm xcscope ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-cscope";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-css-scss = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-css-scss";
+        version = "20140626.1925";
+        src = fetchFromGitHub {
+          owner = "ShingoFukuyama";
+          repo = "helm-css-scss";
+          rev = "ab8348aa98e0daa2f1b771e35bdb06bfacbe5016";
+          sha256 = "01a3pahpsxb7d15dkfgxypl7gzqb4dy4f36lmid1w77b9rhs6nph";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-css-scss";
+          sha256 = "0iflwl0rijbkx1b7i1s7984dw7sz1wa1cb74fqij0kcn76kal7ak";
+          name = "helm-css-scss";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-css-scss";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-ctest = callPackage ({ dash, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "helm-ctest";
+        version = "20150823.608";
+        src = fetchFromGitHub {
+          owner = "danlamanna";
+          repo = "helm-ctest";
+          rev = "973a138aa8ff4c6a1cd798779e8d0dd80522354d";
+          sha256 = "18d96alik66nw3rkk7k8740b4rx2bnh3pwn27ahpgj5yf51wm0ry";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ctest";
+          sha256 = "1mphc9fsclbw19p5i1xf52qg6ljljbajvbcsl95hisrnvhg89vpm";
+          name = "helm-ctest";
+        };
+        packageRequires = [ dash helm-core s ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-ctest";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-dash";
+        version = "20160103.734";
+        src = fetchFromGitHub {
+          owner = "areina";
+          repo = "helm-dash";
+          rev = "50eecc195d019afa86a77330db5e23b96e5b75aa";
+          sha256 = "1fbwxd6fm36ci85svl22h30bjqm8p5p8fxsnbmvkksln5psghn5d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-dash";
+          sha256 = "1cnxssj2ilszq94v5cc4ixblar1nlilv9askqjp9gfnkj2z1n9cy";
+          name = "helm-dash";
+        };
+        packageRequires = [ cl-lib helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-dash";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-descbinds = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-descbinds";
+        version = "20160108.2147";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm-descbinds";
+          rev = "3c344979f1df0d1a5cc913674e56c4d45c346134";
+          sha256 = "0y0xxs67bzh6j68j3f4zxzrl2ij5g1qvvxqklw7nz305xliis29g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-descbinds";
+          sha256 = "1890ss4pimjxskzzllf57fg07xbs8zqcrp6r8r6x989llrfvd1h7";
+          name = "helm-descbinds";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-descbinds";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-dictionary = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-dictionary";
+        version = "20141226.1336";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm-dictionary";
+          rev = "2aeafba1556c76cc5ff949ca50f341fc2aa687b0";
+          sha256 = "05mb7kb4x7kzh0w9r531ppd92hzsa2v3wqcmafkcn1z5wfp7zw68";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-dictionary";
+          sha256 = "1pak8qn0qvbzyclhzvr5ka3pl370i4kiykypfkwbfgvqqwczhl3n";
+          name = "helm-dictionary";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-dictionary";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-dired-recent-dirs = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-dired-recent-dirs";
+        version = "20131228.814";
+        src = fetchFromGitHub {
+          owner = "akisute3";
+          repo = "helm-dired-recent-dirs";
+          rev = "3bcd125b44f5a707588ae3868777d91192351523";
+          sha256 = "14sifdrfg8ydvi9mj8qm2bfphbffglxrkb5ky4q5b3j96bn8v110";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-dired-recent-dirs";
+          sha256 = "0kh0n5674ksswjzi9gji2qmx8v8g0axx8xbi0m3zby9nwcpv4qzs";
+          name = "helm-dired-recent-dirs";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-dired-recent-dirs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-dirset = callPackage ({ cl-lib ? null, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "helm-dirset";
+        version = "20151208.1812";
+        src = fetchFromGitHub {
+          owner = "k1LoW";
+          repo = "helm-dirset";
+          rev = "eb30810cd26e1ee73d84a863e6b2667700e9aead";
+          sha256 = "183vj5yi575aqkak19hl8k4mw38r0ki9p1fnpa8nny2srjyy34yb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-dirset";
+          sha256 = "0vng52axp7r01s00cqbbclbm5bx1qbhmlrx9h9kj7smx1al4daml";
+          name = "helm-dirset";
+        };
+        packageRequires = [ cl-lib f helm s ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-dirset";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-emmet = callPackage ({ emmet-mode, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-emmet";
+        version = "20131014.129";
+        src = fetchFromGitHub {
+          owner = "yasuyk";
+          repo = "helm-emmet";
+          rev = "b4e0618773d9fdfbf0ed03d24a53d26285c51b91";
+          sha256 = "0c3mn5w98phsv7gsljyp5vxxmr2w6n3nczh5zm4hcpwsra3wh1v9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-emmet";
+          sha256 = "1dkn9qa3dv2im11lm19wfh5jwwwp42sv7jc0p6qg35rhzwdpfg03";
+          name = "helm-emmet";
+        };
+        packageRequires = [ emmet-mode helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-emmet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-emms = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-emms";
+        version = "20151001.1528";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm-emms";
+          rev = "ed3da37e86ea5dabc15da708335b1e439ae0777d";
+          sha256 = "0330s07b41nw9q32xhjdl7yw83p8ikj6b2qkir3y0jyx16gk10dl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-emms";
+          sha256 = "1vq7cxnacmhyczsa4s5h1nnzc08m66harfnxsqxyrdsnggv9hbf5";
+          name = "helm-emms";
+        };
+        packageRequires = [ cl-lib emacs emms helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-emms";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-filesets = callPackage ({ fetchFromGitHub, fetchurl, filesets-plus, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-filesets";
+        version = "20140929.1335";
+        src = fetchFromGitHub {
+          owner = "gcla";
+          repo = "helm-filesets";
+          rev = "b352910af4c3099267a8aa0169c7f743b35bb1fa";
+          sha256 = "00yhmpv5xjlw1gwbcrznz83gkaby8zlqv74d3p7plca2cwjll1g9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-filesets";
+          sha256 = "1yhhchksi0r4r5c5q1mggz2hykkvk93baq91b5hkaflqi30d1v8f";
+          name = "helm-filesets";
+        };
+        packageRequires = [ filesets-plus helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-filesets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-firefox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-firefox";
+        version = "20160101.1542";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm-firefox";
+          rev = "ca1a800c2564650e67651ee62159e9f1c1ba1135";
+          sha256 = "0vmlpj6zfif5f3wzgq8lkfqprl3z5gjsqj86347krblgfzhqlz30";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-firefox";
+          sha256 = "0677nj0zsk11vvp3q3xl9nk8dhz3ki9yl3kfb57wgnmprp109wgs";
+          name = "helm-firefox";
+        };
+        packageRequires = [ cl-lib emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-firefox";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-flx = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-flx";
+        version = "20160105.1418";
+        src = fetchFromGitHub {
+          owner = "PythonNut";
+          repo = "helm-flx";
+          rev = "95b197ae8b20ac125a540abff7da6c6588250477";
+          sha256 = "1np2kwrwd82nq3bs1vsgyybx1j1wc639ndfzizhskglss4m1md2y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-flx";
+          sha256 = "03vxr5f5m4s6k6rm0976w8h3s4c3b5mrdqgmkd281hmyh9q3cslq";
+          name = "helm-flx";
+        };
+        packageRequires = [ emacs flx helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-flx";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-flycheck = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-flycheck";
+        version = "20140915.952";
+        src = fetchFromGitHub {
+          owner = "yasuyk";
+          repo = "helm-flycheck";
+          rev = "361d7f0359cea3dd0bfef1647d65ab61c9e52925";
+          sha256 = "0k5703nj838qh0h6hzgffjrp0df9rs7psczg4r9mxpi19vqk8ff0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-flycheck";
+          sha256 = "038f9294qc0jnkzrrjxm97hyhwa4sca3wdsjbaya50cf0g4cmk7b";
+          name = "helm-flycheck";
+        };
+        packageRequires = [ dash flycheck helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-flycheck";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-flymake = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-flymake";
+        version = "20130717.44";
+        src = fetchFromGitHub {
+          owner = "tam17aki";
+          repo = "helm-flymake";
+          rev = "afb1089d6a0dc9a63bc2aa1df19d80830cc33c6a";
+          sha256 = "1liaid4l4x8sb133lj944gwwpqngsf8hzibdwyfdmsi4m4abh73h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-flymake";
+          sha256 = "0h87yd56nhxpahrcpk6hin142hzv3sdr5bvz0injbv8a2lwnny3b";
+          name = "helm-flymake";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-flymake";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-flyspell = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-flyspell";
+        version = "20151026.1112";
+        src = fetchFromGitHub {
+          owner = "pronobis";
+          repo = "helm-flyspell";
+          rev = "a9ea896fd932fec15709b88ef8bf101dff261b2d";
+          sha256 = "1k7invgzqrcm11plyvinqwf98yxibr8i4r9yw3csfsicc8b6if59";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-flyspell";
+          sha256 = "1g6xry2y6396pg7rg8hc0l84z5r3j2df7dpd1jgffxa8xa3i661f";
+          name = "helm-flyspell";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-flyspell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-fuzzier = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-fuzzier";
+        version = "20151111.838";
+        src = fetchFromGitHub {
+          owner = "EphramPerdition";
+          repo = "helm-fuzzier";
+          rev = "7e8573de1a639c031056f20c677d13760f2cece0";
+          sha256 = "1jns0428jmxrm4w9yk67ffbzmgyjgp1v5ii152y0wsb105ary0xp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-fuzzier";
+          sha256 = "0qdgf0phs3iz29zj3qjhdgb3i4xvf5r2vi0709pwxx2s6r13pvcc";
+          name = "helm-fuzzier";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-fuzzier";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-fuzzy-find = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-fuzzy-find";
+        version = "20150613.549";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "helm-fuzzy-find";
+          rev = "daf24bc236dafa4f4be45f1621e11dbc9f304b64";
+          sha256 = "1yxnmxq6ppfgwxrk5ryc5xfn82kjf4j65j14hy077gphr0q61q6a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-fuzzy-find";
+          sha256 = "0lczlrpd5jy2vhy9jl3rjcdyiwr136spqm8k2rj8m9s8wpn0v75i";
+          name = "helm-fuzzy-find";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-fuzzy-find";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-ghc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ghc, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-ghc";
+        version = "20141105.859";
+        src = fetchFromGitHub {
+          owner = "david-christiansen";
+          repo = "helm-ghc";
+          rev = "e5ee7b8d3b745d162553aecfbd41381c4de85f35";
+          sha256 = "16p1gisbza48qircsvrwx020n96ss1c6s68d7cgqqfc0bf2467is";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ghc";
+          sha256 = "1q5ia8sgpflv2hhvw7hjpkfb25vmrjwlrqz1f9qj2qgmki5mix2d";
+          name = "helm-ghc";
+        };
+        packageRequires = [ cl-lib emacs ghc helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-ghc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-ghq = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-ghq";
+        version = "20151221.623";
+        src = fetchFromGitHub {
+          owner = "masutaka";
+          repo = "emacs-helm-ghq";
+          rev = "2997646b2fb5421ab435b772dd2dbaeb92d70166";
+          sha256 = "0rlk9016rxj292kpxrnqgrm4xsjs4m4gk2fwh8z3fcihi013lxaw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ghq";
+          sha256 = "14f3cbsj7jhlhrp561d8pasllnx1cmi7jk6v2fja7ghzj76dnvq6";
+          name = "helm-ghq";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-ghq";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-git = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-git";
+        version = "20120630.1603";
+        src = fetchFromGitHub {
+          owner = "maio";
+          repo = "helm-git";
+          rev = "cb96a52b5aecadd3c27aba7749d14e43ab128d55";
+          sha256 = "1yfy4a52hx44r32i0b75bka8gfcn5lp61jl86lzrsi2cr9wg10pn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-git";
+          sha256 = "1ib73p7cmkw96csxxpkqwn6m60k1xrd46z6vyp29gj85cs4fpsb8";
+          name = "helm-git";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/helm-git";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-git-files = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-git-files";
+        version = "20141212.717";
+        src = fetchFromGitHub {
+          owner = "kenbeese";
+          repo = "helm-git-files";
+          rev = "43193960774069369ac6964bbf7c026900206fa8";
+          sha256 = "157b525h0kiaknn12fsw67fg26lzb20apx8sssmvlcicqcd51iaw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-git-files";
+          sha256 = "02109r956nc1dmqh4v082vkr9wdixh03xhl7icwkzl7ipr5453s6";
+          name = "helm-git-files";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-git-files";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-git-grep = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-git-grep";
+        version = "20140222.2022";
+        src = fetchFromGitHub {
+          owner = "yasuyk";
+          repo = "helm-git-grep";
+          rev = "9e602f79ea58fe12c6a48ce3c2f749b817ef8c86";
+          sha256 = "1mp5gbda81szbx19rvaa6ybb28v64q49hqic8d478ggnjjsqhfyr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-git-grep";
+          sha256 = "1ww6a4q78w5hnwikq7y93ic2b7x070c27r946lh6p8cz1k4b8vqi";
+          name = "helm-git-grep";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-git-grep";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-github-stars = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-github-stars";
+        version = "20150625.1723";
+        src = fetchFromGitHub {
+          owner = "Sliim";
+          repo = "helm-github-stars";
+          rev = "9211be3fbb65ca8819e0d1a54524ed8abbfaa4fa";
+          sha256 = "1sbhh3dmb47sy3r2iw6vmvbq5bpjac4xdg8i5a0m0c392a38nfqn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-github-stars";
+          sha256 = "1r4mc4v71171sq9rbbhm346s92fb7jnvvl91y2q52jqmrnzzl9zy";
+          name = "helm-github-stars";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-github-stars";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-gitignore = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, gitignore-mode, helm, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "helm-gitignore";
+        version = "20150517.2256";
+        src = fetchFromGitHub {
+          owner = "jupl";
+          repo = "helm-gitignore";
+          rev = "03aad6edb0ed4471c093230856f26719754e570b";
+          sha256 = "0pd755s5zcg8y1svxj3g8m0znkp6cyx5y6lsj4lxczrk7lynzc3g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-gitignore";
+          sha256 = "01l7mx8g1m5qnwz973hzrgds4gywm56jgl4hcdxqvpi1n56md3x6";
+          name = "helm-gitignore";
+        };
+        packageRequires = [ cl-lib gitignore-mode helm request ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-gitignore";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, helm, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "helm-gitlab";
+        version = "20150604.233";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "emacs-gitlab";
+          rev = "78deece7f314f9652b50117605e93be9f8c860f4";
+          sha256 = "07i4j9yl1yag70sl89n7v4yg4jvh5mrifhrf1xswlb29by6najdx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-gitlab";
+          sha256 = "010ihx3yddhb8j3jqcssc49qnf3i7xlz0s380mpgrdxgz6yahsmd";
+          name = "helm-gitlab";
+        };
+        packageRequires = [ dash gitlab helm s ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-gitlab";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-go-package = callPackage ({ deferred, fetchFromGitHub, fetchurl, go-mode, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-go-package";
+        version = "20150603.804";
+        src = fetchFromGitHub {
+          owner = "yasuyk";
+          repo = "helm-go-package";
+          rev = "1909156510a4e73697a86b8c040d38e4d352851a";
+          sha256 = "1r01nl1k9jjb70214rkmbqaa4qrkyd3apiyq00w02wsymy12wwic";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-go-package";
+          sha256 = "102yhn1xg83l67yaq3brn35a03fkvqqhad10rq0h39n4i1slq3z6";
+          name = "helm-go-package";
+        };
+        packageRequires = [ deferred go-mode helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-go-package";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-google = callPackage ({ fetchFromGitHub, fetchurl, google, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-google";
+        version = "20141228.540";
+        src = fetchFromGitHub {
+          owner = "steckerhalter";
+          repo = "helm-google";
+          rev = "21443456eefab39a2bfef00f1387c015e7dfac51";
+          sha256 = "0ml5mv282dz73hmgjalcsypdvc30pwhsfbamyz46744j7wxn6ik2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-google";
+          sha256 = "0d1y7232rm888car3h40fba1m1pna2nh1a3fcvpra74igwarfi32";
+          name = "helm-google";
+        };
+        packageRequires = [ google helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-google";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-grepint = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-grepint";
+        version = "20151030.1137";
+        src = fetchFromGitHub {
+          owner = "kopoli";
+          repo = "helm-grepint";
+          rev = "0327f64121751065a85c76527dda2c037c8fb0d8";
+          sha256 = "07bmk4wbn07rg8h8rdhah285hsaaqkx5n84g87lpb7y5ba3ivlk5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-grepint";
+          sha256 = "00wr3wk41sbpamxbjkqlby49g8y5z9n79p51sg7ginban4qy91gf";
+          name = "helm-grepint";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-grepint";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-growthforecast = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-growthforecast";
+        version = "20140119.2144";
+        src = fetchFromGitHub {
+          owner = "daic-h";
+          repo = "helm-growthforecast";
+          rev = "0f94ac090d6c354058ad89a86e5c18385c136d9b";
+          sha256 = "0p0mk44y2z875ra8mzcb6vlf4rbkiq9yank5hdxvg2x2sxsaambk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-growthforecast";
+          sha256 = "0716rhs5dam6p8ym83vy19svl6jr49lcfgb29mm3cqi9jcch3ckh";
+          name = "helm-growthforecast";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-growthforecast";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-gtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-gtags";
+        version = "20160117.2055";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-helm-gtags";
+          rev = "7fb96b900fb8640993354a2f83732a50da529d03";
+          sha256 = "1gfshy0brlfa8z39savj2a0jlfpqffijshsyjpz28ig2ggv8amnh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-gtags";
+          sha256 = "0snx0b8b4yc507q3i4fzvrd68xgzqxly8kn5cwp26ik6cv840y29";
+          name = "helm-gtags";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-gtags";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-hatena-bookmark = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-hatena-bookmark";
+        version = "20151221.620";
+        src = fetchFromGitHub {
+          owner = "masutaka";
+          repo = "emacs-helm-hatena-bookmark";
+          rev = "1ba352b858869a32323d4e6f9ca4b3eae055809e";
+          sha256 = "189dv3qqqmfyhsqa1n52cgcn1xv7k49f92ndn43y2v20234nhl9f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-hatena-bookmark";
+          sha256 = "14091zrp4vj7752rb5s3pkyvrrsdl7iaj3q9ys8rjmbsjwcv30id";
+          name = "helm-hatena-bookmark";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-hatena-bookmark";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-hayoo = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, helm, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-hayoo";
+        version = "20151014.151";
+        src = fetchFromGitHub {
+          owner = "markus1189";
+          repo = "helm-hayoo";
+          rev = "dd4c0c8c87521026edf1b808c4de01fa19b7c693";
+          sha256 = "08pfzs030d8g5s7vkpgicz4srp5cr3xpd84lhrr24ncrhbszxar9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-hayoo";
+          sha256 = "0xdvl6q2rpfsma4hx8m4snbd05s4z0bi8psdalixywlp5s4vzr32";
+          name = "helm-hayoo";
+        };
+        packageRequires = [ haskell-mode helm json ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-hayoo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-helm-commands = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-helm-commands";
+        version = "20130902.1248";
+        src = fetchFromGitHub {
+          owner = "vapniks";
+          repo = "helm-helm-commands";
+          rev = "3a05aa19c976501343ad9ae630a36810921a85f6";
+          sha256 = "05ksfx54ar2j4mypzwh0gfir8r26s4f1i4xw319q5pa1y2100cpn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-helm-commands";
+          sha256 = "0dq9p37i5rrp2nb1vhqzzqfmdg11va2xr3yz8hdxpwykm1ldqdcf";
+          name = "helm-helm-commands";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-helm-commands";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-hoogle = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-hoogle";
+        version = "20150919.421";
+        src = fetchFromGitHub {
+          owner = "jwiegley";
+          repo = "haskell-config";
+          rev = "8e4e28c3852376510861f64f00009a63b8ec0c7d";
+          sha256 = "052hzybign54qawdm1fflsaz4bcwflycksv6wb1nw1jv79s2qbap";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-hoogle";
+          sha256 = "0672mqm0c261mknbgc3a4pahq27gw2pfklflxl1y4ykbs6q7vcyw";
+          name = "helm-hoogle";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-hoogle";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-idris = callPackage ({ fetchFromGitHub, fetchurl, helm, idris-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-idris";
+        version = "20141202.1157";
+        src = fetchFromGitHub {
+          owner = "david-christiansen";
+          repo = "helm-idris";
+          rev = "a2f45d6817974f318b55ad9b7fd19d5df132d47e";
+          sha256 = "0128nrhwyzslzl0l7wcjxn3dlx3h1sjmwnbbnp2fj4bjk7chc59q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-idris";
+          sha256 = "1y52675j4kcq14jypxjw1rflxrxwaxyn1n3m613klad55wpfaamf";
+          name = "helm-idris";
+        };
+        packageRequires = [ helm idris-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-idris";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-img = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-img";
+        version = "20151224.1721";
+        src = fetchFromGitHub {
+          owner = "l3msh0";
+          repo = "helm-img";
+          rev = "aa3f8a5dce8d0413bf07584f07153a39015c2bfc";
+          sha256 = "0py4xs27z2jvg99i6qaf2ccz0mvk6bb9cvdyz8v8ngmnj3rw2vla";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-img";
+          sha256 = "0sq9l1wgm97ppfc45w3bdcv0qq5m85ygnanv1bdcp8bxbdl4vg0q";
+          name = "helm-img";
+        };
+        packageRequires = [ cl-lib helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-img";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-img-tiqav = callPackage ({ fetchFromGitHub, fetchurl, helm-img, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-img-tiqav";
+        version = "20151224.1722";
+        src = fetchFromGitHub {
+          owner = "l3msh0";
+          repo = "helm-img-tiqav";
+          rev = "33a7e9508bc8f37d53320b56c92b53d321a57bb0";
+          sha256 = "04vdin0n3514c8bycdjrwk3l6pkarrwanlklnm75315b91nkkbcp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-img-tiqav";
+          sha256 = "1m083hiih2rpyy8i439745mj4ldqy85fpnvms8qnv3042b8x35y0";
+          name = "helm-img-tiqav";
+        };
+        packageRequires = [ helm-img ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-img-tiqav";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-ispell = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-ispell";
+        version = "20151231.253";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-helm-ispell";
+          rev = "cb735695ab3a0e66c123c2f3f3e8911fb1c2d5fc";
+          sha256 = "04ddjdia09y14gq4h6m8g6aiwkqvdxp66yjx3j5dh2xrkyxhlxpz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ispell";
+          sha256 = "0qyj6whgb2p0v231wn6pvx4awvl1wxppppqqbx5255j8r1f3l1b0";
+          name = "helm-ispell";
+        };
+        packageRequires = [ helm-core ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-ispell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-itunes = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-itunes";
+        version = "20151013.148";
+        src = fetchFromGitHub {
+          owner = "daschwa";
+          repo = "helm-itunes";
+          rev = "966de755a5aadbe02311a6cef77bd4790e84c263";
+          sha256 = "1czgf5br89x192g3lh3x2n998f79hi1n2f309ll264qnl35kv14w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-itunes";
+          sha256 = "15z5lgh5x1ykz5p31i994fig8v05s7ckkgw6p9jifn11sn1a39nb";
+          name = "helm-itunes";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-itunes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-j-cheatsheet = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-j-cheatsheet";
+        version = "20131228.641";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "helm-j-cheatsheet";
+          rev = "70560fd2fb880eccba3b1927d0fa5e870e0734e4";
+          sha256 = "0f2psp7p82sa2fip282w152zc1rjd3l0sna1g7rgwi9x29gcsh0v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-j-cheatsheet";
+          sha256 = "0lppzk60vl3ps9fqnrh020awiy5w46gwlb6d91pr889x24ryphmm";
+          name = "helm-j-cheatsheet";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-j-cheatsheet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-jstack = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-jstack";
+        version = "20150602.2322";
+        src = fetchFromGitHub {
+          owner = "raghavgautam";
+          repo = "helm-jstack";
+          rev = "2064f7215dcf4ccbd6a7b8784223251507746da4";
+          sha256 = "0vhqpcv8xi6a6q7n6xxahdzijr1x5s40fvk9nc44q55psbyv627g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-jstack";
+          sha256 = "0giix1rv2jrmdxyg990w90ivl8bvgbbvah6nkpj7gb6vbnm15ldz";
+          name = "helm-jstack";
+        };
+        packageRequires = [ cl-lib emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-jstack";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-lobsters = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-lobsters";
+        version = "20150213.946";
+        src = fetchFromGitHub {
+          owner = "julienXX";
+          repo = "helm-lobste.rs";
+          rev = "4121b232aeded2f82ad2c8a85c7dda17ef9d97bb";
+          sha256 = "0nkmc17ggyfi7iz959mvzh6q7116j44zqwi7ydm9i8z49xfpzafy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-lobsters";
+          sha256 = "0dkb78n373kywxj8zba2s5a2g85vx19rdswv9i78xjwv1lqh8cpp";
+          name = "helm-lobsters";
+        };
+        packageRequires = [ cl-lib helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-lobsters";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-ls-git";
+        version = "20151101.56";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm-ls-git";
+          rev = "8cddd84ee4361b9d21f800adbaeeacf72645ab62";
+          sha256 = "129mlpx5vqxyg2scrdiajxp71phxamrvijpc054k1q1an8vgn0kv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ls-git";
+          sha256 = "08rsy9479nk03kinjfkxddrq6wi4sx2a0wrz37cl2q517qi7sibj";
+          name = "helm-ls-git";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-ls-git";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-ls-hg = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-ls-hg";
+        version = "20150909.43";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm-ls-hg";
+          rev = "61b91a22fcfb62d0fc56e361ec01ce96973c7165";
+          sha256 = "1msrsqiwk7bg5gry5cia8a6c7ifymfyn738hk8g2qwzzw4vkxxcs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ls-hg";
+          sha256 = "0ca0xn7n8bagxb504xgkcv04rpm1vxhx2m77biqrx5886pwl25bh";
+          name = "helm-ls-hg";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-ls-hg";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-ls-svn = callPackage ({ cl-lib ? null, emacs, fetchsvn, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-ls-svn";
+        version = "20150717.239";
+        src = fetchsvn {
+          url = "https://svn.macports.org/repository/macports/users/chunyang/helm-ls-svn.el";
+          rev = "144800";
+          sha256 = "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ls-svn";
+          sha256 = "08mwzi340akw4ar20by0q981mzmzvf0wz3mn738q4inn2kqgs60d";
+          name = "helm-ls-svn";
+        };
+        packageRequires = [ cl-lib emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-ls-svn";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
+    melpaBuild {
+        pname = "helm-make";
+        version = "20151117.1120";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "helm-make";
+          rev = "0f29d09002653a2b3cb21ffdecaf33e7911747d8";
+          sha256 = "05z1s01wgdj2s7qln42cg7nnjq0hmq2ji4xjldzj6w770a5nvb7g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-make";
+          sha256 = "1r6jjy1rlsii6p6pinbz7h6gcw4vmcycd3vj338bfbnqp5rrf2mc";
+          name = "helm-make";
+        };
+        packageRequires = [ helm projectile ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-make";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-migemo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, migemo }:
+    melpaBuild {
+        pname = "helm-migemo";
+        version = "20151009.2256";
+        src = fetchFromGitHub {
+          owner = "emacs-jp";
+          repo = "helm-migemo";
+          rev = "66c6a19d07c6a385daefd2090d0709d26b608b4e";
+          sha256 = "0gzlprf5js4y3vzkf7si2xc7ai5j97b5cqrs002hyjj5ij4f2vix";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-migemo";
+          sha256 = "1cjvb1lm1fsg5ky63fvrphwl5a7r7xf6qzb4mvl06ikj8hv2h33x";
+          name = "helm-migemo";
+        };
+        packageRequires = [ cl-lib emacs helm-core migemo ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-migemo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-mode-manager = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-mode-manager";
+        version = "20151124.338";
+        src = fetchFromGitHub {
+          owner = "istib";
+          repo = "helm-mode-manager";
+          rev = "5d9c3ca4f8205d07ff4e03c4c3e88f596751c1fc";
+          sha256 = "1lbxb4vnnv6s46m90qihkj99qdbdylwncwaijjfd7i2kap2ayawh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-mode-manager";
+          sha256 = "1w9svq1kyyj8mmljardhbdvykb334nq1y18s956g4rvqyas2ciyd";
+          name = "helm-mode-manager";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-mode-manager";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-mt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi-term }:
+    melpaBuild {
+        pname = "helm-mt";
+        version = "20151104.2320";
+        src = fetchFromGitHub {
+          owner = "dfdeshom";
+          repo = "helm-mt";
+          rev = "39a7d58050942f6afc15b1078f1e397ec4c8cd5c";
+          sha256 = "09rb8aq7fnf661w3liwbkkaczjph3dzvg26slm9cwcnl7pqnvagl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-mt";
+          sha256 = "04hx8cg8wmm2w8g942nc9mvm12ammmjnx4k61ljrq76smd8s3x2a";
+          name = "helm-mt";
+        };
+        packageRequires = [ cl-lib emacs helm multi-term ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-mt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-mu = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-mu";
+        version = "20160104.415";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm-mu";
+          rev = "e9805abf7498d3f990da26dd3355e5af3112e29e";
+          sha256 = "0xqykxq8ys9gd269kjzhlwcd2lzsjj5j2ynijvpl2rji10w2xwkr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-mu";
+          sha256 = "0pydp6scj5icaqfp3dp5h0q1y2i7z9mfyw1ll6iphsz9qh3x2bj2";
+          name = "helm-mu";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-mu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-nixos-options = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, nixos-options }:
+    melpaBuild {
+        pname = "helm-nixos-options";
+        version = "20151013.1809";
+        src = fetchFromGitHub {
+          owner = "travisbhartwell";
+          repo = "nix-emacs";
+          rev = "6b1418611b49a6cf77380a76f7e6236bbb5df83a";
+          sha256 = "0ia9wgn33znaviy7ilfm83yfalc2dbpm1g7nvss5s4rznqkdfhn3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-nixos-options";
+          sha256 = "1nsi4hfw53iwn29fp33dkri1c6w8kdyn4sa0yn2fi6144ilmq933";
+          name = "helm-nixos-options";
+        };
+        packageRequires = [ helm nixos-options ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-nixos-options";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-open-github = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, gh, helm-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-open-github";
+        version = "20151226.842";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-helm-open-github";
+          rev = "4c5a47003b2efed1c3437e91121a77d082cf64c8";
+          sha256 = "1wkmbc7247f209krvw4dzja3z0wyny12x5yi1cn3fnfh5nx04851";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-open-github";
+          sha256 = "121sszwvihbv688nq5lhdclvsjj8759glh42h82r4pcw30lxggxb";
+          name = "helm-open-github";
+        };
+        packageRequires = [ cl-lib gh helm-core ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-open-github";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-orgcard = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-orgcard";
+        version = "20151001.1024";
+        src = fetchFromGitHub {
+          owner = "emacs-jp";
+          repo = "helm-orgcard";
+          rev = "9655ac340d1ccc5f3d1c0f7c49be8dd3556d4d0d";
+          sha256 = "1zyjxrrda7nxxjqczv2p3sfimxy2pq734kf51j6v2y0biclc4bk3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-orgcard";
+          sha256 = "1a56y8fny7qxxidc357n7l3yi7h66hidhvwhkam8y5wk6k61460p";
+          name = "helm-orgcard";
+        };
+        packageRequires = [ helm-core ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-orgcard";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-package = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-package";
+        version = "20151210.248";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-helm-package";
+          rev = "117f5f26c96c0854aadaf9c52aaec961195d5798";
+          sha256 = "14ad0b9d07chabjclffjyvnmrasar1di9wmpzf78bw5yg99cbisw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-package";
+          sha256 = "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y";
+          name = "helm-package";
+        };
+        packageRequires = [ cl-lib helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-package";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-pages = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-pages";
+        version = "20151209.1400";
+        src = fetchFromGitHub {
+          owner = "david-christiansen";
+          repo = "helm-pages";
+          rev = "60f52edb11e54f553251234f4d336c0947ca0a2b";
+          sha256 = "0yngs3q6142g2nn1wwdaifylyfjjs3gmmy0jck5zh8mhmdgdqr06";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-pages";
+          sha256 = "1v3w8100invb5wsmm3dyl41pjs7s889s3b1rlr6vlcspa1ncv3wj";
+          name = "helm-pages";
+        };
+        packageRequires = [ cl-lib emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-pages";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-perldoc = callPackage ({ cl-lib ? null, deferred, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-perldoc";
+        version = "20151031.2227";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-helm-perldoc";
+          rev = "a7347e0a4f1a1832060b3a7a1a3f3d2ed4f92f33";
+          sha256 = "13wnagmgicl2mi4iksqckrjbaiz05j9ykbmvj26jy8zcbll5imfs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-perldoc";
+          sha256 = "0b0cl2xj5w1r71zrjhnqhrzsnz1296jv21qx5adzslra6lk55q2r";
+          name = "helm-perldoc";
+        };
+        packageRequires = [ cl-lib deferred helm-core ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-perldoc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-proc = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-proc";
+        version = "20140504.357";
+        src = fetchFromGitHub {
+          owner = "markus1189";
+          repo = "helm-proc";
+          rev = "76fee002caa1c83809f4d3f7b30fa672dcb36937";
+          sha256 = "076yhcf447fas14k8gg67rc743x049xf66627sd9lgjv7107r8vr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-proc";
+          sha256 = "1bq60giy2bs9m3hlbc5nwvy51702a98s0vqass3b290hdgki4bnx";
+          name = "helm-proc";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-proc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-project-persist = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, project-persist }:
+    melpaBuild {
+        pname = "helm-project-persist";
+        version = "20151210.943";
+        src = fetchFromGitHub {
+          owner = "Sliim";
+          repo = "helm-project-persist";
+          rev = "357950fbac18090985a750e40d5d8b10ee9dcd53";
+          sha256 = "0j54c1kzsjgr05qx25rg3ylawvyw6n6liypiwaas47vpyfswbxhv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-project-persist";
+          sha256 = "1n87kn1n3453mpdj6amyrgivslskmnzdafpspvkz7b0smf9mv2ld";
+          name = "helm-project-persist";
+        };
+        packageRequires = [ helm project-persist ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-project-persist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-projectile = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
+    melpaBuild {
+        pname = "helm-projectile";
+        version = "20151220.421";
+        src = fetchFromGitHub {
+          owner = "bbatsov";
+          repo = "helm-projectile";
+          rev = "2544343b4214511988fa1b652474d7984008f807";
+          sha256 = "1c6pfy3qghpqnng1jsnxnvqnd6sq41f2dm7kkwkgml405asqlcqa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-projectile";
+          sha256 = "18y7phrvbpdi3cnghwyhh0v1bwm95nwq1lymzf8lrcbmrwcvh36a";
+          name = "helm-projectile";
+        };
+        packageRequires = [ cl-lib dash helm projectile ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-projectile";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-prosjekt = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, prosjekt }:
+    melpaBuild {
+        pname = "helm-prosjekt";
+        version = "20140129.117";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "prosjekt";
+          rev = "a864a8be5842223043702395f311e3350c28e9db";
+          sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-prosjekt";
+          sha256 = "019rya3bf13cnval8iz680wby3sqlmqg4nbn0a13l1pkhlnv9fvm";
+          name = "helm-prosjekt";
+        };
+        packageRequires = [ helm prosjekt ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-prosjekt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-pt = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-pt";
+        version = "20151208.2130";
+        src = fetchFromGitHub {
+          owner = "ralesi";
+          repo = "helm-pt";
+          rev = "afdf50913c49b8bbb0ff40ee5d9dfe3eb8b7c71a";
+          sha256 = "01wcybzb1jdyybr7scblzxp3c16zm01ms9ci1hcpfsv2y55gbg5y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-pt";
+          sha256 = "1imhy0bsm9aldv0pvf88280qdya01lznxpx5gi5wffhrz17yh4pi";
+          name = "helm-pt";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-pt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-pydoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-pydoc";
+        version = "20151008.924";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-helm-pydoc";
+          rev = "d4f409127bc77e7c79dcc87320b2db10466caed2";
+          sha256 = "1hlbyw6jvh6pm3ivmhd6qvs9j7km322fki9g4yd4qw7w15a3wkyy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-pydoc";
+          sha256 = "0cnbhjw951f8sci63cvzcc65d0ffdx3rb8l1g38qql5rzkam48fn";
+          name = "helm-pydoc";
+        };
+        packageRequires = [ cl-lib helm-core ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-pydoc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-rails = callPackage ({ fetchFromGitHub, fetchurl, helm, inflections, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-rails";
+        version = "20130424.1019";
+        src = fetchFromGitHub {
+          owner = "asok";
+          repo = "helm-rails";
+          rev = "31d79cd0feca11cbb1aa532a8d2112ec794de4f0";
+          sha256 = "1a26r21jvgzk21vh3mf29s1dhvvv70jh860zaq9ihrpfrrl91158";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-rails";
+          sha256 = "1iihfsmnkpfp08pldghf3w5k8v5dlmy5ns0l4niwdwp5w8lyjcd6";
+          name = "helm-rails";
+        };
+        packageRequires = [ helm inflections ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-rails";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-rb = callPackage ({ fetchFromGitHub, fetchurl, helm, helm-ag-r, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-rb";
+        version = "20131123.1039";
+        src = fetchFromGitHub {
+          owner = "yuutayamada";
+          repo = "helm-rb";
+          rev = "4949d646420a9849af234dacdd8eb34a77c662fd";
+          sha256 = "1b74jsr28ldz80mrqz3d1bmykpcprdbhf3fzhc0awd5i5xdnfaid";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-rb";
+          sha256 = "14pkrj1rpi2ihpb7c1hx6xwzvc1x7l41lwr9znp5vn7z93i034fr";
+          name = "helm-rb";
+        };
+        packageRequires = [ helm helm-ag-r ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-rb";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-recoll = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-recoll";
+        version = "20160108.1557";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm-recoll";
+          rev = "5f9b807a4415fcd3188b022be1233b4b2906c8eb";
+          sha256 = "0nbny1a41sy4w3k2irp7rh6663jhbssqqshxd3y82iq0hs9h2wda";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-recoll";
+          sha256 = "0pr2pllplml55k1xx9inr3dm90ichg2wb62dvgvmbq2sqdf4606b";
+          name = "helm-recoll";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-recoll";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-rhythmbox = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-rhythmbox";
+        version = "20150813.808";
+        src = fetchFromGitHub {
+          owner = "mrBliss";
+          repo = "helm-rhythmbox";
+          rev = "3bdff00fd9d7b39f8b1dfb35e6843da307ef4d98";
+          sha256 = "05mf0021jhr4zmysy28cgilkfxyp08qmkc20v9wlykksg73l2crk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-rhythmbox";
+          sha256 = "0pnm7yvas0q3b38ch5idm7v4ih2fjyfai8217j74xhkpcc2w4g4a";
+          name = "helm-rhythmbox";
+        };
+        packageRequires = [ cl-lib helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-rhythmbox";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-robe = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-robe";
+        version = "20151208.2155";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-helm-robe";
+          rev = "7348d0bc0251b51979554ea678b970fd01c0efe9";
+          sha256 = "163ljqar3vvbavzc8sk6rnf8awyc2rhh2g117fglswich3c8lnqg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-robe";
+          sha256 = "1gi4nkm9xvnxv0frmhiiw8dkmnmhfpr9n0b6jpidlvr8xr4s5kyw";
+          name = "helm-robe";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-robe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-rubygems-local = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-rubygems-local";
+        version = "20130711.2011";
+        src = fetchFromGitHub {
+          owner = "f-kubotar";
+          repo = "helm-rubygems-local";
+          rev = "289cb33d41c703af9791d6da46b55f070013c2e3";
+          sha256 = "0s4hb1fvwr9za5gkz8s5w1kh9qjyygz6g59w7vmrg2d8ds2an03d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-rubygems-local";
+          sha256 = "18p18bly15a8xjc34k11jbvxlmr127sll0vh5ma2p787x6a3mc7c";
+          name = "helm-rubygems-local";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-rubygems-local";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-rubygems-org = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-rubygems-org";
+        version = "20140826.656";
+        src = fetchFromGitHub {
+          owner = "neomantic";
+          repo = "helm-rubygems-org";
+          rev = "6aaed984f698cbdf9f9aceb0221404563e28764d";
+          sha256 = "1sff8kagyhmwcxf9062il1077d4slvr2kq76abj496610gpb75i0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-rubygems-org";
+          sha256 = "04ni03ak53z3rggdgf68qh7ksgcf3s0f2cv6skwjqw7v8qhph6qs";
+          name = "helm-rubygems-org";
+        };
+        packageRequires = [ cl-lib emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-rubygems-org";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-safari = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-safari";
+        version = "20160116.134";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "helm-safari";
+          rev = "a1e17b7a75df62e84b1b5fdedb969cc291c90beb";
+          sha256 = "0qm5wlqklwf0y8grqhl2hfyfbkyj8200cdmbcf9cfr51lrh3cn8v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-safari";
+          sha256 = "0lvwghcl5w67g0lc97r7hfvca7ss0mysy2mxj9axxbpyiq6fmh0y";
+          name = "helm-safari";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-safari";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-sage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, sage-shell-mode }:
+    melpaBuild {
+        pname = "helm-sage";
+        version = "20150827.2234";
+        src = fetchFromGitHub {
+          owner = "stakemori";
+          repo = "helm-sage";
+          rev = "b42b4ba5fd1b17c4b54c30376a053281686beeb8";
+          sha256 = "1s6aw1viyzhhrfiazzi82n7bkvshp7clwi6539660m72lfwc5zdl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-sage";
+          sha256 = "1vnq15fjaap0ai7dadi64sm4415xssmahk2j7kx45sasy4qaxlbj";
+          name = "helm-sage";
+        };
+        packageRequires = [ cl-lib helm sage-shell-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-sage";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-sheet = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-sheet";
+        version = "20130630.739";
+        src = fetchFromGitHub {
+          owner = "yasuyk";
+          repo = "helm-sheet";
+          rev = "d360b68d0ddb09aa1854e7b2f3cb39caeee26463";
+          sha256 = "00wnqcgpf4hqdnqj5zrizr4s0pffb93xwya8k5c3rp4plncrcdzx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-sheet";
+          sha256 = "0lx70l5gq43hckgdfna8s6wx287sw5ms9l1z3n6vg2x8nr9m61kc";
+          name = "helm-sheet";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-sheet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-spaces = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, spaces }:
+    melpaBuild {
+        pname = "helm-spaces";
+        version = "20130605.1100";
+        src = fetchFromGitHub {
+          owner = "yasuyk";
+          repo = "helm-spaces";
+          rev = "7545fed3880effe079bb27bfbf22e902ac0bc828";
+          sha256 = "0sw7g1zcs1jfqcpprxwjq97lsk4qfngwamkj3q8jhm77zh7kfa3b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-spaces";
+          sha256 = "0hdvkk173k98iycvii5xpbiblx044125pl7jyz4kb8r1vvwcv791";
+          name = "helm-spaces";
+        };
+        packageRequires = [ helm spaces ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-spaces";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-spotify = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi }:
+    melpaBuild {
+        pname = "helm-spotify";
+        version = "20131014.1621";
+        src = fetchFromGitHub {
+          owner = "krisajenkins";
+          repo = "helm-spotify";
+          rev = "a1a8275a4769221f7df9a67ed9a028fecbdc29ca";
+          sha256 = "133dcqk42nq5gh5qlcbcmx3lczisfgymcnypnld318jvjgd2ma8a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-spotify";
+          sha256 = "1rzvxnaqh8bm78qp0rhpqs971pc855qrq589r3s8z3gpqzmwlnmf";
+          name = "helm-spotify";
+        };
+        packageRequires = [ helm multi ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-spotify";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-swoop";
+        version = "20151022.1950";
+        src = fetchFromGitHub {
+          owner = "ShingoFukuyama";
+          repo = "helm-swoop";
+          rev = "d953ad605c989c40da5bc0fcb2953104ea7210e6";
+          sha256 = "1dixg0yik08ad9qwcfis9vkg1h7zwqsisfr1zlgzabpzzm822mmd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-swoop";
+          sha256 = "1fqbhj75hcmy7c2vdd0m7fk3m34njmv5s6k1i9y94djpbd13i3d8";
+          name = "helm-swoop";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-swoop";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-themes = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-themes";
+        version = "20151009.121";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-helm-themes";
+          rev = "a6449a40c5a219b43a92c975917a07337f864b4f";
+          sha256 = "0a9h6rmjc6c6krkvxbgrzv35if260d9ma9a2k47jzm9psnyp9s2w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-themes";
+          sha256 = "1j64w6dnxmq0rfycci9wfy2z5lbddsggf486pknxfgwwqgvns90l";
+          name = "helm-themes";
+        };
+        packageRequires = [ helm-core ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-themes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-unicode = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-unicode";
+        version = "20150428.1354";
+        src = fetchFromGitHub {
+          owner = "shosti";
+          repo = "helm-unicode";
+          rev = "cf08fea1235fdc9f900efc0742b021ca33ef65aa";
+          sha256 = "1ypnsbx623gg3q07gxrbkn82jzy38sj4p52hj1wcb54qjqzyznkg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-unicode";
+          sha256 = "052xqzvcfzpsbl75ylqb1khqndvc2dqdymqlwivs0darlds0w8y4";
+          name = "helm-unicode";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-unicode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-w32-launcher = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-w32-launcher";
+        version = "20141223.1414";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "helm-w32-launcher";
+          rev = "3e59ad62b89dd21d334af0203d445a83eb25dc5b";
+          sha256 = "0xlz9rxx7y9pkrzvxmv42vgys5iwx75zv9g50k8ihwc08z80dhcq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-w32-launcher";
+          sha256 = "0bzn2vhspn6lla815qxwsl9gwfyiwgwmnysr6rjpyacmi17d73ri";
+          name = "helm-w32-launcher";
+        };
+        packageRequires = [ cl-lib emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-w32-launcher";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-w3m = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, w3m }:
+    melpaBuild {
+        pname = "helm-w3m";
+        version = "20150722.1024";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm-w3m";
+          rev = "280673470672c9fbc57fd6a91defeb9f6641fc8a";
+          sha256 = "0d47mqib4zkfadq26vpy0ih7j18d6n5v4c21wvr4hhg6hg205iiz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-w3m";
+          sha256 = "1rr83ija93iqz74k236hk3v75jk0iwcccwqpqgys7spvrld0b9pz";
+          name = "helm-w3m";
+        };
+        packageRequires = [ cl-lib emacs helm w3m ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-w3m";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-wordnet = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-wordnet";
+        version = "20150921.1633";
+        src = fetchFromGitHub {
+          owner = "raghavgautam";
+          repo = "helm-wordnet";
+          rev = "71fe718cccdb172614b5e2e55192301a44f6d7d4";
+          sha256 = "0jaj513nnmbmlj8if84k5k0k7a6b24hzpzi0kbzj5vbr010cwnjd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-wordnet";
+          sha256 = "0di8gxsa9r8mzja4akhz0wpgrhlidqyn1s1ix5szplwxklwf2r2f";
+          name = "helm-wordnet";
+        };
+        packageRequires = [ cl-lib emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-wordnet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-words = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-words";
+        version = "20150413.1518";
+        src = fetchFromGitHub {
+          owner = "pronobis";
+          repo = "helm-words";
+          rev = "637aa3a7e9cfd34e0127472c5b1f993a4da26185";
+          sha256 = "19l8vysjygscr1nsddjz2yv0fjhbsswfq40rdny8zsmaa6qhpj35";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-words";
+          sha256 = "0l9mb7g3xzasna1bw2p7vh2wdg1hmjkff40p8kpqvwwzszdm9v76";
+          name = "helm-words";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/helm-words";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-xcdoc = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-xcdoc";
+        version = "20160116.418";
+        src = fetchFromGitHub {
+          owner = "fujimisakari";
+          repo = "emacs-helm-xcdoc";
+          rev = "a85612149a6d8e18ab309b3db2d222ce39c42049";
+          sha256 = "1yqr5z5sw7schvaq9pmwg79anp806gikm28s6xvrayzyn4idz2n6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-xcdoc";
+          sha256 = "1ikphlnj053i4g1l8r2pqaljvdqglj1yk0xx4vygnw98qyzdsx4v";
+          name = "helm-xcdoc";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-xcdoc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-zhihu-daily = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-zhihu-daily";
+        version = "20151006.319";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "helm-zhihu-daily";
+          rev = "c084d2505621dbb71d83ec10550fa0801623cafc";
+          sha256 = "11fznbfcv4rac4h50mkax1g66wd2f91f5dw2v4jxjq2f5y4h4w0g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-zhihu-daily";
+          sha256 = "0hkgail60s9qhxl0pskqxjvfz93iq1qh1kcmcq0x5kq7d08b911r";
+          name = "helm-zhihu-daily";
+        };
+        packageRequires = [ cl-lib emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-zhihu-daily";
+          license = lib.licenses.free;
+        };
+      }) {};
+    help-fns-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "help-fns-plus";
+        version = "20151215.837";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/help-fns+.el";
+          sha256 = "00x3ln7x4d6r422x845smf3h0x1z85l5jqyjkrllqcs7qijcrk5w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/help-fns+";
+          sha256 = "10vz7w79k3barlcs3ph3pc7914xdhcygagdk2wj3bq0wmwxa1lia";
+          name = "help-fns-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/help-fns+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    help-mode-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "help-mode-plus";
+        version = "20151231.1531";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/help-mode+.el";
+          sha256 = "0qmf81maq6yvs68b8vlbxwkjk72qldamq75znrma9mhvlv8igrgx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/help-mode+";
+          sha256 = "1pmb845bxa5kazjpdxm12rm2wcshmv2cmisigs3kyva1pmi1shra";
+          name = "help-mode-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/help-mode+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    help-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "help-plus";
+        version = "20151231.1528";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/help+.el";
+          sha256 = "1r7kf9plnsjx87bhflsdh47wybvhis7gb10izqa1p6w0aqsg178s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/help+";
+          sha256 = "1jx0wa4md1mvdsvjyx2yvi4hhm5w061qqcafsrw4axsz7gjpd4yi";
+          name = "help-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/help+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hemisu-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hemisu-theme";
+        version = "20130508.1344";
+        src = fetchFromGitHub {
+          owner = "andrzejsliwa";
+          repo = "hemisu-theme";
+          rev = "5c206561aa2c844ecdf3e3b672c3235e559ddd7f";
+          sha256 = "178dvigiw162m01x7dm8pf61w2n3bq51lvk5q7jzpb9s35pz1697";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hemisu-theme";
+          sha256 = "0byzrz74yvk12m8dl47kkmkziwrrql193q72qx974zbqdj8h2sph";
+          name = "hemisu-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hemisu-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    heroku = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "heroku";
+        version = "20120629.1313";
+        src = fetchFromGitHub {
+          owner = "technomancy";
+          repo = "heroku.el";
+          rev = "92af1c073b593c4def99c8777c869992aa4d0b3a";
+          sha256 = "0c45pib8qpwgyr271g5ddnsn7hzq68mqflv0yyc8803ni06w9vhj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/heroku";
+          sha256 = "1kadmxmqhc60cb5k14943rad1gbril2hlcnqxnsy4h3j2ykmcdyy";
+          name = "heroku";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/heroku";
+          license = lib.licenses.free;
+        };
+      }) {};
+    heroku-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "heroku-theme";
+        version = "20150522.2119";
+        src = fetchFromGitHub {
+          owner = "jonathanchu";
+          repo = "heroku-theme";
+          rev = "8083643fe92ec3a1c3eb82f1b8dc2236c9c9691d";
+          sha256 = "15hk0v6ck076mahsz4spq75jcnv587fx4d3w50c7bdh423fl0xvx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/heroku-theme";
+          sha256 = "0mchh9y3pqwamry6105qrv1bp1qg1g0jmz7rzc5svz9giynypwf9";
+          name = "heroku-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/heroku-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hexrgb = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "hexrgb";
+        version = "20151231.1532";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/hexrgb.el";
+          sha256 = "0rqjidjxa5j6rjknklfks743lczbq3qsyiranrf2z3ghzi0gf7fd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hexrgb";
+          sha256 = "0mzqslrrf7sc262syj3ja7b7rnbg80dwf2p9bzxdrzx6b8vvsx06";
+          name = "hexrgb";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hexrgb";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hgignore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hgignore-mode";
+        version = "20150412.1300";
+        src = fetchFromGitHub {
+          owner = "omajid";
+          repo = "hgignore-mode";
+          rev = "054c370c6df1b789f0d9907b30b54ef2287aafbe";
+          sha256 = "06hm98aq87l91fhb2bqz8jw427k8fb280ygz5g44fy6sqc6js7v0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hgignore-mode";
+          sha256 = "0ja71l3cghhn1c6w2pff80km8h8xgzf0j9gcldfyc72ar6ifhjkj";
+          name = "hgignore-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hgignore-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hi2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hi2";
+        version = "20141005.1431";
+        src = fetchFromGitHub {
+          owner = "nilcons";
+          repo = "hi2";
+          rev = "c9d199727b5cdcb9e36a972b38131ce4611fd6c8";
+          sha256 = "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hi2";
+          sha256 = "1wxkjg1jnw05lqzggi20jy2jl20d8brvv76vmrf6lnz62g6jv9h2";
+          name = "hi2";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hi2";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hide-comnt = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "hide-comnt";
+        version = "20151231.1533";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/hide-comnt.el";
+          sha256 = "1l5jvgjgd0kzv1sn6h467fbnl487hma4h4pkwq4x1dhbc26yvfpz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hide-comnt";
+          sha256 = "181kns2rg4rc0pyyxw305qc06d10v025ad7v2m037y72vfwb0igx";
+          name = "hide-comnt";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hide-comnt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hide-lines = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "hide-lines";
+        version = "20151127.1240";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/hide-lines.el";
+          sha256 = "1q87yp1pr62cza3pqimqd09a39yyij4c7pncdww84zz7cii9qrn2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hide-lines";
+          sha256 = "146sgvd88w20rqvd8y8kc76cb1nqk6dvqsz9rgl4rcrf0xfqvp7q";
+          name = "hide-lines";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hide-lines";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hide-region = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "hide-region";
+        version = "20140201.514";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/hide-region.el";
+          sha256 = "1zxrygpf47bzj6p808r3qhj3dfr3m8brp1xgxs33c7f88rinfval";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hide-region";
+          sha256 = "0nsc6m3yza658xsxvjz8766vkp71rcm6vwnvcv225r2pr94mq7vm";
+          name = "hide-region";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hide-region";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hideshow-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hideshow-org";
+        version = "20120223.1650";
+        src = fetchFromGitHub {
+          owner = "shanecelis";
+          repo = "hideshow-org";
+          rev = "16419e52e6cdd2f46f755144c0ab11ce00d1a626";
+          sha256 = "1dr06b9njzih8z97k62l9w3x0a801x4bp043zvk7av9qkz8izl2r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hideshow-org";
+          sha256 = "1bzx5ii06r64nra92zv1dvw5zv3im7la2dd3md801hxyfrpb74gc";
+          name = "hideshow-org";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hideshow-org";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hideshowvis = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "hideshowvis";
+        version = "20130824.700";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/hideshowvis.el";
+          sha256 = "15ax1j3j7kylyc8a91ja825sp4mhbdgx0j4i5kqxwhvmwvpmyrv6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hideshowvis";
+          sha256 = "1ajr71fch3v5g8brb83kwmlakcam5w21i3yr8df00c5j2pnc6v1f";
+          name = "hideshowvis";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hideshowvis";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "highlight";
+        version = "20151231.1537";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/highlight.el";
+          sha256 = "15s4463damlszd5wqi22a6w25i8l0m5rvqdg73k3yp01i65jc29z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight";
+          sha256 = "0clv4mzy9kllcvc0cgsbx3a9anw68dc2c7vzwbrv13sw5gh9skc0";
+          name = "highlight";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/highlight";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-blocks = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "highlight-blocks";
+        version = "20151201.1015";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "highlight-blocks";
+          rev = "9c4240a5d16008db430d1a81c76dad474d3deb0c";
+          sha256 = "0c65jk00j88qxfki2g88hy9g6n92rzskwcn1fbmwcw3qgaz4b6w5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-blocks";
+          sha256 = "1a32iv5kgf6g6ygbs559w156dh578k45m860czazfx0d6ap3k5m1";
+          name = "highlight-blocks";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/highlight-blocks";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-chars = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "highlight-chars";
+        version = "20151231.1535";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/highlight-chars.el";
+          sha256 = "18y6cw43mhizccvwfydv6g2kz8w7vff0n3k9sq5ghwq3rb3z14b2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-chars";
+          sha256 = "19jawbjvqx1hsjbynx0jgpziap3r64k8s1xfckajrx8aq8m4c6i0";
+          name = "highlight-chars";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/highlight-chars";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-cl = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "highlight-cl";
+        version = "20091012.1230";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/highlight-cl.el";
+          sha256 = "0r3kzs2fsi3kl5gqmsv75dc7lgfl4imrrqhg09ij6kq1ri8gjxjw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-cl";
+          sha256 = "164h3c3rzriahb7v5hk2pw4i0gk2vk5ak722bai6x4zx4l1xp20w";
+          name = "highlight-cl";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/highlight-cl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-current-line = callPackage ({ fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "highlight-current-line";
+        version = "20051013.1256";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/highlight-current-line.el";
+          sha256 = "1aki7a7nnj9n7vh19k4fr0v7cqbwkrpc6b3f3yv95vcqj8a4y34c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-current-line";
+          sha256 = "01bga6is3frzlzfajpvpgz224vhl0jnc2bl2ipvlygdcmv4h8973";
+          name = "highlight-current-line";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/highlight-current-line";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-defined = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "highlight-defined";
+        version = "20141225.930";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "highlight-defined";
+          rev = "243478cc204ab42d29805ed610961cbb260c1dfd";
+          sha256 = "1l10xnjyvcbv1v8xlldaca7z3fk5qav7nsbhfnjxxd0bgh5v9by2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-defined";
+          sha256 = "1vjxm35wf4c2qphpkjh57hf03a5qdssdlmfj0n0gwxsdw1q5rpms";
+          name = "highlight-defined";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/highlight-defined";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-escape-sequences = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "highlight-escape-sequences";
+        version = "20151231.612";
+        src = fetchFromGitHub {
+          owner = "dgutov";
+          repo = "highlight-escape-sequences";
+          rev = "ffb8c5da19ffd2a71003b93fe33f78d0900fad9e";
+          sha256 = "0rs8zyjz5mh26n8bdxn6fmyw2809nihz1vp7ih59dq11lx3mf9az";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-escape-sequences";
+          sha256 = "0938b29cqapid9v9q4w2jwh8kdb0p70qwzy9xm2nxaairm7436d6";
+          name = "highlight-escape-sequences";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/highlight-escape-sequences";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-indent-guides = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "highlight-indent-guides";
+        version = "20151112.1427";
+        src = fetchFromGitHub {
+          owner = "DarthFennec";
+          repo = "highlight-indent-guides";
+          rev = "4473af2bbeb80d50681a64b66f5891262cf52346";
+          sha256 = "10m1cr5plzsxbq08lck4c2w0whcdrnl9h2qm4bbr9srhnpry7fxj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-indent-guides";
+          sha256 = "00ghp677qgb5clxhdjarfl8ab3mbp6v7yfsldm9bn0s14lyaq5pm";
+          name = "highlight-indent-guides";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/highlight-indent-guides";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-indentation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "highlight-indentation";
+        version = "20150307.408";
+        src = fetchFromGitHub {
+          owner = "antonj";
+          repo = "Highlight-Indentation-for-Emacs";
+          rev = "cd6d8168ccb04c6c0394f42e9512c58f23c01689";
+          sha256 = "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-indentation";
+          sha256 = "0iblrrbssjwfn71n8xxjcl98pjv1qw1igf3hlz6mh8740fsca3d6";
+          name = "highlight-indentation";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/highlight-indentation";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-leading-spaces = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "highlight-leading-spaces";
+        version = "20151216.622";
+        src = fetchFromGitHub {
+          owner = "mrBliss";
+          repo = "highlight-leading-spaces";
+          rev = "840db19d863dd97993fd9f893f5be501627b6354";
+          sha256 = "1vy6j63jp83ljdqkrqglpys74yfh7p61sd0lqiwczgr5nqyc60rl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-leading-spaces";
+          sha256 = "0h2ww2vqmarghf4zg0wbwn0wgndmkcjy696mc885rwavck2dav4p";
+          name = "highlight-leading-spaces";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/highlight-leading-spaces";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parent-mode }:
+    melpaBuild {
+        pname = "highlight-numbers";
+        version = "20150531.807";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "highlight-numbers";
+          rev = "e1245b27a732ec43c1562f825533fe147759d24e";
+          sha256 = "0ffhc5s0h34064bix4qyiiyx30m4hpv0phmxwcrwiyvanj9ggfai";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-numbers";
+          sha256 = "1bywrjv9ybr65mwkrxggb52jdqn16z8acgs5vqm0faq43an8i5yv";
+          name = "highlight-numbers";
+        };
+        packageRequires = [ emacs parent-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/highlight-numbers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-parentheses = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "highlight-parentheses";
+        version = "20151108.116";
+        src = fetchFromGitHub {
+          owner = "nschum";
+          repo = "highlight-parentheses.el";
+          rev = "a821a314942f409cd69660d816cd9a0aebd1ae8f";
+          sha256 = "0kzqx1y6rr4ryxi2md9087saad4g4bzysckmp8272k521d46xa1r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-parentheses";
+          sha256 = "1b0n9mz4a6baljvvgb881w53391smm35c9pwd45g861hk1qvrk5k";
+          name = "highlight-parentheses";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/highlight-parentheses";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-quoted = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "highlight-quoted";
+        version = "20140916.1322";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "highlight-quoted";
+          rev = "ec9108486cf7f21f9a0b13f81369849b3b525f1f";
+          sha256 = "0vqkadhzszlxiqb4ysr7p86hhmi4z1j95llxa680xn6md8x2sj8a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-quoted";
+          sha256 = "0x6gxi0jfxvpx7r1fm43ikxlxilnbk2xbhdy9xivhgmmdyqiqqkl";
+          name = "highlight-quoted";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/highlight-quoted";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-stages = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "highlight-stages";
+        version = "20150421.2257";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "highlight-stages";
+          rev = "c5a01b29cf79cebd09da863d45f9f35f6ad3bd06";
+          sha256 = "0gnr1dqkcmc9gfzqjaixh76g1kq7xp20mg1h6vl3c4na7nk6a3fg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-stages";
+          sha256 = "0r4kmjmrpi38q3y0q9h5xkxh7x728ha2nbnc152lzw6zfsxnm4x4";
+          name = "highlight-stages";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/highlight-stages";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-symbol = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "highlight-symbol";
+        version = "20160102.1409";
+        src = fetchFromGitHub {
+          owner = "nschum";
+          repo = "highlight-symbol.el";
+          rev = "7a789c779648c55b16e43278e51be5898c121b3a";
+          sha256 = "19cgyk0sh8nsmf3jbi92i8qsdx4l4yilfq5jj9zfdbj9p5gvwx96";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-symbol";
+          sha256 = "0gw8ffr64s58qdbvm034s1b9xz1hynzvbk8ld67j06fxpc98qaj4";
+          name = "highlight-symbol";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/highlight-symbol";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-tail = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "highlight-tail";
+        version = "20140415.2041";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/highlight-tail.el";
+          sha256 = "1bbiyqddqkrp3c7xsg1m4143611bhg1kkakrwscqjb4cfmx29qqg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-tail";
+          sha256 = "187kv3n262l38jdapi9bwcafz8fh61pdq2zliwiz7m7xdspp2iws";
+          name = "highlight-tail";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/highlight-tail";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "highlight-thing";
+        version = "20151001.221";
+        src = fetchFromGitHub {
+          owner = "fgeller";
+          repo = "highlight-thing.el";
+          rev = "eaf817d61d13fc97142996211222f8d54b48d3aa";
+          sha256 = "01cx05dkrshcpddciiqvbfcc0zg0awbvg3r2n1v44kiixyfdpdwr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-thing";
+          sha256 = "0rvdb1lx9xn9drqw0sw9ih759n10g7k0af39w6n8g0wfr67p96w1";
+          name = "highlight-thing";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/highlight-thing";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-unique-symbol = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "highlight-unique-symbol";
+        version = "20130612.42";
+        src = fetchFromGitHub {
+          owner = "hitode909";
+          repo = "emacs-highlight-unique-symbol";
+          rev = "4141bf86a94e30d94d9af9c29d40b16886226e1c";
+          sha256 = "0hhc2l4pz6q8injpplv6b5l08l8q2lnjdpwabp7gwmhraq54rhjx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-unique-symbol";
+          sha256 = "0lwl8pkmq0q4dvyflarggnn8vzpvk5hhcnk508r6xml2if1sg9zx";
+          name = "highlight-unique-symbol";
+        };
+        packageRequires = [ deferred ];
+        meta = {
+          homepage = "http://melpa.org/#/highlight-unique-symbol";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight2clipboard = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }:
+    melpaBuild {
+        pname = "highlight2clipboard";
+        version = "20151020.1340";
+        src = fetchFromGitHub {
+          owner = "Lindydancer";
+          repo = "highlight2clipboard";
+          rev = "6ce58a060d9c5843ccb8c79ec2bba7858c68ac15";
+          sha256 = "06nnqry36ncqacfzd8yvc4q59bwk3vgf9a14rkpph2hk2rfvq2m6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight2clipboard";
+          sha256 = "19r7abbpm31b0azf2v3xn0rjagg9h01i8g72qapp8dhqb4d9n9r0";
+          name = "highlight2clipboard";
+        };
+        packageRequires = [ htmlize ];
+        meta = {
+          homepage = "http://melpa.org/#/highlight2clipboard";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hindent";
+        version = "20151113.224";
+        src = fetchFromGitHub {
+          owner = "chrisdone";
+          repo = "hindent";
+          rev = "575a7a19f9c86b9699a6222072c79fe02da18c4c";
+          sha256 = "1phyaf6fwaxi2plq38m09cfb5ls401ay8jw0yf5rix8nyvm8nrn9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hindent";
+          sha256 = "1f3vzgnqigwbwvglxv0ziz3kyp5dxjraw3vlghkpw39f57mky4xz";
+          name = "hindent";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/hindent";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hippie-exp-ext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "hippie-exp-ext";
+        version = "20151011.345";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/hippie-exp-ext.el";
+          sha256 = "1jkjg7zxpc06plzlyvj1a8dcvj8ijqzhkxwlsd12cgkymvp411yl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hippie-exp-ext";
+          sha256 = "14py5hz523847f7bhw67v81x5cfhzz5la15mrqavc4z4yicy63iq";
+          name = "hippie-exp-ext";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hippie-exp-ext";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hippie-expand-slime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hippie-expand-slime";
+        version = "20130907.332";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "hippie-expand-slime";
+          rev = "432de36799fffc920e5bff7a4691f3c67236e59c";
+          sha256 = "1l76r8hzhaapx76f6spm5jmjbrrm5zf79cpd5024xw3hpj1jbkjp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hippie-expand-slime";
+          sha256 = "0kxyv1lpkg33qgfv1jfqx03640py7525bcnc9dk98w6y6y92zf4m";
+          name = "hippie-expand-slime";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hippie-expand-slime";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hippie-namespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hippie-namespace";
+        version = "20140508.1541";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "hippie-namespace";
+          rev = "d0d0f15c67ab8bef5e9d1e29a89ecd3613a60b49";
+          sha256 = "0b5wrid428s11afc48d6mdifmd31gmzyrj9zcpd3jwk63ydiihdc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hippie-namespace";
+          sha256 = "1bzjhq116ci9c9f0aw121fn3drmg2pw5ny1w6wcasa4p30syxxf0";
+          name = "hippie-namespace";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hippie-namespace";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hipster-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hipster-theme";
+        version = "20141205.2205";
+        src = fetchFromGitHub {
+          owner = "xzerocode";
+          repo = "hipster-theme";
+          rev = "0583bcef489c0bbe2393f813c17f634a9487e04f";
+          sha256 = "17dcpwx2y464g8qi3ixlsf3la8dn0bkxax296bhfg4vh73dxccl3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hipster-theme";
+          sha256 = "1xrgpqlzp4lhh5h3sv7pg1nqzc9wcv1hs6ybv2h4x6jangicwfl2";
+          name = "hipster-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hipster-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    history = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "history";
+        version = "20150409.1934";
+        src = fetchFromGitHub {
+          owner = "boyw165";
+          repo = "history";
+          rev = "4bb475513f98ec07db55212a504b6167dae3a646";
+          sha256 = "1dmrg39g0faqqkgrpcbybjbb91vcpkwawxsplckkj92y59zanq3x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/history";
+          sha256 = "0s8pcz53bk1w4h5847204vb6j838vr8za66ni1b2y4pas76zjr5g";
+          name = "history";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/history";
+          license = lib.licenses.free;
+        };
+      }) {};
+    historyf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "historyf";
+        version = "20151123.1959";
+        src = fetchFromGitHub {
+          owner = "k1LoW";
+          repo = "emacs-historyf";
+          rev = "66590519a02816cde8f442032fb144f3c38ebc6e";
+          sha256 = "1y275fchhx0n6dv038hsr44a3bjghqdhc8j1dcpm2rvs8chgm8g0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/historyf";
+          sha256 = "15pcaqfjpkfwcy46yqqw10q8kpw7aamcg0gr4frbdgzbv0yld08s";
+          name = "historyf";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/historyf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hive = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sql ? null }:
+    melpaBuild {
+        pname = "hive";
+        version = "20131217.912";
+        src = fetchFromGitHub {
+          owner = "r0man";
+          repo = "hive-el";
+          rev = "11b5172e081ad8079fc78758bef6f306f82ae32b";
+          sha256 = "097lrj9lgfa7szww324hlqywwkbi31n1pxfqyg0zbfj45djkp9bx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hive";
+          sha256 = "1marz8gmk824hb0nkhaw48d4qw1xjk1aad27gviya7f5ilypxrya";
+          name = "hive";
+        };
+        packageRequires = [ sql ];
+        meta = {
+          homepage = "http://melpa.org/#/hive";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hiwin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hiwin";
+        version = "20150825.327";
+        src = fetchFromGitHub {
+          owner = "yoshida-mediba";
+          repo = "hiwin-mode";
+          rev = "6ee8ed051405653bd9b7332d7e9fbb591d954051";
+          sha256 = "177blksgncxpxd1zi9kmbcfjnpd3ll1szjxiyc4am8a6hs1dyyqk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hiwin";
+          sha256 = "0klhxwxsz7xan2vsknw79r1dj4qhhjbfpddr67mk9qzccp8q0w8g";
+          name = "hiwin";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hiwin";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hl-anything = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hl-anything";
+        version = "20150219.731";
+        src = fetchFromGitHub {
+          owner = "boyw165";
+          repo = "hl-anything";
+          rev = "018da4cdf891529b4769d59c0400b6cf3456b9c4";
+          sha256 = "0889dzrwizpkyh3wms13k8zx27ipsrsxfa4j4yzk4cwk3aicckcr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-anything";
+          sha256 = "15n998nhirvg3f719b7x9s7jpqv6gzkr22kp4zbbq99lbx2wfc1k";
+          name = "hl-anything";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/hl-anything";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hl-defined = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "hl-defined";
+        version = "20151231.1538";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/hl-defined.el";
+          sha256 = "170sz6hjd85cw1x0y2g81ks3x3niib4f7y2xz6k8x0dpw357ggv3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-defined";
+          sha256 = "1y7vbhvpwxz70kja5hfm4i57mdd1cv43m4y9fr978y3nk265p8xx";
+          name = "hl-defined";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hl-defined";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hl-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hl-indent";
+        version = "20141227.1530";
+        src = fetchFromGitHub {
+          owner = "ikirill";
+          repo = "hl-indent";
+          rev = "e749f726ce589e04bb508160e7b290b61fb64d75";
+          sha256 = "17apqs7yqd89mv5283kmwp7byaaimj7j0vis0z1d89jlmp8i6zbc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-indent";
+          sha256 = "1z42kcwcyinjay65mv042ijh4xfaaiyri368g0sjw0fflsg0ikcr";
+          name = "hl-indent";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/hl-indent";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hl-line-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "hl-line-plus";
+        version = "20151231.1539";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/hl-line+.el";
+          sha256 = "1kxq79pfs83gp12p2g093m6shsf25q88mi29bvhapxx77ahmxpkn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-line+";
+          sha256 = "13yv2nmx1wb80z4yifnh6d67rag17wirmp7z8ssq3havjl8lbpix";
+          name = "hl-line-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hl-line+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hl-sentence = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hl-sentence";
+        version = "20140802.1120";
+        src = fetchFromGitHub {
+          owner = "milkypostman";
+          repo = "hl-sentence";
+          rev = "45e3cc525ba636c0f22baa6d0938d9808622bc89";
+          sha256 = "0pjfbm8p077frk475bx8xkygn8r4vdsvnx4rcqbjlpjawj0ndgxs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-sentence";
+          sha256 = "16sjfs0nnpwzj1cqfna9vhmxgznwwhb2qdmjci25hlgrdxwwyahs";
+          name = "hl-sentence";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hl-sentence";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hl-sexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hl-sexp";
+        version = "20101130.643";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "hl-sexp";
+          rev = "0606100422321c18db51ceda80f25cd7717c2e01";
+          sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-sexp";
+          sha256 = "0kg0m20i9ylphf4w0qcvii8yp65abdl2q5flyphilk0jahwbj9jy";
+          name = "hl-sexp";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hl-sexp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hl-spotlight = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "hl-spotlight";
+        version = "20151231.1540";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/hl-spotlight.el";
+          sha256 = "0m84d1rdsp9r5ip79jlrp69pf1daw0ch8c378q3kc328606i3p2d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-spotlight";
+          sha256 = "1166g27fp2pj4j3a8904pzvp5idlq4l22i0w6lbk5c9zh5pqyyf3";
+          name = "hl-spotlight";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hl-spotlight";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hl-todo";
+        version = "20151025.1420";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "hl-todo";
+          rev = "4a5958b90d35c0ba368778274c2a3ab9df941d1c";
+          sha256 = "0lwcvwnkbfpjw92k4qfj57nlhv8xbl614p5dfi8qy76y8bs71cvd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-todo";
+          sha256 = "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4";
+          name = "hl-todo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hl-todo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hlint-refactor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hlint-refactor";
+        version = "20151124.1441";
+        src = fetchFromGitHub {
+          owner = "mpickering";
+          repo = "hlint-refactor-mode";
+          rev = "695d39b3434a5e35fab70aa5251f824ffaa30d6b";
+          sha256 = "02mkfrs55d32948x739f94v35343gw6a0f7fknbcigbz56mzsvsp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hlint-refactor";
+          sha256 = "1311z6y7ycwx0mj67bya7a39j5hiypg72y6yg93dhgpk23wk7frq";
+          name = "hlint-refactor";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hlint-refactor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hlinum = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hlinum";
+        version = "20150621.2133";
+        src = fetchFromGitHub {
+          owner = "tom-tan";
+          repo = "hlinum-mode";
+          rev = "22218c9883a2de6468bf6ad13864b50b44c93592";
+          sha256 = "0yw89kxvz53i9rbq3lsbp5xkgfl1986s23vyra5pipakfv85gmq4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hlinum";
+          sha256 = "04b6m0njr7yrbcbpkhqz4hmqpfacmyca3lw75dyw3vpjpsj2g0iv";
+          name = "hlinum";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/hlinum";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hoa-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hoa-mode";
+        version = "20151203.1050";
+        src = fetchgit {
+          url = "https://gitlab.lrde.epita.fr/spot/emacs-modes.git";
+          rev = "3c608e15b655d2375c5f81323ac561c7848dc029";
+          sha256 = "bf4056192044808554a5dfd537512ec939cbcf628a9becd61736d6409f7e7ce8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hoa-mode";
+          sha256 = "06rfqn7sqvmgpvwhfmk17qqs4q0frfzhm597z3p1q7kys2035kiv";
+          name = "hoa-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hoa-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hoa-pp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
+    melpaBuild {
+        pname = "hoa-pp-mode";
+        version = "20151027.236";
+        src = fetchFromGitHub {
+          owner = "hoaproject";
+          repo = "Contributions-Emacs-Pp";
+          rev = "925b79930a3f4377b0fb2a36b3c6d5566d4b9a8e";
+          sha256 = "0g2r4d0ivbadqw1k8jsv0jwv8krpfahsg0qmzyi909p2yfddqk1l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hoa-pp-mode";
+          sha256 = "01ijfn0hd645j6j88rids5dsanmzwmky37slf50yqffnv69jwvla";
+          name = "hoa-pp-mode";
+        };
+        packageRequires = [ emacs names ];
+        meta = {
+          homepage = "http://melpa.org/#/hoa-pp-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    homebrew-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
+    melpaBuild {
+        pname = "homebrew-mode";
+        version = "20151030.851";
+        src = fetchFromGitHub {
+          owner = "dunn";
+          repo = "homebrew-mode";
+          rev = "767b4934c02c7b4117b6bd6cae8224848bc49db2";
+          sha256 = "1sj8pz48cilk8l6zn47fv1wkv833wrkvrf2mrmbdkvj3lqjrz0b3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/homebrew-mode";
+          sha256 = "088wc5fq4r5yj1nbh7mriyqf0xwqmbxvblj9d2wwrkkdm5flc8mj";
+          name = "homebrew-mode";
+        };
+        packageRequires = [ dash emacs inf-ruby ];
+        meta = {
+          homepage = "http://melpa.org/#/homebrew-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hookify = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "hookify";
+        version = "20141216.1609";
+        src = fetchFromGitHub {
+          owner = "Silex";
+          repo = "hookify";
+          rev = "e76127230716f7fab6662410c03c3872d17a172b";
+          sha256 = "1yvz9d5h7npxhsdf6s9fgxpmqk5ixx91iwivbhzcz935gs2886hc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hookify";
+          sha256 = "0prls539ifk2fsqklcxmbrwmgbm9hya50z486d7sw426lh648qmy";
+          name = "hookify";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/hookify";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hound = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, web }:
+    melpaBuild {
+        pname = "hound";
+        version = "20150217.1149";
+        src = fetchFromGitHub {
+          owner = "ryoung786";
+          repo = "hound.el";
+          rev = "26fb047ff4e4c1fe5b66423cb29a7394b9ace665";
+          sha256 = "1gm5nczq5lsxqkfb38ajffg65zwxkfqvqhk33bwnnd00rpa1ix6j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hound";
+          sha256 = "0qri6bddd3c4sqvaqvmqw6xg46vwlfi1by3gc9i3izpq4xl1cr1v";
+          name = "hound";
+        };
+        packageRequires = [ cl-lib web ];
+        meta = {
+          homepage = "http://melpa.org/#/hound";
+          license = lib.licenses.free;
+        };
+      }) {};
+    how-many-lines-in-project = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "how-many-lines-in-project";
+        version = "20140806.2342";
+        src = fetchFromGitHub {
+          owner = "kaihaosw";
+          repo = "how-many-lines-in-project";
+          rev = "8a37ef885d004fe2ce231bfe05ed4867c6192d9b";
+          sha256 = "0vygbdjy2dv7n50vrkcnqyswq48sgas0zzjfsac8x5g9vhxjkawj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/how-many-lines-in-project";
+          sha256 = "145zmfmsxcbmfh9s0mvxxgfh1d51q66396zc29k1c0hw94ffhkdd";
+          name = "how-many-lines-in-project";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/how-many-lines-in-project";
+          license = lib.licenses.free;
+        };
+      }) {};
+    howdoi = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "howdoi";
+        version = "20150203.1843";
+        src = fetchFromGitHub {
+          owner = "atykhonov";
+          repo = "emacs-howdoi";
+          rev = "5fbf7069ee160c597a328e5ce5fb32920e1ca88f";
+          sha256 = "01sj9c8mxqaif8wh6zz9v2czjaq7vcdi66drldyjmifkln6rg2v8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/howdoi";
+          sha256 = "12vgbypawxhhrnjp8dgh0wrcp7pvjccfaxw4yhq7msai7ik3h83b";
+          name = "howdoi";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/howdoi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ht = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ht";
+        version = "20150830.1315";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "ht.el";
+          rev = "84b5b4404515ed3a3f6a85aacf2723302de851a4";
+          sha256 = "17x5w5kzam8cgaphyasnqzm2yhc0hwm38azvmin7ra4h912vlisd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ht";
+          sha256 = "16vmxksannn2wyn8r44jbkdp19jvz1bg57ggbs1vn0yi7nkanwbd";
+          name = "ht";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ht";
+          license = lib.licenses.free;
+        };
+      }) {};
+    html-check-frag = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "html-check-frag";
+        version = "20160116.214";
+        src = fetchFromGitHub {
+          owner = "TobiasZawada";
+          repo = "html-check-frag";
+          rev = "cc8b099154d5bde23af88f61adb05a80c03d08a8";
+          sha256 = "1nvvd81xsadqfa60h86c61800cn7a1nhp6hw8cyc8dh0bsx1pxx5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/html-check-frag";
+          sha256 = "0drancb9ryifiln44b40l6cal0c7nyp597a6q26288s3v909yk2a";
+          name = "html-check-frag";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/html-check-frag";
+          license = lib.licenses.free;
+        };
+      }) {};
+    html-script-src = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "html-script-src";
+        version = "20120403.1315";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "html-script-src";
+          rev = "66460f8ab1b24656e6f3ce5bd50cff6a81be8422";
+          sha256 = "0k9ga0qi6h33akip2vrpclfp4zljnbw5ax40lxyxc1813hwkdrmh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/html-script-src";
+          sha256 = "1pin1x6g68y75pa3vz2i9h5pmhjamh5rd5ladb1z3flcavsls64j";
+          name = "html-script-src";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/html-script-src";
+          license = lib.licenses.free;
+        };
+      }) {};
+    html-to-markdown = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "html-to-markdown";
+        version = "20151105.240";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "html-to-markdown";
+          rev = "60c5498c801be186478cf7c05be05b4430c4a144";
+          sha256 = "09n3zm9ivln8ng80fv5vwwzh9mj355ni685axda3m85xfxgai8gi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/html-to-markdown";
+          sha256 = "1gjh9ndqsb3nfb7w5h7carjckkgy6qh63b4mg141j19dsyx9rrjv";
+          name = "html-to-markdown";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/html-to-markdown";
+          license = lib.licenses.free;
+        };
+      }) {};
+    htmlize = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "htmlize";
+        version = "20130207.1402";
+        src = fetchgit {
+          url = "http://fly.srk.fer.hr/~hniksic/emacs/htmlize.git";
+          rev = "aa6e2f6dba6fdfa200c7c55efe29ff63380eac8f";
+          sha256 = "8afaf87b30628afd8d376965247a6b2791129339ad7238c5529f4b173f908251";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/htmlize";
+          sha256 = "15pym76iwqb1dqkbmkgc1yar450g2xinfl89fyss2ifyi4am1nxp";
+          name = "htmlize";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/htmlize";
+          license = lib.licenses.free;
+        };
+      }) {};
+    http = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "http";
+        version = "20150716.959";
+        src = fetchFromGitHub {
+          owner = "emacs-pe";
+          repo = "http.el";
+          rev = "3984230ea8b413bc634fb72d097c7f3b8c92b988";
+          sha256 = "0k9ksbpcdx5asjcvnivm8hpkm55qjz348gb8ihx5q5448h89ksrz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/http";
+          sha256 = "1176jhm8m7s1pzp0zv1sqawcgn4m5zvxghypmsrjyyb5p7m6dalm";
+          name = "http";
+        };
+        packageRequires = [ cl-lib emacs request ];
+        meta = {
+          homepage = "http://melpa.org/#/http";
+          license = lib.licenses.free;
+        };
+      }) {};
+    http-post-simple = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "http-post-simple";
+        version = "20131010.2258";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/http-post-simple.el";
+          sha256 = "1wp2rwc1hgd5c3yr6b96yzzakd1qmy5d95mhc6q4f6lx279nx0my";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/http-post-simple";
+          sha256 = "1b2fh0hp5z3712ncgc5ns1f3sww84khkq7zb3k9xclsp1p12a4cf";
+          name = "http-post-simple";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/http-post-simple";
+          license = lib.licenses.free;
+        };
+      }) {};
+    http-twiddle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "http-twiddle";
+        version = "20151121.744";
+        src = fetchFromGitHub {
+          owner = "hassy";
+          repo = "http-twiddle";
+          rev = "bbf025b0f57068fe0fb3f1fbc2f6fd7bf0d65992";
+          sha256 = "008iq5fhsw4qklw2l457a1cfqq8diadpnf1c1di5p07sc0za5562";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/http-twiddle";
+          sha256 = "153qavpcwvk2g15w5a814xjsnsv54xksx4iz6yjffvvzq14a08ry";
+          name = "http-twiddle";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/http-twiddle";
+          license = lib.licenses.free;
+        };
+      }) {};
+    httpcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "httpcode";
+        version = "20121001.2245";
+        src = fetchFromGitHub {
+          owner = "rspivak";
+          repo = "httpcode.el";
+          rev = "a45e735082b09477cd704a99294d336cdbeb12ba";
+          sha256 = "02jz8qwxl69zhwvpmlqc15znr8x4f30paqszmm7xrrrz5x1c1rn4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/httpcode";
+          sha256 = "05k1al1j119x6zf03p7jn2r9qql33859583nbf85k41bhicknpgh";
+          name = "httpcode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/httpcode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    httprepl = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "httprepl";
+        version = "20141101.1234";
+        src = fetchFromGitHub {
+          owner = "gregsexton";
+          repo = "httprepl.el";
+          rev = "cfa3693267a8ed1c96a86a126823f37dbfe077d8";
+          sha256 = "0wd4wmy99mx677x4sdbp57bxxll1fsnnf8hk97r85xdmmjsmrkld";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/httprepl";
+          sha256 = "0899qb1yfnsyf04hhvnk47qnq4d1f4vd5ghj43x4743wd2b9qawh";
+          name = "httprepl";
+        };
+        packageRequires = [ dash emacs s ];
+        meta = {
+          homepage = "http://melpa.org/#/httprepl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hungry-delete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hungry-delete";
+        version = "20151203.1514";
+        src = fetchFromGitHub {
+          owner = "nflath";
+          repo = "hungry-delete";
+          rev = "ed1694ca3bd1fe7d117b0176d417341915ad4f1f";
+          sha256 = "1vy521ljn16a1lcmpj09mr9y0m15lfjhl6xk04sb7nisps3vljyl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hungry-delete";
+          sha256 = "0hcsm3yndkyfqzb77ibx7df6bjppc34x5yabi6nd389pdscp9rpz";
+          name = "hungry-delete";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hungry-delete";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hy-mode";
+        version = "20151025.743";
+        src = fetchFromGitHub {
+          owner = "hylang";
+          repo = "hy-mode";
+          rev = "af0d848b069ca0cda3ed177d37d94de117f7ffec";
+          sha256 = "16z43mpj839bzafhyzpcbw6bmv4ckrf9ryslvg6z6q4g93k64q2m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hy-mode";
+          sha256 = "1vxrqla3p82x7s3kn7x4h33vcdfms21srxgxzidr02k37f0vi82m";
+          name = "hy-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hy-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hyai = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hyai";
+        version = "20151218.610";
+        src = fetchFromGitHub {
+          owner = "iquiw";
+          repo = "hyai";
+          rev = "9c229e6bbccb8481b3889643d02de9869956875c";
+          sha256 = "0d3kdpwzr1gs0q986pkj8b9av9knzbh1ax9ybhn0k66hi55hn7bc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hyai";
+          sha256 = "00ns7q5b11c5amwkq11fs4p5vrmdfmjljfrcxbwb39gc12yrhn7s";
+          name = "hyai";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/hyai";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hydandata-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hydandata-light-theme";
+        version = "20160113.1617";
+        src = fetchFromGitHub {
+          owner = "hydandata";
+          repo = "hydandata-light-theme";
+          rev = "e78f4e106d22ac8ed269d3481eebdc1668ea492f";
+          sha256 = "1wd3fd9mqzg9420p2l7k2j433kb5yjin6hq0ajyy5q5w4a63s64l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hydandata-light-theme";
+          sha256 = "0jw43m91m10ifqg335y6d52r6ri77hcmxkird8wsyrpsnk3cfb60";
+          name = "hydandata-light-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hydandata-light-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hyde = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hyde";
+        version = "20150615.1225";
+        src = fetchFromGitHub {
+          owner = "nibrahim";
+          repo = "Hyde";
+          rev = "640959dd6837487dd4545809d6cc9ef54283673d";
+          sha256 = "14gxbza26ccah8jl0fm7ksvaag0mv3c348bgqjy88dqq2qlwcrav";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hyde";
+          sha256 = "18kjcxm7qmv9bfh4crw37zgax8khjqs9zkp4lrb490zlad2asbs3";
+          name = "hyde";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hyde";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hydra";
+        version = "20151214.617";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "hydra";
+          rev = "7f022f7f1a7833618c1bf4d38a4854d2bae06199";
+          sha256 = "0dp1ablyih2m3q5224xnkwxqm8pgblkdfcwls81r0qsaav7ag3fj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hydra";
+          sha256 = "1c59l43p39ins3dn9690gm6llwm4b9p0pk78lip0dwlx736drdbw";
+          name = "hydra";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/hydra";
+          license = lib.licenses.free;
+        };
+      }) {};
+    i2b2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "i2b2-mode";
+        version = "20140709.2004";
+        src = fetchFromGitHub {
+          owner = "danlamanna";
+          repo = "i2b2-mode";
+          rev = "db10efcfc8bed369a516bbf7526ede41f98cb95a";
+          sha256 = "17k41rah17l9kf7bvlm83x71nzz4aizgn7254cl5sb59mdhcm8pm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/i2b2-mode";
+          sha256 = "172qnprmfliic3rszzg3g7q015i3dchd23skrbdikg0kxj5c57lf";
+          name = "i2b2-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/i2b2-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    iasm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "iasm-mode";
+        version = "20131004.1844";
+        src = fetchFromGitHub {
+          owner = "RAttab";
+          repo = "iasm-mode";
+          rev = "6b404ff94bbfe971b3614007c8e5dcd5757c5727";
+          sha256 = "1gl21li9vqfjvls4ffjw8a4bicas2c7hmaa621k3hpllgpy6qdg5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iasm-mode";
+          sha256 = "09xh41ayaha07fi5crk3c6pn17gwm3samsf6h71ldkywvz74kipv";
+          name = "iasm-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/iasm-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ibuffer-git = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ibuffer-git";
+        version = "20110508.231";
+        src = fetchFromGitHub {
+          owner = "jrockway";
+          repo = "ibuffer-git";
+          rev = "d326319c05ddb8280885b31f9094040c1b365876";
+          sha256 = "1s5qvlf310b0z7q9k1xhcf4qmyfqd37jpqd67ciahaxk7cp224rd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ibuffer-git";
+          sha256 = "048888y07bzmi9x5i43fg6bgqbzdqi3nfjfnn6zr29jvlx366r5z";
+          name = "ibuffer-git";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ibuffer-git";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ibuffer-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+    melpaBuild {
+        pname = "ibuffer-projectile";
+        version = "20150121.1037";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "ibuffer-projectile";
+          rev = "8b225dc779088ce65b81d8d86dc5d394baa53e2e";
+          sha256 = "1zcnp61c9cp2kvns3v499hifk072rxm4rhw4pvdv2mm966vcxzvc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ibuffer-projectile";
+          sha256 = "1qh4krggmsc6lx5mg60n8aakmi3f6ppl1gw094vfcsni96jl34fk";
+          name = "ibuffer-projectile";
+        };
+        packageRequires = [ projectile ];
+        meta = {
+          homepage = "http://melpa.org/#/ibuffer-projectile";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ibuffer-rcirc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ibuffer-rcirc";
+        version = "20150215.1518";
+        src = fetchFromGitHub {
+          owner = "fgallina";
+          repo = "ibuffer-rcirc";
+          rev = "8a4409b1c679d65c819dee4085faf929840e79f8";
+          sha256 = "15lapyj7qkkw1i1g1aizappm7gxkfnxhvd4fq66lghkzb76clz2m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ibuffer-rcirc";
+          sha256 = "1y6pyc6g8j42hs103yynjsdkkxvcq0q4xsz4r93rqwsr3za3wcmc";
+          name = "ibuffer-rcirc";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/ibuffer-rcirc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ibuffer-tramp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ibuffer-tramp";
+        version = "20151118.1139";
+        src = fetchFromGitHub {
+          owner = "svend";
+          repo = "ibuffer-tramp";
+          rev = "41fab2ad174f53a4cf5ef7d2ebef518dede82ab4";
+          sha256 = "1mfrbr725p27p3s5nxh7xhm81pdr78ysz8l3kwrlp97bb6dmljmq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ibuffer-tramp";
+          sha256 = "11a9b9g1jk2r3fldi012zka4jzy68kfn4991xp046qm2fbc7la32";
+          name = "ibuffer-tramp";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ibuffer-tramp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ibuffer-vc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ibuffer-vc";
+        version = "20150714.1520";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "ibuffer-vc";
+          rev = "daae8b8cec4b8e572b065e00c8c8a368fd0a8b8b";
+          sha256 = "0fwxhkx5rkyv3w5vs2swhmly9siahlww2ipsmk7v8xmvk4a63bhp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ibuffer-vc";
+          sha256 = "0bn5qyiq07cgzci10xl57ss5wsk7bfhi3hjq2v6yvpy9v704dvla";
+          name = "ibuffer-vc";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/ibuffer-vc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "icicles";
+        version = "20151231.1715";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/icicles.el";
+          sha256 = "16fsxw7w0l4dxgdi71q2izcki9ykqbjxaffsjh4k0zl7nxyyvv6q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/icicles";
+          sha256 = "15h2511gm38q14avsd86j5mnxhsjvcdmwbnhj66ashj5p5nxhr92";
+          name = "icicles";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/icicles";
+          license = lib.licenses.free;
+        };
+      }) {};
+    icomplete-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "icomplete-plus";
+        version = "20151231.1600";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/icomplete+.el";
+          sha256 = "0z7v4pj0m6pwrjzyzz2xmwf6a53kmka9hxlzd1dxcpzx47pyvz3w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/icomplete+";
+          sha256 = "0gxqkj4bjrxb046qisfz22wvanxx6bzl4hfv91rfwm78q3484slx";
+          name = "icomplete-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/icomplete+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    id-manager = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "id-manager";
+        version = "20150605.2239";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-id-manager";
+          rev = "0d968929bbaff813dd7e098c7f69e0b54434ce09";
+          sha256 = "0bzbp0vgnzvd1m3lhbcrxmknpi0cjisff6jd49f1nvkdx3p2ks40";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/id-manager";
+          sha256 = "13g5fi06hvx0x2wn1d1d8rkfq5n6wbk9g5bhx2b5sar2yw0akmwm";
+          name = "id-manager";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/id-manager";
+          license = lib.licenses.free;
+        };
+      }) {};
+    idea-darkula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "idea-darkula-theme";
+        version = "20160104.1557";
+        src = fetchFromGitHub {
+          owner = "fourier";
+          repo = "idea-darkula-theme";
+          rev = "37854cee8f8714d5d388681158df5771664e6043";
+          sha256 = "0yvrb5a0ajnbvdzzqhhmswm6irlr3xjimpddfyjgdkl5l7d7iln5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/idea-darkula-theme";
+          sha256 = "0lanhwlhd7pbzjc047vd5sgsmi2bx66gr3inr8y57swgrfw3l8sk";
+          name = "idea-darkula-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/idea-darkula-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    identica-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "identica-mode";
+        version = "20130204.1653";
+        src = fetchFromGitHub {
+          owner = "gabrielsaldana";
+          repo = "Emacs-Identica-mode";
+          rev = "cf9183ee11ac922e85c7c908f04e2d00b03111b3";
+          sha256 = "047gzycr49cs8wlmm9j4ry7b7jxmfhmbayx6rbbxs49lba8dgwlk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/identica-mode";
+          sha256 = "1r69ylykjap305g23cry4wajiqhpgw08nw3b5d9i1y3mwx0j253q";
+          name = "identica-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/identica-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    idle-highlight-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "idle-highlight-mode";
+        version = "20120920.1148";
+        src = fetchFromGitHub {
+          owner = "nonsequitur";
+          repo = "idle-highlight-mode";
+          rev = "c466f2a9e291f9da1167dc879577b2e1a7880482";
+          sha256 = "0x4w1ksrw7dicl84zpf4d4scg672dyan9g95jkn6zvri0lr8xciv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/idle-highlight-mode";
+          sha256 = "1i5ky61bq0dpk71yasfpjhsrv29mmp9nly9f5xxin7gz3x0f36fc";
+          name = "idle-highlight-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/idle-highlight-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    idle-require = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "idle-require";
+        version = "20090715.1703";
+        src = fetchFromGitHub {
+          owner = "nschum";
+          repo = "idle-require.el";
+          rev = "33592bb098223b4432d7a35a1d65ab83f47c1ec1";
+          sha256 = "0f8rxvc3dk2hi4x524l18fx73xrxy0qqwbybdma4ca67ck9n6xam";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/idle-require";
+          sha256 = "1lr330bqj4rfh2jgn3562sliani4yw5y4j2hr6cq9cfjjp18qgsj";
+          name = "idle-require";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/idle-require";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-at-point = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-at-point";
+        version = "20151021.257";
+        src = fetchFromGitHub {
+          owner = "katspaugh";
+          repo = "ido-at-point";
+          rev = "e5907bbe8a3d148d07698b76bd994dc3076e16ee";
+          sha256 = "1bii7vj8pmmijcpvq3a1scky4ais7k6d7zympb3m9dmz355m9rpp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-at-point";
+          sha256 = "0jpgq2iiwgqifwdhwhqv0cd3lp846pdqar6rxqgw9fvvb8bijqm0";
+          name = "ido-at-point";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ido-at-point";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-clever-match = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-clever-match";
+        version = "20151011.1226";
+        src = fetchFromGitHub {
+          owner = "Bogdanp";
+          repo = "ido-clever-match";
+          rev = "f173473e99c8b0756f12e4cc8f67e68fa59eadd3";
+          sha256 = "14nmldahr0pj2x4vkzpnpx0bsxafmiihgjylk5j5linqvy8q6wk6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-clever-match";
+          sha256 = "081i6cjvqyfpgj0nvzc94zrl2v3l6nv6mhfda4zf7c8qqbvx1m8m";
+          name = "ido-clever-match";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ido-clever-match";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-complete-space-or-hyphen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-complete-space-or-hyphen";
+        version = "20130228.408";
+        src = fetchFromGitHub {
+          owner = "doitian";
+          repo = "ido-complete-space-or-hyphen";
+          rev = "3fe1fe1e1a743f8deb8f4025977647afecd58f14";
+          sha256 = "1aih8n10lcrw0bdgvlrkxzhkpxpmphw07cvbp6zd27ia25037fzw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-complete-space-or-hyphen";
+          sha256 = "1wk0cq5gjnprmpyvhh80ksz3fash42hckvmx8m95crbzjg9j0gbc";
+          name = "ido-complete-space-or-hyphen";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ido-complete-space-or-hyphen";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-completing-read-plus";
+        version = "20151219.1036";
+        src = fetchFromGitHub {
+          owner = "DarwinAwardWinner";
+          repo = "ido-ubiquitous";
+          rev = "78458a8bc3c3bffae933efb9fd7dfd04c481b3de";
+          sha256 = "0aqx69pvpz4bdhzg3awjpd7xn3h34pygip75dqjwpd6jp350g8r0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-completing-read+";
+          sha256 = "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh";
+          name = "ido-completing-read-plus";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ido-completing-read+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-describe-bindings = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-describe-bindings";
+        version = "20160105.253";
+        src = fetchFromGitHub {
+          owner = "danil";
+          repo = "ido-describe-bindings";
+          rev = "5b2e1c8d685b4d022c8f56f45053a9f2229960ef";
+          sha256 = "1pp8djlyvaly55jshwwzx06mgb78hhaqm0mxbjasc3bg2x3d4y9n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-describe-bindings";
+          sha256 = "1lsa09h025vd908r9q571iq2ia0zdpnq04mlihb3crpp5v9n9ws2";
+          name = "ido-describe-bindings";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/ido-describe-bindings";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-exit-target = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-exit-target";
+        version = "20150904.937";
+        src = fetchFromGitHub {
+          owner = "waymondo";
+          repo = "ido-exit-target";
+          rev = "322520c665284ce6547eb9dcd3aa888a02a51489";
+          sha256 = "1s93q47cadanynvm1y4y08s68yq0l8q8vfasdk7w39vrjsxxsj3x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-exit-target";
+          sha256 = "17vmg47xwk6yjlbcsswirl8s2q565k291ajzjglnz7qg2fwx6spi";
+          name = "ido-exit-target";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ido-exit-target";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-gnus = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-gnus";
+        version = "20140216.1046";
+        src = fetchFromGitHub {
+          owner = "vapniks";
+          repo = "ido-gnus";
+          rev = "f5fe3f6aa8086f675ba216abace9e3d5f2e3a089";
+          sha256 = "0ifdwd5vnjv2iyb5bnz8pij35lc0ymmyx8j8zhpkbgjigz8f05ip";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-gnus";
+          sha256 = "14ijb8q4s846984h102h72ij713v5bj3k2vfdvr94gw1f0iya2yg";
+          name = "ido-gnus";
+        };
+        packageRequires = [ gnus ];
+        meta = {
+          homepage = "http://melpa.org/#/ido-gnus";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-grid-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-grid-mode";
+        version = "20151127.1135";
+        src = fetchFromGitHub {
+          owner = "larkery";
+          repo = "ido-grid-mode.el";
+          rev = "34a7412c30840c1131464781dddfb1602355766b";
+          sha256 = "051rzjxk73h8apkmn4w39bl0pz1c9gna4w3lq7j3a6fiplb0jn23";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-grid-mode";
+          sha256 = "1wl1yclcxmkbfnvp0il23csdf6gprzf7fkcknpivk784fhl19acr";
+          name = "ido-grid-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ido-grid-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-hacks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-hacks";
+        version = "20150331.1409";
+        src = fetchFromGitHub {
+          owner = "scottjad";
+          repo = "ido-hacks";
+          rev = "b7e7514a0e011e4d767d1f5755c5eae9d85f83dc";
+          sha256 = "01p4az128k1jvd9i1gshgg87z6048cw9cnm57l8qdlw01c3h6dkx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-hacks";
+          sha256 = "05f9pdkqppnp7wafka2d2yj84gqchjd7vnrl5rcywy1l47gbxiw0";
+          name = "ido-hacks";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ido-hacks";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-load-library = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, persistent-soft }:
+    melpaBuild {
+        pname = "ido-load-library";
+        version = "20140611.1100";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "ido-load-library";
+          rev = "e03b55957c93aa1a7dd190e173e16ec59dbb2ba7";
+          sha256 = "0l69sr3g1n2x61j6sv6hnbiyk8a2qra6y2kh413qp0sfpx4fzchv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-load-library";
+          sha256 = "13f83gqh39p3yjy7r7qc7kzgdcmqh4b5c07zl7rwzb8y9rz59lhj";
+          name = "ido-load-library";
+        };
+        packageRequires = [ pcache persistent-soft ];
+        meta = {
+          homepage = "http://melpa.org/#/ido-load-library";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-migemo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
+    melpaBuild {
+        pname = "ido-migemo";
+        version = "20150921.1744";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "ido-migemo.el";
+          rev = "e71114a92dd69cb46abf3fb71a09ce27506fcf77";
+          sha256 = "15iajhrgy989pn91ijcd1mq2015bkaacaplm79rmb0ggxhh8vq38";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-migemo";
+          sha256 = "02hbwchwx2bcwdxz7gz555699l7n9wisfikax1j6idn167n4wdpi";
+          name = "ido-migemo";
+        };
+        packageRequires = [ migemo ];
+        meta = {
+          homepage = "http://melpa.org/#/ido-migemo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-occasional = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-occasional";
+        version = "20150214.648";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "ido-occasional";
+          rev = "d405f1795e1e0c63be411ee2825184738d29c33a";
+          sha256 = "0zlkq29wxd3a4vg0w6ds2jad5h1pja7ccd3l6ppl0kz1b1517qlr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-occasional";
+          sha256 = "1vdh5i9qznzd9r148a6jw9v47swf7ykwyciqfzc3ismv5q909bl2";
+          name = "ido-occasional";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ido-occasional";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-occur = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-occur";
+        version = "20160114.1313";
+        src = fetchFromGitHub {
+          owner = "danil";
+          repo = "ido-occur";
+          rev = "247ee110dc085f9f5577aa02241c3ad66164b455";
+          sha256 = "1qvx1v5xrfv1id6lfn767b667m2hn4rsw2nmb61j1i81csdiqjds";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-occur";
+          sha256 = "058l2pklg12wkvyyshk8va6shphpbc508fv9a8x25pw857a28pji";
+          name = "ido-occur";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/ido-occur";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-select-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-select-window";
+        version = "20131220.1447";
+        src = fetchFromGitHub {
+          owner = "pjones";
+          repo = "ido-select-window";
+          rev = "946db3db7a3fec582cc1a0097877f1250303b53a";
+          sha256 = "0qvf3h2ljlbf3z36dhywzza62mfi6mqbrfc0sqfsbyia9bn1df4f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-select-window";
+          sha256 = "03xqfpnagy2sk67yq7n7s6ma3im37d558zzx8sdzd9pbfxy9ij23";
+          name = "ido-select-window";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ido-select-window";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-skk = callPackage ({ ddskk, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-skk";
+        version = "20151111.350";
+        src = fetchFromGitHub {
+          owner = "tsukimizake";
+          repo = "ido-skk";
+          rev = "89a2e62799bff2841ff634517c86084c4ce69246";
+          sha256 = "149cznbybwj0gkjyvpnh4kn258kxw449m7cn95n9jbh1r45vljvy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-skk";
+          sha256 = "1fyzjkw9xp126bzfv1254bvyakh323iw3wdzrkd9gb4ir39k5jzw";
+          name = "ido-skk";
+        };
+        packageRequires = [ ddskk emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ido-skk";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-sort-mtime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-sort-mtime";
+        version = "20131117.730";
+        src = fetchFromGitHub {
+          owner = "pkkm";
+          repo = "ido-sort-mtime";
+          rev = "7b7c77f6856125a59aff99ba0ff8d2b369896b5e";
+          sha256 = "0w3cr2yf8644i0g8w6r147vi9wanibn41sg7dzws51yb9q0y92vd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-sort-mtime";
+          sha256 = "1dkny9y3x49dv1vjwz78x2qhb6kdq3fa8qh1xkm30jyapvgiwdg2";
+          name = "ido-sort-mtime";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ido-sort-mtime";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-springboard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-springboard";
+        version = "20150505.1211";
+        src = fetchFromGitHub {
+          owner = "jwiegley";
+          repo = "springboard";
+          rev = "d12119d9dd2b0b64f0af0ba82c273326c8c12268";
+          sha256 = "14py5amh66jzhqyqjz5pxq0g19vzlmqnrr5wij1ix64xwfr3xdy8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-springboard";
+          sha256 = "04jqnag8jiyfbwvc3vd9ikrsmf6cajld7dz2gz9y0zkj1k4gs7zv";
+          name = "ido-springboard";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ido-springboard";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-ubiquitous";
+        version = "20160115.1826";
+        src = fetchFromGitHub {
+          owner = "DarwinAwardWinner";
+          repo = "ido-ubiquitous";
+          rev = "78458a8bc3c3bffae933efb9fd7dfd04c481b3de";
+          sha256 = "0aqx69pvpz4bdhzg3awjpd7xn3h34pygip75dqjwpd6jp350g8r0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-ubiquitous";
+          sha256 = "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp";
+          name = "ido-ubiquitous";
+        };
+        packageRequires = [ cl-lib emacs ido-completing-read-plus ];
+        meta = {
+          homepage = "http://melpa.org/#/ido-ubiquitous";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-vertical-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-vertical-mode";
+        version = "20151003.2033";
+        src = fetchFromGitHub {
+          owner = "creichert";
+          repo = "ido-vertical-mode.el";
+          rev = "0beaf1eaa8509bece9419b663826665322b22b4c";
+          sha256 = "1vl87phswkciijq0j07lqlgmha5dmff8yd4j4jn7cfrkrdjp6jbx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-vertical-mode";
+          sha256 = "1vg5s6nd6v2g8ychz1q9cdqvsdw6vag7d9w68sn7blpmlr0nqhfm";
+          name = "ido-vertical-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ido-vertical-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-yes-or-no = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-yes-or-no";
+        version = "20140625.2306";
+        src = fetchFromGitHub {
+          owner = "DarwinAwardWinner";
+          repo = "ido-yes-or-no";
+          rev = "a9de5731b64f888be38073773c3d72b19c61ed4f";
+          sha256 = "0zqjmi1pbvpby84g1nsrmwcv7w5k0nl3hmkqj0fvhdsmayxqc6j8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-yes-or-no";
+          sha256 = "0glag4yb9xyf1lxxbdhph2nq6s1vg44i6f2z1ii8bkxpambz2ana";
+          name = "ido-yes-or-no";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ido-yes-or-no";
+          license = lib.licenses.free;
+        };
+      }) {};
+    idomenu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "idomenu";
+        version = "20141123.1520";
+        src = fetchFromGitHub {
+          owner = "birkenfeld";
+          repo = "idomenu";
+          rev = "4b0152d606360c70204fb4c27f68de79ca885386";
+          sha256 = "1vx2g1xgxpcabr49mkl6ggzrpa3k2zhm479j6262vb64swzx33jw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/idomenu";
+          sha256 = "0mg601ak9mhp2fg5n13npcfzphgyms4vkqd18ldmv098z2z1412h";
+          name = "idomenu";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/idomenu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }:
+    melpaBuild {
+        pname = "idris-mode";
+        version = "20151030.607";
+        src = fetchFromGitHub {
+          owner = "idris-hackers";
+          repo = "idris-mode";
+          rev = "f2f0a19f1a23fac618442d7d2187cc3ac5d9e445";
+          sha256 = "16gk7ry4yiaxk9dp6s2m4g79klw344yvr86d7hr0qdjkkf229m56";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/idris-mode";
+          sha256 = "0hiiizz976hz3z3ciwg1gs9y10qhxbs8givhz89kvyn4s4861a1s";
+          name = "idris-mode";
+        };
+        packageRequires = [ cl-lib emacs prop-menu ];
+        meta = {
+          homepage = "http://melpa.org/#/idris-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ids-edit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ids-edit";
+        version = "20151128.635";
+        src = fetchFromGitHub {
+          owner = "kawabata";
+          repo = "ids-edit";
+          rev = "f40495ecd434c6b39d52cadfed25098f08ce78cb";
+          sha256 = "1k7h1795kaczmhd21hzqgns7blqc6zjh2xg4w3rj986ll8lb9fpr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ids-edit";
+          sha256 = "0jzmcynr6lvsr36nblqzrjwxawyqcdz972zsv4rqkihdydpqfz7m";
+          name = "ids-edit";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ids-edit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "iedit";
+        version = "20150915.2222";
+        src = fetchFromGitHub {
+          owner = "victorhge";
+          repo = "iedit";
+          rev = "2d9017daeaeb408568992f5c9cad5df5ca4f1d12";
+          sha256 = "1n2yz6jzbminrviadhd3h42fwvfrdy0v2nw7sk5plkzc8zrs3x25";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iedit";
+          sha256 = "02gjshvkcvyr58yf6vlg3s2pzls5sd54xpxggdmqajfg8xmpkq04";
+          name = "iedit";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/iedit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ietf-docs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ietf-docs";
+        version = "20150928.457";
+        src = fetchFromGitHub {
+          owner = "choppsv1";
+          repo = "ietf-docs";
+          rev = "ede30d6d26044069e1731fd20c0ab2324552c0b4";
+          sha256 = "0b86x675g95yrlc0alffx0z9fmficlwv3gpy5cy86z1xvvyh3nzw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ietf-docs";
+          sha256 = "0wnk36z9g7lksmynd04hb2m6rx45wpxnxj1lhrlpjnzsrknhf4k3";
+          name = "ietf-docs";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ietf-docs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    iflipb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "iflipb";
+        version = "20141123.1516";
+        src = fetchFromGitHub {
+          owner = "jrosdahl";
+          repo = "iflipb";
+          rev = "2e0d1719abeec7982341761ee5dabb01574e6862";
+          sha256 = "18rlyjsn9w0zbs0c002s84qzark3rrcmjn9vq4nap7i6zpaq8hki";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iflipb";
+          sha256 = "1nfrrxgi9nlhn477z8ay7jxycpcghhhmmg9dagdhrlrr20fx697d";
+          name = "iflipb";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/iflipb";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ignoramus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ignoramus";
+        version = "20150216.1542";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "ignoramus";
+          rev = "cab192aa621d1087f2d574b65fffd295c5efb919";
+          sha256 = "161algqrrjbc1ja08416q5wzz34rrg6shr2sim7vba0j3svyggnf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ignoramus";
+          sha256 = "1czqdmlrds1l5afi8ldg7nrxcwav86538z2w1npad3dz8xk67da9";
+          name = "ignoramus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ignoramus";
+          license = lib.licenses.free;
+        };
+      }) {};
+    igrep = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "igrep";
+        version = "20130824.707";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/igrep.el";
+          sha256 = "0qiv69v7ig38iizif7zg8aljdmpa1jk8bsfa0iyhqqqrkvsmhc29";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/igrep";
+          sha256 = "1vyhrziy29q6w8w9vvanb7d29r1n7nfkznbcd62il991n48d08i3";
+          name = "igrep";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/igrep";
+          license = lib.licenses.free;
+        };
+      }) {};
+    igv = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "igv";
+        version = "20141210.627";
+        src = fetchgit {
+          url = "https://bitbucket.org/sbarbit/eigv";
+          rev = "47ac6ceede252f451348a2c696398c0cb5279555";
+          sha256 = "cefc95ead9e5d425d3763f8d63afa10dea416493cafd7144f4d3cdeee0d0fa86";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/igv";
+          sha256 = "01igm3cb0lncmcyy72mjf93byh42k2hvscqhg8r7iljbxm58460z";
+          name = "igv";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/igv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    image-archive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "image-archive";
+        version = "20150219.18";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-image-archive";
+          rev = "ff33f64d09432a8f5bf1714d4cf750c01626fe98";
+          sha256 = "0hacg0549vpgx7yyyc748i44zw5y825w1v7nb440wx7sdxp855nb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/image-archive";
+          sha256 = "0x0lv5dr1gc9bnr3dn26bc9s1ccq2rp8c4a1licbi929f0jyxxfp";
+          name = "image-archive";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/image-archive";
+          license = lib.licenses.free;
+        };
+      }) {};
+    image-dired-plus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "image-dired-plus";
+        version = "20150430.44";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-image-diredx";
+          rev = "b68094625d963056ad64e0e44af0e2266b2eadc7";
+          sha256 = "1n2ya9s0ld257a8iryjd0dz0z2zs1xhzfiwsdkq4l4azwxl54m29";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/image-dired+";
+          sha256 = "0hhwqfn490n7p12n7ij4xbjh15gfvicmn21fvwbnrmfqc343pcdy";
+          name = "image-dired-plus";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/image-dired+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    image-plus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "image-plus";
+        version = "20150707.1116";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-imagex";
+          rev = "6834d0c09bb4df9ecc0d7a559bd7827fed48fffc";
+          sha256 = "0v66wk9nh0raih4jhrzmmyi5lbysjnmbv791vm2230ffi2hmwxnd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/image+";
+          sha256 = "1a9dxswnqn6cvx28180kclpjc0vc6fimzp7n91gpdwnmy123x6hg";
+          name = "image-plus";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/image+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    imakado = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "imakado";
+        version = "20141024.423";
+        src = fetchFromGitHub {
+          owner = "imakado";
+          repo = "emacs-imakado";
+          rev = "00a1e7eea2cb9e9066343a23927d6c747707902f";
+          sha256 = "0f3xdqhq9nprvl8bnmgrx20h08ddkfak0is29bsqwckkfgn7pmqp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imakado";
+          sha256 = "18mj0vpv3dybfpa8hl9jwlagsivbhgqgz8lwb8cswsq9hwv3jgd3";
+          name = "imakado";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/imakado";
+          license = lib.licenses.free;
+        };
+      }) {};
+    imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "imenu-anywhere";
+        version = "20151030.1327";
+        src = fetchFromGitHub {
+          owner = "vitoshka";
+          repo = "imenu-anywhere";
+          rev = "b486c1e80c667504b243a84351cc8751710248e9";
+          sha256 = "1mi45vb3f2ka9xgz5gbgq77nirl4dnrjxkar3d5m3xvax0bicv6i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imenu-anywhere";
+          sha256 = "0p93g7ay9n4nhf1qk24mbax0w9sr06xd2kjmrz00gbg75sr9r2s8";
+          name = "imenu-anywhere";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/imenu-anywhere";
+          license = lib.licenses.free;
+        };
+      }) {};
+    imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "imenu-list";
+        version = "20150911.446";
+        src = fetchFromGitHub {
+          owner = "bmag";
+          repo = "imenu-list";
+          rev = "0c725825ad13fca6b1eea2d28c42ffb172fa6de9";
+          sha256 = "0hlrhnv0n9i1jl20k6hly4py9d98vpqdb9wgzx8573srxqpv541k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imenu-list";
+          sha256 = "092fsn7hnbfabcyakbqyk20pk62sr8xrs45aimkv1l91681np98s";
+          name = "imenu-list";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/imenu-list";
+          license = lib.licenses.free;
+        };
+      }) {};
+    imenu-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "imenu-plus";
+        version = "20151231.1601";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/imenu+.el";
+          sha256 = "00w88d37mg2hdrzpw5cxrgqz5jbf7rylmir95hs8j1cm8fk787bb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imenu+";
+          sha256 = "1v2h3xs5pnv7z5qphkn2y5pa1p8pivrknkw7xihm5yr4a4dqjv5d";
+          name = "imenu-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/imenu+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    imenus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "imenus";
+        version = "20150107.1139";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "imenus.el";
+          rev = "a153eadef49bcc0a2dd5d045c0e003fdfd8c13cd";
+          sha256 = "0wi346m05b18i14xxih4qvwdrfcgv30gdvxjjcn6vd7gr0wdk2ns";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imenus";
+          sha256 = "1q0j6r2n5vjlbgchkz9zdglmmbpd8agawzcg61knqrgzpc4lk82r";
+          name = "imenus";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/imenus";
+          license = lib.licenses.free;
+        };
+      }) {};
+    imgix = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "imgix";
+        version = "20141226.1532";
+        src = fetchFromGitHub {
+          owner = "imgix";
+          repo = "imgix-emacs";
+          rev = "4906ff0b4f7c9e84a5beb81630fe6d522ec91eaa";
+          sha256 = "1q53r3f3x0hpzryxd1v1w3qgs54p384q0azi7xj2gppi1q49sa42";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imgix";
+          sha256 = "0dh7qsz5c9mflldcw60vc8mrxrw76n2ydd7blv6jfmsnr19ila4q";
+          name = "imgix";
+        };
+        packageRequires = [ cl-lib dash ht json s ];
+        meta = {
+          homepage = "http://melpa.org/#/imgix";
+          license = lib.licenses.free;
+        };
+      }) {};
+    imgur = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "imgur";
+        version = "20120307.425";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "imgur.el";
+          rev = "ed952eb8f556c6fc0d982e2a689083504558cffb";
+          sha256 = "0nzgfj083im8lc62ifgsh1pmbw0j9wivimjgih7k6ny3jgw834rs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imgur";
+          sha256 = "0hr2zz7nq65jig2036g5sa8q2lhb42jv40ijikcz8s4f5v3y14i7";
+          name = "imgur";
+        };
+        packageRequires = [ anything ];
+        meta = {
+          homepage = "http://melpa.org/#/imgur";
+          license = lib.licenses.free;
+        };
+      }) {};
+    immutant-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "immutant-server";
+        version = "20140311.1708";
+        src = fetchFromGitHub {
+          owner = "leathekd";
+          repo = "immutant-server.el";
+          rev = "2a21e65588acb6a976f2998e30b21fdabdba4dbb";
+          sha256 = "0rbamm9qvipgswxng8g1d7rbdbcj7sgwrccg7imcfapwwq7xhj4h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/immutant-server";
+          sha256 = "15vcxag1ni41ja4b3q0444sq5ysrisis59la7li6h3617wy8r02i";
+          name = "immutant-server";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/immutant-server";
+          license = lib.licenses.free;
+        };
+      }) {};
+    impatient-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild, simple-httpd }:
+    melpaBuild {
+        pname = "impatient-mode";
+        version = "20150501.447";
+        src = fetchFromGitHub {
+          owner = "netguy204";
+          repo = "imp.el";
+          rev = "eba1efce3dd20b5f5017ab64bae0cfb3b181c2b0";
+          sha256 = "0vr4i3ayp1n8zg3v9rfv81qnr0vrdbkzphwd5kyadjgy4sbfjykj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/impatient-mode";
+          sha256 = "05vp04zh5w0ss959galdrnridv268dzqymqzqfpkfjbg8kryzfxg";
+          name = "impatient-mode";
+        };
+        packageRequires = [ cl-lib htmlize simple-httpd ];
+        meta = {
+          homepage = "http://melpa.org/#/impatient-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "import-js";
+        version = "20160103.1631";
+        src = fetchFromGitHub {
+          owner = "trotzig";
+          repo = "import-js";
+          rev = "e56623506bde5767161d048b63b897a22fd12d41";
+          sha256 = "0psa9jg0m7dkq2v4ybsbqhpbzvq6zvyc59f3rhycqwfpw2an4n64";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/import-js";
+          sha256 = "1grvzy378qj14wlbmhb3j7fx2zkl9wp65b5g0brjimav08nz7bls";
+          name = "import-js";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/import-js";
+          license = lib.licenses.free;
+        };
+      }) {};
+    import-popwin = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }:
+    melpaBuild {
+        pname = "import-popwin";
+        version = "20150716.433";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-import-popwin";
+          rev = "34c3b34ffcadafea71600acb8f4e5ba385e6da19";
+          sha256 = "0ycsdwwfb27g85aby4jix1aj41a4vq6bf541iwla0xh3wsyxb01w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/import-popwin";
+          sha256 = "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy";
+          name = "import-popwin";
+        };
+        packageRequires = [ cl-lib popwin ];
+        meta = {
+          homepage = "http://melpa.org/#/import-popwin";
+          license = lib.licenses.free;
+        };
+      }) {};
+    indent-guide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "indent-guide";
+        version = "20151119.917";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "indent-guide";
+          rev = "0ef4813c538d5afba210681a8e81848b0927d421";
+          sha256 = "1p54w9dwkc76nvc4m0q9a0lh4bdxp4ad1wzscadayqy8qbrylf97";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/indent-guide";
+          sha256 = "029fj9rr9vfmkysi6lzpwra92j6ppw675qpj3sinfq7fqqlicvp7";
+          name = "indent-guide";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/indent-guide";
+          license = lib.licenses.free;
+        };
+      }) {};
+    indicators = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "indicators";
+        version = "20130217.1605";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "indicators.el";
+          rev = "c6d520eb3536cf3a77c635fa36fec031d3f84fe4";
+          sha256 = "1zsw68zzvjjh93cldc0w83k67hzcgi226vz3d0nzqc9sczqk8civ";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/indicators";
+          sha256 = "1rhmz8sfi2gnv72sbw6kgyzidk43mnp05wnscw9vjvz9v0vwirss";
+          name = "indicators";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/indicators";
+          license = lib.licenses.free;
+        };
+      }) {};
+    indy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "indy";
+        version = "20150610.1206";
+        src = fetchFromGitHub {
+          owner = "kwrooijen";
+          repo = "indy";
+          rev = "bc1edbaa6db7264dd64fbd04331406d889b44501";
+          sha256 = "0kv0aj444i2rzksvcfz8sw0yyig3ca3m05agnhw9jzr01y05yl1n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/indy";
+          sha256 = "118n3n07h1vx576fdv6v5a94aa004q0gmy9hlsnrswpxa30ahnw7";
+          name = "indy";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/indy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "inf-clojure";
+        version = "20160117.1257";
+        src = fetchFromGitHub {
+          owner = "clojure-emacs";
+          repo = "inf-clojure";
+          rev = "aa93684c0d88cb72b106ae1cea000f501044d564";
+          sha256 = "18fsd02fw74dgyc7dv6rn51nczwhpr3784hpqp64sz4w5fjvn8d6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inf-clojure";
+          sha256 = "0n8w0vx1dnbfz88j45a57z9bsmkxr2zyh6ld72ady8asanf17zhl";
+          name = "inf-clojure";
+        };
+        packageRequires = [ clojure-mode emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/inf-clojure";
+          license = lib.licenses.free;
+        };
+      }) {};
+    inf-mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "inf-mongo";
+        version = "20131216.428";
+        src = fetchFromGitHub {
+          owner = "tobiassvn";
+          repo = "inf-mongo";
+          rev = "2d910f2143610f12de9c573ee202a322cf579e85";
+          sha256 = "14kf3zvms1w8cbixhpgw3m2xxc2r87i57gmx00jwh89282i6kgsi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inf-mongo";
+          sha256 = "09hf3jmacsk4hl0rxk35cza8vjl0xfmv19dagb8h8fli97fb65hh";
+          name = "inf-mongo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/inf-mongo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    inf-php = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }:
+    melpaBuild {
+        pname = "inf-php";
+        version = "20130414.221";
+        src = fetchFromGitHub {
+          owner = "taksatou";
+          repo = "inf-php";
+          rev = "4396022d6e169f0cf30cd9f68ca575d8b30c418a";
+          sha256 = "1z5ns94xgj2dkv2sc2ckax6bzwdxsm19pkvni24ys2w7d5nhajzr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inf-php";
+          sha256 = "011sc6f0ka7mmik8z0df8qk24mf6ygq22jy781f2ikhjh94gy83d";
+          name = "inf-php";
+        };
+        packageRequires = [ php-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/inf-php";
+          license = lib.licenses.free;
+        };
+      }) {};
+    inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "inf-ruby";
+        version = "20151104.1437";
+        src = fetchFromGitHub {
+          owner = "nonsequitur";
+          repo = "inf-ruby";
+          rev = "24c08fca2a18b76a3a200c79bdb5e41b50e04296";
+          sha256 = "0rg7md4b8chqfh565l9dhsjyiiqrbhm2xcaf88h2zian2rp0p1wh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inf-ruby";
+          sha256 = "02f01vwzr6j9iqcdns4l579bhia99sw8hwdqfwqjs9gk3xampfpp";
+          name = "inf-ruby";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/inf-ruby";
+          license = lib.licenses.free;
+        };
+      }) {};
+    inflections = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "inflections";
+        version = "20121016.357";
+        src = fetchFromGitHub {
+          owner = "eschulte";
+          repo = "jump.el";
+          rev = "56cec33dd98231a95faa26dd4c0612885d923f78";
+          sha256 = "0061hcmj63g13bvacwkmcb5iggwnk27dvb04fz4hihqis6jg01c5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inflections";
+          sha256 = "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70";
+          name = "inflections";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/inflections";
+          license = lib.licenses.free;
+        };
+      }) {};
+    info-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "info-plus";
+        version = "20151231.1603";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/info+.el";
+          sha256 = "068y1p44ynimxfrqgrrhrj4gldf661dr0kbc9p7dqm1mw928hxmm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/info+";
+          sha256 = "0flpmi8dsaalg14xd86xcr087j51899sm8ghsa150ag4g4acfggr";
+          name = "info-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/info+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    inform7-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild, sws-mode }:
+    melpaBuild {
+        pname = "inform7-mode";
+        version = "20131010.154";
+        src = fetchgit {
+          url = "https://github.com/fred-o/inform7-mode.git";
+          rev = "42458733947f2fbd44bc78f7264be247a5d8980b";
+          sha256 = "3c00805529518edba788671fed0c3e56810d1dbec2a0dbd3cb42f42991326ca6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inform7-mode";
+          sha256 = "1kbyl69vwhp1wdivr3ijmj7mghdnjaw7adk8az7bwyzjvpq73171";
+          name = "inform7-mode";
+        };
+        packageRequires = [ sws-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/inform7-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    init-loader = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "init-loader";
+        version = "20141031.133";
+        src = fetchFromGitHub {
+          owner = "emacs-jp";
+          repo = "init-loader";
+          rev = "1f28a0b801cbb08aa9b47fd15ceab243a2bc064c";
+          sha256 = "1zykh80k2sy0as1rn7qaa2hyvkagcvzzmxik4jpb0apw0ha1bf6s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/init-loader";
+          sha256 = "0rq7759abp0ml0l8dycvdl0j5wsxw9z5y9pyx68973a4ssbx2i0r";
+          name = "init-loader";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/init-loader";
+          license = lib.licenses.free;
+        };
+      }) {};
+    init-open-recentf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "init-open-recentf";
+        version = "20151106.2223";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "init-open-recentf.el";
+          rev = "f7999730ed8b02a9f4b9f884defd40a90772765b";
+          sha256 = "0xk7lyhd9pgahbscqwa2qkh2vgnbs5yz78am3zh930k4ig9lbmjh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/init-open-recentf";
+          sha256 = "0xlmfxhxb2car8vfx7krxmxb3d56x0r3zzkj8ds7yqvr65z85x2r";
+          name = "init-open-recentf";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/init-open-recentf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    initsplit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "initsplit";
+        version = "20160113.853";
+        src = fetchFromGitHub {
+          owner = "dabrahams";
+          repo = "initsplit";
+          rev = "5d51986eafb2b5c64f825fba0d1221bd42364c1c";
+          sha256 = "1qvkxpxdv0n9qlzigvi25iw485824pgbpb10lwhh8bs2074dvrgq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/initsplit";
+          sha256 = "0n9dk3x62vgxfn39jkmdg8wxsik0xqkprifgvqzyvn8xcx1blyyq";
+          name = "initsplit";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/initsplit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    inkpot-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "inkpot-theme";
+        version = "20120505.908";
+        src = fetchFromGitHub {
+          owner = "siovan";
+          repo = "emacs24-inkpot";
+          rev = "374a72794ebcb92bd7b50b5578d4c2ffa6049966";
+          sha256 = "063v3a783si5fi8jrnysss60qma1c3whvyb48i10qbrrrx750cmv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inkpot-theme";
+          sha256 = "0w4q74w769n88zb2q7x326cxji42278lf95wnpslgjybnaxycgw7";
+          name = "inkpot-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/inkpot-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    inline-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "inline-crypt";
+        version = "20130409.707";
+        src = fetchFromGitHub {
+          owner = "Sodel-the-Vociferous";
+          repo = "inline-crypt-el";
+          rev = "497ce9dc29a8ccac0b6dd6854f5d120514350282";
+          sha256 = "0jipds844432a8m4d5gxbbkk2h1rsq9fg748g6bxy2q066kyzfz6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inline-crypt";
+          sha256 = "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n";
+          name = "inline-crypt";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/inline-crypt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    inlineR = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "inlineR";
+        version = "20120520.932";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "inlineR.el";
+          rev = "29357186beca825e3d0451b700ec09b9ed65e37b";
+          sha256 = "15nasjknmzy57ilj1gaz3w5sj8b3ijcpgwcd6w2r9xhgcl86m40q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inlineR";
+          sha256 = "1fflq2gkpfn3jkv4a6yywzmxsq6qszfid1ri85ass1ppw6scdvzw";
+          name = "inlineR";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/inlineR";
+          license = lib.licenses.free;
+        };
+      }) {};
+    insert-shebang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "insert-shebang";
+        version = "20141119.627";
+        src = fetchFromGitHub {
+          owner = "psachin";
+          repo = "insert-shebang";
+          rev = "a6e520280b1cb64d70adba2ba38dd9b728960b36";
+          sha256 = "1np3ih2bz9831p97rx5bssq78grjxj7f9241z372l6ggimrqhkbx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/insert-shebang";
+          sha256 = "0z88l1q925v9lwzr6nas9qjy0f57qxilg6smgpx9wj6lll3f7p5v";
+          name = "insert-shebang";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/insert-shebang";
+          license = lib.licenses.free;
+        };
+      }) {};
+    insfactor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "insfactor";
+        version = "20141116.1802";
+        src = fetchFromGitHub {
+          owner = "duelinmarkers";
+          repo = "insfactor.el";
+          rev = "7ef5446cebb08a17d4106d2e6f3c053e49e1e829";
+          sha256 = "112s3c0ii8zjc6vlj2im2qd2pl3hb95pq4zibm86gjpw428wd8iy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/insfactor";
+          sha256 = "0c6q1d864qc78sqk9iadjpd01xc7myipgnf89pqa2z75yprndvyn";
+          name = "insfactor";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/insfactor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    instapaper = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "instapaper";
+        version = "20130104.821";
+        src = fetchhg {
+          url = "https://bitbucket.com/jfm/emacs-instapaper";
+          rev = "8daa0058ede7";
+          sha256 = "0krscid3yz2b7kv75gd9fs92zgfl7pnl77dbp5gycv5rmw5mivp8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/instapaper";
+          sha256 = "1yibdpj3lx6vr33s75s1y415lxqljrk7pqc901f8nfa01kca7axn";
+          name = "instapaper";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/instapaper";
+          license = lib.licenses.free;
+        };
+      }) {};
+    interaction-log = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "interaction-log";
+        version = "20150603.1210";
+        src = fetchFromGitHub {
+          owner = "michael-heerdegen";
+          repo = "interaction-log.el";
+          rev = "977a3d276b73a4e239addc6c30214bc55ac6fd1f";
+          sha256 = "0jdm4xjzpl5dr5s8n2hhd5md6hfl6m6v10nwd1n54pb7bv98aqsl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/interaction-log";
+          sha256 = "1r9qbvgssc2zdwgwmmwv5kapvmg1y3px7268gkiakkfanw3kqk6j";
+          name = "interaction-log";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/interaction-log";
+          license = lib.licenses.free;
+        };
+      }) {};
+    interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "interleave";
+        version = "20151120.835";
+        src = fetchFromGitHub {
+          owner = "rudolfochrist";
+          repo = "interleave";
+          rev = "4b8ce53ee8ca075029ce88d203735256a875e516";
+          sha256 = "13bsszx4rsq3awg6zgzfdwgflkldw38nihkc9nldfixzvw1gdqqv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/interleave";
+          sha256 = "18b3fpxn07y5abkcnaw9is9ihdhik7xjdj6kzl1pz958lk9f4hfy";
+          name = "interleave";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/interleave";
+          license = lib.licenses.free;
+        };
+      }) {};
+    interval-list = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "interval-list";
+        version = "20150327.1218";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "interval-list";
+          rev = "38af7ecf0a493ad8f487074938a2a115f3531177";
+          sha256 = "1zv6m24ryls9hvla3hf8wzp6r7fzbxa1lzr1mb0wz0s292l38wjz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/interval-list";
+          sha256 = "0926z3lxkmpxalpq7hj355cjzbgpdiw7z4s8xdrpa1pi818d35zf";
+          name = "interval-list";
+        };
+        packageRequires = [ cl-lib dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/interval-list";
+          license = lib.licenses.free;
+        };
+      }) {};
+    interval-tree = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "interval-tree";
+        version = "20130325.907";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "interval-tree";
+          rev = "301302f480617091cf3ab6989caac385d52543dc";
+          sha256 = "0fqnn9xhrc9hkaiziafjgg288l6m05416z9kz8l5845fnqsb7pb3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/interval-tree";
+          sha256 = "13zynac3h50x68f1ja72kqdrapjks2zmgqd4g7qwscq92mmh60i9";
+          name = "interval-tree";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/interval-tree";
+          license = lib.licenses.free;
+        };
+      }) {};
+    io-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "io-mode";
+        version = "20140814.521";
+        src = fetchFromGitHub {
+          owner = "superbobry";
+          repo = "io-mode";
+          rev = "79f2de13d8a448892266da26642525747d048aa8";
+          sha256 = "10xpxmbzhmi0lmby2rpmxrbr3qf1vlbif2inmfsvkj85wyh8a7rp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/io-mode";
+          sha256 = "1fpiml7lvbl4s2xw4wk2y10iifvfza24kd9j8qvi1bgd85qkx42q";
+          name = "io-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/io-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    io-mode-inf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "io-mode-inf";
+        version = "20140128.1334";
+        src = fetchFromGitHub {
+          owner = "slackorama";
+          repo = "io-emacs";
+          rev = "6dd2bac3fd87484bb7d97e135b06c29d70b444b6";
+          sha256 = "1ard88kc13c57y9zdkyr012w8rdrwahz8a3fb5v6hwqymg16m20s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/io-mode-inf";
+          sha256 = "0hwhvf1qwkmzzlzdda1flw6p1jjh9rzxsfwm2sc4795ac2xm6dhc";
+          name = "io-mode-inf";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/io-mode-inf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ioccur = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ioccur";
+        version = "20130822.48";
+        src = fetchFromGitHub {
+          owner = "thierryvolpiatto";
+          repo = "ioccur";
+          rev = "4c0ef992a6fcd2aed62e3866d56650463108ab5a";
+          sha256 = "1rz5wf19lg1lnm0h73ynhb0vl3c99k7vpipay2f8jls24pv60bra";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ioccur";
+          sha256 = "1a9iy6x4lkm4wgkcb0pv86c2kvpq8ymrc4ssp109r67kwqw7lrr6";
+          name = "ioccur";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ioccur";
+          license = lib.licenses.free;
+        };
+      }) {};
+    iodine-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "iodine-theme";
+        version = "20151031.1139";
+        src = fetchFromGitHub {
+          owner = "srdja";
+          repo = "iodine-theme";
+          rev = "02fb780e1d8d8a6b9c709bfac399abe1665c6999";
+          sha256 = "14zfxa8fc7h4rkz1hyplwf4q2lga3l5dd7a2xq5kk0kvf2fs4mk3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iodine-theme";
+          sha256 = "05mnq0bgcla0pxsgywpvcdgd4sk2xr7bjlp87l0dx8j121vqripj";
+          name = "iodine-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/iodine-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    iplayer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "iplayer";
+        version = "20150101.455";
+        src = fetchFromGitHub {
+          owner = "csrhodes";
+          repo = "iplayer-el";
+          rev = "48b664e36e1a8e37eeb3eee80b91ff7126ed449a";
+          sha256 = "043dnij48zdyg081sa7y64lm35z7zvrv8gcymv3l3a98r1yhy3v6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iplayer";
+          sha256 = "0wnxvdlnvlmspqsaqx0ldw8j03qjckkqzvx3cbpc2yfs55pm3p7r";
+          name = "iplayer";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/iplayer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ipretty = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ipretty";
+        version = "20140407.20";
+        src = fetchFromGitHub {
+          owner = "steckerhalter";
+          repo = "ipretty";
+          rev = "6f6da8907abea53d6d246d61e1a0f4ebeb0b9f38";
+          sha256 = "0skyd9c7pz68v17aj3h47ralszbmc4gqg552q8jpimcjd1lacc7l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ipretty";
+          sha256 = "1zysip6cb8s4nzsxiwk052gq6higz2xnd376r9wxmgj7w8him2c4";
+          name = "ipretty";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ipretty";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ir-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ir-black-theme";
+        version = "20130303.155";
+        src = fetchFromGitHub {
+          owner = "jmdeldin";
+          repo = "ir-black-theme.el";
+          rev = "36e930d107604b5763c80294a6f92aaa02e6c272";
+          sha256 = "1cy9xwhswj9vahg8zr16r2crm2mm3vczqs73gc580iidasb1q1i2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ir-black-theme";
+          sha256 = "1qpq9zbv63ywzk5mlr8x53g3rn37k0mdv6x1l1hcd90gka7vga9v";
+          name = "ir-black-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ir-black-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    iregister = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "iregister";
+        version = "20150515.1607";
+        src = fetchFromGitHub {
+          owner = "atykhonov";
+          repo = "iregister.el";
+          rev = "6a48c66187289de5f300492be11c83e98410c018";
+          sha256 = "1ch610b3d0x3nxglp749305syliivamc108rgv9if4ihb67gp8b5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iregister";
+          sha256 = "0iq1nlj5czi4nblrszfv3grkl1fni7blh8bhcfccidms8v9r3mdm";
+          name = "iregister";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/iregister";
+          license = lib.licenses.free;
+        };
+      }) {};
+    irfc = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "irfc";
+        version = "20130824.707";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/irfc.el";
+          sha256 = "197ybqwbj8qjh2p9pkf5mvqnrkpcgmv8c5s2gvl6msyrabk0mnca";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/irfc";
+          sha256 = "0186l6zk5l427vjvmjvi0xhwk8a4fjhsvw9kd0yw88q3ggpdl25i";
+          name = "irfc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/irfc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "irony";
+        version = "20160106.1423";
+        src = fetchFromGitHub {
+          owner = "Sarcasm";
+          repo = "irony-mode";
+          rev = "34a3f19c79c65ef52b14699faf9b00dac2d0d4e8";
+          sha256 = "1s6xvn5zmp26rmm57cpmhqrv331v2nrj8f60v065qabqpbsdpyl3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/irony";
+          sha256 = "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a";
+          name = "irony";
+        };
+        packageRequires = [ cl-lib json ];
+        meta = {
+          homepage = "http://melpa.org/#/irony";
+          license = lib.licenses.free;
+        };
+      }) {};
+    irony-eldoc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }:
+    melpaBuild {
+        pname = "irony-eldoc";
+        version = "20141227.19";
+        src = fetchFromGitHub {
+          owner = "ikirill";
+          repo = "irony-eldoc";
+          rev = "bd1fadbc7c806d84aeec098b19238e5328cbbb7b";
+          sha256 = "01fjpfixfcca01a5fnnpd2wga4j30p0kwhbai25prvib4qcp1kqn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/irony-eldoc";
+          sha256 = "03m0h13jd37vfvn4mavaq3vbzx4x0lklbs0mbc29zaz8pwqlcwz6";
+          name = "irony-eldoc";
+        };
+        packageRequires = [ cl-lib emacs irony ];
+        meta = {
+          homepage = "http://melpa.org/#/irony-eldoc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    isearch-dabbrev = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "isearch-dabbrev";
+        version = "20141224.22";
+        src = fetchFromGitHub {
+          owner = "Dewdrops";
+          repo = "isearch-dabbrev";
+          rev = "1efe7abba4923015cbc2462395deaec5446a9cc8";
+          sha256 = "17d0816awadvsw1qc7r0p6ira75jmgxaj9hsk9ypayxsaf6ynyrb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/isearch-dabbrev";
+          sha256 = "1hl7zl5vjcsk3z452874g4nfcnmna8m2242dc9cgpl5jddzwqa7x";
+          name = "isearch-dabbrev";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/isearch-dabbrev";
+          license = lib.licenses.free;
+        };
+      }) {};
+    isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "isearch-plus";
+        version = "20160115.1122";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/isearch+.el";
+          sha256 = "0wgfjl083nz7p5j9gbsq7ki7wpjikb8546iiaydkx5ay3lrcg7nf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/isearch+";
+          sha256 = "1rzlsf08nmc3p3vhpwbiy8cgnnl2c10xrnsr2rlpv0g2kxkrd69r";
+          name = "isearch-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/isearch+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    isearch-prop = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "isearch-prop";
+        version = "20151231.1607";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/isearch-prop.el";
+          sha256 = "1i1ypganr2ivwgi0vgjihgk1s4yglwj8nbqnqjiiwdywf8g5hcmr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/isearch-prop";
+          sha256 = "1z9y88b23m4ffil8p3wcq61q1fiyqjxphyd3wacs5fnc53mdzad9";
+          name = "isearch-prop";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/isearch-prop";
+          license = lib.licenses.free;
+        };
+      }) {};
+    isearch-symbol-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "isearch-symbol-at-point";
+        version = "20130728.1721";
+        src = fetchFromGitHub {
+          owner = "re5et";
+          repo = "isearch-symbol-at-point";
+          rev = "51a1029bec1ec414885f9edb7e5947603dffdab2";
+          sha256 = "09z49850c32x0rchxg203cxg504xi2b6cjgnd0i4axcs5fmq7gv9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/isearch-symbol-at-point";
+          sha256 = "0j5fr7qdvpd5b096h5a83fz8sh9wybdnsgix6v94gv8lkzdsqkr8";
+          name = "isearch-symbol-at-point";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/isearch-symbol-at-point";
+          license = lib.licenses.free;
+        };
+      }) {};
+    isend-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "isend-mode";
+        version = "20130419.458";
+        src = fetchFromGitHub {
+          owner = "ffevotte";
+          repo = "isend-mode.el";
+          rev = "274163f5c42834ce0391fcc8800e169104ad518f";
+          sha256 = "022j39r2vvppnh3p5rp9i4cgc3lg24ksjcmcjmbmna1vf624izn0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/isend-mode";
+          sha256 = "0sk80a08ny9vqw94klqfgii297qm633000wlcldha76ip8viikdv";
+          name = "isend-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/isend-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    isgd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "isgd";
+        version = "20150414.436";
+        src = fetchFromGitHub {
+          owner = "chmouel";
+          repo = "isgd.el";
+          rev = "764306dadd5a9213799081a48aba22f7c75cca9a";
+          sha256 = "09hx28lmldm7z3x22a0qx34id09fdp3z61pdr61flgny213q1ach";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/isgd";
+          sha256 = "0yc9mkjzj3w64f48flnjvd193mk9gndrrqbxz3cvmvq3vgahhzyi";
+          name = "isgd";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/isgd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    iss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "iss-mode";
+        version = "20141001.1413";
+        src = fetchFromGitHub {
+          owner = "rasmus-toftdahl-olesen";
+          repo = "iss-mode";
+          rev = "3b517aff31529bab33f8d7b562bd17aff0107fd1";
+          sha256 = "0992lzgar0kz9i1sk5vz17q9qzfgl8fkyxa1q0hmhgnpjf503cnj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iss-mode";
+          sha256 = "1my4vi1x07hg0dva97i685lx6m6fcbfk16j1zy93zriyd7z5plkc";
+          name = "iss-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/iss-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    itail = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "itail";
+        version = "20151113.1035";
+        src = fetchFromGitHub {
+          owner = "re5et";
+          repo = "itail";
+          rev = "ff80d0456a0039062de1cf73932a5a32d46821b1";
+          sha256 = "1az986mk8j8hyvr1mi9hirixwcd73jcqkjsw4xy34vjbwxi122r9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/itail";
+          sha256 = "0mcyly88a3c15hl3wll56agpdsyvd26r501h0v64lasfr4k634m7";
+          name = "itail";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/itail";
+          license = lib.licenses.free;
+        };
+      }) {};
+    iterator = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "iterator";
+        version = "20150321.2325";
+        src = fetchFromGitHub {
+          owner = "thierryvolpiatto";
+          repo = "iterator";
+          rev = "7bd349d559a6e1c3da575e579a7cb35a7bee9190";
+          sha256 = "08gagq74702x65dy75n2f53fsh806nppnidim9z6ycp8qw1ibyfp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iterator";
+          sha256 = "17q10fw6y0icsv6vv9n968bwmbjlihrpkkyw62d1kfxhs9yw659z";
+          name = "iterator";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/iterator";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ivariants = callPackage ({ emacs, fetchFromGitHub, fetchurl, ivs-edit, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ivariants";
+        version = "20140720.2327";
+        src = fetchFromGitHub {
+          owner = "kawabata";
+          repo = "emacs-ivariants";
+          rev = "f9deff2e6fba5647f69771546fb2283136d0fb0d";
+          sha256 = "12nqpzcmz724wpk8p16lc3z26rxma3wp6pf6dvrsqagnlixrs9si";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ivariants";
+          sha256 = "00fgcm62g4fw4306lw9ld2k7w0c358fcbkxn969k5p009g7pk5bw";
+          name = "ivariants";
+        };
+        packageRequires = [ emacs ivs-edit ];
+        meta = {
+          homepage = "http://melpa.org/#/ivariants";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ivs-edit = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ivs-edit";
+        version = "20140720.546";
+        src = fetchFromGitHub {
+          owner = "kawabata";
+          repo = "ivs-edit";
+          rev = "c496e85f93f6f00e723d9df0ea0703f6c672826b";
+          sha256 = "1926pyfsbr6j7cn3diq8ibs0db94rgsf0aifvbqrqp4grs85pkva";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ivs-edit";
+          sha256 = "0gzhvzrfk17j2vwlg82f5ifk4dcfc1yv7barcij38ckran8cqmb2";
+          name = "ivs-edit";
+        };
+        packageRequires = [ cl-lib dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ivs-edit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ix = callPackage ({ fetchFromGitHub, fetchurl, grapnel, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ix";
+        version = "20131027.1129";
+        src = fetchFromGitHub {
+          owner = "theanalyst";
+          repo = "ix.el";
+          rev = "aea4c54a5cc5a6f26637353c16a3a0e70fc76963";
+          sha256 = "069alh9vs6is3hvbwxbwr9g8qq9md5c92wg5bfswi99yciqdvc4i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ix";
+          sha256 = "1fl76dk8vgw3mrh5iz99lrsllwya6ij9d1lj3szcrs4qnj0b5ql3";
+          name = "ix";
+        };
+        packageRequires = [ grapnel ];
+        meta = {
+          homepage = "http://melpa.org/#/ix";
+          license = lib.licenses.free;
+        };
+      }) {};
+    iy-go-to-char = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "iy-go-to-char";
+        version = "20141029.1049";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/iy-go-to-char.el";
+          sha256 = "19l9d5gp1xj40iyy35r8hh7v6bjnzjx7pb8dvwrmndzg0rlsp7mi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iy-go-to-char";
+          sha256 = "055qj2pc32l824vyjl2w2j8c3rpd9g4x0sazi8svqf923lgcs5s8";
+          name = "iy-go-to-char";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/iy-go-to-char";
+          license = lib.licenses.free;
+        };
+      }) {};
+    j-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "j-mode";
+        version = "20140702.1009";
+        src = fetchFromGitHub {
+          owner = "zellio";
+          repo = "j-mode";
+          rev = "caa55dfaae01d1875380929826952c2b3ef8a653";
+          sha256 = "07kbicf760nw4qlb2lkf1ns8yzqy0r5jqqwqjbsnqxx4sm52hml9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/j-mode";
+          sha256 = "0f9lsr9hjhdvmzx565ivlncfzb4iq4rjjn6a41053cjy50bl066i";
+          name = "j-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/j-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jabber = callPackage ({ fetchgit, fetchurl, fsm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jabber";
+        version = "20151025.1804";
+        src = fetchgit {
+          url = "git://git.code.sf.net/p/emacs-jabber/git";
+          rev = "d5bfa1c62e6474a997e73a836524fdd322c0af44";
+          sha256 = "1a0f7c2154f863dbefc732a2057d0f7416cb4cd5764bdfa01cbf9e221a3abcb3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jabber";
+          sha256 = "1g5pc80n3cd5pzs3hmpbnmxbldwakd72pdn3vvb0h26j9v073pa8";
+          name = "jabber";
+        };
+        packageRequires = [ fsm ];
+        meta = {
+          homepage = "http://melpa.org/#/jabber";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jabber-otr = callPackage ({ emacs, fetchFromGitHub, fetchurl, jabber, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jabber-otr";
+        version = "20150918.644";
+        src = fetchFromGitHub {
+          owner = "legoscia";
+          repo = "emacs-jabber-otr";
+          rev = "2692b1530234e0ba9a0d6c1eaa1cbe8679f193c0";
+          sha256 = "0yv86nadp6dfzl05vhk8c1kahg2pcrhfmd3mnfjrngp7ksac5lyf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jabber-otr";
+          sha256 = "114z5bwhkza03yvfa4nmicaih2jdq83lh6micxjimpddsc8fjgi0";
+          name = "jabber-otr";
+        };
+        packageRequires = [ emacs jabber ];
+        meta = {
+          homepage = "http://melpa.org/#/jabber-otr";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jack-connect = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jack-connect";
+        version = "20141207.607";
+        src = fetchgit {
+          url = "https://bitbucket.org/sbarbit/jack-connect";
+          rev = "b00658dfe3d5d67431c18ffa693d5a3705067ba0";
+          sha256 = "7036a0eddf25a2274a6fd1584ff497d2b8078869fa6cc9d61504e6540ff863a8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jack-connect";
+          sha256 = "1ssl126wihaf8m2f6ms0l5ai6pz5wn348a09k6l0h3jfww032g1q";
+          name = "jack-connect";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jack-connect";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jade-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jade-mode";
+        version = "20150801.1144";
+        src = fetchFromGitHub {
+          owner = "brianc";
+          repo = "jade-mode";
+          rev = "0d0bbf60730d0e33c6362e1fceeaf0e133b1ceeb";
+          sha256 = "1q6wpjb7vhsy92li6fag34pwyil4zvcchbvfjml612aaykiys506";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jade-mode";
+          sha256 = "156j0d9wx6hrhph0nsjsi1jha4h65rcbrbff1j2yr8vdsszjrs94";
+          name = "jade-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jade-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jammer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jammer";
+        version = "20151213.814";
+        src = fetchFromGitHub {
+          owner = "wasamasa";
+          repo = "jammer";
+          rev = "1ba232b71507b468c60dc53c2bc8888bef36c858";
+          sha256 = "0x0vz7m9kn7b2aiqvrdqx8qh84ynbpzy2asz2b18l47bcwa7r5bh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jammer";
+          sha256 = "01c4bii7gswhp6z9dgx4bhvsywiwbbdv7mg1zj6vp1530l74zx6z";
+          name = "jammer";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jammer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    japanese-holidays = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "japanese-holidays";
+        version = "20150208.1937";
+        src = fetchFromGitHub {
+          owner = "emacs-jp";
+          repo = "japanese-holidays";
+          rev = "3c82e33a942e495bbfdf3f40d965dafc87b51336";
+          sha256 = "1mwm9wpnxqq3nw7fl0jf40a92ha51yd95vvr58zllhbxdpy3q9pv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/japanese-holidays";
+          sha256 = "0pxpkikkn2ys0kgf3lbrdxv8iym50h5ik2xzza0qk7cw1v93jza9";
+          name = "japanese-holidays";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/japanese-holidays";
+          license = lib.licenses.free;
+        };
+      }) {};
+    japanlaw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "japanlaw";
+        version = "20150621.2341";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "japanlaw.el";
+          rev = "d90b204b018893d5d75286c92948c0bddf94cce2";
+          sha256 = "08gkxxaw789g1r0dql11skz6i8bdrrz4wp87fzs9f5rgx99xxr6h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/japanlaw";
+          sha256 = "1pxss1mjk5660k80r1xqgslnbrsr6r4apgp9abjwjfxpg4f6d0sa";
+          name = "japanlaw";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/japanlaw";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jape-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jape-mode";
+        version = "20140903.1006";
+        src = fetchFromGitHub {
+          owner = "tanzoniteblack";
+          repo = "jape-mode";
+          rev = "85b9182850707b5d107391f6caee5bd401507a7d";
+          sha256 = "0xmv7gw5xms6nhjcl51cw33yvjgw0c6bpnlyca3195x7g34sg1zj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jape-mode";
+          sha256 = "1gd685r86h0kr36msw81gfgwv7d35hihz6h0jkc6vd22wf6qc3ly";
+          name = "jape-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jape-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jar-manifest-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jar-manifest-mode";
+        version = "20150329.1733";
+        src = fetchFromGitHub {
+          owner = "omajid";
+          repo = "jar-manifest-mode";
+          rev = "200dcf6ec5116b506ae24a83511837adf0acedef";
+          sha256 = "0nydj0y58yhfh16492q5gzkkz7qrxbdhp4gh2xbiykcbynygj2mq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jar-manifest-mode";
+          sha256 = "0kx358m3p23r8m7z45454i62ijmdlf4mljlbqc20jkihfanr6wqd";
+          name = "jar-manifest-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jar-manifest-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jasminejs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jasminejs-mode";
+        version = "20150526.1905";
+        src = fetchFromGitHub {
+          owner = "stoltene2";
+          repo = "jasminejs-mode";
+          rev = "9f8044bf81ab5b4841a30b0bd099916e1b7ff54a";
+          sha256 = "1zcrxijcwqfs6r1cd6w4jq8g3ly0a69nf0cbx93w5v86x2kjpz0l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jasminejs-mode";
+          sha256 = "1a70j3aglrwmaw9g8m99sxad2vs53y4swxh97gqjsgx1rrx03g52";
+          name = "jasminejs-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jasminejs-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jaunte = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jaunte";
+        version = "20130413.419";
+        src = fetchFromGitHub {
+          owner = "kawaguchi";
+          repo = "jaunte.el";
+          rev = "b719c2d4d5d70640d70978b661863d10d6be06fc";
+          sha256 = "1bv0al89wlwdv3bhasxnwhsv84phgnixclgrh4l52385rjn8v53f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jaunte";
+          sha256 = "0chqiai7fv1idga71gc5dw4rdv1rblg5rrbdijh3glyi8yfr4snf";
+          name = "jaunte";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jaunte";
+          license = lib.licenses.free;
+        };
+      }) {};
+    java-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }:
+    melpaBuild {
+        pname = "java-imports";
+        version = "20160105.1833";
+        src = fetchFromGitHub {
+          owner = "dakrone";
+          repo = "emacs-java-imports";
+          rev = "275f354c245df741b45e88d085660722e81a12be";
+          sha256 = "1bngn6v6w60qb3zz7s3px7v3wk99a3hfvzrg9l06dz1q7xgyvsi1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/java-imports";
+          sha256 = "1waz6skyrm1n8wpc0pwa652l11wz8qz1m89mqxk27k3lwyd84n98";
+          name = "java-imports";
+        };
+        packageRequires = [ emacs pcache s ];
+        meta = {
+          homepage = "http://melpa.org/#/java-imports";
+          license = lib.licenses.free;
+        };
+      }) {};
+    java-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "java-snippets";
+        version = "20140728.36";
+        src = fetchFromGitHub {
+          owner = "nekop";
+          repo = "yasnippet-java-mode";
+          rev = "701e84d91d6e8bf53c0088687ee385c1954792d8";
+          sha256 = "09pa1hmk0dyh7vw0lb9awyrvdarakgaxn66gag5fzbg5vgdfz32i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/java-snippets";
+          sha256 = "0bsmp6sc3khdadkmwqy8khz8kzqijcsv70gimm2cs1kwnbyj6pfp";
+          name = "java-snippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/java-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    javadoc-lookup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "javadoc-lookup";
+        version = "20151222.1310";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "javadoc-lookup";
+          rev = "0d5316407c9ec183040ca5c6ab71091b9444276f";
+          sha256 = "0ljpqgp2w3lr61n2vr748n3wyshlqnnbin0643jffa319l99z35r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/javadoc-lookup";
+          sha256 = "1fffs0iqkk9rg5vbxifvn09j4i2751p81bzcvy5fslr3r1r2nv79";
+          name = "javadoc-lookup";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/javadoc-lookup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    javap-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "javap-mode";
+        version = "20120223.1608";
+        src = fetchFromGitHub {
+          owner = "hiredman";
+          repo = "javap-mode";
+          rev = "864c1130e204b2072e1d19cd027b6fce8ebe6629";
+          sha256 = "070r4mg4v937n4h2bmzdbn3vsmmq7ijz69nankqs761jxv5gcwlg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/javap-mode";
+          sha256 = "19p39l4nwgxm52yimy4j6l43845cpk8g5qdrldlwfxd7dvay09ay";
+          name = "javap-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/javap-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jaword = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, tinysegmenter }:
+    melpaBuild {
+        pname = "jaword";
+        version = "20150325.918";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "jaword";
+          rev = "a96bc63a08f616cc23dcc43d565e1f22a94aa9f3";
+          sha256 = "1430xwd86fdlv1gzkdlp9a0x3w4blbplw24z0m7y8b0j9rhl4fka";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jaword";
+          sha256 = "05pzh99zfl8n3p6lxdd9abr52m24hqcb105458i1cy0ra840bf4d";
+          name = "jaword";
+        };
+        packageRequires = [ tinysegmenter ];
+        meta = {
+          homepage = "http://melpa.org/#/jaword";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jazz-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jazz-theme";
+        version = "20150910.1044";
+        src = fetchFromGitHub {
+          owner = "donderom";
+          repo = "jazz-theme";
+          rev = "b9f66600fe33d25a230ed26a69f3abaaca03b453";
+          sha256 = "00havgs6xc44plnr3vbs13xxiwygr93izm6nx4y98zhcv389ajb0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jazz-theme";
+          sha256 = "0ad8kvrmd3gyb8wfghcl4r3kwzplk5gxlw3p23wsbx6c2xq6xr7g";
+          name = "jazz-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jazz-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jbeans-theme";
+        version = "20151217.954";
+        src = fetchFromGitHub {
+          owner = "synic";
+          repo = "jbeans-emacs";
+          rev = "282f4236b11d42b2927f18b4e0b458bf61550867";
+          sha256 = "0yx64jrq1br0aylfn4mm26f71gyyw6kad97kv40sb0ashm3di96h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jbeans-theme";
+          sha256 = "0y7ccycfnpykgzr88968w7dl45qazf8b9zlf7ydw3ghkl4f6lbwl";
+          name = "jbeans-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/jbeans-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jdee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jdee";
+        version = "20160116.1538";
+        src = fetchFromGitHub {
+          owner = "jdee-emacs";
+          repo = "jdee";
+          rev = "54222ea1bccf8bea9757858213fc13f81e3bfd40";
+          sha256 = "1hsx0xfadwwsacs3bad580mns01xyn62j5da0mcmswprxfhc8zx9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jdee";
+          sha256 = "1yn8vszj0hs2jwwd4x55f11hs2wrxjjvxpngsj7lkcwax04kkvq3";
+          name = "jdee";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/jdee";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jedi = callPackage ({ auto-complete, emacs, fetchFromGitHub, fetchurl, jedi-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jedi";
+        version = "20151214.905";
+        src = fetchFromGitHub {
+          owner = "tkf";
+          repo = "emacs-jedi";
+          rev = "8da022c8cda511428c72a6dc4c5be3c0a0c88584";
+          sha256 = "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jedi";
+          sha256 = "1777060q25k9n2g6h1lm5lkki900pmjqkxq72mrk3j19jr4pk9m4";
+          name = "jedi";
+        };
+        packageRequires = [ auto-complete emacs jedi-core ];
+        meta = {
+          homepage = "http://melpa.org/#/jedi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jedi-core = callPackage ({ cl-lib ? null, emacs, epc, fetchFromGitHub, fetchurl, lib, melpaBuild, python-environment }:
+    melpaBuild {
+        pname = "jedi-core";
+        version = "20151214.905";
+        src = fetchFromGitHub {
+          owner = "tkf";
+          repo = "emacs-jedi";
+          rev = "8da022c8cda511428c72a6dc4c5be3c0a0c88584";
+          sha256 = "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jedi-core";
+          sha256 = "0pzi32zdb4g9n4kvpmkdflmqypa7nckmnjq60a3ngym4wlzbb32f";
+          name = "jedi-core";
+        };
+        packageRequires = [ cl-lib emacs epc python-environment ];
+        meta = {
+          homepage = "http://melpa.org/#/jedi-core";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jedi-direx = callPackage ({ direx, fetchFromGitHub, fetchurl, jedi, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jedi-direx";
+        version = "20140310.436";
+        src = fetchFromGitHub {
+          owner = "tkf";
+          repo = "emacs-jedi-direx";
+          rev = "7a2e677400717ed12b959cb5988e7b3fb1c12117";
+          sha256 = "1pgi5vnwz5agrpvy7nwg3gv2nfbbmimhk8dxkg81k6yf1iiqxcap";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jedi-direx";
+          sha256 = "1y4n4c2imnm3f1q129bvbi4gzk0iazd8qq959gvq9j9fl1aziiz1";
+          name = "jedi-direx";
+        };
+        packageRequires = [ direx jedi ];
+        meta = {
+          homepage = "http://melpa.org/#/jedi-direx";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jekyll-modes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, polymode }:
+    melpaBuild {
+        pname = "jekyll-modes";
+        version = "20141117.714";
+        src = fetchFromGitHub {
+          owner = "fred-o";
+          repo = "jekyll-modes";
+          rev = "7cb10b50fd2883e3f7b10fdfd98f19f2f0b2381c";
+          sha256 = "0rx72rid7922mhw21j85kxmx0fhpkmkv9jvxmj9izy01xnjbk00c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jekyll-modes";
+          sha256 = "1305f1yg1mamyw3bkzrk5q3q58ihs8f5k9vjknsww5xvrzz3r1si";
+          name = "jekyll-modes";
+        };
+        packageRequires = [ polymode ];
+        meta = {
+          homepage = "http://melpa.org/#/jekyll-modes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jenkins = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jenkins";
+        version = "20151114.2108";
+        src = fetchFromGitHub {
+          owner = "rmuslimov";
+          repo = "jenkins.el";
+          rev = "5ae8759d4799789337df0fd5e0e7d6f732f59b79";
+          sha256 = "08ywfmsjv3vjqy95hx095kasy8knh3asl7mrlkgmv9wjwnxw45zs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jenkins";
+          sha256 = "0ji42r7p3f3hh643839xf74gb231vr7anycr2xhkga8qy2vwa53s";
+          name = "jenkins";
+        };
+        packageRequires = [ dash emacs json ];
+        meta = {
+          homepage = "http://melpa.org/#/jenkins";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jenkins-watch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jenkins-watch";
+        version = "20121004.1826";
+        src = fetchFromGitHub {
+          owner = "ataylor284";
+          repo = "jenkins-watch";
+          rev = "37b84dfbd98240a57ff798e1ff8bc7dba2913577";
+          sha256 = "0jayhv8j7b527dimhvcs0d7ax25x7v50dk0k6apisqc23psvkq66";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jenkins-watch";
+          sha256 = "0brgjgbw804x0gf2vq01yv6bd0ilp3x9kvr1nnsqxb9c03ffmb2m";
+          name = "jenkins-watch";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jenkins-watch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jg-quicknav = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "jg-quicknav";
+        version = "20150217.2028";
+        src = fetchgit {
+          url = "https://github.com/jeffgran/jg-quicknav";
+          rev = "67293fdbbb0c6afe2528ec6c03dc54eaa59a2c98";
+          sha256 = "a7aa00b03d474549a25faec9ae0394f9d1065c05049268dea507409f84c801a1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jg-quicknav";
+          sha256 = "1v46ck9imffhrmx6s4c3kbi5g5spf2mn2axy5nfpn7q8sc8bf0s3";
+          name = "jg-quicknav";
+        };
+        packageRequires = [ cl-lib s ];
+        meta = {
+          homepage = "http://melpa.org/#/jg-quicknav";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jinja2-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jinja2-mode";
+        version = "20141128.407";
+        src = fetchFromGitHub {
+          owner = "paradoxxxzero";
+          repo = "jinja2-mode";
+          rev = "cfaa7bbe7bb290cc500440124ce89686f3e26f86";
+          sha256 = "0l26wcy496k6xk7q5sf905xir0p73ziy6c44is77854lv3y0z381";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jinja2-mode";
+          sha256 = "0480fh719r4v7xdwyf4jlg1k36y54i5zrv7gxlhfm66pil75zafx";
+          name = "jinja2-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jinja2-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jira = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "jira";
+        version = "20131210.1222";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/jira.el";
+          sha256 = "18b6hdqk59gnqh4ibq8lj59kbsg5gbyfb7vfcvpgmxjikpl3cgkz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jira";
+          sha256 = "0cf5zgkxagvka5v6scgyxqx4mz1n7lxbynn3gl2a4s9s64jycsy6";
+          name = "jira";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jira";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jira-markup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jira-markup-mode";
+        version = "20150601.1609";
+        src = fetchFromGitHub {
+          owner = "mnuessler";
+          repo = "jira-markup-mode";
+          rev = "4fc534c47df26a2f402bf835ebe2ed89474a4062";
+          sha256 = "1ack7dmapva3wc2gm22prd5wd3cmq19sl4xl9f04a3nk2msr6ksx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jira-markup-mode";
+          sha256 = "0f3sw41b4wl0aajq0ap66942rb2015d9iks0ss016jgzashw7zsp";
+          name = "jira-markup-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jira-markup-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jist = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, magit, melpaBuild, pkg-info, request }:
+    melpaBuild {
+        pname = "jist";
+        version = "20151228.1750";
+        src = fetchFromGitHub {
+          owner = "emacs-pe";
+          repo = "jist.el";
+          rev = "b9889524e70c1124e091ef83128211637d57b569";
+          sha256 = "0mh7990zqrprsa1g9jzpqm666pynlqd2nh9z236zyzykf8d8il8c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jist";
+          sha256 = "11m9li1016cfkm4931h69d7g1dc59lwjl83wy3yipswdg3zlw0ar";
+          name = "jist";
+        };
+        packageRequires = [ dash emacs let-alist magit pkg-info request ];
+        meta = {
+          homepage = "http://melpa.org/#/jist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jknav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jknav";
+        version = "20121006.1525";
+        src = fetchFromGitHub {
+          owner = "aculich";
+          repo = "jknav.el";
+          rev = "861245715c728503dad6573278fdd75c271dbf8b";
+          sha256 = "1idby2rjkslw85593qd4zy6an9zz71yzwqc6rck57r54xyfs8mij";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jknav";
+          sha256 = "0c0a8plqrlsw8lhmyj9c1lfkj2b48cjkbw9pna8qcizvwgym9089";
+          name = "jknav";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jknav";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jonprl-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "jonprl-mode";
+        version = "20151203.342";
+        src = fetchFromGitHub {
+          owner = "david-christiansen";
+          repo = "jonprl-mode";
+          rev = "a7c7525ee19682c700f4d1d432b5be5707e94f10";
+          sha256 = "1a0091r1xs3fpvg1wynh53xibdsiaf2khz1gp6s8dc45z8r0bclx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jonprl-mode";
+          sha256 = "0763ad65dmpl2l5lw91mlppfdvrjg6ym45brhi8sdwwri1xnyv9z";
+          name = "jonprl-mode";
+        };
+        packageRequires = [ cl-lib emacs yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/jonprl-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jq-mode";
+        version = "20151030.651";
+        src = fetchFromGitHub {
+          owner = "ljos";
+          repo = "jq-mode";
+          rev = "305ead8f087b1b817291d5f0365e5226199ec58c";
+          sha256 = "014qfzl0qc23pa9w9f3v4yi80jr7nxpd0pz6d615x5mq3zi6l0gp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jq-mode";
+          sha256 = "1xvh641pdkvbppb2nzwn1ljdk7sv6laq29kdv09kxaqd89vm0vin";
+          name = "jq-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/jq-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jquery-doc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jquery-doc";
+        version = "20150812.258";
+        src = fetchFromGitHub {
+          owner = "ananthakumaran";
+          repo = "jquery-doc.el";
+          rev = "24032284919b942ec27707d929bdd8bf48420062";
+          sha256 = "0gh2bgmsbi9lby89ssvl49kpz07jqrfnyg47g6b9xmf5rw42s1z9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jquery-doc";
+          sha256 = "0pyg90izdrb9mvpbz9nx21mp8m3svqjnz1jr8i7wqgfjxsxdklxj";
+          name = "jquery-doc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jquery-doc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nvm }:
+    melpaBuild {
+        pname = "js-comint";
+        version = "20151126.2038";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "js-comint";
+          rev = "6eb9b2be4fc1c43d600ae9d4cfeacee40fba5c73";
+          sha256 = "0hh49j4ngnw7zkp31nm7bckkic3ya3xwzrsz4ksj2ws4fyjkqc9v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js-comint";
+          sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1";
+          name = "js-comint";
+        };
+        packageRequires = [ nvm ];
+        meta = {
+          homepage = "http://melpa.org/#/js-comint";
+          license = lib.licenses.free;
+        };
+      }) {};
+    js-doc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "js-doc";
+        version = "20131215.719";
+        src = fetchFromGitHub {
+          owner = "mooz";
+          repo = "js-doc";
+          rev = "cf9b5292b7fca655bafb87bd55662edcf842d5b6";
+          sha256 = "1d2jy71iw1v7l0jrvszmr3qdls5mak6kjvyvk0n9895z87lhgm8g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js-doc";
+          sha256 = "0nafqgb4kf8jgrb7ijfcvigq8kf043ki89h61izda4hccm3c42pk";
+          name = "js-doc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/js-doc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    js2-closure = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "js2-closure";
+        version = "20141027.1750";
+        src = fetchFromGitHub {
+          owner = "jart";
+          repo = "js2-closure";
+          rev = "8e81e90ee0b923b9d053c339e4b328ecc7693998";
+          sha256 = "0105vx7bc681q9v2x6wj2r63pwp7g0cjjgpg7k4r852zmndfbzsc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js2-closure";
+          sha256 = "19732bf98lk2ah2ssgkr1ngxx7rz3nhsiw84lsfmydb0vvm4fpk7";
+          name = "js2-closure";
+        };
+        packageRequires = [ js2-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/js2-closure";
+          license = lib.licenses.free;
+        };
+      }) {};
+    js2-highlight-vars = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "js2-highlight-vars";
+        version = "20150914.308";
+        src = fetchFromGitHub {
+          owner = "unhammer";
+          repo = "js2-highlight-vars.el";
+          rev = "5857999e6a376810816a0bee71f6d235ffe8911d";
+          sha256 = "1gad5a18m3jfhnklsj0ka3p2wbihh1yvpcn7mwlmm7cjjxcaly9g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js2-highlight-vars";
+          sha256 = "07bq393g2jy8ydvaqyqn6vdyfvyminvgi239yvwzg5g9a1xjc475";
+          name = "js2-highlight-vars";
+        };
+        packageRequires = [ js2-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/js2-highlight-vars";
+          license = lib.licenses.free;
+        };
+      }) {};
+    js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "js2-mode";
+        version = "20160109.348";
+        src = fetchFromGitHub {
+          owner = "mooz";
+          repo = "js2-mode";
+          rev = "b57d129c2f156eda96f7aea004472a7f6d70334a";
+          sha256 = "06lfpj4n5f1g657amyfd8ndr8w94a0bjlp9xic614w0z9a2l3ak6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js2-mode";
+          sha256 = "0f9cj3n55qnlifxwk1yp8n1kfd319jf7qysnkk28xpvglzw24yjv";
+          name = "js2-mode";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/js2-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }:
+    melpaBuild {
+        pname = "js2-refactor";
+        version = "20151029.707";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "js2-refactor.el";
+          rev = "ac3da94a33b714d44d4f0adc670a829fdc522e34";
+          sha256 = "08wxsz90x5zhma3q8kqfd01avhzxjmcrjc95s757l5xaynsc2bly";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js2-refactor";
+          sha256 = "09dcfwpxxyw0ffgjjjaaxbsj0x2nwfrmxy1a05h8ba3r3jl4kl1r";
+          name = "js2-refactor";
+        };
+        packageRequires = [ dash js2-mode multiple-cursors s yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/js2-refactor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    js3-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "js3-mode";
+        version = "20150902.1149";
+        src = fetchFromGitHub {
+          owner = "thomblake";
+          repo = "js3-mode";
+          rev = "d0767afbb4fc8019f9e90e978937036d3bddbc5e";
+          sha256 = "137lypg6jwsisn2g5h0wiqh57icj46zv3albxjf2q1k5isszhy1l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js3-mode";
+          sha256 = "12s5qf6zfcv4m5kqxvh9b4zgwf433x39a210d957gjjp5mywbb1r";
+          name = "js3-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/js3-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jscs = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jscs";
+        version = "20151015.1249";
+        src = fetchFromGitHub {
+          owner = "papaeye";
+          repo = "emacs-jscs";
+          rev = "9d39d0f2355e69a020bf76242504f3a33e013ccf";
+          sha256 = "1bqsv2drhcs8ia7nxss33f80p2mhcl4mr1nalphzw6s1f4mq2sgy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jscs";
+          sha256 = "1yw251f6vpj2bikjw79arywprk8qnmmfcki99mvwnqhsqlv1a8iv";
+          name = "jscs";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/jscs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jsfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jsfmt";
+        version = "20150727.1725";
+        src = fetchFromGitHub {
+          owner = "brettlangdon";
+          repo = "jsfmt.el";
+          rev = "68109120f553fbc651fafb6fc35ed83c3e79f8a6";
+          sha256 = "0h9gx5cl3lashk0n8pv9yzb0mm8dyziddfbwfqfm70638p93ylhc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jsfmt";
+          sha256 = "1syy32sv2d57b3gja0ly65h36mfnyq6hzf5lnnl3r58yvbdzngqd";
+          name = "jsfmt";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jsfmt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    json-mode = callPackage ({ fetchFromGitHub, fetchurl, json-reformat, json-snatcher, lib, melpaBuild }:
+    melpaBuild {
+        pname = "json-mode";
+        version = "20151116.2200";
+        src = fetchFromGitHub {
+          owner = "joshwnj";
+          repo = "json-mode";
+          rev = "ce275e004dc7265047a80dec68b24eb058b200f0";
+          sha256 = "0sxkp9m68rvff8dbr8jlsx85w5ngifn19lwhcydysm7grbwzrdi3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/json-mode";
+          sha256 = "014j10wgxsqy6d6aksnkz2dr5cmpsi8c7v4a825si1vgb4622a70";
+          name = "json-mode";
+        };
+        packageRequires = [ json-reformat json-snatcher ];
+        meta = {
+          homepage = "http://melpa.org/#/json-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    json-reformat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "json-reformat";
+        version = "20151204.1100";
+        src = fetchFromGitHub {
+          owner = "gongo";
+          repo = "json-reformat";
+          rev = "b9bd375ec1deb10d2ba09c409bdcf99c56d7a716";
+          sha256 = "0qp4n2k6s69jj4gwwimkpadjv245y54wk3bxb1x96f034gkp81vs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/json-reformat";
+          sha256 = "1m5p895w9qdgb8f67xykhzriribgmp20a1lvj64iap4aam6wp8na";
+          name = "json-reformat";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/json-reformat";
+          license = lib.licenses.free;
+        };
+      }) {};
+    json-rpc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "json-rpc";
+        version = "20150830.1601";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "elisp-json-rpc";
+          rev = "a83189b126d8d3d7a856008a5b6ad267b2fcc126";
+          sha256 = "0xgrb0zfxyfmfnvx1l7ca99lzl6f2qyal798rcra45167c0j0vbb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/json-rpc";
+          sha256 = "1v1pfmm9g18p6kgn27q1m1bjgwbzvwfm0jbsxp8gdsssaygky71k";
+          name = "json-rpc";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/json-rpc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    json-snatcher = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "json-snatcher";
+        version = "20150511.2247";
+        src = fetchFromGitHub {
+          owner = "Sterlingg";
+          repo = "json-snatcher";
+          rev = "c4cecc0a5051bd364373aa499c47a1bb7a5ac51c";
+          sha256 = "05zsgnk7grgw9jzwl80h5sxfpifxlr37b4mkbvx7mjq4z14xc2jw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/json-snatcher";
+          sha256 = "0f6j9g3c5fz3wlqa88706cbzinrs3dnfpgsr2d3h3117gic4iwp4";
+          name = "json-snatcher";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/json-snatcher";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jss = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, websocket }:
+    melpaBuild {
+        pname = "jss";
+        version = "20130508.923";
+        src = fetchFromGitHub {
+          owner = "segv";
+          repo = "jss";
+          rev = "41749257aecf13c7bd6ed489b5ab3304d06e40bc";
+          sha256 = "07yd7sxb5f2mbm2nva7b2nwyxxkmsi2rdd5qig0bq1b2mf3g5l83";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jss";
+          sha256 = "050hskqcjz5kc8nni255vj3hc9m936w1rybvg5kqyz4p4lpzj00k";
+          name = "jss";
+        };
+        packageRequires = [ emacs js2-mode websocket ];
+        meta = {
+          homepage = "http://melpa.org/#/jss";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jst = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }:
+    melpaBuild {
+        pname = "jst";
+        version = "20150604.638";
+        src = fetchFromGitHub {
+          owner = "cheunghy";
+          repo = "jst-mode";
+          rev = "2a3fd16c992f7790dc67134ef06a814c3d20579c";
+          sha256 = "16jgmabcqrjb3v9c6q711jqn9dna88bmzm4880mdry69ixwcydxy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jst";
+          sha256 = "0hp1f7p6m1gfv1a3plavzkzn87dllb5g2xrgg3mch4qsgdbqx65i";
+          name = "jst";
+        };
+        packageRequires = [ dash emacs f pcache s ];
+        meta = {
+          homepage = "http://melpa.org/#/jst";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jsx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jsx-mode";
+        version = "20130908.1224";
+        src = fetchFromGitHub {
+          owner = "jsx";
+          repo = "jsx-mode.el";
+          rev = "47213429c09259126cddb5742482cfc444c70d50";
+          sha256 = "1g648r0wrd8m5ggl5jrplmj7jmr68bh2ykyii5wv30zfba97r1sh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jsx-mode";
+          sha256 = "1lnjnyn8qf3biqr92z443z6b58dly7glksp1g986vgqzdprq3n1b";
+          name = "jsx-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jsx-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jtags = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "jtags";
+        version = "20160118.828";
+        src = fetchgit {
+          url = "git://git.code.sf.net/p/jtags/code";
+          rev = "1a820caeb0d0b38280346ee75e4aae312bf54799";
+          sha256 = "e71284e30a2d69e5769c414d29870d0d5ef3696fba35944a6844ad157bd57288";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jtags";
+          sha256 = "0in5ybgwmghlpa5d7wz0477ba6n14f1mwp5dxcl4y11f1lsq041r";
+          name = "jtags";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jtags";
+          license = lib.licenses.free;
+        };
+      }) {};
+    julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "julia-mode";
+        version = "20150912.1000";
+        src = fetchFromGitHub {
+          owner = "JuliaLang";
+          repo = "julia";
+          rev = "57beb963d9ba34ef2c40f7caf52e659339e6f258";
+          sha256 = "1s2j7iq3xwvjnrsljryzccca7h5sd6swmzhy4bj7gisymdg0h7lg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/julia-mode";
+          sha256 = "0c5bdgh98hw7484s2is84af7hznd8c4z5vlzfd98s8qxi7bldqjm";
+          name = "julia-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/julia-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    julia-shell = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "julia-shell";
+        version = "20151104.1252";
+        src = fetchFromGitHub {
+          owner = "dennisog";
+          repo = "julia-shell-mode";
+          rev = "3e25a6b2e942dc323512f2530f48cbc8794cfd48";
+          sha256 = "0r4ajn3f1c8n0r831ihvzwyzy94aiv0ijqrwhpq0s85cqvzr7pq8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/julia-shell";
+          sha256 = "0182irlvk6nn71zk4j8xjgcqp4bxi7a2dbj44frrssy6018cd410";
+          name = "julia-shell";
+        };
+        packageRequires = [ julia-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/julia-shell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jumblr = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "jumblr";
+        version = "20140908.1552";
+        src = fetchFromGitHub {
+          owner = "mkmcc";
+          repo = "jumblr";
+          rev = "705c7286e09a307b2b7f60072a12ed45325657c0";
+          sha256 = "1f0kai4cz3r25fqlnryyvnyf80cf57xa655dvv1rx8si3xd20x4j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jumblr";
+          sha256 = "1wnawz1m6x95iyzac453p55h7hlr5q0ry5437aqqx0bw7gdwg3dp";
+          name = "jumblr";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/jumblr";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jump = callPackage ({ fetchFromGitHub, fetchurl, findr, inflections, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jump";
+        version = "20151009.329";
+        src = fetchFromGitHub {
+          owner = "eschulte";
+          repo = "jump.el";
+          rev = "56cec33dd98231a95faa26dd4c0612885d923f78";
+          sha256 = "0061hcmj63g13bvacwkmcb5iggwnk27dvb04fz4hihqis6jg01c5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jump";
+          sha256 = "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364";
+          name = "jump";
+        };
+        packageRequires = [ findr inflections ];
+        meta = {
+          homepage = "http://melpa.org/#/jump";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jump-char = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jump-char";
+        version = "20150108.1435";
+        src = fetchFromGitHub {
+          owner = "lewang";
+          repo = "jump-char";
+          rev = "b6011a1cb501c0242d11103bbee4d9138fcc765f";
+          sha256 = "0vpla6lyr30fyq9gi7g9zmnhysbm077m0qgi7w3axppfbxdvg67q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jump-char";
+          sha256 = "0l8zvfwpngkgcxl1a36jwwxdh23hi390mikz7xrq63w5zwm0007n";
+          name = "jump-char";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jump-char";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jump-to-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jump-to-line";
+        version = "20130122.1053";
+        src = fetchFromGitHub {
+          owner = "ongaeshi";
+          repo = "jump-to-line";
+          rev = "01ef8c3529d85e6c59cc20840acbc4a8e8325bc8";
+          sha256 = "1s9plmg323m1p625xqnks0yqz0zlsjacdj7pv8f783r0d9jmfq3s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jump-to-line";
+          sha256 = "09ifhsggl5mrb6l8nqnl38yph0v26v30y98ic8hl23i455hqkkdr";
+          name = "jump-to-line";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jump-to-line";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jumplist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jumplist";
+        version = "20151119.2145";
+        src = fetchFromGitHub {
+          owner = "ganmacs";
+          repo = "jumplist";
+          rev = "c482d137d95bc5e1bcd790cdbde25b7f729b2502";
+          sha256 = "0ykzvy8034mchq6ffyi7vqnwyrj6gnqqgn39ki81pv97qh8hh8yl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jumplist";
+          sha256 = "06xjg1q8b2fwfhfmdkb76bw2id8pgqc61fmwlgri5746jgdmd7nf";
+          name = "jumplist";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/jumplist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jvm-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jvm-mode";
+        version = "20150422.208";
+        src = fetchFromGitHub {
+          owner = "martintrojer";
+          repo = "jvm-mode.el";
+          rev = "3355dbaf5b0185aadfbad24160399abb32c5bea0";
+          sha256 = "0k91cdjlpil8npc4d3zsgx2gk41crl7qgm9r85khcgxs59kmkniw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jvm-mode";
+          sha256 = "1r283b4s0pzq4hgwcz5cnhlvdvq4gy0x51g3vp0762s8qx969a5w";
+          name = "jvm-mode";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/jvm-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kaesar = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kaesar";
+        version = "20150220.505";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-kaesar";
+          rev = "11ab63b8e6f1c4ebc5a2e54474095754a39104e5";
+          sha256 = "1maab8iaf2wcjj02ibl21jlfzmi9gmcl167cgdlwj50wkig74s23";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kaesar";
+          sha256 = "0zhi1dv1ay1azh7afq4x6bdg91clwpsr13nrzy7539yrn9sglj5l";
+          name = "kaesar";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/kaesar";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kaesar-file = callPackage ({ fetchFromGitHub, fetchurl, kaesar, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kaesar-file";
+        version = "20150130.1004";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-kaesar";
+          rev = "11ab63b8e6f1c4ebc5a2e54474095754a39104e5";
+          sha256 = "1maab8iaf2wcjj02ibl21jlfzmi9gmcl167cgdlwj50wkig74s23";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kaesar-file";
+          sha256 = "0dcizg82maad98mbqqw5lamwz7n2lpai09jsrc66x3wy8k784alc";
+          name = "kaesar-file";
+        };
+        packageRequires = [ kaesar ];
+        meta = {
+          homepage = "http://melpa.org/#/kaesar-file";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kaesar-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, kaesar, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kaesar-mode";
+        version = "20150220.505";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-kaesar";
+          rev = "11ab63b8e6f1c4ebc5a2e54474095754a39104e5";
+          sha256 = "1maab8iaf2wcjj02ibl21jlfzmi9gmcl167cgdlwj50wkig74s23";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kaesar-mode";
+          sha256 = "0yqnlchbpmhsqc8j531n08vybwa32cy0v9sy4f9fgxa90rfqczry";
+          name = "kaesar-mode";
+        };
+        packageRequires = [ cl-lib kaesar ];
+        meta = {
+          homepage = "http://melpa.org/#/kaesar-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kakapo-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kakapo-mode";
+        version = "20150906.2352";
+        src = fetchFromGitHub {
+          owner = "listx";
+          repo = "kakapo-mode";
+          rev = "fe3d579867f7465cd3ad04f29b4b2b3b820edc01";
+          sha256 = "0b6af8hnrn0v4z1xpahjfpw5iga2bmgd3qwfn3is2rygsn5rkm40";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kakapo-mode";
+          sha256 = "0a99cqflpzasl4wcmmf99aj8xgywkym37j7mvnsajrsk5wawdlss";
+          name = "kakapo-mode";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/kakapo-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kanban = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "kanban";
+        version = "20150930.1117";
+        src = fetchhg {
+          url = "https://bitbucket.com/ArneBab/kanban.el";
+          rev = "54d855426372";
+          sha256 = "14g0f51jig8b1y6zfaw7b1cp692lddqzkc0ngf4y89sw9gbmsh3w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kanban";
+          sha256 = "1sif2ayb8fq5vjz9lpkaq40aw9wiciz84yipab2qczszlgw1l1hb";
+          name = "kanban";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/kanban";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kanji-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kanji-mode";
+        version = "20150202.225";
+        src = fetchFromGitHub {
+          owner = "wsgac";
+          repo = "kanji-mode";
+          rev = "3caaee58f00f69a8c9ee2491b8a2050add9df962";
+          sha256 = "0vfagfzhh4rkmvjzfhfcm7w3z1x31aqzxwigk5yw9scnfb77pinz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kanji-mode";
+          sha256 = "0nnkv7lp7ks9qhkbhz15ixm53grc2q0xfspzykxi9c4b59kypcq5";
+          name = "kanji-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/kanji-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    karma = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
+    melpaBuild {
+        pname = "karma";
+        version = "20150120.2358";
+        src = fetchFromGitHub {
+          owner = "tonini";
+          repo = "karma.el";
+          rev = "07d5ba0fd669b909efdf02ffd0c1f45e6136edc4";
+          sha256 = "1xcs15j555cgp2k4k9vl5sy2lrffbk0ma2fv60hlxwirqyw4jcdy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/karma";
+          sha256 = "19wl7js7wmw7jv2q3l4r5zl718lhy2a0jhl79k57ihwhxdc58fwc";
+          name = "karma";
+        };
+        packageRequires = [ emacs pkg-info ];
+        meta = {
+          homepage = "http://melpa.org/#/karma";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kerl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kerl";
+        version = "20150424.1505";
+        src = fetchFromGitHub {
+          owner = "correl";
+          repo = "kerl.el";
+          rev = "1732ee26213f021bf040919c45ad276aafcaae14";
+          sha256 = "1kkzs7nrcr74qn1m456vaj52a9j3ah4biakimz06hls415l56yk9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kerl";
+          sha256 = "0f8n7cm5c432pwj28bcpv2jj5z3br3k164xj6nwfis3dvijwsgss";
+          name = "kerl";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/kerl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    key-chord = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "key-chord";
+        version = "20151209.304";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/key-chord.el";
+          sha256 = "03m44pqggfrd53nh9dvpdjgm0rvca34qxmd30hr33hzprzjambxg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/key-chord";
+          sha256 = "0cr9lx1pvr0qc762nn5pbh8w93dx1hh1zzf806cag2b9pgk6d4an";
+          name = "key-chord";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/key-chord";
+          license = lib.licenses.free;
+        };
+      }) {};
+    key-combo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "key-combo";
+        version = "20150324.939";
+        src = fetchFromGitHub {
+          owner = "uk-ar";
+          repo = "key-combo";
+          rev = "2e220fe3a91c944ce30c4c0297f99d0053b95754";
+          sha256 = "1is7s50lgn77lxxwgakiaywx6jqdfg8045d18m4zn3ilxg6k8ljf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/key-combo";
+          sha256 = "1v8saw92jphvjkyy7j9jx7cxzgisl4zpf4wjzdjfw3la5lz11waf";
+          name = "key-combo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/key-combo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    key-intercept = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "key-intercept";
+        version = "20140211.149";
+        src = fetchFromGitHub {
+          owner = "tarao";
+          repo = "key-intercept-el";
+          rev = "d9a60edb4ce893f2d3d94f242164fdcc62d43cf2";
+          sha256 = "143nfs8pgi5yy3mjq7nirffplk4vb8kik4q7zypynh2pddip30a4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/key-intercept";
+          sha256 = "1z776jbpjks5bir6bd0748mlrmz05nf0jy9l4hlmwgyn72dcbx16";
+          name = "key-intercept";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/key-intercept";
+          license = lib.licenses.free;
+        };
+      }) {};
+    key-leap = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "key-leap";
+        version = "20160109.1437";
+        src = fetchFromGitHub {
+          owner = "MartinRykfors";
+          repo = "key-leap";
+          rev = "62877ecc6b0eadac5185e4b7c3c51b4762263142";
+          sha256 = "14xk0crl25alcckkcg0wx7gwb65hmicfn01db1zip8swk249g9w3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/key-leap";
+          sha256 = "0z1fhpf8g0c4rh3bf8dfmdgyhj5w686kavjr214czaga0x7mwlwj";
+          name = "key-leap";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/key-leap";
+          license = lib.licenses.free;
+        };
+      }) {};
+    key-seq = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }:
+    melpaBuild {
+        pname = "key-seq";
+        version = "20150907.256";
+        src = fetchFromGitHub {
+          owner = "vlevit";
+          repo = "key-seq.el";
+          rev = "e29b083a6427d061638749194fc249ef69ad2cc0";
+          sha256 = "05vpydcgiaya35b62cdjxna9y02vnwzzg6p8jh0dkr9k44h4iy3f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/key-seq";
+          sha256 = "166k6hl9vvsnnksvhrv5cbhv9bdiclnbfv7qf67q4c1an9xzqi74";
+          name = "key-seq";
+        };
+        packageRequires = [ key-chord ];
+        meta = {
+          homepage = "http://melpa.org/#/key-seq";
+          license = lib.licenses.free;
+        };
+      }) {};
+    keychain-environment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "keychain-environment";
+        version = "20150416.1458";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "keychain-environment";
+          rev = "c4c87cf3b3f13c1d73efe8fccf5f2c68ebe04abe";
+          sha256 = "0xm7vybqgglacm0xz6fa7ipfvsx14qqws629gi9i16maxn3by9ci";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keychain-environment";
+          sha256 = "1w77cg00bwx68h0d6k6r1fzwdwz97q12ch2hmpzjnblqs0i4sv8v";
+          name = "keychain-environment";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/keychain-environment";
+          license = lib.licenses.free;
+        };
+      }) {};
+    keydef = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "keydef";
+        version = "20090428.1431";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "keydef";
+          rev = "dff2be9f58d12d8c6a490ad0c1b2b10b55528dc0";
+          sha256 = "0dkc51bmix4b8czs2wg6vz8vk32qlll1b9fjmx6xshrxm85cyhvv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keydef";
+          sha256 = "0yb2vgj7abyg8j7qmv74nsanv50lf350q1m58rjv8wm31yykg992";
+          name = "keydef";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/keydef";
+          license = lib.licenses.free;
+        };
+      }) {};
+    keyfreq = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "keyfreq";
+        version = "20150924.2205";
+        src = fetchFromGitHub {
+          owner = "dacap";
+          repo = "keyfreq";
+          rev = "06cb50b2796688cc76eeb86d48c9826abbee6383";
+          sha256 = "18qiw2324gx5w12pqka9njsysxym8dpglk7dzadg0k1wji73nn6l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keyfreq";
+          sha256 = "1rw6hzmw7h5ngvndy7aa41pq911y2hr9kqc9w4gdd5v2p4ln1qh7";
+          name = "keyfreq";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/keyfreq";
+          license = lib.licenses.free;
+        };
+      }) {};
+    keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "keymap-utils";
+        version = "20151030.526";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "keymap-utils";
+          rev = "f9164e23dbc58c4fdce635138ed59fe2eb285313";
+          sha256 = "18kc48glbwy9njw863fzlrgc4g0a65s5wf2iarfsjqcynad7r4c7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keymap-utils";
+          sha256 = "0nbcwz4nls0pva79lbx91bpzkl38g98yavwkvg2rxbhn9vjbhzs9";
+          name = "keymap-utils";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/keymap-utils";
+          license = lib.licenses.free;
+        };
+      }) {};
+    keyset = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "keyset";
+        version = "20150219.2330";
+        src = fetchFromGitHub {
+          owner = "HKey";
+          repo = "keyset";
+          rev = "0a186c3316fda5baa72ae1fdf50c31e00761cc21";
+          sha256 = "1kkp3frsk644djmdwxq3l1m88690gch3g8pijlzv566xrwkd903j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keyset";
+          sha256 = "1kfw0pfb6qm2ji1v0kb8xgz8q2yd2k9kxmaz5vxcdixdlax3xiqg";
+          name = "keyset";
+        };
+        packageRequires = [ cl-lib dash ];
+        meta = {
+          homepage = "http://melpa.org/#/keyset";
+          license = lib.licenses.free;
+        };
+      }) {};
+    keyword-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "keyword-search";
+        version = "20150911.432";
+        src = fetchFromGitHub {
+          owner = "keyword-search";
+          repo = "keyword-search";
+          rev = "1a01e3d5a43e48701cfab0332876284f5d3a1bba";
+          sha256 = "0zw4klp9ifb6yylr9yab3p3vjv18as6clpg2i3w4r2xah9chxgqq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keyword-search";
+          sha256 = "0wvci1v8pblfbdslfzpi46c149y8pi49kza9jf33jzhj357lp5qa";
+          name = "keyword-search";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/keyword-search";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kfg = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kfg";
+        version = "20140909.38";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "kfg";
+          rev = "d2c9dd26618fb2f7bf1e7b6eae193b1cceba3c97";
+          sha256 = "0xq835xzywks4b4kaz5i0pp759i23kibs5gkvvxasw0dncqh7j5c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kfg";
+          sha256 = "0vvvxl6a4ac27igwmsgzpf0whf9h2pjl9d89fd9fizad6gi8x1fs";
+          name = "kfg";
+        };
+        packageRequires = [ f ];
+        meta = {
+          homepage = "http://melpa.org/#/kfg";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kibit-helper = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "kibit-helper";
+        version = "20150508.1033";
+        src = fetchFromGitHub {
+          owner = "brunchboy";
+          repo = "kibit-helper";
+          rev = "16bdfff785ee05d8e74a5780f6808506d990cef7";
+          sha256 = "0s2hb2lvfmcvm3n1fg4biaafc1p7j7w990d7w15gicaw6rr2j4nr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kibit-helper";
+          sha256 = "15viybjqksylvm5ash2kzsil0cpdka56wj1rryixa8y1bwlj8y4s";
+          name = "kibit-helper";
+        };
+        packageRequires = [ emacs s ];
+        meta = {
+          homepage = "http://melpa.org/#/kibit-helper";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kill-or-bury-alive";
+        version = "20160114.345";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "kill-or-bury-alive";
+          rev = "dde977419d6d56f4be692e6d7fe1374a087e77c7";
+          sha256 = "15ang6bj34hiq605iaw97is85nn5vc6cyxiy0w4h921f7qmjqdd1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kill-or-bury-alive";
+          sha256 = "0mm0m8hpy5v98cap4f0s38dcviirm7s6ra4l94mknyvnx0f73lz8";
+          name = "kill-or-bury-alive";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/kill-or-bury-alive";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kill-ring-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kill-ring-search";
+        version = "20140422.1055";
+        src = fetchFromGitHub {
+          owner = "nschum";
+          repo = "kill-ring-search.el";
+          rev = "23535b4a01a1cb1574604e36c49614e84e85c883";
+          sha256 = "0yrc09k64rv5is4wvss938mkj2pkvbr98lr3ahsi7p0aqn7s444v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kill-ring-search";
+          sha256 = "1pg4j1rrji64rrdv2xpwz33vlyk8r0hz4j4fikzwpbcbmni3skan";
+          name = "kill-ring-search";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/kill-ring-search";
+          license = lib.licenses.free;
+        };
+      }) {};
+    killer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "killer";
+        version = "20120808.622";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "killer";
+          rev = "7bbb223f875402a7b2abee4baa5a54f10bd97212";
+          sha256 = "05rbh5hkj3jsn9pw0qa4d5a5pi6367vdqkijcn9k14fdfbmyd30x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/killer";
+          sha256 = "10z4vqwrpss7mk0gq8xdsbsl0qibpp7s1g0l8wlmrsgn6kjkr2ma";
+          name = "killer";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/killer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kite = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, websocket }:
+    melpaBuild {
+        pname = "kite";
+        version = "20130201.1338";
+        src = fetchFromGitHub {
+          owner = "jscheid";
+          repo = "kite";
+          rev = "7ed74d1147a6ddd152d3da65dc30df3517d53144";
+          sha256 = "1cr4i66lws6yhyxmyx5jw6d5x7i75435mafkkych4nfa0mv4vicd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kite";
+          sha256 = "04x92qcvx428l2cvm2nk9px7r8i159k0ra0haq2sjncjr1ajhg9m";
+          name = "kite";
+        };
+        packageRequires = [ json websocket ];
+        meta = {
+          homepage = "http://melpa.org/#/kite";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kite-mini = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, websocket }:
+    melpaBuild {
+        pname = "kite-mini";
+        version = "20150811.1329";
+        src = fetchFromGitHub {
+          owner = "tungd";
+          repo = "kite-mini.el";
+          rev = "d9eb14593364f7d58eed3f26b45e8aef5b845b20";
+          sha256 = "1m0f1hiczq88qjy573rhlkw2lmjy814cgdl42zxsjbf78wg4qx8d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kite-mini";
+          sha256 = "1g644406zm3db0fjyv704aa8dbd20v1apmysb3mmh2vldbch4iyh";
+          name = "kite-mini";
+        };
+        packageRequires = [ dash websocket ];
+        meta = {
+          homepage = "http://melpa.org/#/kite-mini";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kivy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kivy-mode";
+        version = "20140524.757";
+        src = fetchFromGitHub {
+          owner = "kivy";
+          repo = "kivy";
+          rev = "417fdc3dc5f0c695b016f9b853d8315de609592d";
+          sha256 = "00y1h3zm1rah86g5gl58qwmndmmcyvix2s6r1gmz7vc2rr06w4kj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kivy-mode";
+          sha256 = "02l230rwivr7rbiqm4vg70458z35f9v9w3mdapcrqd5d07y5mvi1";
+          name = "kivy-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/kivy-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kixtart-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kixtart-mode";
+        version = "20150611.1104";
+        src = fetchFromGitHub {
+          owner = "ryrun";
+          repo = "kixtart-mode";
+          rev = "1c2356797e7b766bbaaa2b341176a8b10499cd79";
+          sha256 = "1ld3ccg8q7hmjrj60rxvmmfy4dpm2lvlshjqdf9ifgjzp221g4vb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kixtart-mode";
+          sha256 = "079bw4lgxbmk65rrfyy8givs8j5wsyhpcjjw915ifkg577gj87qp";
+          name = "kixtart-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/kixtart-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    know-your-http-well = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "know-your-http-well";
+        version = "20151220.813";
+        src = fetchFromGitHub {
+          owner = "for-GET";
+          repo = "know-your-http-well";
+          rev = "e208d856ce1b036d2dc1454813c6fc81f0269def";
+          sha256 = "08q43k4450kgygyvqv18gwcmmb7y9x445401048lbixc4cp6p3cg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/know-your-http-well";
+          sha256 = "0k2x0ajxkivim8nfpli716y7f4ssrmvwi56r94y34x4j3ib3px3q";
+          name = "know-your-http-well";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/know-your-http-well";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kolon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kolon-mode";
+        version = "20140122.534";
+        src = fetchFromGitHub {
+          owner = "samvtran";
+          repo = "kolon-mode";
+          rev = "5af0955e280ae991862189ebecd3937c5fc8fb9f";
+          sha256 = "0yr4yxwxgxp5pm9f8gaqlikxp26inv01inq0ya42dzam5yphkafw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kolon-mode";
+          sha256 = "0wcg8ph3mk4zcmzqpvl2w6rfgvrfvhmgwb14y8agh9b7v5d9xwj3";
+          name = "kolon-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/kolon-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kooten-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kooten-theme";
+        version = "20151228.1026";
+        src = fetchFromGitHub {
+          owner = "kootenpv";
+          repo = "emacs-kooten-theme";
+          rev = "d35f58beece81008fa647a4b8a2cb70a3077fc91";
+          sha256 = "1ly55ldf2maf8qfpnsqzn0rbz9cz1f08ak9rr3zijaip3zvlm9q9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kooten-theme";
+          sha256 = "1kkk8nl1xykc4c487icmjrc2xsv8i4s2r5h5gbcpyrk2myqi4179";
+          name = "kooten-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/kooten-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kpm-list = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kpm-list";
+        version = "20130131.348";
+        src = fetchFromGitHub {
+          owner = "KMahoney";
+          repo = "kpm-list";
+          rev = "397912496d42e57c261ff6d33edc8fc029479b8b";
+          sha256 = "1m9hixlclynph2i5q18miq077dyvhx14pfzgawrwj82j1kslz50x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kpm-list";
+          sha256 = "0022bhy1mzngjmjydyqnmlgnhww05v4dxsfav034r8nyyc7677z0";
+          name = "kpm-list";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/kpm-list";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kroman = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kroman";
+        version = "20150827.1840";
+        src = fetchFromGitHub {
+          owner = "cheunghy";
+          repo = "kroman-el";
+          rev = "90402b6ae40383e75d8ba97d66eee93eebf40f70";
+          sha256 = "11axxmhdpwgrcyjz200pf5bqzjw9wz4085r8p1n2vr5gx98374fr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kroman";
+          sha256 = "0y9ji3c8kndrz605n7b4w5xq0qp093d61hxwhblm3qrh3370mws7";
+          name = "kroman";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/kroman";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "kurecolor";
+        version = "20150423.2322";
+        src = fetchFromGitHub {
+          owner = "emacsfodder";
+          repo = "kurecolor";
+          rev = "c8c72cea04e51f57701d2dd9be7dba5f3412e2f3";
+          sha256 = "0da4y9pf6vq0i6w7bmvrszg9bji3ylhr44hmyrmxvah28pigb2fz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kurecolor";
+          sha256 = "0q0q0dfv376h7j3sgwxqwfpxy1qjbvb6i5clsxz9xp4ly89w4d4f";
+          name = "kurecolor";
+        };
+        packageRequires = [ emacs s ];
+        meta = {
+          homepage = "http://melpa.org/#/kurecolor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kv";
+        version = "20140108.934";
+        src = fetchFromGitHub {
+          owner = "nicferrier";
+          repo = "emacs-kv";
+          rev = "721148475bce38a70e0b678ba8aa923652e8900e";
+          sha256 = "0r0lz2s6gvy04fwnafai668jsf4546h4k6zd6isx5wpk0n33pj5m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kv";
+          sha256 = "1vzifi6zpkmsh1a3c2njrw7mpfdgyjvpbz3bj42j8cg3vwjnjznb";
+          name = "kv";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/kv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kwin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kwin";
+        version = "20150308.1312";
+        src = fetchFromGitHub {
+          owner = "reactormonk";
+          repo = "kwin-minor-mode";
+          rev = "d4f8f3593598b71ee596e0a87b2c1d6a912a9566";
+          sha256 = "0irbfgip493hyh45msnb7climgfwr8f05nvc97bzaqggnay88scy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kwin";
+          sha256 = "1pxnyj81py3ygadmyfrqndb0jkk6xlbf0rg3857hsy3ccblzm7ki";
+          name = "kwin";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/kwin";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lacarte = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "lacarte";
+        version = "20151231.1609";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/lacarte.el";
+          sha256 = "01vs0v17l76zwyrblf9c6x0xg5fagd4qv8pr1fwfw7kl64hb9aa2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lacarte";
+          sha256 = "0a0n1lqakgsbz0scn6617rkkkvzwranzlvkzw9q4zapiz1s9xqp9";
+          name = "lacarte";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lacarte";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lang-refactor-perl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lang-refactor-perl";
+        version = "20131122.1527";
+        src = fetchFromGitHub {
+          owner = "jplindstrom";
+          repo = "emacs-lang-refactor-perl";
+          rev = "691bd69639de6b7af357e3b7143563ececd9c497";
+          sha256 = "135k7inkvdz51j7al3nndaamrkyn989vlv1mxcp8lwx8cgq0rqfj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lang-refactor-perl";
+          sha256 = "02fv25d76rvxqzxs48j4lkrifdhqayyb1in05ryyz2pk9x5hbax9";
+          name = "lang-refactor-perl";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lang-refactor-perl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    langdoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "langdoc";
+        version = "20150218.45";
+        src = fetchFromGitHub {
+          owner = "tom-tan";
+          repo = "langdoc";
+          rev = "2c7223bacb116992d700ecb19a60df5c09c63424";
+          sha256 = "0svci7xs4iysv8ysf93g382arip0xpgi0fllw8xx2vrd70sz7lff";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/langdoc";
+          sha256 = "19i6ys58wswl5ckf33swl6lsfzg4znx850br4icik15yrry65yj7";
+          name = "langdoc";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/langdoc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "langtool";
+        version = "20160116.1854";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-langtool";
+          rev = "d014434d5698d927dfdbd0882d974edc3fc6ac66";
+          sha256 = "1rj0j4vxfwss0w6bwh591w5mbyzjg5rkbwyjaphyi6p7wq5w6np1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/langtool";
+          sha256 = "1xq70jyhzg0qmvialy015crbdk9rdibhwpl36khab9hi2999wxyw";
+          name = "langtool";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/langtool";
+          license = lib.licenses.free;
+        };
+      }) {};
+    latest-clojure-libraries = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "latest-clojure-libraries";
+        version = "20140314.817";
+        src = fetchFromGitHub {
+          owner = "AdamClements";
+          repo = "latest-clojure-libraries";
+          rev = "6db8709a746194800a3ffea3f906e3c9f5d4ca22";
+          sha256 = "1cqbdgk3sd0xbw76qrhlild9dvgds3vgldq0rcl200kh7y8l6g4k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/latest-clojure-libraries";
+          sha256 = "1vnm9piq71nx7q1843izm4vydfjq1564ax4ffwmqmlpisqzd6wq5";
+          name = "latest-clojure-libraries";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/latest-clojure-libraries";
+          license = lib.licenses.free;
+        };
+      }) {};
+    latex-extra = callPackage ({ auctex, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "latex-extra";
+        version = "20160103.1607";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "latex-extra";
+          rev = "72fc297ffda2041acb20db2d9daf12276789f3f3";
+          sha256 = "17dp23ggd380fln3g5djs7gwx9z3ixbkn51zfccbh4s5549krl5y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/latex-extra";
+          sha256 = "1w98ngxymafigjpfalybhs12jcf4916wk4nlxflfjcx8ryd9wjcj";
+          name = "latex-extra";
+        };
+        packageRequires = [ auctex cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/latex-extra";
+          license = lib.licenses.free;
+        };
+      }) {};
+    latex-math-preview = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "latex-math-preview";
+        version = "20160104.1858";
+        src = fetchFromGitLab {
+          owner = "latex-math-preview";
+          repo = "latex-math-preview";
+          rev = "c1c87c4c5501f98b97af19f7e3454a2369265edc";
+          sha256 = "118xrgrnwsmsysmframf6bmb0gkrdrm3jbkgivzxs41cw92fhbzw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/latex-math-preview";
+          sha256 = "14bn0q5czrrkb1vjdkwx6f2x4zwjkxgrc0bcncv23l13qls1gkmr";
+          name = "latex-math-preview";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/latex-math-preview";
+          license = lib.licenses.free;
+        };
+      }) {};
+    latex-pretty-symbols = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "latex-pretty-symbols";
+        version = "20151112.444";
+        src = fetchhg {
+          url = "https://bitbucket.com/mortiferus/latex-pretty-symbols.el";
+          rev = "ef4ea64c09ea";
+          sha256 = "0h9hncf2ghfkd3i3342ajj1niykhfr0aais3j6sjg1vkm16xbr3b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/latex-pretty-symbols";
+          sha256 = "1f2s2f64bmsx89a3crm4skhdi4pq9w18z9skxw3i3ydaj15s8jgl";
+          name = "latex-pretty-symbols";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/latex-pretty-symbols";
+          license = lib.licenses.free;
+        };
+      }) {};
+    latex-preview-pane = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "latex-preview-pane";
+        version = "20151023.1503";
+        src = fetchFromGitHub {
+          owner = "jsinglet";
+          repo = "latex-preview-pane";
+          rev = "1a0539ab70eaf5dd31c2c94773dddd6f437fed41";
+          sha256 = "1bvhrh9xfl7p474b8jcczw255d2pjmrz5b60wis0lmmxdljplrfa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/latex-preview-pane";
+          sha256 = "1id1l473azmc9hm5vq5wba8gad9np7sv38x94qd2zkf8b78pzkbw";
+          name = "latex-preview-pane";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/latex-preview-pane";
+          license = lib.licenses.free;
+        };
+      }) {};
+    launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "launch";
+        version = "20130619.1704";
+        src = fetchFromGitHub {
+          owner = "sfllaw";
+          repo = "emacs-launch";
+          rev = "e7c3b573fc05fe4d3d322389079909311542e799";
+          sha256 = "0ciycsqzyj6ld60c7sfqjq59ln3jvk3w9vy606kqzpcvj01ihmv1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/launch";
+          sha256 = "043gwz583pa1wv84fl634p1v86lcsldsw7qkjbm6y678q5mms0m6";
+          name = "launch";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/launch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    launchctl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "launchctl";
+        version = "20150518.809";
+        src = fetchFromGitHub {
+          owner = "pekingduck";
+          repo = "launchctl-el";
+          rev = "73f8f52a5aa9a0be9bdcf68c29ad0fa2b4a115a4";
+          sha256 = "154z7bhb7qagvl3dlgrlsxdg4chz2863ijglg47xs3yhjp5ypanj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/launchctl";
+          sha256 = "07fq445cjpv4ndi7hnjmsrmskm2rlp6ghq0k3bcbjxl21smd9vs9";
+          name = "launchctl";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/launchctl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lavender-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lavender-theme";
+        version = "20141116.102";
+        src = fetchFromGitHub {
+          owner = "emacsfodder";
+          repo = "emacs-lavender-theme";
+          rev = "d9e4d7838167a0e07fb5d04877a7b34c4b4cc1ee";
+          sha256 = "1mg923rs2dk104bcr461dif3mg42r081ii8ipnnr588w7il0xh7k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lavender-theme";
+          sha256 = "1x7mk3dpk44fkzll6xmh2dw270cgb3a9qs3h8bmiq2dw0wrcwcd1";
+          name = "lavender-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/lavender-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ldap-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ldap-mode";
+        version = "20091203.1215";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "ldap-mode";
+          rev = "8761a835e90b990fb5fe70173ecdcd6f4b776cb0";
+          sha256 = "03mv2r6k9syr7bk4vmdafmpa8kz19hv5h68ahj2bmdcmwlvwhkf3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ldap-mode";
+          sha256 = "0lkfpbzsry9jigrx5zp14bkrvqnavnk4y3s0whnbigc4fgpf94rq";
+          name = "ldap-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ldap-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ledger-mode";
+        version = "20160111.2034";
+        src = fetchFromGitHub {
+          owner = "ledger";
+          repo = "ledger";
+          rev = "f612ef0b25a6f679fae47f8371bcd4c25a380b02";
+          sha256 = "011a0l2jx4x687s3mqhhyrgpwxqcjv0cn4alhd55caql6z5cwh5h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ledger-mode";
+          sha256 = "0hi9waxmw1bbg88brlr3816vhdi0jj05wcwvrvfc1agvrvzyqq8s";
+          name = "ledger-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ledger-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    leerzeichen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "leerzeichen";
+        version = "20151106.28";
+        src = fetchFromGitHub {
+          owner = "fgeller";
+          repo = "leerzeichen.el";
+          rev = "e67e59a0e15bc4a41006fdd9822c4b3e6d7da626";
+          sha256 = "0yrrlwmxg1wy65bqyacjpzd5ksljgp41x4zyizl7h0zx9rmqcdvn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/leerzeichen";
+          sha256 = "0h7zpskcgkswr110vckfdbxggz5b3g9grk1j1cbd98pmrpgfqrvp";
+          name = "leerzeichen";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/leerzeichen";
+          license = lib.licenses.free;
+        };
+      }) {};
+    legalese = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "legalese";
+        version = "20100119.1548";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/legalese.el";
+          sha256 = "0vjf2f5kpmgnw7904jsv2wnn6dcv654v7h1v917wmj72sy941xml";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/legalese";
+          sha256 = "0xsf3w5h4g7wigrv5kbys7lf9lfv2cab5ch320p74l3l3r2lj9wz";
+          name = "legalese";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/legalese";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lemon-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lemon-mode";
+        version = "20130216.704";
+        src = fetchFromGitHub {
+          owner = "mooz";
+          repo = "lemon-mode";
+          rev = "155bfced6c9afc8072a0133d3d1baa54c6d67430";
+          sha256 = "0n6jrm5ilm5wzfrh7yjxn3sr5m10hwdm55b179ild32lh4795zj7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lemon-mode";
+          sha256 = "0jdf3556kmv55jh85ljqh2gdx0jl2b8zgvpz9a4kf53xifk3lqz5";
+          name = "lemon-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lemon-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lenlen-theme = callPackage ({ color-theme-solarized, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lenlen-theme";
+        version = "20150307.211";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "lenlen-theme";
+          rev = "05202458fa0a5242e5c6e4451e375f6c16920272";
+          sha256 = "0ab84qiqaz3swiraks8lx0y1kzwylpy9wz2104xgnpwnc5169z65";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lenlen-theme";
+          sha256 = "1bddkcl9kzj3v071qpzmxzjwywqfj5j6cldz240qgp5mx685r0a9";
+          name = "lenlen-theme";
+        };
+        packageRequires = [ color-theme-solarized ];
+        meta = {
+          homepage = "http://melpa.org/#/lenlen-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lentic = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild, s }:
+    melpaBuild {
+        pname = "lentic";
+        version = "20160110.1105";
+        src = fetchFromGitHub {
+          owner = "phillord";
+          repo = "lentic";
+          rev = "8655ecd51e189bbdd6a4d8405dc3ea2e689c709a";
+          sha256 = "04h6vk7w25yp4kzkwqnsmc59bm0182qqkyk5nxm3a1lv1v1590lf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lentic";
+          sha256 = "0y94y1qwj23kqp491b1fzqsrjak96k1dmmzmakbl7q8vc9bncl5m";
+          name = "lentic";
+        };
+        packageRequires = [ dash emacs f m-buffer s ];
+        meta = {
+          homepage = "http://melpa.org/#/lentic";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lentic-server = callPackage ({ fetchFromGitHub, fetchurl, lentic, lib, melpaBuild, web-server }:
+    melpaBuild {
+        pname = "lentic-server";
+        version = "20150320.826";
+        src = fetchFromGitHub {
+          owner = "phillord";
+          repo = "lentic-server";
+          rev = "533e0eadb2dd79c50da7de8fc1d6e6f1e99bd6ff";
+          sha256 = "0c6wkfz6sdcs4aglvx6h3slhma2vbj7idckwzvp8ji6s7p1mavlv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lentic-server";
+          sha256 = "1y9idhf9qcsw3dbdj7rwa7bdrn1q0m3bg3r2jzwdnvkq8aas1w56";
+          name = "lentic-server";
+        };
+        packageRequires = [ lentic web-server ];
+        meta = {
+          homepage = "http://melpa.org/#/lentic-server";
+          license = lib.licenses.free;
+        };
+      }) {};
+    less-css-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "less-css-mode";
+        version = "20150511.519";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "less-css-mode";
+          rev = "d59a3ff4031ae75fbbe77b6cfce7843205394c28";
+          sha256 = "1w6mbk4gc63sh2p9rsy851x2kid0dp2ja4ai5badkr5prxkcpfdn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/less-css-mode";
+          sha256 = "188iplnwwhawq3dby3388kimy0jh1k9r8v9nxz52hy9rhh9hykf8";
+          name = "less-css-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/less-css-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    letcheck = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "letcheck";
+        version = "20150726.1112";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "letcheck";
+          rev = "e85b185993a2eaeec6490709f4c131fde2edd672";
+          sha256 = "1l9qjmyb4a3f6i2iimpmjczbx890cd1p24n941s13sg67xfbm7hn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/letcheck";
+          sha256 = "1sjwi1ldg6b1qvj9cvfwxq3qlkfas6pm8zasf43baljmnz38mxh2";
+          name = "letcheck";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/letcheck";
+          license = lib.licenses.free;
+        };
+      }) {};
+    leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "leuven-theme";
+        version = "20160115.942";
+        src = fetchFromGitHub {
+          owner = "fniessen";
+          repo = "emacs-leuven-theme";
+          rev = "991c573ede413fa416cb365d903d1ddf512ade55";
+          sha256 = "088ijndcyfi5jai8x2pd9cbh7x9r41nbimw20hz71n9izy2xnjl0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/leuven-theme";
+          sha256 = "0pm5majr9cmj6g4zr7vb55ypk9fmfbvxx78mgmgignknbasq9g9a";
+          name = "leuven-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/leuven-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    levenshtein = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "levenshtein";
+        version = "20051013.1256";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/levenshtein.el";
+          sha256 = "0m94z18i1428bispxi285flvjf22kjm33s4sm0ad11m0w0jizir6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/levenshtein";
+          sha256 = "1iypnz0bw3baqxa9gldz8cikxvdhw60pvqp00kq5p3v4x3xcy4z2";
+          name = "levenshtein";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/levenshtein";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lexbind-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lexbind-mode";
+        version = "20141027.929";
+        src = fetchFromGitHub {
+          owner = "spacebat";
+          repo = "lexbind-mode";
+          rev = "fa0a6848c1cfd3fbf45db43dc2deef16377d887d";
+          sha256 = "167ayfl1k8dnajw173hh67nbwbk4frmjc4fzc515q67m9d7m5932";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lexbind-mode";
+          sha256 = "1hs9wg45mwp3fwi827rc4g0gjx4fk87zlibq3id9fcqic8q7nrnl";
+          name = "lexbind-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lexbind-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lfe-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lfe-mode";
+        version = "20151227.2031";
+        src = fetchFromGitHub {
+          owner = "rvirding";
+          repo = "lfe";
+          rev = "f6867fcab654e86e42e1d27d5b68c47597a5ed21";
+          sha256 = "1h0nzdnd698scn4hl6i3j5d0l51vgkf1y9q5prar0rj5n1sjd3vc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lfe-mode";
+          sha256 = "06b382ncgk4zz3q8akyzfy55j86a53r97gf0l92qvlca7fbs8jjx";
+          name = "lfe-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lfe-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lib-requires = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "lib-requires";
+        version = "20151231.1610";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/lib-requires.el";
+          sha256 = "077cy2clllrvabw44wb1pzcqz97r3y92j7cb9lnhd9pix0wpcq6g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lib-requires";
+          sha256 = "1g22jh56z8rnq0h80wj10gs38yig1rk9xmk3kmhmm5mm6b14iwdx";
+          name = "lib-requires";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lib-requires";
+          license = lib.licenses.free;
+        };
+      }) {};
+    libmpdee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "libmpdee";
+        version = "20160117.1701";
+        src = fetchFromGitHub {
+          owner = "andyetitmoves";
+          repo = "libmpdee";
+          rev = "a6ca3b7d6687f3ba60996b9b5044ad1d3b228290";
+          sha256 = "039awlam3nrgkxrarcapfyc2myvc77aw7whrkcsjjybzylpzv0pr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/libmpdee";
+          sha256 = "0z4d8y8jlsjw20b31akkaikh5xl0c05lj77d2i1xbgzam4iixma0";
+          name = "libmpdee";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/libmpdee";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lice";
+        version = "20151225.1222";
+        src = fetchFromGitHub {
+          owner = "buzztaiki";
+          repo = "lice-el";
+          rev = "d8572d997f54f4022f245dcf7c38fef6919a474a";
+          sha256 = "11c3vmxyddx7zm8fpxmzhq2xygyijbszinfiwllgb4l738bxwljb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lice";
+          sha256 = "1hv2hz3153x0gk7f2js18dbx5pyprfdf2pfxb658fj16vxpp7y6x";
+          name = "lice";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lice";
+          license = lib.licenses.free;
+        };
+      }) {};
+    light-soap-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "light-soap-theme";
+        version = "20150607.945";
+        src = fetchFromGitHub {
+          owner = "mswift42";
+          repo = "light-soap-theme";
+          rev = "76a787bd40c6b567ae68ced7f5d9f9f10725e00d";
+          sha256 = "04dik8z2mg6qr4d3fkd26kg29b4c5crvbnc1lfsrzyrik7ipvsi8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/light-soap-theme";
+          sha256 = "09p4w51d5szhi81a6a3l0r4zd4ixkrkzxldr938bcmj0qmj62iyk";
+          name = "light-soap-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/light-soap-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lingr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lingr";
+        version = "20100807.1231";
+        src = fetchFromGitHub {
+          owner = "lugecy";
+          repo = "lingr-el";
+          rev = "4215a8704492d3c860097cbe2649936c22c196df";
+          sha256 = "0rkx0hk3y79rwhjqs3wvgxhg1rj83mxbqkhhm3jfawp8c1av4f40";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lingr";
+          sha256 = "1445bxiirsxl9kgm0j86xc9d0pbaa5f07c1i66pw2vl40bvhrjff";
+          name = "lingr";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lingr";
+          license = lib.licenses.free;
+        };
+      }) {};
+    link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "link";
+        version = "20140717.2229";
+        src = fetchFromGitHub {
+          owner = "myrkr";
+          repo = "dictionary-el";
+          rev = "a23b8f4a422d0de69a006ed010eff5795319db98";
+          sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/link";
+          sha256 = "17jpsg3f2954b740vyj37ikygrg5gmp0bjhbid8bh8vbz7xx9zy8";
+          name = "link";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/link";
+          license = lib.licenses.free;
+        };
+      }) {};
+    link-hint = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "link-hint";
+        version = "20160117.1918";
+        src = fetchFromGitHub {
+          owner = "noctuid";
+          repo = "link-hint.el";
+          rev = "254f0daf31026934a45c4cdbe3a8b7cb2f713e3f";
+          sha256 = "1sh1cp5q6lbmf16fvq2w0m9dhljvra6n0525jfh6kkma8hk8xdvj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/link-hint";
+          sha256 = "12fb2zm9jnh92fc2nzmzmwjlhi64rhakwbh9lsydx9svsvkgcs89";
+          name = "link-hint";
+        };
+        packageRequires = [ avy emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/link-hint";
+          license = lib.licenses.free;
+        };
+      }) {};
+    linphone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "linphone";
+        version = "20130524.609";
+        src = fetchFromGitHub {
+          owner = "zabbal";
+          repo = "emacs-linphone";
+          rev = "99af3db941b7f4e5272bb48bff96c1ce4ceac302";
+          sha256 = "01yv6239z90hvncwmm9g5nh4xvyxv2ig3h4hsmxdn4kacfxvc84n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/linphone";
+          sha256 = "0q7mw1npxq24szhwswc93qz5h6magcxw63ymba7hwhif6my65zx7";
+          name = "linphone";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/linphone";
+          license = lib.licenses.free;
+        };
+      }) {};
+    linum-off = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "linum-off";
+        version = "20130419.2254";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "linum-off";
+          rev = "e16826e9a4cfe104d55884dc3cc4b4b1ced364ca";
+          sha256 = "0x0k4m7nan2klvrhyzqvgpqnw99fq805hvipnrp2j755x7sv92g5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/linum-off";
+          sha256 = "1yilsdsyxlzmh64dpzirzga9c7lhp1phps9cdgp2898zpnzaclay";
+          name = "linum-off";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/linum-off";
+          license = lib.licenses.free;
+        };
+      }) {};
+    linum-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "linum-relative";
+        version = "20160118.0";
+        src = fetchFromGitHub {
+          owner = "coldnew";
+          repo = "linum-relative";
+          rev = "ed3fccccc2fad54176e6b0a7619b321304db0404";
+          sha256 = "01r8vbblpqfyfafmgbcw02f371j6c2g940bwmvi54rmjf9kjd6h7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/linum-relative";
+          sha256 = "0s1lc3lppazv0481dxknm6qrxhvkv0r9hw8xmdrpjc282l91whkj";
+          name = "linum-relative";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/linum-relative";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lisp-extra-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lisp-extra-font-lock";
+        version = "20150129.1516";
+        src = fetchFromGitHub {
+          owner = "Lindydancer";
+          repo = "lisp-extra-font-lock";
+          rev = "ff34c8519653824cf4a40979538b334cd2653892";
+          sha256 = "1r2yhjfby4mibbr7d14m1rifchdy7bvwy50xz2wx4004zqhjmnjd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lisp-extra-font-lock";
+          sha256 = "1xchqwhav9x7b02787ghka567fihdc14aamx92jg549c6d14qpwk";
+          name = "lisp-extra-font-lock";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lisp-extra-font-lock";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lispxmp = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "lispxmp";
+        version = "20130824.707";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/lispxmp.el";
+          sha256 = "1m07gb3v1a7al0h4nj3914y8lqrwzi8fwb1ih66nxzn6kb0qj3mf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lispxmp";
+          sha256 = "02gfbyng3dh2445jfkasxzjc9dlk02dafbfkjm40iwmb8h0fzji4";
+          name = "lispxmp";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lispxmp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper }:
+    melpaBuild {
+        pname = "lispy";
+        version = "20160118.432";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "lispy";
+          rev = "d37884533a4ede108fcb840e7b53f9ca912b783a";
+          sha256 = "0a8jl83gc87fvq149834khqq3l6qcscv8n2np9xiqp16gpmw8q65";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lispy";
+          sha256 = "12qk2gpwzz7chfz7x3wds39r4iiipvcw2rjqncir46b6zzlb1q0g";
+          name = "lispy";
+        };
+        packageRequires = [ ace-window emacs hydra iedit swiper ];
+        meta = {
+          homepage = "http://melpa.org/#/lispy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lispyscript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lispyscript-mode";
+        version = "20130828.919";
+        src = fetchFromGitHub {
+          owner = "krisajenkins";
+          repo = "lispyscript-mode";
+          rev = "d0e67ee734919d7ff14c72712e909149cb9604bd";
+          sha256 = "0n0mk01h9c3f24gzpws5xf6syrdwkq4kzs9mgwl74x9l0x904rgf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lispyscript-mode";
+          sha256 = "02biai45l5xl2m9l1drphrlj6r01msmadhyg774ijdk1x4gm5nhr";
+          name = "lispyscript-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lispyscript-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    list-environment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "list-environment";
+        version = "20151226.2056";
+        src = fetchFromGitHub {
+          owner = "dgtized";
+          repo = "list-environment.el";
+          rev = "b7ca30b05905047be2e55199a6475f8d98ce318b";
+          sha256 = "1szbs16jlxfj71986dbg0d3j5raaxcwz0xq5ar352731r5mdcqw4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-environment";
+          sha256 = "1zdhrlp8vk8knjwh56pws6dyn003r6avjzvhghlkgnw9nfrdk57h";
+          name = "list-environment";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/list-environment";
+          license = lib.licenses.free;
+        };
+      }) {};
+    list-packages-ext = callPackage ({ fetchFromGitHub, fetchurl, ht, lib, melpaBuild, persistent-soft, s }:
+    melpaBuild {
+        pname = "list-packages-ext";
+        version = "20151115.1116";
+        src = fetchFromGitHub {
+          owner = "laynor";
+          repo = "list-packages-ext";
+          rev = "b4dd644e4369c9aa66f5bb8895ea49ebbfd0a27a";
+          sha256 = "02l7q5376ydz6a8i9x74bsx5bbxz8xkasmv1lzvf79d3jbg28l1s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-packages-ext";
+          sha256 = "15m4888fm5xv697y7jspghg1ra49fyrny4y2x7h8ivcbslvpglvk";
+          name = "list-packages-ext";
+        };
+        packageRequires = [ ht persistent-soft s ];
+        meta = {
+          homepage = "http://melpa.org/#/list-packages-ext";
+          license = lib.licenses.free;
+        };
+      }) {};
+    list-processes-plus = callPackage ({ fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "list-processes-plus";
+        version = "20131117.1335";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/list-processes+.el";
+          sha256 = "1bssvyjgk1h1wiaxxdi2m5gjy6a790a9rwvi0r22hin7iskg300a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-processes+";
+          sha256 = "10x7hkba2bmryyl68w769fggw65dl4f3a9g0gqdzmkdj80rcipky";
+          name = "list-processes-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/list-processes+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    list-register = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "list-register";
+        version = "20130824.700";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/list-register.el";
+          sha256 = "1sv1x2bc1xg7z3q4r9pbvjspj041q4zn883w9m071h7dgx8i9a6l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-register";
+          sha256 = "06q7q3j9qvqbp25cx9as2ckmgcz2myfvi2n34jp60v3ayhna79r4";
+          name = "list-register";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/list-register";
+          license = lib.licenses.free;
+        };
+      }) {};
+    list-unicode-display = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "list-unicode-display";
+        version = "20150219.301";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "list-unicode-display";
+          rev = "59770cf3572bd36c3e9ba044846dc420c0dca09b";
+          sha256 = "05nn4db8s8h4mn3fxhwsa111ayvlq1raf6bifh7jciyw7a2c3aww";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-unicode-display";
+          sha256 = "01x9i5k5vhjscmkx0l6r27w1cdp9n6xk1pdjf98z3y88dnsmyfha";
+          name = "list-unicode-display";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/list-unicode-display";
+          license = lib.licenses.free;
+        };
+      }) {};
+    list-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "list-utils";
+        version = "20140508.1541";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "list-utils";
+          rev = "36ade42f7cac835d1b8e3dcaf6beeba55ce89832";
+          sha256 = "0b6pnkhm5hnim2lpari93la08ic8qyh4nv0d7mw0cyfyk8phzzvn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-utils";
+          sha256 = "0bknprr4jb1d20i9lj2aa17vpg1kqwdyzzwmy1kfydnkpf5scnr3";
+          name = "list-utils";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/list-utils";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lit-mode";
+        version = "20141123.1136";
+        src = fetchFromGitHub {
+          owner = "HectorAE";
+          repo = "lit-mode";
+          rev = "c61c403afc8333a5649c5421ab1a6341dc1c7d92";
+          sha256 = "0mr0king5dj20vdycpszxnfs9ch808fhcz3q7svxfngj3d3671wd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lit-mode";
+          sha256 = "05rf7ki060nqnvircn0dkpdrg7xbh7phb8bqgsab89ycc7l9vv59";
+          name = "lit-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lit-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    litable = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "litable";
+        version = "20150908.909";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "litable";
+          rev = "9065bade1ba42ad04d9839d58082b73da589dca6";
+          sha256 = "1nbz119ldwjvkm3xd9m0dx820lc177frz5mn585fsd7kqdbkam99";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/litable";
+          sha256 = "073yw3ivkl093xxppn5vqyh69jhfc97al505mnyn34fwdj5v8fji";
+          name = "litable";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/litable";
+          license = lib.licenses.free;
+        };
+      }) {};
+    literate-coffee-mode = callPackage ({ coffee-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "literate-coffee-mode";
+        version = "20160114.634";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-literate-coffee-mode";
+          rev = "996bffe70499fb807b824a4a03d7fa0e5b675c82";
+          sha256 = "1wxysnsigjw40ykdwngg0gqfaag0dx6zg029i2zx25kl3gr1lflc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/literate-coffee-mode";
+          sha256 = "1bll1y9q3kcg3v250asjvx2k9kb314qadaq1iwanwgdlp3qvvs40";
+          name = "literate-coffee-mode";
+        };
+        packageRequires = [ coffee-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/literate-coffee-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    literate-starter-kit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "literate-starter-kit";
+        version = "20150730.1354";
+        src = fetchFromGitHub {
+          owner = "eschulte";
+          repo = "emacs24-starter-kit";
+          rev = "6dce1d01781966c14558aa553cfc85008c06e115";
+          sha256 = "1v37bii372w2g3pl09n5dcrk6y7glhpg8qiv17zsk9jy3ps2xm1b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/literate-starter-kit";
+          sha256 = "1n2njf007fmrmsb8zrgxbz1cpxmr5nsp8w41yxa934iqc7qygkjy";
+          name = "literate-starter-kit";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/literate-starter-kit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    live-code-talks = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, narrowed-page-navigation }:
+    melpaBuild {
+        pname = "live-code-talks";
+        version = "20150115.1623";
+        src = fetchFromGitHub {
+          owner = "david-christiansen";
+          repo = "live-code-talks";
+          rev = "fece58108939a53104f88d348298c9e122f25b75";
+          sha256 = "1j0qa96vlsqybhp0082a466qb1hd2b0621306brl9pfl5srf5jsj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/live-code-talks";
+          sha256 = "173mjmxanva13vk2f3a06s4dy62x271kynsa7pbhdg4fd72hdjma";
+          name = "live-code-talks";
+        };
+        packageRequires = [ cl-lib emacs narrowed-page-navigation ];
+        meta = {
+          homepage = "http://melpa.org/#/live-code-talks";
+          license = lib.licenses.free;
+        };
+      }) {};
+    live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "live-py-mode";
+        version = "20151108.1107";
+        src = fetchFromGitHub {
+          owner = "donkirkby";
+          repo = "live-py-plugin";
+          rev = "35dda7dadba37ffbcc14d3b0a2711ca4967f1db5";
+          sha256 = "02jvfn0g7r07kvb9m97kqa22j5nsgxbnp6r5vsq3d9qjsi459yd3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/live-py-mode";
+          sha256 = "0yn1a0gf9yn068xifpv8p77d917mnalc56pll800zlpsdk8ljicq";
+          name = "live-py-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/live-py-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lively = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "lively";
+        version = "20120728.913";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/lively.el";
+          sha256 = "1z9b0arn7vby4fkwzgj3ml537lh94gvf61vs03cqfkc95lv14r76";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lively";
+          sha256 = "1wjd6kfnknhw9lc2p9iipaxfm9phpkqqmjw43bhc70ybsq1xaln7";
+          name = "lively";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lively";
+          license = lib.licenses.free;
+        };
+      }) {};
+    livescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "livescript-mode";
+        version = "20140612.2321";
+        src = fetchFromGitHub {
+          owner = "yhisamatsu";
+          repo = "livescript-mode";
+          rev = "90a918d9686e256e6d4d439cc20f24dad8d3b804";
+          sha256 = "0kqjz0i0zapyhh8z57cvc8ifiizngix3ca01mjnvyq3zxg1bqrsg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/livescript-mode";
+          sha256 = "1fdfhp39zr2mhy5rd6mwqv5fwd8xaypdqig7v3ksv77m5zq7cmmj";
+          name = "livescript-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/livescript-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    livid-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s, skewer-mode }:
+    melpaBuild {
+        pname = "livid-mode";
+        version = "20131116.744";
+        src = fetchFromGitHub {
+          owner = "pandeiro";
+          repo = "livid-mode";
+          rev = "dfe5212fa64738bc4138bfebf349fbc8bc237c26";
+          sha256 = "178ldzpk8a9m9abn8xlplxn5jgcca71dpkp82bs5g7bsccp3rx6p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/livid-mode";
+          sha256 = "0jy16m6injqznx4gmxzvhys480pclw9g07z4qll2dna37177ww9d";
+          name = "livid-mode";
+        };
+        packageRequires = [ s skewer-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/livid-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    llvm-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "llvm-mode";
+        version = "20150910.844";
+        src = fetchgit {
+          url = "http://llvm.org/git/llvm";
+          rev = "b51e7cd7a3a0d1323325623369d6893340fa526e";
+          sha256 = "222ae816ac005033cad4164b6f530b2d824dba86ca78b20f79acd4f74cb2d6df";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/llvm-mode";
+          sha256 = "0j3zsd0shd7kbi65a2ha7kmr0zy3my05378swx6m5m9x7miyr4y7";
+          name = "llvm-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/llvm-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    load-theme-buffer-local = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "load-theme-buffer-local";
+        version = "20120702.1536";
+        src = fetchFromGitHub {
+          owner = "vic";
+          repo = "color-theme-buffer-local";
+          rev = "ca8470bc34c65a026a6bca1707d95240bfd019af";
+          sha256 = "0gvc9jy34a8wvzwjpmqhshbx2kpk6ckmdrdj5v00iya7c4afnckx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/load-theme-buffer-local";
+          sha256 = "13829yrh36qac7gpxanizlk4n7av99ngvv06y6mmi5rq06a4hjx4";
+          name = "load-theme-buffer-local";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/load-theme-buffer-local";
+          license = lib.licenses.free;
+        };
+      }) {};
+    loc-changes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "loc-changes";
+        version = "20150302.1048";
+        src = fetchFromGitHub {
+          owner = "rocky";
+          repo = "emacs-loc-changes";
+          rev = "58000738accf2f80ea2bf210f7dea5914adb14ee";
+          sha256 = "0i0ainawjvfl3qix329hx01x7rxyfin2xgpjk7y5dgmh4p3xhv94";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/loc-changes";
+          sha256 = "1akgij61b2ixpkchrriabwvx68cg4v5r5w9ncjrjh91hskjprfxh";
+          name = "loc-changes";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/loc-changes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    loccur = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "loccur";
+        version = "20151231.646";
+        src = fetchFromGitHub {
+          owner = "fourier";
+          repo = "loccur";
+          rev = "61dcaaf53622ece672cc6114f3f75e5ce3544c09";
+          sha256 = "1hl9f3kb8v07ks0qx7361y306739r5gcadp8l3m72mnlfx4vlsz1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/loccur";
+          sha256 = "06pv2i05yzjzal4q21krbnp9rp4bsainxcwvpc98020vsmms0z8h";
+          name = "loccur";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/loccur";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lodgeit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lodgeit";
+        version = "20150312.849";
+        src = fetchFromGitHub {
+          owner = "ionrock";
+          repo = "lodgeit-el";
+          rev = "ec9b8e5cbb17bcf8ac4bdddd1d361cb60e59384c";
+          sha256 = "1cdnm270kzixa0kpis0xw2ybkw8lqh7kykc7blxkxjrr9yjvbawl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lodgeit";
+          sha256 = "1ax2w5yxscycjz90g4jdbhd64g9sipzxpfjs7gq3na77s5dcjzsq";
+          name = "lodgeit";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lodgeit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    log4e = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "log4e";
+        version = "20150105.705";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "log4e";
+          rev = "6592682ab7de0e3d1915aa4d3c53e083be79fbeb";
+          sha256 = "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/log4e";
+          sha256 = "1klj59dv8k4r0hily489dp12ra5hq1jnsdc0wcakh6zirmakhs34";
+          name = "log4e";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/log4e";
+          license = lib.licenses.free;
+        };
+      }) {};
+    log4j-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "log4j-mode";
+        version = "20101016.1022";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "log4j-mode";
+          rev = "ec3de92cfe60dd3d0de613e9062476196dea0faf";
+          sha256 = "14dmmjdmcc0zag8i947n59ihjc2df2l44f7issf66767ym3839kk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/log4j-mode";
+          sha256 = "0axr0x8mdxif0xbvs83mxc3gqgs84jb4b9la9n62i3lldckghwmg";
+          name = "log4j-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/log4j-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    logalimacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup, popwin, stem }:
+    melpaBuild {
+        pname = "logalimacs";
+        version = "20131021.1329";
+        src = fetchFromGitHub {
+          owner = "logaling";
+          repo = "logalimacs";
+          rev = "8286e39502250fc6c3c6656a7f46a8eee8e9a713";
+          sha256 = "0lj3i9i3mg17xws13gzx8myc6d7djgsj47yx4kaq5hycgkni1p7q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/logalimacs";
+          sha256 = "0ai7a01bdi3a0amgi63pwgdp8wgcgx10an4nhc627wgb1cqxb7p6";
+          name = "logalimacs";
+        };
+        packageRequires = [ popup popwin stem ];
+        meta = {
+          homepage = "http://melpa.org/#/logalimacs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    logito = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "logito";
+        version = "20120225.1455";
+        src = fetchFromGitHub {
+          owner = "sigma";
+          repo = "logito";
+          rev = "824acb89d2cc18cb47281a4fbddd81ad244a2052";
+          sha256 = "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/logito";
+          sha256 = "0bk4qnz66kvhzsk88lw45209778y53kg17iih70ix4ma1x6a3v5l";
+          name = "logito";
+        };
+        packageRequires = [ eieio ];
+        meta = {
+          homepage = "http://melpa.org/#/logito";
+          license = lib.licenses.free;
+        };
+      }) {};
+    logstash-conf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "logstash-conf";
+        version = "20150308.718";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "logstash-conf.el";
+          rev = "60a06ad1ceb6699cef849e9f2e8255f7816ca5de";
+          sha256 = "05px3zc3is7k2jmh7mal0al5zx5cqvn1bzmhgqq02pp6lwsx5xqa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/logstash-conf";
+          sha256 = "03i2ilphf3fdjag7m9z5gi23n6ik36qn42mzc22432m4y3c7iksh";
+          name = "logstash-conf";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/logstash-conf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    logview = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "logview";
+        version = "20151030.1649";
+        src = fetchFromGitHub {
+          owner = "doublep";
+          repo = "logview";
+          rev = "03b2f0fc325a557ccee0dbcb9226a1d733f21c84";
+          sha256 = "1wglgjf45rl4rl5zp1p1z318p2d1hy1w77m65wwg35v6pkl1mikr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/logview";
+          sha256 = "0gks3j5avx8k3427a36lv7gr95id3cylaamgn5qwbg14s54y0vsh";
+          name = "logview";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/logview";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lolcode-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lolcode-mode";
+        version = "20111002.347";
+        src = fetchFromGitHub {
+          owner = "bodil";
+          repo = "lolcode-mode";
+          rev = "1914f1ba87587ecf5f175eeb2144c28e9f039317";
+          sha256 = "0pyfgywmmnlz1arvdxwyw96gr6xcg2sp3bqjli8xfcl8i0nww4kb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lolcode-mode";
+          sha256 = "0dxdqr3z5bw0vcfxhhhc1499vrfk1xqwxshr0kvlhdalpf59rqiw";
+          name = "lolcode-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lolcode-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    look-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, look-mode, melpaBuild }:
+    melpaBuild {
+        pname = "look-dired";
+        version = "20151115.1956";
+        src = fetchFromGitHub {
+          owner = "vapniks";
+          repo = "look-dired";
+          rev = "5b2afe910a904d13674103f5264c6bcdbb9f9fb2";
+          sha256 = "0w9pbjcp4d2w3qb3nnyzq2d0d9f0pgz5lyzapidxa9z1xcj51ccj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/look-dired";
+          sha256 = "0dddx5nxr519wqdgrbglh0pqjl3alg4ddmank42g4llzycy61wsd";
+          name = "look-dired";
+        };
+        packageRequires = [ look-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/look-dired";
+          license = lib.licenses.free;
+        };
+      }) {};
+    look-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "look-mode";
+        version = "20151211.1226";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/look-mode.el";
+          sha256 = "0sl6hqggi6qn2qp9khw11qp5hamngwxrrwx98k3pwpj9kgicdpgp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/look-mode";
+          sha256 = "0y3wjfjx0g5jclmv9m3vimv7zd18pk5im7smr41qk09hswi63yqj";
+          name = "look-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/look-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    loop = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "loop";
+        version = "20151228.521";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "loop.el";
+          rev = "20dc5c549821b12e6777f5e6aed9033b4a2dcc5c";
+          sha256 = "1wmd7s3dk9krgmhs4f92mig18vx6y551n45ai7cvj92f4fbrsd08";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/loop";
+          sha256 = "0pav16kinzljmzx84vfz63fvi39af4628vk1jw79jk0pyg9rjbar";
+          name = "loop";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/loop";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lorem-ipsum = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lorem-ipsum";
+        version = "20140911.1608";
+        src = fetchFromGitHub {
+          owner = "jschaf";
+          repo = "emacs-lorem-ipsum";
+          rev = "893a27505734a1497b79bc26e0736a78221b35d9";
+          sha256 = "0grzl4kqpc1x6569yfh9xdzzbgmhcskxwk6f7scjpl32acr88cmx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lorem-ipsum";
+          sha256 = "0p62yifbrknjn8z0613wy2aaknj44liyrgbknhpa0qn0d4fcrp4h";
+          name = "lorem-ipsum";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lorem-ipsum";
+          license = lib.licenses.free;
+        };
+      }) {};
+    love-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild }:
+    melpaBuild {
+        pname = "love-minor-mode";
+        version = "20130429.1659";
+        src = fetchFromGitHub {
+          owner = "ejmr";
+          repo = "love-minor-mode";
+          rev = "31c3fc1ecd31f72f0f736014a4ff905eb3742e74";
+          sha256 = "179r4pz3hlb5p6bjfhdikkx1zvh09ln5dbw3c3rmlyww1q7v26yl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/love-minor-mode";
+          sha256 = "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m";
+          name = "love-minor-mode";
+        };
+        packageRequires = [ lua-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/love-minor-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lua-mode";
+        version = "20151025.730";
+        src = fetchFromGitHub {
+          owner = "immerrr";
+          repo = "lua-mode";
+          rev = "bdf121b2c05bc74d3d7961a91d7afeb6176e0f45";
+          sha256 = "1psk4202rmkkfy1ir1ax4x4djfngd5pfry7x30ybq2ifqzymb9qb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lua-mode";
+          sha256 = "0gyi7w2h192h3pmrhq39lxwlwd9qyqs303lnp2655pikdzk9js94";
+          name = "lua-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lua-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lush-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lush-theme";
+        version = "20141107.1006";
+        src = fetchFromGitHub {
+          owner = "andre-richter";
+          repo = "emacs-lush-theme";
+          rev = "3b80004f33cdce9f4db69e9ccf2041561e98985d";
+          sha256 = "0mv73s89n59m44szc37086wq55py5sx0lc0jxncfybawhsqyd0ar";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lush-theme";
+          sha256 = "03kqws8dzm0ay5k86f4v7g2g2ygwk4fzmz2vyzhzhbsj8hrniq9p";
+          name = "lush-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/lush-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lusty-explorer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lusty-explorer";
+        version = "20150508.1757";
+        src = fetchFromGitHub {
+          owner = "sjbach";
+          repo = "lusty-emacs";
+          rev = "a6e78cafc193050a493d16d07eae107a2436c293";
+          sha256 = "1r1xfn0dyc4m49064g9n6hpwn4r763kpbg3dgprsv30i5ska61qa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lusty-explorer";
+          sha256 = "0xqanmmkyvzcg2g4zvascq5j004bqz7vmz1a19c25g9cs3rdh0ps";
+          name = "lusty-explorer";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lusty-explorer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lxc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lxc";
+        version = "20140410.1522";
+        src = fetchFromGitHub {
+          owner = "nicferrier";
+          repo = "emacs-lxc";
+          rev = "88bed56c954d1edd9ff5ce0ced2c02dcf9f71835";
+          sha256 = "090gk0il4yyypzjbh2qrjdaldwf90fi30impmh4zcfl73bic5q9q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lxc";
+          sha256 = "1rv1ybmbjx7n3cavx21nzmvckw63q3jmjsfdr2pcgavrr2ck6lka";
+          name = "lxc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lxc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    m-buffer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "m-buffer";
+        version = "20160104.237";
+        src = fetchFromGitHub {
+          owner = "phillord";
+          repo = "m-buffer-el";
+          rev = "1ff021c5f6c74b092dc1aad28d28af1b5e060f76";
+          sha256 = "01847f8xmjfxvvi7hf73l7ypkdazwg8ciinm117zp4jkgnv0apz0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/m-buffer";
+          sha256 = "0l2rayglv48pcwnr1ggmn8c0az0mffgv02ivnzr9jcfs55ki07fc";
+          name = "m-buffer";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/m-buffer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    macro-math = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "macro-math";
+        version = "20130328.1104";
+        src = fetchFromGitHub {
+          owner = "nschum";
+          repo = "macro-math.el";
+          rev = "216e59371e9ee39c34117ba79b9acd78bb415750";
+          sha256 = "119c77s3qp1vqc5m2yf7m4s81aphkhsvsnwqmpq6xl08r3592zxz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/macro-math";
+          sha256 = "1r7splwq5kdrdhbmw5zn81vxymsrllgil48g8dl0r60293384h00";
+          name = "macro-math";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/macro-math";
+          license = lib.licenses.free;
+        };
+      }) {};
+    macros-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "macros-plus";
+        version = "20151231.1619";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/macros+.el";
+          sha256 = "07iw9iarz6z9n6vnhqqljfjpvq6vb97ca2hwj9v0k5k8mafdqg7d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/macros+";
+          sha256 = "0aihszxsjnc93pbbkmkr1iwzvii3jw8yh1f6dpnjykgvb328pvqi";
+          name = "macros-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/macros+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    macrostep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "macrostep";
+        version = "20151213.345";
+        src = fetchFromGitHub {
+          owner = "joddie";
+          repo = "macrostep";
+          rev = "a3338d351e18bfbacd970d371735f840e7d5fe38";
+          sha256 = "0j95lv4b01p8a5fpxnj5qs2ajg1yxnsg97vw3184dfy9r5hy7ryb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/macrostep";
+          sha256 = "1wjibxbdsp5qfhq8xy0mcf3ms0q74qhdrhqndprn6jh3kcn5q63c";
+          name = "macrostep";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/macrostep";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mag-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, splitter }:
+    melpaBuild {
+        pname = "mag-menu";
+        version = "20150505.1350";
+        src = fetchFromGitHub {
+          owner = "chumpage";
+          repo = "mag-menu";
+          rev = "9b9277021cd09fb1dba64b1d2a00705d20914bd6";
+          sha256 = "1flamyk7z3r723cczqra0f4yabc6kmgwjaw2bvs3kisppqmmz72g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mag-menu";
+          sha256 = "1r1yisjnqxl9llpf91rwqp4q47jc4qp32xnkl8wzsgr0r2qf5yk2";
+          name = "mag-menu";
+        };
+        packageRequires = [ splitter ];
+        meta = {
+          homepage = "http://melpa.org/#/mag-menu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "magic-filetype";
+        version = "20151224.715";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "magic-filetype.el";
+          rev = "bffe69c70565c534bcc245cfdc2781d85e4edb68";
+          sha256 = "1ycqhmi18yjniw6w258rhxcc70ngq51vjlafx0bcs1aw1px97z5s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magic-filetype";
+          sha256 = "0gcys45cqn5ghppkn0rmyvfybprlfz1x6hqr21yv93mf79h75zhg";
+          name = "magic-filetype";
+        };
+        packageRequires = [ emacs s ];
+        meta = {
+          homepage = "http://melpa.org/#/magic-filetype";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magic-latex-buffer = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "magic-latex-buffer";
+        version = "20151230.116";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "magic-latex-buffer";
+          rev = "db01f00780cba71a18bd442332efc599450d5fec";
+          sha256 = "1nvfvyvangpyg5k56x4zrsnh43ffiqbbsibny33zy6idkc145fy0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magic-latex-buffer";
+          sha256 = "0xm4vk4aggyfw96cgya5cp97jzx5ha0xwpf2yfh7c3m8d9cca4y8";
+          name = "magic-latex-buffer";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/magic-latex-buffer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
+    melpaBuild {
+        pname = "magit";
+        version = "20160117.2329";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "magit";
+          rev = "45b06a7b8664046fd1aecb3f07db535edd80d013";
+          sha256 = "1c6x10nm5syahn85vrgg9i6i7kzy4h7l9alahaxb71w6jwf91rsg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit";
+          sha256 = "099i9h375yfhcylz8mvsm45mkkiyyhx0s1q3icba5n875jvq7smz";
+          name = "magit";
+        };
+        packageRequires = [
+          async
+          dash
+          emacs
+          git-commit
+          magit-popup
+          with-editor
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/magit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "magit-annex";
+        version = "20151213.38";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "magit-annex";
+          rev = "154345a5192f3581af105022541911398a566cce";
+          sha256 = "1h1i8712w0pn6bhc5lpps7ri7bf6f3vy23i6qld13hdgvimgisd9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-annex";
+          sha256 = "1ri58s1ly416ksmb7mql6vnmx7hq59lmhi7qijknjarw7qs3bqys";
+          name = "magit-annex";
+        };
+        packageRequires = [ cl-lib magit ];
+        meta = {
+          homepage = "http://melpa.org/#/magit-annex";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-filenotify = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "magit-filenotify";
+        version = "20151116.1740";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "magit-filenotify";
+          rev = "c0865b3c41af20b6cd89de23d3b0beb54c8401a4";
+          sha256 = "0nkxxhxkhy314jv1l3hza84vigl8q7fc8hjjvrx58gfgsfgifx6r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-filenotify";
+          sha256 = "00a77czdi24n3zkx6jwaj2asablzpxq16iqd8s84kkqxcfiiahn7";
+          name = "magit-filenotify";
+        };
+        packageRequires = [ emacs magit ];
+        meta = {
+          homepage = "http://melpa.org/#/magit-filenotify";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-find-file = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "magit-find-file";
+        version = "20150702.330";
+        src = fetchFromGitHub {
+          owner = "bradleywright";
+          repo = "magit-find-file.el";
+          rev = "c3ea91bab37d10a814a829728ec972811f728d60";
+          sha256 = "1j3jsrp0qpaa2xd98d1g9z0zc4b93knwajrlnlsc7l6g0vlfsddb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-find-file";
+          sha256 = "1d5flydyhwhvhlhi541zcnz2b03bi07zrp21bfz5sm069bf2c96b";
+          name = "magit-find-file";
+        };
+        packageRequires = [ dash magit ];
+        meta = {
+          homepage = "http://melpa.org/#/magit-find-file";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-gerrit = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "magit-gerrit";
+        version = "20160111.2048";
+        src = fetchFromGitHub {
+          owner = "terranpro";
+          repo = "magit-gerrit";
+          rev = "ce265149870d4e80fb2d9b80aa380a8c05686c65";
+          sha256 = "1qwcgd6lw0bfzyhzk7vkdrvnxshck0l7rp9lgg9g0jnhf0aqlfri";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-gerrit";
+          sha256 = "1iwvg10ly6dlf8llz9f8d4qfdbvd3s28wf48qgn1wjlxpka6zrd4";
+          name = "magit-gerrit";
+        };
+        packageRequires = [ magit ];
+        meta = {
+          homepage = "http://melpa.org/#/magit-gerrit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-gh-pulls = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild, pcache, s }:
+    melpaBuild {
+        pname = "magit-gh-pulls";
+        version = "20151212.1243";
+        src = fetchFromGitHub {
+          owner = "sigma";
+          repo = "magit-gh-pulls";
+          rev = "728819217c697b4eed996eb14261a8c7c3388df7";
+          sha256 = "03m4gr86lm8rs3zn6hdirlgfixf1w033iyhsg9dwlhvmfpfghxb5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-gh-pulls";
+          sha256 = "0qn9vjxi33pya9s8v3g95scmhwrn2yf5pjm7d24frq766wigjv8d";
+          name = "magit-gh-pulls";
+        };
+        packageRequires = [ emacs gh magit pcache s ];
+        meta = {
+          homepage = "http://melpa.org/#/magit-gh-pulls";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }:
+    melpaBuild {
+        pname = "magit-gitflow";
+        version = "20150905.239";
+        src = fetchFromGitHub {
+          owner = "jtatarik";
+          repo = "magit-gitflow";
+          rev = "dd1d88888957f0fd8b950037e0e58dba2d3221d9";
+          sha256 = "10c1qd1l92h0z7mz7j004bx3fc9p6ij3m732lwmni9vlfbishbb4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-gitflow";
+          sha256 = "0wsqq3xpqqfak4aqwsh5sxjb1m62z3z0ysgdmnrch3qsh480r8vf";
+          name = "magit-gitflow";
+        };
+        packageRequires = [ magit magit-popup ];
+        meta = {
+          homepage = "http://melpa.org/#/magit-gitflow";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "magit-popup";
+        version = "20160117.1713";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "magit";
+          rev = "45b06a7b8664046fd1aecb3f07db535edd80d013";
+          sha256 = "1c6x10nm5syahn85vrgg9i6i7kzy4h7l9alahaxb71w6jwf91rsg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-popup";
+          sha256 = "0w6m384bbmp3bd4qbss5h1jvcfp4qnpqvzlfykhdgjwpv2b2a2fj";
+          name = "magit-popup";
+        };
+        packageRequires = [ async dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/magit-popup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "magit-rockstar";
+        version = "20160117.1858";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "magit-rockstar";
+          rev = "6d572b9371c366814b3b071aa6301e503a47fbdd";
+          sha256 = "1pqbrrp4366kwfk1d32h2lb70id32ynfc03i7m2832w97f1xp16c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-rockstar";
+          sha256 = "1i4fmraiypyd3q6vvibkg9xqfxiq83kcz64b1dr3wmwn30j7986n";
+          name = "magit-rockstar";
+        };
+        packageRequires = [ dash magit ];
+        meta = {
+          homepage = "http://melpa.org/#/magit-rockstar";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-stgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "magit-stgit";
+        version = "20151228.1001";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "magit-stgit";
+          rev = "0aec74f70ca1544ee81c586de4aa621ad5f66205";
+          sha256 = "0gb7wpwdhar2a81shd3c5s85ywv8vvjqykpc4py06ybjk8qpspcw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-stgit";
+          sha256 = "12wg1ig2jzy2np76brpwxdix9pwv75chviq3c24qyv4y80pd11sv";
+          name = "magit-stgit";
+        };
+        packageRequires = [ emacs magit ];
+        meta = {
+          homepage = "http://melpa.org/#/magit-stgit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-svn = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "magit-svn";
+        version = "20151219.747";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "magit-svn";
+          rev = "9b2f8c14e83ee5851a63bd23b5f19422b00c0ff5";
+          sha256 = "0r3nkrisyjawjwbm74yi6fqiwcqzlfkypsdscfhii0q50ky8plph";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-svn";
+          sha256 = "02n732z06f0bhxqkxzlvm36bpqr40pas09zbzpfdk4pb6f9f80s0";
+          name = "magit-svn";
+        };
+        packageRequires = [ emacs magit ];
+        meta = {
+          homepage = "http://melpa.org/#/magit-svn";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-topgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "magit-topgit";
+        version = "20151018.1231";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "magit-topgit";
+          rev = "732de604c31c74e9da24616428c6e9668b57c881";
+          sha256 = "0dj183vphnvz9k2amga0ydcb4gkjxr28qz67055mxrf89q1qjq33";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-topgit";
+          sha256 = "1ngrgf40n1g6ncd5nqgr0zgxwlkmv9k4fik96dgzysgwincx683i";
+          name = "magit-topgit";
+        };
+        packageRequires = [ emacs magit ];
+        meta = {
+          homepage = "http://melpa.org/#/magit-topgit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magma-mode = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "magma-mode";
+        version = "20150923.340";
+        src = fetchFromGitHub {
+          owner = "ThibautVerron";
+          repo = "magma-mode";
+          rev = "b6ccdeb774348ef3e87cc877de9fc90405872760";
+          sha256 = "0alcdr84g2gvvshpa3cws87n47n5shcryzbj947nsbicmp7f9k8j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magma-mode";
+          sha256 = "1gq6yi51h1h7ivrm1xr6nfrpabx8ylbk0waaw04gnw3bb54dmmvc";
+          name = "magma-mode";
+        };
+        packageRequires = [ cl-lib dash f ];
+        meta = {
+          homepage = "http://melpa.org/#/magma-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magnatune = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "magnatune";
+        version = "20151030.1435";
+        src = fetchFromGitHub {
+          owner = "eikek";
+          repo = "magnatune.el";
+          rev = "605b01505ba30589c77ebb4c96834b5072ccbdd4";
+          sha256 = "1hqz26zm4bdz5wavna4j9yia3ns4z19dnszl7k0lcpgbgmb0wh8y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magnatune";
+          sha256 = "0fmxlrq5ls6fpbk5fv67aan8gg1c61i1chfw5lhf496pwqzq901d";
+          name = "magnatune";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/magnatune";
+          license = lib.licenses.free;
+        };
+      }) {};
+    main-line = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "main-line";
+        version = "20151120.2006";
+        src = fetchFromGitHub {
+          owner = "jasonm23";
+          repo = "emacs-mainline";
+          rev = "0e88f91e49ef27cb77d74f6a8d8140063549d67f";
+          sha256 = "06sjwl0bk648wnnrmyh6qgnlqmxypjmy0gkfl6kpv01r8vh7x2q5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/main-line";
+          sha256 = "0c9c5kmixvhk9il8hsxzf2k14fggb9b9mw59g8q3hgpn5g7kgpkv";
+          name = "main-line";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/main-line";
+          license = lib.licenses.free;
+        };
+      }) {};
+    majapahit-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "majapahit-theme";
+        version = "20160118.1010";
+        src = fetchFromGitLab {
+          owner = "franksn";
+          repo = "majapahit-theme";
+          rev = "97b45223cf59b2ab56dcd06cea078b3ce2a0a328";
+          sha256 = "11dqlvazga7sisx4nbhwzz4525g43k1sbx5pcjwdamwy93bli0fz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/majapahit-theme";
+          sha256 = "04k2smrya27rrjlzvnl3a6llg8vj8x4mm9qyk4kwrmckhd6jd68s";
+          name = "majapahit-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/majapahit-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    make-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "make-color";
+        version = "20140625.650";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "make-color.el";
+          rev = "a1b34e95ccd3ebee4fba1489ab613d0b3078026d";
+          sha256 = "1ky3scyjb69wi76xg6a8qx4ja6lr6mk530bv5gmhj7fxbq8b3x5c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/make-color";
+          sha256 = "0mrv8b67lpid5m8rfbhcik76bvnjlw4xmcrd2c2iinyl02y07r5k";
+          name = "make-color";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/make-color";
+          license = lib.licenses.free;
+        };
+      }) {};
+    make-it-so = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "make-it-so";
+        version = "20150319.1407";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "make-it-so";
+          rev = "ed83b8b9787441cc6be4994d571529852a8cce4a";
+          sha256 = "00j5n9pil1qik4mrzvam4rp6213w8jm4qw7c4z8sxpq57xa0b679";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/make-it-so";
+          sha256 = "0a8abz54mb60mfr0bl9ry8yawq99vx9hjl4fm2sivns58qjgfy73";
+          name = "make-it-so";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/make-it-so";
+          license = lib.licenses.free;
+        };
+      }) {};
+    maker-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "maker-mode";
+        version = "20150116.554";
+        src = fetchFromGitHub {
+          owner = "fommil";
+          repo = "maker-mode";
+          rev = "335c43b08eff589040129dae1ea13c88793b069e";
+          sha256 = "0w3kar52yf8clf9801c4jzfrixi10clc8fs8ni2d4pzhdwwca2zw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/maker-mode";
+          sha256 = "03q09jxmhwqy7g09navj08z9ir0rbh7w26c1av7hwhmq4i6xwg8a";
+          name = "maker-mode";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/maker-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    makey = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "makey";
+        version = "20131231.830";
+        src = fetchFromGitHub {
+          owner = "mickeynp";
+          repo = "makey";
+          rev = "a61781e69d3b451551e269446e1c5f624ab81137";
+          sha256 = "1rr7vpm3xxzcaam3m8xni3ajy8ycyljix07n2jzczayri9sd8csy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/makey";
+          sha256 = "06xgrlkqvg288yd4lyhx4vi80jlfarhblxk5m5zzs5as7n08cvk4";
+          name = "makey";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/makey";
+          license = lib.licenses.free;
+        };
+      }) {};
+    malabar-mode = callPackage ({ fetchFromGitHub, fetchurl, fringe-helper, groovy-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "malabar-mode";
+        version = "20150720.1255";
+        src = fetchFromGitHub {
+          owner = "m0smith";
+          repo = "malabar-mode";
+          rev = "830f38efae813db4388da6b4abd386eb0a4e861c";
+          sha256 = "0hlxs9gi2vml2id9q0r1r0xdm0zshjzc1w3phjf2ab0aa3hl5k6l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/malabar-mode";
+          sha256 = "026ing7v22rz1pfzs2j9z09pm6dajpys992n45gzhwirz5f0q1rk";
+          name = "malabar-mode";
+        };
+        packageRequires = [ fringe-helper groovy-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/malabar-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }:
+    melpaBuild {
+        pname = "malinka";
+        version = "20151107.216";
+        src = fetchFromGitHub {
+          owner = "LefterisJP";
+          repo = "malinka";
+          rev = "cd451d32dcdfa3e6b34f47c6956ff310de8a9a06";
+          sha256 = "1a22xkhnmpfffllarsjdw10n5cd3nwifcl1iv98kb4j4x96kd4xg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/malinka";
+          sha256 = "1245mpxsxwnnpdsf0pd28mddgdfhh7x32a2l3sxfq0dyg2xlgvrp";
+          name = "malinka";
+        };
+        packageRequires = [ cl-lib dash f projectile rtags s ];
+        meta = {
+          homepage = "http://melpa.org/#/malinka";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mallard-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mallard-mode";
+        version = "20131203.2225";
+        src = fetchFromGitHub {
+          owner = "jhradilek";
+          repo = "emacs-mallard-mode";
+          rev = "c48170c1ace4959abcc5fb1df0d4cb149cff44c1";
+          sha256 = "18x3cssfn81k8hg4frj7dhzphg784321z51wbbvn3bjhq7s6j3a2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mallard-mode";
+          sha256 = "0y2ikjgy107kb85pz50vv7ywslqgbrrkcfsrd8gsk1jky4qn8izd";
+          name = "mallard-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mallard-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mallard-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, mallard-mode, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "mallard-snippets";
+        version = "20131023.1351";
+        src = fetchFromGitHub {
+          owner = "jhradilek";
+          repo = "emacs-mallard-snippets";
+          rev = "70c5293f10722f2ace73bdf74d9a18f95b040edc";
+          sha256 = "0qk7i47nmyp4llwp6x0i1i5dk82ck26iyz1sjvvlihaw8a5akny2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mallard-snippets";
+          sha256 = "0437qd7q9i32pmhxaz3vi2dnfpj4nddmzgnqpwsgl28slhjw2hv8";
+          name = "mallard-snippets";
+        };
+        packageRequires = [ mallard-mode yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/mallard-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    man-commands = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "man-commands";
+        version = "20151221.1621";
+        src = fetchFromGitHub {
+          owner = "nflath";
+          repo = "man-commands";
+          rev = "f4ba0c3790855d7544dff92d470d212f24de1d9d";
+          sha256 = "1lfq4hsq2n33l58ja5kzy6bwk9jxbcdsg6y8gqlk71lcslzqldrk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/man-commands";
+          sha256 = "1yl7y0k24gydldfs406v1n523q46m9x6in6pgljgjnjravc67wnq";
+          name = "man-commands";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/man-commands";
+          license = lib.licenses.free;
+        };
+      }) {};
+    manage-minor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "manage-minor-mode";
+        version = "20140310.1100";
+        src = fetchFromGitHub {
+          owner = "ShingoFukuyama";
+          repo = "manage-minor-mode";
+          rev = "1bed33b0752380b548b822fe72e6858c5fe70c8e";
+          sha256 = "10wl7kc76dyijrmdlcl5cx821jg7clsj35r22955mbbgh7zl1x07";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/manage-minor-mode";
+          sha256 = "11jdj8kd401q0y8bbyyn72f27f51bckqid10dnh64z8w7hv59cw6";
+          name = "manage-minor-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/manage-minor-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
+    melpaBuild {
+        pname = "mandoku";
+        version = "20160116.2051";
+        src = fetchFromGitHub {
+          owner = "mandoku";
+          repo = "mandoku";
+          rev = "04bc90d764be19f8f22507e0c2d64f7ad2f1d8db";
+          sha256 = "1yddr220y2digfsfz6d1sx5d1m5xwsipl3xpfy2hzxm8mldkaa6c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mandoku";
+          sha256 = "1pg7ir3y6yk92kfs5agbxapcxf7gy60m353rjv8g3kfkx5zyh3mv";
+          name = "mandoku";
+        };
+        packageRequires = [ git github-clone magit org ];
+        meta = {
+          homepage = "http://melpa.org/#/mandoku";
+          license = lib.licenses.free;
+        };
+      }) {};
+    map-progress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "map-progress";
+        version = "20140310.1632";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "map-progress";
+          rev = "3167eb218510953fb97e7d50948a625eaa3f0005";
+          sha256 = "0pd6bh7wrrh59blp86a2jl2vi4qkzx49z0hy7dkc71ccg0wjsgz1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/map-progress";
+          sha256 = "0zc5vii72gbfwbb35w8m30c8r9zck971hwgcn1a4wjczgn4vkln7";
+          name = "map-progress";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/map-progress";
+          license = lib.licenses.free;
+        };
+      }) {};
+    map-regexp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "map-regexp";
+        version = "20130522.1603";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "map-regexp";
+          rev = "b8e06284ec1c593d7d2bda5f35597a63de46333f";
+          sha256 = "0kk1sk3cr4dbmgq4wzml8kdf14dn9jbyq4bwmvk0i7dic9vwn21c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/map-regexp";
+          sha256 = "0yiif0033lhaqggywzfizfia3siggwcz7yv4z7przhnr04akdmbj";
+          name = "map-regexp";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/map-regexp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    marcopolo = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
+    melpaBuild {
+        pname = "marcopolo";
+        version = "20150326.1118";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "marcopolo";
+          rev = "ce6ad40d7feab0568924e3bd9659b76e3eecd55e";
+          sha256 = "0y4b69r2l6kvh7g8f1y9v1pdall3n668ci24lp04lcms6rxcrsnh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/marcopolo";
+          sha256 = "1nbck1m7lhync7n474578d2g1zc72c841hi236xjbdd2lnxz3zz0";
+          name = "marcopolo";
+        };
+        packageRequires = [ dash pkg-info request s ];
+        meta = {
+          homepage = "http://melpa.org/#/marcopolo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mark-multiple = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mark-multiple";
+        version = "20121118.954";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "mark-multiple.el";
+          rev = "f6a53c7c5283d640ae718f4548b0fda78877a375";
+          sha256 = "1x3anvy3hlmydxyfzr1rhaiy502yi1yz3v54sg8wc1w7jrvwaj29";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mark-multiple";
+          sha256 = "179wd9g0smm76k92n7j2vgg8gz5wn9lczrns5ggq2yhbc77j0gn4";
+          name = "mark-multiple";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mark-multiple";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mark-tools = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mark-tools";
+        version = "20130614.525";
+        src = fetchFromGitHub {
+          owner = "stsquad";
+          repo = "emacs-mark-tools";
+          rev = "a11b61effa90bd0abc876d12573674d36fc17f0c";
+          sha256 = "0k4zvbs09mkr8vdffv18s55rn9cyxldzav9vw04lm7v296k94ivz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mark-tools";
+          sha256 = "1688y7lnzhwdva2ildjabzi10i87klfsgvs947i7gfgxl7jwhisq";
+          name = "mark-tools";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mark-tools";
+          license = lib.licenses.free;
+        };
+      }) {};
+    markdown-mode = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "markdown-mode";
+        version = "20160118.700";
+        src = fetchgit {
+          url = "git://jblevins.org/git/markdown-mode.git";
+          rev = "7b68cd4e8cfbc86141763ee96a5c3e989afc1984";
+          sha256 = "e8abcd04d12977df22ba14fe38deca8c115c777d006fb5f9f37282f29c23ece0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-mode";
+          sha256 = "02lmhihv495drv9cb40h6l0xsbx7yglbvsdzc4r0vf78j87rs33f";
+          name = "markdown-mode";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/markdown-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    markdown-mode-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
+    melpaBuild {
+        pname = "markdown-mode-plus";
+        version = "20120829.710";
+        src = fetchFromGitHub {
+          owner = "milkypostman";
+          repo = "markdown-mode-plus";
+          rev = "f35e63284c5caed19b29501730e134018a78e441";
+          sha256 = "1adl36fj506kgfw40gpagzsd7aypfdvy60141raggd5844i6y96r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-mode+";
+          sha256 = "1535kcj9nmcgmk2448jxc0jmnqy7f50cw2ngffjq5w8bfhgf7q00";
+          name = "markdown-mode-plus";
+        };
+        packageRequires = [ markdown-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/markdown-mode+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    markdown-preview-eww = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "markdown-preview-eww";
+        version = "20160111.902";
+        src = fetchFromGitHub {
+          owner = "niku";
+          repo = "markdown-preview-eww";
+          rev = "5853f836425c877c8a956501f0adda137ef1d3b7";
+          sha256 = "1i5gr3j9dq41p2zl4bfyvzv6i5z7hgrxzrycmbdc3s7nja36k9z4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-preview-eww";
+          sha256 = "0j6924f84is41dspib68y5lnz1f8nm7pqyhv47alxra50cjrpxnx";
+          name = "markdown-preview-eww";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/markdown-preview-eww";
+          license = lib.licenses.free;
+        };
+      }) {};
+    markdown-preview-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, websocket }:
+    melpaBuild {
+        pname = "markdown-preview-mode";
+        version = "20160115.154";
+        src = fetchFromGitHub {
+          owner = "ancane";
+          repo = "markdown-preview-mode";
+          rev = "97d9276210465f4e9492169f3c0ed831a57cedf4";
+          sha256 = "10h5zh03c3v0c6pqcxvlns6l70k2l916nqvza53ikjpldmc4mln2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-preview-mode";
+          sha256 = "0i0mld45d8y96nkqn2r77nvbyw6wgsf8r54d3c2jrv04mnaxs7pg";
+          name = "markdown-preview-mode";
+        };
+        packageRequires = [ cl-lib markdown-mode websocket ];
+        meta = {
+          homepage = "http://melpa.org/#/markdown-preview-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    markdown-toc = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, s }:
+    melpaBuild {
+        pname = "markdown-toc";
+        version = "20160108.241";
+        src = fetchFromGitHub {
+          owner = "ardumont";
+          repo = "markdown-toc";
+          rev = "e0382443ee83e982cc40878ee04d8543dbe0a12a";
+          sha256 = "1s5sasp8z9s1pfq7nww221lb427qblryilx0h5y7bg4z2ay9yr03";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-toc";
+          sha256 = "0slky735yzmbfi4ld264vw64b4a4nllhywp19ya0sljbsfycbihv";
+          name = "markdown-toc";
+        };
+        packageRequires = [ dash markdown-mode s ];
+        meta = {
+          homepage = "http://melpa.org/#/markdown-toc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    markup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "markup";
+        version = "20130207.1509";
+        src = fetchFromGitHub {
+          owner = "leoc";
+          repo = "markup.el";
+          rev = "5ff4874ce897db146f5fd2b3d32147a0d404e1e5";
+          sha256 = "1i95b15mvkkki2iq8hysdr7jr1d5nix9jjkh7jz0alvaybqlsnqi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markup";
+          sha256 = "0yw4b42nc2n7nanqvj596hwjf0p4qc7x6g2d9g5cwi7975iak8pf";
+          name = "markup";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/markup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    markup-faces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "markup-faces";
+        version = "20141110.217";
+        src = fetchFromGitHub {
+          owner = "sensorflo";
+          repo = "markup-faces";
+          rev = "98a807ed82473eb41c6a201ed7ef816d6bcd67b0";
+          sha256 = "1w6i1m7xdr9cijnmdj35cl99r12vl83qws0qlfhrgvisilshnr27";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markup-faces";
+          sha256 = "12z92j9f0mpn7w2qkiwg54wh743q3inx56q3f8qcpfzyks546grq";
+          name = "markup-faces";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/markup-faces";
+          license = lib.licenses.free;
+        };
+      }) {};
+    marmalade = callPackage ({ fetchFromGitHub, fetchurl, furl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "marmalade";
+        version = "20110602.1822";
+        src = fetchFromGitHub {
+          owner = "nex3";
+          repo = "marmalade";
+          rev = "2a4f07fbd4c17e08556c1a80c1753c37b3626d39";
+          sha256 = "1ygznmqb3fqy94p8qi71i223m7cpw3f596pkls2ybjlbpb4psjcl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/marmalade";
+          sha256 = "0ppa2s1fma1lc01byanfxpxfrjqk2snxbsmdbkcipjdi5dpb0a9s";
+          name = "marmalade";
+        };
+        packageRequires = [ furl ];
+        meta = {
+          homepage = "http://melpa.org/#/marmalade";
+          license = lib.licenses.free;
+        };
+      }) {};
+    marmalade-client = callPackage ({ fetchFromGitHub, fetchurl, gh, kv, lib, melpaBuild, web }:
+    melpaBuild {
+        pname = "marmalade-client";
+        version = "20141231.1407";
+        src = fetchFromGitHub {
+          owner = "nicferrier";
+          repo = "emacs-marmalade-upload";
+          rev = "f315dea57e4fbebd9ee0668c0bafd4c45c7b754a";
+          sha256 = "017k109nfif5mzkj547py8pdnzlr4sxb74yqqsl944znflq67blr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/marmalade-client";
+          sha256 = "0llwqwwxrf7qdkpdb03ij0iinll0vc9qr557zyr3bn5zb4fad1sq";
+          name = "marmalade-client";
+        };
+        packageRequires = [ gh kv web ];
+        meta = {
+          homepage = "http://melpa.org/#/marmalade-client";
+          license = lib.licenses.free;
+        };
+      }) {};
+    marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "marshal";
+        version = "20150916.2057";
+        src = fetchFromGitHub {
+          owner = "sigma";
+          repo = "marshal.el";
+          rev = "0ab06a654af0555dc669b5bdf4e0991a78238d6d";
+          sha256 = "0fwhhzfd6vgpaf5mrw90hvm35j2kzhk9h3gbrwd7y7q08nrmsx9p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/marshal";
+          sha256 = "17ikd8f1k42f28d4v5dn83zb44bsx7g336db60q068w6z8d4jbgl";
+          name = "marshal";
+        };
+        packageRequires = [ eieio json ];
+        meta = {
+          homepage = "http://melpa.org/#/marshal";
+          license = lib.licenses.free;
+        };
+      }) {};
+    material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "material-theme";
+        version = "20160118.1237";
+        src = fetchFromGitHub {
+          owner = "cpaulik";
+          repo = "emacs-material-theme";
+          rev = "35ad0e9f2e8c52c738b1fc2bf3eb6910402c87e3";
+          sha256 = "0n3gc90cgqbdcfml5zhvlpkfxczb0xhgxqxgd1ghcyxgsfzafbqh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/material-theme";
+          sha256 = "1d259avldc5fq121xrqv53h8s4f4bp6b89nz2rvjhygz7f8hargq";
+          name = "material-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/material-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    math-symbol-lists = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "math-symbol-lists";
+        version = "20151215.1243";
+        src = fetchFromGitHub {
+          owner = "vspinu";
+          repo = "math-symbol-lists";
+          rev = "56319989e7ac6bd625b46e8a28f8005077b5957b";
+          sha256 = "186gb83y3g1q7d0sdrxqz22nr62qq6fy7m74qwirlsf7vnnm4gpx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/math-symbol-lists";
+          sha256 = "01j11k29acj0b1pcapmgi2d2s3p50bkms21i2qcj0cbqgz8h6s27";
+          name = "math-symbol-lists";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/math-symbol-lists";
+          license = lib.licenses.free;
+        };
+      }) {};
+    math-symbols = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "math-symbols";
+        version = "20151121.1842";
+        src = fetchFromGitHub {
+          owner = "kawabata";
+          repo = "math-symbols";
+          rev = "666b1f00d9e106cf2a3a7d58c2262fe9a1404764";
+          sha256 = "1chyxi096krjbi9zgbrnrkvwgmn4wygnia9m57m0jh4arlbm28la";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/math-symbols";
+          sha256 = "0sx9cgyk56npjd6z78y9cldbvjl5ipl7k1nc1sylg1iggkbwxnqx";
+          name = "math-symbols";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/math-symbols";
+          license = lib.licenses.free;
+        };
+      }) {};
+    matlab-mode = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "matlab-mode";
+        version = "20141227.1244";
+        src = fetchcvs {
+          cvsRoot = ":pserver:anonymous@matlab-emacs.cvs.sourceforge.net:/cvsroot/matlab-emacs";
+          module = "matlab-emacs";
+          sha256 = "694652e361b9d15a3f1542d45b43c6516f20030dbaa8a058b5fdb4c833885465";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/matlab-mode";
+          sha256 = "06s7mrbfbkk6baf8j1vc26nb2bg3ma1n7d297zqz8ay90cv81y76";
+          name = "matlab-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/matlab-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    matrix-client = callPackage ({ fetchgit, fetchurl, json ? null, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "matrix-client";
+        version = "20160116.2145";
+        src = fetchgit {
+          url = "git://fort.kickass.systems/personal/rrix/pub/matrix.el";
+          rev = "7ee66597688fb3b664d0544a6c53f91d5ca5303d";
+          sha256 = "08d15d06b7b18c7b00cb02dc4107b38a40898ea52b8353084d9e1ebc8c2da322";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/matrix-client";
+          sha256 = "09mgxk0xngw8j46vz6f5nwkb01iq96bf9m51w2q61wxivypnsyr6";
+          name = "matrix-client";
+        };
+        packageRequires = [ json request ];
+        meta = {
+          homepage = "http://melpa.org/#/matrix-client";
+          license = lib.licenses.free;
+        };
+      }) {};
+    maude-mode = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "maude-mode";
+        version = "20140212.502";
+        src = fetchsvn {
+          url = "svn://svn.code.sf.net/p/maude-mode/code/trunk";
+          rev = "63";
+          sha256 = "06k07qvhm2mbqasn72649lx3pwzb0r466854a18g6lciwhiww7vy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/maude-mode";
+          sha256 = "04b6q328hj0w33z4c50nqyark0pn5sqi0s8096m9di4rjwxaw0ma";
+          name = "maude-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/maude-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    maven-test-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "maven-test-mode";
+        version = "20141219.2357";
+        src = fetchFromGitHub {
+          owner = "rranelli";
+          repo = "maven-test-mode";
+          rev = "a19151861df2ad8ae4880a2e7c86ddf848cb569a";
+          sha256 = "1xn2yyr8mr90cynbxgv0h5v180pzf0ydnjr9spg34mrdicqlki6c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/maven-test-mode";
+          sha256 = "1k9w51rh003p67yalzq1w8am40nnr2khyyb5y4bwxgpms8z391fm";
+          name = "maven-test-mode";
+        };
+        packageRequires = [ emacs s ];
+        meta = {
+          homepage = "http://melpa.org/#/maven-test-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    maxframe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "maxframe";
+        version = "20140916.954";
+        src = fetchFromGitHub {
+          owner = "rmm5t";
+          repo = "maxframe.el";
+          rev = "174e3a0f3a716e904eba15e659096a99976ee39a";
+          sha256 = "0g9kpsg6623nmxnshj49q8k952xybrkmqqy6m892m8wnm22pjdz1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/maxframe";
+          sha256 = "10cwy3gi3xb3pfdh6xiafxp3vvssawci3y26jda6550d0w5vardj";
+          name = "maxframe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/maxframe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mb-depth-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "mb-depth-plus";
+        version = "20151231.1621";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/mb-depth+.el";
+          sha256 = "0w8clp96jblsc9v87404zpc280ms0d644in34jdgjc5r33f4i0g3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mb-depth+";
+          sha256 = "031hh227rh7l818p3di4h34i4698yynw5g9a5sl2hj47c0734q6w";
+          name = "mb-depth-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mb-depth+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mb-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mb-url";
+        version = "20151210.1216";
+        src = fetchFromGitHub {
+          owner = "dochang";
+          repo = "mb-url";
+          rev = "e1d9af92f8f3c4fc96760558ee1a4df7bbbc537c";
+          sha256 = "1qd4vya49sy7iwcpnyd91d0zx3niwsavhdcq6387rsb0j64hwybl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mb-url";
+          sha256 = "1nf8ssan00qsn3d4dc6h6qzdwqzh977qb5d2m33kiwi6qb98988h";
+          name = "mb-url";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/mb-url";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mbe = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mbe";
+        version = "20151126.534";
+        src = fetchFromGitHub {
+          owner = "ijp";
+          repo = "mbe.el";
+          rev = "bb10aa8f26bb7e9b1d5746934c94edb00402940c";
+          sha256 = "1zywygdgnp2zr8fxqhl0cbrgbl43931k936b9imhqi96p6622pb6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mbe";
+          sha256 = "0h18mbcjy8nh4gl12kg2v8x6ps320yk7sbgq5alqnx2shp80kri3";
+          name = "mbe";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/mbe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mbo70s-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mbo70s-theme";
+        version = "20141122.842";
+        src = fetchFromGitHub {
+          owner = "emacsfodder";
+          repo = "emacs-mbo70s-theme";
+          rev = "d50414697760896dbe6b06d2a00c271c16e0e4a2";
+          sha256 = "1vr85fdlb4zwgid1v00ndppla9fqqk25g2x2f5alm69pfqssr75z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mbo70s-theme";
+          sha256 = "1abx2rw09xxp122ff7i9sry5djd4l6vn4lfzxs92rknjzkyc40pb";
+          name = "mbo70s-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/mbo70s-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mc-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
+    melpaBuild {
+        pname = "mc-extras";
+        version = "20150218.434";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "mc-extras.el";
+          rev = "71cf966be06d9c74e781a87bb30fa4cf657ee852";
+          sha256 = "0252wdq4sd6jhzfy0pn3gdm6aq2h13nnp8hvrn1mpml9x473a5n1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mc-extras";
+          sha256 = "0b110x6ygc95v5pb9lk1i731x5s6dagl5afzv37l1qchys36xrym";
+          name = "mc-extras";
+        };
+        packageRequires = [ multiple-cursors ];
+        meta = {
+          homepage = "http://melpa.org/#/mc-extras";
+          license = lib.licenses.free;
+        };
+      }) {};
+    md-readme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "md-readme";
+        version = "20150506.159";
+        src = fetchFromGitHub {
+          owner = "thomas11";
+          repo = "md-readme";
+          rev = "9f3630d3ad2b83ec20968cf02c6613c53e8e32ec";
+          sha256 = "1j8gp3byanf1mq8sc4hv838rgcywlv35d8q1vjwzsjaznvz8hvc3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/md-readme";
+          sha256 = "1krq0f79jjrlihr2aqq87pxdqixv2zdjw4hm732sz79g996yxyw3";
+          name = "md-readme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/md-readme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    meacupla-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "meacupla-theme";
+        version = "20151027.1717";
+        src = fetchFromGitLab {
+          owner = "jtecca";
+          repo = "meacupla-theme";
+          rev = "f57542222a3a43af9aae665e05a84a61637ab22a";
+          sha256 = "136lh39hakwx46rd1gsmsfhsj78mrpamid766v2vjx9rkkprk0zv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/meacupla-theme";
+          sha256 = "09q88q2xghj5vn5y3mjrcparfwdzavkgjyg2ay55h7wf5f2zpw2d";
+          name = "meacupla-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/meacupla-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mediawiki";
+        version = "20150711.1934";
+        src = fetchFromGitHub {
+          owner = "hexmode";
+          repo = "mediawiki-el";
+          rev = "47875f753599e309f1c3da5beb4805487ab75636";
+          sha256 = "1cdr5p9x9bxnfy9mgz7l70zfzfwcjdhydw0jhdvs6qlqaqmm4qqq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mediawiki";
+          sha256 = "17cbrzfdp6jbbf74mn2fi1cwv7d1hvdbw9j84p43jzscnaa5ikx6";
+          name = "mediawiki";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mediawiki";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mellow-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mellow-theme";
+        version = "20141116.102";
+        src = fetchFromGitHub {
+          owner = "emacsfodder";
+          repo = "emacs-mellow-theme";
+          rev = "ab72898824af6452d0cefea16e49491e42b660d1";
+          sha256 = "0bilwhvprzk634sk5hnxilrvrl0yv593swzznch0p38hqxl585ld";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mellow-theme";
+          sha256 = "0kl1psykx7akxwabszk4amszh3zil8ia4bfbjjvr6h9phgx66pb0";
+          name = "mellow-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/mellow-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    melpa-upstream-visit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "melpa-upstream-visit";
+        version = "20130720.533";
+        src = fetchFromGitHub {
+          owner = "laynor";
+          repo = "melpa-upstream-visit";
+          rev = "7310c74fdead3c0f86ad6eff76cf989e63f70f66";
+          sha256 = "12cp56ppmwpdgf5afx7hd2qb8d1qq8z27191fbbf5zqw8cq5zkpd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/melpa-upstream-visit";
+          sha256 = "0j4afy9ipzr7pwkij8ab207mabd7srganlyyif9h1hvclj9svdmf";
+          name = "melpa-upstream-visit";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "http://melpa.org/#/melpa-upstream-visit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    memento = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "memento";
+        version = "20150823.539";
+        src = fetchFromGitHub {
+          owner = "ehartc";
+          repo = "memento";
+          rev = "35733b79101f694346792a57df686cbffe64bd79";
+          sha256 = "0pjqax3pi6pb650yb8iwa4brwwl6cdka7jym3cfkpppyy782dm0q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/memento";
+          sha256 = "0f8ajhj677r2kxszmad6h1j1b827ja0vaz2my1vx145y3gf160b8";
+          name = "memento";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/memento";
+          license = lib.licenses.free;
+        };
+      }) {};
+    memoize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "memoize";
+        version = "20130421.1434";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "emacs-memoize";
+          rev = "b55eab0cb6ab05d941e07b8c01f1655c0cf1dd75";
+          sha256 = "0fjwlrdm270qcrqffvarw5yhijk656q4lam79ybhaznzj0dq3xpw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/memoize";
+          sha256 = "0mzz3hghnbkmxf9wgjqv3sbyxyqqzvvscazq9ybb0b41qrzm73s6";
+          name = "memoize";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/memoize";
+          license = lib.licenses.free;
+        };
+      }) {};
+    memolist = callPackage ({ ag, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
+    melpaBuild {
+        pname = "memolist";
+        version = "20150804.1221";
+        src = fetchFromGitHub {
+          owner = "mikanfactory";
+          repo = "memolist.el";
+          rev = "60c296e202a71e9dcf1c3936d47b5c4b95c5839f";
+          sha256 = "1jd4rjv812iv7kp4wyxdz8sk7j0442m8x2ypk6hiqis0braxnspm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/memolist";
+          sha256 = "1whajbwmz1v01dirv795bhvs27vq9dh0qmj10dk2xia7vhn42mgh";
+          name = "memolist";
+        };
+        packageRequires = [ ag markdown-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/memolist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mentor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
+    melpaBuild {
+        pname = "mentor";
+        version = "20140904.1910";
+        src = fetchFromGitHub {
+          owner = "skangas";
+          repo = "mentor";
+          rev = "f5d653348140cdab1d8ee9143b14a50ea88ed3fb";
+          sha256 = "11hyydc13jdai6lkxx8nqf8xljh0gx7fcmywhik4f1hf3pdv7i2q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mentor";
+          sha256 = "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s";
+          name = "mentor";
+        };
+        packageRequires = [ xml-rpc ];
+        meta = {
+          homepage = "http://melpa.org/#/mentor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    menu-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "menu-bar-plus";
+        version = "20151231.1622";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/menu-bar+.el";
+          sha256 = "1i96s0z0q9z2ws2b1lz1n50j6hih9y4rsy7mwx0k8a4ikll0gx82";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/menu-bar+";
+          sha256 = "181jxjnzdckmvpsdknhm21xwimvsp0qxn8azfn58dz41gl4xcg90";
+          name = "menu-bar-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/menu-bar+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "merlin";
+        version = "20151228.934";
+        src = fetchFromGitHub {
+          owner = "the-lambda-church";
+          repo = "merlin";
+          rev = "969a01386f78b39432b1decacaac5ba0e48c85f2";
+          sha256 = "18gcqs9ds1afm11p78x5l9mqizlrq4cf4slapzwm2fmwbb1wf69x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/merlin";
+          sha256 = "0wnh7512sknagdk56j6gd8vamh9ns3vnggm56s73pik0m009w0xr";
+          name = "merlin";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/merlin";
+          license = lib.licenses.free;
+        };
+      }) {};
+    message-x = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "message-x";
+        version = "20151029.918";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/message-x.el";
+          sha256 = "05ic97plsysh4nqwdrsl5m9f24m11w24bahj8bxzfdawfima2bkf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/message-x";
+          sha256 = "0z12alizwrqp5f9wq3qllym9k5xljh904c9qhlfhp9biazj6yqwj";
+          name = "message-x";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/message-x";
+          license = lib.licenses.free;
+        };
+      }) {};
+    meta-presenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "meta-presenter";
+        version = "20150501.610";
+        src = fetchFromGitHub {
+          owner = "myTerminal";
+          repo = "meta-presenter";
+          rev = "bfdbe68384466bf3eb991d05c7f371f0b52a382f";
+          sha256 = "1x425ah3ymjyp3pxvyzyp4gd8zrjx8lgdzprml8qvf1yk82iv45l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/meta-presenter";
+          sha256 = "0f70cfa91wavchlx8d9hdlgq90cmnylhbg2dbw603rzjkyvslp5d";
+          name = "meta-presenter";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/meta-presenter";
+          license = lib.licenses.free;
+        };
+      }) {};
+    metascript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "metascript-mode";
+        version = "20150708.1957";
+        src = fetchFromGitHub {
+          owner = "metascript";
+          repo = "metascript-mode";
+          rev = "edb361c7b0e5de231e5334a17b90652fb1df78f9";
+          sha256 = "1rascpmv17dksyn9y0llmjb8r4484x5ax54w6r83k1x7ha1iacx5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/metascript-mode";
+          sha256 = "1kgs4ki0s6bxx2ri6zxmsy2b2w56gnr9hjkr6302wcmp3qy7clwn";
+          name = "metascript-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/metascript-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    metaweblog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
+    melpaBuild {
+        pname = "metaweblog";
+        version = "20141130.805";
+        src = fetchFromGitHub {
+          owner = "punchagan";
+          repo = "metaweblog.el";
+          rev = "c8b50a6edf0fd2f396570c9a1c2ef8cd207606fb";
+          sha256 = "06mbdb4zb07skq1jpv05hr45k5x96d9hgkb358jiq0kfsqlrbbb4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/metaweblog";
+          sha256 = "11y5x3a8iv0hjj7ppi2sa7vawn7r475qfsh1jg415j4y4fzwpk6y";
+          name = "metaweblog";
+        };
+        packageRequires = [ xml-rpc ];
+        meta = {
+          homepage = "http://melpa.org/#/metaweblog";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mew";
+        version = "20150814.154";
+        src = fetchFromGitHub {
+          owner = "kazu-yamamoto";
+          repo = "Mew";
+          rev = "ff9c41b981fb6050121a3831825d0349bffeb9ce";
+          sha256 = "1rkipcv53p7zra3gbjc77ywyxn8d1kx2gniyfqq16d2p2jw0lbzb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mew";
+          sha256 = "0423xxn3cw6jmsd7vrw30hx9phga5chxzi6x7cvpswg1mhcyn9fk";
+          name = "mew";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mew";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mexican-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mexican-holidays";
+        version = "20160109.1542";
+        src = fetchFromGitHub {
+          owner = "shopClerk";
+          repo = "mexican-holidays";
+          rev = "43ced1f9e40a04be6927d1a1be64060f9be4f5c5";
+          sha256 = "0bhllmyk1r9y63jw5gx10v09791w33lc54qs31gcxbnss094l6py";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mexican-holidays";
+          sha256 = "0awf4vv6mbp1xr92nsgdn513g4adqhp21k12q4fbm85b2l3jlspb";
+          name = "mexican-holidays";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mexican-holidays";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mhc";
+        version = "20151210.238";
+        src = fetchFromGitHub {
+          owner = "yoshinari-nomura";
+          repo = "mhc";
+          rev = "0204160474bdb01e62c89364b5f720b2c42afb0d";
+          sha256 = "0z34x254z79acslxzn35mg9nsxh0cpmb540k90vlp7am7g4d4sra";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mhc";
+          sha256 = "02ikn9hx0kcfc2xrx4f38zpkfi6vgz7chcxk6q5d0vcsp93b4lql";
+          name = "mhc";
+        };
+        packageRequires = [ calfw ];
+        meta = {
+          homepage = "http://melpa.org/#/mhc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mic-paren = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "mic-paren";
+        version = "20140714.219";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/mic-paren.el";
+          sha256 = "1ibim60fx0srmvchwbb2s04dmcc7mv7zyg1vqavas24ya2gmixc5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mic-paren";
+          sha256 = "1kdmp0wd7838nk58lby8gx91pjan47lq3izk4vdb2vm0h0iq57sa";
+          name = "mic-paren";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mic-paren";
+          license = lib.licenses.free;
+        };
+      }) {};
+    midje-mode = callPackage ({ cider, clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "midje-mode";
+        version = "20150921.1950";
+        src = fetchFromGitHub {
+          owner = "dnaumov";
+          repo = "midje-mode";
+          rev = "07fc6cee4f5d6aa4187636266b9681a3e455ab6b";
+          sha256 = "1cigsr0hkbi1860w38k2j8fw6j4w43pgv2bpkmdsifbqy6l8grpg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/midje-mode";
+          sha256 = "0069hwy5cyrsv5b1yvjhmjasywbmc8x3daq9hkzidy3a2fmqgqv3";
+          name = "midje-mode";
+        };
+        packageRequires = [ cider clojure-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/midje-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    midje-test-mode = callPackage ({ cider, clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "midje-test-mode";
+        version = "20131208.1114";
+        src = fetchFromGitHub {
+          owner = "bpoweski";
+          repo = "midje-test-mode";
+          rev = "46fc081865d48f30b950f21a597eadd59a802fc9";
+          sha256 = "0f3iq4ghi4ig2by1smfciavr2f0lx6vhvajykxdfs0afn006w4cs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/midje-test-mode";
+          sha256 = "0i5j9bnrncxar8hpy3d0566d0y5s4ywakskf27d3kxfyrwqi4l4f";
+          name = "midje-test-mode";
+        };
+        packageRequires = [ cider clojure-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/midje-test-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    migemo = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "migemo";
+        version = "20150412.941";
+        src = fetchFromGitHub {
+          owner = "emacs-jp";
+          repo = "migemo";
+          rev = "c2240afa9afc0f003bb1d846710505e8e8e38169";
+          sha256 = "1az4mnmanhz9ga0g46jf33w8axcw8lnrb9lmszajwv7y5j9nk7yr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/migemo";
+          sha256 = "0y49imdwygv5zd7cyh9ngda4gyb2mld2a4s7zh4yzlh7z5ha9qkr";
+          name = "migemo";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/migemo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    milkode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "milkode";
+        version = "20140927.29";
+        src = fetchFromGitHub {
+          owner = "ongaeshi";
+          repo = "emacs-milkode";
+          rev = "ba97e2aeefa1d9d0b3835bf08edd0de248b0c513";
+          sha256 = "1qg64mxsm2cswk52mlj7sx7k6gfnrsdwnf68i7cachri0i8aq4ap";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/milkode";
+          sha256 = "07v6xgalx7vcw5sghckwvz584746cba05ql8flv8n556glm7hibh";
+          name = "milkode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/milkode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    minesweeper = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "minesweeper";
+        version = "20150414.22";
+        src = fetchhg {
+          url = "https://bitbucket.com/zck/minesweeper.el";
+          rev = "d29af12fc611";
+          sha256 = "1b2kn4c90hl07lzdg10wamd4lq8f24wmaj4zvr728pwyga99b2av";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minesweeper";
+          sha256 = "1n6r3a3rl09pv4jvb7ald1gaipqylfchggza973qv9rgh5g90nag";
+          name = "minesweeper";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/minesweeper";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mingus = callPackage ({ fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild }:
+    melpaBuild {
+        pname = "mingus";
+        version = "20151115.1317";
+        src = fetchFromGitHub {
+          owner = "pft";
+          repo = "mingus";
+          rev = "151f2225f9af3c4cc7ca89e94dc6a19077baf6a4";
+          sha256 = "0r4jh58pls859fljb6qm49l4imfxxif9mxsmjgwan0czfhq33xqh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mingus";
+          sha256 = "0vw09qk56l792706vvp465f40shf678mcmdh7iw8wsjix4401bzi";
+          name = "mingus";
+        };
+        packageRequires = [ libmpdee ];
+        meta = {
+          homepage = "http://melpa.org/#/mingus";
+          license = lib.licenses.free;
+        };
+      }) {};
+    minibuf-isearch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "minibuf-isearch";
+        version = "20151226.1343";
+        src = fetchFromGitHub {
+          owner = "knagano";
+          repo = "minibuf-isearch";
+          rev = "2846c6ac369ee623dad4cd3c8a7a6d9078965516";
+          sha256 = "1n4b039448826w2jcsv4r2iw3v2vlrsxw8dbci8wcfigmkbfc879";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minibuf-isearch";
+          sha256 = "0n36d152lc53zj9jy38b0c7hlww0z6hx94y3x2njy6cmh3p5g8nh";
+          name = "minibuf-isearch";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/minibuf-isearch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    minibuffer-complete-cycle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "minibuffer-complete-cycle";
+        version = "20130813.1145";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "minibuffer-complete-cycle";
+          rev = "3df80135887d0169e02294a948711f6dfeca4a6f";
+          sha256 = "1zyb6c3xwdzk7dpn7xi0mvbcjdfxvzz1a0zlbs053pfar8iim5fk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minibuffer-complete-cycle";
+          sha256 = "0y1mxs6q9a8lzprrlb22qff6x5mvkw4gp2l6p2js2r0j9jzyffq2";
+          name = "minibuffer-complete-cycle";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/minibuffer-complete-cycle";
+          license = lib.licenses.free;
+        };
+      }) {};
+    minibuffer-cua = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "minibuffer-cua";
+        version = "20130906.634";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "minibuffer-cua.el";
+          rev = "adc4979a64f8b36e05960e9afa0746dfa9e2e4c7";
+          sha256 = "011kg76zr4hfhi2gngnc7jlmp0l0nvhmlgyc0y9bir2jbjf4yyvz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minibuffer-cua";
+          sha256 = "1ragvr73ykbvpgynnq3z0z4yzrlfhfqlwc1vbxclb8x2xmxq7pzw";
+          name = "minibuffer-cua";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/minibuffer-cua";
+          license = lib.licenses.free;
+        };
+      }) {};
+    miniedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "miniedit";
+        version = "20100419.1245";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "miniedit";
+          rev = "e12bf659c3eb92dd8a4cb77642dc0865c54667a3";
+          sha256 = "1850z96gly0jnr50472idqz1drzqarr0n23bbasslrc501xkg0bq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/miniedit";
+          sha256 = "10s407q7igdi2hsaaahbw8vckalrl7z3s6l9cflf51q16xh2ih87";
+          name = "miniedit";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/miniedit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    minimal-session-saver = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "minimal-session-saver";
+        version = "20140508.1541";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "minimal-session-saver";
+          rev = "cf654ac549850746dc21091746e4bcc1aef7668e";
+          sha256 = "1sj5sq932w079y3vy55q5b6wybwrzz30y092iq1mpfg5xvl42sbm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minimal-session-saver";
+          sha256 = "1ay7wvriga28bdmarpfwagqzmmk93ri9f3idhr6z6iivwggwyy2i";
+          name = "minimal-session-saver";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/minimal-session-saver";
+          license = lib.licenses.free;
+        };
+      }) {};
+    minimal-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "minimal-theme";
+        version = "20140409.1801";
+        src = fetchFromGitHub {
+          owner = "ikame";
+          repo = "minimal-theme";
+          rev = "2cc688c1705eeb77fe1deeea35bfce378081f238";
+          sha256 = "1iy1z2kwnbzxhz5r4gsy4zm0l3xbwy314dqxliprbl8n2m9w0lmz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minimal-theme";
+          sha256 = "0l4xj5q06h5fk634d6v3idm0zniq8grz4rjm6qzi7b4jr9sc60gm";
+          name = "minimal-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/minimal-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    minitest = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "minitest";
+        version = "20160111.1349";
+        src = fetchFromGitHub {
+          owner = "arthurnn";
+          repo = "minitest-emacs";
+          rev = "263d3f03cdee0b84c8e122b4eae333ffbb793cda";
+          sha256 = "08sy08bzn2as4n6jydrzvn0h0xahyihr2snfr3ps25gkfwxsk4aq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minitest";
+          sha256 = "0x6nd4kkhiw8hh79r69861pf41j8p1y39kzf2rl61zlmyjz9zpmw";
+          name = "minitest";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/minitest";
+          license = lib.licenses.free;
+        };
+      }) {};
+    minizinc-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "minizinc-mode";
+        version = "20151214.758";
+        src = fetchFromGitHub {
+          owner = "m00nlight";
+          repo = "minizinc-mode";
+          rev = "98064f098e6871382614fcf3c99520f7a526af0a";
+          sha256 = "0808cl5ixvmhd8pa6fc8rn7wbxzvqjgz43mz1pambj89vbkzmw1c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minizinc-mode";
+          sha256 = "1blb6mbyqvmdvwp477p1ggs3n6rzi9sdfvi0v1wfzmd7k749b10c";
+          name = "minizinc-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/minizinc-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    minor-mode-hack = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "minor-mode-hack";
+        version = "20141226.1420";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/minor-mode-hack.el";
+          sha256 = "0vwvvhzqiad82qvfwygb2arq1mdvh1lj6q2as0a92fg1vc95qcb0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minor-mode-hack";
+          sha256 = "1f2wy25iphk3hzjy39ls5j04173g7gaq2rdp2grkawfhwx0ld4pj";
+          name = "minor-mode-hack";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/minor-mode-hack";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mip-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mip-mode";
+        version = "20151127.17";
+        src = fetchFromGitHub {
+          owner = "gaudecker";
+          repo = "mip-mode";
+          rev = "7c88c383b4c7ed0a4c1dc397735f365c1fcb461c";
+          sha256 = "12k9ii4090dn03xvgqisl4zl4qi33054zxyfkqzzpa9wv72h4knc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mip-mode";
+          sha256 = "1wx5zg4kimd29vqipbzm4vjphn0mldri12g6b18kc290nhgj22ar";
+          name = "mip-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mip-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    misc-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "misc-cmds";
+        version = "20151231.1623";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/misc-cmds.el";
+          sha256 = "0sc4l0prwmakxmdq22xd5mj8ddwhzrs034zmx2swi2k3s07x15id";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/misc-cmds";
+          sha256 = "0bylb84icddgznmim18fwq1mhh3qz8yh8ch6lpadf9p3h420qgcl";
+          name = "misc-cmds";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/misc-cmds";
+          license = lib.licenses.free;
+        };
+      }) {};
+    misc-fns = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "misc-fns";
+        version = "20151231.1708";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/misc-fns.el";
+          sha256 = "1mksmxy741sv7d5lr9wlj4klb0sg06bg5z1zpd5hj0bd4b3mx7x0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/misc-fns";
+          sha256 = "1spjbkcac33lyfsgkd6z186a3432x9nw3akmx194gaap2863xcam";
+          name = "misc-fns";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/misc-fns";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mkdown = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
+    melpaBuild {
+        pname = "mkdown";
+        version = "20140517.918";
+        src = fetchFromGitHub {
+          owner = "ajtulloch";
+          repo = "mkdown.el";
+          rev = "8e23de82719af6c5b53b52b3308a02b3a1fb872e";
+          sha256 = "1d08i2cfn1q446nyyji0hi9vlw7bzkpxhn6653jz2k77vd2y0wmk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mkdown";
+          sha256 = "1b2vi8q6jhq1xv7yr5f3aiyp1w8j59w19vxys0pv6bqr2gra07i1";
+          name = "mkdown";
+        };
+        packageRequires = [ markdown-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/mkdown";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mmm-jinja2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-mode }:
+    melpaBuild {
+        pname = "mmm-jinja2";
+        version = "20150904.1334";
+        src = fetchFromGitHub {
+          owner = "beardedprojamz";
+          repo = "mmm-jinja2";
+          rev = "0ecd7fd239fc096495d903b5f1bafac83515acef";
+          sha256 = "1lcc2p9qz70kpykgx82isv0qiqlsajp4vvcj6bvag92d7h9yk9bv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mmm-jinja2";
+          sha256 = "0579sv77dyzishhcw4xxi444inwy4jgh9vmxwd856nd05j3cyc7z";
+          name = "mmm-jinja2";
+        };
+        packageRequires = [ mmm-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/mmm-jinja2";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mmm-mako = callPackage ({ fetchhg, fetchurl, lib, melpaBuild, mmm-mode }:
+    melpaBuild {
+        pname = "mmm-mako";
+        version = "20121020.151";
+        src = fetchhg {
+          url = "https://bitbucket.com/pjenvey/mmm-mako";
+          rev = "5c9ff92137b5";
+          sha256 = "0rpp748ym79sxccp9pyrwri14m7624zzb80srfgjfdpysrrs0jrr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mmm-mako";
+          sha256 = "0a4af5q9wxafrid8visp30cz6073ig0c961b78vmmgqrwvvxd3kn";
+          name = "mmm-mako";
+        };
+        packageRequires = [ mmm-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/mmm-mako";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mmm-mode";
+        version = "20150828.1916";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "mmm-mode";
+          rev = "c9a857a638701482931ffaaee262b61ce53489f3";
+          sha256 = "04rapmqblfjvmdccm9kqi8gn0him1x2q7hjwsyb8mg4lwxcd7qp9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mmm-mode";
+          sha256 = "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw";
+          name = "mmm-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mmm-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mmt";
+        version = "20150906.1159";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "mmt";
+          rev = "e77b809e39b9ab437b662ee759e990163bc89377";
+          sha256 = "05nmcx3f63ds31cj3qwwp03ksflkfwlcn3z2xyxbny83r0dxbgvc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mmt";
+          sha256 = "0hal3qcw6x9658xpdaw6q9l2rr2z107pvg5bdzshf67p1b3lf9dq";
+          name = "mmt";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/mmt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mo-git-blame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mo-git-blame";
+        version = "20151127.215";
+        src = fetchFromGitHub {
+          owner = "mbunkus";
+          repo = "mo-git-blame";
+          rev = "a0b9ca186d96ef02a5c0ab5d1c29b7a71e78af68";
+          sha256 = "1ydv6z0nns3cc3bxb1r7052dck66y4v201ms2bzichmd351qhv6q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mo-git-blame";
+          sha256 = "1dp9pxhggappb70m5hyp8sxlnh06y996adabq7x6qvm745mk6f0x";
+          name = "mo-git-blame";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mo-git-blame";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mo-vi-ment-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mo-vi-ment-mode";
+        version = "20131029.133";
+        src = fetchFromGitHub {
+          owner = "AjayMT";
+          repo = "mo-vi-ment";
+          rev = "f45b014261f8fab19254920bd1d92f3a83263411";
+          sha256 = "0k0scl9z35d8x4ikxm2db1frpbx151p2m181fa1armxbd9lbfvnn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mo-vi-ment-mode";
+          sha256 = "1pg889mgpv0waccm135mlvag7q13gzfkzchv2532jngwrn6amqc7";
+          name = "mo-vi-ment-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mo-vi-ment-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mobdebug-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, lua-mode, melpaBuild }:
+    melpaBuild {
+        pname = "mobdebug-mode";
+        version = "20140109.2146";
+        src = fetchFromGitHub {
+          owner = "deftsp";
+          repo = "mobdebug-mode";
+          rev = "e1d483bc4e341c762bc5c0a8c52306a8d01ea0da";
+          sha256 = "04hbd7mv29v3fv4ld0b3skrir0wp9dix2n5nbqp63fj6n5i4cyyz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mobdebug-mode";
+          sha256 = "19k0c7igqsqvib6hx0nssig4l5f959dlr4wijd1hp5h1hmcb5vv8";
+          name = "mobdebug-mode";
+        };
+        packageRequires = [ emacs lua-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/mobdebug-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mocha-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "mocha-snippets";
+        version = "20150116.1000";
+        src = fetchFromGitHub {
+          owner = "cowboyd";
+          repo = "mocha-snippets.el";
+          rev = "b8d321eda797e8382f0033901694860fe52f19a9";
+          sha256 = "06c92q1wrj6b8d8k7i10d4gcy5liag3x4f4chh510c4d3wi0f6sp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mocha-snippets";
+          sha256 = "0dbsdk4jpzxv2sxx0nia9zhd0a0wmkz1qcqmbd15m1909ccdwxds";
+          name = "mocha-snippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/mocha-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mocker = callPackage ({ eieio ? null, el-x, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mocker";
+        version = "20150916.2054";
+        src = fetchFromGitHub {
+          owner = "sigma";
+          repo = "mocker.el";
+          rev = "b56f0f2839d4a395979816b40089a77050518eb6";
+          sha256 = "0dngznaraphpc5amn9n120la7ga3rj7h67pnnal6qwflh5rqcmss";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mocker";
+          sha256 = "1g90jp1czrrzrmn7n4linby3q4fb4gcflzv2amjv0sdimw1ln1w3";
+          name = "mocker";
+        };
+        packageRequires = [ eieio el-x ];
+        meta = {
+          homepage = "http://melpa.org/#/mocker";
+          license = lib.licenses.free;
+        };
+      }) {};
+    modalka = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "modalka";
+        version = "20150924.1111";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "modalka";
+          rev = "67e08b9d315cfa6a2ca3b3dc3954214c68a90cf5";
+          sha256 = "04c7js9jfhzcak9rgzqh1lq56i2b1g4phwjncsxkirvx97rnz4ac";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/modalka";
+          sha256 = "0bkjykvl6sw797h7j76dzn1viy598asly98gcl5wrq13n4w1md4c";
+          name = "modalka";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/modalka";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mode-icons = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mode-icons";
+        version = "20130602.748";
+        src = fetchgit {
+          url = "git://ryuslash.org/mode-icons.git";
+          rev = "cbf412d0c47dfdbeac7587a0c12c96f58f546467";
+          sha256 = "b7afff1d8fb0b3f044d266af479df51fbb6021ff433628a9dc669695c1ddae40";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mode-icons";
+          sha256 = "18w221zjrrsfcymprv5x75i3qv04zy4bxl9mqjv0ys7qcc8xf1dp";
+          name = "mode-icons";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mode-icons";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mode-line-debug = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mode-line-debug";
+        version = "20150307.712";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "mode-line-debug";
+          rev = "da44422eeb6a1f055b4ec2f822962c5162fce001";
+          sha256 = "1lkw9nnlns6v7r6nx915f85whq1ri4w8lccwyxrvam40hfvq60s1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mode-line-debug";
+          sha256 = "0ppj14bm3rx3xgg4mfxa5zcm2r129jgmsx817wq3h7akjngcbfkd";
+          name = "mode-line-debug";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mode-line-debug";
+          license = lib.licenses.free;
+        };
+      }) {};
+    modeline-char = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "modeline-char";
+        version = "20151231.1719";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/modeline-char.el";
+          sha256 = "1dlprk1jlfw7b7vnxi0d0mf85737wkjc5fkvycx8nawngb2fqhbw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/modeline-char";
+          sha256 = "1cb6pm69db0jbksmc4mkawf643i74is9v7ka34pv3mb21nj095qp";
+          name = "modeline-char";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/modeline-char";
+          license = lib.licenses.free;
+        };
+      }) {};
+    modeline-posn = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "modeline-posn";
+        version = "20160112.849";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/modeline-posn.el";
+          sha256 = "1r4zq355h570hk7qq0ik121bwsr4hjnhacal4d4h119d11gq2p8d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/modeline-posn";
+          sha256 = "0dngfcbcdh22fl6nd47dhg9z9iivj67six67zjr9j1cbngp10dwk";
+          name = "modeline-posn";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/modeline-posn";
+          license = lib.licenses.free;
+        };
+      }) {};
+    modtime-skip-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "modtime-skip-mode";
+        version = "20140128.1601";
+        src = fetchFromGitHub {
+          owner = "jordonbiondo";
+          repo = "modtime-skip-mode";
+          rev = "c0e49523aa26b2263a8693691ac775988015f592";
+          sha256 = "0ri841cwx2mx8ri50lhvifmxnysdc022421mlmklql0252kn775l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/modtime-skip-mode";
+          sha256 = "1drafwf4kqp83jp47j2ddl2n4a92zf1589fnp6c72hmjqcxv3l28";
+          name = "modtime-skip-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/modtime-skip-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "moe-theme";
+        version = "20151124.1709";
+        src = fetchFromGitHub {
+          owner = "kuanyui";
+          repo = "moe-theme.el";
+          rev = "56b0833e3549e1b2f008388549972971936b053f";
+          sha256 = "0dyp8jpznb9ivzkka2cgydzcldc275238p0f1c9pcrxjf7mjglmx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/moe-theme";
+          sha256 = "1nqvj8spvffgjvqlf25rcm3dc6w1axb6qlwwsjhq401a6xhw67f6";
+          name = "moe-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/moe-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    molokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "molokai-theme";
+        version = "20151016.1045";
+        src = fetchFromGitHub {
+          owner = "alloy-d";
+          repo = "color-theme-molokai";
+          rev = "04a44f21184b6a26caae4f2c92db9019d883309c";
+          sha256 = "1hqa59pdrnwfykyl58lr8pfbh2f13sygvmrh707hbwc2aii0jjv2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/molokai-theme";
+          sha256 = "0srdh3yx7j6xs7rgpzmsyzz6ds00kq887rs2sfa0nvk0j0ga6baf";
+          name = "molokai-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/molokai-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mongo";
+        version = "20150315.719";
+        src = fetchFromGitHub {
+          owner = "m2ym";
+          repo = "mongo-el";
+          rev = "595529ddd70ecb9fab8b11daad2c3929941099d6";
+          sha256 = "0z8mcfhj425hb91fkj1pyg3apw1kf4mgy8lx6n1sc8zmib38py0x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mongo";
+          sha256 = "103zkslqdihjyl81688fvkq96rzk3an1vf3gz8rlmmz5anbql8ai";
+          name = "mongo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mongo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    monky = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "monky";
+        version = "20150404.218";
+        src = fetchFromGitHub {
+          owner = "ananthakumaran";
+          repo = "monky";
+          rev = "48c0200910739b6521f26f6423b2bfb8c38b4482";
+          sha256 = "0ddkcb5rzpcqpsrwkhvm9kzpx2mlrrsp7psljkz5q5qfvy3wdagh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/monky";
+          sha256 = "1m7hy3ijwgxqjk3vjvqkxqj8b5bqnd201bmf302k45n0dpjmhshz";
+          name = "monky";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/monky";
+          license = lib.licenses.free;
+        };
+      }) {};
+    monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "monochrome-theme";
+        version = "20140326.550";
+        src = fetchFromGitHub {
+          owner = "fxn";
+          repo = "monochrome-theme.el";
+          rev = "58fb4cf28c407f059b78bfd72c4dbced07638dd6";
+          sha256 = "1sxhpvxapzgrwvzibkg7zd3ppmfcz5rhrbvg73b8rggjg4m5snyf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/monochrome-theme";
+          sha256 = "191ikqns1sxcz6ca6xp6mb2vyfj19x19cmcf17snrf46kmx60qk9";
+          name = "monochrome-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/monochrome-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "monokai-theme";
+        version = "20160104.1512";
+        src = fetchFromGitHub {
+          owner = "oneKelvinSmith";
+          repo = "monokai-emacs";
+          rev = "8bd39a186bf4e1bd4ce115aef39b2831561ba28b";
+          sha256 = "0rszr7p5v47s66kj872mz68apkbykhl51lp4v1apwj1ay32lbx9h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/monokai-theme";
+          sha256 = "13mv4vgsmdbf3v748lqi7b42hvr3yp86n97rb6792bcgd3kbdx7a";
+          name = "monokai-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/monokai-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "monroe";
+        version = "20141111.307";
+        src = fetchFromGitHub {
+          owner = "sanel";
+          repo = "monroe";
+          rev = "7f42a0139a8030407da736ddb0f67132634b70c0";
+          sha256 = "1z1gyknxscvk2qpfcrgzymf9w5m8jcnj525q852b8s6yf5fnffmh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/monroe";
+          sha256 = "04rhninxppvilk7s90g0wwa0g9vfcg7mk8mrb2m2c7cb9vj6wyig";
+          name = "monroe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/monroe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    morlock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "morlock";
+        version = "20150815.1034";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "morlock";
+          rev = "804131c7cff5dafa762c666fd66458111e4ee36f";
+          sha256 = "1ndgw4799d816pkn2bwja5kmigydpmj9znn8cax4dxsd9fg2hzjy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/morlock";
+          sha256 = "0693jr1k8mzd7hwp52azkl62c1g1p5yinarjcmdksfyqblqq5jna";
+          name = "morlock";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/morlock";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mote-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
+    melpaBuild {
+        pname = "mote-mode";
+        version = "20121014.2319";
+        src = fetchFromGitHub {
+          owner = "inkel";
+          repo = "mote-mode";
+          rev = "18dfc3af0cee7d6d522616f07134364c1c3e54ba";
+          sha256 = "1hz9vqvhyz2zw5sl4r62rjxiymqlp9y26j4kdd9qy1y67zx9rmi7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mote-mode";
+          sha256 = "1lg5z5d0d35sh21maiwmgzvc31iki9yg6x0awy5xrfsains7ykn9";
+          name = "mote-mode";
+        };
+        packageRequires = [ ruby-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/mote-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    motion-mode = callPackage ({ fetchFromGitHub, fetchurl, flymake-cursor, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "motion-mode";
+        version = "20140919.2056";
+        src = fetchFromGitHub {
+          owner = "ainame";
+          repo = "motion-mode";
+          rev = "4c94180e3ecea611a61240a0c0cd48f1032c4a55";
+          sha256 = "17570labnwdnwca2cg4ga0mrrm00n0h3wlxry823k5yn3k93rnj1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/motion-mode";
+          sha256 = "1lfsc8ayiz2v3dfn8c0mmfch8vpzqyddxw8kscan2lzl2lcj50h0";
+          name = "motion-mode";
+        };
+        packageRequires = [ flymake-cursor flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/motion-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mouse-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "mouse-plus";
+        version = "20151231.1725";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/mouse+.el";
+          sha256 = "0rakxcpqdx175hic3ykwbd5if53dvvf0sxhq0gplpsybpqvkimyv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mouse+";
+          sha256 = "1fv7jnqzskx9iv92dm2pf0mqy2accl0svjl2kkb6v273n1day3f8";
+          name = "mouse-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mouse+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mouse-slider-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mouse-slider-mode";
+        version = "20150910.1600";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "mouse-slider-mode";
+          rev = "a8d6489fe2a3c2769b421f93f3609f402c9b92f7";
+          sha256 = "05pzplb3gmlnlvn2azbxdlf4vrkvk8fc9dkgi2nq4shysnh4c9v7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mouse-slider-mode";
+          sha256 = "0aqxjm78k7i8c59w6mw9wsfw3rail1pg40ac1dbcjkm62fjbh5hy";
+          name = "mouse-slider-mode";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/mouse-slider-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mouse3 = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "mouse3";
+        version = "20151231.1726";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/mouse3.el";
+          sha256 = "1831jpi06hi5v2jdjgs83jma7fp8xiqdmvvwxfyp2zpbfwi1lkb6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mouse3";
+          sha256 = "1rppn55axjpqwqm2lq4dvwi3z7xkd5jkyqi1x8jqgcsfc9w6m777";
+          name = "mouse3";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mouse3";
+          license = lib.licenses.free;
+        };
+      }) {};
+    move-dup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "move-dup";
+        version = "20140925.1008";
+        src = fetchFromGitHub {
+          owner = "wyuenho";
+          repo = "move-dup";
+          rev = "964d1bbaacd4559d2dbde9cb44015c400d5a71b5";
+          sha256 = "0baynb6gq04rxh10l6rn0myrhg7c7fwqaryiiyddp4jy7llf83c8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/move-dup";
+          sha256 = "0b0lmiisl9yckblwf7619if88qsmbka3bl4qiaqam7fka7psxs7f";
+          name = "move-dup";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/move-dup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    move-text = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "move-text";
+        version = "20140307.1044";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/move-text.el";
+          sha256 = "0azda60cbz3kpvy6zd7pvlj40iwvj1zjdxv1brzqa6yfa4kyixv2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/move-text";
+          sha256 = "1xgq7wsh08fb23zv71lfw5rska9wijsl64ijpi2m06zyw1m7mdqr";
+          name = "move-text";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/move-text";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mowedline";
+        version = "20150601.1209";
+        src = fetchFromGitHub {
+          owner = "retroj";
+          repo = "mowedline";
+          rev = "058d5fad71c9895ab36cf83b3f0a0b722054cb19";
+          sha256 = "179mc70x3dvj0cz6yyhs00ndh0xvk71gmiscln9y0f1ngxr5h338";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mowedline";
+          sha256 = "0c2hvvwa7s5iyz517jaskshdcq9zs15zr6xsvrcb3biahrh4bmfb";
+          name = "mowedline";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mowedline";
+          license = lib.licenses.free;
+        };
+      }) {};
+    moz = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "moz";
+        version = "20150805.1206";
+        src = fetchFromGitHub {
+          owner = "bard";
+          repo = "mozrepl";
+          rev = "57f278849e4246a992e731e188b221a2574fc81e";
+          sha256 = "1g06i3d8xv8ja6nfww4k60l3467xr1s9xsk7i6dbicq0lf8559h9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/moz";
+          sha256 = "0ar2xgsi7csjj6fgiamrjwjc58j942dm32j3f3lz21yn2c4pnyxi";
+          name = "moz";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/moz";
+          license = lib.licenses.free;
+        };
+      }) {};
+    moz-controller = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, moz }:
+    melpaBuild {
+        pname = "moz-controller";
+        version = "20151208.2006";
+        src = fetchFromGitHub {
+          owner = "RenWenshan";
+          repo = "emacs-moz-controller";
+          rev = "46f665c03574fa922de767fc29795e0db4a7c5c6";
+          sha256 = "0fssn33ld6xhjlwg1dbrjg8sa0pjmglq0dw792yrmvm4fj0zjph8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/moz-controller";
+          sha256 = "18gca1csl9dfi9995mky8cbgi3xzf1if8pzdjiz5404gzcqk0rfd";
+          name = "moz-controller";
+        };
+        packageRequires = [ moz ];
+        meta = {
+          homepage = "http://melpa.org/#/moz-controller";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mozc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mozc";
+        version = "20160102.1706";
+        src = fetchFromGitHub {
+          owner = "google";
+          repo = "mozc";
+          rev = "80c7fb819873621addab82767100d3dfba703063";
+          sha256 = "10674ch2svx8w1hh59whac579hsf3bcgimsasalidkw3cd9w69d3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mozc";
+          sha256 = "0nslh4xyqpvzdxcgrd1bzaqcdz77bghizh6n2w6wk46cflir8xba";
+          name = "mozc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mozc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mozc-im = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mozc }:
+    melpaBuild {
+        pname = "mozc-im";
+        version = "20150419.649";
+        src = fetchFromGitHub {
+          owner = "d5884";
+          repo = "mozc-im";
+          rev = "eaba71ee15d0822631e2023e2ee244e98782cb2d";
+          sha256 = "03j5fy2xw204807wi7ivwcqlgkh1f7msshh5yrk6c7qdpp08062r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mozc-im";
+          sha256 = "1gqzmm712npj36qfi506zgl0ycd6k7l5m46c7zz2z2lb6jpssw10";
+          name = "mozc-im";
+        };
+        packageRequires = [ mozc ];
+        meta = {
+          homepage = "http://melpa.org/#/mozc-im";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mozc-popup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mozc, popup }:
+    melpaBuild {
+        pname = "mozc-popup";
+        version = "20150223.1834";
+        src = fetchFromGitHub {
+          owner = "d5884";
+          repo = "mozc-popup";
+          rev = "f0684b875a7427ec08f8df13939a486e5d5cf420";
+          sha256 = "1mbpkjc6sk7qqmgsmr5a5l2ycwnqp8bkwgikdavgs6hnal10bkmn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mozc-popup";
+          sha256 = "1n43lwflxzzyskxgzg19rg3hiqqkf5l7vfgaydryf4sk8480x687";
+          name = "mozc-popup";
+        };
+        packageRequires = [ mozc popup ];
+        meta = {
+          homepage = "http://melpa.org/#/mozc-popup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mpages = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mpages";
+        version = "20150710.904";
+        src = fetchFromGitHub {
+          owner = "slevin";
+          repo = "mpages";
+          rev = "39a72a0931ab1cdbfdf0ab9f412dc12d43a3829f";
+          sha256 = "11c8pr3s77aq34ic32lnsialwh8bw3m78kj838xl2aab2pgrlny2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mpages";
+          sha256 = "11scjjwwrpgaz6i4jq9y7m864nfak46vnbfb0w15625znz926jcs";
+          name = "mpages";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mpages";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mpg123 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mpg123";
+        version = "20151214.1350";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "mpg123";
+          rev = "ed2307843ca54ebf0ca5e5d2e79b41e79527c45c";
+          sha256 = "09731mwm23b6ic53366lnxy2p7dfd245yh75gaf6ijfa22jks7gb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mpg123";
+          sha256 = "184ip9pvv4zkfxnrzxbfajjadc9f4dz4psn33f9x3sfh7s1y4nw8";
+          name = "mpg123";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mpg123";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mpv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, names, org }:
+    melpaBuild {
+        pname = "mpv";
+        version = "20150218.318";
+        src = fetchFromGitHub {
+          owner = "kljohann";
+          repo = "mpv.el";
+          rev = "3021c55fa5723a806dde5fb2a630b115e2c53d06";
+          sha256 = "193j90sgn1zgl00mji86wll4djj57vk5arhwbmhhf5b1qx3wpbhm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mpv";
+          sha256 = "1vq308ac6jj1h8qa2b2sypisb38hbvwjimqndhpfir06fghkw94l";
+          name = "mpv";
+        };
+        packageRequires = [ cl-lib emacs json names org ];
+        meta = {
+          homepage = "http://melpa.org/#/mpv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "msvc";
+        version = "20150530.351";
+        src = fetchFromGitHub {
+          owner = "yaruopooner";
+          repo = "msvc";
+          rev = "e7a61fa5b98a129637f970ac6db9163e330b3d02";
+          sha256 = "1draiwbwb8zfi6rdr5irv8091xv2pmnifq7pzi3rrvjb8swb28z3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/msvc";
+          sha256 = "04gq2klana557qvsi3bv6416l0319jsqb6bdfs7y6729qd94hlq3";
+          name = "msvc";
+        };
+        packageRequires = [ ac-clang cedet cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/msvc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "mu4e-alert";
+        version = "20160109.2212";
+        src = fetchFromGitHub {
+          owner = "iqbalansari";
+          repo = "mu4e-alert";
+          rev = "86d0dbd3418c8d61f982430111ceb6697a576285";
+          sha256 = "065pncwj0sgiacn24c4pimcw325xc7wncbq0s1rrgq0920dxc9rc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mu4e-alert";
+          sha256 = "15nwj09iyrvjsc9lrxla6qa0s8izcllxghw5gx3ffncfcrx2l8qm";
+          name = "mu4e-alert";
+        };
+        packageRequires = [ alert emacs ht s ];
+        meta = {
+          homepage = "http://melpa.org/#/mu4e-alert";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mu4e-maildirs-extension = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mu4e-maildirs-extension";
+        version = "20151126.1126";
+        src = fetchFromGitHub {
+          owner = "agpchil";
+          repo = "mu4e-maildirs-extension";
+          rev = "17eacf2d0b3a57ebf26a6aaa9eeb51d579457d25";
+          sha256 = "0hbgzvybd04s9fz9myrs68ic2v0kks3wpv8qj14ihrnl7xh03rfh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mu4e-maildirs-extension";
+          sha256 = "1xz19dxrj1grnl7wy9qglh08xb3dr509232l3xizpkxgqqk8pwbi";
+          name = "mu4e-maildirs-extension";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/mu4e-maildirs-extension";
+          license = lib.licenses.free;
+        };
+      }) {};
+    multi = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "multi";
+        version = "20131013.1044";
+        src = fetchFromGitHub {
+          owner = "kurisuwhyte";
+          repo = "emacs-multi";
+          rev = "0987ab71692717ed457cb3984de184db9185806d";
+          sha256 = "0f5hc6mgq0hg1wwnvqd4fp7ck58lcavvgqjggz9zlhrjgkmynjxx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi";
+          sha256 = "1c240d1c1g8wb2ld944344zklnv86d9rycmya4z53b2ai10642ig";
+          name = "multi";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/multi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    multi-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "multi-compile";
+        version = "20151111.1640";
+        src = fetchFromGitHub {
+          owner = "ReanGD";
+          repo = "emacs-multi-compile";
+          rev = "61a4a7b35cd78773305150f533f51587367378db";
+          sha256 = "004c4fbf5rrxvs01imv43lwvw5k9ndk02mk29q0w45s230gfca8x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi-compile";
+          sha256 = "16fv0hpwcjw1771zlbgznph0fix9fbm6yqj2rcz1f9l26iih6apz";
+          name = "multi-compile";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/multi-compile";
+          license = lib.licenses.free;
+        };
+      }) {};
+    multi-eshell = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "multi-eshell";
+        version = "20120608.1335";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/multi-eshell.el";
+          sha256 = "1w1jwfznpl214a1xx46zlgqbx9c5yjzpyqqrkn3xqjgnj485yhkl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi-eshell";
+          sha256 = "1i0mvgqxsc99dwp9qcdrijqxsxflrbxw846rgw89p1jfs8mp4l7d";
+          name = "multi-eshell";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/multi-eshell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    multi-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "multi-line";
+        version = "20151206.1813";
+        src = fetchFromGitHub {
+          owner = "IvanMalison";
+          repo = "multi-line";
+          rev = "a46b34340a3dd1cba42ee0f41d6b599500f06233";
+          sha256 = "13rp6kbabjy9dy0x4696065yyaxlgmfnwcqq9vcw2jhbb2gl9gs5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi-line";
+          sha256 = "1aadmijnjr029s1qq4gk8xyl9m8xb5x5774b8i3jyfixyjqvhvwp";
+          name = "multi-line";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/multi-line";
+          license = lib.licenses.free;
+        };
+      }) {};
+    multi-project = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "multi-project";
+        version = "20150314.944";
+        src = fetchhg {
+          url = "https://bitbucket.com/ellisvelo/multi-project";
+          rev = "f7fd0ae6819e";
+          sha256 = "0lcx73vzm7zwvzzc53pfb5y16bhvq9cm9fdy63d3242s8v834z3c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi-project";
+          sha256 = "19dy2wl5ad1xldiznlw2vjvr9ja8h9wiv6igcggixq56fhngp40x";
+          name = "multi-project";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/multi-project";
+          license = lib.licenses.free;
+        };
+      }) {};
+    multi-term = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "multi-term";
+        version = "20150220.720";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/multi-term.el";
+          sha256 = "062c52xd469jdmsq4fvdhsmgfjrlanv0bb1w5vglz7bsn68d2bim";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi-term";
+          sha256 = "1va4ihngwv5qvwps3m9jj0150gbrmq3zllnyq1hbx5ap8hjrhvdx";
+          name = "multi-term";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/multi-term";
+          license = lib.licenses.free;
+        };
+      }) {};
+    multi-web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "multi-web-mode";
+        version = "20130823.2254";
+        src = fetchFromGitHub {
+          owner = "fgallina";
+          repo = "multi-web-mode";
+          rev = "ad1c8d1c870334052d244c7ae3636cb7b9357b7c";
+          sha256 = "0mc4kkgwnwfk27wwc21nw5ly7qcsl7y5bd8wf2y8r6pxhvwran4n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi-web-mode";
+          sha256 = "0vi4yvahr10aqpcz4127c8pcqpr5srwc1yhgipnbnm86qnh34ql5";
+          name = "multi-web-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/multi-web-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    multicolumn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "multicolumn";
+        version = "20150202.1651";
+        src = fetchFromGitHub {
+          owner = "Lindydancer";
+          repo = "multicolumn";
+          rev = "c7a3afecd470859b2e60aa7c554d6e4d436df7fa";
+          sha256 = "1ispa0wxpkydm0cyj4scyyacfrbilrip5v8bsrcqfc6qs597z8rf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multicolumn";
+          sha256 = "1ylnc3s4ixvnqn7g2p6nzz8x29ggqc703waci430f1rp1lsd3q09";
+          name = "multicolumn";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/multicolumn";
+          license = lib.licenses.free;
+        };
+      }) {};
+    multifiles = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "multifiles";
+        version = "20130615.1633";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "multifiles.el";
+          rev = "dddfe64b8e1c1cd1f9ccc1f03405477fc0d53897";
+          sha256 = "065l04ylplng1vgykkbn2vnkcs3sn1k2cikx1ha2q8wmgx6bkvai";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multifiles";
+          sha256 = "0m0pi2qjis9p6z9cd8hlxm1r88ynwmd2ks8wg65sffffwsdbg4kz";
+          name = "multifiles";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/multifiles";
+          license = lib.licenses.free;
+        };
+      }) {};
+    multiple-cursors = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "multiple-cursors";
+        version = "20151205.1425";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "multiple-cursors.el";
+          rev = "a393384b3508e7d8d721e66d2bfb97fa7153dd4f";
+          sha256 = "0hl9ll7pgqv74dnihyy0gz15wz0swj1cpa208484qd3g0dvin8j6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multiple-cursors";
+          sha256 = "0mky5p9wpd3270wr5vfna8rkk2ff81wk7vicyxli39195m0qgg0x";
+          name = "multiple-cursors";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/multiple-cursors";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mustache = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "mustache";
+        version = "20131117.1607";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "mustache.el";
+          rev = "b0ea352813592424164520a49e86c04600242752";
+          sha256 = "1n2ymd92qpvsby6ms0l3kjhdzzc47rri2aiscc6bs07hm4mjpr9q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mustache";
+          sha256 = "1pjr00xx77mlfw1myxaz6i3y2gbivhbiq5hyjxxbjlfrkm1vxc8g";
+          name = "mustache";
+        };
+        packageRequires = [ dash ht s ];
+        meta = {
+          homepage = "http://melpa.org/#/mustache";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mustache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mustache-mode";
+        version = "20141024.932";
+        src = fetchFromGitHub {
+          owner = "mustache";
+          repo = "emacs";
+          rev = "bf9897eb287ca47ced65d7d4e07ea61ea0aec39f";
+          sha256 = "15gw4d0hp15rglsj8hzd290li4p0kadj2dsz0dgfcxld7hnimihk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mustache-mode";
+          sha256 = "076ar57qhwcpl4n634ma827r2rh61670778wqr5za2444a6ax1gs";
+          name = "mustache-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mustache-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mustang-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mustang-theme";
+        version = "20141017.1823";
+        src = fetchFromGitHub {
+          owner = "mswift42";
+          repo = "mustang-theme";
+          rev = "79c3381dd50601775402fe2fddd16fffa9218837";
+          sha256 = "19qd34dcfspv621p4y07zhq2pr8pwss3lcssm9sfhr6w2vmvgcr4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mustang-theme";
+          sha256 = "0771l3x6109ki914nwpfz3fj7pbvpcg9vf485mrccq2wlxymr5dr";
+          name = "mustang-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mustang-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mustard-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mustard-theme";
+        version = "20141116.102";
+        src = fetchFromGitHub {
+          owner = "emacsfodder";
+          repo = "emacs-mustard-theme";
+          rev = "33bc6e3a0e2abc5668afdb349bca7e8b5730582c";
+          sha256 = "170qhbbvcv9dg6jzfd9r95in5m8z1k647mn0gaqflfj0hvq5hwgf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mustard-theme";
+          sha256 = "0izxhivhmv49dja4wy9n0ipd41xdzdza2ql7pfa7ny35ji5hskik";
+          name = "mustard-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/mustard-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    muttrc-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "muttrc-mode";
+        version = "20090804.1752";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/muttrc-mode.el";
+          sha256 = "1xihp3zdqs9054j3bfrd9wnahsvvxjk1ags1iy50ncv5850ppjis";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/muttrc-mode";
+          sha256 = "0ym6rfrhrmpnlqhkxv9ck5893qm0yhswslvgc9vb4nl9hyc1b5jn";
+          name = "muttrc-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/muttrc-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mvn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mvn";
+        version = "20151001.129";
+        src = fetchFromGitHub {
+          owner = "apgwoz";
+          repo = "mvn-el";
+          rev = "01ede605d49c5fb6f2da038f5df6f31112de802f";
+          sha256 = "1gvn0a49lgbjnkl0j2sv4p9zdfqzj9s4jw0k2f4ypmsd1fc0q6d6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mvn";
+          sha256 = "1ykiz5fviq2n2474izwp0vvqanpbmxg7lzh1xbpn281kwmp0mwin";
+          name = "mvn";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mvn";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mwe-log-commands = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mwe-log-commands";
+        version = "20100703.741";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "mwe-log-commands";
+          rev = "8253f2a311f35b03f72a035744f0cbdd776ea17e";
+          sha256 = "0qdlbyq47gr65yq5ri8s9lxw4wp9fmyqc2prkh560d4hkvw60aw3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mwe-log-commands";
+          sha256 = "05z2ax9mgyxldd3ds44xnh9f5w5q4ziy4rxmnfiqjykan2f5hnkn";
+          name = "mwe-log-commands";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mwe-log-commands";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mwim";
+        version = "20150822.1436";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "mwim.el";
+          rev = "dc1b5c358e0bfe607527f1b7c082188105fe6c75";
+          sha256 = "0hvq6z754niqjyv79jzb833wrwbspc7npfg85scwdv8vzwassjx4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mwim";
+          sha256 = "0bsibwplvyv96y5i5svm2b0jwzs5a7jr2aara7v7xnpj0nqaxm8k";
+          name = "mwim";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mwim";
+          license = lib.licenses.free;
+        };
+      }) {};
+    myanmar-input-methods = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "myanmar-input-methods";
+        version = "20160106.937";
+        src = fetchFromGitHub {
+          owner = "yelinkyaw";
+          repo = "emacs-myanmar-input-methods";
+          rev = "9d4e0d6358c61bde7a2274e430ef71683faea32e";
+          sha256 = "0cf0c9g9k2lk1ifi2dlw7c601sh1ycxf3fgl2hy5wliyd6l9rf86";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/myanmar-input-methods";
+          sha256 = "1yg8zy2z18pbyr507ms2b162c0819rna1ilwyp6hb3iv2zjw45sd";
+          name = "myanmar-input-methods";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/myanmar-input-methods";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mykie = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mykie";
+        version = "20150808.1705";
+        src = fetchFromGitHub {
+          owner = "yuutayamada";
+          repo = "mykie-el";
+          rev = "7676f0e883af1d1054e404e97691f3c13aba196f";
+          sha256 = "0a9a6hmv8vjmp6h9mnzin9vc0sncg79v5z72pasvbrplfxijzan0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mykie";
+          sha256 = "12ram39fp3m9ar6q184rsnpkxb14y0ajibng7ia2ck54ck7n36cj";
+          name = "mykie";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/mykie";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mynt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, virtualenvwrapper }:
+    melpaBuild {
+        pname = "mynt-mode";
+        version = "20150512.1549";
+        src = fetchFromGitHub {
+          owner = "crshd";
+          repo = "mynt-mode";
+          rev = "23d4489167bfa899634548cb41ed32fdeb3600c9";
+          sha256 = "18ml0qz3iipm9w36zvwz77cbbrg885jgvzk6z4a33xcfp524xhma";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mynt-mode";
+          sha256 = "17s0wdwgh2dcpww6h3qszc9dcs7ki00xkyisvsfn4xqajrmmp75b";
+          name = "mynt-mode";
+        };
+        packageRequires = [ virtualenvwrapper ];
+        meta = {
+          homepage = "http://melpa.org/#/mynt-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mysql2sqlite = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mysql2sqlite";
+        version = "20151123.1539";
+        src = fetchFromGitHub {
+          owner = "echosa";
+          repo = "emacs-mysql2sqlite";
+          rev = "07415c5fcd895ebccf1b774d0eab175f2700652f";
+          sha256 = "0q5809hq22hyzxx5xr2hwwf3jh3qlpf3mkbl3fxqq93gm16plh1i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mysql2sqlite";
+          sha256 = "1jblrbw4rq2jwpb8d1dyna0fiv52b9va3sj881cb17rqx200y3nd";
+          name = "mysql2sqlite";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mysql2sqlite";
+          license = lib.licenses.free;
+        };
+      }) {};
+    myterminal-controls = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "myterminal-controls";
+        version = "20150427.547";
+        src = fetchFromGitHub {
+          owner = "myTerminal";
+          repo = "myterminal-controls";
+          rev = "6b40d5f606dd402b80b7c93775bece1063cbf826";
+          sha256 = "0mnkhp286nrifxbrzp7lbmr4bccm7byh1f2zid4l1hac4x5wcx86";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/myterminal-controls";
+          sha256 = "0ipk5s2whf3l68q0dydm1j6rcb6jhk61hgjwxygdphifvih7c5y2";
+          name = "myterminal-controls";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/myterminal-controls";
+          license = lib.licenses.free;
+        };
+      }) {};
+    n3-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "n3-mode";
+        version = "20141027.1257";
+        src = fetchFromGitHub {
+          owner = "doriantaylor";
+          repo = "n3-mode-for-emacs";
+          rev = "0145e7938c30183edb03a55a4f16390dabd191ec";
+          sha256 = "1lp1bx9110vqzjww94va8pdks39qvqzl8rf0p8na1q0qn06rnk9h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/n3-mode";
+          sha256 = "0hasxq39phgyc259dgxskhqxjsp0yi98vx1bs8ynvwa26la4ddzh";
+          name = "n3-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/n3-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    n4js = callPackage ({ cypher-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "n4js";
+        version = "20150713.2131";
+        src = fetchFromGitHub {
+          owner = "tmtxt";
+          repo = "n4js.el";
+          rev = "3991ed8975151d5e8d568e952362df810f7ffab7";
+          sha256 = "1pd6c0jc1zxx3i3nk4qdx7gdf1qn8sc9jgqd72pkkpzvdwv998cp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/n4js";
+          sha256 = "0x7smxs91ffriyxx2df61fh1abpl39gqy4m62k77h7xb6fg7af6m";
+          name = "n4js";
+        };
+        packageRequires = [ cypher-mode emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/n4js";
+          license = lib.licenses.free;
+        };
+      }) {};
+    naked = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "naked";
+        version = "20151231.1727";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/naked.el";
+          sha256 = "0zq13qjqfpxjba1bhdqqxkvgxq1dxyb7hd1bpnk6cbhsxr6mr50i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/naked";
+          sha256 = "06p6dzhn34dva3677mrvwq2a2x3bhw7f486y654hszla7i75pilq";
+          name = "naked";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/naked";
+          license = lib.licenses.free;
+        };
+      }) {};
+    name-this-color = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "name-this-color";
+        version = "20151014.1530";
+        src = fetchFromGitHub {
+          owner = "knl";
+          repo = "name-this-color.el";
+          rev = "e37cd1291d5d68d4c8d6386eab9cb9d94fd3bcfa";
+          sha256 = "0amhw630hgc0j8wr8m6aav399ixi3vbwrck79hhlr3pmyh91vv7n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/name-this-color";
+          sha256 = "12nrk1ww766jb4gb4iz6w485nimh2iv8wni2jq4l38v8ndh490zb";
+          name = "name-this-color";
+        };
+        packageRequires = [ cl-lib dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/name-this-color";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nameframe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nameframe";
+        version = "20151017.2319";
+        src = fetchFromGitHub {
+          owner = "john2x";
+          repo = "nameframe";
+          rev = "96acff56b30f9d1145aeaf7a4c53c9a2c823ee8e";
+          sha256 = "07zgwyrss23yb8plnhhwmh0khdvfp539891sj1z1vs50jcllcpw5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nameframe";
+          sha256 = "0iq8cfii39ha8sxn9w7kyfvys8kwyax8g4l0pkl05q0a0s95padp";
+          name = "nameframe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nameframe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nameframe-perspective = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nameframe, perspective }:
+    melpaBuild {
+        pname = "nameframe-perspective";
+        version = "20151018.407";
+        src = fetchFromGitHub {
+          owner = "john2x";
+          repo = "nameframe";
+          rev = "96acff56b30f9d1145aeaf7a4c53c9a2c823ee8e";
+          sha256 = "07zgwyrss23yb8plnhhwmh0khdvfp539891sj1z1vs50jcllcpw5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nameframe-perspective";
+          sha256 = "0wgr90m2pazc514slgdl1lin4mr3xxizasc82k7qinvdvdja515x";
+          name = "nameframe-perspective";
+        };
+        packageRequires = [ nameframe perspective ];
+        meta = {
+          homepage = "http://melpa.org/#/nameframe-perspective";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nameframe-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nameframe, projectile }:
+    melpaBuild {
+        pname = "nameframe-projectile";
+        version = "20151018.407";
+        src = fetchFromGitHub {
+          owner = "john2x";
+          repo = "nameframe";
+          rev = "96acff56b30f9d1145aeaf7a4c53c9a2c823ee8e";
+          sha256 = "07zgwyrss23yb8plnhhwmh0khdvfp539891sj1z1vs50jcllcpw5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nameframe-projectile";
+          sha256 = "11z64wy8mnnrjmgfs2sjbv3mh136aki8r5f89myx861nfx18hc3k";
+          name = "nameframe-projectile";
+        };
+        packageRequires = [ nameframe projectile ];
+        meta = {
+          homepage = "http://melpa.org/#/nameframe-projectile";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nameless = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nameless";
+        version = "20151014.639";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "Nameless";
+          rev = "a3dfd7ecf9c58898241c8d1145eb8e0c875f5448";
+          sha256 = "13v0v90vrc2w0wi7wmzmpql6yjbr6lpzh29kxggq9fy38lahd3ks";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nameless";
+          sha256 = "14agx54h2vqfb0656n12z761ywyxsdskd6xa1ccar70l9vwj85vq";
+          name = "nameless";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/nameless";
+          license = lib.licenses.free;
+        };
+      }) {};
+    names = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "names";
+        version = "20151201.604";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "names";
+          rev = "00862c57ae6363ba86d1e5ce138929a1b6d5c7e6";
+          sha256 = "0m82g27gwf9mvicivmcilqghz5b24ijmnw0jf0wl2skfbbg0sydh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/names";
+          sha256 = "1q784606jlakw1z6sx2g2x8hz8c8arywrm2r626wj0v105v510vg";
+          name = "names";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/names";
+          license = lib.licenses.free;
+        };
+      }) {};
+    namespaces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "namespaces";
+        version = "20130326.1750";
+        src = fetchFromGitHub {
+          owner = "chrisbarrett";
+          repo = "elisp-namespaces";
+          rev = "3d02525d9b9a5ae6e7be3adefd880121436e6270";
+          sha256 = "157hhb253m6a9l5wy6x8w5ar3x0qz1326l7a0npxif6pma0dd140";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/namespaces";
+          sha256 = "02pb7762khxpah4q6xg8r7dmlv1kwyzinffi7pcaps6ycj29q2fr";
+          name = "namespaces";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/namespaces";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nand2tetris = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
+    melpaBuild {
+        pname = "nand2tetris";
+        version = "20151027.1651";
+        src = fetchFromGitHub {
+          owner = "CestDiego";
+          repo = "nand2tetris.el";
+          rev = "0297cd8d76cad072cb64318ffacdc65d8a1ad948";
+          sha256 = "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nand2tetris";
+          sha256 = "1zg9xx7mj8334m2v2zqqfkr5vkj4dzqbj8y13qk6xhzb7qkppyqd";
+          name = "nand2tetris";
+        };
+        packageRequires = [ names ];
+        meta = {
+          homepage = "http://melpa.org/#/nand2tetris";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nand2tetris-assembler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, names, nand2tetris }:
+    melpaBuild {
+        pname = "nand2tetris-assembler";
+        version = "20151027.1636";
+        src = fetchFromGitHub {
+          owner = "CestDiego";
+          repo = "nand2tetris.el";
+          rev = "0297cd8d76cad072cb64318ffacdc65d8a1ad948";
+          sha256 = "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nand2tetris-assembler";
+          sha256 = "1761kgrflipxba8894cnx90ks7f3ba4nj6ci515zzxcx9s45mfyy";
+          name = "nand2tetris-assembler";
+        };
+        packageRequires = [ names nand2tetris ];
+        meta = {
+          homepage = "http://melpa.org/#/nand2tetris-assembler";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nanowrimo = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nanowrimo";
+        version = "20151104.2028";
+        src = fetchhg {
+          url = "https://bitbucket.com/gvol/nanowrimo.el";
+          rev = "25e2ca20ed34";
+          sha256 = "1nzkamy53kl1g4y1jm7j5zgpkdsyg5ykp8zp1f0bg5mhy8mmf75w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nanowrimo";
+          sha256 = "1nhyj38qyn1x6a5rbrwhcxwfwzyqqjm3dvksdnmam6vfwn3s2r31";
+          name = "nanowrimo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nanowrimo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    naquadah-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "naquadah-theme";
+        version = "20150923.341";
+        src = fetchFromGitHub {
+          owner = "jd";
+          repo = "naquadah-theme";
+          rev = "f6308bb7d110f1e6d6a91db901f8fb3f99da12ac";
+          sha256 = "0mxf61ky1dd7r2qd4j7k6bdppmkilkq5l9gv257a12539wkw5yq2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/naquadah-theme";
+          sha256 = "1aml1f2lgn530i86218nrc1pk3zw5n3qd2gw4gylwi7g75i0cqn1";
+          name = "naquadah-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/naquadah-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    narrow-indirect = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "narrow-indirect";
+        version = "20151231.1739";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/narrow-indirect.el";
+          sha256 = "1lyszm94pd3jxs73v7k0aaazm0sd2rpz2pphcdag7lk7k6vppd9n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/narrow-indirect";
+          sha256 = "10aq4gssayh3adw8yz2lza1xbypyffi8r03lsc0kiis6gd9ibiyj";
+          name = "narrow-indirect";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/narrow-indirect";
+          license = lib.licenses.free;
+        };
+      }) {};
+    narrow-reindent = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "narrow-reindent";
+        version = "20150722.1406";
+        src = fetchFromGitHub {
+          owner = "emallson";
+          repo = "narrow-reindent.el";
+          rev = "87466aac4dbeb79597124dd077bf5c704872fd3d";
+          sha256 = "10yn215xb4s6kshk108y75im1xbdp0vwc9kah5bbaflp9234i0zh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/narrow-reindent";
+          sha256 = "0fybal70kk62zlra63x4jb72694m0mzv4cx746prx9anvq1ss2i0";
+          name = "narrow-reindent";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/narrow-reindent";
+          license = lib.licenses.free;
+        };
+      }) {};
+    narrowed-page-navigation = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "narrowed-page-navigation";
+        version = "20150108.2319";
+        src = fetchFromGitHub {
+          owner = "david-christiansen";
+          repo = "narrowed-page-navigation";
+          rev = "b215adbac4873f56fbab65772062f0f5be8058a1";
+          sha256 = "0ydxj6dc10knambma2hpimqrhfz216nbj96w1dcwgjixs4cd4nax";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/narrowed-page-navigation";
+          sha256 = "1yrmih60dd69qnin505jlmfidm2svzpdrz46286r7nm6pk7s4pb7";
+          name = "narrowed-page-navigation";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/narrowed-page-navigation";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nasm-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nasm-mode";
+        version = "20151109.1858";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "nasm-mode";
+          rev = "d95a12d3caaf1decf4d3bd39ac8559098e7227aa";
+          sha256 = "19v1qp4rzqvyzrk5zaxdjhki8cjl4fg6lr4ai3vi06yf62ds9mcs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nasm-mode";
+          sha256 = "1626yf9mmqlsw8w01vzqsyb5ipa56259d4kl6w871k7rvhxwff17";
+          name = "nasm-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/nasm-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nav = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "nav";
+        version = "20120507.207";
+        src = fetchhg {
+          url = "https://code.google.com/p/emacs-nav/";
+          rev = "d7f54ce8536e";
+          sha256 = "0kfqpji6z3ra8sc951vmm1bzyhkws7vb5q6djvl45wlf1wrgkc4p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nav";
+          sha256 = "036lf6iirxamlqzq3w6m0hji36l480yx5c9wnwypms85hi8hq0vl";
+          name = "nav";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nav";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nav-flash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nav-flash";
+        version = "20140508.1541";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "nav-flash";
+          rev = "53f5bc59e3f32c1192d15637d3979732dacb2c35";
+          sha256 = "07wjicbvzg7cz983hv0p2qw1qlln07djigkmbqfpwvg3fk50fdyg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nav-flash";
+          sha256 = "0936kr0s6zxxmjwaqm7ywdw2im4dxai1xb7j6xa2gp7c70qvvsx3";
+          name = "nav-flash";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nav-flash";
+          license = lib.licenses.free;
+        };
+      }) {};
+    navi-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, outorg, outshine }:
+    melpaBuild {
+        pname = "navi-mode";
+        version = "20151203.957";
+        src = fetchFromGitHub {
+          owner = "tj64";
+          repo = "navi";
+          rev = "78c0c227d06254d1aec9d8a1301b9a5a785b8b31";
+          sha256 = "1yywbfa0syhb8zmn2qjjw2hxy7vz9ky3xd7kv3nz3gd2x989nb9a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/navi-mode";
+          sha256 = "0f5db983w9kxq8mcjr22zfrm7cpxydml4viac62lvab2kwbpbrmi";
+          name = "navi-mode";
+        };
+        packageRequires = [ outorg outshine ];
+        meta = {
+          homepage = "http://melpa.org/#/navi-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    navi2ch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "navi2ch";
+        version = "20150329.2116";
+        src = fetchFromGitHub {
+          owner = "naota";
+          repo = "navi2ch";
+          rev = "faebfd15184de9df6903eae436dafb52c38ee86e";
+          sha256 = "15l2zmm8bp4ip8m1hfxkvswfwa29pg72kisfya2n5v900r184a4m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/navi2ch";
+          sha256 = "13xwvyy27dz1abjkkazm3s1p6cw32l2klr1bnln02w0azkbdy7x3";
+          name = "navi2ch";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/navi2ch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    navorski = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, multi-term, s }:
+    melpaBuild {
+        pname = "navorski";
+        version = "20141203.1224";
+        src = fetchFromGitHub {
+          owner = "roman";
+          repo = "navorski.el";
+          rev = "698c1c62da70164aebe9a7a5d034778fbc30ea5b";
+          sha256 = "0g7rmvfm0ldv0d2x7f8k761mgmi47siyspfi1ns40ijhkpc15x8l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/navorski";
+          sha256 = "0dnzpsm0ya8rbcik5wp378hc9k7gjb3gwmkqqj889c38q5cdwsx7";
+          name = "navorski";
+        };
+        packageRequires = [ dash multi-term s ];
+        meta = {
+          homepage = "http://melpa.org/#/navorski";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ncl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ncl-mode";
+        version = "20150525.1129";
+        src = fetchFromGitHub {
+          owner = "yyr";
+          repo = "ncl-mode";
+          rev = "01559734504d2712606ac30916252d788ea73124";
+          sha256 = "0gbv5fv401z58ycbqlivqamf5kp3x6krhi36q7q0m4gvy448xz0n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ncl-mode";
+          sha256 = "0hmd606xgapzbc79px9l1q6pphrhdzip495yprvg20xsdpmjlfw9";
+          name = "ncl-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ncl-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nclip";
+        version = "20130617.1515";
+        src = fetchFromGitHub {
+          owner = "maio";
+          repo = "nclip.el";
+          rev = "af88e38b1f04be02bf2e57affc662dbd0f828e67";
+          sha256 = "178gjv7kq97p9i4naxql7xabvmchw5x8idkpyjqqky3b24v5wkis";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nclip";
+          sha256 = "016jp1rqrf1baxlxbi3476m88a0l3r405dh6pmly519wm2k8pipw";
+          name = "nclip";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nclip";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nemerle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nemerle";
+        version = "20130328.946";
+        src = fetchFromGitHub {
+          owner = "rsdn";
+          repo = "nemerle";
+          rev = "47840833c6a49d680127e6112848868879eeeb4d";
+          sha256 = "0nw13s51frvm5yhrbvhq0ns38cr9whqvacnn7xbbkm017rg4dhy7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nemerle";
+          sha256 = "0698hbgk80w7wp0ssx9pl13aapm7rc6l3y2zydfkyqdfwy5y71v6";
+          name = "nemerle";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nemerle";
+          license = lib.licenses.free;
+        };
+      }) {};
+    neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "neotree";
+        version = "20160112.158";
+        src = fetchFromGitHub {
+          owner = "jaypei";
+          repo = "emacs-neotree";
+          rev = "56ea48d0035daed7f6716dffcdfacbc9b9f13149";
+          sha256 = "0zr4lcbqd1fasx7h49klnbc1d8sv1nzhvv18jqqkkgkjq6q7bapf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/neotree";
+          sha256 = "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06";
+          name = "neotree";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/neotree";
+          license = lib.licenses.free;
+        };
+      }) {};
+    netherlands-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "netherlands-holidays";
+        version = "20150202.1017";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "netherlands-holidays";
+          rev = "26236178cdd650df9958bf5a086e184096559f00";
+          sha256 = "1kkflj2qnrn6kzh1l6bjl5n5507qilb22pqj3h0f2m6hfyn0sw5z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/netherlands-holidays";
+          sha256 = "181linsbg5wrx1z7zbj3in2d3d4zd2v7drspkj0b6l0c5yfxwayf";
+          name = "netherlands-holidays";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/netherlands-holidays";
+          license = lib.licenses.free;
+        };
+      }) {};
+    never-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "never-comment";
+        version = "20140104.1607";
+        src = fetchFromGitHub {
+          owner = "To1ne";
+          repo = "never-comment";
+          rev = "74ded8f1e7f23240f5f6032d0451fb0a51733bc4";
+          sha256 = "0p00mmid04pfsna4ify3cy0b9lx431q1r5h772hihsg4f1rs2ppy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/never-comment";
+          sha256 = "0sn8y57895bfpgiynnj4m9b3x3dbb9v5fwkcwmf9jr39dbf98v6s";
+          name = "never-comment";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/never-comment";
+          license = lib.licenses.free;
+        };
+      }) {};
+    newlisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "newlisp-mode";
+        version = "20150120.1240";
+        src = fetchFromGitHub {
+          owner = "kosh04";
+          repo = "newlisp-mode";
+          rev = "7f44e7c763bd16481e78bced5ff310b8113883e5";
+          sha256 = "05jwaj7wlrdpmylawv14ypwpg9qz9pqqqd1nvb94b9gbs79j86z5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/newlisp-mode";
+          sha256 = "0i2d2gyzzvpr5qm2cqzbn9my21lfb66315hg9fj86ac5pkc25zrd";
+          name = "newlisp-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/newlisp-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nexus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nexus";
+        version = "20140114.705";
+        src = fetchFromGitHub {
+          owner = "juergenhoetzel";
+          repo = "emacs-nexus";
+          rev = "c46f499951b90839aa8683779fe43d8f01672a60";
+          sha256 = "1xnx6v49i6abzbhq4fl4bp9d0pp9gby40splpcj211xsb8yiry27";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nexus";
+          sha256 = "1mdphgsqg6n4hryr53rk42z58vfv0g5wkar5ipanr4h4iclkf5vd";
+          name = "nexus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nexus";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nginx-mode";
+        version = "20150824.1611";
+        src = fetchFromGitHub {
+          owner = "ajc";
+          repo = "nginx-mode";
+          rev = "8a296e30b01adbc40d1aa9ccde369a972ac5ceab";
+          sha256 = "08bpyk0brx0x2l0y8hn8zpkaxb2ndmxz22kzxxypj6hdz303wf38";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nginx-mode";
+          sha256 = "07k17m64zhv6gik8v4n73d8l1k6fsp4qp8cl94r384ny0187y65c";
+          name = "nginx-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nginx-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    niflheim-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "niflheim-theme";
+        version = "20150630.1021";
+        src = fetchFromGitHub {
+          owner = "niflheim-theme";
+          repo = "emacs";
+          rev = "5265e89164132fbdbc13146a79f0abce78bd0c5e";
+          sha256 = "147vw3qlsply5h8cjmjzqr5dv9jzf9xlmhjnmcpyb1r7krh1l8xm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/niflheim-theme";
+          sha256 = "1dipxwaar7rghmz7s733v035vrbijcg1dla9f7cld1gkgiq9iq36";
+          name = "niflheim-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/niflheim-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nim-mode = callPackage ({ emacs, epc, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nim-mode";
+        version = "20160118.1138";
+        src = fetchFromGitHub {
+          owner = "nim-lang";
+          repo = "nim-mode";
+          rev = "4aa694e25423fda22ebb21ae355ba2d4a7e08d07";
+          sha256 = "0l07wwzjj8479zyghh6dq454c62gxi0bxppwa43zmvfmk3zwcblx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nim-mode";
+          sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6";
+          name = "nim-mode";
+        };
+        packageRequires = [ emacs epc let-alist ];
+        meta = {
+          homepage = "http://melpa.org/#/nim-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ninja-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ninja-mode";
+        version = "20141203.2359";
+        src = fetchFromGitHub {
+          owner = "martine";
+          repo = "ninja";
+          rev = "19a3066bf76bd121ca39ca138577f90bea5a10a2";
+          sha256 = "1kfmf4dprg2zkmfkpyn0w9d18xz8v3hmmdkajmv14a6py1sjh14c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ninja-mode";
+          sha256 = "1m7f25sbkz8k343giczrnw2ah5i3mk4c7csi8kk9x5y16030asik";
+          name = "ninja-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ninja-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nix-mode";
+        version = "20151026.515";
+        src = fetchFromGitHub {
+          owner = "NixOS";
+          repo = "nix";
+          rev = "d704abc0f33718e339562eea4cce565f8467ada3";
+          sha256 = "0gd592xvh7mr6h4gcdyfi03lg6ciml1spjpvrcbbkvxz7sdk6p3i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nix-mode";
+          sha256 = "00rqawi8zs2x79c91gmk0anfyqbwalvfwmpak20i11lfzmdsza1s";
+          name = "nix-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nix-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nixos-options = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nixos-options";
+        version = "20151013.1809";
+        src = fetchFromGitHub {
+          owner = "travisbhartwell";
+          repo = "nix-emacs";
+          rev = "6b1418611b49a6cf77380a76f7e6236bbb5df83a";
+          sha256 = "0ia9wgn33znaviy7ilfm83yfalc2dbpm1g7nvss5s4rznqkdfhn3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nixos-options";
+          sha256 = "1m3jipidk10zj68rzjbacgjlal31jf80gqjxlgj4qs8lm671gxmm";
+          name = "nixos-options";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/nixos-options";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nm = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, notmuch, peg }:
+    melpaBuild {
+        pname = "nm";
+        version = "20151110.1310";
+        src = fetchFromGitHub {
+          owner = "tjim";
+          repo = "nevermore";
+          rev = "5a3f29174b3a4b2b2e7a700a862f3b16a942687e";
+          sha256 = "1skbjmyikzyiic470sngskggs05r35m8vzm69wbmrjapczginnak";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nm";
+          sha256 = "004rjbrkc7jalbd8ih170sy97w2g16k3whqrqwywh09pzrzb05kw";
+          name = "nm";
+        };
+        packageRequires = [ company emacs notmuch peg ];
+        meta = {
+          homepage = "http://melpa.org/#/nm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nnir-est = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nnir-est";
+        version = "20140301.802";
+        src = fetchFromGitHub {
+          owner = "kawabata";
+          repo = "nnir-est";
+          rev = "ba263fbd872fe05cfa6b3d815c0d98cdbe24b687";
+          sha256 = "0gzxcq0gki89dz9ad26683zhq1nif3wdz185cdplwy68z9szbdx1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nnir-est";
+          sha256 = "04ih47pipph8sl84nv6ka4xlpd8vhnpwhs5cchgk5k1zv3l5scxv";
+          name = "nnir-est";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nnir-est";
+          license = lib.licenses.free;
+        };
+      }) {};
+    noccur = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "noccur";
+        version = "20150514.1620";
+        src = fetchFromGitHub {
+          owner = "NicolasPetton";
+          repo = "noccur.el";
+          rev = "6cc02ce07178a61ae38a849f80472c01969272bc";
+          sha256 = "0wk86gm0by9c8mfbvydz5va07qd30n6wx067inqfa7wjffaq0xr7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/noccur";
+          sha256 = "0a8l50v09bgap7rsls808k9wyjpjbcxaffsvz7hh9rw9s7m5fz5g";
+          name = "noccur";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/noccur";
+          license = lib.licenses.free;
+        };
+      }) {};
+    noctilux-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "noctilux-theme";
+        version = "20150723.947";
+        src = fetchFromGitHub {
+          owner = "sjrmanning";
+          repo = "noctilux-theme";
+          rev = "5f21c8523ddb99c4e5bc727d59ddf6bf6f50d626";
+          sha256 = "1a1pp3sd5g4wkhywb5jfchcdpjsjb0iyhk2sxvd0gpc4kk4zh6xs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/noctilux-theme";
+          sha256 = "15ymyv3rq0n31d8h0ry0l4w4r5a8as0q63ajm9wb6yrxxjl1imfp";
+          name = "noctilux-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/noctilux-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    node-resolver = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "node-resolver";
+        version = "20140930.1223";
+        src = fetchFromGitHub {
+          owner = "meandavejustice";
+          repo = "node-resolver.el";
+          rev = "ef9d0486907a746a80b02ffc6208a09c168a9f7c";
+          sha256 = "1cgmq00ackabwcl4h0n2bb8y08wz0ir5rzca2q3sk4asly6d02m7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/node-resolver";
+          sha256 = "1ng4rgm8f745fajqnbjhi2rshvn6icwdpbh5dzpzhim1w9kb3bhh";
+          name = "node-resolver";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/node-resolver";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nodejs-repl";
+        version = "20151229.803";
+        src = fetchFromGitHub {
+          owner = "abicky";
+          repo = "nodejs-repl.el";
+          rev = "868339fffedc38f0fd0a3c21d167d8d48830ef84";
+          sha256 = "03vcs458rcn1hgfvmgmijadjvri7zlh2z4lxgaplzfnga13mapym";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nodejs-repl";
+          sha256 = "0rvhhrsw87kfrwdhm8glq6b3nr0v90ivm7fcc0da4yc2jmcyk907";
+          name = "nodejs-repl";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nodejs-repl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    noflet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "noflet";
+        version = "20141102.854";
+        src = fetchFromGitHub {
+          owner = "nicferrier";
+          repo = "emacs-noflet";
+          rev = "7ae84dc3257637af7334101456dafe1759c6b68a";
+          sha256 = "0g70gnmfi8n24jzfci9nrj0n9bn1qig7b8f9f325rin8h7x32ypf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/noflet";
+          sha256 = "0vzamqb52n330mi6rydrd4ls8nbwh5s42fc2gs5y15zakp6mvhr3";
+          name = "noflet";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/noflet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nose = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "nose";
+        version = "20140520.1148";
+        src = fetchhg {
+          url = "https://bitbucket.com/durin42/nosemacs";
+          rev = "194d7789bf79";
+          sha256 = "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nose";
+          sha256 = "0l77hsmn3qk934ppdav1gy9sq48g0v1dzc5qy0rp9vv4yz2jx2jk";
+          name = "nose";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nose";
+          license = lib.licenses.free;
+        };
+      }) {};
+    notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "notmuch";
+        version = "20160108.632";
+        src = fetchgit {
+          url = "git://git.notmuchmail.org/git/notmuch";
+          rev = "3959d98535b1a3fa61d45a457cce23aa7569b942";
+          sha256 = "163d6027ea220493a607e7a815de1c2580a9d01672bb4f3987256a92034c4f52";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/notmuch";
+          sha256 = "1sy9k6xbfl035qhnp8sdq9cb3xvgw3lkmdczyd6fw6yrzm5n0g1r";
+          name = "notmuch";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/notmuch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    notmuch-labeler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, notmuch }:
+    melpaBuild {
+        pname = "notmuch-labeler";
+        version = "20131230.1119";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "notmuch-labeler";
+          rev = "d65d1129555d368243df4770ecc1e7ccb88efc58";
+          sha256 = "1ss87vlp7625lnn2iah3rc1xfxcbpx4kmiww9n16jx073fs2rj18";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/notmuch-labeler";
+          sha256 = "1c0cbkk5k8ps01xl63a0xa2adkqaj0znw8qs8ca4ai8v1420bpl0";
+          name = "notmuch-labeler";
+        };
+        packageRequires = [ notmuch ];
+        meta = {
+          homepage = "http://melpa.org/#/notmuch-labeler";
+          license = lib.licenses.free;
+        };
+      }) {};
+    novice-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "novice-plus";
+        version = "20151231.1740";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/novice+.el";
+          sha256 = "0mmdf3z9299hbs3wr8hqgpmg74sb2xm0rxyh38sjcqmk8f310rqh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/novice+";
+          sha256 = "0r4w4c6y4fny8k0kipzqjsn7idwbi9jq6x9yw51d41ra3pkpvfzf";
+          name = "novice-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/novice+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    noxml-fold = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "noxml-fold";
+        version = "20151216.1021";
+        src = fetchFromGitHub {
+          owner = "paddymcall";
+          repo = "noXML-fold";
+          rev = "feecc06b1136c1ddbabcdc37287f1ef26f1282fc";
+          sha256 = "0jahr1380919p272srym1pp16ifdz69fn1m45ppglm54q4a741d8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/noxml-fold";
+          sha256 = "11dninxxwhflf2qrmvwmrryspd9j6m95kdlmyx59ykqvw8j0siqc";
+          name = "noxml-fold";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/noxml-fold";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nrepl-eval-sexp-fu = callPackage ({ fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, smartparens, thingatpt ? null }:
+    melpaBuild {
+        pname = "nrepl-eval-sexp-fu";
+        version = "20140311.541";
+        src = fetchFromGitHub {
+          owner = "samaaron";
+          repo = "nrepl-eval-sexp-fu";
+          rev = "3a24b7d4bca13e87c987a4ddd212da914ff59191";
+          sha256 = "1nwj1ax2qmmlab4lik0b7japhqd424d0rb995dfv89p99gp8vmvc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nrepl-eval-sexp-fu";
+          sha256 = "17g4nih9kz2483ylp651lwfxkvmaj7wpinpgnifwbciyrplfvx2j";
+          name = "nrepl-eval-sexp-fu";
+        };
+        packageRequires = [ highlight smartparens thingatpt ];
+        meta = {
+          homepage = "http://melpa.org/#/nrepl-eval-sexp-fu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nrepl-sync = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nrepl-sync";
+        version = "20140807.1054";
+        src = fetchFromGitHub {
+          owner = "phillord";
+          repo = "lein-sync";
+          rev = "bab53a2361526d63a24cda176d07a1247bf5b399";
+          sha256 = "1129r3rzmfbl8nxjz71xnlyaszhhldawj467zbl36brdadp014n1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nrepl-sync";
+          sha256 = "01b504b4d8rrhlf3sfq3kk9i222fch6jd5jbm02kqw20fgv6q3jd";
+          name = "nrepl-sync";
+        };
+        packageRequires = [ cider ];
+        meta = {
+          homepage = "http://melpa.org/#/nrepl-sync";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nsis-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nsis-mode";
+        version = "20150914.746";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "nsis-mode";
+          rev = "5ea767c326bbe180e42be723605c0b03b16fdb06";
+          sha256 = "1w80mbwlvmpd5ff7vy84z61b27klzh9z4wa6m2g7cy674fw4r1xp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nsis-mode";
+          sha256 = "0pc047ryw906sz5mv0awvl67kh20prsgx6fbh0j1qm0cali2792l";
+          name = "nsis-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nsis-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nu-mode = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, undo-tree }:
+    melpaBuild {
+        pname = "nu-mode";
+        version = "20150413.1515";
+        src = fetchFromGitHub {
+          owner = "pyluyten";
+          repo = "emacs-nu";
+          rev = "e2b509a9b631e98f6feabdc783c01a6b57d05fc2";
+          sha256 = "0nbmpnljl0wdkwmxzg6lqd3mand9w043qmwp727hb84gxy0j4dib";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nu-mode";
+          sha256 = "0h5jaw577vgm3hfiwc2c0k1wn8zda8ps06vj6mqj952m8bqhf4i7";
+          name = "nu-mode";
+        };
+        packageRequires = [ helm undo-tree ];
+        meta = {
+          homepage = "http://melpa.org/#/nu-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "number";
+        version = "20141127.1204";
+        src = fetchFromGitHub {
+          owner = "chrisdone";
+          repo = "number";
+          rev = "f483365c330392b3e9362481b145acf3db040baf";
+          sha256 = "045m83rdqryjpqh6y9s6x0yf9fw9xrwmxbm4qgg8ka164x9szv0n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/number";
+          sha256 = "1nwcdv5ibirxx3sqadh6mnpj40ni3wna7wnjh343mx38dk2dzncf";
+          name = "number";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/number";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nummm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nummm-mode";
+        version = "20131117.414";
+        src = fetchFromGitHub {
+          owner = "agpchil";
+          repo = "nummm-mode";
+          rev = "81951e12032274543c5f7a585b29bd93961e94e4";
+          sha256 = "1i0yymsx8kin28bkrgwkk9ngsmjh0gh5j4hb0k03bq4fy799f2xx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nummm-mode";
+          sha256 = "10khhc6q0zjzrhsv4fgfdbs7qcwi1bgkwq4yqzidqcdndsailyh0";
+          name = "nummm-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nummm-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nvm = callPackage ({ dash, dash-functional, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "nvm";
+        version = "20151113.255";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "nvm.el";
+          rev = "d6c7ad048f1d2854ec3c043d80528857aa1090a8";
+          sha256 = "0prag0ks511ifa5mdpqmizp5n8190dxp4vdr81ld9w9xv7migpd7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nvm";
+          sha256 = "03gy7wavc2q02lnr9pmp3l1pn0lzbdq0kwnmg9fvklmq6r6n3x34";
+          name = "nvm";
+        };
+        packageRequires = [ dash dash-functional f s ];
+        meta = {
+          homepage = "http://melpa.org/#/nvm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nyan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nyan-mode";
+        version = "20151018.35";
+        src = fetchFromGitHub {
+          owner = "TeMPOraL";
+          repo = "nyan-mode";
+          rev = "eb940664cbca6165644d97989f402c8c5bd0e384";
+          sha256 = "1v8ndr8hdbqhd7nca8882g05y36pigv6lj7hpxl50lr1lvp1kmmf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nyan-mode";
+          sha256 = "1z2wnsbjllqa533g1ab5cgbv3d9hjix7fsd7z9c45nqh5cmadmyv";
+          name = "nyan-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nyan-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nyan-prompt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nyan-prompt";
+        version = "20140810.8";
+        src = fetchFromGitHub {
+          owner = "PuercoPop";
+          repo = "nyan-prompt";
+          rev = "b5137f2ee9afe640f59786eed17b308df6356c73";
+          sha256 = "0bgspjy8h3d7v12sfjnd2ghj4183pdf0z48g5xs129jwd3nycykp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nyan-prompt";
+          sha256 = "1s0qyhpfpncsv9qfxy07rbp4gv8pp5xzb48rbd3r14nkjlnylnfb";
+          name = "nyan-prompt";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nyan-prompt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    o-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "o-blog";
+        version = "20151202.1739";
+        src = fetchFromGitHub {
+          owner = "renard";
+          repo = "o-blog";
+          rev = "e466c59478feddc8126c43c1b98550474af484c0";
+          sha256 = "0xs6787a4v7djgd2zz2v1pk14x27mg2ganz30j9f0gdiai7da6ch";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/o-blog";
+          sha256 = "08grkyvg27wd5232q3y8p0v7higfq7bmsdzmvhja96v6qy2xsbja";
+          name = "o-blog";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/o-blog";
+          license = lib.licenses.free;
+        };
+      }) {};
+    oauth = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "oauth";
+        version = "20130127.1951";
+        src = fetchFromGitHub {
+          owner = "psanford";
+          repo = "emacs-oauth";
+          rev = "ee4744ad76a1560281b0c4944575a3bd598c6458";
+          sha256 = "058dyk1c3iw0ip8n8rfpskvqiriqilpclkzc18x73msp5svrh3lj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/oauth";
+          sha256 = "18z3i5brxm60z373cwx2sa3hx7v38a5s62gbs9b0lxb20ah4p9rz";
+          name = "oauth";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/oauth";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-axiom = callPackage ({ axiom-environment, emacs, fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ob-axiom";
+        version = "20150804.1700";
+        src = fetchhg {
+          url = "https://bitbucket.com/pdo/axiom-environment";
+          rev = "d7ea57a27527";
+          sha256 = "1vk7jjbf8wp183c4nagkgxvzcyrdlr53avzsxl111rm5rsxbvdli";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-axiom";
+          sha256 = "12cmzhgzk8314y6nvzdjwidalccz6h440lil83c1h4lz4ddlwmf6";
+          name = "ob-axiom";
+        };
+        packageRequires = [ axiom-environment emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ob-axiom";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-browser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ob-browser";
+        version = "20150101.910";
+        src = fetchFromGitHub {
+          owner = "krisajenkins";
+          repo = "ob-browser";
+          rev = "9271453d28d0912093ab5f91807745ada69ada0c";
+          sha256 = "1nzli8wk3nd05j2z2fw511857qbawirhg8mfw21wqclkz8zqn813";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-browser";
+          sha256 = "1yqbzmmazamgf8fi8ipq14ffm8h1pp5d2lkflbxjsagdq61hirxm";
+          name = "ob-browser";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "http://melpa.org/#/ob-browser";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-cypher = callPackage ({ cypher-mode, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "ob-cypher";
+        version = "20150224.2037";
+        src = fetchFromGitHub {
+          owner = "zweifisch";
+          repo = "ob-cypher";
+          rev = "b3511df05f175c1947996802e9e199432ea9ced8";
+          sha256 = "1xbczyqfqdig5w6jvx2kg57mk16sbiz5ysv445v83wqk0sz6nc9n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-cypher";
+          sha256 = "1ygmx0rjvxjl8hifkkwrkk9gpsmdsk6ndb6pg7y78p8hfp5jpyq3";
+          name = "ob-cypher";
+        };
+        packageRequires = [ cypher-mode dash dash-functional s ];
+        meta = {
+          homepage = "http://melpa.org/#/ob-cypher";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-elixir = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ob-elixir";
+        version = "20151021.647";
+        src = fetchFromGitHub {
+          owner = "zweifisch";
+          repo = "ob-elixir";
+          rev = "d0e8007efa0b99ab7a6e4cb7160a87d6cb60d210";
+          sha256 = "0qknm1h2ijnzs1km51hqwpnv5083m9ngi3nbxd90r7d6vva5fhhk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-elixir";
+          sha256 = "1l5b9hww2vmqnjlsd6lbjpz9walck82ngang1amfnk4xn6d0gdhi";
+          name = "ob-elixir";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "http://melpa.org/#/ob-elixir";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "ob-http";
+        version = "20151128.430";
+        src = fetchFromGitHub {
+          owner = "zweifisch";
+          repo = "ob-http";
+          rev = "d9af67c6726c50447d8cf21b9c1c25a3a07dc0ce";
+          sha256 = "1yv1i646ll9wnmarcwcmx3nvscq3sv22rmnphvqcr0whrd9vb7rb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-http";
+          sha256 = "0b7ghz9pqbyn3b52cpmnwa2wnd4svj23p6gc48ybwzwiid42wiss";
+          name = "ob-http";
+        };
+        packageRequires = [ cl-lib s ];
+        meta = {
+          homepage = "http://melpa.org/#/ob-http";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-ipython = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "ob-ipython";
+        version = "20151010.507";
+        src = fetchFromGitHub {
+          owner = "gregsexton";
+          repo = "ob-ipython";
+          rev = "15011a8e1694d09a74094c5361a588bf586458f6";
+          sha256 = "0r5p2gr7ri4w79lmhil4fgh6g8cmxs1qp8glkbvycvlaxwrzszhs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-ipython";
+          sha256 = "06llf365k8m81ljmlajqvxlh84qg6h0flp3m6gb0zx71xilvw186";
+          name = "ob-ipython";
+        };
+        packageRequires = [ dash dash-functional emacs f s ];
+        meta = {
+          homepage = "http://melpa.org/#/ob-ipython";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-kotlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ob-kotlin";
+        version = "20150312.814";
+        src = fetchFromGitHub {
+          owner = "zweifisch";
+          repo = "ob-kotlin";
+          rev = "c494f50184d25e196c009bf5cc105c4931b9464d";
+          sha256 = "01cjwg27m0iqndkwwl0v5w8vvk270xvi81za3y5hyrmb7dq6bfy7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-kotlin";
+          sha256 = "19g4s9dnipg9aa360mp0affmnslm6h7byg595rnaz6rz25a3qdpx";
+          name = "ob-kotlin";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "http://melpa.org/#/ob-kotlin";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-lfe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ob-lfe";
+        version = "20150701.855";
+        src = fetchFromGitHub {
+          owner = "zweifisch";
+          repo = "ob-lfe";
+          rev = "d50a5d76e389501504e060a7005f20b96c895594";
+          sha256 = "1mk7qcf4svf4yk4mimcyhbw5imq3zps2vh2zzq9gwjcn17jnplhn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-lfe";
+          sha256 = "11cpaxk9wb27b9zhyns75dqpds4gh3cbjcvia4p2bnvmbm8lz4y8";
+          name = "ob-lfe";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "http://melpa.org/#/ob-lfe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-mongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ob-mongo";
+        version = "20130718.932";
+        src = fetchFromGitHub {
+          owner = "krisajenkins";
+          repo = "ob-mongo";
+          rev = "7eb5524d9c106945b371f9fbb9f1176f6e6f9b13";
+          sha256 = "0qibnn908a59jyfslsnpjanbm85f8xw9zywsqsh37nv27ncbx0hr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-mongo";
+          sha256 = "1cgmqsl5dzi8xy3sh5xsfkczl555fpd4q6kgsh9xkn74sz227907";
+          name = "ob-mongo";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "http://melpa.org/#/ob-mongo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-prolog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ob-prolog";
+        version = "20150530.1137";
+        src = fetchFromGitHub {
+          owner = "ljos";
+          repo = "ob-prolog";
+          rev = "548986d0e6f678789216a882f0a19daf1b89ab93";
+          sha256 = "14scbds1rlmii52i0zr3s0r1wmga7qysj63c2dpinhagxa36d51n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-prolog";
+          sha256 = "0ki8yd20yk5xwn0zpk06zjxzgrsf8paydif9n98svb9s2l9wrh1s";
+          name = "ob-prolog";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ob-prolog";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ob-restclient";
+        version = "20151207.1503";
+        src = fetchFromGitHub {
+          owner = "alf";
+          repo = "ob-restclient.el";
+          rev = "fc5684186275146bba667325c8c33bf7d6011552";
+          sha256 = "0gd2n7dgaasl0clx71gsdm74xxm03qr5yrin8vz3q7wvkfn4bzdf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-restclient";
+          sha256 = "0nv2wsqmpschym6ch8fr4a79hlnpz31jc8y2flsygaqj0annjkfk";
+          name = "ob-restclient";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ob-restclient";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-sml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sml-mode }:
+    melpaBuild {
+        pname = "ob-sml";
+        version = "20130829.1343";
+        src = fetchFromGitHub {
+          owner = "swannodette";
+          repo = "ob-sml";
+          rev = "958165c92b6cff6cada5c85c8ae5887806b8451b";
+          sha256 = "0gymna48igcixrapjmg842pnlsshhw8zplxwyyn0x2yrma9fjyyg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-sml";
+          sha256 = "04qvzhwjr8ipvq3znnhn0wbl4pbb1rwxi90iidavzk3phbkpaskn";
+          name = "ob-sml";
+        };
+        packageRequires = [ sml-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/ob-sml";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-translate = callPackage ({ fetchFromGitHub, fetchurl, google-translate, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ob-translate";
+        version = "20130718.929";
+        src = fetchFromGitHub {
+          owner = "krisajenkins";
+          repo = "ob-translate";
+          rev = "c068f8710ec3019a345b7dc5a5433bee23c87afb";
+          sha256 = "1yaqs6zcx8228pwzsm19h6272bw9lhib6xz5xzzq8x8n54l81225";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-translate";
+          sha256 = "1hi0rxbyxvk9sbk2fy3kqw7l4lgri921vya1mn4i1q2i1979r2gz";
+          name = "ob-translate";
+        };
+        packageRequires = [ google-translate org ];
+        meta = {
+          homepage = "http://melpa.org/#/ob-translate";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-typescript = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ob-typescript";
+        version = "20150804.730";
+        src = fetchFromGitHub {
+          owner = "lurdan";
+          repo = "ob-typescript";
+          rev = "9dcbd226cbfb75e790dd9de91d9401dde85a889a";
+          sha256 = "1ycqdjqn5361pcnc95hxhjqd3y96cjjnaylrnzwhmacl38jm3vai";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-typescript";
+          sha256 = "1wpy928ndvc076jzi14f6k5fsw8had0pz7f1yjdqql4icszhqa0p";
+          name = "ob-typescript";
+        };
+        packageRequires = [ emacs org ];
+        meta = {
+          homepage = "http://melpa.org/#/ob-typescript";
+          license = lib.licenses.free;
+        };
+      }) {};
+    oberon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "oberon";
+        version = "20120715.409";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "oberon";
+          rev = "fb57d18ce13835a8a69b6bafecdd9193ca9a59a3";
+          sha256 = "16462cgq91jg7i97h440zss5vw2qkxgdy7gm148ns4djr2fchnf6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/oberon";
+          sha256 = "1wna7ld670r6ljdg5yx0ga0grbq1ma8q92gkari0d5czr7s9lggv";
+          name = "oberon";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/oberon";
+          license = lib.licenses.free;
+        };
+      }) {};
+    objc-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "objc-font-lock";
+        version = "20141021.1322";
+        src = fetchFromGitHub {
+          owner = "Lindydancer";
+          repo = "objc-font-lock";
+          rev = "34b457d577f97ca94b8792d025f9a909c7610612";
+          sha256 = "138c1nm579vr37dqprqsakfkhs2awm3klzyyd6bv9rhkrysrpbqk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/objc-font-lock";
+          sha256 = "0njslpgdcph3p3gamrbd6pc04szks07yv4ij3p1l7p5dc2p06rs6";
+          name = "objc-font-lock";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/objc-font-lock";
+          license = lib.licenses.free;
+        };
+      }) {};
+    obsidian-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "obsidian-theme";
+        version = "20140420.1143";
+        src = fetchFromGitHub {
+          owner = "mswift42";
+          repo = "obsidian-theme";
+          rev = "0f92ce87245529d5c75d6e5f7862ebbc54bdbc92";
+          sha256 = "00v21iw9wwxap8jhg9035cp47fm5v2djmldq6nprv860m01xlwh1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/obsidian-theme";
+          sha256 = "17ckshimdma6fqiis4kxczxkbrsfpm2a0b41m5f3qz3qlhcw2xgr";
+          name = "obsidian-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/obsidian-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    occidental-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "occidental-theme";
+        version = "20130312.1458";
+        src = fetchFromGitHub {
+          owner = "olcai";
+          repo = "occidental-theme";
+          rev = "fd2db7256d4f78c43d99c3cddb1c39106d479816";
+          sha256 = "0pnliw02crqw8hbg088klz54z6s1ih8q2lcn9mq5f12xi752hxm8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/occidental-theme";
+          sha256 = "1ra5p8k96wvb04v69xm87jl4jlgi57v4jw2xxzkwbwxbydncnv0b";
+          name = "occidental-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/occidental-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    occur-context-resize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "occur-context-resize";
+        version = "20151227.2202";
+        src = fetchFromGitHub {
+          owner = "dgtized";
+          repo = "occur-context-resize.el";
+          rev = "36e69b9d3b7c6de884a8e8822d67856b78a07f4f";
+          sha256 = "1v1c2481v2xgnw8kgbbqhqkdd41lzvki9hm3iypbf3n0jxz8nnzy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/occur-context-resize";
+          sha256 = "0sp5v4rwqgqdj26gdkrmjvkmbp4g6jq4lrn2c3zm8s2gq0s3l6ri";
+          name = "occur-context-resize";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/occur-context-resize";
+          license = lib.licenses.free;
+        };
+      }) {};
+    occur-x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "occur-x";
+        version = "20130610.843";
+        src = fetchFromGitHub {
+          owner = "juan-leon";
+          repo = "occur-x";
+          rev = "352f5fab207d8a1d3dd048073ff127a83e97c82b";
+          sha256 = "1zj0xhvl5qx42injv0av4lyzd3jsjls1m368dqd2qnswhfw8wfn6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/occur-x";
+          sha256 = "1xq1k9rq7k1zw90shbgiidwvcn0ys1d53q03b5mpvvfqhj4n0i1g";
+          name = "occur-x";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/occur-x";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ocodo-svg-modelines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, svg-mode-line-themes }:
+    melpaBuild {
+        pname = "ocodo-svg-modelines";
+        version = "20150516.919";
+        src = fetchFromGitHub {
+          owner = "ocodo";
+          repo = "ocodo-svg-modelines";
+          rev = "c7b0789a177219f117c4de5659ecfa8622958c40";
+          sha256 = "155gmls6cz3zf4lcj89kzb96y7k0glx0f659jg5z0skgxq79hf48";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ocodo-svg-modelines";
+          sha256 = "0fa88ns70wsr9i9gf4zx3fvmn1a32mrjsda105n0cx6c965kfmay";
+          name = "ocodo-svg-modelines";
+        };
+        packageRequires = [ svg-mode-line-themes ];
+        meta = {
+          homepage = "http://melpa.org/#/ocodo-svg-modelines";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ocp-indent";
+        version = "20150914.332";
+        src = fetchFromGitHub {
+          owner = "OCamlPro";
+          repo = "ocp-indent";
+          rev = "a463bee9088178f429022d1c6c4db216178384e9";
+          sha256 = "0p3wsxkj9jpnxanl6r8glf9wvyjbf5z24idvaa1j07whlq68bcrq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ocp-indent";
+          sha256 = "0wc4z9dsnnyr24n3vg1npvc3rm53av8bpbvrl8kldxxdiwgnbkjw";
+          name = "ocp-indent";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ocp-indent";
+          license = lib.licenses.free;
+        };
+      }) {};
+    octicons = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "octicons";
+        version = "20151031.2240";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-octicons";
+          rev = "229286a6166dba8ddabc8c4d338798c6cd3cf67d";
+          sha256 = "0dp7dhmgrq078rjhpm1cr993qjqz7qgy2z4sn73qw6j55va7d9kw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/octicons";
+          sha256 = "02f37bvnc5qvkvfbyx5wp54nz71bqm747mq1p5361sx091lllkxk";
+          name = "octicons";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/octicons";
+          license = lib.licenses.free;
+        };
+      }) {};
+    octopress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "octopress";
+        version = "20151006.514";
+        src = fetchFromGitHub {
+          owner = "aaronbieber";
+          repo = "octopress.el";
+          rev = "2e068887b17b72a69e29349d477333d067867eec";
+          sha256 = "1fc9iabxfmyqb41j31rgbzxdmnjrzqh1pp9s15q6s7b2d7mc0a0y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/octopress";
+          sha256 = "0zsir6chjvn5i1irmf5aj6mmb401c553r5wykq796sz7jnjhrjg0";
+          name = "octopress";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/octopress";
+          license = lib.licenses.free;
+        };
+      }) {};
+    offlineimap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "offlineimap";
+        version = "20150916.658";
+        src = fetchFromGitHub {
+          owner = "jd";
+          repo = "offlineimap.el";
+          rev = "cc3e067e6237a1eb7b21c575a41683b1febb47f1";
+          sha256 = "1bjrgj8klg7ly63vx90jpaih9virn02bhqi16p6z0mw36q1q7ysq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/offlineimap";
+          sha256 = "0nza7lrz7cn06njcblwh9hy3050j8ja4awbxx7jzv6nazjg7201b";
+          name = "offlineimap";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/offlineimap";
+          license = lib.licenses.free;
+        };
+      }) {};
+    oldlace-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "oldlace-theme";
+        version = "20150705.800";
+        src = fetchFromGitHub {
+          owner = "mswift42";
+          repo = "oldlace-theme";
+          rev = "5c6f437203b0783b36a7aff4a578de4a0c8c4ee6";
+          sha256 = "0y9fxrsxp1158fyjp4f69r7g2s7b6nbxlsmsb8clwqc8pmmg2z82";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/oldlace-theme";
+          sha256 = "1pxiqqh5x4wsayqgwplzvsbalbj44zvby7x0pijdvwcnsh74znj8";
+          name = "oldlace-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/oldlace-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "olivetti";
+        version = "20160105.555";
+        src = fetchFromGitHub {
+          owner = "rnkn";
+          repo = "olivetti";
+          rev = "ef3d85e65d46370702e04359cc22068678336d0c";
+          sha256 = "1mh4dlx5j2zwv7zx8x52vl6h38jr41ly5bn6zqsncnafd1a8l7x7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/olivetti";
+          sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd";
+          name = "olivetti";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/olivetti";
+          license = lib.licenses.free;
+        };
+      }) {};
+    om-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "om-mode";
+        version = "20140915.1610";
+        src = fetchFromGitHub {
+          owner = "danielsz";
+          repo = "om-mode";
+          rev = "cdc0c2912321f8438b0f3449ba8aca50ec150bba";
+          sha256 = "03szb2i2xk3nq578cz1drsddsbld03ryvykdfzmfvwcmlpaknvzb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/om-mode";
+          sha256 = "1q2h9wjnyg7wlk913px4vj1cxqynd6xfh9ind7kjyra436yw3l4j";
+          name = "om-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/om-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    omni-kill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "omni-kill";
+        version = "20150527.149";
+        src = fetchFromGitHub {
+          owner = "AdrieanKhisbe";
+          repo = "omni-kill.el";
+          rev = "4c8dbb6b2c9f1afc0f82077c04eab022e5387e85";
+          sha256 = "1925mh47n4x9v780qp5l6cksl64v9mpyb87znsg93x6sxr0cvv4c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-kill";
+          sha256 = "03kydl16rd9mnc1rnan2byqa6f70891fhcj16wkavl2r68rfj75k";
+          name = "omni-kill";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/omni-kill";
+          license = lib.licenses.free;
+        };
+      }) {};
+    omni-log = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "omni-log";
+        version = "20150604.1238";
+        src = fetchFromGitHub {
+          owner = "AdrieanKhisbe";
+          repo = "omni-log.el";
+          rev = "e5a8ee7d63eb1e745b37ba4e3e71c5ea025e2342";
+          sha256 = "1nvgh9wvgswcs3r958b579rsx540xrhlnafc6cmcd63z6yck19w0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-log";
+          sha256 = "0c29243zq8r89ax4rxlmb8imag12icnldcb0q0xsnhjccw8lyw1r";
+          name = "omni-log";
+        };
+        packageRequires = [ dash emacs ht s ];
+        meta = {
+          homepage = "http://melpa.org/#/omni-log";
+          license = lib.licenses.free;
+        };
+      }) {};
+    omni-quotes = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, omni-log }:
+    melpaBuild {
+        pname = "omni-quotes";
+        version = "20150604.1257";
+        src = fetchFromGitHub {
+          owner = "AdrieanKhisbe";
+          repo = "omni-quotes.el";
+          rev = "537f7191bede7156dae94622e92cec04c6cd4bdf";
+          sha256 = "1x8af8jv4n83sl4rgj0d2rpmw9g78rknm1h523f3b1a5x4kdvsz6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-quotes";
+          sha256 = "0dqki0ibabs9cpcjvnh8lc2114x46i1xmnyjc6qqblfxa3ggdygs";
+          name = "omni-quotes";
+        };
+        packageRequires = [ dash omni-log ];
+        meta = {
+          homepage = "http://melpa.org/#/omni-quotes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    omni-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "omni-scratch";
+        version = "20151211.1059";
+        src = fetchFromGitHub {
+          owner = "AdrieanKhisbe";
+          repo = "omni-scratch.el";
+          rev = "7e04d7f20ee383bf72dfdcfd642bf08e4b8ab973";
+          sha256 = "1icdk19vwihc8mn04yxl2brql2gssn3gxd5bv7ljdd6mn5hkw500";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-scratch";
+          sha256 = "190dkqcw8xywzrq8a99w4rqi0y1h2aj23s84g2ln1sf7jaf6d6n9";
+          name = "omni-scratch";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/omni-scratch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    omni-tags = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el }:
+    melpaBuild {
+        pname = "omni-tags";
+        version = "20150513.1253";
+        src = fetchFromGitHub {
+          owner = "AdrieanKhisbe";
+          repo = "omni-tags.el";
+          rev = "3f88b087d492e8ef742416d6e4bf8be41e5a46c4";
+          sha256 = "1lvnkdrav7h15p8d5ayhfsjynllwp4br1vqxmw0ppxnlyq7337n5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-tags";
+          sha256 = "133ww1jf14jbw02ssbx2a46mp52j18a2wwzb6x77azb0akmf1lzl";
+          name = "omni-tags";
+        };
+        packageRequires = [ cl-lib pcre2el ];
+        meta = {
+          homepage = "http://melpa.org/#/omni-tags";
+          license = lib.licenses.free;
+        };
+      }) {};
+    omniref = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "omniref";
+        version = "20151118.221";
+        src = fetchFromGitHub {
+          owner = "dotemacs";
+          repo = "omniref.el";
+          rev = "0026e0472c7071e06cfdc24be91d3f4989ba8115";
+          sha256 = "1hzvpajq58py6k7z2rwwax1c7pm65m534mq8mr9g9kxn9hqiz9n8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omniref";
+          sha256 = "0lgw1knqppdg046zqx4m7nbzvsasr89wa9i4594hf46w1094dabj";
+          name = "omniref";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/omniref";
+          license = lib.licenses.free;
+        };
+      }) {};
+    omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild, popup, s }:
+    melpaBuild {
+        pname = "omnisharp";
+        version = "20151210.1314";
+        src = fetchFromGitHub {
+          owner = "OmniSharp";
+          repo = "omnisharp-emacs";
+          rev = "725796278fa8a391e244f2e50676dd6d6b67585d";
+          sha256 = "1iq8yzjv7wb0jfi3lqqyx4n7whvb7xf8ls0q0w7pgsrsslrxbwcm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omnisharp";
+          sha256 = "0dwya22y92k7x2s223az1g8hmrpfmk1sgwbr9z47raaa8kd52iad";
+          name = "omnisharp";
+        };
+        packageRequires = [
+          auto-complete
+          cl-lib
+          csharp-mode
+          dash
+          flycheck
+          json
+          popup
+          s
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/omnisharp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    on-parens = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
+    melpaBuild {
+        pname = "on-parens";
+        version = "20150702.1706";
+        src = fetchFromGitHub {
+          owner = "willghatch";
+          repo = "emacs-on-parens";
+          rev = "16a145bf73550d5000ffbc2725c541a8458d0d3c";
+          sha256 = "1616bdvrf1bawcqgj7balbxaw26waw81gxiw7yspnvpyb009j66y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/on-parens";
+          sha256 = "19kyzpkgfl0ipbcgnl8fbfbapnfdxr8w9i7prfkm6rjp6amxyqab";
+          name = "on-parens";
+        };
+        packageRequires = [ dash emacs evil smartparens ];
+        meta = {
+          homepage = "http://melpa.org/#/on-parens";
+          license = lib.licenses.free;
+        };
+      }) {};
+    on-screen = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "on-screen";
+        version = "20151108.2308";
+        src = fetchFromGitHub {
+          owner = "michael-heerdegen";
+          repo = "on-screen.el";
+          rev = "80b00ddef6dffad7086174c2c57f29ef28b69d27";
+          sha256 = "1rksk0j9b27w913bzbq7w2ws75yi66m24ic6ljdhhbrq3z2ic7dy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/on-screen";
+          sha256 = "104jisc2bckzrajxlvj1cfx1drnjj7jhqjblvm89ry32xdnjxmqb";
+          name = "on-screen";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/on-screen";
+          license = lib.licenses.free;
+        };
+      }) {};
+    oneonone = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild {
+        pname = "oneonone";
+        version = "20151231.1741";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/oneonone.el";
+          sha256 = "05njigqi9061d34530d76kwsdzqgk9qxnwhn9xis64w59f5nzf1h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/oneonone";
+          sha256 = "0v4nvhzgq97zbi18jd3ds57yh1fpv57b2a1cd7r8jbxwaaz3gpg9";
+          name = "oneonone";
+        };
+        packageRequires = [ hexrgb ];
+        meta = {
+          homepage = "http://melpa.org/#/oneonone";
+          license = lib.licenses.free;
+        };
+      }) {};
+    opam = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "opam";
+        version = "20150719.720";
+        src = fetchFromGitHub {
+          owner = "lunaryorn";
+          repo = "opam.el";
+          rev = "4d589de5765728f56af7078fae328b6792de8600";
+          sha256 = "1yqrp9icci5snp1485wb6y8mr2hjp9006ahch58lvmnq98bn7j45";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/opam";
+          sha256 = "004r93nn1ranvxkcc0y5m3p8gh4axgghgnsvim38nc1sqda5h6xa";
+          name = "opam";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/opam";
+          license = lib.licenses.free;
+        };
+      }) {};
+    open-junk-file = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "open-junk-file";
+        version = "20130131.120";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/open-junk-file.el";
+          sha256 = "1vjmgayksdgg54b46aqmvhd7a9arjx9p3jyrjs2z9262f6r288lj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/open-junk-file";
+          sha256 = "0ybycprs5di9niai4hbmfq4xdacfgrzf1mwq1aj1hi53phl8l4di";
+          name = "open-junk-file";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/open-junk-file";
+          license = lib.licenses.free;
+        };
+      }) {};
+    openstack-cgit-browse-file = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "openstack-cgit-browse-file";
+        version = "20130819.427";
+        src = fetchFromGitHub {
+          owner = "chmouel";
+          repo = "openstack-cgit-browse-file";
+          rev = "244219288b9aef41155044697bb114b7af83ab8f";
+          sha256 = "0086pfk4pq6xmknk7a42fihcjgzkcplqqc1rk9fhwmn9j7djbq70";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/openstack-cgit-browse-file";
+          sha256 = "05dl28a4npnnzzipypfcqb21sdww715lwji2xnsabx3fb1h1w5jl";
+          name = "openstack-cgit-browse-file";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/openstack-cgit-browse-file";
+          license = lib.licenses.free;
+        };
+      }) {};
+    openwith = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "openwith";
+        version = "20120531.1636";
+        src = fetchhg {
+          url = "https://bitbucket.com/jpkotta/openwith";
+          rev = "aeb78782ec87";
+          sha256 = "1wl6gnxsyhaad4cl9bxjc0qbc5jzvlwbwjbajs0n1s6qr07d6r01";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/openwith";
+          sha256 = "05lkx3yfv2445fp07bhqv2aqz5hgf3dxp39lmz3nfxn4c9v8nkqi";
+          name = "openwith";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/openwith";
+          license = lib.licenses.free;
+        };
+      }) {};
+    operate-on-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "operate-on-number";
+        version = "20150707.123";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "operate-on-number.el";
+          rev = "ceb3be565a29326c1098244fac0c50606723a56e";
+          sha256 = "0iw3c8sn702ziki59mvd5gxm484i7f0bwsy8fz95y08s9gknjjf9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/operate-on-number";
+          sha256 = "1rw3fqbzfizgcbz3yaf99rr2546msna4z7dyfa8dbi8h7yzl4fhk";
+          name = "operate-on-number";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/operate-on-number";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-ac = callPackage ({ auto-complete-pcmp, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
+    melpaBuild {
+        pname = "org-ac";
+        version = "20140302.613";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "org-ac";
+          rev = "9cbbda79e2fe964ded3f39cf7a2e74f1be3d6b9a";
+          sha256 = "1xckin2d6s40kgr2293g72ipc57f8gp6y63303kmqcv3qm8q13ca";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-ac";
+          sha256 = "059jr3v3558cgw626zbqfwmwwv5f4637ai26h7b6psqh0x9sf3mr";
+          name = "org-ac";
+        };
+        packageRequires = [ auto-complete-pcmp log4e yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/org-ac";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-agenda-property = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-agenda-property";
+        version = "20140626.1616";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "org-agenda-property";
+          rev = "3b469f3e93de0036547f3631cd0366d53f7584c8";
+          sha256 = "15xgkm5p30qfghyhkjivh5n4770794qf4pza462vb0xl5v6kffbm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-agenda-property";
+          sha256 = "0zsjzjw52asl609q7a2s4jcsm478p4cxzhnd3azyr9ypxydjf6qk";
+          name = "org-agenda-property";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/org-agenda-property";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-alert = callPackage ({ alert, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "org-alert";
+        version = "20151007.537";
+        src = fetchFromGitHub {
+          owner = "groksteve";
+          repo = "org-alert";
+          rev = "d9b73febcc4f211406521786a39853c6bc6dd1bf";
+          sha256 = "0yzvir2gmyv9k43q3sf37lc9xcmfyaj5wh825xax7305j3b2hhvv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-alert";
+          sha256 = "0n5a24iv8cj395xr0gfgi0hs237dd98zm2fws05k47vy3ygni152";
+          name = "org-alert";
+        };
+        packageRequires = [ alert dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/org-alert";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-attach-screenshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-attach-screenshot";
+        version = "20160104.1446";
+        src = fetchFromGitHub {
+          owner = "dfeich";
+          repo = "org-screenshot";
+          rev = "5e80f275ee3fe540a72e5f5b11a0d8634e46cafb";
+          sha256 = "1b3n4cbpx7crvkc8kx651f8ap68xhpvq0kp4f6c9sqp4n6wg7g35";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-attach-screenshot";
+          sha256 = "0108kahyd499q87wzvirv5d6p7jrb7ckz8r96pwqzgflj3njbnmn";
+          name = "org-attach-screenshot";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-attach-screenshot";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-autolist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-autolist";
+        version = "20150922.905";
+        src = fetchFromGitHub {
+          owner = "calvinwyoung";
+          repo = "org-autolist";
+          rev = "da332fadcd9be4c5eb21c5e98c392b89743750b2";
+          sha256 = "0j6fqgzvbmvvdh0dgwsxq004wxys2zwnq9wa3idm087ynp2a2ani";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-autolist";
+          sha256 = "1jvspxhxlvd7h1srk9dbk1v5dykmf8jsjaqicpll7ial6i0qgikj";
+          name = "org-autolist";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-autolist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-beautify-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-beautify-theme";
+        version = "20150106.1156";
+        src = fetchFromGitHub {
+          owner = "jonnay";
+          repo = "emagicians-starter-kit";
+          rev = "5fadbf1bf84091b6ffe6cd1bff48f30e3da6c479";
+          sha256 = "00iklf97mszrsdv20q55qhml1dscvmmalpfnlkwi9mabklyq3i6z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-beautify-theme";
+          sha256 = "1j2gi3f72kvavdcj6xs7zng0dcnivrhc7pjzm2g4mjm5ad5s1flq";
+          name = "org-beautify-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-beautify-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-bullets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-bullets";
+        version = "20140918.1337";
+        src = fetchFromGitHub {
+          owner = "sabof";
+          repo = "org-bullets";
+          rev = "b70ac2ec805bcb626a6e39ea696354577c681b36";
+          sha256 = "10nr4sjffnqbllv6gmak6pviyynrb7pi5nvrq331h5alm3xcpq0w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-bullets";
+          sha256 = "1kxhlabaqi1g6pz215afp65d9cp324s8mvabjh7q1h7ari32an75";
+          name = "org-bullets";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-bullets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-caldav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-caldav";
+        version = "20150131.352";
+        src = fetchFromGitHub {
+          owner = "dengste";
+          repo = "org-caldav";
+          rev = "8aff005f431e5f677950b73f710fdf968ff4ac65";
+          sha256 = "0lq2rx6wgz0aymwhw597xs2pabinhk3jpnnhjwq0jk8ggp3afqaz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-caldav";
+          sha256 = "0166y04gxrwnynm4jshm2kqk5jbvl5g5078dxvw18nicrgq3y4r8";
+          name = "org-caldav";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "http://melpa.org/#/org-caldav";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-cliplink = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-cliplink";
+        version = "20151229.1300";
+        src = fetchFromGitHub {
+          owner = "rexim";
+          repo = "org-cliplink";
+          rev = "82f46c1355ef6cfbf884171c0410570bcc525027";
+          sha256 = "1g9fanikdcbkmvbh9bp5dg3s2maawkqinjavn5158p0gy68ab240";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-cliplink";
+          sha256 = "19l3k9w9csgvdr7n824bzg7jja0f28dmz6caldxh43vankpmlg3p";
+          name = "org-cliplink";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-cliplink";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-context = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-context";
+        version = "20160108.414";
+        src = fetchFromGitHub {
+          owner = "thisirs";
+          repo = "org-context";
+          rev = "d09878d247cd4fc9702d6da1f79eca1b07942120";
+          sha256 = "0q4v216ihhwv8rlb9xc8xy7nj1p058xabfflglhgcd7mfjrsyayx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-context";
+          sha256 = "19y8aln7wix9p506ajvfkl641147c5mdmjm98jnq68cx2r4wp6zz";
+          name = "org-context";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-context";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-cua-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-cua-dwim";
+        version = "20120202.2334";
+        src = fetchFromGitHub {
+          owner = "mlf176f2";
+          repo = "org-cua-dwim.el";
+          rev = "a55d6c7009fc0b22f1110c07de629acc955c85e4";
+          sha256 = "0nrfvmqb70phnq0k4wbdj6z666wq6xvabg4pgv8qn62rbrw4yyhm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-cua-dwim";
+          sha256 = "0p7v564p8n1hm7rzlrbm2pnhyha8aif2r9g7g4kg0iqln89f5yhc";
+          name = "org-cua-dwim";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-cua-dwim";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-dashboard = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-dashboard";
+        version = "20150812.502";
+        src = fetchFromGitHub {
+          owner = "bard";
+          repo = "org-dashboard";
+          rev = "b523aefb5822c1f09a70bc429579c2959929782b";
+          sha256 = "1nqfi139cag3ll8wxk8rh59hay97vi8i0mlgnams4jla285zydj5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-dashboard";
+          sha256 = "1hvhhbmyx12wsf2n1hd0hg5cy05zyspd82xxcdh04g4s9r3ikqj5";
+          name = "org-dashboard";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/org-dashboard";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-doing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-doing";
+        version = "20150824.901";
+        src = fetchFromGitHub {
+          owner = "omouse";
+          repo = "org-doing";
+          rev = "7d0a8ef5dcd18ee375da6298d96e6858508fb919";
+          sha256 = "1wrgqdrfdxc1vrcr6dsa8dcxrwj6zgjr9h1fzilwnxlzfvdilnsm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-doing";
+          sha256 = "17w49z78fvbz182sxv9mnryj124gm9jbdmbybppjqz4rk6wvnm2j";
+          name = "org-doing";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-doing";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-dotemacs = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-dotemacs";
+        version = "20151119.1222";
+        src = fetchFromGitHub {
+          owner = "vapniks";
+          repo = "org-dotemacs";
+          rev = "99a066508fedf8c80a3bfef08e015e612499d417";
+          sha256 = "15zrnd168n4pwa1bj5fz79hcrgw61braf0b095rsfhjh5w2sasy7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-dotemacs";
+          sha256 = "1vc391fdkdqd4g0piq66zhrlgqx5s2ijv7qd1rc3a235sjb9i2n4";
+          name = "org-dotemacs";
+        };
+        packageRequires = [ cl-lib org ];
+        meta = {
+          homepage = "http://melpa.org/#/org-dotemacs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-download = callPackage ({ async, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-download";
+        version = "20151030.916";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "org-download";
+          rev = "501920e273b32f96dfbafcf769d330296a612847";
+          sha256 = "12k3iqzmj92cvi0d99mn3ylxj00p2f2f8049dd2nxnp1gxs2k4dq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-download";
+          sha256 = "19yjx0qqpmrdwagp3d6lwwv7dcb745m9ccq3m29sin74f5p4svsi";
+          name = "org-download";
+        };
+        packageRequires = [ async ];
+        meta = {
+          homepage = "http://melpa.org/#/org-download";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-drill-table = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-plus-contrib, s }:
+    melpaBuild {
+        pname = "org-drill-table";
+        version = "20140117.337";
+        src = fetchFromGitHub {
+          owner = "chrisbarrett";
+          repo = "org-drill-table";
+          rev = "d7b5b3743ac04f8cb1087c5c049c0520058fa89c";
+          sha256 = "0m5c9x0vazciq6czpg5y9nr5yzjf6nl0qp5cfajv49cw2h0cwqyy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-drill-table";
+          sha256 = "1gb5b4hj4xr8nv8bxfar145i38zcic6c34gk98wpshvwzvb43r69";
+          name = "org-drill-table";
+        };
+        packageRequires = [ cl-lib dash emacs org-plus-contrib s ];
+        meta = {
+          homepage = "http://melpa.org/#/org-drill-table";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-dropbox = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
+    melpaBuild {
+        pname = "org-dropbox";
+        version = "20150113.2309";
+        src = fetchFromGitHub {
+          owner = "heikkil";
+          repo = "org-dropbox";
+          rev = "75dab6d6f0438a7a8a18ccf3a5d55f50bf531f6e";
+          sha256 = "0jjdsng7fm4wbhvd9naqzdfsmkvj1sf1d9rikprg1pd58azv6idx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-dropbox";
+          sha256 = "0qfvdz13ncqn7qaz03lwabzsnk62z6wqzlxlvdqv5xyllcy9m6ln";
+          name = "org-dropbox";
+        };
+        packageRequires = [ dash emacs names ];
+        meta = {
+          homepage = "http://melpa.org/#/org-dropbox";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-ehtml = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-server }:
+    melpaBuild {
+        pname = "org-ehtml";
+        version = "20150506.1858";
+        src = fetchFromGitHub {
+          owner = "eschulte";
+          repo = "org-ehtml";
+          rev = "9df85de1a0fe1e7b2d6c000777c1a0c0217f92d0";
+          sha256 = "0kqvwqmwnwg2h7r38fpjg6qlkcj9v8011df8nmsgs1w1mfdvnjsq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-ehtml";
+          sha256 = "0n82fbd7aircqg2c9m138qfv8csrv0amhya3xlwswdkqn51vn3gw";
+          name = "org-ehtml";
+        };
+        packageRequires = [ emacs web-server ];
+        meta = {
+          homepage = "http://melpa.org/#/org-ehtml";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-elisp-help = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-elisp-help";
+        version = "20130423.1745";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "org-elisp-help";
+          rev = "df319441e528a0cad42d29e71fc3547a61dde1c5";
+          sha256 = "0va8wm319vvw7w0j102mx656icy3fi4mz3b6bxira6z6xl9b92s0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-elisp-help";
+          sha256 = "0a4wvz52hkcw5nrml3h1yp8w97vg5jw22wnpfbb827zh7iwb259h";
+          name = "org-elisp-help";
+        };
+        packageRequires = [ cl-lib org ];
+        meta = {
+          homepage = "http://melpa.org/#/org-elisp-help";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-eww = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-eww";
+        version = "20160104.836";
+        src = fetchFromGitHub {
+          owner = "lujun9972";
+          repo = "org-eww";
+          rev = "c0d3b141780c2e12d2dc4877a5f1c99897dff33a";
+          sha256 = "1mpdk34l08m53r7dk8qaza7kvscy9jxv7bjwc232s1xhgy3mcin5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-eww";
+          sha256 = "132asshgfpphjckd5vz1vcs18lj55mrqs1l4ggfa89rc6aj8xrca";
+          name = "org-eww";
+        };
+        packageRequires = [ emacs org ];
+        meta = {
+          homepage = "http://melpa.org/#/org-eww";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-fstree = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-fstree";
+        version = "20090723.1019";
+        src = fetchgit {
+          url = "http://repo.or.cz/r/org-fstree.git";
+          rev = "24e305c6443be9f45198185772eecfddc390a9ce";
+          sha256 = "35000fb42e317ec1a6e6c7b448bfdec7ecf65fd9f5ab4723062513c3a4acba79";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-fstree";
+          sha256 = "11ddkfddmsy26mmhgw24757f753ssh056v9vxn89pxp4qypxidfz";
+          name = "org-fstree";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-fstree";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-gcal = callPackage ({ alert, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, request-deferred }:
+    melpaBuild {
+        pname = "org-gcal";
+        version = "20151230.324";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "org-gcal.el";
+          rev = "496a04affbeaf21ac78dd29ea4f9c8f3b9e8fc8a";
+          sha256 = "0r5w85bflmky3xzwqr7g7x7srdm43i93vg0gqnhh6k0ldy7ypc06";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-gcal";
+          sha256 = "1mp6cm0rhd4r9pfvsjjp86sdqxjbbg7gk41zx0zf0s772smddy3q";
+          name = "org-gcal";
+        };
+        packageRequires = [ alert cl-lib emacs org request-deferred ];
+        meta = {
+          homepage = "http://melpa.org/#/org-gcal";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-gnome = callPackage ({ alert, fetchFromGitHub, fetchurl, gnome-calendar, lib, melpaBuild, telepathy }:
+    melpaBuild {
+        pname = "org-gnome";
+        version = "20150614.957";
+        src = fetchFromGitHub {
+          owner = "NicolasPetton";
+          repo = "org-gnome.el";
+          rev = "1012d47886cfd30eed25b73d9f18e475e0155f88";
+          sha256 = "0b57ik05iax2h3nrj96kysbk4hxmxlaabd0n6lv1xsayrlli3sj1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-gnome";
+          sha256 = "0c37gfs6xs0jbvg6ypd4z5ip1khm26wr5lxgmv1dzcc383ynzg0v";
+          name = "org-gnome";
+        };
+        packageRequires = [ alert gnome-calendar telepathy ];
+        meta = {
+          homepage = "http://melpa.org/#/org-gnome";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-grep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-grep";
+        version = "20151202.629";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "org-grep";
+          rev = "5bdd04c0f53b8a3d656f36ea17bba3df7f0cb684";
+          sha256 = "10jwqzs431mnwz717qdmcn0v8raklw41sbxbnkb36yrgznk8c09c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-grep";
+          sha256 = "0kpgizy0zxnlmyh0prwdll62ri2c1l4sb0yrkl7yw17cr4gxmkkz";
+          name = "org-grep";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/org-grep";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-if = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-if";
+        version = "20150920.1013";
+        src = fetchFromGitLab {
+          owner = "elzair";
+          repo = "org-if";
+          rev = "fab602cc1bbee7a4e99c0083e129219d3f9ed2e8";
+          sha256 = "1iyqv34b7q2k73srshcnpvfzcadq47w4rzkqp6m1d3ajk8x2vypq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-if";
+          sha256 = "0h0jdyawz2j4mp33w85z8q77l37qid8palvw5n4z379qa0wr5h96";
+          name = "org-if";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-if";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-iv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, impatient-mode, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-iv";
+        version = "20151213.914";
+        src = fetchFromGitHub {
+          owner = "kuangdash";
+          repo = "org-iv";
+          rev = "c45e5ab30183f7b1934f636758750ee2f8a05346";
+          sha256 = "1n7l70pl9x6mh7dyyiihg4zi1advzlaq2x7vivhas1i2120884i6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-iv";
+          sha256 = "1akhabp6mdw1h7zms6ahlfvwizl07fwsizwxpdzi4viggfccsfwx";
+          name = "org-iv";
+        };
+        packageRequires = [ cl-lib impatient-mode org ];
+        meta = {
+          homepage = "http://melpa.org/#/org-iv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-jekyll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-jekyll";
+        version = "20130508.439";
+        src = fetchFromGitHub {
+          owner = "juanre";
+          repo = "org-jekyll";
+          rev = "66300a1a6676ab168663178e7a7c954541a39992";
+          sha256 = "0whv8nsla93194jjpxrhlr6g230spdxbac8ibmzmyad075vx97z5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-jekyll";
+          sha256 = "0jh3rla8s8prprvhnlg0psdrj7swz7v6vf2xy1m6ff66p9saiv8i";
+          name = "org-jekyll";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "http://melpa.org/#/org-jekyll";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-jira = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-jira";
+        version = "20150911.758";
+        src = fetchFromGitHub {
+          owner = "baohaojun";
+          repo = "org-jira";
+          rev = "eb4f3012d64bcab0c28491a26eac085ccae5bf78";
+          sha256 = "0b5f8qkyzh4jwj3kvbaj3m4dpjbvh1fql7v1nb9bi5n7iwkv3lxp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-jira";
+          sha256 = "11h7kbkf38p2xycw8hvabpaacp72xdgy8c7kzcgjb2a8qlbs5ifm";
+          name = "org-jira";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-jira";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-journal";
+        version = "20151228.803";
+        src = fetchFromGitHub {
+          owner = "bastibe";
+          repo = "emacs-journal";
+          rev = "0ddd54c1112b077d0061f22dfa9c187e0ec7cb1b";
+          sha256 = "15swkzq5v9jnpmsziy8mj9rkriilxrm1c24lbfg0a4pwax5nkzp9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-journal";
+          sha256 = "078z9b9hxbvmmxib6098f49rn7n3d0v4x37p7xxb0v8cv4izlb4s";
+          name = "org-journal";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-journal";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-link-travis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-link-travis";
+        version = "20140405.1827";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "org-link-travis";
+          rev = "596615ad8373d9090bd4138da683524f0ad0bda5";
+          sha256 = "1797pd264zn19zk93nifyw6pwk2a7wrpfir373qclk601yv2g5h8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-link-travis";
+          sha256 = "0hj4x7cw7a3ry8xislkz9bnavy77z4cpmnvns02yi3gnib53mlfs";
+          name = "org-link-travis";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "http://melpa.org/#/org-link-travis";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-linkany = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
+    melpaBuild {
+        pname = "org-linkany";
+        version = "20140314.1308";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "org-linkany";
+          rev = "ed4a6614b56c9baef31647ea728b3d5fae6ed3a2";
+          sha256 = "1bggz782ci0z6aw76v51ykbmfzh5g6cxh43w798as1152sn7im3p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-linkany";
+          sha256 = "0arjj3c23yqm1ljvbnl7v9cqvd9lbz4381g8f3jyqbafs25bdc3c";
+          name = "org-linkany";
+        };
+        packageRequires = [ log4e yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/org-linkany";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-mac-iCal = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-mac-iCal";
+        version = "20140107.719";
+        src = fetchgit {
+          url = "git://orgmode.org/org-mode.git";
+          rev = "f3f4b21c57262c8e1527433634d54c1e496055f0";
+          sha256 = "fa1f174e35aad41ca090982ba645f7734201cf720336bce3ab3c07432d345170";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-mac-iCal";
+          sha256 = "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw";
+          name = "org-mac-iCal";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-mac-iCal";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-mac-link = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-mac-link";
+        version = "20160109.1643";
+        src = fetchgit {
+          url = "git://orgmode.org/org-mode.git";
+          rev = "f3f4b21c57262c8e1527433634d54c1e496055f0";
+          sha256 = "fa1f174e35aad41ca090982ba645f7734201cf720336bce3ab3c07432d345170";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-mac-link";
+          sha256 = "02rmhrwikppppw8adnzvwj43kp9wsyk60csj5pygg7cd7wah7khw";
+          name = "org-mac-link";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-mac-link";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-mobile-sync = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-mobile-sync";
+        version = "20131118.1316";
+        src = fetchFromGitHub {
+          owner = "steckerhalter";
+          repo = "org-mobile-sync";
+          rev = "3b086ffebfead48feccc629f7a6571df2f94c8e0";
+          sha256 = "0d22q57mizw70qxbvwi4yz15jg86icqq1z963rliwss3wgpirndh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-mobile-sync";
+          sha256 = "1cj0pxcjngiipmyl0w1p0g4wrxgm2y98a8862x1lcbali9lqbrwj";
+          name = "org-mobile-sync";
+        };
+        packageRequires = [ emacs org ];
+        meta = {
+          homepage = "http://melpa.org/#/org-mobile-sync";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-multiple-keymap = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-multiple-keymap";
+        version = "20150328.2006";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "org-multiple-keymap.el";
+          rev = "8ebc532df7f0dd6e6c3aa7c380a51d4166c668e8";
+          sha256 = "0zbpzm9lni6z180s7n52x8s5by5zkq2nlhx82l2h9i7in9y4r6c3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-multiple-keymap";
+          sha256 = "16iv5575634asvn1b2k535ml8g4lqgy8z5w6ykma5f9phq5idb9f";
+          name = "org-multiple-keymap";
+        };
+        packageRequires = [ cl-lib emacs org ];
+        meta = {
+          homepage = "http://melpa.org/#/org-multiple-keymap";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-octopress = callPackage ({ ctable, fetchFromGitHub, fetchurl, lib, melpaBuild, org, orglue }:
+    melpaBuild {
+        pname = "org-octopress";
+        version = "20150826.616";
+        src = fetchFromGitHub {
+          owner = "yoshinari-nomura";
+          repo = "org-octopress";
+          rev = "e04d55c3f4bb88e5661ee136cb3a55f998dca931";
+          sha256 = "132jv1zvp3yp4pa4ysl0n3a81d39cdi3nqfziz1ha1pl10qbn6wr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-octopress";
+          sha256 = "0r6ms9j4xxsrik4206g7gz4wz41wr4ylpal6yfqs4hhz88yhxrhw";
+          name = "org-octopress";
+        };
+        packageRequires = [ ctable org orglue ];
+        meta = {
+          homepage = "http://melpa.org/#/org-octopress";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-outlook = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-outlook";
+        version = "20150914.747";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "org-outlook.el";
+          rev = "b7978fedb0d50c1a3e499bf7e98b5cc526028cd4";
+          sha256 = "10dddbs9jppqqzwwv5y6pj2szdkw3223gvzzd4pzn9biv5d9kzsb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-outlook";
+          sha256 = "0cn8h6yy67jr5h1yxsfqmr8q7ii4f99pgghfp821m01pj55qyjx9";
+          name = "org-outlook";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-outlook";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-page = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
+    melpaBuild {
+        pname = "org-page";
+        version = "20160111.2331";
+        src = fetchFromGitHub {
+          owner = "kelvinh";
+          repo = "org-page";
+          rev = "a69851476167395a387d561a6e526abf048295d0";
+          sha256 = "1k4yfrmv74mfyvbf5ddhx1mwzbnlrhc2qm30b9278hg6mqdd95sx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-page";
+          sha256 = "1326m3w7vz22zk7rx40z28fddsccy5fl1qhbb7clci8l69blcc2v";
+          name = "org-page";
+        };
+        packageRequires = [ dash ht htmlize mustache org simple-httpd ];
+        meta = {
+          homepage = "http://melpa.org/#/org-page";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-pandoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-pandoc";
+        version = "20130729.2050";
+        src = fetchFromGitHub {
+          owner = "robtillotson";
+          repo = "org-pandoc";
+          rev = "84b5df1f5516704540e19e048e18f437dc090a7d";
+          sha256 = "022qqas919aziq4scs5j1wdbvd0qyw8kkirn2vzfb5k2fjl8z7iq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-pandoc";
+          sha256 = "1r6j6rkwfv7fv7kp73gh1bdz3y5ffwk5f2wyv4mpxs885cfbsm8v";
+          name = "org-pandoc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-pandoc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-password-manager = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
+    melpaBuild {
+        pname = "org-password-manager";
+        version = "20150729.1715";
+        src = fetchFromGitHub {
+          owner = "leafac";
+          repo = "org-password-manager";
+          rev = "b13f63aa4efca47e92cfe52865e99f230851fa03";
+          sha256 = "0v2b7byr56v4pffva93d80cppp3xk8nj3987vpwmczqiq5by1pc8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-password-manager";
+          sha256 = "1l3h0qhv0ad9l933d47as8y3h9x94zw315ax4qsgiw3046nzkdwv";
+          name = "org-password-manager";
+        };
+        packageRequires = [ org s ];
+        meta = {
+          homepage = "http://melpa.org/#/org-password-manager";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }:
+    melpaBuild {
+        pname = "org-pdfview";
+        version = "20151125.1544";
+        src = fetchFromGitHub {
+          owner = "markus1189";
+          repo = "org-pdfview";
+          rev = "8f66629e883e0d490584bbf4610cc91938694889";
+          sha256 = "07xcibpqkr0kmwqvz9sfcd3bizscksvc7jw48zg6k79hb90vp1i0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-pdfview";
+          sha256 = "1z4gb5lw7ngphixw06b5484kwlxbc098w2xshzml5sywr16a4iab";
+          name = "org-pdfview";
+        };
+        packageRequires = [ org pdf-tools ];
+        meta = {
+          homepage = "http://melpa.org/#/org-pdfview";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-pomodoro = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-pomodoro";
+        version = "20151217.753";
+        src = fetchFromGitHub {
+          owner = "lolownia";
+          repo = "org-pomodoro";
+          rev = "95e2b1f555359a6096a19634814e1d93b2072f25";
+          sha256 = "015idpk66835jdg1sbvpksyr07xk4vn17z8cng2qw87fss688ihb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-pomodoro";
+          sha256 = "1vdi07hrhniyhhvg0hcr5mlixy6bjynvwm89z2lvfyvnnxpx0r27";
+          name = "org-pomodoro";
+        };
+        packageRequires = [ alert cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/org-pomodoro";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-present = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-present";
+        version = "20141109.1956";
+        src = fetchFromGitHub {
+          owner = "rlister";
+          repo = "org-present";
+          rev = "1b519cfd5abf44bed307cac576dc9fd61eb2c35f";
+          sha256 = "1n9magg7r7xnw16d43fh6nzjf42s70l3mxq6ph727zi4lz5ngmfm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-present";
+          sha256 = "09h0cjqjwhqychyrdv1hmiyak677vgf1b94392sdsq3ns70zyjk7";
+          name = "org-present";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "http://melpa.org/#/org-present";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-projectile = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+    melpaBuild {
+        pname = "org-projectile";
+        version = "20160101.1750";
+        src = fetchFromGitHub {
+          owner = "IvanMalison";
+          repo = "org-projectile";
+          rev = "863712082708ed2c6f9e22e0de7e4e7e20629b30";
+          sha256 = "1jxw9r1mn9zf0vlvy89w9w6v6mhl8i210hkx86c9vcrkpcrpzmvi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-projectile";
+          sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm";
+          name = "org-projectile";
+        };
+        packageRequires = [ dash projectile ];
+        meta = {
+          homepage = "http://melpa.org/#/org-projectile";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-protocol-jekyll = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-protocol-jekyll";
+        version = "20151119.1038";
+        src = fetchFromGitHub {
+          owner = "vonavi";
+          repo = "org-protocol-jekyll";
+          rev = "f41902baaa62c8de3f81ad67a5f36d6aa5781578";
+          sha256 = "1jzp65sf1am6pz533kg1z666h4jlynvjyx1mf24gyksiiwdhypsy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-protocol-jekyll";
+          sha256 = "18wg489n2d1sx9jk00ki6p2rxkqz67kqwnmy2kb1ga1rmb6x9wfs";
+          name = "org-protocol-jekyll";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/org-protocol-jekyll";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-readme = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, header2, http-post-simple, lib, lib-requires, melpaBuild, yaoddmuse }:
+    melpaBuild {
+        pname = "org-readme";
+        version = "20151204.617";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "org-readme";
+          rev = "4cb9f768d282a2835b4510b6504ff9ede487007d";
+          sha256 = "1q3s12s0ll7jhrnd3adkaxv7ff69ppprv0pyl5f6gy8y51y63k8d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-readme";
+          sha256 = "1qqbsgspd006gy0kc614w7bg6na0ygmflvqkmw47899pbgj81hxh";
+          name = "org-readme";
+        };
+        packageRequires = [
+          cl-lib
+          header2
+          http-post-simple
+          lib-requires
+          yaoddmuse
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/org-readme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-redmine = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-redmine";
+        version = "20151021.931";
+        src = fetchFromGitHub {
+          owner = "gongo";
+          repo = "org-redmine";
+          rev = "4289eb06c506f19ef8c467acb2a05bcf04f187c9";
+          sha256 = "1q99b9l6y97iic46xqj7rqnkrzk8f0qq4qy81jv9wz54hq51w07v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-redmine";
+          sha256 = "0y2pm18nnyzm9wjc0j15v46nf3xi7a0wvspfzi360qv08i54skqv";
+          name = "org-redmine";
+        };
+        packageRequires = [ anything ];
+        meta = {
+          homepage = "http://melpa.org/#/org-redmine";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, key-chord, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "org-ref";
+        version = "20160118.846";
+        src = fetchFromGitHub {
+          owner = "jkitchin";
+          repo = "org-ref";
+          rev = "aa8d51897553093e9f1f39817cb547d451635e03";
+          sha256 = "0z4qbfpw0w5kajc25s7wzk2gxfvb9dwjznhj103hp6pxdaw20gym";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-ref";
+          sha256 = "087isxf3z8cgmmniaxr3lpq9jg3sriw88dwp4f0ky286hlvgzw08";
+          name = "org-ref";
+        };
+        packageRequires = [ dash emacs f helm helm-bibtex hydra key-chord s ];
+        meta = {
+          homepage = "http://melpa.org/#/org-ref";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-repo-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-repo-todo";
+        version = "20141204.1541";
+        src = fetchFromGitHub {
+          owner = "waymondo";
+          repo = "org-repo-todo";
+          rev = "904a26089d87db59a40421d6f857b189e70dfbe3";
+          sha256 = "03c88jzwvl95dl39703mknkvnk3cmw4gss5c1y2k9py2rgh6bpr9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-repo-todo";
+          sha256 = "0l5ns1hs3i4dhrpmvzl34zc9zysgjkfa7j8apbda59n9jdvml5v1";
+          name = "org-repo-todo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-repo-todo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-rtm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, rtm }:
+    melpaBuild {
+        pname = "org-rtm";
+        version = "20160116.1025";
+        src = fetchFromGitHub {
+          owner = "pmiddend";
+          repo = "org-rtm";
+          rev = "c01c45af2cbb4f15f0a8b92c600a5e11ff5cb8ec";
+          sha256 = "0j937x4qk2pb8vbq42qz5rsaf9x33rqfvay656naxzz0jvxj5nzl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-rtm";
+          sha256 = "1paiy5zmdlxb3a1cjk9d30mqbl60bkairw6xkix2qw36p07jwlj5";
+          name = "org-rtm";
+        };
+        packageRequires = [ org rtm ];
+        meta = {
+          homepage = "http://melpa.org/#/org-rtm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-sync = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-sync";
+        version = "20150817.954";
+        src = fetchFromGitHub {
+          owner = "arbox";
+          repo = "org-sync";
+          rev = "1e9045e38cd6f12dc0d60e2f7bd2d414a49a5722";
+          sha256 = "14zn0b8qs740ls1069kg2lwm0b9yc4qv525fg8km0hgi0yp8qw7z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-sync";
+          sha256 = "0n8fz2d1vg9r8dszgasbnb6pgaxr2i8mqrp953prf1nhmfpjpxad";
+          name = "org-sync";
+        };
+        packageRequires = [ cl-lib emacs org ];
+        meta = {
+          homepage = "http://melpa.org/#/org-sync";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-table-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-table-comment";
+        version = "20120209.1251";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "org-table-comment.el";
+          rev = "33b9966c33ecbc3e27cca67c2f2cdea04364d74e";
+          sha256 = "1qx3kd02sxs9k7adlvdlbmyhkc5kr7ni5lw4gxjw3nphnc536bkb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-table-comment";
+          sha256 = "1d40vl8aa1x27z4gwnkzxgrqp7vd3ln2pc445ijjxp1wr8bjxvdz";
+          name = "org-table-comment";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-table-comment";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-time-budgets = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-time-budgets";
+        version = "20151111.201";
+        src = fetchFromGitHub {
+          owner = "leoc";
+          repo = "org-time-budgets";
+          rev = "baa1ce6333157fed3b3799a80e6cf8c73c9e2c18";
+          sha256 = "04adkz950vvwyzy3da468nnqsknpr5kw5369w2yqhnph16cwwfxb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-time-budgets";
+          sha256 = "0r8km586n6xdnjha7xnzlh03nw1dp066hydaz8kxfmhvygl9cpah";
+          name = "org-time-budgets";
+        };
+        packageRequires = [ alert cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/org-time-budgets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-toodledo = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }:
+    melpaBuild {
+        pname = "org-toodledo";
+        version = "20150301.513";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "org-toodledo";
+          rev = "2c91a92bd07ae4a546771b018a6faa0e06399968";
+          sha256 = "014337wimvzy0rxh2p2c647ly215zcyhgym2hcljkdriv15cafna";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-toodledo";
+          sha256 = "0c7qr0jsc4iyrwkc22xp9nmk6984v7q1k0rvpd62m07lb5gvbiq3";
+          name = "org-toodledo";
+        };
+        packageRequires = [ cl-lib emacs request-deferred ];
+        meta = {
+          homepage = "http://melpa.org/#/org-toodledo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-tracktable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-tracktable";
+        version = "20151129.1441";
+        src = fetchFromGitHub {
+          owner = "tty-tourist";
+          repo = "org-tracktable";
+          rev = "28ef6772cdcf436cf38095f15c6bb681473180ce";
+          sha256 = "053wf36lq9piyzq7rv2lid34zanj6l9fvawp3r3nsniy5nlfckqx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-tracktable";
+          sha256 = "0mngf9q2ffxq32cgng0xl30661mj15wmr9y4hr3xddj626kxrp00";
+          name = "org-tracktable";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/org-tracktable";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-transform-tree-table = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "org-transform-tree-table";
+        version = "20150110.833";
+        src = fetchFromGitHub {
+          owner = "jplindstrom";
+          repo = "emacs-org-transform-tree-table";
+          rev = "0a9bf07f01bc5fc3b349aff64e83999a8de83b52";
+          sha256 = "1h15fr16kgbyrxambmk4hsmha6hx4c4yqkccb82g3wlvzmnqj5x3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-transform-tree-table";
+          sha256 = "0n68cw769nk90ms6w1w6cc1nxjwn1navkz56mf11bsiqvsk3km7r";
+          name = "org-transform-tree-table";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/org-transform-tree-table";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-tree-slide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-tree-slide";
+        version = "20151223.147";
+        src = fetchFromGitHub {
+          owner = "takaxp";
+          repo = "org-tree-slide";
+          rev = "3a2d3733baa81484ac53bee9a8d0f9dafa54881c";
+          sha256 = "19id53sjv0r0xnm3l8d694s27dxlmdfm9dal57zlf60s5lg8hykq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-tree-slide";
+          sha256 = "0v857zplv0wdbg4li667v2p5pn5zcf9fgbqcwa75x8babilkl6jn";
+          name = "org-tree-slide";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-tree-slide";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-trello = callPackage ({ dash, dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }:
+    melpaBuild {
+        pname = "org-trello";
+        version = "20151213.936";
+        src = fetchFromGitHub {
+          owner = "org-trello";
+          repo = "org-trello";
+          rev = "ae291d19752d86d01bb21cec6fb410c1eb9145d7";
+          sha256 = "0w0gw3varx8qrcfh3iwg6qqxavprm25bjv9ada34xqjdhsv537xc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-trello";
+          sha256 = "1rm91xccvdsqghdnrnjvyp8xfvrw5ac677vzzz24rz9dssh2mz9b";
+          name = "org-trello";
+        };
+        packageRequires = [
+          dash
+          dash-functional
+          deferred
+          emacs
+          request-deferred
+          s
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/org-trello";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-vcard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-vcard";
+        version = "20151214.22";
+        src = fetchFromGitHub {
+          owner = "flexibeast";
+          repo = "org-vcard";
+          rev = "928827c1de3c90045df3ea4fb07db4af9d3b0a22";
+          sha256 = "1m2xdp6wfg11wi7s4i675c3m5qancm8bpizcf380r6vmkcdfkrdy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-vcard";
+          sha256 = "0l6azshvzl1wws582njqr3qx4h73gwrdqwa3jcic1qbs9hg2l4yl";
+          name = "org-vcard";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-vcard";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-wc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-wc";
+        version = "20141101.120";
+        src = fetchFromGitHub {
+          owner = "dato";
+          repo = "org-wc";
+          rev = "f1765fc913f288432ee2cc330c8a7af3af7715c8";
+          sha256 = "0miahg10xx3sy85n22xqwjp1z7kcmcsb85dh0653sf7axp42kq98";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-wc";
+          sha256 = "1sa9fcy0bnn06swwq2gfrgmppd6dsbmw2mq0v73mizg3l6has1zb";
+          name = "org-wc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-wc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-webpage = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, web-server }:
+    melpaBuild {
+        pname = "org-webpage";
+        version = "20160108.326";
+        src = fetchFromGitHub {
+          owner = "tumashu";
+          repo = "org-webpage";
+          rev = "6aedac36f584e99190572ca74768095512f17503";
+          sha256 = "1izf0lxycg4wh3wfki1sfy283qwgfdf8rzb365z3sk1zzijjaw6j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-webpage";
+          sha256 = "0vwv8cv38gx8rnfskbmnaf8y8sffjqy1408655bwhjz6dp69qmah";
+          name = "org-webpage";
+        };
+        packageRequires = [ cl-lib dash ht htmlize mustache org web-server ];
+        meta = {
+          homepage = "http://melpa.org/#/org-webpage";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-wunderlist = callPackage ({ alert, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, request-deferred, s }:
+    melpaBuild {
+        pname = "org-wunderlist";
+        version = "20150817.2113";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "org-wunderlist.el";
+          rev = "b89633fcfd74e83dd8a5d81619244a666a45715c";
+          sha256 = "1cagmwl3acanwc2nky7m61cawi0i0x703sjc6zlw968lacyw86wa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-wunderlist";
+          sha256 = "08zg3wgr80rp89c53ffqzz22ws9bp62a1m74xvxa74x6nq9i4xl0";
+          name = "org-wunderlist";
+        };
+        packageRequires = [ alert cl-lib emacs org request-deferred s ];
+        meta = {
+          homepage = "http://melpa.org/#/org-wunderlist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }:
+    melpaBuild {
+        pname = "org2blog";
+        version = "20151208.1028";
+        src = fetchFromGitHub {
+          owner = "punchagan";
+          repo = "org2blog";
+          rev = "c0f849b7119b0314934ef33e2ea405cf4db90735";
+          sha256 = "0q6dpih869rz94dqbi910vk5iwffbbl6hkraazc8rky7fnb4nh4s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org2blog";
+          sha256 = "0ancvn4ji4552k4nfd2ijclsd027am93ngg241ll8f6h6k0wpmzq";
+          name = "org2blog";
+        };
+        packageRequires = [ metaweblog org xml-rpc ];
+        meta = {
+          homepage = "http://melpa.org/#/org2blog";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org2jekyll = callPackage ({ dash-functional, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "org2jekyll";
+        version = "20150906.847";
+        src = fetchFromGitHub {
+          owner = "ardumont";
+          repo = "org2jekyll";
+          rev = "a12173b9507b3ef54dfebb5751503ba1ee93c6aa";
+          sha256 = "064kw64w9snm0lbshxn8d6yd9xvyislhg37fmhq1w7vy8lm61xvf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org2jekyll";
+          sha256 = "1j9d6xf5nsakifxwd4zmjc29lbj46ffn3z109k2y2yhz7q3r9hzv";
+          name = "org2jekyll";
+        };
+        packageRequires = [ dash-functional deferred s ];
+        meta = {
+          homepage = "http://melpa.org/#/org2jekyll";
+          license = lib.licenses.free;
+        };
+      }) {};
+    organic-green-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "organic-green-theme";
+        version = "20151028.720";
+        src = fetchFromGitHub {
+          owner = "kostafey";
+          repo = "organic-green-theme";
+          rev = "c4d68c3329147aedd066a88b6d5e5266bcd59dcc";
+          sha256 = "0q90vm2z3vs9hg9zg5dl6c35f7ivzxj5df3y3h9xjif494ladbsg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/organic-green-theme";
+          sha256 = "1fdj3dpcdqx0db5q8dlxag6pr2qn4yiz1hmg3c7dkmh51n85ssw2";
+          name = "organic-green-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/organic-green-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    orgbox = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "orgbox";
+        version = "20140528.2026";
+        src = fetchFromGitHub {
+          owner = "yasuhito";
+          repo = "orgbox";
+          rev = "72373b09768cc2200d143af38e25a0c082e8375d";
+          sha256 = "0hwmr67nky9xp5xlrkp54nw6b72d29lmna28dnbgqs2i5rccbk55";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orgbox";
+          sha256 = "12wfqlpjh9nr7zgqs4h8kmfsk825n68qcbn8z2fw2mpshg3nj7l8";
+          name = "orgbox";
+        };
+        packageRequires = [ cl-lib org ];
+        meta = {
+          homepage = "http://melpa.org/#/orgbox";
+          license = lib.licenses.free;
+        };
+      }) {};
+    orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }:
+    melpaBuild {
+        pname = "orgit";
+        version = "20151008.1614";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "orgit";
+          rev = "731c5cb4f1c7e2ee5b819ca159c0c01e2b306c73";
+          sha256 = "0d7rh5bi5v04njj1nh8q8kdr6aw68lcw4ghx6kwq97aff4qmcrp1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orgit";
+          sha256 = "0askccb3h98v8gmylwxaph3gbyv5b1sp4slws76aqz1kq9x0jy7w";
+          name = "orgit";
+        };
+        packageRequires = [ dash emacs magit org ];
+        meta = {
+          homepage = "http://melpa.org/#/orgit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    orglink = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "orglink";
+        version = "20151106.1206";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "orglink";
+          rev = "8ba8c54395cd1818c4d58d5cd24712405f9810e0";
+          sha256 = "12y395ld36jnlbcrfycnvr4g723w6vahfv9iqf1wr6m94ka9pz3d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orglink";
+          sha256 = "0ldrvvqs3hlazj0dch162gsbnbxcg6fgrxid8p7w9gj19vbcl52b";
+          name = "orglink";
+        };
+        packageRequires = [ dash org ];
+        meta = {
+          homepage = "http://melpa.org/#/orglink";
+          license = lib.licenses.free;
+        };
+      }) {};
+    orglue = callPackage ({ epic, fetchFromGitHub, fetchurl, lib, melpaBuild, org, org-mac-link }:
+    melpaBuild {
+        pname = "orglue";
+        version = "20150430.713";
+        src = fetchFromGitHub {
+          owner = "yoshinari-nomura";
+          repo = "orglue";
+          rev = "4732f8bfd6866e20230b36e5971f2492827c6944";
+          sha256 = "1w0hadpslxcjn29yxl9i37sja4qf4kp7ffjpwij5hs73r518c2z6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orglue";
+          sha256 = "14g4q2k9zjzipzrp5mg72s40b0rwiaixgq3rvi15wh4vvcw5xajn";
+          name = "orglue";
+        };
+        packageRequires = [ epic org org-mac-link ];
+        meta = {
+          homepage = "http://melpa.org/#/orglue";
+          license = lib.licenses.free;
+        };
+      }) {};
+    orgtbl-aggregate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "orgtbl-aggregate";
+        version = "20150104.1018";
+        src = fetchFromGitHub {
+          owner = "tbanel";
+          repo = "orgaggregate";
+          rev = "16b54b2be7cbb87aab9498c0ab7b8bca0f73cb59";
+          sha256 = "0am2yfnaxwc6f2wvrg4d508pdcs88cynr32k7bgyyadwq4xq3zsg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orgtbl-aggregate";
+          sha256 = "0gnyjwn6jshs8bzdssm2xppg2s9p2x3rrhp523q39aydskc6ggc9";
+          name = "orgtbl-aggregate";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/orgtbl-aggregate";
+          license = lib.licenses.free;
+        };
+      }) {};
+    orgtbl-ascii-plot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "orgtbl-ascii-plot";
+        version = "20151215.1551";
+        src = fetchFromGitHub {
+          owner = "tbanel";
+          repo = "orgtblasciiplot";
+          rev = "cd91f6ae26a7402e192a1f4fd6248f5797edf19e";
+          sha256 = "1vbnp37xz0nrpyi0hah345928zsb1xw915mdb0wybq1fzn93mp1z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orgtbl-ascii-plot";
+          sha256 = "1ssjbdprbn34nsfx1xjc382l2195rbh8mybpn31d4kcjx6fqf78h";
+          name = "orgtbl-ascii-plot";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/orgtbl-ascii-plot";
+          license = lib.licenses.free;
+        };
+      }) {};
+    orgtbl-join = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "orgtbl-join";
+        version = "20150121.1646";
+        src = fetchFromGitHub {
+          owner = "tbanel";
+          repo = "orgtbljoin";
+          rev = "ccf5e0d96e053dc289da39a048715fcf36835ff2";
+          sha256 = "06nc82wiha11i79izqil53dkd95fl55nb5m739gyyzvx3sksb0dg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orgtbl-join";
+          sha256 = "1kq2h0lb521z8q2xb9bsi37xzzdsa0hw4mm3qkzidi5j9fi3apf1";
+          name = "orgtbl-join";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/orgtbl-join";
+          license = lib.licenses.free;
+        };
+      }) {};
+    orgtbl-show-header = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "orgtbl-show-header";
+        version = "20141023.337";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "orgtbl-show-header";
+          rev = "f0f48ccc0f96d4aa2a676ff609d9dddd71748e6f";
+          sha256 = "0zfiq9d5jqzpmscngb1s2jgfiqmbi4dyw0fqa59v2g84gxjg793x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orgtbl-show-header";
+          sha256 = "1xgqjg3lmcczdblxaka47cc1ad8p8jhyb2nqwq0qnbqw46fqjp3k";
+          name = "orgtbl-show-header";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/orgtbl-show-header";
+          license = lib.licenses.free;
+        };
+      }) {};
+    origami = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "origami";
+        version = "20150822.650";
+        src = fetchFromGitHub {
+          owner = "gregsexton";
+          repo = "origami.el";
+          rev = "56140b4d3f9f2694ab1e8869972a19bd7f3e12e1";
+          sha256 = "0p53l0s8rxr8v77kj83qjrbln7nck16q0zgdp4sqmqb1121ily48";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/origami";
+          sha256 = "0rkb55zcvsgxzp190vrnbzdfbcjd8zi6vhbhwpqxi0qmyq6a08pr";
+          name = "origami";
+        };
+        packageRequires = [ dash emacs s ];
+        meta = {
+          homepage = "http://melpa.org/#/origami";
+          license = lib.licenses.free;
+        };
+      }) {};
+    osx-browse = callPackage ({ browse-url-dwim, fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }:
+    melpaBuild {
+        pname = "osx-browse";
+        version = "20140508.1541";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "osx-browse";
+          rev = "44ded7cc3a7ee426c1c3257fae534c121f7e752e";
+          sha256 = "1iybrhp607a5rb3ynlaf8w2x9wdgdbril702z44dgcg3wxih2zy1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-browse";
+          sha256 = "06rfzq2hxhzg6jh2zs28r7ffxwlq40nz954j13ly8403c7rmbrfm";
+          name = "osx-browse";
+        };
+        packageRequires = [ browse-url-dwim string-utils ];
+        meta = {
+          homepage = "http://melpa.org/#/osx-browse";
+          license = lib.licenses.free;
+        };
+      }) {};
+    osx-clipboard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "osx-clipboard";
+        version = "20141012.217";
+        src = fetchFromGitHub {
+          owner = "joddie";
+          repo = "osx-clipboard-mode";
+          rev = "e46dd31327a3f92f77b013b4c9b1e5fdd0e5c73d";
+          sha256 = "1ykn48src7qhx9cmpjkaqsz7h36p75kkq1h9wlcpv5fhaky2d4n4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-clipboard";
+          sha256 = "0gjgr451v6rlyarz96v6h8kfbvkk7npvhgvkgwdi0bjighrhlv4f";
+          name = "osx-clipboard";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/osx-clipboard";
+          license = lib.licenses.free;
+        };
+      }) {};
+    osx-dictionary = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "osx-dictionary";
+        version = "20151108.2352";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "osx-dictionary.el";
+          rev = "ffbc358a4c686ea77e8bb88319ad192b4ff1aa55";
+          sha256 = "0frv92i7rj9fbjzgwf80zngq77394wjgijggda6d8ai75n5f47g1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-dictionary";
+          sha256 = "13033fxc5vjd1f7mm6znmprcp3mwxbvblb2d25shr8d4imqqhv82";
+          name = "osx-dictionary";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/osx-dictionary";
+          license = lib.licenses.free;
+        };
+      }) {};
+    osx-lib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "osx-lib";
+        version = "20160106.1215";
+        src = fetchFromGitHub {
+          owner = "raghavgautam";
+          repo = "osx-lib";
+          rev = "3a5a4561c5a1d9f5b8078cd6cbb9cd1f70ad8fbf";
+          sha256 = "1b8ahmljk5whs29ss2wq3800qrb32hk1jlbs71rq8chvxxwlx8j7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-lib";
+          sha256 = "12wvki8jhzqsanxv5yqzjmfx6ifwz9ab9zh6r8nss86bk8864ix4";
+          name = "osx-lib";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/osx-lib";
+          license = lib.licenses.free;
+        };
+      }) {};
+    osx-location = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "osx-location";
+        version = "20150613.417";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "osx-location";
+          rev = "110aee945b53ea550e4debe69bf3c077d940ec8c";
+          sha256 = "1csnxpsfnv9lv07kgvc60qx5c33sshmnz60p3qjz7ym7rnjy9b5x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-location";
+          sha256 = "1p12mmrw70p3b04zlprkdxdfnb7m3vkm6gci3fwhr5zyfvwxvn0c";
+          name = "osx-location";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/osx-location";
+          license = lib.licenses.free;
+        };
+      }) {};
+    osx-org-clock-menubar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "osx-org-clock-menubar";
+        version = "20150205.1511";
+        src = fetchFromGitHub {
+          owner = "jordonbiondo";
+          repo = "osx-org-clock-menubar";
+          rev = "9964d2a97cc2fb6570dc4116da44f73bd8eb7cb3";
+          sha256 = "1rgykby1ysbapq53lnk9yy04r9q4qirnzs2abgvz7g2qjq5fyzag";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-org-clock-menubar";
+          sha256 = "1y5qxslxl0d93f387nyj8zngz5nh1p4rzdfx0lnbvya6shfaxaf6";
+          name = "osx-org-clock-menubar";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/osx-org-clock-menubar";
+          license = lib.licenses.free;
+        };
+      }) {};
+    osx-plist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "osx-plist";
+        version = "20101130.648";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "osx-plist";
+          rev = "5e6de2622fdfe552d4902904f05ea03bc5a6ebd0";
+          sha256 = "0830kkmvc3ss7ygqfwz3j75s7mhxfxyadaksrp0v2cc4y6wn6nfv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-plist";
+          sha256 = "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8";
+          name = "osx-plist";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/osx-plist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    osx-pseudo-daemon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "osx-pseudo-daemon";
+        version = "20131026.1930";
+        src = fetchFromGitHub {
+          owner = "DarwinAwardWinner";
+          repo = "osx-pseudo-daemon";
+          rev = "0b9f330a66b4e8d2ff9bcd57e09b8d304dfb5841";
+          sha256 = "1j601gzizxjsvkw6bvih4a49iq05yfkw0ni77xbc5klc7x7s80hk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-pseudo-daemon";
+          sha256 = "150fxj2phj5axnh5i8ws5fv2qzzmpyisch452wgxb604p56j7vy8";
+          name = "osx-pseudo-daemon";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/osx-pseudo-daemon";
+          license = lib.licenses.free;
+        };
+      }) {};
+    osx-trash = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "osx-trash";
+        version = "20150723.935";
+        src = fetchFromGitHub {
+          owner = "lunaryorn";
+          repo = "osx-trash.el";
+          rev = "a8fe326624e27a0e128c68940c7a9efb001ceee6";
+          sha256 = "1l231168bjqz6lwzs0r9vihxi53d46csrr2gq7g33lg1zm3696ah";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-trash";
+          sha256 = "1f6pi53mhp2pvrfjm8544lqqj36gzpzxq245lzvv91lvqkxr9ysj";
+          name = "osx-trash";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/osx-trash";
+          license = lib.licenses.free;
+        };
+      }) {};
+    outline-magic = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "outline-magic";
+        version = "20150209.1626";
+        src = fetchFromGitHub {
+          owner = "tj64";
+          repo = "outline-magic";
+          rev = "5689436cd67edc86066e51be77fa4e1fe21de507";
+          sha256 = "116cwlhn7s47rhivz6113lh8lvaz3bjb3ynjlbx9hyf7gq3nfnxn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/outline-magic";
+          sha256 = "085yayzph3y7fh6pd5sdjdkhdcvwfzcyqd6y3xlbz7wni5ac6b5f";
+          name = "outline-magic";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/outline-magic";
+          license = lib.licenses.free;
+        };
+      }) {};
+    outlined-elisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "outlined-elisp-mode";
+        version = "20131108.527";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "outlined-elisp-mode";
+          rev = "c16cb02b540448919ad148f2be6a41523ee5489c";
+          sha256 = "0d9hfr4kb6rkhwacdn70bkfchgam26gj92zfyaqw77a2sgwcmwwv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/outlined-elisp-mode";
+          sha256 = "165sivmv5h4nvh08ampq95x6b0bkzxgrdjbxjxlq6rv00vaidn7v";
+          name = "outlined-elisp-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/outlined-elisp-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    outorg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "outorg";
+        version = "20150910.1440";
+        src = fetchFromGitHub {
+          owner = "tj64";
+          repo = "outorg";
+          rev = "9d6d6f1fb8c68ee044ffba1ae1aed8146bcff1f1";
+          sha256 = "0jhqpm31rsmc2r01ra48nbnd9rx9am90qk6i0qrhgfzx9q1svmj9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/outorg";
+          sha256 = "04swss84p33a9baa4swqc1a9lfp6wziqrwa7vcyi3y0yzllx36cx";
+          name = "outorg";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/outorg";
+          license = lib.licenses.free;
+        };
+      }) {};
+    outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }:
+    melpaBuild {
+        pname = "outshine";
+        version = "20151203.1002";
+        src = fetchFromGitHub {
+          owner = "tj64";
+          repo = "outshine";
+          rev = "d1847614727a060e01d1d2f33b414a1b49d3e85b";
+          sha256 = "0g6h5ifmzxvwgyi7qrkkmr8s28kpq8xhmv7rkr3gphqrh5hyppl8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/outshine";
+          sha256 = "1i8c3q6n9hpfbpg2f8n8brwgaq36af1jn3g5js88yiyyb5dknxq4";
+          name = "outshine";
+        };
+        packageRequires = [ cl-lib outorg ];
+        meta = {
+          homepage = "http://melpa.org/#/outshine";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ov = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ov";
+        version = "20150312.28";
+        src = fetchFromGitHub {
+          owner = "ShingoFukuyama";
+          repo = "ov.el";
+          rev = "fae7215b3dedba2a9ced145284332e4609bfdc38";
+          sha256 = "1rk5pzm5wmdq68d99hhhbq8pq37bnph0dip5j2jnfj6zsw70whr2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ov";
+          sha256 = "0d71mpv74cfxcnwixbrl90nr22cw4kv5sdgpny5wycvh6cgmd6qb";
+          name = "ov";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ov";
+          license = lib.licenses.free;
+        };
+      }) {};
+    overseer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
+    melpaBuild {
+        pname = "overseer";
+        version = "20150801.1202";
+        src = fetchFromGitHub {
+          owner = "tonini";
+          repo = "overseer.el";
+          rev = "db27cbbb10fb9b072d638a1b345102b42b20a37d";
+          sha256 = "1bfj56ackza8c1jja660v6ss9ii7prcaim5plnfqsv3k149r8qlh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/overseer";
+          sha256 = "04wfwcal051jrnmm5dga6vl4c9j10pm416586yxb8smi6fxws2jg";
+          name = "overseer";
+        };
+        packageRequires = [ dash emacs pkg-info ];
+        meta = {
+          homepage = "http://melpa.org/#/overseer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    owdriver = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, smartrep, yaxception }:
+    melpaBuild {
+        pname = "owdriver";
+        version = "20141011.938";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "owdriver";
+          rev = "0479389d9df9e70ff9ce69dff06252d3aa40fc86";
+          sha256 = "0f2psx4lq98l3q3fnibsfqxp2hvvwk7b30zjvjlry3bffg3l7pfk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/owdriver";
+          sha256 = "0j8z7ynan0zj581x50gsi9lljkbi6bwmzpfyha3i6q8ch5qkdxfd";
+          name = "owdriver";
+        };
+        packageRequires = [ log4e smartrep yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/owdriver";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ox-asciidoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ox-asciidoc";
+        version = "20150919.1459";
+        src = fetchFromGitHub {
+          owner = "yashi";
+          repo = "org-asciidoc";
+          rev = "e34b1df9fa061d395e600660620ab6c3b7e59ac1";
+          sha256 = "1q7jlz0f09mwymq8m6x9fiariww7rwiy4wkqkbbc296wm7impr75";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-asciidoc";
+          sha256 = "07b549dqyh1gk226d7zbls1mw6q4mas7kbfwkansmyykax0r2zyr";
+          name = "ox-asciidoc";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "http://melpa.org/#/ox-asciidoc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ox-gfm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ox-gfm";
+        version = "20150604.226";
+        src = fetchFromGitHub {
+          owner = "larstvei";
+          repo = "ox-gfm";
+          rev = "dc324f0f4239e151744d59e784da748d4db4f6b8";
+          sha256 = "0gfkb12rn40m71xv292dn3nj3h1bnn81698pinirp0nd8p4bvnin";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-gfm";
+          sha256 = "065ngmzfd3g2h8n903hc4d363hz4z5rrdgizh2xpz03kf3plca6q";
+          name = "ox-gfm";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ox-gfm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ox-html5slide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ox-html5slide";
+        version = "20131228.6";
+        src = fetchFromGitHub {
+          owner = "coldnew";
+          repo = "org-html5slide";
+          rev = "4703dfbd9d79161509def673d2c1e118d722a58f";
+          sha256 = "19h3w3fcas60jv02v7hxjmh05804sb7bif70jssq3qwisj0j09xm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-html5slide";
+          sha256 = "0nqk6chg0ky98ap2higa74786prj7dbwx2a3l67m0llmdajw76qn";
+          name = "ox-html5slide";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "http://melpa.org/#/ox-html5slide";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ox-impress-js = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ox-impress-js";
+        version = "20150412.1216";
+        src = fetchFromGitHub {
+          owner = "kinjo";
+          repo = "org-impress-js.el";
+          rev = "91c6d2af6af308ade352a03355c4fb551b238c6b";
+          sha256 = "1kf2si2lyy0xc971bx5zd2j9mnz1smc9s8l0dwc6iksh2v9q8cy9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-impress-js";
+          sha256 = "0p0cc51lmxgl0xv951ybdg5n8gbzv8qf0chfgigijizzjypxc21l";
+          name = "ox-impress-js";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "http://melpa.org/#/ox-impress-js";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ox-ioslide = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, makey, melpaBuild, org }:
+    melpaBuild {
+        pname = "ox-ioslide";
+        version = "20160118.1034";
+        src = fetchFromGitHub {
+          owner = "coldnew";
+          repo = "org-ioslide";
+          rev = "8dcb0a4ea852d495d7d421d2141f993a250d4a23";
+          sha256 = "1s5byryi8g3vnqvzydzi4dycjpqphw1af5v9dm4rw1g9syaxm87p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-ioslide";
+          sha256 = "0z0qnvpw64wxbgz8203rphswlh9hd2i11pz2mlay8l3bzz4gx4vc";
+          name = "ox-ioslide";
+        };
+        packageRequires = [ cl-lib emacs f makey org ];
+        meta = {
+          homepage = "http://melpa.org/#/ox-ioslide";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ox-mediawiki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "ox-mediawiki";
+        version = "20150923.1102";
+        src = fetchFromGitHub {
+          owner = "tomalexander";
+          repo = "orgmode-mediawiki";
+          rev = "973ebfc673dfb4beeea3d3ce648c917b58dcf879";
+          sha256 = "0c2m02g6csg5fqizj3zqcm88q7w17kgvgi7swcx4fzz6rixnpsji";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-mediawiki";
+          sha256 = "0lijj2n4saw0xd3jaghbvx9v6a4ldl5gd8wy7s7hfcm30wb75cdb";
+          name = "ox-mediawiki";
+        };
+        packageRequires = [ cl-lib s ];
+        meta = {
+          homepage = "http://melpa.org/#/ox-mediawiki";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ox-nikola = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, ox-rst }:
+    melpaBuild {
+        pname = "ox-nikola";
+        version = "20151114.516";
+        src = fetchFromGitHub {
+          owner = "masayuko";
+          repo = "ox-nikola";
+          rev = "5bcbc1a38f6619f62294194f13ca0cd4ca14dd48";
+          sha256 = "0cc14p6c3d4djfmrkac0abb2jq128vlmayv2a8cyvnyjffyvjbk7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-nikola";
+          sha256 = "1amplnazs9igfd382djq23d8j7r0knr0hwlpasd01aypc25c82a4";
+          name = "ox-nikola";
+        };
+        packageRequires = [ emacs org ox-rst ];
+        meta = {
+          homepage = "http://melpa.org/#/ox-nikola";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ox-pandoc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ox-pandoc";
+        version = "20151222.1753";
+        src = fetchFromGitHub {
+          owner = "kawabata";
+          repo = "ox-pandoc";
+          rev = "2605a0ed8ed3c86b78829589956bedf5eda447cc";
+          sha256 = "0bawigwc6v5420642xlkyxdd0i82gicx69wqlnjf6lvhfvs990is";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-pandoc";
+          sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc";
+          name = "ox-pandoc";
+        };
+        packageRequires = [ dash emacs ht org ];
+        meta = {
+          homepage = "http://melpa.org/#/ox-pandoc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ox-pukiwiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ox-pukiwiki";
+        version = "20150124.1116";
+        src = fetchFromGitHub {
+          owner = "yashi";
+          repo = "org-pukiwiki";
+          rev = "bdbde2c294f5d3de11f08a3fe19f01175d2e011a";
+          sha256 = "0adj6gm39qw4ivb7csfh21qqqipcnw1sgm1xdqvrk86kbs9k1b2g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-pukiwiki";
+          sha256 = "10sfbri5hv5hyx9jc1bzlk4qmzfmpfgfy8wkjkpv7lv2x0axqd8a";
+          name = "ox-pukiwiki";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "http://melpa.org/#/ox-pukiwiki";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ox-reveal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ox-reveal";
+        version = "20151023.106";
+        src = fetchFromGitHub {
+          owner = "yjwen";
+          repo = "org-reveal";
+          rev = "b92d0e843f2526788caa08bda5284f23e15e09cd";
+          sha256 = "196bjiij0nj19qsz95y9l44sr63673mxxj0cv6aa3ijpm48vmj9p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-reveal";
+          sha256 = "092swxkkisvj2y18ynal8dn7wcfi7h4y6n0dlzqq28bfflarbwik";
+          name = "ox-reveal";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "http://melpa.org/#/ox-reveal";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ox-rst = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ox-rst";
+        version = "20151115.143";
+        src = fetchFromGitHub {
+          owner = "masayuko";
+          repo = "ox-rst";
+          rev = "2bd53fa5b3af67afbf45041d7f54b3c5b71b1f10";
+          sha256 = "1js4n8iwimc86fp2adzhbhy4ixss1yqngjd8gq7pxgpgmnhd66x3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-rst";
+          sha256 = "1vyj6frrl7328n2x7vc3qwv3ssdhi8bp6ja5h2q4bqalc6bl1pq0";
+          name = "ox-rst";
+        };
+        packageRequires = [ emacs org ];
+        meta = {
+          homepage = "http://melpa.org/#/ox-rst";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ox-textile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ox-textile";
+        version = "20151114.2225";
+        src = fetchFromGitHub {
+          owner = "yashi";
+          repo = "org-textile";
+          rev = "0dfca070e35bc6f4a412319e2474bb88666c8c2d";
+          sha256 = "1r9c4s9f7cvxxzf9h07rg75bil0295zq1inh5i4r6za5jabkr4dg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-textile";
+          sha256 = "01kri7vh16xhy8x5qd6s5z08xr0q964rk6xrligdb3i6x78wfvi4";
+          name = "ox-textile";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "http://melpa.org/#/ox-textile";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ox-tiddly = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ox-tiddly";
+        version = "20151206.440";
+        src = fetchFromGitHub {
+          owner = "dfeich";
+          repo = "org8-wikiexporters";
+          rev = "0cd92e84ad22c103b078f285ec66ff98f7ca98ca";
+          sha256 = "1rmlwx2svnsf0cg2xf0a09ncy4kx8jgn3rrnpa89z0brlafxx25s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-tiddly";
+          sha256 = "196i8lzxv2smpj5yhmiqwazn4pvc14yqyzasrgimhv3vi2xnxlfb";
+          name = "ox-tiddly";
+        };
+        packageRequires = [ cl-lib org ];
+        meta = {
+          homepage = "http://melpa.org/#/ox-tiddly";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ox-trac = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ox-trac";
+        version = "20151102.1155";
+        src = fetchFromGitHub {
+          owner = "JalapenoGremlin";
+          repo = "ox-trac";
+          rev = "2f2f70eefb9679025ae5812e221f0c118da36012";
+          sha256 = "0w6963jvz1sk732nh18735dxivd6nl59jd4m26ps6l4wqhqby0db";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-trac";
+          sha256 = "0f8b3i83vzxzfa91p4ahlqz6njql18xy5nk265sjxpy9zr898rsa";
+          name = "ox-trac";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "http://melpa.org/#/ox-trac";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ox-twbs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ox-twbs";
+        version = "20151223.1320";
+        src = fetchFromGitHub {
+          owner = "marsmining";
+          repo = "ox-twbs";
+          rev = "cfe67353d148e65a7676f1609d8cc22a4c8fbc78";
+          sha256 = "026g48sgqwnqs5zmrabhiv3l8052l4c1vsbsf6bdxv4a6yp0l654";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-twbs";
+          sha256 = "15csgnph5wh2dvcc2dnvrlm7whh428rq8smqji1509ib7aw9y5mx";
+          name = "ox-twbs";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ox-twbs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ox-twiki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ox-twiki";
+        version = "20151206.440";
+        src = fetchFromGitHub {
+          owner = "dfeich";
+          repo = "org8-wikiexporters";
+          rev = "0cd92e84ad22c103b078f285ec66ff98f7ca98ca";
+          sha256 = "1rmlwx2svnsf0cg2xf0a09ncy4kx8jgn3rrnpa89z0brlafxx25s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-twiki";
+          sha256 = "1p1k0yg5fxcjgwpq2ix9ckh2kn69m7d5rnz76h14hw9p72cb54r0";
+          name = "ox-twiki";
+        };
+        packageRequires = [ cl-lib org ];
+        meta = {
+          homepage = "http://melpa.org/#/ox-twiki";
+          license = lib.licenses.free;
+        };
+      }) {};
+    p4 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "p4";
+        version = "20150721.1437";
+        src = fetchFromGitHub {
+          owner = "gareth-rees";
+          repo = "p4.el";
+          rev = "eff047caa75dbe4965defca9d1212454cdb755d5";
+          sha256 = "12jsnfppif4l548wymvakx0f2zlm63xs6kfrb49hicmk668cq4ra";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/p4";
+          sha256 = "0215li17gn35wmvd84gnp4hkwa2jd81wz4frb1cba2b5j33rlprc";
+          name = "p4";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/p4";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pabbrev = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pabbrev";
+        version = "20150806.645";
+        src = fetchFromGitHub {
+          owner = "phillord";
+          repo = "pabbrev";
+          rev = "d28cf8632d2691dc93afbb28500126242d37961c";
+          sha256 = "0cbsl184szbl486454jkn28zj4p7danp92h0zv8yscrlnyl68p0y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pabbrev";
+          sha256 = "1mbfa40pbzbi00sp155zm43sj6nw221mcayc2rk3ppin9ps95hx3";
+          name = "pabbrev";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pabbrev";
+          license = lib.licenses.free;
+        };
+      }) {};
+    package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "package-build";
+        version = "20160112.322";
+        src = fetchFromGitHub {
+          owner = "milkypostman";
+          repo = "melpa";
+          rev = "553e27a3523ade9dc4951086d9340e8240d5d943";
+          sha256 = "00h1zbc4i8apvam38qah9nfs7g7fv2hnd35qhynx2c7ff0xkjq2c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/package-build";
+          sha256 = "1m245q81c2jifgqxwd2fi35jrcbf6v9a1a5zy815861avq3fg9g0";
+          name = "package-build";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/package-build";
+          license = lib.licenses.free;
+        };
+      }) {};
+    package-filter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "package-filter";
+        version = "20140105.1626";
+        src = fetchFromGitHub {
+          owner = "milkypostman";
+          repo = "package-filter";
+          rev = "ba3be37e0ef3972b2d8db7c2f2cb68c460699f12";
+          sha256 = "0i7f8ambcrhyqq15xwlk31jjdcii2hr37y45va8m5w6n9mkpz8c6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/package-filter";
+          sha256 = "0am73zch2fy1hfjwzk8kg0j3lgbcz3hzxjrdf0j0a9w0myp0mmjm";
+          name = "package-filter";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/package-filter";
+          license = lib.licenses.free;
+        };
+      }) {};
+    package-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "package-plus";
+        version = "20150319.1655";
+        src = fetchFromGitHub {
+          owner = "zenspider";
+          repo = "package";
+          rev = "4a9618a44ec4f26a14e0136cd9d3c4855fceb25b";
+          sha256 = "1xv0ra130qg0ksgqi4npspnv0ckq77k7f5kcibavj030h578kj97";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/package+";
+          sha256 = "1mbsxr4llz8ny7n7w3lykld9yvbaywlfqnvr9l0aiv9rvmdv03bn";
+          name = "package-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/package+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    package-safe-delete = callPackage ({ emacs, epl, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "package-safe-delete";
+        version = "20150116.1007";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "package-safe-delete";
+          rev = "138171e4fc03c0ef05a8260cbb5cd2e114c1c194";
+          sha256 = "1pdv6d6bm5jmpgjqf9ycvzasxz1205zdi0zjrmkr33c03azwz7rd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/package-safe-delete";
+          sha256 = "12ss5yjhnyxsif4vlbgxamn5jfa0wxkkphffxnv6drhvmpq226jw";
+          name = "package-safe-delete";
+        };
+        packageRequires = [ emacs epl ];
+        meta = {
+          homepage = "http://melpa.org/#/package-safe-delete";
+          license = lib.licenses.free;
+        };
+      }) {};
+    package-utils = callPackage ({ epl, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "package-utils";
+        version = "20150126.606";
+        src = fetchFromGitHub {
+          owner = "Silex";
+          repo = "package-utils";
+          rev = "4a56f411f98fd455556a3f1d6c16a577a22057a2";
+          sha256 = "138l07qmxj4fkvf43f1hdn4skadxb50c023bc5101l3njzmf74wa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/package-utils";
+          sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r";
+          name = "package-utils";
+        };
+        packageRequires = [ epl ];
+        meta = {
+          homepage = "http://melpa.org/#/package-utils";
+          license = lib.licenses.free;
+        };
+      }) {};
+    packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "packed";
+        version = "20150723.638";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "packed";
+          rev = "9d77e39c9df29c6224302cb7973b2de7e05f8bd7";
+          sha256 = "0743scd1g5xf3k9fbqv1qd9w421vfxwjlnb0vwix0ypahd83r3db";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/packed";
+          sha256 = "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z";
+          name = "packed";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/packed";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pacmacs = callPackage ({ cl-lib ? null, dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pacmacs";
+        version = "20160116.1131";
+        src = fetchFromGitHub {
+          owner = "codingteam";
+          repo = "pacmacs.el";
+          rev = "9fd3009e5a25dfdb3ff7d97b4ffb0fdde984a520";
+          sha256 = "19631m9xyrzbqv0whshxslhqylx5p77535nm49d4kyib2nb30i3m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pacmacs";
+          sha256 = "0w0r6z365jrglpbifb94w6c22wqi9x93qgkss9pn820hrndqbqxy";
+          name = "pacmacs";
+        };
+        packageRequires = [ cl-lib dash dash-functional emacs f ];
+        meta = {
+          homepage = "http://melpa.org/#/pacmacs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    page-break-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "page-break-lines";
+        version = "20160109.2013";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "page-break-lines";
+          rev = "2b8b800e1dd9fa987cb663c3317e8020d37c7b84";
+          sha256 = "0mqd18w98p6z0i08xx7jga10ljh9360x6sqfyvfq6bjfi2jvxdbk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/page-break-lines";
+          sha256 = "0q1166z190dxznzgf2f29klj2jkaqlic483p4h3bylihkqp93ij7";
+          name = "page-break-lines";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/page-break-lines";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pager = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pager";
+        version = "20100330.1331";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "pager";
+          rev = "347e48d150d5e9a1ce2ca33ec12924d5fa89264d";
+          sha256 = "1dq5ibz7rx9a7gm9zq2pz4c1sxgrm59yibyq92bvmi68lvf2q851";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pager";
+          sha256 = "0s5zwimkbsivbwlyd7g8dpnjyzqcfc5plg53ij4sljiipgjh5brl";
+          name = "pager";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pager";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pager-default-keybindings = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pager }:
+    melpaBuild {
+        pname = "pager-default-keybindings";
+        version = "20130719.1557";
+        src = fetchFromGitHub {
+          owner = "nflath";
+          repo = "pager-default-keybindings";
+          rev = "dbbd49c2ac5906d1dabf9e9c832bfebc1ab405b3";
+          sha256 = "11msqs8v9wn8sj45dw1fl0ldi3sw33v0xclynbxgmawyabfq3bqm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pager-default-keybindings";
+          sha256 = "0vqb3s1fxkl1fxxspq89344s55sfcplz26z0pbh347l1681h3pci";
+          name = "pager-default-keybindings";
+        };
+        packageRequires = [ pager ];
+        meta = {
+          homepage = "http://melpa.org/#/pager-default-keybindings";
+          license = lib.licenses.free;
+        };
+      }) {};
+    palette = callPackage ({ fetchurl, hexrgb, lib, melpaBuild }: melpaBuild {
+        pname = "palette";
+        version = "20151231.1745";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/palette.el";
+          sha256 = "1qnv84y0s437xcsjxh0gs9rb36pydba3qfrihvz5pqs9g9w7m94k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/palette";
+          sha256 = "1v6dsph18rqfbvda2c25mqgdwap2a4zrg6qqq57n205zprpcwxc0";
+          name = "palette";
+        };
+        packageRequires = [ hexrgb ];
+        meta = {
+          homepage = "http://melpa.org/#/palette";
+          license = lib.licenses.free;
+        };
+      }) {};
+    palimpsest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "palimpsest";
+        version = "20130731.1021";
+        src = fetchFromGitHub {
+          owner = "danielsz";
+          repo = "Palimpsest";
+          rev = "69fe61494bfd24305bf7e387fa716474918eafa2";
+          sha256 = "1kbja107smdjqv82p84jx13jk1410c9vms89p1iy1jvn7s8g9fiq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/palimpsest";
+          sha256 = "18kklfdlcg982pdrslh0xqa42h28f91bdm7q2zn890d6dcivp6bk";
+          name = "palimpsest";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/palimpsest";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pallet = callPackage ({ cask, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "pallet";
+        version = "20150512.202";
+        src = fetchFromGitHub {
+          owner = "rdallasgray";
+          repo = "pallet";
+          rev = "0e1ae11e1ebfe644cbf832df62ac2dbf6ecd0501";
+          sha256 = "03mlg6dmpjw8fq2s3c4gpqj20kjhzldz3m51bf6s0mxq9bclx2xw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pallet";
+          sha256 = "0q50cdwnn2w1n5h4bappncjjyi5yaixxannwgy23fngdrz1mxwd7";
+          name = "pallet";
+        };
+        packageRequires = [ cask dash f s ];
+        meta = {
+          homepage = "http://melpa.org/#/pallet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pandoc-mode";
+        version = "20151030.513";
+        src = fetchFromGitHub {
+          owner = "joostkremers";
+          repo = "pandoc-mode";
+          rev = "23444375a60f44b3439994e969d8aa7acf220f8c";
+          sha256 = "0aj509yjqgq8bxrvdq5x3d1sfj0dgwwh6kg7f20vapz9qxjdjvdg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pandoc-mode";
+          sha256 = "0qvc6cf87h1jqf590kd68jfg25snxaxayfds634wj4z6gp70l781";
+          name = "pandoc-mode";
+        };
+        packageRequires = [ dash hydra ];
+        meta = {
+          homepage = "http://melpa.org/#/pandoc-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pangu-spacing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pangu-spacing";
+        version = "20150927.224";
+        src = fetchFromGitHub {
+          owner = "coldnew";
+          repo = "pangu-spacing";
+          rev = "4662e66d5cb72738d46d3296ac7626536fc88acb";
+          sha256 = "01zc2cvkyfx80snwrm3cs8cbwgxmd56rgvvbsyq53r4q3zhdk1li";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pangu-spacing";
+          sha256 = "082qh26vlk7kifz1800lyai17yvngwjygrfrsh1dsd8dxhk6l9j8";
+          name = "pangu-spacing";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pangu-spacing";
+          license = lib.licenses.free;
+        };
+      }) {};
+    paper-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, hexrgb, lib, melpaBuild }:
+    melpaBuild {
+        pname = "paper-theme";
+        version = "20151231.1132";
+        src = fetchFromGitHub {
+          owner = "cadadr";
+          repo = "paper-theme";
+          rev = "15af5e31492f79dc0d47787150ef39d6318a2608";
+          sha256 = "1xh614czldjvfl66vhkyaai5k4qsg1l3mz6wd5b1w6kd45qrc54i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paper-theme";
+          sha256 = "04diqm2c9fm29zyms3hplkzb4kb7b2kyrxdsy0jxyjj5kabypd50";
+          name = "paper-theme";
+        };
+        packageRequires = [ emacs hexrgb ];
+        meta = {
+          homepage = "http://melpa.org/#/paper-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    paradox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, hydra, json ? null, let-alist, lib, melpaBuild, seq, spinner }:
+    melpaBuild {
+        pname = "paradox";
+        version = "20151211.1517";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "paradox";
+          rev = "68643e1f473ea204b7191dbcc8a53f95eeb4a117";
+          sha256 = "1gcbdk111m1filfjj0k98s6b65wzm7kj60nfzszf7shl60j5sng7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paradox";
+          sha256 = "1xq14nfvprsq18464qr4mhphq7cl1f570lji5n8z6j9vpfm9a4p2";
+          name = "paradox";
+        };
+        packageRequires = [ cl-lib emacs hydra json let-alist seq spinner ];
+        meta = {
+          homepage = "http://melpa.org/#/paradox";
+          license = lib.licenses.free;
+        };
+      }) {};
+    paredit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "paredit";
+        version = "20150217.913";
+        src = fetchgit {
+          url = "http://mumble.net/~campbell/git/paredit.git";
+          rev = "9a696fdcce87c9d9eec4569a9929d0300ac6ae5c";
+          sha256 = "34dd7d8c07c697b54ea943566e6967012f7366d6f5a21e31e3d768716bc4928f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paredit";
+          sha256 = "1rp859y4qyqdfvp261l8mmbd62p1pw0dypm1mng6838b6q6ycakr";
+          name = "paredit";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/paredit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    paredit-everywhere = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
+    melpaBuild {
+        pname = "paredit-everywhere";
+        version = "20150821.2344";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "paredit-everywhere";
+          rev = "79ecbfc15d2cb338f277f3da50d8e757f07151e9";
+          sha256 = "1jkpb67h96sm3fnga9hrg3kwhlp3czdv66v49a9szq174zpsnrgv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paredit-everywhere";
+          sha256 = "0gbkwk8mrbjr2l8pz3q4y6j8q4m12zmzl31c88ngs1k5d86wav36";
+          name = "paredit-everywhere";
+        };
+        packageRequires = [ paredit ];
+        meta = {
+          homepage = "http://melpa.org/#/paredit-everywhere";
+          license = lib.licenses.free;
+        };
+      }) {};
+    paredit-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "paredit-menu";
+        version = "20130923.1454";
+        src = fetchFromGitHub {
+          owner = "phillord";
+          repo = "phil-emacs-packages";
+          rev = "6e0142bae9cc3bfbea2fa134b6385af1c99ee782";
+          sha256 = "0ygckaj87swrnmsv5dhs55dngw1f22xm6238s9xb2axi3rr4w965";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paredit-menu";
+          sha256 = "17l05m1lg0vmahh53b2lvw316y4z7jz3nmy0zyiyiygax313y42l";
+          name = "paredit-menu";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/paredit-menu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    paren-completer = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "paren-completer";
+        version = "20150711.1723";
+        src = fetchFromGitHub {
+          owner = "MatthewBregg";
+          repo = "paren-completer";
+          rev = "afb6d596ffac85b3457178cfdb384cd2a382b120";
+          sha256 = "0fds9s16c0dgq6ah98x4pv5bgwbikqwiikcxjzmk9g1m3s232fl8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paren-completer";
+          sha256 = "0xh17h8vmsgbrq6yf5sfy3kpia4za68f43gwgkvi2m430g15fr0x";
+          name = "paren-completer";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/paren-completer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "paren-face";
+        version = "20151105.2106";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "paren-face";
+          rev = "09bb594f0c9614fb336fd8b5598215cf7c2d2c7e";
+          sha256 = "0ggpb58dw4dv9i0czj064a8fdcalgjqgl4cm5zsk7hcvjcmal9af";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paren-face";
+          sha256 = "0dmzk66m3rd8x0rb925pyrfpc2qsvayks4kmhpb2ccdrx68pg8gf";
+          name = "paren-face";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/paren-face";
+          license = lib.licenses.free;
+        };
+      }) {};
+    parent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "parent-mode";
+        version = "20150824.1800";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "parent-mode";
+          rev = "db692cf08deff2f0e973e6e86e26662b44813d1b";
+          sha256 = "0i5bc7lyyrx6swqlrp9l5x72yzwi53qn6ldrfs99gh08b3yvsnni";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/parent-mode";
+          sha256 = "1ndn6m6aasmk9yrml9xqj8141100nw7qi1bhnlsss3v8b6njwwig";
+          name = "parent-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/parent-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    parse-csv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "parse-csv";
+        version = "20140203.316";
+        src = fetchFromGitHub {
+          owner = "mrc";
+          repo = "el-csv";
+          rev = "dc31201af8868aa98f055de055ee7aa5fae266dd";
+          sha256 = "1z8cp1cdkxmdqislixxvncj0s1jx42i6arx48kdl5paymnnp282s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/parse-csv";
+          sha256 = "0khpfxbarw0plx8kka357d8wl1vvdih5797xlld9adc0g3cng0zz";
+          name = "parse-csv";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/parse-csv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "parsebib";
+        version = "20151006.432";
+        src = fetchFromGitHub {
+          owner = "joostkremers";
+          repo = "parsebib";
+          rev = "9a1f60bed2814dfb5cec2b92efb5951a4b465cce";
+          sha256 = "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/parsebib";
+          sha256 = "07br2x68scsxykdk2ajc4mfqhdb7vjkcfgz3vnpy91sirxzgfjdd";
+          name = "parsebib";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/parsebib";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }:
+    melpaBuild {
+        pname = "pass";
+        version = "20151109.603";
+        src = fetchFromGitHub {
+          owner = "NicolasPetton";
+          repo = "pass";
+          rev = "f43f6ada151a81f0bca4397b78382e4f6160d0ad";
+          sha256 = "14zpkxnwvwdi7wnjw4827lzzn6kw8wmwr2whavpi4rlkq8ix6dv2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pass";
+          sha256 = "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr";
+          name = "pass";
+        };
+        packageRequires = [ emacs f password-store ];
+        meta = {
+          homepage = "http://melpa.org/#/pass";
+          license = lib.licenses.free;
+        };
+      }) {};
+    passthword = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "passthword";
+        version = "20141201.323";
+        src = fetchFromGitHub {
+          owner = "pidu";
+          repo = "passthword";
+          rev = "30bace842eaaa6b48cb2251fb84868ebca0467d6";
+          sha256 = "0yckh61v9a798gpyk8x2z9990h3b61lwsw0kish571pygfyqhjkq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/passthword";
+          sha256 = "076jayziipjx260yk3p37pf5k0qsagalidah3y6hiflrlq4sfgjn";
+          name = "passthword";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/passthword";
+          license = lib.licenses.free;
+        };
+      }) {};
+    password-generator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "password-generator";
+        version = "20150222.1440";
+        src = fetchFromGitHub {
+          owner = "zargener";
+          repo = "emacs-password-genarator";
+          rev = "c8193d5e963bda0a2f8e51fd4a94dcf37c76f282";
+          sha256 = "1pw401ar114wpayibphv3n6m0gz68zjmiwz60r4lbar45bmxvihx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/password-generator";
+          sha256 = "0aahpplmiwmp6a06y6hl4zvv8lvzkmakmaazlckl5r3rqbsf24cb";
+          name = "password-generator";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/password-generator";
+          license = lib.licenses.free;
+        };
+      }) {};
+    password-store = callPackage ({ f, fetchgit, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "password-store";
+        version = "20151027.1649";
+        src = fetchgit {
+          url = "http://git.zx2c4.com/password-store";
+          rev = "bffca1ee21a38f1e808fa83e5df2fcf0f808cb9f";
+          sha256 = "9c3ee0155b9d6b96acacaab8e799b23e92550ef136ffa2c07880029af3061733";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/password-store";
+          sha256 = "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss";
+          name = "password-store";
+        };
+        packageRequires = [ f s ];
+        meta = {
+          homepage = "http://melpa.org/#/password-store";
+          license = lib.licenses.free;
+        };
+      }) {};
+    password-vault = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "password-vault";
+        version = "20151121.2141";
+        src = fetchFromGitHub {
+          owner = "PuercoPop";
+          repo = "password-vault";
+          rev = "e47d99bb092e150472f1989ab3ac5a4752863515";
+          sha256 = "0984pzlfxsgi2060spjxw7livfh8013ffrk4x8m4sjifhniqgjqk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/password-vault";
+          sha256 = "17i556xwq6yaxv9v18l1abcpbaz6hygsa4vf4b68fc98vcy7396a";
+          name = "password-vault";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/password-vault";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pastebin = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "pastebin";
+        version = "20101125.1355";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/pastebin.el";
+          sha256 = "17br64snqby465bjb0l1hzw0pcms5m2knrvb6y9gn3kir4sdi6kn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pastebin";
+          sha256 = "19fgjcbxgmnm59qjkxhvy2aib5qs5d5a43hwvjdhxq2k6rn3f2gj";
+          name = "pastebin";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pastebin";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pastehub = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pastehub";
+        version = "20140615.120";
+        src = fetchFromGitHub {
+          owner = "kiyoka";
+          repo = "pastehub";
+          rev = "37b045c67659c078f1517d0fbd5282dab58dca23";
+          sha256 = "0m6qjsq6qfwwszm95lj8c58l75vbmx9r5hm9bfywyympfgy0fa1n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pastehub";
+          sha256 = "1slvqn5ay6gkbi0ai1gy1wmc02h4g3n6srrh4fqn72y7b9nv5i0v";
+          name = "pastehub";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pastehub";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pastelmac-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pastelmac-theme";
+        version = "20151030.2136";
+        src = fetchFromGitHub {
+          owner = "bmastenbrook";
+          repo = "pastelmac-theme-el";
+          rev = "bead21741e3f46f6506e8aef4469d4240a819389";
+          sha256 = "1v5mpjb8kavbqhvg4rizwg8cypgmi6ngdiy8qp9pimmkb56y42ly";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pastelmac-theme";
+          sha256 = "168zzqhp2dbfcnknwfqxk68rgmibfw71ksghvi6h2j2c1m08l23f";
+          name = "pastelmac-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/pastelmac-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pastels-on-dark-theme = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pastels-on-dark-theme";
+        version = "20120304.1222";
+        src = fetchgit {
+          url = "https://gist.github.com/1974259.git";
+          rev = "854839a0b4bf8c3f6a7d947926bf41d690547002";
+          sha256 = "c53b4f2c7449bf74648c091f249c33da3ddd8f621474a8901745b4e985cb26ab";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pastels-on-dark-theme";
+          sha256 = "0zdr29793gg229r47yjb3plagxc9pszqyy4sx81ffp3rpdf0nlbh";
+          name = "pastels-on-dark-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pastels-on-dark-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    path-headerline-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "path-headerline-mode";
+        version = "20140423.832";
+        src = fetchFromGitHub {
+          owner = "7696122";
+          repo = "path-headerline-mode";
+          rev = "b5b2725c6a8b1cb592fc242b7dbbd54b4dff2e69";
+          sha256 = "1ffnkw8djs8kvfjd1crnaqram1vl4w3g1zhsqp74ds0mccsd6830";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/path-headerline-mode";
+          sha256 = "0dwr8iyq62ad5xkh7r4kpywpypdq1wljsdzwqbq9zdr79yfqx337";
+          name = "path-headerline-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/path-headerline-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    paxedit = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
+    melpaBuild {
+        pname = "paxedit";
+        version = "20160102.2021";
+        src = fetchFromGitHub {
+          owner = "promethial";
+          repo = "paxedit";
+          rev = "0d06c72b18b4eccb8668b2dc3e7884f2cef7871b";
+          sha256 = "0kkgqaxyrv65rfg2ng1vmmmrc9bm98yqpsv2pcb760287dn0l27m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paxedit";
+          sha256 = "06ymilr0zrwfpyzql7dcpg48lhkx73f2jlaw3caxgsjaz7x3n4ic";
+          name = "paxedit";
+        };
+        packageRequires = [ cl-lib paredit ];
+        meta = {
+          homepage = "http://melpa.org/#/paxedit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pbcopy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pbcopy";
+        version = "20150224.2259";
+        src = fetchFromGitHub {
+          owner = "emacsfodder";
+          repo = "pbcopy.el";
+          rev = "338f7245746b5de1bb96c5cc2b32bfd9b5d83272";
+          sha256 = "138w0dlp3msjmr2x09kfcnxwhdldbz9xjfy7l6lig1x9ima0z5w6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pbcopy";
+          sha256 = "1989pkhaha6s2rmgyswnzps92x9hhzymjz4ng4a5jda1b9snp60q";
+          name = "pbcopy";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pbcopy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pc-bufsw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pc-bufsw";
+        version = "20150923.213";
+        src = fetchFromGitHub {
+          owner = "ibukanov";
+          repo = "pc-bufsw";
+          rev = "a76120bca9821c355069f135b4e6978351b66bc2";
+          sha256 = "1jj5h92qakrn9d5d88dvl43b7ppw96rm11hqg3791i6k48nx1d1m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pc-bufsw";
+          sha256 = "01d7735ininlsjkql7dy57irgwgk4k9br8bl18wq51vgkg90i5k5";
+          name = "pc-bufsw";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pc-bufsw";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pcache = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pcache";
+        version = "20151109.839";
+        src = fetchFromGitHub {
+          owner = "sigma";
+          repo = "pcache";
+          rev = "4b090f46182fd2ed1f44905dc04acc3121bcf622";
+          sha256 = "0xbbq8ddlirhvv921nrf7bwazh0i98bk0a9xzyx8iqpyg66vbfa8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcache";
+          sha256 = "1q2wlbc58lyf3dxfs9ppdxvdsp81jmkq874zbd7f39wvc5ckbz0l";
+          name = "pcache";
+        };
+        packageRequires = [ eieio ];
+        meta = {
+          homepage = "http://melpa.org/#/pcache";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pcmpl-args = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pcmpl-args";
+        version = "20120912.24";
+        src = fetchFromGitHub {
+          owner = "JonWaltman";
+          repo = "pcmpl-args.el";
+          rev = "2ba03b3125ada8037585e545b88bd85b79da5c37";
+          sha256 = "0pwx1nbgciy28rivvrgka46zihmag9ljrs40bvscgd9rkragm4zy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcmpl-args";
+          sha256 = "0sry4zvr8xmzyygf2m5dms52srkd1apj3i7a3aj23qa8jvndx8vr";
+          name = "pcmpl-args";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pcmpl-args";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pcmpl-git = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pcmpl-git";
+        version = "20160111.55";
+        src = fetchFromGitHub {
+          owner = "leoliu";
+          repo = "pcmpl-git-el";
+          rev = "1f866246e14756792e66643d89e2e2e0ec8e2635";
+          sha256 = "0pspxgicc0mkypp94r0jydmkjr3ngv8y4w1xpj93kp79hnvyls0a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcmpl-git";
+          sha256 = "12y9pg1g4i1ghnjvgfdpa6p84h4bcqrr23y9bazwl9n6aj20cmxk";
+          name = "pcmpl-git";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pcmpl-git";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pcmpl-homebrew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pcmpl-homebrew";
+        version = "20150506.2052";
+        src = fetchFromGitHub {
+          owner = "kaihaosw";
+          repo = "pcmpl-homebrew";
+          rev = "a2b9026a1b3c8206d0eca90c491c0397fb275f94";
+          sha256 = "17i5j5005dhzgwzds5jj1a7d31xvbshjc139vawwz2xip5aynji4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcmpl-homebrew";
+          sha256 = "1gckzcwpg4am1ryjy08aic98mbafb64wkfmnm98d64kiwbpaacly";
+          name = "pcmpl-homebrew";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pcmpl-homebrew";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pcmpl-pip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pcmpl-pip";
+        version = "20141024.348";
+        src = fetchFromGitHub {
+          owner = "kaihaosw";
+          repo = "pcmpl-pip";
+          rev = "b775bef9fa3ae9fb8015409554ecdd165c4bc325";
+          sha256 = "14pz15by9gp0307bcdv9h90mcr35ya89wbn3y13n7k0z5r45gn58";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcmpl-pip";
+          sha256 = "17nmgq4wgv4yl2rsdf32585hfa58j0825mzzajrlwgmjiqx9i778";
+          name = "pcmpl-pip";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pcmpl-pip";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pcomplete-extension = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pcomplete-extension";
+        version = "20140604.1147";
+        src = fetchFromGitHub {
+          owner = "thierryvolpiatto";
+          repo = "pcomplete-extension";
+          rev = "839740c90de857e18db2f578d6660951522faab5";
+          sha256 = "0h0p4c08z0dqxmg55fzch1d2f38rywfk1j0an2f4sc94lj7ckbm6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcomplete-extension";
+          sha256 = "0m0c9ir44p21rj93fkisvpvi08936717ljmzsr4qdf69b3i54cwc";
+          name = "pcomplete-extension";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/pcomplete-extension";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pcre2el = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pcre2el";
+        version = "20151213.434";
+        src = fetchFromGitHub {
+          owner = "joddie";
+          repo = "pcre2el";
+          rev = "57ee828d07953329fd85ff85d6a4f27a0ce512a1";
+          sha256 = "0ymbximchjfllrglkwv4lwb2sqprvva77vfbjb6n6kzni0ix70s3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcre2el";
+          sha256 = "1l72hv9843qk5p8gi9ibr15wczm804j3ws2v1x7nx4dr7pc5c7l3";
+          name = "pcre2el";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/pcre2el";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pcsv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pcsv";
+        version = "20150220.531";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-pcsv";
+          rev = "798e0933f8d0818beb17aebf3b1056bbf74e03d0";
+          sha256 = "0aaprjczjf3al5vcypw1fsnz5a0xnnlhmvy0lc83i9aqbsa2y8af";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcsv";
+          sha256 = "1zphndkbva59g1fd319a240yvq8fjk315b1fyrb8zvmqpgk9n0dl";
+          name = "pcsv";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pcsv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pdb-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pdb-mode";
+        version = "20150128.1151";
+        src = fetchFromGitHub {
+          owner = "sixpi";
+          repo = "pdb-mode";
+          rev = "855fb18ebb73b5df30c8d7677c2bcd0f361b138a";
+          sha256 = "1xkkyz7y08jr71rzdacb9v7gk95qsxlsshkdsxq8jp70irq51099";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pdb-mode";
+          sha256 = "1ihkxd15kx5m5xb9yxwz8wqbmyk9iaskry9szzdz1j4gjlczb6hy";
+          name = "pdb-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pdb-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }:
+    melpaBuild {
+        pname = "pdf-tools";
+        version = "20151224.1359";
+        src = fetchFromGitHub {
+          owner = "politza";
+          repo = "pdf-tools";
+          rev = "97b86cd09a411d00a7947da76b4c3f77995ccf44";
+          sha256 = "05b5fn3w2bika21a5sxyjs3yfrcdvn6qdrx9li1jda9jg623bpn3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pdf-tools";
+          sha256 = "1hnc8cci00mw78h7d7gs8smzrgihqz871sdc9hfvamb7iglmdlxw";
+          name = "pdf-tools";
+        };
+        packageRequires = [ emacs let-alist tablist ];
+        meta = {
+          homepage = "http://melpa.org/#/pdf-tools";
+          license = lib.licenses.free;
+        };
+      }) {};
+    peacock-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "peacock-theme";
+        version = "20141116.102";
+        src = fetchFromGitHub {
+          owner = "emacsfodder";
+          repo = "emacs-peacock-theme";
+          rev = "268a2a7eb48ac750fc939657169ec65f2ac0f4f7";
+          sha256 = "1clvrmvijwpffigh5f29vnwcvffqk0nrvlz26158hip1z9x7nah3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/peacock-theme";
+          sha256 = "0jpdq090r37d07bm52yx3x9y3gsip6fyxxq1ax1k5k0r0js45kq9";
+          name = "peacock-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/peacock-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    peek-mode = callPackage ({ elnode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "peek-mode";
+        version = "20130620.1446";
+        src = fetchFromGitHub {
+          owner = "erikriverson";
+          repo = "peek-mode";
+          rev = "55a7dd011375330c7d57322257a5167516702c71";
+          sha256 = "11nv6pll0zj9dkgzlzgav39a6x3sfi7kvfhwm96fa3iy4v8bixrb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/peek-mode";
+          sha256 = "07wcnh3jmp2gi9xhd3d8i2n0pr2g9kav497nnz94i85awhzf8fi4";
+          name = "peek-mode";
+        };
+        packageRequires = [ elnode ];
+        meta = {
+          homepage = "http://melpa.org/#/peek-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    peep-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "peep-dired";
+        version = "20150518.900";
+        src = fetchFromGitHub {
+          owner = "asok";
+          repo = "peep-dired";
+          rev = "6c18727fc58e2a19638f133810e35bd5d918a559";
+          sha256 = "1qi9qzcvclyw9wiamsw0z8q09hs0mfhaj2giny42nd6sqacvfr7m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/peep-dired";
+          sha256 = "16k5y3h2ip96k071vhx83avg4r4nplnd973b1271vvxbx2bly735";
+          name = "peep-dired";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/peep-dired";
+          license = lib.licenses.free;
+        };
+      }) {};
+    peg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "peg";
+        version = "20150708.141";
+        src = fetchFromGitHub {
+          owner = "ellerh";
+          repo = "peg.el";
+          rev = "081efeca91d790c7fbc90871ac22c40935f4833b";
+          sha256 = "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/peg";
+          sha256 = "0nxy9xn99myz0p36m4jflfj48qxhhn1sspbfx8d90030xg3cc2gm";
+          name = "peg";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/peg";
+          license = lib.licenses.free;
+        };
+      }) {};
+    per-buffer-theme = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "per-buffer-theme";
+        version = "20151013.1212";
+        src = fetchhg {
+          url = "https://bitbucket.com/inigoserna/per-buffer-theme.el";
+          rev = "2b82a04b28d0";
+          sha256 = "1rh87jf0a15q35a8h00bx6k5wa931rb6gh600zbs7j4r3y8qsylf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/per-buffer-theme";
+          sha256 = "1czcaybpfmx4mwff7hs07iayyvgvlhifkickccap6kpd0cp4n6hn";
+          name = "per-buffer-theme";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/per-buffer-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    perl-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "perl-completion";
+        version = "20090528.136";
+        src = fetchFromGitHub {
+          owner = "imakado";
+          repo = "perl-completion";
+          rev = "f2ec91b88a8b7d97d40d6c90a89eaf8e595c2b89";
+          sha256 = "0fzypcxxd5zlkcybz0xppf09l0vf4vsfisr2y3ijsmxhg7yrwzj5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/perl-completion";
+          sha256 = "01p17mlkwjm60f14arda3ly8ng0r98nn3rly94ghn6jr7r7fv14b";
+          name = "perl-completion";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/perl-completion";
+          license = lib.licenses.free;
+        };
+      }) {};
+    perl6-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
+    melpaBuild {
+        pname = "perl6-mode";
+        version = "20160117.1309";
+        src = fetchFromGitHub {
+          owner = "hinrik";
+          repo = "perl6-mode";
+          rev = "bf7900b2867ed130be8180cb95f34af969d76eb2";
+          sha256 = "11fs78b7ssz18wr35vxf6h4zpfj4l4vsikfzayq6hyqjnchv7b45";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/perl6-mode";
+          sha256 = "0af1djypd8n0n1fq10sl8mrdg27354kg9g87d6xz4q5phvi48cqv";
+          name = "perl6-mode";
+        };
+        packageRequires = [ emacs pkg-info ];
+        meta = {
+          homepage = "http://melpa.org/#/perl6-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    perlbrew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "perlbrew";
+        version = "20130127.524";
+        src = fetchFromGitHub {
+          owner = "kentaro";
+          repo = "perlbrew.el";
+          rev = "30e14a606a08948fde5eafda2cbe1cd4eb83b3f3";
+          sha256 = "0wg0cpqxzfgln6xdngzspsbfirn9a5jxpgk66m0fpi33215z9q26";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/perlbrew";
+          sha256 = "1qadwkcic2qckqy8hgrnj08ajhxayknhpyxkc6ir15vfqjk5crr8";
+          name = "perlbrew";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/perlbrew";
+          license = lib.licenses.free;
+        };
+      }) {};
+    persistent-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "persistent-scratch";
+        version = "20160112.339";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "persistent-scratch";
+          rev = "f0554b9edb4b05150f297b5c14a2da003209d3bf";
+          sha256 = "0h05j55y3csq91a5m2fg99y4rzsh7zca7hnifb6kic5zb3nahi00";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/persistent-scratch";
+          sha256 = "0iai65lsg3zxj07hdb9201w3rwrvdb3wffr6k2jdl8hzg5idghn1";
+          name = "persistent-scratch";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/persistent-scratch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    persistent-soft = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache }:
+    melpaBuild {
+        pname = "persistent-soft";
+        version = "20150223.1253";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "persistent-soft";
+          rev = "a1e0ddf2a12a6f18cab565dee250f070384cbe02";
+          sha256 = "14p20br8vzxs39d4hswzrrkgwql5nnmn5j17cpbabzjvck42rixc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/persistent-soft";
+          sha256 = "0a4xiwpgyyynjf69s8p183mqd3z53absv544ggvhb2gkpm6jravc";
+          name = "persistent-soft";
+        };
+        packageRequires = [ list-utils pcache ];
+        meta = {
+          homepage = "http://melpa.org/#/persistent-soft";
+          license = lib.licenses.free;
+        };
+      }) {};
+    persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "persp-mode";
+        version = "20160115.533";
+        src = fetchFromGitHub {
+          owner = "Bad-ptr";
+          repo = "persp-mode.el";
+          rev = "56828b520e30662da7a20557971b47a99c56011a";
+          sha256 = "0fqmmv1y0vpgivad1nc8bq781wakfsp2azhxb20lpk7wqa0hp3kr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/persp-mode";
+          sha256 = "1bgni7y5xsn4a21494npr90w3320snfzw1hvql30xrr57pw3765w";
+          name = "persp-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/persp-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    persp-projectile = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, perspective, projectile }:
+    melpaBuild {
+        pname = "persp-projectile";
+        version = "20151220.630";
+        src = fetchFromGitHub {
+          owner = "bbatsov";
+          repo = "persp-projectile";
+          rev = "83e03b1284ea36f37a24571abd6442a267408360";
+          sha256 = "0b9hz253m6d58dwsjsk9d1fw0ql33m9wfvyx10ncsqbr0j0s98k5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/persp-projectile";
+          sha256 = "10l2kqjyigg98qbbpf3qf4d5bm63kkk4vp7ip8fibgj1p9gqmnxm";
+          name = "persp-projectile";
+        };
+        packageRequires = [ cl-lib perspective projectile ];
+        meta = {
+          homepage = "http://melpa.org/#/persp-projectile";
+          license = lib.licenses.free;
+        };
+      }) {};
+    perspective = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "perspective";
+        version = "20151211.1654";
+        src = fetchFromGitHub {
+          owner = "nex3";
+          repo = "perspective-el";
+          rev = "b6f4f05951d3f0d16a503bf462f136c689ede4df";
+          sha256 = "1ajmyl3bg01a3gkhay4qibgk9a0r6s8rhf1cc1678w3cm0w6yvmd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/perspective";
+          sha256 = "150dxcsd0ylvfi9mmfpcki1wd3nl8q9mbszd3dgqfnm40yncklml";
+          name = "perspective";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/perspective";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pg";
+        version = "20130731.1642";
+        src = fetchFromGitHub {
+          owner = "cbbrowne";
+          repo = "pg.el";
+          rev = "4f6516ec3946d95dcef49abb6703cc89ecb5183d";
+          sha256 = "1zh7v4nnpzvbi8yj1ynlqlawk5bmlxi6s80b5f2y7hkdqb5q26k0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pg";
+          sha256 = "0n0187ndvwza1nis9a12h584qdqkwqfzhdw21kz5d1i6c43g7gji";
+          name = "pg";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pg";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pgdevenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pgdevenv";
+        version = "20150105.1636";
+        src = fetchFromGitHub {
+          owner = "dimitri";
+          repo = "pgdevenv-el";
+          rev = "7f1d5bc734750aca98cf67a9491cdbd5615fd132";
+          sha256 = "0c9d4c24ic67y07y74bv5b7vc56b6l0lbh2fbzm870r1dl5zbzcj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pgdevenv";
+          sha256 = "0za35sdwwav81wpk4jjqh56icaswwxxyg3bqqp0qiz24llb5ln1w";
+          name = "pgdevenv";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pgdevenv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ph = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ph";
+        version = "20130312.1337";
+        src = fetchFromGitHub {
+          owner = "gromnitsky";
+          repo = "ph";
+          rev = "ed45c371642e313810b56c45af08fdfbd71a7dfe";
+          sha256 = "1qxsc5wyk8l9gkgmqy3mzwxdhji1ljqw9s1jfxkax7fyv4d1v31p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ph";
+          sha256 = "0azx4cpfdn01yrqyn0q1gg9z7w0h0rn7zl39v3dx6yidd76ysh0l";
+          name = "ph";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ph";
+          license = lib.licenses.free;
+        };
+      }) {};
+    phabricator = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, s }:
+    melpaBuild {
+        pname = "phabricator";
+        version = "20151115.307";
+        src = fetchFromGitHub {
+          owner = "ajtulloch";
+          repo = "phabricator.el";
+          rev = "b1450350cc3c45c732252bb13860156d824ead10";
+          sha256 = "0y77ld1cmfpv9p7yx2mlbvjm5ivsrf2j0g0h4zabfrahz22v39d4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phabricator";
+          sha256 = "07988f2xyp76xjs25b3rdblhmijs2piriz4p0q92jw69bdvkl14c";
+          name = "phabricator";
+        };
+        packageRequires = [ dash emacs f projectile s ];
+        meta = {
+          homepage = "http://melpa.org/#/phabricator";
+          license = lib.licenses.free;
+        };
+      }) {};
+    phi-autopair = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
+    melpaBuild {
+        pname = "phi-autopair";
+        version = "20150527.423";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "phi-autopair";
+          rev = "ec4e02f3b1602a6450ece118c79d4beb2430ff08";
+          sha256 = "14g06ndxrqz80kdyhil6ajcqqxkfa77r1gr7vwqa9sq6jgm8dpx5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phi-autopair";
+          sha256 = "1ya1bvh28qgz1zg9kdh2lzbsf0w0lx4xr42mdrjwaz3bbfa9asg4";
+          name = "phi-autopair";
+        };
+        packageRequires = [ paredit ];
+        meta = {
+          homepage = "http://melpa.org/#/phi-autopair";
+          license = lib.licenses.free;
+        };
+      }) {};
+    phi-grep = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "phi-grep";
+        version = "20150212.924";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "phi-grep";
+          rev = "9f1eb3548311816920864a171de303245a001301";
+          sha256 = "1rchxhp4kji5kbg8kzkzdbfy8sdbgbqd5g59cch7ia9agh5jvwyx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phi-grep";
+          sha256 = "1y5lq6lq9qdydbypb1pjnxryh94a295nnqqh2x27whiwdiysirjj";
+          name = "phi-grep";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/phi-grep";
+          license = lib.licenses.free;
+        };
+      }) {};
+    phi-rectangle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "phi-rectangle";
+        version = "20151208.54";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "phi-rectangle";
+          rev = "0c12716afc71d803d1f39417469521dc465762d9";
+          sha256 = "0d2c579rg8wdfmn94nzaix9332jch4wlr939jszls330s38d0iv4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phi-rectangle";
+          sha256 = "08yw04wmbgbbr60i638m0rspfwn3cp47ky5ssgjcgcmmdgg9yfvy";
+          name = "phi-rectangle";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/phi-rectangle";
+          license = lib.licenses.free;
+        };
+      }) {};
+    phi-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "phi-search";
+        version = "20150807.312";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "phi-search";
+          rev = "40b86bfe9ae15377fbee842b1de3d93c2eb7dd69";
+          sha256 = "10kyq3lkhmbmj1hl9awzc0w8073dn9mbjd5skh660ljg5mmi6x62";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phi-search";
+          sha256 = "0nj06ixl76dd80zg83q4bi8k224mcwb612mr4gd1xppj5k8xl03g";
+          name = "phi-search";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/phi-search";
+          license = lib.licenses.free;
+        };
+      }) {};
+    phi-search-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, phi-search }:
+    melpaBuild {
+        pname = "phi-search-dired";
+        version = "20150405.214";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "phi-search-dired";
+          rev = "162a5e4507c72512affae22744bb606a906d4193";
+          sha256 = "1b44947hncw4q42fxxrz6fm21habzp4pyp0569xdwysrx2rca2fn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phi-search-dired";
+          sha256 = "1gf3vs3vrp5kbq4ixnj7adazmnqixi63qswgc2512p10gf7inf8p";
+          name = "phi-search-dired";
+        };
+        packageRequires = [ phi-search ];
+        meta = {
+          homepage = "http://melpa.org/#/phi-search-dired";
+          license = lib.licenses.free;
+        };
+      }) {};
+    phi-search-mc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors, phi-search }:
+    melpaBuild {
+        pname = "phi-search-mc";
+        version = "20150218.55";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "phi-search-mc.el";
+          rev = "4c6d2d39feb502febb81fc98b7b5854d88150c69";
+          sha256 = "0r6cl1ng41s6wsy5syjlkaip0mp8h491diipdc1psbhnpk4vabsv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phi-search-mc";
+          sha256 = "07hd80rbyzr5n3yd7hv1j51nl6pvcxmln20g6xvw8gh5yfl9k0m8";
+          name = "phi-search-mc";
+        };
+        packageRequires = [ multiple-cursors phi-search ];
+        meta = {
+          homepage = "http://melpa.org/#/phi-search-mc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    phi-search-migemo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, migemo, phi-search }:
+    melpaBuild {
+        pname = "phi-search-migemo";
+        version = "20150116.706";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "phi-search-migemo";
+          rev = "57623e4b67ee766cbb299da00a212f3ebf7d6fb0";
+          sha256 = "1k8hjnkinzdxy9qxldsyvj6npa2sv48m905d1cvxr8lyzpc5hikh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phi-search-migemo";
+          sha256 = "0qk73s09sasm438w29j5z2bmlb60p1mgbv2ch43rgq8c6kjzg6h6";
+          name = "phi-search-migemo";
+        };
+        packageRequires = [ migemo phi-search ];
+        meta = {
+          homepage = "http://melpa.org/#/phi-search-migemo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    phoenix-dark-mono-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "phoenix-dark-mono-theme";
+        version = "20130306.1415";
+        src = fetchFromGitHub {
+          owner = "j0ni";
+          repo = "phoenix-dark-mono";
+          rev = "dafb65c542605145d6b1702aae5b195b70f98285";
+          sha256 = "1fg63g1cm9mp50sf3ldcb0pr4bvlfxx010arisxdkj102pmib2ri";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phoenix-dark-mono-theme";
+          sha256 = "15in299j170n0wxmkg3cx1zzx1n7r1ifraqqzfqhcnk8i8lmc939";
+          name = "phoenix-dark-mono-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/phoenix-dark-mono-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    phoenix-dark-pink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "phoenix-dark-pink-theme";
+        version = "20150406.2202";
+        src = fetchFromGitHub {
+          owner = "j0ni";
+          repo = "phoenix-dark-pink";
+          rev = "314602b2e68c4054159ab3f0f6f6b658f232ada5";
+          sha256 = "042yw44d5pwykl177sdh209drc5f17yzhq0mxrf7qhycbjs4h8cg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phoenix-dark-pink-theme";
+          sha256 = "0bz6iw73d85bi12qqx6fdw3paqknrxvn0asbwjmgdcrlqrfczjlr";
+          name = "phoenix-dark-pink-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/phoenix-dark-pink-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    php-auto-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, yasnippet }:
+    melpaBuild {
+        pname = "php-auto-yasnippets";
+        version = "20141128.1611";
+        src = fetchFromGitHub {
+          owner = "ejmr";
+          repo = "php-auto-yasnippets";
+          rev = "7da250a0d40f3ec44c7249997436ee8c5cae04ef";
+          sha256 = "1l64rka9wrnwdgfgwv8xh7mq9f1937z2v3r82qcfi6il3anw4zm0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php-auto-yasnippets";
+          sha256 = "1hhddvpc80b6wvjpbpibsf24rp5a5p45m0bg7m0c8mx181h9mqgn";
+          name = "php-auto-yasnippets";
+        };
+        packageRequires = [ php-mode yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/php-auto-yasnippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    php-boris = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "php-boris";
+        version = "20130527.321";
+        src = fetchFromGitHub {
+          owner = "tomterl";
+          repo = "php-boris";
+          rev = "d2caaba8f42375b47389240c647c03c2a305d3fb";
+          sha256 = "10lzbyr7z95mynz885k75n2ibsy92dh3mg3s5m69n03jnf9gv1jy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php-boris";
+          sha256 = "19yfbrlfqikix2lnnlbpzm6yakjhl84ix0zra2ycpvgg2pl88r0g";
+          name = "php-boris";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/php-boris";
+          license = lib.licenses.free;
+        };
+      }) {};
+    php-boris-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, highlight, lib, melpaBuild, php-boris }:
+    melpaBuild {
+        pname = "php-boris-minor-mode";
+        version = "20140209.1235";
+        src = fetchFromGitHub {
+          owner = "steckerhalter";
+          repo = "php-boris-minor-mode";
+          rev = "c70e176dd6545f2d42ca3427e87b469635616d8a";
+          sha256 = "1wk7vq80v97psxfg0pwy4mc6kdc61gm6h1vgl9p71ii6g6zvzcqg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php-boris-minor-mode";
+          sha256 = "1cmpd303chldss7kylpinv8qc3c78srz02a9cp9x79c8arq7apwl";
+          name = "php-boris-minor-mode";
+        };
+        packageRequires = [ highlight php-boris ];
+        meta = {
+          homepage = "http://melpa.org/#/php-boris-minor-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    php-eldoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "php-eldoc";
+        version = "20140202.1341";
+        src = fetchFromGitHub {
+          owner = "sabof";
+          repo = "php-eldoc";
+          rev = "df05064146b884d9081e10657e32dc480f070cfe";
+          sha256 = "0hm6myvf91f4d2yfc7fs2xky9m8hfnimx1gkfzmn9f5pcc2l2p0i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php-eldoc";
+          sha256 = "1q5fkl8crqrgxik2mxbkqv10qnqhqrazd66rgfw797s3jcchv58j";
+          name = "php-eldoc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/php-eldoc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    php-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "php-mode";
+        version = "20151002.2230";
+        src = fetchFromGitHub {
+          owner = "ejmr";
+          repo = "php-mode";
+          rev = "9b1e7736ce014f26f40635af3c781127a5e32dfa";
+          sha256 = "0206jv7rz9gm016lpfdwh2l0z6da25szc6hfxgcz2qvkzjpvrlr6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php-mode";
+          sha256 = "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y";
+          name = "php-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/php-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    php-plus--mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "php-plus--mode";
+        version = "20121129.1452";
+        src = fetchFromGitHub {
+          owner = "echosa";
+          repo = "phpplus-mode";
+          rev = "e66950502e7c9a9cd39c9a619ad66fc54c12aafa";
+          sha256 = "0f1n0jcla157ngqshq5n8iws216ar63ynjd6743cbdrzj0v030wg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php+-mode";
+          sha256 = "1ibcsky6la3l7gawpgx814w1acjf73b68i6wbb4p6saxhwg6adik";
+          name = "php-plus--mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/php+-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    php-refactor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "php-refactor-mode";
+        version = "20140920.1611";
+        src = fetchFromGitHub {
+          owner = "keelerm84";
+          repo = "php-refactor-mode.el";
+          rev = "9010e5e8dde2ad3a2c7a65ff1752b5482dfd4f61";
+          sha256 = "163albjkq7ldc9fki368540m7nl58qa70wfpff08gx3gsvywfnyi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php-refactor-mode";
+          sha256 = "0gj0nv6ii7pya0hcxs8haz5pahj0sa12c2ls53c3j85in645zb3s";
+          name = "php-refactor-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/php-refactor-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    phpcbf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "phpcbf";
+        version = "20150302.728";
+        src = fetchFromGitHub {
+          owner = "nishimaki10";
+          repo = "emacs-phpcbf";
+          rev = "b556b548ceb061b002389d6165d2cc63d8bddb5d";
+          sha256 = "09rinyx0621d7613xmbyvrrlav6d4ia332wkgg0m9dn265g3h56z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phpcbf";
+          sha256 = "1hf88ys4grffpqgavrbc72dn3m7crafgid2ygzx9c5j55syh8mfv";
+          name = "phpcbf";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "http://melpa.org/#/phpcbf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    phpunit = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
+    melpaBuild {
+        pname = "phpunit";
+        version = "20151009.454";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "phpunit.el";
+          rev = "1ea2aa7901b5d0b1878d6e104ca92de2bbd7313f";
+          sha256 = "1zghw5nfm4a9j98vsaw4fc8r4f98s5fhgvgbnbyyxapl851fa9i6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phpunit";
+          sha256 = "0nj8ss1yjkcqnbnn4jgbp0403ljjk2xhipzikdrl3dbxlf14i4f8";
+          name = "phpunit";
+        };
+        packageRequires = [ f pkg-info s ];
+        meta = {
+          homepage = "http://melpa.org/#/phpunit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pianobar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pianobar";
+        version = "20120128.1501";
+        src = fetchFromGitHub {
+          owner = "agrif";
+          repo = "pianobar.el";
+          rev = "9193e3888a8097dbe7ee58e4658cc6ec2a76b160";
+          sha256 = "053jqzl0sp3dnl4919vi30xqrdcpi9jsqx5hndj1bprf7926w11d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pianobar";
+          sha256 = "16vsf2cig9qjbh9s58zb5byjmyghxbsxpzpm5hyyrv251jap1jjn";
+          name = "pianobar";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pianobar";
+          license = lib.licenses.free;
+        };
+      }) {};
+    picolisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "picolisp-mode";
+        version = "20150516.355";
+        src = fetchFromGitHub {
+          owner = "flexibeast";
+          repo = "picolisp-mode";
+          rev = "1a537b14090813f46cbba54636d40365e1a8067e";
+          sha256 = "0p91ysyjksbravnw3l78mshay6swgb5k1zi5bbppppk8zkmdp115";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/picolisp-mode";
+          sha256 = "1n56knbapyfs8n23arzlz27y0q4846r64krwlwh8agfqkcdw9dp5";
+          name = "picolisp-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/picolisp-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pig-mode";
+        version = "20140617.1258";
+        src = fetchFromGitHub {
+          owner = "motus";
+          repo = "pig-mode";
+          rev = "af4200c88a50264b63fa162a02860f3f54c8755b";
+          sha256 = "1yg9n265ljdjlh6a3jrjwyvj3f76wp68x25bl0p8dxrrsyr9kvfx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pig-mode";
+          sha256 = "0gmvc4rrqkn0cx8fk1sxk6phfbpf8dcba3k6i24k3idcx8rxsw3x";
+          name = "pig-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pig-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pig-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "pig-snippets";
+        version = "20130913.124";
+        src = fetchFromGitHub {
+          owner = "motus";
+          repo = "pig-mode";
+          rev = "af4200c88a50264b63fa162a02860f3f54c8755b";
+          sha256 = "1yg9n265ljdjlh6a3jrjwyvj3f76wp68x25bl0p8dxrrsyr9kvfx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pig-snippets";
+          sha256 = "1sqi0a2dsqgmabkrncxiyrhibyryyy25d11b15ybhlngd05wqbx2";
+          name = "pig-snippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/pig-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pillar = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }:
+    melpaBuild {
+        pname = "pillar";
+        version = "20141112.1211";
+        src = fetchFromGitHub {
+          owner = "pillar-markup";
+          repo = "pillar-mode";
+          rev = "13a7f676544cc66005ccd8e6fc1c25e4ccd6f909";
+          sha256 = "19i8hgzr7kdj4skf0cnv6vlsklq9qcyxcv3p33k9vgq7y4f9mah8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pillar";
+          sha256 = "1lklky3shyvm1iygp621hbldpx37m0a9vd5l6mxs4y60ksj6z0js";
+          name = "pillar";
+        };
+        packageRequires = [ makey ];
+        meta = {
+          homepage = "http://melpa.org/#/pillar";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pinboard-api = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pinboard-api";
+        version = "20140324.648";
+        src = fetchFromGitHub {
+          owner = "danieroux";
+          repo = "pinboard-api-el";
+          rev = "b7b5214d0c35178f8dca08cf22d6ef3c21f0fce4";
+          sha256 = "0wy9c37g6m5khchlp8qvfnjgkwq4r38659adcm5prvzjgzqhlfja";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pinboard-api";
+          sha256 = "0yzvgnpkj2fhl01id36nc5pj8vyb05bllraiz3lwwcc66y98h9n0";
+          name = "pinboard-api";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pinboard-api";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pinot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pinot";
+        version = "20140211.1426";
+        src = fetchFromGitHub {
+          owner = "tkf";
+          repo = "emacs-pinot-search";
+          rev = "67fda555a155b22bb2ce44ba618b4bd6fc5f144a";
+          sha256 = "1wc31r5fpcia4n4vbpg7vv3rzrnjzh18yygi3kp4wvl2wzx2azqh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pinot";
+          sha256 = "1kjzq02pddnkia637xz2mnjjyglyh6qzragnf7nnxbw9ayiim58i";
+          name = "pinot";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pinot";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pinyin-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pinyin-search";
+        version = "20150719.1955";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "pinyin-search.el";
+          rev = "53e75c2e32c03920dcc10334c7b62922779f2c8b";
+          sha256 = "096izagfjw8cnxjq3v70x8a55npyxnr40mg1fc9b1jnqw6qwf491";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pinyin-search";
+          sha256 = "1si693nmmxgg0kp5mxvj5nq946kfc5cv3wfsl4znbqzps8qb2b7z";
+          name = "pinyin-search";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pinyin-search";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pip-requirements = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pip-requirements";
+        version = "20150423.1558";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "pip-requirements.el";
+          rev = "f8d3ecaee9090cee267476d4551c905c412d6017";
+          sha256 = "05ix3xwqhnxjvc6cr006hhcgzhrp88jz9x4iswb0sidwysidpgnx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pip-requirements";
+          sha256 = "1wsjfyqga7pzp8gsm5x53qrkn40srairbjpifyrqbi2fpzmwhrnz";
+          name = "pip-requirements";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/pip-requirements";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pivotal-tracker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pivotal-tracker";
+        version = "20151203.1350";
+        src = fetchFromGitHub {
+          owner = "jxa";
+          repo = "pivotal-tracker";
+          rev = "93f2b45b373bf6972dcc4b16814ef23e1a6c16f5";
+          sha256 = "1sbwqrk9nciqwm53sfbq3nr9f9zzpz79dmxs8yp005dk7accdlls";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pivotal-tracker";
+          sha256 = "195wcfn434yp0p93zqih1snkkg1v7nxgb4gn0klajahmyrrjq2a2";
+          name = "pivotal-tracker";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pivotal-tracker";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pixie-mode = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, inf-clojure, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pixie-mode";
+        version = "20150121.2324";
+        src = fetchFromGitHub {
+          owner = "johnwalker";
+          repo = "pixie-mode";
+          rev = "f32d5d812c7b5b72d7ff7bad52b41035f9ef6e96";
+          sha256 = "0nnvf2p593gn8sbyrvczyll030xgnkxn900a2hy7ia7xh0wmvddp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pixie-mode";
+          sha256 = "16z15yh78837k548xk5widdmy6fv03vym6q54i40knmgf5cllsl8";
+          name = "pixie-mode";
+        };
+        packageRequires = [ clojure-mode inf-clojure ];
+        meta = {
+          homepage = "http://melpa.org/#/pixie-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pixiv-novel-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pixiv-novel-mode";
+        version = "20150110.54";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "pixiv-novel-mode.el";
+          rev = "65809cf31816257d8c6c92868af6c30abf7b2043";
+          sha256 = "14gn2qd72x3zfqzh2cngxcjpdiibyki1g4d1vdav5v9vcbglgm5d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pixiv-novel-mode";
+          sha256 = "0f1rxvf9nrw984122i6dzsgik9axfjv6yscmg203s065n9lz17px";
+          name = "pixiv-novel-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pixiv-novel-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pkg-info = callPackage ({ epl, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pkg-info";
+        version = "20150517.643";
+        src = fetchFromGitHub {
+          owner = "lunaryorn";
+          repo = "pkg-info.el";
+          rev = "4dbe328c9eced79e0004e3fdcd7bfb997a928be5";
+          sha256 = "1xkdbyhz9mgdz5zmjm4hh050klsl12w5lkckw2l77ihcxv0vjnf2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pkg-info";
+          sha256 = "0whcvralk76mfmvbvwn57va5dkb1irj7iwffgddi7r0ima49iszx";
+          name = "pkg-info";
+        };
+        packageRequires = [ epl ];
+        meta = {
+          homepage = "http://melpa.org/#/pkg-info";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pkgbuild-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pkgbuild-mode";
+        version = "20151010.936";
+        src = fetchFromGitHub {
+          owner = "juergenhoetzel";
+          repo = "pkgbuild-mode";
+          rev = "7369ab3c6b59cfdf2ecd2b32ad96ce006e766fa0";
+          sha256 = "077vp3fxwxj7b98ydw6iyi391w3acp73qwk6615yqdylpp66m750";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pkgbuild-mode";
+          sha256 = "1lp7frjahcpr4xnzxz77qj5hbpxbxm2g28apkixrnc1xjha66v3x";
+          name = "pkgbuild-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pkgbuild-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    plan9-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "plan9-theme";
+        version = "20160111.2123";
+        src = fetchFromGitHub {
+          owner = "john2x";
+          repo = "plan9-theme.el";
+          rev = "b32f6ae1dcc0ec2ba73d8250f36e331dd633600e";
+          sha256 = "0rpiyp95k14fsc5hdbnj4hs3snh0vm8a2skcplsdwkmb5j9547w1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plan9-theme";
+          sha256 = "0bvr877mc79s1shr82b33ipspz09jzc3809c6pkbw0jqpfid44cc";
+          name = "plan9-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/plan9-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    planet-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "planet-theme";
+        version = "20150627.951";
+        src = fetchFromGitHub {
+          owner = "cmack";
+          repo = "emacs-planet-theme";
+          rev = "e2bd6645535a3044fceafb1ce5d296cc111d5f2a";
+          sha256 = "0q4zdw58yawqp9rhx04lhq0v7iaf61ydbw19gpw4an85j2hxrkzq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/planet-theme";
+          sha256 = "1mhbydvk7brmkgmij5gpp6l9ixcyh1g3r4fw3kpq8nvgbwknsqc9";
+          name = "planet-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/planet-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    plantuml-mode = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "plantuml-mode";
+        version = "20131031.1832";
+        src = fetchFromGitHub {
+          owner = "wildsoul";
+          repo = "plantuml-mode";
+          rev = "4bc4cdf7974c8b8956b848ef69f1a2b5767597aa";
+          sha256 = "0jvs051ncpv7pwx2kr14fm1wqakabwc031xcv7lba0mx7shxzqdg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plantuml-mode";
+          sha256 = "0fg313mx9jz92lf9lr5apvma9ixfz02dvyzw1phsgzawi7hai264";
+          name = "plantuml-mode";
+        };
+        packageRequires = [ auto-complete ];
+        meta = {
+          homepage = "http://melpa.org/#/plantuml-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    platformio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+    melpaBuild {
+        pname = "platformio-mode";
+        version = "20160109.2235";
+        src = fetchFromGitHub {
+          owner = "zachmassia";
+          repo = "platformio-mode";
+          rev = "6d12f34548f93dec3c6fe40843d87a8a67ec25c7";
+          sha256 = "1k3bqv5y2xp1jl2hpf8qhs11yzhcl8k40fxqjzv7mvc0ysq9y6wb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/platformio-mode";
+          sha256 = "022l20sfyfkvp6kmmqxr7gcmcdx6b1dgsakjjnx8fknrpxr5kyps";
+          name = "platformio-mode";
+        };
+        packageRequires = [ projectile ];
+        meta = {
+          homepage = "http://melpa.org/#/platformio-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    plenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "plenv";
+        version = "20130707.116";
+        src = fetchFromGitHub {
+          owner = "karupanerura";
+          repo = "plenv.el";
+          rev = "ee937d0f3a1a7ba2d035f45be896d3ed8fefaee2";
+          sha256 = "11cbpgjsnw8fiqf1s12hbm9qxgjcw6y2zxx7wz4wg7idmi7m0b7g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plenv";
+          sha256 = "0dw9fy5wd9wm76ag6yyw3f9jnlj7rcdcxgdjm30h514qfi9hxbw4";
+          name = "plenv";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/plenv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    plim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "plim-mode";
+        version = "20140812.1913";
+        src = fetchFromGitHub {
+          owner = "dongweiming";
+          repo = "plim-mode";
+          rev = "92e39190286f172567ceb02c80e1df3b81abfa2d";
+          sha256 = "07hspp4bkb3f5dm0l1arm0w1m04cq4glg81x4a9kf7bl601wzki2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plim-mode";
+          sha256 = "0247fpvxki5jhxw6swv7pcw0qwxrqnp75acnfss2lf984vggzhxi";
+          name = "plim-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/plim-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    plsense = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
+    melpaBuild {
+        pname = "plsense";
+        version = "20151104.845";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "emacs-plsense";
+          rev = "d50f9dccc98f42bdb42f1d1c8142246e03879218";
+          sha256 = "1r2yxa7gqr0z9fwhx38siwjpg73a93rdmnhr4h6nm6lr32vviyxm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plsense";
+          sha256 = "1ka06r4ashhjkfyzql9mfvs3gj7n684h4gaycj29w4nfqrhcw9va";
+          name = "plsense";
+        };
+        packageRequires = [ auto-complete log4e yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/plsense";
+          license = lib.licenses.free;
+        };
+      }) {};
+    plsense-direx = callPackage ({ direx, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, plsense, yaxception }:
+    melpaBuild {
+        pname = "plsense-direx";
+        version = "20140520.1508";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "plsense-direx";
+          rev = "8a2f465264c74e04524cc789cdad0190ace43f6c";
+          sha256 = "0s34nbqqy6aqi113xj452pbmqp43046wfbfbbfv1xwhybgq0c1j1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plsense-direx";
+          sha256 = "0qd4b7gkmn5ydadhp70995rap3643s1aa8gfi5izgllzhg0i864j";
+          name = "plsense-direx";
+        };
+        packageRequires = [ direx log4e plsense yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/plsense-direx";
+          license = lib.licenses.free;
+        };
+      }) {};
+    plsql = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "plsql";
+        version = "20121115.443";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/plsql.el";
+          sha256 = "1v0wvy9fd1qq3aq83x5jv3953n0n51x7y2r2ql11j0h8xasy42p1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plsql";
+          sha256 = "1jvppmfdll34b8dav5dvbabfxiapv92p7lciblj59a707bbdb7l1";
+          name = "plsql";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/plsql";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pmdm = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "pmdm";
+        version = "20151109.1236";
+        src = fetchhg {
+          url = "https://bitbucket.com/inigoserna/pmdm.el";
+          rev = "f50a54774156";
+          sha256 = "0x3s9fj41n6a21la762qm1si9ysv3zj5bbp6ykfskr73sxq6s9ff";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pmdm";
+          sha256 = "1zmy6cbnqhsbwc5vx30mx45xn88d2186hgrl75ws7vvbl197j03b";
+          name = "pmdm";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pmdm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    point-stack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "point-stack";
+        version = "20140102.1423";
+        src = fetchFromGitHub {
+          owner = "mattharrison";
+          repo = "point-stack";
+          rev = "2d2a5e90988792cf49ba4c5a839ef6a1400f5a24";
+          sha256 = "1p1j2kfwj7gzir7q5ls34k8764kwbnb6d0dhlw4zb4kvwlidp6c1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/point-stack";
+          sha256 = "17z9mc49x4092axs7lq6b6z7yrrhkl8bdx5f8gq6qy5lampgyzch";
+          name = "point-stack";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/point-stack";
+          license = lib.licenses.free;
+        };
+      }) {};
+    point-undo = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "point-undo";
+        version = "20100504.329";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/point-undo.el";
+          sha256 = "13c1iw77ccvrfrv4lyljg8fpm7xqhnv29yzvig8wr8b5j2vsd8bz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/point-undo";
+          sha256 = "0by7ifj1lf0w9pp7v1j9liqjs40k8kk9yjnznxchq172816zbg3k";
+          name = "point-undo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/point-undo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pointback = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pointback";
+        version = "20100210.952";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "pointback";
+          rev = "e3a02c1784d81b5a1d2477338d049af581ed19f8";
+          sha256 = "016cjy5pnnqccjqb0njqc9jq6kf6p165nlki83b8c0sj75yxghav";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pointback";
+          sha256 = "198q511hixvzc13b3ih89xs9g47rdvbiixn5baqakpmpx3a12hz4";
+          name = "pointback";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pointback";
+          license = lib.licenses.free;
+        };
+      }) {};
+    polymode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "polymode";
+        version = "20151216.733";
+        src = fetchFromGitHub {
+          owner = "vitoshka";
+          repo = "polymode";
+          rev = "af589492a49b4703d390a7a91b281cf0d10d91a7";
+          sha256 = "0dlgmp1vmpvfjx19jz52xjmpg0fi1d0gy3zz7rsyjdkdw8dmr1v6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/polymode";
+          sha256 = "0ndavaan7k55l3ghm5h08i0slmmzc82c0gl4b8w91fa8bi2lq4h4";
+          name = "polymode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/polymode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pomodoro = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pomodoro";
+        version = "20150716.1246";
+        src = fetchFromGitHub {
+          owner = "baudtack";
+          repo = "pomodoro.el";
+          rev = "4a299b8f5e6623010224dcb3e524ff288c6a082c";
+          sha256 = "1dlk0ypw8316vgvb7z2p7fvaiz1wcy1l8crixypaya1zdsnh9v1z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pomodoro";
+          sha256 = "075sbypas8xlhsw8wg3mgi3fn5yf7xb3klyjgyy8wfkgdz0269f8";
+          name = "pomodoro";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pomodoro";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pony-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pony-mode";
+        version = "20151028.502";
+        src = fetchFromGitHub {
+          owner = "davidmiller";
+          repo = "pony-mode";
+          rev = "d319b0317bfbdac12d28cfd83abe31cc35f3cdd7";
+          sha256 = "1g1yw0ykwswl9dnicyi7kxskqqry40wjykshgrqhs4k09j3jnacr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pony-mode";
+          sha256 = "1hgiryhpxv30bjlgv9pywzqn2ypimwzdhx03znqvn56zrwn1frnl";
+          name = "pony-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pony-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ponylang-mode";
+        version = "20160116.845";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "ponylang-mode";
+          rev = "f7349f5d74cc3aa408f4cd826258653ef56701be";
+          sha256 = "1jza1gprf21kmy8ysfg8iqz450c0gp3lbnp27gszwv8cn279x3rp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ponylang-mode";
+          sha256 = "06fy4aiflsynnybbrahfcmg0swxrfnwn48gr8ly3sqfpc037h2f3";
+          name = "ponylang-mode";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/ponylang-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pophint = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, popup, yaxception }:
+    melpaBuild {
+        pname = "pophint";
+        version = "20150930.1234";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "emacs-pophint";
+          rev = "fc02a155e28ae27466bedabc756e75c936b01266";
+          sha256 = "0n1w1adglbavqgrv16rzhym72c3q083mh0c8yl5lj7adn4nr4gr3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pophint";
+          sha256 = "1chq2j79hg095jxw5z3pz4qicqrccw0gj4sxrin0a55hnprzzp72";
+          name = "pophint";
+        };
+        packageRequires = [ log4e popup yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/pophint";
+          license = lib.licenses.free;
+        };
+      }) {};
+    poporg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "poporg";
+        version = "20150603.2047";
+        src = fetchFromGitHub {
+          owner = "QBobWatson";
+          repo = "poporg";
+          rev = "d4d8b3e6206b0af4044d1dcecfc0bd2193704e07";
+          sha256 = "0ja1kq4pl62zxlzwv2m8zzb55lg2fl366bi9pzvxl38frvbqg8qx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/poporg";
+          sha256 = "08s42689kd78h2fmw230ja5dd3c3b4lx5mzadncwq0lj91y86kd8";
+          name = "poporg";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/poporg";
+          license = lib.licenses.free;
+        };
+      }) {};
+    popup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "popup";
+        version = "20151222.1539";
+        src = fetchFromGitHub {
+          owner = "auto-complete";
+          repo = "popup-el";
+          rev = "004d58c47f6406b6555cf112f8a6eed6114cb63b";
+          sha256 = "19sbdxs6l66nflfb4kmx4lb6z0shwpfq79b5h9hhi0xr70xacd4b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popup";
+          sha256 = "151g00h9rkid76qf6c53n8bncsfaikmhj8fqcb3r3a6mbngcd5k2";
+          name = "popup";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/popup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    popup-complete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "popup-complete";
+        version = "20141108.2108";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-popup-complete";
+          rev = "caa655a6d8472e9a4bfa1311126d90d7d1b07fca";
+          sha256 = "1q9zajv6g7mi6k98kzq3498nhmdkp1z9d2b8vgzbk7745d39gm9b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popup-complete";
+          sha256 = "04bpm31zx87j390r2xi1yl4kyqgalmyqc48xarsm67zfww9fw9c1";
+          name = "popup-complete";
+        };
+        packageRequires = [ popup ];
+        meta = {
+          homepage = "http://melpa.org/#/popup-complete";
+          license = lib.licenses.free;
+        };
+      }) {};
+    popup-imenu = callPackage ({ dash, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "popup-imenu";
+        version = "20160108.923";
+        src = fetchFromGitHub {
+          owner = "ancane";
+          repo = "popup-imenu";
+          rev = "81a47cb6ffa5082fcb1165835040228057474c48";
+          sha256 = "0fvj61n0kriniz1v96lxbdb9x6gbx00xwkcg83ajqv7f18j3m6wh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popup-imenu";
+          sha256 = "0lxwfaa9vhdn55dj3idp8c3fg1g26qsqq46y5bimfd0s89bjbaxn";
+          name = "popup-imenu";
+        };
+        packageRequires = [ dash flx-ido popup ];
+        meta = {
+          homepage = "http://melpa.org/#/popup-imenu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    popup-kill-ring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
+    melpaBuild {
+        pname = "popup-kill-ring";
+        version = "20131020.1354";
+        src = fetchFromGitHub {
+          owner = "waymondo";
+          repo = "popup-kill-ring";
+          rev = "5773dfadc104a906c088a3ec62e8cdd3e01e57fa";
+          sha256 = "1zdwlmk3vr0mq0dxrnkqjncalnbmvpxc0lma2sv3a4czl8yv0inn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popup-kill-ring";
+          sha256 = "1jfw669xi2983jj3hiw5lyhc0rc0318qrmqx03f7m4ylg70dgxip";
+          name = "popup-kill-ring";
+        };
+        packageRequires = [ popup pos-tip ];
+        meta = {
+          homepage = "http://melpa.org/#/popup-kill-ring";
+          license = lib.licenses.free;
+        };
+      }) {};
+    popup-switcher = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "popup-switcher";
+        version = "20160112.217";
+        src = fetchFromGitHub {
+          owner = "kostafey";
+          repo = "popup-switcher";
+          rev = "a5de386b6fa0b8bbc2a58b7af36be9d32abe7ca9";
+          sha256 = "00qyc5kixb2y1a5rrylq2ln470ny3mihx07ybdim8s8q29dzajy6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popup-switcher";
+          sha256 = "1888xiqhrn7fcpjnr3smchmmqwfayfbbyvdkdb79c6drzjcvidp1";
+          name = "popup-switcher";
+        };
+        packageRequires = [ cl-lib popup ];
+        meta = {
+          homepage = "http://melpa.org/#/popup-switcher";
+          license = lib.licenses.free;
+        };
+      }) {};
+    popwin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "popwin";
+        version = "20150315.800";
+        src = fetchFromGitHub {
+          owner = "m2ym";
+          repo = "popwin-el";
+          rev = "95dea14c60019d6cccf9a3b33e0dec4e1f22c304";
+          sha256 = "0nips9npm4zmz3f37vvb4s0g1ci0p9cl6w0z4sc6agg4rybjhpdp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popwin";
+          sha256 = "1zp54nv8rh0b3g8y5aj4793miiw2r1ijwbzq31lkwmbdr09mixmf";
+          name = "popwin";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/popwin";
+          license = lib.licenses.free;
+        };
+      }) {};
+    portage-navi = callPackage ({ concurrent, ctable, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "portage-navi";
+        version = "20141208.755";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-portage-navi";
+          rev = "8016c3e99fe6cef101d479a3d69185796b22ca2f";
+          sha256 = "1pm4x74pw67m2izr9dir201dn5g9icgk6h2j8rqvasgx8v8krv3i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/portage-navi";
+          sha256 = "1wjkh8xj5120v9fz1nrpkd6x4f22ni8h2lfkd82df7kjz6bzdfwg";
+          name = "portage-navi";
+        };
+        packageRequires = [ concurrent ctable ];
+        meta = {
+          homepage = "http://melpa.org/#/portage-navi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pos-tip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pos-tip";
+        version = "20150318.1013";
+        src = fetchFromGitHub {
+          owner = "pitkali";
+          repo = "pos-tip";
+          rev = "051e08fec5cf30b7574bdf439f79fef7d42d689d";
+          sha256 = "168hl76rhj6f5ncmrij4rd3z55228h6kb23384h2phsjw0avgf23";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pos-tip";
+          sha256 = "13qjz112qlrnq34lr70087gshzq8m44knfl6694hfprzjgix84vh";
+          name = "pos-tip";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pos-tip";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pow = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pow";
+        version = "20140420.306";
+        src = fetchFromGitHub {
+          owner = "yukihr";
+          repo = "emacs-pow";
+          rev = "7c0b39a07069d8b0f6b21adf3b4e462944641ad9";
+          sha256 = "1jzqav2lchr0ggckjq9rwlxwryi7m7xnmn8471zgiamd1h04ddqf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pow";
+          sha256 = "05wc4ylp0xjqbzrm046lcsv4aw2a6s2rfv1ra38bfr0dai6qrsrn";
+          name = "pow";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/pow";
+          license = lib.licenses.free;
+        };
+      }) {};
+    powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "powerline";
+        version = "20151008.1649";
+        src = fetchFromGitHub {
+          owner = "milkypostman";
+          repo = "powerline";
+          rev = "e886f6fe46c7413befb1de3799a185366fd8b39c";
+          sha256 = "0dq7fqlv72p72hbshzbwz5k40mqfdw10v9hsd1m18s2rf7082570";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/powerline";
+          sha256 = "0gsffr6ilmckrzifsmhwd42vr85vs42pc26f1205pbxb7ma34dhx";
+          name = "powerline";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/powerline";
+          license = lib.licenses.free;
+        };
+      }) {};
+    powerline-evil = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
+    melpaBuild {
+        pname = "powerline-evil";
+        version = "20151112.910";
+        src = fetchFromGitHub {
+          owner = "raugturi";
+          repo = "powerline-evil";
+          rev = "98b3a102b6dba6632aa0755a7257300c9b164309";
+          sha256 = "1c8y4r7zdr6764kzs5bc64idv2pfjvi78lg2f1d2hp1595ia8y5r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/powerline-evil";
+          sha256 = "0cdnmq9f06lzkj0hs948a7j5sgg6fl5f36bfnyaxgss23akbfjhr";
+          name = "powerline-evil";
+        };
+        packageRequires = [ evil powerline ];
+        meta = {
+          homepage = "http://melpa.org/#/powerline-evil";
+          license = lib.licenses.free;
+        };
+      }) {};
+    powershell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "powershell";
+        version = "20160101.2018";
+        src = fetchFromGitHub {
+          owner = "jschaf";
+          repo = "powershell.el";
+          rev = "348560747fb4e0f47475be0fb3a11ad576d364fe";
+          sha256 = "0fi8a3l64brljmlbk5j65vj3n5x1ygi07fxvxq5xllbzg0h8x4hc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/powershell";
+          sha256 = "162k8y9k2n48whaq93sqk86zy3p9qvsfxgyfv9n1nvk4l5wn70wk";
+          name = "powershell";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/powershell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pp-c-l = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "pp-c-l";
+        version = "20151231.1747";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/pp-c-l.el";
+          sha256 = "10gsdjdr8qngimqh57qxcljjnypbf38asxqb3zlfwc2ls52fc19q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pp-c-l";
+          sha256 = "0gbqxlrsh9lcdkrj8bqh1mpxyhdlwbaxz4ndp5s90inmisaqb83v";
+          name = "pp-c-l";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pp-c-l";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pp-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "pp-plus";
+        version = "20151231.1746";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/pp+.el";
+          sha256 = "0zlmcrg8gx812gm04cil7p2z0g4814c158yv1ghmrbxshn8p45fg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pp+";
+          sha256 = "1ng5x7dp85y6yqj6q43h08qdnapg2j1ab8rmc47w4w79d1pryniq";
+          name = "pp-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pp+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ppd-sr-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, project-persist-drawer, sr-speedbar }:
+    melpaBuild {
+        pname = "ppd-sr-speedbar";
+        version = "20151108.624";
+        src = fetchFromGitHub {
+          owner = "rdallasgray";
+          repo = "ppd-sr-speedbar";
+          rev = "19d3e924407f40a6bb38c8fe427a159af755adce";
+          sha256 = "0pv671j8g09pn61kkfb3pa9axfa9zd2jdrkgr81rm2gqb2vh1hsq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ppd-sr-speedbar";
+          sha256 = "1m2918hqvb9c6rgb5szs95ds99gdjdxggcbdfqzmbb5sz2936av8";
+          name = "ppd-sr-speedbar";
+        };
+        packageRequires = [ project-persist-drawer sr-speedbar ];
+        meta = {
+          homepage = "http://melpa.org/#/ppd-sr-speedbar";
+          license = lib.licenses.free;
+        };
+      }) {};
+    preproc-font-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "preproc-font-lock";
+        version = "20151107.1418";
+        src = fetchFromGitHub {
+          owner = "Lindydancer";
+          repo = "preproc-font-lock";
+          rev = "565fda9f5fdeb0598986174a07e9fb09f7604397";
+          sha256 = "0yrfd9qaz16nqcvjyjm9qci526qgkv6k51q5752h3iyqkxnss1pd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/preproc-font-lock";
+          sha256 = "1ra0lgjv6713zym2h8pblf2ryf0f658l1khbxbwnxl023gkyj9v4";
+          name = "preproc-font-lock";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/preproc-font-lock";
+          license = lib.licenses.free;
+        };
+      }) {};
+    preseed-generic-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "preseed-generic-mode";
+        version = "20150119.1441";
+        src = fetchFromGitHub {
+          owner = "suntong001";
+          repo = "preseed-generic-mode";
+          rev = "19bce980d41607bef8af4b1901343abfca0f0855";
+          sha256 = "1dyi9nc2q43jf87xiz9xw42irrbla2vyixifdiibh6nm9misnfj0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/preseed-generic-mode";
+          sha256 = "0c0zs07lspwczbcba56fai0rshjzx9zd3jqxgj9nwjf9xlcr8m3j";
+          name = "preseed-generic-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/preseed-generic-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pretty-lambdada = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "pretty-lambdada";
+        version = "20151231.1748";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/pretty-lambdada.el";
+          sha256 = "1fn24399wsn12453py0hw2vbbkrkakiwi06cjvjzsdk7g3326ma4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pretty-lambdada";
+          sha256 = "16v5fgifz672c37xyzv557mm6za4rldvdrb26vdymxqg4fy62fd6";
+          name = "pretty-lambdada";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pretty-lambdada";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pretty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pretty-mode";
+        version = "20141207.1352";
+        src = fetchFromGitHub {
+          owner = "akatov";
+          repo = "pretty-mode";
+          rev = "3e0b88d3db20f89fda2cdce3f54371728dcfd05b";
+          sha256 = "0ccqym98c6zdyrparj5n97bpp9rspxb3z5lqfcrjypp0kn04z1ss";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pretty-mode";
+          sha256 = "1zxi4nj7vnchiiz1ndx17b719a1wipiqniykzn4pa1w7dsnqg21f";
+          name = "pretty-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pretty-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pretty-sha-path = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pretty-sha-path";
+        version = "20141105.1226";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "pretty-sha-path.el";
+          rev = "a2b43dd9de423a38d67cda2e3bd9412f7d363257";
+          sha256 = "1n0594msgy53ia58gjfkm3z3cnmq52wrq5992fm28s4jgazbgdfd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pretty-sha-path";
+          sha256 = "0qqsg383391dnsk46xm8plq7xmdmnis3iv7h7dmchpzd99bkm9lq";
+          name = "pretty-sha-path";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pretty-sha-path";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pretty-symbols = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pretty-symbols";
+        version = "20140814.459";
+        src = fetchFromGitHub {
+          owner = "drothlis";
+          repo = "pretty-symbols";
+          rev = "582cbe51ecfe1cc0a5b185bc06113c8a661e3956";
+          sha256 = "1f00l9f6an1mh8yhf629mw0p37m4jcpl8giz47xbdyw1k6bqn830";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pretty-symbols";
+          sha256 = "0d1ad2x4md0n3fad3s2355wm8hl311qdhih1gkdqwdaj4i1d6gvb";
+          name = "pretty-symbols";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pretty-symbols";
+          license = lib.licenses.free;
+        };
+      }) {};
+    private = callPackage ({ aes, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "private";
+        version = "20150121.1957";
+        src = fetchFromGitHub {
+          owner = "cheunghy";
+          repo = "private";
+          rev = "9266d01c095895cc3ee9de95bc20511e88353755";
+          sha256 = "0zng64f5vwnpkf9fk59yv1ndc646q608a6awr1y9qk0mhzbfzhqm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/private";
+          sha256 = "1glpcwcyndyn683q9mg99hr0h3l8pz7rrhbnfak01v826d5cnk9g";
+          name = "private";
+        };
+        packageRequires = [ aes ];
+        meta = {
+          homepage = "http://melpa.org/#/private";
+          license = lib.licenses.free;
+        };
+      }) {};
+    private-diary = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "private-diary";
+        version = "20151216.1057";
+        src = fetchFromGitHub {
+          owner = "cacology";
+          repo = "private-diary";
+          rev = "0c86fb6150ad8ed14f94def3504f5a68f4147283";
+          sha256 = "1pxr5a9ik09k0f58lawhxiv179n5j8q24zhrs9vjk93yskl1ydwn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/private-diary";
+          sha256 = "0dgnf375c00nlkp66kbkzsf469063l03b9miiplbhd63zshlv1i1";
+          name = "private-diary";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/private-diary";
+          license = lib.licenses.free;
+        };
+      }) {};
+    proc-net = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "proc-net";
+        version = "20130321.1912";
+        src = fetchFromGitHub {
+          owner = "nicferrier";
+          repo = "emacs-proc-net";
+          rev = "10861112a1f3994c8e6374d6c5bb5d734cfeaf73";
+          sha256 = "0nly5h0d6w8dc08ifb2fiqcn4cqcn9crkh2wn0jzlz4zd2x75qrb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/proc-net";
+          sha256 = "0562x2s3kk9vlaavak4lya1nlmn4mwlzlc7nw1l3687q023z4hmv";
+          name = "proc-net";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/proc-net";
+          license = lib.licenses.free;
+        };
+      }) {};
+    processing-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "processing-mode";
+        version = "20150217.632";
+        src = fetchFromGitHub {
+          owner = "ptrv";
+          repo = "processing2-emacs";
+          rev = "a57415e523c9c3faeef02fa62a2b749270c4cc33";
+          sha256 = "1smw786dcjvdn2j6bwqn2rfzhw039rrhxiv7vlrgzm0fyy2v1q6h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/processing-mode";
+          sha256 = "184yg9z14ighz9djg53ji5dgnb98dnxkkwx55m8f0f879x31i89m";
+          name = "processing-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/processing-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    processing-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "processing-snippets";
+        version = "20140426.928";
+        src = fetchFromGitHub {
+          owner = "ptrv";
+          repo = "processing2-emacs";
+          rev = "a57415e523c9c3faeef02fa62a2b749270c4cc33";
+          sha256 = "1smw786dcjvdn2j6bwqn2rfzhw039rrhxiv7vlrgzm0fyy2v1q6h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/processing-snippets";
+          sha256 = "09vkm9asmjz1in0f63s7bf4amifspsqf5w9pxiy5y0qvmn28fr2r";
+          name = "processing-snippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/processing-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    prodigy = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "prodigy";
+        version = "20141109.452";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "prodigy.el";
+          rev = "1f3b5a3309122bae01150738c3d8da910ffbee71";
+          sha256 = "18j0jwp8z4ff7xfiijyh09cvb14mbjfaygin2qjp6bxgx3c1mpin";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/prodigy";
+          sha256 = "032868bgy2wmb2ws48lfibs4118inpna7mmml8m7i4m4y9ll6g85";
+          name = "prodigy";
+        };
+        packageRequires = [ dash emacs f s ];
+        meta = {
+          homepage = "http://melpa.org/#/prodigy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    professional-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "professional-theme";
+        version = "20150315.600";
+        src = fetchFromGitHub {
+          owner = "juanjux";
+          repo = "emacs-professional-theme";
+          rev = "0927d1474049a193f9f366bde5eb1887b9ba20ed";
+          sha256 = "0hx7rxa3smdippcpj4j63k0r5l4wflllb0vpnwwknc9j93r7042b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/professional-theme";
+          sha256 = "1l8nisn2c124cpylyahr76hfpdim2125zrns2897p466l5wcxcx5";
+          name = "professional-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/professional-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    prognth = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "prognth";
+        version = "20130920.1259";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "prognth";
+          rev = "2f1ca4d34b1fd581163e1df122c85418137e8e62";
+          sha256 = "1szxsbk470fg3jp70r20va9hnnf4jj0mb7kxdkn6rd7ky6w34lwm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/prognth";
+          sha256 = "0hr5a3s0ij4hvn424v885z7pcs62yqm9mamw5b096hgjxgjf6ylm";
+          name = "prognth";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/prognth";
+          license = lib.licenses.free;
+        };
+      }) {};
+    programmer-dvorak = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "programmer-dvorak";
+        version = "20150426.2037";
+        src = fetchFromGitHub {
+          owner = "yangchenyun";
+          repo = "programmer-dvorak";
+          rev = "3288a8f058eca4cab390a564babbbcb17cfa0350";
+          sha256 = "1yklm43d0ppyf4simhqab6m892z4mmxs2145lzw6kpizixavcv00";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/programmer-dvorak";
+          sha256 = "1w8r35hkl6qy9a89l0m74x9q2vcc4h2hvmi3r2hqcy2ypkn5l5bv";
+          name = "programmer-dvorak";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/programmer-dvorak";
+          license = lib.licenses.free;
+        };
+      }) {};
+    project-explorer = callPackage ({ cl-lib ? null, emacs, es-lib, es-windows, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "project-explorer";
+        version = "20150503.1914";
+        src = fetchFromGitHub {
+          owner = "sabof";
+          repo = "project-explorer";
+          rev = "589a09008706f5f4ef91393dc4306eede0d15ca9";
+          sha256 = "04l4m3kxbwvyw9xy6cwakrdxxdswrrs7sya8zn6m738aawbr1mcd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-explorer";
+          sha256 = "076lzmyi1n7yrgdgyh9qinq271qk6k64x0msbzarihr3p4psrn8m";
+          name = "project-explorer";
+        };
+        packageRequires = [ cl-lib emacs es-lib es-windows ];
+        meta = {
+          homepage = "http://melpa.org/#/project-explorer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    project-local-variables = callPackage ({ fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "project-local-variables";
+        version = "20080502.1152";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/project-local-variables.el";
+          sha256 = "1bb5b6hxg3gvwf0sqwkd97nnipsmr60py0rnsfhgvizn4cj3khhw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-local-variables";
+          sha256 = "0mrf7p420rmjm8ydwc5blpxr6299pdg3sy3jwz2zz0420gkp0ihl";
+          name = "project-local-variables";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/project-local-variables";
+          license = lib.licenses.free;
+        };
+      }) {};
+    project-persist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "project-persist";
+        version = "20150519.1524";
+        src = fetchFromGitHub {
+          owner = "rdallasgray";
+          repo = "project-persist";
+          rev = "8da45c80b23b1d7499eac11a258fd7382312a304";
+          sha256 = "1fvjap0bsyw5q92q50wk8c81yv4g8nqb6jdlnarf80glwk50avrs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-persist";
+          sha256 = "0csjwj0qaw0hz2qrj8kxgxlixh2hi3aqib98vm19sr3f1b8qab24";
+          name = "project-persist";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/project-persist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    project-persist-drawer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, project-persist }:
+    melpaBuild {
+        pname = "project-persist-drawer";
+        version = "20151108.622";
+        src = fetchFromGitHub {
+          owner = "rdallasgray";
+          repo = "project-persist-drawer";
+          rev = "35bbe132a4fab6a0fec15ce6c0fd2fe6a4aa9626";
+          sha256 = "1nq320ph8fs9a197ji4mnw2xa24dld0r1nka476yvkg4azmcc9x8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-persist-drawer";
+          sha256 = "1jv2y2hcqakyvfibclzm7g4diw0bvsv3a8fa43yf19wb64jm8hdb";
+          name = "project-persist-drawer";
+        };
+        packageRequires = [ project-persist ];
+        meta = {
+          homepage = "http://melpa.org/#/project-persist-drawer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    project-root = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "project-root";
+        version = "20110206.1430";
+        src = fetchhg {
+          url = "https://bitbucket.com/piranha/project-root";
+          rev = "fcd9df2eadca";
+          sha256 = "08dd2y6hdsj1rxcqa2hnjypnn9c2z43y7z2hz0fi4vny547qybz8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-root";
+          sha256 = "0xjir204zk254y2x70k9vqwirx2ljmrikpsgn5kn170d1bxvhwmb";
+          name = "project-root";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/project-root";
+          license = lib.licenses.free;
+        };
+      }) {};
+    projectile = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
+    melpaBuild {
+        pname = "projectile";
+        version = "20160115.223";
+        src = fetchFromGitHub {
+          owner = "bbatsov";
+          repo = "projectile";
+          rev = "68f8f0c4e330e3eb2c4c140c1fbdf66ca11e45df";
+          sha256 = "09p4cgg8129lxalj5nja39a6827q973z0zdgxzi0n53xhzlsznag";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projectile";
+          sha256 = "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn";
+          name = "projectile";
+        };
+        packageRequires = [ dash pkg-info ];
+        meta = {
+          homepage = "http://melpa.org/#/projectile";
+          license = lib.licenses.free;
+        };
+      }) {};
+    projectile-codesearch = callPackage ({ codesearch, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+    melpaBuild {
+        pname = "projectile-codesearch";
+        version = "20151228.220";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "codesearch.el";
+          rev = "09cf7c4275c51a5aafe84f700abea7b48ee0c145";
+          sha256 = "0ch3naqp3ji0q4blpjfr1xbzgzxhw10h08y2akik96kk1pnkwism";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projectile-codesearch";
+          sha256 = "0jgvs9is59q45wh2a7k5sb6vj179ixqgj5dlndj9r6fh59qgrzdk";
+          name = "projectile-codesearch";
+        };
+        packageRequires = [ codesearch projectile ];
+        meta = {
+          homepage = "http://melpa.org/#/projectile-codesearch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
+    melpaBuild {
+        pname = "projectile-rails";
+        version = "20151126.1145";
+        src = fetchFromGitHub {
+          owner = "asok";
+          repo = "projectile-rails";
+          rev = "cc1698f6ba4c54b1d19e73ea7fb3276234a285c5";
+          sha256 = "0hh2hwyhdb1k7ba8vy1ys2i8qvf7sxw8a3v24m3b2cmrg3hz3hcb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projectile-rails";
+          sha256 = "0fgvignqdqh0ma91z9385782l89mvwfn77rp1gmy8cbkwi3b7fkq";
+          name = "projectile-rails";
+        };
+        packageRequires = [ emacs f inf-ruby inflections projectile rake ];
+        meta = {
+          homepage = "http://melpa.org/#/projectile-rails";
+          license = lib.licenses.free;
+        };
+      }) {};
+    projectile-sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, sift }:
+    melpaBuild {
+        pname = "projectile-sift";
+        version = "20160107.415";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "sift.el";
+          rev = "8c3f3d14a351a2394027d72ee0599aa73b9f0d13";
+          sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projectile-sift";
+          sha256 = "1wbgpwq9yy3v7hqidaczrvvsw5ajj7m3n4gsy3b169xv5h673a0i";
+          name = "projectile-sift";
+        };
+        packageRequires = [ projectile sift ];
+        meta = {
+          homepage = "http://melpa.org/#/projectile-sift";
+          license = lib.licenses.free;
+        };
+      }) {};
+    projectile-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+    melpaBuild {
+        pname = "projectile-speedbar";
+        version = "20150629.1353";
+        src = fetchFromGitHub {
+          owner = "anshulverma";
+          repo = "projectile-speedbar";
+          rev = "59a91ea6b7e4ed4e25ba1acc37d6f90e14c3fa16";
+          sha256 = "0lr3vx1byf0i9jdzbyrvvzyzi1nfddvw5r9f9wm7gpfp5l8772la";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projectile-speedbar";
+          sha256 = "0dli4gzsiycivh8dwa00lfpbimyg42qygfachzrhi8qy5413pwlp";
+          name = "projectile-speedbar";
+        };
+        packageRequires = [ projectile ];
+        meta = {
+          homepage = "http://melpa.org/#/projectile-speedbar";
+          license = lib.licenses.free;
+        };
+      }) {};
+    projector = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+    melpaBuild {
+        pname = "projector";
+        version = "20151201.1441";
+        src = fetchFromGitHub {
+          owner = "waymondo";
+          repo = "projector.el";
+          rev = "fd9553a27d665889646b881b64a8f1577b47882b";
+          sha256 = "0y8zbywin99nhcrs5nzx4d179r84rdy39admajpi0j76v0b9pwl3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projector";
+          sha256 = "0hrinplk607wcc2ibn05pl8ghikv9f3zvymncp6nz95jw9brdapf";
+          name = "projector";
+        };
+        packageRequires = [ alert cl-lib projectile ];
+        meta = {
+          homepage = "http://melpa.org/#/projector";
+          license = lib.licenses.free;
+        };
+      }) {};
+    projekt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "projekt";
+        version = "20150324.348";
+        src = fetchFromGitHub {
+          owner = "tekai";
+          repo = "projekt";
+          rev = "a65e554e5d8b0def08c5d06f3fe34fec40bebd83";
+          sha256 = "0hvvlh24157qjxz82sbg22d4cbrf95xyx202cybp0n1vyxsmjcmw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projekt";
+          sha256 = "1bhb24701flihl54w8xrj6yxhynpq4dk0fp5ciac7k28n4930lw8";
+          name = "projekt";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/projekt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    projmake-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, indicators, lib, melpaBuild }:
+    melpaBuild {
+        pname = "projmake-mode";
+        version = "20150619.1620";
+        src = fetchFromGitHub {
+          owner = "ericbmerritt";
+          repo = "projmake-mode";
+          rev = "25e2f28ca2c528e42c6422735829fc77bab8b451";
+          sha256 = "1sxxy0s96sgm6i743qwjs0qjpsdr03gqc1cddvvpxbryh42vw9jn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projmake-mode";
+          sha256 = "192gvmhcz1anl80hpmcjwwd08dljyrap9sk6qj0y85mcnaafm882";
+          name = "projmake-mode";
+        };
+        packageRequires = [ dash indicators ];
+        meta = {
+          homepage = "http://melpa.org/#/projmake-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    prompt-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "prompt-text";
+        version = "20160106.809";
+        src = fetchFromGitHub {
+          owner = "10sr";
+          repo = "prompt-text-el";
+          rev = "bb9265ebfada42d0e3c67c809665e1e5d980691e";
+          sha256 = "1hq8426i8rpb3qzkd5akv3i08pa4jsp9lwsskn38bfgp71pwild2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/prompt-text";
+          sha256 = "1b9sj9kzx5ydq2zsfmkwsx78pzg0vsvrn92397js6b2cm24vrwwc";
+          name = "prompt-text";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/prompt-text";
+          license = lib.licenses.free;
+        };
+      }) {};
+    prop-menu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "prop-menu";
+        version = "20150728.618";
+        src = fetchFromGitHub {
+          owner = "david-christiansen";
+          repo = "prop-menu-el";
+          rev = "50b102c1c0935fd3e0c465feed7f27d66b21cdf3";
+          sha256 = "18ap2liz5r5a8ja2zz9182fnfm47jnsbyblpq859zks356k37iwc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/prop-menu";
+          sha256 = "0dhy52fxxpa058mhhx0slw3sly3dlxm9vkax6fd1sap6f6v00p5i";
+          name = "prop-menu";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/prop-menu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    propfont-mixed = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "propfont-mixed";
+        version = "20150113.1611";
+        src = fetchFromGitHub {
+          owner = "ikirill";
+          repo = "propfont-mixed";
+          rev = "0b461ef4754a469610dba71874a34b6da42176bf";
+          sha256 = "0lch20njy248w7bnvgs7jz0zqasskf5dakmykxwpb48llm6kx95v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/propfont-mixed";
+          sha256 = "19k0ydpkiviznsngwcqwn4k30r6j8w34pchgpjlsfwq1bndaai9y";
+          name = "propfont-mixed";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/propfont-mixed";
+          license = lib.licenses.free;
+        };
+      }) {};
+    prosjekt = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "prosjekt";
+        version = "20151127.816";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "prosjekt";
+          rev = "a864a8be5842223043702395f311e3350c28e9db";
+          sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/prosjekt";
+          sha256 = "1fn7ii1bq7bjkz27hihclpvx0aabgwy3kv47r9qibjl2jin97rck";
+          name = "prosjekt";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/prosjekt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "protobuf-mode";
+        version = "20150521.2211";
+        src = fetchFromGitHub {
+          owner = "google";
+          repo = "protobuf";
+          rev = "bbe6e430f62fc89aac6712403a42121665f00a88";
+          sha256 = "0wiw59shlrg2wd2lmgwpjyqb4gazhljb3b43mn2rffx62s86hzij";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/protobuf-mode";
+          sha256 = "1hh0w93fg6mfwsbb9wvp335ry8kflj50k8hybchpjcn6f4x39xsj";
+          name = "protobuf-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/protobuf-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    psc-ide = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "psc-ide";
+        version = "20160106.415";
+        src = fetchFromGitHub {
+          owner = "epost";
+          repo = "psc-ide-emacs";
+          rev = "d5de1f88860ce6d343d39dcec666db0ebdc0f513";
+          sha256 = "0i5qdx76r0zchhv115nx2gr4r7915df08b9kiaa0i7s3dxc6zmg3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/psc-ide";
+          sha256 = "1f8bphrbksz7si9flyhz54brb7w1lcz19pmn92hjwx7kd4nl18i9";
+          name = "psc-ide";
+        };
+        packageRequires = [ cl-lib company dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/psc-ide";
+          license = lib.licenses.free;
+        };
+      }) {};
+    psci = callPackage ({ dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, purescript-mode, s }:
+    melpaBuild {
+        pname = "psci";
+        version = "20150328.1401";
+        src = fetchFromGitHub {
+          owner = "ardumont";
+          repo = "emacs-psci";
+          rev = "64dc931b4fe2a7507b8ac81423b12f7dcda2067a";
+          sha256 = "08j31bg5vwgirv5n5fsw7w6gncrkpwpjlj2m00dhj8wbvhp503sn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/psci";
+          sha256 = "0sgrz8byz2pcsad2pydinp4hh2xb48pdb03r93wg2vvyy8p15j9g";
+          name = "psci";
+        };
+        packageRequires = [ dash deferred f purescript-mode s ];
+        meta = {
+          homepage = "http://melpa.org/#/psci";
+          license = lib.licenses.free;
+        };
+      }) {};
+    psession = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "psession";
+        version = "20151114.1306";
+        src = fetchFromGitHub {
+          owner = "thierryvolpiatto";
+          repo = "psession";
+          rev = "e46ddd05c8d3a6e4cbcc11b62aa275e5de66f475";
+          sha256 = "1b8w9wnrwk4j2gn543phz9qp8813ksqakr5pi509m6ijwcv0cp7b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/psession";
+          sha256 = "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a";
+          name = "psession";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/psession";
+          license = lib.licenses.free;
+        };
+      }) {};
+    psvn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "psvn";
+        version = "20151103.1242";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "psvn";
+          rev = "23048d302858fc3a52c118652bd83491a4956410";
+          sha256 = "1jz1g0igpnsjn2r144205bffj10iyp8izm8678mzkhnricxkn0d6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/psvn";
+          sha256 = "1wdww25pjla7c8zf04mvgia1ws8cal9rb7z8g3vn2s3gp68py12n";
+          name = "psvn";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/psvn";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pt";
+        version = "20151024.1051";
+        src = fetchFromGitHub {
+          owner = "bling";
+          repo = "pt.el";
+          rev = "17e8e743ac5fbbab14ad2635f0047c43c9d591b7";
+          sha256 = "1nn4m2z0wyp3ygx39c5racydixkis930ln8q5bdbhnjh4xgvgib1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pt";
+          sha256 = "0zmz1hcr4ajc2ydvpdxhy1dlhp7hvlkv6y6w1b79ffvq6acdd5mj";
+          name = "pt";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    puml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "puml-mode";
+        version = "20151212.1023";
+        src = fetchFromGitHub {
+          owner = "skuro";
+          repo = "puml-mode";
+          rev = "966064f37164800cd2c9891387ffcd10339b7137";
+          sha256 = "024g793y6vqhk5h6vqjv5hljvfyb0j6b6j51fjhijgdxmqhlk9vm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/puml-mode";
+          sha256 = "131ghjq6lsbhbx5hdg36swnkqijdb9bx6zg73hg0nw8qk0z742vn";
+          name = "puml-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/puml-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    punctuality-logger = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "punctuality-logger";
+        version = "20141120.1431";
+        src = fetchFromGitLab {
+          owner = "elzair";
+          repo = "punctuality-logger";
+          rev = "e09e5dd37bc92289fa2f7dc44aed51a7b5e04bb0";
+          sha256 = "1bkkgs2agy00wivilljkj3a9fsb2ba935icjmhbk46zjc6yf3y6q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/punctuality-logger";
+          sha256 = "0q9s74hkfqvcx67xpq9rlvh38nyjnz230bll6ks7y5yzxvl4qhcm";
+          name = "punctuality-logger";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/punctuality-logger";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pungi = callPackage ({ fetchFromGitHub, fetchurl, jedi, lib, melpaBuild, pyvenv }:
+    melpaBuild {
+        pname = "pungi";
+        version = "20150222.646";
+        src = fetchFromGitHub {
+          owner = "mgrbyte";
+          repo = "pungi";
+          rev = "a2d4d439ea371be0b064a12248288903b8a521a0";
+          sha256 = "1viw95y6fha782n1jw7snr7xc00iyf94r4whsm1a2q11vm2d1h21";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pungi";
+          sha256 = "1v9fsd764z5wdcips63z53rcipdz7bha4q6s4pnn114jn3a93ls1";
+          name = "pungi";
+        };
+        packageRequires = [ jedi pyvenv ];
+        meta = {
+          homepage = "http://melpa.org/#/pungi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    puppet-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
+    melpaBuild {
+        pname = "puppet-mode";
+        version = "20150730.1408";
+        src = fetchFromGitHub {
+          owner = "lunaryorn";
+          repo = "puppet-mode";
+          rev = "268ec790603a4121f62822ca6c26e9038a1b0375";
+          sha256 = "11mkf9gvjz63szdvhwlqnd6j2r9ij2fh8l6zkf7hl2zlwyyivcmp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/puppet-mode";
+          sha256 = "1s2hap6fs6rg5q80dmzhaf4qqaf5sglhs8p896i3i5hq51w0ciyc";
+          name = "puppet-mode";
+        };
+        packageRequires = [ emacs pkg-info ];
+        meta = {
+          homepage = "http://melpa.org/#/puppet-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    purescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "purescript-mode";
+        version = "20150316.2028";
+        src = fetchFromGitHub {
+          owner = "dysinger";
+          repo = "purescript-mode";
+          rev = "1390bf6a2ddd0764a5ee7f5cac4e88980cf44eaf";
+          sha256 = "0k2plyvd6842yryzrfadbf4h7a9hrjvkcvixclbca2bkvfik3864";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/purescript-mode";
+          sha256 = "00gz752mh7144nsaka5q3q4681jp845kc5vcy2nbfnqp9b24l55m";
+          name = "purescript-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/purescript-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    purple-haze-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "purple-haze-theme";
+        version = "20141014.2129";
+        src = fetchFromGitHub {
+          owner = "jasonm23";
+          repo = "emacs-purple-haze-theme";
+          rev = "3e245cbef7cd09e6b3ee124963e372a04e9a6485";
+          sha256 = "15myw5rkbnnpgzpiipm5xl4cyzymv8hh66x9al4aalb5nf52dckc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/purple-haze-theme";
+          sha256 = "0ld8k53823786y6f0dqcp0hlqlnmy323vdkanjfs5wg5ib60az1m";
+          name = "purple-haze-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/purple-haze-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    purty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "purty-mode";
+        version = "20131004.1759";
+        src = fetchFromGitHub {
+          owner = "hackscience";
+          repo = "purty-mode";
+          rev = "8eef77317a3bab07ade212353a50fbd3f20f365a";
+          sha256 = "0qm2xv762cz196aqs445crqrmsks8hpwzpaykzn0chlvdk0m5cv1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/purty-mode";
+          sha256 = "1ackqv95sdphbsjwydbc4dmdzwpaj74v329f55zcwa8hn3li9d5m";
+          name = "purty-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/purty-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pushbullet = callPackage ({ fetchFromGitHub, fetchurl, grapnel, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pushbullet";
+        version = "20140809.732";
+        src = fetchFromGitHub {
+          owner = "theanalyst";
+          repo = "revolver";
+          rev = "73c59a0f1dc04875b3e5a2c8afbc26c32128e445";
+          sha256 = "03ivg3ddhy5zh410wgwxa17m98wywqhk62jgijhjd00b6l8i4aym";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pushbullet";
+          sha256 = "1swzl25rcw7anl7q099qh14yhnwlbn3m20ib9kis0l1rv59kkarl";
+          name = "pushbullet";
+        };
+        packageRequires = [ grapnel json ];
+        meta = {
+          homepage = "http://melpa.org/#/pushbullet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    px = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "px";
+        version = "20141006.748";
+        src = fetchFromGitHub {
+          owner = "aaptel";
+          repo = "preview-latex";
+          rev = "c698a650997a1d5b06b92acc8f30d620342e1f37";
+          sha256 = "10g4imxgpv7a0j40qkx7xf2qnyz80ypd0mv0lf47n9dwln5byln3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/px";
+          sha256 = "0xjmz18m2dslh6yq5z32r43zq3svfxn8mhrfbmihglyv2mkwxw44";
+          name = "px";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/px";
+          license = lib.licenses.free;
+        };
+      }) {};
+    py-autopep8 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "py-autopep8";
+        version = "20151231.814";
+        src = fetchFromGitHub {
+          owner = "paetzke";
+          repo = "py-autopep8.el";
+          rev = "575ca51c928e6aaf01650901bce3df1122a11a4c";
+          sha256 = "1iw94m1bvsmadlj16f8ymwx0q6f9lqysy7by76hkpiwqqhd2i8rv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-autopep8";
+          sha256 = "1argjdmh0x9c90zkb6cr4z3zkpgjp2mkpsw0dr4v6gg83jcggfpp";
+          name = "py-autopep8";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/py-autopep8";
+          license = lib.licenses.free;
+        };
+      }) {};
+    py-gnitset = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "py-gnitset";
+        version = "20140224.2210";
+        src = fetchFromGitHub {
+          owner = "quodlibetor";
+          repo = "py-gnitset";
+          rev = "471eb99b83eb9f6915d8ca241e9770ddd6244a78";
+          sha256 = "05803wi7rj73sy9ihkilr6pcn72szfsvgf2dgbdpnqra508rxyb6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-gnitset";
+          sha256 = "0f6ivq4ignb4gfxw2q8qvigvv3fbvvyr87x25wcaz6yipg1lr18r";
+          name = "py-gnitset";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/py-gnitset";
+          license = lib.licenses.free;
+        };
+      }) {};
+    py-import-check = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "py-import-check";
+        version = "20130802.611";
+        src = fetchFromGitHub {
+          owner = "psibi";
+          repo = "emacs-py-import-check";
+          rev = "9787f87745a4234cd9bed711860b707902bc8ae4";
+          sha256 = "1416hbc64gwn9c8g9lxfx58w60ysi0x8rbps6mfxalavdhbs20sv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-import-check";
+          sha256 = "1261dki0q44sw9h0g1305i2fj1dg9xgwzry50jbn2idcrqg4xf7k";
+          name = "py-import-check";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/py-import-check";
+          license = lib.licenses.free;
+        };
+      }) {};
+    py-isort = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "py-isort";
+        version = "20150422.1039";
+        src = fetchFromGitHub {
+          owner = "paetzke";
+          repo = "py-isort.el";
+          rev = "cfbb576784fe4501909c15299607ce2a2d0bf164";
+          sha256 = "0150q6xcnzzrkn9fa9njm973l1d49c48ad8qia71k4jwrxjjj6zr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-isort";
+          sha256 = "0k5gn3bjn5pv6dn6p0m9xghn0sx3m29bj3pfrmyh6gd5ic0l00yb";
+          name = "py-isort";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/py-isort";
+          license = lib.licenses.free;
+        };
+      }) {};
+    py-smart-operator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "py-smart-operator";
+        version = "20150824.2110";
+        src = fetchFromGitHub {
+          owner = "rmuslimov";
+          repo = "py-smart-operator";
+          rev = "be4e32572d4128143f46e1874eaa6f3da94fdffe";
+          sha256 = "05gi17n488r2n6x33nj4a23ci89c9smsbanmap4i302dy0mnmwgd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-smart-operator";
+          sha256 = "1n0bdr9z2s1ikhmfz642k94gjzb88anwlb61mh27ay8wqdgm74c4";
+          name = "py-smart-operator";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "http://melpa.org/#/py-smart-operator";
+          license = lib.licenses.free;
+        };
+      }) {};
+    py-test = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "py-test";
+        version = "20151117.22";
+        src = fetchFromGitHub {
+          owner = "Bogdanp";
+          repo = "py-test.el";
+          rev = "3b2a0bdaacb54df6f2bee8317423e5c0d159d5cf";
+          sha256 = "1s39407z3rxz10r5sshv2vj7s23ylkhg59ixasgnpjk82gl4igpf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-test";
+          sha256 = "1mbwbzg606winf5af7qkg6a1hg79lc7k2miq4d3mwih496l5sinb";
+          name = "py-test";
+        };
+        packageRequires = [ dash emacs f ];
+        meta = {
+          homepage = "http://melpa.org/#/py-test";
+          license = lib.licenses.free;
+        };
+      }) {};
+    py-yapf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "py-yapf";
+        version = "20160101.612";
+        src = fetchFromGitHub {
+          owner = "paetzke";
+          repo = "py-yapf.el";
+          rev = "56807d28bf288afec2e2999982074bdd5e9bf932";
+          sha256 = "09z739w4fjg9xnv3mbh7v8j59mnbsfq4ygq616pj4xcw3nsh0rbg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-yapf";
+          sha256 = "1381x0ffpllxwgkr2d8xxbv1nd4k475m1aff8l5qijw7d1fqga2f";
+          name = "py-yapf";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/py-yapf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pycarddavel = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pycarddavel";
+        version = "20150831.716";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "pycarddavel";
+          rev = "a6d81ee4eb8309cd82f6082aeca68c5a015702a3";
+          sha256 = "09glwrb9q65qdm4yd0mbi5hwdy2434zm8699ywhs6hqpjacadlmi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pycarddavel";
+          sha256 = "12k2mnzkd8yv17csfhclsnd479vcabawmac23yw6dsw7ic53jf1a";
+          name = "pycarddavel";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/pycarddavel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pydoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pydoc";
+        version = "20150525.2045";
+        src = fetchFromGitHub {
+          owner = "statmobile";
+          repo = "pydoc";
+          rev = "74fb1a66e9d81661ddd371a03e916ea5e0b01dc8";
+          sha256 = "1q9fmdrnsqmisykndxzy9bvjl6n1rsmfgvh3h8fkg6b44ypcyyw7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pydoc";
+          sha256 = "0sf52cb80yiridsl1pffdr3wpbgxrn2l8vnq03l70djckild477n";
+          name = "pydoc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pydoc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pydoc-info = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pydoc-info";
+        version = "20110301.234";
+        src = fetchhg {
+          url = "https://bitbucket.com/jonwaltman/pydoc-info";
+          rev = "151d877c8fb8";
+          sha256 = "1mzyr6yznkyv99x9q8zx2f270ngjh8s94zvnhcbhidi57inpd1nh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pydoc-info";
+          sha256 = "0l80g0rzkk3a1wrw2riiywz9wdyxwr5i64jb2h5r8alp9qq1k7mf";
+          name = "pydoc-info";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pydoc-info";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pyenv-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic }:
+    melpaBuild {
+        pname = "pyenv-mode";
+        version = "20151105.441";
+        src = fetchFromGitHub {
+          owner = "proofit404";
+          repo = "pyenv-mode";
+          rev = "93ddeb2c0fabc224496cdf5ff688243a208376c4";
+          sha256 = "0017xk95293sc37127hg9bbbh5glq34sdc1b6bx6ykzny6g49fd3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pyenv-mode";
+          sha256 = "00yqrk92knv9gq1m9xcg78gavv70jsjlwzkllzxl63iva9qrch59";
+          name = "pyenv-mode";
+        };
+        packageRequires = [ pythonic ];
+        meta = {
+          homepage = "http://melpa.org/#/pyenv-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pyfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pyfmt";
+        version = "20150521.1556";
+        src = fetchFromGitHub {
+          owner = "aheaume";
+          repo = "pyfmt.el";
+          rev = "cb92be2cf0804cc53142dc5edb36f8e0ef5cec32";
+          sha256 = "1rp8zchvclh29rl9a1i82pcqghnhpaqnppaydxc2qx23y9pdgz9i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pyfmt";
+          sha256 = "112kjsp763c2plhqlhydpngrabhc58ya7cszvi4119xqw2s699g6";
+          name = "pyfmt";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pyfmt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pyimpsort = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pyimpsort";
+        version = "20150927.1317";
+        src = fetchFromGitHub {
+          owner = "emacs-pe";
+          repo = "pyimpsort.el";
+          rev = "e90d1b09e35356e3eed890fe38875bc7216d0f4e";
+          sha256 = "003hd5igv152yr4fa47n2l5jhwvdlfhw7bap1dkm1i7i898i6yds";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pyimpsort";
+          sha256 = "0kdk3bmryfzvwf8vshfszbih8mwncf4xlb0n0n0yjn0p1n98q99k";
+          name = "pyimpsort";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/pyimpsort";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pylint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pylint";
+        version = "20160114.341";
+        src = fetchFromGitHub {
+          owner = "PyCQA";
+          repo = "pylint";
+          rev = "319c79d9b4e15e6600dd055370b6ad6e6392592f";
+          sha256 = "1qqvhabw0hly8c1lsgvh205c50fy5bk3r3r4w01wnrwsa9m8q0zj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pylint";
+          sha256 = "1138a8dn9y4ypbphs1zfvr8gr4vdjcy0adsl4xfbgsls4kcdwpxx";
+          name = "pylint";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pylint";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pytest = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "pytest";
+        version = "20151104.2325";
+        src = fetchFromGitHub {
+          owner = "ionrock";
+          repo = "pytest-el";
+          rev = "71bd43c4eb7254d05104ec1bcca7851d7a203da3";
+          sha256 = "1nlybqvy64lc0c65j9wbk4lx932lz0b8hxw8zm1vgmqppqcyn0p5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pytest";
+          sha256 = "0ssib65wa20h8r6156f392l481vns5fcax6w70hcawmn84nficdh";
+          name = "pytest";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "http://melpa.org/#/pytest";
+          license = lib.licenses.free;
+        };
+      }) {};
+    python-cell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "python-cell";
+        version = "20131029.1816";
+        src = fetchFromGitHub {
+          owner = "thisch";
+          repo = "python-cell.el";
+          rev = "ccacd91a19be784860d687eb1e8ce88fddaacaf6";
+          sha256 = "1cnjdgw3x6yb5k06z57xifywlg0kdx9ai4f1ajc0wx9aax8r5gav";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-cell";
+          sha256 = "07i3vyci52jvslq28djwkgx1r157wvxd99rvqlxnmmsl5yj4k1jf";
+          name = "python-cell";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/python-cell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    python-django = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "python-django";
+        version = "20150821.2304";
+        src = fetchFromGitHub {
+          owner = "fgallina";
+          repo = "python-django.el";
+          rev = "fc54ad74f0309670359b939f64d0f1fff68aeac4";
+          sha256 = "1qckn5bi1ib54hgqbym5qqwzvbv70ria1w3c2x543xlr0l7zga6h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-django";
+          sha256 = "02whx8g8r02mzng7d7bnbkz5n7gyzp5hcnmvd6a3lq106c0h7w9k";
+          name = "python-django";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/python-django";
+          license = lib.licenses.free;
+        };
+      }) {};
+    python-docstring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "python-docstring";
+        version = "20150907.1504";
+        src = fetchFromGitHub {
+          owner = "glyph";
+          repo = "python-docstring-mode";
+          rev = "263879fb339b18ee55d9463697d6f0a73171ee78";
+          sha256 = "1a2019172ycw7sdfjrxpyrg41ky9cp09mx30x6cr2qkc1w9pkyrv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-docstring";
+          sha256 = "1vi30y71vflsbprp5j4phbp7x1j24vxn9d6sifaddari0g0zxpfw";
+          name = "python-docstring";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/python-docstring";
+          license = lib.licenses.free;
+        };
+      }) {};
+    python-environment = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "python-environment";
+        version = "20150310.353";
+        src = fetchFromGitHub {
+          owner = "tkf";
+          repo = "emacs-python-environment";
+          rev = "401006584e32864a10c69d29f14414828909362e";
+          sha256 = "0q6bib9nr6xiq6npzbngyfcjk87yyvwzq1zirr3z1h5wadm34lsk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-environment";
+          sha256 = "1pq16rddw76ic5d02j5bswl9qcydi47hqmhs7r06jk46vsfzxpl7";
+          name = "python-environment";
+        };
+        packageRequires = [ deferred ];
+        meta = {
+          homepage = "http://melpa.org/#/python-environment";
+          license = lib.licenses.free;
+        };
+      }) {};
+    python-info = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "python-info";
+        version = "20151228.1252";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "python-info";
+          rev = "306f15441b54b25757cdfd3b327b84024ea21ed7";
+          sha256 = "0zk6014dzfrb3y3nhs890x082xf044w0a8nmy6rlrj375lvhfn99";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-info";
+          sha256 = "0kvpz1r2si94rs1iajn1ffmx7a5bgyjnzri36ajdgd5gcgh41dhy";
+          name = "python-info";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/python-info";
+          license = lib.licenses.free;
+        };
+      }) {};
+    python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "python-mode";
+        version = "20160115.107";
+        src = fetchFromGitLab {
+          owner = "python-mode-devs";
+          repo = "python-mode";
+          rev = "546b676e6437532a0fa42933b076bd6bbd28201c";
+          sha256 = "1lgx0v67ha5nixz35gy80vdpizkfsxcn7gnr47svpnls5n4d6gq3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-mode";
+          sha256 = "1m7c6c97xpr5mrbyzhcl2cy7ykdz5yjj90mrakd4lknnsbcq205k";
+          name = "python-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/python-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    python-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }:
+    melpaBuild {
+        pname = "python-x";
+        version = "20151229.1148";
+        src = fetchFromGitHub {
+          owner = "wavexx";
+          repo = "python-x.el";
+          rev = "b158c3925f212336b1bc1a95263700e47753e4ed";
+          sha256 = "1254ng5fgmbfbn62wpjwmsx8y9j4vs3xcxpyqjb8s3npjjmv4kd8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-x";
+          sha256 = "115mvhqfa0fa8kdk64biba7ri4xjk74qqi6vm1a5z3psam9mjcmn";
+          name = "python-x";
+        };
+        packageRequires = [ cl-lib folding python ];
+        meta = {
+          homepage = "http://melpa.org/#/python-x";
+          license = lib.licenses.free;
+        };
+      }) {};
+    python3-info = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "python3-info";
+        version = "20151117.31";
+        src = fetchFromGitHub {
+          owner = "dvhansen";
+          repo = "python3-info";
+          rev = "4530e180ded2ad64774e51742eece3e5ea00c5f5";
+          sha256 = "1w29l4zyvcchjdywz2py95qq7bszhldpga2ng75g7p07pq7f2w1p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python3-info";
+          sha256 = "1hma8sphxk95m25s56adgyk7d4blsc02gq5a7vw1pawwvxm2qlz3";
+          name = "python3-info";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/python3-info";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pythonic = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "pythonic";
+        version = "20150730.416";
+        src = fetchFromGitHub {
+          owner = "proofit404";
+          repo = "pythonic";
+          rev = "228db8970b4b6ed6992ac5490f859dc698c0afe9";
+          sha256 = "0ksccyh6da8v3f85zxjwa9rjrpqfr1qqqmm4d1y35nmw3pmlasmx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pythonic";
+          sha256 = "1hq0r3vg8vmgw89wfjdqknwm76pimlk0dy56wmh9vffh06gqsb51";
+          name = "pythonic";
+        };
+        packageRequires = [ cl-lib dash emacs f s ];
+        meta = {
+          homepage = "http://melpa.org/#/pythonic";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pyvenv";
+        version = "20160108.228";
+        src = fetchFromGitHub {
+          owner = "jorgenschaefer";
+          repo = "pyvenv";
+          rev = "0a79b926f030a1737f8dec40fb877208f1eb7bea";
+          sha256 = "1llm8vlmwkhdnr07xgcjx59d4na96kkhmfncww6rqkfc5i6zfarm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pyvenv";
+          sha256 = "0gai9idss1wvryxyqk3pv854mc2xg9hd0r55r2blql8n5rd2yv8v";
+          name = "pyvenv";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pyvenv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    qiita = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, markdown-mode, melpaBuild }:
+    melpaBuild {
+        pname = "qiita";
+        version = "20140118.244";
+        src = fetchFromGitHub {
+          owner = "gongo";
+          repo = "qiita-el";
+          rev = "93c697b97d540fd1601a13a3d9889fb939b19878";
+          sha256 = "0ggivlaj29rbbhkjpf3bf7vr96xjzffas0sf5m54qh6nyz6nnha5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/qiita";
+          sha256 = "1kzk7pc68ks9gxm2l2d28al23gxh56z0cmkl80qwg7sh4gsmhyxl";
+          name = "qiita";
+        };
+        packageRequires = [ helm markdown-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/qiita";
+          license = lib.licenses.free;
+        };
+      }) {};
+    qml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "qml-mode";
+        version = "20160108.904";
+        src = fetchFromGitHub {
+          owner = "coldnew";
+          repo = "qml-mode";
+          rev = "efb465917f260b4b18c30bd45c58bc291c8246f0";
+          sha256 = "1mlka59gyylj4cabi1b552h11qx54kjqwx3bkmsdngjrd4da222a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/qml-mode";
+          sha256 = "123mlibviplzra558x87da4zx0kpbhsgfigjjgjgp3mdg897084n";
+          name = "qml-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/qml-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    quack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "quack";
+        version = "20130126.1823";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "quack";
+          rev = "ce00cb151dde121e156c9543949d088d5ddafdbb";
+          sha256 = "0q7krn16dja0ifnc8h587lh5nilwbixxgsh5179clx5l57naix62";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quack";
+          sha256 = "1l7jw8sx2llbzp3sg5755qdhhyq8jdaggxzzn7icjxxrmj1ji6ii";
+          name = "quack";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/quack";
+          license = lib.licenses.free;
+        };
+      }) {};
+    quasi-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "quasi-monochrome-theme";
+        version = "20150801.1525";
+        src = fetchFromGitHub {
+          owner = "lbolla";
+          repo = "emacs-quasi-monochrome";
+          rev = "b2456aaa71b51d4f9b06c5dfb529e60732574fc7";
+          sha256 = "09vw8nf9yj3v2ks25n39fbn2qk1fld0hmaq1dpzaqsavsbd4dwc1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quasi-monochrome-theme";
+          sha256 = "0h5pqrklyga40jg8qc47lwmf8khn0vcs5jx2sdycl2ipy0ikmfs0";
+          name = "quasi-monochrome-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/quasi-monochrome-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build }:
+    melpaBuild {
+        pname = "quelpa";
+        version = "20151203.305";
+        src = fetchFromGitHub {
+          owner = "quelpa";
+          repo = "quelpa";
+          rev = "e011b4fa916a8b6057225f3e7ee6befc8928d443";
+          sha256 = "0v5fcbjf7ndmywjsq9di3cwxsh2csv5pj3mqgqb340i2yp77r9wy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quelpa";
+          sha256 = "1g53fcy837hpyn9lnmmri0h4c5va61vszhblz4caadqq265hknvs";
+          name = "quelpa";
+        };
+        packageRequires = [ emacs package-build ];
+        meta = {
+          homepage = "http://melpa.org/#/quelpa";
+          license = lib.licenses.free;
+        };
+      }) {};
+    quelpa-use-package = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, quelpa, use-package }:
+    melpaBuild {
+        pname = "quelpa-use-package";
+        version = "20150805.528";
+        src = fetchFromGitHub {
+          owner = "quelpa";
+          repo = "quelpa-use-package";
+          rev = "d18b55508ceaeb894f5db3d775f5c1b27e4be81b";
+          sha256 = "00wnvyw2daiwwd1jyq1ag5jsws8k8jxs3lsj73dagbvqnlywmkm6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quelpa-use-package";
+          sha256 = "0p09w419kldgl913hgqfzyv2pck27vqq2i1xsx7g29biwgnp9hl9";
+          name = "quelpa-use-package";
+        };
+        packageRequires = [ emacs quelpa use-package ];
+        meta = {
+          homepage = "http://melpa.org/#/quelpa-use-package";
+          license = lib.licenses.free;
+        };
+      }) {};
+    quick-buffer-switch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "quick-buffer-switch";
+        version = "20151007.1708";
+        src = fetchFromGitHub {
+          owner = "renard";
+          repo = "quick-buffer-switch";
+          rev = "d5fdd67b4c9f04b7a7122da2215e4ae076a03b1b";
+          sha256 = "0kh63nzdzwxksn2ar2i1ds7n96jga2dhhc9gg27p1g2ca66fs6h5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quick-buffer-switch";
+          sha256 = "1fsnha3x3pgq582libb3dmxb93aagv1avnc0rigpfd7hv6bagj40";
+          name = "quick-buffer-switch";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/quick-buffer-switch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    quick-preview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "quick-preview";
+        version = "20150828.2339";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "quick-preview.el";
+          rev = "29c884c6ab385ef67d9aa656ebb7c94cabeb5c35";
+          sha256 = "1cp3z05qjy7qvjjv105ws1j9qykx8sl4s13xff0ijwvjza6ga44c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quick-preview";
+          sha256 = "18janbmhbwb6a46fgc1sxl9ww591v60y3wgh2wqh62vdy4ix3bd9";
+          name = "quick-preview";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/quick-preview";
+          license = lib.licenses.free;
+        };
+      }) {};
+    quickref = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "quickref";
+        version = "20130113.1700";
+        src = fetchFromGitHub {
+          owner = "pd";
+          repo = "quickref.el";
+          rev = "cfedf98c6b8b679b93296f7436e1fb4c2cc7ad25";
+          sha256 = "1i7qqpqdwifd6vxpyyxyzq0b3wc82r7pqcw07bj0x2lhrjnqrxby";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quickref";
+          sha256 = "0jahi84ra9g7h0cvz3c02zkbkknrzgv48zq32n72lkxl958swqn1";
+          name = "quickref";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/quickref";
+          license = lib.licenses.free;
+        };
+      }) {};
+    quickrun = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "quickrun";
+        version = "20160109.1849";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-quickrun";
+          rev = "6ec3766554b5cb51a493da176c02de27be954d21";
+          sha256 = "1cpv44bmqydwmiswk2743jmjldnjvjbd0qyvapxdkczj86z52l6i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quickrun";
+          sha256 = "1szgirakfnkn9ksls16p233sr7x9ck5m1f1kbk6ancj36yja2nki";
+          name = "quickrun";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/quickrun";
+          license = lib.licenses.free;
+        };
+      }) {};
+    r-autoyas = callPackage ({ ess, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "r-autoyas";
+        version = "20140101.910";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "r-autoyas.el";
+          rev = "b4020ee7f5f895e0065b8b26da8a49c51432d530";
+          sha256 = "0dhljmdlg4p832w9s7rp8vznkpjkwpg8k9hj95cn2h76c0afwz3j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/r-autoyas";
+          sha256 = "18zifadsgbwnga205jvpx61wa2dvjxmxs5v7cjqhny45a524nbv4";
+          name = "r-autoyas";
+        };
+        packageRequires = [ ess yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/r-autoyas";
+          license = lib.licenses.free;
+        };
+      }) {};
+    racer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }:
+    melpaBuild {
+        pname = "racer";
+        version = "20160109.1602";
+        src = fetchFromGitHub {
+          owner = "racer-rust";
+          repo = "emacs-racer";
+          rev = "b1c1aafd14b239e16c68e3a6f00093e3c8db36d0";
+          sha256 = "1niymgv517g5gpchz337a0aarj63dmmspxxqk7l0s3midid0yhfh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/racer";
+          sha256 = "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi";
+          name = "racer";
+        };
+        packageRequires = [ dash emacs rust-mode s ];
+        meta = {
+          homepage = "http://melpa.org/#/racer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "racket-mode";
+        version = "20160102.1830";
+        src = fetchFromGitHub {
+          owner = "greghendershott";
+          repo = "racket-mode";
+          rev = "d70140d54f74aa230155a3dcc96f8637bcdfe001";
+          sha256 = "0w25jmcim7fjabg1pshqsjrw86gfnn61nxmccy6r53a58kkl3j1g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/racket-mode";
+          sha256 = "04sr55zrgwyi48sj4ssm4rmm327yxs7hvjhxclnkhaaigrmrv7jb";
+          name = "racket-mode";
+        };
+        packageRequires = [ emacs faceup s ];
+        meta = {
+          homepage = "http://melpa.org/#/racket-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    railgun = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "railgun";
+        version = "20121017.57";
+        src = fetchFromGitHub {
+          owner = "mbriggs";
+          repo = "railgun.el";
+          rev = "66aaa1b091baef53a69d0d7425f48d184b865fb8";
+          sha256 = "00x09vjd3jz5f73qkf5v1y402zn8vl8dsyfwlq9z646p18ba7gyh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/railgun";
+          sha256 = "1a3fplfipk1nv3py1sy0p2adf3w1h4api01h2j5rjlq2jw06kyr0";
+          name = "railgun";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/railgun";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rails-log-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rails-log-mode";
+        version = "20140407.2325";
+        src = fetchFromGitHub {
+          owner = "ananthakumaran";
+          repo = "rails-log-mode";
+          rev = "ff440003ad7d47cb0ac3300f2a632f4cfd36a446";
+          sha256 = "1fh8wsb0pa2isr1kgh3v9zmmxq1nlmqwqk4z34dw5wpaiyihmk84";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rails-log-mode";
+          sha256 = "0h7gfg0c5pwfh18qzg1mx7an9p958ygdfqb54s85mbkv8x3rh1a0";
+          name = "rails-log-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rails-log-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rails-new = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rails-new";
+        version = "20141221.249";
+        src = fetchFromGitHub {
+          owner = "cheunghy";
+          repo = "rails-new";
+          rev = "b68055a99cde15f9d02ab36b8ad0ea7ab35b2283";
+          sha256 = "0cqp2vns7gq377bm6q9n5q0ra1d5yy2x2aiw9q1hswk82xpibj9l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rails-new";
+          sha256 = "0wgbm6qxqkpsbzj9wccicsphajaii07dl27b8x2vidsyw6ambj5h";
+          name = "rails-new";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rails-new";
+          license = lib.licenses.free;
+        };
+      }) {};
+    railscasts-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "railscasts-theme";
+        version = "20150219.925";
+        src = fetchFromGitHub {
+          owner = "mikenichols";
+          repo = "railscasts-theme";
+          rev = "1340c3f6c2717761cab95617cf8dcbd962b1095b";
+          sha256 = "021x1l5kzsbm0qj5a3bngxa7ickm4lbwsdz81a2ks9pi1ivmw205";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/railscasts-theme";
+          sha256 = "1z5m8ccx2k18gbzqvg0051mp2myy2qncf4xvv47k80f83pk2hw6r";
+          name = "railscasts-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/railscasts-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rainbow-blocks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rainbow-blocks";
+        version = "20140306.1233";
+        src = fetchFromGitHub {
+          owner = "istib";
+          repo = "rainbow-blocks";
+          rev = "8335993563aadd4290c5fa09dd7a6a81691b0690";
+          sha256 = "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rainbow-blocks";
+          sha256 = "08p41wvrw1j3h7j7lyl8nxk1gcc2id9ikljmiklg0kc6s8ijhng8";
+          name = "rainbow-blocks";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rainbow-blocks";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rainbow-delimiters = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rainbow-delimiters";
+        version = "20150320.217";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "rainbow-delimiters";
+          rev = "0823d0c67f935a4c36a1c945e93051102963c7fb";
+          sha256 = "0gxc8j5a14bc9mp43cbcz41ipc0z1yvmypg52dnl8hadirry20gd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rainbow-delimiters";
+          sha256 = "132nslbnszvbgkl0819z811yar3lms1hp5na4ybi9gkmnb7bg4rg";
+          name = "rainbow-delimiters";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rainbow-delimiters";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rainbow-identifiers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rainbow-identifiers";
+        version = "20141102.926";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "rainbow-identifiers";
+          rev = "19fbfded1baa98d12335f26f6d7b20e5ae44ce2e";
+          sha256 = "05i0jpmxzsj2lsj48cafn3v93z37l7k5kaza2ik3yirdpjdibyrh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rainbow-identifiers";
+          sha256 = "0lw790ymrgpyh0sxwmzinl2ik5vl5vggbg14cd0cx5yagkw5y3mp";
+          name = "rainbow-identifiers";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/rainbow-identifiers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rake = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rake";
+        version = "20150831.358";
+        src = fetchFromGitHub {
+          owner = "asok";
+          repo = "rake";
+          rev = "eba311a8f5ccfb6535efbc26fa58c43e3f1e5515";
+          sha256 = "1wcs8j8rdls0n3v8zdpk2n5riwzz2yvjf6b70a5bj7p20gyafhj2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rake";
+          sha256 = "0cw47g6cjnkh3z4hbwwq1f8f5vrvs84spn06k53bx898brqdh8ns";
+          name = "rake";
+        };
+        packageRequires = [ cl-lib dash f ];
+        meta = {
+          homepage = "http://melpa.org/#/rake";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rand-theme = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rand-theme";
+        version = "20151219.1735";
+        src = fetchFromGitHub {
+          owner = "gopar";
+          repo = "rand-theme";
+          rev = "65a00e5c5150f857aa96803b68f50bc8da0215b7";
+          sha256 = "0fmajgqf9j21qn7h35sky5di8cnma432g0ki9d5m41byxp9y1bdl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rand-theme";
+          sha256 = "0h0n1lsxnl12mjrjpra62vblrg8kbp1hk7w1v6makj074d037j2h";
+          name = "rand-theme";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/rand-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    random-splash-image = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "random-splash-image";
+        version = "20151002.2030";
+        src = fetchFromGitHub {
+          owner = "kakakaya";
+          repo = "random-splash-image";
+          rev = "907e2db5ceff781ac7f4dbdd65fe71736c36aa22";
+          sha256 = "1z25xmz8pl3rsfahw6ay8wx5wbnlxabnzr2dq20m0i5jyci8lqll";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/random-splash-image";
+          sha256 = "1j454jy4ia2wrgi3fxzjfdqi3z8x13hq8kh62lnb84whs7a1nhik";
+          name = "random-splash-image";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/random-splash-image";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ranger";
+        version = "20160115.39";
+        src = fetchFromGitHub {
+          owner = "ralesi";
+          repo = "ranger.el";
+          rev = "057150f6710ab2180ac9efd7fa2c9ad53595f16c";
+          sha256 = "1r020msciip8wgy5xrl5dm9idm89iyy51jz1r9zaja840fck95wc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ranger";
+          sha256 = "14g4r4iaz0nzfsklslrswsik670pvfd0605xfjghvpngn2a8ych4";
+          name = "ranger";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ranger";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rase = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rase";
+        version = "20120928.1545";
+        src = fetchFromGitHub {
+          owner = "m00natic";
+          repo = "rase";
+          rev = "59b5f7e8102570b65040e8d55781c7ea28de7338";
+          sha256 = "1i16361klpdsxphcjdpxqswab3ing69j1wb9nygws7ghil85h0bx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rase";
+          sha256 = "1g7v2z7l4csl5by64hc3zg4kgrkvv81iq30mfqq4nvy1jc0xa6j0";
+          name = "rase";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rase";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rbenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rbenv";
+        version = "20141120.149";
+        src = fetchFromGitHub {
+          owner = "senny";
+          repo = "rbenv.el";
+          rev = "2ea1a5bdc1266caef1dd77700f2c8f42429b03f1";
+          sha256 = "0yd0rs6fnc6lsfi7pivw5sivh698055r8ifj9vrxb82dcx2y6v2h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rbenv";
+          sha256 = "09nw7sz6rdgs7hdw517qwgzgyrdmxb16sgldfkifk41rhiyqhr65";
+          name = "rbenv";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rbenv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rbt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "rbt";
+        version = "20151030.2255";
+        src = fetchFromGitHub {
+          owner = "joeheyming";
+          repo = "rbt.el";
+          rev = "47cf236c732e9c5f468fb24c6a1c2db69a133797";
+          sha256 = "0ij2gqhg714ah812rhf1yg2n7ah1v4d5yldn1rixrzfcdng10mpi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rbt";
+          sha256 = "1mrb6v8zybvhh242vvq0kdvg6cvws7gabfhcydrw5g2njhyqkygm";
+          name = "rbt";
+        };
+        packageRequires = [ popup ];
+        meta = {
+          homepage = "http://melpa.org/#/rbt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rcirc-alert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rcirc-alert";
+        version = "20141127.447";
+        src = fetchFromGitHub {
+          owner = "csantosb";
+          repo = "rcirc-alert";
+          rev = "0adf8ff9c47023fec578f678424be62b0f49057f";
+          sha256 = "0xdyrp0zs2v2glpfwlajmj97wygwi0y492zbp6rp3caa5bj3j4z2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rcirc-alert";
+          sha256 = "0lyd3gz1sflp93xb7xbvk1gh69w468ync1p144avyh2pybl40q4a";
+          name = "rcirc-alert";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rcirc-alert";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rcirc-alertify = callPackage ({ alert, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rcirc-alertify";
+        version = "20140406.2019";
+        src = fetchFromGitHub {
+          owner = "fgallina";
+          repo = "rcirc-alertify";
+          rev = "ea5cafc55893f375eccbe013d12dbaa94bf6e259";
+          sha256 = "1mpk5rzsil298q3ppv5v9jrn274v71jffyz0jihrksh1wbjzwhlx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rcirc-alertify";
+          sha256 = "13448bykmy0jqcajhn2gjiar3m8cingyr8394vxybp2m1zvv0pws";
+          name = "rcirc-alertify";
+        };
+        packageRequires = [ alert ];
+        meta = {
+          homepage = "http://melpa.org/#/rcirc-alertify";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rcirc-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rcirc-color";
+        version = "20151130.958";
+        src = fetchFromGitHub {
+          owner = "kensanata";
+          repo = "rcirc-color";
+          rev = "a94c7811e6ab578a138eb582f7ce31d3568b5c4d";
+          sha256 = "173lhi48dwfp9k7jmgivhcc9f38snz5xlciyjhrafpadq1pir497";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rcirc-color";
+          sha256 = "1a8qqwdc0gw6m1xsnwrj3xldp05p7pabyj6l4bccpg3vf5wbgkn5";
+          name = "rcirc-color";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rcirc-color";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rcirc-groups = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rcirc-groups";
+        version = "20160115.631";
+        src = fetchFromGitHub {
+          owner = "dimitri";
+          repo = "rcirc-groups";
+          rev = "e858084e5956ba32a84046616326c0903de6d59f";
+          sha256 = "0d99x7dfw5xrn62knvs65lvn6xyy7399xwqyy47bs4n81v25aqbh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rcirc-groups";
+          sha256 = "1iws3f8vkwrflcj6ni8nmf1wcw1jrlnssm76kzzhag77ry3iswgx";
+          name = "rcirc-groups";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rcirc-groups";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rcirc-notify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rcirc-notify";
+        version = "20150219.1604";
+        src = fetchFromGitHub {
+          owner = "nicferrier";
+          repo = "rcirc-notify";
+          rev = "841a7b5a6cdb0c11a812df924d2c6a7d364fd455";
+          sha256 = "1k4knsrca626pikgaalqbqwy7im4wz1vrmzzhdrdb4lhdz6sq3q3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rcirc-notify";
+          sha256 = "0mwhzkbzhpq4jws05p7qp0kbay8kcblb9xikznm0i8drpdyc617v";
+          name = "rcirc-notify";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rcirc-notify";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rcirc-styles = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rcirc-styles";
+        version = "20160110.1650";
+        src = fetchFromGitHub {
+          owner = "aaron-em";
+          repo = "rcirc-styles.el";
+          rev = "d0547eda261d0885951b283e5622345f999d2083";
+          sha256 = "0yhmdkvswnn5rga5xzysfpivbz9wdkzbm49licilc2fp1dgcvd6i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rcirc-styles";
+          sha256 = "01dxhnzsnljig769dk9axdi970b3lw2s6p1z3ljf29qlb5j4548r";
+          name = "rcirc-styles";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/rcirc-styles";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rdf-prefix";
+        version = "20151205.816";
+        src = fetchFromGitHub {
+          owner = "simenheg";
+          repo = "rdf-prefix";
+          rev = "1ab1464172c7563a7dbf1224572e4ffbfc6608e6";
+          sha256 = "0r95fzi0x8r18x7r574mp503qaiqyicrq78zlggyz6qihi95pmqj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rdf-prefix";
+          sha256 = "1vxgn5f2kws17ndfdv1vj5p9ks3rp6sikzpc258j07bhsfpjz5qm";
+          name = "rdf-prefix";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rdf-prefix";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rdp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rdp";
+        version = "20120928.2054";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "rdp";
+          rev = "b620192afada04aec33b38cc130fef0765f41ca9";
+          sha256 = "08l96bhghmnckar4i6afj9csqglasmpmby1r7j38ic9bp37z2yqd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rdp";
+          sha256 = "0lj3idwv4fxz8pi8mnxkbhwhzaa1gs6ib4nzly3fc6yiix9ampkz";
+          name = "rdp";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rdp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    react-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "react-snippets";
+        version = "20151104.1740";
+        src = fetchFromGitHub {
+          owner = "johnmastro";
+          repo = "react-snippets.el";
+          rev = "1b56f99e1f26c6dea4315c14fa58a851caa9d84f";
+          sha256 = "00j0iqa37yzd7xrgd8xcgpgmjcarhn0yx4zpbnr7z7kzmg24ywa7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/react-snippets";
+          sha256 = "0chs0h41nb2fdz02hdsaynz7ma8fg66a8m1q1np0464skrsdaj73";
+          name = "react-snippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/react-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    readability = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth, ov }:
+    melpaBuild {
+        pname = "readability";
+        version = "20140715.1927";
+        src = fetchFromGitHub {
+          owner = "ShingoFukuyama";
+          repo = "emacs-readability";
+          rev = "6c220ab8e0ca63946574ed892add5c8fd14002ce";
+          sha256 = "0kg18ybgwcxhv5fiya5d3wn5w9si4914q946gjannk67d6jcq08g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/readability";
+          sha256 = "0kg91ma9k3p5ps467jjz2lw13rv1l8ivwc3zpg6c1rl474ds0qqv";
+          name = "readability";
+        };
+        packageRequires = [ emacs oauth ov ];
+        meta = {
+          homepage = "http://melpa.org/#/readability";
+          license = lib.licenses.free;
+        };
+      }) {};
+    readline-complete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "readline-complete";
+        version = "20150708.937";
+        src = fetchFromGitHub {
+          owner = "monsanto";
+          repo = "readline-complete.el";
+          rev = "30c020c37b2741160cc37e656e13c85d826a0ebf";
+          sha256 = "1j5b5xapflwzh8a297gva0l12ralwa9vl5z3bb75c9ksjkhi4nm6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/readline-complete";
+          sha256 = "1qymk5ypv6ljk8x49z4jcifz7c2dqcg5181f4hqh67g1byvj2277";
+          name = "readline-complete";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/readline-complete";
+          license = lib.licenses.free;
+        };
+      }) {};
+    real-auto-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "real-auto-save";
+        version = "20150701.1015";
+        src = fetchFromGitHub {
+          owner = "chillaranand";
+          repo = "real-auto-save";
+          rev = "81bf61742ea553ccdee0e22d3abb43fcf07f82cf";
+          sha256 = "1kghhps8mqys5l59qwzv3fgy1fvb15cnyaxmk29v818a6khjc5l2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/real-auto-save";
+          sha256 = "03dbbizpyg62v6zbq8hd16ikrifz8m2bdlbb3g67f2834xqmxha8";
+          name = "real-auto-save";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/real-auto-save";
+          license = lib.licenses.free;
+        };
+      }) {};
+    realgud = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, load-relative, loc-changes, melpaBuild, test-simple }:
+    melpaBuild {
+        pname = "realgud";
+        version = "20160110.1640";
+        src = fetchFromGitHub {
+          owner = "rocky";
+          repo = "emacs-dbgr";
+          rev = "8c8f9f13d6dcfa8c1db9726064ccc6da17ebee55";
+          sha256 = "0v02kf8dcxrl09g72d1s8akn8qifvdwgxgnwrbdc1z6n53pi07z5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/realgud";
+          sha256 = "15vlln4w4wlgrk5i5nhgvjcbardpahgs9kwwayb1vmj10c8a837s";
+          name = "realgud";
+        };
+        packageRequires = [ list-utils load-relative loc-changes test-simple ];
+        meta = {
+          homepage = "http://melpa.org/#/realgud";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rebox2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rebox2";
+        version = "20121113.700";
+        src = fetchFromGitHub {
+          owner = "lewang";
+          repo = "rebox2";
+          rev = "00634eca420cc48657b81e40e599ff8548083985";
+          sha256 = "1xh9nxqfg9abcl41ni69rnwjfgyfr0pbl55dzyxsbh6sb36r3h8z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rebox2";
+          sha256 = "06ra50afjqac9ck1s9gaxy0sqxcb612wzd28s4q4imicqpgfxzjw";
+          name = "rebox2";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rebox2";
+          license = lib.licenses.free;
+        };
+      }) {};
+    recentf-ext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "recentf-ext";
+        version = "20130130.1550";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/recentf-ext.el";
+          sha256 = "15kwkphrlxq6nbmqm95sxv4rykl1d35sjm59ncy07ncqm706h33l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/recentf-ext";
+          sha256 = "1m54w1n3ci5j7i1jhw6cs7dgzmxrj1hsrrarqlrd1d4iqhixjzbq";
+          name = "recentf-ext";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/recentf-ext";
+          license = lib.licenses.free;
+        };
+      }) {};
+    recompile-on-save = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "recompile-on-save";
+        version = "20151126.846";
+        src = fetchFromGitHub {
+          owner = "maio";
+          repo = "recompile-on-save.el";
+          rev = "92e11446869d878803d4f3dec5d2101380c12bb2";
+          sha256 = "0wk28blnfks987iby0p3qpd4nxnz6sqn4fx8g59gyddjhav51lri";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/recompile-on-save";
+          sha256 = "0bg2p7pk4jlpqc7lg48mxd6zkwnx15r0r7lmsxgx9dv1ilfwrmgn";
+          name = "recompile-on-save";
+        };
+        packageRequires = [ cl-lib dash ];
+        meta = {
+          homepage = "http://melpa.org/#/recompile-on-save";
+          license = lib.licenses.free;
+        };
+      }) {};
+    recover-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "recover-buffers";
+        version = "20150812.205";
+        src = fetchFromGitHub {
+          owner = "tripleee";
+          repo = "recover-buffers";
+          rev = "a1db7f084977697081da3497628e3514e032b966";
+          sha256 = "114ssmby614xjs7mrpbbsdd4gj5ra6klfh8h6z8iij8xn3kii83q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/recover-buffers";
+          sha256 = "0g40d7440hzlc9b45v63ng0anvmgip4dhbd9wcm2sn8qjfr4w11b";
+          name = "recover-buffers";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/recover-buffers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rect-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rect-plus";
+        version = "20150620.1944";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-rectplus";
+          rev = "299b742faa0bc4448e0d5fe9cb98ab1eb93b8dcc";
+          sha256 = "1vpsihrl03hkd6n6b7mrjccm0a023qf3154a8rw4chihikxw27pj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rect+";
+          sha256 = "0vk0jwpl6yp2md9nh0ghp2qn883a8lr3cq8c9mgq0g552dwdiv5m";
+          name = "rect-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rect+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rectangle-utils = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rectangle-utils";
+        version = "20150528.1428";
+        src = fetchFromGitHub {
+          owner = "thierryvolpiatto";
+          repo = "rectangle-utils";
+          rev = "81071e62862c0062b8559eb217e6658878c34a1e";
+          sha256 = "14ysbjdndsmcc4j3zhc3nfjxhdm9310jx237mrp98ancxdhsh4q9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rectangle-utils";
+          sha256 = "1w5z2gykydsfp30ahqjihpvq04c5v0cfslbrrg429hycys8apws7";
+          name = "rectangle-utils";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/rectangle-utils";
+          license = lib.licenses.free;
+        };
+      }) {};
+    recursive-narrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "recursive-narrow";
+        version = "20140902.1227";
+        src = fetchFromGitHub {
+          owner = "nflath";
+          repo = "recursive-narrow";
+          rev = "bc0cab88234ca92640d4b8da0d83e132c1897922";
+          sha256 = "1mj7lyadzn3bwig3f9zariq5z4fg6liqnjvfd34yx88xc52nwf33";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/recursive-narrow";
+          sha256 = "1bx8l8wjxrkv949c73dp93knbn1iwnblcm8iw822mq2mgbgwsa7f";
+          name = "recursive-narrow";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/recursive-narrow";
+          license = lib.licenses.free;
+        };
+      }) {};
+    redis = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "redis";
+        version = "20150531.1448";
+        src = fetchFromGitHub {
+          owner = "emacs-pe";
+          repo = "redis.el";
+          rev = "2c33f3397bc14e7a8192867b55920492d4eead8c";
+          sha256 = "1rjpf23a8rggjmmxvm1997d3xz03kz84xams486b9ky0n2v02d57";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/redis";
+          sha256 = "1awnilb8bk0izp6yw0187ybh9slf1hc51014xvvmj90darxby79a";
+          name = "redis";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/redis";
+          license = lib.licenses.free;
+        };
+      }) {};
+    redo-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "redo-plus";
+        version = "20131117.551";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/redo+.el";
+          sha256 = "1jc4n60spzssa57i3jwrqwy20f741hb271vmmx49riycx1ybx3d3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/redo+";
+          sha256 = "1alfs7k5mydgvzsjmdifcizqgrqjrk2kbh3mabai7nlrwi47w9n2";
+          name = "redo-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/redo+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    redpen-paragraph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "redpen-paragraph";
+        version = "20151206.941";
+        src = fetchFromGitHub {
+          owner = "karronoli";
+          repo = "redpen-paragraph.el";
+          rev = "dcba4dc48593fedd48e398af50f6cdc60f453a07";
+          sha256 = "0s38mi9w1dm9fzhd3l8xvq9x33rkb5vvd66jibza50dhn9dmakax";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/redpen-paragraph";
+          sha256 = "0jr707ik6fhznq0q421l986w85ah0n9b4is91zrgbk1v6miqrhca";
+          name = "redpen-paragraph";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/redpen-paragraph";
+          license = lib.licenses.free;
+        };
+      }) {};
+    redshank = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "redshank";
+        version = "20120510.1430";
+        src = fetchgit {
+          url = "http://www.foldr.org/~michaelw/projects/redshank.git";
+          rev = "f98e68f532e622bcd464292ca4a9cf5fbea14ebb";
+          sha256 = "5547c5db0caa147ae2fa0099b9c58a8629b47bf4facb6c5cc72cee45e84be392";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/redshank";
+          sha256 = "07s4gja1w8piabkajbzrgq77mkdkxr0jy9bmy2qb9w2svfsyns9b";
+          name = "redshank";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/redshank";
+          license = lib.licenses.free;
+        };
+      }) {};
+    refheap = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "refheap";
+        version = "20140902.1602";
+        src = fetchFromGitHub {
+          owner = "Raynes";
+          repo = "refheap.el";
+          rev = "d41f8efb8e913b29035f545914859e3f18287492";
+          sha256 = "08kzi2jcfqnlanqzvbk5gq1if7k8qc9gmz5bmvd2mvmx6z436398";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/refheap";
+          sha256 = "0pzark1db9k2pavd5sn89a28gd9j5jlkx3wkhwfzln3y5c1wnvdk";
+          name = "refheap";
+        };
+        packageRequires = [ json ];
+        meta = {
+          homepage = "http://melpa.org/#/refheap";
+          license = lib.licenses.free;
+        };
+      }) {};
+    regex-dsl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "regex-dsl";
+        version = "20100124.428";
+        src = fetchFromGitHub {
+          owner = "alk";
+          repo = "elisp-regex-dsl";
+          rev = "ac89ab8b7691a165ef3007cb84417125cfc0632e";
+          sha256 = "1d34jd7is979vfgdy56zkd1m15ng3waiabfpak6dv6ak3cdh5fgx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/regex-dsl";
+          sha256 = "129sapsmvcqqqgcr9xlmxwszsxvsb4nj9g2fxsl4y6r383840jbr";
+          name = "regex-dsl";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/regex-dsl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    regex-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "regex-tool";
+        version = "20131104.1634";
+        src = fetchFromGitHub {
+          owner = "jwiegley";
+          repo = "regex-tool";
+          rev = "62b292d93f29e4c4767b0800d53c656b9f626892";
+          sha256 = "1wr12j16hckvc8bxxgxw280frl12h23cp44sxg28lczl16d9693l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/regex-tool";
+          sha256 = "1nd23vjij5h5gk5l7hbd5ks9ljisn054wp138jx2v6i51izxvh2v";
+          name = "regex-tool";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/regex-tool";
+          license = lib.licenses.free;
+        };
+      }) {};
+    region-bindings-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "region-bindings-mode";
+        version = "20140407.1714";
+        src = fetchFromGitHub {
+          owner = "fgallina";
+          repo = "region-bindings-mode";
+          rev = "3fa5dbdbd7c000bebff6d9d14a4be326ec24b6fc";
+          sha256 = "02kfi3c6ydnr7xw611ck66kfjyl5w86dr9vfjv3wjl6ad9jya4zy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/region-bindings-mode";
+          sha256 = "141q4x6rilidpnsm9s78qks9i1v6ng0ydhbzqi39xcaccfyyjb69";
+          name = "region-bindings-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/region-bindings-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    region-state = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "region-state";
+        version = "20151128.438";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "region-state.el";
+          rev = "07ffb7d9ada2fcd204f3447f078c265d25f36f60";
+          sha256 = "0gsh0x1rqxvzrszdyna9d8b8w22mqnd9yqcwzay2prc6rpl26g1f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/region-state";
+          sha256 = "1iq2x1w8lqjjiwjja7r3qki6drvydnk171k9fj9g6rk7wslknz8x";
+          name = "region-state";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/region-state";
+          license = lib.licenses.free;
+        };
+      }) {};
+    register-channel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "register-channel";
+        version = "20150513.2259";
+        src = fetchFromGitHub {
+          owner = "YangZhao11";
+          repo = "register-channel";
+          rev = "f62f9a62ebd2537d4a8c8f2e358562c67d2aefc1";
+          sha256 = "01k3v4yiilz1k6drv7b2x6zbjx6dlz7cch8rq63mwc7v8kvdnqmi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/register-channel";
+          sha256 = "037i2fgxxsfb85vd6xk17wyh7ny6fqfixvb0a18lf8m1hib1gyhr";
+          name = "register-channel";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/register-channel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    relative-buffers = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "relative-buffers";
+        version = "20150115.1301";
+        src = fetchFromGitHub {
+          owner = "proofit404";
+          repo = "relative-buffers";
+          rev = "7e37e118cc231c8581891bef0e4b5bb775920070";
+          sha256 = "023fwcqyy5gg234m772vpws751pharjwn3b0433i2sszna2z6xrf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/relative-buffers";
+          sha256 = "131182yb0pr0d6jibqd8aag4w8hywdyi87ldp77b95gw4bqhr96i";
+          name = "relative-buffers";
+        };
+        packageRequires = [ cl-lib dash f s ];
+        meta = {
+          homepage = "http://melpa.org/#/relative-buffers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    relative-line-numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "relative-line-numbers";
+        version = "20151006.1646";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "relative-line-numbers";
+          rev = "64157db08b0c2f5fada3209fc8d3e4b4c7429978";
+          sha256 = "1r8fhs7d2vkrbv15ic2bm79i9a8swbc38vk566vnxkhl3rfd5a0a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/relative-line-numbers";
+          sha256 = "0mj1w5a4ax8hwz41vn02bacxlnifd14hvf3p288ljvwchvlf0hn3";
+          name = "relative-line-numbers";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/relative-line-numbers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    relax = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "relax";
+        version = "20131029.1634";
+        src = fetchFromGitHub {
+          owner = "technomancy";
+          repo = "relax.el";
+          rev = "6e33892623ab87833082262321dc8e1977209626";
+          sha256 = "0lqbhwi1f8b4sv9p1rf0gyjllk0l7g6v6mlws496079wxx1n5j66";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/relax";
+          sha256 = "0gfr4ym6aakawhkfz40ar2n0rfz503hq428yj6rbf7jmq3ajaysk";
+          name = "relax";
+        };
+        packageRequires = [ json ];
+        meta = {
+          homepage = "http://melpa.org/#/relax";
+          license = lib.licenses.free;
+        };
+      }) {};
+    remark-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
+    melpaBuild {
+        pname = "remark-mode";
+        version = "20151004.1155";
+        src = fetchFromGitHub {
+          owner = "torgeir";
+          repo = "remark-mode.el";
+          rev = "a7e22eaf17673bd5cbf2f80bdfb219c89c1ea74b";
+          sha256 = "0w40cx58c0hmc0yzs8maq1389hwha0qwfbz76pc6kpcx14v1gkhh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/remark-mode";
+          sha256 = "1zl8k3h4acbgb3hmjs2b4a14g0s0vl3xamrqxrr742zmqpr1h0w0";
+          name = "remark-mode";
+        };
+        packageRequires = [ markdown-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/remark-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    repeatable-motion = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "repeatable-motion";
+        version = "20150629.1312";
+        src = fetchFromGitHub {
+          owner = "willghatch";
+          repo = "emacs-repeatable-motion";
+          rev = "e664b0a4a3e39c4085378a28b5136b349a0afb22";
+          sha256 = "007lqahjbig6yygqik6fgbq114784z6l40a3vrc4qs9361zqizck";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/repeatable-motion";
+          sha256 = "12z4z8apd8ksf6dfvqm54l71mx68j0yg4hrjypa9p77fpcd6p0zw";
+          name = "repeatable-motion";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/repeatable-motion";
+          license = lib.licenses.free;
+        };
+      }) {};
+    repl-toggle = callPackage ({ fetchFromGitHub, fetchurl, fullframe, lib, melpaBuild }:
+    melpaBuild {
+        pname = "repl-toggle";
+        version = "20160118.827";
+        src = fetchFromGitHub {
+          owner = "tomterl";
+          repo = "repl-toggle";
+          rev = "22ac44d0251d4f65591e4e48a03f8ab188429656";
+          sha256 = "0lxadfwyflcp8bgz8xp19f150faby023icbljyk5q52s2fl9g79w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/repl-toggle";
+          sha256 = "1jyaksxgyygfv1wn9c6y8sykb4hicwgs9n5vrdikd2i0iix29zpb";
+          name = "repl-toggle";
+        };
+        packageRequires = [ fullframe ];
+        meta = {
+          homepage = "http://melpa.org/#/repl-toggle";
+          license = lib.licenses.free;
+        };
+      }) {};
+    replace-from-region = callPackage ({ fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "replace-from-region";
+        version = "20150406.1930";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/replace-from-region.el";
+          sha256 = "1clxkzxqsm91zbzv8nffav224ldr04ww5lppga2l41xjfl6z12qb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/replace-from-region";
+          sha256 = "19q8hz2xiyamhw8hzpahqwd4352k1m9r9wlh9kdh6hbb6sjgllnb";
+          name = "replace-from-region";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/replace-from-region";
+          license = lib.licenses.free;
+        };
+      }) {};
+    replace-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "replace-plus";
+        version = "20151231.1749";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/replace+.el";
+          sha256 = "1af4sdhkzxknqzdkzc5gpm5j3s5k776j293hqq7cqzk533fdh4iz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/replace+";
+          sha256 = "1imsgr3v8g2p2mnkzp92ga3nvckr758pblmlha8gh8mb80089krn";
+          name = "replace-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/replace+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    replace-symbol = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "replace-symbol";
+        version = "20151030.1857";
+        src = fetchFromGitHub {
+          owner = "bmastenbrook";
+          repo = "replace-symbol-el";
+          rev = "6af93ad5a23790c90595c92bf2dcb69cd6d5f820";
+          sha256 = "0ks884jhxqkr8j38r9m4s56krm2gpkm0v5d51zzivcfhs30s6nff";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/replace-symbol";
+          sha256 = "07ljmw6aw9hsqffhwmiq2pvhry27acg6f4vgxgi91vjr8jj3r4ng";
+          name = "replace-symbol";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/replace-symbol";
+          license = lib.licenses.free;
+        };
+      }) {};
+    repo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "repo";
+        version = "20160114.1314";
+        src = fetchFromGitHub {
+          owner = "canatella";
+          repo = "repo-el";
+          rev = "98bde6fdc840d42a24c5784ee440cad39e8264d9";
+          sha256 = "0hs80g3npgb6qfcaivdfkpsc9mss1kdmyp5j7s922qcy2k4yxmgl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/repo";
+          sha256 = "0z4lcswh0c6xnsxlv33bsxh0nh26ydzfl8sv8xabdp5a2gk6bhpb";
+          name = "repo";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/repo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, lib, log4e, melpaBuild, use-package }:
+    melpaBuild {
+        pname = "req-package";
+        version = "20151220.254";
+        src = fetchFromGitHub {
+          owner = "edvorg";
+          repo = "req-package";
+          rev = "e52f0b0a8cfc28ae1d13c83fdcf3998a9973e7e5";
+          sha256 = "05a88r2jp169x99abz9wrr1i8ch0bg3dlmaalxwqfmlzci0lksx2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/req-package";
+          sha256 = "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf";
+          name = "req-package";
+        };
+        packageRequires = [ dash ht log4e use-package ];
+        meta = {
+          homepage = "http://melpa.org/#/req-package";
+          license = lib.licenses.free;
+        };
+      }) {};
+    request = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "request";
+        version = "20160108.233";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "emacs-request";
+          rev = "48a35969f7c41810d550e6cdf784cb86c5a05a20";
+          sha256 = "1fiyxbd87cdlsdhpm3b3z8ypkrkvya6lamn0qx9hsxl1yv27vx4m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/request";
+          sha256 = "09gxfy34a13wr0agmhn0nldxaiyc72rx9xi56jirsvji4dg5j6mm";
+          name = "request";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/request";
+          license = lib.licenses.free;
+        };
+      }) {};
+    request-deferred = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "request-deferred";
+        version = "20130526.1215";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "emacs-request";
+          rev = "48a35969f7c41810d550e6cdf784cb86c5a05a20";
+          sha256 = "1fiyxbd87cdlsdhpm3b3z8ypkrkvya6lamn0qx9hsxl1yv27vx4m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/request-deferred";
+          sha256 = "19s8q9a01v0g897s9ass1mr5wbzy82rrfcnqpvcvp05q4y787dn9";
+          name = "request-deferred";
+        };
+        packageRequires = [ deferred request ];
+        meta = {
+          homepage = "http://melpa.org/#/request-deferred";
+          license = lib.licenses.free;
+        };
+      }) {};
+    requirejs = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, popup, s, yasnippet }:
+    melpaBuild {
+        pname = "requirejs";
+        version = "20151204.119";
+        src = fetchFromGitHub {
+          owner = "joeheyming";
+          repo = "requirejs-emacs";
+          rev = "4ea2a5fcbc76e4cbb6a7461e6f05f019b75865b1";
+          sha256 = "1bfj2zjn3x41jal6c136wnwkgmag27bmrwbfwdylafc7qqk6dflv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/requirejs";
+          sha256 = "09z6r9wcag3gj075wq215zcslyknl1izap595rn48xvizxi06c6k";
+          name = "requirejs";
+        };
+        packageRequires = [ cl-lib js2-mode popup s yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/requirejs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    requirejs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "requirejs-mode";
+        version = "20130215.1504";
+        src = fetchFromGitHub {
+          owner = "ricardmo";
+          repo = "requirejs-mode";
+          rev = "bbb0c09f8eb2d6a33c17319be8137f68bb16bc92";
+          sha256 = "02wva5q8mvc0a5kms2wm1gyaag2x3zd6fkkpl4218nrbb0mbficv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/requirejs-mode";
+          sha256 = "1sq1kim17bcmh39106vfgm7gq9nj9943lw8by0bpi5qr8xdjsn5r";
+          name = "requirejs-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/requirejs-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    resize-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "resize-window";
+        version = "20151126.2229";
+        src = fetchFromGitHub {
+          owner = "dpsutton";
+          repo = "resize-window";
+          rev = "f239c1718111a20a4139d33ff602de24aa7514ac";
+          sha256 = "055km3g4bwl73kca6ky3qzzmy103w0mqcfscj33ppdhg2n7m94n0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/resize-window";
+          sha256 = "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l";
+          name = "resize-window";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/resize-window";
+          license = lib.licenses.free;
+        };
+      }) {};
+    restart-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "restart-emacs";
+        version = "20151203.1035";
+        src = fetchFromGitHub {
+          owner = "iqbalansari";
+          repo = "restart-emacs";
+          rev = "f0e8e1ae1bb5f4e50a99d220c39913ef300f44c8";
+          sha256 = "0gbm208hmmmpjyj0x3z0cszphawkgvjqzi5idbdca3gikyiqw80n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/restart-emacs";
+          sha256 = "03aabz7fmy99nwimvjn7qz6pvc94i470hfgiwmjz3348cw02k0n6";
+          name = "restart-emacs";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/restart-emacs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "restclient";
+        version = "20151128.1712";
+        src = fetchFromGitHub {
+          owner = "pashky";
+          repo = "restclient.el";
+          rev = "2075b17e2f8e118cf0739e4087f791ed724be1ad";
+          sha256 = "08j4m70j9xdl731bwa4vh656lji0w0f9mm1aki0qqd5msglw6kvx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/restclient";
+          sha256 = "14wxfhb17n2f9wil68lb05abj7m0whwkqvrm3y9dg9mh14lcpbvc";
+          name = "restclient";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/restclient";
+          license = lib.licenses.free;
+        };
+      }) {};
+    reveal-in-osx-finder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "reveal-in-osx-finder";
+        version = "20150802.1157";
+        src = fetchFromGitHub {
+          owner = "kaz-yos";
+          repo = "reveal-in-osx-finder";
+          rev = "5710e5936e47139a610ec9a06899f72e77ddc7bc";
+          sha256 = "1q13cgpz4wzhnqv84ablawy3y2wgdwy46sp7454mmfx9m77jzb2v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/reveal-in-osx-finder";
+          sha256 = "00jgrmh5s3vlpj1jjf8l3c3h4hjk5x781m95sidw6chimizvfmfc";
+          name = "reveal-in-osx-finder";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/reveal-in-osx-finder";
+          license = lib.licenses.free;
+        };
+      }) {};
+    reveal-next = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "reveal-next";
+        version = "20151231.1750";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/reveal-next.el";
+          sha256 = "1h27kg2k8f6smbqxandmvg859qk66jydbbbiwwjmk7316k66w8qa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/reveal-next";
+          sha256 = "0fp6ssd4fad0s2pbxbw75bnx7fcgasig8xvcx7nls8m9p6zbbmh2";
+          name = "reveal-next";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/reveal-next";
+          license = lib.licenses.free;
+        };
+      }) {};
+    reverse-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "reverse-theme";
+        version = "20141204.1945";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-reverse-theme";
+          rev = "8319d0d5342890a3530ffa4daafdb7c35feda1ca";
+          sha256 = "002ywhjms8ybk7cma2p2i11z3fz6kb0w8mlafysm911rvcq2hg5f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/reverse-theme";
+          sha256 = "1lq8nwhf8n5i280v0kqksndm4b3n6x34wnd5fa5i48ljwr5cinih";
+          name = "reverse-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/reverse-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    review-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "review-mode";
+        version = "20150110.812";
+        src = fetchFromGitHub {
+          owner = "kmuto";
+          repo = "review-el";
+          rev = "d043b227eb1cd10361f8117c17de9a67caebe96a";
+          sha256 = "0lzsy68k7sm9d3r8lzhzx9alc1f0cgfclry40pa4x0ilkcr7ysch";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/review-mode";
+          sha256 = "0wapicggkngpdzi0yxc0b24s526fs819rc2d6miv6ix3gnw11n0n";
+          name = "review-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/review-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    revive = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "revive";
+        version = "20150417.1755";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "revive";
+          rev = "16e1ac7cfa2fdccddf60d4a0e15731fc7448d818";
+          sha256 = "037sac5fvz6l2zgzlf8ykk4jf9zhj7ybzyz013jqzjj47a6sn1r1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/revive";
+          sha256 = "1l7c6zq3ga2k1488qb0hgxlk08p3vrcf0sx116c1f8z8nf4c8ny5";
+          name = "revive";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/revive";
+          license = lib.licenses.free;
+        };
+      }) {};
+    reykjavik-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "reykjavik-theme";
+        version = "20160109.200";
+        src = fetchFromGitHub {
+          owner = "mswift42";
+          repo = "reykjavik-theme";
+          rev = "d9bb783d6cf3c3b52cf377d9207484fba54657fd";
+          sha256 = "0zmby92mjszh77r5wh8sccqv3a5bb9sfhac8g55nasavw8hfplvj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/reykjavik-theme";
+          sha256 = "1f0q2gfzkmpd374jryrd1lgg8xj6rwdq181jhppj3rfjizgw4l35";
+          name = "reykjavik-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/reykjavik-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rfringe = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "rfringe";
+        version = "20110405.1020";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/rfringe.el";
+          sha256 = "02i5znln0aphvmvaia3sz75bvjhqwyjq1blf5qkcbprnn95lm3yh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rfringe";
+          sha256 = "171gzfciz78l6b653acgfailxpwmh8m1dm0dzpg0b1k0ny3aiwf6";
+          name = "rfringe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rfringe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rhtml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rhtml-mode";
+        version = "20130422.811";
+        src = fetchFromGitHub {
+          owner = "eschulte";
+          repo = "rhtml";
+          rev = "a6d71b38a3db867ccf82999c99805db1a3a33c33";
+          sha256 = "1qlpv5lzj4yfyjgdykhm6q9izg6g0z5pf5nmynj42vsx7v8bhy1x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rhtml-mode";
+          sha256 = "038j5jkcckmhlq3vz4h07s5y2scljh1fdn9r614hiyxwgk48lc35";
+          name = "rhtml-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rhtml-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rich-minority = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rich-minority";
+        version = "20151201.600";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "rich-minority";
+          rev = "311ac8ee54078f95b7279e532da6cf5a2afb4125";
+          sha256 = "11hwf9y5ax207w6rwrsmi3pmn7pn7ap6iys0z8hni2f5zzxjrmx3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rich-minority";
+          sha256 = "11xd76w5k3b3q5bxqjb55vi6dsal9drvyc1nh7z83awm59hvgczc";
+          name = "rich-minority";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/rich-minority";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rigid-tabs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rigid-tabs";
+        version = "20150807.1056";
+        src = fetchFromGitHub {
+          owner = "wavexx";
+          repo = "rigid-tabs.el";
+          rev = "c7c6b726806df7e8cb25a41b213a207850c91cb7";
+          sha256 = "0p044wg9d4i6f5x7bdshmisgwvw424y16lixac93q6v5bh3xmab5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rigid-tabs";
+          sha256 = "06n0bcvc3nnp84pcq3lywwga7l92jz8hnkilhbq59kydf5zbjldp";
+          name = "rigid-tabs";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/rigid-tabs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rinari = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, jump, lib, melpaBuild, ruby-compilation, ruby-mode ? null }:
+    melpaBuild {
+        pname = "rinari";
+        version = "20150709.140";
+        src = fetchFromGitHub {
+          owner = "eschulte";
+          repo = "rinari";
+          rev = "be07b0f42aefa24c5d36c441d1f3f72e64fffaa4";
+          sha256 = "1kg83z10jw4ik0aapv9cjqlvqy31rln2am8vh3f77zh61qha37hx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rinari";
+          sha256 = "0qknicg3vzl7zbkwsdvp10hrvlng6mbi8hgslx4ir522dflrf9p0";
+          name = "rinari";
+        };
+        packageRequires = [ inf-ruby jump ruby-compilation ruby-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/rinari";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rings = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rings";
+        version = "20140102.1736";
+        src = fetchFromGitHub {
+          owner = "konr";
+          repo = "rings";
+          rev = "1655dbf88ad877f54d67fab49f292945f70708eb";
+          sha256 = "0imsc44mcy5abmfin28d13l8mjjvyx6hxcsk81r0i8h12mxlmfkp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rings";
+          sha256 = "1ncsb4jip07hbrf1l4j9yzn3l0kb63ylhzzsb4bb2yx6as4a66k7";
+          name = "rings";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rings";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rnc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rnc-mode";
+        version = "20121227.1702";
+        src = fetchFromGitHub {
+          owner = "TreeRex";
+          repo = "rnc-mode";
+          rev = "b39dc23218213336b55f28e12a1d0e49ef7c1e21";
+          sha256 = "1drvyf5asjp3lgpss7llff35q8r89vmh73n1axaj2qp9jx5a5jih";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rnc-mode";
+          sha256 = "09ly7ln6qrcmmim9bl7kd50h4axrhy6ig406r352xm4a9zc8n22q";
+          name = "rnc-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rnc-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
+    melpaBuild {
+        pname = "robe";
+        version = "20151230.649";
+        src = fetchFromGitHub {
+          owner = "dgutov";
+          repo = "robe";
+          rev = "af3d1a8deb7f1531b95112b955fce91d5f5d1ea6";
+          sha256 = "1blpkd9sb7wcn4mkjbn20ppva47v1rm0j43hm337cbcsw5f63x6s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/robe";
+          sha256 = "19py2lwi7maya90kh1mgwqb16j72f7gm05dwla6xrzq1aks18wrk";
+          name = "robe";
+        };
+        packageRequires = [ inf-ruby ];
+        meta = {
+          homepage = "http://melpa.org/#/robe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    roguel-ike = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "roguel-ike";
+        version = "20140227.929";
+        src = fetchFromGitHub {
+          owner = "stevenremot";
+          repo = "roguel-ike";
+          rev = "6d9322ad9d43d0c7465f125c8e08b222866e6923";
+          sha256 = "108j3106n9anas07mj26xlrvscsl5irshd39czkippla84gwmgyc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/roguel-ike";
+          sha256 = "1a7sa6nhgi0s4gjh55bhk5cg6q6s7564fk008ibmrm05gfq9wlg8";
+          name = "roguel-ike";
+        };
+        packageRequires = [ popup ];
+        meta = {
+          homepage = "http://melpa.org/#/roguel-ike";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rope-read-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rope-read-mode";
+        version = "20160110.1233";
+        src = fetchFromGitHub {
+          owner = "marcowahl";
+          repo = "rope-read-mode";
+          rev = "3d8ba4999dbdbf025197ee43dfd7a9ee9c25e78e";
+          sha256 = "0k88zjz4v2qllz9bkrhza91ckw5xx4aimgmcqpzcq3zl5py36h4l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rope-read-mode";
+          sha256 = "0grnn5k6rbck0hz4c6cadgj3a4dv62habyingznisg2kx9i3m0dw";
+          name = "rope-read-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rope-read-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rotate";
+        version = "20140123.316";
+        src = fetchFromGitHub {
+          owner = "daic-h";
+          repo = "emacs-rotate";
+          rev = "04b64c6e20c465102ecafe0e099986b0808582bf";
+          sha256 = "0spgpq2cmckpl7j2193axy5yqws5dwrhik69d0bv0ylwzxp3npvg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rotate";
+          sha256 = "0dygdd24flbgqp049sl4p8rymvv8h881hz9lvz8hnfwq687yyclx";
+          name = "rotate";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rotate";
+          license = lib.licenses.free;
+        };
+      }) {};
+    roy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "roy-mode";
+        version = "20121208.558";
+        src = fetchFromGitHub {
+          owner = "folone";
+          repo = "roy-mode";
+          rev = "0416f561edbc6b4a29fced8be84d2527a9613d65";
+          sha256 = "04jbnm9is2cis75h40znqzjvyjq27ncr2vfank6zglzi4fhxsl0r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/roy-mode";
+          sha256 = "0ch0hamvw4gsqs2pap0h6w4cj6n73jqa75if0ymh73hk5i3acm8g";
+          name = "roy-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/roy-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rpm-spec-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rpm-spec-mode";
+        version = "20150411.1055";
+        src = fetchFromGitHub {
+          owner = "bjorlykke";
+          repo = "rpm-spec-mode";
+          rev = "7d06d19a31e888b932da6c8202ff2c73f42703a1";
+          sha256 = "01rb6qfsk4f33nkfdzvvjkw96ip1dv0py8i30l8ix9cqbk07svsv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rpm-spec-mode";
+          sha256 = "01vggdv8sac4p0szwk7xgxcglmd5a1hv5q0ylf8zcp1lsyyh8ypd";
+          name = "rpm-spec-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rpm-spec-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rpn-calc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "rpn-calc";
+        version = "20150302.734";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "rpn-calc";
+          rev = "ed202e9eb59c4ace74b4703174f7bc7fa7e2d594";
+          sha256 = "0i5qwbhhdnspgs2y67kkgbk9zq6fx2j509q92mgfzbvjnf54h1r8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rpn-calc";
+          sha256 = "04dj2r4035k0c3x6iyjydshzmq381d60pmscp2hg5m7sp7bqn5xs";
+          name = "rpn-calc";
+        };
+        packageRequires = [ popup ];
+        meta = {
+          homepage = "http://melpa.org/#/rpn-calc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rsense = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rsense";
+        version = "20100510.2305";
+        src = fetchFromGitHub {
+          owner = "m2ym";
+          repo = "rsense";
+          rev = "8b5ee58318747ca1dde84ee41d48c4f50175cf35";
+          sha256 = "0xkr1qn8fm3kv5c11janq5acp1q02abvxc463zijvm2qk735yl4d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rsense";
+          sha256 = "1901xqlpc8fg4sl9j58jn40i2djs8s0cdcqcrzrq02lvk8ssfdf5";
+          name = "rsense";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rsense";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
+    melpaBuild {
+        pname = "rspec-mode";
+        version = "20160113.1658";
+        src = fetchFromGitHub {
+          owner = "pezra";
+          repo = "rspec-mode";
+          rev = "5dbf9c33ca09510f66980fa948a42c692e60fedc";
+          sha256 = "11yb93sfp9ppbp7fsxr3z2pv37hcig1k6g096b3c438f01z51ha6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rspec-mode";
+          sha256 = "0nyib9rx9w9cbsgkcjx9n8fp77xkzxg923z0rdm3f9kc7njcn0zx";
+          name = "rspec-mode";
+        };
+        packageRequires = [ cl-lib ruby-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/rspec-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rtags";
+        version = "20160114.1314";
+        src = fetchFromGitHub {
+          owner = "Andersbakken";
+          repo = "rtags";
+          rev = "76bfbf25d35dbef636398ce95afcaae0b0437347";
+          sha256 = "144drv24hpjvy2y8ds24nxf6cwmgmiq8z9ndvri4y69kdspqlv5z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rtags";
+          sha256 = "16jvbr4nm48p3dj9wmysjaxyz4ajcay19risqrs9fzrifkr21c9p";
+          name = "rtags";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rtags";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rtm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rtm";
+        version = "20160116.1127";
+        src = fetchFromGitHub {
+          owner = "pmiddend";
+          repo = "emacs-rtm";
+          rev = "dfc1440178d479b1f81ba60b8bfc068384a603a0";
+          sha256 = "1gqvp0h5zy2023gdzf7pw28rl27lzml87vpbi1zaw4bmj82zgh3f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rtm";
+          sha256 = "1ni2610svxziq1gq6s6igkhqyafvgn02gnw7jbm3ir7ks4w2imzf";
+          name = "rtm";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/rtm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rubocop = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rubocop";
+        version = "20151123.2337";
+        src = fetchFromGitHub {
+          owner = "bbatsov";
+          repo = "rubocop-emacs";
+          rev = "c54905256410ce2aed6725d5b5f7ed61d4ddc956";
+          sha256 = "1y5z0kr4qwd4fyvhk0rhpbbp6dw2jpzrawx62jid5539wrdjcabk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rubocop";
+          sha256 = "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q";
+          name = "rubocop";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/rubocop";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ruby-additional = callPackage ({ emacs, fetchsvn, fetchurl, lib, melpaBuild, ruby-mode ? null }:
+    melpaBuild {
+        pname = "ruby-additional";
+        version = "20091002.545";
+        src = fetchsvn {
+          url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
+          rev = "53578";
+          sha256 = "0wrjx25qg1dpgw0gih7fd679fv3q78cwaqyrf5dh1kq8g8cr5xhs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-additional";
+          sha256 = "0h0cxik8lp8g81bvp06mddikkk5bjdlch2wffcvsvi01is408w4w";
+          name = "ruby-additional";
+        };
+        packageRequires = [ emacs ruby-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/ruby-additional";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ruby-block = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "ruby-block";
+        version = "20131210.2131";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/ruby-block.el";
+          sha256 = "0c4vy9xsw44g6q9nc8aaav5avgp34h24mvgcnww468afiimivdcq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-block";
+          sha256 = "0jfimjq1xpwxkxya452kp27h0fdiy87aj713w3zsm04k7l6i12hm";
+          name = "ruby-block";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ruby-block";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ruby-compilation = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ruby-compilation";
+        version = "20150709.140";
+        src = fetchFromGitHub {
+          owner = "eschulte";
+          repo = "rinari";
+          rev = "be07b0f42aefa24c5d36c441d1f3f72e64fffaa4";
+          sha256 = "1kg83z10jw4ik0aapv9cjqlvqy31rln2am8vh3f77zh61qha37hx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-compilation";
+          sha256 = "1x1vpkjpx95sfcjhkx4cafypj0nkbd1i0mzxx3lmcrsmg8iv0rjc";
+          name = "ruby-compilation";
+        };
+        packageRequires = [ inf-ruby ];
+        meta = {
+          homepage = "http://melpa.org/#/ruby-compilation";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ruby-dev = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ruby-dev";
+        version = "20130811.351";
+        src = fetchFromGitHub {
+          owner = "Mon-Ouie";
+          repo = "ruby-dev.el";
+          rev = "3a6f6e489697916dd554852492bd325879be2e44";
+          sha256 = "1cy5zmdfwsjw8jla8mxjm1cmvrv727fwq1kqhjr5nxj0flwsm4x1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-dev";
+          sha256 = "0mf2ra3p5976qn4ryc2s20vi0nrzwcg3xvsgppsc0bsirjw2l0fh";
+          name = "ruby-dev";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ruby-dev";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ruby-electric = callPackage ({ fetchsvn, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ruby-electric";
+        version = "20150424.952";
+        src = fetchsvn {
+          url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
+          rev = "53578";
+          sha256 = "0wrjx25qg1dpgw0gih7fd679fv3q78cwaqyrf5dh1kq8g8cr5xhs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-electric";
+          sha256 = "04j04dsknzb7xc8v6alawgcbymdfmh27xnpr98yc8b05nzafw056";
+          name = "ruby-electric";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ruby-electric";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ruby-end = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ruby-end";
+        version = "20141215.623";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "ruby-end";
+          rev = "ea453f5ac6259f09667fa26b865b6afacd06aa97";
+          sha256 = "1x4nvrq5nk50c1l3b5wcr4g1n5nmwafcz1zzc12qzsl5sya7si55";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-end";
+          sha256 = "0cx121hji8ws6s3p2xfdgidm363y05g2n880fqrmzyz27cqkljis";
+          name = "ruby-end";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ruby-end";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ruby-factory = callPackage ({ fetchFromGitHub, fetchurl, inflections, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ruby-factory";
+        version = "20160102.121";
+        src = fetchFromGitHub {
+          owner = "sshaw";
+          repo = "ruby-factory-mode";
+          rev = "2bb7ccc2fccb5257376a989aa395bc7b9eb1d55d";
+          sha256 = "15b2rs6m4d511qqkc2gc8k15mbqzrgv6s3hpypajl8nvqa79xnyd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-factory";
+          sha256 = "0v8009pad0l41zh9r1wzcx1h6vpzhr5rgpq6rb002prxz2lcbd37";
+          name = "ruby-factory";
+        };
+        packageRequires = [ inflections ];
+        meta = {
+          homepage = "http://melpa.org/#/ruby-factory";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ruby-guard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ruby-guard";
+        version = "20141218.2114";
+        src = fetchFromGitHub {
+          owner = "cheunghy";
+          repo = "ruby-guard";
+          rev = "c0bc5c58ad32e1786001aa5cd84f490096a00a4b";
+          sha256 = "034dbz225xxqpi202h4z8zqz3cdfbd8m7vlnh30cb0p8lvgygmj1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-guard";
+          sha256 = "0hwxhirdvaysw9hxcgfdf0l12wilr6b9f9w91pk1hfwfi1w0lfwr";
+          name = "ruby-guard";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ruby-guard";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ruby-hash-syntax = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ruby-hash-syntax";
+        version = "20141010.1039";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "ruby-hash-syntax";
+          rev = "d73a498143a3a8d6d3a7720104f2f14e70b2e2ae";
+          sha256 = "0knl8zrd4pplnzk5z19cf9rqdfr3ymzfssrwp6jhndjzjdwvc2bv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-hash-syntax";
+          sha256 = "0bvwyagfh7mn457iibrpv1ay75089gp8pg608gbm24m0ix82xvb5";
+          name = "ruby-hash-syntax";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ruby-hash-syntax";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ruby-interpolation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ruby-interpolation";
+        version = "20131112.1052";
+        src = fetchFromGitHub {
+          owner = "leoc";
+          repo = "ruby-interpolation.el";
+          rev = "1978e337601222cedf00e117bf4b5cac15d1f203";
+          sha256 = "1r2f5jxi6wnkmr1ssvqgshi97gjvxvf3qqc0njg1s33cy39wpqq5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-interpolation";
+          sha256 = "07idndxw8vgfrk5zfmjjhmixza35mqxwjhsrbjrq5yy72i5ivznp";
+          name = "ruby-interpolation";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ruby-interpolation";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ruby-refactor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
+    melpaBuild {
+        pname = "ruby-refactor";
+        version = "20151208.1207";
+        src = fetchFromGitHub {
+          owner = "ajvargo";
+          repo = "ruby-refactor";
+          rev = "8be821e89dac15fa402dba211a27b843147e4d17";
+          sha256 = "0dk9vkrjncawf4j4y5dky215m0hgl266d9w6mr7g0rgy6m7wfcyq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-refactor";
+          sha256 = "0nwinnnhy72h1ihjlnjl8k8z3yf4nl2z7hfv085gwiacr6nn2rby";
+          name = "ruby-refactor";
+        };
+        packageRequires = [ ruby-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/ruby-refactor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ruby-test-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
+    melpaBuild {
+        pname = "ruby-test-mode";
+        version = "20151127.218";
+        src = fetchFromGitHub {
+          owner = "r0man";
+          repo = "ruby-test-mode";
+          rev = "b7a652b5d0492a3c712090787faa5f206c2af5fb";
+          sha256 = "06fhrn04whqb3n40wkzrwmzbzv7b1m48rd18rx8zpgxhbw8v7rdc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-test-mode";
+          sha256 = "113ysf08bfh2ipk55f8h741j05999yrgx57mzh53rim5n63a312w";
+          name = "ruby-test-mode";
+        };
+        packageRequires = [ ruby-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/ruby-test-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ruby-tools = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ruby-tools";
+        version = "20151209.1015";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "ruby-tools";
+          rev = "6b97066b58a4f82eb2ecea6434a0a7e981aa4c18";
+          sha256 = "0jd9acycpbdd90hallrl0k5055rypp502qv4c6i286p7f9is4kvq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-tools";
+          sha256 = "1zs2vzcrw11xyj2a7lgqzw4slcha20206jvjbxkm68d57rffpk8y";
+          name = "ruby-tools";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ruby-tools";
+          license = lib.licenses.free;
+        };
+      }) {};
+    runner = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "runner";
+        version = "20151118.416";
+        src = fetchFromGitHub {
+          owner = "thamer";
+          repo = "runner";
+          rev = "f5983931899282cf8b10ad197d61860a61cf070d";
+          sha256 = "17dzr5w12ai2q15yv81gchk360yjs71w74vsgs2fyy2yznvclpq9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/runner";
+          sha256 = "09apmk22swj05z77ziij31jj6b3g221qv3mw3mymffzxn5ap2rbx";
+          name = "runner";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/runner";
+          license = lib.licenses.free;
+        };
+      }) {};
+    runtests = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "runtests";
+        version = "20150807.331";
+        src = fetchFromGitHub {
+          owner = "sunesimonsen";
+          repo = "emacs-runtests";
+          rev = "ed90249f24cc48290018df48b9b9b7172440be3e";
+          sha256 = "18w6gkpxp0g7rzvnrk8vvr267y768dfik447ssq8jpz3jlr5jnq6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/runtests";
+          sha256 = "0m9rqjb5c0yqr2wv5dsdiba21knr63b5pxsqgbkbybi15zgxcicb";
+          name = "runtests";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/runtests";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rust-mode";
+        version = "20160116.1355";
+        src = fetchFromGitHub {
+          owner = "rust-lang";
+          repo = "rust-mode";
+          rev = "fa5b38feac9c5b4da7427b97832b813e20b8e276";
+          sha256 = "0m8ywaa9hccsss4gp1gr6v8faj503gr8l9a6gsdnvf3m5g9wxm6v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rust-mode";
+          sha256 = "0h4gblg6ls8a2wa43r990lanl6ykx8j7c8yg5i3n151imzic2n33";
+          name = "rust-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rust-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rustfmt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rustfmt";
+        version = "20151124.1311";
+        src = fetchFromGitHub {
+          owner = "fbergroth";
+          repo = "emacs-rustfmt";
+          rev = "b54e77b2287bfc558c0b4dbfa8908b4face48320";
+          sha256 = "0i2r14ifpqjcxcflhl38iayk53920vl616y770lwf77zvhnxrmm9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rustfmt";
+          sha256 = "1znav2pbax0rsvdl85mmbgbmxy7gnrm4nx54ij1ff6yd831r5jyl";
+          name = "rustfmt";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/rustfmt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rvm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rvm";
+        version = "20150402.942";
+        src = fetchFromGitHub {
+          owner = "senny";
+          repo = "rvm.el";
+          rev = "8e45a9bad8e317ff195f384dab14d3402497dc79";
+          sha256 = "0iblk0vagjcg3c8q9hlpwk7426ms7aq0s80izgvascfmyqycv6qm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rvm";
+          sha256 = "08i7cmav2cz73jp88ww0ay2yjhk9dj8146836q4sij1bl1slbaf8";
+          name = "rvm";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rvm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "s";
+        version = "20160115.258";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "s.el";
+          rev = "a56f0d0fedf9754e1728067ac868100f2499357d";
+          sha256 = "08vf62fcrnbmf2ppb759kzznjdz8x72fqdwbc4n8nbswrwgm2ikl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/s";
+          sha256 = "0b2lj6nj08pk5fnxvjkc1d9hvi29rnjjy4n5ns4pq6wxpfnlcw64";
+          name = "s";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/s";
+          license = lib.licenses.free;
+        };
+      }) {};
+    s-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, noflet, s }:
+    melpaBuild {
+        pname = "s-buffer";
+        version = "20130605.1624";
+        src = fetchFromGitHub {
+          owner = "nicferrier";
+          repo = "emacs-s-buffer";
+          rev = "f95d234282377f00a2c3a9846681080cb95bb1df";
+          sha256 = "06ng960fj2ivnwb0hrn0qic5x8hb0sswjzph01zmwhbfnwykhr85";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/s-buffer";
+          sha256 = "07kivgzv24psjq1240gwj9wkndq4bhvjh38x552k90m9v6jz8l6m";
+          name = "s-buffer";
+        };
+        packageRequires = [ noflet s ];
+        meta = {
+          homepage = "http://melpa.org/#/s-buffer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sackspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sackspace";
+        version = "20130719.456";
+        src = fetchFromGitHub {
+          owner = "cofi";
+          repo = "sackspace.el";
+          rev = "fd0480eaaf6d3d11fd30ac5feb2da2f4f7572708";
+          sha256 = "06gqqbkn85l2p05whmr4wkg9axqyzb7r7sgm3r8wfshm99kgpxvl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sackspace";
+          sha256 = "1m10iw83k6m7v7sg2dxzdy83zxq6svk8h9fh4ankyn3baqrdxg5z";
+          name = "sackspace";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sackspace";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sage-shell-mode = callPackage ({ cl-lib ? null, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sage-shell-mode";
+        version = "20151024.313";
+        src = fetchFromGitHub {
+          owner = "stakemori";
+          repo = "sage-shell-mode";
+          rev = "ad78c168c1fb702eebc74f30eba830adc3fe0079";
+          sha256 = "060xvh5qwqbvvb5ykyflwps2p2by9p1mm5dz7gkxla5zq0a73vmx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sage-shell-mode";
+          sha256 = "18k7yh8rczng0kn2wsawjml70cb5bnc5jr2gj0hini5f7jq449wx";
+          name = "sage-shell-mode";
+        };
+        packageRequires = [ cl-lib deferred ];
+        meta = {
+          homepage = "http://melpa.org/#/sage-shell-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    salt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mmm-jinja2, mmm-mode, yaml-mode }:
+    melpaBuild {
+        pname = "salt-mode";
+        version = "20150904.1313";
+        src = fetchFromGitHub {
+          owner = "beardedprojamz";
+          repo = "salt-mode";
+          rev = "c9147cb78680cc34e6fcff3968c336460a9090a4";
+          sha256 = "1hl227bmjch0vq7n47mwydkyxnd6wkbz9klk3c4398qmc2qxm5kn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/salt-mode";
+          sha256 = "1r5k7022vxgj3p5l16y839lff85z0m9hpifq59knij61g9hxadsp";
+          name = "salt-mode";
+        };
+        packageRequires = [ mmm-jinja2 mmm-mode yaml-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/salt-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sane-term = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sane-term";
+        version = "20150917.1802";
+        src = fetchFromGitHub {
+          owner = "adamrt";
+          repo = "sane-term";
+          rev = "1d0c1410050cb50034c9e065dfde3e7ec5bc31b7";
+          sha256 = "1r6b6n2bzjznjfimgcm0vnmln4sbyasm4icmdgbpzahdmbkfzq3w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sane-term";
+          sha256 = "0iz63b62x5jrz7c23i850634k4bk73kg1h4wj1ravx3wlgvzs8y8";
+          name = "sane-term";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/sane-term";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sass-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, haml-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sass-mode";
+        version = "20150508.2212";
+        src = fetchFromGitHub {
+          owner = "nex3";
+          repo = "sass-mode";
+          rev = "3da9040680880743fddb55a965ecd150d1039df6";
+          sha256 = "0srz4j7484v5h7hmdlyrcl2k27jhy414689wphbbyj63rvg321cm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sass-mode";
+          sha256 = "1byjk5zpzjlyiwkp780c4kh7s9l56y686sxji89wc59d19rp8800";
+          name = "sass-mode";
+        };
+        packageRequires = [ cl-lib haml-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/sass-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sauron = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sauron";
+        version = "20160101.424";
+        src = fetchFromGitHub {
+          owner = "djcb";
+          repo = "sauron";
+          rev = "7d8fef2755ed91ceffdf88580bb0a007a34f09cc";
+          sha256 = "0y6a0z2ydc5li3990mfhcgz5mrb89sj8s8dvdgmnv8pgdhn1xmb6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sauron";
+          sha256 = "01fk1xfh7r16fb1xg5ibbs7gci9dja49msdlf7964hiq7pnnhxgb";
+          name = "sauron";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sauron";
+          license = lib.licenses.free;
+        };
+      }) {};
+    save-load-path = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "save-load-path";
+        version = "20131228.1352";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/save-load-path.el";
+          sha256 = "1p8p5b85sdnq45rdjq5wcr3xz7c22mr5bz41a21mkabc4j4fvd3z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/save-load-path";
+          sha256 = "01hm1rm9x3bqs6vf65l4xv2n4ramh3qwgmrp632fyfz5dlrvbssi";
+          name = "save-load-path";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/save-load-path";
+          license = lib.licenses.free;
+        };
+      }) {};
+    save-sexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "save-sexp";
+        version = "20150731.1046";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "save-sexp";
+          rev = "31bd739269e14df70f9519417370ba69a53e540d";
+          sha256 = "0jdsndq9nqqqfn821qy66y5x3yvmxca9zfk9j9q4a9sbbychqc9c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/save-sexp";
+          sha256 = "12jx47picdpw668q75qsp9gncrnxnlk1slhzvxsk5pvkdwh26h66";
+          name = "save-sexp";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/save-sexp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    save-visited-files = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "save-visited-files";
+        version = "20151021.1243";
+        src = fetchFromGitHub {
+          owner = "nflath";
+          repo = "save-visited-files";
+          rev = "35f8055a3eb0614721b5b755a3902ba008a4d6fa";
+          sha256 = "00jvl1npc889f3isi7cbdzwvf9x4rq67zgl7br8npxf8jlc2mwhm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/save-visited-files";
+          sha256 = "1pmjz27dlp5yrihgsy8q1bwbhkkj3sn7d79ccvljvzxg5jn1grkd";
+          name = "save-visited-files";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/save-visited-files";
+          license = lib.licenses.free;
+        };
+      }) {};
+    savekill = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "savekill";
+        version = "20140417.2134";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/savekill.el";
+          sha256 = "1qfq83cb4qixdl15j28rlslkq6g88ig55ydg747jqb3dqyp3qaah";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/savekill";
+          sha256 = "1l14p6wkzfhlqxnd9fpw123vg9q5k20ld7rciyzbfdb99pk9z02i";
+          name = "savekill";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/savekill";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sbt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, scala-mode2 }:
+    melpaBuild {
+        pname = "sbt-mode";
+        version = "20151231.1322";
+        src = fetchFromGitHub {
+          owner = "ensime";
+          repo = "emacs-sbt-mode";
+          rev = "9d86487c77d652ca12e8084f0f64b840536a9e6e";
+          sha256 = "1m9lrcknhvxxxalhbnrx652p9zxsq249s39cv9cj5kx57x8fz4sm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sbt-mode";
+          sha256 = "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8";
+          name = "sbt-mode";
+        };
+        packageRequires = [ scala-mode2 ];
+        meta = {
+          homepage = "http://melpa.org/#/sbt-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scad-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "scad-mode";
+        version = "20150330.2229";
+        src = fetchFromGitHub {
+          owner = "openscad";
+          repo = "openscad";
+          rev = "84c9f7699d5a49daa38e7260c877e9bb294a2a18";
+          sha256 = "0ykgbj059m1cxkdp29dd3sxp1cq68ma92dg9jp0qv7bp5x0r708l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scad-mode";
+          sha256 = "04b4y9jks8sslgmkx54fds8fba9xv54z0cfab52dy99v1301ms3k";
+          name = "scad-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/scad-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scad-preview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, scad-mode }:
+    melpaBuild {
+        pname = "scad-preview";
+        version = "20150818.824";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "scad-preview";
+          rev = "a444532126bdec3dec9cacf55bc183780decf040";
+          sha256 = "1mx5bg4mbgj828mwjd9nlxli4ibcrgpzn9i6ns2g9zpgm932zlbc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scad-preview";
+          sha256 = "0wcd2r60ibbc2mzpq8fvyfc1fy172rf9kzdj51p4jyl51r76i86z";
+          name = "scad-preview";
+        };
+        packageRequires = [ scad-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/scad-preview";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "scala-mode";
+        version = "20141205.1451";
+        src = fetchFromGitHub {
+          owner = "scala";
+          repo = "scala-tool-support";
+          rev = "0a217bc446b970116c67c933a747d5f57b853d34";
+          sha256 = "0qd3yi2as30kacr74vbzvyq97684s8sz585z30d47shqcvp6l1a6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scala-mode";
+          sha256 = "1vbgphmvvsj5jl8f78rpsidlmlgyp1kq3nkmziqhwkcq8hfywssm";
+          name = "scala-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/scala-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scala-mode2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "scala-mode2";
+        version = "20151226.1248";
+        src = fetchFromGitHub {
+          owner = "ensime";
+          repo = "emacs-scala-mode";
+          rev = "84850e7e75abb7ffe7838f199a5a07a8cd1025d7";
+          sha256 = "07928cll5n3s7xx75nfbil73zilrhdfh19hp4s75c7hh8sdwmig6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scala-mode2";
+          sha256 = "0rnkln6jwwqc968w3qpc6zjjv8ylw0w6c2hsjpq2slja3jn5khch";
+          name = "scala-mode2";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/scala-mode2";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scala-outline-popup = callPackage ({ dash, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, popup, scala-mode2 }:
+    melpaBuild {
+        pname = "scala-outline-popup";
+        version = "20150702.1137";
+        src = fetchFromGitHub {
+          owner = "ancane";
+          repo = "scala-outline-popup";
+          rev = "47e92a1a7738738164d7657ee324bc382a383985";
+          sha256 = "1wf3d5spvi9kr4q2w7f18g1bm10fh2zbh4sdbqkf78afv6sbqzrz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scala-outline-popup";
+          sha256 = "1fq0k6l57wkya1ycm4cc190kg90j2k9clnl0sc70achp4i47qbk7";
+          name = "scala-outline-popup";
+        };
+        packageRequires = [ dash flx-ido popup scala-mode2 ];
+        meta = {
+          homepage = "http://melpa.org/#/scala-outline-popup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "scf-mode";
+        version = "20151121.2048";
+        src = fetchFromGitHub {
+          owner = "lewang";
+          repo = "scf-mode";
+          rev = "dbfcdcd89034f208d65e181af58e0d73ad09f8b2";
+          sha256 = "0m7hanpc2skmsz783m0212xd10y31gkj5n6w8gx9s989l1y4i1b8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scf-mode";
+          sha256 = "0acbrw94q6cr9b29mz1wcbwi1g90pbm7ly2xbaqb2g8081r5rgg0";
+          name = "scf-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/scf-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scheme-complete = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "scheme-complete";
+        version = "20130220.603";
+        src = fetchhg {
+          url = "http://code.google.com/p/scheme-complete/";
+          rev = "e2ec67dfb1ff";
+          sha256 = "13pym1kwi8ah3h2l557pvbg4lgpp5lhldj3qxyg7gyvgkwr91a7g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scheme-complete";
+          sha256 = "1nam7xzw8hrykz73q9x24szpjv2kpkp48lcmzf02kzj3cg6l76qm";
+          name = "scheme-complete";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/scheme-complete";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scheme-here = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "scheme-here";
+        version = "20141028.218";
+        src = fetchFromGitHub {
+          owner = "judevc";
+          repo = "scheme-here";
+          rev = "430ba017cc530865218de23a8f7985095a58343f";
+          sha256 = "09cvrphrnbj8avnlqqv6scjz17cn6zm6mzghjn3vxfr4hql66rir";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scheme-here";
+          sha256 = "137qqfnla3hjm6qcnzpsgrw173px0k5dwq9apns5cdryxx3ahcvv";
+          name = "scheme-here";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/scheme-here";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "scion";
+        version = "20130315.755";
+        src = fetchFromGitHub {
+          owner = "nominolo";
+          repo = "scion";
+          rev = "99b4589175665687181a932cd836850205625f71";
+          sha256 = "0ark720g0nrdqri5bjdpss6kn6k3hz3w3zdvy334wws05mkb17y4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scion";
+          sha256 = "17qmc7fpvbamqkzyk8jspp2i0nw93iya4iwddvas7vdpjy7mk81d";
+          name = "scion";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/scion";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sclang-extensions = callPackage ({ auto-complete, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "sclang-extensions";
+        version = "20131117.1639";
+        src = fetchFromGitHub {
+          owner = "chrisbarrett";
+          repo = "sclang-extensions";
+          rev = "7133494182738cb0ef49f31cc09cfe0d2fab520e";
+          sha256 = "0v36zd8lnsbc7jvnhv5pidfxabq2qqmwg1nm2jdxfj6vvcg3vx0x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sclang-extensions";
+          sha256 = "00nirxawsngvlx7bmf5hqg2wk0l1v5pi09r6phzd0q8gyq3kmbbn";
+          name = "sclang-extensions";
+        };
+        packageRequires = [ auto-complete dash emacs s ];
+        meta = {
+          homepage = "http://melpa.org/#/sclang-extensions";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sclang-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "sclang-snippets";
+        version = "20130513.251";
+        src = fetchFromGitHub {
+          owner = "ptrv";
+          repo = "sclang-snippets";
+          rev = "c840a416b96f83bdd70491e3d1fbe2f1ae8b3f58";
+          sha256 = "0vbcghgapwdf3jgjnjdla17dhf5mkmwapz4a8fmlr7sw1wqvj857";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sclang-snippets";
+          sha256 = "0q1bh316v737a0hm9afijk1spvg144cgrf45jm0bpd60zhiv7bb2";
+          name = "sclang-snippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/sclang-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scpaste = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }:
+    melpaBuild {
+        pname = "scpaste";
+        version = "20151208.1935";
+        src = fetchFromGitHub {
+          owner = "technomancy";
+          repo = "scpaste";
+          rev = "677f9b7c5a1b533bef44747d6331b671ffcb8a9c";
+          sha256 = "1jgg116rhhgs5qrngrmqi8ir7yj1h470f57dc7fyijw0ly5mp6ii";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scpaste";
+          sha256 = "02dqmx6v3jxdn5yz1z74624sc6sz2bm4qjyi78w9akhp2jplwlk1";
+          name = "scpaste";
+        };
+        packageRequires = [ htmlize ];
+        meta = {
+          homepage = "http://melpa.org/#/scpaste";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "scratch";
+        version = "20120830.1228";
+        src = fetchFromGitHub {
+          owner = "ieure";
+          repo = "scratch-el";
+          rev = "54e31e81cd239e1fd1b3c6a20ff426029bf9aaf5";
+          sha256 = "0ykhr24vpx3byn2n346nqqvmwcg34hk22s3lpdx7lpnkrn5z41aq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scratch";
+          sha256 = "1c6vxpd9c24d2flzwgvzqz0wr70xzqqs3f59pp897h0f7j91im5d";
+          name = "scratch";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/scratch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scratch-ext = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "scratch-ext";
+        version = "20140103.2316";
+        src = fetchFromGitHub {
+          owner = "kyanagi";
+          repo = "scratch-ext-el";
+          rev = "388c53cddd0466b451264894667ed64a6947ad67";
+          sha256 = "0ng0by647r49mia7vmjqc97gwlwgs8kmaz0lw2y54jdz8m0bbngp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scratch-ext";
+          sha256 = "031wxz10k1q4bi5hywhcw1vzi41d5pv5hc09x8jk9s5nzyssvc0y";
+          name = "scratch-ext";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/scratch-ext";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scratch-log = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "scratch-log";
+        version = "20141115.143";
+        src = fetchFromGitHub {
+          owner = "mori-dev";
+          repo = "scratch-log";
+          rev = "1168f7f16d36ca0f4ddf2bb98881f8db62cc5dc0";
+          sha256 = "030mcq0cmamizvra8jh2x76f71g5apiavwb10c28j62rl0r5bisk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scratch-log";
+          sha256 = "1yp3p0dzhmqrd0krqii3x79k4zc3p59148cijhk6my4n1xqnhs69";
+          name = "scratch-log";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/scratch-log";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scratch-palette = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }:
+    melpaBuild {
+        pname = "scratch-palette";
+        version = "20150225.242";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "scratch-palette";
+          rev = "f6803b448079f4a81cc699cec7442ef543cd5818";
+          sha256 = "00b4r8bqlxc29k18vig0164d5c9fp5bp5q26d28lwr4f0s4a71d2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scratch-palette";
+          sha256 = "0m6hc2amwnnii4y189kkridhapl9jipkmadvrmwvspgy3lxhlafs";
+          name = "scratch-palette";
+        };
+        packageRequires = [ popwin ];
+        meta = {
+          homepage = "http://melpa.org/#/scratch-palette";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scratch-pop = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }:
+    melpaBuild {
+        pname = "scratch-pop";
+        version = "20150820.339";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "scratch-pop";
+          rev = "2c9648a669ce8e3a9e35e8e1e3c808531d20c549";
+          sha256 = "1yvmfiv1s83r0jcxzbxyrx3b263d73lbap6agansmrhkxp914xr1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scratch-pop";
+          sha256 = "0s7g1fbnc5hgz8gqmp1lynj5g7vvxisj7scxx5wil9qpn2zyggq1";
+          name = "scratch-pop";
+        };
+        packageRequires = [ popwin ];
+        meta = {
+          homepage = "http://melpa.org/#/scratch-pop";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scratches = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "scratches";
+        version = "20151005.2316";
+        src = fetchFromGitHub {
+          owner = "cheunghy";
+          repo = "scratches";
+          rev = "9441afe6396ca38f08029123fab5d87429cbf315";
+          sha256 = "10hmy0p4pkrzvvyisk4rjc6hqqyk2sir1rszqgmkhrdywl010vlc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scratches";
+          sha256 = "0409v1wi10q48rrh8iib6dw9icmswfrpjx9x7xcma994z080d2fy";
+          name = "scratches";
+        };
+        packageRequires = [ dash f ];
+        meta = {
+          homepage = "http://melpa.org/#/scratches";
+          license = lib.licenses.free;
+        };
+      }) {};
+    screenshot = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "screenshot";
+        version = "20120509.605";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/screenshot.el";
+          sha256 = "0q7yxaaa0fic4d2xwr0qk28clkinwz4xvw3wf8dv1g322s0xx2cw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/screenshot";
+          sha256 = "0aw2343as38y26r2g7wpn1rq1n6xpw4y5c7ir8qh1crkc1y513hs";
+          name = "screenshot";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/screenshot";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "scss-mode";
+        version = "20150107.1600";
+        src = fetchFromGitHub {
+          owner = "antonj";
+          repo = "scss-mode";
+          rev = "b010d134f499c4b4ad33fe8a669a81e9a531b0b2";
+          sha256 = "113pi7nsaksaacy74ngbvrvr6qcl7199xy662nj58bz5307yi9q0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scss-mode";
+          sha256 = "1g27xnp6bjaicxjlb9m0njc6fg962j3hlvvzmxvmyk7gsdgcgpkv";
+          name = "scss-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/scss-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    search-web = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "search-web";
+        version = "20150312.603";
+        src = fetchFromGitHub {
+          owner = "tomoya";
+          repo = "search-web.el";
+          rev = "c4ae86ac1acfc572b81f3d78764bd9a54034c331";
+          sha256 = "08yc67a4ji7z8s0zh500wiscziqsxi92i1d33fjla2mcr8sxxn0i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/search-web";
+          sha256 = "0qqx9l8dn1as4gqpq80jfacn6lz0132m91pjzxv0fx6al2iz0m36";
+          name = "search-web";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/search-web";
+          license = lib.licenses.free;
+        };
+      }) {};
+    searchq = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "searchq";
+        version = "20150829.711";
+        src = fetchFromGitHub {
+          owner = "boyw165";
+          repo = "searchq";
+          rev = "dd510d55ad66a82c6ef022cfe7c4a73ad5365f82";
+          sha256 = "0zs08vxmjb3y4dnfq6djnrhmkgyhhwd5zylrjisrd4y7f089fyh4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/searchq";
+          sha256 = "0flsc07v887pm62mslrv7zqnhl62l6348nkm77mizm1592q3kjgr";
+          name = "searchq";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/searchq";
+          license = lib.licenses.free;
+        };
+      }) {};
+    seclusion-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "seclusion-mode";
+        version = "20121118.1753";
+        src = fetchFromGitHub {
+          owner = "dleslie";
+          repo = "seclusion-mode";
+          rev = "9634e76c52bfb7200ff0f9f01404f743429e9ef0";
+          sha256 = "15cjhwjiwmrfzmr74hbw5s92si2qdb8i97nmkbsgkj3444rxg239";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/seclusion-mode";
+          sha256 = "0ff10x6yr37vpp6ffbk1nb027lgmrydwjrb332fskwlf3xmy6v0m";
+          name = "seclusion-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/seclusion-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    second-sel = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "second-sel";
+        version = "20151231.1753";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/second-sel.el";
+          sha256 = "143vg6z3aa0znmsx88r675vv5g2c13giz25dcbzazsp4wcr46wvq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/second-sel";
+          sha256 = "1nzy5ms5qf5big507kg3z5m6d6zgnsv2fswn359r2j59cval3fvr";
+          name = "second-sel";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/second-sel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    seeing-is-believing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "seeing-is-believing";
+        version = "20151010.1229";
+        src = fetchFromGitHub {
+          owner = "jcinnamond";
+          repo = "seeing-is-believing";
+          rev = "a698443529ea26fba3fd0748fe10439be7721e96";
+          sha256 = "19p3zp4cj7ik2gwzc5k6klqc4b8jc2hvm80yhczc5b7k223gp2bv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/seeing-is-believing";
+          sha256 = "05aja5xycb3kpmxyi234l50h98f5m1fil6ll4f2xkpxwv31ba5rb";
+          name = "seeing-is-believing";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/seeing-is-believing";
+          license = lib.licenses.free;
+        };
+      }) {};
+    seethru = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, shadchen }:
+    melpaBuild {
+        pname = "seethru";
+        version = "20150218.1229";
+        src = fetchFromGitHub {
+          owner = "Benaiah";
+          repo = "seethru";
+          rev = "d87e231f99313bea75b1e69e48c0f32968c82060";
+          sha256 = "0qd462qbqdx53xh3ddf76chiljxf6s43r28v2ix85gsig7nm5pgr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/seethru";
+          sha256 = "1lcwslkki9s15xr2dmh2iic4ax8ia0j20hjnjmkv612wv04b806v";
+          name = "seethru";
+        };
+        packageRequires = [ shadchen ];
+        meta = {
+          homepage = "http://melpa.org/#/seethru";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "sekka";
+        version = "20150708.659";
+        src = fetchFromGitHub {
+          owner = "kiyoka";
+          repo = "sekka";
+          rev = "2768b2c16dd15dcd35fcfd123c4d56f2ffd1b362";
+          sha256 = "1as3llcs7jgcw9pafz4mbfml1cqd1fw8yl64bb4467nmhq2p18p7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sekka";
+          sha256 = "1jj4ly9p7m3xvb31nfn171lbpm9y70y8cbf8p24w0fhv665dx0cp";
+          name = "sekka";
+        };
+        packageRequires = [ cl-lib concurrent popup ];
+        meta = {
+          homepage = "http://melpa.org/#/sekka";
+          license = lib.licenses.free;
+        };
+      }) {};
+    selectric-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "selectric-mode";
+        version = "20151201.918";
+        src = fetchFromGitHub {
+          owner = "rbanffy";
+          repo = "selectric-mode";
+          rev = "0dd7ef28a9d9d6fbb95fdeeab6b576ad8762ad16";
+          sha256 = "18xdkisxvdizsk51pnyimp9mwc6k9cpcxqr5hgndkz9q97p5dp79";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/selectric-mode";
+          sha256 = "1k4l0lr68rqyi37wvqp1cnfci6jfkz0gvrd1hwbgx04cjgmz56n4";
+          name = "selectric-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/selectric-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    semi = callPackage ({ fetchFromGitHub, fetchurl, flim, lib, melpaBuild }:
+    melpaBuild {
+        pname = "semi";
+        version = "20150525.619";
+        src = fetchFromGitHub {
+          owner = "wanderlust";
+          repo = "semi";
+          rev = "35c9ff77db07ace4b7178189c1fe45118ebf9a65";
+          sha256 = "1s1wjk2ba5spqc0vhj8kmfsm8vzmza06pnjkwal084v8dnwz0zz3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/semi";
+          sha256 = "01wk3lgln5lac65hp6v83d292bdk7544z23xa1v6a756nhybwv25";
+          name = "semi";
+        };
+        packageRequires = [ flim ];
+        meta = {
+          homepage = "http://melpa.org/#/semi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sensitive = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sequences }:
+    melpaBuild {
+        pname = "sensitive";
+        version = "20131015.835";
+        src = fetchFromGitHub {
+          owner = "timvisher";
+          repo = "sensitive.el";
+          rev = "7f2c77811e983234e1a93055d78cc4480ae807c3";
+          sha256 = "0g4jfcc5k26yh192bmmxnim9mqv993v2jjd9g9ssvnd42ihpx1n3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sensitive";
+          sha256 = "0v988k0x3mdp7ank2ihghphh8sanvv96s4sg6pnszg5hczak1vr3";
+          name = "sensitive";
+        };
+        packageRequires = [ emacs sequences ];
+        meta = {
+          homepage = "http://melpa.org/#/sensitive";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sentence-highlight = callPackage ({ fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sentence-highlight";
+        version = "20121026.950";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/sentence-highlight.el";
+          sha256 = "01qj57zpqpr4rxk9bsx828c7baac1xaa58cz22fncirdx00svn2k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sentence-highlight";
+          sha256 = "16kh6567hb9lczh8zpqwbzz5bikg2fsabifhhky8qwxp4dy07v9m";
+          name = "sentence-highlight";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sentence-highlight";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sentence-navigation = callPackage ({ ample-regexps, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sentence-navigation";
+        version = "20150914.2346";
+        src = fetchFromGitHub {
+          owner = "noctuid";
+          repo = "emacs-sentence-navigation";
+          rev = "8b6bf8af180c95f516bda9285da3fe940a2ab740";
+          sha256 = "0ikiv12ahndvk5w9pdayqlmafwj8d1vkcshfnqmgy6ykqbcdpqk6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sentence-navigation";
+          sha256 = "1p3ch1ab06v038h130fsxpbq45d1yadl67i2ih4l4fh3xah5997m";
+          name = "sentence-navigation";
+        };
+        packageRequires = [ ample-regexps emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/sentence-navigation";
+          license = lib.licenses.free;
+        };
+      }) {};
+    seoul256-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "seoul256-theme";
+        version = "20150714.1735";
+        src = fetchFromGitHub {
+          owner = "ChrisDavison";
+          repo = "seoul256.el";
+          rev = "32790703847b868e8fdd9c0736b0b8a0167f97cf";
+          sha256 = "15vmd1qmj8a6a5mmvdcnbav6mi5rhrp39m85idzv02zm0x9x6lyc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/seoul256-theme";
+          sha256 = "0mgyq725x5hmhs3h8v5macv8bfkginjghhwr9kli60vdb4skgjvp";
+          name = "seoul256-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/seoul256-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sequences = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sequences";
+        version = "20130908.1322";
+        src = fetchFromGitHub {
+          owner = "timvisher";
+          repo = "sequences.el";
+          rev = "2bcc54a6738202fffb23e9579b9695337ba6ef26";
+          sha256 = "1np6ip28ksms6fig67scwvwj43zgblny50ccvz8aclbl0z8nxswl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sequences";
+          sha256 = "12wnkywkmxfk2sx40h90k53d5qmc8hiky5vhlyf0ws3n39zvhplh";
+          name = "sequences";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/sequences";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sequential-command = callPackage ({ fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sequential-command";
+        version = "20151207.1603";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/sequential-command.el";
+          sha256 = "0vg8rqzzi29swznhra2mnf45czr2vb77dpcxn3j0fi7gynx3wcwk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sequential-command";
+          sha256 = "03qybacgy5fs3lam73x0rds4f68s173mhbah6rr97272nikd50v1";
+          name = "sequential-command";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sequential-command";
+          license = lib.licenses.free;
+        };
+      }) {};
+    servant = callPackage ({ ansi, commander, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up, web-server }:
+    melpaBuild {
+        pname = "servant";
+        version = "20140216.619";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "servant.el";
+          rev = "4d2aa8250b54b28e6e7ee4cd5ebd98a33db2c134";
+          sha256 = "15lx6qvmq3vp84ys8dzbx1nzxcnzlq41whawc2yhrnd1dbq4mv2d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/servant";
+          sha256 = "048xg0gcwnf4l2p56iw4iawi3ywjz7f6icnjfi8qzk1z912iyl9h";
+          name = "servant";
+        };
+        packageRequires = [ ansi commander dash epl f s shut-up web-server ];
+        meta = {
+          homepage = "http://melpa.org/#/servant";
+          license = lib.licenses.free;
+        };
+      }) {};
+    serverspec = callPackage ({ dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "serverspec";
+        version = "20150623.655";
+        src = fetchFromGitHub {
+          owner = "k1LoW";
+          repo = "emacs-serverspec";
+          rev = "b6dfe82af9869438de5e5d860ced196641f372c0";
+          sha256 = "1h58q41wixjlapia1ggf83jxcllq7492k55mc0fq7hbx3hw1q1y2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/serverspec";
+          sha256 = "001d57yd0wmz4d7qmhnanac8g29wls0sqw194003hrgirakg82id";
+          name = "serverspec";
+        };
+        packageRequires = [ dash f helm s ];
+        meta = {
+          homepage = "http://melpa.org/#/serverspec";
+          license = lib.licenses.free;
+        };
+      }) {};
+    session = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "session";
+        version = "20120510.1900";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "session";
+          rev = "19ea0806873daac3539a4b956e15655e99e3dd6c";
+          sha256 = "0sp952abz7dkq8b8kkzzmnwnkq5w15zsx5dr3h8lzxb92lnank9v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/session";
+          sha256 = "0fghxbnf1d5iyrx1q8xd0lbw9nvkdgg2v2f89j6apnawisrsbhwx";
+          name = "session";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/session";
+          license = lib.licenses.free;
+        };
+      }) {};
+    seti-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "seti-theme";
+        version = "20150314.322";
+        src = fetchFromGitHub {
+          owner = "caisah";
+          repo = "seti-theme";
+          rev = "f2f472af00f251f8cdced29faadbb3380d3c7ff1";
+          sha256 = "18igxblmrbxwhd2d68cz1bpj4524djh2dw2rwhxlij76f9v805wn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/seti-theme";
+          sha256 = "1mwkx3hynabwr0a2rm1bh91h7xf38a11h1fb6ys8s3mnr68csd9z";
+          name = "seti-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/seti-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sexp-move = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sexp-move";
+        version = "20150915.1230";
+        src = fetchFromGitLab {
+          owner = "elzair";
+          repo = "sexp-move";
+          rev = "117f7a91ab7c25e438413753e916570122011ce7";
+          sha256 = "11h5z2gmwq07c4gqzj2c9apksvqk3k8kpbb9kg78bbif2xfajr3m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sexp-move";
+          sha256 = "0lcxmr2xqh8z7xinxbv1wyrh786zlahhhj5nnbv83i8m23i3ymmd";
+          name = "sexp-move";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sexp-move";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shackle";
+        version = "20160102.1701";
+        src = fetchFromGitHub {
+          owner = "wasamasa";
+          repo = "shackle";
+          rev = "d8fdd8549724db7416460af3cb655dceacbe2abd";
+          sha256 = "1nfvb2vmbdqfyj25hvwrz7ajb4ilxgrvd3rbf3im3mb3skic1wn9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shackle";
+          sha256 = "159z0cwg7afrmym0xk902d8z093sqv39jig25ds7z4a224yrv5w6";
+          name = "shackle";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/shackle";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shadchen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shadchen";
+        version = "20141102.1239";
+        src = fetchFromGitHub {
+          owner = "VincentToups";
+          repo = "shadchen-el";
+          rev = "35f2b9c304eec990c16efbd557198289dc7cbb1f";
+          sha256 = "0phivbhjdw76gzrx35rp0zybqfb0fdy2hjllf72qf1r0r5gxahl8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shadchen";
+          sha256 = "1r1mfmv4cdlc8kzjiqz81kpqdrwbnyciwdgg6n5x0yi4apwpvnl4";
+          name = "shadchen";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/shadchen";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shader-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shader-mode";
+        version = "20151030.904";
+        src = fetchFromGitHub {
+          owner = "midnightSuyama";
+          repo = "shader-mode";
+          rev = "5d5fcbc614f8d7e9226730dd587faf14115b0e6f";
+          sha256 = "0l094nrrvan8v6j1xdgb51cbjvwicvxih29b7iyga13adb9dy9j4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shader-mode";
+          sha256 = "12y84fa1wc82js53rpadaysmbshhqf6wb97889qkksx19n3xmb9g";
+          name = "shader-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/shader-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shadow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shadow";
+        version = "20110507.224";
+        src = fetchFromGitHub {
+          owner = "mooz";
+          repo = "shadow.el";
+          rev = "eafc93b090895102ac299220a84ec99244f633af";
+          sha256 = "1i1a0jsrrimfxv8xm37cihb3w7fc3l0872c8gnx9gb4876if3sxw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shadow";
+          sha256 = "0zhy94jpk29k51r7m1gd24jx7h6b68l38vhw27j3wz0ag1h5352k";
+          name = "shadow";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/shadow";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shakespeare-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shakespeare-mode";
+        version = "20150708.912";
+        src = fetchFromGitHub {
+          owner = "CodyReichert";
+          repo = "shakespeare-mode";
+          rev = "4bff63eeac2b7ec1220f17e8bbcddbea4c11cb02";
+          sha256 = "0vkxl3w4y4yacs1s4v0gwggvzrss8g74d3dgk8h3gphl4dlgx496";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shakespeare-mode";
+          sha256 = "1i9fr9l3x7pwph654hqd8s74swy5gmn3wzs85a2ibmpcjq8mz9rd";
+          name = "shakespeare-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/shakespeare-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shampoo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shampoo";
+        version = "20131230.419";
+        src = fetchFromGitHub {
+          owner = "dmatveev";
+          repo = "shampoo-emacs";
+          rev = "bc193c39636c30182159c5c91c37a9a4cb50fedf";
+          sha256 = "15a8gs4lrqxn0jyfw16rc6vm7z1i10pzzlnp30x6nly9a7xra47x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shampoo";
+          sha256 = "01ssgw4cnnx8d86g3r1d5hqcib4qyhmpqvcvx47xs7zh0jscps61";
+          name = "shampoo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/shampoo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shell-command = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "shell-command";
+        version = "20090621.832";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/shell-command.el";
+          sha256 = "0jr5sbmg4zrx2dfdrajh2didm6dxx9ri5ib9qnwhc1jlppinyi7l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-command";
+          sha256 = "1jxn721i4s1k5x1qldiynnl5khsl22x9k3whm698nzv8m786spxl";
+          name = "shell-command";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/shell-command";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shell-current-directory = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shell-current-directory";
+        version = "20140101.1754";
+        src = fetchFromGitHub {
+          owner = "metaperl";
+          repo = "shell-current-directory";
+          rev = "bf843771bf9a4aa05e054ade799eb8862f3be89a";
+          sha256 = "1w42j5cdddr0riz1xjq3wiz5i9f71i9jdzd1l92ir0mlj05wjyic";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-current-directory";
+          sha256 = "0bj2gs96ivm5x8l7gwvfckyalr1amh4cb1v2dbl323zmrqddhgkd";
+          name = "shell-current-directory";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/shell-current-directory";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shell-here = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shell-here";
+        version = "20150728.1204";
+        src = fetchFromGitHub {
+          owner = "ieure";
+          repo = "shell-here";
+          rev = "251309141e18978d2b8014345acc6f5afcd4d509";
+          sha256 = "0z04z07r7p5p05zhaka37s48y82hg2dbk0ynap4inph3frn4yyfl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-here";
+          sha256 = "0csi70v89bqdpbsizji6c5z0jmkx4x4vk1zfclkpap4dalmxxcsh";
+          name = "shell-here";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/shell-here";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shell-history = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "shell-history";
+        version = "20100504.350";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/shell-history.el";
+          sha256 = "0biqjm0fpd7c7jilgkcwp6c32car05r5akimbcdii3clllavma7r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-history";
+          sha256 = "1blad7ggv27qzpai2ib1pmr23ljj8asq880g3d7w8fhqv0p1pjs7";
+          name = "shell-history";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/shell-history";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shell-pop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shell-pop";
+        version = "20151121.830";
+        src = fetchFromGitHub {
+          owner = "kyagi";
+          repo = "shell-pop-el";
+          rev = "4531d234ca471ed80458252cba0ed005a0720b27";
+          sha256 = "0fzywfdaisvvdbcl813n1shz0r8v1k9kcgxgynv5l0i4nkrgkww5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-pop";
+          sha256 = "02s17ln0hbi9gy3di8fksp3mqc7d8ahhf5vwyz4vrc1bg77glxw8";
+          name = "shell-pop";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/shell-pop";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shell-split-string = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shell-split-string";
+        version = "20151224.408";
+        src = fetchFromGitHub {
+          owner = "10sr";
+          repo = "shell-split-string-el";
+          rev = "19f6f999c33cc66a4c91bacdcc3697c25d97bf5a";
+          sha256 = "16srngml5xmpaxb0wzhx91jil0r0dmn673bwai3lzxrkmjnl748l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-split-string";
+          sha256 = "1yj1h7za4ylxh2nikj7s1qqlilpsk05x9571a2fymfyznm3iq77m";
+          name = "shell-split-string";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/shell-split-string";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shell-switcher = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shell-switcher";
+        version = "20160112.135";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "shell-switcher";
+          rev = "bdf28e10a05d7187a4c4440d164ae08ba943b856";
+          sha256 = "1bcrxq43a45alv6x0wms4d4nykiqz2mzk04kwk5lmf5pw3dqm900";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-switcher";
+          sha256 = "07g9naiv2jk9jxwjywrbb05dy0pbfdx6g8pkra38rn3vqrjzvhyx";
+          name = "shell-switcher";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/shell-switcher";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shell-toggle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shell-toggle";
+        version = "20150226.811";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "shell-toggle.el";
+          rev = "0d01bd9a780fdb7fe6609c552523f4498649a3b9";
+          sha256 = "0ssaccdacabpja9nqzhr8x8ggfwmlian7y4p0fa6gvr7qsvjpgr9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-toggle";
+          sha256 = "1ai0ks7smr8b221j9hmsikswpxqraa9b13fpwv4wwagavnlah446";
+          name = "shell-toggle";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/shell-toggle";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shelldoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "shelldoc";
+        version = "20151114.2125";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-shelldoc";
+          rev = "20eb889f3d3d9bd01aafdc699e712a75db42d8f3";
+          sha256 = "0i6xp6g3ggs4fkr410blxa4mkb1y05pcygkdbvb7y3gh878q5b5k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shelldoc";
+          sha256 = "1xlp03aaidp7dp8349v8drzhl4lcngvxgdrwwn9cahfqlrvvbbbx";
+          name = "shelldoc";
+        };
+        packageRequires = [ cl-lib s ];
+        meta = {
+          homepage = "http://melpa.org/#/shelldoc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shelltest-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shelltest-mode";
+        version = "20141227.448";
+        src = fetchFromGitHub {
+          owner = "rtrn";
+          repo = "shelltest-mode";
+          rev = "e2513832ce6b994631335be299736cabe291d0f7";
+          sha256 = "1ns2w7zhbi96a3gilmzs69187jngqhcvik17ylsjdfrk42hw5s6r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shelltest-mode";
+          sha256 = "1inb0vq34fbwkr0jg4dv2lljag8djggi8kyssrzhfawri50m81nh";
+          name = "shelltest-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/shelltest-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shift-text = callPackage ({ cl-lib ? null, es-lib, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shift-text";
+        version = "20130831.1155";
+        src = fetchFromGitHub {
+          owner = "sabof";
+          repo = "shift-text";
+          rev = "1be9cbf994000022172ceb746fe1d597f57ea8ba";
+          sha256 = "13zsws8gq9a8nfk4yzlvfsvqjh9zbnanmw68rcna93yc5nc634nr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shift-text";
+          sha256 = "1v9zk7ycc8k1qk1cfs2y1knygl686msmlilqy5a7mh0w0z9f3a2i";
+          name = "shift-text";
+        };
+        packageRequires = [ cl-lib es-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/shift-text";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shimbun = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shimbun";
+        version = "20120718.2238";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "w3m";
+          rev = "5986b51c7c77500fee3349fb0b3f4764d3fc727b";
+          sha256 = "1lgvdaghzj1fzh8p6ans0f62zg1bfp086icbsqmyvbgpgcxia9cs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shimbun";
+          sha256 = "0k54886bh7zxsfnvga3wg3bsij4bixxrah2rrkq1lj0k8ay7nfxh";
+          name = "shimbun";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/shimbun";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shm";
+        version = "20151127.133";
+        src = fetchFromGitHub {
+          owner = "chrisdone";
+          repo = "structured-haskell-mode";
+          rev = "a305ca94059d31c60d549494756d5b4eabec20b0";
+          sha256 = "1cr83az4xm20i2v8bd5dbqll3d8vhjb3m2ypzwbxlizjcxpa638c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shm";
+          sha256 = "1qmp8cc83dcz25xbyqd4987i0d8ywvh16wq2wfs4km3ia8a2vi3c";
+          name = "shm";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/shm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shoulda = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shoulda";
+        version = "20140616.1333";
+        src = fetchFromGitHub {
+          owner = "marcwebbie";
+          repo = "shoulda.el";
+          rev = "fbe8eb8efc6cfcca1713283a290882cfcdc8725e";
+          sha256 = "19p47a4hwl6h2w5ay09hjhl4kf7cydwqp8s2iyrx2i0k58az8i8i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shoulda";
+          sha256 = "0lmlhx34nwvn636y2wvw3sprhhh6q3mdg7dzgpjj7ybibvhp1lzk";
+          name = "shoulda";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/shoulda";
+          license = lib.licenses.free;
+        };
+      }) {};
+    show-css = callPackage ({ dom, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "show-css";
+        version = "20140816.1208";
+        src = fetchFromGitHub {
+          owner = "smmcg";
+          repo = "showcss-mode";
+          rev = "1b8c330644c06e6d99ec5da8a9722c918b2ea039";
+          sha256 = "0n38dbyw039lpdxzbhngndqfhcfgsx570bpflrb5wdh2mq5w57md";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/show-css";
+          sha256 = "1b3n8h39m85inxsqvzwgb9fqnqn2sgib91hrisn1gpgfyjydzkr7";
+          name = "show-css";
+        };
+        packageRequires = [ dom ];
+        meta = {
+          homepage = "http://melpa.org/#/show-css";
+          license = lib.licenses.free;
+        };
+      }) {};
+    show-marks = callPackage ({ fetchFromGitHub, fetchurl, fm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "show-marks";
+        version = "20130805.949";
+        src = fetchFromGitHub {
+          owner = "vapniks";
+          repo = "show-marks";
+          rev = "97609566582e65eed0d0a854efa5c312f209115d";
+          sha256 = "15vkk7lnnfwgzkiwpqz1l1qpnz2d10l82m10m0prbw03k1zx22c7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/show-marks";
+          sha256 = "1jgxdclj88ca106vcvf1k8zbf7iwamy80c2ad8b3myz0f4zscjzb";
+          name = "show-marks";
+        };
+        packageRequires = [ fm ];
+        meta = {
+          homepage = "http://melpa.org/#/show-marks";
+          license = lib.licenses.free;
+        };
+      }) {};
+    showkey = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "showkey";
+        version = "20151231.1759";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/showkey.el";
+          sha256 = "0pq88kz5h0hzgfk8fyf3lppxalmadg5czbik824bpykp9l9gnf1m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/showkey";
+          sha256 = "1m280ll07i5c6s4w0s227jygdlpvd87dq45039v0sljyxm4bfrsv";
+          name = "showkey";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/showkey";
+          license = lib.licenses.free;
+        };
+      }) {};
+    showtip = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "showtip";
+        version = "20080329.2159";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/showtip.el";
+          sha256 = "01ibg36lvmdk7ac1k0f0r6wyds4rq0wb7gzw26nkiwykn14gxaql";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/showtip";
+          sha256 = "1fdhdmkvyz1dcy3x0im1iab6yhhh8gqvxmm6ccwr6rl1r1m5zwc8";
+          name = "showtip";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/showtip";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shpec-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shpec-mode";
+        version = "20150530.422";
+        src = fetchFromGitHub {
+          owner = "shpec";
+          repo = "shpec-mode";
+          rev = "146adc8281d0f115df39a3a3f982ac59ab61b754";
+          sha256 = "1mizhbwvnsxxjz6m94qziibvhghhp8v8db3wxrq3z9gsaqqkcndn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shpec-mode";
+          sha256 = "155hc1nym3fsvflps8d3ixaqw1cafqp97zcaywdppp47n7vj8zjl";
+          name = "shpec-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/shpec-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shrink-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shrink-whitespace";
+        version = "20150916.1415";
+        src = fetchFromGitHub {
+          owner = "jcpetkovich";
+          repo = "shrink-whitespace.el";
+          rev = "8d4263d974fbe66417c0bb9edc155ecc2f48e4b7";
+          sha256 = "07zzyfibs2c7w4gpvdh9003frznbg7zdnrx0nv8bvn0b68d3yz0m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shrink-whitespace";
+          sha256 = "12if0000i3rrxcm732layrv2h464wbb4xflbbfc844c83dbx1jmq";
+          name = "shrink-whitespace";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/shrink-whitespace";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shut-up = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shut-up";
+        version = "20150423.722";
+        src = fetchFromGitHub {
+          owner = "cask";
+          repo = "shut-up";
+          rev = "a4fd18f37e20ae991c0dbba821b2c8e6f1679c39";
+          sha256 = "00c11s664hwj1l1hw7qshygy3wb6wbd0hn6qqnyq1xr0r87nnhjs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shut-up";
+          sha256 = "1bcqrnnafnimfcg1s7vrgq4cb4rxi5sgpd92jj7xywvkalr3kh26";
+          name = "shut-up";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/shut-up";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sibilant-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sibilant-mode";
+        version = "20151119.1545";
+        src = fetchFromGitHub {
+          owner = "jbr";
+          repo = "sibilant-mode";
+          rev = "bc1b5d8cd597918bafc9b2880ee49024740e54ab";
+          sha256 = "0cjqh6qbbmgxd6zgqnikw6bh8wpjydydkkqs5wcmblpi5awqmnb6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sibilant-mode";
+          sha256 = "0jd6dsk93nvwi5yia3623hfc4v6zz4s2n8m1wx9bw8x6kv3h3qbq";
+          name = "sibilant-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sibilant-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sicp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sicp";
+        version = "20151130.957";
+        src = fetchFromGitHub {
+          owner = "webframp";
+          repo = "sicp-info";
+          rev = "7d060136bf4582fa74e4aa7cb924d856eea270f4";
+          sha256 = "102ssiz4sp7y816s1iy8i98c314jbn3sy0v87b0qgpgjiq913ffq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sicp";
+          sha256 = "1q7pbhjk8qgwvj27ianrdbmj98pwf3xv10gmpchh7bypmbyir4wz";
+          name = "sicp";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sicp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sift";
+        version = "20160107.415";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "sift.el";
+          rev = "8c3f3d14a351a2394027d72ee0599aa73b9f0d13";
+          sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sift";
+          sha256 = "0mv5zk140kjilwvzccj75ym7wlkkqryb532mbsy7i9bs3q7m916d";
+          name = "sift";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sift";
+          license = lib.licenses.free;
+        };
+      }) {};
+    signature = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "signature";
+        version = "20140730.1449";
+        src = fetchFromGitHub {
+          owner = "pidu";
+          repo = "signature";
+          rev = "c47df2e1189a84505f9224aa78e87b6c65d13d37";
+          sha256 = "1g4rr7hpy9r3y4vdpv48xpmy8kqvs4j64kvnhnj2rw2wv1grw78j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/signature";
+          sha256 = "11n3id1iiip99lj8c0iffbrf59s2yvmwlhqbf8xzxkhws7vwdl5q";
+          name = "signature";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/signature";
+          license = lib.licenses.free;
+        };
+      }) {};
+    simp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "simp";
+        version = "20150427.1132";
+        src = fetchFromGitHub {
+          owner = "re5et";
+          repo = "simp";
+          rev = "334b20287b3160f77e25c8e0ee2a73dd41fbe0ab";
+          sha256 = "1m8azyb4nxxdh6pwik9qb0zqp4z8z4vk3dlpfgklsq9rss8gwbaf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simp";
+          sha256 = "0x4lssjkj3fk9fw603f0sggvcj25iw0zbzsm5c949lhl4a3wvc9c";
+          name = "simp";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/simp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    simple-call-tree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "simple-call-tree";
+        version = "20151203.1625";
+        src = fetchFromGitHub {
+          owner = "vapniks";
+          repo = "simple-call-tree";
+          rev = "9f2fd423a3b86878d84e8c97e3ba45647b4d165e";
+          sha256 = "09blcc1aj1lbqr1jcjm8dlq13s3plrg1qbp9vr3sp4dxyhjpimjj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simple-call-tree";
+          sha256 = "1cbv4frsrwd8d3rg8r4sylwnc1hl3hgh595qwbpx0zd3dp5na2yl";
+          name = "simple-call-tree";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/simple-call-tree";
+          license = lib.licenses.free;
+        };
+      }) {};
+    simple-httpd = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "simple-httpd";
+        version = "20150430.1955";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "emacs-http-server";
+          rev = "4b7a6bc6a6df6b932f8c9e9aded9103397c0c18f";
+          sha256 = "0jn46fk0ljqs40kz6ngp0sk6hg1334835r2rmagx4qm0mdaqy7p8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simple-httpd";
+          sha256 = "18dharsdiwfkmhd9ibz9f47yfq9c2d78i886pi6gsjh8iwcpzx59";
+          name = "simple-httpd";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/simple-httpd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    simple-mpc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "simple-mpc";
+        version = "20151227.1234";
+        src = fetchFromGitHub {
+          owner = "jorenvo";
+          repo = "simple-mpc";
+          rev = "7a93c57b3f5d5bb7494a39982db21f25bc4ebbe9";
+          sha256 = "1bnc3ykgf727lc0ajxa8qsx616baljdgav78fkz57irm65dqr18q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simple-mpc";
+          sha256 = "05x2xyys5mf6k7ndh0l6ykyiygaznb4f8bx3npbhvihrsz9ilf8r";
+          name = "simple-mpc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/simple-mpc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    simple-plus = callPackage ({ fetchurl, lib, melpaBuild, strings }:
+    melpaBuild {
+        pname = "simple-plus";
+        version = "20151231.1800";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/simple+.el";
+          sha256 = "01fdk790jlpxy95y67yv6944ws4zjh7gs6ymnj1yflf19ccsdsnn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simple+";
+          sha256 = "12fsgjk53fq2316j8nm6wvdckpyg9hq3v65j5c52i0g0cwmx62ra";
+          name = "simple-plus";
+        };
+        packageRequires = [ strings ];
+        meta = {
+          homepage = "http://melpa.org/#/simple+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    simple-rtm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, rtm }:
+    melpaBuild {
+        pname = "simple-rtm";
+        version = "20160118.1211";
+        src = fetchFromGitHub {
+          owner = "mbunkus";
+          repo = "simple-rtm";
+          rev = "b10db02da508ec26d791ec6705205c74722acb27";
+          sha256 = "15y1kxck6gxqs6pv4qxz8rrc61bsk73pzbz6f30f5l0r0750i1rm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simple-rtm";
+          sha256 = "1aadzaf73clhyny2qiryg6z84k34yx3ghy6pyl0px9qhqc1ak271";
+          name = "simple-rtm";
+        };
+        packageRequires = [ rtm ];
+        meta = {
+          homepage = "http://melpa.org/#/simple-rtm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    simple-screen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "simple-screen";
+        version = "20141023.958";
+        src = fetchFromGitHub {
+          owner = "wachikun";
+          repo = "simple-screen";
+          rev = "4fcbdb4575310c0a2b4dd17fc8aeb4d7e6e9ffae";
+          sha256 = "0zf9wgyp0n00i00zl1lxr0d60569zgcjdnmdvgpcibvny5s1fp2i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simple-screen";
+          sha256 = "16zvsmqn882w320h26hjjz5lcyl9y0x4amkf2zfps77xxmkmi5n0";
+          name = "simple-screen";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/simple-screen";
+          license = lib.licenses.free;
+        };
+      }) {};
+    simpleclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "simpleclip";
+        version = "20150804.1210";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "simpleclip";
+          rev = "7079086ec09a148fcc9146ba9bd10e12fb011861";
+          sha256 = "09286h2q9dqghgfj9a4cniz6djw7867vcy3ixs7cn4wghvhyxm8s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simpleclip";
+          sha256 = "07qkfwlg8vw5kb097qbsv082hxir047q2bcvc8scbak2dr6pl12s";
+          name = "simpleclip";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/simpleclip";
+          license = lib.licenses.free;
+        };
+      }) {};
+    simplenote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "simplenote";
+        version = "20141118.840";
+        src = fetchFromGitHub {
+          owner = "dotemacs";
+          repo = "simplenote.el";
+          rev = "e836fcdb5a6497a9ffd6bceddd19b4bc52189078";
+          sha256 = "0xq4vy3ggdjiycd3aa62k94kd43zcpm8bfdgi8grwkb1lpvwq9i9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simplenote";
+          sha256 = "0rnvm3q2spfj15kx2c8ic1p8hxg7rwiqgf3x2zg34j1xxayn3h2j";
+          name = "simplenote";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/simplenote";
+          license = lib.licenses.free;
+        };
+      }) {};
+    simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }:
+    melpaBuild {
+        pname = "simplenote2";
+        version = "20150630.916";
+        src = fetchFromGitHub {
+          owner = "alpha22jp";
+          repo = "simplenote2.el";
+          rev = "2a6c539d98968837ec09d2754e9235ff278057a8";
+          sha256 = "1a0l0f6by1nmnnq0n52la9g3d357bmwak4qgy6p8g66qb9rx6rzv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simplenote2";
+          sha256 = "1qdzbwhzmsga65wmrd0mb3rbs71nlyqqb6f4v7kvfxzyis50cswm";
+          name = "simplenote2";
+        };
+        packageRequires = [ request-deferred ];
+        meta = {
+          homepage = "http://melpa.org/#/simplenote2";
+          license = lib.licenses.free;
+        };
+      }) {};
+    simplezen = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "simplezen";
+        version = "20130421.500";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "simplezen.el";
+          rev = "119fdf2c6890a0c56045ae72cf4fce0071a81481";
+          sha256 = "0108q2b5h73rjxg9k2kmc8z6la9kgqdnz9z1x7rn61v3vbxlzqvn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simplezen";
+          sha256 = "13f2anhfsxmx1vdd209gxkhpywsi3nn6pazhc6bkswmn27yiig7j";
+          name = "simplezen";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/simplezen";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sisyphus = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }:
+    melpaBuild {
+        pname = "sisyphus";
+        version = "20160111.308";
+        src = fetchFromGitHub {
+          owner = "phillord";
+          repo = "sisyphus";
+          rev = "83973f404749595d6921adde37e2d600931224de";
+          sha256 = "1wzzk1j2404cvwy9hwwwqa2njncy73py5m90w41v5kgjrrkiy84j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sisyphus";
+          sha256 = "08400jazj7w63l8g9ypy6w9dj8r0xh4d2yg3nfwqqf5lhfnj9bnj";
+          name = "sisyphus";
+        };
+        packageRequires = [ dash emacs m-buffer ];
+        meta = {
+          homepage = "http://melpa.org/#/sisyphus";
+          license = lib.licenses.free;
+        };
+      }) {};
+    skeletor = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "skeletor";
+        version = "20151220.2254";
+        src = fetchFromGitHub {
+          owner = "chrisbarrett";
+          repo = "skeletor.el";
+          rev = "8dffccd773d6c8e73ea3d9c1de689634cbf427d4";
+          sha256 = "0kbgxjfdf88h7hfds1kbdxx84wvkvy773r98ym1fzfm54m2kddvq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/skeletor";
+          sha256 = "1vfvg5l12dzksr24dxwc6ngawsqzpxjs97drw48qav9dy1vyl10v";
+          name = "skeletor";
+        };
+        packageRequires = [ cl-lib dash emacs f let-alist s ];
+        meta = {
+          homepage = "http://melpa.org/#/skeletor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    skewer-less = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, skewer-mode }:
+    melpaBuild {
+        pname = "skewer-less";
+        version = "20131015.822";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "skewer-less";
+          rev = "5a48dfa627c91f5f94150fab04cd66e890e3929f";
+          sha256 = "16757xz5ank3jsh8xglyly7pwdn5xm0yngampy1n1vgcwsp5080a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/skewer-less";
+          sha256 = "0fhv5cnp5bgw3krfmb0jl18kw2hzx2p81falj57lg3p8rn23dryl";
+          name = "skewer-less";
+        };
+        packageRequires = [ skewer-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/skewer-less";
+          license = lib.licenses.free;
+        };
+      }) {};
+    skewer-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, simple-httpd }:
+    melpaBuild {
+        pname = "skewer-mode";
+        version = "20150914.1504";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "skewer-mode";
+          rev = "5c76ab1786f2f365eff33fd5f52ce4ec3f9b42a2";
+          sha256 = "0yj7r5f751lra9jj7lg90qp66sgnb7fcjw5v9hfna7r13qdn9f20";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/skewer-mode";
+          sha256 = "1zp4myi9f7pw6zkgc0xg12585iihn7khcsf20pvqyc0vn4ajdwqm";
+          name = "skewer-mode";
+        };
+        packageRequires = [ emacs js2-mode simple-httpd ];
+        meta = {
+          homepage = "http://melpa.org/#/skewer-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    skewer-reload-stylesheets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, skewer-mode }:
+    melpaBuild {
+        pname = "skewer-reload-stylesheets";
+        version = "20150111.623";
+        src = fetchFromGitHub {
+          owner = "NateEag";
+          repo = "skewer-reload-stylesheets";
+          rev = "a22ed760a5515e43a05aeb82811dc571ba3d6060";
+          sha256 = "1q0qc4jc83k7dfhq2y06zy0fg38kvp219gb3icysdhs88zi2v9s3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/skewer-reload-stylesheets";
+          sha256 = "1rxn0ha2yhvyc195alg31nk1sjghnbha33xrqwc9z3j71w211frm";
+          name = "skewer-reload-stylesheets";
+        };
+        packageRequires = [ skewer-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/skewer-reload-stylesheets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    skype = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "skype";
+        version = "20131001.2318";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-skype";
+          rev = "c10f96d1d105acee8a9a9804652bf6a813591da4";
+          sha256 = "0gzj7cf42nhp3ac1a2gxcfbmn80z1z46zxsfr2f5xil2gjag39fx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/skype";
+          sha256 = "06p5s5agajbm9vg9xxpzv817xmjw2kmcahiw4iypn5yzwhv1aykl";
+          name = "skype";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/skype";
+          license = lib.licenses.free;
+        };
+      }) {};
+    slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
+    melpaBuild {
+        pname = "slack";
+        version = "20160118.752";
+        src = fetchFromGitHub {
+          owner = "yuya373";
+          repo = "emacs-slack";
+          rev = "d0bce55f11dbf4497c02955f406d4a31dacb5add";
+          sha256 = "07hpalcn3fj09bd5fs7ddnai9n8x91mqrysdf1kvivxq695a5hsz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slack";
+          sha256 = "0mybjx08yskk9vi06ayiknl5ddyd8h0mnr8c0a3zr61p1x4s6anp";
+          name = "slack";
+        };
+        packageRequires = [ alert circe emojify oauth2 request websocket ];
+        meta = {
+          homepage = "http://melpa.org/#/slack";
+          license = lib.licenses.free;
+        };
+      }) {};
+    slamhound = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "slamhound";
+        version = "20140506.1818";
+        src = fetchFromGitHub {
+          owner = "technomancy";
+          repo = "slamhound";
+          rev = "f43dd49b63b2838081735ea1988f70de05389692";
+          sha256 = "108zcb7hdaaq3sxjfr9nrwzqxx71q6aygzik7l3ab854xknkjfad";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slamhound";
+          sha256 = "14zlcw0zw86awd6g98l4h2whav9amz4m8ik877d1wsdjf69g7k9x";
+          name = "slamhound";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/slamhound";
+          license = lib.licenses.free;
+        };
+      }) {};
+    slideview = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "slideview";
+        version = "20150324.1740";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-slideview";
+          rev = "b6d170bda139aedf81b47dc55cbd1a3af512fb4c";
+          sha256 = "11p1pghx55a4gcn45cadw7c594134b21cdim723k2h99z14f89az";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slideview";
+          sha256 = "0zr08yrnrz49zds1651ysmgjqgbnhfdcqbg90sbsb086iw89rxl1";
+          name = "slideview";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/slideview";
+          license = lib.licenses.free;
+        };
+      }) {};
+    slim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "slim-mode";
+        version = "20140611.1150";
+        src = fetchFromGitHub {
+          owner = "slim-template";
+          repo = "emacs-slim";
+          rev = "869c84821cf3e556b380c5c35d8ad62287c4df58";
+          sha256 = "0vgyc2ny9qmn8f5r149y4g398mh4gnwsp4yim85z4vmdikqg8vi1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slim-mode";
+          sha256 = "1hip0r22irr9sah3b65ky71ic508bhqvj9hj95a81qvy1zi9rcac";
+          name = "slim-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/slim-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "slime";
+        version = "20160113.830";
+        src = fetchFromGitHub {
+          owner = "slime";
+          repo = "slime";
+          rev = "7f950dac7b4fd5925509626b69a0ab2c6397ec93";
+          sha256 = "0awxgn4vpwkkf0m2gwy5ivqpin4szc2y1xrz5v75h4hpfr5pqz4x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime";
+          sha256 = "04zcvjg0bbx5mdbsk9yn7rlprakl89dq6jmnq5v2g0n6q0mh6ign";
+          name = "slime";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/slime";
+          license = lib.licenses.free;
+        };
+      }) {};
+    slime-annot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
+    melpaBuild {
+        pname = "slime-annot";
+        version = "20131230.2108";
+        src = fetchFromGitHub {
+          owner = "arielnetworks";
+          repo = "cl-annot";
+          rev = "c99e69c15d935eabc671b483349a406e0da9518d";
+          sha256 = "1wq1gs9jjd5m6iwrv06c2d7i5dvqsfjcljgbspfbc93cg5xahk4n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime-annot";
+          sha256 = "14x9lzpkgkc96jsbfpahl027qh6y5azwdk0cmk9pbd1xm95kxj6n";
+          name = "slime-annot";
+        };
+        packageRequires = [ slime ];
+        meta = {
+          homepage = "http://melpa.org/#/slime-annot";
+          license = lib.licenses.free;
+        };
+      }) {};
+    slime-company = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
+    melpaBuild {
+        pname = "slime-company";
+        version = "20151210.814";
+        src = fetchFromGitHub {
+          owner = "anwyn";
+          repo = "slime-company";
+          rev = "cf03a862c3aa2393eb151af9e5bc032aa6b6f154";
+          sha256 = "1yi89hmnawf1pf9nv3f6i8a168wvri3zc40wgbbgnda8hxrcqkjx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime-company";
+          sha256 = "195s5fi2dl3h2jyy4d45q22jac35sciz81n13b4lgw94mkxx4rq2";
+          name = "slime-company";
+        };
+        packageRequires = [ company slime ];
+        meta = {
+          homepage = "http://melpa.org/#/slime-company";
+          license = lib.licenses.free;
+        };
+      }) {};
+    slime-ritz = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "slime-ritz";
+        version = "20130218.1737";
+        src = fetchFromGitHub {
+          owner = "pallet";
+          repo = "ritz";
+          rev = "4003fdaa5657d4ed1eeb0e244c46658cbb981667";
+          sha256 = "0rsh0bbhyx74yz1gjfqyi0bkqq5n3scpyh5mmc3d6dkpv8wa7bwz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime-ritz";
+          sha256 = "1y1439y07l1a0sp9wn110hw4yyxj8n1cnd6h17rmsr549m2qbg1a";
+          name = "slime-ritz";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/slime-ritz";
+          license = lib.licenses.free;
+        };
+      }) {};
+    slime-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "slime-theme";
+        version = "20141116.102";
+        src = fetchFromGitHub {
+          owner = "emacsfodder";
+          repo = "emacs-slime-theme";
+          rev = "441288a5791d24e79ada2698888653ef3cf2ac6f";
+          sha256 = "13rm9pmshgssmydhpirri38s38z3kvkhqama40qdzqq96dsxlnjx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime-theme";
+          sha256 = "1b709cplxip48a6qjdnzcn5qcgsy0jq1m05d7vc8p5ywgr1f9a00";
+          name = "slime-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/slime-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    slime-volleyball = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "slime-volleyball";
+        version = "20140717.2341";
+        src = fetchFromGitHub {
+          owner = "fitzsim";
+          repo = "slime-volleyball";
+          rev = "159b5c0f40b109e3854e94b89ec5383854c46ae3";
+          sha256 = "00v4mh04affd8kkw4rn51djpyga2rb8f63mgy86napglqnkz40r3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime-volleyball";
+          sha256 = "1dzvj8z3l5l9ixjl3nc3c7zzi23zc2300r7jzw2l3bvg64cfbdg7";
+          name = "slime-volleyball";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/slime-volleyball";
+          license = lib.licenses.free;
+        };
+      }) {};
+    slirm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "slirm";
+        version = "20160118.929";
+        src = fetchFromGitHub {
+          owner = "fbie";
+          repo = "slirm";
+          rev = "bf66b9c512fc1955cadb4e573d07877dcda10df2";
+          sha256 = "186q8mcfk1p14nf97rqrqm6zgd6pzw7g96pj7kcazpndnl1my8zx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slirm";
+          sha256 = "061xjj3vjdkkvd979fhp7bc12g5zkxqxywvcz3z9dlkgdks41ld7";
+          name = "slirm";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/slirm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    slovak-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "slovak-holidays";
+        version = "20150418.355";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "slovak-holidays";
+          rev = "effb16dfcd14797bf7448f5113085479db339c02";
+          sha256 = "1y1gay1h91c0690gly4qibx1my0l1zpb6s3x58lks8m21jdwfw28";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slovak-holidays";
+          sha256 = "1dcw8pa3r9b7n7dc8fgzijz7ywwxb3nlfg7n0by8dnvpjq2c30bg";
+          name = "slovak-holidays";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/slovak-holidays";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sly";
+        version = "20151228.955";
+        src = fetchFromGitHub {
+          owner = "capitaomorte";
+          repo = "sly";
+          rev = "8ac6fe5286eed3f778895581c5315a9c9dbd03a6";
+          sha256 = "1svawfb46066jnap7k188j5fwyqwkd5mql3x14zrm6gjl5mv2a5z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sly";
+          sha256 = "1pmyqjk8fdlzwvrlx8h6fq0savksfny78fhmr8r7b07pi20y6n9l";
+          name = "sly";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/sly";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sly-company = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
+    melpaBuild {
+        pname = "sly-company";
+        version = "20151126.222";
+        src = fetchFromGitHub {
+          owner = "capitaomorte";
+          repo = "sly-company";
+          rev = "21248bd852c9520ec27692f286c5f43b50892b12";
+          sha256 = "0qpw345ch5b9dbznk916f6h9f9dnf03wfyvpgnzdf30ffvf4q01w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sly-company";
+          sha256 = "1n8bx0qis2bs49c589cbh59xcv06r8sx6y4lxprc9pfpycx7h6v2";
+          name = "sly-company";
+        };
+        packageRequires = [ company emacs sly ];
+        meta = {
+          homepage = "http://melpa.org/#/sly-company";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sly-hello-world = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
+    melpaBuild {
+        pname = "sly-hello-world";
+        version = "20160118.449";
+        src = fetchFromGitHub {
+          owner = "capitaomorte";
+          repo = "sly-hello-world";
+          rev = "4f5047a3b79e14d84ccf908cd29d5663815c05f6";
+          sha256 = "03pprkhsczfvlnpf15xx3dp5a1jvqskf2w14yz3xn9k9hgy5sa13";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sly-hello-world";
+          sha256 = "03ybjgczp6ssk4hmwd486vshlk7ql27k1lyhmvk26gmrf554z90n";
+          name = "sly-hello-world";
+        };
+        packageRequires = [ sly ];
+        meta = {
+          homepage = "http://melpa.org/#/sly-hello-world";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sly-named-readtables = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
+    melpaBuild {
+        pname = "sly-named-readtables";
+        version = "20150817.1016";
+        src = fetchFromGitHub {
+          owner = "capitaomorte";
+          repo = "sly-named-readtables";
+          rev = "df4ed79064cf85275804e201899b677bef4ab3f5";
+          sha256 = "1xi625pn3mg77mjvr94v6a5pjyvgjavpkdbbh1lqjx1halaa2qb7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sly-named-readtables";
+          sha256 = "11ymzbj1ji7avfjqafj9p5zx0m4y1jfjcmyanpjq1frdcz639ir9";
+          name = "sly-named-readtables";
+        };
+        packageRequires = [ sly ];
+        meta = {
+          homepage = "http://melpa.org/#/sly-named-readtables";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smart-compile = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "smart-compile";
+        version = "20150519.1147";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/smart-compile.el";
+          sha256 = "0sm4nxynwhwypzw008fz56axai9lrphjczwzfdy7da3akan18rbd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-compile";
+          sha256 = "0vgxqyzl7jw2j96rmjw75b5lmjwrvzajrdvfyabss4xmv96dy2r3";
+          name = "smart-compile";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/smart-compile";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smart-cursor-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smart-cursor-color";
+        version = "20141124.1119";
+        src = fetchFromGitHub {
+          owner = "7696122";
+          repo = "smart-cursor-color";
+          rev = "1d190f49ca77734b55ac58f1b6276e42ada967b0";
+          sha256 = "1xbd42q60pmg0hw4bn2fndjwgrfgj6ggm757fyp8m08jqh0zkarn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-cursor-color";
+          sha256 = "11875pwlx2rm8d86541na9g3yiq0j472vg63mryqv6pzq3n8q6jx";
+          name = "smart-cursor-color";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/smart-cursor-color";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smart-forward = callPackage ({ expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smart-forward";
+        version = "20140430.213";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "smart-forward.el";
+          rev = "7b6dbfdbd4b646376a567c70e1a161545431b72b";
+          sha256 = "19l47xqzjhhm9j3izik0imssip5ygg3lnflb9ixsz1js571aaxha";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-forward";
+          sha256 = "032yc45c19fl886jmi5q04r6q47xz5rphb040wjvpd4fnb06hr8c";
+          name = "smart-forward";
+        };
+        packageRequires = [ expand-region ];
+        meta = {
+          homepage = "http://melpa.org/#/smart-forward";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smart-indent-rigidly = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smart-indent-rigidly";
+        version = "20141205.1815";
+        src = fetchFromGitHub {
+          owner = "re5et";
+          repo = "smart-indent-rigidly";
+          rev = "323d1fe4d0b81e598249aad01bc44adb180ece0e";
+          sha256 = "0q5hxg265ad9gpclv2kzikg6jvbf3zzb1mrykxn0n7mnvdfdlhsi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-indent-rigidly";
+          sha256 = "12qggg1m28mlvkdn52dig8bwv58pvipkvn1mlc4r7w569arar44x";
+          name = "smart-indent-rigidly";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/smart-indent-rigidly";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smart-mark = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smart-mark";
+        version = "20150911.2110";
+        src = fetchFromGitHub {
+          owner = "cheunghy";
+          repo = "smart-mark";
+          rev = "04b522a23e3aae8381c6a976fc978532fcb2e7d0";
+          sha256 = "0sqvm7iwdjk057fwid4kz6wj71igiqhdarj59s17pzy6xz34afhg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-mark";
+          sha256 = "1vv65sa0pwl407mbxcp653kycgx8jz87n6wshias1dp9lv21pj6v";
+          name = "smart-mark";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/smart-mark";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }:
+    melpaBuild {
+        pname = "smart-mode-line";
+        version = "20160111.1134";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "smart-mode-line";
+          rev = "25db8758068bd7495b1f2fe25a221cdb9c4dde80";
+          sha256 = "10d6skkl9skq1y669sma2pyahri5lcn48fq0lvpmbh8397rb94pk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-mode-line";
+          sha256 = "0qmhzlkc6mfqyaw4jaw6195b8sw0wg9pfjcijb4p0mlywf5mh5q6";
+          name = "smart-mode-line";
+        };
+        packageRequires = [ emacs rich-minority ];
+        meta = {
+          homepage = "http://melpa.org/#/smart-mode-line";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smart-mode-line-powerline-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, smart-mode-line }:
+    melpaBuild {
+        pname = "smart-mode-line-powerline-theme";
+        version = "20160111.1132";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "smart-mode-line";
+          rev = "25db8758068bd7495b1f2fe25a221cdb9c4dde80";
+          sha256 = "10d6skkl9skq1y669sma2pyahri5lcn48fq0lvpmbh8397rb94pk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-mode-line-powerline-theme";
+          sha256 = "0hv3mx39m3l35xhz351zp98321ilr6qq9wzwn1f0ziiv814khcn4";
+          name = "smart-mode-line-powerline-theme";
+        };
+        packageRequires = [ emacs powerline smart-mode-line ];
+        meta = {
+          homepage = "http://melpa.org/#/smart-mode-line-powerline-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smart-newline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smart-newline";
+        version = "20131207.2140";
+        src = fetchFromGitHub {
+          owner = "ainame";
+          repo = "smart-newline.el";
+          rev = "f5f5ff033645aea0652aa375b034746754a38b1e";
+          sha256 = "1q74b0mbhly84g252a0arbyxc720rgs9a3yqf8b8s2fpfkzb95sg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-newline";
+          sha256 = "1kyk865vkgh05vzlggs3ii81v86fcbcxybfkv5rkyl3fyqpkza1w";
+          name = "smart-newline";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/smart-newline";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smart-region = callPackage ({ cl-lib ? null, emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
+    melpaBuild {
+        pname = "smart-region";
+        version = "20150903.903";
+        src = fetchFromGitHub {
+          owner = "uk-ar";
+          repo = "smart-region";
+          rev = "5a8017fd8e8dc3483865951c4942cab3f96f69f6";
+          sha256 = "0h559cdyln5f4ignx1r86ryi7wizys0gj03dj7lfzaxr7wkd0jaf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-region";
+          sha256 = "1bcvxf62bfi5lmhprma9rh670kka9p9ygbkgmv6dg6ajjfsplgwc";
+          name = "smart-region";
+        };
+        packageRequires = [ cl-lib emacs expand-region multiple-cursors ];
+        meta = {
+          homepage = "http://melpa.org/#/smart-region";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smart-shift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smart-shift";
+        version = "20150203.125";
+        src = fetchFromGitHub {
+          owner = "hbin";
+          repo = "smart-shift";
+          rev = "a26ab2b240137e62ec4bce1698ed9c5f7b6d13ae";
+          sha256 = "0azhfffm1bkgjx4i3p9f6x2gmw8kc3fafzqj4vxxdibhn0nizqk8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-shift";
+          sha256 = "0azahlflnh6sk081k5dcqal6nmwkjnj4dq8pv8ckwf8684zp23d3";
+          name = "smart-shift";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/smart-shift";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smart-tab = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smart-tab";
+        version = "20150703.1117";
+        src = fetchFromGitHub {
+          owner = "genehack";
+          repo = "smart-tab";
+          rev = "28918a72045811294ecb33f666ba23fe66c169af";
+          sha256 = "0aighpby8khrljb67m533bwkzlsckyvv7d09cnzr1rfwxiil0ml4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-tab";
+          sha256 = "0qi8jph2c9fdsv2mqgxd7wb3q4dax3g5x2hc53kbgkjxylagjvp5";
+          name = "smart-tab";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/smart-tab";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smart-tabs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smart-tabs-mode";
+        version = "20140331.1829";
+        src = fetchFromGitHub {
+          owner = "jcsalomon";
+          repo = "smarttabs";
+          rev = "cd19892677ec9a2c378c828aa7cef9a2b2bd1c0e";
+          sha256 = "1s65hr7b8aggvdd1i6gkkpz6j1kqilggfnf46xvjnvdw9awmwk6b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-tabs-mode";
+          sha256 = "1fmbi0ypzhsizzb1vm92hfaq23swiyiqvg0pmibavzqyc9lczhhl";
+          name = "smart-tabs-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/smart-tabs-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smart-window = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smart-window";
+        version = "20130214.1342";
+        src = fetchFromGitHub {
+          owner = "dryman";
+          repo = "smart-window.el";
+          rev = "a87e0d2007de40033deee39496f791f4b047f138";
+          sha256 = "15834lnh7dq9kz31k06ifpnc0vz86rycz0ryildi5qd2nb7s3lw9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-window";
+          sha256 = "1x1ncldl9njil9hhvzj5ac1l5aiyfm0f7j0d7lw8ady7xx2cy26m";
+          name = "smart-window";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/smart-window";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smartparens";
+        version = "20160108.1603";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "smartparens";
+          rev = "8f94974ec25b82fbab49eeae2054db52a00e274d";
+          sha256 = "1kwn1k6yyi2s83qkhl30zc1c2l8xlwy6bs8mqffss9y3bknli6px";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smartparens";
+          sha256 = "025nfrfw0992024i219jzm4phwf29smc5hib45s6h1s67942mqh6";
+          name = "smartparens";
+        };
+        packageRequires = [ cl-lib dash ];
+        meta = {
+          homepage = "http://melpa.org/#/smartparens";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smartrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smartrep";
+        version = "20150508.2130";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "smartrep.el";
+          rev = "f0ff5a6d7b8603603598ae3045c98b011e58d86e";
+          sha256 = "1sjwqi8w83qxihqmcm7z0vwmrz1az0y266qgj2nwfv39bri6y4i6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smartrep";
+          sha256 = "1ypls52d51lcqhz737rqg73c6jwl6q8b3bwb29z51swyamf37rbn";
+          name = "smartrep";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/smartrep";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smartscan = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smartscan";
+        version = "20131230.939";
+        src = fetchFromGitHub {
+          owner = "mickeynp";
+          repo = "smart-scan";
+          rev = "5fd584d29ff8e5cd7a9e689369756868ab2922d3";
+          sha256 = "193cxfnh263yw628ipf9gssvyq3j7mffrdmnjhvzzcsnhd1k145p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smartscan";
+          sha256 = "0vghgmx8vnjbvsw7q5zs0qz2wm6dcng9m69b8dq81g2cq9dflbwb";
+          name = "smartscan";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/smartscan";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smartwin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smartwin";
+        version = "20151230.311";
+        src = fetchFromGitHub {
+          owner = "jerryxgh";
+          repo = "smartwin";
+          rev = "9928e6b57b65b42a285f7ea8234c7825442b9f3b";
+          sha256 = "1qfa6i59zhi8d6175py8id8gq7b3hdaqq4naa86r1rb7x8ringff";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smartwin";
+          sha256 = "0rg92j0aa8qxhr91hjj2f4w8vj5w9b4d2nmkggng44nxk8zafdif";
+          name = "smartwin";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/smartwin";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smarty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smarty-mode";
+        version = "20100703.658";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "smarty-mode";
+          rev = "3dfdfe1571f5e9ef55a29c51e5a80046d4cb7568";
+          sha256 = "1vl3nx0y2skb8sibqxvmc3wrmmd6z88hknbry348d0ik3cbr0ijx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smarty-mode";
+          sha256 = "06cyr2330asy2dlx81g3h9gq0yhd4pbnmzfvmla7amh4pfnjg14v";
+          name = "smarty-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/smarty-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smeargle = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smeargle";
+        version = "20151014.42";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-smeargle";
+          rev = "67466d5214a681430db8cb59a2a1bca771ff0024";
+          sha256 = "1smv91ggvaw37597ilvhra8cnj4p71n6v5pfazii8k85kvs6x460";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smeargle";
+          sha256 = "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd";
+          name = "smeargle";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/smeargle";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smex = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smex";
+        version = "20151212.1609";
+        src = fetchFromGitHub {
+          owner = "nonsequitur";
+          repo = "smex";
+          rev = "55aaebe3d793c2c990b39a302eb26c184281c42c";
+          sha256 = "0xrbkpc3w7yadpjih169cpp75gilsnx4y9akgci5vfcggv4ffm26";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smex";
+          sha256 = "1rwyi7gdzswafkwpfqd6zkxka1mrf4xz17kld95d2ram6cxl6zda";
+          name = "smex";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/smex";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sml-modeline = callPackage ({ fetchbzr, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sml-modeline";
+        version = "20120110.1440";
+        src = fetchbzr {
+          url = "lp:~nxhtml/nxhtml/main";
+          rev = "835";
+          sha256 = "1p10q1b5bvc8fvgfxynrq2kf1ygr6gad92x40zhaa5r1ksf6ryk4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sml-modeline";
+          sha256 = "086hslzznv6fmlhkf28mcl8nh4xk802mv6w0a4zwd5px2wyyaysd";
+          name = "sml-modeline";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sml-modeline";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smooth-scroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smooth-scroll";
+        version = "20130321.2314";
+        src = fetchFromGitHub {
+          owner = "k-talo";
+          repo = "smooth-scroll.el";
+          rev = "02320f28abb5cae28b3a18f6b9ce93129bdbfc45";
+          sha256 = "1kkg7qhb2lmwr4siiazqny9w2z9nk799lzl5i159lfivlxcgixmk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smooth-scroll";
+          sha256 = "1b0mjpd4dqgk7ij37145ry2jqbn1msf8rrvymn7zyckbccg83zsf";
+          name = "smooth-scroll";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/smooth-scroll";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smooth-scrolling = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smooth-scrolling";
+        version = "20131219.2239";
+        src = fetchFromGitHub {
+          owner = "aspiers";
+          repo = "smooth-scrolling";
+          rev = "0d9b228f952c53ad456f98e2c761dda70ed72174";
+          sha256 = "05kf3hb3nb32jzw50a2z9vlf3f0pj40klzxvqj4fxlci777imsvk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smooth-scrolling";
+          sha256 = "0zy2xsmr05l2narslfgril36d7qfb55f52qm2ki6fy1r18lfiyc6";
+          name = "smooth-scrolling";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/smooth-scrolling";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smotitah = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smotitah";
+        version = "20150218.430";
+        src = fetchFromGitHub {
+          owner = "laynor";
+          repo = "smotitah";
+          rev = "f9ab562128a5460549d016913533778e8c94bcf3";
+          sha256 = "1a097f1x9l0m4dizvnb742svlqsm6hlif73rk7qjar081sk1gjxx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smotitah";
+          sha256 = "1m5qjl3r96riljp48il8k4rb6rwys1xf1pl93d4qjhprwvz57mv2";
+          name = "smotitah";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/smotitah";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smtpmail-multi = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smtpmail-multi";
+        version = "20130921.2242";
+        src = fetchFromGitHub {
+          owner = "vapniks";
+          repo = "smtpmail-multi";
+          rev = "21885f6f7ec46facb64fafc2caa2be01caa4b6db";
+          sha256 = "0rhpnijp72jsl4gzhwz0z387f55vv3fp0zwki0fi5jlkzjamnnqg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smtpmail-multi";
+          sha256 = "0nc3k8ly4nx7fm3b2apga3p4svz5c9sldnlk86pz2lzra5h3b4ss";
+          name = "smtpmail-multi";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/smtpmail-multi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smyx-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smyx-theme";
+        version = "20141127.228";
+        src = fetchFromGitHub {
+          owner = "tacit7";
+          repo = "smyx";
+          rev = "6263f6b401bbabaed388c8efcfc0be2e58c51401";
+          sha256 = "1z2sdnf11wh5hz1rkrbg7fs4ha3zrbj9qnvfzq9005y89d7cs95x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smyx-theme";
+          sha256 = "1r85yxr864df5akqknl3hsrmzikr4085bqr6ijrbdj27nz00vl61";
+          name = "smyx-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/smyx-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    snakemake-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "snakemake-mode";
+        version = "20160117.1551";
+        src = fetchFromGitHub {
+          owner = "kyleam";
+          repo = "snakemake-mode";
+          rev = "fac9683e73ec1a068ac2bd03269494f137ef9606";
+          sha256 = "01kixhbl2q7qd173zv6prgr81gnmhf95bjyraysw45wza72amkqk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/snakemake-mode";
+          sha256 = "1xxd3dms5vgvpn18a70wjprka5xvri2pj9cw8qz09s640f5jf3r4";
+          name = "snakemake-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/snakemake-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    snapshot-timemachine = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "snapshot-timemachine";
+        version = "20150501.1300";
+        src = fetchFromGitHub {
+          owner = "mrBliss";
+          repo = "snapshot-timemachine";
+          rev = "5c1e29fc771ffc65180faa1366c85aa50a335773";
+          sha256 = "17nbm8692ihrlcikihspdqg8wvp80ryq4h06da34d0awqm0w027m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/snapshot-timemachine";
+          sha256 = "0pvh1ilzv0ambc5cridyhjcxs58wq92bxjkisqv42yar3h3z6f8p";
+          name = "snapshot-timemachine";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/snapshot-timemachine";
+          license = lib.licenses.free;
+        };
+      }) {};
+    snippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "snippet";
+        version = "20130210.1715";
+        src = fetchFromGitHub {
+          owner = "pkazmier";
+          repo = "snippet.el";
+          rev = "11d00dd803874b93836f2010b08bd2c97b0f3c63";
+          sha256 = "1nyrfbjrg74wrqlh8229rf7ym07k2a0wscjm0kbg3sam9ryc546y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/snippet";
+          sha256 = "1lgpw69k5a82y70j7nximdj0bl5nzr4jhjr5fkx1cvz8hhvgdz6j";
+          name = "snippet";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/snippet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    soft-charcoal-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "soft-charcoal-theme";
+        version = "20140420.1143";
+        src = fetchFromGitHub {
+          owner = "mswift42";
+          repo = "soft-charcoal-theme";
+          rev = "5607ab977fae6638e78b1495e02da8955c9ba19f";
+          sha256 = "07056pnjgsgw06c67776qp7jci96iqbzlprbavzz2l1j8ywz8cwm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/soft-charcoal-theme";
+          sha256 = "0i29ais1m2h9v4ghcg41zfbnaj8klgm4509nkyfkxm7wqnjd166a";
+          name = "soft-charcoal-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/soft-charcoal-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    soft-morning-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "soft-morning-theme";
+        version = "20150918.1541";
+        src = fetchFromGitHub {
+          owner = "mswift42";
+          repo = "soft-morning-theme";
+          rev = "c0f9c70c97ef2be2a093cf839c4bfe27740a111c";
+          sha256 = "06q82v1hndvznsqg0r6jrxvgxhycg9m65kay4db4yy0gmc66v2xf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/soft-morning-theme";
+          sha256 = "0lzg478ax6idzh6m5sf2ds4gbv096y0c0gn15dai19f58bs63xzr";
+          name = "soft-morning-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/soft-morning-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    soft-stone-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "soft-stone-theme";
+        version = "20140614.335";
+        src = fetchFromGitHub {
+          owner = "mswift42";
+          repo = "soft-stone-theme";
+          rev = "fb475514cfb02cf30ce358a61c48e46614344d48";
+          sha256 = "030mf8b0sf9mmzwhg85zh0ccvcg768kckwvbm0yzg7vmq1x46hjl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/soft-stone-theme";
+          sha256 = "05jjw9z6hqln9yj8ya2xrmjnylp7psfdj9206n30m3lwnlwx399v";
+          name = "soft-stone-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/soft-stone-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    solarized-theme = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "solarized-theme";
+        version = "20160106.215";
+        src = fetchFromGitHub {
+          owner = "bbatsov";
+          repo = "solarized-emacs";
+          rev = "d518af81dbe14c4ae710115e6b7de94587436f21";
+          sha256 = "1vkrl8xvr5la8rj5gmafamzlqr0q2l1immyfnmfzf3r4n14kdywk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/solarized-theme";
+          sha256 = "15d8k32sj8i11806byvf7r57rivz391ljr0zb4dx8n8vjjkyja12";
+          name = "solarized-theme";
+        };
+        packageRequires = [ cl-lib dash ];
+        meta = {
+          homepage = "http://melpa.org/#/solarized-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    solidity-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "solidity-mode";
+        version = "20151124.1111";
+        src = fetchFromGitHub {
+          owner = "ethereum";
+          repo = "emacs-solidity";
+          rev = "8bbd7d9e1e823b524d882d996b5c4e7b6a523b41";
+          sha256 = "0drb237750lry18arbfx37drf16znwz8fhx5fawxy1q4z7bl7z5n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/solidity-mode";
+          sha256 = "1qdzdivrf5yaa80p61b9r1gryw112v5l2m2jkvkc7glhkhrcvwsx";
+          name = "solidity-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/solidity-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sonic-pi = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, osc }:
+    melpaBuild {
+        pname = "sonic-pi";
+        version = "20150919.530";
+        src = fetchFromGitHub {
+          owner = "repl-electric";
+          repo = "sonic-pi.el";
+          rev = "3d88a784bf7883ec56fbef5923c4e1b50d2b9b09";
+          sha256 = "1ga35d3rhdf6ffd36q58ay6380gjvkmaiid4vscga3v7ca0dkhl1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sonic-pi";
+          sha256 = "07qxm1rkw2cbxf4g2vqk3s7xnqldqkdm2zw1qh2kqjscg5gwpkqp";
+          name = "sonic-pi";
+        };
+        packageRequires = [ cl-lib dash emacs osc ];
+        meta = {
+          homepage = "http://melpa.org/#/sonic-pi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    soothe-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "soothe-theme";
+        version = "20141027.941";
+        src = fetchFromGitHub {
+          owner = "jasonm23";
+          repo = "emacs-soothe-theme";
+          rev = "0786fe70c6c1b4ddcfb932fdc6862b9611cfc09b";
+          sha256 = "10gh1hvxq9gm29r6qzlnva7vjidd7n4kih4z2ihyvbvy9za20xqw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/soothe-theme";
+          sha256 = "000hikpsmqpbb6v13az2dv319d0f7jjpkkpgi4vzv59z6cdlrlp3";
+          name = "soothe-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/soothe-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "sos";
+        version = "20141214.2203";
+        src = fetchFromGitHub {
+          owner = "omouse";
+          repo = "emacs-sos";
+          rev = "96b7d951a5f0a8ae401c0813745fc1aca0cb816c";
+          sha256 = "16x039imyf4p5d4rn92nlqcsvb5vlvdgq1m5g856b9dzwa89x733";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sos";
+          sha256 = "1gkd0plx7152s3dj8a9lwlwh8bgs1m006s80l10agclx6aay8rvb";
+          name = "sos";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "http://melpa.org/#/sos";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sotclojure = callPackage ({ cider, clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sotlisp }:
+    melpaBuild {
+        pname = "sotclojure";
+        version = "20151225.1913";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "speed-of-thought-clojure";
+          rev = "f2f7ed52dba57752804810992c35f991c9f7dfc4";
+          sha256 = "0s6nfszyk0qprdpd55yfcn6xv1fym43yra0j4ys6wf65lai9kr2p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sotclojure";
+          sha256 = "12byqjzg0pffqyq958265qq8yxxmf3iyy4m7zib492qcj8ccy090";
+          name = "sotclojure";
+        };
+        packageRequires = [ cider clojure-mode emacs sotlisp ];
+        meta = {
+          homepage = "http://melpa.org/#/sotclojure";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sotlisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sotlisp";
+        version = "20151105.934";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "speed-of-thought-lisp";
+          rev = "d5d5ae44e6a31e231024cc7ad9861aa451165413";
+          sha256 = "027jmqx4240hym2is9q1iyjdws9ijyyck8dnsbm9xc5lhpsdrl69";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sotlisp";
+          sha256 = "0zjnn6hhwy6cjvc5rhvhxcq5pmrhcyil14a48fcgwvg4lv7fbljk";
+          name = "sotlisp";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/sotlisp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sound-wav = callPackage ({ cl-lib ? null, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sound-wav";
+        version = "20140303.657";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-sound-wav";
+          rev = "254d3a7180a65cb33a808c43b70d4e6daa121ac9";
+          sha256 = "1h6h65gwxb07pscyhhhdn11h3lx3jgyfw8v1kw5m2qfrv5kh6ylq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sound-wav";
+          sha256 = "1vrwzk6zqma7r0w5ivbx16shys6hsifj52fwlf5rxs6jg1gqdb4f";
+          name = "sound-wav";
+        };
+        packageRequires = [ cl-lib deferred ];
+        meta = {
+          homepage = "http://melpa.org/#/sound-wav";
+          license = lib.licenses.free;
+        };
+      }) {};
+    soundcloud = callPackage ({ deferred, emms, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, request, request-deferred, string-utils }:
+    melpaBuild {
+        pname = "soundcloud";
+        version = "20150501.2226";
+        src = fetchFromGitHub {
+          owner = "tthieman";
+          repo = "soundcloud.el";
+          rev = "f998d4276ea90258909c698f6a5a51fccb667c08";
+          sha256 = "1m8wcm6y80gq5rrm4brd3f20kmk54s6ph26j4lz4cmilxk6gj56v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/soundcloud";
+          sha256 = "1jl9sk372j4162av9kfcbqp0cc5wpm86nkqg8rskfgmsi4ncp4ph";
+          name = "soundcloud";
+        };
+        packageRequires = [
+          deferred
+          emms
+          json
+          request
+          request-deferred
+          string-utils
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/soundcloud";
+          license = lib.licenses.free;
+        };
+      }) {};
+    soundklaus = callPackage ({ cl-lib ? null, dash, deferred, emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
+    melpaBuild {
+        pname = "soundklaus";
+        version = "20150102.1521";
+        src = fetchFromGitHub {
+          owner = "r0man";
+          repo = "soundklaus.el";
+          rev = "830f2b5f4dd4bd110db23a71494b92bb8fe5b058";
+          sha256 = "1ipg4vvh6vgf0az8p31br1xkb8ndjmd6fybcx11r3c479sg0y6k7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/soundklaus";
+          sha256 = "0b63sbgwp99ff94dxrqqp2p99j268fjkkzx0g42g726hv80d4fxb";
+          name = "soundklaus";
+        };
+        packageRequires = [ cl-lib dash deferred emacs emms pkg-info s ];
+        meta = {
+          homepage = "http://melpa.org/#/soundklaus";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sourcegraph = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sourcegraph";
+        version = "20150403.2127";
+        src = fetchFromGitHub {
+          owner = "sourcegraph";
+          repo = "emacs-sourcegraph-mode";
+          rev = "554c55734c23588fce66a8fa966945509b03d395";
+          sha256 = "18iv7jhy08smpdksplngj1mxcm2mm9gvbylimgr3211l8jr9gq8r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sourcegraph";
+          sha256 = "0rl6s1d0y2pggbfiq4f4xg9qp7nhkd708himzilfqyfa4jwna8yz";
+          name = "sourcegraph";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/sourcegraph";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sourcekit";
+        version = "20151209.714";
+        src = fetchFromGitHub {
+          owner = "nathankot";
+          repo = "company-sourcekit";
+          rev = "5e1adf8d201fd94a942b40983415db1b28b6eef1";
+          sha256 = "1xzwalchl9lnq9848dlvhhbzyh1wkwbciz20d1iw0fsigj5g156c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sourcekit";
+          sha256 = "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks";
+          name = "sourcekit";
+        };
+        packageRequires = [ dash dash-functional emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/sourcekit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sourcemap = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sourcemap";
+        version = "20150418.900";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-sourcemap";
+          rev = "d50fd8d169f2d347b24276a0d28bb197400fc657";
+          sha256 = "085xd5fqxgv9bam9k4aa3w0sa9q41cg275i60c8njy3bkbqcalh5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sourcemap";
+          sha256 = "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5";
+          name = "sourcemap";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/sourcemap";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sourcetalk = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "sourcetalk";
+        version = "20140823.939";
+        src = fetchFromGitHub {
+          owner = "malroc";
+          repo = "sourcetalk_emacs";
+          rev = "aced89fa8776e6d5e42dad4a863e159959f08de6";
+          sha256 = "0j4qm1y7rhb95k1zbl3c60a46l9rchzslzq36mayyw61s6yysjnv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sourcetalk";
+          sha256 = "0qaf2q784xgl1s3m88jpwdzghpi4f3nybga3lnr1w7sb7b3yvj3z";
+          name = "sourcetalk";
+        };
+        packageRequires = [ request ];
+        meta = {
+          homepage = "http://melpa.org/#/sourcetalk";
+          license = lib.licenses.free;
+        };
+      }) {};
+    spacegray-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "spacegray-theme";
+        version = "20150719.1431";
+        src = fetchFromGitHub {
+          owner = "bruce";
+          repo = "emacs-spacegray-theme";
+          rev = "7f70ee36297e5ccf9bc90b1f81472024f5a7a749";
+          sha256 = "1a8jp7m9zarvljg5d9c8ydir3qcmwx05c3frs696p9nwvapf6lsb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spacegray-theme";
+          sha256 = "0khiddpsywpv9qvynpfdmybd80lbrhm68j3py6ranxlv7p79j9dx";
+          name = "spacegray-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/spacegray-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
+    melpaBuild {
+        pname = "spaceline";
+        version = "20160107.826";
+        src = fetchFromGitHub {
+          owner = "TheBB";
+          repo = "spaceline";
+          rev = "e140876cf75d5dbbac3a45428640d9d573a8c4c5";
+          sha256 = "0l2qvh01m1r8gfi055slgz96k7mcl0pqw8bbfw1saq5wfr2s95zh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spaceline";
+          sha256 = "0jpcj0i8ckdylrisx9b4l9kam6kkjzhhv1s7mwwi4b744rx942iw";
+          name = "spaceline";
+        };
+        packageRequires = [ cl-lib dash emacs powerline s ];
+        meta = {
+          homepage = "http://melpa.org/#/spaceline";
+          license = lib.licenses.free;
+        };
+      }) {};
+    spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "spacemacs-theme";
+        version = "20160118.708";
+        src = fetchFromGitHub {
+          owner = "nashamri";
+          repo = "spacemacs-theme";
+          rev = "afbb2c89ab574e9851da2fff7aa7d992f59f5780";
+          sha256 = "10q9n4iygp7r7rnp15jh2rq4d38v38xsmmbg6isykampwcxpwfq4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spacemacs-theme";
+          sha256 = "0riiim6qb6x9g5hz0k3qgdymgikynlb9l07mrbfmybkv4919p992";
+          name = "spacemacs-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/spacemacs-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    spaces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "spaces";
+        version = "20130610.249";
+        src = fetchFromGitHub {
+          owner = "chumpage";
+          repo = "chumpy-windows";
+          rev = "164be41b588b615864258c502583100d3ccfe13e";
+          sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spaces";
+          sha256 = "152x7fzjnjjdk9d9h0hbixdp3haqn5vdx3bq1nfqfrkvzychyr06";
+          name = "spaces";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/spaces";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sparkline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sparkline";
+        version = "20150101.719";
+        src = fetchFromGitHub {
+          owner = "woudshoo";
+          repo = "sparkline";
+          rev = "a2b5d817d272d6363b67ed8f8cc75499a19fa8d2";
+          sha256 = "1fqd3ycywxxmln2kzqwflc69xmqlvi9gwvmf7frn0rfv73w09cvp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sparkline";
+          sha256 = "081jzaxjb32nydvr1kmyafxqxi610n0yf8lwz9vldm84famf3g7y";
+          name = "sparkline";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/sparkline";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sparql-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sparql-mode";
+        version = "20151104.1114";
+        src = fetchFromGitHub {
+          owner = "ljos";
+          repo = "sparql-mode";
+          rev = "303858e7f91829ec720141482c777460e66f310b";
+          sha256 = "1gk2ps7fn9z8n6r923qzn518gz9mrj7mb6j726cz8qb585ndjbij";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sparql-mode";
+          sha256 = "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d";
+          name = "sparql-mode";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/sparql-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    speck = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "speck";
+        version = "20140901.1335";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/speck.el";
+          sha256 = "1i2z57aasljia6xd2xn1mryklc2gc9c2q1fad8wn7982sl277d10";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/speck";
+          sha256 = "19h3syk4kjmcy7jy9nlsbq6gyxwl4xsi84dy66a3cpvmknm25kyg";
+          name = "speck";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/speck";
+          license = lib.licenses.free;
+        };
+      }) {};
+    speech-tagger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "speech-tagger";
+        version = "20160103.1712";
+        src = fetchFromGitHub {
+          owner = "cosmicexplorer";
+          repo = "speech-tagger";
+          rev = "994f61753f78cd2b2139f6e5eef9254f28fb9bed";
+          sha256 = "05qx3wqsqs9lxv5lgpaw1wsd6qb5hh599ggi3c17ig5663q7pjsd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/speech-tagger";
+          sha256 = "0sqil949ny9qjxq7kpb4zmjd7770r0qvq4sz80agw6a27mqnaajc";
+          name = "speech-tagger";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/speech-tagger";
+          license = lib.licenses.free;
+        };
+      }) {};
+    speechd-el = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "speechd-el";
+        version = "20141025.1112";
+        src = fetchgit {
+          url = "git://git.freebsoft.org/git/speechd-el";
+          rev = "3d729817296b2ed8ad414a6aa044a8aa762259eb";
+          sha256 = "2c1bff3e5a182b8150c6ba6c3be7e70ab2b733cac0a758521c0b941dff215c32";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/speechd-el";
+          sha256 = "07g6jwymmwkx26p3as3r370viz1cqq360cagw9ji6i0hvgrr66a0";
+          name = "speechd-el";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/speechd-el";
+          license = lib.licenses.free;
+        };
+      }) {};
+    speed-type = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "speed-type";
+        version = "20150120.2234";
+        src = fetchFromGitHub {
+          owner = "hagleitn";
+          repo = "speed-type";
+          rev = "d3a6745dbaaf6b1eacee10ce9b50108482dbe758";
+          sha256 = "102hjyr9ii2rmq8762irbwansbi023s7dg4a8n6lkadcvzfibmag";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/speed-type";
+          sha256 = "14q423an7v5hhfx1x039fizxcn5hcscqf2jfn9rqifg4jpq8bq5g";
+          name = "speed-type";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/speed-type";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sphinx-doc = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "sphinx-doc";
+        version = "20160116.517";
+        src = fetchFromGitHub {
+          owner = "naiquevin";
+          repo = "sphinx-doc.el";
+          rev = "f39da2e6cae55d5d7c7ce887e69755b7529bcd67";
+          sha256 = "1wif9wf8hwxk0q09cdnrmyas7zjg8l5b8jd6sjxd40ypn6dmz2ch";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sphinx-doc";
+          sha256 = "00h3wx2p5hzbw6sggggdrzv4jrn1wc051iqql5y2m1hsh772ic5z";
+          name = "sphinx-doc";
+        };
+        packageRequires = [ cl-lib dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/sphinx-doc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sphinx-frontend = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sphinx-frontend";
+        version = "20151122.412";
+        src = fetchFromGitHub {
+          owner = "kostafey";
+          repo = "sphinx-frontend";
+          rev = "a46e81ce65fd24c03acab9311b162cad21343744";
+          sha256 = "1mfp4777ppg7zg7zqj755zpfk9lmcq73hxv055ig66pz30m7x5rw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sphinx-frontend";
+          sha256 = "0hdn6zjnhzyka0lzdxqfzbj3lrj767ij406zha9zw8ibbkk7cmag";
+          name = "sphinx-frontend";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sphinx-frontend";
+          license = lib.licenses.free;
+        };
+      }) {};
+    splitjoin = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "splitjoin";
+        version = "20150505.932";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-splitjoin";
+          rev = "e2945ee269e6e90f0243d6f2a33e067bb0a2873c";
+          sha256 = "1qdy9nc2h7mwxh7zg2p1x7yg96hxkwxqimjp6zb1119jx0s8grjc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/splitjoin";
+          sha256 = "0l1x98fvvia8qx8g125h4d76slv0xnb3h1zxiq9xb5qh7a1h069l";
+          name = "splitjoin";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/splitjoin";
+          license = lib.licenses.free;
+        };
+      }) {};
+    splitter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "splitter";
+        version = "20130705.250";
+        src = fetchFromGitHub {
+          owner = "chumpage";
+          repo = "chumpy-windows";
+          rev = "164be41b588b615864258c502583100d3ccfe13e";
+          sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/splitter";
+          sha256 = "02vdhvipzwnh6mlj25lirzxkc0shfzqfs1p4gn3smkxqx6g7mdb2";
+          name = "splitter";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/splitter";
+          license = lib.licenses.free;
+        };
+      }) {};
+    spotify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "spotify";
+        version = "20150108.1003";
+        src = fetchFromGitHub {
+          owner = "remvee";
+          repo = "spotify-el";
+          rev = "07a44ecdbdaa93977e97f2a2e5d280ef0b2e8545";
+          sha256 = "05y8xv6zapspwr5bii41lgirslas22wsbm0kgb4dm79qbk9j1kzw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spotify";
+          sha256 = "0pmsvxi1dsi580wkhhx8iw329agkh5yzk61bqvxzign3cd6fbq6k";
+          name = "spotify";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/spotify";
+          license = lib.licenses.free;
+        };
+      }) {};
+    spotlight = callPackage ({ counsel, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
+    melpaBuild {
+        pname = "spotlight";
+        version = "20150929.255";
+        src = fetchFromGitHub {
+          owner = "benmaughan";
+          repo = "spotlight.el";
+          rev = "ab902900f22e7d1ea2dd8169441d2da7155aaa68";
+          sha256 = "05knlca2dvpyqp9lw8dc47fl5kh2jb04q57cygkzfjjkzvywdwq8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spotlight";
+          sha256 = "0mmr1spr21pi8sfy95dsgqcxn8qfsphdkfjm5w5q97lh7496z65p";
+          name = "spotlight";
+        };
+        packageRequires = [ counsel emacs swiper ];
+        meta = {
+          homepage = "http://melpa.org/#/spotlight";
+          license = lib.licenses.free;
+        };
+      }) {};
+    spray = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "spray";
+        version = "20150626.145";
+        src = fetchFromGitHub {
+          owner = "ian-kelling";
+          repo = "spray";
+          rev = "11623f45955a18115459a2c18dc95bc967980a53";
+          sha256 = "0fvywcwn0zd06yy4b6cxpasiwfbps17jz9dy3jr0y0mdx5lzfxa9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spray";
+          sha256 = "11b3wn53309ws60w8sfpfxij7vnibj6kxxsx6w1agglqx9zqngz4";
+          name = "spray";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/spray";
+          license = lib.licenses.free;
+        };
+      }) {};
+    springboard = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "springboard";
+        version = "20150505.1211";
+        src = fetchFromGitHub {
+          owner = "jwiegley";
+          repo = "springboard";
+          rev = "d12119d9dd2b0b64f0af0ba82c273326c8c12268";
+          sha256 = "14py5amh66jzhqyqjz5pxq0g19vzlmqnrr5wij1ix64xwfr3xdy8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/springboard";
+          sha256 = "17rmsidsbb4p08vr07mfn25m17wnpadcwr4nxvp79glp5a0wyyib";
+          name = "springboard";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/springboard";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sprintly-mode = callPackage ({ fetchFromGitHub, fetchurl, furl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sprintly-mode";
+        version = "20121006.34";
+        src = fetchFromGitHub {
+          owner = "sprintly";
+          repo = "sprintly-mode";
+          rev = "6695892bae5860b5268bf3ae62be990ee9b63c11";
+          sha256 = "06rk07h92s5sljprs41y3q31q64cprx9kgs56c2j6v4c8cmsq5h6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sprintly-mode";
+          sha256 = "15i3rrv27ccpn12wwj9raaxpj7nlnrrj3lsp8vdfwph6ydvnfza4";
+          name = "sprintly-mode";
+        };
+        packageRequires = [ furl ];
+        meta = {
+          homepage = "http://melpa.org/#/sprintly-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sproto-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sproto-mode";
+        version = "20151115.1205";
+        src = fetchFromGitHub {
+          owner = "m2q1n9";
+          repo = "sproto-mode";
+          rev = "0583a88273204dccd884b7edaa3590cefd31e7f7";
+          sha256 = "11igl9n2zwwar1xg651g5v0r0w6xl0grm8xns9wg80351ijrci7x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sproto-mode";
+          sha256 = "19l6si3sx2i542r5lyr9axby9hblx76m77f17vnsjf32n3r0qgma";
+          name = "sproto-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sproto-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sql-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sql-indent";
+        version = "20150424.1916";
+        src = fetchFromGitHub {
+          owner = "bsvingen";
+          repo = "sql-indent";
+          rev = "f85bc91535b64b5d538e5aec2ce4c5e2312ec862";
+          sha256 = "17nbcaqx58fq4rz501xcqqcjhmibdlkaavmmzwcfwra7jv8hqljy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sql-indent";
+          sha256 = "13s38zdd9j127p6jxbcj4d4va8mkri5dx5zh39g465mnlzx7fp8g";
+          name = "sql-indent";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sql-indent";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sqlite = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sqlite";
+        version = "20150417.15";
+        src = fetchFromGitHub {
+          owner = "cnngimenez";
+          repo = "sqlite.el";
+          rev = "9a7fb5836a19bc0ea8b4c5a50177112524380986";
+          sha256 = "0zlrx8sk7gwwr6a23mc22d7iinwf8p9ff16r9krqp86fyzbhnq1d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sqlite";
+          sha256 = "1j23rqgq00as90nk6csi489ida6b83h1myl3icxivj2iw1iikgj1";
+          name = "sqlite";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sqlite";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sqlplus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "sqlplus";
+        version = "20141009.939";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/sqlplus.el";
+          sha256 = "0xixdddcrzx6k0s8w9rp6q7b9qjpdb4l888gmcis42yvawb1i53d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sqlplus";
+          sha256 = "1z9pf36b1581flykis9cjv7pynnp94fm4ijzjy6hvqyj81aikxpz";
+          name = "sqlplus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sqlplus";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sqlup-mode";
+        version = "20151121.830";
+        src = fetchFromGitHub {
+          owner = "trevoke";
+          repo = "sqlup-mode.el";
+          rev = "9cb9662673b7bed891582cfc1080d91a254048f7";
+          sha256 = "0p2g4ss3bf2asxcibrd8l70ll04nm47znr99l5xyzzwhyfzi61w4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sqlup-mode";
+          sha256 = "06a0v2qagpd9p2bh19bfw14a6if8kjjc4yyhm5nwp8a8d2vnl5l7";
+          name = "sqlup-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sqlup-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sr-speedbar = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "sr-speedbar";
+        version = "20150804.1151";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/sr-speedbar.el";
+          sha256 = "1ffnm2kfh8cg5rdhrkqmh4krggbxvqg3s6lc1nssv88av1c5cs3i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sr-speedbar";
+          sha256 = "1zq3ysz1vpc98sz2kpq307v1fp1l4ivwgrfh2kdqkkdjm4fkya23";
+          name = "sr-speedbar";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sr-speedbar";
+          license = lib.licenses.free;
+        };
+      }) {};
+    srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "srefactor";
+        version = "20151202.2204";
+        src = fetchFromGitHub {
+          owner = "tuhdo";
+          repo = "semantic-refactor";
+          rev = "e0482b08425894431fa67109615d4f0c971471c8";
+          sha256 = "1n5p51iy79z60fnhxklc03pp0jbs5rgyb02z3wndbyzy73bhfh7b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/srefactor";
+          sha256 = "01cd40jm4h00c5q2ix7cskp7klbkcd3n5763y5lqfv59bjxwdqd2";
+          name = "srefactor";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/srefactor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ssh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ssh";
+        version = "20120904.1542";
+        src = fetchFromGitHub {
+          owner = "ieure";
+          repo = "ssh-el";
+          rev = "c17cf5b43df8ac4662a0580f85898e1f078df0d1";
+          sha256 = "1rdhdkwdhb727rj53xyxk6i00sjr58a48hfig14m12niy1k739vd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ssh";
+          sha256 = "1jywn8wlqzc2mfylp0kbpzxv3kwzak3vxdbjabiawqv1m4bfpk5g";
+          name = "ssh";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ssh";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ssh-agency = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ssh-agency";
+        version = "20160101.1635";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "ssh-agency";
+          rev = "f8042250174fb72dd935b3e65820580e3232a6fd";
+          sha256 = "0076g1yb8xvn6s8gz5jxiz8mn448fmab574yizgakbxaxd91s1dj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ssh-agency";
+          sha256 = "0lci3fhl2p9mwilvq1njzy13dkq5cp5ighymf3zs4gzm3w0ih3h8";
+          name = "ssh-agency";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ssh-agency";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ssh-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ssh-config-mode";
+        version = "20141219.1046";
+        src = fetchFromGitHub {
+          owner = "jhgorrell";
+          repo = "ssh-config-mode-el";
+          rev = "3d194c772d428144acd84c85be560ca96fb323ba";
+          sha256 = "1v6srqiqq5xsjiw4d3kfgp218dks8mm6f9i88ngjri6sb3slpfb6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ssh-config-mode";
+          sha256 = "0aihyig6q3pmk9ld519f4n3kychrg3l7r29ijd2dpvs0530md4wb";
+          name = "ssh-config-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ssh-config-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ssh-tunnels = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ssh-tunnels";
+        version = "20141219.518";
+        src = fetchFromGitHub {
+          owner = "death";
+          repo = "ssh-tunnels";
+          rev = "b08ba7a560ba5b16aa95c3cc17ed6fea59529cc4";
+          sha256 = "10a5havjg4yjshpfzkhgjdwbrvl44narg09ddzynczmyzm4f01wh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ssh-tunnels";
+          sha256 = "0zlf22wg9adkhycsasv6bfim2h0cknsvihyi1q2l2l4pjdp9ypqj";
+          name = "ssh-tunnels";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ssh-tunnels";
+          license = lib.licenses.free;
+        };
+      }) {};
+    stack-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, flycheck, haskell-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "stack-mode";
+        version = "20150923.1023";
+        src = fetchFromGitHub {
+          owner = "commercialhaskell";
+          repo = "stack-ide";
+          rev = "f3481e239dde9817152ec00e32bfc3ebf5aaf2cb";
+          sha256 = "1f2dxlc3dsf9ay417h1l43fxjkrb0a4gg96zd3asx9v2alpzgcim";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stack-mode";
+          sha256 = "0s0m2lj40php7bc2i3fy9ikd5rmx4v7zbxfkp9vadmlc5s7w25gf";
+          name = "stack-mode";
+        };
+        packageRequires = [ cl-lib flycheck haskell-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/stack-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    stan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "stan-mode";
+        version = "20160117.47";
+        src = fetchFromGitHub {
+          owner = "stan-dev";
+          repo = "stan-mode";
+          rev = "f490f907bde35062e43872fba3eda97ea78de0e2";
+          sha256 = "0nkrpx1rmzg48mi5871mgdizasv80vpald513ycx4nshyln0ymv2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stan-mode";
+          sha256 = "17ph5khwwrcpyl96xnp3rsbmnk7mpwmgskxka3cfgkm190qihfqy";
+          name = "stan-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/stan-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    stan-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, stan-mode, yasnippet }:
+    melpaBuild {
+        pname = "stan-snippets";
+        version = "20160117.47";
+        src = fetchFromGitHub {
+          owner = "stan-dev";
+          repo = "stan-mode";
+          rev = "f490f907bde35062e43872fba3eda97ea78de0e2";
+          sha256 = "0nkrpx1rmzg48mi5871mgdizasv80vpald513ycx4nshyln0ymv2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stan-snippets";
+          sha256 = "021skkvak645483s7haz1hsz98q3zd8hqi9k5zdzaqlabwdjwh85";
+          name = "stan-snippets";
+        };
+        packageRequires = [ stan-mode yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/stan-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    standoff-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "standoff-mode";
+        version = "20150628.1842";
+        src = fetchFromGitHub {
+          owner = "lueck";
+          repo = "standoff-mode";
+          rev = "09b4b2dfeadf0b9c2f3e2897be5e9b728c07b9b6";
+          sha256 = "1fn97aw91g02hgz5c9dvnxh4zdd9wrdhs44s0gnj570za1m4cbiv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/standoff-mode";
+          sha256 = "127bzpm1cz103f1pb860yqrh7mr0rdaivrm9p6ssd01kchl9nskp";
+          name = "standoff-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/standoff-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    start-menu = callPackage ({ cl-lib ? null, config-parser, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "start-menu";
+        version = "20160115.2339";
+        src = fetchFromGitHub {
+          owner = "lujun9972";
+          repo = "el-start-menu";
+          rev = "259ec3e5f8564bd03edc12a0f539b294ad1d841f";
+          sha256 = "1v3rzy842mfzm850vs273ssr4hg00q1wz2rpky8lk3wbbw2qq3f0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/start-menu";
+          sha256 = "1k1lc9i9vcl2am9afq0ksrxwsy6kppl4i0v10h0w2fq5z374rdkv";
+          name = "start-menu";
+        };
+        packageRequires = [ cl-lib config-parser ];
+        meta = {
+          homepage = "http://melpa.org/#/start-menu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    stash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "stash";
+        version = "20151117.827";
+        src = fetchFromGitHub {
+          owner = "vermiculus";
+          repo = "stash.el";
+          rev = "c2e494d20c752b80ebbdffbf66687b3cdfc425ad";
+          sha256 = "0cl2y72iagmv87kg72a46a3kap2xigwnrbk2hjgvsbxv2ng5f9cr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stash";
+          sha256 = "116k40ispv7sq3jskwc1lvmhmk3jjz4j967r732s07f5h11vk1z9";
+          name = "stash";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/stash";
+          license = lib.licenses.free;
+        };
+      }) {};
+    state = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "state";
+        version = "20160108.736";
+        src = fetchFromGitHub {
+          owner = "thisirs";
+          repo = "state";
+          rev = "bd74ed144cebae926f54cbaf18600b24dd1a9aaf";
+          sha256 = "1b17v4xghmki0g9yr5855891mlcrrbkr68xc3qyals5xw0dhb3xb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/state";
+          sha256 = "19y3n8wnbpgbpz4jxy2p7hjqxykg09arjp7s5v22yz7il3gn48l2";
+          name = "state";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/state";
+          license = lib.licenses.free;
+        };
+      }) {};
+    status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "status";
+        version = "20151230.808";
+        src = fetchFromGitHub {
+          owner = "tromey";
+          repo = "emacs-status";
+          rev = "b62c74bf272566f82a68622f29fb9edafea0f241";
+          sha256 = "0jpxmzfvg4k5q3h3gn6lrg891wjzlcps2kkij1jbdjk4jkgq386i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/status";
+          sha256 = "0a9lqa7a5nki5711bjrmx214kah5ndqpwh3i240gdd08mcm07ps3";
+          name = "status";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/status";
+          license = lib.licenses.free;
+        };
+      }) {};
+    stekene-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "stekene-theme";
+        version = "20141108.1411";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "stekene-theme";
+          rev = "45b643a5af7dac70997d6a60e69c2f2473337d98";
+          sha256 = "0w1qb8r6nrxi5hbf8l4247yqq754zfbxz64pqqcnw43cxk0qd4j3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stekene-theme";
+          sha256 = "0v1kwlnrqaygzaz376a5njg9kv4yf5l35k87xga4wdd2mxfwrmf1";
+          name = "stekene-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/stekene-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    stem = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "stem";
+        version = "20131102.609";
+        src = fetchFromGitHub {
+          owner = "yuutayamada";
+          repo = "stem";
+          rev = "d74e6611d6ba5025e0276a2cc7c8a90f46bfa9ac";
+          sha256 = "1xc4v8a35c2vpfhza15j4f89x7vyg9bbgm7xnprij7814k8iy7p0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stem";
+          sha256 = "1625nbi2bmb7vzjz0s7y1cy7dp8lp83dayiib3nr2bfkv76fwkcq";
+          name = "stem";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/stem";
+          license = lib.licenses.free;
+        };
+      }) {};
+    stgit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "stgit";
+        version = "20140213.548";
+        src = fetchgit {
+          url = "git://repo.or.cz/stgit.git";
+          rev = "e4e04764009f749665636c4d11e0cafd9c4971e1";
+          sha256 = "c5d424f34ca33d2c19e3888a9dc249d0398203e5199bf2b4bdd9e604390b500b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stgit";
+          sha256 = "102s9lllrcxsqs0lgbrcljwq1l3s8ri4276wck6rcypck5zgzj89";
+          name = "stgit";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/stgit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sticky = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "sticky";
+        version = "20101129.2052";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/sticky.el";
+          sha256 = "18izyia1j3w2c07qhkp9h6rnvw35m5k1brrrjhm51fpdv2xj65fy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sticky";
+          sha256 = "1xjkdwphq3m4jrazsfnzrrcrqikfdxzph3jdzkpbzk3grd4af96w";
+          name = "sticky";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sticky";
+          license = lib.licenses.free;
+        };
+      }) {};
+    stickyfunc-enhance = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "stickyfunc-enhance";
+        version = "20150429.1314";
+        src = fetchFromGitHub {
+          owner = "tuhdo";
+          repo = "semantic-stickyfunc-enhance";
+          rev = "13bdba51fcd83ccbc3267959d23afc94d458dcb0";
+          sha256 = "16dxjsr5nj20blww4xpd4jzgjprzzh1nwvb810ggdmp9paf4iy0g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stickyfunc-enhance";
+          sha256 = "13dh19c3bljs83l847syqlg07g33hz6sapg6j4s4xv4skix8zfks";
+          name = "stickyfunc-enhance";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/stickyfunc-enhance";
+          license = lib.licenses.free;
+        };
+      }) {};
+    stock-ticker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request, s }:
+    melpaBuild {
+        pname = "stock-ticker";
+        version = "20150204.452";
+        src = fetchFromGitHub {
+          owner = "hagleitn";
+          repo = "stock-ticker";
+          rev = "f2e564142c9de84232839a5b01979cf95b04d6a9";
+          sha256 = "191sg32z1iagyxmbn49i1lpfihld9g9741cw2kj830s4vag4kinx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stock-ticker";
+          sha256 = "1slcjk2avybr4v9s7gglizmaxbb3yqg6s6gdbg12m3vvj3b72lfi";
+          name = "stock-ticker";
+        };
+        packageRequires = [ request s ];
+        meta = {
+          homepage = "http://melpa.org/#/stock-ticker";
+          license = lib.licenses.free;
+        };
+      }) {};
+    strie = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "strie";
+        version = "20140109.812";
+        src = fetchFromGitHub {
+          owner = "hackscience";
+          repo = "strie.el";
+          rev = "066e72c39ed51162d7d7892c7451a6cac28581b7";
+          sha256 = "1xgsdr75p52vg34s1gm16ffkr3s7gdsln56xjxpdirnwr78glbmw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/strie";
+          sha256 = "0i1bgjlwcc2ks8hzjkyrw924q4k8pcz8335z9935m73js0sq0lxl";
+          name = "strie";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/strie";
+          license = lib.licenses.free;
+        };
+      }) {};
+    string-edit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "string-edit";
+        version = "20151213.1130";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "string-edit.el";
+          rev = "c380e20ca169bd4e7117a99edd5711e673168cbe";
+          sha256 = "0nx303bdi8mq18isgf79y8f1cjhqnxv3g3ynm09llrg73qr7r4zw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/string-edit";
+          sha256 = "1l1hqsfyi6pp4x4g1rk4s7x9zjc03wfmhy16izia8nkjhzz88fi8";
+          name = "string-edit";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/string-edit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    string-inflection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "string-inflection";
+        version = "20150805.456";
+        src = fetchFromGitHub {
+          owner = "akicho8";
+          repo = "string-inflection";
+          rev = "147990de9d07d8e603ade92a23ef27a71e52b850";
+          sha256 = "06qs8v2pai3pyg0spmarssmrq06xg9q60wjj46s5xxichlw9pgcf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/string-inflection";
+          sha256 = "1vrjcg1fa5adw16s4v9dq0fid0gfazxk15z9cawz0kmnpyzz3fg2";
+          name = "string-inflection";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/string-inflection";
+          license = lib.licenses.free;
+        };
+      }) {};
+    string-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild }:
+    melpaBuild {
+        pname = "string-utils";
+        version = "20140508.1541";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "string-utils";
+          rev = "c2232d691617973ecf12a970c6008a161c21da14";
+          sha256 = "1frdspm1qgksa8cpx5gkj50xk9mgz8202pgp11lqir6l3yjcj3wq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/string-utils";
+          sha256 = "1vsvxc06fd3wardldb83i5hjfibvmiqnxvcgdns7i5i8qlsrsx4v";
+          name = "string-utils";
+        };
+        packageRequires = [ list-utils ];
+        meta = {
+          homepage = "http://melpa.org/#/string-utils";
+          license = lib.licenses.free;
+        };
+      }) {};
+    strings = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "strings";
+        version = "20151231.1807";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/strings.el";
+          sha256 = "1sa6wd2z2qkcnjprkkm9b945qz8d0l702sv9w15wl0lngbhw84na";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/strings";
+          sha256 = "0n3239y7biq3rlg74m7nqimhf654w4snnw2zm7z84isgwzz2dphk";
+          name = "strings";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/strings";
+          license = lib.licenses.free;
+        };
+      }) {};
+    stripe-buffer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "stripe-buffer";
+        version = "20141208.908";
+        src = fetchFromGitHub {
+          owner = "sabof";
+          repo = "stripe-buffer";
+          rev = "c252080f55cb78c951b19ebab9687f6d00237baf";
+          sha256 = "0dxajh72wdcwdb9ydbcm19fmp0p1drmh1niq4r69jnbn8sah0zax";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stripe-buffer";
+          sha256 = "02wkb9y6vykrn6a5nfnimaplj7ig8i8h6m2rvwv08f5ilbccj16a";
+          name = "stripe-buffer";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/stripe-buffer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    stumpwm-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "stumpwm-mode";
+        version = "20140130.2016";
+        src = fetchgit {
+          url = "git://git.savannah.nongnu.org/stumpwm.git";
+          rev = "61a7cf27e49e0779a53c018b2342f5f1c5cc70b4";
+          sha256 = "3547616b9e5694fd09014bbbf29458ee0dea828428b6bf7a6231670aacfb8271";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stumpwm-mode";
+          sha256 = "0a77mh7h7033adfbwg2fbx84789962par43q31s9msjlqw15gs86";
+          name = "stumpwm-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/stumpwm-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    stupid-indent-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "stupid-indent-mode";
+        version = "20130816.1554";
+        src = fetchgit {
+          url = "https://gist.github.com/5487564.git";
+          rev = "e26ff5a2c4a582c6c1940bbcd204cfeed8e65222";
+          sha256 = "242b90e4c403fbcadd40777cd98899c96aab78b84dea88dfa97583b734c9876b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stupid-indent-mode";
+          sha256 = "12y8qxxs04qzy09m734qg0857g4612qdswx2bh9jk7dp886fpd7p";
+          name = "stupid-indent-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/stupid-indent-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    stylus-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sws-mode }:
+    melpaBuild {
+        pname = "stylus-mode";
+        version = "20150313.1012";
+        src = fetchFromGitHub {
+          owner = "brianc";
+          repo = "jade-mode";
+          rev = "0d0bbf60730d0e33c6362e1fceeaf0e133b1ceeb";
+          sha256 = "1q6wpjb7vhsy92li6fag34pwyil4zvcchbvfjml612aaykiys506";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stylus-mode";
+          sha256 = "152k74q6qn2xa38v2zyd5y7ya5n26nvai5v7z5fmq7jrcndp27r5";
+          name = "stylus-mode";
+        };
+        packageRequires = [ sws-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/stylus-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    subatomic-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "subatomic-theme";
+        version = "20150704.1009";
+        src = fetchFromGitHub {
+          owner = "cryon";
+          repo = "subatomic";
+          rev = "2543881f9bbb8520f845b7fe8f370793c36f7df2";
+          sha256 = "1njfwjyrh9m00jyy65zl31gxa66941mvvrk7nn5yizsbdadrbq0z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/subatomic-theme";
+          sha256 = "0mqas67qms492n3hn74c5nrkjpsgf9b42lp02s2dh366c075dpqc";
+          name = "subatomic-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/subatomic-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    subatomic256-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "subatomic256-theme";
+        version = "20130620.2110";
+        src = fetchFromGitHub {
+          owner = "d11wtq";
+          repo = "subatomic256";
+          rev = "326177d6f99cd2b1d30df695e67ee3bc441cd96f";
+          sha256 = "1w7mimyqc25phlww20l49wlafnxp6c7dwibvphg3vwl61g0llpq8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/subatomic256-theme";
+          sha256 = "1whjlkpkkirpnvvjryhlpzwphr1syz5zfyg4pb66i0db03hxwwcy";
+          name = "subatomic256-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/subatomic256-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    subemacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "subemacs";
+        version = "20160105.559";
+        src = fetchFromGitHub {
+          owner = "kbauer";
+          repo = "subemacs";
+          rev = "d693919991de6b93f0797daae2a12285e54ae27e";
+          sha256 = "10pirwc7g9vii5cyk4vg6m5g5hlap0yg9w4qy257744c67jmaxvg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/subemacs";
+          sha256 = "0sqh80jhh3v37l5af7w6k9lqvj39bd91pn6a9rwdlfk389hp90zm";
+          name = "subemacs";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/subemacs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sublime-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sublime-themes";
+        version = "20160111.322";
+        src = fetchFromGitHub {
+          owner = "owainlewis";
+          repo = "emacs-color-themes";
+          rev = "2b37d0def434871a2c0d3476f5b7eeeed9bb90b2";
+          sha256 = "0lhbmcpzpxlqvw4mgh79v9y2f0xqjd1m36dbxcvhb67rwq6nrw3r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sublime-themes";
+          sha256 = "1nahcfcy831c7w3c69i2na0r8jsdgprffgfdvh4c41cnk4rkgdqj";
+          name = "sublime-themes";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sublime-themes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sublimity = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sublimity";
+        version = "20151230.927";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "sublimity";
+          rev = "ee9c9fbb92b8fc0c191e5e8640477e251b602bf9";
+          sha256 = "1kpq7kpmhgq3vjd62rr4qsc824qcyjxm50m49r7invgnmgd78h4x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sublimity";
+          sha256 = "1xwggaalad65cxcfvmy30f141bxhpzc3fgvwziwbzi8fygbdv4nw";
+          name = "sublimity";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sublimity";
+          license = lib.licenses.free;
+        };
+      }) {};
+    subr-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "subr-plus";
+        version = "20151231.1807";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/subr+.el";
+          sha256 = "1xxf8kgxzcwwjm96isj4zg31vw63ahivr6xch5dw8wsvk0mjks9y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/subr+";
+          sha256 = "1vrv64768f7rk58mqr4pq1fjyi5n5kfqk90hzrwbvblkkrmilmfs";
+          name = "subr-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/subr+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    subshell-proc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "subshell-proc";
+        version = "20130122.1522";
+        src = fetchFromGitHub {
+          owner = "andrewmains12";
+          repo = "subshell-proc";
+          rev = "d18b20e03fc89ee08e8c6a968aba31a16b53287f";
+          sha256 = "09izm28jrzfaj469v6yd1xgjgvy6pmxarcy0rzn2ihn3c0z7mdg4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/subshell-proc";
+          sha256 = "1fnp49yhnhsj7paj0b25vr6r03hr5kpgcrci439ffpbd2c85fkw2";
+          name = "subshell-proc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/subshell-proc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sudden-death = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sudden-death";
+        version = "20140829.738";
+        src = fetchFromGitHub {
+          owner = "yewton";
+          repo = "sudden-death.el";
+          rev = "beba6b4fb42b1e27575d3f722d23a0eb19666736";
+          sha256 = "1007xz4x1wgvxilv1qwf0a4y7hd7sqnnzwk2bdr12kfk7vq9cw2b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sudden-death";
+          sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh";
+          name = "sudden-death";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sudden-death";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sudo-ext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "sudo-ext";
+        version = "20130130.1551";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/sudo-ext.el";
+          sha256 = "0fpz73r52j7sk1w7my0002wg7isrp54w28nnrwk9xb9il4qpxag2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sudo-ext";
+          sha256 = "1iirrpa4rnz7rm85yjg60vdfca1ipxbk3qkld8lgwwm242pvvkw3";
+          name = "sudo-ext";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sudo-ext";
+          license = lib.licenses.free;
+        };
+      }) {};
+    summarye = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "summarye";
+        version = "20130328.527";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/summarye.el";
+          sha256 = "0q5m8d6p9aqbfx17zgznkqw2jgh027xix4894wrdz91670zxd3py";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/summarye";
+          sha256 = "1znd96ixg1n90yjiny84igb7m8qsbiibn7s6bky8g6n2k7zzmq65";
+          name = "summarye";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/summarye";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sunny-day-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sunny-day-theme";
+        version = "20140413.1625";
+        src = fetchFromGitHub {
+          owner = "mswift42";
+          repo = "sunny-day-theme";
+          rev = "420e0a6eb33fcc9b75c2c9e88ab60a975d782a00";
+          sha256 = "0mhyhkjjwszwl5wzkys9pgvgx9sps9r46k1s1hpzzf4s3vi015mc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sunny-day-theme";
+          sha256 = "1wsfnmmbzzyggzip66vr38yyzy27blxp91wx97bafj7jpg5cyhzw";
+          name = "sunny-day-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sunny-day-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sunshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sunshine";
+        version = "20151013.814";
+        src = fetchFromGitHub {
+          owner = "aaronbieber";
+          repo = "sunshine.el";
+          rev = "8783923f0aa4b835b90359443b941b10758c28d7";
+          sha256 = "1x3ivhwyapxw7v3ygam3bn2i9djrsp9mcd5zdn8q84c583ppanll";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sunshine";
+          sha256 = "1lxiqw7k8cpq0v6p5whgxgzqrbx3sd9174r0d4qlkrpn6rcp44vv";
+          name = "sunshine";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/sunshine";
+          license = lib.licenses.free;
+        };
+      }) {};
+    suomalainen-kalenteri = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "suomalainen-kalenteri";
+        version = "20151129.504";
+        src = fetchFromGitHub {
+          owner = "tlikonen";
+          repo = "suomalainen-kalenteri";
+          rev = "b7991cb35624ebc04a89bbe759d40f186c9c097e";
+          sha256 = "1b637p2cyc8a83qv9vba4yamzhk08f62zykqh5p35jwvym8wkann";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/suomalainen-kalenteri";
+          sha256 = "1wzijbgcr3jc47ccr7nrdkqha16s6gw0xiccnmdczi48cvnvvlkh";
+          name = "suomalainen-kalenteri";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/suomalainen-kalenteri";
+          license = lib.licenses.free;
+        };
+      }) {};
+    super-save = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "super-save";
+        version = "20160114.652";
+        src = fetchFromGitHub {
+          owner = "bbatsov";
+          repo = "super-save";
+          rev = "f3a126a22e2e8c7bc33cd59326c61a172cfffe78";
+          sha256 = "02wgdhb3ap6zp7jw0nf5c0dy8f363r5w00nq4p3h8q40492khgyk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/super-save";
+          sha256 = "0ikfw7n2rvm3xcgnj1si92ly8w75x26071ki551ims7a8sawh52p";
+          name = "super-save";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/super-save";
+          license = lib.licenses.free;
+        };
+      }) {};
+    supergenpass = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "supergenpass";
+        version = "20130329.48";
+        src = fetchFromGitHub {
+          owner = "ober";
+          repo = "sgpass";
+          rev = "549072ef7b5b82913cadd4758e8a0a9926f0a04a";
+          sha256 = "0m02snzka243adhwwgriml133n4312lhdia3wdqjcq8y2mlp3331";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/supergenpass";
+          sha256 = "0ldy6j6l6rf72w0hl195rdnrabml2a5k91200s186k0r5aja4b95";
+          name = "supergenpass";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/supergenpass";
+          license = lib.licenses.free;
+        };
+      }) {};
+    svg-mode-line-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xmlgen }:
+    melpaBuild {
+        pname = "svg-mode-line-themes";
+        version = "20150425.1506";
+        src = fetchFromGitHub {
+          owner = "sabof";
+          repo = "svg-mode-line-themes";
+          rev = "80a0e01839cafbd66899202e7764c33231974259";
+          sha256 = "14h40s0arc2i898r9yysn256z6l8jkrnmqvrdg7p7658c0klz5ic";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/svg-mode-line-themes";
+          sha256 = "12lnszcb9bl32n9wir7vf8xiyyv7njw4xg21aj9x4dasmidyx506";
+          name = "svg-mode-line-themes";
+        };
+        packageRequires = [ xmlgen ];
+        meta = {
+          homepage = "http://melpa.org/#/svg-mode-line-themes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    swap-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "swap-buffers";
+        version = "20150506.1639";
+        src = fetchFromGitHub {
+          owner = "ekazakov";
+          repo = "swap-buffers";
+          rev = "46ab31359b70d935add6c6e9533443116dc51103";
+          sha256 = "1kn70570r6x0h1xfs1vr8as27pjfanyhml140yms60gdjb4ssf9r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swap-buffers";
+          sha256 = "0ih5dhnqy3c9nlfz9m2zwy4q4jaam09ykbdqhsxx2hnwjk7p35bw";
+          name = "swap-buffers";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/swap-buffers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    swbuff-x = callPackage ({ fetchurl, lib, melpaBuild, swbuff }: melpaBuild {
+        pname = "swbuff-x";
+        version = "20130607.514";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/swbuff-x.el";
+          sha256 = "1fkicyjvanh8yk2y27sq075sarcyqhsdz0r4xhillpnv34ji98r5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swbuff-x";
+          sha256 = "1wglcxgfr839lynwsl8i7fm70sxxjidy3ib6ibz0kgiwr41rh49y";
+          name = "swbuff-x";
+        };
+        packageRequires = [ swbuff ];
+        meta = {
+          homepage = "http://melpa.org/#/swbuff-x";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sweetgreen = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "sweetgreen";
+        version = "20151207.1116";
+        src = fetchFromGitHub {
+          owner = "CestDiego";
+          repo = "sweetgreen.el";
+          rev = "a456dd7948a25da8ff007a142cf1325b4855d908";
+          sha256 = "10blwlwg1ry9jznf1a6iss5s0z8sj9gc02ayf5qv92mgxvjhrhdn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sweetgreen";
+          sha256 = "1v75wk0gq5fkz8i1r8pl4gqnxbv1d80isyn48w2hxj2fmdn2xhpy";
+          name = "sweetgreen";
+        };
+        packageRequires = [ cl-lib dash helm request ];
+        meta = {
+          homepage = "http://melpa.org/#/sweetgreen";
+          license = lib.licenses.free;
+        };
+      }) {};
+    swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "swift-mode";
+        version = "20151018.120";
+        src = fetchFromGitHub {
+          owner = "chrisbarrett";
+          repo = "swift-mode";
+          rev = "a5e1acf5826ccd489617f9255da0aab7e5e920ee";
+          sha256 = "03pxizbw02bp9mp0b0vwiys4vncna73ymmbbmxpw9m6mn1ql2fjv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swift-mode";
+          sha256 = "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d";
+          name = "swift-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/swift-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "swiper";
+        version = "20160118.710";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "swiper";
+          rev = "bcb81dde6e1abba02256d716426797a3e1b306f1";
+          sha256 = "0r1i6ck37yq92h7hc9pm6kqlh0751j8jj7vqrligghxk9d42r479";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swiper";
+          sha256 = "13lld7kjz1n1ryxvrfsy0iym5l9m9ybrf7bpcmkzsalpp15j3mvm";
+          name = "swiper";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/swiper";
+          license = lib.licenses.free;
+        };
+      }) {};
+    swiper-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, swiper }:
+    melpaBuild {
+        pname = "swiper-helm";
+        version = "20151116.530";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "swiper-helm";
+          rev = "57012ab626486fcb3dfba0ee6720b0625e489b8c";
+          sha256 = "1fr9vs0574g93mq88d25nmj93hrx4d4s2d0im6wk156k2yb8ha2b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swiper-helm";
+          sha256 = "011ln6vny7z5vw67cpzldxf5n6sk2hjdkllyf7v6sf4m62ws93ph";
+          name = "swiper-helm";
+        };
+        packageRequires = [ emacs helm swiper ];
+        meta = {
+          homepage = "http://melpa.org/#/swiper-helm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    switch-window = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "switch-window";
+        version = "20150114.415";
+        src = fetchFromGitHub {
+          owner = "dimitri";
+          repo = "switch-window";
+          rev = "cd4b06121aa5bac4c4b13b63526a99008def5f2b";
+          sha256 = "1zpfilcaycj0l2q3zyvpjbwp5j3d9rrkacd5swzlr1n1klvbji48";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/switch-window";
+          sha256 = "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2";
+          name = "switch-window";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/switch-window";
+          license = lib.licenses.free;
+        };
+      }) {};
+    swoop = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, pcre2el }:
+    melpaBuild {
+        pname = "swoop";
+        version = "20140605.1610";
+        src = fetchFromGitHub {
+          owner = "ShingoFukuyama";
+          repo = "emacs-swoop";
+          rev = "80a5df8edb86efd9885073b3ec6f475d8b969adf";
+          sha256 = "0qp078q9jrfm0k8sjq6qglfilwgqy1n0bbhyjk3hrf7rjxlkfkx7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swoop";
+          sha256 = "0r265rwfbl1iyclnspxpbzf2w1q0w8dnc0wv5mz5g6hhcrr0iv6g";
+          name = "swoop";
+        };
+        packageRequires = [ async emacs ht pcre2el ];
+        meta = {
+          homepage = "http://melpa.org/#/swoop";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sws-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sws-mode";
+        version = "20150317.1445";
+        src = fetchFromGitHub {
+          owner = "brianc";
+          repo = "jade-mode";
+          rev = "0d0bbf60730d0e33c6362e1fceeaf0e133b1ceeb";
+          sha256 = "1q6wpjb7vhsy92li6fag34pwyil4zvcchbvfjml612aaykiys506";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sws-mode";
+          sha256 = "0b12dsad0piih1qygjj0n7rni0pl8cizbzwqm9h1dr8imy53ak4i";
+          name = "sws-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sws-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }:
+    melpaBuild {
+        pname = "sx";
+        version = "20160106.1852";
+        src = fetchFromGitHub {
+          owner = "vermiculus";
+          repo = "sx.el";
+          rev = "e850df66ef6d98d6a8733a6e096a8c83c9ad0e3c";
+          sha256 = "1g94lh59sdhsa4xw2cjydzysa6crf81qs6mkdjqv9p9c1dlimya5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sx";
+          sha256 = "1ml1rkhhk3hkd16ij2zwng591rxs2yppsfq9gwd4ppk02if4v517";
+          name = "sx";
+        };
+        packageRequires = [ cl-lib emacs json let-alist markdown-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/sx";
+          license = lib.licenses.free;
+        };
+      }) {};
+    symon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "symon";
+        version = "20151118.300";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "symon";
+          rev = "48dfbd86981e709ebcf055832bb48a7f212ac842";
+          sha256 = "1mb068vgf0bbj0bdxjhd6c794bwc3wp7r6q1s49w8b24g1pfrjkq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/symon";
+          sha256 = "11llnvngyc3xz8nd6nj86ism0hhs8p54wkscvs4yycbakbyn61lz";
+          name = "symon";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/symon";
+          license = lib.licenses.free;
+        };
+      }) {};
+    symon-lingr = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, symon }:
+    melpaBuild {
+        pname = "symon-lingr";
+        version = "20150719.842";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "symon-lingr";
+          rev = "056d1a473e36992ff5881e5ce6fdc331cead975f";
+          sha256 = "030bglxnvrkf1f9grbhd8n11j4c6sxpabpjdr1ryx522v01fvx8j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/symon-lingr";
+          sha256 = "0kyhmw25cn10b4jv2yx7bvp8zkwcswiidpk4amyaisw25820gkv1";
+          name = "symon-lingr";
+        };
+        packageRequires = [ cl-lib symon ];
+        meta = {
+          homepage = "http://melpa.org/#/symon-lingr";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sync-recentf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sync-recentf";
+        version = "20151005.526";
+        src = fetchFromGitHub {
+          owner = "ffevotte";
+          repo = "sync-recentf";
+          rev = "530254b1f1b569ce958dadad2620c67c31835d5c";
+          sha256 = "00lx6081h1nzwga5jg4cik4h667vfkn128yvnhkd0vw7b5g4ji5x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sync-recentf";
+          sha256 = "17aji2vcw6zfd823anzwj8pcgyxamxr87bnni085jvlz0vx6gh9c";
+          name = "sync-recentf";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sync-recentf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    synonymous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "synonymous";
+        version = "20150909.1034";
+        src = fetchFromGitHub {
+          owner = "toroidal-code";
+          repo = "synonymous.el";
+          rev = "9abd08c57f4a35902cd6b3eb5aad8dbb352141f4";
+          sha256 = "02xnfkmpvjicckmp9is42fnavy9pd95s99zmf1wylxdji2hhpjxw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/synonymous";
+          sha256 = "0vawa9qwvv6z1i7vzhkjdl1l9r1yham48yn5y8w8g1xyhxxp6rs5";
+          name = "synonymous";
+        };
+        packageRequires = [ cl-lib emacs request ];
+        meta = {
+          homepage = "http://melpa.org/#/synonymous";
+          license = lib.licenses.free;
+        };
+      }) {};
+    synonyms = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "synonyms";
+        version = "20151231.1808";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/synonyms.el";
+          sha256 = "01l7z6l9pdxzvh851pbq2fn62r28gzwldibffb69jkdln47bph50";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/synonyms";
+          sha256 = "0rnq97jpr047gpkxhw22jj3gw09r45vn6fwkzxnxjzcmsyk492d0";
+          name = "synonyms";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/synonyms";
+          license = lib.licenses.free;
+        };
+      }) {};
+    synosaurus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "synosaurus";
+        version = "20151119.1249";
+        src = fetchFromGitHub {
+          owner = "rootzlevel";
+          repo = "synosaurus";
+          rev = "9be71a2df0c19ddb5e0cb8cba29ded5368a0fcae";
+          sha256 = "1zz9rnwaclr95fpjyabv5rlhk36n2k8f1lzz6yqh964hv8i9562s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/synosaurus";
+          sha256 = "16i2ag4l824h1kq4cy01zf01zrms4v6ldwlsixwfyb1mh97lqljg";
+          name = "synosaurus";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/synosaurus";
+          license = lib.licenses.free;
+        };
+      }) {};
+    syntactic-sugar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "syntactic-sugar";
+        version = "20140508.1541";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "syntactic-sugar";
+          rev = "7ddc4502c831abe1c4ad4c7d1ca628a2c9e13968";
+          sha256 = "0zi11540wwcl93xcgd2yf6b72zv01zkaqbf1jfbksg82k9038m2d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/syntactic-sugar";
+          sha256 = "12b2vpvz5h4wzxrk8jrbgc8v0w6bzzvxcyfs083fi1791qq1rw7r";
+          name = "syntactic-sugar";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/syntactic-sugar";
+          license = lib.licenses.free;
+        };
+      }) {};
+    syntax-subword = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "syntax-subword";
+        version = "20150415.1426";
+        src = fetchhg {
+          url = "https://bitbucket.com/jpkotta/syntax-subword";
+          rev = "a1e0accb754d";
+          sha256 = "1p9bp09nibw7rra3r6nj496zdx09db6k82dxnxs1lfgdiswfdq2h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/syntax-subword";
+          sha256 = "1as89ffqz2h69fdwybgs5wibnrvskm7hd58vagfjkla9pjlpffpm";
+          name = "syntax-subword";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/syntax-subword";
+          license = lib.licenses.free;
+        };
+      }) {};
+    syslog-mode = callPackage ({ fetchFromGitHub, fetchurl, hide-lines, lib, melpaBuild }:
+    melpaBuild {
+        pname = "syslog-mode";
+        version = "20140217.1818";
+        src = fetchFromGitHub {
+          owner = "vapniks";
+          repo = "syslog-mode";
+          rev = "c18661b3058f0ec00e6957c955559a762cb0062c";
+          sha256 = "1sxpda380c9wnnf5d72lrcqm6dkihf48cgsjcckzf706cc00ksf4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/syslog-mode";
+          sha256 = "15kh2v8jsw04vyh2lmh1ndpxli3cwp6yq66hl8mwb1i3g429az19";
+          name = "syslog-mode";
+        };
+        packageRequires = [ hide-lines ];
+        meta = {
+          homepage = "http://melpa.org/#/syslog-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    system-specific-settings = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "system-specific-settings";
+        version = "20140818.957";
+        src = fetchFromGitHub {
+          owner = "DarwinAwardWinner";
+          repo = "emacs-system-specific-settings";
+          rev = "0050d85b2175095aa5ecf580a2fe43c069b0eef3";
+          sha256 = "1hixilnnybv2v3p1wpn7a0ybwah17grawszs3jycsjgzahpgckv7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/system-specific-settings";
+          sha256 = "1ydmxi8aw2lf78wv4m39yswbqkmcadqg0wmzg9s8b5h9bxxwvppp";
+          name = "system-specific-settings";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/system-specific-settings";
+          license = lib.licenses.free;
+        };
+      }) {};
+    systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "systemd";
+        version = "20160101.134";
+        src = fetchFromGitHub {
+          owner = "holomorph";
+          repo = "systemd-mode";
+          rev = "dbf78305d435888ef251795c65e702b424e9956b";
+          sha256 = "1z7zi0wcms55x0ar9jv02g7gbzsn4k887aigpgv4xghbdiyp7lp0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/systemd";
+          sha256 = "1biais0cmidy3d0hf2ifdlr6qv1z8k8c8bczi07bsfk4md3idbir";
+          name = "systemd";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/systemd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    systemtap-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "systemtap-mode";
+        version = "20151122.1340";
+        src = fetchFromGitHub {
+          owner = "ruediger";
+          repo = "systemtap-mode";
+          rev = "1a968c2b1f3a054bebf91ac49739d3a81ce050a9";
+          sha256 = "0343ss3y9i40y3i9rr7p7bb4k9dj950zyvdv44q1abw2xrfd2xwd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/systemtap-mode";
+          sha256 = "1l2jx6mvph0q2pdlhq7p4vwfw72rfl8k1rwi504bbkr5n5xwhhhz";
+          name = "systemtap-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/systemtap-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ta = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ta";
+        version = "20150604.1224";
+        src = fetchFromGitHub {
+          owner = "kuanyui";
+          repo = "ta.el";
+          rev = "0d946b15a88239982ec66eaa8a55ad53d85e7c3f";
+          sha256 = "054l3imxk9ivq361cr15q1wym07mw3s8xzjkzqlihrfvadsq37ym";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ta";
+          sha256 = "0kn2k4n0xfwsrniaqb36v3rxj2pf2sai3bmjksbn1g2kf5g156ll";
+          name = "ta";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ta";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tab-group = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tab-group";
+        version = "20140306.850";
+        src = fetchFromGitHub {
+          owner = "tarao";
+          repo = "tab-group-el";
+          rev = "5a290ec2608e4100fb188fd60ecb77affcc3465b";
+          sha256 = "0lfvgbgvsm61kv5mcjnhnfjcnr7fy1015y0hndkf9xvdlw4hahr4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tab-group";
+          sha256 = "1i5lxpf3wmqnqj9mzgcn4gp1gjxp737awrzl1dml5wnarbbj4fs9";
+          name = "tab-group";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tab-group";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tab-jump-out = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tab-jump-out";
+        version = "20151005.2030";
+        src = fetchFromGitHub {
+          owner = "cheunghy";
+          repo = "tab-jump-out";
+          rev = "1c3fec1826d2891177ea78e4e7cce1dc67e83e51";
+          sha256 = "0h7sfbca1nzcjylwl7zp25yj6wxnlx8g8a50zc6sg6jg4rggi2fm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tab-jump-out";
+          sha256 = "0nlbyzym8l8g9w2xvykpcl5r449v30gal2k1dnz74rq4y8w4rh7n";
+          name = "tab-jump-out";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/tab-jump-out";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tabbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tabbar";
+        version = "20141109.343";
+        src = fetchFromGitHub {
+          owner = "dholm";
+          repo = "tabbar";
+          rev = "ad4c9c20cf9090a5ebf77a5150f2bf98bdb4bded";
+          sha256 = "0n23nnig1lgjamrzsa91p2aplh7gpj2vkp951i9fpf49c6xpyj3x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tabbar";
+          sha256 = "1y376nz1xmchwns4fz8dixbb7hbqh4mln78zvsh7y32il98wzvx9";
+          name = "tabbar";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tabbar";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tabbar-ruler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, tabbar }:
+    melpaBuild {
+        pname = "tabbar-ruler";
+        version = "20160115.1123";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "tabbar-ruler.el";
+          rev = "dcb480c77632f28b0c6eabfe703911935c44a974";
+          sha256 = "06igfnwih98kp36whw1gb25grj5hkmh4h08dzxg1q1j9wjildb6d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tabbar-ruler";
+          sha256 = "10dwjj6r74g9rzdd650wa1wxhqc0q6dmff4j0qbbhmjsxvsr3y0d";
+          name = "tabbar-ruler";
+        };
+        packageRequires = [ powerline tabbar ];
+        meta = {
+          homepage = "http://melpa.org/#/tabbar-ruler";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tablist = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tablist";
+        version = "20150619.18";
+        src = fetchFromGitHub {
+          owner = "politza";
+          repo = "tablist";
+          rev = "ef38312867bc0268b1584dd890b1c420bb77ec11";
+          sha256 = "0gy9hxm7bca0l1hfy2pzn86avpifrz3bs8xzpicj4kxw5wi4ygns";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tablist";
+          sha256 = "0c10g86xjhzpmc2sqjmzcmi393qskyw6d9bydqzjk3ffjzklm45p";
+          name = "tablist";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/tablist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tabula-rasa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tabula-rasa";
+        version = "20141215.2347";
+        src = fetchFromGitHub {
+          owner = "idomagal";
+          repo = "tabula-rasa";
+          rev = "e85fff9de18dc31bc6a7aca726e34a95cc5459f5";
+          sha256 = "1dbjfq9a7a5s9c18nrp4kcda64jkg5cp8na31kxw0hjcn98dgqa8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tabula-rasa";
+          sha256 = "186lph964swg7rs5gvby3p1d0znq9x3xzsmirfb3cdbazvz6hhxi";
+          name = "tabula-rasa";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/tabula-rasa";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tagedit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "tagedit";
+        version = "20150727.424";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "tagedit";
+          rev = "458ff5bb23aa4816a2d5ff5d66c4e95996b4a4e1";
+          sha256 = "00hjc6ax4659ww6vygpzzsb3zzr2ddz2z33mkp5j6hmj2s4g2viy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tagedit";
+          sha256 = "0vfkbrxmrw4fwdz324s734zxdxm2nj3df6i8m6lgb9pizqyp2g6z";
+          name = "tagedit";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/tagedit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    take-off = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, web-server }:
+    melpaBuild {
+        pname = "take-off";
+        version = "20140531.417";
+        src = fetchFromGitHub {
+          owner = "tburette";
+          repo = "take-off";
+          rev = "aa9ea45566fc74febbb6ee9c409ecc4b59246215";
+          sha256 = "13zwlb5805cpv0pbr7fj5b4crlg7lb0ibslvcpszm0cz6rlifcvf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/take-off";
+          sha256 = "05vlajmirbp62rpbdwa2bimpzyl9xc331gg0lhn2rkivc0hma2ar";
+          name = "take-off";
+        };
+        packageRequires = [ emacs web-server ];
+        meta = {
+          homepage = "http://melpa.org/#/take-off";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tango-2-theme = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tango-2-theme";
+        version = "20120312.1525";
+        src = fetchgit {
+          url = "https://gist.github.com/2024464.git";
+          rev = "64e44c98e41ebbe3b827d54280e3b9615787daaa";
+          sha256 = "7342a670559cd296dba4b676607641a05d6203255951b17473ccdda4e35713d3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tango-2-theme";
+          sha256 = "1a9qmz99h99gpd0sxqb71c08wr8pm3bzsg3p4cvf3vcirvav9lq6";
+          name = "tango-2-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tango-2-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tango-plus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tango-plus-theme";
+        version = "20140425.1711";
+        src = fetchFromGitHub {
+          owner = "tmalsburg";
+          repo = "tango-plus-theme";
+          rev = "99c3484eeb4e6f7f62a6dacfd665a4d46f4cbdaf";
+          sha256 = "1gfn1yyyb9p2fi17wra1yf2j96cfjw0sifgk3c0vl63h3vmiyvjf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tango-plus-theme";
+          sha256 = "1bx9qcwvybgd0rg8a9rag8xvb5ljrwfnm5nvq793ncvbdvq6vrh5";
+          name = "tango-plus-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tango-plus-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tangotango-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tangotango-theme";
+        version = "20150702.304";
+        src = fetchFromGitHub {
+          owner = "juba";
+          repo = "color-theme-tangotango";
+          rev = "92a94756080577c0446b2fc7f06d43d7b76b2005";
+          sha256 = "00v2y2gfb44kmzfdbp6f4nmxlwn8gf6y3hvgqzggmlbqb5m8hg8d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tangotango-theme";
+          sha256 = "05cnvyqmh5h5mqys7qs7d9knzxzmi2x0j1avp77x5l5njzzv59s2";
+          name = "tangotango-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tangotango-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tao-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tao-theme";
+        version = "20151217.1040";
+        src = fetchFromGitHub {
+          owner = "11111000000";
+          repo = "tao-theme-emacs";
+          rev = "48a69f5568b2d16496960aa92b312cd02be80ecc";
+          sha256 = "1zhr6vrzf511mxrj4fkc9k8wfr1hixn733f5g28j4qzykr4zl2mh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tao-theme";
+          sha256 = "0gl6zzk5ha6vl2xxf5fcnv1k42cw4axdjdcirr1c4r8jwdq3nl3a";
+          name = "tao-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tao-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tbx2org = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "tbx2org";
+        version = "20140224.959";
+        src = fetchFromGitHub {
+          owner = "istib";
+          repo = "tbx2org";
+          rev = "08e9816ba6066f56936050b58d07ceb2187ae6f7";
+          sha256 = "1jp80qywcphql1ngd4fr24lqdfwrw0bw6q9hgq5vmzgjwfxwxwd4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tbx2org";
+          sha256 = "1yvkw65la4w12c4w6l9ai73lzng170wv4b8gry99m2bakw3wr8m8";
+          name = "tbx2org";
+        };
+        packageRequires = [ cl-lib dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/tbx2org";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tc";
+        version = "20150113.2126";
+        src = fetchFromGitHub {
+          owner = "kozo2";
+          repo = "tc";
+          rev = "6aa9d27c475be8d009adf9cd417f2cdf348a91e8";
+          sha256 = "1xpkrlfqb0np9zyxk41f3pxfkw98ii4q0xh8whq4llv5bmfxynzk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tc";
+          sha256 = "13qdnfslnik4f97lz9bxayyhgcp1knh5gaqy00ps863j3vpzjb9s";
+          name = "tc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tco = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tco";
+        version = "20140412.812";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "tco.el";
+          rev = "d2224bd291e25724b06d8589d4d62d74ed32db24";
+          sha256 = "1krway6iw62dlr4ak3kj9llqh48xjf3d84nlincap7gkrw886l4q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tco";
+          sha256 = "0hfrzwjlgynk3mydrpmic9mckak37r22fdglrfas6zdihgrg152f";
+          name = "tco";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/tco";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tdd-status-mode-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tdd-status-mode-line";
+        version = "20131123.1116";
+        src = fetchFromGitHub {
+          owner = "algernon";
+          repo = "tdd-status-mode-line";
+          rev = "4c082e62f4915b573338a97efcc6854d132323dc";
+          sha256 = "1jyz6z5bk1gvmknphcnvjvbl329zm8m40yl0a1hfaj8fvhwyzdw5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tdd-status-mode-line";
+          sha256 = "0z1q1aw14xq72nfx7mmvz7pr2x4960l45z02jva35zxzvb1mvsgq";
+          name = "tdd-status-mode-line";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tdd-status-mode-line";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tea-time = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tea-time";
+        version = "20120331.320";
+        src = fetchFromGitHub {
+          owner = "krick";
+          repo = "tea-time";
+          rev = "1f6cf0bdd27c5eb3508989c5095427781f858eca";
+          sha256 = "0b4cwkwkc4i8lc4j30xc9d6xskm3gqrc2dij60ya75h92aj0lj40";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tea-time";
+          sha256 = "18fsbh78c5408zg5bk44gxdynp6kn8253xdg7ap2pr3mjknq9kld";
+          name = "tea-time";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tea-time";
+          license = lib.licenses.free;
+        };
+      }) {};
+    telepathy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "telepathy";
+        version = "20131209.658";
+        src = fetchFromGitHub {
+          owner = "NicolasPetton";
+          repo = "telepathy.el";
+          rev = "211d785b02a29ddc254422fdcc3db45262582f8c";
+          sha256 = "16kr1p4lzi1ysd5r2dh0mxk60zsm5fvwa9345nfyrgdic340yscc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/telepathy";
+          sha256 = "0c3d6vk7d6vqzjndlym2kk7d2zm0b15ac4142ir03p6f19rqq9pr";
+          name = "telepathy";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/telepathy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    telephone-line = callPackage ({ cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
+    melpaBuild {
+        pname = "telephone-line";
+        version = "20151116.642";
+        src = fetchFromGitHub {
+          owner = "dbordak";
+          repo = "telephone-line";
+          rev = "0715ee7d156086098b375f3d93de2f50e76f3d75";
+          sha256 = "0mg870s60by22ripxhqrgxjx16506n4llj9nnxlqgr4mdsi77cf5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/telephone-line";
+          sha256 = "0dyh9h1yk9y0217b6rxsm7m372n910vpfgw5w23lkkrwa8x8qpx3";
+          name = "telephone-line";
+        };
+        packageRequires = [ cl-lib eieio emacs s seq ];
+        meta = {
+          homepage = "http://melpa.org/#/telephone-line";
+          license = lib.licenses.free;
+        };
+      }) {};
+    term-alert = callPackage ({ alert, fetchFromGitHub, fetchurl, lib, melpaBuild, term-cmd }:
+    melpaBuild {
+        pname = "term-alert";
+        version = "20141121.1405";
+        src = fetchFromGitHub {
+          owner = "CallumCameron";
+          repo = "term-alert";
+          rev = "46cc46dba6957a7081a360692e58b9bffb2cfa86";
+          sha256 = "0sa3chk16s830lqhcd8d3bwdfmjg239ywb7jm6lhwshydssh34nk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term-alert";
+          sha256 = "0x4rc1y311ivaj6mlks1j8sgzrrwqn8vx171vw7s1kgf1qzk826n";
+          name = "term-alert";
+        };
+        packageRequires = [ alert term-cmd ];
+        meta = {
+          homepage = "http://melpa.org/#/term-alert";
+          license = lib.licenses.free;
+        };
+      }) {};
+    term-cmd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "term-cmd";
+        version = "20141114.1514";
+        src = fetchFromGitHub {
+          owner = "CallumCameron";
+          repo = "term-cmd";
+          rev = "fc2ae638409af99c4788563ef54847636f2e23e0";
+          sha256 = "11xk11i99d17x5bl7glrwj2dhvl3f54slipj034dbf07dd5b2jih";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term-cmd";
+          sha256 = "0fn4f32zpl0p2lid159q59lzjv4xqmc23a64kcclqp9db8b1m5fy";
+          name = "term-cmd";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/term-cmd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    term-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "term-plus";
+        version = "20130612.852";
+        src = fetchFromGitHub {
+          owner = "tarao";
+          repo = "term-plus-el";
+          rev = "090807985673755720c5533b2fc684f88a3554ad";
+          sha256 = "1ayr34smxf94c09ssdwl4hyhzgahsmbj7j4h25cdm6wcwii2br86";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term+";
+          sha256 = "12lvfspqmyrapmbz3x997vf160927d325y50kxdx3s6p81r7n2n8";
+          name = "term-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/term+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    term-plus-key-intercept = callPackage ({ fetchFromGitHub, fetchurl, key-intercept, lib, melpaBuild, term-plus }:
+    melpaBuild {
+        pname = "term-plus-key-intercept";
+        version = "20140211.150";
+        src = fetchFromGitHub {
+          owner = "tarao";
+          repo = "term-plus-ki-el";
+          rev = "fd0771fd66b8c7a909aaac972194485c79ba48c4";
+          sha256 = "1dql2w8xkdw52zlrc2p9x391zn8wv4dj8a6293p4s08if7gg260w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term+key-intercept";
+          sha256 = "1564a86950xdwsrwinrs118bjsfmbv8gicq0c2dfr827v5b6zrlb";
+          name = "term-plus-key-intercept";
+        };
+        packageRequires = [ key-intercept term-plus ];
+        meta = {
+          homepage = "http://melpa.org/#/term+key-intercept";
+          license = lib.licenses.free;
+        };
+      }) {};
+    term-plus-mux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, tab-group, term-plus }:
+    melpaBuild {
+        pname = "term-plus-mux";
+        version = "20140211.149";
+        src = fetchFromGitHub {
+          owner = "tarao";
+          repo = "term-plus-mux-el";
+          rev = "81b60e80cf008472bfd7fad9233af2ef722c208a";
+          sha256 = "12gfvcf7hl29xhg231cx76q04ll7cvfpvhkb0qs3qn1sqb50fs2q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term+mux";
+          sha256 = "129kzjpi5nzagqkjfikx9i7k6489dy7d3pd7ggn59p4cnh3r2rhh";
+          name = "term-plus-mux";
+        };
+        packageRequires = [ tab-group term-plus ];
+        meta = {
+          homepage = "http://melpa.org/#/term+mux";
+          license = lib.licenses.free;
+        };
+      }) {};
+    term-run = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "term-run";
+        version = "20151228.305";
+        src = fetchFromGitHub {
+          owner = "10sr";
+          repo = "term-run-el";
+          rev = "54650dbbabb13cb2a6c0670ff6b24b29717a6a8b";
+          sha256 = "149pl3zxg5kriydk5h6j95jyly6i23w4w4g4a99s4zi6ljiny6c6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term-run";
+          sha256 = "1bx3s68rgr9slsw9k01gfg7sxd4z7sarg4pi2ivril7108mhg2cs";
+          name = "term-run";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/term-run";
+          license = lib.licenses.free;
+        };
+      }) {};
+    termbright-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "termbright-theme";
+        version = "20151030.2135";
+        src = fetchFromGitHub {
+          owner = "bmastenbrook";
+          repo = "termbright-theme-el";
+          rev = "bec6ab14336c0611e85f45486276004f16d20607";
+          sha256 = "0gfsqpza8phvma5y3ck0n6p197x1i33w39m3c7jmja4ml121n73d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/termbright-theme";
+          sha256 = "14q88qdbnyzxr8sr8i5glj674sb4150b9y6nag0dqrxs629is6xj";
+          name = "termbright-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/termbright-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tern";
+        version = "20151228.711";
+        src = fetchFromGitHub {
+          owner = "marijnh";
+          repo = "tern";
+          rev = "ddb2438867524e422a0baa807cb89cd7403b5622";
+          sha256 = "0w2hnb3yhrzywl9wjz228i4jwj1nn9xfa0b19sc79jwpz7m37rdv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tern";
+          sha256 = "06bgwizn9dcd8hsvimjvb28j0mpxg7rrv9knhv5kkdapa6gggxif";
+          name = "tern";
+        };
+        packageRequires = [ cl-lib emacs json ];
+        meta = {
+          homepage = "http://melpa.org/#/tern";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tern-auto-complete = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }:
+    melpaBuild {
+        pname = "tern-auto-complete";
+        version = "20151123.853";
+        src = fetchFromGitHub {
+          owner = "marijnh";
+          repo = "tern";
+          rev = "ddb2438867524e422a0baa807cb89cd7403b5622";
+          sha256 = "0w2hnb3yhrzywl9wjz228i4jwj1nn9xfa0b19sc79jwpz7m37rdv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tern-auto-complete";
+          sha256 = "0lq924c5f6bhlgyqqzc346n381qf0fp66h50a0zqz2ch66kanni1";
+          name = "tern-auto-complete";
+        };
+        packageRequires = [ auto-complete cl-lib emacs tern ];
+        meta = {
+          homepage = "http://melpa.org/#/tern-auto-complete";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tern-django = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }:
+    melpaBuild {
+        pname = "tern-django";
+        version = "20150121.1327";
+        src = fetchFromGitHub {
+          owner = "proofit404";
+          repo = "tern-django";
+          rev = "455326a1732daa58d4d963b0b11bb1a9fd2f2b86";
+          sha256 = "1yb416py93sxnkfnfnbwrlfg68gkp97wpfsrdpc83sai888p44wc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tern-django";
+          sha256 = "1pjaaffadaw8h2n7yv01ks19gw59dmh8bp8vw51hx1082r3yfvv0";
+          name = "tern-django";
+        };
+        packageRequires = [ emacs f tern ];
+        meta = {
+          homepage = "http://melpa.org/#/tern-django";
+          license = lib.licenses.free;
+        };
+      }) {};
+    terraform-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, hcl-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "terraform-mode";
+        version = "20151226.657";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-terraform-mode";
+          rev = "6157690efce03ff20b16b85e2be6b0964efec2fb";
+          sha256 = "0mz2yl9jaw7chzv9d9hhv7gcvdwwvi676y9wpn7vp85hxpda7xg7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/terraform-mode";
+          sha256 = "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn";
+          name = "terraform-mode";
+        };
+        packageRequires = [ cl-lib hcl-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/terraform-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    test-case-mode = callPackage ({ fetchFromGitHub, fetchurl, fringe-helper, lib, melpaBuild }:
+    melpaBuild {
+        pname = "test-case-mode";
+        version = "20130525.934";
+        src = fetchFromGitHub {
+          owner = "ieure";
+          repo = "test-case-mode";
+          rev = "6074df10ebc97ddfcc228c71c73db179e672dac3";
+          sha256 = "1r3fmb8cshgh9pppdvydfcrzlmb9cgz4m04rgv69c5xv8clwcmbr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/test-case-mode";
+          sha256 = "1iba97yvbi5vr7gvc58gq2ah6jg2s7apc9ssq7mdzki823n8z2qi";
+          name = "test-case-mode";
+        };
+        packageRequires = [ fringe-helper ];
+        meta = {
+          homepage = "http://melpa.org/#/test-case-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    test-kitchen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "test-kitchen";
+        version = "20151027.627";
+        src = fetchFromGitHub {
+          owner = "jjasghar";
+          repo = "test-kitchen-el";
+          rev = "3f3647bf437563493331821638f5f5829ae7dd26";
+          sha256 = "125k13sqgxk963c04zn49jidvzx0hl0s4vvc9jpffgq8aq0mnnmr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/test-kitchen";
+          sha256 = "1bl3yvj56dq147yplrcwphcxiwvmx5n97y4qpkm9imiv8cnjm1g0";
+          name = "test-kitchen";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/test-kitchen";
+          license = lib.licenses.free;
+        };
+      }) {};
+    test-simple = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "test-simple";
+        version = "20151110.2143";
+        src = fetchFromGitHub {
+          owner = "rocky";
+          repo = "emacs-test-simple";
+          rev = "95e58b52ff36ed7c0c50e84dcf5458cb71c380dc";
+          sha256 = "0h2g02r1spj8vbwgvjn3dddyj89j1qcqzdf2kdggvyyisssj81s3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/test-simple";
+          sha256 = "1l6y77fqd0l0mh2my23psi66v5ya6pbr2hgvcbsaqjnpmfm90w3g";
+          name = "test-simple";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/test-simple";
+          license = lib.licenses.free;
+        };
+      }) {};
+    textile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "textile-mode";
+        version = "20151203.253";
+        src = fetchFromGitHub {
+          owner = "juba";
+          repo = "textile-mode";
+          rev = "db33dc5f994c008ef9f1556801bf8ac62d451f31";
+          sha256 = "1qcd7vdg63q80zwz8ziaznllq1x7micmljm72s6sh3720rb5aiz2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/textile-mode";
+          sha256 = "0c1l7ml9b1zipk5fhmhirrh070h0qwwiagdk84i04yvdmmcjw2nf";
+          name = "textile-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/textile-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    textmate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "textmate";
+        version = "20110816.1646";
+        src = fetchFromGitHub {
+          owner = "defunkt";
+          repo = "textmate.el";
+          rev = "350918b070148f0ace6d9d3cd4ebcaf15c1a8781";
+          sha256 = "1b7xxz1i84azmbz8rqpxdn18avmnqlj87hfrpbngbf6pj5h9jqjh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/textmate";
+          sha256 = "119w944pwarpqzcr9vys17svy1rkfs9hiln8903q9ff4lnjkpf1v";
+          name = "textmate";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/textmate";
+          license = lib.licenses.free;
+        };
+      }) {};
+    textmate-to-yas = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "textmate-to-yas";
+        version = "20150914.746";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "textmate-to-yas.el";
+          rev = "74cbf0877ab6391f920d2d7a588e363423d61227";
+          sha256 = "1idhhfp0jhnykyms7dp3lfk6imddg6a315pfklbjpcys4y3fdz89";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/textmate-to-yas";
+          sha256 = "04agz4a41h0givfdw88qjd3c7pd418qyigsij4la5f37j5rh338l";
+          name = "textmate-to-yas";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/textmate-to-yas";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tfs = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "tfs";
+        version = "20120508.1320";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/tfs.el";
+          sha256 = "16byw8ix7bjh5ldr8rymisq2bhc5sh7db6rhpf0x28yd6mmzn73v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tfs";
+          sha256 = "10szb9mni37s2blvhl1spj96narmkrv8zhrryw9q1251z8laq5v0";
+          name = "tfs";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tfs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    theme-changer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "theme-changer";
+        version = "20130725.2119";
+        src = fetchFromGitHub {
+          owner = "hadronzoo";
+          repo = "theme-changer";
+          rev = "c28ea477e8277c03e14657f167695e3c4bf3c11f";
+          sha256 = "0njmn5dy773v9kmwclw1m79rh52xnxl8mswcaagni2z3dvlvw4m8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/theme-changer";
+          sha256 = "1qbmsghkl5gs728q0gaalc7p8q7nzv3l045jc0jdxxnb7na3gc5w";
+          name = "theme-changer";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/theme-changer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    theme-looper = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "theme-looper";
+        version = "20150723.1304";
+        src = fetchFromGitHub {
+          owner = "myTerminal";
+          repo = "theme-looper";
+          rev = "41c15ae98f9406b7932974318a2eada3668a88e7";
+          sha256 = "1kd4mazrcy5xamkvvrwsmcx63g0gp5w4264kxbk3d25bjqcf8rmj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/theme-looper";
+          sha256 = "02hz9k4ybpp4i8ik2av9rg240sjgicbf6w24zn67dmw4nc4lp9c5";
+          name = "theme-looper";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/theme-looper";
+          license = lib.licenses.free;
+        };
+      }) {};
+    therapy = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "therapy";
+        version = "20151113.1353";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "therapy";
+          rev = "775a92bb7b6b0fcc5b38c0b5198a9d0a1bef788a";
+          sha256 = "12kz4alyf3y2i7lkvi26hcxy55v0blsrxv5srx9fv5jhxkdz1vq1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/therapy";
+          sha256 = "0y040ghb0y6aq0nchqr09vapz6h6112rkwxkqsx0v7xmqrqfjvhh";
+          name = "therapy";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/therapy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    thesaurus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "thesaurus";
+        version = "20121125.1337";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/thesaurus.el";
+          sha256 = "0zcyasdzb7dvmld8418cy2mg8mpdx01bv44cm0sp5950scrypsaq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thesaurus";
+          sha256 = "1nyjk9jr1xvdkil13ylfsgg7q2sx71za05gi8m2v5f45pbmbi50h";
+          name = "thesaurus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/thesaurus";
+          license = lib.licenses.free;
+        };
+      }) {};
+    thing-cmds = callPackage ({ fetchurl, hide-comnt, lib, melpaBuild }:
+    melpaBuild {
+        pname = "thing-cmds";
+        version = "20151231.1809";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/thing-cmds.el";
+          sha256 = "1nclwxb63ffbc4wsga9ngkfcxsw88za0c4663fh9x64rl4db4hn8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thing-cmds";
+          sha256 = "133bm2cw9ar6m2amj0rrq4wbj9c3zl61gaprx0vlasxj2cyxs7yw";
+          name = "thing-cmds";
+        };
+        packageRequires = [ hide-comnt ];
+        meta = {
+          homepage = "http://melpa.org/#/thing-cmds";
+          license = lib.licenses.free;
+        };
+      }) {};
+    thingatpt-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "thingatpt-plus";
+        version = "20151231.1810";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/thingatpt+.el";
+          sha256 = "0ijz0mj095wycpc3as5fiikrwazljk0c04rh089ch0mzc95g3vqq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thingatpt+";
+          sha256 = "0w031lzjl5phvzsmbbxn2fpziwkmdyxsn08h6b9lxbss1prhx7aa";
+          name = "thingatpt-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/thingatpt+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    thingopt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "thingopt";
+        version = "20150315.723";
+        src = fetchFromGitHub {
+          owner = "m2ym";
+          repo = "thingopt-el";
+          rev = "6a50f23faa764c5f6200c0253c606b0b4e5226f8";
+          sha256 = "0imzrb3vqnm36illqnpfc6x7rbq9rrrlpcw9n2yzl4n309mqdwr6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thingopt";
+          sha256 = "0yvzq1z2nrldr8vhcvxqgzvh4gbrjjwfmprg59p4v5hlxvhxsb1y";
+          name = "thingopt";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/thingopt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    thread-dump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "thread-dump";
+        version = "20130323.1225";
+        src = fetchFromGitHub {
+          owner = "nd";
+          repo = "thread-dump.el";
+          rev = "1cee07775ac8c13bb52217be6c383562c617542b";
+          sha256 = "0rjcrvw9v2y10ahycra53bwbccpwqxxwn2c21wjj1kfs0kdwhs9p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thread-dump";
+          sha256 = "0dzr86jyf2j49gq40q6qd6lppa57n65n94xzpdjjbs182hxzavp2";
+          name = "thread-dump";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/thread-dump";
+          license = lib.licenses.free;
+        };
+      }) {};
+    thrift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "thrift";
+        version = "20140312.1548";
+        src = fetchFromGitHub {
+          owner = "apache";
+          repo = "thrift";
+          rev = "e917a278d836ad9cceba8ea5054346b22b3bbbb7";
+          sha256 = "0vp076m7lydl19rk7f7fa9lmlwn5dczc3g79y6pyxyhqsdr6sa3f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thrift";
+          sha256 = "0p1hxmm7gvhyigz8aylncgqbhk6cyf75rbcqis7x552g605mhiy9";
+          name = "thrift";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/thrift";
+          license = lib.licenses.free;
+        };
+      }) {};
+    thumb-frm = callPackage ({ fetchurl, frame-cmds, frame-fns, lib, melpaBuild }:
+    melpaBuild {
+        pname = "thumb-frm";
+        version = "20151231.1812";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/thumb-frm.el";
+          sha256 = "0nyp1sp55l3mlhlxw8kyp6hxan3rbgwc4fmfs174n6hlj3zr5vg8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thumb-frm";
+          sha256 = "1fjjd80drm8banni909lww9zqazr1kk9m40xwwa1ln2zicaf091c";
+          name = "thumb-frm";
+        };
+        packageRequires = [ frame-cmds frame-fns ];
+        meta = {
+          homepage = "http://melpa.org/#/thumb-frm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    thumb-through = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "thumb-through";
+        version = "20120118.2334";
+        src = fetchFromGitHub {
+          owner = "apgwoz";
+          repo = "thumb-through";
+          rev = "08d8fb720f93c6172653e035191a8fa9c3305e63";
+          sha256 = "0nypcryqwwsdawqxi7hgsv6fp28zqslj9phw7zscqqxzc3svaywn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thumb-through";
+          sha256 = "1krn7zn2y8p51m8dxai5nbrwbdviz6zrjzz0kykya9cqz4n9dhln";
+          name = "thumb-through";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/thumb-through";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tide = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
+    melpaBuild {
+        pname = "tide";
+        version = "20151201.245";
+        src = fetchFromGitHub {
+          owner = "ananthakumaran";
+          repo = "tide";
+          rev = "0c0f95b9e5abdbe60ccfcefc81f02178bfa940ab";
+          sha256 = "045c1fmmig88lc7c85vy8532mx0lhl666m5lrrv4i6r5n6sf68s3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tide";
+          sha256 = "1z2xr25s23sz6nrzzw2xg1l2j8jvjhxi53qh7nvxmmq6n6jjpwg1";
+          name = "tide";
+        };
+        packageRequires = [ dash emacs flycheck typescript-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/tide";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tidy = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "tidy";
+        version = "20111222.1156";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/tidy.el";
+          sha256 = "0psci55a3angwv45z9i8wz8jw634rxg1xawkrb57m878zcxxddwa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tidy";
+          sha256 = "09xb2k3k99hp3m725f31s6hlaxgl4fsaa1dylahxvdfddhbh290m";
+          name = "tidy";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tidy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    time-ext = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "time-ext";
+        version = "20130130.1551";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/time-ext.el";
+          sha256 = "0kxgzjwgd979aypjak07k8ss6hnm3x9f96z1rz2zsz2i3vvh6sqv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/time-ext";
+          sha256 = "15b3m1jvr7kg5sc4c8cp0aaiiyivfx8ip1zf7w5m702krv4lfvpk";
+          name = "time-ext";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/time-ext";
+          license = lib.licenses.free;
+        };
+      }) {};
+    timer-revert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "timer-revert";
+        version = "20150122.1432";
+        src = fetchFromGitHub {
+          owner = "yyr";
+          repo = "timer-revert";
+          rev = "615c91dec8b440d2b9b7c725dd733d7432564e45";
+          sha256 = "1hidvbd1xzz9m0fc55wac1mpv4dpcf8qnw1myh3646bfvivj9c2q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/timer-revert";
+          sha256 = "0lvm2irfx9rb5psm1lf53fv2jjx745n1c172xmyqip5xwgmf6msy";
+          name = "timer-revert";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/timer-revert";
+          license = lib.licenses.free;
+        };
+      }) {};
+    timesheet = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
+    melpaBuild {
+        pname = "timesheet";
+        version = "20151107.804";
+        src = fetchFromGitHub {
+          owner = "tmarble";
+          repo = "timesheet.el";
+          rev = "6aba2bac0be92b38c245135cebe5bf1f0d8406ab";
+          sha256 = "1ghvnmswq6rg17pjnys58mak6crfcvv1vb6q7spagq143y2ar24z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/timesheet";
+          sha256 = "1gy6bf4wqvp8cw2wjnrr9ijnzwav3p7j46m7qrn6l0517shwl506";
+          name = "timesheet";
+        };
+        packageRequires = [ auctex org s ];
+        meta = {
+          homepage = "http://melpa.org/#/timesheet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tinkerer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "tinkerer";
+        version = "20150220.49";
+        src = fetchFromGitHub {
+          owner = "yyr";
+          repo = "tinkerer.el";
+          rev = "1125780d1fba0330435fcbe943716032ed543a57";
+          sha256 = "0rf177kr0qfhg8g5xrpi405dhp2va1yk170zm3f8hghi2575ciy2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tinkerer";
+          sha256 = "0qh6pzjn98jlpxcm9zf25ga0y3d3v53275a9zgswyhz33mafd7pd";
+          name = "tinkerer";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "http://melpa.org/#/tinkerer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tiny = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tiny";
+        version = "20151208.405";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "tiny";
+          rev = "d775201a6e14aae03dda032132aa288ca93bddc4";
+          sha256 = "0mmz8b0fzffybc2jws9fif982zfx0l6kn1l4qxc67mf9nafbdca3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tiny";
+          sha256 = "183qczyb6c8zmdgmsjsj4hddmvnzzq4c7syslm861xcyxia94icy";
+          name = "tiny";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tiny";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tinysegmenter = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tinysegmenter";
+        version = "20141124.413";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "tinysegmenter.el";
+          rev = "872134704bd25c13a4c59552433da4c6881b5230";
+          sha256 = "1n8cn6mr26hgmsm2mkbj5gs6dv61d0pap8ija4g0n1vsibfhzd8j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tinysegmenter";
+          sha256 = "005yy2f8vghvwdcwakz5sr9n1gzk6cfyglm6d8b74y90d8fng0r6";
+          name = "tinysegmenter";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/tinysegmenter";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tj-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, tern }:
+    melpaBuild {
+        pname = "tj-mode";
+        version = "20150826.1051";
+        src = fetchFromGitHub {
+          owner = "katspaugh";
+          repo = "tj-mode";
+          rev = "8d60bcbe264275c76a2284fbc84ba80e0ac8e767";
+          sha256 = "1wr8m7yivz4z8rsiiqdlvdv3s2i0japvbpsz3x7nxr1y75fax2mz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tj-mode";
+          sha256 = "1i7dvxgj00p4n2fh8irgdfsjl2dpvfjjnkkv0cw71441f79p79mf";
+          name = "tj-mode";
+        };
+        packageRequires = [ emacs js2-mode tern ];
+        meta = {
+          homepage = "http://melpa.org/#/tj-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tldr";
+        version = "20160116.1131";
+        src = fetchFromGitHub {
+          owner = "kuanyui";
+          repo = "tldr.el";
+          rev = "138725e0849b698914502adb5240e700b7927cf2";
+          sha256 = "11316dz3f44qvla120hb7hwsj3968670ipf9y1k0wvc53vxc0aqq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tldr";
+          sha256 = "1f1xsmkbf4j1c876qqr9h8fgx3zxjgdfzvzf6capxlx2svhxzvc9";
+          name = "tldr";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/tldr";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tmmofl = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "tmmofl";
+        version = "20121025.601";
+        src = fetchhg {
+          url = "https://code.google.com/p/phillord-emacs-packages/";
+          rev = "e14e67d6a5b7";
+          sha256 = "0pq9x73hrp7qwhms7x3dvjfh9imapglba9yd7nkyw68mc0b9wlnl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tmmofl";
+          sha256 = "1hqv2xqnhwnbj4sqcbdial4987yj1y3ry7niaaz2hh0f5qzrzwa8";
+          name = "tmmofl";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tmmofl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    toc-org = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "toc-org";
+        version = "20150921.905";
+        src = fetchFromGitHub {
+          owner = "snosov1";
+          repo = "toc-org";
+          rev = "72883a08b01d08b74cc03c565eac8d0422770fcf";
+          sha256 = "0gzv45yxjy0bkdnx9kki0svmc7gxrdaarblvi1pyvl7id31ssw70";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/toc-org";
+          sha256 = "06mx2b0zjck82vp3i4bwbqlrzn05i2rkf8080cn34nkizi59wlbs";
+          name = "toc-org";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/toc-org";
+          license = lib.licenses.free;
+        };
+      }) {};
+    todochiku = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "todochiku";
+        version = "20150112.1454";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/todochiku.el";
+          sha256 = "0fhlyjl0a3fd25as185j6dmch0wsrf1zc59q29lhjximg9lk3hr5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/todochiku";
+          sha256 = "1iq08s5ji6hd8as80qxqkbavnjbx0kcmmjjvhjchmvv93vsn1f96";
+          name = "todochiku";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/todochiku";
+          license = lib.licenses.free;
+        };
+      }) {};
+    todotxt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "todotxt";
+        version = "20150513.2129";
+        src = fetchFromGitHub {
+          owner = "rpdillon";
+          repo = "todotxt.el";
+          rev = "fc83f954aea75065aa9788ee07027c94e76a9364";
+          sha256 = "0ms4mapjg9mbpmcmpn68r0mhwaibwfr4v25sin74b2281h4q7gal";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/todotxt";
+          sha256 = "13jcbkasvcczf7qnrh89ncqp6az6hm1s0ycrv7msva145n5bk1kr";
+          name = "todotxt";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/todotxt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    todotxt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "todotxt-mode";
+        version = "20150424.904";
+        src = fetchFromGitHub {
+          owner = "avillafiorita";
+          repo = "todotxt-mode";
+          rev = "dc6ae151edee88f329ba7abc5d39b7440002232f";
+          sha256 = "1k9ywi7cdgb6i600wr04r2l00423l6vr7k93qa7i7svv856nbbc7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/todotxt-mode";
+          sha256 = "1bs4air13ifx3xkhcfi80z29alsd63r436gnyvjyxlph2ip37v7k";
+          name = "todotxt-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/todotxt-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    togetherly = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "togetherly";
+        version = "20150820.338";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "togetherly";
+          rev = "9d655661984f7d62e9d6e0e9d47ae7ca8c4f43c7";
+          sha256 = "1falf86mm2206szkkwiwa5yk65y12asv84j1pdbcy6n8y6hha796";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/togetherly";
+          sha256 = "01ks160dfmgh05lx0lmyg020hba8nw49mj51dp1afcsmx4dkis2f";
+          name = "togetherly";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/togetherly";
+          license = lib.licenses.free;
+        };
+      }) {};
+    toggle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "toggle";
+        version = "20151210.1727";
+        src = fetchFromGitHub {
+          owner = "zenspider";
+          repo = "elisp";
+          rev = "ec4ef9dc2d018053bed7fb44837b4c66f1a14c36";
+          sha256 = "109il2s5ynfam510yli4xmi5zgw7xhr5gv096li24idqdp0gpf9n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/toggle";
+          sha256 = "08lk8h2dk5s8k93j5vmxdlgg453pif8wbcx2w3xkjlh43dw1vdfq";
+          name = "toggle";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/toggle";
+          license = lib.licenses.free;
+        };
+      }) {};
+    toggle-quotes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "toggle-quotes";
+        version = "20140710.426";
+        src = fetchFromGitHub {
+          owner = "toctan";
+          repo = "toggle-quotes.el";
+          rev = "33abc221d6887f0518337851318065cd86c34b03";
+          sha256 = "1w1lmqgzn9bp59h9y9plv80y53k6qhjgfmnnlqyyqfl45z3si7kg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/toggle-quotes";
+          sha256 = "16w453v4g7ww93bydim62p785x7w4vssp9l5liy0h3ppfmgvmxhp";
+          name = "toggle-quotes";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/toggle-quotes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    toggle-test = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "toggle-test";
+        version = "20140723.37";
+        src = fetchFromGitHub {
+          owner = "rags";
+          repo = "toggle-test";
+          rev = "e969321f274903d705995a7d0345a257576ec5ff";
+          sha256 = "0sgaslqxj806byidh06h5pqmqz8jzjfz9ky8jvkif3cq3a479jby";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/toggle-test";
+          sha256 = "0n8m325jcjhz8g75ysb9whsd12gpxw8598y5065j7c7gxjzv45l1";
+          name = "toggle-test";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/toggle-test";
+          license = lib.licenses.free;
+        };
+      }) {};
+    toggle-window = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "toggle-window";
+        version = "20141207.948";
+        src = fetchFromGitHub {
+          owner = "deadghost";
+          repo = "toggle-window";
+          rev = "e82c60e543933880402ede11e9423e48a17dde53";
+          sha256 = "0f86aij1glmvgpbhmfpi441zy0r37zblb0q3ycgq0dp92x8yny5r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/toggle-window";
+          sha256 = "1z080jywqj99xiwbvfclr6gjkc6spr3dqjb9kq1g4971vx4w8n9g";
+          name = "toggle-window";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/toggle-window";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tomatinho = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tomatinho";
+        version = "20140120.1740";
+        src = fetchFromGitHub {
+          owner = "konr";
+          repo = "tomatinho";
+          rev = "7468bbfca79e6ed70ad8fb9517bc05f02fe602c7";
+          sha256 = "0a3zvhy3jxs88zk4nhdc7lzybz4qji9baw5gm88sxlgcjgn7ip6n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tomatinho";
+          sha256 = "1ad3kr73v75vjrc09mdvb7a3ws834k5y5xha3v0ldah38cl1pmjz";
+          name = "tomatinho";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tomatinho";
+          license = lib.licenses.free;
+        };
+      }) {};
+    toml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "toml";
+        version = "20130903.755";
+        src = fetchFromGitHub {
+          owner = "gongo";
+          repo = "emacs-toml";
+          rev = "9633a6872928e737a2335aae1065768b23d8c3b3";
+          sha256 = "1b3bkla6i5nvanifxchph6ab6ldrskdf240hy4d27dkmmnr3pban";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/toml";
+          sha256 = "0kqv6zkywa7kqh8kg1dzcgkbi91lwx335przdakndm1lfai38i9b";
+          name = "toml";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/toml";
+          license = lib.licenses.free;
+        };
+      }) {};
+    toml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "toml-mode";
+        version = "20150818.320";
+        src = fetchFromGitHub {
+          owner = "dryman";
+          repo = "toml-mode.el";
+          rev = "afd98423773c2b9578fc5b2b46a43b5f5ecf7e6b";
+          sha256 = "1w9vkh6c4g80zykcy77k3r0bdc99mq8yh58bqkyd6gsr7pnp16gj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/toml-mode";
+          sha256 = "0yghf2ixl3dkcaxnkr4qzxfa9k1rrac7w5qpw1jx2bvic0cfs40l";
+          name = "toml-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/toml-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tommyh-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tommyh-theme";
+        version = "20131004.1830";
+        src = fetchFromGitHub {
+          owner = "wglass";
+          repo = "tommyh-theme";
+          rev = "46d1c69ee0a1ca7c67b569b891a2f28fed89e7d5";
+          sha256 = "0pwbd5gzmpr6js20438870w605671930291070nhmhswvxfcdvay";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tommyh-theme";
+          sha256 = "0nb9r407h08yxxdihxqx0c645bcz6qywbh2l654s3zfzdsqi1aj4";
+          name = "tommyh-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tommyh-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tool-bar-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "tool-bar-plus";
+        version = "20151231.1815";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/tool-bar+.el";
+          sha256 = "1sqflxj3hzxdlwn5qmpqm4dwik5vsyp7lypkvshcghdplxymb38a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tool-bar+";
+          sha256 = "07nsas600w5kxx7yzg52ax9avry8kq429mqlrs38jg5ycf3b1l6d";
+          name = "tool-bar-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tool-bar+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    top-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "top-mode";
+        version = "20130605.1239";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/top-mode.el";
+          sha256 = "0a5rl1cgznycqwx4r48mh69lgm8ixbnlfzbqdyvclgm8fldbannn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/top-mode";
+          sha256 = "0hrjlbiz827v9yf4086wlghw64rhvvlsbzv8lzs6pprdwbpr9pdx";
+          name = "top-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/top-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tornado-template-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tornado-template-mode";
+        version = "20141128.408";
+        src = fetchFromGitHub {
+          owner = "paradoxxxzero";
+          repo = "tornado-template-mode";
+          rev = "667c0663dbbd279b6c345446b9f2bc50eb52b747";
+          sha256 = "0wv49gn1daylnjmnallpqsqy7630ynrp45agpiwi6kwyyqk1kdvv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tornado-template-mode";
+          sha256 = "1sdv9rlhnabydws2sppsjcgqr0lg6bjapv753ksq5aaq21qsps0h";
+          name = "tornado-template-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tornado-template-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    totd = callPackage ({ cl-lib ? null, fetchFromGitLab, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "totd";
+        version = "20150519.940";
+        src = fetchFromGitLab {
+          owner = "egh";
+          repo = "emacs-totd";
+          rev = "ca47b618ea8290776cdb5b0f1c2c335691f69660";
+          sha256 = "188cdgic25wrb4jdgdcj070a0pxsh3m0rd9d2r6i1s1n1nalrs6g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/totd";
+          sha256 = "1bp07xl9yh9x6bi6cn8wz11x90jhv1rhxaig540iydjn5b0ny9m0";
+          name = "totd";
+        };
+        packageRequires = [ cl-lib s ];
+        meta = {
+          homepage = "http://melpa.org/#/totd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tox";
+        version = "20141004.1603";
+        src = fetchFromGitHub {
+          owner = "chmouel";
+          repo = "tox.el";
+          rev = "5c1a7c18cb7f2fd2da2386debf86012e6953e15d";
+          sha256 = "16217i8rjhgaa5kv8iq0s14b42v5rs8m2qlr60a0x6qzy65chq39";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tox";
+          sha256 = "1z81x8fs5q6r19hpqphsilk8wdwwnfr8w78x5x298x74s9mcsywl";
+          name = "tox";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tox";
+          license = lib.licenses.free;
+        };
+      }) {};
+    toxi-theme = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "toxi-theme";
+        version = "20130418.1439";
+        src = fetchhg {
+          url = "https://bitbucket.com/postspectacular/toxi-theme";
+          rev = "fc4274055149";
+          sha256 = "0hfzbrw9ik3yxdwmgsm80k0n045z6az6pgvxc1nqcjmiwh80h9mk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/toxi-theme";
+          sha256 = "032m3qbxfd0qp81qwayd5g9k7vz55g4yhw0d35qkxzf4qf58x9sd";
+          name = "toxi-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/toxi-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    traad = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, python-environment, request, request-deferred }:
+    melpaBuild {
+        pname = "traad";
+        version = "20151226.134";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "emacs-traad";
+          rev = "bcf9260fb8b9216ec1c455f673270049be7ccb38";
+          sha256 = "1yh9dxf986dl74sgn71qxwxsg67lr0yg1z7b9h2254lmxq0mgni6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/traad";
+          sha256 = "08gxh5c01xfbbj9g4992jah494rw3d3bbs8j79r3mpqxllkp2znf";
+          name = "traad";
+        };
+        packageRequires = [
+          deferred
+          popup
+          python-environment
+          request
+          request-deferred
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/traad";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tracking";
+        version = "20151129.519";
+        src = fetchFromGitHub {
+          owner = "jorgenschaefer";
+          repo = "circe";
+          rev = "c9862e432d2dad7cd568d79dbe49849245333fb1";
+          sha256 = "1l6lm3i02r0b8ng0n3rckgk0q38wjng41dqbx148bjxfq44cpghz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tracking";
+          sha256 = "096h5bl7jcwz5hpbm2139bf8a784hijfy40vzf42y1c9794al46z";
+          name = "tracking";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tracking";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tracwiki-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
+    melpaBuild {
+        pname = "tracwiki-mode";
+        version = "20150119.1021";
+        src = fetchFromGitHub {
+          owner = "merickson";
+          repo = "tracwiki-mode";
+          rev = "6a620444d59b438f42383b48cd4c19c03105dba6";
+          sha256 = "1m25l1lyff4h0h4vjrcsziwbf8svqg2llvvgl8i2b4jbh7k7pk5f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tracwiki-mode";
+          sha256 = "1k983f0lj42rxr5szpq9l9harykfn8jr13y3y6fav86zzd1fb8j0";
+          name = "tracwiki-mode";
+        };
+        packageRequires = [ xml-rpc ];
+        meta = {
+          homepage = "http://melpa.org/#/tracwiki-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tramp-hdfs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tramp-hdfs";
+        version = "20151028.2236";
+        src = fetchFromGitHub {
+          owner = "raghavgautam";
+          repo = "tramp-hdfs";
+          rev = "4a3ccaf931ecffeae283cb1766425afbc0f81101";
+          sha256 = "057a3z42j4s0npl35p5rl6n767s2wq0a3c49wii3f1w8p40fh7qc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tramp-hdfs";
+          sha256 = "1l7s2z8yk3cbnffig9fds75jkjlkng76qglx5ankzva61dz1kf2b";
+          name = "tramp-hdfs";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tramp-hdfs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tramp-term = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tramp-term";
+        version = "20141104.1545";
+        src = fetchFromGitHub {
+          owner = "randymorris";
+          repo = "tramp-term.el";
+          rev = "983ed67ee65d26a51c641f306fa6b921ec83eeaf";
+          sha256 = "0cgx6h9a49qj7x6bgsnsa20hi1yj5k080x4x0jpn6l9bj5nqiaip";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tramp-term";
+          sha256 = "1vbdwj8q66j6h5ijqzxhyaqf8wf9rbs03x8ppfijxl5qd2bhc1dy";
+          name = "tramp-term";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tramp-term";
+          license = lib.licenses.free;
+        };
+      }) {};
+    transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
+    melpaBuild {
+        pname = "transmission";
+        version = "20160114.1501";
+        src = fetchFromGitHub {
+          owner = "holomorph";
+          repo = "transmission";
+          rev = "c09102856740d3a67abcbc456a3488d6d8899897";
+          sha256 = "0iirqfjai330jw71pd6pqyhzl78k2y5psxiaw2nbgiq32rhn7whg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/transmission";
+          sha256 = "0w0hlr4y4xpcrpvclqqqasggkgrwnzrdib51mhkh3f3mqyiw8gs9";
+          name = "transmission";
+        };
+        packageRequires = [ emacs let-alist ];
+        meta = {
+          homepage = "http://melpa.org/#/transmission";
+          license = lib.licenses.free;
+        };
+      }) {};
+    transpose-frame = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "transpose-frame";
+        version = "20151126.826";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/transpose-frame.el";
+          sha256 = "1f67yksgw9s6j0033hmqzaxx2a93jm11sd5ys7cc3li5gfh680m4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/transpose-frame";
+          sha256 = "0bqip7vckic3kfq3d31ifs1zics1djxwj2jadafj6f1agv02sdz5";
+          name = "transpose-frame";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/transpose-frame";
+          license = lib.licenses.free;
+        };
+      }) {};
+    transpose-mark = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "transpose-mark";
+        version = "20150405.216";
+        src = fetchFromGitHub {
+          owner = "kwrooijen";
+          repo = "transpose-mark";
+          rev = "667327602004794de97214cf336ac61650ef75b7";
+          sha256 = "03wc50vn1kmrgnzzhs06pwpap2p2rx84wwzxw0hawsg1f1l35m2x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/transpose-mark";
+          sha256 = "1q1icp1szm1bxz9ywwyrfbsm1wmx0h4cvzywrh9q0fj1fq387qvv";
+          name = "transpose-mark";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/transpose-mark";
+          license = lib.licenses.free;
+        };
+      }) {};
+    travis = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
+    melpaBuild {
+        pname = "travis";
+        version = "20150825.638";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "emacs-travis";
+          rev = "c8769d3db10ed4604969049e3bd276afa0a0138e";
+          sha256 = "1jd7xsvs4m55fscp62a9lk59ip4sgifv4kazl55b7543nz1i31bz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/travis";
+          sha256 = "1km496cq1vni9gy2d3z4c9524q62750ywz745rjz4r7178ip9mix";
+          name = "travis";
+        };
+        packageRequires = [ dash pkg-info request s ];
+        meta = {
+          homepage = "http://melpa.org/#/travis";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tree-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "tree-mode";
+        version = "20151104.731";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/tree-mode.el";
+          sha256 = "0hffnzvzbvmzf23z9z7n7y53l5i7kza9hgfl39qqcnw4njg48llx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tree-mode";
+          sha256 = "0xwyhlc5lagj46nd70l81rvb43hs08pic96grk62zknig8354c24";
+          name = "tree-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tree-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    trident-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, skewer-mode, slime }:
+    melpaBuild {
+        pname = "trident-mode";
+        version = "20130726.1407";
+        src = fetchFromGitHub {
+          owner = "johnmastro";
+          repo = "trident-mode.el";
+          rev = "ad3201f47e114de35df189c3d80f0fdea9507ea9";
+          sha256 = "08484fhc69rk16g52f9bzc1kzpif61ddfchxjbj1qqqammbx11ym";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/trident-mode";
+          sha256 = "0l81hs7bp46jlk41b9fk1lkvlp17fqc5hcz8k8kkal7rh7ari1fd";
+          name = "trident-mode";
+        };
+        packageRequires = [ dash emacs skewer-mode slime ];
+        meta = {
+          homepage = "http://melpa.org/#/trident-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tronesque-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tronesque-theme";
+        version = "20150125.441";
+        src = fetchFromGitHub {
+          owner = "aurelienbottazini";
+          repo = "tronesque";
+          rev = "42093c08a50c860601c364c8a746c803458c10ba";
+          sha256 = "06wm3qwxjhzwjn9nnrqm5wwj1z5gfghg9d2qbg8w3zyqzva5dmvm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tronesque-theme";
+          sha256 = "1bk73zawl1922aq739r3rz30flxd6nq87k8ahzbix139g7gxf19j";
+          name = "tronesque-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tronesque-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    truthy = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild }:
+    melpaBuild {
+        pname = "truthy";
+        version = "20140508.1541";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "truthy";
+          rev = "8ed8d07772aa8457554547eb17e264b5df2b4a69";
+          sha256 = "1mm6rrprsmx4hc622qmllm7c81yhwbqmdr0n6020krq92zmilmlm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/truthy";
+          sha256 = "1a56zmqars9fd03bkqzwpvgblq5fvq19n4jw04c4hpga92sq8wqg";
+          name = "truthy";
+        };
+        packageRequires = [ list-utils ];
+        meta = {
+          homepage = "http://melpa.org/#/truthy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    try = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "try";
+        version = "20150608.411";
+        src = fetchFromGitHub {
+          owner = "larstvei";
+          repo = "Try";
+          rev = "464cfb73599c88a4b57c83adfa93173c41d28a35";
+          sha256 = "05nzchk7jia9g7b3ww4m3rgg0aylrfkpiz13cylv2bk79rwhzifc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/try";
+          sha256 = "0dv0i77agva215bf1gj1x1k7f7g3pvccyyd7vslapf9z8brccn7n";
+          name = "try";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/try";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tss = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, json-mode, lib, log4e, melpaBuild, yaxception }:
+    melpaBuild {
+        pname = "tss";
+        version = "20150913.908";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "emacs-tss";
+          rev = "81ac6351a2ae258fd0ebf916dae9bd5a179fefd0";
+          sha256 = "1bk5v9dffs65qsay0dp336s2ly065nd0cg572zz058ikwxd44zd3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tss";
+          sha256 = "0d16x5r2xfy6mrwy0mqzpr9b3inqmyyxgawrxlfh83j1xb903dhm";
+          name = "tss";
+        };
+        packageRequires = [ auto-complete json-mode log4e yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/tss";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tt-mode";
+        version = "20130804.610";
+        src = fetchFromGitHub {
+          owner = "davorg";
+          repo = "tt-mode";
+          rev = "85ed3832e7eef391f7879d9990d59c7a3493c15e";
+          sha256 = "1gvqxk67cf779szyg907815i4m9jzrpmn5cnsmnwd62k3r3z4nxm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tt-mode";
+          sha256 = "02dzyycn5znbibbz50b243bh1kcccp8xwknjqwljk00gpf196vzf";
+          name = "tt-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tt-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ttrss = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ttrss";
+        version = "20130409.1249";
+        src = fetchFromGitHub {
+          owner = "pedros";
+          repo = "ttrss.el";
+          rev = "e90d8f7ccaf235053057bd91d3a2113582604e24";
+          sha256 = "0a8f9p1im6k7mnp2bq733rfx2x246gfwpvi5ccym1y5lakx37fil";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ttrss";
+          sha256 = "08921cssvwpq33w87v08dafi2rz2rl1b3bhbhijn4bwjqgxi9w7z";
+          name = "ttrss";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ttrss";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tuareg";
+        version = "20160105.1224";
+        src = fetchFromGitHub {
+          owner = "ocaml";
+          repo = "tuareg";
+          rev = "8c3f604ad3b393403baaa93fc53898217e675ab8";
+          sha256 = "0knp7nbzhzahkn97zs2aw0ly7x40cbh8m5xb4rk1ynw0n09zq3d0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tuareg";
+          sha256 = "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q";
+          name = "tuareg";
+        };
+        packageRequires = [ caml ];
+        meta = {
+          homepage = "http://melpa.org/#/tuareg";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tumble = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, http-post-simple, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tumble";
+        version = "20160112.129";
+        src = fetchFromGitHub {
+          owner = "febuiles";
+          repo = "tumble";
+          rev = "e8fd7643cccf2b6ea4170f0c5f1f87d007e7fa00";
+          sha256 = "1xdkgvr1pnlg3nrjmma4ra80ysr8xbslvczg7cq1x1mqw6gn9xq5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tumble";
+          sha256 = "1c9ybq0mb2a0pw15fmm13vfwcnr2h9fb1xsm5nrff1cg7913pgv9";
+          name = "tumble";
+        };
+        packageRequires = [ cl-lib http-post-simple ];
+        meta = {
+          homepage = "http://melpa.org/#/tumble";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tumblesocks = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, markdown-mode, melpaBuild, oauth }:
+    melpaBuild {
+        pname = "tumblesocks";
+        version = "20140215.1447";
+        src = fetchFromGitHub {
+          owner = "gcr";
+          repo = "tumblesocks";
+          rev = "85a6cdc2db3390593fd886c474959b675460b310";
+          sha256 = "1g7y7czan7mcs5lwc5r6cllgksrj3b9lpn1bj7khwkd1ll391jc2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tumblesocks";
+          sha256 = "11ky69icsnxwsinv2j3f4c0764wm6i9g9mlvwsdrd6w1lchq1dg9";
+          name = "tumblesocks";
+        };
+        packageRequires = [ htmlize markdown-mode oauth ];
+        meta = {
+          homepage = "http://melpa.org/#/tumblesocks";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tup-mode";
+        version = "20140410.1114";
+        src = fetchFromGitHub {
+          owner = "ejmr";
+          repo = "tup-mode";
+          rev = "bcc100c6485f1c81fdcd1215dfc6c41a81c215c8";
+          sha256 = "0y1b9zvwbw3vp41siyzj04bis939fgz3j27hc5ljjzy92kd39nzm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tup-mode";
+          sha256 = "0pzpn1ljfcc2dl9fg7jc8lmjwz2baays4axjqk1qsbj0kqbc8j0l";
+          name = "tup-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tup-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    turnip = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "turnip";
+        version = "20150309.129";
+        src = fetchFromGitHub {
+          owner = "kljohann";
+          repo = "turnip.el";
+          rev = "2fd32562fc6fc1cda6d91aa939cfb29f9b16e9de";
+          sha256 = "0khl4q22x6vdn87xdqqg5f535d4dqpnfbhk6qhlh187p1w7qaiq4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/turnip";
+          sha256 = "1vfqv71j47fn53klz3jl8r8hscywd01kkl4w96a308sac3lhbrps";
+          name = "turnip";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/turnip";
+          license = lib.licenses.free;
+        };
+      }) {};
+    twig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "twig-mode";
+        version = "20130220.1250";
+        src = fetchFromGitHub {
+          owner = "moljac024";
+          repo = "twig-mode";
+          rev = "2849f273a4855d3314a9c0cc84134f5b28ad5ea6";
+          sha256 = "0wvmih2y3hy7casxx2y1w8csmzfnfgbb5ivpggr94sc86p6bg8sa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/twig-mode";
+          sha256 = "1m3xjgmkqg8aj536wcg2f2hf4y6whscbsh7z7448hl4b5qjwii4n";
+          name = "twig-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/twig-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    twilight-anti-bright-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "twilight-anti-bright-theme";
+        version = "20140810.234";
+        src = fetchFromGitHub {
+          owner = "jimeh";
+          repo = "twilight-anti-bright-theme";
+          rev = "c3a7b4177416031284da73f53b4dddaa27570bd7";
+          sha256 = "1bj2mpiklqcangjzbnz5wz7klsfvp0x397lidvf42awn7s2aax0n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/twilight-anti-bright-theme";
+          sha256 = "1qfybk5akaxdahmjffqaw712v8d7kk4jqkj3hzp96kys2zv1r6f9";
+          name = "twilight-anti-bright-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/twilight-anti-bright-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    twilight-bright-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "twilight-bright-theme";
+        version = "20130605.343";
+        src = fetchFromGitHub {
+          owner = "jimeh";
+          repo = "twilight-bright-theme.el";
+          rev = "322157cb2f3bf7920ecd209dafc31bc1c7959f49";
+          sha256 = "1awqc4rvg8693myynb1d4y4dfdaxkd5blnixxs3mdv81l07zyn8c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/twilight-bright-theme";
+          sha256 = "074cqs55gwy5jlaay3m9bpdpdfb45nmlijvapz96nibl64pyk83d";
+          name = "twilight-bright-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/twilight-bright-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    twilight-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "twilight-theme";
+        version = "20120412.803";
+        src = fetchFromGitHub {
+          owner = "developernotes";
+          repo = "twilight-theme";
+          rev = "77c4741cb3dcf16e53d06d6c2ffdc660c40afb5b";
+          sha256 = "0d7vd1h0rwwgrh7f9kmdgy2ni0p20da9c8ylwlg33nsb26345wfs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/twilight-theme";
+          sha256 = "1wkca66q4k94h9njsy15n83wjzn90rcbmv44x0hdwqj92yxjf3y7";
+          name = "twilight-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/twilight-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    twittering-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "twittering-mode";
+        version = "20150906.1203";
+        src = fetchFromGitHub {
+          owner = "hayamiz";
+          repo = "twittering-mode";
+          rev = "97197cdd3cc005000dc2599f67c754d74fab5972";
+          sha256 = "02c9z229ayqnmlvja5a2fz3vk8914v9v8akin57q8a0gyzn2bli5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/twittering-mode";
+          sha256 = "0v9ijxw5jazh2hc0qab48y71za2l9ryff0mpkxhr3f79irlqy0a1";
+          name = "twittering-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/twittering-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    typed-clojure-mode = callPackage ({ cider, clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "typed-clojure-mode";
+        version = "20151003.1322";
+        src = fetchFromGitHub {
+          owner = "typedclojure";
+          repo = "typed-clojure-mode";
+          rev = "3abd53d8cc1ad77ffe76e02849d0ab7731fd8364";
+          sha256 = "1i826xq77nh4s7qlj63r2iznbn319l1l3fzpbjb2nj0m00bwvxl6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/typed-clojure-mode";
+          sha256 = "1579zkhk2lwl5ij7dm9n2drggs5fmhpljrshc4ghhvig7nlyqjy3";
+          name = "typed-clojure-mode";
+        };
+        packageRequires = [ cider clojure-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/typed-clojure-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "typescript-mode";
+        version = "20150830.2028";
+        src = fetchFromGitHub {
+          owner = "ananthakumaran";
+          repo = "typescript.el";
+          rev = "49241bcc1f60b3787ccd9448a559f792156907a9";
+          sha256 = "16y1r8080scjanbd95hpgk9lp8xqy8cxwkk9xij53jiqfglcwi5c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/typescript-mode";
+          sha256 = "01jyqy44ir59n9c2f6gh4xzwfmzdpnys1lw4lnsy6kirqgbsq9ha";
+          name = "typescript-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/typescript-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    typing = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "typing";
+        version = "20121026.1618";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/typing.el";
+          sha256 = "0mgvpdp3vlvjy32d163h2mzsf9j2ij2f542sdr3rsy8l80n6nx31";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/typing";
+          sha256 = "0b72lbzji105wzvsi58l6pjc08qcwrm5ddf42irdxi956081pzp3";
+          name = "typing";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/typing";
+          license = lib.licenses.free;
+        };
+      }) {};
+    typing-game = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "typing-game";
+        version = "20151111.940";
+        src = fetchFromGitHub {
+          owner = "lujun9972";
+          repo = "el-typing-game";
+          rev = "b58c19a4a14895cc24ce01a73cf624b5c54a12b8";
+          sha256 = "0i5pipciwsl6cj3inxiz6ybkv5jglacjwhcyqdfzi4mrbic7g848";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/typing-game";
+          sha256 = "0k85j9bcqp0gbzdh44q5a9wlkv5mc0g0m42ziq1bzmp6993wkmy2";
+          name = "typing-game";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/typing-game";
+          license = lib.licenses.free;
+        };
+      }) {};
+    typo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "typo";
+        version = "20150910.843";
+        src = fetchFromGitHub {
+          owner = "jorgenschaefer";
+          repo = "typoel";
+          rev = "da7e6784a987fbff804f35e402df372ac4b013b2";
+          sha256 = "1q4yg0rmw39qykrg5cga5ab8gbnxzig4wczxqrap0470nhdbms3h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/typo";
+          sha256 = "07hmqrnbxbrhcbxdls8i4786lkqmfr3hv6va41xih1lxj0mk60bx";
+          name = "typo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/typo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ubuntu-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ubuntu-theme";
+        version = "20150805.1006";
+        src = fetchFromGitHub {
+          owner = "rocher";
+          repo = "ubuntu-theme";
+          rev = "88b0eefc75d4cbcde103057e1c5968d4c3052f69";
+          sha256 = "1v8d1pc0vjc7wz0prr5w5vp2qb19f3gcyl6jx5130plajbvv23rc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ubuntu-theme";
+          sha256 = "160z59aaxb2v6c24nki6bn7pjm9r4jl1mgxs4h4sivzxkaw811s2";
+          name = "ubuntu-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ubuntu-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ucs-cmds = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "ucs-cmds";
+        version = "20151231.1816";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/ucs-cmds.el";
+          sha256 = "0qy211rxrmzhwl9qfrcmfnwayysvb5rghjginbvx3wf2s6hrbpya";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ucs-cmds";
+          sha256 = "1n0f0qf8w8ark78fs67aaxnqpk0km97hy59pnxwfyahgjl2qz6d1";
+          name = "ucs-cmds";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ucs-cmds";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ucs-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache, persistent-soft }:
+    melpaBuild {
+        pname = "ucs-utils";
+        version = "20150826.914";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "ucs-utils";
+          rev = "cbfd42f822bf5717934fa2d92060e6e24a813433";
+          sha256 = "0qw9vwl1p0pjw1xmshxar1a8kn6gmin5rdvvnnly8b5z9hpkjf3m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ucs-utils";
+          sha256 = "111fwg2cqqzpa79rcqxidppb12c8g12zszppph2ydfvkgkryb6z2";
+          name = "ucs-utils";
+        };
+        packageRequires = [ list-utils pcache persistent-soft ];
+        meta = {
+          homepage = "http://melpa.org/#/ucs-utils";
+          license = lib.licenses.free;
+        };
+      }) {};
+    uimage = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "uimage";
+        version = "20151012.804";
+        src = fetchFromGitHub {
+          owner = "lujun9972";
+          repo = "uimage";
+          rev = "29ca0f4b9f27a8d1649931cc2ce5a3c0eb655413";
+          sha256 = "19qvn1vzal5k86pqn6a4ins869qmp2i586qqbl97z84szn8mn7j3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/uimage";
+          sha256 = "0i6qpk6v4pmpk3zswygdy0dd7rxy8kl7qn8a1xanpi4aqg7wlbmd";
+          name = "uimage";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/uimage";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ujelly-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ujelly-theme";
+        version = "20150807.2336";
+        src = fetchFromGitHub {
+          owner = "marktran";
+          repo = "color-theme-ujelly";
+          rev = "ff4b9fb4a9469cd807ed712e05cf739a1a900218";
+          sha256 = "0cryprvns1qdnp2qif2g187lj15810w472m7nwrfiwgvqv4v3p1l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ujelly-theme";
+          sha256 = "0b7zgmpsdn5p3jx4kif7phxz8pb85snmmfr3yz98xf6p7h6w60gw";
+          name = "ujelly-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ujelly-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ukrainian-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ukrainian-holidays";
+        version = "20130720.849";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "ukrainian-holidays";
+          rev = "e52b0c92843e9f4d0415a7ba3b8559785497d23d";
+          sha256 = "033v4ck979lhkpwblci5clacfc1xnkq03p5d1m566wff8dp5flwz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ukrainian-holidays";
+          sha256 = "0kbfj2l1rcv74c88nabkwkcl7k9pkim835l24q61zv3i6wf9sykf";
+          name = "ukrainian-holidays";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ukrainian-holidays";
+          license = lib.licenses.free;
+        };
+      }) {};
+    unbound = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "unbound";
+        version = "20140307.328";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/unbound.el";
+          sha256 = "0i5km1naxprd4lj20097ph50mjs2364xwxcdw0j3g5569mk5nc06";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unbound";
+          sha256 = "1ys6pgb3lhx4ihhv8i28vrchp1ad37md7lnana40macf5n72d77x";
+          name = "unbound";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/unbound";
+          license = lib.licenses.free;
+        };
+      }) {};
+    uncrustify-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "uncrustify-mode";
+        version = "20130707.859";
+        src = fetchFromGitHub {
+          owner = "koko1000ban";
+          repo = "emacs-uncrustify-mode";
+          rev = "73893d000361e95784911e5ec268ad0ab2a1473c";
+          sha256 = "0366h4jfi0c7yda9wcrz4zxgf2qqdd08b8z2dr8c1rkvkdd67iam";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/uncrustify-mode";
+          sha256 = "0amdxdfc8i99zjrw4iqmxzb47h0airs60fwmc32bc8b0ds66c3kd";
+          name = "uncrustify-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/uncrustify-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    undercover = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, shut-up }:
+    melpaBuild {
+        pname = "undercover";
+        version = "20150817.1210";
+        src = fetchFromGitHub {
+          owner = "sviridov";
+          repo = "undercover.el";
+          rev = "7b38281c21a0ed9f7260d58aca6b4b2471672cfd";
+          sha256 = "1qm6fzgmrdzhkajd60l4l890dlbxll96x41kx36wm97h4gz7aiyw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/undercover";
+          sha256 = "1s30c3i6y4r3mgrrs3lda3rrwmy9ff11ihdmshyziv9v5879sdjf";
+          name = "undercover";
+        };
+        packageRequires = [ dash emacs shut-up ];
+        meta = {
+          homepage = "http://melpa.org/#/undercover";
+          license = lib.licenses.free;
+        };
+      }) {};
+    underwater-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "underwater-theme";
+        version = "20131117.1802";
+        src = fetchFromGitHub {
+          owner = "jmdeldin";
+          repo = "underwater-theme.el";
+          rev = "4eb9ef014f580adc135d91d1cd68d37a310640b6";
+          sha256 = "1ypxpv5vw2ls757iwrq3zld6k0s29q3kg3spcsl5ks4aqpnkxpva";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/underwater-theme";
+          sha256 = "0ab2bcqfdi9ml3z9d511pbfwcbp8hkkd36xxp61k36gkyi3acvlr";
+          name = "underwater-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/underwater-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    undo-tree = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "undo-tree";
+        version = "20140509.722";
+        src = fetchgit {
+          url = "http://www.dr-qubit.org/git/undo-tree.git";
+          rev = "a3e81b682053a81e082139300ef0a913a7a610a2";
+          sha256 = "1ef5db7cf476dd37348fd1f11dd199613a89a2351dc583a42afd9d35a53d8ae2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/undo-tree";
+          sha256 = "0vrjxprpk854989wcp4wjb07jhhxqi25p6c758gz264z3xa8g9cr";
+          name = "undo-tree";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/undo-tree";
+          license = lib.licenses.free;
+        };
+      }) {};
+    undohist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "undohist";
+        version = "20150315.742";
+        src = fetchFromGitHub {
+          owner = "m2ym";
+          repo = "undohist-el";
+          rev = "d2239a5f736724ceb9e3b6bcaa86f4064805cda0";
+          sha256 = "1c0daw246ky7b1x5b8h55x79pl1pjqk1k348l487bdd8zdj4w9wx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/undohist";
+          sha256 = "0zzfzh8sf2dkz8h3kidv7zmwz2c2qq9n9qz2mab2lk0y44njzwhn";
+          name = "undohist";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/undohist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    unfill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "unfill";
+        version = "20131103.413";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "unfill";
+          rev = "d5f3dbaaaa871dc26bbc9e4bcd6deacac02a02d4";
+          sha256 = "0fd9k5m1yw2274m2w9rkrg7vqagzf0rjbybglqi7d200b3hmjin3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unfill";
+          sha256 = "0b21dk45vbz4vqdbdx0n6wx30rm38w1jjqbsxfj7b96p3i5shwqv";
+          name = "unfill";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/unfill";
+          license = lib.licenses.free;
+        };
+      }) {};
+    unicode-emoticons = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "unicode-emoticons";
+        version = "20150204.508";
+        src = fetchFromGitHub {
+          owner = "hagleitn";
+          repo = "unicode-emoticons";
+          rev = "fb18631f342b0243cf77cf59ed2067c47aae5233";
+          sha256 = "015gjf8chd6h9azhyarmskk41cm0cmg981jif7q81hakl9av6rhh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-emoticons";
+          sha256 = "15s6qjhrrqrhm87vmvd6akdclzba19613im85kfkhc24p6nxyhbn";
+          name = "unicode-emoticons";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/unicode-emoticons";
+          license = lib.licenses.free;
+        };
+      }) {};
+    unicode-enbox = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache, persistent-soft, string-utils, ucs-utils }:
+    melpaBuild {
+        pname = "unicode-enbox";
+        version = "20140508.1541";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "unicode-enbox";
+          rev = "77074fac1994a4236f111d6a1d0cf79ea3fca151";
+          sha256 = "0936dqxyp72if9wvn2dcci670yp1gqrmpnll9xq00skp85yq9zs5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-enbox";
+          sha256 = "1phb2qq3pg6z6bl96kl9yfq4jxhgardjpaa4lhgqbxymmqdm7gzv";
+          name = "unicode-enbox";
+        };
+        packageRequires = [
+          list-utils
+          pcache
+          persistent-soft
+          string-utils
+          ucs-utils
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/unicode-enbox";
+          license = lib.licenses.free;
+        };
+      }) {};
+    unicode-fonts = callPackage ({ fetchFromGitHub, fetchurl, font-utils, lib, list-utils, melpaBuild, pcache, persistent-soft, ucs-utils }:
+    melpaBuild {
+        pname = "unicode-fonts";
+        version = "20150826.1732";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "unicode-fonts";
+          rev = "a36597d83e0248bd0e6b2c1d5fb95bff72add527";
+          sha256 = "0fbwncna6gxlynq9196djpkjhayzk8kxlsxg0gasdgqx1nyxl0mk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-fonts";
+          sha256 = "0plipwb30qqay8691qzqdyg6smpbs9dsxxi49psb8sq0xnxl84q3";
+          name = "unicode-fonts";
+        };
+        packageRequires = [
+          font-utils
+          list-utils
+          pcache
+          persistent-soft
+          ucs-utils
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/unicode-fonts";
+          license = lib.licenses.free;
+        };
+      }) {};
+    unicode-input = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "unicode-input";
+        version = "20141219.120";
+        src = fetchhg {
+          url = "https://bitbucket.com/m00nlight/unicode-input";
+          rev = "e76ccb549e6a";
+          sha256 = "0kzcg1wxi1z424jdn7pibk9zyfyi85kligav08sl1c2hdldzya4l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-input";
+          sha256 = "17sf3xnl8yyx4ln4mrjlrvfinb8dvabh81l3qyr9pkn5skpgqgj8";
+          name = "unicode-input";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/unicode-input";
+          license = lib.licenses.free;
+        };
+      }) {};
+    unicode-progress-reporter = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache, persistent-soft, ucs-utils }:
+    melpaBuild {
+        pname = "unicode-progress-reporter";
+        version = "20140508.1541";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "unicode-progress-reporter";
+          rev = "5e66724fd7d15743213b082474d798117b194494";
+          sha256 = "16jgm70ldsngxldiagjkw3ragypalpiidnf82g5hss9ciybkd3j4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-progress-reporter";
+          sha256 = "03z7p27470fqy3gd356l9cpp44a35sfrxz94dxmx388rzlygk7y7";
+          name = "unicode-progress-reporter";
+        };
+        packageRequires = [ emacs list-utils pcache persistent-soft ucs-utils ];
+        meta = {
+          homepage = "http://melpa.org/#/unicode-progress-reporter";
+          license = lib.licenses.free;
+        };
+      }) {};
+    unicode-troll-stopper = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "unicode-troll-stopper";
+        version = "20151023.2031";
+        src = fetchFromGitHub {
+          owner = "camsaul";
+          repo = "emacs-unicode-troll-stopper";
+          rev = "15e4b57b78bf643bb56e5000078030cbb5c66e2a";
+          sha256 = "0ny260mr1h810fvqsfj2hpd3zql4g309m60qj4vk6kmd83p5b60f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-troll-stopper";
+          sha256 = "0a10lq0xsfyp052iw4xjbhsdkbyg25x2gk68gys4k7p6l92la0k5";
+          name = "unicode-troll-stopper";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/unicode-troll-stopper";
+          license = lib.licenses.free;
+        };
+      }) {};
+    unicode-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache, persistent-soft, ucs-utils }:
+    melpaBuild {
+        pname = "unicode-whitespace";
+        version = "20140508.1541";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "unicode-whitespace";
+          rev = "a18c6b38d78b94f2eb1dcc4cb4fa91b6a17efabe";
+          sha256 = "1ayb15nd5vqr0xaghrnp55kqw7bblrjipmfrag6bqpn7jk9bvbdz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-whitespace";
+          sha256 = "1b3jgha8va42b89pdp41sab2w9wllp7dicqg4lxl67bg6wn147wy";
+          name = "unicode-whitespace";
+        };
+        packageRequires = [ list-utils pcache persistent-soft ucs-utils ];
+        meta = {
+          homepage = "http://melpa.org/#/unicode-whitespace";
+          license = lib.licenses.free;
+        };
+      }) {};
+    unidecode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "unidecode";
+        version = "20140317.2318";
+        src = fetchFromGitHub {
+          owner = "sindikat";
+          repo = "unidecode";
+          rev = "9e279e88a689584027d5a1b088fe5def25d0f75c";
+          sha256 = "1jvr1k8zd40m1rvwmxzidz1dvr4j8cbh78nqgc3vfb410fj619gw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unidecode";
+          sha256 = "0h058mvb6x53zywpwg85dzhaynlgq577yyqhrn5qqyqjg1n8lhc1";
+          name = "unidecode";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/unidecode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    unify-opening = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "unify-opening";
+        version = "20151116.1848";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "unify-opening";
+          rev = "2812e43029cab7183197ce5e3c9577856bfd22c5";
+          sha256 = "1vbx10s2zmhpxjg26ik947bcg9f7w3g2w45wmm0shjp743fsdq8p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unify-opening";
+          sha256 = "1gpmklbdbmv8va8d3yr94r1ydkcyvdzcgxv56rp0bxwbcgmk0as8";
+          name = "unify-opening";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/unify-opening";
+          license = lib.licenses.free;
+        };
+      }) {};
+    unipoint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "unipoint";
+        version = "20140113.1624";
+        src = fetchFromGitHub {
+          owner = "apgwoz";
+          repo = "unipoint";
+          rev = "5da04aebac35a5c9e1d8704f2231808d42f4b36a";
+          sha256 = "1wl9rzys1zr2c41h5i57y6hxsavix1b26f453l2izmb6r0b1dvh0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unipoint";
+          sha256 = "1nym2wlr50wk62cbagq1qyjczzf56nb6i9dfzcwikdck8p4p2dr7";
+          name = "unipoint";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/unipoint";
+          license = lib.licenses.free;
+        };
+      }) {};
+    unison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "unison-mode";
+        version = "20150104.614";
+        src = fetchFromGitHub {
+          owner = "impaktor";
+          repo = "unison-mode";
+          rev = "7e1bfee1a6796cc749a583605a9c948eccbc8cc5";
+          sha256 = "0l8h084xkbjvx2vbg67hxmg4hb9175k858z3k3c93d2b6x2kh7ni";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unison-mode";
+          sha256 = "03kyr1h5pm51vn4bykj13rm4ybln266rpnxh65y2ygw8f8md88gl";
+          name = "unison-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/unison-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    unkillable-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "unkillable-scratch";
+        version = "20150328.118";
+        src = fetchFromGitHub {
+          owner = "EricCrosson";
+          repo = "unkillable-scratch";
+          rev = "55a196d0c7001bfc8cf9c6cc532a5dc94e95baf8";
+          sha256 = "0xpaifmrvq5bbzpjhbzbxaac8kymmvqgg7lb2q1s7b5qf47fhqac";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unkillable-scratch";
+          sha256 = "0ghbpa9pf7k6vd2mjxkpqg2qfl4sd40ir6mrk1rxr1rv8s0afkf7";
+          name = "unkillable-scratch";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/unkillable-scratch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    url-shortener = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "url-shortener";
+        version = "20150806.113";
+        src = fetchFromGitHub {
+          owner = "yuyang0";
+          repo = "url-shortener";
+          rev = "2ce3fedbdc44f778f28a5a08f06958bc5dccae88";
+          sha256 = "118c23dsfgkhwhv65dx3wbg2dn7qyrd80d78cykl732c68d6wvi0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/url-shortener";
+          sha256 = "12r01dyk55bs01jk0ab9f24lfvm63h8kvix223pii5y9890dr6ys";
+          name = "url-shortener";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/url-shortener";
+          license = lib.licenses.free;
+        };
+      }) {};
+    urlenc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "urlenc";
+        version = "20140116.856";
+        src = fetchFromGitHub {
+          owner = "buzztaiki";
+          repo = "urlenc-el";
+          rev = "835a6dcb783bbe84714bae87a3464aa0b128bfac";
+          sha256 = "0xwr0v4f64d7hi5ldig4r5yjn8h3f8by49g5820187lsp7ng2nw4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/urlenc";
+          sha256 = "0n6shh95m11162zsnf62zy1ljswdjznjilxx2dbqyqdrn7qr2dgh";
+          name = "urlenc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/urlenc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    usage-memo = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "usage-memo";
+        version = "20110722.1051";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/usage-memo.el";
+          sha256 = "00g1zj5fjykdi6gh2wkswpwx132xa6jmwfnrgfg5r96zwb8pib4i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/usage-memo";
+          sha256 = "05n50adjnavl7ag24wfjwlnbv5x55qlhmplgsm8j57gjig01nd95";
+          name = "usage-memo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/usage-memo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "use-package";
+        version = "20160112.1501";
+        src = fetchFromGitHub {
+          owner = "jwiegley";
+          repo = "use-package";
+          rev = "2a50241538b8ead3d620be33bd8e0087f98f42c5";
+          sha256 = "0wiv5xh2hik76x0i4a6amq5648akm5kvr4llnkh190riibnwkwx6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/use-package";
+          sha256 = "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8";
+          name = "use-package";
+        };
+        packageRequires = [ bind-key diminish ];
+        meta = {
+          homepage = "http://melpa.org/#/use-package";
+          license = lib.licenses.free;
+        };
+      }) {};
+    use-package-chords = callPackage ({ bind-chord, bind-key, fetchFromGitHub, fetchurl, lib, melpaBuild, use-package }:
+    melpaBuild {
+        pname = "use-package-chords";
+        version = "20160107.1054";
+        src = fetchFromGitHub {
+          owner = "waymondo";
+          repo = "use-package-chords";
+          rev = "cbf623c867f911732077b026692f9312401791ad";
+          sha256 = "05lhxbrgwbyz0nkb19yln9a46jh91ic685943hd58cn91lxsw3al";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/use-package-chords";
+          sha256 = "18av8gkz3nzyqigyd88ajvylsz2nswsfywxrk2w8d0ykc3p37ass";
+          name = "use-package-chords";
+        };
+        packageRequires = [ bind-chord bind-key use-package ];
+        meta = {
+          homepage = "http://melpa.org/#/use-package-chords";
+          license = lib.licenses.free;
+        };
+      }) {};
+    utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "utop";
+        version = "20151105.447";
+        src = fetchFromGitHub {
+          owner = "diml";
+          repo = "utop";
+          rev = "9e41bf85da052bd1dc52701b3e83d5699d96701a";
+          sha256 = "0nvd9hc9dgiqd8xg1cbs7wmh0zpfpwx9i6q06p0xy8b2qd8xp58c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/utop";
+          sha256 = "0lv16kl29gc9hdcpn04l85pf7x93vkl41s4mgqp678cllzyr0cq7";
+          name = "utop";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/utop";
+          license = lib.licenses.free;
+        };
+      }) {};
+    uuid = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "uuid";
+        version = "20120910.351";
+        src = fetchFromGitHub {
+          owner = "nicferrier";
+          repo = "emacs-uuid";
+          rev = "1519bfeb0e31602b840bc8dd35d7c7e732c159fe";
+          sha256 = "0r74gw8gcbrr62rvj4anz0c3n6kwi1xpb42d3pkzlh4igblhi5zj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/uuid";
+          sha256 = "13xjnawir9i83j2abxxkl12gz3wapgbk56cps3qyfgql02bfk2rw";
+          name = "uuid";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/uuid";
+          license = lib.licenses.free;
+        };
+      }) {};
+    uuidgen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "uuidgen";
+        version = "20140918.1801";
+        src = fetchFromGitHub {
+          owner = "kanru";
+          repo = "uuidgen-el";
+          rev = "7eb96415484c3854a3f383d1a3e10b87ae674e22";
+          sha256 = "19bf6vpc2b9hfjkjanji96fflvk1lbillasnpwcb6zzyq0cs47bw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/uuidgen";
+          sha256 = "1qaz7hg0wsdkl0jb7v7vrkjs554i2zgpxl8xq2f8q7m4bs2m5k48";
+          name = "uuidgen";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/uuidgen";
+          license = lib.licenses.free;
+        };
+      }) {};
+    uzumaki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "uzumaki";
+        version = "20150119.1906";
+        src = fetchFromGitHub {
+          owner = "geyslan";
+          repo = "uzumaki";
+          rev = "afae141588ef9407ff86ce1ae9a0f1860843c4a4";
+          sha256 = "0fx18m688wfflbzwv8h3051439fwql69v1ip5q6xn958rdq4pi3x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/uzumaki";
+          sha256 = "1fvhzz2qpyc819rjvzyf42jmb70hlg7a9ybqwi81w7rydpabg61q";
+          name = "uzumaki";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/uzumaki";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vagrant = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vagrant";
+        version = "20141125.2159";
+        src = fetchFromGitHub {
+          owner = "ottbot";
+          repo = "vagrant.el";
+          rev = "dabf69b7146f8a035bba15285b1fafc1e9ef4b3c";
+          sha256 = "04r73s3fhvdcryv0l57awkpg1hi3kg6zcqxbxb03jc89h0f9vdlh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vagrant";
+          sha256 = "0g6sqzsx3lixcn09fkxhhcfp45qnqgf1ms0l7nkzyljavb7151cf";
+          name = "vagrant";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/vagrant";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vagrant-tramp = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vagrant-tramp";
+        version = "20151018.1723";
+        src = fetchFromGitHub {
+          owner = "dougm";
+          repo = "vagrant-tramp";
+          rev = "20413671c9db8fd5a4b02ea0ff495820f2480e5e";
+          sha256 = "0v1a1lsrs9zlg9y6mhdlrg3nrdaba54ndkfmvsn7nw46asinganv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vagrant-tramp";
+          sha256 = "0ij7k27zj22sl7inx141l4dg0ymywnvyabjvaqzc0xjdj0cky5c5";
+          name = "vagrant-tramp";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/vagrant-tramp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vala-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vala-mode";
+        version = "20150324.1725";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "vala-mode";
+          rev = "fb2871a4492d75d03d72e60474919ab89adb267b";
+          sha256 = "10vs4d8csww781j1ps3f6dczy5zzza36z7a8zqk40fg4x57ikw44";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vala-mode";
+          sha256 = "164dhlsiflhpdymk3q5x0bv8gpbwfp34lnkhm2x90kdakfzqf91p";
+          name = "vala-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/vala-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vala-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "vala-snippets";
+        version = "20150428.2252";
+        src = fetchFromGitHub {
+          owner = "gopar";
+          repo = "vala-snippets";
+          rev = "671439501060449bd100b9fffd524a86064fbfbb";
+          sha256 = "0iscaz8lm4fk6w13f68ysqk8ppng2wj9fkkkq1rfqz77ws66f8nq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vala-snippets";
+          sha256 = "14hmmic0px3z38dm2dg0kis6cz1p3p1hj7xaqnqjmv02dkx2mmcy";
+          name = "vala-snippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/vala-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vbasense = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
+    melpaBuild {
+        pname = "vbasense";
+        version = "20140221.1753";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "emacs-vbasense";
+          rev = "8c61a492d7c15218ae1a96e2aebfe6f78bfff6db";
+          sha256 = "19j5q2f6pybvjq3ryjcyihzlw348hqyjhfcy3qflry6w786dqcgn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vbasense";
+          sha256 = "1440q2bi4arpl5lbqh7zscg7v3884clqx54p2fdfcfkz47ky4z9n";
+          name = "vbasense";
+        };
+        packageRequires = [ auto-complete log4e yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/vbasense";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vc-auto-commit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vc-auto-commit";
+        version = "20160108.415";
+        src = fetchFromGitHub {
+          owner = "thisirs";
+          repo = "vc-auto-commit";
+          rev = "9e60dd775df9771185c8ff79fa0ce7f7cfb90c17";
+          sha256 = "09h7yg44hbxv3pyazfypkvk8j3drlwz0zn8x1wj0kbsviksl1wxk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vc-auto-commit";
+          sha256 = "1xpp7vbld3jgcr249m5h7il919kfg7d5ap3zs64i27axzdhv26zk";
+          name = "vc-auto-commit";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/vc-auto-commit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vc-check-status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vc-check-status";
+        version = "20160108.416";
+        src = fetchFromGitHub {
+          owner = "thisirs";
+          repo = "vc-check-status";
+          rev = "7c2e8a4e26d16c50343677fd769fc9d9d9778920";
+          sha256 = "0icc4kqfpimxlja4jgcy9gjj4myc8y84vbvacyf79lxixygpaxi1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vc-check-status";
+          sha256 = "1kwnxa0ndfj8b211xy5d47sxkwmsay0kk8q7azfm5ag5dkg56zgi";
+          name = "vc-check-status";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/vc-check-status";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vc-osc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vc-osc";
+        version = "20120910.411";
+        src = fetchFromGitHub {
+          owner = "aspiers";
+          repo = "vc-osc";
+          rev = "fb01a35107be50ebb126c3573e0374e5e7d78331";
+          sha256 = "0whzfzg0m03wbmqsxml8hislnbfvawcniq83hj66lbrnbivxsqj4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vc-osc";
+          sha256 = "0rp33945xk5d986brganqnn55psmlkj6glbimxakhgv9a1r85sxz";
+          name = "vc-osc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/vc-osc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vcl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vcl-mode";
+        version = "20151213.1323";
+        src = fetchFromGitHub {
+          owner = "ssm";
+          repo = "vcl-mode";
+          rev = "9f315654ec2ab13e5a14b752cac57dc832bef893";
+          sha256 = "1jfis26lmghl30ydzq1xdkrrj3d85q7g44ns6kmfg119ccapllbj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vcl-mode";
+          sha256 = "1h0a1briinp9ka7ga3ipdhyf7yfinwvf7babv36myi720900wcq5";
+          name = "vcl-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/vcl-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vcomp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vcomp";
+        version = "20140906.1708";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "vcomp";
+          rev = "092ef48a78e950c0576269d889be6caf9f6e61c5";
+          sha256 = "0fzz26c1pdaz3i58ndhzd2520mhny487daqs21yajxi9x2m00zrl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vcomp";
+          sha256 = "02cj2nlyxvgvl2rjfgacljvcsnfm9crmmkhcm2pznj9xw10y8pq0";
+          name = "vcomp";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/vcomp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vdirel = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-vcard, seq }:
+    melpaBuild {
+        pname = "vdirel";
+        version = "20151216.55";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "vdirel";
+          rev = "aab19692e2c2084a0d5b554a96a64a2e3e2a3d09";
+          sha256 = "034475m2d2vlrlc2l88gdx0ga3krsdh08wkjxwnbb2dfyz3p8r9v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vdirel";
+          sha256 = "11cc7bw7x5h3bwnlsjyhw6k5fh2fk7wffarrcny562v4cmr013cj";
+          name = "vdirel";
+        };
+        packageRequires = [ emacs helm org-vcard seq ];
+        meta = {
+          homepage = "http://melpa.org/#/vdirel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vector-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vector-utils";
+        version = "20140508.1541";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "vector-utils";
+          rev = "c38ca1c6a23b2b51a6ac36c2c64e50e21cbe9d21";
+          sha256 = "1wa03gb98x650q798aqshm43kh6gfxaz1rlyrmvka5dxgf48whmf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vector-utils";
+          sha256 = "07armr23pq5pd47lqhir6a59r86c84zikbc51d8vfcaw8y71yr5n";
+          name = "vector-utils";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/vector-utils";
+          license = lib.licenses.free;
+        };
+      }) {};
+    verify-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, url ? null }:
+    melpaBuild {
+        pname = "verify-url";
+        version = "20151227.652";
+        src = fetchFromGitHub {
+          owner = "lujun9972";
+          repo = "verify-url";
+          rev = "67a8c27ab331859ca5c1b4d757440a8d7a070696";
+          sha256 = "199pab06cwym59110z3kcgikmp8m3y81bd3slr0n3ky40mh5rbh3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/verify-url";
+          sha256 = "1gd83rb1q0kywchd0345p5axqj1sv4f5kadympx5pbp4n5p1dqb2";
+          name = "verify-url";
+        };
+        packageRequires = [ cl-lib url ];
+        meta = {
+          homepage = "http://melpa.org/#/verify-url";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vertica = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sql ? null }:
+    melpaBuild {
+        pname = "vertica";
+        version = "20131217.911";
+        src = fetchFromGitHub {
+          owner = "r0man";
+          repo = "vertica-el";
+          rev = "3c9647b425c5c13c30bf0cba483646af18196588";
+          sha256 = "1mp71axs3vdrdwlhgywfldvnr6a1g2qbxiywmpfmcv59n5n58p1j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vertica";
+          sha256 = "1ljjk6zrbr2k0s0iaqd9iq3j45cavijcx0rqdidliswnfllav4ng";
+          name = "vertica";
+        };
+        packageRequires = [ sql ];
+        meta = {
+          homepage = "http://melpa.org/#/vertica";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vertigo = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vertigo";
+        version = "20151110.2213";
+        src = fetchFromGitHub {
+          owner = "noctuid";
+          repo = "vertigo.el";
+          rev = "fecc566e9039408303f9b1c979624d546152b7df";
+          sha256 = "0v884gbqq5vrx5gwg9dqn97kaqgnzhrqv8kam8dy9g7hx4fm6b2l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vertigo";
+          sha256 = "0x0wy1z601sk1x96bl2xx18qm4avd77iybq1a3ss8x8ykwqlgf83";
+          name = "vertigo";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/vertigo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, lib, melpaBuild, outshine }:
+    melpaBuild {
+        pname = "vhdl-tools";
+        version = "20160114.449";
+        src = fetchFromGitHub {
+          owner = "csantosb";
+          repo = "vhdl-tools";
+          rev = "5df894e6032abd24743b7c3cd220f0869bb46c62";
+          sha256 = "0y1m903x864qv745b8slwkbqd63gb1nz36nglh8g16gcfccjgn6j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vhdl-tools";
+          sha256 = "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw";
+          name = "vhdl-tools";
+        };
+        packageRequires = [ emacs ggtags outshine ];
+        meta = {
+          homepage = "http://melpa.org/#/vhdl-tools";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vi-tilde-fringe = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vi-tilde-fringe";
+        version = "20141027.2142";
+        src = fetchFromGitHub {
+          owner = "syl20bnr";
+          repo = "vi-tilde-fringe";
+          rev = "f1597a8d54535bb1d84b442577b2024e6f910308";
+          sha256 = "0wdm8k49zl6i6wnh7vjkswdh5m9lix56jv37xvc90inipwgs402z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vi-tilde-fringe";
+          sha256 = "0jhwv46gjwjbs1ai65nm6k15y0q4yl9m5mawgp3n4f45dh02cawp";
+          name = "vi-tilde-fringe";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/vi-tilde-fringe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    viewer = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "viewer";
+        version = "20141021.1338";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/viewer.el";
+          sha256 = "0lns0ic3zjz1km02674d9hxgnp6wlhk168wyr6h4vhpr8a71x9mb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/viewer";
+          sha256 = "0aqwkymq5f0qfgs1hmcg1jb1rd0vcnlqwiyjrjjkfff2xlbpagqf";
+          name = "viewer";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/viewer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vim-empty-lines-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vim-empty-lines-mode";
+        version = "20150110.2226";
+        src = fetchFromGitHub {
+          owner = "jmickelin";
+          repo = "vim-empty-lines-mode";
+          rev = "442a29b0ba1635a3b352c9dd1faf9ce99656d048";
+          sha256 = "09x857vbx35rpyc5x1322ajby613gva090x4vawaczk22idq65h4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vim-empty-lines-mode";
+          sha256 = "17bl1g4ais73ws596mha0l8dgckfqhx9k2v9m9k0gw7kg7dcjhnb";
+          name = "vim-empty-lines-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/vim-empty-lines-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vim-region = callPackage ({ expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vim-region";
+        version = "20140329.1124";
+        src = fetchFromGitHub {
+          owner = "ongaeshi";
+          repo = "emacs-vim-region";
+          rev = "7c4a99ce3678fee40c83ab88e8ad075d2a935fdf";
+          sha256 = "13g2hin100c8h5bd7hzhyqzj02ab9c35giyv963l7y044v7sbwig";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vim-region";
+          sha256 = "1dcnx799lpjsdnnjxqzgskkfj2nx7f4kwf0xjhbg35ny4nyn81dx";
+          name = "vim-region";
+        };
+        packageRequires = [ expand-region ];
+        meta = {
+          homepage = "http://melpa.org/#/vim-region";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vimgolf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vimgolf";
+        version = "20140814.1648";
+        src = fetchFromGitHub {
+          owner = "timvisher";
+          repo = "vimgolf";
+          rev = "289bef87963b660c0cf6ea1f648ac2440c609c88";
+          sha256 = "1i407ilhmk2qrk66ygbvizq964bdk502x7lvrzs4wxwfr5y8ciyj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vimgolf";
+          sha256 = "1hvw2pfa5a984hm6wd33bf6zz6hmlprc6qs3g789dfx91qm890vn";
+          name = "vimgolf";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/vimgolf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vimish-fold";
+        version = "20160111.302";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "vimish-fold";
+          rev = "1b0e8dc12665b40780ef069fb6e43b6e207b7bbd";
+          sha256 = "0rl9pcw1dcqpivmcrwpbsd11ym643zccp4sh5k11rmal77gb36sl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vimish-fold";
+          sha256 = "017by9w53d8pqlsazfycmhdv16yylks308p5vxp1rcw2qacpc5m3";
+          name = "vimish-fold";
+        };
+        packageRequires = [ cl-lib emacs f ];
+        meta = {
+          homepage = "http://melpa.org/#/vimish-fold";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vimrc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vimrc-mode";
+        version = "20150607.1113";
+        src = fetchFromGitHub {
+          owner = "mcandre";
+          repo = "vimrc-mode";
+          rev = "d4c7d41091eb282e617c973f5b1fc29c69dc9a28";
+          sha256 = "000fs2h5zcv8aq8an16r6zwwf9x1qnfs7xxn39iahiwfzvnljqp0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vimrc-mode";
+          sha256 = "06hisgsn0czvzbq8m4dz86h4q75j54a0gxkg5shnr8s654d450bp";
+          name = "vimrc-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/vimrc-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    virtualenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "virtualenv";
+        version = "20140220.1701";
+        src = fetchFromGitHub {
+          owner = "aculich";
+          repo = "virtualenv.el";
+          rev = "276c0f4d6493b402dc4d22ecdf17b2b072e911b3";
+          sha256 = "0rd7hyv66278dj32yva5q9z1749y84c6fwl2iqrns512j1l4kl8q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/virtualenv";
+          sha256 = "1djqzzlbwsp9xyjqjbjwdck73wzikbpq19irzamybk90nc98wirl";
+          name = "virtualenv";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/virtualenv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    virtualenvwrapper = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "virtualenvwrapper";
+        version = "20151127.821";
+        src = fetchFromGitHub {
+          owner = "porterjamesj";
+          repo = "virtualenvwrapper.el";
+          rev = "f95094dc7a6e6c0aa6f80fd897dbf380382f35f2";
+          sha256 = "1a0x4dsyavqcl7xibn3g90fxvh1fnb6k0mpjm5mjvzc168p939kc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/virtualenvwrapper";
+          sha256 = "0rn5vwncx8z69xp8hspr06nzkf28l9flchpb2936c2nalmhx6m8i";
+          name = "virtualenvwrapper";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/virtualenvwrapper";
+          license = lib.licenses.free;
+        };
+      }) {};
+    visible-mark = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "visible-mark";
+        version = "20150623.2350";
+        src = fetchFromGitLab {
+          owner = "iankelling";
+          repo = "visible-mark";
+          rev = "c1852e13b6b61982738b56977a452ec9026faf1b";
+          sha256 = "15zdbvv6c114mv6hdq375l7ax70sss06p9d7m86hgssc3kiv9vsv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/visible-mark";
+          sha256 = "1rp0gnz28m1drwb1hhsf0mwxzdppdi88hscf788qw8cw65gckv80";
+          name = "visible-mark";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/visible-mark";
+          license = lib.licenses.free;
+        };
+      }) {};
+    visual-ascii-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "visual-ascii-mode";
+        version = "20150129.446";
+        src = fetchFromGitHub {
+          owner = "Dewdrops";
+          repo = "visual-ascii-mode";
+          rev = "99285a099a17472ddd9f1b4f74e9d092dd8c5947";
+          sha256 = "1cv8mf3l92a9p8qmkfiphk3r81f2ihg2gyw2r4jbbd5ppwbxkl0n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/visual-ascii-mode";
+          sha256 = "1h0143h39dq61afswlzlgpknk0gv574x91ar6klqmnaf1snab59g";
+          name = "visual-ascii-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/visual-ascii-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    visual-fill-column = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "visual-fill-column";
+        version = "20151121.1751";
+        src = fetchFromGitHub {
+          owner = "joostkremers";
+          repo = "visual-fill-column";
+          rev = "043485d16a645c8c6df5d82bc77b8fc155a818aa";
+          sha256 = "126qm63ik1n1agvcp4mgk1gr7dnnyjif8zbw0l336q74d5cy6h6w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/visual-fill-column";
+          sha256 = "19y0pwaybjal2rc7migdbnafpi4dfbxvrzgfqr8dlvd9q68v08y5";
+          name = "visual-fill-column";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/visual-fill-column";
+          license = lib.licenses.free;
+        };
+      }) {};
+    visual-regexp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "visual-regexp";
+        version = "20151206.719";
+        src = fetchFromGitHub {
+          owner = "benma";
+          repo = "visual-regexp.el";
+          rev = "58566c09e593dda9c3e3a348310a9bdc42dcb3d8";
+          sha256 = "04wds01yzhia508852gm18rp7dkg0838j0w8cr1l1qmc8p0jjsz9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/visual-regexp";
+          sha256 = "16bdqq2j7pnjq3j6qa4rhxzidqdhyg80c7nazd93smis8rcv5d0z";
+          name = "visual-regexp";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/visual-regexp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    visual-regexp-steroids = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, visual-regexp }:
+    melpaBuild {
+        pname = "visual-regexp-steroids";
+        version = "20150411.616";
+        src = fetchFromGitHub {
+          owner = "benma";
+          repo = "visual-regexp-steroids.el";
+          rev = "2a50710dea5be872b31ea56f74b4cd57d6e61461";
+          sha256 = "03jggsnz5j0c36inxqa16vrdwlzn3wrniyl2i9b8c5bx7az7210m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/visual-regexp-steroids";
+          sha256 = "1xkrzyyll8wmb67m75lfm9k8qcm068km8r1k8hcsadpkd01bx1lr";
+          name = "visual-regexp-steroids";
+        };
+        packageRequires = [ visual-regexp ];
+        meta = {
+          homepage = "http://melpa.org/#/visual-regexp-steroids";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vkill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vkill";
+        version = "20091203.1222";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "vkill";
+          rev = "8ffe640ed03ddcc23db1c74c76d1acbf25250ad9";
+          sha256 = "0hb845pnh2yska6alca8hbbxh65x7g81pr7852h8fddm0qd1agkd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vkill";
+          sha256 = "09siqsip6d2h3jrxbdbhylkqm42dx3d2dqlkkdw3a81c7ga9lpwm";
+          name = "vkill";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/vkill";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vlf";
+        version = "20150101.918";
+        src = fetchFromGitHub {
+          owner = "m00natic";
+          repo = "vlfi";
+          rev = "4eaf763cadac62d7a74f7b2d2436d7793c8f7b43";
+          sha256 = "0vl0hwxzzvgna8sysf517qq08fi1zsff3dmcgwvsgzhc47sq8mng";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vlf";
+          sha256 = "1ipkv5kmda0l39xwbf7ns9p0mx3kb781mxsm9vmbkhr5x577s2j8";
+          name = "vlf";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/vlf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vline = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "vline";
+        version = "20120108.645";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/vline.el";
+          sha256 = "1ys6928fgk8mswa4gv10cxggir8acck27g78cw1z3pdz5gakbgnj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vline";
+          sha256 = "0p59xhyrv7fmcn3qi51sp8v9v2y71ray2s756zbhzgzg63h3nbjp";
+          name = "vline";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/vline";
+          license = lib.licenses.free;
+        };
+      }) {};
+    voca-builder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "voca-builder";
+        version = "20150625.1333";
+        src = fetchFromGitHub {
+          owner = "yitang";
+          repo = "voca-builder";
+          rev = "cd74c13e005e33ab125d43233b1267a8819b0abb";
+          sha256 = "183pvfp5nnqpgdmfxm84qrnid0lijgk79l5lhwzmnznzkrb7bgxw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/voca-builder";
+          sha256 = "0mbw87mpbb8rw7xzhmg6yjla2c80x9820kw4q00x00ny5rbhm76y";
+          name = "voca-builder";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/voca-builder";
+          license = lib.licenses.free;
+        };
+      }) {};
+    volatile-highlights = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "volatile-highlights";
+        version = "20141005.40";
+        src = fetchFromGitHub {
+          owner = "k-talo";
+          repo = "volatile-highlights.el";
+          rev = "fb2abc2d4d4051a9a6b7c8de2fe7564161f01f24";
+          sha256 = "1v0chqj5jir4685jd8ahw86g9zdmi6xd05wmzhyw20rbk924fcqf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/volatile-highlights";
+          sha256 = "1r6in919aqdziv6bgzp4k7jqa87bd287pacq615sd5m1nzva1a4d";
+          name = "volatile-highlights";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/volatile-highlights";
+          license = lib.licenses.free;
+        };
+      }) {};
+    volume = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "volume";
+        version = "20150718.1509";
+        src = fetchFromGitHub {
+          owner = "dbrock";
+          repo = "volume-el";
+          rev = "ecc1550b3c8b501d37e0f0116b54b535d15f90f6";
+          sha256 = "0ymibjq6iwab5ia1fglhz4gm5cnbi792018fmrabcqkisj2zsjb7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/volume";
+          sha256 = "1r01v453bpyh561j8ja36609hy60gc30arvmz4z3c1cybhv8sk1i";
+          name = "volume";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/volume";
+          license = lib.licenses.free;
+        };
+      }) {};
+    w32-browser = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "w32-browser";
+        version = "20151231.1820";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/w32-browser.el";
+          sha256 = "0vb5ss30mz0kqq8cscjckw647vqn6xprp2sfjcbpg2fx59z4agma";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/w32-browser";
+          sha256 = "14vc2cipwlwwc0b5ld4x0zvydkg8nbjmp0z2x6ca0nmxw8sfsnc6";
+          name = "w32-browser";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/w32-browser";
+          license = lib.licenses.free;
+        };
+      }) {};
+    w32browser-dlgopen = callPackage ({ fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "w32browser-dlgopen";
+        version = "20151231.1821";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/w32browser-dlgopen.el";
+          sha256 = "0nyara81bnd0rvgyljqrrbvjvndkngdc7qzf6scl5iz3vlglfgy7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/w32browser-dlgopen";
+          sha256 = "0dnvsnahnbnvjlhfmb0q6agzikv9d42fbnfrwsz6hni92937gz39";
+          name = "w32browser-dlgopen";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/w32browser-dlgopen";
+          license = lib.licenses.free;
+        };
+      }) {};
+    w3m = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "w3m";
+        version = "20121224.1947";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "w3m";
+          rev = "5986b51c7c77500fee3349fb0b3f4764d3fc727b";
+          sha256 = "1lgvdaghzj1fzh8p6ans0f62zg1bfp086icbsqmyvbgpgcxia9cs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/w3m";
+          sha256 = "0vh882b44vxnij3l01sig87c1jmbymgirf6s98mvag1p9rm8agxw";
+          name = "w3m";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/w3m";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wacspace = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wacspace";
+        version = "20140827.32";
+        src = fetchFromGitHub {
+          owner = "shosti";
+          repo = "wacspace.el";
+          rev = "4a11168d58c9c129cfcd04a1c9581962565eca4a";
+          sha256 = "0nvlni3iy2sq76z8d4kj5492m0w7qv96shjqkynvlj0avf528hv4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wacspace";
+          sha256 = "1xy0mprvyi37zmgj1yrlh5ni08j47lpag1jm3a76cgghgmlfjxrl";
+          name = "wacspace";
+        };
+        packageRequires = [ cl-lib dash ];
+        meta = {
+          homepage = "http://melpa.org/#/wacspace";
+          license = lib.licenses.free;
+        };
+      }) {};
+    waher-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "waher-theme";
+        version = "20141115.630";
+        src = fetchFromGitHub {
+          owner = "emacsfodder";
+          repo = "emacs-waher-theme";
+          rev = "60d31519fcfd8e797723d47961b255ae2f2e2c0a";
+          sha256 = "0w59ix8cbbcyhh882c8vkrbh84i8d03h9w7dchr3qy233b8wcxlc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/waher-theme";
+          sha256 = "091kipkb6z6x9ic4chprim9rvnmx4yj4419ijmvpn70w69aspnb5";
+          name = "waher-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/waher-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wakatime-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wakatime-mode";
+        version = "20151117.1830";
+        src = fetchFromGitHub {
+          owner = "wakatime";
+          repo = "wakatime-mode";
+          rev = "883f969c1502994b55912c6ade7155220e3c2cea";
+          sha256 = "1bcdvk5bg5yi0qq0wd3w9wl38s0brrafz52bzsracj3wffswjg1n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wakatime-mode";
+          sha256 = "1rhy2bwkqlha4bj3zmb0iassiglch7yb2kbas0bbpl3d0hdki2i8";
+          name = "wakatime-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/wakatime-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wand = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wand";
+        version = "20141104.1845";
+        src = fetchFromGitHub {
+          owner = "cmpitg";
+          repo = "wand";
+          rev = "da6284ab75c3afa1275420faa9934037052e2967";
+          sha256 = "09gqsssc2sk0vwfg0h4zxq9a779sdjdgvxsw7p6n2k0g4wk0phri";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wand";
+          sha256 = "052zq5dp800hynd9fb6c645kjb9rp3bpkz41ifazjnx4h4864r0l";
+          name = "wand";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/wand";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, tabulated-list ? null }:
+    melpaBuild {
+        pname = "wandbox";
+        version = "20150905.1024";
+        src = fetchFromGitHub {
+          owner = "kosh04";
+          repo = "emacs-wandbox";
+          rev = "cea03dec67e90a4c87eb9b6d69d1b3c68af541d0";
+          sha256 = "00qzgabanmy4nkpnbc1m45j86k29plyyn408n1l0j8505fy9l7ca";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wandbox";
+          sha256 = "0myyln82nx462bj79acvqxwvmblxild4vbygcrzw5chcwy6crvlz";
+          name = "wandbox";
+        };
+        packageRequires = [ emacs json tabulated-list ];
+        meta = {
+          homepage = "http://melpa.org/#/wandbox";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }:
+    melpaBuild {
+        pname = "wanderlust";
+        version = "20160116.733";
+        src = fetchFromGitHub {
+          owner = "wanderlust";
+          repo = "wanderlust";
+          rev = "5dba92992d54ae5403b19b7143ab3f7770cacec8";
+          sha256 = "0q1a2ihrz7g08sqv55dx9ki3qb75rrg2dnzdy7kyv60cdz4gcz33";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wanderlust";
+          sha256 = "0lq7fvqc0isv49lcm7ql6prc3hpcj5cx4kf8f4gcnfv5k8159cq9";
+          name = "wanderlust";
+        };
+        packageRequires = [ semi ];
+        meta = {
+          homepage = "http://melpa.org/#/wanderlust";
+          license = lib.licenses.free;
+        };
+      }) {};
+    warm-night-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "warm-night-theme";
+        version = "20150607.941";
+        src = fetchFromGitHub {
+          owner = "mswift42";
+          repo = "warm-night-theme";
+          rev = "67cc2a1591c0627e6310cdfe8ca7c8d4565b9c16";
+          sha256 = "1x472s5qr6wvla7nj5i9mas8z9qhkj4zj5qghfwn5chb9igvfkif";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/warm-night-theme";
+          sha256 = "1nrjkrr64rry6fjya22b0lcs0f8a2ijvr87192z311y9mw5rvb29";
+          name = "warm-night-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/warm-night-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    watch-buffer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "watch-buffer";
+        version = "20120331.1544";
+        src = fetchFromGitHub {
+          owner = "mjsteger";
+          repo = "watch-buffer";
+          rev = "761fd7252e6d7bf5148283c2a7ee935f087d9427";
+          sha256 = "0i84ndnxma8s07kf5ixqyhv5f89mzc4iymgazj5inmxhvbc7s7r2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/watch-buffer";
+          sha256 = "18sxgihmqmkrbgs66qgnrsjqbp90l93531hns31fbnif10bkx2j5";
+          name = "watch-buffer";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/watch-buffer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wavefront-obj-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wavefront-obj-mode";
+        version = "20150501.1316";
+        src = fetchFromGitHub {
+          owner = "abend";
+          repo = "wavefront-obj-mode";
+          rev = "75eedad052848e82cdd94064764956b906e6d6b2";
+          sha256 = "0zw8z2r82986likz0b0zy37bywicrvz9dizzw9p52gs1lx0is1fy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wavefront-obj-mode";
+          sha256 = "0qqismh6g2fvi45q2q52lq0n9nrh95wgamlsy5j4rx4syfgzxbrk";
+          name = "wavefront-obj-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/wavefront-obj-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wc-goal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wc-goal-mode";
+        version = "20140829.859";
+        src = fetchFromGitHub {
+          owner = "bnbeckwith";
+          repo = "wc-goal-mode";
+          rev = "bf21ab9c5a449bcc20dd207a4915dcec218d2699";
+          sha256 = "0p7j4hvcxfyjf0na9s3xv29dvmwq82s56lincfasd0ydcpz4fbwc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wc-goal-mode";
+          sha256 = "0l3gh96njjldp7n13jn1zjrp17h7ivjak102j6wwspgg6v2h5419";
+          name = "wc-goal-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/wc-goal-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wc-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "wc-mode";
+        version = "20150116.2302";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/wc-mode.el";
+          sha256 = "15wz0c0rsn02zl6yr8mpwzy2hvp2146krhdbjpq63l75w4i98w4d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wc-mode";
+          sha256 = "0n9hc22rp18dxx33l2l1xla78m5zjybgh3mmsp91fbdiq92b446s";
+          name = "wc-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/wc-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wcheck-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wcheck-mode";
+        version = "20160105.100";
+        src = fetchFromGitHub {
+          owner = "tlikonen";
+          repo = "wcheck-mode";
+          rev = "53555c6faf22c193eb61c3b56be613a906c8b56a";
+          sha256 = "0hsv391lvdb6hqjbvrsn5id6vgdhjsndsr3xnivykbi999ng9mrs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wcheck-mode";
+          sha256 = "0cmdvhgax6r5svn3wkwll4j271qj70g8182c58riwnkhiajxmn3k";
+          name = "wcheck-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/wcheck-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    weather-metno = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "weather-metno";
+        version = "20150831.2007";
+        src = fetchFromGitHub {
+          owner = "ruediger";
+          repo = "weather-metno-el";
+          rev = "bfc7137095e0ee71aad70ac46f2af677f3c051b6";
+          sha256 = "05gfc67724b0mwg8kvk3dsazx3dld50b9xjq8h1nc6jvdz3zxb9z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/weather-metno";
+          sha256 = "0h7p4l8y75h27pgk45f0mk3gjd43jk8q97gjf85a9b0afd63d3f6";
+          name = "weather-metno";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/weather-metno";
+          license = lib.licenses.free;
+        };
+      }) {};
+    web = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "web";
+        version = "20141231.1401";
+        src = fetchFromGitHub {
+          owner = "nicferrier";
+          repo = "emacs-web";
+          rev = "483188dac4bc6b409b985c9dae45f3324a425efd";
+          sha256 = "03xcadplw1hg5hxw6bfrhw5xkkxk3i4105f114c6m3d2525jq4y5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/web";
+          sha256 = "0ynnmqw0vsf7wyhp9m5a05dfb19vkj8dnj5glhjdzjvg30dhjp3a";
+          name = "web";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/web";
+          license = lib.licenses.free;
+        };
+      }) {};
+    web-beautify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "web-beautify";
+        version = "20131118.426";
+        src = fetchFromGitHub {
+          owner = "yasuyk";
+          repo = "web-beautify";
+          rev = "be2b9a7f510e1719396ebeab9135bc64f0785b78";
+          sha256 = "0ky2rg16xrbnsvqc6gcfhgi69fdzbx6jlsq73n8hr0n4562czhzl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/web-beautify";
+          sha256 = "06ky2svhca8hjgmvxrg3h6ya7prl72q1r88x967yc6b0qq3r7g0f";
+          name = "web-beautify";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/web-beautify";
+          license = lib.licenses.free;
+        };
+      }) {};
+    web-completion-data = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "web-completion-data";
+        version = "20150623.533";
+        src = fetchFromGitHub {
+          owner = "osv";
+          repo = "web-completion-data";
+          rev = "81482f9ff17e13906bdbd9db6bc4e1cbdc0e1870";
+          sha256 = "12j8ql9v9mrg8hlsminpm3ydcacc2fbdjsfw7l604sc3qvgza1lm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/web-completion-data";
+          sha256 = "1zzdmhyn6bjaidk808s4pdk25a5rn4287949ps5vbpyniaf6gny9";
+          name = "web-completion-data";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/web-completion-data";
+          license = lib.licenses.free;
+        };
+      }) {};
+    web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "web-mode";
+        version = "20160114.1506";
+        src = fetchFromGitHub {
+          owner = "fxbois";
+          repo = "web-mode";
+          rev = "867ea7c5d7f3d9bb41127dac364c0fb009adc7bf";
+          sha256 = "0zpvhiazbsc87ai6gjlvbj6bd9hmvv4mf1q691jr4258mma1sssm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/web-mode";
+          sha256 = "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i";
+          name = "web-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/web-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    web-server = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "web-server";
+        version = "20140905.1906";
+        src = fetchFromGitHub {
+          owner = "eschulte";
+          repo = "emacs-web-server";
+          rev = "469cd3bc117bfb8da0c03a2a2fb185e80c81d068";
+          sha256 = "0mbhyk7sgisx0l0xiz2xgy4jfbgwazlnxjvajsh4nysyig5rys05";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/web-server";
+          sha256 = "1f0iyvwq1kq3zfxx2v596cmah7jfk2a04g2rjllbgxxnzwms29z3";
+          name = "web-server";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/web-server";
+          license = lib.licenses.free;
+        };
+      }) {};
+    weblogger = callPackage ({ fetchbzr, fetchurl, lib, melpaBuild, xml-rpc }:
+    melpaBuild {
+        pname = "weblogger";
+        version = "20110926.1118";
+        src = fetchbzr {
+          url = "lp:weblogger-el";
+          rev = "38";
+          sha256 = "1z7ld9d0crwdh778fyaapx75vpnlnslsh9nf07ywkylhz4w68yyv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/weblogger";
+          sha256 = "189zs1321rybgi4zihps7d2jll5z13726jsg5mi7iycg85nkv2fk";
+          name = "weblogger";
+        };
+        packageRequires = [ xml-rpc ];
+        meta = {
+          homepage = "http://melpa.org/#/weblogger";
+          license = lib.licenses.free;
+        };
+      }) {};
+    websocket = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "websocket";
+        version = "20150719.1248";
+        src = fetchFromGitHub {
+          owner = "ahyatt";
+          repo = "emacs-websocket";
+          rev = "49a93b2218c6044377d81099ac916877f42b722e";
+          sha256 = "1ibzl8rp24py5mq42cxvy68pc7n18pfqpdfngxc8hxqdh5q3a5f1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/websocket";
+          sha256 = "1v8jlpahp30lihz7mdznwl6pyrbsdbqznli2wb5gfblnlxil04lg";
+          name = "websocket";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/websocket";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wedge-ws = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wedge-ws";
+        version = "20140714.1649";
+        src = fetchFromGitHub {
+          owner = "aes";
+          repo = "wedge-ws";
+          rev = "4669115f02d9c6fee067cc5369bb38c0f9db88b2";
+          sha256 = "19hgb5knqqc4rb8yl8s604xql8ar6m9r4d379cfakn15jvwqnl98";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wedge-ws";
+          sha256 = "07i2dr807np4fwq3ryxlw11vbc1sik1iv7x5740q258jyc9zfgll";
+          name = "wedge-ws";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/wedge-ws";
+          license = lib.licenses.free;
+        };
+      }) {};
+    weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }:
+    melpaBuild {
+        pname = "weechat";
+        version = "20151206.647";
+        src = fetchFromGitHub {
+          owner = "the-kenny";
+          repo = "weechat.el";
+          rev = "a191b4c52e2cca33acfdd82145da42fb2798b185";
+          sha256 = "03xsh3fc7if6rkdp2s8lmrzpqm3pjakgqi3faap44y9i84q6mc6k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/weechat";
+          sha256 = "0sxrms5024bi4irv8x8s8j1zcyd62cpqm0zv4dgpm65wnpc7xc46";
+          name = "weechat";
+        };
+        packageRequires = [ cl-lib emacs s tracking ];
+        meta = {
+          homepage = "http://melpa.org/#/weechat";
+          license = lib.licenses.free;
+        };
+      }) {};
+    weibo = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "weibo";
+        version = "20150307.1642";
+        src = fetchFromGitHub {
+          owner = "austin-----";
+          repo = "weibo.emacs";
+          rev = "a8abb50b7602fe15fe2bc6400ac29780e956b390";
+          sha256 = "0hc5iyjpcik996ns84akrl28scndmn0gd1zfdf1nnqq6n2m5zvgh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/weibo";
+          sha256 = "1ndgfqqb0gvy8p2fisi57s9bsa2nrnv80smg78m89i4cwagbz6yd";
+          name = "weibo";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/weibo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wgrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wgrep";
+        version = "20141016.1856";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-wgrep";
+          rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c";
+          sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wgrep";
+          sha256 = "09xs420lvbsmz5z28rf6f1iwa0ixkk0w24qbj6zhl9hidh4mv9y4";
+          name = "wgrep";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/wgrep";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wgrep-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }:
+    melpaBuild {
+        pname = "wgrep-ack";
+        version = "20141012.511";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-wgrep";
+          rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c";
+          sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wgrep-ack";
+          sha256 = "03l1a681cwnn06m77xg0a547892gy8mh415v9rg3h6lkxwcld8wh";
+          name = "wgrep-ack";
+        };
+        packageRequires = [ wgrep ];
+        meta = {
+          homepage = "http://melpa.org/#/wgrep-ack";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wgrep-ag = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }:
+    melpaBuild {
+        pname = "wgrep-ag";
+        version = "20141012.511";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-wgrep";
+          rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c";
+          sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wgrep-ag";
+          sha256 = "1b2mj06kws29ha7g16l5d1s3p3nwyw8rprbpaiijdk9nxqcm0a8a";
+          name = "wgrep-ag";
+        };
+        packageRequires = [ wgrep ];
+        meta = {
+          homepage = "http://melpa.org/#/wgrep-ag";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wgrep-helm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }:
+    melpaBuild {
+        pname = "wgrep-helm";
+        version = "20140528.1627";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-wgrep";
+          rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c";
+          sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wgrep-helm";
+          sha256 = "1hh7isc9xifkrdfw88jw0z0xmfazrbcis6d355bcaxlnjy6fzm8b";
+          name = "wgrep-helm";
+        };
+        packageRequires = [ wgrep ];
+        meta = {
+          homepage = "http://melpa.org/#/wgrep-helm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wgrep-pt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, wgrep }:
+    melpaBuild {
+        pname = "wgrep-pt";
+        version = "20140510.1731";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-wgrep";
+          rev = "7ef26c51feaef8a5ec0929737130ab8ba326983c";
+          sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wgrep-pt";
+          sha256 = "1gphdf85spsywj3s3ypb7dwrqh0zd70n2vrbgjqkbnfbwqjp9qbg";
+          name = "wgrep-pt";
+        };
+        packageRequires = [ wgrep ];
+        meta = {
+          homepage = "http://melpa.org/#/wgrep-pt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    what-the-commit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "what-the-commit";
+        version = "20150901.816";
+        src = fetchFromGitHub {
+          owner = "danielbarbarito";
+          repo = "what-the-commit.el";
+          rev = "868c80a1b8614bcbd2225cd0290142c72f2a7956";
+          sha256 = "04w62davpqqqvympkr52bg54c2i45p09q9bs70p9ff5jvc6i3g76";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/what-the-commit";
+          sha256 = "0nnyb6hq6r21wf1x3q41ab48b3dmcz5lyli771a59dk1gs8qpgak";
+          name = "what-the-commit";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/what-the-commit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "which-key";
+        version = "20160117.1957";
+        src = fetchFromGitHub {
+          owner = "justbur";
+          repo = "emacs-which-key";
+          rev = "f1d3d1b5e5351e5f878643496d8523fd54a96ca3";
+          sha256 = "1054q7k2v0zkxndn8f371x41dwg97fzmkvb5yc119gcc1ccdk1j1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/which-key";
+          sha256 = "0vqbhfzcv9m58w41zdhpiymhgl38n15c6d7ffd99narxlkckcj59";
+          name = "which-key";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/which-key";
+          license = lib.licenses.free;
+        };
+      }) {};
+    whitaker = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "whitaker";
+        version = "20150814.622";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "whitaker";
+          rev = "eaf26ea647b729ca705b73ea70312d5ffdf89448";
+          sha256 = "1y75cylvqgn54h8yqahz4wi1qj5yhbs66i7x23jmbmah3q0rycab";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/whitaker";
+          sha256 = "17fnvb3jh6fi4wddn5qnp6i6ndidg8jf9ac69q9j032c2msr07nj";
+          name = "whitaker";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/whitaker";
+          license = lib.licenses.free;
+        };
+      }) {};
+    white-sand-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "white-sand-theme";
+        version = "20151117.1048";
+        src = fetchFromGitHub {
+          owner = "mswift42";
+          repo = "white-sand-theme";
+          rev = "97621edd69267dd143760d94393db2c2558c9ea4";
+          sha256 = "0sh92g5vd518f80klvljqkjpw4ji909439dpc3sfaccf5jiwn9xn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/white-sand-theme";
+          sha256 = "19qsiic6yf7g60ygjmw7kg1i28nqpm3zja8cmdh33ny2bbkwxsz5";
+          name = "white-sand-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/white-sand-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    whitespace-cleanup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "whitespace-cleanup-mode";
+        version = "20150603.647";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "whitespace-cleanup-mode";
+          rev = "14eaf40e0e67539106d3636af440a167105be296";
+          sha256 = "15yhbyyr0ksd9ziinlylyddny2szlj35x2548awj9ijnqqgjd23r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/whitespace-cleanup-mode";
+          sha256 = "1fhdjrxxyfx4xsgfjqq9p7vhj98wmqf2r00mv8k27vdaxwsnm5p3";
+          name = "whitespace-cleanup-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/whitespace-cleanup-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    whole-line-or-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "whole-line-or-region";
+        version = "20110901.330";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "whole-line-or-region";
+          rev = "a60e022b30c2f4d3118bcaef1adb77b90e0ca941";
+          sha256 = "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/whole-line-or-region";
+          sha256 = "1vs2i4cy1zc6nj660i9h36jbfgc3kvqivjnzlq5zwlxk5hcibqa1";
+          name = "whole-line-or-region";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/whole-line-or-region";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wid-edit-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "wid-edit-plus";
+        version = "20151231.1822";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/wid-edit+.el";
+          sha256 = "18bnwwjk8jj4ns08sxhnznj0d8n1bxm2kj43r06nwyibh6ajpl7f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wid-edit+";
+          sha256 = "1wwrsk14hc0wrvy7hm94aw6zg50n2smlqwr6frwpi7yp8y394wiv";
+          name = "wid-edit-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/wid-edit+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wide-column = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wide-column";
+        version = "20120814.312";
+        src = fetchhg {
+          url = "https://code.google.com/p/phillord-emacs-packages/";
+          rev = "e14e67d6a5b7";
+          sha256 = "0pq9x73hrp7qwhms7x3dvjfh9imapglba9yd7nkyw68mc0b9wlnl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wide-column";
+          sha256 = "1r9mh7756jgf1hdnprci988z07xxh2jvh8d0c1h5rmxmldlbx8az";
+          name = "wide-column";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/wide-column";
+          license = lib.licenses.free;
+        };
+      }) {};
+    widget-mvc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "widget-mvc";
+        version = "20150101.2206";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-widget-mvc";
+          rev = "a3fd2d2abc29a1b53aeaae8b267d0718740fb783";
+          sha256 = "0036alzp66k7w3z45lj8qzh3plxv9vwcw17wibkz90mlb27vy6yz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/widget-mvc";
+          sha256 = "0njzvdlxb7z480r6dvmksgivhz7rvnil517aj86qx0jbc5mr3l2f";
+          name = "widget-mvc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/widget-mvc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wiki-nav = callPackage ({ button-lock, fetchFromGitHub, fetchurl, lib, melpaBuild, nav-flash }:
+    melpaBuild {
+        pname = "wiki-nav";
+        version = "20150223.754";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "button-lock";
+          rev = "f9082feb329432fcf2ac49a95e64bed9fda24d58";
+          sha256 = "06qjvybf65ffrcnhhbqs333lg51fawaxnva3jvdg7zbrsv4m9acl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wiki-nav";
+          sha256 = "19mabz0y3fcqsm68ijwwbbqylxgp71anc0a31zgc1blha9jivvwy";
+          name = "wiki-nav";
+        };
+        packageRequires = [ button-lock nav-flash ];
+        meta = {
+          homepage = "http://melpa.org/#/wiki-nav";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wiki-summary = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wiki-summary";
+        version = "20150408.1622";
+        src = fetchFromGitHub {
+          owner = "jozefg";
+          repo = "wiki-summary.el";
+          rev = "ed3755dd09f5f73ef78ec295fe842d08b316c8a0";
+          sha256 = "02bczc1mb1cs1aryz5pw6cmpydjmxja2zj91893cz8rnfn1r031i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wiki-summary";
+          sha256 = "1hiyi3w6rvins8hfxd96bgpihxarmv192q96sadqcwshcqi14zmw";
+          name = "wiki-summary";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/wiki-summary";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wilt = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "wilt";
+        version = "20151105.718";
+        src = fetchFromGitHub {
+          owner = "sixty-north";
+          repo = "emacs-wilt";
+          rev = "5febe367c6c3729848654358af4d17ee2987da8d";
+          sha256 = "1n45m8xn65a2lg8ff7m6hbqnp2j49n9sfyr924laljvhjbi37knd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wilt";
+          sha256 = "0nw6zr06zq60j72qfjmbqrxyz022fnisb0bsh6xmlnd1k1kqlrz6";
+          name = "wilt";
+        };
+        packageRequires = [ dash emacs s ];
+        meta = {
+          homepage = "http://melpa.org/#/wilt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wimpy-del = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "wimpy-del";
+        version = "20151231.1823";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/wimpy-del.el";
+          sha256 = "142ql6886h418f73h3wjblhnd16qvbap7mfr4g2yv4xybh88d4x2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wimpy-del";
+          sha256 = "10qw5lfq2392fr5sdz5a9bc6rvsg0j4dkrwvdhip1kqvajznw49x";
+          name = "wimpy-del";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/wimpy-del";
+          license = lib.licenses.free;
+        };
+      }) {};
+    win-switch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "win-switch";
+        version = "20150208.2111";
+        src = fetchFromGitHub {
+          owner = "genovese";
+          repo = "win-switch";
+          rev = "a0da96c23e8775a2dfdbe55ed3ec5b57f1ebb26a";
+          sha256 = "0ib20zl8l1fs69ca9rry27qz69sgf6ws1ca5nhm5llvpkjcgv53i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/win-switch";
+          sha256 = "1s6inp5kf763rngn58r02fd7n7z3dd55j6hb7s9dgvc856d5z3my";
+          name = "win-switch";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/win-switch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    windata = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "windata";
+        version = "20080412.955";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/windata.el";
+          sha256 = "0dcbnqcqw7jzwwdn0rxxlixga1zw1x3a2zbpxvd90xp7zig4f0yz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/windata";
+          sha256 = "0xq51rdanq5as6kfyi97hsqmig5g35w7xv8c96bhzyflranw7jw5";
+          name = "windata";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/windata";
+          license = lib.licenses.free;
+        };
+      }) {};
+    window-end-visible = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "window-end-visible";
+        version = "20140508.1541";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "window-end-visible";
+          rev = "525500fb2ebc08f3f9ea493972e5f2e1d79f89ef";
+          sha256 = "0g69r64gyz4p3k6n8l0i1837mszycbrp23acnp0iy0y3mg67x3pn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-end-visible";
+          sha256 = "1p78n7yysj18404cdc6vahfrzwn5pixyfnja8ch48rj4fm4jbxwq";
+          name = "window-end-visible";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/window-end-visible";
+          license = lib.licenses.free;
+        };
+      }) {};
+    window-jump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "window-jump";
+        version = "20150213.1436";
+        src = fetchFromGitHub {
+          owner = "chumpage";
+          repo = "chumpy-windows";
+          rev = "164be41b588b615864258c502583100d3ccfe13e";
+          sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-jump";
+          sha256 = "1gmqb7j5fb3q3krgx7arrln5nvyg9vcpph6wlxj6py679wfa3lwr";
+          name = "window-jump";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/window-jump";
+          license = lib.licenses.free;
+        };
+      }) {};
+    window-layout = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "window-layout";
+        version = "20150717.7";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-window-layout";
+          rev = "03ee615fc8fad5be4efec9c3febab8c851271257";
+          sha256 = "08chi9b4bap78n069aavvx3850kabk2jflrgymy4jxv08ybqikdg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-layout";
+          sha256 = "1n4a6z00lxsffirjrmbaaw432w798b9vv34qawgn1k17y9l7gb85";
+          name = "window-layout";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/window-layout";
+          license = lib.licenses.free;
+        };
+      }) {};
+    window-number = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "window-number";
+        version = "20140123.2102";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/window-number.el";
+          sha256 = "1as3qbvj6d171qp2s8ycqqi16bgqm47vfk3fbxrl9szjzaxh9nw6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-number";
+          sha256 = "1qhlsdhs40cyly87pj3f1n6ckr7z5pmhqndgay5jyxwxxdpknpap";
+          name = "window-number";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/window-number";
+          license = lib.licenses.free;
+        };
+      }) {};
+    window-numbering = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "window-numbering";
+        version = "20150228.1447";
+        src = fetchFromGitHub {
+          owner = "nschum";
+          repo = "window-numbering.el";
+          rev = "575ad203545b01e21d28fefc0d8b809d1016ea3a";
+          sha256 = "1f4c6q4larifm745fr8f3w8sxs1sbs77vna29rw120jz8rnlz0jy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-numbering";
+          sha256 = "0x3n0ni16q69lfpyjz61spqghmhvc3cwa4aj80ihii3pk80f769x";
+          name = "window-numbering";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/window-numbering";
+          license = lib.licenses.free;
+        };
+      }) {};
+    window-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "window-plus";
+        version = "20151231.1824";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/window+.el";
+          sha256 = "0mqdcgk6mdxgl9if7jzgg16zqdwnsp8icrdhnygphw5m9h2dqcnm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window+";
+          sha256 = "0fhzb0ay9g9qgcaxpb2qaw15dh0lfmv3x4akyipi3zx11446d06j";
+          name = "window-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/window+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }:
+    melpaBuild {
+        pname = "window-purpose";
+        version = "20151114.440";
+        src = fetchFromGitHub {
+          owner = "bmag";
+          repo = "emacs-purpose";
+          rev = "d8b9399c8bbdb6e843cd62b7adb658fea6cf7e75";
+          sha256 = "1hfn3x08h426kw0m1qyrjy8kp6nm56d1h5zlfiwj22kfc560gb4v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-purpose";
+          sha256 = "1ib5ia7armghvmcw8qywcil4nxzwwakmfsp7ybawb0xr53h1w96d";
+          name = "window-purpose";
+        };
+        packageRequires = [ cl-lib emacs imenu-list let-alist ];
+        meta = {
+          homepage = "http://melpa.org/#/window-purpose";
+          license = lib.licenses.free;
+        };
+      }) {};
+    windsize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "windsize";
+        version = "20151121.740";
+        src = fetchFromGitHub {
+          owner = "grammati";
+          repo = "windsize";
+          rev = "beb6376fdf52afa6f220c89032448460faf76e7f";
+          sha256 = "0hijf56ahbc5inn7n39nj96d948c4d05n9d5ci3g3vbl5hsyb121";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/windsize";
+          sha256 = "1xhfw77168942rcn246qndii0hv0q6vkgzj67jg4mxh8n46m50m9";
+          name = "windsize";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/windsize";
+          license = lib.licenses.free;
+        };
+      }) {};
+    winpoint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "winpoint";
+        version = "20131023.1213";
+        src = fetchFromGitHub {
+          owner = "jorgenschaefer";
+          repo = "winpoint";
+          rev = "e6050093c076308184566fa1d1012423d6934773";
+          sha256 = "1qrbvidnmgg7jyasb28bc0z1x4a4ayzq5jmv38dsx0qs080s85wy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/winpoint";
+          sha256 = "10ji7xd9ipmy6c2qxljqdxgqf5sb8h7lwz43mr6ixbn7v1b7pp6w";
+          name = "winpoint";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/winpoint";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wisp-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wisp-mode";
+        version = "20150623.1234";
+        src = fetchhg {
+          url = "https://bitbucket.com/ArneBab/wisp";
+          rev = "34fc6f12d740";
+          sha256 = "0ppj8mrlc20i2syyiwvj5rp53swrm929h0ksxxlqvn3nvl9gsajd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wisp-mode";
+          sha256 = "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc";
+          name = "wisp-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/wisp-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wispjs-mode = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wispjs-mode";
+        version = "20140103.1632";
+        src = fetchFromGitHub {
+          owner = "krisajenkins";
+          repo = "wispjs-mode";
+          rev = "be094c3c3223c07b26b5d8bb8fa7aa6866369b3f";
+          sha256 = "188h1sy4mxzrkwi3zgiw108c5f71rkj5agdkf9yy9v8c1bkawm4x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wispjs-mode";
+          sha256 = "0qzm0dcvjndasnbqpkdc56f1qv66gxv8dfgfcwq5l1bp5wyx813p";
+          name = "wispjs-mode";
+        };
+        packageRequires = [ clojure-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/wispjs-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "with-editor";
+        version = "20160118.835";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "magit";
+          rev = "45b06a7b8664046fd1aecb3f07db535edd80d013";
+          sha256 = "1c6x10nm5syahn85vrgg9i6i7kzy4h7l9alahaxb71w6jwf91rsg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/with-editor";
+          sha256 = "042fa55yakdn2di4l5dilnmqpslac46wpr1zpl4xk3v3i4nn9ndv";
+          name = "with-editor";
+        };
+        packageRequires = [ async dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/with-editor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    with-namespace = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, loop, melpaBuild }:
+    melpaBuild {
+        pname = "with-namespace";
+        version = "20130407.1322";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "with-namespace.el";
+          rev = "8ac52da3a09cf46087720e30cf730d00f140cde6";
+          sha256 = "1c7g8f3jr7bb0xxprammfg433gd63in5iiiaq8rjmc94h6hdcys3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/with-namespace";
+          sha256 = "1199k1xvvv7ald6ywrh2sfpw2v42ckpcsw6mcj617bg3b5m7770i";
+          name = "with-namespace";
+        };
+        packageRequires = [ dash loop ];
+        meta = {
+          homepage = "http://melpa.org/#/with-namespace";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wn-mode";
+        version = "20151109.2352";
+        src = fetchFromGitHub {
+          owner = "luismbo";
+          repo = "wn-mode";
+          rev = "f05c3151523e529af5a0a3fa8c948b61fb369f6e";
+          sha256 = "12rfpkyjkhikjh0mihhp5h5pzbm4br68nwf8k1ja9djl77vfzv36";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wn-mode";
+          sha256 = "1qy1pkfdnm4pska4cnff9cx2c812ilymajhpmsfc9jdbvhzwrwg3";
+          name = "wn-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/wn-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wolfram-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wolfram-mode";
+        version = "20140118.957";
+        src = fetchFromGitHub {
+          owner = "kawabata";
+          repo = "wolfram-mode";
+          rev = "72cb36975816a9a7b677269e19b9ff431f597ed7";
+          sha256 = "1xna0cjgi9m87pws2h0cza67qbpdhjmdi5h4wv6v4g14nr26hi3w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wolfram-mode";
+          sha256 = "1bq95lamzz45macpklnq1kxw9ak4x4f41kx16f472dn650ff0zlf";
+          name = "wolfram-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/wolfram-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wonderland = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi }:
+    melpaBuild {
+        pname = "wonderland";
+        version = "20130912.2019";
+        src = fetchFromGitHub {
+          owner = "kurisuwhyte";
+          repo = "emacs-wonderland";
+          rev = "89d274ad694b0e748efdac23ccd60b7d8b73d7c6";
+          sha256 = "0hacc8ha5w44cgwkipa3nwh1q5gdrcxhjkmw2gnvb1l01crgnack";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wonderland";
+          sha256 = "1b4p49mbzqffm2b2y8sbbi56vnkxap2jscsmla9l6l8brybqjppi";
+          name = "wonderland";
+        };
+        packageRequires = [ dash dash-functional emacs multi ];
+        meta = {
+          homepage = "http://melpa.org/#/wonderland";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wordnut = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wordnut";
+        version = "20151002.1657";
+        src = fetchFromGitHub {
+          owner = "gromnitsky";
+          repo = "wordnut";
+          rev = "3e0184a8a1cc118a985f1cbd0b6d5b7417987169";
+          sha256 = "1b9pya342ikyxnlyxp86wx8xk6zcdws7jsqs7a9xk027prwkfngj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wordnut";
+          sha256 = "1gqmjb2f9izra0x9ds1jyk7h204qsll6viwkvdnmxczyyc0wx44n";
+          name = "wordnut";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/wordnut";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wordsmith-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wordsmith-mode";
+        version = "20151117.436";
+        src = fetchFromGitHub {
+          owner = "istib";
+          repo = "wordsmith-mode";
+          rev = "597e1e7c7ef89b06ed8280251ecd8f40ce55e1bf";
+          sha256 = "0d2byl3si2r0zh5ih6xpsgcd9r114ry0lzg5vcf31rr2gqf0j06h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wordsmith-mode";
+          sha256 = "1570h1sjjaks6bnhd4xrbx6nna4v7hz6dmrzwjq37rwvallasg1n";
+          name = "wordsmith-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/wordsmith-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, helm, hydra, lib, melpaBuild }:
+    melpaBuild {
+        pname = "worf";
+        version = "20151231.1124";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "worf";
+          rev = "dc68fa582287861e778c463209f8311c8ac4d620";
+          sha256 = "102qgcsh905hvbygrj8ik47qy1q2qkh2h4sski1g40mp3z6pbza9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/worf";
+          sha256 = "1fkb2ddl684dijsb0cqgmfbg1nz4xv43rb7g5rah05rchy5sgkpi";
+          name = "worf";
+        };
+        packageRequires = [ ace-link helm hydra ];
+        meta = {
+          homepage = "http://melpa.org/#/worf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    workgroups = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "workgroups";
+        version = "20110726.1141";
+        src = fetchFromGitHub {
+          owner = "tlh";
+          repo = "workgroups.el";
+          rev = "9572b3492ee09054dc329f64ed846c962b395e39";
+          sha256 = "0q32z54qafj8ap3ybx82i3fm1msmzwvpxgmkaglzhi8nccgzbn2n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/workgroups";
+          sha256 = "1v01yr3lk6l0qn80i3r8fq3di0a8bmqjyhwx19hcgiap57xl80h8";
+          name = "workgroups";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/workgroups";
+          license = lib.licenses.free;
+        };
+      }) {};
+    workgroups2 = callPackage ({ anaphora, cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "workgroups2";
+        version = "20141102.1322";
+        src = fetchFromGitHub {
+          owner = "pashinin";
+          repo = "workgroups2";
+          rev = "928d509157ec8a4a2e343b6115dff034c3243a7a";
+          sha256 = "0prj2b33h6rya7y9ff91r72bva1y6hg0sv9l11bn1gikmc6lc18n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/workgroups2";
+          sha256 = "0vhj6mb3iflli0l3rjlvlbxz5yk6z3ii5r71gx0m4vp4lhxncy3v";
+          name = "workgroups2";
+        };
+        packageRequires = [ anaphora cl-lib dash f ];
+        meta = {
+          homepage = "http://melpa.org/#/workgroups2";
+          license = lib.licenses.free;
+        };
+      }) {};
+    world-time-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "world-time-mode";
+        version = "20140627.307";
+        src = fetchFromGitHub {
+          owner = "nicferrier";
+          repo = "emacs-world-time-mode";
+          rev = "ce7a3b45c87eb24cfe61eee453175d64f741d7cc";
+          sha256 = "0i00xm4rynbp2v3gm6h46ajgj8h8nxnsjh6db1659b0hbpnah0ji";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/world-time-mode";
+          sha256 = "10gdlz4l9iqw1zdlk5i3knysn36iqxdh3xabjq8kq04jkl7i36dl";
+          name = "world-time-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/world-time-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wrap-region = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wrap-region";
+        version = "20140117.120";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "wrap-region";
+          rev = "0eff3165db36464d28ed303ab25b715307cbdee0";
+          sha256 = "09fzbbrdgq19c3gylj4i0c5g070k65w943wz28mzis8b403vzh3n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wrap-region";
+          sha256 = "0mby3m49vm2pw127divspgivqam27zd4r70wx5ra05xwfxywaibq";
+          name = "wrap-region";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/wrap-region";
+          license = lib.licenses.free;
+        };
+      }) {};
+    writegood-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "writegood-mode";
+        version = "20150325.1315";
+        src = fetchFromGitHub {
+          owner = "bnbeckwith";
+          repo = "writegood-mode";
+          rev = "4302169c1563cab9319745083f9b9a7f5f4af0bd";
+          sha256 = "1nnjn1r669hvvzfycllwap4w04m8rfsk4nzcg8057m1f263kj31b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/writegood-mode";
+          sha256 = "1lxammisaj04g5vr5lwms64ywf39w8knrq72x4i94wwzwx5ywi1d";
+          name = "writegood-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/writegood-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }:
+    melpaBuild {
+        pname = "writeroom-mode";
+        version = "20151111.301";
+        src = fetchFromGitHub {
+          owner = "joostkremers";
+          repo = "writeroom-mode";
+          rev = "57aeef137b04134fe05c7e701e42b05f3edbcc30";
+          sha256 = "0an36zra25r0l482irxbwrq90fd3rik53yqw3gccjkgdf3lpkc4x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/writeroom-mode";
+          sha256 = "1kpsrp3agw8bg3qbf5rf5k1a7ww30q5xsa8z5ywxajsaywjzx1bk";
+          name = "writeroom-mode";
+        };
+        packageRequires = [ emacs visual-fill-column ];
+        meta = {
+          homepage = "http://melpa.org/#/writeroom-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ws-butler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ws-butler";
+        version = "20150126.959";
+        src = fetchFromGitHub {
+          owner = "lewang";
+          repo = "ws-butler";
+          rev = "a998a23ee8713808ac1fe3d1523ea1861be4da57";
+          sha256 = "1x2ybnv0h52i24vd1n95s4vglc6p79cyxh91a20cwza34svhz152";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ws-butler";
+          sha256 = "072k67z2lx0ampwzdiszi64xs0w6frp4nbmrd2r0wpx0pd211vbn";
+          name = "ws-butler";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ws-butler";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wsd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wsd-mode";
+        version = "20160117.1502";
+        src = fetchFromGitHub {
+          owner = "josteink";
+          repo = "wsd-mode";
+          rev = "b733fc4d1e88c33f23552fc88c8e4cb0135c6e15";
+          sha256 = "07mmnlfqm0jmkj43l33gd4wjj8kin3rnqzhsh9hsjxir851d0jf2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wsd-mode";
+          sha256 = "07vclmnj18wx9wlrcnsl99f9jlk3sb9g6pcdv8x1smk84gccpakc";
+          name = "wsd-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/wsd-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wwtime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wwtime";
+        version = "20151122.1010";
+        src = fetchFromGitHub {
+          owner = "ndw";
+          repo = "wwtime";
+          rev = "d04d8fa814b5d3644efaeb28f25520ada69acbbd";
+          sha256 = "0ba193ilqmp7l35hhzfym4kvbnj9h57m8mwsxdj6rdj2cwrifx8r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wwtime";
+          sha256 = "0n37k23lkjgaj9wxnr41yk3mwvy62mc9im5l86czqmw5gy4l63ic";
+          name = "wwtime";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/wwtime";
+          license = lib.licenses.free;
+        };
+      }) {};
+    x-dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "x-dict";
+        version = "20091203.1223";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "x-dict";
+          rev = "920b2430bff9fb8c4bb7944aa358622545c00cee";
+          sha256 = "0i7bgbhk4lvdkdjh6z4xs69mbdi49985j82cjikzyyskjcqd2klq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/x-dict";
+          sha256 = "1w51xhiaxk50wlch262dxs2ybjvjj8qzx01xlgiimvggb8h5arlc";
+          name = "x-dict";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/x-dict";
+          license = lib.licenses.free;
+        };
+      }) {};
+    x86-lookup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "x86-lookup";
+        version = "20160113.1603";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "x86-lookup";
+          rev = "6145e13baf1ea227fbe63215c70cf73da1574160";
+          sha256 = "0lssri13f3c7drkirh3cyxzxm3lix5myfrqb9iy178nybrifgf8l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/x86-lookup";
+          sha256 = "1clv1npvdkzsy0a08xrb880yflwzl4d5cc2c5xrs7b837mqpj8hd";
+          name = "x86-lookup";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/x86-lookup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xah-elisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xah-elisp-mode";
+        version = "20160111.1954";
+        src = fetchFromGitHub {
+          owner = "xahlee";
+          repo = "xah-elisp-mode";
+          rev = "f7bf8463b1d553c6c960f37ca44e64071261839e";
+          sha256 = "1birxxr28iv70x2h9war7ibhgan6pmbghdj11jnndvxl140jclmq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xah-elisp-mode";
+          sha256 = "0cl07hw1hd3hj7wrzkh20m8vcs7mqsajxjmnlbnk2yg927yyijij";
+          name = "xah-elisp-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/xah-elisp-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xah-find = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xah-find";
+        version = "20151214.1257";
+        src = fetchFromGitHub {
+          owner = "xahlee";
+          repo = "xah-find";
+          rev = "e25eb9343fca71523ea6bf76741e6c5aab8004a4";
+          sha256 = "05dvmvh81n30l56gvlgzj0bwqd2fv1d6xvhvj5ywax6kqr9piwqv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xah-find";
+          sha256 = "1d3x9yhm7my3yhvgqnjxr2v28g5w1h4ri40sy6dqcx09bjf3jhyq";
+          name = "xah-find";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/xah-find";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xah-fly-keys";
+        version = "20160115.115";
+        src = fetchFromGitHub {
+          owner = "xahlee";
+          repo = "xah-fly-keys";
+          rev = "c7e27935a325be5f00db455ad7c0d9c473feefaf";
+          sha256 = "1i3q1fl9ciw367l065lxsdz78fq9y91hbp1vfwaw480rf1vqfxf2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xah-fly-keys";
+          sha256 = "0bzfz8q7yd1jai0pgngxwjp82nsfx5ivn24cb20vc5r8hhzj17cs";
+          name = "xah-fly-keys";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/xah-fly-keys";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xah-get-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xah-get-thing";
+        version = "20150712.1630";
+        src = fetchFromGitHub {
+          owner = "xahlee";
+          repo = "xah-get-thing-or-selection";
+          rev = "d2dadc54417468cc42da72c4e02fd23e3fd0584a";
+          sha256 = "0abknznp2si80zq5pc0hqr3w3pca2vrv3msm6jz1s8l8zi2hwx72";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xah-get-thing";
+          sha256 = "0m61bmfgqy19h4ivw655mqj547ga8hrpaswcp48hx00hx8mqzcvg";
+          name = "xah-get-thing";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/xah-get-thing";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xah-lookup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xah-lookup";
+        version = "20150602.1346";
+        src = fetchFromGitHub {
+          owner = "xahlee";
+          repo = "lookup-word-on-internet";
+          rev = "75590c52af87e635b2f19640095b805fdb3e5d8b";
+          sha256 = "1adyww9jbjvcn9p3z9ggs3gijdmnab275a81ch8sir1xp59pfm3s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xah-lookup";
+          sha256 = "0z0h1myw6wmybyd0z2lw4l59vgm6q6kh492q77kf3s0fssc0facc";
+          name = "xah-lookup";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/xah-lookup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xah-math-input = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xah-math-input";
+        version = "20151225.1358";
+        src = fetchFromGitHub {
+          owner = "xahlee";
+          repo = "xah-math-input";
+          rev = "f0c98d1271b20334c8af2593fd391af23a6e64b4";
+          sha256 = "1j2dca3j71g2g8phzfxjvcwymlr10dq8fbahwslwdhadffjv9m87";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xah-math-input";
+          sha256 = "1afikjk46sjf97fb5fc8h63h7b9af010wxhsbpnmabsb4j72rx5a";
+          name = "xah-math-input";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/xah-math-input";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xah-replace-pairs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xah-replace-pairs";
+        version = "20150522.533";
+        src = fetchFromGitHub {
+          owner = "xahlee";
+          repo = "xah-replace-pairs";
+          rev = "b80430cd285ba09e2b35d518be0c25ba7db2d0a3";
+          sha256 = "18msj947w6msma6zm23slk2v0h92n5ych5j12zbzkzzir49sffql";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xah-replace-pairs";
+          sha256 = "0r4aq9davh3ypzcjixr3aw9g659dhiblwbmcyhm8iqhkavcpqr1x";
+          name = "xah-replace-pairs";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/xah-replace-pairs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xahk-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xahk-mode";
+        version = "20150504.1811";
+        src = fetchFromGitHub {
+          owner = "xahlee";
+          repo = "xahk-mode.el";
+          rev = "91301b8eae7fd703b258a4c68066d9d5af943c4b";
+          sha256 = "0dc74kqwi0hpihdbb9a9lrqb7823w6j96mah47zyd9d4rd3vx850";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xahk-mode";
+          sha256 = "1bs12z7lnqlhm44hq0l98d0ka1bjgvm2yv97yivaj9akd53znca9";
+          name = "xahk-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/xahk-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xbm-life = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xbm-life";
+        version = "20160103.417";
+        src = fetchFromGitHub {
+          owner = "wasamasa";
+          repo = "xbm-life";
+          rev = "dd6a98ac9ea81b681e68f6318fed47158e5d469e";
+          sha256 = "08hzsqf4gawcr9q2h3rxrf1igvdja84aaa821657k04kdq4dpcbj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xbm-life";
+          sha256 = "1pglxjd4cs630sayx17ai1xflpbyj3hry3156682bgwhqs1vw68q";
+          name = "xbm-life";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/xbm-life";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xcscope = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xcscope";
+        version = "20140510.1637";
+        src = fetchFromGitHub {
+          owner = "dkogan";
+          repo = "xcscope.el";
+          rev = "d845a033058ccb83e32dd9648885e8f608bb6258";
+          sha256 = "1wf6yijafqwcksrqci3d8zy3zh5yzqpfbf0d3m7qyslbax2aw25a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xcscope";
+          sha256 = "06xh29cm5v3b5xwj32y0i0h0kvvy995840db4hvab2wn9jw68m8w";
+          name = "xcscope";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/xcscope";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xkcd = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xkcd";
+        version = "20151016.2353";
+        src = fetchFromGitHub {
+          owner = "vibhavp";
+          repo = "emacs-xkcd";
+          rev = "8f0009f15926f37f2ea02471425ab6dbac00e50d";
+          sha256 = "0gd7ag7cqzkfk8y9rbkrjpnyjnwad5bx86a30vxamd1ql8xp57ap";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xkcd";
+          sha256 = "1r88yhs8vnkak8xl16vw3xdpm7ncz4ydkml8932bqk8xix8l8f0w";
+          name = "xkcd";
+        };
+        packageRequires = [ json ];
+        meta = {
+          homepage = "http://melpa.org/#/xkcd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xml-quotes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xml-quotes";
+        version = "20151230.1649";
+        src = fetchFromGitHub {
+          owner = "ndw";
+          repo = "xml-quotes";
+          rev = "26db170e80b9295861227cdf970721b12539ed44";
+          sha256 = "0z3yd3dzcsd7584jchv9q55fx04ig4yjzp8ay2pa112lykv4jxxd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xml-quotes";
+          sha256 = "1lmafa695xkhd90k6yiv8a57ch1jx33l1zpm39z0kj546mn6y8aq";
+          name = "xml-quotes";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/xml-quotes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xml-rpc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xml-rpc";
+        version = "20150902.2027";
+        src = fetchFromGitHub {
+          owner = "hexmode";
+          repo = "xml-rpc-el";
+          rev = "a190759da8765d3b22ceb6774cefc610fda404d8";
+          sha256 = "0kkjfg1l2wg3d5wrgkwnww4d3fca0xpd3k5z9j9gwmjnkxqd95ca";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xml-rpc";
+          sha256 = "14r6xgnpqsb2jlv52vgrhqf3qw8a6gmdyap3ylhilyxw71lxf1js";
+          name = "xml-rpc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/xml-rpc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xmlgen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xmlgen";
+        version = "20130219.419";
+        src = fetchFromGitHub {
+          owner = "philjackson";
+          repo = "xmlgen";
+          rev = "d27294a4174888fe452015cb98dedd2a4bdc1e92";
+          sha256 = "1nk50iwb6az01r1s2l9wwdqrz3k4ywr00q0zmd9vvi3y9v4cjah0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xmlgen";
+          sha256 = "1mvnjqb9zxf9ml605w10v4cbbajwv9if93apr4xrh79l00scj383";
+          name = "xmlgen";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/xmlgen";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xmlunicode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xmlunicode";
+        version = "20160108.2311";
+        src = fetchFromGitHub {
+          owner = "ndw";
+          repo = "xmlunicode";
+          rev = "7da11de1a196f8fb202464320107774ed3c7ecc9";
+          sha256 = "16rj11rasifkfp7357i5s2kg36vqrnjl3zv6lgzmn365xxx6zrbz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xmlunicode";
+          sha256 = "1ylpvx2p5l863r9qv9jdsm9rbv989c8xn0zpjl8zkcfxqxix4h4p";
+          name = "xmlunicode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/xmlunicode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xquery-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xquery-mode";
+        version = "20140121.1143";
+        src = fetchFromGitHub {
+          owner = "mblakele";
+          repo = "xquery-mode";
+          rev = "ac0ca72ccd575952393804330c3efe3b2271c4e2";
+          sha256 = "09fpxr55b2adqmca8xhpy8z5cify5091fjdjyxjd1jh5wdp1658v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xquery-mode";
+          sha256 = "0b5k2ihbjm5drv4lf64ap31yj873x1fcq85y6yq1ayahn6s52rql";
+          name = "xquery-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/xquery-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xquery-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xquery-tool";
+        version = "20160112.406";
+        src = fetchFromGitHub {
+          owner = "paddymcall";
+          repo = "xquery-tool.el";
+          rev = "c7783a502b5a1f4a41cd87ed881a27aafa145a11";
+          sha256 = "1i2ah3wkjv6ya7zda53ivj5fchmg1kr2l01bhl0r183g3jws796p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xquery-tool";
+          sha256 = "069injmvv9zzcbqbms94qx5wjj740jnik6sf3b4xjhln7z1yskp0";
+          name = "xquery-tool";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/xquery-tool";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xresources-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xresources-theme";
+        version = "20141219.1117";
+        src = fetchFromGitHub {
+          owner = "CQQL";
+          repo = "xresources-theme";
+          rev = "4842144f9f83e9d6f71f5ba2fd3abdcf6887de8f";
+          sha256 = "1n3biybylvq5c1lpf7zsjsgdrg7mzrhkaw251fp8qmsss0s3sv4g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xresources-theme";
+          sha256 = "0spqa3xn3p2lmvlc5hdn7prq4vb70nkyrryx1kavha9igzhlyaga";
+          name = "xresources-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/xresources-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xterm-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xterm-color";
+        version = "20150823.846";
+        src = fetchFromGitHub {
+          owner = "atomontage";
+          repo = "xterm-color";
+          rev = "1bc4ddb0e1bf7562cbf4b6b3bdd2ce3f9b596b39";
+          sha256 = "064fpjcj1sp8m5x106dw6zgy0p0rfd5fxcx57h533q263l7z00ny";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xterm-color";
+          sha256 = "0bvzi1mkxgm4vbq2va1sr0k9h3fdmppq79hkvbizc2xgk72sazpj";
+          name = "xterm-color";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/xterm-color";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xterm-frobs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xterm-frobs";
+        version = "20091211.1755";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "xterm-frobs";
+          rev = "58fb0de21e4d1963d1398a38e1b803446fb41320";
+          sha256 = "10dsf2lgjjqvjzzyc5kwggfk511v8ypmx173bixry3djcc15dsf3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xterm-frobs";
+          sha256 = "02v8kh2g6a2fpxy911630zsg985hyakvqbd6v2xyfbz0vnd6i1lf";
+          name = "xterm-frobs";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/xterm-frobs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xterm-keybinder = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xterm-keybinder";
+        version = "20151211.101";
+        src = fetchFromGitHub {
+          owner = "yuutayamada";
+          repo = "xterm-keybinder-el";
+          rev = "08d7c9b4c71db05df092010ba92f87567004b8c7";
+          sha256 = "1jwimgglhqgp259wjqmpp1wi9j51qxcl1l356jlhjnfp1zh1ihmg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xterm-keybinder";
+          sha256 = "1n0zp1mc7x7z0671lf7p9r4qxic90bkf5q3zwz4vinpiw2qh88lz";
+          name = "xterm-keybinder";
+        };
+        packageRequires = [ cl-lib emacs let-alist ];
+        meta = {
+          homepage = "http://melpa.org/#/xterm-keybinder";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xterm-title = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xterm-title";
+        version = "20091203.1223";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "xterm-title";
+          rev = "b6ea73d297d191d48bba7dd1e2adc23bbdfa1c3c";
+          sha256 = "06cbr7y3wp7j8lnbys57g6md4fdx9xhlnxl73pj7xpfa5i2x9ifl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xterm-title";
+          sha256 = "08z8qg9x6vjpybbhxa8x46qnp3951miz1264fivg776y76cg3ck6";
+          name = "xterm-title";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/xterm-title";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xtest = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xtest";
+        version = "20141214.1106";
+        src = fetchFromGitHub {
+          owner = "promethial";
+          repo = "xtest";
+          rev = "2c2bdf32667506dd9ddf6eb311832add616bdf1c";
+          sha256 = "09mn8s7gzzxgs7kskld8l68zjrcgnvml3fqj69wrfq7b1g62hhxy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xtest";
+          sha256 = "1vbs4sb4frzg8d3l96ip9cc6lc86nbj50vpdfqazvxmdfd1sg4i7";
+          name = "xtest";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/xtest";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yabin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yabin";
+        version = "20140205.2151";
+        src = fetchFromGitHub {
+          owner = "d5884";
+          repo = "yabin";
+          rev = "db8c404507560ef9147fcce2b94cd706fbfa03b5";
+          sha256 = "0f6pvwzhncycw8gnjy24h6q1qglfgvdjfs5dzqx9s43j3yg63lzm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yabin";
+          sha256 = "1kmpm2rbb43c9cgp44qwd24d90mj48k3gyiir3vb6zf6k3syrc17";
+          name = "yabin";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/yabin";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yafolding = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yafolding";
+        version = "20141202.2256";
+        src = fetchFromGitHub {
+          owner = "zenozeng";
+          repo = "yafolding.el";
+          rev = "0dc48073f429112b51a888e8e9285739435d3c7f";
+          sha256 = "0b252m7vb5kg5bjhpgag6nhm32cac8dhlmy4pr0kpa860lh2xlz7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yafolding";
+          sha256 = "1z70ismfwmh9a83a7h5lbhw7iywfib5fis7y8gx8020wfjq9g2yq";
+          name = "yafolding";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/yafolding";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yagist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yagist";
+        version = "20150425.751";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "yagist.el";
+          rev = "ab19ce3607873a6c523f87fffd653a1e7fbb66c2";
+          sha256 = "0sqwz37y6mpc378pp8p6bq9fmhgwfr6rlbngiwgvsp30iq6vjsn4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yagist";
+          sha256 = "1mz86fq0pb4w54c66vd19m2492mkrzq2qi6ssnn2xwmn8vv02wdd";
+          name = "yagist";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/yagist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yahoo-weather = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yahoo-weather";
+        version = "20160111.639";
+        src = fetchFromGitHub {
+          owner = "lujun9972";
+          repo = "yahoo-weather-mode";
+          rev = "593695c4ed2d53948ff8586afd3267373c1879f2";
+          sha256 = "030dcp5iq0jvr2m6lb5ar7bqzp1l7f835yl7d7fa8zp46fc3a6d5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yahoo-weather";
+          sha256 = "1kzi6yp186wfcqh5q1v9vw6b1h8x89sba6wlnacfpjbarwapfif0";
+          name = "yahoo-weather";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/yahoo-weather";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yalinum = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yalinum";
+        version = "20130217.443";
+        src = fetchFromGitHub {
+          owner = "tm8st";
+          repo = "emacs-yalinum";
+          rev = "d3e0cbe3f4f5ca311e3298e684901d6fea3ad973";
+          sha256 = "12dd4ahg9f1493982d49g7sxx0n6ss4xcfhxwzyaqxckwzfranp0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yalinum";
+          sha256 = "0jzsvkcvy2mkfmri4bzgrlgw2y0z3hxz44md83s5zmw09mshkahf";
+          name = "yalinum";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/yalinum";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yaml-mode";
+        version = "20160101.1121";
+        src = fetchFromGitHub {
+          owner = "yoshiki";
+          repo = "yaml-mode";
+          rev = "49668547e1891cb68d2bbbc650acbfa208012f2b";
+          sha256 = "1cngxwn7m3qxn0dm7l9vd4lb5sw5i4aqn5rkr7pacskl0giikhfb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yaml-mode";
+          sha256 = "0afp83xcr8h153cayyaszwkgpap0iyk351dlykmv6bv9d2m774mc";
+          name = "yaml-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/yaml-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yaml-tomato = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "yaml-tomato";
+        version = "20151123.153";
+        src = fetchFromGitHub {
+          owner = "RadekMolenda";
+          repo = "yaml-tomato";
+          rev = "f9df1c9bdfcec629b03031b2d2032f9dc533cb14";
+          sha256 = "1xgqqgg4q3hrhiap8gmr8iifdr1mg4dl0j236b6alhrgmykbhimy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yaml-tomato";
+          sha256 = "0bja213l6mvh8ap5d04x8dik1z9px5jr52zpw1py7shw5asvp5s2";
+          name = "yaml-tomato";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "http://melpa.org/#/yaml-tomato";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yandex-weather = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yandex-weather";
+        version = "20150821.614";
+        src = fetchFromGitHub {
+          owner = "abstractionlayer";
+          repo = "yandex-weather.el";
+          rev = "41cb91bd1e5aa0e4a317a99e88742631f487ab37";
+          sha256 = "17ymdqi19bs9xn0pxylzv7m99f7cn14hx73xljm6bg0qfb8m53f3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yandex-weather";
+          sha256 = "11hspadm520cjlv1wk2bdpzg7hg2g0chbh26qijj9jgvca26x0md";
+          name = "yandex-weather";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/yandex-weather";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yaoddmuse = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "yaoddmuse";
+        version = "20150712.621";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/yaoddmuse.el";
+          sha256 = "0svy6zp5f22z7mblap4psh7h4i52d1qasi9yk22l39przhsrjar4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yaoddmuse";
+          sha256 = "07sqcsad3k23agwwws7hxnc46cp9mkc9qinzva7qvjgs8pa9dh54";
+          name = "yaoddmuse";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/yaoddmuse";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yard-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yard-mode";
+        version = "20140816.1244";
+        src = fetchFromGitHub {
+          owner = "pd";
+          repo = "yard-mode.el";
+          rev = "aa303f6f1c348cbee1dbab3be2ad04b0aaa590cf";
+          sha256 = "06mjjxa0blgxd8dbahgyni3b1rscbwjpxby5abrgfbb0fvs2bnfa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yard-mode";
+          sha256 = "0jmlcba8qapjwaaliz9gzs99if3wglkhmlpjzcdy3icx18sw8kzx";
+          name = "yard-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/yard-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yari = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yari";
+        version = "20151128.139";
+        src = fetchFromGitHub {
+          owner = "hron";
+          repo = "yari.el";
+          rev = "a2cb9656ee5dfe1fc2ee3854f3079a1c8e85dbe9";
+          sha256 = "0w9a6j0ndpfwaz1g974vv5jqgbzxw26l19kq51j3ah73063cavpf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yari";
+          sha256 = "0sch9x899mzwdacg55w5j583k2r4vn71ish7gqpghd7cj13ii66h";
+          name = "yari";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/yari";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yascroll = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yascroll";
+        version = "20150315.805";
+        src = fetchFromGitHub {
+          owner = "m2ym";
+          repo = "yascroll-el";
+          rev = "f7743df1cf6d8e55607141d1ea5f50b562582c51";
+          sha256 = "08wa97hsfy1rc8ify3rz2ncfij4z6l16p4s20naygqccjv3ir6z5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yascroll";
+          sha256 = "11g7wn4hgdwnx3n7ra0sh8gk6rykwvrg9g2cihvcv7mjbqgcv53f";
+          name = "yascroll";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/yascroll";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yasnippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yasnippet";
+        version = "20160104.329";
+        src = fetchFromGitHub {
+          owner = "capitaomorte";
+          repo = "yasnippet";
+          rev = "100d8d19049f1ec97a0cd22400758d4afcde403c";
+          sha256 = "10a2rrwz88gzhq3qij2nabqd6b31n3cxnjshrzjn9iv0lcby31a5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yasnippet";
+          sha256 = "1j6hcpzxljz1axh0xfbwr4ysbixkwgxawsvsgicls8r8kl2xvjvf";
+          name = "yasnippet";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/yasnippet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yatemplate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "yatemplate";
+        version = "20151125.107";
+        src = fetchFromGitHub {
+          owner = "mineo";
+          repo = "yatemplate";
+          rev = "499e7f2ea245686c09915523657fa95905f70561";
+          sha256 = "1gxn302kwjfq6s6rxxvy0jpp37r2vh4ry899giqbdfr0cc1qnw0c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yatemplate";
+          sha256 = "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q";
+          name = "yatemplate";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/yatemplate";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "yatex";
+        version = "20160107.1719";
+        src = fetchhg {
+          url = "https://www.yatex.org/hgrepos/yatex/";
+          rev = "e78a87bc2c9e";
+          sha256 = "08iwfpsjs36pqr2l85avxhsjx8z0sdfw8cqwwf3brn7i4x67f7z5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yatex";
+          sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6";
+          name = "yatex";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/yatex";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yaxception";
+        version = "20150105.852";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "yaxception";
+          rev = "4e94cf3e0b9b5631b0e90eb4b7de597ee7185875";
+          sha256 = "0nqyn1b01v1qxv7rcf46qypca61lmpm8d7kqv63jazw3n05qdnj8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yaxception";
+          sha256 = "18n2kjbgfhkhcwigxmv8dk72jp57vsqqd20lc26v5amx6mrhgh58";
+          name = "yaxception";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/yaxception";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ycm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ycm";
+        version = "20150822.1336";
+        src = fetchFromGitHub {
+          owner = "neuromage";
+          repo = "ycm.el";
+          rev = "4da8a14abcd0f4fa3235042ade2e12b5068c0601";
+          sha256 = "0znchya89zzk30mwl4qfm0q9sfa5m3jspapb892ydj0mck5n4nyj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ycm";
+          sha256 = "16ahgvi85ddjlrjxld14zm2vvam0m89mwskizjd5clcz0snk51sc";
+          name = "ycm";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ycm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ycmd = callPackage ({ dash, deferred, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "ycmd";
+        version = "20160115.1652";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "emacs-ycmd";
+          rev = "80c6d7c663b6ccc32b851348f1099790ac4c9736";
+          sha256 = "1c3c3frd9fdb77wkhg8f8g29dvr86ryzf9prg4pm8wvhifa4yhvg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ycmd";
+          sha256 = "06psmcr5132vn72l0amzj14dy43aradnbmlvvms55srvici6r60q";
+          name = "ycmd";
+        };
+        packageRequires = [ dash deferred emacs f popup ];
+        meta = {
+          homepage = "http://melpa.org/#/ycmd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yesql-ghosts = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "yesql-ghosts";
+        version = "20150220.637";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "yesql-ghosts";
+          rev = "8f1faf0137b85a5072d13e1240a463d9a35ce2bb";
+          sha256 = "1fyvvkx6pa41bcr9cyh4yclwdzc5bs742s9fxr6wb4a5scq3hg9m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yesql-ghosts";
+          sha256 = "1hxzbnfd15f0ifdqjbw9nhxd0z46x705v2bc0xl71nav78fgpswf";
+          name = "yesql-ghosts";
+        };
+        packageRequires = [ cider dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/yesql-ghosts";
+          license = lib.licenses.free;
+        };
+      }) {};
+    youdao-dictionary = callPackage ({ chinese-word-at-point, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names, popup }:
+    melpaBuild {
+        pname = "youdao-dictionary";
+        version = "20150914.144";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "youdao-dictionary.el";
+          rev = "5b4f716ca41fa0cdb18a4949ac5cdcd470182c57";
+          sha256 = "0016qff7hdnd0xkyhxakfzzscwlwkpzppvc4wxfw0iacpjkz1fnr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/youdao-dictionary";
+          sha256 = "1qfk7s18br9jask1bpida0cjxks098qpz0ssmw8misi3bjax0fym";
+          name = "youdao-dictionary";
+        };
+        packageRequires = [ chinese-word-at-point emacs names popup ];
+        meta = {
+          homepage = "http://melpa.org/#/youdao-dictionary";
+          license = lib.licenses.free;
+        };
+      }) {};
+    z3-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "z3-mode";
+        version = "20151120.1655";
+        src = fetchFromGitHub {
+          owner = "zv";
+          repo = "z3-mode";
+          rev = "163dc01d59e9880b4dc188d4e1ad84d6c0c852e1";
+          sha256 = "1k7m3xk5ksbr2s3ypz5yqafz9sfav1m0qk2jz1xyi3fdaw2j0w2z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/z3-mode";
+          sha256 = "183lzhgjj480ca2939za3rlnsbfn24mgi501n66h5wim950v7vgd";
+          name = "z3-mode";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/z3-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zeal-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zeal-at-point";
+        version = "20151231.248";
+        src = fetchFromGitHub {
+          owner = "jinzhu";
+          repo = "zeal-at-point";
+          rev = "ba25ee7b8378545e849be371f3ad4676d73b2e02";
+          sha256 = "16k8hha798hrs0qfdwqdr6n7y13ffgm6jj3msrk0zl8117jhaany";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zeal-at-point";
+          sha256 = "1cz53plk5bax5azm13y7xz530qcfh0scm0cgrkrgwja2wwlxirnw";
+          name = "zeal-at-point";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/zeal-at-point";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zeitgeist = callPackage ({ fetchbzr, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zeitgeist";
+        version = "20131228.1209";
+        src = fetchbzr {
+          url = "lp:zeitgeist-datasources";
+          rev = "181";
+          sha256 = "0f80fxh0y9lfa08fnic7ln0jn8vngfbiygy6sizdmrcxz67559vc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zeitgeist";
+          sha256 = "0gzmiwxmzcrl5mf0s7vs09p2wl7slq8xbl6ynl76iwzwjxjizahk";
+          name = "zeitgeist";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/zeitgeist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zen-and-art-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zen-and-art-theme";
+        version = "20120622.937";
+        src = fetchFromGitHub {
+          owner = "developernotes";
+          repo = "zen-and-art-theme";
+          rev = "a7226cbce0bca2501d69a620cb2aeabfc396c232";
+          sha256 = "0dnaxhsw549k54j0mgydm7qbl4pizgipfyzc15f9afsxa107rpnl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zen-and-art-theme";
+          sha256 = "0b2lflji955z90xl9iz2y1vm04yljghbw4948gh5vv5p7mwibgf2";
+          name = "zen-and-art-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/zen-and-art-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zenburn-theme";
+        version = "20160117.1319";
+        src = fetchFromGitHub {
+          owner = "bbatsov";
+          repo = "zenburn-emacs";
+          rev = "041b800022f486cd328a8cd3eb729db93ddb710e";
+          sha256 = "13nmbjz4a7ibjcs4h6rbx5hkcdmbinsm8jzh049cb289y7m0lcpa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zenburn-theme";
+          sha256 = "1kb371j9aissj0vy07jw4ydfn554blc8b2rbi0x1dvfksr2rhsn9";
+          name = "zenburn-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/zenburn-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zencoding-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zencoding-mode";
+        version = "20140213.222";
+        src = fetchFromGitHub {
+          owner = "rooney";
+          repo = "zencoding";
+          rev = "58e42af182c98cb9941d27cd042d227fbf4e146c";
+          sha256 = "1y3wj15kfbgskl29glmba6lzq43rcm141p4i5s180aqcw7ydp5vr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zencoding-mode";
+          sha256 = "1fclad1dyngyg9ncfkcqfxybvy8482i2bd409cgxi9y4h1wc7ws7";
+          name = "zencoding-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/zencoding-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zerodark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zerodark-theme";
+        version = "20160115.1710";
+        src = fetchFromGitHub {
+          owner = "NicolasPetton";
+          repo = "zerodark-theme";
+          rev = "d89e721dcda9a36670759bad433a02d0eb89f935";
+          sha256 = "1byzw9k8g7inwr5icci9i1iar0y6w9zgs91nj04431j003l10xfs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zerodark-theme";
+          sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9";
+          name = "zerodark-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/zerodark-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zlc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zlc";
+        version = "20151010.2057";
+        src = fetchFromGitHub {
+          owner = "mooz";
+          repo = "emacs-zlc";
+          rev = "4dd2ba267ecdeac845a7cbb3147294ee7daa25f4";
+          sha256 = "1gb51bqdf87yibs1zngk6q090p05293cpwlwbwzhnih9sl6wkq8x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zlc";
+          sha256 = "0qw0qf14l09mcnw7h0ccbw17psfpra76qfawkc10zpdb5a2167d0";
+          name = "zlc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/zlc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    znc = callPackage ({ cl-lib ? null, erc ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "znc";
+        version = "20140722.1621";
+        src = fetchFromGitHub {
+          owner = "sshirokov";
+          repo = "ZNC.el";
+          rev = "94c8e4cdcfb51b75d5f95cb51ce21c6274325e19";
+          sha256 = "1xsxmvbh3xm3zh9yc6q28h48nar6pwyd51xw04b1x7amwkp8qdnp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/znc";
+          sha256 = "1z2kzbapgh55wwr5jp7v1wz5kpz4l7n3k94mkh3s068xag9xs6zz";
+          name = "znc";
+        };
+        packageRequires = [ cl-lib erc ];
+        meta = {
+          homepage = "http://melpa.org/#/znc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zombie = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zombie";
+        version = "20141222.1016";
+        src = fetchFromGitHub {
+          owner = "zk-phi";
+          repo = "zombie";
+          rev = "ff8cd1b4cdbb4b0b9b8fd1ec8f6fb93eba249345";
+          sha256 = "1gm3ly6czbw4vrxcslm50jy6nxf2qsl656cjwbyhw251wppn75cg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zombie";
+          sha256 = "0ji3nsxwbxmmygd6plpbc1lkw6i5zw4y6x3r5n2ah3ds4vjr7cnv";
+          name = "zombie";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/zombie";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zombie-trellys-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zombie-trellys-mode";
+        version = "20150304.848";
+        src = fetchFromGitHub {
+          owner = "david-christiansen";
+          repo = "zombie-trellys-mode";
+          rev = "7f0c45fdda3a44c3b6d1762d116abb1421b8fba2";
+          sha256 = "04m53hzk5n9vxh0gxi8jzpdhsdjlxnvz7hmsisr3bs99v603ha01";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zombie-trellys-mode";
+          sha256 = "19xzvppw7f35s82hm0y7sga8dyjjyy0dxy6vji4hxdpjziz7lggv";
+          name = "zombie-trellys-mode";
+        };
+        packageRequires = [ cl-lib emacs haskell-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/zombie-trellys-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zone-nyan = callPackage ({ esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zone-nyan";
+        version = "20160102.1656";
+        src = fetchFromGitHub {
+          owner = "wasamasa";
+          repo = "zone-nyan";
+          rev = "033e9e7d23584fb15e30639dd9e3b2ffeb54618a";
+          sha256 = "1zg8fiv62bz7zmalczmfkbgjc6km7n66pzvidivc0p9b9sfxslkp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zone-nyan";
+          sha256 = "165sgjaahz038isii971m02hr2g5iqhbhiwf5kdn8c739cjaa17b";
+          name = "zone-nyan";
+        };
+        packageRequires = [ esxml ];
+        meta = {
+          homepage = "http://melpa.org/#/zone-nyan";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zone-select = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zone-select";
+        version = "20160118.819";
+        src = fetchFromGitHub {
+          owner = "kawabata";
+          repo = "zone-select";
+          rev = "bf30da12f1625fe6563448fccf3c506acad10af7";
+          sha256 = "17mrzf85ym0x5ih4l6sjdjlcmviabf8c8rpvpkd90gp9qxd8pyx1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zone-select";
+          sha256 = "05kc211invmy4ajwf71vgr2b7bdgn99c4a26m95gcjqgy3sh5xzz";
+          name = "zone-select";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/zone-select";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "zones";
+        version = "20151231.1825";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/zones.el";
+          sha256 = "1dgadarqz1fvijf9cch24ngkn223jjp08njsfa52qk16k8pdpc12";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zones";
+          sha256 = "08sl7i7cy22nd1jijc5l7lp75k9z83gfr8q41n72l0vxrpdasc9w";
+          name = "zones";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/zones";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zonokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zonokai-theme";
+        version = "20150408.2202";
+        src = fetchFromGitHub {
+          owner = "ZehCnaS34";
+          repo = "zonokai-emacs";
+          rev = "b6f9eb7eb7e3f9954d786144e74dc6e392df3a69";
+          sha256 = "0ls9x2r12z9ki2fy3cbf05mp28x4ws2gk3knacvw7gvvg4sjdq5w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zonokai-theme";
+          sha256 = "1hrpgh03mp7yynqamgzkw7fa70c5pmyjfmfblkfhspnsif8j4v29";
+          name = "zonokai-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/zonokai-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zoom-frm = callPackage ({ fetchurl, frame-cmds, frame-fns, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zoom-frm";
+        version = "20151231.1825";
+        src = fetchurl {
+          url = "http://www.emacswiki.org/emacs/download/zoom-frm.el";
+          sha256 = "1whpd97yjby5zbcr4fcn0nxhqvn6k3jn8k2d15i6ss579kziwdqn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zoom-frm";
+          sha256 = "111lr29zhj8w8j7dbzl58iisqxjhccxpw4spfxx08zxh4623g5mk";
+          name = "zoom-frm";
+        };
+        packageRequires = [ frame-cmds frame-fns ];
+        meta = {
+          homepage = "http://melpa.org/#/zoom-frm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zoom-window = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zoom-window";
+        version = "20151206.2305";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-zoom-window";
+          rev = "45ae8d0f47af351d73daeb6cecc366ea7eb49a88";
+          sha256 = "1kl01dlggsrffvakmwixw9j8cncdmlsw805wvzls6l1711r1zjwj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zoom-window";
+          sha256 = "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3";
+          name = "zoom-window";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/zoom-window";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zop-to-char = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zop-to-char";
+        version = "20160117.444";
+        src = fetchFromGitHub {
+          owner = "thierryvolpiatto";
+          repo = "zop-to-char";
+          rev = "d2b89c72777b3ece880b50ac52f5228d7f36c34a";
+          sha256 = "0ybmvn5wriyhpgxqv8xarviyxgy255vbp3yz9d330y29jhdih6zd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zop-to-char";
+          sha256 = "0jnspvqqvnaplld083j7cqqxw122qazh88ab7hymci36m3ka9hga";
+          name = "zop-to-char";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/zop-to-char";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zossima = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zossima";
+        version = "20121123.1835";
+        src = fetchFromGitHub {
+          owner = "technomancy";
+          repo = "zossima";
+          rev = "991676635c374d2a12714dcf48c1ce2d6f97a375";
+          sha256 = "0fgwxw7r3zfv0b7xi8bx7kxff2r5hdw9gxf16kwq04fnh18nhi39";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zossima";
+          sha256 = "11kmnbqv4s8arindg7cxcdhbvfxsckks332wn7aiyb3bjhcgzwjb";
+          name = "zossima";
+        };
+        packageRequires = [ inf-ruby ];
+        meta = {
+          homepage = "http://melpa.org/#/zossima";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zotelo = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zotelo";
+        version = "20151105.541";
+        src = fetchFromGitHub {
+          owner = "vitoshka";
+          repo = "zotelo";
+          rev = "91c8309da1f293341ba86f29fa0a28dee5cabd93";
+          sha256 = "16fr5s8i9ykq5j7ikf6qfd2px2dxc1gcff5wipif8h758691rliv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zotelo";
+          sha256 = "0ai516lqj9yw7ymvfm4n5inv53sp6mg90wy56lr1laflizwxzg8z";
+          name = "zotelo";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/zotelo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zotxt = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild, request-deferred }:
+    melpaBuild {
+        pname = "zotxt";
+        version = "20151031.1159";
+        src = fetchFromGitLab {
+          owner = "egh";
+          repo = "zotxt-emacs";
+          rev = "3809f0932660c09910639eaecb3d0a8e784420b3";
+          sha256 = "015xgsisgsv4w5h6r68f7iw3vwrqvc0az1gcdkd5dfr3nl1h4yzl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zotxt";
+          sha256 = "18jla05g2k8zfrmp7q9kpr1mpw6smxzdyn8nfghm306wvv9ff8y5";
+          name = "zotxt";
+        };
+        packageRequires = [ request-deferred ];
+        meta = {
+          homepage = "http://melpa.org/#/zotxt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ztree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ztree";
+        version = "20160109.1737";
+        src = fetchFromGitHub {
+          owner = "fourier";
+          repo = "ztree";
+          rev = "b5b2d02af8a34c40d6c3936c24d1cfe3d7911659";
+          sha256 = "0bf10znzjim35qv2v64l9pz5f44rv2xaxvfrsl5n8nl9p0knwfmg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ztree";
+          sha256 = "1fk5xz8qq3azc66f954x5qvym94xnv4fg6wy83ihdfwycsas7j20";
+          name = "ztree";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ztree";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zygospore = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zygospore";
+        version = "20140703.352";
+        src = fetchFromGitHub {
+          owner = "louiskottmann";
+          repo = "zygospore.el";
+          rev = "1af5ee663f5a7aa08d96a77cacff834dcdf55ea8";
+          sha256 = "0v73fgb0gf81vlihiicy32v6x86rr2hv0bxlpw7d3pk4ng1a0l3z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zygospore";
+          sha256 = "03mmxqbliwd1g73cxd9kqkngdy4jdavcs6j12b4wp27xmhgaj40z";
+          name = "zygospore";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/zygospore";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zzz-to-char = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zzz-to-char";
+        version = "20151030.232";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "zzz-to-char";
+          rev = "5d3465122342265b6ff8495c60d9a7cb457be42a";
+          sha256 = "1ai0a9r1xdz1jcr071ivm49wl906a0jqnhfaznw37jw9j2db58zn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zzz-to-char";
+          sha256 = "16vwp0krshmn5x3ry1j512g4kydx39znjqzri4j7wgg49bz1n7vh";
+          name = "zzz-to-char";
+        };
+        packageRequires = [ avy cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/zzz-to-char";
+          license = lib.licenses.free;
+        };
+      }) {};
+  }
\ No newline at end of file
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.json b/pkgs/applications/editors/emacs-modes/melpa-packages.json
deleted file mode 100644
index 889b4cea4a5a..000000000000
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.json
+++ /dev/null
@@ -1,46627 +0,0 @@
-{
-    "netherlands-holidays": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "netherlands-holidays",
-            "sha256": "1kkflj2qnrn6kzh1l6bjl5n5507qilb22pqj3h0f2m6hfyn0sw5z",
-            "rev": "26236178cdd650df9958bf5a086e184096559f00"
-        },
-        "recipe": {
-            "sha256": "181linsbg5wrx1z7zbj3in2d3d4zd2v7drspkj0b6l0c5yfxwayf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150202.1017",
-        "deps": []
-    },
-    "qiita": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gongo",
-            "repo": "qiita-el",
-            "sha256": "0ggivlaj29rbbhkjpf3bf7vr96xjzffas0sf5m54qh6nyz6nnha5",
-            "rev": "93c697b97d540fd1601a13a3d9889fb939b19878"
-        },
-        "recipe": {
-            "sha256": "1kzk7pc68ks9gxm2l2d28al23gxh56z0cmkl80qwg7sh4gsmhyxl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140118.244",
-        "deps": [
-            "helm",
-            "markdown-mode"
-        ]
-    },
-    "drawille": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sshbio",
-            "repo": "drawille",
-            "sha256": "1i4kccig2qy9rqfblibjj0aml7yqxjl9j2za4nkqdjwqkn9ihin7",
-            "rev": "2b31e339a64e06ae817b29cade04a2a141c69121"
-        },
-        "recipe": {
-            "sha256": "01rl21hbj3hwy072yr27jl6iql331v131d3mr9zifg9v6f3jqbil",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151222.1832",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "om-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "danielsz",
-            "repo": "om-mode",
-            "sha256": "03szb2i2xk3nq578cz1drsddsbld03ryvykdfzmfvwcmlpaknvzb",
-            "rev": "cdc0c2912321f8438b0f3449ba8aca50ec150bba"
-        },
-        "recipe": {
-            "sha256": "1q2h9wjnyg7wlk913px4vj1cxqynd6xfh9ind7kjyra436yw3l4j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140915.1610",
-        "deps": []
-    },
-    "outorg": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tj64",
-            "repo": "outorg",
-            "sha256": "0jhqpm31rsmc2r01ra48nbnd9rx9am90qk6i0qrhgfzx9q1svmj9",
-            "rev": "9d6d6f1fb8c68ee044ffba1ae1aed8146bcff1f1"
-        },
-        "recipe": {
-            "sha256": "04swss84p33a9baa4swqc1a9lfp6wziqrwa7vcyi3y0yzllx36cx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150910.1440",
-        "deps": []
-    },
-    "cg": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs",
-            "sha256": "1v8wgm3cvz4xx2jlx95ipd9340mxfxgk5hqialp76y74x03vfzq1",
-            "rev": "11174"
-        },
-        "recipe": {
-            "sha256": "0ra6mxf8l9fjn1vszjj71fs6f6l08hwypka8zsb3si96fzb6sgjh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150819.604",
-        "deps": []
-    },
-    "helm-ls-hg": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-helm",
-            "repo": "helm-ls-hg",
-            "sha256": "1msrsqiwk7bg5gry5cia8a6c7ifymfyn738hk8g2qwzzw4vkxxcs",
-            "rev": "61b91a22fcfb62d0fc56e361ec01ce96973c7165"
-        },
-        "recipe": {
-            "sha256": "0ca0xn7n8bagxb504xgkcv04rpm1vxhx2m77biqrx5886pwl25bh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150909.43",
-        "deps": [
-            "helm"
-        ]
-    },
-    "wgrep-ag": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-wgrep",
-            "sha256": "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4",
-            "rev": "7ef26c51feaef8a5ec0929737130ab8ba326983c"
-        },
-        "recipe": {
-            "sha256": "1b2mj06kws29ha7g16l5d1s3p3nwyw8rprbpaiijdk9nxqcm0a8a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141012.511",
-        "deps": [
-            "wgrep"
-        ]
-    },
-    "color-theme-sanityinc-tomorrow": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "color-theme-sanityinc-tomorrow",
-            "sha256": "1qs6n30amzv47d4d12z6jj506jsm5janp639jg9w65zibbp2dy7a",
-            "rev": "e309cb5a26228633797209276c5d48c070b90767"
-        },
-        "recipe": {
-            "sha256": "1k8iwjc7iidq5sxybs47rnswa6c5dwqfdzfw7w0by2h1id2z6nqd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151215.2305",
-        "deps": []
-    },
-    "focus": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "larstvei",
-            "repo": "Focus",
-            "sha256": "0aj5qxzlfxxp7z27fiw9bvir5yi2zj0xzj5kbh17ix4wnhi03bhc",
-            "rev": "0a6e9624ea5607dadd0f2cd4d3eaa2b10b788eb9"
-        },
-        "recipe": {
-            "sha256": "0jw26j8npyl3dgsrs7ap2djxmkafn2hl6gfqvi7v76bccs4jkyv8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151118.215",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "xahk-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xahlee",
-            "repo": "xahk-mode.el",
-            "sha256": "0dc74kqwi0hpihdbb9a9lrqb7823w6j96mah47zyd9d4rd3vx850",
-            "rev": "91301b8eae7fd703b258a4c68066d9d5af943c4b"
-        },
-        "recipe": {
-            "sha256": "1bs12z7lnqlhm44hq0l98d0ka1bjgvm2yv97yivaj9akd53znca9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150504.1811",
-        "deps": []
-    },
-    "buffer-move": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lukhas",
-            "repo": "buffer-move",
-            "sha256": "0n60373l60fb7w679ld8i1fa6fqj23f8q8ypfddv1zjxjkp4n2k0",
-            "rev": "7034d74abe4df67737d520e994d55dbb34b3b4d5"
-        },
-        "recipe": {
-            "sha256": "0wysywff2bggrha7lpl83c8x6ln7zgdj9gsqmjva6gramqb260fg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151106.249",
-        "deps": []
-    },
-    "slovak-holidays": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "slovak-holidays",
-            "sha256": "1y1gay1h91c0690gly4qibx1my0l1zpb6s3x58lks8m21jdwfw28",
-            "rev": "effb16dfcd14797bf7448f5113085479db339c02"
-        },
-        "recipe": {
-            "sha256": "1dcw8pa3r9b7n7dc8fgzijz7ywwxb3nlfg7n0by8dnvpjq2c30bg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150418.355",
-        "deps": []
-    },
-    "youdao-dictionary": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xuchunyang",
-            "repo": "youdao-dictionary.el",
-            "sha256": "0016qff7hdnd0xkyhxakfzzscwlwkpzppvc4wxfw0iacpjkz1fnr",
-            "rev": "5b4f716ca41fa0cdb18a4949ac5cdcd470182c57"
-        },
-        "recipe": {
-            "sha256": "1qfk7s18br9jask1bpida0cjxks098qpz0ssmw8misi3bjax0fym",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150914.144",
-        "deps": [
-            "chinese-word-at-point",
-            "emacs",
-            "names",
-            "popup"
-        ]
-    },
-    "ox-nikola": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "masayuko",
-            "repo": "ox-nikola",
-            "sha256": "0cc14p6c3d4djfmrkac0abb2jq128vlmayv2a8cyvnyjffyvjbk7",
-            "rev": "5bcbc1a38f6619f62294194f13ca0cd4ca14dd48"
-        },
-        "recipe": {
-            "sha256": "1amplnazs9igfd382djq23d8j7r0knr0hwlpasd01aypc25c82a4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151114.516",
-        "deps": [
-            "emacs",
-            "org",
-            "ox-rst"
-        ]
-    },
-    "io-mode-inf": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "slackorama",
-            "repo": "io-emacs",
-            "sha256": "1ard88kc13c57y9zdkyr012w8rdrwahz8a3fb5v6hwqymg16m20s",
-            "rev": "6dd2bac3fd87484bb7d97e135b06c29d70b444b6"
-        },
-        "recipe": {
-            "sha256": "0hwhvf1qwkmzzlzdda1flw6p1jjh9rzxsfwm2sc4795ac2xm6dhc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140128.1334",
-        "deps": []
-    },
-    "emacsql": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "emacsql",
-            "sha256": "0ld5qpl7b3iksgxcfysznf88wj019l5271kdz4nalqi4kchf5xad",
-            "rev": "74bd11bc0998d7019a05eecc0486fee09c84a93b"
-        },
-        "recipe": {
-            "sha256": "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151003.2131",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "finalize"
-        ]
-    },
-    "ido-skk": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tsukimizake",
-            "repo": "ido-skk",
-            "sha256": "149cznbybwj0gkjyvpnh4kn258kxw449m7cn95n9jbh1r45vljvy",
-            "rev": "89a2e62799bff2841ff634517c86084c4ce69246"
-        },
-        "recipe": {
-            "sha256": "1fyzjkw9xp126bzfv1254bvyakh323iw3wdzrkd9gb4ir39k5jzw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151111.350",
-        "deps": [
-            "ddskk",
-            "emacs"
-        ]
-    },
-    "help-fns+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/help-fns+.el",
-            "sha256": "00x3ln7x4d6r422x845smf3h0x1z85l5jqyjkrllqcs7qijcrk5w"
-        },
-        "recipe": {
-            "sha256": "10vz7w79k3barlcs3ph3pc7914xdhcygagdk2wj3bq0wmwxa1lia",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151215.837",
-        "deps": []
-    },
-    "cmake-ide": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "atilaneves",
-            "repo": "cmake-ide",
-            "sha256": "1qkcyh26iz7xm9a9ki0k3m1mcq4jfddy6n2ibvxl2g1l1p487cgq",
-            "rev": "1b4a9cb5c588efd2e0f9fc9bbc2f638e29bbb9f5"
-        },
-        "recipe": {
-            "sha256": "0xvy7l80zw67jgvk1rkhwzjvsqjqckmd8zj6s67rgbm56z6ypmcg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151216.1347",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "hideshow-org": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "shanecelis",
-            "repo": "hideshow-org",
-            "sha256": "1dr06b9njzih8z97k62l9w3x0a801x4bp043zvk7av9qkz8izl2r",
-            "rev": "16419e52e6cdd2f46f755144c0ab11ce00d1a626"
-        },
-        "recipe": {
-            "sha256": "1bzx5ii06r64nra92zv1dvw5zv3im7la2dd3md801hxyfrpb74gc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120223.1650",
-        "deps": []
-    },
-    "jammer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wasamasa",
-            "repo": "jammer",
-            "sha256": "0x0vz7m9kn7b2aiqvrdqx8qh84ynbpzy2asz2b18l47bcwa7r5bh",
-            "rev": "1ba232b71507b468c60dc53c2bc8888bef36c858"
-        },
-        "recipe": {
-            "sha256": "01c4bii7gswhp6z9dgx4bhvsywiwbbdv7mg1zj6vp1530l74zx6z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151213.814",
-        "deps": []
-    },
-    "ghci-completion": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "manzyuk",
-            "repo": "ghci-completion",
-            "sha256": "17fl3k2sqiavbv3bp6rnp3p89j6pnpkkp7wi26pzzk4675r5k45q",
-            "rev": "c47e23d585d2a3c7b13aac163693fdc4f2bb90e5"
-        },
-        "recipe": {
-            "sha256": "1a6k47z5kmacj1s5479393jyj27bjx0911yaqfmmwg2hr0yz7vll",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151125.657",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "dired-sort-menu+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/dired-sort-menu+.el",
-            "sha256": "0l19xa7z4015lqw98dzb5i40na32758wxyfka2vdhn7g5iq7qday"
-        },
-        "recipe": {
-            "sha256": "19ah8qgbfdvyhfszdr6hlw8l01lbdb84vf5snldw8qh3x6lw8cfq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151213.1640",
-        "deps": [
-            "dired-sort-menu"
-        ]
-    },
-    "tide": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ananthakumaran",
-            "repo": "tide",
-            "sha256": "045c1fmmig88lc7c85vy8532mx0lhl666m5lrrv4i6r5n6sf68s3",
-            "rev": "0c0f95b9e5abdbe60ccfcefc81f02178bfa940ab"
-        },
-        "recipe": {
-            "sha256": "1z2xr25s23sz6nrzzw2xg1l2j8jvjhxi53qh7nvxmmq6n6jjpwg1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151201.245",
-        "deps": [
-            "dash",
-            "emacs",
-            "flycheck",
-            "typescript-mode"
-        ]
-    },
-    "org-doing": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "omouse",
-            "repo": "org-doing",
-            "sha256": "1wrgqdrfdxc1vrcr6dsa8dcxrwj6zgjr9h1fzilwnxlzfvdilnsm",
-            "rev": "7d0a8ef5dcd18ee375da6298d96e6858508fb919"
-        },
-        "recipe": {
-            "sha256": "17w49z78fvbz182sxv9mnryj124gm9jbdmbybppjqz4rk6wvnm2j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150824.901",
-        "deps": []
-    },
-    "go-eldoc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-go-eldoc",
-            "sha256": "1jwh5rqk7vr6kna6i0p3fl3wjk3mhlr6gxklc3xij4r2zdyfj8na",
-            "rev": "684f1414913c85695eb8ca4a2643cea04ee60527"
-        },
-        "recipe": {
-            "sha256": "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151028.210",
-        "deps": [
-            "cl-lib",
-            "go-mode"
-        ]
-    },
-    "w32browser-dlgopen": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/w32browser-dlgopen.el",
-            "sha256": "15cjfr8fknlp61mqz6377d4pprv3pddhiqqdhk1lsz2mncw8z9mq"
-        },
-        "recipe": {
-            "sha256": "0dnvsnahnbnvjlhfmb0q6agzikv9d42fbnfrwsz6hni92937gz39",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1906",
-        "deps": []
-    },
-    "cerbere": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nlamirault",
-            "repo": "cerbere",
-            "sha256": "17jg5d5afh9zpnjx8wkys8bjllxq99j0yhz8j3fvkskisvhkz1im",
-            "rev": "ef573b05f4c2a067b8234003aaa4b2a76fffea5c"
-        },
-        "recipe": {
-            "sha256": "1g3svmh5dlh5mvyag3hmiy90dfkk6f7ppd9qpwckxqyll9vl7r06",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140418.915",
-        "deps": [
-            "f",
-            "pkg-info",
-            "s"
-        ]
-    },
-    "key-intercept": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarao",
-            "repo": "key-intercept-el",
-            "sha256": "143nfs8pgi5yy3mjq7nirffplk4vb8kik4q7zypynh2pddip30a4",
-            "rev": "d9a60edb4ce893f2d3d94f242164fdcc62d43cf2"
-        },
-        "recipe": {
-            "sha256": "1z776jbpjks5bir6bd0748mlrmz05nf0jy9l4hlmwgyn72dcbx16",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140211.149",
-        "deps": []
-    },
-    "grandshell-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "steckerhalter",
-            "repo": "grandshell-theme",
-            "sha256": "1202fwwwdr74q6s5jv1n0mvmq4n9mra85l14hdhwh2kks513s6vs",
-            "rev": "6bf34fb1a3117244629a7fb23daf610f50854bed"
-        },
-        "recipe": {
-            "sha256": "1mnnjsw1kx40b6ws8wmk25fz9rq8rd70xia9cjpwdfkg7kh8xvsa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150404.701",
-        "deps": []
-    },
-    "warm-night-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mswift42",
-            "repo": "warm-night-theme",
-            "sha256": "1x472s5qr6wvla7nj5i9mas8z9qhkj4zj5qghfwn5chb9igvfkif",
-            "rev": "67cc2a1591c0627e6310cdfe8ca7c8d4565b9c16"
-        },
-        "recipe": {
-            "sha256": "1nrjkrr64rry6fjya22b0lcs0f8a2ijvr87192z311y9mw5rvb29",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150607.941",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "cbm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "akermu",
-            "repo": "cbm.el",
-            "sha256": "1b3cjb27z0nypn9nsmi93b61j7a252fb7sclh1mrsnanhvbwl0zx",
-            "rev": "40ae4f6ed075889346b4ba7cf991f5ad6dd6d1b7"
-        },
-        "recipe": {
-            "sha256": "02ch0gdw610c8dfxxjxs7ijsc9lzbhklj7hqgwfwksnyc36zcjmn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150715.1404",
-        "deps": []
-    },
-    "lacarte": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/lacarte.el",
-            "sha256": "1nlras4g3ncp1pcmkkpa2j88zvqjibmn5h6ilahgjry0dwg9qw5j"
-        },
-        "recipe": {
-            "sha256": "0a0n1lqakgsbz0scn6617rkkkvzwranzlvkzw9q4zapiz1s9xqp9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1750",
-        "deps": []
-    },
-    "diff-hl": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dgutov",
-            "repo": "diff-hl",
-            "sha256": "1n1acyd39n0zbfcc5bzn81yzw7f1z1mxz43maq5hdc25m8rcqkw2",
-            "rev": "89e08d60c4e8d5d4ddd47e14c0dd769ba965a545"
-        },
-        "recipe": {
-            "sha256": "0kw0v9xcqidhf26qzrqwdlav2zhq32xx91k7akd2536jpji5pbn6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151120.1915",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "outline-magic": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tj64",
-            "repo": "outline-magic",
-            "sha256": "116cwlhn7s47rhivz6113lh8lvaz3bjb3ynjlbx9hyf7gq3nfnxn",
-            "rev": "5689436cd67edc86066e51be77fa4e1fe21de507"
-        },
-        "recipe": {
-            "sha256": "085yayzph3y7fh6pd5sdjdkhdcvwfzcyqd6y3xlbz7wni5ac6b5f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150209.1626",
-        "deps": []
-    },
-    "vim-empty-lines-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jmickelin",
-            "repo": "vim-empty-lines-mode",
-            "sha256": "09x857vbx35rpyc5x1322ajby613gva090x4vawaczk22idq65h4",
-            "rev": "442a29b0ba1635a3b352c9dd1faf9ce99656d048"
-        },
-        "recipe": {
-            "sha256": "17bl1g4ais73ws596mha0l8dgckfqhx9k2v9m9k0gw7kg7dcjhnb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150110.2226",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "mmt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mrkkrp",
-            "repo": "mmt",
-            "sha256": "05nmcx3f63ds31cj3qwwp03ksflkfwlcn3z2xyxbny83r0dxbgvc",
-            "rev": "e77b809e39b9ab437b662ee759e990163bc89377"
-        },
-        "recipe": {
-            "sha256": "0hal3qcw6x9658xpdaw6q9l2rr2z107pvg5bdzshf67p1b3lf9dq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150906.1159",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "fetch": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "crshd",
-            "repo": "fetch.el",
-            "sha256": "0pjw9fb3n08yd38680ifdn2wlnw2k6q97lzhqb2259mywsycyqy8",
-            "rev": "3f2793afcbbc32f320e572453166f9354ecc6d06"
-        },
-        "recipe": {
-            "sha256": "1jqc6pspgcrdzm7ij46r1q6vpjq7il5dy2xyxwn2c1ky5a80paby",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131201.130",
-        "deps": []
-    },
-    "vimish-fold": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mrkkrp",
-            "repo": "vimish-fold",
-            "sha256": "1kypjcw9n2amfq3y2g1dgx6zxf0yy4xnmxjg1fgs9j3xshg6y61m",
-            "rev": "843a709a129f3f587fa69a67ec655b2ef301ea8a"
-        },
-        "recipe": {
-            "sha256": "017by9w53d8pqlsazfycmhdv16yylks308p5vxp1rcw2qacpc5m3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151124.1009",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "f"
-        ]
-    },
-    "stripe-buffer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sabof",
-            "repo": "stripe-buffer",
-            "sha256": "0dxajh72wdcwdb9ydbcm19fmp0p1drmh1niq4r69jnbn8sah0zax",
-            "rev": "c252080f55cb78c951b19ebab9687f6d00237baf"
-        },
-        "recipe": {
-            "sha256": "02wkb9y6vykrn6a5nfnimaplj7ig8i8h6m2rvwv08f5ilbccj16a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141208.908",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "web-completion-data": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "osv",
-            "repo": "web-completion-data",
-            "sha256": "12j8ql9v9mrg8hlsminpm3ydcacc2fbdjsfw7l604sc3qvgza1lm",
-            "rev": "81482f9ff17e13906bdbd9db6bc4e1cbdc0e1870"
-        },
-        "recipe": {
-            "sha256": "1zzdmhyn6bjaidk808s4pdk25a5rn4287949ps5vbpyniaf6gny9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150623.533",
-        "deps": []
-    },
-    "slime-company": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "anwyn",
-            "repo": "slime-company",
-            "sha256": "1yi89hmnawf1pf9nv3f6i8a168wvri3zc40wgbbgnda8hxrcqkjx",
-            "rev": "cf03a862c3aa2393eb151af9e5bc032aa6b6f154"
-        },
-        "recipe": {
-            "sha256": "195s5fi2dl3h2jyy4d45q22jac35sciz81n13b4lgw94mkxx4rq2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151210.814",
-        "deps": [
-            "company",
-            "slime"
-        ]
-    },
-    "flymake-php": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-php",
-            "sha256": "09mibjdji5mf3qvngspv1zmik1zd9jwp4mb4c1w4256202359sf4",
-            "rev": "93abe12d62b13f1d035a0df01e53e4bacdac2c66"
-        },
-        "recipe": {
-            "sha256": "12ds2l5kvs7fz38syp4amasbjkpqd36rlpajnb3xxll0hbk6vffk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121104.1302",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "jade-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "brianc",
-            "repo": "jade-mode",
-            "sha256": "1q6wpjb7vhsy92li6fag34pwyil4zvcchbvfjml612aaykiys506",
-            "rev": "0d0bbf60730d0e33c6362e1fceeaf0e133b1ceeb"
-        },
-        "recipe": {
-            "sha256": "156j0d9wx6hrhph0nsjsi1jha4h65rcbrbff1j2yr8vdsszjrs94",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150801.1144",
-        "deps": []
-    },
-    "cheatsheet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "darksmile",
-            "repo": "cheatsheet",
-            "sha256": "1v2r7b6dbnxfhacg8cbb0wkymsnxnr2qgxsdbzqb4lh7r282vxxn",
-            "rev": "80e58c1783571e2907dfe25a32ae46ad3da1bcf1"
-        },
-        "recipe": {
-            "sha256": "11z3svlzvmhdy0pkxbx9qz9bnq056cgkbfyw9z34aq1yxazi2cpq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151203.351",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "xquery-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mblakele",
-            "repo": "xquery-mode",
-            "sha256": "09fpxr55b2adqmca8xhpy8z5cify5091fjdjyxjd1jh5wdp1658v",
-            "rev": "ac0ca72ccd575952393804330c3efe3b2271c4e2"
-        },
-        "recipe": {
-            "sha256": "0b5k2ihbjm5drv4lf64ap31yj873x1fcq85y6yq1ayahn6s52rql",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140121.1143",
-        "deps": []
-    },
-    "dakrone-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dakrone",
-            "repo": "dakrone-theme",
-            "sha256": "0fd0h07m42q2h1ggsjra20kzv209rpb4apjv408h2dxqm8sy0jiy",
-            "rev": "281ac9f9080a94bf9dada2f40cdba58e50f94235"
-        },
-        "recipe": {
-            "sha256": "0ma4rfmgwd6k24jzn6pgk46b88jfix7mz0ib7c7r90h5vmpiq814",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140211.2245",
-        "deps": []
-    },
-    "smart-mode-line-powerline-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "smart-mode-line",
-            "sha256": "17m8nqp9xarrsr68n6c9jqzv2jzsyq0m1hqqhlj9j363x6y8790y",
-            "rev": "4b3265ec3e442bd8c596b99cfd4ec73424c395ec"
-        },
-        "recipe": {
-            "sha256": "0hv3mx39m3l35xhz351zp98321ilr6qq9wzwn1f0ziiv814khcn4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151201.839",
-        "deps": [
-            "emacs",
-            "powerline",
-            "smart-mode-line"
-        ]
-    },
-    "signature": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pidu",
-            "repo": "signature",
-            "sha256": "1g4rr7hpy9r3y4vdpv48xpmy8kqvs4j64kvnhnj2rw2wv1grw78j",
-            "rev": "c47df2e1189a84505f9224aa78e87b6c65d13d37"
-        },
-        "recipe": {
-            "sha256": "11n3id1iiip99lj8c0iffbrf59s2yvmwlhqbf8xzxkhws7vwdl5q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140730.1449",
-        "deps": []
-    },
-    "unfill": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "unfill",
-            "sha256": "0fd9k5m1yw2274m2w9rkrg7vqagzf0rjbybglqi7d200b3hmjin3",
-            "rev": "d5f3dbaaaa871dc26bbc9e4bcd6deacac02a02d4"
-        },
-        "recipe": {
-            "sha256": "0b21dk45vbz4vqdbdx0n6wx30rm38w1jjqbsxfj7b96p3i5shwqv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131103.413",
-        "deps": []
-    },
-    "sonic-pi": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "repl-electric",
-            "repo": "sonic-pi.el",
-            "sha256": "1ga35d3rhdf6ffd36q58ay6380gjvkmaiid4vscga3v7ca0dkhl1",
-            "rev": "3d88a784bf7883ec56fbef5923c4e1b50d2b9b09"
-        },
-        "recipe": {
-            "sha256": "07qxm1rkw2cbxf4g2vqk3s7xnqldqkdm2zw1qh2kqjscg5gwpkqp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150919.530",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "emacs",
-            "osc"
-        ]
-    },
-    "org-page": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kelvinh",
-            "repo": "org-page",
-            "sha256": "05q3dx7sfv51frsa3mk06pbrw3n986adgn08yrjwj0am0p11vpqs",
-            "rev": "75859f2d7e05be5dd9899f765adbf2e2d434ba83"
-        },
-        "recipe": {
-            "sha256": "1326m3w7vz22zk7rx40z28fddsccy5fl1qhbb7clci8l69blcc2v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150913.1933",
-        "deps": [
-            "dash",
-            "ht",
-            "htmlize",
-            "mustache",
-            "org",
-            "simple-httpd"
-        ]
-    },
-    "auto-complete-c-headers": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mooz",
-            "repo": "auto-complete-c-headers",
-            "sha256": "12mzi6bwg702sp0f0wd1ag555blbpk252rr9rqs03bn8pkw89h4n",
-            "rev": "52fef720c6f274ad8de52bef39a343421006c511"
-        },
-        "recipe": {
-            "sha256": "02pkrxvzrpyjrr2fkxnl1qw06aspzv8jlp2c1piln6zcjd92l3j7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150911.2223",
-        "deps": [
-            "auto-complete"
-        ]
-    },
-    "grails-projectile-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yveszoundi",
-            "repo": "grails-projectile-mode",
-            "sha256": "11ry4p5r0hg3jlmfhp6hfkryzrp6snl38v8j7ds8limhbpdh5wr4",
-            "rev": "6cb3b7890ce869a911a7b1d5892a6eef7992c199"
-        },
-        "recipe": {
-            "sha256": "0dy8v2mila7ccvb7j5jlfkhfjsjfk3bm3rcy84m0rgbqjai67amn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141229.1329",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "projectile"
-        ]
-    },
-    "web-beautify": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yasuyk",
-            "repo": "web-beautify",
-            "sha256": "0ky2rg16xrbnsvqc6gcfhgi69fdzbx6jlsq73n8hr0n4562czhzl",
-            "rev": "be2b9a7f510e1719396ebeab9135bc64f0785b78"
-        },
-        "recipe": {
-            "sha256": "06ky2svhca8hjgmvxrg3h6ya7prl72q1r88x967yc6b0qq3r7g0f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131118.426",
-        "deps": []
-    },
-    "inf-clojure": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "clojure-emacs",
-            "repo": "inf-clojure",
-            "sha256": "1b1w999gsz2w7djc46pcxchqzpkwvqg3cfsh3j8mhb1rvmh33m7a",
-            "rev": "54fe6de266db1bbdaa634ce7680ea8733971335c"
-        },
-        "recipe": {
-            "sha256": "0n8w0vx1dnbfz88j45a57z9bsmkxr2zyh6ld72ady8asanf17zhl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151224.1407",
-        "deps": [
-            "clojure-mode",
-            "emacs"
-        ]
-    },
-    "php-boris-minor-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "steckerhalter",
-            "repo": "php-boris-minor-mode",
-            "sha256": "1wk7vq80v97psxfg0pwy4mc6kdc61gm6h1vgl9p71ii6g6zvzcqg",
-            "rev": "c70e176dd6545f2d42ca3427e87b469635616d8a"
-        },
-        "recipe": {
-            "sha256": "1cmpd303chldss7kylpinv8qc3c78srz02a9cp9x79c8arq7apwl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140209.1235",
-        "deps": [
-            "highlight",
-            "php-boris"
-        ]
-    },
-    "rcirc-alertify": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fgallina",
-            "repo": "rcirc-alertify",
-            "sha256": "1mpk5rzsil298q3ppv5v9jrn274v71jffyz0jihrksh1wbjzwhlx",
-            "rev": "ea5cafc55893f375eccbe013d12dbaa94bf6e259"
-        },
-        "recipe": {
-            "sha256": "13448bykmy0jqcajhn2gjiar3m8cingyr8394vxybp2m1zvv0pws",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140406.2019",
-        "deps": [
-            "alert"
-        ]
-    },
-    "git-wip-timemachine": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "itsjeyd",
-            "repo": "git-wip-timemachine",
-            "sha256": "1ivnf4vsqk6c7iw1cid7q1hxp7047ajd1mpg0fl002d7m7ginhyl",
-            "rev": "ed4c7931a5f5233bf3e358b1e81647d063526460"
-        },
-        "recipe": {
-            "sha256": "02fi51k6l23cgnwjp507ylkiwb8azmnhc0fips68nwn9dghzp6dw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150408.506",
-        "deps": [
-            "s"
-        ]
-    },
-    "shell-pop": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kyagi",
-            "repo": "shell-pop-el",
-            "sha256": "0fzywfdaisvvdbcl813n1shz0r8v1k9kcgxgynv5l0i4nkrgkww5",
-            "rev": "4531d234ca471ed80458252cba0ed005a0720b27"
-        },
-        "recipe": {
-            "sha256": "02s17ln0hbi9gy3di8fksp3mqc7d8ahhf5vwyz4vrc1bg77glxw8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151121.830",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "cider-decompile": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "clojure-emacs",
-            "repo": "cider-decompile",
-            "sha256": "1w4y65s3m2irga4iqfqqkcmvl6ss24zmaxqzbfib8jmi84r4lpac",
-            "rev": "5d87035f3c3c14025e8f01c0c53d0ce2c8f56651"
-        },
-        "recipe": {
-            "sha256": "0jhsm31zcfwkbpsdh1lvmjm1fv2m7y849930sjvf5nxv3ffhx3b4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151121.2337",
-        "deps": [
-            "cider",
-            "javap-mode"
-        ]
-    },
-    "j-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zellio",
-            "repo": "j-mode",
-            "sha256": "07kbicf760nw4qlb2lkf1ns8yzqy0r5jqqwqjbsnqxx4sm52hml9",
-            "rev": "caa55dfaae01d1875380929826952c2b3ef8a653"
-        },
-        "recipe": {
-            "sha256": "0f9lsr9hjhdvmzx565ivlncfzb4iq4rjjn6a41053cjy50bl066i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140702.1009",
-        "deps": []
-    },
-    "persistent-scratch": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "persistent-scratch",
-            "sha256": "0vzifam1a3gy27phvhgi081v99pim669xymfwd9f96pnh0pwsqbh",
-            "rev": "52be8e41fe1e23a1f2b912fc119af06cc051bd28"
-        },
-        "recipe": {
-            "sha256": "0iai65lsg3zxj07hdb9201w3rwrvdb3wffr6k2jdl8hzg5idghn1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150202.1143",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "map-regexp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "map-regexp",
-            "sha256": "0kk1sk3cr4dbmgq4wzml8kdf14dn9jbyq4bwmvk0i7dic9vwn21c",
-            "rev": "b8e06284ec1c593d7d2bda5f35597a63de46333f"
-        },
-        "recipe": {
-            "sha256": "0yiif0033lhaqggywzfizfia3siggwcz7yv4z7przhnr04akdmbj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130522.1603",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "sauron": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "djcb",
-            "repo": "sauron",
-            "sha256": "0hzg05i8x2xgsr99nyikvflsibjsq2nryfsw7y2wyhc43w89l8cb",
-            "rev": "d7704fd9a0623d862f03f40588ac816a8877f308"
-        },
-        "recipe": {
-            "sha256": "01fk1xfh7r16fb1xg5ibbs7gci9dja49msdlf7964hiq7pnnhxgb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150614.246",
-        "deps": []
-    },
-    "ob-browser": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "krisajenkins",
-            "repo": "ob-browser",
-            "sha256": "1nzli8wk3nd05j2z2fw511857qbawirhg8mfw21wqclkz8zqn813",
-            "rev": "9271453d28d0912093ab5f91807745ada69ada0c"
-        },
-        "recipe": {
-            "sha256": "1yqbzmmazamgf8fi8ipq14ffm8h1pp5d2lkflbxjsagdq61hirxm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150101.910",
-        "deps": [
-            "org"
-        ]
-    },
-    "scratch-palette": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "scratch-palette",
-            "sha256": "00b4r8bqlxc29k18vig0164d5c9fp5bp5q26d28lwr4f0s4a71d2",
-            "rev": "f6803b448079f4a81cc699cec7442ef543cd5818"
-        },
-        "recipe": {
-            "sha256": "0m6hc2amwnnii4y189kkridhapl9jipkmadvrmwvspgy3lxhlafs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150225.242",
-        "deps": [
-            "popwin"
-        ]
-    },
-    "ariadne": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "manzyuk",
-            "repo": "ariadne-el",
-            "sha256": "0vh9wfc3657sd12ybjcrxpg6f757x2ghkcl1lw01szmyy5vmj27h",
-            "rev": "6fe401c7f996bcbc2f685e7971324c6f5e5eaf15"
-        },
-        "recipe": {
-            "sha256": "0lfhving19wcfr40gjb2gnginiz8cncixiyyxhwx08lm84qb3a7p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131117.1111",
-        "deps": [
-            "bert"
-        ]
-    },
-    "company-ansible": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "krzysztof-magosa",
-            "repo": "company-ansible",
-            "sha256": "06gh33qzglv40r62dsapzhxwparw8ciblv80g7h6y6ilyazwcidn",
-            "rev": "cfe1c915f49d716f30eec654c54db761f662952c"
-        },
-        "recipe": {
-            "sha256": "084l9dr2hvm00952y4m3jhchzxjhcd61sfn5ywj9b9a1d4sr110d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150901.450",
-        "deps": [
-            "company",
-            "emacs"
-        ]
-    },
-    "flycheck-ocaml": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "flycheck",
-            "repo": "flycheck-ocaml",
-            "sha256": "0fm8w7126vf04n76qhh33rzybvl1n7va2whbqzafbvmv2nny3v94",
-            "rev": "e4412025f27850918762237fa80b33e285a63e7c"
-        },
-        "recipe": {
-            "sha256": "1cv2bb66aql2kj1y1gsl4xji8yrzrq6rd8hxxs5vpfsk47052lf7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151103.412",
-        "deps": [
-            "emacs",
-            "flycheck",
-            "let-alist",
-            "merlin"
-        ]
-    },
-    "eshell-z": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xuchunyang",
-            "repo": "eshell-z",
-            "sha256": "0znk2wmvk7b5mi727cawbddvzx74dlm1lwsxgkiylx2qp299ark0",
-            "rev": "5a1317a58d9761c200d0ad49dc4793dec9f9490f"
-        },
-        "recipe": {
-            "sha256": "14ixazj0nscyqsdv7brqnfr0q8llir1pwb91yhl9jdqypmadpm6d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151110.2246",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "fix-word": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mrkkrp",
-            "repo": "fix-word",
-            "sha256": "17f11v9sd5fay3i4k6lmpsjicdw9j3zvx3fvhx0a86mp7ay2ywwf",
-            "rev": "3e6aa7e3e2625efdac2c0f7d715959dabf01560f"
-        },
-        "recipe": {
-            "sha256": "0a8w09cx8p5pkkd4533nd199axkhdhs2a7blp7syfn40bkscx6xc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150716.802",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "celery": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ardumont",
-            "repo": "emacs-celery",
-            "sha256": "0974bxy85rcxia6dkfryas2g46nanjdf8fv90adbc7kyj07xsf7c",
-            "rev": "5b5b1968fd258c444dc2372e989aab82830004c3"
-        },
-        "recipe": {
-            "sha256": "0m3hmvp6xz2m7z1kbb0ii0j3c95zi19652gfixq5a5x23kz8y59h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150812.347",
-        "deps": [
-            "dash-functional",
-            "deferred",
-            "emacs",
-            "s"
-        ]
-    },
-    "lib-requires": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/lib-requires.el",
-            "sha256": "1s6969kz6hpgjdm3xp18ik116nji43md7vbya600cmq48njk44nk"
-        },
-        "recipe": {
-            "sha256": "1g22jh56z8rnq0h80wj10gs38yig1rk9xmk3kmhmm5mm6b14iwdx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1751",
-        "deps": []
-    },
-    "charmap": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lateau",
-            "repo": "charmap",
-            "sha256": "0crnd64cnsnaj5mcy55q0sc1rnamxa1xbpwpmirhyhxz780klww6",
-            "rev": "165193d91ef96f563ae8366ed4c1a2df5a4eaed2"
-        },
-        "recipe": {
-            "sha256": "1j7762d2i17ysn9ys8j7wfv989avmax8iylml2hc26mwbpyfpm84",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131019.2358",
-        "deps": []
-    },
-    "parsebib": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joostkremers",
-            "repo": "parsebib",
-            "sha256": "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml",
-            "rev": "9a1f60bed2814dfb5cec2b92efb5951a4b465cce"
-        },
-        "recipe": {
-            "sha256": "07br2x68scsxykdk2ajc4mfqhdb7vjkcfgz3vnpy91sirxzgfjdd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151006.432",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "hindent": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chrisdone",
-            "repo": "hindent",
-            "sha256": "1phyaf6fwaxi2plq38m09cfb5ls401ay8jw0yf5rix8nyvm8nrn9",
-            "rev": "575a7a19f9c86b9699a6222072c79fe02da18c4c"
-        },
-        "recipe": {
-            "sha256": "1f3vzgnqigwbwvglxv0ziz3kyp5dxjraw3vlghkpw39f57mky4xz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151113.224",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "world-time-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nicferrier",
-            "repo": "emacs-world-time-mode",
-            "sha256": "0i00xm4rynbp2v3gm6h46ajgj8h8nxnsjh6db1659b0hbpnah0ji",
-            "rev": "ce7a3b45c87eb24cfe61eee453175d64f741d7cc"
-        },
-        "recipe": {
-            "sha256": "10gdlz4l9iqw1zdlk5i3knysn36iqxdh3xabjq8kq04jkl7i36dl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140627.307",
-        "deps": []
-    },
-    "sudden-death": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yewton",
-            "repo": "sudden-death.el",
-            "sha256": "1007xz4x1wgvxilv1qwf0a4y7hd7sqnnzwk2bdr12kfk7vq9cw2b",
-            "rev": "beba6b4fb42b1e27575d3f722d23a0eb19666736"
-        },
-        "recipe": {
-            "sha256": "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140829.738",
-        "deps": []
-    },
-    "multifiles": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "multifiles.el",
-            "sha256": "065l04ylplng1vgykkbn2vnkcs3sn1k2cikx1ha2q8wmgx6bkvai",
-            "rev": "dddfe64b8e1c1cd1f9ccc1f03405477fc0d53897"
-        },
-        "recipe": {
-            "sha256": "0m0pi2qjis9p6z9cd8hlxm1r88ynwmd2ks8wg65sffffwsdbg4kz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130615.1633",
-        "deps": []
-    },
-    "remark-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "torgeir",
-            "repo": "remark-mode.el",
-            "sha256": "0w40cx58c0hmc0yzs8maq1389hwha0qwfbz76pc6kpcx14v1gkhh",
-            "rev": "a7e22eaf17673bd5cbf2f80bdfb219c89c1ea74b"
-        },
-        "recipe": {
-            "sha256": "1zl8k3h4acbgb3hmjs2b4a14g0s0vl3xamrqxrr742zmqpr1h0w0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151004.1155",
-        "deps": [
-            "markdown-mode"
-        ]
-    },
-    "flatland-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gchp",
-            "repo": "flatland-emacs",
-            "sha256": "0cl8m1i1aaw4zmkrkhfchhp0gxhpvhcmpjglsisjni47y5mydypf",
-            "rev": "b2c2df1fc20a3a23787644f91f8121d9353f9bf9"
-        },
-        "recipe": {
-            "sha256": "14drqwcp9nv269aqm34d426a7gx1a7kr9ygnqa2c8ia1fsizybl3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140805.505",
-        "deps": []
-    },
-    "jist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-pe",
-            "repo": "jist.el",
-            "sha256": "0c53awaf93pxc8fn1wf6gkd46x1c0q98ygssz8gflp0a88fmm78g",
-            "rev": "6f36b550b65083ac4a6e824382891518b578e9f3"
-        },
-        "recipe": {
-            "sha256": "11m9li1016cfkm4931h69d7g1dc59lwjl83wy3yipswdg3zlw0ar",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151221.1752",
-        "deps": [
-            "dash",
-            "emacs",
-            "let-alist",
-            "magit",
-            "pkg-info",
-            "request"
-        ]
-    },
-    "groovy-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Groovy-Emacs-Modes",
-            "repo": "groovy-emacs-modes",
-            "sha256": "07xiyf30p6hdd6lxv7c6xqpnvw6ys0halg8di0m3pwqz9qf4rj4i",
-            "rev": "74f360ee1ad25755707a89bec9eeed571b6748d0"
-        },
-        "recipe": {
-            "sha256": "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151206.154",
-        "deps": []
-    },
-    "redshank": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "http://www.foldr.org/~michaelw/projects/redshank.git",
-            "sha256": "5547c5db0caa147ae2fa0099b9c58a8629b47bf4facb6c5cc72cee45e84be392",
-            "rev": "f98e68f532e622bcd464292ca4a9cf5fbea14ebb"
-        },
-        "recipe": {
-            "sha256": "07s4gja1w8piabkajbzrgq77mkdkxr0jy9bmy2qb9w2svfsyns9b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120510.1430",
-        "deps": []
-    },
-    "simplenote2": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alpha22jp",
-            "repo": "simplenote2.el",
-            "sha256": "1a0l0f6by1nmnnq0n52la9g3d357bmwak4qgy6p8g66qb9rx6rzv",
-            "rev": "2a6c539d98968837ec09d2754e9235ff278057a8"
-        },
-        "recipe": {
-            "sha256": "1qdzbwhzmsga65wmrd0mb3rbs71nlyqqb6f4v7kvfxzyis50cswm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150630.916",
-        "deps": [
-            "request-deferred"
-        ]
-    },
-    "pivotal-tracker": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jxa",
-            "repo": "pivotal-tracker",
-            "sha256": "1sbwqrk9nciqwm53sfbq3nr9f9zzpz79dmxs8yp005dk7accdlls",
-            "rev": "93f2b45b373bf6972dcc4b16814ef23e1a6c16f5"
-        },
-        "recipe": {
-            "sha256": "195wcfn434yp0p93zqih1snkkg1v7nxgb4gn0klajahmyrrjq2a2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151203.1350",
-        "deps": []
-    },
-    "cake": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k1LoW",
-            "repo": "emacs-cake",
-            "sha256": "0bvrwzjx93qyx97qqw0imvnkkx4w91yk99rnhcmk029zj1fy0kzg",
-            "rev": "a7c9f3bee71eb3865060123d4d98e5397c2f967e"
-        },
-        "recipe": {
-            "sha256": "06qlqrazz2jr08g44q73hx9vpp6xnjvkpd6ky108g0xc5p9q2hcr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140603.2331",
-        "deps": [
-            "anything",
-            "cake-inflector",
-            "historyf"
-        ]
-    },
-    "realgud": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rocky",
-            "repo": "emacs-dbgr",
-            "sha256": "1qlf9whz912jk7j87zal10b48a9agpfxkyqa7s1xjchs4k662a24",
-            "rev": "4e85910b106e3094d2b27ac34f584df5bf4ab457"
-        },
-        "recipe": {
-            "sha256": "15vlln4w4wlgrk5i5nhgvjcbardpahgs9kwwayb1vmj10c8a837s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151215.1523",
-        "deps": [
-            "list-utils",
-            "load-relative",
-            "loc-changes",
-            "test-simple"
-        ]
-    },
-    "js2-refactor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "js2-refactor.el",
-            "sha256": "08wxsz90x5zhma3q8kqfd01avhzxjmcrjc95s757l5xaynsc2bly",
-            "rev": "ac3da94a33b714d44d4f0adc670a829fdc522e34"
-        },
-        "recipe": {
-            "sha256": "09dcfwpxxyw0ffgjjjaaxbsj0x2nwfrmxy1a05h8ba3r3jl4kl1r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151029.707",
-        "deps": [
-            "dash",
-            "js2-mode",
-            "multiple-cursors",
-            "s",
-            "yasnippet"
-        ]
-    },
-    "ecb": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alexott",
-            "repo": "ecb",
-            "sha256": "1hs069m4m6vhb37ac2x6hzbp9mfmpd3zhp4m631lx8dlmx11rydz",
-            "rev": "071706b22efcfeb65da8381e317220d7f9d8cb54"
-        },
-        "recipe": {
-            "sha256": "097hdskhfh255znrqamcssx4ns1sgkxchlbc7pjqwzpflsi0fx89",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140215.314",
-        "deps": []
-    },
-    "helm-img-tiqav": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "l3msh0",
-            "repo": "helm-img-tiqav",
-            "sha256": "04vdin0n3514c8bycdjrwk3l6pkarrwanlklnm75315b91nkkbcp",
-            "rev": "33a7e9508bc8f37d53320b56c92b53d321a57bb0"
-        },
-        "recipe": {
-            "sha256": "1m083hiih2rpyy8i439745mj4ldqy85fpnvms8qnv3042b8x35y0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151224.1722",
-        "deps": [
-            "helm-img"
-        ]
-    },
-    "meta-presenter": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myTerminal",
-            "repo": "meta-presenter",
-            "sha256": "1x425ah3ymjyp3pxvyzyp4gd8zrjx8lgdzprml8qvf1yk82iv45l",
-            "rev": "bfdbe68384466bf3eb991d05c7f371f0b52a382f"
-        },
-        "recipe": {
-            "sha256": "0f70cfa91wavchlx8d9hdlgq90cmnylhbg2dbw603rzjkyvslp5d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150501.610",
-        "deps": []
-    },
-    "kroman": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cheunghy",
-            "repo": "kroman-el",
-            "sha256": "11axxmhdpwgrcyjz200pf5bqzjw9wz4085r8p1n2vr5gx98374fr",
-            "rev": "90402b6ae40383e75d8ba97d66eee93eebf40f70"
-        },
-        "recipe": {
-            "sha256": "0y9ji3c8kndrz605n7b4w5xq0qp093d61hxwhblm3qrh3370mws7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150827.1840",
-        "deps": []
-    },
-    "quickrun": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-quickrun",
-            "sha256": "1i7bx81g8xq7659hc1zlvs0afwkr8mg10cki45khxsxwcy5jr7dh",
-            "rev": "fd9d372bcbb9b4ad52dcae782ca007e5aa7087fd"
-        },
-        "recipe": {
-            "sha256": "1szgirakfnkn9ksls16p233sr7x9ck5m1f1kbk6ancj36yja2nki",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151203.2352",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "enh-ruby-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zenspider",
-            "repo": "enhanced-ruby-mode",
-            "sha256": "008wggl6xxk339njrgpj2fndbil7k9f3i2hg1mjwqk033j87nbz7",
-            "rev": "73d949ab1de16a4d3f368cde94dd5403c0402ab4"
-        },
-        "recipe": {
-            "sha256": "0r486yajjf7vsaz92ypxpfmz2nsvw9giffpxb9szj7fcry3nfdns",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151123.341",
-        "deps": []
-    },
-    "ukrainian-holidays": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "ukrainian-holidays",
-            "sha256": "033v4ck979lhkpwblci5clacfc1xnkq03p5d1m566wff8dp5flwz",
-            "rev": "e52b0c92843e9f4d0415a7ba3b8559785497d23d"
-        },
-        "recipe": {
-            "sha256": "0kbfj2l1rcv74c88nabkwkcl7k9pkim835l24q61zv3i6wf9sykf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130720.849",
-        "deps": []
-    },
-    "rsense": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "m2ym",
-            "repo": "rsense",
-            "sha256": "0xkr1qn8fm3kv5c11janq5acp1q02abvxc463zijvm2qk735yl4d",
-            "rev": "8b5ee58318747ca1dde84ee41d48c4f50175cf35"
-        },
-        "recipe": {
-            "sha256": "1901xqlpc8fg4sl9j58jn40i2djs8s0cdcqcrzrq02lvk8ssfdf5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20100510.2305",
-        "deps": []
-    },
-    "capture": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pashinin",
-            "repo": "capture.el",
-            "sha256": "08cp45snhyir5w8gyp6xws1q7c54pz06q099l0m3zmwn9277g68z",
-            "rev": "1bb26060311da76767f70096218313fc93b0c806"
-        },
-        "recipe": {
-            "sha256": "1hxrvyq8my5886q7wj5w3mhyja7d6cf19gyclap492ci7kmrkdk2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130828.1144",
-        "deps": []
-    },
-    "ocodo-svg-modelines": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ocodo",
-            "repo": "ocodo-svg-modelines",
-            "sha256": "155gmls6cz3zf4lcj89kzb96y7k0glx0f659jg5z0skgxq79hf48",
-            "rev": "c7b0789a177219f117c4de5659ecfa8622958c40"
-        },
-        "recipe": {
-            "sha256": "0fa88ns70wsr9i9gf4zx3fvmn1a32mrjsda105n0cx6c965kfmay",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150516.919",
-        "deps": [
-            "svg-mode-line-themes"
-        ]
-    },
-    "jedi-core": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tkf",
-            "repo": "emacs-jedi",
-            "sha256": "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7",
-            "rev": "8da022c8cda511428c72a6dc4c5be3c0a0c88584"
-        },
-        "recipe": {
-            "sha256": "0pzi32zdb4g9n4kvpmkdflmqypa7nckmnjq60a3ngym4wlzbb32f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151214.905",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "epc",
-            "python-environment"
-        ]
-    },
-    "dim-autoload": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "dim-autoload",
-            "sha256": "0bw1gkaycbbv2glnaa36gwzkl1l6lsq7i2i7jinka92b27zvrans",
-            "rev": "d68ef0d2f9204ffe0d521e2647e6d8f473588fd3"
-        },
-        "recipe": {
-            "sha256": "0lhzzjrgfvbqnzwhjywrk3skdb7x10xdq7d21q6kdk3h5r0np9f9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150815.1032",
-        "deps": []
-    },
-    "sentence-highlight": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/sentence-highlight.el",
-            "sha256": "01qj57zpqpr4rxk9bsx828c7baac1xaa58cz22fncirdx00svn2k"
-        },
-        "recipe": {
-            "sha256": "16kh6567hb9lczh8zpqwbzz5bikg2fsabifhhky8qwxp4dy07v9m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121026.950",
-        "deps": []
-    },
-    "pkgbuild-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "juergenhoetzel",
-            "repo": "pkgbuild-mode",
-            "sha256": "077vp3fxwxj7b98ydw6iyi391w3acp73qwk6615yqdylpp66m750",
-            "rev": "7369ab3c6b59cfdf2ecd2b32ad96ce006e766fa0"
-        },
-        "recipe": {
-            "sha256": "1lp7frjahcpr4xnzxz77qj5hbpxbxm2g28apkixrnc1xjha66v3x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151010.936",
-        "deps": []
-    },
-    "erc-youtube": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kidd",
-            "repo": "erc-youtube.el",
-            "sha256": "0kh4amx3l3a14qaiyvjyak1jbybs6n49mdvzjrd1i2vd1y74zj5w",
-            "rev": "97054ba8475b442e2aa81e5a291f668b7f28697f"
-        },
-        "recipe": {
-            "sha256": "12ylxkskkgfv5x7vlkib963ichb3rlmdzkf4zh8a39cgl8wsmacx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150603.1636",
-        "deps": []
-    },
-    "roguel-ike": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "stevenremot",
-            "repo": "roguel-ike",
-            "sha256": "108j3106n9anas07mj26xlrvscsl5irshd39czkippla84gwmgyc",
-            "rev": "6d9322ad9d43d0c7465f125c8e08b222866e6923"
-        },
-        "recipe": {
-            "sha256": "1a7sa6nhgi0s4gjh55bhk5cg6q6s7564fk008ibmrm05gfq9wlg8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140227.929",
-        "deps": [
-            "popup"
-        ]
-    },
-    "memoize": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "emacs-memoize",
-            "sha256": "0fjwlrdm270qcrqffvarw5yhijk656q4lam79ybhaznzj0dq3xpw",
-            "rev": "b55eab0cb6ab05d941e07b8c01f1655c0cf1dd75"
-        },
-        "recipe": {
-            "sha256": "0mzz3hghnbkmxf9wgjqv3sbyxyqqzvvscazq9ybb0b41qrzm73s6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130421.1434",
-        "deps": []
-    },
-    "helm-words": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pronobis",
-            "repo": "helm-words",
-            "sha256": "19l8vysjygscr1nsddjz2yv0fjhbsswfq40rdny8zsmaa6qhpj35",
-            "rev": "637aa3a7e9cfd34e0127472c5b1f993a4da26185"
-        },
-        "recipe": {
-            "sha256": "0l9mb7g3xzasna1bw2p7vh2wdg1hmjkff40p8kpqvwwzszdm9v76",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150413.1518",
-        "deps": []
-    },
-    "name-this-color": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knl",
-            "repo": "name-this-color.el",
-            "sha256": "0amhw630hgc0j8wr8m6aav399ixi3vbwrck79hhlr3pmyh91vv7n",
-            "rev": "e37cd1291d5d68d4c8d6386eab9cb9d94fd3bcfa"
-        },
-        "recipe": {
-            "sha256": "12nrk1ww766jb4gb4iz6w485nimh2iv8wni2jq4l38v8ndh490zb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151014.1530",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "emacs"
-        ]
-    },
-    "git-messenger": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-git-messenger",
-            "sha256": "038m4fjva8ynlms6dbh55w8x8wsn9c3z02rh4782ck2zi51q0d8g",
-            "rev": "7b16fdc9f6fd1a3b9c9f212b1633291c4c18fc9b"
-        },
-        "recipe": {
-            "sha256": "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150314.802",
-        "deps": [
-            "cl-lib",
-            "popup"
-        ]
-    },
-    "maven-test-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rranelli",
-            "repo": "maven-test-mode",
-            "sha256": "1xn2yyr8mr90cynbxgv0h5v180pzf0ydnjr9spg34mrdicqlki6c",
-            "rev": "a19151861df2ad8ae4880a2e7c86ddf848cb569a"
-        },
-        "recipe": {
-            "sha256": "1k9w51rh003p67yalzq1w8am40nnr2khyyb5y4bwxgpms8z391fm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141219.2357",
-        "deps": [
-            "emacs",
-            "s"
-        ]
-    },
-    "rails-new": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cheunghy",
-            "repo": "rails-new",
-            "sha256": "0cqp2vns7gq377bm6q9n5q0ra1d5yy2x2aiw9q1hswk82xpibj9l",
-            "rev": "b68055a99cde15f9d02ab36b8ad0ea7ab35b2283"
-        },
-        "recipe": {
-            "sha256": "0wgbm6qxqkpsbzj9wccicsphajaii07dl27b8x2vidsyw6ambj5h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141221.249",
-        "deps": []
-    },
-    "help-mode+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/help-mode+.el",
-            "sha256": "1xnlb1sn52dzpwz2hx0wr34682cl83nar7qsacsn70z9h443a30j"
-        },
-        "recipe": {
-            "sha256": "1pmb845bxa5kazjpdxm12rm2wcshmv2cmisigs3kyva1pmi1shra",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1616",
-        "deps": []
-    },
-    "nnir-est": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kawabata",
-            "repo": "nnir-est",
-            "sha256": "0gzxcq0gki89dz9ad26683zhq1nif3wdz185cdplwy68z9szbdx1",
-            "rev": "ba263fbd872fe05cfa6b3d815c0d98cdbe24b687"
-        },
-        "recipe": {
-            "sha256": "04ih47pipph8sl84nv6ka4xlpd8vhnpwhs5cchgk5k1zv3l5scxv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140301.802",
-        "deps": []
-    },
-    "discover-my-major": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "steckerhalter",
-            "repo": "discover-my-major",
-            "sha256": "183dh0laiwnnrjfp9kimg4s9lrzv2lvrc35203igjadj74vpbg1a",
-            "rev": "22130d8f16ef1bf7835d6204216c8c6b1fc8eb95"
-        },
-        "recipe": {
-            "sha256": "0ch2y4grdjp7pvw2kxqnqdl7jd3q609n3pm3r0gn6k0xmcw85fgg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151008.212",
-        "deps": [
-            "makey"
-        ]
-    },
-    "never-comment": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "To1ne",
-            "repo": "never-comment",
-            "sha256": "0p00mmid04pfsna4ify3cy0b9lx431q1r5h772hihsg4f1rs2ppy",
-            "rev": "74ded8f1e7f23240f5f6032d0451fb0a51733bc4"
-        },
-        "recipe": {
-            "sha256": "0sn8y57895bfpgiynnj4m9b3x3dbb9v5fwkcwmf9jr39dbf98v6s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140104.1607",
-        "deps": []
-    },
-    "helm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-helm",
-            "repo": "helm",
-            "sha256": "0l7dzk4xa4nfyj943x4gqcn1brfznfyrdxfwf1v097fp4ix8654q",
-            "rev": "e6fbd80f9f21e7cdb5d530f7aba138ad1dc527ab"
-        },
-        "recipe": {
-            "sha256": "0xsf4rg7kn0m5wjlbwhd1mc38lg2822037dyd0h66h6x2gbs3fd9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151224.1416",
-        "deps": [
-            "async",
-            "cl-lib",
-            "emacs",
-            "helm-core"
-        ]
-    },
-    "helm-flyspell": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pronobis",
-            "repo": "helm-flyspell",
-            "sha256": "1k7invgzqrcm11plyvinqwf98yxibr8i4r9yw3csfsicc8b6if59",
-            "rev": "a9ea896fd932fec15709b88ef8bf101dff261b2d"
-        },
-        "recipe": {
-            "sha256": "1g6xry2y6396pg7rg8hc0l84z5r3j2df7dpd1jgffxa8xa3i661f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151026.1112",
-        "deps": [
-            "helm"
-        ]
-    },
-    "latex-preview-pane": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jsinglet",
-            "repo": "latex-preview-pane",
-            "sha256": "1bvhrh9xfl7p474b8jcczw255d2pjmrz5b60wis0lmmxdljplrfa",
-            "rev": "1a0539ab70eaf5dd31c2c94773dddd6f437fed41"
-        },
-        "recipe": {
-            "sha256": "1id1l473azmc9hm5vq5wba8gad9np7sv38x94qd2zkf8b78pzkbw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151023.1503",
-        "deps": []
-    },
-    "pastelmac-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bmastenbrook",
-            "repo": "pastelmac-theme-el",
-            "sha256": "1v5mpjb8kavbqhvg4rizwg8cypgmi6ngdiy8qp9pimmkb56y42ly",
-            "rev": "bead21741e3f46f6506e8aef4469d4240a819389"
-        },
-        "recipe": {
-            "sha256": "168zzqhp2dbfcnknwfqxk68rgmibfw71ksghvi6h2j2c1m08l23f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151030.2136",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "omni-scratch": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "AdrieanKhisbe",
-            "repo": "omni-scratch.el",
-            "sha256": "1icdk19vwihc8mn04yxl2brql2gssn3gxd5bv7ljdd6mn5hkw500",
-            "rev": "7e04d7f20ee383bf72dfdcfd642bf08e4b8ab973"
-        },
-        "recipe": {
-            "sha256": "190dkqcw8xywzrq8a99w4rqi0y1h2aj23s84g2ln1sf7jaf6d6n9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151211.1059",
-        "deps": []
-    },
-    "company-auctex": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alexeyr",
-            "repo": "company-auctex",
-            "sha256": "0mkyg9y1rhl6hdzhr51psnvy2q0zw4y29m9p0ivb7s643k3fjjp5",
-            "rev": "780ba68b4154ecac4f20dbd4b1ba561ba40f248b"
-        },
-        "recipe": {
-            "sha256": "1jia80sqmm83kzjcf1h1d9iz2k4k9albzvfka5hx6hpa4h8nm5q4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151102.843",
-        "deps": [
-            "auctex",
-            "company",
-            "yasnippet"
-        ]
-    },
-    "newlisp-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kosh04",
-            "repo": "newlisp-mode",
-            "sha256": "05jwaj7wlrdpmylawv14ypwpg9qz9pqqqd1nvb94b9gbs79j86z5",
-            "rev": "7f44e7c763bd16481e78bced5ff310b8113883e5"
-        },
-        "recipe": {
-            "sha256": "0i2d2gyzzvpr5qm2cqzbn9my21lfb66315hg9fj86ac5pkc25zrd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150120.1240",
-        "deps": []
-    },
-    "flycheck-hdevtools": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "flycheck",
-            "repo": "flycheck-hdevtools",
-            "sha256": "1lzr2hdq5m8n331bz5213gf9n9zhhrw9xa1z1r9rkwam1mc23ciy",
-            "rev": "6997f8d033811b7a169052fa23c086fd8e904edb"
-        },
-        "recipe": {
-            "sha256": "0ahvai1q4x59ryiyccvqvjisgqbaiahx4gk8ssaxhblhj0sqga93",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150329.523",
-        "deps": [
-            "dash",
-            "flycheck"
-        ]
-    },
-    "mellow-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsfodder",
-            "repo": "emacs-mellow-theme",
-            "sha256": "0bilwhvprzk634sk5hnxilrvrl0yv593swzznch0p38hqxl585ld",
-            "rev": "ab72898824af6452d0cefea16e49491e42b660d1"
-        },
-        "recipe": {
-            "sha256": "0kl1psykx7akxwabszk4amszh3zil8ia4bfbjjvr6h9phgx66pb0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141116.102",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "org-fstree": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "http://repo.or.cz/r/org-fstree.git",
-            "sha256": "35000fb42e317ec1a6e6c7b448bfdec7ecf65fd9f5ab4723062513c3a4acba79",
-            "rev": "24e305c6443be9f45198185772eecfddc390a9ce"
-        },
-        "recipe": {
-            "sha256": "11ddkfddmsy26mmhgw24757f753ssh056v9vxn89pxp4qypxidfz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20090723.1019",
-        "deps": []
-    },
-    "el-sprunge": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "eschulte",
-            "repo": "el-sprunge",
-            "sha256": "04k1fz0ypmfzgwamncp2vz0lq54bq6y7c8k9nm39csp2564vmbbc",
-            "rev": "37855ec60aeb4d565c49a4d711edc7341e9a22cb"
-        },
-        "recipe": {
-            "sha256": "0rb1cr7zrfl1s5prxy3xwdqgnm8ddw33pcvk049km2qbccb08v6a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140106.1939",
-        "deps": [
-            "emacs",
-            "htmlize",
-            "web-server"
-        ]
-    },
-    "4clojure": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joshuarh",
-            "repo": "4clojure.el",
-            "sha256": "1fybicg46fc5jjqv7g2d3dnj1x9n58m2fg9x6qxn9l8qlzk9yxkq",
-            "rev": "3cdfd356c24cd3518397d29ae833f56a4d20b4ca"
-        },
-        "recipe": {
-            "sha256": "1w9zxy6jwiln28cmdgkbbdfk3pdscqlfahrqi6lbgpjvkw9z44mb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131014.1707",
-        "deps": [
-            "json",
-            "request"
-        ]
-    },
-    "mustard-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsfodder",
-            "repo": "emacs-mustard-theme",
-            "sha256": "170qhbbvcv9dg6jzfd9r95in5m8z1k647mn0gaqflfj0hvq5hwgf",
-            "rev": "33bc6e3a0e2abc5668afdb349bca7e8b5730582c"
-        },
-        "recipe": {
-            "sha256": "0izxhivhmv49dja4wy9n0ipd41xdzdza2ql7pfa7ny35ji5hskik",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141116.102",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "blank-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/blank-mode.el",
-            "sha256": "1wdplnmdllbydwr9gyyq4fbkxl5xjh7220vd4iajyv74pg2jkkkv"
-        },
-        "recipe": {
-            "sha256": "1pyx5xwflnni9my5aqpgf8xz4q4rvmj67pwb4zxx1lghrca97z87",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130824.659",
-        "deps": []
-    },
-    "sly-company": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "capitaomorte",
-            "repo": "sly-company",
-            "sha256": "0qpw345ch5b9dbznk916f6h9f9dnf03wfyvpgnzdf30ffvf4q01w",
-            "rev": "21248bd852c9520ec27692f286c5f43b50892b12"
-        },
-        "recipe": {
-            "sha256": "1n8bx0qis2bs49c589cbh59xcv06r8sx6y4lxprc9pfpycx7h6v2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151126.222",
-        "deps": [
-            "company",
-            "emacs",
-            "sly"
-        ]
-    },
-    "ht": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Wilfred",
-            "repo": "ht.el",
-            "sha256": "17x5w5kzam8cgaphyasnqzm2yhc0hwm38azvmin7ra4h912vlisd",
-            "rev": "84b5b4404515ed3a3f6a85aacf2723302de851a4"
-        },
-        "recipe": {
-            "sha256": "16vmxksannn2wyn8r44jbkdp19jvz1bg57ggbs1vn0yi7nkanwbd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150830.1315",
-        "deps": []
-    },
-    "quelpa": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "quelpa",
-            "repo": "quelpa",
-            "sha256": "0v5fcbjf7ndmywjsq9di3cwxsh2csv5pj3mqgqb340i2yp77r9wy",
-            "rev": "e011b4fa916a8b6057225f3e7ee6befc8928d443"
-        },
-        "recipe": {
-            "sha256": "1g53fcy837hpyn9lnmmri0h4c5va61vszhblz4caadqq265hknvs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151203.305",
-        "deps": [
-            "emacs",
-            "package-build"
-        ]
-    },
-    "erc-yt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yhvh",
-            "repo": "erc-yt",
-            "sha256": "1dlw34kaslyvnsrahf4rm76r2b7qqqn589i4mmhr23prl8xbz9z9",
-            "rev": "43e7d49325b17a3217a6ffb4a9daf75c5ff4e6f8"
-        },
-        "recipe": {
-            "sha256": "0yrwvahv4l2s1aavy6y6mjlrw8l11i00a249825ab5yaxrkzz7xc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150426.749",
-        "deps": [
-            "dash"
-        ]
-    },
-    "org-webpage": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tumashu",
-            "repo": "org-webpage",
-            "sha256": "15r6scvg3pynzj0waam9m22s3ym5kri4mwrsjkyxgz5fr929crj7",
-            "rev": "944b46e74d0d753a30bfefbebbe533abe06d25f4"
-        },
-        "recipe": {
-            "sha256": "0vwv8cv38gx8rnfskbmnaf8y8sffjqy1408655bwhjz6dp69qmah",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151125.15",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "ht",
-            "htmlize",
-            "mustache",
-            "org",
-            "web-server"
-        ]
-    },
-    "elisp-slime-nav": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "elisp-slime-nav",
-            "sha256": "184yxv2qhqc2g5v259kprihppvcwsd52idjay2c01lkmk1i3qnj5",
-            "rev": "f6d241b11abbc4064e17e02dbd0bc6c61db256cc"
-        },
-        "recipe": {
-            "sha256": "009zgp68i4naprpjr8lcp06lh3i5ickn0nh0lgvrqs0niprnzh8c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150805.1448",
-        "deps": []
-    },
-    "vlf": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "m00natic",
-            "repo": "vlfi",
-            "sha256": "0vl0hwxzzvgna8sysf517qq08fi1zsff3dmcgwvsgzhc47sq8mng",
-            "rev": "4eaf763cadac62d7a74f7b2d2436d7793c8f7b43"
-        },
-        "recipe": {
-            "sha256": "1ipkv5kmda0l39xwbf7ns9p0mx3kb781mxsm9vmbkhr5x577s2j8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150101.918",
-        "deps": []
-    },
-    "xkcd": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vibhavp",
-            "repo": "emacs-xkcd",
-            "sha256": "0gd7ag7cqzkfk8y9rbkrjpnyjnwad5bx86a30vxamd1ql8xp57ap",
-            "rev": "8f0009f15926f37f2ea02471425ab6dbac00e50d"
-        },
-        "recipe": {
-            "sha256": "1r88yhs8vnkak8xl16vw3xdpm7ncz4ydkml8932bqk8xix8l8f0w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151016.2353",
-        "deps": [
-            "json"
-        ]
-    },
-    "github-notifier": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xuchunyang",
-            "repo": "github-notifier.el",
-            "sha256": "1z3ikxa4wz2gqzny6a7ll0h80y5db7jsh4iz7ynsmlbrck2s9kqk",
-            "rev": "d3d8ee1711972872f660a3129430bcc2c1ec573a"
-        },
-        "recipe": {
-            "sha256": "1jqc2wx1pvkca8syj97ds32404szm0wn12b7zpa98265sg3n64nw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151109.523",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "easy-after-load": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pd",
-            "repo": "easy-after-load",
-            "sha256": "09ikwg5s42b50lfj0796pa2h32larkf5j6cy042dzh8c441vgih4",
-            "rev": "f8e6e10725d80d3b7e8b1ca966de6190089d8f12"
-        },
-        "recipe": {
-            "sha256": "1mn4hpx82nifphzx71yw3rbixbgis8bhvl3iyxcgcd88n5hqwvys",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121224.2049",
-        "deps": []
-    },
-    "recover-buffers": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tripleee",
-            "repo": "recover-buffers",
-            "sha256": "114ssmby614xjs7mrpbbsdd4gj5ra6klfh8h6z8iij8xn3kii83q",
-            "rev": "a1db7f084977697081da3497628e3514e032b966"
-        },
-        "recipe": {
-            "sha256": "0g40d7440hzlc9b45v63ng0anvmgip4dhbd9wcm2sn8qjfr4w11b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150812.205",
-        "deps": []
-    },
-    "evil-args": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wcsmith",
-            "repo": "evil-args",
-            "sha256": "1nh7wa4ynr7ln42x32znzqsmh7ijzy5ymd7rszf49l8677alvazq",
-            "rev": "2a88b4d19953a11227cc1e91973b92149116f44c"
-        },
-        "recipe": {
-            "sha256": "1bwdvf1i3jc77bw2as1wr1djm8z3a7wms60694xkyqh0m909hs2w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140329.1629",
-        "deps": [
-            "evil"
-        ]
-    },
-    "smart-region": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "uk-ar",
-            "repo": "smart-region",
-            "sha256": "0h559cdyln5f4ignx1r86ryi7wizys0gj03dj7lfzaxr7wkd0jaf",
-            "rev": "5a8017fd8e8dc3483865951c4942cab3f96f69f6"
-        },
-        "recipe": {
-            "sha256": "1bcvxf62bfi5lmhprma9rh670kka9p9ygbkgmv6dg6ajjfsplgwc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150903.903",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "expand-region",
-            "multiple-cursors"
-        ]
-    },
-    "color-theme-approximate": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tungd",
-            "repo": "color-theme-approximate",
-            "sha256": "1b0ymwszqsjcihcbfp7s4fjam983ixh3yb7sdc0rmqlyric1zwxq",
-            "rev": "f54301ca39bc5d2ffb000f233f8114184a3e7d71"
-        },
-        "recipe": {
-            "sha256": "1wdnia9q42x7vky3ks555iic5s50g4mx7ss5ppaljvgxvbxyxqh1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140227.2236",
-        "deps": []
-    },
-    "framemove": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/framemove.el",
-            "sha256": "03ll68d0j0b55rfxymzcirdigkmxcy8556d0i67ghdzmcqfwily7"
-        },
-        "recipe": {
-            "sha256": "10qf017j0zfnzmcs1i56pznhbvgw7mv4232p8znqaaxphgh6r0ar",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130328.633",
-        "deps": []
-    },
-    "real-auto-save": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chillaranand",
-            "repo": "real-auto-save",
-            "sha256": "1kghhps8mqys5l59qwzv3fgy1fvb15cnyaxmk29v818a6khjc5l2",
-            "rev": "81bf61742ea553ccdee0e22d3abb43fcf07f82cf"
-        },
-        "recipe": {
-            "sha256": "03dbbizpyg62v6zbq8hd16ikrifz8m2bdlbb3g67f2834xqmxha8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150701.1015",
-        "deps": []
-    },
-    "ebib": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joostkremers",
-            "repo": "ebib",
-            "sha256": "015dch0f4h9qrjgv3rapxq5afi8g074jfgjjsgvqcm90myx12p1m",
-            "rev": "9ef4cb26f944bf6a9a0fb6054e5fc65f89270130"
-        },
-        "recipe": {
-            "sha256": "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151116.933",
-        "deps": [
-            "dash",
-            "emacs",
-            "parsebib"
-        ]
-    },
-    "db-pg": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nicferrier",
-            "repo": "emacs-db-pg",
-            "sha256": "15r0qwjkl33p8kh2k5kxz9wnbkv1k470b1h0i6svvljkx9ynk68a",
-            "rev": "7d5ab86b74b05fe003b3b434d4835f37f3f3eded"
-        },
-        "recipe": {
-            "sha256": "06nfibw01ijv7nr0m142y80jbbpg9kk1dh19s5wq7i6fqf7g08xg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130131.1302",
-        "deps": [
-            "db",
-            "pg"
-        ]
-    },
-    "multiple-cursors": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "multiple-cursors.el",
-            "sha256": "0hl9ll7pgqv74dnihyy0gz15wz0swj1cpa208484qd3g0dvin8j6",
-            "rev": "a393384b3508e7d8d721e66d2bfb97fa7153dd4f"
-        },
-        "recipe": {
-            "sha256": "0mky5p9wpd3270wr5vfna8rkk2ff81wk7vicyxli39195m0qgg0x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151205.1425",
-        "deps": []
-    },
-    "tss": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "emacs-tss",
-            "sha256": "1bk5v9dffs65qsay0dp336s2ly065nd0cg572zz058ikwxd44zd3",
-            "rev": "81ac6351a2ae258fd0ebf916dae9bd5a179fefd0"
-        },
-        "recipe": {
-            "sha256": "0d16x5r2xfy6mrwy0mqzpr9b3inqmyyxgawrxlfh83j1xb903dhm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150913.908",
-        "deps": [
-            "auto-complete",
-            "json-mode",
-            "log4e",
-            "yaxception"
-        ]
-    },
-    "isearch+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/isearch+.el",
-            "sha256": "1cg5rvc16ljncini13fpwmzfhp3zy9rd1jvdd3jxpdkqzw07rnc6"
-        },
-        "recipe": {
-            "sha256": "1rzlsf08nmc3p3vhpwbiy8cgnnl2c10xrnsr2rlpv0g2kxkrd69r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151128.941",
-        "deps": []
-    },
-    "ac-js2": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ScottyB",
-            "repo": "ac-js2",
-            "sha256": "0yn9333rjs2pzb1wk1japclsqagdcl28j0yjl3q5b70g5gi5vx7k",
-            "rev": "721c482e1d4a08f4a29a74437257d573e8f69969"
-        },
-        "recipe": {
-            "sha256": "0gcr0xdi89nj3854v2z3nndfgazmcdzmd6wdndl0i4s7pdfl96fa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140906.642",
-        "deps": [
-            "js2-mode",
-            "skewer-mode"
-        ]
-    },
-    "turnip": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kljohann",
-            "repo": "turnip.el",
-            "sha256": "0khl4q22x6vdn87xdqqg5f535d4dqpnfbhk6qhlh187p1w7qaiq4",
-            "rev": "2fd32562fc6fc1cda6d91aa939cfb29f9b16e9de"
-        },
-        "recipe": {
-            "sha256": "1vfqv71j47fn53klz3jl8r8hscywd01kkl4w96a308sac3lhbrps",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150309.129",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "soft-stone-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mswift42",
-            "repo": "soft-stone-theme",
-            "sha256": "030mf8b0sf9mmzwhg85zh0ccvcg768kckwvbm0yzg7vmq1x46hjl",
-            "rev": "fb475514cfb02cf30ce358a61c48e46614344d48"
-        },
-        "recipe": {
-            "sha256": "05jjw9z6hqln9yj8ya2xrmjnylp7psfdj9206n30m3lwnlwx399v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140614.335",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "el2markdown": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Lindydancer",
-            "repo": "el2markdown",
-            "sha256": "03xlxx57z1id9mr7afkvf77m2f9rrknrm1380p51vka84v2hl3mh",
-            "rev": "875648f9a65ed18fe71fc72872a0db70aab5253d"
-        },
-        "recipe": {
-            "sha256": "1a52qm0jrcvvpb01blr5l7apaxqn4bvhkgha53cr48rdkmmq318g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150516.1538",
-        "deps": []
-    },
-    "espuds": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ecukes",
-            "repo": "espuds",
-            "sha256": "16r4j27j9yfdiy841w9q5ykkc6n3wrm7hvfacagb32mydk821ijg",
-            "rev": "1405972873339e056517217136de4ad3202d744a"
-        },
-        "recipe": {
-            "sha256": "16yzw9l64ahf5v92jzb7vyb4zqxxplq6qh0y9rkfmvm59s4nhk6c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151114.959",
-        "deps": [
-            "dash",
-            "f",
-            "s"
-        ]
-    },
-    "nav-flash": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "nav-flash",
-            "sha256": "07wjicbvzg7cz983hv0p2qw1qlln07djigkmbqfpwvg3fk50fdyg",
-            "rev": "53f5bc59e3f32c1192d15637d3979732dacb2c35"
-        },
-        "recipe": {
-            "sha256": "0936kr0s6zxxmjwaqm7ywdw2im4dxai1xb7j6xa2gp7c70qvvsx3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140508.1541",
-        "deps": []
-    },
-    "persp-projectile": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bbatsov",
-            "repo": "persp-projectile",
-            "sha256": "0b9hz253m6d58dwsjsk9d1fw0ql33m9wfvyx10ncsqbr0j0s98k5",
-            "rev": "83e03b1284ea36f37a24571abd6442a267408360"
-        },
-        "recipe": {
-            "sha256": "10l2kqjyigg98qbbpf3qf4d5bm63kkk4vp7ip8fibgj1p9gqmnxm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151220.630",
-        "deps": [
-            "cl-lib",
-            "perspective",
-            "projectile"
-        ]
-    },
-    "osx-location": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "osx-location",
-            "sha256": "1csnxpsfnv9lv07kgvc60qx5c33sshmnz60p3qjz7ym7rnjy9b5x",
-            "rev": "110aee945b53ea550e4debe69bf3c077d940ec8c"
-        },
-        "recipe": {
-            "sha256": "1p12mmrw70p3b04zlprkdxdfnb7m3vkm6gci3fwhr5zyfvwxvn0c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150613.417",
-        "deps": []
-    },
-    "objc-font-lock": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Lindydancer",
-            "repo": "objc-font-lock",
-            "sha256": "138c1nm579vr37dqprqsakfkhs2awm3klzyyd6bv9rhkrysrpbqk",
-            "rev": "34b457d577f97ca94b8792d025f9a909c7610612"
-        },
-        "recipe": {
-            "sha256": "0njslpgdcph3p3gamrbd6pc04szks07yv4ij3p1l7p5dc2p06rs6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141021.1322",
-        "deps": []
-    },
-    "unify-opening": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DamienCassou",
-            "repo": "unify-opening",
-            "sha256": "1vbx10s2zmhpxjg26ik947bcg9f7w3g2w45wmm0shjp743fsdq8p",
-            "rev": "2812e43029cab7183197ce5e3c9577856bfd22c5"
-        },
-        "recipe": {
-            "sha256": "1gpmklbdbmv8va8d3yr94r1ydkcyvdzcgxv56rp0bxwbcgmk0as8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151116.1848",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "visual-regexp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "benma",
-            "repo": "visual-regexp.el",
-            "sha256": "04wds01yzhia508852gm18rp7dkg0838j0w8cr1l1qmc8p0jjsz9",
-            "rev": "58566c09e593dda9c3e3a348310a9bdc42dcb3d8"
-        },
-        "recipe": {
-            "sha256": "16bdqq2j7pnjq3j6qa4rhxzidqdhyg80c7nazd93smis8rcv5d0z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151206.719",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "ghc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kazu-yamamoto",
-            "repo": "ghc-mod",
-            "sha256": "0ig6f0wfkcm1jfl3khsik0ggr3gypvvn8c3r3n1kgmy5s72r98cn",
-            "rev": "41b9c0bbf249d763f617dcdc052c49d5b7c98987"
-        },
-        "recipe": {
-            "sha256": "0xqriwggd1ahla5aff7k0j4admx6q18rmqsx3ipn4nfk86wrhb8g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151220.455",
-        "deps": [
-            "haskell-mode"
-        ]
-    },
-    "orgtbl-show-header": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DamienCassou",
-            "repo": "orgtbl-show-header",
-            "sha256": "0zfiq9d5jqzpmscngb1s2jgfiqmbi4dyw0fqa59v2g84gxjg793x",
-            "rev": "f0f48ccc0f96d4aa2a676ff609d9dddd71748e6f"
-        },
-        "recipe": {
-            "sha256": "1xgqjg3lmcczdblxaka47cc1ad8p8jhyb2nqwq0qnbqw46fqjp3k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141023.337",
-        "deps": []
-    },
-    "inf-php": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "taksatou",
-            "repo": "inf-php",
-            "sha256": "1z5ns94xgj2dkv2sc2ckax6bzwdxsm19pkvni24ys2w7d5nhajzr",
-            "rev": "4396022d6e169f0cf30cd9f68ca575d8b30c418a"
-        },
-        "recipe": {
-            "sha256": "011sc6f0ka7mmik8z0df8qk24mf6ygq22jy781f2ikhjh94gy83d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130414.221",
-        "deps": [
-            "php-mode"
-        ]
-    },
-    "omniref": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dotemacs",
-            "repo": "omniref.el",
-            "sha256": "1hzvpajq58py6k7z2rwwax1c7pm65m534mq8mr9g9kxn9hqiz9n8",
-            "rev": "0026e0472c7071e06cfdc24be91d3f4989ba8115"
-        },
-        "recipe": {
-            "sha256": "0lgw1knqppdg046zqx4m7nbzvsasr89wa9i4594hf46w1094dabj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151118.221",
-        "deps": []
-    },
-    "flycheck-dialyzer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lbolla",
-            "repo": "emacs-flycheck-dialyzer",
-            "sha256": "15dc76r047pnxll229z0pmpn76zw3cc6qs81b7wg7yc5czsk8axh",
-            "rev": "3560214658cbdbd454f8b3d4f108cb51537afa36"
-        },
-        "recipe": {
-            "sha256": "0bn81yzijmnfg5xcnvcvxvqxz995iaafhgbfckgcal974s229kd2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151024.37",
-        "deps": [
-            "flycheck"
-        ]
-    },
-    "ninja-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "martine",
-            "repo": "ninja",
-            "sha256": "1yvgamxjqyzpwk59lm3gvcw6f9ab64cnbwwcmmyrk4yxhyva6r3q",
-            "rev": "9a4eb587f3d3dcc6e6edd8d344a93b1c32d27dc7"
-        },
-        "recipe": {
-            "sha256": "1m7f25sbkz8k343giczrnw2ah5i3mk4c7csi8kk9x5y16030asik",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141203.2359",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "el-x": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sigma",
-            "repo": "el-x",
-            "sha256": "1i6j44ssxm1xdg0mf91nh1lnprwsaxsx8vsrf720nan7mfr283h5",
-            "rev": "e96541c1f32e0a3aca4ad0a0eb382bd898250163"
-        },
-        "recipe": {
-            "sha256": "1721d9mljlcbdwb5b9934q7a48y30x6706pp4bjvgys0r64dml5g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140111.1601",
-        "deps": []
-    },
-    "migemo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-jp",
-            "repo": "migemo",
-            "sha256": "1az4mnmanhz9ga0g46jf33w8axcw8lnrb9lmszajwv7y5j9nk7yr",
-            "rev": "c2240afa9afc0f003bb1d846710505e8e8e38169"
-        },
-        "recipe": {
-            "sha256": "0y49imdwygv5zd7cyh9ngda4gyb2mld2a4s7zh4yzlh7z5ha9qkr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150412.941",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "screenshot": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/screenshot.el",
-            "sha256": "0q7yxaaa0fic4d2xwr0qk28clkinwz4xvw3wf8dv1g322s0xx2cw"
-        },
-        "recipe": {
-            "sha256": "0aw2343as38y26r2g7wpn1rq1n6xpw4y5c7ir8qh1crkc1y513hs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120509.605",
-        "deps": []
-    },
-    "easy-repeat": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xuchunyang",
-            "repo": "easy-repeat.el",
-            "sha256": "18bm5ns1qrxq0rrz9sylshr62wkymh1m6b7ch2y74f8rcwdwjgnq",
-            "rev": "060f0e6801c82c40c06961dc0528a00e18947a8c"
-        },
-        "recipe": {
-            "sha256": "1vx57gpw0nbxh976s18va4ali1nqxqffhaxv1c5rhf4pwlk2fa06",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150516.348",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "python3-info": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dvhansen",
-            "repo": "python3-info",
-            "sha256": "1w29l4zyvcchjdywz2py95qq7bszhldpga2ng75g7p07pq7f2w1p",
-            "rev": "4530e180ded2ad64774e51742eece3e5ea00c5f5"
-        },
-        "recipe": {
-            "sha256": "1hma8sphxk95m25s56adgyk7d4blsc02gq5a7vw1pawwvxm2qlz3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151117.31",
-        "deps": []
-    },
-    "doremi-frm": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/doremi-frm.el",
-            "sha256": "0p2wcyb1cqa6b0lvrc83wj6xwl8gnmfg12k1q36scq2y430qbmdc"
-        },
-        "recipe": {
-            "sha256": "1rj3p665q32acsxxwygv1j5nbmjqrhi0b4glzrk88xki4lyz0ihz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150727.1554",
-        "deps": [
-            "doremi",
-            "faces+",
-            "frame-fns",
-            "hexrgb"
-        ]
-    },
-    "weblogger": {
-        "fetch": {
-            "tag": "fetchbzr",
-            "url": "lp:weblogger-el",
-            "sha256": "1z7ld9d0crwdh778fyaapx75vpnlnslsh9nf07ywkylhz4w68yyv",
-            "rev": "38"
-        },
-        "recipe": {
-            "sha256": "189zs1321rybgi4zihps7d2jll5z13726jsg5mi7iycg85nkv2fk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20110926.1118",
-        "deps": [
-            "xml-rpc"
-        ]
-    },
-    "helm-ad": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tnoda",
-            "repo": "helm-ad",
-            "sha256": "0hxfgdn56c7qr64r59g9hvxxwa4mw0ad9c9m0z5cj85bsdd7rlx4",
-            "rev": "8ac044705d8620ee354a9cfa8cc1b865e83c0d55"
-        },
-        "recipe": {
-            "sha256": "0h2zjfj9hy7bkpmmjjs0a4a06asbw0yww8mw9rk2xi1gc2aqq4hi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151209.415",
-        "deps": [
-            "dash",
-            "helm"
-        ]
-    },
-    "pophint": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "emacs-pophint",
-            "sha256": "0n1w1adglbavqgrv16rzhym72c3q083mh0c8yl5lj7adn4nr4gr3",
-            "rev": "fc02a155e28ae27466bedabc756e75c936b01266"
-        },
-        "recipe": {
-            "sha256": "1chq2j79hg095jxw5z3pz4qicqrccw0gj4sxrin0a55hnprzzp72",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150930.1234",
-        "deps": [
-            "log4e",
-            "popup",
-            "yaxception"
-        ]
-    },
-    "shell-command": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/shell-command.el",
-            "sha256": "0jr5sbmg4zrx2dfdrajh2didm6dxx9ri5ib9qnwhc1jlppinyi7l"
-        },
-        "recipe": {
-            "sha256": "1jxn721i4s1k5x1qldiynnl5khsl22x9k3whm698nzv8m786spxl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20090621.832",
-        "deps": []
-    },
-    "filesets+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/filesets+.el",
-            "sha256": "0vqmz5rac2fgry1mzg3hnp0w65x6va471f982g9i8fn70ws46ww2"
-        },
-        "recipe": {
-            "sha256": "06n8pw8c65bmrkxda2akvv57ndfijgbp95l40j7sjg8bjp385spn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1602",
-        "deps": []
-    },
-    "find-file-in-project": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "technomancy",
-            "repo": "find-file-in-project",
-            "sha256": "0bf32nhpmjvvgnr6g9xqh8pqnhr3dl24y3g40lsv4pc8ffs70ydm",
-            "rev": "908cc56c0fd715001da4d97b30cba5eb7af3a609"
-        },
-        "recipe": {
-            "sha256": "0aznnv82xhnilc9j4cdmcgh6ksv7bhjjm3pa76hynnyrfn7kq7wy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151216.2050",
-        "deps": [
-            "emacs",
-            "swiper"
-        ]
-    },
-    "paren-face": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "paren-face",
-            "sha256": "0ggpb58dw4dv9i0czj064a8fdcalgjqgl4cm5zsk7hcvjcmal9af",
-            "rev": "09bb594f0c9614fb336fd8b5598215cf7c2d2c7e"
-        },
-        "recipe": {
-            "sha256": "0dmzk66m3rd8x0rb925pyrfpc2qsvayks4kmhpb2ccdrx68pg8gf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151105.2106",
-        "deps": []
-    },
-    "racket-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "greghendershott",
-            "repo": "racket-mode",
-            "sha256": "0xjdf0zw8faf5ya7nsv8m6qiicwz268rb2y1z5ijknjhsjp2bwi6",
-            "rev": "ffb9904d4d9d69c69900151f96cb4d4a08657720"
-        },
-        "recipe": {
-            "sha256": "04sr55zrgwyi48sj4ssm4rmm327yxs7hvjhxclnkhaaigrmrv7jb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151218.2014",
-        "deps": [
-            "emacs",
-            "faceup",
-            "s"
-        ]
-    },
-    "mozc-popup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "d5884",
-            "repo": "mozc-popup",
-            "sha256": "1mbpkjc6sk7qqmgsmr5a5l2ycwnqp8bkwgikdavgs6hnal10bkmn",
-            "rev": "f0684b875a7427ec08f8df13939a486e5d5cf420"
-        },
-        "recipe": {
-            "sha256": "1n43lwflxzzyskxgzg19rg3hiqqkf5l7vfgaydryf4sk8480x687",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150223.1834",
-        "deps": [
-            "mozc",
-            "popup"
-        ]
-    },
-    "writeroom-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joostkremers",
-            "repo": "writeroom-mode",
-            "sha256": "0an36zra25r0l482irxbwrq90fd3rik53yqw3gccjkgdf3lpkc4x",
-            "rev": "57aeef137b04134fe05c7e701e42b05f3edbcc30"
-        },
-        "recipe": {
-            "sha256": "1kpsrp3agw8bg3qbf5rf5k1a7ww30q5xsa8z5ywxajsaywjzx1bk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151111.301",
-        "deps": [
-            "emacs",
-            "visual-fill-column"
-        ]
-    },
-    "use-package": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jwiegley",
-            "repo": "use-package",
-            "sha256": "1kng5yzm73gz67znifjhzrr2zbcc7cyb2f1j703hmf33zb9naqhp",
-            "rev": "1d7e6ff5b73761c3b7180530da8bc433338d0cec"
-        },
-        "recipe": {
-            "sha256": "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151112.1639",
-        "deps": [
-            "bind-key",
-            "diminish"
-        ]
-    },
-    "unicode-input": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/m00nlight/unicode-input",
-            "sha256": "0kzcg1wxi1z424jdn7pibk9zyfyi85kligav08sl1c2hdldzya4l",
-            "rev": "e76ccb549e6a"
-        },
-        "recipe": {
-            "sha256": "17sf3xnl8yyx4ln4mrjlrvfinb8dvabh81l3qyr9pkn5skpgqgj8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141219.120",
-        "deps": []
-    },
-    "highlight-defined": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "highlight-defined",
-            "sha256": "1l10xnjyvcbv1v8xlldaca7z3fk5qav7nsbhfnjxxd0bgh5v9by2",
-            "rev": "243478cc204ab42d29805ed610961cbb260c1dfd"
-        },
-        "recipe": {
-            "sha256": "1vjxm35wf4c2qphpkjh57hf03a5qdssdlmfj0n0gwxsdw1q5rpms",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141225.930",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "org-present": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rlister",
-            "repo": "org-present",
-            "sha256": "1n9magg7r7xnw16d43fh6nzjf42s70l3mxq6ph727zi4lz5ngmfm",
-            "rev": "1b519cfd5abf44bed307cac576dc9fd61eb2c35f"
-        },
-        "recipe": {
-            "sha256": "09h0cjqjwhqychyrdv1hmiyak677vgf1b94392sdsq3ns70zyjk7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141109.1956",
-        "deps": [
-            "org"
-        ]
-    },
-    "vkill": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsmirror",
-            "repo": "vkill",
-            "sha256": "0hb845pnh2yska6alca8hbbxh65x7g81pr7852h8fddm0qd1agkd",
-            "rev": "8ffe640ed03ddcc23db1c74c76d1acbf25250ad9"
-        },
-        "recipe": {
-            "sha256": "09siqsip6d2h3jrxbdbhylkqm42dx3d2dqlkkdw3a81c7ga9lpwm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20091203.1222",
-        "deps": []
-    },
-    "spacemacs-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nashamri",
-            "repo": "spacemacs-theme",
-            "sha256": "0vg5g5pw5qzrd8yx1imfgv9r62c9laiqd9xckah30hsyzglzdakn",
-            "rev": "febe56c3e56757b149eac0536c087259782d2345"
-        },
-        "recipe": {
-            "sha256": "0riiim6qb6x9g5hz0k3qgdymgikynlb9l07mrbfmybkv4919p992",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151206.848",
-        "deps": []
-    },
-    "historyf": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k1LoW",
-            "repo": "emacs-historyf",
-            "sha256": "1y275fchhx0n6dv038hsr44a3bjghqdhc8j1dcpm2rvs8chgm8g0",
-            "rev": "66590519a02816cde8f442032fb144f3c38ebc6e"
-        },
-        "recipe": {
-            "sha256": "15pcaqfjpkfwcy46yqqw10q8kpw7aamcg0gr4frbdgzbv0yld08s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151123.1959",
-        "deps": []
-    },
-    "dired-narrow": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "dired-hacks",
-            "sha256": "15jri9cj5jgr3ff423izd8idd7djay238c9pa3ccy05djl9z2hdx",
-            "rev": "6647825dbca4269afa76302e345d6bd15b222e42"
-        },
-        "recipe": {
-            "sha256": "1rgqiscbizalh78jwc53zbj599dd13a6vzdgf75vzllc1w7jsg6d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151126.1141",
-        "deps": [
-            "dash",
-            "dired-hacks-utils"
-        ]
-    },
-    "skype": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiwanami",
-            "repo": "emacs-skype",
-            "sha256": "0gzj7cf42nhp3ac1a2gxcfbmn80z1z46zxsfr2f5xil2gjag39fx",
-            "rev": "c10f96d1d105acee8a9a9804652bf6a813591da4"
-        },
-        "recipe": {
-            "sha256": "06p5s5agajbm9vg9xxpzv817xmjw2kmcahiw4iypn5yzwhv1aykl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131001.2318",
-        "deps": []
-    },
-    "flymake-rust": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joaoxsouls",
-            "repo": "flymake-rust",
-            "sha256": "1qxb3vhh83ikhmm89ms7irdip2l03hnjcq5ncmgywkaqkpslaacv",
-            "rev": "72ec92c261670b7384ee2593d0f1946ea29f429a"
-        },
-        "recipe": {
-            "sha256": "080cvgl2cg08kyvmgg080zqb6k6bngga3m5lfwb2dpmi1bajywc1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141004.1752",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "js-doc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mooz",
-            "repo": "js-doc",
-            "sha256": "1d2jy71iw1v7l0jrvszmr3qdls5mak6kjvyvk0n9895z87lhgm8g",
-            "rev": "cf9b5292b7fca655bafb87bd55662edcf842d5b6"
-        },
-        "recipe": {
-            "sha256": "0nafqgb4kf8jgrb7ijfcvigq8kf043ki89h61izda4hccm3c42pk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131215.719",
-        "deps": []
-    },
-    "ess-smart-underscore": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "ess-smart-underscore.el",
-            "sha256": "01xa98q0pqsf4gyl6ixlpjjdqazqsxg1sf7a3j2wbh7196ps61v5",
-            "rev": "f3bbee01754888452232b337173b57c6c266de49"
-        },
-        "recipe": {
-            "sha256": "01pki1xa8zpgvldcbjwg6vmslj7ddf44hsx976xipc95vrdk15r2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131229.2051",
-        "deps": [
-            "ess"
-        ]
-    },
-    "edbi-database-url": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "proofit404",
-            "repo": "edbi-database-url",
-            "sha256": "1l5lkdgcy1z6fkjh3zrhf0f4f26bzhpqy33ak1xacvm9fyf54s2x",
-            "rev": "08b833584460ddfd4d0d76e5b159625dde684bcf"
-        },
-        "recipe": {
-            "sha256": "018rxijmy0lvisy281d501ra9lnh5xi0wmvz5avbjpb0fi4q1zdn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150126.603",
-        "deps": [
-            "edbi",
-            "emacs"
-        ]
-    },
-    "geeknote": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "avendael",
-            "repo": "emacs-geeknote",
-            "sha256": "14v5gm931dcsfflhsvijr4ihx7cs6jymvnjzph3arvhvqwyqhwgq",
-            "rev": "e0d25cddc35e9a0f5986a04df2c3d11f78dd3ad9"
-        },
-        "recipe": {
-            "sha256": "1ci82fj3layd95lqj2w40y87xps6bs7x05z8ai9m59k244g26m8v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150223.1015",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "autofit-frame": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/autofit-frame.el",
-            "sha256": "14iajfdf59lc9ik6spv4sq3v0ji1dmhfl1zwhcz2bkypxlbg1v3s"
-        },
-        "recipe": {
-            "sha256": "0p24qqnfa1vfn5pgnpvbxwi11zjkd6f3cv5igwg6h0pr5s7spnvw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1508",
-        "deps": [
-            "fit-frame"
-        ]
-    },
-    "winpoint": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jorgenschaefer",
-            "repo": "winpoint",
-            "sha256": "1qrbvidnmgg7jyasb28bc0z1x4a4ayzq5jmv38dsx0qs080s85wy",
-            "rev": "e6050093c076308184566fa1d1012423d6934773"
-        },
-        "recipe": {
-            "sha256": "10ji7xd9ipmy6c2qxljqdxgqf5sb8h7lwz43mr6ixbn7v1b7pp6w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131023.1213",
-        "deps": []
-    },
-    "vala-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsorphanage",
-            "repo": "vala-mode",
-            "sha256": "10vs4d8csww781j1ps3f6dczy5zzza36z7a8zqk40fg4x57ikw44",
-            "rev": "fb2871a4492d75d03d72e60474919ab89adb267b"
-        },
-        "recipe": {
-            "sha256": "164dhlsiflhpdymk3q5x0bv8gpbwfp34lnkhm2x90kdakfzqf91p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150324.1725",
-        "deps": []
-    },
-    "pinot": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tkf",
-            "repo": "emacs-pinot-search",
-            "sha256": "1wc31r5fpcia4n4vbpg7vv3rzrnjzh18yygi3kp4wvl2wzx2azqh",
-            "rev": "67fda555a155b22bb2ce44ba618b4bd6fc5f144a"
-        },
-        "recipe": {
-            "sha256": "1kjzq02pddnkia637xz2mnjjyglyh6qzragnf7nnxbw9ayiim58i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140211.1426",
-        "deps": []
-    },
-    "mmm-jinja2": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "beardedprojamz",
-            "repo": "mmm-jinja2",
-            "sha256": "1lcc2p9qz70kpykgx82isv0qiqlsajp4vvcj6bvag92d7h9yk9bv",
-            "rev": "0ecd7fd239fc096495d903b5f1bafac83515acef"
-        },
-        "recipe": {
-            "sha256": "0579sv77dyzishhcw4xxi444inwy4jgh9vmxwd856nd05j3cyc7z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150904.1334",
-        "deps": [
-            "mmm-mode"
-        ]
-    },
-    "tronesque-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aurelienbottazini",
-            "repo": "tronesque",
-            "sha256": "06wm3qwxjhzwjn9nnrqm5wwj1z5gfghg9d2qbg8w3zyqzva5dmvm",
-            "rev": "42093c08a50c860601c364c8a746c803458c10ba"
-        },
-        "recipe": {
-            "sha256": "1bk73zawl1922aq739r3rz30flxd6nq87k8ahzbix139g7gxf19j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150125.441",
-        "deps": []
-    },
-    "sensitive": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "timvisher",
-            "repo": "sensitive.el",
-            "sha256": "0g4jfcc5k26yh192bmmxnim9mqv993v2jjd9g9ssvnd42ihpx1n3",
-            "rev": "7f2c77811e983234e1a93055d78cc4480ae807c3"
-        },
-        "recipe": {
-            "sha256": "0v988k0x3mdp7ank2ihghphh8sanvv96s4sg6pnszg5hczak1vr3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131015.835",
-        "deps": [
-            "emacs",
-            "sequences"
-        ]
-    },
-    "dark-souls": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tomjakubowski",
-            "repo": "dark-souls.el",
-            "sha256": "1w0y2j0j9n107dbk7ksr9bipshjfs9dk08qbs9m6h5aqh4hmwa4r",
-            "rev": "94122b1215423e58dcf18584a2bd022029d54d4b"
-        },
-        "recipe": {
-            "sha256": "1ilsn657mpl7v8vkbzqf3gp0gmvy0dgynfsn8w4cb49qaiy337xc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140314.628",
-        "deps": []
-    },
-    "narrowed-page-navigation": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "david-christiansen",
-            "repo": "narrowed-page-navigation",
-            "sha256": "0ydxj6dc10knambma2hpimqrhfz216nbj96w1dcwgjixs4cd4nax",
-            "rev": "b215adbac4873f56fbab65772062f0f5be8058a1"
-        },
-        "recipe": {
-            "sha256": "1yrmih60dd69qnin505jlmfidm2svzpdrz46286r7nm6pk7s4pb7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150108.2319",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "thingopt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "m2ym",
-            "repo": "thingopt-el",
-            "sha256": "0imzrb3vqnm36illqnpfc6x7rbq9rrrlpcw9n2yzl4n309mqdwr6",
-            "rev": "6a50f23faa764c5f6200c0253c606b0b4e5226f8"
-        },
-        "recipe": {
-            "sha256": "0yvzq1z2nrldr8vhcvxqgzvh4gbrjjwfmprg59p4v5hlxvhxsb1y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150315.723",
-        "deps": []
-    },
-    "broadcast": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "killdash9",
-            "repo": "broadcast.el",
-            "sha256": "0w6b9rxdciy1365kgf6fh3vgrjr8xd5ar6xcn0g4h56f2zg9hdmj",
-            "rev": "f6f9cd2e0e3f8c31d6b8e7446c27eb0e50b25f16"
-        },
-        "recipe": {
-            "sha256": "1h2c3mb49q3vlpalrsrx8q3rmy1zg0y45ayvzbvzdkfgs8idgbib",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151204.2012",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "lxc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nicferrier",
-            "repo": "emacs-lxc",
-            "sha256": "090gk0il4yyypzjbh2qrjdaldwf90fi30impmh4zcfl73bic5q9q",
-            "rev": "88bed56c954d1edd9ff5ce0ced2c02dcf9f71835"
-        },
-        "recipe": {
-            "sha256": "1rv1ybmbjx7n3cavx21nzmvckw63q3jmjsfdr2pcgavrr2ck6lka",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140410.1522",
-        "deps": []
-    },
-    "conkeror-minor-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "conkeror-minor-mode",
-            "sha256": "0sz3qx1bn0lwjhka2l6wfl4b5486ji9dklgjs7fdlkg3dgpp1ahx",
-            "rev": "476e81c27b056e21c192391fe674a2bf875466b0"
-        },
-        "recipe": {
-            "sha256": "1ch108f20k7xbf79azsp31hh4wmw7iycsxddcszgxkbm7pj11933",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150114.1004",
-        "deps": []
-    },
-    "pycarddavel": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DamienCassou",
-            "repo": "pycarddavel",
-            "sha256": "09glwrb9q65qdm4yd0mbi5hwdy2434zm8699ywhs6hqpjacadlmi",
-            "rev": "a6d81ee4eb8309cd82f6082aeca68c5a015702a3"
-        },
-        "recipe": {
-            "sha256": "12k2mnzkd8yv17csfhclsnd479vcabawmac23yw6dsw7ic53jf1a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150831.716",
-        "deps": [
-            "emacs",
-            "helm"
-        ]
-    },
-    "org-jira": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "baohaojun",
-            "repo": "org-jira",
-            "sha256": "0b5f8qkyzh4jwj3kvbaj3m4dpjbvh1fql7v1nb9bi5n7iwkv3lxp",
-            "rev": "eb4f3012d64bcab0c28491a26eac085ccae5bf78"
-        },
-        "recipe": {
-            "sha256": "11h7kbkf38p2xycw8hvabpaacp72xdgy8c7kzcgjb2a8qlbs5ifm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150911.758",
-        "deps": []
-    },
-    "flycheck-mercury": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "flycheck",
-            "repo": "flycheck-mercury",
-            "sha256": "0isqa6ybdd4166h3rdcg0b8pcxn00v8dav58xwfcj92nhzvs0qca",
-            "rev": "fa9e433a0a912f0fae9e4dec9ea616ef99fcf861"
-        },
-        "recipe": {
-            "sha256": "1z2y6933f05yv9y2aapmn876jnsydh642zqid3j88bb9kqi67x0h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151123.134",
-        "deps": [
-            "dash",
-            "flycheck",
-            "s"
-        ]
-    },
-    "chatwork": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ataka",
-            "repo": "chatwork",
-            "sha256": "1r2s3fszblk5wa6v3hnbzsri550gi5qsmp2w1spvmf1726n900cb",
-            "rev": "7a1def04735423d47e058a8137e859391a6aaf7e"
-        },
-        "recipe": {
-            "sha256": "0p71swcpfqbx2zmp5nh57f0m30cn68g3019005wa5x4fg7dx746p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150807.2148",
-        "deps": []
-    },
-    "bookmark+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/bookmark+.el",
-            "sha256": "1qp84qzywc9nzb8n6j6cl99g7z88355ypw2fr4vpwy6n863a4b7l"
-        },
-        "recipe": {
-            "sha256": "0121xx7dp2pakk9g7sg6par4mkxd9ky746yk4wh2wrhprc9dqzni",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151107.1047",
-        "deps": []
-    },
-    "ert-expectations": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/ert-expectations.el",
-            "sha256": "0cwy3ilsid90abzzjb7ha2blq9kmv3gfp3icwwfcz6qczgirq6g7"
-        },
-        "recipe": {
-            "sha256": "094lkf1h83rc0dkvdv8923xjrzj5pnpnsb4izk8n5n7g0rbz1l9w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130824.700",
-        "deps": []
-    },
-    "orgtbl-join": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tbanel",
-            "repo": "orgtbljoin",
-            "sha256": "06nc82wiha11i79izqil53dkd95fl55nb5m739gyyzvx3sksb0dg",
-            "rev": "ccf5e0d96e053dc289da39a048715fcf36835ff2"
-        },
-        "recipe": {
-            "sha256": "1kq2h0lb521z8q2xb9bsi37xzzdsa0hw4mm3qkzidi5j9fi3apf1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150121.1646",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "sclang-snippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ptrv",
-            "repo": "sclang-snippets",
-            "sha256": "0vbcghgapwdf3jgjnjdla17dhf5mkmwapz4a8fmlr7sw1wqvj857",
-            "rev": "c840a416b96f83bdd70491e3d1fbe2f1ae8b3f58"
-        },
-        "recipe": {
-            "sha256": "0q1bh316v737a0hm9afijk1spvg144cgrf45jm0bpd60zhiv7bb2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130513.251",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "multi-eshell": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/multi-eshell.el",
-            "sha256": "1w1jwfznpl214a1xx46zlgqbx9c5yjzpyqqrkn3xqjgnj485yhkl"
-        },
-        "recipe": {
-            "sha256": "1i0mvgqxsc99dwp9qcdrijqxsxflrbxw846rgw89p1jfs8mp4l7d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120608.1335",
-        "deps": []
-    },
-    "disaster": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jart",
-            "repo": "disaster",
-            "sha256": "1srlz63pncxndh1kmb6dl5sxaanspxa444wg998dld3dkdflwavq",
-            "rev": "8d8fc67af5b3d876b0056562ece0478e6e2367f0"
-        },
-        "recipe": {
-            "sha256": "1ad8q81n0s13cwmm216wqx3s92195pda1amc4wxvpb3lq7dbd3yn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130509.1255",
-        "deps": []
-    },
-    "emoji-cheat-sheet-plus": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syl20bnr",
-            "repo": "emacs-emoji-cheat-sheet-plus",
-            "sha256": "1rk7am0xvpnv98yi7a62wlyh576md4n2ddj7nm201bjd4wdl2yxk",
-            "rev": "96a003127d646a2683d81ca906a17eace0a6413e"
-        },
-        "recipe": {
-            "sha256": "1ciwlbw0ihm0p5gnnl3safcj7dxwiy53bkj8cmw3i334al0gjnnv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150617.831",
-        "deps": [
-            "emacs",
-            "helm"
-        ]
-    },
-    "helm-proc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "markus1189",
-            "repo": "helm-proc",
-            "sha256": "076yhcf447fas14k8gg67rc743x049xf66627sd9lgjv7107r8vr",
-            "rev": "76fee002caa1c83809f4d3f7b30fa672dcb36937"
-        },
-        "recipe": {
-            "sha256": "1bq60giy2bs9m3hlbc5nwvy51702a98s0vqass3b290hdgki4bnx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140504.357",
-        "deps": [
-            "helm"
-        ]
-    },
-    "minimap": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dustinlacewell",
-            "repo": "emacs-minimap",
-            "sha256": "0s95bb6ld7a23jrq2pa087w9yg16ymnajp3pmw880j6dahlwpdgk",
-            "rev": "be119f9b9c321c0045b01d940e495f16f2ea4f5c"
-        },
-        "recipe": {
-            "sha256": "1gnvakp71l25r48bx1n2j33dq8q1lc7ff1j4fcnnvblhh3rsra96",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150108.1815",
-        "deps": []
-    },
-    "evil-lisp-state": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syl20bnr",
-            "repo": "evil-lisp-state",
-            "sha256": "0lvjqs40caxj3781cs41qavk10vlz2mjw0r6fmxa2z3c087cxnxw",
-            "rev": "f4da21900563f4ac1abf79f3fe73eaf1edcd633d"
-        },
-        "recipe": {
-            "sha256": "117irac05fs73n7sgja3zd7yh4nz9h0gw5b1b57lfkav6y3ndgcy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151201.924",
-        "deps": [
-            "bind-map",
-            "evil",
-            "smartparens"
-        ]
-    },
-    "gitolite-clone": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "IvanMalison",
-            "repo": "gitolite-clone",
-            "sha256": "1h66wywhl5ipryx0s0w1vxp3ydg57zpizjz61wvf6qd8zn07nhng",
-            "rev": "36e8dbc2906b7bfce382db64211d982c9719ab59"
-        },
-        "recipe": {
-            "sha256": "1la1nrfns9j6wii6lriwwsd44cx3ksyhh09h8lf9dai6wp67kjac",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150819.839",
-        "deps": [
-            "dash",
-            "emacs",
-            "pcache",
-            "s"
-        ]
-    },
-    "helm-spotify": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "krisajenkins",
-            "repo": "helm-spotify",
-            "sha256": "133dcqk42nq5gh5qlcbcmx3lczisfgymcnypnld318jvjgd2ma8a",
-            "rev": "a1a8275a4769221f7df9a67ed9a028fecbdc29ca"
-        },
-        "recipe": {
-            "sha256": "1rzvxnaqh8bm78qp0rhpqs971pc855qrq589r3s8z3gpqzmwlnmf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131014.1621",
-        "deps": [
-            "helm",
-            "multi"
-        ]
-    },
-    "linphone": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zabbal",
-            "repo": "emacs-linphone",
-            "sha256": "01yv6239z90hvncwmm9g5nh4xvyxv2ig3h4hsmxdn4kacfxvc84n",
-            "rev": "99af3db941b7f4e5272bb48bff96c1ce4ceac302"
-        },
-        "recipe": {
-            "sha256": "0q7mw1npxq24szhwswc93qz5h6magcxw63ymba7hwhif6my65zx7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130524.609",
-        "deps": []
-    },
-    "popwin": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "m2ym",
-            "repo": "popwin-el",
-            "sha256": "0nips9npm4zmz3f37vvb4s0g1ci0p9cl6w0z4sc6agg4rybjhpdp",
-            "rev": "95dea14c60019d6cccf9a3b33e0dec4e1f22c304"
-        },
-        "recipe": {
-            "sha256": "1zp54nv8rh0b3g8y5aj4793miiw2r1ijwbzq31lkwmbdr09mixmf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150315.800",
-        "deps": []
-    },
-    "py-isort": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "paetzke",
-            "repo": "py-isort.el",
-            "sha256": "0150q6xcnzzrkn9fa9njm973l1d49c48ad8qia71k4jwrxjjj6zr",
-            "rev": "cfbb576784fe4501909c15299607ce2a2d0bf164"
-        },
-        "recipe": {
-            "sha256": "0k5gn3bjn5pv6dn6p0m9xghn0sx3m29bj3pfrmyh6gd5ic0l00yb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150422.1039",
-        "deps": []
-    },
-    "theme-looper": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myTerminal",
-            "repo": "theme-looper",
-            "sha256": "1kd4mazrcy5xamkvvrwsmcx63g0gp5w4264kxbk3d25bjqcf8rmj",
-            "rev": "41c15ae98f9406b7932974318a2eada3668a88e7"
-        },
-        "recipe": {
-            "sha256": "02hz9k4ybpp4i8ik2av9rg240sjgicbf6w24zn67dmw4nc4lp9c5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150723.1304",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "org-octopress": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yoshinari-nomura",
-            "repo": "org-octopress",
-            "sha256": "132jv1zvp3yp4pa4ysl0n3a81d39cdi3nqfziz1ha1pl10qbn6wr",
-            "rev": "e04d55c3f4bb88e5661ee136cb3a55f998dca931"
-        },
-        "recipe": {
-            "sha256": "0r6ms9j4xxsrik4206g7gz4wz41wr4ylpal6yfqs4hhz88yhxrhw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150826.616",
-        "deps": [
-            "ctable",
-            "org",
-            "orglue"
-        ]
-    },
-    "django-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myfreeweb",
-            "repo": "django-mode",
-            "sha256": "0dw0m77w7kdwxxh53b4k15jjkpfl5vha17hw9dn29ap77pf820va",
-            "rev": "3d82a62a7faeb2c124ac4c109e075f581c175508"
-        },
-        "recipe": {
-            "sha256": "1rdkzqvicjpfh9k66m31ky6jshx9fqw7pza7add36bk6xg8lbara",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150207.717",
-        "deps": []
-    },
-    "mobdebug-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "deftsp",
-            "repo": "mobdebug-mode",
-            "sha256": "04hbd7mv29v3fv4ld0b3skrir0wp9dix2n5nbqp63fj6n5i4cyyz",
-            "rev": "e1d483bc4e341c762bc5c0a8c52306a8d01ea0da"
-        },
-        "recipe": {
-            "sha256": "19k0c7igqsqvib6hx0nssig4l5f959dlr4wijd1hp5h1hmcb5vv8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140109.2146",
-        "deps": [
-            "emacs",
-            "lua-mode"
-        ]
-    },
-    "paredit": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "http://mumble.net/~campbell/git/paredit.git",
-            "sha256": "34dd7d8c07c697b54ea943566e6967012f7366d6f5a21e31e3d768716bc4928f",
-            "rev": "9a696fdcce87c9d9eec4569a9929d0300ac6ae5c"
-        },
-        "recipe": {
-            "sha256": "1rp859y4qyqdfvp261l8mmbd62p1pw0dypm1mng6838b6q6ycakr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150217.913",
-        "deps": []
-    },
-    "gh": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sigma",
-            "repo": "gh.el",
-            "sha256": "0fkq3yl9jpakfnahymjv28fcal38c210garnq055rgmyhyhhpdwd",
-            "rev": "3ceef078d9418cf19e1fe6be15cf34794a14880a"
-        },
-        "recipe": {
-            "sha256": "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151216.946",
-        "deps": [
-            "emacs",
-            "logito",
-            "pcache"
-        ]
-    },
-    "cider-profile": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thunknyc",
-            "repo": "nrepl-profile",
-            "sha256": "0lgq4p7rs4prqfqd83v1l36xxacrd65jsfzbp7q62b2pjqikpgk0",
-            "rev": "9aa7e404f53f5136ac8d15301ce8ca2924785cb3"
-        },
-        "recipe": {
-            "sha256": "14jc98h4r9rb7pxfb60ps4ss8p0bm66wdl6n8z1357hk93h9kmfs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141120.825",
-        "deps": [
-            "cider"
-        ]
-    },
-    "simp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "re5et",
-            "repo": "simp",
-            "sha256": "1m8azyb4nxxdh6pwik9qb0zqp4z8z4vk3dlpfgklsq9rss8gwbaf",
-            "rev": "334b20287b3160f77e25c8e0ee2a73dd41fbe0ab"
-        },
-        "recipe": {
-            "sha256": "0x4lssjkj3fk9fw603f0sggvcj25iw0zbzsm5c949lhl4a3wvc9c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150427.1132",
-        "deps": []
-    },
-    "org-grep": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsorphanage",
-            "repo": "org-grep",
-            "sha256": "10jwqzs431mnwz717qdmcn0v8raklw41sbxbnkb36yrgznk8c09c",
-            "rev": "5bdd04c0f53b8a3d656f36ea17bba3df7f0cb684"
-        },
-        "recipe": {
-            "sha256": "0kpgizy0zxnlmyh0prwdll62ri2c1l4sb0yrkl7yw17cr4gxmkkz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151202.629",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "minimal-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ikame",
-            "repo": "minimal-theme",
-            "sha256": "1iy1z2kwnbzxhz5r4gsy4zm0l3xbwy314dqxliprbl8n2m9w0lmz",
-            "rev": "2cc688c1705eeb77fe1deeea35bfce378081f238"
-        },
-        "recipe": {
-            "sha256": "0l4xj5q06h5fk634d6v3idm0zniq8grz4rjm6qzi7b4jr9sc60gm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140409.1801",
-        "deps": []
-    },
-    "lispy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "lispy",
-            "sha256": "0w5wwwffn3dhvdcr54jfh9l4kv99bkf0ck5ryjh165cjjy3y9z28",
-            "rev": "83a670d230d60112337d5b1c92bced20e3f43d1c"
-        },
-        "recipe": {
-            "sha256": "12qk2gpwzz7chfz7x3wds39r4iiipvcw2rjqncir46b6zzlb1q0g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.1224",
-        "deps": [
-            "ace-window",
-            "emacs",
-            "iedit",
-            "swiper"
-        ]
-    },
-    "bpe": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yuutayamada",
-            "repo": "bpe",
-            "sha256": "0chmarbpqingdma54d6chbr6v6jg8lapbw56cpvcpbl04fz980r0",
-            "rev": "7b5b25f83506e6c9f4075d3803fa32404943a189"
-        },
-        "recipe": {
-            "sha256": "08zfqcgs7i2ram2qpy8vrzksx5722aahr66vdi4d9bcxm03s19fm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141228.1605",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "sphinx-frontend": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kostafey",
-            "repo": "sphinx-frontend",
-            "sha256": "1mfp4777ppg7zg7zqj755zpfk9lmcq73hxv055ig66pz30m7x5rw",
-            "rev": "a46e81ce65fd24c03acab9311b162cad21343744"
-        },
-        "recipe": {
-            "sha256": "0hdn6zjnhzyka0lzdxqfzbj3lrj767ij406zha9zw8ibbkk7cmag",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151122.412",
-        "deps": []
-    },
-    "request-deferred": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tkf",
-            "repo": "emacs-request",
-            "sha256": "0dja4g43zfjbxqvz2cgivgq5sfm6fz1563qgrp4yxknl7bdggb92",
-            "rev": "adf7de452f9914406bfb693541f1d280093c4efd"
-        },
-        "recipe": {
-            "sha256": "1dcxqnzmvddk61dzmfx8vjbzd8m44lscr3pjdp3r7211zhwfk40n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130526.1215",
-        "deps": [
-            "deferred",
-            "request"
-        ]
-    },
-    "railscasts-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mikenichols",
-            "repo": "railscasts-theme",
-            "sha256": "021x1l5kzsbm0qj5a3bngxa7ickm4lbwsdz81a2ks9pi1ivmw205",
-            "rev": "1340c3f6c2717761cab95617cf8dcbd962b1095b"
-        },
-        "recipe": {
-            "sha256": "1z5m8ccx2k18gbzqvg0051mp2myy2qncf4xvv47k80f83pk2hw6r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150219.925",
-        "deps": []
-    },
-    "second-sel": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/second-sel.el",
-            "sha256": "0ar60sqzlyrhvlg0mxfbc8c824lqglq07gf8lccjabnpwilz3ksd"
-        },
-        "recipe": {
-            "sha256": "1nzy5ms5qf5big507kg3z5m6d6zgnsv2fswn359r2j59cval3fvr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1846",
-        "deps": []
-    },
-    "on-parens": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "willghatch",
-            "repo": "emacs-on-parens",
-            "sha256": "1616bdvrf1bawcqgj7balbxaw26waw81gxiw7yspnvpyb009j66y",
-            "rev": "16a145bf73550d5000ffbc2725c541a8458d0d3c"
-        },
-        "recipe": {
-            "sha256": "19kyzpkgfl0ipbcgnl8fbfbapnfdxr8w9i7prfkm6rjp6amxyqab",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150702.1706",
-        "deps": [
-            "dash",
-            "emacs",
-            "evil",
-            "smartparens"
-        ]
-    },
-    "ace-flyspell": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cute-jumper",
-            "repo": "ace-flyspell",
-            "sha256": "1msj0dbzfan0jax5wh5rmv4l7cp5zhrp5wy5k1n9s7xdgz2dprzj",
-            "rev": "76c255d91c86b57a07cc7660450e37107d73505f"
-        },
-        "recipe": {
-            "sha256": "0f24qrpcvyg7h6ylyggn4zrbydci537iigshac1d8yywsr0j47gd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150523.1315",
-        "deps": [
-            "ace-jump-mode"
-        ]
-    },
-    "list-unicode-display": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "list-unicode-display",
-            "sha256": "05nn4db8s8h4mn3fxhwsa111ayvlq1raf6bifh7jciyw7a2c3aww",
-            "rev": "59770cf3572bd36c3e9ba044846dc420c0dca09b"
-        },
-        "recipe": {
-            "sha256": "01x9i5k5vhjscmkx0l6r27w1cdp9n6xk1pdjf98z3y88dnsmyfha",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150219.301",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "import-popwin": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-import-popwin",
-            "sha256": "0ycsdwwfb27g85aby4jix1aj41a4vq6bf541iwla0xh3wsyxb01w",
-            "rev": "34c3b34ffcadafea71600acb8f4e5ba385e6da19"
-        },
-        "recipe": {
-            "sha256": "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150716.433",
-        "deps": [
-            "cl-lib",
-            "popwin"
-        ]
-    },
-    "company-tern": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "proofit404",
-            "repo": "company-tern",
-            "sha256": "1mybg3izz93kf5a6xhalz9rfbjmazgqrhpw9mjdcqh4zd6avw00c",
-            "rev": "bd358af7c1492391ea39d35672ac12f8587ade21"
-        },
-        "recipe": {
-            "sha256": "17pw4jx3f1hymj6sc0ri18jz9ngggj4a41kxx14fnmmm8adqn6wh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150525.416",
-        "deps": [
-            "cl-lib",
-            "company",
-            "dash",
-            "dash-functional",
-            "s",
-            "tern"
-        ]
-    },
-    "lit-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "HectorAE",
-            "repo": "lit-mode",
-            "sha256": "0mr0king5dj20vdycpszxnfs9ch808fhcz3q7svxfngj3d3671wd",
-            "rev": "c61c403afc8333a5649c5421ab1a6341dc1c7d92"
-        },
-        "recipe": {
-            "sha256": "05rf7ki060nqnvircn0dkpdrg7xbh7phb8bqgsab89ycc7l9vv59",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141123.1136",
-        "deps": []
-    },
-    "platformio-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zachmassia",
-            "repo": "platformio-mode",
-            "sha256": "0xcmnla5cm5kk5cnjzszrwrlab98g4w8nfydvagbhfh5gzglqm4q",
-            "rev": "5fde4cb291790e174542423accdbe6674efb176b"
-        },
-        "recipe": {
-            "sha256": "022l20sfyfkvp6kmmqxr7gcmcdx6b1dgsakjjnx8fknrpxr5kyps",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151225.2142",
-        "deps": [
-            "projectile"
-        ]
-    },
-    "w32-browser": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/w32-browser.el",
-            "sha256": "1cpy3c0aj265wda9bz6b88i73mr9xi8gm1cp0q72ikhz43kszihx"
-        },
-        "recipe": {
-            "sha256": "14vc2cipwlwwc0b5ld4x0zvydkg8nbjmp0z2x6ca0nmxw8sfsnc6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1905",
-        "deps": []
-    },
-    "miniedit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsorphanage",
-            "repo": "miniedit",
-            "sha256": "1850z96gly0jnr50472idqz1drzqarr0n23bbasslrc501xkg0bq",
-            "rev": "e12bf659c3eb92dd8a4cb77642dc0865c54667a3"
-        },
-        "recipe": {
-            "sha256": "10s407q7igdi2hsaaahbw8vckalrl7z3s6l9cflf51q16xh2ih87",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20100419.1245",
-        "deps": []
-    },
-    "magit-gh-pulls": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sigma",
-            "repo": "magit-gh-pulls",
-            "sha256": "03m4gr86lm8rs3zn6hdirlgfixf1w033iyhsg9dwlhvmfpfghxb5",
-            "rev": "728819217c697b4eed996eb14261a8c7c3388df7"
-        },
-        "recipe": {
-            "sha256": "0qn9vjxi33pya9s8v3g95scmhwrn2yf5pjm7d24frq766wigjv8d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151212.1243",
-        "deps": [
-            "emacs",
-            "gh",
-            "magit",
-            "pcache",
-            "s"
-        ]
-    },
-    "pcre2el": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joddie",
-            "repo": "pcre2el",
-            "sha256": "0ymbximchjfllrglkwv4lwb2sqprvva77vfbjb6n6kzni0ix70s3",
-            "rev": "57ee828d07953329fd85ff85d6a4f27a0ce512a1"
-        },
-        "recipe": {
-            "sha256": "1l72hv9843qk5p8gi9ibr15wczm804j3ws2v1x7nx4dr7pc5c7l3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151213.434",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "highlight-current-line": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/highlight-current-line.el",
-            "sha256": "1aki7a7nnj9n7vh19k4fr0v7cqbwkrpc6b3f3yv95vcqj8a4y34c"
-        },
-        "recipe": {
-            "sha256": "01bga6is3frzlzfajpvpgz224vhl0jnc2bl2ipvlygdcmv4h8973",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20051013.1256",
-        "deps": []
-    },
-    "znc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sshirokov",
-            "repo": "ZNC.el",
-            "sha256": "1xsxmvbh3xm3zh9yc6q28h48nar6pwyd51xw04b1x7amwkp8qdnp",
-            "rev": "94c8e4cdcfb51b75d5f95cb51ce21c6274325e19"
-        },
-        "recipe": {
-            "sha256": "1z2kzbapgh55wwr5jp7v1wz5kpz4l7n3k94mkh3s068xag9xs6zz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140722.1621",
-        "deps": [
-            "cl-lib",
-            "erc"
-        ]
-    },
-    "window+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/window+.el",
-            "sha256": "1mq8nrcypfm8na1qg0dykp6r1mfraix2jp1xc0lkx4wn620mp9cz"
-        },
-        "recipe": {
-            "sha256": "0fhzb0ay9g9qgcaxpb2qaw15dh0lfmv3x4akyipi3zx11446d06j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1911",
-        "deps": []
-    },
-    "dired-open": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "dired-hacks",
-            "sha256": "15jri9cj5jgr3ff423izd8idd7djay238c9pa3ccy05djl9z2hdx",
-            "rev": "6647825dbca4269afa76302e345d6bd15b222e42"
-        },
-        "recipe": {
-            "sha256": "0a4ksz2jkva4gvhprywjc1fzrbf95xdk8gn25nv1h1c1ckhr91qx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150819.1148",
-        "deps": [
-            "dash",
-            "dired-hacks-utils"
-        ]
-    },
-    "firestarter": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wasamasa",
-            "repo": "firestarter",
-            "sha256": "0s8rml5xbskvnjpi8qp7vqflxhh5yis6zr6ay2bxmd2chjlhli55",
-            "rev": "4b7428477980e12578ebbbb121115696b352d6b2"
-        },
-        "recipe": {
-            "sha256": "1cpx664hyrdnpb1jps1x6lm7idwlfjblkfygj48cjz9pzd6ld5mp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151213.815",
-        "deps": []
-    },
-    "adoc-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sensorflo",
-            "repo": "adoc-mode",
-            "sha256": "01fn73vyhdcy84s60r2jjy9a0xm3zwagpzi6b4qlankbvswypask",
-            "rev": "168ffa3f8efc3a635cc8f9422b7117a3a99af804"
-        },
-        "recipe": {
-            "sha256": "0wgagcsh0fkb51fy17ilrs20z2vzdpmz97vpwijcfy2b9rypxq15",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151119.1114",
-        "deps": [
-            "markup-faces"
-        ]
-    },
-    "racer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "racer-rust",
-            "repo": "emacs-racer",
-            "sha256": "10nj92fm9lmamqyri84lsdv71wbrb2nfi0gfwnq9mg54pyv0r2si",
-            "rev": "637e01ba74c7ffda3c37d3bff13d870a1899fecd"
-        },
-        "recipe": {
-            "sha256": "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151016.1916",
-        "deps": [
-            "dash",
-            "emacs",
-            "rust-mode",
-            "s"
-        ]
-    },
-    "hamlet-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lightquake",
-            "repo": "hamlet-mode",
-            "sha256": "1njrpb1s2v9skyfbgb28clrxyvyp8i4b8kwa68ynvq3vjb4fnws6",
-            "rev": "7362b955e556a3d007fa06945a27e5b99349527d"
-        },
-        "recipe": {
-            "sha256": "0ils4w8ry1inlfj4931ypibj3n60xq6ah74hig62y4vrs4d47gyx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131208.124",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "s"
-        ]
-    },
-    "simplezen": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "simplezen.el",
-            "sha256": "0108q2b5h73rjxg9k2kmc8z6la9kgqdnz9z1x7rn61v3vbxlzqvn",
-            "rev": "119fdf2c6890a0c56045ae72cf4fce0071a81481"
-        },
-        "recipe": {
-            "sha256": "13f2anhfsxmx1vdd209gxkhpywsi3nn6pazhc6bkswmn27yiig7j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130421.500",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "geiser": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jaor",
-            "repo": "geiser",
-            "sha256": "1sr053v8vdc4v7prbbz8dbwk84hravpcc3zyfsifghmv999iwrz3",
-            "rev": "8e75455dfbd46355d777c26366e7ccfcb59ace20"
-        },
-        "recipe": {
-            "sha256": "067rrjvyn5sz60w9h7qn542d9iycm2q4ryvx3n6xlard0dky5596",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.2114",
-        "deps": []
-    },
-    "tup-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ejmr",
-            "repo": "tup-mode",
-            "sha256": "0y1b9zvwbw3vp41siyzj04bis939fgz3j27hc5ljjzy92kd39nzm",
-            "rev": "bcc100c6485f1c81fdcd1215dfc6c41a81c215c8"
-        },
-        "recipe": {
-            "sha256": "0pzpn1ljfcc2dl9fg7jc8lmjwz2baays4axjqk1qsbj0kqbc8j0l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140410.1114",
-        "deps": []
-    },
-    "voca-builder": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yitang",
-            "repo": "voca-builder",
-            "sha256": "183pvfp5nnqpgdmfxm84qrnid0lijgk79l5lhwzmnznzkrb7bgxw",
-            "rev": "cd74c13e005e33ab125d43233b1267a8819b0abb"
-        },
-        "recipe": {
-            "sha256": "0mbw87mpbb8rw7xzhmg6yjla2c80x9820kw4q00x00ny5rbhm76y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150625.1333",
-        "deps": []
-    },
-    "replace+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/replace+.el",
-            "sha256": "0hma5mb2r33yfdlwb1ls1gjnqps00sri6q0hkksngvz67hka9mx4"
-        },
-        "recipe": {
-            "sha256": "1imsgr3v8g2p2mnkzp92ga3nvckr758pblmlha8gh8mb80089krn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150723.833",
-        "deps": []
-    },
-    "pager-default-keybindings": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nflath",
-            "repo": "pager-default-keybindings",
-            "sha256": "11msqs8v9wn8sj45dw1fl0ldi3sw33v0xclynbxgmawyabfq3bqm",
-            "rev": "dbbd49c2ac5906d1dabf9e9c832bfebc1ab405b3"
-        },
-        "recipe": {
-            "sha256": "0vqb3s1fxkl1fxxspq89344s55sfcplz26z0pbh347l1681h3pci",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130719.1557",
-        "deps": [
-            "pager"
-        ]
-    },
-    "zotelo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vitoshka",
-            "repo": "zotelo",
-            "sha256": "16fr5s8i9ykq5j7ikf6qfd2px2dxc1gcff5wipif8h758691rliv",
-            "rev": "91c8309da1f293341ba86f29fa0a28dee5cabd93"
-        },
-        "recipe": {
-            "sha256": "0ai516lqj9yw7ymvfm4n5inv53sp6mg90wy56lr1laflizwxzg8z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151105.541",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "material-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cpaulik",
-            "repo": "emacs-material-theme",
-            "sha256": "1vpqkbjqdy6x4icpn312yl0ppnpj0m2anc9jld2kvz8wbpgqmlwl",
-            "rev": "68a2e4d9f09dc3a45c765edb271c3460af885de0"
-        },
-        "recipe": {
-            "sha256": "1d259avldc5fq121xrqv53h8s4f4bp6b89nz2rvjhygz7f8hargq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151125.225",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "helm-dash": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "areina",
-            "repo": "helm-dash",
-            "sha256": "0s503q56acv70i5qahrdgk3nhvdpb3wa22a8jh1kvb7lykaw74ai",
-            "rev": "a0f5d6539da873cd0c51d8ef714930c970a66aa0"
-        },
-        "recipe": {
-            "sha256": "1cnxssj2ilszq94v5cc4ixblar1nlilv9askqjp9gfnkj2z1n9cy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151203.1347",
-        "deps": [
-            "cl-lib",
-            "helm"
-        ]
-    },
-    "vcomp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "vcomp",
-            "sha256": "0fzz26c1pdaz3i58ndhzd2520mhny487daqs21yajxi9x2m00zrl",
-            "rev": "092ef48a78e950c0576269d889be6caf9f6e61c5"
-        },
-        "recipe": {
-            "sha256": "02cj2nlyxvgvl2rjfgacljvcsnfm9crmmkhcm2pznj9xw10y8pq0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140906.1708",
-        "deps": []
-    },
-    "togetherly": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "togetherly",
-            "sha256": "1falf86mm2206szkkwiwa5yk65y12asv84j1pdbcy6n8y6hha796",
-            "rev": "9d655661984f7d62e9d6e0e9d47ae7ca8c4f43c7"
-        },
-        "recipe": {
-            "sha256": "01ks160dfmgh05lx0lmyg020hba8nw49mj51dp1afcsmx4dkis2f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150820.338",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "jsx-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jsx",
-            "repo": "jsx-mode.el",
-            "sha256": "1g648r0wrd8m5ggl5jrplmj7jmr68bh2ykyii5wv30zfba97r1sh",
-            "rev": "47213429c09259126cddb5742482cfc444c70d50"
-        },
-        "recipe": {
-            "sha256": "1lnjnyn8qf3biqr92z443z6b58dly7glksp1g986vgqzdprq3n1b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130908.1224",
-        "deps": []
-    },
-    "literate-starter-kit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "eschulte",
-            "repo": "emacs24-starter-kit",
-            "sha256": "1v37bii372w2g3pl09n5dcrk6y7glhpg8qiv17zsk9jy3ps2xm1b",
-            "rev": "6dce1d01781966c14558aa553cfc85008c06e115"
-        },
-        "recipe": {
-            "sha256": "1n2njf007fmrmsb8zrgxbz1cpxmr5nsp8w41yxa934iqc7qygkjy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150730.1354",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "searchq": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "boyw165",
-            "repo": "searchq",
-            "sha256": "0zs08vxmjb3y4dnfq6djnrhmkgyhhwd5zylrjisrd4y7f089fyh4",
-            "rev": "dd510d55ad66a82c6ef022cfe7c4a73ad5365f82"
-        },
-        "recipe": {
-            "sha256": "0flsc07v887pm62mslrv7zqnhl62l6348nkm77mizm1592q3kjgr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150829.711",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "x-dict": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsmirror",
-            "repo": "x-dict",
-            "sha256": "0i7bgbhk4lvdkdjh6z4xs69mbdi49985j82cjikzyyskjcqd2klq",
-            "rev": "920b2430bff9fb8c4bb7944aa358622545c00cee"
-        },
-        "recipe": {
-            "sha256": "1w51xhiaxk50wlch262dxs2ybjvjj8qzx01xlgiimvggb8h5arlc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20091203.1223",
-        "deps": []
-    },
-    "tool-bar+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/tool-bar+.el",
-            "sha256": "1ml95y7275yd2jn4zf96rg0pwxsv8vnwv52mvr9j0j9mqkw1d0d9"
-        },
-        "recipe": {
-            "sha256": "07nsas600w5kxx7yzg52ax9avry8kq429mqlrs38jg5ycf3b1l6d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1902",
-        "deps": []
-    },
-    "python-info": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Wilfred",
-            "repo": "python-info",
-            "sha256": "079xvdaw06wvjnma6572j3p8c7h206agpi9c1as3iw8r1qf5pv7z",
-            "rev": "39996472d78420986e62ae9d16bf62a4a26aab60"
-        },
-        "recipe": {
-            "sha256": "0kvpz1r2si94rs1iajn1ffmx7a5bgyjnzri36ajdgd5gcgh41dhy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141106.1551",
-        "deps": []
-    },
-    "mo-git-blame": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mbunkus",
-            "repo": "mo-git-blame",
-            "sha256": "1ydv6z0nns3cc3bxb1r7052dck66y4v201ms2bzichmd351qhv6q",
-            "rev": "a0b9ca186d96ef02a5c0ab5d1c29b7a71e78af68"
-        },
-        "recipe": {
-            "sha256": "1dp9pxhggappb70m5hyp8sxlnh06y996adabq7x6qvm745mk6f0x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151127.215",
-        "deps": []
-    },
-    "auto-async-byte-compile": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/auto-async-byte-compile.el",
-            "sha256": "1c8nm4sz9a67q8w0b1jahg5ldy185zws7nilj9yv3miklg07zq17"
-        },
-        "recipe": {
-            "sha256": "108jhrdx67chbdd4h824072i2wrn90zdh2hw5vqd4a5svhhf28jj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151029.916",
-        "deps": []
-    },
-    "gradle-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jacobono",
-            "repo": "emacs-gradle-mode",
-            "sha256": "0xs2278gamzg0710bm1fkhjh1p75m2l1jcl98ldhyjhvaf9d0ysc",
-            "rev": "e4d665d5784ecda7ddfba015f07c69be3cfc45f2"
-        },
-        "recipe": {
-            "sha256": "0lx9qi93wmiy9pxjxqp68scbcb4bx88b6jiqk3y8jg5cajizh24g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150313.1405",
-        "deps": [
-            "s"
-        ]
-    },
-    "code-library": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lujun9972",
-            "repo": "code-library",
-            "sha256": "0mcf0xyh4p6pk2hf1f554vy4amd0qcimspgnncff2a0qc2bsg5sy",
-            "rev": "6004c12b199f0a78bc6c11adaa5091a90bc6926b"
-        },
-        "recipe": {
-            "sha256": "0gi8lz2q0vis4nyziykq15jp3m3vykfwycbk6amhf1ybkn9k3ywj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151216.1011",
-        "deps": [
-            "gist"
-        ]
-    },
-    "redo+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/redo+.el",
-            "sha256": "1jc4n60spzssa57i3jwrqwy20f741hb271vmmx49riycx1ybx3d3"
-        },
-        "recipe": {
-            "sha256": "1alfs7k5mydgvzsjmdifcizqgrqjrk2kbh3mabai7nlrwi47w9n2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131117.551",
-        "deps": []
-    },
-    "cycle-themes": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "toroidal-code",
-            "repo": "cycle-themes.el",
-            "sha256": "125s6vwbb9zpx6h3vrxnn7nr8pb45vhxd70ba2r3f87dlxah93am",
-            "rev": "6e125d11fdbc6b78fc9f219eb2609a5e29815898"
-        },
-        "recipe": {
-            "sha256": "1whp9q26sgyf59wygbrvdf9gc94bn4dmhr2f2qivpajx550fjfbc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150402.2209",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "ess-R-data-view": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "ess-R-data-view.el",
-            "sha256": "1ya2ay52gkrd31pmw45ban8kkxgnzhhwkzkypwdhjfccq3ys835x",
-            "rev": "d6e98d3ae1e2a2ea39a56eebcdb73e99d29562e9"
-        },
-        "recipe": {
-            "sha256": "0r2fzwayf3yb7fqk6f31x4xfqiiczwik8qw4rrvkqx2h3s1kz7i0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130509.658",
-        "deps": [
-            "ctable",
-            "ess",
-            "popup"
-        ]
-    },
-    "string-inflection": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "akicho8",
-            "repo": "string-inflection",
-            "sha256": "06qs8v2pai3pyg0spmarssmrq06xg9q60wjj46s5xxichlw9pgcf",
-            "rev": "147990de9d07d8e603ade92a23ef27a71e52b850"
-        },
-        "recipe": {
-            "sha256": "1vrjcg1fa5adw16s4v9dq0fid0gfazxk15z9cawz0kmnpyzz3fg2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150805.456",
-        "deps": []
-    },
-    "keyfreq": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dacap",
-            "repo": "keyfreq",
-            "sha256": "18qiw2324gx5w12pqka9njsysxym8dpglk7dzadg0k1wji73nn6l",
-            "rev": "06cb50b2796688cc76eeb86d48c9826abbee6383"
-        },
-        "recipe": {
-            "sha256": "1rw6hzmw7h5ngvndy7aa41pq911y2hr9kqc9w4gdd5v2p4ln1qh7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150924.2205",
-        "deps": []
-    },
-    "sourcetalk": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "malroc",
-            "repo": "sourcetalk_emacs",
-            "sha256": "0j4qm1y7rhb95k1zbl3c60a46l9rchzslzq36mayyw61s6yysjnv",
-            "rev": "aced89fa8776e6d5e42dad4a863e159959f08de6"
-        },
-        "recipe": {
-            "sha256": "0qaf2q784xgl1s3m88jpwdzghpi4f3nybga3lnr1w7sb7b3yvj3z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140823.939",
-        "deps": [
-            "request"
-        ]
-    },
-    "darkmine-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pierre-lecocq",
-            "repo": "darkmine-theme",
-            "sha256": "0ajxlrnz1228w8ldgraw6a4s605isbr67p8s382jvia2zf821fmp",
-            "rev": "8cd5ff16bede4c8e1d063bc46fc1089a36a05bd3"
-        },
-        "recipe": {
-            "sha256": "06vzldyqlmfd11g8dqrqh5x244ikfa20qwpsmbgsiry3041k8iw5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151216.832",
-        "deps": []
-    },
-    "archive-region": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/archive-region.el",
-            "sha256": "1mhj6x0n2ya3xd7gykmkcf70ji5g8qd8xawz764ykdlcribpsq52"
-        },
-        "recipe": {
-            "sha256": "03x2fqhx4w0c7xd8x8zlnyzdwyay6r2yxf4jzgkcg87q7rqjk9nd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140201.1745",
-        "deps": []
-    },
-    "path-headerline-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "7696122",
-            "repo": "path-headerline-mode",
-            "sha256": "1ffnkw8djs8kvfjd1crnaqram1vl4w3g1zhsqp74ds0mccsd6830",
-            "rev": "b5b2725c6a8b1cb592fc242b7dbbd54b4dff2e69"
-        },
-        "recipe": {
-            "sha256": "0dwr8iyq62ad5xkh7r4kpywpypdq1wljsdzwqbq9zdr79yfqx337",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140423.832",
-        "deps": []
-    },
-    "pointback": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsorphanage",
-            "repo": "pointback",
-            "sha256": "016cjy5pnnqccjqb0njqc9jq6kf6p165nlki83b8c0sj75yxghav",
-            "rev": "e3a02c1784d81b5a1d2477338d049af581ed19f8"
-        },
-        "recipe": {
-            "sha256": "198q511hixvzc13b3ih89xs9g47rdvbiixn5baqakpmpx3a12hz4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20100210.952",
-        "deps": []
-    },
-    "vc-osc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aspiers",
-            "repo": "vc-osc",
-            "sha256": "0whzfzg0m03wbmqsxml8hislnbfvawcniq83hj66lbrnbivxsqj4",
-            "rev": "fb01a35107be50ebb126c3573e0374e5e7d78331"
-        },
-        "recipe": {
-            "sha256": "0rp33945xk5d986brganqnn55psmlkj6glbimxakhgv9a1r85sxz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120910.411",
-        "deps": []
-    },
-    "kaesar": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-kaesar",
-            "sha256": "1maab8iaf2wcjj02ibl21jlfzmi9gmcl167cgdlwj50wkig74s23",
-            "rev": "11ab63b8e6f1c4ebc5a2e54474095754a39104e5"
-        },
-        "recipe": {
-            "sha256": "0zhi1dv1ay1azh7afq4x6bdg91clwpsr13nrzy7539yrn9sglj5l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150220.505",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "image-dired+": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-image-diredx",
-            "sha256": "1n2ya9s0ld257a8iryjd0dz0z2zs1xhzfiwsdkq4l4azwxl54m29",
-            "rev": "b68094625d963056ad64e0e44af0e2266b2eadc7"
-        },
-        "recipe": {
-            "sha256": "0hhwqfn490n7p12n7ij4xbjh15gfvicmn21fvwbnrmfqc343pcdy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150430.44",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "anything-sage": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "stakemori",
-            "repo": "anything-sage",
-            "sha256": "08xr6fkk1r4r5jqh349d4dfal9nbs2a8y2fp8zn3zlrj2cd0g80k",
-            "rev": "370b4248935dd4527127954788a028399644f578"
-        },
-        "recipe": {
-            "sha256": "1878vj8hzrwfyd2yvxcm0f1vm9m0ndwnj0pcq7j8zm9lxj0w48p3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141005.613",
-        "deps": [
-            "anything",
-            "cl-lib",
-            "sage-shell-mode"
-        ]
-    },
-    "ignoramus": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "ignoramus",
-            "sha256": "161algqrrjbc1ja08416q5wzz34rrg6shr2sim7vba0j3svyggnf",
-            "rev": "cab192aa621d1087f2d574b65fffd295c5efb919"
-        },
-        "recipe": {
-            "sha256": "1czqdmlrds1l5afi8ldg7nrxcwav86538z2w1npad3dz8xk67da9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150216.1542",
-        "deps": []
-    },
-    "stock-ticker": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hagleitn",
-            "repo": "stock-ticker",
-            "sha256": "191sg32z1iagyxmbn49i1lpfihld9g9741cw2kj830s4vag4kinx",
-            "rev": "f2e564142c9de84232839a5b01979cf95b04d6a9"
-        },
-        "recipe": {
-            "sha256": "1slcjk2avybr4v9s7gglizmaxbb3yqg6s6gdbg12m3vvj3b72lfi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150204.452",
-        "deps": [
-            "request",
-            "s"
-        ]
-    },
-    "telephone-line": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dbordak",
-            "repo": "telephone-line",
-            "sha256": "0mg870s60by22ripxhqrgxjx16506n4llj9nnxlqgr4mdsi77cf5",
-            "rev": "0715ee7d156086098b375f3d93de2f50e76f3d75"
-        },
-        "recipe": {
-            "sha256": "0dyh9h1yk9y0217b6rxsm7m372n910vpfgw5w23lkkrwa8x8qpx3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151116.642",
-        "deps": [
-            "cl-lib",
-            "eieio",
-            "emacs",
-            "s",
-            "seq"
-        ]
-    },
-    "ac-php": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xcwen",
-            "repo": "ac-php",
-            "sha256": "0gvb3bwp4nk8xxjhv17ss0f1pbdl20rhkah83x267ckksz534mh1",
-            "rev": "e574960b27000ed9b15b43bc15809d269e87d4fd"
-        },
-        "recipe": {
-            "sha256": "0p9qq8nszp5jb71s35cxnmcxp50b62y2jv1ha7vvqfz5p8miallk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151224.2322",
-        "deps": [
-            "auto-complete",
-            "company",
-            "dash",
-            "emacs",
-            "f",
-            "php-mode",
-            "popup",
-            "s",
-            "xcscope",
-            "yasnippet"
-        ]
-    },
-    "helm-ghq": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "masutaka",
-            "repo": "emacs-helm-ghq",
-            "sha256": "0rlk9016rxj292kpxrnqgrm4xsjs4m4gk2fwh8z3fcihi013lxaw",
-            "rev": "2997646b2fb5421ab435b772dd2dbaeb92d70166"
-        },
-        "recipe": {
-            "sha256": "14f3cbsj7jhlhrp561d8pasllnx1cmi7jk6v2fja7ghzj76dnvq6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151221.623",
-        "deps": [
-            "helm"
-        ]
-    },
-    "haskell-tab-indent": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "https://git.spwhitton.name/haskell-tab-indent",
-            "sha256": "7e41c910d6901638b9dfb697206659f5441e26e0558f9227c4ba7c6f2f47d841",
-            "rev": "150f52176242ba3bc4f58179cd2dbee4d89580f4"
-        },
-        "recipe": {
-            "sha256": "0vdfmy56w5yi202nbd28v1bzj97v1wxnfnb5z3dh9687p2abgnr7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151205.1359",
-        "deps": []
-    },
-    "math-symbol-lists": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vspinu",
-            "repo": "math-symbol-lists",
-            "sha256": "186gb83y3g1q7d0sdrxqz22nr62qq6fy7m74qwirlsf7vnnm4gpx",
-            "rev": "56319989e7ac6bd625b46e8a28f8005077b5957b"
-        },
-        "recipe": {
-            "sha256": "01j11k29acj0b1pcapmgi2d2s3p50bkms21i2qcj0cbqgz8h6s27",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151215.1243",
-        "deps": []
-    },
-    "ox-rst": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "masayuko",
-            "repo": "ox-rst",
-            "sha256": "1js4n8iwimc86fp2adzhbhy4ixss1yqngjd8gq7pxgpgmnhd66x3",
-            "rev": "2bd53fa5b3af67afbf45041d7f54b3c5b71b1f10"
-        },
-        "recipe": {
-            "sha256": "1vyj6frrl7328n2x7vc3qwv3ssdhi8bp6ja5h2q4bqalc6bl1pq0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151115.143",
-        "deps": [
-            "emacs",
-            "org"
-        ]
-    },
-    "multicolumn": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Lindydancer",
-            "repo": "multicolumn",
-            "sha256": "1ispa0wxpkydm0cyj4scyyacfrbilrip5v8bsrcqfc6qs597z8rf",
-            "rev": "c7a3afecd470859b2e60aa7c554d6e4d436df7fa"
-        },
-        "recipe": {
-            "sha256": "1ylnc3s4ixvnqn7g2p6nzz8x29ggqc703waci430f1rp1lsd3q09",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150202.1651",
-        "deps": []
-    },
-    "css-eldoc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zenozeng",
-            "repo": "css-eldoc",
-            "sha256": "1mgc6bd0dzrp1dq1yj8m2qxjnpysd8ppdk2yp96d3zd07zllw4rx",
-            "rev": "c558ac4c470742c98a37290e6b409db28183df30"
-        },
-        "recipe": {
-            "sha256": "1f079q3ccrr4drk2hvn4xs4vbrd3hg87xqbk3r9mmjvkagd1v7rf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150124.2123",
-        "deps": []
-    },
-    "helm-gtags": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-helm-gtags",
-            "sha256": "01l8d282jr191dak8zijqf5j12svp5rwnlqampnd2xdy39lw3800",
-            "rev": "28875c7b72798c357aa40d78a6a2d969b78e183a"
-        },
-        "recipe": {
-            "sha256": "0snx0b8b4yc507q3i4fzvrd68xgzqxly8kn5cwp26ik6cv840y29",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151222.919",
-        "deps": [
-            "cl-lib",
-            "helm"
-        ]
-    },
-    "chinese-pyim": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tumashu",
-            "repo": "chinese-pyim",
-            "sha256": "0kh3zn23qkw4i36ca28yly3h20i47kvf04cqywmchmic9nd8kh13",
-            "rev": "98e10e1e70b0eab713e1d764a5078f92917396b1"
-        },
-        "recipe": {
-            "sha256": "0zdx5zhgj1ly89pl48vigjzd8g74fxnxcd9bxrqykcn7y5qvim8l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151227.154",
-        "deps": [
-            "cl-lib",
-            "pos-tip"
-        ]
-    },
-    "zencoding-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rooney",
-            "repo": "zencoding",
-            "sha256": "1y3wj15kfbgskl29glmba6lzq43rcm141p4i5s180aqcw7ydp5vr",
-            "rev": "58e42af182c98cb9941d27cd042d227fbf4e146c"
-        },
-        "recipe": {
-            "sha256": "1fclad1dyngyg9ncfkcqfxybvy8482i2bd409cgxi9y4h1wc7ws7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140213.222",
-        "deps": []
-    },
-    "company-cabal": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "iquiw",
-            "repo": "company-cabal",
-            "sha256": "0ll9dxzsgrpy4psz3dqhzny990lfccn63swcyfvl8mnqgwbrq8k0",
-            "rev": "f458de88cad16ed48a605e8347e56433e73dcef8"
-        },
-        "recipe": {
-            "sha256": "0pbjidj88c9qri6xw8023yqwnczad5ig224cbsz6vsmdla2nlxra",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151216.920",
-        "deps": [
-            "cl-lib",
-            "company",
-            "emacs"
-        ]
-    },
-    "borland-blue-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fourier",
-            "repo": "borland-blue-theme",
-            "sha256": "1s7inys0191z90kwzlr4khrwin1qyj3jsci7240fifk2w8vpa69r",
-            "rev": "4b77caf6f40e2ffb4f37cb6e2c526bddb50c405f"
-        },
-        "recipe": {
-            "sha256": "1sc8qngm40bwdym8k1dgbahg48i73c00zxd99kqqwm9fnd6nm7qx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151206.1238",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "idle-highlight-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nonsequitur",
-            "repo": "idle-highlight-mode",
-            "sha256": "0x4w1ksrw7dicl84zpf4d4scg672dyan9g95jkn6zvri0lr8xciv",
-            "rev": "c466f2a9e291f9da1167dc879577b2e1a7880482"
-        },
-        "recipe": {
-            "sha256": "1i5ky61bq0dpk71yasfpjhsrv29mmp9nly9f5xxin7gz3x0f36fc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120920.1148",
-        "deps": []
-    },
-    "tc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kozo2",
-            "repo": "tc",
-            "sha256": "1xpkrlfqb0np9zyxk41f3pxfkw98ii4q0xh8whq4llv5bmfxynzk",
-            "rev": "6aa9d27c475be8d009adf9cd417f2cdf348a91e8"
-        },
-        "recipe": {
-            "sha256": "13qdnfslnik4f97lz9bxayyhgcp1knh5gaqy00ps863j3vpzjb9s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150113.2126",
-        "deps": []
-    },
-    "java-imports": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dakrone",
-            "repo": "emacs-java-imports",
-            "sha256": "1iy1y2lslh7agix7srkvbqcxhg9kgjbm9m44kgpim3kyjzgagw6i",
-            "rev": "9d39496f437e27dabe0873d4fc158a14bb25ed67"
-        },
-        "recipe": {
-            "sha256": "1waz6skyrm1n8wpc0pwa652l11wz8qz1m89mqxk27k3lwyd84n98",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151224.2013",
-        "deps": [
-            "pcache",
-            "s"
-        ]
-    },
-    "mandoku": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mandoku",
-            "repo": "mandoku",
-            "sha256": "0dbm53ihva3qsrcr1ancc6ky55j3j2i6qgqlipndv29aksxx3mlf",
-            "rev": "d8027f67b4a65f59101ce80a6b6308c01d37a186"
-        },
-        "recipe": {
-            "sha256": "1pg7ir3y6yk92kfs5agbxapcxf7gy60m353rjv8g3kfkx5zyh3mv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151130.900",
-        "deps": [
-            "git",
-            "github-clone",
-            "magit",
-            "org"
-        ]
-    },
-    "bibretrieve": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pzorin",
-            "repo": "bibretrieve",
-            "sha256": "0rwy4k06nd9a31hpyqs0fxp45dpddbvbhwcw1gzx4f73qmgawq9b",
-            "rev": "aff34c6e1a074ac4fd574d8e66fd9e0760585419"
-        },
-        "recipe": {
-            "sha256": "1mf884c6adx7rq5c2z5wrnjpb6znljy30mscxskwqiyfs8c62mii",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131013.1332",
-        "deps": [
-            "auctex",
-            "emacs"
-        ]
-    },
-    "private-diary": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cacology",
-            "repo": "private-diary",
-            "sha256": "1pxr5a9ik09k0f58lawhxiv179n5j8q24zhrs9vjk93yskl1ydwn",
-            "rev": "0c86fb6150ad8ed14f94def3504f5a68f4147283"
-        },
-        "recipe": {
-            "sha256": "0dgnf375c00nlkp66kbkzsf469063l03b9miiplbhd63zshlv1i1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151216.1057",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "cryptsy-public-api": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sodaware",
-            "repo": "cryptsy-public-api.el",
-            "sha256": "0ry0087g1br3397js7a9iy6k2x6p0dgqlggxx9gaqhms7pmpq14b",
-            "rev": "59bdf2425dccc27cc1598868a1a810885508cff5"
-        },
-        "recipe": {
-            "sha256": "1v78rm44af3vgsml5f6kpwvnb4ks6n49br2fhjgh6nc7g3jmz97n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141008.728",
-        "deps": [
-            "json"
-        ]
-    },
-    "highlight-blocks": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "highlight-blocks",
-            "sha256": "0c65jk00j88qxfki2g88hy9g6n92rzskwcn1fbmwcw3qgaz4b6w5",
-            "rev": "9c4240a5d16008db430d1a81c76dad474d3deb0c"
-        },
-        "recipe": {
-            "sha256": "1a32iv5kgf6g6ygbs559w156dh578k45m860czazfx0d6ap3k5m1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151201.1015",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "simple-httpd": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "emacs-http-server",
-            "sha256": "0jn46fk0ljqs40kz6ngp0sk6hg1334835r2rmagx4qm0mdaqy7p8",
-            "rev": "4b7a6bc6a6df6b932f8c9e9aded9103397c0c18f"
-        },
-        "recipe": {
-            "sha256": "18dharsdiwfkmhd9ibz9f47yfq9c2d78i886pi6gsjh8iwcpzx59",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150430.1955",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "lavender-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsfodder",
-            "repo": "emacs-lavender-theme",
-            "sha256": "1mg923rs2dk104bcr461dif3mg42r081ii8ipnnr588w7il0xh7k",
-            "rev": "d9e4d7838167a0e07fb5d04877a7b34c4b4cc1ee"
-        },
-        "recipe": {
-            "sha256": "1x7mk3dpk44fkzll6xmh2dw270cgb3a9qs3h8bmiq2dw0wrcwcd1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141116.102",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "actionscript-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "austinhaas",
-            "repo": "actionscript-mode",
-            "sha256": "1rxx2j7kkzjdsk06zgisiydg8dc18vqll4wl6q9mfhrg2y12lq94",
-            "rev": "f7dd1d77322b49d259919d58ffcdf64073ba6c09"
-        },
-        "recipe": {
-            "sha256": "1dkiay9jmizvslji5kzab4dxm1dq0jm8ps7sjq6710g7a5aqdvwq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140605.1328",
-        "deps": []
-    },
-    "electric-spacing": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xwl",
-            "repo": "electric-spacing",
-            "sha256": "0q1pb01h48wdbjgi04a6ck2jn7yfh92wpq1vka5pg54wv2k9b5fn",
-            "rev": "78e4ccbb0a924a3062fa16c9b24823bb79bb1f3e"
-        },
-        "recipe": {
-            "sha256": "0fcsz9wmibqp6ci0pa5r4gzlrsyj5klajxpgfksa0nfj3dc94cvg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151209.936",
-        "deps": []
-    },
-    "fakir": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nicferrier",
-            "repo": "emacs-fakir",
-            "sha256": "1w5apzbzr1jd983b0rzsy9ldb0z0zcq6mpyb5r8czl5wd4vvj69h",
-            "rev": "1fca406ad7de80fece6319ff75d4230b648534b0"
-        },
-        "recipe": {
-            "sha256": "07bicglgpm6qkcsxwj6rswhx4hgh27rfg8s1cki7g8qcvk2f7b25",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140729.1152",
-        "deps": [
-            "dash",
-            "kv",
-            "noflet"
-        ]
-    },
-    "z3-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zv",
-            "repo": "z3-mode",
-            "sha256": "1k7m3xk5ksbr2s3ypz5yqafz9sfav1m0qk2jz1xyi3fdaw2j0w2z",
-            "rev": "163dc01d59e9880b4dc188d4e1ad84d6c0c852e1"
-        },
-        "recipe": {
-            "sha256": "183lzhgjj480ca2939za3rlnsbfn24mgi501n66h5wim950v7vgd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151120.1655",
-        "deps": [
-            "emacs",
-            "flycheck"
-        ]
-    },
-    "latex-pretty-symbols": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/mortiferus/latex-pretty-symbols.el",
-            "sha256": "0h9hncf2ghfkd3i3342ajj1niykhfr0aais3j6sjg1vkm16xbr3b",
-            "rev": "ef4ea64c09ea"
-        },
-        "recipe": {
-            "sha256": "1f2s2f64bmsx89a3crm4skhdi4pq9w18z9skxw3i3ydaj15s8jgl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151112.444",
-        "deps": []
-    },
-    "sos": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "omouse",
-            "repo": "emacs-sos",
-            "sha256": "16x039imyf4p5d4rn92nlqcsvb5vlvdgq1m5g856b9dzwa89x733",
-            "rev": "96b7d951a5f0a8ae401c0813745fc1aca0cb816c"
-        },
-        "recipe": {
-            "sha256": "1gkd0plx7152s3dj8a9lwlwh8bgs1m006s80l10agclx6aay8rvb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141214.2203",
-        "deps": [
-            "org"
-        ]
-    },
-    "nasm-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "nasm-mode",
-            "sha256": "19v1qp4rzqvyzrk5zaxdjhki8cjl4fg6lr4ai3vi06yf62ds9mcs",
-            "rev": "d95a12d3caaf1decf4d3bd39ac8559098e7227aa"
-        },
-        "recipe": {
-            "sha256": "1626yf9mmqlsw8w01vzqsyb5ipa56259d4kl6w871k7rvhxwff17",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151109.1858",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "markup-faces": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sensorflo",
-            "repo": "markup-faces",
-            "sha256": "1w6i1m7xdr9cijnmdj35cl99r12vl83qws0qlfhrgvisilshnr27",
-            "rev": "98a807ed82473eb41c6a201ed7ef816d6bcd67b0"
-        },
-        "recipe": {
-            "sha256": "12z92j9f0mpn7w2qkiwg54wh743q3inx56q3f8qcpfzyks546grq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141110.217",
-        "deps": []
-    },
-    "state": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thisirs",
-            "repo": "state",
-            "sha256": "1930cfpvik6b7xqpbwf92cnnqcn1icmi0v0b75hxv9jxiibqavap",
-            "rev": "6b7ae04cba5d055c1a143a4fdef9a0429fd38049"
-        },
-        "recipe": {
-            "sha256": "19y3n8wnbpgbpz4jxy2p7hjqxykg09arjp7s5v22yz7il3gn48l2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151103.447",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "angry-police-captain": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolando2424",
-            "repo": "angry-police-captain-el",
-            "sha256": "1m0c7ns7aiycg86cgglir8bkw730fslyg1n15m9ki0da4cnmm97a",
-            "rev": "d11931c5cb63368dcc4a48797962428cca6d3e9d"
-        },
-        "recipe": {
-            "sha256": "1cshhd4bkgbkg0n6m8gz53z47z4nq0hcriz2qh3v7m4cqgkw1m9r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120829.752",
-        "deps": []
-    },
-    "better-registers": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/better-registers.el",
-            "sha256": "05dlhhvd1m9q642gqqj6klif13shbinqi6bi72fldidi1z6wcqlh"
-        },
-        "recipe": {
-            "sha256": "01i0qjrwsc5way2h9z3pmsgccsbdifsq1dh6zhka4h6qfgrmn3bx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140813.319",
-        "deps": []
-    },
-    "bison-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Wilfred",
-            "repo": "bison-mode",
-            "sha256": "0iccafawm9ah62f7qq1k77kjpafhcpjcaiqh5xjig1wxnpc43ck7",
-            "rev": "bb48d82f296bbe9f8b4a5651fab6610525fdbfcf"
-        },
-        "recipe": {
-            "sha256": "097gimlzmyrsfnl76cbzyyi9dm0d2y3f9107672h56ncri35mh66",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141119.243",
-        "deps": []
-    },
-    "wgrep": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-wgrep",
-            "sha256": "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4",
-            "rev": "7ef26c51feaef8a5ec0929737130ab8ba326983c"
-        },
-        "recipe": {
-            "sha256": "09xs420lvbsmz5z28rf6f1iwa0ixkk0w24qbj6zhl9hidh4mv9y4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141016.1856",
-        "deps": []
-    },
-    "pg": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cbbrowne",
-            "repo": "pg.el",
-            "sha256": "1zh7v4nnpzvbi8yj1ynlqlawk5bmlxi6s80b5f2y7hkdqb5q26k0",
-            "rev": "4f6516ec3946d95dcef49abb6703cc89ecb5183d"
-        },
-        "recipe": {
-            "sha256": "0n0187ndvwza1nis9a12h584qdqkwqfzhdw21kz5d1i6c43g7gji",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130731.1642",
-        "deps": []
-    },
-    "calfw": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiwanami",
-            "repo": "emacs-calfw",
-            "sha256": "1rv6slk3a7ca2q16isjlkmgxbxmbqx4lx2ip7z33fvnq10r5h60n",
-            "rev": "50e0e0261568f84f31fe7f87c9f863e21d30132f"
-        },
-        "recipe": {
-            "sha256": "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150923.2149",
-        "deps": [
-            "google-maps"
-        ]
-    },
-    "tabbar-ruler": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "tabbar-ruler.el",
-            "sha256": "0vvbzzw5l9j2gf2a8ajzf87x80ifm4npfpamgsi85s90j4ac4n5q",
-            "rev": "5854ef040a1c45e1ce7dfebea6ed7953ce6bd2b9"
-        },
-        "recipe": {
-            "sha256": "10dwjj6r74g9rzdd650wa1wxhqc0q6dmff4j0qbbhmjsxvsr3y0d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150914.1951",
-        "deps": [
-            "tabbar"
-        ]
-    },
-    "gruber-darker-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rexim",
-            "repo": "gruber-darker-theme",
-            "sha256": "0l6gkhzg0dn4q223gljh1jh305aa9n8rbf9h5gg5d1aygs7cb3ha",
-            "rev": "60d8262d8e38103568bbe58e2ece1d9a970fc15a"
-        },
-        "recipe": {
-            "sha256": "0vn4msixb77xj6p5mlfchjyyjhzah0lcmp0z82s8849zd194fxqi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151223.252",
-        "deps": []
-    },
-    "orgbox": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yasuhito",
-            "repo": "orgbox",
-            "sha256": "0hwmr67nky9xp5xlrkp54nw6b72d29lmna28dnbgqs2i5rccbk55",
-            "rev": "72373b09768cc2200d143af38e25a0c082e8375d"
-        },
-        "recipe": {
-            "sha256": "12wfqlpjh9nr7zgqs4h8kmfsk825n68qcbn8z2fw2mpshg3nj7l8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140528.2026",
-        "deps": [
-            "cl-lib",
-            "org"
-        ]
-    },
-    "kolon-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "samvtran",
-            "repo": "kolon-mode",
-            "sha256": "0yr4yxwxgxp5pm9f8gaqlikxp26inv01inq0ya42dzam5yphkafw",
-            "rev": "5af0955e280ae991862189ebecd3937c5fc8fb9f"
-        },
-        "recipe": {
-            "sha256": "0wcg8ph3mk4zcmzqpvl2w6rfgvrfvhmgwb14y8agh9b7v5d9xwj3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140122.534",
-        "deps": []
-    },
-    "mew": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kazu-yamamoto",
-            "repo": "Mew",
-            "sha256": "1rkipcv53p7zra3gbjc77ywyxn8d1kx2gniyfqq16d2p2jw0lbzb",
-            "rev": "ff9c41b981fb6050121a3831825d0349bffeb9ce"
-        },
-        "recipe": {
-            "sha256": "0423xxn3cw6jmsd7vrw30hx9phga5chxzi6x7cvpswg1mhcyn9fk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150814.154",
-        "deps": []
-    },
-    "nand2tetris-assembler": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "CestDiego",
-            "repo": "nand2tetris.el",
-            "sha256": "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7",
-            "rev": "0297cd8d76cad072cb64318ffacdc65d8a1ad948"
-        },
-        "recipe": {
-            "sha256": "1761kgrflipxba8894cnx90ks7f3ba4nj6ci515zzxcx9s45mfyy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151027.1636",
-        "deps": [
-            "names",
-            "nand2tetris"
-        ]
-    },
-    "pytest": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ionrock",
-            "repo": "pytest-el",
-            "sha256": "1nlybqvy64lc0c65j9wbk4lx932lz0b8hxw8zm1vgmqppqcyn0p5",
-            "rev": "71bd43c4eb7254d05104ec1bcca7851d7a203da3"
-        },
-        "recipe": {
-            "sha256": "0ssib65wa20h8r6156f392l481vns5fcax6w70hcawmn84nficdh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151104.2325",
-        "deps": [
-            "s"
-        ]
-    },
-    "portage-navi": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiwanami",
-            "repo": "emacs-portage-navi",
-            "sha256": "1pm4x74pw67m2izr9dir201dn5g9icgk6h2j8rqvasgx8v8krv3i",
-            "rev": "8016c3e99fe6cef101d479a3d69185796b22ca2f"
-        },
-        "recipe": {
-            "sha256": "1wjkh8xj5120v9fz1nrpkd6x4f22ni8h2lfkd82df7kjz6bzdfwg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141208.755",
-        "deps": [
-            "concurrent",
-            "ctable"
-        ]
-    },
-    "mouse-slider-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "mouse-slider-mode",
-            "sha256": "05pzplb3gmlnlvn2azbxdlf4vrkvk8fc9dkgi2nq4shysnh4c9v7",
-            "rev": "a8d6489fe2a3c2769b421f93f3609f402c9b92f7"
-        },
-        "recipe": {
-            "sha256": "0aqxjm78k7i8c59w6mw9wsfw3rail1pg40ac1dbcjkm62fjbh5hy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150910.1600",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "helm-circe": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lesharris",
-            "repo": "helm-circe",
-            "sha256": "1iqjc15pz5qr8zjxaxz1b2vys2689ri76jacmipxvgjk0y7vc5f0",
-            "rev": "0b7ecf5380971ee7b6291fca6a2805c320638238"
-        },
-        "recipe": {
-            "sha256": "12jfzg03573lih2aapvv5h2mi3pwqc9nrmv538ivjywix5117k3v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150317.44",
-        "deps": [
-            "circe",
-            "cl-lib",
-            "emacs",
-            "helm"
-        ]
-    },
-    "ruby-hash-syntax": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "ruby-hash-syntax",
-            "sha256": "0knl8zrd4pplnzk5z19cf9rqdfr3ymzfssrwp6jhndjzjdwvc2bv",
-            "rev": "d73a498143a3a8d6d3a7720104f2f14e70b2e2ae"
-        },
-        "recipe": {
-            "sha256": "0bvwyagfh7mn457iibrpv1ay75089gp8pg608gbm24m0ix82xvb5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141010.1039",
-        "deps": []
-    },
-    "skewer-reload-stylesheets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "NateEag",
-            "repo": "skewer-reload-stylesheets",
-            "sha256": "1q0qc4jc83k7dfhq2y06zy0fg38kvp219gb3icysdhs88zi2v9s3",
-            "rev": "a22ed760a5515e43a05aeb82811dc571ba3d6060"
-        },
-        "recipe": {
-            "sha256": "1rxn0ha2yhvyc195alg31nk1sjghnbha33xrqwc9z3j71w211frm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150111.623",
-        "deps": [
-            "skewer-mode"
-        ]
-    },
-    "nodejs-repl": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abicky",
-            "repo": "nodejs-repl.el",
-            "sha256": "1qvs73nimqzhcjgw77vaipqbmnvailc1q6w8rb5vc9c425xsi7an",
-            "rev": "3c51428ccda7b1c4b5cd4a51f9034e6ca3a053f8"
-        },
-        "recipe": {
-            "sha256": "0rvhhrsw87kfrwdhm8glq6b3nr0v90ivm7fcc0da4yc2jmcyk907",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151207.714",
-        "deps": []
-    },
-    "ido-completing-read+": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DarwinAwardWinner",
-            "repo": "ido-ubiquitous",
-            "sha256": "0byairx5nxbzgdyiw658p7yiysfr7r1bd3b2prawq72bslb1c5cn",
-            "rev": "1a97a38f2d1a51371853e44da659caa6baf78cbe"
-        },
-        "recipe": {
-            "sha256": "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151219.1036",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "package-filter": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "milkypostman",
-            "repo": "package-filter",
-            "sha256": "0i7f8ambcrhyqq15xwlk31jjdcii2hr37y45va8m5w6n9mkpz8c6",
-            "rev": "ba3be37e0ef3972b2d8db7c2f2cb68c460699f12"
-        },
-        "recipe": {
-            "sha256": "0am73zch2fy1hfjwzk8kg0j3lgbcz3hzxjrdf0j0a9w0myp0mmjm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140105.1626",
-        "deps": []
-    },
-    "sekka": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiyoka",
-            "repo": "sekka",
-            "sha256": "1as3llcs7jgcw9pafz4mbfml1cqd1fw8yl64bb4467nmhq2p18p7",
-            "rev": "2768b2c16dd15dcd35fcfd123c4d56f2ffd1b362"
-        },
-        "recipe": {
-            "sha256": "1jj4ly9p7m3xvb31nfn171lbpm9y70y8cbf8p24w0fhv665dx0cp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150708.659",
-        "deps": [
-            "cl-lib",
-            "concurrent",
-            "popup"
-        ]
-    },
-    "auto-complete-exuberant-ctags": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k1LoW",
-            "repo": "auto-complete-exuberant-ctags",
-            "sha256": "1fqgyg986fg1dzac5wa97bx82mfddqb6qrfnpr3zksmw3vgykxr0",
-            "rev": "ff6121ff8b71beb5aa606d28fd389c484ed49765"
-        },
-        "recipe": {
-            "sha256": "1i2s3ycc8jafkzdsz3kbvx1hh95ydi5s6rq6n0wzw1kyy3km35gd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140320.224",
-        "deps": [
-            "auto-complete"
-        ]
-    },
-    "rcirc-notify": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nicferrier",
-            "repo": "rcirc-notify",
-            "sha256": "1k4knsrca626pikgaalqbqwy7im4wz1vrmzzhdrdb4lhdz6sq3q3",
-            "rev": "841a7b5a6cdb0c11a812df924d2c6a7d364fd455"
-        },
-        "recipe": {
-            "sha256": "0mwhzkbzhpq4jws05p7qp0kbay8kcblb9xikznm0i8drpdyc617v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150219.1604",
-        "deps": []
-    },
-    "full-ack": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nschum",
-            "repo": "full-ack",
-            "sha256": "0bjny4ryrs788myhiaf3ir99vadf2v4swa5gkz9i36a7j6wzpgk5",
-            "rev": "761d846e105b150f8e6d13d7a8983f0248313a45"
-        },
-        "recipe": {
-            "sha256": "09ikhyhpvkcl6yl6pa4abnw6i7yfsx5jkmzypib94w7khikvb309",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140223.1132",
-        "deps": []
-    },
-    "elogcat": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "youngker",
-            "repo": "elogcat.el",
-            "sha256": "1jcr8bxffvnfs0ym6zkgs79hd6a0m81r4x4jr3v5l9zwxw04sy15",
-            "rev": "4f311b7a07565b0d060334bc68edb36f2bff703f"
-        },
-        "recipe": {
-            "sha256": "0sqdqlpg4firswr742nrb6b8sz3bpijf6pbxvandq3ddpm0rx9ia",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151120.1841",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "helm-nixos-options": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "travisbhartwell",
-            "repo": "nix-emacs",
-            "sha256": "0ia9wgn33znaviy7ilfm83yfalc2dbpm1g7nvss5s4rznqkdfhn3",
-            "rev": "6b1418611b49a6cf77380a76f7e6236bbb5df83a"
-        },
-        "recipe": {
-            "sha256": "1nsi4hfw53iwn29fp33dkri1c6w8kdyn4sa0yn2fi6144ilmq933",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151013.1809",
-        "deps": [
-            "helm",
-            "nixos-options"
-        ]
-    },
-    "magit-annex": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "magit-annex",
-            "sha256": "1h1i8712w0pn6bhc5lpps7ri7bf6f3vy23i6qld13hdgvimgisd9",
-            "rev": "154345a5192f3581af105022541911398a566cce"
-        },
-        "recipe": {
-            "sha256": "1ri58s1ly416ksmb7mql6vnmx7hq59lmhi7qijknjarw7qs3bqys",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151213.38",
-        "deps": [
-            "cl-lib",
-            "magit"
-        ]
-    },
-    "matrix-client": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://fort.kickass.systems/personal/rrix/pub/matrix.el",
-            "sha256": "28022465db474430300c3776165eb2cb7a243c476332da09d7558bc3051b2448",
-            "rev": "26e4696de28a12d9ac2d3af43bedc871f47f4dad"
-        },
-        "recipe": {
-            "sha256": "09mgxk0xngw8j46vz6f5nwkb01iq96bf9m51w2q61wxivypnsyr6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151219.1249",
-        "deps": [
-            "json",
-            "request"
-        ]
-    },
-    "sync-recentf": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ffevotte",
-            "repo": "sync-recentf",
-            "sha256": "00lx6081h1nzwga5jg4cik4h667vfkn128yvnhkd0vw7b5g4ji5x",
-            "rev": "530254b1f1b569ce958dadad2620c67c31835d5c"
-        },
-        "recipe": {
-            "sha256": "17aji2vcw6zfd823anzwj8pcgyxamxr87bnni085jvlz0vx6gh9c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151005.526",
-        "deps": []
-    },
-    "helm-hatena-bookmark": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "masutaka",
-            "repo": "emacs-helm-hatena-bookmark",
-            "sha256": "189dv3qqqmfyhsqa1n52cgcn1xv7k49f92ndn43y2v20234nhl9f",
-            "rev": "1ba352b858869a32323d4e6f9ca4b3eae055809e"
-        },
-        "recipe": {
-            "sha256": "14091zrp4vj7752rb5s3pkyvrrsdl7iaj3q9ys8rjmbsjwcv30id",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151221.620",
-        "deps": [
-            "helm"
-        ]
-    },
-    "helm-emms": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-helm",
-            "repo": "helm-emms",
-            "sha256": "0330s07b41nw9q32xhjdl7yw83p8ikj6b2qkir3y0jyx16gk10dl",
-            "rev": "ed3da37e86ea5dabc15da708335b1e439ae0777d"
-        },
-        "recipe": {
-            "sha256": "1vq7cxnacmhyczsa4s5h1nnzc08m66harfnxsqxyrdsnggv9hbf5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151001.1528",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "emms",
-            "helm"
-        ]
-    },
-    "xquery-tool": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "paddymcall",
-            "repo": "xquery-tool.el",
-            "sha256": "00b8nndvgpa20vmdc9vcig65ij6pmd9q3wfmczj1qbkz2q00kn5a",
-            "rev": "3d43bf6d18ccf5553a5a80b80b99ad1fb8b9ccb2"
-        },
-        "recipe": {
-            "sha256": "069injmvv9zzcbqbms94qx5wjj740jnik6sf3b4xjhln7z1yskp0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151221.450",
-        "deps": []
-    },
-    "gruvbox-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Greduan",
-            "repo": "emacs-theme-gruvbox",
-            "sha256": "04jknwkax9gdmzz0yq0m21grl9c43vr3abdam3g8zjh5sjx5gs14",
-            "rev": "6af232a46073235ccf81cf99f46ee600fea7ba3e"
-        },
-        "recipe": {
-            "sha256": "042mnwlmixygk2mf24ygk7rkv1rfavc5a36hs9x8b68jnf3khj32",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151227.313",
-        "deps": []
-    },
-    "java-snippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nekop",
-            "repo": "yasnippet-java-mode",
-            "sha256": "09pa1hmk0dyh7vw0lb9awyrvdarakgaxn66gag5fzbg5vgdfz32i",
-            "rev": "701e84d91d6e8bf53c0088687ee385c1954792d8"
-        },
-        "recipe": {
-            "sha256": "0bsmp6sc3khdadkmwqy8khz8kzqijcsv70gimm2cs1kwnbyj6pfp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140728.36",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "emacsql-psql": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "emacsql",
-            "sha256": "0ld5qpl7b3iksgxcfysznf88wj019l5271kdz4nalqi4kchf5xad",
-            "rev": "74bd11bc0998d7019a05eecc0486fee09c84a93b"
-        },
-        "recipe": {
-            "sha256": "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151004.915",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "emacsql",
-            "pg"
-        ]
-    },
-    "jazz-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "donderom",
-            "repo": "jazz-theme",
-            "sha256": "00havgs6xc44plnr3vbs13xxiwygr93izm6nx4y98zhcv389ajb0",
-            "rev": "b9f66600fe33d25a230ed26a69f3abaaca03b453"
-        },
-        "recipe": {
-            "sha256": "0ad8kvrmd3gyb8wfghcl4r3kwzplk5gxlw3p23wsbx6c2xq6xr7g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150910.1044",
-        "deps": []
-    },
-    "yaml-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yoshiki",
-            "repo": "yaml-mode",
-            "sha256": "1yy7f7prg2v17mzj6g0rvdkvrs96cjqzdz8xbs4zl4nbmj3lmay5",
-            "rev": "6ddd55205224c2f2c306699e021cedbaeecfaaf2"
-        },
-        "recipe": {
-            "sha256": "0afp83xcr8h153cayyaszwkgpap0iyk351dlykmv6bv9d2m774mc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151218.554",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "point-stack": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattharrison",
-            "repo": "point-stack",
-            "sha256": "1p1j2kfwj7gzir7q5ls34k8764kwbnb6d0dhlw4zb4kvwlidp6c1",
-            "rev": "2d2a5e90988792cf49ba4c5a839ef6a1400f5a24"
-        },
-        "recipe": {
-            "sha256": "17z9mc49x4092axs7lq6b6z7yrrhkl8bdx5f8gq6qy5lampgyzch",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140102.1423",
-        "deps": []
-    },
-    "ncl-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yyr",
-            "repo": "ncl-mode",
-            "sha256": "0gbv5fv401z58ycbqlivqamf5kp3x6krhi36q7q0m4gvy448xz0n",
-            "rev": "01559734504d2712606ac30916252d788ea73124"
-        },
-        "recipe": {
-            "sha256": "0hmd606xgapzbc79px9l1q6pphrhdzip495yprvg20xsdpmjlfw9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150525.1129",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "go-direx": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-go-direx",
-            "sha256": "09rxz40bkr0l75v3lmf8lcwqsgjiv5c8zjmwzy2d4syj4qv69c5y",
-            "rev": "8f2206469328ee932c7f1892f5e1fb02dec98432"
-        },
-        "recipe": {
-            "sha256": "0dq5d7fsld4hww8fl68c18qp6fl3781dqqwd98cg68bihw2wwni7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150315.2043",
-        "deps": [
-            "cl-lib",
-            "direx"
-        ]
-    },
-    "doremi-cmd": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/doremi-cmd.el",
-            "sha256": "1wmfkviyr5mp15aqh6qhmi7ykgcii1h85wxmsm7bxg9v2lzyckk2"
-        },
-        "recipe": {
-            "sha256": "1qzspirn1abqps0dn5z8w6ymffc6b02dyki5hr8v74wfs8fhzx05",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1552",
-        "deps": [
-            "doremi"
-        ]
-    },
-    "shampoo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dmatveev",
-            "repo": "shampoo-emacs",
-            "sha256": "15a8gs4lrqxn0jyfw16rc6vm7z1i10pzzlnp30x6nly9a7xra47x",
-            "rev": "bc193c39636c30182159c5c91c37a9a4cb50fedf"
-        },
-        "recipe": {
-            "sha256": "01ssgw4cnnx8d86g3r1d5hqcib4qyhmpqvcvx47xs7zh0jscps61",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131230.419",
-        "deps": []
-    },
-    "dash-at-point": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "stanaka",
-            "repo": "dash-at-point",
-            "sha256": "0zd50sr51mmvndjb9qfc3sn502nhc939rhd454jbkmlrzqsxvphj",
-            "rev": "ed872b4fcbe02ef1a5bac0337afe19a7a747f34c"
-        },
-        "recipe": {
-            "sha256": "0x4nq42nbh2qgbg111lgbknc7w7m7lxd14mp9s8dcrpwsaxz960m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140626.235",
-        "deps": []
-    },
-    "window-purpose": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bmag",
-            "repo": "emacs-purpose",
-            "sha256": "1hfn3x08h426kw0m1qyrjy8kp6nm56d1h5zlfiwj22kfc560gb4v",
-            "rev": "d8b9399c8bbdb6e843cd62b7adb658fea6cf7e75"
-        },
-        "recipe": {
-            "sha256": "1ib5ia7armghvmcw8qywcil4nxzwwakmfsp7ybawb0xr53h1w96d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151114.440",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "imenu-list",
-            "let-alist"
-        ]
-    },
-    "boxquote": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "davep",
-            "repo": "boxquote.el",
-            "sha256": "0235l4f1cxj7nysfnay4fz52mg0c13pzqxbhw65vdpfzz1gl1p73",
-            "rev": "4c49b2046647ed187920c885e175ed388f4833dc"
-        },
-        "recipe": {
-            "sha256": "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20081011.1526",
-        "deps": []
-    },
-    "sticky": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/sticky.el",
-            "sha256": "18izyia1j3w2c07qhkp9h6rnvw35m5k1brrrjhm51fpdv2xj65fy"
-        },
-        "recipe": {
-            "sha256": "1xjkdwphq3m4jrazsfnzrrcrqikfdxzph3jdzkpbzk3grd4af96w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20101129.2052",
-        "deps": []
-    },
-    "ein": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "millejoh",
-            "repo": "emacs-ipython-notebook",
-            "sha256": "055hyvdcnbbzxs66v06d5flylhsz1qnmff758736f84cyxm76ayy",
-            "rev": "3aa290ed91832ba28a99c5f4b53ef40459eea539"
-        },
-        "recipe": {
-            "sha256": "1nksj1cpf4d9brr3rb80bgp2x05qdq9xmlp8mwbic1s27mw80bpp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150914.1316",
-        "deps": [
-            "request",
-            "websocket"
-        ]
-    },
-    "scratches": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cheunghy",
-            "repo": "scratches",
-            "sha256": "10hmy0p4pkrzvvyisk4rjc6hqqyk2sir1rszqgmkhrdywl010vlc",
-            "rev": "9441afe6396ca38f08029123fab5d87429cbf315"
-        },
-        "recipe": {
-            "sha256": "0409v1wi10q48rrh8iib6dw9icmswfrpjx9x7xcma994z080d2fy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151005.2316",
-        "deps": [
-            "dash",
-            "f"
-        ]
-    },
-    "magic-filetype": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zonuexe",
-            "repo": "magic-filetype.el",
-            "sha256": "1ycqhmi18yjniw6w258rhxcc70ngq51vjlafx0bcs1aw1px97z5s",
-            "rev": "bffe69c70565c534bcc245cfdc2781d85e4edb68"
-        },
-        "recipe": {
-            "sha256": "0gcys45cqn5ghppkn0rmyvfybprlfz1x6hqr21yv93mf79h75zhg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151224.715",
-        "deps": [
-            "emacs",
-            "s"
-        ]
-    },
-    "helm-j-cheatsheet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "helm-j-cheatsheet",
-            "sha256": "0f2psp7p82sa2fip282w152zc1rjd3l0sna1g7rgwi9x29gcsh0v",
-            "rev": "70560fd2fb880eccba3b1927d0fa5e870e0734e4"
-        },
-        "recipe": {
-            "sha256": "0lppzk60vl3ps9fqnrh020awiy5w46gwlb6d91pr889x24ryphmm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131228.641",
-        "deps": [
-            "helm"
-        ]
-    },
-    "py-yapf": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "paetzke",
-            "repo": "py-yapf.el",
-            "sha256": "03hki4v61340x0xp47lckxabz51abcazcahmr6wfn9n4bvfqjr9x",
-            "rev": "766e57448639ff95eeb018f6d8bdf09170094218"
-        },
-        "recipe": {
-            "sha256": "1381x0ffpllxwgkr2d8xxbv1nd4k475m1aff8l5qijw7d1fqga2f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150422.953",
-        "deps": []
-    },
-    "paper-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cadadr",
-            "repo": "paper-theme",
-            "sha256": "115j0zg3gfbgrl62h1sx7jaxsnd484sb1b14jqz185i12lrca506",
-            "rev": "37b1b16901231854b31b525f0796958c82aa8565"
-        },
-        "recipe": {
-            "sha256": "04diqm2c9fm29zyms3hplkzb4kb7b2kyrxdsy0jxyjj5kabypd50",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151225.732",
-        "deps": [
-            "emacs",
-            "hexrgb"
-        ]
-    },
-    "noctilux-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sjrmanning",
-            "repo": "noctilux-theme",
-            "sha256": "1a1pp3sd5g4wkhywb5jfchcdpjsjb0iyhk2sxvd0gpc4kk4zh6xs",
-            "rev": "5f21c8523ddb99c4e5bc727d59ddf6bf6f50d626"
-        },
-        "recipe": {
-            "sha256": "15ymyv3rq0n31d8h0ry0l4w4r5a8as0q63ajm9wb6yrxxjl1imfp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150723.947",
-        "deps": []
-    },
-    "emms-mark-ext": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vapniks",
-            "repo": "emms-mark-ext",
-            "sha256": "03a7sn8pl0pnr05rmrrbw4hjyi8vpjqbvkvh0fqnij913a6qc64l",
-            "rev": "ec68129e3e9e469e5bf160c6a1b7030e322f3541"
-        },
-        "recipe": {
-            "sha256": "13h6hy8y0as0xfc1cg8balw63as81fzar32q9h4zhnndl3hc1081",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130528.2227",
-        "deps": [
-            "emms"
-        ]
-    },
-    "hexrgb": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/hexrgb.el",
-            "sha256": "04maddrgvijimxc8i942h0f7448snqlgdsj3yc03izh6bimvkhk5"
-        },
-        "recipe": {
-            "sha256": "0mzqslrrf7sc262syj3ja7b7rnbg80dwf2p9bzxdrzx6b8vvsx06",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150708.2036",
-        "deps": []
-    },
-    "finalize": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "elisp-finalize",
-            "sha256": "0f76cgh97z0rbbg2bp217nqmxfimzkvw85k9mx8bj78i9s2cdmwa",
-            "rev": "9ac589cf487f5d37163dc9e7ca8c52800710805e"
-        },
-        "recipe": {
-            "sha256": "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140127.1246",
-        "deps": [
-            "cl-lib",
-            "eieio",
-            "emacs"
-        ]
-    },
-    "mpg123": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsmirror",
-            "repo": "mpg123",
-            "sha256": "09731mwm23b6ic53366lnxy2p7dfd245yh75gaf6ijfa22jks7gb",
-            "rev": "ed2307843ca54ebf0ca5e5d2e79b41e79527c45c"
-        },
-        "recipe": {
-            "sha256": "184ip9pvv4zkfxnrzxbfajjadc9f4dz4psn33f9x3sfh7s1y4nw8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151214.1350",
-        "deps": []
-    },
-    "paredit-everywhere": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "paredit-everywhere",
-            "sha256": "1jkpb67h96sm3fnga9hrg3kwhlp3czdv66v49a9szq174zpsnrgv",
-            "rev": "79ecbfc15d2cb338f277f3da50d8e757f07151e9"
-        },
-        "recipe": {
-            "sha256": "0gbkwk8mrbjr2l8pz3q4y6j8q4m12zmzl31c88ngs1k5d86wav36",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150821.2344",
-        "deps": [
-            "paredit"
-        ]
-    },
-    "jinja2-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "paradoxxxzero",
-            "repo": "jinja2-mode",
-            "sha256": "0l26wcy496k6xk7q5sf905xir0p73ziy6c44is77854lv3y0z381",
-            "rev": "cfaa7bbe7bb290cc500440124ce89686f3e26f86"
-        },
-        "recipe": {
-            "sha256": "0480fh719r4v7xdwyf4jlg1k36y54i5zrv7gxlhfm66pil75zafx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141128.407",
-        "deps": []
-    },
-    "org-caldav": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dengste",
-            "repo": "org-caldav",
-            "sha256": "0lq2rx6wgz0aymwhw597xs2pabinhk3jpnnhjwq0jk8ggp3afqaz",
-            "rev": "8aff005f431e5f677950b73f710fdf968ff4ac65"
-        },
-        "recipe": {
-            "sha256": "0166y04gxrwnynm4jshm2kqk5jbvl5g5078dxvw18nicrgq3y4r8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150131.352",
-        "deps": [
-            "org"
-        ]
-    },
-    "eval-in-repl": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kaz-yos",
-            "repo": "eval-in-repl",
-            "sha256": "0qfi02n30yizalgvd5l7cbqrajn98037y694cqkycph9vvkrpsb5",
-            "rev": "c2c677d39cfad572fe487661ac9e8a70fb88749f"
-        },
-        "recipe": {
-            "sha256": "10h5vy9wdiqf9dgk1d1bsvp93y8sfcxghzg8zbhhn7m5cqg2wh63",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151123.528",
-        "deps": [
-            "dash",
-            "paredit"
-        ]
-    },
-    "gherkin-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "candera",
-            "repo": "gherkin-mode",
-            "sha256": "0lcbyw6yrl6c8py5v2hqghcbsf9cbiplzil90al4lwqps7rw09a8",
-            "rev": "d84a2977a536f2f8bf4836aebc33a4e86925673d"
-        },
-        "recipe": {
-            "sha256": "0dhrsz24hn0sdf22wpmzbkn66g4540vdkl03pc27kv21gwa9ixxv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140107.1004",
-        "deps": []
-    },
-    "helm-perldoc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-helm-perldoc",
-            "sha256": "13wnagmgicl2mi4iksqckrjbaiz05j9ykbmvj26jy8zcbll5imfs",
-            "rev": "a7347e0a4f1a1832060b3a7a1a3f3d2ed4f92f33"
-        },
-        "recipe": {
-            "sha256": "0b0cl2xj5w1r71zrjhnqhrzsnz1296jv21qx5adzslra6lk55q2r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151031.2227",
-        "deps": [
-            "cl-lib",
-            "deferred",
-            "helm-core"
-        ]
-    },
-    "relative-buffers": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "proofit404",
-            "repo": "relative-buffers",
-            "sha256": "023fwcqyy5gg234m772vpws751pharjwn3b0433i2sszna2z6xrf",
-            "rev": "7e37e118cc231c8581891bef0e4b5bb775920070"
-        },
-        "recipe": {
-            "sha256": "131182yb0pr0d6jibqd8aag4w8hywdyi87ldp77b95gw4bqhr96i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150115.1301",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "f",
-            "s"
-        ]
-    },
-    "helm-grepint": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kopoli",
-            "repo": "helm-grepint",
-            "sha256": "07bmk4wbn07rg8h8rdhah285hsaaqkx5n84g87lpb7y5ba3ivlk5",
-            "rev": "0327f64121751065a85c76527dda2c037c8fb0d8"
-        },
-        "recipe": {
-            "sha256": "00wr3wk41sbpamxbjkqlby49g8y5z9n79p51sg7ginban4qy91gf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151030.1137",
-        "deps": [
-            "emacs",
-            "helm"
-        ]
-    },
-    "emms-info-mediainfo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fgallina",
-            "repo": "emms-info-mediainfo",
-            "sha256": "07qbbs2i05bqndr4dxb84z50wav8ffbc56f6saw6pdx6n0sw6n6n",
-            "rev": "bce16eae9eacd38719fea62a9755225a888da59d"
-        },
-        "recipe": {
-            "sha256": "17x8vvfhx739hcj9j1nh6j4r6zqnwa5zq9zpi9b6lxc8979k3m4w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131223.700",
-        "deps": [
-            "emms"
-        ]
-    },
-    "javap-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hiredman",
-            "repo": "javap-mode",
-            "sha256": "070r4mg4v937n4h2bmzdbn3vsmmq7ijz69nankqs761jxv5gcwlg",
-            "rev": "864c1130e204b2072e1d19cd027b6fce8ebe6629"
-        },
-        "recipe": {
-            "sha256": "19p39l4nwgxm52yimy4j6l43845cpk8g5qdrldlwfxd7dvay09ay",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120223.1608",
-        "deps": []
-    },
-    "ttrss": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pedros",
-            "repo": "ttrss.el",
-            "sha256": "0a8f9p1im6k7mnp2bq733rfx2x246gfwpvi5ccym1y5lakx37fil",
-            "rev": "e90d8f7ccaf235053057bd91d3a2113582604e24"
-        },
-        "recipe": {
-            "sha256": "08921cssvwpq33w87v08dafi2rz2rl1b3bhbhijn4bwjqgxi9w7z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130409.1249",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "term-run": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "10sr",
-            "repo": "term-run-el",
-            "sha256": "0m3h89carkbgr043d0l573igf9qrdhv5nxnxq5j9x4xc0j7sbnzc",
-            "rev": "4e47afc1babb87f2c3ebd1f71c7f456c323a7ffb"
-        },
-        "recipe": {
-            "sha256": "1bx3s68rgr9slsw9k01gfg7sxd4z7sarg4pi2ivril7108mhg2cs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150601.206",
-        "deps": []
-    },
-    "anx-api": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rmloveland",
-            "repo": "emacs-appnexus-api",
-            "sha256": "0fzxzar8m9qznfxv3wr7vfj9y2110wf6mm5cj55k3sd5djdjhmf1",
-            "rev": "b2411ebc966ac32c3ffc61bc22bf183834df0fa0"
-        },
-        "recipe": {
-            "sha256": "1vzg3wsqyfb9rsfxrpz8k2gazjlz2nwnf4gnn1dypsjspjnzcb8r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140208.914",
-        "deps": []
-    },
-    "smooth-scrolling": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aspiers",
-            "repo": "smooth-scrolling",
-            "sha256": "05kf3hb3nb32jzw50a2z9vlf3f0pj40klzxvqj4fxlci777imsvk",
-            "rev": "0d9b228f952c53ad456f98e2c761dda70ed72174"
-        },
-        "recipe": {
-            "sha256": "0zy2xsmr05l2narslfgril36d7qfb55f52qm2ki6fy1r18lfiyc6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131219.2239",
-        "deps": []
-    },
-    "helm-cmd-t": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lewang",
-            "repo": "helm-cmd-t",
-            "sha256": "10cp21v8vwgp8hv2rkdn9x8v2n8wqbphgslb561rlwc2rfpvzqvs",
-            "rev": "8749f0b2b8527423cd146fa2d5c0e7a9e159eefb"
-        },
-        "recipe": {
-            "sha256": "04fmhravd3ld4n1n820wlnr1jvmk7c7cdazd15gazixrlz6fm4fk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150823.1357",
-        "deps": []
-    },
-    "flymake-python-pyflakes": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-python-pyflakes",
-            "sha256": "1aijapvpw4skfhfmz09v5kpaxay6b0bp77bbjkrvgyizsqdd39vp",
-            "rev": "f09ec573d7580a69f8bd49778c26da9ab6d5ec5a"
-        },
-        "recipe": {
-            "sha256": "0asbjxv03zkbcjayanv13qzbv4z7b6fi0z1j6yv7fl6q9mgvm497",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131127.206",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "misc-fns": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/misc-fns.el",
-            "sha256": "1c46iwa6i08wsa0syrm0gxhyndrqlkmqpdj61rss7hbbf1066v86"
-        },
-        "recipe": {
-            "sha256": "1spjbkcac33lyfsgkd6z186a3432x9nw3akmx194gaap2863xcam",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150403.1121",
-        "deps": []
-    },
-    "flycheck-cask": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "flycheck",
-            "repo": "flycheck-cask",
-            "sha256": "0klnhq0zfn5zbkwl7y9kja7x49n1w6r1qbphk7a7v9svgm3h9s7n",
-            "rev": "f2cebedacaa96ef30262fbb67068d1df489ff238"
-        },
-        "recipe": {
-            "sha256": "1lq559nyhkpnagncj68h84i3cq85vhdikr534kj018n2zcilsyw7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150920.653",
-        "deps": [
-            "dash",
-            "emacs",
-            "flycheck"
-        ]
-    },
-    "fzf": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bling",
-            "repo": "fzf.el",
-            "sha256": "0prbz2np6maqjpfkqhsrv4lcdlhxpiw0jbv0m73w4f1wcy3f0jqk",
-            "rev": "30bb2f0f82ff413f268bb5e7fb02d3586ba7783f"
-        },
-        "recipe": {
-            "sha256": "0jjzm1gq85fx1gmj6nqaijnjws9bm8hmk40ws3x7fmsp41qq5py0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151129.833",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "el-get": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dimitri",
-            "repo": "el-get",
-            "sha256": "07c7rik31zxqck3wprdgww41pr1f08knj169bxrn59ayla7h8yy5",
-            "rev": "ec946c9b6df2565bed80ee4e940502d804d1ef10"
-        },
-        "recipe": {
-            "sha256": "1438v2sw5n67q404c93y2py226v469nagqwp4w9l6yyy40h4myhz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151117.1015",
-        "deps": []
-    },
-    "markdown-mode+": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "milkypostman",
-            "repo": "markdown-mode-plus",
-            "sha256": "1adl36fj506kgfw40gpagzsd7aypfdvy60141raggd5844i6y96r",
-            "rev": "f35e63284c5caed19b29501730e134018a78e441"
-        },
-        "recipe": {
-            "sha256": "1535kcj9nmcgmk2448jxc0jmnqy7f50cw2ngffjq5w8bfhgf7q00",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120829.710",
-        "deps": [
-            "markdown-mode"
-        ]
-    },
-    "feature-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "michaelklishin",
-            "repo": "cucumber.el",
-            "sha256": "18b27xfajhd0vi7dcaky7pi7vmnlmdb88gkx3hwangj78d24as5d",
-            "rev": "40886bc4cc5b1e855d6bb78505ebc651593d409d"
-        },
-        "recipe": {
-            "sha256": "0ryinmpqb3c91qcna6gbijcmqv3skxdc947dlr5s1w623z9nxgqg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141121.1230",
-        "deps": []
-    },
-    "dired-details+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/dired-details+.el",
-            "sha256": "119x9mclyhxfp2zr5rmh5jxl2h2wb82phbm8kvlkxa4kcwaiw04y"
-        },
-        "recipe": {
-            "sha256": "1gzr3z4nyzip299z08mignhigxr7drak7rv9z6gmdjrika9a29lx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1550",
-        "deps": [
-            "dired-details"
-        ]
-    },
-    "mouse3": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/mouse3.el",
-            "sha256": "1jxqvhfjsnjdp0c0zndj7p77vxfscs4z4s7csrd8gi9cli8pmgwi"
-        },
-        "recipe": {
-            "sha256": "1rppn55axjpqwqm2lq4dvwi3z7xkd5jkyqi1x8jqgcsfc9w6m777",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150402.1829",
-        "deps": []
-    },
-    "unkillable-scratch": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "EricCrosson",
-            "repo": "unkillable-scratch",
-            "sha256": "0xpaifmrvq5bbzpjhbzbxaac8kymmvqgg7lb2q1s7b5qf47fhqac",
-            "rev": "55a196d0c7001bfc8cf9c6cc532a5dc94e95baf8"
-        },
-        "recipe": {
-            "sha256": "0ghbpa9pf7k6vd2mjxkpqg2qfl4sd40ir6mrk1rxr1rv8s0afkf7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150328.118",
-        "deps": []
-    },
-    "edit-server-htmlize": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "frobtech",
-            "repo": "edit-server-htmlize",
-            "sha256": "174xq45xc632zrb916aw7q4bch96pbi6zgy3dk77qla3ky9cfpl3",
-            "rev": "e7f8dadfabe869c77ca241cd6fbd4c52bd908392"
-        },
-        "recipe": {
-            "sha256": "007lv3698a88wxan7kplz2117azxxpzzgshin9c1aabg059hszlj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130329.1748",
-        "deps": [
-            "edit-server"
-        ]
-    },
-    "multi-line": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "IvanMalison",
-            "repo": "multi-line",
-            "sha256": "13rp6kbabjy9dy0x4696065yyaxlgmfnwcqq9vcw2jhbb2gl9gs5",
-            "rev": "a46b34340a3dd1cba42ee0f41d6b599500f06233"
-        },
-        "recipe": {
-            "sha256": "1aadmijnjr029s1qq4gk8xyl9m8xb5x5774b8i3jyfixyjqvhvwp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151206.1813",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "crm-custom": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DarwinAwardWinner",
-            "repo": "crm-custom",
-            "sha256": "1fhjz2x9jpz53g9j83kznhy2nhfap3jaf6i69k62243kcw31qyz0",
-            "rev": "fbcf8bf3c87f56cb872d840dd79b6727b886e90d"
-        },
-        "recipe": {
-            "sha256": "14w15skxr44p9ilhpswlgdbqfw8jghxi69l37yk4m449m7g9694c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140816.1148",
-        "deps": []
-    },
-    "soundcloud": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tthieman",
-            "repo": "soundcloud.el",
-            "sha256": "1m8wcm6y80gq5rrm4brd3f20kmk54s6ph26j4lz4cmilxk6gj56v",
-            "rev": "f998d4276ea90258909c698f6a5a51fccb667c08"
-        },
-        "recipe": {
-            "sha256": "1jl9sk372j4162av9kfcbqp0cc5wpm86nkqg8rskfgmsi4ncp4ph",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150501.2226",
-        "deps": [
-            "deferred",
-            "emms",
-            "json",
-            "request",
-            "request-deferred",
-            "string-utils"
-        ]
-    },
-    "ace-link": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "ace-link",
-            "sha256": "0wy7p5vsrdndlsvdm4zjnxmfrrdfkcmwkav1c4g0rbpz8jn881c8",
-            "rev": "b03a91df61f8885c33c8c6812e656a86918572f0"
-        },
-        "recipe": {
-            "sha256": "1jl805r2s3wa0xyhss1q28rcy6y2fngf0yfcrcd9wf8kamhpajk5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151019.1035",
-        "deps": [
-            "avy"
-        ]
-    },
-    "anaphora": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "anaphora",
-            "sha256": "1ym43y0wqifkzpkm7ayf8cq2wz8pc2wgg9zvdyi0cn9lr9mwpbav",
-            "rev": "ed99ad4502e6fccde76050496984c6454676a410"
-        },
-        "recipe": {
-            "sha256": "1wb7fb3pc4gxvpjlm6gjbyx0rbhjiwd93qwc4vfw6p865ikl19y2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140728.1736",
-        "deps": []
-    },
-    "wc-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/wc-mode.el",
-            "sha256": "15wz0c0rsn02zl6yr8mpwzy2hvp2146krhdbjpq63l75w4i98w4d"
-        },
-        "recipe": {
-            "sha256": "0n9hc22rp18dxx33l2l1xla78m5zjybgh3mmsp91fbdiq92b446s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150116.2302",
-        "deps": []
-    },
-    "csv-nav": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/csv-nav.el",
-            "sha256": "15rfg3326xcs3zj3siy9rn7yff101vfch1srskdi2650c3l3krva"
-        },
-        "recipe": {
-            "sha256": "0626vsm2f5zc2wi5pyx4xrwcr4ai8w9a3l7gi9883smvayr619sj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130407.1320",
-        "deps": []
-    },
-    "tiny": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "tiny",
-            "sha256": "0mmz8b0fzffybc2jws9fif982zfx0l6kn1l4qxc67mf9nafbdca3",
-            "rev": "d775201a6e14aae03dda032132aa288ca93bddc4"
-        },
-        "recipe": {
-            "sha256": "183qczyb6c8zmdgmsjsj4hddmvnzzq4c7syslm861xcyxia94icy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151208.405",
-        "deps": []
-    },
-    "grass-mode": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/tws/grass-mode.el",
-            "sha256": "0djv2ps2ahw9b1b5i45hgy7l7cch7cgh7rzq601c0r6vi7gm2ac5",
-            "rev": "aa8cc5eff764"
-        },
-        "recipe": {
-            "sha256": "1lq6bk4bwgcy4ra3d9rlca3fk87ydg7xnnqcqjg0pw4m9xnr3f7v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151030.1120",
-        "deps": [
-            "cl-lib",
-            "dash"
-        ]
-    },
-    "fish-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wwwjfy",
-            "repo": "emacs-fish",
-            "sha256": "0gh82k9kadhriijf1csl9dk7gwa7iz7jmdklxfymihlkssskdgaq",
-            "rev": "683af1c17c9dfe947166ae4a73fe97a4920d7973"
-        },
-        "recipe": {
-            "sha256": "0l6k06bs0qdhj3h8vf5fv8c3rbhiqfwszrpb0v2cgnb6xhwzmq14",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151105.334",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "ercn": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "leathekd",
-            "repo": "ercn",
-            "sha256": "0xw3d9fz4kmn1myrsy44ki4bgg0aclv41wldl6r9nhvkrnri41cv",
-            "rev": "79a4df5609046ae2e2e3375998287be6dda80615"
-        },
-        "recipe": {
-            "sha256": "0yvis02bypw6v1zv7i326y8s6j0id558n0bdri52hr5pw85imnlp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150523.1003",
-        "deps": []
-    },
-    "roy-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "folone",
-            "repo": "roy-mode",
-            "sha256": "04jbnm9is2cis75h40znqzjvyjq27ncr2vfank6zglzi4fhxsl0r",
-            "rev": "0416f561edbc6b4a29fced8be84d2527a9613d65"
-        },
-        "recipe": {
-            "sha256": "0ch0hamvw4gsqs2pap0h6w4cj6n73jqa75if0ymh73hk5i3acm8g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121208.558",
-        "deps": []
-    },
-    "clojars": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joshuamiller",
-            "repo": "clojars.el",
-            "sha256": "1r189c0xm6vh05k0y715i5ldj1pxzvwkxqbq0n85m489mjnf2wv6",
-            "rev": "b500b243c92d4311c4041ff3ecbb6a1dbbf8090f"
-        },
-        "recipe": {
-            "sha256": "1skvd29347hwapgdqznbzwfcp2nf077qkdzknxc8ylmqa32yf5w1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151215.1433",
-        "deps": [
-            "cl-lib",
-            "request"
-        ]
-    },
-    "jump": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "eschulte",
-            "repo": "jump.el",
-            "sha256": "0061hcmj63g13bvacwkmcb5iggwnk27dvb04fz4hihqis6jg01c5",
-            "rev": "56cec33dd98231a95faa26dd4c0612885d923f78"
-        },
-        "recipe": {
-            "sha256": "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151009.329",
-        "deps": [
-            "findr",
-            "inflections"
-        ]
-    },
-    "list-packages-ext": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "laynor",
-            "repo": "list-packages-ext",
-            "sha256": "02l7q5376ydz6a8i9x74bsx5bbxz8xkasmv1lzvf79d3jbg28l1s",
-            "rev": "b4dd644e4369c9aa66f5bb8895ea49ebbfd0a27a"
-        },
-        "recipe": {
-            "sha256": "15m4888fm5xv697y7jspghg1ra49fyrny4y2x7h8ivcbslvpglvk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151115.1116",
-        "deps": [
-            "ht",
-            "persistent-soft",
-            "s"
-        ]
-    },
-    "ert-junit": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "https://bitbucket.org/olanilsson/ert-junit",
-            "sha256": "eedfdd6753c32d16baa341e6d20abee8713921d8eb850d16782cde55bdbeec46",
-            "rev": "c303c04da7a3ba4d2c46b00b79b67ff7ec57cc6d"
-        },
-        "recipe": {
-            "sha256": "0bv22mhh1ahbjwi6s1csxkh11dmy0srabkddjd33l4havykxlg6g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140830.1721",
-        "deps": [
-            "ert"
-        ]
-    },
-    "railgun": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mbriggs",
-            "repo": "railgun.el",
-            "sha256": "00x09vjd3jz5f73qkf5v1y402zn8vl8dsyfwlq9z646p18ba7gyh",
-            "rev": "66aaa1b091baef53a69d0d7425f48d184b865fb8"
-        },
-        "recipe": {
-            "sha256": "1a3fplfipk1nv3py1sy0p2adf3w1h4api01h2j5rjlq2jw06kyr0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121017.57",
-        "deps": []
-    },
-    "clj-refactor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "clojure-emacs",
-            "repo": "clj-refactor.el",
-            "sha256": "1wp4pbvj2llc72ypznq5dg9fisaa90g78kqjc29xczz30hkj3dji",
-            "rev": "76508499cbd1c69751a7d1437f703c4b2734023b"
-        },
-        "recipe": {
-            "sha256": "1qvds6dylazvrzz1ji2z2ldw72pa2nxqacb9d04gasmkqc32ipvz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151210.400",
-        "deps": [
-            "cider",
-            "dash",
-            "edn",
-            "emacs",
-            "hydra",
-            "inflections",
-            "multiple-cursors",
-            "paredit",
-            "s",
-            "yasnippet"
-        ]
-    },
-    "org-autolist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "calvinwyoung",
-            "repo": "org-autolist",
-            "sha256": "0j6fqgzvbmvvdh0dgwsxq004wxys2zwnq9wa3idm087ynp2a2ani",
-            "rev": "da332fadcd9be4c5eb21c5e98c392b89743750b2"
-        },
-        "recipe": {
-            "sha256": "1jvspxhxlvd7h1srk9dbk1v5dykmf8jsjaqicpll7ial6i0qgikj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150922.905",
-        "deps": []
-    },
-    "nameframe-projectile": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "john2x",
-            "repo": "nameframe",
-            "sha256": "07zgwyrss23yb8plnhhwmh0khdvfp539891sj1z1vs50jcllcpw5",
-            "rev": "96acff56b30f9d1145aeaf7a4c53c9a2c823ee8e"
-        },
-        "recipe": {
-            "sha256": "11z64wy8mnnrjmgfs2sjbv3mh136aki8r5f89myx861nfx18hc3k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151018.407",
-        "deps": [
-            "nameframe",
-            "projectile"
-        ]
-    },
-    "helm-bind-key": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "helm-bind-key.el",
-            "sha256": "1wmcy7q4ys2sf8ya5l4n7a6bq5m9d6m19amjfwkmkh4ajkwl041y",
-            "rev": "9da6ad8b7530e72fb4ac67be8c6a482898dddc25"
-        },
-        "recipe": {
-            "sha256": "1yfj6mmxc165in1i85ccanssch6bg19ib1fcm7sa4i4hv0mgwaid",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141108.2315",
-        "deps": [
-            "bind-key",
-            "helm"
-        ]
-    },
-    "evil-escape": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syl20bnr",
-            "repo": "evil-escape",
-            "sha256": "1dl201jx7kfmkhd7ism6wlmlnbgfg1qn17faryz7kc5v2mms69b4",
-            "rev": "32a6c6c31eaa5678205ce658baaab7eb5ca9c9e3"
-        },
-        "recipe": {
-            "sha256": "0rlwnnshcvsb5kn7db5qy39s89qmqlllvg2z8cnxyri8bsssks4k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151214.1311",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "evil"
-        ]
-    },
-    "camcorder": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "camcorder.el",
-            "sha256": "1fxmk9ykvxkd0ldmldqnwdn5grzzzigla7zsw1yqqmlfwd48ggf8",
-            "rev": "bfef46deae617825089fb06591e5c25c82a2d4be"
-        },
-        "recipe": {
-            "sha256": "1kbnpz3kn8ycpy8nlp8bsnnd1k1h7m02h7w5f7raw97sk4cnpvbi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151208.1012",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "names"
-        ]
-    },
-    "make-color": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alezost",
-            "repo": "make-color.el",
-            "sha256": "1ky3scyjb69wi76xg6a8qx4ja6lr6mk530bv5gmhj7fxbq8b3x5c",
-            "rev": "a1b34e95ccd3ebee4fba1489ab613d0b3078026d"
-        },
-        "recipe": {
-            "sha256": "0mrv8b67lpid5m8rfbhcik76bvnjlw4xmcrd2c2iinyl02y07r5k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140625.650",
-        "deps": []
-    },
-    "nand2tetris": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "CestDiego",
-            "repo": "nand2tetris.el",
-            "sha256": "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7",
-            "rev": "0297cd8d76cad072cb64318ffacdc65d8a1ad948"
-        },
-        "recipe": {
-            "sha256": "1zg9xx7mj8334m2v2zqqfkr5vkj4dzqbj8y13qk6xhzb7qkppyqd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151027.1651",
-        "deps": [
-            "names"
-        ]
-    },
-    "german-holidays": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rudolfochrist",
-            "repo": "german-holidays",
-            "sha256": "0344w4sbd6wlgl13j163v0hzjw9nwhvpr5s7658xsdd90wp4i701",
-            "rev": "8388b3bf5b5c38f9b9fcc9216ca26ef0640c6edc"
-        },
-        "recipe": {
-            "sha256": "0fgrxdgyl6va6axjc5l4sp90pyqaz5zha1g73xyhbxblshm5dwxn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151102.943",
-        "deps": []
-    },
-    "traad": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abingham",
-            "repo": "emacs-traad",
-            "sha256": "0sr159v18x7xp2rqq2lr4ir15ksc6xyh96whipxzbi2qnvx3j3xg",
-            "rev": "5affdb2278228566007d189ca950a15d1c7e509e"
-        },
-        "recipe": {
-            "sha256": "08gxh5c01xfbbj9g4992jah494rw3d3bbs8j79r3mpqxllkp2znf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.134",
-        "deps": [
-            "deferred",
-            "popup",
-            "python-environment",
-            "request",
-            "request-deferred"
-        ]
-    },
-    "save-sexp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "save-sexp",
-            "sha256": "0jdsndq9nqqqfn821qy66y5x3yvmxca9zfk9j9q4a9sbbychqc9c",
-            "rev": "31bd739269e14df70f9519417370ba69a53e540d"
-        },
-        "recipe": {
-            "sha256": "12jx47picdpw668q75qsp9gncrnxnlk1slhzvxsk5pvkdwh26h66",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150731.1046",
-        "deps": []
-    },
-    "fringe-helper": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nschum",
-            "repo": "fringe-helper.el",
-            "sha256": "0ra9rc53l1gvkqank8apasl3r7wz2yfjrcvmfk3wpxhh24ppxv9d",
-            "rev": "ef4a9c023bae18ec1ddd7265f1f2d6d2e775efdd"
-        },
-        "recipe": {
-            "sha256": "1vki5jd8jfrlrjcfd12gisgk12y20q3943i2qjgg4qvcj9k28cbv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140620.1609",
-        "deps": []
-    },
-    "bufshow": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pjones",
-            "repo": "bufshow",
-            "sha256": "1plh77xzpbhgmjdagm5rhqx6nkhc0g39ir0b6s5yh003wmx6r1hh",
-            "rev": "afabb87e07da7f035ca0ca85ed95e3936ea64547"
-        },
-        "recipe": {
-            "sha256": "027cd0jzb8yxm66q1bhyi75f2m9f2pq3aswgav1d18na3ybwg65h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130711.1239",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "esh-help": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tom-tan",
-            "repo": "esh-help",
-            "sha256": "1yfvdx763xxhxf2r6kjjjyafaxrj1lpgrz1sgbhzkyj6nspmm9ms",
-            "rev": "3dc15f2f6086d4e4da977468fda67229a859c927"
-        },
-        "recipe": {
-            "sha256": "1k925wmn8jy9rxxsxxawasxq6r4yzwl116digdx314gd3i04sh3w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140107.422",
-        "deps": [
-            "dash"
-        ]
-    },
-    "plsql": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/plsql.el",
-            "sha256": "1v0wvy9fd1qq3aq83x5jv3953n0n51x7y2r2ql11j0h8xasy42p1"
-        },
-        "recipe": {
-            "sha256": "1jvppmfdll34b8dav5dvbabfxiapv92p7lciblj59a707bbdb7l1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121115.443",
-        "deps": []
-    },
-    "ebal": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mrkkrp",
-            "repo": "ebal",
-            "sha256": "0l2nhf6m6m01y2gw1fkn3zsjvmm1w02qj9zp4nmhgdl0qkllhdz5",
-            "rev": "ef0a288d9b6e557532d772c146ff02aa82771f13"
-        },
-        "recipe": {
-            "sha256": "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151211.15",
-        "deps": [
-            "emacs",
-            "f",
-            "ido-completing-read+"
-        ]
-    },
-    "coffee-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "defunkt",
-            "repo": "coffee-mode",
-            "sha256": "03f8dvajaz6bf3mzfpgcvl0mc79jadlk7419whawcfgzlp9lq676",
-            "rev": "1b938ba9100aa67a0e0ce22c258033bbad50a45d"
-        },
-        "recipe": {
-            "sha256": "1px50hs0x30psa5ljndpcc22c0qwcaxslpjf28cfgxinawnp74g1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151227.753",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "usage-memo": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/usage-memo.el",
-            "sha256": "00g1zj5fjykdi6gh2wkswpwx132xa6jmwfnrgfg5r96zwb8pib4i"
-        },
-        "recipe": {
-            "sha256": "05n50adjnavl7ag24wfjwlnbv5x55qlhmplgsm8j57gjig01nd95",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20110722.1051",
-        "deps": []
-    },
-    "smartparens": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "smartparens",
-            "sha256": "0bmv079l8sak9afnjkf71f180i72l5cch49ckahxrdwwwhglh9a9",
-            "rev": "aa35628d4ad8cf4bcc2f9654f6fbf261327c75ae"
-        },
-        "recipe": {
-            "sha256": "025nfrfw0992024i219jzm4phwf29smc5hib45s6h1s67942mqh6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.1756",
-        "deps": [
-            "cl-lib",
-            "dash"
-        ]
-    },
-    "grunt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gempesaw",
-            "repo": "grunt.el",
-            "sha256": "1js849s8b9x0n6ak2qwv90lk6zr71mgkk9f0xccdhikz4c8vxk0r",
-            "rev": "42bcab2990a27e0f8cf22eee87089c95eb9fae29"
-        },
-        "recipe": {
-            "sha256": "1qdzqcrff9x97kyy0d4j636d5i751qja10liw8i0lf4lk6n0lywz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151110.1029",
-        "deps": [
-            "ansi-color",
-            "dash",
-            "emacs"
-        ]
-    },
-    "buffer-utils": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "buffer-utils",
-            "sha256": "1mnf0dgr6g58k0jyia7985jsinrla04vm5sjl2iajwphbhadjk8p",
-            "rev": "685b13457e3a2085b7584e41365d2aa0779a1b6f"
-        },
-        "recipe": {
-            "sha256": "0cfipdn4fc4fvz513mwiaihvbdi05mza3z5z1379wlljw6r539z2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140512.900",
-        "deps": []
-    },
-    "elscreen-persist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "robario",
-            "repo": "elscreen-persist",
-            "sha256": "06g7fl2c7cvwsrgi462wf6j13ny56y6zvgkizz9f256xjjq77ymf",
-            "rev": "652b4c738f92c518ead69343ebfcf66bc2a0254c"
-        },
-        "recipe": {
-            "sha256": "1rjfvpsx0y5l9b76wa1ilj5lx39jd0m78nb1a4bqn81z0rkfpl4k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151218.126",
-        "deps": [
-            "elscreen",
-            "revive"
-        ]
-    },
-    "scheme-here": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "judevc",
-            "repo": "scheme-here",
-            "sha256": "09cvrphrnbj8avnlqqv6scjz17cn6zm6mzghjn3vxfr4hql66rir",
-            "rev": "430ba017cc530865218de23a8f7985095a58343f"
-        },
-        "recipe": {
-            "sha256": "137qqfnla3hjm6qcnzpsgrw173px0k5dwq9apns5cdryxx3ahcvv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141028.218",
-        "deps": []
-    },
-    "dictcc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cqql",
-            "repo": "dictcc.el",
-            "sha256": "0b8yg03h5arfl5rlzlg2a6q7nhx452mdyngizjzxlvkmrqnlra4v",
-            "rev": "1fd76499cf5d2045e8594aec3c0b62168802f887"
-        },
-        "recipe": {
-            "sha256": "0x1y742hb3dm7xmh5810dlqki38kybw68rmg9adcchm2rn86jqlm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151221.557",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "emacs",
-            "helm",
-            "s"
-        ]
-    },
-    "ido-clever-match": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Bogdanp",
-            "repo": "ido-clever-match",
-            "sha256": "14nmldahr0pj2x4vkzpnpx0bsxafmiihgjylk5j5linqvy8q6wk6",
-            "rev": "f173473e99c8b0756f12e4cc8f67e68fa59eadd3"
-        },
-        "recipe": {
-            "sha256": "081i6cjvqyfpgj0nvzc94zrl2v3l6nv6mhfda4zf7c8qqbvx1m8m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151011.1226",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "pyenv-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "proofit404",
-            "repo": "pyenv-mode",
-            "sha256": "0017xk95293sc37127hg9bbbh5glq34sdc1b6bx6ykzny6g49fd3",
-            "rev": "93ddeb2c0fabc224496cdf5ff688243a208376c4"
-        },
-        "recipe": {
-            "sha256": "00yqrk92knv9gq1m9xcg78gavv70jsjlwzkllzxl63iva9qrch59",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151105.441",
-        "deps": [
-            "pythonic"
-        ]
-    },
-    "iplayer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "csrhodes",
-            "repo": "iplayer-el",
-            "sha256": "043dnij48zdyg081sa7y64lm35z7zvrv8gcymv3l3a98r1yhy3v6",
-            "rev": "48b664e36e1a8e37eeb3eee80b91ff7126ed449a"
-        },
-        "recipe": {
-            "sha256": "0wnxvdlnvlmspqsaqx0ldw8j03qjckkqzvx3cbpc2yfs55pm3p7r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150101.455",
-        "deps": []
-    },
-    "ruby-tools": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "ruby-tools",
-            "sha256": "0jd9acycpbdd90hallrl0k5055rypp502qv4c6i286p7f9is4kvq",
-            "rev": "6b97066b58a4f82eb2ecea6434a0a7e981aa4c18"
-        },
-        "recipe": {
-            "sha256": "1zs2vzcrw11xyj2a7lgqzw4slcha20206jvjbxkm68d57rffpk8y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151209.1015",
-        "deps": []
-    },
-    "multi-term": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/multi-term.el",
-            "sha256": "062c52xd469jdmsq4fvdhsmgfjrlanv0bb1w5vglz7bsn68d2bim"
-        },
-        "recipe": {
-            "sha256": "1va4ihngwv5qvwps3m9jj0150gbrmq3zllnyq1hbx5ap8hjrhvdx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150220.720",
-        "deps": []
-    },
-    "hardcore-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "hardcore-mode.el",
-            "sha256": "124k803pgxc7fz325yy6jcyam69f5fk9kdwfgmnwwca9ablq4cfb",
-            "rev": "b1dda19692b4a7a58a689e81784a9b35be39e70d"
-        },
-        "recipe": {
-            "sha256": "1bgi1acpw4z7i03d0i8mrd2hpjn6hyvkdsk0ks9q380yp9mqmiwd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151114.101",
-        "deps": []
-    },
-    "e2wm-R": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "e2wm-R.el",
-            "sha256": "0xjgdd6xgxy1rfiah95w7wzjriqqf4hi87lma8v4f59g312zrhwy",
-            "rev": "4bcf8c38d4ec38bb575d553a5d4a247d1777bf7b"
-        },
-        "recipe": {
-            "sha256": "09v4fz178lch4d6m801ipclfxm2qrap5601aysnzyvc2apvyr3sh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130506.8",
-        "deps": [
-            "e2wm",
-            "ess",
-            "inlineR"
-        ]
-    },
-    "bibtex-utils": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "plantarum",
-            "repo": "bibtex-utils",
-            "sha256": "1qf45s53vcbd90v2d2brynv3xmp8sy9w9jp611cf0dzfl1k7x8p8",
-            "rev": "1695db9f4f9198bb27f219bd4da7d34a9ae58069"
-        },
-        "recipe": {
-            "sha256": "13llsyyvy0xc9s51cqqc1rz13m3qdqh8jw07gwywfbixlma59z8l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150924.847",
-        "deps": []
-    },
-    "fold-this": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "fold-this.el",
-            "sha256": "1cbabpyp66nl5j8yhyj2jih4mhaljxvjh9ij05clai71z4598ahn",
-            "rev": "90b41d7b588ab1c3295bf69f7dd87bf31b543a6a"
-        },
-        "recipe": {
-            "sha256": "1iri4a6ixw3q7qr803cj2ik7rvmww1b6ybj5q2pvkf1v25r8655d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150601.542",
-        "deps": []
-    },
-    "mowedline": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "retroj",
-            "repo": "mowedline",
-            "sha256": "179mc70x3dvj0cz6yyhs00ndh0xvk71gmiscln9y0f1ngxr5h338",
-            "rev": "058d5fad71c9895ab36cf83b3f0a0b722054cb19"
-        },
-        "recipe": {
-            "sha256": "0c2hvvwa7s5iyz517jaskshdcq9zs15zr6xsvrcb3biahrh4bmfb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150601.1209",
-        "deps": []
-    },
-    "keychain-environment": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "keychain-environment",
-            "sha256": "0xm7vybqgglacm0xz6fa7ipfvsx14qqws629gi9i16maxn3by9ci",
-            "rev": "c4c87cf3b3f13c1d73efe8fccf5f2c68ebe04abe"
-        },
-        "recipe": {
-            "sha256": "1w77cg00bwx68h0d6k6r1fzwdwz97q12ch2hmpzjnblqs0i4sv8v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150416.1458",
-        "deps": []
-    },
-    "parent-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "parent-mode",
-            "sha256": "0i5bc7lyyrx6swqlrp9l5x72yzwi53qn6ldrfs99gh08b3yvsnni",
-            "rev": "db692cf08deff2f0e973e6e86e26662b44813d1b"
-        },
-        "recipe": {
-            "sha256": "1ndn6m6aasmk9yrml9xqj8141100nw7qi1bhnlsss3v8b6njwwig",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150824.1800",
-        "deps": []
-    },
-    "frame-tag": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "liangzan",
-            "repo": "frame-tag.el",
-            "sha256": "1vvkdgj8warl40kqmd0408q46dxy9qp2sclq4q92b6falry9qy30",
-            "rev": "7018490dbc3c39f2c959e38c448001d1864bfa17"
-        },
-        "recipe": {
-            "sha256": "1n13xcc3ny9j9h1h4vslpjl6k9mqksr73kgmqrmkq301p8zps94q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151121.118",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "midje-test-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bpoweski",
-            "repo": "midje-test-mode",
-            "sha256": "0f3iq4ghi4ig2by1smfciavr2f0lx6vhvajykxdfs0afn006w4cs",
-            "rev": "46fc081865d48f30b950f21a597eadd59a802fc9"
-        },
-        "recipe": {
-            "sha256": "0i5j9bnrncxar8hpy3d0566d0y5s4ywakskf27d3kxfyrwqi4l4f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131208.1114",
-        "deps": [
-            "cider",
-            "clojure-mode"
-        ]
-    },
-    "git-gutter": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-git-gutter",
-            "sha256": "1pjvy4r1wrvqsqlxssrkw5c5qn57icgsz7p7fh6qkj9dfpszg8ad",
-            "rev": "cb2b341162447bc04b6f561dbb2e5add9a24c134"
-        },
-        "recipe": {
-            "sha256": "12yjl9hsd72dwzl42hdcmjfdbxyi356jcq0kz8k7jvcsn57z4p2k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.2202",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "flycheck-flow": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lbolla",
-            "repo": "emacs-flycheck-flow",
-            "sha256": "0lk7da7axn9fm0kzlzx10ir014rsdsycffi8jcy4biqllw6yi4dx",
-            "rev": "6a6307a3998531279feab742321192cfc0c6e90a"
-        },
-        "recipe": {
-            "sha256": "0p4vvk09vjgk98dwzr2qzldvij3v6af56pradssi6sm3shbqhkk3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151218.604",
-        "deps": [
-            "flycheck"
-        ]
-    },
-    "highlight-cl": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/highlight-cl.el",
-            "sha256": "0r3kzs2fsi3kl5gqmsv75dc7lgfl4imrrqhg09ij6kq1ri8gjxjw"
-        },
-        "recipe": {
-            "sha256": "164h3c3rzriahb7v5hk2pw4i0gk2vk5ak722bai6x4zx4l1xp20w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20091012.1230",
-        "deps": []
-    },
-    "stylus-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "brianc",
-            "repo": "jade-mode",
-            "sha256": "1q6wpjb7vhsy92li6fag34pwyil4zvcchbvfjml612aaykiys506",
-            "rev": "0d0bbf60730d0e33c6362e1fceeaf0e133b1ceeb"
-        },
-        "recipe": {
-            "sha256": "152k74q6qn2xa38v2zyd5y7ya5n26nvai5v7z5fmq7jrcndp27r5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150313.1012",
-        "deps": [
-            "sws-mode"
-        ]
-    },
-    "peg": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ellerh",
-            "repo": "peg.el",
-            "sha256": "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n",
-            "rev": "081efeca91d790c7fbc90871ac22c40935f4833b"
-        },
-        "recipe": {
-            "sha256": "0nxy9xn99myz0p36m4jflfj48qxhhn1sspbfx8d90030xg3cc2gm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150708.141",
-        "deps": []
-    },
-    "cask": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cask",
-            "repo": "cask",
-            "sha256": "0zky8d9kdrcfh4vh8v6wbzs80nixr1xnnyjgg1zdingyklrxl79y",
-            "rev": "acd19283ff2da1c37c30015bcd83b012b33cf3c5"
-        },
-        "recipe": {
-            "sha256": "11nr6my3vlb1xiyai7qwii3nszda2mnkhkjlbh3d0699h0yw7dk5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151123.728",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "epl",
-            "f",
-            "package-build",
-            "s",
-            "shut-up"
-        ]
-    },
-    "pcmpl-homebrew": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kaihaosw",
-            "repo": "pcmpl-homebrew",
-            "sha256": "17i5j5005dhzgwzds5jj1a7d31xvbshjc139vawwz2xip5aynji4",
-            "rev": "a2b9026a1b3c8206d0eca90c491c0397fb275f94"
-        },
-        "recipe": {
-            "sha256": "1gckzcwpg4am1ryjy08aic98mbafb64wkfmnm98d64kiwbpaacly",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150506.2052",
-        "deps": []
-    },
-    "ace-jump-helm-line": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cute-jumper",
-            "repo": "ace-jump-helm-line",
-            "sha256": "0yfhny921krpl9j8x7xflj8jzbrj8fkabc8373b8q5hyz20d332k",
-            "rev": "8400dbdd93d0442493f74f4030b09bbfac2d5700"
-        },
-        "recipe": {
-            "sha256": "04q8wh6jskvbiq6y2xsp2ir23vgz5zw09rm127sgiqrmn0jc61b9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151113.1300",
-        "deps": [
-            "avy",
-            "helm"
-        ]
-    },
-    "keyword-search": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "keyword-search",
-            "repo": "keyword-search",
-            "sha256": "0zw4klp9ifb6yylr9yab3p3vjv18as6clpg2i3w4r2xah9chxgqq",
-            "rev": "1a01e3d5a43e48701cfab0332876284f5d3a1bba"
-        },
-        "recipe": {
-            "sha256": "0wvci1v8pblfbdslfzpi46c149y8pi49kza9jf33jzhj357lp5qa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150911.432",
-        "deps": []
-    },
-    "puml-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skuro",
-            "repo": "puml-mode",
-            "sha256": "15c2p5ffvkp80v6fvxa3bgrk8mj18famngqkz2dammxnbppvnvvz",
-            "rev": "9d3b5e326d1e68f87711c2ccb0920e2f5db5550b"
-        },
-        "recipe": {
-            "sha256": "131ghjq6lsbhbx5hdg36swnkqijdb9bx6zg73hg0nw8qk0z742vn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151212.1023",
-        "deps": []
-    },
-    "gnus-summary-ext": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vapniks",
-            "repo": "gnus-summary-ext",
-            "sha256": "1dzb3h5swvmwwy7x1lhz79cq2kpmamk35jb4dwmmxz6j248kmv6b",
-            "rev": "6be01a82819dc73b0650d726e17d0adb44b72c2b"
-        },
-        "recipe": {
-            "sha256": "0svyz8fy4k9ba6gpdymf4cf8zjjpgm71y48vlybxbv507xjm17qf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150119.2033",
-        "deps": []
-    },
-    "bbdb-ext": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vapniks",
-            "repo": "bbdb-ext",
-            "sha256": "1ydf89mmp3zjfqdymnrwg18wclyf7psarz9f2k82pl58h0khh71g",
-            "rev": "fee97b1b3faa83edaea00fbc5ad3cbca5e791a55"
-        },
-        "recipe": {
-            "sha256": "0fnxcvzdyh0602rdfz3lz3vmvza4s0syz1vn2fgsn2lg3afqq7li",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151220.1413",
-        "deps": [
-            "bbdb"
-        ]
-    },
-    "ac-html-csswatcher": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "osv",
-            "repo": "ac-html-csswatcher",
-            "sha256": "0swbw62zh5rjjf73pvmp8brrrmk6bp061k793z4z83v7ic0cicrr",
-            "rev": "b0f3e7e1a3fe49e88b6eb6432377232fc715f221"
-        },
-        "recipe": {
-            "sha256": "0jb9dnm2lxadrxssf0rjqw8yvvskcq4hys8c21shjyj3gkvwbfqn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151208.1513",
-        "deps": [
-            "web-completion-data"
-        ]
-    },
-    "viewer": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/viewer.el",
-            "sha256": "0lns0ic3zjz1km02674d9hxgnp6wlhk168wyr6h4vhpr8a71x9mb"
-        },
-        "recipe": {
-            "sha256": "0aqwkymq5f0qfgs1hmcg1jb1rd0vcnlqwiyjrjjkfff2xlbpagqf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141021.1338",
-        "deps": []
-    },
-    "gmail2bbdb": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "redguardtoo",
-            "repo": "gmail2bbdb",
-            "sha256": "01hhanijqlh741f9wh6xn88qvghwqnfj5j0rvys5mghssfspqs3z",
-            "rev": "f0e23a1262bb683285b381b1d142478ba345af1a"
-        },
-        "recipe": {
-            "sha256": "03jhrk4vpjim3ybzjxy7s9r1cgjysj9vlc4criz5k0w7vqz3r28j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150909.2039",
-        "deps": []
-    },
-    "wolfram-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kawabata",
-            "repo": "wolfram-mode",
-            "sha256": "1xna0cjgi9m87pws2h0cza67qbpdhjmdi5h4wv6v4g14nr26hi3w",
-            "rev": "72cb36975816a9a7b677269e19b9ff431f597ed7"
-        },
-        "recipe": {
-            "sha256": "1bq95lamzz45macpklnq1kxw9ak4x4f41kx16f472dn650ff0zlf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140118.957",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "flymake-easy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-easy",
-            "sha256": "1mylcsklnv3q27q1gvf7wrila39rmxab1ypmvjh5p56d91y6pszc",
-            "rev": "de41ea49503f71f997e5c359a2ad08df696c0147"
-        },
-        "recipe": {
-            "sha256": "19p6s9fllgvs35v167xf624k5dn16l9fnvaqcj9ks162gl9vymn7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140818.255",
-        "deps": []
-    },
-    "sane-term": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "adamrt",
-            "repo": "sane-term",
-            "sha256": "1r6b6n2bzjznjfimgcm0vnmln4sbyasm4icmdgbpzahdmbkfzq3w",
-            "rev": "1d0c1410050cb50034c9e065dfde3e7ec5bc31b7"
-        },
-        "recipe": {
-            "sha256": "0iz63b62x5jrz7c23i850634k4bk73kg1h4wj1ravx3wlgvzs8y8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150917.1802",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "org-repo-todo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "waymondo",
-            "repo": "org-repo-todo",
-            "sha256": "03c88jzwvl95dl39703mknkvnk3cmw4gss5c1y2k9py2rgh6bpr9",
-            "rev": "904a26089d87db59a40421d6f857b189e70dfbe3"
-        },
-        "recipe": {
-            "sha256": "0l5ns1hs3i4dhrpmvzl34zc9zysgjkfa7j8apbda59n9jdvml5v1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141204.1541",
-        "deps": []
-    },
-    "anything": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "http://repo.or.cz/r/anything-config.git",
-            "sha256": "e90ded84609e59a4cef22bfd9d9a543ec6b677b78ab44fb4eb6cbae9eb248669",
-            "rev": "2d7e0450e13ab04b20f4dff08f32936e78677e58"
-        },
-        "recipe": {
-            "sha256": "13pmks0bsby57v3vp6jcvvzwb771d4qq62djgvrw4ykxqzkcb8fj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151018.2103",
-        "deps": []
-    },
-    "headlong": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "headlong",
-            "sha256": "06hq6p6a4fzprbj4r885vsvzddlvx0wxqk5kik06v5bm7hjmnyrq",
-            "rev": "f6830f87f236eee88263cb6976125f72422abe72"
-        },
-        "recipe": {
-            "sha256": "042ybplkqjb30qf5cpbw5d91j1rdc71b789v277h036bri7hgxz6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150417.1026",
-        "deps": []
-    },
-    "robe": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dgutov",
-            "repo": "robe",
-            "sha256": "1fckb18x9ikm6dlwwdfg9q4wyjjwdqy3r1w2ic01xb0dbyls41gw",
-            "rev": "c5a0ae6f68c699ec3cdbb73a3e01e76f62d75f48"
-        },
-        "recipe": {
-            "sha256": "19py2lwi7maya90kh1mgwqb16j72f7gm05dwla6xrzq1aks18wrk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151119.1658",
-        "deps": [
-            "inf-ruby"
-        ]
-    },
-    "espresso-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dgutov",
-            "repo": "espresso-theme",
-            "sha256": "0ir7j4dgy0fq9ybixaqs52kiqk73p9v6prgqzjs8nyicjrpmnpyq",
-            "rev": "c3a524e873f33923fe511791197a66dea5156687"
-        },
-        "recipe": {
-            "sha256": "1bsff8fnq5z0f6cwg6wprz8qi3ivsqxpxx6v6fxfammn74qqyvb5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130301.148",
-        "deps": []
-    },
-    "ob-axiom": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/pdo/axiom-environment",
-            "sha256": "1vk7jjbf8wp183c4nagkgxvzcyrdlr53avzsxl111rm5rsxbvdli",
-            "rev": "d7ea57a27527"
-        },
-        "recipe": {
-            "sha256": "12cmzhgzk8314y6nvzdjwidalccz6h440lil83c1h4lz4ddlwmf6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150804.1700",
-        "deps": [
-            "axiom-environment",
-            "emacs"
-        ]
-    },
-    "git-auto-commit-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ryuslash",
-            "repo": "git-auto-commit-mode",
-            "sha256": "0psmr7749nzxln4b500sl3vrf24x3qijp12ir0i5z4x25k72hrlh",
-            "rev": "075e5f9ded66c2035581a7b216896556cc586814"
-        },
-        "recipe": {
-            "sha256": "0nf4n63xnzcsizjk1yl8qvqj9wjdqy57kvn6r736xvsxwzd44xgl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150404.951",
-        "deps": []
-    },
-    "company-go": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nsf",
-            "repo": "gocode",
-            "sha256": "0p3abkqllgy1b5l08wgxjywvvbcjiyjdf00azh1r1nyc81m4krni",
-            "rev": "2b99fc4d372b017483b7596c4577bf5f15479772"
-        },
-        "recipe": {
-            "sha256": "1ncy5wlg3ywr17zrxb1d1bap4gdvwr35w9a8b0crz5h3l3y4cp29",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151211.1224",
-        "deps": [
-            "company",
-            "go-mode"
-        ]
-    },
-    "light-soap-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mswift42",
-            "repo": "light-soap-theme",
-            "sha256": "04dik8z2mg6qr4d3fkd26kg29b4c5crvbnc1lfsrzyrik7ipvsi8",
-            "rev": "76a787bd40c6b567ae68ced7f5d9f9f10725e00d"
-        },
-        "recipe": {
-            "sha256": "09p4w51d5szhi81a6a3l0r4zd4ixkrkzxldr938bcmj0qmj62iyk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150607.945",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "google-translate": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "atykhonov",
-            "repo": "google-translate",
-            "sha256": "0j2x7xvc556bq63c85j4dn8aggz2xfilx4x7hf99p7w6px0pzp29",
-            "rev": "e3f3981895d829a05f6f92d4db065c4b46076ff7"
-        },
-        "recipe": {
-            "sha256": "1crgzdd32mk6hrawdypg496dwh51wzwfb5wqw4a2j5l8y958xf47",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151016.1420",
-        "deps": []
-    },
-    "kfg": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abingham",
-            "repo": "kfg",
-            "sha256": "0xq835xzywks4b4kaz5i0pp759i23kibs5gkvvxasw0dncqh7j5c",
-            "rev": "d2c9dd26618fb2f7bf1e7b6eae193b1cceba3c97"
-        },
-        "recipe": {
-            "sha256": "0vvvxl6a4ac27igwmsgzpf0whf9h2pjl9d89fd9fizad6gi8x1fs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140909.38",
-        "deps": [
-            "f"
-        ]
-    },
-    "batch-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/batch-mode.el",
-            "sha256": "1aa611jrzw4svmxvw1ghgh53x4nry0sl7mxmp4kxiaybqqvz6a1p"
-        },
-        "recipe": {
-            "sha256": "1p0rh5r8w00jag64sbjy8xb9g6lqhm2fz476v201kbrj9ggp643x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140807.1550",
-        "deps": []
-    },
-    "puppet-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lunaryorn",
-            "repo": "puppet-mode",
-            "sha256": "11mkf9gvjz63szdvhwlqnd6j2r9ij2fh8l6zkf7hl2zlwyyivcmp",
-            "rev": "268ec790603a4121f62822ca6c26e9038a1b0375"
-        },
-        "recipe": {
-            "sha256": "1s2hap6fs6rg5q80dmzhaf4qqaf5sglhs8p896i3i5hq51w0ciyc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150730.1408",
-        "deps": [
-            "emacs",
-            "pkg-info"
-        ]
-    },
-    "region-state": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xuchunyang",
-            "repo": "region-state.el",
-            "sha256": "0gsh0x1rqxvzrszdyna9d8b8w22mqnd9yqcwzay2prc6rpl26g1f",
-            "rev": "07ffb7d9ada2fcd204f3447f078c265d25f36f60"
-        },
-        "recipe": {
-            "sha256": "1iq2x1w8lqjjiwjja7r3qki6drvydnk171k9fj9g6rk7wslknz8x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151128.438",
-        "deps": []
-    },
-    "heroku-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jonathanchu",
-            "repo": "heroku-theme",
-            "sha256": "15hk0v6ck076mahsz4spq75jcnv587fx4d3w50c7bdh423fl0xvx",
-            "rev": "8083643fe92ec3a1c3eb82f1b8dc2236c9c9691d"
-        },
-        "recipe": {
-            "sha256": "0mchh9y3pqwamry6105qrv1bp1qg1g0jmz7rzc5svz9giynypwf9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150522.2119",
-        "deps": []
-    },
-    "commify": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ddoherty03",
-            "repo": "commify",
-            "sha256": "04bma9sdn7h8fjz62wlcwayzhr7lvzhidh48wc5rk195zlbgagwa",
-            "rev": "921467f666c05ccec9cf3bc0a8168eade20bcb6a"
-        },
-        "recipe": {
-            "sha256": "1jc6iqa4hna3277hx13scfcqzkr43yv6gndbxv7qf4ydi01ysd0m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151110.338",
-        "deps": [
-            "s"
-        ]
-    },
-    "fillcode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "snarfed",
-            "repo": "fillcode",
-            "sha256": "1x9wmxbcmd6qgdyzrl978nczfqrgyk6xz3rnh5hffbapy1v1rw47",
-            "rev": "ae5f6c6de81a7681c8f883e7fce36fd0f2b3c1e8"
-        },
-        "recipe": {
-            "sha256": "0bfsw55vjhx88jpy6npnzfwinvggivbvkk7fa3iwzq19005fkag2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150812.1141",
-        "deps": []
-    },
-    "gs-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yyr",
-            "repo": "emacs-grads",
-            "sha256": "1d89gxyzv0z0nk7v1aa4qa0xfms2g2dsrr07cw0d99xsnyxfky31",
-            "rev": "1a13051db21b999c7682a015b33a03096ff9d891"
-        },
-        "recipe": {
-            "sha256": "02ldd92fv1k28nygl34i8gv0b0i1v5qd7nl1l17cf5f3akdwc6iq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151202.406",
-        "deps": []
-    },
-    "mip-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gaudecker",
-            "repo": "mip-mode",
-            "sha256": "12k9ii4090dn03xvgqisl4zl4qi33054zxyfkqzzpa9wv72h4knc",
-            "rev": "7c88c383b4c7ed0a4c1dc397735f365c1fcb461c"
-        },
-        "recipe": {
-            "sha256": "1wx5zg4kimd29vqipbzm4vjphn0mldri12g6b18kc290nhgj22ar",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151127.17",
-        "deps": []
-    },
-    "marmalade-client": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nicferrier",
-            "repo": "emacs-marmalade-upload",
-            "sha256": "017k109nfif5mzkj547py8pdnzlr4sxb74yqqsl944znflq67blr",
-            "rev": "f315dea57e4fbebd9ee0668c0bafd4c45c7b754a"
-        },
-        "recipe": {
-            "sha256": "0llwqwwxrf7qdkpdb03ij0iinll0vc9qr557zyr3bn5zb4fad1sq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141231.1407",
-        "deps": [
-            "gh",
-            "kv",
-            "web"
-        ]
-    },
-    "live-code-talks": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "david-christiansen",
-            "repo": "live-code-talks",
-            "sha256": "1j0qa96vlsqybhp0082a466qb1hd2b0621306brl9pfl5srf5jsj",
-            "rev": "fece58108939a53104f88d348298c9e122f25b75"
-        },
-        "recipe": {
-            "sha256": "173mjmxanva13vk2f3a06s4dy62x271kynsa7pbhdg4fd72hdjma",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150115.1623",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "narrowed-page-navigation"
-        ]
-    },
-    "smooth-scroll": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k-talo",
-            "repo": "smooth-scroll.el",
-            "sha256": "1kkg7qhb2lmwr4siiazqny9w2z9nk799lzl5i159lfivlxcgixmk",
-            "rev": "02320f28abb5cae28b3a18f6b9ce93129bdbfc45"
-        },
-        "recipe": {
-            "sha256": "1b0mjpd4dqgk7ij37145ry2jqbn1msf8rrvymn7zyckbccg83zsf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130321.2314",
-        "deps": []
-    },
-    "helm-c-moccur": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "helm-c-moccur.el",
-            "sha256": "1silsbancag21x167q68q9fi15h4fxpv4f7dcxy4b0di9l08mc46",
-            "rev": "a0f70c8bc750b1e0a5f417a70c9ca192eb7a1e83"
-        },
-        "recipe": {
-            "sha256": "1i6a4jqjy9amlhdbj5d26wzagndfgszha09vs5qf4760vjl7kn4b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150213.2142",
-        "deps": [
-            "color-moccur",
-            "helm"
-        ]
-    },
-    "unicode-fonts": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "unicode-fonts",
-            "sha256": "0fbwncna6gxlynq9196djpkjhayzk8kxlsxg0gasdgqx1nyxl0mk",
-            "rev": "a36597d83e0248bd0e6b2c1d5fb95bff72add527"
-        },
-        "recipe": {
-            "sha256": "0plipwb30qqay8691qzqdyg6smpbs9dsxxi49psb8sq0xnxl84q3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150826.1732",
-        "deps": [
-            "font-utils",
-            "list-utils",
-            "pcache",
-            "persistent-soft",
-            "ucs-utils"
-        ]
-    },
-    "eww-lnum": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "m00natic",
-            "repo": "eww-lnum",
-            "sha256": "1i6zf17rwa390c33cbspz81dz86vwlphyhjjsia4gp205nfk3s20",
-            "rev": "4b0ecec769919ecb05ca4fb15ec51911ba589929"
-        },
-        "recipe": {
-            "sha256": "1y745z4wa90snizq2g0amdwwgjafd6hkrayn93ca50f1wghdbk79",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150102.912",
-        "deps": []
-    },
-    "mbe": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ijp",
-            "repo": "mbe.el",
-            "sha256": "1zywygdgnp2zr8fxqhl0cbrgbl43931k936b9imhqi96p6622pb6",
-            "rev": "bb10aa8f26bb7e9b1d5746934c94edb00402940c"
-        },
-        "recipe": {
-            "sha256": "0h18mbcjy8nh4gl12kg2v8x6ps320yk7sbgq5alqnx2shp80kri3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151126.534",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "relative-line-numbers": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "relative-line-numbers",
-            "sha256": "1r8fhs7d2vkrbv15ic2bm79i9a8swbc38vk566vnxkhl3rfd5a0a",
-            "rev": "64157db08b0c2f5fada3209fc8d3e4b4c7429978"
-        },
-        "recipe": {
-            "sha256": "0mj1w5a4ax8hwz41vn02bacxlnifd14hvf3p288ljvwchvlf0hn3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151006.1646",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "electric-case": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "electric-case",
-            "sha256": "0s4y1319sr4xc0k6h2zhzzxsx2kc3pc2m6saah18y4kip0hjyhr8",
-            "rev": "bac64e772107e3dc721a9819f63b9ebdc28a81f7"
-        },
-        "recipe": {
-            "sha256": "11mab7799kxs3w47srmds5prmwh6ldxzial9kqbqy33vybpkprmd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150417.612",
-        "deps": []
-    },
-    "python-mode": {
-        "fetch": {
-            "tag": "fetchFromGitLab",
-            "owner": "python-mode-devs",
-            "repo": "python-mode",
-            "sha256": "1x1nf3xsv4wzahqjzaavjrh1zjvf67h6kwyz6fx6ijycyx52bcwr",
-            "rev": "2ead7e73280f42ee8f18368e093b49ae839a643d"
-        },
-        "recipe": {
-            "sha256": "1m7c6c97xpr5mrbyzhcl2cy7ykdz5yjj90mrakd4lknnsbcq205k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.1231",
-        "deps": []
-    },
-    "ob-sml": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "swannodette",
-            "repo": "ob-sml",
-            "sha256": "0gymna48igcixrapjmg842pnlsshhw8zplxwyyn0x2yrma9fjyyg",
-            "rev": "958165c92b6cff6cada5c85c8ae5887806b8451b"
-        },
-        "recipe": {
-            "sha256": "04qvzhwjr8ipvq3znnhn0wbl4pbb1rwxi90iidavzk3phbkpaskn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130829.1343",
-        "deps": [
-            "sml-mode"
-        ]
-    },
-    "mu4e-alert": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "iqbalansari",
-            "repo": "mu4e-alert",
-            "sha256": "0n2dxvy5m3mflal3157v22v1zi3c13pryqqgn312c7jwc5cqi19c",
-            "rev": "7ae95b309f8092ae639aeaba1d89c516f61a56c5"
-        },
-        "recipe": {
-            "sha256": "15nwj09iyrvjsc9lrxla6qa0s8izcllxghw5gx3ffncfcrx2l8qm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151214.1227",
-        "deps": [
-            "alert",
-            "emacs",
-            "s"
-        ]
-    },
-    "preseed-generic-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "suntong001",
-            "repo": "preseed-generic-mode",
-            "sha256": "1dyi9nc2q43jf87xiz9xw42irrbla2vyixifdiibh6nm9misnfj0",
-            "rev": "19bce980d41607bef8af4b1901343abfca0f0855"
-        },
-        "recipe": {
-            "sha256": "0c0zs07lspwczbcba56fai0rshjzx9zd3jqxgj9nwjf9xlcr8m3j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150119.1441",
-        "deps": []
-    },
-    "erc-colorize": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thisirs",
-            "repo": "erc-colorize",
-            "sha256": "0knr45va4xi5dgv7iyzdv93zrw4rapzahj7ryi3ik32jacx2cpl2",
-            "rev": "0fdc12d222f36f352ee17da0d4fcbf77be5bf865"
-        },
-        "recipe": {
-            "sha256": "1m941q7ql3yb71s71783nvz822bwhn1krmin18fvh0fbsbbnck2a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150725.909",
-        "deps": []
-    },
-    "django-snippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myfreeweb",
-            "repo": "django-mode",
-            "sha256": "0dw0m77w7kdwxxh53b4k15jjkpfl5vha17hw9dn29ap77pf820va",
-            "rev": "3d82a62a7faeb2c124ac4c109e075f581c175508"
-        },
-        "recipe": {
-            "sha256": "1qs9fw104kidbr5zbxc1q71yy033nq3wxh98vvzk4z4fppnd29sw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131229.1011",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "ham-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "ham-mode",
-            "sha256": "0d3xmagl18pas19zbpg27j0lmdiry23df48z4vkjsrcllqg25v5g",
-            "rev": "3a141986a21c2aa6eefb428983352abb8b7907d2"
-        },
-        "recipe": {
-            "sha256": "000qrdby7d6zmp5066vs4gjlc9ik0ybrgcwzcbfgxb16w1g9xpmz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150811.806",
-        "deps": [
-            "html-to-markdown",
-            "markdown-mode"
-        ]
-    },
-    "toggle": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zenspider",
-            "repo": "elisp",
-            "sha256": "109il2s5ynfam510yli4xmi5zgw7xhr5gv096li24idqdp0gpf9n",
-            "rev": "ec4ef9dc2d018053bed7fb44837b4c66f1a14c36"
-        },
-        "recipe": {
-            "sha256": "08lk8h2dk5s8k93j5vmxdlgg453pif8wbcx2w3xkjlh43dw1vdfq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151210.1727",
-        "deps": []
-    },
-    "slime-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsfodder",
-            "repo": "emacs-slime-theme",
-            "sha256": "13rm9pmshgssmydhpirri38s38z3kvkhqama40qdzqq96dsxlnjx",
-            "rev": "441288a5791d24e79ada2698888653ef3cf2ac6f"
-        },
-        "recipe": {
-            "sha256": "1b709cplxip48a6qjdnzcn5qcgsy0jq1m05d7vc8p5ywgr1f9a00",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141116.102",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "modeline-posn": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/modeline-posn.el",
-            "sha256": "1c0pkk4jnpqs3r46yjh9srwy3ql6pkjv55m85w49kxvcflmipl9i"
-        },
-        "recipe": {
-            "sha256": "0dngfcbcdh22fl6nd47dhg9z9iivj67six67zjr9j1cbngp10dwk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150228.1213",
-        "deps": []
-    },
-    "e2wm-direx": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "e2wm-direx",
-            "sha256": "09i7d2rc9zd4s3nqrhd3ggs1ykdpxf0pyhxixxw2xy0q6nbswjia",
-            "rev": "f319625b56c44e601af7c17fc6dbb88e5d70ebae"
-        },
-        "recipe": {
-            "sha256": "0nv8aciq0swxi9ahwc2pvk9c7i3rmlp7vrzqcan58ml0i3nm17wg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140815.1813",
-        "deps": [
-            "direx",
-            "e2wm"
-        ]
-    },
-    "macros+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/macros+.el",
-            "sha256": "1nf8hgaig26plb7dbn81gw7q4dmnr5gh90lcm82aml8h8z5ab78q"
-        },
-        "recipe": {
-            "sha256": "0aihszxsjnc93pbbkmkr1iwzvii3jw8yh1f6dpnjykgvb328pvqi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1820",
-        "deps": []
-    },
-    "ruby-electric": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "http://svn.ruby-lang.org/repos/ruby/trunk/misc/",
-            "sha256": "0gl8wcnm7pidvd8zy3w5lzxqj0qxs9d932350ncgnmxwfsfzkdk7",
-            "rev": "53351"
-        },
-        "recipe": {
-            "sha256": "04j04dsknzb7xc8v6alawgcbymdfmh27xnpr98yc8b05nzafw056",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150424.952",
-        "deps": []
-    },
-    "rcirc-alert": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "csantosb",
-            "repo": "rcirc-alert",
-            "sha256": "0xdyrp0zs2v2glpfwlajmj97wygwi0y492zbp6rp3caa5bj3j4z2",
-            "rev": "0adf8ff9c47023fec578f678424be62b0f49057f"
-        },
-        "recipe": {
-            "sha256": "0lyd3gz1sflp93xb7xbvk1gh69w468ync1p144avyh2pybl40q4a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141127.447",
-        "deps": []
-    },
-    "multi-web-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fgallina",
-            "repo": "multi-web-mode",
-            "sha256": "0mc4kkgwnwfk27wwc21nw5ly7qcsl7y5bd8wf2y8r6pxhvwran4n",
-            "rev": "ad1c8d1c870334052d244c7ae3636cb7b9357b7c"
-        },
-        "recipe": {
-            "sha256": "0vi4yvahr10aqpcz4127c8pcqpr5srwc1yhgipnbnm86qnh34ql5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130823.2254",
-        "deps": []
-    },
-    "ctags": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/semente/ctags.el",
-            "sha256": "1xgrb4ivgz7gmingfafmclqqflxdvkarmfkqqv1zjk6yrjhlcvwf",
-            "rev": "afb16c5b2530"
-        },
-        "recipe": {
-            "sha256": "11fp8l99rj4fmi0vd3hkffgpfhk1l82ggglzb74jr3qfzv3dcn6y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20110911.504",
-        "deps": []
-    },
-    "history": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "boyw165",
-            "repo": "history",
-            "sha256": "1dmrg39g0faqqkgrpcbybjbb91vcpkwawxsplckkj92y59zanq3x",
-            "rev": "4bb475513f98ec07db55212a504b6167dae3a646"
-        },
-        "recipe": {
-            "sha256": "0s8pcz53bk1w4h5847204vb6j838vr8za66ni1b2y4pas76zjr5g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150409.1934",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "auto-dictionary": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nschum",
-            "repo": "auto-dictionary-mode",
-            "sha256": "0rfjx0x2an28821shgb4v5djza4kwn5nnrsl2cvh3px4wrvw3izp",
-            "rev": "b364e08009fe0062cf0927d8a0582fad5a12b8e7"
-        },
-        "recipe": {
-            "sha256": "1va485a8lxvb3507kr83cr6wpssxnf8y4l42mamn9daa8sjx3q16",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150410.1110",
-        "deps": []
-    },
-    "defproject": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kotfic",
-            "repo": "defproject",
-            "sha256": "07jzr571q02l0lg5d40rnmzg16hmybi1nkjgslmvlx46z3c4xvyr",
-            "rev": "674d48a5e34cb4bba76faa38ee901322ec649086"
-        },
-        "recipe": {
-            "sha256": "1gld2fkssrjh4smpp54017549d6aw3n1zisp5s4kkb6cmszwj5gm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151201.1619",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "project-persist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rdallasgray",
-            "repo": "project-persist",
-            "sha256": "1fvjap0bsyw5q92q50wk8c81yv4g8nqb6jdlnarf80glwk50avrs",
-            "rev": "8da45c80b23b1d7499eac11a258fd7382312a304"
-        },
-        "recipe": {
-            "sha256": "0csjwj0qaw0hz2qrj8kxgxlixh2hi3aqib98vm19sr3f1b8qab24",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150519.1524",
-        "deps": []
-    },
-    "popup-kill-ring": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "waymondo",
-            "repo": "popup-kill-ring",
-            "sha256": "1zdwlmk3vr0mq0dxrnkqjncalnbmvpxc0lma2sv3a4czl8yv0inn",
-            "rev": "5773dfadc104a906c088a3ec62e8cdd3e01e57fa"
-        },
-        "recipe": {
-            "sha256": "1jfw669xi2983jj3hiw5lyhc0rc0318qrmqx03f7m4ylg70dgxip",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131020.1354",
-        "deps": [
-            "popup",
-            "pos-tip"
-        ]
-    },
-    "popup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "auto-complete",
-            "repo": "popup-el",
-            "sha256": "19sbdxs6l66nflfb4kmx4lb6z0shwpfq79b5h9hhi0xr70xacd4b",
-            "rev": "004d58c47f6406b6555cf112f8a6eed6114cb63b"
-        },
-        "recipe": {
-            "sha256": "151g00h9rkid76qf6c53n8bncsfaikmhj8fqcb3r3a6mbngcd5k2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151222.1539",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "evil-commentary": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "linktohack",
-            "repo": "evil-commentary",
-            "sha256": "1qiym8f56a18j5swrxx5is48nz7z76531k8cw2c7czr6611l8l5a",
-            "rev": "122880a6721fcf16479f406c78c6e490a25efab0"
-        },
-        "recipe": {
-            "sha256": "151iiimmkpn58pl9zn40qssfahbrqy83axyl9dcd6kx2ywv5gcxz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151210.527",
-        "deps": [
-            "evil"
-        ]
-    },
-    "mozc-im": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "d5884",
-            "repo": "mozc-im",
-            "sha256": "03j5fy2xw204807wi7ivwcqlgkh1f7msshh5yrk6c7qdpp08062r",
-            "rev": "eaba71ee15d0822631e2023e2ee244e98782cb2d"
-        },
-        "recipe": {
-            "sha256": "1gqzmm712npj36qfi506zgl0ycd6k7l5m46c7zz2z2lb6jpssw10",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150419.649",
-        "deps": [
-            "mozc"
-        ]
-    },
-    "shut-up": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cask",
-            "repo": "shut-up",
-            "sha256": "00c11s664hwj1l1hw7qshygy3wb6wbd0hn6qqnyq1xr0r87nnhjs",
-            "rev": "a4fd18f37e20ae991c0dbba821b2c8e6f1679c39"
-        },
-        "recipe": {
-            "sha256": "1bcqrnnafnimfcg1s7vrgq4cb4rxi5sgpd92jj7xywvkalr3kh26",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150423.722",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "orglink": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "orglink",
-            "sha256": "12y395ld36jnlbcrfycnvr4g723w6vahfv9iqf1wr6m94ka9pz3d",
-            "rev": "8ba8c54395cd1818c4d58d5cd24712405f9810e0"
-        },
-        "recipe": {
-            "sha256": "0ldrvvqs3hlazj0dch162gsbnbxcg6fgrxid8p7w9gj19vbcl52b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151106.1206",
-        "deps": [
-            "dash",
-            "org"
-        ]
-    },
-    "flymake-shell": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-shell",
-            "sha256": "0c2lz1p91yhprmlbmp0756d96yiy0w92zf0c9vlp0i9abvd0cvkc",
-            "rev": "ec097bd77db5523a04ceb15a128e01689d36fb90"
-        },
-        "recipe": {
-            "sha256": "13ff4r0k29yqgx8ybxz7hh50cjsadcjb7pd0075s9xcrzia5x63i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121104.1300",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "uimage": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lujun9972",
-            "repo": "uimage",
-            "sha256": "19qvn1vzal5k86pqn6a4ins869qmp2i586qqbl97z84szn8mn7j3",
-            "rev": "29ca0f4b9f27a8d1649931cc2ce5a3c0eb655413"
-        },
-        "recipe": {
-            "sha256": "0i6qpk6v4pmpk3zswygdy0dd7rxy8kl7qn8a1xanpi4aqg7wlbmd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151012.804",
-        "deps": []
-    },
-    "shakespeare-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "CodyReichert",
-            "repo": "shakespeare-mode",
-            "sha256": "0vkxl3w4y4yacs1s4v0gwggvzrss8g74d3dgk8h3gphl4dlgx496",
-            "rev": "4bff63eeac2b7ec1220f17e8bbcddbea4c11cb02"
-        },
-        "recipe": {
-            "sha256": "1i9fr9l3x7pwph654hqd8s74swy5gmn3wzs85a2ibmpcjq8mz9rd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150708.912",
-        "deps": []
-    },
-    "gregorio-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cajetanus",
-            "repo": "gregorio-mode.el",
-            "sha256": "1670pxgmqflzw5d02mzsmqjf3gp0c4wf25z0crmaamyfmwdz9pag",
-            "rev": "5b618a8d05cc073bd8e6f1e4e56eceb4de60eab3"
-        },
-        "recipe": {
-            "sha256": "0f226l67bqqc6m8wb97m7lkxvwrfbw74b1riasirca1anzjl8jfx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151026.920",
-        "deps": []
-    },
-    "helm-xcdoc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fujimisakari",
-            "repo": "emacs-helm-xcdoc",
-            "sha256": "1519hknpa9j4ybdsx3a39zcsac4nvpwivydqlgfyfilyryxkwns8",
-            "rev": "fe779cc0a0b79fb6690972d54f36e3f847e39e2f"
-        },
-        "recipe": {
-            "sha256": "1ikphlnj053i4g1l8r2pqaljvdqglj1yk0xx4vygnw98qyzdsx4v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150220.2126",
-        "deps": [
-            "emacs",
-            "helm"
-        ]
-    },
-    "ponylang-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abingham",
-            "repo": "ponylang-mode",
-            "sha256": "14rczhgpkm93cada7hqqf31mxx9f34ih43mjq52zkkcbr7smm09d",
-            "rev": "9ee25b542dda6f1b776d3d9b8f34fbfa2ccb8cbc"
-        },
-        "recipe": {
-            "sha256": "06fy4aiflsynnybbrahfcmg0swxrfnwn48gr8ly3sqfpc037h2f3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151029.450",
-        "deps": [
-            "dash"
-        ]
-    },
-    "e2ansi": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Lindydancer",
-            "repo": "e2ansi",
-            "sha256": "0d18kdpw4zfbq4bkqh19cf42xlinxqa71lr2d994phaxqxqq195w",
-            "rev": "bd047d3d6ad02a0679582d5786afe9aee656da90"
-        },
-        "recipe": {
-            "sha256": "0ns1sldipx5kyqpi0bw79kdmhi1ry5glwxfzfx8r01hbbkf0cc94",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150220.1713",
-        "deps": []
-    },
-    "sunny-day-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mswift42",
-            "repo": "sunny-day-theme",
-            "sha256": "0mhyhkjjwszwl5wzkys9pgvgx9sps9r46k1s1hpzzf4s3vi015mc",
-            "rev": "420e0a6eb33fcc9b75c2c9e88ab60a975d782a00"
-        },
-        "recipe": {
-            "sha256": "1wsfnmmbzzyggzip66vr38yyzy27blxp91wx97bafj7jpg5cyhzw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140413.1625",
-        "deps": []
-    },
-    "rdf-prefix": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "simenheg",
-            "repo": "rdf-prefix",
-            "sha256": "0r95fzi0x8r18x7r574mp503qaiqyicrq78zlggyz6qihi95pmqj",
-            "rev": "1ab1464172c7563a7dbf1224572e4ffbfc6608e6"
-        },
-        "recipe": {
-            "sha256": "1vxgn5f2kws17ndfdv1vj5p9ks3rp6sikzpc258j07bhsfpjz5qm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151205.816",
-        "deps": []
-    },
-    "bs-ext": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/bs-ext.el",
-            "sha256": "1yslzlx54n17330sf6b2pynz01y6ifnkhipz4hggn1i55bz8hvrw"
-        },
-        "recipe": {
-            "sha256": "0dddligqr71qdakgfkx0r45k9py85qlym7y5f204bxppyw5jmwb6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130824.659",
-        "deps": []
-    },
-    "edit-at-point": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "enoson",
-            "repo": "edit-at-point.el",
-            "sha256": "0crwdgng377sy1zbq7kqkz24v697mlzgdsvkdp1m8r7ympikkj6w",
-            "rev": "3b800c11685102e1eab62ec71c5fc1589ebb81a7"
-        },
-        "recipe": {
-            "sha256": "0sn5a644zm165li44yffcpcai8bhl3yfvqcljghlwaa0w45sc9im",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150716.824",
-        "deps": []
-    },
-    "centered-window-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ikame",
-            "repo": "centered-window-mode",
-            "sha256": "09jrcyc1dk2cdfi7ajk8xh2c9jw0f712j6gyvpaklvijakhvgsg7",
-            "rev": "3107c8942d06e9fea180d9340828ee58ad5cb2fd"
-        },
-        "recipe": {
-            "sha256": "0f5qwv4f8gn5nxsqn57bbb3y0w5whjvhv3pls88d5n68lkd1k4si",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140730.447",
-        "deps": []
-    },
-    "helm-migemo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-jp",
-            "repo": "helm-migemo",
-            "sha256": "0gzlprf5js4y3vzkf7si2xc7ai5j97b5cqrs002hyjj5ij4f2vix",
-            "rev": "66c6a19d07c6a385daefd2090d0709d26b608b4e"
-        },
-        "recipe": {
-            "sha256": "1cjvb1lm1fsg5ky63fvrphwl5a7r7xf6qzb4mvl06ikj8hv2h33x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151009.2256",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "helm-core",
-            "migemo"
-        ]
-    },
-    "gather": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-gather",
-            "sha256": "0j0dg7nl9kmanayvw0712x5c5x9h48qmqdsyi0pijvgmv8l5slg5",
-            "rev": "50809fbc22d70a1c724c2dd99ac5a1f818ffeb6b"
-        },
-        "recipe": {
-            "sha256": "1f0cqqp1a7w8g1pfvzxxb0hjrxq4m79a4n85dncqj2xhjxrkm0xk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141230.738",
-        "deps": []
-    },
-    "test-simple": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rocky",
-            "repo": "emacs-test-simple",
-            "sha256": "0h2g02r1spj8vbwgvjn3dddyj89j1qcqzdf2kdggvyyisssj81s3",
-            "rev": "95e58b52ff36ed7c0c50e84dcf5458cb71c380dc"
-        },
-        "recipe": {
-            "sha256": "1l6y77fqd0l0mh2my23psi66v5ya6pbr2hgvcbsaqjnpmfm90w3g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151110.2143",
-        "deps": []
-    },
-    "auto-dim-other-buffers": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mina86",
-            "repo": "auto-dim-other-buffers.el",
-            "sha256": "1j3ygbask2vsrh6ia6y86348lg6vl68gsraryxn25mr0c2b41811",
-            "rev": "8b909cb210a9e4482bcc43858cf8d15da4ecd1d2"
-        },
-        "recipe": {
-            "sha256": "0n9d23sfcmkjfqlm80vrgf856wy08ak4n4rk0z7vadq07yj46zxh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140619.1102",
-        "deps": []
-    },
-    "projectile-rails": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "asok",
-            "repo": "projectile-rails",
-            "sha256": "0hh2hwyhdb1k7ba8vy1ys2i8qvf7sxw8a3v24m3b2cmrg3hz3hcb",
-            "rev": "cc1698f6ba4c54b1d19e73ea7fb3276234a285c5"
-        },
-        "recipe": {
-            "sha256": "0fgvignqdqh0ma91z9385782l89mvwfn77rp1gmy8cbkwi3b7fkq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151126.1145",
-        "deps": [
-            "emacs",
-            "f",
-            "inf-ruby",
-            "inflections",
-            "projectile",
-            "rake"
-        ]
-    },
-    "super-save": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bbatsov",
-            "repo": "super-save",
-            "sha256": "1pq71simdb4pcbzzavlxdfbgh548m15f493h821k04n67ydzlmj3",
-            "rev": "4eb8aef705237d706b30cf722c5ad4909ea3acf1"
-        },
-        "recipe": {
-            "sha256": "0ikfw7n2rvm3xcgnj1si92ly8w75x26071ki551ims7a8sawh52p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151224.139",
-        "deps": []
-    },
-    "furl": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://code.google.com/p/furl-el/",
-            "sha256": "109z1d0zrya1s9wy28nz5ynpg4zl7i1p6q1n57m1b1kkhhckjcv5",
-            "rev": "9a96eeea0046"
-        },
-        "recipe": {
-            "sha256": "15njmanpj3qb8ic3k4sbrngqnsg85lvlj32dmii3y9bpgvis3k6f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20110112.1907",
-        "deps": []
-    },
-    "change-inner": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "change-inner.el",
-            "sha256": "1m9sq93bwajbld3lnlzkjbsby5zlm9sxjzqynryyvsb9zr1d0a9z",
-            "rev": "52c543a4b9808c0d15b565fcdf646c9779de33e8"
-        },
-        "recipe": {
-            "sha256": "0r693056wykg4bs7inbfzfniyawmb91igk6kjjpq3njk0v84y1sj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150707.1044",
-        "deps": [
-            "expand-region"
-        ]
-    },
-    "flymake-yaml": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yasuyk",
-            "repo": "flymake-yaml",
-            "sha256": "0mdam39a85csi9b90wak9j3zkd25lj6x54affwkg3fym8yphmplm",
-            "rev": "24cb5b744a1796e554e6dbfc6eeb237d06a00b10"
-        },
-        "recipe": {
-            "sha256": "17wghm797np4hlidf3wwb47w4klwc6qyk6ry1z05psl3nykws1g7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130423.1048",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "tabulated-list": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sigma",
-            "repo": "tabulated-list.el",
-            "sha256": "0861shx0yicl3cyik6bsjlc0bm8q4h2krxmsrw7irmnwj4ng8g7g",
-            "rev": "b547d9b728935102d1c418bc0e978c221c37f6ab"
-        },
-        "recipe": {
-            "sha256": "1gp523w11f0aa8mbrb8z6ykqmy6ihvnfs00ff906gdmjx5kk16sr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120406.1551",
-        "deps": []
-    },
-    "hippie-expand-slime": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "hippie-expand-slime",
-            "sha256": "1l76r8hzhaapx76f6spm5jmjbrrm5zf79cpd5024xw3hpj1jbkjp",
-            "rev": "432de36799fffc920e5bff7a4691f3c67236e59c"
-        },
-        "recipe": {
-            "sha256": "0kxyv1lpkg33qgfv1jfqx03640py7525bcnc9dk98w6y6y92zf4m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130907.332",
-        "deps": []
-    },
-    "pgdevenv": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dimitri",
-            "repo": "pgdevenv-el",
-            "sha256": "0c9d4c24ic67y07y74bv5b7vc56b6l0lbh2fbzm870r1dl5zbzcj",
-            "rev": "7f1d5bc734750aca98cf67a9491cdbd5615fd132"
-        },
-        "recipe": {
-            "sha256": "0za35sdwwav81wpk4jjqh56icaswwxxyg3bqqp0qiz24llb5ln1w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150105.1636",
-        "deps": []
-    },
-    "httpcode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rspivak",
-            "repo": "httpcode.el",
-            "sha256": "02jz8qwxl69zhwvpmlqc15znr8x4f30paqszmm7xrrrz5x1c1rn4",
-            "rev": "a45e735082b09477cd704a99294d336cdbeb12ba"
-        },
-        "recipe": {
-            "sha256": "05k1al1j119x6zf03p7jn2r9qql33859583nbf85k41bhicknpgh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121001.2245",
-        "deps": []
-    },
-    "keyset": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "HKey",
-            "repo": "keyset",
-            "sha256": "1kkp3frsk644djmdwxq3l1m88690gch3g8pijlzv566xrwkd903j",
-            "rev": "0a186c3316fda5baa72ae1fdf50c31e00761cc21"
-        },
-        "recipe": {
-            "sha256": "1kfw0pfb6qm2ji1v0kb8xgz8q2yd2k9kxmaz5vxcdixdlax3xiqg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150219.2330",
-        "deps": [
-            "cl-lib",
-            "dash"
-        ]
-    },
-    "editorconfig-fnmatch": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "editorconfig",
-            "repo": "editorconfig-emacs",
-            "sha256": "04sflhamh5b9gxllfhcqdim02x6cb9xid39al2lisb8z4xywch68",
-            "rev": "5132b7a9441af76196ba3e62d73a0bb415853e4f"
-        },
-        "recipe": {
-            "sha256": "0ji243vrw527jc3alsgmqi9rdnslxyq48zzx33rbpkqcjssm11iv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151208.1035",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "plantuml-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wildsoul",
-            "repo": "plantuml-mode",
-            "sha256": "0jvs051ncpv7pwx2kr14fm1wqakabwc031xcv7lba0mx7shxzqdg",
-            "rev": "4bc4cdf7974c8b8956b848ef69f1a2b5767597aa"
-        },
-        "recipe": {
-            "sha256": "0fg313mx9jz92lf9lr5apvma9ixfz02dvyzw1phsgzawi7hai264",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131031.1832",
-        "deps": [
-            "auto-complete"
-        ]
-    },
-    "anything-git-files": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarao",
-            "repo": "anything-git-files-el",
-            "sha256": "0gj0p7420wx5c186kdccjb9icn656sg5b0zwnwy3fjvhsbbvrb2r",
-            "rev": "efeec4f8001e2a95f36a9c31181bb30f7561015c"
-        },
-        "recipe": {
-            "sha256": "13giasg8lh5968plva449ki9nc3478a63700f8c0yghnwjb77asw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130609.443",
-        "deps": [
-            "anything"
-        ]
-    },
-    "smart-compile": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/smart-compile.el",
-            "sha256": "0sm4nxynwhwypzw008fz56axai9lrphjczwzfdy7da3akan18rbd"
-        },
-        "recipe": {
-            "sha256": "0vgxqyzl7jw2j96rmjw75b5lmjwrvzajrdvfyabss4xmv96dy2r3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150519.1147",
-        "deps": []
-    },
-    "git-gutter-fringe+": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nonsequitur",
-            "repo": "git-gutter-fringe-plus",
-            "sha256": "1rsj193zpblndki4khjjlwl2njxb329d42l75ki55msxifqrn4fi",
-            "rev": "7a2f49d2455a3a872e90e5f7dd4e6b27f1d96cfc"
-        },
-        "recipe": {
-            "sha256": "1zkjb8p08cq2nqskn79rjszlhp9mrblplgamgi66yskz8qb1bgcc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140729.603",
-        "deps": [
-            "fringe-helper",
-            "git-gutter+"
-        ]
-    },
-    "encourage-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "halbtuerke",
-            "repo": "encourage-mode.el",
-            "sha256": "0k5ns40s5nskn0zialwq96qll1v5k50lfa5xh8hxbpcamsfym6h8",
-            "rev": "99edacf2d94d168d3da0609860dc7253db7c9815"
-        },
-        "recipe": {
-            "sha256": "0fwn6w7s61c08z0d8z3awclqrhszia9is30gm2kx4hwr9dhhwh63",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151128.305",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "milkode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ongaeshi",
-            "repo": "emacs-milkode",
-            "sha256": "1qg64mxsm2cswk52mlj7sx7k6gfnrsdwnf68i7cachri0i8aq4ap",
-            "rev": "ba97e2aeefa1d9d0b3835bf08edd0de248b0c513"
-        },
-        "recipe": {
-            "sha256": "07v6xgalx7vcw5sghckwvz584746cba05ql8flv8n556glm7hibh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140927.29",
-        "deps": []
-    },
-    "palette": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/palette.el",
-            "sha256": "13k1l2cs45fiwd0zayjfzxxrx1pqds3mkxrflmxy8y0piwx6mr1w"
-        },
-        "recipe": {
-            "sha256": "1v6dsph18rqfbvda2c25mqgdwap2a4zrg6qqq57n205zprpcwxc0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150509.1607",
-        "deps": [
-            "hexrgb"
-        ]
-    },
-    "egg": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "byplayer",
-            "repo": "egg",
-            "sha256": "1ryb7smvf66hk307yazkjn9bqzbwzbyyb5db200fq6j2zdjwsmaj",
-            "rev": "499894195528203cfcf309228bf7578dd8cd5698"
-        },
-        "recipe": {
-            "sha256": "144g1fvs2cmn3px0a98nvxl5cz70kx30v936k5ppyi8gvbj0md5i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150208.2015",
-        "deps": []
-    },
-    "aok": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/aok.el",
-            "sha256": "10vdmxzifxx3fkpyg76ngnj79k3d2pq0f322rd8ssc66alxhkz3g"
-        },
-        "recipe": {
-            "sha256": "1nkkbfwqp5r44wjwl902gm0xc8p3d2qj5mk1cchilr2rib52zd46",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130824.627",
-        "deps": []
-    },
-    "quack": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsmirror",
-            "repo": "quack",
-            "sha256": "0q7krn16dja0ifnc8h587lh5nilwbixxgsh5179clx5l57naix62",
-            "rev": "ce00cb151dde121e156c9543949d088d5ddafdbb"
-        },
-        "recipe": {
-            "sha256": "1l7jw8sx2llbzp3sg5755qdhhyq8jdaggxzzn7icjxxrmj1ji6ii",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130126.1823",
-        "deps": []
-    },
-    "jaword": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "jaword",
-            "sha256": "1430xwd86fdlv1gzkdlp9a0x3w4blbplw24z0m7y8b0j9rhl4fka",
-            "rev": "a96bc63a08f616cc23dcc43d565e1f22a94aa9f3"
-        },
-        "recipe": {
-            "sha256": "05pzh99zfl8n3p6lxdd9abr52m24hqcb105458i1cy0ra840bf4d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150325.918",
-        "deps": [
-            "tinysegmenter"
-        ]
-    },
-    "greymatters-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mswift42",
-            "repo": "greymatters-theme",
-            "sha256": "14c09m9p6556rrf0qfad4zsv7qxa5flamzg6fa83cxh0qfg7wjbp",
-            "rev": "a7220a8c6cf18ccae2b76946b6f01188a7c9d5d1"
-        },
-        "recipe": {
-            "sha256": "10cxajyws5rwk62i4vk26c1ih0dq490kcfx7gijw38q3b5r1l8nr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150621.623",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "ample-zen-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mjwall",
-            "repo": "ample-zen",
-            "sha256": "18z9jl5d19a132k6g1dvwqfbbdh5cx66b2qxlcjsfiqxlxglc2sa",
-            "rev": "b277bb7abd4b6624e8d59f02474b79af50a007bd"
-        },
-        "recipe": {
-            "sha256": "0xygk80mh05qssrbfj4h6k50pg557dyj6kzc2pdlmnr5r4gnzdn3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150119.1554",
-        "deps": []
-    },
-    "at": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "at-el",
-            "sha256": "0rnnvr8x1czphbinby2z2dga7ikwgd13d7zhgmp3ggamzyaz6nf1",
-            "rev": "114dfe3761bf0c9dd89f794106c3a6a436ed06cc"
-        },
-        "recipe": {
-            "sha256": "0w91qx955z67w2yh8kf86b58bb3b6s6490mmbky8467knf2q83qz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140707.720",
-        "deps": [
-            "emacs",
-            "queue"
-        ]
-    },
-    "osx-clipboard": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joddie",
-            "repo": "osx-clipboard-mode",
-            "sha256": "1ykn48src7qhx9cmpjkaqsz7h36p75kkq1h9wlcpv5fhaky2d4n4",
-            "rev": "e46dd31327a3f92f77b013b4c9b1e5fdd0e5c73d"
-        },
-        "recipe": {
-            "sha256": "0gjgr451v6rlyarz96v6h8kfbvkk7npvhgvkgwdi0bjighrhlv4f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141012.217",
-        "deps": []
-    },
-    "ac-c-headers": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "ac-c-headers",
-            "sha256": "1z6rj15p5gjv0jwnnck8789n9csf1pwxfvsz37graihgfy2khj0y",
-            "rev": "de13a1d35b311e6601556d8ef163de102057deea"
-        },
-        "recipe": {
-            "sha256": "1cq5rz2w79bj185va7y13x7bciihrpsvyxwk6msmcxb4g86s9phv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151021.334",
-        "deps": [
-            "auto-complete"
-        ]
-    },
-    "tern": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "marijnh",
-            "repo": "tern",
-            "sha256": "07b96yjv8jns8d18mciqchpfbhcd8w0lgy3p4msl24rk4hmv56z7",
-            "rev": "f585fe7d6f4da28770fdd3dc7ddf88a39ad9b105"
-        },
-        "recipe": {
-            "sha256": "06bgwizn9dcd8hsvimjvb28j0mpxg7rrv9knhv5kkdapa6gggxif",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151123.853",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "json"
-        ]
-    },
-    "helm-swoop": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ShingoFukuyama",
-            "repo": "helm-swoop",
-            "sha256": "1dixg0yik08ad9qwcfis9vkg1h7zwqsisfr1zlgzabpzzm822mmd",
-            "rev": "d953ad605c989c40da5bc0fcb2953104ea7210e6"
-        },
-        "recipe": {
-            "sha256": "1fqbhj75hcmy7c2vdd0m7fk3m34njmv5s6k1i9y94djpbd13i3d8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151022.1950",
-        "deps": [
-            "emacs",
-            "helm"
-        ]
-    },
-    "skeletor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chrisbarrett",
-            "repo": "skeletor.el",
-            "sha256": "0kbgxjfdf88h7hfds1kbdxx84wvkvy773r98ym1fzfm54m2kddvq",
-            "rev": "8dffccd773d6c8e73ea3d9c1de689634cbf427d4"
-        },
-        "recipe": {
-            "sha256": "1vfvg5l12dzksr24dxwc6ngawsqzpxjs97drw48qav9dy1vyl10v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151220.2254",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "emacs",
-            "f",
-            "let-alist",
-            "s"
-        ]
-    },
-    "css-comb": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "channikhabra",
-            "repo": "css-comb.el",
-            "sha256": "0ljhar80kk7k54jz1xiq4r0w6s1wkacl7qz9wkvvbzhjb0z049hq",
-            "rev": "980251dc5d3ce0e607498f8a793f6d67a77d9cda"
-        },
-        "recipe": {
-            "sha256": "1axwrvbc3xl1ixhh72bii3hhbi9d96y6i1my1rpvwqyd6f7wb2cf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150502.1528",
-        "deps": []
-    },
-    "counsel": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "swiper",
-            "sha256": "1262k48ky88m3jgdryyxm9dqzsd2lc17vcra93lp3yrr6iqn55dl",
-            "rev": "d74fab4a5b98910bd09956d3cb9b3376d6287840"
-        },
-        "recipe": {
-            "sha256": "0y8cb2q4mqvzan5n8ws5pjpm7bkjcghg5q19mzc3gqrq9vrvyzi6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151227.301",
-        "deps": [
-            "emacs",
-            "swiper"
-        ]
-    },
-    "visual-fill-column": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joostkremers",
-            "repo": "visual-fill-column",
-            "sha256": "126qm63ik1n1agvcp4mgk1gr7dnnyjif8zbw0l336q74d5cy6h6w",
-            "rev": "043485d16a645c8c6df5d82bc77b8fc155a818aa"
-        },
-        "recipe": {
-            "sha256": "19y0pwaybjal2rc7migdbnafpi4dfbxvrzgfqr8dlvd9q68v08y5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151121.1751",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "popup-imenu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ancane",
-            "repo": "popup-imenu",
-            "sha256": "0pkaic2l0xk2nsqcvxgxqbk152hd42h21j3z1ldgmpy1162viw7z",
-            "rev": "2a03162d9439d80f2eeca1fac14215af0d1b77e2"
-        },
-        "recipe": {
-            "sha256": "0lxwfaa9vhdn55dj3idp8c3fg1g26qsqq46y5bimfd0s89bjbaxn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151219.1909",
-        "deps": [
-            "dash",
-            "flx-ido",
-            "popup"
-        ]
-    },
-    "google-c-style": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "google",
-            "repo": "styleguide",
-            "sha256": "16dm5kllj64aibwp6gq4gywz4dwqhx4x9wznwn2wl9gmvkfgkmd6",
-            "rev": "e1333014b5ffec70af81ace136c830856d13683e"
-        },
-        "recipe": {
-            "sha256": "10gsbg880jbvxs4291vi2ww30ird2f313lbgcb11lswivmhrmd1r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140929.1318",
-        "deps": []
-    },
-    "android-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "remvee",
-            "repo": "android-mode",
-            "sha256": "1ms338qq17nwivpq8c1xsnld5k532rfhgvfxx1zg3l8wrjh235d2",
-            "rev": "80629ff38e4c2f72ba1dbebd4a0abadb94d8a231"
-        },
-        "recipe": {
-            "sha256": "1nqrvq411yg4b9xb5cvc7ai7lfalwc2rfhclzprvymc4vxh6k4cc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150106.744",
-        "deps": []
-    },
-    "efire": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "capitaomorte",
-            "repo": "efire",
-            "sha256": "1c2iyv392ap35nss4j901h33d3lx9lmq5v43flf2rid1766pam6v",
-            "rev": "91a644662afb352475efad0b377713656f131e5c"
-        },
-        "recipe": {
-            "sha256": "1c8vdc58i0k7vvanwhckfc31226d3rb5xq77lh9ydgnd4i97gq2w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151009.1531",
-        "deps": [
-            "circe"
-        ]
-    },
-    "highlight-escape-sequences": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dgutov",
-            "repo": "highlight-escape-sequences",
-            "sha256": "14sf81bwah9q5mjhh1aiicq4b280kfqa7m34mpnwkig3l8xy7ryg",
-            "rev": "083954e5c39b2cc10cfc12192099e76e2b84b072"
-        },
-        "recipe": {
-            "sha256": "0938b29cqapid9v9q4w2jwh8kdb0p70qwzy9xm2nxaairm7436d6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150729.2110",
-        "deps": []
-    },
-    "hl-indent": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ikirill",
-            "repo": "hl-indent",
-            "sha256": "17apqs7yqd89mv5283kmwp7byaaimj7j0vis0z1d89jlmp8i6zbc",
-            "rev": "e749f726ce589e04bb508160e7b290b61fb64d75"
-        },
-        "recipe": {
-            "sha256": "1z42kcwcyinjay65mv042ijh4xfaaiyri368g0sjw0fflsg0ikcr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141227.1530",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "undercover": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sviridov",
-            "repo": "undercover.el",
-            "sha256": "1qm6fzgmrdzhkajd60l4l890dlbxll96x41kx36wm97h4gz7aiyw",
-            "rev": "7b38281c21a0ed9f7260d58aca6b4b2471672cfd"
-        },
-        "recipe": {
-            "sha256": "1s30c3i6y4r3mgrrs3lda3rrwmy9ff11ihdmshyziv9v5879sdjf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150817.1210",
-        "deps": [
-            "dash",
-            "emacs",
-            "shut-up"
-        ]
-    },
-    "dklrt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "davidkeegan",
-            "repo": "dklrt",
-            "sha256": "063nnln5m42qf190vr2z0ibacyn7n0xkxm3v5vaa4gxdvdwzhshs",
-            "rev": "5d6c99f8018335256ab934b4c1049708ae2d48ba"
-        },
-        "recipe": {
-            "sha256": "11ss5x9sxgxp1wx2r1m0vsp5z5qm8m4ww20ybr6bqjw0a1gax561",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131110.741",
-        "deps": [
-            "dkmisc",
-            "emacs",
-            "ledger-mode"
-        ]
-    },
-    "clojure-quick-repls": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "symfrog",
-            "repo": "clojure-quick-repls",
-            "sha256": "1vgahik2q2sn6vqm9wg5b9jc74mkbc1md8pl69apz4cg397kjkzr",
-            "rev": "b543c6c35bb1bacb278f92a6e0f4d2128c0c3db9"
-        },
-        "recipe": {
-            "sha256": "10glzyd4y3918pwp048pc1y7y7fa34fkqckn1nbys841dbssmay0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150814.236",
-        "deps": [
-            "cider",
-            "dash"
-        ]
-    },
-    "rase": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "m00natic",
-            "repo": "rase",
-            "sha256": "1i16361klpdsxphcjdpxqswab3ing69j1wb9nygws7ghil85h0bx",
-            "rev": "59b5f7e8102570b65040e8d55781c7ea28de7338"
-        },
-        "recipe": {
-            "sha256": "1g7v2z7l4csl5by64hc3zg4kgrkvv81iq30mfqq4nvy1jc0xa6j0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120928.1545",
-        "deps": []
-    },
-    "js2-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mooz",
-            "repo": "js2-mode",
-            "sha256": "17bpfi6ppmbx1q23qa89jnwnh465s54gl1vp4djy9arqir76hwsc",
-            "rev": "73c0348bf964c956aa5a9f2aeb0415bb9a65198c"
-        },
-        "recipe": {
-            "sha256": "0f9cj3n55qnlifxwk1yp8n1kfd319jf7qysnkk28xpvglzw24yjv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151130.605",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "yabin": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "d5884",
-            "repo": "yabin",
-            "sha256": "0f6pvwzhncycw8gnjy24h6q1qglfgvdjfs5dzqx9s43j3yg63lzm",
-            "rev": "db8c404507560ef9147fcce2b94cd706fbfa03b5"
-        },
-        "recipe": {
-            "sha256": "1kmpm2rbb43c9cgp44qwd24d90mj48k3gyiir3vb6zf6k3syrc17",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140205.2151",
-        "deps": []
-    },
-    "symon-lingr": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "symon-lingr",
-            "sha256": "030bglxnvrkf1f9grbhd8n11j4c6sxpabpjdr1ryx522v01fvx8j",
-            "rev": "056d1a473e36992ff5881e5ce6fdc331cead975f"
-        },
-        "recipe": {
-            "sha256": "0kyhmw25cn10b4jv2yx7bvp8zkwcswiidpk4amyaisw25820gkv1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150719.842",
-        "deps": [
-            "cl-lib",
-            "symon"
-        ]
-    },
-    "zones": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/zones.el",
-            "sha256": "0fr6lbx62qa8acqa4s4wrg0nlga2pm3vy04j17wyhcxdjszan4yd"
-        },
-        "recipe": {
-            "sha256": "08sl7i7cy22nd1jijc5l7lp75k9z83gfr8q41n72l0vxrpdasc9w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150908.1438",
-        "deps": []
-    },
-    "window-end-visible": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "window-end-visible",
-            "sha256": "0g69r64gyz4p3k6n8l0i1837mszycbrp23acnp0iy0y3mg67x3pn",
-            "rev": "525500fb2ebc08f3f9ea493972e5f2e1d79f89ef"
-        },
-        "recipe": {
-            "sha256": "1p78n7yysj18404cdc6vahfrzwn5pixyfnja8ch48rj4fm4jbxwq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140508.1541",
-        "deps": []
-    },
-    "dic-lookup-w3m": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "http://svn.sourceforge.jp/svnroot/dic-lookup-w3m/",
-            "sha256": "0lg6i9vw6xsnaamfjczz0cr41vlv1bs03h8c8y2jxpdkgaab31nc",
-            "rev": "79"
-        },
-        "recipe": {
-            "sha256": "0myv7sns9ajyr7fzn6kd8a64pfapjdksgby5ilh9mr99imm8dcfv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140513.1941",
-        "deps": [
-            "stem",
-            "w3m"
-        ]
-    },
-    "spacegray-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bruce",
-            "repo": "emacs-spacegray-theme",
-            "sha256": "1a8jp7m9zarvljg5d9c8ydir3qcmwx05c3frs696p9nwvapf6lsb",
-            "rev": "7f70ee36297e5ccf9bc90b1f81472024f5a7a749"
-        },
-        "recipe": {
-            "sha256": "0khiddpsywpv9qvynpfdmybd80lbrhm68j3py6ranxlv7p79j9dx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150719.1431",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "multi-compile": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ReanGD",
-            "repo": "emacs-multi-compile",
-            "sha256": "004c4fbf5rrxvs01imv43lwvw5k9ndk02mk29q0w45s230gfca8x",
-            "rev": "61a4a7b35cd78773305150f533f51587367378db"
-        },
-        "recipe": {
-            "sha256": "16fv0hpwcjw1771zlbgznph0fix9fbm6yqj2rcz1f9l26iih6apz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151111.1640",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "scratch-log": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mori-dev",
-            "repo": "scratch-log",
-            "sha256": "030mcq0cmamizvra8jh2x76f71g5apiavwb10c28j62rl0r5bisk",
-            "rev": "1168f7f16d36ca0f4ddf2bb98881f8db62cc5dc0"
-        },
-        "recipe": {
-            "sha256": "1yp3p0dzhmqrd0krqii3x79k4zc3p59148cijhk6my4n1xqnhs69",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141115.143",
-        "deps": []
-    },
-    "clmemo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ataka",
-            "repo": "clmemo",
-            "sha256": "0za8j7pwcmvjm2ls62z9f8sjryzzsmms4slikzixc0rxyiqnqyd1",
-            "rev": "553d62f80b6c3e0f281e09d377d490795bdcaabf"
-        },
-        "recipe": {
-            "sha256": "03qa79ip0gqinj1kk898lcvixk98hf6gknz0yc2fnqcrm642k2vs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150220.747",
-        "deps": []
-    },
-    "rbenv": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "senny",
-            "repo": "rbenv.el",
-            "sha256": "0yd0rs6fnc6lsfi7pivw5sivh698055r8ifj9vrxb82dcx2y6v2h",
-            "rev": "2ea1a5bdc1266caef1dd77700f2c8f42429b03f1"
-        },
-        "recipe": {
-            "sha256": "09nw7sz6rdgs7hdw517qwgzgyrdmxb16sgldfkifk41rhiyqhr65",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141120.149",
-        "deps": []
-    },
-    "org-agenda-property": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "org-agenda-property",
-            "sha256": "15xgkm5p30qfghyhkjivh5n4770794qf4pza462vb0xl5v6kffbm",
-            "rev": "3b469f3e93de0036547f3631cd0366d53f7584c8"
-        },
-        "recipe": {
-            "sha256": "0zsjzjw52asl609q7a2s4jcsm478p4cxzhnd3azyr9ypxydjf6qk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140626.1616",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "standoff-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lueck",
-            "repo": "standoff-mode",
-            "sha256": "1fn97aw91g02hgz5c9dvnxh4zdd9wrdhs44s0gnj570za1m4cbiv",
-            "rev": "09b4b2dfeadf0b9c2f3e2897be5e9b728c07b9b6"
-        },
-        "recipe": {
-            "sha256": "127bzpm1cz103f1pb860yqrh7mr0rdaivrm9p6ssd01kchl9nskp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150628.1842",
-        "deps": []
-    },
-    "phi-rectangle": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "phi-rectangle",
-            "sha256": "0d2c579rg8wdfmn94nzaix9332jch4wlr939jszls330s38d0iv4",
-            "rev": "0c12716afc71d803d1f39417469521dc465762d9"
-        },
-        "recipe": {
-            "sha256": "08yw04wmbgbbr60i638m0rspfwn3cp47ky5ssgjcgcmmdgg9yfvy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151208.54",
-        "deps": []
-    },
-    "dart-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nex3",
-            "repo": "dart-mode",
-            "sha256": "1pd7a76znzypwi0khssdlas5kcma8r865d68jmr3n6xvwdmy8dlc",
-            "rev": "1b7562262c83de94a5118ffc55b495dae8aa7367"
-        },
-        "recipe": {
-            "sha256": "0wxfh8v716dhrmx1klhpnsrlsj66llk8brmwryjg2h7c391sb5ff",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150721.1854",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "flycheck"
-        ]
-    },
-    "peek-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "erikriverson",
-            "repo": "peek-mode",
-            "sha256": "11nv6pll0zj9dkgzlzgav39a6x3sfi7kvfhwm96fa3iy4v8bixrb",
-            "rev": "55a7dd011375330c7d57322257a5167516702c71"
-        },
-        "recipe": {
-            "sha256": "07wcnh3jmp2gi9xhd3d8i2n0pr2g9kav497nnz94i85awhzf8fi4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130620.1446",
-        "deps": [
-            "elnode"
-        ]
-    },
-    "disk": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/disk.el",
-            "sha256": "1c0pgqvl1z2f5hprszln53pn2v2pqy110r3wx3g84v71w6378bbv"
-        },
-        "recipe": {
-            "sha256": "0bij9gr4zv6jmc6dwsy3lb06vsxvmyzl8xrm8wzasxisk1qd2l6n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20081128.906",
-        "deps": []
-    },
-    "refheap": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Raynes",
-            "repo": "refheap.el",
-            "sha256": "08kzi2jcfqnlanqzvbk5gq1if7k8qc9gmz5bmvd2mvmx6z436398",
-            "rev": "d41f8efb8e913b29035f545914859e3f18287492"
-        },
-        "recipe": {
-            "sha256": "0pzark1db9k2pavd5sn89a28gd9j5jlkx3wkhwfzln3y5c1wnvdk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140902.1602",
-        "deps": [
-            "json"
-        ]
-    },
-    "navorski": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "roman",
-            "repo": "navorski.el",
-            "sha256": "0g7rmvfm0ldv0d2x7f8k761mgmi47siyspfi1ns40ijhkpc15x8l",
-            "rev": "698c1c62da70164aebe9a7a5d034778fbc30ea5b"
-        },
-        "recipe": {
-            "sha256": "0dnzpsm0ya8rbcik5wp378hc9k7gjb3gwmkqqj889c38q5cdwsx7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141203.1224",
-        "deps": [
-            "dash",
-            "multi-term",
-            "s"
-        ]
-    },
-    "info+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/info+.el",
-            "sha256": "1c95876j5ya0na5rf7dlxchhawl85k25bjxh02kqcsrdirc1q86g"
-        },
-        "recipe": {
-            "sha256": "0flpmi8dsaalg14xd86xcr087j51899sm8ghsa150ag4g4acfggr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150914.1636",
-        "deps": []
-    },
-    "manage-minor-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ShingoFukuyama",
-            "repo": "manage-minor-mode",
-            "sha256": "10wl7kc76dyijrmdlcl5cx821jg7clsj35r22955mbbgh7zl1x07",
-            "rev": "1bed33b0752380b548b822fe72e6858c5fe70c8e"
-        },
-        "recipe": {
-            "sha256": "11jdj8kd401q0y8bbyyn72f27f51bckqid10dnh64z8w7hv59cw6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140310.1100",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "yasnippet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "capitaomorte",
-            "repo": "yasnippet",
-            "sha256": "1pdyrs0cv688s39vqd20dgnvlddd8x1gj7lzzlpwr47fz8zxfm9i",
-            "rev": "71f0142edae6196535bfc27b79f317dc7a12ea1d"
-        },
-        "recipe": {
-            "sha256": "1j6hcpzxljz1axh0xfbwr4ysbixkwgxawsvsgicls8r8kl2xvjvf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151212.2333",
-        "deps": []
-    },
-    "erc-crypt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "atomontage",
-            "repo": "erc-crypt",
-            "sha256": "1hzp42x6f73wsjr5n01i3dzsfrl5pym2l53rzlca11prcccvklfr",
-            "rev": "5d548bab298a27ca5886392c129b14d0e93067be"
-        },
-        "recipe": {
-            "sha256": "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151030.1257",
-        "deps": []
-    },
-    "log4e": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "log4e",
-            "sha256": "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022",
-            "rev": "6592682ab7de0e3d1915aa4d3c53e083be79fbeb"
-        },
-        "recipe": {
-            "sha256": "1klj59dv8k4r0hily489dp12ra5hq1jnsdc0wcakh6zirmakhs34",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150105.705",
-        "deps": []
-    },
-    "graphviz-dot-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ppareit",
-            "repo": "graphviz-dot-mode",
-            "sha256": "12r6a3hikzqcdbplmraa4p4w136c006yamylxfjf8580v15xngrf",
-            "rev": "ca0f15158c3bbd516549532be1dd35bc51462c84"
-        },
-        "recipe": {
-            "sha256": "04rkynsrsk6w4sxn1pc0b9b6pij1p7yraywbrk7qvv05fv69kri2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151127.821",
-        "deps": []
-    },
-    "pcomplete-extension": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thierryvolpiatto",
-            "repo": "pcomplete-extension",
-            "sha256": "0h0p4c08z0dqxmg55fzch1d2f38rywfk1j0an2f4sc94lj7ckbm6",
-            "rev": "839740c90de857e18db2f578d6660951522faab5"
-        },
-        "recipe": {
-            "sha256": "0m0c9ir44p21rj93fkisvpvi08936717ljmzsr4qdf69b3i54cwc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140604.1147",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "melpa-upstream-visit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "laynor",
-            "repo": "melpa-upstream-visit",
-            "sha256": "12cp56ppmwpdgf5afx7hd2qb8d1qq8z27191fbbf5zqw8cq5zkpd",
-            "rev": "7310c74fdead3c0f86ad6eff76cf989e63f70f66"
-        },
-        "recipe": {
-            "sha256": "0j4afy9ipzr7pwkij8ab207mabd7srganlyyif9h1hvclj9svdmf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130720.533",
-        "deps": [
-            "s"
-        ]
-    },
-    "php+-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "echosa",
-            "repo": "phpplus-mode",
-            "sha256": "0f1n0jcla157ngqshq5n8iws216ar63ynjd6743cbdrzj0v030wg",
-            "rev": "e66950502e7c9a9cd39c9a619ad66fc54c12aafa"
-        },
-        "recipe": {
-            "sha256": "1ibcsky6la3l7gawpgx814w1acjf73b68i6wbb4p6saxhwg6adik",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121129.1452",
-        "deps": []
-    },
-    "col-highlight": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/col-highlight.el",
-            "sha256": "1gs30lb038f01czrr1d95ngwvc53pd6sfq2vhcspq8d12062lx6n"
-        },
-        "recipe": {
-            "sha256": "1kycjdlrg7a5x37b0pzqhg56yn7kaisryrk303qx1084kwq9464i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1534",
-        "deps": [
-            "vline"
-        ]
-    },
-    "paxedit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "promethial",
-            "repo": "paxedit",
-            "sha256": "1bjv3ny1bicqk6kwy9g607kj6wc3r8kdf8yfj1jynmf5xa4wwdnw",
-            "rev": "7a69ff07d97955fb5412ba1d5259810609e3bca0"
-        },
-        "recipe": {
-            "sha256": "06ymilr0zrwfpyzql7dcpg48lhkx73f2jlaw3caxgsjaz7x3n4ic",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150405.1808",
-        "deps": [
-            "cl-lib",
-            "paredit"
-        ]
-    },
-    "e2wm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiwanami",
-            "repo": "emacs-window-manager",
-            "sha256": "1lx0c7s810x6prf7x1lnx412gll8nn8gqpmi56n319n406cxhnhw",
-            "rev": "71543ce4502bdb09c888e24b3a80e47786785b88"
-        },
-        "recipe": {
-            "sha256": "0dp360jr3fgxqywkp7g88cp02g37kw2hdsc0f70hjak9n3sy03la",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150608.1923",
-        "deps": [
-            "window-layout"
-        ]
-    },
-    "helm-emmet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yasuyk",
-            "repo": "helm-emmet",
-            "sha256": "0c3mn5w98phsv7gsljyp5vxxmr2w6n3nczh5zm4hcpwsra3wh1v9",
-            "rev": "b4e0618773d9fdfbf0ed03d24a53d26285c51b91"
-        },
-        "recipe": {
-            "sha256": "1dkn9qa3dv2im11lm19wfh5jwwwp42sv7jc0p6qg35rhzwdpfg03",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131014.129",
-        "deps": [
-            "emmet-mode",
-            "helm"
-        ]
-    },
-    "xmlgen": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "philjackson",
-            "repo": "xmlgen",
-            "sha256": "1nk50iwb6az01r1s2l9wwdqrz3k4ywr00q0zmd9vvi3y9v4cjah0",
-            "rev": "d27294a4174888fe452015cb98dedd2a4bdc1e92"
-        },
-        "recipe": {
-            "sha256": "1mvnjqb9zxf9ml605w10v4cbbajwv9if93apr4xrh79l00scj383",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130219.419",
-        "deps": []
-    },
-    "drupal-spell": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "arnested",
-            "repo": "drupal-spell",
-            "sha256": "156cscpavrp695lp8pgjg5jnq3b8n9c2h8qg8w89dd4vfkc3iikd",
-            "rev": "a69f5e3b62c4c0da74ce26c1d00d5b8f7395e4ae"
-        },
-        "recipe": {
-            "sha256": "117rr2bfnc99g3qsr127grxwaqp54cxjaj3nl2nr6z78nja0fij3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130520.1155",
-        "deps": []
-    },
-    "helm-chronos": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dxknight",
-            "repo": "helm-chronos",
-            "sha256": "1dmj4f8pris1i7wvfplp4dbnyfm403l6rplxfrfi0cd9afg7m68i",
-            "rev": "a14fc3d65dd96ce6616234b3f7b8b08b4c1817ef"
-        },
-        "recipe": {
-            "sha256": "1a65b680741cx4cyyizyl2c3bss36x3j2m9sh9hjc87xrzarg0s3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150528.1536",
-        "deps": [
-            "chronos",
-            "helm"
-        ]
-    },
-    "expand-line": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cheunghy",
-            "repo": "expand-line",
-            "sha256": "0wz4h5hrr5ci0w8pynd2nr1b2zl5hl4pa8gc16mcabik5927rf7z",
-            "rev": "75a5d0241f35dd0748ab8ecb4ff16891535be372"
-        },
-        "recipe": {
-            "sha256": "07nfgp6jlrb9wxqy835j79i4g88714zndidkda84z16qn2y901a9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151005.2107",
-        "deps": []
-    },
-    "org-ac": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "org-ac",
-            "sha256": "1xckin2d6s40kgr2293g72ipc57f8gp6y63303kmqcv3qm8q13ca",
-            "rev": "9cbbda79e2fe964ded3f39cf7a2e74f1be3d6b9a"
-        },
-        "recipe": {
-            "sha256": "059jr3v3558cgw626zbqfwmwwv5f4637ai26h7b6psqh0x9sf3mr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140302.613",
-        "deps": [
-            "auto-complete-pcmp",
-            "log4e",
-            "yaxception"
-        ]
-    },
-    "omnisharp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "OmniSharp",
-            "repo": "omnisharp-emacs",
-            "sha256": "1iq8yzjv7wb0jfi3lqqyx4n7whvb7xf8ls0q0w7pgsrsslrxbwcm",
-            "rev": "725796278fa8a391e244f2e50676dd6d6b67585d"
-        },
-        "recipe": {
-            "sha256": "0dwya22y92k7x2s223az1g8hmrpfmk1sgwbr9z47raaa8kd52iad",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151210.1314",
-        "deps": [
-            "auto-complete",
-            "cl-lib",
-            "csharp-mode",
-            "dash",
-            "flycheck",
-            "json",
-            "popup",
-            "s"
-        ]
-    },
-    "project-local-variables": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/project-local-variables.el",
-            "sha256": "1bb5b6hxg3gvwf0sqwkd97nnipsmr60py0rnsfhgvizn4cj3khhw"
-        },
-        "recipe": {
-            "sha256": "0mrf7p420rmjm8ydwc5blpxr6299pdg3sy3jwz2zz0420gkp0ihl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20080502.1152",
-        "deps": []
-    },
-    "company-racer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-pe",
-            "repo": "company-racer",
-            "sha256": "1lk3fqsgbi6mg4hrpc9gy4hbfp9snyj4yvc0zh8iqqw5nx12dab4",
-            "rev": "c31f7cab8c2f9c376ff0bd48e56dbc30a32e4b00"
-        },
-        "recipe": {
-            "sha256": "0zc8dzvsjz5qsrwhv7x9f7djzvb9awacc3pgjirsv8f8sp7p3am4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150628.2133",
-        "deps": [
-            "cl-lib",
-            "company",
-            "deferred",
-            "emacs"
-        ]
-    },
-    "lang-refactor-perl": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jplindstrom",
-            "repo": "emacs-lang-refactor-perl",
-            "sha256": "135k7inkvdz51j7al3nndaamrkyn989vlv1mxcp8lwx8cgq0rqfj",
-            "rev": "691bd69639de6b7af357e3b7143563ececd9c497"
-        },
-        "recipe": {
-            "sha256": "02fv25d76rvxqzxs48j4lkrifdhqayyb1in05ryyz2pk9x5hbax9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131122.1527",
-        "deps": []
-    },
-    "top-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/top-mode.el",
-            "sha256": "0a5rl1cgznycqwx4r48mh69lgm8ixbnlfzbqdyvclgm8fldbannn"
-        },
-        "recipe": {
-            "sha256": "0hrjlbiz827v9yf4086wlghw64rhvvlsbzv8lzs6pprdwbpr9pdx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130605.1239",
-        "deps": []
-    },
-    "gnuplot-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mkmcc",
-            "repo": "gnuplot-mode",
-            "sha256": "1pss9a60dh6i277pkp8j5g1v5h7qlh11w2fki50qcp0zglyw1kaq",
-            "rev": "296ff8d263513cdfb8e85b06e2441c751565b793"
-        },
-        "recipe": {
-            "sha256": "1avpik06cmi4h6v6039c64b4zw1r1nsg3nrryl254gl881pysfxg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151123.139",
-        "deps": []
-    },
-    "show-css": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "smmcg",
-            "repo": "showcss-mode",
-            "sha256": "0n38dbyw039lpdxzbhngndqfhcfgsx570bpflrb5wdh2mq5w57md",
-            "rev": "1b8c330644c06e6d99ec5da8a9722c918b2ea039"
-        },
-        "recipe": {
-            "sha256": "1b3n8h39m85inxsqvzwgb9fqnqn2sgib91hrisn1gpgfyjydzkr7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140816.1208",
-        "deps": [
-            "dom"
-        ]
-    },
-    "picolisp-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "flexibeast",
-            "repo": "picolisp-mode",
-            "sha256": "0p91ysyjksbravnw3l78mshay6swgb5k1zi5bbppppk8zkmdp115",
-            "rev": "1a537b14090813f46cbba54636d40365e1a8067e"
-        },
-        "recipe": {
-            "sha256": "1n56knbapyfs8n23arzlz27y0q4846r64krwlwh8agfqkcdw9dp5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150516.355",
-        "deps": []
-    },
-    "highlight-numbers": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "highlight-numbers",
-            "sha256": "0ffhc5s0h34064bix4qyiiyx30m4hpv0phmxwcrwiyvanj9ggfai",
-            "rev": "e1245b27a732ec43c1562f825533fe147759d24e"
-        },
-        "recipe": {
-            "sha256": "1bywrjv9ybr65mwkrxggb52jdqn16z8acgs5vqm0faq43an8i5yv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150531.807",
-        "deps": [
-            "emacs",
-            "parent-mode"
-        ]
-    },
-    "flash-region": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "flash-region",
-            "sha256": "0z77lm6jv2w5z551pwarcx6xg9kx8fgms9dlskngfvnzbqkldj1f",
-            "rev": "261b3597b23cdd40e5c14262a5687bcc6c1d0901"
-        },
-        "recipe": {
-            "sha256": "1rgg7j34ka0nj1yjl688asim07bbz4aavh67kly6dzzwndr0nw8c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130923.1317",
-        "deps": []
-    },
-    "org-toodledo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "org-toodledo",
-            "sha256": "014337wimvzy0rxh2p2c647ly215zcyhgym2hcljkdriv15cafna",
-            "rev": "2c91a92bd07ae4a546771b018a6faa0e06399968"
-        },
-        "recipe": {
-            "sha256": "0c7qr0jsc4iyrwkc22xp9nmk6984v7q1k0rvpd62m07lb5gvbiq3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150301.513",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "request-deferred"
-        ]
-    },
-    "occur-context-resize": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dgtized",
-            "repo": "occur-context-resize.el",
-            "sha256": "161lsgpzlrfzsn3pzcwhwj46ns088frjm0dps9jbc4bzqbpsd293",
-            "rev": "78263b8907569695773e9acaa375ce0cb3245f10"
-        },
-        "recipe": {
-            "sha256": "0sp5v4rwqgqdj26gdkrmjvkmbp4g6jq4lrn2c3zm8s2gq0s3l6ri",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140826.1449",
-        "deps": []
-    },
-    "evil-surround": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "timcharper",
-            "repo": "evil-surround",
-            "sha256": "15vy2l6q0zm50wknw4fnz2v3j81p77y4ya7clk66lia3qdca4z9v",
-            "rev": "9f1ab3c302d585c3489f0429b904e7e6e3204e94"
-        },
-        "recipe": {
-            "sha256": "1bcjxw0yrk2bqj5ihl5r2c4id0m9wbnj7fpd0wwmw9444xvwp8ag",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151210.1418",
-        "deps": []
-    },
-    "dts-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bgamari",
-            "repo": "dts-mode",
-            "sha256": "0cafvhbpfqd8ajqg2757fs64kryrl2ckvbp5abldb4y8fa14pb9l",
-            "rev": "6ec1443ead16105234765f9b48df9b4aca562e61"
-        },
-        "recipe": {
-            "sha256": "1k8cbiayajbzwkm0s0kyin0qpq9yhymidz0srs4hbvsnb6hvp234",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150403.1804",
-        "deps": []
-    },
-    "js2-highlight-vars": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "unhammer",
-            "repo": "js2-highlight-vars.el",
-            "sha256": "1gad5a18m3jfhnklsj0ka3p2wbihh1yvpcn7mwlmm7cjjxcaly9g",
-            "rev": "5857999e6a376810816a0bee71f6d235ffe8911d"
-        },
-        "recipe": {
-            "sha256": "07bq393g2jy8ydvaqyqn6vdyfvyminvgi239yvwzg5g9a1xjc475",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150914.308",
-        "deps": [
-            "js2-mode"
-        ]
-    },
-    "processing-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ptrv",
-            "repo": "processing2-emacs",
-            "sha256": "1smw786dcjvdn2j6bwqn2rfzhw039rrhxiv7vlrgzm0fyy2v1q6h",
-            "rev": "a57415e523c9c3faeef02fa62a2b749270c4cc33"
-        },
-        "recipe": {
-            "sha256": "184yg9z14ighz9djg53ji5dgnb98dnxkkwx55m8f0f879x31i89m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150217.632",
-        "deps": []
-    },
-    "csharp-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "josteink",
-            "repo": "csharp-mode",
-            "sha256": "1bp4bsghvmar6kvwiarxz4fnh0bikkyjnw30x796d1hi7jdk3ll9",
-            "rev": "b11fcda620aed46fbd4e702ee565448af26a1b25"
-        },
-        "recipe": {
-            "sha256": "17j84qrprq492dsn103dji8mvh29mbdlqlpsszbgfdgnpvfr1rv0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.1524",
-        "deps": []
-    },
-    "evil-avy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "louy2",
-            "repo": "evil-avy",
-            "sha256": "1q6znbnshk45mdglx519qlbfhb7g47qsm245i93ka4djsjy55j9l",
-            "rev": "2dd955cc3ecaa7ddeb67b295298abdc6d16dd3a5"
-        },
-        "recipe": {
-            "sha256": "1hc96dd78yxgr8cs9sk9y1i5h1qnyk110vlb3wnlxv1hwn92qvrd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150908.248",
-        "deps": [
-            "avy",
-            "cl-lib",
-            "emacs",
-            "evil"
-        ]
-    },
-    "evil-mc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gabesoft",
-            "repo": "evil-mc",
-            "sha256": "0w5z644hx5h9rscq13aqgmbr4mlx2dx3p1q7qhc0jkffhmckk09k",
-            "rev": "a56f83460a6a90dc504f5935b0ab105810a41179"
-        },
-        "recipe": {
-            "sha256": "0cq4xg6svb5gz4ra607wy768as2igla4h1xcrfnxldknk476fqqs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151128.2032",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "evil"
-        ]
-    },
-    "bbdb-csv-import": {
-        "fetch": {
-            "tag": "fetchFromGitLab",
-            "owner": "iankelling",
-            "repo": "bbdb-csv-import",
-            "sha256": "1h9vi9wb3dzzjrw5zfypk60afzzshxa3qmnbc24ypby5dr7qy91l",
-            "rev": "7739d10ebe1787a72aa74085e9baedd0f4988b00"
-        },
-        "recipe": {
-            "sha256": "0r7pc2ypd1ydqrnvcqmsg69rm047by7k0zhm563538ra82597wnm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140802.642",
-        "deps": [
-            "bbdb",
-            "dash",
-            "pcsv"
-        ]
-    },
-    "all-ext": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/all-ext.el",
-            "sha256": "10j70bwa28xpmqwigvls76jg6vz0iky88lmkq4pk35bg3rz09r4m"
-        },
-        "recipe": {
-            "sha256": "1zi266cm5hpfhnnnzbsm4s1w0lsy4sj5z8d020y0cg57yn2v62dv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130824.706",
-        "deps": [
-            "all"
-        ]
-    },
-    "cherry-blossom-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "inlinestyle",
-            "repo": "emacs-cherry-blossom-theme",
-            "sha256": "0m97xr6lddy2jdmd4bl4kbp2568p4n110yfa9k7fqc20ihq8jkyd",
-            "rev": "eea7653e00f35973857ee23b27bc2fae5e753e50"
-        },
-        "recipe": {
-            "sha256": "1i3kafj3m7iij5mr0vhg45zdnkl9pg9ndrq0b0i3k3mw7d5siq7w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150621.2242",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "wanderlust": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wanderlust",
-            "repo": "wanderlust",
-            "sha256": "1181fhazm2r9j9w3yc6cjm0j0lwgv94pz15qsdmg31z43w55l0qk",
-            "rev": "912c443a912e037d898941397b747d3325aa01b3"
-        },
-        "recipe": {
-            "sha256": "0lq7fvqc0isv49lcm7ql6prc3hpcj5cx4kf8f4gcnfv5k8159cq9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151118.1727",
-        "deps": [
-            "semi"
-        ]
-    },
-    "private": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cheunghy",
-            "repo": "private",
-            "sha256": "0zng64f5vwnpkf9fk59yv1ndc646q608a6awr1y9qk0mhzbfzhqm",
-            "rev": "9266d01c095895cc3ee9de95bc20511e88353755"
-        },
-        "recipe": {
-            "sha256": "1glpcwcyndyn683q9mg99hr0h3l8pz7rrhbnfak01v826d5cnk9g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150121.1957",
-        "deps": [
-            "aes"
-        ]
-    },
-    "jquery-doc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ananthakumaran",
-            "repo": "jquery-doc.el",
-            "sha256": "0gh2bgmsbi9lby89ssvl49kpz07jqrfnyg47g6b9xmf5rw42s1z9",
-            "rev": "24032284919b942ec27707d929bdd8bf48420062"
-        },
-        "recipe": {
-            "sha256": "0pyg90izdrb9mvpbz9nx21mp8m3svqjnz1jr8i7wqgfjxsxdklxj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150812.258",
-        "deps": []
-    },
-    "mallard-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jhradilek",
-            "repo": "emacs-mallard-mode",
-            "sha256": "18x3cssfn81k8hg4frj7dhzphg784321z51wbbvn3bjhq7s6j3a2",
-            "rev": "c48170c1ace4959abcc5fb1df0d4cb149cff44c1"
-        },
-        "recipe": {
-            "sha256": "0y2ikjgy107kb85pz50vv7ywslqgbrrkcfsrd8gsk1jky4qn8izd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131203.2225",
-        "deps": []
-    },
-    "i2b2-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "danlamanna",
-            "repo": "i2b2-mode",
-            "sha256": "17k41rah17l9kf7bvlm83x71nzz4aizgn7254cl5sb59mdhcm8pm",
-            "rev": "db10efcfc8bed369a516bbf7526ede41f98cb95a"
-        },
-        "recipe": {
-            "sha256": "172qnprmfliic3rszzg3g7q015i3dchd23skrbdikg0kxj5c57lf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140709.2004",
-        "deps": []
-    },
-    "ess-R-object-popup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "ess-R-object-popup.el",
-            "sha256": "0q8pbaa6wahli6fh0kng5zmnypsxi1fr2bzs2mfk3h8vf4nikpv0",
-            "rev": "7e1f601bfba72de0fda44d9c82f96028ecbb9948"
-        },
-        "recipe": {
-            "sha256": "1dxwgahfki6d6ywh85ifk3kq6f2a1114kkd8xcv4lcpzqykp93zj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130302.536",
-        "deps": [
-            "ess",
-            "popup"
-        ]
-    },
-    "solarized-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bbatsov",
-            "repo": "solarized-emacs",
-            "sha256": "1xws08ppzh5mz7s0j0pv393zk0hr10vdcb5hya5kfscq8wvkf4p1",
-            "rev": "7a43652689de5188198c77715e2dbc111de760bf"
-        },
-        "recipe": {
-            "sha256": "15d8k32sj8i11806byvf7r57rivz391ljr0zb4dx8n8vjjkyja12",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151211.735",
-        "deps": [
-            "cl-lib",
-            "dash"
-        ]
-    },
-    "tab-group": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarao",
-            "repo": "tab-group-el",
-            "sha256": "0lfvgbgvsm61kv5mcjnhnfjcnr7fy1015y0hndkf9xvdlw4hahr4",
-            "rev": "5a290ec2608e4100fb188fd60ecb77affcc3465b"
-        },
-        "recipe": {
-            "sha256": "1i5lxpf3wmqnqj9mzgcn4gp1gjxp737awrzl1dml5wnarbbj4fs9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140306.850",
-        "deps": []
-    },
-    "pig-snippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "motus",
-            "repo": "pig-mode",
-            "sha256": "1yg9n265ljdjlh6a3jrjwyvj3f76wp68x25bl0p8dxrrsyr9kvfx",
-            "rev": "af4200c88a50264b63fa162a02860f3f54c8755b"
-        },
-        "recipe": {
-            "sha256": "1sqi0a2dsqgmabkrncxiyrhibyryyy25d11b15ybhlngd05wqbx2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130913.124",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "closure-lint-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "r0man",
-            "repo": "closure-lint-mode",
-            "sha256": "0v0wdq0b5jz4x0d7dl3ilgf3aqp2hk375db366ij6gxwd0b9i3na",
-            "rev": "bc3d2fd5c35580bf1b8af43b12484c95a343b4b5"
-        },
-        "recipe": {
-            "sha256": "1xmi1gjgayd5xbm3xx721xv57ns3x56r8ps94zpwyf2znpdchqfy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20101118.1524",
-        "deps": []
-    },
-    "helm-jstack": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "raghavgautam",
-            "repo": "helm-jstack",
-            "sha256": "0vhqpcv8xi6a6q7n6xxahdzijr1x5s40fvk9nc44q55psbyv627g",
-            "rev": "2064f7215dcf4ccbd6a7b8784223251507746da4"
-        },
-        "recipe": {
-            "sha256": "0giix1rv2jrmdxyg990w90ivl8bvgbbvah6nkpj7gb6vbnm15ldz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150602.2322",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "helm"
-        ]
-    },
-    "osx-trash": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lunaryorn",
-            "repo": "osx-trash.el",
-            "sha256": "1l231168bjqz6lwzs0r9vihxi53d46csrr2gq7g33lg1zm3696ah",
-            "rev": "a8fe326624e27a0e128c68940c7a9efb001ceee6"
-        },
-        "recipe": {
-            "sha256": "1f6pi53mhp2pvrfjm8544lqqj36gzpzxq245lzvv91lvqkxr9ysj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150723.935",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "org-readme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "org-readme",
-            "sha256": "1q3s12s0ll7jhrnd3adkaxv7ff69ppprv0pyl5f6gy8y51y63k8d",
-            "rev": "4cb9f768d282a2835b4510b6504ff9ede487007d"
-        },
-        "recipe": {
-            "sha256": "1qqbsgspd006gy0kc614w7bg6na0ygmflvqkmw47899pbgj81hxh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151204.617",
-        "deps": [
-            "cl-lib",
-            "header2",
-            "http-post-simple",
-            "lib-requires",
-            "yaoddmuse"
-        ]
-    },
-    "org2jekyll": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ardumont",
-            "repo": "org2jekyll",
-            "sha256": "064kw64w9snm0lbshxn8d6yd9xvyislhg37fmhq1w7vy8lm61xvf",
-            "rev": "a12173b9507b3ef54dfebb5751503ba1ee93c6aa"
-        },
-        "recipe": {
-            "sha256": "1j9d6xf5nsakifxwd4zmjc29lbj46ffn3z109k2y2yhz7q3r9hzv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150906.847",
-        "deps": [
-            "dash-functional",
-            "deferred",
-            "s"
-        ]
-    },
-    "pastels-on-dark-theme": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "https://gist.github.com/1974259.git",
-            "sha256": "c53b4f2c7449bf74648c091f249c33da3ddd8f621474a8901745b4e985cb26ab",
-            "rev": "854839a0b4bf8c3f6a7d947926bf41d690547002"
-        },
-        "recipe": {
-            "sha256": "0zdr29793gg229r47yjb3plagxc9pszqyy4sx81ffp3rpdf0nlbh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120304.1222",
-        "deps": []
-    },
-    "bing-dict": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cute-jumper",
-            "repo": "bing-dict.el",
-            "sha256": "0yjywdzrbp821d4krv1jxnpwpb156j020mzvmv4pkkd0l1ivzk7m",
-            "rev": "4d8713c0134b3b44cb7607802bb06a7be9a9a202"
-        },
-        "recipe": {
-            "sha256": "0s5pd08rcnvmgi1hw17xbzvswlv0yni6h2h2gccrjmf6izi8whh1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151216.1954",
-        "deps": []
-    },
-    "django-manage": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gopar",
-            "repo": "django-manage",
-            "sha256": "15i25zh54b2fqji0qmkg502051ymccih6pgqnzq02c43dpnsqhqv",
-            "rev": "91ce758c830f06b33b7d04cc66dd5ec131bd4398"
-        },
-        "recipe": {
-            "sha256": "0j95g7fps28xhlrikkg61xgpbpf52xb56swmns2qdib6x1xzd6rh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151025.130",
-        "deps": [
-            "hydra"
-        ]
-    },
-    "ctable": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiwanami",
-            "repo": "emacs-ctable",
-            "sha256": "07vasdlai49qs0nsmq2cz1kcq1adqyarv8199imgwwcbh4vn7dqb",
-            "rev": "cd673a09a80ce4e9e102ffe2e3d7e6bfb9d652b0"
-        },
-        "recipe": {
-            "sha256": "040qmlgfvjc1f908n52m5ll2fizbrhjzbd0kgrsw37bvm3029rx1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140304.1859",
-        "deps": []
-    },
-    "elscreen": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knu",
-            "repo": "elscreen",
-            "sha256": "055kam18k4ni1zw3310cpsvdnrp62d579r30lq67ig2lq3yxzc1m",
-            "rev": "249653a4a4b47c9b6306c2c29fa3753bc7342e61"
-        },
-        "recipe": {
-            "sha256": "1mlqbw14ilk6d3ba38kfw50pnlhb9f6sm5hy9dw58gp59siark5s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151025.2000",
-        "deps": []
-    },
-    "highlight-indent-guides": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DarthFennec",
-            "repo": "highlight-indent-guides",
-            "sha256": "10m1cr5plzsxbq08lck4c2w0whcdrnl9h2qm4bbr9srhnpry7fxj",
-            "rev": "4473af2bbeb80d50681a64b66f5891262cf52346"
-        },
-        "recipe": {
-            "sha256": "00ghp677qgb5clxhdjarfl8ab3mbp6v7yfsldm9bn0s14lyaq5pm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151112.1427",
-        "deps": []
-    },
-    "ivs-edit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kawabata",
-            "repo": "ivs-edit",
-            "sha256": "1926pyfsbr6j7cn3diq8ibs0db94rgsf0aifvbqrqp4grs85pkva",
-            "rev": "c496e85f93f6f00e723d9df0ea0703f6c672826b"
-        },
-        "recipe": {
-            "sha256": "0gzhvzrfk17j2vwlg82f5ifk4dcfc1yv7barcij38ckran8cqmb2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140720.546",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "emacs"
-        ]
-    },
-    "typing": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/typing.el",
-            "sha256": "0mgvpdp3vlvjy32d163h2mzsf9j2ij2f542sdr3rsy8l80n6nx31"
-        },
-        "recipe": {
-            "sha256": "0b72lbzji105wzvsi58l6pjc08qcwrm5ddf42irdxi956081pzp3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121026.1618",
-        "deps": []
-    },
-    "pcmpl-git": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "leoliu",
-            "repo": "pcmpl-git-el",
-            "sha256": "03ckgbp38fmsmh9wxjqpw97p2vkaqq7l63yg3lc6xczjqj12m5dk",
-            "rev": "2db904452b7367a9bf84a926e886945fc9128fad"
-        },
-        "recipe": {
-            "sha256": "12y9pg1g4i1ghnjvgfdpa6p84h4bcqrr23y9bazwl9n6aj20cmxk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140218.2004",
-        "deps": []
-    },
-    "leuven-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fniessen",
-            "repo": "emacs-leuven-theme",
-            "sha256": "1kbvpf3wvma6r2gxd0zmz1j6clgr3xfsvsrbh900j5k5f1w8r8jx",
-            "rev": "94d12f81c5103e01b57f125581c5337ef883433c"
-        },
-        "recipe": {
-            "sha256": "0pm5majr9cmj6g4zr7vb55ypk9fmfbvxx78mgmgignknbasq9g9a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151218.1750",
-        "deps": []
-    },
-    "snippet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pkazmier",
-            "repo": "snippet.el",
-            "sha256": "1nyrfbjrg74wrqlh8229rf7ym07k2a0wscjm0kbg3sam9ryc546y",
-            "rev": "11d00dd803874b93836f2010b08bd2c97b0f3c63"
-        },
-        "recipe": {
-            "sha256": "1lgpw69k5a82y70j7nximdj0bl5nzr4jhjr5fkx1cvz8hhvgdz6j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130210.1715",
-        "deps": []
-    },
-    "ess": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-ess",
-            "repo": "ESS",
-            "sha256": "1j2i8n34kn6lkz70fc4c0sk0sxv348a61asc3wbz55a2hvys8z0a",
-            "rev": "837454b76475a4eb3256e288fe4149a927faefa9"
-        },
-        "recipe": {
-            "sha256": "02kz4fjxr0vrj5mg13cq758nzykizq4dmsijraxv46snvh337v5i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151217.744",
-        "deps": [
-            "julia-mode"
-        ]
-    },
-    "ocp-indent": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "OCamlPro",
-            "repo": "ocp-indent",
-            "sha256": "0ydmjgxzdxbrzfz3zal1m3hnlxanldx8japapafpa9k8fm02rgnr",
-            "rev": "930f05acdf3ca6783e48a4729761996d27c8c009"
-        },
-        "recipe": {
-            "sha256": "0wc4z9dsnnyr24n3vg1npvc3rm53av8bpbvrl8kldxxdiwgnbkjw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150914.332",
-        "deps": []
-    },
-    "uuid": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nicferrier",
-            "repo": "emacs-uuid",
-            "sha256": "0r74gw8gcbrr62rvj4anz0c3n6kwi1xpb42d3pkzlh4igblhi5zj",
-            "rev": "1519bfeb0e31602b840bc8dd35d7c7e732c159fe"
-        },
-        "recipe": {
-            "sha256": "13xjnawir9i83j2abxxkl12gz3wapgbk56cps3qyfgql02bfk2rw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120910.351",
-        "deps": []
-    },
-    "launch": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sfllaw",
-            "repo": "emacs-launch",
-            "sha256": "0ciycsqzyj6ld60c7sfqjq59ln3jvk3w9vy606kqzpcvj01ihmv1",
-            "rev": "e7c3b573fc05fe4d3d322389079909311542e799"
-        },
-        "recipe": {
-            "sha256": "043gwz583pa1wv84fl634p1v86lcsldsw7qkjbm6y678q5mms0m6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130619.1704",
-        "deps": []
-    },
-    "hoa-pp-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hoaproject",
-            "repo": "Contributions-Emacs-Pp",
-            "sha256": "0g2r4d0ivbadqw1k8jsv0jwv8krpfahsg0qmzyi909p2yfddqk1l",
-            "rev": "925b79930a3f4377b0fb2a36b3c6d5566d4b9a8e"
-        },
-        "recipe": {
-            "sha256": "01ijfn0hd645j6j88rids5dsanmzwmky37slf50yqffnv69jwvla",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151027.236",
-        "deps": [
-            "emacs",
-            "names"
-        ]
-    },
-    "eldoc-extension": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/eldoc-extension.el",
-            "sha256": "13ncpp3hrwk0h030c5nnm2zfiingilr5b876jsf2wxmylg57nbch"
-        },
-        "recipe": {
-            "sha256": "0azkdx4ncjhb7qyhyg1a5pxgqqf2z1wq9iz802j0nxxnjzh9ny24",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140306.845",
-        "deps": []
-    },
-    "2048-game": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/zck/2048.el",
-            "sha256": "1p9qn9n8mfb4z62h1s94mlg0vshpzafbhsxgzvx78sqlf6bfc80l",
-            "rev": "ea6c3bce8ac1"
-        },
-        "recipe": {
-            "sha256": "0z7x9bnyi3qlq7l0fskb61i6yr9gm7w7wplqd28wz8p1j5yw8aa0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151026.1433",
-        "deps": []
-    },
-    "mag-menu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chumpage",
-            "repo": "mag-menu",
-            "sha256": "1flamyk7z3r723cczqra0f4yabc6kmgwjaw2bvs3kisppqmmz72g",
-            "rev": "9b9277021cd09fb1dba64b1d2a00705d20914bd6"
-        },
-        "recipe": {
-            "sha256": "1r1yisjnqxl9llpf91rwqp4q47jc4qp32xnkl8wzsgr0r2qf5yk2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150505.1350",
-        "deps": [
-            "splitter"
-        ]
-    },
-    "seethru": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Benaiah",
-            "repo": "seethru",
-            "sha256": "0qd462qbqdx53xh3ddf76chiljxf6s43r28v2ix85gsig7nm5pgr",
-            "rev": "d87e231f99313bea75b1e69e48c0f32968c82060"
-        },
-        "recipe": {
-            "sha256": "1lcwslkki9s15xr2dmh2iic4ax8ia0j20hjnjmkv612wv04b806v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150218.1229",
-        "deps": [
-            "shadchen"
-        ]
-    },
-    "helm-w32-launcher": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "helm-w32-launcher",
-            "sha256": "0xlz9rxx7y9pkrzvxmv42vgys5iwx75zv9g50k8ihwc08z80dhcq",
-            "rev": "3e59ad62b89dd21d334af0203d445a83eb25dc5b"
-        },
-        "recipe": {
-            "sha256": "0bzn2vhspn6lla815qxwsl9gwfyiwgwmnysr6rjpyacmi17d73ri",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141223.1414",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "helm"
-        ]
-    },
-    "org-iv": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kuangdash",
-            "repo": "org-iv",
-            "sha256": "1n7l70pl9x6mh7dyyiihg4zi1advzlaq2x7vivhas1i2120884i6",
-            "rev": "c45e5ab30183f7b1934f636758750ee2f8a05346"
-        },
-        "recipe": {
-            "sha256": "1akhabp6mdw1h7zms6ahlfvwizl07fwsizwxpdzi4viggfccsfwx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151213.914",
-        "deps": [
-            "cl-lib",
-            "impatient-mode",
-            "org"
-        ]
-    },
-    "ac-ispell": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-ac-ispell",
-            "sha256": "1cq73bdv3lkn8v3nx6aznygqaac9s5i7pvirl8wz9ib31hsgwpbk",
-            "rev": "22bace7387e9012002a6a444922f75f9913077b0"
-        },
-        "recipe": {
-            "sha256": "1vsy2qjh60n5lavivpqhhcpg5pk8zz2r0wy1sb65capn841zdi67",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151031.2126",
-        "deps": [
-            "auto-complete",
-            "cl-lib"
-        ]
-    },
-    "buffer-buttons": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rpav",
-            "repo": "buffer-buttons",
-            "sha256": "1p5a29bpjqr1gs6sb6rr7y0j06nlva23wxkwfskap25zvjpgwbvq",
-            "rev": "2feb8494fa7863b98256bc85da670d74a3a8a975"
-        },
-        "recipe": {
-            "sha256": "1p0ydbrff9197sann3s0d7hpav7r9g461w4llncafmy31w7m1dn6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150106.839",
-        "deps": []
-    },
-    "alect-themes": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alezost",
-            "repo": "alect-themes",
-            "sha256": "0hvf7ydd2p3dfk5hqjqcbaajhgihkyvlwvqcr97a8jknznk7hfzp",
-            "rev": "05d7515d936bbf48ad3fa961220f076d2e5d2312"
-        },
-        "recipe": {
-            "sha256": "04fq65qnxlvl5nc2q037c6yb4nf422dfw2913gv6zfh9rdmxsks8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150920.1324",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "evil-exchange": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Dewdrops",
-            "repo": "evil-exchange",
-            "sha256": "1d9hxyplvjmv3hhgkp5snyssmddmca38r5v58bhba9gvk61lfcg9",
-            "rev": "22d9b6ce1b979c0560b32637d0c2b28bf4082d2b"
-        },
-        "recipe": {
-            "sha256": "1mvw7w23yfbfmhzj6wimslbryb0gppryw24ac0wh4fzl9rdcma4r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141128.43",
-        "deps": [
-            "cl-lib",
-            "evil"
-        ]
-    },
-    "markup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "leoc",
-            "repo": "markup.el",
-            "sha256": "1i95b15mvkkki2iq8hysdr7jr1d5nix9jjkh7jz0alvaybqlsnqi",
-            "rev": "5ff4874ce897db146f5fd2b3d32147a0d404e1e5"
-        },
-        "recipe": {
-            "sha256": "0yw4b42nc2n7nanqvj596hwjf0p4qc7x6g2d9g5cwi7975iak8pf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130207.1509",
-        "deps": []
-    },
-    "jira": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/jira.el",
-            "sha256": "18b6hdqk59gnqh4ibq8lj59kbsg5gbyfb7vfcvpgmxjikpl3cgkz"
-        },
-        "recipe": {
-            "sha256": "0cf5zgkxagvka5v6scgyxqx4mz1n7lxbynn3gl2a4s9s64jycsy6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131210.1222",
-        "deps": []
-    },
-    "dired-k": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-dired-k",
-            "sha256": "13xpbbdd190lklz8jmj8nw8qm414kpkij9wrd7a9ws9j1jzj8x6s",
-            "rev": "4c5ae87f0198eaa4789a1fe85e9ef7cf5a8633e7"
-        },
-        "recipe": {
-            "sha256": "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151107.2036",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "stack-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "commercialhaskell",
-            "repo": "stack-ide",
-            "sha256": "0m26b44gdxbpz6v0f27rx1x9frph19ykfvnr6716fnrm074d53ah",
-            "rev": "c1e8416b2beb86c7f50109255d28379ca0b17735"
-        },
-        "recipe": {
-            "sha256": "0s0m2lj40php7bc2i3fy9ikd5rmx4v7zbxfkp9vadmlc5s7w25gf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150923.1023",
-        "deps": [
-            "cl-lib",
-            "flycheck",
-            "haskell-mode"
-        ]
-    },
-    "pcmpl-args": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "JonWaltman",
-            "repo": "pcmpl-args.el",
-            "sha256": "0pwx1nbgciy28rivvrgka46zihmag9ljrs40bvscgd9rkragm4zy",
-            "rev": "2ba03b3125ada8037585e545b88bd85b79da5c37"
-        },
-        "recipe": {
-            "sha256": "0sry4zvr8xmzyygf2m5dms52srkd1apj3i7a3aj23qa8jvndx8vr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120912.24",
-        "deps": []
-    },
-    "eprime-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "AndrewHynes",
-            "repo": "eprime-mode",
-            "sha256": "1wwg46xdb488wxvglwvsy08vznrnmdmmbcvm9vb60dy3gqjmz7cw",
-            "rev": "17a481af26496be91c07139a9bfc05cfe722506f"
-        },
-        "recipe": {
-            "sha256": "0vswjcs24f3mdyw6ai7p21ab8pdn327lr2d6css0a5nrg539cn2g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140513.1316",
-        "deps": []
-    },
-    "legalese": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/legalese.el",
-            "sha256": "0vjf2f5kpmgnw7904jsv2wnn6dcv654v7h1v917wmj72sy941xml"
-        },
-        "recipe": {
-            "sha256": "0xsf3w5h4g7wigrv5kbys7lf9lfv2cab5ch320p74l3l3r2lj9wz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20100119.1548",
-        "deps": []
-    },
-    "tco": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Wilfred",
-            "repo": "tco.el",
-            "sha256": "1krway6iw62dlr4ak3kj9llqh48xjf3d84nlincap7gkrw886l4q",
-            "rev": "d2224bd291e25724b06d8589d4d62d74ed32db24"
-        },
-        "recipe": {
-            "sha256": "0hfrzwjlgynk3mydrpmic9mckak37r22fdglrfas6zdihgrg152f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140412.812",
-        "deps": [
-            "dash",
-            "emacs"
-        ]
-    },
-    "autobookmarks": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "autobookmarks",
-            "sha256": "01q3k8i8vrs7pcr507kh48np0bc6smanh0ald1hv9h4dylkq89k7",
-            "rev": "cec3a2ac60a382ee61996c17bd962bc5a2e45c4b"
-        },
-        "recipe": {
-            "sha256": "11zhg3y9fb5mq67fwsnjrql9mnwkp3hwib7fpllb3yyf2yywc8zp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151120.1645",
-        "deps": [
-            "cl-lib",
-            "dash"
-        ]
-    },
-    "hayoo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "benma",
-            "repo": "hayoo.el",
-            "sha256": "0pjxyhh8a02i54a9jsqr8p1mcqfl6k9b8gv9lnzb242gy4518y3l",
-            "rev": "3ca2fb0c4d5f337d0410c21b2702dd147014e984"
-        },
-        "recipe": {
-            "sha256": "1rqvnv5nxlsyvsa5my1wpfm82sw21s7kfbg80vrjmxh0mwlyv4p9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140831.721",
-        "deps": [
-            "emacs",
-            "json"
-        ]
-    },
-    "dedukti-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rafoo",
-            "repo": "dedukti-mode",
-            "sha256": "1haixiy94r50rfza64dypb7fi256231pf06g6p2il9kyscqg0zz2",
-            "rev": "7d9f459c87c84f1067eb87542da4549de5e38650"
-        },
-        "recipe": {
-            "sha256": "17adfmrhfks5f45ddr6ygjq870ac50vfzc5872ycv414zg0w4sa9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150820.908",
-        "deps": []
-    },
-    "project-persist-drawer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rdallasgray",
-            "repo": "project-persist-drawer",
-            "sha256": "1nq320ph8fs9a197ji4mnw2xa24dld0r1nka476yvkg4azmcc9x8",
-            "rev": "35bbe132a4fab6a0fec15ce6c0fd2fe6a4aa9626"
-        },
-        "recipe": {
-            "sha256": "1jv2y2hcqakyvfibclzm7g4diw0bvsv3a8fa43yf19wb64jm8hdb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151108.622",
-        "deps": [
-            "project-persist"
-        ]
-    },
-    "dos": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/dos.el",
-            "sha256": "0sfmcd1rq6wih9q7d9vkcfrw6gf7309mm7491jx091ij8m4p8ypp"
-        },
-        "recipe": {
-            "sha256": "0cpijbqpci96s0d6rwqz5bbi9b0zkan1bg8vdgib1f87r7g980nc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140808.1635",
-        "deps": []
-    },
-    "pianobar": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "agrif",
-            "repo": "pianobar.el",
-            "sha256": "053jqzl0sp3dnl4919vi30xqrdcpi9jsqx5hndj1bprf7926w11d",
-            "rev": "9193e3888a8097dbe7ee58e4658cc6ec2a76b160"
-        },
-        "recipe": {
-            "sha256": "16vsf2cig9qjbh9s58zb5byjmyghxbsxpzpm5hyyrv251jap1jjn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120128.1501",
-        "deps": []
-    },
-    "image-archive": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-image-archive",
-            "sha256": "0hacg0549vpgx7yyyc748i44zw5y825w1v7nb440wx7sdxp855nb",
-            "rev": "ff33f64d09432a8f5bf1714d4cf750c01626fe98"
-        },
-        "recipe": {
-            "sha256": "0x0lv5dr1gc9bnr3dn26bc9s1ccq2rp8c4a1licbi929f0jyxxfp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150219.18",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "nummm-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "agpchil",
-            "repo": "nummm-mode",
-            "sha256": "1i0yymsx8kin28bkrgwkk9ngsmjh0gh5j4hb0k03bq4fy799f2xx",
-            "rev": "81951e12032274543c5f7a585b29bd93961e94e4"
-        },
-        "recipe": {
-            "sha256": "10khhc6q0zjzrhsv4fgfdbs7qcwi1bgkwq4yqzidqcdndsailyh0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131117.414",
-        "deps": []
-    },
-    "el-spice": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vedang",
-            "repo": "el-spice",
-            "sha256": "1sba405h1sy5vxg4ki631p4979gyaqv8wnwbgca5jp2pm8l3viri",
-            "rev": "65d9ec84b581a5867eebbc58de93958e992ca80d"
-        },
-        "recipe": {
-            "sha256": "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140805.1338",
-        "deps": [
-            "thingatpt+"
-        ]
-    },
-    "package-utils": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Silex",
-            "repo": "package-utils",
-            "sha256": "138l07qmxj4fkvf43f1hdn4skadxb50c023bc5101l3njzmf74wa",
-            "rev": "4a56f411f98fd455556a3f1d6c16a577a22057a2"
-        },
-        "recipe": {
-            "sha256": "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150126.606",
-        "deps": [
-            "epl"
-        ]
-    },
-    "julia-shell": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dennisog",
-            "repo": "julia-shell-mode",
-            "sha256": "0r4ajn3f1c8n0r831ihvzwyzy94aiv0ijqrwhpq0s85cqvzr7pq8",
-            "rev": "3e25a6b2e942dc323512f2530f48cbc8794cfd48"
-        },
-        "recipe": {
-            "sha256": "0182irlvk6nn71zk4j8xjgcqp4bxi7a2dbj44frrssy6018cd410",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151104.1252",
-        "deps": [
-            "julia-mode"
-        ]
-    },
-    "cycbuf": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "martinp26",
-            "repo": "cycbuf",
-            "sha256": "1d5i8sm1xrsp4v4myidfyb40hm3wp7hgva7dizg9gbb7prmn1p5w",
-            "rev": "1079b41c3eb27d65b66d4399959bb6253f84858e"
-        },
-        "recipe": {
-            "sha256": "0gyj48h5wgjawqq3j4hgk5a8d23nffmhd1q53kg7b9vfsda51hbw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131203.1437",
-        "deps": []
-    },
-    "ruby-additional": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "http://svn.ruby-lang.org/repos/ruby/trunk/misc/",
-            "sha256": "0gl8wcnm7pidvd8zy3w5lzxqj0qxs9d932350ncgnmxwfsfzkdk7",
-            "rev": "53351"
-        },
-        "recipe": {
-            "sha256": "0h0cxik8lp8g81bvp06mddikkk5bjdlch2wffcvsvi01is408w4w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20091002.545",
-        "deps": [
-            "emacs",
-            "ruby-mode"
-        ]
-    },
-    "open-junk-file": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/open-junk-file.el",
-            "sha256": "1vjmgayksdgg54b46aqmvhd7a9arjx9p3jyrjs2z9262f6r288lj"
-        },
-        "recipe": {
-            "sha256": "0ybycprs5di9niai4hbmfq4xdacfgrzf1mwq1aj1hi53phl8l4di",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130131.120",
-        "deps": []
-    },
-    "git-commit-insert-issue": {
-        "fetch": {
-            "tag": "fetchFromGitLab",
-            "owner": "emacs-stuff",
-            "repo": "git-commit-insert-issue",
-            "sha256": "0axy8r0cs8mdsxvs57p7gqyp4lpr5a2d49947j8ri7xmxp77jwp1",
-            "rev": "1bdfd1960bc279ca830e034a6708b25493b3f460"
-        },
-        "recipe": {
-            "sha256": "0mhpszm2y178dxgjv3kh2n744hg2kd60h16zbgmjf4f8228xw8j3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151204.619",
-        "deps": [
-            "github-issues",
-            "helm",
-            "projectile",
-            "s"
-        ]
-    },
-    "seeing-is-believing": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jcinnamond",
-            "repo": "seeing-is-believing",
-            "sha256": "19p3zp4cj7ik2gwzc5k6klqc4b8jc2hvm80yhczc5b7k223gp2bv",
-            "rev": "a698443529ea26fba3fd0748fe10439be7721e96"
-        },
-        "recipe": {
-            "sha256": "05aja5xycb3kpmxyi234l50h98f5m1fil6ll4f2xkpxwv31ba5rb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151010.1229",
-        "deps": []
-    },
-    "cdnjs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yasuyk",
-            "repo": "cdnjs.el",
-            "sha256": "0aspci0zg8waa3l234l0f8fjfzm67z2gydfdwwpxksz49sm2s1jk",
-            "rev": "eac2b4d150907aeb2d568327d04775578c82887f"
-        },
-        "recipe": {
-            "sha256": "1clm86n643z1prxrlxlg59jg43l9wwm34x5d88bj6yvix8g6wkb7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140217.1512",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "deferred",
-            "f",
-            "pkg-info"
-        ]
-    },
-    "pdb-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sixpi",
-            "repo": "pdb-mode",
-            "sha256": "1xkkyz7y08jr71rzdacb9v7gk95qsxlsshkdsxq8jp70irq51099",
-            "rev": "855fb18ebb73b5df30c8d7677c2bcd0f361b138a"
-        },
-        "recipe": {
-            "sha256": "1ihkxd15kx5m5xb9yxwz8wqbmyk9iaskry9szzdz1j4gjlczb6hy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150128.1151",
-        "deps": []
-    },
-    "interval-list": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "interval-list",
-            "sha256": "1zv6m24ryls9hvla3hf8wzp6r7fzbxa1lzr1mb0wz0s292l38wjz",
-            "rev": "38af7ecf0a493ad8f487074938a2a115f3531177"
-        },
-        "recipe": {
-            "sha256": "0926z3lxkmpxalpq7hj355cjzbgpdiw7z4s8xdrpa1pi818d35zf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150327.1218",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "emacs"
-        ]
-    },
-    "beginend": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DamienCassou",
-            "repo": "beginend",
-            "sha256": "1hyiz7iwnzbg1616q0w7fndllbnx4m98kakgxn04bsqib5fqk78p",
-            "rev": "c5bfdc3bb77a8c019aa4433cf12d3c45690c27bd"
-        },
-        "recipe": {
-            "sha256": "1y81kr9q0zrsr3c3s14rm6l86y5wf1a0kia6d98112fy4fwdm7kq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150607.1201",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "org-if": {
-        "fetch": {
-            "tag": "fetchFromGitLab",
-            "owner": "elzair",
-            "repo": "org-if",
-            "sha256": "1iyqv34b7q2k73srshcnpvfzcadq47w4rzkqp6m1d3ajk8x2vypq",
-            "rev": "fab602cc1bbee7a4e99c0083e129219d3f9ed2e8"
-        },
-        "recipe": {
-            "sha256": "0h0jdyawz2j4mp33w85z8q77l37qid8palvw5n4z379qa0wr5h96",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150920.1013",
-        "deps": []
-    },
-    "recursive-narrow": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nflath",
-            "repo": "recursive-narrow",
-            "sha256": "1mj7lyadzn3bwig3f9zariq5z4fg6liqnjvfd34yx88xc52nwf33",
-            "rev": "bc0cab88234ca92640d4b8da0d83e132c1897922"
-        },
-        "recipe": {
-            "sha256": "1bx8l8wjxrkv949c73dp93knbn1iwnblcm8iw822mq2mgbgwsa7f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140902.1227",
-        "deps": []
-    },
-    "tidy": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/tidy.el",
-            "sha256": "0psci55a3angwv45z9i8wz8jw634rxg1xawkrb57m878zcxxddwa"
-        },
-        "recipe": {
-            "sha256": "09xb2k3k99hp3m725f31s6hlaxgl4fsaa1dylahxvdfddhbh290m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20111222.1156",
-        "deps": []
-    },
-    "shift-text": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sabof",
-            "repo": "shift-text",
-            "sha256": "13zsws8gq9a8nfk4yzlvfsvqjh9zbnanmw68rcna93yc5nc634nr",
-            "rev": "1be9cbf994000022172ceb746fe1d597f57ea8ba"
-        },
-        "recipe": {
-            "sha256": "1v9zk7ycc8k1qk1cfs2y1knygl686msmlilqy5a7mh0w0z9f3a2i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130831.1155",
-        "deps": [
-            "cl-lib",
-            "es-lib"
-        ]
-    },
-    "vimgolf": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "timvisher",
-            "repo": "vimgolf",
-            "sha256": "1i407ilhmk2qrk66ygbvizq964bdk502x7lvrzs4wxwfr5y8ciyj",
-            "rev": "289bef87963b660c0cf6ea1f648ac2440c609c88"
-        },
-        "recipe": {
-            "sha256": "1hvw2pfa5a984hm6wd33bf6zz6hmlprc6qs3g789dfx91qm890vn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140814.1648",
-        "deps": []
-    },
-    "palimpsest": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "danielsz",
-            "repo": "Palimpsest",
-            "sha256": "1kbja107smdjqv82p84jx13jk1410c9vms89p1iy1jvn7s8g9fiq",
-            "rev": "69fe61494bfd24305bf7e387fa716474918eafa2"
-        },
-        "recipe": {
-            "sha256": "18kklfdlcg982pdrslh0xqa42h28f91bdm7q2zn890d6dcivp6bk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130731.1021",
-        "deps": []
-    },
-    "ac-geiser": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xiaohanyu",
-            "repo": "ac-geiser",
-            "sha256": "02ifz25rq64z0ifxs52aqdz0iz4mi6xvj88hcn3aakkmsj749vvn",
-            "rev": "0e2e36532336f27e3dc3b01fff55ad1a4329817d"
-        },
-        "recipe": {
-            "sha256": "0v558qz1mp8b1bgk8kgdk5sx5mpd353mw77n5b0pw4b2ikzpz2mx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130929.147",
-        "deps": [
-            "auto-complete",
-            "geiser"
-        ]
-    },
-    "git-dwim": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/git-dwim.el",
-            "sha256": "074k1r8rkvyhhwnqy4gnyd7shidxgc25l1xq4hmnwjn13nsyqfnv"
-        },
-        "recipe": {
-            "sha256": "0vdd2cksiqbnxplqbpb16bcmp137fj3p9a7pa0622wx8vd5p0rkr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130130.1550",
-        "deps": []
-    },
-    "hound": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ryoung786",
-            "repo": "hound.el",
-            "sha256": "1gm5nczq5lsxqkfb38ajffg65zwxkfqvqhk33bwnnd00rpa1ix6j",
-            "rev": "26fb047ff4e4c1fe5b66423cb29a7394b9ace665"
-        },
-        "recipe": {
-            "sha256": "0qri6bddd3c4sqvaqvmqw6xg46vwlfi1by3gc9i3izpq4xl1cr1v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150217.1149",
-        "deps": [
-            "cl-lib",
-            "web"
-        ]
-    },
-    "tuareg": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ocaml",
-            "repo": "tuareg",
-            "sha256": "1650j84yvvwci0b8zy40dsdp75ad5f4d9pvkf9kzd47dkafjsyca",
-            "rev": "bc94358eda8b6b1484e9daa83ac884fc0f5427d2"
-        },
-        "recipe": {
-            "sha256": "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151118.851",
-        "deps": [
-            "caml"
-        ]
-    },
-    "twilight-anti-bright-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jimeh",
-            "repo": "twilight-anti-bright-theme",
-            "sha256": "1bj2mpiklqcangjzbnz5wz7klsfvp0x397lidvf42awn7s2aax0n",
-            "rev": "c3a7b4177416031284da73f53b4dddaa27570bd7"
-        },
-        "recipe": {
-            "sha256": "1qfybk5akaxdahmjffqaw712v8d7kk4jqkj3hzp96kys2zv1r6f9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140810.234",
-        "deps": []
-    },
-    "benchmark-init": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dholm",
-            "repo": "benchmark-init-el",
-            "sha256": "058mic9jkwiqvmp3k9sfd6gb70ysdphnb1iynlszhixbrz5w7zs2",
-            "rev": "8e4c32f32ec869fe521fb4d3c0a69406830b4178"
-        },
-        "recipe": {
-            "sha256": "0dknch4b1j7ff1079z2fhqng7kp4903b3v7mhj15b5vzspbp3wal",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150905.438",
-        "deps": []
-    },
-    "octicons": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-octicons",
-            "sha256": "0dp7dhmgrq078rjhpm1cr993qjqz7qgy2z4sn73qw6j55va7d9kw",
-            "rev": "229286a6166dba8ddabc8c4d338798c6cd3cf67d"
-        },
-        "recipe": {
-            "sha256": "02f37bvnc5qvkvfbyx5wp54nz71bqm747mq1p5361sx091lllkxk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151031.2240",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "loc-changes": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rocky",
-            "repo": "emacs-loc-changes",
-            "sha256": "0i0ainawjvfl3qix329hx01x7rxyfin2xgpjk7y5dgmh4p3xhv94",
-            "rev": "58000738accf2f80ea2bf210f7dea5914adb14ee"
-        },
-        "recipe": {
-            "sha256": "1akgij61b2ixpkchrriabwvx68cg4v5r5w9ncjrjh91hskjprfxh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150302.1048",
-        "deps": []
-    },
-    "go-stacktracer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "samertm",
-            "repo": "go-stacktracer.el",
-            "sha256": "0n5nsyfwx2pdlwx6bl35wrfyady5dwraimv92f58mhc344ajd70y",
-            "rev": "a2ac6d801b389f80ca4e2fcc1ab44513a9e55976"
-        },
-        "recipe": {
-            "sha256": "1laz2ggqydnyr7b36ggb7sphlib79dhp7nszw42wssmv212v94cy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150430.1642",
-        "deps": []
-    },
-    "initsplit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dabrahams",
-            "repo": "initsplit",
-            "sha256": "031i0fihcisizip069rdv28nkzvq9krd9sj0lmyq1bj2d8729316",
-            "rev": "ec1d659a8121e874bcc87a2a5e5c3f68f24e5f68"
-        },
-        "recipe": {
-            "sha256": "0n9dk3x62vgxfn39jkmdg8wxsik0xqkprifgvqzyvn8xcx1blyyq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141219.1829",
-        "deps": []
-    },
-    "downplay-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tobias",
-            "repo": "downplay-mode",
-            "sha256": "0s7swvfd7h8r0n3cjmkps6ary9vwg61jylfm4qrkp3idsz6is548",
-            "rev": "4a2c3addc73c8ca3816345c3c11c08af265baedb"
-        },
-        "recipe": {
-            "sha256": "1v6nga101ljzza8qj3lkmkzzl0vvzj4lsh1m69698s8prnczxr9b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151125.1409",
-        "deps": []
-    },
-    "stupid-indent-mode": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "https://gist.github.com/5487564.git",
-            "sha256": "242b90e4c403fbcadd40777cd98899c96aab78b84dea88dfa97583b734c9876b",
-            "rev": "e26ff5a2c4a582c6c1940bbcd204cfeed8e65222"
-        },
-        "recipe": {
-            "sha256": "12y8qxxs04qzy09m734qg0857g4612qdswx2bh9jk7dp886fpd7p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130816.1554",
-        "deps": []
-    },
-    "math-symbols": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kawabata",
-            "repo": "math-symbols",
-            "sha256": "1chyxi096krjbi9zgbrnrkvwgmn4wygnia9m57m0jh4arlbm28la",
-            "rev": "666b1f00d9e106cf2a3a7d58c2262fe9a1404764"
-        },
-        "recipe": {
-            "sha256": "0sx9cgyk56npjd6z78y9cldbvjl5ipl7k1nc1sylg1iggkbwxnqx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151121.1842",
-        "deps": [
-            "helm"
-        ]
-    },
-    "ruby-compilation": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "eschulte",
-            "repo": "rinari",
-            "sha256": "1kg83z10jw4ik0aapv9cjqlvqy31rln2am8vh3f77zh61qha37hx",
-            "rev": "be07b0f42aefa24c5d36c441d1f3f72e64fffaa4"
-        },
-        "recipe": {
-            "sha256": "1x1vpkjpx95sfcjhkx4cafypj0nkbd1i0mzxx3lmcrsmg8iv0rjc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150709.140",
-        "deps": [
-            "inf-ruby"
-        ]
-    },
-    "flycheck-google-cpplint": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "flycheck",
-            "repo": "flycheck-google-cpplint",
-            "sha256": "0fykawnq9ch1vj76rsimwbmn2xxdamsnvbj4ahqaqhq7adb2wyrq",
-            "rev": "dc23300757c6762c018d536a5831aef2486f7a17"
-        },
-        "recipe": {
-            "sha256": "0llrvg6mhcsj5aascsndhbv99122zj32agxk1w6s8xn8ksk2i90b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140806.1125",
-        "deps": [
-            "flycheck"
-        ]
-    },
-    "thing-cmds": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/thing-cmds.el",
-            "sha256": "0216gckb727hhzf230a3m3n9blyaa21djxcc77r4lf7g2h9g0b5m"
-        },
-        "recipe": {
-            "sha256": "133bm2cw9ar6m2amj0rrq4wbj9c3zl61gaprx0vlasxj2cyxs7yw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150630.1632",
-        "deps": [
-            "hide-comnt"
-        ]
-    },
-    "rebox2": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lewang",
-            "repo": "rebox2",
-            "sha256": "1xh9nxqfg9abcl41ni69rnwjfgyfr0pbl55dzyxsbh6sb36r3h8z",
-            "rev": "00634eca420cc48657b81e40e599ff8548083985"
-        },
-        "recipe": {
-            "sha256": "06ra50afjqac9ck1s9gaxy0sqxcb612wzd28s4q4imicqpgfxzjw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121113.700",
-        "deps": []
-    },
-    "alchemist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tonini",
-            "repo": "alchemist.el",
-            "sha256": "1waspq1apxk4l6m9wshhjp44nj1sci1xvk9pah9gy977j74ng0yl",
-            "rev": "2d9c2079c95a0dea0d564576e64dee2e758eea97"
-        },
-        "recipe": {
-            "sha256": "18jxw0zb7y34qbm4bcpfpb2656f0h9grmrbfskgp4ra4q5q3n369",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151210.49",
-        "deps": [
-            "company",
-            "dash",
-            "elixir-mode",
-            "emacs",
-            "pkg-info"
-        ]
-    },
-    "eopengrok": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "youngker",
-            "repo": "eopengrok.el",
-            "sha256": "1yzb7c0pl2hqzr34cp5ryym5k3ab9026kd3njmrlqykcqcjygm7k",
-            "rev": "1e471ee40145e73316ad5a965a44b46edbae68a3"
-        },
-        "recipe": {
-            "sha256": "0756x78113286hwk1i1m5s8xq04gh7zxb4fkmw58lg2ssff8q6av",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151118.109",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "magit",
-            "s"
-        ]
-    },
-    "pretty-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "akatov",
-            "repo": "pretty-mode",
-            "sha256": "0ccqym98c6zdyrparj5n97bpp9rspxb3z5lqfcrjypp0kn04z1ss",
-            "rev": "3e0b88d3db20f89fda2cdce3f54371728dcfd05b"
-        },
-        "recipe": {
-            "sha256": "1zxi4nj7vnchiiz1ndx17b719a1wipiqniykzn4pa1w7dsnqg21f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141207.1352",
-        "deps": []
-    },
-    "function-args": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "function-args",
-            "sha256": "0m7fcw0cswypiwi5abg6vhw7a3agx9vhp10flbbbji6lblb0fya8",
-            "rev": "25e447d8a8930a8c515077de57a7693c6a642514"
-        },
-        "recipe": {
-            "sha256": "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151022.751",
-        "deps": [
-            "swiper"
-        ]
-    },
-    "dayone": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mori-dev",
-            "repo": "emacs-dayone",
-            "sha256": "084alwm2kvq1ilfyrqqfni1xbihx3dzrihykl98vv8ldqvw8kn95",
-            "rev": "046771dcb58f6cd9d21a67b3627075d739d3ed4d"
-        },
-        "recipe": {
-            "sha256": "0hi09dj00h6g5r84jxglwkgbijhfxknx4mq5gcl5jzjis5affk8l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131117.455",
-        "deps": [
-            "ht",
-            "mustache",
-            "uuid"
-        ]
-    },
-    "splitjoin": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-splitjoin",
-            "sha256": "1qdy9nc2h7mwxh7zg2p1x7yg96hxkwxqimjp6zb1119jx0s8grjc",
-            "rev": "e2945ee269e6e90f0243d6f2a33e067bb0a2873c"
-        },
-        "recipe": {
-            "sha256": "0l1x98fvvia8qx8g125h4d76slv0xnb3h1zxiq9xb5qh7a1h069l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150505.932",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "url-shortener": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yuyang0",
-            "repo": "url-shortener",
-            "sha256": "118c23dsfgkhwhv65dx3wbg2dn7qyrd80d78cykl732c68d6wvi0",
-            "rev": "2ce3fedbdc44f778f28a5a08f06958bc5dccae88"
-        },
-        "recipe": {
-            "sha256": "12r01dyk55bs01jk0ab9f24lfvm63h8kvix223pii5y9890dr6ys",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150806.113",
-        "deps": []
-    },
-    "frame-restore": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lunaryorn",
-            "repo": "frame-restore.el",
-            "sha256": "0n6jhm1198c8slvdymsfjif0dfx3wlf8q4mm0yvpiln46shhwldx",
-            "rev": "6346cf157d5e1b487a16839d998258b7e693cbc8"
-        },
-        "recipe": {
-            "sha256": "0b321iyf57nkrm6xv8d1aydivrdapdgng35zcnrg298ws2naysvm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140811.1609",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "fortune-cookie": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "andschwa",
-            "repo": "fortune-cookie",
-            "sha256": "1kk04hl2y2svrs07w4pq9f4g7vs9qzy2qpw9prvi1gravmnfrzc4",
-            "rev": "9bf0d29358989e1aee61c472bd5204b9bdf46465"
-        },
-        "recipe": {
-            "sha256": "0xg0zk7hnyhnbhqpxnzrgqs5yz0sy6wb0n9982qc0pa6jqnl9z78",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151111.35",
-        "deps": []
-    },
-    "link": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myrkr",
-            "repo": "dictionary-el",
-            "sha256": "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm",
-            "rev": "a23b8f4a422d0de69a006ed010eff5795319db98"
-        },
-        "recipe": {
-            "sha256": "17jpsg3f2954b740vyj37ikygrg5gmp0bjhbid8bh8vbz7xx9zy8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140717.2229",
-        "deps": []
-    },
-    "bind-map": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "justbur",
-            "repo": "emacs-bind-map",
-            "sha256": "18i2lq89pay4s58xvybmk7bs9haq5vx217wi25fzxgam6nwnzkhy",
-            "rev": "d47be94d236c819b5ca47d66551d23a0ee17ac33"
-        },
-        "recipe": {
-            "sha256": "1jzkp010b4vs1bdhccf5igmymfxab4vxs1pccpk9n5n5a4xaa358",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151217.1029",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "jumplist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ganmacs",
-            "repo": "jumplist",
-            "sha256": "0ykzvy8034mchq6ffyi7vqnwyrj6gnqqgn39ki81pv97qh8hh8yl",
-            "rev": "c482d137d95bc5e1bcd790cdbde25b7f729b2502"
-        },
-        "recipe": {
-            "sha256": "06xjg1q8b2fwfhfmdkb76bw2id8pgqc61fmwlgri5746jgdmd7nf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151119.2145",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "narrow-indirect": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/narrow-indirect.el",
-            "sha256": "1j50f3kzgrvxf4iznjjwsi4smp7gdp09irz7x3ppv4w2c8apc6j8"
-        },
-        "recipe": {
-            "sha256": "10aq4gssayh3adw8yz2lza1xbypyffi8r03lsc0kiis6gd9ibiyj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1833",
-        "deps": []
-    },
-    "button-lock": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "button-lock",
-            "sha256": "06qjvybf65ffrcnhhbqs333lg51fawaxnva3jvdg7zbrsv4m9acl",
-            "rev": "f9082feb329432fcf2ac49a95e64bed9fda24d58"
-        },
-        "recipe": {
-            "sha256": "1arrdmb3nm570hgs18y9sz3z9v0wlkr3vwa2zgfnc15lmf0y34mp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150223.754",
-        "deps": []
-    },
-    "readline-complete": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "monsanto",
-            "repo": "readline-complete.el",
-            "sha256": "1j5b5xapflwzh8a297gva0l12ralwa9vl5z3bb75c9ksjkhi4nm6",
-            "rev": "30c020c37b2741160cc37e656e13c85d826a0ebf"
-        },
-        "recipe": {
-            "sha256": "1qymk5ypv6ljk8x49z4jcifz7c2dqcg5181f4hqh67g1byvj2277",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150708.937",
-        "deps": []
-    },
-    "fill-column-indicator": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alpaker",
-            "repo": "Fill-Column-Indicator",
-            "sha256": "0gbqspqn4y7f2fwqq8210b6k5q22c0zr7b4ws8qgz9swav8g3vrq",
-            "rev": "0e755319451dd9c6c99c2a2ef82c890ba93343b6"
-        },
-        "recipe": {
-            "sha256": "0w8cmijv7ihij9yyncz6lixb6awzzl7n9qpjj2bks1d5rx46blma",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151030.1433",
-        "deps": []
-    },
-    "mallard-snippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jhradilek",
-            "repo": "emacs-mallard-snippets",
-            "sha256": "0qk7i47nmyp4llwp6x0i1i5dk82ck26iyz1sjvvlihaw8a5akny2",
-            "rev": "70c5293f10722f2ace73bdf74d9a18f95b040edc"
-        },
-        "recipe": {
-            "sha256": "0437qd7q9i32pmhxaz3vi2dnfpj4nddmzgnqpwsgl28slhjw2hv8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131023.1351",
-        "deps": [
-            "mallard-mode",
-            "yasnippet"
-        ]
-    },
-    "ido-gnus": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vapniks",
-            "repo": "ido-gnus",
-            "sha256": "0ifdwd5vnjv2iyb5bnz8pij35lc0ymmyx8j8zhpkbgjigz8f05ip",
-            "rev": "f5fe3f6aa8086f675ba216abace9e3d5f2e3a089"
-        },
-        "recipe": {
-            "sha256": "14ijb8q4s846984h102h72ij713v5bj3k2vfdvr94gw1f0iya2yg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140216.1046",
-        "deps": [
-            "gnus"
-        ]
-    },
-    "farmhouse-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattly",
-            "repo": "emacs-farmhouse-theme",
-            "sha256": "08lgfa2k42qpcs4999b77ycsg76zb56qbcxbsvmg0pcwjwa1ambz",
-            "rev": "a09e7cd5b12542d27474aad7e118c8ede3edbea1"
-        },
-        "recipe": {
-            "sha256": "0hbqdrw6x25b331qhbg3yaaa45c2b896wknsjm0a1kg142klq229",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150506.2327",
-        "deps": []
-    },
-    "serverspec": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k1LoW",
-            "repo": "emacs-serverspec",
-            "sha256": "1h58q41wixjlapia1ggf83jxcllq7492k55mc0fq7hbx3hw1q1y2",
-            "rev": "b6dfe82af9869438de5e5d860ced196641f372c0"
-        },
-        "recipe": {
-            "sha256": "001d57yd0wmz4d7qmhnanac8g29wls0sqw194003hrgirakg82id",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150623.655",
-        "deps": [
-            "dash",
-            "f",
-            "helm",
-            "s"
-        ]
-    },
-    "prognth": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "prognth",
-            "sha256": "1szxsbk470fg3jp70r20va9hnnf4jj0mb7kxdkn6rd7ky6w34lwm",
-            "rev": "2f1ca4d34b1fd581163e1df122c85418137e8e62"
-        },
-        "recipe": {
-            "sha256": "0hr5a3s0ij4hvn424v885z7pcs62yqm9mamw5b096hgjxgjf6ylm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130920.1259",
-        "deps": []
-    },
-    "butler": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "AshtonKem",
-            "repo": "Butler",
-            "sha256": "0pp604r2gzzdpfajw920607pklwflk842difdyl4hy9w87fgc0jg",
-            "rev": "8ceb35737107572455cca9a61ff46b3ff78f1016"
-        },
-        "recipe": {
-            "sha256": "1jv74l9jy55qpwf5np9nlj6a1wqsm3xirm7wm89d1h2mbsfcr0mq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150811.1908",
-        "deps": [
-            "deferred",
-            "emacs",
-            "json"
-        ]
-    },
-    "iflipb": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jrosdahl",
-            "repo": "iflipb",
-            "sha256": "18rlyjsn9w0zbs0c002s84qzark3rrcmjn9vq4nap7i6zpaq8hki",
-            "rev": "2e0d1719abeec7982341761ee5dabb01574e6862"
-        },
-        "recipe": {
-            "sha256": "1nfrrxgi9nlhn477z8ay7jxycpcghhhmmg9dagdhrlrr20fx697d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141123.1516",
-        "deps": []
-    },
-    "ido-complete-space-or-hyphen": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "doitian",
-            "repo": "ido-complete-space-or-hyphen",
-            "sha256": "1aih8n10lcrw0bdgvlrkxzhkpxpmphw07cvbp6zd27ia25037fzw",
-            "rev": "3fe1fe1e1a743f8deb8f4025977647afecd58f14"
-        },
-        "recipe": {
-            "sha256": "1wk0cq5gjnprmpyvhh80ksz3fash42hckvmx8m95crbzjg9j0gbc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130228.408",
-        "deps": []
-    },
-    "bbdb-android": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tumashu",
-            "repo": "bbdb-android",
-            "sha256": "0m80k87dahzdpfa4snbl4p9zm5d5anc8s91535mwzsnfbr98qmhm",
-            "rev": "60641acf8b90e34b70f783b3d6e7789a4272f2b4"
-        },
-        "recipe": {
-            "sha256": "0v3njygqkcrwjkf7jrqmza6bwk2jp3956cx1qvf9ph7dfxsq7rn3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150706.24",
-        "deps": [
-            "bbdb-vcard"
-        ]
-    },
-    "sift": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nlamirault",
-            "repo": "sift.el",
-            "sha256": "0mlwv66528927gf9x8jx9ifqbj1bhid21lrcm5gjym92lvpvps4p",
-            "rev": "99218553b5979b3431f188906cf3f50265ad72a0"
-        },
-        "recipe": {
-            "sha256": "13y6nmc317hljch3x8f80jg5sb57imm7w9kdn7ybw59g55zxzz8q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151223.140",
-        "deps": []
-    },
-    "moz": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bard",
-            "repo": "mozrepl",
-            "sha256": "1g06i3d8xv8ja6nfww4k60l3467xr1s9xsk7i6dbicq0lf8559h9",
-            "rev": "57f278849e4246a992e731e188b221a2574fc81e"
-        },
-        "recipe": {
-            "sha256": "0ar2xgsi7csjj6fgiamrjwjc58j942dm32j3f3lz21yn2c4pnyxi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150805.1206",
-        "deps": []
-    },
-    "baidu-life": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lujun9972",
-            "repo": "el-baidu-life",
-            "sha256": "00skx1aywzvnqqsm41n2mwry5i6ifib8kzq5klymbrc7qfnbb55f",
-            "rev": "4cb251d44e97da54306af9d99444d9b8525f043e"
-        },
-        "recipe": {
-            "sha256": "0rib50hja33qk8dmw5i62gaxhx7mscj2y0n25jmnds7k88ms8z19",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151210.615",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "use-package-chords": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "waymondo",
-            "repo": "use-package-chords",
-            "sha256": "100py4x10nd8w0l87lc7wpa8nmg7yg6pwxln0wcyal7vpwycmhjz",
-            "rev": "e5f7a43fd0a63a4a0bf7dabc2c223f615ea71eca"
-        },
-        "recipe": {
-            "sha256": "18av8gkz3nzyqigyd88ajvylsz2nswsfywxrk2w8d0ykc3p37ass",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151001.1528",
-        "deps": [
-            "bind-chord",
-            "bind-key",
-            "use-package"
-        ]
-    },
-    "jekyll-modes": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fred-o",
-            "repo": "jekyll-modes",
-            "sha256": "0rx72rid7922mhw21j85kxmx0fhpkmkv9jvxmj9izy01xnjbk00c",
-            "rev": "7cb10b50fd2883e3f7b10fdfd98f19f2f0b2381c"
-        },
-        "recipe": {
-            "sha256": "1305f1yg1mamyw3bkzrk5q3q58ihs8f5k9vjknsww5xvrzz3r1si",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141117.714",
-        "deps": [
-            "polymode"
-        ]
-    },
-    "timer-revert": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yyr",
-            "repo": "timer-revert",
-            "sha256": "1hidvbd1xzz9m0fc55wac1mpv4dpcf8qnw1myh3646bfvivj9c2q",
-            "rev": "615c91dec8b440d2b9b7c725dd733d7432564e45"
-        },
-        "recipe": {
-            "sha256": "0lvm2irfx9rb5psm1lf53fv2jjx745n1c172xmyqip5xwgmf6msy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150122.1432",
-        "deps": []
-    },
-    "igv": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "https://bitbucket.org/sbarbit/eigv",
-            "sha256": "cefc95ead9e5d425d3763f8d63afa10dea416493cafd7144f4d3cdeee0d0fa86",
-            "rev": "47ac6ceede252f451348a2c696398c0cb5279555"
-        },
-        "recipe": {
-            "sha256": "01igm3cb0lncmcyy72mjf93byh42k2hvscqhg8r7iljbxm58460z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141210.627",
-        "deps": []
-    },
-    "helm-mt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dfdeshom",
-            "repo": "helm-mt",
-            "sha256": "09rb8aq7fnf661w3liwbkkaczjph3dzvg26slm9cwcnl7pqnvagl",
-            "rev": "39a7d58050942f6afc15b1078f1e397ec4c8cd5c"
-        },
-        "recipe": {
-            "sha256": "04hx8cg8wmm2w8g942nc9mvm12ammmjnx4k61ljrq76smd8s3x2a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151104.2320",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "helm",
-            "multi-term"
-        ]
-    },
-    "web-server": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "eschulte",
-            "repo": "emacs-web-server",
-            "sha256": "0mbhyk7sgisx0l0xiz2xgy4jfbgwazlnxjvajsh4nysyig5rys05",
-            "rev": "469cd3bc117bfb8da0c03a2a2fb185e80c81d068"
-        },
-        "recipe": {
-            "sha256": "1f0iyvwq1kq3zfxx2v596cmah7jfk2a04g2rjllbgxxnzwms29z3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140905.1906",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "bpr": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ilya-babanov",
-            "repo": "emacs-bpr",
-            "sha256": "01bh371c0ln0qw1wixw28gdyjk4v8griw464d671r26wsxjdiwqy",
-            "rev": "1c8ffe083df2bb1e8a9aa44c9ed450f631081ae4"
-        },
-        "recipe": {
-            "sha256": "0rjxn40n4s4xdq51bq0w3455g9pli2pvcf1gnbr96zawbngrw6x2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151206.1415",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "thumb-through": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "apgwoz",
-            "repo": "thumb-through",
-            "sha256": "0nypcryqwwsdawqxi7hgsv6fp28zqslj9phw7zscqqxzc3svaywn",
-            "rev": "08d8fb720f93c6172653e035191a8fa9c3305e63"
-        },
-        "recipe": {
-            "sha256": "1krn7zn2y8p51m8dxai5nbrwbdviz6zrjzz0kykya9cqz4n9dhln",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120118.2334",
-        "deps": []
-    },
-    "darcula-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fommil",
-            "repo": "darcula-theme-emacs",
-            "sha256": "100aycjy47md09aw0wlp846py93zrvw6wafcmmha1vbc8p5v5nms",
-            "rev": "05dea7041483e2ac9f0839cba01f7bf218a2d87e"
-        },
-        "recipe": {
-            "sha256": "13d21gwzv66ibn0gs56ff3sn76sa2mkjvjmpd2ncxq3mcgxajnjg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150629.435",
-        "deps": []
-    },
-    "cm-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joostkremers",
-            "repo": "criticmarkup-emacs",
-            "sha256": "1ii3n9x0xdbbs0bpa6nf7i2jij19czwkm9fpdwkqh390j8r8mn6a",
-            "rev": "61b1557bad3cf7dfd0fc4c9eb4a7af0d86d605d0"
-        },
-        "recipe": {
-            "sha256": "1rgfpxbnp8wiq9j8aywm2n07rxzkhqljigwynrkyvrnsgxlq2a9x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141112.1915",
-        "deps": []
-    },
-    "dynamic-fonts": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "dynamic-fonts",
-            "sha256": "150dj1g49q9x9zx9wkymq30l5gc8c4mhsq91fm6q0yj6ip7hlfxh",
-            "rev": "ab0c65accbdb59acaed5b263327e22ec019b3e82"
-        },
-        "recipe": {
-            "sha256": "0a210ca41maa755lv1n7hhpxp0f7lfxrxbi0x34icbkfkmijhl6q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140731.726",
-        "deps": [
-            "font-utils",
-            "pcache",
-            "persistent-soft"
-        ]
-    },
-    "ethan-wspace": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "glasserc",
-            "repo": "ethan-wspace",
-            "sha256": "098mfyw63b23h7jajaik1rfj307sxs82nnwf6b81j550kl2n05y6",
-            "rev": "477444d95adc2cb86c82e498cbaa5fbb1fc293a8"
-        },
-        "recipe": {
-            "sha256": "0k4kqkf5c6ysyhh1vpi9v4220yxm5ir3ippq2gmvvhnk77pg6hws",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151217.2010",
-        "deps": []
-    },
-    "ssh": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ieure",
-            "repo": "ssh-el",
-            "sha256": "1rdhdkwdhb727rj53xyxk6i00sjr58a48hfig14m12niy1k739vd",
-            "rev": "c17cf5b43df8ac4662a0580f85898e1f078df0d1"
-        },
-        "recipe": {
-            "sha256": "1jywn8wlqzc2mfylp0kbpzxv3kwzak3vxdbjabiawqv1m4bfpk5g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120904.1542",
-        "deps": []
-    },
-    "bbdb2erc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "unhammer",
-            "repo": "bbdb2erc",
-            "sha256": "1zkh7dcas80wwjvigl27wj8sp4b5z6lh3qj7zkziinwamwnxbdbs",
-            "rev": "f39a36351e1e6f1105c9e32970e7502b77b0dbcd"
-        },
-        "recipe": {
-            "sha256": "0k1f6mq9xd3568vg01dqqvcdbdshbdsi4ivkjyxis6dqfnqhlfdd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130607.129",
-        "deps": [
-            "bbdb"
-        ]
-    },
-    "whitespace-cleanup-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "whitespace-cleanup-mode",
-            "sha256": "15yhbyyr0ksd9ziinlylyddny2szlj35x2548awj9ijnqqgjd23r",
-            "rev": "14eaf40e0e67539106d3636af440a167105be296"
-        },
-        "recipe": {
-            "sha256": "1fhdjrxxyfx4xsgfjqq9p7vhj98wmqf2r00mv8k27vdaxwsnm5p3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150603.647",
-        "deps": []
-    },
-    "m-buffer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "phillord",
-            "repo": "m-buffer-el",
-            "sha256": "07v2mch8qd8s760gxx3c8fdqqsjpqpxacl5nsbiqvpsvccky66b3",
-            "rev": "883e6192e992ae783e51de6cd6b6a7dbaa54dce0"
-        },
-        "recipe": {
-            "sha256": "0l2rayglv48pcwnr1ggmn8c0az0mffgv02ivnzr9jcfs55ki07fc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151025.1116",
-        "deps": [
-            "dash",
-            "emacs"
-        ]
-    },
-    "yard-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pd",
-            "repo": "yard-mode.el",
-            "sha256": "06mjjxa0blgxd8dbahgyni3b1rscbwjpxby5abrgfbb0fvs2bnfa",
-            "rev": "aa303f6f1c348cbee1dbab3be2ad04b0aaa590cf"
-        },
-        "recipe": {
-            "sha256": "0jmlcba8qapjwaaliz9gzs99if3wglkhmlpjzcdy3icx18sw8kzx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140816.1244",
-        "deps": []
-    },
-    "lodgeit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ionrock",
-            "repo": "lodgeit-el",
-            "sha256": "1cdnm270kzixa0kpis0xw2ybkw8lqh7kykc7blxkxjrr9yjvbawl",
-            "rev": "ec9b8e5cbb17bcf8ac4bdddd1d361cb60e59384c"
-        },
-        "recipe": {
-            "sha256": "1ax2w5yxscycjz90g4jdbhd64g9sipzxpfjs7gq3na77s5dcjzsq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150312.849",
-        "deps": []
-    },
-    "distinguished-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Lokaltog",
-            "repo": "distinguished-theme",
-            "sha256": "03d8zb2is7n2y2z0k6j37cijjc3ndgasxsm9gqyq7drlq9bqwzsm",
-            "rev": "9b1d25ac59465a5016d187ea84b7614c95a29b3b"
-        },
-        "recipe": {
-            "sha256": "0h03aqgijrmisbgqga42zlb5yz4x3jn9jgr29rq8canyhayr3rk4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151216.1415",
-        "deps": []
-    },
-    "wavefront-obj-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abend",
-            "repo": "wavefront-obj-mode",
-            "sha256": "0zw8z2r82986likz0b0zy37bywicrvz9dizzw9p52gs1lx0is1fy",
-            "rev": "75eedad052848e82cdd94064764956b906e6d6b2"
-        },
-        "recipe": {
-            "sha256": "0qqismh6g2fvi45q2q52lq0n9nrh95wgamlsy5j4rx4syfgzxbrk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150501.1316",
-        "deps": []
-    },
-    "pow": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yukihr",
-            "repo": "emacs-pow",
-            "sha256": "1jzqav2lchr0ggckjq9rwlxwryi7m7xnmn8471zgiamd1h04ddqf",
-            "rev": "7c0b39a07069d8b0f6b21adf3b4e462944641ad9"
-        },
-        "recipe": {
-            "sha256": "05wc4ylp0xjqbzrm046lcsv4aw2a6s2rfv1ra38bfr0dai6qrsrn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140420.306",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "memolist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mikanfactory",
-            "repo": "memolist.el",
-            "sha256": "1jd4rjv812iv7kp4wyxdz8sk7j0442m8x2ypk6hiqis0braxnspm",
-            "rev": "60c296e202a71e9dcf1c3936d47b5c4b95c5839f"
-        },
-        "recipe": {
-            "sha256": "1whajbwmz1v01dirv795bhvs27vq9dh0qmj10dk2xia7vhn42mgh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150804.1221",
-        "deps": [
-            "ag",
-            "markdown-mode"
-        ]
-    },
-    "iasm-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "RAttab",
-            "repo": "iasm-mode",
-            "sha256": "1gl21li9vqfjvls4ffjw8a4bicas2c7hmaa621k3hpllgpy6qdg5",
-            "rev": "6b404ff94bbfe971b3614007c8e5dcd5757c5727"
-        },
-        "recipe": {
-            "sha256": "09xh41ayaha07fi5crk3c6pn17gwm3samsf6h71ldkywvz74kipv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131004.1844",
-        "deps": []
-    },
-    "marshal": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sigma",
-            "repo": "marshal.el",
-            "sha256": "0fwhhzfd6vgpaf5mrw90hvm35j2kzhk9h3gbrwd7y7q08nrmsx9p",
-            "rev": "0ab06a654af0555dc669b5bdf4e0991a78238d6d"
-        },
-        "recipe": {
-            "sha256": "17ikd8f1k42f28d4v5dn83zb44bsx7g336db60q068w6z8d4jbgl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150916.2057",
-        "deps": [
-            "eieio",
-            "json"
-        ]
-    },
-    "chinese-yasdcv": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tumashu",
-            "repo": "chinese-yasdcv",
-            "sha256": "14yzmyzkf846yjrwnqrbzmvyhfav39qa5fr8jnb7lyz8rm7y9pnq",
-            "rev": "619e4d701ed995ad2c95f35072c638cfb3933afb"
-        },
-        "recipe": {
-            "sha256": "1y2qywldf8b8b0km1lcf74p0w6rd8gr86qcj7ikwhhbvd19dfglm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150702.816",
-        "deps": [
-            "chinese-pyim",
-            "cl-lib"
-        ]
-    },
-    "company-nand2tetris": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "CestDiego",
-            "repo": "nand2tetris.el",
-            "sha256": "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7",
-            "rev": "0297cd8d76cad072cb64318ffacdc65d8a1ad948"
-        },
-        "recipe": {
-            "sha256": "1g2i33jjh7kbpzk835kbnqicf0w4cq5rqv934bqzz5kavj9cg886",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151027.1636",
-        "deps": [
-            "cl-lib",
-            "company",
-            "names",
-            "nand2tetris"
-        ]
-    },
-    "zygospore": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "louiskottmann",
-            "repo": "zygospore.el",
-            "sha256": "0v73fgb0gf81vlihiicy32v6x86rr2hv0bxlpw7d3pk4ng1a0l3z",
-            "rev": "1af5ee663f5a7aa08d96a77cacff834dcdf55ea8"
-        },
-        "recipe": {
-            "sha256": "03mmxqbliwd1g73cxd9kqkngdy4jdavcs6j12b4wp27xmhgaj40z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140703.352",
-        "deps": []
-    },
-    "elisp-depend": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/elisp-depend.el",
-            "sha256": "0khc3gacw27aw9pkfrnla9844lqbspgm0hrz7q0h5nr73d9pnc02"
-        },
-        "recipe": {
-            "sha256": "08zxzvj60v23b7d5q0hvgffm1jxq7lc5y9w22m6nv2fp29yadyiy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120426.2023",
-        "deps": []
-    },
-    "eproject": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jrockway",
-            "repo": "eproject",
-            "sha256": "13ds5z2nvanx8cvxrzi0da6ixx7kw222z6mrlbs8cldqcmzm7xh2",
-            "rev": "fdff000d601eb8bdb165db3dc4925c6797308b78"
-        },
-        "recipe": {
-            "sha256": "0kpg4r57khbyinc73v9kj32b9m3b4nb5014r5fkl5mzzpzmd85b4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151205.2330",
-        "deps": [
-            "helm"
-        ]
-    },
-    "bonjourmadame": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pierre-lecocq",
-            "repo": "bonjourmadame",
-            "sha256": "1sapdy92arcgfmci17cvvr408kqw9x4yzjm4x77ndbs6nic8f3f6",
-            "rev": "85b72ddb602434ca7dd171b86acbcfd58baab83b"
-        },
-        "recipe": {
-            "sha256": "0d36yradh37359fjk59s54hxkbh4qcc17sblj2ylcdyw7181iwfn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150914.508",
-        "deps": []
-    },
-    "vdirel": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DamienCassou",
-            "repo": "vdirel",
-            "sha256": "034475m2d2vlrlc2l88gdx0ga3krsdh08wkjxwnbb2dfyz3p8r9v",
-            "rev": "aab19692e2c2084a0d5b554a96a64a2e3e2a3d09"
-        },
-        "recipe": {
-            "sha256": "11cc7bw7x5h3bwnlsjyhw6k5fh2fk7wffarrcny562v4cmr013cj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151216.55",
-        "deps": [
-            "emacs",
-            "helm",
-            "org-vcard",
-            "seq"
-        ]
-    },
-    "scala-mode2": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ensime",
-            "repo": "emacs-scala-mode",
-            "sha256": "015p93isbpxgqiq6l0jmvsyxjqajjjclfnn76p7xz5p73hzlvfx7",
-            "rev": "c20d6e6df028f055e69066aa75d571e520ff0670"
-        },
-        "recipe": {
-            "sha256": "0rnkln6jwwqc968w3qpc6zjjv8ylw0w6c2hsjpq2slja3jn5khch",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.1248",
-        "deps": []
-    },
-    "show-marks": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vapniks",
-            "repo": "show-marks",
-            "sha256": "15vkk7lnnfwgzkiwpqz1l1qpnz2d10l82m10m0prbw03k1zx22c7",
-            "rev": "97609566582e65eed0d0a854efa5c312f209115d"
-        },
-        "recipe": {
-            "sha256": "1jgxdclj88ca106vcvf1k8zbf7iwamy80c2ad8b3myz0f4zscjzb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130805.949",
-        "deps": [
-            "fm"
-        ]
-    },
-    "simple-rtm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mbunkus",
-            "repo": "simple-rtm",
-            "sha256": "0dxfgpqjcdwk1yzxjg9nbw7aa56vp7jxxbpyp8j92wd7lwgpk6a5",
-            "rev": "cff3e87bc2d440aa643c9f43bf99972668147231"
-        },
-        "recipe": {
-            "sha256": "1aadzaf73clhyny2qiryg6z84k34yx3ghy6pyl0px9qhqc1ak271",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140926.639",
-        "deps": []
-    },
-    "rigid-tabs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wavexx",
-            "repo": "rigid-tabs.el",
-            "sha256": "0p044wg9d4i6f5x7bdshmisgwvw424y16lixac93q6v5bh3xmab5",
-            "rev": "c7c6b726806df7e8cb25a41b213a207850c91cb7"
-        },
-        "recipe": {
-            "sha256": "06n0bcvc3nnp84pcq3lywwga7l92jz8hnkilhbq59kydf5zbjldp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150807.1056",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "inform7-mode": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "https://github.com/fred-o/inform7-mode.git",
-            "sha256": "3c00805529518edba788671fed0c3e56810d1dbec2a0dbd3cb42f42991326ca6",
-            "rev": "42458733947f2fbd44bc78f7264be247a5d8980b"
-        },
-        "recipe": {
-            "sha256": "1kbyl69vwhp1wdivr3ijmj7mghdnjaw7adk8az7bwyzjvpq73171",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131010.154",
-        "deps": [
-            "sws-mode"
-        ]
-    },
-    "hc-zenburn-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "edran",
-            "repo": "hc-zenburn-emacs",
-            "sha256": "0rgcj47h7a67qkw6696pcm1a4g4ryx8nrz55s69fw86958fp08hk",
-            "rev": "fd0024a5191cdce204d91c8f1db99ba31640f6e9"
-        },
-        "recipe": {
-            "sha256": "0jcddk9ppgcizyyciabj3sgk1pmingl97knf9nmr0mi89h7n2g5y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150928.1133",
-        "deps": []
-    },
-    "synonymous": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "toroidal-code",
-            "repo": "synonymous.el",
-            "sha256": "02xnfkmpvjicckmp9is42fnavy9pd95s99zmf1wylxdji2hhpjxw",
-            "rev": "9abd08c57f4a35902cd6b3eb5aad8dbb352141f4"
-        },
-        "recipe": {
-            "sha256": "0vawa9qwvv6z1i7vzhkjdl1l9r1yham48yn5y8w8g1xyhxxp6rs5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150909.1034",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "request"
-        ]
-    },
-    "theme-changer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hadronzoo",
-            "repo": "theme-changer",
-            "sha256": "0njmn5dy773v9kmwclw1m79rh52xnxl8mswcaagni2z3dvlvw4m8",
-            "rev": "c28ea477e8277c03e14657f167695e3c4bf3c11f"
-        },
-        "recipe": {
-            "sha256": "1qbmsghkl5gs728q0gaalc7p8q7nzv3l045jc0jdxxnb7na3gc5w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130725.2119",
-        "deps": []
-    },
-    "uncrustify-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "koko1000ban",
-            "repo": "emacs-uncrustify-mode",
-            "sha256": "0366h4jfi0c7yda9wcrz4zxgf2qqdd08b8z2dr8c1rkvkdd67iam",
-            "rev": "73893d000361e95784911e5ec268ad0ab2a1473c"
-        },
-        "recipe": {
-            "sha256": "0amdxdfc8i99zjrw4iqmxzb47h0airs60fwmc32bc8b0ds66c3kd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130707.859",
-        "deps": []
-    },
-    "hl-sentence": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "milkypostman",
-            "repo": "hl-sentence",
-            "sha256": "0pjfbm8p077frk475bx8xkygn8r4vdsvnx4rcqbjlpjawj0ndgxs",
-            "rev": "45e3cc525ba636c0f22baa6d0938d9808622bc89"
-        },
-        "recipe": {
-            "sha256": "16sjfs0nnpwzj1cqfna9vhmxgznwwhb2qdmjci25hlgrdxwwyahs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140802.1120",
-        "deps": []
-    },
-    "mynt-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "crshd",
-            "repo": "mynt-mode",
-            "sha256": "18ml0qz3iipm9w36zvwz77cbbrg885jgvzk6z4a33xcfp524xhma",
-            "rev": "23d4489167bfa899634548cb41ed32fdeb3600c9"
-        },
-        "recipe": {
-            "sha256": "17s0wdwgh2dcpww6h3qszc9dcs7ki00xkyisvsfn4xqajrmmp75b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150512.1549",
-        "deps": [
-            "virtualenvwrapper"
-        ]
-    },
-    "svg-mode-line-themes": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sabof",
-            "repo": "svg-mode-line-themes",
-            "sha256": "14h40s0arc2i898r9yysn256z6l8jkrnmqvrdg7p7658c0klz5ic",
-            "rev": "80a0e01839cafbd66899202e7764c33231974259"
-        },
-        "recipe": {
-            "sha256": "12lnszcb9bl32n9wir7vf8xiyyv7njw4xg21aj9x4dasmidyx506",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150425.1506",
-        "deps": [
-            "xmlgen"
-        ]
-    },
-    "tdd-status-mode-line": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "algernon",
-            "repo": "tdd-status-mode-line",
-            "sha256": "1jyz6z5bk1gvmknphcnvjvbl329zm8m40yl0a1hfaj8fvhwyzdw5",
-            "rev": "4c082e62f4915b573338a97efcc6854d132323dc"
-        },
-        "recipe": {
-            "sha256": "0z1q1aw14xq72nfx7mmvz7pr2x4960l45z02jva35zxzvb1mvsgq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131123.1116",
-        "deps": []
-    },
-    "processing-snippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ptrv",
-            "repo": "processing2-emacs",
-            "sha256": "1smw786dcjvdn2j6bwqn2rfzhw039rrhxiv7vlrgzm0fyy2v1q6h",
-            "rev": "a57415e523c9c3faeef02fa62a2b749270c4cc33"
-        },
-        "recipe": {
-            "sha256": "09vkm9asmjz1in0f63s7bf4amifspsqf5w9pxiy5y0qvmn28fr2r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140426.928",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "minibuf-isearch": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knagano",
-            "repo": "minibuf-isearch",
-            "sha256": "1n4b039448826w2jcsv4r2iw3v2vlrsxw8dbci8wcfigmkbfc879",
-            "rev": "2846c6ac369ee623dad4cd3c8a7a6d9078965516"
-        },
-        "recipe": {
-            "sha256": "0n36d152lc53zj9jy38b0c7hlww0z6hx94y3x2njy6cmh3p5g8nh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.1343",
-        "deps": []
-    },
-    "namespaces": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chrisbarrett",
-            "repo": "elisp-namespaces",
-            "sha256": "157hhb253m6a9l5wy6x8w5ar3x0qz1326l7a0npxif6pma0dd140",
-            "rev": "3d02525d9b9a5ae6e7be3adefd880121436e6270"
-        },
-        "recipe": {
-            "sha256": "02pb7762khxpah4q6xg8r7dmlv1kwyzinffi7pcaps6ycj29q2fr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130326.1750",
-        "deps": []
-    },
-    "doremi": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/doremi.el",
-            "sha256": "0b50iwyjxnhny9kzbcqxwqwa5fg5xbldm7l4jzcyl3bmcdbg4w7q"
-        },
-        "recipe": {
-            "sha256": "11i4cdxgrspx44p44zz5py89ypji5li6p5w77wy0b07i8a5gq2gb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150815.938",
-        "deps": []
-    },
-    "clevercss": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jschaf",
-            "repo": "CleverCSS-Mode",
-            "sha256": "19q6zbnl9fg4cwgi56d7p4qp6y3g0fdyihinpakby49xv2n2k8dx",
-            "rev": "b8a3c0dd674367c62b1a1ffec84d88fe0c0219bc"
-        },
-        "recipe": {
-            "sha256": "189f2l4za1j9ds0bhxrzyp7da9p6svh5dx2vnzf4vql7qhjk3gf0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131228.1955",
-        "deps": []
-    },
-    "grizzl": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "d11wtq",
-            "repo": "grizzl",
-            "sha256": "1v5xh0hana9wqc73g0yrzk5ip9zxbqg9xi8k7972nzj3fnma77bh",
-            "rev": "38b819b8f132962e24eb6a2cff33d571e848776d"
-        },
-        "recipe": {
-            "sha256": "1klds0w9qrsgfppq105qr69c26zi91y575db2hxr6h9vypf2rq24",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151223.1358",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "hyde": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nibrahim",
-            "repo": "Hyde",
-            "sha256": "14gxbza26ccah8jl0fm7ksvaag0mv3c348bgqjy88dqq2qlwcrav",
-            "rev": "640959dd6837487dd4545809d6cc9ef54283673d"
-        },
-        "recipe": {
-            "sha256": "18kjcxm7qmv9bfh4crw37zgax8khjqs9zkp4lrb490zlad2asbs3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150615.1225",
-        "deps": []
-    },
-    "on-screen": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "michael-heerdegen",
-            "repo": "on-screen.el",
-            "sha256": "1rksk0j9b27w913bzbq7w2ws75yi66m24ic6ljdhhbrq3z2ic7dy",
-            "rev": "80b00ddef6dffad7086174c2c57f29ef28b69d27"
-        },
-        "recipe": {
-            "sha256": "104jisc2bckzrajxlvj1cfx1drnjj7jhqjblvm89ry32xdnjxmqb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151108.2308",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "html-script-src": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "html-script-src",
-            "sha256": "0k9ga0qi6h33akip2vrpclfp4zljnbw5ax40lxyxc1813hwkdrmh",
-            "rev": "66460f8ab1b24656e6f3ce5bd50cff6a81be8422"
-        },
-        "recipe": {
-            "sha256": "1pin1x6g68y75pa3vz2i9h5pmhjamh5rd5ladb1z3flcavsls64j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120403.1315",
-        "deps": []
-    },
-    "shoulda": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "marcwebbie",
-            "repo": "shoulda.el",
-            "sha256": "19p47a4hwl6h2w5ay09hjhl4kf7cydwqp8s2iyrx2i0k58az8i8i",
-            "rev": "fbe8eb8efc6cfcca1713283a290882cfcdc8725e"
-        },
-        "recipe": {
-            "sha256": "0lmlhx34nwvn636y2wvw3sprhhh6q3mdg7dzgpjj7ybibvhp1lzk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140616.1333",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "wid-edit+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/wid-edit+.el",
-            "sha256": "080i3gfvhmpmjq9hbjpkvs8pi88s59ia5dvrng0gg5zd8xrwdc6k"
-        },
-        "recipe": {
-            "sha256": "1wwrsk14hc0wrvy7hm94aw6zg50n2smlqwr6frwpi7yp8y394wiv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1907",
-        "deps": []
-    },
-    "pabbrev": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "phillord",
-            "repo": "pabbrev",
-            "sha256": "0cbsl184szbl486454jkn28zj4p7danp92h0zv8yscrlnyl68p0y",
-            "rev": "d28cf8632d2691dc93afbb28500126242d37961c"
-        },
-        "recipe": {
-            "sha256": "1mbfa40pbzbi00sp155zm43sj6nw221mcayc2rk3ppin9ps95hx3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150806.645",
-        "deps": []
-    },
-    "tumblesocks": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gcr",
-            "repo": "tumblesocks",
-            "sha256": "1g7y7czan7mcs5lwc5r6cllgksrj3b9lpn1bj7khwkd1ll391jc2",
-            "rev": "85a6cdc2db3390593fd886c474959b675460b310"
-        },
-        "recipe": {
-            "sha256": "11ky69icsnxwsinv2j3f4c0764wm6i9g9mlvwsdrd6w1lchq1dg9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140215.1447",
-        "deps": [
-            "htmlize",
-            "markdown-mode",
-            "oauth"
-        ]
-    },
-    "jack-connect": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "https://bitbucket.org/sbarbit/jack-connect",
-            "sha256": "7036a0eddf25a2274a6fd1584ff497d2b8078869fa6cc9d61504e6540ff863a8",
-            "rev": "b00658dfe3d5d67431c18ffa693d5a3705067ba0"
-        },
-        "recipe": {
-            "sha256": "1ssl126wihaf8m2f6ms0l5ai6pz5wn348a09k6l0h3jfww032g1q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141207.607",
-        "deps": []
-    },
-    "auto-indent-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "auto-indent-mode.el",
-            "sha256": "1hlsgsdxpx42kmqkjgy9b9ldz5i4dbi879v87pjd2qbkj8iywb6y",
-            "rev": "1a12448ce3a030ed905226450dfb01bba37f127c"
-        },
-        "recipe": {
-            "sha256": "1nk78p8lqs8cx90asfs8iaqnwwyy8fi5bafaprm9c0nrxz299ibz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140505.855",
-        "deps": []
-    },
-    "main-line": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jasonm23",
-            "repo": "emacs-mainline",
-            "sha256": "06sjwl0bk648wnnrmyh6qgnlqmxypjmy0gkfl6kpv01r8vh7x2q5",
-            "rev": "0e88f91e49ef27cb77d74f6a8d8140063549d67f"
-        },
-        "recipe": {
-            "sha256": "0c9c5kmixvhk9il8hsxzf2k14fggb9b9mw59g8q3hgpn5g7kgpkv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151120.2006",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "helm-ls-svn": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "https://svn.macports.org/repository/macports/users/chunyang/helm-ls-svn.el",
-            "sha256": "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz",
-            "rev": "143923"
-        },
-        "recipe": {
-            "sha256": "08mwzi340akw4ar20by0q981mzmzvf0wz3mn738q4inn2kqgs60d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150717.239",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "helm"
-        ]
-    },
-    "pig-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "motus",
-            "repo": "pig-mode",
-            "sha256": "1yg9n265ljdjlh6a3jrjwyvj3f76wp68x25bl0p8dxrrsyr9kvfx",
-            "rev": "af4200c88a50264b63fa162a02860f3f54c8755b"
-        },
-        "recipe": {
-            "sha256": "0gmvc4rrqkn0cx8fk1sxk6phfbpf8dcba3k6i24k3idcx8rxsw3x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140617.1258",
-        "deps": []
-    },
-    "logstash-conf": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Wilfred",
-            "repo": "logstash-conf.el",
-            "sha256": "05px3zc3is7k2jmh7mal0al5zx5cqvn1bzmhgqq02pp6lwsx5xqa",
-            "rev": "60a06ad1ceb6699cef849e9f2e8255f7816ca5de"
-        },
-        "recipe": {
-            "sha256": "03i2ilphf3fdjag7m9z5gi23n6ik36qn42mzc22432m4y3c7iksh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150308.718",
-        "deps": []
-    },
-    "volume": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dbrock",
-            "repo": "volume-el",
-            "sha256": "0ymibjq6iwab5ia1fglhz4gm5cnbi792018fmrabcqkisj2zsjb7",
-            "rev": "ecc1550b3c8b501d37e0f0116b54b535d15f90f6"
-        },
-        "recipe": {
-            "sha256": "1r01v453bpyh561j8ja36609hy60gc30arvmz4z3c1cybhv8sk1i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150718.1509",
-        "deps": []
-    },
-    "evil-leader": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cofi",
-            "repo": "evil-leader",
-            "sha256": "10xrlimsxk09z9cw6rxdz8qvvn1i0vhc1gdicwxri0j10p0hacl3",
-            "rev": "39f7014bcf8b36463e0c7512c638bda4bac6c2cf"
-        },
-        "recipe": {
-            "sha256": "154s2nb170hzksmc87wnzlwg3ic3w3ravgsfvwkyfi2q285vmra6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140606.743",
-        "deps": [
-            "evil"
-        ]
-    },
-    "niflheim-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "niflheim-theme",
-            "repo": "emacs",
-            "sha256": "147vw3qlsply5h8cjmjzqr5dv9jzf9xlmhjnmcpyb1r7krh1l8xm",
-            "rev": "5265e89164132fbdbc13146a79f0abce78bd0c5e"
-        },
-        "recipe": {
-            "sha256": "1dipxwaar7rghmz7s733v035vrbijcg1dla9f7cld1gkgiq9iq36",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150630.1021",
-        "deps": []
-    },
-    "inf-mongo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tobiassvn",
-            "repo": "inf-mongo",
-            "sha256": "14kf3zvms1w8cbixhpgw3m2xxc2r87i57gmx00jwh89282i6kgsi",
-            "rev": "2d910f2143610f12de9c573ee202a322cf579e85"
-        },
-        "recipe": {
-            "sha256": "09hf3jmacsk4hl0rxk35cza8vjl0xfmv19dagb8h8fli97fb65hh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131216.428",
-        "deps": []
-    },
-    "highlight": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/highlight.el",
-            "sha256": "01d7khl7d78wz37bz28wjszhdwz81lrq9vm9d4slnj2qg4by6dcy"
-        },
-        "recipe": {
-            "sha256": "0clv4mzy9kllcvc0cgsbx3a9anw68dc2c7vzwbrv13sw5gh9skc0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151204.1851",
-        "deps": []
-    },
-    "darktooth-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsfodder",
-            "repo": "emacs-theme-darktooth",
-            "sha256": "1p7ih9fmcxnnxkj2mz56xa403m828wyyqvliabf5amklzjlhb3z9",
-            "rev": "ce2d8d5faeb72205bdcb192dfc1e4769e7088fa3"
-        },
-        "recipe": {
-            "sha256": "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151121.1922",
-        "deps": []
-    },
-    "helm-anything": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rubikitch",
-            "repo": "helm-anything",
-            "sha256": "153zq1q3s3ihjh15wyci9qdic3pin8f1j1gq2qlzyhmy0njlvgjb",
-            "rev": "0ec578922928b7c75cf034d1b7a956b5f36107ea"
-        },
-        "recipe": {
-            "sha256": "0yjlwsiahb7n4q3522d68xrdb8caad9gpnglz5php245yqy3n5vx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141126.431",
-        "deps": [
-            "anything",
-            "helm"
-        ]
-    },
-    "window-layout": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiwanami",
-            "repo": "emacs-window-layout",
-            "sha256": "08chi9b4bap78n069aavvx3850kabk2jflrgymy4jxv08ybqikdg",
-            "rev": "03ee615fc8fad5be4efec9c3febab8c851271257"
-        },
-        "recipe": {
-            "sha256": "1n4a6z00lxsffirjrmbaaw432w798b9vv34qawgn1k17y9l7gb85",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150717.7",
-        "deps": []
-    },
-    "draft-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gaudecker",
-            "repo": "draft-mode",
-            "sha256": "1451rdfgnvkc5mgsj4v646gadj14bc2wlh2bq4l44qyfd4737lb4",
-            "rev": "8a59f537d44ef7e8f34a69da1a7d5e0d443d76f7"
-        },
-        "recipe": {
-            "sha256": "1wg9cx39f4dhrykb4zx4fh0x5cfrh5aicwwfh1h3yzpc4zlr7xfh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140609.956",
-        "deps": []
-    },
-    "edit-list": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsmirror",
-            "repo": "edit-list",
-            "sha256": "0981hy1n50yizc3k06vbxqrpfml817a67kab1hkgkw5v6ymm1hc9",
-            "rev": "f460d3f9e208a4e606fe6ded307f1b011916ca71"
-        },
-        "recipe": {
-            "sha256": "0mi12jfgx06i0yr8k5nk80xryqszjv0xykdnri505862rb90xakv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20100930.943",
-        "deps": []
-    },
-    "grapnel": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "leathekd",
-            "repo": "grapnel",
-            "sha256": "0nvl8mh7jxailisq31h5bi64s9b74ah1465wiwh18x502swr2s3c",
-            "rev": "fbd0f9a51139973d35e4014855964fa435e8ecaf"
-        },
-        "recipe": {
-            "sha256": "019cdx1wdx8sc2ibqwgp1akgckzxxvrayyp2sv806gha0kn6yf6r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131001.1034",
-        "deps": []
-    },
-    "fcopy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ataka",
-            "repo": "fcopy",
-            "sha256": "0c56j8ip2fyma9yvwaanz89jyzgi9k11xwwkflzlzc4smnvgfibr",
-            "rev": "e355f6ec889d8ecbdb096019c2dc660b1cec4941"
-        },
-        "recipe": {
-            "sha256": "13337ymf8vlbk8c4jpj6paqi06xdmk39yf72s40kmfrbvgmi8qy1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150304.803",
-        "deps": []
-    },
-    "litable": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "litable",
-            "sha256": "1nbz119ldwjvkm3xd9m0dx820lc177frz5mn585fsd7kqdbkam99",
-            "rev": "9065bade1ba42ad04d9839d58082b73da589dca6"
-        },
-        "recipe": {
-            "sha256": "073yw3ivkl093xxppn5vqyh69jhfc97al505mnyn34fwdj5v8fji",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150908.909",
-        "deps": [
-            "dash"
-        ]
-    },
-    "ducpel": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alezost",
-            "repo": "ducpel",
-            "sha256": "1ixb78dv66lmqlbv4zl5ysvv1xqafvqh1h5cfdv03jdkqlfk34jz",
-            "rev": "4a1671fc45ab92d44dee85a1a223122d5a43cb32"
-        },
-        "recipe": {
-            "sha256": "1cqrkgg7n9bhjswnpl7yc6w6yjs4gfbliaqsimmf9z43wk2ml4pc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140419.16",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "sclang-extensions": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chrisbarrett",
-            "repo": "sclang-extensions",
-            "sha256": "0v36zd8lnsbc7jvnhv5pidfxabq2qqmwg1nm2jdxfj6vvcg3vx0x",
-            "rev": "7133494182738cb0ef49f31cc09cfe0d2fab520e"
-        },
-        "recipe": {
-            "sha256": "00nirxawsngvlx7bmf5hqg2wk0l1v5pi09r6phzd0q8gyq3kmbbn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131117.1639",
-        "deps": [
-            "auto-complete",
-            "dash",
-            "emacs",
-            "s"
-        ]
-    },
-    "highlight-leading-spaces": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mrBliss",
-            "repo": "highlight-leading-spaces",
-            "sha256": "1vy6j63jp83ljdqkrqglpys74yfh7p61sd0lqiwczgr5nqyc60rl",
-            "rev": "840db19d863dd97993fd9f893f5be501627b6354"
-        },
-        "recipe": {
-            "sha256": "0h2ww2vqmarghf4zg0wbwn0wgndmkcjy696mc885rwavck2dav4p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151216.622",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "elfeed": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "elfeed",
-            "sha256": "1ln0wprk8m2d33z804ld73jwv9x51xkwl9xfsywbh09w3x2zb51j",
-            "rev": "9fd3cf8833e26bf41f52a7e2149734858d2eeb96"
-        },
-        "recipe": {
-            "sha256": "1psga7fcjk2b8xjg10fndp9l0ib72l5ggf43gxp62i4lxixzv8f9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151222.1322",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "org-dropbox": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "heikkil",
-            "repo": "org-dropbox",
-            "sha256": "0jjdsng7fm4wbhvd9naqzdfsmkvj1sf1d9rikprg1pd58azv6idx",
-            "rev": "75dab6d6f0438a7a8a18ccf3a5d55f50bf531f6e"
-        },
-        "recipe": {
-            "sha256": "0qfvdz13ncqn7qaz03lwabzsnk62z6wqzlxlvdqv5xyllcy9m6ln",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150113.2309",
-        "deps": [
-            "dash",
-            "emacs",
-            "names"
-        ]
-    },
-    "resize-window": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dpsutton",
-            "repo": "resize-window",
-            "sha256": "061lc8arwv7wmj98pii8ff6qk0sfhxhdh0f9dak5q8nazcvqgk41",
-            "rev": "0bc23978d1084da5638becf93b66816edc4ece54"
-        },
-        "recipe": {
-            "sha256": "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151126.2229",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "kite": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jscheid",
-            "repo": "kite",
-            "sha256": "1cr4i66lws6yhyxmyx5jw6d5x7i75435mafkkych4nfa0mv4vicd",
-            "rev": "7ed74d1147a6ddd152d3da65dc30df3517d53144"
-        },
-        "recipe": {
-            "sha256": "04x92qcvx428l2cvm2nk9px7r8i159k0ra0haq2sjncjr1ajhg9m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130201.1338",
-        "deps": [
-            "json",
-            "websocket"
-        ]
-    },
-    "google-maps": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jd",
-            "repo": "google-maps.el",
-            "sha256": "183igr5lp20zcqi7rc01fk76sfxdhksd74i11v16gdsifdkjimd0",
-            "rev": "90151ab59e693243ca8da660ce7b9ce361ea5126"
-        },
-        "recipe": {
-            "sha256": "0a0wqs3cnlpar2dzdi6h14isw78vgqr2r6psmrzbdl00s4fcyxwx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130412.430",
-        "deps": []
-    },
-    "htmlize": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "http://fly.srk.fer.hr/~hniksic/emacs/htmlize.git",
-            "sha256": "8afaf87b30628afd8d376965247a6b2791129339ad7238c5529f4b173f908251",
-            "rev": "aa6e2f6dba6fdfa200c7c55efe29ff63380eac8f"
-        },
-        "recipe": {
-            "sha256": "15pym76iwqb1dqkbmkgc1yar450g2xinfl89fyss2ifyi4am1nxp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130207.1402",
-        "deps": []
-    },
-    "forecast": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cadadr",
-            "repo": "forecast.el",
-            "sha256": "1jw888nqmbi9kcd9ycl2fqrmrnqxnmkx72n0b3nf3hp7j956yb21",
-            "rev": "51526906140700f076bd329753abe7ae31b6da90"
-        },
-        "recipe": {
-            "sha256": "0whag2n1120384w304g0w4bqr7svdxxncdhnz4rznfpxlgiw2rsc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151105.1635",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "perl6-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hinrik",
-            "repo": "perl6-mode",
-            "sha256": "1ibnax9498jwcmkgm0jnl7q8qlwkgkp8nhp6zz7xr0x1d0dibcas",
-            "rev": "6c97f87fd8556cc0dc7a6754ab2237ea815bf5a4"
-        },
-        "recipe": {
-            "sha256": "0af1djypd8n0n1fq10sl8mrdg27354kg9g87d6xz4q5phvi48cqv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151014.1718",
-        "deps": [
-            "emacs",
-            "pkg-info"
-        ]
-    },
-    "tox": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chmouel",
-            "repo": "tox.el",
-            "sha256": "16217i8rjhgaa5kv8iq0s14b42v5rs8m2qlr60a0x6qzy65chq39",
-            "rev": "5c1a7c18cb7f2fd2da2386debf86012e6953e15d"
-        },
-        "recipe": {
-            "sha256": "1z81x8fs5q6r19hpqphsilk8wdwwnfr8w78x5x298x74s9mcsywl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141004.1603",
-        "deps": []
-    },
-    "swap-buffers": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ekazakov",
-            "repo": "swap-buffers",
-            "sha256": "1kn70570r6x0h1xfs1vr8as27pjfanyhml140yms60gdjb4ssf9r",
-            "rev": "46ab31359b70d935add6c6e9533443116dc51103"
-        },
-        "recipe": {
-            "sha256": "0ih5dhnqy3c9nlfz9m2zwy4q4jaam09ykbdqhsxx2hnwjk7p35bw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150506.1639",
-        "deps": []
-    },
-    "window-jump": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chumpage",
-            "repo": "chumpy-windows",
-            "sha256": "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs",
-            "rev": "164be41b588b615864258c502583100d3ccfe13e"
-        },
-        "recipe": {
-            "sha256": "1gmqb7j5fb3q3krgx7arrln5nvyg9vcpph6wlxj6py679wfa3lwr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150213.1436",
-        "deps": []
-    },
-    "org-screenshot": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dfeich",
-            "repo": "org-screenshot",
-            "sha256": "0ay68vz1mqr46svy9bwnd2cb9yykad3jwwm1zvvi9w87drx5pj3y",
-            "rev": "90c78dce2846bd1d148181ff896afe0f9fa9bdeb"
-        },
-        "recipe": {
-            "sha256": "012pm38d9v8qmg83vrsp39y6y30il0956rlrcmb5m5nzla84z2c3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151106.704",
-        "deps": [
-            "org"
-        ]
-    },
-    "init-open-recentf": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zonuexe",
-            "repo": "init-open-recentf.el",
-            "sha256": "0xk7lyhd9pgahbscqwa2qkh2vgnbs5yz78am3zh930k4ig9lbmjh",
-            "rev": "f7999730ed8b02a9f4b9f884defd40a90772765b"
-        },
-        "recipe": {
-            "sha256": "0xlmfxhxb2car8vfx7krxmxb3d56x0r3zzkj8ds7yqvr65z85x2r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151106.2223",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "geben": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "http://geben-on-emacs.googlecode.com/svn/trunk/",
-            "sha256": "01kbvmylymm6qww45mbjjxmb8ccdl9c2pxdyqfq3g73vwzrvndk4",
-            "rev": "124"
-        },
-        "recipe": {
-            "sha256": "1hvvy1kp8wrb1qasm42fslgdkg095g4jxgzbnwpa4vp5cq270qbm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20100330.543",
-        "deps": []
-    },
-    "date-field": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "emacs-date-field",
-            "sha256": "1lmwnj2fnvijj9qp4rjggl7c4x91vnpb47rqaam6m2wmr5wbrx3w",
-            "rev": "11c9170d1f7b343233f7716d4c0a62be024c1654"
-        },
-        "recipe": {
-            "sha256": "0fmw13sa4ajs1xkrkdpcjpbp0jl9d81cgvwh93myg8yjjn7wbmvk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141128.1905",
-        "deps": [
-            "dash",
-            "log4e",
-            "yaxception"
-        ]
-    },
-    "regex-dsl": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alk",
-            "repo": "elisp-regex-dsl",
-            "sha256": "1d34jd7is979vfgdy56zkd1m15ng3waiabfpak6dv6ak3cdh5fgx",
-            "rev": "ac89ab8b7691a165ef3007cb84417125cfc0632e"
-        },
-        "recipe": {
-            "sha256": "129sapsmvcqqqgcr9xlmxwszsxvsb4nj9g2fxsl4y6r383840jbr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20100124.428",
-        "deps": []
-    },
-    "lemon-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mooz",
-            "repo": "lemon-mode",
-            "sha256": "0n6jrm5ilm5wzfrh7yjxn3sr5m10hwdm55b179ild32lh4795zj7",
-            "rev": "155bfced6c9afc8072a0133d3d1baa54c6d67430"
-        },
-        "recipe": {
-            "sha256": "0jdf3556kmv55jh85ljqh2gdx0jl2b8zgvpz9a4kf53xifk3lqz5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130216.704",
-        "deps": []
-    },
-    "atom-one-dark-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jonathanchu",
-            "repo": "atom-one-dark-theme",
-            "sha256": "05cqic5amvm7cmcw9z3x93g7hq9y2l4gpr3i2z5a9fmadqq9zbyy",
-            "rev": "5fe3c1463daa4736435eb0c4716d4bf29f25f0a6"
-        },
-        "recipe": {
-            "sha256": "0wwnkhq7vyysqiqcxc1jsn98155ri4mf4w03k7inl1f8ffpwahvw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151115.2245",
-        "deps": []
-    },
-    "toggle-window": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "deadghost",
-            "repo": "toggle-window",
-            "sha256": "0f86aij1glmvgpbhmfpi441zy0r37zblb0q3ycgq0dp92x8yny5r",
-            "rev": "e82c60e543933880402ede11e9423e48a17dde53"
-        },
-        "recipe": {
-            "sha256": "1z080jywqj99xiwbvfclr6gjkc6spr3dqjb9kq1g4971vx4w8n9g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141207.948",
-        "deps": []
-    },
-    "slamhound": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "technomancy",
-            "repo": "slamhound",
-            "sha256": "108zcb7hdaaq3sxjfr9nrwzqxx71q6aygzik7l3ab854xknkjfad",
-            "rev": "f43dd49b63b2838081735ea1988f70de05389692"
-        },
-        "recipe": {
-            "sha256": "14zlcw0zw86awd6g98l4h2whav9amz4m8ik877d1wsdjf69g7k9x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140506.1818",
-        "deps": []
-    },
-    "syslog-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vapniks",
-            "repo": "syslog-mode",
-            "sha256": "1sxpda380c9wnnf5d72lrcqm6dkihf48cgsjcckzf706cc00ksf4",
-            "rev": "c18661b3058f0ec00e6957c955559a762cb0062c"
-        },
-        "recipe": {
-            "sha256": "15kh2v8jsw04vyh2lmh1ndpxli3cwp6yq66hl8mwb1i3g429az19",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140217.1818",
-        "deps": [
-            "hide-lines"
-        ]
-    },
-    "evil-numbers": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cofi",
-            "repo": "evil-numbers",
-            "sha256": "1aq95hj8x13py0pwsnc6wvd8cc5yv5qin8ym9js42y5966vwj4np",
-            "rev": "6ea1c8c3a9b37bed63d48f1128e9a4910e68187e"
-        },
-        "recipe": {
-            "sha256": "1lpmkklwjdf7ayhv99g9zh3l9hzrwm0hr0ijvbc7yz3n398zn1b2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140606.751",
-        "deps": []
-    },
-    "switch-window": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dimitri",
-            "repo": "switch-window",
-            "sha256": "1zpfilcaycj0l2q3zyvpjbwp5j3d9rrkacd5swzlr1n1klvbji48",
-            "rev": "cd4b06121aa5bac4c4b13b63526a99008def5f2b"
-        },
-        "recipe": {
-            "sha256": "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150114.415",
-        "deps": []
-    },
-    "zeal-at-point": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jinzhu",
-            "repo": "zeal-at-point",
-            "sha256": "1csxy186mi59zb3hmv2fngcz4hhg4r9qzqsyjjsn45l8zrb4q7vf",
-            "rev": "f18afeae0a4e0cd339a386255ac65b35deb787bb"
-        },
-        "recipe": {
-            "sha256": "1cz53plk5bax5azm13y7xz530qcfh0scm0cgrkrgwja2wwlxirnw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151103.2107",
-        "deps": []
-    },
-    "helm-robe": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-helm-robe",
-            "sha256": "163ljqar3vvbavzc8sk6rnf8awyc2rhh2g117fglswich3c8lnqg",
-            "rev": "7348d0bc0251b51979554ea678b970fd01c0efe9"
-        },
-        "recipe": {
-            "sha256": "1gi4nkm9xvnxv0frmhiiw8dkmnmhfpr9n0b6jpidlvr8xr4s5kyw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151208.2155",
-        "deps": [
-            "helm"
-        ]
-    },
-    "helm-flx": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "PythonNut",
-            "repo": "helm-flx",
-            "sha256": "02aran1myhm43skv7rjinrjbrayj1ld1s5f604bbqil8swvrq5ba",
-            "rev": "f634e85ee92f6a390da33d1a618a4c353e270762"
-        },
-        "recipe": {
-            "sha256": "03vxr5f5m4s6k6rm0976w8h3s4c3b5mrdqgmkd281hmyh9q3cslq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151103.1025",
-        "deps": [
-            "emacs",
-            "flx",
-            "helm"
-        ]
-    },
-    "ac-capf": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-ac-capf",
-            "sha256": "0nyq34yq4jcp3p30ygma3iz1h0q551p33792byj76pa5ps09g1da",
-            "rev": "17571dba0a8f98111f2ab758e9bea285b263781b"
-        },
-        "recipe": {
-            "sha256": "1drgk5iz2wp3rxzd39pj0n4cfmm5z8zqlp50jw5z7ffbbg35qxbm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151031.2117",
-        "deps": [
-            "auto-complete",
-            "cl-lib"
-        ]
-    },
-    "lice": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "buzztaiki",
-            "repo": "lice-el",
-            "sha256": "11c3vmxyddx7zm8fpxmzhq2xygyijbszinfiwllgb4l738bxwljb",
-            "rev": "d8572d997f54f4022f245dcf7c38fef6919a474a"
-        },
-        "recipe": {
-            "sha256": "1hv2hz3153x0gk7f2js18dbx5pyprfdf2pfxb658fj16vxpp7y6x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151225.1222",
-        "deps": []
-    },
-    "mark-tools": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "stsquad",
-            "repo": "emacs-mark-tools",
-            "sha256": "0k4zvbs09mkr8vdffv18s55rn9cyxldzav9vw04lm7v296k94ivz",
-            "rev": "a11b61effa90bd0abc876d12573674d36fc17f0c"
-        },
-        "recipe": {
-            "sha256": "1688y7lnzhwdva2ildjabzi10i87klfsgvs947i7gfgxl7jwhisq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130614.525",
-        "deps": []
-    },
-    "xah-get-thing": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xahlee",
-            "repo": "xah-get-thing-or-selection",
-            "sha256": "0abknznp2si80zq5pc0hqr3w3pca2vrv3msm6jz1s8l8zi2hwx72",
-            "rev": "d2dadc54417468cc42da72c4e02fd23e3fd0584a"
-        },
-        "recipe": {
-            "sha256": "0m61bmfgqy19h4ivw655mqj547ga8hrpaswcp48hx00hx8mqzcvg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150712.1630",
-        "deps": []
-    },
-    "helm-gitignore": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jupl",
-            "repo": "helm-gitignore",
-            "sha256": "0pd755s5zcg8y1svxj3g8m0znkp6cyx5y6lsj4lxczrk7lynzc3g",
-            "rev": "03aad6edb0ed4471c093230856f26719754e570b"
-        },
-        "recipe": {
-            "sha256": "01l7mx8g1m5qnwz973hzrgds4gywm56jgl4hcdxqvpi1n56md3x6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150517.2256",
-        "deps": [
-            "cl-lib",
-            "gitignore-mode",
-            "helm",
-            "request"
-        ]
-    },
-    "echo-bell": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/echo-bell.el",
-            "sha256": "11914ca1q8szqyqihfm2q39cway3p6j1fdggr99lk6848dkf5p1v"
-        },
-        "recipe": {
-            "sha256": "0adhdfbcpmdhd9252rh0jik2z3v9bzf0brpzfvcjn5py2x6724ws",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151007.2025",
-        "deps": []
-    },
-    "dkmisc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "davidkeegan",
-            "repo": "dkmisc",
-            "sha256": "1nz71g8pb19aqjcb4s94hhn6j30cc04q05kmwvcbxpjb11qqrv49",
-            "rev": "fe3d49c6f8322b6f89466361acd97585bdfe0608"
-        },
-        "recipe": {
-            "sha256": "0nnbl272hldcmhyj47r463yvj7b06rjdkpkl5xk0gw9ikyja7w0z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131110.515",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "dedicated": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsorphanage",
-            "repo": "dedicated",
-            "sha256": "0pba9s0h37sxyqh733vi6k5raa4cs7aradipf3826inw36jcw414",
-            "rev": "8275fb672f9cc4ba6682ebda0ef91db827e32992"
-        },
-        "recipe": {
-            "sha256": "1ka8n02r3nd2ksbid23g2qd6707c7xsjx7lbbdi6pcmwam5mglw9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20090428.1431",
-        "deps": []
-    },
-    "pixiv-novel-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zonuexe",
-            "repo": "pixiv-novel-mode.el",
-            "sha256": "14gn2qd72x3zfqzh2cngxcjpdiibyki1g4d1vdav5v9vcbglgm5d",
-            "rev": "65809cf31816257d8c6c92868af6c30abf7b2043"
-        },
-        "recipe": {
-            "sha256": "0f1rxvf9nrw984122i6dzsgik9axfjv6yscmg203s065n9lz17px",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150110.54",
-        "deps": []
-    },
-    "edit-indirect": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "edit-indirect",
-            "sha256": "10c84aad1lnr7z9f75k5ylgchykr3srcdmn88hlcx2n2c4jfbkds",
-            "rev": "d1ab87fdfbc2a894a7eaac8b289a5af2d7c835b0"
-        },
-        "recipe": {
-            "sha256": "0q5jjmrvx5kaajllmhaxihsab2kr1vmcsfqrhxdhw3x3nf41s439",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141213.1205",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "asn1-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kawabata",
-            "repo": "asn1-mode",
-            "sha256": "0h18x9nh152dnyqjv5b1zjksl8wb75s8zmx3v8vvmwqyy6ql8gcj",
-            "rev": "f8acc7e79306ca416f28ff4dc308d8ec47af51a5"
-        },
-        "recipe": {
-            "sha256": "0iswisb08dqz7jc5ra4wcdhbmglildgyrb547dm5362xmvm9ifmy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151124.28",
-        "deps": [
-            "emacs",
-            "s"
-        ]
-    },
-    "soundklaus": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "r0man",
-            "repo": "soundklaus.el",
-            "sha256": "1ipg4vvh6vgf0az8p31br1xkb8ndjmd6fybcx11r3c479sg0y6k7",
-            "rev": "830f2b5f4dd4bd110db23a71494b92bb8fe5b058"
-        },
-        "recipe": {
-            "sha256": "0b63sbgwp99ff94dxrqqp2p99j268fjkkzx0g42g726hv80d4fxb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150102.1521",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "deferred",
-            "emacs",
-            "emms",
-            "pkg-info",
-            "s"
-        ]
-    },
-    "fireplace": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "johanvts",
-            "repo": "emacs-fireplace",
-            "sha256": "1y1bk18wfirscbq7mz8i1bmfvp2xh7pzfrkpq0lxmfb4sridqlx0",
-            "rev": "36c7cc50d23dad979d3e2d166032fd295b1ab743"
-        },
-        "recipe": {
-            "sha256": "1apcypznq23fc7xgy4xy1c5hvfvjx1xhyq3aaq1lf59v99zchciw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151225.1934",
-        "deps": []
-    },
-    "morlock": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "morlock",
-            "sha256": "1ndgw4799d816pkn2bwja5kmigydpmj9znn8cax4dxsd9fg2hzjy",
-            "rev": "804131c7cff5dafa762c666fd66458111e4ee36f"
-        },
-        "recipe": {
-            "sha256": "0693jr1k8mzd7hwp52azkl62c1g1p5yinarjcmdksfyqblqq5jna",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150815.1034",
-        "deps": []
-    },
-    "helm-fuzzy-find": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xuchunyang",
-            "repo": "helm-fuzzy-find",
-            "sha256": "1yxnmxq6ppfgwxrk5ryc5xfn82kjf4j65j14hy077gphr0q61q6a",
-            "rev": "daf24bc236dafa4f4be45f1621e11dbc9f304b64"
-        },
-        "recipe": {
-            "sha256": "0lczlrpd5jy2vhy9jl3rjcdyiwr136spqm8k2rj8m9s8wpn0v75i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150613.549",
-        "deps": [
-            "emacs",
-            "helm"
-        ]
-    },
-    "auto-complete": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "auto-complete",
-            "repo": "auto-complete",
-            "sha256": "1kaamih2589y2bc67wjkb5xh1rgxxyw1zkr58dvpfyhagjg3czzd",
-            "rev": "422e1a24b2e75bac25cf224191e306a645794e10"
-        },
-        "recipe": {
-            "sha256": "1c4ij5bnclg94jdzhkqvq2vxwv6wvs051mbki1ibjm5f2hlacvh3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151227.554",
-        "deps": [
-            "cl-lib",
-            "popup"
-        ]
-    },
-    "psvn": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsmirror",
-            "repo": "psvn",
-            "sha256": "1jz1g0igpnsjn2r144205bffj10iyp8izm8678mzkhnricxkn0d6",
-            "rev": "23048d302858fc3a52c118652bd83491a4956410"
-        },
-        "recipe": {
-            "sha256": "1wdww25pjla7c8zf04mvgia1ws8cal9rb7z8g3vn2s3gp68py12n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151103.1242",
-        "deps": []
-    },
-    "go-snippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "toumorokoshi",
-            "repo": "go-snippets",
-            "sha256": "0di6xwpl6pi0430q208gliz8dgrzwqnmp997q7xcczbkk8zfwn0n",
-            "rev": "983eb74025030bf6d405f1ed63be3162cc28a528"
-        },
-        "recipe": {
-            "sha256": "1wcbnfzxailv18spxyv4a0nwlqh9l7yf5vxg0qcjcp5ajd2w12kn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151122.57",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "sparql-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ljos",
-            "repo": "sparql-mode",
-            "sha256": "1gk2ps7fn9z8n6r923qzn518gz9mrj7mb6j726cz8qb585ndjbij",
-            "rev": "303858e7f91829ec720141482c777460e66f310b"
-        },
-        "recipe": {
-            "sha256": "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151104.1114",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "emamux-ruby-test": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emamux-ruby-test",
-            "sha256": "1idsvilsvlxh72waalhl8vrsmh0vfvz56qcv56fc2c0pb1i90icn",
-            "rev": "23b73c650573b340351a919da3da416acfc2ac84"
-        },
-        "recipe": {
-            "sha256": "1l1hp2dggjlc287qkfyj21w9lri4agh91g5x707qqq8nicdlv3xm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130812.1139",
-        "deps": [
-            "emamux",
-            "projectile"
-        ]
-    },
-    "expand-region": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "expand-region.el",
-            "sha256": "0qqqv0pp25xg1zh72i6fsb7l9vi14nd96rx0qdj1f3pdwfidqms1",
-            "rev": "59f67115263676de5345581216640019975c4fda"
-        },
-        "recipe": {
-            "sha256": "1c7f1nqsqdc75h22fxxnyg0m4yxj6l23sirk3c71fqj14paxqnwg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150902.758",
-        "deps": []
-    },
-    "auto-compile": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "auto-compile",
-            "sha256": "07vnk8az4lcxncqn01jvks38b4hpdmg43nbby2b39zy50agqnwsg",
-            "rev": "90eddfb63bd2b58be8a3fe9400b67ea45f67bb29"
-        },
-        "recipe": {
-            "sha256": "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151107.1608",
-        "deps": [
-            "dash",
-            "emacs",
-            "packed"
-        ]
-    },
-    "ruby-refactor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ajvargo",
-            "repo": "ruby-refactor",
-            "sha256": "0dk9vkrjncawf4j4y5dky215m0hgl266d9w6mr7g0rgy6m7wfcyq",
-            "rev": "8be821e89dac15fa402dba211a27b843147e4d17"
-        },
-        "recipe": {
-            "sha256": "0nwinnnhy72h1ihjlnjl8k8z3yf4nl2z7hfv085gwiacr6nn2rby",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151208.1207",
-        "deps": [
-            "ruby-mode"
-        ]
-    },
-    "redpen-paragraph": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "karronoli",
-            "repo": "redpen-paragraph.el",
-            "sha256": "0s38mi9w1dm9fzhd3l8xvq9x33rkb5vvd66jibza50dhn9dmakax",
-            "rev": "dcba4dc48593fedd48e398af50f6cdc60f453a07"
-        },
-        "recipe": {
-            "sha256": "0jr707ik6fhznq0q421l986w85ah0n9b4is91zrgbk1v6miqrhca",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151206.941",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "tomatinho": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "konr",
-            "repo": "tomatinho",
-            "sha256": "0a3zvhy3jxs88zk4nhdc7lzybz4qji9baw5gm88sxlgcjgn7ip6n",
-            "rev": "7468bbfca79e6ed70ad8fb9517bc05f02fe602c7"
-        },
-        "recipe": {
-            "sha256": "1ad3kr73v75vjrc09mdvb7a3ws834k5y5xha3v0ldah38cl1pmjz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140120.1740",
-        "deps": []
-    },
-    "r-autoyas": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "r-autoyas.el",
-            "sha256": "0dhljmdlg4p832w9s7rp8vznkpjkwpg8k9hj95cn2h76c0afwz3j",
-            "rev": "b4020ee7f5f895e0065b8b26da8a49c51432d530"
-        },
-        "recipe": {
-            "sha256": "18zifadsgbwnga205jvpx61wa2dvjxmxs5v7cjqhny45a524nbv4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140101.910",
-        "deps": [
-            "ess",
-            "yasnippet"
-        ]
-    },
-    "buffer-stack": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/buffer-stack.el",
-            "sha256": "0d87cl7a4rcd6plbjyf26vaar7imwd18z24xdi4dz734m9zbkg6r"
-        },
-        "recipe": {
-            "sha256": "00vxfd4ki5pqf9n9vbmn1441vn2y14bdr1v05h46hswf13b4hzrn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20101223.420",
-        "deps": []
-    },
-    "frame-fns": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/frame-fns.el",
-            "sha256": "0vh3k8wjvf78r5gv6sn468a4gxfxf4f63csk54izgyspyv6mj9c7"
-        },
-        "recipe": {
-            "sha256": "1wq8wva9q1hdzkvjk582a3fgig0lpqz9ch1p2jd6p29kb1i15f5p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1608",
-        "deps": []
-    },
-    "scad-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "openscad",
-            "repo": "openscad",
-            "sha256": "1na5ab12y5zr93pinnl9x7cgz139wvxgwpjys7akbpm3car86g5n",
-            "rev": "dff10cc9af40ff5c8ac1dd46deace5971409b31b"
-        },
-        "recipe": {
-            "sha256": "04b4y9jks8sslgmkx54fds8fba9xv54z0cfab52dy99v1301ms3k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150330.2229",
-        "deps": []
-    },
-    "ccc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skk-dev",
-            "repo": "ddskk",
-            "sha256": "0yrjrrm0rkrvr34jwxbl5bm8ahr7w5xh76k859qwgi2cbz6vr7q0",
-            "rev": "47980e6c4f9979ff0b2d656befa5366c57e4527b"
-        },
-        "recipe": {
-            "sha256": "0fckhmz4svcg059v4acbn13yf3ijs09fxmq1axc1b9bm3xxig2cq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151205.743",
-        "deps": []
-    },
-    "search-web": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tomoya",
-            "repo": "search-web.el",
-            "sha256": "08yc67a4ji7z8s0zh500wiscziqsxi92i1d33fjla2mcr8sxxn0i",
-            "rev": "c4ae86ac1acfc572b81f3d78764bd9a54034c331"
-        },
-        "recipe": {
-            "sha256": "0qqx9l8dn1as4gqpq80jfacn6lz0132m91pjzxv0fx6al2iz0m36",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150312.603",
-        "deps": []
-    },
-    "helm-growthforecast": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "daic-h",
-            "repo": "helm-growthforecast",
-            "sha256": "0p0mk44y2z875ra8mzcb6vlf4rbkiq9yank5hdxvg2x2sxsaambk",
-            "rev": "0f94ac090d6c354058ad89a86e5c18385c136d9b"
-        },
-        "recipe": {
-            "sha256": "0716rhs5dam6p8ym83vy19svl6jr49lcfgb29mm3cqi9jcch3ckh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140119.2144",
-        "deps": [
-            "helm"
-        ]
-    },
-    "id-manager": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiwanami",
-            "repo": "emacs-id-manager",
-            "sha256": "0bzbp0vgnzvd1m3lhbcrxmknpi0cjisff6jd49f1nvkdx3p2ks40",
-            "rev": "0d968929bbaff813dd7e098c7f69e0b54434ce09"
-        },
-        "recipe": {
-            "sha256": "13g5fi06hvx0x2wn1d1d8rkfq5n6wbk9g5bhx2b5sar2yw0akmwm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150605.2239",
-        "deps": []
-    },
-    "clips-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "grettke",
-            "repo": "clips-mode",
-            "sha256": "0i6sj5rs4b9v8aqq9l6wr15080qb101hdxspx6innhijhajgmssd",
-            "rev": "a3ab4a3e958d54a16544ec38fe6338f27df20817"
-        },
-        "recipe": {
-            "sha256": "083wrhjn04rg8vr6j0ziffdbdhbfn63wzl4q7yzpkf8qckh6mxhf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131012.1601",
-        "deps": []
-    },
-    "kivy-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kivy",
-            "repo": "kivy",
-            "sha256": "1py7wzbbmmz5924n23jlss403yliljd608yhcxvf50i41svvsdrw",
-            "rev": "dfc535142a1ffa75ac3b7685b5c2168d99b1ba28"
-        },
-        "recipe": {
-            "sha256": "02l230rwivr7rbiqm4vg70458z35f9v9w3mdapcrqd5d07y5mvi1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140524.757",
-        "deps": []
-    },
-    "mpv": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kljohann",
-            "repo": "mpv.el",
-            "sha256": "193j90sgn1zgl00mji86wll4djj57vk5arhwbmhhf5b1qx3wpbhm",
-            "rev": "3021c55fa5723a806dde5fb2a630b115e2c53d06"
-        },
-        "recipe": {
-            "sha256": "1vq308ac6jj1h8qa2b2sypisb38hbvwjimqndhpfir06fghkw94l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150218.318",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "json",
-            "names",
-            "org"
-        ]
-    },
-    "go-dlv": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "benma",
-            "repo": "go-dlv.el",
-            "sha256": "0wha1h5mnnh3nsiaf5q1drrvk1gj2cn18bapi8ysy5jdpzi4xqsv",
-            "rev": "8d5a0076b3d43e7af61149370e583c0d15cb2dd1"
-        },
-        "recipe": {
-            "sha256": "13mk7mg2xk7v65r1rs6rmvi4g5nvm8jqg3p9nhk62d46i7dzp61i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151030.259",
-        "deps": [
-            "go-mode"
-        ]
-    },
-    "column-enforce-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jordonbiondo",
-            "repo": "column-enforce-mode",
-            "sha256": "0ay4wrnyrdp4v3vjxr99hy8fpq6zsyh246c0gbp7bh63l5fx8nwr",
-            "rev": "f43263e50ae83db099d83ea445f93e248a3207a0"
-        },
-        "recipe": {
-            "sha256": "1qh7kwr65spbbnzvq744gkksx50x04zs0nwn5ly60swc05d05lcg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140902.1149",
-        "deps": []
-    },
-    "busybee-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mswift42",
-            "repo": "busybee-theme",
-            "sha256": "11z987frzswnsym8g3l0s9wwdly1zn5inl2l558m6kcvfy7g59cx",
-            "rev": "70850d1781ff91c4ce125a31ed451d080f8da643"
-        },
-        "recipe": {
-            "sha256": "0w0z5x2fbnalv404av3mapfkqbfgyk81a1mzvngll8x0pirbyi10",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130920.1142",
-        "deps": []
-    },
-    "erlang": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "erlang",
-            "repo": "otp",
-            "sha256": "1dl2sxd77miaqbl9plrg6kgql5jg5vz42lj9f85i771g95h2c6nk",
-            "rev": "21d6192389a04024f7a41ced9d0911a9cce6f4e8"
-        },
-        "recipe": {
-            "sha256": "1gmrdkfanivb9l5lmkl0853snlhl62w34537r82w11z2fbk9lxhc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151013.357",
-        "deps": []
-    },
-    "cssh": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dimitri",
-            "repo": "cssh",
-            "sha256": "1xf2hy077frfz8qf91c0l0qppcjxzr4bsbb622bx6fidqkpa3a1a",
-            "rev": "2fe2754235225a59b63f08b130cfd4352e2e1c3f"
-        },
-        "recipe": {
-            "sha256": "10yvvyzqr06jvijmzis9clb1slzp2mn80yclis8wvrmg4p8djljk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150810.1209",
-        "deps": []
-    },
-    "apropos-fn+var": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/apropos-fn+var.el",
-            "sha256": "0q1b2x4z0ds4y45gy7sxc68xyai3g8kmqnssnhdina4x20sgm2vf"
-        },
-        "recipe": {
-            "sha256": "1s5gnsipsj7dhc8ca806grg32i6vlwm78hcxhrbs830vx9k84g5x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150425.1301",
-        "deps": []
-    },
-    "concurrent": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiwanami",
-            "repo": "emacs-deferred",
-            "sha256": "0m7y41hqv8mjwyy3v8pmgffqw11gcbyvhmydj1ph0jwxkc68hy14",
-            "rev": "01710a52a1206a0da1374335e6b89ad5aed92160"
-        },
-        "recipe": {
-            "sha256": "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150309.2252",
-        "deps": [
-            "deferred"
-        ]
-    },
-    "yari": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hron",
-            "repo": "yari.el",
-            "sha256": "0w9a6j0ndpfwaz1g974vv5jqgbzxw26l19kq51j3ah73063cavpf",
-            "rev": "a2cb9656ee5dfe1fc2ee3854f3079a1c8e85dbe9"
-        },
-        "recipe": {
-            "sha256": "0sch9x899mzwdacg55w5j583k2r4vn71ish7gqpghd7cj13ii66h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151128.139",
-        "deps": []
-    },
-    "cobra-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Nekroze",
-            "repo": "cobra-mode",
-            "sha256": "1sx8grp3j7zcma3nb7zj6kijkdqx166vw1qgmm29hvx48bys6vlp",
-            "rev": "acd6e53f6286af5176471d01f25257e5ddb6dd01"
-        },
-        "recipe": {
-            "sha256": "11jscpbclxlq2xqy2nsfa4y575bp8h0kpkp8cfjqb05lm5ybcp89",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140116.1516",
-        "deps": []
-    },
-    "grep+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/grep+.el",
-            "sha256": "03a4mmhbkwj2bq48525jba6wiczs943lmlhvy5vz8x4hb47rlmc3"
-        },
-        "recipe": {
-            "sha256": "1qj4f6d3l88bdcnq825pylnc76m22x2i15yxdhc2b6rv80df7zsx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1610",
-        "deps": []
-    },
-    "textile-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "juba",
-            "repo": "textile-mode",
-            "sha256": "1qcd7vdg63q80zwz8ziaznllq1x7micmljm72s6sh3720rb5aiz2",
-            "rev": "db33dc5f994c008ef9f1556801bf8ac62d451f31"
-        },
-        "recipe": {
-            "sha256": "0c1l7ml9b1zipk5fhmhirrh070h0qwwiagdk84i04yvdmmcjw2nf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151203.253",
-        "deps": []
-    },
-    "xterm-title": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsmirror",
-            "repo": "xterm-title",
-            "sha256": "06cbr7y3wp7j8lnbys57g6md4fdx9xhlnxl73pj7xpfa5i2x9ifl",
-            "rev": "b6ea73d297d191d48bba7dd1e2adc23bbdfa1c3c"
-        },
-        "recipe": {
-            "sha256": "08z8qg9x6vjpybbhxa8x46qnp3951miz1264fivg776y76cg3ck6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20091203.1223",
-        "deps": []
-    },
-    "helm-zhihu-daily": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xuchunyang",
-            "repo": "helm-zhihu-daily",
-            "sha256": "11fznbfcv4rac4h50mkax1g66wd2f91f5dw2v4jxjq2f5y4h4w0g",
-            "rev": "c084d2505621dbb71d83ec10550fa0801623cafc"
-        },
-        "recipe": {
-            "sha256": "0hkgail60s9qhxl0pskqxjvfz93iq1qh1kcmcq0x5kq7d08b911r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151006.319",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "helm"
-        ]
-    },
-    "vector-utils": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "vector-utils",
-            "sha256": "1wa03gb98x650q798aqshm43kh6gfxaz1rlyrmvka5dxgf48whmf",
-            "rev": "c38ca1c6a23b2b51a6ac36c2c64e50e21cbe9d21"
-        },
-        "recipe": {
-            "sha256": "07armr23pq5pd47lqhir6a59r86c84zikbc51d8vfcaw8y71yr5n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140508.1541",
-        "deps": []
-    },
-    "darkburn-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gorauskas",
-            "repo": "darkburn-theme",
-            "sha256": "19vrxfzhi0sqf7frzjx5z02d65r2jp1w2nhhf0527g7baid5hqvf",
-            "rev": "a0151684ae4fa7c364115188422f6c3425d1594c"
-        },
-        "recipe": {
-            "sha256": "18hwdnwmkf640vcyx8d66i424wwazbzjq3k0w0xjmwsn2mpyhm9w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151003.300",
-        "deps": []
-    },
-    "bongo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dbrock",
-            "repo": "bongo",
-            "sha256": "0ghjfrwc2i04rxg3nqc5fg2kgfyjlhk8n2qcz53p9i7ncc3zgpha",
-            "rev": "4cdacc10a530d4edbfdf6c95891f3cf229518e9d"
-        },
-        "recipe": {
-            "sha256": "07i9gw067r2igp6s2g2iakm1ybvw04q6zznna2cfdf08nax64ghv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151205.1009",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "ac-dabbrev": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/ac-dabbrev.el",
-            "sha256": "0q0lbhdng5s5hqa342yyvg02hf2bfbwq513lj1rlaqz4ykvpd7fh"
-        },
-        "recipe": {
-            "sha256": "03lndw7y55bzz4rckl80j0kh66qa82xxxhfakzs1dh1h9f1f0azh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130906.18",
-        "deps": []
-    },
-    "caskxy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "caskxy",
-            "sha256": "15sq5vrkhb7c5j6ny6wy4bkyl5pggch4l7zw46an29rzni3pffr3",
-            "rev": "dc18dcab7ed526070ab76de071c9c5272e6ac40e"
-        },
-        "recipe": {
-            "sha256": "0x4s3c8m75zxsvqpgfc5xwll0489zzdnngmnq048z9gkgcd7pd2s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140513.1039",
-        "deps": [
-            "log4e",
-            "yaxception"
-        ]
-    },
-    "aurora-config-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bdd",
-            "repo": "aurora-config.el",
-            "sha256": "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28",
-            "rev": "0a7ca7987c3a0824e25470389c7d25c337a81593"
-        },
-        "recipe": {
-            "sha256": "0yqmpwj1vp0d5w9zw1hbyxzsbvw165dsgk1v1dxizkqwn7b1v7jm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140520.403",
-        "deps": []
-    },
-    "twittering-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hayamiz",
-            "repo": "twittering-mode",
-            "sha256": "02c9z229ayqnmlvja5a2fz3vk8914v9v8akin57q8a0gyzn2bli5",
-            "rev": "97197cdd3cc005000dc2599f67c754d74fab5972"
-        },
-        "recipe": {
-            "sha256": "0v9ijxw5jazh2hc0qab48y71za2l9ryff0mpkxhr3f79irlqy0a1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150906.1203",
-        "deps": []
-    },
-    "rtags": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Andersbakken",
-            "repo": "rtags",
-            "sha256": "0lvajqcw4mfw33wpb6m43k0c0f74s8m33lw5i730qvkrh0in8gf0",
-            "rev": "8f032d75a7a7d6b8019913b5f2b5703181a15d19"
-        },
-        "recipe": {
-            "sha256": "16jvbr4nm48p3dj9wmysjaxyz4ajcay19risqrs9fzrifkr21c9p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151221.1501",
-        "deps": []
-    },
-    "totd": {
-        "fetch": {
-            "tag": "fetchFromGitLab",
-            "owner": "egh",
-            "repo": "emacs-totd",
-            "sha256": "188cdgic25wrb4jdgdcj070a0pxsh3m0rd9d2r6i1s1n1nalrs6g",
-            "rev": "ca47b618ea8290776cdb5b0f1c2c335691f69660"
-        },
-        "recipe": {
-            "sha256": "1bp07xl9yh9x6bi6cn8wz11x90jhv1rhxaig540iydjn5b0ny9m0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150519.940",
-        "deps": [
-            "cl-lib",
-            "s"
-        ]
-    },
-    "skewer-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "skewer-mode",
-            "sha256": "0yj7r5f751lra9jj7lg90qp66sgnb7fcjw5v9hfna7r13qdn9f20",
-            "rev": "5c76ab1786f2f365eff33fd5f52ce4ec3f9b42a2"
-        },
-        "recipe": {
-            "sha256": "1zp4myi9f7pw6zkgc0xg12585iihn7khcsf20pvqyc0vn4ajdwqm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150914.1504",
-        "deps": [
-            "emacs",
-            "js2-mode",
-            "simple-httpd"
-        ]
-    },
-    "yesql-ghosts": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "yesql-ghosts",
-            "sha256": "1fyvvkx6pa41bcr9cyh4yclwdzc5bs742s9fxr6wb4a5scq3hg9m",
-            "rev": "8f1faf0137b85a5072d13e1240a463d9a35ce2bb"
-        },
-        "recipe": {
-            "sha256": "1hxzbnfd15f0ifdqjbw9nhxd0z46x705v2bc0xl71nav78fgpswf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150220.637",
-        "deps": [
-            "cider",
-            "dash",
-            "s"
-        ]
-    },
-    "latex-extra": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "latex-extra",
-            "sha256": "06k1x3334hmdfs07s2nsvjs6qq9bk3dz2ij2kq667rc7m11hwa77",
-            "rev": "b4ca0185b7046b1d4e2ef90082f23e9e774d626d"
-        },
-        "recipe": {
-            "sha256": "1w98ngxymafigjpfalybhs12jcf4916wk4nlxflfjcx8ryd9wjcj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151116.322",
-        "deps": [
-            "auctex",
-            "cl-lib"
-        ]
-    },
-    "minizinc-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "m00nlight",
-            "repo": "minizinc-mode",
-            "sha256": "0808cl5ixvmhd8pa6fc8rn7wbxzvqjgz43mz1pambj89vbkzmw1c",
-            "rev": "98064f098e6871382614fcf3c99520f7a526af0a"
-        },
-        "recipe": {
-            "sha256": "1blb6mbyqvmdvwp477p1ggs3n6rzi9sdfvi0v1wfzmd7k749b10c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151214.758",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "transpose-frame": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/transpose-frame.el",
-            "sha256": "1f67yksgw9s6j0033hmqzaxx2a93jm11sd5ys7cc3li5gfh680m4"
-        },
-        "recipe": {
-            "sha256": "0bqip7vckic3kfq3d31ifs1zics1djxwj2jadafj6f1agv02sdz5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151126.826",
-        "deps": []
-    },
-    "travis": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nlamirault",
-            "repo": "emacs-travis",
-            "sha256": "1jd7xsvs4m55fscp62a9lk59ip4sgifv4kazl55b7543nz1i31bz",
-            "rev": "c8769d3db10ed4604969049e3bd276afa0a0138e"
-        },
-        "recipe": {
-            "sha256": "1km496cq1vni9gy2d3z4c9524q62750ywz745rjz4r7178ip9mix",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150825.638",
-        "deps": [
-            "dash",
-            "pkg-info",
-            "request",
-            "s"
-        ]
-    },
-    "mocha-snippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cowboyd",
-            "repo": "mocha-snippets.el",
-            "sha256": "06c92q1wrj6b8d8k7i10d4gcy5liag3x4f4chh510c4d3wi0f6sp",
-            "rev": "b8d321eda797e8382f0033901694860fe52f19a9"
-        },
-        "recipe": {
-            "sha256": "0dbsdk4jpzxv2sxx0nia9zhd0a0wmkz1qcqmbd15m1909ccdwxds",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150116.1000",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "calfw-gcal": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "calfw-gcal.el",
-            "sha256": "14n5rci4bkbl7037xvkd69gfxnjlgvd2j1xzciqcgz92f06ir3xi",
-            "rev": "14aab20687d6cc9e6c5ddb9e11984c4e14c3d870"
-        },
-        "recipe": {
-            "sha256": "182p56wiycrm2cjzmlqabksyshpk7nga68jf80vjjmaavp5xqsq8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120111.400",
-        "deps": []
-    },
-    "project-explorer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sabof",
-            "repo": "project-explorer",
-            "sha256": "04l4m3kxbwvyw9xy6cwakrdxxdswrrs7sya8zn6m738aawbr1mcd",
-            "rev": "589a09008706f5f4ef91393dc4306eede0d15ca9"
-        },
-        "recipe": {
-            "sha256": "076lzmyi1n7yrgdgyh9qinq271qk6k64x0msbzarihr3p4psrn8m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150503.1914",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "es-lib",
-            "es-windows"
-        ]
-    },
-    "sequential-command": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/sequential-command.el",
-            "sha256": "0vg8rqzzi29swznhra2mnf45czr2vb77dpcxn3j0fi7gynx3wcwk"
-        },
-        "recipe": {
-            "sha256": "03qybacgy5fs3lam73x0rds4f68s173mhbah6rr97272nikd50v1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151207.1603",
-        "deps": []
-    },
-    "ant": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "apgwoz",
-            "repo": "ant-el",
-            "sha256": "1g4ah0iwqrvvzcxr0ss6il5kign73gzcz1dbc22wdgprlfa4hah7",
-            "rev": "8afe6cd0ee4674911ce6b9381b551ab22c567c49"
-        },
-        "recipe": {
-            "sha256": "03rxn2dh0xj89kl24jd19q7kmrn1hnr2cdl3519bpng298kxwni6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131228.107",
-        "deps": []
-    },
-    "ac-helm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yasuyk",
-            "repo": "ac-helm",
-            "sha256": "1ycchpiiavxw8n08gra0bsp9pxp6ln8cgjrkz9jjq7i6ixi8f9d6",
-            "rev": "0cde22dac4726d08c27801c926cf40b1165c8a07"
-        },
-        "recipe": {
-            "sha256": "16ajxlhcah5zbvywpc6l4l1arr308gjpgvdx6l1nrv2zvpckhlwq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140919.1117",
-        "deps": [
-            "auto-complete",
-            "cl-lib",
-            "helm",
-            "popup"
-        ]
-    },
-    "node-resolver": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "meandavejustice",
-            "repo": "node-resolver.el",
-            "sha256": "1cgmq00ackabwcl4h0n2bb8y08wz0ir5rzca2q3sk4asly6d02m7",
-            "rev": "ef9d0486907a746a80b02ffc6208a09c168a9f7c"
-        },
-        "recipe": {
-            "sha256": "1ng4rgm8f745fajqnbjhi2rshvn6icwdpbh5dzpzhim1w9kb3bhh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140930.1223",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "rainbow-delimiters": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "rainbow-delimiters",
-            "sha256": "0gxc8j5a14bc9mp43cbcz41ipc0z1yvmypg52dnl8hadirry20gd",
-            "rev": "0823d0c67f935a4c36a1c945e93051102963c7fb"
-        },
-        "recipe": {
-            "sha256": "132nslbnszvbgkl0819z811yar3lms1hp5na4ybi9gkmnb7bg4rg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150320.217",
-        "deps": []
-    },
-    "pp+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/pp+.el",
-            "sha256": "1997hkxnnhrhkszzxmhabkh8ifb07bzr0w9svx8yynn22j0s5dmh"
-        },
-        "recipe": {
-            "sha256": "1ng5x7dp85y6yqj6q43h08qdnapg2j1ab8rmc47w4w79d1pryniq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150418.1028",
-        "deps": []
-    },
-    "evil-annoying-arrows": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "endrebak",
-            "repo": "evil-annoying-arrows",
-            "sha256": "05fba10yvxl82g2xl48mxwz7cwjp4pylb7n8a4b08i8f9xasny7f",
-            "rev": "1ec60cea0e67d782e5b8d093d19da6d0d4fd1e7f"
-        },
-        "recipe": {
-            "sha256": "024zz9l43y1kk2hm8l96h1ahril23cj35f0x72jrcfjysid7wpry",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150509.1618",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "dired-hacks-utils": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "dired-hacks",
-            "sha256": "15jri9cj5jgr3ff423izd8idd7djay238c9pa3ccy05djl9z2hdx",
-            "rev": "6647825dbca4269afa76302e345d6bd15b222e42"
-        },
-        "recipe": {
-            "sha256": "1vgl0wqf7gc2nbiqjn0rkrdlnxfm3wrgspx5b3cixv2n8rqx8kyi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150819.1148",
-        "deps": [
-            "dash"
-        ]
-    },
-    "twig-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "moljac024",
-            "repo": "twig-mode",
-            "sha256": "0wvmih2y3hy7casxx2y1w8csmzfnfgbb5ivpggr94sc86p6bg8sa",
-            "rev": "2849f273a4855d3314a9c0cc84134f5b28ad5ea6"
-        },
-        "recipe": {
-            "sha256": "1m3xjgmkqg8aj536wcg2f2hf4y6whscbsh7z7448hl4b5qjwii4n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130220.1250",
-        "deps": []
-    },
-    "genrnc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "emacs-genrnc",
-            "sha256": "08cw1fa25kbhbq2sp1cpn90bz38i9hjfdj93xf6wvki55b52s0nn",
-            "rev": "da75b1966a73ad215ec2ced4522c25f4d0bf1f9a"
-        },
-        "recipe": {
-            "sha256": "1nwbdscl0yh9j1n421can93m6s8j9dkyb3xmpampr6x528g6z0lm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140612.737",
-        "deps": [
-            "concurrent",
-            "deferred",
-            "log4e",
-            "yaxception"
-        ]
-    },
-    "unicode-progress-reporter": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "unicode-progress-reporter",
-            "sha256": "16jgm70ldsngxldiagjkw3ragypalpiidnf82g5hss9ciybkd3j4",
-            "rev": "5e66724fd7d15743213b082474d798117b194494"
-        },
-        "recipe": {
-            "sha256": "03z7p27470fqy3gd356l9cpp44a35sfrxz94dxmx388rzlygk7y7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140508.1541",
-        "deps": [
-            "emacs",
-            "list-utils",
-            "pcache",
-            "persistent-soft",
-            "ucs-utils"
-        ]
-    },
-    "faff-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "WJCFerguson",
-            "repo": "emacs-faff-theme",
-            "sha256": "1sc5f867h7i0n2gd9qcydqn1b2pk227l92ad4bf9nnpl3jmdr26v",
-            "rev": "8ec2bee09b386c711b0753ab12ace926d06fca7e"
-        },
-        "recipe": {
-            "sha256": "1dmwbkp94zsddy0brs3mkdjr09n69maw2mrdfhriqcdk56qpwp4g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151027.717",
-        "deps": []
-    },
-    "fm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsmirror",
-            "repo": "fm",
-            "sha256": "1fk4zsb4jliwz10sqz5bpqgj1p479mc506dmvy4zq3vqnpbypqvs",
-            "rev": "555bcebdf47ea3b1d9d1e152af7237b9daa62d59"
-        },
-        "recipe": {
-            "sha256": "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130126.1818",
-        "deps": []
-    },
-    "company-anaconda": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "proofit404",
-            "repo": "company-anaconda",
-            "sha256": "1369k2wcf5mgbnxsp6dn9vrml8dzq7lgv3a1918jhgmlxicn4dm1",
-            "rev": "f796fea142cb164a08f9b0968f565e279bd23dd7"
-        },
-        "recipe": {
-            "sha256": "1s7y47ghy7q35qpfqavh4p9wr91i6r579mdbpvv6h5by856yn4gl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151210.523",
-        "deps": [
-            "anaconda-mode",
-            "cl-lib",
-            "company",
-            "dash",
-            "s"
-        ]
-    },
-    "inlineR": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "inlineR.el",
-            "sha256": "15nasjknmzy57ilj1gaz3w5sj8b3ijcpgwcd6w2r9xhgcl86m40q",
-            "rev": "29357186beca825e3d0451b700ec09b9ed65e37b"
-        },
-        "recipe": {
-            "sha256": "1fflq2gkpfn3jkv4a6yywzmxsq6qszfid1ri85ass1ppw6scdvzw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120520.932",
-        "deps": []
-    },
-    "evil-tutor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syl20bnr",
-            "repo": "evil-tutor",
-            "sha256": "00yfq8aflxvp2nnz7smgq0c5wlb7cips5irj8qs6193ixlkpffvx",
-            "rev": "4e124cd3911dc0d1b6817ad2c9e59b4753638f28"
-        },
-        "recipe": {
-            "sha256": "1hvc2w5ykrgh62n4sxqqqcdk5sd7nmh6xzv4mir5vf9y2dgqcvsn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150103.50",
-        "deps": [
-            "evil"
-        ]
-    },
-    "flycheck-dmd-dub": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "atilaneves",
-            "repo": "flycheck-dmd-dub",
-            "sha256": "0dqkd9h54qmr9cv2gmic010j2h03i80psajrv4wq3c4pvxyqyn2j",
-            "rev": "1acd7e3683ed55ac11f013e325c1cbf19be8ad66"
-        },
-        "recipe": {
-            "sha256": "0pg3sf7h6xqv65yqclhlb7fx1mp2w0m3qk4vji6m438kxy6fhzqm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151019.822",
-        "deps": [
-            "flycheck"
-        ]
-    },
-    "evil-visualstar": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bling",
-            "repo": "evil-visualstar",
-            "sha256": "17m4kdz1is4ipnyiv9n3vss49faswbbd6v57df9npzsbn5jyydd0",
-            "rev": "bd9e1b50c03b37c57355d387f291c2ec8ce51eec"
-        },
-        "recipe": {
-            "sha256": "135l9hjfbpn0a6p53picnpydi9qs5vrk2rfn64gxa5ag2apcyycy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150514.1610",
-        "deps": [
-            "evil"
-        ]
-    },
-    "hlinum": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tom-tan",
-            "repo": "hlinum-mode",
-            "sha256": "0yw89kxvz53i9rbq3lsbp5xkgfl1986s23vyra5pipakfv85gmq4",
-            "rev": "22218c9883a2de6468bf6ad13864b50b44c93592"
-        },
-        "recipe": {
-            "sha256": "04b6m0njr7yrbcbpkhqz4hmqpfacmyca3lw75dyw3vpjpsj2g0iv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150621.2133",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "rainbow-identifiers": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "rainbow-identifiers",
-            "sha256": "05i0jpmxzsj2lsj48cafn3v93z37l7k5kaza2ik3yirdpjdibyrh",
-            "rev": "19fbfded1baa98d12335f26f6d7b20e5ae44ce2e"
-        },
-        "recipe": {
-            "sha256": "0lw790ymrgpyh0sxwmzinl2ik5vl5vggbg14cd0cx5yagkw5y3mp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141102.926",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "demangle-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "liblit",
-            "repo": "demangle-mode",
-            "sha256": "13jfhc9gavvb9dxmgi3k7ivp5iwh4yw4m11r2s8wpwn6p056bmfl",
-            "rev": "07e62a7f976f6c7366b4b0475bbb5cff881452b8"
-        },
-        "recipe": {
-            "sha256": "0ky0bb6rc99vrdli4lhs656qjndnla9b7inc2ji9l4n1zki5qxzk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151109.1453",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "github-clone": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dgtized",
-            "repo": "github-clone.el",
-            "sha256": "1aiy1jwrzyy3v0ra4a107dbsdf8c92yyvv87q5pf471vsf61fqmb",
-            "rev": "96070145cdcbbfbbfbfa69e6992b8663fef5c9d1"
-        },
-        "recipe": {
-            "sha256": "0ffrm4lmcj3d9kx3g2d5xbiih7hn4frs0prjrvcjq8acvsbc50q9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151225.1842",
-        "deps": [
-            "emacs",
-            "gh",
-            "magit"
-        ]
-    },
-    "shrink-whitespace": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jcpetkovich",
-            "repo": "shrink-whitespace.el",
-            "sha256": "07zzyfibs2c7w4gpvdh9003frznbg7zdnrx0nv8bvn0b68d3yz0m",
-            "rev": "8d4263d974fbe66417c0bb9edc155ecc2f48e4b7"
-        },
-        "recipe": {
-            "sha256": "12if0000i3rrxcm732layrv2h464wbb4xflbbfc844c83dbx1jmq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150916.1415",
-        "deps": []
-    },
-    "helm-git-files": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kenbeese",
-            "repo": "helm-git-files",
-            "sha256": "157b525h0kiaknn12fsw67fg26lzb20apx8sssmvlcicqcd51iaw",
-            "rev": "43193960774069369ac6964bbf7c026900206fa8"
-        },
-        "recipe": {
-            "sha256": "02109r956nc1dmqh4v082vkr9wdixh03xhl7icwkzl7ipr5453s6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141212.717",
-        "deps": [
-            "helm"
-        ]
-    },
-    "hi2": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nilcons",
-            "repo": "hi2",
-            "sha256": "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf",
-            "rev": "c9d199727b5cdcb9e36a972b38131ce4611fd6c8"
-        },
-        "recipe": {
-            "sha256": "1wxkjg1jnw05lqzggi20jy2jl20d8brvv76vmrf6lnz62g6jv9h2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141005.1431",
-        "deps": []
-    },
-    "deferred": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiwanami",
-            "repo": "emacs-deferred",
-            "sha256": "0m7y41hqv8mjwyy3v8pmgffqw11gcbyvhmydj1ph0jwxkc68hy14",
-            "rev": "01710a52a1206a0da1374335e6b89ad5aed92160"
-        },
-        "recipe": {
-            "sha256": "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151007.1857",
-        "deps": []
-    },
-    "eshell-did-you-mean": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xuchunyang",
-            "repo": "eshell-did-you-mean",
-            "sha256": "0v0wshck5n4hspcv1zk1g2nm6xiigcjp16lx0dc8wzkl6ymljvbg",
-            "rev": "7cb6ef8e2274d0a50a9e114d412307a6543533d5"
-        },
-        "recipe": {
-            "sha256": "1z1wpn3sj1gi5nn0a71wg0i3av0dijnk79dc32zh3qlh500kz8mz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150915.1452",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "bind-key": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jwiegley",
-            "repo": "use-package",
-            "sha256": "1kng5yzm73gz67znifjhzrr2zbcc7cyb2f1j703hmf33zb9naqhp",
-            "rev": "1d7e6ff5b73761c3b7180530da8bc433338d0cec"
-        },
-        "recipe": {
-            "sha256": "1qw2c27016d3yfg0w10is1v72y2jvzhq07ca4h6v17yi94ahj5xm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151220.1639",
-        "deps": []
-    },
-    "urlenc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "buzztaiki",
-            "repo": "urlenc-el",
-            "sha256": "0xwr0v4f64d7hi5ldig4r5yjn8h3f8by49g5820187lsp7ng2nw4",
-            "rev": "835a6dcb783bbe84714bae87a3464aa0b128bfac"
-        },
-        "recipe": {
-            "sha256": "0n6shh95m11162zsnf62zy1ljswdjznjilxx2dbqyqdrn7qr2dgh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140116.856",
-        "deps": []
-    },
-    "bbdb-": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "bbdb-",
-            "sha256": "17nbnkg0zn6p89r27mk9hl6qhv6xscwdsq8iyikdw03svpr16lnp",
-            "rev": "2839e84c894de2513af41053e80a277a1b483d22"
-        },
-        "recipe": {
-            "sha256": "1vzbalcchay4pxl9f1sxg0zclgc095f59dlj15pj0bqq61sbl9jf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140221.1754",
-        "deps": [
-            "bbdb",
-            "log4e",
-            "yaxception"
-        ]
-    },
-    "ace-pinyin": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cute-jumper",
-            "repo": "ace-pinyin",
-            "sha256": "00pcdf2nz27f7zbpyrgqr9nh8pd4nhxvsz885b6mq263s0qyykzx",
-            "rev": "d7c8fed8ab6f6fbbbcb95bcd74516c30d05dcdfa"
-        },
-        "recipe": {
-            "sha256": "18gmj71zd0i6yx8ifjxsqz2v81jx0j37f5kxllf31w7fj32ymbkc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151126.1517",
-        "deps": [
-            "ace-jump-mode",
-            "avy"
-        ]
-    },
-    "vc-auto-commit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thisirs",
-            "repo": "vc-auto-commit",
-            "sha256": "081cyicwyx1jdjkk5xp9pgy4xqnawwznkxz2pc570xxf06yx46cs",
-            "rev": "b23ee2727495b89d0a979a7420ce3a313434fdfe"
-        },
-        "recipe": {
-            "sha256": "1xpp7vbld3jgcr249m5h7il919kfg7d5ap3zs64i27axzdhv26zk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150330.303",
-        "deps": []
-    },
-    "etable": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "ETable",
-            "sha256": "1k361bbwd9z17qlycymb1x7scidvgvrh9bdp06rhwfh9j3slrbxy",
-            "rev": "8c9a32a92e7f808874c150c851f1605b2dd83d6e"
-        },
-        "recipe": {
-            "sha256": "0m4h24mmhp680wfhb90im228mrcyxapzyi4kla8xdmss83gc0c32",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150327.1216",
-        "deps": [
-            "dash",
-            "emacs",
-            "interval-list"
-        ]
-    },
-    "gplusify": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jorgenschaefer",
-            "repo": "gplusify",
-            "sha256": "1l43h008l7n6waclb2km32dy8aj7m5yavm1pkq38p9ppzayfxqq1",
-            "rev": "bd6237ae671db2fbf406dcc6225839dcbd2475b2"
-        },
-        "recipe": {
-            "sha256": "0fgkcvppkq6pba1giddkfxp9z4c8v2cid9nb8a190b3g85wcwycr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150312.1444",
-        "deps": []
-    },
-    "prop-menu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "david-christiansen",
-            "repo": "prop-menu-el",
-            "sha256": "18ap2liz5r5a8ja2zz9182fnfm47jnsbyblpq859zks356k37iwc",
-            "rev": "50b102c1c0935fd3e0c465feed7f27d66b21cdf3"
-        },
-        "recipe": {
-            "sha256": "0dhy52fxxpa058mhhx0slw3sly3dlxm9vkax6fd1sap6f6v00p5i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150728.618",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "esqlite": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-esqlite",
-            "sha256": "0ag444hfrpdrf3lnaz7l2plj392xgh7a2080421z3g0alc74m8h3",
-            "rev": "fae9826cbc255b0f0686a801288f1441bda5f631"
-        },
-        "recipe": {
-            "sha256": "1dny5qjzl9gaj90ihzbhliwk0n0x7jz333hzf6gaw7wsjmx91wlh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151206.606",
-        "deps": [
-            "pcsv"
-        ]
-    },
-    "green-phosphor-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aalpern",
-            "repo": "emacs-color-theme-green-phosphor",
-            "sha256": "0rgv96caigcjffg1983274p4ff1icx1xh5bj7rcd53hai5ag16mp",
-            "rev": "fa42f598626adfdc5450e5c380fa2d5df6110f28"
-        },
-        "recipe": {
-            "sha256": "1p4l75lahmbjcx74ca5jcyc04828vlcahk7gzv5lr7z9mhvq6fbh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150515.947",
-        "deps": []
-    },
-    "cypher-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fxbois",
-            "repo": "cypher-mode",
-            "sha256": "0vbcq807jpjssabmyjcdkpp6nnx1288is2c6x79dkrviw2xxw3qf",
-            "rev": "ce8543d7877c736c574a17b49874c9dcdc7a06d6"
-        },
-        "recipe": {
-            "sha256": "174rfbm7yzkznkfjmh9bdnm5fgqv9bjwm85h39317pv1g8c3mgv0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151110.542",
-        "deps": []
-    },
-    "bbcode-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ejmr",
-            "repo": "bbcode-mode",
-            "sha256": "17ip24fk13aj9zldn2qsr4naa8anqhm484m1an5l5i9m9awfiyn7",
-            "rev": "b6ff1bfb8041b1435ebfc0a7d8e5e34eeb1b6aae"
-        },
-        "recipe": {
-            "sha256": "0ixxavmilr6na56yc148prbh3nlhcwir6rxqvh332cr8vr9gmp89",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141103.1541",
-        "deps": []
-    },
-    "ob-kotlin": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zweifisch",
-            "repo": "ob-kotlin",
-            "sha256": "01cjwg27m0iqndkwwl0v5w8vvk270xvi81za3y5hyrmb7dq6bfy7",
-            "rev": "c494f50184d25e196c009bf5cc105c4931b9464d"
-        },
-        "recipe": {
-            "sha256": "19g4s9dnipg9aa360mp0affmnslm6h7byg595rnaz6rz25a3qdpx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150312.814",
-        "deps": [
-            "org"
-        ]
-    },
-    "fold-dwim": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsmirror",
-            "repo": "fold-dwim",
-            "sha256": "1yz1wis31asw6xa5maliyd1ck2q02xnnh7dc6swgj9cb4wi7k6i1",
-            "rev": "c46f4bb2ce91b4e307136320e72c28dd50b6cd8b"
-        },
-        "recipe": {
-            "sha256": "0c9yxx45zlhb1h4ldgkjv7bndwlagpyingaaqn9dcsxidrvp3p5x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140208.1037",
-        "deps": []
-    },
-    "cake-inflector": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k1LoW",
-            "repo": "emacs-cake-inflector",
-            "sha256": "0xq10jkbk3crdhbh4lab39xhfw6vvcqz3if5q3yy4gzhx7zp94i4",
-            "rev": "a91cecd533930bacf1dc30f5209831f79847abda"
-        },
-        "recipe": {
-            "sha256": "04mrqcm1igb638skaq2b3nr5yzxnck2vwhln61rnh7lkfxq7wbwf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140415.358",
-        "deps": [
-            "s"
-        ]
-    },
-    "kwin": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "reactormonk",
-            "repo": "kwin-minor-mode",
-            "sha256": "0irbfgip493hyh45msnb7climgfwr8f05nvc97bzaqggnay88scy",
-            "rev": "d4f8f3593598b71ee596e0a87b2c1d6a912a9566"
-        },
-        "recipe": {
-            "sha256": "1pxnyj81py3ygadmyfrqndb0jkk6xlbf0rg3857hsy3ccblzm7ki",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150308.1312",
-        "deps": []
-    },
-    "purescript-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dysinger",
-            "repo": "purescript-mode",
-            "sha256": "0k2plyvd6842yryzrfadbf4h7a9hrjvkcvixclbca2bkvfik3864",
-            "rev": "1390bf6a2ddd0764a5ee7f5cac4e88980cf44eaf"
-        },
-        "recipe": {
-            "sha256": "00gz752mh7144nsaka5q3q4681jp845kc5vcy2nbfnqp9b24l55m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150316.2028",
-        "deps": []
-    },
-    "centered-cursor-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/centered-cursor-mode.el",
-            "sha256": "15psyizjz8wf9wfxwwcdmg1bxf8jbv0qy40rskz7si7vxin8hhxl"
-        },
-        "recipe": {
-            "sha256": "0a5mymnkwjvpra8iffxjwa5fq3kq4vc8fw7pr7gmrwq8ml7il5zl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151001.834",
-        "deps": []
-    },
-    "rectangle-utils": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thierryvolpiatto",
-            "repo": "rectangle-utils",
-            "sha256": "14ysbjdndsmcc4j3zhc3nfjxhdm9310jx237mrp98ancxdhsh4q9",
-            "rev": "81071e62862c0062b8559eb217e6658878c34a1e"
-        },
-        "recipe": {
-            "sha256": "1w5z2gykydsfp30ahqjihpvq04c5v0cfslbrrg429hycys8apws7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150528.1428",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "helm-R": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "helm-R.el",
-            "sha256": "0nip0zrmn944wy0x2dc5ryr0m7a948rn2a8cbaajghs7a7zai4cr",
-            "rev": "b0eb9d5f6a483a9dbe6eb6cf1f2024d4f5938bc2"
-        },
-        "recipe": {
-            "sha256": "0zq9f2xhgap3ihnrlsrsaxaz0nx014k0820bfsq7lckwcnm0mng1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120819.1914",
-        "deps": [
-            "ess",
-            "helm"
-        ]
-    },
-    "mingus": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pft",
-            "repo": "mingus",
-            "sha256": "0r4jh58pls859fljb6qm49l4imfxxif9mxsmjgwan0czfhq33xqh",
-            "rev": "151f2225f9af3c4cc7ca89e94dc6a19077baf6a4"
-        },
-        "recipe": {
-            "sha256": "0vw09qk56l792706vvp465f40shf678mcmdh7iw8wsjix4401bzi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151115.1317",
-        "deps": [
-            "libmpdee"
-        ]
-    },
-    "hippie-namespace": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "hippie-namespace",
-            "sha256": "0b5wrid428s11afc48d6mdifmd31gmzyrj9zcpd3jwk63ydiihdc",
-            "rev": "d0d0f15c67ab8bef5e9d1e29a89ecd3613a60b49"
-        },
-        "recipe": {
-            "sha256": "1bzjhq116ci9c9f0aw121fn3drmg2pw5ny1w6wcasa4p30syxxf0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140508.1541",
-        "deps": []
-    },
-    "sbt-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ensime",
-            "repo": "emacs-sbt-mode",
-            "sha256": "1l6l90lhqk56l20dhy19snn0fz4di03j714d2v07yl19q64gfk6c",
-            "rev": "209a396babd0a302cbb5a32f16525aabb409528b"
-        },
-        "recipe": {
-            "sha256": "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151014.242",
-        "deps": [
-            "scala-mode2"
-        ]
-    },
-    "evil-easymotion": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "PythonNut",
-            "repo": "evil-easymotion",
-            "sha256": "17qb3qnnn2f8jj2mi8735ymnw8rhpj6w3l61lhqfrkc0m6vq1vhy",
-            "rev": "ba7f1e08a5dca4c0540b347f55547828421d6c79"
-        },
-        "recipe": {
-            "sha256": "0zixgdhc228y6yqr044cbyls0pihzacqsgvybhhar916p4h8izgv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151016.2259",
-        "deps": [
-            "avy",
-            "emacs"
-        ]
-    },
-    "org-dashboard": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bard",
-            "repo": "org-dashboard",
-            "sha256": "1nqfi139cag3ll8wxk8rh59hay97vi8i0mlgnams4jla285zydj5",
-            "rev": "b523aefb5822c1f09a70bc429579c2959929782b"
-        },
-        "recipe": {
-            "sha256": "1hvhhbmyx12wsf2n1hd0hg5cy05zyspd82xxcdh04g4s9r3ikqj5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150812.502",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "shpec-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "shpec",
-            "repo": "shpec-mode",
-            "sha256": "1mizhbwvnsxxjz6m94qziibvhghhp8v8db3wxrq3z9gsaqqkcndn",
-            "rev": "146adc8281d0f115df39a3a3f982ac59ab61b754"
-        },
-        "recipe": {
-            "sha256": "155hc1nym3fsvflps8d3ixaqw1cafqp97zcaywdppp47n7vj8zjl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150530.422",
-        "deps": []
-    },
-    "jonprl-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "david-christiansen",
-            "repo": "jonprl-mode",
-            "sha256": "1a0091r1xs3fpvg1wynh53xibdsiaf2khz1gp6s8dc45z8r0bclx",
-            "rev": "a7c7525ee19682c700f4d1d432b5be5707e94f10"
-        },
-        "recipe": {
-            "sha256": "0763ad65dmpl2l5lw91mlppfdvrjg6ym45brhi8sdwwri1xnyv9z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151203.342",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "yasnippet"
-        ]
-    },
-    "anything-replace-string": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k1LoW",
-            "repo": "anything-replace-string",
-            "sha256": "1834yj2vgs4dasdfnppc8iw8ll3yif948biq9hj0sbpsa2d8y44k",
-            "rev": "1962f24243d6013bcef7e8d23136277d42e13130"
-        },
-        "recipe": {
-            "sha256": "1fagi6cn88p6sf1yhx1qsi7nw9zpyx9hdfl66iyskqwddfvywp71",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140317.536",
-        "deps": [
-            "anything"
-        ]
-    },
-    "novice+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/novice+.el",
-            "sha256": "1lv911k9s0607g8mrhc42zb7s1cw0zqqafqbrk6w17j4hr53n897"
-        },
-        "recipe": {
-            "sha256": "0r4w4c6y4fny8k0kipzqjsn7idwbi9jq6x9yw51d41ra3pkpvfzf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1834",
-        "deps": []
-    },
-    "discover": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mickeynp",
-            "repo": "discover.el",
-            "sha256": "0f7h2rhh37lrs6xclj182li6s1fawv5m8w3hgy6qgm06dam45lka",
-            "rev": "7b0044bbb3b3bd5d811fdfb0f5ac6ec8de1239df"
-        },
-        "recipe": {
-            "sha256": "1hf57p90jn1zzhjl63zv9ascbgkcbr0p0zmd3fvzpjsw84235dga",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140103.1539",
-        "deps": [
-            "makey"
-        ]
-    },
-    "ob-elixir": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zweifisch",
-            "repo": "ob-elixir",
-            "sha256": "0qknm1h2ijnzs1km51hqwpnv5083m9ngi3nbxd90r7d6vva5fhhk",
-            "rev": "d0e8007efa0b99ab7a6e4cb7160a87d6cb60d210"
-        },
-        "recipe": {
-            "sha256": "1l5b9hww2vmqnjlsd6lbjpz9walck82ngang1amfnk4xn6d0gdhi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151021.647",
-        "deps": [
-            "org"
-        ]
-    },
-    "ledger-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ledger",
-            "repo": "ledger",
-            "sha256": "110yvfj01cfl40pf8c1ad8hy07kb6ibjiwvc8svfxrlhw5lca465",
-            "rev": "7eacf5130849b4d53948d4750e11bd08f8a97a27"
-        },
-        "recipe": {
-            "sha256": "0hi9waxmw1bbg88brlr3816vhdi0jj05wcwvrvfc1agvrvzyqq8s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151026.1742",
-        "deps": []
-    },
-    "eshell-autojump": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "coldnew",
-            "repo": "eshell-autojump",
-            "sha256": "13crzgkx1lham1nfsg6hj2zg875majvnig0v4ydg691zk1qi4hc2",
-            "rev": "c6a8b81a16576df9875e721fbbfe6690d04e7e43"
-        },
-        "recipe": {
-            "sha256": "09l2680hknmdbwr4cncv1v4b0adik0c3sm5i9m3qbwyyxm8m41i5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150927.224",
-        "deps": []
-    },
-    "company-restclient": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "iquiw",
-            "repo": "company-restclient",
-            "sha256": "04829y7510zxjww9pq8afvnzwyyv30c0b3a71mxwf6ympfxb9rx5",
-            "rev": "752f39490178832f6a09abd82e10d9356636350a"
-        },
-        "recipe": {
-            "sha256": "1md0n4k4wmbh9rmbwqh3kg2fj0c34rzqfd56jsq8lcdg14k0kdcb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151202.601",
-        "deps": [
-            "cl-lib",
-            "company",
-            "emacs",
-            "know-your-http-well",
-            "restclient"
-        ]
-    },
-    "ac-cake": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k1LoW",
-            "repo": "emacs-ac-cake",
-            "sha256": "1llpnb9vy612sg214i76rxnzcl3qx8pqnixczc5pik9kd3fdaz5f",
-            "rev": "f34c9e3ba8cb962e4708c8f53b623e1922500176"
-        },
-        "recipe": {
-            "sha256": "0s2pgf0m98ixgadsnn201vm5gnawanpvxv56sf599f33krqnxzkl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140315.1129",
-        "deps": [
-            "auto-complete",
-            "cake"
-        ]
-    },
-    "ddskk": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skk-dev",
-            "repo": "ddskk",
-            "sha256": "0yrjrrm0rkrvr34jwxbl5bm8ahr7w5xh76k859qwgi2cbz6vr7q0",
-            "rev": "47980e6c4f9979ff0b2d656befa5366c57e4527b"
-        },
-        "recipe": {
-            "sha256": "1wj3z6ldlkaj99xqh7a497in1syn7shf2w1ffcn6aiskxjrzmpiq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.42",
-        "deps": [
-            "ccc",
-            "cdb"
-        ]
-    },
-    "el-swank-fuzzy": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/el-swank-fuzzy.el",
-            "sha256": "1g2jhm9m5qcj6a231n5ch6b8bqwzq3kj275nd4s89p89v1252qhn"
-        },
-        "recipe": {
-            "sha256": "1m7y4c0r1w8ndmr1wgc2llrbfawbbxnvcvgjpsckb3704s87yxr1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130824.657",
-        "deps": []
-    },
-    "org-tree-slide": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "takaxp",
-            "repo": "org-tree-slide",
-            "sha256": "19id53sjv0r0xnm3l8d694s27dxlmdfm9dal57zlf60s5lg8hykq",
-            "rev": "3a2d3733baa81484ac53bee9a8d0f9dafa54881c"
-        },
-        "recipe": {
-            "sha256": "0v857zplv0wdbg4li667v2p5pn5zcf9fgbqcwa75x8babilkl6jn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151223.147",
-        "deps": []
-    },
-    "org-transform-tree-table": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jplindstrom",
-            "repo": "emacs-org-transform-tree-table",
-            "sha256": "1h15fr16kgbyrxambmk4hsmha6hx4c4yqkccb82g3wlvzmnqj5x3",
-            "rev": "0a9bf07f01bc5fc3b349aff64e83999a8de83b52"
-        },
-        "recipe": {
-            "sha256": "0n68cw769nk90ms6w1w6cc1nxjwn1navkz56mf11bsiqvsk3km7r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150110.833",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "asilea": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "asilea",
-            "sha256": "1s973vzivibaqjb8acn4ylrdasxh17jcfmmvqp4wm05nwhg75597",
-            "rev": "2aab1cc63b64ef08d12e84fd7ba5c94065f6039f"
-        },
-        "recipe": {
-            "sha256": "1lb8nr6r6yy06m4pxg8w9ja4zv8k5xwhl95v2wv95y1qwhgnwg3j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150105.925",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "icomplete+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/icomplete+.el",
-            "sha256": "1vcv3ssmn5wwjnz6wcc0lsb0awxgqk5pn9p8zgwnj8qbag31b4ky"
-        },
-        "recipe": {
-            "sha256": "0gxqkj4bjrxb046qisfz22wvanxx6bzl4hfv91rfwm78q3484slx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150619.1003",
-        "deps": []
-    },
-    "ox-reveal": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yjwen",
-            "repo": "org-reveal",
-            "sha256": "196bjiij0nj19qsz95y9l44sr63673mxxj0cv6aa3ijpm48vmj9p",
-            "rev": "b92d0e843f2526788caa08bda5284f23e15e09cd"
-        },
-        "recipe": {
-            "sha256": "092swxkkisvj2y18ynal8dn7wcfi7h4y6n0dlzqq28bfflarbwik",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151023.106",
-        "deps": [
-            "org"
-        ]
-    },
-    "demo-it": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "howardabrams",
-            "repo": "demo-it",
-            "sha256": "051i2ywmy0qs6cqq6qxyjpgy28k7pxr9wfjpm48r871hmb61xaai",
-            "rev": "1b41e85d34960278f21139b02e4d85eecb07c4b0"
-        },
-        "recipe": {
-            "sha256": "063v115xy9mcga4qv16v538k12rn9maz92khzwa35wx56bwz4gg7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151221.2343",
-        "deps": []
-    },
-    "helm-package": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-helm-package",
-            "sha256": "14ad0b9d07chabjclffjyvnmrasar1di9wmpzf78bw5yg99cbisw",
-            "rev": "117f5f26c96c0854aadaf9c52aaec961195d5798"
-        },
-        "recipe": {
-            "sha256": "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151210.248",
-        "deps": [
-            "cl-lib",
-            "helm"
-        ]
-    },
-    "dired-filter": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "dired-hacks",
-            "sha256": "15jri9cj5jgr3ff423izd8idd7djay238c9pa3ccy05djl9z2hdx",
-            "rev": "6647825dbca4269afa76302e345d6bd15b222e42"
-        },
-        "recipe": {
-            "sha256": "1mw94210i57wrqfyif6rh689xbwbpv1qp6bgc0j7z6g4xypvd52p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150909.1336",
-        "deps": [
-            "dash",
-            "dired-hacks-utils"
-        ]
-    },
-    "mmm-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "mmm-mode",
-            "sha256": "04rapmqblfjvmdccm9kqi8gn0him1x2q7hjwsyb8mg4lwxcd7qp9",
-            "rev": "c9a857a638701482931ffaaee262b61ce53489f3"
-        },
-        "recipe": {
-            "sha256": "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150828.1916",
-        "deps": []
-    },
-    "revive": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsmirror",
-            "repo": "revive",
-            "sha256": "037sac5fvz6l2zgzlf8ykk4jf9zhj7ybzyz013jqzjj47a6sn1r1",
-            "rev": "16e1ac7cfa2fdccddf60d4a0e15731fc7448d818"
-        },
-        "recipe": {
-            "sha256": "1l7c6zq3ga2k1488qb0hgxlk08p3vrcf0sx116c1f8z8nf4c8ny5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150417.1755",
-        "deps": []
-    },
-    "smart-tab": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "genehack",
-            "repo": "smart-tab",
-            "sha256": "0aighpby8khrljb67m533bwkzlsckyvv7d09cnzr1rfwxiil0ml4",
-            "rev": "28918a72045811294ecb33f666ba23fe66c169af"
-        },
-        "recipe": {
-            "sha256": "0qi8jph2c9fdsv2mqgxd7wb3q4dax3g5x2hc53kbgkjxylagjvp5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150703.1117",
-        "deps": []
-    },
-    "man-commands": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nflath",
-            "repo": "man-commands",
-            "sha256": "1lfq4hsq2n33l58ja5kzy6bwk9jxbcdsg6y8gqlk71lcslzqldrk",
-            "rev": "f4ba0c3790855d7544dff92d470d212f24de1d9d"
-        },
-        "recipe": {
-            "sha256": "1yl7y0k24gydldfs406v1n523q46m9x6in6pgljgjnjravc67wnq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151221.1621",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "helm-git": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "maio",
-            "repo": "helm-git",
-            "sha256": "1yfy4a52hx44r32i0b75bka8gfcn5lp61jl86lzrsi2cr9wg10pn",
-            "rev": "cb96a52b5aecadd3c27aba7749d14e43ab128d55"
-        },
-        "recipe": {
-            "sha256": "1ib73p7cmkw96csxxpkqwn6m60k1xrd46z6vyp29gj85cs4fpsb8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120630.1603",
-        "deps": []
-    },
-    "git-lens": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pidu",
-            "repo": "git-lens",
-            "sha256": "0s1adgsigaq47vx8bfbmr5z8jq9y230ykwbw0jqka61n4ibg9ish",
-            "rev": "1feacc217c58fd4a41f9378eb09658f664036509"
-        },
-        "recipe": {
-            "sha256": "1vv3s89vk5ncinqh2f724z0qbbzp8g4y5y670ryy56w1l6v2acfb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150817.214",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "emacs-setup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "echosa",
-            "repo": "emacs-setup",
-            "sha256": "15l3ab11vcmzqibkd6h5zqw5a83k8dmgcp4n26px29c0gv6bkpy8",
-            "rev": "cc36ad5318c6c0e65d1b9ff8dff5ea2437675de2"
-        },
-        "recipe": {
-            "sha256": "1x4rh8vx6fsb2d6dz2g9j6jamin1vmpppwy3yzbl1dnf7w4hx4kh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120727.926",
-        "deps": []
-    },
-    "interaction-log": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "michael-heerdegen",
-            "repo": "interaction-log.el",
-            "sha256": "0jdm4xjzpl5dr5s8n2hhd5md6hfl6m6v10nwd1n54pb7bv98aqsl",
-            "rev": "977a3d276b73a4e239addc6c30214bc55ac6fd1f"
-        },
-        "recipe": {
-            "sha256": "1r9qbvgssc2zdwgwmmwv5kapvmg1y3px7268gkiakkfanw3kqk6j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150603.1210",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "ac-emmet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yasuyk",
-            "repo": "ac-emmet",
-            "sha256": "1lkhqmfkjga7qi4r1m7mjax3pyf9m6minsn57cbzm2z2kvkhq22g",
-            "rev": "88f24876ee3b759978d4614a758280b5d512d543"
-        },
-        "recipe": {
-            "sha256": "09ycjllfpdgqaf5iis5bkkhal1vxvl3qkxrn2759p67s97c49f3x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131015.1058",
-        "deps": [
-            "auto-complete",
-            "emmet-mode"
-        ]
-    },
-    "dummy-h-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/dummy-h-mode.el",
-            "sha256": "0zq94x4br3sk6n4chrfnw7hpnsicxa02fcpk8hw1hfsaq3327n6v"
-        },
-        "recipe": {
-            "sha256": "1h2pm37y9kz62id0rm0zzgh1hpkhd9gvq95kjd29w0awsp9b6ca4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140816.733",
-        "deps": []
-    },
-    "highlight-quoted": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "highlight-quoted",
-            "sha256": "0vqkadhzszlxiqb4ysr7p86hhmi4z1j95llxa680xn6md8x2sj8a",
-            "rev": "ec9108486cf7f21f9a0b13f81369849b3b525f1f"
-        },
-        "recipe": {
-            "sha256": "0x6gxi0jfxvpx7r1fm43ikxlxilnbk2xbhdy9xivhgmmdyqiqqkl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140916.1322",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "org-wc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dato",
-            "repo": "org-wc",
-            "sha256": "0miahg10xx3sy85n22xqwjp1z7kcmcsb85dh0653sf7axp42kq98",
-            "rev": "f1765fc913f288432ee2cc330c8a7af3af7715c8"
-        },
-        "recipe": {
-            "sha256": "1sa9fcy0bnn06swwq2gfrgmppd6dsbmw2mq0v73mizg3l6has1zb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141101.120",
-        "deps": []
-    },
-    "undo-tree": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "http://www.dr-qubit.org/git/undo-tree.git",
-            "sha256": "1ef5db7cf476dd37348fd1f11dd199613a89a2351dc583a42afd9d35a53d8ae2",
-            "rev": "a3e81b682053a81e082139300ef0a913a7a610a2"
-        },
-        "recipe": {
-            "sha256": "0vrjxprpk854989wcp4wjb07jhhxqi25p6c758gz264z3xa8g9cr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140509.722",
-        "deps": []
-    },
-    "wordsmith-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "istib",
-            "repo": "wordsmith-mode",
-            "sha256": "0d2byl3si2r0zh5ih6xpsgcd9r114ry0lzg5vcf31rr2gqf0j06h",
-            "rev": "597e1e7c7ef89b06ed8280251ecd8f40ce55e1bf"
-        },
-        "recipe": {
-            "sha256": "1570h1sjjaks6bnhd4xrbx6nna4v7hz6dmrzwjq37rwvallasg1n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151117.436",
-        "deps": []
-    },
-    "makey": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mickeynp",
-            "repo": "makey",
-            "sha256": "1rr7vpm3xxzcaam3m8xni3ajy8ycyljix07n2jzczayri9sd8csy",
-            "rev": "a61781e69d3b451551e269446e1c5f624ab81137"
-        },
-        "recipe": {
-            "sha256": "06xgrlkqvg288yd4lyhx4vi80jlfarhblxk5m5zzs5as7n08cvk4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131231.830",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "stumpwm-mode": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://git.savannah.nongnu.org/stumpwm.git",
-            "sha256": "3547616b9e5694fd09014bbbf29458ee0dea828428b6bf7a6231670aacfb8271",
-            "rev": "61a7cf27e49e0779a53c018b2342f5f1c5cc70b4"
-        },
-        "recipe": {
-            "sha256": "0a77mh7h7033adfbwg2fbx84789962par43q31s9msjlqw15gs86",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140130.2016",
-        "deps": []
-    },
-    "magit-gitflow": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jtatarik",
-            "repo": "magit-gitflow",
-            "sha256": "10c1qd1l92h0z7mz7j004bx3fc9p6ij3m732lwmni9vlfbishbb4",
-            "rev": "dd1d88888957f0fd8b950037e0e58dba2d3221d9"
-        },
-        "recipe": {
-            "sha256": "0wsqq3xpqqfak4aqwsh5sxjb1m62z3z0ysgdmnrch3qsh480r8vf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150905.239",
-        "deps": [
-            "magit",
-            "magit-popup"
-        ]
-    },
-    "wsd-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "josteink",
-            "repo": "wsd-mode",
-            "sha256": "134ysscql74v1ix3wnpgrcbmayq6d264m0m975g41hcz8f876j03",
-            "rev": "d54c22f6f9a774ef2b1595ab52947403af2ff994"
-        },
-        "recipe": {
-            "sha256": "07vclmnj18wx9wlrcnsl99f9jlk3sb9g6pcdv8x1smk84gccpakc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151224.850",
-        "deps": []
-    },
-    "rubocop": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bbatsov",
-            "repo": "rubocop-emacs",
-            "sha256": "1y5z0kr4qwd4fyvhk0rhpbbp6dw2jpzrawx62jid5539wrdjcabk",
-            "rev": "c54905256410ce2aed6725d5b5f7ed61d4ddc956"
-        },
-        "recipe": {
-            "sha256": "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151123.2337",
-        "deps": [
-            "dash",
-            "emacs"
-        ]
-    },
-    "planet-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cmack",
-            "repo": "emacs-planet-theme",
-            "sha256": "0q4zdw58yawqp9rhx04lhq0v7iaf61ydbw19gpw4an85j2hxrkzq",
-            "rev": "e2bd6645535a3044fceafb1ce5d296cc111d5f2a"
-        },
-        "recipe": {
-            "sha256": "1mhbydvk7brmkgmij5gpp6l9ixcyh1g3r4fw3kpq8nvgbwknsqc9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150627.951",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "ert-runner": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "ert-runner.el",
-            "sha256": "0ivnfc42pw9pc9glx2m4klzx4csy4m60hj1x12js7492bd0ri933",
-            "rev": "0a88a6cc9d970660c9f1205a623bc80d9bd5a05b"
-        },
-        "recipe": {
-            "sha256": "0fnb8rmjr5lvc3dq0fnyxhws8ync1lj5xp8ycs63z4ax6gmdqr48",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151023.313",
-        "deps": [
-            "ansi",
-            "commander",
-            "dash",
-            "f",
-            "s",
-            "shut-up"
-        ]
-    },
-    "coffee-fof": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yasuyk",
-            "repo": "coffee-fof",
-            "sha256": "010v886ak0rbbhqwxwj6m0mkgh19s232igy7wwbv07l2pdqszf3p",
-            "rev": "211529594bc074721c6cbc4edb73a63cc05f89ac"
-        },
-        "recipe": {
-            "sha256": "02cqza46qp8y69jd33cg4nmcgvrpwz23vyxqnmzwwvlmnbky96yc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131012.730",
-        "deps": [
-            "coffee-mode"
-        ]
-    },
-    "zenburn-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bbatsov",
-            "repo": "zenburn-emacs",
-            "sha256": "071wrw9n1f3f9r19ng55942fzijlssrd3kzmxxs1c76yvdpy3wy5",
-            "rev": "7bdf03cb51105bb1c8f1cd86107e4a7b03b2a81e"
-        },
-        "recipe": {
-            "sha256": "1kb371j9aissj0vy07jw4ydfn554blc8b2rbi0x1dvfksr2rhsn9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151223.450",
-        "deps": []
-    },
-    "web-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fxbois",
-            "repo": "web-mode",
-            "sha256": "1k3kwcr4q6j0ljxj8hqfy466nw12v5j7yrszg2brmgfxz2285k63",
-            "rev": "71aebc9f003dccce021be917deb58e9c0dd5c704"
-        },
-        "recipe": {
-            "sha256": "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151218.1600",
-        "deps": []
-    },
-    "helm-filesets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gcla",
-            "repo": "helm-filesets",
-            "sha256": "00yhmpv5xjlw1gwbcrznz83gkaby8zlqv74d3p7plca2cwjll1g9",
-            "rev": "b352910af4c3099267a8aa0169c7f743b35bb1fa"
-        },
-        "recipe": {
-            "sha256": "1yhhchksi0r4r5c5q1mggz2hykkvk93baq91b5hkaflqi30d1v8f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140929.1335",
-        "deps": [
-            "filesets+",
-            "helm"
-        ]
-    },
-    "gitconfig-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "git-modes",
-            "sha256": "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd",
-            "rev": "9d8f6eda6ee97963e4085da8988cad2c0547b8df"
-        },
-        "recipe": {
-            "sha256": "0hqky40kcgxdnghnf56gpi0xp7ik45ssia1x84v0mvfwqc50dgn1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150330.1248",
-        "deps": []
-    },
-    "helm-sheet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yasuyk",
-            "repo": "helm-sheet",
-            "sha256": "00wnqcgpf4hqdnqj5zrizr4s0pffb93xwya8k5c3rp4plncrcdzx",
-            "rev": "d360b68d0ddb09aa1854e7b2f3cb39caeee26463"
-        },
-        "recipe": {
-            "sha256": "0lx70l5gq43hckgdfna8s6wx287sw5ms9l1z3n6vg2x8nr9m61kc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130630.739",
-        "deps": [
-            "helm"
-        ]
-    },
-    "tao-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "11111000000",
-            "repo": "tao-theme-emacs",
-            "sha256": "1zhr6vrzf511mxrj4fkc9k8wfr1hixn733f5g28j4qzykr4zl2mh",
-            "rev": "48a69f5568b2d16496960aa92b312cd02be80ecc"
-        },
-        "recipe": {
-            "sha256": "0gl6zzk5ha6vl2xxf5fcnv1k42cw4axdjdcirr1c4r8jwdq3nl3a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151217.1040",
-        "deps": []
-    },
-    "ahg": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/agriggio/ahg",
-            "sha256": "0fnn52b2prai8dlsj4759mbcgbbbvhr2lbqs3f0k5d2q8vvqrch1",
-            "rev": "e8eda2f41471"
-        },
-        "recipe": {
-            "sha256": "0kw138lfzwp54fmly3jzzml11y7fhcjp3w0irmwdzr68lc206lr4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151223.501",
-        "deps": []
-    },
-    "isearch-dabbrev": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Dewdrops",
-            "repo": "isearch-dabbrev",
-            "sha256": "17d0816awadvsw1qc7r0p6ira75jmgxaj9hsk9ypayxsaf6ynyrb",
-            "rev": "1efe7abba4923015cbc2462395deaec5446a9cc8"
-        },
-        "recipe": {
-            "sha256": "1hl7zl5vjcsk3z452874g4nfcnmna8m2242dc9cgpl5jddzwqa7x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141224.22",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "helm-bm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yasuyk",
-            "repo": "helm-bm",
-            "sha256": "1gcx7imq9gxfgmh188a8xlpmmlrdif1vsnnff49qvk82082ghbfz",
-            "rev": "1764c0139cb2f04b9fd520c7aca0b6d0152913bd"
-        },
-        "recipe": {
-            "sha256": "1dnlcvn0zv4qv4ii4j0h9r8w6vhi3l0c5aa768kblh5r2rf4bjjh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131224.905",
-        "deps": [
-            "bm",
-            "cl-lib",
-            "helm",
-            "s"
-        ]
-    },
-    "tornado-template-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "paradoxxxzero",
-            "repo": "tornado-template-mode",
-            "sha256": "0wv49gn1daylnjmnallpqsqy7630ynrp45agpiwi6kwyyqk1kdvv",
-            "rev": "667c0663dbbd279b6c345446b9f2bc50eb52b747"
-        },
-        "recipe": {
-            "sha256": "1sdv9rlhnabydws2sppsjcgqr0lg6bjapv753ksq5aaq21qsps0h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141128.408",
-        "deps": []
-    },
-    "mwim": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alezost",
-            "repo": "mwim.el",
-            "sha256": "0hvq6z754niqjyv79jzb833wrwbspc7npfg85scwdv8vzwassjx4",
-            "rev": "dc1b5c358e0bfe607527f1b7c082188105fe6c75"
-        },
-        "recipe": {
-            "sha256": "0bsibwplvyv96y5i5svm2b0jwzs5a7jr2aara7v7xnpj0nqaxm8k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150822.1436",
-        "deps": []
-    },
-    "launchctl": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pekingduck",
-            "repo": "launchctl-el",
-            "sha256": "154z7bhb7qagvl3dlgrlsxdg4chz2863ijglg47xs3yhjp5ypanj",
-            "rev": "73f8f52a5aa9a0be9bdcf68c29ad0fa2b4a115a4"
-        },
-        "recipe": {
-            "sha256": "07fq445cjpv4ndi7hnjmsrmskm2rlp6ghq0k3bcbjxl21smd9vs9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150518.809",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "transmission": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "holomorph",
-            "repo": "transmission",
-            "sha256": "08jir2kj42x0kf124g1znphnmh6n25vcxkykyyn01brbdycgkb1j",
-            "rev": "61d487b5cdf1931852bf3c8a30f3695c5ae7e8aa"
-        },
-        "recipe": {
-            "sha256": "0w0hlr4y4xpcrpvclqqqasggkgrwnzrdib51mhkh3f3mqyiw8gs9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151220.1447",
-        "deps": [
-            "emacs",
-            "let-alist"
-        ]
-    },
-    "ghq": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rcoedo",
-            "repo": "emacs-ghq",
-            "sha256": "1aj5j0y244r1fbbbl0lzb53wnyhljw91kb4n3hi2gagm7zwp8jcf",
-            "rev": "bfbf9245075f710ffc7dc2c6bf584dd2ca7bde24"
-        },
-        "recipe": {
-            "sha256": "0prvywcgwdhx5pw66rv5kkfriahal2mli2ibam5np3z6bwcq4ngh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151130.318",
-        "deps": []
-    },
-    "soft-charcoal-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mswift42",
-            "repo": "soft-charcoal-theme",
-            "sha256": "07056pnjgsgw06c67776qp7jci96iqbzlprbavzz2l1j8ywz8cwm",
-            "rev": "5607ab977fae6638e78b1495e02da8955c9ba19f"
-        },
-        "recipe": {
-            "sha256": "0i29ais1m2h9v4ghcg41zfbnaj8klgm4509nkyfkxm7wqnjd166a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140420.1143",
-        "deps": []
-    },
-    "dyalog-mode": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/harsman/dyalog-mode",
-            "sha256": "0ghxnzi2iy1g633fshl9wdpg2asrcl0v5rkk61gqd6axm7fjaxcj",
-            "rev": "ce795beb8747"
-        },
-        "recipe": {
-            "sha256": "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151111.854",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "xah-lookup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xahlee",
-            "repo": "lookup-word-on-internet",
-            "sha256": "1adyww9jbjvcn9p3z9ggs3gijdmnab275a81ch8sir1xp59pfm3s",
-            "rev": "75590c52af87e635b2f19640095b805fdb3e5d8b"
-        },
-        "recipe": {
-            "sha256": "0z0h1myw6wmybyd0z2lw4l59vgm6q6kh492q77kf3s0fssc0facc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150602.1346",
-        "deps": []
-    },
-    "character-fold+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/character-fold+.el",
-            "sha256": "1lr1gzabaw7jpxazyjq7pkmy1cljna8v4150jkpndzzb1anb9xxy"
-        },
-        "recipe": {
-            "sha256": "01ibdwd7vap9m64w0bhyknxa3iank3wfss49gsgg4xbbxibyrjh3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151201.924",
-        "deps": []
-    },
-    "notmuch": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://git.notmuchmail.org/git/notmuch",
-            "sha256": "1b103da2084cb38dcf5ce07a62d69b6a15f81b59fae9130686934ec9820dc7b4",
-            "rev": "8881a61fe7a1956534b89cd1f79984793ff694fe"
-        },
-        "recipe": {
-            "sha256": "1sy9k6xbfl035qhnp8sdq9cb3xvgw3lkmdczyd6fw6yrzm5n0g1r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151123.640",
-        "deps": []
-    },
-    "nixos-options": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "travisbhartwell",
-            "repo": "nix-emacs",
-            "sha256": "0ia9wgn33znaviy7ilfm83yfalc2dbpm1g7nvss5s4rznqkdfhn3",
-            "rev": "6b1418611b49a6cf77380a76f7e6236bbb5df83a"
-        },
-        "recipe": {
-            "sha256": "1m3jipidk10zj68rzjbacgjlal31jf80gqjxlgj4qs8lm671gxmm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151013.1809",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "monky": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ananthakumaran",
-            "repo": "monky",
-            "sha256": "0ddkcb5rzpcqpsrwkhvm9kzpx2mlrrsp7psljkz5q5qfvy3wdagh",
-            "rev": "48c0200910739b6521f26f6423b2bfb8c38b4482"
-        },
-        "recipe": {
-            "sha256": "1m7hy3ijwgxqjk3vjvqkxqj8b5bqnd201bmf302k45n0dpjmhshz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150404.218",
-        "deps": []
-    },
-    "pythonic": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "proofit404",
-            "repo": "pythonic",
-            "sha256": "1af9cd8l5ac58mj92xc7a3diy995cv29abnbb3fl6x4208l4xs3c",
-            "rev": "959b3f5d5607eb41ef26ad61d7ec15ceecb8e37a"
-        },
-        "recipe": {
-            "sha256": "1hq0r3vg8vmgw89wfjdqknwm76pimlk0dy56wmh9vffh06gqsb51",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150730.416",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "emacs",
-            "f",
-            "s"
-        ]
-    },
-    "auto-capitalize": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/auto-capitalize.el",
-            "sha256": "1lk9zwng7wkjvb8hprlgyrab1s56n8a61xjva931h0bgypwl1dfi"
-        },
-        "recipe": {
-            "sha256": "18fygc71n9bc0vrpymz2f7sw9hzkpqxzfglh53shmbm1zns3wkw0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131014.5",
-        "deps": []
-    },
-    "emms-mode-line-cycle": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "momomo5717",
-            "repo": "emms-mode-line-cycle",
-            "sha256": "1pz2xvv5hzfg4a8s6xnbr14mpwnr94cwsa1bpk83i7x15hmxj938",
-            "rev": "0488de1f9b4d0be6aa7dfe2fe0231cfd9b4d4295"
-        },
-        "recipe": {
-            "sha256": "1jdmfh1i9v84iy7bj2dbc3s2wfzkrby3pabd99gnqzd9gn1cn8ca",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151009.946",
-        "deps": [
-            "emacs",
-            "emms"
-        ]
-    },
-    "ember-yasnippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ronco",
-            "repo": "ember-yasnippets.el",
-            "sha256": "14049ldvyxn6w06aw6slvxdb68idars3ynka90lm0piyjpn0fy16",
-            "rev": "650a6d31748175aa7df074bcfffd433a0b072ab5"
-        },
-        "recipe": {
-            "sha256": "1alqrv9yhc1f8dhvh2kjcv8qbn1hdgza5iasmchr1wggxds3s50i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150501.1126",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "go-errcheck": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dominikh",
-            "repo": "go-errcheck.el",
-            "sha256": "1fm6xd3vsi8mqh0idddjpfxlsmz1ljmjppw3qkxl1vr0qz3598k3",
-            "rev": "1b0cd6af048a8b2074ace14ab51fb6c987beb430"
-        },
-        "recipe": {
-            "sha256": "11a75h32cd5h5xjv30x83k60s49k9fhgis31358q46y2gbvqp5bs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150828.1335",
-        "deps": []
-    },
-    "lexbind-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "spacebat",
-            "repo": "lexbind-mode",
-            "sha256": "167ayfl1k8dnajw173hh67nbwbk4frmjc4fzc515q67m9d7m5932",
-            "rev": "fa0a6848c1cfd3fbf45db43dc2deef16377d887d"
-        },
-        "recipe": {
-            "sha256": "1hs9wg45mwp3fwi827rc4g0gjx4fk87zlibq3id9fcqic8q7nrnl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141027.929",
-        "deps": []
-    },
-    "minimal-session-saver": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "minimal-session-saver",
-            "sha256": "1sj5sq932w079y3vy55q5b6wybwrzz30y092iq1mpfg5xvl42sbm",
-            "rev": "cf654ac549850746dc21091746e4bcc1aef7668e"
-        },
-        "recipe": {
-            "sha256": "1ay7wvriga28bdmarpfwagqzmmk93ri9f3idhr6z6iivwggwyy2i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140508.1541",
-        "deps": []
-    },
-    "flymake-vala": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "daniellawrence",
-            "repo": "flymake-vala",
-            "sha256": "0qpr0frcn3w0f6yz8vgavwbxvn6wb0qkfk653v4cfy57dvslr4wf",
-            "rev": "c3674f461fc84fb0300cd3a562fb903a59782745"
-        },
-        "recipe": {
-            "sha256": "0yp81phd96z594ckav796qrjm0wlkrfsl0rwpmgg840qn49w71vx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150326.31",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "popup-complete": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-popup-complete",
-            "sha256": "1q9zajv6g7mi6k98kzq3498nhmdkp1z9d2b8vgzbk7745d39gm9b",
-            "rev": "caa655a6d8472e9a4bfa1311126d90d7d1b07fca"
-        },
-        "recipe": {
-            "sha256": "04bpm31zx87j390r2xi1yl4kyqgalmyqc48xarsm67zfww9fw9c1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141108.2108",
-        "deps": [
-            "popup"
-        ]
-    },
-    "cake2": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k1LoW",
-            "repo": "emacs-cake2",
-            "sha256": "15w21r0gqblbn9wlvb4wlm3706wf01r38mp465snjzi839f6sazb",
-            "rev": "0a9d0b3a1c49ba1730088416f50507f53221c70b"
-        },
-        "recipe": {
-            "sha256": "03q8vqqjlhahgnyy976c46x52splwdjpmb9ngrj5c2z7d8n9145x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140626.742",
-        "deps": [
-            "anything",
-            "cake-inflector",
-            "dash",
-            "f",
-            "historyf",
-            "ht",
-            "json",
-            "s"
-        ]
-    },
-    "helm-rhythmbox": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mrBliss",
-            "repo": "helm-rhythmbox",
-            "sha256": "05mf0021jhr4zmysy28cgilkfxyp08qmkc20v9wlykksg73l2crk",
-            "rev": "3bdff00fd9d7b39f8b1dfb35e6843da307ef4d98"
-        },
-        "recipe": {
-            "sha256": "0pnm7yvas0q3b38ch5idm7v4ih2fjyfai8217j74xhkpcc2w4g4a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150813.808",
-        "deps": [
-            "cl-lib",
-            "helm"
-        ]
-    },
-    "async": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jwiegley",
-            "repo": "emacs-async",
-            "sha256": "0z91alzf4ajj3r7pnwazynvp81cg67csy9kf87fk98024xldpkdp",
-            "rev": "c25bf17b34a1608da45e8a1ca02e1c89a34acd34"
-        },
-        "recipe": {
-            "sha256": "063ci4f35x1zm9ixy110i5ds0vsrcafpixrz3xkvpnfqdn29si3f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151123.456",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "gotest": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nlamirault",
-            "repo": "gotest.el",
-            "sha256": "1b6zn1fmqvfb7bcpmhzkgcy5003dl22w3f293arlsd1xkbjgkxa2",
-            "rev": "ab0da939aad5cec301126c59b7718cd3158b3233"
-        },
-        "recipe": {
-            "sha256": "1kan3gykhci33jgg67jjiiz7rqlz5mpxp8sh6mb0n6kpfmgb4ly9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151218.249",
-        "deps": [
-            "emacs",
-            "f",
-            "go-mode",
-            "s"
-        ]
-    },
-    "ede-compdb": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "randomphrase",
-            "repo": "ede-compdb",
-            "sha256": "1cfjw9b1lm29s5cbh0qqmkchbq2382s71w4rpb0gyf603s0yg13m",
-            "rev": "d6d8466cd62876fc90adeff5875a1a584fd846cd"
-        },
-        "recipe": {
-            "sha256": "1ypi7rxbgg2qck1b571hcw5m4ipllb48g6sindpdf180kbfbfpn7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150920.1533",
-        "deps": [
-            "cl-lib",
-            "ede",
-            "semantic"
-        ]
-    },
-    "floobits": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Floobits",
-            "repo": "floobits-emacs",
-            "sha256": "1b9zxyv5bn1ja0gcv5p3dk3lq3gp3g1dhbnizx7ifgpzc36sp374",
-            "rev": "c75af788d089b701dc71fd79c2baefe82d0d17eb"
-        },
-        "recipe": {
-            "sha256": "1jpk0q4mkf9ag1rqyai993nz5ngzfvxq9n9avmaaq59gkk9cjraf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151221.1804",
-        "deps": [
-            "highlight",
-            "json"
-        ]
-    },
-    "md-readme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thomas11",
-            "repo": "md-readme",
-            "sha256": "1j8gp3byanf1mq8sc4hv838rgcywlv35d8q1vjwzsjaznvz8hvc3",
-            "rev": "9f3630d3ad2b83ec20968cf02c6613c53e8e32ec"
-        },
-        "recipe": {
-            "sha256": "1krq0f79jjrlihr2aqq87pxdqixv2zdjw4hm732sz79g996yxyw3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150506.159",
-        "deps": []
-    },
-    "annoying-arrows-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "annoying-arrows-mode.el",
-            "sha256": "1ppq3kszzj2fgr7mwj565bjs8bs285ymy384cnnw7paddgcr9z02",
-            "rev": "fe59f3fd464e7a87cc43fb8a1f135b3bdf8a2fb3"
-        },
-        "recipe": {
-            "sha256": "13bwqv3mv7kgi1gms58f5g03q5g7q98n4vv6n28zqmppxm5z33s7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151113.1102",
-        "deps": []
-    },
-    "foreign-regexp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k-talo",
-            "repo": "foreign-regexp.el",
-            "sha256": "1fczg710a0rjs932yv6vv9rwr9g5ii6cwva82nqfzyhlkf0b1sn5",
-            "rev": "c7251fce89c8585f2595e687d8d7bc65cf465b5e"
-        },
-        "recipe": {
-            "sha256": "189cq8n759f28nx10fn3w4qbq7q49bb788kp9l70pj38jgnjn7n7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140823.1942",
-        "deps": []
-    },
-    "wilt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sixty-north",
-            "repo": "emacs-wilt",
-            "sha256": "1n45m8xn65a2lg8ff7m6hbqnp2j49n9sfyr924laljvhjbi37knd",
-            "rev": "5febe367c6c3729848654358af4d17ee2987da8d"
-        },
-        "recipe": {
-            "sha256": "0nw6zr06zq60j72qfjmbqrxyz022fnisb0bsh6xmlnd1k1kqlrz6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151105.718",
-        "deps": [
-            "dash",
-            "emacs",
-            "s"
-        ]
-    },
-    "airplay": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gongo",
-            "repo": "airplay-el",
-            "sha256": "1lxpfswp1bjrz192px79f155dycf2kazpr7dfrcr1gyshlgxkpf7",
-            "rev": "bd690aafcae3a887946e1bba8327597932d964ad"
-        },
-        "recipe": {
-            "sha256": "095nibgs197iplphk6csvkgsrgh1fcfyy33py860v6qmihvk538f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130212.626",
-        "deps": [
-            "deferred",
-            "request",
-            "simple-httpd"
-        ]
-    },
-    "mode-icons": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://ryuslash.org/mode-icons.git",
-            "sha256": "b7afff1d8fb0b3f044d266af479df51fbb6021ff433628a9dc669695c1ddae40",
-            "rev": "cbf412d0c47dfdbeac7587a0c12c96f58f546467"
-        },
-        "recipe": {
-            "sha256": "18w221zjrrsfcymprv5x75i3qv04zy4bxl9mqjv0ys7qcc8xf1dp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130602.748",
-        "deps": []
-    },
-    "weibo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "austin-----",
-            "repo": "weibo.emacs",
-            "sha256": "0hc5iyjpcik996ns84akrl28scndmn0gd1zfdf1nnqq6n2m5zvgh",
-            "rev": "a8abb50b7602fe15fe2bc6400ac29780e956b390"
-        },
-        "recipe": {
-            "sha256": "1ndgfqqb0gvy8p2fisi57s9bsa2nrnv80smg78m89i4cwagbz6yd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150307.1642",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "volatile-highlights": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k-talo",
-            "repo": "volatile-highlights.el",
-            "sha256": "1v0chqj5jir4685jd8ahw86g9zdmi6xd05wmzhyw20rbk924fcqf",
-            "rev": "fb2abc2d4d4051a9a6b7c8de2fe7564161f01f24"
-        },
-        "recipe": {
-            "sha256": "1r6in919aqdziv6bgzp4k7jqa87bd287pacq615sd5m1nzva1a4d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141005.40",
-        "deps": []
-    },
-    "bbdb-china": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tumashu",
-            "repo": "bbdb-china",
-            "sha256": "07plwm5nh58qya03l8z0iaqh8bmyhywx7qiffkf803n8wwjb3kdn",
-            "rev": "a64725ca6dbb5ec1825f3a9112df9aa54bb14f6c"
-        },
-        "recipe": {
-            "sha256": "111lf256zxlnylfmwis0pngbpj73p59s520v8abbm7pn82k2m72b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150615.2056",
-        "deps": [
-            "bbdb-vcard",
-            "chinese-pyim"
-        ]
-    },
-    "grep-a-lot": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ZungBang",
-            "repo": "emacs-grep-a-lot",
-            "sha256": "1f8262mrlinzgnn4m49hbj1hm3c1mvzza24py4b37sasn49546lw",
-            "rev": "9f9f645b9e308a0d887b66864ff97d0fca1ba4ad"
-        },
-        "recipe": {
-            "sha256": "1513vnm5b587r15hcbnplgsfv7kv8g5fd0w4nwb6pq7myzv53ra1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131006.847",
-        "deps": []
-    },
-    "stan-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "stan-dev",
-            "repo": "stan-mode",
-            "sha256": "1k0jidh177s9lk4k9vphivq8dapd2qzajim2s835pn72j6k675vg",
-            "rev": "e981ca7fee98431162b21ec6b79c82100ce4b276"
-        },
-        "recipe": {
-            "sha256": "17ph5khwwrcpyl96xnp3rsbmnk7mpwmgskxka3cfgkm190qihfqy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151222.2258",
-        "deps": []
-    },
-    "parse-csv": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mrc",
-            "repo": "el-csv",
-            "sha256": "1z8cp1cdkxmdqislixxvncj0s1jx42i6arx48kdl5paymnnp282s",
-            "rev": "dc31201af8868aa98f055de055ee7aa5fae266dd"
-        },
-        "recipe": {
-            "sha256": "0khpfxbarw0plx8kka357d8wl1vvdih5797xlld9adc0g3cng0zz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140203.316",
-        "deps": []
-    },
-    "edts": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tjarvstrand",
-            "repo": "edts",
-            "sha256": "0vsrcvrd02nx647gxp65r548qlxg50w73dy0rs1lxwy6mdgp0npv",
-            "rev": "70dfcfd8cc448c854fb67d65e005ba00e77384c5"
-        },
-        "recipe": {
-            "sha256": "0f0rbd0mqqwn743qmr1g5mmi1sbmlcglclww8jxvbvb61jq8vspr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150830.710",
-        "deps": [
-            "auto-complete",
-            "auto-highlight-symbol",
-            "dash",
-            "eproject",
-            "erlang",
-            "f",
-            "popup",
-            "s"
-        ]
-    },
-    "unison-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "impaktor",
-            "repo": "unison-mode",
-            "sha256": "0l8h084xkbjvx2vbg67hxmg4hb9175k858z3k3c93d2b6x2kh7ni",
-            "rev": "7e1bfee1a6796cc749a583605a9c948eccbc8cc5"
-        },
-        "recipe": {
-            "sha256": "03kyr1h5pm51vn4bykj13rm4ybln266rpnxh65y2ygw8f8md88gl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.614",
-        "deps": []
-    },
-    "avy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "avy",
-            "sha256": "17sa27vhyz642y3g6pjqjs03clqlblmbx2vinpmylga3anf5rrnw",
-            "rev": "9d18bf9fc247e7423b954d05cecdea2417dfc239"
-        },
-        "recipe": {
-            "sha256": "0gjq79f8jagbngp0shkcqmwhisc3hpgwfk34kq30nb929nbnlmag",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151222.445",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "marmalade": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nex3",
-            "repo": "marmalade",
-            "sha256": "1ygznmqb3fqy94p8qi71i223m7cpw3f596pkls2ybjlbpb4psjcl",
-            "rev": "2a4f07fbd4c17e08556c1a80c1753c37b3626d39"
-        },
-        "recipe": {
-            "sha256": "0ppa2s1fma1lc01byanfxpxfrjqk2snxbsmdbkcipjdi5dpb0a9s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20110602.1822",
-        "deps": [
-            "furl"
-        ]
-    },
-    "per-buffer-theme": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/inigoserna/per-buffer-theme.el",
-            "sha256": "1rh87jf0a15q35a8h00bx6k5wa931rb6gh600zbs7j4r3y8qsylf",
-            "rev": "2b82a04b28d0"
-        },
-        "recipe": {
-            "sha256": "1czcaybpfmx4mwff7hs07iayyvgvlhifkickccap6kpd0cp4n6hn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151013.1212",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "aurora-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xzerocode",
-            "repo": "aurora-theme",
-            "sha256": "1z2n6gd63mgj2wj45n6g1gmfrk0iwzlrzb6g1rdd9r9a03c03qi6",
-            "rev": "3cd8c3359b7b15148e5cea503f3d071e1ed7fc79"
-        },
-        "recipe": {
-            "sha256": "1fhlng30v25ycr502vfvajl70vimscqkipva6ghr670j35ac5vz5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151015.1302",
-        "deps": []
-    },
-    "systemtap-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ruediger",
-            "repo": "systemtap-mode",
-            "sha256": "0343ss3y9i40y3i9rr7p7bb4k9dj950zyvdv44q1abw2xrfd2xwd",
-            "rev": "1a968c2b1f3a054bebf91ac49739d3a81ce050a9"
-        },
-        "recipe": {
-            "sha256": "1l2jx6mvph0q2pdlhq7p4vwfw72rfl8k1rwi504bbkr5n5xwhhhz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151122.1340",
-        "deps": []
-    },
-    "evil-dvorak": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jbranso",
-            "repo": "evil-dvorak",
-            "sha256": "0jbb0ln54p43rqyw188ggrc848v24mhwdj9xna16y4g41g00i105",
-            "rev": "c193913839e153b0f2c973fae5e6b1fe51809d2b"
-        },
-        "recipe": {
-            "sha256": "1iq9wzcb625vs942khja39db1js8r46vrdiqcm47yfji98g39gsn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151104.726",
-        "deps": [
-            "ace-jump-mode",
-            "evil",
-            "evil-surround",
-            "helm",
-            "helm-swoop"
-        ]
-    },
-    "shadow": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mooz",
-            "repo": "shadow.el",
-            "sha256": "1i1a0jsrrimfxv8xm37cihb3w7fc3l0872c8gnx9gb4876if3sxw",
-            "rev": "eafc93b090895102ac299220a84ec99244f633af"
-        },
-        "recipe": {
-            "sha256": "0zhy94jpk29k51r7m1gd24jx7h6b68l38vhw27j3wz0ag1h5352k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20110507.224",
-        "deps": []
-    },
-    "zop-to-char": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thierryvolpiatto",
-            "repo": "zop-to-char",
-            "sha256": "1gqlxwvih7bhwvnjk7s0qff2dmnsjhiw522hd34jvx7z03s4bc7g",
-            "rev": "e1b4080286d7c905119eac745b8b7aaca2784844"
-        },
-        "recipe": {
-            "sha256": "0jnspvqqvnaplld083j7cqqxw122qazh88ab7hymci36m3ka9hga",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150901.247",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "phoenix-dark-mono-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "j0ni",
-            "repo": "phoenix-dark-mono",
-            "sha256": "1fg63g1cm9mp50sf3ldcb0pr4bvlfxx010arisxdkj102pmib2ri",
-            "rev": "dafb65c542605145d6b1702aae5b195b70f98285"
-        },
-        "recipe": {
-            "sha256": "15in299j170n0wxmkg3cx1zzx1n7r1ifraqqzfqhcnk8i8lmc939",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130306.1415",
-        "deps": []
-    },
-    "connection": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myrkr",
-            "repo": "dictionary-el",
-            "sha256": "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm",
-            "rev": "a23b8f4a422d0de69a006ed010eff5795319db98"
-        },
-        "recipe": {
-            "sha256": "1y68d2kay8p5vapailxhrc5dl7b8k8nkvp7pa54md3fsivwp1d0q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140717.2229",
-        "deps": []
-    },
-    "gmail-message-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "gmail-mode",
-            "sha256": "0j3pay3gd1wdnpc853gy5j68hbavrwy6cc2bgmd12ag29xki3hcg",
-            "rev": "2e0286e4a3c80889692f8da63a3b15d7a96abdea"
-        },
-        "recipe": {
-            "sha256": "0py0i7b893ihb8l1hmk3jfl0xil450znadcd18q7svr3zl2m0gkk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140815.1016",
-        "deps": [
-            "ham-mode"
-        ]
-    },
-    "rust-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rust-lang",
-            "repo": "rust-mode",
-            "sha256": "0vnf3y92s5rwwqifn1gfvhi609a5ir32dhyzgs9d2gacri7z75lw",
-            "rev": "061e6d8a3a9104570144f1eacb729e3211cb03cd"
-        },
-        "recipe": {
-            "sha256": "0h4gblg6ls8a2wa43r990lanl6ykx8j7c8yg5i3n151imzic2n33",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151215.2134",
-        "deps": []
-    },
-    "bug-reference-github": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "arnested",
-            "repo": "bug-reference-github",
-            "sha256": "0zr1raf0q5wi3vr66kglxcfxswlm8g2l501adm8c27clvqizpnrr",
-            "rev": "6f693e1f659d9a75abea3f23e95946c7f67138cd"
-        },
-        "recipe": {
-            "sha256": "18yzxwanbrxsab6ba75z1196x0m6dapdhbvy6df5b5x5viz99cf6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131202.1503",
-        "deps": []
-    },
-    "clojure-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "clojure-emacs",
-            "repo": "clojure-mode",
-            "sha256": "130s55mwzmi1almjajfl5bv3jra9ccafsiv240ls4agqkq2702vv",
-            "rev": "22b6709a651cc9c38a0c2a4c42df500ec3e46f1b"
-        },
-        "recipe": {
-            "sha256": "11n0rjhs1mmlzdqy711g432an5ybdka5xj0ipsk8dx6xcyab70np",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151224.636",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "utop": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "diml",
-            "repo": "utop",
-            "sha256": "034hn9rf6jh8kk07jdhvk03dlxm9v0asypjdhkkslgwfj3hp7yz2",
-            "rev": "e608977856005c7a3503afff7a2f6c3ca8a423c5"
-        },
-        "recipe": {
-            "sha256": "0lv16kl29gc9hdcpn04l85pf7x93vkl41s4mgqp678cllzyr0cq7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151105.447",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "with-editor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "magit",
-            "sha256": "1wgy1rkaanqf382m7ijy90gpaiz2049mrmwlvwkr3hw3vgkffar8",
-            "rev": "c650d164a94adcd123ed28da7d413aee76cc9fe7"
-        },
-        "recipe": {
-            "sha256": "042fa55yakdn2di4l5dilnmqpslac46wpr1zpl4xk3v3i4nn9ndv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151223.1541",
-        "deps": [
-            "async",
-            "dash",
-            "emacs"
-        ]
-    },
-    "evil-jumper": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bling",
-            "repo": "evil-jumper",
-            "sha256": "1y4jm800mam36vzh2lwc4j6l0856c4h6da1fivz4kkgf4gy79mq8",
-            "rev": "f1a4952c0e1cee793275d75e297351eaaf6bb1b2"
-        },
-        "recipe": {
-            "sha256": "0zwsk7slzvcgvgh8fjrwangylishrwc1w0glxcr71sybxph2g46x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151025.1002",
-        "deps": [
-            "cl-lib",
-            "evil"
-        ]
-    },
-    "lingr": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lugecy",
-            "repo": "lingr-el",
-            "sha256": "0rkx0hk3y79rwhjqs3wvgxhg1rj83mxbqkhhm3jfawp8c1av4f40",
-            "rev": "4215a8704492d3c860097cbe2649936c22c196df"
-        },
-        "recipe": {
-            "sha256": "1445bxiirsxl9kgm0j86xc9d0pbaa5f07c1i66pw2vl40bvhrjff",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20100807.1231",
-        "deps": []
-    },
-    "auto-complete-sage": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "stakemori",
-            "repo": "auto-complete-sage",
-            "sha256": "0l49ciic7g30vklxq6l1ny3mz87l5p8qc30rmkjvkzvg8r52ksn3",
-            "rev": "a61a4e58b14134712e0737280281c0b10e56da93"
-        },
-        "recipe": {
-            "sha256": "02sxbir3arvmnkvxgndlkln9y05jnlv6i8czd6a0wcxk4nj43lq1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151201.1257",
-        "deps": [
-            "auto-complete",
-            "sage-shell-mode"
-        ]
-    },
-    "rich-minority": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "rich-minority",
-            "sha256": "11hwf9y5ax207w6rwrsmi3pmn7pn7ap6iys0z8hni2f5zzxjrmx3",
-            "rev": "311ac8ee54078f95b7279e532da6cf5a2afb4125"
-        },
-        "recipe": {
-            "sha256": "11xd76w5k3b3q5bxqjb55vi6dsal9drvyc1nh7z83awm59hvgczc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151201.600",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "el-spy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "uk-ar",
-            "repo": "el-spy",
-            "sha256": "016l3inzb7dby0w58najj2pvymwk6gllsxvqj2fkz3599i36p1pn",
-            "rev": "b1dead9d1877660856ada22d906ac4e54695aec7"
-        },
-        "recipe": {
-            "sha256": "1bgv4mgsnkmjdyay7lhkqdszvnwpjy4dxxw11kq45w866ba8645n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131226.1408",
-        "deps": []
-    },
-    "marcopolo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nlamirault",
-            "repo": "marcopolo",
-            "sha256": "0y4b69r2l6kvh7g8f1y9v1pdall3n668ci24lp04lcms6rxcrsnh",
-            "rev": "ce6ad40d7feab0568924e3bd9659b76e3eecd55e"
-        },
-        "recipe": {
-            "sha256": "1nbck1m7lhync7n474578d2g1zc72c841hi236xjbdd2lnxz3zz0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150326.1118",
-        "deps": [
-            "dash",
-            "pkg-info",
-            "request",
-            "s"
-        ]
-    },
-    "openwith": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/jpkotta/openwith",
-            "sha256": "1wl6gnxsyhaad4cl9bxjc0qbc5jzvlwbwjbajs0n1s6qr07d6r01",
-            "rev": "aeb78782ec87"
-        },
-        "recipe": {
-            "sha256": "05lkx3yfv2445fp07bhqv2aqz5hgf3dxp39lmz3nfxn4c9v8nkqi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120531.1636",
-        "deps": []
-    },
-    "el-mock": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "el-mock.el",
-            "sha256": "1jiq2hpym3wpk80zsl4lffpv4kgkykc2zp08sb01wa7pl8d1knmm",
-            "rev": "5cb160b9bd2c9b909a2b64adcc9ec947da643c39"
-        },
-        "recipe": {
-            "sha256": "07m7w7n202nijnxidy0j0r4nbcvlnbkm9b0n8qb2bwi3d4cfp77l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150906.521",
-        "deps": []
-    },
-    "smart-newline": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ainame",
-            "repo": "smart-newline.el",
-            "sha256": "1q74b0mbhly84g252a0arbyxc720rgs9a3yqf8b8s2fpfkzb95sg",
-            "rev": "f5f5ff033645aea0652aa375b034746754a38b1e"
-        },
-        "recipe": {
-            "sha256": "1kyk865vkgh05vzlggs3ii81v86fcbcxybfkv5rkyl3fyqpkza1w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131207.2140",
-        "deps": []
-    },
-    "fringe-current-line": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kyanagi",
-            "repo": "fringe-current-line",
-            "sha256": "0zwlnzbi91hkfz1jgj9s9pxwi21s21cwp6psdm687wj2a3wy4231",
-            "rev": "0ef000bac76abae30601222e6f06c7d133ab4942"
-        },
-        "recipe": {
-            "sha256": "125yn0wbrrxrmdn7qfxj0f4538sb3xnqb3r2inz3gpblc1vxnqb8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140110.2211",
-        "deps": []
-    },
-    "vertica": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "r0man",
-            "repo": "vertica-el",
-            "sha256": "1mp71axs3vdrdwlhgywfldvnr6a1g2qbxiywmpfmcv59n5n58p1j",
-            "rev": "3c9647b425c5c13c30bf0cba483646af18196588"
-        },
-        "recipe": {
-            "sha256": "1ljjk6zrbr2k0s0iaqd9iq3j45cavijcx0rqdidliswnfllav4ng",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131217.911",
-        "deps": [
-            "sql"
-        ]
-    },
-    "hydra": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "hydra",
-            "sha256": "0dp1ablyih2m3q5224xnkwxqm8pgblkdfcwls81r0qsaav7ag3fj",
-            "rev": "7f022f7f1a7833618c1bf4d38a4854d2bae06199"
-        },
-        "recipe": {
-            "sha256": "1c59l43p39ins3dn9690gm6llwm4b9p0pk78lip0dwlx736drdbw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151214.617",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "xmlunicode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ndw",
-            "repo": "xmlunicode",
-            "sha256": "0y1n5xmz06var2m19nfw3q3b5mlqibd6h7dn35la3lb2s9s3b1bg",
-            "rev": "aecbdb50fcc4eee8a84fb37107bf3a69fb7a1e21"
-        },
-        "recipe": {
-            "sha256": "1ylpvx2p5l863r9qv9jdsm9rbv989c8xn0zpjl8zkcfxqxix4h4p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151208.1113",
-        "deps": []
-    },
-    "pony-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "davidmiller",
-            "repo": "pony-mode",
-            "sha256": "1g1yw0ykwswl9dnicyi7kxskqqry40wjykshgrqhs4k09j3jnacr",
-            "rev": "d319b0317bfbdac12d28cfd83abe31cc35f3cdd7"
-        },
-        "recipe": {
-            "sha256": "1hgiryhpxv30bjlgv9pywzqn2ypimwzdhx03znqvn56zrwn1frnl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151028.502",
-        "deps": []
-    },
-    "browse-kill-ring": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "browse-kill-ring",
-            "repo": "browse-kill-ring",
-            "sha256": "06mdrjc4jq7pj8vmg91dair138kmhvaa9gi5icc56120jmfb6kn2",
-            "rev": "66b5a0872b4278b49a815fc759c3eb48aebe10bf"
-        },
-        "recipe": {
-            "sha256": "1d97ap0vrg5ymp96z7y6si98fspxzy02jh1i4clvw5lggjfibhq4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150829.832",
-        "deps": []
-    },
-    "auto-shell-command": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ongaeshi",
-            "repo": "auto-shell-command",
-            "sha256": "1h8zsgw30axprs7a5kkygbhvilillzazxgqz01ng36il65fi28s6",
-            "rev": "59d4abce779a3ce3e920592bf5696b54b2e192c7"
-        },
-        "recipe": {
-            "sha256": "1i78fh72i8yv91rnabf0vs78r43qrjkr36hndmn5ya2xs3b1g41j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150416.1257",
-        "deps": [
-            "deferred",
-            "popwin"
-        ]
-    },
-    "gerrit-download": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chmouel",
-            "repo": "gerrit-download.el",
-            "sha256": "1ch8yp0mgk57x0pny9bvkknsqj27fd1rcmpm9s7qpryrwqkp1ix4",
-            "rev": "d568acc7c5935188c9bc19ba72719a6092d9f6fd"
-        },
-        "recipe": {
-            "sha256": "1rlz0iqgvr8yxnv5qmk29xs1jwf0g0ckzanlyldcxvs7n6mhkjjp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150714.908",
-        "deps": [
-            "emacs",
-            "magit"
-        ]
-    },
-    "emms-player-mpv-jp-radios": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "momomo5717",
-            "repo": "emms-player-mpv-jp-radios",
-            "sha256": "06xhgxkpq4mw1mjkajjq30l131blqkkm46lh5hdq1x25d78qcpqi",
-            "rev": "325d78e161cacbd8279d53a0e786fdb5914f85d1"
-        },
-        "recipe": {
-            "sha256": "0gdap5cv08pz370fl92v9lyvgkbbyjhp9wsc4kyjm4f4pwx9fybv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151130.617",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "emms",
-            "emms-player-simple-mpv"
-        ]
-    },
-    "paren-completer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "MatthewBregg",
-            "repo": "paren-completer",
-            "sha256": "0fds9s16c0dgq6ah98x4pv5bgwbikqwiikcxjzmk9g1m3s232fl8",
-            "rev": "afb6d596ffac85b3457178cfdb384cd2a382b120"
-        },
-        "recipe": {
-            "sha256": "0xh17h8vmsgbrq6yf5sfy3kpia4za68f43gwgkvi2m430g15fr0x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150711.1723",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "shelldoc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-shelldoc",
-            "sha256": "0i6xp6g3ggs4fkr410blxa4mkb1y05pcygkdbvb7y3gh878q5b5k",
-            "rev": "20eb889f3d3d9bd01aafdc699e712a75db42d8f3"
-        },
-        "recipe": {
-            "sha256": "1xlp03aaidp7dp8349v8drzhl4lcngvxgdrwwn9cahfqlrvvbbbx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151114.2125",
-        "deps": [
-            "cl-lib",
-            "s"
-        ]
-    },
-    "malabar-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "m0smith",
-            "repo": "malabar-mode",
-            "sha256": "0hlxs9gi2vml2id9q0r1r0xdm0zshjzc1w3phjf2ab0aa3hl5k6l",
-            "rev": "830f38efae813db4388da6b4abd386eb0a4e861c"
-        },
-        "recipe": {
-            "sha256": "026ing7v22rz1pfzs2j9z09pm6dajpys992n45gzhwirz5f0q1rk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150720.1255",
-        "deps": [
-            "fringe-helper",
-            "groovy-mode"
-        ]
-    },
-    "fullframe": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tomterl",
-            "repo": "fullframe",
-            "sha256": "09jqaq81vbch93qwrmg0rm6a26pchqdraw374j13hgkhs849gx90",
-            "rev": "b9c3e54c8928c5ba994c55de7794b5f739b43ced"
-        },
-        "recipe": {
-            "sha256": "08sh8lmb6g8asv28fcb36ilcn0ka4fc6ka0pnslid0h4c32fxp2a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140619.505",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "cperl-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jrockway",
-            "repo": "cperl-mode",
-            "sha256": "02fl9y72prykh6qmxlnyn7fl27rqsk5kgcm4vdhj3i6fvl1iqdm6",
-            "rev": "06f5668653a114991836139344dbe8f0674577af"
-        },
-        "recipe": {
-            "sha256": "0hkmpa0vg1miv8qqpnml4xblzvn9w4ba02fqp6qa2nnv554i7azp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140309.422",
-        "deps": []
-    },
-    "handlebars-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "danielevans",
-            "repo": "handlebars-mode",
-            "sha256": "0w443knp6kvjm2m79cni5d17plyhbsl0a4kip7yrpv5nmg370q3p",
-            "rev": "81f6b73fea8f397807781a1b51568397af21a6ef"
-        },
-        "recipe": {
-            "sha256": "11ahrm4n588v7ir2r7sp4dkbypl5nhnr22px849hdxjcrwal24vj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150211.1149",
-        "deps": []
-    },
-    "helm-git-grep": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yasuyk",
-            "repo": "helm-git-grep",
-            "sha256": "1mp5gbda81szbx19rvaa6ybb28v64q49hqic8d478ggnjjsqhfyr",
-            "rev": "9e602f79ea58fe12c6a48ce3c2f749b817ef8c86"
-        },
-        "recipe": {
-            "sha256": "1ww6a4q78w5hnwikq7y93ic2b7x070c27r946lh6p8cz1k4b8vqi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140222.2022",
-        "deps": [
-            "helm"
-        ]
-    },
-    "ido-select-window": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pjones",
-            "repo": "ido-select-window",
-            "sha256": "0qvf3h2ljlbf3z36dhywzza62mfi6mqbrfc0sqfsbyia9bn1df4f",
-            "rev": "946db3db7a3fec582cc1a0097877f1250303b53a"
-        },
-        "recipe": {
-            "sha256": "03xqfpnagy2sk67yq7n7s6ma3im37d558zzx8sdzd9pbfxy9ij23",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131220.1447",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "highlight-chars": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/highlight-chars.el",
-            "sha256": "14gx9fri2qbgii828dd42aw02rskshbyyymd68aqh2dll7cbw6mf"
-        },
-        "recipe": {
-            "sha256": "19jawbjvqx1hsjbynx0jgpziap3r64k8s1xfckajrx8aq8m4c6i0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150630.1635",
-        "deps": []
-    },
-    "wgrep-helm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-wgrep",
-            "sha256": "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4",
-            "rev": "7ef26c51feaef8a5ec0929737130ab8ba326983c"
-        },
-        "recipe": {
-            "sha256": "1hh7isc9xifkrdfw88jw0z0xmfazrbcis6d355bcaxlnjy6fzm8b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140528.1627",
-        "deps": [
-            "wgrep"
-        ]
-    },
-    "flymake-cursor": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/flymake-cursor.el",
-            "sha256": "10cpzrd588ya52blghxss5zkn6x8hc7bx1h0qbcdlybbmkjgpkxr"
-        },
-        "recipe": {
-            "sha256": "1s065w0z3sfv3d348w4zhlw96xf3j28bcz14sl46963mj2dm90lr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130822.532",
-        "deps": []
-    },
-    "tabbar": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dholm",
-            "repo": "tabbar",
-            "sha256": "0n23nnig1lgjamrzsa91p2aplh7gpj2vkp951i9fpf49c6xpyj3x",
-            "rev": "ad4c9c20cf9090a5ebf77a5150f2bf98bdb4bded"
-        },
-        "recipe": {
-            "sha256": "1y376nz1xmchwns4fz8dixbb7hbqh4mln78zvsh7y32il98wzvx9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141109.343",
-        "deps": []
-    },
-    "pretty-symbols": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "drothlis",
-            "repo": "pretty-symbols",
-            "sha256": "1f00l9f6an1mh8yhf629mw0p37m4jcpl8giz47xbdyw1k6bqn830",
-            "rev": "582cbe51ecfe1cc0a5b185bc06113c8a661e3956"
-        },
-        "recipe": {
-            "sha256": "0d1ad2x4md0n3fad3s2355wm8hl311qdhih1gkdqwdaj4i1d6gvb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140814.459",
-        "deps": []
-    },
-    "comment-dwim-2": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "remyferre",
-            "repo": "comment-dwim-2",
-            "sha256": "0kzlv2my0cc7d3nki2rlm32nmb2nyjb38inmvlf13z0m2kybg2ps",
-            "rev": "8cedecde018b5872195bfead6511af822776a430"
-        },
-        "recipe": {
-            "sha256": "1w9w2a72ygsj5w47vjqcljajmmbz0mi8dhz5gjnpwxjwsr6fn6lj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150825.1749",
-        "deps": []
-    },
-    "dom": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "toroidal-code",
-            "repo": "dom.el",
-            "sha256": "165d22qkkdxd8zsbln0991r5n7aklz92f2snf6d8578flkqvdmm2",
-            "rev": "19a3cadd02ef2cafc258b7ddb1f1609eec894ed6"
-        },
-        "recipe": {
-            "sha256": "0cpd12vhshlk2v3w42n769gc0b3rsqc8wb7g84846v9r05ypinj2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150414.1810",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "s-buffer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nicferrier",
-            "repo": "emacs-s-buffer",
-            "sha256": "06ng960fj2ivnwb0hrn0qic5x8hb0sswjzph01zmwhbfnwykhr85",
-            "rev": "f95d234282377f00a2c3a9846681080cb95bb1df"
-        },
-        "recipe": {
-            "sha256": "07kivgzv24psjq1240gwj9wkndq4bhvjh38x552k90m9v6jz8l6m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130605.1624",
-        "deps": [
-            "noflet",
-            "s"
-        ]
-    },
-    "ctags-update": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jixiuf",
-            "repo": "helm-etags-plus",
-            "sha256": "1va394nls4yi77rgm0kz5r00xiidj6lwcabhqxisz08m3h8gfkh2",
-            "rev": "eeed834b25a1c084b2c672bf15e4f96ee3df6a4e"
-        },
-        "recipe": {
-            "sha256": "1k43l667mvr2y33nblachdlvdqvn256gysc1iwv5zgv7gj9i65qf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150427.2214",
-        "deps": []
-    },
-    "pcsv": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-pcsv",
-            "sha256": "0aaprjczjf3al5vcypw1fsnz5a0xnnlhmvy0lc83i9aqbsa2y8af",
-            "rev": "798e0933f8d0818beb17aebf3b1056bbf74e03d0"
-        },
-        "recipe": {
-            "sha256": "1zphndkbva59g1fd319a240yvq8fjk315b1fyrb8zvmqpgk9n0dl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150220.531",
-        "deps": []
-    },
-    "projectile-speedbar": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "anshulverma",
-            "repo": "projectile-speedbar",
-            "sha256": "0lr3vx1byf0i9jdzbyrvvzyzi1nfddvw5r9f9wm7gpfp5l8772la",
-            "rev": "59a91ea6b7e4ed4e25ba1acc37d6f90e14c3fa16"
-        },
-        "recipe": {
-            "sha256": "0dli4gzsiycivh8dwa00lfpbimyg42qygfachzrhi8qy5413pwlp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150629.1353",
-        "deps": [
-            "projectile"
-        ]
-    },
-    "helm-unicode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "shosti",
-            "repo": "helm-unicode",
-            "sha256": "1ypnsbx623gg3q07gxrbkn82jzy38sj4p52hj1wcb54qjqzyznkg",
-            "rev": "cf08fea1235fdc9f900efc0742b021ca33ef65aa"
-        },
-        "recipe": {
-            "sha256": "052xqzvcfzpsbl75ylqb1khqndvc2dqdymqlwivs0darlds0w8y4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150428.1354",
-        "deps": [
-            "emacs",
-            "helm"
-        ]
-    },
-    "base16-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mkaito",
-            "repo": "base16-emacs",
-            "sha256": "16240dj0hvxkljas9973wjdgkbx213sqws77j167yr5xf761dlsr",
-            "rev": "18693adea42ec2667534651c28c32934bc1bcec0"
-        },
-        "recipe": {
-            "sha256": "1zxbvfj6gvz1ynhj6i9q9y65hq7aq41qx4vnx738cjizcq0rc8bs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151019.911",
-        "deps": []
-    },
-    "xah-fly-keys": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xahlee",
-            "repo": "xah-fly-keys",
-            "sha256": "0ayd26gmv4jw6dblq1x81hsb35hy65f2mx5nsbfrgdkh078vzsq7",
-            "rev": "668895c2f6014174b0e42539b9d2963ed71b401c"
-        },
-        "recipe": {
-            "sha256": "0bzfz8q7yd1jai0pgngxwjp82nsfx5ivn24cb20vc5r8hhzj17cs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151223.2256",
-        "deps": []
-    },
-    "chm-view": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/chm-view.el",
-            "sha256": "1r274pf0xrcdml4sy2nhhp3v5pr3y3s4lvk45hd3pmw1i4pw2fd8"
-        },
-        "recipe": {
-            "sha256": "1acz0fvl3inn7g4himq680yf64bgm7n61hsv2zpm1k6smrdl78nz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20110616.1219",
-        "deps": []
-    },
-    "company-quickhelp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "expez",
-            "repo": "company-quickhelp",
-            "sha256": "0hg3wrfhz3qlfb6zv6j5a4xzmm4jk25pkv8h3ryg7sl7h602idgl",
-            "rev": "05e0ee9b854f90ff2b007b3e19446a02513f43dc"
-        },
-        "recipe": {
-            "sha256": "042bwv0wd4hksbm528zb7pbllzk83p8qjq5f8z46p84c8mmxfp9g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150804.519",
-        "deps": [
-            "company",
-            "emacs",
-            "pos-tip"
-        ]
-    },
-    "fxrd-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "msherry",
-            "repo": "fxrd-mode",
-            "sha256": "1n2cvingj7li61k1ff4kmf2gf591fdkslvqsqk0lh71nz59c543j",
-            "rev": "e8c93535cc04083d3b63a1944770488984bc19ce"
-        },
-        "recipe": {
-            "sha256": "17zimg64lqc1yh9gnp5izshkvviz996aym7q6n9p61a4kqq37z4r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151220.1444",
-        "deps": [
-            "s"
-        ]
-    },
-    "gnus-desktop-notify": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wavexx",
-            "repo": "gnus-desktop-notify",
-            "sha256": "0ylcphnf4lv78kiazdkl5izn7ql402fpvv82n7n1gpjiqq4ylalr",
-            "rev": "cbd5352d7cb5209a410db7f0faa60b4585f8647b"
-        },
-        "recipe": {
-            "sha256": "0hf2dszk5d7vn80bm0msaqv7iji384n85dxgw8ng64c0f9f6752b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150703.854",
-        "deps": [
-            "gnus"
-        ]
-    },
-    "abyss-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mgrbyte",
-            "repo": "emacs-abyss-theme",
-            "sha256": "12cgjc01k3ivy02381py2g87n2wzwnv153favw2raw4gwl2sfwhs",
-            "rev": "7971da041f5fb608e32cdac9259b53c87013c04f"
-        },
-        "recipe": {
-            "sha256": "0ckrgfd7fjls6g510v8fqpkd0fd18lr0spg3lf5s88gky8ihdg6c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151007.608",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "js-comint": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "redguardtoo",
-            "repo": "js-comint",
-            "sha256": "0hh49j4ngnw7zkp31nm7bckkic3ya3xwzrsz4ksj2ws4fyjkqc9v",
-            "rev": "6eb9b2be4fc1c43d600ae9d4cfeacee40fba5c73"
-        },
-        "recipe": {
-            "sha256": "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151126.2038",
-        "deps": [
-            "nvm"
-        ]
-    },
-    "orglue": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yoshinari-nomura",
-            "repo": "orglue",
-            "sha256": "1w0hadpslxcjn29yxl9i37sja4qf4kp7ffjpwij5hs73r518c2z6",
-            "rev": "4732f8bfd6866e20230b36e5971f2492827c6944"
-        },
-        "recipe": {
-            "sha256": "14g4q2k9zjzipzrp5mg72s40b0rwiaixgq3rvi15wh4vvcw5xajn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150430.713",
-        "deps": [
-            "epic",
-            "org",
-            "org-mac-link"
-        ]
-    },
-    "qml-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "coldnew",
-            "repo": "qml-mode",
-            "sha256": "172yfy4adxqhjgh0y4z5fpp52fgbyqvxmb7nh7050byljmiqy3jf",
-            "rev": "5e8fb8819e2d7f6fdbb5609a19570db6eaa6a83a"
-        },
-        "recipe": {
-            "sha256": "123mlibviplzra558x87da4zx0kpbhsgfigjjgjgp3mdg897084n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130427.1008",
-        "deps": []
-    },
-    "org-journal": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bastibe",
-            "repo": "emacs-journal",
-            "sha256": "0j6c2ykcm0yscfx5fjnbx53x4jvjc7c0lsgidlnn3a2mwynrc234",
-            "rev": "f67e147d864ec05f08f757725c8a97cb8d8a3fd1"
-        },
-        "recipe": {
-            "sha256": "078z9b9hxbvmmxib6098f49rn7n3d0v4x37p7xxb0v8cv4izlb4s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150910.949",
-        "deps": []
-    },
-    "selectric-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rbanffy",
-            "repo": "selectric-mode",
-            "sha256": "18xdkisxvdizsk51pnyimp9mwc6k9cpcxqr5hgndkz9q97p5dp79",
-            "rev": "0dd7ef28a9d9d6fbb95fdeeab6b576ad8762ad16"
-        },
-        "recipe": {
-            "sha256": "1k4l0lr68rqyi37wvqp1cnfci6jfkz0gvrd1hwbgx04cjgmz56n4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151201.918",
-        "deps": []
-    },
-    "circe": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jorgenschaefer",
-            "repo": "circe",
-            "sha256": "1l6lm3i02r0b8ng0n3rckgk0q38wjng41dqbx148bjxfq44cpghz",
-            "rev": "c9862e432d2dad7cd568d79dbe49849245333fb1"
-        },
-        "recipe": {
-            "sha256": "1f54d8490gfx0r0cdvgmcjdxqpni43msy0k2mgqd1qz88a4b5l07",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151207.344",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "blgrep": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ataka",
-            "repo": "blgrep",
-            "sha256": "1pslwyaq18d1z7fay2ih3n27i6b49ss62drqqb095l1jxk42xxm0",
-            "rev": "605beda210610a5829750a987f5fcebea97af546"
-        },
-        "recipe": {
-            "sha256": "0w7453vh9c73hdfgr06693kwvhznn9xr1hqa65izlsx2fjhqc9gm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150401.916",
-        "deps": [
-            "clmemo"
-        ]
-    },
-    "sublime-themes": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "owainlewis",
-            "repo": "emacs-color-themes",
-            "sha256": "0gnxc9i544g6202s205jkjsfyzbybiqsdaxmfxcwj8la7ga6h2bf",
-            "rev": "88315505322f285ff56272a6cd5f20af8eff2ef0"
-        },
-        "recipe": {
-            "sha256": "1nahcfcy831c7w3c69i2na0r8jsdgprffgfdvh4c41cnk4rkgdqj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150915.203",
-        "deps": []
-    },
-    "evm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "evm.el",
-            "sha256": "0739v0m9vj70a55z0canslyqgafzys815i7a0r6bxj2f9iwq6rhb",
-            "rev": "d0623b2355436a5fd9f7238b419782080c79196b"
-        },
-        "recipe": {
-            "sha256": "19l6cs5schbnph0pwhhj66gkxsswd4bmjpy79l9kxzpjf107wc03",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141007.656",
-        "deps": [
-            "dash",
-            "f"
-        ]
-    },
-    "snakemake-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kyleam",
-            "repo": "snakemake-mode",
-            "sha256": "18n4r3nqslvlzambraf70s5qgbdljy0qlfhpghilp1nvh327fmv5",
-            "rev": "3c6ed16930c0c18c4f5fddbe181ba407df681a07"
-        },
-        "recipe": {
-            "sha256": "1xxd3dms5vgvpn18a70wjprka5xvri2pj9cw8qz09s640f5jf3r4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151224.37",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "nameless": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "Nameless",
-            "sha256": "13v0v90vrc2w0wi7wmzmpql6yjbr6lpzh29kxggq9fy38lahd3ks",
-            "rev": "a3dfd7ecf9c58898241c8d1145eb8e0c875f5448"
-        },
-        "recipe": {
-            "sha256": "14agx54h2vqfb0656n12z761ywyxsdskd6xa1ccar70l9vwj85vq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151014.639",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "epresent": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "eschulte",
-            "repo": "epresent",
-            "sha256": "1a8gzf7abda0zgcllyl351m47avnf995i9lvwjf05nyx2jb31dnw",
-            "rev": "c185826a464f780467dff240fd63ec385bd1d9c2"
-        },
-        "recipe": {
-            "sha256": "1x16wqfjfrh7kaqar5px61bf3lnlibvcbr5xaf3mcgph37sgi6la",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150324.810",
-        "deps": []
-    },
-    "truthy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "truthy",
-            "sha256": "1mm6rrprsmx4hc622qmllm7c81yhwbqmdr0n6020krq92zmilmlm",
-            "rev": "8ed8d07772aa8457554547eb17e264b5df2b4a69"
-        },
-        "recipe": {
-            "sha256": "1a56zmqars9fd03bkqzwpvgblq5fvq19n4jw04c4hpga92sq8wqg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140508.1541",
-        "deps": [
-            "list-utils"
-        ]
-    },
-    "php-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ejmr",
-            "repo": "php-mode",
-            "sha256": "0206jv7rz9gm016lpfdwh2l0z6da25szc6hfxgcz2qvkzjpvrlr6",
-            "rev": "9b1e7736ce014f26f40635af3c781127a5e32dfa"
-        },
-        "recipe": {
-            "sha256": "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151002.2230",
-        "deps": []
-    },
-    "helm-bibtexkey": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kenbeese",
-            "repo": "helm-bibtexkey",
-            "sha256": "10k7hjfz9jmfpbmsv20jy9vr6fqxx1yp8v115hprqvw057iifsl9",
-            "rev": "aa1637ea5c8c5f1817e480fc2a3750cafab3d99f"
-        },
-        "recipe": {
-            "sha256": "00i7ni4r73mmxavhfcm0fd7jhx6gxvxx7prax1yxmhs46fpz8jwj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140214.904",
-        "deps": [
-            "helm"
-        ]
-    },
-    "sotlisp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "speed-of-thought-lisp",
-            "sha256": "027jmqx4240hym2is9q1iyjdws9ijyyck8dnsbm9xc5lhpsdrl69",
-            "rev": "d5d5ae44e6a31e231024cc7ad9861aa451165413"
-        },
-        "recipe": {
-            "sha256": "0zjnn6hhwy6cjvc5rhvhxcq5pmrhcyil14a48fcgwvg4lv7fbljk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151105.934",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "helm-spaces": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yasuyk",
-            "repo": "helm-spaces",
-            "sha256": "0sw7g1zcs1jfqcpprxwjq97lsk4qfngwamkj3q8jhm77zh7kfa3b",
-            "rev": "7545fed3880effe079bb27bfbf22e902ac0bc828"
-        },
-        "recipe": {
-            "sha256": "0hdvkk173k98iycvii5xpbiblx044125pl7jyz4kb8r1vvwcv791",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130605.1100",
-        "deps": [
-            "helm",
-            "spaces"
-        ]
-    },
-    "logito": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sigma",
-            "repo": "logito",
-            "sha256": "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr",
-            "rev": "824acb89d2cc18cb47281a4fbddd81ad244a2052"
-        },
-        "recipe": {
-            "sha256": "0bk4qnz66kvhzsk88lw45209778y53kg17iih70ix4ma1x6a3v5l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120225.1455",
-        "deps": [
-            "eieio"
-        ]
-    },
-    "slack": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yuya373",
-            "repo": "emacs-slack",
-            "sha256": "1qczdpklkb1ayyy71d40xi3iw276kpns4p3ml30sykva4y995khl",
-            "rev": "feaf6beae109e3dd9c8828cda2024eba69fad936"
-        },
-        "recipe": {
-            "sha256": "0mybjx08yskk9vi06ayiknl5ddyd8h0mnr8c0a3zr61p1x4s6anp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.532",
-        "deps": [
-            "alert",
-            "circe",
-            "emojify",
-            "oauth2",
-            "request",
-            "websocket"
-        ]
-    },
-    "auto-save-buffers-enhanced": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kentaro",
-            "repo": "auto-save-buffers-enhanced",
-            "sha256": "10aw3bpvawkqj1l8brvzq057wx3mkzpxs4zc3yhppkhq2cpvx7i2",
-            "rev": "caf594120781a323ac37eab82bcf87f1ed4c9c42"
-        },
-        "recipe": {
-            "sha256": "123vf6nnvdhrrfjn8n8h8a11mkqmy2zm3w3yn99np0zj31x8z7bb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130607.2149",
-        "deps": []
-    },
-    "programmer-dvorak": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yangchenyun",
-            "repo": "programmer-dvorak",
-            "sha256": "1yklm43d0ppyf4simhqab6m892z4mmxs2145lzw6kpizixavcv00",
-            "rev": "3288a8f058eca4cab390a564babbbcb17cfa0350"
-        },
-        "recipe": {
-            "sha256": "1w8r35hkl6qy9a89l0m74x9q2vcc4h2hvmi3r2hqcy2ypkn5l5bv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150426.2037",
-        "deps": []
-    },
-    "gold-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yuutayamada",
-            "repo": "gold-mode-el",
-            "sha256": "1k4i9z9h4m0h0y92mncr96jir63q5h1bix5bpnlfxhxl5w8pvk1q",
-            "rev": "6d3aa59602b1b835495271c8c9741ac344c2eab1"
-        },
-        "recipe": {
-            "sha256": "1b67hd1fp6xcj65xxp5jcpdjspxsbzxy26v6lqg5kiy8knls57kf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140606.2106",
-        "deps": [
-            "sws-mode"
-        ]
-    },
-    "org-tracktable": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tty-tourist",
-            "repo": "org-tracktable",
-            "sha256": "053wf36lq9piyzq7rv2lid34zanj6l9fvawp3r3nsniy5nlfckqx",
-            "rev": "28ef6772cdcf436cf38095f15c6bb681473180ce"
-        },
-        "recipe": {
-            "sha256": "0mngf9q2ffxq32cgng0xl30661mj15wmr9y4hr3xddj626kxrp00",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151129.1441",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "showtip": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/showtip.el",
-            "sha256": "01ibg36lvmdk7ac1k0f0r6wyds4rq0wb7gzw26nkiwykn14gxaql"
-        },
-        "recipe": {
-            "sha256": "1fdhdmkvyz1dcy3x0im1iab6yhhh8gqvxmm6ccwr6rl1r1m5zwc8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20080329.2159",
-        "deps": []
-    },
-    "electric-operator": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "davidshepherd7",
-            "repo": "electric-operator",
-            "sha256": "15k9jc8c7d1wq8lrmdpdk52a7krla0irb2anbllz7kmdj1cp6311",
-            "rev": "42be5a7e1e98ce879e93d87472de7b37434a5868"
-        },
-        "recipe": {
-            "sha256": "043bkpvvk42lmkll5jnz4q8i0m44y4wdxvkz6hiqhqcp1rv03nw2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151126.1536",
-        "deps": [
-            "dash",
-            "emacs",
-            "names"
-        ]
-    },
-    "duplicate-thing": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ongaeshi",
-            "repo": "duplicate-thing",
-            "sha256": "1qaiwm8mf4656gc1pdj8ivgy4abkjsypr52pvf4nrdkkln9qzfli",
-            "rev": "f6ed0232fd0653621afe450d53775a32a9d0e328"
-        },
-        "recipe": {
-            "sha256": "1jx2b6h23dj561xhizzbpxp3av69ic8zdw4kkf0py1jm3gnrmlm4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120515.1148",
-        "deps": []
-    },
-    "owdriver": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "owdriver",
-            "sha256": "0f2psx4lq98l3q3fnibsfqxp2hvvwk7b30zjvjlry3bffg3l7pfk",
-            "rev": "0479389d9df9e70ff9ce69dff06252d3aa40fc86"
-        },
-        "recipe": {
-            "sha256": "0j8z7ynan0zj581x50gsi9lljkbi6bwmzpfyha3i6q8ch5qkdxfd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141011.938",
-        "deps": [
-            "log4e",
-            "smartrep",
-            "yaxception"
-        ]
-    },
-    "color-identifiers-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ankurdave",
-            "repo": "color-identifiers-mode",
-            "sha256": "0m98i8w513zdzkskw9a96dd73lnfbfwvr947b0djsrazn8grh6hv",
-            "rev": "e35ee05588d84517193db07d94ce7f29ace10ef6"
-        },
-        "recipe": {
-            "sha256": "1hxp8lzn7kfckn5ngxic6qiz3nbynilqlxhlq9k1n1llfg216gfq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150602.2004",
-        "deps": [
-            "dash",
-            "emacs"
-        ]
-    },
-    "visible-mark": {
-        "fetch": {
-            "tag": "fetchFromGitLab",
-            "owner": "iankelling",
-            "repo": "visible-mark",
-            "sha256": "15zdbvv6c114mv6hdq375l7ax70sss06p9d7m86hgssc3kiv9vsv",
-            "rev": "c1852e13b6b61982738b56977a452ec9026faf1b"
-        },
-        "recipe": {
-            "sha256": "1rp0gnz28m1drwb1hhsf0mwxzdppdi88hscf788qw8cw65gckv80",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150623.2350",
-        "deps": []
-    },
-    "message-x": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/message-x.el",
-            "sha256": "05ic97plsysh4nqwdrsl5m9f24m11w24bahj8bxzfdawfima2bkf"
-        },
-        "recipe": {
-            "sha256": "0z12alizwrqp5f9wq3qllym9k5xljh904c9qhlfhp9biazj6yqwj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151029.918",
-        "deps": []
-    },
-    "spotify": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "remvee",
-            "repo": "spotify-el",
-            "sha256": "05y8xv6zapspwr5bii41lgirslas22wsbm0kgb4dm79qbk9j1kzw",
-            "rev": "07a44ecdbdaa93977e97f2a2e5d280ef0b2e8545"
-        },
-        "recipe": {
-            "sha256": "0pmsvxi1dsi580wkhhx8iw329agkh5yzk61bqvxzign3cd6fbq6k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150108.1003",
-        "deps": []
-    },
-    "vi-tilde-fringe": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syl20bnr",
-            "repo": "vi-tilde-fringe",
-            "sha256": "0wdm8k49zl6i6wnh7vjkswdh5m9lix56jv37xvc90inipwgs402z",
-            "rev": "f1597a8d54535bb1d84b442577b2024e6f910308"
-        },
-        "recipe": {
-            "sha256": "0jhwv46gjwjbs1ai65nm6k15y0q4yl9m5mawgp3n4f45dh02cawp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141027.2142",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "babel-repl": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hung-phan",
-            "repo": "babel-repl",
-            "sha256": "19sj3kw8kyv1bmagf2mw27yxmajf4k2abzmb6pc5rlhhhjq0xam1",
-            "rev": "be3ec68b36f4dea88aa5705d9ac230b74afcd77e"
-        },
-        "recipe": {
-            "sha256": "0h11i8w8s4ia1x0lm5n7bnc3db4bv0a7f7hzl27qrg38m3c7dl6x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150712.1000",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "spotlight": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "benmaughan",
-            "repo": "spotlight.el",
-            "sha256": "05knlca2dvpyqp9lw8dc47fl5kh2jb04q57cygkzfjjkzvywdwq8",
-            "rev": "ab902900f22e7d1ea2dd8169441d2da7155aaa68"
-        },
-        "recipe": {
-            "sha256": "0mmr1spr21pi8sfy95dsgqcxn8qfsphdkfjm5w5q97lh7496z65p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150929.255",
-        "deps": [
-            "counsel",
-            "emacs",
-            "swiper"
-        ]
-    },
-    "http-post-simple": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/http-post-simple.el",
-            "sha256": "1wp2rwc1hgd5c3yr6b96yzzakd1qmy5d95mhc6q4f6lx279nx0my"
-        },
-        "recipe": {
-            "sha256": "1b2fh0hp5z3712ncgc5ns1f3sww84khkq7zb3k9xclsp1p12a4cf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131010.2258",
-        "deps": []
-    },
-    "shadchen": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "VincentToups",
-            "repo": "shadchen-el",
-            "sha256": "0phivbhjdw76gzrx35rp0zybqfb0fdy2hjllf72qf1r0r5gxahl8",
-            "rev": "35f2b9c304eec990c16efbd557198289dc7cbb1f"
-        },
-        "recipe": {
-            "sha256": "1r1mfmv4cdlc8kzjiqz81kpqdrwbnyciwdgg6n5x0yi4apwpvnl4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141102.1239",
-        "deps": []
-    },
-    "mustache-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mustache",
-            "repo": "emacs",
-            "sha256": "15gw4d0hp15rglsj8hzd290li4p0kadj2dsz0dgfcxld7hnimihk",
-            "rev": "bf9897eb287ca47ced65d7d4e07ea61ea0aec39f"
-        },
-        "recipe": {
-            "sha256": "076ar57qhwcpl4n634ma827r2rh61670778wqr5za2444a6ax1gs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141024.932",
-        "deps": []
-    },
-    "persistent-soft": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "persistent-soft",
-            "sha256": "14p20br8vzxs39d4hswzrrkgwql5nnmn5j17cpbabzjvck42rixc",
-            "rev": "a1e0ddf2a12a6f18cab565dee250f070384cbe02"
-        },
-        "recipe": {
-            "sha256": "0a4xiwpgyyynjf69s8p183mqd3z53absv544ggvhb2gkpm6jravc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150223.1253",
-        "deps": [
-            "list-utils",
-            "pcache"
-        ]
-    },
-    "prosjekt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abingham",
-            "repo": "prosjekt",
-            "sha256": "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3",
-            "rev": "a864a8be5842223043702395f311e3350c28e9db"
-        },
-        "recipe": {
-            "sha256": "1fn7ii1bq7bjkz27hihclpvx0aabgwy3kv47r9qibjl2jin97rck",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151127.816",
-        "deps": [
-            "dash"
-        ]
-    },
-    "chef-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mpasternacki",
-            "repo": "chef-mode",
-            "sha256": "1mnskri5r1lyzzcag60x7amn00613jyl7by7hd4sqm2a7zd4r5aa",
-            "rev": "c333dd3f9229c4f35fe8c4495b21049ba730cc42"
-        },
-        "recipe": {
-            "sha256": "1pz82s82d4z3vkm8mpmwdxb9pd11kq09g23mg461lzqxjjw734rr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20111121.900",
-        "deps": []
-    },
-    "simplenote": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dotemacs",
-            "repo": "simplenote.el",
-            "sha256": "0xq4vy3ggdjiycd3aa62k94kd43zcpm8bfdgi8grwkb1lpvwq9i9",
-            "rev": "e836fcdb5a6497a9ffd6bceddd19b4bc52189078"
-        },
-        "recipe": {
-            "sha256": "0rnvm3q2spfj15kx2c8ic1p8hxg7rwiqgf3x2zg34j1xxayn3h2j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141118.840",
-        "deps": []
-    },
-    "key-combo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "uk-ar",
-            "repo": "key-combo",
-            "sha256": "1is7s50lgn77lxxwgakiaywx6jqdfg8045d18m4zn3ilxg6k8ljf",
-            "rev": "2e220fe3a91c944ce30c4c0297f99d0053b95754"
-        },
-        "recipe": {
-            "sha256": "1v8saw92jphvjkyy7j9jx7cxzgisl4zpf4wjzdjfw3la5lz11waf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150324.939",
-        "deps": []
-    },
-    "white-sand-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mswift42",
-            "repo": "white-sand-theme",
-            "sha256": "0sh92g5vd518f80klvljqkjpw4ji909439dpc3sfaccf5jiwn9xn",
-            "rev": "97621edd69267dd143760d94393db2c2558c9ea4"
-        },
-        "recipe": {
-            "sha256": "19qsiic6yf7g60ygjmw7kg1i28nqpm3zja8cmdh33ny2bbkwxsz5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151117.1048",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "company-irony-c-headers": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hotpxl",
-            "repo": "company-irony-c-headers",
-            "sha256": "1x2dfjmy86icyv2g1y5bjlr87w8rixqdcndkwm1sba6ha277wp9i",
-            "rev": "ba304fe7eebdff90bbc7dea063b45b82638427fa"
-        },
-        "recipe": {
-            "sha256": "0kiag5ggmc2f5c3gd8nn40x16i686jpdrfrflgrz2aih8p3g6af8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151018.409",
-        "deps": [
-            "cl-lib",
-            "company",
-            "irony"
-        ]
-    },
-    "eshell-prompt-extras": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kaihaosw",
-            "repo": "eshell-prompt-extras",
-            "sha256": "0r2fbz5z935vny9cbi857ryddhbg9v8i93jrzn2xvqs3h5wj9jn9",
-            "rev": "0b7670972b6b424b4a15a88b1733b99324dcf387"
-        },
-        "recipe": {
-            "sha256": "1plvc8azpmb3phlrxhw3y18dv5y0xljsr5fqym4w84m66lq5csfj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150726.159",
-        "deps": []
-    },
-    "magit-filenotify": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "magit-filenotify",
-            "sha256": "0nkxxhxkhy314jv1l3hza84vigl8q7fc8hjjvrx58gfgsfgifx6r",
-            "rev": "c0865b3c41af20b6cd89de23d3b0beb54c8401a4"
-        },
-        "recipe": {
-            "sha256": "00a77czdi24n3zkx6jwaj2asablzpxq16iqd8s84kkqxcfiiahn7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151116.1740",
-        "deps": [
-            "emacs",
-            "magit"
-        ]
-    },
-    "xterm-color": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "atomontage",
-            "repo": "xterm-color",
-            "sha256": "064fpjcj1sp8m5x106dw6zgy0p0rfd5fxcx57h533q263l7z00ny",
-            "rev": "1bc4ddb0e1bf7562cbf4b6b3bdd2ce3f9b596b39"
-        },
-        "recipe": {
-            "sha256": "0bvzi1mkxgm4vbq2va1sr0k9h3fdmppq79hkvbizc2xgk72sazpj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150823.846",
-        "deps": []
-    },
-    "cp5022x": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "awasira",
-            "repo": "cp5022x.el",
-            "sha256": "1z67x4a0aricd9q6i2w33k74alddl6w0rijjhzyxwml7ibhbvphz",
-            "rev": "ea7327dd75e54539576916f592ae1be98179ae35"
-        },
-        "recipe": {
-            "sha256": "0v1jhkix01l299m67jag43rnps68m19zy83vvdglxa8dj3naz5dl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120323.1835",
-        "deps": []
-    },
-    "sqlite": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cnngimenez",
-            "repo": "sqlite.el",
-            "sha256": "0zlrx8sk7gwwr6a23mc22d7iinwf8p9ff16r9krqp86fyzbhnq1d",
-            "rev": "9a7fb5836a19bc0ea8b4c5a50177112524380986"
-        },
-        "recipe": {
-            "sha256": "1j23rqgq00as90nk6csi489ida6b83h1myl3icxivj2iw1iikgj1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150417.15",
-        "deps": []
-    },
-    "phpunit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nlamirault",
-            "repo": "phpunit.el",
-            "sha256": "1zghw5nfm4a9j98vsaw4fc8r4f98s5fhgvgbnbyyxapl851fa9i6",
-            "rev": "1ea2aa7901b5d0b1878d6e104ca92de2bbd7313f"
-        },
-        "recipe": {
-            "sha256": "0nj8ss1yjkcqnbnn4jgbp0403ljjk2xhipzikdrl3dbxlf14i4f8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151009.454",
-        "deps": [
-            "f",
-            "pkg-info",
-            "s"
-        ]
-    },
-    "pastebin": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/pastebin.el",
-            "sha256": "17br64snqby465bjb0l1hzw0pcms5m2knrvb6y9gn3kir4sdi6kn"
-        },
-        "recipe": {
-            "sha256": "19fgjcbxgmnm59qjkxhvy2aib5qs5d5a43hwvjdhxq2k6rn3f2gj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20101125.1355",
-        "deps": []
-    },
-    "org-gcal": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "org-gcal.el",
-            "sha256": "1fg5qd1jswbdykx2aghpv79y5fccxcrwhwm81cnfh8s4fsq5nyfi",
-            "rev": "d9e04635ad692a02073947cc290c3c36a56c89f0"
-        },
-        "recipe": {
-            "sha256": "1mp6cm0rhd4r9pfvsjjp86sdqxjbbg7gk41zx0zf0s772smddy3q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150922.2148",
-        "deps": [
-            "alert",
-            "cl-lib",
-            "emacs",
-            "org",
-            "request-deferred"
-        ]
-    },
-    "evil-rails": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "antono",
-            "repo": "evil-rails",
-            "sha256": "12rdx5zjp5pck008cykpw200rr1y0b3lj2dpzf82llfyfaxzh7wi",
-            "rev": "6a9375bf7f5823c8138e679249c4e2ce58f2e93a"
-        },
-        "recipe": {
-            "sha256": "0ah0nvzl30z19566kacyrsznsdm3cpij8n3bw3dfng7263rh60gj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150803.646",
-        "deps": [
-            "evil",
-            "projectile-rails"
-        ]
-    },
-    "pcmpl-pip": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kaihaosw",
-            "repo": "pcmpl-pip",
-            "sha256": "14pz15by9gp0307bcdv9h90mcr35ya89wbn3y13n7k0z5r45gn58",
-            "rev": "b775bef9fa3ae9fb8015409554ecdd165c4bc325"
-        },
-        "recipe": {
-            "sha256": "17nmgq4wgv4yl2rsdf32585hfa58j0825mzzajrlwgmjiqx9i778",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141024.348",
-        "deps": []
-    },
-    "helm-rubygems-org": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "neomantic",
-            "repo": "helm-rubygems-org",
-            "sha256": "1sff8kagyhmwcxf9062il1077d4slvr2kq76abj496610gpb75i0",
-            "rev": "6aaed984f698cbdf9f9aceb0221404563e28764d"
-        },
-        "recipe": {
-            "sha256": "04ni03ak53z3rggdgf68qh7ksgcf3s0f2cv6skwjqw7v8qhph6qs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140826.656",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "helm"
-        ]
-    },
-    "ag": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Wilfred",
-            "repo": "ag.el",
-            "sha256": "03157dyw4in7hazw2glc9dz9509097s76x8g79w9cr9cyjwax42p",
-            "rev": "4894b38feffc4c044f8cbaabf3033f49084dba2c"
-        },
-        "recipe": {
-            "sha256": "1r4ai09vdckkg4h4i7dp781qqmm4kky53p4q8azp3n2c78i1vz6g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.1805",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "s"
-        ]
-    },
-    "smartscan": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mickeynp",
-            "repo": "smart-scan",
-            "sha256": "193cxfnh263yw628ipf9gssvyq3j7mffrdmnjhvzzcsnhd1k145p",
-            "rev": "5fd584d29ff8e5cd7a9e689369756868ab2922d3"
-        },
-        "recipe": {
-            "sha256": "0vghgmx8vnjbvsw7q5zs0qz2wm6dcng9m69b8dq81g2cq9dflbwb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131230.939",
-        "deps": []
-    },
-    "propfont-mixed": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ikirill",
-            "repo": "propfont-mixed",
-            "sha256": "0lch20njy248w7bnvgs7jz0zqasskf5dakmykxwpb48llm6kx95v",
-            "rev": "0b461ef4754a469610dba71874a34b6da42176bf"
-        },
-        "recipe": {
-            "sha256": "19k0ydpkiviznsngwcqwn4k30r6j8w34pchgpjlsfwq1bndaai9y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150113.1611",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "jenkins": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rmuslimov",
-            "repo": "jenkins.el",
-            "sha256": "08ywfmsjv3vjqy95hx095kasy8knh3asl7mrlkgmv9wjwnxw45zs",
-            "rev": "5ae8759d4799789337df0fd5e0e7d6f732f59b79"
-        },
-        "recipe": {
-            "sha256": "0ji42r7p3f3hh643839xf74gb231vr7anycr2xhkga8qy2vwa53s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151114.2108",
-        "deps": [
-            "dash",
-            "emacs",
-            "json"
-        ]
-    },
-    "el-init": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "HKey",
-            "repo": "el-init",
-            "sha256": "140afbksvm1kvam7pyaibay8rqhfhmb22rrh39mvdnqskqfnlqgr",
-            "rev": "a23cc95dd67fe63e131da211caa48eae804b11c5"
-        },
-        "recipe": {
-            "sha256": "121n6z8p9kzi7axp4i2kyi621gw20635w4j81i1bryblaqrv5kl5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150728.420",
-        "deps": [
-            "anaphora",
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "todotxt-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "avillafiorita",
-            "repo": "todotxt-mode",
-            "sha256": "1k9ywi7cdgb6i600wr04r2l00423l6vr7k93qa7i7svv856nbbc7",
-            "rev": "dc6ae151edee88f329ba7abc5d39b7440002232f"
-        },
-        "recipe": {
-            "sha256": "1bs4air13ifx3xkhcfi80z29alsd63r436gnyvjyxlph2ip37v7k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150424.904",
-        "deps": []
-    },
-    "alert": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jwiegley",
-            "repo": "alert",
-            "sha256": "0z7yfjg14bzndpm9ski1a1mdixvrykg7d08cd86dc82bghb3px2z",
-            "rev": "dfb003476aeb26d08782c17257f3a81934bcf6ce"
-        },
-        "recipe": {
-            "sha256": "0x3cvczq09jvshz435jw2fjm69457x2wxdvvbbjq46nfnybhi118",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151123.959",
-        "deps": [
-            "gntp",
-            "log4e"
-        ]
-    },
-    "slime-ritz": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pallet",
-            "repo": "ritz",
-            "sha256": "0rsh0bbhyx74yz1gjfqyi0bkqq5n3scpyh5mmc3d6dkpv8wa7bwz",
-            "rev": "4003fdaa5657d4ed1eeb0e244c46658cbb981667"
-        },
-        "recipe": {
-            "sha256": "1y1439y07l1a0sp9wn110hw4yyxj8n1cnd6h17rmsr549m2qbg1a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130218.1737",
-        "deps": []
-    },
-    "buffer-flip": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "killdash9",
-            "repo": "buffer-flip.el",
-            "sha256": "0ck6d1z8j9yc32wrbwmxl8rgm19la7ijvsh740sd0sfmhwqxc1kz",
-            "rev": "2bbf74fac037ace991d03336c515c499a8e69c95"
-        },
-        "recipe": {
-            "sha256": "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151214.1050",
-        "deps": [
-            "key-chord"
-        ]
-    },
-    "point-undo": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/point-undo.el",
-            "sha256": "13c1iw77ccvrfrv4lyljg8fpm7xqhnv29yzvig8wr8b5j2vsd8bz"
-        },
-        "recipe": {
-            "sha256": "0by7ifj1lf0w9pp7v1j9liqjs40k8kk9yjnznxchq172816zbg3k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20100504.329",
-        "deps": []
-    },
-    "frame-cmds": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/frame-cmds.el",
-            "sha256": "1p7ry940wgjpg2vq3m1nr1bs86cc4mhbpzj64znlmlnjgwa4bk2a"
-        },
-        "recipe": {
-            "sha256": "0xwzp6sgcb5ap76hpzm8g4kl08a8cgq7i2x9w64njyfink7frwc0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150814.952",
-        "deps": [
-            "frame-fns"
-        ]
-    },
-    "yaoddmuse": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/yaoddmuse.el",
-            "sha256": "0svy6zp5f22z7mblap4psh7h4i52d1qasi9yk22l39przhsrjar4"
-        },
-        "recipe": {
-            "sha256": "07sqcsad3k23agwwws7hxnc46cp9mkc9qinzva7qvjgs8pa9dh54",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150712.621",
-        "deps": []
-    },
-    "company-dcd": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tsukimizake",
-            "repo": "company-dcd",
-            "sha256": "0qbis9jqcrgj71cf8i9yfxsm7yj6d546gxw6linqd7slqn97l8rl",
-            "rev": "1d121dc42906fc58fa3a7febff8dabd29fba34f2"
-        },
-        "recipe": {
-            "sha256": "03849k4jzs23iglk9ghcq6283c9asffcq4dznypcjax7y4x113vd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150901.604",
-        "deps": [
-            "cl-lib",
-            "company",
-            "flycheck-dmd-dub",
-            "helm",
-            "popwin",
-            "yasnippet"
-        ]
-    },
-    "focus-autosave-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vifon",
-            "repo": "focus-autosave-mode.el",
-            "sha256": "1k5xhnr1jkfw8896kf2nl4633r6ni5bnc53rs6lxn8y9lj0srafb",
-            "rev": "592e2c0642ee86b2000b728ea346de084447dda8"
-        },
-        "recipe": {
-            "sha256": "1zwp99mk360mqk4mjnnjr6islavginc9732p0jn9g5yz62xypxpc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151012.442",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "bert": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "manzyuk",
-            "repo": "bert-el",
-            "sha256": "06izbc0ksyhgh4gsjiifhj11v0gx9x5xjx9aqci5mc4kc6mg05sf",
-            "rev": "a3eec6980a725aa4abd2019e4c00246450260490"
-        },
-        "recipe": {
-            "sha256": "1zhz1dcy1nf84p244x6lc4ajancv5fgmqmbrm080yhb2ral1z8x7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131117.414",
-        "deps": []
-    },
-    "tern-django": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "proofit404",
-            "repo": "tern-django",
-            "sha256": "1yb416py93sxnkfnfnbwrlfg68gkp97wpfsrdpc83sai888p44wc",
-            "rev": "455326a1732daa58d4d963b0b11bb1a9fd2f2b86"
-        },
-        "recipe": {
-            "sha256": "1pjaaffadaw8h2n7yv01ks19gw59dmh8bp8vw51hx1082r3yfvv0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150121.1327",
-        "deps": [
-            "emacs",
-            "f",
-            "tern"
-        ]
-    },
-    "shell-history": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/shell-history.el",
-            "sha256": "0biqjm0fpd7c7jilgkcwp6c32car05r5akimbcdii3clllavma7r"
-        },
-        "recipe": {
-            "sha256": "1blad7ggv27qzpai2ib1pmr23ljj8asq880g3d7w8fhqv0p1pjs7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20100504.350",
-        "deps": []
-    },
-    "pager": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsorphanage",
-            "repo": "pager",
-            "sha256": "1dq5ibz7rx9a7gm9zq2pz4c1sxgrm59yibyq92bvmi68lvf2q851",
-            "rev": "347e48d150d5e9a1ce2ca33ec12924d5fa89264d"
-        },
-        "recipe": {
-            "sha256": "0s5zwimkbsivbwlyd7g8dpnjyzqcfc5plg53ij4sljiipgjh5brl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20100330.1331",
-        "deps": []
-    },
-    "ido-ubiquitous": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DarwinAwardWinner",
-            "repo": "ido-ubiquitous",
-            "sha256": "0byairx5nxbzgdyiw658p7yiysfr7r1bd3b2prawq72bslb1c5cn",
-            "rev": "1a97a38f2d1a51371853e44da659caa6baf78cbe"
-        },
-        "recipe": {
-            "sha256": "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151219.1036",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "ido-completing-read+",
-            "s"
-        ]
-    },
-    "merlin": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "the-lambda-church",
-            "repo": "merlin",
-            "sha256": "00rmhvj2a7vxmqlr47f0x2nzkyy0ppx0h7ql4hp9iyxqpan7rrha",
-            "rev": "f8f26df0ceee91a6825362029dfae03bc7bde679"
-        },
-        "recipe": {
-            "sha256": "0wnh7512sknagdk56j6gd8vamh9ns3vnggm56s73pik0m009w0xr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151202.525",
-        "deps": []
-    },
-    "org-multiple-keymap": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "org-multiple-keymap.el",
-            "sha256": "0zbpzm9lni6z180s7n52x8s5by5zkq2nlhx82l2h9i7in9y4r6c3",
-            "rev": "8ebc532df7f0dd6e6c3aa7c380a51d4166c668e8"
-        },
-        "recipe": {
-            "sha256": "16iv5575634asvn1b2k535ml8g4lqgy8z5w6ykma5f9phq5idb9f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150328.2006",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "org"
-        ]
-    },
-    "bbdb-handy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tumashu",
-            "repo": "bbdb-handy",
-            "sha256": "04yxky7qxh0s4y4addry85qd1074l97frhp0hw77xd1bc7n5zzg0",
-            "rev": "67936204488b539fac9b4a7bfbf11546f3b13de2"
-        },
-        "recipe": {
-            "sha256": "0qv1lw4fv9w9c1ypzpbnvkm6ypqrzqpwyw5gpi7n9almxpd8d68z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150707.1952",
-        "deps": [
-            "bbdb"
-        ]
-    },
-    "preproc-font-lock": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Lindydancer",
-            "repo": "preproc-font-lock",
-            "sha256": "0yrfd9qaz16nqcvjyjm9qci526qgkv6k51q5752h3iyqkxnss1pd",
-            "rev": "565fda9f5fdeb0598986174a07e9fb09f7604397"
-        },
-        "recipe": {
-            "sha256": "1ra0lgjv6713zym2h8pblf2ryf0f658l1khbxbwnxl023gkyj9v4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151107.1418",
-        "deps": []
-    },
-    "vagrant": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ottbot",
-            "repo": "vagrant.el",
-            "sha256": "04r73s3fhvdcryv0l57awkpg1hi3kg6zcqxbxb03jc89h0f9vdlh",
-            "rev": "dabf69b7146f8a035bba15285b1fafc1e9ef4b3c"
-        },
-        "recipe": {
-            "sha256": "0g6sqzsx3lixcn09fkxhhcfp45qnqgf1ms0l7nkzyljavb7151cf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141125.2159",
-        "deps": []
-    },
-    "tramp-term": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "randymorris",
-            "repo": "tramp-term.el",
-            "sha256": "0cgx6h9a49qj7x6bgsnsa20hi1yj5k080x4x0jpn6l9bj5nqiaip",
-            "rev": "983ed67ee65d26a51c641f306fa6b921ec83eeaf"
-        },
-        "recipe": {
-            "sha256": "1vbdwj8q66j6h5ijqzxhyaqf8wf9rbs03x8ppfijxl5qd2bhc1dy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141104.1545",
-        "deps": []
-    },
-    "windsize": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "grammati",
-            "repo": "windsize",
-            "sha256": "0hijf56ahbc5inn7n39nj96d948c4d05n9d5ci3g3vbl5hsyb121",
-            "rev": "beb6376fdf52afa6f220c89032448460faf76e7f"
-        },
-        "recipe": {
-            "sha256": "1xhfw77168942rcn246qndii0hv0q6vkgzj67jg4mxh8n46m50m9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151121.740",
-        "deps": []
-    },
-    "unbound": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/unbound.el",
-            "sha256": "0i5km1naxprd4lj20097ph50mjs2364xwxcdw0j3g5569mk5nc06"
-        },
-        "recipe": {
-            "sha256": "1ys6pgb3lhx4ihhv8i28vrchp1ad37md7lnana40macf5n72d77x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140307.328",
-        "deps": []
-    },
-    "uuidgen": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kanru",
-            "repo": "uuidgen-el",
-            "sha256": "19bf6vpc2b9hfjkjanji96fflvk1lbillasnpwcb6zzyq0cs47bw",
-            "rev": "7eb96415484c3854a3f383d1a3e10b87ae674e22"
-        },
-        "recipe": {
-            "sha256": "1qaz7hg0wsdkl0jb7v7vrkjs554i2zgpxl8xq2f8q7m4bs2m5k48",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140918.1801",
-        "deps": []
-    },
-    "anti-zenburn-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "m00natic",
-            "repo": "anti-zenburn-theme",
-            "sha256": "0p4jg397iqriahqm7ssr8zsmqnwh0wrwl9bxkhwh8fzkd2rvxci0",
-            "rev": "7e107cd0b77e4212a6c330600e8eb83a72d7defe"
-        },
-        "recipe": {
-            "sha256": "1sp9p6m2jy4m9fdn1hz25cmasy0mwwgn46qmvm92i56f5x6jlzzk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151223.1613",
-        "deps": []
-    },
-    "sws-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "brianc",
-            "repo": "jade-mode",
-            "sha256": "1q6wpjb7vhsy92li6fag34pwyil4zvcchbvfjml612aaykiys506",
-            "rev": "0d0bbf60730d0e33c6362e1fceeaf0e133b1ceeb"
-        },
-        "recipe": {
-            "sha256": "0b12dsad0piih1qygjj0n7rni0pl8cizbzwqm9h1dr8imy53ak4i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150317.1445",
-        "deps": []
-    },
-    "impatient-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "netguy204",
-            "repo": "imp.el",
-            "sha256": "0vr4i3ayp1n8zg3v9rfv81qnr0vrdbkzphwd5kyadjgy4sbfjykj",
-            "rev": "eba1efce3dd20b5f5017ab64bae0cfb3b181c2b0"
-        },
-        "recipe": {
-            "sha256": "05vp04zh5w0ss959galdrnridv268dzqymqzqfpkfjbg8kryzfxg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150501.447",
-        "deps": [
-            "cl-lib",
-            "htmlize",
-            "simple-httpd"
-        ]
-    },
-    "ibuffer-projectile": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "ibuffer-projectile",
-            "sha256": "1zcnp61c9cp2kvns3v499hifk072rxm4rhw4pvdv2mm966vcxzvc",
-            "rev": "8b225dc779088ce65b81d8d86dc5d394baa53e2e"
-        },
-        "recipe": {
-            "sha256": "1qh4krggmsc6lx5mg60n8aakmi3f6ppl1gw094vfcsni96jl34fk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150121.1037",
-        "deps": [
-            "projectile"
-        ]
-    },
-    "lentic": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "phillord",
-            "repo": "lentic",
-            "sha256": "0r5mngz8jsgx1z0dyvm93pimsh63wg18bisvk11d9mq7c1whyc4v",
-            "rev": "02073c4f1c376c99511e0e637a15ed0da18405a8"
-        },
-        "recipe": {
-            "sha256": "0y94y1qwj23kqp491b1fzqsrjak96k1dmmzmakbl7q8vc9bncl5m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151223.314",
-        "deps": [
-            "dash",
-            "emacs",
-            "f",
-            "m-buffer",
-            "s"
-        ]
-    },
-    "hgignore-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "omajid",
-            "repo": "hgignore-mode",
-            "sha256": "06hm98aq87l91fhb2bqz8jw427k8fb280ygz5g44fy6sqc6js7v0",
-            "rev": "054c370c6df1b789f0d9907b30b54ef2287aafbe"
-        },
-        "recipe": {
-            "sha256": "0ja71l3cghhn1c6w2pff80km8h8xgzf0j9gcldfyc72ar6ifhjkj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150412.1300",
-        "deps": []
-    },
-    "ubuntu-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rocher",
-            "repo": "ubuntu-theme",
-            "sha256": "1v8d1pc0vjc7wz0prr5w5vp2qb19f3gcyl6jx5130plajbvv23rc",
-            "rev": "88b0eefc75d4cbcde103057e1c5968d4c3052f69"
-        },
-        "recipe": {
-            "sha256": "160z59aaxb2v6c24nki6bn7pjm9r4jl1mgxs4h4sivzxkaw811s2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150805.1006",
-        "deps": []
-    },
-    "lfe-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rvirding",
-            "repo": "lfe",
-            "sha256": "14rkvxyyxsr80bcymvwxvnyvk9mminvxsy5yg1gqvw9aif0y8ia4",
-            "rev": "64dec553ac6fcee72cb61f7e0f6f317690a73c1f"
-        },
-        "recipe": {
-            "sha256": "06b382ncgk4zz3q8akyzfy55j86a53r97gf0l92qvlca7fbs8jjx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151110.1835",
-        "deps": []
-    },
-    "color-theme": {
-        "fetch": {
-            "tag": "fetchbzr",
-            "url": "http://bzr.savannah.gnu.org/r/color-theme/trunk",
-            "sha256": "17bidzq9kiz250gal1fn9mg8gf8l749nz69z0awpc4x2222wxxiz",
-            "rev": "57"
-        },
-        "recipe": {
-            "sha256": "1p4bjh8a9f6ixmwwnyjb520myk3bww1v9w6427za07v68m9cdh79",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20080305.234",
-        "deps": []
-    },
-    "mo-vi-ment-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "AjayMT",
-            "repo": "mo-vi-ment",
-            "sha256": "0k0scl9z35d8x4ikxm2db1frpbx151p2m181fa1armxbd9lbfvnn",
-            "rev": "f45b014261f8fab19254920bd1d92f3a83263411"
-        },
-        "recipe": {
-            "sha256": "1pg889mgpv0waccm135mlvag7q13gzfkzchv2532jngwrn6amqc7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131029.133",
-        "deps": []
-    },
-    "ascii": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/ascii.el",
-            "sha256": "05fjsj5nmc05cmsi0qj914dqdwk8rll1d4dwhn0crw36p2ivql75"
-        },
-        "recipe": {
-            "sha256": "0jb63f7qwhfbz0n4yrvnvx03cjqly3mqsc3rq9mgf4svy2zw702r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130824.700",
-        "deps": []
-    },
-    "flycheck-d-unittest": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "flycheck",
-            "repo": "flycheck-d-unittest",
-            "sha256": "1r71alxbxwcrdf3r5rg7f0bdwh0ylvayp5g97i9biyxdg59az4ad",
-            "rev": "f2255abf6a5cd9268b1576d9b46356f8151a7311"
-        },
-        "recipe": {
-            "sha256": "0n4m4f0zqcx966582af1nqff5sla7jcr0wrmgzzxnn97yjrlnzk2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150709.109",
-        "deps": [
-            "dash",
-            "flycheck"
-        ]
-    },
-    "crontab-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsorphanage",
-            "repo": "crontab-mode",
-            "sha256": "1r9dhk8h8lq18vi0hjai8y4z42yjxg18786mcr2qs5m3q1ampf9d",
-            "rev": "68341c82b26462a6af4a5e2b624b1c2165243b8e"
-        },
-        "recipe": {
-            "sha256": "16qc2isvf6cgl5ihdbwmvv0gbhns4mkhd5lxkl6f8f6h0za054ci",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20090510.1555",
-        "deps": []
-    },
-    "term+key-intercept": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarao",
-            "repo": "term-plus-ki-el",
-            "sha256": "1dql2w8xkdw52zlrc2p9x391zn8wv4dj8a6293p4s08if7gg260w",
-            "rev": "fd0771fd66b8c7a909aaac972194485c79ba48c4"
-        },
-        "recipe": {
-            "sha256": "1564a86950xdwsrwinrs118bjsfmbv8gicq0c2dfr827v5b6zrlb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140211.150",
-        "deps": [
-            "key-intercept",
-            "term+"
-        ]
-    },
-    "nyan-prompt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "PuercoPop",
-            "repo": "nyan-prompt",
-            "sha256": "0bgspjy8h3d7v12sfjnd2ghj4183pdf0z48g5xs129jwd3nycykp",
-            "rev": "b5137f2ee9afe640f59786eed17b308df6356c73"
-        },
-        "recipe": {
-            "sha256": "1s0qyhpfpncsv9qfxy07rbp4gv8pp5xzb48rbd3r14nkjlnylnfb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140810.8",
-        "deps": []
-    },
-    "keymap-utils": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "keymap-utils",
-            "sha256": "18kc48glbwy9njw863fzlrgc4g0a65s5wf2iarfsjqcynad7r4c7",
-            "rev": "f9164e23dbc58c4fdce635138ed59fe2eb285313"
-        },
-        "recipe": {
-            "sha256": "0nbcwz4nls0pva79lbx91bpzkl38g98yavwkvg2rxbhn9vjbhzs9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151030.526",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "aria2": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "https://bitbucket.org/ukaszg/aria2.git",
-            "sha256": "2713755e56b03e28a5a6e10c85865c1ace0247e71caeb8b89ec65d5618addafc",
-            "rev": "3c54254e424c6c8b4eb0d8e7c4907b094c27a3f0"
-        },
-        "recipe": {
-            "sha256": "10x2k99m3kl6y0k0mw590gq1ac162nmdwk58i8i7a4mb72zmsmhc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141107.1717",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "spray": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ian-kelling",
-            "repo": "spray",
-            "sha256": "0fvywcwn0zd06yy4b6cxpasiwfbps17jz9dy3jr0y0mdx5lzfxa9",
-            "rev": "11623f45955a18115459a2c18dc95bc967980a53"
-        },
-        "recipe": {
-            "sha256": "11b3wn53309ws60w8sfpfxij7vnibj6kxxsx6w1agglqx9zqngz4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150626.145",
-        "deps": []
-    },
-    "xcscope": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dkogan",
-            "repo": "xcscope.el",
-            "sha256": "1wf6yijafqwcksrqci3d8zy3zh5yzqpfbf0d3m7qyslbax2aw25a",
-            "rev": "d845a033058ccb83e32dd9648885e8f608bb6258"
-        },
-        "recipe": {
-            "sha256": "06xh29cm5v3b5xwj32y0i0h0kvvy995840db4hvab2wn9jw68m8w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140510.1637",
-        "deps": []
-    },
-    "helm-mu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-helm",
-            "repo": "helm-mu",
-            "sha256": "0x523ic0bi40iplp2lbiyvy6yw6mrbgj9cfah71a47rwcm0fvhjk",
-            "rev": "2ae4b26817f13760e6d9e739477e2512292d90d5"
-        },
-        "recipe": {
-            "sha256": "0pydp6scj5icaqfp3dp5h0q1y2i7z9mfyw1ll6iphsz9qh3x2bj2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151019.1144",
-        "deps": [
-            "helm"
-        ]
-    },
-    "org-cliplink": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rexim",
-            "repo": "org-cliplink",
-            "sha256": "1fwnsyl6lq43bvdh4fldsb8224y1dasavkjdlg0fw1libqjp8w6i",
-            "rev": "401d378e6324334d8b6ac4d28c86182848cd8c26"
-        },
-        "recipe": {
-            "sha256": "19l3k9w9csgvdr7n824bzg7jja0f28dmz6caldxh43vankpmlg3p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151219.1455",
-        "deps": []
-    },
-    "flymake-cppcheck": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "senda-akiha",
-            "repo": "flymake-cppcheck",
-            "sha256": "1dlxn8hhz3gfrhvkwhlxjmby6zc0g8yy9n9j9dn8c4cbi2fhyx5m",
-            "rev": "9554f504d425a04fa6a875f7e3179bc7cf07dd03"
-        },
-        "recipe": {
-            "sha256": "11brzgq2zl32a8a2dgj2imsldjqaqvxwk2jypf4bmfwa3mkcqh3d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140415.757",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "weechat": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "the-kenny",
-            "repo": "weechat.el",
-            "sha256": "03xsh3fc7if6rkdp2s8lmrzpqm3pjakgqi3faap44y9i84q6mc6k",
-            "rev": "a191b4c52e2cca33acfdd82145da42fb2798b185"
-        },
-        "recipe": {
-            "sha256": "0sxrms5024bi4irv8x8s8j1zcyd62cpqm0zv4dgpm65wnpc7xc46",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151206.647",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "s",
-            "tracking"
-        ]
-    },
-    "psci": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ardumont",
-            "repo": "emacs-psci",
-            "sha256": "08j31bg5vwgirv5n5fsw7w6gncrkpwpjlj2m00dhj8wbvhp503sn",
-            "rev": "64dc931b4fe2a7507b8ac81423b12f7dcda2067a"
-        },
-        "recipe": {
-            "sha256": "0sgrz8byz2pcsad2pydinp4hh2xb48pdb03r93wg2vvyy8p15j9g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150328.1401",
-        "deps": [
-            "dash",
-            "deferred",
-            "f",
-            "purescript-mode",
-            "s"
-        ]
-    },
-    "chicken-scheme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dleslie",
-            "repo": "chicken-scheme.el",
-            "sha256": "0j61lvr99viaharg4553whcppp7lxhimkk5lps0izz9mnd8y2wm5",
-            "rev": "19b0b08b5592063e852cae094b394c7d1f923639"
-        },
-        "recipe": {
-            "sha256": "0ns49p7nsifpi7wrzr02ljrr0p6hxanrg54zaixakvjkxwcgfabr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141116.1339",
-        "deps": []
-    },
-    "ample-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jordonbiondo",
-            "repo": "ample-theme",
-            "sha256": "0x72czw5rmz89w5fa27z54bz8qirrr882g0r37pb8li04j1hk7kw",
-            "rev": "8259da1cc14e7f7dd3ee0fb01245c58110a95382"
-        },
-        "recipe": {
-            "sha256": "055c6jy2q761za4cl1vlqdskcd3mc1j58k8b4418q7h2lv2zc0ry",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150814.1301",
-        "deps": []
-    },
-    "ob-restclient": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alf",
-            "repo": "ob-restclient.el",
-            "sha256": "0gd2n7dgaasl0clx71gsdm74xxm03qr5yrin8vz3q7wvkfn4bzdf",
-            "rev": "fc5684186275146bba667325c8c33bf7d6011552"
-        },
-        "recipe": {
-            "sha256": "0nv2wsqmpschym6ch8fr4a79hlnpz31jc8y2flsygaqj0annjkfk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151207.1503",
-        "deps": []
-    },
-    "cmake-font-lock": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Lindydancer",
-            "repo": "cmake-font-lock",
-            "sha256": "030kg3m546gcm6cf1k928ld51znsfrzhlpm005dvqap3gkcrg4sf",
-            "rev": "982b753e0228bb5189e3bf2283afad9197d93c37"
-        },
-        "recipe": {
-            "sha256": "0ws4kd94m8fh55d7whsf3rj9qrxjp1wsgxh0valsjxyp2ck9zrz0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150828.1527",
-        "deps": [
-            "cmake-mode"
-        ]
-    },
-    "go-scratch": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "shosti",
-            "repo": "go-scratch.el",
-            "sha256": "1a6vg2vwgnafb61pwrd837fwlq5gs80wawbzjsnykawnmcaag8pm",
-            "rev": "3f68cbcce04f59eb8e83af109164731ec0454be0"
-        },
-        "recipe": {
-            "sha256": "11ahvmxbh67wa39cymymxmcpkq0kcn5jz0rrvazjy2p1hx3x1ma5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150809.2340",
-        "deps": [
-            "emacs",
-            "go-mode"
-        ]
-    },
-    "finder+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/finder+.el",
-            "sha256": "01rkp2fa4h9pippa7q3702hn9bqgbdg7ml4w6dn72l8nj4vnrwmn"
-        },
-        "recipe": {
-            "sha256": "1ichxghp2vzx01n129fmjm6iwx4b98ay3xk1ja1i8vzyd2p0z8vh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1604",
-        "deps": []
-    },
-    "vala-snippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gopar",
-            "repo": "vala-snippets",
-            "sha256": "0iscaz8lm4fk6w13f68ysqk8ppng2wj9fkkkq1rfqz77ws66f8nq",
-            "rev": "671439501060449bd100b9fffd524a86064fbfbb"
-        },
-        "recipe": {
-            "sha256": "14hmmic0px3z38dm2dg0kis6cz1p3p1hj7xaqnqjmv02dkx2mmcy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150428.2252",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "plenv": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "karupanerura",
-            "repo": "plenv.el",
-            "sha256": "11cbpgjsnw8fiqf1s12hbm9qxgjcw6y2zxx7wz4wg7idmi7m0b7g",
-            "rev": "ee937d0f3a1a7ba2d035f45be896d3ed8fefaee2"
-        },
-        "recipe": {
-            "sha256": "0dw9fy5wd9wm76ag6yyw3f9jnlj7rcdcxgdjm30h514qfi9hxbw4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130707.116",
-        "deps": []
-    },
-    "random-splash-image": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kakakaya",
-            "repo": "random-splash-image",
-            "sha256": "1z25xmz8pl3rsfahw6ay8wx5wbnlxabnzr2dq20m0i5jyci8lqll",
-            "rev": "907e2db5ceff781ac7f4dbdd65fe71736c36aa22"
-        },
-        "recipe": {
-            "sha256": "1j454jy4ia2wrgi3fxzjfdqi3z8x13hq8kh62lnb84whs7a1nhik",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151002.2030",
-        "deps": []
-    },
-    "typescript-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ananthakumaran",
-            "repo": "typescript.el",
-            "sha256": "16y1r8080scjanbd95hpgk9lp8xqy8cxwkk9xij53jiqfglcwi5c",
-            "rev": "49241bcc1f60b3787ccd9448a559f792156907a9"
-        },
-        "recipe": {
-            "sha256": "01jyqy44ir59n9c2f6gh4xzwfmzdpnys1lw4lnsy6kirqgbsq9ha",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150830.2028",
-        "deps": []
-    },
-    "git-gutter+": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nonsequitur",
-            "repo": "git-gutter-plus",
-            "sha256": "0bhrrgdzzj8gwxjx7b2kibp1b6s0vgvykfg0n47iq49m6rqkgi5q",
-            "rev": "b7726997806d9a2da9fe84ff00ecf21d62b6f975"
-        },
-        "recipe": {
-            "sha256": "1w78p5cz6kyl9kmndgvwnfrs80ha707s8952hycrihgfb6lixmp0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151204.1123",
-        "deps": [
-            "dash",
-            "git-commit"
-        ]
-    },
-    "wrap-region": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "wrap-region",
-            "sha256": "09fzbbrdgq19c3gylj4i0c5g070k65w943wz28mzis8b403vzh3n",
-            "rev": "0eff3165db36464d28ed303ab25b715307cbdee0"
-        },
-        "recipe": {
-            "sha256": "0mby3m49vm2pw127divspgivqam27zd4r70wx5ra05xwfxywaibq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140117.120",
-        "deps": [
-            "dash"
-        ]
-    },
-    "flymake-gjshint": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yasuyk",
-            "repo": "flymake-gjshint-el",
-            "sha256": "14kbqyw4v1c51dx7pfgqbn8x4j8j3rgyyq2fa9klqzxpldcskl24",
-            "rev": "dc957c14cb060819585de8aedb330e24efa4b784"
-        },
-        "recipe": {
-            "sha256": "19jcd5z4883z3fzlrdn4fzmsvn16f4hfnhgw4vbs5b0ma6a8ka44",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130327.732",
-        "deps": []
-    },
-    "smotitah": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "laynor",
-            "repo": "smotitah",
-            "sha256": "1a097f1x9l0m4dizvnb742svlqsm6hlif73rk7qjar081sk1gjxx",
-            "rev": "f9ab562128a5460549d016913533778e8c94bcf3"
-        },
-        "recipe": {
-            "sha256": "1m5qjl3r96riljp48il8k4rb6rwys1xf1pl93d4qjhprwvz57mv2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150218.430",
-        "deps": []
-    },
-    "org-dotemacs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vapniks",
-            "repo": "org-dotemacs",
-            "sha256": "15zrnd168n4pwa1bj5fz79hcrgw61braf0b095rsfhjh5w2sasy7",
-            "rev": "99a066508fedf8c80a3bfef08e015e612499d417"
-        },
-        "recipe": {
-            "sha256": "1vc391fdkdqd4g0piq66zhrlgqx5s2ijv7qd1rc3a235sjb9i2n4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151119.1222",
-        "deps": [
-            "cl-lib",
-            "org"
-        ]
-    },
-    "rnc-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "TreeRex",
-            "repo": "rnc-mode",
-            "sha256": "1drvyf5asjp3lgpss7llff35q8r89vmh73n1axaj2qp9jx5a5jih",
-            "rev": "b39dc23218213336b55f28e12a1d0e49ef7c1e21"
-        },
-        "recipe": {
-            "sha256": "09ly7ln6qrcmmim9bl7kd50h4axrhy6ig406r352xm4a9zc8n22q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121227.1702",
-        "deps": []
-    },
-    "pangu-spacing": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "coldnew",
-            "repo": "pangu-spacing",
-            "sha256": "01zc2cvkyfx80snwrm3cs8cbwgxmd56rgvvbsyq53r4q3zhdk1li",
-            "rev": "4662e66d5cb72738d46d3296ac7626536fc88acb"
-        },
-        "recipe": {
-            "sha256": "082qh26vlk7kifz1800lyai17yvngwjygrfrsh1dsd8dxhk6l9j8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150927.224",
-        "deps": []
-    },
-    "protobuf-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "google",
-            "repo": "protobuf",
-            "sha256": "04j0i9glv0g6k59gjdpdpnlq44h2b958md8vr2mh4qsbhm89nbk3",
-            "rev": "b27f2893b2a118b4e3bfcd23d32114dbdd4e6d9b"
-        },
-        "recipe": {
-            "sha256": "1hh0w93fg6mfwsbb9wvp335ry8kflj50k8hybchpjcn6f4x39xsj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150521.2211",
-        "deps": []
-    },
-    "metaweblog": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "punchagan",
-            "repo": "metaweblog.el",
-            "sha256": "06mbdb4zb07skq1jpv05hr45k5x96d9hgkb358jiq0kfsqlrbbb4",
-            "rev": "c8b50a6edf0fd2f396570c9a1c2ef8cd207606fb"
-        },
-        "recipe": {
-            "sha256": "11y5x3a8iv0hjj7ppi2sa7vawn7r475qfsh1jg415j4y4fzwpk6y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141130.805",
-        "deps": [
-            "xml-rpc"
-        ]
-    },
-    "imenus": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alezost",
-            "repo": "imenus.el",
-            "sha256": "0wi346m05b18i14xxih4qvwdrfcgv30gdvxjjcn6vd7gr0wdk2ns",
-            "rev": "a153eadef49bcc0a2dd5d045c0e003fdfd8c13cd"
-        },
-        "recipe": {
-            "sha256": "1q0j6r2n5vjlbgchkz9zdglmmbpd8agawzcg61knqrgzpc4lk82r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150107.1139",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "systemd": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "holomorph",
-            "repo": "systemd-mode",
-            "sha256": "0f0xwsizi34pbpy48r70sdqk5692c0ds11amscafj0lyw3lza93j",
-            "rev": "26de1dd6f4505eb9db606d97c11b0d120c395d76"
-        },
-        "recipe": {
-            "sha256": "1biais0cmidy3d0hf2ifdlr6qv1z8k8c8bczi07bsfk4md3idbir",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151127.2332",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "sourcegraph": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sourcegraph",
-            "repo": "emacs-sourcegraph-mode",
-            "sha256": "18iv7jhy08smpdksplngj1mxcm2mm9gvbylimgr3211l8jr9gq8r",
-            "rev": "554c55734c23588fce66a8fa966945509b03d395"
-        },
-        "recipe": {
-            "sha256": "0rl6s1d0y2pggbfiq4f4xg9qp7nhkd708himzilfqyfa4jwna8yz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150403.2127",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "wordnut": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gromnitsky",
-            "repo": "wordnut",
-            "sha256": "1b9pya342ikyxnlyxp86wx8xk6zcdws7jsqs7a9xk027prwkfngj",
-            "rev": "3e0184a8a1cc118a985f1cbd0b6d5b7417987169"
-        },
-        "recipe": {
-            "sha256": "1gqmjb2f9izra0x9ds1jyk7h204qsll6viwkvdnmxczyyc0wx44n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151002.1657",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "list-processes+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/list-processes+.el",
-            "sha256": "1bssvyjgk1h1wiaxxdi2m5gjy6a790a9rwvi0r22hin7iskg300a"
-        },
-        "recipe": {
-            "sha256": "10x7hkba2bmryyl68w769fggw65dl4f3a9g0gqdzmkdj80rcipky",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131117.1335",
-        "deps": []
-    },
-    "nav": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://code.google.com/p/emacs-nav/",
-            "sha256": "0kfqpji6z3ra8sc951vmm1bzyhkws7vb5q6djvl45wlf1wrgkc4p",
-            "rev": "d7f54ce8536e"
-        },
-        "recipe": {
-            "sha256": "036lf6iirxamlqzq3w6m0hji36l480yx5c9wnwypms85hi8hq0vl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120507.207",
-        "deps": []
-    },
-    "seclusion-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dleslie",
-            "repo": "seclusion-mode",
-            "sha256": "15cjhwjiwmrfzmr74hbw5s92si2qdb8i97nmkbsgkj3444rxg239",
-            "rev": "9634e76c52bfb7200ff0f9f01404f743429e9ef0"
-        },
-        "recipe": {
-            "sha256": "0ff10x6yr37vpp6ffbk1nb027lgmrydwjrb332fskwlf3xmy6v0m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121118.1753",
-        "deps": []
-    },
-    "auto-highlight-symbol": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gennad",
-            "repo": "auto-highlight-symbol",
-            "sha256": "0jfiax1qqnyznhlnqkjsr9nnv7fpjywvfhj9jq59460j0nbrgs5c",
-            "rev": "26573de912d760e04321b350897aea70958cee8b"
-        },
-        "recipe": {
-            "sha256": "02mkji4sxym07jf5ww5kgv1c18x0xdfn8cmvgns5h4gij64lnr66",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130313.443",
-        "deps": []
-    },
-    "hippie-exp-ext": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/hippie-exp-ext.el",
-            "sha256": "1jkjg7zxpc06plzlyvj1a8dcvj8ijqzhkxwlsd12cgkymvp411yl"
-        },
-        "recipe": {
-            "sha256": "14py5hz523847f7bhw67v81x5cfhzz5la15mrqavc4z4yicy63iq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151011.345",
-        "deps": []
-    },
-    "flycheck-clangcheck": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kumar8600",
-            "repo": "flycheck-clangcheck",
-            "sha256": "1ckzs32wzqpnw89rrw3l7i4gbyn25wagbadsc4mcrixml5nf0mck",
-            "rev": "24a9424c484420073a24443a829fd5779752362b"
-        },
-        "recipe": {
-            "sha256": "1316cj3ynl80j39ha0371ss7cqw5hcr3m8944pdacdzbmp2sak2m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150712.210",
-        "deps": [
-            "cl-lib",
-            "flycheck",
-            "seq"
-        ]
-    },
-    "lisp-extra-font-lock": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Lindydancer",
-            "repo": "lisp-extra-font-lock",
-            "sha256": "1r2yhjfby4mibbr7d14m1rifchdy7bvwy50xz2wx4004zqhjmnjd",
-            "rev": "ff34c8519653824cf4a40979538b334cd2653892"
-        },
-        "recipe": {
-            "sha256": "1xchqwhav9x7b02787ghka567fihdc14aamx92jg549c6d14qpwk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150129.1516",
-        "deps": []
-    },
-    "helm-rb": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yuutayamada",
-            "repo": "helm-rb",
-            "sha256": "1b74jsr28ldz80mrqz3d1bmykpcprdbhf3fzhc0awd5i5xdnfaid",
-            "rev": "4949d646420a9849af234dacdd8eb34a77c662fd"
-        },
-        "recipe": {
-            "sha256": "14pkrj1rpi2ihpb7c1hx6xwzvc1x7l41lwr9znp5vn7z93i034fr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131123.1039",
-        "deps": [
-            "helm",
-            "helm-ag-r"
-        ]
-    },
-    "splitter": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chumpage",
-            "repo": "chumpy-windows",
-            "sha256": "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs",
-            "rev": "164be41b588b615864258c502583100d3ccfe13e"
-        },
-        "recipe": {
-            "sha256": "02vdhvipzwnh6mlj25lirzxkc0shfzqfs1p4gn3smkxqx6g7mdb2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130705.250",
-        "deps": []
-    },
-    "w3m": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsorphanage",
-            "repo": "w3m",
-            "sha256": "1lgvdaghzj1fzh8p6ans0f62zg1bfp086icbsqmyvbgpgcxia9cs",
-            "rev": "5986b51c7c77500fee3349fb0b3f4764d3fc727b"
-        },
-        "recipe": {
-            "sha256": "0vh882b44vxnij3l01sig87c1jmbymgirf6s98mvag1p9rm8agxw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121224.1947",
-        "deps": []
-    },
-    "recentf-ext": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/recentf-ext.el",
-            "sha256": "15kwkphrlxq6nbmqm95sxv4rykl1d35sjm59ncy07ncqm706h33l"
-        },
-        "recipe": {
-            "sha256": "1m54w1n3ci5j7i1jhw6cs7dgzmxrj1hsrrarqlrd1d4iqhixjzbq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130130.1550",
-        "deps": []
-    },
-    "pydoc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "statmobile",
-            "repo": "pydoc",
-            "sha256": "1q9fmdrnsqmisykndxzy9bvjl6n1rsmfgvh3h8fkg6b44ypcyyw7",
-            "rev": "74fb1a66e9d81661ddd371a03e916ea5e0b01dc8"
-        },
-        "recipe": {
-            "sha256": "0sf52cb80yiridsl1pffdr3wpbgxrn2l8vnq03l70djckild477n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150525.2045",
-        "deps": []
-    },
-    "ov": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ShingoFukuyama",
-            "repo": "ov.el",
-            "sha256": "1rk5pzm5wmdq68d99hhhbq8pq37bnph0dip5j2jnfj6zsw70whr2",
-            "rev": "fae7215b3dedba2a9ced145284332e4609bfdc38"
-        },
-        "recipe": {
-            "sha256": "0d71mpv74cfxcnwixbrl90nr22cw4kv5sdgpny5wycvh6cgmd6qb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150312.28",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "applescript-mode": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "http://svn.osdn.jp/svnroot/macemacsjp/applescript-mode/trunk",
-            "sha256": "0n3y0314ajqhn5hzih09gl72110ifw4vzcgdxm8n6npjbx7irbml",
-            "rev": "584"
-        },
-        "recipe": {
-            "sha256": "1ya0dh7gz7qfflhn6dq43rapb2zg7djvxwn7p4jajyjnwbxmk611",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120205.507",
-        "deps": []
-    },
-    "ibuffer-vc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "ibuffer-vc",
-            "sha256": "0fwxhkx5rkyv3w5vs2swhmly9siahlww2ipsmk7v8xmvk4a63bhp",
-            "rev": "daae8b8cec4b8e572b065e00c8c8a368fd0a8b8b"
-        },
-        "recipe": {
-            "sha256": "0bn5qyiq07cgzci10xl57ss5wsk7bfhi3hjq2v6yvpy9v704dvla",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150714.1520",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "kanji-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wsgac",
-            "repo": "kanji-mode",
-            "sha256": "0vfagfzhh4rkmvjzfhfcm7w3z1x31aqzxwigk5yw9scnfb77pinz",
-            "rev": "3caaee58f00f69a8c9ee2491b8a2050add9df962"
-        },
-        "recipe": {
-            "sha256": "0nnkv7lp7ks9qhkbhz15ixm53grc2q0xfspzykxi9c4b59kypcq5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150202.225",
-        "deps": []
-    },
-    "dired-dups": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vapniks",
-            "repo": "dired-dups",
-            "sha256": "1lcmpzwj43gix2q56bh2gw3gfqh8vl5j3mqr8s7v3k0aw816j0ni",
-            "rev": "694ad128c822c59348ced16c4a0c1356d43da47a"
-        },
-        "recipe": {
-            "sha256": "05s02gw8b339yvsr7vvka1r2140y7mbjzs8px4kn4acgb5y7rk71",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130527.1625",
-        "deps": []
-    },
-    "edebug-x": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ScottyB",
-            "repo": "edebug-x",
-            "sha256": "1zgiifi1k2d9g8sarfpjzamk8g1yx4ilgn60mqhy2pznp30b5qb2",
-            "rev": "a2c2c42553d3bcbd5ac11898554865acbed1bc46"
-        },
-        "recipe": {
-            "sha256": "0mzrip6y346mix4ny1xj8rkji1w531ix24k3cczmlmm4hm7l29ql",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130616.125",
-        "deps": []
-    },
-    "servant": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "servant.el",
-            "sha256": "15lx6qvmq3vp84ys8dzbx1nzxcnzlq41whawc2yhrnd1dbq4mv2d",
-            "rev": "4d2aa8250b54b28e6e7ee4cd5ebd98a33db2c134"
-        },
-        "recipe": {
-            "sha256": "048xg0gcwnf4l2p56iw4iawi3ywjz7f6icnjfi8qzk1z912iyl9h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140216.619",
-        "deps": [
-            "ansi",
-            "commander",
-            "dash",
-            "epl",
-            "f",
-            "s",
-            "shut-up",
-            "web-server"
-        ]
-    },
-    "moz-controller": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "RenWenshan",
-            "repo": "emacs-moz-controller",
-            "sha256": "0fssn33ld6xhjlwg1dbrjg8sa0pjmglq0dw792yrmvm4fj0zjph8",
-            "rev": "46f665c03574fa922de767fc29795e0db4a7c5c6"
-        },
-        "recipe": {
-            "sha256": "18gca1csl9dfi9995mky8cbgi3xzf1if8pzdjiz5404gzcqk0rfd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151208.2006",
-        "deps": [
-            "moz"
-        ]
-    },
-    "bitlbee": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pjones",
-            "repo": "elisp",
-            "sha256": "1cnx5kr0hah4h4b6arp7hb2i556vpx1dwmziny2csil39hkcjgbs",
-            "rev": "5eafcd3ff0725b5826d1e01bfe4c7ed01563b75e"
-        },
-        "recipe": {
-            "sha256": "15xb0vjamnfwi25yqd37zwfm6xb6p71if88hk2ymxikza4i47x0f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130328.1218",
-        "deps": []
-    },
-    "dired-efap": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "juan-leon",
-            "repo": "dired-efap",
-            "sha256": "0jj9da880b4zwxba140fldai1x9p2sxc6hdf3wz6lnbvz1pyn1mv",
-            "rev": "624757b2e54d9a13e2183118d6c113e37684b90c"
-        },
-        "recipe": {
-            "sha256": "01j5v6584qi8ia7zmk03kx3i3kmm6hn6ycfgqlh5va6lp2h9sr00",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140122.1056",
-        "deps": []
-    },
-    "form-feed": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wasamasa",
-            "repo": "form-feed",
-            "sha256": "0ymj89bha77fwb64wrkgyaxp61k03kvdhp98c4l3vljmfm5hmsbl",
-            "rev": "ba1fb2be4b509e98ba7a368176bb13e4a3bb4720"
-        },
-        "recipe": {
-            "sha256": "1abwjkzi3irw0jwpv3f584zc72my9n8iq8zp5s0354xk6iwrl1rh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150926.756",
-        "deps": []
-    },
-    "auto-complete-nxml": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "auto-complete-nxml",
-            "sha256": "18bf1kw85mab0zp7rn85cm1nxjxg5c1dmiv0j0mjwzsv8an4px5y",
-            "rev": "ac7b09a23e45f9bd02affb31847263de4180163a"
-        },
-        "recipe": {
-            "sha256": "0viscr5k1carn9vhflry16kgihr6fvh6h36b049pgnk6ww085k6a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140220.2258",
-        "deps": [
-            "auto-complete"
-        ]
-    },
-    "time-ext": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/time-ext.el",
-            "sha256": "0kxgzjwgd979aypjak07k8ss6hnm3x9f96z1rz2zsz2i3vvh6sqv"
-        },
-        "recipe": {
-            "sha256": "15b3m1jvr7kg5sc4c8cp0aaiiyivfx8ip1zf7w5m702krv4lfvpk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130130.1551",
-        "deps": []
-    },
-    "ws-butler": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lewang",
-            "repo": "ws-butler",
-            "sha256": "1x2ybnv0h52i24vd1n95s4vglc6p79cyxh91a20cwza34svhz152",
-            "rev": "a998a23ee8713808ac1fe3d1523ea1861be4da57"
-        },
-        "recipe": {
-            "sha256": "072k67z2lx0ampwzdiszi64xs0w6frp4nbmrd2r0wpx0pd211vbn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150126.959",
-        "deps": []
-    },
-    "nsis-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "nsis-mode",
-            "sha256": "1w80mbwlvmpd5ff7vy84z61b27klzh9z4wa6m2g7cy674fw4r1xp",
-            "rev": "5ea767c326bbe180e42be723605c0b03b16fdb06"
-        },
-        "recipe": {
-            "sha256": "0pc047ryw906sz5mv0awvl67kh20prsgx6fbh0j1qm0cali2792l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150914.746",
-        "deps": []
-    },
-    "cucumber-goto-step": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gstamp",
-            "repo": "cucumber-goto-step",
-            "sha256": "184plai32sn0indvi1dma6ykz907zgnrdyxdw6f5mghwca96g5kx",
-            "rev": "f2713ffb26ebe1b757d1f2ea80e900b55e5895aa"
-        },
-        "recipe": {
-            "sha256": "1ydsd455dvaw6a180b6570bfgg0kxn01sn6cb57smqj835am6gx8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131209.2319",
-        "deps": [
-            "pcre2el"
-        ]
-    },
-    "strie": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hackscience",
-            "repo": "strie.el",
-            "sha256": "1xgsdr75p52vg34s1gm16ffkr3s7gdsln56xjxpdirnwr78glbmw",
-            "rev": "066e72c39ed51162d7d7892c7451a6cac28581b7"
-        },
-        "recipe": {
-            "sha256": "0i1bgjlwcc2ks8hzjkyrw924q4k8pcz8335z9935m73js0sq0lxl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140109.812",
-        "deps": []
-    },
-    "punctuality-logger": {
-        "fetch": {
-            "tag": "fetchFromGitLab",
-            "owner": "elzair",
-            "repo": "punctuality-logger",
-            "sha256": "1bkkgs2agy00wivilljkj3a9fsb2ba935icjmhbk46zjc6yf3y6q",
-            "rev": "e09e5dd37bc92289fa2f7dc44aed51a7b5e04bb0"
-        },
-        "recipe": {
-            "sha256": "0q9s74hkfqvcx67xpq9rlvh38nyjnz230bll6ks7y5yzxvl4qhcm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141120.1431",
-        "deps": []
-    },
-    "obsidian-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mswift42",
-            "repo": "obsidian-theme",
-            "sha256": "00v21iw9wwxap8jhg9035cp47fm5v2djmldq6nprv860m01xlwh1",
-            "rev": "0f92ce87245529d5c75d6e5f7862ebbc54bdbc92"
-        },
-        "recipe": {
-            "sha256": "17ckshimdma6fqiis4kxczxkbrsfpm2a0b41m5f3qz3qlhcw2xgr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140420.1143",
-        "deps": []
-    },
-    "firecode-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsfodder",
-            "repo": "emacs-firecode-theme",
-            "sha256": "0v8liv6aq10f8dxbl3d4rph1qk891dlxm9wqdc6w8aj318750hfm",
-            "rev": "73573192e5e9d14d94dfc5131dd2b7a780b89626"
-        },
-        "recipe": {
-            "sha256": "10lxd93lkrvz8884dv4sh6fzzg355j7ab4p5dpvwry79rhs7f739",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141116.102",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "less-css-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "less-css-mode",
-            "sha256": "1w6mbk4gc63sh2p9rsy851x2kid0dp2ja4ai5badkr5prxkcpfdn",
-            "rev": "d59a3ff4031ae75fbbe77b6cfce7843205394c28"
-        },
-        "recipe": {
-            "sha256": "188iplnwwhawq3dby3388kimy0jh1k9r8v9nxz52hy9rhh9hykf8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150511.519",
-        "deps": []
-    },
-    "snapshot-timemachine": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mrBliss",
-            "repo": "snapshot-timemachine",
-            "sha256": "17nbm8692ihrlcikihspdqg8wvp80ryq4h06da34d0awqm0w027m",
-            "rev": "5c1e29fc771ffc65180faa1366c85aa50a335773"
-        },
-        "recipe": {
-            "sha256": "0pvh1ilzv0ambc5cridyhjcxs58wq92bxjkisqv42yar3h3z6f8p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150501.1300",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "python-x": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wavexx",
-            "repo": "python-x.el",
-            "sha256": "0ky23irh8zdkssgzhsyas37118vjc7w50rlc5a2414d2mmgnp70m",
-            "rev": "d241015775e34f5ef7844abc067ea68b88f0b548"
-        },
-        "recipe": {
-            "sha256": "115mvhqfa0fa8kdk64biba7ri4xjk74qqi6vm1a5z3psam9mjcmn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.1926",
-        "deps": [
-            "cl-lib",
-            "folding",
-            "python"
-        ]
-    },
-    "el-spec": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "uk-ar",
-            "repo": "el-spec",
-            "sha256": "1lsq7980pwcwlg7z37hrig8ddm9nyvaqrlczv1w0vy631vc5z2az",
-            "rev": "1dbc465401d4aea5560318c4f13ff30920a0718d"
-        },
-        "recipe": {
-            "sha256": "017syizs8qw5phwvpzzffzdnj6rh9q4n7s51qjvj8qfb3088igkh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121018.204",
-        "deps": []
-    },
-    "slime-annot": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "arielnetworks",
-            "repo": "cl-annot",
-            "sha256": "1wq1gs9jjd5m6iwrv06c2d7i5dvqsfjcljgbspfbc93cg5xahk4n",
-            "rev": "c99e69c15d935eabc671b483349a406e0da9518d"
-        },
-        "recipe": {
-            "sha256": "14x9lzpkgkc96jsbfpahl027qh6y5azwdk0cmk9pbd1xm95kxj6n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131230.2108",
-        "deps": [
-            "slime"
-        ]
-    },
-    "ruby-test-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "r0man",
-            "repo": "ruby-test-mode",
-            "sha256": "06fhrn04whqb3n40wkzrwmzbzv7b1m48rd18rx8zpgxhbw8v7rdc",
-            "rev": "b7a652b5d0492a3c712090787faa5f206c2af5fb"
-        },
-        "recipe": {
-            "sha256": "113ysf08bfh2ipk55f8h741j05999yrgx57mzh53rim5n63a312w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151127.218",
-        "deps": [
-            "ruby-mode"
-        ]
-    },
-    "font-utils": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "font-utils",
-            "sha256": "1k90w8v5rpswqb8fn1cc8sq5w12gf4sn6say5dhvqd63512b0055",
-            "rev": "9192d3f8ee6a4e75f34c3fed10378674cc2b11d3"
-        },
-        "recipe": {
-            "sha256": "0k33jdchjkj7j211a23kfp5axg74cfsrrq4axsb1pfp124swh2n5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150806.1251",
-        "deps": [
-            "pcache",
-            "persistent-soft"
-        ]
-    },
-    "digistar-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "retroj",
-            "repo": "digistar-mode",
-            "sha256": "0rjqfpya6wkf8nv00q2d40fcnssnsr3p07j9blbpcrqalkdm27ds",
-            "rev": "fcc0447b9ad97ac76f86de7485e0947440966d3f"
-        },
-        "recipe": {
-            "sha256": "0khzxlrm09h31i1nqz6rnzhrdssb3kppc4klpxza612l306fih0s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150402.1922",
-        "deps": []
-    },
-    "yatex": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://www.yatex.org/hgrepos/yatex/",
-            "sha256": "1n38fn6hcsl5ilq8vdaakv6id426lr7hdnvccqy6jdplqymgj7h6",
-            "rev": "5b49aea3810d"
-        },
-        "recipe": {
-            "sha256": "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151014.2228",
-        "deps": []
-    },
-    "phi-autopair": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "phi-autopair",
-            "sha256": "14g06ndxrqz80kdyhil6ajcqqxkfa77r1gr7vwqa9sq6jgm8dpx5",
-            "rev": "ec4e02f3b1602a6450ece118c79d4beb2430ff08"
-        },
-        "recipe": {
-            "sha256": "1ya1bvh28qgz1zg9kdh2lzbsf0w0lx4xr42mdrjwaz3bbfa9asg4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150527.423",
-        "deps": [
-            "paredit"
-        ]
-    },
-    "dired-sort": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/dired-sort.el",
-            "sha256": "1dpxkxxfs14sdm3hwxv0j26lq0qzx4gryw42vrcdi680aj24962z"
-        },
-        "recipe": {
-            "sha256": "1dzy2601yikmmbfqivf9s5xi4vd1f5g3c53f8rc74kfnxr1qn59x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20090208.2238",
-        "deps": []
-    },
-    "navi2ch": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "naota",
-            "repo": "navi2ch",
-            "sha256": "15l2zmm8bp4ip8m1hfxkvswfwa29pg72kisfya2n5v900r184a4m",
-            "rev": "faebfd15184de9df6903eae436dafb52c38ee86e"
-        },
-        "recipe": {
-            "sha256": "13xwvyy27dz1abjkkazm3s1p6cw32l2klr1bnln02w0azkbdy7x3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150329.2116",
-        "deps": []
-    },
-    "smartwin": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jerryxgh",
-            "repo": "smartwin",
-            "sha256": "1fyv0j641iyhnkdf8wmg6d35gv0678w26kdgx61phwa3kgcc156l",
-            "rev": "bff875daca9509ef323e4ed846b9b4fdbf7b0d95"
-        },
-        "recipe": {
-            "sha256": "0rg92j0aa8qxhr91hjj2f4w8vj5w9b4d2nmkggng44nxk8zafdif",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.611",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "dired-filetype-face": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jixiuf",
-            "repo": "dired-filetype-face",
-            "sha256": "0v6n4ymlnphzmqaqlfbxvf24dh1pa0xy37xhz9xfjkk02l02wsgf",
-            "rev": "c51bb2d5fba8964b86e63242c247c4688441b9db"
-        },
-        "recipe": {
-            "sha256": "1g9wzkkqmlkxlxwx43446q9mlam035zwq0wzpf7m6394rw2xlwx6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151216.2057",
-        "deps": []
-    },
-    "pandoc-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joostkremers",
-            "repo": "pandoc-mode",
-            "sha256": "0aj509yjqgq8bxrvdq5x3d1sfj0dgwwh6kg7f20vapz9qxjdjvdg",
-            "rev": "23444375a60f44b3439994e969d8aa7acf220f8c"
-        },
-        "recipe": {
-            "sha256": "0qvc6cf87h1jqf590kd68jfg25snxaxayfds634wj4z6gp70l781",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151030.513",
-        "deps": [
-            "dash",
-            "hydra"
-        ]
-    },
-    "highlight-parentheses": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nschum",
-            "repo": "highlight-parentheses.el",
-            "sha256": "0kzqx1y6rr4ryxi2md9087saad4g4bzysckmp8272k521d46xa1r",
-            "rev": "a821a314942f409cd69660d816cd9a0aebd1ae8f"
-        },
-        "recipe": {
-            "sha256": "1b0n9mz4a6baljvvgb881w53391smm35c9pwd45g861hk1qvrk5k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151108.116",
-        "deps": []
-    },
-    "elx": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "elx",
-            "sha256": "1mchc4d61li5gfsf05dwhgb694fjj9hljnbvwvc12c1iik0zavq0",
-            "rev": "a8dff14f0626f729e745092dd88a1801c6239710"
-        },
-        "recipe": {
-            "sha256": "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151215.639",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "bibslurp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mkmcc",
-            "repo": "bibslurp",
-            "sha256": "077shjz9sd0k0akvxzzgjd8a626ck650xxlhp2ws4gs7rjd7a823",
-            "rev": "aeba96368f2a06959e4fe945375ce2a54d34b189"
-        },
-        "recipe": {
-            "sha256": "178nhng87bdi8s0r2bdh2gk31w9mmjkyi6ncnddk3v7p8fsh4jjp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151202.1746",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "ensime": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ensime",
-            "repo": "ensime-emacs",
-            "sha256": "0p6fdph08332c82vv8ds2h6ghxjb1kird84ykblkx41f748hw2y2",
-            "rev": "f590c350695e3efbe3a3197bb4ad7e6a3174f77c"
-        },
-        "recipe": {
-            "sha256": "1d8y72l7bh93x9zdj3d3qjhrrzr804rgi6kjifyrin772dffjwby",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151224.620",
-        "deps": [
-            "company",
-            "dash",
-            "popup",
-            "s",
-            "sbt-mode",
-            "scala-mode2",
-            "yasnippet"
-        ]
-    },
-    "hyai": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "iquiw",
-            "repo": "hyai",
-            "sha256": "0d3kdpwzr1gs0q986pkj8b9av9knzbh1ax9ybhn0k66hi55hn7bc",
-            "rev": "9c229e6bbccb8481b3889643d02de9869956875c"
-        },
-        "recipe": {
-            "sha256": "00ns7q5b11c5amwkq11fs4p5vrmdfmjljfrcxbwb39gc12yrhn7s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151218.610",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "hackernews": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "clarete",
-            "repo": "hackernews.el",
-            "sha256": "15d7zjxjp9h8jmxq3dqakwzlymqk6hqsg7zklkjs0ih7fz0d25pl",
-            "rev": "676d72da9fa4743dae34da95138fd022a51fbfdd"
-        },
-        "recipe": {
-            "sha256": "1x1jf5gkhmpiby5rmy0sziywh6c1f1n0p4f6dlz6ifbwns7har6a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150901.1017",
-        "deps": [
-            "json"
-        ]
-    },
-    "powerline": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "milkypostman",
-            "repo": "powerline",
-            "sha256": "0dq7fqlv72p72hbshzbwz5k40mqfdw10v9hsd1m18s2rf7082570",
-            "rev": "e886f6fe46c7413befb1de3799a185366fd8b39c"
-        },
-        "recipe": {
-            "sha256": "0gsffr6ilmckrzifsmhwd42vr85vs42pc26f1205pbxb7ma34dhx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151008.1649",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "helm-sage": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "stakemori",
-            "repo": "helm-sage",
-            "sha256": "1s6aw1viyzhhrfiazzi82n7bkvshp7clwi6539660m72lfwc5zdl",
-            "rev": "b42b4ba5fd1b17c4b54c30376a053281686beeb8"
-        },
-        "recipe": {
-            "sha256": "1vnq15fjaap0ai7dadi64sm4415xssmahk2j7kx45sasy4qaxlbj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150827.2234",
-        "deps": [
-            "cl-lib",
-            "helm",
-            "sage-shell-mode"
-        ]
-    },
-    "skewer-less": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "skewer-less",
-            "sha256": "16757xz5ank3jsh8xglyly7pwdn5xm0yngampy1n1vgcwsp5080a",
-            "rev": "5a48dfa627c91f5f94150fab04cd66e890e3929f"
-        },
-        "recipe": {
-            "sha256": "0fhv5cnp5bgw3krfmb0jl18kw2hzx2p81falj57lg3p8rn23dryl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131015.822",
-        "deps": [
-            "skewer-mode"
-        ]
-    },
-    "eimp": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/eimp.el",
-            "sha256": "024qyipwlj3g0fff06cgq357blkh3hyr14vpmkqsv15x6gb9snir"
-        },
-        "recipe": {
-            "sha256": "11z23kx89yy03hzs1xlbcih70lsp2lplxs8nkc8jvfcpsjwypsl0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140630.947",
-        "deps": []
-    },
-    "flymake-perlcritic": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "illusori",
-            "repo": "emacs-flymake-perlcritic",
-            "sha256": "1f4l2r4gp03s18255jawc7s5abpjjrw54937wzygmvzvqvmaiikj",
-            "rev": "edfaa86500ddfa8a6a6f51f5581a81a821277df6"
-        },
-        "recipe": {
-            "sha256": "0hibnh463wzhvpix7gygpgs04gi6salwjrsjc6d43lxlsn3y1im8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120328.314",
-        "deps": [
-            "flymake"
-        ]
-    },
-    "dired-single": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/dired-single.el",
-            "sha256": "1ys38kjnqvks8w207jv6y5yh30rarmib0p78ak761k9sldgd6wvx"
-        },
-        "recipe": {
-            "sha256": "075vzvmh9y403m1vm5a807vkzrqv8dmhgfdzyizfj80q365sv72p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130824.700",
-        "deps": []
-    },
-    "oneonone": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/oneonone.el",
-            "sha256": "1810acc61dwdq80jwn5diwg9djzag3n1l9lql72bjkq21my320k5"
-        },
-        "recipe": {
-            "sha256": "0v4nvhzgq97zbi18jd3ds57yh1fpv57b2a1cd7r8jbxwaaz3gpg9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150821.1428",
-        "deps": [
-            "hexrgb"
-        ]
-    },
-    "emamux": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-emamux",
-            "sha256": "1x88blaf7f1nwqm20jlcx4xh9almz0570dck87qf27lljrbfikpn",
-            "rev": "1bb88275e472e131c4c14590b48e2016861724a5"
-        },
-        "recipe": {
-            "sha256": "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151021.2302",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "itail": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "re5et",
-            "repo": "itail",
-            "sha256": "1az986mk8j8hyvr1mi9hirixwcd73jcqkjsw4xy34vjbwxi122r9",
-            "rev": "ff80d0456a0039062de1cf73932a5a32d46821b1"
-        },
-        "recipe": {
-            "sha256": "0mcyly88a3c15hl3wll56agpdsyvd26r501h0v64lasfr4k634m7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151113.1035",
-        "deps": []
-    },
-    "rings": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "konr",
-            "repo": "rings",
-            "sha256": "0imsc44mcy5abmfin28d13l8mjjvyx6hxcsk81r0i8h12mxlmfkp",
-            "rev": "1655dbf88ad877f54d67fab49f292945f70708eb"
-        },
-        "recipe": {
-            "sha256": "1ncsb4jip07hbrf1l4j9yzn3l0kb63ylhzzsb4bb2yx6as4a66k7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140102.1736",
-        "deps": []
-    },
-    "kill-or-bury-alive": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mrkkrp",
-            "repo": "kill-or-bury-alive",
-            "sha256": "0z9jlps979c1pza9wqfy2v9jx9awwfccdnrdlz535r49qv5lmih4",
-            "rev": "04fa76e5baa2fbdfac77c38007a8dacbf0a3f9bc"
-        },
-        "recipe": {
-            "sha256": "0mm0m8hpy5v98cap4f0s38dcviirm7s6ra4l94mknyvnx0f73lz8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151210.100",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "hiwin": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yoshida-mediba",
-            "repo": "hiwin-mode",
-            "sha256": "177blksgncxpxd1zi9kmbcfjnpd3ll1szjxiyc4am8a6hs1dyyqk",
-            "rev": "6ee8ed051405653bd9b7332d7e9fbb591d954051"
-        },
-        "recipe": {
-            "sha256": "0klhxwxsz7xan2vsknw79r1dj4qhhjbfpddr67mk9qzccp8q0w8g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150825.327",
-        "deps": []
-    },
-    "ggtags": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "leoliu",
-            "repo": "ggtags",
-            "sha256": "1qjh7av046ax4240iw40hv5fc0k23c36my9hili7fp4y2ak99l8n",
-            "rev": "d4fb6d40b71cad3fd5a2141b8456f27e2b2dc731"
-        },
-        "recipe": {
-            "sha256": "1cmry4knxbx9257ivhfxsd09z07z3g3wjihi99nrwmhb9h4mpqyw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151214.1544",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "move-text": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/move-text.el",
-            "sha256": "0azda60cbz3kpvy6zd7pvlj40iwvj1zjdxv1brzqa6yfa4kyixv2"
-        },
-        "recipe": {
-            "sha256": "1xgq7wsh08fb23zv71lfw5rska9wijsl64ijpi2m06zyw1m7mdqr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140307.1044",
-        "deps": []
-    },
-    "ac-cake2": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k1LoW",
-            "repo": "emacs-ac-cake2",
-            "sha256": "0mlmhdl9s28z981y8bnpj8jpfzm6bgfiyl0zmpgvhyqw1wzqywwv",
-            "rev": "ffbb679c0d5c261b05abde06d8d1d1e5d5990b6a"
-        },
-        "recipe": {
-            "sha256": "0qxilldx23wqf8ilif2nin119bvd0l7b6f6wifixx28a6kl1vsgy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140320.208",
-        "deps": [
-            "auto-complete",
-            "cake2"
-        ]
-    },
-    "elog": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lujun9972",
-            "repo": "elog",
-            "sha256": "19yvhyg34w1idsh712cahmcy1pzbxcipw9j6xk567lvkqkinqg7s",
-            "rev": "03c275877301c72fbc61d5fdd72efe5fdc0b6e98"
-        },
-        "recipe": {
-            "sha256": "0hixsi60nf0khm9xmya3saf95ahn1gydp0l5wxawsc491qwg4vqd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151116.1937",
-        "deps": [
-            "eieio"
-        ]
-    },
-    "cfengine-code-style": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cfengine",
-            "repo": "core",
-            "sha256": "176s48z9zm8xl1dm891kzky0f6c0ammsn1kk9vps9i7cig8j4aar",
-            "rev": "6929de02ae1084c20f89ade7f2653ee8860baee0"
-        },
-        "recipe": {
-            "sha256": "1ny8xvdnz740qmw9m81xnwd0gh0a516arpvl3nfimglaai5bfc9a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131209.611",
-        "deps": []
-    },
-    "rpm-spec-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bjorlykke",
-            "repo": "rpm-spec-mode",
-            "sha256": "01rb6qfsk4f33nkfdzvvjkw96ip1dv0py8i30l8ix9cqbk07svsv",
-            "rev": "7d06d19a31e888b932da6c8202ff2c73f42703a1"
-        },
-        "recipe": {
-            "sha256": "01vggdv8sac4p0szwk7xgxcglmd5a1hv5q0ylf8zcp1lsyyh8ypd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150411.1055",
-        "deps": []
-    },
-    "jscs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "papaeye",
-            "repo": "emacs-jscs",
-            "sha256": "1bqsv2drhcs8ia7nxss33f80p2mhcl4mr1nalphzw6s1f4mq2sgy",
-            "rev": "9d39d0f2355e69a020bf76242504f3a33e013ccf"
-        },
-        "recipe": {
-            "sha256": "1yw251f6vpj2bikjw79arywprk8qnmmfcki99mvwnqhsqlv1a8iv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151015.1249",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "fm-bookmarks": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kuanyui",
-            "repo": "fm-bookmarks.el",
-            "sha256": "0984fhf1nlpdh9mh3gd2xak3v2rlv76qxppqvr6a4kl1dxwg37r3",
-            "rev": "e1440334a4fe161bd8872996b6862d079d8eb24e"
-        },
-        "recipe": {
-            "sha256": "12ami0k6rfwhrr6xgj0dls4mkk6dp0r9smwzhr4897dv0lw89bdj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151203.803",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "corral": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nivekuil",
-            "repo": "corral",
-            "sha256": "1q9jxg9khvjm7lqjhgfhdnb9j9620bq1k5b2cj74q8k4paa6kyyw",
-            "rev": "9a5ab7f293a23a4fec77ab4fb442d69ecfcc293f"
-        },
-        "recipe": {
-            "sha256": "1drccqk4qzkgvkgkzlrrfd1dcgj8ziqriijrjihrzjgjsbpzv6da",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151120.1809",
-        "deps": []
-    },
-    "look-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/look-mode.el",
-            "sha256": "0sl6hqggi6qn2qp9khw11qp5hamngwxrrwx98k3pwpj9kgicdpgp"
-        },
-        "recipe": {
-            "sha256": "0y3wjfjx0g5jclmv9m3vimv7zd18pk5im7smr41qk09hswi63yqj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151211.1226",
-        "deps": []
-    },
-    "cacoo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiwanami",
-            "repo": "emacs-cacoo",
-            "sha256": "07kzhyqr8ycjvkknijqhsfr26zd5jc8wxm9sl8bp6pzn4jbs1dmx",
-            "rev": "c9fa04fbe97639b24698709530361c2bb5f3273c"
-        },
-        "recipe": {
-            "sha256": "0kri4vi6dpsf0zk24psm16f3aa27cq5b54ga7zygmr02csq24a6z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120319.1859",
-        "deps": [
-            "concurrent"
-        ]
-    },
-    "widget-mvc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiwanami",
-            "repo": "emacs-widget-mvc",
-            "sha256": "0036alzp66k7w3z45lj8qzh3plxv9vwcw17wibkz90mlb27vy6yz",
-            "rev": "a3fd2d2abc29a1b53aeaae8b267d0718740fb783"
-        },
-        "recipe": {
-            "sha256": "0njzvdlxb7z480r6dvmksgivhz7rvnil517aj86qx0jbc5mr3l2f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150101.2206",
-        "deps": []
-    },
-    "sprintly-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sprintly",
-            "repo": "sprintly-mode",
-            "sha256": "06rk07h92s5sljprs41y3q31q64cprx9kgs56c2j6v4c8cmsq5h6",
-            "rev": "6695892bae5860b5268bf3ae62be990ee9b63c11"
-        },
-        "recipe": {
-            "sha256": "15i3rrv27ccpn12wwj9raaxpj7nlnrrj3lsp8vdfwph6ydvnfza4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121006.34",
-        "deps": [
-            "furl"
-        ]
-    },
-    "org-alert": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "groksteve",
-            "repo": "org-alert",
-            "sha256": "0yzvir2gmyv9k43q3sf37lc9xcmfyaj5wh825xax7305j3b2hhvv",
-            "rev": "d9b73febcc4f211406521786a39853c6bc6dd1bf"
-        },
-        "recipe": {
-            "sha256": "0n5a24iv8cj395xr0gfgi0hs237dd98zm2fws05k47vy3ygni152",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151007.537",
-        "deps": [
-            "alert",
-            "dash",
-            "s"
-        ]
-    },
-    "dtrace-script-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dotemacs",
-            "repo": "dtrace-script-mode",
-            "sha256": "1blfx3r2xd3idbfjrx44ma3x1d83xp67il2s2bmdwa8qz92z99lf",
-            "rev": "801af1ef16075d31a19830ebb8404bbf3a322f10"
-        },
-        "recipe": {
-            "sha256": "0v29rzlyccrc37052w2qmvjaii84jihhp736l807b0hjjfryras4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150214.23",
-        "deps": []
-    },
-    "multi": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kurisuwhyte",
-            "repo": "emacs-multi",
-            "sha256": "0f5hc6mgq0hg1wwnvqd4fp7ck58lcavvgqjggz9zlhrjgkmynjxx",
-            "rev": "0987ab71692717ed457cb3984de184db9185806d"
-        },
-        "recipe": {
-            "sha256": "1c240d1c1g8wb2ld944344zklnv86d9rycmya4z53b2ai10642ig",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131013.1044",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "eclipse-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "eclipse-theme",
-            "sha256": "1vxa6d8kp4h1havr9cq7zqgqm1xsjxhbgbi4hvi842ma6xwh4m5w",
-            "rev": "222f5b37d9c0573f752aa6097c677c91af9d2427"
-        },
-        "recipe": {
-            "sha256": "0mww0jysxqky1zkkhvhj7fn20w970n2w6501rdm5jwqfb58ivxfx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150929.801",
-        "deps": []
-    },
-    "json-reformat": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gongo",
-            "repo": "json-reformat",
-            "sha256": "0qp4n2k6s69jj4gwwimkpadjv245y54wk3bxb1x96f034gkp81vs",
-            "rev": "b9bd375ec1deb10d2ba09c409bdcf99c56d7a716"
-        },
-        "recipe": {
-            "sha256": "1m5p895w9qdgb8f67xykhzriribgmp20a1lvj64iap4aam6wp8na",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151204.1100",
-        "deps": []
-    },
-    "unicode-whitespace": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "unicode-whitespace",
-            "sha256": "1ayb15nd5vqr0xaghrnp55kqw7bblrjipmfrag6bqpn7jk9bvbdz",
-            "rev": "a18c6b38d78b94f2eb1dcc4cb4fa91b6a17efabe"
-        },
-        "recipe": {
-            "sha256": "1b3jgha8va42b89pdp41sab2w9wllp7dicqg4lxl67bg6wn147wy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140508.1541",
-        "deps": [
-            "list-utils",
-            "pcache",
-            "persistent-soft",
-            "ucs-utils"
-        ]
-    },
-    "kakapo-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "listx",
-            "repo": "kakapo-mode",
-            "sha256": "0b6af8hnrn0v4z1xpahjfpw5iga2bmgd3qwfn3is2rygsn5rkm40",
-            "rev": "fe3d579867f7465cd3ad04f29b4b2b3b820edc01"
-        },
-        "recipe": {
-            "sha256": "0a99cqflpzasl4wcmmf99aj8xgywkym37j7mvnsajrsk5wawdlss",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150906.2352",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "pretty-lambdada": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/pretty-lambdada.el",
-            "sha256": "0qda87pz137ki2527v2ji74nibazwxh8ykqv26315z6pz0q1dkin"
-        },
-        "recipe": {
-            "sha256": "16v5fgifz672c37xyzv557mm6za4rldvdrb26vdymxqg4fy62fd6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1841",
-        "deps": []
-    },
-    "pretty-sha-path": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alezost",
-            "repo": "pretty-sha-path.el",
-            "sha256": "1n0594msgy53ia58gjfkm3z3cnmq52wrq5992fm28s4jgazbgdfd",
-            "rev": "a2b43dd9de423a38d67cda2e3bd9412f7d363257"
-        },
-        "recipe": {
-            "sha256": "0qqsg383391dnsk46xm8plq7xmdmnis3iv7h7dmchpzd99bkm9lq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141105.1226",
-        "deps": []
-    },
-    "omni-tags": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "AdrieanKhisbe",
-            "repo": "omni-tags.el",
-            "sha256": "1lvnkdrav7h15p8d5ayhfsjynllwp4br1vqxmw0ppxnlyq7337n5",
-            "rev": "3f88b087d492e8ef742416d6e4bf8be41e5a46c4"
-        },
-        "recipe": {
-            "sha256": "133ww1jf14jbw02ssbx2a46mp52j18a2wwzb6x77azb0akmf1lzl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150513.1253",
-        "deps": [
-            "cl-lib",
-            "pcre2el"
-        ]
-    },
-    "hcl-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-hcl-mode",
-            "sha256": "1vf5130bj1ii9j8qq9vdw0ga0qgfk8brjz34ysfmz9l2ihlcxvl0",
-            "rev": "5a5e490509452a1882bea43952e248682577ed2d"
-        },
-        "recipe": {
-            "sha256": "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151002.2249",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "polymode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vitoshka",
-            "repo": "polymode",
-            "sha256": "0dlgmp1vmpvfjx19jz52xjmpg0fi1d0gy3zz7rsyjdkdw8dmr1v6",
-            "rev": "af589492a49b4703d390a7a91b281cf0d10d91a7"
-        },
-        "recipe": {
-            "sha256": "0ndavaan7k55l3ghm5h08i0slmmzc82c0gl4b8w91fa8bi2lq4h4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151216.733",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "restclient": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pashky",
-            "repo": "restclient.el",
-            "sha256": "08j4m70j9xdl731bwa4vh656lji0w0f9mm1aki0qqd5msglw6kvx",
-            "rev": "2075b17e2f8e118cf0739e4087f791ed724be1ad"
-        },
-        "recipe": {
-            "sha256": "14wxfhb17n2f9wil68lb05abj7m0whwkqvrm3y9dg9mh14lcpbvc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151128.1712",
-        "deps": []
-    },
-    "lentic-server": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "phillord",
-            "repo": "lentic-server",
-            "sha256": "0c6wkfz6sdcs4aglvx6h3slhma2vbj7idckwzvp8ji6s7p1mavlv",
-            "rev": "533e0eadb2dd79c50da7de8fc1d6e6f1e99bd6ff"
-        },
-        "recipe": {
-            "sha256": "1y9idhf9qcsw3dbdj7rwa7bdrn1q0m3bg3r2jzwdnvkq8aas1w56",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150320.826",
-        "deps": [
-            "lentic",
-            "web-server"
-        ]
-    },
-    "tfs": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/tfs.el",
-            "sha256": "16byw8ix7bjh5ldr8rymisq2bhc5sh7db6rhpf0x28yd6mmzn73v"
-        },
-        "recipe": {
-            "sha256": "10szb9mni37s2blvhl1spj96narmkrv8zhrryw9q1251z8laq5v0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120508.1320",
-        "deps": []
-    },
-    "emms-soundcloud": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "osener",
-            "repo": "emms-soundcloud",
-            "sha256": "0nx5bb5fjmaa1nhkbfnhd1aydqrq390x4rl1vfh11ilnf52wzzld",
-            "rev": "87e5cbf9609d1f26c24dc834fdeb78b33d453c2b"
-        },
-        "recipe": {
-            "sha256": "0nf1f719m4pvxn0mf4qyx8mzwhrhv6kchnrpiy9clx520y8x3dqi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131221.545",
-        "deps": [
-            "emms",
-            "json"
-        ]
-    },
-    "abl-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "afroisalreadyinu",
-            "repo": "abl-mode",
-            "sha256": "081rz6q46wdpnlzd3ddcw425434vz54q7xw29z2nnaxsqckmim8f",
-            "rev": "5a2a65cc5eb1dc2ee80c8b64a7ea352a444abfdb"
-        },
-        "recipe": {
-            "sha256": "0h25lc87pa8irgxflnmnmkr9dcv4kz841nfc45fcz4awrn75kkzb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151125.335",
-        "deps": []
-    },
-    "page-break-lines": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "page-break-lines",
-            "sha256": "1acz3w2zdcds0h6p2k9h3lmjsk519asqrxjw7f3pyrcq7x2qbhc4",
-            "rev": "36d3f93a23b767e7558b9c90f3631b03ce9fbdce"
-        },
-        "recipe": {
-            "sha256": "0q1166z190dxznzgf2f29klj2jkaqlic483p4h3bylihkqp93ij7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150226.1017",
-        "deps": []
-    },
-    "kpm-list": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "KMahoney",
-            "repo": "kpm-list",
-            "sha256": "1m9hixlclynph2i5q18miq077dyvhx14pfzgawrwj82j1kslz50x",
-            "rev": "397912496d42e57c261ff6d33edc8fc029479b8b"
-        },
-        "recipe": {
-            "sha256": "0022bhy1mzngjmjydyqnmlgnhww05v4dxsfav034r8nyyc7677z0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130131.348",
-        "deps": []
-    },
-    "edbi-sqlite": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "proofit404",
-            "repo": "edbi-sqlite",
-            "sha256": "0xnaj2f9zvnc6abjkaa23j6ga4anmq676aplws0n01y7qz6w0xk8",
-            "rev": "929009365529b56daec172b87d7632240b15be1f"
-        },
-        "recipe": {
-            "sha256": "1w53ypz3pdqaml3vq9j3f1w443n8s9hb2ys090kxvjqnb8x8v44y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150115.1301",
-        "deps": [
-            "edbi",
-            "emacs"
-        ]
-    },
-    "rope-read-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "marcowahl",
-            "repo": "rope-read-mode",
-            "sha256": "1zcpd2rb35xjv16jrypd0vvsfw8ik72gil8wdzbwq19phjqvccjx",
-            "rev": "9ea77f9cb6f5e4e97838f05603a1c81834bcde1f"
-        },
-        "recipe": {
-            "sha256": "0grnn5k6rbck0hz4c6cadgj3a4dv62habyingznisg2kx9i3m0dw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151220.1359",
-        "deps": []
-    },
-    "desktop+": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ffevotte",
-            "repo": "desktop-plus",
-            "sha256": "18k5898r4n96h93xsvjrpm90hz3rd0ir6x3axjzqwwrgs2ik7pj2",
-            "rev": "8ef242d0aa6f715ff4c5abbc4ee6be66a90ffedd"
-        },
-        "recipe": {
-            "sha256": "0w7i6k4814hwb19l7ly9yq59674xiw57ylrwxq7yprwx52sgs2r8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151004.1440",
-        "deps": [
-            "dash",
-            "emacs",
-            "f"
-        ]
-    },
-    "smart-indent-rigidly": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "re5et",
-            "repo": "smart-indent-rigidly",
-            "sha256": "0q5hxg265ad9gpclv2kzikg6jvbf3zzb1mrykxn0n7mnvdfdlhsi",
-            "rev": "323d1fe4d0b81e598249aad01bc44adb180ece0e"
-        },
-        "recipe": {
-            "sha256": "12qggg1m28mlvkdn52dig8bwv58pvipkvn1mlc4r7w569arar44x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141205.1815",
-        "deps": []
-    },
-    "colemak-evil": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "patbl",
-            "repo": "colemak-evil",
-            "sha256": "0jjj1miwc7hw2fbb1fnmfnydim81djswla8iy4waam9014yraqci",
-            "rev": "cd2c75848ab0ad1aec42ca421d03a923166fa228"
-        },
-        "recipe": {
-            "sha256": "1bfzs5px1k6g3cnwjdaq2m78bbnfy3lxhjzkcch7zdv3nyacwl5z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140508.1812",
-        "deps": [
-            "evil"
-        ]
-    },
-    "elnode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nicferrier",
-            "repo": "elnode",
-            "sha256": "0p3cj5vgka388i4dk9r7bx8pv8mywnfij9ahgqak5jlsddflh8hw",
-            "rev": "3f2bf225853e40a2a10386ee5ae0bd6ba5d44ce9"
-        },
-        "recipe": {
-            "sha256": "0piy5gy9a7c8s10b99fmdyh6glhvjvdyrz0x2bv30h7wplx5szi6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140203.1706",
-        "deps": [
-            "creole",
-            "dash",
-            "db",
-            "fakir",
-            "kv",
-            "noflet",
-            "s",
-            "web"
-        ]
-    },
-    "bash-completion": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "szermatt",
-            "repo": "emacs-bash-completion",
-            "sha256": "06c42531dy5ngscwfvg8rksg6jcsakfn7104hmlg1jp4kvfiy1kg",
-            "rev": "1659c7ca38e2cf591525a3d0b9d97461de33916d"
-        },
-        "recipe": {
-            "sha256": "0l41yj0sb87i27hw6dh35l32hg4qkka6r3bpkckjnfm0xifrd9hj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150514.928",
-        "deps": []
-    },
-    "php-refactor-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "keelerm84",
-            "repo": "php-refactor-mode.el",
-            "sha256": "163albjkq7ldc9fki368540m7nl58qa70wfpff08gx3gsvywfnyi",
-            "rev": "9010e5e8dde2ad3a2c7a65ff1752b5482dfd4f61"
-        },
-        "recipe": {
-            "sha256": "0gj0nv6ii7pya0hcxs8haz5pahj0sa12c2ls53c3j85in645zb3s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140920.1611",
-        "deps": []
-    },
-    "perlbrew": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kentaro",
-            "repo": "perlbrew.el",
-            "sha256": "0wg0cpqxzfgln6xdngzspsbfirn9a5jxpgk66m0fpi33215z9q26",
-            "rev": "30e14a606a08948fde5eafda2cbe1cd4eb83b3f3"
-        },
-        "recipe": {
-            "sha256": "1qadwkcic2qckqy8hgrnj08ajhxayknhpyxkc6ir15vfqjk5crr8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130127.524",
-        "deps": []
-    },
-    "download-region": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "download-region",
-            "sha256": "0gc7z5ribp5yvadclq07l731m65pja00wgch4bgxsihiy7wvwknr",
-            "rev": "51fc808e10803f695ea3d24c22e1af27e080903d"
-        },
-        "recipe": {
-            "sha256": "1mrl2x6j708nchyh9y5avbf2cq10kpnhfj553l6akarvl5n5pvkl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150807.232",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "swoop": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ShingoFukuyama",
-            "repo": "emacs-swoop",
-            "sha256": "0qp078q9jrfm0k8sjq6qglfilwgqy1n0bbhyjk3hrf7rjxlkfkx7",
-            "rev": "80a5df8edb86efd9885073b3ec6f475d8b969adf"
-        },
-        "recipe": {
-            "sha256": "0r265rwfbl1iyclnspxpbzf2w1q0w8dnc0wv5mz5g6hhcrr0iv6g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140605.1610",
-        "deps": [
-            "async",
-            "emacs",
-            "ht",
-            "pcre2el"
-        ]
-    },
-    "angular-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "omouse",
-            "repo": "angularjs-mode",
-            "sha256": "04kg2x0lif91knmkkh05mj42xw3dkzsnysjda6ian95v57wfg377",
-            "rev": "8720cde86af0f1859ccc8580571e8d0ad1c52cff"
-        },
-        "recipe": {
-            "sha256": "1bwfmjldnxki0lqi3ys6r2a3nlhbwm1dibsg2dvzirq8qql02w1i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151201.1527",
-        "deps": []
-    },
-    "vertigo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "noctuid",
-            "repo": "vertigo.el",
-            "sha256": "0v884gbqq5vrx5gwg9dqn97kaqgnzhrqv8kam8dy9g7hx4fm6b2l",
-            "rev": "fecc566e9039408303f9b1c979624d546152b7df"
-        },
-        "recipe": {
-            "sha256": "0x0wy1z601sk1x96bl2xx18qm4avd77iybq1a3ss8x8ykwqlgf83",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151110.2213",
-        "deps": [
-            "dash"
-        ]
-    },
-    "flycheck-ats2": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "drvink",
-            "repo": "flycheck-ats2",
-            "sha256": "0fh5z68gnggm0qjb8ncmfngv195lbp1dxz9jbmdi418d47mlba9c",
-            "rev": "431e46d5bbd20941c26270c7ba6872c86451348b"
-        },
-        "recipe": {
-            "sha256": "0xm7zzz6hs5qnqkmv7hwxpvp3jjca57agx71sj0m12v0h53gbzhr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151130.807",
-        "deps": [
-            "emacs",
-            "flycheck"
-        ]
-    },
-    "supergenpass": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ober",
-            "repo": "sgpass",
-            "sha256": "0m02snzka243adhwwgriml133n4312lhdia3wdqjcq8y2mlp3331",
-            "rev": "549072ef7b5b82913cadd4758e8a0a9926f0a04a"
-        },
-        "recipe": {
-            "sha256": "0ldy6j6l6rf72w0hl195rdnrabml2a5k91200s186k0r5aja4b95",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130329.48",
-        "deps": []
-    },
-    "iodine-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "srdja",
-            "repo": "iodine-theme",
-            "sha256": "14zfxa8fc7h4rkz1hyplwf4q2lga3l5dd7a2xq5kk0kvf2fs4mk3",
-            "rev": "02fb780e1d8d8a6b9c709bfac399abe1665c6999"
-        },
-        "recipe": {
-            "sha256": "05mnq0bgcla0pxsgywpvcdgd4sk2xr7bjlp87l0dx8j121vqripj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151031.1139",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "mkdown": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ajtulloch",
-            "repo": "mkdown.el",
-            "sha256": "1d08i2cfn1q446nyyji0hi9vlw7bzkpxhn6653jz2k77vd2y0wmk",
-            "rev": "8e23de82719af6c5b53b52b3308a02b3a1fb872e"
-        },
-        "recipe": {
-            "sha256": "1b2vi8q6jhq1xv7yr5f3aiyp1w8j59w19vxys0pv6bqr2gra07i1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140517.918",
-        "deps": [
-            "markdown-mode"
-        ]
-    },
-    "ctxmenu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "emacs-ctxmenu",
-            "sha256": "1jlr2miwqsg06hk2clvsrw9fa98m2n76qfq8qv5svrb8dpil04wb",
-            "rev": "5c2376859562b98c07c985d2b483658e4c0e888e"
-        },
-        "recipe": {
-            "sha256": "03g9px858mg19wapqszwav3599slljdyam8bvn1ri85fpa5ydvdp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140303.1542",
-        "deps": [
-            "log4e",
-            "popup",
-            "yaxception"
-        ]
-    },
-    "python-environment": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tkf",
-            "repo": "emacs-python-environment",
-            "sha256": "0q6bib9nr6xiq6npzbngyfcjk87yyvwzq1zirr3z1h5wadm34lsk",
-            "rev": "401006584e32864a10c69d29f14414828909362e"
-        },
-        "recipe": {
-            "sha256": "1pq16rddw76ic5d02j5bswl9qcydi47hqmhs7r06jk46vsfzxpl7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150310.353",
-        "deps": [
-            "deferred"
-        ]
-    },
-    "flymake-phpcs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "senda-akiha",
-            "repo": "flymake-phpcs",
-            "sha256": "140rlp6m0aqibwa0bhv8w6l3giziybqdw7x271nq8f3r60ch13bi",
-            "rev": "a4d383474e055e554aaf1cd617055d5d7181aa50"
-        },
-        "recipe": {
-            "sha256": "0zzxi3c203fiw6jp1ar9bb9f28x2lg23bczgy8n5cicrq59jfsn9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140713.131",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "gotham-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wasamasa",
-            "repo": "gotham-theme",
-            "sha256": "0pxzi56lw9ry91f70hjnvrsbyhcaqknlwicjjbhf6rhv57fplw8h",
-            "rev": "d41b0ea37ad5a4d0060ea05e25d80581f113b662"
-        },
-        "recipe": {
-            "sha256": "0jars6rvf7hkyf71vq06mqki1r840i1dvv43dissqjg5i4lr79cl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151117.358",
-        "deps": []
-    },
-    "evil-quickscope": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "blorbx",
-            "repo": "evil-quickscope",
-            "sha256": "0yx5ry102hzhqx1aql58fkd986xgj250bbcxabpnvy27gim2b977",
-            "rev": "d2f512fa4bd0b0603529a441e474ca551f621650"
-        },
-        "recipe": {
-            "sha256": "0xym1mh4p68i00l1lshywf5fdg1vw3szxp3fk9fwfcg04z6vd489",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150929.1448",
-        "deps": [
-            "evil"
-        ]
-    },
-    "hl-line+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/hl-line+.el",
-            "sha256": "023l9f74kmg66j2rj5h39b4l6svdd48i4h3bdvq8lwy0lz58g889"
-        },
-        "recipe": {
-            "sha256": "13yv2nmx1wb80z4yifnh6d67rag17wirmp7z8ssq3havjl8lbpix",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1622",
-        "deps": []
-    },
-    "lenlen-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "lenlen-theme",
-            "sha256": "0ab84qiqaz3swiraks8lx0y1kzwylpy9wz2104xgnpwnc5169z65",
-            "rev": "05202458fa0a5242e5c6e4451e375f6c16920272"
-        },
-        "recipe": {
-            "sha256": "1bddkcl9kzj3v071qpzmxzjwywqfj5j6cldz240qgp5mx685r0a9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150307.211",
-        "deps": [
-            "color-theme-solarized"
-        ]
-    },
-    "orgtbl-aggregate": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tbanel",
-            "repo": "orgaggregate",
-            "sha256": "0am2yfnaxwc6f2wvrg4d508pdcs88cynr32k7bgyyadwq4xq3zsg",
-            "rev": "16b54b2be7cbb87aab9498c0ab7b8bca0f73cb59"
-        },
-        "recipe": {
-            "sha256": "0gnyjwn6jshs8bzdssm2xppg2s9p2x3rrhp523q39aydskc6ggc9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1018",
-        "deps": []
-    },
-    "cssfmt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "KeenS",
-            "repo": "cssfmt.el",
-            "sha256": "0hyf4im7b8zka065daw7yxrb3670dpp8q92vd2gcsva1jla92h9y",
-            "rev": "802c82a1aa8d433ec473e253ae1fa4ecad3fb4b0"
-        },
-        "recipe": {
-            "sha256": "12yq4dhyv3p5gxnd2w193ilpj2d3gx5ns09w0z1zkg7ax3a4q4b8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150818.2328",
-        "deps": []
-    },
-    "color-theme-buffer-local": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vic",
-            "repo": "color-theme-buffer-local",
-            "sha256": "0gvc9jy34a8wvzwjpmqhshbx2kpk6ckmdrdj5v00iya7c4afnckx",
-            "rev": "ca8470bc34c65a026a6bca1707d95240bfd019af"
-        },
-        "recipe": {
-            "sha256": "1448rffyzn5k5mr31hwd28wlj7if7rp5sjlqcsvbxd2mnbgkgjz0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151012.1828",
-        "deps": [
-            "color-theme"
-        ]
-    },
-    "xbm-life": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wasamasa",
-            "repo": "xbm-life",
-            "sha256": "154xnfcmil9xjjmq4cyrfpir4ga4mgcmmbd7dja1m7rpk1734xk6",
-            "rev": "bde2b3730a02d237f7d95a8e3f3722f23f2d9201"
-        },
-        "recipe": {
-            "sha256": "1pglxjd4cs630sayx17ai1xflpbyj3hry3156682bgwhqs1vw68q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151217.215",
-        "deps": []
-    },
-    "grails-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Groovy-Emacs-Modes",
-            "repo": "groovy-emacs-modes",
-            "sha256": "07xiyf30p6hdd6lxv7c6xqpnvw6ys0halg8di0m3pwqz9qf4rj4i",
-            "rev": "74f360ee1ad25755707a89bec9eeed571b6748d0"
-        },
-        "recipe": {
-            "sha256": "1zdlmdkwyaj2zns3xwmqpil83j7857aj2070kvx8xza66dxcnlm4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151206.154",
-        "deps": []
-    },
-    "flymake-lua": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sroccaserra",
-            "repo": "emacs",
-            "sha256": "1fz7kywp1y2nhp50b2v961wz604sw1gzqcid4k8igz9aii3ygxcv",
-            "rev": "ee23c427a8eb01773c87e215d0e61cd8b5b5fe76"
-        },
-        "recipe": {
-            "sha256": "0pa66ymhazcfgd9jmxizq5w2sgj008hph42wsa9ljr2rina1gai6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140310.430",
-        "deps": []
-    },
-    "elpa-mirror": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "redguardtoo",
-            "repo": "elpa-mirror",
-            "sha256": "1hjmvn3kls63alh0ihb5c8gf90lrfvq1hxrlf4162qiaa0s15f8a",
-            "rev": "6c32875c2317736e590e067820996010b21acb1d"
-        },
-        "recipe": {
-            "sha256": "1jnviav2ybr13cgllg26kfjrwrl25adggnqiiwyjwgbbzxfycah8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151123.653",
-        "deps": []
-    },
-    "e2wm-bookmark": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "e2wm-bookmark.el",
-            "sha256": "121vd44f42bxqvdjswmjlghf1jalbs974b6cip2i049k1n08xgh0",
-            "rev": "bad816b6d8049984d69bcd277b7d325fb84d55eb"
-        },
-        "recipe": {
-            "sha256": "1myaqxzrgff5gxcn3zn1bsmyf5122ql1mwr05wamd450lq8nmbw5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151122.2321",
-        "deps": [
-            "e2wm"
-        ]
-    },
-    "p4": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gareth-rees",
-            "repo": "p4.el",
-            "sha256": "12jsnfppif4l548wymvakx0f2zlm63xs6kfrb49hicmk668cq4ra",
-            "rev": "eff047caa75dbe4965defca9d1212454cdb755d5"
-        },
-        "recipe": {
-            "sha256": "0215li17gn35wmvd84gnp4hkwa2jd81wz4frb1cba2b5j33rlprc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150721.1437",
-        "deps": []
-    },
-    "review-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kmuto",
-            "repo": "review-el",
-            "sha256": "0lzsy68k7sm9d3r8lzhzx9alc1f0cgfclry40pa4x0ilkcr7ysch",
-            "rev": "d043b227eb1cd10361f8117c17de9a67caebe96a"
-        },
-        "recipe": {
-            "sha256": "0wapicggkngpdzi0yxc0b24s526fs819rc2d6miv6ix3gnw11n0n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150110.812",
-        "deps": []
-    },
-    "peacock-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsfodder",
-            "repo": "emacs-peacock-theme",
-            "sha256": "1clvrmvijwpffigh5f29vnwcvffqk0nrvlz26158hip1z9x7nah3",
-            "rev": "268a2a7eb48ac750fc939657169ec65f2ac0f4f7"
-        },
-        "recipe": {
-            "sha256": "0jpdq090r37d07bm52yx3x9y3gsip6fyxxq1ax1k5k0r0js45kq9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141116.102",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "edit-server": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "stsquad",
-            "repo": "emacs_chrome",
-            "sha256": "0ssmhwg4wfh5cxgqv8bl55449204h4zi863m7jhvas4c9zq005kd",
-            "rev": "0a50fbb524fe256560f481701c000309c627b9ca"
-        },
-        "recipe": {
-            "sha256": "0ffxcgmnz0f2c1i3vfwm8vlm6jyd7ibf4kq5z8c6n50zkwfdmns0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141231.1558",
-        "deps": []
-    },
-    "imakado": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "imakado",
-            "repo": "emacs-imakado",
-            "sha256": "0f3xdqhq9nprvl8bnmgrx20h08ddkfak0is29bsqwckkfgn7pmqp",
-            "rev": "00a1e7eea2cb9e9066343a23927d6c747707902f"
-        },
-        "recipe": {
-            "sha256": "18mj0vpv3dybfpa8hl9jwlagsivbhgqgz8lwb8cswsq9hwv3jgd3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141024.423",
-        "deps": []
-    },
-    "dynamic-ruler": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rocher",
-            "repo": "dynamic-ruler",
-            "sha256": "1jsjk4fkisgprn2w1d1385kbc9w1bd707biapd1y453k20q5c4h5",
-            "rev": "06318152d6831b1b0cfd814b4f4150a00b47ef67"
-        },
-        "recipe": {
-            "sha256": "13jc3xbsyc3apkdfy0iafmsfvgqs0zfa5w8jxp7zj4dhb7pxpnmc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150826.1609",
-        "deps": []
-    },
-    "fontawesome": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-fontawesome",
-            "sha256": "103xz042h8w6c85hn19cglfsa34syjh18asm41rjhr9krp15sdl1",
-            "rev": "66650efea4a044afe0e5f482ccac465082cd5e62"
-        },
-        "recipe": {
-            "sha256": "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151202.830",
-        "deps": [
-            "cl-lib",
-            "helm-core"
-        ]
-    },
-    "langdoc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tom-tan",
-            "repo": "langdoc",
-            "sha256": "0svci7xs4iysv8ysf93g382arip0xpgi0fllw8xx2vrd70sz7lff",
-            "rev": "2c7223bacb116992d700ecb19a60df5c09c63424"
-        },
-        "recipe": {
-            "sha256": "19i6ys58wswl5ckf33swl6lsfzg4znx850br4icik15yrry65yj7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150218.45",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "o-blog": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "renard",
-            "repo": "o-blog",
-            "sha256": "0xs6787a4v7djgd2zz2v1pk14x27mg2ganz30j9f0gdiai7da6ch",
-            "rev": "e466c59478feddc8126c43c1b98550474af484c0"
-        },
-        "recipe": {
-            "sha256": "08grkyvg27wd5232q3y8p0v7higfq7bmsdzmvhja96v6qy2xsbja",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151202.1739",
-        "deps": []
-    },
-    "love-minor-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ejmr",
-            "repo": "love-minor-mode",
-            "sha256": "179r4pz3hlb5p6bjfhdikkx1zvh09ln5dbw3c3rmlyww1q7v26yl",
-            "rev": "31c3fc1ecd31f72f0f736014a4ff905eb3742e74"
-        },
-        "recipe": {
-            "sha256": "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130429.1659",
-        "deps": [
-            "lua-mode"
-        ]
-    },
-    "erc-hl-nicks": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "leathekd",
-            "repo": "erc-hl-nicks",
-            "sha256": "0h2hfa5qpszg0pzi1gc7qfkn9kb37pfg0vlj30049xnryh80r9br",
-            "rev": "e536ea57f842f85ecda5a28ceed24cd506b7be2c"
-        },
-        "recipe": {
-            "sha256": "1lhw77n2nrjnb5yhnpm6yhbcp022xxjcmdgqf21z9rd0igss9mja",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140619.722",
-        "deps": []
-    },
-    "quickref": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pd",
-            "repo": "quickref.el",
-            "sha256": "1i7qqpqdwifd6vxpyyxyzq0b3wc82r7pqcw07bj0x2lhrjnqrxby",
-            "rev": "cfedf98c6b8b679b93296f7436e1fb4c2cc7ad25"
-        },
-        "recipe": {
-            "sha256": "0jahi84ra9g7h0cvz3c02zkbkknrzgv48zq32n72lkxl958swqn1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130113.1700",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "dash-functional": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "dash.el",
-            "sha256": "1g7vrfhafmkqwdpfllfiwirl4pi437pyaws38jsd8laxmsa4m4wb",
-            "rev": "8a46d3c7c126d3e979f7f9b36867a413694cd8df"
-        },
-        "recipe": {
-            "sha256": "0hx36hs12mf4nmskaaqrqpcgwrfjdqj6qcxn6bwb0s5m2jf9hs8p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150828.613",
-        "deps": [
-            "dash",
-            "emacs"
-        ]
-    },
-    "pdf-tools": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "politza",
-            "repo": "pdf-tools",
-            "sha256": "05b5fn3w2bika21a5sxyjs3yfrcdvn6qdrx9li1jda9jg623bpn3",
-            "rev": "97b86cd09a411d00a7947da76b4c3f77995ccf44"
-        },
-        "recipe": {
-            "sha256": "1hnc8cci00mw78h7d7gs8smzrgihqz871sdc9hfvamb7iglmdlxw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151224.1359",
-        "deps": [
-            "emacs",
-            "let-alist",
-            "tablist"
-        ]
-    },
-    "beacon": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "beacon",
-            "sha256": "1aczmdlc8ckcq5qbnsdyraw9wp8p5cddjm5jx8rf0ahsszh6vxws",
-            "rev": "0353da8dd7f78179a721f42cec4df8c23f0908f2"
-        },
-        "recipe": {
-            "sha256": "1pwxvdfzs9qjd44wvgimipi2hg4qw5sh5wlsl8h8mq2kyx09s7hq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151205.1203",
-        "deps": [
-            "seq"
-        ]
-    },
-    "image+": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-imagex",
-            "sha256": "0v66wk9nh0raih4jhrzmmyi5lbysjnmbv791vm2230ffi2hmwxnd",
-            "rev": "6834d0c09bb4df9ecc0d7a559bd7827fed48fffc"
-        },
-        "recipe": {
-            "sha256": "1a9dxswnqn6cvx28180kclpjc0vc6fimzp7n91gpdwnmy123x6hg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150707.1116",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "dockerfile-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "spotify",
-            "repo": "dockerfile-mode",
-            "sha256": "08pd42vv2c3l19nfib1hd7i7sy9dqwar1wfrvsnm5dkxcwlsm99j",
-            "rev": "40be396417535c6721c1b13ca9f99c46192f1d73"
-        },
-        "recipe": {
-            "sha256": "1dxvzn35a9qd3x8pjvrvb2g71yf84404g6vz81y0p353rf2zknpa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151123.1057",
-        "deps": []
-    },
-    "telepathy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "NicolasPetton",
-            "repo": "telepathy.el",
-            "sha256": "16kr1p4lzi1ysd5r2dh0mxk60zsm5fvwa9345nfyrgdic340yscc",
-            "rev": "211d785b02a29ddc254422fdcc3db45262582f8c"
-        },
-        "recipe": {
-            "sha256": "0c3d6vk7d6vqzjndlym2kk7d2zm0b15ac4142ir03p6f19rqq9pr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131209.658",
-        "deps": []
-    },
-    "flycheck-haskell": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "flycheck",
-            "repo": "flycheck-haskell",
-            "sha256": "0sv4swdqnra3xvjp8im0mxphwfsfw6c45shwdgnjagqs6z6v0i5k",
-            "rev": "d83da3ff856ac59b84e3d84598a5bb30c288bd55"
-        },
-        "recipe": {
-            "sha256": "12lgirz3j6n5ns2ikq4n41z0d33qp1lb5lfz1q11qvpbpn9d0jn7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151208.1347",
-        "deps": [
-            "dash",
-            "emacs",
-            "flycheck",
-            "haskell-mode",
-            "let-alist",
-            "seq"
-        ]
-    },
-    "handoff": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "handoff.el",
-            "sha256": "0whn8rc98dhncgizzrb22nx6b6cm655q1cf2fpn6g3knq1c2471r",
-            "rev": "75dc7a7e352f38679f65d0ca80ad158798e168bd"
-        },
-        "recipe": {
-            "sha256": "0iqqvygx50wi2vcbs6bfgqzhcz9a89zrwb7sg0ang9qrkiz5k36w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150917.100",
-        "deps": []
-    },
-    "evil-iedit-state": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syl20bnr",
-            "repo": "evil-iedit-state",
-            "sha256": "1kdigwpl9pp88l11bkpxkw91pvs8z3gachxccibivzgjxd2pnvfl",
-            "rev": "153de161d5a272e3740dd862a3b7530b4240bcf8"
-        },
-        "recipe": {
-            "sha256": "1dihyh7vqcp7kvfic613k7v33czr93hz04d635awrsyzgy8savhl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141217.1934",
-        "deps": [
-            "evil",
-            "iedit"
-        ]
-    },
-    "unicode-enbox": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "unicode-enbox",
-            "sha256": "0936dqxyp72if9wvn2dcci670yp1gqrmpnll9xq00skp85yq9zs5",
-            "rev": "77074fac1994a4236f111d6a1d0cf79ea3fca151"
-        },
-        "recipe": {
-            "sha256": "1phb2qq3pg6z6bl96kl9yfq4jxhgardjpaa4lhgqbxymmqdm7gzv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140508.1541",
-        "deps": [
-            "list-utils",
-            "pcache",
-            "persistent-soft",
-            "string-utils",
-            "ucs-utils"
-        ]
-    },
-    "arduino-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bookest",
-            "repo": "arduino-mode",
-            "sha256": "0i9xf74yfmg1a5vdf3nxd35865qhvrdw8vnfhnfx5cdc56v6rwa3",
-            "rev": "bb89ac81e9b206a6da5653fd108a315ad3e8a8d7"
-        },
-        "recipe": {
-            "sha256": "1lpsjpc7par12zsmg9sf4r1h039kxa4n68anjr3mhpp3d6rapjcx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151018.135",
-        "deps": []
-    },
-    "flycheck-pos-tip": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "flycheck",
-            "repo": "flycheck-pos-tip",
-            "sha256": "1aq68lycw3pfzb0bivldfaz8v6lf35jidjgm74hh2pgppvijyi31",
-            "rev": "32ddd6bf3c1a642a9f7afe25475c4bf2ebc7aae9"
-        },
-        "recipe": {
-            "sha256": "09i2jmwj8b915fhyczwdb1j7c551ggbva33avis77ga1s9v3nsf9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151224.822",
-        "deps": [
-            "dash",
-            "flycheck",
-            "pos-tip"
-        ]
-    },
-    "subatomic256-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "d11wtq",
-            "repo": "subatomic256",
-            "sha256": "1w7mimyqc25phlww20l49wlafnxp6c7dwibvphg3vwl61g0llpq8",
-            "rev": "326177d6f99cd2b1d30df695e67ee3bc441cd96f"
-        },
-        "recipe": {
-            "sha256": "1whjlkpkkirpnvvjryhlpzwphr1syz5zfyg4pb66i0db03hxwwcy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130620.2110",
-        "deps": []
-    },
-    "evil-paredit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "roman",
-            "repo": "evil-paredit",
-            "sha256": "0b08y4spapl4g2292j3l4cr84gjlvm3rpma3gqld4yb1sxd7v78p",
-            "rev": "e058fbdcf9dbf7ad6cc77f0172d7517ef233d55f"
-        },
-        "recipe": {
-            "sha256": "0xvxxa3gjgsrv10a61y0591bn3gj8v1ff2wck8s0svwfl076gyfy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150413.1548",
-        "deps": [
-            "evil",
-            "paredit"
-        ]
-    },
-    "ac-dcd": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "atilaneves",
-            "repo": "ac-dcd",
-            "sha256": "1dydjkilvyzxl7wwy3afmn1cjf8jv0385im4nhn8c3xr8iiil7yv",
-            "rev": "8fe1a48fcfeeafa1970e5041b0e71a4fcd10f336"
-        },
-        "recipe": {
-            "sha256": "086jp9c6bilc361n1hscza3pbhgvqlq944z7cil2jm1kicsf8s7r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150702.924",
-        "deps": [
-            "auto-complete",
-            "flycheck-dmd-dub"
-        ]
-    },
-    "es-windows": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sabof",
-            "repo": "es-windows",
-            "sha256": "14rsifcx2kwdmwq9zh41fkb848l0f4igp5v9pk3x4jd2yw9gay7m",
-            "rev": "239e30408cb1adb4bc8bd63e2df34711fa910b4f"
-        },
-        "recipe": {
-            "sha256": "112ngkan0hv3y7m71479f46x5gwdmf0vhbqrzs5kcjwlacqlrahx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140211.304",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "find-by-pinyin-dired": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "redguardtoo",
-            "repo": "find-by-pinyin-dired",
-            "sha256": "18a4ydp30ycx5w80j3xgghclzmzbvrkl2awxixy4aj68nmljk480",
-            "rev": "d049cc7f507a6f801c497a3d401b260300874f58"
-        },
-        "recipe": {
-            "sha256": "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150202.416",
-        "deps": []
-    },
-    "metascript-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "metascript",
-            "repo": "metascript-mode",
-            "sha256": "1rascpmv17dksyn9y0llmjb8r4484x5ax54w6r83k1x7ha1iacx5",
-            "rev": "edb361c7b0e5de231e5334a17b90652fb1df78f9"
-        },
-        "recipe": {
-            "sha256": "1kgs4ki0s6bxx2ri6zxmsy2b2w56gnr9hjkr6302wcmp3qy7clwn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150708.1957",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "helm-helm-commands": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vapniks",
-            "repo": "helm-helm-commands",
-            "sha256": "05ksfx54ar2j4mypzwh0gfir8r26s4f1i4xw319q5pa1y2100cpn",
-            "rev": "3a05aa19c976501343ad9ae630a36810921a85f6"
-        },
-        "recipe": {
-            "sha256": "0dq9p37i5rrp2nb1vhqzzqfmdg11va2xr3yz8hdxpwykm1ldqdcf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130902.1248",
-        "deps": [
-            "helm"
-        ]
-    },
-    "smart-mode-line": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "smart-mode-line",
-            "sha256": "17m8nqp9xarrsr68n6c9jqzv2jzsyq0m1hqqhlj9j363x6y8790y",
-            "rev": "4b3265ec3e442bd8c596b99cfd4ec73424c395ec"
-        },
-        "recipe": {
-            "sha256": "0qmhzlkc6mfqyaw4jaw6195b8sw0wg9pfjcijb4p0mlywf5mh5q6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151201.837",
-        "deps": [
-            "emacs",
-            "rich-minority"
-        ]
-    },
-    "apu": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/apu.el",
-            "sha256": "1g70yzfsn4wg077biwf2ja6gj1qv728s2map3a1njy664ga3r1k4"
-        },
-        "recipe": {
-            "sha256": "0399rmjwcs7fykj10s9m0lm2wb1cr2bzw2bkgm5rp4n3va0rzaa2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150710.2151",
-        "deps": []
-    },
-    "live-py-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "donkirkby",
-            "repo": "live-py-plugin",
-            "sha256": "02jvfn0g7r07kvb9m97kqa22j5nsgxbnp6r5vsq3d9qjsi459yd3",
-            "rev": "35dda7dadba37ffbcc14d3b0a2711ca4967f1db5"
-        },
-        "recipe": {
-            "sha256": "0yn1a0gf9yn068xifpv8p77d917mnalc56pll800zlpsdk8ljicq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151108.1107",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "virtualenv": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aculich",
-            "repo": "virtualenv.el",
-            "sha256": "0rd7hyv66278dj32yva5q9z1749y84c6fwl2iqrns512j1l4kl8q",
-            "rev": "276c0f4d6493b402dc4d22ecdf17b2b072e911b3"
-        },
-        "recipe": {
-            "sha256": "1djqzzlbwsp9xyjqjbjwdck73wzikbpq19irzamybk90nc98wirl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140220.1701",
-        "deps": []
-    },
-    "pos-tip": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pitkali",
-            "repo": "pos-tip",
-            "sha256": "168hl76rhj6f5ncmrij4rd3z55228h6kb23384h2phsjw0avgf23",
-            "rev": "051e08fec5cf30b7574bdf439f79fef7d42d689d"
-        },
-        "recipe": {
-            "sha256": "13qjz112qlrnq34lr70087gshzq8m44knfl6694hfprzjgix84vh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150318.1013",
-        "deps": []
-    },
-    "empos": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dimalik",
-            "repo": "empos",
-            "sha256": "0bm0cxnv7g2dzfvfhkyy16kzn6shvy9gzypiqyjj42ng54xmhs0n",
-            "rev": "7b99ad30e56937adb7e6349777e5a2045597d564"
-        },
-        "recipe": {
-            "sha256": "0wbrszl9rq4is0ymxq9lxpqzlfg93gljh6almjy0hp3cs7pkzyl4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151011.1416",
-        "deps": []
-    },
-    "helm-gitlab": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nlamirault",
-            "repo": "emacs-gitlab",
-            "sha256": "07i4j9yl1yag70sl89n7v4yg4jvh5mrifhrf1xswlb29by6najdx",
-            "rev": "78deece7f314f9652b50117605e93be9f8c860f4"
-        },
-        "recipe": {
-            "sha256": "010ihx3yddhb8j3jqcssc49qnf3i7xlz0s380mpgrdxgz6yahsmd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150604.233",
-        "deps": [
-            "dash",
-            "gitlab",
-            "helm",
-            "s"
-        ]
-    },
-    "smart-shift": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hbin",
-            "repo": "smart-shift",
-            "sha256": "0azhfffm1bkgjx4i3p9f6x2gmw8kc3fafzqj4vxxdibhn0nizqk8",
-            "rev": "a26ab2b240137e62ec4bce1698ed9c5f7b6d13ae"
-        },
-        "recipe": {
-            "sha256": "0azahlflnh6sk081k5dcqal6nmwkjnj4dq8pv8ckwf8684zp23d3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150203.125",
-        "deps": []
-    },
-    "jabber": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://git.code.sf.net/p/emacs-jabber/git",
-            "sha256": "1a0f7c2154f863dbefc732a2057d0f7416cb4cd5764bdfa01cbf9e221a3abcb3",
-            "rev": "d5bfa1c62e6474a997e73a836524fdd322c0af44"
-        },
-        "recipe": {
-            "sha256": "1g5pc80n3cd5pzs3hmpbnmxbldwakd72pdn3vvb0h26j9v073pa8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151025.1804",
-        "deps": [
-            "fsm"
-        ]
-    },
-    "magit-gerrit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "terranpro",
-            "repo": "magit-gerrit",
-            "sha256": "0qhrh7z5snbmxfcrcj1v00z7vkmxqwgxmx4hfi0bvs3lfkcdrfxv",
-            "rev": "c4e3da19d55229feef8df2e062104ecc9fd4290d"
-        },
-        "recipe": {
-            "sha256": "1iwvg10ly6dlf8llz9f8d4qfdbvd3s28wf48qgn1wjlxpka6zrd4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151202.1818",
-        "deps": [
-            "magit"
-        ]
-    },
-    "bubbleberry-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jasonm23",
-            "repo": "emacs-bubbleberry-theme",
-            "sha256": "1aha8rzilv4k300rr4l9qjfygydfwllkbw17lhm8jz0kh9w6bd28",
-            "rev": "22e9adf4586414024e4592972022ec297321b320"
-        },
-        "recipe": {
-            "sha256": "056pcr9ynsl34wqa2pw6sh4bdl5kpp1r0pl1vvw15p4866l9bdz3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141017.444",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "org-pomodoro": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lolownia",
-            "repo": "org-pomodoro",
-            "sha256": "015idpk66835jdg1sbvpksyr07xk4vn17z8cng2qw87fss688ihb",
-            "rev": "95e2b1f555359a6096a19634814e1d93b2072f25"
-        },
-        "recipe": {
-            "sha256": "1vdi07hrhniyhhvg0hcr5mlixy6bjynvwm89z2lvfyvnnxpx0r27",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151217.753",
-        "deps": [
-            "alert",
-            "cl-lib"
-        ]
-    },
-    "buster-snippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "buster-snippets.el",
-            "sha256": "11djqlw4qf3qs2rwiz7dn5q2zw5i8sykwdf4hg4awsgv8g0bbxn6",
-            "rev": "bb8769dae132659858e74d52f3f4e8790399423a"
-        },
-        "recipe": {
-            "sha256": "0k36c2k7wwix10rgmjxipc77fkn9jahjyvl191af6w41wla47x4x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151125.410",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "monokai-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "oneKelvinSmith",
-            "repo": "monokai-emacs",
-            "sha256": "09vm2mq89vnlnl13qra511inc1dsall3qd2sxjg0g536fk3y9v13",
-            "rev": "451a46930b9c5420d526505abe8f157a7292644e"
-        },
-        "recipe": {
-            "sha256": "13mv4vgsmdbf3v748lqi7b42hvr3yp86n97rb6792bcgd3kbdx7a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151210.507",
-        "deps": []
-    },
-    "cloud-to-butt-erc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "leathekd",
-            "repo": "cloud-to-butt-erc",
-            "sha256": "07kvnb6p35swkyj92c4wymsqq4r2885wdpqhv7nhicvi6n658kpf",
-            "rev": "6710c03d1bc91736435cbfe845924940cae34e5c"
-        },
-        "recipe": {
-            "sha256": "061mmw39dq8sqzi2589lf7svy15n2iyiwbfiram48r2yhma5dd0f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130627.1808",
-        "deps": []
-    },
-    "kurecolor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsfodder",
-            "repo": "kurecolor",
-            "sha256": "0da4y9pf6vq0i6w7bmvrszg9bji3ylhr44hmyrmxvah28pigb2fz",
-            "rev": "c8c72cea04e51f57701d2dd9be7dba5f3412e2f3"
-        },
-        "recipe": {
-            "sha256": "0q0q0dfv376h7j3sgwxqwfpxy1qjbvb6i5clsxz9xp4ly89w4d4f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150423.2322",
-        "deps": [
-            "emacs",
-            "s"
-        ]
-    },
-    "dropbox": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pavpanchekha",
-            "repo": "dropbox.el",
-            "sha256": "1s4cz5s0mw733ak9ps62fs150y3psqmb6v5s6s88jjfsi0r03c0s",
-            "rev": "fb71a2787030f911b569426596c081a89241056e"
-        },
-        "recipe": {
-            "sha256": "0ak6g2d2sq026ml6cmn6v1qz7sczkplgv2j9zq9zgzafihyyzs5f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130513.1737",
-        "deps": [
-            "json",
-            "oauth"
-        ]
-    },
-    "helm-rails": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "asok",
-            "repo": "helm-rails",
-            "sha256": "1a26r21jvgzk21vh3mf29s1dhvvv70jh860zaq9ihrpfrrl91158",
-            "rev": "31d79cd0feca11cbb1aa532a8d2112ec794de4f0"
-        },
-        "recipe": {
-            "sha256": "1iihfsmnkpfp08pldghf3w5k8v5dlmy5ns0l4niwdwp5w8lyjcd6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130424.1019",
-        "deps": [
-            "helm",
-            "inflections"
-        ]
-    },
-    "flymake-haml": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-haml",
-            "sha256": "08rcsg76qdq2l6z8q339yw770kv1q657ywqvq6a20pxxz2158a8l",
-            "rev": "3117d94ecad908710502e8def42dbae5748e9c1d"
-        },
-        "recipe": {
-            "sha256": "0dmdhh12h4xrx6mc0qrwavngk2sx0l4pfqkjjyavabsgcs9wlgp1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130324.551",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "highlight-indentation": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "antonj",
-            "repo": "Highlight-Indentation-for-Emacs",
-            "sha256": "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k",
-            "rev": "cd6d8168ccb04c6c0394f42e9512c58f23c01689"
-        },
-        "recipe": {
-            "sha256": "0iblrrbssjwfn71n8xxjcl98pjv1qw1igf3hlz6mh8740fsca3d6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150307.408",
-        "deps": []
-    },
-    "runtests": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sunesimonsen",
-            "repo": "emacs-runtests",
-            "sha256": "18w6gkpxp0g7rzvnrk8vvr267y768dfik447ssq8jpz3jlr5jnq6",
-            "rev": "ed90249f24cc48290018df48b9b9b7172440be3e"
-        },
-        "recipe": {
-            "sha256": "0m9rqjb5c0yqr2wv5dsdiba21knr63b5pxsqgbkbybi15zgxcicb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150807.331",
-        "deps": []
-    },
-    "monroe": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sanel",
-            "repo": "monroe",
-            "sha256": "1z1gyknxscvk2qpfcrgzymf9w5m8jcnj525q852b8s6yf5fnffmh",
-            "rev": "7f42a0139a8030407da736ddb0f67132634b70c0"
-        },
-        "recipe": {
-            "sha256": "04rhninxppvilk7s90g0wwa0g9vfcg7mk8mrb2m2c7cb9vj6wyig",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141111.307",
-        "deps": []
-    },
-    "helm-ctest": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "danlamanna",
-            "repo": "helm-ctest",
-            "sha256": "18d96alik66nw3rkk7k8740b4rx2bnh3pwn27ahpgj5yf51wm0ry",
-            "rev": "973a138aa8ff4c6a1cd798779e8d0dd80522354d"
-        },
-        "recipe": {
-            "sha256": "1mphc9fsclbw19p5i1xf52qg6ljljbajvbcsl95hisrnvhg89vpm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150823.608",
-        "deps": [
-            "dash",
-            "helm-core",
-            "s"
-        ]
-    },
-    "with-namespace": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Wilfred",
-            "repo": "with-namespace.el",
-            "sha256": "1c7g8f3jr7bb0xxprammfg433gd63in5iiiaq8rjmc94h6hdcys3",
-            "rev": "8ac52da3a09cf46087720e30cf730d00f140cde6"
-        },
-        "recipe": {
-            "sha256": "1199k1xvvv7ald6ywrh2sfpw2v42ckpcsw6mcj617bg3b5m7770i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130407.1322",
-        "deps": [
-            "dash",
-            "loop"
-        ]
-    },
-    "flymake-google-cpplint": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "senda-akiha",
-            "repo": "flymake-google-cpplint",
-            "sha256": "0zldhlvxmk0xcjmj4ns48pp4h3bvijrzs1md69ya7m3dmsbayfrc",
-            "rev": "905d32e84a27f18a78bec455ca930ab1ff9ae31e"
-        },
-        "recipe": {
-            "sha256": "0q7v70xbprh03f1yabq216q4q82a58s2c1ykr6ig49cg1jdgzkf3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140205.725",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "names": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "names",
-            "sha256": "0m82g27gwf9mvicivmcilqghz5b24ijmnw0jf0wl2skfbbg0sydh",
-            "rev": "00862c57ae6363ba86d1e5ce138929a1b6d5c7e6"
-        },
-        "recipe": {
-            "sha256": "1q784606jlakw1z6sx2g2x8hz8c8arywrm2r626wj0v105v510vg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151201.604",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "worf": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "worf",
-            "sha256": "0flwch8hsfz1kkb0hg68s71szbvmh7mqih8hj0kwfjdb7alsah8r",
-            "rev": "61a6fc392034c2a588c44fef0a514032cf660e68"
-        },
-        "recipe": {
-            "sha256": "1fkb2ddl684dijsb0cqgmfbg1nz4xv43rb7g5rah05rchy5sgkpi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151116.2040",
-        "deps": [
-            "ace-link",
-            "helm",
-            "hydra"
-        ]
-    },
-    "ztree": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fourier",
-            "repo": "ztree",
-            "sha256": "1m6s02jvd48hx8i9apqlscrzqlqa46rk1zf1ix28c6xg0xpri00i",
-            "rev": "3d70aefd95404a42e21e53d7139c0b1fba47087b"
-        },
-        "recipe": {
-            "sha256": "1fk5xz8qq3azc66f954x5qvym94xnv4fg6wy83ihdfwycsas7j20",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151215.1412",
-        "deps": []
-    },
-    "log4j-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsorphanage",
-            "repo": "log4j-mode",
-            "sha256": "14dmmjdmcc0zag8i947n59ihjc2df2l44f7issf66767ym3839kk",
-            "rev": "ec3de92cfe60dd3d0de613e9062476196dea0faf"
-        },
-        "recipe": {
-            "sha256": "0axr0x8mdxif0xbvs83mxc3gqgs84jb4b9la9n62i3lldckghwmg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20101016.1022",
-        "deps": []
-    },
-    "discover-clj-refactor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "maio",
-            "repo": "discover-clj-refactor.el",
-            "sha256": "0l2g58f55p8zmzv2q2hf163ggm9p0wk8hg93wlkyldrgyb94dgf4",
-            "rev": "3fbd5c1162739e606d7cf5d4f5d7426547d99647"
-        },
-        "recipe": {
-            "sha256": "08bz60fxcgzab77690mmv0f7wdxcpygmasazcss427k37z9ysm7r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150328.959",
-        "deps": [
-            "clj-refactor",
-            "discover"
-        ]
-    },
-    "faceup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Lindydancer",
-            "repo": "faceup",
-            "sha256": "0sjmjydapfnv979dx8dwiz67wffamiaf41s4skkwa0wn2h4p6wja",
-            "rev": "70fa6be83768adf78f20425d0d76fe809dc44d79"
-        },
-        "recipe": {
-            "sha256": "0l41xp38iji55dv20lk7r187ywcz8s1g2jmwbjwkspzmcf763xvx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150215.1548",
-        "deps": []
-    },
-    "repl-toggle": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tomterl",
-            "repo": "repl-toggle",
-            "sha256": "0lx9zbn9zvr50i8x5vpd5cr22c2v27ln2v89dmn0shcdx54m454l",
-            "rev": "903791e3e34f67bca64c47dc2b91e612d3bad09c"
-        },
-        "recipe": {
-            "sha256": "1jyaksxgyygfv1wn9c6y8sykb4hicwgs9n5vrdikd2i0iix29zpb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140501.731",
-        "deps": [
-            "fullframe"
-        ]
-    },
-    "gnus-x-gm-raw": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "gnus-x-gm-raw",
-            "sha256": "1i3f67x2l9l5c5agspbkxr2mmh3rpq3009d8yzh6r1lih0b4hril",
-            "rev": "978bdfcecc8844465b71641c2e909fcdc66b22be"
-        },
-        "recipe": {
-            "sha256": "1a5iccghzqmcndql2bppvr48535sf6jbvc83iypr1031z1b5k4wg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140610.231",
-        "deps": [
-            "log4e",
-            "yaxception"
-        ]
-    },
-    "noxml-fold": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "paddymcall",
-            "repo": "noXML-fold",
-            "sha256": "0jahr1380919p272srym1pp16ifdz69fn1m45ppglm54q4a741d8",
-            "rev": "feecc06b1136c1ddbabcdc37287f1ef26f1282fc"
-        },
-        "recipe": {
-            "sha256": "11dninxxwhflf2qrmvwmrryspd9j6m95kdlmyx59ykqvw8j0siqc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151216.1021",
-        "deps": []
-    },
-    "dropdown-list": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/dropdown-list.el",
-            "sha256": "1szy46sk3nvlbb3yzk1s983281kkf507xr3fkclkki3d3x31n08a"
-        },
-        "recipe": {
-            "sha256": "14i9w897gnb3mvnkbzhzij04bgr551r8km310mbrmzzag54w077z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120329.1136",
-        "deps": []
-    },
-    "look-dired": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vapniks",
-            "repo": "look-dired",
-            "sha256": "0w9pbjcp4d2w3qb3nnyzq2d0d9f0pgz5lyzapidxa9z1xcj51ccj",
-            "rev": "5b2afe910a904d13674103f5264c6bcdbb9f9fb2"
-        },
-        "recipe": {
-            "sha256": "0dddx5nxr519wqdgrbglh0pqjl3alg4ddmank42g4llzycy61wsd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151115.1956",
-        "deps": [
-            "look-mode"
-        ]
-    },
-    "salt-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "beardedprojamz",
-            "repo": "salt-mode",
-            "sha256": "1hl227bmjch0vq7n47mwydkyxnd6wkbz9klk3c4398qmc2qxm5kn",
-            "rev": "c9147cb78680cc34e6fcff3968c336460a9090a4"
-        },
-        "recipe": {
-            "sha256": "1r5k7022vxgj3p5l16y839lff85z0m9hpifq59knij61g9hxadsp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150904.1313",
-        "deps": [
-            "mmm-jinja2",
-            "mmm-mode",
-            "yaml-mode"
-        ]
-    },
-    "wand": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cmpitg",
-            "repo": "wand",
-            "sha256": "09gqsssc2sk0vwfg0h4zxq9a779sdjdgvxsw7p6n2k0g4wk0phri",
-            "rev": "da6284ab75c3afa1275420faa9934037052e2967"
-        },
-        "recipe": {
-            "sha256": "052zq5dp800hynd9fb6c645kjb9rp3bpkz41ifazjnx4h4864r0l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141104.1845",
-        "deps": [
-            "dash"
-        ]
-    },
-    "docker": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Silex",
-            "repo": "docker.el",
-            "sha256": "06vb6r1k9ml799h44fm9jhf3amldzhawxnm0lnr501hrmj4bz36x",
-            "rev": "77f646cc10909403a945d188cf9d81abd3bfc2a0"
-        },
-        "recipe": {
-            "sha256": "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151126.413",
-        "deps": [
-            "dash",
-            "emacs",
-            "magit-popup",
-            "s"
-        ]
-    },
-    "fuzzy-format": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/fuzzy-format.el",
-            "sha256": "1iv0x1cb12kknnxyq2gca7m3c3rg9s4cxz397sazkh1csrn0b2i7"
-        },
-        "recipe": {
-            "sha256": "055b8710yxbi2sdqsqk6jqgnzky4nykv8jgqgwy8q2isgj6q98jb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130824.700",
-        "deps": []
-    },
-    "rpn-calc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "rpn-calc",
-            "sha256": "0i5qwbhhdnspgs2y67kkgbk9zq6fx2j509q92mgfzbvjnf54h1r8",
-            "rev": "ed202e9eb59c4ace74b4703174f7bc7fa7e2d594"
-        },
-        "recipe": {
-            "sha256": "04dj2r4035k0c3x6iyjydshzmq381d60pmscp2hg5m7sp7bqn5xs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150302.734",
-        "deps": [
-            "popup"
-        ]
-    },
-    "auto-package-update": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rranelli",
-            "repo": "auto-package-update.el",
-            "sha256": "05llpa6g4nb4qswmcn7j3bs7hnmkrkax7hsk7wvklr0wrljyg9a2",
-            "rev": "cdef79f9fc6f8347fdd05664978fb9a948ea0410"
-        },
-        "recipe": {
-            "sha256": "0fdcniq5mrwbc7yvma4088r0frdfvc2ydfil0s003faz0nrjcp8k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151026.111",
-        "deps": [
-            "dash",
-            "emacs"
-        ]
-    },
-    "map-progress": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "map-progress",
-            "sha256": "0pd6bh7wrrh59blp86a2jl2vi4qkzx49z0hy7dkc71ccg0wjsgz1",
-            "rev": "3167eb218510953fb97e7d50948a625eaa3f0005"
-        },
-        "recipe": {
-            "sha256": "0zc5vii72gbfwbb35w8m30c8r9zck971hwgcn1a4wjczgn4vkln7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140310.1632",
-        "deps": []
-    },
-    "eno": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "enoson",
-            "repo": "eno.el",
-            "sha256": "15zqfisfa5yrdnlh0xd6avas0qxj273hy5nvj97bm9h54mamjbs6",
-            "rev": "c379bf040bab10e52aba44140e9aa1b566cdebb6"
-        },
-        "recipe": {
-            "sha256": "0k4n4vw261v3bcxg7pqhxr99vh673l963yjridl0dp1663gcrfpk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150722.726",
-        "deps": [
-            "dash",
-            "edit-at-point"
-        ]
-    },
-    "helm-idris": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "david-christiansen",
-            "repo": "helm-idris",
-            "sha256": "0128nrhwyzslzl0l7wcjxn3dlx3h1sjmwnbbnp2fj4bjk7chc59q",
-            "rev": "a2f45d6817974f318b55ad9b7fd19d5df132d47e"
-        },
-        "recipe": {
-            "sha256": "1y52675j4kcq14jypxjw1rflxrxwaxyn1n3m613klad55wpfaamf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141202.1157",
-        "deps": [
-            "helm",
-            "idris-mode"
-        ]
-    },
-    "omni-log": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "AdrieanKhisbe",
-            "repo": "omni-log.el",
-            "sha256": "1nvgh9wvgswcs3r958b579rsx540xrhlnafc6cmcd63z6yck19w0",
-            "rev": "e5a8ee7d63eb1e745b37ba4e3e71c5ea025e2342"
-        },
-        "recipe": {
-            "sha256": "0c29243zq8r89ax4rxlmb8imag12icnldcb0q0xsnhjccw8lyw1r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150604.1238",
-        "deps": [
-            "dash",
-            "emacs",
-            "ht",
-            "s"
-        ]
-    },
-    "zombie-trellys-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "david-christiansen",
-            "repo": "zombie-trellys-mode",
-            "sha256": "04m53hzk5n9vxh0gxi8jzpdhsdjlxnvz7hmsisr3bs99v603ha01",
-            "rev": "7f0c45fdda3a44c3b6d1762d116abb1421b8fba2"
-        },
-        "recipe": {
-            "sha256": "19xzvppw7f35s82hm0y7sga8dyjjyy0dxy6vji4hxdpjziz7lggv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150304.848",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "haskell-mode"
-        ]
-    },
-    "ob-mongo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "krisajenkins",
-            "repo": "ob-mongo",
-            "sha256": "0qibnn908a59jyfslsnpjanbm85f8xw9zywsqsh37nv27ncbx0hr",
-            "rev": "7eb5524d9c106945b371f9fbb9f1176f6e6f9b13"
-        },
-        "recipe": {
-            "sha256": "1cgmqsl5dzi8xy3sh5xsfkczl555fpd4q6kgsh9xkn74sz227907",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130718.932",
-        "deps": [
-            "org"
-        ]
-    },
-    "karma": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tonini",
-            "repo": "karma.el",
-            "sha256": "1xcs15j555cgp2k4k9vl5sy2lrffbk0ma2fv60hlxwirqyw4jcdy",
-            "rev": "07d5ba0fd669b909efdf02ffd0c1f45e6136edc4"
-        },
-        "recipe": {
-            "sha256": "19wl7js7wmw7jv2q3l4r5zl718lhy2a0jhl79k57ihwhxdc58fwc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150120.2358",
-        "deps": [
-            "emacs",
-            "pkg-info"
-        ]
-    },
-    "jg-quicknav": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "https://github.com/jeffgran/jg-quicknav",
-            "sha256": "a7aa00b03d474549a25faec9ae0394f9d1065c05049268dea507409f84c801a1",
-            "rev": "67293fdbbb0c6afe2528ec6c03dc54eaa59a2c98"
-        },
-        "recipe": {
-            "sha256": "1v46ck9imffhrmx6s4c3kbi5g5spf2mn2axy5nfpn7q8sc8bf0s3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150217.2028",
-        "deps": [
-            "cl-lib",
-            "s"
-        ]
-    },
-    "imenu-anywhere": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vitoshka",
-            "repo": "imenu-anywhere",
-            "sha256": "1mi45vb3f2ka9xgz5gbgq77nirl4dnrjxkar3d5m3xvax0bicv6i",
-            "rev": "b486c1e80c667504b243a84351cc8751710248e9"
-        },
-        "recipe": {
-            "sha256": "0p93g7ay9n4nhf1qk24mbax0w9sr06xd2kjmrz00gbg75sr9r2s8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151030.1327",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "js3-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thomblake",
-            "repo": "js3-mode",
-            "sha256": "137lypg6jwsisn2g5h0wiqh57icj46zv3albxjf2q1k5isszhy1l",
-            "rev": "d0767afbb4fc8019f9e90e978937036d3bddbc5e"
-        },
-        "recipe": {
-            "sha256": "12s5qf6zfcv4m5kqxvh9b4zgwf433x39a210d957gjjp5mywbb1r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150902.1149",
-        "deps": []
-    },
-    "scratch": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ieure",
-            "repo": "scratch-el",
-            "sha256": "0ykhr24vpx3byn2n346nqqvmwcg34hk22s3lpdx7lpnkrn5z41aq",
-            "rev": "54e31e81cd239e1fd1b3c6a20ff426029bf9aaf5"
-        },
-        "recipe": {
-            "sha256": "1c6vxpd9c24d2flzwgvzqz0wr70xzqqs3f59pp897h0f7j91im5d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120830.1228",
-        "deps": []
-    },
-    "tangotango-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "juba",
-            "repo": "color-theme-tangotango",
-            "sha256": "00v2y2gfb44kmzfdbp6f4nmxlwn8gf6y3hvgqzggmlbqb5m8hg8d",
-            "rev": "92a94756080577c0446b2fc7f06d43d7b76b2005"
-        },
-        "recipe": {
-            "sha256": "05cnvyqmh5h5mqys7qs7d9knzxzmi2x0j1avp77x5l5njzzv59s2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150702.304",
-        "deps": []
-    },
-    "imgur": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "imgur.el",
-            "sha256": "0nzgfj083im8lc62ifgsh1pmbw0j9wivimjgih7k6ny3jgw834rs",
-            "rev": "ed952eb8f556c6fc0d982e2a689083504558cffb"
-        },
-        "recipe": {
-            "sha256": "0hr2zz7nq65jig2036g5sa8q2lhb42jv40ijikcz8s4f5v3y14i7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120307.425",
-        "deps": [
-            "anything"
-        ]
-    },
-    "c-c-combo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "CestDiego",
-            "repo": "c-c-combo.el",
-            "sha256": "040mcq2cwzbrf96f9mghb4314cd8xwp7ki2ix9fxpmbwiy323ld5",
-            "rev": "a261a833499a7fdc29610863b3aafc74818770ba"
-        },
-        "recipe": {
-            "sha256": "09rvh6n2hqls7qki5dc34s2hmcmlvdsbgzcxgglhcmrhwx5w4vxn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151223.2055",
-        "deps": []
-    },
-    "auto-auto-indent": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sabof",
-            "repo": "auto-auto-indent",
-            "sha256": "1whbvqylwnxg8d8gn55kcky39rgyc49rakyxlbkplh813lk6lxb7",
-            "rev": "0139378577f936d34b20276af6f022fb457af490"
-        },
-        "recipe": {
-            "sha256": "08s73pnyrmklb660jl5rshncpq31z3m9fl55v7453ch8syp7gzh7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131106.1303",
-        "deps": [
-            "cl-lib",
-            "es-lib"
-        ]
-    },
-    "aproject": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vietor",
-            "repo": "aproject",
-            "sha256": "1wyz8jvdy4m0cn75mm3zvxagm2gl10q51479f91gnqv14b4rndfc",
-            "rev": "3c7d23c341862dfd77fd0a64775df12ddb44ab54"
-        },
-        "recipe": {
-            "sha256": "0v3gx2mff2s7knm69y253pm1yr4svy8w00pqbn1chrvymb62jhp2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150605.406",
-        "deps": []
-    },
-    "helm-projectile": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bbatsov",
-            "repo": "helm-projectile",
-            "sha256": "1c6pfy3qghpqnng1jsnxnvqnd6sq41f2dm7kkwkgml405asqlcqa",
-            "rev": "2544343b4214511988fa1b652474d7984008f807"
-        },
-        "recipe": {
-            "sha256": "18y7phrvbpdi3cnghwyhh0v1bwm95nwq1lymzf8lrcbmrwcvh36a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151220.421",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "helm",
-            "projectile"
-        ]
-    },
-    "ahk-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ralesi",
-            "repo": "ahk-mode",
-            "sha256": "122as0ssc6xzmxb5hlvhx6dlx6gq2f70xisz0z8pxgm3bpf9h6mx",
-            "rev": "e08a1b467d42b9d5e719c39407908152011b4573"
-        },
-        "recipe": {
-            "sha256": "066l4hsb49wbyv381qgn9k4hn8gxlzi20h3qaim9grngjj5ljbni",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151104.1737",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "requirejs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joeheyming",
-            "repo": "requirejs-emacs",
-            "sha256": "1bfj2zjn3x41jal6c136wnwkgmag27bmrwbfwdylafc7qqk6dflv",
-            "rev": "4ea2a5fcbc76e4cbb6a7461e6f05f019b75865b1"
-        },
-        "recipe": {
-            "sha256": "09z6r9wcag3gj075wq215zcslyknl1izap595rn48xvizxi06c6k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151204.119",
-        "deps": [
-            "cl-lib",
-            "js2-mode",
-            "popup",
-            "s",
-            "yasnippet"
-        ]
-    },
-    "json-rpc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "elisp-json-rpc",
-            "sha256": "0xgrb0zfxyfmfnvx1l7ca99lzl6f2qyal798rcra45167c0j0vbb",
-            "rev": "a83189b126d8d3d7a856008a5b6ad267b2fcc126"
-        },
-        "recipe": {
-            "sha256": "1v1pfmm9g18p6kgn27q1m1bjgwbzvwfm0jbsxp8gdsssaygky71k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150830.1601",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "gnus-alias": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hexmode",
-            "repo": "gnus-alias",
-            "sha256": "1i278npayv3kfxxd1ypi9n83q5l402sbc1zkm11pf8g006ifqsp4",
-            "rev": "9447d3ccb4c0e75d0468899cccff7aa249657bac"
-        },
-        "recipe": {
-            "sha256": "0mbq9v8fiqqyldpb66v9bc777mzxywaq2dabivabxjg6554s8chf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150315.1942",
-        "deps": []
-    },
-    "pastehub": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiyoka",
-            "repo": "pastehub",
-            "sha256": "0m6qjsq6qfwwszm95lj8c58l75vbmx9r5hm9bfywyympfgy0fa1n",
-            "rev": "37b045c67659c078f1517d0fbd5282dab58dca23"
-        },
-        "recipe": {
-            "sha256": "1slvqn5ay6gkbi0ai1gy1wmc02h4g3n6srrh4fqn72y7b9nv5i0v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140615.120",
-        "deps": []
-    },
-    "nim-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nim-lang",
-            "repo": "nim-mode",
-            "sha256": "00s8c4a5qnfm0h6zx26f1m0syq7gii7n45nl83y71yaccdw0syls",
-            "rev": "1f0a6cdd39460c1d59da79aa8d4b132753448c56"
-        },
-        "recipe": {
-            "sha256": "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151125.225",
-        "deps": [
-            "emacs",
-            "epc"
-        ]
-    },
-    "elfeed-org": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "remyhonig",
-            "repo": "elfeed-org",
-            "sha256": "0cp8sbhym83db88ii7gyab6iqxppinjlrkzb9627gq7xgb5mqj5j",
-            "rev": "e5206bc983d04c68310181da83147908682de295"
-        },
-        "recipe": {
-            "sha256": "0xf2r5ca3gnx2cv9f8rr4s1hds2ggqsbllvfr229gznkcqjnglik",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151003.531",
-        "deps": [
-            "dash",
-            "elfeed",
-            "org",
-            "s"
-        ]
-    },
-    "watch-buffer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mjsteger",
-            "repo": "watch-buffer",
-            "sha256": "0i84ndnxma8s07kf5ixqyhv5f89mzc4iymgazj5inmxhvbc7s7r2",
-            "rev": "761fd7252e6d7bf5148283c2a7ee935f087d9427"
-        },
-        "recipe": {
-            "sha256": "18sxgihmqmkrbgs66qgnrsjqbp90l93531hns31fbnif10bkx2j5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120331.1544",
-        "deps": []
-    },
-    "langtool": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-langtool",
-            "sha256": "16wmc89jnn7qqcqw6702c9ccmwpb8pkxasa17ikmmmnggmg50lfh",
-            "rev": "443b3804f9e33e6d96ee8e15ddede7f152ece378"
-        },
-        "recipe": {
-            "sha256": "1xq70jyhzg0qmvialy015crbdk9rdibhwpl36khab9hi2999wxyw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150917.613",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "toml-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dryman",
-            "repo": "toml-mode.el",
-            "sha256": "1w9vkh6c4g80zykcy77k3r0bdc99mq8yh58bqkyd6gsr7pnp16gj",
-            "rev": "afd98423773c2b9578fc5b2b46a43b5f5ecf7e6b"
-        },
-        "recipe": {
-            "sha256": "0yghf2ixl3dkcaxnkr4qzxfa9k1rrac7w5qpw1jx2bvic0cfs40l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150818.320",
-        "deps": []
-    },
-    "ac-skk": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "ac-skk.el",
-            "sha256": "1nvz0jfz4x99xc5ywspl8fdpyqns5zd0j7i4bwzlwplmy3qakjwm",
-            "rev": "d25a265930430d080329789fb253d786c01dfa24"
-        },
-        "recipe": {
-            "sha256": "0iycyfgv8v15ygngvyx66m3w3sv8p9h6q6j1hbpzwd8azl8fzj5z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141229.1919",
-        "deps": [
-            "auto-complete",
-            "cl-lib",
-            "ddskk",
-            "tinysegmenter"
-        ]
-    },
-    "gnus-spotlight": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/gnus-spotlight.el",
-            "sha256": "1r6bck1hsvk39ccri1h128jj8zd0fh9bsrlp8ijb0v9f6x3cysw4"
-        },
-        "recipe": {
-            "sha256": "065jcix6a4mxwq8wc8gkr0x9lxmn6hlvf0rqmhi8hb840km1syjx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130901.935",
-        "deps": []
-    },
-    "rbt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joeheyming",
-            "repo": "rbt.el",
-            "sha256": "0ij2gqhg714ah812rhf1yg2n7ah1v4d5yldn1rixrzfcdng10mpi",
-            "rev": "47cf236c732e9c5f468fb24c6a1c2db69a133797"
-        },
-        "recipe": {
-            "sha256": "1mrb6v8zybvhh242vvq0kdvg6cvws7gabfhcydrw5g2njhyqkygm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151030.2255",
-        "deps": [
-            "popup"
-        ]
-    },
-    "uzumaki": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "geyslan",
-            "repo": "uzumaki",
-            "sha256": "0fx18m688wfflbzwv8h3051439fwql69v1ip5q6xn958rdq4pi3x",
-            "rev": "afae141588ef9407ff86ce1ae9a0f1860843c4a4"
-        },
-        "recipe": {
-            "sha256": "1fvhzz2qpyc819rjvzyf42jmb70hlg7a9ybqwi81w7rydpabg61q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150119.1906",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "eredis": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "http://eredis.googlecode.com/svn/trunk/",
-            "sha256": "0cdyhklmsv0xfcq97c3wqh8scs6910jzvvp04w0jxlayd1dbzx49",
-            "rev": "28"
-        },
-        "recipe": {
-            "sha256": "1j0y4h97pqsw6k18w6r3rza3ql04ag3cixyndji7i1smbfsh4v95",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120808.2207",
-        "deps": []
-    },
-    "creole-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nicferrier",
-            "repo": "creole-mode",
-            "sha256": "0japww5x89vd1ahjm2bc3biz6wxv94vvqq5fyyzkqsblgk5bys0h",
-            "rev": "b5e79b2ec5f19fb5aacf689b5febc3e0b61515c4"
-        },
-        "recipe": {
-            "sha256": "1lj9a0bgn7lmc2wyjzzvmpaz1f1spj02l51ki2wydjbfhxq61k0s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130721.1950",
-        "deps": []
-    },
-    "fvwm-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "theBlackDragon",
-            "repo": "fvwm-mode",
-            "sha256": "0w2kqmx38ji5273mzhn9sp4r6vn7jfwb5qpsf2w8d46avpf8rj5i",
-            "rev": "cfd14546b6905806e0f2ad3df58b08de2401be3c"
-        },
-        "recipe": {
-            "sha256": "07y32cnp4qfhncp7s24gmlxljdrj5miicinfaf4gc7hihb4bkrkb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141105.2236",
-        "deps": []
-    },
-    "factlog": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tkf",
-            "repo": "factlog",
-            "sha256": "19zm9my7fl1r3q48axjv2f8x9hcjk6qah4y4r92b90bzfmcdc30y",
-            "rev": "6503d77ea882c995b051d22e72db336fb28770fc"
-        },
-        "recipe": {
-            "sha256": "163482vfpa52b5ya5xps4qnclbaql1x0q54gqdwwmm04as8qbfz7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130209.1940",
-        "deps": [
-            "deferred"
-        ]
-    },
-    "erc-terminal-notifier": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "julienXX",
-            "repo": "erc-terminal-notifier.el",
-            "sha256": "0cfqbqskh260zfq1lx1s8jz2351w2ij9m73rqim16fy7zr0s0670",
-            "rev": "a3dacb935845e4a20031212bbd82b2170f68d2a8"
-        },
-        "recipe": {
-            "sha256": "0vrxkg62qr3ki8n9mdn02sdni5fkj79fpkn0drx0a4kqp0nrrj7c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140115.424",
-        "deps": []
-    },
-    "calmer-forest-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "caldwell",
-            "repo": "calmer-forest-theme",
-            "sha256": "0n6y4z3qg04qnlsrjysf8ldxl2f2bk7n8crijydwabyy672qxd9h",
-            "rev": "87ba7bae389084d13fe3bc34e0c923017eda6ba0"
-        },
-        "recipe": {
-            "sha256": "0riz5n8fzvxdnzgg650xqc2zwc4xvhwjlrrzls5h0pl5adaxz96p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130926.10",
-        "deps": []
-    },
-    "kaesar-file": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-kaesar",
-            "sha256": "1maab8iaf2wcjj02ibl21jlfzmi9gmcl167cgdlwj50wkig74s23",
-            "rev": "11ab63b8e6f1c4ebc5a2e54474095754a39104e5"
-        },
-        "recipe": {
-            "sha256": "0dcizg82maad98mbqqw5lamwz7n2lpai09jsrc66x3wy8k784alc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150130.1004",
-        "deps": [
-            "kaesar"
-        ]
-    },
-    "purty-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hackscience",
-            "repo": "purty-mode",
-            "sha256": "0qm2xv762cz196aqs445crqrmsks8hpwzpaykzn0chlvdk0m5cv1",
-            "rev": "8eef77317a3bab07ade212353a50fbd3f20f365a"
-        },
-        "recipe": {
-            "sha256": "1ackqv95sdphbsjwydbc4dmdzwpaj74v329f55zcwa8hn3li9d5m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131004.1759",
-        "deps": []
-    },
-    "idea-darkula-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fourier",
-            "repo": "idea-darkula-theme",
-            "sha256": "0famn16syz4d5ln1xiblqm0naxr5cnv9757r03xnzi9l9r67vyrs",
-            "rev": "509481632d337dc6ad49809225d209eb2fdb243f"
-        },
-        "recipe": {
-            "sha256": "0lanhwlhd7pbzjc047vd5sgsmi2bx66gr3inr8y57swgrfw3l8sk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151223.517",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "boon": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jyp",
-            "repo": "boon",
-            "sha256": "1qgyfcrk1rs1kbshmcgy67hhpfw7rbkbncm3iyqs51wk076hss7a",
-            "rev": "b4bb92a5c4ce0367e84137b29625a03ace60da2a"
-        },
-        "recipe": {
-            "sha256": "0gryw7x97jd46jgrm93cjagj4p7w93cjc36i2ps9ajf0d8m4gajb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.1557",
-        "deps": [
-            "emacs",
-            "expand-region",
-            "multiple-cursors"
-        ]
-    },
-    "inflections": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "eschulte",
-            "repo": "jump.el",
-            "sha256": "0061hcmj63g13bvacwkmcb5iggwnk27dvb04fz4hihqis6jg01c5",
-            "rev": "56cec33dd98231a95faa26dd4c0612885d923f78"
-        },
-        "recipe": {
-            "sha256": "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121016.357",
-        "deps": []
-    },
-    "loccur": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fourier",
-            "repo": "loccur",
-            "sha256": "1293ihhl1n1vkbp160ha23g46sx7s6wbdyqbbb2ym6300yrl2x10",
-            "rev": "5e2f33943a18c0b1ae984c24c8000bbaed737067"
-        },
-        "recipe": {
-            "sha256": "06pv2i05yzjzal4q21krbnp9rp4bsainxcwvpc98020vsmms0z8h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150611.1237",
-        "deps": []
-    },
-    "interval-tree": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "interval-tree",
-            "sha256": "0fqnn9xhrc9hkaiziafjgg288l6m05416z9kz8l5845fnqsb7pb3",
-            "rev": "301302f480617091cf3ab6989caac385d52543dc"
-        },
-        "recipe": {
-            "sha256": "13zynac3h50x68f1ja72kqdrapjks2zmgqd4g7qwscq92mmh60i9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130325.907",
-        "deps": [
-            "dash"
-        ]
-    },
-    "todochiku": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/todochiku.el",
-            "sha256": "0fhlyjl0a3fd25as185j6dmch0wsrf1zc59q29lhjximg9lk3hr5"
-        },
-        "recipe": {
-            "sha256": "1iq08s5ji6hd8as80qxqkbavnjbx0kcmmjjvhjchmvv93vsn1f96",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150112.1454",
-        "deps": []
-    },
-    "wide-column": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://code.google.com/p/phillord-emacs-packages/",
-            "sha256": "0pq9x73hrp7qwhms7x3dvjfh9imapglba9yd7nkyw68mc0b9wlnl",
-            "rev": "e14e67d6a5b7"
-        },
-        "recipe": {
-            "sha256": "1r9mh7756jgf1hdnprci988z07xxh2jvh8d0c1h5rmxmldlbx8az",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120814.312",
-        "deps": []
-    },
-    "color-theme-sanityinc-solarized": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "color-theme-sanityinc-solarized",
-            "sha256": "07703v8xyia1vx9s636aaql99i29a4r5v9z0lvaypixgsidshx10",
-            "rev": "14beb86aeb5b17451980f192bad72d7edb17321c"
-        },
-        "recipe": {
-            "sha256": "0xg79hgb893f1nqx6q4q6hp4w6rvgp1aah1v2r3scg2jk057qxkf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150803.1620",
-        "deps": []
-    },
-    "ido-yes-or-no": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DarwinAwardWinner",
-            "repo": "ido-yes-or-no",
-            "sha256": "0zqjmi1pbvpby84g1nsrmwcv7w5k0nl3hmkqj0fvhdsmayxqc6j8",
-            "rev": "a9de5731b64f888be38073773c3d72b19c61ed4f"
-        },
-        "recipe": {
-            "sha256": "0glag4yb9xyf1lxxbdhph2nq6s1vg44i6f2z1ii8bkxpambz2ana",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140625.2306",
-        "deps": []
-    },
-    "mode-line-debug": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "mode-line-debug",
-            "sha256": "1lkw9nnlns6v7r6nx915f85whq1ri4w8lccwyxrvam40hfvq60s1",
-            "rev": "da44422eeb6a1f055b4ec2f822962c5162fce001"
-        },
-        "recipe": {
-            "sha256": "0ppj14bm3rx3xgg4mfxa5zcm2r129jgmsx817wq3h7akjngcbfkd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150307.712",
-        "deps": []
-    },
-    "helm-mode-manager": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "istib",
-            "repo": "helm-mode-manager",
-            "sha256": "1lbxb4vnnv6s46m90qihkj99qdbdylwncwaijjfd7i2kap2ayawh",
-            "rev": "5d9c3ca4f8205d07ff4e03c4c3e88f596751c1fc"
-        },
-        "recipe": {
-            "sha256": "1w9svq1kyyj8mmljardhbdvykb334nq1y18s956g4rvqyas2ciyd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151124.338",
-        "deps": [
-            "helm"
-        ]
-    },
-    "python-docstring": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "glyph",
-            "repo": "python-docstring-mode",
-            "sha256": "1a2019172ycw7sdfjrxpyrg41ky9cp09mx30x6cr2qkc1w9pkyrv",
-            "rev": "263879fb339b18ee55d9463697d6f0a73171ee78"
-        },
-        "recipe": {
-            "sha256": "1vi30y71vflsbprp5j4phbp7x1j24vxn9d6sifaddari0g0zxpfw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150907.1504",
-        "deps": []
-    },
-    "helm-aws": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "istib",
-            "repo": "helm-aws",
-            "sha256": "1bnypr906gfc1fbyrqfsfilsl6wiacrnhr8flpa0gmdjhvmrw7af",
-            "rev": "512fb7edcdc6c65303b9641bfc737f836939e5e9"
-        },
-        "recipe": {
-            "sha256": "0sjgdjpznjxsf6nlv2ah45fw17j8j5apdphd1fp43rjv1lskkgc5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151124.333",
-        "deps": [
-            "cl-lib",
-            "helm",
-            "s"
-        ]
-    },
-    "ido-springboard": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jwiegley",
-            "repo": "springboard",
-            "sha256": "14py5amh66jzhqyqjz5pxq0g19vzlmqnrr5wij1ix64xwfr3xdy8",
-            "rev": "d12119d9dd2b0b64f0af0ba82c273326c8c12268"
-        },
-        "recipe": {
-            "sha256": "04jqnag8jiyfbwvc3vd9ikrsmf6cajld7dz2gz9y0zkj1k4gs7zv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150505.1211",
-        "deps": []
-    },
-    "autotetris-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "autotetris-mode",
-            "sha256": "162zay36mmkkpbfvp0lagv2js4cr1z75dc1z5l2505814m5sx3az",
-            "rev": "dd490d5ad6d84bd964ab349484f6a2d05651ede1"
-        },
-        "recipe": {
-            "sha256": "0k4yq4pvrs1zaf9aqxmlb6l2v4k774zbxj4zcx49w3l1h8gwxpbb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141114.1046",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "pcache": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sigma",
-            "repo": "pcache",
-            "sha256": "0xbbq8ddlirhvv921nrf7bwazh0i98bk0a9xzyx8iqpyg66vbfa8",
-            "rev": "4b090f46182fd2ed1f44905dc04acc3121bcf622"
-        },
-        "recipe": {
-            "sha256": "1q2wlbc58lyf3dxfs9ppdxvdsp81jmkq874zbd7f39wvc5ckbz0l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151109.839",
-        "deps": [
-            "eieio"
-        ]
-    },
-    "fuzzy-match": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/fuzzy-match.el",
-            "sha256": "1q2qvw2inizw9r47nff7ikvjzfsx1f8n6yf0j31fxvaawcdf91nq"
-        },
-        "recipe": {
-            "sha256": "0mpy84f2zdyzmipzhs06b8rl2pxiypazf35ls1nc1yj8r16ijrds",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1609",
-        "deps": []
-    },
-    "lolcode-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bodil",
-            "repo": "lolcode-mode",
-            "sha256": "0pyfgywmmnlz1arvdxwyw96gr6xcg2sp3bqjli8xfcl8i0nww4kb",
-            "rev": "1914f1ba87587ecf5f175eeb2144c28e9f039317"
-        },
-        "recipe": {
-            "sha256": "0dxdqr3z5bw0vcfxhhhc1499vrfk1xqwxshr0kvlhdalpf59rqiw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20111002.347",
-        "deps": []
-    },
-    "go-playground": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "grafov",
-            "repo": "go-playground",
-            "sha256": "1hpxvp0slqafbxhkashnmfjssb0ccjq67x01b4p7gznf6rwji166",
-            "rev": "6de119fe6d1ecb8db2dad1f70831561695c5da58"
-        },
-        "recipe": {
-            "sha256": "1rabwc80qwkafq833m6a199zfiwwmf0hha89721gc7i0myk9pac6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151031.1610",
-        "deps": [
-            "emacs",
-            "go-mode",
-            "gotest"
-        ]
-    },
-    "cache": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nflath",
-            "repo": "cache",
-            "sha256": "1hp6dk84vvgkmj5lzghvqlpq3axwzgx9c7gly2yx6497fgf9jlby",
-            "rev": "7499586b6c8224df9f5c5bc4dec96b008258d580"
-        },
-        "recipe": {
-            "sha256": "0lzj0h23g6alqcmd20ack53p72g9i09dp9x0bp3rdw5izcfkvhh3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20111019.1800",
-        "deps": []
-    },
-    "flymake-go": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "robert-zaremba",
-            "repo": "flymake-go",
-            "sha256": "03gh0y988pksghmmvb5av2vnlbcsncafvn4nwihsis0bhys8k28q",
-            "rev": "ae83761aa908c1a50ff34af04f00dcc46bca2ce9"
-        },
-        "recipe": {
-            "sha256": "030m67d8g60ljm7ny3jh4vwj3cshypsklgbjpcvh32y109ga1hy1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150714.233",
-        "deps": []
-    },
-    "reverse-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-reverse-theme",
-            "sha256": "002ywhjms8ybk7cma2p2i11z3fz6kb0w8mlafysm911rvcq2hg5f",
-            "rev": "8319d0d5342890a3530ffa4daafdb7c35feda1ca"
-        },
-        "recipe": {
-            "sha256": "1lq8nwhf8n5i280v0kqksndm4b3n6x34wnd5fa5i48ljwr5cinih",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141204.1945",
-        "deps": []
-    },
-    "menu-bar+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/menu-bar+.el",
-            "sha256": "1vdqhn9srd8ihp0yjjj6lr0zl4n858wri0h3jzxmk3axc688lks7"
-        },
-        "recipe": {
-            "sha256": "181jxjnzdckmvpsdknhm21xwimvsp0qxn8azfn58dz41gl4xcg90",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151206.1120",
-        "deps": []
-    },
-    "perspective": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nex3",
-            "repo": "perspective-el",
-            "sha256": "1ajmyl3bg01a3gkhay4qibgk9a0r6s8rhf1cc1678w3cm0w6yvmd",
-            "rev": "b6f4f05951d3f0d16a503bf462f136c689ede4df"
-        },
-        "recipe": {
-            "sha256": "150dxcsd0ylvfi9mmfpcki1wd3nl8q9mbszd3dgqfnm40yncklml",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151211.1654",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "loop": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Wilfred",
-            "repo": "loop.el",
-            "sha256": "07f9lp7s5lbnpjca84nys2pvsc4bk0mpaw3x2h8i9vickns2mlwp",
-            "rev": "186332dfd3f63ab79b53c4e26b46ef75713b308e"
-        },
-        "recipe": {
-            "sha256": "0pav16kinzljmzx84vfz63fvi39af4628vk1jw79jk0pyg9rjbar",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130309.1005",
-        "deps": []
-    },
-    "offlineimap": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jd",
-            "repo": "offlineimap.el",
-            "sha256": "1bjrgj8klg7ly63vx90jpaih9virn02bhqi16p6z0mw36q1q7ysq",
-            "rev": "cc3e067e6237a1eb7b21c575a41683b1febb47f1"
-        },
-        "recipe": {
-            "sha256": "0nza7lrz7cn06njcblwh9hy3050j8ja4awbxx7jzv6nazjg7201b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150916.658",
-        "deps": []
-    },
-    "pmdm": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/inigoserna/pmdm.el",
-            "sha256": "0x3s9fj41n6a21la762qm1si9ysv3zj5bbp6ykfskr73sxq6s9ff",
-            "rev": "f50a54774156"
-        },
-        "recipe": {
-            "sha256": "1zmy6cbnqhsbwc5vx30mx45xn88d2186hgrl75ws7vvbl197j03b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151109.1236",
-        "deps": []
-    },
-    "es-lib": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sabof",
-            "repo": "es-lib",
-            "sha256": "0jq4yp80wiphlpsc0429rg8n50g8l4lf78q0l3nywz2p93smjy9b",
-            "rev": "753b27363e39c10edc9e4e452bdbbbe4d190df4a"
-        },
-        "recipe": {
-            "sha256": "0mwvgf5385qsp91zsdw75ipif1h90xy277xdmrpwixsxd7abbn0n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141111.1230",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "php-eldoc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sabof",
-            "repo": "php-eldoc",
-            "sha256": "0hm6myvf91f4d2yfc7fs2xky9m8hfnimx1gkfzmn9f5pcc2l2p0i",
-            "rev": "df05064146b884d9081e10657e32dc480f070cfe"
-        },
-        "recipe": {
-            "sha256": "1q5fkl8crqrgxik2mxbkqv10qnqhqrazd66rgfw797s3jcchv58j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140202.1341",
-        "deps": []
-    },
-    "sqlplus": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/sqlplus.el",
-            "sha256": "0xixdddcrzx6k0s8w9rp6q7b9qjpdb4l888gmcis42yvawb1i53d"
-        },
-        "recipe": {
-            "sha256": "1z9pf36b1581flykis9cjv7pynnp94fm4ijzjy6hvqyj81aikxpz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141009.939",
-        "deps": []
-    },
-    "how-many-lines-in-project": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kaihaosw",
-            "repo": "how-many-lines-in-project",
-            "sha256": "0vygbdjy2dv7n50vrkcnqyswq48sgas0zzjfsac8x5g9vhxjkawj",
-            "rev": "8a37ef885d004fe2ce231bfe05ed4867c6192d9b"
-        },
-        "recipe": {
-            "sha256": "145zmfmsxcbmfh9s0mvxxgfh1d51q66396zc29k1c0hw94ffhkdd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140806.2342",
-        "deps": []
-    },
-    "helm-fuzzier": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "EphramPerdition",
-            "repo": "helm-fuzzier",
-            "sha256": "1jns0428jmxrm4w9yk67ffbzmgyjgp1v5ii152y0wsb105ary0xp",
-            "rev": "7e8573de1a639c031056f20c677d13760f2cece0"
-        },
-        "recipe": {
-            "sha256": "0qdgf0phs3iz29zj3qjhdgb3i4xvf5r2vi0709pwxx2s6r13pvcc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151111.838",
-        "deps": [
-            "emacs",
-            "helm"
-        ]
-    },
-    "pt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bling",
-            "repo": "pt.el",
-            "sha256": "0bjs9khpvqcdamvizd0symb5xvb05vacahwdax6nl7bsk1hmzvzk",
-            "rev": "d63d1c2765160683a7b496aa265024fc8e768ae0"
-        },
-        "recipe": {
-            "sha256": "0zmz1hcr4ajc2ydvpdxhy1dlhp7hvlkv6y6w1b79ffvq6acdd5mj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151024.1051",
-        "deps": []
-    },
-    "idle-require": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nschum",
-            "repo": "idle-require.el",
-            "sha256": "0f8rxvc3dk2hi4x524l18fx73xrxy0qqwbybdma4ca67ck9n6xam",
-            "rev": "33592bb098223b4432d7a35a1d65ab83f47c1ec1"
-        },
-        "recipe": {
-            "sha256": "1lr330bqj4rfh2jgn3562sliani4yw5y4j2hr6cq9cfjjp18qgsj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20090715.1703",
-        "deps": []
-    },
-    "save-visited-files": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nflath",
-            "repo": "save-visited-files",
-            "sha256": "00jvl1npc889f3isi7cbdzwvf9x4rq67zgl7br8npxf8jlc2mwhm",
-            "rev": "35f8055a3eb0614721b5b755a3902ba008a4d6fa"
-        },
-        "recipe": {
-            "sha256": "1pmjz27dlp5yrihgsy8q1bwbhkkj3sn7d79ccvljvzxg5jn1grkd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151021.1243",
-        "deps": []
-    },
-    "colonoscopy-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsfodder",
-            "repo": "emacs-colonoscopy-theme",
-            "sha256": "1k3sd07ffgpfhzg7d9mb1gc3n02zsvilxc30bgiycbjrbjgqq0i6",
-            "rev": "7b873d7e7e091b71bf4fdd23ded19e261a1e3936"
-        },
-        "recipe": {
-            "sha256": "0x9bfr4j0sp41jkgnyjlaxnnjjrc102x6sznn6cgcmqk5qhswl4q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141116.101",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "gitignore-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "git-modes",
-            "sha256": "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd",
-            "rev": "9d8f6eda6ee97963e4085da8988cad2c0547b8df"
-        },
-        "recipe": {
-            "sha256": "1i98ribmnxr4hwphd95f9hcfm5wfwgdbcxw3g0w17ws7z0ir61mn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150330.1248",
-        "deps": []
-    },
-    "go-complete": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vibhavp",
-            "repo": "go-complete",
-            "sha256": "0phy24cra8cza89xrqsx9xrwg98v9qwqx0fzgm1gwlf333zb3hha",
-            "rev": "e39efc356f6e19f17db3f3d2c81f28d38b31a55e"
-        },
-        "recipe": {
-            "sha256": "0dl0ibw145f84kd709r5i2kaw07z1sjzn3dmsiqn8dncspcf2vb4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151015.428",
-        "deps": [
-            "cl-lib",
-            "go-mode"
-        ]
-    },
-    "ruby-guard": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cheunghy",
-            "repo": "ruby-guard",
-            "sha256": "034dbz225xxqpi202h4z8zqz3cdfbd8m7vlnh30cb0p8lvgygmj1",
-            "rev": "c0bc5c58ad32e1786001aa5cd84f490096a00a4b"
-        },
-        "recipe": {
-            "sha256": "0hwxhirdvaysw9hxcgfdf0l12wilr6b9f9w91pk1hfwfi1w0lfwr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141218.2114",
-        "deps": []
-    },
-    "dkdo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "davidkeegan",
-            "repo": "dkdo",
-            "sha256": "1nbvdnw9g3zbbb0n2sn2kxfzs5wichhl9qid3qjp8dsiq1wpv459",
-            "rev": "fd6bb105e8331fafb6385c5238c988c4c5bbe2da"
-        },
-        "recipe": {
-            "sha256": "0p7ybgldjs046jrkkbpli1iicfmblpxfz9lql8m8sz7lpjn7h300",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131110.519",
-        "deps": [
-            "dkmisc",
-            "emacs"
-        ]
-    },
-    "occidental-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "olcai",
-            "repo": "occidental-theme",
-            "sha256": "0pnliw02crqw8hbg088klz54z6s1ih8q2lcn9mq5f12xi752hxm8",
-            "rev": "fd2db7256d4f78c43d99c3cddb1c39106d479816"
-        },
-        "recipe": {
-            "sha256": "1ra5p8k96wvb04v69xm87jl4jlgi57v4jw2xxzkwbwxbydncnv0b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130312.1458",
-        "deps": []
-    },
-    "helm-flycheck": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yasuyk",
-            "repo": "helm-flycheck",
-            "sha256": "0k5703nj838qh0h6hzgffjrp0df9rs7psczg4r9mxpi19vqk8ff0",
-            "rev": "361d7f0359cea3dd0bfef1647d65ab61c9e52925"
-        },
-        "recipe": {
-            "sha256": "038f9294qc0jnkzrrjxm97hyhwa4sca3wdsjbaya50cf0g4cmk7b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140915.952",
-        "deps": [
-            "dash",
-            "flycheck",
-            "helm"
-        ]
-    },
-    "mb-depth+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/mb-depth+.el",
-            "sha256": "02dszzkcqa2zwnafxyd6avsjgdrmb6c80j9qx0bgdkwm7yii090q"
-        },
-        "recipe": {
-            "sha256": "031hh227rh7l818p3di4h34i4698yynw5g9a5sl2hj47c0734q6w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1822",
-        "deps": []
-    },
-    "fold-dwim-org": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "fold-dwim-org",
-            "sha256": "14jvbkahwvv4wb0s9vp8gqmlpv1d4269j5rsjxn79q5pawjzslxw",
-            "rev": "c09bb2b46d65afbd1d0febc6fded7495be7a3037"
-        },
-        "recipe": {
-            "sha256": "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131203.751",
-        "deps": [
-            "fold-dwim"
-        ]
-    },
-    "minesweeper": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/zck/minesweeper.el",
-            "sha256": "1b2kn4c90hl07lzdg10wamd4lq8f24wmaj4zvr728pwyga99b2av",
-            "rev": "d29af12fc611"
-        },
-        "recipe": {
-            "sha256": "1n6r3a3rl09pv4jvb7ald1gaipqylfchggza973qv9rgh5g90nag",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150414.22",
-        "deps": []
-    },
-    "fstar-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "FStarLang",
-            "repo": "fstar-mode.el",
-            "sha256": "0qq2gradcibjhn477sljy4lnsmi3pzlac42hpa92c6ca1srh3lc4",
-            "rev": "5e7c3d5a4b5422284d8ef4b69023b1fd71952b81"
-        },
-        "recipe": {
-            "sha256": "0kyzkghdkrnqqbd5b969pjyz9jxgq0j8hkmvlcwikl7ynnhm9lgy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151023.953",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "emacs"
-        ]
-    },
-    "ac-mozc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "igjit",
-            "repo": "ac-mozc",
-            "sha256": "19cb8kq8gmrplkxil22ahvbyq5cng1l2vh2lrfiyqpjsap7zfjz5",
-            "rev": "4c6c8be4701010d9362184437c0f783e0335c631"
-        },
-        "recipe": {
-            "sha256": "1v3iiid8cq50i076q98ycks9m827xzncgxqwqs2rqhab0ncy3h0f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150227.1019",
-        "deps": [
-            "auto-complete",
-            "cl-lib",
-            "mozc"
-        ]
-    },
-    "helm-dirset": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k1LoW",
-            "repo": "helm-dirset",
-            "sha256": "183vj5yi575aqkak19hl8k4mw38r0ki9p1fnpa8nny2srjyy34yb",
-            "rev": "eb30810cd26e1ee73d84a863e6b2667700e9aead"
-        },
-        "recipe": {
-            "sha256": "0vng52axp7r01s00cqbbclbm5bx1qbhmlrx9h9kj7smx1al4daml",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151208.1812",
-        "deps": [
-            "cl-lib",
-            "f",
-            "helm",
-            "s"
-        ]
-    },
-    "logalimacs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "logaling",
-            "repo": "logalimacs",
-            "sha256": "0lj3i9i3mg17xws13gzx8myc6d7djgsj47yx4kaq5hycgkni1p7q",
-            "rev": "8286e39502250fc6c3c6656a7f46a8eee8e9a713"
-        },
-        "recipe": {
-            "sha256": "0ai7a01bdi3a0amgi63pwgdp8wgcgx10an4nhc627wgb1cqxb7p6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131021.1329",
-        "deps": [
-            "popup",
-            "popwin",
-            "stem"
-        ]
-    },
-    "outlined-elisp-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "outlined-elisp-mode",
-            "sha256": "0d9hfr4kb6rkhwacdn70bkfchgam26gj92zfyaqw77a2sgwcmwwv",
-            "rev": "c16cb02b540448919ad148f2be6a41523ee5489c"
-        },
-        "recipe": {
-            "sha256": "165sivmv5h4nvh08ampq95x6b0bkzxgrdjbxjxlq6rv00vaidn7v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131108.527",
-        "deps": []
-    },
-    "achievements": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/gvol/emacs-achievements",
-            "sha256": "0zjncby2884cv8nz2ss7i0p17l15lsk88zwvb7b0gr3apbfpcpa3",
-            "rev": "5b4b7b6816aa"
-        },
-        "recipe": {
-            "sha256": "1pwlibq87ph20z2pssk5hbgs6v8kdym9193jjdx2rxp0nic4k0cr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150530.1326",
-        "deps": [
-            "keyfreq"
-        ]
-    },
-    "company-nixos-options": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "travisbhartwell",
-            "repo": "nix-emacs",
-            "sha256": "0ia9wgn33znaviy7ilfm83yfalc2dbpm1g7nvss5s4rznqkdfhn3",
-            "rev": "6b1418611b49a6cf77380a76f7e6236bbb5df83a"
-        },
-        "recipe": {
-            "sha256": "1yrqqdadmf7qfxpqp8wwb325zjnwwjmn2hhnl7i3j0ckg6hqyqf0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151013.1809",
-        "deps": [
-            "cl-lib",
-            "company",
-            "nixos-options"
-        ]
-    },
-    "mongo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "m2ym",
-            "repo": "mongo-el",
-            "sha256": "0z8mcfhj425hb91fkj1pyg3apw1kf4mgy8lx6n1sc8zmib38py0x",
-            "rev": "595529ddd70ecb9fab8b11daad2c3929941099d6"
-        },
-        "recipe": {
-            "sha256": "103zkslqdihjyl81688fvkq96rzk3an1vf3gz8rlmmz5anbql8ai",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150315.719",
-        "deps": []
-    },
-    "face-remap+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/face-remap+.el",
-            "sha256": "13a439ipxy28l91c9gy6skq54xy2m3hj2qgqdjjqbinnhngg7ffi"
-        },
-        "recipe": {
-            "sha256": "0vq6xjrv3qic89pxzi6mx1s08k4ba27g8wqm1ap4fxh3l14wkg0y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1558",
-        "deps": []
-    },
-    "flymake-json": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-json",
-            "sha256": "1qn15pr7c07fmki484z5xpqyn8546qb5dr9gcp5n1172wnh2a534",
-            "rev": "36084b67830bdc6c226115ea8287ea88d14b05dd"
-        },
-        "recipe": {
-            "sha256": "1p5kajiycpqy2id664bs0fb1mbf73a43qqfdi4c57n6j9x7fxp4d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130424.157",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "sass-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nex3",
-            "repo": "sass-mode",
-            "sha256": "0srz4j7484v5h7hmdlyrcl2k27jhy414689wphbbyj63rvg321cm",
-            "rev": "3da9040680880743fddb55a965ecd150d1039df6"
-        },
-        "recipe": {
-            "sha256": "1byjk5zpzjlyiwkp780c4kh7s9l56y686sxji89wc59d19rp8800",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150508.2212",
-        "deps": [
-            "cl-lib",
-            "haml-mode"
-        ]
-    },
-    "string-edit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "string-edit.el",
-            "sha256": "0nx303bdi8mq18isgf79y8f1cjhqnxv3g3ynm09llrg73qr7r4zw",
-            "rev": "c380e20ca169bd4e7117a99edd5711e673168cbe"
-        },
-        "recipe": {
-            "sha256": "1l1hqsfyi6pp4x4g1rk4s7x9zjc03wfmhy16izia8nkjhzz88fi8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151213.1130",
-        "deps": [
-            "dash"
-        ]
-    },
-    "flycheck-elm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bsermons",
-            "repo": "flycheck-elm",
-            "sha256": "08dlm3g2d8rl53hq0b4z7gp8529almlkyf69d3c8f9didmlhizk7",
-            "rev": "d1395ce80dcad5ed8931b4901471a8980fd3f2b8"
-        },
-        "recipe": {
-            "sha256": "06dpv19wgbw48gbf701c77vw1dkpddx8056wpim3zbvwwfwk8ra4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151204.924",
-        "deps": [
-            "emacs",
-            "flycheck"
-        ]
-    },
-    "showkey": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/showkey.el",
-            "sha256": "0fbpwqjgi15l1mk2p1m9apfj9a50566gi97wkin5hrc8zhm41k5r"
-        },
-        "recipe": {
-            "sha256": "1m280ll07i5c6s4w0s227jygdlpvd87dq45039v0sljyxm4bfrsv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150527.1048",
-        "deps": []
-    },
-    "proc-net": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nicferrier",
-            "repo": "emacs-proc-net",
-            "sha256": "0nly5h0d6w8dc08ifb2fiqcn4cqcn9crkh2wn0jzlz4zd2x75qrb",
-            "rev": "10861112a1f3994c8e6374d6c5bb5d734cfeaf73"
-        },
-        "recipe": {
-            "sha256": "0562x2s3kk9vlaavak4lya1nlmn4mwlzlc7nw1l3687q023z4hmv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130321.1912",
-        "deps": []
-    },
-    "phi-grep": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "phi-grep",
-            "sha256": "1rchxhp4kji5kbg8kzkzdbfy8sdbgbqd5g59cch7ia9agh5jvwyx",
-            "rev": "9f1eb3548311816920864a171de303245a001301"
-        },
-        "recipe": {
-            "sha256": "1y5lq6lq9qdydbypb1pjnxryh94a295nnqqh2x27whiwdiysirjj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150212.924",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "xah-replace-pairs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xahlee",
-            "repo": "xah-replace-pairs",
-            "sha256": "18msj947w6msma6zm23slk2v0h92n5ych5j12zbzkzzir49sffql",
-            "rev": "b80430cd285ba09e2b35d518be0c25ba7db2d0a3"
-        },
-        "recipe": {
-            "sha256": "0r4aq9davh3ypzcjixr3aw9g659dhiblwbmcyhm8iqhkavcpqr1x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150522.533",
-        "deps": []
-    },
-    "sequences": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "timvisher",
-            "repo": "sequences.el",
-            "sha256": "1np6ip28ksms6fig67scwvwj43zgblny50ccvz8aclbl0z8nxswl",
-            "rev": "2bcc54a6738202fffb23e9579b9695337ba6ef26"
-        },
-        "recipe": {
-            "sha256": "12wnkywkmxfk2sx40h90k53d5qmc8hiky5vhlyf0ws3n39zvhplh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130908.1322",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "chronos": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dxknight",
-            "repo": "chronos",
-            "sha256": "1mqdz3rvx0jm80fgzw3s3lqn448kqrlrifdwcg36cqq4qmkpalq4",
-            "rev": "b360d9dae57aa553cf2a14ffa0756a51ad71de09"
-        },
-        "recipe": {
-            "sha256": "1fwpll0mk6pc37qagbq3b3z32d2qwz993nxp9pjw4qbmlnq6sy9d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150602.1029",
-        "deps": []
-    },
-    "flymake-haskell-multi": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-haskell-multi",
-            "sha256": "0hwcgas83wwhk0szwgw7abf70400knb8dfabknwv0qrcsk4gqffd",
-            "rev": "6183620ffee429b33c886fffd6106b876245ea47"
-        },
-        "recipe": {
-            "sha256": "0cyzmmghwkkv6020s6n436lwymi6dr49i7gkci5n0hw5pdywcaij",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130620.622",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "simple-screen": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wachikun",
-            "repo": "simple-screen",
-            "sha256": "0zf9wgyp0n00i00zl1lxr0d60569zgcjdnmdvgpcibvny5s1fp2i",
-            "rev": "4fcbdb4575310c0a2b4dd17fc8aeb4d7e6e9ffae"
-        },
-        "recipe": {
-            "sha256": "16zvsmqn882w320h26hjjz5lcyl9y0x4amkf2zfps77xxmkmi5n0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141023.958",
-        "deps": []
-    },
-    "git-timemachine": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pidu",
-            "repo": "git-timemachine",
-            "sha256": "058ylvq71xap2r2qas8lw2l2fmg2769ahh9zs4dw1mhf9j3rlmzg",
-            "rev": "141122e52a80f28b958a8bad128c480567ce3942"
-        },
-        "recipe": {
-            "sha256": "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151005.29",
-        "deps": []
-    },
-    "evil-search-highlight-persist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "juanjux",
-            "repo": "evil-search-highlight-persist",
-            "sha256": "1jfi2k9dm0cc9bx8klppm965ydhdw17a2n664199vhxrap6g27yk",
-            "rev": "0e2b3d4e3dec5f38ae95f62519eb2736f73c0b85"
-        },
-        "recipe": {
-            "sha256": "0iia136js364iygi1mydyzwvizhic6w5z9pbwmhva4654pq8dzqy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151215.438",
-        "deps": [
-            "highlight"
-        ]
-    },
-    "edn": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "expez",
-            "repo": "edn.el",
-            "sha256": "107ljwqibnd247h4iyav37y75zcgl0j2yav09s38kl3nbxmaad2y",
-            "rev": "501a69696bec2fc09bf5d61e38a3ea344ed77a47"
-        },
-        "recipe": {
-            "sha256": "00cy8axhy2p3zalzl8k2083l5a7s3aswb9qfk9wsmf678m8pqwqg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150929.346",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "emacs",
-            "peg",
-            "s"
-        ]
-    },
-    "register-channel": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "YangZhao11",
-            "repo": "register-channel",
-            "sha256": "01k3v4yiilz1k6drv7b2x6zbjx6dlz7cch8rq63mwc7v8kvdnqmi",
-            "rev": "f62f9a62ebd2537d4a8c8f2e358562c67d2aefc1"
-        },
-        "recipe": {
-            "sha256": "037i2fgxxsfb85vd6xk17wyh7ny6fqfixvb0a18lf8m1hib1gyhr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150513.2259",
-        "deps": []
-    },
-    "isearch-prop": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/isearch-prop.el",
-            "sha256": "190dlmrqk1g7ak5a3p6i97kwxk4lgz8y0kxf9ql75qis3hc4cl09"
-        },
-        "recipe": {
-            "sha256": "1z9y88b23m4ffil8p3wcq61q1fiyqjxphyd3wacs5fnc53mdzad9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151108.1305",
-        "deps": []
-    },
-    "virtualenvwrapper": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "porterjamesj",
-            "repo": "virtualenvwrapper.el",
-            "sha256": "1a0x4dsyavqcl7xibn3g90fxvh1fnb6k0mpjm5mjvzc168p939kc",
-            "rev": "f95094dc7a6e6c0aa6f80fd897dbf380382f35f2"
-        },
-        "recipe": {
-            "sha256": "0rn5vwncx8z69xp8hspr06nzkf28l9flchpb2936c2nalmhx6m8i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151127.821",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "emagician-fix-spell-memory": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jonnay",
-            "repo": "emagicians-starter-kit",
-            "sha256": "00iklf97mszrsdv20q55qhml1dscvmmalpfnlkwi9mabklyq3i6z",
-            "rev": "5fadbf1bf84091b6ffe6cd1bff48f30e3da6c479"
-        },
-        "recipe": {
-            "sha256": "0ffjrpiph21dn8bplklsz3hrsai25l67yyr7n8qjxlwlibwqzv6j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141229.1634",
-        "deps": []
-    },
-    "google-contacts": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jd",
-            "repo": "google-contacts.el",
-            "sha256": "1a3qdjk7mpzxdiwciv6qr56pj4av23s2aslg8pqzirn24xmnfpmj",
-            "rev": "92969f5f02f0ec1957c591b248530c0be0cc5432"
-        },
-        "recipe": {
-            "sha256": "0wgi244zy2am90alimgzazshk2z756bk1hchphssfa4j15n16jgn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140530.433",
-        "deps": [
-            "oauth2"
-        ]
-    },
-    "org-table-comment": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "org-table-comment.el",
-            "sha256": "1qx3kd02sxs9k7adlvdlbmyhkc5kr7ni5lw4gxjw3nphnc536bkb",
-            "rev": "33b9966c33ecbc3e27cca67c2f2cdea04364d74e"
-        },
-        "recipe": {
-            "sha256": "1d40vl8aa1x27z4gwnkzxgrqp7vd3ln2pc445ijjxp1wr8bjxvdz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120209.1251",
-        "deps": []
-    },
-    "govet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "meshelton",
-            "repo": "govet",
-            "sha256": "1fzf43my7qs4n37yh1jm6fyp76dfgknc5g4zin7x5b5lc63g0wxb",
-            "rev": "736f11850f2d1d62bd417fb57d4f8bb55a176b70"
-        },
-        "recipe": {
-            "sha256": "1rpgngixf1xnnqf0l2vvh6y9q3395qyj9ln1rh0xz5lm7d4pq4hy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150428.1359",
-        "deps": []
-    },
-    "c-eldoc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nflath",
-            "repo": "c-eldoc",
-            "sha256": "0mlm5f66541namqn04vx6csf14mxhsiknbm36yqdnp1lxb7knv7a",
-            "rev": "3baef9b6300370bd8db3ea7636084afcdebc6e85"
-        },
-        "recipe": {
-            "sha256": "13grkww14w39y2x6mrbfa9nzljsnl5l7il8dnj6sjdyv0hz9x8vm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150904.332",
-        "deps": []
-    },
-    "toc-org": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "snosov1",
-            "repo": "toc-org",
-            "sha256": "0gzv45yxjy0bkdnx9kki0svmc7gxrdaarblvi1pyvl7id31ssw70",
-            "rev": "72883a08b01d08b74cc03c565eac8d0422770fcf"
-        },
-        "recipe": {
-            "sha256": "06mx2b0zjck82vp3i4bwbqlrzn05i2rkf8080cn34nkizi59wlbs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150921.905",
-        "deps": []
-    },
-    "hl-sexp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsmirror",
-            "repo": "hl-sexp",
-            "sha256": "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw",
-            "rev": "0606100422321c18db51ceda80f25cd7717c2e01"
-        },
-        "recipe": {
-            "sha256": "0kg0m20i9ylphf4w0qcvii8yp65abdl2q5flyphilk0jahwbj9jy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20101130.643",
-        "deps": []
-    },
-    "find-temp-file": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thisirs",
-            "repo": "find-temp-file",
-            "sha256": "0anc6icm1a5d4iirkzzmz8g4z5ssa3hpzgj7gigm3kvvp4r1261d",
-            "rev": "556cc3afbdc3011c99e92e1ab3fe0744bd1af9ba"
-        },
-        "recipe": {
-            "sha256": "0c98zm94958rb9kdvqr3pad744nh63y3vy3lshfm0lsg85k9j62p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150101.801",
-        "deps": []
-    },
-    "avy-migemo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "momomo5717",
-            "repo": "avy-migemo",
-            "sha256": "0c7ss211z0qls26sd9qjpplak58g5zzk3n1h54zsyzyfnwxs0nsj",
-            "rev": "804a02dbd50dcfbdbf327ec800d9f7572e8b9511"
-        },
-        "recipe": {
-            "sha256": "1zvgkhma445gj1zjl8j25prw95bdpjbvfy8yr0r5liay6g2hf296",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151126.808",
-        "deps": [
-            "avy",
-            "emacs",
-            "migemo"
-        ]
-    },
-    "crosshairs": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/crosshairs.el",
-            "sha256": "0m2qggd8q3r32c8ipnp14093p0hbdd7i66nrv3q739wid7j98s8b"
-        },
-        "recipe": {
-            "sha256": "1gf73li6q5rg1dimzihxq0rdxiqzbl2w78r1qzc9mxw3qj7azxqp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1539",
-        "deps": [
-            "col-highlight",
-            "hl-line+",
-            "vline"
-        ]
-    },
-    "osx-browse": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "osx-browse",
-            "sha256": "1iybrhp607a5rb3ynlaf8w2x9wdgdbril702z44dgcg3wxih2zy1",
-            "rev": "44ded7cc3a7ee426c1c3257fae534c121f7e752e"
-        },
-        "recipe": {
-            "sha256": "06rfzq2hxhzg6jh2zs28r7ffxwlq40nz954j13ly8403c7rmbrfm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140508.1541",
-        "deps": [
-            "browse-url-dwim",
-            "string-utils"
-        ]
-    },
-    "sql-indent": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bsvingen",
-            "repo": "sql-indent",
-            "sha256": "17nbcaqx58fq4rz501xcqqcjhmibdlkaavmmzwcfwra7jv8hqljy",
-            "rev": "f85bc91535b64b5d538e5aec2ce4c5e2312ec862"
-        },
-        "recipe": {
-            "sha256": "13s38zdd9j127p6jxbcj4d4va8mkri5dx5zh39g465mnlzx7fp8g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150424.1916",
-        "deps": []
-    },
-    "helm-orgcard": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-jp",
-            "repo": "helm-orgcard",
-            "sha256": "1zyjxrrda7nxxjqczv2p3sfimxy2pq734kf51j6v2y0biclc4bk3",
-            "rev": "9655ac340d1ccc5f3d1c0f7c49be8dd3556d4d0d"
-        },
-        "recipe": {
-            "sha256": "1a56y8fny7qxxidc357n7l3yi7h66hidhvwhkam8y5wk6k61460p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151001.1024",
-        "deps": [
-            "helm-core"
-        ]
-    },
-    "phpcbf": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nishimaki10",
-            "repo": "emacs-phpcbf",
-            "sha256": "09rinyx0621d7613xmbyvrrlav6d4ia332wkgg0m9dn265g3h56z",
-            "rev": "b556b548ceb061b002389d6165d2cc63d8bddb5d"
-        },
-        "recipe": {
-            "sha256": "1hf88ys4grffpqgavrbc72dn3m7crafgid2ygzx9c5j55syh8mfv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150302.728",
-        "deps": [
-            "s"
-        ]
-    },
-    "dispass": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ryuslash",
-            "repo": "dispass.el",
-            "sha256": "075gj81rnhrvv061wnldixpfmlsyfbnvacnk107z6f9v3m2m3vl1",
-            "rev": "b6e8f89040ebaaf0e7609b04bc27a8979f0ae861"
-        },
-        "recipe": {
-            "sha256": "08c1s4zgl4rha10mva48cfkxzrqnpdhy03pxq51ihw94v6vxzg3z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140202.931",
-        "deps": [
-            "dash"
-        ]
-    },
-    "ac-inf-ruby": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "ac-inf-ruby",
-            "sha256": "0xdqk0qr1mmm5q3049ldwlmrcfgz6rzk4yxc8qgz6kll27kciia0",
-            "rev": "3a1e741b40b8dba0e9c235dad4b9907411d9dcd3"
-        },
-        "recipe": {
-            "sha256": "04jclf0yxz78x1fsaf5sh1p466947nqrcx337kyhqn0nkj3hplqr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131115.550",
-        "deps": [
-            "auto-complete",
-            "inf-ruby"
-        ]
-    },
-    "cider-eval-sexp-fu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "clojure-emacs",
-            "repo": "cider-eval-sexp-fu",
-            "sha256": "1gpklkrw6iishfb3yilnqysh6zij67l1sl3ixq1bi3f6r237v1pg",
-            "rev": "7c54327e6ff8914c7dbc9f8de289e1b255d01fbc"
-        },
-        "recipe": {
-            "sha256": "1n4sgv042qd9560pllabysx0c5snly6i22bk126y8f8rn0zj58iq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150320.2215",
-        "deps": [
-            "emacs",
-            "eval-sexp-fu",
-            "highlight"
-        ]
-    },
-    "wn-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "luismbo",
-            "repo": "wn-mode",
-            "sha256": "12rfpkyjkhikjh0mihhp5h5pzbm4br68nwf8k1ja9djl77vfzv36",
-            "rev": "f05c3151523e529af5a0a3fa8c948b61fb369f6e"
-        },
-        "recipe": {
-            "sha256": "1qy1pkfdnm4pska4cnff9cx2c812ilymajhpmsfc9jdbvhzwrwg3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151109.2352",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "professional-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "juanjux",
-            "repo": "emacs-professional-theme",
-            "sha256": "0hx7rxa3smdippcpj4j63k0r5l4wflllb0vpnwwknc9j93r7042b",
-            "rev": "0927d1474049a193f9f366bde5eb1887b9ba20ed"
-        },
-        "recipe": {
-            "sha256": "1l8nisn2c124cpylyahr76hfpdim2125zrns2897p466l5wcxcx5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150315.600",
-        "deps": []
-    },
-    "goto-last-change": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "camdez",
-            "repo": "goto-last-change.el",
-            "sha256": "1f0zlvva7d7iza1v79yjp0bm7vd011q4cy14g1saryll32z115z5",
-            "rev": "58b0928bc255b47aad318cd183a5dce8f62199cc"
-        },
-        "recipe": {
-            "sha256": "1yl9p95ls04bkmf4d6az72pycp27bv7q7wxxzvj8sj97bgwvwajx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150109.1223",
-        "deps": []
-    },
-    "flymake-css": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-css",
-            "sha256": "00cnz3snhs44aknq6wmf19hq9bzb5pj0hvfzz93l6n7ngd8vvpzy",
-            "rev": "4649fc209836498d709bb627e8aa6e50189a06ec"
-        },
-        "recipe": {
-            "sha256": "0kqm3wn9symqc9ivnh11gqgq8ql2bhpqvxfm86d8vwm082hd92c5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121104.1304",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "flycheck-pyflakes": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Wilfred",
-            "repo": "flycheck-pyflakes",
-            "sha256": "16albss527dq4ncpiy8p326fib038qc6wjbh985lw2p1f9babswa",
-            "rev": "026ef070f1589bc0ae8f86a02072fa36e57b9912"
-        },
-        "recipe": {
-            "sha256": "186h5ky48i1xmjbvvhn1i0rzhsy8bgdv1d8f7rlr2z4brb52f9c1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140630.1721",
-        "deps": [
-            "flycheck"
-        ]
-    },
-    "vc-check-status": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thisirs",
-            "repo": "vc-check-status",
-            "sha256": "0rl1q374h06lmspsmgkp44m9x8w93dz6zx2yk89hklfbsvg5pb5j",
-            "rev": "540db724cdd9f517f54fcd9f8c4be3bf274c9333"
-        },
-        "recipe": {
-            "sha256": "1kwnxa0ndfj8b211xy5d47sxkwmsay0kk8q7azfm5ag5dkg56zgi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150330.301",
-        "deps": []
-    },
-    "pbcopy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsfodder",
-            "repo": "pbcopy.el",
-            "sha256": "138w0dlp3msjmr2x09kfcnxwhdldbz9xjfy7l6lig1x9ima0z5w6",
-            "rev": "338f7245746b5de1bb96c5cc2b32bfd9b5d83272"
-        },
-        "recipe": {
-            "sha256": "1989pkhaha6s2rmgyswnzps92x9hhzymjz4ng4a5jda1b9snp60q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150224.2259",
-        "deps": []
-    },
-    "ob-lfe": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zweifisch",
-            "repo": "ob-lfe",
-            "sha256": "1mk7qcf4svf4yk4mimcyhbw5imq3zps2vh2zzq9gwjcn17jnplhn",
-            "rev": "d50a5d76e389501504e060a7005f20b96c895594"
-        },
-        "recipe": {
-            "sha256": "11cpaxk9wb27b9zhyns75dqpds4gh3cbjcvia4p2bnvmbm8lz4y8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150701.855",
-        "deps": [
-            "org"
-        ]
-    },
-    "auto-yasnippet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "auto-yasnippet",
-            "sha256": "14qr8c4i4644vwqvlh5d3xhw1dzmqz3v74hqlp7g8991yaka72va",
-            "rev": "9e126461d4473fb734f7e33dc2019cd71856dc42"
-        },
-        "recipe": {
-            "sha256": "02281gyy07cy72a29fjsixg9byqq3izb9m1jxv98ni8pcy3bpsqa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151218.1031",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "company-try-hard": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Wilfred",
-            "repo": "company-try-hard",
-            "sha256": "18hy60fm3b3dmp29cmzbs6grlihkwifjbzv30gprwj5f6x7m8knf",
-            "rev": "0401e8afa6bd4d3e9d2cf18e58955b83aef93005"
-        },
-        "recipe": {
-            "sha256": "1rwn521dc8kxh43vcd3rf0h8jc53d4gmid3szj2msi0da1sk0mmj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150902.1706",
-        "deps": [
-            "company",
-            "dash",
-            "emacs"
-        ]
-    },
-    "clippy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "clippy.el",
-            "sha256": "0msmigzip7hpjxwkz0khhlc2lj9wgb2919i4k0kv8ppi9j2f9hjc",
-            "rev": "23ba8772056a103267611b3757722730740d9f00"
-        },
-        "recipe": {
-            "sha256": "0nqmc8f2qrsp25vzc66xw6b232n7fyw6g06mwn2cdpm3d2pgb7rg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140417.614",
-        "deps": [
-            "pos-tip"
-        ]
-    },
-    "company-coq": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cpitclaudel",
-            "repo": "company-coq",
-            "sha256": "1np5k6wnhylyi3si2vg4fff5axafixv9qdf3k7l2iislq372nq61",
-            "rev": "eba6fee09a02b42ef581fa757314b6b63a11601f"
-        },
-        "recipe": {
-            "sha256": "1iagm07ckf60kg4i8m4n0gfmv0brqc4dcn7lkcz229r3f4kyqksa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150718.2131",
-        "deps": [
-            "cl-lib",
-            "company",
-            "company-math",
-            "dash",
-            "yasnippet"
-        ]
-    },
-    "emacsql-sqlite": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "emacsql",
-            "sha256": "0ld5qpl7b3iksgxcfysznf88wj019l5271kdz4nalqi4kchf5xad",
-            "rev": "74bd11bc0998d7019a05eecc0486fee09c84a93b"
-        },
-        "recipe": {
-            "sha256": "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151004.915",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "emacsql"
-        ]
-    },
-    "haskell-snippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "haskell",
-            "repo": "haskell-snippets",
-            "sha256": "0b3d7rvqvvcsp51aqfhl0zg9zg8j0p6vlfvga6jp9xc7626vh6f6",
-            "rev": "bcf12cf33a67ddc2f023a55072859e637fe4fa25"
-        },
-        "recipe": {
-            "sha256": "10bvv7q694fahcpm83v8lpqihg1gvfzrp1hdzwiffxydfvdbalh2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150612.1439",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "ycm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "neuromage",
-            "repo": "ycm.el",
-            "sha256": "0znchya89zzk30mwl4qfm0q9sfa5m3jspapb892ydj0mck5n4nyj",
-            "rev": "4da8a14abcd0f4fa3235042ade2e12b5068c0601"
-        },
-        "recipe": {
-            "sha256": "16ahgvi85ddjlrjxld14zm2vvam0m89mwskizjd5clcz0snk51sc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150822.1336",
-        "deps": []
-    },
-    "ldap-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsmirror",
-            "repo": "ldap-mode",
-            "sha256": "03mv2r6k9syr7bk4vmdafmpa8kz19hv5h68ahj2bmdcmwlvwhkf3",
-            "rev": "8761a835e90b990fb5fe70173ecdcd6f4b776cb0"
-        },
-        "recipe": {
-            "sha256": "0lkfpbzsry9jigrx5zp14bkrvqnavnk4y3s0whnbigc4fgpf94rq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20091203.1215",
-        "deps": []
-    },
-    "golint": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "golang",
-            "repo": "lint",
-            "sha256": "16lghkdi0rd7l1fph0a254k6axxivmpmc6grx4ryvza3f4yf7483",
-            "rev": "32a87160691b3c96046c0c678fe57c5bef761456"
-        },
-        "recipe": {
-            "sha256": "1q4y6mgll8wyp0c7zx810nzsm0k4wvz0wkly1fbja9z63sjzzxwb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150414.1930",
-        "deps": []
-    },
-    "typed-clojure-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "typedclojure",
-            "repo": "typed-clojure-mode",
-            "sha256": "1i826xq77nh4s7qlj63r2iznbn319l1l3fzpbjb2nj0m00bwvxl6",
-            "rev": "3abd53d8cc1ad77ffe76e02849d0ab7731fd8364"
-        },
-        "recipe": {
-            "sha256": "1579zkhk2lwl5ij7dm9n2drggs5fmhpljrshc4ghhvig7nlyqjy3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151003.1322",
-        "deps": [
-            "cider",
-            "clojure-mode"
-        ]
-    },
-    "load-theme-buffer-local": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vic",
-            "repo": "color-theme-buffer-local",
-            "sha256": "0gvc9jy34a8wvzwjpmqhshbx2kpk6ckmdrdj5v00iya7c4afnckx",
-            "rev": "ca8470bc34c65a026a6bca1707d95240bfd019af"
-        },
-        "recipe": {
-            "sha256": "13829yrh36qac7gpxanizlk4n7av99ngvv06y6mmi5rq06a4hjx4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120702.1536",
-        "deps": []
-    },
-    "xah-math-input": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xahlee",
-            "repo": "xah-math-input",
-            "sha256": "1j2dca3j71g2g8phzfxjvcwymlr10dq8fbahwslwdhadffjv9m87",
-            "rev": "f0c98d1271b20334c8af2593fd391af23a6e64b4"
-        },
-        "recipe": {
-            "sha256": "1afikjk46sjf97fb5fc8h63h7b9af010wxhsbpnmabsb4j72rx5a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151225.1358",
-        "deps": []
-    },
-    "vim-region": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ongaeshi",
-            "repo": "emacs-vim-region",
-            "sha256": "13g2hin100c8h5bd7hzhyqzj02ab9c35giyv963l7y044v7sbwig",
-            "rev": "7c4a99ce3678fee40c83ab88e8ad075d2a935fdf"
-        },
-        "recipe": {
-            "sha256": "1dcnx799lpjsdnnjxqzgskkfj2nx7f4kwf0xjhbg35ny4nyn81dx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140329.1124",
-        "deps": [
-            "expand-region"
-        ]
-    },
-    "hideshowvis": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/hideshowvis.el",
-            "sha256": "15ax1j3j7kylyc8a91ja825sp4mhbdgx0j4i5kqxwhvmwvpmyrv6"
-        },
-        "recipe": {
-            "sha256": "1ajr71fch3v5g8brb83kwmlakcam5w21i3yr8df00c5j2pnc6v1f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130824.700",
-        "deps": []
-    },
-    "tumble": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "febuiles",
-            "repo": "tumble",
-            "sha256": "1klqqk0kn60c4ircgwh6hhdhhfqq7s3d7hw3xf62s7lp6r6yw5lc",
-            "rev": "8d04216752ad94c343ffa507016b893f8252602f"
-        },
-        "recipe": {
-            "sha256": "1c9ybq0mb2a0pw15fmm13vfwcnr2h9fb1xsm5nrff1cg7913pgv9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151123.1349",
-        "deps": [
-            "http-post-simple"
-        ]
-    },
-    "evil-tabs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "krisajenkins",
-            "repo": "evil-tabs",
-            "sha256": "1rjpgcl9m23fzlw9gfp0yyf5k5dcgn88pjm8glmmdpx1b08ymk79",
-            "rev": "93eba393e86ea4574aebaf4edbd27dce4fd7b2e6"
-        },
-        "recipe": {
-            "sha256": "0qgvpv5hcai8wmkv2fp6i2vdy7qp4gwidwpzz8j6vl9519x73s62",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150127.1546",
-        "deps": [
-            "elscreen",
-            "evil"
-        ]
-    },
-    "solidity-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ethereum",
-            "repo": "emacs-solidity",
-            "sha256": "0drb237750lry18arbfx37drf16znwz8fhx5fawxy1q4z7bl7z5n",
-            "rev": "8bbd7d9e1e823b524d882d996b5c4e7b6a523b41"
-        },
-        "recipe": {
-            "sha256": "1qdzdivrf5yaa80p61b9r1gryw112v5l2m2jkvkc7glhkhrcvwsx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151124.1111",
-        "deps": []
-    },
-    "ac-math": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vitoshka",
-            "repo": "ac-math",
-            "sha256": "0p5cdaw9v8jgnmjqpb95bxy4khwbdgg19wzg8jkr2j2p55dpfbd6",
-            "rev": "c012a8f620a48cb18db7d78995035d65eae28f11"
-        },
-        "recipe": {
-            "sha256": "1gx35m0wv60cfgm87y2c7vrpwdsqjzk9bz4pp9dbs8dhxvji0ay4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141116.1527",
-        "deps": [
-            "auto-complete",
-            "math-symbol-lists"
-        ]
-    },
-    "flex-autopair": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "uk-ar",
-            "repo": "flex-autopair",
-            "sha256": "187ah7yhmr3ckw23bf4fivx8v79yj0zmilrkjj7k6l198w8wmvql",
-            "rev": "4bb757f2556a4a51828e2fed8fb81e31e83052cb"
-        },
-        "recipe": {
-            "sha256": "0hphrqwryp3c0wwyf2f16hj8nc7jlg2dkvljgm2rdvmh2kgj3007",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120809.718",
-        "deps": []
-    },
-    "company-ghci": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "juiko",
-            "repo": "company-ghci",
-            "sha256": "112nkvkjrk41yc75mc0mnzm0jy0j6wafmdm0pbhrdar12wj8y014",
-            "rev": "c62617770a457c53d1d49621d4e71a2c36de2f82"
-        },
-        "recipe": {
-            "sha256": "0h9hqfb8fm90h87bi3myl84nppbbminhnvv6jqg62qi9k6snn1iq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151206.1250",
-        "deps": [
-            "company",
-            "haskell-mode"
-        ]
-    },
-    "aurel": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alezost",
-            "repo": "aurel",
-            "sha256": "0z0wq79ks8251fflk2iwrhd885h5qbki2m19f0jy4a8c00ydmxyz",
-            "rev": "bcabf49c1410b89d592d8aa78f896428c492879a"
-        },
-        "recipe": {
-            "sha256": "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151219.2340",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "ob-typescript": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lurdan",
-            "repo": "ob-typescript",
-            "sha256": "1ycqdjqn5361pcnc95hxhjqd3y96cjjnaylrnzwhmacl38jm3vai",
-            "rev": "9dcbd226cbfb75e790dd9de91d9401dde85a889a"
-        },
-        "recipe": {
-            "sha256": "1wpy928ndvc076jzi14f6k5fsw8had0pz7f1yjdqql4icszhqa0p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150804.730",
-        "deps": [
-            "emacs",
-            "org"
-        ]
-    },
-    "anaconda-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "proofit404",
-            "repo": "anaconda-mode",
-            "sha256": "01a9l785chmcf6d7fsyc72gapapb4gddgqmpps705zpkhjm8f6wj",
-            "rev": "e8f6d910993ac1ecaa41b07abc4cdc9e76e66fb8"
-        },
-        "recipe": {
-            "sha256": "0gz16aam4zrm3s9ms13h4qcdflf55506kgkpyncq3bi54cvv8n1r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150922.737",
-        "deps": [
-            "dash",
-            "emacs",
-            "f",
-            "pythonic",
-            "s"
-        ]
-    },
-    "js2-closure": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jart",
-            "repo": "js2-closure",
-            "sha256": "0105vx7bc681q9v2x6wj2r63pwp7g0cjjgpg7k4r852zmndfbzsc",
-            "rev": "8e81e90ee0b923b9d053c339e4b328ecc7693998"
-        },
-        "recipe": {
-            "sha256": "19732bf98lk2ah2ssgkr1ngxx7rz3nhsiw84lsfmydb0vvm4fpk7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141027.1750",
-        "deps": [
-            "js2-mode"
-        ]
-    },
-    "drag-stuff": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "drag-stuff",
-            "sha256": "08kkiqhfy1i6j9156gbl85jvyj592vd08qy24ng2dj0prjvap8w1",
-            "rev": "0d7e28bf234037380dbcb24b9175b96ae34ef8fb"
-        },
-        "recipe": {
-            "sha256": "0hzbh58ijv1akamav8r0zs76pwda2zd9mjaj31ffalzhhsm5jnyc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150717.732",
-        "deps": []
-    },
-    "epic": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yoshinari-nomura",
-            "repo": "epic",
-            "sha256": "18gfi1287skv5xvh12arkvxy2c4fism8bdk42wc5q3y21h8nsiim",
-            "rev": "02f6472bb490a39d42ed49c0364972173202f6e1"
-        },
-        "recipe": {
-            "sha256": "0gfl8if83jbs0icz6gcjkwxvcz5v744k1kvqnbx3ga481kds9rqf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150503.237",
-        "deps": [
-            "htmlize"
-        ]
-    },
-    "dsvn": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/",
-            "sha256": "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq",
-            "rev": "1721816"
-        },
-        "recipe": {
-            "sha256": "12cviq6v08anif762a5qav3l8ircp81kmnl9q4yl6bkh9zxv7vy6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130120.1457",
-        "deps": []
-    },
-    "clocker": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "roman",
-            "repo": "clocker.el",
-            "sha256": "0hw6i92k651p71am578p02lqp1dj9pic880n6x4z0ydz4xyjhmfw",
-            "rev": "9cb1440ca1fa4f82597f8b053c7f8e44f4682229"
-        },
-        "recipe": {
-            "sha256": "0cckrk40k1labiqjh7ghzpx5zi136xz70j3ipp117x52qf24k10k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150505.1043",
-        "deps": [
-            "dash",
-            "projectile"
-        ]
-    },
-    "ujelly-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "marktran",
-            "repo": "color-theme-ujelly",
-            "sha256": "0cryprvns1qdnp2qif2g187lj15810w472m7nwrfiwgvqv4v3p1l",
-            "rev": "ff4b9fb4a9469cd807ed712e05cf739a1a900218"
-        },
-        "recipe": {
-            "sha256": "0b7zgmpsdn5p3jx4kif7phxz8pb85snmmfr3yz98xf6p7h6w60gw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150807.2336",
-        "deps": []
-    },
-    "hl-spotlight": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/hl-spotlight.el",
-            "sha256": "1mvcvd8401w0xw8kjq6rwmmqa41npgdxgpghf4nxl6rghza77nwh"
-        },
-        "recipe": {
-            "sha256": "1166g27fp2pj4j3a8904pzvp5idlq4l22i0w6lbk5c9zh5pqyyf3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1624",
-        "deps": []
-    },
-    "quick-buffer-switch": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "renard",
-            "repo": "quick-buffer-switch",
-            "sha256": "0kh63nzdzwxksn2ar2i1ds7n96jga2dhhc9gg27p1g2ca66fs6h5",
-            "rev": "d5fdd67b4c9f04b7a7122da2215e4ae076a03b1b"
-        },
-        "recipe": {
-            "sha256": "1fsnha3x3pgq582libb3dmxb93aagv1avnc0rigpfd7hv6bagj40",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151007.1708",
-        "deps": []
-    },
-    "jump-char": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lewang",
-            "repo": "jump-char",
-            "sha256": "0vpla6lyr30fyq9gi7g9zmnhysbm077m0qgi7w3axppfbxdvg67q",
-            "rev": "b6011a1cb501c0242d11103bbee4d9138fcc765f"
-        },
-        "recipe": {
-            "sha256": "0l8zvfwpngkgcxl1a36jwwxdh23hi390mikz7xrq63w5zwm0007n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150108.1435",
-        "deps": []
-    },
-    "e2wm-svg-clock": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "e2wm-svg-clock.el",
-            "sha256": "0h1fnlpvy2mqfxjv64znghmiadh9qimj9q9a60cxhyc0bq0prz6f",
-            "rev": "d425925e3afffcbe2ff74edc80b714e4319d4c94"
-        },
-        "recipe": {
-            "sha256": "0q02lksrbn43s8d9rzpglqybalglpi6qi9lix0cllag6i7fzcbms",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150106.706",
-        "deps": [
-            "e2wm",
-            "svg-clock"
-        ]
-    },
-    "instapaper": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/jfm/emacs-instapaper",
-            "sha256": "0krscid3yz2b7kv75gd9fs92zgfl7pnl77dbp5gycv5rmw5mivp8",
-            "rev": "8daa0058ede7"
-        },
-        "recipe": {
-            "sha256": "1yibdpj3lx6vr33s75s1y415lxqljrk7pqc901f8nfa01kca7axn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130104.821",
-        "deps": []
-    },
-    "tracking": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jorgenschaefer",
-            "repo": "circe",
-            "sha256": "1l6lm3i02r0b8ng0n3rckgk0q38wjng41dqbx148bjxfq44cpghz",
-            "rev": "c9862e432d2dad7cd568d79dbe49849245333fb1"
-        },
-        "recipe": {
-            "sha256": "096h5bl7jcwz5hpbm2139bf8a784hijfy40vzf42y1c9794al46z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151129.519",
-        "deps": []
-    },
-    "findr": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/findr.el",
-            "sha256": "0a04mgya59w468jv2bmkqlayzgh0r8sdz0qg3n70wn9rhdcwnl9q"
-        },
-        "recipe": {
-            "sha256": "0pxyfnn3f70gknxv09mfkjixqkzn77rdbql703wsslrj2v1l7bfq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130824.707",
-        "deps": []
-    },
-    "helm-chrome": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kawabata",
-            "repo": "helm-chrome",
-            "sha256": "0wkskm0d1mvh49l65xg6pgwd7yxy02llflkzx59ayqv4wjvsyayb",
-            "rev": "4591cc760d3e721094c70b913b91138776f0e52e"
-        },
-        "recipe": {
-            "sha256": "0p3n2pna83mp4ym8x69lk4r3q4apbj5v2blg2mwcsd9zij153nxz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151222.1958",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "helm"
-        ]
-    },
-    "chruby": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "plexus",
-            "repo": "chruby.el",
-            "sha256": "0gx0bd7j71rlniq64vw8k59yzl070mdia05ry18br8kpsbk3bhrl",
-            "rev": "0b210f5bb8c38dbe4581e660055cf9bac93304d0"
-        },
-        "recipe": {
-            "sha256": "0pk6vdvmifiq52n452lbrkklxa69c40bfyzra9qhrghxr2q5v3mk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151204.630",
-        "deps": []
-    },
-    "whitaker": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "whitaker",
-            "sha256": "1y75cylvqgn54h8yqahz4wi1qj5yhbs66i7x23jmbmah3q0rycab",
-            "rev": "eaf26ea647b729ca705b73ea70312d5ffdf89448"
-        },
-        "recipe": {
-            "sha256": "17fnvb3jh6fi4wddn5qnp6i6ndidg8jf9ac69q9j032c2msr07nj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150814.622",
-        "deps": [
-            "dash"
-        ]
-    },
-    "company": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "company-mode",
-            "repo": "company-mode",
-            "sha256": "0nd0zxzgaxwncbrrs2cql9kiya8s6kjjq0gls58qgq2vd9mwrrgg",
-            "rev": "900ae0d7a2270ea1d2ea00567e80a619333fd4e5"
-        },
-        "recipe": {
-            "sha256": "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151225.2110",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "twilight-bright-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jimeh",
-            "repo": "twilight-bright-theme.el",
-            "sha256": "1awqc4rvg8693myynb1d4y4dfdaxkd5blnixxs3mdv81l07zyn8c",
-            "rev": "322157cb2f3bf7920ecd209dafc31bc1c7959f49"
-        },
-        "recipe": {
-            "sha256": "074cqs55gwy5jlaay3m9bpdpdfb45nmlijvapz96nibl64pyk83d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130605.343",
-        "deps": []
-    },
-    "macro-math": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nschum",
-            "repo": "macro-math.el",
-            "sha256": "119c77s3qp1vqc5m2yf7m4s81aphkhsvsnwqmpq6xl08r3592zxz",
-            "rev": "216e59371e9ee39c34117ba79b9acd78bb415750"
-        },
-        "recipe": {
-            "sha256": "1r7splwq5kdrdhbmw5zn81vxymsrllgil48g8dl0r60293384h00",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130328.1104",
-        "deps": []
-    },
-    "elscreen-mew": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "masutaka",
-            "repo": "elscreen-mew",
-            "sha256": "091dxsb73bhqmrddwnmvblmfpwa7v7fa0ha18daxc8j0lrhzdhlh",
-            "rev": "f66a2a5a8dd904791ede5133fdd183522b061bba"
-        },
-        "recipe": {
-            "sha256": "06g4wcfjs036nn64ac0zsvr08cfmak2hyj83y7a0r35yxr1853w4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140629.1016",
-        "deps": [
-            "elscreen"
-        ]
-    },
-    "helm-backup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "antham",
-            "repo": "helm-backup",
-            "sha256": "0d6h4gbb69abxxgm85pdi5rsaf9h72yryg72ykd5633i1g4s8a76",
-            "rev": "184026b9fe454aab8e7730106b4ca494fe307769"
-        },
-        "recipe": {
-            "sha256": "182jbm36yzayxi9y3vhpyn25ivrgay37sncqvah35vbw52lnjcn3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151213.1247",
-        "deps": [
-            "cl-lib",
-            "helm",
-            "s"
-        ]
-    },
-    "cedit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "cedit",
-            "sha256": "1f8gdj3p54q3410c66716y3l7i7nnkmq6hqz0dg1a1sc6jwdij3v",
-            "rev": "0878d851b6307c162bfbddd2bb02789e5e27bc2c"
-        },
-        "recipe": {
-            "sha256": "169sy7a1bgczwfxkkzjiggb7vdjxhrx7i3a39g6zv9f1zs6byk6m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141231.1014",
-        "deps": []
-    },
-    "dired-sort-menu": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/dired-sort-menu.el",
-            "sha256": "1i42r7j1c8677qf79ig33bia24d2yvcj26y92migfvrlbi03w4qi"
-        },
-        "recipe": {
-            "sha256": "0n7zh8s3vdw3pcax8wkas9rykf917wn2dzikdlyrl5bbil9ijblb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130824.707",
-        "deps": []
-    },
-    "rinari": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "eschulte",
-            "repo": "rinari",
-            "sha256": "1kg83z10jw4ik0aapv9cjqlvqy31rln2am8vh3f77zh61qha37hx",
-            "rev": "be07b0f42aefa24c5d36c441d1f3f72e64fffaa4"
-        },
-        "recipe": {
-            "sha256": "0qknicg3vzl7zbkwsdvp10hrvlng6mbi8hgslx4ir522dflrf9p0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150709.140",
-        "deps": [
-            "inf-ruby",
-            "jump",
-            "ruby-compilation",
-            "ruby-mode"
-        ]
-    },
-    "irony-eldoc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ikirill",
-            "repo": "irony-eldoc",
-            "sha256": "01fjpfixfcca01a5fnnpd2wga4j30p0kwhbai25prvib4qcp1kqn",
-            "rev": "bd1fadbc7c806d84aeec098b19238e5328cbbb7b"
-        },
-        "recipe": {
-            "sha256": "03m0h13jd37vfvn4mavaq3vbzx4x0lklbs0mbc29zaz8pwqlcwz6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141227.19",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "irony"
-        ]
-    },
-    "bm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joodland",
-            "repo": "bm",
-            "sha256": "1ggqg0lgvxg2adq91damvh55m36qsa23n3z6zyf5z6855ilzaa4x",
-            "rev": "b91f87c8f78d2430edc376830d5ba15f45d28637"
-        },
-        "recipe": {
-            "sha256": "07459r7m12j2nsb7qrb26bx32alylhaaq3z448n42lz02a8dc63g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151222.1803",
-        "deps": []
-    },
-    "ox-textile": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yashi",
-            "repo": "org-textile",
-            "sha256": "1r9c4s9f7cvxxzf9h07rg75bil0295zq1inh5i4r6za5jabkr4dg",
-            "rev": "0dfca070e35bc6f4a412319e2474bb88666c8c2d"
-        },
-        "recipe": {
-            "sha256": "01kri7vh16xhy8x5qd6s5z08xr0q964rk6xrligdb3i6x78wfvi4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151114.2225",
-        "deps": [
-            "org"
-        ]
-    },
-    "helm-prosjekt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abingham",
-            "repo": "prosjekt",
-            "sha256": "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3",
-            "rev": "a864a8be5842223043702395f311e3350c28e9db"
-        },
-        "recipe": {
-            "sha256": "019rya3bf13cnval8iz680wby3sqlmqg4nbn0a13l1pkhlnv9fvm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140129.117",
-        "deps": [
-            "helm",
-            "prosjekt"
-        ]
-    },
-    "ucs-utils": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "ucs-utils",
-            "sha256": "0qw9vwl1p0pjw1xmshxar1a8kn6gmin5rdvvnnly8b5z9hpkjf3m",
-            "rev": "cbfd42f822bf5717934fa2d92060e6e24a813433"
-        },
-        "recipe": {
-            "sha256": "111fwg2cqqzpa79rcqxidppb12c8g12zszppph2ydfvkgkryb6z2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150826.914",
-        "deps": [
-            "list-utils",
-            "pcache",
-            "persistent-soft"
-        ]
-    },
-    "ids-edit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kawabata",
-            "repo": "ids-edit",
-            "sha256": "1k7h1795kaczmhd21hzqgns7blqc6zjh2xg4w3rj986ll8lb9fpr",
-            "rev": "f40495ecd434c6b39d52cadfed25098f08ce78cb"
-        },
-        "recipe": {
-            "sha256": "0jzmcynr6lvsr36nblqzrjwxawyqcdz972zsv4rqkihdydpqfz7m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151128.635",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "string-utils": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "string-utils",
-            "sha256": "1frdspm1qgksa8cpx5gkj50xk9mgz8202pgp11lqir6l3yjcj3wq",
-            "rev": "c2232d691617973ecf12a970c6008a161c21da14"
-        },
-        "recipe": {
-            "sha256": "1vsvxc06fd3wardldb83i5hjfibvmiqnxvcgdns7i5i8qlsrsx4v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140508.1541",
-        "deps": [
-            "list-utils"
-        ]
-    },
-    "nose": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/durin42/nosemacs",
-            "sha256": "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm",
-            "rev": "194d7789bf79"
-        },
-        "recipe": {
-            "sha256": "0l77hsmn3qk934ppdav1gy9sq48g0v1dzc5qy0rp9vv4yz2jx2jk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140520.1148",
-        "deps": []
-    },
-    "egison-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "egisatoshi",
-            "repo": "egison3",
-            "sha256": "0sz506yx59gjkphyi3fp07i8h0mkm7gr73xfbjdhn29dss0xl7x0",
-            "rev": "dbb8773f8a47655f3b5311e0a87f63c7b39f60db"
-        },
-        "recipe": {
-            "sha256": "0x11fhv8kkx34h831k2q70y5qfz7wnfia4ka5mbmps7mpr68zcwi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150827.2329",
-        "deps": []
-    },
-    "hy-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hylang",
-            "repo": "hy-mode",
-            "sha256": "16z43mpj839bzafhyzpcbw6bmv4ckrf9ryslvg6z6q4g93k64q2m",
-            "rev": "af0d848b069ca0cda3ed177d37d94de117f7ffec"
-        },
-        "recipe": {
-            "sha256": "1vxrqla3p82x7s3kn7x4h33vcdfms21srxgxzidr02k37f0vi82m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151025.743",
-        "deps": []
-    },
-    "shader-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "midnightSuyama",
-            "repo": "shader-mode",
-            "sha256": "0l094nrrvan8v6j1xdgb51cbjvwicvxih29b7iyga13adb9dy9j4",
-            "rev": "5d5fcbc614f8d7e9226730dd587faf14115b0e6f"
-        },
-        "recipe": {
-            "sha256": "12y84fa1wc82js53rpadaysmbshhqf6wb97889qkksx19n3xmb9g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151030.904",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "elscreen-separate-buffer-list": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wamei",
-            "repo": "elscreen-separate-buffer-list",
-            "sha256": "1w34nnl4zalxzmyfbc81qd82m7qp3zvz608dx6hfi44pjz0dp36f",
-            "rev": "1aa66cdbf2b1dc87689725aef004a29bb79dd0f9"
-        },
-        "recipe": {
-            "sha256": "1d8kc137cd8i3wglir1rlvk7w8mrdhd3xvcihi2f2f2g5nh2n5jk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150522.145",
-        "deps": [
-            "elscreen",
-            "emacs"
-        ]
-    },
-    "helm-cider-history": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Kungi",
-            "repo": "helm-cider-history",
-            "sha256": "18j4ikb3q8ygdq74zqzm83wgb39x7w209n3186mm051n8lfmkaif",
-            "rev": "c391fcb2e162a02001605a0b9449783575a831fd"
-        },
-        "recipe": {
-            "sha256": "12l8jyl743zqk8m2xzcz75y1ybdkbkvcbvfkn1k88k09s31kdq4h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150719.1620",
-        "deps": [
-            "cider",
-            "helm"
-        ]
-    },
-    "ido-occur": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "danil",
-            "repo": "ido-occur",
-            "sha256": "1xv8bryinn9qhjjxaxci4jnmz87jdm4nnhghl5lbpy7vzbhij490",
-            "rev": "13dc79ac2bb148b9fcbb470509a06ad1cb7008bb"
-        },
-        "recipe": {
-            "sha256": "058l2pklg12wkvyyshk8va6shphpbc508fv9a8x25pw857a28pji",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150928.1643",
-        "deps": [
-            "dash",
-            "ido-vertical-mode"
-        ]
-    },
-    "cus-edit+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/cus-edit+.el",
-            "sha256": "0qqfxnsy124nk61iqgb8rjwziyj6h4nvx0gdpsj03z1zh7gqms9s"
-        },
-        "recipe": {
-            "sha256": "1kazcdfajcnrzvhsgsmwwx96rkry0dglprrc02hbd7ky1fppp4sz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150814.949",
-        "deps": []
-    },
-    "outshine": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tj64",
-            "repo": "outshine",
-            "sha256": "0g6h5ifmzxvwgyi7qrkkmr8s28kpq8xhmv7rkr3gphqrh5hyppl8",
-            "rev": "d1847614727a060e01d1d2f33b414a1b49d3e85b"
-        },
-        "recipe": {
-            "sha256": "1i8c3q6n9hpfbpg2f8n8brwgaq36af1jn3g5js88yiyyb5dknxq4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151203.1002",
-        "deps": [
-            "cl-lib",
-            "outorg"
-        ]
-    },
-    "ack-menu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chumpage",
-            "repo": "ack-menu",
-            "sha256": "02ba4d8qkvgy52g0zcbyfvsnhr9685gq569nkwa2as30xdcq3khm",
-            "rev": "f77be93a4697926ecf3195a355eb69580f695f4d"
-        },
-        "recipe": {
-            "sha256": "1d2kw04ndxji2qjcm1b65qnxpp08zx8gbia8bl6x6mnjb2isc2d9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150504.1522",
-        "deps": [
-            "mag-menu"
-        ]
-    },
-    "golden-ratio": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "roman",
-            "repo": "golden-ratio.el",
-            "sha256": "0wdw89n7ngxpcdigv8c01h4i84hsdh0y7xq6jdj1i6mnajl8gk92",
-            "rev": "72b028808b41d23fa3f7e8c0d23d2c475e7b46ae"
-        },
-        "recipe": {
-            "sha256": "15fkrv0sgpzmnw2h4fp2gb83d8s42khkfq1h76l241njjayk1f81",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150819.620",
-        "deps": []
-    },
-    "evil-mark-replace": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "redguardtoo",
-            "repo": "evil-mark-replace",
-            "sha256": "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv",
-            "rev": "56cf191724a3e82239ca47a17b071c20aedb0617"
-        },
-        "recipe": {
-            "sha256": "03cq43vlv1b53w4kw7mjvk026i8rzhhryfb27ddn6ipgc6xh68a0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150424.218",
-        "deps": [
-            "evil"
-        ]
-    },
-    "dark-krystal-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsfodder",
-            "repo": "emacs-dark-krystal-theme",
-            "sha256": "07w5aycgaps904q8lk52d0g28wxq41c82xgl5mw2q56n3s5iixfx",
-            "rev": "bcb3c4ccf17db541e319d60e2eca38a5b22d5664"
-        },
-        "recipe": {
-            "sha256": "056aql35502sgvdpbgphpqdxzbjf4ay01rra6pm11c1dya8avv0j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141116.101",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "helm-hoogle": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jwiegley",
-            "repo": "haskell-config",
-            "sha256": "052hzybign54qawdm1fflsaz4bcwflycksv6wb1nw1jv79s2qbap",
-            "rev": "8e4e28c3852376510861f64f00009a63b8ec0c7d"
-        },
-        "recipe": {
-            "sha256": "0672mqm0c261mknbgc3a4pahq27gw2pfklflxl1y4ykbs6q7vcyw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150919.421",
-        "deps": [
-            "emacs",
-            "helm"
-        ]
-    },
-    "kixtart-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ryrun",
-            "repo": "kixtart-mode",
-            "sha256": "1ld3ccg8q7hmjrj60rxvmmfy4dpm2lvlshjqdf9ifgjzp221g4vb",
-            "rev": "1c2356797e7b766bbaaa2b341176a8b10499cd79"
-        },
-        "recipe": {
-            "sha256": "079bw4lgxbmk65rrfyy8givs8j5wsyhpcjjw915ifkg577gj87qp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150611.1104",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "helm-ag": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-helm-ag",
-            "sha256": "19ymwdi9ld1myl66a4xsy32ysni8wb5qi80yh5l7v0bmgp6ybdqq",
-            "rev": "679ce0cc4a36cc377fa9f438705c3c8be9a944f3"
-        },
-        "recipe": {
-            "sha256": "023zvgmi5b5b2qga3jqd7jrq9ap8n3rhvl6jrv9fsi565sg1fv43",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151222.335",
-        "deps": [
-            "cl-lib",
-            "helm"
-        ]
-    },
-    "direx-grep": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "direx-grep",
-            "sha256": "0swdh0qynpijsv6a2d308i42hfa0jwqsnmf4sm8vrhaf3vv25f5h",
-            "rev": "1109a512a80b2673a70b18b8568514049017faad"
-        },
-        "recipe": {
-            "sha256": "0y2wrzq06prm55akwgaqjg56znknyvbayav13asirqzg258skvm2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140515.1006",
-        "deps": [
-            "direx"
-        ]
-    },
-    "muttrc-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/muttrc-mode.el",
-            "sha256": "1xihp3zdqs9054j3bfrd9wnahsvvxjk1ags1iy50ncv5850ppjis"
-        },
-        "recipe": {
-            "sha256": "0ym6rfrhrmpnlqhkxv9ck5893qm0yhswslvgc9vb4nl9hyc1b5jn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20090804.1752",
-        "deps": []
-    },
-    "cycle-resize": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pierre-lecocq",
-            "repo": "cycle-resize",
-            "sha256": "0hf3r89n9zn7wkay71drxadsnd9zm6p6kvg5mvwzdy3x3z4cfyi3",
-            "rev": "1a5ed3ff6f7f5dc097c38b4361708b6882af692c"
-        },
-        "recipe": {
-            "sha256": "0vp57plwqx4nf3pbv5g4frjriq8niiia9xc3bv6c3gzd4a0zm7xi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150602.1423",
-        "deps": []
-    },
-    "cmds-menu": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/cmds-menu.el",
-            "sha256": "1dfnvvdlyb8jlrj6zkmry075vmax77kyjnk5mjsfz2wwyk5lsfb5"
-        },
-        "recipe": {
-            "sha256": "12s75y9d75cxqgg3hj0s4w0d10zy8y230b5gy09685ab5lcajfks",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1534",
-        "deps": []
-    },
-    "centimacro": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "centimacro",
-            "sha256": "0zqrpaq9c3lm12jxnvysh8f3m3193k22zaj0ycscdqd1jpq4wcgh",
-            "rev": "1b97a9b558ed9c49d5da1bfbf29b2506575c2742"
-        },
-        "recipe": {
-            "sha256": "1qbyfi6s4hdp5sv394w3sib8g2kx06i06q8gh6hdv5pis5kq9fx6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140306.827",
-        "deps": []
-    },
-    "cmake-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Kitware",
-            "repo": "CMake",
-            "sha256": "1imzpf467rkmgsifbycc81jqvkpwhdi1ngr39h9i3z2j7nx7f023",
-            "rev": "1d73f6525c523661e51173829b327acf9de9dfc4"
-        },
-        "recipe": {
-            "sha256": "0zbn8syb5lw5xp1qcy3qcl75zfiyik30xvqyl38gdqddm9h7qmz7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151012.926",
-        "deps": []
-    },
-    "eyedropper": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/eyedropper.el",
-            "sha256": "1bs8239sv3mjyj2dw72wrl7yp1ds7gs3cs4a9ds7hlzzz7qw9s6s"
-        },
-        "recipe": {
-            "sha256": "07kdn90vm2nbdprw9hwdgi4py6gqzmrad09y1fwqdy49hrvbwdzk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150509.1545",
-        "deps": [
-            "hexrgb"
-        ]
-    },
-    "smart-forward": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "smart-forward.el",
-            "sha256": "19l47xqzjhhm9j3izik0imssip5ygg3lnflb9ixsz1js571aaxha",
-            "rev": "7b6dbfdbd4b646376a567c70e1a161545431b72b"
-        },
-        "recipe": {
-            "sha256": "032yc45c19fl886jmi5q04r6q47xz5rphb040wjvpd4fnb06hr8c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140430.213",
-        "deps": [
-            "expand-region"
-        ]
-    },
-    "majapahit-theme": {
-        "fetch": {
-            "tag": "fetchFromGitLab",
-            "owner": "franksn",
-            "repo": "majapahit-theme",
-            "sha256": "0bn2qllfv0iwssdc17g2vhmkk7i9iygh7wji6nbksv0ssgxbfvc0",
-            "rev": "3b753a972f716a10f6a4ed1f596ceea348d6b489"
-        },
-        "recipe": {
-            "sha256": "04k2smrya27rrjlzvnl3a6llg8vj8x4mm9qyk4kwrmckhd6jd68s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151219.2232",
-        "deps": []
-    },
-    "interleave": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rudolfochrist",
-            "repo": "interleave",
-            "sha256": "13bsszx4rsq3awg6zgzfdwgflkldw38nihkc9nldfixzvw1gdqqv",
-            "rev": "4b8ce53ee8ca075029ce88d203735256a875e516"
-        },
-        "recipe": {
-            "sha256": "18b3fpxn07y5abkcnaw9is9ihdhik7xjdj6kzl1pz958lk9f4hfy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151120.835",
-        "deps": []
-    },
-    "workgroups2": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pashinin",
-            "repo": "workgroups2",
-            "sha256": "0prj2b33h6rya7y9ff91r72bva1y6hg0sv9l11bn1gikmc6lc18n",
-            "rev": "928d509157ec8a4a2e343b6115dff034c3243a7a"
-        },
-        "recipe": {
-            "sha256": "0vhj6mb3iflli0l3rjlvlbxz5yk6z3ii5r71gx0m4vp4lhxncy3v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141102.1322",
-        "deps": [
-            "anaphora",
-            "cl-lib",
-            "dash",
-            "f"
-        ]
-    },
-    "eyebrowse": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wasamasa",
-            "repo": "eyebrowse",
-            "sha256": "0jc5wv2hkc89yh5ypa324xlfqdna20msr63g30njxq4g2vd0iqa7",
-            "rev": "6d75409a81a6447765ad2171e3d0b5a272e1f207"
-        },
-        "recipe": {
-            "sha256": "09fkzm8z8nkr4s9fbmfcjc80h50051f48v6n14l76xicglr5p861",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151213.816",
-        "deps": [
-            "dash",
-            "emacs"
-        ]
-    },
-    "ido-occasional": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "ido-occasional",
-            "sha256": "0zlkq29wxd3a4vg0w6ds2jad5h1pja7ccd3l6ppl0kz1b1517qlr",
-            "rev": "d405f1795e1e0c63be411ee2825184738d29c33a"
-        },
-        "recipe": {
-            "sha256": "1vdh5i9qznzd9r148a6jw9v47swf7ykwyciqfzc3ismv5q909bl2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150214.648",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "extempore-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "extemporelang",
-            "repo": "extempore-emacs-mode",
-            "sha256": "0nry653cd3qzsj6asrf9hh4zkzhz8nnwjrg1wp17f5ggzpjyybjw",
-            "rev": "a08be9f0cec32c2818f93a6f7633c14fc2013e61"
-        },
-        "recipe": {
-            "sha256": "1z8nzpcj27s74kxfjz7wyr3848jpd6mbyjkssd06ri5p694j9php",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151225.51",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "oauth": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "psanford",
-            "repo": "emacs-oauth",
-            "sha256": "058dyk1c3iw0ip8n8rfpskvqiriqilpclkzc18x73msp5svrh3lj",
-            "rev": "ee4744ad76a1560281b0c4944575a3bd598c6458"
-        },
-        "recipe": {
-            "sha256": "18z3i5brxm60z373cwx2sa3hx7v38a5s62gbs9b0lxb20ah4p9rz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130127.1951",
-        "deps": []
-    },
-    "delight": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/delight.el",
-            "sha256": "1gap2icsqi7cryfvcffh41zqg2ghl4y7kg9pngzdfjrc3m7sf635"
-        },
-        "recipe": {
-            "sha256": "1d9m5k18k73vhidwd50mcbq7mlvwdn4sb9ih8r5gri9a9whi2nkj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141128.837",
-        "deps": []
-    },
-    "apropospriate-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "waymondo",
-            "repo": "apropospriate-theme",
-            "sha256": "1jw6am5c8szrrlff1qfh0hpyi5p5nqnhs8kywl5s4bpj1gxgq8dh",
-            "rev": "fdd70f890c2fd25882de011c1327ddab143937ce"
-        },
-        "recipe": {
-            "sha256": "10bj2bsi7b104m686z8mgvbh493liidsvivxfvfxzbndc8wyjsw9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151224.956",
-        "deps": []
-    },
-    "speech-tagger": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cosmicexplorer",
-            "repo": "speech-tagger",
-            "sha256": "03vvv8s5l3218231hm7l6bkl990b0ypc8n72lda1zxk6kjyr1q25",
-            "rev": "10135e324630d25ae8c16f052cf4d97bda592164"
-        },
-        "recipe": {
-            "sha256": "0sqil949ny9qjxq7kpb4zmjd7770r0qvq4sz80agw6a27mqnaajc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150903.2",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "dokuwiki-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kbkbkbkb1",
-            "repo": "emacs-dokuwiki-mode",
-            "sha256": "104nnvp2mhsm9iwnya6k9s6mlgcg47ndshppnz0hbh556pcdyagr",
-            "rev": "e0cecc9551f490318e7a23ed9e0a3082c7196bc7"
-        },
-        "recipe": {
-            "sha256": "0q5ybyj35dyh8k0nfvbglsq3ad2apc8cdijw4wqczc5180fckgy9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140130.1136",
-        "deps": []
-    },
-    "wakatime-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wakatime",
-            "repo": "wakatime-mode",
-            "sha256": "1bcdvk5bg5yi0qq0wd3w9wl38s0brrafz52bzsracj3wffswjg1n",
-            "rev": "883f969c1502994b55912c6ade7155220e3c2cea"
-        },
-        "recipe": {
-            "sha256": "1rhy2bwkqlha4bj3zmb0iassiglch7yb2kbas0bbpl3d0hdki2i8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151117.1830",
-        "deps": []
-    },
-    "evil-vimish-fold": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alexmurray",
-            "repo": "evil-vimish-fold",
-            "sha256": "0m4ipz3x5k3gbyjgsnhl6rr4jvhqn61cyc1gmv0mkc2pbqqs1ijq",
-            "rev": "d187a685d9610ec8159040c90030cb8ada4f54a5"
-        },
-        "recipe": {
-            "sha256": "01wp4h97hjyzbpd7iighjj26m79499wp5pn8m4pa7v59f6r3sdk6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151006.2326",
-        "deps": [
-            "emacs",
-            "evil",
-            "vimish-fold"
-        ]
-    },
-    "try": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "larstvei",
-            "repo": "Try",
-            "sha256": "05nzchk7jia9g7b3ww4m3rgg0aylrfkpiz13cylv2bk79rwhzifc",
-            "rev": "464cfb73599c88a4b57c83adfa93173c41d28a35"
-        },
-        "recipe": {
-            "sha256": "0dv0i77agva215bf1gj1x1k7f7g3pvccyyd7vslapf9z8brccn7n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150608.411",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "whole-line-or-region": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "whole-line-or-region",
-            "sha256": "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d",
-            "rev": "a60e022b30c2f4d3118bcaef1adb77b90e0ca941"
-        },
-        "recipe": {
-            "sha256": "1vs2i4cy1zc6nj660i9h36jbfgc3kvqivjnzlq5zwlxk5hcibqa1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20110901.330",
-        "deps": []
-    },
-    "flymake-elixir": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syl20bnr",
-            "repo": "flymake-elixir",
-            "sha256": "04w6g4wixrpfidxbk2bwazhvf0cx3c2v2mxnycqqlqkg0m0sb0fn",
-            "rev": "3810566cffe35d04cc3f01e27fe397d68d52f802"
-        },
-        "recipe": {
-            "sha256": "15r3m58hnc75l3j02xdr8yg25fbn2sbz1295ac44widzis82m792",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130810.917",
-        "deps": []
-    },
-    "flatui-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "john2x",
-            "repo": "flatui-theme.el",
-            "sha256": "0j8pklgd2sk01glgkr24b5n5521425vws8zwdi4sxcv74922j5zr",
-            "rev": "80d1967ea73c10aa8aa10620c2b343010e9ce5b9"
-        },
-        "recipe": {
-            "sha256": "0s88xihw44ks4b07wcb9swr52f3l1ls0jn629mxvfkv4a6hn7rmz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150531.343",
-        "deps": []
-    },
-    "seti-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "caisah",
-            "repo": "seti-theme",
-            "sha256": "18igxblmrbxwhd2d68cz1bpj4524djh2dw2rwhxlij76f9v805wn",
-            "rev": "f2f472af00f251f8cdced29faadbb3380d3c7ff1"
-        },
-        "recipe": {
-            "sha256": "1mwkx3hynabwr0a2rm1bh91h7xf38a11h1fb6ys8s3mnr68csd9z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150314.322",
-        "deps": []
-    },
-    "git-link": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sshaw",
-            "repo": "git-link",
-            "sha256": "1la3zzcjnmzgxkd4ljr9b5335ddbrvid47kfzp2s358xknzmbsdf",
-            "rev": "00a8ed924d837d43bfdc486ab389ee400b6c2a8f"
-        },
-        "recipe": {
-            "sha256": "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150927.1225",
-        "deps": []
-    },
-    "evil-nerd-commenter": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "redguardtoo",
-            "repo": "evil-nerd-commenter",
-            "sha256": "1c8zh5vykl4v57jrxcpyrbd1ih6nv306sfmb6ihiak6ncvllp8cx",
-            "rev": "770981cffd7e8d967e6291c738534a04bcd7f753"
-        },
-        "recipe": {
-            "sha256": "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151213.625",
-        "deps": []
-    },
-    "aes": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Sauermann",
-            "repo": "emacs-aes",
-            "sha256": "0jlqk3kn2920b0dfmwy511x83hkmclb646qws3im0p75qcnyr4s1",
-            "rev": "61d0da553ad980e5b9079444aed8214a28b409d9"
-        },
-        "recipe": {
-            "sha256": "11vl9x3ldrv7q7rd29xk4xmlvfxs0m6iys84f6mlgf00190l5r5v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151211.1603",
-        "deps": []
-    },
-    "vcl-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ssm",
-            "repo": "vcl-mode",
-            "sha256": "1jfis26lmghl30ydzq1xdkrrj3d85q7g44ns6kmfg119ccapllbj",
-            "rev": "9f315654ec2ab13e5a14b752cac57dc832bef893"
-        },
-        "recipe": {
-            "sha256": "1h0a1briinp9ka7ga3ipdhyf7yfinwvf7babv36myi720900wcq5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151213.1323",
-        "deps": []
-    },
-    "orgit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "orgit",
-            "sha256": "0d7rh5bi5v04njj1nh8q8kdr6aw68lcw4ghx6kwq97aff4qmcrp1",
-            "rev": "731c5cb4f1c7e2ee5b819ca159c0c01e2b306c73"
-        },
-        "recipe": {
-            "sha256": "0askccb3h98v8gmylwxaph3gbyv5b1sp4slws76aqz1kq9x0jy7w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151008.1614",
-        "deps": [
-            "dash",
-            "emacs",
-            "magit",
-            "org"
-        ]
-    },
-    "jump-to-line": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ongaeshi",
-            "repo": "jump-to-line",
-            "sha256": "1s9plmg323m1p625xqnks0yqz0zlsjacdj7pv8f783r0d9jmfq3s",
-            "rev": "01ef8c3529d85e6c59cc20840acbc4a8e8325bc8"
-        },
-        "recipe": {
-            "sha256": "09ifhsggl5mrb6l8nqnl38yph0v26v30y98ic8hl23i455hqkkdr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130122.1053",
-        "deps": []
-    },
-    "browse-at-remote": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rmuslimov",
-            "repo": "browse-at-remote",
-            "sha256": "0q71ah62q6acivhxzsw9j1ky54i9hhlnj97sjn8bxrxx7nw01gf7",
-            "rev": "d7e155e9ea7acfc9dadd334fe41ac57e93f38674"
-        },
-        "recipe": {
-            "sha256": "1d40b9j3pc6iy3l25062k7f52aq0vk9sizdwd7wii3v5nciczv6w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.1628",
-        "deps": [
-            "cl-lib",
-            "f",
-            "s"
-        ]
-    },
-    "pkg-info": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lunaryorn",
-            "repo": "pkg-info.el",
-            "sha256": "1xkdbyhz9mgdz5zmjm4hh050klsl12w5lkckw2l77ihcxv0vjnf2",
-            "rev": "4dbe328c9eced79e0004e3fdcd7bfb997a928be5"
-        },
-        "recipe": {
-            "sha256": "0whcvralk76mfmvbvwn57va5dkb1irj7iwffgddi7r0ima49iszx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150517.643",
-        "deps": [
-            "epl"
-        ]
-    },
-    "dollaro": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "laynor",
-            "repo": "dollaro",
-            "sha256": "1xyqsnymgdd8ic3az2lgwv7s7vld6d4pcycb234bxm4in9fixgdj",
-            "rev": "500127f0172ac7a1eec627e026b59136580a74ac"
-        },
-        "recipe": {
-            "sha256": "06kaqzb0nh8sndhk7p5n4acn5nc27dyxw3ldgcbp81wj6ipii26h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151123.702",
-        "deps": [
-            "s"
-        ]
-    },
-    "rustfmt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fbergroth",
-            "repo": "emacs-rustfmt",
-            "sha256": "0i2r14ifpqjcxcflhl38iayk53920vl616y770lwf77zvhnxrmm9",
-            "rev": "b54e77b2287bfc558c0b4dbfa8908b4face48320"
-        },
-        "recipe": {
-            "sha256": "1znav2pbax0rsvdl85mmbgbmxy7gnrm4nx54ij1ff6yd831r5jyl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151124.1311",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "helm-css-scss": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ShingoFukuyama",
-            "repo": "helm-css-scss",
-            "sha256": "01a3pahpsxb7d15dkfgxypl7gzqb4dy4f36lmid1w77b9rhs6nph",
-            "rev": "ab8348aa98e0daa2f1b771e35bdb06bfacbe5016"
-        },
-        "recipe": {
-            "sha256": "0iflwl0rijbkx1b7i1s7984dw7sz1wa1cb74fqij0kcn76kal7ak",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140626.1925",
-        "deps": [
-            "emacs",
-            "helm"
-        ]
-    },
-    "flycheck-protobuf": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "edvorg",
-            "repo": "flycheck-protobuf",
-            "sha256": "0dq4ikqskkpcl3z4s5vl6h4f4bx4dsgyn2knlr3x4wjcgzyrv0qn",
-            "rev": "2f0ab48b1b2e8f6c4b86ce876598f9ac9868d1da"
-        },
-        "recipe": {
-            "sha256": "0cn5b9pr9i9hrix7dbrylwb2812al8ipbpqvlb9bm2f8hc9kgsmc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150731.512",
-        "deps": [
-            "protobuf-mode"
-        ]
-    },
-    "evil-space": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "linktohack",
-            "repo": "evil-space",
-            "sha256": "1x4nphjq8lvg8qsm1pj04mk9n59xc6jlxiv5s3bih1nl4xkssrxy",
-            "rev": "a9c07284d308425deee134c9d88a2d538dd229e6"
-        },
-        "recipe": {
-            "sha256": "1asvh873r1xgffvz3nr653yn8h5ifaphnafp6wf1b1mja6as7f23",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151208.628",
-        "deps": [
-            "evil"
-        ]
-    },
-    "ipretty": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "steckerhalter",
-            "repo": "ipretty",
-            "sha256": "0skyd9c7pz68v17aj3h47ralszbmc4gqg552q8jpimcjd1lacc7l",
-            "rev": "6f6da8907abea53d6d246d61e1a0f4ebeb0b9f38"
-        },
-        "recipe": {
-            "sha256": "1zysip6cb8s4nzsxiwk052gq6higz2xnd376r9wxmgj7w8him2c4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140407.20",
-        "deps": []
-    },
-    "wcheck-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tlikonen",
-            "repo": "wcheck-mode",
-            "sha256": "15ghfb6bpd1lcxaf04fcr9n62pjcbl65g4mgdhig8yawnwh0x05v",
-            "rev": "6f5e9faabb04f9e7c6698b90487ebe5913a13aed"
-        },
-        "recipe": {
-            "sha256": "0cmdvhgax6r5svn3wkwll4j271qj70g8182c58riwnkhiajxmn3k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151203.1205",
-        "deps": []
-    },
-    "overseer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tonini",
-            "repo": "overseer.el",
-            "sha256": "1bfj56ackza8c1jja660v6ss9ii7prcaim5plnfqsv3k149r8qlh",
-            "rev": "db27cbbb10fb9b072d638a1b345102b42b20a37d"
-        },
-        "recipe": {
-            "sha256": "04wfwcal051jrnmm5dga6vl4c9j10pm416586yxb8smi6fxws2jg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150801.1202",
-        "deps": [
-            "dash",
-            "emacs",
-            "pkg-info"
-        ]
-    },
-    "pp-c-l": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/pp-c-l.el",
-            "sha256": "0czz6qakz55776ji5472clvw13y32k3jvq8w5k9rdlmyxnc2vafd"
-        },
-        "recipe": {
-            "sha256": "0gbqxlrsh9lcdkrj8bqh1mpxyhdlwbaxz4ndp5s90inmisaqb83v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1839",
-        "deps": []
-    },
-    "win-switch": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "genovese",
-            "repo": "win-switch",
-            "sha256": "0ib20zl8l1fs69ca9rry27qz69sgf6ws1ca5nhm5llvpkjcgv53i",
-            "rev": "a0da96c23e8775a2dfdbe55ed3ec5b57f1ebb26a"
-        },
-        "recipe": {
-            "sha256": "1s6inp5kf763rngn58r02fd7n7z3dd55j6hb7s9dgvc856d5z3my",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150208.2111",
-        "deps": []
-    },
-    "nrepl-sync": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "phillord",
-            "repo": "lein-sync",
-            "sha256": "1129r3rzmfbl8nxjz71xnlyaszhhldawj467zbl36brdadp014n1",
-            "rev": "bab53a2361526d63a24cda176d07a1247bf5b399"
-        },
-        "recipe": {
-            "sha256": "01b504b4d8rrhlf3sfq3kk9i222fch6jd5jbm02kqw20fgv6q3jd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140807.1054",
-        "deps": [
-            "cider"
-        ]
-    },
-    "smtpmail-multi": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vapniks",
-            "repo": "smtpmail-multi",
-            "sha256": "0rhpnijp72jsl4gzhwz0z387f55vv3fp0zwki0fi5jlkzjamnnqg",
-            "rev": "21885f6f7ec46facb64fafc2caa2be01caa4b6db"
-        },
-        "recipe": {
-            "sha256": "0nc3k8ly4nx7fm3b2apga3p4svz5c9sldnlk86pz2lzra5h3b4ss",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130921.2242",
-        "deps": []
-    },
-    "gitty": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jorgenschaefer",
-            "repo": "gitty",
-            "sha256": "0y8msn22lzfwh7d417abay9by2zhs9zswhcj8a0l7ln2ksljl500",
-            "rev": "c7c3d622d59531d023b9184d2479316c28045ca2"
-        },
-        "recipe": {
-            "sha256": "1z6w4vbn0aaajyqanc7h1m5ali7dbrnh4ngw87a2x2pkxarx6x16",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151121.148",
-        "deps": []
-    },
-    "dmenu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lujun9972",
-            "repo": "el-dmenu",
-            "sha256": "0spj80vq6m2kqbdy6y1vh9fzwqyqkij30457d2n39kjn2gzbyar8",
-            "rev": "b9be62dc33b59fdd34b449699801c1772af84284"
-        },
-        "recipe": {
-            "sha256": "1w1pgaj2yasfhsd1ibvrwy11ykq8v17h913g298h3ycsvqv8gic0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151220.702",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "stem": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yuutayamada",
-            "repo": "stem",
-            "sha256": "1xc4v8a35c2vpfhza15j4f89x7vyg9bbgm7xnprij7814k8iy7p0",
-            "rev": "d74e6611d6ba5025e0276a2cc7c8a90f46bfa9ac"
-        },
-        "recipe": {
-            "sha256": "1625nbi2bmb7vzjz0s7y1cy7dp8lp83dayiib3nr2bfkv76fwkcq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131102.609",
-        "deps": []
-    },
-    "erefactor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-erefactor",
-            "sha256": "17i567nfm0rykimh6bpcc5f2l7wsf8zcdy2jzd7sgrl54dvb0g9i",
-            "rev": "fde3fd42c815c76e8015f69518a92f6bfcfde990"
-        },
-        "recipe": {
-            "sha256": "0ma9sbrq4n8y5w7vvbhhgmw25aiykbq5yhxzm0knj32bgpviprw7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150620.1943",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "mwe-log-commands": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsmirror",
-            "repo": "mwe-log-commands",
-            "sha256": "0qdlbyq47gr65yq5ri8s9lxw4wp9fmyqc2prkh560d4hkvw60aw3",
-            "rev": "8253f2a311f35b03f72a035744f0cbdd776ea17e"
-        },
-        "recipe": {
-            "sha256": "05z2ax9mgyxldd3ds44xnh9f5w5q4ziy4rxmnfiqjykan2f5hnkn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20100703.741",
-        "deps": []
-    },
-    "livescript-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yhisamatsu",
-            "repo": "livescript-mode",
-            "sha256": "0kqjz0i0zapyhh8z57cvc8ifiizngix3ca01mjnvyq3zxg1bqrsg",
-            "rev": "90a918d9686e256e6d4d439cc20f24dad8d3b804"
-        },
-        "recipe": {
-            "sha256": "1fdfhp39zr2mhy5rd6mwqv5fwd8xaypdqig7v3ksv77m5zq7cmmj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140612.2321",
-        "deps": []
-    },
-    "identica-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gabrielsaldana",
-            "repo": "Emacs-Identica-mode",
-            "sha256": "047gzycr49cs8wlmm9j4ry7b7jxmfhmbayx6rbbxs49lba8dgwlk",
-            "rev": "cf9183ee11ac922e85c7c908f04e2d00b03111b3"
-        },
-        "recipe": {
-            "sha256": "1r69ylykjap305g23cry4wajiqhpgw08nw3b5d9i1y3mwx0j253q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130204.1653",
-        "deps": []
-    },
-    "org-ehtml": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "eschulte",
-            "repo": "org-ehtml",
-            "sha256": "0kqvwqmwnwg2h7r38fpjg6qlkcj9v8011df8nmsgs1w1mfdvnjsq",
-            "rev": "9df85de1a0fe1e7b2d6c000777c1a0c0217f92d0"
-        },
-        "recipe": {
-            "sha256": "0n82fbd7aircqg2c9m138qfv8csrv0amhya3xlwswdkqn51vn3gw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150506.1858",
-        "deps": [
-            "emacs",
-            "web-server"
-        ]
-    },
-    "mentor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skangas",
-            "repo": "mentor",
-            "sha256": "11hyydc13jdai6lkxx8nqf8xljh0gx7fcmywhik4f1hf3pdv7i2q",
-            "rev": "f5d653348140cdab1d8ee9143b14a50ea88ed3fb"
-        },
-        "recipe": {
-            "sha256": "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140904.1910",
-        "deps": [
-            "xml-rpc"
-        ]
-    },
-    "etags-table": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/etags-table.el",
-            "sha256": "0apm8as606bbkpa7i1hkwcbajzsmsyxn6cwfk9dkkll5bh4vglqf"
-        },
-        "recipe": {
-            "sha256": "1jzij9jknab42jmx358g7f1c0d8lsp9baxbk3xsy7w4nl0l53d84",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130824.657",
-        "deps": []
-    },
-    "dtrt-indent": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jscheid",
-            "repo": "dtrt-indent",
-            "sha256": "0x8c3h3jvyn2462r0sagz63vv9pr5ivfzkshr69603ibyfgqxxkp",
-            "rev": "7f212888fbacc262080ab2740eda673b376c6b7b"
-        },
-        "recipe": {
-            "sha256": "1npn2jngy1wq0jpwmg1hkn8lx6ncbqsi587jl38lyp2xwchshfk5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151013.414",
-        "deps": []
-    },
-    "bracketed-paste": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hchbaw",
-            "repo": "bracketed-paste.el",
-            "sha256": "00463z740xrkr4yz46g9zxz23zy878jgvba81pnwvg4l6hd3kc8s",
-            "rev": "6c2aee346e2f5cdb4ed1386c3e3c853cecd72eff"
-        },
-        "recipe": {
-            "sha256": "1v7zwi29as0218vy6ch21iqqcxfhyh373m3dbcdzm2pb8bpcg58j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140222.2001",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "ac-alchemist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-ac-alchemist",
-            "sha256": "19msfx3f3px1maj41bzh139s6sv2pjk9vm3bphn7758fqhzyin0f",
-            "rev": "b1891c3d41aed83f61d78a609ea97be5cc2758d9"
-        },
-        "recipe": {
-            "sha256": "02ll3hcixgdb8zyszn78714gy1h2q0vkhpbnwap9302mr2racwl0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150908.156",
-        "deps": [
-            "alchemist",
-            "auto-complete",
-            "cl-lib"
-        ]
-    },
-    "jvm-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "martintrojer",
-            "repo": "jvm-mode.el",
-            "sha256": "0k91cdjlpil8npc4d3zsgx2gk41crl7qgm9r85khcgxs59kmkniw",
-            "rev": "3355dbaf5b0185aadfbad24160399abb32c5bea0"
-        },
-        "recipe": {
-            "sha256": "1r283b4s0pzq4hgwcz5cnhlvdvq4gy0x51g3vp0762s8qx969a5w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150422.208",
-        "deps": [
-            "dash",
-            "emacs"
-        ]
-    },
-    "replace-symbol": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bmastenbrook",
-            "repo": "replace-symbol-el",
-            "sha256": "0ks884jhxqkr8j38r9m4s56krm2gpkm0v5d51zzivcfhs30s6nff",
-            "rev": "6af93ad5a23790c90595c92bf2dcb69cd6d5f820"
-        },
-        "recipe": {
-            "sha256": "07ljmw6aw9hsqffhwmiq2pvhry27acg6f4vgxgi91vjr8jj3r4ng",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151030.1857",
-        "deps": []
-    },
-    "which-key": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "justbur",
-            "repo": "emacs-which-key",
-            "sha256": "0d722q5g05q0kbxlbv0iacv7d7r9dvk15g3i4i66v2p6knd7zqpx",
-            "rev": "f4a1b4283bf09475e5255a889a34784501ad2fc0"
-        },
-        "recipe": {
-            "sha256": "0vqbhfzcv9m58w41zdhpiymhgl38n15c6d7ffd99narxlkckcj59",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151221.1112",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "myanmar-input-methods": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yelinkyaw",
-            "repo": "emacs-myanmar-input-methods",
-            "sha256": "0177q8hm51bcvb4i46rwnimngvy9y32p3as19zwmfbznp2sc5963",
-            "rev": "601f5342ee2fd01263f6e04579d90cc22ad623f7"
-        },
-        "recipe": {
-            "sha256": "1yg8zy2z18pbyr507ms2b162c0819rna1ilwyp6hb3iv2zjw45sd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150806.707",
-        "deps": []
-    },
-    "spaces": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chumpage",
-            "repo": "chumpy-windows",
-            "sha256": "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs",
-            "rev": "164be41b588b615864258c502583100d3ccfe13e"
-        },
-        "recipe": {
-            "sha256": "152x7fzjnjjdk9d9h0hbixdp3haqn5vdx3bq1nfqfrkvzychyr06",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130610.249",
-        "deps": []
-    },
-    "esxml": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tali713",
-            "repo": "esxml",
-            "sha256": "0mrfkq3jcsjfccqir02yijl24hllc347b02y7gk3b2yn0b676dv3",
-            "rev": "ca09423c3172820ba97dcc68204911d06f55f851"
-        },
-        "recipe": {
-            "sha256": "0nn074abkxz7p4w59l1za586p5ya392xhl3sx92yys8a3194n6hz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151013.1328",
-        "deps": [
-            "kv"
-        ]
-    },
-    "iss-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rasmus-toftdahl-olesen",
-            "repo": "iss-mode",
-            "sha256": "0992lzgar0kz9i1sk5vz17q9qzfgl8fkyxa1q0hmhgnpjf503cnj",
-            "rev": "3b517aff31529bab33f8d7b562bd17aff0107fd1"
-        },
-        "recipe": {
-            "sha256": "1my4vi1x07hg0dva97i685lx6m6fcbfk16j1zy93zriyd7z5plkc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141001.1413",
-        "deps": []
-    },
-    "dpaste": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gregnewman",
-            "repo": "dpaste.el",
-            "sha256": "11s4vxr6waswyx4lz3q70s8xdz0v7354sn0pfwj42mmww4pzkizs",
-            "rev": "d073030e6b7feae84f0e2118e5fc454833848629"
-        },
-        "recipe": {
-            "sha256": "17mrdkldv4gfwm6ggc047l4a69xg2fy9f9mjbphkjl0p5nr6b4kz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150528.800",
-        "deps": []
-    },
-    "python-cell": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thisch",
-            "repo": "python-cell.el",
-            "sha256": "1cnjdgw3x6yb5k06z57xifywlg0kdx9ai4f1ajc0wx9aax8r5gav",
-            "rev": "ccacd91a19be784860d687eb1e8ce88fddaacaf6"
-        },
-        "recipe": {
-            "sha256": "07i3vyci52jvslq28djwkgx1r157wvxd99rvqlxnmmsl5yj4k1jf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131029.1816",
-        "deps": []
-    },
-    "japanese-holidays": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-jp",
-            "repo": "japanese-holidays",
-            "sha256": "1mwm9wpnxqq3nw7fl0jf40a92ha51yd95vvr58zllhbxdpy3q9pv",
-            "rev": "3c82e33a942e495bbfdf3f40d965dafc87b51336"
-        },
-        "recipe": {
-            "sha256": "0pxpkikkn2ys0kgf3lbrdxv8iym50h5ik2xzza0qk7cw1v93jza9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150208.1937",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "pyimpsort": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-pe",
-            "repo": "pyimpsort.el",
-            "sha256": "003hd5igv152yr4fa47n2l5jhwvdlfhw7bap1dkm1i7i898i6yds",
-            "rev": "e90d1b09e35356e3eed890fe38875bc7216d0f4e"
-        },
-        "recipe": {
-            "sha256": "0kdk3bmryfzvwf8vshfszbih8mwncf4xlb0n0n0yjn0p1n98q99k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150927.1317",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "fwb-cmds": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "fwb-cmds",
-            "sha256": "08qnyr945938hwjg1ypkf2x4mfxbh3bbf1xrgz1rk2ddrfv7hmkm",
-            "rev": "93504c2022799a84cc14d598e1413f8d9df4ee0e"
-        },
-        "recipe": {
-            "sha256": "0wnjvi0v0l2h1mhwlsk2d8ggwh3nk7pks48l55gp18nmj00jxycx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131209.1800",
-        "deps": []
-    },
-    "thread-dump": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nd",
-            "repo": "thread-dump.el",
-            "sha256": "0rjcrvw9v2y10ahycra53bwbccpwqxxwn2c21wjj1kfs0kdwhs9p",
-            "rev": "1cee07775ac8c13bb52217be6c383562c617542b"
-        },
-        "recipe": {
-            "sha256": "0dzr86jyf2j49gq40q6qd6lppa57n65n94xzpdjjbs182hxzavp2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130323.1225",
-        "deps": []
-    },
-    "highlight-stages": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "highlight-stages",
-            "sha256": "0gnr1dqkcmc9gfzqjaixh76g1kq7xp20mg1h6vl3c4na7nk6a3fg",
-            "rev": "c5a01b29cf79cebd09da863d45f9f35f6ad3bd06"
-        },
-        "recipe": {
-            "sha256": "0r4kmjmrpi38q3y0q9h5xkxh7x728ha2nbnc152lzw6zfsxnm4x4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150421.2257",
-        "deps": []
-    },
-    "notmuch-labeler": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DamienCassou",
-            "repo": "notmuch-labeler",
-            "sha256": "1ss87vlp7625lnn2iah3rc1xfxcbpx4kmiww9n16jx073fs2rj18",
-            "rev": "d65d1129555d368243df4770ecc1e7ccb88efc58"
-        },
-        "recipe": {
-            "sha256": "1c0cbkk5k8ps01xl63a0xa2adkqaj0znw8qs8ca4ai8v1420bpl0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131230.1119",
-        "deps": [
-            "notmuch"
-        ]
-    },
-    "arjen-grey-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "credmp",
-            "repo": "arjen-grey-theme",
-            "sha256": "1i6y3kv2vii6f8gpd845vv6h832hqx0vxb3fmb1x80kwx3gda682",
-            "rev": "d67a1da021269cb1aeb25ff1aa56249d67371266"
-        },
-        "recipe": {
-            "sha256": "18q66f7hhys2ab9ljsdp9013mp7d6v6d1lrb0d1bb035r1b4pfj7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150731.845",
-        "deps": []
-    },
-    "phi-search": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "phi-search",
-            "sha256": "10kyq3lkhmbmj1hl9awzc0w8073dn9mbjd5skh660ljg5mmi6x62",
-            "rev": "40b86bfe9ae15377fbee842b1de3d93c2eb7dd69"
-        },
-        "recipe": {
-            "sha256": "0nj06ixl76dd80zg83q4bi8k224mcwb612mr4gd1xppj5k8xl03g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150807.312",
-        "deps": []
-    },
-    "helm-c-yasnippet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-jp",
-            "repo": "helm-c-yasnippet",
-            "sha256": "02sqcww40n6xbmh65n57l9vl79q4ysqm5x80gshzh1280s50irgd",
-            "rev": "660e18131a91e08a6a797ae6c17e2067416b93d1"
-        },
-        "recipe": {
-            "sha256": "0jwj4giv6lxb3h7vqqb2alkwq5kp0shy2nraik33956p4l8dfs90",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151117.1705",
-        "deps": [
-            "cl-lib",
-            "helm-core",
-            "yasnippet"
-        ]
-    },
-    "codic": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-codic",
-            "sha256": "14jcxrs3b02pbppvdsabr7c74i3c6d1lmd6l1p9dj8gv413pghsz",
-            "rev": "52bbb6997ef4ab9fb7fea43bbfff7f04671aa557"
-        },
-        "recipe": {
-            "sha256": "0fq2qfqhkd6injgl66vcpd61j67shl9xj260aj6cgb2nriq0jxgn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150926.627",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "perl-completion": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "imakado",
-            "repo": "perl-completion",
-            "sha256": "0fzypcxxd5zlkcybz0xppf09l0vf4vsfisr2y3ijsmxhg7yrwzj5",
-            "rev": "f2ec91b88a8b7d97d40d6c90a89eaf8e595c2b89"
-        },
-        "recipe": {
-            "sha256": "01p17mlkwjm60f14arda3ly8ng0r98nn3rly94ghn6jr7r7fv14b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20090528.136",
-        "deps": []
-    },
-    "ahungry-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ahungry",
-            "repo": "color-theme-ahungry",
-            "sha256": "0dlk53zij907413fl6wh02i8nwzrbbrm22nn3i9h5sc8x9dhzazg",
-            "rev": "52b050992ef6fe0e6e57b51bcb5c98e02c616541"
-        },
-        "recipe": {
-            "sha256": "0fhim0qscpqx9siprp3ax1azxzmqkzvrjx517d9bnd68z7xxbpqy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151014.2138",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "spaceline": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "TheBB",
-            "repo": "spaceline",
-            "sha256": "1xyhayzr2mbsq9w448bxy7ja9cgy3vrgh70w36nqrrkl1pi7lm3b",
-            "rev": "2cc31a94b8b8c3eefc81ab409071365d120d2535"
-        },
-        "recipe": {
-            "sha256": "0jpcj0i8ckdylrisx9b4l9kam6kkjzhhv1s7mwwi4b744rx942iw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151215.225",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "emacs",
-            "powerline",
-            "s"
-        ]
-    },
-    "auto-complete-clang-async": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Golevka",
-            "repo": "emacs-clang-complete-async",
-            "sha256": "1sw0wxrjcjqk0w1llfj376g6axa5bnk2lq2vv66746bkz14h0s8f",
-            "rev": "5d9c5cabbb6b31e0ac3637631c0c8b25184aa8b4"
-        },
-        "recipe": {
-            "sha256": "1jj0jn1v3070g7g0j5gvpybv145kki8nsjxqb8fjf9qag8ilfkjh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130526.1014",
-        "deps": []
-    },
-    "gscholar-bibtex": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cute-jumper",
-            "repo": "gscholar-bibtex",
-            "sha256": "1dfd22629gz0c8r4wplvbn0n7bm20549mg5chq289s826ca0kxqk",
-            "rev": "00b32521de3aa689bc58516ae10ba7f3ef1b6c92"
-        },
-        "recipe": {
-            "sha256": "0d41gr9amf9vdn9pl9lamhp2swqllxslv9r3wsgzqvjl7zayd1az",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151022.1225",
-        "deps": []
-    },
-    "elscreen-multi-term": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wamei",
-            "repo": "elscreen-multi-term",
-            "sha256": "1cninrbgxzg0gykkpjx0i8pk2yc7sgr2kliqd35lgcxz2q4jlr51",
-            "rev": "7b6048a0dd80f69460a62bbc6f1af8856141a5ea"
-        },
-        "recipe": {
-            "sha256": "1zwrzblkag1d18xz450b7khsdssvsxyl1x6a682vy0dkn1y5qh1n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151021.2133",
-        "deps": [
-            "elscreen",
-            "emacs",
-            "multi-term"
-        ]
-    },
-    "hive": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "r0man",
-            "repo": "hive-el",
-            "sha256": "097lrj9lgfa7szww324hlqywwkbi31n1pxfqyg0zbfj45djkp9bx",
-            "rev": "11b5172e081ad8079fc78758bef6f306f82ae32b"
-        },
-        "recipe": {
-            "sha256": "1marz8gmk824hb0nkhaw48d4qw1xjk1aad27gviya7f5ilypxrya",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131217.912",
-        "deps": [
-            "sql"
-        ]
-    },
-    "anyins": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "antham",
-            "repo": "anyins",
-            "sha256": "05lq0bllgn44zs85mgnfdcyjasm6j8m70jdcxksf798i0qdqnk7n",
-            "rev": "83844c17ac9b5b6c7655ee556b75689e4c8ea663"
-        },
-        "recipe": {
-            "sha256": "0ncf3kn8rackcidkgda2zs60km3hx87rwr9daj7ksmbb6am09s7c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131229.441",
-        "deps": []
-    },
-    "d-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Emacs-D-Mode-Maintainers",
-            "repo": "Emacs-D-Mode",
-            "sha256": "0fqirypxhbvnhz86rznwdx553ppg0z0hxh1h04qg7y58g01vpsdq",
-            "rev": "5501b77a1e212e27dd78e8c0e86424064b439cbb"
-        },
-        "recipe": {
-            "sha256": "060k9ndjx0n5vlpzfxlv5zxnizx72d7y9vk7gz7gdvpm6w2ha0a2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151206.154",
-        "deps": []
-    },
-    "google-this": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "emacs-google-this",
-            "sha256": "0r6hngf3h5x55lk2qwfgd6bhjhkax5nz8ml43d1x23y5bjnrricq",
-            "rev": "5274167553071fadaebe9c2d3b061470a684ae22"
-        },
-        "recipe": {
-            "sha256": "0hg9y1b03aiamyn3mam3hyxmxy21wygxrnrww91zcbwlzgp4dd2c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150522.440",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "goto-chg": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/goto-chg.el",
-            "sha256": "078d6p4br5vips7b9x4v6cy0wxf6m5ij9gpqd4g33bryn22gnpij"
-        },
-        "recipe": {
-            "sha256": "0fs0fc1mksbb1266sywasl6pppdn1f9a4q9dwycl9zycr588yjyv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131228.859",
-        "deps": []
-    },
-    "iterator": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thierryvolpiatto",
-            "repo": "iterator",
-            "sha256": "08gagq74702x65dy75n2f53fsh806nppnidim9z6ycp8qw1ibyfp",
-            "rev": "7bd349d559a6e1c3da575e579a7cb35a7bee9190"
-        },
-        "recipe": {
-            "sha256": "17q10fw6y0icsv6vv9n968bwmbjlihrpkkyw62d1kfxhs9yw659z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150321.2325",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "jss": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "segv",
-            "repo": "jss",
-            "sha256": "07yd7sxb5f2mbm2nva7b2nwyxxkmsi2rdd5qig0bq1b2mf3g5l83",
-            "rev": "41749257aecf13c7bd6ed489b5ab3304d06e40bc"
-        },
-        "recipe": {
-            "sha256": "050hskqcjz5kc8nni255vj3hc9m936w1rybvg5kqyz4p4lpzj00k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130508.923",
-        "deps": [
-            "emacs",
-            "js2-mode",
-            "websocket"
-        ]
-    },
-    "dired-fdclone": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knu",
-            "repo": "dired-fdclone.el",
-            "sha256": "1lnqjkbzryv655n16xj1c5bxck2jb5ccy8yckz1wp5yikkr06ba8",
-            "rev": "e9bf4f16248cb5d187a323b7887d236a4a203c59"
-        },
-        "recipe": {
-            "sha256": "11aikq2q3m9h4zpgl24f8npvpwd98jgh8ygjwy2x5q8as8i89vf9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150417.332",
-        "deps": []
-    },
-    "package-safe-delete": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "package-safe-delete",
-            "sha256": "1pdv6d6bm5jmpgjqf9ycvzasxz1205zdi0zjrmkr33c03azwz7rd",
-            "rev": "138171e4fc03c0ef05a8260cbb5cd2e114c1c194"
-        },
-        "recipe": {
-            "sha256": "12ss5yjhnyxsif4vlbgxamn5jfa0wxkkphffxnv6drhvmpq226jw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150116.1007",
-        "deps": [
-            "emacs",
-            "epl"
-        ]
-    },
-    "emacsc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knu",
-            "repo": "emacsc",
-            "sha256": "1rqr08gj07hw37mqd0flmq4a10wn16vy7wg0msqq0ab2smwjhns7",
-            "rev": "02325c640232ee184314eb58d0051f365f7f085c"
-        },
-        "recipe": {
-            "sha256": "1fbf9al3yds0il18jz6hbpj1fsjlpb1kgp450gb6r09lc46x77mk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150807.457",
-        "deps": []
-    },
-    "react-snippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "johnmastro",
-            "repo": "react-snippets.el",
-            "sha256": "00j0iqa37yzd7xrgd8xcgpgmjcarhn0yx4zpbnr7z7kzmg24ywa7",
-            "rev": "1b56f99e1f26c6dea4315c14fa58a851caa9d84f"
-        },
-        "recipe": {
-            "sha256": "0chs0h41nb2fdz02hdsaynz7ma8fg66a8m1q1np0464skrsdaj73",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151104.1740",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "dirtree-prosjekt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abingham",
-            "repo": "prosjekt",
-            "sha256": "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3",
-            "rev": "a864a8be5842223043702395f311e3350c28e9db"
-        },
-        "recipe": {
-            "sha256": "0pyb6c0gvc16z5rc5h0kpl8021hz2hzv86cmjsd20gbhz7imrqwk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140129.304",
-        "deps": [
-            "dirtree",
-            "prosjekt"
-        ]
-    },
-    "indicators": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "indicators.el",
-            "sha256": "1zsw68zzvjjh93cldc0w83k67hzcgi226vz3d0nzqc9sczqk8civ",
-            "rev": "c6d520eb3536cf3a77c635fa36fec031d3f84fe4"
-        },
-        "recipe": {
-            "sha256": "1rhmz8sfi2gnv72sbw6kgyzidk43mnp05wnscw9vjvz9v0vwirss",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130217.1605",
-        "deps": []
-    },
-    "fuzzy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "auto-complete",
-            "repo": "fuzzy-el",
-            "sha256": "0rzp8c2164w775ggm2fs4j5dz33vqcah84ysp81majirwfql1niv",
-            "rev": "534d723ad2e06322ff8d9bd0ba4863d243f698e7"
-        },
-        "recipe": {
-            "sha256": "1hwdh9bx4g4vzzyc20vdwxsii611za37kc9ik40kwjjk62qmll8h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150729.2237",
-        "deps": []
-    },
-    "evil-snipe": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hlissner",
-            "repo": "evil-snipe",
-            "sha256": "0iyk8pn7pc3js3ppn46myzfr2i0b47wwrzv72939aydpw64rx76q",
-            "rev": "71f0f7df2300be390227e3f78619630c32bddbe9"
-        },
-        "recipe": {
-            "sha256": "0gcmpjw3iw7rjk86b2k6clfigp48vakfjd1a9n8qramhnc85rgkn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151106.1602",
-        "deps": [
-            "evil"
-        ]
-    },
-    "jedi": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tkf",
-            "repo": "emacs-jedi",
-            "sha256": "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7",
-            "rev": "8da022c8cda511428c72a6dc4c5be3c0a0c88584"
-        },
-        "recipe": {
-            "sha256": "1777060q25k9n2g6h1lm5lkki900pmjqkxq72mrk3j19jr4pk9m4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151214.905",
-        "deps": [
-            "auto-complete",
-            "emacs",
-            "jedi-core"
-        ]
-    },
-    "god-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chrisdone",
-            "repo": "god-mode",
-            "sha256": "1am415k4xxcva6y3vbvyvknzc6bma49pq3p85zmpjsdmsp18qdix",
-            "rev": "6cf0807b6555eb6fcf8387a4e3b667071ef38964"
-        },
-        "recipe": {
-            "sha256": "01xx2byjh6vlckaxamm2x2qzicd9qc8h6amyjg0bxz3932a4llaa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151005.1125",
-        "deps": []
-    },
-    "cask-package-toolset": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "AdrieanKhisbe",
-            "repo": "cask-package-toolset.el",
-            "sha256": "12bpf5vk2na428h1fc3qb6nh7hyhxfvmzpcs45ym9ddjvdzwb0gs",
-            "rev": "e691d8815586bef059de26bedbd2162f64ca0827"
-        },
-        "recipe": {
-            "sha256": "13ix093c0a58rjqj7zfp3914xj3hvj276gb2d8zhvrx9vvs1345g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151220.18",
-        "deps": [
-            "ansi",
-            "cl-lib",
-            "commander",
-            "dash",
-            "emacs",
-            "f",
-            "s",
-            "shut-up"
-        ]
-    },
-    "firebelly-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "startling",
-            "repo": "firebelly",
-            "sha256": "02ajday0lnk37dnzf4747ha3w0azisq35fmdhq322hx0hfb1c66x",
-            "rev": "5fd621102c676196319579b168da1476e8552d00"
-        },
-        "recipe": {
-            "sha256": "0lns846l70wcrzqb6p5cy5hpd0szh4gvjxd4xq4zsb0z5nfz97jr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140410.355",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "wc-goal-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bnbeckwith",
-            "repo": "wc-goal-mode",
-            "sha256": "0p7j4hvcxfyjf0na9s3xv29dvmwq82s56lincfasd0ydcpz4fbwc",
-            "rev": "bf21ab9c5a449bcc20dd207a4915dcec218d2699"
-        },
-        "recipe": {
-            "sha256": "0l3gh96njjldp7n13jn1zjrp17h7ivjak102j6wwspgg6v2h5419",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140829.859",
-        "deps": []
-    },
-    "toml": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gongo",
-            "repo": "emacs-toml",
-            "sha256": "1b3bkla6i5nvanifxchph6ab6ldrskdf240hy4d27dkmmnr3pban",
-            "rev": "9633a6872928e737a2335aae1065768b23d8c3b3"
-        },
-        "recipe": {
-            "sha256": "0kqv6zkywa7kqh8kg1dzcgkbi91lwx335przdakndm1lfai38i9b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130903.755",
-        "deps": []
-    },
-    "grin": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/dariusp686/emacs-grin",
-            "sha256": "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2",
-            "rev": "f541aa22da52"
-        },
-        "recipe": {
-            "sha256": "0mvzwmws5pi6hpzgkc43fjxs98ngkr0jvqbclza2jbbqawifzzbk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20110806.158",
-        "deps": []
-    },
-    "find-things-fast": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "eglaysher",
-            "repo": "find-things-fast",
-            "sha256": "1r6cs7p43pi6n2inbrv9q924m679izxwxqgyr4sjjj3lg6an4cnx",
-            "rev": "efc7c189019ed65430e2f9e910e8e0a5ca9d2d03"
-        },
-        "recipe": {
-            "sha256": "1fs3wf61lzm1hxh5sx8pr74g7g9np3npdwg7xmk81b5f2jx2vy6m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150519.1726",
-        "deps": []
-    },
-    "github-issues": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "inkel",
-            "repo": "github-issues.el",
-            "sha256": "065gpnllsk4x574fn9d6m4ajxl7mj5w2w5g9in421sp5r80fp9fv",
-            "rev": "ebe83ec18e7b874b05e7bc9c25b8cf0800ad20c1"
-        },
-        "recipe": {
-            "sha256": "12c6yb3v7xwkzc51binfgl4jb3sm3al5nlrklbsxhn44alazsvb0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120425.1735",
-        "deps": []
-    },
-    "window-numbering": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nschum",
-            "repo": "window-numbering.el",
-            "sha256": "1f4c6q4larifm745fr8f3w8sxs1sbs77vna29rw120jz8rnlz0jy",
-            "rev": "575ad203545b01e21d28fefc0d8b809d1016ea3a"
-        },
-        "recipe": {
-            "sha256": "0x3n0ni16q69lfpyjz61spqghmhvc3cwa4aj80ihii3pk80f769x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150228.1447",
-        "deps": []
-    },
-    "company-math": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vspinu",
-            "repo": "company-math",
-            "sha256": "0pxg9851pl7ck58qiz4swj2c0by914d4bn14c5imfvdn5hxnq19i",
-            "rev": "f5cedcfa73e5ddd445167969e87ddf8e1bbd2bc1"
-        },
-        "recipe": {
-            "sha256": "0chig8k8l65bnd0a6734fiy0ikl20k9v2wlndh3ckz5a8h963g87",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150830.1837",
-        "deps": [
-            "company",
-            "math-symbol-lists"
-        ]
-    },
-    "window-number": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/window-number.el",
-            "sha256": "1as3qbvj6d171qp2s8ycqqi16bgqm47vfk3fbxrl9szjzaxh9nw6"
-        },
-        "recipe": {
-            "sha256": "1qhlsdhs40cyly87pj3f1n6ckr7z5pmhqndgay5jyxwxxdpknpap",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140123.2102",
-        "deps": []
-    },
-    "creole": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nicferrier",
-            "repo": "elwikicreole",
-            "sha256": "18c4jfjnhb7asdhwj41g06cp9rz5xd7bbx2s1xvk6gahay27rlrv",
-            "rev": "7d5cffe93857f6c75ca09ac79c0e47b8d4410e53"
-        },
-        "recipe": {
-            "sha256": "1pqgm7m2gzkn65v3qic71c38qiira29cwx11l96qph8h8sf47zw5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140924.1000",
-        "deps": [
-            "kv",
-            "noflet"
-        ]
-    },
-    "minibuffer-complete-cycle": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knu",
-            "repo": "minibuffer-complete-cycle",
-            "sha256": "1zyb6c3xwdzk7dpn7xi0mvbcjdfxvzz1a0zlbs053pfar8iim5fk",
-            "rev": "3df80135887d0169e02294a948711f6dfeca4a6f"
-        },
-        "recipe": {
-            "sha256": "0y1mxs6q9a8lzprrlb22qff6x5mvkw4gp2l6p2js2r0j9jzyffq2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130813.1145",
-        "deps": []
-    },
-    "imgix": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "imgix",
-            "repo": "imgix-emacs",
-            "sha256": "1q53r3f3x0hpzryxd1v1w3qgs54p384q0azi7xj2gppi1q49sa42",
-            "rev": "4906ff0b4f7c9e84a5beb81630fe6d522ec91eaa"
-        },
-        "recipe": {
-            "sha256": "0dh7qsz5c9mflldcw60vc8mrxrw76n2ydd7blv6jfmsnr19ila4q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141226.1532",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "ht",
-            "json",
-            "s"
-        ]
-    },
-    "anything-project": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "imakado",
-            "repo": "anything-project",
-            "sha256": "16a7i01q8qqkgph1s3jnwdr2arjq3cm3jpv5bk5sqs29c003q0pp",
-            "rev": "9f6f04bc1911474e97e99faf52e204cf159add83"
-        },
-        "recipe": {
-            "sha256": "10crwm34igb4kjh97alni15xzhsb2s0d4ghva86f2gpjidka9fhr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141024.427",
-        "deps": [
-            "anything",
-            "imakado"
-        ]
-    },
-    "powerline-evil": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "raugturi",
-            "repo": "powerline-evil",
-            "sha256": "1c8y4r7zdr6764kzs5bc64idv2pfjvi78lg2f1d2hp1595ia8y5r",
-            "rev": "98b3a102b6dba6632aa0755a7257300c9b164309"
-        },
-        "recipe": {
-            "sha256": "0cdnmq9f06lzkj0hs948a7j5sgg6fl5f36bfnyaxgss23akbfjhr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151112.910",
-        "deps": [
-            "evil",
-            "powerline"
-        ]
-    },
-    "bog": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kyleam",
-            "repo": "bog",
-            "sha256": "0p9smhj53xy2flfcf988jq20kgf5jj4w3z8h9lb7378vwai0y70i",
-            "rev": "ea99bc6b8108bd3b2ff767541fa264db4dbf04a5"
-        },
-        "recipe": {
-            "sha256": "1ci8xxca7dclmi5v37y5k45qlmzs6a9hi6m7czgiwxii902w5pkl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151213.2151",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "pydoc-info": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/jonwaltman/pydoc-info",
-            "sha256": "1mzyr6yznkyv99x9q8zx2f270ngjh8s94zvnhcbhidi57inpd1nh",
-            "rev": "151d877c8fb8"
-        },
-        "recipe": {
-            "sha256": "0l80g0rzkk3a1wrw2riiywz9wdyxwr5i64jb2h5r8alp9qq1k7mf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20110301.234",
-        "deps": []
-    },
-    "evil-indent-textobject": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cofi",
-            "repo": "evil-indent-textobject",
-            "sha256": "0nghisnc49ivh56mddfdlcbqv3y2vqzjvkpgwv3zp80ga6ghvdmz",
-            "rev": "70a1154a531b7cfdbb9a31d6922482791e20a3a7"
-        },
-        "recipe": {
-            "sha256": "172a3krid5lrx1w9xcifkhjnvlxg1nbz4w102d99d0grr9465r09",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130831.1719",
-        "deps": [
-            "evil"
-        ]
-    },
-    "fixmee": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "fixmee",
-            "sha256": "1x4k8890pzdcizzl0p6v96ylrx5xid9ykgrmggx0b3y0gx0vhwic",
-            "rev": "1b8b3460f1e3c3c1784b2a63fb9f4fb3bb4dc084"
-        },
-        "recipe": {
-            "sha256": "0wnp6h8f547fsi1lkk4ajny7g21dnr76qfhxl82n0l5h1ps4w8mp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150223.755",
-        "deps": [
-            "back-button",
-            "button-lock",
-            "nav-flash",
-            "smartrep",
-            "string-utils",
-            "tabulated-list"
-        ]
-    },
-    "haxe-mode": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/jpsecher/haxe-mode",
-            "sha256": "106a7kpjj4laxl7x8aqpv75ih54569b3bs2a1b8z4rghmikqc4aw",
-            "rev": "850f29d9f70e"
-        },
-        "recipe": {
-            "sha256": "032h0nxlsrk30bsqb02by842ycrw1qscpfprifjjkaiq08wigh1l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131004.342",
-        "deps": []
-    },
-    "atom-dark-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "whitlockjc",
-            "repo": "atom-dark-theme-emacs",
-            "sha256": "0jfpzv8dmvl4nr6kvq5aii830s5h632bq2q3jbnfc4zdql7id464",
-            "rev": "b6963e486d27eae7cd472736c106c7079c2a3d3c"
-        },
-        "recipe": {
-            "sha256": "1ci61blm7wc83wm2iyax017ai4jljyag5j1mvw86rimmmjzr0v8f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151120.135",
-        "deps": []
-    },
-    "ox-tiddly": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dfeich",
-            "repo": "org8-wikiexporters",
-            "sha256": "1rmlwx2svnsf0cg2xf0a09ncy4kx8jgn3rrnpa89z0brlafxx25s",
-            "rev": "0cd92e84ad22c103b078f285ec66ff98f7ca98ca"
-        },
-        "recipe": {
-            "sha256": "196i8lzxv2smpj5yhmiqwazn4pvc14yqyzasrgimhv3vi2xnxlfb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151206.440",
-        "deps": [
-            "cl-lib",
-            "org"
-        ]
-    },
-    "thesaurus": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/thesaurus.el",
-            "sha256": "0zcyasdzb7dvmld8418cy2mg8mpdx01bv44cm0sp5950scrypsaq"
-        },
-        "recipe": {
-            "sha256": "1nyjk9jr1xvdkil13ylfsgg7q2sx71za05gi8m2v5f45pbmbi50h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121125.1337",
-        "deps": []
-    },
-    "semi": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wanderlust",
-            "repo": "semi",
-            "sha256": "1s1wjk2ba5spqc0vhj8kmfsm8vzmza06pnjkwal084v8dnwz0zz3",
-            "rev": "35c9ff77db07ace4b7178189c1fe45118ebf9a65"
-        },
-        "recipe": {
-            "sha256": "01wk3lgln5lac65hp6v83d292bdk7544z23xa1v6a756nhybwv25",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150525.619",
-        "deps": [
-            "flim"
-        ]
-    },
-    "boron-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsfodder",
-            "repo": "emacs-boron-theme",
-            "sha256": "1gys5ri56s2s525wdji3m72sxzswmb8cmhmw5iha84v7hlqkrahb",
-            "rev": "ea5873139424d6ca013b915876daf0399432015b"
-        },
-        "recipe": {
-            "sha256": "1rrqlq08jnh9ihb99ji1vvmamj742assnm4a7xqz6gp7f248nb81",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150117.1152",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "relax": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "technomancy",
-            "repo": "relax.el",
-            "sha256": "0lqbhwi1f8b4sv9p1rf0gyjllk0l7g6v6mlws496079wxx1n5j66",
-            "rev": "6e33892623ab87833082262321dc8e1977209626"
-        },
-        "recipe": {
-            "sha256": "0gfr4ym6aakawhkfz40ar2n0rfz503hq428yj6rbf7jmq3ajaysk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131029.1634",
-        "deps": [
-            "json"
-        ]
-    },
-    "omni-kill": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "AdrieanKhisbe",
-            "repo": "omni-kill.el",
-            "sha256": "1925mh47n4x9v780qp5l6cksl64v9mpyb87znsg93x6sxr0cvv4c",
-            "rev": "4c8dbb6b2c9f1afc0f82077c04eab022e5387e85"
-        },
-        "recipe": {
-            "sha256": "03kydl16rd9mnc1rnan2byqa6f70891fhcj16wkavl2r68rfj75k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150527.149",
-        "deps": []
-    },
-    "jenkins-watch": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ataylor284",
-            "repo": "jenkins-watch",
-            "sha256": "0jayhv8j7b527dimhvcs0d7ax25x7v50dk0k6apisqc23psvkq66",
-            "rev": "37b84dfbd98240a57ff798e1ff8bc7dba2913577"
-        },
-        "recipe": {
-            "sha256": "0brgjgbw804x0gf2vq01yv6bd0ilp3x9kvr1nnsqxb9c03ffmb2m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121004.1826",
-        "deps": []
-    },
-    "git": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "git.el",
-            "sha256": "0471xm0h6jkmxnrcqy5agq42i8immdb2qpnw7q7czrbsl521al8d",
-            "rev": "2b523c1975d4f258effaf826656c4b7120b2a19f"
-        },
-        "recipe": {
-            "sha256": "1nd2yvfgin13m368gjn7xah99glspnam4g4fh348x4makxcaw8w5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140128.441",
-        "deps": [
-            "dash",
-            "f",
-            "s"
-        ]
-    },
-    "operate-on-number": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knu",
-            "repo": "operate-on-number.el",
-            "sha256": "0iw3c8sn702ziki59mvd5gxm484i7f0bwsy8fz95y08s9gknjjf9",
-            "rev": "ceb3be565a29326c1098244fac0c50606723a56e"
-        },
-        "recipe": {
-            "sha256": "1rw3fqbzfizgcbz3yaf99rr2546msna4z7dyfa8dbi8h7yzl4fhk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150707.123",
-        "deps": []
-    },
-    "easy-escape": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cpitclaudel",
-            "repo": "easy-escape",
-            "sha256": "1qn0givyh07w41sv5xayfzlwbpbq7p39wbhmwsgffgfqzzz5r2ys",
-            "rev": "c87d76e5001f36fbbf975e9ce7e776acd2dd7776"
-        },
-        "recipe": {
-            "sha256": "1zspb79x6s151wwiian45j1nh0xps8y8yd98byyn5lbwbj2pp2gk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150718.2133",
-        "deps": []
-    },
-    "thumb-frm": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/thumb-frm.el",
-            "sha256": "1zyx30awgdvhfbr7fzgizm7gl93j0hqckiafp2jmlaarl8s2i36i"
-        },
-        "recipe": {
-            "sha256": "1fjjd80drm8banni909lww9zqazr1kk9m40xwwa1ln2zicaf091c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151206.1226",
-        "deps": [
-            "frame-cmds",
-            "frame-fns"
-        ]
-    },
-    "browse-url-dwim": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "browse-url-dwim",
-            "sha256": "1rcihwdxrzhgcz573rh1yp3770ihkwqjqvd39yhic1d3sgwxz2hy",
-            "rev": "3d611dbb167c286109ac53995ad68286d87aafb9"
-        },
-        "recipe": {
-            "sha256": "13bv2ka5pp9k4kwrxfqfawwxzsqlakvpi9a32gxgx7qfi0dcb1rf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140731.1422",
-        "deps": [
-            "string-utils"
-        ]
-    },
-    "bats-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dougm",
-            "repo": "bats-mode",
-            "sha256": "1fy9qnwsxvb8qnyk13bnjjbnlhdads5qf1byg5agg6lq5np3w5jf",
-            "rev": "9469a9a9de4fe7d1aab4600294c43898bf5cf638"
-        },
-        "recipe": {
-            "sha256": "1l5winy30w8fs3f5cylc3a3j3mfkvchwanlgsin7q76jivn87h7w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141115.901",
-        "deps": []
-    },
-    "requirejs-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ricardmo",
-            "repo": "requirejs-mode",
-            "sha256": "02wva5q8mvc0a5kms2wm1gyaag2x3zd6fkkpl4218nrbb0mbficv",
-            "rev": "bbb0c09f8eb2d6a33c17319be8137f68bb16bc92"
-        },
-        "recipe": {
-            "sha256": "1sq1kim17bcmh39106vfgm7gq9nj9943lw8by0bpi5qr8xdjsn5r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130215.1504",
-        "deps": []
-    },
-    "emmet-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "smihica",
-            "repo": "emmet",
-            "sha256": "0037nikvlcw6i228jym76pl1mgw4fn5dpz8hfr86b3m0zb012inj",
-            "rev": "3a29a1ae17271a3dfe3cd47db034ee4036b2b144"
-        },
-        "recipe": {
-            "sha256": "0w5nnhha70mndpk2a58raaxqanv868z05mfy1a8prgapm56mm819",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151213.938",
-        "deps": []
-    },
-    "trident-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "johnmastro",
-            "repo": "trident-mode.el",
-            "sha256": "08484fhc69rk16g52f9bzc1kzpif61ddfchxjbj1qqqammbx11ym",
-            "rev": "ad3201f47e114de35df189c3d80f0fdea9507ea9"
-        },
-        "recipe": {
-            "sha256": "0l81hs7bp46jlk41b9fk1lkvlp17fqc5hcz8k8kkal7rh7ari1fd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130726.1407",
-        "deps": [
-            "dash",
-            "emacs",
-            "skewer-mode",
-            "slime"
-        ]
-    },
-    "gnu-apl-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lokedhs",
-            "repo": "gnu-apl-mode",
-            "sha256": "1dfkjzx33wzafj9cfm1bpj99bmnq5a8qrvzmhjykr7mfkca79ymz",
-            "rev": "fb1686403e4842b6f44eebe80e5acf86a5151d88"
-        },
-        "recipe": {
-            "sha256": "0971pzc14gw8f0b4lzvicxww1k3wc58gbr3fd0qvdra2jifk2is6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151224.1059",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "edbi": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiwanami",
-            "repo": "emacs-edbi",
-            "sha256": "1x5y1d5crc48iddlsf6irkr017p32a9xjcmlm9wf3zggmr95fr3s",
-            "rev": "3edb409245d8a3bca7a5b25c70c98954c0ab42b2"
-        },
-        "recipe": {
-            "sha256": "0qq0j16n8lyvkqqlcsrq1m7r7f0in6b92d74mpx5c6siv6z2vxlr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140920.235",
-        "deps": [
-            "concurrent",
-            "ctable",
-            "epc"
-        ]
-    },
-    "markdown-toc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ardumont",
-            "repo": "markdown-toc",
-            "sha256": "0jgr327qlh7acwi6sld27xdsvr89parspk6wmfklwszvy1v13633",
-            "rev": "c2ac578113015ba7d3377c0756a4d00c61ba2e17"
-        },
-        "recipe": {
-            "sha256": "0slky735yzmbfi4ld264vw64b4a4nllhywp19ya0sljbsfycbihv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151223.514",
-        "deps": [
-            "dash",
-            "markdown-mode",
-            "s"
-        ]
-    },
-    "sly-named-readtables": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "capitaomorte",
-            "repo": "sly-named-readtables",
-            "sha256": "1xi625pn3mg77mjvr94v6a5pjyvgjavpkdbbh1lqjx1halaa2qb7",
-            "rev": "df4ed79064cf85275804e201899b677bef4ab3f5"
-        },
-        "recipe": {
-            "sha256": "11ymzbj1ji7avfjqafj9p5zx0m4y1jfjcmyanpjq1frdcz639ir9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150817.1016",
-        "deps": [
-            "sly"
-        ]
-    },
-    "ac-html": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cheunghy",
-            "repo": "ac-html",
-            "sha256": "1sip87j4wvlf9pfnpr0zyyhys1dd9smh6hy3zs08ihbdh98krgs5",
-            "rev": "3de94a46d8cb93e8e62a1b6bdebbde4d65dc7cc2"
-        },
-        "recipe": {
-            "sha256": "0qf8f75b6dvy844dq8vh8d9c6k599rh1ynjcif9bwvdpf6pxwvqa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151005.231",
-        "deps": [
-            "auto-complete",
-            "dash",
-            "f",
-            "s"
-        ]
-    },
-    "rails-log-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ananthakumaran",
-            "repo": "rails-log-mode",
-            "sha256": "1fh8wsb0pa2isr1kgh3v9zmmxq1nlmqwqk4z34dw5wpaiyihmk84",
-            "rev": "ff440003ad7d47cb0ac3300f2a632f4cfd36a446"
-        },
-        "recipe": {
-            "sha256": "0h7gfg0c5pwfh18qzg1mx7an9p958ygdfqb54s85mbkv8x3rh1a0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140407.2325",
-        "deps": []
-    },
-    "swiper": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "swiper",
-            "sha256": "1262k48ky88m3jgdryyxm9dqzsd2lc17vcra93lp3yrr6iqn55dl",
-            "rev": "d74fab4a5b98910bd09956d3cb9b3376d6287840"
-        },
-        "recipe": {
-            "sha256": "13lld7kjz1n1ryxvrfsy0iym5l9m9ybrf7bpcmkzsalpp15j3mvm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151227.300",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "simple-call-tree": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vapniks",
-            "repo": "simple-call-tree",
-            "sha256": "09blcc1aj1lbqr1jcjm8dlq13s3plrg1qbp9vr3sp4dxyhjpimjj",
-            "rev": "9f2fd423a3b86878d84e8c97e3ba45647b4d165e"
-        },
-        "recipe": {
-            "sha256": "1cbv4frsrwd8d3rg8r4sylwnc1hl3hgh595qwbpx0zd3dp5na2yl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151203.1625",
-        "deps": []
-    },
-    "eldoc-eval": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thierryvolpiatto",
-            "repo": "eldoc-eval",
-            "sha256": "0vppa9xihn8777rphiw1aqp96xn16vgjwff1dwvp8z861silp8ar",
-            "rev": "e87b89f89a2aed0bb3b31c014fc1b72f00413866"
-        },
-        "recipe": {
-            "sha256": "0z4scgi2xgrgd47aqqmyv1ww8alh43s0qny5qmh3f1nnppz3nd7c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150512.706",
-        "deps": []
-    },
-    "elm-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jcollard",
-            "repo": "elm-mode",
-            "sha256": "055bnhkw0nvry3n20a980nrq3y2rlihp59pmrm1s4rlb0f5drckc",
-            "rev": "3462740eb2add23fc294aa5b2b549ee08f5f711e"
-        },
-        "recipe": {
-            "sha256": "18hky1d1d2q5paz271w17r6n1k2sb7rrski8dxq3q586k4lqykj2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151227.556",
-        "deps": [
-            "emacs",
-            "f",
-            "let-alist",
-            "s"
-        ]
-    },
-    "axiom-environment": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/pdo/axiom-environment",
-            "sha256": "1vk7jjbf8wp183c4nagkgxvzcyrdlr53avzsxl111rm5rsxbvdli",
-            "rev": "d7ea57a27527"
-        },
-        "recipe": {
-            "sha256": "1d3h1fn5zfbh7kpm2i02kza3bq9s6if4yd2vvfjdhgrykvl86h66",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151126.1509",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "speed-type": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hagleitn",
-            "repo": "speed-type",
-            "sha256": "102hjyr9ii2rmq8762irbwansbi023s7dg4a8n6lkadcvzfibmag",
-            "rev": "d3a6745dbaaf6b1eacee10ce9b50108482dbe758"
-        },
-        "recipe": {
-            "sha256": "14q423an7v5hhfx1x039fizxcn5hcscqf2jfn9rqifg4jpq8bq5g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150120.2234",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "el-pocket": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pterygota",
-            "repo": "el-pocket",
-            "sha256": "1iykhicc1ic1r6h4vj3701rm0vfy41b16w3d98amf8jjypv54wv7",
-            "rev": "e79b5a4c7762be4ea88f43f17203d44a5c8ad310"
-        },
-        "recipe": {
-            "sha256": "0fgylpfixsx5l1nrgz6n1c2ayf52p60f9q290hmkn36siyx5hixw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150202.1728",
-        "deps": [
-            "emacs",
-            "web"
-        ]
-    },
-    "helm-descbinds": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-helm",
-            "repo": "helm-descbinds",
-            "sha256": "1f7k0h1g1835fsvx6vc272bk62jf4y1r4qynjy7zbhzk13m6k6z2",
-            "rev": "f8ef6e195e7b0a9f167d2da4810a97baebbe2228"
-        },
-        "recipe": {
-            "sha256": "1890ss4pimjxskzzllf57fg07xbs8zqcrp6r8r6x989llrfvd1h7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151222.849",
-        "deps": [
-            "helm"
-        ]
-    },
-    "popup-switcher": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kostafey",
-            "repo": "popup-switcher",
-            "sha256": "1gcf0dzw02jy5l7xzb4w5llzlinc1nvs72d6aydwp70cwziks475",
-            "rev": "a858f680898ef9631c21eebbe5cb527622179305"
-        },
-        "recipe": {
-            "sha256": "1888xiqhrn7fcpjnr3smchmmqwfayfbbyvdkdb79c6drzjcvidp1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150331.908",
-        "deps": [
-            "cl-lib",
-            "popup"
-        ]
-    },
-    "edit-color-stamp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sabof",
-            "repo": "edit-color-stamp",
-            "sha256": "0vk954f44m2bq7qb122pzlb8fibrisx47ihvn3h96m8nmx0fv32r",
-            "rev": "32dc1ca5bcf3dcf83fad5e39b55dc5b77becb3d3"
-        },
-        "recipe": {
-            "sha256": "1f8v8w3w7vb8jv29w06mplah8yfcs5qfjz2w4irv0rg7dwzy3zk8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130529.1233",
-        "deps": [
-            "cl-lib",
-            "es-lib"
-        ]
-    },
-    "flycheck-typescript-tslint": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Simplify",
-            "repo": "flycheck-typescript-tslint",
-            "sha256": "0m9fjfpand20qy9d196z5khiznn25n95zbmgs8q2s2wcn4f7022p",
-            "rev": "79d33ba8fbc23df604c239cfc32c21e07339faa1"
-        },
-        "recipe": {
-            "sha256": "141x4scl13gqxyg0nlc8vig1iaybc3g95il5r51k4k83isi62iyq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151209.1647",
-        "deps": [
-            "emacs",
-            "flycheck"
-        ]
-    },
-    "wispjs-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "krisajenkins",
-            "repo": "wispjs-mode",
-            "sha256": "188h1sy4mxzrkwi3zgiw108c5f71rkj5agdkf9yy9v8c1bkawm4x",
-            "rev": "be094c3c3223c07b26b5d8bb8fa7aa6866369b3f"
-        },
-        "recipe": {
-            "sha256": "0qzm0dcvjndasnbqpkdc56f1qv66gxv8dfgfcwq5l1bp5wyx813p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140103.1632",
-        "deps": [
-            "clojure-mode"
-        ]
-    },
-    "org-wunderlist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "org-wunderlist.el",
-            "sha256": "1cagmwl3acanwc2nky7m61cawi0i0x703sjc6zlw968lacyw86wa",
-            "rev": "b89633fcfd74e83dd8a5d81619244a666a45715c"
-        },
-        "recipe": {
-            "sha256": "08zg3wgr80rp89c53ffqzz22ws9bp62a1m74xvxa74x6nq9i4xl0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150817.2113",
-        "deps": [
-            "alert",
-            "cl-lib",
-            "emacs",
-            "org",
-            "request-deferred",
-            "s"
-        ]
-    },
-    "discover-js2-refactor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "NicolasPetton",
-            "repo": "discover-js2-refactor",
-            "sha256": "1vnbn4asz3lifscvy4shzisl6r0gkgq0qsa3kpgif3853wcd2rvn",
-            "rev": "3812abf61f39f3e73a9f3daefa6fed4f21a429ba"
-        },
-        "recipe": {
-            "sha256": "139zq66cpcn4dnidf22h7x88p812ywrrz4c3c62w3915b75f71ki",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140129.952",
-        "deps": [
-            "discover",
-            "js2-refactor"
-        ]
-    },
-    "glsl-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jimhourihan",
-            "repo": "glsl-mode",
-            "sha256": "0b6ldcfzbdn0mzrcl08zm9kx1hap3djsbzd1qvph1pa2gab25n8j",
-            "rev": "6bd83d429307d682fef0efd46c78b3e055e2caf1"
-        },
-        "recipe": {
-            "sha256": "0d05qb60k5f7wwpsp3amzghayfbwcha6rh8nrslhnklpjbg87aw5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150114.1033",
-        "deps": []
-    },
-    "py-import-check": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "psibi",
-            "repo": "emacs-py-import-check",
-            "sha256": "1416hbc64gwn9c8g9lxfx58w60ysi0x8rbps6mfxalavdhbs20sv",
-            "rev": "9787f87745a4234cd9bed711860b707902bc8ae4"
-        },
-        "recipe": {
-            "sha256": "1261dki0q44sw9h0g1305i2fj1dg9xgwzry50jbn2idcrqg4xf7k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130802.611",
-        "deps": []
-    },
-    "neotree": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jaypei",
-            "repo": "emacs-neotree",
-            "sha256": "0ig7r2shwp37sfmbxb4k4rl3hyssj4g6va0l31qx8n5z8dpfdxxy",
-            "rev": "cd02617453a0a780bc8fa13efb2426f1623cfd4d"
-        },
-        "recipe": {
-            "sha256": "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151101.807",
-        "deps": []
-    },
-    "magit-topgit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "magit-topgit",
-            "sha256": "0dj183vphnvz9k2amga0ydcb4gkjxr28qz67055mxrf89q1qjq33",
-            "rev": "732de604c31c74e9da24616428c6e9668b57c881"
-        },
-        "recipe": {
-            "sha256": "1ngrgf40n1g6ncd5nqgr0zgxwlkmv9k4fik96dgzysgwincx683i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151018.1231",
-        "deps": [
-            "emacs",
-            "magit"
-        ]
-    },
-    "gildas-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "smaret",
-            "repo": "gildas-mode",
-            "sha256": "1na8pp1g940zi22jgqi6drsm12db0hyw99v493i5j1p2y67c4hxw",
-            "rev": "23e8a2e6066ff74af592de6d5d0d858442e2bf8a"
-        },
-        "recipe": {
-            "sha256": "0bc3d8bnvg1w2chrr4rp9daq1x8p41qgklrniq0bbkr2h93cmkgv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150919.1701",
-        "deps": [
-            "emacs",
-            "polymode"
-        ]
-    },
-    "express": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "express",
-            "sha256": "0ah8zayipwp760909llb9whcdvmbsdgkg0x5y4qlcicm1r9kwcc7",
-            "rev": "93dae7377eace4a5413ba99aecb6f26f90798725"
-        },
-        "recipe": {
-            "sha256": "0lhisy4ds96bwpc7k8w9ws1zi1qh0d36nhxsp36bqzfi09ig0nb9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140508.1541",
-        "deps": [
-            "string-utils"
-        ]
-    },
-    "easy-lentic": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tumashu",
-            "repo": "easy-lentic",
-            "sha256": "0qpabig0qrkyhhiifjpq9a7qv7h3nlqmpz79xy8lk58xy6rj0zk0",
-            "rev": "1b59ebe748e80488512034f885ad6540ad037382"
-        },
-        "recipe": {
-            "sha256": "1j141lncgcgfpa42m505xndiy6lh848xymfvb3cz4d6h73421khg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151227.357",
-        "deps": [
-            "cl-lib",
-            "lentic"
-        ]
-    },
-    "ox-twiki": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dfeich",
-            "repo": "org8-wikiexporters",
-            "sha256": "1rmlwx2svnsf0cg2xf0a09ncy4kx8jgn3rrnpa89z0brlafxx25s",
-            "rev": "0cd92e84ad22c103b078f285ec66ff98f7ca98ca"
-        },
-        "recipe": {
-            "sha256": "1p1k0yg5fxcjgwpq2ix9ckh2kn69m7d5rnz76h14hw9p72cb54r0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151206.440",
-        "deps": [
-            "cl-lib",
-            "org"
-        ]
-    },
-    "company-web": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "osv",
-            "repo": "company-web",
-            "sha256": "1a9qx041w7i1ahg6rmi82hv161k57z4aljzm8wpa9wrfj8a6df2q",
-            "rev": "2b426fc09b45b0e6bb95bb27d8ef22789c72a1d8"
-        },
-        "recipe": {
-            "sha256": "0dj0m6wcc8cyvblp9b5b3am95gc18j9y4va44hvljxv1h7l5hhvy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151219.517",
-        "deps": [
-            "cl-lib",
-            "company",
-            "dash",
-            "web-completion-data"
-        ]
-    },
-    "yandex-weather": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abstractionlayer",
-            "repo": "yandex-weather.el",
-            "sha256": "17ymdqi19bs9xn0pxylzv7m99f7cn14hx73xljm6bg0qfb8m53f3",
-            "rev": "41cb91bd1e5aa0e4a317a99e88742631f487ab37"
-        },
-        "recipe": {
-            "sha256": "11hspadm520cjlv1wk2bdpzg7hg2g0chbh26qijj9jgvca26x0md",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150821.614",
-        "deps": []
-    },
-    "howdoi": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "atykhonov",
-            "repo": "emacs-howdoi",
-            "sha256": "01sj9c8mxqaif8wh6zz9v2czjaq7vcdi66drldyjmifkln6rg2v8",
-            "rev": "5fbf7069ee160c597a328e5ce5fb32920e1ca88f"
-        },
-        "recipe": {
-            "sha256": "12vgbypawxhhrnjp8dgh0wrcp7pvjccfaxw4yhq7msai7ik3h83b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150203.1843",
-        "deps": []
-    },
-    "helm-recoll": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-helm",
-            "repo": "helm-recoll",
-            "sha256": "1nl8acbvkbrgbxc4h2i10gq0bngyk74cfl8hi50cdq6agrsrfa3r",
-            "rev": "a13c5f372b470e1247a62834021931dcb4e50c96"
-        },
-        "recipe": {
-            "sha256": "0pr2pllplml55k1xx9inr3dm90ichg2wb62dvgvmbq2sqdf4606b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151220.854",
-        "deps": [
-            "helm"
-        ]
-    },
-    "anything-milkode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ongaeshi",
-            "repo": "anything-milkode",
-            "sha256": "1jw6gqwcl3fx1m7w0a15w2pnzzlqyr1fbg0m81ay358s4w3jn6v7",
-            "rev": "d6b2be13a351c41793e9cc13c1320953939d3ac9"
-        },
-        "recipe": {
-            "sha256": "1apc865a01jyx602ldzj32rrjk6xmgnxdccpjpcfgh24h2aqpdan",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140518.943",
-        "deps": [
-            "anything",
-            "milkode"
-        ]
-    },
-    "sr-speedbar": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/sr-speedbar.el",
-            "sha256": "1ffnm2kfh8cg5rdhrkqmh4krggbxvqg3s6lc1nssv88av1c5cs3i"
-        },
-        "recipe": {
-            "sha256": "1zq3ysz1vpc98sz2kpq307v1fp1l4ivwgrfh2kdqkkdjm4fkya23",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150804.1151",
-        "deps": []
-    },
-    "emr": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chrisbarrett",
-            "repo": "emacs-refactor",
-            "sha256": "0pl7i2a0mf2s33qpsc14dcvqbl6jm5xrvcnrhfr7visvnih29cy4",
-            "rev": "fd20fc1887e2ebcf752f0170b1f3bf697043fd4b"
-        },
-        "recipe": {
-            "sha256": "05vpfxg6lviclnms2zyrza8dc87m60mimlwd11ihvsbngi9gcw8x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140817.1804",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "emacs",
-            "list-utils",
-            "paredit",
-            "popup",
-            "projectile",
-            "redshank",
-            "s"
-        ]
-    },
-    "emacs-eclim": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-eclim",
-            "repo": "emacs-eclim",
-            "sha256": "1hjrnz3z5ac7gcly6jqxsv7v3b84xvyiv1dlbaivgic5rwp2n9mx",
-            "rev": "de6f6d7be1ba4e2d96cdbd05853f07ebbcd091cc"
-        },
-        "recipe": {
-            "sha256": "1l55jhz5mb3bqw90cbf4jhcqgwj962br706qhm2wn5i2a1mg8xlv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.1623",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "json",
-            "popup",
-            "s"
-        ]
-    },
-    "pillar": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pillar-markup",
-            "repo": "pillar-mode",
-            "sha256": "19i8hgzr7kdj4skf0cnv6vlsklq9qcyxcv3p33k9vgq7y4f9mah8",
-            "rev": "13a7f676544cc66005ccd8e6fc1c25e4ccd6f909"
-        },
-        "recipe": {
-            "sha256": "1lklky3shyvm1iygp621hbldpx37m0a9vd5l6mxs4y60ksj6z0js",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141112.1211",
-        "deps": [
-            "makey"
-        ]
-    },
-    "esqlite-helm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-esqlite",
-            "sha256": "0ag444hfrpdrf3lnaz7l2plj392xgh7a2080421z3g0alc74m8h3",
-            "rev": "fae9826cbc255b0f0686a801288f1441bda5f631"
-        },
-        "recipe": {
-            "sha256": "00y2nwyx13xlny40afczr31lvbpnw1cgmj5wc3iycyznizg5kvhq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151116.250",
-        "deps": [
-            "esqlite",
-            "helm"
-        ]
-    },
-    "docean": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-pe",
-            "repo": "docean.el",
-            "sha256": "055kr0qknjgnjs7dn6gdmahrdbs8piwldbz7vg1hgq3b046x8lky",
-            "rev": "dcc296782b08531b768d3cf851cc7959ec486bf1"
-        },
-        "recipe": {
-            "sha256": "1mqmn2i9axnv5vnkg9gwfdjpzr6gxx4ia9mcdpm200ix297dg7x9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150927.1318",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "request"
-        ]
-    },
-    "noflet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nicferrier",
-            "repo": "emacs-noflet",
-            "sha256": "0g70gnmfi8n24jzfci9nrj0n9bn1qig7b8f9f325rin8h7x32ypf",
-            "rev": "7ae84dc3257637af7334101456dafe1759c6b68a"
-        },
-        "recipe": {
-            "sha256": "0vzamqb52n330mi6rydrd4ls8nbwh5s42fc2gs5y15zakp6mvhr3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141102.854",
-        "deps": []
-    },
-    "typo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jorgenschaefer",
-            "repo": "typoel",
-            "sha256": "0f1rln2dqxgx2jdbs5n9czg930xqkzrknz4wqxv7zvgwlq4qpkvk",
-            "rev": "a6b9e0400706aeda99fe29012ff017bef300f580"
-        },
-        "recipe": {
-            "sha256": "07hmqrnbxbrhcbxdls8i4786lkqmfr3hv6va41xih1lxj0mk60bx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150910.843",
-        "deps": []
-    },
-    "org-jekyll": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "juanre",
-            "repo": "org-jekyll",
-            "sha256": "0whv8nsla93194jjpxrhlr6g230spdxbac8ibmzmyad075vx97z5",
-            "rev": "66300a1a6676ab168663178e7a7c954541a39992"
-        },
-        "recipe": {
-            "sha256": "0jh3rla8s8prprvhnlg0psdrj7swz7v6vf2xy1m6ff66p9saiv8i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130508.439",
-        "deps": [
-            "org"
-        ]
-    },
-    "foreman-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zweifisch",
-            "repo": "foreman-mode",
-            "sha256": "00wqn8h50xr90pyvwk4sv552yiajlzq56wh6f6lad5w90j47q1lx",
-            "rev": "9496018b0c202442248d4983ec5345501ea18a84"
-        },
-        "recipe": {
-            "sha256": "0p3kwbld05wf3dwcv0k6ynz727fiy0ik2srx4js9wvagy57x98kv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150611.356",
-        "deps": [
-            "dash",
-            "dash-functional",
-            "emacs",
-            "f",
-            "s"
-        ]
-    },
-    "timesheet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tmarble",
-            "repo": "timesheet.el",
-            "sha256": "1ghvnmswq6rg17pjnys58mak6crfcvv1vb6q7spagq143y2ar24z",
-            "rev": "6aba2bac0be92b38c245135cebe5bf1f0d8406ab"
-        },
-        "recipe": {
-            "sha256": "1gy6bf4wqvp8cw2wjnrr9ijnzwav3p7j46m7qrn6l0517shwl506",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151107.804",
-        "deps": [
-            "auctex",
-            "org",
-            "s"
-        ]
-    },
-    "crab": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "puffnfresh",
-            "repo": "crab-emacs",
-            "sha256": "0y37fx4ghx8a74cp7ci6p5yfpji8g42hlah2xcwfnyw0qlpqfbnl",
-            "rev": "6d66844856c1864157cef3dea9332c319b05d7d5"
-        },
-        "recipe": {
-            "sha256": "1jz26bw2h7ahcb7y2qhpqrlfald244c92m6pvfrb0jg0z384i6aj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150126.2337",
-        "deps": [
-            "json",
-            "websocket"
-        ]
-    },
-    "slideview": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-slideview",
-            "sha256": "11p1pghx55a4gcn45cadw7c594134b21cdim723k2h99z14f89az",
-            "rev": "b6d170bda139aedf81b47dc55cbd1a3af512fb4c"
-        },
-        "recipe": {
-            "sha256": "0zr08yrnrz49zds1651ysmgjqgbnhfdcqbg90sbsb086iw89rxl1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150324.1740",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "latest-clojure-libraries": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "AdamClements",
-            "repo": "latest-clojure-libraries",
-            "sha256": "1cqbdgk3sd0xbw76qrhlild9dvgds3vgldq0rcl200kh7y8l6g4k",
-            "rev": "6db8709a746194800a3ffea3f906e3c9f5d4ca22"
-        },
-        "recipe": {
-            "sha256": "1vnm9piq71nx7q1843izm4vydfjq1564ax4ffwmqmlpisqzd6wq5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140314.817",
-        "deps": []
-    },
-    "direx": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "m2ym",
-            "repo": "direx-el",
-            "sha256": "0mis3m6lg3vlvp8qm8iajprgx3pm3gcbhdszsm9mvrcgkahdjqnr",
-            "rev": "9497231cf50767987494718db073731b05a4f970"
-        },
-        "recipe": {
-            "sha256": "1x3rnrhhyrrvgry9n7kc0734la1zp4gc4bpy50f2qpfd452jwqdm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151023.1806",
-        "deps": []
-    },
-    "yaxception": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "yaxception",
-            "sha256": "0nqyn1b01v1qxv7rcf46qypca61lmpm8d7kqv63jazw3n05qdnj8",
-            "rev": "4e94cf3e0b9b5631b0e90eb4b7de597ee7185875"
-        },
-        "recipe": {
-            "sha256": "18n2kjbgfhkhcwigxmv8dk72jp57vsqqd20lc26v5amx6mrhgh58",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150105.852",
-        "deps": []
-    },
-    "haskell-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "haskell",
-            "repo": "haskell-mode",
-            "sha256": "1z4yagdzcl66ak0wiiqfxpy1l9j0rh5kb5ir597w2lpahgrxz9p7",
-            "rev": "8ef95feb969df21905d8b8942a32155fce21b1cd"
-        },
-        "recipe": {
-            "sha256": "0wijvcpfdbl17iwzy47vf8brkj2djarfr8y28rw0wqvbs381zzwp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.950",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "icicles": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/icicles.el",
-            "sha256": "1vr4wp808rv8kiq324ph2jfbqdw1wzii41rca45v5w21gway169s"
-        },
-        "recipe": {
-            "sha256": "15h2511gm38q14avsd86j5mnxhsjvcdmwbnhj66ashj5p5nxhr92",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151225.1201",
-        "deps": []
-    },
-    "linum-relative": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "coldnew",
-            "repo": "linum-relative",
-            "sha256": "0a3vljbgmbzcw6a4pb0pwf47h3rmcmjgzpgy8fa28a3j0g0z7jrj",
-            "rev": "3bed92ac52495938f3f23b626b2097e64a3d9dc0"
-        },
-        "recipe": {
-            "sha256": "0s1lc3lppazv0481dxknm6qrxhvkv0r9hw8xmdrpjc282l91whkj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151205.1956",
-        "deps": []
-    },
-    "fingers": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fgeller",
-            "repo": "fingers.el",
-            "sha256": "1vjgcxyzv2p74igr3y0z6hk7bj6yqwjawx90xvvmp9z7m91d4yrg",
-            "rev": "8fc8ae143736c4761fef69cb53c6083c5be5d914"
-        },
-        "recipe": {
-            "sha256": "1r8fy6q6isjxz9mvaa8in4imdghzla3gg1l93dfm1v2rlr7bhzbg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150809.1916",
-        "deps": []
-    },
-    "flymake-jslint": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-jslint",
-            "sha256": "0y01albwwcnhj4pnpvcry0zw7z2g9py9q2p3sw5zhgw3g0v5p9ls",
-            "rev": "68ca28a88cffdd317f50c712b09abd2ccda8d7bc"
-        },
-        "recipe": {
-            "sha256": "1cq8fni4p0qhigx0qh34ypmcsbnilra1ixgnrn9mgg8x3cvcm4cm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130613.402",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "flycheck-nim": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ALSchwalm",
-            "repo": "flycheck-nim",
-            "sha256": "06hs41l41hm08dv93wldd98hmnd3jqbg58pj5ymn15kgdsy1rirg",
-            "rev": "4cf6a70864e594c24b33c1032e2692ad1b310d6c"
-        },
-        "recipe": {
-            "sha256": "0w6f6998rqx8a3i4xhga7mrmvhxrm690wkqwfzspidid2z7v71az",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150911.1847",
-        "deps": [
-            "dash",
-            "flycheck"
-        ]
-    },
-    "org-bullets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sabof",
-            "repo": "org-bullets",
-            "sha256": "10nr4sjffnqbllv6gmak6pviyynrb7pi5nvrq331h5alm3xcpq0w",
-            "rev": "b70ac2ec805bcb626a6e39ea696354577c681b36"
-        },
-        "recipe": {
-            "sha256": "1kxhlabaqi1g6pz215afp65d9cp324s8mvabjh7q1h7ari32an75",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140918.1337",
-        "deps": []
-    },
-    "org-beautify-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jonnay",
-            "repo": "emagicians-starter-kit",
-            "sha256": "00iklf97mszrsdv20q55qhml1dscvmmalpfnlkwi9mabklyq3i6z",
-            "rev": "5fadbf1bf84091b6ffe6cd1bff48f30e3da6c479"
-        },
-        "recipe": {
-            "sha256": "1j2gi3f72kvavdcj6xs7zng0dcnivrhc7pjzm2g4mjm5ad5s1flq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150106.1156",
-        "deps": []
-    },
-    "bitly": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jorgenschaefer",
-            "repo": "bitly-el",
-            "sha256": "09blh9cbcbqr3pdaiwm9fmh5kzqm1v9mffy623z3jn87g5wadrmb",
-            "rev": "fca9d8da070402fa62d9289e56f7f1c5ce40f664"
-        },
-        "recipe": {
-            "sha256": "032s7ax8qp3qzcj1njbyyxiyadjirphswqdlr45zj6hzajfsr247",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151125.1048",
-        "deps": []
-    },
-    "scala-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "scala",
-            "repo": "scala-tool-support",
-            "sha256": "0qd3yi2as30kacr74vbzvyq97684s8sz585z30d47shqcvp6l1a6",
-            "rev": "0a217bc446b970116c67c933a747d5f57b853d34"
-        },
-        "recipe": {
-            "sha256": "1vbgphmvvsj5jl8f78rpsidlmlgyp1kq3nkmziqhwkcq8hfywssm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141205.1451",
-        "deps": []
-    },
-    "wimpy-del": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/wimpy-del.el",
-            "sha256": "05gmqx9qj95fd4lryvpp7rk93f1ibsvl3lqanraph0s73ir48x3z"
-        },
-        "recipe": {
-            "sha256": "10qw5lfq2392fr5sdz5a9bc6rvsg0j4dkrwvdhip1kqvajznw49x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1909",
-        "deps": []
-    },
-    "help+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/help+.el",
-            "sha256": "0vdga10l8vslsicrspl3wyhf6a5jxdwzqb7r8g07fbd4f09d57a4"
-        },
-        "recipe": {
-            "sha256": "1jx0wa4md1mvdsvjyx2yvi4hhm5w061qqcafsrw4axsz7gjpd4yi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150702.1143",
-        "deps": []
-    },
-    "org-projectile": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "IvanMalison",
-            "repo": "org-projectile",
-            "sha256": "1zskm97502f4yq1jr3k1j2mkdpbh8q7lm56wqnpbpv4gcprpx8gg",
-            "rev": "df1d4a843724f2e556305aea53567a0b3b403fb1"
-        },
-        "recipe": {
-            "sha256": "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150902.2356",
-        "deps": [
-            "dash",
-            "projectile"
-        ]
-    },
-    "doremi-mac": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/doremi-mac.el",
-            "sha256": "1zlb6r5qy46yf5x499gzk6kvdy427qf3s9gzmpf5mzszcy6rzsfx"
-        },
-        "recipe": {
-            "sha256": "0n9fffgxnpqc7cch7aci5kxbwzk36iljdz2r8gcp5y5n1p7aamls",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1553",
-        "deps": []
-    },
-    "magit-rockstar": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "magit-rockstar",
-            "sha256": "0p9fx9ph18ygsjknvmn63qq5h5lq4p833lccbyzy3sbivn46496j",
-            "rev": "6e09d3d1589e5bde7279f9bd5b8f27352ea26ef4"
-        },
-        "recipe": {
-            "sha256": "1i4fmraiypyd3q6vvibkg9xqfxiq83kcz64b1dr3wmwn30j7986n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151128.928",
-        "deps": [
-            "dash",
-            "magit"
-        ]
-    },
-    "list-environment": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dgtized",
-            "repo": "list-environment.el",
-            "sha256": "1szbs16jlxfj71986dbg0d3j5raaxcwz0xq5ar352731r5mdcqw4",
-            "rev": "b7ca30b05905047be2e55199a6475f8d98ce318b"
-        },
-        "recipe": {
-            "sha256": "1zdhrlp8vk8knjwh56pws6dyn003r6avjzvhghlkgnw9nfrdk57h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.2056",
-        "deps": []
-    },
-    "flyspell-popup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xuchunyang",
-            "repo": "flyspell-popup",
-            "sha256": "1rk7fsill0salrhb4anbf698nd21nxj8pni35brbmv64nj9fhfic",
-            "rev": "a3890c9272c0cfa1e2cde6526f7d6280ad4af00c"
-        },
-        "recipe": {
-            "sha256": "0wp15ra1ry6xpwal6mb53ixh3f0s4nps0rdyfli7hhaiwbr9bhql",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150926.1003",
-        "deps": [
-            "popup"
-        ]
-    },
-    "nameframe": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "john2x",
-            "repo": "nameframe",
-            "sha256": "07zgwyrss23yb8plnhhwmh0khdvfp539891sj1z1vs50jcllcpw5",
-            "rev": "96acff56b30f9d1145aeaf7a4c53c9a2c823ee8e"
-        },
-        "recipe": {
-            "sha256": "0iq8cfii39ha8sxn9w7kyfvys8kwyax8g4l0pkl05q0a0s95padp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151017.2319",
-        "deps": []
-    },
-    "pyvenv": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jorgenschaefer",
-            "repo": "pyvenv",
-            "sha256": "11scrmm15zyybl861l6izqsdysh8li7kkkwjm4p8cl5kmibiqrss",
-            "rev": "a0331f52ba2c9fe994ee423e4d82263b6f68a38a"
-        },
-        "recipe": {
-            "sha256": "0gai9idss1wvryxyqk3pv854mc2xg9hd0r55r2blql8n5rd2yv8v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151105.1719",
-        "deps": []
-    },
-    "persp-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Bad-ptr",
-            "repo": "persp-mode.el",
-            "sha256": "11xcaxd0c2jxm8gxhspi5v5y64xz4gx8xzy5qsw81y2gj96byjc5",
-            "rev": "1f80818462211a8f81b8e352ec28d6a6745e8396"
-        },
-        "recipe": {
-            "sha256": "1bgni7y5xsn4a21494npr90w3320snfzw1hvql30xrr57pw3765w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151222.659",
-        "deps": []
-    },
-    "replace-from-region": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/replace-from-region.el",
-            "sha256": "1clxkzxqsm91zbzv8nffav224ldr04ww5lppga2l41xjfl6z12qb"
-        },
-        "recipe": {
-            "sha256": "19q8hz2xiyamhw8hzpahqwd4352k1m9r9wlh9kdh6hbb6sjgllnb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150406.1930",
-        "deps": []
-    },
-    "fuel": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://factorcode.org/git/factor.git",
-            "sha256": "8f9db8a5dae2ddd9a8a7118c79fe40be3d9c890d112f5858fb98a6ea90a19e56",
-            "rev": "7e40b6037490f2194f0dcf02e18992e601e28b78"
-        },
-        "recipe": {
-            "sha256": "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151204.543",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "what-the-commit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "danielbarbarito",
-            "repo": "what-the-commit.el",
-            "sha256": "04w62davpqqqvympkr52bg54c2i45p09q9bs70p9ff5jvc6i3g76",
-            "rev": "868c80a1b8614bcbd2225cd0290142c72f2a7956"
-        },
-        "recipe": {
-            "sha256": "0nnyb6hq6r21wf1x3q41ab48b3dmcz5lyli771a59dk1gs8qpgak",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150901.816",
-        "deps": []
-    },
-    "xterm-keybinder": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yuutayamada",
-            "repo": "xterm-keybinder-el",
-            "sha256": "1jwimgglhqgp259wjqmpp1wi9j51qxcl1l356jlhjnfp1zh1ihmg",
-            "rev": "08d7c9b4c71db05df092010ba92f87567004b8c7"
-        },
-        "recipe": {
-            "sha256": "1n0zp1mc7x7z0671lf7p9r4qxic90bkf5q3zwz4vinpiw2qh88lz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151211.101",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "let-alist"
-        ]
-    },
-    "mic-paren": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/mic-paren.el",
-            "sha256": "1ibim60fx0srmvchwbb2s04dmcc7mv7zyg1vqavas24ya2gmixc5"
-        },
-        "recipe": {
-            "sha256": "1kdmp0wd7838nk58lby8gx91pjan47lq3izk4vdb2vm0h0iq57sa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140714.219",
-        "deps": []
-    },
-    "helm-core": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-helm",
-            "repo": "helm",
-            "sha256": "0l7dzk4xa4nfyj943x4gqcn1brfznfyrdxfwf1v097fp4ix8654q",
-            "rev": "e6fbd80f9f21e7cdb5d530f7aba138ad1dc527ab"
-        },
-        "recipe": {
-            "sha256": "1dyv8rv1728vwsp6vfdq954sp878jbp3srbfxl9gsgjnv1l6vjda",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151224.1331",
-        "deps": [
-            "async",
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "ssh-agency": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "ssh-agency",
-            "sha256": "0i9c146wmy47dpiar5gzyxrqbi4156hbbabc9h6zkxiyx0zb3p78",
-            "rev": "528122b182e9e8ade2361720ea05a5594f926c18"
-        },
-        "recipe": {
-            "sha256": "0lci3fhl2p9mwilvq1njzy13dkq5cp5ighymf3zs4gzm3w0ih3h8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151130.1754",
-        "deps": [
-            "dash",
-            "emacs"
-        ]
-    },
-    "bf-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-jp",
-            "repo": "bf-mode",
-            "sha256": "02b2m0cq04ynjcmr4j8gpdzjv9mpf1fysn736xv724xgaymj396n",
-            "rev": "7cc4d09aed64d9db6be95646f5f5067de68f8895"
-        },
-        "recipe": {
-            "sha256": "0b1yf9bx1ldkzry7v5qvcnl059rq62a50dvpa10i2f5v0y96n1q9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130403.942",
-        "deps": []
-    },
-    "sml-modeline": {
-        "fetch": {
-            "tag": "fetchbzr",
-            "url": "lp:~nxhtml/nxhtml/main",
-            "sha256": "1p10q1b5bvc8fvgfxynrq2kf1ygr6gad92x40zhaa5r1ksf6ryk4",
-            "rev": "835"
-        },
-        "recipe": {
-            "sha256": "086hslzznv6fmlhkf28mcl8nh4xk802mv6w0a4zwd5px2wyyaysd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120110.1440",
-        "deps": []
-    },
-    "wonderland": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kurisuwhyte",
-            "repo": "emacs-wonderland",
-            "sha256": "0hacc8ha5w44cgwkipa3nwh1q5gdrcxhjkmw2gnvb1l01crgnack",
-            "rev": "89d274ad694b0e748efdac23ccd60b7d8b73d7c6"
-        },
-        "recipe": {
-            "sha256": "1b4p49mbzqffm2b2y8sbbi56vnkxap2jscsmla9l6l8brybqjppi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130912.2019",
-        "deps": [
-            "dash",
-            "dash-functional",
-            "emacs",
-            "multi"
-        ]
-    },
-    "plsense": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "emacs-plsense",
-            "sha256": "1r2yxa7gqr0z9fwhx38siwjpg73a93rdmnhr4h6nm6lr32vviyxm",
-            "rev": "d50f9dccc98f42bdb42f1d1c8142246e03879218"
-        },
-        "recipe": {
-            "sha256": "1ka06r4ashhjkfyzql9mfvs3gj7n684h4gaycj29w4nfqrhcw9va",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151104.845",
-        "deps": [
-            "auto-complete",
-            "log4e",
-            "yaxception"
-        ]
-    },
-    "synonyms": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/synonyms.el",
-            "sha256": "1vqsi13ygbzjh3a6hdzidjy1p1xjxxvbisax8lcppy99l2cymr20"
-        },
-        "recipe": {
-            "sha256": "0rnq97jpr047gpkxhw22jj3gw09r45vn6fwkzxnxjzcmsyk492d0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150920.38",
-        "deps": []
-    },
-    "clipmon": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bburns",
-            "repo": "clipmon",
-            "sha256": "1xqszj16yim89pln9aw17lji5knxm3pklaihydagd7a1f99hr51w",
-            "rev": "a531c3e5d3cf760b00d3f00726a4e60e226aae99"
-        },
-        "recipe": {
-            "sha256": "1gvy1722px4fh88jyb8xx7k1dgyjgq7zjadr5fghdir42l0byw7i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151224.1147",
-        "deps": []
-    },
-    "datomic-snippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "datomic-snippets",
-            "sha256": "0ry7magy9x63xv2apjbpgszp0slch92g23gqwl4rd564qafajmf0",
-            "rev": "7116eac8e15a16fc72973b96fa855fd9784bbbb8"
-        },
-        "recipe": {
-            "sha256": "0lax0pj4k9c9n0gmrvil240pc9p25535q3n5m8nb2ar4sli8dn8r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130707.1515",
-        "deps": [
-            "dash",
-            "s",
-            "yasnippet"
-        ]
-    },
-    "save-load-path": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/save-load-path.el",
-            "sha256": "1p8p5b85sdnq45rdjq5wcr3xz7c22mr5bz41a21mkabc4j4fvd3z"
-        },
-        "recipe": {
-            "sha256": "01hm1rm9x3bqs6vf65l4xv2n4ramh3qwgmrp632fyfz5dlrvbssi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131228.1352",
-        "deps": []
-    },
-    "fic-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/fic-mode.el",
-            "sha256": "110h0ff7bkwx7icph0j997hq53zpyz426dji4vs89zf75cf1nl7s"
-        },
-        "recipe": {
-            "sha256": "037f2jr8bs2sfxw28cal2d49bsbrg0zkz2xdham627l04qnkgv8x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140421.1122",
-        "deps": []
-    },
-    "dionysos": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nlamirault",
-            "repo": "dionysos",
-            "sha256": "1ldqxdwy6r0fd2vh0ckkhgpincvybghavi8c7vvyd24j91i57y2f",
-            "rev": "98907a38e98ff1b02171a1ad8df246a291e04750"
-        },
-        "recipe": {
-            "sha256": "1wjgj74dnlwd79gc3l7ymbx75jka8rw9smzbb10dsfppw3rrzfmz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151013.303",
-        "deps": [
-            "alert",
-            "cl-lib",
-            "dash",
-            "libmpdee",
-            "pkg-info",
-            "s"
-        ]
-    },
-    "company-qml": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cute-jumper",
-            "repo": "company-qml",
-            "sha256": "07vcxwqynji7ggy9sb8lgpinkfjdiav0aybn5pnb0v8ck9v1w6k3",
-            "rev": "ae4a5f1ac30eb31e74e2eebf98c895c2cb5a51df"
-        },
-        "recipe": {
-            "sha256": "0sva7i93dam8mc2z3cp785vmgcg7cphrpkwyvqyqhq8w51qg8mxx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151027.1035",
-        "deps": [
-            "company",
-            "qml-mode"
-        ]
-    },
-    "graphene": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rdallasgray",
-            "repo": "graphene",
-            "sha256": "1f34bhjxmbf2jjrkpdvqg2gwp83ka6d5vrxmsxdl3r57yc6rbrwa",
-            "rev": "dcc0e34c6c4632d5d5445ec023f5b1ca04c7d1b7"
-        },
-        "recipe": {
-            "sha256": "1wz3rvd8b7gx5d0k7yi4dd69ax5bybcm10vdc7xp4yn296lmyl9k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151109.140",
-        "deps": [
-            "company",
-            "dash",
-            "exec-path-from-shell",
-            "flycheck",
-            "graphene-meta-theme",
-            "ido-ubiquitous",
-            "ppd-sr-speedbar",
-            "smartparens",
-            "smex",
-            "sr-speedbar",
-            "web-mode"
-        ]
-    },
-    "flycheck-package": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flycheck-package",
-            "sha256": "0aa8cnh9f0f2zr2kkba2kf9djzjnsd51fzj8l578pbj016zdarwd",
-            "rev": "ff93e8986a1021daf542c441c1fd50436ee83cba"
-        },
-        "recipe": {
-            "sha256": "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151029.1338",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "flycheck"
-        ]
-    },
-    "btc-ticker": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "niedbalski",
-            "repo": "emacs-btc-ticker",
-            "sha256": "022j0gw5qkxjz8f70vqjxysifv2mz6cigf9n5z03zmpvwwvxmx2z",
-            "rev": "845235b545f070d0812cd1654cbaa4997565824f"
-        },
-        "recipe": {
-            "sha256": "1vfnx114bvnly1k3fmcpkqq4m9558wqr5c9k9yj8f046dgfh8dp1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151113.859",
-        "deps": [
-            "json",
-            "request"
-        ]
-    },
-    "org-mac-iCal": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://orgmode.org/org-mode.git",
-            "sha256": "5f5c7580539162bd268e6e2703a47aea2a353984fe86158df72594d6105476d7",
-            "rev": "955bc57ded513be2cf2248a7d7a858c11a1110b3"
-        },
-        "recipe": {
-            "sha256": "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140107.719",
-        "deps": []
-    },
-    "annotate": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bastibe",
-            "repo": "annotate.el",
-            "sha256": "18ninv1z8zdqpqnablbds4zgxgk4c1nmznlfdicj6qs738c5c30s",
-            "rev": "a1690384317ce366e5a33aec916949e3328a0117"
-        },
-        "recipe": {
-            "sha256": "1ajykgara2m713blj2kfmdz12fzm8jw7klyakkyi6i3c3a9m44jy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151006.1133",
-        "deps": []
-    },
-    "helm-img": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "l3msh0",
-            "repo": "helm-img",
-            "sha256": "0py4xs27z2jvg99i6qaf2ccz0mvk6bb9cvdyz8v8ngmnj3rw2vla",
-            "rev": "aa3f8a5dce8d0413bf07584f07153a39015c2bfc"
-        },
-        "recipe": {
-            "sha256": "0sq9l1wgm97ppfc45w3bdcv0qq5m85ygnanv1bdcp8bxbdl4vg0q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151224.1721",
-        "deps": [
-            "cl-lib",
-            "helm"
-        ]
-    },
-    "elfeed-goodies": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "algernon",
-            "repo": "elfeed-goodies",
-            "sha256": "1r2liqjww0yscxjpg13dsfhhv3yjahlbas0dabqlh4f9q0jdrgj4",
-            "rev": "5983e70a3ed5d62d218e1149cfe777b10c3168e5"
-        },
-        "recipe": {
-            "sha256": "0zpk6nx757hasgzcww90fzkcdn078my33p7yax7xslvi4msm37bi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151224.358",
-        "deps": [
-            "ace-jump-mode",
-            "cl-lib",
-            "elfeed",
-            "noflet",
-            "popwin",
-            "powerline"
-        ]
-    },
-    "ox-mediawiki": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tomalexander",
-            "repo": "orgmode-mediawiki",
-            "sha256": "0c2m02g6csg5fqizj3zqcm88q7w17kgvgi7swcx4fzz6rixnpsji",
-            "rev": "973ebfc673dfb4beeea3d3ce648c917b58dcf879"
-        },
-        "recipe": {
-            "sha256": "0lijj2n4saw0xd3jaghbvx9v6a4ldl5gd8wy7s7hfcm30wb75cdb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150923.1102",
-        "deps": [
-            "cl-lib",
-            "s"
-        ]
-    },
-    "indy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "attichacker",
-            "repo": "indy",
-            "sha256": "0kv0aj444i2rzksvcfz8sw0yyig3ca3m05agnhw9jzr01y05yl1n",
-            "rev": "bc1edbaa6db7264dd64fbd04331406d889b44501"
-        },
-        "recipe": {
-            "sha256": "1brmsgnkhr5nlma1p8f5s78y9gw3rfm8sah55n6vyhr0dpb4z7kl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150610.1206",
-        "deps": []
-    },
-    "company-inf-ruby": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "company-mode",
-            "repo": "company-inf-ruby",
-            "sha256": "0fnv4rvvs9rqzrs86g23jcrpg0rcgk25299hm6jm08ia0kjjby1m",
-            "rev": "fe3e4863bc971fbb81edad447efad5795ead1b17"
-        },
-        "recipe": {
-            "sha256": "0cb1w0sxgb5jf0p2a5s2i4d511lsjjhyaqkqlwjz8nk4w14n0zxm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140805.1554",
-        "deps": [
-            "company",
-            "emacs",
-            "inf-ruby"
-        ]
-    },
-    "envdir": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "proofit404",
-            "repo": "envdir-mode",
-            "sha256": "0jb8hf4v02b0zd02749533arrypjr3b3k88129grfks2kf29ybhb",
-            "rev": "efbfc45de320d33cd5c52edfa73a399a8b4dc34b"
-        },
-        "recipe": {
-            "sha256": "085bfm4w7flrv8jvzdnzbdg3j5n29xfzbs1wlrr29mg9dja6s8g8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150519.955",
-        "deps": [
-            "dash",
-            "emacs",
-            "f"
-        ]
-    },
-    "flycheck-ghcmod": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "scturtle",
-            "repo": "flycheck-ghcmod",
-            "sha256": "0q1m1f3vhw1wy0pa3njy55z28psznbw2xwmwk2v1p5c86n74ns8d",
-            "rev": "6bb7b7d879f05bbae54e99eb04806c877adf3ccc"
-        },
-        "recipe": {
-            "sha256": "0mqxg622lqnkb52a0wff7h8b0k6mm1k7fhkfi95fi5sahclja0rp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150114.32",
-        "deps": [
-            "dash",
-            "flycheck"
-        ]
-    },
-    "zerodark-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "NicolasPetton",
-            "repo": "zerodark-theme",
-            "sha256": "1wv9wwc39555cr72z9pjnpymll8ifrhc527sph61pdilzlrmrc7q",
-            "rev": "98135542bad1fc894c718bc37e611f79434b693a"
-        },
-        "recipe": {
-            "sha256": "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151106.534",
-        "deps": []
-    },
-    "py-test": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Bogdanp",
-            "repo": "py-test.el",
-            "sha256": "1s39407z3rxz10r5sshv2vj7s23ylkhg59ixasgnpjk82gl4igpf",
-            "rev": "3b2a0bdaacb54df6f2bee8317423e5c0d159d5cf"
-        },
-        "recipe": {
-            "sha256": "1mbwbzg606winf5af7qkg6a1hg79lc7k2miq4d3mwih496l5sinb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151117.22",
-        "deps": [
-            "dash",
-            "emacs",
-            "f"
-        ]
-    },
-    "py-gnitset": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "quodlibetor",
-            "repo": "py-gnitset",
-            "sha256": "05803wi7rj73sy9ihkilr6pcn72szfsvgf2dgbdpnqra508rxyb6",
-            "rev": "471eb99b83eb9f6915d8ca241e9770ddd6244a78"
-        },
-        "recipe": {
-            "sha256": "0f6ivq4ignb4gfxw2q8qvigvv3fbvvyr87x25wcaz6yipg1lr18r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140224.2210",
-        "deps": []
-    },
-    "org-cua-dwim": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mlf176f2",
-            "repo": "org-cua-dwim.el",
-            "sha256": "0nrfvmqb70phnq0k4wbdj6z666wq6xvabg4pgv8qn62rbrw4yyhm",
-            "rev": "a55d6c7009fc0b22f1110c07de629acc955c85e4"
-        },
-        "recipe": {
-            "sha256": "0p7v564p8n1hm7rzlrbm2pnhyha8aif2r9g7g4kg0iqln89f5yhc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120202.2334",
-        "deps": []
-    },
-    "docbook-snippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jhradilek",
-            "repo": "emacs-docbook-snippets",
-            "sha256": "1nbm3wzd12rsrhnwlcc6b72b1ala328mfpcp5bwlfcdshw6mfcrq",
-            "rev": "b06297fdec039a541aaa6312cb328a11062cfab4"
-        },
-        "recipe": {
-            "sha256": "1ipqfylgiw9iyjc1nckbay890clfkhda81nr00cq06sjmm71iniq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150714.1125",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "quick-preview": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "quick-preview.el",
-            "sha256": "1cp3z05qjy7qvjjv105ws1j9qykx8sl4s13xff0ijwvjza6ga44c",
-            "rev": "29c884c6ab385ef67d9aa656ebb7c94cabeb5c35"
-        },
-        "recipe": {
-            "sha256": "18janbmhbwb6a46fgc1sxl9ww591v60y3wgh2wqh62vdy4ix3bd9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150828.2339",
-        "deps": []
-    },
-    "scad-preview": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "scad-preview",
-            "sha256": "1mx5bg4mbgj828mwjd9nlxli4ibcrgpzn9i6ns2g9zpgm932zlbc",
-            "rev": "a444532126bdec3dec9cacf55bc183780decf040"
-        },
-        "recipe": {
-            "sha256": "0wcd2r60ibbc2mzpq8fvyfc1fy172rf9kzdj51p4jyl51r76i86z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150818.824",
-        "deps": [
-            "scad-mode"
-        ]
-    },
-    "flx": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lewang",
-            "repo": "flx",
-            "sha256": "10f9135i9z2y4k0x6fbwm0g6vhsj6ag41xq504zpygqzp6y6ikmz",
-            "rev": "807d69455585d89804ecef233a9462db7d0524d8"
-        },
-        "recipe": {
-            "sha256": "04plfhrnw7jx2jaxhbhw4ypydfcb8v0x2m5hyacvrli1mca2iyf9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151030.1312",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "hardhat": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "hardhat",
-            "sha256": "13pgxskddir74lqknkkflzkrv6q455cf5s7wjww1zgvw95j7q50v",
-            "rev": "9355d174d49a514f3e176995ba93d5da7a25cbba"
-        },
-        "recipe": {
-            "sha256": "16pdbpm647ag9cadmdm75nwwyzrqsd9y1b4zgkl3pg669mi5vl5z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140827.2056",
-        "deps": [
-            "ignoramus"
-        ]
-    },
-    "pinyin-search": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xuchunyang",
-            "repo": "pinyin-search.el",
-            "sha256": "096izagfjw8cnxjq3v70x8a55npyxnr40mg1fc9b1jnqw6qwf491",
-            "rev": "53e75c2e32c03920dcc10334c7b62922779f2c8b"
-        },
-        "recipe": {
-            "sha256": "1si693nmmxgg0kp5mxvj5nq946kfc5cv3wfsl4znbqzps8qb2b7z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150719.1955",
-        "deps": []
-    },
-    "mouse+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/mouse+.el",
-            "sha256": "1l29smg3r2b2b08869wsrwyr5239gznd88xwf40q7qi350cj8fwy"
-        },
-        "recipe": {
-            "sha256": "1fv7jnqzskx9iv92dm2pf0mqy2accl0svjl2kkb6v273n1day3f8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151122.1052",
-        "deps": []
-    },
-    "sexp-move": {
-        "fetch": {
-            "tag": "fetchFromGitLab",
-            "owner": "elzair",
-            "repo": "sexp-move",
-            "sha256": "11h5z2gmwq07c4gqzj2c9apksvqk3k8kpbb9kg78bbif2xfajr3m",
-            "rev": "117f7a91ab7c25e438413753e916570122011ce7"
-        },
-        "recipe": {
-            "sha256": "0lcxmr2xqh8z7xinxbv1wyrh786zlahhhj5nnbv83i8m23i3ymmd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150915.1230",
-        "deps": []
-    },
-    "mc-extras": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knu",
-            "repo": "mc-extras.el",
-            "sha256": "0252wdq4sd6jhzfy0pn3gdm6aq2h13nnp8hvrn1mpml9x473a5n1",
-            "rev": "71cf966be06d9c74e781a87bb30fa4cf657ee852"
-        },
-        "recipe": {
-            "sha256": "0b110x6ygc95v5pb9lk1i731x5s6dagl5afzv37l1qchys36xrym",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150218.434",
-        "deps": [
-            "multiple-cursors"
-        ]
-    },
-    "desktop-registry": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://ryuslash.org/desktop-registry.git",
-            "sha256": "7c7727dd1d63be98e428700bfe340f2c4e7ff713fcc9b2b743a3366d786ae02d",
-            "rev": "244c2e7f9f0a1050aa8a47ad0b38f4e4584682dd"
-        },
-        "recipe": {
-            "sha256": "02mj0nlawx6vpksqsvp1q7l8rd6b1bs8f9c8c2rmda46jaf5npyr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140119.1543",
-        "deps": []
-    },
-    "seoul256-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ChrisDavison",
-            "repo": "seoul256.el",
-            "sha256": "15vmd1qmj8a6a5mmvdcnbav6mi5rhrp39m85idzv02zm0x9x6lyc",
-            "rev": "32790703847b868e8fdd9c0736b0b8a0167f97cf"
-        },
-        "recipe": {
-            "sha256": "0mgyq725x5hmhs3h8v5macv8bfkginjghhwr9kli60vdb4skgjvp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150714.1735",
-        "deps": []
-    },
-    "test-kitchen": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jjasghar",
-            "repo": "test-kitchen-el",
-            "sha256": "125k13sqgxk963c04zn49jidvzx0hl0s4vvc9jpffgq8aq0mnnmr",
-            "rev": "3f3647bf437563493331821638f5f5829ae7dd26"
-        },
-        "recipe": {
-            "sha256": "1bl3yvj56dq147yplrcwphcxiwvmx5n97y4qpkm9imiv8cnjm1g0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151027.627",
-        "deps": []
-    },
-    "llvm-mode": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "http://llvm.org/git/llvm",
-            "sha256": "31e826259c8497fcbe810bae9a51780766a0b676448746fd8ceeff285369fafc",
-            "rev": "d3bcf04e8331314fbfec3f0af41e137b6bd242c7"
-        },
-        "recipe": {
-            "sha256": "0j3zsd0shd7kbi65a2ha7kmr0zy3my05378swx6m5m9x7miyr4y7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150910.844",
-        "deps": []
-    },
-    "dired-rainbow": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "dired-hacks",
-            "sha256": "15jri9cj5jgr3ff423izd8idd7djay238c9pa3ccy05djl9z2hdx",
-            "rev": "6647825dbca4269afa76302e345d6bd15b222e42"
-        },
-        "recipe": {
-            "sha256": "1b9yh8p2x1dg7dyqhjhnqqiiymyl6bwsam65j0lpvbdx8r4iw882",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141214.743",
-        "deps": [
-            "dash",
-            "dired-hacks-utils"
-        ]
-    },
-    "thrift": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "apache",
-            "repo": "thrift",
-            "sha256": "1rd947vs6md9rdchqrpwm8qq5gxiz547npvph7njlahbpbm4xgyj",
-            "rev": "6dde7f19254db71cf27df214a59d7156967237fc"
-        },
-        "recipe": {
-            "sha256": "0p1hxmm7gvhyigz8aylncgqbhk6cyf75rbcqis7x552g605mhiy9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140312.1548",
-        "deps": []
-    },
-    "better-defaults": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "technomancy",
-            "repo": "better-defaults",
-            "sha256": "0j3wpw43q262wnq5214r20r15sy2hihbiak5j7ag23lq9jx2jvva",
-            "rev": "b7888289ed702aff1616cbff832c97d4e5fc2463"
-        },
-        "recipe": {
-            "sha256": "13bqcmx2gagm2ykg921ik3awp8zvw5d4lb69rr6gkpjlqp7nq2cm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150404.423",
-        "deps": []
-    },
-    "wwtime": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ndw",
-            "repo": "wwtime",
-            "sha256": "0ba193ilqmp7l35hhzfym4kvbnj9h57m8mwsxdj6rdj2cwrifx8r",
-            "rev": "d04d8fa814b5d3644efaeb28f25520ada69acbbd"
-        },
-        "recipe": {
-            "sha256": "0n37k23lkjgaj9wxnr41yk3mwvy62mc9im5l86czqmw5gy4l63ic",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151122.1010",
-        "deps": []
-    },
-    "color-theme-solarized": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sellout",
-            "repo": "emacs-color-theme-solarized",
-            "sha256": "1xd2yk7p39zxgcf91s80pqknzdxw9d09cppjb87g7ihj6f0wxqjv",
-            "rev": "412713a0fcedd520d208a7b783fea03d710bcc61"
-        },
-        "recipe": {
-            "sha256": "011rzq38ffmq7f2nzwrq96wwz67p82p1f0p5nib4nwqa47xlx7kf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150619.1934",
-        "deps": [
-            "color-theme"
-        ]
-    },
-    "cinspect": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "inlinestyle",
-            "repo": "cinspect-mode",
-            "sha256": "190n4kdcqdwglhnawnj9mqjarmcaqylxipc07whmrii0jv279kjw",
-            "rev": "4e199a90f89b335cccda1518aa0963e0a1d4fbab"
-        },
-        "recipe": {
-            "sha256": "0djh61mrfgcm3767ll1l5apw6646j4fdcaripksrmvn5aqfn8rjj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150715.2133",
-        "deps": [
-            "cl-lib",
-            "deferred",
-            "emacs",
-            "python-environment"
-        ]
-    },
-    "nu-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pyluyten",
-            "repo": "emacs-nu",
-            "sha256": "0nbmpnljl0wdkwmxzg6lqd3mand9w043qmwp727hb84gxy0j4dib",
-            "rev": "e2b509a9b631e98f6feabdc783c01a6b57d05fc2"
-        },
-        "recipe": {
-            "sha256": "0h5jaw577vgm3hfiwc2c0k1wn8zda8ps06vj6mqj952m8bqhf4i7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150413.1515",
-        "deps": [
-            "helm",
-            "undo-tree"
-        ]
-    },
-    "plsense-direx": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "plsense-direx",
-            "sha256": "0s34nbqqy6aqi113xj452pbmqp43046wfbfbbfv1xwhybgq0c1j1",
-            "rev": "8a2f465264c74e04524cc789cdad0190ace43f6c"
-        },
-        "recipe": {
-            "sha256": "0qd4b7gkmn5ydadhp70995rap3643s1aa8gfi5izgllzhg0i864j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140520.1508",
-        "deps": [
-            "direx",
-            "log4e",
-            "plsense",
-            "yaxception"
-        ]
-    },
-    "cygwin-mount": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/cygwin-mount.el",
-            "sha256": "09my4gj3qm9rdpk8lg6n6ki8ywj7kwzwd4hhgwascfnfi1hzwdvw"
-        },
-        "recipe": {
-            "sha256": "0ik2c8ab9bsx58mgcv511p50h45cpv7455n4b0kri83sx9xf5abb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131111.1546",
-        "deps": []
-    },
-    "aggressive-fill-paragraph": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "davidshepherd7",
-            "repo": "aggressive-fill-paragraph-mode",
-            "sha256": "18zlxgwcvqhlw9y7zn6fywmy04f7rs71fd5ihcx28j4rx9ay929c",
-            "rev": "9af6a31b7c47306fb524bcc8582e0a3738701f25"
-        },
-        "recipe": {
-            "sha256": "1df4bk3ks09805y67af6z1gpfln0lz773jzbbckfl0fy3yli0dja",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151112.141",
-        "deps": [
-            "dash"
-        ]
-    },
-    "eshell-git-prompt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xuchunyang",
-            "repo": "eshell-git-prompt",
-            "sha256": "1b94pamb92a26lvlbwyr7kgaiwax4hkgmmalh8l5ldcwxkscq09c",
-            "rev": "1751dd26dab245fd9567ed5eb09ba0b312699eac"
-        },
-        "recipe": {
-            "sha256": "0a8pyppqvnavvb8rwsjxagb76hra9zhs5gwa0ylyznmql83f8w8s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150929.47",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "emacs",
-            "s"
-        ]
-    },
-    "stgit": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://repo.or.cz/stgit.git",
-            "sha256": "c5d424f34ca33d2c19e3888a9dc249d0398203e5199bf2b4bdd9e604390b500b",
-            "rev": "e4e04764009f749665636c4d11e0cafd9c4971e1"
-        },
-        "recipe": {
-            "sha256": "102s9lllrcxsqs0lgbrcljwq1l3s8ri4276wck6rcypck5zgzj89",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140213.548",
-        "deps": []
-    },
-    "poporg": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "QBobWatson",
-            "repo": "poporg",
-            "sha256": "0ja1kq4pl62zxlzwv2m8zzb55lg2fl366bi9pzvxl38frvbqg8qx",
-            "rev": "d4d8b3e6206b0af4044d1dcecfc0bd2193704e07"
-        },
-        "recipe": {
-            "sha256": "08s42689kd78h2fmw230ja5dd3c3b4lx5mzadncwq0lj91y86kd8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150603.2047",
-        "deps": []
-    },
-    "cdb": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skk-dev",
-            "repo": "ddskk",
-            "sha256": "0yrjrrm0rkrvr34jwxbl5bm8ahr7w5xh76k859qwgi2cbz6vr7q0",
-            "rev": "47980e6c4f9979ff0b2d656befa5366c57e4527b"
-        },
-        "recipe": {
-            "sha256": "1gx34062h25gqsl3j1fjlklha19snvmfaw068q6bv6x9r92niqnf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151205.743",
-        "deps": []
-    },
-    "kite-mini": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tungd",
-            "repo": "kite-mini.el",
-            "sha256": "1m0f1hiczq88qjy573rhlkw2lmjy814cgdl42zxsjbf78wg4qx8d",
-            "rev": "d9eb14593364f7d58eed3f26b45e8aef5b845b20"
-        },
-        "recipe": {
-            "sha256": "1g644406zm3db0fjyv704aa8dbd20v1apmysb3mmh2vldbch4iyh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150811.1329",
-        "deps": [
-            "dash",
-            "websocket"
-        ]
-    },
-    "ac-html-bootstrap": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "osv",
-            "repo": "ac-html-bootstrap",
-            "sha256": "0v33p6lnsq1nwyxfbgs6vg6fidfyqwxd5wls2yza95yxzl30m9r7",
-            "rev": "ea9f7e351e1f39e0c2da5f518948db5ee751d15b"
-        },
-        "recipe": {
-            "sha256": "0z71m6xws0k9smhsswaivpikr64mv0wh6klnmi5cwhwcqas6kdi1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151222.1512",
-        "deps": [
-            "web-completion-data"
-        ]
-    },
-    "zlc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mooz",
-            "repo": "emacs-zlc",
-            "sha256": "1gb51bqdf87yibs1zngk6q090p05293cpwlwbwzhnih9sl6wkq8x",
-            "rev": "4dd2ba267ecdeac845a7cbb3147294ee7daa25f4"
-        },
-        "recipe": {
-            "sha256": "0qw0qf14l09mcnw7h0ccbw17psfpra76qfawkc10zpdb5a2167d0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151010.2057",
-        "deps": []
-    },
-    "julia-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "JuliaLang",
-            "repo": "julia",
-            "sha256": "0ng603klkc56577qcn4gcayrqc38g2fyargjzj0nk7gc8kkd443r",
-            "rev": "1380bfe231858b49f0395377ee0af1aa383bbf93"
-        },
-        "recipe": {
-            "sha256": "0c5bdgh98hw7484s2is84af7hznd8c4z5vlzfd98s8qxi7bldqjm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150912.1000",
-        "deps": []
-    },
-    "term+mux": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarao",
-            "repo": "term-plus-mux-el",
-            "sha256": "12gfvcf7hl29xhg231cx76q04ll7cvfpvhkb0qs3qn1sqb50fs2q",
-            "rev": "81b60e80cf008472bfd7fad9233af2ef722c208a"
-        },
-        "recipe": {
-            "sha256": "129kzjpi5nzagqkjfikx9i7k6489dy7d3pd7ggn59p4cnh3r2rhh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140211.149",
-        "deps": [
-            "tab-group",
-            "term+"
-        ]
-    },
-    "chinese-remote-input": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tumashu",
-            "repo": "chinese-remote-input",
-            "sha256": "06k13wk659qw40aczq3i9gj0nyz6vb9z1nwsz7c1bgjbl2lh6hcv",
-            "rev": "d05d0bd116421e6fd19f52e9e576431ee5de0858"
-        },
-        "recipe": {
-            "sha256": "0nnccm6w9i0qsgiif22hi1asr0xqdivk8fgg76mp26a2fv8d3dag",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150110.2303",
-        "deps": []
-    },
-    "flycheck-status-emoji": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "liblit",
-            "repo": "flycheck-status-emoji",
-            "sha256": "17mhsxnixw37x9jpy59nn3npw93r1rza2zcw6jmqzandmj0jyvm4",
-            "rev": "a6ae7b108110acc4dba32e616c8b02555455ea67"
-        },
-        "recipe": {
-            "sha256": "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150924.1314",
-        "deps": [
-            "emacs",
-            "flycheck",
-            "let-alist"
-        ]
-    },
-    "gitlab": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nlamirault",
-            "repo": "emacs-gitlab",
-            "sha256": "07i4j9yl1yag70sl89n7v4yg4jvh5mrifhrf1xswlb29by6najdx",
-            "rev": "78deece7f314f9652b50117605e93be9f8c860f4"
-        },
-        "recipe": {
-            "sha256": "0vxsqfnipgapnd2ijvdnkspk68dlnki3pkpkzg2h6hyazmzrsqnq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151202.238",
-        "deps": [
-            "dash",
-            "pkg-info",
-            "request",
-            "s"
-        ]
-    },
-    "ivariants": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kawabata",
-            "repo": "emacs-ivariants",
-            "sha256": "12nqpzcmz724wpk8p16lc3z26rxma3wp6pf6dvrsqagnlixrs9si",
-            "rev": "f9deff2e6fba5647f69771546fb2283136d0fb0d"
-        },
-        "recipe": {
-            "sha256": "00fgcm62g4fw4306lw9ld2k7w0c358fcbkxn969k5p009g7pk5bw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140720.2327",
-        "deps": [
-            "emacs",
-            "ivs-edit"
-        ]
-    },
-    "highlight-tail": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/highlight-tail.el",
-            "sha256": "1bbiyqddqkrp3c7xsg1m4143611bhg1kkakrwscqjb4cfmx29qqg"
-        },
-        "recipe": {
-            "sha256": "187kv3n262l38jdapi9bwcafz8fh61pdq2zliwiz7m7xdspp2iws",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140415.2041",
-        "deps": []
-    },
-    "common-lisp-snippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mrkkrp",
-            "repo": "common-lisp-snippets",
-            "sha256": "1cc9ak9193m92g6l4mrfxbkkmvljl3c51d0xzdidwww978q3x6ad",
-            "rev": "3b2b50fda8b1526d45a74e3d30f560d6b6bbb284"
-        },
-        "recipe": {
-            "sha256": "0ig8cz00cbfx0jckqk1xhsvm18ivl2mjvcn65s941nblsywfvxjl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150910.547",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "apples-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tequilasunset",
-            "repo": "apples-mode",
-            "sha256": "0br0jl6xnajdx37s5cvs13srn9lldg58y9587a11s3s651xjdq0z",
-            "rev": "83a9ab0d6ba82496e2f7df386909b1a55701fccb"
-        },
-        "recipe": {
-            "sha256": "05ssnxs9ybc26jhr69xl9jpb41bz1688minmlc9msq2nvyfnj97s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20110120.2218",
-        "deps": []
-    },
-    "reveal-in-osx-finder": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kaz-yos",
-            "repo": "reveal-in-osx-finder",
-            "sha256": "1q13cgpz4wzhnqv84ablawy3y2wgdwy46sp7454mmfx9m77jzb2v",
-            "rev": "5710e5936e47139a610ec9a06899f72e77ddc7bc"
-        },
-        "recipe": {
-            "sha256": "00jgrmh5s3vlpj1jjf8l3c3h4hjk5x781m95sidw6chimizvfmfc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150802.1157",
-        "deps": []
-    },
-    "minitest": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "arthurnn",
-            "repo": "minitest-emacs",
-            "sha256": "0svv44f9fham9icqq3v31n9728wap4fa0dq241sikbbrw0lnq3gx",
-            "rev": "c2019088087ebb5e3fe32eae9ae8156db08bd82d"
-        },
-        "recipe": {
-            "sha256": "0x6nd4kkhiw8hh79r69861pf41j8p1y39kzf2rl61zlmyjz9zpmw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151015.1331",
-        "deps": [
-            "dash"
-        ]
-    },
-    "evil-god-state": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gridaphobe",
-            "repo": "evil-god-state",
-            "sha256": "1cv24qnxxf6n1grf4n5969v8y9xll5zb9mbfdnq9iavdvhnndk2h",
-            "rev": "3d44197dc0a1fb40e7b7ff8717f8a8c339ce1d40"
-        },
-        "recipe": {
-            "sha256": "1g547d58zf11qw0zz3fk5kmrzmfx1rhawyh5d2h8bll8hwygnrxf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141116.2055",
-        "deps": [
-            "evil",
-            "god-mode"
-        ]
-    },
-    "org-mac-link": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://orgmode.org/org-mode.git",
-            "sha256": "5f5c7580539162bd268e6e2703a47aea2a353984fe86158df72594d6105476d7",
-            "rev": "955bc57ded513be2cf2248a7d7a858c11a1110b3"
-        },
-        "recipe": {
-            "sha256": "02rmhrwikppppw8adnzvwj43kp9wsyk60csj5pygg7cd7wah7khw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151218.428",
-        "deps": []
-    },
-    "occur-x": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "juan-leon",
-            "repo": "occur-x",
-            "sha256": "1zj0xhvl5qx42injv0av4lyzd3jsjls1m368dqd2qnswhfw8wfn6",
-            "rev": "352f5fab207d8a1d3dd048073ff127a83e97c82b"
-        },
-        "recipe": {
-            "sha256": "1xq1k9rq7k1zw90shbgiidwvcn0ys1d53q03b5mpvvfqhj4n0i1g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130610.843",
-        "deps": []
-    },
-    "evil-matchit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "redguardtoo",
-            "repo": "evil-matchit",
-            "sha256": "0kf4m1ghpxfalqx2zwm1d8xav4d6l6bpk79g5cvssk5jz5913fbi",
-            "rev": "8b80b3df9472217d55962981025539f2da603296"
-        },
-        "recipe": {
-            "sha256": "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151120.535",
-        "deps": []
-    },
-    "sqlup-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "trevoke",
-            "repo": "sqlup-mode.el",
-            "sha256": "0p2g4ss3bf2asxcibrd8l70ll04nm47znr99l5xyzzwhyfzi61w4",
-            "rev": "9cb9662673b7bed891582cfc1080d91a254048f7"
-        },
-        "recipe": {
-            "sha256": "06a0v2qagpd9p2bh19bfw14a6if8kjjc4yyhm5nwp8a8d2vnl5l7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151121.830",
-        "deps": []
-    },
-    "ox-impress-js": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kinjo",
-            "repo": "org-impress-js.el",
-            "sha256": "1kf2si2lyy0xc971bx5zd2j9mnz1smc9s8l0dwc6iksh2v9q8cy9",
-            "rev": "91c6d2af6af308ade352a03355c4fb551b238c6b"
-        },
-        "recipe": {
-            "sha256": "0p0cc51lmxgl0xv951ybdg5n8gbzv8qf0chfgigijizzjypxc21l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150412.1216",
-        "deps": [
-            "org"
-        ]
-    },
-    "flycheck-gometalinter": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "favadi",
-            "repo": "flycheck-gometalinter",
-            "sha256": "1hvjbvrarg39bi761bfvg4i3psz03pcilpp9zb6zb01vnhihwgd0",
-            "rev": "bc82ffa3ad4a4407a4eddc9bc06ff0b7df9d4ab3"
-        },
-        "recipe": {
-            "sha256": "1bnvj5kwgbh0dv989rsjcvmcij1ahwcz0vpr6a8f2p6wwvksw1h2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151201.1128",
-        "deps": [
-            "emacs",
-            "flycheck"
-        ]
-    },
-    "hipster-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xzerocode",
-            "repo": "hipster-theme",
-            "sha256": "17dcpwx2y464g8qi3ixlsf3la8dn0bkxax296bhfg4vh73dxccl3",
-            "rev": "0583bcef489c0bbe2393f813c17f634a9487e04f"
-        },
-        "recipe": {
-            "sha256": "1xrgpqlzp4lhh5h3sv7pg1nqzc9wcv1hs6ybv2h4x6jangicwfl2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141205.2205",
-        "deps": []
-    },
-    "ir-black-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jmdeldin",
-            "repo": "ir-black-theme.el",
-            "sha256": "1cy9xwhswj9vahg8zr16r2crm2mm3vczqs73gc580iidasb1q1i2",
-            "rev": "36e930d107604b5763c80294a6f92aaa02e6c272"
-        },
-        "recipe": {
-            "sha256": "1qpq9zbv63ywzk5mlr8x53g3rn37k0mdv6x1l1hcd90gka7vga9v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130303.155",
-        "deps": []
-    },
-    "password-store": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "http://git.zx2c4.com/password-store",
-            "sha256": "9c3ee0155b9d6b96acacaab8e799b23e92550ef136ffa2c07880029af3061733",
-            "rev": "bffca1ee21a38f1e808fa83e5df2fcf0f808cb9f"
-        },
-        "recipe": {
-            "sha256": "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151027.1649",
-        "deps": [
-            "f",
-            "s"
-        ]
-    },
-    "subr+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/subr+.el",
-            "sha256": "16k141aikvwg5dsw8mfkv222ikjdch0178dm8w58km0mjj7j81wk"
-        },
-        "recipe": {
-            "sha256": "1vrv64768f7rk58mqr4pq1fjyi5n5kfqk90hzrwbvblkkrmilmfs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1855",
-        "deps": []
-    },
-    "memento": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ehartc",
-            "repo": "memento",
-            "sha256": "0pjqax3pi6pb650yb8iwa4brwwl6cdka7jym3cfkpppyy782dm0q",
-            "rev": "35733b79101f694346792a57df686cbffe64bd79"
-        },
-        "recipe": {
-            "sha256": "0f8ajhj677r2kxszmad6h1j1b827ja0vaz2my1vx145y3gf160b8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150823.539",
-        "deps": []
-    },
-    "django-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "andrzejsliwa",
-            "repo": "django-theme.el",
-            "sha256": "1azf4p6salga7269l0kf13bqlxf9idp0ys8mm20qpyjpj79p5g9w",
-            "rev": "86c8142b3eb1addd94a43aa6f1d98dab06401af0"
-        },
-        "recipe": {
-            "sha256": "1rydl857zfpbvd7aziz6h7n3rrh584z2cbfxlss3wgfclzmbyhgf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131022.402",
-        "deps": []
-    },
-    "vimrc-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mcandre",
-            "repo": "vimrc-mode",
-            "sha256": "000fs2h5zcv8aq8an16r6zwwf9x1qnfs7xxn39iahiwfzvnljqp0",
-            "rev": "d4c7d41091eb282e617c973f5b1fc29c69dc9a28"
-        },
-        "recipe": {
-            "sha256": "06hisgsn0czvzbq8m4dz86h4q75j54a0gxkg5shnr8s654d450bp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150607.1113",
-        "deps": []
-    },
-    "highlight-unique-symbol": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hitode909",
-            "repo": "emacs-highlight-unique-symbol",
-            "sha256": "0hhc2l4pz6q8injpplv6b5l08l8q2lnjdpwabp7gwmhraq54rhjx",
-            "rev": "4141bf86a94e30d94d9af9c29d40b16886226e1c"
-        },
-        "recipe": {
-            "sha256": "0lwl8pkmq0q4dvyflarggnn8vzpvk5hhcnk508r6xml2if1sg9zx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130612.42",
-        "deps": [
-            "deferred"
-        ]
-    },
-    "extend-dnd": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "extend-dnd",
-            "sha256": "15dwl1rb3186k328a83dz9xmslc0px60ah16fifvmr3migis9hwz",
-            "rev": "80c966c93b82c9bb5c6225a432557c39144fc602"
-        },
-        "recipe": {
-            "sha256": "0rknpvp8yw051pg3blvmjpp3c9a82jw7f10mq67ggbz98w227417",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151122.1250",
-        "deps": []
-    },
-    "bts-github": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "emacs-bts-github",
-            "sha256": "1sfr3j11jz4k9jnfa9i05bp4v5vkil38iyrgsp3kxf15797b9dg9",
-            "rev": "57c23f2b842f6775f0bbbdff97eeec78474be6bc"
-        },
-        "recipe": {
-            "sha256": "03lz12bbkjqbs82alc97k6s1pmk721qip3h9cifq8a5ww5cbq9ln",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150108.227",
-        "deps": [
-            "bts",
-            "gh"
-        ]
-    },
-    "ac-haskell-process": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "ac-haskell-process",
-            "sha256": "0m33v9iy3y37sicfmpx7kvmn8v1a8k6cs7d0v9v5k93p4d5ila41",
-            "rev": "0362d4323511107ec70e7165cb612f3ab01b712f"
-        },
-        "recipe": {
-            "sha256": "0kv4z850kv03wiax1flnrp6sgqja25j23l719w7rkr7ck110q8rw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150423.902",
-        "deps": [
-            "auto-complete",
-            "haskell-mode"
-        ]
-    },
-    "erc-view-log": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Niluge-KiWi",
-            "repo": "erc-view-log",
-            "sha256": "0bzi2sh2fhrz49j5y53h6jgf41av6rx78smb3bbk6m74is8vim2y",
-            "rev": "c5a25f0cbca84ed2e4f72068c02b66bd0ea3b266"
-        },
-        "recipe": {
-            "sha256": "1k6fawblz0d7kz1y7sa3q43s7ci28jsmzkp9vnl1nf55p9xvv4cf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140227.1439",
-        "deps": []
-    },
-    "jst": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cheunghy",
-            "repo": "jst-mode",
-            "sha256": "16jgmabcqrjb3v9c6q711jqn9dna88bmzm4880mdry69ixwcydxy",
-            "rev": "2a3fd16c992f7790dc67134ef06a814c3d20579c"
-        },
-        "recipe": {
-            "sha256": "0hp1f7p6m1gfv1a3plavzkzn87dllb5g2xrgg3mch4qsgdbqx65i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150604.638",
-        "deps": [
-            "dash",
-            "emacs",
-            "f",
-            "pcache",
-            "s"
-        ]
-    },
-    "flx-ido": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lewang",
-            "repo": "flx",
-            "sha256": "10f9135i9z2y4k0x6fbwm0g6vhsj6ag41xq504zpygqzp6y6ikmz",
-            "rev": "807d69455585d89804ecef233a9462db7d0524d8"
-        },
-        "recipe": {
-            "sha256": "00wcwbvfjbcx8kyap7rl1b6nsgqdwjzlpv6al2cdpdd19rm1vgdc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151030.1312",
-        "deps": [
-            "cl-lib",
-            "flx"
-        ]
-    },
-    "helm-open-github": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-helm-open-github",
-            "sha256": "1wkmbc7247f209krvw4dzja3z0wyny12x5yi1cn3fnfh5nx04851",
-            "rev": "4c5a47003b2efed1c3437e91121a77d082cf64c8"
-        },
-        "recipe": {
-            "sha256": "121sszwvihbv688nq5lhdclvsjj8759glh42h82r4pcw30lxggxb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.842",
-        "deps": [
-            "cl-lib",
-            "gh",
-            "helm-core"
-        ]
-    },
-    "xresources-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "CQQL",
-            "repo": "xresources-theme",
-            "sha256": "1n3biybylvq5c1lpf7zsjsgdrg7mzrhkaw251fp8qmsss0s3sv4g",
-            "rev": "4842144f9f83e9d6f71f5ba2fd3abdcf6887de8f"
-        },
-        "recipe": {
-            "sha256": "0spqa3xn3p2lmvlc5hdn7prq4vb70nkyrryx1kavha9igzhlyaga",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141219.1117",
-        "deps": []
-    },
-    "enclose": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "enclose",
-            "sha256": "0dz5xm05d7irh1j8iy08jk521p19cjai1kw68z2nngnyf1az7cim",
-            "rev": "2747653e84af39017f503064bc66ed1812a77259"
-        },
-        "recipe": {
-            "sha256": "04gs468qqhdc9avx7lgibr0f1i444714i7rifad37dfmim8qk759",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121008.1114",
-        "deps": []
-    },
-    "magic-latex-buffer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "magic-latex-buffer",
-            "sha256": "102qvck8piskirlpz6y5m3slli8913flkjw6jzz1ymxcw9mszaz3",
-            "rev": "9039acc76000d3c11444fc8782343344247f6fb3"
-        },
-        "recipe": {
-            "sha256": "0xm4vk4aggyfw96cgya5cp97jzx5ha0xwpf2yfh7c3m8d9cca4y8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151211.202",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "nvm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "nvm.el",
-            "sha256": "0prag0ks511ifa5mdpqmizp5n8190dxp4vdr81ld9w9xv7migpd7",
-            "rev": "d6c7ad048f1d2854ec3c043d80528857aa1090a8"
-        },
-        "recipe": {
-            "sha256": "03gy7wavc2q02lnr9pmp3l1pn0lzbdq0kwnmg9fvklmq6r6n3x34",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151113.255",
-        "deps": [
-            "dash",
-            "dash-functional",
-            "f",
-            "s"
-        ]
-    },
-    "organic-green-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kostafey",
-            "repo": "organic-green-theme",
-            "sha256": "0q90vm2z3vs9hg9zg5dl6c35f7ivzxj5df3y3h9xjif494ladbsg",
-            "rev": "c4d68c3329147aedd066a88b6d5e5266bcd59dcc"
-        },
-        "recipe": {
-            "sha256": "1fdj3dpcdqx0db5q8dlxag6pr2qn4yiz1hmg3c7dkmh51n85ssw2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151028.720",
-        "deps": []
-    },
-    "ruby-factory": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sshaw",
-            "repo": "ruby-factory-mode",
-            "sha256": "1xwh71kpjn8ql3qp0s35c4ql3niab31igj21k1gcybdfv316mcyd",
-            "rev": "134a91c854c06d0d06038005769ce20b2a8177bd"
-        },
-        "recipe": {
-            "sha256": "0v8009pad0l41zh9r1wzcx1h6vpzhr5rgpq6rb002prxz2lcbd37",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151011.1023",
-        "deps": [
-            "inflections"
-        ]
-    },
-    "kv": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nicferrier",
-            "repo": "emacs-kv",
-            "sha256": "0r0lz2s6gvy04fwnafai668jsf4546h4k6zd6isx5wpk0n33pj5m",
-            "rev": "721148475bce38a70e0b678ba8aa923652e8900e"
-        },
-        "recipe": {
-            "sha256": "1vzifi6zpkmsh1a3c2njrw7mpfdgyjvpbz3bj42j8cg3vwjnjznb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140108.934",
-        "deps": []
-    },
-    "org-mobile-sync": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "steckerhalter",
-            "repo": "org-mobile-sync",
-            "sha256": "0d22q57mizw70qxbvwi4yz15jg86icqq1z963rliwss3wgpirndh",
-            "rev": "3b086ffebfead48feccc629f7a6571df2f94c8e0"
-        },
-        "recipe": {
-            "sha256": "1cj0pxcjngiipmyl0w1p0g4wrxgm2y98a8862x1lcbali9lqbrwj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131118.1316",
-        "deps": [
-            "emacs",
-            "org"
-        ]
-    },
-    "websocket": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ahyatt",
-            "repo": "emacs-websocket",
-            "sha256": "1w6qg6acakl868s392m4hrz3z2111ir6hk89d1scy8qm9g81znap",
-            "rev": "e5cd7c955734f6864fd9f2fa001f076b1a024044"
-        },
-        "recipe": {
-            "sha256": "1v8jlpahp30lihz7mdznwl6pyrbsdbqznli2wb5gfblnlxil04lg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150719.1248",
-        "deps": []
-    },
-    "editorconfig-core": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "editorconfig",
-            "repo": "editorconfig-emacs",
-            "sha256": "04sflhamh5b9gxllfhcqdim02x6cb9xid39al2lisb8z4xywch68",
-            "rev": "5132b7a9441af76196ba3e62d73a0bb415853e4f"
-        },
-        "recipe": {
-            "sha256": "18d7byqkxn6lyw3nqsvqs5vyj9alh9wjd2mim44a3zcc9r2j061r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151208.1035",
-        "deps": [
-            "cl-lib",
-            "editorconfig-fnmatch"
-        ]
-    },
-    "gnomenm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nicferrier",
-            "repo": "emacs-nm",
-            "sha256": "1svnvm9fqqx4mrk9jjn11pzqwk71w8kyyd9wwxam8gz22ykw5jb2",
-            "rev": "9065cda44ffc9e06239b8189a0154d31314c3b4d"
-        },
-        "recipe": {
-            "sha256": "01vmr64j6hcvdbzg945c5a2g4fiidl18dsk4px7mdf85cv45kzqm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150316.1418",
-        "deps": [
-            "dash",
-            "kv",
-            "s"
-        ]
-    },
-    "imenu-list": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bmag",
-            "repo": "imenu-list",
-            "sha256": "0hlrhnv0n9i1jl20k6hly4py9d98vpqdb9wgzx8573srxqpv541k",
-            "rev": "0c725825ad13fca6b1eea2d28c42ffb172fa6de9"
-        },
-        "recipe": {
-            "sha256": "092fsn7hnbfabcyakbqyk20pk62sr8xrs45aimkv1l91681np98s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150911.446",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "minor-mode-hack": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/minor-mode-hack.el",
-            "sha256": "0vwvvhzqiad82qvfwygb2arq1mdvh1lj6q2as0a92fg1vc95qcb0"
-        },
-        "recipe": {
-            "sha256": "1f2wy25iphk3hzjy39ls5j04173g7gaq2rdp2grkawfhwx0ld4pj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141226.1420",
-        "deps": []
-    },
-    "flymake-less": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-less",
-            "sha256": "0ggi8a4j4glpsar0sqg8q06rscajjaziis5ann31wphx88rc5wd7",
-            "rev": "32d3c28a9a5c52b82d1741ff9d715013b6498421"
-        },
-        "recipe": {
-            "sha256": "05k5daphxy94164c73ia7f4l1gv2cmlw8xzs8xnddg7ly22gjhi0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151111.138",
-        "deps": [
-            "flymake-easy",
-            "less-css-mode"
-        ]
-    },
-    "go-rename": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "https://go.googlesource.com/tools",
-            "sha256": "e9c11949d98b65c9d5f6e282f8bc4c4d85ee988c91f68fba22562a2e620e43d7",
-            "rev": "d6e83e534da905609e21e4086a0fbaed33f88d07"
-        },
-        "recipe": {
-            "sha256": "1sc3iwxiydgs787a6pi778i0qzqv3bf498r47jwiw5b6mmib3fah",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151027.838",
-        "deps": [
-            "go-mode"
-        ]
-    },
-    "malinka": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "LefterisJP",
-            "repo": "malinka",
-            "sha256": "1a22xkhnmpfffllarsjdw10n5cd3nwifcl1iv98kb4j4x96kd4xg",
-            "rev": "cd451d32dcdfa3e6b34f47c6956ff310de8a9a06"
-        },
-        "recipe": {
-            "sha256": "1245mpxsxwnnpdsf0pd28mddgdfhh7x32a2l3sxfq0dyg2xlgvrp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151107.216",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "f",
-            "projectile",
-            "rtags",
-            "s"
-        ]
-    },
-    "aggressive-indent": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "aggressive-indent-mode",
-            "sha256": "0alqjrpssmkijab1pigaa86ny9vdir9vssgr4fz04fw8xws81qkr",
-            "rev": "e613e7eb5179ae0caf4b96501923276bccd30d83"
-        },
-        "recipe": {
-            "sha256": "1qi8jbr28gax35siim3hnnkiy8pa2vcrzqzc6axr98wzny46x0i2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151212.1448",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "helm-pt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ralesi",
-            "repo": "helm-pt",
-            "sha256": "01wcybzb1jdyybr7scblzxp3c16zm01ms9ci1hcpfsv2y55gbg5y",
-            "rev": "afdf50913c49b8bbb0ff40ee5d9dfe3eb8b7c71a"
-        },
-        "recipe": {
-            "sha256": "1imhy0bsm9aldv0pvf88280qdya01lznxpx5gi5wffhrz17yh4pi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151208.2130",
-        "deps": [
-            "helm"
-        ]
-    },
-    "subemacs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kbauer",
-            "repo": "subemacs",
-            "sha256": "189547d0g9ax0nr221bkdchlfcj60dsy8lgbbrvq3n3xrmlvl362",
-            "rev": "24f0896f1995a3ea42a58b0452d250dcc6802944"
-        },
-        "recipe": {
-            "sha256": "0sqh80jhh3v37l5af7w6k9lqvj39bd91pn6a9rwdlfk389hp90zm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150830.1054",
-        "deps": []
-    },
-    "magit-find-file": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bradleywright",
-            "repo": "magit-find-file.el",
-            "sha256": "1j3jsrp0qpaa2xd98d1g9z0zc4b93knwajrlnlsc7l6g0vlfsddb",
-            "rev": "c3ea91bab37d10a814a829728ec972811f728d60"
-        },
-        "recipe": {
-            "sha256": "1d5flydyhwhvhlhi541zcnz2b03bi07zrp21bfz5sm069bf2c96b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150702.330",
-        "deps": [
-            "dash",
-            "magit"
-        ]
-    },
-    "awk-it": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/awk-it.el",
-            "sha256": "1r1vbi1r3rdbkyb2naciqwja7hxigjhqfxsfcinnygabsi7fw9aw"
-        },
-        "recipe": {
-            "sha256": "1rnrm9jf9wvfrwyylhj0bfrz9140945lc87lrh21caf7q88fpvkw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130917.1348",
-        "deps": []
-    },
-    "c0-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "catern",
-            "repo": "c0-mode",
-            "sha256": "10k90r4ckkkdjn9pqcbfyp6ynvrd5k0ngqcn5d0v1qvkn6jifxjx",
-            "rev": "c214093c36864d6208fcb9e6a72413ed17ed5d60"
-        },
-        "recipe": {
-            "sha256": "0s3h4b3lpz4jsk222yyfdxh780dvykhaqgyv6r3ambz95vrmmpl4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151110.1252",
-        "deps": []
-    },
-    "dizzee": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "davidmiller",
-            "repo": "dizzee",
-            "sha256": "120zgp38nz4ssid6bv0zy5rnf2claa5s880incgljqyl0vmj9nq5",
-            "rev": "37629f390afb8da03ef0ce81c2b3caff660e12f6"
-        },
-        "recipe": {
-            "sha256": "1axydags80jkyhpzp3m4gyplwr9k3a13w6vmrrzcv161nln7jhhs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20111009.816",
-        "deps": []
-    },
-    "mvn": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "apgwoz",
-            "repo": "mvn-el",
-            "sha256": "1gvn0a49lgbjnkl0j2sv4p9zdfqzj9s4jw0k2f4ypmsd1fc0q6d6",
-            "rev": "01ede605d49c5fb6f2da038f5df6f31112de802f"
-        },
-        "recipe": {
-            "sha256": "1ykiz5fviq2n2474izwp0vvqanpbmxg7lzh1xbpn281kwmp0mwin",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151001.129",
-        "deps": []
-    },
-    "figlet": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/jpkotta/figlet",
-            "sha256": "0xnr709vmwbryyfxngxs80gjfxv009ik6wcs4jd74ph5lm6gqh4f",
-            "rev": "255e7570a3e2"
-        },
-        "recipe": {
-            "sha256": "1m7hw56awdbvgzdnjysb3wqkhkjqy68jxsxh9f7fx266wjqhp6yj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141104.1037",
-        "deps": []
-    },
-    "caroline-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xjackk",
-            "repo": "caroline-theme",
-            "sha256": "14ijcb9qp1gv8ianqm7cdvwjkgpwdaw3lz34j29c3rmg5ir26bjb",
-            "rev": "742bf4ac4521ff9905294812919051cec768b1a0"
-        },
-        "recipe": {
-            "sha256": "07flxggnf0lb1fnvprac1daplgx4bi5fnnkgfc58wnw805s12k32",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151030.1804",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "ace-isearch": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tam17aki",
-            "repo": "ace-isearch",
-            "sha256": "02i3gxk7kfv3a0pcc82z69hgvjw8bvn40y8h7d59chg8bixcwbyr",
-            "rev": "9a32a039623e3907a4fce959aa48c26a79fb249b"
-        },
-        "recipe": {
-            "sha256": "0n8qf08z9n8c2sp5ks29nxcfks5mil1jj6wq348apda8safk36hm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150808.756",
-        "deps": [
-            "ace-jump-mode",
-            "avy",
-            "emacs",
-            "helm-swoop"
-        ]
-    },
-    "flycheck-perl6": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hinrik",
-            "repo": "flycheck-perl6",
-            "sha256": "0ffas4alqhijvm8wl1p5nqjhnxki8gs6b5bxb4nsqwnma8qmlcx3",
-            "rev": "6a9a929ffb58595bbe9fe3d7c2e78617c8e9bb5a"
-        },
-        "recipe": {
-            "sha256": "0czc0fqx7g543afzkbjyz4bhxfl4s3v5swn9xrkayv8cgk8acvp4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150414.2032",
-        "deps": [
-            "emacs",
-            "flycheck"
-        ]
-    },
-    "sparkline": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "woudshoo",
-            "repo": "sparkline",
-            "sha256": "1fqd3ycywxxmln2kzqwflc69xmqlvi9gwvmf7frn0rfv73w09cvp",
-            "rev": "a2b5d817d272d6363b67ed8f8cc75499a19fa8d2"
-        },
-        "recipe": {
-            "sha256": "081jzaxjb32nydvr1kmyafxqxi610n0yf8lwz9vldm84famf3g7y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150101.719",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "slime-volleyball": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fitzsim",
-            "repo": "slime-volleyball",
-            "sha256": "00v4mh04affd8kkw4rn51djpyga2rb8f63mgy86napglqnkz40r3",
-            "rev": "159b5c0f40b109e3854e94b89ec5383854c46ae3"
-        },
-        "recipe": {
-            "sha256": "1dzvj8z3l5l9ixjl3nc3c7zzi23zc2300r7jzw2l3bvg64cfbdg7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140717.2341",
-        "deps": []
-    },
-    "free-keys": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "free-keys",
-            "sha256": "12rmwf7gm9ib2c99jangygh2yswy41vxlp90rg0hvlhdfmbqa8p0",
-            "rev": "368820cb361161f10a2ae7a839ab758146fd222c"
-        },
-        "recipe": {
-            "sha256": "0j9cfgy2nkbska4lm5z32p804i9n8pdgn50bs5zzk1ilwd5vbalj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151202.522",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "emms-player-simple-mpv": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "momomo5717",
-            "repo": "emms-player-simple-mpv",
-            "sha256": "0ajxyv7yx4ni8dizs7acpsxnmy3c9s0dx28vw9y1ym0bxkgfyzrf",
-            "rev": "92be36ef158df3db3a2f9e2d0186a609fc2d3702"
-        },
-        "recipe": {
-            "sha256": "15aljprjd74ha7wpzsmv3d873i6fy3x1jwhzm03hvw0sw18m25i1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151020.801",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "emms"
-        ]
-    },
-    "ta": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kuanyui",
-            "repo": "ta.el",
-            "sha256": "054l3imxk9ivq361cr15q1wym07mw3s8xzjkzqlihrfvadsq37ym",
-            "rev": "0d946b15a88239982ec66eaa8a55ad53d85e7c3f"
-        },
-        "recipe": {
-            "sha256": "0kn2k4n0xfwsrniaqb36v3rxj2pf2sai3bmjksbn1g2kf5g156ll",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150604.1224",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "mote-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "inkel",
-            "repo": "mote-mode",
-            "sha256": "1hz9vqvhyz2zw5sl4r62rjxiymqlp9y26j4kdd9qy1y67zx9rmi7",
-            "rev": "18dfc3af0cee7d6d522616f07134364c1c3e54ba"
-        },
-        "recipe": {
-            "sha256": "1lg5z5d0d35sh21maiwmgzvc31iki9yg6x0awy5xrfsains7ykn9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121014.2319",
-        "deps": [
-            "ruby-mode"
-        ]
-    },
-    "xml-rpc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hexmode",
-            "repo": "xml-rpc-el",
-            "sha256": "0kkjfg1l2wg3d5wrgkwnww4d3fca0xpd3k5z9j9gwmjnkxqd95ca",
-            "rev": "a190759da8765d3b22ceb6774cefc610fda404d8"
-        },
-        "recipe": {
-            "sha256": "14r6xgnpqsb2jlv52vgrhqf3qw8a6gmdyap3ylhilyxw71lxf1js",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150902.2027",
-        "deps": []
-    },
-    "cmm-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bgamari",
-            "repo": "cmm-mode",
-            "sha256": "0xdcw329d2gssx86iajwrgpr7yv69b9nflmzjgb4jvg4pskj4pgx",
-            "rev": "c3ad514dff3eb30434f6b20d953276d4c00de1ee"
-        },
-        "recipe": {
-            "sha256": "184b8x19cnvx8z4dr9alv62wchzc7vr7crzz8jiyqw9d544zs50h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150225.146",
-        "deps": []
-    },
-    "enlive": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zweifisch",
-            "repo": "enlive",
-            "sha256": "0vd7zy06nqb1ayjlnf2wl0bfv1cqv2qcb3cgy3zr9k9c4whcd8jh",
-            "rev": "0f6646adda3974e7fe9a42339a4ec3daa532eda5"
-        },
-        "recipe": {
-            "sha256": "1dyayk37zik12qfh8zbjmhsch64yqsx3acrlm7hcnavx465hmhnz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150824.749",
-        "deps": []
-    },
-    "wiki-summary": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jozefg",
-            "repo": "wiki-summary.el",
-            "sha256": "02bczc1mb1cs1aryz5pw6cmpydjmxja2zj91893cz8rnfn1r031i",
-            "rev": "ed3755dd09f5f73ef78ec295fe842d08b316c8a0"
-        },
-        "recipe": {
-            "sha256": "1hiyi3w6rvins8hfxd96bgpihxarmv192q96sadqcwshcqi14zmw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150408.1622",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "nexus": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "juergenhoetzel",
-            "repo": "emacs-nexus",
-            "sha256": "1xnx6v49i6abzbhq4fl4bp9d0pp9gby40splpcj211xsb8yiry27",
-            "rev": "c46f499951b90839aa8683779fe43d8f01672a60"
-        },
-        "recipe": {
-            "sha256": "1mdphgsqg6n4hryr53rk42z58vfv0g5wkar5ipanr4h4iclkf5vd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140114.705",
-        "deps": []
-    },
-    "rake": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "asok",
-            "repo": "rake",
-            "sha256": "1wcs8j8rdls0n3v8zdpk2n5riwzz2yvjf6b70a5bj7p20gyafhj2",
-            "rev": "eba311a8f5ccfb6535efbc26fa58c43e3f1e5515"
-        },
-        "recipe": {
-            "sha256": "0cw47g6cjnkh3z4hbwwq1f8f5vrvs84spn06k53bx898brqdh8ns",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150831.358",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "f"
-        ]
-    },
-    "slim-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "slim-template",
-            "repo": "emacs-slim",
-            "sha256": "0vgyc2ny9qmn8f5r149y4g398mh4gnwsp4yim85z4vmdikqg8vi1",
-            "rev": "869c84821cf3e556b380c5c35d8ad62287c4df58"
-        },
-        "recipe": {
-            "sha256": "1hip0r22irr9sah3b65ky71ic508bhqvj9hj95a81qvy1zi9rcac",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140611.1150",
-        "deps": []
-    },
-    "ox-html5slide": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "coldnew",
-            "repo": "org-html5slide",
-            "sha256": "19h3w3fcas60jv02v7hxjmh05804sb7bif70jssq3qwisj0j09xm",
-            "rev": "4703dfbd9d79161509def673d2c1e118d722a58f"
-        },
-        "recipe": {
-            "sha256": "0nqk6chg0ky98ap2higa74786prj7dbwx2a3l67m0llmdajw76qn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131228.6",
-        "deps": [
-            "org"
-        ]
-    },
-    "waher-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsfodder",
-            "repo": "emacs-waher-theme",
-            "sha256": "0w59ix8cbbcyhh882c8vkrbh84i8d03h9w7dchr3qy233b8wcxlc",
-            "rev": "60d31519fcfd8e797723d47961b255ae2f2e2c0a"
-        },
-        "recipe": {
-            "sha256": "091kipkb6z6x9ic4chprim9rvnmx4yj4419ijmvpn70w69aspnb5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141115.630",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "zotxt": {
-        "fetch": {
-            "tag": "fetchFromGitLab",
-            "owner": "egh",
-            "repo": "zotxt-emacs",
-            "sha256": "015xgsisgsv4w5h6r68f7iw3vwrqvc0az1gcdkd5dfr3nl1h4yzl",
-            "rev": "3809f0932660c09910639eaecb3d0a8e784420b3"
-        },
-        "recipe": {
-            "sha256": "18jla05g2k8zfrmp7q9kpr1mpw6smxzdyn8nfghm306wvv9ff8y5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151031.1159",
-        "deps": [
-            "request-deferred"
-        ]
-    },
-    "mu4e-maildirs-extension": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "agpchil",
-            "repo": "mu4e-maildirs-extension",
-            "sha256": "0hbgzvybd04s9fz9myrs68ic2v0kks3wpv8qj14ihrnl7xh03rfh",
-            "rev": "17eacf2d0b3a57ebf26a6aaa9eeb51d579457d25"
-        },
-        "recipe": {
-            "sha256": "1xz19dxrj1grnl7wy9qglh08xb3dr509232l3xizpkxgqqk8pwbi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151126.1126",
-        "deps": [
-            "dash"
-        ]
-    },
-    "gvpr-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rodw",
-            "repo": "gvpr-lib",
-            "sha256": "0060qw4gr9fv6db20xf3spgl2fwg2iid5ckfjm3vj3ydyv62q13s",
-            "rev": "3d6cc6f4416faf2a1913821d12ba6eb624362af0"
-        },
-        "recipe": {
-            "sha256": "19p6f06qdjvh2vmgbabajvkfxpn13j899jrivw9mqyssz0cyvzgw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131208.1118",
-        "deps": []
-    },
-    "header2": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/header2.el",
-            "sha256": "04gp3km2d163cw8gqzb02dj3kq23s96ncip5c03whpja2sj9ji6f"
-        },
-        "recipe": {
-            "sha256": "1dg25krx3wxma2l5vb2ji7rpfp17qbrl62jyjpa52cjfsvyp6v06",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1610",
-        "deps": []
-    },
-    "move-dup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wyuenho",
-            "repo": "move-dup",
-            "sha256": "0baynb6gq04rxh10l6rn0myrhg7c7fwqaryiiyddp4jy7llf83c8",
-            "rev": "964d1bbaacd4559d2dbde9cb44015c400d5a71b5"
-        },
-        "recipe": {
-            "sha256": "0b0lmiisl9yckblwf7619if88qsmbka3bl4qiaqam7fka7psxs7f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140925.1008",
-        "deps": []
-    },
-    "stash": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vermiculus",
-            "repo": "stash.el",
-            "sha256": "0cl2y72iagmv87kg72a46a3kap2xigwnrbk2hjgvsbxv2ng5f9cr",
-            "rev": "c2e494d20c752b80ebbdffbf66687b3cdfc425ad"
-        },
-        "recipe": {
-            "sha256": "116k40ispv7sq3jskwc1lvmhmk3jjz4j967r732s07f5h11vk1z9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151117.827",
-        "deps": []
-    },
-    "autopair": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "capitaomorte",
-            "repo": "autopair",
-            "sha256": "1z3hd2jkibwz2ijvyh066ki5g30pdqgh2vj2r35prpp12bqabw4a",
-            "rev": "4f4bd30b341e7fb15a452b59f3e5c34cbd5c97d8"
-        },
-        "recipe": {
-            "sha256": "161qhk8rc1ldj9hpg0k9phka0gflz9vny7gc8rnylk90p6asmr28",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140825.627",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "chinese-word-at-point": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xuchunyang",
-            "repo": "chinese-word-at-point.el",
-            "sha256": "1jsy43avingxxccs0zw2qm5ysx8g76xhhh1mnyypxskl9m60qb4j",
-            "rev": "36a03cce32fe059d2b581cb2e029715c0be81074"
-        },
-        "recipe": {
-            "sha256": "0pjs4ckncv84qrdj0pyibrbiy86f1gmjla9n2cgh10xbc7j9y0c4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150618.2038",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "key-seq": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vlevit",
-            "repo": "key-seq.el",
-            "sha256": "05vpydcgiaya35b62cdjxna9y02vnwzzg6p8jh0dkr9k44h4iy3f",
-            "rev": "e29b083a6427d061638749194fc249ef69ad2cc0"
-        },
-        "recipe": {
-            "sha256": "166k6hl9vvsnnksvhrv5cbhv9bdiclnbfv7qf67q4c1an9xzqi74",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150907.256",
-        "deps": [
-            "key-chord"
-        ]
-    },
-    "ox-pandoc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kawabata",
-            "repo": "ox-pandoc",
-            "sha256": "0bawigwc6v5420642xlkyxdd0i82gicx69wqlnjf6lvhfvs990is",
-            "rev": "2605a0ed8ed3c86b78829589956bedf5eda447cc"
-        },
-        "recipe": {
-            "sha256": "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151222.1753",
-        "deps": [
-            "dash",
-            "emacs",
-            "ht",
-            "org"
-        ]
-    },
-    "helm-ghc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "david-christiansen",
-            "repo": "helm-ghc",
-            "sha256": "16p1gisbza48qircsvrwx020n96ss1c6s68d7cgqqfc0bf2467is",
-            "rev": "e5ee7b8d3b745d162553aecfbd41381c4de85f35"
-        },
-        "recipe": {
-            "sha256": "1q5ia8sgpflv2hhvw7hjpkfb25vmrjwlrqz1f9qj2qgmki5mix2d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141105.859",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "ghc",
-            "helm"
-        ]
-    },
-    "projectile": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bbatsov",
-            "repo": "projectile",
-            "sha256": "1b6h07scpg9gvslsdvz996p67vyyhiiy3hnkh7sqm2pyv9zf7wq5",
-            "rev": "b9e76f90d3846837e53ca75b78917a11b905ab70"
-        },
-        "recipe": {
-            "sha256": "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151224.1443",
-        "deps": [
-            "dash",
-            "pkg-info"
-        ]
-    },
-    "fabric": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nlamirault",
-            "repo": "fabric.el",
-            "sha256": "0crhkdbxz1ldbrvppi95g005ni5zg99z1271rkrnk5i6cvc4hlq5",
-            "rev": "004934318f63d8cf955022f87b2c33eb97ada280"
-        },
-        "recipe": {
-            "sha256": "1mkblsakdhvi10b67bv3j0jsf7hr8lf9sibmprvx8smqsih7l88m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141024.522",
-        "deps": []
-    },
-    "sage-shell-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "stakemori",
-            "repo": "sage-shell-mode",
-            "sha256": "060xvh5qwqbvvb5ykyflwps2p2by9p1mm5dz7gkxla5zq0a73vmx",
-            "rev": "ad78c168c1fb702eebc74f30eba830adc3fe0079"
-        },
-        "recipe": {
-            "sha256": "18k7yh8rczng0kn2wsawjml70cb5bnc5jr2gj0hini5f7jq449wx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151024.313",
-        "deps": [
-            "cl-lib",
-            "deferred"
-        ]
-    },
-    "flycheck": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "flycheck",
-            "repo": "flycheck",
-            "sha256": "0n9bbcbv2ria9x1ysfz714xd04z6cdpcfkyhrscl9rywhccjx6zl",
-            "rev": "1d0c64869a93f830bd8b53ac3426a6682c0ec563"
-        },
-        "recipe": {
-            "sha256": "045k214dq8bmrai13da6gwdz97a2i998gggxqswqs4g52l1h6hvr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151223.902",
-        "deps": [
-            "dash",
-            "emacs",
-            "let-alist",
-            "pkg-info",
-            "seq"
-        ]
-    },
-    "cuda-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chachi",
-            "repo": "cuda-mode",
-            "sha256": "1ms0z5zplcbdwwdbgsjsbm32i57z9i2i8j9y3wm0pwzyz4zr36zy",
-            "rev": "9ae9eacfdba3559b5456342d0d03296290df8ff5"
-        },
-        "recipe": {
-            "sha256": "0ip4vax93x72bjrh6prik6ddmrvszpsmgm0fxfz772rp24smc300",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151213.2121",
-        "deps": []
-    },
-    "ob-cypher": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zweifisch",
-            "repo": "ob-cypher",
-            "sha256": "1xbczyqfqdig5w6jvx2kg57mk16sbiz5ysv445v83wqk0sz6nc9n",
-            "rev": "b3511df05f175c1947996802e9e199432ea9ced8"
-        },
-        "recipe": {
-            "sha256": "1ygmx0rjvxjl8hifkkwrkk9gpsmdsk6ndb6pg7y78p8hfp5jpyq3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150224.2037",
-        "deps": [
-            "cypher-mode",
-            "dash",
-            "dash-functional",
-            "s"
-        ]
-    },
-    "company-ycm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "neuromage",
-            "repo": "ycm.el",
-            "sha256": "0znchya89zzk30mwl4qfm0q9sfa5m3jspapb892ydj0mck5n4nyj",
-            "rev": "4da8a14abcd0f4fa3235042ade2e12b5068c0601"
-        },
-        "recipe": {
-            "sha256": "1q4d63c7nr3g7q0smd55pp636vqa9lf1pkwjn9iq265369npvina",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140904.1317",
-        "deps": [
-            "ycm"
-        ]
-    },
-    "dired+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/dired+.el",
-            "sha256": "0pgm5pg3z7cbrvs12fwj6g2kxm7qqq0410lsb1kpsdlgixb2yh5q"
-        },
-        "recipe": {
-            "sha256": "1dmp6wcynran03nsa0fd26b9q0zj9wp8ngaafx1i1ybwn2gx32g5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151215.854",
-        "deps": []
-    },
-    "bfbuilder": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "bfbuilder",
-            "sha256": "1y9fxs1nbf0xsn8mw45m9ghmji3h64wdbfnyr1npmf5fb27rmd17",
-            "rev": "49560bdef131fa5672dab660e0c62376dbdcd906"
-        },
-        "recipe": {
-            "sha256": "16ckybqd0a8l75ascm3k4cdzp969lzq7m050aymdyjhwif6ld2r7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150924.1150",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "debug-print": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kenoss",
-            "repo": "debug-print",
-            "sha256": "1n99nrp42slmyp5228d1nz174bysjn122jgs8fn1x0qxywg7jyxp",
-            "rev": "d817fd9ea2d3f8d2c1ace4d8af155684f3a99dc5"
-        },
-        "recipe": {
-            "sha256": "01dsqq2qdsbxny6j9dhvg770493awxjhk1m85c14ysgh6sl199rm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140125.1819",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "gorepl-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "manute",
-            "repo": "gorepl-mode",
-            "sha256": "1abb78xxsggawl43hspl0cr0f7i1b3jd9r6xl1nl5jg97i4byg0b",
-            "rev": "17e025951f5964a0542a4b353ddddbc734c01eed"
-        },
-        "recipe": {
-            "sha256": "12h9r4kf9y2v601myhzzdw2c4jc5cb7s94r5dkzriq578digxphl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151121.622",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "mocker": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sigma",
-            "repo": "mocker.el",
-            "sha256": "0dngznaraphpc5amn9n120la7ga3rj7h67pnnal6qwflh5rqcmss",
-            "rev": "b56f0f2839d4a395979816b40089a77050518eb6"
-        },
-        "recipe": {
-            "sha256": "1g90jp1czrrzrmn7n4linby3q4fb4gcflzv2amjv0sdimw1ln1w3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150916.2054",
-        "deps": [
-            "eieio",
-            "el-x"
-        ]
-    },
-    "ac-html-angular": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "osv",
-            "repo": "ac-html-angular",
-            "sha256": "1v3ia439h4n2i204n0sazzbwwm0l5k6j31gq58iv2rqrq2ysikny",
-            "rev": "6bafe09afe03112ca4183d58461c1a6f6c2b3c67"
-        },
-        "recipe": {
-            "sha256": "05rbxf5kbr4jlskrhvfvhf82qvb55zl5cb6z1ymfh9l3h9j9xk3s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151225.119",
-        "deps": [
-            "web-completion-data"
-        ]
-    },
-    "ido-hacks": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "scottjad",
-            "repo": "ido-hacks",
-            "sha256": "01p4az128k1jvd9i1gshgg87z6048cw9cnm57l8qdlw01c3h6dkx",
-            "rev": "b7e7514a0e011e4d767d1f5755c5eae9d85f83dc"
-        },
-        "recipe": {
-            "sha256": "05f9pdkqppnp7wafka2d2yj84gqchjd7vnrl5rcywy1l47gbxiw0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150331.1409",
-        "deps": []
-    },
-    "subatomic-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cryon",
-            "repo": "subatomic",
-            "sha256": "1njfwjyrh9m00jyy65zl31gxa66941mvvrk7nn5yizsbdadrbq0z",
-            "rev": "2543881f9bbb8520f845b7fe8f370793c36f7df2"
-        },
-        "recipe": {
-            "sha256": "0mqas67qms492n3hn74c5nrkjpsgf9b42lp02s2dh366c075dpqc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150704.1009",
-        "deps": []
-    },
-    "jar-manifest-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "omajid",
-            "repo": "jar-manifest-mode",
-            "sha256": "0nydj0y58yhfh16492q5gzkkz7qrxbdhp4gh2xbiykcbynygj2mq",
-            "rev": "200dcf6ec5116b506ae24a83511837adf0acedef"
-        },
-        "recipe": {
-            "sha256": "0kx358m3p23r8m7z45454i62ijmdlf4mljlbqc20jkihfanr6wqd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150329.1733",
-        "deps": []
-    },
-    "psc-ide": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "epost",
-            "repo": "psc-ide-emacs",
-            "sha256": "0g2z4dkzwxpzpqwjizjcz3v3rgihxpl1pk3wcmyv0mz05795if4r",
-            "rev": "c4bfcf3d7414c37e745d95f6e3a3672c0ca99620"
-        },
-        "recipe": {
-            "sha256": "1f8bphrbksz7si9flyhz54brb7w1lcz19pmn92hjwx7kd4nl18i9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151220.1634",
-        "deps": [
-            "cl-lib",
-            "company",
-            "dash",
-            "s"
-        ]
-    },
-    "rand-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gopar",
-            "repo": "rand-theme",
-            "sha256": "0fmajgqf9j21qn7h35sky5di8cnma432g0ki9d5m41byxp9y1bdl",
-            "rev": "65a00e5c5150f857aa96803b68f50bc8da0215b7"
-        },
-        "recipe": {
-            "sha256": "0h0n1lsxnl12mjrjpra62vblrg8kbp1hk7w1v6makj074d037j2h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151219.1735",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "quelpa-use-package": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "quelpa",
-            "repo": "quelpa-use-package",
-            "sha256": "00wnvyw2daiwwd1jyq1ag5jsws8k8jxs3lsj73dagbvqnlywmkm6",
-            "rev": "d18b55508ceaeb894f5db3d775f5c1b27e4be81b"
-        },
-        "recipe": {
-            "sha256": "0p09w419kldgl913hgqfzyv2pck27vqq2i1xsx7g29biwgnp9hl9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150805.528",
-        "deps": [
-            "emacs",
-            "quelpa",
-            "use-package"
-        ]
-    },
-    "hide-region": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/hide-region.el",
-            "sha256": "1zxrygpf47bzj6p808r3qhj3dfr3m8brp1xgxs33c7f88rinfval"
-        },
-        "recipe": {
-            "sha256": "0nsc6m3yza658xsxvjz8766vkp71rcm6vwnvcv225r2pr94mq7vm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140201.514",
-        "deps": []
-    },
-    "dna-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jhgorrell",
-            "repo": "dna-mode-el",
-            "sha256": "0z28j7x7wgkc1cg1q1kz1lhdx1v1n6s88ixgkm8hn458h9bfnr3n",
-            "rev": "c3fed6b9d98deafbc1525d445a920b969120fe6a"
-        },
-        "recipe": {
-            "sha256": "0ak3g152q3xxkiz1a4pl5y2vgbigbbmbc95fggirbcrh52zkzgk9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130821.1305",
-        "deps": []
-    },
-    "pungi": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mgrbyte",
-            "repo": "pungi",
-            "sha256": "1viw95y6fha782n1jw7snr7xc00iyf94r4whsm1a2q11vm2d1h21",
-            "rev": "a2d4d439ea371be0b064a12248288903b8a521a0"
-        },
-        "recipe": {
-            "sha256": "1v9fsd764z5wdcips63z53rcipdz7bha4q6s4pnn114jn3a93ls1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150222.646",
-        "deps": [
-            "jedi",
-            "pyvenv"
-        ]
-    },
-    "mpages": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "slevin",
-            "repo": "mpages",
-            "sha256": "11c8pr3s77aq34ic32lnsialwh8bw3m78kj838xl2aab2pgrlny2",
-            "rev": "39a72a0931ab1cdbfdf0ab9f412dc12d43a3829f"
-        },
-        "recipe": {
-            "sha256": "11scjjwwrpgaz6i4jq9y7m864nfak46vnbfb0w15625znz926jcs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150710.904",
-        "deps": []
-    },
-    "colorsarenice-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "colorsarenice-theme",
-            "sha256": "18hzm7yzwlfjlbkx46rgdl31p9xyfqnxlvg8337h2bicpks7kjia",
-            "rev": "3cae55d0c7aeda3a8ef731ebc3886b2449ad87e6"
-        },
-        "recipe": {
-            "sha256": "09zlglldjbjr97clwyzyz7c0k8hswclnk2zbkm03nnn9n9yyg2qi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150421.1536",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "isearch-symbol-at-point": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "re5et",
-            "repo": "isearch-symbol-at-point",
-            "sha256": "09z49850c32x0rchxg203cxg504xi2b6cjgnd0i4axcs5fmq7gv9",
-            "rev": "51a1029bec1ec414885f9edb7e5947603dffdab2"
-        },
-        "recipe": {
-            "sha256": "0j5fr7qdvpd5b096h5a83fz8sh9wybdnsgix6v94gv8lkzdsqkr8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130728.1721",
-        "deps": []
-    },
-    "flycheck-mypy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lbolla",
-            "repo": "emacs-flycheck-mypy",
-            "sha256": "1vdnw6hnhg8aqcsdqcd2rqz4fsfgxn2xr3xixkvwmpplb4x40c8k",
-            "rev": "263339e6e44c3d0d4c10ff3528e5575db97a353f"
-        },
-        "recipe": {
-            "sha256": "1w418jm6x3vcg2x31nzc8a3b8asx6gznl6m76ip8w98riz7vy02f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150915.333",
-        "deps": [
-            "flycheck"
-        ]
-    },
-    "backup-walker": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lewang",
-            "repo": "backup-walker",
-            "sha256": "0z4d8x9lkad50720lgvr8f85p1ligv07865i30lgr9ck0q04w68v",
-            "rev": "934a4128c122972ac32bb9952addf279a60a94da"
-        },
-        "recipe": {
-            "sha256": "0hfr27yiiblrd0p3zhpapbj4vijfdk7wqh406xnlwf2yvnfsqycd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130720.1016",
-        "deps": []
-    },
-    "workgroups": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tlh",
-            "repo": "workgroups.el",
-            "sha256": "0q32z54qafj8ap3ybx82i3fm1msmzwvpxgmkaglzhi8nccgzbn2n",
-            "rev": "9572b3492ee09054dc329f64ed846c962b395e39"
-        },
-        "recipe": {
-            "sha256": "1v01yr3lk6l0qn80i3r8fq3di0a8bmqjyhwx19hcgiap57xl80h8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20110726.1141",
-        "deps": []
-    },
-    "browse-kill-ring+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/browse-kill-ring+.el",
-            "sha256": "0av8fv2xf8b3qs32hxv90pglv9a90z2865rlja21hsyi5isw8vca"
-        },
-        "recipe": {
-            "sha256": "1flw7vmqgsjjvr2zlgz2909gvpq9mhz8qkg6hvsrzwg95f4l548w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1532",
-        "deps": [
-            "browse-kill-ring"
-        ]
-    },
-    "ace-jump-buffer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "waymondo",
-            "repo": "ace-jump-buffer",
-            "sha256": "11c9jfrh9mzi0qwbvgcjia6s1gkwb76ssiraka3f4k7rc8dli11y",
-            "rev": "9299ebd4bbbf6ba78dcb40440b3aadd7b540375c"
-        },
-        "recipe": {
-            "sha256": "0hkxa0ps0v1hwmjafqbnyr6rc4s0w95igk8y3w53asl7f5sj5mpi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150215.34",
-        "deps": [
-            "ace-jump-mode",
-            "dash"
-        ]
-    },
-    "find-dired+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/find-dired+.el",
-            "sha256": "1x0zn9kpnvxhgljp4ii4f11hgncj9smdkn64ihih00w7qgg7sif2"
-        },
-        "recipe": {
-            "sha256": "06a6lwx61xindlchh3ps8khhxc6sr7i9d7i60rjw1h07nxmh0fli",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150829.2355",
-        "deps": []
-    },
-    "codebug": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "shano",
-            "repo": "emacs-codebug",
-            "sha256": "11v671c4338bsizbmm7ypp4x9s5hiwyddsg2ig6h157gfv2597pp",
-            "rev": "ac0e4331ba94ccb5203fa492570e1ca6b90c3d52"
-        },
-        "recipe": {
-            "sha256": "1cb2wvawp3wqslhgbmbw9xwcqgwfscqg0jfgqzi3nr42mjp9zgqj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140929.1637",
-        "deps": []
-    },
-    "bts": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "emacs-bts",
-            "sha256": "1qgasaqhqm0birjmb6k6isd2f5pn58hva8db8qfhva9g5kg1f38w",
-            "rev": "df42d58a36447697f93b56e69f5e700b2baef1f9"
-        },
-        "recipe": {
-            "sha256": "1i1lbjracrgdxr52agxhxxgkra4w291dmz85s195lcx38rva7ib3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151109.733",
-        "deps": [
-            "dash",
-            "log4e",
-            "pos-tip",
-            "s",
-            "widget-mvc",
-            "yaxception"
-        ]
-    },
-    "fyure": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mooz",
-            "repo": "fyure",
-            "sha256": "08x5li0mshrlamr7vswy7xh358bqhh3pngjr4ckswfi0l2r5fjbd",
-            "rev": "b6977f1eb148e8b63259f7233b55bb050e44d9b8"
-        },
-        "recipe": {
-            "sha256": "0k5z2xqlrzp5lyvp2lr462x38kqdmqld845bvyvkfjd2k4yri71x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130216.714",
-        "deps": []
-    },
-    "wedge-ws": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aes",
-            "repo": "wedge-ws",
-            "sha256": "19hgb5knqqc4rb8yl8s604xql8ar6m9r4d379cfakn15jvwqnl98",
-            "rev": "4669115f02d9c6fee067cc5369bb38c0f9db88b2"
-        },
-        "recipe": {
-            "sha256": "07i2dr807np4fwq3ryxlw11vbc1sik1iv7x5740q258jyc9zfgll",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140714.1649",
-        "deps": []
-    },
-    "ctl-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yyr",
-            "repo": "emacs-grads",
-            "sha256": "1d89gxyzv0z0nk7v1aa4qa0xfms2g2dsrr07cw0d99xsnyxfky31",
-            "rev": "1a13051db21b999c7682a015b33a03096ff9d891"
-        },
-        "recipe": {
-            "sha256": "0fydq779b0y6hmh8srfdimr5rl9mk3sj08rbvlljxv3kqv5ajczj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151202.406",
-        "deps": []
-    },
-    "ac-octave": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "coldnew",
-            "repo": "ac-octave",
-            "sha256": "16bg2zg08223x7q54rmfjziaccgm64h9vc8z59sjljkw1bgx9m7q",
-            "rev": "28dfce296dd2aa0ea46b51803109f3fdd1e5c379"
-        },
-        "recipe": {
-            "sha256": "1g5s4dk1rcgkjn17jfw6g201pw0vfhqcx1nhigmnizpnzy0man9z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150111.1908",
-        "deps": [
-            "auto-complete"
-        ]
-    },
-    "color-moccur": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "color-moccur.el",
-            "sha256": "1p1f30qz4nd5a8ym2iwrgp6vhws0dls2qlc0apblj9nj3b0ziv0x",
-            "rev": "4f1c59ffd1ccc2ab1a171cd6b721e8cb9e002fb7"
-        },
-        "recipe": {
-            "sha256": "17b9walfc5c9qfdvl9pcwb2gjikc3wxk1d3v878ckypmxd38vciq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141222.1835",
-        "deps": []
-    },
-    "simple-mpc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jorenvo",
-            "repo": "simple-mpc",
-            "sha256": "1y6lgkrhyzc79ss3wb3gaf4z8gqd4yjjwmwjligrs38ly66y48h5",
-            "rev": "fdf0ccb2a157325386e6997c119d87a9aa0865d1"
-        },
-        "recipe": {
-            "sha256": "05x2xyys5mf6k7ndh0l6ykyiygaznb4f8bx3npbhvihrsz9ilf8r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150802.406",
-        "deps": []
-    },
-    "ansi": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "ansi",
-            "sha256": "19k71dj83kvc8mks6zhl45vsrsb61via53dqxjv9bny1ybh2av85",
-            "rev": "12b4c5d91b3da1902838f421e5af6d40e2cd57dd"
-        },
-        "recipe": {
-            "sha256": "04n0kvaqq8214prdk20bplqyzlsnlzfzsg23ifkrzjgqjjpdcyi1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150703.326",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "evil-magit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "justbur",
-            "repo": "evil-magit",
-            "sha256": "0g7a7djdzwm15n51384571xfmwzbf7ibldbzki6s64g5yf3yd69d",
-            "rev": "8f07cf1382c9715cf3c735087794460f92b4b114"
-        },
-        "recipe": {
-            "sha256": "10mhq6mzpklk5sj28lvd478dv9k84s81ax5jkwwxj26mqdw1ybg6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151216.1858",
-        "deps": [
-            "evil",
-            "magit"
-        ]
-    },
-    "ido-describe-bindings": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "danil",
-            "repo": "ido-describe-bindings",
-            "sha256": "1xd86jx6j5livsdsplq5yawz1wmkflkvnjmccjjlcy8f5ncl80ax",
-            "rev": "2076b7e8a418008fb503357df2f0f99de3d9aa1d"
-        },
-        "recipe": {
-            "sha256": "1lsa09h025vd908r9q571iq2ia0zdpnq04mlihb3crpp5v9n9ws2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151222.934",
-        "deps": [
-            "dash",
-            "ido-vertical-mode"
-        ]
-    },
-    "birds-of-paradise-plus-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jimeh",
-            "repo": "birds-of-paradise-plus-theme.el",
-            "sha256": "1n5icy29ks5rxrxp7v4sf0523z7wxn0fh9lx4y6jb7ppdjnff12s",
-            "rev": "bb9f9d4ef7f7872a388ec4eee1253069adcadb6f"
-        },
-        "recipe": {
-            "sha256": "0vdv2siy30kf1qhzrc39sygjk17lwm3ix58pcs3shwkg1y5amj3m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130419.1629",
-        "deps": []
-    },
-    "term+": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarao",
-            "repo": "term-plus-el",
-            "sha256": "1ayr34smxf94c09ssdwl4hyhzgahsmbj7j4h25cdm6wcwii2br86",
-            "rev": "090807985673755720c5533b2fc684f88a3554ad"
-        },
-        "recipe": {
-            "sha256": "12lvfspqmyrapmbz3x997vf160927d325y50kxdx3s6p81r7n2n8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130612.852",
-        "deps": []
-    },
-    "elixir-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "elixir-lang",
-            "repo": "emacs-elixir",
-            "sha256": "00rl76bsyzq6dh9z65n894z1rsj483yclyndw515j4gvfqqlxcd9",
-            "rev": "25f3995ea34b23b7ffa304159a2508dbf9b3d075"
-        },
-        "recipe": {
-            "sha256": "1dba3jfg210i2rw8qy866396xn2xjgmbcyl006d6fibpr3j4lxaf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151211.612",
-        "deps": [
-            "emacs",
-            "pkg-info"
-        ]
-    },
-    "jbeans-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "synic",
-            "repo": "jbeans-emacs",
-            "sha256": "0yx64jrq1br0aylfn4mm26f71gyyw6kad97kv40sb0ashm3di96h",
-            "rev": "282f4236b11d42b2927f18b4e0b458bf61550867"
-        },
-        "recipe": {
-            "sha256": "0y7ccycfnpykgzr88968w7dl45qazf8b9zlf7ydw3ghkl4f6lbwl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151217.954",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "fakespace": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "elisp-fakespace",
-            "sha256": "11fm0h9rily5731s137mgv8rdbfqi99s6f36bgr0arwbq3f2j3fs",
-            "rev": "d1bd1f4b14b2690d7a67f9a52622ec51ed84813a"
-        },
-        "recipe": {
-            "sha256": "09dsmrqax4wfcw8fd5jf07bjxm5dizpc2qvjkqwg74j2n352wv27",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120817.1906",
-        "deps": []
-    },
-    "auto-complete-chunk": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tkf",
-            "repo": "auto-complete-chunk",
-            "sha256": "1zhbpxpl443ghpkl9i68jcjfcw1vnf8ky06pf5qjjmqbxlcyd9li",
-            "rev": "a9aa77ffb84a1037984a7ce4dda25074272f13fe"
-        },
-        "recipe": {
-            "sha256": "1937j1xm20vfcqm9ig4nvciqfkz7rpw0nsfhlg69gkmv0nqszdr3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140225.346",
-        "deps": [
-            "auto-complete"
-        ]
-    },
-    "hookify": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Silex",
-            "repo": "hookify",
-            "sha256": "1yvz9d5h7npxhsdf6s9fgxpmqk5ixx91iwivbhzcz935gs2886hc",
-            "rev": "e76127230716f7fab6662410c03c3872d17a172b"
-        },
-        "recipe": {
-            "sha256": "0prls539ifk2fsqklcxmbrwmgbm9hya50z486d7sw426lh648qmy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141216.1609",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "gntp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tekai",
-            "repo": "gntp.el",
-            "sha256": "1nvyjjjydrimpxy4cpg90si7sr8lmldbhlcm2mx8npklp9pn5y3a",
-            "rev": "767571135e2c0985944017dc59b0be79af222ef5"
-        },
-        "recipe": {
-            "sha256": "1ywj3p082g54dcpy8q4jnkqfr12npikx8yz14r0njxdlr0janh4f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141024.2150",
-        "deps": []
-    },
-    "github-browse-file": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "osener",
-            "repo": "github-browse-file",
-            "sha256": "07vgnmfn0kbg3h3vhf3xk443yi1b55761x881xlmw9sr9nraa578",
-            "rev": "fa5cc00a40869430fb44596792961a4cddf9c265"
-        },
-        "recipe": {
-            "sha256": "03xvgxlw7wmfby898din7dfcg87ihahkhlav1n7qklw6qi7skjcr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151112.1825",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "diminish": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myrjola",
-            "repo": "diminish.el",
-            "sha256": "03kpwmm3pfh32jkxs6z10ghj66kn0vkhi92b0mxjrm82cql6k5cf",
-            "rev": "18d9730f48f1f775b38ec8390cc644bc3f3d8de5"
-        },
-        "recipe": {
-            "sha256": "1h6a31jllypk47akjflz89xk6h47na96pim17d6g4rpqcafc2k43",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151215.1115",
-        "deps": []
-    },
-    "easy-kill-extras": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knu",
-            "repo": "easy-kill-extras.el",
-            "sha256": "18fn9qnm0cwdy47nv6wafiy6cf7rnv4av4w8zmjwjj0n8ql4jl08",
-            "rev": "aff957b4fd699331d21648780b2f0f6ffc3cb70b"
-        },
-        "recipe": {
-            "sha256": "0xzlzv57nvrc142saydwfib51fyqcdzjccc1hj6xvgcdbwadlnjy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151209.2117",
-        "deps": [
-            "easy-kill"
-        ]
-    },
-    "projekt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tekai",
-            "repo": "projekt",
-            "sha256": "0hvvlh24157qjxz82sbg22d4cbrf95xyx202cybp0n1vyxsmjcmw",
-            "rev": "a65e554e5d8b0def08c5d06f3fe34fec40bebd83"
-        },
-        "recipe": {
-            "sha256": "1bhb24701flihl54w8xrj6yxhynpq4dk0fp5ciac7k28n4930lw8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150324.348",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "ob-ipython": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gregsexton",
-            "repo": "ob-ipython",
-            "sha256": "0r5p2gr7ri4w79lmhil4fgh6g8cmxs1qp8glkbvycvlaxwrzszhs",
-            "rev": "15011a8e1694d09a74094c5361a588bf586458f6"
-        },
-        "recipe": {
-            "sha256": "06llf365k8m81ljmlajqvxlh84qg6h0flp3m6gb0zx71xilvw186",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151010.507",
-        "deps": [
-            "dash",
-            "dash-functional",
-            "emacs",
-            "f",
-            "s"
-        ]
-    },
-    "naked": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/naked.el",
-            "sha256": "0fr7l8ab6wmffyjs7vc38x6ca37w8c00fjhi3br3g7cgi0bna0wi"
-        },
-        "recipe": {
-            "sha256": "06p6dzhn34dva3677mrvwq2a2x3bhw7f486y654hszla7i75pilq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1832",
-        "deps": []
-    },
-    "flex-isearch": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/jpkotta/flex-isearch",
-            "sha256": "02z1w8z9fqdshyyf03c26zjwhmmclb02caw3b6nhhk4w1rkbh6is",
-            "rev": "bb9c3502057d"
-        },
-        "recipe": {
-            "sha256": "1msgrimi2a0xm5h23p78jflh00bl5bx44xpc3sc9pspznjv1d0k3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130508.1703",
-        "deps": []
-    },
-    "ranger": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ralesi",
-            "repo": "ranger.el",
-            "sha256": "0yw61vnkljr6kba9bhldjgsbq5m9z1dg9f1jhxh5p1alcwk1vb7i",
-            "rev": "bec7f51db0aa2fd6c08304b61475352ee54b6692"
-        },
-        "recipe": {
-            "sha256": "14g4r4iaz0nzfsklslrswsik670pvfd0605xfjghvpngn2a8ych4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151201.36",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "jq-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ljos",
-            "repo": "jq-mode",
-            "sha256": "014qfzl0qc23pa9w9f3v4yi80jr7nxpd0pz6d615x5mq3zi6l0gp",
-            "rev": "305ead8f087b1b817291d5f0365e5226199ec58c"
-        },
-        "recipe": {
-            "sha256": "1xvh641pdkvbppb2nzwn1ljdk7sv6laq29kdv09kxaqd89vm0vin",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151030.651",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "jedi-direx": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tkf",
-            "repo": "emacs-jedi-direx",
-            "sha256": "1pgi5vnwz5agrpvy7nwg3gv2nfbbmimhk8dxkg81k6yf1iiqxcap",
-            "rev": "7a2e677400717ed12b959cb5988e7b3fb1c12117"
-        },
-        "recipe": {
-            "sha256": "1y4n4c2imnm3f1q129bvbi4gzk0iazd8qq959gvq9j9fl1aziiz1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140310.436",
-        "deps": [
-            "direx",
-            "jedi"
-        ]
-    },
-    "yascroll": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "m2ym",
-            "repo": "yascroll-el",
-            "sha256": "08wa97hsfy1rc8ify3rz2ncfij4z6l16p4s20naygqccjv3ir6z5",
-            "rev": "f7743df1cf6d8e55607141d1ea5f50b562582c51"
-        },
-        "recipe": {
-            "sha256": "11g7wn4hgdwnx3n7ra0sh8gk6rykwvrg9g2cihvcv7mjbqgcv53f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150315.805",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "general-close": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-berlin",
-            "repo": "general-close",
-            "sha256": "1l3ps28a1wdrg2fgvvkdxdadfgpplijs4ig1yqq8yi7k13k046p4",
-            "rev": "e12d26ffc59f62aeee31ad16a823cb4a390d85c8"
-        },
-        "recipe": {
-            "sha256": "17v0aprfvxbygx5517a8hrl88qm5lb9k7523yd0ps5p9l5x96964",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151222.343",
-        "deps": []
-    },
-    "date-at-point": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alezost",
-            "repo": "date-at-point.el",
-            "sha256": "0l4z9rjla4xvm2hmp07xil69q1cg0v8iff0ya41svaqr944qf7hf",
-            "rev": "65733210479812a70a6dd5978ba0e2a4a6fcd08b"
-        },
-        "recipe": {
-            "sha256": "0r26df6px6q5jlxj29nhl3qbp6kzy9hs5vd72kpiirgn4wlmagp0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150108.618",
-        "deps": []
-    },
-    "boogie-friends": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "boogie-org",
-            "repo": "boogie-friends",
-            "sha256": "11m0w8i2nq0nqrpg6m7vnn9sd3v1ln5b3rka7m9fnasadf77nmpv",
-            "rev": "d7b67730e9d4ac2ad5dc886bdc27e9b441497b96"
-        },
-        "recipe": {
-            "sha256": "0cfs7gvjxsx2027dbzh4yypz500nmk503ikiiprbww8jyvc8grk7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151121.1549",
-        "deps": [
-            "cl-lib",
-            "company",
-            "dash",
-            "flycheck",
-            "yasnippet"
-        ]
-    },
-    "flycheck-ledger": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flycheck-ledger",
-            "sha256": "15cgqbl6n3nyqiizgs2zvcvfs6bcnjk3bj81lhhwrzizbjvap3rv",
-            "rev": "78392ba2c0c177c47bb795a1a191c29846837f57"
-        },
-        "recipe": {
-            "sha256": "0807pd2km4r60wgd6jakscbx63ab22d9kvf1cml0ad8wynsap7jl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140605.1346",
-        "deps": [
-            "flycheck"
-        ]
-    },
-    "killer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "killer",
-            "sha256": "05rbh5hkj3jsn9pw0qa4d5a5pi6367vdqkijcn9k14fdfbmyd30x",
-            "rev": "7bbb223f875402a7b2abee4baa5a54f10bd97212"
-        },
-        "recipe": {
-            "sha256": "10z4vqwrpss7mk0gq8xdsbsl0qibpp7s1g0l8wlmrsgn6kjkr2ma",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120808.622",
-        "deps": []
-    },
-    "flycheck-tip": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yuutayamada",
-            "repo": "flycheck-tip",
-            "sha256": "0hn3qjff1lcpd2ghjixkkq2bpmrmqab3860vy38yw201yy4xmn5r",
-            "rev": "9eefbea4ccc9e348d356faf28c9a1902ba28f29e"
-        },
-        "recipe": {
-            "sha256": "0zab1zknrnsw5xh5pwzzcpz7p40bbywkf9zx99sgsd6b5j1jz656",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150726.356",
-        "deps": [
-            "emacs",
-            "flycheck",
-            "popup"
-        ]
-    },
-    "ibuffer-rcirc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fgallina",
-            "repo": "ibuffer-rcirc",
-            "sha256": "15lapyj7qkkw1i1g1aizappm7gxkfnxhvd4fq66lghkzb76clz2m",
-            "rev": "8a4409b1c679d65c819dee4085faf929840e79f8"
-        },
-        "recipe": {
-            "sha256": "1y6pyc6g8j42hs103yynjsdkkxvcq0q4xsz4r93rqwsr3za3wcmc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150215.1518",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "tablist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "politza",
-            "repo": "tablist",
-            "sha256": "0gy9hxm7bca0l1hfy2pzn86avpifrz3bs8xzpicj4kxw5wi4ygns",
-            "rev": "ef38312867bc0268b1584dd890b1c420bb77ec11"
-        },
-        "recipe": {
-            "sha256": "0c10g86xjhzpmc2sqjmzcmi393qskyw6d9bydqzjk3ffjzklm45p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150619.18",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "iedit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "victorhge",
-            "repo": "iedit",
-            "sha256": "1n2yz6jzbminrviadhd3h42fwvfrdy0v2nw7sk5plkzc8zrs3x25",
-            "rev": "2d9017daeaeb408568992f5c9cad5df5ca4f1d12"
-        },
-        "recipe": {
-            "sha256": "02gjshvkcvyr58yf6vlg3s2pzls5sd54xpxggdmqajfg8xmpkq04",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150915.2222",
-        "deps": []
-    },
-    "term-alert": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "CallumCameron",
-            "repo": "term-alert",
-            "sha256": "0sa3chk16s830lqhcd8d3bwdfmjg239ywb7jm6lhwshydssh34nk",
-            "rev": "46cc46dba6957a7081a360692e58b9bffb2cfa86"
-        },
-        "recipe": {
-            "sha256": "0x4rc1y311ivaj6mlks1j8sgzrrwqn8vx171vw7s1kgf1qzk826n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141121.1405",
-        "deps": [
-            "alert",
-            "term-cmd"
-        ]
-    },
-    "org-vcard": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "flexibeast",
-            "repo": "org-vcard",
-            "sha256": "1m2xdp6wfg11wi7s4i675c3m5qancm8bpizcf380r6vmkcdfkrdy",
-            "rev": "928827c1de3c90045df3ea4fb07db4af9d3b0a22"
-        },
-        "recipe": {
-            "sha256": "0l6azshvzl1wws582njqr3qx4h73gwrdqwa3jcic1qbs9hg2l4yl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151214.22",
-        "deps": []
-    },
-    "eide": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git",
-            "sha256": "3f41ade3332a3f1dc5cfb0b33077396feb7b683b2cf2c235b7a5f07f0b2e3271",
-            "rev": "524494fd2b23217c6807b30b43bb95b5724f809e"
-        },
-        "recipe": {
-            "sha256": "16cf32n2l4wy1px7fm6x4vxx7pbqdp7zh2jn3bymg0b40i2321sz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151212.1406",
-        "deps": []
-    },
-    "simple+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/simple+.el",
-            "sha256": "0y1c87288cj7kwdq5ww6rvd4g4afssw22b7d0wa5ihl85nnf21kv"
-        },
-        "recipe": {
-            "sha256": "12fsgjk53fq2316j8nm6wvdckpyg9hq3v65j5c52i0g0cwmx62ra",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150616.1522",
-        "deps": [
-            "strings"
-        ]
-    },
-    "mbo70s-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsfodder",
-            "repo": "emacs-mbo70s-theme",
-            "sha256": "1vr85fdlb4zwgid1v00ndppla9fqqk25g2x2f5alm69pfqssr75z",
-            "rev": "d50414697760896dbe6b06d2a00c271c16e0e4a2"
-        },
-        "recipe": {
-            "sha256": "1abx2rw09xxp122ff7i9sry5djd4l6vn4lfzxs92rknjzkyc40pb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141122.842",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "weather-metno": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ruediger",
-            "repo": "weather-metno-el",
-            "sha256": "05gfc67724b0mwg8kvk3dsazx3dld50b9xjq8h1nc6jvdz3zxb9z",
-            "rev": "bfc7137095e0ee71aad70ac46f2af677f3c051b6"
-        },
-        "recipe": {
-            "sha256": "0h7p4l8y75h27pgk45f0mk3gjd43jk8q97gjf85a9b0afd63d3f6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150831.2007",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "gitconfig": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tonini",
-            "repo": "gitconfig.el",
-            "sha256": "184q3vsxa9rvhc1n57ms47r73f3zap25wswzi66rm6rmfi2k7678",
-            "rev": "7612a37ca14009cac8fb8d6b6f54adad739a5741"
-        },
-        "recipe": {
-            "sha256": "126znl1c4vwgskj7ka9id8v2bdrdn5nkyx3mmc6cz9ylc27ainm7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130718.435",
-        "deps": []
-    },
-    "auth-password-store": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DamienCassou",
-            "repo": "auth-password-store",
-            "sha256": "0gi65n1np63zi2ylc4y1licwvk97jl92s1v98fv5y61kppi1d8sq",
-            "rev": "d7fc1f026c3f43190cacedfa6eff8da916e607f5"
-        },
-        "recipe": {
-            "sha256": "118ll12dhhxmlsp2mxmy5cd91166a1qsk406yhap5zw1qvyg58w5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151112.1547",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "password-store",
-            "seq"
-        ]
-    },
-    "org-context": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thisirs",
-            "repo": "org-context",
-            "sha256": "1sn0lhy5sb241wspv56s1snhsb8r5jwy9cwgaszcq3yibi34j38q",
-            "rev": "47d1f0c9b9fb7547dbeed5b3315102a2d3c3e16f"
-        },
-        "recipe": {
-            "sha256": "19y8aln7wix9p506ajvfkl641147c5mdmjm98jnq68cx2r4wp6zz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150106.1506",
-        "deps": []
-    },
-    "eyuml": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "antham",
-            "repo": "eyuml",
-            "sha256": "1rgzydxv7c455vj1jm44vvs6xc4qgivqqb0g6zh5x4wdcpgdi2g9",
-            "rev": "2f259c201c6cc63ee608f75cd85c1ae27f9d2532"
-        },
-        "recipe": {
-            "sha256": "0ada2gcl8bw9nn0fz8g9lbqy8a8w1554q03fzd7lv8qla33ri3wx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141028.1727",
-        "deps": [
-            "request",
-            "s"
-        ]
-    },
-    "cpputils-cmake": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "redguardtoo",
-            "repo": "cpputils-cmake",
-            "sha256": "0kjkqylg0fncizrgcr8xx2qgjr8id41904n2pip0gicbry1n8bqg",
-            "rev": "9a496c9c14d1f287d9819aa0ed017be9fad9d3f4"
-        },
-        "recipe": {
-            "sha256": "0fswmmmrjv897n51nidmn8gs8yp00595g35vwjafsq6rzfg58j60",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151030.603",
-        "deps": []
-    },
-    "anzu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-anzu",
-            "sha256": "1d2laybz1igrr9nnkmfsnrvsjw7qmrgby4wnrxprins9gq263lra",
-            "rev": "6fded24b366efc4cf27166104c1928f7d1fedaa7"
-        },
-        "recipe": {
-            "sha256": "0i2ia0jisj31vc2pjx9bhv8jccbp24q7c406x3nhh9hxjzs1f41i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151015.605",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "tj-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "katspaugh",
-            "repo": "tj-mode",
-            "sha256": "152yrxridh4b3k808lmky4p6zm8q4jpff8hmnywqhfbrvwv1n6ah",
-            "rev": "492b271c3736616c84a99c5b43897848bc350c96"
-        },
-        "recipe": {
-            "sha256": "1i7dvxgj00p4n2fh8irgdfsjl2dpvfjjnkkv0cw71441f79p79mf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150826.1051",
-        "deps": [
-            "emacs",
-            "js2-mode",
-            "tern"
-        ]
-    },
-    "speechd-el": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://git.freebsoft.org/git/speechd-el",
-            "sha256": "2c1bff3e5a182b8150c6ba6c3be7e70ab2b733cac0a758521c0b941dff215c32",
-            "rev": "3d729817296b2ed8ad414a6aa044a8aa762259eb"
-        },
-        "recipe": {
-            "sha256": "07g6jwymmwkx26p3as3r370viz1cqq360cagw9ji6i0hvgrr66a0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141025.1112",
-        "deps": []
-    },
-    "web": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nicferrier",
-            "repo": "emacs-web",
-            "sha256": "03xcadplw1hg5hxw6bfrhw5xkkxk3i4105f114c6m3d2525jq4y5",
-            "rev": "483188dac4bc6b409b985c9dae45f3324a425efd"
-        },
-        "recipe": {
-            "sha256": "0ynnmqw0vsf7wyhp9m5a05dfb19vkj8dnj5glhjdzjvg30dhjp3a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141231.1401",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "python-django": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fgallina",
-            "repo": "python-django.el",
-            "sha256": "1qckn5bi1ib54hgqbym5qqwzvbv70ria1w3c2x543xlr0l7zga6h",
-            "rev": "fc54ad74f0309670359b939f64d0f1fff68aeac4"
-        },
-        "recipe": {
-            "sha256": "02whx8g8r02mzng7d7bnbkz5n7gyzp5hcnmvd6a3lq106c0h7w9k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150821.2304",
-        "deps": []
-    },
-    "helm-google": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "steckerhalter",
-            "repo": "helm-google",
-            "sha256": "0ml5mv282dz73hmgjalcsypdvc30pwhsfbamyz46744j7wxn6ik2",
-            "rev": "21443456eefab39a2bfef00f1387c015e7dfac51"
-        },
-        "recipe": {
-            "sha256": "0d1y7232rm888car3h40fba1m1pna2nh1a3fcvpra74igwarfi32",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141228.540",
-        "deps": [
-            "google",
-            "helm"
-        ]
-    },
-    "format-sql": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "paetzke",
-            "repo": "format-sql.el",
-            "sha256": "0mikksamljps1czacgqavlnzzhgs8s3f8q4jza6v3csf8kgp5zd0",
-            "rev": "97f475c245cd6c81a72a265678e2087cee66ac7b"
-        },
-        "recipe": {
-            "sha256": "0684xqzs933vj9d3n3lv7afk4gii41kaqykbb05cribaswapsanj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150422.833",
-        "deps": []
-    },
-    "writegood-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bnbeckwith",
-            "repo": "writegood-mode",
-            "sha256": "1nnjn1r669hvvzfycllwap4w04m8rfsk4nzcg8057m1f263kj31b",
-            "rev": "4302169c1563cab9319745083f9b9a7f5f4af0bd"
-        },
-        "recipe": {
-            "sha256": "1lxammisaj04g5vr5lwms64ywf39w8knrq72x4i94wwzwx5ywi1d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150325.1315",
-        "deps": []
-    },
-    "simpleclip": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "simpleclip",
-            "sha256": "09286h2q9dqghgfj9a4cniz6djw7867vcy3ixs7cn4wghvhyxm8s",
-            "rev": "7079086ec09a148fcc9146ba9bd10e12fb011861"
-        },
-        "recipe": {
-            "sha256": "07qkfwlg8vw5kb097qbsv082hxir047q2bcvc8scbak2dr6pl12s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150804.1210",
-        "deps": []
-    },
-    "pallet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rdallasgray",
-            "repo": "pallet",
-            "sha256": "03mlg6dmpjw8fq2s3c4gpqj20kjhzldz3m51bf6s0mxq9bclx2xw",
-            "rev": "0e1ae11e1ebfe644cbf832df62ac2dbf6ecd0501"
-        },
-        "recipe": {
-            "sha256": "0q50cdwnn2w1n5h4bappncjjyi5yaixxannwgy23fngdrz1mxwd7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150512.202",
-        "deps": [
-            "cask",
-            "dash",
-            "f",
-            "s"
-        ]
-    },
-    "org-sync": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "arbox",
-            "repo": "org-sync",
-            "sha256": "14zn0b8qs740ls1069kg2lwm0b9yc4qv525fg8km0hgi0yp8qw7z",
-            "rev": "1e9045e38cd6f12dc0d60e2f7bd2d414a49a5722"
-        },
-        "recipe": {
-            "sha256": "0n8fz2d1vg9r8dszgasbnb6pgaxr2i8mqrp953prf1nhmfpjpxad",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150817.954",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "org"
-        ]
-    },
-    "rcirc-styles": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aaron-em",
-            "repo": "rcirc-styles.el",
-            "sha256": "0x0nf8qk2fb7p9577456slgszhnh2f2vqaazz20fyaxv1rjfadxw",
-            "rev": "6a65ad9f910d716a218ee42035fd9e9c93998a79"
-        },
-        "recipe": {
-            "sha256": "01dxhnzsnljig769dk9axdi970b3lw2s6p1z3ljf29qlb5j4548r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151220.1157",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "jasminejs-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "stoltene2",
-            "repo": "jasminejs-mode",
-            "sha256": "1zcrxijcwqfs6r1cd6w4jq8g3ly0a69nf0cbx93w5v86x2kjpz0l",
-            "rev": "9f8044bf81ab5b4841a30b0bd099916e1b7ff54a"
-        },
-        "recipe": {
-            "sha256": "1a70j3aglrwmaw9g8m99sxad2vs53y4swxh97gqjsgx1rrx03g52",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150526.1905",
-        "deps": []
-    },
-    "key-chord": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/key-chord.el",
-            "sha256": "03m44pqggfrd53nh9dvpdjgm0rvca34qxmd30hr33hzprzjambxg"
-        },
-        "recipe": {
-            "sha256": "0cr9lx1pvr0qc762nn5pbh8w93dx1hh1zzf806cag2b9pgk6d4an",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151209.304",
-        "deps": []
-    },
-    "twilight-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "developernotes",
-            "repo": "twilight-theme",
-            "sha256": "0d7vd1h0rwwgrh7f9kmdgy2ni0p20da9c8ylwlg33nsb26345wfs",
-            "rev": "77c4741cb3dcf16e53d06d6c2ffdc660c40afb5b"
-        },
-        "recipe": {
-            "sha256": "1wkca66q4k94h9njsy15n83wjzn90rcbmv44x0hdwqj92yxjf3y7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120412.803",
-        "deps": []
-    },
-    "apel": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wanderlust",
-            "repo": "apel",
-            "sha256": "0sdxnf4b8rqs1cbjxh23wvxmj7ll3zddv8yfdgif6zmgyy8xhc9m",
-            "rev": "8402e59eadb580f59969114557b331b4d9364f95"
-        },
-        "recipe": {
-            "sha256": "0zhlm8lfri3zkhj62cycvdhkkgrn72lqb0dalh8qgr049bdv816y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141024.1842",
-        "deps": []
-    },
-    "cn-outline": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mori-dev",
-            "repo": "cn-outline",
-            "sha256": "1635k51ppivq6v2702fihq8dvi33445smds9zhqm0drnpv9rv5cr",
-            "rev": "47d33a99b7ae26b1cd456441970b4bab2173d981"
-        },
-        "recipe": {
-            "sha256": "0cw1rr56hdngvhmx59j76hvkfzgybasn0fwhd6vwm709jqiiiwiz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20100321.1114",
-        "deps": []
-    },
-    "yatemplate": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mineo",
-            "repo": "yatemplate",
-            "sha256": "1gxn302kwjfq6s6rxxvy0jpp37r2vh4ry899giqbdfr0cc1qnw0c",
-            "rev": "499e7f2ea245686c09915523657fa95905f70561"
-        },
-        "recipe": {
-            "sha256": "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151125.107",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "nginx-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ajc",
-            "repo": "nginx-mode",
-            "sha256": "08bpyk0brx0x2l0y8hn8zpkaxb2ndmxz22kzxxypj6hdz303wf38",
-            "rev": "8a296e30b01adbc40d1aa9ccde369a972ac5ceab"
-        },
-        "recipe": {
-            "sha256": "07k17m64zhv6gik8v4n73d8l1k6fsp4qp8cl94r384ny0187y65c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150824.1611",
-        "deps": []
-    },
-    "anything-git-grep": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mechairoi",
-            "repo": "anything-git-grep",
-            "sha256": "06fyvk7cjz1aag6fj52qraqmr23b0fqwml41yyid8gjxl4ygmkpv",
-            "rev": "6ee26e68bb8ec23ffacf5c5f9698c451a4bc905c"
-        },
-        "recipe": {
-            "sha256": "1kw88fvxil9l80w8zn16az7avqplyf2m0l7kp431wb5b1b1508jl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130608.2140",
-        "deps": [
-            "anything"
-        ]
-    },
-    "emoji-fontset": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zonuexe",
-            "repo": "emoji-fontset.el",
-            "sha256": "0qi7p1grann3mhaq8kc0yc27cp9fm983g2gaqddljchn7lmgagrr",
-            "rev": "3b8c2204284b95934383836b5b36efeefb65663b"
-        },
-        "recipe": {
-            "sha256": "19affsvlm1rzrzdh1k6xsv79icdkzx4izxivrd2ia6y2wcg9wc5d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151107.2247",
-        "deps": []
-    },
-    "ergoemacs-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ergoemacs",
-            "repo": "ergoemacs-mode",
-            "sha256": "0pwky3r2s43iw4gq0cq343fja2795qd8z9qbfi1vdrz18rp57s0j",
-            "rev": "742b5d39d6cfb0991933c169976cfb7b8e5e7e93"
-        },
-        "recipe": {
-            "sha256": "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151221.833",
-        "deps": [
-            "emacs",
-            "undo-tree"
-        ]
-    },
-    "cyphejor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mrkkrp",
-            "repo": "cyphejor",
-            "sha256": "1vkwm1n0amf0y0jdyvqskp00b6aijqhd7wclzkzrq7glrvj2z1xw",
-            "rev": "1025d82a9abaca132f5855e72d56c0c2ccc0eef4"
-        },
-        "recipe": {
-            "sha256": "18l5km4xm5j3vv19k3fxs8i3rg4qnhrvx7b62vmyfcqmpiasrh6g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150914.627",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "motion-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ainame",
-            "repo": "motion-mode",
-            "sha256": "17570labnwdnwca2cg4ga0mrrm00n0h3wlxry823k5yn3k93rnj1",
-            "rev": "4c94180e3ecea611a61240a0c0cd48f1032c4a55"
-        },
-        "recipe": {
-            "sha256": "1lfsc8ayiz2v3dfn8c0mmfch8vpzqyddxw8kscan2lzl2lcj50h0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140919.2056",
-        "deps": [
-            "flymake-cursor",
-            "flymake-easy"
-        ]
-    },
-    "guide-key-tip": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "guide-key-tip",
-            "sha256": "1s6p4ysdbqx5fk68s317ckj5rjmpkwwb0324sbqqa6byhw3j0xyj",
-            "rev": "d1773156b62566e1245f39936abd151844bd471c"
-        },
-        "recipe": {
-            "sha256": "0h2vkkbxq361dkn6irm1v19qj7bkhxcjljiksd5wwlq5zsq6bd06",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140406.2020",
-        "deps": [
-            "guide-key",
-            "pos-tip"
-        ]
-    },
-    "apache-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/apache-mode.el",
-            "sha256": "1jndhcjvj6s1clmyyphl5ss5267c7b5a58fz8gbp1ffk1d9ylfik"
-        },
-        "recipe": {
-            "sha256": "1a1pj3bk0gplfx217yd6qdn7qrhfbkx2bhkk33k0gq5sia6rzs44",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150828.914",
-        "deps": []
-    },
-    "ac-racer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-ac-racer",
-            "sha256": "0g7xbfsfqpmcay56y8xbmif52ccz430s3rjxf5bgl9ahkk7zgkzl",
-            "rev": "2708b0a49afc89fb99a6d74a016cff6b94138ed0"
-        },
-        "recipe": {
-            "sha256": "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150831.341",
-        "deps": [
-            "auto-complete",
-            "cl-lib",
-            "racer"
-        ]
-    },
-    "iregister": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "atykhonov",
-            "repo": "iregister.el",
-            "sha256": "1ch610b3d0x3nxglp749305syliivamc108rgv9if4ihb67gp8b5",
-            "rev": "6a48c66187289de5f300492be11c83e98410c018"
-        },
-        "recipe": {
-            "sha256": "0iq1nlj5czi4nblrszfv3grkl1fni7blh8bhcfccidms8v9r3mdm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150515.1607",
-        "deps": []
-    },
-    "tango-plus-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tmalsburg",
-            "repo": "tango-plus-theme",
-            "sha256": "1gfn1yyyb9p2fi17wra1yf2j96cfjw0sifgk3c0vl63h3vmiyvjf",
-            "rev": "99c3484eeb4e6f7f62a6dacfd665a4d46f4cbdaf"
-        },
-        "recipe": {
-            "sha256": "1bx9qcwvybgd0rg8a9rag8xvb5ljrwfnm5nvq793ncvbdvq6vrh5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140425.1711",
-        "deps": []
-    },
-    "debpaste": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alezost",
-            "repo": "debpaste.el",
-            "sha256": "1wzjdyadm8x63r874x8qi4p9ni1wdq28v3m9hca9jizkfqv9xxzz",
-            "rev": "c296c063e5a75da1ebeea84ee35c6988651de416"
-        },
-        "recipe": {
-            "sha256": "1vgirfy4vdqkhllnnmcplhwmzqqwca3la5jfvvansykqriwbq9lw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140618.58",
-        "deps": [
-            "xml-rpc"
-        ]
-    },
-    "kerl": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "correl",
-            "repo": "kerl.el",
-            "sha256": "1kkzs7nrcr74qn1m456vaj52a9j3ah4biakimz06hls415l56yk9",
-            "rev": "1732ee26213f021bf040919c45ad276aafcaae14"
-        },
-        "recipe": {
-            "sha256": "0f8n7cm5c432pwj28bcpv2jj5z3br3k164xj6nwfis3dvijwsgss",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150424.1505",
-        "deps": []
-    },
-    "haskell-emacs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knupfer",
-            "repo": "haskell-emacs",
-            "sha256": "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0",
-            "rev": "f242ac4d0312aee5d162be82ae14b7154bb0db19"
-        },
-        "recipe": {
-            "sha256": "1wkh7qws35c32hha0p9rpjz5pls2844920nh919lvp2wmq9l6jd6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151004.1230",
-        "deps": []
-    },
-    "terraform-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-terraform-mode",
-            "sha256": "0mz2yl9jaw7chzv9d9hhv7gcvdwwvi676y9wpn7vp85hxpda7xg7",
-            "rev": "6157690efce03ff20b16b85e2be6b0964efec2fb"
-        },
-        "recipe": {
-            "sha256": "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.657",
-        "deps": [
-            "cl-lib",
-            "hcl-mode"
-        ]
-    },
-    "octopress": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aaronbieber",
-            "repo": "octopress.el",
-            "sha256": "1fc9iabxfmyqb41j31rgbzxdmnjrzqh1pp9s15q6s7b2d7mc0a0y",
-            "rev": "2e068887b17b72a69e29349d477333d067867eec"
-        },
-        "recipe": {
-            "sha256": "0zsir6chjvn5i1irmf5aj6mmb401c553r5wykq796sz7jnjhrjg0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151006.514",
-        "deps": []
-    },
-    "helm-dired-recent-dirs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "akisute3",
-            "repo": "helm-dired-recent-dirs",
-            "sha256": "14sifdrfg8ydvi9mj8qm2bfphbffglxrkb5ky4q5b3j96bn8v110",
-            "rev": "3bcd125b44f5a707588ae3868777d91192351523"
-        },
-        "recipe": {
-            "sha256": "0kh0n5674ksswjzi9gji2qmx8v8g0axx8xbi0m3zby9nwcpv4qzs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131228.814",
-        "deps": [
-            "helm"
-        ]
-    },
-    "gap-mode": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/gvol/gap-mode",
-            "sha256": "1jdaysi5rbl0m2lmz41xldxbh3z5b89cnxka7r2ndldcqiq5j9q7",
-            "rev": "38e9eb6cbd0f"
-        },
-        "recipe": {
-            "sha256": "07whab3gi4b8gsvy5ijmjnj700lw0rm3bnr1769byhnpi7qpqin2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140913.1458",
-        "deps": []
-    },
-    "elpa-audit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "elpa-audit",
-            "sha256": "1dadf24x6v1vk57bp6w0g2dysigy5cqjzwldc8dn129f4pfrhipy",
-            "rev": "1ca4e6073f8c4cbb41688b69d3b3feaa1a392efc"
-        },
-        "recipe": {
-            "sha256": "0l8har14zrlh9kdkh9vlmkmzg49vb0r8j1wnznryaidalvk84a52",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141023.831",
-        "deps": []
-    },
-    "sublimity": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "sublimity",
-            "sha256": "0xg8ahjh1mkh555q645c9rhacv85iz6s83n2dpj4rhb45g9if6pc",
-            "rev": "45fabc1a63625bd0181f2bd4f39f154df5110338"
-        },
-        "recipe": {
-            "sha256": "1xwggaalad65cxcfvmy30f141bxhpzc3fgvwziwbzi8fygbdv4nw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150918.1417",
-        "deps": []
-    },
-    "helm-w3m": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-helm",
-            "repo": "helm-w3m",
-            "sha256": "0d47mqib4zkfadq26vpy0ih7j18d6n5v4c21wvr4hhg6hg205iiz",
-            "rev": "280673470672c9fbc57fd6a91defeb9f6641fc8a"
-        },
-        "recipe": {
-            "sha256": "1rr83ija93iqz74k236hk3v75jk0iwcccwqpqgys7spvrld0b9pz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150722.1024",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "helm",
-            "w3m"
-        ]
-    },
-    "ietf-docs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "choppsv1",
-            "repo": "ietf-docs",
-            "sha256": "0b86x675g95yrlc0alffx0z9fmficlwv3gpy5cy86z1xvvyh3nzw",
-            "rev": "ede30d6d26044069e1731fd20c0ab2324552c0b4"
-        },
-        "recipe": {
-            "sha256": "0wnk36z9g7lksmynd04hb2m6rx45wpxnxj1lhrlpjnzsrknhf4k3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150928.457",
-        "deps": []
-    },
-    "ruby-block": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/ruby-block.el",
-            "sha256": "0c4vy9xsw44g6q9nc8aaav5avgp34h24mvgcnww468afiimivdcq"
-        },
-        "recipe": {
-            "sha256": "0jfimjq1xpwxkxya452kp27h0fdiy87aj713w3zsm04k7l6i12hm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131210.2131",
-        "deps": []
-    },
-    "inline-crypt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Sodel-the-Vociferous",
-            "repo": "inline-crypt-el",
-            "sha256": "0jipds844432a8m4d5gxbbkk2h1rsq9fg748g6bxy2q066kyzfz6",
-            "rev": "497ce9dc29a8ccac0b6dd6854f5d120514350282"
-        },
-        "recipe": {
-            "sha256": "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130409.707",
-        "deps": []
-    },
-    "fsharp-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rneatherway",
-            "repo": "emacs-fsharp-mode-bin",
-            "sha256": "126pd75673q61zi65p2z4x77fz6rd6rh8hlbv1lw8cv4al1bx7rh",
-            "rev": "6c6111980b2bfa0664bf4032039d6dca3d00b4f4"
-        },
-        "recipe": {
-            "sha256": "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151124.936",
-        "deps": [
-            "auto-complete",
-            "dash",
-            "popup",
-            "pos-tip",
-            "s"
-        ]
-    },
-    "mmm-mako": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/pjenvey/mmm-mako",
-            "sha256": "0rpp748ym79sxccp9pyrwri14m7624zzb80srfgjfdpysrrs0jrr",
-            "rev": "5c9ff92137b5"
-        },
-        "recipe": {
-            "sha256": "0a4af5q9wxafrid8visp30cz6073ig0c961b78vmmgqrwvvxd3kn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121020.151",
-        "deps": [
-            "mmm-mode"
-        ]
-    },
-    "auto-complete-pcmp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "auto-complete-pcmp",
-            "sha256": "1hf2f903hy9afahrgy2fx9smgn631drs6733188zgqi3nkyizj26",
-            "rev": "2595d3dab1ef3549271ca922f212928e9d830eec"
-        },
-        "recipe": {
-            "sha256": "1mpgkwj8jwpvxphlm6iaprwjrldmihbgg97jav0fbm1kjnm4azna",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140227.51",
-        "deps": [
-            "auto-complete",
-            "log4e",
-            "yaxception"
-        ]
-    },
-    "regex-tool": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jwiegley",
-            "repo": "regex-tool",
-            "sha256": "1wr12j16hckvc8bxxgxw280frl12h23cp44sxg28lczl16d9693l",
-            "rev": "62b292d93f29e4c4767b0800d53c656b9f626892"
-        },
-        "recipe": {
-            "sha256": "1nd23vjij5h5gk5l7hbd5ks9ljisn054wp138jx2v6i51izxvh2v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131104.1634",
-        "deps": []
-    },
-    "macrostep": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joddie",
-            "repo": "macrostep",
-            "sha256": "0j95lv4b01p8a5fpxnj5qs2ajg1yxnsg97vw3184dfy9r5hy7ryb",
-            "rev": "a3338d351e18bfbacd970d371735f840e7d5fe38"
-        },
-        "recipe": {
-            "sha256": "1wjibxbdsp5qfhq8xy0mcf3ms0q74qhdrhqndprn6jh3kcn5q63c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151213.345",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "keydef": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsorphanage",
-            "repo": "keydef",
-            "sha256": "0dkc51bmix4b8czs2wg6vz8vk32qlll1b9fjmx6xshrxm85cyhvv",
-            "rev": "dff2be9f58d12d8c6a490ad0c1b2b10b55528dc0"
-        },
-        "recipe": {
-            "sha256": "0yb2vgj7abyg8j7qmv74nsanv50lf350q1m58rjv8wm31yykg992",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20090428.1431",
-        "deps": []
-    },
-    "flymake-coffee": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-coffee",
-            "sha256": "10i0rbvk6vyifgbgskdyspmw9q64x99fzi8i1h8bgv58xhfx6pm7",
-            "rev": "325ab379592fdf9017d7c19625c7a978f6f3af3b"
-        },
-        "recipe": {
-            "sha256": "1aig1d4fgjdg31vrg8k43z5hbqiydgfvxi45p1695s3kbdm8pr2d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140809.524",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "magit-svn": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "magit-svn",
-            "sha256": "0r3nkrisyjawjwbm74yi6fqiwcqzlfkypsdscfhii0q50ky8plph",
-            "rev": "9b2f8c14e83ee5851a63bd23b5f19422b00c0ff5"
-        },
-        "recipe": {
-            "sha256": "02n732z06f0bhxqkxzlvm36bpqr40pas09zbzpfdk4pb6f9f80s0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151219.747",
-        "deps": [
-            "emacs",
-            "magit"
-        ]
-    },
-    "scion": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nominolo",
-            "repo": "scion",
-            "sha256": "0ark720g0nrdqri5bjdpss6kn6k3hz3w3zdvy334wws05mkb17y4",
-            "rev": "99b4589175665687181a932cd836850205625f71"
-        },
-        "recipe": {
-            "sha256": "17qmc7fpvbamqkzyk8jspp2i0nw93iya4iwddvas7vdpjy7mk81d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130315.755",
-        "deps": []
-    },
-    "hl-defined": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/hl-defined.el",
-            "sha256": "19pvwdkw833c84j9ynn2x8s8lv1bi98gkkmppn01v08yyzi3kr7y"
-        },
-        "recipe": {
-            "sha256": "1y7vbhvpwxz70kja5hfm4i57mdd1cv43m4y9fr978y3nk265p8xx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1620",
-        "deps": []
-    },
-    "company-arduino": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yuutayamada",
-            "repo": "company-arduino",
-            "sha256": "067xb4mwfnmbqjyfv4717417fg7ysvz9flnx1nrk6iv96gnf4vfx",
-            "rev": "fd31103ab73acd6c77e4361db86e472619903f80"
-        },
-        "recipe": {
-            "sha256": "1bch447lllikip1xd90kdgssgc67sl04a70fxqkqlrc1bs6gkkws",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150614.326",
-        "deps": [
-            "arduino-mode",
-            "cl-lib",
-            "company",
-            "company-c-headers",
-            "company-irony",
-            "emacs",
-            "irony"
-        ]
-    },
-    "diffview": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mgalgs",
-            "repo": "diffview-mode",
-            "sha256": "0diw887x4q7kbgdvxbbnxdw51z33kqwxw3v9m45fczxbywyi4cxf",
-            "rev": "031b70913e755c5e55222680f80185032a7d1728"
-        },
-        "recipe": {
-            "sha256": "0vlzmykvxjwjww313brl1nr13kz41jypsk0s3l8q3rbsnkpfic5k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150929.11",
-        "deps": []
-    },
-    "tree-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/tree-mode.el",
-            "sha256": "0hffnzvzbvmzf23z9z7n7y53l5i7kza9hgfl39qqcnw4njg48llx"
-        },
-        "recipe": {
-            "sha256": "0xwyhlc5lagj46nd70l81rvb43hs08pic96grk62zknig8354c24",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151104.731",
-        "deps": []
-    },
-    "scf-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lewang",
-            "repo": "scf-mode",
-            "sha256": "0m7hanpc2skmsz783m0212xd10y31gkj5n6w8gx9s989l1y4i1b8",
-            "rev": "dbfcdcd89034f208d65e181af58e0d73ad09f8b2"
-        },
-        "recipe": {
-            "sha256": "0acbrw94q6cr9b29mz1wcbwi1g90pbm7ly2xbaqb2g8081r5rgg0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151121.2048",
-        "deps": []
-    },
-    "go-projectile": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dougm",
-            "repo": "go-projectile",
-            "sha256": "16n8655i7qidakxijymx1n84pnkn3hxpj7lsr901j03blxdrij5y",
-            "rev": "0a974097ef74b6045585c6120309c208b002f6e6"
-        },
-        "recipe": {
-            "sha256": "07diik27gr82n11a8k62v1jxq8rhi16f02ybk548f6cn7iqgp2ml",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151215.1058",
-        "deps": [
-            "go-eldoc",
-            "go-mode",
-            "go-rename",
-            "projectile"
-        ]
-    },
-    "align-cljlet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gstamp",
-            "repo": "align-cljlet",
-            "sha256": "11vi1qjj1187gkdqrzblrl26xnj7vcpzgbq8py29k94szjrlyasp",
-            "rev": "eb8d18058838167a13e3272ac9fd597d7c183b35"
-        },
-        "recipe": {
-            "sha256": "0pnhhv33rvlmb3823xpy9v5h6q99fa7fn38djbwry4rymi4jmlih",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151106.154",
-        "deps": [
-            "clojure-mode"
-        ]
-    },
-    "framesize": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nicferrier",
-            "repo": "emacs-framesize",
-            "sha256": "11h9xw6jnw7dacyv1jch2a77xp7hfb93690m7hhazy6l87xmm4dk",
-            "rev": "f2dbf5d2513b2bc45f2085370a55c1754b6025da"
-        },
-        "recipe": {
-            "sha256": "1rwiwx3n7gkpfihbf6ndl1lxza4zi2rlj5av6lfp5qypbw9wddkf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131017.1632",
-        "deps": [
-            "key-chord"
-        ]
-    },
-    "helm-cscope": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alpha22jp",
-            "repo": "helm-cscope.el",
-            "sha256": "0nhi8xhcf7qpsibpyy5v364xx7lqkhskzai7awkg0xcdq8b5090x",
-            "rev": "ddc3f750a92044d6712585e29d3dbaface2e34db"
-        },
-        "recipe": {
-            "sha256": "13a76wc1ia4c0v701dxqc9ycbb43d5k09m5pfsvs8mccisfzk9y4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150609.849",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "helm",
-            "xcscope"
-        ]
-    },
-    "cil-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ForNeVeR",
-            "repo": "cil-mode",
-            "sha256": "1w0ya0446rqsg1j59fd1mp4wavv2f3h1k3mw9svm5glymdirw4d1",
-            "rev": "fcd2e407aeefab9ae465b072eea33dc115506fff"
-        },
-        "recipe": {
-            "sha256": "1h18r086bqspyn5n252yzw8x2zgyaqzdd8pbcf5gqlh1w8kapq4y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150223.450",
-        "deps": []
-    },
-    "dylan-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dylan-lang",
-            "repo": "dylan-mode",
-            "sha256": "011423kvbfcd7jifg9425j89hlzmnw4j751s4mdz9wyr979k19ny",
-            "rev": "2a5b8a65a3e3e9543e935dceea1a121e69e78c8e"
-        },
-        "recipe": {
-            "sha256": "0kimvz8vmcvgxi0wvf7dqv6plj31xlksmvgip8h3bhyy7slxj3yy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140611.37",
-        "deps": []
-    },
-    "babel": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "juergenhoetzel",
-            "repo": "babel",
-            "sha256": "140lbpqq4qz45ykycdn8nvcn8pv0xqfwpapgprvyg8z5fjkyc4sg",
-            "rev": "9bc1c3cf6de50b0e34fa1a7640eb68c650e72fd6"
-        },
-        "recipe": {
-            "sha256": "0sdpp4iym61ni32zv75n48ylj4jib8ca6n9hyqwj1b7nqg76mm1c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131231.925",
-        "deps": []
-    },
-    "hide-lines": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/hide-lines.el",
-            "sha256": "1q87yp1pr62cza3pqimqd09a39yyij4c7pncdww84zz7cii9qrn2"
-        },
-        "recipe": {
-            "sha256": "146sgvd88w20rqvd8y8kc76cb1nqk6dvqsz9rgl4rcrf0xfqvp7q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151127.1240",
-        "deps": []
-    },
-    "todotxt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rpdillon",
-            "repo": "todotxt.el",
-            "sha256": "0ms4mapjg9mbpmcmpn68r0mhwaibwfr4v25sin74b2281h4q7gal",
-            "rev": "fc83f954aea75065aa9788ee07027c94e76a9364"
-        },
-        "recipe": {
-            "sha256": "13jcbkasvcczf7qnrh89ncqp6az6hm1s0ycrv7msva145n5bk1kr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150513.2129",
-        "deps": []
-    },
-    "helm-firefox": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-helm",
-            "repo": "helm-firefox",
-            "sha256": "0pvc163pd1jh8f4ym5yymspd0ppkq0ni05gjh45plr8yaw32n2y4",
-            "rev": "73d2dc49f4f3efa3f68881cf7cb5da27419d13a9"
-        },
-        "recipe": {
-            "sha256": "0677nj0zsk11vvp3q3xl9nk8dhz3ki9yl3kfb57wgnmprp109wgs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150720.1318",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "helm"
-        ]
-    },
-    "nanowrimo": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/gvol/nanowrimo.el",
-            "sha256": "1nzkamy53kl1g4y1jm7j5zgpkdsyg5ykp8zp1f0bg5mhy8mmf75w",
-            "rev": "25e2ca20ed34"
-        },
-        "recipe": {
-            "sha256": "1nhyj38qyn1x6a5rbrwhcxwfwzyqqjm3dvksdnmam6vfwn3s2r31",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151104.2028",
-        "deps": []
-    },
-    "engine-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hrs",
-            "repo": "engine-mode",
-            "sha256": "1k17z1dy9m9lx2fy78ack8fyf5vqb79fwjn078f93bcjl5mc7d4k",
-            "rev": "98020c5c8fcc3c675999fc6215af6a6259c5c017"
-        },
-        "recipe": {
-            "sha256": "1gg7i93163m7k7lr3pnal1svymnhzwrfpfcdc0798d7ybv26gg8c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150902.1235",
-        "deps": []
-    },
-    "company-c-headers": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "randomphrase",
-            "repo": "company-c-headers",
-            "sha256": "16cva7ccc0hrc6yf659kpsznlk1bkgv525lqr4nj8a12q0avjdxf",
-            "rev": "0b8c63cdc7864c3e3939c4b8cda314d05ae0a352"
-        },
-        "recipe": {
-            "sha256": "1715vnjr5cjiq8gjcd3idnpnijg5cg3sw3f8gr5x2ixcrip1hx3a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150801.1101",
-        "deps": [
-            "company",
-            "emacs"
-        ]
-    },
-    "textmate": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "defunkt",
-            "repo": "textmate.el",
-            "sha256": "1b7xxz1i84azmbz8rqpxdn18avmnqlj87hfrpbngbf6pj5h9jqjh",
-            "rev": "350918b070148f0ace6d9d3cd4ebcaf15c1a8781"
-        },
-        "recipe": {
-            "sha256": "119w944pwarpqzcr9vys17svy1rkfs9hiln8903q9ff4lnjkpf1v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20110816.1646",
-        "deps": []
-    },
-    "flycheck-clojure": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "clojure-emacs",
-            "repo": "squiggly-clojure",
-            "sha256": "0zldhxlbp6m2gnqbb3dgmj32hnx1lh7wvjcpw1s4gz980ncgc8k8",
-            "rev": "308044d58c4e16567ae818cc1d1e90f29947ada3"
-        },
-        "recipe": {
-            "sha256": "1b20gcs6fvq9pm4nl2qwsf34sg6wxngdql921q2pyh5n1xsxhm28",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150831.831",
-        "deps": [
-            "cider",
-            "emacs",
-            "flycheck",
-            "let-alist"
-        ]
-    },
-    "sotclojure": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "speed-of-thought-clojure",
-            "sha256": "0s6nfszyk0qprdpd55yfcn6xv1fym43yra0j4ys6wf65lai9kr2p",
-            "rev": "f2f7ed52dba57752804810992c35f991c9f7dfc4"
-        },
-        "recipe": {
-            "sha256": "12byqjzg0pffqyq958265qq8yxxmf3iyy4m7zib492qcj8ccy090",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151225.1913",
-        "deps": [
-            "cider",
-            "clojure-mode",
-            "emacs",
-            "sotlisp"
-        ]
-    },
-    "modeline-char": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/modeline-char.el",
-            "sha256": "0z3izd0wvnqh3r8535rzxi0xab6hz46njw4m24nl6xps2n7fcwmi"
-        },
-        "recipe": {
-            "sha256": "1cb6pm69db0jbksmc4mkawf643i74is9v7ka34pv3mb21nj095qp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150710.2153",
-        "deps": []
-    },
-    "el-autoyas": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "el-autoyas.el",
-            "sha256": "0dbp2zz993cm7mrd58c4iflbzqwg50wzgn2cpwfivk14w1mznh4n",
-            "rev": "bde0251ecb504f585dfa27c205c8e312655310cc"
-        },
-        "recipe": {
-            "sha256": "0hh5j79f3z82nmb3kqry8k8lgc1qswk6ni3g9jg60pasc3wkbh6c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120918.817",
-        "deps": []
-    },
-    "px": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aaptel",
-            "repo": "preview-latex",
-            "sha256": "10g4imxgpv7a0j40qkx7xf2qnyz80ypd0mv0lf47n9dwln5byln3",
-            "rev": "c698a650997a1d5b06b92acc8f30d620342e1f37"
-        },
-        "recipe": {
-            "sha256": "0xjmz18m2dslh6yq5z32r43zq3svfxn8mhrfbmihglyv2mkwxw44",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141006.748",
-        "deps": []
-    },
-    "osx-pseudo-daemon": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DarwinAwardWinner",
-            "repo": "osx-pseudo-daemon",
-            "sha256": "1j601gzizxjsvkw6bvih4a49iq05yfkw0ni77xbc5klc7x7s80hk",
-            "rev": "0b9f330a66b4e8d2ff9bcd57e09b8d304dfb5841"
-        },
-        "recipe": {
-            "sha256": "150fxj2phj5axnh5i8ws5fv2qzzmpyisch452wgxb604p56j7vy8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131026.1930",
-        "deps": []
-    },
-    "system-specific-settings": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DarwinAwardWinner",
-            "repo": "emacs-system-specific-settings",
-            "sha256": "1hixilnnybv2v3p1wpn7a0ybwah17grawszs3jycsjgzahpgckv7",
-            "rev": "0050d85b2175095aa5ecf580a2fe43c069b0eef3"
-        },
-        "recipe": {
-            "sha256": "1ydmxi8aw2lf78wv4m39yswbqkmcadqg0wmzg9s8b5h9bxxwvppp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140818.957",
-        "deps": []
-    },
-    "haskell-emacs-base": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knupfer",
-            "repo": "haskell-emacs",
-            "sha256": "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0",
-            "rev": "f242ac4d0312aee5d162be82ae14b7154bb0db19"
-        },
-        "recipe": {
-            "sha256": "1fwkds6qyhbxxdgxfzmgd7dlcxr08ynrrg5jdp9r7f924pd536vb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150714.1059",
-        "deps": [
-            "haskell-emacs"
-        ]
-    },
-    "leerzeichen": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fgeller",
-            "repo": "leerzeichen.el",
-            "sha256": "0yrrlwmxg1wy65bqyacjpzd5ksljgp41x4zyizl7h0zx9rmqcdvn",
-            "rev": "e67e59a0e15bc4a41006fdd9822c4b3e6d7da626"
-        },
-        "recipe": {
-            "sha256": "0h7zpskcgkswr110vckfdbxggz5b3g9grk1j1cbd98pmrpgfqrvp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151106.28",
-        "deps": []
-    },
-    "rcirc-groups": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dimitri",
-            "repo": "rcirc-groups",
-            "sha256": "0b09qx30iy82c2zs7b7g1a4ij7qa0ic830ip0j37mrb0hpxym634",
-            "rev": "af15e550339c1b8b2971eb2958e0029c353abfb2"
-        },
-        "recipe": {
-            "sha256": "1iws3f8vkwrflcj6ni8nmf1wcw1jrlnssm76kzzhag77ry3iswgx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151207.1113",
-        "deps": []
-    },
-    "windata": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/windata.el",
-            "sha256": "0dcbnqcqw7jzwwdn0rxxlixga1zw1x3a2zbpxvd90xp7zig4f0yz"
-        },
-        "recipe": {
-            "sha256": "0xq51rdanq5as6kfyi97hsqmig5g35w7xv8c96bhzyflranw7jw5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20080412.955",
-        "deps": []
-    },
-    "clues-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jasonm23",
-            "repo": "emacs-clues-theme",
-            "sha256": "0fnl3b62clg9llcs2l511sxp4yishan4pqk45sqp8ih4rdzvy7ar",
-            "rev": "69d873c90fbf24590c765309b7fb55cd14bb6bda"
-        },
-        "recipe": {
-            "sha256": "12g7373js5a2fa0m396k9kjhxvx3qws7n1r435nr9zgwaw7xvciy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140922.2256",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "ert-async": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "ert-async.el",
-            "sha256": "0hn9i405nfhjd1h9vnwj43nxbbz00khrwkjq0acfyxjaz1shfac9",
-            "rev": "f64a7ed5b0d2900c9a3d8cc33294bf8a79bc8526"
-        },
-        "recipe": {
-            "sha256": "004798ckri5j72j0xvzkyciss1iz4lw9gya2749hkjxlamg14cn5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151011.859",
-        "deps": []
-    },
-    "http": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-pe",
-            "repo": "http.el",
-            "sha256": "0k9ksbpcdx5asjcvnivm8hpkm55qjz348gb8ihx5q5448h89ksrz",
-            "rev": "3984230ea8b413bc634fb72d097c7f3b8c92b988"
-        },
-        "recipe": {
-            "sha256": "1176jhm8m7s1pzp0zv1sqawcgn4m5zvxghypmsrjyyb5p7m6dalm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150716.959",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "request"
-        ]
-    },
-    "textmate-to-yas": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "textmate-to-yas.el",
-            "sha256": "1idhhfp0jhnykyms7dp3lfk6imddg6a315pfklbjpcys4y3fdz89",
-            "rev": "74cbf0877ab6391f920d2d7a588e363423d61227"
-        },
-        "recipe": {
-            "sha256": "04agz4a41h0givfdw88qjd3c7pd418qyigsij4la5f37j5rh338l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150914.746",
-        "deps": []
-    },
-    "password-vault": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "PuercoPop",
-            "repo": "password-vault",
-            "sha256": "0984pzlfxsgi2060spjxw7livfh8013ffrk4x8m4sjifhniqgjqk",
-            "rev": "e47d99bb092e150472f1989ab3ac5a4752863515"
-        },
-        "recipe": {
-            "sha256": "17i556xwq6yaxv9v18l1abcpbaz6hygsa4vf4b68fc98vcy7396a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151121.2141",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "mustache": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Wilfred",
-            "repo": "mustache.el",
-            "sha256": "1n2ymd92qpvsby6ms0l3kjhdzzc47rri2aiscc6bs07hm4mjpr9q",
-            "rev": "b0ea352813592424164520a49e86c04600242752"
-        },
-        "recipe": {
-            "sha256": "1pjr00xx77mlfw1myxaz6i3y2gbivhbiq5hyjxxbjlfrkm1vxc8g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131117.1607",
-        "deps": [
-            "dash",
-            "ht",
-            "s"
-        ]
-    },
-    "dracula-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zenorocha",
-            "repo": "dracula-theme",
-            "sha256": "1x7hyj5qi9f222zwhwjqr98zzcvqjqfwxlglph8nsbadkv4s8c3v",
-            "rev": "ee065fed126eecdfe33a1a578d9f1e20687d2f3a"
-        },
-        "recipe": {
-            "sha256": "0ayv00wvajia8kbfrqkrkpb3qp3k70qcnqkav7am16p5kbvzp10r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151109.1045",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "sibilant-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jbr",
-            "repo": "sibilant-mode",
-            "sha256": "0cjqh6qbbmgxd6zgqnikw6bh8wpjydydkkqs5wcmblpi5awqmnb6",
-            "rev": "bc1b5d8cd597918bafc9b2880ee49024740e54ab"
-        },
-        "recipe": {
-            "sha256": "0jd6dsk93nvwi5yia3623hfc4v6zz4s2n8m1wx9bw8x6kv3h3qbq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151119.1545",
-        "deps": []
-    },
-    "elixir-yasnippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hisea",
-            "repo": "elixir-yasnippets",
-            "sha256": "1sdq4372i19wdxpdp3347a1rf5zf5w6sa0da6lr511m7ri0lj6hd",
-            "rev": "980ca7626c14ef0573bec0035ec7942796062783"
-        },
-        "recipe": {
-            "sha256": "0927znqd9j91wc51hdwcl2rxb66i1h549nyr1h39r13353gbwk3a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150417.739",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "misc-cmds": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/misc-cmds.el",
-            "sha256": "0akrb0gd4ywrib9bg3q5qjf991gnkggivmg1nsn9snc6il8yjaxq"
-        },
-        "recipe": {
-            "sha256": "0bylb84icddgznmim18fwq1mhh3qz8yh8ch6lpadf9p3h420qgcl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150602.1427",
-        "deps": []
-    },
-    "drupal-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "arnested",
-            "repo": "drupal-mode",
-            "sha256": "0am3n25qcfjkqfp4wjj1d2zigrmi8hg7p5sy2h91zg3blypqmpsr",
-            "rev": "b4a66092bddc471884b2746d69fd7e8853b4b79f"
-        },
-        "recipe": {
-            "sha256": "14jvk4phq3wcff3yvhygix0c9cpbphh0dvm961i93jpsx7g9awgn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150830.1427",
-        "deps": [
-            "php-mode"
-        ]
-    },
-    "livid-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pandeiro",
-            "repo": "livid-mode",
-            "sha256": "178ldzpk8a9m9abn8xlplxn5jgcca71dpkp82bs5g7bsccp3rx6p",
-            "rev": "dfe5212fa64738bc4138bfebf349fbc8bc237c26"
-        },
-        "recipe": {
-            "sha256": "0jy16m6injqznx4gmxzvhys480pclw9g07z4qll2dna37177ww9d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131116.744",
-        "deps": [
-            "s",
-            "skewer-mode"
-        ]
-    },
-    "company-flx": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "PythonNut",
-            "repo": "company-flx",
-            "sha256": "0qvscm1r7c1apj8cj8qvrqfiki7xfaxg4hpw2kynbg7v7lynj94j",
-            "rev": "da73fc0d306fdb7335a801353b9798d1e1cfc1c1"
-        },
-        "recipe": {
-            "sha256": "1r4jcfzrhdpclblfrmi4qbl8dnhc2d7d4c1425xnslg7bhwd2vxn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151020.1301",
-        "deps": [
-            "company",
-            "emacs",
-            "flx"
-        ]
-    },
-    "org-pandoc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "robtillotson",
-            "repo": "org-pandoc",
-            "sha256": "022qqas919aziq4scs5j1wdbvd0qyw8kkirn2vzfb5k2fjl8z7iq",
-            "rev": "84b5df1f5516704540e19e048e18f437dc090a7d"
-        },
-        "recipe": {
-            "sha256": "1r6j6rkwfv7fv7kp73gh1bdz3y5ffwk5f2wyv4mpxs885cfbsm8v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130729.2050",
-        "deps": []
-    },
-    "company-jedi": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-company-jedi",
-            "sha256": "1ihqapp4dv92794rsgyq0rmhwika60cmradqd4bn9b72ss6plxs1",
-            "rev": "ad49407451c7f28fe137f9c8f3a7fc89e8693a1b"
-        },
-        "recipe": {
-            "sha256": "1krrgrjq967c3j02y0i345yx6w4crisnj1k3bhih6j849fvy3fvj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151216.2121",
-        "deps": [
-            "cl-lib",
-            "company",
-            "emacs",
-            "jedi-core"
-        ]
-    },
-    "hoa-mode": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "https://gitlab.lrde.epita.fr/spot/emacs-modes.git",
-            "sha256": "bf4056192044808554a5dfd537512ec939cbcf628a9becd61736d6409f7e7ce8",
-            "rev": "3c608e15b655d2375c5f81323ac561c7848dc029"
-        },
-        "recipe": {
-            "sha256": "06rfqn7sqvmgpvwhfmk17qqs4q0frfzhm597z3p1q7kys2035kiv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151203.1050",
-        "deps": []
-    },
-    "termbright-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bmastenbrook",
-            "repo": "termbright-theme-el",
-            "sha256": "0gfsqpza8phvma5y3ck0n6p197x1i33w39m3c7jmja4ml121n73d",
-            "rev": "bec6ab14336c0611e85f45486276004f16d20607"
-        },
-        "recipe": {
-            "sha256": "14q88qdbnyzxr8sr8i5glj674sb4150b9y6nag0dqrxs629is6xj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151030.2135",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "jape-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tanzoniteblack",
-            "repo": "jape-mode",
-            "sha256": "0xmv7gw5xms6nhjcl51cw33yvjgw0c6bpnlyca3195x7g34sg1zj",
-            "rev": "85b9182850707b5d107391f6caee5bd401507a7d"
-        },
-        "recipe": {
-            "sha256": "1gd685r86h0kr36msw81gfgwv7d35hihz6h0jkc6vd22wf6qc3ly",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140903.1006",
-        "deps": []
-    },
-    "list-utils": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "list-utils",
-            "sha256": "0b6pnkhm5hnim2lpari93la08ic8qyh4nv0d7mw0cyfyk8phzzvn",
-            "rev": "36ade42f7cac835d1b8e3dcaf6beeba55ce89832"
-        },
-        "recipe": {
-            "sha256": "0bknprr4jb1d20i9lj2aa17vpg1kqwdyzzwmy1kfydnkpf5scnr3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140508.1541",
-        "deps": []
-    },
-    "helm-ack": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-helm-ack",
-            "sha256": "04rvbafa77blps7x7cmlsciys8fgmvhfhq4v51pk8z5q3j1lrgc5",
-            "rev": "889bc225318d14c6e3be80e73b1d9d6fb30e48c3"
-        },
-        "recipe": {
-            "sha256": "1a8sc5gd2g57dl9g18wyydfmihy74yniwhjr27h7vxylnf2g3pni",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141030.726",
-        "deps": [
-            "cl-lib",
-            "helm"
-        ]
-    },
-    "fasd": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "steckerhalter",
-            "repo": "emacs-fasd",
-            "sha256": "0m2qn3rd16s7ahyw6f9a4jb73sdc8bqp6d03p450yzcn36lw78z5",
-            "rev": "8726a367048054add81ecea7543de00688056735"
-        },
-        "recipe": {
-            "sha256": "0i49z50bpi7fx0dm5jywlndnq9hb0dm5a906k4017w8y7sfpfl6c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151208.116",
-        "deps": [
-            "grizzl"
-        ]
-    },
-    "packed": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "packed",
-            "sha256": "0743scd1g5xf3k9fbqv1qd9w421vfxwjlnb0vwix0ypahd83r3db",
-            "rev": "9d77e39c9df29c6224302cb7973b2de7e05f8bd7"
-        },
-        "recipe": {
-            "sha256": "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150723.638",
-        "deps": [
-            "dash",
-            "emacs"
-        ]
-    },
-    "guide-key": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kai2nenobu",
-            "repo": "guide-key",
-            "sha256": "14sx5m6fpkm2q8ljkicl1yy1sw003k4rzz9hi7lm1nfqr2l4n6q0",
-            "rev": "9236d287a7272e307fb941237390a96037c8c0a2"
-        },
-        "recipe": {
-            "sha256": "0zjrdvppcg8b2k6hfdj45rswc1ks9xgimcr2yvgpc8prrwk1yjsf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150108.35",
-        "deps": [
-            "dash",
-            "popwin",
-            "s"
-        ]
-    },
-    "jabber-otr": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "legoscia",
-            "repo": "emacs-jabber-otr",
-            "sha256": "0yv86nadp6dfzl05vhk8c1kahg2pcrhfmd3mnfjrngp7ksac5lyf",
-            "rev": "2692b1530234e0ba9a0d6c1eaa1cbe8679f193c0"
-        },
-        "recipe": {
-            "sha256": "114z5bwhkza03yvfa4nmicaih2jdq83lh6micxjimpddsc8fjgi0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150918.644",
-        "deps": [
-            "emacs",
-            "jabber"
-        ]
-    },
-    "pip-requirements": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Wilfred",
-            "repo": "pip-requirements.el",
-            "sha256": "05ix3xwqhnxjvc6cr006hhcgzhrp88jz9x4iswb0sidwysidpgnx",
-            "rev": "f8d3ecaee9090cee267476d4551c905c412d6017"
-        },
-        "recipe": {
-            "sha256": "1wsjfyqga7pzp8gsm5x53qrkn40srairbjpifyrqbi2fpzmwhrnz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150423.1558",
-        "deps": [
-            "dash"
-        ]
-    },
-    "flx-isearch": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "PythonNut",
-            "repo": "flx-isearch",
-            "sha256": "0ajc3vvgswqk57z7nmcx7npryi8ph9kzvw588bvqcg37a8l3nzh0",
-            "rev": "1c44a76bb6f9af925db6cee4102c635ef8d76318"
-        },
-        "recipe": {
-            "sha256": "14cshv5xb57ch5g3m3hfhawnnabdnbacp4kx40d0pw6jxw677gqd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151016.2259",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "flx"
-        ]
-    },
-    "runner": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thamer",
-            "repo": "runner",
-            "sha256": "17dzr5w12ai2q15yv81gchk360yjs71w74vsgs2fyy2yznvclpq9",
-            "rev": "f5983931899282cf8b10ad197d61860a61cf070d"
-        },
-        "recipe": {
-            "sha256": "09apmk22swj05z77ziij31jj6b3g221qv3mw3mymffzxn5ap2rbx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151118.416",
-        "deps": []
-    },
-    "cliphist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "redguardtoo",
-            "repo": "cliphist",
-            "sha256": "11c0zpk8gg70d4xiiyjc7v13knwb2ihbrxnlaxzh3rdg2c12676q",
-            "rev": "c0db2da95fa3d3a58160f465c636989bb4b251d5"
-        },
-        "recipe": {
-            "sha256": "0mg6pznijba3kvp3r57pi54v6mgih2vfwj2kg6qmcy1abrc0xq29",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151012.729",
-        "deps": [
-            "popup"
-        ]
-    },
-    "chinese-fonts-setup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tumashu",
-            "repo": "chinese-fonts-setup",
-            "sha256": "08ln66kx73019klzw0rsvlz3cs4ch8wxjfljmkyswjjd179h882c",
-            "rev": "bac9c65f7a78b0c70a6cce9658395d3bc24b02fa"
-        },
-        "recipe": {
-            "sha256": "141ri6a6mnxf7fn17gw48kxk8pvl3khdxkb4pw8brxwrr9rx0xd5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151208.259",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "mark-multiple": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "mark-multiple.el",
-            "sha256": "1x3anvy3hlmydxyfzr1rhaiy502yi1yz3v54sg8wc1w7jrvwaj29",
-            "rev": "f6a53c7c5283d640ae718f4548b0fda78877a375"
-        },
-        "recipe": {
-            "sha256": "179wd9g0smm76k92n7j2vgg8gz5wn9lczrns5ggq2yhbc77j0gn4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121118.954",
-        "deps": []
-    },
-    "dim": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alezost",
-            "repo": "dim.el",
-            "sha256": "1nixb8xw7rdrq9da1767jl8xximfdcwav2fs0kwmxjc6vahh7ya1",
-            "rev": "aee695f4c227e11aa22376667712815aafbb3616"
-        },
-        "recipe": {
-            "sha256": "0gsyily47g3g55qmhp1wzfz319l1pkgjz4lbigafjzlzqxyclz52",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.315",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "zossima": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "technomancy",
-            "repo": "zossima",
-            "sha256": "0fgwxw7r3zfv0b7xi8bx7kxff2r5hdw9gxf16kwq04fnh18nhi39",
-            "rev": "991676635c374d2a12714dcf48c1ce2d6f97a375"
-        },
-        "recipe": {
-            "sha256": "11kmnbqv4s8arindg7cxcdhbvfxsckks332wn7aiyb3bjhcgzwjb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121123.1835",
-        "deps": [
-            "inf-ruby"
-        ]
-    },
-    "haskell-emacs-text": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knupfer",
-            "repo": "haskell-emacs",
-            "sha256": "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0",
-            "rev": "f242ac4d0312aee5d162be82ae14b7154bb0db19"
-        },
-        "recipe": {
-            "sha256": "1j18fhhra6lv32xrq8jc6l8i56fgn68da81wymcimpmpbp0hl5fy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150713.916",
-        "deps": [
-            "haskell-emacs"
-        ]
-    },
-    "flycheck-rust": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "flycheck",
-            "repo": "flycheck-rust",
-            "sha256": "08ar85p5llk0lxlm2rd7rfc8s449vrknsrzzxqg8kvakgpd0nx7q",
-            "rev": "e03c895ef1ce514f7cefcd86f10e6bde97ff1c73"
-        },
-        "recipe": {
-            "sha256": "1k0n0y6lbp71v4465dwq7864vp1qqyx7zjz0kssszcpx5gl1596w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151225.913",
-        "deps": [
-            "dash",
-            "emacs",
-            "flycheck"
-        ]
-    },
-    "ido-sort-mtime": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pkkm",
-            "repo": "ido-sort-mtime",
-            "sha256": "0w3cr2yf8644i0g8w6r147vi9wanibn41sg7dzws51yb9q0y92vd",
-            "rev": "7b7c77f6856125a59aff99ba0ff8d2b369896b5e"
-        },
-        "recipe": {
-            "sha256": "1dkny9y3x49dv1vjwz78x2qhb6kdq3fa8qh1xkm30jyapvgiwdg2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131117.730",
-        "deps": []
-    },
-    "synosaurus": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rootzlevel",
-            "repo": "synosaurus",
-            "sha256": "1zz9rnwaclr95fpjyabv5rlhk36n2k8f1lzz6yqh964hv8i9562s",
-            "rev": "9be71a2df0c19ddb5e0cb8cba29ded5368a0fcae"
-        },
-        "recipe": {
-            "sha256": "16i2ag4l824h1kq4cy01zf01zrms4v6ldwlsixwfyb1mh97lqljg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151119.1249",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "php-boris": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tomterl",
-            "repo": "php-boris",
-            "sha256": "10lzbyr7z95mynz885k75n2ibsy92dh3mg3s5m69n03jnf9gv1jy",
-            "rev": "d2caaba8f42375b47389240c647c03c2a305d3fb"
-        },
-        "recipe": {
-            "sha256": "19yfbrlfqikix2lnnlbpzm6yakjhl84ix0zra2ycpvgg2pl88r0g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130527.321",
-        "deps": []
-    },
-    "flycheck-color-mode-line": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "flycheck",
-            "repo": "flycheck-color-mode-line",
-            "sha256": "11xc08xld758xx9myqjsiqz8vk3gh4d9c4yswswvky6mrx34c0y5",
-            "rev": "c85319f8d2579e770c9060bfef11bedc1370d8be"
-        },
-        "recipe": {
-            "sha256": "0hw19nsh5h2l8qbp7brqmml2fhs8a0x850vlvq3qfd7z248gvhrq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131125.2338",
-        "deps": [
-            "dash",
-            "emacs",
-            "flycheck"
-        ]
-    },
-    "yaml-tomato": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "RadekMolenda",
-            "repo": "yaml-tomato",
-            "sha256": "1xgqqgg4q3hrhiap8gmr8iifdr1mg4dl0j236b6alhrgmykbhimy",
-            "rev": "f9df1c9bdfcec629b03031b2d2032f9dc533cb14"
-        },
-        "recipe": {
-            "sha256": "0bja213l6mvh8ap5d04x8dik1z9px5jr52zpw1py7shw5asvp5s2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151123.153",
-        "deps": [
-            "s"
-        ]
-    },
-    "ph": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gromnitsky",
-            "repo": "ph",
-            "sha256": "1qxsc5wyk8l9gkgmqy3mzwxdhji1ljqw9s1jfxkax7fyv4d1v31p",
-            "rev": "ed45c371642e313810b56c45af08fdfbd71a7dfe"
-        },
-        "recipe": {
-            "sha256": "0azx4cpfdn01yrqyn0q1gg9z7w0h0rn7zl39v3dx6yidd76ysh0l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130312.1337",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "auto-complete-auctex": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "monsanto",
-            "repo": "auto-complete-auctex",
-            "sha256": "1wri8q5llpy1q1h4ac4kjnnkgj6fby8i9vrpr6mrb13d4gnk4gr2",
-            "rev": "855633f668bcc4b9408396742a7cb84e0c4a2f77"
-        },
-        "recipe": {
-            "sha256": "00npvryds5wd3d5a13r9prlvw6vvjlag8d32x5xf9bfmmvs0fgqh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140223.1158",
-        "deps": [
-            "auto-complete",
-            "yasnippet"
-        ]
-    },
-    "py-smart-operator": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rmuslimov",
-            "repo": "py-smart-operator",
-            "sha256": "05gi17n488r2n6x33nj4a23ci89c9smsbanmap4i302dy0mnmwgd",
-            "rev": "be4e32572d4128143f46e1874eaa6f3da94fdffe"
-        },
-        "recipe": {
-            "sha256": "1n0bdr9z2s1ikhmfz642k94gjzb88anwlb61mh27ay8wqdgm74c4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150824.2110",
-        "deps": [
-            "s"
-        ]
-    },
-    "es-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dakrone",
-            "repo": "es-mode",
-            "sha256": "1cc2k52vq2m4hzmrpb51xd5pjnxzv3iy8rf2y02c6f3a5xpilj9k",
-            "rev": "c5dd41e453e83da2e841894d9a51598f03318f7c"
-        },
-        "recipe": {
-            "sha256": "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150916.2233",
-        "deps": [
-            "dash"
-        ]
-    },
-    "flymake-ruby": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-ruby",
-            "sha256": "13yk9cncp3zw6d7zkgdpgprpw6wrirk2gxgjvkr15dwcyx1g3109",
-            "rev": "8dc4ca44ec2acfaab25f5501fca1bd687fae94f2"
-        },
-        "recipe": {
-            "sha256": "1shr6d03vx85nmyxnysglzlc1pz0zy3n28nrcmxqgdm02g197bzr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121104.1259",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "projector": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "waymondo",
-            "repo": "projector.el",
-            "sha256": "0y8zbywin99nhcrs5nzx4d179r84rdy39admajpi0j76v0b9pwl3",
-            "rev": "fd9553a27d665889646b881b64a8f1577b47882b"
-        },
-        "recipe": {
-            "sha256": "0hrinplk607wcc2ibn05pl8ghikv9f3zvymncp6nz95jw9brdapf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151201.1441",
-        "deps": [
-            "alert",
-            "cl-lib",
-            "projectile"
-        ]
-    },
-    "font-lock-studio": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Lindydancer",
-            "repo": "font-lock-studio",
-            "sha256": "04n32rgdz7m24jji8p0j42zmf2r60sdbbr4mkr6435fqyvmdd20k",
-            "rev": "35d510e4b16939621d7200bf67021f773cdb4ae5"
-        },
-        "recipe": {
-            "sha256": "0swwbfaypc78cg4ak24cc92kgxmr1x9vcpaw3jz4zgpm2wzbgmrq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141201.1858",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "commander": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "commander.el",
-            "sha256": "06y7ika4781gkh94ygdaz7a760s7ahrma6af6n7cqhgjyikz7lg1",
-            "rev": "2a4f1fd6cf9aa1798559dbdd5fbd9dcd327cd859"
-        },
-        "recipe": {
-            "sha256": "17y0hg6a90hflgwn24ww23qmvc1alzivpipca8zvpf0nih4fl393",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140120.1252",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "f",
-            "s"
-        ]
-    },
-    "olivetti": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rnkn",
-            "repo": "olivetti",
-            "sha256": "1rj97yg2n9fi80qlb4z6iahqid3yinlhx9mrbh6gi1niz58ws69h",
-            "rev": "26f3db0bc37324444e41a1d4797056b61b56b004"
-        },
-        "recipe": {
-            "sha256": "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151117.2129",
-        "deps": []
-    },
-    "gmpl-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cute-jumper",
-            "repo": "gmpl-mode",
-            "sha256": "08d6j5wws2ngngf3p31ic0lrsrp9i9lkpr3nxgmiiadm617x8hv4",
-            "rev": "c4cf8896aef89b4c08c0c8764c9f2330fc987f9e"
-        },
-        "recipe": {
-            "sha256": "1f60xim8h85jmqpvgfg402ff8mjd66gla8fa0cwi7l18ijnjblpz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151116.1349",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "helm-ag-r": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yuutayamada",
-            "repo": "helm-ag-r",
-            "sha256": "1rifdkhzvf7xd2npban0i8v3rjcji69063dw9rs1d32w4n7fzlfa",
-            "rev": "67de4ebafe9b088db950eefa5ef590a6d78b4ac8"
-        },
-        "recipe": {
-            "sha256": "0ivh7f021lbmbaj6gs4y8m99s63js57w04q7cwx7v4i32cpas7r9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131123.931",
-        "deps": [
-            "helm"
-        ]
-    },
-    "back-button": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "back-button",
-            "sha256": "0rj6a8rdwa0h2ckz7h4d91hnxqcin98l4ikbfyak2whfb47z909l",
-            "rev": "98d92984a740acd1547bd7ed05cca0affdb21c3e"
-        },
-        "recipe": {
-            "sha256": "0vyhvm445d0rs14j5xi419akk5nd88d4hvm4251z62fmnvs50j85",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150804.1504",
-        "deps": [
-            "list-utils",
-            "nav-flash",
-            "pcache",
-            "persistent-soft",
-            "smartrep",
-            "ucs-utils"
-        ]
-    },
-    "evil-indent-plus": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "TheBB",
-            "repo": "evil-indent-plus",
-            "sha256": "1g6r1ydscwjvmhh1zg4q3nap4avk8lb9msdqrh7dff6pla0r2qs6",
-            "rev": "0c7501e6efed661242c3a20e0a6c79a6455c2c40"
-        },
-        "recipe": {
-            "sha256": "15vnvch0qsaram22d44k617bqhr9rrf8qc86sf20yvdyy3gi5j12",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151109.1306",
-        "deps": [
-            "cl-lib",
-            "evil"
-        ]
-    },
-    "flymake-puppet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "benprew",
-            "repo": "flymake-puppet",
-            "sha256": "1r3yjqxig2j7l50l787qsi96mkvjcgqll9vb4ci51j7b43d53c5m",
-            "rev": "fc4cd25aeac37ed5722bc586d5350fd06ee3067c"
-        },
-        "recipe": {
-            "sha256": "1izq6s33p74dy4wzfnjii8wjs723bm5ggl0w6hkvzgbmyjc01hxv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141006.2055",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "nclip": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "maio",
-            "repo": "nclip.el",
-            "sha256": "178gjv7kq97p9i4naxql7xabvmchw5x8idkpyjqqky3b24v5wkis",
-            "rev": "af88e38b1f04be02bf2e57affc662dbd0f828e67"
-        },
-        "recipe": {
-            "sha256": "016jp1rqrf1baxlxbi3476m88a0l3r405dh6pmly519wm2k8pipw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130617.1515",
-        "deps": []
-    },
-    "tango-2-theme": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "https://gist.github.com/2024464.git",
-            "sha256": "7342a670559cd296dba4b676607641a05d6203255951b17473ccdda4e35713d3",
-            "rev": "64e44c98e41ebbe3b827d54280e3b9615787daaa"
-        },
-        "recipe": {
-            "sha256": "1a9qmz99h99gpd0sxqb71c08wr8pm3bzsg3p4cvf3vcirvav9lq6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120312.1525",
-        "deps": []
-    },
-    "ox-twbs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "marsmining",
-            "repo": "ox-twbs",
-            "sha256": "026g48sgqwnqs5zmrabhiv3l8052l4c1vsbsf6bdxv4a6yp0l654",
-            "rev": "cfe67353d148e65a7676f1609d8cc22a4c8fbc78"
-        },
-        "recipe": {
-            "sha256": "15csgnph5wh2dvcc2dnvrlm7whh428rq8smqji1509ib7aw9y5mx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151223.1320",
-        "deps": []
-    },
-    "mediawiki": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hexmode",
-            "repo": "mediawiki-el",
-            "sha256": "1cdr5p9x9bxnfy9mgz7l70zfzfwcjdhydw0jhdvs6qlqaqmm4qqq",
-            "rev": "47875f753599e309f1c3da5beb4805487ab75636"
-        },
-        "recipe": {
-            "sha256": "17cbrzfdp6jbbf74mn2fi1cwv7d1hvdbw9j84p43jzscnaa5ikx6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150711.1934",
-        "deps": []
-    },
-    "jknav": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aculich",
-            "repo": "jknav.el",
-            "sha256": "1idby2rjkslw85593qd4zy6an9zz71yzwqc6rck57r54xyfs8mij",
-            "rev": "861245715c728503dad6573278fdd75c271dbf8b"
-        },
-        "recipe": {
-            "sha256": "0c0a8plqrlsw8lhmyj9c1lfkj2b48cjkbw9pna8qcizvwgym9089",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121006.1525",
-        "deps": []
-    },
-    "oldlace-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mswift42",
-            "repo": "oldlace-theme",
-            "sha256": "0y9fxrsxp1158fyjp4f69r7g2s7b6nbxlsmsb8clwqc8pmmg2z82",
-            "rev": "5c6f437203b0783b36a7aff4a578de4a0c8c4ee6"
-        },
-        "recipe": {
-            "sha256": "1pxiqqh5x4wsayqgwplzvsbalbj44zvby7x0pijdvwcnsh74znj8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150705.800",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "0blayout": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "etu",
-            "repo": "0blayout-mode",
-            "sha256": "1xigpz2aswlmpcsc1f7gfakyw7041pbyl9zfd8nz38iq036n5b96",
-            "rev": "e256da71d4e0f126a0fd8a9b8fb77f54931f4dfc"
-        },
-        "recipe": {
-            "sha256": "027k85h34998i8vmbg2hi4q1m4f7jfva5jm38k0g9m1db700gk92",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151021.549",
-        "deps": []
-    },
-    "afternoon-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "osener",
-            "repo": "emacs-afternoon-theme",
-            "sha256": "19d5d6qs5nwmpf26rsb86ranb5p4236qp7p2b4i88cimcmzspylb",
-            "rev": "89b1d778a1f8b385775c122f2bd1c62f0fbf931a"
-        },
-        "recipe": {
-            "sha256": "13xgdw8px58sxpl7nyhkcdxwqdpp13i8wghvlb3l4471plw3vqgj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140104.1259",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "helm-pydoc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-helm-pydoc",
-            "sha256": "1hlbyw6jvh6pm3ivmhd6qvs9j7km322fki9g4yd4qw7w15a3wkyy",
-            "rev": "d4f409127bc77e7c79dcc87320b2db10466caed2"
-        },
-        "recipe": {
-            "sha256": "0cnbhjw951f8sci63cvzcc65d0ffdx3rb8l1g38qql5rzkam48fn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151008.924",
-        "deps": [
-            "cl-lib",
-            "helm-core"
-        ]
-    },
-    "visual-regexp-steroids": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "benma",
-            "repo": "visual-regexp-steroids.el",
-            "sha256": "03jggsnz5j0c36inxqa16vrdwlzn3wrniyl2i9b8c5bx7az7210m",
-            "rev": "2a50710dea5be872b31ea56f74b4cd57d6e61461"
-        },
-        "recipe": {
-            "sha256": "1xkrzyyll8wmb67m75lfm9k8qcm068km8r1k8hcsadpkd01bx1lr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150411.616",
-        "deps": [
-            "visual-regexp"
-        ]
-    },
-    "org-pdfview": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "markus1189",
-            "repo": "org-pdfview",
-            "sha256": "07xcibpqkr0kmwqvz9sfcd3bizscksvc7jw48zg6k79hb90vp1i0",
-            "rev": "8f66629e883e0d490584bbf4610cc91938694889"
-        },
-        "recipe": {
-            "sha256": "1z4gb5lw7ngphixw06b5484kwlxbc098w2xshzml5sywr16a4iab",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151125.1544",
-        "deps": [
-            "org",
-            "pdf-tools"
-        ]
-    },
-    "company-edbi": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "proofit404",
-            "repo": "company-edbi",
-            "sha256": "1fymxqdch9qnn68h3x4gq6f5fq9i4z6blsqyry2xmdvfrp407160",
-            "rev": "38758829b7fd9c1bb152b4d54b5317a20a96e411"
-        },
-        "recipe": {
-            "sha256": "067ff1xdyqy4qzgk5pmqf4kksfjk1glkrslcj3rk4zmhcalwrfrm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150525.414",
-        "deps": [
-            "cl-lib",
-            "company",
-            "edbi",
-            "s"
-        ]
-    },
-    "flyparens": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jiyoo",
-            "repo": "flyparens",
-            "sha256": "07hy1kyw4cbxydmhp4scsy3dcbk2s50rmdp8rch1vbcjk5lj4mvb",
-            "rev": "af9b8cfd647d0e5f97684d613dc2eea7cfc19398"
-        },
-        "recipe": {
-            "sha256": "1mvbfq062qj8vmgzk6rymg3idlfc1makfp1scmjvpw98h30j2a0a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140723.1346",
-        "deps": []
-    },
-    "aozora-view": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kawabata",
-            "repo": "aozora-view",
-            "sha256": "0528z3axjmplg2fdbv4jxgy1p39vr4rnsm4a3ps2fanf8bwsyx3l",
-            "rev": "b0390616d19e45f15f9a2f5d5688274831e721fd"
-        },
-        "recipe": {
-            "sha256": "0pd2574a6dkhrfr0jf5gvv34ganp6ddylyb6cfpg2d4znwbc2r2w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140310.817",
-        "deps": []
-    },
-    "tinkerer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yyr",
-            "repo": "tinkerer.el",
-            "sha256": "0rf177kr0qfhg8g5xrpi405dhp2va1yk170zm3f8hghi2575ciy2",
-            "rev": "1125780d1fba0330435fcbe943716032ed543a57"
-        },
-        "recipe": {
-            "sha256": "0qh6pzjn98jlpxcm9zf25ga0y3d3v53275a9zgswyhz33mafd7pd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150220.49",
-        "deps": [
-            "s"
-        ]
-    },
-    "readability": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ShingoFukuyama",
-            "repo": "emacs-readability",
-            "sha256": "0kg18ybgwcxhv5fiya5d3wn5w9si4914q946gjannk67d6jcq08g",
-            "rev": "6c220ab8e0ca63946574ed892add5c8fd14002ce"
-        },
-        "recipe": {
-            "sha256": "0kg91ma9k3p5ps467jjz2lw13rv1l8ivwc3zpg6c1rl474ds0qqv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140715.1927",
-        "deps": [
-            "emacs",
-            "oauth",
-            "ov"
-        ]
-    },
-    "pushbullet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "theanalyst",
-            "repo": "revolver",
-            "sha256": "03ivg3ddhy5zh410wgwxa17m98wywqhk62jgijhjd00b6l8i4aym",
-            "rev": "73c59a0f1dc04875b3e5a2c8afbc26c32128e445"
-        },
-        "recipe": {
-            "sha256": "1swzl25rcw7anl7q099qh14yhnwlbn3m20ib9kis0l1rv59kkarl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140809.732",
-        "deps": [
-            "grapnel",
-            "json"
-        ]
-    },
-    "git-blame": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tsgates",
-            "repo": "git-emacs",
-            "sha256": "0g839pzmipjlv32r0gh166jn3na5d0wh2w1sia2k4yx1w0ch1bsx",
-            "rev": "5c7e8c546c7e99a2424d484b253c1581bfd7ff7d"
-        },
-        "recipe": {
-            "sha256": "0glmnj77vya8ivjin4qja7lis67wyibzy9k6z8b54z7mqf9ikx06",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20110509.1126",
-        "deps": []
-    },
-    "io-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "superbobry",
-            "repo": "io-mode",
-            "sha256": "10xpxmbzhmi0lmby2rpmxrbr3qf1vlbif2inmfsvkj85wyh8a7rp",
-            "rev": "79f2de13d8a448892266da26642525747d048aa8"
-        },
-        "recipe": {
-            "sha256": "1fpiml7lvbl4s2xw4wk2y10iifvfza24kd9j8qvi1bgd85qkx42q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140814.521",
-        "deps": []
-    },
-    "command-log-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lewang",
-            "repo": "command-log-mode",
-            "sha256": "0fnyksbynlmmvl39f4is0xjp6b13yshfazigbksv012hxp0whslm",
-            "rev": "7408c0cb96709b8449f25a58a2203ed90bb5b850"
-        },
-        "recipe": {
-            "sha256": "11jq6055bvpwvrm0b8cgab25wa2mcyylpz4j56h1nqj7cnhb6ppj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150615.916",
-        "deps": []
-    },
-    "vline": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/vline.el",
-            "sha256": "1ys6928fgk8mswa4gv10cxggir8acck27g78cw1z3pdz5gakbgnj"
-        },
-        "recipe": {
-            "sha256": "0p59xhyrv7fmcn3qi51sp8v9v2y71ray2s756zbhzgzg63h3nbjp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120108.645",
-        "deps": []
-    },
-    "helm-wordnet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "raghavgautam",
-            "repo": "helm-wordnet",
-            "sha256": "0jaj513nnmbmlj8if84k5k0k7a6b24hzpzi0kbzj5vbr010cwnjd",
-            "rev": "71fe718cccdb172614b5e2e55192301a44f6d7d4"
-        },
-        "recipe": {
-            "sha256": "0di8gxsa9r8mzja4akhz0wpgrhlidqyn1s1ix5szplwxklwf2r2f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150921.1633",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "helm"
-        ]
-    },
-    "artbollocks-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sachac",
-            "repo": "artbollocks-mode",
-            "sha256": "133c1n4ra7z3vb6y47400y71a6ac19pyji0bgd4kr9fcbx0flx91",
-            "rev": "583c7048a1b09cd79554423d5115f5ddd129d190"
-        },
-        "recipe": {
-            "sha256": "0dlnxicn6nzyiz44y92pbl4nzr9jxfb9a99wacjrwq2ahdrwhhjp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141212.1532",
-        "deps": []
-    },
-    "firefox-controller": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cute-jumper",
-            "repo": "emacs-firefox-controller",
-            "sha256": "0pyk9qg7rb69bcbkbc6vf47ziyyxz9gapvkisi5h9kfx3frbix04",
-            "rev": "aeed30509fefc78463531b9e006a795d868d4e74"
-        },
-        "recipe": {
-            "sha256": "03y96b3l75w9al8ylijnlb8pcfkwddyfnh8xwig1b6k08zxfgal6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151212.1440",
-        "deps": [
-            "cl-lib",
-            "moz",
-            "popwin"
-        ]
-    },
-    "org-elisp-help": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "org-elisp-help",
-            "sha256": "0va8wm319vvw7w0j102mx656icy3fi4mz3b6bxira6z6xl9b92s0",
-            "rev": "df319441e528a0cad42d29e71fc3547a61dde1c5"
-        },
-        "recipe": {
-            "sha256": "0a4wvz52hkcw5nrml3h1yp8w97vg5jw22wnpfbb827zh7iwb259h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130423.1745",
-        "deps": [
-            "cl-lib",
-            "org"
-        ]
-    },
-    "pinboard-api": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "danieroux",
-            "repo": "pinboard-api-el",
-            "sha256": "0wy9c37g6m5khchlp8qvfnjgkwq4r38659adcm5prvzjgzqhlfja",
-            "rev": "b7b5214d0c35178f8dca08cf22d6ef3c21f0fce4"
-        },
-        "recipe": {
-            "sha256": "0yzvgnpkj2fhl01id36nc5pj8vyb05bllraiz3lwwcc66y98h9n0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140324.648",
-        "deps": []
-    },
-    "elpy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jorgenschaefer",
-            "repo": "elpy",
-            "sha256": "0kzara7r6gvgf3p06xswxbhq01dbhmwx1pldx3mmv7knvm2mdxq8",
-            "rev": "96fa05708629600fd79c4b0fcafe63ec97f5ce07"
-        },
-        "recipe": {
-            "sha256": "051irp7k0cp1hqp3hzrmapllf2iim7cq0iz38489g4fkh2ybk709",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151101.601",
-        "deps": [
-            "company",
-            "find-file-in-project",
-            "highlight-indentation",
-            "pyvenv",
-            "yasnippet"
-        ]
-    },
-    "fcitx": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cute-jumper",
-            "repo": "fcitx.el",
-            "sha256": "1q1ka1k6xca30lr7sl0dkiv1rcfmmvfh0igwrk3mhw79bxr9pyzz",
-            "rev": "5c4ec4181226b9846bc227e20c61645280fc26c1"
-        },
-        "recipe": {
-            "sha256": "0a8wd588c26p3czfp5hn2n46f2vwyg5v301sv0y07b55b1i3ynmx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151103.901",
-        "deps": []
-    },
-    "smart-window": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dryman",
-            "repo": "smart-window.el",
-            "sha256": "15834lnh7dq9kz31k06ifpnc0vz86rycz0ryildi5qd2nb7s3lw9",
-            "rev": "a87e0d2007de40033deee39496f791f4b047f138"
-        },
-        "recipe": {
-            "sha256": "1x1ncldl9njil9hhvzj5ac1l5aiyfm0f7j0d7lw8ady7xx2cy26m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130214.1342",
-        "deps": []
-    },
-    "avy-zap": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cute-jumper",
-            "repo": "avy-zap",
-            "sha256": "0s7lhls6gs055kw0893nkb9myv7m2q2p251lq9wh2r3bmia9d6pg",
-            "rev": "ee3a2ad9911384e21537bc641a2f794dd192bbe8"
-        },
-        "recipe": {
-            "sha256": "1zbkf21ggrmg1w0xaw40i3swgc1g4fz0j8p0r9djm9j120d94zkx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151211.1348",
-        "deps": [
-            "avy"
-        ]
-    },
-    "inf-ruby": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nonsequitur",
-            "repo": "inf-ruby",
-            "sha256": "0rg7md4b8chqfh565l9dhsjyiiqrbhm2xcaf88h2zian2rp0p1wh",
-            "rev": "24c08fca2a18b76a3a200c79bdb5e41b50e04296"
-        },
-        "recipe": {
-            "sha256": "02f01vwzr6j9iqcdns4l579bhia99sw8hwdqfwqjs9gk3xampfpp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151104.1437",
-        "deps": []
-    },
-    "confluence": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "http://confluence-el.googlecode.com/svn/trunk/",
-            "sha256": "1l6970ng046hw2izzb15cbbbf83l6m8c9mvic8fzjixfi3g1dl55",
-            "rev": "170"
-        },
-        "recipe": {
-            "sha256": "003lykwd3ya0xwlahmm35nx9p6mk8vylq57yxrmgdcc64630bdpf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130808.2150",
-        "deps": [
-            "xml-rpc"
-        ]
-    },
-    "tea-time": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "krick",
-            "repo": "tea-time",
-            "sha256": "0b4cwkwkc4i8lc4j30xc9d6xskm3gqrc2dij60ya75h92aj0lj40",
-            "rev": "1f6cf0bdd27c5eb3508989c5095427781f858eca"
-        },
-        "recipe": {
-            "sha256": "18fsbh78c5408zg5bk44gxdynp6kn8253xdg7ap2pr3mjknq9kld",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120331.320",
-        "deps": []
-    },
-    "dictionary": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myrkr",
-            "repo": "dictionary-el",
-            "sha256": "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm",
-            "rev": "a23b8f4a422d0de69a006ed010eff5795319db98"
-        },
-        "recipe": {
-            "sha256": "0zr9sm5rmr0frxdr0za72wiffip9391fn9dm5y5x0aj1z4c1n28w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140717.2229",
-        "deps": [
-            "connection",
-            "link"
-        ]
-    },
-    "cargo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "attichacker",
-            "repo": "cargo.el",
-            "sha256": "1khdwj443rw6l47r8j49a7wfg5qfdn9n8viz1fbk56v33kgj2lav",
-            "rev": "1b28b29d641a52d23861f241c54c098d6f070e76"
-        },
-        "recipe": {
-            "sha256": "0kr8mj3i4fd2x6ymaikzmj1m4q0s4lfvnafcpi7jch0za0qixjcq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151017.1620",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "helm-flymake": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tam17aki",
-            "repo": "helm-flymake",
-            "sha256": "1liaid4l4x8sb133lj944gwwpqngsf8hzibdwyfdmsi4m4abh73h",
-            "rev": "afb1089d6a0dc9a63bc2aa1df19d80830cc33c6a"
-        },
-        "recipe": {
-            "sha256": "0h87yd56nhxpahrcpk6hin142hzv3sdr5bvz0injbv8a2lwnny3b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130717.44",
-        "deps": [
-            "helm"
-        ]
-    },
-    "scratch-ext": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kyanagi",
-            "repo": "scratch-ext-el",
-            "sha256": "0ng0by647r49mia7vmjqc97gwlwgs8kmaz0lw2y54jdz8m0bbngp",
-            "rev": "388c53cddd0466b451264894667ed64a6947ad67"
-        },
-        "recipe": {
-            "sha256": "031wxz10k1q4bi5hywhcw1vzi41d5pv5hc09x8jk9s5nzyssvc0y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140103.2316",
-        "deps": []
-    },
-    "backup-each-save": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/backup-each-save.el",
-            "sha256": "0b9vvi2m0fdv36wj8mvawl951gjmg3pypg08a8n6rzn3rwg0fwz7"
-        },
-        "recipe": {
-            "sha256": "1fv9sf6vkjyv93vil4l9hjm2fg73zlxbnif0xfm3kpmva9xin337",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130704.932",
-        "deps": []
-    },
-    "cl-lib-highlight": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "cl-lib-highlight",
-            "sha256": "1mc8kayw8fmvpl0z09v6i68s2lharlwpzff0cvcsfn0an2imj2d0",
-            "rev": "fd1b308e6e989791d1df14438efa6b77d20f7c7e"
-        },
-        "recipe": {
-            "sha256": "13qdrvpxq928p27b1xdcbsscyhqk042rwfa17037gp9h02fd42j8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140127.1512",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "hlint-refactor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mpickering",
-            "repo": "hlint-refactor-mode",
-            "sha256": "02mkfrs55d32948x739f94v35343gw6a0f7fknbcigbz56mzsvsp",
-            "rev": "695d39b3434a5e35fab70aa5251f824ffaa30d6b"
-        },
-        "recipe": {
-            "sha256": "1311z6y7ycwx0mj67bya7a39j5hiypg72y6yg93dhgpk23wk7frq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151124.1441",
-        "deps": []
-    },
-    "ob-http": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zweifisch",
-            "repo": "ob-http",
-            "sha256": "1yv1i646ll9wnmarcwcmx3nvscq3sv22rmnphvqcr0whrd9vb7rb",
-            "rev": "d9af67c6726c50447d8cf21b9c1c25a3a07dc0ce"
-        },
-        "recipe": {
-            "sha256": "0b7ghz9pqbyn3b52cpmnwa2wnd4svj23p6gc48ybwzwiid42wiss",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151128.430",
-        "deps": [
-            "cl-lib",
-            "s"
-        ]
-    },
-    "wiki-nav": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "button-lock",
-            "sha256": "06qjvybf65ffrcnhhbqs333lg51fawaxnva3jvdg7zbrsv4m9acl",
-            "rev": "f9082feb329432fcf2ac49a95e64bed9fda24d58"
-        },
-        "recipe": {
-            "sha256": "19mabz0y3fcqsm68ijwwbbqylxgp71anc0a31zgc1blha9jivvwy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150223.754",
-        "deps": [
-            "button-lock",
-            "nav-flash"
-        ]
-    },
-    "ac-clang": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yaruopooner",
-            "repo": "ac-clang",
-            "sha256": "0n9zagwh3rz7b76irj4ya8wskffns9v1c1pivsdqgpd76spvl7n5",
-            "rev": "6b3365063ddfb88d5527618217bb56166349ad4e"
-        },
-        "recipe": {
-            "sha256": "070s06xhkzaqfc3j8c4i44rks6gn8z66lwd54j17p8d91x3qjpr4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150906.1208",
-        "deps": [
-            "auto-complete",
-            "cl-lib",
-            "emacs",
-            "pos-tip",
-            "yasnippet"
-        ]
-    },
-    "ert-modeline": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chrisbarrett",
-            "repo": "ert-modeline",
-            "sha256": "08yfq3qzscxvzyxvyvdqpkrm787278yhkdd9prbvrgjj80p8n7vq",
-            "rev": "e7be2b81191afb437b70368a819770f8f750e4af"
-        },
-        "recipe": {
-            "sha256": "06pc50q9ggin20cbfafxd53x35ac3kh85dap0nbws7514f473m7b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140115.415",
-        "deps": [
-            "dash",
-            "emacs",
-            "projectile",
-            "s"
-        ]
-    },
-    "pc-bufsw": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ibukanov",
-            "repo": "pc-bufsw",
-            "sha256": "1jj5h92qakrn9d5d88dvl43b7ppw96rm11hqg3791i6k48nx1d1m",
-            "rev": "a76120bca9821c355069f135b4e6978351b66bc2"
-        },
-        "recipe": {
-            "sha256": "01d7735ininlsjkql7dy57irgwgk4k9br8bl18wq51vgkg90i5k5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150923.213",
-        "deps": []
-    },
-    "stekene-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "stekene-theme",
-            "sha256": "0w1qb8r6nrxi5hbf8l4247yqq754zfbxz64pqqcnw43cxk0qd4j3",
-            "rev": "45b643a5af7dac70997d6a60e69c2f2473337d98"
-        },
-        "recipe": {
-            "sha256": "0v1kwlnrqaygzaz376a5njg9kv4yf5l35k87xga4wdd2mxfwrmf1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141108.1411",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "git-annex": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jwiegley",
-            "repo": "git-annex-el",
-            "sha256": "0yxmrcrvl9pbwhd7w4vnrv2jqyskzvqp17sr3vzjlvv694jd4dms",
-            "rev": "a37648ae83783bb48221ef6299aa4ef5ceccf51b"
-        },
-        "recipe": {
-            "sha256": "0194y24vq1w6m2cjgqgx9dqp99cq8y9licyry2zxa5brbrsxi94l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131119.1645",
-        "deps": []
-    },
-    "checkbox": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "camdez",
-            "repo": "checkbox.el",
-            "sha256": "0660ix17ksxy5a5v8yqy7adr9d4bs6p1mnkc6lpyw96k4pn62h45",
-            "rev": "335afa4404adf72973195a580458927004664d98"
-        },
-        "recipe": {
-            "sha256": "17gw6w1m6bs3sfx8nqa8nzdq26m8w85a0fca5qw3bmd18bcmknqa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141116.1858",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "color-theme-modern": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-jp",
-            "repo": "replace-colorthemes",
-            "sha256": "0q9ss11i31iiv0vn8238922fkic7j6d02f9ykbip04sm46p5k6kj",
-            "rev": "0a804c611da57b2d7c02c95f26eb8a7fc305f159"
-        },
-        "recipe": {
-            "sha256": "0f662ham430fgxpqw96zcl1whcm28cv710g6wvg4fma60sblaxcm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151109.2106",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "jtags": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://git.code.sf.net/p/jtags/code",
-            "sha256": "4fce3cbd26e010869736aae584753dca0b2201d31efaa8e52ee04b885edd859a",
-            "rev": "89eca29499dd9516e6d70456dcd9f163777c786d"
-        },
-        "recipe": {
-            "sha256": "0in5ybgwmghlpa5d7wz0477ba6n14f1mwp5dxcl4y11f1lsq041r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20111208.1222",
-        "deps": []
-    },
-    "opam": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lunaryorn",
-            "repo": "opam.el",
-            "sha256": "1yqrp9icci5snp1485wb6y8mr2hjp9006ahch58lvmnq98bn7j45",
-            "rev": "4d589de5765728f56af7078fae328b6792de8600"
-        },
-        "recipe": {
-            "sha256": "004r93nn1ranvxkcc0y5m3p8gh4axgghgnsvim38nc1sqda5h6xa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150719.720",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "jira-markup-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mnuessler",
-            "repo": "jira-markup-mode",
-            "sha256": "1ack7dmapva3wc2gm22prd5wd3cmq19sl4xl9f04a3nk2msr6ksx",
-            "rev": "4fc534c47df26a2f402bf835ebe2ed89474a4062"
-        },
-        "recipe": {
-            "sha256": "0f3sw41b4wl0aajq0ap66942rb2015d9iks0ss016jgzashw7zsp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150601.1609",
-        "deps": []
-    },
-    "number": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chrisdone",
-            "repo": "number",
-            "sha256": "045m83rdqryjpqh6y9s6x0yf9fw9xrwmxbm4qgg8ka164x9szv0n",
-            "rev": "f483365c330392b3e9362481b145acf3db040baf"
-        },
-        "recipe": {
-            "sha256": "1nwcdv5ibirxx3sqadh6mnpj40ni3wna7wnjh343mx38dk2dzncf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141127.1204",
-        "deps": []
-    },
-    "org-drill-table": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chrisbarrett",
-            "repo": "org-drill-table",
-            "sha256": "0m5c9x0vazciq6czpg5y9nr5yzjf6nl0qp5cfajv49cw2h0cwqyy",
-            "rev": "d7b5b3743ac04f8cb1087c5c049c0520058fa89c"
-        },
-        "recipe": {
-            "sha256": "1gb5b4hj4xr8nv8bxfar145i38zcic6c34gk98wpshvwzvb43r69",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140117.337",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "emacs",
-            "org-plus-contrib",
-            "s"
-        ]
-    },
-    "crappy-jsp-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "crappy-jsp-mode",
-            "sha256": "12g6l6xlbs9h24q5lk8yjgk91xqd7r3v7r6czy10r09cmfjmkxbb",
-            "rev": "6c45ab92b452411cc0fab9bcee2f456276b4fc40"
-        },
-        "recipe": {
-            "sha256": "00wj61maib77qldzq06l9v0pbvp9jih75w1xw0ry9mij0r6ca8ii",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140311.431",
-        "deps": []
-    },
-    "peep-dired": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "asok",
-            "repo": "peep-dired",
-            "sha256": "1qi9qzcvclyw9wiamsw0z8q09hs0mfhaj2giny42nd6sqacvfr7m",
-            "rev": "6c18727fc58e2a19638f133810e35bd5d918a559"
-        },
-        "recipe": {
-            "sha256": "16k5y3h2ip96k071vhx83avg4r4nplnd973b1271vvxbx2bly735",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150518.900",
-        "deps": []
-    },
-    "docker-tramp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-pe",
-            "repo": "docker-tramp.el",
-            "sha256": "1mh28210a85yy1b4lic3ijv7xhjk3z9nxjq55b7mqflgjna1ih3c",
-            "rev": "8e9ae1b170fc320e38806c3957c6f01dbb46c26e"
-        },
-        "recipe": {
-            "sha256": "19kky80qm68n2izpjfyiy4gjywav7ljcmp101kmziklpqdldgh1w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150908.2155",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "ycmd": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abingham",
-            "repo": "emacs-ycmd",
-            "sha256": "1lydq43xn51m4dwvv3qzrcsqw7dwbhxz4rinqx4m9y81caqakssx",
-            "rev": "3005b49176ff3315ba4cc7893fff42ce034d6e80"
-        },
-        "recipe": {
-            "sha256": "06psmcr5132vn72l0amzj14dy43aradnbmlvvms55srvici6r60q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151223.906",
-        "deps": [
-            "dash",
-            "deferred",
-            "emacs",
-            "f",
-            "popup"
-        ]
-    },
-    "springboard": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jwiegley",
-            "repo": "springboard",
-            "sha256": "14py5amh66jzhqyqjz5pxq0g19vzlmqnrr5wij1ix64xwfr3xdy8",
-            "rev": "d12119d9dd2b0b64f0af0ba82c273326c8c12268"
-        },
-        "recipe": {
-            "sha256": "17rmsidsbb4p08vr07mfn25m17wnpadcwr4nxvp79glp5a0wyyib",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150505.1211",
-        "deps": [
-            "helm"
-        ]
-    },
-    "zone-nyan": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wasamasa",
-            "repo": "zone-nyan",
-            "sha256": "1lrgirfvcvbir7csshkhhwj99jj1x5aprhw7xfiicv7nan9m6gjy",
-            "rev": "e36875d83ad3dce14f23864688959fa0d98ba410"
-        },
-        "recipe": {
-            "sha256": "165sgjaahz038isii971m02hr2g5iqhbhiwf5kdn8c739cjaa17b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151208.1514",
-        "deps": [
-            "esxml"
-        ]
-    },
-    "cursor-chg": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/cursor-chg.el",
-            "sha256": "1mvfg2m3wq5rbbxs2a84pd69yb82dag4g5mpzr16xi0gn6ybj4s7"
-        },
-        "recipe": {
-            "sha256": "0d1ilall8c1y4w014wks9yx4fz743hvx5lc8jqxxlrq7pmqyqdxk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1539",
-        "deps": []
-    },
-    "haste": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rlister",
-            "repo": "emacs-haste-client",
-            "sha256": "1gmh455ahd9if11f8mrqbfky24c784bb4fgdl3pj8i0n5sl51i88",
-            "rev": "22d05aacc3296ab50a7361222ab139fb4d447c25"
-        },
-        "recipe": {
-            "sha256": "0wz15p58g4mxvwbpy9k60gixs1g4jw7pay5pbxnlggc39x1py8nf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141030.1534",
-        "deps": [
-            "json"
-        ]
-    },
-    "gitattributes-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "git-modes",
-            "sha256": "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd",
-            "rev": "9d8f6eda6ee97963e4085da8988cad2c0547b8df"
-        },
-        "recipe": {
-            "sha256": "1gjs0pjh6ap0h54savamzx94lq6vqrg58jxqaq5n5qplrbg15a6x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150330.1248",
-        "deps": []
-    },
-    "emojify": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "iqbalansari",
-            "repo": "emacs-emojify",
-            "sha256": "0nrf6p4h66i17nz850kpdrnk5h5ra4l3icjjrq34sxvmsssp6zhp",
-            "rev": "fec788f09ab1c131b89f296ebd3e73df97e96cfe"
-        },
-        "recipe": {
-            "sha256": "15v2h5jfksfc208qphiczplg56yka07qv4w4482c10yzwq76zp17",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151220.2152",
-        "deps": [
-            "emacs",
-            "ht",
-            "seq"
-        ]
-    },
-    "sx": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vermiculus",
-            "repo": "sx.el",
-            "sha256": "0kfjaqydpm1c9l3k58zfjdy7wpqvsm7rirsnizwidg8lhca28b2b",
-            "rev": "75db6c18ceee1e75f8be0c312c6241d359b7a28b"
-        },
-        "recipe": {
-            "sha256": "1ml1rkhhk3hkd16ij2zwng591rxs2yppsfq9gwd4ppk02if4v517",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151111.2046",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "json",
-            "let-alist",
-            "markdown-mode"
-        ]
-    },
-    "mykie": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yuutayamada",
-            "repo": "mykie-el",
-            "sha256": "0a9a6hmv8vjmp6h9mnzin9vc0sncg79v5z72pasvbrplfxijzan0",
-            "rev": "7676f0e883af1d1054e404e97691f3c13aba196f"
-        },
-        "recipe": {
-            "sha256": "12ram39fp3m9ar6q184rsnpkxb14y0ajibng7ia2ck54ck7n36cj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150808.1705",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "esup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jschaf",
-            "repo": "esup",
-            "sha256": "0xfip7awlrd935ijyw4pz0mjg0wyqifp74w4psxm8cy7hymly450",
-            "rev": "bba1baf15c12e8fdaa36afa20943e311c7fdc12d"
-        },
-        "recipe": {
-            "sha256": "0cv3zc2zzm38ki3kxq58g9sp4gsk3dffa398wky6z83a3zc02zs0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151225.1946",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "evil-rsi": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "linktohack",
-            "repo": "evil-rsi",
-            "sha256": "1ygrpffa847144i74z2yy5r5vcvd334gad5mg18ffydacddcyqmq",
-            "rev": "4e0cb07d0e1c2a5e463ea1ea146f019c47a29e61"
-        },
-        "recipe": {
-            "sha256": "0mc39n72420n36kwyf9zpw1pgyih0aigfnmkbywb0yxgj7myc345",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151027.1719",
-        "deps": [
-            "evil"
-        ]
-    },
-    "letcheck": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "letcheck",
-            "sha256": "1l9qjmyb4a3f6i2iimpmjczbx890cd1p24n941s13sg67xfbm7hn",
-            "rev": "e85b185993a2eaeec6490709f4c131fde2edd672"
-        },
-        "recipe": {
-            "sha256": "1sjwi1ldg6b1qvj9cvfwxq3qlkfas6pm8zasf43baljmnz38mxh2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150726.1112",
-        "deps": []
-    },
-    "zoom-frm": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/zoom-frm.el",
-            "sha256": "0y424lw7j0p0i0s7az7fabk9k4d0shcp4mimlkfl3whci24rbq6y"
-        },
-        "recipe": {
-            "sha256": "111lr29zhj8w8j7dbzl58iisqxjhccxpw4spfxx08zxh4623g5mk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151101.1224",
-        "deps": [
-            "frame-cmds",
-            "frame-fns"
-        ]
-    },
-    "ido-exit-target": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "waymondo",
-            "repo": "ido-exit-target",
-            "sha256": "1s93q47cadanynvm1y4y08s68yq0l8q8vfasdk7w39vrjsxxsj3x",
-            "rev": "322520c665284ce6547eb9dcd3aa888a02a51489"
-        },
-        "recipe": {
-            "sha256": "17vmg47xwk6yjlbcsswirl8s2q565k291ajzjglnz7qg2fwx6spi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150904.937",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "find-file-in-repository": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hoffstaetter",
-            "repo": "find-file-in-repository",
-            "sha256": "090m5647dpc8r8fwi3mszvc8kp0420ma5sv0lmqr2fpxyn9ybkjh",
-            "rev": "8a8c84a6dbe7a2bba4564c3b58c92d157abfa3f8"
-        },
-        "recipe": {
-            "sha256": "0q1ym06w2yn3nzpj018dj6h68f7rmkxczyl061mirjp8z9c6a9q6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151113.719",
-        "deps": []
-    },
-    "auto-install": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/auto-install.el",
-            "sha256": "043pb2wk7jh0jgxphdl4848rjyabna26gj0vlhpiyd8zc361pg9d"
-        },
-        "recipe": {
-            "sha256": "1gaxc2ya4r903k0jf3319wg7wg5kzq7k8rfy8ac9b0wfzv247ixk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150418.1902",
-        "deps": []
-    },
-    "clojure-snippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mpenet",
-            "repo": "clojure-snippets",
-            "sha256": "1w8izhrj23b8kqcsqalgrzxqnq18nvdxl48305p8cnwll646xjl2",
-            "rev": "24ebfd34665e1a3b74aaa823f8b2e3e4a5e0b827"
-        },
-        "recipe": {
-            "sha256": "15622mdd6b3fpwp22d32p78yap08pyscs2vc83sv1xz4338i0lij",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150504.344",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "zonokai-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ZehCnaS34",
-            "repo": "zonokai-emacs",
-            "sha256": "0ls9x2r12z9ki2fy3cbf05mp28x4ws2gk3knacvw7gvvg4sjdq5w",
-            "rev": "b6f9eb7eb7e3f9954d786144e74dc6e392df3a69"
-        },
-        "recipe": {
-            "sha256": "1hrpgh03mp7yynqamgzkw7fa70c5pmyjfmfblkfhspnsif8j4v29",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150408.2202",
-        "deps": []
-    },
-    "helm-lobsters": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "julienXX",
-            "repo": "helm-lobste.rs",
-            "sha256": "0nkmc17ggyfi7iz959mvzh6q7116j44zqwi7ydm9i8z49xfpzafy",
-            "rev": "4121b232aeded2f82ad2c8a85c7dda17ef9d97bb"
-        },
-        "recipe": {
-            "sha256": "0dkb78n373kywxj8zba2s5a2g85vx19rdswv9i78xjwv1lqh8cpp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150213.946",
-        "deps": [
-            "cl-lib",
-            "helm"
-        ]
-    },
-    "moe-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kuanyui",
-            "repo": "moe-theme.el",
-            "sha256": "0dyp8jpznb9ivzkka2cgydzcldc275238p0f1c9pcrxjf7mjglmx",
-            "rev": "56b0833e3549e1b2f008388549972971936b053f"
-        },
-        "recipe": {
-            "sha256": "1nqvj8spvffgjvqlf25rcm3dc6w1axb6qlwwsjhq401a6xhw67f6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151124.1709",
-        "deps": []
-    },
-    "sproto-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "m2q1n9",
-            "repo": "sproto-mode",
-            "sha256": "11igl9n2zwwar1xg651g5v0r0w6xl0grm8xns9wg80351ijrci7x",
-            "rev": "0583a88273204dccd884b7edaa3590cefd31e7f7"
-        },
-        "recipe": {
-            "sha256": "19l6si3sx2i542r5lyr9axby9hblx76m77f17vnsjf32n3r0qgma",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151115.1205",
-        "deps": []
-    },
-    "helm-commandlinefu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xuchunyang",
-            "repo": "helm-commandlinefu",
-            "sha256": "0fxrmvb64lav4aqs61z3a4d2mcp9s2nw7fvysyjn0r1291pkzk9j",
-            "rev": "9ee7e018c5db23ae9c8d1c8fa969876f15b7280d"
-        },
-        "recipe": {
-            "sha256": "150nqib0sr4n35vdj1xrxcja8gkv3chzhdbgkjxqgkz2yq10xxnd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150611.45",
-        "deps": [
-            "emacs",
-            "helm",
-            "json",
-            "let-alist"
-        ]
-    },
-    "ac-emoji": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-ac-emoji",
-            "sha256": "19981mzxnqqdb8dsdizy2i8byb8sx9138x3nrvi6ap2qbcsabjmz",
-            "rev": "f4b3a5b3548dc36f69daeff742f53b5bda538bae"
-        },
-        "recipe": {
-            "sha256": "0msh3dh89jzk6hxva34gp9d5pazchgdknxjbi72z26rss9bkp1mw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150823.211",
-        "deps": [
-            "auto-complete",
-            "cl-lib"
-        ]
-    },
-    "gh-md": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-pe",
-            "repo": "gh-md.el",
-            "sha256": "0g3bjpnwgqczw6ddh4mv7pby0zyqzqgywjrjz2ib6hwmdqzyp1s0",
-            "rev": "693cb0dcadff70e813e1a9d303d227aff7898557"
-        },
-        "recipe": {
-            "sha256": "0b72fl1hj7gkqlqrr8hklq0w3ryqqqfn5qpb7a9i6q0vh98652xm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151207.1140",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "badger-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ccann",
-            "repo": "badger-theme",
-            "sha256": "0g8smx6pi2wqv78mhxfgwg51mx5msqsgcc55xcz29aq0q3naw4z1",
-            "rev": "80fb9f8ace37b2e8807da639f7da499a53ffefd4"
-        },
-        "recipe": {
-            "sha256": "01h5bsqllgn6gs0wpl0y2h041007mn3ldjswkz6f3mayrgl4c6yf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140716.2132",
-        "deps": []
-    },
-    "ox-asciidoc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yashi",
-            "repo": "org-asciidoc",
-            "sha256": "1q7jlz0f09mwymq8m6x9fiariww7rwiy4wkqkbbc296wm7impr75",
-            "rev": "e34b1df9fa061d395e600660620ab6c3b7e59ac1"
-        },
-        "recipe": {
-            "sha256": "07b549dqyh1gk226d7zbls1mw6q4mas7kbfwkansmyykax0r2zyr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150919.1459",
-        "deps": [
-            "org"
-        ]
-    },
-    "ember-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "madnificent",
-            "repo": "ember-mode",
-            "sha256": "0cv8y6hr719648yxr2fbgb1hyg36m60bsbd57f2vvvqvg87si4jz",
-            "rev": "e82d88eee1882ac104857ec42a4fed731a99c13e"
-        },
-        "recipe": {
-            "sha256": "0fwd34cim29dg802ibsfd120px9sj54d4wzp3ggmjjzwkl9ky7dx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151103.421",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "ido-load-library": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "ido-load-library",
-            "sha256": "0l69sr3g1n2x61j6sv6hnbiyk8a2qra6y2kh413qp0sfpx4fzchv",
-            "rev": "e03b55957c93aa1a7dd190e173e16ec59dbb2ba7"
-        },
-        "recipe": {
-            "sha256": "13f83gqh39p3yjy7r7qc7kzgdcmqh4b5c07zl7rwzb8y9rz59lhj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140611.1100",
-        "deps": [
-            "pcache",
-            "persistent-soft"
-        ]
-    },
-    "therapy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abingham",
-            "repo": "therapy",
-            "sha256": "12kz4alyf3y2i7lkvi26hcxy55v0blsrxv5srx9fv5jhxkdz1vq1",
-            "rev": "775a92bb7b6b0fcc5b38c0b5198a9d0a1bef788a"
-        },
-        "recipe": {
-            "sha256": "0y040ghb0y6aq0nchqr09vapz6h6112rkwxkqsx0v7xmqrqfjvhh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151113.1353",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "isend-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ffevotte",
-            "repo": "isend-mode.el",
-            "sha256": "022j39r2vvppnh3p5rp9i4cgc3lg24ksjcmcjmbmna1vf624izn0",
-            "rev": "274163f5c42834ce0391fcc8800e169104ad518f"
-        },
-        "recipe": {
-            "sha256": "0sk80a08ny9vqw94klqfgii297qm633000wlcldha76ip8viikdv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130419.458",
-        "deps": []
-    },
-    "cd-compile": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jamienicol",
-            "repo": "emacs-cd-compile",
-            "sha256": "1a93cim1w96aaj81clhjv25r7v9bwqm9a818mn8lk4aj1bmhgc4c",
-            "rev": "10284ccae86afda4a37b09ba90acd1e2efedec9f"
-        },
-        "recipe": {
-            "sha256": "1a24rv1jbb883vwhjkw6qxv3h3qy039iqkhkx3jkq1ydidr9f0hv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141108.1357",
-        "deps": []
-    },
-    "flycheck-irony": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Sarcasm",
-            "repo": "flycheck-irony",
-            "sha256": "1ax55yhf9q8i8z1f97zp3r08dqv8npd2llllbwa67d1bj49bsf2h",
-            "rev": "b92e881fdf9c9cea192bfb8fa228784af5e27ea4"
-        },
-        "recipe": {
-            "sha256": "0qk814m5s7mjba659llml0gy1g3045w8l1g73w2pnm1pbpqdfn3z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150728.1431",
-        "deps": [
-            "emacs",
-            "flycheck",
-            "irony"
-        ]
-    },
-    "tabula-rasa": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "idomagal",
-            "repo": "tabula-rasa",
-            "sha256": "1dbjfq9a7a5s9c18nrp4kcda64jkg5cp8na31kxw0hjcn98dgqa8",
-            "rev": "e85fff9de18dc31bc6a7aca726e34a95cc5459f5"
-        },
-        "recipe": {
-            "sha256": "186lph964swg7rs5gvby3p1d0znq9x3xzsmirfb3cdbazvz6hhxi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141215.2347",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "auctex-lua": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vermiculus",
-            "repo": "auctex-lua",
-            "sha256": "0lgfgvnaln5rhhwgcrzwrhbj0gz8sgaf6xxdl7njf3sa6bfgngsz",
-            "rev": "799cd8ac10c96991bb63d9aa60528ae5d8c786b5"
-        },
-        "recipe": {
-            "sha256": "0v999jvinljkvhbn205p36a6jfzppn0xvflvzr8mid1hnqlrpjhf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151121.1010",
-        "deps": [
-            "auctex",
-            "lua-mode"
-        ]
-    },
-    "elmacro": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Silex",
-            "repo": "elmacro",
-            "sha256": "181hcyg5v62nxrgmb7pl9672rm9fy8crc4lqhdwvdvd7ngki1fiz",
-            "rev": "ff5d8a0d7f5154707f1d0a2b22894c6c0b0b9f94"
-        },
-        "recipe": {
-            "sha256": "0644rgwawivrq1shsjx1x2p53z7jgr6bxqgn2smzql8pp6azy7xz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141109.1006",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "fit-frame": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/fit-frame.el",
-            "sha256": "15697xc2gr5x9wj472jyzjhnim1jlx3ai3anzx8apngpqa9caiq1"
-        },
-        "recipe": {
-            "sha256": "1xcq4n9gj0npjjl98vqacms0a0wnzw62a9iplyf7bgj7n77pgkjb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1604",
-        "deps": []
-    },
-    "helm-make": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "helm-make",
-            "sha256": "05z1s01wgdj2s7qln42cg7nnjq0hmq2ji4xjldzj6w770a5nvb7g",
-            "rev": "0f29d09002653a2b3cb21ffdecaf33e7911747d8"
-        },
-        "recipe": {
-            "sha256": "1r6jjy1rlsii6p6pinbz7h6gcw4vmcycd3vj338bfbnqp5rrf2mc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151117.1120",
-        "deps": [
-            "helm",
-            "projectile"
-        ]
-    },
-    "go-autocomplete": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nsf",
-            "repo": "gocode",
-            "sha256": "0p3abkqllgy1b5l08wgxjywvvbcjiyjdf00azh1r1nyc81m4krni",
-            "rev": "2b99fc4d372b017483b7596c4577bf5f15479772"
-        },
-        "recipe": {
-            "sha256": "1ldsq81a167dk2r2mvzyp3v3j2mxc4l9p6b12i7pv8zrjlkhma5a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150903.2140",
-        "deps": [
-            "auto-complete"
-        ]
-    },
-    "beeminder": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sodaware",
-            "repo": "beeminder.el",
-            "sha256": "1ckbl8z59p81jsq8xsgcwqqrpzv1apzjr594w3dyp9bzqb7h2acm",
-            "rev": "92fa1a8d1df3e2fd0698192008f604b1794ee5f8"
-        },
-        "recipe": {
-            "sha256": "0aj7ix7nrsl89f9c449kik8fbzhfk9li50wrh50cdwgfh8gda0fx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1634",
-        "deps": [
-            "org"
-        ]
-    },
-    "idris-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "idris-hackers",
-            "repo": "idris-mode",
-            "sha256": "16gk7ry4yiaxk9dp6s2m4g79klw344yvr86d7hr0qdjkkf229m56",
-            "rev": "f2f0a19f1a23fac618442d7d2187cc3ac5d9e445"
-        },
-        "recipe": {
-            "sha256": "0hiiizz976hz3z3ciwg1gs9y10qhxbs8givhz89kvyn4s4861a1s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151030.607",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "prop-menu"
-        ]
-    },
-    "bliss-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsfodder",
-            "repo": "emacs-bliss-theme",
-            "sha256": "0dn0i3nxrqd82b9d17p1v0ddlpxnlfclkc8sqzrwq6cf19wcrmdr",
-            "rev": "2c6922cb24118722819bea79a981f066039d34a3"
-        },
-        "recipe": {
-            "sha256": "1kzvi6zymfgirr41l8r2kazfz1y4xkigbp5qa1fafcdmw81anmdh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141116.101",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "drill-instructor-AZIK-force": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "drill-instructor-AZIK-force.el",
-            "sha256": "0lzq0mkhhj3s5yrcbs576qxkd8h0m2ikc4iplk97ddpzh4nz4127",
-            "rev": "008cea202dc31d7d6fb1e7d8e6334d516403b7a5"
-        },
-        "recipe": {
-            "sha256": "1bb698r11m58csd2rm17fmiw691p25npphzqgjiiqbn4vx35ja7f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151122.2314",
-        "deps": [
-            "popup"
-        ]
-    },
-    "exec-path-from-shell": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "exec-path-from-shell",
-            "sha256": "085vmpxk99mvxa5k3fwr5x443434gh0iy3qp272fyks85yccrayl",
-            "rev": "673f1fc0606ca9a30eb62cb1ac2094d15ab9377e"
-        },
-        "recipe": {
-            "sha256": "1j6f52qs1m43878ikl6nplgb72pdbxfznkfn66wyzcfiz2hrvvm9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151125.1333",
-        "deps": []
-    },
-    "highlight-symbol": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nschum",
-            "repo": "highlight-symbol.el",
-            "sha256": "0d7scpgn9wnq9r72vjv68nnk6qgk0x1bxlm070hj2iz51pdqda7x",
-            "rev": "c2e15fee52aebf5c8e618460b8f924331d0df2a3"
-        },
-        "recipe": {
-            "sha256": "0gw8ffr64s58qdbvm034s1b9xz1hynzvbk8ld67j06fxpc98qaj4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151005.651",
-        "deps": []
-    },
-    "ppd-sr-speedbar": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rdallasgray",
-            "repo": "ppd-sr-speedbar",
-            "sha256": "0pv671j8g09pn61kkfb3pa9axfa9zd2jdrkgr81rm2gqb2vh1hsq",
-            "rev": "19d3e924407f40a6bb38c8fe427a159af755adce"
-        },
-        "recipe": {
-            "sha256": "1m2918hqvb9c6rgb5szs95ds99gdjdxggcbdfqzmbb5sz2936av8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151108.624",
-        "deps": [
-            "project-persist-drawer",
-            "sr-speedbar"
-        ]
-    },
-    "clean-buffers": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lujun9972",
-            "repo": "clean-buffers",
-            "sha256": "18z3511iyvcw04lhpxfa36gybbw4ply6bbd5l2nfqn7q2lpi95ya",
-            "rev": "a6902eecef04a39f28a1e44631cfb571ddc5e020"
-        },
-        "recipe": {
-            "sha256": "025sxrqxm24yg1wpfncrjw1nm91h0h7jy2xd5g20xqlinqqvdihj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.922",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "reveal-next": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/reveal-next.el",
-            "sha256": "0bpcx6jlv0m5bg1zrkak471fa2yj4m517zn72ajvp5r9y408i82y"
-        },
-        "recipe": {
-            "sha256": "0fp6ssd4fad0s2pbxbw75bnx7fcgasig8xvcx7nls8m9p6zbbmh2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1843",
-        "deps": []
-    },
-    "vbasense": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "emacs-vbasense",
-            "sha256": "19j5q2f6pybvjq3ryjcyihzlw348hqyjhfcy3qflry6w786dqcgn",
-            "rev": "8c61a492d7c15218ae1a96e2aebfe6f78bfff6db"
-        },
-        "recipe": {
-            "sha256": "1440q2bi4arpl5lbqh7zscg7v3884clqx54p2fdfcfkz47ky4z9n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140221.1753",
-        "deps": [
-            "auto-complete",
-            "log4e",
-            "yaxception"
-        ]
-    },
-    "lively": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/lively.el",
-            "sha256": "1z9b0arn7vby4fkwzgj3ml537lh94gvf61vs03cqfkc95lv14r76"
-        },
-        "recipe": {
-            "sha256": "1wjd6kfnknhw9lc2p9iipaxfm9phpkqqmjw43bhc70ybsq1xaln7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120728.913",
-        "deps": []
-    },
-    "org-redmine": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gongo",
-            "repo": "org-redmine",
-            "sha256": "1q99b9l6y97iic46xqj7rqnkrzk8f0qq4qy81jv9wz54hq51w07v",
-            "rev": "4289eb06c506f19ef8c467acb2a05bcf04f187c9"
-        },
-        "recipe": {
-            "sha256": "0y2pm18nnyzm9wjc0j15v46nf3xi7a0wvspfzi360qv08i54skqv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151021.931",
-        "deps": [
-            "anything"
-        ]
-    },
-    "creds": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ardumont",
-            "repo": "emacs-creds",
-            "sha256": "0l4bvk3m355b25d7pdnhczn3fckbq0rg2l4r0a0d94004ksvylqa",
-            "rev": "b059397a7d59481f05fbb1bb9c8d3c2c69226482"
-        },
-        "recipe": {
-            "sha256": "0n11xxaf93bbc9ih25wj09zzw4sj32wb99qig4zcy8bpkl5y3llk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140510.1206",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "helm-project-persist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Sliim",
-            "repo": "helm-project-persist",
-            "sha256": "0j54c1kzsjgr05qx25rg3ylawvyw6n6liypiwaas47vpyfswbxhv",
-            "rev": "357950fbac18090985a750e40d5d8b10ee9dcd53"
-        },
-        "recipe": {
-            "sha256": "1n87kn1n3453mpdj6amyrgivslskmnzdafpspvkz7b0smf9mv2ld",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151210.943",
-        "deps": [
-            "helm",
-            "project-persist"
-        ]
-    },
-    "phabricator": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ajtulloch",
-            "repo": "phabricator.el",
-            "sha256": "0y77ld1cmfpv9p7yx2mlbvjm5ivsrf2j0g0h4zabfrahz22v39d4",
-            "rev": "b1450350cc3c45c732252bb13860156d824ead10"
-        },
-        "recipe": {
-            "sha256": "07988f2xyp76xjs25b3rdblhmijs2piriz4p0q92jw69bdvkl14c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151115.307",
-        "deps": [
-            "dash",
-            "emacs",
-            "f",
-            "projectile",
-            "s"
-        ]
-    },
-    "make-it-so": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "make-it-so",
-            "sha256": "00j5n9pil1qik4mrzvam4rp6213w8jm4qw7c4z8sxpq57xa0b679",
-            "rev": "ed83b8b9787441cc6be4994d571529852a8cce4a"
-        },
-        "recipe": {
-            "sha256": "0a8abz54mb60mfr0bl9ry8yawq99vx9hjl4fm2sivns58qjgfy73",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150319.1407",
-        "deps": [
-            "emacs",
-            "helm"
-        ]
-    },
-    "eval-sexp-fu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hchbaw",
-            "repo": "eval-sexp-fu.el",
-            "sha256": "1syqakdyg3ydnq9gvkjf2rw9rz3kyhzp7avhy6dvyy65pv2ndyc2",
-            "rev": "6cffd33155d10c3e58b39cbb170f42e910fd8595"
-        },
-        "recipe": {
-            "sha256": "17cazf81z4cszflnfp66zyq2cclw5sp9539pxskdf267cf7r0ycs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131230.1551",
-        "deps": [
-            "highlight"
-        ]
-    },
-    "mustang-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mswift42",
-            "repo": "mustang-theme",
-            "sha256": "19qd34dcfspv621p4y07zhq2pr8pwss3lcssm9sfhr6w2vmvgcr4",
-            "rev": "79c3381dd50601775402fe2fddd16fffa9218837"
-        },
-        "recipe": {
-            "sha256": "0771l3x6109ki914nwpfz3fj7pbvpcg9vf485mrccq2wlxymr5dr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141017.1823",
-        "deps": []
-    },
-    "httprepl": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gregsexton",
-            "repo": "httprepl.el",
-            "sha256": "0wd4wmy99mx677x4sdbp57bxxll1fsnnf8hk97r85xdmmjsmrkld",
-            "rev": "cfa3693267a8ed1c96a86a126823f37dbfe077d8"
-        },
-        "recipe": {
-            "sha256": "0899qb1yfnsyf04hhvnk47qnq4d1f4vd5ghj43x4743wd2b9qawh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141101.1234",
-        "deps": [
-            "dash",
-            "emacs",
-            "s"
-        ]
-    },
-    "tern-auto-complete": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "marijnh",
-            "repo": "tern",
-            "sha256": "07b96yjv8jns8d18mciqchpfbhcd8w0lgy3p4msl24rk4hmv56z7",
-            "rev": "f585fe7d6f4da28770fdd3dc7ddf88a39ad9b105"
-        },
-        "recipe": {
-            "sha256": "0lq924c5f6bhlgyqqzc346n381qf0fp66h50a0zqz2ch66kanni1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151123.853",
-        "deps": [
-            "auto-complete",
-            "cl-lib",
-            "emacs",
-            "tern"
-        ]
-    },
-    "ox-ioslide": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "coldnew",
-            "repo": "org-ioslide",
-            "sha256": "12c170m04yk0acllkvrbl3kpl5z91gh0z8d09hpqpdmfs2gmpbm9",
-            "rev": "79fb2c161ded934c3a4ddf623100103212a4d2d8"
-        },
-        "recipe": {
-            "sha256": "0z0qnvpw64wxbgz8203rphswlh9hd2i11pz2mlay8l3bzz4gx4vc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151018.2352",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "f",
-            "makey",
-            "org"
-        ]
-    },
-    "hungry-delete": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nflath",
-            "repo": "hungry-delete",
-            "sha256": "1vy521ljn16a1lcmpj09mr9y0m15lfjhl6xk04sb7nisps3vljyl",
-            "rev": "ed1694ca3bd1fe7d117b0176d417341915ad4f1f"
-        },
-        "recipe": {
-            "sha256": "0hcsm3yndkyfqzb77ibx7df6bjppc34x5yabi6nd389pdscp9rpz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151203.1514",
-        "deps": []
-    },
-    "n3-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "doriantaylor",
-            "repo": "n3-mode-for-emacs",
-            "sha256": "1lp1bx9110vqzjww94va8pdks39qvqzl8rf0p8na1q0qn06rnk9h",
-            "rev": "0145e7938c30183edb03a55a4f16390dabd191ec"
-        },
-        "recipe": {
-            "sha256": "0hasxq39phgyc259dgxskhqxjsp0yi98vx1bs8ynvwa26la4ddzh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141027.1257",
-        "deps": []
-    },
-    "quasi-monochrome-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lbolla",
-            "repo": "emacs-quasi-monochrome",
-            "sha256": "09vw8nf9yj3v2ks25n39fbn2qk1fld0hmaq1dpzaqsavsbd4dwc1",
-            "rev": "b2456aaa71b51d4f9b06c5dfb529e60732574fc7"
-        },
-        "recipe": {
-            "sha256": "0h5pqrklyga40jg8qc47lwmf8khn0vcs5jx2sdycl2ipy0ikmfs0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150801.1525",
-        "deps": []
-    },
-    "rfringe": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/rfringe.el",
-            "sha256": "02i5znln0aphvmvaia3sz75bvjhqwyjq1blf5qkcbprnn95lm3yh"
-        },
-        "recipe": {
-            "sha256": "171gzfciz78l6b653acgfailxpwmh8m1dm0dzpg0b1k0ny3aiwf6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20110405.1020",
-        "deps": []
-    },
-    "projectile-codesearch": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abingham",
-            "repo": "codesearch.el",
-            "sha256": "105g2a9d0rb1qaph276qyj2gq9k9zkvrz5wzic9r06mjiywk1s9a",
-            "rev": "9a887f8d440ba98a72a7619dd744c0a9e3892919"
-        },
-        "recipe": {
-            "sha256": "0jgvs9is59q45wh2a7k5sb6vj179ixqgj5dlndj9r6fh59qgrzdk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150419.45",
-        "deps": [
-            "codesearch",
-            "projectile"
-        ]
-    },
-    "editorconfig": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "editorconfig",
-            "repo": "editorconfig-emacs",
-            "sha256": "04sflhamh5b9gxllfhcqdim02x6cb9xid39al2lisb8z4xywch68",
-            "rev": "5132b7a9441af76196ba3e62d73a0bb415853e4f"
-        },
-        "recipe": {
-            "sha256": "0na5lfi9bs4k1q73pph3ff0v8k8vzrfpzh47chyzk8nxsmvklw35",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151208.1035",
-        "deps": [
-            "editorconfig-core"
-        ]
-    },
-    "bbyac": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "baohaojun",
-            "repo": "bbyac",
-            "sha256": "1cdm4d6fjf3m495phynq0dzvv0wc0gfsw6fdq4d47iyxs0p4q2dl",
-            "rev": "8dc5a7c0ada7ac729a87343149970ced139bb659"
-        },
-        "recipe": {
-            "sha256": "19s9fqcdyqz22m981vr0p8jwghbs267yrlxsv9xkfzd7fccnx170",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150316.501",
-        "deps": [
-            "browse-kill-ring",
-            "cl-lib"
-        ]
-    },
-    "evil-anzu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-evil-anzu",
-            "sha256": "0cnj91lwpmk4c8nf3xi80yvv6anvkg8h1kbzbp16glkgmy6jpmy8",
-            "rev": "a041db15bd6e2eb353b24f6f984f6c5ee618d460"
-        },
-        "recipe": {
-            "sha256": "19cmc61l370mm4h2m6jw5pdcsvj4wcv9zpa8z7k1fjg57mwmmn70",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150124.1809",
-        "deps": [
-            "anzu",
-            "evil"
-        ]
-    },
-    "cloc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cosmicexplorer",
-            "repo": "cloc-emacs",
-            "sha256": "1rflc00yrbb7xzfh8c54ajf4qnhsp3mq07gkr257gjyrwsdw762v",
-            "rev": "15e63b83dd6261f543d25aac4c72e764e3274d53"
-        },
-        "recipe": {
-            "sha256": "1ny5wixa9x4fq5jvhs01jmyvwkfvwwi9aamrcqsl42s9sx6ygz7a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151007.401",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "hl-anything": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "boyw165",
-            "repo": "hl-anything",
-            "sha256": "0889dzrwizpkyh3wms13k8zx27ipsrsxfa4j4yzk4cwk3aicckcr",
-            "rev": "018da4cdf891529b4769d59c0400b6cf3456b9c4"
-        },
-        "recipe": {
-            "sha256": "15n998nhirvg3f719b7x9s7jpqv6gzkr22kp4zbbq99lbx2wfc1k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150219.731",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "restart-emacs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "iqbalansari",
-            "repo": "restart-emacs",
-            "sha256": "0gbm208hmmmpjyj0x3z0cszphawkgvjqzi5idbdca3gikyiqw80n",
-            "rev": "f0e8e1ae1bb5f4e50a99d220c39913ef300f44c8"
-        },
-        "recipe": {
-            "sha256": "03aabz7fmy99nwimvjn7qz6pvc94i470hfgiwmjz3348cw02k0n6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151203.1035",
-        "deps": []
-    },
-    "lispxmp": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/lispxmp.el",
-            "sha256": "1m07gb3v1a7al0h4nj3914y8lqrwzi8fwb1ih66nxzn6kb0qj3mf"
-        },
-        "recipe": {
-            "sha256": "02gfbyng3dh2445jfkasxzjc9dlk02dafbfkjm40iwmb8h0fzji4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130824.707",
-        "deps": []
-    },
-    "dummyparens": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "snosov1",
-            "repo": "dummyparens",
-            "sha256": "0g72nnz0j6dvllyxyrw20z1vg6p7sy46yy0fq017pa77sgqm0xzh",
-            "rev": "9798ef1d0eaa24e4fe66f8aa6022a8c62714cc89"
-        },
-        "recipe": {
-            "sha256": "1yah8kpqkk9ygm73iy51fzwc8q5nw0xlwqir2qld1fc5y1lkb7dk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141009.524",
-        "deps": []
-    },
-    "clean-aindent-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pmarinov",
-            "repo": "clean-aindent-mode",
-            "sha256": "1h6k6kzim1zb87y1kzpqjzk3ip9bmfxyg54kdh2sfp4xy0g5h3p0",
-            "rev": "9ae15997cd75c5625a4f759a3aff39bf202fc36f"
-        },
-        "recipe": {
-            "sha256": "1whzbs2gg2ar24kw29ffv94dgvrlfy2v4zdn0g7ksjjmmdr8ahh4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150816.2229",
-        "deps": []
-    },
-    "passthword": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pidu",
-            "repo": "passthword",
-            "sha256": "0yckh61v9a798gpyk8x2z9990h3b61lwsw0kish571pygfyqhjkq",
-            "rev": "30bace842eaaa6b48cb2251fb84868ebca0467d6"
-        },
-        "recipe": {
-            "sha256": "076jayziipjx260yk3p37pf5k0qsagalidah3y6hiflrlq4sfgjn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141201.323",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "tab-jump-out": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cheunghy",
-            "repo": "tab-jump-out",
-            "sha256": "0h7sfbca1nzcjylwl7zp25yj6wxnlx8g8a50zc6sg6jg4rggi2fm",
-            "rev": "1c3fec1826d2891177ea78e4e7cce1dc67e83e51"
-        },
-        "recipe": {
-            "sha256": "0nlbyzym8l8g9w2xvykpcl5r449v30gal2k1dnz74rq4y8w4rh7n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151005.2030",
-        "deps": [
-            "dash",
-            "emacs"
-        ]
-    },
-    "smyx-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tacit7",
-            "repo": "smyx",
-            "sha256": "1z2sdnf11wh5hz1rkrbg7fs4ha3zrbj9qnvfzq9005y89d7cs95x",
-            "rev": "6263f6b401bbabaed388c8efcfc0be2e58c51401"
-        },
-        "recipe": {
-            "sha256": "1r85yxr864df5akqknl3hsrmzikr4085bqr6ijrbdj27nz00vl61",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141127.228",
-        "deps": []
-    },
-    "evil-cleverparens": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "luxbock",
-            "repo": "evil-cleverparens",
-            "sha256": "1pzybq12m1p28x8p173s4hdagv7654k0z5vj3a1wj1nww31978m6",
-            "rev": "28fc9a9b465b908cb01bf99b538d50069bda8107"
-        },
-        "recipe": {
-            "sha256": "10zkyaxy52ixh26hzm9v1y0gakcn5sdwz4ny8v1vcmjqjphnk799",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151201.2238",
-        "deps": [
-            "dash",
-            "emacs",
-            "evil",
-            "paredit",
-            "smartparens"
-        ]
-    },
-    "s": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "s.el",
-            "sha256": "1zn8n3mv0iscs242dbkf5vmkkizfslq5haw9z0d0g3wknq18286h",
-            "rev": "372e94c1a28031686d75d6c52bfbe833a118a72a"
-        },
-        "recipe": {
-            "sha256": "0b2lj6nj08pk5fnxvjkc1d9hvi29rnjjy4n5ns4pq6wxpfnlcw64",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150924.606",
-        "deps": []
-    },
-    "sweetgreen": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "CestDiego",
-            "repo": "sweetgreen.el",
-            "sha256": "10blwlwg1ry9jznf1a6iss5s0z8sj9gc02ayf5qv92mgxvjhrhdn",
-            "rev": "a456dd7948a25da8ff007a142cf1325b4855d908"
-        },
-        "recipe": {
-            "sha256": "1v75wk0gq5fkz8i1r8pl4gqnxbv1d80isyn48w2hxj2fmdn2xhpy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151207.1116",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "helm",
-            "request"
-        ]
-    },
-    "transpose-mark": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "attichacker",
-            "repo": "transpose-mark",
-            "sha256": "03wc50vn1kmrgnzzhs06pwpap2p2rx84wwzxw0hawsg1f1l35m2x",
-            "rev": "667327602004794de97214cf336ac61650ef75b7"
-        },
-        "recipe": {
-            "sha256": "16xn9d33nylbb4pr65i8x4rbf5ncd4vxhmcbd136k5b6hj62mg7i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150405.216",
-        "deps": []
-    },
-    "javadoc-lookup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "javadoc-lookup",
-            "sha256": "0ljpqgp2w3lr61n2vr748n3wyshlqnnbin0643jffa319l99z35r",
-            "rev": "0d5316407c9ec183040ca5c6ab71091b9444276f"
-        },
-        "recipe": {
-            "sha256": "1fffs0iqkk9rg5vbxifvn09j4i2751p81bzcvy5fslr3r1r2nv79",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151222.1310",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "immutant-server": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "leathekd",
-            "repo": "immutant-server.el",
-            "sha256": "0rbamm9qvipgswxng8g1d7rbdbcj7sgwrccg7imcfapwwq7xhj4h",
-            "rev": "2a21e65588acb6a976f2998e30b21fdabdba4dbb"
-        },
-        "recipe": {
-            "sha256": "15vcxag1ni41ja4b3q0444sq5ysrisis59la7li6h3617wy8r02i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140311.1708",
-        "deps": []
-    },
-    "git-ps1-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "10sr",
-            "repo": "git-ps1-mode-el",
-            "sha256": "13k11acls6r65gms1hkmnhnbw7hkc1f7ijdb0lwipqdn4h361pjg",
-            "rev": "c4910224204c94aabd59ab2cf05f309302bcbedd"
-        },
-        "recipe": {
-            "sha256": "15gswi9s0m3hrsl1qqyjnjgbglsai95klbdp51h3pcq7zj22wkn6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151220.1031",
-        "deps": []
-    },
-    "evil-textobj-anyblock": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "noctuid",
-            "repo": "evil-textobj-anyblock",
-            "sha256": "1v4z2snllgg32cy8glv7xl0m9ib7rwi5ixgdydz1d0sx0z62jyhw",
-            "rev": "a9e1fdd546312fa787cd0a0acc7ca5e0253de945"
-        },
-        "recipe": {
-            "sha256": "03vk30s2wkcszcjxmh5ww39rihnag9cp678wdzq4bnqy0c6rnjwa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151017.1617",
-        "deps": [
-            "cl-lib",
-            "evil"
-        ]
-    },
-    "osx-plist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsmirror",
-            "repo": "osx-plist",
-            "sha256": "0830kkmvc3ss7ygqfwz3j75s7mhxfxyadaksrp0v2cc4y6wn6nfv",
-            "rev": "5e6de2622fdfe552d4902904f05ea03bc5a6ebd0"
-        },
-        "recipe": {
-            "sha256": "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20101130.648",
-        "deps": []
-    },
-    "cyberpunk-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "n3mo",
-            "repo": "cyberpunk-theme.el",
-            "sha256": "1zx93qb83ji2jf3dya9m7prii58aj4y94h10ynldls45cqk3chz4",
-            "rev": "5fee81bccb07d40ff1d41aa2342ca29639b057b0"
-        },
-        "recipe": {
-            "sha256": "0l2bwb5afkkhrbh99v2gns1vil9s5911hbnlq5w35nmg1wvbmbc9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151215.1153",
-        "deps": []
-    },
-    "ido-migemo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "ido-migemo.el",
-            "sha256": "15iajhrgy989pn91ijcd1mq2015bkaacaplm79rmb0ggxhh8vq38",
-            "rev": "e71114a92dd69cb46abf3fb71a09ce27506fcf77"
-        },
-        "recipe": {
-            "sha256": "02hbwchwx2bcwdxz7gz555699l7n9wisfikax1j6idn167n4wdpi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150921.1744",
-        "deps": [
-            "migemo"
-        ]
-    },
-    "elwm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "elwm",
-            "sha256": "1k7npf93xbmrsq607x8zlgrpzqvplgia3ixz5w1lr1jlv1m2m8x2",
-            "rev": "c33b183f006ad476c3a44dab316f580f8b369930"
-        },
-        "recipe": {
-            "sha256": "0rf663ih3lfg4n4pj4dpp133967zha5m1wr46riaxpha7xr59al9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150817.507",
-        "deps": [
-            "dash"
-        ]
-    },
-    "airline-themes": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "AnthonyDiGirolamo",
-            "repo": "airline-themes",
-            "sha256": "00j9gx0lmh34pmm19909g1pj1hfz0g4jxw4f0wvcsqzsj6zdz8nx",
-            "rev": "8355460678b95a2ef38d6ef6c046b451e4a0255e"
-        },
-        "recipe": {
-            "sha256": "0jkhb6nigyjmwqny7g59h4ssfy64vl3qnwcw46wnx5k9i73cjyih",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151211.2135",
-        "deps": [
-            "powerline"
-        ]
-    },
-    "shackle": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wasamasa",
-            "repo": "shackle",
-            "sha256": "0yy162sz7vwj0i9w687a5x1c2fq31vc3i6gqhbywspviczdp4q1y",
-            "rev": "4069e0cbff0d172de2cd7d588de971d8b02915c6"
-        },
-        "recipe": {
-            "sha256": "159z0cwg7afrmym0xk902d8z093sqv39jig25ds7z4a224yrv5w6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151220.1432",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "scpaste": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "technomancy",
-            "repo": "scpaste",
-            "sha256": "1jgg116rhhgs5qrngrmqi8ir7yj1h470f57dc7fyijw0ly5mp6ii",
-            "rev": "677f9b7c5a1b533bef44747d6331b671ffcb8a9c"
-        },
-        "recipe": {
-            "sha256": "02dqmx6v3jxdn5yz1z74624sc6sz2bm4qjyi78w9akhp2jplwlk1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151208.1935",
-        "deps": [
-            "htmlize"
-        ]
-    },
-    "helm-themes": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-helm-themes",
-            "sha256": "0a9h6rmjc6c6krkvxbgrzv35if260d9ma9a2k47jzm9psnyp9s2w",
-            "rev": "a6449a40c5a219b43a92c975917a07337f864b4f"
-        },
-        "recipe": {
-            "sha256": "1j64w6dnxmq0rfycci9wfy2z5lbddsggf486pknxfgwwqgvns90l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151009.121",
-        "deps": [
-            "helm-core"
-        ]
-    },
-    "gnuplot": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bruceravel",
-            "repo": "gnuplot-mode",
-            "sha256": "1gm116479gdwc4hr3nyv1id692dcd1sx7w2a80pvmgr35ybccn7c",
-            "rev": "21f9046e3f5caad41b750b5c9cee02fa4fd20fb9"
-        },
-        "recipe": {
-            "sha256": "06c5gqf02fkra8c52xck1lqvf4yg45zfibyf9zqmnbwk7p2jxrds",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141231.1537",
-        "deps": []
-    },
-    "brainfuck-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tom-tan",
-            "repo": "brainfuck-mode",
-            "sha256": "1nzgjgzidyrplfs4jl8nikd5wwvb4rmrnm51qxmw9y2if0hpq0jd",
-            "rev": "36e69552bb3b97a4f888d362c59845651bd0d492"
-        },
-        "recipe": {
-            "sha256": "08jzx329mrr3c2pifs3hb4i79dsw606b0iviagaaja8s808m40cd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150113.242",
-        "deps": [
-            "langdoc"
-        ]
-    },
-    "auto-complete-rst": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tkf",
-            "repo": "auto-complete-rst",
-            "sha256": "107svb82cgfns9kcrmy3hh56cab81782jkbz5i9959ms81xizfb8",
-            "rev": "4803ce41a96224e6fa54e6741a5b5f40ebed7351"
-        },
-        "recipe": {
-            "sha256": "0dazkpnzzr0imb2a01qq8l60jxhhlknzjx7wccnbm7d2rk3338m6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140225.344",
-        "deps": [
-            "auto-complete"
-        ]
-    },
-    "ess-smart-equals": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "genovese",
-            "repo": "ess-smart-equals",
-            "sha256": "0ici253mllqyzcbhxrazfj2kl50brr8qid99fk9nlyfgh516ms1x",
-            "rev": "e0f5f18f01ed252fde50d051adf1fa6254a254c9"
-        },
-        "recipe": {
-            "sha256": "0mfmxmsqr2byj56psx4h08cjc2j3aac3xqr04yd47k2mlivnyrxp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150202.1",
-        "deps": [
-            "emacs",
-            "ess"
-        ]
-    },
-    "gom-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-gom-mode",
-            "sha256": "1anjzlg53kjdqfjcdahbxy8zk9hdha075c1f9nzrnnbbqvmirbbb",
-            "rev": "972e33df1d38ff323bc97de87477305826013701"
-        },
-        "recipe": {
-            "sha256": "07zr38gzqb3ds9mpf94c1vhl1rqd0cjh4g4j2bz86q16c0rnmp7m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131007.2153",
-        "deps": []
-    },
-    "ac-etags": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-ac-etags",
-            "sha256": "140i02b2ipyfmki945l1xd1nsqdpganhmi3bmwj1h9w8cg078bd4",
-            "rev": "e53cb3a8dd44e41fba3d2b737f90a8cfc529e2a6"
-        },
-        "recipe": {
-            "sha256": "0ag49k9izrs4ikzac9lifvvwhcn5n89lr2vb20pngsvg1czdyhzb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151031.2121",
-        "deps": [
-            "auto-complete"
-        ]
-    },
-    "rect+": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-rectplus",
-            "sha256": "1vpsihrl03hkd6n6b7mrjccm0a023qf3154a8rw4chihikxw27pj",
-            "rev": "299b742faa0bc4448e0d5fe9cb98ab1eb93b8dcc"
-        },
-        "recipe": {
-            "sha256": "0vk0jwpl6yp2md9nh0ghp2qn883a8lr3cq8c9mgq0g552dwdiv5m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150620.1944",
-        "deps": []
-    },
-    "flymake-hlint": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-hlint",
-            "sha256": "003fdrgxlyhs595ndcdzhmdkcpsf9bpw53hrlrrrh07qlnqxwrvp",
-            "rev": "fae0c16f938129fb933e4c4625287816e8e160f0"
-        },
-        "recipe": {
-            "sha256": "0wq1ijhn3ypy31yk8jywl5hnz0r0vlhcxjyznzccwqbdc5vf7b2x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130309.345",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "flycheck-ycmd": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abingham",
-            "repo": "emacs-ycmd",
-            "sha256": "1lydq43xn51m4dwvv3qzrcsqw7dwbhxz4rinqx4m9y81caqakssx",
-            "rev": "3005b49176ff3315ba4cc7893fff42ce034d6e80"
-        },
-        "recipe": {
-            "sha256": "0m99ssynrqxgzf32d35n17iqyh1lyc6948inxpnwgcb98rfamchv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150727.231",
-        "deps": [
-            "dash",
-            "emacs",
-            "flycheck",
-            "ycmd"
-        ]
-    },
-    "ansible-doc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lunaryorn",
-            "repo": "ansible-doc.el",
-            "sha256": "1h3rqrjrl8wx7xvvd631jkbbczq3srd4mgz7y9wh3cvz1njdpy62",
-            "rev": "d0ce210674b5bee9836e6773c4e823747a6f1946"
-        },
-        "recipe": {
-            "sha256": "03idvnn79fr9id81aivkm7g7cmlsg0c520wcq4da8g013xvi342w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150524.1205",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "ido-vertical-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "creichert",
-            "repo": "ido-vertical-mode.el",
-            "sha256": "1vl87phswkciijq0j07lqlgmha5dmff8yd4j4jn7cfrkrdjp6jbx",
-            "rev": "0beaf1eaa8509bece9419b663826665322b22b4c"
-        },
-        "recipe": {
-            "sha256": "1vg5s6nd6v2g8ychz1q9cdqvsdw6vag7d9w68sn7blpmlr0nqhfm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151003.2033",
-        "deps": []
-    },
-    "hemisu-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "andrzejsliwa",
-            "repo": "hemisu-theme",
-            "sha256": "178dvigiw162m01x7dm8pf61w2n3bq51lvk5q7jzpb9s35pz1697",
-            "rev": "5c206561aa2c844ecdf3e3b672c3235e559ddd7f"
-        },
-        "recipe": {
-            "sha256": "0byzrz74yvk12m8dl47kkmkziwrrql193q72qx974zbqdj8h2sph",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130508.1344",
-        "deps": []
-    },
-    "naquadah-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jd",
-            "repo": "naquadah-theme",
-            "sha256": "0mxf61ky1dd7r2qd4j7k6bdppmkilkq5l9gv257a12539wkw5yq2",
-            "rev": "f6308bb7d110f1e6d6a91db901f8fb3f99da12ac"
-        },
-        "recipe": {
-            "sha256": "1aml1f2lgn530i86218nrc1pk3zw5n3qd2gw4gylwi7g75i0cqn1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150923.341",
-        "deps": []
-    },
-    "stan-snippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "stan-dev",
-            "repo": "stan-mode",
-            "sha256": "1k0jidh177s9lk4k9vphivq8dapd2qzajim2s835pn72j6k675vg",
-            "rev": "e981ca7fee98431162b21ec6b79c82100ce4b276"
-        },
-        "recipe": {
-            "sha256": "021skkvak645483s7haz1hsz98q3zd8hqi9k5zdzaqlabwdjwh85",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151222.2258",
-        "deps": [
-            "stan-mode",
-            "yasnippet"
-        ]
-    },
-    "emacsql-mysql": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "emacsql",
-            "sha256": "0ld5qpl7b3iksgxcfysznf88wj019l5271kdz4nalqi4kchf5xad",
-            "rev": "74bd11bc0998d7019a05eecc0486fee09c84a93b"
-        },
-        "recipe": {
-            "sha256": "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151004.915",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "emacsql"
-        ]
-    },
-    "cdlatex": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cdominik",
-            "repo": "cdlatex",
-            "sha256": "1jj9vmhc4s3ych08bjm1c2xwi81z1p20rj7bvxrgvb5aga2ghi9d",
-            "rev": "b7183c2200392b6d85fca69390f4a65fac7a7b19"
-        },
-        "recipe": {
-            "sha256": "1jsfmzl13fykbg7l4wv9si7z11ai5lzvkndzbxh9cyqlvznq0m64",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140707.626",
-        "deps": []
-    },
-    "yalinum": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tm8st",
-            "repo": "emacs-yalinum",
-            "sha256": "12dd4ahg9f1493982d49g7sxx0n6ss4xcfhxwzyaqxckwzfranp0",
-            "rev": "d3e0cbe3f4f5ca311e3298e684901d6fea3ad973"
-        },
-        "recipe": {
-            "sha256": "0jzsvkcvy2mkfmri4bzgrlgw2y0z3hxz44md83s5zmw09mshkahf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130217.443",
-        "deps": []
-    },
-    "org-download": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "org-download",
-            "sha256": "12k3iqzmj92cvi0d99mn3ylxj00p2f2f8049dd2nxnp1gxs2k4dq",
-            "rev": "501920e273b32f96dfbafcf769d330296a612847"
-        },
-        "recipe": {
-            "sha256": "19yjx0qqpmrdwagp3d6lwwv7dcb745m9ccq3m29sin74f5p4svsi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151030.916",
-        "deps": [
-            "async"
-        ]
-    },
-    "oberon": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsorphanage",
-            "repo": "oberon",
-            "sha256": "16462cgq91jg7i97h440zss5vw2qkxgdy7gm148ns4djr2fchnf6",
-            "rev": "fb57d18ce13835a8a69b6bafecdd9193ca9a59a3"
-        },
-        "recipe": {
-            "sha256": "1wna7ld670r6ljdg5yx0ga0grbq1ma8q92gkari0d5czr7s9lggv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120715.409",
-        "deps": []
-    },
-    "inkpot-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "siovan",
-            "repo": "emacs24-inkpot",
-            "sha256": "063v3a783si5fi8jrnysss60qma1c3whvyb48i10qbrrrx750cmv",
-            "rev": "374a72794ebcb92bd7b50b5578d4c2ffa6049966"
-        },
-        "recipe": {
-            "sha256": "0w4q74w769n88zb2q7x326cxji42278lf95wnpslgjybnaxycgw7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120505.908",
-        "deps": []
-    },
-    "pixie-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "johnwalker",
-            "repo": "pixie-mode",
-            "sha256": "0nnvf2p593gn8sbyrvczyll030xgnkxn900a2hy7ia7xh0wmvddp",
-            "rev": "f32d5d812c7b5b72d7ff7bad52b41035f9ef6e96"
-        },
-        "recipe": {
-            "sha256": "16z15yh78837k548xk5widdmy6fv03vym6q54i40knmgf5cllsl8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150121.2324",
-        "deps": [
-            "clojure-mode",
-            "inf-clojure"
-        ]
-    },
-    "sourcekit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nathankot",
-            "repo": "company-sourcekit",
-            "sha256": "1xzwalchl9lnq9848dlvhhbzyh1wkwbciz20d1iw0fsigj5g156c",
-            "rev": "5e1adf8d201fd94a942b40983415db1b28b6eef1"
-        },
-        "recipe": {
-            "sha256": "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151209.714",
-        "deps": [
-            "dash",
-            "dash-functional",
-            "emacs"
-        ]
-    },
-    "gandalf-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ptrv",
-            "repo": "gandalf-theme-emacs",
-            "sha256": "0sn3y1ilbg532mg941qmzipvzq86q31x86ypaf0h0m4015r7l59v",
-            "rev": "4e472fc851431458537d458d09c1f5895e338536"
-        },
-        "recipe": {
-            "sha256": "0wkmsg3pdw98gyp3q508wsqkzw821qsqi796ynm53zd7a4jfap4p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130809.447",
-        "deps": []
-    },
-    "guru-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bbatsov",
-            "repo": "guru-mode",
-            "sha256": "16h1g88y4q737sxcjkm1kxirv5m2x3l9wgmz0s4hlxjzli8fc7jr",
-            "rev": "062a41794431d5e263f9f0e6ae1ec4a8d79980dd"
-        },
-        "recipe": {
-            "sha256": "0j25nxs3ndybq1ik36qyqdprmhav4ba8ny7v2z61s23id8hz3xjs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151028.28",
-        "deps": []
-    },
-    "msvc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yaruopooner",
-            "repo": "msvc",
-            "sha256": "1draiwbwb8zfi6rdr5irv8091xv2pmnifq7pzi3rrvjb8swb28z3",
-            "rev": "e7a61fa5b98a129637f970ac6db9163e330b3d02"
-        },
-        "recipe": {
-            "sha256": "04gq2klana557qvsi3bv6416l0319jsqb6bdfs7y6729qd94hlq3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150530.351",
-        "deps": [
-            "ac-clang",
-            "cedet",
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "phi-search-migemo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "phi-search-migemo",
-            "sha256": "1k8hjnkinzdxy9qxldsyvj6npa2sv48m905d1cvxr8lyzpc5hikh",
-            "rev": "57623e4b67ee766cbb299da00a212f3ebf7d6fb0"
-        },
-        "recipe": {
-            "sha256": "0qk73s09sasm438w29j5z2bmlb60p1mgbv2ch43rgq8c6kjzg6h6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150116.706",
-        "deps": [
-            "migemo",
-            "phi-search"
-        ]
-    },
-    "describe-number": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "netromdk",
-            "repo": "describe-number",
-            "sha256": "13fasbhdjwc4jh3cy25gm5sbbg56hq8la271098qpx6dhqm2wycq",
-            "rev": "40618345a37831804b29589849a785ef5aa5ac24"
-        },
-        "recipe": {
-            "sha256": "0gvriailni2ppz69g0bwnb1ik1ghjkj341k45vllz30j0frp9iji",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151031.1955",
-        "deps": [
-            "yabin"
-        ]
-    },
-    "smex": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nonsequitur",
-            "repo": "smex",
-            "sha256": "0xrbkpc3w7yadpjih169cpp75gilsnx4y9akgci5vfcggv4ffm26",
-            "rev": "55aaebe3d793c2c990b39a302eb26c184281c42c"
-        },
-        "recipe": {
-            "sha256": "1rwyi7gdzswafkwpfqd6zkxka1mrf4xz17kld95d2ram6cxl6zda",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151212.1609",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "fancy-battery": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lunaryorn",
-            "repo": "fancy-battery.el",
-            "sha256": "0m7rjzl9js2gjfcaqp2n5pn5ykpqnv8qfv35l5m5kpfigsi9cbb0",
-            "rev": "bcc2d7960ba207b5b4db96fe40f7d72670fdbb68"
-        },
-        "recipe": {
-            "sha256": "03rkfdkrzyal9abdiv8c73w10sm974hxf3xg5015hibfi6kzg8ii",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150101.604",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "erc-track-score": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jd",
-            "repo": "erc-track-score.el",
-            "sha256": "0n107d77z04ahypa7hn2165kkb6490v4vkzdm5zwm4lfhvlmp0x2",
-            "rev": "5b27531ea6b1a4c4b703b270dfa9128cb5bfdaa3"
-        },
-        "recipe": {
-            "sha256": "19wjwah2n8ri6gyrsbzxnrvxwr5cj48sxrar1226n9miqvgj5whx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130328.715",
-        "deps": []
-    },
-    "wgrep-ack": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-wgrep",
-            "sha256": "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4",
-            "rev": "7ef26c51feaef8a5ec0929737130ab8ba326983c"
-        },
-        "recipe": {
-            "sha256": "03l1a681cwnn06m77xg0a547892gy8mh415v9rg3h6lkxwcld8wh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141012.511",
-        "deps": [
-            "wgrep"
-        ]
-    },
-    "nameframe-perspective": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "john2x",
-            "repo": "nameframe",
-            "sha256": "07zgwyrss23yb8plnhhwmh0khdvfp539891sj1z1vs50jcllcpw5",
-            "rev": "96acff56b30f9d1145aeaf7a4c53c9a2c823ee8e"
-        },
-        "recipe": {
-            "sha256": "0wgr90m2pazc514slgdl1lin4mr3xxizasc82k7qinvdvdja515x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151018.407",
-        "deps": [
-            "nameframe",
-            "perspective"
-        ]
-    },
-    "nrepl-eval-sexp-fu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "samaaron",
-            "repo": "nrepl-eval-sexp-fu",
-            "sha256": "1nwj1ax2qmmlab4lik0b7japhqd424d0rb995dfv89p99gp8vmvc",
-            "rev": "3a24b7d4bca13e87c987a4ddd212da914ff59191"
-        },
-        "recipe": {
-            "sha256": "17g4nih9kz2483ylp651lwfxkvmaj7wpinpgnifwbciyrplfvx2j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140311.541",
-        "deps": [
-            "highlight",
-            "smartparens",
-            "thingatpt"
-        ]
-    },
-    "org-trello": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "org-trello",
-            "repo": "org-trello",
-            "sha256": "0w0gw3varx8qrcfh3iwg6qqxavprm25bjv9ada34xqjdhsv537xc",
-            "rev": "ae291d19752d86d01bb21cec6fb410c1eb9145d7"
-        },
-        "recipe": {
-            "sha256": "1rm91xccvdsqghdnrnjvyp8xfvrw5ac677vzzz24rz9dssh2mz9b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151213.936",
-        "deps": [
-            "dash",
-            "dash-functional",
-            "deferred",
-            "emacs",
-            "request-deferred",
-            "s"
-        ]
-    },
-    "codesearch": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abingham",
-            "repo": "codesearch.el",
-            "sha256": "105g2a9d0rb1qaph276qyj2gq9k9zkvrz5wzic9r06mjiywk1s9a",
-            "rev": "9a887f8d440ba98a72a7619dd744c0a9e3892919"
-        },
-        "recipe": {
-            "sha256": "0z7zvain9n0rm6bvrh3j7z275l32fmp46p4b33mizqd1y86w89nx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151109.754",
-        "deps": [
-            "dash"
-        ]
-    },
-    "know-your-http-well": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "for-GET",
-            "repo": "know-your-http-well",
-            "sha256": "08q43k4450kgygyvqv18gwcmmb7y9x445401048lbixc4cp6p3cg",
-            "rev": "e208d856ce1b036d2dc1454813c6fc81f0269def"
-        },
-        "recipe": {
-            "sha256": "0k2x0ajxkivim8nfpli716y7f4ssrmvwi56r94y34x4j3ib3px3q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151220.813",
-        "deps": []
-    },
-    "homebrew-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dunn",
-            "repo": "homebrew-mode",
-            "sha256": "1sj8pz48cilk8l6zn47fv1wkv833wrkvrf2mrmbdkvj3lqjrz0b3",
-            "rev": "767b4934c02c7b4117b6bd6cae8224848bc49db2"
-        },
-        "recipe": {
-            "sha256": "088wc5fq4r5yj1nbh7mriyqf0xwqmbxvblj9d2wwrkkdm5flc8mj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151030.851",
-        "deps": [
-            "dash",
-            "emacs",
-            "inf-ruby"
-        ]
-    },
-    "erc-social-graph": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vibhavp",
-            "repo": "erc-social-graph",
-            "sha256": "0k3gp4c74g5awk7v9lzb6py3dvf59nggh6dw7530cswxb6kg2psa",
-            "rev": "e6ef3416a1c5064054bf054d9f0c1c7bf54a9cd0"
-        },
-        "recipe": {
-            "sha256": "07arn3k89cqxab5x5lczv8bpgrbirmlw9p6c37fgrl3df6f46h4h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150508.704",
-        "deps": []
-    },
-    "caml": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "http://caml.inria.fr/svn/ocaml/trunk/emacs/",
-            "sha256": "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw",
-            "rev": "16548"
-        },
-        "recipe": {
-            "sha256": "0kxrn9s1h2l05akcdcj6fd3g6x5wbi511mf14g9glcn8azyfs698",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150911.658",
-        "deps": []
-    },
-    "indent-guide": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "indent-guide",
-            "sha256": "1p54w9dwkc76nvc4m0q9a0lh4bdxp4ad1wzscadayqy8qbrylf97",
-            "rev": "0ef4813c538d5afba210681a8e81848b0927d421"
-        },
-        "recipe": {
-            "sha256": "029fj9rr9vfmkysi6lzpwra92j6ppw675qpj3sinfq7fqqlicvp7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151119.917",
-        "deps": []
-    },
-    "deft": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://jblevins.org/git/deft.git",
-            "sha256": "15c3ec6fcfae63201652394205fee951f3c1db8d3c6fc5f48c306b9b775c8e63",
-            "rev": "2dd64ddc798a009e62289d65abfa621735461b7a"
-        },
-        "recipe": {
-            "sha256": "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151222.725",
-        "deps": []
-    },
-    "autodisass-java-bytecode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gbalats",
-            "repo": "autodisass-java-bytecode",
-            "sha256": "1pf2mwnicj5x2kksxwmrzz2vfxj9y9r6rzgc1fl8028mfrmrmg8s",
-            "rev": "3d61dbe266133c950b39e880f78d142751c7dc4c"
-        },
-        "recipe": {
-            "sha256": "1k19nkbxnysm3qkpdhz4gv2x9nnrp94xl40x84q8n84s6xaan4dc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151005.1112",
-        "deps": []
-    },
-    "projmake-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ericbmerritt",
-            "repo": "projmake-mode",
-            "sha256": "1sxxy0s96sgm6i743qwjs0qjpsdr03gqc1cddvvpxbryh42vw9jn",
-            "rev": "25e2f28ca2c528e42c6422735829fc77bab8b451"
-        },
-        "recipe": {
-            "sha256": "192gvmhcz1anl80hpmcjwwd08dljyrap9sk6qj0y85mcnaafm882",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150619.1620",
-        "deps": [
-            "dash",
-            "indicators"
-        ]
-    },
-    "nm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tjim",
-            "repo": "nevermore",
-            "sha256": "1skbjmyikzyiic470sngskggs05r35m8vzm69wbmrjapczginnak",
-            "rev": "5a3f29174b3a4b2b2e7a700a862f3b16a942687e"
-        },
-        "recipe": {
-            "sha256": "004rjbrkc7jalbd8ih170sy97w2g16k3whqrqwywh09pzrzb05kw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151110.1310",
-        "deps": [
-            "company",
-            "emacs",
-            "notmuch",
-            "peg"
-        ]
-    },
-    "helm-bundle-show": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "masutaka",
-            "repo": "emacs-helm-bundle-show",
-            "sha256": "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30",
-            "rev": "b34523aa8a7f82ed9a1bf3643c35b65866a7877a"
-        },
-        "recipe": {
-            "sha256": "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151221.630",
-        "deps": [
-            "helm"
-        ]
-    },
-    "irony": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Sarcasm",
-            "repo": "irony-mode",
-            "sha256": "0lsi3vzpfh62bh9lknswwsxczvns0j78psk1w5yqdjrnnd1fb6sw",
-            "rev": "64d16007f3e5066ed3b49adcb291044c01cb42d6"
-        },
-        "recipe": {
-            "sha256": "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151217.1258",
-        "deps": [
-            "cl-lib",
-            "json"
-        ]
-    },
-    "elein": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "remvee",
-            "repo": "elein",
-            "sha256": "1ijrhm9vrzh5wl1rr9ayl11dwm05bh1i43fnbz3ga58l6whgkfpw",
-            "rev": "d4c0c0491dbb7c90e953d7a16172107c37103605"
-        },
-        "recipe": {
-            "sha256": "0af263zq4xxaxhpypn769q8h1dla0ygpnd6l8xc13zlni6jjwdsg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120120.516",
-        "deps": []
-    },
-    "ruby-interpolation": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "leoc",
-            "repo": "ruby-interpolation.el",
-            "sha256": "1r2f5jxi6wnkmr1ssvqgshi97gjvxvf3qqc0njg1s33cy39wpqq5",
-            "rev": "1978e337601222cedf00e117bf4b5cac15d1f203"
-        },
-        "recipe": {
-            "sha256": "07idndxw8vgfrk5zfmjjhmixza35mqxwjhsrbjrq5yy72i5ivznp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131112.1052",
-        "deps": []
-    },
-    "swiper-helm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "swiper-helm",
-            "sha256": "1fr9vs0574g93mq88d25nmj93hrx4d4s2d0im6wk156k2yb8ha2b",
-            "rev": "57012ab626486fcb3dfba0ee6720b0625e489b8c"
-        },
-        "recipe": {
-            "sha256": "011ln6vny7z5vw67cpzldxf5n6sk2hjdkllyf7v6sf4m62ws93ph",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151116.530",
-        "deps": [
-            "emacs",
-            "helm",
-            "swiper"
-        ]
-    },
-    "cal-china-x": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xwl",
-            "repo": "cal-china-x",
-            "sha256": "0l9izmif064jcz8hrmxjvi09i4kayxnw5az2x6w2w9d11j0zbgma",
-            "rev": "b8b3f94571ce6f7f53fda45516aa70632c9647ac"
-        },
-        "recipe": {
-            "sha256": "06mh2p14m2axci8vy1hr7jpy53jj215z0djyn8h7zpr0k62ajhka",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.804",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "chinese-wbim": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zilongshanren",
-            "repo": "chinese-wbim",
-            "sha256": "0cx1g6drkr8gyqqdxjf7j4wprxcbq30gam2racgnvdicgij0apwg",
-            "rev": "57ff61ff3895d77335709d24b40cefc4d10b0095"
-        },
-        "recipe": {
-            "sha256": "1pax3kpmvg170mpvfrjbpj9czq0xykmfbany2f7vbn96jb5xfmsb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150623.2250",
-        "deps": []
-    },
-    "n4js": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tmtxt",
-            "repo": "n4js.el",
-            "sha256": "1pd6c0jc1zxx3i3nk4qdx7gdf1qn8sc9jgqd72pkkpzvdwv998cp",
-            "rev": "3991ed8975151d5e8d568e952362df810f7ffab7"
-        },
-        "recipe": {
-            "sha256": "0x7smxs91ffriyxx2df61fh1abpl39gqy4m62k77h7xb6fg7af6m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150713.2131",
-        "deps": [
-            "cypher-mode",
-            "emacs"
-        ]
-    },
-    "emoji-display": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ikazuhiro",
-            "repo": "emoji-display",
-            "sha256": "0sh4q4sb4j58ryvvmlsx7scry9inzgv2ssa87vbyzpxq0435l229",
-            "rev": "bb4217f6400151a9cfa6d4524b8427f01feb5193"
-        },
-        "recipe": {
-            "sha256": "04cf18z26d64l0sv8qkbxjixi2wbw23awd5fznvg1cs8ixss01j9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140117.413",
-        "deps": []
-    },
-    "e2wm-sww": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "e2wm-sww",
-            "sha256": "0mz43mwcgyc1c9p9b7nflnjxdxjm2nxbhl0scj6llzphikicr35g",
-            "rev": "1063f9854bd34db5ac771cd1036cecc89834729d"
-        },
-        "recipe": {
-            "sha256": "0x45j62cjivf9v7jp1b41yya3f9akp92md6cbv0v7bwz98g2vsk8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140524.358",
-        "deps": [
-            "e2wm"
-        ]
-    },
-    "pomodoro": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "baudtack",
-            "repo": "pomodoro.el",
-            "sha256": "1dlk0ypw8316vgvb7z2p7fvaiz1wcy1l8crixypaya1zdsnh9v1z",
-            "rev": "4a299b8f5e6623010224dcb3e524ff288c6a082c"
-        },
-        "recipe": {
-            "sha256": "075sbypas8xlhsw8wg3mgi3fn5yf7xb3klyjgyy8wfkgdz0269f8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150716.1246",
-        "deps": []
-    },
-    "wisp-mode": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/ArneBab/wisp",
-            "sha256": "0ppj8mrlc20i2syyiwvj5rp53swrm929h0ksxxlqvn3nvl9gsajd",
-            "rev": "34fc6f12d740"
-        },
-        "recipe": {
-            "sha256": "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150623.1234",
-        "deps": []
-    },
-    "syntactic-sugar": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "syntactic-sugar",
-            "sha256": "0zi11540wwcl93xcgd2yf6b72zv01zkaqbf1jfbksg82k9038m2d",
-            "rev": "7ddc4502c831abe1c4ad4c7d1ca628a2c9e13968"
-        },
-        "recipe": {
-            "sha256": "12b2vpvz5h4wzxrk8jrbgc8v0w6bzzvxcyfs083fi1791qq1rw7r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140508.1541",
-        "deps": []
-    },
-    "savekill": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/savekill.el",
-            "sha256": "1qfq83cb4qixdl15j28rlslkq6g88ig55ydg747jqb3dqyp3qaah"
-        },
-        "recipe": {
-            "sha256": "1l14p6wkzfhlqxnd9fpw123vg9q5k20ld7rciyzbfdb99pk9z02i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140417.2134",
-        "deps": []
-    },
-    "ido-at-point": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "katspaugh",
-            "repo": "ido-at-point",
-            "sha256": "1bii7vj8pmmijcpvq3a1scky4ais7k6d7zympb3m9dmz355m9rpp",
-            "rev": "e5907bbe8a3d148d07698b76bd994dc3076e16ee"
-        },
-        "recipe": {
-            "sha256": "0jpgq2iiwgqifwdhwhqv0cd3lp846pdqar6rxqgw9fvvb8bijqm0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151021.257",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "smartrep": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "smartrep.el",
-            "sha256": "1sjwqi8w83qxihqmcm7z0vwmrz1az0y266qgj2nwfv39bri6y4i6",
-            "rev": "f0ff5a6d7b8603603598ae3045c98b011e58d86e"
-        },
-        "recipe": {
-            "sha256": "1ypls52d51lcqhz737rqg73c6jwl6q8b3bwb29z51swyamf37rbn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150508.2130",
-        "deps": []
-    },
-    "prodigy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "prodigy.el",
-            "sha256": "18j0jwp8z4ff7xfiijyh09cvb14mbjfaygin2qjp6bxgx3c1mpin",
-            "rev": "1f3b5a3309122bae01150738c3d8da910ffbee71"
-        },
-        "recipe": {
-            "sha256": "032868bgy2wmb2ws48lfibs4118inpna7mmml8m7i4m4y9ll6g85",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141109.452",
-        "deps": [
-            "dash",
-            "emacs",
-            "f",
-            "s"
-        ]
-    },
-    "toggle-quotes": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "toctan",
-            "repo": "toggle-quotes.el",
-            "sha256": "1w1lmqgzn9bp59h9y9plv80y53k6qhjgfmnnlqyyqfl45z3si7kg",
-            "rev": "33abc221d6887f0518337851318065cd86c34b03"
-        },
-        "recipe": {
-            "sha256": "16w453v4g7ww93bydim62p785x7w4vssp9l5liy0h3ppfmgvmxhp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140710.426",
-        "deps": []
-    },
-    "scss-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "antonj",
-            "repo": "scss-mode",
-            "sha256": "113pi7nsaksaacy74ngbvrvr6qcl7199xy662nj58bz5307yi9q0",
-            "rev": "b010d134f499c4b4ad33fe8a669a81e9a531b0b2"
-        },
-        "recipe": {
-            "sha256": "1g27xnp6bjaicxjlb9m0njc6fg962j3hlvvzmxvmyk7gsdgcgpkv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150107.1600",
-        "deps": []
-    },
-    "unipoint": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "apgwoz",
-            "repo": "unipoint",
-            "sha256": "1wl9rzys1zr2c41h5i57y6hxsavix1b26f453l2izmb6r0b1dvh0",
-            "rev": "5da04aebac35a5c9e1d8704f2231808d42f4b36a"
-        },
-        "recipe": {
-            "sha256": "1nym2wlr50wk62cbagq1qyjczzf56nb6i9dfzcwikdck8p4p2dr7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140113.1624",
-        "deps": []
-    },
-    "buttercup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jorgenschaefer",
-            "repo": "emacs-buttercup",
-            "sha256": "02r6n7563yc8gads38pq2yqsfv6p8wi6gi1f36mmz4h2gc872m1b",
-            "rev": "238bfa84538e95bfeb3430feb5bd9be4f4f4b906"
-        },
-        "recipe": {
-            "sha256": "1grrrdk5pl9l1jvnwzl8g0102gipvxb5qn6k2nmv28jpl57v8dkb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151223.806",
-        "deps": []
-    },
-    "jdee": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jdee-emacs",
-            "repo": "jdee",
-            "sha256": "1vfh2wmn3lbq6lly0g7r1npmghn5idfvy9rx8im2gk04cdmiqkxx",
-            "rev": "7a4fa853e7d6af835bad236bc7eb0b28408e01f2"
-        },
-        "recipe": {
-            "sha256": "1yn8vszj0hs2jwwd4x55f11hs2wrxjjvxpngsj7lkcwax04kkvq3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151218.1443",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "maude-mode": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "svn://svn.code.sf.net/p/maude-mode/code/trunk",
-            "sha256": "06k07qvhm2mbqasn72649lx3pwzb0r466854a18g6lciwhiww7vy",
-            "rev": "63"
-        },
-        "recipe": {
-            "sha256": "04b6q328hj0w33z4c50nqyark0pn5sqi0s8096m9di4rjwxaw0ma",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140212.502",
-        "deps": []
-    },
-    "display-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kawabata",
-            "repo": "emacs-display-theme",
-            "sha256": "0r560bpgw5p2pfcgkgcrlpp1bprv1f23dl4y5fjk06dg93fgaysa",
-            "rev": "b180b3be7a74ae4799a14e7e4bc2fe10e3ff7a15"
-        },
-        "recipe": {
-            "sha256": "07nqscmfa6iykll1m6gyiqca1g5ncx3rx468iyf2ahygpvqvnbxa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140115.956",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "list-register": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/list-register.el",
-            "sha256": "1sv1x2bc1xg7z3q4r9pbvjspj041q4zn883w9m071h7dgx8i9a6l"
-        },
-        "recipe": {
-            "sha256": "06q7q3j9qvqbp25cx9as2ckmgcz2myfvi2n34jp60v3ayhna79r4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130824.700",
-        "deps": []
-    },
-    "scratch-pop": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "scratch-pop",
-            "sha256": "1yvmfiv1s83r0jcxzbxyrx3b263d73lbap6agansmrhkxp914xr1",
-            "rev": "2c9648a669ce8e3a9e35e8e1e3c808531d20c549"
-        },
-        "recipe": {
-            "sha256": "0s7g1fbnc5hgz8gqmp1lynj5g7vvxisj7scxx5wil9qpn2zyggq1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150820.339",
-        "deps": [
-            "popwin"
-        ]
-    },
-    "erc-image": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kidd",
-            "repo": "erc-image.el",
-            "sha256": "03r13x2hxy4hk0n0ri5wld8rp8frx4j3mig6mn2v25k0cr52689f",
-            "rev": "270a60706e3e0669350bb7aaea465570ef5074cf"
-        },
-        "recipe": {
-            "sha256": "1cgzygkysjyrsdr6jwqkxlnisxccsvh4kxgn19rk4n61ms7bafvf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150914.514",
-        "deps": []
-    },
-    "thingatpt+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/thingatpt+.el",
-            "sha256": "1fyx4z7ci5yisfng0ps2q1nwvziidamam1m2n53rkfmm2gprxqhb"
-        },
-        "recipe": {
-            "sha256": "0w031lzjl5phvzsmbbxn2fpziwkmdyxsn08h6b9lxbss1prhx7aa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150823.1911",
-        "deps": []
-    },
-    "mysql2sqlite": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "echosa",
-            "repo": "emacs-mysql2sqlite",
-            "sha256": "0q5809hq22hyzxx5xr2hwwf3jh3qlpf3mkbl3fxqq93gm16plh1i",
-            "rev": "07415c5fcd895ebccf1b774d0eab175f2700652f"
-        },
-        "recipe": {
-            "sha256": "1jblrbw4rq2jwpb8d1dyna0fiv52b9va3sj881cb17rqx200y3nd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151123.1539",
-        "deps": []
-    },
-    "hide-comnt": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/hide-comnt.el",
-            "sha256": "1xvchpbrfwnqlh32pj0fg7n0x8csfm0mn09z7p45w3wf1mz0ckbn"
-        },
-        "recipe": {
-            "sha256": "181kns2rg4rc0pyyxw305qc06d10v025ad7v2m037y72vfwb0igx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150801.1120",
-        "deps": []
-    },
-    "emms-player-mpv": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dochang",
-            "repo": "emms-player-mpv",
-            "sha256": "1yy4dmjp53l2df5qix31g4vizhv80wm88vjqq6qqa9p822732n0m",
-            "rev": "a1be1d266530ede3780dd69a7243d898f1016127"
-        },
-        "recipe": {
-            "sha256": "175rmqx3bgys4chw8ylyf9rk07sg0llwbs9ivrv2d3ayhcz1lg9y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151208.102",
-        "deps": [
-            "emms"
-        ]
-    },
-    "decl": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "preetpalS",
-            "repo": "decl.el",
-            "sha256": "1njmsdgzknz844g0ydssg034pvrpvrhb0lx6rqyjkps2m74llzq1",
-            "rev": "75cca6bb1203f4d00cf10f7c4e87400f7c456e75"
-        },
-        "recipe": {
-            "sha256": "0wdhmp226wmrjvjgpbz8ihvhxxv3rrxh97sdqm3mgsav3n071n6k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151204.2249",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "emacs"
-        ]
-    },
-    "flatland-black-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsfodder",
-            "repo": "emacs-flatland-black-theme",
-            "sha256": "0ib6r6q4wbkkxdwgqsd25nx7ccxhk16lqkvwikign80j9n11g7s1",
-            "rev": "75fc4f1815feb23563a60477c02d70326b45c59e"
-        },
-        "recipe": {
-            "sha256": "0cl2qbry56nb4prbsczffx8h35x91pgicw5pld0ndw3pxid9h2da",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141116.30",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "kibit-helper": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "brunchboy",
-            "repo": "kibit-helper",
-            "sha256": "0s2hb2lvfmcvm3n1fg4biaafc1p7j7w990d7w15gicaw6rr2j4nr",
-            "rev": "16bdfff785ee05d8e74a5780f6808506d990cef7"
-        },
-        "recipe": {
-            "sha256": "15viybjqksylvm5ash2kzsil0cpdka56wj1rryixa8y1bwlj8y4s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150508.1033",
-        "deps": [
-            "emacs",
-            "s"
-        ]
-    },
-    "recompile-on-save": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "maio",
-            "repo": "recompile-on-save.el",
-            "sha256": "0wk28blnfks987iby0p3qpd4nxnz6sqn4fx8g59gyddjhav51lri",
-            "rev": "92e11446869d878803d4f3dec5d2101380c12bb2"
-        },
-        "recipe": {
-            "sha256": "0bg2p7pk4jlpqc7lg48mxd6zkwnx15r0r7lmsxgx9dv1ilfwrmgn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151126.846",
-        "deps": [
-            "cl-lib",
-            "dash"
-        ]
-    },
-    "slime": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "slime",
-            "repo": "slime",
-            "sha256": "18iz4cn209xri420hrsl7dmaf0mqr87rc870kwn63pddrqffzqa8",
-            "rev": "137a6bf990c5a9db72716ee15aa2bd86b77ba0cb"
-        },
-        "recipe": {
-            "sha256": "04zcvjg0bbx5mdbsk9yn7rlprakl89dq6jmnq5v2g0n6q0mh6ign",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151213.1342",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "audio-notes-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "audio-notes-mode",
-            "sha256": "0q79kblcbz5vlzj0f49vpc1902767ydmvkmwwjs60x3w2f3aq3cm",
-            "rev": "2158b2e8d20df3184bbe273a7fd5aa693e98baa9"
-        },
-        "recipe": {
-            "sha256": "0q88xmi7jbrx47nvbbmwggbm6i7agzpnv5y7cpdh73lg165xsz2h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140204.1354",
-        "deps": []
-    },
-    "define-word": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "define-word",
-            "sha256": "02i621yq2ih0zp7mna8iykj41prv77hvcadz7rx8c942zyvjzxqd",
-            "rev": "64d98b7748686c51261fe6e8d42078c6284feb13"
-        },
-        "recipe": {
-            "sha256": "035fdfwnxw0mir1dyvrimygx2gafcgnvlcsmwmry1rsfh39n5b9a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150709.1423",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "zeitgeist": {
-        "fetch": {
-            "tag": "fetchbzr",
-            "url": "lp:zeitgeist-datasources",
-            "sha256": "0f80fxh0y9lfa08fnic7ln0jn8vngfbiygy6sizdmrcxz67559vc",
-            "rev": "181"
-        },
-        "recipe": {
-            "sha256": "0gzmiwxmzcrl5mf0s7vs09p2wl7slq8xbl6ynl76iwzwjxjizahk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131228.1209",
-        "deps": []
-    },
-    "ecukes": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ecukes",
-            "repo": "ecukes",
-            "sha256": "0h6vh719ai0cxyja6wpfi6m76d42vskj56wg666j0h6j0qw6h3i2",
-            "rev": "7dad2da09da33d8540f25bf7bb7dd62900669b80"
-        },
-        "recipe": {
-            "sha256": "0ava8hrc7r1mzv6xgbrb84qak5xrf6fj8g9qr4i4g0cr7843nrw0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150717.848",
-        "deps": [
-            "ansi",
-            "commander",
-            "dash",
-            "espuds",
-            "f",
-            "s"
-        ]
-    },
-    "shell-switcher": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DamienCassou",
-            "repo": "shell-switcher",
-            "sha256": "0ia7sdip4hl27avckv3qpqgm3k4ynvp3xxq1cy53bqfzzx0gcria",
-            "rev": "2c5575ae859a82041a4bacd1793b844bfc24c34f"
-        },
-        "recipe": {
-            "sha256": "07g9naiv2jk9jxwjywrbb05dy0pbfdx6g8pkra38rn3vqrjzvhyx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151011.815",
-        "deps": []
-    },
-    "dash": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "dash.el",
-            "sha256": "1g7vrfhafmkqwdpfllfiwirl4pi437pyaws38jsd8laxmsa4m4wb",
-            "rev": "8a46d3c7c126d3e979f7f9b36867a413694cd8df"
-        },
-        "recipe": {
-            "sha256": "0azm47900bk2frpjsgy108fr3p1jk4h9kmp4b5j5pibgsm26azgz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151216.1515",
-        "deps": []
-    },
-    "haml-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nex3",
-            "repo": "haml-mode",
-            "sha256": "0fmcm4pcivigz9xhf7z9wsxz9pg1yfx9qv8na2dxj426bibk0a6w",
-            "rev": "7717db6fa4a90d618b4a5e3fef2ac1d24ce39be3"
-        },
-        "recipe": {
-            "sha256": "0ih0m7zr6kgn6zd45zbp1jgs1ydc5i5gmq6l080wma83v5w1436f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150508.2211",
-        "deps": [
-            "ruby-mode"
-        ]
-    },
-    "sentence-navigation": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "noctuid",
-            "repo": "emacs-sentence-navigation",
-            "sha256": "0ikiv12ahndvk5w9pdayqlmafwj8d1vkcshfnqmgy6ykqbcdpqk6",
-            "rev": "8b6bf8af180c95f516bda9285da3fe940a2ab740"
-        },
-        "recipe": {
-            "sha256": "1p3ch1ab06v038h130fsxpbq45d1yadl67i2ih4l4fh3xah5997m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150914.2346",
-        "deps": [
-            "ample-regexps",
-            "emacs"
-        ]
-    },
-    "helm-github-stars": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Sliim",
-            "repo": "helm-github-stars",
-            "sha256": "1sbhh3dmb47sy3r2iw6vmvbq5bpjac4xdg8i5a0m0c392a38nfqn",
-            "rev": "9211be3fbb65ca8819e0d1a54524ed8abbfaa4fa"
-        },
-        "recipe": {
-            "sha256": "1r4mc4v71171sq9rbbhm346s92fb7jnvvl91y2q52jqmrnzzl9zy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150625.1723",
-        "deps": [
-            "emacs",
-            "helm"
-        ]
-    },
-    "elmine": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "leoc",
-            "repo": "elmine",
-            "sha256": "1463y4zc6yabd30k6806yw0am18fjv0bkxm56p2siqrwn9pbsh8k",
-            "rev": "60639f46a5f45653f490cdd30732beb2dca47ada"
-        },
-        "recipe": {
-            "sha256": "1gi94dyz9x50swkvryd4vj36rqgz4s58nrb4h4vwwviiiqmc8fvz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151121.623",
-        "deps": [
-            "s"
-        ]
-    },
-    "ace-jump-zap": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "waymondo",
-            "repo": "ace-jump-zap",
-            "sha256": "0z0rblr41r94l4b2gh9fcw50nk82ifxrr3ilxqzbb8wmvil54gh4",
-            "rev": "c60af83a857955b68c568c274a3c80cbe93f3150"
-        },
-        "recipe": {
-            "sha256": "07bkmly3lvlbby2m13nj3m1q0gcnwy5sas7d6ws6vr9jh0d36byb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150330.1542",
-        "deps": [
-            "ace-jump-mode",
-            "dash"
-        ]
-    },
-    "anchored-transpose": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/anchored-transpose.el",
-            "sha256": "1hklypbp79pgaf1yklbm3qx4skm3xlml0cm1r9b9js3dbqyha651"
-        },
-        "recipe": {
-            "sha256": "19dgj1605qxc2znvzj0cj6x29zyrh00qnzk2rlwpn9hvzypg9v7w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20080905.54",
-        "deps": []
-    },
-    "toxi-theme": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/postspectacular/toxi-theme",
-            "sha256": "0hfzbrw9ik3yxdwmgsm80k0n045z6az6pgvxc1nqcjmiwh80h9mk",
-            "rev": "fc4274055149"
-        },
-        "recipe": {
-            "sha256": "032m3qbxfd0qp81qwayd5g9k7vz55g4yhw0d35qkxzf4qf58x9sd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130418.1439",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "pyfmt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aheaume",
-            "repo": "pyfmt.el",
-            "sha256": "1rp8zchvclh29rl9a1i82pcqghnhpaqnppaydxc2qx23y9pdgz9i",
-            "rev": "cb92be2cf0804cc53142dc5edb36f8e0ef5cec32"
-        },
-        "recipe": {
-            "sha256": "112kjsp763c2plhqlhydpngrabhc58ya7cszvi4119xqw2s699g6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150521.1556",
-        "deps": []
-    },
-    "ruby-dev": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Mon-Ouie",
-            "repo": "ruby-dev.el",
-            "sha256": "1cy5zmdfwsjw8jla8mxjm1cmvrv727fwq1kqhjr5nxj0flwsm4x1",
-            "rev": "3a6f6e489697916dd554852492bd325879be2e44"
-        },
-        "recipe": {
-            "sha256": "0mf2ra3p5976qn4ryc2s20vi0nrzwcg3xvsgppsc0bsirjw2l0fh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130811.351",
-        "deps": []
-    },
-    "flappymacs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "taksatou",
-            "repo": "flappymacs",
-            "sha256": "07hv6l80ka10qszm16fpan8sas4b0qvl5s6qixxlz02fm7m0s7m5",
-            "rev": "bbc69405f62e1bc488533709d4ab0b5eba919dbd"
-        },
-        "recipe": {
-            "sha256": "0dcpl5n7wwsk62ddgfrkq5dkm91569y4i4f0yqa61pdmzhgllx7d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140715.1101",
-        "deps": []
-    },
-    "helm-company": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "manuel-uberti",
-            "repo": "helm-company",
-            "sha256": "189qmc6fdj5a01a7w45r0qpn9qjf2q9g83qic9sgnrccc841zpyg",
-            "rev": "13f87befb1a427295eeeeb49f0c2e4847bc81e10"
-        },
-        "recipe": {
-            "sha256": "1pbsg7zrz447siwd8pasw2hz5z21wa1xpqs5nrylhbghsk076ld3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151216.209",
-        "deps": [
-            "company",
-            "helm"
-        ]
-    },
-    "smeargle": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-smeargle",
-            "sha256": "1smv91ggvaw37597ilvhra8cnj4p71n6v5pfazii8k85kvs6x460",
-            "rev": "67466d5214a681430db8cb59a2a1bca771ff0024"
-        },
-        "recipe": {
-            "sha256": "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151014.42",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "table": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "byplayer",
-            "repo": "table.el",
-            "sha256": "06asy1mwp9yyvzck1n5xrl1c4zzf1vf3k2xmlcb262nllfsh4gmc",
-            "rev": "d3718985d1103490c140690ead37d65b0e427c63"
-        },
-        "recipe": {
-            "sha256": "0jayhjvs5pkacw8r7z7fy0i732a1zpkcmirkzjpx3wqk0bs5fga6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140722.15",
-        "deps": []
-    },
-    "epc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiwanami",
-            "repo": "emacs-epc",
-            "sha256": "1ayhknqv1wmar2j2r4n7nqcp69i7k222qx524x4wv61ys324d004",
-            "rev": "dbae585622fa7b556945cc7475f354976d26b065"
-        },
-        "recipe": {
-            "sha256": "1l9rcx07pa4b9z5654gyw6b64c95lcigzg15amphwr56v2g3rbzx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140610.34",
-        "deps": [
-            "concurrent",
-            "ctable"
-        ]
-    },
-    "suomalainen-kalenteri": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tlikonen",
-            "repo": "suomalainen-kalenteri",
-            "sha256": "1b637p2cyc8a83qv9vba4yamzhk08f62zykqh5p35jwvym8wkann",
-            "rev": "b7991cb35624ebc04a89bbe759d40f186c9c097e"
-        },
-        "recipe": {
-            "sha256": "1wzijbgcr3jc47ccr7nrdkqha16s6gw0xiccnmdczi48cvnvvlkh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151129.504",
-        "deps": []
-    },
-    "init-loader": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-jp",
-            "repo": "init-loader",
-            "sha256": "1zykh80k2sy0as1rn7qaa2hyvkagcvzzmxik4jpb0apw0ha1bf6s",
-            "rev": "1f28a0b801cbb08aa9b47fd15ceab243a2bc064c"
-        },
-        "recipe": {
-            "sha256": "0rq7759abp0ml0l8dycvdl0j5wsxw9z5y9pyx68973a4ssbx2i0r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141031.133",
-        "deps": []
-    },
-    "font-lock+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/font-lock+.el",
-            "sha256": "1w159k5hn9z7ydx5gq4hph7gvbqs4ml4qbfgpsib5z39v7x6wkv4"
-        },
-        "recipe": {
-            "sha256": "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1605",
-        "deps": []
-    },
-    "session": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsorphanage",
-            "repo": "session",
-            "sha256": "0sp952abz7dkq8b8kkzzmnwnkq5w15zsx5dr3h8lzxb92lnank9v",
-            "rev": "19ea0806873daac3539a4b956e15655e99e3dd6c"
-        },
-        "recipe": {
-            "sha256": "0fghxbnf1d5iyrx1q8xd0lbw9nvkdgg2v2f89j6apnawisrsbhwx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120510.1900",
-        "deps": []
-    },
-    "bundler": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tobiassvn",
-            "repo": "bundler.el",
-            "sha256": "0cldbyc7qsyxszzfbdcw8n8a15hvj343acsjir29n6d9nnpmvjgp",
-            "rev": "9be0c4601a4d1a35de22f818637ce029830272d3"
-        },
-        "recipe": {
-            "sha256": "0i5ybc6i8ackxpaa75kwrg44zdq3jkvy48c42vaaafpddjwjnsy4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151111.912",
-        "deps": [
-            "cl-lib",
-            "inf-ruby"
-        ]
-    },
-    "undohist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "m2ym",
-            "repo": "undohist-el",
-            "sha256": "1c0daw246ky7b1x5b8h55x79pl1pjqk1k348l487bdd8zdj4w9wx",
-            "rev": "d2239a5f736724ceb9e3b6bcaa86f4064805cda0"
-        },
-        "recipe": {
-            "sha256": "0zzfzh8sf2dkz8h3kidv7zmwz2c2qq9n9qz2mab2lk0y44njzwhn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150315.742",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "jsfmt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "brettlangdon",
-            "repo": "jsfmt.el",
-            "sha256": "0h9gx5cl3lashk0n8pv9yzb0mm8dyziddfbwfqfm70638p93ylhc",
-            "rev": "68109120f553fbc651fafb6fc35ed83c3e79f8a6"
-        },
-        "recipe": {
-            "sha256": "1syy32sv2d57b3gja0ly65h36mfnyq6hzf5lnnl3r58yvbdzngqd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150727.1725",
-        "deps": []
-    },
-    "rdp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "rdp",
-            "sha256": "08l96bhghmnckar4i6afj9csqglasmpmby1r7j38ic9bp37z2yqd",
-            "rev": "b620192afada04aec33b38cc130fef0765f41ca9"
-        },
-        "recipe": {
-            "sha256": "0lj3idwv4fxz8pi8mnxkbhwhzaa1gs6ib4nzly3fc6yiix9ampkz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120928.2054",
-        "deps": []
-    },
-    "go-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dominikh",
-            "repo": "go-mode.el",
-            "sha256": "0wsh3rgay1k6ncayhqnnsnl5v2xwl60k6qyanmps0jgyshdv67zj",
-            "rev": "dccb56c1b1b85c3d7b3184a6606024077d4e1775"
-        },
-        "recipe": {
-            "sha256": "1852zjxandmq0cpbf7m56ar3rbdi7bx613gdgsf1bg8hsdvkgzfx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.1424",
-        "deps": []
-    },
-    "xtest": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "promethial",
-            "repo": "xtest",
-            "sha256": "09mn8s7gzzxgs7kskld8l68zjrcgnvml3fqj69wrfq7b1g62hhxy",
-            "rev": "2c2bdf32667506dd9ddf6eb311832add616bdf1c"
-        },
-        "recipe": {
-            "sha256": "1vbs4sb4frzg8d3l96ip9cc6lc86nbj50vpdfqazvxmdfd1sg4i7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141214.1106",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "noccur": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "NicolasPetton",
-            "repo": "noccur.el",
-            "sha256": "0wk86gm0by9c8mfbvydz5va07qd30n6wx067inqfa7wjffaq0xr7",
-            "rev": "6cc02ce07178a61ae38a849f80472c01969272bc"
-        },
-        "recipe": {
-            "sha256": "0a8l50v09bgap7rsls808k9wyjpjbcxaffsvz7hh9rw9s7m5fz5g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150514.1620",
-        "deps": []
-    },
-    "speck": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/speck.el",
-            "sha256": "1i2z57aasljia6xd2xn1mryklc2gc9c2q1fad8wn7982sl277d10"
-        },
-        "recipe": {
-            "sha256": "19h3syk4kjmcy7jy9nlsbq6gyxwl4xsi84dy66a3cpvmknm25kyg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140901.1335",
-        "deps": []
-    },
-    "lispyscript-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "krisajenkins",
-            "repo": "lispyscript-mode",
-            "sha256": "0n0mk01h9c3f24gzpws5xf6syrdwkq4kzs9mgwl74x9l0x904rgf",
-            "rev": "d0e67ee734919d7ff14c72712e909149cb9604bd"
-        },
-        "recipe": {
-            "sha256": "02biai45l5xl2m9l1drphrlj6r01msmadhyg774ijdk1x4gm5nhr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130828.919",
-        "deps": []
-    },
-    "pacmacs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "codingteam",
-            "repo": "pacmacs.el",
-            "sha256": "07w3w3ms18kas637z6n86nnd9xqi73c6cbrmni99jbwqq7jhgi29",
-            "rev": "98816141d5d47db8d5c9c04aaf1c9a30a045a88f"
-        },
-        "recipe": {
-            "sha256": "13pgxwwigb0h709xrs2h1l957n4vcjz59qkrs8aa12czcg291599",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151217.803",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "dash-functional",
-            "emacs",
-            "f"
-        ]
-    },
-    "latex-math-preview": {
-        "fetch": {
-            "tag": "fetchFromGitLab",
-            "owner": "latex-math-preview",
-            "repo": "latex-math-preview",
-            "sha256": "1rpf0vkrzchhws1gzz2cpfcvswwfn5557m225qlwf869kqz37m2d",
-            "rev": "6dd4d18b1b1ce8acc72ae5ef63e6498b859ac029"
-        },
-        "recipe": {
-            "sha256": "14bn0q5czrrkb1vjdkwx6f2x4zwjkxgrc0bcncv23l13qls1gkmr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151224.20",
-        "deps": []
-    },
-    "bbdb": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://git.savannah.nongnu.org/bbdb.git",
-            "sha256": "e20dfe8085782948c1411685d45bad0cb7ff088bc2d1d2c1654c276356382b26",
-            "rev": "8fce6df3ab09250d545a2ed373ae64e68d12ff4c"
-        },
-        "recipe": {
-            "sha256": "0zhs4psa9b9yf9hxm19q5znsny11cdp23pya3rrlmj39j4jfn73j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151114.1741",
-        "deps": []
-    },
-    "ac-anaconda": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "proofit404",
-            "repo": "ac-anaconda",
-            "sha256": "0vrd6g9cl02jjxrjxpshq4pd748b5xszhpmakywrw8s08nh8jf44",
-            "rev": "d0dec5c026235f65f9fd6594540df8886ed1b6a8"
-        },
-        "recipe": {
-            "sha256": "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150912.308",
-        "deps": [
-            "anaconda-mode",
-            "auto-complete",
-            "dash"
-        ]
-    },
-    "fliptext": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/fliptext.el",
-            "sha256": "1viigj04kla20dk46xm913jzqrmx05rpjrpghnc0ylbqppqdwzpw"
-        },
-        "recipe": {
-            "sha256": "0cmyan9hckjsv5wk1mvjzif9nrc07frhzkhhl6pkgm0j0f1q30ji",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131113.2018",
-        "deps": []
-    },
-    "cljsbuild-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kototama",
-            "repo": "cljsbuild-mode",
-            "sha256": "1cdim8fancrsrm9avzv4m2v384i7n4632nibyfnxkhq03bj00j1z",
-            "rev": "7edfc199b5daf972f6b2110d13a96e0bd974cd65"
-        },
-        "recipe": {
-            "sha256": "0qvb990dgq4v75lwnd661wxszbdbhlgxpsyv4zaj6h10gp1vi214",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140619.326",
-        "deps": []
-    },
-    "magit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "magit",
-            "sha256": "1wgy1rkaanqf382m7ijy90gpaiz2049mrmwlvwkr3hw3vgkffar8",
-            "rev": "c650d164a94adcd123ed28da7d413aee76cc9fe7"
-        },
-        "recipe": {
-            "sha256": "0kcx8pqzvl7xgx7f8q7xck83ghkx6cjsa2nczxj1virap1nkfhkw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.639",
-        "deps": [
-            "async",
-            "dash",
-            "emacs",
-            "git-commit",
-            "magit-popup",
-            "with-editor"
-        ]
-    },
-    "sly": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "capitaomorte",
-            "repo": "sly",
-            "sha256": "11qdkhpz0h2idm0arrql5r7wh1nf40b34vnvwrwgdaqwq49xfrr4",
-            "rev": "762b53a1b1eecb0b7a9c8030d529e23e73b18791"
-        },
-        "recipe": {
-            "sha256": "1pmyqjk8fdlzwvrlx8h6fq0savksfny78fhmr8r7b07pi20y6n9l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151222.931",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "delim-kill": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thomas11",
-            "repo": "delim-kill",
-            "sha256": "06a20sd8nc273azrgha40l1fbqvv9qmxsmkjiqbf6dcf1blkwjyf",
-            "rev": "1dbe47344f2d2cbc8c54beedf0cf0bf10fd203c1"
-        },
-        "recipe": {
-            "sha256": "1pplc456771hi52ap1p87y7pabxlvm6raszcxjvnxff3xzw56pig",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20100517.120",
-        "deps": []
-    },
-    "magit-stgit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "magit-stgit",
-            "sha256": "1mk8g8rr9vf8jm0mmsj33p8gc71nhlv3847hvqywy6z40nhcjnyb",
-            "rev": "d1793345a8d32b2c509077d634ca73148a68de4b"
-        },
-        "recipe": {
-            "sha256": "12wg1ig2jzy2np76brpwxdix9pwv75chviq3c24qyv4y80pd11sv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151120.1744",
-        "deps": [
-            "emacs",
-            "magit"
-        ]
-    },
-    "shelltest-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rtrn",
-            "repo": "shelltest-mode",
-            "sha256": "1ns2w7zhbi96a3gilmzs69187jngqhcvik17ylsjdfrk42hw5s6r",
-            "rev": "e2513832ce6b994631335be299736cabe291d0f7"
-        },
-        "recipe": {
-            "sha256": "1inb0vq34fbwkr0jg4dv2lljag8djggi8kyssrzhfawri50m81nh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141227.448",
-        "deps": []
-    },
-    "maker-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fommil",
-            "repo": "maker-mode",
-            "sha256": "0w3kar52yf8clf9801c4jzfrixi10clc8fs8ni2d4pzhdwwca2zw",
-            "rev": "335c43b08eff589040129dae1ea13c88793b069e"
-        },
-        "recipe": {
-            "sha256": "03q09jxmhwqy7g09navj08z9ir0rbh7w26c1av7hwhmq4i6xwg8a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150116.554",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "tagedit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "tagedit",
-            "sha256": "00hjc6ax4659ww6vygpzzsb3zzr2ddz2z33mkp5j6hmj2s4g2viy",
-            "rev": "458ff5bb23aa4816a2d5ff5d66c4e95996b4a4e1"
-        },
-        "recipe": {
-            "sha256": "0vfkbrxmrw4fwdz324s734zxdxm2nj3df6i8m6lgb9pizqyp2g6z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150727.424",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "lorem-ipsum": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jschaf",
-            "repo": "emacs-lorem-ipsum",
-            "sha256": "0grzl4kqpc1x6569yfh9xdzzbgmhcskxwk6f7scjpl32acr88cmx",
-            "rev": "893a27505734a1497b79bc26e0736a78221b35d9"
-        },
-        "recipe": {
-            "sha256": "0p62yifbrknjn8z0613wy2aaknj44liyrgbknhpa0qn0d4fcrp4h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140911.1608",
-        "deps": []
-    },
-    "db": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nicferrier",
-            "repo": "emacs-db",
-            "sha256": "0syv4kr319d34yqi4q61b8jh5yy22wvd148x1m3pc511znh2ry5k",
-            "rev": "b3a423fb8e72f9013009cbe033d654df2ce31438"
-        },
-        "recipe": {
-            "sha256": "05jhga9n6gh1bmj8gda14sb703gn7jgjlvy55mlr5kdb2z3rqw1n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140421.1611",
-        "deps": [
-            "kv"
-        ]
-    },
-    "tinysegmenter": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "tinysegmenter.el",
-            "sha256": "1n8cn6mr26hgmsm2mkbj5gs6dv61d0pap8ija4g0n1vsibfhzd8j",
-            "rev": "872134704bd25c13a4c59552433da4c6881b5230"
-        },
-        "recipe": {
-            "sha256": "005yy2f8vghvwdcwakz5sr9n1gzk6cfyglm6d8b74y90d8fng0r6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141124.413",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "org-ref": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jkitchin",
-            "repo": "org-ref",
-            "sha256": "0ggr0ln67gffyl3czcjw1hck7m7wibmbgb7q2kn8ps9cc90ngc1a",
-            "rev": "fa0e03e8c194c5d2e95fe51a59802a68b7039a86"
-        },
-        "recipe": {
-            "sha256": "087isxf3z8cgmmniaxr3lpq9jg3sriw88dwp4f0ky286hlvgzw08",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151226.1700",
-        "deps": [
-            "dash",
-            "emacs",
-            "helm",
-            "helm-bibtex",
-            "hydra",
-            "key-chord"
-        ]
-    },
-    "flymake-jshint": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Wilfred",
-            "repo": "flymake-jshint.el",
-            "sha256": "0ywm9fpb7d7ry2fly8719fa41q97yj9za3phqhv6j1chzaxvcv3a",
-            "rev": "79dd554c227883c487db38ac111306c8d5382c95"
-        },
-        "recipe": {
-            "sha256": "0j4djylz6mrq14qmbm35k3gvvsw6i9qc4gd9ma4fykiqzkdjsg7j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140319.1700",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "navi-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tj64",
-            "repo": "navi",
-            "sha256": "1yywbfa0syhb8zmn2qjjw2hxy7vz9ky3xd7kv3nz3gd2x989nb9a",
-            "rev": "78c0c227d06254d1aec9d8a1301b9a5a785b8b31"
-        },
-        "recipe": {
-            "sha256": "0f5db983w9kxq8mcjr22zfrm7cpxydml4viac62lvab2kwbpbrmi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151203.957",
-        "deps": [
-            "outorg",
-            "outshine"
-        ]
-    },
-    "smarty-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsorphanage",
-            "repo": "smarty-mode",
-            "sha256": "1vl3nx0y2skb8sibqxvmc3wrmmd6z88hknbry348d0ik3cbr0ijx",
-            "rev": "3dfdfe1571f5e9ef55a29c51e5a80046d4cb7568"
-        },
-        "recipe": {
-            "sha256": "06cyr2330asy2dlx81g3h9gq0yhd4pbnmzfvmla7amh4pfnjg14v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20100703.658",
-        "deps": []
-    },
-    "flymake-sass": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-sass",
-            "sha256": "0rwjiplpqw3rrh76llnx2fn78f6avxsg0la5br46q1rgw4n8r1w1",
-            "rev": "748f13caa399c27c41ba797da9e214b814f5a30f"
-        },
-        "recipe": {
-            "sha256": "0sz6n5r9pdphgvvaljg9zdwj3dqayaxzxmb4s8x4b05c8yx3ba0d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140308.525",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "shimbun": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsorphanage",
-            "repo": "w3m",
-            "sha256": "1lgvdaghzj1fzh8p6ans0f62zg1bfp086icbsqmyvbgpgcxia9cs",
-            "rev": "5986b51c7c77500fee3349fb0b3f4764d3fc727b"
-        },
-        "recipe": {
-            "sha256": "0k54886bh7zxsfnvga3wg3bsij4bixxrah2rrkq1lj0k8ay7nfxh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120718.2238",
-        "deps": []
-    },
-    "sackspace": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cofi",
-            "repo": "sackspace.el",
-            "sha256": "06gqqbkn85l2p05whmr4wkg9axqyzb7r7sgm3r8wfshm99kgpxvl",
-            "rev": "fd0480eaaf6d3d11fd30ac5feb2da2f4f7572708"
-        },
-        "recipe": {
-            "sha256": "1m10iw83k6m7v7sg2dxzdy83zxq6svk8h9fh4ankyn3baqrdxg5z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130719.456",
-        "deps": []
-    },
-    "bind-chord": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "waymondo",
-            "repo": "use-package-chords",
-            "sha256": "100py4x10nd8w0l87lc7wpa8nmg7yg6pwxln0wcyal7vpwycmhjz",
-            "rev": "e5f7a43fd0a63a4a0bf7dabc2c223f615ea71eca"
-        },
-        "recipe": {
-            "sha256": "01a3c298kq8cfsxsscpic0shkjm77adiamgbgk8laqkbrlsrrcsb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151111.1007",
-        "deps": [
-            "bind-key",
-            "key-chord"
-        ]
-    },
-    "org2blog": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "punchagan",
-            "repo": "org2blog",
-            "sha256": "1cy4bglfxq87iwz4iflyc5mswa2381b5z3gv9ps3sww1kbkm3njx",
-            "rev": "c97bb3d0f3e3816581b04394c6d9c55a2c2cfc5c"
-        },
-        "recipe": {
-            "sha256": "0ancvn4ji4552k4nfd2ijclsd027am93ngg241ll8f6h6k0wpmzq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151208.1028",
-        "deps": [
-            "metaweblog",
-            "org",
-            "xml-rpc"
-        ]
-    },
-    "ample-regexps": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "immerrr",
-            "repo": "ample-regexps.el",
-            "sha256": "18cicz11i19cpabrq6khnl9ks1khn6gw5a4ckaq4y65r40x0cr6g",
-            "rev": "884c712a82773d3af500e71d20bebe52340352c5"
-        },
-        "recipe": {
-            "sha256": "00y07pd438v7ldkn5f1w84cpxa1mvcnzjkj6sf5l5pm97xqiz7j2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151023.500",
-        "deps": []
-    },
-    "mhc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yoshinari-nomura",
-            "repo": "mhc",
-            "sha256": "0z34x254z79acslxzn35mg9nsxh0cpmb540k90vlp7am7g4d4sra",
-            "rev": "0204160474bdb01e62c89364b5f720b2c42afb0d"
-        },
-        "recipe": {
-            "sha256": "02ikn9hx0kcfc2xrx4f38zpkfi6vgz7chcxk6q5d0vcsp93b4lql",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151210.238",
-        "deps": [
-            "calfw"
-        ]
-    },
-    "company-ghc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "iquiw",
-            "repo": "company-ghc",
-            "sha256": "06ljm0ysz8czdr32gfq1y3nm3jcywihdszgnc2alx1hcgqiq0ds6",
-            "rev": "d78fcee6c8fa4f786a1e15a3bb78d2dd2c56b6af"
-        },
-        "recipe": {
-            "sha256": "07adykza4dqs64bk8vjmgryr54khxmcy28hms5z8i1qpsk9vmvnn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151217.859",
-        "deps": [
-            "cl-lib",
-            "company",
-            "emacs",
-            "ghc"
-        ]
-    },
-    "evil": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/lyro/evil",
-            "sha256": "0m1nd5v0f72lvispjrsfph8iyv2z7gsf8awwmfdghag348bmvjn3",
-            "rev": "73ad80e8fea1"
-        },
-        "recipe": {
-            "sha256": "09qrhy7l229w0qk3ba1i2xg4vqz8525v8scrbm031lqp30jp54hc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151128.1302",
-        "deps": [
-            "goto-chg",
-            "undo-tree"
-        ]
-    },
-    "flycheck-css-colorguard": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Simplify",
-            "repo": "flycheck-css-colorguard",
-            "sha256": "073vkjgcyqp8frsi05s6x8ml3ar6hwjmn2c7ryfab5b35kp9gmdi",
-            "rev": "8c2061c11d5465eec77ad471bef413eb14d122da"
-        },
-        "recipe": {
-            "sha256": "1n56j5nicac94jl7kp8fbqxmd115vbhzklzgfz5jbib2ab8y60jc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151122.347",
-        "deps": [
-            "emacs",
-            "flycheck"
-        ]
-    },
-    "ruby-end": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "ruby-end",
-            "sha256": "1x4nvrq5nk50c1l3b5wcr4g1n5nmwafcz1zzc12qzsl5sya7si55",
-            "rev": "ea453f5ac6259f09667fa26b865b6afacd06aa97"
-        },
-        "recipe": {
-            "sha256": "0cx121hji8ws6s3p2xfdgidm363y05g2n880fqrmzyz27cqkljis",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141215.623",
-        "deps": []
-    },
-    "openstack-cgit-browse-file": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chmouel",
-            "repo": "openstack-cgit-browse-file",
-            "sha256": "0086pfk4pq6xmknk7a42fihcjgzkcplqqc1rk9fhwmn9j7djbq70",
-            "rev": "244219288b9aef41155044697bb114b7af83ab8f"
-        },
-        "recipe": {
-            "sha256": "05dl28a4npnnzzipypfcqb21sdww715lwji2xnsabx3fb1h1w5jl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130819.427",
-        "deps": []
-    },
-    "addressbook-bookmark": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thierryvolpiatto",
-            "repo": "addressbook-bookmark",
-            "sha256": "0bzg8qi188rybk0a4lsdal0788iia0ymr5gdbz41c42f59a6y49d",
-            "rev": "784df4fa06f90214ddba127391ef4fcb6b699468"
-        },
-        "recipe": {
-            "sha256": "15p00v4ndrsbadal0ss176mks4ynj39786bmrnil29b6sqibd43r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141205.2308",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "magnatune": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "eikek",
-            "repo": "magnatune.el",
-            "sha256": "1hqz26zm4bdz5wavna4j9yia3ns4z19dnszl7k0lcpgbgmb0wh8y",
-            "rev": "605b01505ba30589c77ebb4c96834b5072ccbdd4"
-        },
-        "recipe": {
-            "sha256": "0fmxlrq5ls6fpbk5fv67aan8gg1c61i1chfw5lhf496pwqzq901d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151030.1435",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "f": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "f.el",
-            "sha256": "0lzqfr5xgc3qvpbs6vf63yiw7pc2mybfvsrhczf9ghlmlawqa6k1",
-            "rev": "e0259ee060ff9a3f12204adcc8630869080acd68"
-        },
-        "recipe": {
-            "sha256": "0s7fqav0dc9g4y5kqjjyqjs90gi34cahaxyx2s0kf9fwcgn23ja2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151113.323",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "fortpy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rosenbrockc",
-            "repo": "fortpy-el",
-            "sha256": "1nqx2igxmwswjcrnzdjpx5qcjr60zjy3q9cadq5disms17wdcr6y",
-            "rev": "c614517e9396ef7a78be3b8786fbf303879cf43b"
-        },
-        "recipe": {
-            "sha256": "1nn5vx1rspfsijwhilnjhiy0mjw154ds3lwxvkpwxpchygirlyxj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150715.1532",
-        "deps": [
-            "auto-complete",
-            "epc",
-            "pos-tip",
-            "python-environment"
-        ]
-    },
-    "dired-ranger": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "dired-hacks",
-            "sha256": "15jri9cj5jgr3ff423izd8idd7djay238c9pa3ccy05djl9z2hdx",
-            "rev": "6647825dbca4269afa76302e345d6bd15b222e42"
-        },
-        "recipe": {
-            "sha256": "19lbbzqflqda5b0alqfzdhpbgqssghqb4n4viq8x4l1fac8mby6h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150819.1148",
-        "deps": [
-            "dash",
-            "dired-hacks-utils"
-        ]
-    },
-    "ac-cider": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "clojure-emacs",
-            "repo": "ac-cider",
-            "sha256": "1k4zk27zvxmcffwwg0zx19rcy2ysd65nnrifwspdw699glpwx2l5",
-            "rev": "eeb4b3ae1e91d03d765f6c39994792e4f05f6600"
-        },
-        "recipe": {
-            "sha256": "1dszpb706h34miq2bxqyq1ycbran5ax36vcniwp8vvhgcjsw5sz6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151012.508",
-        "deps": [
-            "auto-complete",
-            "cider",
-            "cl-lib"
-        ]
-    },
-    "project-root": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/piranha/project-root",
-            "sha256": "08dd2y6hdsj1rxcqa2hnjypnn9c2z43y7z2hz0fi4vny547qybz8",
-            "rev": "fcd9df2eadca"
-        },
-        "recipe": {
-            "sha256": "0xjir204zk254y2x70k9vqwirx2ljmrikpsgn5kn170d1bxvhwmb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20110206.1430",
-        "deps": []
-    },
-    "heroku": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "technomancy",
-            "repo": "heroku.el",
-            "sha256": "0c45pib8qpwgyr271g5ddnsn7hzq68mqflv0yyc8803ni06w9vhj",
-            "rev": "92af1c073b593c4def99c8777c869992aa4d0b3a"
-        },
-        "recipe": {
-            "sha256": "1kadmxmqhc60cb5k14943rad1gbril2hlcnqxnsy4h3j2ykmcdyy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120629.1313",
-        "deps": []
-    },
-    "otter-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "scvalex",
-            "repo": "script-fu",
-            "sha256": "0a6i3jqdmpsfllwifqwpd1ncwp8m09m2yhx9b2fzsyycd8yslnns",
-            "rev": "da9438b58b6b95bb75fcd5f55a48b8a53eed368b"
-        },
-        "recipe": {
-            "sha256": "197r0sfbmwygvzsiv0bjjfsngwp79qi365z762y8gbf8f3hjp45i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121202.1103",
-        "deps": []
-    },
-    "zombie": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "zombie",
-            "sha256": "1gm3ly6czbw4vrxcslm50jy6nxf2qsl656cjwbyhw251wppn75cg",
-            "rev": "ff8cd1b4cdbb4b0b9b8fd1ec8f6fb93eba249345"
-        },
-        "recipe": {
-            "sha256": "0ji3nsxwbxmmygd6plpbc1lkw6i5zw4y6x3r5n2ah3ds4vjr7cnv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141222.1016",
-        "deps": []
-    },
-    "irfc": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/irfc.el",
-            "sha256": "197ybqwbj8qjh2p9pkf5mvqnrkpcgmv8c5s2gvl6msyrabk0mnca"
-        },
-        "recipe": {
-            "sha256": "0186l6zk5l427vjvmjvi0xhwk8a4fjhsvw9kd0yw88q3ggpdl25i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130824.707",
-        "deps": []
-    },
-    "basic-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fgeller",
-            "repo": "basic-theme.el",
-            "sha256": "1pbnw6ccphxynbhnc4g687jfcg33p1sa7a0mfxc2ai0i3z59gn78",
-            "rev": "e3c32e1285749b4135d4d593f06566c631c26456"
-        },
-        "recipe": {
-            "sha256": "16rgff1d0s65alh328lr93zc06zmgbzgwx1rf3k3l4d10ki4cc27",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151010.307",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "swbuff-x": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/swbuff-x.el",
-            "sha256": "1fkicyjvanh8yk2y27sq075sarcyqhsdz0r4xhillpnv34ji98r5"
-        },
-        "recipe": {
-            "sha256": "1wglcxgfr839lynwsl8i7fm70sxxjidy3ib6ibz0kgiwr41rh49y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130607.514",
-        "deps": [
-            "swbuff"
-        ]
-    },
-    "ibuffer-tramp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "svend",
-            "repo": "ibuffer-tramp",
-            "sha256": "1mfrbr725p27p3s5nxh7xhm81pdr78ysz8l3kwrlp97bb6dmljmq",
-            "rev": "41fab2ad174f53a4cf5ef7d2ebef518dede82ab4"
-        },
-        "recipe": {
-            "sha256": "11a9b9g1jk2r3fldi012zka4jzy68kfn4991xp046qm2fbc7la32",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151118.1139",
-        "deps": []
-    },
-    "sound-wav": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-sound-wav",
-            "sha256": "1h6h65gwxb07pscyhhhdn11h3lx3jgyfw8v1kw5m2qfrv5kh6ylq",
-            "rev": "254d3a7180a65cb33a808c43b70d4e6daa121ac9"
-        },
-        "recipe": {
-            "sha256": "1vrwzk6zqma7r0w5ivbx16shys6hsifj52fwlf5rxs6jg1gqdb4f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140303.657",
-        "deps": [
-            "cl-lib",
-            "deferred"
-        ]
-    },
-    "psession": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thierryvolpiatto",
-            "repo": "psession",
-            "sha256": "1b8w9wnrwk4j2gn543phz9qp8813ksqakr5pi509m6ijwcv0cp7b",
-            "rev": "e46ddd05c8d3a6e4cbcc11b62aa275e5de66f475"
-        },
-        "recipe": {
-            "sha256": "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151114.1306",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "elfeed-web": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "elfeed",
-            "sha256": "1ln0wprk8m2d33z804ld73jwv9x51xkwl9xfsywbh09w3x2zb51j",
-            "rev": "9fd3cf8833e26bf41f52a7e2149734858d2eeb96"
-        },
-        "recipe": {
-            "sha256": "14ydwvjjc6wbhkj4g4xdh0c3nh4asqsz8ln7my5vjib881vmaq1n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151222.1322",
-        "deps": [
-            "elfeed",
-            "emacs",
-            "simple-httpd"
-        ]
-    },
-    "osx-lib": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "raghavgautam",
-            "repo": "osx-lib",
-            "sha256": "1rha3qcv8k1y91w9p70fw0jfwyssiwxn85xz4jq1gd3nha126zw1",
-            "rev": "18ad53b6a3f9895f25dc2413bf448ded0fb6fdff"
-        },
-        "recipe": {
-            "sha256": "12wvki8jhzqsanxv5yqzjmfx6ifwz9ab9zh6r8nss86bk8864ix4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151221.2148",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "wgrep-pt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-wgrep",
-            "sha256": "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4",
-            "rev": "7ef26c51feaef8a5ec0929737130ab8ba326983c"
-        },
-        "recipe": {
-            "sha256": "1gphdf85spsywj3s3ypb7dwrqh0zd70n2vrbgjqkbnfbwqjp9qbg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140510.1731",
-        "deps": [
-            "wgrep"
-        ]
-    },
-    "cljr-helm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "philjackson",
-            "repo": "cljr-helm",
-            "sha256": "0ydv2prnw1j3m5nk23fqn4iv202kjswr8z0ip4zacdm8bl0q25ln",
-            "rev": "99c6dcc5228ecd2fe9e6e28a9512cbc3df0770ef"
-        },
-        "recipe": {
-            "sha256": "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150425.1507",
-        "deps": [
-            "clj-refactor",
-            "helm"
-        ]
-    },
-    "tt-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "davorg",
-            "repo": "tt-mode",
-            "sha256": "1gvqxk67cf779szyg907815i4m9jzrpmn5cnsmnwd62k3r3z4nxm",
-            "rev": "85ed3832e7eef391f7879d9990d59c7a3493c15e"
-        },
-        "recipe": {
-            "sha256": "02dzyycn5znbibbz50b243bh1kcccp8xwknjqwljk00gpf196vzf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130804.610",
-        "deps": []
-    },
-    "ansible": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k1LoW",
-            "repo": "emacs-ansible",
-            "sha256": "03d240jngxw51ybrsjw8kdxygrr0ymdckzwga2jr1bqf26v559j2",
-            "rev": "e9b9431738de4808d8ef70871069f68885cc0d98"
-        },
-        "recipe": {
-            "sha256": "1xdc05fdglqfbizra6s1zl6knnvaq526dkxqnw9g7w269j8f4z8g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151123.1953",
-        "deps": [
-            "f",
-            "s"
-        ]
-    },
-    "japanlaw": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "japanlaw.el",
-            "sha256": "08gkxxaw789g1r0dql11skz6i8bdrrz4wp87fzs9f5rgx99xxr6h",
-            "rev": "d90b204b018893d5d75286c92948c0bddf94cce2"
-        },
-        "recipe": {
-            "sha256": "1pxss1mjk5660k80r1xqgslnbrsr6r4apgp9abjwjfxpg4f6d0sa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150621.2341",
-        "deps": []
-    },
-    "smart-cursor-color": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "7696122",
-            "repo": "smart-cursor-color",
-            "sha256": "1xbd42q60pmg0hw4bn2fndjwgrfgj6ggm757fyp8m08jqh0zkarn",
-            "rev": "1d190f49ca77734b55ac58f1b6276e42ada967b0"
-        },
-        "recipe": {
-            "sha256": "11875pwlx2rm8d86541na9g3yiq0j472vg63mryqv6pzq3n8q6jx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141124.1119",
-        "deps": []
-    },
-    "link-hint": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "noctuid",
-            "repo": "link-hint.el",
-            "sha256": "0flskfrbq66wbygbp7x9da3fm88gf1nc92500jg6skks48w00xqn",
-            "rev": "cec4e90ffc9794fc9e25cbfcde9b5e1dd8328d09"
-        },
-        "recipe": {
-            "sha256": "12fb2zm9jnh92fc2nzmzmwjlhi64rhakwbh9lsydx9svsvkgcs89",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151031.1845",
-        "deps": [
-            "avy",
-            "emacs"
-        ]
-    },
-    "ox-gfm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "larstvei",
-            "repo": "ox-gfm",
-            "sha256": "0gfkb12rn40m71xv292dn3nj3h1bnn81698pinirp0nd8p4bvnin",
-            "rev": "dc324f0f4239e151744d59e784da748d4db4f6b8"
-        },
-        "recipe": {
-            "sha256": "065ngmzfd3g2h8n903hc4d363hz4z5rrdgizh2xpz03kf3plca6q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150604.226",
-        "deps": []
-    },
-    "ibuffer-git": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jrockway",
-            "repo": "ibuffer-git",
-            "sha256": "1s5qvlf310b0z7q9k1xhcf4qmyfqd37jpqd67ciahaxk7cp224rd",
-            "rev": "d326319c05ddb8280885b31f9094040c1b365876"
-        },
-        "recipe": {
-            "sha256": "048888y07bzmi9x5i43fg6bgqbzdqi3nfjfnn6zr29jvlx366r5z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20110508.231",
-        "deps": []
-    },
-    "golden-ratio-scroll-screen": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jixiuf",
-            "repo": "golden-ratio-scroll-screen",
-            "sha256": "18a7dv8yshspyq4bi30j0l4ap9qp696syfc29mgvly4xyqh9x4qm",
-            "rev": "585ca16851ac543da75d6ff61872565fb851a118"
-        },
-        "recipe": {
-            "sha256": "1ygh104vr65s7frlkzyhrfi6shrbvp2b2j3ynj5dip253v85xki5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151211.430",
-        "deps": []
-    },
-    "ewmctrl": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "flexibeast",
-            "repo": "ewmctrl",
-            "sha256": "1frhcgkiys0pqrlcsi5zcl3ngblr38wrwfi6wzqk75x21rnwnbqv",
-            "rev": "4e1ad0d54bccf2eddb7844eefb8253440aa80f28"
-        },
-        "recipe": {
-            "sha256": "1w60pb7szai1kh06jd3qvgpzq3z1ci4a77ysnpqjfk326s6zv7hl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150630.338",
-        "deps": []
-    },
-    "git-commit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "magit",
-            "sha256": "1wgy1rkaanqf382m7ijy90gpaiz2049mrmwlvwkr3hw3vgkffar8",
-            "rev": "c650d164a94adcd123ed28da7d413aee76cc9fe7"
-        },
-        "recipe": {
-            "sha256": "1i7122fydqga68cilgzir80xfq77hnrw75zrvn52mjymfli6aza2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151111.618",
-        "deps": [
-            "dash",
-            "emacs",
-            "with-editor"
-        ]
-    },
-    "flycheck-dedukti": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rafoo",
-            "repo": "flycheck-dedukti",
-            "sha256": "1hw875dirz041vzw1pxjpk5lr1zmrp2kp9m6pazs9j19d686hyn6",
-            "rev": "717977c0ead0dc6e267ba2164781d92ee016b7b2"
-        },
-        "recipe": {
-            "sha256": "00nc18w4nsi6vicpbqqpr4xcdh48g95vnay3kirb2xp5hc2rw3x8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150106.851",
-        "deps": [
-            "dedukti-mode",
-            "flycheck"
-        ]
-    },
-    "json-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joshwnj",
-            "repo": "json-mode",
-            "sha256": "0sxkp9m68rvff8dbr8jlsx85w5ngifn19lwhcydysm7grbwzrdi3",
-            "rev": "ce275e004dc7265047a80dec68b24eb058b200f0"
-        },
-        "recipe": {
-            "sha256": "014j10wgxsqy6d6aksnkz2dr5cmpsi8c7v4a825si1vgb4622a70",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151116.2200",
-        "deps": [
-            "json-reformat",
-            "json-snatcher"
-        ]
-    },
-    "tbx2org": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "istib",
-            "repo": "tbx2org",
-            "sha256": "1jp80qywcphql1ngd4fr24lqdfwrw0bw6q9hgq5vmzgjwfxwxwd4",
-            "rev": "08e9816ba6066f56936050b58d07ceb2187ae6f7"
-        },
-        "recipe": {
-            "sha256": "1yvkw65la4w12c4w6l9ai73lzng170wv4b8gry99m2bakw3wr8m8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140224.959",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "s"
-        ]
-    },
-    "edbi-minor-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "proofit404",
-            "repo": "edbi-minor-mode",
-            "sha256": "1lndz0qlmjvi9r2f1yzw217b971ym5jzfrddcd6rind1asrzl32a",
-            "rev": "afcbaf9e8264278e8526ca7509e6fc6bfd0d7937"
-        },
-        "recipe": {
-            "sha256": "0p7vdf9cp6i7mhjxj82670pfflf1kacalmakb7ssgigs1nsf3spi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150421.703",
-        "deps": [
-            "edbi"
-        ]
-    },
-    "fountain-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rnkn",
-            "repo": "fountain-mode",
-            "sha256": "07rmg994vhxws6r0sj27kipf6qvmz2qn5zr7z1mwfj4gkjh0c1cr",
-            "rev": "934243afbfa042643a973af1b6f26d7353517526"
-        },
-        "recipe": {
-            "sha256": "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151203.2321",
-        "deps": [
-            "emacs",
-            "s"
-        ]
-    },
-    "erc-tweet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kidd",
-            "repo": "erc-tweet.el",
-            "sha256": "118q4zj9dh5xnimcsi229j5pflhcd8qz0p212kc4p9dmyrx2iw0n",
-            "rev": "91fed61e139fa788d66a7358f0d50acc896414b8"
-        },
-        "recipe": {
-            "sha256": "0bazwq21mah4qrzwaji6w13m91l6v9dqh9svxrd13ij8yycr184b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150920.758",
-        "deps": []
-    },
-    "ace-jump-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "winterTTr",
-            "repo": "ace-jump-mode",
-            "sha256": "17axrgd99glnl6ma4ls3k01ysdqmiqr581wnrbsn3s4gp53mm2x6",
-            "rev": "8351e2df4fbbeb2a4003f2fb39f46d33803f3dac"
-        },
-        "recipe": {
-            "sha256": "0yk0kppjyblr5wamncrjm3ym3n8jcl0r0g0cbnwni89smvpngij6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140616.315",
-        "deps": []
-    },
-    "tommyh-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wglass",
-            "repo": "tommyh-theme",
-            "sha256": "0pwbd5gzmpr6js20438870w605671930291070nhmhswvxfcdvay",
-            "rev": "46d1c69ee0a1ca7c67b569b891a2f28fed89e7d5"
-        },
-        "recipe": {
-            "sha256": "0nb9r407h08yxxdihxqx0c645bcz6qywbh2l654s3zfzdsqi1aj4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131004.1830",
-        "deps": []
-    },
-    "ob-translate": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "krisajenkins",
-            "repo": "ob-translate",
-            "sha256": "1yaqs6zcx8228pwzsm19h6272bw9lhib6xz5xzzq8x8n54l81225",
-            "rev": "c068f8710ec3019a345b7dc5a5433bee23c87afb"
-        },
-        "recipe": {
-            "sha256": "1hi0rxbyxvk9sbk2fy3kqw7l4lgri921vya1mn4i1q2i1979r2gz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130718.929",
-        "deps": [
-            "google-translate",
-            "org"
-        ]
-    },
-    "lush-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "andre-richter",
-            "repo": "emacs-lush-theme",
-            "sha256": "0mv73s89n59m44szc37086wq55py5sx0lc0jxncfybawhsqyd0ar",
-            "rev": "3b80004f33cdce9f4db69e9ccf2041561e98985d"
-        },
-        "recipe": {
-            "sha256": "03kqws8dzm0ay5k86f4v7g2g2ygwk4fzmz2vyzhzhbsj8hrniq9p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141107.1006",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "meacupla-theme": {
-        "fetch": {
-            "tag": "fetchFromGitLab",
-            "owner": "jtecca",
-            "repo": "meacupla-theme",
-            "sha256": "136lh39hakwx46rd1gsmsfhsj78mrpamid766v2vjx9rkkprk0zv",
-            "rev": "f57542222a3a43af9aae665e05a84a61637ab22a"
-        },
-        "recipe": {
-            "sha256": "09q88q2xghj5vn5y3mjrcparfwdzavkgjyg2ay55h7wf5f2zpw2d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151027.1717",
-        "deps": []
-    },
-    "jumblr": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mkmcc",
-            "repo": "jumblr",
-            "sha256": "1f0kai4cz3r25fqlnryyvnyf80cf57xa655dvv1rx8si3xd20x4j",
-            "rev": "705c7286e09a307b2b7f60072a12ed45325657c0"
-        },
-        "recipe": {
-            "sha256": "1wnawz1m6x95iyzac453p55h7hlr5q0ry5437aqqx0bw7gdwg3dp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140908.1552",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "ox-trac": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "JalapenoGremlin",
-            "repo": "ox-trac",
-            "sha256": "0w6963jvz1sk732nh18735dxivd6nl59jd4m26ps6l4wqhqby0db",
-            "rev": "2f2f70eefb9679025ae5812e221f0c118da36012"
-        },
-        "recipe": {
-            "sha256": "0f8b3i83vzxzfa91p4ahlqz6njql18xy5nk265sjxpy9zr898rsa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151102.1155",
-        "deps": [
-            "org"
-        ]
-    },
-    "plim-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dongweiming",
-            "repo": "plim-mode",
-            "sha256": "07hspp4bkb3f5dm0l1arm0w1m04cq4glg81x4a9kf7bl601wzki2",
-            "rev": "92e39190286f172567ceb02c80e1df3b81abfa2d"
-        },
-        "recipe": {
-            "sha256": "0247fpvxki5jhxw6swv7pcw0qwxrqnp75acnfss2lf984vggzhxi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140812.1913",
-        "deps": []
-    },
-    "default-text-scale": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "default-text-scale",
-            "sha256": "1ysv1q7n7k2l4x8x7hlzmxmawyxl5lx627sbdv3phkvjh5zccsm8",
-            "rev": "c680861a459e5a1b4cea0da1b99d2a22f08fdcd2"
-        },
-        "recipe": {
-            "sha256": "18r90ic38fnlsbg4gi3r962vban398x2bf3rqhrc6z4jk4aiv3mi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150227.1156",
-        "deps": []
-    },
-    "shm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chrisdone",
-            "repo": "structured-haskell-mode",
-            "sha256": "1cr83az4xm20i2v8bd5dbqll3d8vhjb3m2ypzwbxlizjcxpa638c",
-            "rev": "a305ca94059d31c60d549494756d5b4eabec20b0"
-        },
-        "recipe": {
-            "sha256": "1qmp8cc83dcz25xbyqd4987i0d8ywvh16wq2wfs4km3ia8a2vi3c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151127.133",
-        "deps": []
-    },
-    "strings": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/strings.el",
-            "sha256": "0svvgrssd4r027d25g167lf9cpks3la5zhvyd50gjrhryyxkf225"
-        },
-        "recipe": {
-            "sha256": "0n3239y7biq3rlg74m7nqimhf654w4snnw2zm7z84isgwzz2dphk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150805.1752",
-        "deps": []
-    },
-    "ssh-tunnels": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "death",
-            "repo": "ssh-tunnels",
-            "sha256": "10a5havjg4yjshpfzkhgjdwbrvl44narg09ddzynczmyzm4f01wh",
-            "rev": "b08ba7a560ba5b16aa95c3cc17ed6fea59529cc4"
-        },
-        "recipe": {
-            "sha256": "0zlf22wg9adkhycsasv6bfim2h0cknsvihyi1q2l2l4pjdp9ypqj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141219.518",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "tramp-hdfs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "raghavgautam",
-            "repo": "tramp-hdfs",
-            "sha256": "057a3z42j4s0npl35p5rl6n767s2wq0a3c49wii3f1w8p40fh7qc",
-            "rev": "4a3ccaf931ecffeae283cb1766425afbc0f81101"
-        },
-        "recipe": {
-            "sha256": "1l7s2z8yk3cbnffig9fds75jkjlkng76qglx5ankzva61dz1kf2b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151028.2236",
-        "deps": []
-    },
-    "handlebars-sgml-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jacott",
-            "repo": "handlebars-sgml-mode",
-            "sha256": "1z37di9vk1l35my8kl8jnyqlkr1rnp0iz13hpc0r065mib67v58k",
-            "rev": "c76df93a9a8c1b1b3efdcc4add32bf93304192a4"
-        },
-        "recipe": {
-            "sha256": "10sxm7v94yxa92mqbwj3shqjs6f3zbxjvwgbvg9m2fh3b7xj617w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130623.1833",
-        "deps": []
-    },
-    "iy-go-to-char": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/iy-go-to-char.el",
-            "sha256": "19l9d5gp1xj40iyy35r8hh7v6bjnzjx7pb8dvwrmndzg0rlsp7mi"
-        },
-        "recipe": {
-            "sha256": "055qj2pc32l824vyjl2w2j8c3rpd9g4x0sazi8svqf923lgcs5s8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141029.1049",
-        "deps": []
-    },
-    "git-gutter-fringe": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-git-gutter-fringe",
-            "sha256": "0vc1da72vwlys723xi7xvv4ii43sjxgsywb2ss0l0kcm0rays6lv",
-            "rev": "62accbd227b17073d623faa4cc472280fc45f53e"
-        },
-        "recipe": {
-            "sha256": "14wyiyyi2rram2sz3habvmygy5a5m2jfi6x9fqcyfr3vpcjn1k4i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150331.2339",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "fringe-helper",
-            "git-gutter"
-        ]
-    },
-    "flim": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wanderlust",
-            "repo": "flim",
-            "sha256": "1w913kw4b3dipawn567847jxl89j0prnf6656yqi2rp96axx3lhp",
-            "rev": "60fa2c74a72358658603480addc75b1d23f6431a"
-        },
-        "recipe": {
-            "sha256": "1gkaq549svflx8qyqrk0ccb52b7wp17wmd5jgzkw1109bpc4k6jc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151213.150",
-        "deps": [
-            "apel"
-        ]
-    },
-    "molokai-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alloy-d",
-            "repo": "color-theme-molokai",
-            "sha256": "1hqa59pdrnwfykyl58lr8pfbh2f13sygvmrh707hbwc2aii0jjv2",
-            "rev": "04a44f21184b6a26caae4f2c92db9019d883309c"
-        },
-        "recipe": {
-            "sha256": "0srdh3yx7j6xs7rgpzmsyzz6ds00kq887rs2sfa0nvk0j0ga6baf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151016.1045",
-        "deps": []
-    },
-    "emms": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://git.sv.gnu.org/emms.git",
-            "sha256": "6e653c3b44442e21ec6e4410d8b9c0e51b2f03ed1ae62c1bb1a2ffa6c8c144da",
-            "rev": "489df29303fc89d4f80bffae91ad53f937ccd59a"
-        },
-        "recipe": {
-            "sha256": "0kzli8b0z5maizfwhlhph1f5w3v6pwxvs2dfs90l8c0h97m4yy2m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151211.1353",
-        "deps": []
-    },
-    "diffscuss-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hut8labs",
-            "repo": "diffscuss",
-            "sha256": "14ccak3cmv36pd085188lypal9gd3flyikcrxn0wi6hn60w2dgvr",
-            "rev": "e0aacd8b3d9f886f27222c1397f0655e849e0af7"
-        },
-        "recipe": {
-            "sha256": "06jd7wh4yzryz0yjwa4a0xddz7srl5mif8ff1wvcpxsb66m2zbvh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141014.1857",
-        "deps": []
-    },
-    "flyspell-lazy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "flyspell-lazy",
-            "sha256": "1g09s57b773nm9xqslzbin5i2h18k55nx00s5nnkvx1qg0n0mzkm",
-            "rev": "31786fe04a4732d2f845e1c7e96fcb030182ef10"
-        },
-        "recipe": {
-            "sha256": "0lzazrhsfh5m7n57dzx0v46d5mg87wpwwkjzf5j9gpv1mc1xfg1y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141222.852",
-        "deps": []
-    },
-    "insert-shebang": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "psachin",
-            "repo": "insert-shebang",
-            "sha256": "1np3ih2bz9831p97rx5bssq78grjxj7f9241z372l6ggimrqhkbx",
-            "rev": "a6e520280b1cb64d70adba2ba38dd9b728960b36"
-        },
-        "recipe": {
-            "sha256": "0z88l1q925v9lwzr6nas9qjy0f57qxilg6smgpx9wj6lll3f7p5v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141119.627",
-        "deps": []
-    },
-    "anything-exuberant-ctags": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k1LoW",
-            "repo": "anything-exuberant-ctags",
-            "sha256": "0dbf510gcd0m191samih0r4lx6d7sgk0ls0sx2jrdkyacy82ridy",
-            "rev": "8ed688fd526751e044435bb77135f5315c8167e5"
-        },
-        "recipe": {
-            "sha256": "0p0jq2ggdgaxv2gd9m5iza0y3mjjc82xmgp899yr15pfffa4wihk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140316.1837",
-        "deps": [
-            "anything"
-        ]
-    },
-    "py-autopep8": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "paetzke",
-            "repo": "py-autopep8.el",
-            "sha256": "06xdq2slwhkcqlbv7x86zmv55drzif9cwjlj543cwhncphl2x9rd",
-            "rev": "685414b19106b99a4384fa0c9ce4817c659e0e81"
-        },
-        "recipe": {
-            "sha256": "1argjdmh0x9c90zkb6cr4z3zkpgjp2mkpsw0dr4v6gg83jcggfpp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150420.621",
-        "deps": []
-    },
-    "syntax-subword": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/jpkotta/syntax-subword",
-            "sha256": "1p9bp09nibw7rra3r6nj496zdx09db6k82dxnxs1lfgdiswfdq2h",
-            "rev": "a1e0accb754d"
-        },
-        "recipe": {
-            "sha256": "1as89ffqz2h69fdwybgs5wibnrvskm7hd58vagfjkla9pjlpffpm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150415.1426",
-        "deps": []
-    },
-    "nyan-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "TeMPOraL",
-            "repo": "nyan-mode",
-            "sha256": "1v8ndr8hdbqhd7nca8882g05y36pigv6lj7hpxl50lr1lvp1kmmf",
-            "rev": "eb940664cbca6165644d97989f402c8c5bd0e384"
-        },
-        "recipe": {
-            "sha256": "1z2wnsbjllqa533g1ab5cgbv3d9hjix7fsd7z9c45nqh5cmadmyv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151018.35",
-        "deps": []
-    },
-    "repeatable-motion": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "willghatch",
-            "repo": "emacs-repeatable-motion",
-            "sha256": "007lqahjbig6yygqik6fgbq114784z6l40a3vrc4qs9361zqizck",
-            "rev": "e664b0a4a3e39c4085378a28b5136b349a0afb22"
-        },
-        "recipe": {
-            "sha256": "12z4z8apd8ksf6dfvqm54l71mx68j0yg4hrjypa9p77fpcd6p0zw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150629.1312",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "libmpdee": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "andyetitmoves",
-            "repo": "libmpdee",
-            "sha256": "0hazcizn8cjk9casax6xav19yi850ip7xwcasj597lmlmk0p01an",
-            "rev": "3f057bf21f5d2e4b70ee551a970aa49d67042db8"
-        },
-        "recipe": {
-            "sha256": "0z4d8y8jlsjw20b31akkaikh5xl0c05lj77d2i1xbgzam4iixma0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150131.1557",
-        "deps": []
-    },
-    "abc-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mkjunker",
-            "repo": "abc-mode",
-            "sha256": "1h4gwp2gyd4jhbkb8ai1zbzhhmlhmihbwzr0wsxg5yq074n72ifs",
-            "rev": "1dd6e1217136a6f986917a3e5f41c1007bac908d"
-        },
-        "recipe": {
-            "sha256": "0qf5lbszyscmagiqhc0d05vzkhdky7ini4w33z1h3j5417sscrcx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140225.1144",
-        "deps": []
-    },
-    "enotify": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "laynor",
-            "repo": "enotify",
-            "sha256": "0v5p97dvzrk3j59yjc6iny71j3fdw9bb8737wnnzm098ff42dfmd",
-            "rev": "7fd2f48ef4ff32c8f013c634ea2dd6b1d1409f80"
-        },
-        "recipe": {
-            "sha256": "0mii6m6zw9y8njgzi79rcf1n251iw7qz3yqjjij3c19rk3zpm5qi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130407.848",
-        "deps": []
-    },
-    "unidecode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sindikat",
-            "repo": "unidecode",
-            "sha256": "1jvr1k8zd40m1rvwmxzidz1dvr4j8cbh78nqgc3vfb410fj619gw",
-            "rev": "9e279e88a689584027d5a1b088fe5def25d0f75c"
-        },
-        "recipe": {
-            "sha256": "0h058mvb6x53zywpwg85dzhaynlgq577yyqhrn5qqyqjg1n8lhc1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140317.2318",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "org-outlook": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "org-outlook.el",
-            "sha256": "10dddbs9jppqqzwwv5y6pj2szdkw3223gvzzd4pzn9biv5d9kzsb",
-            "rev": "b7978fedb0d50c1a3e499bf7e98b5cc526028cd4"
-        },
-        "recipe": {
-            "sha256": "0cn8h6yy67jr5h1yxsfqmr8q7ii4f99pgghfp821m01pj55qyjx9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150914.747",
-        "deps": []
-    },
-    "highlight2clipboard": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Lindydancer",
-            "repo": "highlight2clipboard",
-            "sha256": "06nnqry36ncqacfzd8yvc4q59bwk3vgf9a14rkpph2hk2rfvq2m6",
-            "rev": "6ce58a060d9c5843ccb8c79ec2bba7858c68ac15"
-        },
-        "recipe": {
-            "sha256": "19r7abbpm31b0azf2v3xn0rjagg9h01i8g72qapp8dhqb4d9n9r0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151020.1340",
-        "deps": [
-            "htmlize"
-        ]
-    },
-    "orgtbl-ascii-plot": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tbanel",
-            "repo": "orgtblasciiplot",
-            "sha256": "1vbnp37xz0nrpyi0hah345928zsb1xw915mdb0wybq1fzn93mp1z",
-            "rev": "cd91f6ae26a7402e192a1f4fd6248f5797edf19e"
-        },
-        "recipe": {
-            "sha256": "1ssjbdprbn34nsfx1xjc382l2195rbh8mybpn31d4kcjx6fqf78h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151215.1551",
-        "deps": []
-    },
-    "kill-ring-search": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nschum",
-            "repo": "kill-ring-search.el",
-            "sha256": "0yrc09k64rv5is4wvss938mkj2pkvbr98lr3ahsi7p0aqn7s444v",
-            "rev": "23535b4a01a1cb1574604e36c49614e84e85c883"
-        },
-        "recipe": {
-            "sha256": "1pg4j1rrji64rrdv2xpwz33vlyk8r0hz4j4fikzwpbcbmni3skan",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140422.1055",
-        "deps": []
-    },
-    "soothe-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jasonm23",
-            "repo": "emacs-soothe-theme",
-            "sha256": "10gh1hvxq9gm29r6qzlnva7vjidd7n4kih4z2ihyvbvy9za20xqw",
-            "rev": "0786fe70c6c1b4ddcfb932fdc6862b9611cfc09b"
-        },
-        "recipe": {
-            "sha256": "000hikpsmqpbb6v13az2dv319d0f7jjpkkpgi4vzv59z6cdlrlp3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141027.941",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "cider-spy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jonpither",
-            "repo": "cider-spy",
-            "sha256": "1hvvfp58x269yapnayxwyclgqy52azf76rb703mlfqivj1gzd7p3",
-            "rev": "6913a52c4ee781c5325074af05fcdfab864d6c41"
-        },
-        "recipe": {
-            "sha256": "0478jlg76h0mrjwk2b1kdj16s1q1b03b7ygacai45jh89bc025fh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151123.946",
-        "deps": [
-            "cider",
-            "cl-lib",
-            "dash"
-        ]
-    },
-    "plan9-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "john2x",
-            "repo": "plan9-theme.el",
-            "sha256": "18i8n0v1a3z82dbn29m2h1vb5anvpbvzd9zwn7ffaq01pi0fj2p9",
-            "rev": "0136d0bf1074cf64f305b4396edcf0f54a90436f"
-        },
-        "recipe": {
-            "sha256": "0bvr877mc79s1shr82b33ipspz09jzc3809c6pkbw0jqpfid44cc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151214.745",
-        "deps": []
-    },
-    "visual-ascii-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Dewdrops",
-            "repo": "visual-ascii-mode",
-            "sha256": "1cv8mf3l92a9p8qmkfiphk3r81f2ihg2gyw2r4jbbd5ppwbxkl0n",
-            "rev": "99285a099a17472ddd9f1b4f74e9d092dd8c5947"
-        },
-        "recipe": {
-            "sha256": "1h0143h39dq61afswlzlgpknk0gv574x91ar6klqmnaf1snab59g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150129.446",
-        "deps": []
-    },
-    "helm-go-package": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yasuyk",
-            "repo": "helm-go-package",
-            "sha256": "1r01nl1k9jjb70214rkmbqaa4qrkyd3apiyq00w02wsymy12wwic",
-            "rev": "1909156510a4e73697a86b8c040d38e4d352851a"
-        },
-        "recipe": {
-            "sha256": "102yhn1xg83l67yaq3brn35a03fkvqqhad10rq0h39n4i1slq3z6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150603.804",
-        "deps": [
-            "deferred",
-            "go-mode",
-            "helm"
-        ]
-    },
-    "scala-outline-popup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ancane",
-            "repo": "scala-outline-popup",
-            "sha256": "1wf3d5spvi9kr4q2w7f18g1bm10fh2zbh4sdbqkf78afv6sbqzrz",
-            "rev": "47e92a1a7738738164d7657ee324bc382a383985"
-        },
-        "recipe": {
-            "sha256": "1fq0k6l57wkya1ycm4cc190kg90j2k9clnl0sc70achp4i47qbk7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150702.1137",
-        "deps": [
-            "dash",
-            "flx-ido",
-            "popup",
-            "scala-mode2"
-        ]
-    },
-    "http-twiddle": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hassy",
-            "repo": "http-twiddle",
-            "sha256": "008iq5fhsw4qklw2l457a1cfqq8diadpnf1c1di5p07sc0za5562",
-            "rev": "bbf025b0f57068fe0fb3f1fbc2f6fd7bf0d65992"
-        },
-        "recipe": {
-            "sha256": "153qavpcwvk2g15w5a814xjsnsv54xksx4iz6yjffvvzq14a08ry",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151121.744",
-        "deps": []
-    },
-    "vagrant-tramp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dougm",
-            "repo": "vagrant-tramp",
-            "sha256": "075q3ib1skk0437hb4wmmhf6sz1g72bj12qcf5waj2xk09swqfgy",
-            "rev": "dc9202c1420d5d6eaf0efde4a9b548248ce42d33"
-        },
-        "recipe": {
-            "sha256": "0ij7k27zj22sl7inx141l4dg0ymywnvyabjvaqzc0xjdj0cky5c5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151018.1723",
-        "deps": [
-            "dash"
-        ]
-    },
-    "typing-game": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lujun9972",
-            "repo": "el-typing-game",
-            "sha256": "0i5pipciwsl6cj3inxiz6ybkv5jglacjwhcyqdfzi4mrbic7g848",
-            "rev": "b58c19a4a14895cc24ce01a73cf624b5c54a12b8"
-        },
-        "recipe": {
-            "sha256": "0k85j9bcqp0gbzdh44q5a9wlkv5mc0g0m42ziq1bzmp6993wkmy2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151111.940",
-        "deps": []
-    },
-    "symon": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "symon",
-            "sha256": "1mb068vgf0bbj0bdxjhd6c794bwc3wp7r6q1s49w8b24g1pfrjkq",
-            "rev": "48dfbd86981e709ebcf055832bb48a7f212ac842"
-        },
-        "recipe": {
-            "sha256": "11llnvngyc3xz8nd6nj86ism0hhs8p54wkscvs4yycbakbyn61lz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151118.300",
-        "deps": []
-    },
-    "edbi-django": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "proofit404",
-            "repo": "edbi-django",
-            "sha256": "0jlr1da26jkrgadaznxjynjqbg4cpnq7gda3qab2qqrjzzi8cfia",
-            "rev": "9cdf6d7a45402d41551c1e17edd7a29a8520f102"
-        },
-        "recipe": {
-            "sha256": "1s59hab35hwnspyklxbhi0js0sgdn0rc7y33dqjk0psjcikqymg1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150115.1301",
-        "deps": [
-            "edbi",
-            "emacs",
-            "f"
-        ]
-    },
-    "smart-tabs-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jcsalomon",
-            "repo": "smarttabs",
-            "sha256": "1s65hr7b8aggvdd1i6gkkpz6j1kqilggfnf46xvjnvdw9awmwk6b",
-            "rev": "cd19892677ec9a2c378c828aa7cef9a2b2bd1c0e"
-        },
-        "recipe": {
-            "sha256": "1fmbi0ypzhsizzb1vm92hfaq23swiyiqvg0pmibavzqyc9lczhhl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140331.1829",
-        "deps": []
-    },
-    "amd-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "NicolasPetton",
-            "repo": "amd-mode.el",
-            "sha256": "12vjjdyxmm6ky8d7xbsg0pmfam12vzghzzr3j6klji01i8lxmh74",
-            "rev": "17eefc009e26769fa0e81936bcbea9d9ea42954f"
-        },
-        "recipe": {
-            "sha256": "17ry6vm5xlmdfs0mykdyn05cik38yswq5axdgn8hxrvvb6f58d06",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151214.318",
-        "deps": [
-            "dash",
-            "f",
-            "js2-mode",
-            "js2-refactor",
-            "makey",
-            "projectile",
-            "s"
-        ]
-    },
-    "lua-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "immerrr",
-            "repo": "lua-mode",
-            "sha256": "1psk4202rmkkfy1ir1ax4x4djfngd5pfry7x30ybq2ifqzymb9qb",
-            "rev": "bdf121b2c05bc74d3d7961a91d7afeb6176e0f45"
-        },
-        "recipe": {
-            "sha256": "0gyi7w2h192h3pmrhq39lxwlwd9qyqs303lnp2655pikdzk9js94",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151025.730",
-        "deps": []
-    },
-    "ace-window": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "ace-window",
-            "sha256": "053074jyinr3a2zkr1jfgmizdbhk5s37vrvf490x2hwf19dzis4a",
-            "rev": "f6653fb5d8bfe8d7bcad94fc72ca9561e28180f0"
-        },
-        "recipe": {
-            "sha256": "1k0x8m1phmvgdxb5aj841iai9q96a5lfq8i4b5vnlbc3w888n3xa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150803.1037",
-        "deps": [
-            "avy"
-        ]
-    },
-    "origami": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gregsexton",
-            "repo": "origami.el",
-            "sha256": "0p53l0s8rxr8v77kj83qjrbln7nck16q0zgdp4sqmqb1121ily48",
-            "rev": "56140b4d3f9f2694ab1e8869972a19bd7f3e12e1"
-        },
-        "recipe": {
-            "sha256": "0rkb55zcvsgxzp190vrnbzdfbcjd8zi6vhbhwpqxi0qmyq6a08pr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150822.650",
-        "deps": [
-            "dash",
-            "emacs",
-            "s"
-        ]
-    },
-    "ace-popup-menu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mrkkrp",
-            "repo": "ace-popup-menu",
-            "sha256": "0ffkdq94slfy8w73bznc7bcy4amylhsh2nk2vvdwwqmxmviirlnq",
-            "rev": "92cac2f656b5000d2f267ffaa92a275f40a2719d"
-        },
-        "recipe": {
-            "sha256": "1cq1mpv7v98bqrpsm598krq1741b6rwih71cx3yjifpbagrv4m5s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150910.727",
-        "deps": [
-            "avy",
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "zoom-window": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-zoom-window",
-            "sha256": "1kl01dlggsrffvakmwixw9j8cncdmlsw805wvzls6l1711r1zjwj",
-            "rev": "45ae8d0f47af351d73daeb6cecc366ea7eb49a88"
-        },
-        "recipe": {
-            "sha256": "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151206.2305",
-        "deps": []
-    },
-    "shell-current-directory": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "metaperl",
-            "repo": "shell-current-directory",
-            "sha256": "1w42j5cdddr0riz1xjq3wiz5i9f71i9jdzd1l92ir0mlj05wjyic",
-            "rev": "bf843771bf9a4aa05e054ade799eb8862f3be89a"
-        },
-        "recipe": {
-            "sha256": "0bj2gs96ivm5x8l7gwvfckyalr1amh4cb1v2dbl323zmrqddhgkd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140101.1754",
-        "deps": []
-    },
-    "ghc-imported-from": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "david-christiansen",
-            "repo": "ghc-imported-from-el",
-            "sha256": "1ywwyc2kz1c1s26c412nmzh55cinh84cfiazyyi3jsy5zzwhrbhi",
-            "rev": "fcff08628a19f5d26151564659218cc677779b79"
-        },
-        "recipe": {
-            "sha256": "10cxz4c341lknyz4ns63bri00mya39278xav12c73if03llsyzy5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141124.1332",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "elhome": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "demyanrogozhin",
-            "repo": "elhome",
-            "sha256": "0rdhnnyn0xsmnshnf289kxk974r57i6nx0vii1w36j6p6q0b7f9h",
-            "rev": "af112592fbc41a625d1d17828db78357df23c127"
-        },
-        "recipe": {
-            "sha256": "1k7936wxgslr29511dz9az38i9vi35rcxk68gzv35v9lpj89lalh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131202.1308",
-        "deps": [
-            "initsplit"
-        ]
-    },
-    "company-emoji": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dunn",
-            "repo": "company-emoji",
-            "sha256": "1lm26av6z18p70gxz23h87l25airawljr5lm7hw6krg706cp3aq6",
-            "rev": "c3665bf150c43a1c9830e817cf6de950be8c0fde"
-        },
-        "recipe": {
-            "sha256": "1mflqqw9gnfcqjb6g8ivdfl7s4mdyjg7j0457hamgyvgvpxsh8x3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151108.20",
-        "deps": [
-            "cl-lib",
-            "company"
-        ]
-    },
-    "stickyfunc-enhance": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tuhdo",
-            "repo": "semantic-stickyfunc-enhance",
-            "sha256": "16dxjsr5nj20blww4xpd4jzgjprzzh1nwvb810ggdmp9paf4iy0g",
-            "rev": "13bdba51fcd83ccbc3267959d23afc94d458dcb0"
-        },
-        "recipe": {
-            "sha256": "13dh19c3bljs83l847syqlg07g33hz6sapg6j4s4xv4skix8zfks",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150429.1314",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "pylint": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/logilab/pylint",
-            "sha256": "0rgik6478hbvnjdvhyfvp0kz4g80jig1cbvxaqp3amc4nhxqbcpb",
-            "rev": "467e659fd2eb"
-        },
-        "recipe": {
-            "sha256": "1y8xz04spn7a4fjnfv82hamk1mrc3a1iilf5nrl40nlg2xgp1h63",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150123.1800",
-        "deps": []
-    },
-    "org-password-manager": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "leafac",
-            "repo": "org-password-manager",
-            "sha256": "0v2b7byr56v4pffva93d80cppp3xk8nj3987vpwmczqiq5by1pc8",
-            "rev": "b13f63aa4efca47e92cfe52865e99f230851fa03"
-        },
-        "recipe": {
-            "sha256": "1l3h0qhv0ad9l933d47as8y3h9x94zw315ax4qsgiw3046nzkdwv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150729.1715",
-        "deps": [
-            "org",
-            "s"
-        ]
-    },
-    "graphene-meta-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rdallasgray",
-            "repo": "graphene-meta-theme",
-            "sha256": "1bidfn4x5lb6dylhadyf05g4l2k7jg83mi058cmv76av1glawk17",
-            "rev": "5d848233ac91c1e3560160a4eba60944f5837d35"
-        },
-        "recipe": {
-            "sha256": "1cqdr93lccdpxkzgap3r3qc92dh8vqgdlnxvqkw7lrcbs31fvf3q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151108.400",
-        "deps": []
-    },
-    "e2wm-term": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "e2wm-term",
-            "sha256": "0qv3kh6q3q7vgfsd8x25x8agi3fp96dkpjnxdidkwk6k8h9n0jzw",
-            "rev": "65b5ac88043d5c4048920a048f3599904ca55981"
-        },
-        "recipe": {
-            "sha256": "0wrq06yap80a96l9l0hs7x7rng7sx6vi1hz778kknb6il4f2f45g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141009.808",
-        "deps": [
-            "e2wm",
-            "log4e",
-            "yaxception"
-        ]
-    },
-    "files+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/files+.el",
-            "sha256": "0yl98k1yxmqidyc08dn20dmqkb450xnanqr0iqs01z3q6agpqc0v"
-        },
-        "recipe": {
-            "sha256": "1m1pxf6knrnyc9ygmyr27gm709ydxf0kkh1xrfcza6n476frmwr8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151215.858",
-        "deps": []
-    },
-    "tracwiki-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "merickson",
-            "repo": "tracwiki-mode",
-            "sha256": "1m25l1lyff4h0h4vjrcsziwbf8svqg2llvvgl8i2b4jbh7k7pk5f",
-            "rev": "6a620444d59b438f42383b48cd4c19c03105dba6"
-        },
-        "recipe": {
-            "sha256": "1k983f0lj42rxr5szpq9l9harykfn8jr13y3y6fav86zzd1fb8j0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150119.1021",
-        "deps": [
-            "xml-rpc"
-        ]
-    },
-    "x86-lookup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "x86-lookup",
-            "sha256": "13id1vf590gc0kwkhh6mgq2gj2bra2kycxjlvql7v0s7cdvamjhq",
-            "rev": "cac42bd9f27bff92e0b1cf6fb20563061885239f"
-        },
-        "recipe": {
-            "sha256": "1clv1npvdkzsy0a08xrb880yflwzl4d5cc2c5xrs7b837mqpj8hd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151118.732",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "badwolf-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bkruczyk",
-            "repo": "badwolf-emacs",
-            "sha256": "1plh7i4zhs5p7qkv7p7lnfrmkszn8b3znwvbxgp7wpxay5safc5j",
-            "rev": "24a557f92a702f632901a5b7bee59945a0a8cde9"
-        },
-        "recipe": {
-            "sha256": "03plkzpmlh0pgfp1c9padsh4w2g23clsznym8x4jabxnk0ynhq41",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151215.1125",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "cursor-test": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ainame",
-            "repo": "cursor-test.el",
-            "sha256": "0wmnhizv4jfcl1w9za4ydxf6xwxgm5vwmn1zi5vn70zmv4d6r49l",
-            "rev": "e09956e048b88fd2ee8dd90b5678baed8b04d31b"
-        },
-        "recipe": {
-            "sha256": "1c1d5xq4alamlwyqxjx557aykz5dw87acp0lyglsrzzkdynbwlb1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131207.1132",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "sunshine": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aaronbieber",
-            "repo": "sunshine.el",
-            "sha256": "1x3ivhwyapxw7v3ygam3bn2i9djrsp9mcd5zdn8q84c583ppanll",
-            "rev": "8783923f0aa4b835b90359443b941b10758c28d7"
-        },
-        "recipe": {
-            "sha256": "1lxiqw7k8cpq0v6p5whgxgzqrbx3sd9174r0d4qlkrpn6rcp44vv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151013.814",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "smart-mark": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cheunghy",
-            "repo": "smart-mark",
-            "sha256": "0sqvm7iwdjk057fwid4kz6wj71igiqhdarj59s17pzy6xz34afhg",
-            "rev": "04b522a23e3aae8381c6a976fc978532fcb2e7d0"
-        },
-        "recipe": {
-            "sha256": "1vv65sa0pwl407mbxcp653kycgx8jz87n6wshias1dp9lv21pj6v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150911.2110",
-        "deps": []
-    },
-    "region-bindings-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fgallina",
-            "repo": "region-bindings-mode",
-            "sha256": "02kfi3c6ydnr7xw611ck66kfjyl5w86dr9vfjv3wjl6ad9jya4zy",
-            "rev": "3fa5dbdbd7c000bebff6d9d14a4be326ec24b6fc"
-        },
-        "recipe": {
-            "sha256": "141q4x6rilidpnsm9s78qks9i1v6ng0ydhbzqi39xcaccfyyjb69",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140407.1714",
-        "deps": []
-    },
-    "rspec-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pezra",
-            "repo": "rspec-mode",
-            "sha256": "1rgy4jp1ydvwxb83qmbn1wwscgdqn9pfjw8788n4rg1l2ypb8w0s",
-            "rev": "fc3bb819136966b1d1bd31335724d702132fff0b"
-        },
-        "recipe": {
-            "sha256": "0nyib9rx9w9cbsgkcjx9n8fp77xkzxg923z0rdm3f9kc7njcn0zx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151217.2046",
-        "deps": [
-            "cl-lib",
-            "ruby-mode"
-        ]
-    },
-    "mb-url": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dochang",
-            "repo": "mb-url",
-            "sha256": "1qd4vya49sy7iwcpnyd91d0zx3niwsavhdcq6387rsb0j64hwybl",
-            "rev": "e1d9af92f8f3c4fc96760558ee1a4df7bbbc537c"
-        },
-        "recipe": {
-            "sha256": "1nf8ssan00qsn3d4dc6h6qzdwqzh977qb5d2m33kiwi6qb98988h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151210.1216",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "shell-toggle": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knu",
-            "repo": "shell-toggle.el",
-            "sha256": "0ssaccdacabpja9nqzhr8x8ggfwmlian7y4p0fa6gvr7qsvjpgr9",
-            "rev": "0d01bd9a780fdb7fe6609c552523f4498649a3b9"
-        },
-        "recipe": {
-            "sha256": "1ai0ks7smr8b221j9hmsikswpxqraa9b13fpwv4wwagavnlah446",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150226.811",
-        "deps": []
-    },
-    "idomenu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "birkenfeld",
-            "repo": "idomenu",
-            "sha256": "1vx2g1xgxpcabr49mkl6ggzrpa3k2zhm479j6262vb64swzx33jw",
-            "rev": "4b0152d606360c70204fb4c27f68de79ca885386"
-        },
-        "recipe": {
-            "sha256": "0mg601ak9mhp2fg5n13npcfzphgyms4vkqd18ldmv098z2z1412h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141123.1520",
-        "deps": []
-    },
-    "unicode-troll-stopper": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "camsaul",
-            "repo": "emacs-unicode-troll-stopper",
-            "sha256": "0ny260mr1h810fvqsfj2hpd3zql4g309m60qj4vk6kmd83p5b60f",
-            "rev": "15e4b57b78bf643bb56e5000078030cbb5c66e2a"
-        },
-        "recipe": {
-            "sha256": "0a10lq0xsfyp052iw4xjbhsdkbyg25x2gk68gys4k7p6l92la0k5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151023.2031",
-        "deps": []
-    },
-    "ein-mumamo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "millejoh",
-            "repo": "ein-mumamo",
-            "sha256": "1w0b3giy9ca35pp2ni4afnqas64a2vriilab7jiw9anp3ryh6570",
-            "rev": "028fefec499598add1a87b92ed991891f38f0c7b"
-        },
-        "recipe": {
-            "sha256": "029sk90xz9fhv2s56f5hp0aks1d6ybz517009vv4892bbzkpjv1w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150301.1828",
-        "deps": [
-            "ein"
-        ]
-    },
-    "omni-quotes": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "AdrieanKhisbe",
-            "repo": "omni-quotes.el",
-            "sha256": "1x8af8jv4n83sl4rgj0d2rpmw9g78rknm1h523f3b1a5x4kdvsz6",
-            "rev": "537f7191bede7156dae94622e92cec04c6cd4bdf"
-        },
-        "recipe": {
-            "sha256": "0dqki0ibabs9cpcjvnh8lc2114x46i1xmnyjc6qqblfxa3ggdygs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150604.1257",
-        "deps": [
-            "dash",
-            "omni-log"
-        ]
-    },
-    "helm-dictionary": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-helm",
-            "repo": "helm-dictionary",
-            "sha256": "05mb7kb4x7kzh0w9r531ppd92hzsa2v3wqcmafkcn1z5wfp7zw68",
-            "rev": "2aeafba1556c76cc5ff949ca50f341fc2aa687b0"
-        },
-        "recipe": {
-            "sha256": "1pak8qn0qvbzyclhzvr5ka3pl370i4kiykypfkwbfgvqqwczhl3n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141226.1336",
-        "deps": [
-            "helm"
-        ]
-    },
-    "auto-complete-clang": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "brianjcj",
-            "repo": "auto-complete-clang",
-            "sha256": "12y6f47xbjl4gy14j2f5wlisy5vl6rhx74n27w61pjv38m0a7mi1",
-            "rev": "a195db1d0593b4fb97efe50885e12aa6764d998c"
-        },
-        "recipe": {
-            "sha256": "1rnmphl7ml5ryjl5ka2l58hddir8b34iz1rm905wdwh164piljva",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140409.252",
-        "deps": [
-            "auto-complete"
-        ]
-    },
-    "ob-prolog": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ljos",
-            "repo": "ob-prolog",
-            "sha256": "14scbds1rlmii52i0zr3s0r1wmga7qysj63c2dpinhagxa36d51n",
-            "rev": "548986d0e6f678789216a882f0a19daf1b89ab93"
-        },
-        "recipe": {
-            "sha256": "0ki8yd20yk5xwn0zpk06zjxzgrsf8paydif9n98svb9s2l9wrh1s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150530.1137",
-        "deps": []
-    },
-    "goto-gem": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pidu",
-            "repo": "goto-gem",
-            "sha256": "0j2hdxqfsifm0d8ilwcw7np6mvn4xm58xglzh42gigj2fxv87g99",
-            "rev": "e3206f11f48bb7e798514a4ca2c2f60649613e5e"
-        },
-        "recipe": {
-            "sha256": "06vy9m01qccvahxr5xn0plzw9knl5ig7gi5q5r1smfx92bmzkg3a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140729.1345",
-        "deps": [
-            "s"
-        ]
-    },
-    "minibuffer-cua": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knu",
-            "repo": "minibuffer-cua.el",
-            "sha256": "011kg76zr4hfhi2gngnc7jlmp0l0nvhmlgyc0y9bir2jbjf4yyvz",
-            "rev": "adc4979a64f8b36e05960e9afa0746dfa9e2e4c7"
-        },
-        "recipe": {
-            "sha256": "1ragvr73ykbvpgynnq3z0z4yzrlfhfqlwc1vbxclb8x2xmxq7pzw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130906.634",
-        "deps": []
-    },
-    "clang-format": {
-        "fetch": {
-            "tag": "fetchsvn",
-            "url": "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format",
-            "sha256": "1rzax55darnj4h8i3qyrm2rqdwcvqggsz7kv6gi2i174fbdkbzfr",
-            "rev": "256472"
-        },
-        "recipe": {
-            "sha256": "19qaihb0lqnym2in4465lv8scw6qba6fdn8rcbkpsq09hpzikbah",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151116.638",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "autotest": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zenspider",
-            "repo": "elisp",
-            "sha256": "109il2s5ynfam510yli4xmi5zgw7xhr5gv096li24idqdp0gpf9n",
-            "rev": "ec4ef9dc2d018053bed7fb44837b4c66f1a14c36"
-        },
-        "recipe": {
-            "sha256": "0f46m5pc40i531dzfnhkcn192dcs1q20y083c1c0wg2zhjcdr5iy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150130.425",
-        "deps": []
-    },
-    "yagist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "yagist.el",
-            "sha256": "0sqwz37y6mpc378pp8p6bq9fmhgwfr6rlbngiwgvsp30iq6vjsn4",
-            "rev": "ab19ce3607873a6c523f87fffd653a1e7fbb66c2"
-        },
-        "recipe": {
-            "sha256": "1mz86fq0pb4w54c66vd19m2492mkrzq2qi6ssnn2xwmn8vv02wdd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150425.751",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "magma-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ThibautVerron",
-            "repo": "magma-mode",
-            "sha256": "0alcdr84g2gvvshpa3cws87n47n5shcryzbj947nsbicmp7f9k8j",
-            "rev": "b6ccdeb774348ef3e87cc877de9fc90405872760"
-        },
-        "recipe": {
-            "sha256": "1gq6yi51h1h7ivrm1xr6nfrpabx8ylbk0waaw04gnw3bb54dmmvc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150923.340",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "f"
-        ]
-    },
-    "maxframe": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rmm5t",
-            "repo": "maxframe.el",
-            "sha256": "0g9kpsg6623nmxnshj49q8k952xybrkmqqy6m892m8wnm22pjdz1",
-            "rev": "174e3a0f3a716e904eba15e659096a99976ee39a"
-        },
-        "recipe": {
-            "sha256": "10cwy3gi3xb3pfdh6xiafxp3vvssawci3y26jda6550d0w5vardj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140916.954",
-        "deps": []
-    },
-    "company-irony": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Sarcasm",
-            "repo": "company-irony",
-            "sha256": "0y1a9wxk9w2jk4177hkqzgqzknswikxc1dc60hzj4samyp2jhvfl",
-            "rev": "09f16eade551201548455285a2d977a0889761da"
-        },
-        "recipe": {
-            "sha256": "15adamk1b9y1i6k06i5ahf1wn70cgwlhgk0x6fk8pl5izg05z1km",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150810.439",
-        "deps": [
-            "cl-lib",
-            "company",
-            "emacs",
-            "irony"
-        ]
-    },
-    "dactyl-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "luxbock",
-            "repo": "dactyl-mode",
-            "sha256": "0fp40cyamchc9qq5vbpxgq3yp6vs8p3ncg46mjzr54psy3fc86dm",
-            "rev": "cc55fe6b987271d9647492b8df4c812d884f661f"
-        },
-        "recipe": {
-            "sha256": "0ppcabddcpwshfd04x42nbrbkagbyi1bg4vslysnlxn4kaxjs7pm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140906.1225",
-        "deps": []
-    },
-    "easy-kill": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "leoliu",
-            "repo": "easy-kill",
-            "sha256": "0i2plbvaalapx3svryn5lrc68m0qj1xm0z577xxzq7i9z91nanq7",
-            "rev": "e2b667f651a3531164d24ea4cbcd8c34fba0e17f"
-        },
-        "recipe": {
-            "sha256": "10jcv7a4vcnaj3wkabip2xwzcwlmvdlqkl409a9lnzfasxcpf32i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151031.29",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "dired-imenu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DamienCassou",
-            "repo": "dired-imenu",
-            "sha256": "088h9yn6wndq4pq6f7q4iz17f9f4ci29z9nh595idljp3vwr7qid",
-            "rev": "610e21fe0988c85931d34894d3eee2442c79ab0a"
-        },
-        "recipe": {
-            "sha256": "09yix4fkr03jq6j2rmvyg6gkmcnraw49a8m9649r3m525qdnhxs1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140109.1010",
-        "deps": []
-    },
-    "soft-morning-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mswift42",
-            "repo": "soft-morning-theme",
-            "sha256": "06q82v1hndvznsqg0r6jrxvgxhycg9m65kay4db4yy0gmc66v2xf",
-            "rev": "c0f9c70c97ef2be2a093cf839c4bfe27740a111c"
-        },
-        "recipe": {
-            "sha256": "0lzg478ax6idzh6m5sf2ds4gbv096y0c0gn15dai19f58bs63xzr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150918.1541",
-        "deps": []
-    },
-    "escreen": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsmirror",
-            "repo": "escreen",
-            "sha256": "0id7820vjbprlpprj4fyhylkjvx00b87mw4n7jnxn1gczvjgafmc",
-            "rev": "e3fd46225fec70943024d950c6b6c2eb88e00b96"
-        },
-        "recipe": {
-            "sha256": "0yis27362jc63jkzdndz1wpysmf1b51rrbv3swvi6b36da5i6b54",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20091203.1213",
-        "deps": []
-    },
-    "nix-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "NixOS",
-            "repo": "nix",
-            "sha256": "067dpzww3w3q065bqpzywgfxq09zn0fk56v917aanb6va2rddq0r",
-            "rev": "52120123a5505199c342afb42f1a48b9cb2628ed"
-        },
-        "recipe": {
-            "sha256": "00rqawi8zs2x79c91gmk0anfyqbwalvfwmpak20i11lfzmdsza1s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151026.515",
-        "deps": []
-    },
-    "angular-snippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "angular-snippets.el",
-            "sha256": "0hdm1a323mzxjfdply8ri3addk146f21d8cmpd18r7dw3j3cdfrn",
-            "rev": "af5ae0a4a8603b040446c28afcf6ca01a8b4bd7b"
-        },
-        "recipe": {
-            "sha256": "057phgizn1c6njvdfigb23ljs31knq247gr0rcpqfrdaxsnnzm5c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140514.23",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "helm-rubygems-local": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "f-kubotar",
-            "repo": "helm-rubygems-local",
-            "sha256": "0s4hb1fvwr9za5gkz8s5w1kh9qjyygz6g59w7vmrg2d8ds2an03d",
-            "rev": "289cb33d41c703af9791d6da46b55f070013c2e3"
-        },
-        "recipe": {
-            "sha256": "18p18bly15a8xjc34k11jbvxlmr127sll0vh5ma2p787x6a3mc7c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130711.2011",
-        "deps": [
-            "helm"
-        ]
-    },
-    "emacsagist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "echosa",
-            "repo": "emacsagist",
-            "sha256": "0ciqxyahlzaxq854jm25zbrbmrhcaj5csdhxa0az9crwha8wkmw2",
-            "rev": "aba342ba59c254a88017f25e9fb7a8cd6f2fda83"
-        },
-        "recipe": {
-            "sha256": "1cyz7nf0zxa21979jf5kdmkgwiyd17vsmpcmrw1af37ly27l8l64",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140331.1330",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "yafolding": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zenozeng",
-            "repo": "yafolding.el",
-            "sha256": "0b252m7vb5kg5bjhpgag6nhm32cac8dhlmy4pr0kpa860lh2xlz7",
-            "rev": "0dc48073f429112b51a888e8e9285739435d3c7f"
-        },
-        "recipe": {
-            "sha256": "1z70ismfwmh9a83a7h5lbhw7iywfib5fis7y8gx8020wfjq9g2yq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141202.2256",
-        "deps": []
-    },
-    "term-cmd": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "CallumCameron",
-            "repo": "term-cmd",
-            "sha256": "11xk11i99d17x5bl7glrwj2dhvl3f54slipj034dbf07dd5b2jih",
-            "rev": "fc2ae638409af99c4788563ef54847636f2e23e0"
-        },
-        "recipe": {
-            "sha256": "0fn4f32zpl0p2lid159q59lzjv4xqmc23a64kcclqp9db8b1m5fy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141114.1514",
-        "deps": []
-    },
-    "shell-split-string": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "10sr",
-            "repo": "shell-split-string-el",
-            "sha256": "16srngml5xmpaxb0wzhx91jil0r0dmn673bwai3lzxrkmjnl748l",
-            "rev": "19f6f999c33cc66a4c91bacdcc3697c25d97bf5a"
-        },
-        "recipe": {
-            "sha256": "1yj1h7za4ylxh2nikj7s1qqlilpsk05x9571a2fymfyznm3iq77m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151224.408",
-        "deps": []
-    },
-    "evil-visual-mark-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "roman",
-            "repo": "evil-visual-mark-mode",
-            "sha256": "07cmql8zsqz1qchq2mp3qybbay499dk1yglisig6jfddcmrbbggz",
-            "rev": "094ee37599492885ff3144918fcdd9b74dadaaa0"
-        },
-        "recipe": {
-            "sha256": "1qgr2dfhfz6imnlznicl7lplajd1s8wny7mlxs1bkms3xjcjfi48",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150202.1200",
-        "deps": [
-            "dash",
-            "evil"
-        ]
-    },
-    "package+": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zenspider",
-            "repo": "package",
-            "sha256": "1xv0ra130qg0ksgqi4npspnv0ckq77k7f5kcibavj030h578kj97",
-            "rev": "4a9618a44ec4f26a14e0136cd9d3c4855fceb25b"
-        },
-        "recipe": {
-            "sha256": "1mbsxr4llz8ny7n7w3lykld9yvbaywlfqnvr9l0aiv9rvmdv03bn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150319.1655",
-        "deps": []
-    },
-    "helm-itunes": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "daschwa",
-            "repo": "helm-itunes",
-            "sha256": "1czgf5br89x192g3lh3x2n998f79hi1n2f309ll264qnl35kv14w",
-            "rev": "966de755a5aadbe02311a6cef77bd4790e84c263"
-        },
-        "recipe": {
-            "sha256": "15z5lgh5x1ykz5p31i994fig8v05s7ckkgw6p9jifn11sn1a39nb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151013.148",
-        "deps": [
-            "helm"
-        ]
-    },
-    "import-js": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "trotzig",
-            "repo": "import-js",
-            "sha256": "07q610m35v59nxzzzqmjlgmbwziq8nzriy18h3y6ajmk4pwiwkqp",
-            "rev": "905f81b31e049fc49337b76aca4dd92ed7033dcb"
-        },
-        "recipe": {
-            "sha256": "1grvzy378qj14wlbmhb3j7fx2zkl9wp65b5g0brjimav08nz7bls",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151225.609",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "xterm-frobs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsmirror",
-            "repo": "xterm-frobs",
-            "sha256": "10dsf2lgjjqvjzzyc5kwggfk511v8ypmx173bixry3djcc15dsf3",
-            "rev": "58fb0de21e4d1963d1398a38e1b803446fb41320"
-        },
-        "recipe": {
-            "sha256": "02v8kh2g6a2fpxy911630zsg985hyakvqbd6v2xyfbz0vnd6i1lf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20091211.1755",
-        "deps": []
-    },
-    "faces+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/faces+.el",
-            "sha256": "0mgj7mdadc62wpav7z138jsjvbvkxg05h5z9kmjw8jl5x4m334lq"
-        },
-        "recipe": {
-            "sha256": "0k3m434f3d3061pvir0dnykmv6r9jswl7pzybzja3afiy591hh92",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1600",
-        "deps": []
-    },
-    "purple-haze-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jasonm23",
-            "repo": "emacs-purple-haze-theme",
-            "sha256": "15myw5rkbnnpgzpiipm5xl4cyzymv8hh66x9al4aalb5nf52dckc",
-            "rev": "3e245cbef7cd09e6b3ee124963e372a04e9a6485"
-        },
-        "recipe": {
-            "sha256": "0ld8k53823786y6f0dqcp0hlqlnmy323vdkanjfs5wg5ib60az1m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141014.2129",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "dired-subtree": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "dired-hacks",
-            "sha256": "15jri9cj5jgr3ff423izd8idd7djay238c9pa3ccy05djl9z2hdx",
-            "rev": "6647825dbca4269afa76302e345d6bd15b222e42"
-        },
-        "recipe": {
-            "sha256": "1vqcnkh3g6dwi2hwfkb534q0j19pkqzqk3yb7ah8ck4z4ln4ppfk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150908.1233",
-        "deps": [
-            "dash",
-            "dired-hacks-utils"
-        ]
-    },
-    "rvm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "senny",
-            "repo": "rvm.el",
-            "sha256": "0iblk0vagjcg3c8q9hlpwk7426ms7aq0s80izgvascfmyqycv6qm",
-            "rev": "8e45a9bad8e317ff195f384dab14d3402497dc79"
-        },
-        "recipe": {
-            "sha256": "08i7cmav2cz73jp88ww0ay2yjhk9dj8146836q4sij1bl1slbaf8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150402.942",
-        "deps": []
-    },
-    "isgd": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chmouel",
-            "repo": "isgd.el",
-            "sha256": "09hx28lmldm7z3x22a0qx34id09fdp3z61pdr61flgny213q1ach",
-            "rev": "764306dadd5a9213799081a48aba22f7c75cca9a"
-        },
-        "recipe": {
-            "sha256": "0yc9mkjzj3w64f48flnjvd193mk9gndrrqbxz3cvmvq3vgahhzyi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150414.436",
-        "deps": []
-    },
-    "redis": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-pe",
-            "repo": "redis.el",
-            "sha256": "1rjpf23a8rggjmmxvm1997d3xz03kz84xams486b9ky0n2v02d57",
-            "rev": "2c33f3397bc14e7a8192867b55920492d4eead8c"
-        },
-        "recipe": {
-            "sha256": "1awnilb8bk0izp6yw0187ybh9slf1hc51014xvvmj90darxby79a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150531.1448",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "swift-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chrisbarrett",
-            "repo": "swift-mode",
-            "sha256": "03pxizbw02bp9mp0b0vwiys4vncna73ymmbbmxpw9m6mn1ql2fjv",
-            "rev": "a5e1acf5826ccd489617f9255da0aab7e5e920ee"
-        },
-        "recipe": {
-            "sha256": "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151018.120",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "logview": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "doublep",
-            "repo": "logview",
-            "sha256": "1wglgjf45rl4rl5zp1p1z318p2d1hy1w77m65wwg35v6pkl1mikr",
-            "rev": "03b2f0fc325a557ccee0dbcb9226a1d733f21c84"
-        },
-        "recipe": {
-            "sha256": "0gks3j5avx8k3427a36lv7gr95id3cylaamgn5qwbg14s54y0vsh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151030.1649",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "facemenu+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/facemenu+.el",
-            "sha256": "0b8all1l4v98iz1y4zbc0l9zxrdbgkljzahs2yrbl9md2qj3j91d"
-        },
-        "recipe": {
-            "sha256": "0lbggalgkj59wj67z95949jmppmqrzrp63mdhw42r2x0fz1ir0iv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150816.2153",
-        "deps": []
-    },
-    "sicp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "webframp",
-            "repo": "sicp-info",
-            "sha256": "102ssiz4sp7y816s1iy8i98c314jbn3sy0v87b0qgpgjiq913ffq",
-            "rev": "7d060136bf4582fa74e4aa7cb924d856eea270f4"
-        },
-        "recipe": {
-            "sha256": "1q7pbhjk8qgwvj27ianrdbmj98pwf3xv10gmpchh7bypmbyir4wz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151130.957",
-        "deps": []
-    },
-    "dired-toggle": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fasheng",
-            "repo": "dired-toggle",
-            "sha256": "1yx20h16hc1b04knsqhrxni0j8qgwnq7i5b0dlggq3dakcvqfxma",
-            "rev": "84efb9ec9c327e4da53cdb7cda5b51dcd0ede0e5"
-        },
-        "recipe": {
-            "sha256": "18v571kp440n5g1d7pj86rr8dgbbm324f9vblkdbdvn13c5dczf5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140907.1549",
-        "deps": []
-    },
-    "narrow-reindent": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emallson",
-            "repo": "narrow-reindent.el",
-            "sha256": "10yn215xb4s6kshk108y75im1xbdp0vwc9kah5bbaflp9234i0zh",
-            "rev": "87466aac4dbeb79597124dd077bf5c704872fd3d"
-        },
-        "recipe": {
-            "sha256": "0fybal70kk62zlra63x4jb72694m0mzv4cx746prx9anvq1ss2i0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150722.1406",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "xah-elisp-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xahlee",
-            "repo": "xah-elisp-mode",
-            "sha256": "05a29y4mds2vhgkvlnyjby240pmnq4yq9cx92iqbvhdi984dcm28",
-            "rev": "c05ab4d78d1eb37ec7635e79f8c49a14c61b69b0"
-        },
-        "recipe": {
-            "sha256": "0cl07hw1hd3hj7wrzkh20m8vcs7mqsajxjmnlbnk2yg927yyijij",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151219.1522",
-        "deps": []
-    },
-    "epl": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cask",
-            "repo": "epl",
-            "sha256": "0s4k2grikhibd075435giv3bmba1mx71ndxlr0k1i0q0xawpyyb4",
-            "rev": "a5ad061d0a5eb42f66c384e55d102da7d52c96b0"
-        },
-        "recipe": {
-            "sha256": "0zr3r2hn9jaxscrl83hyixznb8l5dzfr6fsac76aa8x12xgsc5hn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150517.633",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "control-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "stephendavidmarsh",
-            "repo": "control-mode",
-            "sha256": "1qsq543rb0z2fq716a2khs8zqyh13npzmbj58f00s8b3w3andpbh",
-            "rev": "52c43d198f423eb00e5de6e44f2f3dd70893a6bc"
-        },
-        "recipe": {
-            "sha256": "1biq4p2w8rqcbvr09gxbchjqlaixjf1fzv7xv8lpv81dlhi7dgz6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140218.807",
-        "deps": []
-    },
-    "paradox": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "paradox",
-            "sha256": "1kvyfsf4dy7gss5jg2hb5hn51llq0jza9nkdxgsf7mh07v6kj9ap",
-            "rev": "6fd7161475ab3580f2113e569ef4df7431d0b1b5"
-        },
-        "recipe": {
-            "sha256": "1xq14nfvprsq18464qr4mhphq7cl1f570lji5n8z6j9vpfm9a4p2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151211.1517",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "hydra",
-            "json",
-            "let-alist",
-            "seq",
-            "spinner"
-        ]
-    },
-    "ix": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "theanalyst",
-            "repo": "ix.el",
-            "sha256": "069alh9vs6is3hvbwxbwr9g8qq9md5c92wg5bfswi99yciqdvc4i",
-            "rev": "aea4c54a5cc5a6f26637353c16a3a0e70fc76963"
-        },
-        "recipe": {
-            "sha256": "1fl76dk8vgw3mrh5iz99lrsllwya6ij9d1lj3szcrs4qnj0b5ql3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131027.1129",
-        "deps": [
-            "grapnel"
-        ]
-    },
-    "dired-toggle-sudo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "renard",
-            "repo": "dired-toggle-sudo",
-            "sha256": "0ajj8d6k5in2hclcrqckinfh80ylddplva0ryfbkzsjkfq167cv2",
-            "rev": "02449dbda4e168f99fe5352c9628df5d39e11483"
-        },
-        "recipe": {
-            "sha256": "0fy05af9aq9791ij4j9pscdk5j44pbg0kmhpqli41qiazjw7v2va",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151109.406",
-        "deps": []
-    },
-    "req-package": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "edvorg",
-            "repo": "req-package",
-            "sha256": "05a88r2jp169x99abz9wrr1i8ch0bg3dlmaalxwqfmlzci0lksx2",
-            "rev": "e52f0b0a8cfc28ae1d13c83fdcf3998a9973e7e5"
-        },
-        "recipe": {
-            "sha256": "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151220.254",
-        "deps": [
-            "dash",
-            "ht",
-            "log4e",
-            "use-package"
-        ]
-    },
-    "esh-buf-stack": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tom-tan",
-            "repo": "esh-buf-stack",
-            "sha256": "1k8k9hl9m4vjqdw3x9wg04cy2lb9x64mq0mm0i3i6w59zrsnkn4q",
-            "rev": "ce0ea5aadca3150eaa9d2e6ec20296add4e99176"
-        },
-        "recipe": {
-            "sha256": "0zmwlsm98m9vbjk9mldfj2nf6cip7mlvb71j33ddix76yqggp4qg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140107.418",
-        "deps": []
-    },
-    "tmmofl": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://code.google.com/p/phillord-emacs-packages/",
-            "sha256": "0pq9x73hrp7qwhms7x3dvjfh9imapglba9yd7nkyw68mc0b9wlnl",
-            "rev": "e14e67d6a5b7"
-        },
-        "recipe": {
-            "sha256": "1hqv2xqnhwnbj4sqcbdial4987yj1y3ry7niaaz2hh0f5qzrzwa8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121025.601",
-        "deps": []
-    },
-    "cmake-project": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alamaison",
-            "repo": "emacs-cmake-project",
-            "sha256": "0fyzi8xac80wnhnwwm1j6yxpvpg1n4diq2lcl3qkj8klvk5gpxr6",
-            "rev": "5212063b6276f8b9af8b48b4052e5ec97721c08b"
-        },
-        "recipe": {
-            "sha256": "13n6j9ljvzjzkknbm9zkhxljcn12avl39gxqq95hah44dr11rns3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150720.1559",
-        "deps": []
-    },
-    "matlab-mode": {
-        "fetch": {
-            "tag": "fetchcvs",
-            "module": "matlab-emacs",
-            "cvsRoot": ":pserver:anonymous@matlab-emacs.cvs.sourceforge.net:/cvsroot/matlab-emacs",
-            "sha256": "694652e361b9d15a3f1542d45b43c6516f20030dbaa8a058b5fdb4c833885465"
-        },
-        "recipe": {
-            "sha256": "06s7mrbfbkk6baf8j1vc26nb2bg3ma1n7d297zqz8ay90cv81y76",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141227.1244",
-        "deps": []
-    },
-    "org-time-budgets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "leoc",
-            "repo": "org-time-budgets",
-            "sha256": "04adkz950vvwyzy3da468nnqsknpr5kw5369w2yqhnph16cwwfxb",
-            "rev": "baa1ce6333157fed3b3799a80e6cf8c73c9e2c18"
-        },
-        "recipe": {
-            "sha256": "0r8km586n6xdnjha7xnzlh03nw1dp066hydaz8kxfmhvygl9cpah",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151111.201",
-        "deps": [
-            "alert",
-            "cl-lib"
-        ]
-    },
-    "fancy-narrow": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "fancy-narrow",
-            "sha256": "1i6xq03fhkffahrlfjcds5mvk4rsipia9diaqv7qfbhzrfwvn665",
-            "rev": "5196dc6066d354883fa21090266b6cebccc9f6fd"
-        },
-        "recipe": {
-            "sha256": "15i86jz6rdpva1az7gqp1wbm8kispcfc8h6v9fqsbag9sbzvgcyv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151021.533",
-        "deps": []
-    },
-    "rhtml-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "eschulte",
-            "repo": "rhtml",
-            "sha256": "1qlpv5lzj4yfyjgdykhm6q9izg6g0z5pf5nmynj42vsx7v8bhy1x",
-            "rev": "a6d71b38a3db867ccf82999c99805db1a3a33c33"
-        },
-        "recipe": {
-            "sha256": "038j5jkcckmhlq3vz4h07s5y2scljh1fdn9r614hiyxwgk48lc35",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130422.811",
-        "deps": []
-    },
-    "insfactor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "duelinmarkers",
-            "repo": "insfactor.el",
-            "sha256": "112s3c0ii8zjc6vlj2im2qd2pl3hb95pq4zibm86gjpw428wd8iy",
-            "rev": "7ef5446cebb08a17d4106d2e6f3c053e49e1e829"
-        },
-        "recipe": {
-            "sha256": "0c6q1d864qc78sqk9iadjpd01xc7myipgnf89pqa2z75yprndvyn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141116.1802",
-        "deps": []
-    },
-    "dirtree": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/dirtree.el",
-            "sha256": "1q03q4j0wkbg9p2nzf1kb7l517b21mskp2v52i95jbxh09igbjjx"
-        },
-        "recipe": {
-            "sha256": "0wfz9ks5iha2n0rya9yjmrb6f9lhp620iaqi92lw9smm7w83zj29",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140129.232",
-        "deps": [
-            "tree-mode",
-            "windata"
-        ]
-    },
-    "osx-org-clock-menubar": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jordonbiondo",
-            "repo": "osx-org-clock-menubar",
-            "sha256": "1rgykby1ysbapq53lnk9yy04r9q4qirnzs2abgvz7g2qjq5fyzag",
-            "rev": "9964d2a97cc2fb6570dc4116da44f73bd8eb7cb3"
-        },
-        "recipe": {
-            "sha256": "1y5qxslxl0d93f387nyj8zngz5nh1p4rzdfx0lnbvya6shfaxaf6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150205.1511",
-        "deps": []
-    },
-    "test-case-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ieure",
-            "repo": "test-case-mode",
-            "sha256": "1r3fmb8cshgh9pppdvydfcrzlmb9cgz4m04rgv69c5xv8clwcmbr",
-            "rev": "6074df10ebc97ddfcc228c71c73db179e672dac3"
-        },
-        "recipe": {
-            "sha256": "1iba97yvbi5vr7gvc58gq2ah6jg2s7apc9ssq7mdzki823n8z2qi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130525.934",
-        "deps": [
-            "fringe-helper"
-        ]
-    },
-    "take-off": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tburette",
-            "repo": "take-off",
-            "sha256": "13zwlb5805cpv0pbr7fj5b4crlg7lb0ibslvcpszm0cz6rlifcvf",
-            "rev": "aa9ea45566fc74febbb6ee9c409ecc4b59246215"
-        },
-        "recipe": {
-            "sha256": "05vlajmirbp62rpbdwa2bimpzyl9xc331gg0lhn2rkivc0hma2ar",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140531.417",
-        "deps": [
-            "emacs",
-            "web-server"
-        ]
-    },
-    "fiplr": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "d11wtq",
-            "repo": "fiplr",
-            "sha256": "14yy7kr2iv549xaf5gkav48lk2hzmvipwbs0rzljzw60il6k05hk",
-            "rev": "bb6b90ba3c558988c195048c4c40140b2ee17530"
-        },
-        "recipe": {
-            "sha256": "0l68rl5cy2maynny6iq6c4qr6c99y44i0i1z613k9rk08z7h0k5i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140724.145",
-        "deps": [
-            "cl-lib",
-            "grizzl"
-        ]
-    },
-    "rainbow-blocks": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "istib",
-            "repo": "rainbow-blocks",
-            "sha256": "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c",
-            "rev": "8335993563aadd4290c5fa09dd7a6a81691b0690"
-        },
-        "recipe": {
-            "sha256": "08p41wvrw1j3h7j7lyl8nxk1gcc2id9ikljmiklg0kc6s8ijhng8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140306.1233",
-        "deps": []
-    },
-    "ucs-cmds": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/ucs-cmds.el",
-            "sha256": "0s65g6rdrjn4ypdny68fjk58yddn921xkbl811izxyc3q6q2z0k4"
-        },
-        "recipe": {
-            "sha256": "1n0f0qf8w8ark78fs67aaxnqpk0km97hy59pnxwfyahgjl2qz6d1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150508.1745",
-        "deps": []
-    },
-    "password-generator": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zargener",
-            "repo": "emacs-password-genarator",
-            "sha256": "1pw401ar114wpayibphv3n6m0gz68zjmiwz60r4lbar45bmxvihx",
-            "rev": "c8193d5e963bda0a2f8e51fd4a94dcf37c76f282"
-        },
-        "recipe": {
-            "sha256": "0aahpplmiwmp6a06y6hl4zvv8lvzkmakmaazlckl5r3rqbsf24cb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150222.1440",
-        "deps": []
-    },
-    "dot-mode": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/dot-mode.el",
-            "sha256": "0xhbzq3yvfvvvl6mfihrzkd3pn5p5yxvbcyf2jhsppk7lscifsgk"
-        },
-        "recipe": {
-            "sha256": "1fik32635caq3r5f9k62qbj2dkwczz2z1v28mc7bcj7jv2p93nvh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151029.855",
-        "deps": []
-    },
-    "ido-grid-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "larkery",
-            "repo": "ido-grid-mode.el",
-            "sha256": "051rzjxk73h8apkmn4w39bl0pz1c9gna4w3lq7j3a6fiplb0jn23",
-            "rev": "34a7412c30840c1131464781dddfb1602355766b"
-        },
-        "recipe": {
-            "sha256": "1wl1yclcxmkbfnvp0il23csdf6gprzf7fkcknpivk784fhl19acr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151127.1135",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "anything-prosjekt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abingham",
-            "repo": "prosjekt",
-            "sha256": "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3",
-            "rev": "a864a8be5842223043702395f311e3350c28e9db"
-        },
-        "recipe": {
-            "sha256": "15kgn0wrnbh666kchijdlssf2gp7spgbymr2nwgv6k730cb4mfa8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140129.204",
-        "deps": [
-            "anything",
-            "prosjekt"
-        ]
-    },
-    "company-sourcekit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nathankot",
-            "repo": "company-sourcekit",
-            "sha256": "1xzwalchl9lnq9848dlvhhbzyh1wkwbciz20d1iw0fsigj5g156c",
-            "rev": "5e1adf8d201fd94a942b40983415db1b28b6eef1"
-        },
-        "recipe": {
-            "sha256": "0hr5j1ginf43h4qf3fvsh3z53z0c7w5a9lhrvdwmlzj396qhqmzs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151209.714",
-        "deps": [
-            "company",
-            "dash",
-            "dash-functional",
-            "emacs",
-            "sourcekit"
-        ]
-    },
-    "kaesar-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-kaesar",
-            "sha256": "1maab8iaf2wcjj02ibl21jlfzmi9gmcl167cgdlwj50wkig74s23",
-            "rev": "11ab63b8e6f1c4ebc5a2e54474095754a39104e5"
-        },
-        "recipe": {
-            "sha256": "0yqnlchbpmhsqc8j531n08vybwa32cy0v9sy4f9fgxa90rfqczry",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150220.505",
-        "deps": [
-            "cl-lib",
-            "kaesar"
-        ]
-    },
-    "e2wm-pkgex4pl": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "e2wm-pkgex4pl",
-            "sha256": "1vrlfzy1wynm7x4m7pl8vim7ykqd6qkcilwz7sjc1lbckz11ig0d",
-            "rev": "7ea994450727190c4f3cb46cb429ba41b692ecc0"
-        },
-        "recipe": {
-            "sha256": "0hgdbqfw3015fr929m36kfiqqzsid6afs3222iqq0apg7gfj7jil",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140525.547",
-        "deps": [
-            "e2wm",
-            "plsense-direx"
-        ]
-    },
-    "org-linkany": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "org-linkany",
-            "sha256": "1bggz782ci0z6aw76v51ykbmfzh5g6cxh43w798as1152sn7im3p",
-            "rev": "ed4a6614b56c9baef31647ea728b3d5fae6ed3a2"
-        },
-        "recipe": {
-            "sha256": "0arjj3c23yqm1ljvbnl7v9cqvd9lbz4381g8f3jyqbafs25bdc3c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140314.1308",
-        "deps": [
-            "log4e",
-            "yaxception"
-        ]
-    },
-    "scheme-complete": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "http://code.google.com/p/scheme-complete/",
-            "sha256": "13pym1kwi8ah3h2l557pvbg4lgpp5lhldj3qxyg7gyvgkwr91a7g",
-            "rev": "e2ec67dfb1ff"
-        },
-        "recipe": {
-            "sha256": "1nam7xzw8hrykz73q9x24szpjv2kpkp48lcmzf02kzj3cg6l76qm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130220.603",
-        "deps": []
-    },
-    "zen-and-art-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "developernotes",
-            "repo": "zen-and-art-theme",
-            "sha256": "0dnaxhsw549k54j0mgydm7qbl4pizgipfyzc15f9afsxa107rpnl",
-            "rev": "a7226cbce0bca2501d69a620cb2aeabfc396c232"
-        },
-        "recipe": {
-            "sha256": "0b2lflji955z90xl9iz2y1vm04yljghbw4948gh5vv5p7mwibgf2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120622.937",
-        "deps": []
-    },
-    "modtime-skip-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jordonbiondo",
-            "repo": "modtime-skip-mode",
-            "sha256": "0ri841cwx2mx8ri50lhvifmxnysdc022421mlmklql0252kn775l",
-            "rev": "c0e49523aa26b2263a8693691ac775988015f592"
-        },
-        "recipe": {
-            "sha256": "1drafwf4kqp83jp47j2ddl2n4a92zf1589fnp6c72hmjqcxv3l28",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140128.1601",
-        "deps": []
-    },
-    "autumn-light-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aalpern",
-            "repo": "emacs-color-theme-autumn-light",
-            "sha256": "1lip7282g41ghn64dvx2ab437s83cj9l8ps1rd8rbhqyz4bx5wb9",
-            "rev": "1e3b2a43a3001e4a97a5ff073ba3f0d2ea3888f9"
-        },
-        "recipe": {
-            "sha256": "0g3wqv1yw3jycq30mcj3w4sn9nj6i6gyd2ljzimf547ggcai536a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150515.947",
-        "deps": []
-    },
-    "powershell": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jschaf",
-            "repo": "powershell.el",
-            "sha256": "010b151wblgxlfpy590yanbl2r8qhpbqgi02v0pyir340frm9ngn",
-            "rev": "7316f44d0b528552f5a0692f778e5f0efd964299"
-        },
-        "recipe": {
-            "sha256": "162k8y9k2n48whaq93sqk86zy3p9qvsfxgyfv9n1nvk4l5wn70wk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150428.1621",
-        "deps": []
-    },
-    "underwater-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jmdeldin",
-            "repo": "underwater-theme.el",
-            "sha256": "1ypxpv5vw2ls757iwrq3zld6k0s29q3kg3spcsl5ks4aqpnkxpva",
-            "rev": "4eb9ef014f580adc135d91d1cd68d37a310640b6"
-        },
-        "recipe": {
-            "sha256": "0ab2bcqfdi9ml3z9d511pbfwcbp8hkkd36xxp61k36gkyi3acvlr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131117.1802",
-        "deps": []
-    },
-    "column-marker": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/column-marker.el",
-            "sha256": "05bv198zhqw5hqq6cr11mhz02dpca74hhp1ycwq369m0yb2naxy9"
-        },
-        "recipe": {
-            "sha256": "1xgfsiw46aib2vb9bbjlgnhcgfnlfhdcxd0cl0jqj4fjfxzbz0bq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20121128.243",
-        "deps": []
-    },
-    "magit-popup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "magit",
-            "sha256": "1wgy1rkaanqf382m7ijy90gpaiz2049mrmwlvwkr3hw3vgkffar8",
-            "rev": "c650d164a94adcd123ed28da7d413aee76cc9fe7"
-        },
-        "recipe": {
-            "sha256": "0w6m384bbmp3bd4qbss5h1jvcfp4qnpqvzlfykhdgjwpv2b2a2fj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151223.1541",
-        "deps": [
-            "async",
-            "dash",
-            "emacs"
-        ]
-    },
-    "rotate": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "daic-h",
-            "repo": "emacs-rotate",
-            "sha256": "0spgpq2cmckpl7j2193axy5yqws5dwrhik69d0bv0ylwzxp3npvg",
-            "rev": "04b64c6e20c465102ecafe0e099986b0808582bf"
-        },
-        "recipe": {
-            "sha256": "0dygdd24flbgqp049sl4p8rymvv8h881hz9lvz8hnfwq687yyclx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140123.316",
-        "deps": []
-    },
-    "bbdb-vcard": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tohojo",
-            "repo": "bbdb-vcard",
-            "sha256": "1zlf9xhpirln72xr7v6kgndkg5wyz5ipsl4gpq9lbmp92jlgbwlj",
-            "rev": "c3aafd4160854a38fd92afcdade32b9a13abe82c"
-        },
-        "recipe": {
-            "sha256": "1kn98b7mh9a28933r4yl8qfl9p92rpix4vkp71sar9cka0m71ilj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150713.1550",
-        "deps": [
-            "bbdb"
-        ]
-    },
-    "package-build": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "milkypostman",
-            "repo": "melpa",
-            "sha256": "1linipac2qg8905qmgyr8lgjgv30mlwyib52r0k3kjpha6wcmniq",
-            "rev": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "recipe": {
-            "sha256": "1m245q81c2jifgqxwd2fi35jrcbf6v9a1a5zy815861avq3fg9g0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151224.1137",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "lusty-explorer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sjbach",
-            "repo": "lusty-emacs",
-            "sha256": "1r1xfn0dyc4m49064g9n6hpwn4r763kpbg3dgprsv30i5ska61qa",
-            "rev": "a6e78cafc193050a493d16d07eae107a2436c293"
-        },
-        "recipe": {
-            "sha256": "0xqanmmkyvzcg2g4zvascq5j004bqz7vmz1a19c25g9cs3rdh0ps",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150508.1757",
-        "deps": []
-    },
-    "helm-hayoo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "markus1189",
-            "repo": "helm-hayoo",
-            "sha256": "08pfzs030d8g5s7vkpgicz4srp5cr3xpd84lhrr24ncrhbszxar9",
-            "rev": "dd4c0c8c87521026edf1b808c4de01fa19b7c693"
-        },
-        "recipe": {
-            "sha256": "0xdvl6q2rpfsma4hx8m4snbd05s4z0bi8psdalixywlp5s4vzr32",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151014.151",
-        "deps": [
-            "haskell-mode",
-            "helm",
-            "json"
-        ]
-    },
-    "dpaste_de": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "theju",
-            "repo": "dpaste_de.el",
-            "sha256": "1avpg0cgzk8d6g1q0ryx41lkcdgkm0mkzr5xr32xm28dzrfmgd4z",
-            "rev": "f0c39e8864299f735642f7d9fa490689398ce39d"
-        },
-        "recipe": {
-            "sha256": "0dql9qsl5gj51i3l2grl7nhw0ign8h4xa4jnhwn196j71c0rdwwp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131015.725",
-        "deps": [
-            "web"
-        ]
-    },
-    "evil-terminal-cursor-changer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "7696122",
-            "repo": "evil-terminal-cursor-changer",
-            "sha256": "10aic2r1akk38hh761hr5vp9fjlh1m5nimag0nzdq5x9g9467cc8",
-            "rev": "2735a11a2a0c8d327b730cefef2794834263c413"
-        },
-        "recipe": {
-            "sha256": "1300ch6f8mkz45na1hdffglhw0cdrrxmwnbd3g4m3sl5z4midian",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150827.2151",
-        "deps": [
-            "evil"
-        ]
-    },
-    "igrep": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/igrep.el",
-            "sha256": "0qiv69v7ig38iizif7zg8aljdmpa1jk8bsfa0iyhqqqrkvsmhc29"
-        },
-        "recipe": {
-            "sha256": "1vyhrziy29q6w8w9vvanb7d29r1n7nfkznbcd62il991n48d08i3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130824.707",
-        "deps": []
-    },
-    "bdo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chrisdone",
-            "repo": "bdo",
-            "sha256": "0d5b7zyl2vg621w1ll2lw3kjz5hx6lqxc0jivh0i449gckk5pzkm",
-            "rev": "c96cb6aa9e97fa3491185c50dee0f77a13241010"
-        },
-        "recipe": {
-            "sha256": "0vp8am2x11abxganw90025w9qxnqjdkj015592glbbzpa6338nfl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140126.301",
-        "deps": []
-    },
-    "gnome-calendar": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "NicolasPetton",
-            "repo": "gnome-calendar.el",
-            "sha256": "160qm8xf0yghygb52p8cykhb5vpg9ww3gjprcdkcxplr4b230nnc",
-            "rev": "58c3a3c32aff9901c679bdf9091ed934897b84a0"
-        },
-        "recipe": {
-            "sha256": "00clamlm5b42zqggxywdqrf6s2dnsxir5rpd8mjpyc502kqmsfn6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140112.559",
-        "deps": []
-    },
-    "linum-off": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "linum-off",
-            "sha256": "0x0k4m7nan2klvrhyzqvgpqnw99fq805hvipnrp2j755x7sv92g5",
-            "rev": "e16826e9a4cfe104d55884dc3cc4b4b1ced364ca"
-        },
-        "recipe": {
-            "sha256": "1yilsdsyxlzmh64dpzirzga9c7lhp1phps9cdgp2898zpnzaclay",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130419.2254",
-        "deps": []
-    },
-    "multi-project": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/ellisvelo/multi-project",
-            "sha256": "0lcx73vzm7zwvzzc53pfb5y16bhvq9cm9fdy63d3242s8v834z3c",
-            "rev": "f7fd0ae6819e"
-        },
-        "recipe": {
-            "sha256": "19dy2wl5ad1xldiznlw2vjvr9ja8h9wiv6igcggixq56fhngp40x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150314.944",
-        "deps": []
-    },
-    "diredful": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thamer",
-            "repo": "diredful",
-            "sha256": "1rx7vq6yl83fbmb76sczbb1bv972s4cyg160sm2yap1i6nzhd10p",
-            "rev": "e814fa3ffc7ec7b2455112c3d98e905674a6006b"
-        },
-        "recipe": {
-            "sha256": "0y8x6q1yfsk0srxsh4g5nbsms1g9pk9d103jx7cfdac79mcigw7x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151118.1500",
-        "deps": []
-    },
-    "evil-org": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "edwtjo",
-            "repo": "evil-org-mode",
-            "sha256": "0pir7a3xxbcp5f3q9pi36rpdpi8pbx18afmh0r3501ynssyjfq53",
-            "rev": "61319f85979e8768c930983595caa2483c0fb319"
-        },
-        "recipe": {
-            "sha256": "18w07fbafry3wb87f55kd8y0yra3s18a52f3m5kkdlcz5zwagi1c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151203.147",
-        "deps": [
-            "evil",
-            "evil-leader",
-            "org"
-        ]
-    },
-    "modalka": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mrkkrp",
-            "repo": "modalka",
-            "sha256": "04c7js9jfhzcak9rgzqh1lq56i2b1g4phwjncsxkirvx97rnz4ac",
-            "rev": "67e08b9d315cfa6a2ca3b3dc3954214c68a90cf5"
-        },
-        "recipe": {
-            "sha256": "0bkjykvl6sw797h7j76dzn1viy598asly98gcl5wrq13n4w1md4c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150924.1111",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "ac-sly": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "qoocku",
-            "repo": "ac-sly",
-            "sha256": "0mif35chyj4ai1bj4gq8qi38dyfsp72yi1xchhzy9zi2plpvqa7a",
-            "rev": "b37a1ecfaab10a6d81c6d894417176d3bb4c5285"
-        },
-        "recipe": {
-            "sha256": "1ng81b5f8w2s9mm9s7h5kwyx8fdwndnlsbzx50slmqyaz2ad15mx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150421.1522",
-        "deps": [
-            "auto-complete",
-            "cl-lib",
-            "sly"
-        ]
-    },
-    "subshell-proc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "andrewmains12",
-            "repo": "subshell-proc",
-            "sha256": "09izm28jrzfaj469v6yd1xgjgvy6pmxarcy0rzn2ihn3c0z7mdg4",
-            "rev": "d18b20e03fc89ee08e8c6a968aba31a16b53287f"
-        },
-        "recipe": {
-            "sha256": "1fnp49yhnhsj7paj0b25vr6r03hr5kpgcrci439ffpbd2c85fkw2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130122.1522",
-        "deps": []
-    },
-    "highlight-thing": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fgeller",
-            "repo": "highlight-thing.el",
-            "sha256": "01cx05dkrshcpddciiqvbfcc0zg0awbvg3r2n1v44kiixyfdpdwr",
-            "rev": "eaf817d61d13fc97142996211222f8d54b48d3aa"
-        },
-        "recipe": {
-            "sha256": "0rvdb1lx9xn9drqw0sw9ih759n10g7k0af39w6n8g0wfr67p96w1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151001.221",
-        "deps": []
-    },
-    "helm-bibtex": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tmalsburg",
-            "repo": "helm-bibtex",
-            "sha256": "1z38lssfjxan65p6y4lw1yyrnv41da2rmhmr43rnqv9rl1k68x8d",
-            "rev": "0475ffd145e2de5ee78691a364d2a0361c6483e2"
-        },
-        "recipe": {
-            "sha256": "1rsplnh18w1fqr6da79vj8x9q2lyss9sssy8pfz3hfw7p6qi6zkg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151223.52",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "f",
-            "helm",
-            "parsebib",
-            "s"
-        ]
-    },
-    "ssh-config-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jhgorrell",
-            "repo": "ssh-config-mode-el",
-            "sha256": "1v6srqiqq5xsjiw4d3kfgp218dks8mm6f9i88ngjri6sb3slpfb6",
-            "rev": "3d194c772d428144acd84c85be560ca96fb323ba"
-        },
-        "recipe": {
-            "sha256": "0aihyig6q3pmk9ld519f4n3kychrg3l7r29ijd2dpvs0530md4wb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141219.1046",
-        "deps": []
-    },
-    "imenu+": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/imenu+.el",
-            "sha256": "16f2a6jgwgczsaps55pnnyi38mw5z3fn4abybyr7hn0kf5xqip6q"
-        },
-        "recipe": {
-            "sha256": "1v2h3xs5pnv7z5qphkn2y5pa1p8pivrknkw7xihm5yr4a4dqjv5d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150104.1748",
-        "deps": []
-    },
-    "phi-search-mc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knu",
-            "repo": "phi-search-mc.el",
-            "sha256": "0r6cl1ng41s6wsy5syjlkaip0mp8h491diipdc1psbhnpk4vabsv",
-            "rev": "4c6d2d39feb502febb81fc98b7b5854d88150c69"
-        },
-        "recipe": {
-            "sha256": "07hd80rbyzr5n3yd7hv1j51nl6pvcxmln20g6xvw8gh5yfl9k0m8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150218.55",
-        "deps": [
-            "multiple-cursors",
-            "phi-search"
-        ]
-    },
-    "phi-search-dired": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "phi-search-dired",
-            "sha256": "1b44947hncw4q42fxxrz6fm21habzp4pyp0569xdwysrx2rca2fn",
-            "rev": "162a5e4507c72512affae22744bb606a906d4193"
-        },
-        "recipe": {
-            "sha256": "1gf3vs3vrp5kbq4ixnj7adazmnqixi63qswgc2512p10gf7inf8p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150405.214",
-        "deps": [
-            "phi-search"
-        ]
-    },
-    "rcirc-color": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kensanata",
-            "repo": "rcirc-color",
-            "sha256": "173lhi48dwfp9k7jmgivhcc9f38snz5xlciyjhrafpadq1pir497",
-            "rev": "a94c7811e6ab578a138eb582f7ce31d3568b5c4d"
-        },
-        "recipe": {
-            "sha256": "1a8qqwdc0gw6m1xsnwrj3xldp05p7pabyj6l4bccpg3vf5wbgkn5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151130.958",
-        "deps": []
-    },
-    "bury-successful-compilation": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "EricCrosson",
-            "repo": "bury-successful-compilation",
-            "sha256": "1bzilpjibyyj97z5j7zz89jx0kfqr842lrjlnq1qki8r5kj18p4j",
-            "rev": "0c05c006ab5d0a7262701d003aed5cf5fc9dd621"
-        },
-        "recipe": {
-            "sha256": "1gkq4r1573m6m57fp7x69k7kcpqchpcqfcz3792v0wxr22zhkwr3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150328.1928",
-        "deps": []
-    },
-    "html-to-markdown": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "html-to-markdown",
-            "sha256": "09n3zm9ivln8ng80fv5vwwzh9mj355ni685axda3m85xfxgai8gi",
-            "rev": "60c5498c801be186478cf7c05be05b4430c4a144"
-        },
-        "recipe": {
-            "sha256": "1gjh9ndqsb3nfb7w5h7carjckkgy6qh63b4mg141j19dsyx9rrjv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151105.240",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "emacsshot": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "marcowahl",
-            "repo": "emacsshot",
-            "sha256": "0jn4xj206idh5kgbklgcrngx6wvz9gwfm61wygar6pbfzqyx1y9b",
-            "rev": "8615aa841a37c20f8cc0f0efdc89c8d79acbb84b"
-        },
-        "recipe": {
-            "sha256": "08xqx017yfizdj8wz7nbh9i7qpar6398sri78abzf78inv828s9j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150516.1633",
-        "deps": []
-    },
-    "folding": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jaalto",
-            "repo": "project-emacs--folding-mode",
-            "sha256": "1z2dkyzj1gq3gp9cc3lhi240f8f3yjpjnw520xszm0wvx1rp06ny",
-            "rev": "f738e28cd90d794aff698bcd44bf4f5027c92839"
-        },
-        "recipe": {
-            "sha256": "0rb4f4llc4z502znmmc0hfi7n07lp01msx4y1iyqijvqzlq2i93y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140401.203",
-        "deps": []
-    },
-    "srefactor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tuhdo",
-            "repo": "semantic-refactor",
-            "sha256": "1n5p51iy79z60fnhxklc03pp0jbs5rgyb02z3wndbyzy73bhfh7b",
-            "rev": "e0482b08425894431fa67109615d4f0c971471c8"
-        },
-        "recipe": {
-            "sha256": "01cd40jm4h00c5q2ix7cskp7klbkcd3n5763y5lqfv59bjxwdqd2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151202.2204",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "dired-avfs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "dired-hacks",
-            "sha256": "15jri9cj5jgr3ff423izd8idd7djay238c9pa3ccy05djl9z2hdx",
-            "rev": "6647825dbca4269afa76302e345d6bd15b222e42"
-        },
-        "recipe": {
-            "sha256": "1q42pvrpmd525887iicd3m5gw4w2a78xb72v7fjfl30ay1kir4bm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141203.932",
-        "deps": [
-            "dash",
-            "dired-hacks-utils"
-        ]
-    },
-    "dircmp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "matthewlmcclure",
-            "repo": "dircmp-mode",
-            "sha256": "0mcsfsybpsxhzkd2m9bzc0np49azm6qf5x4x9h9lbxc8vfgh4z8s",
-            "rev": "558ee0b601c2de9d247612085aafe2926f56a09f"
-        },
-        "recipe": {
-            "sha256": "0cnj7b0s8vc83sh9sai1cldw54krk5qbz1qmlvvd1whryf2pc95c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141204.1156",
-        "deps": []
-    },
-    "kanban": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/ArneBab/kanban.el",
-            "sha256": "14g0f51jig8b1y6zfaw7b1cp692lddqzkc0ngf4y89sw9gbmsh3w",
-            "rev": "54d855426372"
-        },
-        "recipe": {
-            "sha256": "1sif2ayb8fq5vjz9lpkaq40aw9wiciz84yipab2qczszlgw1l1hb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150930.1117",
-        "deps": []
-    },
-    "wacspace": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "shosti",
-            "repo": "wacspace.el",
-            "sha256": "0nvlni3iy2sq76z8d4kj5492m0w7qv96shjqkynvlj0avf528hv4",
-            "rev": "4a11168d58c9c129cfcd04a1c9581962565eca4a"
-        },
-        "recipe": {
-            "sha256": "1xy0mprvyi37zmgj1yrlh5ni08j47lpag1jm3a76cgghgmlfjxrl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140827.32",
-        "deps": [
-            "cl-lib",
-            "dash"
-        ]
-    },
-    "helm-pages": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "david-christiansen",
-            "repo": "helm-pages",
-            "sha256": "0yngs3q6142g2nn1wwdaifylyfjjs3gmmy0jck5zh8mhmdgdqr06",
-            "rev": "60f52edb11e54f553251234f4d336c0947ca0a2b"
-        },
-        "recipe": {
-            "sha256": "1v3w8100invb5wsmm3dyl41pjs7s889s3b1rlr6vlcspa1ncv3wj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151209.1400",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "helm"
-        ]
-    },
-    "php-auto-yasnippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ejmr",
-            "repo": "php-auto-yasnippets",
-            "sha256": "1l64rka9wrnwdgfgwv8xh7mq9f1937z2v3r82qcfi6il3anw4zm0",
-            "rev": "7da250a0d40f3ec44c7249997436ee8c5cae04ef"
-        },
-        "recipe": {
-            "sha256": "1hhddvpc80b6wvjpbpibsf24rp5a5p45m0bg7m0c8mx181h9mqgn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141128.1611",
-        "deps": [
-            "php-mode",
-            "yasnippet"
-        ]
-    },
-    "summarye": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/summarye.el",
-            "sha256": "0q5m8d6p9aqbfx17zgznkqw2jgh027xix4894wrdz91670zxd3py"
-        },
-        "recipe": {
-            "sha256": "1znd96ixg1n90yjiny84igb7m8qsbiibn7s6bky8g6n2k7zzmq65",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130328.527",
-        "deps": []
-    },
-    "helm-ls-git": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-helm",
-            "repo": "helm-ls-git",
-            "sha256": "129mlpx5vqxyg2scrdiajxp71phxamrvijpc054k1q1an8vgn0kv",
-            "rev": "8cddd84ee4361b9d21f800adbaeeacf72645ab62"
-        },
-        "recipe": {
-            "sha256": "08rsy9479nk03kinjfkxddrq6wi4sx2a0wrz37cl2q517qi7sibj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151101.56",
-        "deps": [
-            "helm"
-        ]
-    },
-    "hl-todo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "hl-todo",
-            "sha256": "0lwcvwnkbfpjw92k4qfj57nlhv8xbl614p5dfi8qy76y8bs71cvd",
-            "rev": "4a5958b90d35c0ba368778274c2a3ab9df941d1c"
-        },
-        "recipe": {
-            "sha256": "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151025.1420",
-        "deps": []
-    },
-    "cython-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cython",
-            "repo": "cython",
-            "sha256": "1s26yr506b4v9bfrmqp2wyjdhxkc63nhis5azi9yhd0hg56nlyaq",
-            "rev": "20f028eb00b6b52083975aaa6738852b8840b497"
-        },
-        "recipe": {
-            "sha256": "0asai1f1pncrfxx296fn6ky09hj1qam5j0dpxxkzhy0a34xz0k2i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140705.1429",
-        "deps": []
-    },
-    "google": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "steckerhalter",
-            "repo": "google-el",
-            "sha256": "06p1dpnmg7lhdff1g7c04qq8f9srgkmnm42jlqy85k87j3p5ys2i",
-            "rev": "1ec11138bdd237e668ced1470c54f740e6c629a4"
-        },
-        "recipe": {
-            "sha256": "15z8l3adw8il0simk8phjgksh0v88cffb6gg3hv8a7nf5bla43my",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140330.1056",
-        "deps": []
-    },
-    "midje-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dnaumov",
-            "repo": "midje-mode",
-            "sha256": "1cigsr0hkbi1860w38k2j8fw6j4w43pgv2bpkmdsifbqy6l8grpg",
-            "rev": "07fc6cee4f5d6aa4187636266b9681a3e455ab6b"
-        },
-        "recipe": {
-            "sha256": "0069hwy5cyrsv5b1yvjhmjasywbmc8x3daq9hkzidy3a2fmqgqv3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150921.1950",
-        "deps": [
-            "cider",
-            "clojure-mode"
-        ]
-    },
-    "toggle-test": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rags",
-            "repo": "toggle-test",
-            "sha256": "0sgaslqxj806byidh06h5pqmqz8jzjfz9ky8jvkif3cq3a479jby",
-            "rev": "e969321f274903d705995a7d0345a257576ec5ff"
-        },
-        "recipe": {
-            "sha256": "0n8m325jcjhz8g75ysb9whsd12gpxw8598y5065j7c7gxjzv45l1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140723.37",
-        "deps": []
-    },
-    "cider": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "clojure-emacs",
-            "repo": "cider",
-            "sha256": "16f17jl94g5zvjayigkbr70mslg1mrk666aqjwiwqc8mg71h05h7",
-            "rev": "d191f8b364558cafec147d96d3e0415e18ad28bd"
-        },
-        "recipe": {
-            "sha256": "1a6hb728a3ir18c2dn9zfd3jn79fi5xjn5gqr7ljy6qb063xd4qx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151227.936",
-        "deps": [
-            "clojure-mode",
-            "emacs",
-            "pkg-info",
-            "queue",
-            "seq",
-            "spinner"
-        ]
-    },
-    "sudo-ext": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/sudo-ext.el",
-            "sha256": "0fpz73r52j7sk1w7my0002wg7isrp54w28nnrwk9xb9il4qpxag2"
-        },
-        "recipe": {
-            "sha256": "1iirrpa4rnz7rm85yjg60vdfca1ipxbk3qkld8lgwwm242pvvkw3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130130.1551",
-        "deps": []
-    },
-    "levenshtein": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/levenshtein.el",
-            "sha256": "0m94z18i1428bispxi285flvjf22kjm33s4sm0ad11m0w0jizir6"
-        },
-        "recipe": {
-            "sha256": "1iypnz0bw3baqxa9gldz8cikxvdhw60pvqp00kq5p3v4x3xcy4z2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20051013.1256",
-        "deps": []
-    },
-    "ox-pukiwiki": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yashi",
-            "repo": "org-pukiwiki",
-            "sha256": "0adj6gm39qw4ivb7csfh21qqqipcnw1sgm1xdqvrk86kbs9k1b2g",
-            "rev": "bdbde2c294f5d3de11f08a3fe19f01175d2e011a"
-        },
-        "recipe": {
-            "sha256": "10sfbri5hv5hyx9jc1bzlk4qmzfmpfgfy8wkjkpv7lv2x0axqd8a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150124.1116",
-        "deps": [
-            "org"
-        ]
-    },
-    "ac-slime": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "ac-slime",
-            "sha256": "13yghv7p6c91fn8mrxbwrb6ldk5n3b6nj6a7pwsvks1q73i1pl88",
-            "rev": "df6c4e88b5ba2d15d47a651ecf7edc0986624112"
-        },
-        "recipe": {
-            "sha256": "0mk3k1lcbqa16xvsbgk28x09vzqyaidqaqpq934xdbrwhdgwgckg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150729.2235",
-        "deps": [
-            "auto-complete",
-            "cl-lib",
-            "slime"
-        ]
-    },
-    "fastnav": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gleber",
-            "repo": "fastnav.el",
-            "sha256": "0y95lrdqd9i2kbb266s1wdiim4m8vrn3br19d8s55ib6xlywf8cx",
-            "rev": "1019ba2b61d1a070204099b23da347278a61bc89"
-        },
-        "recipe": {
-            "sha256": "08hg256w8k9f5nzgpyl1jykbf28vmvv09kkhzs0s2zhwbl2158a5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20120211.857",
-        "deps": []
-    },
-    "etags-select": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/etags-select.el",
-            "sha256": "0gmlmxlwfsfk5axn3x5cfvqy9bx26ynpbg50mdxiljk7wzqs5dyb"
-        },
-        "recipe": {
-            "sha256": "0j6mxj10n7jf087l7j86s3a8si5hzpwmvrpqisfvlnvn6a0rdy7h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130824.700",
-        "deps": []
-    },
-    "myterminal-controls": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myTerminal",
-            "repo": "myterminal-controls",
-            "sha256": "0mnkhp286nrifxbrzp7lbmr4bccm7byh1f2zid4l1hac4x5wcx86",
-            "rev": "6b40d5f606dd402b80b7c93775bece1063cbf826"
-        },
-        "recipe": {
-            "sha256": "0ipk5s2whf3l68q0dydm1j6rcb6jhk61hgjwxygdphifvih7c5y2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150427.547",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "xah-find": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xahlee",
-            "repo": "xah-find",
-            "sha256": "05dvmvh81n30l56gvlgzj0bwqd2fv1d6xvhvj5ywax6kqr9piwqv",
-            "rev": "e25eb9343fca71523ea6bf76741e6c5aab8004a4"
-        },
-        "recipe": {
-            "sha256": "1d3x9yhm7my3yhvgqnjxr2v28g5w1h4ri40sy6dqcx09bjf3jhyq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151214.1257",
-        "deps": []
-    },
-    "wandbox": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kosh04",
-            "repo": "emacs-wandbox",
-            "sha256": "00qzgabanmy4nkpnbc1m45j86k29plyyn408n1l0j8505fy9l7ca",
-            "rev": "cea03dec67e90a4c87eb9b6d69d1b3c68af541d0"
-        },
-        "recipe": {
-            "sha256": "0myyln82nx462bj79acvqxwvmblxild4vbygcrzw5chcwy6crvlz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150905.1024",
-        "deps": [
-            "emacs",
-            "json",
-            "tabulated-list"
-        ]
-    },
-    "verify-url": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lujun9972",
-            "repo": "verify-url",
-            "sha256": "199pab06cwym59110z3kcgikmp8m3y81bd3slr0n3ky40mh5rbh3",
-            "rev": "67a8c27ab331859ca5c1b4d757440a8d7a070696"
-        },
-        "recipe": {
-            "sha256": "1gd83rb1q0kywchd0345p5axqj1sv4f5kadympx5pbp4n5p1dqb2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151227.652",
-        "deps": [
-            "cl-lib",
-            "url"
-        ]
-    },
-    "paredit-menu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "phillord",
-            "repo": "phil-emacs-packages",
-            "sha256": "0ygckaj87swrnmsv5dhs55dngw1f22xm6238s9xb2axi3rr4w965",
-            "rev": "6e0142bae9cc3bfbea2fa134b6385af1c99ee782"
-        },
-        "recipe": {
-            "sha256": "17l05m1lg0vmahh53b2lvw316y4z7jz3nmy0zyiyiygax313y42l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130923.1454",
-        "deps": []
-    },
-    "el-init-viewer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "HKey",
-            "repo": "el-init-viewer",
-            "sha256": "13cc7nnslij28fa1469s9pfmnz8j0m6bayhrqxckd0xplvwwipnx",
-            "rev": "6e1aaab3e49d87253763e5b437d4f43f445b7774"
-        },
-        "recipe": {
-            "sha256": "0kkmsml9xf2n8nlrcicfg2l78s3dlhd6ssx0s62v77v4wdpl297m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150303.228",
-        "deps": [
-            "anaphora",
-            "cl-lib",
-            "ctable",
-            "dash",
-            "el-init",
-            "emacs"
-        ]
-    },
-    "gist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "defunkt",
-            "repo": "gist.el",
-            "sha256": "0q3ps5f6mr9hyf6nq1wshcm1z6a5yhskqd7dbbwq5dm78552z6z8",
-            "rev": "144280f5353bceb902d5278fa64078337e99fa4d"
-        },
-        "recipe": {
-            "sha256": "053fl8aw0ram9wsabzvmlm5w2klwd2pgcn2w9r1yqfs4xqja5sd3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150906.1154",
-        "deps": [
-            "emacs",
-            "gh"
-        ]
-    },
-    "clojure-mode-extra-font-locking": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "clojure-emacs",
-            "repo": "clojure-mode",
-            "sha256": "130s55mwzmi1almjajfl5bv3jra9ccafsiv240ls4agqkq2702vv",
-            "rev": "22b6709a651cc9c38a0c2a4c42df500ec3e46f1b"
-        },
-        "recipe": {
-            "sha256": "00nff9mkj61i76dj21x87vhz0bbkzgvkx1ypkxcv6yf3pfhq7r8n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150110.705",
-        "deps": [
-            "clojure-mode"
-        ]
-    },
-    "ggo-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mkjunker",
-            "repo": "ggo-mode",
-            "sha256": "0bwjiq4a4f5pg0ngvc3lmkk7aki8n9zqfa1dym0lk4vy6yfhcbhp",
-            "rev": "e326899d9ed8217c7a4ea6cfdc4dd7aea61d6c1b"
-        },
-        "recipe": {
-            "sha256": "1403x530n90jlfz3lq2vfiqx84cxsrhgs6hhmniq960cjj31q35p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130524.643",
-        "deps": []
-    },
-    "auctex-latexmk": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tom-tan",
-            "repo": "auctex-latexmk",
-            "sha256": "1h0044zfzklc9sy0a02vcdr75ly6wlhjx3n5bvq7yiicqd012316",
-            "rev": "b7d36658c8a9102055a720e9102e1d3514089659"
-        },
-        "recipe": {
-            "sha256": "1rdlgkiwlgm06i1gjxcfciz6wgdskfhln8qhixyfxk7pnz0ax327",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151217.757",
-        "deps": [
-            "auctex"
-        ]
-    },
-    "clojure-cheatsheet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "clojure-emacs",
-            "repo": "clojure-cheatsheet",
-            "sha256": "1ljb0g4yvrqgjqgmz8qz0c0swbx1m6gldmcdqnmxd72bs3w9p0k8",
-            "rev": "7f1ee3facf131609ac1b987439b9b14daa4d7402"
-        },
-        "recipe": {
-            "sha256": "05sw3bkdcadslpsk64ds0ciavmdgqk7fr5q3z505vvafmszfnaqv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151112.717",
-        "deps": [
-            "cider",
-            "helm"
-        ]
-    },
-    "ioccur": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thierryvolpiatto",
-            "repo": "ioccur",
-            "sha256": "1rz5wf19lg1lnm0h73ynhb0vl3c99k7vpipay2f8jls24pv60bra",
-            "rev": "4c0ef992a6fcd2aed62e3866d56650463108ab5a"
-        },
-        "recipe": {
-            "sha256": "1a9iy6x4lkm4wgkcb0pv86c2kvpq8ymrc4ssp109r67kwqw7lrr6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130822.48",
-        "deps": []
-    },
-    "shell-here": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ieure",
-            "repo": "shell-here",
-            "sha256": "0z04z07r7p5p05zhaka37s48y82hg2dbk0ynap4inph3frn4yyfl",
-            "rev": "251309141e18978d2b8014345acc6f5afcd4d509"
-        },
-        "recipe": {
-            "sha256": "0csi70v89bqdpbsizji6c5z0jmkx4x4vk1zfclkpap4dalmxxcsh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150728.1204",
-        "deps": []
-    },
-    "org-gnome": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "NicolasPetton",
-            "repo": "org-gnome.el",
-            "sha256": "0b57ik05iax2h3nrj96kysbk4hxmxlaabd0n6lv1xsayrlli3sj1",
-            "rev": "1012d47886cfd30eed25b73d9f18e475e0155f88"
-        },
-        "recipe": {
-            "sha256": "0c37gfs6xs0jbvg6ypd4z5ip1khm26wr5lxgmv1dzcc383ynzg0v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150614.957",
-        "deps": [
-            "alert",
-            "gnome-calendar",
-            "telepathy"
-        ]
-    },
-    "buster-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "buster-mode",
-            "sha256": "1viq7cb41r8klr8i38c5zjrhdnww31gh4j51xdgy4v2lc3z321zi",
-            "rev": "de6958ef8369400922618b8d1e99abfa91b97ac5"
-        },
-        "recipe": {
-            "sha256": "1qndhchc8y27x49znhnc4rny1ynfcplr64rczrlbj53qmkxn5am7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140928.713",
-        "deps": []
-    },
-    "osx-dictionary": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xuchunyang",
-            "repo": "osx-dictionary.el",
-            "sha256": "0frv92i7rj9fbjzgwf80zngq77394wjgijggda6d8ai75n5f47g1",
-            "rev": "ffbc358a4c686ea77e8bb88319ad192b4ff1aa55"
-        },
-        "recipe": {
-            "sha256": "13033fxc5vjd1f7mm6znmprcp3mwxbvblb2d25shr8d4imqqhv82",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151108.2352",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "phoenix-dark-pink-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "j0ni",
-            "repo": "phoenix-dark-pink",
-            "sha256": "042yw44d5pwykl177sdh209drc5f17yzhq0mxrf7qhycbjs4h8cg",
-            "rev": "314602b2e68c4054159ab3f0f6f6b658f232ada5"
-        },
-        "recipe": {
-            "sha256": "0bz6iw73d85bi12qqx6fdw3paqknrxvn0asbwjmgdcrlqrfczjlr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150406.2202",
-        "deps": []
-    },
-    "zzz-to-char": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mrkkrp",
-            "repo": "zzz-to-char",
-            "sha256": "1ai0a9r1xdz1jcr071ivm49wl906a0jqnhfaznw37jw9j2db58zn",
-            "rev": "5d3465122342265b6ff8495c60d9a7cb457be42a"
-        },
-        "recipe": {
-            "sha256": "16vwp0krshmn5x3ry1j512g4kydx39znjqzri4j7wgg49bz1n7vh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151030.232",
-        "deps": [
-            "avy",
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "automargin": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zk-phi",
-            "repo": "automargin",
-            "sha256": "02nnyncfh6g0xizy7wa8721ahpnwk451kngd6n0y0249f50p3962",
-            "rev": "4901d969ad69f5244e6300baab4ba04efed800c3"
-        },
-        "recipe": {
-            "sha256": "0llqz01wmacc0f8j3h7r0j57vkmzksl9vj1h0igfxzpm347mm9q8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20131112.214",
-        "deps": []
-    },
-    "pass": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "NicolasPetton",
-            "repo": "pass",
-            "sha256": "14zpkxnwvwdi7wnjw4827lzzn6kw8wmwr2whavpi4rlkq8ix6dv2",
-            "rev": "f43f6ada151a81f0bca4397b78382e4f6160d0ad"
-        },
-        "recipe": {
-            "sha256": "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151109.603",
-        "deps": [
-            "emacs",
-            "f",
-            "password-store"
-        ]
-    },
-    "jaunte": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kawaguchi",
-            "repo": "jaunte.el",
-            "sha256": "1bv0al89wlwdv3bhasxnwhsv84phgnixclgrh4l52385rjn8v53f",
-            "rev": "b719c2d4d5d70640d70978b661863d10d6be06fc"
-        },
-        "recipe": {
-            "sha256": "0chqiai7fv1idga71gc5dw4rdv1rblg5rrbdijh3glyi8yfr4snf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130413.419",
-        "deps": []
-    },
-    "monochrome-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fxn",
-            "repo": "monochrome-theme.el",
-            "sha256": "1sxhpvxapzgrwvzibkg7zd3ppmfcz5rhrbvg73b8rggjg4m5snyf",
-            "rev": "58fb4cf28c407f059b78bfd72c4dbced07638dd6"
-        },
-        "recipe": {
-            "sha256": "191ikqns1sxcz6ca6xp6mb2vyfj19x19cmcf17snrf46kmx60qk9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140326.550",
-        "deps": []
-    },
-    "ez-query-replace": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Wilfred",
-            "repo": "ez-query-replace.el",
-            "sha256": "15qa09x206s7rxmk35rslqniydh6hdb3n2kbspm5zrndcmsqz4zi",
-            "rev": "1c0cab96d65105b780e32fdd29d2c6933be72ef6"
-        },
-        "recipe": {
-            "sha256": "1h9ijr1qagwp9vvikh7ajby0dqgfypjgc45s7d93zb9jrg2n5cgx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140810.717",
-        "deps": [
-            "dash"
-        ]
-    },
-    "request": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tkf",
-            "repo": "emacs-request",
-            "sha256": "0dja4g43zfjbxqvz2cgivgq5sfm6fz1563qgrp4yxknl7bdggb92",
-            "rev": "adf7de452f9914406bfb693541f1d280093c4efd"
-        },
-        "recipe": {
-            "sha256": "0h4jqg98px9dqqvjp08vi2z1lhmk0ca59lnrcl96bi7gkkj3jiji",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140316.617",
-        "deps": []
-    },
-    "markdown-mode": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://jblevins.org/git/markdown-mode.git",
-            "sha256": "715de106b5be4b78b091ab76d70961e9232ee35f88673f55f5bfd01da6102e17",
-            "rev": "5a83366cc8e33f4a50f6283fb2cd0c3519d8577a"
-        },
-        "recipe": {
-            "sha256": "02lmhihv495drv9cb40h6l0xsbx7yglbvsdzc4r0vf78j87rs33f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151224.1008",
-        "deps": []
-    },
-    "sphinx-doc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "naiquevin",
-            "repo": "sphinx-doc.el",
-            "sha256": "0smxpv1i9nsaam4qc683491c4jwv3vqb7wpiyvjy2p9giqr3csjh",
-            "rev": "c6f3053b83eab029c13e680b8200c704880727b1"
-        },
-        "recipe": {
-            "sha256": "00h3wx2p5hzbw6sggggdrzv4jrn1wc051iqql5y2m1hsh772ic5z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150616.1350",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "s"
-        ]
-    },
-    "evil-smartparens": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "expez",
-            "repo": "evil-smartparens",
-            "sha256": "0xwrg03w40pncdy5ppn7f77ravcbimj1ylc1r4clpqiha1d4xkhi",
-            "rev": "0e89b23924b2e0baa0d11841ea5126967a072fa8"
-        },
-        "recipe": {
-            "sha256": "1viwrd6gfqmwhlil80pk68dikn3cjf9ddsy0z781z3qfx0j35qza",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151126.324",
-        "deps": [
-            "emacs",
-            "evil",
-            "smartparens"
-        ]
-    },
-    "org-protocol-jekyll": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vonavi",
-            "repo": "org-protocol-jekyll",
-            "sha256": "1jzp65sf1am6pz533kg1z666h4jlynvjyx1mf24gyksiiwdhypsy",
-            "rev": "f41902baaa62c8de3f81ad67a5f36d6aa5781578"
-        },
-        "recipe": {
-            "sha256": "18wg489n2d1sx9jk00ki6p2rxkqz67kqwnmy2kb1ga1rmb6x9wfs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151119.1038",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "autodisass-llvm-bitcode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gbalats",
-            "repo": "autodisass-llvm-bitcode",
-            "sha256": "1fq4h5fmamyh7z8nq6pigx74p5v8k3qfm64k66vwsm8bl5jdkw17",
-            "rev": "d2579e3a1427af2dc947c343e49eb3434078bf04"
-        },
-        "recipe": {
-            "sha256": "0bh73nzll9jp7kiqfnb5dwkipw85p3c3cyq58s0nghig02z63j01",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150410.2025",
-        "deps": []
-    },
-    "sourcemap": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-sourcemap",
-            "sha256": "085xd5fqxgv9bam9k4aa3w0sa9q41cg275i60c8njy3bkbqcalh5",
-            "rev": "d50fd8d169f2d347b24276a0d28bb197400fc657"
-        },
-        "recipe": {
-            "sha256": "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150418.900",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "json-snatcher": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Sterlingg",
-            "repo": "json-snatcher",
-            "sha256": "05zsgnk7grgw9jzwl80h5sxfpifxlr37b4mkbvx7mjq4z14xc2jw",
-            "rev": "c4cecc0a5051bd364373aa499c47a1bb7a5ac51c"
-        },
-        "recipe": {
-            "sha256": "0f6j9g3c5fz3wlqa88706cbzinrs3dnfpgsr2d3h3117gic4iwp4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150511.2247",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "dired-details": {
-        "fetch": {
-            "tag": "fetchurl",
-            "url": "http://www.emacswiki.org/emacs/download/dired-details.el",
-            "sha256": "1ddrhj1kw0wl7jbs9jn067vfffsvqhz4izfw9f7ihxz34fdl2iza"
-        },
-        "recipe": {
-            "sha256": "1390vl3i4qbnl7lbia98wznhf6x887d24f8p7146fpqjsiwbm5ck",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130824.658",
-        "deps": []
-    },
-    "gore-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sergey-pashaev",
-            "repo": "gore-mode",
-            "sha256": "0l022aqpnb38q6kgdqpbxrc1r7fljwl7xq14yi5jb7qgzw2v43cz",
-            "rev": "94d7f3e99104e06167967c98fdc201049c433c2d"
-        },
-        "recipe": {
-            "sha256": "0nljybh2pw8pbbajfsz57r11rs4bvzfxmwpbm5qrdn6dzzv65nq3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151123.1327",
-        "deps": [
-            "go-mode"
-        ]
-    },
-    "org-link-travis": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "org-link-travis",
-            "sha256": "1797pd264zn19zk93nifyw6pwk2a7wrpfir373qclk601yv2g5h8",
-            "rev": "596615ad8373d9090bd4138da683524f0ad0bda5"
-        },
-        "recipe": {
-            "sha256": "0hj4x7cw7a3ry8xislkz9bnavy77z4cpmnvns02yi3gnib53mlfs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140405.1827",
-        "deps": [
-            "org"
-        ]
-    },
-    "cryptol-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thoughtpolice",
-            "repo": "cryptol-mode",
-            "sha256": "00wgbcw09xn9xi52swi4wyi9dj9p9hyin7i431xi6zkhxysw4q7w",
-            "rev": "a54d000d24757fad2a91ae2853b16a97ebe52771"
-        },
-        "recipe": {
-            "sha256": "08iq69gqmps8cckybhj9065b8a2a49p0rpzgx883qxnypsmjfmf2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140426.1204",
-        "deps": []
-    },
-    "company-ycmd": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abingham",
-            "repo": "emacs-ycmd",
-            "sha256": "1lydq43xn51m4dwvv3qzrcsqw7dwbhxz4rinqx4m9y81caqakssx",
-            "rev": "3005b49176ff3315ba4cc7893fff42ce034d6e80"
-        },
-        "recipe": {
-            "sha256": "0fqmkb0q8ai605jzn2kwd585b2alwxbmnb3yqnn9fgkcvyc9f0pk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151022.1210",
-        "deps": [
-            "company",
-            "dash",
-            "deferred",
-            "s",
-            "ycmd"
-        ]
-    },
-    "unicode-emoticons": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hagleitn",
-            "repo": "unicode-emoticons",
-            "sha256": "015gjf8chd6h9azhyarmskk41cm0cmg981jif7q81hakl9av6rhh",
-            "rev": "fb18631f342b0243cf77cf59ed2067c47aae5233"
-        },
-        "recipe": {
-            "sha256": "15s6qjhrrqrhm87vmvd6akdclzba19613im85kfkhc24p6nxyhbn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150204.508",
-        "deps": []
-    },
-    "literate-coffee-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-literate-coffee-mode",
-            "sha256": "16xy6251ba0ca7r3wbjdng8i7pmcsh48lziczhrs5zx5y0b2j4zr",
-            "rev": "c55d0bec31438f15e986c5ad031dff853cfd1178"
-        },
-        "recipe": {
-            "sha256": "1bll1y9q3kcg3v250asjvx2k9kb314qadaq1iwanwgdlp3qvvs40",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20141216.1719",
-        "deps": [
-            "coffee-mode"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index 16f147695914..e5135b2c0c35 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -14,62 +14,171 @@ To update the list of packages from MELPA,
 
 { lib }:
 
-let
-
-  inherit (lib) makeScope mapAttrs;
-
-  json = builtins.readFile ./melpa-packages.json;
-  manifest = builtins.fromJSON json;
-
-  mkPackage = self: name: recipe:
-    let drv =
-          { melpaBuild, stdenv, fetchbzr, fetchcvs, fetchFromGitHub, fetchFromGitLab
-          , fetchgit, fetchhg, fetchsvn, fetchurl }:
-          let
-            unknownFetcher =
-              abort "emacs-${name}: unknown fetcher '${recipe.fetch.tag}'";
-            fetch =
-              {
-                inherit fetchbzr fetchcvs fetchFromGitHub fetchFromGitLab fetchgit fetchhg
-                        fetchsvn fetchurl;
-              }."${recipe.fetch.tag}"
-              or unknownFetcher;
-            args = builtins.removeAttrs recipe.fetch [ "tag" ];
-            src = fetch args;
-            recipeFile = fetchurl {
-              url = "https://raw.githubusercontent.com/milkypostman/melpa/${recipe.recipe.commit}/recipes/${name}";
-              inherit (recipe.recipe) sha256;
-            };
-          in melpaBuild {
-            pname = name;
-            inherit (recipe) version;
-            inherit recipeFile src;
-            packageRequires =
-              let lookupDep = d: self."${d}" or null;
-              in map lookupDep recipe.deps;
-            meta = {
-              homepage = "http://melpa.org/#/${name}";
-              license = stdenv.lib.licenses.free;
-            };
-          };
-    in self.callPackage drv {};
-
-in
-
 self:
 
   let
-    super = mapAttrs (mkPackage self) manifest;
+    imported = import ./melpa-generated.nix { inherit (self) callPackage; };
+    super = builtins.removeAttrs imported [
+      "swbuff-x" # required dependency swbuff is missing
+    ];
 
-    markBroken = pkg: pkg.override {
-      melpaBuild = args: self.melpaBuild (args // {
-        meta = (args.meta or {}) // { broken = true; };
+    dontConfigure = pkg: pkg.override (args: {
+      melpaBuild = drv: args.melpaBuild (drv // {
+        configureScript = "true";
       });
+    });
+
+    markBroken = pkg: pkg.override (args: {
+      melpaBuild = drv: args.melpaBuild (drv // {
+        meta = (drv.meta or {}) // { broken = true; };
+      });
+    });
+
+    overrides = {
+      ac-php = super.ac-php.override {
+        inherit (self.melpaPackages) company popup;
+      };
+
+      # upstream issue: mismatched filename
+      ack-menu = markBroken super.ack-menu;
+
+      airline-themes = super.airline-themes.override {
+        inherit (self.melpaPackages) powerline;
+      };
+
+      # upstream issue: missing file header
+      bufshow = markBroken super.bufshow;
+
+      # part of a larger package
+      # upstream issue: missing package version
+      cmake-mode = markBroken (dontConfigure super.cmake-mode);
+
+      # upstream issue: missing file header
+      cn-outline = markBroken super.cn-outline;
+
+      # upstream issue: missing file header
+      connection = markBroken super.connection;
+
+      # upstream issue: missing file header
+      crux = markBroken super.crux;
+
+      # upstream issue: missing file header
+      dictionary = markBroken super.dictionary;
+
+      easy-kill-extras = super.easy-kill-extras.override {
+        inherit (self.melpaPackages) easy-kill;
+      };
+
+      # missing git
+      egg = markBroken super.egg;
+
+      # upstream issue: missing file header
+      elmine = markBroken super.elmine;
+
+      ess-R-data-view = super.ess-R-data-view.override {
+        inherit (self.melpaPackages) ess ctable popup;
+      };
+
+      ess-R-object-popup = super.ess-R-object-popup.override {
+        inherit (self.melpaPackages) ess popup;
+      };
+
+      # missing OCaml
+      flycheck-ocaml = markBroken super.flycheck-ocaml;
+
+      # upstream issue: missing file header
+      fold-dwim = markBroken super.fold-dwim;
+
+      # upstream issue: mismatched filename
+      helm-lobsters = markBroken super.helm-lobsters;
+
+      # upstream issue: missing file header
+      helm-words = markBroken super.helm-words;
+
+      # upstream issue: missing file header
+      ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
+
+      # upstream issue: missing file header
+      initsplit = markBroken super.initsplit;
+
+      # upstream issue: missing file header
+      jsfmt = markBroken super.jsfmt;
+
+      # upstream issue: missing file header
+      link = markBroken super.link;
+
+      # upstream issue: mismatched filename
+      link-hint = markBroken super.link-hint;
+
+      # part of a larger package
+      llvm-mode = dontConfigure super.llvm-mode;
+
+      # upstream issue: missing file header
+      maxframe = markBroken super.maxframe;
+
+      # missing OCaml
+      merlin = markBroken super.merlin;
+
+      mhc = super.mhc.override {
+        inherit (self.melpaPackages) calfw;
+      };
+
+      # missing .NET
+      nemerle = markBroken super.nemerle;
+
+      # part of a larger package
+      notmuch = dontConfigure super.notmuch;
+
+      # missing OCaml
+      ocp-indent = markBroken super.ocp-indent;
+
+      # upstream issue: missing file header
+      perl-completion = markBroken super.perl-completion;
+
+      # upstream issue: truncated file
+      powershell = markBroken super.powershell;
+
+      # upstream issue: mismatched filename
+      processing-snippets = markBroken super.processing-snippets;
+
+      # upstream issue: missing file header
+      qiita = markBroken super.qiita;
+
+      # upstream issue: missing package version
+      quack = markBroken super.quack;
+
+      # upstream issue: missing file header
+      railgun = markBroken super.railgun;
+
+      # upstream issue: missing file footer
+      seoul256-theme = markBroken super.seoul256-theme;
+
+      spaceline = super.spaceline.override {
+        inherit (self.melpaPackages) powerline;
+      };
+
+      # upstream issue: missing file header
+      speech-tagger = markBroken super.speech-tagger;
+
+      # upstream issue: missing file header
+      stgit = markBroken super.stgit;
+
+      # upstream issue: missing file header
+      textmate = markBroken super.textmate;
+
+      # missing OCaml
+      utop = markBroken super.utop;
+
+      # upstream issue: missing file header
+      voca-builder = markBroken super.voca-builder;
+
+      # upstream issue: missing file header
+      window-numbering = markBroken super.window-numbering;
+
+      # upstream issue: missing file header
+      zeitgeist = markBroken super.zeitgeist;
     };
 
-    melpaPackages = super // {
-      # broken upstream
-      ack-menu = markBroken super.ack-menu;
-    };
+    melpaPackages = super // overrides;
   in
     melpaPackages // { inherit melpaPackages; }

From 7c42f9a20028a796d66fb4569d81a24917565857 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 15 Jan 2016 16:14:41 -0600
Subject: [PATCH 0095/2285] melpa-stable-packages 2016-01-18

The MELPA Stable package expressions are now generated in one file to
improve evaluation performance.
---
 .../emacs-modes/melpa-stable-generated.nix    | 26460 ++++++++++++++++
 .../emacs-modes/melpa-stable-packages.json    | 20813 ------------
 .../emacs-modes/melpa-stable-packages.nix     |   184 +-
 3 files changed, 26594 insertions(+), 20863 deletions(-)
 create mode 100644 pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
 delete mode 100644 pkgs/applications/editors/emacs-modes/melpa-stable-packages.json

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
new file mode 100644
index 000000000000..ad91c6e251db
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
@@ -0,0 +1,26460 @@
+{ callPackage }: {
+    abc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "abc-mode";
+        version = "20140225.944";
+        src = fetchFromGitHub {
+          owner = "mkjunker";
+          repo = "abc-mode";
+          rev = "6b5ab7402287dab5a091e94fec9982dc45d9d287";
+          sha256 = "13f4l9xzx4xm5m80kkb49zh31w0bn0kw9m5ca28rrx4aysqmwryv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/abc-mode";
+          sha256 = "0qf5lbszyscmagiqhc0d05vzkhdky7ini4w33z1h3j5417sscrcx";
+          name = "abc-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/abc-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-alchemist = callPackage ({ alchemist, auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-alchemist";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-ac-alchemist";
+          rev = "31114f3e1e7cc1e101d0b81819d7876d8861df92";
+          sha256 = "0a8widshsm39cbala17pmnk1sazazhhyqppwalysli170whk49c5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-alchemist";
+          sha256 = "02ll3hcixgdb8zyszn78714gy1h2q0vkhpbnwap9302mr2racwl0";
+          name = "ac-alchemist";
+        };
+        packageRequires = [ alchemist auto-complete cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-alchemist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-anaconda = callPackage ({ anaconda-mode, auto-complete, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-anaconda";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "proofit404";
+          repo = "ac-anaconda";
+          rev = "d0dec5c026235f65f9fd6594540df8886ed1b6a8";
+          sha256 = "0vrd6g9cl02jjxrjxpshq4pd748b5xszhpmakywrw8s08nh8jf44";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-anaconda";
+          sha256 = "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf";
+          name = "ac-anaconda";
+        };
+        packageRequires = [ anaconda-mode auto-complete dash ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-anaconda";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-cake = callPackage ({ auto-complete, cake, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-cake";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "k1LoW";
+          repo = "emacs-ac-cake";
+          rev = "f01b3da7e2d20ea5a62daf62412c7dc1ad0130ff";
+          sha256 = "12z8nq797hjy0bq5vzpcm7z7bdn0ixc3ma4cj3v51xnwmgknzk6c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-cake";
+          sha256 = "0s2pgf0m98ixgadsnn201vm5gnawanpvxv56sf599f33krqnxzkl";
+          name = "ac-cake";
+        };
+        packageRequires = [ auto-complete cake ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-cake";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-cake2 = callPackage ({ auto-complete, cake2, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-cake2";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "k1LoW";
+          repo = "emacs-ac-cake2";
+          rev = "ffbb679c0d5c261b05abde06d8d1d1e5d5990b6a";
+          sha256 = "0mlmhdl9s28z981y8bnpj8jpfzm6bgfiyl0zmpgvhyqw1wzqywwv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-cake2";
+          sha256 = "0qxilldx23wqf8ilif2nin119bvd0l7b6f6wifixx28a6kl1vsgy";
+          name = "ac-cake2";
+        };
+        packageRequires = [ auto-complete cake2 ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-cake2";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-capf = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-capf";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-ac-capf";
+          rev = "17571dba0a8f98111f2ab758e9bea285b263781b";
+          sha256 = "0nyq34yq4jcp3p30ygma3iz1h0q551p33792byj76pa5ps09g1da";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-capf";
+          sha256 = "1drgk5iz2wp3rxzd39pj0n4cfmm5z8zqlp50jw5z7ffbbg35qxbm";
+          name = "ac-capf";
+        };
+        packageRequires = [ auto-complete cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-capf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-cider = callPackage ({ auto-complete, cider, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-cider";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "clojure-emacs";
+          repo = "ac-cider";
+          rev = "0dcb8e3028f9f658cacbe1ac3e99b02575e2ecd4";
+          sha256 = "1vpj0lxbvlxffj2z29l109w70hcphiavyvglsw524agxql3c8yf9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-cider";
+          sha256 = "1dszpb706h34miq2bxqyq1ycbran5ax36vcniwp8vvhgcjsw5sz6";
+          name = "ac-cider";
+        };
+        packageRequires = [ auto-complete cider cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-cider";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-clang = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, yasnippet }:
+    melpaBuild {
+        pname = "ac-clang";
+        version = "1.6.0";
+        src = fetchFromGitHub {
+          owner = "yaruopooner";
+          repo = "ac-clang";
+          rev = "610ff778697eb5499394be3fc3652756d0bfb772";
+          sha256 = "1sdgpyq5p824dnxv6r7djwvhyhdmnis8k6992klr8iz7anhxzdam";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-clang";
+          sha256 = "070s06xhkzaqfc3j8c4i44rks6gn8z66lwd54j17p8d91x3qjpr4";
+          name = "ac-clang";
+        };
+        packageRequires = [ auto-complete cl-lib emacs pos-tip yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-clang";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-dcd = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, flycheck-dmd-dub, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-dcd";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "atilaneves";
+          repo = "ac-dcd";
+          rev = "4cb14b1e9fcfc4bf4a084765bc1eb10abfbbbd49";
+          sha256 = "0a3s880nswc2s6yh2v5zsmws550q917i7av8nrxc5sp1d03xqwmn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-dcd";
+          sha256 = "086jp9c6bilc361n1hscza3pbhgvqlq944z7cil2jm1kicsf8s7r";
+          name = "ac-dcd";
+        };
+        packageRequires = [ auto-complete flycheck-dmd-dub ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-dcd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-emoji = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-emoji";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-ac-emoji";
+          rev = "53677f754929ead403ccde64b714ebb6b8fc808e";
+          sha256 = "0cc3jpc4pihbyznyzvf6i3xwc2x78gb5m36ba9gkvxhabsljnlfg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-emoji";
+          sha256 = "0msh3dh89jzk6hxva34gp9d5pazchgdknxjbi72z26rss9bkp1mw";
+          name = "ac-emoji";
+        };
+        packageRequires = [ auto-complete cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-emoji";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-etags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-etags";
+        version = "0.6";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-ac-etags";
+          rev = "8cd188b2e4908285ba8178bbd18a555edd7282e8";
+          sha256 = "0ijni3qgd68jhznhirhgcl59cr7hwfvbwgf6z120x56jmp8h01d2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-etags";
+          sha256 = "0ag49k9izrs4ikzac9lifvvwhcn5n89lr2vb20pngsvg1czdyhzb";
+          name = "ac-etags";
+        };
+        packageRequires = [ auto-complete ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-etags";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-geiser = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, geiser, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-geiser";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "xiaohanyu";
+          repo = "ac-geiser";
+          rev = "0e2e36532336f27e3dc3b01fff55ad1a4329817d";
+          sha256 = "02ifz25rq64z0ifxs52aqdz0iz4mi6xvj88hcn3aakkmsj749vvn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-geiser";
+          sha256 = "0v558qz1mp8b1bgk8kgdk5sx5mpd353mw77n5b0pw4b2ikzpz2mx";
+          name = "ac-geiser";
+        };
+        packageRequires = [ auto-complete geiser ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-geiser";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-haskell-process = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-haskell-process";
+        version = "0.7";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "ac-haskell-process";
+          rev = "0362d4323511107ec70e7165cb612f3ab01b712f";
+          sha256 = "0m33v9iy3y37sicfmpx7kvmn8v1a8k6cs7d0v9v5k93p4d5ila41";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-haskell-process";
+          sha256 = "0kv4z850kv03wiax1flnrp6sgqja25j23l719w7rkr7ck110q8rw";
+          name = "ac-haskell-process";
+        };
+        packageRequires = [ auto-complete haskell-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-haskell-process";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-helm = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "ac-helm";
+        version = "2.1";
+        src = fetchFromGitHub {
+          owner = "yasuyk";
+          repo = "ac-helm";
+          rev = "f2110576b0eb35850a7f638c1a991a9fa0c8da3a";
+          sha256 = "1gw38phyaslpql7szvlpwgyfngdgd21f6lq406vq0gjwwmxgig34";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-helm";
+          sha256 = "16ajxlhcah5zbvywpc6l4l1arr308gjpgvdx6l1nrv2zvpckhlwq";
+          name = "ac-helm";
+        };
+        packageRequires = [ auto-complete helm popup ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-helm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-html = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }:
+    melpaBuild {
+        pname = "ac-html";
+        version = "0.31";
+        src = fetchFromGitHub {
+          owner = "cheunghy";
+          repo = "ac-html";
+          rev = "415a78c3b84855b0c0411832d21a0fb63239b184";
+          sha256 = "19v9515ixg22m7h7riix8w3vyhzax1m2pbwdirp59v532xn9b0cz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-html";
+          sha256 = "0qf8f75b6dvy844dq8vh8d9c6k599rh1ynjcif9bwvdpf6pxwvqa";
+          name = "ac-html";
+        };
+        packageRequires = [ auto-complete web-completion-data ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-html";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-html-bootstrap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }:
+    melpaBuild {
+        pname = "ac-html-bootstrap";
+        version = "0.9.3";
+        src = fetchFromGitHub {
+          owner = "osv";
+          repo = "ac-html-bootstrap";
+          rev = "591e1e996c820da218ea1eee0a500c556769f128";
+          sha256 = "1zmjqnlbfchnb7n2v7ms7q06xma1lmf9ry3v6f4pfnwlmz5lsf3a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-html-bootstrap";
+          sha256 = "0z71m6xws0k9smhsswaivpikr64mv0wh6klnmi5cwhwcqas6kdi1";
+          name = "ac-html-bootstrap";
+        };
+        packageRequires = [ web-completion-data ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-html-bootstrap";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-html-csswatcher = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }:
+    melpaBuild {
+        pname = "ac-html-csswatcher";
+        version = "0.1.7";
+        src = fetchFromGitHub {
+          owner = "osv";
+          repo = "ac-html-csswatcher";
+          rev = "dadc3c595cf1708291096c03987f1981f3cabc6b";
+          sha256 = "0p18wxyyc1jmcwx9y5i77s25v4jszv7cmm4bkwm4dzhkxd33kh1f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-html-csswatcher";
+          sha256 = "0jb9dnm2lxadrxssf0rjqw8yvvskcq4hys8c21shjyj3gkvwbfqn";
+          name = "ac-html-csswatcher";
+        };
+        packageRequires = [ web-completion-data ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-html-csswatcher";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-inf-ruby = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-inf-ruby";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "ac-inf-ruby";
+          rev = "3e22b66d3d3e2712a0fe783b5cdd0583a0d4c318";
+          sha256 = "1acm13n59sdgvvzicscxzrr5j1x5sa5x4rc4cnkbwb28nw5a5ysm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-inf-ruby";
+          sha256 = "04jclf0yxz78x1fsaf5sh1p466947nqrcx337kyhqn0nkj3hplqr";
+          name = "ac-inf-ruby";
+        };
+        packageRequires = [ auto-complete inf-ruby ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-inf-ruby";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-ispell = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-ispell";
+        version = "0.7";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-ac-ispell";
+          rev = "a8c84f7f0b96dc091abc51b1698f24e9c994e6aa";
+          sha256 = "16qsj3wni4xhcrjx2rnxdzq6jb7jrl4bngi4an37vgdlrx3w8m6l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-ispell";
+          sha256 = "1vsy2qjh60n5lavivpqhhcpg5pk8zz2r0wy1sb65capn841zdi67";
+          name = "ac-ispell";
+        };
+        packageRequires = [ auto-complete cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-ispell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-mozc = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, mozc }:
+    melpaBuild {
+        pname = "ac-mozc";
+        version = "0.0.4";
+        src = fetchFromGitHub {
+          owner = "igjit";
+          repo = "ac-mozc";
+          rev = "4c6c8be4701010d9362184437c0f783e0335c631";
+          sha256 = "19cb8kq8gmrplkxil22ahvbyq5cng1l2vh2lrfiyqpjsap7zfjz5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-mozc";
+          sha256 = "1v3iiid8cq50i076q98ycks9m827xzncgxqwqs2rqhab0ncy3h0f";
+          name = "ac-mozc";
+        };
+        packageRequires = [ auto-complete cl-lib mozc ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-mozc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-octave = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ac-octave";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "coldnew";
+          repo = "ac-octave";
+          rev = "eb6463631a69dfd06fe750c1c155594d11de0590";
+          sha256 = "16f8hvdz6y8nsfj7094yrvw194ag3w1jvz81h287vcgcvmyb7wdf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-octave";
+          sha256 = "1g5s4dk1rcgkjn17jfw6g201pw0vfhqcx1nhigmnizpnzy0man9z";
+          name = "ac-octave";
+        };
+        packageRequires = [ auto-complete ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-octave";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-php = callPackage ({ auto-complete, company, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope, yasnippet }:
+    melpaBuild {
+        pname = "ac-php";
+        version = "1.7.1";
+        src = fetchFromGitHub {
+          owner = "xcwen";
+          repo = "ac-php";
+          rev = "3147e2f10a3959c0f54fcc71f87a0a2ef64043d0";
+          sha256 = "11v45azd544fs4v5ndxxc2d6rbqh9r6mqx8gk1487jw7j290j6v8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-php";
+          sha256 = "0p9qq8nszp5jb71s35cxnmcxp50b62y2jv1ha7vvqfz5p8miallk";
+          name = "ac-php";
+        };
+        packageRequires = [
+          auto-complete
+          company
+          dash
+          emacs
+          f
+          php-mode
+          popup
+          s
+          xcscope
+          yasnippet
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-php";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-racer = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, racer }:
+    melpaBuild {
+        pname = "ac-racer";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-ac-racer";
+          rev = "2708b0a49afc89fb99a6d74a016cff6b94138ed0";
+          sha256 = "0g7xbfsfqpmcay56y8xbmif52ccz430s3rjxf5bgl9ahkk7zgkzl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-racer";
+          sha256 = "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp";
+          name = "ac-racer";
+        };
+        packageRequires = [ auto-complete cl-lib racer ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-racer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ac-slime = callPackage ({ auto-complete, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
+    melpaBuild {
+        pname = "ac-slime";
+        version = "0.8";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "ac-slime";
+          rev = "df6c4e88b5ba2d15d47a651ecf7edc0986624112";
+          sha256 = "13yghv7p6c91fn8mrxbwrb6ldk5n3b6nj6a7pwsvks1q73i1pl88";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-slime";
+          sha256 = "0mk3k1lcbqa16xvsbgk28x09vzqyaidqaqpq934xdbrwhdgwgckg";
+          name = "ac-slime";
+        };
+        packageRequires = [ auto-complete cl-lib slime ];
+        meta = {
+          homepage = "http://melpa.org/#/ac-slime";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ace-flyspell = callPackage ({ ace-jump-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ace-flyspell";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "ace-flyspell";
+          rev = "a850fa913b3d1bab4c00bacee41da934929cef52";
+          sha256 = "1pzh5l8dybrrmglj55nbff6065pxlbx14501p3a1qx1wvf24g1sv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-flyspell";
+          sha256 = "0f24qrpcvyg7h6ylyggn4zrbydci537iigshac1d8yywsr0j47gd";
+          name = "ace-flyspell";
+        };
+        packageRequires = [ ace-jump-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/ace-flyspell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ace-isearch = callPackage ({ ace-jump-mode, avy, emacs, fetchFromGitHub, fetchurl, helm-swoop, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ace-isearch";
+        version = "0.1.4";
+        src = fetchFromGitHub {
+          owner = "tam17aki";
+          repo = "ace-isearch";
+          rev = "7e041d058492c5c35ec70de0e7c5586043e7e5ec";
+          sha256 = "0233ai62zhsy5yhv72016clygwp2pcg80y6kr4cjm2k1k2wwy7m9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-isearch";
+          sha256 = "0n8qf08z9n8c2sp5ks29nxcfks5mil1jj6wq348apda8safk36hm";
+          name = "ace-isearch";
+        };
+        packageRequires = [ ace-jump-mode avy emacs helm-swoop ];
+        meta = {
+          homepage = "http://melpa.org/#/ace-isearch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ace-jump-buffer = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ace-jump-buffer";
+        version = "0.3.1";
+        src = fetchFromGitHub {
+          owner = "waymondo";
+          repo = "ace-jump-buffer";
+          rev = "41f8bb0744cdf9c219d25b417f2ffbd0883469e7";
+          sha256 = "1z82a0lrb61msamqpsy7rxcgs2nfhhckkk4zw0aw49l248p2nrgs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-jump-buffer";
+          sha256 = "0hkxa0ps0v1hwmjafqbnyr6rc4s0w95igk8y3w53asl7f5sj5mpi";
+          name = "ace-jump-buffer";
+        };
+        packageRequires = [ ace-jump-mode dash ];
+        meta = {
+          homepage = "http://melpa.org/#/ace-jump-buffer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ace-jump-helm-line = callPackage ({ avy, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ace-jump-helm-line";
+        version = "0.3.3";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "ace-jump-helm-line";
+          rev = "8259c2bd34486c3929c3425f3354d70cdb478c69";
+          sha256 = "0rrdh7jq23dyplq5rsf6f3a8v5f8smrzi85dgvqagasv74d19jbv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-jump-helm-line";
+          sha256 = "04q8wh6jskvbiq6y2xsp2ir23vgz5zw09rm127sgiqrmn0jc61b9";
+          name = "ace-jump-helm-line";
+        };
+        packageRequires = [ avy helm ];
+        meta = {
+          homepage = "http://melpa.org/#/ace-jump-helm-line";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ace-jump-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ace-jump-mode";
+        version = "2.0";
+        src = fetchFromGitHub {
+          owner = "winterTTr";
+          repo = "ace-jump-mode";
+          rev = "a62a6867811cd739dd98a5e00a2d2e17edfb5b71";
+          sha256 = "1bwvzh056ls2v7y26a0s4j5mj582dmds04lx4x6iqihs04ss74bb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-jump-mode";
+          sha256 = "0yk0kppjyblr5wamncrjm3ym3n8jcl0r0g0cbnwni89smvpngij6";
+          name = "ace-jump-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ace-jump-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ace-jump-zap = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ace-jump-zap";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "waymondo";
+          repo = "ace-jump-zap";
+          rev = "0acdd83a5abd59606495e67a4ee01f7856e5d359";
+          sha256 = "0yng6qayzqadk4cdviri84ghld4can35q134hm3n3j3vprhpbmca";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-jump-zap";
+          sha256 = "07bkmly3lvlbby2m13nj3m1q0gcnwy5sas7d6ws6vr9jh0d36byb";
+          name = "ace-jump-zap";
+        };
+        packageRequires = [ ace-jump-mode dash ];
+        meta = {
+          homepage = "http://melpa.org/#/ace-jump-zap";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ace-link = callPackage ({ ace-jump-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ace-link";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "ace-link";
+          rev = "f88b70fda761c235afe8d3f7735ef14bc82226f5";
+          sha256 = "1v127ld04gn16bgismbcz91kfjk71f3g8yf10r4scfp603y41zgz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-link";
+          sha256 = "1jl805r2s3wa0xyhss1q28rcy6y2fngf0yfcrcd9wf8kamhpajk5";
+          name = "ace-link";
+        };
+        packageRequires = [ ace-jump-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/ace-link";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ace-pinyin = callPackage ({ ace-jump-mode, avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ace-pinyin";
+        version = "0.2.3";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "ace-pinyin";
+          rev = "10f66ba2355bed78ef0a1ad24edb00972a0dbe02";
+          sha256 = "10n01sgdi1zq1fyb5ani1fbvwfnqnj74rxzmw5v0y72cwq27r9kr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-pinyin";
+          sha256 = "18gmj71zd0i6yx8ifjxsqz2v81jx0j37f5kxllf31w7fj32ymbkc";
+          name = "ace-pinyin";
+        };
+        packageRequires = [ ace-jump-mode avy ];
+        meta = {
+          homepage = "http://melpa.org/#/ace-pinyin";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ace-popup-menu = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ace-popup-menu";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "ace-popup-menu";
+          rev = "eb8d0d938debdf89575d2ed204aeb7c0b52060b0";
+          sha256 = "061gi4w43dvdys2i0ffc3bnzhrkc83h5x2c43yv4fwb3xz0zn9h0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-popup-menu";
+          sha256 = "1cq1mpv7v98bqrpsm598krq1741b6rwih71cx3yjifpbagrv4m5s";
+          name = "ace-popup-menu";
+        };
+        packageRequires = [ avy cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ace-popup-menu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ace-window = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ace-window";
+        version = "0.9.0";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "ace-window";
+          rev = "eef897e590c4ce63c28fd29ebff3c97aec8a69ae";
+          sha256 = "07mcdzjmgrqdvjs94f2n5bkrf5vrq2fwzz256wbm3wzqxqkfy1q6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-window";
+          sha256 = "1k0x8m1phmvgdxb5aj841iai9q96a5lfq8i4b5vnlbc3w888n3xa";
+          name = "ace-window";
+        };
+        packageRequires = [ avy ];
+        meta = {
+          homepage = "http://melpa.org/#/ace-window";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ack-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ack-menu";
+        version = "0.2.3";
+        src = fetchFromGitHub {
+          owner = "chumpage";
+          repo = "ack-menu";
+          rev = "37e9979eb65e3803fc00829377397b4e6f2bd059";
+          sha256 = "0hib4a8385q2czi1yqs0hwnva2xi7kw0bdfnrgha1hrl30rilp2f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ack-menu";
+          sha256 = "1d2kw04ndxji2qjcm1b65qnxpp08zx8gbia8bl6x6mnjb2isc2d9";
+          name = "ack-menu";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ack-menu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    actionscript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "actionscript-mode";
+        version = "7.2.2";
+        src = fetchFromGitHub {
+          owner = "austinhaas";
+          repo = "actionscript-mode";
+          rev = "fddd7220342d29e7eca734f6b798b7a2849717a5";
+          sha256 = "0zybch8hz3mj63i0pxynb4d76ywqcy7b4fsa4hh71c2kb0bnczb3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/actionscript-mode";
+          sha256 = "1dkiay9jmizvslji5kzab4dxm1dq0jm8ps7sjq6710g7a5aqdvwq";
+          name = "actionscript-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/actionscript-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    adoc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, markup-faces, melpaBuild }:
+    melpaBuild {
+        pname = "adoc-mode";
+        version = "0.6.4";
+        src = fetchFromGitHub {
+          owner = "sensorflo";
+          repo = "adoc-mode";
+          rev = "b6d54d9007b97f2553c238e0c36586079b666f4f";
+          sha256 = "1mb7dlyd5w161xagwn6w5h4q660dppkd50m71vz0w3zmxsc9a0vq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/adoc-mode";
+          sha256 = "0wgagcsh0fkb51fy17ilrs20z2vzdpmz97vpwijcfy2b9rypxq15";
+          name = "adoc-mode";
+        };
+        packageRequires = [ markup-faces ];
+        meta = {
+          homepage = "http://melpa.org/#/adoc-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "aes";
+        version = "0.8";
+        src = fetchFromGitHub {
+          owner = "Sauermann";
+          repo = "emacs-aes";
+          rev = "d78796facc034b09f379cda5f27090f3139305ec";
+          sha256 = "1y9bw2vkl952pha2dsi18swyr94mihgwlcg5m8hg4d5bfg2fzcb2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aes";
+          sha256 = "11vl9x3ldrv7q7rd29xk4xmlvfxs0m6iys84f6mlgf00190l5r5v";
+          name = "aes";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/aes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "ag";
+        version = "0.46";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "ag.el";
+          rev = "12f22a4a9f4ff3c8a0b6f089b8cf6d85a3f8b7eb";
+          sha256 = "0hpsv2zyhhfm53hrd2lzvc9gpvfn6g5dpwmzxfl8l1sqjisips2a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ag";
+          sha256 = "1r4ai09vdckkg4h4i7dp781qqmm4kky53p4q8azp3n2c78i1vz6g";
+          name = "ag";
+        };
+        packageRequires = [ cl-lib dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/ag";
+          license = lib.licenses.free;
+        };
+      }) {};
+    aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "aggressive-indent";
+        version = "1.4.2";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "aggressive-indent-mode";
+          rev = "970c5e3bd4519deed8b8b604a5a96269166bf697";
+          sha256 = "0nss26rz8qly0q00iq7i7q4ss3xvs4s5ndjjmfxhybmnb71a8y9k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aggressive-indent";
+          sha256 = "1qi8jbr28gax35siim3hnnkiy8pa2vcrzqzc6axr98wzny46x0i2";
+          name = "aggressive-indent";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/aggressive-indent";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ahk-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ahk-mode";
+        version = "1.5.5";
+        src = fetchFromGitHub {
+          owner = "ralesi";
+          repo = "ahk-mode";
+          rev = "7b47b40952708ea4e9a0f1969f00caa92700513a";
+          sha256 = "1qqrf9ncc3blkv4p2bhh9q6y41pp9p4wr667mm80vb5j8rkpsaa8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ahk-mode";
+          sha256 = "066l4hsb49wbyv381qgn9k4hn8gxlzi20h3qaim9grngjj5ljbni";
+          name = "ahk-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ahk-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
+    melpaBuild {
+        pname = "airline-themes";
+        version = "1.2";
+        src = fetchFromGitHub {
+          owner = "AnthonyDiGirolamo";
+          repo = "airline-themes";
+          rev = "b7d06424ce7d596f5bff3105d3eaa416f173436a";
+          sha256 = "0q9m7lih760p7yrpqvpxdks5h6ac7dj4fi0qviyicbjlz9mqw7wp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/airline-themes";
+          sha256 = "0jkhb6nigyjmwqny7g59h4ssfy64vl3qnwcw46wnx5k9i73cjyih";
+          name = "airline-themes";
+        };
+        packageRequires = [ powerline ];
+        meta = {
+          homepage = "http://melpa.org/#/airline-themes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
+    melpaBuild {
+        pname = "alchemist";
+        version = "1.7.0";
+        src = fetchFromGitHub {
+          owner = "tonini";
+          repo = "alchemist.el";
+          rev = "19e70b7eea28ee33e1c7f023a82eaee541d75c36";
+          sha256 = "0m05wxvvygc4rpkgnnmk6zrp3d8fylzzjz5ag7lh0jk5al4gfay5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/alchemist";
+          sha256 = "18jxw0zb7y34qbm4bcpfpb2656f0h9grmrbfskgp4ra4q5q3n369";
+          name = "alchemist";
+        };
+        packageRequires = [ company dash elixir-mode emacs pkg-info ];
+        meta = {
+          homepage = "http://melpa.org/#/alchemist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "alect-themes";
+        version = "0.7";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "alect-themes";
+          rev = "db7cc6ebf695a71881d803966d672f80fe967da6";
+          sha256 = "1pk5dgjqrynap85700wdivq41bdqvwd5hkfimgmcd48l5lhj9pbj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/alect-themes";
+          sha256 = "04fq65qnxlvl5nc2q037c6yb4nf422dfw2913gv6zfh9rdmxsks8";
+          name = "alect-themes";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/alect-themes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    alert = callPackage ({ fetchFromGitHub, fetchurl, gntp, lib, log4e, melpaBuild }:
+    melpaBuild {
+        pname = "alert";
+        version = "1.2";
+        src = fetchFromGitHub {
+          owner = "jwiegley";
+          repo = "alert";
+          rev = "b301478e34a5c8bd27c17fc7605e6dd576e97935";
+          sha256 = "1vpc3q40m6dcrslki4bg725j4kv6c6xfxwjjl1ilg7la49fwwf26";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/alert";
+          sha256 = "0x3cvczq09jvshz435jw2fjm69457x2wxdvvbbjq46nfnybhi118";
+          name = "alert";
+        };
+        packageRequires = [ gntp log4e ];
+        meta = {
+          homepage = "http://melpa.org/#/alert";
+          license = lib.licenses.free;
+        };
+      }) {};
+    amd-mode = callPackage ({ dash, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s }:
+    melpaBuild {
+        pname = "amd-mode";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "NicolasPetton";
+          repo = "amd-mode.el";
+          rev = "16500ccc16e98bf28395b576afa83ec7bcb7b101";
+          sha256 = "00kfnkr0rclzbir2xxzr9wf2g0hf1alc004v8i9mqf3ab6dgdqiy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/amd-mode";
+          sha256 = "17ry6vm5xlmdfs0mykdyn05cik38yswq5axdgn8hxrvvb6f58d06";
+          name = "amd-mode";
+        };
+        packageRequires = [ dash f js2-mode js2-refactor makey projectile s ];
+        meta = {
+          homepage = "http://melpa.org/#/amd-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
+    melpaBuild {
+        pname = "anaconda-mode";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "proofit404";
+          repo = "anaconda-mode";
+          rev = "2ad7c1ee5b786d900154982270e4c68a4fe5b404";
+          sha256 = "0sj6cr2bghy80dnwgl7rg61abdlvgfzi0jjc7jrxz7fdzwkcq714";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anaconda-mode";
+          sha256 = "0gz16aam4zrm3s9ms13h4qcdflf55506kgkpyncq3bi54cvv8n1r";
+          name = "anaconda-mode";
+        };
+        packageRequires = [ dash emacs f pythonic s ];
+        meta = {
+          homepage = "http://melpa.org/#/anaconda-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anaphora = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "anaphora";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "anaphora";
+          rev = "20bf7dcfa502538d23525f0905b4f845d97993d3";
+          sha256 = "0fnxxvw81c34zhmiyr5awl92wr5941n4gklvzjc4jphaf2nhkg4w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anaphora";
+          sha256 = "1wb7fb3pc4gxvpjlm6gjbyx0rbhjiwd93qwc4vfw6p865ikl19y2";
+          name = "anaphora";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/anaphora";
+          license = lib.licenses.free;
+        };
+      }) {};
+    android-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "android-mode";
+        version = "0.4.0";
+        src = fetchFromGitHub {
+          owner = "remvee";
+          repo = "android-mode";
+          rev = "146476c5ae958715520bec2b7f8de6b30c48c19f";
+          sha256 = "0gjynmzqlqz0d57fb4np6xrklqdn11y4vjbm18rlpvmk92bgw740";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/android-mode";
+          sha256 = "1nqrvq411yg4b9xb5cvc7ai7lfalwc2rfhclzprvymc4vxh6k4cc";
+          name = "android-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/android-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    angular-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "angular-mode";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "omouse";
+          repo = "angularjs-mode";
+          rev = "7c0fb37f59dfd9e69f00b50e90a0e88c4e25d8c2";
+          sha256 = "1798nv4djhxzbin68zf6w7dbfm9sc39d0kygky52ii36arg5r1zp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/angular-mode";
+          sha256 = "1bwfmjldnxki0lqi3ys6r2a3nlhbwm1dibsg2dvzirq8qql02w1i";
+          name = "angular-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/angular-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    angular-snippets = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "angular-snippets";
+        version = "0.2.3";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "angular-snippets.el";
+          rev = "8f737c2cf5fce758a7a3833ebad2952b5398568d";
+          sha256 = "0h9i0iimanbvhbqy0cj9na335rs961pvhxjj4k8y53qc73xm102a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/angular-snippets";
+          sha256 = "057phgizn1c6njvdfigb23ljs31knq247gr0rcpqfrdaxsnnzm5c";
+          name = "angular-snippets";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/angular-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    annotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "annotate";
+        version = "0.4.4";
+        src = fetchFromGitHub {
+          owner = "bastibe";
+          repo = "annotate.el";
+          rev = "a1690384317ce366e5a33aec916949e3328a0117";
+          sha256 = "18ninv1z8zdqpqnablbds4zgxgk4c1nmznlfdicj6qs738c5c30s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/annotate";
+          sha256 = "1ajykgara2m713blj2kfmdz12fzm8jw7klyakkyi6i3c3a9m44jy";
+          name = "annotate";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/annotate";
+          license = lib.licenses.free;
+        };
+      }) {};
+    annoying-arrows-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "annoying-arrows-mode";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "annoying-arrows-mode.el";
+          rev = "fe59f3fd464e7a87cc43fb8a1f135b3bdf8a2fb3";
+          sha256 = "1ppq3kszzj2fgr7mwj565bjs8bs285ymy384cnnw7paddgcr9z02";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/annoying-arrows-mode";
+          sha256 = "13bwqv3mv7kgi1gms58f5g03q5g7q98n4vv6n28zqmppxm5z33s7";
+          name = "annoying-arrows-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/annoying-arrows-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ansi = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "ansi";
+        version = "0.4.1";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "ansi";
+          rev = "a042c5954453bab9a74177e2b78ad17a824caebc";
+          sha256 = "1hbddxarr40ygvaw4pwaivq2l4f0brszw73w1r50lkjlggb7bl3g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ansi";
+          sha256 = "04n0kvaqq8214prdk20bplqyzlsnlzfzsg23ifkrzjgqjjpdcyi1";
+          name = "ansi";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/ansi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ansible = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "ansible";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "k1LoW";
+          repo = "emacs-ansible";
+          rev = "e9b9431738de4808d8ef70871069f68885cc0d98";
+          sha256 = "03d240jngxw51ybrsjw8kdxygrr0ymdckzwga2jr1bqf26v559j2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ansible";
+          sha256 = "1xdc05fdglqfbizra6s1zl6knnvaq526dkxqnw9g7w269j8f4z8g";
+          name = "ansible";
+        };
+        packageRequires = [ f s ];
+        meta = {
+          homepage = "http://melpa.org/#/ansible";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ansible-doc = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ansible-doc";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "lunaryorn";
+          repo = "ansible-doc.el";
+          rev = "6ab94392c860e23439ea3213b74ca56834d1ab14";
+          sha256 = "05z379k6a7xq9d2zapf687x3f37jpmh6kfghpgxdd18v0hzca8ds";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ansible-doc";
+          sha256 = "03idvnn79fr9id81aivkm7g7cmlsg0c520wcq4da8g013xvi342w";
+          name = "ansible-doc";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ansible-doc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anti-zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "anti-zenburn-theme";
+        version = "2.3.1";
+        src = fetchFromGitHub {
+          owner = "m00natic";
+          repo = "anti-zenburn-theme";
+          rev = "ed9760daa4224666105d9449ea1d77710c297fe2";
+          sha256 = "1i1xb04g17f6029w0n8fp55gklgr9kh6c24m9dfrkn5q3dlvd26p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anti-zenburn-theme";
+          sha256 = "1sp9p6m2jy4m9fdn1hz25cmasy0mwwgn46qmvm92i56f5x6jlzzk";
+          name = "anti-zenburn-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/anti-zenburn-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anyins = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "anyins";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "antham";
+          repo = "anyins";
+          rev = "1ff4673ca197c9bf64c65f718573bf7d478fc562";
+          sha256 = "1z6l72dn98icqsmxb3rrj6l63ijc3xgfa3vdl19yqa2rfy6ya721";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anyins";
+          sha256 = "0ncf3kn8rackcidkgda2zs60km3hx87rwr9daj7ksmbb6am09s7c";
+          name = "anyins";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/anyins";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anything = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "anything";
+        version = "1.3.9";
+        src = fetchgit {
+          url = "http://repo.or.cz/r/anything-config.git";
+          rev = "6b9718fba257e6c2912ba70f9895251ab1926928";
+          sha256 = "86b90766ccb31a492998299092a3d0b892a8ac0bdb8e1833ef75fa6d79c7c721";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything";
+          sha256 = "13pmks0bsby57v3vp6jcvvzwb771d4qq62djgvrw4ykxqzkcb8fj";
+          name = "anything";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/anything";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anything-exuberant-ctags = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "anything-exuberant-ctags";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "k1LoW";
+          repo = "anything-exuberant-ctags";
+          rev = "97fa91eb04df11bdf4558fe7bb2f6aebf8be0d6c";
+          sha256 = "01lw9159axg5w9bpdy55m4zc902zmsqvk213ky1nmgnln0fvq3rd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-exuberant-ctags";
+          sha256 = "0p0jq2ggdgaxv2gd9m5iza0y3mjjc82xmgp899yr15pfffa4wihk";
+          name = "anything-exuberant-ctags";
+        };
+        packageRequires = [ anything ];
+        meta = {
+          homepage = "http://melpa.org/#/anything-exuberant-ctags";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anything-replace-string = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "anything-replace-string";
+        version = "0.9.2";
+        src = fetchFromGitHub {
+          owner = "k1LoW";
+          repo = "anything-replace-string";
+          rev = "1962f24243d6013bcef7e8d23136277d42e13130";
+          sha256 = "1834yj2vgs4dasdfnppc8iw8ll3yif948biq9hj0sbpsa2d8y44k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-replace-string";
+          sha256 = "1fagi6cn88p6sf1yhx1qsi7nw9zpyx9hdfl66iyskqwddfvywp71";
+          name = "anything-replace-string";
+        };
+        packageRequires = [ anything ];
+        meta = {
+          homepage = "http://melpa.org/#/anything-replace-string";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anything-sage = callPackage ({ anything, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sage-shell-mode }:
+    melpaBuild {
+        pname = "anything-sage";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "stakemori";
+          repo = "anything-sage";
+          rev = "8335657d3f0611bd5fc8858160bbe87dfdbaf0f2";
+          sha256 = "1bcvin2694ypqgiw0mqk82riq7gw6ra10vbkzng1yp9jp2qr6wmm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-sage";
+          sha256 = "1878vj8hzrwfyd2yvxcm0f1vm9m0ndwnj0pcq7j8zm9lxj0w48p3";
+          name = "anything-sage";
+        };
+        packageRequires = [ anything cl-lib sage-shell-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/anything-sage";
+          license = lib.licenses.free;
+        };
+      }) {};
+    anzu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "anzu";
+        version = "0.59";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-anzu";
+          rev = "6fded24b366efc4cf27166104c1928f7d1fedaa7";
+          sha256 = "1d2laybz1igrr9nnkmfsnrvsjw7qmrgby4wnrxprins9gq263lra";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anzu";
+          sha256 = "0i2ia0jisj31vc2pjx9bhv8jccbp24q7c406x3nhh9hxjzs1f41i";
+          name = "anzu";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/anzu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    apples-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "apples-mode";
+        version = "0.0.2";
+        src = fetchFromGitHub {
+          owner = "tequilasunset";
+          repo = "apples-mode";
+          rev = "fac47b6255e79a373c5d5e1abe66ea5d74588e9f";
+          sha256 = "13j2r4nx2x6j3qx50d5rdnqd8nl5idxdkhizsk7ccz3v2607fbyy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/apples-mode";
+          sha256 = "05ssnxs9ybc26jhr69xl9jpb41bz1688minmlc9msq2nvyfnj97s";
+          name = "apples-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/apples-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    aproject = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "aproject";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "vietor";
+          repo = "aproject";
+          rev = "3c7d23c341862dfd77fd0a64775df12ddb44ab54";
+          sha256 = "1wyz8jvdy4m0cn75mm3zvxagm2gl10q51479f91gnqv14b4rndfc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aproject";
+          sha256 = "0v3gx2mff2s7knm69y253pm1yr4svy8w00pqbn1chrvymb62jhp2";
+          name = "aproject";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/aproject";
+          license = lib.licenses.free;
+        };
+      }) {};
+    artbollocks-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "artbollocks-mode";
+        version = "1.1.2";
+        src = fetchFromGitHub {
+          owner = "sachac";
+          repo = "artbollocks-mode";
+          rev = "583c7048a1b09cd79554423d5115f5ddd129d190";
+          sha256 = "133c1n4ra7z3vb6y47400y71a6ac19pyji0bgd4kr9fcbx0flx91";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/artbollocks-mode";
+          sha256 = "0dlnxicn6nzyiz44y92pbl4nzr9jxfb9a99wacjrwq2ahdrwhhjp";
+          name = "artbollocks-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/artbollocks-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    asilea = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "asilea";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "asilea";
+          rev = "2aab1cc63b64ef08d12e84fd7ba5c94065f6039f";
+          sha256 = "1s973vzivibaqjb8acn4ylrdasxh17jcfmmvqp4wm05nwhg75597";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/asilea";
+          sha256 = "1lb8nr6r6yy06m4pxg8w9ja4zv8k5xwhl95v2wv95y1qwhgnwg3j";
+          name = "asilea";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/asilea";
+          license = lib.licenses.free;
+        };
+      }) {};
+    async = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "async";
+        version = "1.6";
+        src = fetchFromGitHub {
+          owner = "jwiegley";
+          repo = "emacs-async";
+          rev = "c25bf17b34a1608da45e8a1ca02e1c89a34acd34";
+          sha256 = "0z91alzf4ajj3r7pnwazynvp81cg67csy9kf87fk98024xldpkdp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/async";
+          sha256 = "063ci4f35x1zm9ixy110i5ds0vsrcafpixrz3xkvpnfqdn29si3f";
+          name = "async";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/async";
+          license = lib.licenses.free;
+        };
+      }) {};
+    aurel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "aurel";
+        version = "0.7";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "aurel";
+          rev = "3458214e0d2942b03c2926de67ca06cbe42b37d0";
+          sha256 = "01ig5v5f2xya7hyq678nd8j8x972yfbni813c0imxkkba996a2k7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aurel";
+          sha256 = "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl";
+          name = "aurel";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/aurel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    aurora-config-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "aurora-config-mode";
+        version = "0.0.2";
+        src = fetchFromGitHub {
+          owner = "bdd";
+          repo = "aurora-config.el";
+          rev = "0a7ca7987c3a0824e25470389c7d25c337a81593";
+          sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aurora-config-mode";
+          sha256 = "0yqmpwj1vp0d5w9zw1hbyxzsbvw165dsgk1v1dxizkqwn7b1v7jm";
+          name = "aurora-config-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/aurora-config-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auth-password-store = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store, seq }:
+    melpaBuild {
+        pname = "auth-password-store";
+        version = "1.0.3";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "auth-password-store";
+          rev = "d7fc1f026c3f43190cacedfa6eff8da916e607f5";
+          sha256 = "0gi65n1np63zi2ylc4y1licwvk97jl92s1v98fv5y61kppi1d8sq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auth-password-store";
+          sha256 = "118ll12dhhxmlsp2mxmy5cd91166a1qsk406yhap5zw1qvyg58w5";
+          name = "auth-password-store";
+        };
+        packageRequires = [ cl-lib emacs password-store seq ];
+        meta = {
+          homepage = "http://melpa.org/#/auth-password-store";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-compile = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, packed }:
+    melpaBuild {
+        pname = "auto-compile";
+        version = "1.3.0";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "auto-compile";
+          rev = "90eddfb63bd2b58be8a3fe9400b67ea45f67bb29";
+          sha256 = "07vnk8az4lcxncqn01jvks38b4hpdmg43nbby2b39zy50agqnwsg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-compile";
+          sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks";
+          name = "auto-compile";
+        };
+        packageRequires = [ dash emacs packed ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-compile";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-complete = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "auto-complete";
+        version = "1.5.0";
+        src = fetchFromGitHub {
+          owner = "auto-complete";
+          repo = "auto-complete";
+          rev = "70770b17168c30fe482467d7219cfbe8650c5e1c";
+          sha256 = "0q880dksf3bj1hixa4zhj3ybvrqf1wcnjnmb37i49qwdy6p1ma06";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete";
+          sha256 = "1c4ij5bnclg94jdzhkqvq2vxwv6wvs051mbki1ibjm5f2hlacvh3";
+          name = "auto-complete";
+        };
+        packageRequires = [ cl-lib popup ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-complete";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-complete-clang-async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-complete-clang-async";
+        version = "0.5";
+        src = fetchFromGitHub {
+          owner = "Golevka";
+          repo = "emacs-clang-complete-async";
+          rev = "a5114e3477793ccb9420acc5cd6a1cb26be65964";
+          sha256 = "1kp2l1cgzlg2g3wllz4gl1ssn4lnx2sn26xqigfrpr8y5rj2bsfj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-clang-async";
+          sha256 = "1jj0jn1v3070g7g0j5gvpybv145kki8nsjxqb8fjf9qag8ilfkjh";
+          name = "auto-complete-clang-async";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/auto-complete-clang-async";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-complete-exuberant-ctags = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-complete-exuberant-ctags";
+        version = "0.0.7";
+        src = fetchFromGitHub {
+          owner = "k1LoW";
+          repo = "auto-complete-exuberant-ctags";
+          rev = "ff6121ff8b71beb5aa606d28fd389c484ed49765";
+          sha256 = "1fqgyg986fg1dzac5wa97bx82mfddqb6qrfnpr3zksmw3vgykxr0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-exuberant-ctags";
+          sha256 = "1i2s3ycc8jafkzdsz3kbvx1hh95ydi5s6rq6n0wzw1kyy3km35gd";
+          name = "auto-complete-exuberant-ctags";
+        };
+        packageRequires = [ auto-complete ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-complete-exuberant-ctags";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-complete-nxml = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-complete-nxml";
+        version = "0.5.0";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "auto-complete-nxml";
+          rev = "ac7b09a23e45f9bd02affb31847263de4180163a";
+          sha256 = "18bf1kw85mab0zp7rn85cm1nxjxg5c1dmiv0j0mjwzsv8an4px5y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-nxml";
+          sha256 = "0viscr5k1carn9vhflry16kgihr6fvh6h36b049pgnk6ww085k6a";
+          name = "auto-complete-nxml";
+        };
+        packageRequires = [ auto-complete ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-complete-nxml";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-complete-pcmp = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
+    melpaBuild {
+        pname = "auto-complete-pcmp";
+        version = "0.0.2";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "auto-complete-pcmp";
+          rev = "2595d3dab1ef3549271ca922f212928e9d830eec";
+          sha256 = "1hf2f903hy9afahrgy2fx9smgn631drs6733188zgqi3nkyizj26";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-pcmp";
+          sha256 = "1mpgkwj8jwpvxphlm6iaprwjrldmihbgg97jav0fbm1kjnm4azna";
+          name = "auto-complete-pcmp";
+        };
+        packageRequires = [ auto-complete log4e yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-complete-pcmp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-complete-sage = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild, sage-shell-mode }:
+    melpaBuild {
+        pname = "auto-complete-sage";
+        version = "0.0.5";
+        src = fetchFromGitHub {
+          owner = "stakemori";
+          repo = "auto-complete-sage";
+          rev = "a61a4e58b14134712e0737280281c0b10e56da93";
+          sha256 = "0l49ciic7g30vklxq6l1ny3mz87l5p8qc30rmkjvkzvg8r52ksn3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-sage";
+          sha256 = "02sxbir3arvmnkvxgndlkln9y05jnlv6i8czd6a0wcxk4nj43lq1";
+          name = "auto-complete-sage";
+        };
+        packageRequires = [ auto-complete sage-shell-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-complete-sage";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-dictionary = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-dictionary";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "nschum";
+          repo = "auto-dictionary-mode";
+          rev = "0e3567a81f7bb0ad53ed9f20c7d3d1ac40c26ad1";
+          sha256 = "191294k92qp8gmfypf0q8j8qrym96aqikzvyb9p03wqvbr3r1dsk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-dictionary";
+          sha256 = "1va485a8lxvb3507kr83cr6wpssxnf8y4l42mamn9daa8sjx3q16";
+          name = "auto-dictionary";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/auto-dictionary";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-indent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-indent-mode";
+        version = "0.126";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "auto-indent-mode.el";
+          rev = "ad7032ee058a74405d04d775b0b384351536bc53";
+          sha256 = "1hlsgsdxpx42kmqkjgy9b9ldz5i4dbi879v87pjd2qbkj8iywb6y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-indent-mode";
+          sha256 = "1nk78p8lqs8cx90asfs8iaqnwwyy8fi5bafaprm9c0nrxz299ibz";
+          name = "auto-indent-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/auto-indent-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-package-update = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "auto-package-update";
+        version = "1.6.1";
+        src = fetchFromGitHub {
+          owner = "rranelli";
+          repo = "auto-package-update.el";
+          rev = "cdef79f9fc6f8347fdd05664978fb9a948ea0410";
+          sha256 = "05llpa6g4nb4qswmcn7j3bs7hnmkrkax7hsk7wvklr0wrljyg9a2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-package-update";
+          sha256 = "0fdcniq5mrwbc7yvma4088r0frdfvc2ydfil0s003faz0nrjcp8k";
+          name = "auto-package-update";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-package-update";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-shell-command = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }:
+    melpaBuild {
+        pname = "auto-shell-command";
+        version = "1.0.2";
+        src = fetchFromGitHub {
+          owner = "ongaeshi";
+          repo = "auto-shell-command";
+          rev = "59d4abce779a3ce3e920592bf5696b54b2e192c7";
+          sha256 = "1h8zsgw30axprs7a5kkygbhvilillzazxgqz01ng36il65fi28s6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-shell-command";
+          sha256 = "1i78fh72i8yv91rnabf0vs78r43qrjkr36hndmn5ya2xs3b1g41j";
+          name = "auto-shell-command";
+        };
+        packageRequires = [ deferred popwin ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-shell-command";
+          license = lib.licenses.free;
+        };
+      }) {};
+    auto-yasnippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "auto-yasnippet";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "auto-yasnippet";
+          rev = "5cc54edbe03c0061bf69883a3e39d3bb16019e0f";
+          sha256 = "0n3r7j83csby2s7284hy5pycynazyrkljxkn6xqn08gvxbbbdpdq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-yasnippet";
+          sha256 = "02281gyy07cy72a29fjsixg9byqq3izb9m1jxv98ni8pcy3bpsqa";
+          name = "auto-yasnippet";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-yasnippet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    autodisass-java-bytecode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "autodisass-java-bytecode";
+        version = "1.3";
+        src = fetchFromGitHub {
+          owner = "gbalats";
+          repo = "autodisass-java-bytecode";
+          rev = "3d61dbe266133c950b39e880f78d142751c7dc4c";
+          sha256 = "1pf2mwnicj5x2kksxwmrzz2vfxj9y9r6rzgc1fl8028mfrmrmg8s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autodisass-java-bytecode";
+          sha256 = "1k19nkbxnysm3qkpdhz4gv2x9nnrp94xl40x84q8n84s6xaan4dc";
+          name = "autodisass-java-bytecode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/autodisass-java-bytecode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    autodisass-llvm-bitcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "autodisass-llvm-bitcode";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "gbalats";
+          repo = "autodisass-llvm-bitcode";
+          rev = "14bb1bfe2be3b04d6e0c87a7a9d1e88ce15506d0";
+          sha256 = "1hyp49bidwc53cr25wwwyzcd0cbbqzxkfcpnccimphv24qfsai85";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autodisass-llvm-bitcode";
+          sha256 = "0bh73nzll9jp7kiqfnb5dwkipw85p3c3cyq58s0nghig02z63j01";
+          name = "autodisass-llvm-bitcode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/autodisass-llvm-bitcode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    autopair = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "autopair";
+        version = "0.6.1";
+        src = fetchFromGitHub {
+          owner = "capitaomorte";
+          repo = "autopair";
+          rev = "2d1eb81d12f71248ad305e70cceddf08d4fe2b39";
+          sha256 = "0g6kd1r0wizamw26bhp5jkvpsd98rcybkfchc622b9v5b89a07nq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autopair";
+          sha256 = "161qhk8rc1ldj9hpg0k9phka0gflz9vny7gc8rnylk90p6asmr28";
+          name = "autopair";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/autopair";
+          license = lib.licenses.free;
+        };
+      }) {};
+    avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "avy";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "avy";
+          rev = "44d76b9d2aad5477521675747a5c769f3f9a69a0";
+          sha256 = "15xfgmsy4sqs3cmk7dwmj21g3r9dqb3fra7n7ly306bwgzh4vm8k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/avy";
+          sha256 = "0gjq79f8jagbngp0shkcqmwhisc3hpgwfk34kq30nb929nbnlmag";
+          name = "avy";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/avy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
+    melpaBuild {
+        pname = "avy-migemo";
+        version = "0.2.11";
+        src = fetchFromGitHub {
+          owner = "momomo5717";
+          repo = "avy-migemo";
+          rev = "f2498ed4a476a554c84716f5a8131f9b78a45185";
+          sha256 = "098bkqb2cndjx93jacj6p54xfy14m1iknvpv1y5rffy9p4l2cbd3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/avy-migemo";
+          sha256 = "1zvgkhma445gj1zjl8j25prw95bdpjbvfy8yr0r5liay6g2hf296";
+          name = "avy-migemo";
+        };
+        packageRequires = [ avy emacs migemo ];
+        meta = {
+          homepage = "http://melpa.org/#/avy-migemo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    avy-zap = callPackage ({ avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "avy-zap";
+        version = "0.1.4";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "avy-zap";
+          rev = "67fed60d0dfe9087ca4fe3332f4a78e775b8d239";
+          sha256 = "0lmv34pi9qdh76fi3w4lrfyfhzr824nsiif4nyjvpnmrabxgk309";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/avy-zap";
+          sha256 = "1zbkf21ggrmg1w0xaw40i3swgc1g4fz0j8p0r9djm9j120d94zkx";
+          name = "avy-zap";
+        };
+        packageRequires = [ avy ];
+        meta = {
+          homepage = "http://melpa.org/#/avy-zap";
+          license = lib.licenses.free;
+        };
+      }) {};
+    babel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "babel";
+        version = "1.4";
+        src = fetchFromGitHub {
+          owner = "juergenhoetzel";
+          repo = "babel";
+          rev = "65b55ad89017c9b3a1c8c241ac4b4541eabdaf5f";
+          sha256 = "0px1xggk6qyrwkma1p3d7b4z2id2gbrsxkliw3nwc1q4zndg1zr7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/babel";
+          sha256 = "0sdpp4iym61ni32zv75n48ylj4jib8ca6n9hyqwj1b7nqg76mm1c";
+          name = "babel";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/babel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    back-button = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nav-flash, pcache, persistent-soft, smartrep, ucs-utils }:
+    melpaBuild {
+        pname = "back-button";
+        version = "0.6.6";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "back-button";
+          rev = "c7b50a3e087a8dc5588d7292379cd387a1afff87";
+          sha256 = "0hmn3jlsqgpc602lbcs9wzw0hgr5qpjdcxi2hjlc1cp27ilyscnf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/back-button";
+          sha256 = "0vyhvm445d0rs14j5xi419akk5nd88d4hvm4251z62fmnvs50j85";
+          name = "back-button";
+        };
+        packageRequires = [
+          nav-flash
+          pcache
+          persistent-soft
+          smartrep
+          ucs-utils
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/back-button";
+          license = lib.licenses.free;
+        };
+      }) {};
+    badwolf-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "badwolf-theme";
+        version = "1.2";
+        src = fetchFromGitHub {
+          owner = "bkruczyk";
+          repo = "badwolf-emacs";
+          rev = "24a557f92a702f632901a5b7bee59945a0a8cde9";
+          sha256 = "1plh7i4zhs5p7qkv7p7lnfrmkszn8b3znwvbxgp7wpxay5safc5j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/badwolf-theme";
+          sha256 = "03plkzpmlh0pgfp1c9padsh4w2g23clsznym8x4jabxnk0ynhq41";
+          name = "badwolf-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/badwolf-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bash-completion = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bash-completion";
+        version = "2.0.0";
+        src = fetchFromGitHub {
+          owner = "szermatt";
+          repo = "emacs-bash-completion";
+          rev = "9588a9c0ddf18f9869d4145a67e6446a4b66eba2";
+          sha256 = "11rlmrjdpa3vnf0h9vcd75946q9jyf1mpbm7h12hmpj6g2pavgdd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bash-completion";
+          sha256 = "0l41yj0sb87i27hw6dh35l32hg4qkka6r3bpkckjnfm0xifrd9hj";
+          name = "bash-completion";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bash-completion";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bbcode-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bbcode-mode";
+        version = "2.0.0";
+        src = fetchFromGitHub {
+          owner = "ejmr";
+          repo = "bbcode-mode";
+          rev = "e693ab09c3f34cabfd185e7c249c0b5403f0a7e0";
+          sha256 = "1xvxz9sk9l57a4kiiavxxdp0v241mfgiy2lg5ilacq1cd6xrrhky";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbcode-mode";
+          sha256 = "0ixxavmilr6na56yc148prbh3nlhcwir6rxqvh332cr8vr9gmp89";
+          name = "bbcode-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bbcode-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bbdb- = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
+    melpaBuild {
+        pname = "bbdb-";
+        version = "0.0.2";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "bbdb-";
+          rev = "2839e84c894de2513af41053e80a277a1b483d22";
+          sha256 = "17nbnkg0zn6p89r27mk9hl6qhv6xscwdsq8iyikdw03svpr16lnp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-";
+          sha256 = "1vzbalcchay4pxl9f1sxg0zclgc095f59dlj15pj0bqq61sbl9jf";
+          name = "bbdb-";
+        };
+        packageRequires = [ bbdb log4e yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/bbdb-";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bbdb-vcard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bbdb-vcard";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "tohojo";
+          repo = "bbdb-vcard";
+          rev = "9e11fafef1a94bc6395bd1eeacd00f94848ac560";
+          sha256 = "0fg72qnb40djyciy4gzj359lqlcbbrq0indbkzd0dj09zipkx0df";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-vcard";
+          sha256 = "1kn98b7mh9a28933r4yl8qfl9p92rpix4vkp71sar9cka0m71ilj";
+          name = "bbdb-vcard";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bbdb-vcard";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bbdb2erc = callPackage ({ bbdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bbdb2erc";
+        version = "0.1.3";
+        src = fetchFromGitHub {
+          owner = "unhammer";
+          repo = "bbdb2erc";
+          rev = "f39a36351e1e6f1105c9e32970e7502b77b0dbcd";
+          sha256 = "1zkh7dcas80wwjvigl27wj8sp4b5z6lh3qj7zkziinwamwnxbdbs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb2erc";
+          sha256 = "0k1f6mq9xd3568vg01dqqvcdbdshbdsi4ivkjyxis6dqfnqhlfdd";
+          name = "bbdb2erc";
+        };
+        packageRequires = [ bbdb ];
+        meta = {
+          homepage = "http://melpa.org/#/bbdb2erc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    beeminder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "beeminder";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "sodaware";
+          repo = "beeminder.el";
+          rev = "54cc1277f2a7667a7b0d999dc49ceffcf2862b44";
+          sha256 = "01d10algmi9a4xd7mzf7n3zxfs2qf5as66wx17mff5cd8dahxj1q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/beeminder";
+          sha256 = "0aj7ix7nrsl89f9c449kik8fbzhfk9li50wrh50cdwgfh8gda0fx";
+          name = "beeminder";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/beeminder";
+          license = lib.licenses.free;
+        };
+      }) {};
+    beginend = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "beginend";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "beginend";
+          rev = "de3833a1a651532e76df668bd92cfa07893501f1";
+          sha256 = "1agrci37bni1vfkxg171l53fvsnjdryhf05v54wj07jngnwf3cw9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/beginend";
+          sha256 = "1y81kr9q0zrsr3c3s14rm6l86y5wf1a0kia6d98112fy4fwdm7kq";
+          name = "beginend";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/beginend";
+          license = lib.licenses.free;
+        };
+      }) {};
+    better-defaults = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "better-defaults";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "technomancy";
+          repo = "better-defaults";
+          rev = "c286d55528f148733c696fe07eb01073dc412fb8";
+          sha256 = "09cn3dnaq88jwmmxfg76168s8f4wbmp6y2dv13rhwagihx9mf20m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/better-defaults";
+          sha256 = "13bqcmx2gagm2ykg921ik3awp8zvw5d4lb69rr6gkpjlqp7nq2cm";
+          name = "better-defaults";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/better-defaults";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bind-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bind-key";
+        version = "2.1";
+        src = fetchFromGitHub {
+          owner = "jwiegley";
+          repo = "use-package";
+          rev = "2b077f6e485e8c5c167413c03246068022b6bc71";
+          sha256 = "07vwg0bg719gb8ln1n5a33103903vvrphnkbvvfn43904pkrf14w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bind-key";
+          sha256 = "1qw2c27016d3yfg0w10is1v72y2jvzhq07ca4h6v17yi94ahj5xm";
+          name = "bind-key";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bind-key";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bing-dict = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bing-dict";
+        version = "0.2.2";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "bing-dict.el";
+          rev = "e94975ac63ba87225b56eec13a153ce169e4ec94";
+          sha256 = "0pmpg54faq0l886f2cmnmwm28d2yfg8adk7gp7623gx0ifggn332";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bing-dict";
+          sha256 = "0s5pd08rcnvmgi1hw17xbzvswlv0yni6h2h2gccrjmf6izi8whh1";
+          name = "bing-dict";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bing-dict";
+          license = lib.licenses.free;
+        };
+      }) {};
+    birds-of-paradise-plus-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "birds-of-paradise-plus-theme";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "jimeh";
+          repo = "birds-of-paradise-plus-theme.el";
+          rev = "ba2c4443388a73f2c5e2de0c24d3106676aeb6fa";
+          sha256 = "1r3f5d67x257g8kvdbdsl4w3y1dvc1d6s9x8bygbkvyahfi5m5hn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/birds-of-paradise-plus-theme";
+          sha256 = "0vdv2siy30kf1qhzrc39sygjk17lwm3ix58pcs3shwkg1y5amj3m";
+          name = "birds-of-paradise-plus-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/birds-of-paradise-plus-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bog";
+        version = "1.1.0";
+        src = fetchFromGitHub {
+          owner = "kyleam";
+          repo = "bog";
+          rev = "a13b6305f0b6a73373809fb71595194aa284696c";
+          sha256 = "1j2ar9sinbrraqvymqmjray48xbr1arhpigzgkgnhkc2zzqv8dwb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bog";
+          sha256 = "1ci8xxca7dclmi5v37y5k45qlmzs6a9hi6m7czgiwxii902w5pkl";
+          name = "bog";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/bog";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bongo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bongo";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "dbrock";
+          repo = "bongo";
+          rev = "c5280a11fe8ff39fba4b09ec4a39b0f799d2b59c";
+          sha256 = "1q3ws2vn062dh7ci6jn2k2bcn7szh3ap64sgwkzdd6f1pas37fnr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bongo";
+          sha256 = "07i9gw067r2igp6s2g2iakm1ybvw04q6zznna2cfdf08nax64ghv";
+          name = "bongo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bongo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    boon = callPackage ({ emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
+    melpaBuild {
+        pname = "boon";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "jyp";
+          repo = "boon";
+          rev = "82458a944e9cf3e4c959e63ebad09312aafe6d2c";
+          sha256 = "1apxgj14hgfpz6hjp3384yjf2zrkv4pcncf2zklijs668igvaskq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/boon";
+          sha256 = "0gryw7x97jd46jgrm93cjagj4p7w93cjc36i2ps9ajf0d8m4gajb";
+          name = "boon";
+        };
+        packageRequires = [ emacs expand-region multiple-cursors ];
+        meta = {
+          homepage = "http://melpa.org/#/boon";
+          license = lib.licenses.free;
+        };
+      }) {};
+    boxquote = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "boxquote";
+        version = "1.22";
+        src = fetchFromGitHub {
+          owner = "davep";
+          repo = "boxquote.el";
+          rev = "4c49b2046647ed187920c885e175ed388f4833dc";
+          sha256 = "0235l4f1cxj7nysfnay4fz52mg0c13pzqxbhw65vdpfzz1gl1p73";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/boxquote";
+          sha256 = "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s";
+          name = "boxquote";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/boxquote";
+          license = lib.licenses.free;
+        };
+      }) {};
+    browse-kill-ring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "browse-kill-ring";
+        version = "2.0.0";
+        src = fetchFromGitHub {
+          owner = "browse-kill-ring";
+          repo = "browse-kill-ring";
+          rev = "2a7acf98c348c4f405a6b2ab216224ca14915be8";
+          sha256 = "0y9m6cv70pzcm0v2v8nwmyh1xx40831chx72m85h5ic5db03gy7b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/browse-kill-ring";
+          sha256 = "1d97ap0vrg5ymp96z7y6si98fspxzy02jh1i4clvw5lggjfibhq4";
+          name = "browse-kill-ring";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/browse-kill-ring";
+          license = lib.licenses.free;
+        };
+      }) {};
+    browse-url-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }:
+    melpaBuild {
+        pname = "browse-url-dwim";
+        version = "0.6.8";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "browse-url-dwim";
+          rev = "11f1c53126619c7ef1bb5f5d6914ce0b3cce0e30";
+          sha256 = "08qz9l0gb7fvknzkp67srhldzkk8cylnbn0qwkflxgcs6ndfk95y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/browse-url-dwim";
+          sha256 = "13bv2ka5pp9k4kwrxfqfawwxzsqlakvpi9a32gxgx7qfi0dcb1rf";
+          name = "browse-url-dwim";
+        };
+        packageRequires = [ string-utils ];
+        meta = {
+          homepage = "http://melpa.org/#/browse-url-dwim";
+          license = lib.licenses.free;
+        };
+      }) {};
+    buffer-flip = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }:
+    melpaBuild {
+        pname = "buffer-flip";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "killdash9";
+          repo = "buffer-flip.el";
+          rev = "f6c67d87717e3171156b78406ab5a0eeb048905c";
+          sha256 = "0s43cvkr1za5sd2cvl55ig34wbp8xyjf85snmf67ps04swyyk92q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buffer-flip";
+          sha256 = "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098";
+          name = "buffer-flip";
+        };
+        packageRequires = [ key-chord ];
+        meta = {
+          homepage = "http://melpa.org/#/buffer-flip";
+          license = lib.licenses.free;
+        };
+      }) {};
+    buffer-move = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "buffer-move";
+        version = "0.6.2";
+        src = fetchFromGitHub {
+          owner = "lukhas";
+          repo = "buffer-move";
+          rev = "9bf3ff940011c7af3fdd172fa3ea2511c7a8a190";
+          sha256 = "0xdks4jfqyhkh34y48iq3gz8swp0f526kwnaai5mhgvazvs4za8c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buffer-move";
+          sha256 = "0wysywff2bggrha7lpl83c8x6ln7zgdj9gsqmjva6gramqb260fg";
+          name = "buffer-move";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/buffer-move";
+          license = lib.licenses.free;
+        };
+      }) {};
+    buffer-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "buffer-utils";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "buffer-utils";
+          rev = "b4d325543e25518d725a2122b49cd72a0d6a079a";
+          sha256 = "0rp9hiysy13c4in7b420r7yjza2knlmvphj7l01xbxphbilplqk5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buffer-utils";
+          sha256 = "0cfipdn4fc4fvz513mwiaihvbdi05mza3z5z1379wlljw6r539z2";
+          name = "buffer-utils";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/buffer-utils";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bufshow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bufshow";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "pjones";
+          repo = "bufshow";
+          rev = "d8424e412d63dcc721c64fbd2ddd2420a03b4e8b";
+          sha256 = "0x9q4amsmawi8jqj9xxg81khvb3gyyf9hjvb0w6vhrgjwpxiq8sy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bufshow";
+          sha256 = "027cd0jzb8yxm66q1bhyi75f2m9f2pq3aswgav1d18na3ybwg65h";
+          name = "bufshow";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bufshow";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bug-reference-github = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bug-reference-github";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "arnested";
+          repo = "bug-reference-github";
+          rev = "671d32083aad5cf813a5e61075b70889bc95dec5";
+          sha256 = "07jzg58a3jxs4mmsgb35f5f8awazlvzak9wrhif6xb60jq1wrp0v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bug-reference-github";
+          sha256 = "18yzxwanbrxsab6ba75z1196x0m6dapdhbvy6df5b5x5viz99cf6";
+          name = "bug-reference-github";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bug-reference-github";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bundler = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bundler";
+        version = "1.1.0";
+        src = fetchFromGitHub {
+          owner = "tobiassvn";
+          repo = "bundler.el";
+          rev = "4cb4fafe092d587cc9e58ff61cf900fb7f409adf";
+          sha256 = "18d74nwcpk1i8adxzfwz1lgqqcxsc4wkrb490v64pph79dxsi80h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bundler";
+          sha256 = "0i5ybc6i8ackxpaa75kwrg44zdq3jkvy48c42vaaafpddjwjnsy4";
+          name = "bundler";
+        };
+        packageRequires = [ inf-ruby ];
+        meta = {
+          homepage = "http://melpa.org/#/bundler";
+          license = lib.licenses.free;
+        };
+      }) {};
+    bury-successful-compilation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "bury-successful-compilation";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "EricCrosson";
+          repo = "bury-successful-compilation";
+          rev = "ca58a5df0aa3f266a8df0e3e5d3d962c086be0a9";
+          sha256 = "03hab3iw2jjckal20zwsw7cm38nf7pan0m96d8ab4i75phy6liyw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bury-successful-compilation";
+          sha256 = "1gkq4r1573m6m57fp7x69k7kcpqchpcqfcz3792v0wxr22zhkwr3";
+          name = "bury-successful-compilation";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/bury-successful-compilation";
+          license = lib.licenses.free;
+        };
+      }) {};
+    butler = callPackage ({ deferred, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "butler";
+        version = "0.2.4";
+        src = fetchFromGitHub {
+          owner = "AshtonKem";
+          repo = "Butler";
+          rev = "0e91e0f01ac9c09422f076a096ee567ee138e7a4";
+          sha256 = "1pii9dw4skq7nr4na6qxqasl36av8cwjp71bf1fgppqpcd9z8skj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/butler";
+          sha256 = "1jv74l9jy55qpwf5np9nlj6a1wqsm3xirm7wm89d1h2mbsfcr0mq";
+          name = "butler";
+        };
+        packageRequires = [ deferred emacs json ];
+        meta = {
+          homepage = "http://melpa.org/#/butler";
+          license = lib.licenses.free;
+        };
+      }) {};
+    buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "buttercup";
+        version = "1.4";
+        src = fetchFromGitHub {
+          owner = "jorgenschaefer";
+          repo = "emacs-buttercup";
+          rev = "e1f71acdef3de3033d24be1cb41933eefc75029f";
+          sha256 = "0lpfx7q0qrclxii4ffrrjffb678bsx908za91nsy7mc2g0cxcapb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buttercup";
+          sha256 = "1grrrdk5pl9l1jvnwzl8g0102gipvxb5qn6k2nmv28jpl57v8dkb";
+          name = "buttercup";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/buttercup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    button-lock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "button-lock";
+        version = "1.0.2";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "button-lock";
+          rev = "cd0bf4a3c2f224d851e6ed8a54a6e80c129b225f";
+          sha256 = "1kqcc1d56jz107bswlzvdng6ny6qwp93yck2i2j921msn62qvbb2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/button-lock";
+          sha256 = "1arrdmb3nm570hgs18y9sz3z9v0wlkr3vwa2zgfnc15lmf0y34mp";
+          name = "button-lock";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/button-lock";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cacoo = callPackage ({ concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cacoo";
+        version = "2.1.2";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-cacoo";
+          rev = "c2e6a8830144810cd4e51de3646cb8200bcebbc6";
+          sha256 = "1k2hmc87ifww95k3m8ksiswkk2z0y8grssba7381g8dnlp6jgprx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cacoo";
+          sha256 = "0kri4vi6dpsf0zk24psm16f3aa27cq5b54ga7zygmr02csq24a6z";
+          name = "cacoo";
+        };
+        packageRequires = [ concurrent ];
+        meta = {
+          homepage = "http://melpa.org/#/cacoo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cake = callPackage ({ anything, cake-inflector, fetchFromGitHub, fetchurl, historyf, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cake";
+        version = "1.4.3";
+        src = fetchFromGitHub {
+          owner = "k1LoW";
+          repo = "emacs-cake";
+          rev = "a7c9f3bee71eb3865060123d4d98e5397c2f967e";
+          sha256 = "0bvrwzjx93qyx97qqw0imvnkkx4w91yk99rnhcmk029zj1fy0kzg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cake";
+          sha256 = "06qlqrazz2jr08g44q73hx9vpp6xnjvkpd6ky108g0xc5p9q2hcr";
+          name = "cake";
+        };
+        packageRequires = [ anything cake-inflector historyf ];
+        meta = {
+          homepage = "http://melpa.org/#/cake";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cake-inflector = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "cake-inflector";
+        version = "1.1.1";
+        src = fetchFromGitHub {
+          owner = "k1LoW";
+          repo = "emacs-cake-inflector";
+          rev = "40bf11890842ba305954528694e1c39a8b73737b";
+          sha256 = "1w7yq35gzzwyf480d8gc5r6jbnawg09l6663q068ir6zr9pp4far";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cake-inflector";
+          sha256 = "04mrqcm1igb638skaq2b3nr5yzxnck2vwhln61rnh7lkfxq7wbwf";
+          name = "cake-inflector";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "http://melpa.org/#/cake-inflector";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cake2 = callPackage ({ anything, cake-inflector, dash, f, fetchFromGitHub, fetchurl, historyf, ht, json ? null, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "cake2";
+        version = "2.1.0";
+        src = fetchFromGitHub {
+          owner = "k1LoW";
+          repo = "emacs-cake2";
+          rev = "0a9d0b3a1c49ba1730088416f50507f53221c70b";
+          sha256 = "15w21r0gqblbn9wlvb4wlm3706wf01r38mp465snjzi839f6sazb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cake2";
+          sha256 = "03q8vqqjlhahgnyy976c46x52splwdjpmb9ngrj5c2z7d8n9145x";
+          name = "cake2";
+        };
+        packageRequires = [ anything cake-inflector dash f historyf ht json s ];
+        meta = {
+          homepage = "http://melpa.org/#/cake2";
+          license = lib.licenses.free;
+        };
+      }) {};
+    calfw = callPackage ({ fetchFromGitHub, fetchurl, google-maps, lib, melpaBuild }:
+    melpaBuild {
+        pname = "calfw";
+        version = "1.5";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-calfw";
+          rev = "50e0e0261568f84f31fe7f87c9f863e21d30132f";
+          sha256 = "1rv6slk3a7ca2q16isjlkmgxbxmbqx4lx2ip7z33fvnq10r5h60n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/calfw";
+          sha256 = "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8";
+          name = "calfw";
+        };
+        packageRequires = [ google-maps ];
+        meta = {
+          homepage = "http://melpa.org/#/calfw";
+          license = lib.licenses.free;
+        };
+      }) {};
+    camcorder = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
+    melpaBuild {
+        pname = "camcorder";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "camcorder.el";
+          rev = "a2b5e0629ee3c01ead684e148965ac68e533efbd";
+          sha256 = "0v927m3l5cf0j0rs0nfk5whwqmmxs941d8qalxi19j1ihspjz8d6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/camcorder";
+          sha256 = "1kbnpz3kn8ycpy8nlp8bsnnd1k1h7m02h7w5f7raw97sk4cnpvbi";
+          name = "camcorder";
+        };
+        packageRequires = [ cl-lib emacs names ];
+        meta = {
+          homepage = "http://melpa.org/#/camcorder";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
+    melpaBuild {
+        pname = "cargo";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "kwrooijen";
+          repo = "cargo.el";
+          rev = "e6a02346fc033d6342183a76a49156d4091ef402";
+          sha256 = "152d5ym4bqnlnp6rafgy8fafx8246n78ymlcx9k2nyfar4c0lir2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cargo";
+          sha256 = "06zq657cxfk5l4867qqsvhskcqc9wswyl030wj27a43idj8n41jx";
+          name = "cargo";
+        };
+        packageRequires = [ emacs rust-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/cargo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    caseformat = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "caseformat";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "HKey";
+          repo = "caseformat";
+          rev = "72707c9f0f0819b4e2aa45876432a293aa07f814";
+          sha256 = "0mg49rpz362ipn5qzqhyfs3d6fpb51rfa73kna3gxdw0wxq2sa7g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/caseformat";
+          sha256 = "1qwyr74jbx4jpfcw8sccg47q1vdg094rr06m111gsz2yaj9m0gfk";
+          name = "caseformat";
+        };
+        packageRequires = [ cl-lib dash emacs s ];
+        meta = {
+          homepage = "http://melpa.org/#/caseformat";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cask = callPackage ({ cl-lib ? null, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build, s, shut-up }:
+    melpaBuild {
+        pname = "cask";
+        version = "0.7.4";
+        src = fetchFromGitHub {
+          owner = "cask";
+          repo = "cask";
+          rev = "8337237449446e186ccd5ade0b0dc8c6ea7bd728";
+          sha256 = "1hvm6r6a8rgjwnn2mcamwqrmhz424vlr4mbvbri3wmn0ikbk510l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cask";
+          sha256 = "11nr6my3vlb1xiyai7qwii3nszda2mnkhkjlbh3d0699h0yw7dk5";
+          name = "cask";
+        };
+        packageRequires = [ cl-lib dash epl f package-build s shut-up ];
+        meta = {
+          homepage = "http://melpa.org/#/cask";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cask-package-toolset = callPackage ({ ansi, cl-lib ? null, commander, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
+    melpaBuild {
+        pname = "cask-package-toolset";
+        version = "0.9.1";
+        src = fetchFromGitHub {
+          owner = "AdrieanKhisbe";
+          repo = "cask-package-toolset.el";
+          rev = "1e972739dbdf3af5b60a250c99414e76db238f78";
+          sha256 = "0padb1zfjkmx9kbqnqh744qvpd3ln0khwxifxld9cpcpdp5k04vc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cask-package-toolset";
+          sha256 = "13ix093c0a58rjqj7zfp3914xj3hvj276gb2d8zhvrx9vvs1345g";
+          name = "cask-package-toolset";
+        };
+        packageRequires = [ ansi cl-lib commander dash emacs f s shut-up ];
+        meta = {
+          homepage = "http://melpa.org/#/cask-package-toolset";
+          license = lib.licenses.free;
+        };
+      }) {};
+    caskxy = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
+    melpaBuild {
+        pname = "caskxy";
+        version = "0.0.5";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "caskxy";
+          rev = "279f3ab79bd77fe69cb3148a79896b9bf118a9b3";
+          sha256 = "1j1lw5zifp7q1ykm6si0nzxfp7n3z2lzla2njkkxmc2s6m7w4x1a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/caskxy";
+          sha256 = "0x4s3c8m75zxsvqpgfc5xwll0489zzdnngmnq048z9gkgcd7pd2s";
+          name = "caskxy";
+        };
+        packageRequires = [ log4e yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/caskxy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cdlatex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cdlatex";
+        version = "4.7";
+        src = fetchFromGitHub {
+          owner = "cdominik";
+          repo = "cdlatex";
+          rev = "b7183c2200392b6d85fca69390f4a65fac7a7b19";
+          sha256 = "1jj9vmhc4s3ych08bjm1c2xwi81z1p20rj7bvxrgvb5aga2ghi9d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cdlatex";
+          sha256 = "1jsfmzl13fykbg7l4wv9si7z11ai5lzvkndzbxh9cyqlvznq0m64";
+          name = "cdlatex";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cdlatex";
+          license = lib.licenses.free;
+        };
+      }) {};
+    celery = callPackage ({ dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "celery";
+        version = "0.0.3";
+        src = fetchFromGitHub {
+          owner = "ardumont";
+          repo = "emacs-celery";
+          rev = "163ebede3f6a7f59202ff319675b0873dd1de365";
+          sha256 = "07h5g905i1jglsryl0dnqxz8yya5kkyjjggzbk4nl3rcj41lyas7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/celery";
+          sha256 = "0m3hmvp6xz2m7z1kbb0ii0j3c95zi19652gfixq5a5x23kz8y59h";
+          name = "celery";
+        };
+        packageRequires = [ dash-functional deferred emacs s ];
+        meta = {
+          homepage = "http://melpa.org/#/celery";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cerbere = callPackage ({ f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, pkg-info, s }:
+    melpaBuild {
+        pname = "cerbere";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "cerbere";
+          rev = "11de1e7ec5126083ae697f5a9993facdb9895f9d";
+          sha256 = "08hqgsjvs62l1cfzshbpj80xd8365qmx2b5r5jq20d5cj68s36wl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cerbere";
+          sha256 = "1g3svmh5dlh5mvyag3hmiy90dfkk6f7ppd9qpwckxqyll9vl7r06";
+          name = "cerbere";
+        };
+        packageRequires = [ f go-mode pkg-info s ];
+        meta = {
+          homepage = "http://melpa.org/#/cerbere";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cfengine-code-style";
+        version = "3.8.0.2.1";
+        src = fetchFromGitHub {
+          owner = "cfengine";
+          repo = "core";
+          rev = "afed90c14a2b30bc36595626b959522c34a6565f";
+          sha256 = "11a89pyz8zdjdkimpqaywp702xf9cmwz1djkjp5dghgpwi1aid72";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cfengine-code-style";
+          sha256 = "1ny8xvdnz740qmw9m81xnwd0gh0a516arpvl3nfimglaai5bfc9a";
+          name = "cfengine-code-style";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cfengine-code-style";
+          license = lib.licenses.free;
+        };
+      }) {};
+    charmap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "charmap";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "lateau";
+          repo = "charmap";
+          rev = "165193d91ef96f563ae8366ed4c1a2df5a4eaed2";
+          sha256 = "0crnd64cnsnaj5mcy55q0sc1rnamxa1xbpwpmirhyhxz780klww6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/charmap";
+          sha256 = "1j7762d2i17ysn9ys8j7wfv989avmax8iylml2hc26mwbpyfpm84";
+          name = "charmap";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/charmap";
+          license = lib.licenses.free;
+        };
+      }) {};
+    checkbox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "checkbox";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "camdez";
+          repo = "checkbox.el";
+          rev = "2afc2011fa35ccfa0ce9ef46cb1896911fa340d1";
+          sha256 = "09ypxhfad3v1pz0xhw4xgxvfj7ad2kb3ff9zy1mnw7fzsa7gw6nj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/checkbox";
+          sha256 = "17gw6w1m6bs3sfx8nqa8nzdq26m8w85a0fca5qw3bmd18bcmknqa";
+          name = "checkbox";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/checkbox";
+          license = lib.licenses.free;
+        };
+      }) {};
+    chinese-word-at-point = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "chinese-word-at-point";
+        version = "0.2.3";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "chinese-word-at-point.el";
+          rev = "36a03cce32fe059d2b581cb2e029715c0be81074";
+          sha256 = "1jsy43avingxxccs0zw2qm5ysx8g76xhhh1mnyypxskl9m60qb4j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chinese-word-at-point";
+          sha256 = "0pjs4ckncv84qrdj0pyibrbiy86f1gmjla9n2cgh10xbc7j9y0c4";
+          name = "chinese-word-at-point";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/chinese-word-at-point";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
+    melpaBuild {
+        pname = "cider";
+        version = "0.10.1";
+        src = fetchFromGitHub {
+          owner = "clojure-emacs";
+          repo = "cider";
+          rev = "93e061b99c1e6f3098b098d884a37778dbca9825";
+          sha256 = "1amj1qad03b7hw6isxh1389mi4i9q0jym57csj95q4mgamgk9vhj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cider";
+          sha256 = "1a6hb728a3ir18c2dn9zfd3jn79fi5xjn5gqr7ljy6qb063xd4qx";
+          name = "cider";
+        };
+        packageRequires = [ clojure-mode emacs pkg-info queue seq spinner ];
+        meta = {
+          homepage = "http://melpa.org/#/cider";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cider-eval-sexp-fu = callPackage ({ emacs, eval-sexp-fu, fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cider-eval-sexp-fu";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "clojure-emacs";
+          repo = "cider-eval-sexp-fu";
+          rev = "dbe6a19c835ea42b099dd17f040db0baf9774aaf";
+          sha256 = "1rkd76561h93si4lpisz3qnaj48dx8x01nd59a3lgpqsbbibnccf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cider-eval-sexp-fu";
+          sha256 = "1n4sgv042qd9560pllabysx0c5snly6i22bk126y8f8rn0zj58iq";
+          name = "cider-eval-sexp-fu";
+        };
+        packageRequires = [ emacs eval-sexp-fu highlight ];
+        meta = {
+          homepage = "http://melpa.org/#/cider-eval-sexp-fu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cil-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cil-mode";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "ForNeVeR";
+          repo = "cil-mode";
+          rev = "1cacd8bca125dbdeb97fdf156e32c2b74bac2186";
+          sha256 = "1w0ya0446rqsg1j59fd1mp4wavv2f3h1k3mw9svm5glymdirw4d1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cil-mode";
+          sha256 = "1h18r086bqspyn5n252yzw8x2zgyaqzdd8pbcf5gqlh1w8kapq4y";
+          name = "cil-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cil-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "circe";
+        version = "2.1";
+        src = fetchFromGitHub {
+          owner = "jorgenschaefer";
+          repo = "circe";
+          rev = "ac1cddf946e0af90ab453dd816f7173e0d4000e5";
+          sha256 = "0q3rv6lk37yybkbswmn4pgzca0nfhvf4h3ac395fr16k5ixybc5q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/circe";
+          sha256 = "1f54d8490gfx0r0cdvgmcjdxqpni43msy0k2mgqd1qz88a4b5l07";
+          name = "circe";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/circe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cl-lib-highlight = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cl-lib-highlight";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "cl-lib-highlight";
+          rev = "c117451df8455769701af6c8e92a8fb29c05e1fa";
+          sha256 = "12vgi5dicx3lxzngjcg9g3nflrhfy9wdw6ldm72zarp1h96jy5cw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cl-lib-highlight";
+          sha256 = "13qdrvpxq928p27b1xdcbsscyhqk042rwfa17037gp9h02fd42j8";
+          name = "cl-lib-highlight";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/cl-lib-highlight";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "cliphist";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "cliphist";
+          rev = "c0db2da95fa3d3a58160f465c636989bb4b251d5";
+          sha256 = "11c0zpk8gg70d4xiiyjc7v13knwb2ihbrxnlaxzh3rdg2c12676q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cliphist";
+          sha256 = "0mg6pznijba3kvp3r57pi54v6mgih2vfwj2kg6qmcy1abrc0xq29";
+          name = "cliphist";
+        };
+        packageRequires = [ popup ];
+        meta = {
+          homepage = "http://melpa.org/#/cliphist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clips-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "clips-mode";
+        version = "0.7";
+        src = fetchFromGitHub {
+          owner = "grettke";
+          repo = "clips-mode";
+          rev = "a3ab4a3e958d54a16544ec38fe6338f27df20817";
+          sha256 = "0i6sj5rs4b9v8aqq9l6wr15080qb101hdxspx6innhijhajgmssd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clips-mode";
+          sha256 = "083wrhjn04rg8vr6j0ziffdbdhbfn63wzl4q7yzpkf8qckh6mxhf";
+          name = "clips-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/clips-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clj-refactor = callPackage ({ cider, dash, edn, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }:
+    melpaBuild {
+        pname = "clj-refactor";
+        version = "1.1.0";
+        src = fetchFromGitHub {
+          owner = "clojure-emacs";
+          repo = "clj-refactor.el";
+          rev = "a0a35b6fb0a2f31973d5e5b711f0aac0314d7168";
+          sha256 = "1w0lv2d916wxfakcy11avmn9f6nsmxff02dpyih5kx6ncgqv1bnd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clj-refactor";
+          sha256 = "1qvds6dylazvrzz1ji2z2ldw72pa2nxqacb9d04gasmkqc32ipvz";
+          name = "clj-refactor";
+        };
+        packageRequires = [
+          cider
+          dash
+          edn
+          emacs
+          multiple-cursors
+          paredit
+          s
+          yasnippet
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/clj-refactor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cljr-helm = callPackage ({ clj-refactor, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cljr-helm";
+        version = "0.7";
+        src = fetchFromGitHub {
+          owner = "philjackson";
+          repo = "cljr-helm";
+          rev = "916d070503d0f484f36626c7a42f156b737e3fab";
+          sha256 = "18gv8vmmpiyq16cq4nr9nk2bmc5y2rsv21wjl4ji29rc7566shha";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cljr-helm";
+          sha256 = "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc";
+          name = "cljr-helm";
+        };
+        packageRequires = [ clj-refactor helm ];
+        meta = {
+          homepage = "http://melpa.org/#/cljr-helm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clocker = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+    melpaBuild {
+        pname = "clocker";
+        version = "0.0.10";
+        src = fetchFromGitHub {
+          owner = "roman";
+          repo = "clocker.el";
+          rev = "6faf5a23dc9cbe506f21a11fae4f6c4bbb1d4b01";
+          sha256 = "1s05644m048clz0lxizzgarh1bkyjxr96b0mbpxi2p003322aw09";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clocker";
+          sha256 = "0cckrk40k1labiqjh7ghzpx5zi136xz70j3ipp117x52qf24k10k";
+          name = "clocker";
+        };
+        packageRequires = [ dash projectile ];
+        meta = {
+          homepage = "http://melpa.org/#/clocker";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clojure-cheatsheet = callPackage ({ cider, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "clojure-cheatsheet";
+        version = "0.4.0";
+        src = fetchFromGitHub {
+          owner = "clojure-emacs";
+          repo = "clojure-cheatsheet";
+          rev = "f8db406b7b13a580c142d08865c9a03c101235fa";
+          sha256 = "1x1kfycf3023z0r3v7xqci59k8jv5wn2vqc9y0nx7k5qgifmswrx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-cheatsheet";
+          sha256 = "05sw3bkdcadslpsk64ds0ciavmdgqk7fr5q3z505vvafmszfnaqv";
+          name = "clojure-cheatsheet";
+        };
+        packageRequires = [ cider helm ];
+        meta = {
+          homepage = "http://melpa.org/#/clojure-cheatsheet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "clojure-mode";
+        version = "5.1.0";
+        src = fetchFromGitHub {
+          owner = "clojure-emacs";
+          repo = "clojure-mode";
+          rev = "126c23a9d905da7afd82917494648b5068d47f54";
+          sha256 = "1dkzbvmdyc6gwm8c67blv4a67p7mji417r0pcwzl8brfqlis9gsw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-mode";
+          sha256 = "11n0rjhs1mmlzdqy711g432an5ybdka5xj0ipsk8dx6xcyab70np";
+          name = "clojure-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/clojure-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "clojure-mode-extra-font-locking";
+        version = "5.1.0";
+        src = fetchFromGitHub {
+          owner = "clojure-emacs";
+          repo = "clojure-mode";
+          rev = "126c23a9d905da7afd82917494648b5068d47f54";
+          sha256 = "1dkzbvmdyc6gwm8c67blv4a67p7mji417r0pcwzl8brfqlis9gsw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-mode-extra-font-locking";
+          sha256 = "00nff9mkj61i76dj21x87vhz0bbkzgvkx1ypkxcv6yf3pfhq7r8n";
+          name = "clojure-mode-extra-font-locking";
+        };
+        packageRequires = [ clojure-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/clojure-mode-extra-font-locking";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clojure-quick-repls = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "clojure-quick-repls";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "symfrog";
+          repo = "clojure-quick-repls";
+          rev = "90f82e294cfdfb65231adc456177580cd69bfc00";
+          sha256 = "0sw34yjp8934xd2n76lbwyvxkbyz5pxszj6gkflas8lfjvms9z7d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-quick-repls";
+          sha256 = "10glzyd4y3918pwp048pc1y7y7fa34fkqckn1nbys841dbssmay0";
+          name = "clojure-quick-repls";
+        };
+        packageRequires = [ cider dash ];
+        meta = {
+          homepage = "http://melpa.org/#/clojure-quick-repls";
+          license = lib.licenses.free;
+        };
+      }) {};
+    clojure-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "clojure-snippets";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "mpenet";
+          repo = "clojure-snippets";
+          rev = "30cd52379b856cf80eab2b541c32b1bcdcff3db2";
+          sha256 = "1p0w83m9j4a6va4g68a4gcfbdkp8nic0q8cm28l8nr7czd5s0yl6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-snippets";
+          sha256 = "15622mdd6b3fpwp22d32p78yap08pyscs2vc83sv1xz4338i0lij";
+          name = "clojure-snippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/clojure-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cm-mode";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "joostkremers";
+          repo = "criticmarkup-emacs";
+          rev = "abc5adc7e00e10c388c2a57c9f1d59f164773082";
+          sha256 = "1bhnlcsvl1qsi36a5kz8i857spzybprsbsywpqrmjpndn74n8690";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cm-mode";
+          sha256 = "1rgfpxbnp8wiq9j8aywm2n07rxzkhqljigwynrkyvrnsgxlq2a9x";
+          name = "cm-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cm-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cmake-ide = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cmake-ide";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "atilaneves";
+          repo = "cmake-ide";
+          rev = "b6953102d022adb60678eb5c4186008de987cdce";
+          sha256 = "14z5izpgby7lak6hzjwsph31awg5126hcjzld21ihknhlg09sw7q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmake-ide";
+          sha256 = "0xvy7l80zw67jgvk1rkhwzjvsqjqckmd8zj6s67rgbm56z6ypmcg";
+          name = "cmake-ide";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/cmake-ide";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cmake-mode";
+        version = "3.4.1";
+        src = fetchFromGitHub {
+          owner = "Kitware";
+          repo = "CMake";
+          rev = "fd7180f0c0c2554c31afda235469df986a109fe4";
+          sha256 = "054i416l7kwdnwlb55ya89zpnsyxg9h4b2ll3d4dhx2qpph7w9s2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmake-mode";
+          sha256 = "0zbn8syb5lw5xp1qcy3qcl75zfiyik30xvqyl38gdqddm9h7qmz7";
+          name = "cmake-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cmake-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cmake-project = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cmake-project";
+        version = "0.7";
+        src = fetchFromGitHub {
+          owner = "alamaison";
+          repo = "emacs-cmake-project";
+          rev = "ec61f687772cccdb699f64ebe1e8dc8ba83f790f";
+          sha256 = "10xlny2agxjknvnjdnw41cyb3d361yy0wvpc8l1d0xwnmmfh3bxk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmake-project";
+          sha256 = "13n6j9ljvzjzkknbm9zkhxljcn12avl39gxqq95hah44dr11rns3";
+          name = "cmake-project";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cmake-project";
+          license = lib.licenses.free;
+        };
+      }) {};
+    codic = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "codic";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-codic";
+          rev = "52bbb6997ef4ab9fb7fea43bbfff7f04671aa557";
+          sha256 = "14jcxrs3b02pbppvdsabr7c74i3c6d1lmd6l1p9dj8gv413pghsz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/codic";
+          sha256 = "0fq2qfqhkd6injgl66vcpd61j67shl9xj260aj6cgb2nriq0jxgn";
+          name = "codic";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/codic";
+          license = lib.licenses.free;
+        };
+      }) {};
+    coffee-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "coffee-mode";
+        version = "0.6.2";
+        src = fetchFromGitHub {
+          owner = "defunkt";
+          repo = "coffee-mode";
+          rev = "d19075264dc1f662e2282ca42ce70be0eae61b2a";
+          sha256 = "1axp9hixp4vgaqjd3ii9xwb32jhb964zclmpg3zpsl4rp8b9bdz5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/coffee-mode";
+          sha256 = "1px50hs0x30psa5ljndpcc22c0qwcaxslpjf28cfgxinawnp74g1";
+          name = "coffee-mode";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/coffee-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    color-theme-modern = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "color-theme-modern";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "emacs-jp";
+          repo = "replace-colorthemes";
+          rev = "0a804c611da57b2d7c02c95f26eb8a7fc305f159";
+          sha256 = "0q9ss11i31iiv0vn8238922fkic7j6d02f9ykbip04sm46p5k6kj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-modern";
+          sha256 = "0f662ham430fgxpqw96zcl1whcm28cv710g6wvg4fma60sblaxcm";
+          name = "color-theme-modern";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/color-theme-modern";
+          license = lib.licenses.free;
+        };
+      }) {};
+    color-theme-sanityinc-solarized = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "color-theme-sanityinc-solarized";
+        version = "2.29";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "color-theme-sanityinc-solarized";
+          rev = "554e941131d009c0a5d7129ed96796182b4cc590";
+          sha256 = "13jmg05skv409z8pg5m9rzkajj9knyln0ff8a3i1pbpyrnpngmmc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-sanityinc-solarized";
+          sha256 = "0xg79hgb893f1nqx6q4q6hp4w6rvgp1aah1v2r3scg2jk057qxkf";
+          name = "color-theme-sanityinc-solarized";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/color-theme-sanityinc-solarized";
+          license = lib.licenses.free;
+        };
+      }) {};
+    color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "color-theme-sanityinc-tomorrow";
+        version = "1.16";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "color-theme-sanityinc-tomorrow";
+          rev = "55db9979397bd66446eb1927e08c5a22df9f0eea";
+          sha256 = "0w99ypq048xldl1mrgc7qr4n2770dm48aknhp7q0176l43nvxnqf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-sanityinc-tomorrow";
+          sha256 = "1k8iwjc7iidq5sxybs47rnswa6c5dwqfdzfw7w0by2h1id2z6nqd";
+          name = "color-theme-sanityinc-tomorrow";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/color-theme-sanityinc-tomorrow";
+          license = lib.licenses.free;
+        };
+      }) {};
+    colorsarenice-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "colorsarenice-theme";
+        version = "1.0.20";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "colorsarenice-theme";
+          rev = "3cae55d0c7aeda3a8ef731ebc3886b2449ad87e6";
+          sha256 = "18hzm7yzwlfjlbkx46rgdl31p9xyfqnxlvg8337h2bicpks7kjia";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/colorsarenice-theme";
+          sha256 = "09zlglldjbjr97clwyzyz7c0k8hswclnk2zbkm03nnn9n9yyg2qi";
+          name = "colorsarenice-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/colorsarenice-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    commander = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "commander";
+        version = "0.7.0";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "commander.el";
+          rev = "2c8a57b9c619e29ccbe2d5a85921b9c689e95bf9";
+          sha256 = "1j6hhyzww7wfwk6bllbb5mk4hw4qs8hsgfbfdifsam9c6i4spm45";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/commander";
+          sha256 = "17y0hg6a90hflgwn24ww23qmvc1alzivpipca8zvpf0nih4fl393";
+          name = "commander";
+        };
+        packageRequires = [ cl-lib dash f s ];
+        meta = {
+          homepage = "http://melpa.org/#/commander";
+          license = lib.licenses.free;
+        };
+      }) {};
+    comment-dwim-2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "comment-dwim-2";
+        version = "1.2.2";
+        src = fetchFromGitHub {
+          owner = "remyferre";
+          repo = "comment-dwim-2";
+          rev = "8cedecde018b5872195bfead6511af822776a430";
+          sha256 = "0kzlv2my0cc7d3nki2rlm32nmb2nyjb38inmvlf13z0m2kybg2ps";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/comment-dwim-2";
+          sha256 = "1w9w2a72ygsj5w47vjqcljajmmbz0mi8dhz5gjnpwxjwsr6fn6lj";
+          name = "comment-dwim-2";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/comment-dwim-2";
+          license = lib.licenses.free;
+        };
+      }) {};
+    common-lisp-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "common-lisp-snippets";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "common-lisp-snippets";
+          rev = "3b2b50fda8b1526d45a74e3d30f560d6b6bbb284";
+          sha256 = "1cc9ak9193m92g6l4mrfxbkkmvljl3c51d0xzdidwww978q3x6ad";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/common-lisp-snippets";
+          sha256 = "0ig8cz00cbfx0jckqk1xhsvm18ivl2mjvcn65s941nblsywfvxjl";
+          name = "common-lisp-snippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/common-lisp-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company";
+        version = "0.8.12";
+        src = fetchFromGitHub {
+          owner = "company-mode";
+          repo = "company-mode";
+          rev = "e085a333867959a1b36015a3ad8e12e5bd6550d9";
+          sha256 = "08rrjfp2amgya1hswjz3vd5ja6lg2nfmm7454p0h1naz00hlmmw0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company";
+          sha256 = "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4";
+          name = "company";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/company";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-anaconda = callPackage ({ anaconda-mode, cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "company-anaconda";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "proofit404";
+          repo = "company-anaconda";
+          rev = "137ba58960a5feeb23aff34c9225fdf161f49f98";
+          sha256 = "1i6788qfinh47c5crgr57ykgbp6bvk1afcl00c8gywxsf8srvnvy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-anaconda";
+          sha256 = "1s7y47ghy7q35qpfqavh4p9wr91i6r579mdbpvv6h5by856yn4gl";
+          name = "company-anaconda";
+        };
+        packageRequires = [ anaconda-mode cl-lib company dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/company-anaconda";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-ansible = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-ansible";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "krzysztof-magosa";
+          repo = "company-ansible";
+          rev = "b9b4b22bc8c109de3ae3a5bb4c6b2be89bd644db";
+          sha256 = "1dds3fynbd6yb0874aw6g4qk5zmq3pgl3jmcp38md027qalgqmym";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-ansible";
+          sha256 = "084l9dr2hvm00952y4m3jhchzxjhcd61sfn5ywj9b9a1d4sr110d";
+          name = "company-ansible";
+        };
+        packageRequires = [ company emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/company-ansible";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-cabal = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-cabal";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "iquiw";
+          repo = "company-cabal";
+          rev = "a570559ff92522598b5ed40e21c4539fffb3e976";
+          sha256 = "1pja44g15d11kl47abzykrp28j782nkbmb0db0ilpc96xf1fjlsw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-cabal";
+          sha256 = "0pbjidj88c9qri6xw8023yqwnczad5ig224cbsz6vsmdla2nlxra";
+          name = "company-cabal";
+        };
+        packageRequires = [ cl-lib company emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/company-cabal";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-emoji = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-emoji";
+        version = "2.3.0";
+        src = fetchFromGitHub {
+          owner = "dunn";
+          repo = "company-emoji";
+          rev = "c77e9c6f87a7853787c70eae885e12b6162d4cc5";
+          sha256 = "1f8sjjms9kxni153pia6b45p2ih2mhm2r07d0j3fmxmz3q2jdldd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-emoji";
+          sha256 = "1mflqqw9gnfcqjb6g8ivdfl7s4mdyjg7j0457hamgyvgvpxsh8x3";
+          name = "company-emoji";
+        };
+        packageRequires = [ cl-lib company ];
+        meta = {
+          homepage = "http://melpa.org/#/company-emoji";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-ghc = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, ghc, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-ghc";
+        version = "1.1.0";
+        src = fetchFromGitHub {
+          owner = "iquiw";
+          repo = "company-ghc";
+          rev = "64e4f9d0cf9377138a8dee34c69e7d578fd71090";
+          sha256 = "0y9i0q37xjbnlnlxq7xjvnpn6ykzbd55g6nbw10z1wg0m2v7f96r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-ghc";
+          sha256 = "07adykza4dqs64bk8vjmgryr54khxmcy28hms5z8i1qpsk9vmvnn";
+          name = "company-ghc";
+        };
+        packageRequires = [ cl-lib company emacs ghc ];
+        meta = {
+          homepage = "http://melpa.org/#/company-ghc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-go = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-go";
+        version = "20150303";
+        src = fetchFromGitHub {
+          owner = "nsf";
+          repo = "gocode";
+          rev = "eef10fdde96a12528a6da32f51bf638b2863a3b1";
+          sha256 = "03snnra31b5j6iy94gql240vhkynbjql9b4b5j8bsqp9inmbsia3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-go";
+          sha256 = "1ncy5wlg3ywr17zrxb1d1bap4gdvwr35w9a8b0crz5h3l3y4cp29";
+          name = "company-go";
+        };
+        packageRequires = [ company ];
+        meta = {
+          homepage = "http://melpa.org/#/company-go";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-irony = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, irony, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-irony";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "Sarcasm";
+          repo = "company-irony";
+          rev = "29becb8824cacb1ea6f8c823d06ba65512c62e3d";
+          sha256 = "1gdsaa8zcs3layivn3ndbd5z1zflblmbxl251ld67bq763ga49cz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-irony";
+          sha256 = "15adamk1b9y1i6k06i5ahf1wn70cgwlhgk0x6fk8pl5izg05z1km";
+          name = "company-irony";
+        };
+        packageRequires = [ cl-lib company emacs irony ];
+        meta = {
+          homepage = "http://melpa.org/#/company-irony";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-jedi = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, jedi-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-jedi";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-company-jedi";
+          rev = "ad49407451c7f28fe137f9c8f3a7fc89e8693a1b";
+          sha256 = "1ihqapp4dv92794rsgyq0rmhwika60cmradqd4bn9b72ss6plxs1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-jedi";
+          sha256 = "1krrgrjq967c3j02y0i345yx6w4crisnj1k3bhih6j849fvy3fvj";
+          name = "company-jedi";
+        };
+        packageRequires = [ cl-lib company emacs jedi-core ];
+        meta = {
+          homepage = "http://melpa.org/#/company-jedi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
+    melpaBuild {
+        pname = "company-math";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "vspinu";
+          repo = "company-math";
+          rev = "e82c91d960f9418774959f299d0e064fcb6ba0ad";
+          sha256 = "009f0p0sggfn0yz7sivkcv8zygvv4ssbwqykbxgdxh9n6zk4hjky";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-math";
+          sha256 = "0chig8k8l65bnd0a6734fiy0ikl20k9v2wlndh3ckz5a8h963g87";
+          name = "company-math";
+        };
+        packageRequires = [ company math-symbol-lists ];
+        meta = {
+          homepage = "http://melpa.org/#/company-math";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-nixos-options = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, nixos-options }:
+    melpaBuild {
+        pname = "company-nixos-options";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "travisbhartwell";
+          repo = "nix-emacs";
+          rev = "5fc8fa29bea9dd8e9c822af92f9bc6ddc223635f";
+          sha256 = "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-nixos-options";
+          sha256 = "1yrqqdadmf7qfxpqp8wwb325zjnwwjmn2hhnl7i3j0ckg6hqyqf0";
+          name = "company-nixos-options";
+        };
+        packageRequires = [ cl-lib company nixos-options ];
+        meta = {
+          homepage = "http://melpa.org/#/company-nixos-options";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }:
+    melpaBuild {
+        pname = "company-quickhelp";
+        version = "1.2.0";
+        src = fetchFromGitHub {
+          owner = "expez";
+          repo = "company-quickhelp";
+          rev = "05e0ee9b854f90ff2b007b3e19446a02513f43dc";
+          sha256 = "0hg3wrfhz3qlfb6zv6j5a4xzmm4jk25pkv8h3ryg7sl7h602idgl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-quickhelp";
+          sha256 = "042bwv0wd4hksbm528zb7pbllzk83p8qjq5f8z46p84c8mmxfp9g";
+          name = "company-quickhelp";
+        };
+        packageRequires = [ company emacs pos-tip ];
+        meta = {
+          homepage = "http://melpa.org/#/company-quickhelp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-restclient = callPackage ({ cl-lib ? null, company, emacs, fetchFromGitHub, fetchurl, know-your-http-well, lib, melpaBuild, restclient }:
+    melpaBuild {
+        pname = "company-restclient";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "iquiw";
+          repo = "company-restclient";
+          rev = "98e4b2af0e84ba4192c16288123aed96541c6401";
+          sha256 = "0i1fh5lvqwlgn3g3fzh0xacxyljx6gkryipn133vfkv4jbns51n4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-restclient";
+          sha256 = "1md0n4k4wmbh9rmbwqh3kg2fj0c34rzqfd56jsq8lcdg14k0kdcb";
+          name = "company-restclient";
+        };
+        packageRequires = [
+          cl-lib
+          company
+          emacs
+          know-your-http-well
+          restclient
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/company-restclient";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }:
+    melpaBuild {
+        pname = "company-sourcekit";
+        version = "0.1.4";
+        src = fetchFromGitHub {
+          owner = "nathankot";
+          repo = "company-sourcekit";
+          rev = "ea26c1284ccf72d6e3a850c6725433f0f8e2b3f9";
+          sha256 = "1l9xrw88wq32wm3qx922ihdb9mlv9rrdalwvz9i2790fmw7y84vz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-sourcekit";
+          sha256 = "0hr5j1ginf43h4qf3fvsh3z53z0c7w5a9lhrvdwmlzj396qhqmzs";
+          name = "company-sourcekit";
+        };
+        packageRequires = [ company dash dash-functional emacs sourcekit ];
+        meta = {
+          homepage = "http://melpa.org/#/company-sourcekit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-tern = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tern }:
+    melpaBuild {
+        pname = "company-tern";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "proofit404";
+          repo = "company-tern";
+          rev = "9a2cb8427a1a93c9c5021c01df1b47c69d79e176";
+          sha256 = "11cinjsyf24d4a682ikniprxd1vkwn6mynsp5dzab6yzq09np78i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-tern";
+          sha256 = "17pw4jx3f1hymj6sc0ri18jz9ngggj4a41kxx14fnmmm8adqn6wh";
+          name = "company-tern";
+        };
+        packageRequires = [ cl-lib company dash dash-functional s tern ];
+        meta = {
+          homepage = "http://melpa.org/#/company-tern";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-web = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, web-completion-data }:
+    melpaBuild {
+        pname = "company-web";
+        version = "0.9";
+        src = fetchFromGitHub {
+          owner = "osv";
+          repo = "company-web";
+          rev = "ffb6b969813041d2d90680a7696a9e0208eaed61";
+          sha256 = "0b0k75rg43h48dbcqiid947nspqiqxkiqcmvph9aqpxlfr67bz5r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-web";
+          sha256 = "0dj0m6wcc8cyvblp9b5b3am95gc18j9y4va44hvljxv1h7l5hhvy";
+          name = "company-web";
+        };
+        packageRequires = [ cl-lib company dash web-completion-data ];
+        meta = {
+          homepage = "http://melpa.org/#/company-web";
+          license = lib.licenses.free;
+        };
+      }) {};
+    company-ycmd = callPackage ({ company, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, s, ycmd }:
+    melpaBuild {
+        pname = "company-ycmd";
+        version = "0.9";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "emacs-ycmd";
+          rev = "8fb29b84d42c0aea71fe7db088b0b7a5a0c6b34c";
+          sha256 = "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-ycmd";
+          sha256 = "0fqmkb0q8ai605jzn2kwd585b2alwxbmnb3yqnn9fgkcvyc9f0pk";
+          name = "company-ycmd";
+        };
+        packageRequires = [ company deferred s ycmd ];
+        meta = {
+          homepage = "http://melpa.org/#/company-ycmd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    concurrent = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "concurrent";
+        version = "0.4.0";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-deferred";
+          rev = "8827106c83f0fc773bc406d381ea25a29a5965e1";
+          sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/concurrent";
+          sha256 = "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf";
+          name = "concurrent";
+        };
+        packageRequires = [ deferred ];
+        meta = {
+          homepage = "http://melpa.org/#/concurrent";
+          license = lib.licenses.free;
+        };
+      }) {};
+    conkeror-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "conkeror-minor-mode";
+        version = "1.6.2";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "conkeror-minor-mode";
+          rev = "476e81c27b056e21c192391fe674a2bf875466b0";
+          sha256 = "0sz3qx1bn0lwjhka2l6wfl4b5486ji9dklgjs7fdlkg3dgpp1ahx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/conkeror-minor-mode";
+          sha256 = "1ch108f20k7xbf79azsp31hh4wmw7iycsxddcszgxkbm7pj11933";
+          name = "conkeror-minor-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/conkeror-minor-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    connection = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "connection";
+        version = "1.10";
+        src = fetchFromGitHub {
+          owner = "myrkr";
+          repo = "dictionary-el";
+          rev = "9ef1672ecd367827381bbbc9af93685980083c5c";
+          sha256 = "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/connection";
+          sha256 = "1y68d2kay8p5vapailxhrc5dl7b8k8nkvp7pa54md3fsivwp1d0q";
+          name = "connection";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/connection";
+          license = lib.licenses.free;
+        };
+      }) {};
+    corral = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "corral";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "nivekuil";
+          repo = "corral";
+          rev = "bcd1d90b2280f93ed139e4aa82838a8e62a4bac9";
+          sha256 = "0gpckp12b0hllgn821q3rqfxh5h7ny5gfhhvfdbvszb7kwl1f6cx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/corral";
+          sha256 = "1drccqk4qzkgvkgkzlrrfd1dcgj8ziqriijrjihrzjgjsbpzv6da";
+          name = "corral";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/corral";
+          license = lib.licenses.free;
+        };
+      }) {};
+    counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
+    melpaBuild {
+        pname = "counsel";
+        version = "0.7.0";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "swiper";
+          rev = "706349fcfae297ee285552af9246bc0cf00d9b7f";
+          sha256 = "1kahl3h18vsjkbqvd84fb2w45s4srsiydn6jiv49vvg1yaxzxcbm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/counsel";
+          sha256 = "0y8cb2q4mqvzan5n8ws5pjpm7bkjcghg5q19mzc3gqrq9vrvyzi6";
+          name = "counsel";
+        };
+        packageRequires = [ emacs swiper ];
+        meta = {
+          homepage = "http://melpa.org/#/counsel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cpputils-cmake = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cpputils-cmake";
+        version = "0.5.2";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "cpputils-cmake";
+          rev = "d11e5496a0bf885900e7d0d004decc66f95dda3f";
+          sha256 = "03nzbrvvs31xgaqhxmrj9bypywsg42q06k4z4z1fpjssg9az0j4p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cpputils-cmake";
+          sha256 = "0fswmmmrjv897n51nidmn8gs8yp00595g35vwjafsq6rzfg58j60";
+          name = "cpputils-cmake";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cpputils-cmake";
+          license = lib.licenses.free;
+        };
+      }) {};
+    creds = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "creds";
+        version = "0.0.6.1";
+        src = fetchFromGitHub {
+          owner = "ardumont";
+          repo = "emacs-creds";
+          rev = "00ebefd10005c170b790a01380cb6a98f798ce5c";
+          sha256 = "169ai0xkh3988racnhaapxw0v1pbxvcaq470x1qacdzdpka4a7bs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/creds";
+          sha256 = "0n11xxaf93bbc9ih25wj09zzw4sj32wb99qig4zcy8bpkl5y3llk";
+          name = "creds";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/creds";
+          license = lib.licenses.free;
+        };
+      }) {};
+    crm-custom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "crm-custom";
+        version = "0.5";
+        src = fetchFromGitHub {
+          owner = "DarwinAwardWinner";
+          repo = "crm-custom";
+          rev = "f1aaccf64306a5f99d9bf7ba815d7ea41c15518d";
+          sha256 = "1kl6blr4dlz40gfc845071nhfms4fm59284ja2177bhghy3wmw6r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/crm-custom";
+          sha256 = "14w15skxr44p9ilhpswlgdbqfw8jghxi69l37yk4m449m7g9694c";
+          name = "crm-custom";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/crm-custom";
+          license = lib.licenses.free;
+        };
+      }) {};
+    crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "crux";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "bbatsov";
+          repo = "crux";
+          rev = "7d4e425af79c5756c243f74e86884680e671c2e1";
+          sha256 = "1way14a4rhrqkby40wr21q6yxhl4qi0a0x89jzf21jdzsbykvaik";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/crux";
+          sha256 = "10lim1sngqbdqqwyq6ksqjjqpkm97aj1jk550sgwj28338lnw73c";
+          name = "crux";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/crux";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cryptol-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cryptol-mode";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "thoughtpolice";
+          repo = "cryptol-mode";
+          rev = "a54d000d24757fad2a91ae2853b16a97ebe52771";
+          sha256 = "00wgbcw09xn9xi52swi4wyi9dj9p9hyin7i431xi6zkhxysw4q7w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cryptol-mode";
+          sha256 = "08iq69gqmps8cckybhj9065b8a2a49p0rpzgx883qxnypsmjfmf2";
+          name = "cryptol-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cryptol-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "csharp-mode";
+        version = "0.8.12";
+        src = fetchFromGitHub {
+          owner = "josteink";
+          repo = "csharp-mode";
+          rev = "b4fb58af022a60c1c8161475e9c3fa023a0f9816";
+          sha256 = "0dqih7cy57sciqn5vz5fiwynpld96qldyl7jcgn9qpwnzb401ayx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/csharp-mode";
+          sha256 = "17j84qrprq492dsn103dji8mvh29mbdlqlpsszbgfdgnpvfr1rv0";
+          name = "csharp-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/csharp-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ctable = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ctable";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-ctable";
+          rev = "08a017bde6d24ea585e39ce2637bebe28774d316";
+          sha256 = "13zq8kym1y6bzrpxbcdz32323a6azy5px4ridff6xh8bfprwlay3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctable";
+          sha256 = "040qmlgfvjc1f908n52m5ll2fizbrhjzbd0kgrsw37bvm3029rx1";
+          name = "ctable";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ctable";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ctags = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "ctags";
+        version = "1.1.1";
+        src = fetchhg {
+          url = "https://bitbucket.com/semente/ctags.el";
+          rev = "afb16c5b2530";
+          sha256 = "1xgrb4ivgz7gmingfafmclqqflxdvkarmfkqqv1zjk6yrjhlcvwf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctags";
+          sha256 = "11fp8l99rj4fmi0vd3hkffgpfhk1l82ggglzb74jr3qfzv3dcn6y";
+          name = "ctags";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ctags";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ctags-update = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ctags-update";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "jixiuf";
+          repo = "helm-etags-plus";
+          rev = "d3f3162d5a3291d84b15fd325859c87e1a374923";
+          sha256 = "05vhryqcydvcfm18fwby344931kzzh47x4l5ixy95xkcjkzrj8c7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctags-update";
+          sha256 = "1k43l667mvr2y33nblachdlvdqvn256gysc1iwv5zgv7gj9i65qf";
+          name = "ctags-update";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ctags-update";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ctxmenu = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, popup, yaxception }:
+    melpaBuild {
+        pname = "ctxmenu";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "emacs-ctxmenu";
+          rev = "5c2376859562b98c07c985d2b483658e4c0e888e";
+          sha256 = "1jlr2miwqsg06hk2clvsrw9fa98m2n76qfq8qv5svrb8dpil04wb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctxmenu";
+          sha256 = "03g9px858mg19wapqszwav3599slljdyam8bvn1ri85fpa5ydvdp";
+          name = "ctxmenu";
+        };
+        packageRequires = [ log4e popup yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/ctxmenu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cuda-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cuda-mode";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "chachi";
+          repo = "cuda-mode";
+          rev = "c8cf7d92b8039cdd0bd525c258ab42f49a0f91cf";
+          sha256 = "1y685qfdkjyl7dwyvivlgc2lwp102vy6hvcb9zynw84c49f726sn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cuda-mode";
+          sha256 = "0ip4vax93x72bjrh6prik6ddmrvszpsmgm0fxfz772rp24smc300";
+          name = "cuda-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cuda-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cyberpunk-theme";
+        version = "1.16";
+        src = fetchFromGitHub {
+          owner = "n3mo";
+          repo = "cyberpunk-theme.el";
+          rev = "08ac966ce38be4a3de0a6f6051b8763b5c85e534";
+          sha256 = "12lkhlsi48wc5cy3zw57wihh9d4ixs2mcbvz9mdgjyhc2xhx3na8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cyberpunk-theme";
+          sha256 = "0l2bwb5afkkhrbh99v2gns1vil9s5911hbnlq5w35nmg1wvbmbc9";
+          name = "cyberpunk-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cyberpunk-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cyphejor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cyphejor";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "cyphejor";
+          rev = "1025d82a9abaca132f5855e72d56c0c2ccc0eef4";
+          sha256 = "1vkwm1n0amf0y0jdyvqskp00b6aijqhd7wclzkzrq7glrvj2z1xw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cyphejor";
+          sha256 = "18l5km4xm5j3vv19k3fxs8i3rg4qnhrvx7b62vmyfcqmpiasrh6g";
+          name = "cyphejor";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/cyphejor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    cython-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cython-mode";
+        version = "0.23.4";
+        src = fetchFromGitHub {
+          owner = "cython";
+          repo = "cython";
+          rev = "dc00a176d896f0df892aad8b305d946d3ed632a0";
+          sha256 = "0kbk2gp2avp0da32mr003ziigmi98zi0fvwia4knylllmrkl3pvq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cython-mode";
+          sha256 = "0asai1f1pncrfxx296fn6ky09hj1qam5j0dpxxkzhy0a34xz0k2i";
+          name = "cython-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/cython-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    d-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "d-mode";
+        version = "2.0.6";
+        src = fetchFromGitHub {
+          owner = "Emacs-D-Mode-Maintainers";
+          repo = "Emacs-D-Mode";
+          rev = "9b22a9373fc38cf3bc1ea9a814bcd8191d4c6626";
+          sha256 = "0apg6cpwjhp8spqq8yyfp56y3pn991sfc85kfnifyhz6v3y6vwv6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/d-mode";
+          sha256 = "060k9ndjx0n5vlpzfxlv5zxnizx72d7y9vk7gz7gdvpm6w2ha0a2";
+          name = "d-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/d-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    darcula-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "darcula-theme";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "fommil";
+          repo = "darcula-theme-emacs";
+          rev = "202a5affe59a5e1ac1d33a7e518d1df772bf2100";
+          sha256 = "1gdh4izwhyly6dyrmh7lfpd12gnb8hpnafj8br51ksijsssrf21f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/darcula-theme";
+          sha256 = "13d21gwzv66ibn0gs56ff3sn76sa2mkjvjmpd2ncxq3mcgxajnjg";
+          name = "darcula-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/darcula-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    darktooth-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "darktooth-theme";
+        version = "0.1.37";
+        src = fetchFromGitHub {
+          owner = "emacsfodder";
+          repo = "emacs-theme-darktooth";
+          rev = "ce2d8d5faeb72205bdcb192dfc1e4769e7088fa3";
+          sha256 = "1p7ih9fmcxnnxkj2mz56xa403m828wyyqvliabf5amklzjlhb3z9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/darktooth-theme";
+          sha256 = "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs";
+          name = "darktooth-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/darktooth-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dart-mode";
+        version = "0.14";
+        src = fetchFromGitHub {
+          owner = "nex3";
+          repo = "dart-mode";
+          rev = "07edf4d4448ede128d13c27bd76cf06f5ef5bb3b";
+          sha256 = "1vkn95dyc0pppnflyqlrlx32g9zc7wdcgc9fgf1hgvqp313ydfcs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dart-mode";
+          sha256 = "0wxfh8v716dhrmx1klhpnsrlsj66llk8brmwryjg2h7c391sb5ff";
+          name = "dart-mode";
+        };
+        packageRequires = [ cl-lib dash flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/dart-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dash";
+        version = "2.12.1";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "dash.el";
+          rev = "fec6f5480d0ce03ead0e6117ac77dc7e757e76f8";
+          sha256 = "1njv5adcm96kdch0jb941l8pm51yfdx7mlz83y0pq6jlzjs9mwaa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dash";
+          sha256 = "0azm47900bk2frpjsgy108fr3p1jk4h9kmp4b5j5pibgsm26azgz";
+          name = "dash";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dash";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dash-functional = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dash-functional";
+        version = "2.12.1";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "dash.el";
+          rev = "fec6f5480d0ce03ead0e6117ac77dc7e757e76f8";
+          sha256 = "1njv5adcm96kdch0jb941l8pm51yfdx7mlz83y0pq6jlzjs9mwaa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dash-functional";
+          sha256 = "0hx36hs12mf4nmskaaqrqpcgwrfjdqj6qcxn6bwb0s5m2jf9hs8p";
+          name = "dash-functional";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/dash-functional";
+          license = lib.licenses.free;
+        };
+      }) {};
+    date-at-point = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "date-at-point";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "date-at-point.el";
+          rev = "662f8350a83311503dc0aae47a28752f9f1270c9";
+          sha256 = "06aprbhhxb6bbzmf0r5yq2ry6x7708vp4d94ja3ir6zcwc96wn0k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/date-at-point";
+          sha256 = "0r26df6px6q5jlxj29nhl3qbp6kzy9hs5vd72kpiirgn4wlmagp0";
+          name = "date-at-point";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/date-at-point";
+          license = lib.licenses.free;
+        };
+      }) {};
+    date-field = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
+    melpaBuild {
+        pname = "date-field";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "emacs-date-field";
+          rev = "11c9170d1f7b343233f7716d4c0a62be024c1654";
+          sha256 = "1lmwnj2fnvijj9qp4rjggl7c4x91vnpb47rqaam6m2wmr5wbrx3w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/date-field";
+          sha256 = "0fmw13sa4ajs1xkrkdpcjpbp0jl9d81cgvwh93myg8yjjn7wbmvk";
+          name = "date-field";
+        };
+        packageRequires = [ dash log4e yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/date-field";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dedicated = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dedicated";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "dedicated";
+          rev = "8275fb672f9cc4ba6682ebda0ef91db827e32992";
+          sha256 = "0pba9s0h37sxyqh733vi6k5raa4cs7aradipf3826inw36jcw414";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dedicated";
+          sha256 = "1ka8n02r3nd2ksbid23g2qd6707c7xsjx7lbbdi6pcmwam5mglw9";
+          name = "dedicated";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dedicated";
+          license = lib.licenses.free;
+        };
+      }) {};
+    default-text-scale = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "default-text-scale";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "default-text-scale";
+          rev = "c90c08b9fe5f25474067a00c4a4babdb413b25b1";
+          sha256 = "031f8ls1q80j717cg6b4pjd37wk7vrl5hcycsn8ca7yssmqa8q81";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/default-text-scale";
+          sha256 = "18r90ic38fnlsbg4gi3r962vban398x2bf3rqhrc6z4jk4aiv3mi";
+          name = "default-text-scale";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/default-text-scale";
+          license = lib.licenses.free;
+        };
+      }) {};
+    deferred = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "deferred";
+        version = "0.4.0";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-deferred";
+          rev = "8827106c83f0fc773bc406d381ea25a29a5965e1";
+          sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/deferred";
+          sha256 = "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr";
+          name = "deferred";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/deferred";
+          license = lib.licenses.free;
+        };
+      }) {};
+    define-word = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "define-word";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "define-word";
+          rev = "38e2f94779652fc6280a51b68dc910431513a8e1";
+          sha256 = "1lyqd9cgj7cb2lasf6ycw5j8wnsx2nrfm8ra4sg3dgcspm01a89g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/define-word";
+          sha256 = "035fdfwnxw0mir1dyvrimygx2gafcgnvlcsmwmry1rsfh39n5b9a";
+          name = "define-word";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/define-word";
+          license = lib.licenses.free;
+        };
+      }) {};
+    deft = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "deft";
+        version = "0.7";
+        src = fetchgit {
+          url = "git://jblevins.org/git/deft.git";
+          rev = "4001a55cf5f79cdbfa00f1405e8a4645af4acd40";
+          sha256 = "eb5c178337c0bd6a001114aac685bb0d23167050970274203d93c1c0caece1e8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/deft";
+          sha256 = "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p";
+          name = "deft";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/deft";
+          license = lib.licenses.free;
+        };
+      }) {};
+    demangle-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "demangle-mode";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "liblit";
+          repo = "demangle-mode";
+          rev = "07e62a7f976f6c7366b4b0475bbb5cff881452b8";
+          sha256 = "13jfhc9gavvb9dxmgi3k7ivp5iwh4yw4m11r2s8wpwn6p056bmfl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/demangle-mode";
+          sha256 = "0ky0bb6rc99vrdli4lhs656qjndnla9b7inc2ji9l4n1zki5qxzk";
+          name = "demangle-mode";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/demangle-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    describe-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yabin }:
+    melpaBuild {
+        pname = "describe-number";
+        version = "0.3.1";
+        src = fetchFromGitHub {
+          owner = "netromdk";
+          repo = "describe-number";
+          rev = "40618345a37831804b29589849a785ef5aa5ac24";
+          sha256 = "13fasbhdjwc4jh3cy25gm5sbbg56hq8la271098qpx6dhqm2wycq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/describe-number";
+          sha256 = "0gvriailni2ppz69g0bwnb1ik1ghjkj341k45vllz30j0frp9iji";
+          name = "describe-number";
+        };
+        packageRequires = [ yabin ];
+        meta = {
+          homepage = "http://melpa.org/#/describe-number";
+          license = lib.licenses.free;
+        };
+      }) {};
+    desktop-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "desktop-plus";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "ffevotte";
+          repo = "desktop-plus";
+          rev = "a484d24ca673c7536387368729421dad9dde5059";
+          sha256 = "184zi5fv7ranghfx1hpx7j2wnk6kim8ysliyw2c5c1294sxxq3f3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/desktop+";
+          sha256 = "0w7i6k4814hwb19l7ly9yq59674xiw57ylrwxq7yprwx52sgs2r8";
+          name = "desktop-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/desktop+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    desktop-registry = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "desktop-registry";
+        version = "1.2.0";
+        src = fetchgit {
+          url = "git://ryuslash.org/desktop-registry.git";
+          rev = "244c2e7f9f0a1050aa8a47ad0b38f4e4584682dd";
+          sha256 = "7c7727dd1d63be98e428700bfe340f2c4e7ff713fcc9b2b743a3366d786ae02d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/desktop-registry";
+          sha256 = "02mj0nlawx6vpksqsvp1q7l8rd6b1bs8f9c8c2rmda46jaf5npyr";
+          name = "desktop-registry";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/desktop-registry";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dictionary = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dictionary";
+        version = "1.10";
+        src = fetchFromGitHub {
+          owner = "myrkr";
+          repo = "dictionary-el";
+          rev = "9ef1672ecd367827381bbbc9af93685980083c5c";
+          sha256 = "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dictionary";
+          sha256 = "0zr9sm5rmr0frxdr0za72wiffip9391fn9dm5y5x0aj1z4c1n28w";
+          name = "dictionary";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dictionary";
+          license = lib.licenses.free;
+        };
+      }) {};
+    diff-hl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "diff-hl";
+        version = "1.8.2";
+        src = fetchFromGitHub {
+          owner = "dgutov";
+          repo = "diff-hl";
+          rev = "d0e6660ee501efea3e9b0936ed64fff09e66df02";
+          sha256 = "09fdhpi6qqq5s5mwqz56631jk8l1g0lh4zl62nq4982pl6sciqk9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/diff-hl";
+          sha256 = "0kw0v9xcqidhf26qzrqwdlav2zhq32xx91k7akd2536jpji5pbn6";
+          name = "diff-hl";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/diff-hl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    diffview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "diffview";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "mgalgs";
+          repo = "diffview-mode";
+          rev = "471dc36af93e68849bf2da0db991e186283b3546";
+          sha256 = "1ci2gmyl0i736b2sxh77fyg4hs2pkn6rn9z7v2hzv6xlgqd6j3z6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/diffview";
+          sha256 = "0vlzmykvxjwjww313brl1nr13kz41jypsk0s3l8q3rbsnkpfic5k";
+          name = "diffview";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/diffview";
+          license = lib.licenses.free;
+        };
+      }) {};
+    digistar-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "digistar-mode";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "retroj";
+          repo = "digistar-mode";
+          rev = "0dcde58ec6e473042e55d4f283b223554546de5b";
+          sha256 = "0jzwaivsqh66py9hd3dg1ys5rc3p6pn8ndpwpvgyivk4pg6zhhj6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/digistar-mode";
+          sha256 = "0khzxlrm09h31i1nqz6rnzhrdssb3kppc4klpxza612l306fih0s";
+          name = "digistar-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/digistar-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dim = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dim";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "dim.el";
+          rev = "0c19a510580ebdc77e6db536f0f8ed2840b9b33e";
+          sha256 = "1vrd74vmm60gb69a4in412mjncnhkjbfpakpaa6w9rj7w4kyfiz1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dim";
+          sha256 = "0gsyily47g3g55qmhp1wzfz319l1pkgjz4lbigafjzlzqxyclz52";
+          name = "dim";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/dim";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dim-autoload = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dim-autoload";
+        version = "1.1.4";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "dim-autoload";
+          rev = "d68ef0d2f9204ffe0d521e2647e6d8f473588fd3";
+          sha256 = "0bw1gkaycbbv2glnaa36gwzkl1l6lsq7i2i7jinka92b27zvrans";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dim-autoload";
+          sha256 = "0lhzzjrgfvbqnzwhjywrk3skdb7x10xdq7d21q6kdk3h5r0np9f9";
+          name = "dim-autoload";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dim-autoload";
+          license = lib.licenses.free;
+        };
+      }) {};
+    diminish = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "diminish";
+        version = "0.45";
+        src = fetchFromGitHub {
+          owner = "myrjola";
+          repo = "diminish.el";
+          rev = "0211de96b7cfba9c9dc8d2d392dbd4ccdb22bc65";
+          sha256 = "0qpgfgp8hrzz4vdifxq8h25n0a0jlzgf7aa1fpy6r0080v5rqbb6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/diminish";
+          sha256 = "1h6a31jllypk47akjflz89xk6h47na96pim17d6g4rpqcafc2k43";
+          name = "diminish";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/diminish";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dionysos = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild, pkg-info, s }:
+    melpaBuild {
+        pname = "dionysos";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "dionysos";
+          rev = "92578e813b92c8aae12948b44e0c7757cc9b3d9b";
+          sha256 = "1xg9cschjd2m0zal296q54ifk5i4s1s3azwfdkbgshxxgvxaky0w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dionysos";
+          sha256 = "1wjgj74dnlwd79gc3l7ymbx75jka8rw9smzbb10dsfppw3rrzfmz";
+          name = "dionysos";
+        };
+        packageRequires = [ dash libmpdee pkg-info s ];
+        meta = {
+          homepage = "http://melpa.org/#/dionysos";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-efap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-efap";
+        version = "0.8";
+        src = fetchFromGitHub {
+          owner = "juan-leon";
+          repo = "dired-efap";
+          rev = "2b849bc5c09d0b752a177495ea1b851ee821f5bf";
+          sha256 = "1m0nx8wd6q56qbp5mbp9n466kyglrz34nflwvgd1qnmi08jwswgv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-efap";
+          sha256 = "01j5v6584qi8ia7zmk03kx3i3kmm6hn6ycfgqlh5va6lp2h9sr00";
+          name = "dired-efap";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dired-efap";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-fdclone = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-fdclone";
+        version = "1.5.2";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "dired-fdclone.el";
+          rev = "8144c013d46c55b0471f31cdc3b5ead303286cbf";
+          sha256 = "0lrc4082ghg77x5jl26hj8c7cp48yjvqhv4g3j0pznpzb4qyfnq0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-fdclone";
+          sha256 = "11aikq2q3m9h4zpgl24f8npvpwd98jgh8ygjwy2x5q8as8i89vf9";
+          name = "dired-fdclone";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dired-fdclone";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-imenu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-imenu";
+        version = "0.5.0";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "dired-imenu";
+          rev = "610e21fe0988c85931d34894d3eee2442c79ab0a";
+          sha256 = "088h9yn6wndq4pq6f7q4iz17f9f4ci29z9nh595idljp3vwr7qid";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-imenu";
+          sha256 = "09yix4fkr03jq6j2rmvyg6gkmcnraw49a8m9649r3m525qdnhxs1";
+          name = "dired-imenu";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dired-imenu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-k = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-k";
+        version = "0.16";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-dired-k";
+          rev = "f4f4a1fe3155c35e212d3e16ed5f7c89c0b32282";
+          sha256 = "0rpln6m3j4xbhrmmz18hby6xpzpzbf1c5hr7bxvna265cb0i5rn7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-k";
+          sha256 = "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8";
+          name = "dired-k";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/dired-k";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dired-single = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-single";
+        version = "0.1.3";
+        src = fetchFromGitHub {
+          owner = "crocket";
+          repo = "dired-single";
+          rev = "5b002927fd8c7f954eec187227ac59dcaa8edfa3";
+          sha256 = "0mfvyjbx7l7a1sfq47m6rb507xxw92nykkkpzmi2mpwv30f1c22j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-single";
+          sha256 = "13h8dsn7bkz8ji2rrb7vyrqb2znxarpiynqi65mfli7dn5k086vf";
+          name = "dired-single";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dired-single";
+          license = lib.licenses.free;
+        };
+      }) {};
+    direx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "direx";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "m2ym";
+          repo = "direx-el";
+          rev = "423caeed13249e37afc937dc8134cb3c53e0f111";
+          sha256 = "0p8c2hjgr81idm1psv3i3v5hr5rv0875ig8app2yqjwzvl0nn73f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/direx";
+          sha256 = "1x3rnrhhyrrvgry9n7kc0734la1zp4gc4bpy50f2qpfd452jwqdm";
+          name = "direx";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/direx";
+          license = lib.licenses.free;
+        };
+      }) {};
+    direx-grep = callPackage ({ direx, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "direx-grep";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "direx-grep";
+          rev = "1109a512a80b2673a70b18b8568514049017faad";
+          sha256 = "0swdh0qynpijsv6a2d308i42hfa0jwqsnmf4sm8vrhaf3vv25f5h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/direx-grep";
+          sha256 = "0y2wrzq06prm55akwgaqjg56znknyvbayav13asirqzg258skvm2";
+          name = "direx-grep";
+        };
+        packageRequires = [ direx ];
+        meta = {
+          homepage = "http://melpa.org/#/direx-grep";
+          license = lib.licenses.free;
+        };
+      }) {};
+    discover = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }:
+    melpaBuild {
+        pname = "discover";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "mickeynp";
+          repo = "discover.el";
+          rev = "bbfda2b4e429985a8fa7971d264c942767cfa816";
+          sha256 = "0qxw30zrlcxhxb0alrgyiclrk44dysal8xsbz2mvgrb6jli8wg18";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/discover";
+          sha256 = "1hf57p90jn1zzhjl63zv9ascbgkcbr0p0zmd3fvzpjsw84235dga";
+          name = "discover";
+        };
+        packageRequires = [ makey ];
+        meta = {
+          homepage = "http://melpa.org/#/discover";
+          license = lib.licenses.free;
+        };
+      }) {};
+    discover-my-major = callPackage ({ fetchFromGitHub, fetchurl, lib, makey, melpaBuild }:
+    melpaBuild {
+        pname = "discover-my-major";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "steckerhalter";
+          repo = "discover-my-major";
+          rev = "57d76fd21ec54706289cf9396fc871250569951e";
+          sha256 = "1wlqyl03hhnflbyay3qlvdzqzvv5rbybcjpfddggda7ias9h0pr4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/discover-my-major";
+          sha256 = "0ch2y4grdjp7pvw2kxqnqdl7jd3q609n3pm3r0gn6k0xmcw85fgg";
+          name = "discover-my-major";
+        };
+        packageRequires = [ makey ];
+        meta = {
+          homepage = "http://melpa.org/#/discover-my-major";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dispass = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dispass";
+        version = "1.1.2";
+        src = fetchFromGitHub {
+          owner = "ryuslash";
+          repo = "dispass.el";
+          rev = "38b880e72cfe5e65179b16791903b0900c73eff4";
+          sha256 = "1b1a1bwc6nv6wkd8jg1cqmjb9m9pxi5i2wbrz97fgii23dwfmlnl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dispass";
+          sha256 = "08c1s4zgl4rha10mva48cfkxzrqnpdhy03pxq51ihw94v6vxzg3z";
+          name = "dispass";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dispass";
+          license = lib.licenses.free;
+        };
+      }) {};
+    docker = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit-popup, melpaBuild, s }:
+    melpaBuild {
+        pname = "docker";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "Silex";
+          repo = "docker.el";
+          rev = "77f646cc10909403a945d188cf9d81abd3bfc2a0";
+          sha256 = "06vb6r1k9ml799h44fm9jhf3amldzhawxnm0lnr501hrmj4bz36x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/docker";
+          sha256 = "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk";
+          name = "docker";
+        };
+        packageRequires = [ dash emacs magit-popup s ];
+        meta = {
+          homepage = "http://melpa.org/#/docker";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dockerfile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dockerfile-mode";
+        version = "1.2";
+        src = fetchFromGitHub {
+          owner = "spotify";
+          repo = "dockerfile-mode";
+          rev = "9a75fcd119c5b2a1d723d440bbe4b1db56df90cc";
+          sha256 = "1cmh8pwwa6dhl4w66wy8s5yqxs326mnaalg1ig2yhl4bjk8gi4m2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dockerfile-mode";
+          sha256 = "1dxvzn35a9qd3x8pjvrvb2g71yf84404g6vz81y0p353rf2zknpa";
+          name = "dockerfile-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dockerfile-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    downplay-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "downplay-mode";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "tobias";
+          repo = "downplay-mode";
+          rev = "225a4b3ca09e6f463dfdd54941c98b02be8d574c";
+          sha256 = "13czcxmmvy4g9ysfjr6lb91c0fqv1xv8ppd27wbfsrgxm3aaqimb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/downplay-mode";
+          sha256 = "1v6nga101ljzza8qj3lkmkzzl0vvzj4lsh1m69698s8prnczxr9b";
+          name = "downplay-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/downplay-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dracula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dracula-theme";
+        version = "1.2.0";
+        src = fetchFromGitHub {
+          owner = "zenorocha";
+          repo = "dracula-theme";
+          rev = "ee065fed126eecdfe33a1a578d9f1e20687d2f3a";
+          sha256 = "1x7hyj5qi9f222zwhwjqr98zzcvqjqfwxlglph8nsbadkv4s8c3v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dracula-theme";
+          sha256 = "0ayv00wvajia8kbfrqkrkpb3qp3k70qcnqkav7am16p5kbvzp10r";
+          name = "dracula-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/dracula-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    draft-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "draft-mode";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "gaudecker";
+          repo = "draft-mode";
+          rev = "4779fb32daf53746459da2def7e08004492d4f18";
+          sha256 = "0z3w58zplm5ks195zfsaq8kwbc944p3kbzs702jgz02wcrm4c28y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/draft-mode";
+          sha256 = "1wg9cx39f4dhrykb4zx4fh0x5cfrh5aicwwfh1h3yzpc4zlr7xfh";
+          name = "draft-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/draft-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    drag-stuff = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "drag-stuff";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "drag-stuff";
+          rev = "3265e4fe93323bc9089d12db3d466d49bc44a99d";
+          sha256 = "0wncdlc45flggn6sq5a95y7k6q11hy7zxp0ddhsjqccl30mdwax5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/drag-stuff";
+          sha256 = "0hzbh58ijv1akamav8r0zs76pwda2zd9mjaj31ffalzhhsm5jnyc";
+          name = "drag-stuff";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/drag-stuff";
+          license = lib.licenses.free;
+        };
+      }) {};
+    drupal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode }:
+    melpaBuild {
+        pname = "drupal-mode";
+        version = "0.6.1";
+        src = fetchFromGitHub {
+          owner = "arnested";
+          repo = "drupal-mode";
+          rev = "cf0364cbaf727bcd21ab7c2a14cc987c49fd97d0";
+          sha256 = "12lxqrcfv5salmcslw3kggymcwwc0lzq1b6iqd7x4zizp0sjf09s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/drupal-mode";
+          sha256 = "14jvk4phq3wcff3yvhygix0c9cpbphh0dvm961i93jpsx7g9awgn";
+          name = "drupal-mode";
+        };
+        packageRequires = [ php-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/drupal-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    drupal-spell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "drupal-spell";
+        version = "0.2.2";
+        src = fetchFromGitHub {
+          owner = "arnested";
+          repo = "drupal-spell";
+          rev = "a69f5e3b62c4c0da74ce26c1d00d5b8f7395e4ae";
+          sha256 = "156cscpavrp695lp8pgjg5jnq3b8n9c2h8qg8w89dd4vfkc3iikd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/drupal-spell";
+          sha256 = "117rr2bfnc99g3qsr127grxwaqp54cxjaj3nl2nr6z78nja0fij3";
+          name = "drupal-spell";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/drupal-spell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ducpel = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ducpel";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "ducpel";
+          rev = "ece785baaa102bd2e9d54257af3a92bacc5757bc";
+          sha256 = "17yldk76mxakhb90bma7r4z9jgx02wankgk17r2di196mc04bj7b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ducpel";
+          sha256 = "1cqrkgg7n9bhjswnpl7yc6w6yjs4gfbliaqsimmf9z43wk2ml4pc";
+          name = "ducpel";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/ducpel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dyalog-mode";
+        version = "0.3";
+        src = fetchhg {
+          url = "https://bitbucket.com/harsman/dyalog-mode";
+          rev = "ce795beb8747";
+          sha256 = "0ghxnzi2iy1g633fshl9wdpg2asrcl0v5rkk61gqd6axm7fjaxcj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dyalog-mode";
+          sha256 = "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq";
+          name = "dyalog-mode";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/dyalog-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dynamic-fonts = callPackage ({ fetchFromGitHub, fetchurl, font-utils, lib, melpaBuild, pcache, persistent-soft }:
+    melpaBuild {
+        pname = "dynamic-fonts";
+        version = "0.6.4";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "dynamic-fonts";
+          rev = "d318498b377d8941c7420f51616c78e3440d00f5";
+          sha256 = "1ppwlill1z4vqd566h9zi6zx5jb7hggmnmqrga84j5n7fwqvgz7f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dynamic-fonts";
+          sha256 = "0a210ca41maa755lv1n7hhpxp0f7lfxrxbi0x34icbkfkmijhl6q";
+          name = "dynamic-fonts";
+        };
+        packageRequires = [ font-utils pcache persistent-soft ];
+        meta = {
+          homepage = "http://melpa.org/#/dynamic-fonts";
+          license = lib.licenses.free;
+        };
+      }) {};
+    dynamic-ruler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dynamic-ruler";
+        version = "0.1.4";
+        src = fetchFromGitHub {
+          owner = "rocher";
+          repo = "dynamic-ruler";
+          rev = "2d69a7aec21d3d9dbc8ae7520e5c513e98d64ebb";
+          sha256 = "05z7gshrn7wp0qkb9ns6rgmcp375yllmkwhdsm4amg0dk3j2slbr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dynamic-ruler";
+          sha256 = "13jc3xbsyc3apkdfy0iafmsfvgqs0zfa5w8jxp7zj4dhb7pxpnmc";
+          name = "dynamic-ruler";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dynamic-ruler";
+          license = lib.licenses.free;
+        };
+      }) {};
+    e2wm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "e2wm";
+        version = "1.3";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-window-manager";
+          rev = "397cb6c110c9337cfc1a25ea7fddad00f168613c";
+          sha256 = "0g0cz5a0vf31w27ljq5sn52mq15ynadl6cfbb97ja5zj1zxsxgjl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm";
+          sha256 = "0dp360jr3fgxqywkp7g88cp02g37kw2hdsc0f70hjak9n3sy03la";
+          name = "e2wm";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/e2wm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    e2wm-R = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "e2wm-R";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "e2wm-R.el";
+          rev = "fe17906bf48324032a1beaec9af32b9b49ea9125";
+          sha256 = "1yf081rac0chvkjha9z9xi1p983gmhjph0hai6ppsz5hzf2vikpp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-R";
+          sha256 = "09v4fz178lch4d6m801ipclfxm2qrap5601aysnzyvc2apvyr3sh";
+          name = "e2wm-R";
+        };
+        packageRequires = [ e2wm ];
+        meta = {
+          homepage = "http://melpa.org/#/e2wm-R";
+          license = lib.licenses.free;
+        };
+      }) {};
+    e2wm-direx = callPackage ({ direx, e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "e2wm-direx";
+        version = "0.0.5";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "e2wm-direx";
+          rev = "f319625b56c44e601af7c17fc6dbb88e5d70ebae";
+          sha256 = "09i7d2rc9zd4s3nqrhd3ggs1ykdpxf0pyhxixxw2xy0q6nbswjia";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-direx";
+          sha256 = "0nv8aciq0swxi9ahwc2pvk9c7i3rmlp7vrzqcan58ml0i3nm17wg";
+          name = "e2wm-direx";
+        };
+        packageRequires = [ direx e2wm ];
+        meta = {
+          homepage = "http://melpa.org/#/e2wm-direx";
+          license = lib.licenses.free;
+        };
+      }) {};
+    e2wm-pkgex4pl = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild, plsense-direx }:
+    melpaBuild {
+        pname = "e2wm-pkgex4pl";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "e2wm-pkgex4pl";
+          rev = "7ea994450727190c4f3cb46cb429ba41b692ecc0";
+          sha256 = "1vrlfzy1wynm7x4m7pl8vim7ykqd6qkcilwz7sjc1lbckz11ig0d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-pkgex4pl";
+          sha256 = "0hgdbqfw3015fr929m36kfiqqzsid6afs3222iqq0apg7gfj7jil";
+          name = "e2wm-pkgex4pl";
+        };
+        packageRequires = [ e2wm plsense-direx ];
+        meta = {
+          homepage = "http://melpa.org/#/e2wm-pkgex4pl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    e2wm-sww = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "e2wm-sww";
+        version = "0.0.2";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "e2wm-sww";
+          rev = "1063f9854bd34db5ac771cd1036cecc89834729d";
+          sha256 = "0mz43mwcgyc1c9p9b7nflnjxdxjm2nxbhl0scj6llzphikicr35g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-sww";
+          sha256 = "0x45j62cjivf9v7jp1b41yya3f9akp92md6cbv0v7bwz98g2vsk8";
+          name = "e2wm-sww";
+        };
+        packageRequires = [ e2wm ];
+        meta = {
+          homepage = "http://melpa.org/#/e2wm-sww";
+          license = lib.licenses.free;
+        };
+      }) {};
+    e2wm-term = callPackage ({ e2wm, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
+    melpaBuild {
+        pname = "e2wm-term";
+        version = "0.0.5";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "e2wm-term";
+          rev = "65b5ac88043d5c4048920a048f3599904ca55981";
+          sha256 = "0qv3kh6q3q7vgfsd8x25x8agi3fp96dkpjnxdidkwk6k8h9n0jzw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-term";
+          sha256 = "0wrq06yap80a96l9l0hs7x7rng7sx6vi1hz778kknb6il4f2f45g";
+          name = "e2wm-term";
+        };
+        packageRequires = [ e2wm log4e yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/e2wm-term";
+          license = lib.licenses.free;
+        };
+      }) {};
+    easy-kill = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "easy-kill";
+        version = "0.9.3";
+        src = fetchFromGitHub {
+          owner = "leoliu";
+          repo = "easy-kill";
+          rev = "e3b2442e2096cefff94ea8656e49af07fee58f47";
+          sha256 = "0r56nqrj6iaz57ys6hqdq5qkyliv7dj6dv274l228r7x0axrwd9m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-kill";
+          sha256 = "10jcv7a4vcnaj3wkabip2xwzcwlmvdlqkl409a9lnzfasxcpf32i";
+          name = "easy-kill";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/easy-kill";
+          license = lib.licenses.free;
+        };
+      }) {};
+    easy-kill-extras = callPackage ({ easy-kill, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "easy-kill-extras";
+        version = "0.9.4";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "easy-kill-extras.el";
+          rev = "242844bc95b9015396405d84c4335338037968c3";
+          sha256 = "18fdlxz9k961k8wafdw0gq0y514bvrfvx6qc1lmm4pk3gdcfbbi0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-kill-extras";
+          sha256 = "0xzlzv57nvrc142saydwfib51fyqcdzjccc1hj6xvgcdbwadlnjy";
+          name = "easy-kill-extras";
+        };
+        packageRequires = [ easy-kill ];
+        meta = {
+          homepage = "http://melpa.org/#/easy-kill-extras";
+          license = lib.licenses.free;
+        };
+      }) {};
+    easy-repeat = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "easy-repeat";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "easy-repeat.el";
+          rev = "060f0e6801c82c40c06961dc0528a00e18947a8c";
+          sha256 = "18bm5ns1qrxq0rrz9sylshr62wkymh1m6b7ch2y74f8rcwdwjgnq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-repeat";
+          sha256 = "1vx57gpw0nbxh976s18va4ali1nqxqffhaxv1c5rhf4pwlk2fa06";
+          name = "easy-repeat";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/easy-repeat";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ebal";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "ebal";
+          rev = "bd8bca3a57d390c22862179db0afca7008831dd7";
+          sha256 = "0nb0p82fx1qp1q9id88wlfqfvfbqqr20541s59snln1pa25s2agm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ebal";
+          sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg";
+          name = "ebal";
+        };
+        packageRequires = [ emacs f ido-completing-read-plus ];
+        meta = {
+          homepage = "http://melpa.org/#/ebal";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }:
+    melpaBuild {
+        pname = "ebib";
+        version = "2.5.2";
+        src = fetchFromGitHub {
+          owner = "joostkremers";
+          repo = "ebib";
+          rev = "e9f92df575d747992e9ada768b18dee475cfee55";
+          sha256 = "159w19hx3gmhv8n2amkm6i999vdrz5132bjwk28qpiq37v1v7dd5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ebib";
+          sha256 = "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid";
+          name = "ebib";
+        };
+        packageRequires = [ dash emacs parsebib ];
+        meta = {
+          homepage = "http://melpa.org/#/ebib";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ecb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ecb";
+        version = "2.24";
+        src = fetchFromGitHub {
+          owner = "alexott";
+          repo = "ecb";
+          rev = "1e9ddf472d7b6006dc92684b82de22e6148f38b4";
+          sha256 = "1s9r1qj7cjsjvvphdpyjff6y598xpbrm9qjv5ncq15w6ac7yxzvc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ecb";
+          sha256 = "097hdskhfh255znrqamcssx4ns1sgkxchlbc7pjqwzpflsi0fx89";
+          name = "ecb";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ecb";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ecukes = callPackage ({ ansi, commander, dash, espuds, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "ecukes";
+        version = "0.6.15";
+        src = fetchFromGitHub {
+          owner = "ecukes";
+          repo = "ecukes";
+          rev = "2bba6266a3fff772cd54a6cd1b1aee2c36872aa5";
+          sha256 = "1r5hlcspznvfm111l1z0r4isd582qj64sa8cqk6hyi3y1hyp1xxs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ecukes";
+          sha256 = "0ava8hrc7r1mzv6xgbrb84qak5xrf6fj8g9qr4i4g0cr7843nrw0";
+          name = "ecukes";
+        };
+        packageRequires = [ ansi commander dash espuds f s ];
+        meta = {
+          homepage = "http://melpa.org/#/ecukes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    edbi = callPackage ({ concurrent, ctable, epc, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "edbi";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-edbi";
+          rev = "39b833d2e51ae5ce66ebdec7c5425ff0d34e02d2";
+          sha256 = "0xy3q68i47a3s81jwr0rdvc1722bp78ng56xm53pri05g1z0db9s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edbi";
+          sha256 = "0qq0j16n8lyvkqqlcsrq1m7r7f0in6b92d74mpx5c6siv6z2vxlr";
+          name = "edbi";
+        };
+        packageRequires = [ concurrent ctable epc ];
+        meta = {
+          homepage = "http://melpa.org/#/edbi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    edit-indirect = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "edit-indirect";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "edit-indirect";
+          rev = "d1ab87fdfbc2a894a7eaac8b289a5af2d7c835b0";
+          sha256 = "10c84aad1lnr7z9f75k5ylgchykr3srcdmn88hlcx2n2c4jfbkds";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-indirect";
+          sha256 = "0q5jjmrvx5kaajllmhaxihsab2kr1vmcsfqrhxdhw3x3nf41s439";
+          name = "edit-indirect";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/edit-indirect";
+          license = lib.licenses.free;
+        };
+      }) {};
+    edit-list = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "edit-list";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "edit-list";
+          rev = "f460d3f9e208a4e606fe6ded307f1b011916ca71";
+          sha256 = "0981hy1n50yizc3k06vbxqrpfml817a67kab1hkgkw5v6ymm1hc9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-list";
+          sha256 = "0mi12jfgx06i0yr8k5nk80xryqszjv0xykdnri505862rb90xakv";
+          name = "edit-list";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/edit-list";
+          license = lib.licenses.free;
+        };
+      }) {};
+    edit-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "edit-server";
+        version = "1.13";
+        src = fetchFromGitHub {
+          owner = "stsquad";
+          repo = "emacs_chrome";
+          rev = "f0db18f0d6e9885e4aef3ace8342fd6f635fadf6";
+          sha256 = "12dp1xj09jrp0kxp9xb6cak9dn6zkyis1wfn4fnhzmxxnrd8c5rn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-server";
+          sha256 = "0ffxcgmnz0f2c1i3vfwm8vlm6jyd7ibf4kq5z8c6n50zkwfdmns0";
+          name = "edit-server";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/edit-server";
+          license = lib.licenses.free;
+        };
+      }) {};
+    editorconfig = callPackage ({ editorconfig-core, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "editorconfig";
+        version = "0.7.0";
+        src = fetchFromGitHub {
+          owner = "editorconfig";
+          repo = "editorconfig-emacs";
+          rev = "765797d42784f15d207b5a4bfddce780eae2fbb3";
+          sha256 = "0002i69r4cpka73b8mvnkvh4lpyrrrnj07aq0zs0v62b3xlci22y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/editorconfig";
+          sha256 = "0na5lfi9bs4k1q73pph3ff0v8k8vzrfpzh47chyzk8nxsmvklw35";
+          name = "editorconfig";
+        };
+        packageRequires = [ editorconfig-core ];
+        meta = {
+          homepage = "http://melpa.org/#/editorconfig";
+          license = lib.licenses.free;
+        };
+      }) {};
+    editorconfig-core = callPackage ({ cl-lib ? null, editorconfig-fnmatch, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "editorconfig-core";
+        version = "0.7.0";
+        src = fetchFromGitHub {
+          owner = "editorconfig";
+          repo = "editorconfig-emacs";
+          rev = "765797d42784f15d207b5a4bfddce780eae2fbb3";
+          sha256 = "0002i69r4cpka73b8mvnkvh4lpyrrrnj07aq0zs0v62b3xlci22y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/editorconfig-core";
+          sha256 = "18d7byqkxn6lyw3nqsvqs5vyj9alh9wjd2mim44a3zcc9r2j061r";
+          name = "editorconfig-core";
+        };
+        packageRequires = [ cl-lib editorconfig-fnmatch ];
+        meta = {
+          homepage = "http://melpa.org/#/editorconfig-core";
+          license = lib.licenses.free;
+        };
+      }) {};
+    editorconfig-fnmatch = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "editorconfig-fnmatch";
+        version = "0.7.0";
+        src = fetchFromGitHub {
+          owner = "editorconfig";
+          repo = "editorconfig-emacs";
+          rev = "765797d42784f15d207b5a4bfddce780eae2fbb3";
+          sha256 = "0002i69r4cpka73b8mvnkvh4lpyrrrnj07aq0zs0v62b3xlci22y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/editorconfig-fnmatch";
+          sha256 = "0ji243vrw527jc3alsgmqi9rdnslxyq48zzx33rbpkqcjssm11iv";
+          name = "editorconfig-fnmatch";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/editorconfig-fnmatch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    edn = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, peg, s }:
+    melpaBuild {
+        pname = "edn";
+        version = "1.1.2";
+        src = fetchFromGitHub {
+          owner = "expez";
+          repo = "edn.el";
+          rev = "bb035dcbeccccdb2c899d2cce8e81486764d0ad7";
+          sha256 = "06v34l9dkykrrdfpnm3zi5wjm0fdvy76pbkfnk92wqkjp8fqimhd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edn";
+          sha256 = "00cy8axhy2p3zalzl8k2083l5a7s3aswb9qfk9wsmf678m8pqwqg";
+          name = "edn";
+        };
+        packageRequires = [ cl-lib dash emacs peg s ];
+        meta = {
+          homepage = "http://melpa.org/#/edn";
+          license = lib.licenses.free;
+        };
+      }) {};
+    edts = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "edts";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "tjarvstrand";
+          repo = "edts";
+          rev = "61855db6f1315ea45f97ed95b47a3f182ec4c6be";
+          sha256 = "1a1apa48n24yisd2zw5k4lfkngx3016x6y11qi80hg75vrnmg7f1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edts";
+          sha256 = "0f0rbd0mqqwn743qmr1g5mmi1sbmlcglclww8jxvbvb61jq8vspr";
+          name = "edts";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/edts";
+          license = lib.licenses.free;
+        };
+      }) {};
+    egg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "egg";
+        version = "1.0.9";
+        src = fetchFromGitHub {
+          owner = "byplayer";
+          repo = "egg";
+          rev = "499894195528203cfcf309228bf7578dd8cd5698";
+          sha256 = "1ryb7smvf66hk307yazkjn9bqzbwzbyyb5db200fq6j2zdjwsmaj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/egg";
+          sha256 = "144g1fvs2cmn3px0a98nvxl5cz70kx30v936k5ppyi8gvbj0md5i";
+          name = "egg";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/egg";
+          license = lib.licenses.free;
+        };
+      }) {};
+    egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "egison-mode";
+        version = "3.5.10";
+        src = fetchFromGitHub {
+          owner = "egisatoshi";
+          repo = "egison3";
+          rev = "6debb5f36074811a1b2f9c9741dc8c1f3bd869de";
+          sha256 = "16m7h477z10bmaymmgpj2id6l98iyrsp5wf69wd56534kh6qcajg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/egison-mode";
+          sha256 = "0x11fhv8kkx34h831k2q70y5qfz7wnfia4ka5mbmps7mpr68zcwi";
+          name = "egison-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/egison-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "eide";
+        version = "2.1.1";
+        src = fetchgit {
+          url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git";
+          rev = "524494fd2b23217c6807b30b43bb95b5724f809e";
+          sha256 = "3f41ade3332a3f1dc5cfb0b33077396feb7b683b2cf2c235b7a5f07f0b2e3271";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eide";
+          sha256 = "16cf32n2l4wy1px7fm6x4vxx7pbqdp7zh2jn3bymg0b40i2321sz";
+          name = "eide";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/eide";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ein = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
+    melpaBuild {
+        pname = "ein";
+        version = "0.7.1";
+        src = fetchFromGitHub {
+          owner = "millejoh";
+          repo = "emacs-ipython-notebook";
+          rev = "2c08c68125ab7323e5068401a3097b90879571f8";
+          sha256 = "1si9zk4iwgkfn5p9x48hy1laz8r5m5vbyahy1andxrfxnb9fi0kj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ein";
+          sha256 = "1nksj1cpf4d9brr3rb80bgp2x05qdq9xmlp8mwbic1s27mw80bpp";
+          name = "ein";
+        };
+        packageRequires = [ request websocket ];
+        meta = {
+          homepage = "http://melpa.org/#/ein";
+          license = lib.licenses.free;
+        };
+      }) {};
+    el-autoyas = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "el-autoyas";
+        version = "0.5";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "el-autoyas.el";
+          rev = "bde0251ecb504f585dfa27c205c8e312655310cc";
+          sha256 = "0dbp2zz993cm7mrd58c4iflbzqwg50wzgn2cpwfivk14w1mznh4n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-autoyas";
+          sha256 = "0hh5j79f3z82nmb3kqry8k8lgc1qswk6ni3g9jg60pasc3wkbh6c";
+          name = "el-autoyas";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/el-autoyas";
+          license = lib.licenses.free;
+        };
+      }) {};
+    el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "el-get";
+        version = "5.1";
+        src = fetchFromGitHub {
+          owner = "dimitri";
+          repo = "el-get";
+          rev = "bfffd553f4c72b818e9ee94f05458eae7a16056b";
+          sha256 = "1awyh9ffd6a4cia239s89asb88ddqlnrv757d76vcb701pq412bz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-get";
+          sha256 = "1438v2sw5n67q404c93y2py226v469nagqwp4w9l6yyy40h4myhz";
+          name = "el-get";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/el-get";
+          license = lib.licenses.free;
+        };
+      }) {};
+    el-init = callPackage ({ anaphora, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "el-init";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "HKey";
+          repo = "el-init";
+          rev = "25fd21d820bca1cf576b8f70c8d5a3bc76792597";
+          sha256 = "1mzla7ijmq1mgzr6bf16mjdycbf8ylsf4zdk4j6fh5kw5n4k6c5n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-init";
+          sha256 = "121n6z8p9kzi7axp4i2kyi621gw20635w4j81i1bryblaqrv5kl5";
+          name = "el-init";
+        };
+        packageRequires = [ anaphora cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/el-init";
+          license = lib.licenses.free;
+        };
+      }) {};
+    el-init-viewer = callPackage ({ anaphora, cl-lib ? null, ctable, dash, el-init, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "el-init-viewer";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "HKey";
+          repo = "el-init-viewer";
+          rev = "dcc595ba51b5aff972292278aa528c7ddb46f1b5";
+          sha256 = "1488wv0f9ihzzf9fl8cki044k61b0kva604hdwpb2qk9gnjr4g1l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-init-viewer";
+          sha256 = "0kkmsml9xf2n8nlrcicfg2l78s3dlhd6ssx0s62v77v4wdpl297m";
+          name = "el-init-viewer";
+        };
+        packageRequires = [ anaphora cl-lib ctable dash el-init emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/el-init-viewer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    el-mock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "el-mock";
+        version = "1.25.1";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "el-mock.el";
+          rev = "3069931de75bb6704ecf565af5390009dc4dae00";
+          sha256 = "13mv1rhgkwiww2wh5w926jz7idppp492wir1vdl245c5x50dh4f7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-mock";
+          sha256 = "07m7w7n202nijnxidy0j0r4nbcvlnbkm9b0n8qb2bwi3d4cfp77l";
+          name = "el-mock";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/el-mock";
+          license = lib.licenses.free;
+        };
+      }) {};
+    el-spice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, thingatpt-plus }:
+    melpaBuild {
+        pname = "el-spice";
+        version = "0.2.2";
+        src = fetchFromGitHub {
+          owner = "vedang";
+          repo = "el-spice";
+          rev = "53921ffe9a84d9395eea90709309d3d5529921ea";
+          sha256 = "0390pfgfgj7hwfmkwikwhip0hmwkgx784l529cqvalc31jchi94i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-spice";
+          sha256 = "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg";
+          name = "el-spice";
+        };
+        packageRequires = [ thingatpt-plus ];
+        meta = {
+          homepage = "http://melpa.org/#/el-spice";
+          license = lib.licenses.free;
+        };
+      }) {};
+    el-x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "el-x";
+        version = "0.3.1";
+        src = fetchFromGitHub {
+          owner = "sigma";
+          repo = "el-x";
+          rev = "e96541c1f32e0a3aca4ad0a0eb382bd898250163";
+          sha256 = "1i6j44ssxm1xdg0mf91nh1lnprwsaxsx8vsrf720nan7mfr283h5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-x";
+          sha256 = "1721d9mljlcbdwb5b9934q7a48y30x6706pp4bjvgys0r64dml5g";
+          name = "el-x";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/el-x";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
+    melpaBuild {
+        pname = "elang";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "vkazanov";
+          repo = "elang";
+          rev = "ae42437603d6dc84d3850bc45496a82b8583703e";
+          sha256 = "0hlj6jn9gmi00sqghxswkxpgk65c4gy2k7010vpkr2257rd4f3gq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elang";
+          sha256 = "0frhn3hm8351qzljicpzars28af1fghgv45717ml79rwb4vi6yiy";
+          name = "elang";
+        };
+        packageRequires = [ names ];
+        meta = {
+          homepage = "http://melpa.org/#/elang";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eldoc-eval = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eldoc-eval";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "thierryvolpiatto";
+          repo = "eldoc-eval";
+          rev = "deca5e39f31282a06531002d289258cd099433c0";
+          sha256 = "1fh9dx669czkwy4msylcg64azz3az27akx55ipnazb5ghmsi7ivk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eldoc-eval";
+          sha256 = "0z4scgi2xgrgd47aqqmyv1ww8alh43s0qny5qmh3f1nnppz3nd7c";
+          name = "eldoc-eval";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/eldoc-eval";
+          license = lib.licenses.free;
+        };
+      }) {};
+    electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
+    melpaBuild {
+        pname = "electric-operator";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "davidshepherd7";
+          repo = "electric-operator";
+          rev = "3d34101e065396389cfbb8fec333c78641a71dc6";
+          sha256 = "1bqdg5sr4hkiqndr4hcdjscfdyj56jb4wr1kqgwy1hy4ccr9mkrr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/electric-operator";
+          sha256 = "043bkpvvk42lmkll5jnz4q8i0m44y4wdxvkz6hiqhqcp1rv03nw2";
+          name = "electric-operator";
+        };
+        packageRequires = [ dash emacs names ];
+        meta = {
+          homepage = "http://melpa.org/#/electric-operator";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elfeed";
+        version = "1.4.0";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "elfeed";
+          rev = "9fd3cf8833e26bf41f52a7e2149734858d2eeb96";
+          sha256 = "1ln0wprk8m2d33z804ld73jwv9x51xkwl9xfsywbh09w3x2zb51j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elfeed";
+          sha256 = "1psga7fcjk2b8xjg10fndp9l0ib72l5ggf43gxp62i4lxixzv8f9";
+          name = "elfeed";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/elfeed";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elfeed-web = callPackage ({ elfeed, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, simple-httpd }:
+    melpaBuild {
+        pname = "elfeed-web";
+        version = "1.4.0";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "elfeed";
+          rev = "9fd3cf8833e26bf41f52a7e2149734858d2eeb96";
+          sha256 = "1ln0wprk8m2d33z804ld73jwv9x51xkwl9xfsywbh09w3x2zb51j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elfeed-web";
+          sha256 = "14ydwvjjc6wbhkj4g4xdh0c3nh4asqsz8ln7my5vjib881vmaq1n";
+          name = "elfeed-web";
+        };
+        packageRequires = [ elfeed emacs simple-httpd ];
+        meta = {
+          homepage = "http://melpa.org/#/elfeed-web";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elisp-slime-nav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elisp-slime-nav";
+        version = "0.8";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "elisp-slime-nav";
+          rev = "551a6045969756d4aaee9e82b44cfbcdd0670cea";
+          sha256 = "1k7kprdknqm18dc0nwl7gachm0rivcpa8ng7p7ximalja3nsg2j1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elisp-slime-nav";
+          sha256 = "009zgp68i4naprpjr8lcp06lh3i5ickn0nh0lgvrqs0niprnzh8c";
+          name = "elisp-slime-nav";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/elisp-slime-nav";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elixir-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
+    melpaBuild {
+        pname = "elixir-mode";
+        version = "2.2.8";
+        src = fetchFromGitHub {
+          owner = "elixir-lang";
+          repo = "emacs-elixir";
+          rev = "bfc95d9d444bf4002d340d37ad30954dd86c0e94";
+          sha256 = "07kgzdla31nc146xya21rn4hyr76h5lyabla8yh4qjsvnknb7cbj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elixir-mode";
+          sha256 = "1dba3jfg210i2rw8qy866396xn2xjgmbcyl006d6fibpr3j4lxaf";
+          name = "elixir-mode";
+        };
+        packageRequires = [ emacs pkg-info ];
+        meta = {
+          homepage = "http://melpa.org/#/elixir-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elixir-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "elixir-yasnippets";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "hisea";
+          repo = "elixir-yasnippets";
+          rev = "6b55c88ce483932f226b6bca0212b589d1d393ea";
+          sha256 = "0dx5h3sfccc2bp1jxnqqki95x5hp1skw8n5n4lnh703yjga5gkrz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elixir-yasnippets";
+          sha256 = "0927znqd9j91wc51hdwcl2rxb66i1h549nyr1h39r13353gbwk3a";
+          name = "elixir-yasnippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/elixir-yasnippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "elm-mode";
+        version = "0.9.1";
+        src = fetchFromGitHub {
+          owner = "jcollard";
+          repo = "elm-mode";
+          rev = "74fc1abaef7d3ead80d1bc032d3cd406b7260ed8";
+          sha256 = "1x92r1y9d7jssjnlcx1qbw1dqdghfmmmx603296401w1pdcrhl6r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elm-mode";
+          sha256 = "1gw9szkyr1spcx7qijddhxlm36h0hmfd53b4yzp1336yx44mlnd1";
+          name = "elm-mode";
+        };
+        packageRequires = [ emacs f let-alist s ];
+        meta = {
+          homepage = "http://melpa.org/#/elm-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elmacro = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "elmacro";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "Silex";
+          repo = "elmacro";
+          rev = "20a0d1e220984ec6079dda9419b3bb44a88edae3";
+          sha256 = "0l2iincskpks9yvj3y9zh1b48xli1q39wybr5n96rys5gv0drc9h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elmacro";
+          sha256 = "0644rgwawivrq1shsjx1x2p53z7jgr6bxqgn2smzql8pp6azy7xz";
+          name = "elmacro";
+        };
+        packageRequires = [ cl-lib dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/elmacro";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elmine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elmine";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "leoc";
+          repo = "elmine";
+          rev = "091f61c70c9e7630a74b7b127488051d143a35e7";
+          sha256 = "080nnw6ddsczbm7gk50x4dkahi77fsybfiki5iyp39fjpa7lfzq3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elmine";
+          sha256 = "1gi94dyz9x50swkvryd4vj36rqgz4s58nrb4h4vwwviiiqmc8fvz";
+          name = "elmine";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/elmine";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elpa-audit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elpa-audit";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "elpa-audit";
+          rev = "a7a1806278c73ea6cb6d235714e7bc8088971df5";
+          sha256 = "1q4krfrc2dy0vr7q148msfpkcwj55mlsrn4n5xjnya4xj0134ib7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elpa-audit";
+          sha256 = "0l8har14zrlh9kdkh9vlmkmzg49vb0r8j1wnznryaidalvk84a52";
+          name = "elpa-audit";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/elpa-audit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elpa-mirror = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elpa-mirror";
+        version = "1.2.1";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "elpa-mirror";
+          rev = "6c32875c2317736e590e067820996010b21acb1d";
+          sha256 = "1hjmvn3kls63alh0ihb5c8gf90lrfvq1hxrlf4162qiaa0s15f8a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elpa-mirror";
+          sha256 = "1jnviav2ybr13cgllg26kfjrwrl25adggnqiiwyjwgbbzxfycah8";
+          name = "elpa-mirror";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/elpa-mirror";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }:
+    melpaBuild {
+        pname = "elpy";
+        version = "1.10.0";
+        src = fetchFromGitHub {
+          owner = "jorgenschaefer";
+          repo = "elpy";
+          rev = "96fa05708629600fd79c4b0fcafe63ec97f5ce07";
+          sha256 = "0kzara7r6gvgf3p06xswxbhq01dbhmwx1pldx3mmv7knvm2mdxq8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elpy";
+          sha256 = "051irp7k0cp1hqp3hzrmapllf2iim7cq0iz38489g4fkh2ybk709";
+          name = "elpy";
+        };
+        packageRequires = [
+          company
+          find-file-in-project
+          highlight-indentation
+          pyvenv
+          yasnippet
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/elpy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elscreen-mew = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elscreen-mew";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "masutaka";
+          repo = "elscreen-mew";
+          rev = "f66a2a5a8dd904791ede5133fdd183522b061bba";
+          sha256 = "091dxsb73bhqmrddwnmvblmfpwa7v7fa0ha18daxc8j0lrhzdhlh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elscreen-mew";
+          sha256 = "06g4wcfjs036nn64ac0zsvr08cfmak2hyj83y7a0r35yxr1853w4";
+          name = "elscreen-mew";
+        };
+        packageRequires = [ elscreen ];
+        meta = {
+          homepage = "http://melpa.org/#/elscreen-mew";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elscreen-persist = callPackage ({ elscreen, fetchFromGitHub, fetchurl, lib, melpaBuild, revive }:
+    melpaBuild {
+        pname = "elscreen-persist";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "robario";
+          repo = "elscreen-persist";
+          rev = "652b4c738f92c518ead69343ebfcf66bc2a0254c";
+          sha256 = "06g7fl2c7cvwsrgi462wf6j13ny56y6zvgkizz9f256xjjq77ymf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elscreen-persist";
+          sha256 = "1rjfvpsx0y5l9b76wa1ilj5lx39jd0m78nb1a4bqn81z0rkfpl4k";
+          name = "elscreen-persist";
+        };
+        packageRequires = [ elscreen revive ];
+        meta = {
+          homepage = "http://melpa.org/#/elscreen-persist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elwm = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elwm";
+        version = "0.0.2";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "elwm";
+          rev = "c33b183f006ad476c3a44dab316f580f8b369930";
+          sha256 = "1k7npf93xbmrsq607x8zlgrpzqvplgia3ixz5w1lr1jlv1m2m8x2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elwm";
+          sha256 = "0rf663ih3lfg4n4pj4dpp133967zha5m1wr46riaxpha7xr59al9";
+          name = "elwm";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/elwm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "elx";
+        version = "0.10.0";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "elx";
+          rev = "8f339d0c266713ca8398b01d51ccfdbe1dbb9aeb";
+          sha256 = "12svv24qclkcdb5sniq0xbbsj34hq835s2v636xkb07dpmy644lg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elx";
+          sha256 = "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x";
+          name = "elx";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/elx";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emacs-eclim = callPackage ({ dash, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, popup, s }:
+    melpaBuild {
+        pname = "emacs-eclim";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "emacs-eclim";
+          repo = "emacs-eclim";
+          rev = "c5c7272ae30e5017ebd08d4e03508abc6b23bf4c";
+          sha256 = "0b9hr3xg53nap6sik9d2cwqi8vfwzv8yqjcin4hab6rg2fkr5mra";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacs-eclim";
+          sha256 = "1l55jhz5mb3bqw90cbf4jhcqgwj962br706qhm2wn5i2a1mg8xlv";
+          name = "emacs-eclim";
+        };
+        packageRequires = [ dash json popup s ];
+        meta = {
+          homepage = "http://melpa.org/#/emacs-eclim";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emacs-setup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emacs-setup";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "echosa";
+          repo = "emacs-setup";
+          rev = "cc36ad5318c6c0e65d1b9ff8dff5ea2437675de2";
+          sha256 = "15l3ab11vcmzqibkd6h5zqw5a83k8dmgcp4n26px29c0gv6bkpy8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacs-setup";
+          sha256 = "1x4rh8vx6fsb2d6dz2g9j6jamin1vmpppwy3yzbl1dnf7w4hx4kh";
+          name = "emacs-setup";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/emacs-setup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emacsagist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emacsagist";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "echosa";
+          repo = "emacsagist";
+          rev = "aba342ba59c254a88017f25e9fb7a8cd6f2fda83";
+          sha256 = "0ciqxyahlzaxq854jm25zbrbmrhcaj5csdhxa0az9crwha8wkmw2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsagist";
+          sha256 = "1cyz7nf0zxa21979jf5kdmkgwiyd17vsmpcmrw1af37ly27l8l64";
+          name = "emacsagist";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/emacsagist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emacsc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emacsc";
+        version = "1.2.20131027";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "emacsc";
+          rev = "69607bdc3a0c070e924a3bcac93180f917992368";
+          sha256 = "1r6cpb7fck5znb7q7zrxcsjn7d3xiqhq8dp1ar1rsd6k4h05by4j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsc";
+          sha256 = "1fbf9al3yds0il18jz6hbpj1fsjlpb1kgp450gb6r09lc46x77mk";
+          name = "emacsc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/emacsc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emacsql = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emacsql";
+        version = "2.0.0";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "emacsql";
+          rev = "03d478870834a683f433e7f0e288476748eec624";
+          sha256 = "0ph0462shk00rhrkpvwgsr4biykimky2d89pvkbg377951jdga7i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsql";
+          sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax";
+          name = "emacsql";
+        };
+        packageRequires = [ cl-lib emacs finalize ];
+        meta = {
+          homepage = "http://melpa.org/#/emacsql";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emacsql-mysql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emacsql-mysql";
+        version = "2.0.0";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "emacsql";
+          rev = "03d478870834a683f433e7f0e288476748eec624";
+          sha256 = "0ph0462shk00rhrkpvwgsr4biykimky2d89pvkbg377951jdga7i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsql-mysql";
+          sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy";
+          name = "emacsql-mysql";
+        };
+        packageRequires = [ cl-lib emacs emacsql ];
+        meta = {
+          homepage = "http://melpa.org/#/emacsql-mysql";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emacsql-psql = callPackage ({ cl-lib ? null, emacs, emacsql, fetchFromGitHub, fetchurl, lib, melpaBuild, pg }:
+    melpaBuild {
+        pname = "emacsql-psql";
+        version = "2.0.0";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "emacsql";
+          rev = "03d478870834a683f433e7f0e288476748eec624";
+          sha256 = "0ph0462shk00rhrkpvwgsr4biykimky2d89pvkbg377951jdga7i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsql-psql";
+          sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3";
+          name = "emacsql-psql";
+        };
+        packageRequires = [ cl-lib emacs emacsql pg ];
+        meta = {
+          homepage = "http://melpa.org/#/emacsql-psql";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emacsql-sqlite = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emacsql-sqlite";
+        version = "2.0.0";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "emacsql";
+          rev = "03d478870834a683f433e7f0e288476748eec624";
+          sha256 = "0ph0462shk00rhrkpvwgsr4biykimky2d89pvkbg377951jdga7i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsql-sqlite";
+          sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i";
+          name = "emacsql-sqlite";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/emacsql-sqlite";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emamux = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emamux";
+        version = "0.13";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-emamux";
+          rev = "53177ca59ed2824cc0837677af5a13a580691a71";
+          sha256 = "1a9925n0jcgxcgiz2kmh9zbb1rg9039rlrbr9fr80by9znfwmy67";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emamux";
+          sha256 = "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz";
+          name = "emamux";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/emamux";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emmet-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emmet-mode";
+        version = "1.0.8";
+        src = fetchFromGitHub {
+          owner = "smihica";
+          repo = "emmet";
+          rev = "bf76d717c60f33d223cdac35513105e9f9244885";
+          sha256 = "1dsa85bk33j90h1ypaz1ylqh9yp2xvlga237h3kwa5y3sb0d5ydi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emmet-mode";
+          sha256 = "0w5nnhha70mndpk2a58raaxqanv868z05mfy1a8prgapm56mm819";
+          name = "emmet-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/emmet-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emms-mode-line-cycle = callPackage ({ emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emms-mode-line-cycle";
+        version = "0.2.4";
+        src = fetchFromGitHub {
+          owner = "momomo5717";
+          repo = "emms-mode-line-cycle";
+          rev = "0488de1f9b4d0be6aa7dfe2fe0231cfd9b4d4295";
+          sha256 = "1pz2xvv5hzfg4a8s6xnbr14mpwnr94cwsa1bpk83i7x15hmxj938";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-mode-line-cycle";
+          sha256 = "1jdmfh1i9v84iy7bj2dbc3s2wfzkrby3pabd99gnqzd9gn1cn8ca";
+          name = "emms-mode-line-cycle";
+        };
+        packageRequires = [ emacs emms ];
+        meta = {
+          homepage = "http://melpa.org/#/emms-mode-line-cycle";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emms-player-mpv = callPackage ({ emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emms-player-mpv";
+        version = "0.0.7";
+        src = fetchFromGitHub {
+          owner = "dochang";
+          repo = "emms-player-mpv";
+          rev = "a1be1d266530ede3780dd69a7243d898f1016127";
+          sha256 = "1yy4dmjp53l2df5qix31g4vizhv80wm88vjqq6qqa9p822732n0m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-player-mpv";
+          sha256 = "175rmqx3bgys4chw8ylyf9rk07sg0llwbs9ivrv2d3ayhcz1lg9y";
+          name = "emms-player-mpv";
+        };
+        packageRequires = [ emms ];
+        meta = {
+          homepage = "http://melpa.org/#/emms-player-mpv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emms-player-simple-mpv = callPackage ({ cl-lib ? null, emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emms-player-simple-mpv";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "momomo5717";
+          repo = "emms-player-simple-mpv";
+          rev = "ae4c0032d4d2d0b069ee147b19f962e6a8a73c79";
+          sha256 = "15bb8fp2lwr5brfrsjwa47yvja5g2wyaac5a4sh5rn734s64x2sq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-player-simple-mpv";
+          sha256 = "15aljprjd74ha7wpzsmv3d873i6fy3x1jwhzm03hvw0sw18m25i1";
+          name = "emms-player-simple-mpv";
+        };
+        packageRequires = [ cl-lib emacs emms ];
+        meta = {
+          homepage = "http://melpa.org/#/emms-player-simple-mpv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emoji-cheat-sheet-plus = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emoji-cheat-sheet-plus";
+        version = "1.2.1";
+        src = fetchFromGitHub {
+          owner = "syl20bnr";
+          repo = "emacs-emoji-cheat-sheet-plus";
+          rev = "96a003127d646a2683d81ca906a17eace0a6413e";
+          sha256 = "1rk7am0xvpnv98yi7a62wlyh576md4n2ddj7nm201bjd4wdl2yxk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emoji-cheat-sheet-plus";
+          sha256 = "1ciwlbw0ihm0p5gnnl3safcj7dxwiy53bkj8cmw3i334al0gjnnv";
+          name = "emoji-cheat-sheet-plus";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/emoji-cheat-sheet-plus";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emoji-fontset = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emoji-fontset";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "emoji-fontset.el";
+          rev = "3b8c2204284b95934383836b5b36efeefb65663b";
+          sha256 = "0qi7p1grann3mhaq8kc0yc27cp9fm983g2gaqddljchn7lmgagrr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emoji-fontset";
+          sha256 = "19affsvlm1rzrzdh1k6xsv79icdkzx4izxivrd2ia6y2wcg9wc5d";
+          name = "emoji-fontset";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/emoji-fontset";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emojify = callPackage ({ emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, seq }:
+    melpaBuild {
+        pname = "emojify";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "iqbalansari";
+          repo = "emacs-emojify";
+          rev = "fec788f09ab1c131b89f296ebd3e73df97e96cfe";
+          sha256 = "0nrf6p4h66i17nz850kpdrnk5h5ra4l3icjjrq34sxvmsssp6zhp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emojify";
+          sha256 = "15v2h5jfksfc208qphiczplg56yka07qv4w4482c10yzwq76zp17";
+          name = "emojify";
+        };
+        packageRequires = [ emacs ht seq ];
+        meta = {
+          homepage = "http://melpa.org/#/emojify";
+          license = lib.licenses.free;
+        };
+      }) {};
+    emr = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, paredit, popup, projectile, redshank, s }:
+    melpaBuild {
+        pname = "emr";
+        version = "0.3.6";
+        src = fetchFromGitHub {
+          owner = "chrisbarrett";
+          repo = "emacs-refactor";
+          rev = "fd20fc1887e2ebcf752f0170b1f3bf697043fd4b";
+          sha256 = "0pl7i2a0mf2s33qpsc14dcvqbl6jm5xrvcnrhfr7visvnih29cy4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emr";
+          sha256 = "05vpfxg6lviclnms2zyrza8dc87m60mimlwd11ihvsbngi9gcw8x";
+          name = "emr";
+        };
+        packageRequires = [
+          cl-lib
+          dash
+          emacs
+          list-utils
+          paredit
+          popup
+          projectile
+          redshank
+          s
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/emr";
+          license = lib.licenses.free;
+        };
+      }) {};
+    engine-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "engine-mode";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "hrs";
+          repo = "engine-mode";
+          rev = "9e8b10b029f63bc0399f8975a28247eaa78dfcbc";
+          sha256 = "1dsa3r39ip20ddbw0m9vq8z3r4ahrxvb37adyqi4mbdgyr6fq6sw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/engine-mode";
+          sha256 = "1gg7i93163m7k7lr3pnal1svymnhzwrfpfcdc0798d7ybv26gg8c";
+          name = "engine-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/engine-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    enlive = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "enlive";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "zweifisch";
+          repo = "enlive";
+          rev = "60facaf8bc48b660d209551c0ce4d17e5c907ab8";
+          sha256 = "08j6b79vy8ry4ad1abk3hvxjbb4ylrhkvrbrnq1gcikl4h1p2v63";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/enlive";
+          sha256 = "1dyayk37zik12qfh8zbjmhsch64yqsx3acrlm7hcnavx465hmhnz";
+          name = "enlive";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/enlive";
+          license = lib.licenses.free;
+        };
+      }) {};
+    enotify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "enotify";
+        version = "0.1.3";
+        src = fetchFromGitHub {
+          owner = "laynor";
+          repo = "enotify";
+          rev = "75c84b53703e5d52cb18acc9251b87ffa400f388";
+          sha256 = "1in4wbwkxn8qfcsfjbczzk73z74w4ixlml61wk666dw0kpscgbs5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/enotify";
+          sha256 = "0mii6m6zw9y8njgzi79rcf1n251iw7qz3yqjjij3c19rk3zpm5qi";
+          name = "enotify";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/enotify";
+          license = lib.licenses.free;
+        };
+      }) {};
+    epc = callPackage ({ concurrent, ctable, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "epc";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-epc";
+          rev = "152e6e10a79b56ebc7568054589cf6c3c44595c7";
+          sha256 = "05r2m7zghbdrgscg0x78jnhk1g6fq8iylar4cx699zm6pzvlq98z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/epc";
+          sha256 = "1l9rcx07pa4b9z5654gyw6b64c95lcigzg15amphwr56v2g3rbzx";
+          name = "epc";
+        };
+        packageRequires = [ concurrent ctable ];
+        meta = {
+          homepage = "http://melpa.org/#/epc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    epl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "epl";
+        version = "0.8";
+        src = fetchFromGitHub {
+          owner = "cask";
+          repo = "epl";
+          rev = "a76ec344a7fee3ca7e7dfb98b86ebc3b8c1a3837";
+          sha256 = "0sjxd5y5hxhrbgfkpwx6m724r3841b53hgc61a0g5zwispw5pmrr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/epl";
+          sha256 = "0zr3r2hn9jaxscrl83hyixznb8l5dzfr6fsac76aa8x12xgsc5hn";
+          name = "epl";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/epl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    erc-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "erc-crypt";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "atomontage";
+          repo = "erc-crypt";
+          rev = "1573189240d8b58e65385414d9a9514238c77805";
+          sha256 = "1xw56sir6gkr0p9g4s6p4qc0rajnl6ifbzrky07j28y9vsa59nsz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-crypt";
+          sha256 = "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3";
+          name = "erc-crypt";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/erc-crypt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    erc-hl-nicks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "erc-hl-nicks";
+        version = "1.3.0";
+        src = fetchFromGitHub {
+          owner = "leathekd";
+          repo = "erc-hl-nicks";
+          rev = "f7e9c378072ecc689f2a0ef66d73db8bbcc07d87";
+          sha256 = "0bc71s1cx4z6a9cpfygmzv1xzzx9s74366kzqnlg22sxxpb9ajhq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-hl-nicks";
+          sha256 = "1lhw77n2nrjnb5yhnpm6yhbcp022xxjcmdgqf21z9rd0igss9mja";
+          name = "erc-hl-nicks";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/erc-hl-nicks";
+          license = lib.licenses.free;
+        };
+      }) {};
+    erc-youtube = callPackage ({ erc ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "erc-youtube";
+        version = "0alpha";
+        src = fetchFromGitHub {
+          owner = "kidd";
+          repo = "erc-youtube.el";
+          rev = "3629583031f3a59797a01e29abe9cc061e337294";
+          sha256 = "0p1j08rrdsqmkb8zz8h8ba24hr59nx3xh2m044ry468hfd2bp6vd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-youtube";
+          sha256 = "12ylxkskkgfv5x7vlkib963ichb3rlmdzkf4zh8a39cgl8wsmacx";
+          name = "erc-youtube";
+        };
+        packageRequires = [ erc ];
+        meta = {
+          homepage = "http://melpa.org/#/erc-youtube";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ercn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ercn";
+        version = "1.1.1";
+        src = fetchFromGitHub {
+          owner = "leathekd";
+          repo = "ercn";
+          rev = "73b00dadf83b97dd9edd8381a4b27f583c08b7f6";
+          sha256 = "19jninbf0dhdw3kn4d38bxmklg0v7sh3m9dwj6z69w99r5pcw480";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ercn";
+          sha256 = "0yvis02bypw6v1zv7i326y8s6j0id558n0bdri52hr5pw85imnlp";
+          name = "ercn";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ercn";
+          license = lib.licenses.free;
+        };
+      }) {};
+    erefactor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "erefactor";
+        version = "0.7.0";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-erefactor";
+          rev = "fde3fd42c815c76e8015f69518a92f6bfcfde990";
+          sha256 = "17i567nfm0rykimh6bpcc5f2l7wsf8zcdy2jzd7sgrl54dvb0g9i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erefactor";
+          sha256 = "0ma9sbrq4n8y5w7vvbhhgmw25aiykbq5yhxzm0knj32bgpviprw7";
+          name = "erefactor";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/erefactor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ergoemacs-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
+    melpaBuild {
+        pname = "ergoemacs-mode";
+        version = "5.14.7.3.1";
+        src = fetchFromGitHub {
+          owner = "ergoemacs";
+          repo = "ergoemacs-mode";
+          rev = "295ce7a4a5341d9e144a06e91befeebfac1239d9";
+          sha256 = "19m6chwc2awbsk5z03q1yhq84m481pff2609a8bxymcvm6yaamvf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ergoemacs-mode";
+          sha256 = "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62";
+          name = "ergoemacs-mode";
+        };
+        packageRequires = [ emacs undo-tree ];
+        meta = {
+          homepage = "http://melpa.org/#/ergoemacs-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "erlang";
+        version = "18.2.2";
+        src = fetchFromGitHub {
+          owner = "erlang";
+          repo = "otp";
+          rev = "7cf9a621c5280a3e97967c4c63ab6ca1adde69c3";
+          sha256 = "022yvfh6h6kbxl04jk3r4kzryc7k8hjpizc1ixrsmvh4gpnv3abi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erlang";
+          sha256 = "1gmrdkfanivb9l5lmkl0853snlhl62w34537r82w11z2fbk9lxhc";
+          name = "erlang";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/erlang";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ert-async = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ert-async";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "ert-async.el";
+          rev = "f64a7ed5b0d2900c9a3d8cc33294bf8a79bc8526";
+          sha256 = "0hn9i405nfhjd1h9vnwj43nxbbz00khrwkjq0acfyxjaz1shfac9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ert-async";
+          sha256 = "004798ckri5j72j0xvzkyciss1iz4lw9gya2749hkjxlamg14cn5";
+          name = "ert-async";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ert-async";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ert-junit = callPackage ({ ert ? null, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ert-junit";
+        version = "0.1.1";
+        src = fetchgit {
+          url = "https://bitbucket.org/olanilsson/ert-junit";
+          rev = "341c755e7b60f8d2081303951377968b1d1a6c23";
+          sha256 = "63a8fb532260f56569ce20f911788054624a7a29f149ed6036d9f997ae0457c3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ert-junit";
+          sha256 = "0bv22mhh1ahbjwi6s1csxkh11dmy0srabkddjd33l4havykxlg6g";
+          name = "ert-junit";
+        };
+        packageRequires = [ ert ];
+        meta = {
+          homepage = "http://melpa.org/#/ert-junit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ert-runner = callPackage ({ ansi, commander, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up }:
+    melpaBuild {
+        pname = "ert-runner";
+        version = "0.7.0";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "ert-runner.el";
+          rev = "00056c37817f15b1870ccedd13cedf102e3194dd";
+          sha256 = "0rdgdslspzb4s0n4a68hnwfm8vm8baasa8nzrdinf0nryn7rrhbf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ert-runner";
+          sha256 = "0fnb8rmjr5lvc3dq0fnyxhws8ync1lj5xp8ycs63z4ax6gmdqr48";
+          name = "ert-runner";
+        };
+        packageRequires = [ ansi commander dash f s shut-up ];
+        meta = {
+          homepage = "http://melpa.org/#/ert-runner";
+          license = lib.licenses.free;
+        };
+      }) {};
+    es-lib = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "es-lib";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "sabof";
+          repo = "es-lib";
+          rev = "753b27363e39c10edc9e4e452bdbbbe4d190df4a";
+          sha256 = "0jq4yp80wiphlpsc0429rg8n50g8l4lf78q0l3nywz2p93smjy9b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/es-lib";
+          sha256 = "0mwvgf5385qsp91zsdw75ipif1h90xy277xdmrpwixsxd7abbn0n";
+          name = "es-lib";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/es-lib";
+          license = lib.licenses.free;
+        };
+      }) {};
+    es-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "es-mode";
+        version = "4.0.0";
+        src = fetchFromGitHub {
+          owner = "dakrone";
+          repo = "es-mode";
+          rev = "bee766109b8da1bba925d6998ef288b8a55f3c8f";
+          sha256 = "105ydizdlak951kfr5mjmk7vkqfkj6r1z0gs5ldz1g19wwc7rhjk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/es-mode";
+          sha256 = "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp";
+          name = "es-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/es-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    es-windows = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "es-windows";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "sabof";
+          repo = "es-windows";
+          rev = "7ebe6c6e0831373847d7adbedeaa2e506b54b2af";
+          sha256 = "0cjchwrhk7bw87bg10zgcwkga50rvs0jn5v2jf6bbsxbcqx2nfc9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/es-windows";
+          sha256 = "112ngkan0hv3y7m71479f46x5gwdmf0vhbqrzs5kcjwlacqlrahx";
+          name = "es-windows";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/es-windows";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eshell-autojump = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eshell-autojump";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "coldnew";
+          repo = "eshell-autojump";
+          rev = "c0866d7f2789831665ebb01b812bae89d085bff0";
+          sha256 = "0nkmwwx224r50y2xnrz3v26l3ngqshvy5hs861gy4zagwllqfmvc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eshell-autojump";
+          sha256 = "09l2680hknmdbwr4cncv1v4b0adik0c3sm5i9m3qbwyyxm8m41i5";
+          name = "eshell-autojump";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/eshell-autojump";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eshell-z = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eshell-z";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "eshell-z";
+          rev = "cc9a4b505953a9b56222896a6f973145aeb154b9";
+          sha256 = "179xqh0rs8w3d03gygg9sy4qp5xqgfgl4c0ycrknip9zrnbmph4i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eshell-z";
+          sha256 = "14ixazj0nscyqsdv7brqnfr0q8llir1pwb91yhl9jdqypmadpm6d";
+          name = "eshell-z";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/eshell-z";
+          license = lib.licenses.free;
+        };
+      }) {};
+    espuds = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "espuds";
+        version = "0.3.3";
+        src = fetchFromGitHub {
+          owner = "ecukes";
+          repo = "espuds";
+          rev = "1405972873339e056517217136de4ad3202d744a";
+          sha256 = "16r4j27j9yfdiy841w9q5ykkc6n3wrm7hvfacagb32mydk821ijg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/espuds";
+          sha256 = "16yzw9l64ahf5v92jzb7vyb4zqxxplq6qh0y9rkfmvm59s4nhk6c";
+          name = "espuds";
+        };
+        packageRequires = [ dash f s ];
+        meta = {
+          homepage = "http://melpa.org/#/espuds";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ess";
+        version = "15.9";
+        src = fetchFromGitHub {
+          owner = "emacs-ess";
+          repo = "ESS";
+          rev = "82d13c36f43efb4ef32fbb515ca58f63b2f0c06e";
+          sha256 = "0lvr14xlxsdad4ihywkpbwwj9lyal0w4p616ska5rk7gg5i8v74p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess";
+          sha256 = "02kz4fjxr0vrj5mg13cq758nzykizq4dmsijraxv46snvh337v5i";
+          name = "ess";
+        };
+        packageRequires = [ julia-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/ess";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ess-R-data-view = callPackage ({ ctable, ess, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "ess-R-data-view";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "ess-R-data-view.el";
+          rev = "d6e98d3ae1e2a2ea39a56eebcdb73e99d29562e9";
+          sha256 = "1ya2ay52gkrd31pmw45ban8kkxgnzhhwkzkypwdhjfccq3ys835x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess-R-data-view";
+          sha256 = "0r2fzwayf3yb7fqk6f31x4xfqiiczwik8qw4rrvkqx2h3s1kz7i0";
+          name = "ess-R-data-view";
+        };
+        packageRequires = [ ctable ess popup ];
+        meta = {
+          homepage = "http://melpa.org/#/ess-R-data-view";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ess-R-object-popup = callPackage ({ ess, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "ess-R-object-popup";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "ess-R-object-popup.el";
+          rev = "7e1f601bfba72de0fda44d9c82f96028ecbb9948";
+          sha256 = "0q8pbaa6wahli6fh0kng5zmnypsxi1fr2bzs2mfk3h8vf4nikpv0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess-R-object-popup";
+          sha256 = "1dxwgahfki6d6ywh85ifk3kq6f2a1114kkd8xcv4lcpzqykp93zj";
+          name = "ess-R-object-popup";
+        };
+        packageRequires = [ ess popup ];
+        meta = {
+          homepage = "http://melpa.org/#/ess-R-object-popup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ess-smart-underscore = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ess-smart-underscore";
+        version = "0.79";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "ess-smart-underscore.el";
+          rev = "ef18a160aeb3b1a7ae5fe93759f8e92147da8746";
+          sha256 = "1avb6dng4xgw3bp7bw0j60wl6s4y26alfys9vwwj29rlzvjrlh74";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess-smart-underscore";
+          sha256 = "01pki1xa8zpgvldcbjwg6vmslj7ddf44hsx976xipc95vrdk15r2";
+          name = "ess-smart-underscore";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ess-smart-underscore";
+          license = lib.licenses.free;
+        };
+      }) {};
+    esup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "esup";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "jschaf";
+          repo = "esup";
+          rev = "f9514db82c06680c7f354a2e50c2ca66e8aa0171";
+          sha256 = "1pzbd2ka6h5ipiivfwfgq1hq80ww59xvyldmx406mdd5vn7yqk5z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/esup";
+          sha256 = "0cv3zc2zzm38ki3kxq58g9sp4gsk3dffa398wky6z83a3zc02zs0";
+          name = "esup";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/esup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    esxml = callPackage ({ fetchFromGitHub, fetchurl, kv, lib, melpaBuild }:
+    melpaBuild {
+        pname = "esxml";
+        version = "0.3.1";
+        src = fetchFromGitHub {
+          owner = "tali713";
+          repo = "esxml";
+          rev = "cd096242fadbf878d9428786306e54ed60522b43";
+          sha256 = "0k4vqlbk3h2snfiriraxhnjpdxgs49vcaazl191p9s2f799msd8p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/esxml";
+          sha256 = "0nn074abkxz7p4w59l1za586p5ya392xhl3sx92yys8a3194n6hz";
+          name = "esxml";
+        };
+        packageRequires = [ kv ];
+        meta = {
+          homepage = "http://melpa.org/#/esxml";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eval-in-repl = callPackage ({ ace-window, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
+    melpaBuild {
+        pname = "eval-in-repl";
+        version = "0.9.0";
+        src = fetchFromGitHub {
+          owner = "kaz-yos";
+          repo = "eval-in-repl";
+          rev = "ce5c304993d316750a4ff998ed199121d55dca8b";
+          sha256 = "1a33yy455yx2188vxnhylgzg4zc0hhrw52dmpc4svxs7h1229pwg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eval-in-repl";
+          sha256 = "10h5vy9wdiqf9dgk1d1bsvp93y8sfcxghzg8zbhhn7m5cqg2wh63";
+          name = "eval-in-repl";
+        };
+        packageRequires = [ ace-window dash paredit ];
+        meta = {
+          homepage = "http://melpa.org/#/eval-in-repl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eval-sexp-fu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eval-sexp-fu";
+        version = "0.4.0";
+        src = fetchFromGitHub {
+          owner = "hchbaw";
+          repo = "eval-sexp-fu.el";
+          rev = "b28d9c4d57511072aa17b2464693e38b769482e0";
+          sha256 = "0lwpl9akdxml9f51pgsv0g7k7mr8dvqm94l01i7vq8jl6vd6v6i5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eval-sexp-fu";
+          sha256 = "17cazf81z4cszflnfp66zyq2cclw5sp9539pxskdf267cf7r0ycs";
+          name = "eval-sexp-fu";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/eval-sexp-fu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil = callPackage ({ fetchhg, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
+    melpaBuild {
+        pname = "evil";
+        version = "1.2.10";
+        src = fetchhg {
+          url = "https://bitbucket.com/lyro/evil";
+          rev = "e2c001ecfded";
+          sha256 = "1by2b0qa5hk2jvkxg8j4b0wpnw3mbg0vdggp4nh33m61290jsn5k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil";
+          sha256 = "09qrhy7l229w0qk3ba1i2xg4vqz8525v8scrbm031lqp30jp54hc";
+          name = "evil";
+        };
+        packageRequires = [ goto-chg undo-tree ];
+        meta = {
+          homepage = "http://melpa.org/#/evil";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-anzu = callPackage ({ anzu, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-anzu";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-evil-anzu";
+          rev = "64cc08a3546373f28cd7bfd76a3e93bd78efa251";
+          sha256 = "0lw7fg4gqwj30r0l6k2ni36sxqkf65zf0d0z3rxnpwbxlf8dlkrr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-anzu";
+          sha256 = "19cmc61l370mm4h2m6jw5pdcsvj4wcv9zpa8z7k1fjg57mwmmn70";
+          name = "evil-anzu";
+        };
+        packageRequires = [ anzu evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-anzu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-args = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-args";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "wcsmith";
+          repo = "evil-args";
+          rev = "2a88b4d19953a11227cc1e91973b92149116f44c";
+          sha256 = "1nh7wa4ynr7ln42x32znzqsmh7ijzy5ymd7rszf49l8677alvazq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-args";
+          sha256 = "1bwdvf1i3jc77bw2as1wr1djm8z3a7wms60694xkyqh0m909hs2w";
+          name = "evil-args";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-args";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-commentary";
+        version = "1.2.1";
+        src = fetchFromGitHub {
+          owner = "linktohack";
+          repo = "evil-commentary";
+          rev = "122880a6721fcf16479f406c78c6e490a25efab0";
+          sha256 = "1qiym8f56a18j5swrxx5is48nz7z76531k8cw2c7czr6611l8l5a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-commentary";
+          sha256 = "151iiimmkpn58pl9zn40qssfahbrqy83axyl9dcd6kx2ywv5gcxz";
+          name = "evil-commentary";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-commentary";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-escape = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-escape";
+        version = "3.12";
+        src = fetchFromGitHub {
+          owner = "syl20bnr";
+          repo = "evil-escape";
+          rev = "befb07d03c0c06ff5c40eb9cdd436c97fc49f394";
+          sha256 = "0cj17gk7cxia2p9xzqnlnmqqbw2afd3x61gfw9fpf65j9wik5hbz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-escape";
+          sha256 = "0rlwnnshcvsb5kn7db5qy39s89qmqlllvg2z8cnxyri8bsssks4k";
+          name = "evil-escape";
+        };
+        packageRequires = [ cl-lib emacs evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-escape";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-iedit-state = callPackage ({ evil, fetchFromGitHub, fetchurl, iedit, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-iedit-state";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "syl20bnr";
+          repo = "evil-iedit-state";
+          rev = "0bf8d5d1777f1e8a3c46b6a1c7dceb082fcc6779";
+          sha256 = "0r2367lbzcdhglvjjcamrzn5fmqy0jalcws8r0yc2al1vbsrn0fr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-iedit-state";
+          sha256 = "1dihyh7vqcp7kvfic613k7v33czr93hz04d635awrsyzgy8savhl";
+          name = "evil-iedit-state";
+        };
+        packageRequires = [ evil iedit ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-iedit-state";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-jumper = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-jumper";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "bling";
+          repo = "evil-jumper";
+          rev = "16ff9e7b90519a139acc88bb80d4629c6e3b592c";
+          sha256 = "1yrd9zvp23xwmxvw9hrhfwhwfczh4lxxk65mcvy69q6wwd03z5vn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-jumper";
+          sha256 = "0zwsk7slzvcgvgh8fjrwangylishrwc1w0glxcr71sybxph2g46x";
+          name = "evil-jumper";
+        };
+        packageRequires = [ cl-lib evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-jumper";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-leader = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-leader";
+        version = "0.4.3";
+        src = fetchFromGitHub {
+          owner = "cofi";
+          repo = "evil-leader";
+          rev = "753b01eb4958370ae2226b3780ff31fe157c2852";
+          sha256 = "1k2zinchs0jjllp8zkpggckyy63dkyi5yig3p46vh4w45jdzysk5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-leader";
+          sha256 = "154s2nb170hzksmc87wnzlwg3ic3w3ravgsfvwkyfi2q285vmra6";
+          name = "evil-leader";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-leader";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-lisp-state = callPackage ({ evil, evil-leader, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
+    melpaBuild {
+        pname = "evil-lisp-state";
+        version = "7.1";
+        src = fetchFromGitHub {
+          owner = "syl20bnr";
+          repo = "evil-lisp-state";
+          rev = "e5792ec68a5615bd07bf2c6e9eb3f49d1bc7810d";
+          sha256 = "12l3gnhirq8jz0dqyj9m02l1fg5rh78fdyskslprxp5vfa4ngzkh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-lisp-state";
+          sha256 = "117irac05fs73n7sgja3zd7yh4nz9h0gw5b1b57lfkav6y3ndgcy";
+          name = "evil-lisp-state";
+        };
+        packageRequires = [ evil evil-leader smartparens ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-lisp-state";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-mark-replace = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-mark-replace";
+        version = "0.0.4";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "evil-mark-replace";
+          rev = "56cf191724a3e82239ca47a17b071c20aedb0617";
+          sha256 = "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-mark-replace";
+          sha256 = "03cq43vlv1b53w4kw7mjvk026i8rzhhryfb27ddn6ipgc6xh68a0";
+          name = "evil-mark-replace";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-mark-replace";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-matchit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-matchit";
+        version = "2.1.2";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "evil-matchit";
+          rev = "8b80b3df9472217d55962981025539f2da603296";
+          sha256 = "0kf4m1ghpxfalqx2zwm1d8xav4d6l6bpk79g5cvssk5jz5913fbi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-matchit";
+          sha256 = "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq";
+          name = "evil-matchit";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/evil-matchit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-nerd-commenter";
+        version = "2.3";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "evil-nerd-commenter";
+          rev = "981c80bb53384f93987d03c1b307767f2a68791a";
+          sha256 = "16wn74690572n3xpxvnvka524fzswxxni3dy98bwpvsqj6yx2ds5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-nerd-commenter";
+          sha256 = "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d";
+          name = "evil-nerd-commenter";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/evil-nerd-commenter";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-numbers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-numbers";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "cofi";
+          repo = "evil-numbers";
+          rev = "8834eb2e8bd93561a706363946701d0d90546a9f";
+          sha256 = "13jg2xbh4p02x1nj77b6csb93hh56c1nv8kslcq2hjj3caipk4m8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-numbers";
+          sha256 = "1lpmkklwjdf7ayhv99g9zh3l9hzrwm0hr0ijvbc7yz3n398zn1b2";
+          name = "evil-numbers";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/evil-numbers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-org = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "evil-org";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "edwtjo";
+          repo = "evil-org-mode";
+          rev = "2d7c58dbeca0d4ac7b4eab5f47b77946951f27e9";
+          sha256 = "09l0ph9rc941kr718zq0dw27fq6l7rb0h2003ihw7q0a5yr8fpk7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-org";
+          sha256 = "18w07fbafry3wb87f55kd8y0yra3s18a52f3m5kkdlcz5zwagi1c";
+          name = "evil-org";
+        };
+        packageRequires = [ evil org ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-org";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-quickscope = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-quickscope";
+        version = "0.1.3";
+        src = fetchFromGitHub {
+          owner = "blorbx";
+          repo = "evil-quickscope";
+          rev = "d2f512fa4bd0b0603529a441e474ca551f621650";
+          sha256 = "0yx5ry102hzhqx1aql58fkd986xgj250bbcxabpnvy27gim2b977";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-quickscope";
+          sha256 = "0xym1mh4p68i00l1lshywf5fdg1vw3szxp3fk9fwfcg04z6vd489";
+          name = "evil-quickscope";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-quickscope";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-rsi = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-rsi";
+        version = "1.1.1";
+        src = fetchFromGitHub {
+          owner = "linktohack";
+          repo = "evil-rsi";
+          rev = "4e0cb07d0e1c2a5e463ea1ea146f019c47a29e61";
+          sha256 = "1ygrpffa847144i74z2yy5r5vcvd334gad5mg18ffydacddcyqmq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-rsi";
+          sha256 = "0mc39n72420n36kwyf9zpw1pgyih0aigfnmkbywb0yxgj7myc345";
+          name = "evil-rsi";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-rsi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-search-highlight-persist = callPackage ({ fetchFromGitHub, fetchurl, highlight, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-search-highlight-persist";
+        version = "1.8";
+        src = fetchFromGitHub {
+          owner = "juanjux";
+          repo = "evil-search-highlight-persist";
+          rev = "0e2b3d4e3dec5f38ae95f62519eb2736f73c0b85";
+          sha256 = "1jfi2k9dm0cc9bx8klppm965ydhdw17a2n664199vhxrap6g27yk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-search-highlight-persist";
+          sha256 = "0iia136js364iygi1mydyzwvizhic6w5z9pbwmhva4654pq8dzqy";
+          name = "evil-search-highlight-persist";
+        };
+        packageRequires = [ highlight ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-search-highlight-persist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-smartparens = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
+    melpaBuild {
+        pname = "evil-smartparens";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "expez";
+          repo = "evil-smartparens";
+          rev = "12521212b8e4a02cbec733882bb89c6fac37301f";
+          sha256 = "0j2m3rsszivyjhv8bjid5fdqaf1vwp8rf55b27y4vc2489wrw415";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-smartparens";
+          sha256 = "1viwrd6gfqmwhlil80pk68dikn3cjf9ddsy0z781z3qfx0j35qza";
+          name = "evil-smartparens";
+        };
+        packageRequires = [ cl-lib emacs evil smartparens ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-smartparens";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-snipe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-snipe";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "hlissner";
+          repo = "evil-snipe";
+          rev = "9df049eb83789ea5711632672e077cebf4c54e14";
+          sha256 = "143lgpvbjrddbgnyh9dfdhjj0gp69slv4fkiq53czz85ffwli5ig";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-snipe";
+          sha256 = "0gcmpjw3iw7rjk86b2k6clfigp48vakfjd1a9n8qramhnc85rgkn";
+          name = "evil-snipe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/evil-snipe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-space = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-space";
+        version = "0.0.6";
+        src = fetchFromGitHub {
+          owner = "linktohack";
+          repo = "evil-space";
+          rev = "f77860fa00662e2def3e1885adac777f051e1e61";
+          sha256 = "1rchanv0vq9rx6x69608dlpdybvkn8a9ymx8wzm7gqpz9qh6xqrk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-space";
+          sha256 = "1asvh873r1xgffvz3nr653yn8h5ifaphnafp6wf1b1mja6as7f23";
+          name = "evil-space";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-space";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-textobj-anyblock = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-textobj-anyblock";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "noctuid";
+          repo = "evil-textobj-anyblock";
+          rev = "068d26a625cd6202aaf70a8ff399f9130c0ffa68";
+          sha256 = "0vsf7yzlb2j7c5c7cnk81y1979psy6a9v7klg6c2j9lkcn3cqpvj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-textobj-anyblock";
+          sha256 = "03vk30s2wkcszcjxmh5ww39rihnag9cp678wdzq4bnqy0c6rnjwa";
+          name = "evil-textobj-anyblock";
+        };
+        packageRequires = [ cl-lib evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-textobj-anyblock";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-tutor = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-tutor";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "syl20bnr";
+          repo = "evil-tutor";
+          rev = "909273bac88b98a565f1b89bbb13d523b7edce2b";
+          sha256 = "1rskvkmz30xyy8xfjf2i35f3dxh663gb3plfy3f0j6z17i086jl2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-tutor";
+          sha256 = "1hvc2w5ykrgh62n4sxqqqcdk5sd7nmh6xzv4mir5vf9y2dgqcvsn";
+          name = "evil-tutor";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-tutor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-visual-mark-mode = callPackage ({ dash, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-visual-mark-mode";
+        version = "0.0.3";
+        src = fetchFromGitHub {
+          owner = "roman";
+          repo = "evil-visual-mark-mode";
+          rev = "094ee37599492885ff3144918fcdd9b74dadaaa0";
+          sha256 = "07cmql8zsqz1qchq2mp3qybbay499dk1yglisig6jfddcmrbbggz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-visual-mark-mode";
+          sha256 = "1qgr2dfhfz6imnlznicl7lplajd1s8wny7mlxs1bkms3xjcjfi48";
+          name = "evil-visual-mark-mode";
+        };
+        packageRequires = [ dash evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-visual-mark-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evil-visualstar = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-visualstar";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "bling";
+          repo = "evil-visualstar";
+          rev = "eb996eca0081b6e8bab70b2c0a86ef1c71087bf6";
+          sha256 = "11y2jrwbsw4fcx77zkhj1cn2hl1zcdqy00bv3mpbcrs03jywssrk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-visualstar";
+          sha256 = "135l9hjfbpn0a6p53picnpydi9qs5vrk2rfn64gxa5ag2apcyycy";
+          name = "evil-visualstar";
+        };
+        packageRequires = [ evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-visualstar";
+          license = lib.licenses.free;
+        };
+      }) {};
+    evm = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evm";
+        version = "0.4.2";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "evm.el";
+          rev = "d0623b2355436a5fd9f7238b419782080c79196b";
+          sha256 = "0739v0m9vj70a55z0canslyqgafzys815i7a0r6bxj2f9iwq6rhb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evm";
+          sha256 = "19l6cs5schbnph0pwhhj66gkxsswd4bmjpy79l9kxzpjf107wc03";
+          name = "evm";
+        };
+        packageRequires = [ dash f ];
+        meta = {
+          homepage = "http://melpa.org/#/evm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eww-lnum = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eww-lnum";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "m00natic";
+          repo = "eww-lnum";
+          rev = "daef49974446ed4c1001e0549c3f74679bca6bd3";
+          sha256 = "0gs6bi3s2sszc6v2b26929azmn5513kvyin99n4d0ark1jdbjmv2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eww-lnum";
+          sha256 = "1y745z4wa90snizq2g0amdwwgjafd6hkrayn93ca50f1wghdbk79";
+          name = "eww-lnum";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/eww-lnum";
+          license = lib.licenses.free;
+        };
+      }) {};
+    exec-path-from-shell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "exec-path-from-shell";
+        version = "1.10";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "exec-path-from-shell";
+          rev = "30c793b388312e5044afb7549b50996bf2b71941";
+          sha256 = "0nhc3m88i6rl2y426ksmjbbaqwfrjnwbzqq1bvd6r0bkcwgfwfml";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/exec-path-from-shell";
+          sha256 = "1j6f52qs1m43878ikl6nplgb72pdbxfznkfn66wyzcfiz2hrvvm9";
+          name = "exec-path-from-shell";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/exec-path-from-shell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    expand-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "expand-region";
+        version = "0.10.0";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "expand-region.el";
+          rev = "90c4e959ac8bf0bbd857dd679f38a121c592bf7a";
+          sha256 = "0rvkhjfkhamr3ys9iarblfwvwq7n4wishdjgnwj1lx7m80h1hzbg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/expand-region";
+          sha256 = "1c7f1nqsqdc75h22fxxnyg0m4yxj6l23sirk3c71fqj14paxqnwg";
+          name = "expand-region";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/expand-region";
+          license = lib.licenses.free;
+        };
+      }) {};
+    express = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }:
+    melpaBuild {
+        pname = "express";
+        version = "0.6.0";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "express";
+          rev = "e6dc9abdc395ef537408befebeb4fd3ed4ee5c60";
+          sha256 = "106yh793scbyharsk1dvrirkj3c6666w8jqilpkaz78vwyw3zs5y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/express";
+          sha256 = "0lhisy4ds96bwpc7k8w9ws1zi1qh0d36nhxsp36bqzfi09ig0nb9";
+          name = "express";
+        };
+        packageRequires = [ string-utils ];
+        meta = {
+          homepage = "http://melpa.org/#/express";
+          license = lib.licenses.free;
+        };
+      }) {};
+    extend-dnd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "extend-dnd";
+        version = "0.5";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "extend-dnd";
+          rev = "a1923d57f8f5e862cc66c189b5e6627bc84a2119";
+          sha256 = "1k2j8szavyq2wy5c0skvs03a88cr9njy7y63b7knh2m92nw4830d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/extend-dnd";
+          sha256 = "0rknpvp8yw051pg3blvmjpp3c9a82jw7f10mq67ggbz98w227417";
+          name = "extend-dnd";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/extend-dnd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    eyebrowse = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eyebrowse";
+        version = "0.6.9";
+        src = fetchFromGitHub {
+          owner = "wasamasa";
+          repo = "eyebrowse";
+          rev = "6d75409a81a6447765ad2171e3d0b5a272e1f207";
+          sha256 = "0jc5wv2hkc89yh5ypa324xlfqdna20msr63g30njxq4g2vd0iqa7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eyebrowse";
+          sha256 = "09fkzm8z8nkr4s9fbmfcjc80h50051f48v6n14l76xicglr5p861";
+          name = "eyebrowse";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/eyebrowse";
+          license = lib.licenses.free;
+        };
+      }) {};
+    f = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "f";
+        version = "0.17.3";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "f.el";
+          rev = "e0259ee060ff9a3f12204adcc8630869080acd68";
+          sha256 = "0lzqfr5xgc3qvpbs6vf63yiw7pc2mybfvsrhczf9ghlmlawqa6k1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/f";
+          sha256 = "0s7fqav0dc9g4y5kqjjyqjs90gi34cahaxyx2s0kf9fwcgn23ja2";
+          name = "f";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/f";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fabric = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fabric";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "fabric.el";
+          rev = "004934318f63d8cf955022f87b2c33eb97ada280";
+          sha256 = "0crhkdbxz1ldbrvppi95g005ni5zg99z1271rkrnk5i6cvc4hlq5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fabric";
+          sha256 = "1mkblsakdhvi10b67bv3j0jsf7hr8lf9sibmprvx8smqsih7l88m";
+          name = "fabric";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fabric";
+          license = lib.licenses.free;
+        };
+      }) {};
+    factlog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "factlog";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "tkf";
+          repo = "factlog";
+          rev = "c834fdab81ec5b1bdc0ee2721a12cecb48a319bf";
+          sha256 = "01l8dlfpyy97b17djbza46rq11xlbkhd5kn2r26r2xac8klj4pka";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/factlog";
+          sha256 = "163482vfpa52b5ya5xps4qnclbaql1x0q54gqdwwmm04as8qbfz7";
+          name = "factlog";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/factlog";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fancy-battery = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fancy-battery";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "lunaryorn";
+          repo = "fancy-battery.el";
+          rev = "5b8115bbeb67c52d4202a12dcd5726fb66e0a1ff";
+          sha256 = "05lwcwf412m717yhwpjrswqkm8c3i7391rmiwv2k8xc1vk6dpp4g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fancy-battery";
+          sha256 = "03rkfdkrzyal9abdiv8c73w10sm974hxf3xg5015hibfi6kzg8ii";
+          name = "fancy-battery";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/fancy-battery";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fancy-narrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fancy-narrow";
+        version = "0.9.4";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "fancy-narrow";
+          rev = "cd381c1acd5e0d9b6acd7f3e76c3b1de21e8b6df";
+          sha256 = "10ds6nlzm1s5xsp53a52qlzrnph7in6gib67qhgnwpj33wp8gs91";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fancy-narrow";
+          sha256 = "15i86jz6rdpva1az7gqp1wbm8kispcfc8h6v9fqsbag9sbzvgcyv";
+          name = "fancy-narrow";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fancy-narrow";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fastnav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fastnav";
+        version = "1.0.7";
+        src = fetchFromGitHub {
+          owner = "gleber";
+          repo = "fastnav.el";
+          rev = "54626e9e7cc7be5bc2bd01732e95ed2afc2312a1";
+          sha256 = "0h32w63vv451797zi6206j529fd4j8l3fp7rqip3s8xn8d4728x1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fastnav";
+          sha256 = "08hg256w8k9f5nzgpyl1jykbf28vmvv09kkhzs0s2zhwbl2158a5";
+          name = "fastnav";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fastnav";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fcitx";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "fcitx.el";
+          rev = "5e216df6df652599d921e00afb6e52a050f8cb50";
+          sha256 = "03w68zbgprly45i6ps7iviwvjf3acbc7f7acvjpzj2plf0g5i19z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fcitx";
+          sha256 = "0a8wd588c26p3czfp5hn2n46f2vwyg5v301sv0y07b55b1i3ynmx";
+          name = "fcitx";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fcitx";
+          license = lib.licenses.free;
+        };
+      }) {};
+    feature-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "feature-mode";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "michaelklishin";
+          repo = "cucumber.el";
+          rev = "4bd8f19da816115094beb4b0e085822eb298ac37";
+          sha256 = "1cxjygg05v8s96c8z6plk3hl34jaiwg7s7dl7dsk20rj5f54kgw7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/feature-mode";
+          sha256 = "0ryinmpqb3c91qcna6gbijcmqv3skxdc947dlr5s1w623z9nxgqg";
+          name = "feature-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/feature-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fill-column-indicator = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fill-column-indicator";
+        version = "1.81";
+        src = fetchFromGitHub {
+          owner = "alpaker";
+          repo = "Fill-Column-Indicator";
+          rev = "5cbc077083775d4719a294455a8a8a53bb3151f8";
+          sha256 = "0fghhy5xqsdwal4fwlr6hxr5kpnfw71q79mxpp9db59ldnj9f5y9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fill-column-indicator";
+          sha256 = "0w8cmijv7ihij9yyncz6lixb6awzzl7n9qpjj2bks1d5rx46blma";
+          name = "fill-column-indicator";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fill-column-indicator";
+          license = lib.licenses.free;
+        };
+      }) {};
+    finalize = callPackage ({ cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "finalize";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "elisp-finalize";
+          rev = "72c8eaab3deb150ee2cf7f1473114cecffb5204a";
+          sha256 = "1r9y9zschavi28c5ysrlh56vxszjfyhh5r36fhn74i0b5iiy15rx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/finalize";
+          sha256 = "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq";
+          name = "finalize";
+        };
+        packageRequires = [ cl-lib eieio emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/finalize";
+          license = lib.licenses.free;
+        };
+      }) {};
+    find-by-pinyin-dired = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "find-by-pinyin-dired";
+        version = "0.0.2";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "find-by-pinyin-dired";
+          rev = "3137c367d58958858daa6d3dee1993b2eb9dd9b4";
+          sha256 = "1xjb66pydm3yf0jxnm2mri98pxq3b26xvwjkaj1488qgj27i05jr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-by-pinyin-dired";
+          sha256 = "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq";
+          name = "find-by-pinyin-dired";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/find-by-pinyin-dired";
+          license = lib.licenses.free;
+        };
+      }) {};
+    find-file-in-project = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
+    melpaBuild {
+        pname = "find-file-in-project";
+        version = "4.5";
+        src = fetchFromGitHub {
+          owner = "technomancy";
+          repo = "find-file-in-project";
+          rev = "908cc56c0fd715001da4d97b30cba5eb7af3a609";
+          sha256 = "0bf32nhpmjvvgnr6g9xqh8pqnhr3dl24y3g40lsv4pc8ffs70ydm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-file-in-project";
+          sha256 = "0aznnv82xhnilc9j4cdmcgh6ksv7bhjjm3pa76hynnyrfn7kq7wy";
+          name = "find-file-in-project";
+        };
+        packageRequires = [ emacs swiper ];
+        meta = {
+          homepage = "http://melpa.org/#/find-file-in-project";
+          license = lib.licenses.free;
+        };
+      }) {};
+    find-file-in-repository = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "find-file-in-repository";
+        version = "1.2";
+        src = fetchFromGitHub {
+          owner = "hoffstaetter";
+          repo = "find-file-in-repository";
+          rev = "8b888f85029a2ff9159a724b42aeacdb051c3420";
+          sha256 = "0wbmmrd7brf4498pdyilz17rzv7221cj8sd4h11gac2r72f1q2md";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-file-in-repository";
+          sha256 = "0q1ym06w2yn3nzpj018dj6h68f7rmkxczyl061mirjp8z9c6a9q6";
+          name = "find-file-in-repository";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/find-file-in-repository";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fiplr = callPackage ({ fetchFromGitHub, fetchurl, grizzl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fiplr";
+        version = "0.2.4";
+        src = fetchFromGitHub {
+          owner = "d11wtq";
+          repo = "fiplr";
+          rev = "100dfc33f43da8c49e50e8a2222b9d95532f6e24";
+          sha256 = "0lwgbd9zwdv7qs39c3fp4hrc17d9wrwwjgba7a14zwrhb27m7j07";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fiplr";
+          sha256 = "0l68rl5cy2maynny6iq6c4qr6c99y44i0i1z613k9rk08z7h0k5i";
+          name = "fiplr";
+        };
+        packageRequires = [ grizzl ];
+        meta = {
+          homepage = "http://melpa.org/#/fiplr";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fireplace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fireplace";
+        version = "1.1.1";
+        src = fetchFromGitHub {
+          owner = "johanvts";
+          repo = "emacs-fireplace";
+          rev = "1ba1234ae801dcc2a0c051073622666584d0619a";
+          sha256 = "174x0qyrwswppc9p1q1nn4424r3zg7g49zk329k5aq18vyjz52d7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fireplace";
+          sha256 = "1apcypznq23fc7xgy4xy1c5hvfvjx1xhyq3aaq1lf59v99zchciw";
+          name = "fireplace";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fireplace";
+          license = lib.licenses.free;
+        };
+      }) {};
+    firestarter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "firestarter";
+        version = "0.2.4";
+        src = fetchFromGitHub {
+          owner = "wasamasa";
+          repo = "firestarter";
+          rev = "4b7428477980e12578ebbbb121115696b352d6b2";
+          sha256 = "0s8rml5xbskvnjpi8qp7vqflxhh5yis6zr6ay2bxmd2chjlhli55";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/firestarter";
+          sha256 = "1cpx664hyrdnpb1jps1x6lm7idwlfjblkfygj48cjz9pzd6ld5mp";
+          name = "firestarter";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/firestarter";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fish-mode";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "wwwjfy";
+          repo = "emacs-fish";
+          rev = "ac38e249dc260790ae32a24e101311990d9a84df";
+          sha256 = "1vwq0h88yassa0m0cizfvj5b9rrx5cb7w1n5mbczv54q97lq530n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fish-mode";
+          sha256 = "0l6k06bs0qdhj3h8vf5fv8c3rbhiqfwszrpb0v2cgnb6xhwzmq14";
+          name = "fish-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/fish-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fix-word = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fix-word";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "fix-word";
+          rev = "256a87d4b871ead0975fa0e7f76a1ecbaa074582";
+          sha256 = "1hj5jp4vbkcmnc8l2hqsvjc76f7c9zcsq8znwcwv2nv9xj9hlbkr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fix-word";
+          sha256 = "0a8w09cx8p5pkkd4533nd199axkhdhs2a7blp7syfn40bkscx6xc";
+          name = "fix-word";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/fix-word";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fixmee = callPackage ({ back-button, button-lock, fetchFromGitHub, fetchurl, lib, melpaBuild, nav-flash, smartrep, string-utils, tabulated-list ? null }:
+    melpaBuild {
+        pname = "fixmee";
+        version = "0.8.6";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "fixmee";
+          rev = "aa3be8ad9fcc9c0c7ff15f70cda4ba77de96dd74";
+          sha256 = "1hnxdmzqmnp3dr7mpr58pjmigykb3cxwphxzia013kfi37ipf5a0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fixmee";
+          sha256 = "0wnp6h8f547fsi1lkk4ajny7g21dnr76qfhxl82n0l5h1ps4w8mp";
+          name = "fixmee";
+        };
+        packageRequires = [
+          back-button
+          button-lock
+          nav-flash
+          smartrep
+          string-utils
+          tabulated-list
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/fixmee";
+          license = lib.licenses.free;
+        };
+      }) {};
+    floobits = callPackage ({ fetchFromGitHub, fetchurl, highlight, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "floobits";
+        version = "1.6.3";
+        src = fetchFromGitHub {
+          owner = "Floobits";
+          repo = "floobits-emacs";
+          rev = "9c052942524169c1ba98e644ccbeaea583275530";
+          sha256 = "12b1b7avjdbfm184mcg3bh3s6k0ygfz1sraz8q7qnrsyw4170893";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/floobits";
+          sha256 = "1jpk0q4mkf9ag1rqyai993nz5ngzfvxq9n9avmaaq59gkk9cjraf";
+          name = "floobits";
+        };
+        packageRequires = [ highlight json ];
+        meta = {
+          homepage = "http://melpa.org/#/floobits";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flx = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flx";
+        version = "0.6.1";
+        src = fetchFromGitHub {
+          owner = "lewang";
+          repo = "flx";
+          rev = "7fce6a4cdb65ac1b52e2b409ba548767581ce34c";
+          sha256 = "0sjybrcnb2sl33swy3q664vqrparajcl0m455gciiih2j87hwadc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flx";
+          sha256 = "04plfhrnw7jx2jaxhbhw4ypydfcb8v0x2m5hyacvrli1mca2iyf9";
+          name = "flx";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/flx";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flx-ido = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, flx, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flx-ido";
+        version = "0.6.1";
+        src = fetchFromGitHub {
+          owner = "lewang";
+          repo = "flx";
+          rev = "7fce6a4cdb65ac1b52e2b409ba548767581ce34c";
+          sha256 = "0sjybrcnb2sl33swy3q664vqrparajcl0m455gciiih2j87hwadc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flx-ido";
+          sha256 = "00wcwbvfjbcx8kyap7rl1b6nsgqdwjzlpv6al2cdpdd19rm1vgdc";
+          name = "flx-ido";
+        };
+        packageRequires = [ cl-lib flx ];
+        meta = {
+          homepage = "http://melpa.org/#/flx-ido";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
+    melpaBuild {
+        pname = "flycheck";
+        version = "0.25.1";
+        src = fetchFromGitHub {
+          owner = "flycheck";
+          repo = "flycheck";
+          rev = "efaf2e3894428fec065ac6ab0b204db66dbdaa85";
+          sha256 = "19mnx2zm71qrf7qf3mk5kriv5vgq0nl67lj029n63wqd8jcjb5fi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck";
+          sha256 = "045k214dq8bmrai13da6gwdz97a2i998gggxqswqs4g52l1h6hvr";
+          name = "flycheck";
+        };
+        packageRequires = [ cl-lib dash emacs let-alist pkg-info seq ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-cask = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-cask";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "flycheck";
+          repo = "flycheck-cask";
+          rev = "bad0b7bc25fdfc200ec383db852120aa0fcdba4b";
+          sha256 = "1c3igqfd42dm42kfjm2q2xgr673vws10n9jn2jjlsk4g33brc7h4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-cask";
+          sha256 = "1lq559nyhkpnagncj68h84i3cq85vhdikr534kj018n2zcilsyw7";
+          name = "flycheck-cask";
+        };
+        packageRequires = [ dash emacs flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-cask";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-checkbashisms = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-checkbashisms";
+        version = "1.3";
+        src = fetchFromGitHub {
+          owner = "Gnouc";
+          repo = "flycheck-checkbashisms";
+          rev = "652c977de277519b07de70d6570082687e39367c";
+          sha256 = "0rvnc574r3fhm85g4n1fn1c4avg0w1x32a4k6fv5v94m5c4331nn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-checkbashisms";
+          sha256 = "1rq0ymlr1dl39v0sfyjmdv4pq3q9116cz9wvgpvfgalq8759q5sz";
+          name = "flycheck-checkbashisms";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-checkbashisms";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-clojure = callPackage ({ cider, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-clojure";
+        version = "0.1.3";
+        src = fetchFromGitHub {
+          owner = "clojure-emacs";
+          repo = "squiggly-clojure";
+          rev = "9e07fd2526ab6e2c4db7d7d6b8c9e44be6e90298";
+          sha256 = "1i824iyjsg4d786kx5chsb64wlqd8vn2vsrhq6rmdx2x3gzdfcsx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-clojure";
+          sha256 = "1b20gcs6fvq9pm4nl2qwsf34sg6wxngdql921q2pyh5n1xsxhm28";
+          name = "flycheck-clojure";
+        };
+        packageRequires = [ cider emacs flycheck let-alist ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-clojure";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-color-mode-line = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-color-mode-line";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "flycheck";
+          repo = "flycheck-color-mode-line";
+          rev = "c85319f8d2579e770c9060bfef11bedc1370d8be";
+          sha256 = "11xc08xld758xx9myqjsiqz8vk3gh4d9c4yswswvky6mrx34c0y5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-color-mode-line";
+          sha256 = "0hw19nsh5h2l8qbp7brqmml2fhs8a0x850vlvq3qfd7z248gvhrq";
+          name = "flycheck-color-mode-line";
+        };
+        packageRequires = [ dash emacs flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-color-mode-line";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-dmd-dub = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-dmd-dub";
+        version = "0.9";
+        src = fetchFromGitHub {
+          owner = "atilaneves";
+          repo = "flycheck-dmd-dub";
+          rev = "e8744adaba010415055ac15c702f780dd6e13e14";
+          sha256 = "1ap5hgvaccmf2xkfvyp7rqcfjwmiy6mhr6ccgahxm2z0vm51kpyh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-dmd-dub";
+          sha256 = "0pg3sf7h6xqv65yqclhlb7fx1mp2w0m3qk4vji6m438kxy6fhzqm";
+          name = "flycheck-dmd-dub";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-dmd-dub";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-gometalinter = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-gometalinter";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "favadi";
+          repo = "flycheck-gometalinter";
+          rev = "4b6f26aa5062f9d4164b24ce021bc18d00f9308e";
+          sha256 = "0j2mvf3zjznwkm8dykcgs1v5sz0i882mrivghxqr3h6n3ni4wag4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-gometalinter";
+          sha256 = "1bnvj5kwgbh0dv989rsjcvmcij1ahwcz0vpr6a8f2p6wwvksw1h2";
+          name = "flycheck-gometalinter";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-gometalinter";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-haskell = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, haskell-mode, let-alist, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-haskell";
+        version = "0.7.2";
+        src = fetchFromGitHub {
+          owner = "flycheck";
+          repo = "flycheck-haskell";
+          rev = "57756b8f0e4e0a775a702a1b8f2a4be7bb0088cc";
+          sha256 = "0143lcn6g46g7skm4r6lqq09s8mr3268rikbzlh65qg80rpg9frj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-haskell";
+          sha256 = "12lgirz3j6n5ns2ikq4n41z0d33qp1lb5lfz1q11qvpbpn9d0jn7";
+          name = "flycheck-haskell";
+        };
+        packageRequires = [ dash emacs flycheck haskell-mode let-alist ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-haskell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-hdevtools = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-hdevtools";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "flycheck";
+          repo = "flycheck-hdevtools";
+          rev = "fbf90b9a7d2d90f69ac55b57d18f0f4a47afed61";
+          sha256 = "136mdg21a8sqxhijsjsvpli7r7sb40nmf80p6gmgb1ghwmhlm8k3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-hdevtools";
+          sha256 = "0ahvai1q4x59ryiyccvqvjisgqbaiahx4gk8ssaxhblhj0sqga93";
+          name = "flycheck-hdevtools";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-hdevtools";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-ledger = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-ledger";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flycheck-ledger";
+          rev = "9401b6c83f60bfd29edfc62fee76f75e17a3a41e";
+          sha256 = "1pdssw5k88ym5fczllfjv26sp4brlyrywnlzq5baha5pq91h9cb6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-ledger";
+          sha256 = "0807pd2km4r60wgd6jakscbx63ab22d9kvf1cml0ad8wynsap7jl";
+          name = "flycheck-ledger";
+        };
+        packageRequires = [ flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-ledger";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-ocaml = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, merlin }:
+    melpaBuild {
+        pname = "flycheck-ocaml";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "flycheck";
+          repo = "flycheck-ocaml";
+          rev = "9b4cd83ad2a87cc94b5d4e1ac26ac235475f1e6c";
+          sha256 = "1phfarws2aajkgcl96hqa4ydmb1yncg10q2ldzf8ff6yd6mvk51l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-ocaml";
+          sha256 = "1cv2bb66aql2kj1y1gsl4xji8yrzrq6rd8hxxs5vpfsk47052lf7";
+          name = "flycheck-ocaml";
+        };
+        packageRequires = [ emacs flycheck let-alist merlin ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-ocaml";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-package = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-package";
+        version = "0.8";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flycheck-package";
+          rev = "ff93e8986a1021daf542c441c1fd50436ee83cba";
+          sha256 = "0aa8cnh9f0f2zr2kkba2kf9djzjnsd51fzj8l578pbj016zdarwd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-package";
+          sha256 = "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d";
+          name = "flycheck-package";
+        };
+        packageRequires = [ cl-lib emacs flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-package";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-pos-tip = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }:
+    melpaBuild {
+        pname = "flycheck-pos-tip";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "flycheck";
+          repo = "flycheck-pos-tip";
+          rev = "0c2b31b615fa294f329f3cc387b464525ce3392d";
+          sha256 = "0v23yc8znzjp44lrpfzqb4hc3psad14hsnvqcp8f1yyhgvdx35n8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-pos-tip";
+          sha256 = "09i2jmwj8b915fhyczwdb1j7c551ggbva33avis77ga1s9v3nsf9";
+          name = "flycheck-pos-tip";
+        };
+        packageRequires = [ dash flycheck pos-tip ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-pos-tip";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-status-emoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-status-emoji";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "liblit";
+          repo = "flycheck-status-emoji";
+          rev = "37ed04b76b7338afd2237d3a11487bef3970ff0f";
+          sha256 = "0yi2xmk0bxzqmjf9sy3r3gacqw7z1jrf6hwn05zaqqgn7y78z37i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-status-emoji";
+          sha256 = "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p";
+          name = "flycheck-status-emoji";
+        };
+        packageRequires = [ emacs flycheck let-alist ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-status-emoji";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-tip = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "flycheck-tip";
+        version = "0.5.0";
+        src = fetchFromGitHub {
+          owner = "yuutayamada";
+          repo = "flycheck-tip";
+          rev = "0bfddf52ae4ec48d970324f8336a5d62986bbc9e";
+          sha256 = "0azjr5mfb3hnb66m1b2319i035mn5i9qz24y7fj5crhnc9vp8w3s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-tip";
+          sha256 = "0zab1zknrnsw5xh5pwzzcpz7p40bbywkf9zx99sgsd6b5j1jz656";
+          name = "flycheck-tip";
+        };
+        packageRequires = [ emacs flycheck popup ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-tip";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, ycmd }:
+    melpaBuild {
+        pname = "flycheck-ycmd";
+        version = "0.9";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "emacs-ycmd";
+          rev = "8fb29b84d42c0aea71fe7db088b0b7a5a0c6b34c";
+          sha256 = "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-ycmd";
+          sha256 = "0m99ssynrqxgzf32d35n17iqyh1lyc6948inxpnwgcb98rfamchv";
+          name = "flycheck-ycmd";
+        };
+        packageRequires = [ dash emacs flycheck ycmd ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-ycmd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-coffee = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-coffee";
+        version = "0.12";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-coffee";
+          rev = "d4ef325255ea36d1dd622f29284fe72c3fc9abc0";
+          sha256 = "1svj5n7mmzhq03azlv4n33rz0nyqb00qr8ihdbc8hh2xnp63j5rc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-coffee";
+          sha256 = "1aig1d4fgjdg31vrg8k43z5hbqiydgfvxi45p1695s3kbdm8pr2d";
+          name = "flymake-coffee";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-coffee";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-css = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-css";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-css";
+          rev = "3e56d47d3c53e39741aa4f702bb9fb827cce22ed";
+          sha256 = "054ws88fcfz3hf3cha7dvndm52v5n4jc4vzif1lif44xq0iggwqa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-css";
+          sha256 = "0kqm3wn9symqc9ivnh11gqgq8ql2bhpqvxfm86d8vwm082hd92c5";
+          name = "flymake-css";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-css";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-easy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-easy";
+        version = "0.10";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-easy";
+          rev = "2a24f260cdc3b9c8f9263b653a475d90efa1d392";
+          sha256 = "1j35k52na02b59yglfb48w6m5qzydvzqfsylb8ax5ks0f287yf0c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-easy";
+          sha256 = "19p6s9fllgvs35v167xf624k5dn16l9fnvaqcj9ks162gl9vymn7";
+          name = "flymake-easy";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-easy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-gjshint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-gjshint";
+        version = "0.0.6";
+        src = fetchFromGitHub {
+          owner = "yasuyk";
+          repo = "flymake-gjshint-el";
+          rev = "71495ee5303de18293decd57ab9f9abdbaabfa05";
+          sha256 = "002s01cymgx4z4l3j2pqirg7899pljdx2hmbz8k6cksdxlymzmkd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-gjshint";
+          sha256 = "19jcd5z4883z3fzlrdn4fzmsvn16f4hfnhgw4vbs5b0ma6a8ka44";
+          name = "flymake-gjshint";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-gjshint";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-haml = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-haml";
+        version = "0.8";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-haml";
+          rev = "343449920866238db343d61343bc845cc8bc5e1b";
+          sha256 = "1b3lf5jwan03k7rb97g4bb982dacdwsfdddnwc0inx9gs3qq1zni";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-haml";
+          sha256 = "0dmdhh12h4xrx6mc0qrwavngk2sx0l4pfqkjjyavabsgcs9wlgp1";
+          name = "flymake-haml";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-haml";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-haskell-multi = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-haskell-multi";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-haskell-multi";
+          rev = "d2c9aeffd33440d360c1ea0c5aef6d1f171599f9";
+          sha256 = "0k1qc0r0gr7f9l5if2a67cv4k73z5yxd6vxd6l1bqw500y0aajxz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-haskell-multi";
+          sha256 = "0cyzmmghwkkv6020s6n436lwymi6dr49i7gkci5n0hw5pdywcaij";
+          name = "flymake-haskell-multi";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-haskell-multi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-hlint = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-hlint";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-hlint";
+          rev = "d540e250a80a09da3036c16bf86f9deb6d738c9c";
+          sha256 = "1ygg51r4ym4x7h4svizwllsvr72x9np6jvjqpk8ayv3w2fpb9l31";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-hlint";
+          sha256 = "0wq1ijhn3ypy31yk8jywl5hnz0r0vlhcxjyznzccwqbdc5vf7b2x";
+          name = "flymake-hlint";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-hlint";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-jslint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-jslint";
+        version = "0.23";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-jslint";
+          rev = "30693f75059bab53a9d2eb676c68751f4d8b091c";
+          sha256 = "00zkm3wqlss386qd6jiq0siga7c48n5ykh0vf9q5v83rmpd79yri";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-jslint";
+          sha256 = "1cq8fni4p0qhigx0qh34ypmcsbnilra1ixgnrn9mgg8x3cvcm4cm";
+          name = "flymake-jslint";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-jslint";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-json = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-json";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-json";
+          rev = "ad8e482db1ad29e23bdd9d089b9bc3615649ce65";
+          sha256 = "0rzlw80mi39147yqnpzcvw9wvr5svksd3kn6s3w8191f2kc6xzzv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-json";
+          sha256 = "1p5kajiycpqy2id664bs0fb1mbf73a43qqfdi4c57n6j9x7fxp4d";
+          name = "flymake-json";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-json";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-less = callPackage ({ fetchFromGitHub, fetchurl, less-css-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-less";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-less";
+          rev = "8cbb5e41c8f4b988cee3ef4449cfa9aea3540893";
+          sha256 = "0ggvmsjj6p6a7cwr2bzhlcf8ab4v6a2bz5djsscd2ryy570p367z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-less";
+          sha256 = "05k5daphxy94164c73ia7f4l1gv2cmlw8xzs8xnddg7ly22gjhi0";
+          name = "flymake-less";
+        };
+        packageRequires = [ less-css-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-less";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-perlcritic = callPackage ({ fetchFromGitHub, fetchurl, flymake ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-perlcritic";
+        version = "1.0.3";
+        src = fetchFromGitHub {
+          owner = "illusori";
+          repo = "emacs-flymake-perlcritic";
+          rev = "0692d6ad5495f6e5438bde0a10345829b8e1def8";
+          sha256 = "11r982h5fhjkmm9ld8wfdip0ghinw523nm1w4fmy830g0bbkgkrq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-perlcritic";
+          sha256 = "0hibnh463wzhvpix7gygpgs04gi6salwjrsjc6d43lxlsn3y1im8";
+          name = "flymake-perlcritic";
+        };
+        packageRequires = [ flymake ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-perlcritic";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-php = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-php";
+        version = "0.5";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-php";
+          rev = "91f867e209011af31a2ca2d8f6874b994403bcb2";
+          sha256 = "0dzyid0av9icp77wv0zcsygpw46z24qibq1ra0iwnkzl3kqvkyzh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-php";
+          sha256 = "12ds2l5kvs7fz38syp4amasbjkpqd36rlpajnb3xxll0hbk6vffk";
+          name = "flymake-php";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-php";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-python-pyflakes = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-python-pyflakes";
+        version = "0.9";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-python-pyflakes";
+          rev = "78806a25b0f01f03df4210a79a6eaeec59511d7a";
+          sha256 = "0l8qpcbzfi32h3vy7iwydx3hg2w60x9l3v3rabzjx412m5d00gsh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-python-pyflakes";
+          sha256 = "0asbjxv03zkbcjayanv13qzbv4z7b6fi0z1j6yv7fl6q9mgvm497";
+          name = "flymake-python-pyflakes";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-python-pyflakes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-ruby = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-ruby";
+        version = "0.8";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-ruby";
+          rev = "e14e8e2abda223bd3920dbad0eefd5af5973ae6d";
+          sha256 = "0d2vmpgr5c2cbpxcqm5x1ckfysbpwcbaa9frcnp2yfp8scvkvqj0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-ruby";
+          sha256 = "1shr6d03vx85nmyxnysglzlc1pz0zy3n28nrcmxqgdm02g197bzr";
+          name = "flymake-ruby";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-ruby";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-sass = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-sass";
+        version = "0.6";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-sass";
+          rev = "1c7664818db539de7f3dab396c013528a3f5b8b4";
+          sha256 = "0c74qdgy9c4hv3nyjnbqdzypbg9399vq3p5ngp5lasc7iz6vi0h8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-sass";
+          sha256 = "0sz6n5r9pdphgvvaljg9zdwj3dqayaxzxmb4s8x4b05c8yx3ba0d";
+          name = "flymake-sass";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-sass";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flymake-shell = callPackage ({ fetchFromGitHub, fetchurl, flymake-easy, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flymake-shell";
+        version = "0.8";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "flymake-shell";
+          rev = "ec097bd77db5523a04ceb15a128e01689d36fb90";
+          sha256 = "0c2lz1p91yhprmlbmp0756d96yiy0w92zf0c9vlp0i9abvd0cvkc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-shell";
+          sha256 = "13ff4r0k29yqgx8ybxz7hh50cjsadcjb7pd0075s9xcrzia5x63i";
+          name = "flymake-shell";
+        };
+        packageRequires = [ flymake-easy ];
+        meta = {
+          homepage = "http://melpa.org/#/flymake-shell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flyspell-lazy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flyspell-lazy";
+        version = "0.6.10";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "flyspell-lazy";
+          rev = "31786fe04a4732d2f845e1c7e96fcb030182ef10";
+          sha256 = "1g09s57b773nm9xqslzbin5i2h18k55nx00s5nnkvx1qg0n0mzkm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flyspell-lazy";
+          sha256 = "0lzazrhsfh5m7n57dzx0v46d5mg87wpwwkjzf5j9gpv1mc1xfg1y";
+          name = "flyspell-lazy";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/flyspell-lazy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    flyspell-popup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "flyspell-popup";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "flyspell-popup";
+          rev = "a3890c9272c0cfa1e2cde6526f7d6280ad4af00c";
+          sha256 = "1rk7fsill0salrhb4anbf698nd21nxj8pni35brbmv64nj9fhfic";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flyspell-popup";
+          sha256 = "0wp15ra1ry6xpwal6mb53ixh3f0s4nps0rdyfli7hhaiwbr9bhql";
+          name = "flyspell-popup";
+        };
+        packageRequires = [ popup ];
+        meta = {
+          homepage = "http://melpa.org/#/flyspell-popup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fm";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "fm";
+          rev = "6266840de17ac396dd7275a71da72cd5120c35a6";
+          sha256 = "0r2j238iyxnww60xpbxggjmz6y2waayw4m51f0l39hszbhags2cv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fm";
+          sha256 = "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f";
+          name = "fm";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "focus";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "larstvei";
+          repo = "Focus";
+          rev = "0a6e9624ea5607dadd0f2cd4d3eaa2b10b788eb9";
+          sha256 = "0aj5qxzlfxxp7z27fiw9bvir5yi2zj0xzj5kbh17ix4wnhi03bhc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/focus";
+          sha256 = "0jw26j8npyl3dgsrs7ap2djxmkafn2hl6gfqvi7v76bccs4jkyv8";
+          name = "focus";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/focus";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fold-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fold-dwim";
+        version = "1.2";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "fold-dwim";
+          rev = "4764b0246a722d37eb8ec9f204ffaccaad1755d0";
+          sha256 = "1k8z30imlxvqm7lv12kgqdfgc5znxyvl9jxi8j2ymmwlgy11f726";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fold-dwim";
+          sha256 = "0c9yxx45zlhb1h4ldgkjv7bndwlagpyingaaqn9dcsxidrvp3p5x";
+          name = "fold-dwim";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fold-dwim";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fold-dwim-org = callPackage ({ fetchFromGitHub, fetchurl, fold-dwim, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fold-dwim-org";
+        version = "0.6";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "fold-dwim-org";
+          rev = "c09bb2b46d65afbd1d0febc6fded7495be7a3037";
+          sha256 = "14jvbkahwvv4wb0s9vp8gqmlpv1d4269j5rsjxn79q5pawjzslxw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fold-dwim-org";
+          sha256 = "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn";
+          name = "fold-dwim-org";
+        };
+        packageRequires = [ fold-dwim ];
+        meta = {
+          homepage = "http://melpa.org/#/fold-dwim-org";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fold-this = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fold-this";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "fold-this.el";
+          rev = "90b41d7b588ab1c3295bf69f7dd87bf31b543a6a";
+          sha256 = "1cbabpyp66nl5j8yhyj2jih4mhaljxvjh9ij05clai71z4598ahn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fold-this";
+          sha256 = "1iri4a6ixw3q7qr803cj2ik7rvmww1b6ybj5q2pvkf1v25r8655d";
+          name = "fold-this";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fold-this";
+          license = lib.licenses.free;
+        };
+      }) {};
+    font-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, persistent-soft }:
+    melpaBuild {
+        pname = "font-utils";
+        version = "0.7.8";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "font-utils";
+          rev = "9192d3f8ee6a4e75f34c3fed10378674cc2b11d3";
+          sha256 = "1k90w8v5rpswqb8fn1cc8sq5w12gf4sn6say5dhvqd63512b0055";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/font-utils";
+          sha256 = "0k33jdchjkj7j211a23kfp5axg74cfsrrq4axsb1pfp124swh2n5";
+          name = "font-utils";
+        };
+        packageRequires = [ pcache persistent-soft ];
+        meta = {
+          homepage = "http://melpa.org/#/font-utils";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fontawesome = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fontawesome";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-fontawesome";
+          rev = "ccb03b8329daa3130491c9c4d285b325dbeb5cc7";
+          sha256 = "0qq13jhn9i2ls6n3fbay4i2r0hfs426pkmmif43b87gjxb510irc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fontawesome";
+          sha256 = "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3";
+          name = "fontawesome";
+        };
+        packageRequires = [ cl-lib helm-core ];
+        meta = {
+          homepage = "http://melpa.org/#/fontawesome";
+          license = lib.licenses.free;
+        };
+      }) {};
+    forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "forecast";
+        version = "0.1.9";
+        src = fetchFromGitHub {
+          owner = "cadadr";
+          repo = "forecast.el";
+          rev = "51526906140700f076bd329753abe7ae31b6da90";
+          sha256 = "1jw888nqmbi9kcd9ycl2fqrmrnqxnmkx72n0b3nf3hp7j956yb21";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/forecast";
+          sha256 = "0whag2n1120384w304g0w4bqr7svdxxncdhnz4rznfpxlgiw2rsc";
+          name = "forecast";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/forecast";
+          license = lib.licenses.free;
+        };
+      }) {};
+    foreman-mode = callPackage ({ dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "foreman-mode";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "zweifisch";
+          repo = "foreman-mode";
+          rev = "e90d2b56e83ab914f9ba9e78126bd7a534d5b8fb";
+          sha256 = "199kybf2bvywqfnwr5w893km82829k1j7sp079y6s2601hq8ylw9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/foreman-mode";
+          sha256 = "0p3kwbld05wf3dwcv0k6ynz727fiy0ik2srx4js9wvagy57x98kv";
+          name = "foreman-mode";
+        };
+        packageRequires = [ dash dash-functional emacs f s ];
+        meta = {
+          homepage = "http://melpa.org/#/foreman-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    form-feed = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "form-feed";
+        version = "0.2.2";
+        src = fetchFromGitHub {
+          owner = "wasamasa";
+          repo = "form-feed";
+          rev = "eac6724c093458745e9ae0e37221077fa2ad0ff6";
+          sha256 = "171jna631b2iqcimfsik9c66gii8nc0zdb58m077w00rn7rcxbh2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/form-feed";
+          sha256 = "1abwjkzi3irw0jwpv3f584zc72my9n8iq8zp5s0354xk6iwrl1rh";
+          name = "form-feed";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/form-feed";
+          license = lib.licenses.free;
+        };
+      }) {};
+    format-sql = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "format-sql";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "paetzke";
+          repo = "format-sql.el";
+          rev = "97f475c245cd6c81a72a265678e2087cee66ac7b";
+          sha256 = "0mikksamljps1czacgqavlnzzhgs8s3f8q4jza6v3csf8kgp5zd0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/format-sql";
+          sha256 = "0684xqzs933vj9d3n3lv7afk4gii41kaqykbb05cribaswapsanj";
+          name = "format-sql";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/format-sql";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fountain-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "fountain-mode";
+        version = "1.5.0";
+        src = fetchFromGitHub {
+          owner = "rnkn";
+          repo = "fountain-mode";
+          rev = "167238b3cdd5e510300abe3afd02b820f026b501";
+          sha256 = "0yycn339vqglny1bs4c8jsaf85cyj0rzzn8wzsf5k5srh9yivzdq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fountain-mode";
+          sha256 = "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840";
+          name = "fountain-mode";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "http://melpa.org/#/fountain-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    frame-restore = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "frame-restore";
+        version = "0.5";
+        src = fetchFromGitHub {
+          owner = "lunaryorn";
+          repo = "frame-restore.el";
+          rev = "5bfd06e18cdf5031062de5e052e9a877c3953804";
+          sha256 = "1vznkbly0lyh5kri9lcgy309ws96q3d5m1lghck9l8ain8hphhqz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/frame-restore";
+          sha256 = "0b321iyf57nkrm6xv8d1aydivrdapdgng35zcnrg298ws2naysvm";
+          name = "frame-restore";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/frame-restore";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fringe-helper = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fringe-helper";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "nschum";
+          repo = "fringe-helper.el";
+          rev = "0f10a196c6e57222b8d4c94eafc40a96e7b20f1b";
+          sha256 = "1c3yx9j3q8fkfiay4nzcabsq9i4ydqf6vxk8vv80h78gg9afrzrj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fringe-helper";
+          sha256 = "1vki5jd8jfrlrjcfd12gisgk12y20q3943i2qjgg4qvcj9k28cbv";
+          name = "fringe-helper";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fringe-helper";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fsharp-mode = callPackage ({ auto-complete, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, s }:
+    melpaBuild {
+        pname = "fsharp-mode";
+        version = "1.7.2";
+        src = fetchFromGitHub {
+          owner = "rneatherway";
+          repo = "emacs-fsharp-mode-bin";
+          rev = "9169baa9290e92d2e0ccc3cfd9c2a423136eb251";
+          sha256 = "1ckq45szq8lfg4spmvrj53s3p1hfl7x8k86cgq254gbs7kq8w7p2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fsharp-mode";
+          sha256 = "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z";
+          name = "fsharp-mode";
+        };
+        packageRequires = [ auto-complete dash popup pos-tip s ];
+        meta = {
+          homepage = "http://melpa.org/#/fsharp-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fuel = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "fuel";
+        version = "0.96";
+        src = fetchgit {
+          url = "git://factorcode.org/git/factor.git";
+          rev = "905ec06d864537fb6be9c46ad98f1b6d101dfbf0";
+          sha256 = "b348e285923e480fe696f888783c95becb392a6e05abc553d8be649987c7d190";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fuel";
+          sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756";
+          name = "fuel";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fuel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    full-ack = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "full-ack";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "nschum";
+          repo = "full-ack";
+          rev = "0aef4be1686535f83217cafb1524818071bd8325";
+          sha256 = "0c3w3xs2jbdqgsqw0qmdbwii6p395qfznird4gg0hfr7lby2kmjq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/full-ack";
+          sha256 = "09ikhyhpvkcl6yl6pa4abnw6i7yfsx5jkmzypib94w7khikvb309";
+          name = "full-ack";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/full-ack";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fullframe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fullframe";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "tomterl";
+          repo = "fullframe";
+          rev = "6ce5342191a6837500bcb6d6026103eb53bb6752";
+          sha256 = "0y11yxlfbfb6f20rljpz54crwrmi9yljavfwmh33bq54fck296k7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fullframe";
+          sha256 = "08sh8lmb6g8asv28fcb36ilcn0ka4fc6ka0pnslid0h4c32fxp2a";
+          name = "fullframe";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/fullframe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    function-args = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
+    melpaBuild {
+        pname = "function-args";
+        version = "0.5.1";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "function-args";
+          rev = "25e447d8a8930a8c515077de57a7693c6a642514";
+          sha256 = "0m7fcw0cswypiwi5abg6vhw7a3agx9vhp10flbbbji6lblb0fya8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/function-args";
+          sha256 = "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak";
+          name = "function-args";
+        };
+        packageRequires = [ swiper ];
+        meta = {
+          homepage = "http://melpa.org/#/function-args";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fuzzy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fuzzy";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "auto-complete";
+          repo = "fuzzy-el";
+          rev = "939f4e9a3f08d83925b41dd3d23b2321f3f6b09c";
+          sha256 = "1g7my9ha5cnwg3pjwa86wncg5gphv18xpnpmj3xc3vg7z5m45rss";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fuzzy";
+          sha256 = "1hwdh9bx4g4vzzyc20vdwxsii611za37kc9ik40kwjjk62qmll8h";
+          name = "fuzzy";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fuzzy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fvwm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fvwm-mode";
+        version = "1.6.4";
+        src = fetchFromGitHub {
+          owner = "theBlackDragon";
+          repo = "fvwm-mode";
+          rev = "d48a309bb7db21f5404b6619c6ee861fe0457704";
+          sha256 = "0c3g0yfclczdh6nxmg9lljjf288zibqy51bhh1b1cgdmxcbpg8bv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fvwm-mode";
+          sha256 = "07y32cnp4qfhncp7s24gmlxljdrj5miicinfaf4gc7hihb4bkrkb";
+          name = "fvwm-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fvwm-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fwb-cmds = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fwb-cmds";
+        version = "0.4.0";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "fwb-cmds";
+          rev = "93504c2022799a84cc14d598e1413f8d9df4ee0e";
+          sha256 = "08qnyr945938hwjg1ypkf2x4mfxbh3bbf1xrgz1rk2ddrfv7hmkm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fwb-cmds";
+          sha256 = "0wnjvi0v0l2h1mhwlsk2d8ggwh3nk7pks48l55gp18nmj00jxycx";
+          name = "fwb-cmds";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/fwb-cmds";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "fxrd-mode";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "msherry";
+          repo = "fxrd-mode";
+          rev = "122afe6b7edeff117edf92dab1ba011ae71a5910";
+          sha256 = "003iqzwzf950dvn6q901y0jjadz7hqaafa9wrhzplay3kjnkjj9b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fxrd-mode";
+          sha256 = "17zimg64lqc1yh9gnp5izshkvviz996aym7q6n9p61a4kqq37z4r";
+          name = "fxrd-mode";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "http://melpa.org/#/fxrd-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    fzf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fzf";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "bling";
+          repo = "fzf.el";
+          rev = "bfc157a682b53927af633fd919c2e03235ea6599";
+          sha256 = "0rjn4z7ssl1jy0brvsci44mhpig3zkdbcj8gcylzznhz0qfk1ljj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fzf";
+          sha256 = "0jjzm1gq85fx1gmj6nqaijnjws9bm8hmk40ws3x7fmsp41qq5py0";
+          name = "fzf";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/fzf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gather = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gather";
+        version = "1.1.0";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-gather";
+          rev = "303af57dd2ae0fc1363a3d1a84d475167f58c84a";
+          sha256 = "1q9bz294bc6bplwfrfzsczh444v9152wv7zm2l1pcpwv8n8581p6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gather";
+          sha256 = "1f0cqqp1a7w8g1pfvzxxb0hjrxq4m79a4n85dncqj2xhjxrkm0xk";
+          name = "gather";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gather";
+          license = lib.licenses.free;
+        };
+      }) {};
+    geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "geiser";
+        version = "0.8.1";
+        src = fetchFromGitHub {
+          owner = "jaor";
+          repo = "geiser";
+          rev = "c6f17b25200e36f80d812684a2127b451fc11817";
+          sha256 = "1667zln7bav0bdhrc4b5z36n8rn36xvwh4y9ffgns67zfgwi64kk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/geiser";
+          sha256 = "067rrjvyn5sz60w9h7qn542d9iycm2q4ryvx3n6xlard0dky5596";
+          name = "geiser";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/geiser";
+          license = lib.licenses.free;
+        };
+      }) {};
+    genrnc = callPackage ({ concurrent, deferred, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
+    melpaBuild {
+        pname = "genrnc";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "emacs-genrnc";
+          rev = "da75b1966a73ad215ec2ced4522c25f4d0bf1f9a";
+          sha256 = "08cw1fa25kbhbq2sp1cpn90bz38i9hjfdj93xf6wvki55b52s0nn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/genrnc";
+          sha256 = "1nwbdscl0yh9j1n421can93m6s8j9dkyb3xmpampr6x528g6z0lm";
+          name = "genrnc";
+        };
+        packageRequires = [ concurrent deferred log4e yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/genrnc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    german-holidays = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "german-holidays";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "rudolfochrist";
+          repo = "german-holidays";
+          rev = "8388b3bf5b5c38f9b9fcc9216ca26ef0640c6edc";
+          sha256 = "0344w4sbd6wlgl13j163v0hzjw9nwhvpr5s7658xsdd90wp4i701";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/german-holidays";
+          sha256 = "0fgrxdgyl6va6axjc5l4sp90pyqaz5zha1g73xyhbxblshm5dwxn";
+          name = "german-holidays";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/german-holidays";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ggo-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ggo-mode";
+        version = "20130521";
+        src = fetchFromGitHub {
+          owner = "mkjunker";
+          repo = "ggo-mode";
+          rev = "ea5097f87072309c7b77204888d459d084bf630f";
+          sha256 = "1m9ra9qp7bgf6anfqyn56n3xa9a25ran10k9wd355qknd5skq1zz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ggo-mode";
+          sha256 = "1403x530n90jlfz3lq2vfiqx84cxsrhgs6hhmniq960cjj31q35p";
+          name = "ggo-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ggo-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ggtags = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ggtags";
+        version = "0.8.11";
+        src = fetchFromGitHub {
+          owner = "leoliu";
+          repo = "ggtags";
+          rev = "d4fb6d40b71cad3fd5a2141b8456f27e2b2dc731";
+          sha256 = "1qjh7av046ax4240iw40hv5fc0k23c36my9hili7fp4y2ak99l8n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ggtags";
+          sha256 = "1cmry4knxbx9257ivhfxsd09z07z3g3wjihi99nrwmhb9h4mpqyw";
+          name = "ggtags";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ggtags";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gh = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, logito, melpaBuild, pcache }:
+    melpaBuild {
+        pname = "gh";
+        version = "0.9.2";
+        src = fetchFromGitHub {
+          owner = "sigma";
+          repo = "gh.el";
+          rev = "33b88251e8989069cc08f3f5d6886635f276f42e";
+          sha256 = "0a5v91k9gm9vv15d3m8czicv8n39f0hvqhcr6lfw0w82n26xwsms";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gh";
+          sha256 = "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0";
+          name = "gh";
+        };
+        packageRequires = [ eieio logito pcache ];
+        meta = {
+          homepage = "http://melpa.org/#/gh";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ghc";
+        version = "5.4.0.0";
+        src = fetchFromGitHub {
+          owner = "kazu-yamamoto";
+          repo = "ghc-mod";
+          rev = "edfce196107dbd43958d72c174ad66e4a7d30643";
+          sha256 = "1wiwkp4qcgdwnr4h1bn27hh1kyl2wjlrz2bbfv638y9gzc06rgch";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ghc";
+          sha256 = "0xqriwggd1ahla5aff7k0j4admx6q18rmqsx3ipn4nfk86wrhb8g";
+          name = "ghc";
+        };
+        packageRequires = [ haskell-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/ghc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ghc-imported-from = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ghc-imported-from";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "david-christiansen";
+          repo = "ghc-imported-from-el";
+          rev = "fcff08628a19f5d26151564659218cc677779b79";
+          sha256 = "1ywwyc2kz1c1s26c412nmzh55cinh84cfiazyyi3jsy5zzwhrbhi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ghc-imported-from";
+          sha256 = "10cxz4c341lknyz4ns63bri00mya39278xav12c73if03llsyzy5";
+          name = "ghc-imported-from";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ghc-imported-from";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gist = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gist";
+        version = "1.3.1";
+        src = fetchFromGitHub {
+          owner = "defunkt";
+          repo = "gist.el";
+          rev = "144280f5353bceb902d5278fa64078337e99fa4d";
+          sha256 = "0q3ps5f6mr9hyf6nq1wshcm1z6a5yhskqd7dbbwq5dm78552z6z8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gist";
+          sha256 = "053fl8aw0ram9wsabzvmlm5w2klwd2pgcn2w9r1yqfs4xqja5sd3";
+          name = "gist";
+        };
+        packageRequires = [ emacs gh ];
+        meta = {
+          homepage = "http://melpa.org/#/gist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "git";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "git.el";
+          rev = "8b7f1477ef367b5b7de452589dd9a8ab30150d0a";
+          sha256 = "06ws3x5qa92drmn6rcp502jk2yil6q9gkzdmb2gww9gb2g695wl5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git";
+          sha256 = "1nd2yvfgin13m368gjn7xah99glspnam4g4fh348x4makxcaw8w5";
+          name = "git";
+        };
+        packageRequires = [ dash f s ];
+        meta = {
+          homepage = "http://melpa.org/#/git";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-auto-commit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "git-auto-commit-mode";
+        version = "4.4.0";
+        src = fetchFromGitHub {
+          owner = "ryuslash";
+          repo = "git-auto-commit-mode";
+          rev = "075e5f9ded66c2035581a7b216896556cc586814";
+          sha256 = "0psmr7749nzxln4b500sl3vrf24x3qijp12ir0i5z4x25k72hrlh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-auto-commit-mode";
+          sha256 = "0nf4n63xnzcsizjk1yl8qvqj9wjdqy57kvn6r736xvsxwzd44xgl";
+          name = "git-auto-commit-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/git-auto-commit-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-command = callPackage ({ fetchFromGitHub, fetchurl, git-ps1-mode, lib, melpaBuild, term-run, with-editor }:
+    melpaBuild {
+        pname = "git-command";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "10sr";
+          repo = "git-command-el";
+          rev = "6cc5c17ca3cc1967b5402bb9a0538fb90933428d";
+          sha256 = "0a3ws852ypi34ash39srkwzkfish4n3c5lma10d9xzddjrwapgj9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-command";
+          sha256 = "1hsxak63y6648n0jkzl5ajxg45w84qq8vljvjh0bmwfrbb67kwbg";
+          name = "git-command";
+        };
+        packageRequires = [ git-ps1-mode term-run with-editor ];
+        meta = {
+          homepage = "http://melpa.org/#/git-command";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
+    melpaBuild {
+        pname = "git-commit";
+        version = "2.4.0";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "magit";
+          rev = "2e757a8c919b53edddb186e36e055e011e3b0ab3";
+          sha256 = "0hklwwzi2gqywysxn16ps1fvn48max52cpk2nx7r4df4h52yk6wn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-commit";
+          sha256 = "1i7122fydqga68cilgzir80xfq77hnrw75zrvn52mjymfli6aza2";
+          name = "git-commit";
+        };
+        packageRequires = [ dash emacs with-editor ];
+        meta = {
+          homepage = "http://melpa.org/#/git-commit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "git-gutter";
+        version = "0.85";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-git-gutter";
+          rev = "febe69d909beb407d07dfc1b273ae7b7719fdd7c";
+          sha256 = "1721h4i185wj9nxkb19cnbwk5fwsajaqr54qq9xb669mm4pjn3ra";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-gutter";
+          sha256 = "12yjl9hsd72dwzl42hdcmjfdbxyi356jcq0kz8k7jvcsn57z4p2k";
+          name = "git-gutter";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/git-gutter";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-gutter-fringe = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, fringe-helper, git-gutter, lib, melpaBuild }:
+    melpaBuild {
+        pname = "git-gutter-fringe";
+        version = "0.22";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-git-gutter-fringe";
+          rev = "3efa997ec8330d3e408a225616273d1d40327aec";
+          sha256 = "1cw5x1w14lxy8mqpxdrd9brgps0nig2prjjjda4a19wfsvy3clmv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-gutter-fringe";
+          sha256 = "14wyiyyi2rram2sz3habvmygy5a5m2jfi6x9fqcyfr3vpcjn1k4i";
+          name = "git-gutter-fringe";
+        };
+        packageRequires = [ cl-lib emacs fringe-helper git-gutter ];
+        meta = {
+          homepage = "http://melpa.org/#/git-gutter-fringe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-gutter-fringe-plus = callPackage ({ fetchFromGitHub, fetchurl, fringe-helper, git-gutter-plus, lib, melpaBuild }:
+    melpaBuild {
+        pname = "git-gutter-fringe-plus";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "nonsequitur";
+          repo = "git-gutter-fringe-plus";
+          rev = "ce9d594c0189e78d78df26a0c26bbcf886e373cd";
+          sha256 = "1c7ijbpa7xw831k55cdm2gl8r597rxnp22jcmqnfpwqkqmk48ln9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-gutter-fringe+";
+          sha256 = "1zkjb8p08cq2nqskn79rjszlhp9mrblplgamgi66yskz8qb1bgcc";
+          name = "git-gutter-fringe-plus";
+        };
+        packageRequires = [ fringe-helper git-gutter-plus ];
+        meta = {
+          homepage = "http://melpa.org/#/git-gutter-fringe+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-gutter-plus = callPackage ({ fetchFromGitHub, fetchurl, git-commit, lib, melpaBuild }:
+    melpaBuild {
+        pname = "git-gutter-plus";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "nonsequitur";
+          repo = "git-gutter-plus";
+          rev = "f8daebb6569bb116086d8653da3505382e03d940";
+          sha256 = "101hracd77mici778x3ixwrcicd6fqkcr9z76kapkr0dq5z42yjb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-gutter+";
+          sha256 = "1w78p5cz6kyl9kmndgvwnfrs80ha707s8952hycrihgfb6lixmp0";
+          name = "git-gutter-plus";
+        };
+        packageRequires = [ git-commit ];
+        meta = {
+          homepage = "http://melpa.org/#/git-gutter+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "git-lens";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "pidu";
+          repo = "git-lens";
+          rev = "1feacc217c58fd4a41f9378eb09658f664036509";
+          sha256 = "0s1adgsigaq47vx8bfbmr5z8jq9y230ykwbw0jqka61n4ibg9ish";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-lens";
+          sha256 = "1vv3s89vk5ncinqh2f724z0qbbzp8g4y5y670ryy56w1l6v2acfb";
+          name = "git-lens";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/git-lens";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "git-link";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "sshaw";
+          repo = "git-link";
+          rev = "8ed8f209fe40b3852613691bd968484d6da79e5b";
+          sha256 = "171w8vx1r2v9yclnlk3mwbfaxhg0kbvk575jvi6vr9shpjqnrb0z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-link";
+          sha256 = "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7";
+          name = "git-link";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/git-link";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-messenger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "git-messenger";
+        version = "0.16";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-git-messenger";
+          rev = "c45cdd9805d52a82bdd23907bd0f91dc7760d78d";
+          sha256 = "139yivbxdpmv8j6qz406769b040nbmj3j8r28n9gqy54zlwblgv8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-messenger";
+          sha256 = "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn";
+          name = "git-messenger";
+        };
+        packageRequires = [ cl-lib popup ];
+        meta = {
+          homepage = "http://melpa.org/#/git-messenger";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-ps1-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "git-ps1-mode";
+        version = "0.2.2";
+        src = fetchFromGitHub {
+          owner = "10sr";
+          repo = "git-ps1-mode-el";
+          rev = "288e5c4d0ff20a4e1ac9e72b6af632f67f1d7525";
+          sha256 = "1hyq3il03cm6apfawps60r4km8r6pw0vphzba30smsqfk50z3ya3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-ps1-mode";
+          sha256 = "15gswi9s0m3hrsl1qqyjnjgbglsai95klbdp51h3pcq7zj22wkn6";
+          name = "git-ps1-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/git-ps1-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-timemachine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "git-timemachine";
+        version = "2.8";
+        src = fetchFromGitHub {
+          owner = "pidu";
+          repo = "git-timemachine";
+          rev = "87804bbf6e633f42a48567f21bca52019632f64f";
+          sha256 = "1fq9lzn8vvjh0ayl5h0lywxr6zfg3k41xa66vqrf1hdan3a7ax1j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-timemachine";
+          sha256 = "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq";
+          name = "git-timemachine";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/git-timemachine";
+          license = lib.licenses.free;
+        };
+      }) {};
+    git-wip-timemachine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "git-wip-timemachine";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "itsjeyd";
+          repo = "git-wip-timemachine";
+          rev = "7da7f2acec0b1d1252d7474b13190ae88e5b205d";
+          sha256 = "0igawn43i81icshimj5agv33ab120hd6182knlrn3i46p7lcs3lx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-wip-timemachine";
+          sha256 = "02fi51k6l23cgnwjp507ylkiwb8azmnhc0fips68nwn9dghzp6dw";
+          name = "git-wip-timemachine";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "http://melpa.org/#/git-wip-timemachine";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gitattributes-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gitattributes-mode";
+        version = "1.2.0";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "git-modes";
+          rev = "9d8f6eda6ee97963e4085da8988cad2c0547b8df";
+          sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitattributes-mode";
+          sha256 = "1gjs0pjh6ap0h54savamzx94lq6vqrg58jxqaq5n5qplrbg15a6x";
+          name = "gitattributes-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gitattributes-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gitconfig = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gitconfig";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "tonini";
+          repo = "gitconfig.el";
+          rev = "6c313a39e20702ddcebc12d146f69db1ce668901";
+          sha256 = "0j0w6ywhiapmx7dk20yw3zgf8803kmccnjsr664am3g85kbb644v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitconfig";
+          sha256 = "126znl1c4vwgskj7ka9id8v2bdrdn5nkyx3mmc6cz9ylc27ainm7";
+          name = "gitconfig";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gitconfig";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gitconfig-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gitconfig-mode";
+        version = "1.2.0";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "git-modes";
+          rev = "9d8f6eda6ee97963e4085da8988cad2c0547b8df";
+          sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitconfig-mode";
+          sha256 = "0hqky40kcgxdnghnf56gpi0xp7ik45ssia1x84v0mvfwqc50dgn1";
+          name = "gitconfig-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gitconfig-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    github-browse-file = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "github-browse-file";
+        version = "0.5.0";
+        src = fetchFromGitHub {
+          owner = "osener";
+          repo = "github-browse-file";
+          rev = "fa5cc00a40869430fb44596792961a4cddf9c265";
+          sha256 = "07vgnmfn0kbg3h3vhf3xk443yi1b55761x881xlmw9sr9nraa578";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/github-browse-file";
+          sha256 = "03xvgxlw7wmfby898din7dfcg87ihahkhlav1n7qklw6qi7skjcr";
+          name = "github-browse-file";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/github-browse-file";
+          license = lib.licenses.free;
+        };
+      }) {};
+    github-clone = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "github-clone";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "dgtized";
+          repo = "github-clone.el";
+          rev = "ab048cf49d9ebda73acae803bc44e731e629d540";
+          sha256 = "18c169nxvdl7iv18pyqx690ldg6pkc8njaxdg1cww6ykqzqnfxh7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/github-clone";
+          sha256 = "0ffrm4lmcj3d9kx3g2d5xbiih7hn4frs0prjrvcjq8acvsbc50q9";
+          name = "github-clone";
+        };
+        packageRequires = [ emacs gh magit ];
+        meta = {
+          homepage = "http://melpa.org/#/github-clone";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gitignore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gitignore-mode";
+        version = "1.2.0";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "git-modes";
+          rev = "9d8f6eda6ee97963e4085da8988cad2c0547b8df";
+          sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitignore-mode";
+          sha256 = "1i98ribmnxr4hwphd95f9hcfm5wfwgdbcxw3g0w17ws7z0ir61mn";
+          name = "gitignore-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gitignore-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
+    melpaBuild {
+        pname = "gitlab";
+        version = "0.7.0";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "emacs-gitlab";
+          rev = "90be6027eb59a967e5bbceaa5f32c098472ca245";
+          sha256 = "1hc7j3gwljb1wk2727f66m3f7ga4icbklp54vlm0vf2bmii1ynil";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitlab";
+          sha256 = "0vxsqfnipgapnd2ijvdnkspk68dlnki3pkpkzg2h6hyazmzrsqnq";
+          name = "gitlab";
+        };
+        packageRequires = [ dash pkg-info request s ];
+        meta = {
+          homepage = "http://melpa.org/#/gitlab";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gmail-message-mode = callPackage ({ fetchFromGitHub, fetchurl, ham-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gmail-message-mode";
+        version = "1.3.2";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "gmail-mode";
+          rev = "2e0286e4a3c80889692f8da63a3b15d7a96abdea";
+          sha256 = "0j3pay3gd1wdnpc853gy5j68hbavrwy6cc2bgmd12ag29xki3hcg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gmail-message-mode";
+          sha256 = "0py0i7b893ihb8l1hmk3jfl0xil450znadcd18q7svr3zl2m0gkk";
+          name = "gmail-message-mode";
+        };
+        packageRequires = [ ham-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/gmail-message-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gmail2bbdb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gmail2bbdb";
+        version = "0.0.4";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "gmail2bbdb";
+          rev = "2043fb8ee90c119b13bc8caf85fdf0a05f494b98";
+          sha256 = "0p6n52m3y56nx7chwvmnslrnwc0xmh4fmmlkbkfz9n58hlmw8x1x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gmail2bbdb";
+          sha256 = "03jhrk4vpjim3ybzjxy7s9r1cgjysj9vlc4criz5k0w7vqz3r28j";
+          name = "gmail2bbdb";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gmail2bbdb";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gmpl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gmpl-mode";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "gmpl-mode";
+          rev = "25d20f9d24594e85cb6f80d35d7c73b7e82cbc71";
+          sha256 = "0x0a94bfkk72kqyr5m6arx450qsg1axmp5r0c4r9m84z8j08r4v1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gmpl-mode";
+          sha256 = "1f60xim8h85jmqpvgfg402ff8mjd66gla8fa0cwi7l18ijnjblpz";
+          name = "gmpl-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gmpl-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gnome-calendar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gnome-calendar";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "NicolasPetton";
+          repo = "gnome-calendar.el";
+          rev = "58c3a3c32aff9901c679bdf9091ed934897b84a0";
+          sha256 = "160qm8xf0yghygb52p8cykhb5vpg9ww3gjprcdkcxplr4b230nnc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnome-calendar";
+          sha256 = "00clamlm5b42zqggxywdqrf6s2dnsxir5rpd8mjpyc502kqmsfn6";
+          name = "gnome-calendar";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gnome-calendar";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gntp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gntp";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "tekai";
+          repo = "gntp.el";
+          rev = "767571135e2c0985944017dc59b0be79af222ef5";
+          sha256 = "1nvyjjjydrimpxy4cpg90si7sr8lmldbhlcm2mx8npklp9pn5y3a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gntp";
+          sha256 = "1ywj3p082g54dcpy8q4jnkqfr12npikx8yz14r0njxdlr0janh4f";
+          name = "gntp";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gntp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gnuplot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gnuplot";
+        version = "0.7.0";
+        src = fetchFromGitHub {
+          owner = "bruceravel";
+          repo = "gnuplot-mode";
+          rev = "aefd4f671485fbcea42511ce79a7a60e5e0110a3";
+          sha256 = "0bwri3cvm2vr27kyqkrddm28fs08axnd4nm9amfgp54xp20bn4yn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnuplot";
+          sha256 = "06c5gqf02fkra8c52xck1lqvf4yg45zfibyf9zqmnbwk7p2jxrds";
+          name = "gnuplot";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gnuplot";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gnus-desktop-notify = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gnus-desktop-notify";
+        version = "1.4";
+        src = fetchFromGitHub {
+          owner = "wavexx";
+          repo = "gnus-desktop-notify";
+          rev = "210c70f0021ee78e724f1d8e00ca96e1e99928ca";
+          sha256 = "08j8x0iaz5s9q0b68d8h3153w0z6vak5l8qgw3dd1drz5p9xnvyw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnus-desktop-notify";
+          sha256 = "0hf2dszk5d7vn80bm0msaqv7iji384n85dxgw8ng64c0f9f6752b";
+          name = "gnus-desktop-notify";
+        };
+        packageRequires = [ gnus ];
+        meta = {
+          homepage = "http://melpa.org/#/gnus-desktop-notify";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gnus-x-gm-raw = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
+    melpaBuild {
+        pname = "gnus-x-gm-raw";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "gnus-x-gm-raw";
+          rev = "978bdfcecc8844465b71641c2e909fcdc66b22be";
+          sha256 = "1i3f67x2l9l5c5agspbkxr2mmh3rpq3009d8yzh6r1lih0b4hril";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnus-x-gm-raw";
+          sha256 = "1a5iccghzqmcndql2bppvr48535sf6jbvc83iypr1031z1b5k4wg";
+          name = "gnus-x-gm-raw";
+        };
+        packageRequires = [ log4e yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/gnus-x-gm-raw";
+          license = lib.licenses.free;
+        };
+      }) {};
+    go-autocomplete = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "go-autocomplete";
+        version = "20150303";
+        src = fetchFromGitHub {
+          owner = "nsf";
+          repo = "gocode";
+          rev = "eef10fdde96a12528a6da32f51bf638b2863a3b1";
+          sha256 = "03snnra31b5j6iy94gql240vhkynbjql9b4b5j8bsqp9inmbsia3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-autocomplete";
+          sha256 = "1ldsq81a167dk2r2mvzyp3v3j2mxc4l9p6b12i7pv8zrjlkhma5a";
+          name = "go-autocomplete";
+        };
+        packageRequires = [ auto-complete ];
+        meta = {
+          homepage = "http://melpa.org/#/go-autocomplete";
+          license = lib.licenses.free;
+        };
+      }) {};
+    go-direx = callPackage ({ cl-lib ? null, direx, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "go-direx";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-go-direx";
+          rev = "aecb9fef4d56d04d230d37c75c260c8392b5ad9f";
+          sha256 = "05yc0nylg3457an5j7yp3x23157j0hbi21qhcpgsa01144mwnwln";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-direx";
+          sha256 = "0dq5d7fsld4hww8fl68c18qp6fl3781dqqwd98cg68bihw2wwni7";
+          name = "go-direx";
+        };
+        packageRequires = [ cl-lib direx ];
+        meta = {
+          homepage = "http://melpa.org/#/go-direx";
+          license = lib.licenses.free;
+        };
+      }) {};
+    go-eldoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "go-eldoc";
+        version = "0.26";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-go-eldoc";
+          rev = "af6bfdcbcf12c240da46412efb381a5ee6c3aec5";
+          sha256 = "0ha07nhd2g43l84r1r5dz6c8m3fmmn4bx5mhvi6as33achhip7bn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-eldoc";
+          sha256 = "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk";
+          name = "go-eldoc";
+        };
+        packageRequires = [ cl-lib go-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/go-eldoc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    go-errcheck = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "go-errcheck";
+        version = "1.1.2";
+        src = fetchFromGitHub {
+          owner = "dominikh";
+          repo = "go-errcheck.el";
+          rev = "1b0cd6af048a8b2074ace14ab51fb6c987beb430";
+          sha256 = "1fm6xd3vsi8mqh0idddjpfxlsmz1ljmjppw3qkxl1vr0qz3598k3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-errcheck";
+          sha256 = "11a75h32cd5h5xjv30x83k60s49k9fhgis31358q46y2gbvqp5bs";
+          name = "go-errcheck";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/go-errcheck";
+          license = lib.licenses.free;
+        };
+      }) {};
+    go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "go-mode";
+        version = "1.3.1";
+        src = fetchFromGitHub {
+          owner = "dominikh";
+          repo = "go-mode.el";
+          rev = "dce210fdde620bed3d179816fda79dc83a66b8de";
+          sha256 = "1qqsck11v3ki18qld7hrb7dis60c2ylmq15s7srsppzwil8wm3fx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-mode";
+          sha256 = "1852zjxandmq0cpbf7m56ar3rbdi7bx613gdgsf1bg8hsdvkgzfx";
+          name = "go-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/go-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    go-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "go-scratch";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "shosti";
+          repo = "go-scratch.el";
+          rev = "3f68cbcce04f59eb8e83af109164731ec0454be0";
+          sha256 = "1a6vg2vwgnafb61pwrd837fwlq5gs80wawbzjsnykawnmcaag8pm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-scratch";
+          sha256 = "11ahvmxbh67wa39cymymxmcpkq0kcn5jz0rrvazjy2p1hx3x1ma5";
+          name = "go-scratch";
+        };
+        packageRequires = [ emacs go-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/go-scratch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    golden-ratio = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "golden-ratio";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "roman";
+          repo = "golden-ratio.el";
+          rev = "79b1743fc1a2f3462445e9ddd0a869f30065bb6d";
+          sha256 = "00igv83hiyx7x3pf2grmjpd379brn33fm85f05k104mkkrhg99nm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/golden-ratio";
+          sha256 = "15fkrv0sgpzmnw2h4fp2gb83d8s42khkfq1h76l241njjayk1f81";
+          name = "golden-ratio";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/golden-ratio";
+          license = lib.licenses.free;
+        };
+      }) {};
+    google-this = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "google-this";
+        version = "1.10";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "emacs-google-this";
+          rev = "879ab00f6b5584cfe327eb1c04cd9ff2323b3b11";
+          sha256 = "0j31062zfqmcd0zsbp19f3h7gq7dn78sg4xf2x838sr9421x6w8x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/google-this";
+          sha256 = "0hg9y1b03aiamyn3mam3hyxmxy21wygxrnrww91zcbwlzgp4dd2c";
+          name = "google-this";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/google-this";
+          license = lib.licenses.free;
+        };
+      }) {};
+    google-translate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "google-translate";
+        version = "0.11.5";
+        src = fetchFromGitHub {
+          owner = "atykhonov";
+          repo = "google-translate";
+          rev = "109024fe437c3484160e82eb775343bc149a4446";
+          sha256 = "0hvxyqkxv5hfsa9sv71m7d98g25a1xc962r961nw6vmbvsf64z6b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/google-translate";
+          sha256 = "1crgzdd32mk6hrawdypg496dwh51wzwfb5wqw4a2j5l8y958xf47";
+          name = "google-translate";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/google-translate";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "gotest";
+        version = "0.9.0";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "gotest.el";
+          rev = "ab0da939aad5cec301126c59b7718cd3158b3233";
+          sha256 = "1b6zn1fmqvfb7bcpmhzkgcy5003dl22w3f293arlsd1xkbjgkxa2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gotest";
+          sha256 = "1kan3gykhci33jgg67jjiiz7rqlz5mpxp8sh6mb0n6kpfmgb4ly9";
+          name = "gotest";
+        };
+        packageRequires = [ emacs f go-mode s ];
+        meta = {
+          homepage = "http://melpa.org/#/gotest";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gotham-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gotham-theme";
+        version = "1.1.5";
+        src = fetchFromGitHub {
+          owner = "wasamasa";
+          repo = "gotham-theme";
+          rev = "d41b0ea37ad5a4d0060ea05e25d80581f113b662";
+          sha256 = "0pxzi56lw9ry91f70hjnvrsbyhcaqknlwicjjbhf6rhv57fplw8h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gotham-theme";
+          sha256 = "0jars6rvf7hkyf71vq06mqki1r840i1dvv43dissqjg5i4lr79cl";
+          name = "gotham-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gotham-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    goto-gem = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "goto-gem";
+        version = "1.2";
+        src = fetchFromGitHub {
+          owner = "pidu";
+          repo = "goto-gem";
+          rev = "6f5bd405c096ef879fed1298c09d0daa0bae5dac";
+          sha256 = "188q7jr1y872as3w32m8lf6vwl2by1ibgdk6zk7dhpcjwd0ik7x7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/goto-gem";
+          sha256 = "06vy9m01qccvahxr5xn0plzw9knl5ig7gi5q5r1smfx92bmzkg3a";
+          name = "goto-gem";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "http://melpa.org/#/goto-gem";
+          license = lib.licenses.free;
+        };
+      }) {};
+    goto-last-change = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "goto-last-change";
+        version = "1.2.1";
+        src = fetchFromGitHub {
+          owner = "camdez";
+          repo = "goto-last-change.el";
+          rev = "58b0928bc255b47aad318cd183a5dce8f62199cc";
+          sha256 = "1f0zlvva7d7iza1v79yjp0bm7vd011q4cy14g1saryll32z115z5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/goto-last-change";
+          sha256 = "1yl9p95ls04bkmf4d6az72pycp27bv7q7wxxzvj8sj97bgwvwajx";
+          name = "goto-last-change";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/goto-last-change";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gradle-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "gradle-mode";
+        version = "0.5.5";
+        src = fetchFromGitHub {
+          owner = "jacobono";
+          repo = "emacs-gradle-mode";
+          rev = "579de06674551919cddac9cfe42129f4fb0155c9";
+          sha256 = "0k86lrb55d701nj6pvlw3kjp1dcd3lzfya0hv6q56c529y69d782";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gradle-mode";
+          sha256 = "0lx9qi93wmiy9pxjxqp68scbcb4bx88b6jiqk3y8jg5cajizh24g";
+          name = "gradle-mode";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "http://melpa.org/#/gradle-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    grails-projectile-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+    melpaBuild {
+        pname = "grails-projectile-mode";
+        version = "1.1.1";
+        src = fetchFromGitHub {
+          owner = "yveszoundi";
+          repo = "grails-projectile-mode";
+          rev = "e6667dc737cdb224bbadc70a5fcfb82d0fce6f8f";
+          sha256 = "1rv6klh59y70shc7kwdzlksdzmy0881ss49c0h5m93cn5pd6aj1l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grails-projectile-mode";
+          sha256 = "0dy8v2mila7ccvb7j5jlfkhfjsjfk3bm3rcy84m0rgbqjai67amn";
+          name = "grails-projectile-mode";
+        };
+        packageRequires = [ cl-lib emacs projectile ];
+        meta = {
+          homepage = "http://melpa.org/#/grails-projectile-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    grandshell-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "grandshell-theme";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "steckerhalter";
+          repo = "grandshell-theme";
+          rev = "6bf34fb1a3117244629a7fb23daf610f50854bed";
+          sha256 = "1202fwwwdr74q6s5jv1n0mvmq4n9mra85l14hdhwh2kks513s6vs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grandshell-theme";
+          sha256 = "1mnnjsw1kx40b6ws8wmk25fz9rq8rd70xia9cjpwdfkg7kh8xvsa";
+          name = "grandshell-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/grandshell-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    graphene = callPackage ({ company, dash, exec-path-from-shell, fetchFromGitHub, fetchurl, flycheck, graphene-meta-theme, ido-ubiquitous, lib, melpaBuild, ppd-sr-speedbar, smartparens, smex, sr-speedbar, web-mode }:
+    melpaBuild {
+        pname = "graphene";
+        version = "0.9.5";
+        src = fetchFromGitHub {
+          owner = "rdallasgray";
+          repo = "graphene";
+          rev = "dcc0e34c6c4632d5d5445ec023f5b1ca04c7d1b7";
+          sha256 = "1f34bhjxmbf2jjrkpdvqg2gwp83ka6d5vrxmsxdl3r57yc6rbrwa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/graphene";
+          sha256 = "1wz3rvd8b7gx5d0k7yi4dd69ax5bybcm10vdc7xp4yn296lmyl9k";
+          name = "graphene";
+        };
+        packageRequires = [
+          company
+          dash
+          exec-path-from-shell
+          flycheck
+          graphene-meta-theme
+          ido-ubiquitous
+          ppd-sr-speedbar
+          smartparens
+          smex
+          sr-speedbar
+          web-mode
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/graphene";
+          license = lib.licenses.free;
+        };
+      }) {};
+    graphene-meta-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "graphene-meta-theme";
+        version = "0.0.2";
+        src = fetchFromGitHub {
+          owner = "rdallasgray";
+          repo = "graphene-meta-theme";
+          rev = "5d848233ac91c1e3560160a4eba60944f5837d35";
+          sha256 = "1bidfn4x5lb6dylhadyf05g4l2k7jg83mi058cmv76av1glawk17";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/graphene-meta-theme";
+          sha256 = "1cqdr93lccdpxkzgap3r3qc92dh8vqgdlnxvqkw7lrcbs31fvf3q";
+          name = "graphene-meta-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/graphene-meta-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    graphviz-dot-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "graphviz-dot-mode";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "ppareit";
+          repo = "graphviz-dot-mode";
+          rev = "7301cc276206b6995d265bcb9eb308bb83c760be";
+          sha256 = "1zk664ilyz14p11csmqgzs73gx08hy32h3pnyymzqkavmgb6h3s0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/graphviz-dot-mode";
+          sha256 = "04rkynsrsk6w4sxn1pc0b9b6pij1p7yraywbrk7qvv05fv69kri2";
+          name = "graphviz-dot-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/graphviz-dot-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    grapnel = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "grapnel";
+        version = "0.5.3";
+        src = fetchFromGitHub {
+          owner = "leathekd";
+          repo = "grapnel";
+          rev = "7387234eb3f0285a490fddb1e06a4bf029719fb7";
+          sha256 = "0xcj1kqzgxifhrhpl9j2nfpnkd6213ix5z7f97269v3inpzaiyf5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grapnel";
+          sha256 = "019cdx1wdx8sc2ibqwgp1akgckzxxvrayyp2sv806gha0kn6yf6r";
+          name = "grapnel";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/grapnel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    grass-mode = callPackage ({ cl-lib ? null, dash, fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "grass-mode";
+        version = "0.1";
+        src = fetchhg {
+          url = "https://bitbucket.com/tws/grass-mode.el";
+          rev = "aa8cc5eff764";
+          sha256 = "0djv2ps2ahw9b1b5i45hgy7l7cch7cgh7rzq601c0r6vi7gm2ac5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grass-mode";
+          sha256 = "1lq6bk4bwgcy4ra3d9rlca3fk87ydg7xnnqcqjg0pw4m9xnr3f7v";
+          name = "grass-mode";
+        };
+        packageRequires = [ cl-lib dash ];
+        meta = {
+          homepage = "http://melpa.org/#/grass-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    grin = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "grin";
+        version = "1.0";
+        src = fetchhg {
+          url = "https://bitbucket.com/dariusp686/emacs-grin";
+          rev = "f541aa22da52";
+          sha256 = "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grin";
+          sha256 = "0mvzwmws5pi6hpzgkc43fjxs98ngkr0jvqbclza2jbbqawifzzbk";
+          name = "grin";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/grin";
+          license = lib.licenses.free;
+        };
+      }) {};
+    grizzl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "grizzl";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "d11wtq";
+          repo = "grizzl";
+          rev = "c775de1c34d1e5a374e2f40c1ae2396b4b003fe7";
+          sha256 = "1bq73kcx744xnlm2yvccrzlbyx91c492sg7blx2a9z643v3gg1zs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grizzl";
+          sha256 = "1klds0w9qrsgfppq105qr69c26zi91y575db2hxr6h9vypf2rq24";
+          name = "grizzl";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/grizzl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gruber-darker-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gruber-darker-theme";
+        version = "0.6";
+        src = fetchFromGitHub {
+          owner = "rexim";
+          repo = "gruber-darker-theme";
+          rev = "0c08d77e615aceb9e6e1ca66b1fbde275200cfe4";
+          sha256 = "14h0rcd3nkw3pmx8jwip20p6rzl9qdkip5g52gfjjbqfvaffsrkd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gruber-darker-theme";
+          sha256 = "0vn4msixb77xj6p5mlfchjyyjhzah0lcmp0z82s8849zd194fxqi";
+          name = "gruber-darker-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gruber-darker-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    grunt = callPackage ({ ansi-color ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "grunt";
+        version = "1.3.2";
+        src = fetchFromGitHub {
+          owner = "gempesaw";
+          repo = "grunt.el";
+          rev = "e27dbb6b3de9b36c7fb28f69aa06b4b2ea32d4b9";
+          sha256 = "0zpmhjwj64s72iv3dgsy07pfh20f25ngsy3pszmlrfkxk0926d8k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grunt";
+          sha256 = "1qdzqcrff9x97kyy0d4j636d5i751qja10liw8i0lf4lk6n0lywz";
+          name = "grunt";
+        };
+        packageRequires = [ ansi-color dash ];
+        meta = {
+          homepage = "http://melpa.org/#/grunt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    gscholar-bibtex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "gscholar-bibtex";
+        version = "0.3.1";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "gscholar-bibtex";
+          rev = "00b32521de3aa689bc58516ae10ba7f3ef1b6c92";
+          sha256 = "1dfd22629gz0c8r4wplvbn0n7bm20549mg5chq289s826ca0kxqk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gscholar-bibtex";
+          sha256 = "0d41gr9amf9vdn9pl9lamhp2swqllxslv9r3wsgzqvjl7zayd1az";
+          name = "gscholar-bibtex";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/gscholar-bibtex";
+          license = lib.licenses.free;
+        };
+      }) {};
+    guide-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }:
+    melpaBuild {
+        pname = "guide-key";
+        version = "1.2.5";
+        src = fetchFromGitHub {
+          owner = "kai2nenobu";
+          repo = "guide-key";
+          rev = "626f3aacfe4561eddc46617570426246b88e9cab";
+          sha256 = "1bmcvn8a7g9ahpv2fww673hx9pa7nnrj9kpljq65azf61vq2an2g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/guide-key";
+          sha256 = "0zjrdvppcg8b2k6hfdj45rswc1ks9xgimcr2yvgpc8prrwk1yjsf";
+          name = "guide-key";
+        };
+        packageRequires = [ popwin ];
+        meta = {
+          homepage = "http://melpa.org/#/guide-key";
+          license = lib.licenses.free;
+        };
+      }) {};
+    guide-key-tip = callPackage ({ fetchFromGitHub, fetchurl, guide-key, lib, melpaBuild, pos-tip }:
+    melpaBuild {
+        pname = "guide-key-tip";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "guide-key-tip";
+          rev = "e08b2585228529aeaae5e0ae0948f898e83a6200";
+          sha256 = "040mcfhj2gggp8w1pgip7rxb1bnb23rxlm02wl6x1qv5i0q7g5x3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/guide-key-tip";
+          sha256 = "0h2vkkbxq361dkn6irm1v19qj7bkhxcjljiksd5wwlq5zsq6bd06";
+          name = "guide-key-tip";
+        };
+        packageRequires = [ guide-key pos-tip ];
+        meta = {
+          homepage = "http://melpa.org/#/guide-key-tip";
+          license = lib.licenses.free;
+        };
+      }) {};
+    guru-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "guru-mode";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "bbatsov";
+          repo = "guru-mode";
+          rev = "62a9a0025249f2f8866b94683c4114c39f48e1fa";
+          sha256 = "1y46qd9cgkfb0wp2cvksjncyp77hd2jnr4bm4zafqirc3qhbysx0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/guru-mode";
+          sha256 = "0j25nxs3ndybq1ik36qyqdprmhav4ba8ny7v2z61s23id8hz3xjs";
+          name = "guru-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/guru-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hackernews = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hackernews";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "clarete";
+          repo = "hackernews.el";
+          rev = "97b178acfa26b929fc23177b25fb0c62d2958e32";
+          sha256 = "1ffk39lnmg9gfffkaj595p768d1p99q6sqym5g5ch6fmi6cx3a84";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hackernews";
+          sha256 = "1x1jf5gkhmpiby5rmy0sziywh6c1f1n0p4f6dlz6ifbwns7har6a";
+          name = "hackernews";
+        };
+        packageRequires = [ json ];
+        meta = {
+          homepage = "http://melpa.org/#/hackernews";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ham-mode = callPackage ({ fetchFromGitHub, fetchurl, html-to-markdown, lib, markdown-mode, melpaBuild }:
+    melpaBuild {
+        pname = "ham-mode";
+        version = "1.1.2";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "ham-mode";
+          rev = "3a141986a21c2aa6eefb428983352abb8b7907d2";
+          sha256 = "0d3xmagl18pas19zbpg27j0lmdiry23df48z4vkjsrcllqg25v5g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ham-mode";
+          sha256 = "000qrdby7d6zmp5066vs4gjlc9ik0ybrgcwzcbfgxb16w1g9xpmz";
+          name = "ham-mode";
+        };
+        packageRequires = [ html-to-markdown markdown-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/ham-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    haml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
+    melpaBuild {
+        pname = "haml-mode";
+        version = "3.1.9";
+        src = fetchFromGitHub {
+          owner = "nex3";
+          repo = "haml-mode";
+          rev = "5e0baf7b795b9e41ac03b55f8feff6b51027c43b";
+          sha256 = "0fmr7ji8x5ki9fzybpbg3xbhzws6n7ffk7d0zf9jl1x3jd8d6988";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haml-mode";
+          sha256 = "0ih0m7zr6kgn6zd45zbp1jgs1ydc5i5gmq6l080wma83v5w1436f";
+          name = "haml-mode";
+        };
+        packageRequires = [ ruby-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/haml-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hardcore-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hardcore-mode";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "hardcore-mode.el";
+          rev = "5ab75594a7a0ca236e2ac87882ee439ff6155d96";
+          sha256 = "08l6p9n2ggg4filad1k663qc2gjgfbia4knnnif4sw7h92yb31jl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hardcore-mode";
+          sha256 = "1bgi1acpw4z7i03d0i8mrd2hpjn6hyvkdsk0ks9q380yp9mqmiwd";
+          name = "hardcore-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hardcore-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hardhat = callPackage ({ fetchFromGitHub, fetchurl, ignoramus, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hardhat";
+        version = "0.4.4";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "hardhat";
+          rev = "fa42fa4a07dc59f253950c5a8aa5257263a41cdf";
+          sha256 = "0mbdnsm903s380ajjgjjqa0m4mxsddzqfjdafrngy0pxgs16iv1f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hardhat";
+          sha256 = "16pdbpm647ag9cadmdm75nwwyzrqsd9y1b4zgkl3pg669mi5vl5z";
+          name = "hardhat";
+        };
+        packageRequires = [ ignoramus ];
+        meta = {
+          homepage = "http://melpa.org/#/hardhat";
+          license = lib.licenses.free;
+        };
+      }) {};
+    haskell-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "haskell-emacs";
+        version = "3.1.2";
+        src = fetchFromGitHub {
+          owner = "knupfer";
+          repo = "haskell-emacs";
+          rev = "f242ac4d0312aee5d162be82ae14b7154bb0db19";
+          sha256 = "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-emacs";
+          sha256 = "1wkh7qws35c32hha0p9rpjz5pls2844920nh919lvp2wmq9l6jd6";
+          name = "haskell-emacs";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/haskell-emacs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    haskell-emacs-base = callPackage ({ fetchFromGitHub, fetchurl, haskell-emacs, lib, melpaBuild }:
+    melpaBuild {
+        pname = "haskell-emacs-base";
+        version = "3.1.2";
+        src = fetchFromGitHub {
+          owner = "knupfer";
+          repo = "haskell-emacs";
+          rev = "f242ac4d0312aee5d162be82ae14b7154bb0db19";
+          sha256 = "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-emacs-base";
+          sha256 = "1fwkds6qyhbxxdgxfzmgd7dlcxr08ynrrg5jdp9r7f924pd536vb";
+          name = "haskell-emacs-base";
+        };
+        packageRequires = [ haskell-emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/haskell-emacs-base";
+          license = lib.licenses.free;
+        };
+      }) {};
+    haskell-emacs-text = callPackage ({ fetchFromGitHub, fetchurl, haskell-emacs, lib, melpaBuild }:
+    melpaBuild {
+        pname = "haskell-emacs-text";
+        version = "3.1.2";
+        src = fetchFromGitHub {
+          owner = "knupfer";
+          repo = "haskell-emacs";
+          rev = "f242ac4d0312aee5d162be82ae14b7154bb0db19";
+          sha256 = "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-emacs-text";
+          sha256 = "1j18fhhra6lv32xrq8jc6l8i56fgn68da81wymcimpmpbp0hl5fy";
+          name = "haskell-emacs-text";
+        };
+        packageRequires = [ haskell-emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/haskell-emacs-text";
+          license = lib.licenses.free;
+        };
+      }) {};
+    haskell-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "haskell-mode";
+        version = "13.16";
+        src = fetchFromGitHub {
+          owner = "haskell";
+          repo = "haskell-mode";
+          rev = "ea81bbb966a839527a786739b7628fd9cd777456";
+          sha256 = "1gmpmfkr54sfzrif87zf92a1i13wx75bhp66h1rxhflg216m62yv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-mode";
+          sha256 = "0wijvcpfdbl17iwzy47vf8brkj2djarfr8y28rw0wqvbs381zzwp";
+          name = "haskell-mode";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/haskell-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    haskell-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "haskell-snippets";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "haskell";
+          repo = "haskell-snippets";
+          rev = "bcf12cf33a67ddc2f023a55072859e637fe4fa25";
+          sha256 = "0b3d7rvqvvcsp51aqfhl0zg9zg8j0p6vlfvga6jp9xc7626vh6f6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-snippets";
+          sha256 = "10bvv7q694fahcpm83v8lpqihg1gvfzrp1hdzwiffxydfvdbalh2";
+          name = "haskell-snippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/haskell-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    haskell-tab-indent = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "haskell-tab-indent";
+        version = "0.1.0";
+        src = fetchgit {
+          url = "https://git.spwhitton.name/haskell-tab-indent";
+          rev = "38d50e9bb8f64ba13ffbd9bcff32db820403a0fc";
+          sha256 = "02786f437bbbbb221c9c810a8d110bb4af172b986733ac35c932b18b38af7201";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-tab-indent";
+          sha256 = "0vdfmy56w5yi202nbd28v1bzj97v1wxnfnb5z3dh9687p2abgnr7";
+          name = "haskell-tab-indent";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/haskell-tab-indent";
+          license = lib.licenses.free;
+        };
+      }) {};
+    haxor-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "haxor-mode";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "krzysztof-magosa";
+          repo = "haxor-mode";
+          rev = "5a85955b64820a0e126ee0bd7954ef5b102dde93";
+          sha256 = "14m8z13nvfqqgx40vzzbn0z9crwi3hhacmk1zfbv9cmhs95dwy6l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haxor-mode";
+          sha256 = "1y4m058whdqnkkf9s6hzi0h6w0fc8ajfawhpjj0wqjam4adnfkq5";
+          name = "haxor-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/haxor-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hcl-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hcl-mode";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-hcl-mode";
+          rev = "f9757d4122d75ffdff92c97ec9e75694506caba5";
+          sha256 = "15h1wkl1d9f2xfhm0nffqicg31rw7z2q0sizjphys9ljgxm43is4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hcl-mode";
+          sha256 = "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin";
+          name = "hcl-mode";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/hcl-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm";
+        version = "1.9.1";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm";
+          rev = "fe96a398aa09ed0d25f6782efa5833085aa63791";
+          sha256 = "0awr4nvzgp1kckxqli1xw4pk16gc22i8hchin63fqvk0gllcy454";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm";
+          sha256 = "0xsf4rg7kn0m5wjlbwhd1mc38lg2822037dyd0h66h6x2gbs3fd9";
+          name = "helm";
+        };
+        packageRequires = [ async cl-lib emacs helm-core ];
+        meta = {
+          homepage = "http://melpa.org/#/helm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-ack = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-ack";
+        version = "0.13";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-helm-ack";
+          rev = "5982f3cb6ec9f460ebbe06ec0ce7b3590bca3118";
+          sha256 = "0ps86zpyywibjwcm9drmamla979ad61fyqr8d6bv71fr56k9ak21";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ack";
+          sha256 = "1a8sc5gd2g57dl9g18wyydfmihy74yniwhjr27h7vxylnf2g3pni";
+          name = "helm-ack";
+        };
+        packageRequires = [ cl-lib helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-ack";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-ag = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-ag";
+        version = "0.50";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-helm-ag";
+          rev = "e0a4620fcc82d03bec7366542557539e7ecb653a";
+          sha256 = "03vv8arsvpshcfhmi2a3ams3q9q3p67avbbxyd3amyi3j336s2i7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ag";
+          sha256 = "023zvgmi5b5b2qga3jqd7jrq9ap8n3rhvl6jrv9fsi565sg1fv43";
+          name = "helm-ag";
+        };
+        packageRequires = [ cl-lib helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-ag";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-aws = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-aws";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "istib";
+          repo = "helm-aws";
+          rev = "172a4a3427d31c999e27e9ee06aa8e3822364a8c";
+          sha256 = "015p5sszd54x81qm96gx6xwjkvbi4f3j9i2nhcvlkk75s95w1ijv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-aws";
+          sha256 = "0sjgdjpznjxsf6nlv2ah45fw17j8j5apdphd1fp43rjv1lskkgc5";
+          name = "helm-aws";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-aws";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-backup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "helm-backup";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "antham";
+          repo = "helm-backup";
+          rev = "184026b9fe454aab8e7730106b4ca494fe307769";
+          sha256 = "0d6h4gbb69abxxgm85pdi5rsaf9h72yryg72ykd5633i1g4s8a76";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-backup";
+          sha256 = "182jbm36yzayxi9y3vhpyn25ivrgay37sncqvah35vbw52lnjcn3";
+          name = "helm-backup";
+        };
+        packageRequires = [ cl-lib helm s ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-backup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-bundle-show = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-bundle-show";
+        version = "1.1.5";
+        src = fetchFromGitHub {
+          owner = "masutaka";
+          repo = "emacs-helm-bundle-show";
+          rev = "b34523aa8a7f82ed9a1bf3643c35b65866a7877a";
+          sha256 = "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-bundle-show";
+          sha256 = "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7";
+          name = "helm-bundle-show";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-bundle-show";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-c-yasnippet = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "helm-c-yasnippet";
+        version = "0.6.7";
+        src = fetchFromGitHub {
+          owner = "emacs-jp";
+          repo = "helm-c-yasnippet";
+          rev = "1fa400233ba8e990066c47cca1e2af64bd192d4d";
+          sha256 = "108584bmadgidqkdfvf333zkyb5v9f84pasz5h01fkh57ks8by9f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-c-yasnippet";
+          sha256 = "0jwj4giv6lxb3h7vqqb2alkwq5kp0shy2nraik33956p4l8dfs90";
+          name = "helm-c-yasnippet";
+        };
+        packageRequires = [ cl-lib helm-core yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-c-yasnippet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-circe = callPackage ({ circe, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-circe";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "lesharris";
+          repo = "helm-circe";
+          rev = "0b7ecf5380971ee7b6291fca6a2805c320638238";
+          sha256 = "1iqjc15pz5qr8zjxaxz1b2vys2689ri76jacmipxvgjk0y7vc5f0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-circe";
+          sha256 = "12jfzg03573lih2aapvv5h2mi3pwqc9nrmv538ivjywix5117k3v";
+          name = "helm-circe";
+        };
+        packageRequires = [ circe cl-lib emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-circe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-commandlinefu = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, json ? null, let-alist, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-commandlinefu";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "helm-commandlinefu";
+          rev = "e11cd3e961c1c4c973b51d8d12592e7235a4971b";
+          sha256 = "1l61csd1gqz7kg5zjx60cfy824g42p682z7pk0rqzlrz8498wvkh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-commandlinefu";
+          sha256 = "150nqib0sr4n35vdj1xrxcja8gkv3chzhdbgkjxqgkz2yq10xxnd";
+          name = "helm-commandlinefu";
+        };
+        packageRequires = [ emacs helm json let-alist ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-commandlinefu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-core = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-core";
+        version = "1.9.1";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm";
+          rev = "fe96a398aa09ed0d25f6782efa5833085aa63791";
+          sha256 = "0awr4nvzgp1kckxqli1xw4pk16gc22i8hchin63fqvk0gllcy454";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-core";
+          sha256 = "1dyv8rv1728vwsp6vfdq954sp878jbp3srbfxl9gsgjnv1l6vjda";
+          name = "helm-core";
+        };
+        packageRequires = [ async cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-core";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-cscope = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, xcscope }:
+    melpaBuild {
+        pname = "helm-cscope";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "alpha22jp";
+          repo = "helm-cscope.el";
+          rev = "b82db54071bd2d1c77db2e648f8b4e61b1abe288";
+          sha256 = "0xnqkc4z22m41v5lgf87dd8xc4gmf932zbnbdhf9xic1gal1779c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-cscope";
+          sha256 = "13a76wc1ia4c0v701dxqc9ycbb43d5k09m5pfsvs8mccisfzk9y4";
+          name = "helm-cscope";
+        };
+        packageRequires = [ cl-lib emacs helm xcscope ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-cscope";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-dash";
+        version = "1.2.0";
+        src = fetchFromGitHub {
+          owner = "areina";
+          repo = "helm-dash";
+          rev = "a0f5d6539da873cd0c51d8ef714930c970a66aa0";
+          sha256 = "0s503q56acv70i5qahrdgk3nhvdpb3wa22a8jh1kvb7lykaw74ai";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-dash";
+          sha256 = "1cnxssj2ilszq94v5cc4ixblar1nlilv9askqjp9gfnkj2z1n9cy";
+          name = "helm-dash";
+        };
+        packageRequires = [ cl-lib helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-dash";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-descbinds = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-descbinds";
+        version = "1.8";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm-descbinds";
+          rev = "5d8e84e6c047ce8a042fdcd827abb421f4848ac7";
+          sha256 = "1cm2vaw0j1x2w2m45k6iqbzm7nydfdx1x89673vsvb90whdgvjbp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-descbinds";
+          sha256 = "1890ss4pimjxskzzllf57fg07xbs8zqcrp6r8r6x989llrfvd1h7";
+          name = "helm-descbinds";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-descbinds";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-firefox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-firefox";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm-firefox";
+          rev = "ca1a800c2564650e67651ee62159e9f1c1ba1135";
+          sha256 = "0vmlpj6zfif5f3wzgq8lkfqprl3z5gjsqj86347krblgfzhqlz30";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-firefox";
+          sha256 = "0677nj0zsk11vvp3q3xl9nk8dhz3ki9yl3kfb57wgnmprp109wgs";
+          name = "helm-firefox";
+        };
+        packageRequires = [ cl-lib emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-firefox";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-ghc = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ghc, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-ghc";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "david-christiansen";
+          repo = "helm-ghc";
+          rev = "d3603ee18299b789be255297dc42af16dd431869";
+          sha256 = "00ls9v3jdpz3wka90crd193z3ipwnf1b0slmldn4vb9ivrndh6wn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ghc";
+          sha256 = "1q5ia8sgpflv2hhvw7hjpkfb25vmrjwlrqz1f9qj2qgmki5mix2d";
+          name = "helm-ghc";
+        };
+        packageRequires = [ cl-lib emacs ghc helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-ghc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-ghq = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-ghq";
+        version = "1.5.1";
+        src = fetchFromGitHub {
+          owner = "masutaka";
+          repo = "emacs-helm-ghq";
+          rev = "2997646b2fb5421ab435b772dd2dbaeb92d70166";
+          sha256 = "0rlk9016rxj292kpxrnqgrm4xsjs4m4gk2fwh8z3fcihi013lxaw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ghq";
+          sha256 = "14f3cbsj7jhlhrp561d8pasllnx1cmi7jk6v2fja7ghzj76dnvq6";
+          name = "helm-ghq";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-ghq";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-github-stars = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-github-stars";
+        version = "1.3.2";
+        src = fetchFromGitHub {
+          owner = "Sliim";
+          repo = "helm-github-stars";
+          rev = "9211be3fbb65ca8819e0d1a54524ed8abbfaa4fa";
+          sha256 = "1sbhh3dmb47sy3r2iw6vmvbq5bpjac4xdg8i5a0m0c392a38nfqn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-github-stars";
+          sha256 = "1r4mc4v71171sq9rbbhm346s92fb7jnvvl91y2q52jqmrnzzl9zy";
+          name = "helm-github-stars";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-github-stars";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-gitlab = callPackage ({ dash, fetchFromGitHub, fetchurl, gitlab, helm, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "helm-gitlab";
+        version = "0.7.0";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "emacs-gitlab";
+          rev = "90be6027eb59a967e5bbceaa5f32c098472ca245";
+          sha256 = "1hc7j3gwljb1wk2727f66m3f7ga4icbklp54vlm0vf2bmii1ynil";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-gitlab";
+          sha256 = "010ihx3yddhb8j3jqcssc49qnf3i7xlz0s380mpgrdxgz6yahsmd";
+          name = "helm-gitlab";
+        };
+        packageRequires = [ dash gitlab helm s ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-gitlab";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-gtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-gtags";
+        version = "1.5.2";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-helm-gtags";
+          rev = "7fb96b900fb8640993354a2f83732a50da529d03";
+          sha256 = "1gfshy0brlfa8z39savj2a0jlfpqffijshsyjpz28ig2ggv8amnh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-gtags";
+          sha256 = "0snx0b8b4yc507q3i4fzvrd68xgzqxly8kn5cwp26ik6cv840y29";
+          name = "helm-gtags";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-gtags";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-hatena-bookmark = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-hatena-bookmark";
+        version = "2.1.0";
+        src = fetchFromGitHub {
+          owner = "masutaka";
+          repo = "emacs-helm-hatena-bookmark";
+          rev = "1ba352b858869a32323d4e6f9ca4b3eae055809e";
+          sha256 = "189dv3qqqmfyhsqa1n52cgcn1xv7k49f92ndn43y2v20234nhl9f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-hatena-bookmark";
+          sha256 = "14091zrp4vj7752rb5s3pkyvrrsdl7iaj3q9ys8rjmbsjwcv30id";
+          name = "helm-hatena-bookmark";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-hatena-bookmark";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-hayoo = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, helm, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-hayoo";
+        version = "0.0.5";
+        src = fetchFromGitHub {
+          owner = "markus1189";
+          repo = "helm-hayoo";
+          rev = "f49a77e8b8704bb7eb0d1097eefb8010a6617664";
+          sha256 = "1imfzz6cfdq7fgrcgrafy2nln929mgh31vybk9frm7a9jpamqdxp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-hayoo";
+          sha256 = "0xdvl6q2rpfsma4hx8m4snbd05s4z0bi8psdalixywlp5s4vzr32";
+          name = "helm-hayoo";
+        };
+        packageRequires = [ haskell-mode helm json ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-hayoo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-ispell = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-ispell";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-helm-ispell";
+          rev = "640723ace794d21b8a5892012db99f963149415b";
+          sha256 = "0bz2ngw816jvpw1a10j31y5hf1knz0mzz60l073h33qci11jbwid";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ispell";
+          sha256 = "0qyj6whgb2p0v231wn6pvx4awvl1wxppppqqbx5255j8r1f3l1b0";
+          name = "helm-ispell";
+        };
+        packageRequires = [ helm-core ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-ispell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-lobsters = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-lobsters";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "julienXX";
+          repo = "helm-lobste.rs";
+          rev = "d798bebb1a65e255c8ec791753a0c78e6b19243b";
+          sha256 = "1nd562lffc41r3y5x7y46f37ra97avllk2m95w23f9g42h47f1ar";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-lobsters";
+          sha256 = "0dkb78n373kywxj8zba2s5a2g85vx19rdswv9i78xjwv1lqh8cpp";
+          name = "helm-lobsters";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/helm-lobsters";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-ls-git = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-ls-git";
+        version = "1.8.0";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm-ls-git";
+          rev = "c5e43f4083af3949c5d5afdfbbf26d01881cb0e2";
+          sha256 = "0azs971d7pqd4ddxzy7bfs52cmrjbafwrcnf57afw39d772rzpdf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ls-git";
+          sha256 = "08rsy9479nk03kinjfkxddrq6wi4sx2a0wrz37cl2q517qi7sibj";
+          name = "helm-ls-git";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-ls-git";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-ls-hg = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-ls-hg";
+        version = "1.7.8";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm-ls-hg";
+          rev = "fa709b6354d84e1c88ccef096d29410fa16f7f5f";
+          sha256 = "1hma79i69l8ilkr3l4b8zqk3ny62vqr1ym2blymia4ibwk4zqbda";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ls-hg";
+          sha256 = "0ca0xn7n8bagxb504xgkcv04rpm1vxhx2m77biqrx5886pwl25bh";
+          name = "helm-ls-hg";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-ls-hg";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-make = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
+    melpaBuild {
+        pname = "helm-make";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "helm-make";
+          rev = "6558a79d20d04465419b312da198190be6832647";
+          sha256 = "17ls0bplnja2qvg3129x2irgsgs7l4bjj0qi7b9z16i6knjkwfya";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-make";
+          sha256 = "1r6jjy1rlsii6p6pinbz7h6gcw4vmcycd3vj338bfbnqp5rrf2mc";
+          name = "helm-make";
+        };
+        packageRequires = [ helm projectile ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-make";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-migemo = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, migemo }:
+    melpaBuild {
+        pname = "helm-migemo";
+        version = "1.22";
+        src = fetchFromGitHub {
+          owner = "emacs-jp";
+          repo = "helm-migemo";
+          rev = "2d964309a5415cf47f5154271e6fe7b6a7fffec7";
+          sha256 = "03588hanfa20pjp9w1bqy8wsf5x6az0vfq0bmcnr4xvlf6fhkyxs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-migemo";
+          sha256 = "1cjvb1lm1fsg5ky63fvrphwl5a7r7xf6qzb4mvl06ikj8hv2h33x";
+          name = "helm-migemo";
+        };
+        packageRequires = [ cl-lib helm-core migemo ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-migemo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-mode-manager = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-mode-manager";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "istib";
+          repo = "helm-mode-manager";
+          rev = "1fc1d65a27bc57d3a5bbd359f3eb77a6353fa4a5";
+          sha256 = "1srx5f0s9x7zan7ayqd6scxfhcvr3nkd4yzs96hphd87rb18apzk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-mode-manager";
+          sha256 = "1w9svq1kyyj8mmljardhbdvykb334nq1y18s956g4rvqyas2ciyd";
+          name = "helm-mode-manager";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-mode-manager";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-mt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, multi-term }:
+    melpaBuild {
+        pname = "helm-mt";
+        version = "0.6";
+        src = fetchFromGitHub {
+          owner = "dfdeshom";
+          repo = "helm-mt";
+          rev = "27391022dbf5720cb13ecec8ca8c398c05a7cbf7";
+          sha256 = "0gknncyhr2392xkvghgy5mh6gdv6qzvswidx2wy04ypb4s0vxgq2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-mt";
+          sha256 = "04hx8cg8wmm2w8g942nc9mvm12ammmjnx4k61ljrq76smd8s3x2a";
+          name = "helm-mt";
+        };
+        packageRequires = [ cl-lib emacs helm multi-term ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-mt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-nixos-options = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, nixos-options }:
+    melpaBuild {
+        pname = "helm-nixos-options";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "travisbhartwell";
+          repo = "nix-emacs";
+          rev = "5fc8fa29bea9dd8e9c822af92f9bc6ddc223635f";
+          sha256 = "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-nixos-options";
+          sha256 = "1nsi4hfw53iwn29fp33dkri1c6w8kdyn4sa0yn2fi6144ilmq933";
+          name = "helm-nixos-options";
+        };
+        packageRequires = [ helm nixos-options ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-nixos-options";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-open-github = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, gh, helm-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-open-github";
+        version = "0.14";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-helm-open-github";
+          rev = "95140bbacc66320a032d3cdd9e1c31aeb47eb83d";
+          sha256 = "1hq1nnmgkx0a8sv6g8k4v9f0102qg7jga0hcjnr8lcji51nqrcya";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-open-github";
+          sha256 = "121sszwvihbv688nq5lhdclvsjj8759glh42h82r4pcw30lxggxb";
+          name = "helm-open-github";
+        };
+        packageRequires = [ cl-lib gh helm-core ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-open-github";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-orgcard = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-orgcard";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "emacs-jp";
+          repo = "helm-orgcard";
+          rev = "9655ac340d1ccc5f3d1c0f7c49be8dd3556d4d0d";
+          sha256 = "1zyjxrrda7nxxjqczv2p3sfimxy2pq734kf51j6v2y0biclc4bk3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-orgcard";
+          sha256 = "1a56y8fny7qxxidc357n7l3yi7h66hidhvwhkam8y5wk6k61460p";
+          name = "helm-orgcard";
+        };
+        packageRequires = [ helm-core ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-orgcard";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-package = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-package";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-helm-package";
+          rev = "117f5f26c96c0854aadaf9c52aaec961195d5798";
+          sha256 = "14ad0b9d07chabjclffjyvnmrasar1di9wmpzf78bw5yg99cbisw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-package";
+          sha256 = "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y";
+          name = "helm-package";
+        };
+        packageRequires = [ cl-lib helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-package";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-pages = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-pages";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "david-christiansen";
+          repo = "helm-pages";
+          rev = "e334ca3312e51d6fdfa989df5d3ebe683d673c0e";
+          sha256 = "1r2ndmrw5ivawb940j8jnmqzxv46qrzd3cqh9fvxx5yicf020fjf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-pages";
+          sha256 = "1v3w8100invb5wsmm3dyl41pjs7s889s3b1rlr6vlcspa1ncv3wj";
+          name = "helm-pages";
+        };
+        packageRequires = [ cl-lib emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-pages";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-perldoc = callPackage ({ cl-lib ? null, deferred, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-perldoc";
+        version = "0.7";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-helm-perldoc";
+          rev = "18645f2065a07acce2c6b50a2f9d7a2554e532a3";
+          sha256 = "01cj2897hqz02mfz32nxlyyp59iwm0gz1zj11s8ll7pwy9q3r90g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-perldoc";
+          sha256 = "0b0cl2xj5w1r71zrjhnqhrzsnz1296jv21qx5adzslra6lk55q2r";
+          name = "helm-perldoc";
+        };
+        packageRequires = [ cl-lib deferred helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-perldoc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-proc = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-proc";
+        version = "0.0.4";
+        src = fetchFromGitHub {
+          owner = "markus1189";
+          repo = "helm-proc";
+          rev = "babf86d7d0e1f325f18095a51116c49cda2c5fec";
+          sha256 = "0y0a18bj2k459fk51z7svnnasqkl78bx61y5ha1yv3sqnppgdw2h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-proc";
+          sha256 = "1bq60giy2bs9m3hlbc5nwvy51702a98s0vqass3b290hdgki4bnx";
+          name = "helm-proc";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-proc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-project-persist = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, project-persist }:
+    melpaBuild {
+        pname = "helm-project-persist";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "Sliim";
+          repo = "helm-project-persist";
+          rev = "df63a21b9118f9639f0f4a336127b4fb8ec6deec";
+          sha256 = "1q7hfj8ldwivhjp9ns5pvsn0ds6pyvl2zhl366c22s6q8jmbr8ik";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-project-persist";
+          sha256 = "1n87kn1n3453mpdj6amyrgivslskmnzdafpspvkz7b0smf9mv2ld";
+          name = "helm-project-persist";
+        };
+        packageRequires = [ helm project-persist ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-project-persist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-pt = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-pt";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "ralesi";
+          repo = "helm-pt";
+          rev = "03e35e2bb5b683d79897d07acb57ee67009cc6cd";
+          sha256 = "0jm6nnnjyd4kmm1knh0mq3xhnw2hvs3linwlynj8yaliqvlv6brv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-pt";
+          sha256 = "1imhy0bsm9aldv0pvf88280qdya01lznxpx5gi5wffhrz17yh4pi";
+          name = "helm-pt";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-pt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-pydoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-pydoc";
+        version = "0.7";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-helm-pydoc";
+          rev = "30f1814b5b16db0413ffe74b0d0420b38e153df9";
+          sha256 = "1ik0vllakh73kc2zbgii4sm33n9pj388gaz69j4drz2mik307zvs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-pydoc";
+          sha256 = "0cnbhjw951f8sci63cvzcc65d0ffdx3rb8l1g38qql5rzkam48fn";
+          name = "helm-pydoc";
+        };
+        packageRequires = [ cl-lib helm-core ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-pydoc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-recoll = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-recoll";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm-recoll";
+          rev = "d5e453933e6b97bc2bc504aa80fb989de9894849";
+          sha256 = "1f1ijna97dn190if3nwk5s5rldlpryfb7wvgg0imwqyp25h4all7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-recoll";
+          sha256 = "0pr2pllplml55k1xx9inr3dm90ichg2wb62dvgvmbq2sqdf4606b";
+          name = "helm-recoll";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-recoll";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-robe = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-robe";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-helm-robe";
+          rev = "7348d0bc0251b51979554ea678b970fd01c0efe9";
+          sha256 = "163ljqar3vvbavzc8sk6rnf8awyc2rhh2g117fglswich3c8lnqg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-robe";
+          sha256 = "1gi4nkm9xvnxv0frmhiiw8dkmnmhfpr9n0b6jpidlvr8xr4s5kyw";
+          name = "helm-robe";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-robe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-rubygems-org = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-rubygems-org";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "neomantic";
+          repo = "helm-rubygems-org";
+          rev = "6aaed984f698cbdf9f9aceb0221404563e28764d";
+          sha256 = "1sff8kagyhmwcxf9062il1077d4slvr2kq76abj496610gpb75i0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-rubygems-org";
+          sha256 = "04ni03ak53z3rggdgf68qh7ksgcf3s0f2cv6skwjqw7v8qhph6qs";
+          name = "helm-rubygems-org";
+        };
+        packageRequires = [ cl-lib emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-rubygems-org";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-sage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, sage-shell-mode }:
+    melpaBuild {
+        pname = "helm-sage";
+        version = "0.0.4";
+        src = fetchFromGitHub {
+          owner = "stakemori";
+          repo = "helm-sage";
+          rev = "b42b4ba5fd1b17c4b54c30376a053281686beeb8";
+          sha256 = "1s6aw1viyzhhrfiazzi82n7bkvshp7clwi6539660m72lfwc5zdl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-sage";
+          sha256 = "1vnq15fjaap0ai7dadi64sm4415xssmahk2j7kx45sasy4qaxlbj";
+          name = "helm-sage";
+        };
+        packageRequires = [ cl-lib helm sage-shell-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-sage";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-spaces = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild, spaces }:
+    melpaBuild {
+        pname = "helm-spaces";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "yasuyk";
+          repo = "helm-spaces";
+          rev = "8b4f5a1e3cb823ceee1e341ce45f9b18a1b8057c";
+          sha256 = "0kz0vfp43n7f9l53rji2pb8v6ylg63i37q0bmidmjjvsinimwj44";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-spaces";
+          sha256 = "0hdvkk173k98iycvii5xpbiblx044125pl7jyz4kb8r1vvwcv791";
+          name = "helm-spaces";
+        };
+        packageRequires = [ helm spaces ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-spaces";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-swoop";
+        version = "1.5.1";
+        src = fetchFromGitHub {
+          owner = "ShingoFukuyama";
+          repo = "helm-swoop";
+          rev = "d834b05538dd3381c68f1260d39d3a7eb6a8f7f7";
+          sha256 = "1lkjrz9ma2bxr8vskdm3sgrmsyiic798q3271dw38d453bhv4bl1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-swoop";
+          sha256 = "1fqbhj75hcmy7c2vdd0m7fk3m34njmv5s6k1i9y94djpbd13i3d8";
+          name = "helm-swoop";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-swoop";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-themes = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-themes";
+        version = "0.5";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-helm-themes";
+          rev = "8c979f4efc6174eed7df5f3b62db955246202818";
+          sha256 = "0rzbdrs5d5a0icpxrqik2iaz8i5bacw6nm2caf75s9w9j0j6s9li";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-themes";
+          sha256 = "1j64w6dnxmq0rfycci9wfy2z5lbddsggf486pknxfgwwqgvns90l";
+          name = "helm-themes";
+        };
+        packageRequires = [ helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-themes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-unicode = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-unicode";
+        version = "0.0.2";
+        src = fetchFromGitHub {
+          owner = "shosti";
+          repo = "helm-unicode";
+          rev = "e68cc60f7efd93b410844f3722bc6681dc65e2fd";
+          sha256 = "14lbdvs9xdnipsn3lywbvgsqwqnbm8fxm6d1ilq0cj5z6zkxkya0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-unicode";
+          sha256 = "052xqzvcfzpsbl75ylqb1khqndvc2dqdymqlwivs0darlds0w8y4";
+          name = "helm-unicode";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-unicode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-w32-launcher = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-w32-launcher";
+        version = "0.1.6";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "helm-w32-launcher";
+          rev = "01aa370a32900e7521330fba495474f2aa435e19";
+          sha256 = "0s8zp3kx2kxlfyd26yr3lphwcybhbm8qa9vzmxr3kaylwy6jpz5q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-w32-launcher";
+          sha256 = "0bzn2vhspn6lla815qxwsl9gwfyiwgwmnysr6rjpyacmi17d73ri";
+          name = "helm-w32-launcher";
+        };
+        packageRequires = [ cl-lib emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-w32-launcher";
+          license = lib.licenses.free;
+        };
+      }) {};
+    helm-zhihu-daily = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-zhihu-daily";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "helm-zhihu-daily";
+          rev = "fcc534bb42c81070063b28d3d939a53af0fa9a7c";
+          sha256 = "1j6ssbjbm5ym3pg0icpfp735y4dfhlky9qhl9hwp2n3wmba5g9h1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-zhihu-daily";
+          sha256 = "0hkgail60s9qhxl0pskqxjvfz93iq1qh1kcmcq0x5kq7d08b911r";
+          name = "helm-zhihu-daily";
+        };
+        packageRequires = [ cl-lib emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-zhihu-daily";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hi2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hi2";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "nilcons";
+          repo = "hi2";
+          rev = "c9d199727b5cdcb9e36a972b38131ce4611fd6c8";
+          sha256 = "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hi2";
+          sha256 = "1wxkjg1jnw05lqzggi20jy2jl20d8brvv76vmrf6lnz62g6jv9h2";
+          name = "hi2";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hi2";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-blocks = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "highlight-blocks";
+        version = "0.1.16";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "highlight-blocks";
+          rev = "9c4240a5d16008db430d1a81c76dad474d3deb0c";
+          sha256 = "0c65jk00j88qxfki2g88hy9g6n92rzskwcn1fbmwcw3qgaz4b6w5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-blocks";
+          sha256 = "1a32iv5kgf6g6ygbs559w156dh578k45m860czazfx0d6ap3k5m1";
+          name = "highlight-blocks";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/highlight-blocks";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-defined = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "highlight-defined";
+        version = "0.1.5";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "highlight-defined";
+          rev = "9cc03c7136b56c04ea053fbe08a3a4a6af26b90e";
+          sha256 = "08czwa165rnd5z0dwwdddn7zi5w63sdk31l47bj0598kbly01n7r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-defined";
+          sha256 = "1vjxm35wf4c2qphpkjh57hf03a5qdssdlmfj0n0gwxsdw1q5rpms";
+          name = "highlight-defined";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/highlight-defined";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-indentation = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "highlight-indentation";
+        version = "0.7.0";
+        src = fetchFromGitHub {
+          owner = "antonj";
+          repo = "Highlight-Indentation-for-Emacs";
+          rev = "cd6d8168ccb04c6c0394f42e9512c58f23c01689";
+          sha256 = "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-indentation";
+          sha256 = "0iblrrbssjwfn71n8xxjcl98pjv1qw1igf3hlz6mh8740fsca3d6";
+          name = "highlight-indentation";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/highlight-indentation";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parent-mode }:
+    melpaBuild {
+        pname = "highlight-numbers";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "highlight-numbers";
+          rev = "e1245b27a732ec43c1562f825533fe147759d24e";
+          sha256 = "0ffhc5s0h34064bix4qyiiyx30m4hpv0phmxwcrwiyvanj9ggfai";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-numbers";
+          sha256 = "1bywrjv9ybr65mwkrxggb52jdqn16z8acgs5vqm0faq43an8i5yv";
+          name = "highlight-numbers";
+        };
+        packageRequires = [ emacs parent-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/highlight-numbers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-parentheses = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "highlight-parentheses";
+        version = "1.1.0";
+        src = fetchFromGitHub {
+          owner = "nschum";
+          repo = "highlight-parentheses.el";
+          rev = "5aa800a68e3795716de1e7f2722e836781190f31";
+          sha256 = "08ld4wjrkd77cghmrf1n2hn2yzid7bdqwz6b1rzzqaiwxl138iy9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-parentheses";
+          sha256 = "1b0n9mz4a6baljvvgb881w53391smm35c9pwd45g861hk1qvrk5k";
+          name = "highlight-parentheses";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/highlight-parentheses";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-quoted = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "highlight-quoted";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "highlight-quoted";
+          rev = "cdd7164f9ad3a9929387c08af641ef6f5f013f4f";
+          sha256 = "1ahg9qzss67jpw0wp2izys6lyss4nqjy9320fpa4vdx39msdmjjb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-quoted";
+          sha256 = "0x6gxi0jfxvpx7r1fm43ikxlxilnbk2xbhdy9xivhgmmdyqiqqkl";
+          name = "highlight-quoted";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/highlight-quoted";
+          license = lib.licenses.free;
+        };
+      }) {};
+    highlight-symbol = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "highlight-symbol";
+        version = "1.3";
+        src = fetchFromGitHub {
+          owner = "nschum";
+          repo = "highlight-symbol.el";
+          rev = "6136dac6d4328c19077a838dfbae2efc4caa4db2";
+          sha256 = "09z13kv2g21kjjkkm3iyaz93sdjmdy2d563r8n7r7ng94acrn7f6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-symbol";
+          sha256 = "0gw8ffr64s58qdbvm034s1b9xz1hynzvbk8ld67j06fxpc98qaj4";
+          name = "highlight-symbol";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/highlight-symbol";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hindent = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hindent";
+        version = "5.4.3";
+        src = fetchFromGitHub {
+          owner = "chrisdone";
+          repo = "hindent";
+          rev = "726c692d234581c853495165472c78f4c7fb9297";
+          sha256 = "0hb74j5137yj3rm2si16xzwmcvkiwx8ywh1qrlnrzv5gl4viyjzb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hindent";
+          sha256 = "1f3vzgnqigwbwvglxv0ziz3kyp5dxjraw3vlghkpw39f57mky4xz";
+          name = "hindent";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/hindent";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hippie-expand-slime = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hippie-expand-slime";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "hippie-expand-slime";
+          rev = "de31fbc9f9d55891a006463bcee7670b47084015";
+          sha256 = "0mzk4agkcaaw7gryi0wrxv0blqndqsjf1ivdvr2nrnqi798sdhbr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hippie-expand-slime";
+          sha256 = "0kxyv1lpkg33qgfv1jfqx03640py7525bcnc9dk98w6y6y92zf4m";
+          name = "hippie-expand-slime";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hippie-expand-slime";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hippie-namespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hippie-namespace";
+        version = "0.5.8";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "hippie-namespace";
+          rev = "79a662dfe9e61341e071b879f4f9101ca027ad10";
+          sha256 = "0nfr8ad0klqwi97fjchvwx9mfc672lhv3ll166sr8vn6jlh7rkv0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hippie-namespace";
+          sha256 = "1bzjhq116ci9c9f0aw121fn3drmg2pw5ny1w6wcasa4p30syxxf0";
+          name = "hippie-namespace";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hippie-namespace";
+          license = lib.licenses.free;
+        };
+      }) {};
+    history = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "history";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "boyw165";
+          repo = "history";
+          rev = "adef53ecc2f6067bb61f020a2b66c5185a51632d";
+          sha256 = "0dy98sg92xvnr4algm2v2bnjcdwzv0b0vqk0312b0ziinkzisas1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/history";
+          sha256 = "0s8pcz53bk1w4h5847204vb6j838vr8za66ni1b2y4pas76zjr5g";
+          name = "history";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/history";
+          license = lib.licenses.free;
+        };
+      }) {};
+    historyf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "historyf";
+        version = "0.0.9";
+        src = fetchFromGitHub {
+          owner = "k1LoW";
+          repo = "emacs-historyf";
+          rev = "64ab6c9d2cd6dec6982622bf675326e011373cd2";
+          sha256 = "1mxicha6m61qxz1mv9z76x4g9fpqk4ch9i6jf7nnpxd6x4xz3f7z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/historyf";
+          sha256 = "15pcaqfjpkfwcy46yqqw10q8kpw7aamcg0gr4frbdgzbv0yld08s";
+          name = "historyf";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/historyf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hl-anything = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hl-anything";
+        version = "0.0.9";
+        src = fetchFromGitHub {
+          owner = "boyw165";
+          repo = "hl-anything";
+          rev = "990fe4b323b6222d6c6a35898d8128cddda34848";
+          sha256 = "12ab825dldiqymy4md8ssfnbbhrgczkwdiwd3llsdq6sayar16as";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-anything";
+          sha256 = "15n998nhirvg3f719b7x9s7jpqv6gzkr22kp4zbbq99lbx2wfc1k";
+          name = "hl-anything";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/hl-anything";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hl-sentence = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hl-sentence";
+        version = "3";
+        src = fetchFromGitHub {
+          owner = "milkypostman";
+          repo = "hl-sentence";
+          rev = "f88882772f1a29fabb54194cc8aacd80d7f5b085";
+          sha256 = "1hgigbgppdhmr7rc901r95kyydjk05dck8mwbryh7kpglns365fa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-sentence";
+          sha256 = "16sjfs0nnpwzj1cqfna9vhmxgznwwhb2qdmjci25hlgrdxwwyahs";
+          name = "hl-sentence";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hl-sentence";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hl-sexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hl-sexp";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "hl-sexp";
+          rev = "0606100422321c18db51ceda80f25cd7717c2e01";
+          sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-sexp";
+          sha256 = "0kg0m20i9ylphf4w0qcvii8yp65abdl2q5flyphilk0jahwbj9jy";
+          name = "hl-sexp";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hl-sexp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hl-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hl-todo";
+        version = "1.4.5";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "hl-todo";
+          rev = "878220c111add155b9ee1aeb3d3475cc5e488525";
+          sha256 = "07irwpg794fdzsixmcbi1lnafj5gynhrdam7frcpmvb26a0l8fxq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-todo";
+          sha256 = "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4";
+          name = "hl-todo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hl-todo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hoa-pp-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
+    melpaBuild {
+        pname = "hoa-pp-mode";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "hoaproject";
+          repo = "Contributions-Emacs-Pp";
+          rev = "a72104a191214fba502653643a0d166a8f5341d9";
+          sha256 = "1wg6vc9swwspi6s6jpig3my83i2pq8vkq2cy1q3an87rczacmfzp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hoa-pp-mode";
+          sha256 = "01ijfn0hd645j6j88rids5dsanmzwmky37slf50yqffnv69jwvla";
+          name = "hoa-pp-mode";
+        };
+        packageRequires = [ emacs names ];
+        meta = {
+          homepage = "http://melpa.org/#/hoa-pp-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    homebrew-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
+    melpaBuild {
+        pname = "homebrew-mode";
+        version = "1.3.2";
+        src = fetchFromGitHub {
+          owner = "dunn";
+          repo = "homebrew-mode";
+          rev = "359b5a0e42c6dab618bb9bcf03ad3dfe3b2a3d12";
+          sha256 = "1n8r4jrk71dg25ca6bsw11ky0dszdj4pvqwsmy3msqlji1ckvqyn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/homebrew-mode";
+          sha256 = "088wc5fq4r5yj1nbh7mriyqf0xwqmbxvblj9d2wwrkkdm5flc8mj";
+          name = "homebrew-mode";
+        };
+        packageRequires = [ dash emacs inf-ruby ];
+        meta = {
+          homepage = "http://melpa.org/#/homebrew-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hookify = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "hookify";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "Silex";
+          repo = "hookify";
+          rev = "e76127230716f7fab6662410c03c3872d17a172b";
+          sha256 = "1yvz9d5h7npxhsdf6s9fgxpmqk5ixx91iwivbhzcz935gs2886hc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hookify";
+          sha256 = "0prls539ifk2fsqklcxmbrwmgbm9hya50z486d7sw426lh648qmy";
+          name = "hookify";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/hookify";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ht = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ht";
+        version = "2.0";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "ht.el";
+          rev = "285c8752b7d3ab4b3d0c53bab6ba05d328577960";
+          sha256 = "0k09n66jar0prq9aal2h3izp1y67jibdx0gjr0g4jx1p1yxig1dg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ht";
+          sha256 = "16vmxksannn2wyn8r44jbkdp19jvz1bg57ggbs1vn0yi7nkanwbd";
+          name = "ht";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ht";
+          license = lib.licenses.free;
+        };
+      }) {};
+    html-to-markdown = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "html-to-markdown";
+        version = "1.5.1";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "html-to-markdown";
+          rev = "0fa0effd71acd8981a425ef11e0e63d53aea3199";
+          sha256 = "0c648dl5zwjrqx9n6zr6nyzx2zcnv05d5i4hvhjpl9q3y011ncns";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/html-to-markdown";
+          sha256 = "1gjh9ndqsb3nfb7w5h7carjckkgy6qh63b4mg141j19dsyx9rrjv";
+          name = "html-to-markdown";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/html-to-markdown";
+          license = lib.licenses.free;
+        };
+      }) {};
+    httpcode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "httpcode";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "rspivak";
+          repo = "httpcode.el";
+          rev = "2c8eb3b5455254ba70fb71f7178886bfc2d3af90";
+          sha256 = "1h9n388fi17nbyfciqywgrq3n165kpiildbimx59qyk2ac3v7rqk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/httpcode";
+          sha256 = "05k1al1j119x6zf03p7jn2r9qql33859583nbf85k41bhicknpgh";
+          name = "httpcode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/httpcode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    httprepl = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "httprepl";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "gregsexton";
+          repo = "httprepl.el";
+          rev = "d2de8a676544deed1a5e084631a7799e487dbe55";
+          sha256 = "0dd257988bdar9hl2711ch5qshx9jc11fqxcvbrd7rc1va5cshs9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/httprepl";
+          sha256 = "0899qb1yfnsyf04hhvnk47qnq4d1f4vd5ghj43x4743wd2b9qawh";
+          name = "httprepl";
+        };
+        packageRequires = [ dash emacs s ];
+        meta = {
+          homepage = "http://melpa.org/#/httprepl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hyai = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hyai";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "iquiw";
+          repo = "hyai";
+          rev = "7c644d31f62943c75ccf5a772e43450b462cc08f";
+          sha256 = "1b8992vzq5bh01pjlj181nzqjrqs4fbjpwvv8h7gjq42sf8w59sm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hyai";
+          sha256 = "00ns7q5b11c5amwkq11fs4p5vrmdfmjljfrcxbwb39gc12yrhn7s";
+          name = "hyai";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/hyai";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hyde = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hyde";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "nibrahim";
+          repo = "Hyde";
+          rev = "181f9d2f91c2678a22243c5485162fa7999fd893";
+          sha256 = "0nwsmc4c3v0wbfy917ik9k7yz8yclfac695p7p9sh9y354k3maw4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hyde";
+          sha256 = "18kjcxm7qmv9bfh4crw37zgax8khjqs9zkp4lrb490zlad2asbs3";
+          name = "hyde";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/hyde";
+          license = lib.licenses.free;
+        };
+      }) {};
+    hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hydra";
+        version = "0.13.3";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "hydra";
+          rev = "4bf7f1c9e46fb819c673e55d8a1891774e139f98";
+          sha256 = "08iw95lyizcyf6cjl37fm8wvay0vsk9758pk9gq9f2xiafcchl7f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hydra";
+          sha256 = "1c59l43p39ins3dn9690gm6llwm4b9p0pk78lip0dwlx736drdbw";
+          name = "hydra";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/hydra";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ibuffer-projectile = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+    melpaBuild {
+        pname = "ibuffer-projectile";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "ibuffer-projectile";
+          rev = "8b225dc779088ce65b81d8d86dc5d394baa53e2e";
+          sha256 = "1zcnp61c9cp2kvns3v499hifk072rxm4rhw4pvdv2mm966vcxzvc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ibuffer-projectile";
+          sha256 = "1qh4krggmsc6lx5mg60n8aakmi3f6ppl1gw094vfcsni96jl34fk";
+          name = "ibuffer-projectile";
+        };
+        packageRequires = [ projectile ];
+        meta = {
+          homepage = "http://melpa.org/#/ibuffer-projectile";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ibuffer-vc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ibuffer-vc";
+        version = "0.10";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "ibuffer-vc";
+          rev = "b2bac7aa69335933ebb2e6f34259fa96d2c8d46a";
+          sha256 = "0bqdi5w120256g74k0j4jj81x804x1gcg4dxa74w3mb6fl5xlvs8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ibuffer-vc";
+          sha256 = "0bn5qyiq07cgzci10xl57ss5wsk7bfhi3hjq2v6yvpy9v704dvla";
+          name = "ibuffer-vc";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/ibuffer-vc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    identica-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "identica-mode";
+        version = "1.3.1";
+        src = fetchFromGitHub {
+          owner = "gabrielsaldana";
+          repo = "Emacs-Identica-mode";
+          rev = "cf9183ee11ac922e85c7c908f04e2d00b03111b3";
+          sha256 = "047gzycr49cs8wlmm9j4ry7b7jxmfhmbayx6rbbxs49lba8dgwlk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/identica-mode";
+          sha256 = "1r69ylykjap305g23cry4wajiqhpgw08nw3b5d9i1y3mwx0j253q";
+          name = "identica-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/identica-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    idle-highlight-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "idle-highlight-mode";
+        version = "1.1.3";
+        src = fetchFromGitHub {
+          owner = "nonsequitur";
+          repo = "idle-highlight-mode";
+          rev = "c466f2a9e291f9da1167dc879577b2e1a7880482";
+          sha256 = "0x4w1ksrw7dicl84zpf4d4scg672dyan9g95jkn6zvri0lr8xciv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/idle-highlight-mode";
+          sha256 = "1i5ky61bq0dpk71yasfpjhsrv29mmp9nly9f5xxin7gz3x0f36fc";
+          name = "idle-highlight-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/idle-highlight-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-complete-space-or-hyphen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-complete-space-or-hyphen";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "doitian";
+          repo = "ido-complete-space-or-hyphen";
+          rev = "ad9baaec10e06be3f85db97b6c8fd970cf20df77";
+          sha256 = "1ffmsmi31jc0gqnbdxrd8ipsy790bn6hgq3rmayylavmdpg3qfd5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-complete-space-or-hyphen";
+          sha256 = "1wk0cq5gjnprmpyvhh80ksz3fash42hckvmx8m95crbzjg9j0gbc";
+          name = "ido-complete-space-or-hyphen";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ido-complete-space-or-hyphen";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-completing-read-plus";
+        version = "3.10";
+        src = fetchFromGitHub {
+          owner = "DarwinAwardWinner";
+          repo = "ido-ubiquitous";
+          rev = "1a97a38f2d1a51371853e44da659caa6baf78cbe";
+          sha256 = "0byairx5nxbzgdyiw658p7yiysfr7r1bd3b2prawq72bslb1c5cn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-completing-read+";
+          sha256 = "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh";
+          name = "ido-completing-read-plus";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ido-completing-read+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-describe-bindings = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-describe-bindings";
+        version = "0.0.8";
+        src = fetchFromGitHub {
+          owner = "danil";
+          repo = "ido-describe-bindings";
+          rev = "c84054942d03a19ee65716db89771c4a157ff696";
+          sha256 = "1q8vqmdfhbmciwn1i1ln7xx2i41kknv030hf6a88grl4rzqffm70";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-describe-bindings";
+          sha256 = "1lsa09h025vd908r9q571iq2ia0zdpnq04mlihb3crpp5v9n9ws2";
+          name = "ido-describe-bindings";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/ido-describe-bindings";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-grid-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-grid-mode";
+        version = "1.1.5";
+        src = fetchFromGitHub {
+          owner = "larkery";
+          repo = "ido-grid-mode.el";
+          rev = "8bbd66e365d4f6f352bbb17673be5869ab26d7ab";
+          sha256 = "0f1p6cnl0arcc2y1h99nqcflp7byvyf6hj6fmv5xqggs66qc72lb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-grid-mode";
+          sha256 = "1wl1yclcxmkbfnvp0il23csdf6gprzf7fkcknpivk784fhl19acr";
+          name = "ido-grid-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ido-grid-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-load-library = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, persistent-soft }:
+    melpaBuild {
+        pname = "ido-load-library";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "ido-load-library";
+          rev = "8589cb1e4303066eb333f1cfc789835d1cbe21df";
+          sha256 = "1z7az7h90v72llxvdclcywvf1qd0nhkfa45bp99xi7cy7sqsqssf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-load-library";
+          sha256 = "13f83gqh39p3yjy7r7qc7kzgdcmqh4b5c07zl7rwzb8y9rz59lhj";
+          name = "ido-load-library";
+        };
+        packageRequires = [ pcache persistent-soft ];
+        meta = {
+          homepage = "http://melpa.org/#/ido-load-library";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-occur = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-occur";
+        version = "0.1.3";
+        src = fetchFromGitHub {
+          owner = "danil";
+          repo = "ido-occur";
+          rev = "247ee110dc085f9f5577aa02241c3ad66164b455";
+          sha256 = "1qvx1v5xrfv1id6lfn767b667m2hn4rsw2nmb61j1i81csdiqjds";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-occur";
+          sha256 = "058l2pklg12wkvyyshk8va6shphpbc508fv9a8x25pw857a28pji";
+          name = "ido-occur";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/ido-occur";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "ido-ubiquitous";
+        version = "3.10";
+        src = fetchFromGitHub {
+          owner = "DarwinAwardWinner";
+          repo = "ido-ubiquitous";
+          rev = "1a97a38f2d1a51371853e44da659caa6baf78cbe";
+          sha256 = "0byairx5nxbzgdyiw658p7yiysfr7r1bd3b2prawq72bslb1c5cn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-ubiquitous";
+          sha256 = "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp";
+          name = "ido-ubiquitous";
+        };
+        packageRequires = [ cl-lib emacs ido-completing-read-plus s ];
+        meta = {
+          homepage = "http://melpa.org/#/ido-ubiquitous";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-vertical-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-vertical-mode";
+        version = "0.1.6";
+        src = fetchFromGitHub {
+          owner = "creichert";
+          repo = "ido-vertical-mode.el";
+          rev = "c3e0514405ba5c15b5527e7f8e2d42dff259788f";
+          sha256 = "1lv82q639xjnmvby56nwqn23ijh6f163bk675s33dkingm8csj8k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-vertical-mode";
+          sha256 = "1vg5s6nd6v2g8ychz1q9cdqvsdw6vag7d9w68sn7blpmlr0nqhfm";
+          name = "ido-vertical-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ido-vertical-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ido-yes-or-no = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ido-yes-or-no";
+        version = "1.2";
+        src = fetchFromGitHub {
+          owner = "DarwinAwardWinner";
+          repo = "ido-yes-or-no";
+          rev = "ff9d28ca86c8cbfe2fbeb3ee1a60e3983aa776e4";
+          sha256 = "0i3s80ws3qbhb3vsvf09mbq661c5140v4phgbl4cz6z545ha2bj7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-yes-or-no";
+          sha256 = "0glag4yb9xyf1lxxbdhph2nq6s1vg44i6f2z1ii8bkxpambz2ana";
+          name = "ido-yes-or-no";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ido-yes-or-no";
+          license = lib.licenses.free;
+        };
+      }) {};
+    idomenu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "idomenu";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "birkenfeld";
+          repo = "idomenu";
+          rev = "5daaf7e06e4704ae43c825488109d7eb8c049321";
+          sha256 = "0bq0kx0889rdy8aasxbpmb0a4awpk2b24zv6x1dmhacmc5rj11i0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/idomenu";
+          sha256 = "0mg601ak9mhp2fg5n13npcfzphgyms4vkqd18ldmv098z2z1412h";
+          name = "idomenu";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/idomenu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    idris-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, prop-menu }:
+    melpaBuild {
+        pname = "idris-mode";
+        version = "0.9.19";
+        src = fetchFromGitHub {
+          owner = "idris-hackers";
+          repo = "idris-mode";
+          rev = "314a0baea5752069de08e814bb134a9643fb675d";
+          sha256 = "0iwgbaq2797k1f7ql86i2pjfa67cha4s2v0mgmrd0qcgqkxsdq92";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/idris-mode";
+          sha256 = "0hiiizz976hz3z3ciwg1gs9y10qhxbs8givhz89kvyn4s4861a1s";
+          name = "idris-mode";
+        };
+        packageRequires = [ cl-lib emacs prop-menu ];
+        meta = {
+          homepage = "http://melpa.org/#/idris-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    iedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "iedit";
+        version = "0.9.9";
+        src = fetchFromGitHub {
+          owner = "victorhge";
+          repo = "iedit";
+          rev = "b95c35107a429d63b99f888b52eb0f74105d0da0";
+          sha256 = "06qv95bgcb6n3zcjs2i1q80v9040z7m9pb9xbhxmqzcx68vpbpdm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iedit";
+          sha256 = "02gjshvkcvyr58yf6vlg3s2pzls5sd54xpxggdmqajfg8xmpkq04";
+          name = "iedit";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/iedit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    iflipb = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "iflipb";
+        version = "1.3";
+        src = fetchFromGitHub {
+          owner = "jrosdahl";
+          repo = "iflipb";
+          rev = "2e0d1719abeec7982341761ee5dabb01574e6862";
+          sha256 = "18rlyjsn9w0zbs0c002s84qzark3rrcmjn9vq4nap7i6zpaq8hki";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iflipb";
+          sha256 = "1nfrrxgi9nlhn477z8ay7jxycpcghhhmmg9dagdhrlrr20fx697d";
+          name = "iflipb";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/iflipb";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ignoramus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ignoramus";
+        version = "0.7.0";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "ignoramus";
+          rev = "37536286eb1da6d7bb9590e039485c456fdfd245";
+          sha256 = "1j40ldvgd7nr7pabi8mhzdvi0ml9n62m8mfjlh9nrbnkcsifs9rk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ignoramus";
+          sha256 = "1czqdmlrds1l5afi8ldg7nrxcwav86538z2w1npad3dz8xk67da9";
+          name = "ignoramus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ignoramus";
+          license = lib.licenses.free;
+        };
+      }) {};
+    image-archive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "image-archive";
+        version = "0.0.7";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-image-archive";
+          rev = "699e967fa7b1dfcce2bf2ec878e74f4238bb6e45";
+          sha256 = "0imvxzcja91cd19zm2frqfpxm8j0bc89w9s7q0pkpvyjz44kjbq8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/image-archive";
+          sha256 = "0x0lv5dr1gc9bnr3dn26bc9s1ccq2rp8c4a1licbi929f0jyxxfp";
+          name = "image-archive";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/image-archive";
+          license = lib.licenses.free;
+        };
+      }) {};
+    image-dired-plus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "image-dired-plus";
+        version = "0.7.2";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-image-diredx";
+          rev = "b68094625d963056ad64e0e44af0e2266b2eadc7";
+          sha256 = "1n2ya9s0ld257a8iryjd0dz0z2zs1xhzfiwsdkq4l4azwxl54m29";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/image-dired+";
+          sha256 = "0hhwqfn490n7p12n7ij4xbjh15gfvicmn21fvwbnrmfqc343pcdy";
+          name = "image-dired-plus";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/image-dired+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    image-plus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "image-plus";
+        version = "0.6.2";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-imagex";
+          rev = "967508a6c151e6ab6e97d3ac332dc5599011830d";
+          sha256 = "0k69xbih0273xvmj035vcmm67l6hgjb99pb1jbva5x0pnszb1vdv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/image+";
+          sha256 = "1a9dxswnqn6cvx28180kclpjc0vc6fimzp7n91gpdwnmy123x6hg";
+          name = "image-plus";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/image+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "imenu-anywhere";
+        version = "0.9.0";
+        src = fetchFromGitHub {
+          owner = "vitoshka";
+          repo = "imenu-anywhere";
+          rev = "a090132492a3a98b6547240babe0bc0fa6154bb2";
+          sha256 = "0qc96p5f7paxaxzv73w072cba8jb6ibdbhml7n7cm85b0rz1wf16";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imenu-anywhere";
+          sha256 = "0p93g7ay9n4nhf1qk24mbax0w9sr06xd2kjmrz00gbg75sr9r2s8";
+          name = "imenu-anywhere";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/imenu-anywhere";
+          license = lib.licenses.free;
+        };
+      }) {};
+    imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "imenu-list";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "bmag";
+          repo = "imenu-list";
+          rev = "1324cffd571df5e35113efc57e1cdc8490068f9c";
+          sha256 = "192i3iaykw5a9fb9xaivfjj2pbziqdnadlrvqbxbl9h5wi52qq9c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imenu-list";
+          sha256 = "092fsn7hnbfabcyakbqyk20pk62sr8xrs45aimkv1l91681np98s";
+          name = "imenu-list";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/imenu-list";
+          license = lib.licenses.free;
+        };
+      }) {};
+    imenus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "imenus";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "imenus.el";
+          rev = "7409021864a4e74a237a00d1e1d2597dc80ef7f0";
+          sha256 = "18nx5z2vn0ikv4gxjprsqr63pcgf9s02gc3f769h8dji560kqxd4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imenus";
+          sha256 = "1q0j6r2n5vjlbgchkz9zdglmmbpd8agawzcg61knqrgzpc4lk82r";
+          name = "imenus";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/imenus";
+          license = lib.licenses.free;
+        };
+      }) {};
+    imgix = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, json ? null, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "imgix";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "imgix";
+          repo = "imgix-emacs";
+          rev = "cf3994f69b34a36f627e9ceaf3e6f4309ee9ec30";
+          sha256 = "19jqcbiwqknlpij9q63m1p69k4zb3v1qdx0858drprc2rl1p55cd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imgix";
+          sha256 = "0dh7qsz5c9mflldcw60vc8mrxrw76n2ydd7blv6jfmsnr19ila4q";
+          name = "imgix";
+        };
+        packageRequires = [ cl-lib dash ht json s ];
+        meta = {
+          homepage = "http://melpa.org/#/imgix";
+          license = lib.licenses.free;
+        };
+      }) {};
+    immutant-server = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "immutant-server";
+        version = "1.2.0";
+        src = fetchFromGitHub {
+          owner = "leathekd";
+          repo = "immutant-server.el";
+          rev = "6f3d303354a229780a33e6bae64460a95bfefe60";
+          sha256 = "1pf7pqh8yzyvh4gzvp5npfq8kcfjcbzra0kkw7zmz769xxc8v84x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/immutant-server";
+          sha256 = "15vcxag1ni41ja4b3q0444sq5ysrisis59la7li6h3617wy8r02i";
+          name = "immutant-server";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/immutant-server";
+          license = lib.licenses.free;
+        };
+      }) {};
+    import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "import-js";
+        version = "0.3.1";
+        src = fetchFromGitHub {
+          owner = "trotzig";
+          repo = "import-js";
+          rev = "e16a73f16d38d3c30bb2303b176568de6f30f533";
+          sha256 = "1511zk9nm48wr5mhm6xs86n3w7iij6zs20yqza6w3yn460h0kxmb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/import-js";
+          sha256 = "1grvzy378qj14wlbmhb3j7fx2zkl9wp65b5g0brjimav08nz7bls";
+          name = "import-js";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/import-js";
+          license = lib.licenses.free;
+        };
+      }) {};
+    import-popwin = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popwin }:
+    melpaBuild {
+        pname = "import-popwin";
+        version = "0.9";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-import-popwin";
+          rev = "34c3b34ffcadafea71600acb8f4e5ba385e6da19";
+          sha256 = "0ycsdwwfb27g85aby4jix1aj41a4vq6bf541iwla0xh3wsyxb01w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/import-popwin";
+          sha256 = "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy";
+          name = "import-popwin";
+        };
+        packageRequires = [ cl-lib popwin ];
+        meta = {
+          homepage = "http://melpa.org/#/import-popwin";
+          license = lib.licenses.free;
+        };
+      }) {};
+    inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "inf-clojure";
+        version = "1.4.0";
+        src = fetchFromGitHub {
+          owner = "clojure-emacs";
+          repo = "inf-clojure";
+          rev = "a9eb2109fcd547b5c9f18f7bf9e617f32d47b5a0";
+          sha256 = "1dmr1arqy2vs9jdjha513mvw3yfwgkn4zs728q83asjy91sfcz7k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inf-clojure";
+          sha256 = "0n8w0vx1dnbfz88j45a57z9bsmkxr2zyh6ld72ady8asanf17zhl";
+          name = "inf-clojure";
+        };
+        packageRequires = [ clojure-mode emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/inf-clojure";
+          license = lib.licenses.free;
+        };
+      }) {};
+    inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "inf-ruby";
+        version = "2.4.0";
+        src = fetchFromGitHub {
+          owner = "nonsequitur";
+          repo = "inf-ruby";
+          rev = "d130ede56a1203d0aa1c8e5bca5fedbfb14e7ce8";
+          sha256 = "11zsprv5ycnfqi358dd4cx70dbn6a8hccd4prf28lln7vhldbmjz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inf-ruby";
+          sha256 = "02f01vwzr6j9iqcdns4l579bhia99sw8hwdqfwqjs9gk3xampfpp";
+          name = "inf-ruby";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/inf-ruby";
+          license = lib.licenses.free;
+        };
+      }) {};
+    inflections = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "inflections";
+        version = "2.3";
+        src = fetchFromGitHub {
+          owner = "eschulte";
+          repo = "jump.el";
+          rev = "fb7355615276f00397b15182076bf472336448a9";
+          sha256 = "1fm69g4mrmdchvxr062bk7n1jvs2rrscddb02cldb5bgdrcw8g6j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inflections";
+          sha256 = "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70";
+          name = "inflections";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/inflections";
+          license = lib.licenses.free;
+        };
+      }) {};
+    init-loader = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "init-loader";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "emacs-jp";
+          repo = "init-loader";
+          rev = "128ee76adbf431f0b8c30a3a29cb20c9c5100cde";
+          sha256 = "031vb7ndz68x0119v4pyizz0ykd341ywcp5s7i4z35zx1vcqj8az";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/init-loader";
+          sha256 = "0rq7759abp0ml0l8dycvdl0j5wsxw9z5y9pyx68973a4ssbx2i0r";
+          name = "init-loader";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/init-loader";
+          license = lib.licenses.free;
+        };
+      }) {};
+    init-open-recentf = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "init-open-recentf";
+        version = "0.0.2";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "init-open-recentf.el";
+          rev = "39da6a50e7f39e6ccd9aada0c20d8b6d501cb487";
+          sha256 = "06w1vnfhjy8g62z6xajin5akgh30pa0kk56am61kv6mi5ia8fc96";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/init-open-recentf";
+          sha256 = "0xlmfxhxb2car8vfx7krxmxb3d56x0r3zzkj8ds7yqvr65z85x2r";
+          name = "init-open-recentf";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/init-open-recentf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    initsplit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "initsplit";
+        version = "1.6";
+        src = fetchFromGitHub {
+          owner = "dabrahams";
+          repo = "initsplit";
+          rev = "950bdc568e3fd08e6106170953caf98ac582a431";
+          sha256 = "1rfw38a63bvzglqx7mb8wlnzjvlmkhkn35hn66snqqgvnmnvi54g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/initsplit";
+          sha256 = "0n9dk3x62vgxfn39jkmdg8wxsik0xqkprifgvqzyvn8xcx1blyyq";
+          name = "initsplit";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/initsplit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    inline-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "inline-crypt";
+        version = "0.1.4";
+        src = fetchFromGitHub {
+          owner = "Sodel-the-Vociferous";
+          repo = "inline-crypt-el";
+          rev = "497ce9dc29a8ccac0b6dd6854f5d120514350282";
+          sha256 = "0jipds844432a8m4d5gxbbkk2h1rsq9fg748g6bxy2q066kyzfz6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inline-crypt";
+          sha256 = "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n";
+          name = "inline-crypt";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/inline-crypt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    inlineR = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "inlineR";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "inlineR.el";
+          rev = "29357186beca825e3d0451b700ec09b9ed65e37b";
+          sha256 = "15nasjknmzy57ilj1gaz3w5sj8b3ijcpgwcd6w2r9xhgcl86m40q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inlineR";
+          sha256 = "1fflq2gkpfn3jkv4a6yywzmxsq6qszfid1ri85ass1ppw6scdvzw";
+          name = "inlineR";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/inlineR";
+          license = lib.licenses.free;
+        };
+      }) {};
+    insert-shebang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "insert-shebang";
+        version = "0.9.4";
+        src = fetchFromGitHub {
+          owner = "psachin";
+          repo = "insert-shebang";
+          rev = "4161cc8c7d07d0979684838fa8e3eec582351d97";
+          sha256 = "1mqnz40zirnyn3wa71wzzjph3a0sbgvzcywcr7xnzqpl6sp7g93f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/insert-shebang";
+          sha256 = "0z88l1q925v9lwzr6nas9qjy0f57qxilg6smgpx9wj6lll3f7p5v";
+          name = "insert-shebang";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/insert-shebang";
+          license = lib.licenses.free;
+        };
+      }) {};
+    instapaper = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "instapaper";
+        version = "0.9.5";
+        src = fetchhg {
+          url = "https://bitbucket.com/jfm/emacs-instapaper";
+          rev = "8daa0058ede7";
+          sha256 = "0krscid3yz2b7kv75gd9fs92zgfl7pnl77dbp5gycv5rmw5mivp8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/instapaper";
+          sha256 = "1yibdpj3lx6vr33s75s1y415lxqljrk7pqc901f8nfa01kca7axn";
+          name = "instapaper";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/instapaper";
+          license = lib.licenses.free;
+        };
+      }) {};
+    interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "interleave";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "rudolfochrist";
+          repo = "interleave";
+          rev = "d7bfe03dfdfbdd2abd0a96174cacd2ef1ecd2041";
+          sha256 = "1bidhc4pgszx2gqsm125nw7i5ysy0mzc1ifcfkfgns1cpjr74rpn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/interleave";
+          sha256 = "18b3fpxn07y5abkcnaw9is9ihdhik7xjdj6kzl1pz958lk9f4hfy";
+          name = "interleave";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/interleave";
+          license = lib.licenses.free;
+        };
+      }) {};
+    iplayer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "iplayer";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "csrhodes";
+          repo = "iplayer-el";
+          rev = "48b664e36e1a8e37eeb3eee80b91ff7126ed449a";
+          sha256 = "043dnij48zdyg081sa7y64lm35z7zvrv8gcymv3l3a98r1yhy3v6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iplayer";
+          sha256 = "0wnxvdlnvlmspqsaqx0ldw8j03qjckkqzvx3cbpc2yfs55pm3p7r";
+          name = "iplayer";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/iplayer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ir-black-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ir-black-theme";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "jmdeldin";
+          repo = "ir-black-theme.el";
+          rev = "b1ca1d0778e3e6228ff756e7fdaf5f5982000fa2";
+          sha256 = "036q933yw7pimnnq43ydaqqfccgf4iwvjhjmsavp7l6y1w16rvmy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ir-black-theme";
+          sha256 = "1qpq9zbv63ywzk5mlr8x53g3rn37k0mdv6x1l1hcd90gka7vga9v";
+          name = "ir-black-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ir-black-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "irony";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "Sarcasm";
+          repo = "irony-mode";
+          rev = "9f0b33a5369806ba9c2f62238f64d6455a67af9e";
+          sha256 = "1wsh72dzm54srxdnlhnmbi8llc30syhbckycj5wmsamw8b89p7c2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/irony";
+          sha256 = "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a";
+          name = "irony";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/irony";
+          license = lib.licenses.free;
+        };
+      }) {};
+    isgd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "isgd";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "chmouel";
+          repo = "isgd.el";
+          rev = "764306dadd5a9213799081a48aba22f7c75cca9a";
+          sha256 = "09hx28lmldm7z3x22a0qx34id09fdp3z61pdr61flgny213q1ach";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/isgd";
+          sha256 = "0yc9mkjzj3w64f48flnjvd193mk9gndrrqbxz3cvmvq3vgahhzyi";
+          name = "isgd";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/isgd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ix = callPackage ({ fetchFromGitHub, fetchurl, grapnel, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ix";
+        version = "0.7";
+        src = fetchFromGitHub {
+          owner = "theanalyst";
+          repo = "ix.el";
+          rev = "498dac674f4f1910d39087b1457c5da5465a0614";
+          sha256 = "0rpxh1jv98dl9b5ldjkljk70z4hkl61kcmvy1lhpj3lxn8ysv87a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ix";
+          sha256 = "1fl76dk8vgw3mrh5iz99lrsllwya6ij9d1lj3szcrs4qnj0b5ql3";
+          name = "ix";
+        };
+        packageRequires = [ grapnel ];
+        meta = {
+          homepage = "http://melpa.org/#/ix";
+          license = lib.licenses.free;
+        };
+      }) {};
+    j-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "j-mode";
+        version = "1.1.1";
+        src = fetchFromGitHub {
+          owner = "zellio";
+          repo = "j-mode";
+          rev = "caa55dfaae01d1875380929826952c2b3ef8a653";
+          sha256 = "07kbicf760nw4qlb2lkf1ns8yzqy0r5jqqwqjbsnqxx4sm52hml9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/j-mode";
+          sha256 = "0f9lsr9hjhdvmzx565ivlncfzb4iq4rjjn6a41053cjy50bl066i";
+          name = "j-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/j-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jabber = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "jabber";
+        version = "0.8.92";
+        src = fetchgit {
+          url = "git://git.code.sf.net/p/emacs-jabber/git";
+          rev = "2999f58619dd9c20cc6cac8060c4c850a504cbbd";
+          sha256 = "af89d7052e555c7b5efb0c21387a50699056659fb83698691b70e75c88e4cd34";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jabber";
+          sha256 = "1g5pc80n3cd5pzs3hmpbnmxbldwakd72pdn3vvb0h26j9v073pa8";
+          name = "jabber";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jabber";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jade-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jade-mode";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "brianc";
+          repo = "jade-mode";
+          rev = "4e7a20db492719062f40b225ed730ed50be5db56";
+          sha256 = "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jade-mode";
+          sha256 = "156j0d9wx6hrhph0nsjsi1jha4h65rcbrbff1j2yr8vdsszjrs94";
+          name = "jade-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jade-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jammer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jammer";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "wasamasa";
+          repo = "jammer";
+          rev = "1ba232b71507b468c60dc53c2bc8888bef36c858";
+          sha256 = "0x0vz7m9kn7b2aiqvrdqx8qh84ynbpzy2asz2b18l47bcwa7r5bh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jammer";
+          sha256 = "01c4bii7gswhp6z9dgx4bhvsywiwbbdv7mg1zj6vp1530l74zx6z";
+          name = "jammer";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jammer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    japanlaw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "japanlaw";
+        version = "0.9.1";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "japanlaw.el";
+          rev = "d90b204b018893d5d75286c92948c0bddf94cce2";
+          sha256 = "08gkxxaw789g1r0dql11skz6i8bdrrz4wp87fzs9f5rgx99xxr6h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/japanlaw";
+          sha256 = "1pxss1mjk5660k80r1xqgslnbrsr6r4apgp9abjwjfxpg4f6d0sa";
+          name = "japanlaw";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/japanlaw";
+          license = lib.licenses.free;
+        };
+      }) {};
+    javadoc-lookup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "javadoc-lookup";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "javadoc-lookup";
+          rev = "0d5316407c9ec183040ca5c6ab71091b9444276f";
+          sha256 = "0ljpqgp2w3lr61n2vr748n3wyshlqnnbin0643jffa319l99z35r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/javadoc-lookup";
+          sha256 = "1fffs0iqkk9rg5vbxifvn09j4i2751p81bzcvy5fslr3r1r2nv79";
+          name = "javadoc-lookup";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/javadoc-lookup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jedi = callPackage ({ auto-complete, emacs, fetchFromGitHub, fetchurl, jedi-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jedi";
+        version = "0.2.7";
+        src = fetchFromGitHub {
+          owner = "tkf";
+          repo = "emacs-jedi";
+          rev = "8da022c8cda511428c72a6dc4c5be3c0a0c88584";
+          sha256 = "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jedi";
+          sha256 = "1777060q25k9n2g6h1lm5lkki900pmjqkxq72mrk3j19jr4pk9m4";
+          name = "jedi";
+        };
+        packageRequires = [ auto-complete emacs jedi-core ];
+        meta = {
+          homepage = "http://melpa.org/#/jedi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jedi-core = callPackage ({ cl-lib ? null, emacs, epc, fetchFromGitHub, fetchurl, lib, melpaBuild, python-environment }:
+    melpaBuild {
+        pname = "jedi-core";
+        version = "0.2.7";
+        src = fetchFromGitHub {
+          owner = "tkf";
+          repo = "emacs-jedi";
+          rev = "8da022c8cda511428c72a6dc4c5be3c0a0c88584";
+          sha256 = "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jedi-core";
+          sha256 = "0pzi32zdb4g9n4kvpmkdflmqypa7nckmnjq60a3ngym4wlzbb32f";
+          name = "jedi-core";
+        };
+        packageRequires = [ cl-lib emacs epc python-environment ];
+        meta = {
+          homepage = "http://melpa.org/#/jedi-core";
+          license = lib.licenses.free;
+        };
+      }) {};
+    js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nvm }:
+    melpaBuild {
+        pname = "js-comint";
+        version = "0.0.3";
+        src = fetchFromGitHub {
+          owner = "redguardtoo";
+          repo = "js-comint";
+          rev = "69c8475573f1ef1f59331027a0fe445161b51000";
+          sha256 = "1gf6ir4viy8zr9fwmjz4s7zkr3m7947sa8mai56bnv83r2k3s9ir";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js-comint";
+          sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1";
+          name = "js-comint";
+        };
+        packageRequires = [ nvm ];
+        meta = {
+          homepage = "http://melpa.org/#/js-comint";
+          license = lib.licenses.free;
+        };
+      }) {};
+    js2-closure = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "js2-closure";
+        version = "1.4";
+        src = fetchFromGitHub {
+          owner = "jart";
+          repo = "js2-closure";
+          rev = "e1b3e7db13285e63c3c428d87c018289352bd043";
+          sha256 = "0d2hqlgm09rw0azha5dxmq63b56sa8b9qj7gd7invibl6nnyjh4a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js2-closure";
+          sha256 = "19732bf98lk2ah2ssgkr1ngxx7rz3nhsiw84lsfmydb0vvm4fpk7";
+          name = "js2-closure";
+        };
+        packageRequires = [ js2-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/js2-closure";
+          license = lib.licenses.free;
+        };
+      }) {};
+    js2-highlight-vars = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "js2-highlight-vars";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "unhammer";
+          repo = "js2-highlight-vars.el";
+          rev = "bf38d12cf65eebc8b81866fd03f6a0389bb2a9ed";
+          sha256 = "0r2szaxr3q0gvxqd9asn03q8jf3nclxv4mqdsjn96s98n45x388l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js2-highlight-vars";
+          sha256 = "07bq393g2jy8ydvaqyqn6vdyfvyminvgi239yvwzg5g9a1xjc475";
+          name = "js2-highlight-vars";
+        };
+        packageRequires = [ js2-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/js2-highlight-vars";
+          license = lib.licenses.free;
+        };
+      }) {};
+    js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "js2-mode";
+        version = "20150909";
+        src = fetchFromGitHub {
+          owner = "mooz";
+          repo = "js2-mode";
+          rev = "5c9d8b82dddec2fab370ec8798569c7fc5698093";
+          sha256 = "0xj87grvg7pbhh4d239gaqai5gl72klhpp9yksaqn77qnm98q4fn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js2-mode";
+          sha256 = "0f9cj3n55qnlifxwk1yp8n1kfd319jf7qysnkk28xpvglzw24yjv";
+          name = "js2-mode";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/js2-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    js2-refactor = callPackage ({ dash, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, multiple-cursors, s, yasnippet }:
+    melpaBuild {
+        pname = "js2-refactor";
+        version = "0.7.1";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "js2-refactor.el";
+          rev = "ac3da94a33b714d44d4f0adc670a829fdc522e34";
+          sha256 = "08wxsz90x5zhma3q8kqfd01avhzxjmcrjc95s757l5xaynsc2bly";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js2-refactor";
+          sha256 = "09dcfwpxxyw0ffgjjjaaxbsj0x2nwfrmxy1a05h8ba3r3jl4kl1r";
+          name = "js2-refactor";
+        };
+        packageRequires = [ dash js2-mode multiple-cursors s yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/js2-refactor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    js3-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "js3-mode";
+        version = "1.1.0";
+        src = fetchFromGitHub {
+          owner = "thomblake";
+          repo = "js3-mode";
+          rev = "5ccda46ba39998a74bd724fdffb34634be5b6563";
+          sha256 = "17d0nf1kz7mgv5qz57q6khy4w5vrmsliqirggahk9s6nnsx1j56n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js3-mode";
+          sha256 = "12s5qf6zfcv4m5kqxvh9b4zgwf433x39a210d957gjjp5mywbb1r";
+          name = "js3-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/js3-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jsfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jsfmt";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "brettlangdon";
+          repo = "jsfmt.el";
+          rev = "c5d9742872509143db0250a77db705ef78f02cd0";
+          sha256 = "0pjmslxwmlb9cb3j5qfsyxq1lg1ywzw1p9dvj330c2m7nla1j70x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jsfmt";
+          sha256 = "1syy32sv2d57b3gja0ly65h36mfnyq6hzf5lnnl3r58yvbdzngqd";
+          name = "jsfmt";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jsfmt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    json-mode = callPackage ({ fetchFromGitHub, fetchurl, json-reformat, json-snatcher, lib, melpaBuild }:
+    melpaBuild {
+        pname = "json-mode";
+        version = "1.6.0";
+        src = fetchFromGitHub {
+          owner = "joshwnj";
+          repo = "json-mode";
+          rev = "ce275e004dc7265047a80dec68b24eb058b200f0";
+          sha256 = "0sxkp9m68rvff8dbr8jlsx85w5ngifn19lwhcydysm7grbwzrdi3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/json-mode";
+          sha256 = "014j10wgxsqy6d6aksnkz2dr5cmpsi8c7v4a825si1vgb4622a70";
+          name = "json-mode";
+        };
+        packageRequires = [ json-reformat json-snatcher ];
+        meta = {
+          homepage = "http://melpa.org/#/json-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    json-reformat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "json-reformat";
+        version = "0.0.6";
+        src = fetchFromGitHub {
+          owner = "gongo";
+          repo = "json-reformat";
+          rev = "b9bd375ec1deb10d2ba09c409bdcf99c56d7a716";
+          sha256 = "0qp4n2k6s69jj4gwwimkpadjv245y54wk3bxb1x96f034gkp81vs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/json-reformat";
+          sha256 = "1m5p895w9qdgb8f67xykhzriribgmp20a1lvj64iap4aam6wp8na";
+          name = "json-reformat";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/json-reformat";
+          license = lib.licenses.free;
+        };
+      }) {};
+    json-snatcher = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "json-snatcher";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "Sterlingg";
+          repo = "json-snatcher";
+          rev = "c4cecc0a5051bd364373aa499c47a1bb7a5ac51c";
+          sha256 = "05zsgnk7grgw9jzwl80h5sxfpifxlr37b4mkbvx7mjq4z14xc2jw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/json-snatcher";
+          sha256 = "0f6j9g3c5fz3wlqa88706cbzinrs3dnfpgsr2d3h3117gic4iwp4";
+          name = "json-snatcher";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/json-snatcher";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jsx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jsx-mode";
+        version = "0.1.10";
+        src = fetchFromGitHub {
+          owner = "jsx";
+          repo = "jsx-mode.el";
+          rev = "1ca260b76f6e6251c528ed89501597a5b456c179";
+          sha256 = "1wx28rr5dk238yz07xn95v88qmv10c1gz9pcxard2kszpnmrn6dx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jsx-mode";
+          sha256 = "1lnjnyn8qf3biqr92z443z6b58dly7glksp1g986vgqzdprq3n1b";
+          name = "jsx-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jsx-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "julia-mode";
+        version = "0.4.3";
+        src = fetchFromGitHub {
+          owner = "JuliaLang";
+          repo = "julia";
+          rev = "a2f713dea5ac6320d8dcf2835ac4a37ea751af05";
+          sha256 = "0kvk1qiy2cj0iw2c0mx0dyr3jjvhyj1gwym6l43n7clp5kqcij1z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/julia-mode";
+          sha256 = "0c5bdgh98hw7484s2is84af7hznd8c4z5vlzfd98s8qxi7bldqjm";
+          name = "julia-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/julia-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jump = callPackage ({ fetchFromGitHub, fetchurl, findr, inflections, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jump";
+        version = "2.3";
+        src = fetchFromGitHub {
+          owner = "eschulte";
+          repo = "jump.el";
+          rev = "fb7355615276f00397b15182076bf472336448a9";
+          sha256 = "1fm69g4mrmdchvxr062bk7n1jvs2rrscddb02cldb5bgdrcw8g6j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jump";
+          sha256 = "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364";
+          name = "jump";
+        };
+        packageRequires = [ findr inflections ];
+        meta = {
+          homepage = "http://melpa.org/#/jump";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jump-to-line = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jump-to-line";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "ongaeshi";
+          repo = "jump-to-line";
+          rev = "01ef8c3529d85e6c59cc20840acbc4a8e8325bc8";
+          sha256 = "1s9plmg323m1p625xqnks0yqz0zlsjacdj7pv8f783r0d9jmfq3s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jump-to-line";
+          sha256 = "09ifhsggl5mrb6l8nqnl38yph0v26v30y98ic8hl23i455hqkkdr";
+          name = "jump-to-line";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/jump-to-line";
+          license = lib.licenses.free;
+        };
+      }) {};
+    jvm-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jvm-mode";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "martintrojer";
+          repo = "jvm-mode.el";
+          rev = "16d84c8c80bb214367bae6ed30b08756521c27d6";
+          sha256 = "1785nsv61m51lpykai2wxrv6zmwbm5654v937fgw177p37054s83";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jvm-mode";
+          sha256 = "1r283b4s0pzq4hgwcz5cnhlvdvq4gy0x51g3vp0762s8qx969a5w";
+          name = "jvm-mode";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/jvm-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kaesar = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kaesar";
+        version = "0.9.0";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-kaesar";
+          rev = "4fa74851cd928f30e9f2ee1aa27ee6074ad253ea";
+          sha256 = "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kaesar";
+          sha256 = "0zhi1dv1ay1azh7afq4x6bdg91clwpsr13nrzy7539yrn9sglj5l";
+          name = "kaesar";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/kaesar";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kaesar-file = callPackage ({ fetchFromGitHub, fetchurl, kaesar, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kaesar-file";
+        version = "0.9.0";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-kaesar";
+          rev = "4fa74851cd928f30e9f2ee1aa27ee6074ad253ea";
+          sha256 = "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kaesar-file";
+          sha256 = "0dcizg82maad98mbqqw5lamwz7n2lpai09jsrc66x3wy8k784alc";
+          name = "kaesar-file";
+        };
+        packageRequires = [ kaesar ];
+        meta = {
+          homepage = "http://melpa.org/#/kaesar-file";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kaesar-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, kaesar, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kaesar-mode";
+        version = "0.9.0";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-kaesar";
+          rev = "4fa74851cd928f30e9f2ee1aa27ee6074ad253ea";
+          sha256 = "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kaesar-mode";
+          sha256 = "0yqnlchbpmhsqc8j531n08vybwa32cy0v9sy4f9fgxa90rfqczry";
+          name = "kaesar-mode";
+        };
+        packageRequires = [ cl-lib kaesar ];
+        meta = {
+          homepage = "http://melpa.org/#/kaesar-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kakapo-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kakapo-mode";
+        version = "1.2";
+        src = fetchFromGitHub {
+          owner = "listx";
+          repo = "kakapo-mode";
+          rev = "fe3d579867f7465cd3ad04f29b4b2b3b820edc01";
+          sha256 = "0b6af8hnrn0v4z1xpahjfpw5iga2bmgd3qwfn3is2rygsn5rkm40";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kakapo-mode";
+          sha256 = "0a99cqflpzasl4wcmmf99aj8xgywkym37j7mvnsajrsk5wawdlss";
+          name = "kakapo-mode";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/kakapo-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    karma = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "karma";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "tonini";
+          repo = "karma.el";
+          rev = "f4ee856e7f59649e9d9021c46f872f9b4f5b7e6e";
+          sha256 = "0avcg307r4navvgj3hjkggk4gr7mzs4mljhxh223r8g69l9bm6m8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/karma";
+          sha256 = "19wl7js7wmw7jv2q3l4r5zl718lhy2a0jhl79k57ihwhxdc58fwc";
+          name = "karma";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/karma";
+          license = lib.licenses.free;
+        };
+      }) {};
+    key-combo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "key-combo";
+        version = "1.6";
+        src = fetchFromGitHub {
+          owner = "uk-ar";
+          repo = "key-combo";
+          rev = "0bc0cf6466a4257047a21a6d01913e92e6862165";
+          sha256 = "14ijniyvcfmj4y77yhiplsclincng2r3jbdnmmdnwzliv65f7l6q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/key-combo";
+          sha256 = "1v8saw92jphvjkyy7j9jx7cxzgisl4zpf4wjzdjfw3la5lz11waf";
+          name = "key-combo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/key-combo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    key-seq = callPackage ({ fetchFromGitHub, fetchurl, key-chord, lib, melpaBuild }:
+    melpaBuild {
+        pname = "key-seq";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "vlevit";
+          repo = "key-seq.el";
+          rev = "e29b083a6427d061638749194fc249ef69ad2cc0";
+          sha256 = "05vpydcgiaya35b62cdjxna9y02vnwzzg6p8jh0dkr9k44h4iy3f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/key-seq";
+          sha256 = "166k6hl9vvsnnksvhrv5cbhv9bdiclnbfv7qf67q4c1an9xzqi74";
+          name = "key-seq";
+        };
+        packageRequires = [ key-chord ];
+        meta = {
+          homepage = "http://melpa.org/#/key-seq";
+          license = lib.licenses.free;
+        };
+      }) {};
+    keychain-environment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "keychain-environment";
+        version = "2.2.0";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "keychain-environment";
+          rev = "40eba65a3d5581473d6a30f3a7abf73e5832b8c8";
+          sha256 = "07h6s1wdc83cqf08vqm4gh2r7bihbar4a31wr0140fn4rbhicwdw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keychain-environment";
+          sha256 = "1w77cg00bwx68h0d6k6r1fzwdwz97q12ch2hmpzjnblqs0i4sv8v";
+          name = "keychain-environment";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/keychain-environment";
+          license = lib.licenses.free;
+        };
+      }) {};
+    keydef = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "keydef";
+        version = "1.15";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "keydef";
+          rev = "dff2be9f58d12d8c6a490ad0c1b2b10b55528dc0";
+          sha256 = "0dkc51bmix4b8czs2wg6vz8vk32qlll1b9fjmx6xshrxm85cyhvv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keydef";
+          sha256 = "0yb2vgj7abyg8j7qmv74nsanv50lf350q1m58rjv8wm31yykg992";
+          name = "keydef";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/keydef";
+          license = lib.licenses.free;
+        };
+      }) {};
+    keyfreq = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "keyfreq";
+        version = "1.7";
+        src = fetchFromGitHub {
+          owner = "dacap";
+          repo = "keyfreq";
+          rev = "0c0a36a895a34d802614d34d7a3cc986e502ea35";
+          sha256 = "0ways4ksb9pk2kkpgclsxgc0ycfwcr8vghlbv5ic4y0c4ycmlb2d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keyfreq";
+          sha256 = "1rw6hzmw7h5ngvndy7aa41pq911y2hr9kqc9w4gdd5v2p4ln1qh7";
+          name = "keyfreq";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/keyfreq";
+          license = lib.licenses.free;
+        };
+      }) {};
+    keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "keymap-utils";
+        version = "0.5.2";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "keymap-utils";
+          rev = "dd396093899a3792ef88742657e799339fd8aed5";
+          sha256 = "06ajkqxv71hcrwc707ybzwfw4yzbsp6basnbs493ryr41gnvmnzs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keymap-utils";
+          sha256 = "0nbcwz4nls0pva79lbx91bpzkl38g98yavwkvg2rxbhn9vjbhzs9";
+          name = "keymap-utils";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/keymap-utils";
+          license = lib.licenses.free;
+        };
+      }) {};
+    keyset = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "keyset";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "HKey";
+          repo = "keyset";
+          rev = "25658ef79d26971ce41d9df207dff58d38daa091";
+          sha256 = "0z6sgz8nywsd00zaayafwy5hfi7kzxfifjkfr5cn1l7wlypyksfv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keyset";
+          sha256 = "1kfw0pfb6qm2ji1v0kb8xgz8q2yd2k9kxmaz5vxcdixdlax3xiqg";
+          name = "keyset";
+        };
+        packageRequires = [ cl-lib dash ];
+        meta = {
+          homepage = "http://melpa.org/#/keyset";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kibit-helper = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "kibit-helper";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "brunchboy";
+          repo = "kibit-helper";
+          rev = "ec5f154db3bb0c838e86f527353f08644cede926";
+          sha256 = "0ky167xh1hrmqsldybzjhyqjizgjzs1grn5mf8sm2j9qwcvjw2zv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kibit-helper";
+          sha256 = "15viybjqksylvm5ash2kzsil0cpdka56wj1rryixa8y1bwlj8y4s";
+          name = "kibit-helper";
+        };
+        packageRequires = [ emacs s ];
+        meta = {
+          homepage = "http://melpa.org/#/kibit-helper";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kill-or-bury-alive";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "kill-or-bury-alive";
+          rev = "6e0d1ff08889d9cf3f89e366e327d9de930cf67c";
+          sha256 = "11cqrjxfiflz89gkl9g5m0wx041s28xz879cvhl3i1yjnwyhzqay";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kill-or-bury-alive";
+          sha256 = "0mm0m8hpy5v98cap4f0s38dcviirm7s6ra4l94mknyvnx0f73lz8";
+          name = "kill-or-bury-alive";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/kill-or-bury-alive";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kill-ring-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kill-ring-search";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "nschum";
+          repo = "kill-ring-search.el";
+          rev = "3a5bc1767f742c91aa788df79ecec836a0946edb";
+          sha256 = "0axvhikhg4fikiz4ifg0p4a5ygphbpjs0wd0gcbx29n0y54d1i93";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kill-ring-search";
+          sha256 = "1pg4j1rrji64rrdv2xpwz33vlyk8r0hz4j4fikzwpbcbmni3skan";
+          name = "kill-ring-search";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/kill-ring-search";
+          license = lib.licenses.free;
+        };
+      }) {};
+    killer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "killer";
+        version = "0.2.2";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "killer";
+          rev = "52256640aebbb8c25f8527843c2425b848031cd8";
+          sha256 = "0imylcaiwpzvvb3g8kpsna1vk7v7bwdjfcsa98i41m1rv9yla86l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/killer";
+          sha256 = "10z4vqwrpss7mk0gq8xdsbsl0qibpp7s1g0l8wlmrsgn6kjkr2ma";
+          name = "killer";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/killer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kivy-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kivy-mode";
+        version = "1.9.1";
+        src = fetchFromGitHub {
+          owner = "kivy";
+          repo = "kivy";
+          rev = "7e789b24cdb0ee044469d7bc42da9e4146674a18";
+          sha256 = "0rzzjzkzgpiadm9awkj7wrh2hg97lhgwxg74gvdis3fc1xg2hyri";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kivy-mode";
+          sha256 = "02l230rwivr7rbiqm4vg70458z35f9v9w3mdapcrqd5d07y5mvi1";
+          name = "kivy-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/kivy-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    know-your-http-well = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "know-your-http-well";
+        version = "0.4.0";
+        src = fetchFromGitHub {
+          owner = "for-GET";
+          repo = "know-your-http-well";
+          rev = "e208d856ce1b036d2dc1454813c6fc81f0269def";
+          sha256 = "08q43k4450kgygyvqv18gwcmmb7y9x445401048lbixc4cp6p3cg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/know-your-http-well";
+          sha256 = "0k2x0ajxkivim8nfpli716y7f4ssrmvwi56r94y34x4j3ib3px3q";
+          name = "know-your-http-well";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/know-your-http-well";
+          license = lib.licenses.free;
+        };
+      }) {};
+    kurecolor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "kurecolor";
+        version = "1.2.2";
+        src = fetchFromGitHub {
+          owner = "emacsfodder";
+          repo = "kurecolor";
+          rev = "c8c72cea04e51f57701d2dd9be7dba5f3412e2f3";
+          sha256 = "0da4y9pf6vq0i6w7bmvrszg9bji3ylhr44hmyrmxvah28pigb2fz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kurecolor";
+          sha256 = "0q0q0dfv376h7j3sgwxqwfpxy1qjbvb6i5clsxz9xp4ly89w4d4f";
+          name = "kurecolor";
+        };
+        packageRequires = [ emacs s ];
+        meta = {
+          homepage = "http://melpa.org/#/kurecolor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    langtool = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "langtool";
+        version = "1.5.1";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-langtool";
+          rev = "708799b021d4f4a765c312e33737e343d7e3c9bf";
+          sha256 = "1i8wbhc6i88plpq48ccka0avdj2x5rcxm81j93dmwp70ld0zws8p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/langtool";
+          sha256 = "1xq70jyhzg0qmvialy015crbdk9rdibhwpl36khab9hi2999wxyw";
+          name = "langtool";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/langtool";
+          license = lib.licenses.free;
+        };
+      }) {};
+    latex-extra = callPackage ({ auctex, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "latex-extra";
+        version = "1.11";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "latex-extra";
+          rev = "455b7873de095cbce6aa256f33cf64dba3dbaa29";
+          sha256 = "1rr6cgx70avqf1b19la7g8cav926676a76cflkkw18c1bsw83ss3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/latex-extra";
+          sha256 = "1w98ngxymafigjpfalybhs12jcf4916wk4nlxflfjcx8ryd9wjcj";
+          name = "latex-extra";
+        };
+        packageRequires = [ auctex cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/latex-extra";
+          license = lib.licenses.free;
+        };
+      }) {};
+    latex-math-preview = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "latex-math-preview";
+        version = "0.7.2";
+        src = fetchFromGitLab {
+          owner = "latex-math-preview";
+          repo = "latex-math-preview";
+          rev = "c1c87c4c5501f98b97af19f7e3454a2369265edc";
+          sha256 = "118xrgrnwsmsysmframf6bmb0gkrdrm3jbkgivzxs41cw92fhbzw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/latex-math-preview";
+          sha256 = "14bn0q5czrrkb1vjdkwx6f2x4zwjkxgrc0bcncv23l13qls1gkmr";
+          name = "latex-math-preview";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/latex-math-preview";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ledger-mode";
+        version = "3.1.1";
+        src = fetchFromGitHub {
+          owner = "ledger";
+          repo = "ledger";
+          rev = "f612ef0b25a6f679fae47f8371bcd4c25a380b02";
+          sha256 = "011a0l2jx4x687s3mqhhyrgpwxqcjv0cn4alhd55caql6z5cwh5h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ledger-mode";
+          sha256 = "0hi9waxmw1bbg88brlr3816vhdi0jj05wcwvrvfc1agvrvzyqq8s";
+          name = "ledger-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ledger-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lentic = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild, s }:
+    melpaBuild {
+        pname = "lentic";
+        version = "0.11";
+        src = fetchFromGitHub {
+          owner = "phillord";
+          repo = "lentic";
+          rev = "8655ecd51e189bbdd6a4d8405dc3ea2e689c709a";
+          sha256 = "04h6vk7w25yp4kzkwqnsmc59bm0182qqkyk5nxm3a1lv1v1590lf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lentic";
+          sha256 = "0y94y1qwj23kqp491b1fzqsrjak96k1dmmzmakbl7q8vc9bncl5m";
+          name = "lentic";
+        };
+        packageRequires = [ dash emacs f m-buffer s ];
+        meta = {
+          homepage = "http://melpa.org/#/lentic";
+          license = lib.licenses.free;
+        };
+      }) {};
+    less-css-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "less-css-mode";
+        version = "0.20";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "less-css-mode";
+          rev = "d59a3ff4031ae75fbbe77b6cfce7843205394c28";
+          sha256 = "1w6mbk4gc63sh2p9rsy851x2kid0dp2ja4ai5badkr5prxkcpfdn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/less-css-mode";
+          sha256 = "188iplnwwhawq3dby3388kimy0jh1k9r8v9nxz52hy9rhh9hykf8";
+          name = "less-css-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/less-css-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    letcheck = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "letcheck";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "letcheck";
+          rev = "e85b185993a2eaeec6490709f4c131fde2edd672";
+          sha256 = "1l9qjmyb4a3f6i2iimpmjczbx890cd1p24n941s13sg67xfbm7hn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/letcheck";
+          sha256 = "1sjwi1ldg6b1qvj9cvfwxq3qlkfas6pm8zasf43baljmnz38mxh2";
+          name = "letcheck";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/letcheck";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lfe-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lfe-mode";
+        version = "0.10.1";
+        src = fetchFromGitHub {
+          owner = "rvirding";
+          repo = "lfe";
+          rev = "d7bc80da04aedd0a607f17d8d149eba363872b4b";
+          sha256 = "1w9n5v4g4w34gii6nk2aan4w230dmm0dhml4s9q1fzmvk1ngld6k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lfe-mode";
+          sha256 = "06b382ncgk4zz3q8akyzfy55j86a53r97gf0l92qvlca7fbs8jjx";
+          name = "lfe-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lfe-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lice = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lice";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "buzztaiki";
+          repo = "lice-el";
+          rev = "69f2d87984f3f3d469db35e241fbbe979384cd03";
+          sha256 = "0hi8s20vw4a5i5n5jlm5dzgsl1qpfyqbpskqszjls1xrrf3dd4zl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lice";
+          sha256 = "1hv2hz3153x0gk7f2js18dbx5pyprfdf2pfxb658fj16vxpp7y6x";
+          name = "lice";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lice";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lingr = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lingr";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "lugecy";
+          repo = "lingr-el";
+          rev = "c9c20dd9b4967aa2f8873d6890d6797e6a498d23";
+          sha256 = "11sw43z5b0vypmhi0yysf2bxjy8fqpzl61y503jb7nhcfywmfkys";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lingr";
+          sha256 = "1445bxiirsxl9kgm0j86xc9d0pbaa5f07c1i66pw2vl40bvhrjff";
+          name = "lingr";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lingr";
+          license = lib.licenses.free;
+        };
+      }) {};
+    link = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "link";
+        version = "1.10";
+        src = fetchFromGitHub {
+          owner = "myrkr";
+          repo = "dictionary-el";
+          rev = "9ef1672ecd367827381bbbc9af93685980083c5c";
+          sha256 = "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/link";
+          sha256 = "17jpsg3f2954b740vyj37ikygrg5gmp0bjhbid8bh8vbz7xx9zy8";
+          name = "link";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/link";
+          license = lib.licenses.free;
+        };
+      }) {};
+    link-hint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "link-hint";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "noctuid";
+          repo = "link-hint.el";
+          rev = "d26b5330e6e42b4bed4e4730054b4c5e308ceab2";
+          sha256 = "1v4fadxv7ym6lc09nd2xpz2k5vrikjv7annw99ii5cqrwhqa5838";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/link-hint";
+          sha256 = "12fb2zm9jnh92fc2nzmzmwjlhi64rhakwbh9lsydx9svsvkgcs89";
+          name = "link-hint";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/link-hint";
+          license = lib.licenses.free;
+        };
+      }) {};
+    linum-relative = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "linum-relative";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "coldnew";
+          repo = "linum-relative";
+          rev = "1074e12904d08e00dda438d9700f2a3bff238bd5";
+          sha256 = "1m4g4b96cxs05pfln7kdi6gvrdbv76f8dk806py5lq0gq7da2csc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/linum-relative";
+          sha256 = "0s1lc3lppazv0481dxknm6qrxhvkv0r9hw8xmdrpjc282l91whkj";
+          name = "linum-relative";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/linum-relative";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, multiple-cursors, swiper }:
+    melpaBuild {
+        pname = "lispy";
+        version = "0.26.0";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "lispy";
+          rev = "7756a8fbbadbebbd5e20768569ed92ad6c402c5c";
+          sha256 = "05iqhnhj61f30yk4ih63rimmyp134gyq18frc8qgrnwym64dsm6l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lispy";
+          sha256 = "12qk2gpwzz7chfz7x3wds39r4iiipvcw2rjqncir46b6zzlb1q0g";
+          name = "lispy";
+        };
+        packageRequires = [
+          ace-window
+          emacs
+          hydra
+          iedit
+          multiple-cursors
+          swiper
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/lispy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lispyscript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lispyscript-mode";
+        version = "0.3.5";
+        src = fetchFromGitHub {
+          owner = "krisajenkins";
+          repo = "lispyscript-mode";
+          rev = "9a4200085e2a15725a58616d131a56f5edce214b";
+          sha256 = "0qyj04p63fdh3iasp5cna1z5fhibmfyl9lvwyh22ajzsfbr3nhnk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lispyscript-mode";
+          sha256 = "02biai45l5xl2m9l1drphrlj6r01msmadhyg774ijdk1x4gm5nhr";
+          name = "lispyscript-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lispyscript-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    list-packages-ext = callPackage ({ fetchFromGitHub, fetchurl, ht, lib, melpaBuild, persistent-soft, s }:
+    melpaBuild {
+        pname = "list-packages-ext";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "laynor";
+          repo = "list-packages-ext";
+          rev = "344719b313c208c644490f8f1130e21405402f05";
+          sha256 = "197cqkiwxgamhfwbc8h492cmjll3fypkwzcphj26dfnr22v63kwq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-packages-ext";
+          sha256 = "15m4888fm5xv697y7jspghg1ra49fyrny4y2x7h8ivcbslvpglvk";
+          name = "list-packages-ext";
+        };
+        packageRequires = [ ht persistent-soft s ];
+        meta = {
+          homepage = "http://melpa.org/#/list-packages-ext";
+          license = lib.licenses.free;
+        };
+      }) {};
+    list-unicode-display = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "list-unicode-display";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "list-unicode-display";
+          rev = "59770cf3572bd36c3e9ba044846dc420c0dca09b";
+          sha256 = "05nn4db8s8h4mn3fxhwsa111ayvlq1raf6bifh7jciyw7a2c3aww";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-unicode-display";
+          sha256 = "01x9i5k5vhjscmkx0l6r27w1cdp9n6xk1pdjf98z3y88dnsmyfha";
+          name = "list-unicode-display";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/list-unicode-display";
+          license = lib.licenses.free;
+        };
+      }) {};
+    list-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "list-utils";
+        version = "0.4.2";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "list-utils";
+          rev = "ecd6c91c71e37734af9ff4df003cb96b9d236a97";
+          sha256 = "0dmcmvf3dxmp1f71nq5xwsdrnyb04qr14ay4ckpaca2bmi7q0x5x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-utils";
+          sha256 = "0bknprr4jb1d20i9lj2aa17vpg1kqwdyzzwmy1kfydnkpf5scnr3";
+          name = "list-utils";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/list-utils";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lit-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lit-mode";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "HectorAE";
+          repo = "lit-mode";
+          rev = "c61c403afc8333a5649c5421ab1a6341dc1c7d92";
+          sha256 = "0mr0king5dj20vdycpszxnfs9ch808fhcz3q7svxfngj3d3671wd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lit-mode";
+          sha256 = "05rf7ki060nqnvircn0dkpdrg7xbh7phb8bqgsab89ycc7l9vv59";
+          name = "lit-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lit-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    literate-coffee-mode = callPackage ({ coffee-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "literate-coffee-mode";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-literate-coffee-mode";
+          rev = "39fe3bfa1f68a7b8b91160875589219b214a2cd6";
+          sha256 = "1fh9wrw5irn0g3dy8gkk63csdcxgi3w2038mxx3sk6ki3r2bmhw8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/literate-coffee-mode";
+          sha256 = "1bll1y9q3kcg3v250asjvx2k9kb314qadaq1iwanwgdlp3qvvs40";
+          name = "literate-coffee-mode";
+        };
+        packageRequires = [ coffee-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/literate-coffee-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    live-code-talks = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, narrowed-page-navigation }:
+    melpaBuild {
+        pname = "live-code-talks";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "david-christiansen";
+          repo = "live-code-talks";
+          rev = "3a2ecdb49b2651d87999d4cad56ba8f1004c7a99";
+          sha256 = "1cwydbhhbs5v9y2s872zxc5lflqmfrdvnc8xz0qars52d7lg4br5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/live-code-talks";
+          sha256 = "173mjmxanva13vk2f3a06s4dy62x271kynsa7pbhdg4fd72hdjma";
+          name = "live-code-talks";
+        };
+        packageRequires = [ cl-lib emacs narrowed-page-navigation ];
+        meta = {
+          homepage = "http://melpa.org/#/live-code-talks";
+          license = lib.licenses.free;
+        };
+      }) {};
+    live-py-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "live-py-mode";
+        version = "2.8.1";
+        src = fetchFromGitHub {
+          owner = "donkirkby";
+          repo = "live-py-plugin";
+          rev = "75c27e0110257e3138e24dc2de2a19244635a0bf";
+          sha256 = "1y81qqsjj2sa319xkwhvq7bl3f5gma4cs7w8x2w510ms32fgqa8x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/live-py-mode";
+          sha256 = "0yn1a0gf9yn068xifpv8p77d917mnalc56pll800zlpsdk8ljicq";
+          name = "live-py-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/live-py-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    loc-changes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "loc-changes";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "rocky";
+          repo = "emacs-loc-changes";
+          rev = "8447baff7cb4839ef8d1d747a14e5da85d0cee5b";
+          sha256 = "1089sbx20r30sis39vwy29fxhb2n3hh35rdv09lpzdxdq01s8wwp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/loc-changes";
+          sha256 = "1akgij61b2ixpkchrriabwvx68cg4v5r5w9ncjrjh91hskjprfxh";
+          name = "loc-changes";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/loc-changes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    log4e = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "log4e";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "log4e";
+          rev = "6592682ab7de0e3d1915aa4d3c53e083be79fbeb";
+          sha256 = "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/log4e";
+          sha256 = "1klj59dv8k4r0hily489dp12ra5hq1jnsdc0wcakh6zirmakhs34";
+          name = "log4e";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/log4e";
+          license = lib.licenses.free;
+        };
+      }) {};
+    log4j-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "log4j-mode";
+        version = "1.3";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "log4j-mode";
+          rev = "ec3de92cfe60dd3d0de613e9062476196dea0faf";
+          sha256 = "14dmmjdmcc0zag8i947n59ihjc2df2l44f7issf66767ym3839kk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/log4j-mode";
+          sha256 = "0axr0x8mdxif0xbvs83mxc3gqgs84jb4b9la9n62i3lldckghwmg";
+          name = "log4j-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/log4j-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    logalimacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "logalimacs";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "logaling";
+          repo = "logalimacs";
+          rev = "cfd7aaa925934f876eee6e8c550cf6e7a239a2ac";
+          sha256 = "0g5vq9xy9lwczs77lr91c1srhhfmasnnnmjvgc55hbl6iwmbizbm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/logalimacs";
+          sha256 = "0ai7a01bdi3a0amgi63pwgdp8wgcgx10an4nhc627wgb1cqxb7p6";
+          name = "logalimacs";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/logalimacs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    logito = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "logito";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "sigma";
+          repo = "logito";
+          rev = "824acb89d2cc18cb47281a4fbddd81ad244a2052";
+          sha256 = "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/logito";
+          sha256 = "0bk4qnz66kvhzsk88lw45209778y53kg17iih70ix4ma1x6a3v5l";
+          name = "logito";
+        };
+        packageRequires = [ eieio ];
+        meta = {
+          homepage = "http://melpa.org/#/logito";
+          license = lib.licenses.free;
+        };
+      }) {};
+    logview = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "logview";
+        version = "0.4.2";
+        src = fetchFromGitHub {
+          owner = "doublep";
+          repo = "logview";
+          rev = "f53693b37b46af448d0ac102ebbb152a1cb915aa";
+          sha256 = "1yacic778ranlqblrcdhyf5igbrcin8aj30vjdm4klpmqb73hf1s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/logview";
+          sha256 = "0gks3j5avx8k3427a36lv7gr95id3cylaamgn5qwbg14s54y0vsh";
+          name = "logview";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/logview";
+          license = lib.licenses.free;
+        };
+      }) {};
+    loop = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "loop";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "loop.el";
+          rev = "8266cb4174171a7742101d57d9637a661e136613";
+          sha256 = "1rpvw0dvym559vb4nrfy74jq06nbsz2b0n60lcykagcir8mpcidk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/loop";
+          sha256 = "0pav16kinzljmzx84vfz63fvi39af4628vk1jw79jk0pyg9rjbar";
+          name = "loop";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/loop";
+          license = lib.licenses.free;
+        };
+      }) {};
+    love-minor-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "love-minor-mode";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "ejmr";
+          repo = "love-minor-mode";
+          rev = "1634ff3a8b657c63a5cffd9a937812a289f2c954";
+          sha256 = "11y5jyq4xg9zlm1qi2y97nh05vhva9pai9yyr4x2pr41xz3s8fpk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/love-minor-mode";
+          sha256 = "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m";
+          name = "love-minor-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/love-minor-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    lua-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "lua-mode";
+        version = "20151025";
+        src = fetchFromGitHub {
+          owner = "immerrr";
+          repo = "lua-mode";
+          rev = "bdf121b2c05bc74d3d7961a91d7afeb6176e0f45";
+          sha256 = "1psk4202rmkkfy1ir1ax4x4djfngd5pfry7x30ybq2ifqzymb9qb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lua-mode";
+          sha256 = "0gyi7w2h192h3pmrhq39lxwlwd9qyqs303lnp2655pikdzk9js94";
+          name = "lua-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/lua-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    m-buffer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "m-buffer";
+        version = "0.13";
+        src = fetchFromGitHub {
+          owner = "phillord";
+          repo = "m-buffer-el";
+          rev = "1ff021c5f6c74b092dc1aad28d28af1b5e060f76";
+          sha256 = "01847f8xmjfxvvi7hf73l7ypkdazwg8ciinm117zp4jkgnv0apz0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/m-buffer";
+          sha256 = "0l2rayglv48pcwnr1ggmn8c0az0mffgv02ivnzr9jcfs55ki07fc";
+          name = "m-buffer";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/m-buffer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    macro-math = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "macro-math";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "nschum";
+          repo = "macro-math.el";
+          rev = "105e03c80290d1b88984b2d265a149a13d722920";
+          sha256 = "0dgsl1x6r8m9vvff1ia0kmz21h0dji2jl5cqlpx1m947zh45dahj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/macro-math";
+          sha256 = "1r7splwq5kdrdhbmw5zn81vxymsrllgil48g8dl0r60293384h00";
+          name = "macro-math";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/macro-math";
+          license = lib.licenses.free;
+        };
+      }) {};
+    macrostep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "macrostep";
+        version = "0.8";
+        src = fetchFromGitHub {
+          owner = "joddie";
+          repo = "macrostep";
+          rev = "8950313a4e6e3e4bc1d9b0ce4ad4e3bf2f3eb73a";
+          sha256 = "0dkigxa39f3cmndxw79mgadwsj7w3bphns6l2hzhv6w0wdllpifp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/macrostep";
+          sha256 = "1wjibxbdsp5qfhq8xy0mcf3ms0q74qhdrhqndprn6jh3kcn5q63c";
+          name = "macrostep";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/macrostep";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "magic-filetype";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "magic-filetype.el";
+          rev = "1a3e425ab5b7b6614b7ece5885d23f12f45572f0";
+          sha256 = "128dqgh7kvjywiq0wq6ipnr1l1v2dzrz5j0rd3n2783r9nz0i7r5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magic-filetype";
+          sha256 = "0gcys45cqn5ghppkn0rmyvfybprlfz1x6hqr21yv93mf79h75zhg";
+          name = "magic-filetype";
+        };
+        packageRequires = [ emacs s ];
+        meta = {
+          homepage = "http://melpa.org/#/magic-filetype";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
+    melpaBuild {
+        pname = "magit";
+        version = "2.4.0";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "magit";
+          rev = "2e757a8c919b53edddb186e36e055e011e3b0ab3";
+          sha256 = "0hklwwzi2gqywysxn16ps1fvn48max52cpk2nx7r4df4h52yk6wn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit";
+          sha256 = "099i9h375yfhcylz8mvsm45mkkiyyhx0s1q3icba5n875jvq7smz";
+          name = "magit";
+        };
+        packageRequires = [
+          async
+          dash
+          emacs
+          git-commit
+          magit-popup
+          with-editor
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/magit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "magit-annex";
+        version = "1.1.0";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "magit-annex";
+          rev = "b51962dcc1080a35a91e2667f7c26fb33960c711";
+          sha256 = "0d7dick96g1vj6c9wh10rgwhwv5j3ixgw1m3z45szszswlrp1bih";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-annex";
+          sha256 = "1ri58s1ly416ksmb7mql6vnmx7hq59lmhi7qijknjarw7qs3bqys";
+          name = "magit-annex";
+        };
+        packageRequires = [ cl-lib magit ];
+        meta = {
+          homepage = "http://melpa.org/#/magit-annex";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-filenotify = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "magit-filenotify";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "magit-filenotify";
+          rev = "575c4321f61fb8f25e4779f9ffd4514ac086ae96";
+          sha256 = "1vn6x53kpwv3zf2b5xjswyz6v853r8b9dg88qhwd2h480hrx6kal";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-filenotify";
+          sha256 = "00a77czdi24n3zkx6jwaj2asablzpxq16iqd8s84kkqxcfiiahn7";
+          name = "magit-filenotify";
+        };
+        packageRequires = [ emacs magit ];
+        meta = {
+          homepage = "http://melpa.org/#/magit-filenotify";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-find-file = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "magit-find-file";
+        version = "2.1.0";
+        src = fetchFromGitHub {
+          owner = "bradleywright";
+          repo = "magit-find-file.el";
+          rev = "035da838b1a19e7a5ee135b4ca8475f4e235b61e";
+          sha256 = "1jlww053s580d7rlvmr1dl79wxasa0hhh2jnwb1ra353d6h3a73w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-find-file";
+          sha256 = "1d5flydyhwhvhlhi541zcnz2b03bi07zrp21bfz5sm069bf2c96b";
+          name = "magit-find-file";
+        };
+        packageRequires = [ dash magit ];
+        meta = {
+          homepage = "http://melpa.org/#/magit-find-file";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-gerrit = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "magit-gerrit";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "terranpro";
+          repo = "magit-gerrit";
+          rev = "699c5c39c6dbdc8d730721eaf1491f982dd78142";
+          sha256 = "0ym24gjd6c04zry08abcb09zvjbgj8nc1j12q0r51fhzzadxcxbb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-gerrit";
+          sha256 = "1iwvg10ly6dlf8llz9f8d4qfdbvd3s28wf48qgn1wjlxpka6zrd4";
+          name = "magit-gerrit";
+        };
+        packageRequires = [ magit ];
+        meta = {
+          homepage = "http://melpa.org/#/magit-gerrit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-gh-pulls = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild, pcache, s }:
+    melpaBuild {
+        pname = "magit-gh-pulls";
+        version = "0.5.2";
+        src = fetchFromGitHub {
+          owner = "sigma";
+          repo = "magit-gh-pulls";
+          rev = "e4a73781e3c1c7e4a09232b25e3474463cdf77b6";
+          sha256 = "19iqa2kzarpa75xy34hqvpy1y7dzx84pj540wwkj04dnpb4fwj2z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-gh-pulls";
+          sha256 = "0qn9vjxi33pya9s8v3g95scmhwrn2yf5pjm7d24frq766wigjv8d";
+          name = "magit-gh-pulls";
+        };
+        packageRequires = [ emacs gh magit pcache s ];
+        meta = {
+          homepage = "http://melpa.org/#/magit-gh-pulls";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "magit-gitflow";
+        version = "2.0.0";
+        src = fetchFromGitHub {
+          owner = "jtatarik";
+          repo = "magit-gitflow";
+          rev = "58c0f83b0fd02db0f6f4a0cb6101a710029caaeb";
+          sha256 = "00711dgbzmplqrfww8xf261ymz3jmhisnv9x1rhcw0ywmlfkbckz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-gitflow";
+          sha256 = "0wsqq3xpqqfak4aqwsh5sxjb1m62z3z0ysgdmnrch3qsh480r8vf";
+          name = "magit-gitflow";
+        };
+        packageRequires = [ magit ];
+        meta = {
+          homepage = "http://melpa.org/#/magit-gitflow";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "magit-popup";
+        version = "2.4.0";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "magit";
+          rev = "2e757a8c919b53edddb186e36e055e011e3b0ab3";
+          sha256 = "0hklwwzi2gqywysxn16ps1fvn48max52cpk2nx7r4df4h52yk6wn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-popup";
+          sha256 = "0w6m384bbmp3bd4qbss5h1jvcfp4qnpqvzlfykhdgjwpv2b2a2fj";
+          name = "magit-popup";
+        };
+        packageRequires = [ async dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/magit-popup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-rockstar = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "magit-rockstar";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "magit-rockstar";
+          rev = "6d572b9371c366814b3b071aa6301e503a47fbdd";
+          sha256 = "1pqbrrp4366kwfk1d32h2lb70id32ynfc03i7m2832w97f1xp16c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-rockstar";
+          sha256 = "1i4fmraiypyd3q6vvibkg9xqfxiq83kcz64b1dr3wmwn30j7986n";
+          name = "magit-rockstar";
+        };
+        packageRequires = [ dash magit ];
+        meta = {
+          homepage = "http://melpa.org/#/magit-rockstar";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-stgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "magit-stgit";
+        version = "2.1.2";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "magit-stgit";
+          rev = "d1793345a8d32b2c509077d634ca73148a68de4b";
+          sha256 = "1mk8g8rr9vf8jm0mmsj33p8gc71nhlv3847hvqywy6z40nhcjnyb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-stgit";
+          sha256 = "12wg1ig2jzy2np76brpwxdix9pwv75chviq3c24qyv4y80pd11sv";
+          name = "magit-stgit";
+        };
+        packageRequires = [ emacs magit ];
+        meta = {
+          homepage = "http://melpa.org/#/magit-stgit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-svn = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "magit-svn";
+        version = "2.1.1";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "magit-svn";
+          rev = "c6222981d4aae088d658cce5e58a14efea8590d6";
+          sha256 = "1g8zq0s38di96wlhljp370kyj4a0ir1z3vb94k66v2m5nj83ap68";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-svn";
+          sha256 = "02n732z06f0bhxqkxzlvm36bpqr40pas09zbzpfdk4pb6f9f80s0";
+          name = "magit-svn";
+        };
+        packageRequires = [ emacs magit ];
+        meta = {
+          homepage = "http://melpa.org/#/magit-svn";
+          license = lib.licenses.free;
+        };
+      }) {};
+    magit-topgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    melpaBuild {
+        pname = "magit-topgit";
+        version = "2.1.1";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "magit-topgit";
+          rev = "732de604c31c74e9da24616428c6e9668b57c881";
+          sha256 = "0dj183vphnvz9k2amga0ydcb4gkjxr28qz67055mxrf89q1qjq33";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-topgit";
+          sha256 = "1ngrgf40n1g6ncd5nqgr0zgxwlkmv9k4fik96dgzysgwincx683i";
+          name = "magit-topgit";
+        };
+        packageRequires = [ emacs magit ];
+        meta = {
+          homepage = "http://melpa.org/#/magit-topgit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    make-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "make-color";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "make-color.el";
+          rev = "b19cb40c0619e267f2948ed37aff67b712a6deed";
+          sha256 = "0fp5gbin1sgsdz39spk74vadkzig3ydwhpzx9vg7f231kk5f6wzx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/make-color";
+          sha256 = "0mrv8b67lpid5m8rfbhcik76bvnjlw4xmcrd2c2iinyl02y07r5k";
+          name = "make-color";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/make-color";
+          license = lib.licenses.free;
+        };
+      }) {};
+    makey = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "makey";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "mickeynp";
+          repo = "makey";
+          rev = "a61781e69d3b451551e269446e1c5f624ab81137";
+          sha256 = "1rr7vpm3xxzcaam3m8xni3ajy8ycyljix07n2jzczayri9sd8csy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/makey";
+          sha256 = "06xgrlkqvg288yd4lyhx4vi80jlfarhblxk5m5zzs5as7n08cvk4";
+          name = "makey";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/makey";
+          license = lib.licenses.free;
+        };
+      }) {};
+    malabar-mode = callPackage ({ fetchFromGitHub, fetchurl, fringe-helper, lib, melpaBuild }:
+    melpaBuild {
+        pname = "malabar-mode";
+        version = "20140303.946";
+        src = fetchFromGitHub {
+          owner = "m0smith";
+          repo = "malabar-mode";
+          rev = "4c5fde559f518509763a55040fdb0e4b6b04856a";
+          sha256 = "0z0ml7l1a45ych61qfc5fvkybl9hh37pgl6lzkaz6mcif1sl8gn1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/malabar-mode";
+          sha256 = "026ing7v22rz1pfzs2j9z09pm6dajpys992n45gzhwirz5f0q1rk";
+          name = "malabar-mode";
+        };
+        packageRequires = [ fringe-helper ];
+        meta = {
+          homepage = "http://melpa.org/#/malabar-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    malinka = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, rtags, s }:
+    melpaBuild {
+        pname = "malinka";
+        version = "0.3.1";
+        src = fetchFromGitHub {
+          owner = "LefterisJP";
+          repo = "malinka";
+          rev = "81cf7dd81fbf124ceda31ee963cce8c3616f28f1";
+          sha256 = "0hwxwwjzjxv2mmkxmalr2hp3x8apwcyvn2bz4d4yd4wrzcscay97";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/malinka";
+          sha256 = "1245mpxsxwnnpdsf0pd28mddgdfhh7x32a2l3sxfq0dyg2xlgvrp";
+          name = "malinka";
+        };
+        packageRequires = [ cl-lib dash f projectile rtags s ];
+        meta = {
+          homepage = "http://melpa.org/#/malinka";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mallard-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mallard-mode";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "jhradilek";
+          repo = "emacs-mallard-mode";
+          rev = "152cd44d53c881457fe57c1aba77e8e2fca4d1b0";
+          sha256 = "1272fsjzsza9dxm8s64b7x2jzr3ks8wjpwvgcxha2dnsjzklcdcj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mallard-mode";
+          sha256 = "0y2ikjgy107kb85pz50vv7ywslqgbrrkcfsrd8gsk1jky4qn8izd";
+          name = "mallard-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mallard-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    map-progress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "map-progress";
+        version = "0.5.0";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "map-progress";
+          rev = "6b8ef6b60626772082b2e80ec54d1f1275e1a1b8";
+          sha256 = "1fkijm0gikbwmxa9hf7s1rcwb0ipzjygd1mlicsm78rxvdd8k877";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/map-progress";
+          sha256 = "0zc5vii72gbfwbb35w8m30c8r9zck971hwgcn1a4wjczgn4vkln7";
+          name = "map-progress";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/map-progress";
+          license = lib.licenses.free;
+        };
+      }) {};
+    map-regexp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "map-regexp";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "map-regexp";
+          rev = "b8e06284ec1c593d7d2bda5f35597a63de46333f";
+          sha256 = "0kk1sk3cr4dbmgq4wzml8kdf14dn9jbyq4bwmvk0i7dic9vwn21c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/map-regexp";
+          sha256 = "0yiif0033lhaqggywzfizfia3siggwcz7yv4z7przhnr04akdmbj";
+          name = "map-regexp";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/map-regexp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    marcopolo = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
+    melpaBuild {
+        pname = "marcopolo";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "marcopolo";
+          rev = "ce6ad40d7feab0568924e3bd9659b76e3eecd55e";
+          sha256 = "0y4b69r2l6kvh7g8f1y9v1pdall3n668ci24lp04lcms6rxcrsnh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/marcopolo";
+          sha256 = "1nbck1m7lhync7n474578d2g1zc72c841hi236xjbdd2lnxz3zz0";
+          name = "marcopolo";
+        };
+        packageRequires = [ dash pkg-info request s ];
+        meta = {
+          homepage = "http://melpa.org/#/marcopolo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mark-tools = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mark-tools";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "stsquad";
+          repo = "emacs-mark-tools";
+          rev = "0e7ac2522ac84155cab341dc49f7f0b81067133c";
+          sha256 = "0fcyspz7n97n84d9203mxgn8ar4rn52qa49s3vayfrbkn038j5qw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mark-tools";
+          sha256 = "1688y7lnzhwdva2ildjabzi10i87klfsgvs947i7gfgxl7jwhisq";
+          name = "mark-tools";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mark-tools";
+          license = lib.licenses.free;
+        };
+      }) {};
+    markdown-mode = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "markdown-mode";
+        version = "2.1";
+        src = fetchgit {
+          url = "git://jblevins.org/git/markdown-mode.git";
+          rev = "c6eb56eff31f7961c9a00a5d18eaf939c2c40b7d";
+          sha256 = "8091933b49e8dfe57aa10377bd434b7c9b5807e9b78aa7a301885a44db1f7481";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-mode";
+          sha256 = "02lmhihv495drv9cb40h6l0xsbx7yglbvsdzc4r0vf78j87rs33f";
+          name = "markdown-mode";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/markdown-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    markdown-mode-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild }:
+    melpaBuild {
+        pname = "markdown-mode-plus";
+        version = "0.8";
+        src = fetchFromGitHub {
+          owner = "milkypostman";
+          repo = "markdown-mode-plus";
+          rev = "f35e63284c5caed19b29501730e134018a78e441";
+          sha256 = "1adl36fj506kgfw40gpagzsd7aypfdvy60141raggd5844i6y96r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-mode+";
+          sha256 = "1535kcj9nmcgmk2448jxc0jmnqy7f50cw2ngffjq5w8bfhgf7q00";
+          name = "markdown-mode-plus";
+        };
+        packageRequires = [ markdown-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/markdown-mode+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    markdown-preview-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, websocket }:
+    melpaBuild {
+        pname = "markdown-preview-mode";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "ancane";
+          repo = "markdown-preview-mode";
+          rev = "97d9276210465f4e9492169f3c0ed831a57cedf4";
+          sha256 = "10h5zh03c3v0c6pqcxvlns6l70k2l916nqvza53ikjpldmc4mln2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-preview-mode";
+          sha256 = "0i0mld45d8y96nkqn2r77nvbyw6wgsf8r54d3c2jrv04mnaxs7pg";
+          name = "markdown-preview-mode";
+        };
+        packageRequires = [ cl-lib markdown-mode websocket ];
+        meta = {
+          homepage = "http://melpa.org/#/markdown-preview-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    markdown-toc = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, s }:
+    melpaBuild {
+        pname = "markdown-toc";
+        version = "0.0.9";
+        src = fetchFromGitHub {
+          owner = "ardumont";
+          repo = "markdown-toc";
+          rev = "c2ac578113015ba7d3377c0756a4d00c61ba2e17";
+          sha256 = "0jgr327qlh7acwi6sld27xdsvr89parspk6wmfklwszvy1v13633";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-toc";
+          sha256 = "0slky735yzmbfi4ld264vw64b4a4nllhywp19ya0sljbsfycbihv";
+          name = "markdown-toc";
+        };
+        packageRequires = [ dash markdown-mode s ];
+        meta = {
+          homepage = "http://melpa.org/#/markdown-toc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    markup-faces = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "markup-faces";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "sensorflo";
+          repo = "markup-faces";
+          rev = "c43612633c6c161857a3bab5752ae192bb03f5f3";
+          sha256 = "0nk2rm14ccwrh1aaxzm80rllsz8g38h9w52m0pf3nnwh6sa757nk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markup-faces";
+          sha256 = "12z92j9f0mpn7w2qkiwg54wh743q3inx56q3f8qcpfzyks546grq";
+          name = "markup-faces";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/markup-faces";
+          license = lib.licenses.free;
+        };
+      }) {};
+    marmalade = callPackage ({ fetchFromGitHub, fetchurl, furl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "marmalade";
+        version = "0.0.4";
+        src = fetchFromGitHub {
+          owner = "nex3";
+          repo = "marmalade";
+          rev = "01d6ddf5f0e822d6df393aa4546b069b2d6545d7";
+          sha256 = "0pbli67wia8pximvgd68x6i9acdgsk51g9hjpqfm49rqg5nqalh9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/marmalade";
+          sha256 = "0ppa2s1fma1lc01byanfxpxfrjqk2snxbsmdbkcipjdi5dpb0a9s";
+          name = "marmalade";
+        };
+        packageRequires = [ furl ];
+        meta = {
+          homepage = "http://melpa.org/#/marmalade";
+          license = lib.licenses.free;
+        };
+      }) {};
+    marshal = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "marshal";
+        version = "0.5.3";
+        src = fetchFromGitHub {
+          owner = "sigma";
+          repo = "marshal.el";
+          rev = "2a3d102af4e996536a71ec38ab54e379c30a1ab0";
+          sha256 = "0sriyjjhgis7fgq276j5mw6n84jdwxf8lq0iqqiaqwmc66l985mv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/marshal";
+          sha256 = "17ikd8f1k42f28d4v5dn83zb44bsx7g336db60q068w6z8d4jbgl";
+          name = "marshal";
+        };
+        packageRequires = [ eieio json ];
+        meta = {
+          homepage = "http://melpa.org/#/marshal";
+          license = lib.licenses.free;
+        };
+      }) {};
+    matrix-client = callPackage ({ fetchgit, fetchurl, json ? null, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "matrix-client";
+        version = "0.2.0";
+        src = fetchgit {
+          url = "git://fort.kickass.systems/personal/rrix/pub/matrix.el";
+          rev = "de09c69d2d5ca604839239fe49b10a2ed5ac2809";
+          sha256 = "0516772e4aae604359bee659d101fb62b73cc9016cbbe0b749c77402954ec341";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/matrix-client";
+          sha256 = "09mgxk0xngw8j46vz6f5nwkb01iq96bf9m51w2q61wxivypnsyr6";
+          name = "matrix-client";
+        };
+        packageRequires = [ json request ];
+        meta = {
+          homepage = "http://melpa.org/#/matrix-client";
+          license = lib.licenses.free;
+        };
+      }) {};
+    maven-test-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "maven-test-mode";
+        version = "0.1.5";
+        src = fetchFromGitHub {
+          owner = "rranelli";
+          repo = "maven-test-mode";
+          rev = "f79409907375591283291eb96af4754b1ccc0e6f";
+          sha256 = "0x92b1qrhyrdh0z0xriyjc12h0wpk16x4yawj5i828ca6mz0qh5g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/maven-test-mode";
+          sha256 = "1k9w51rh003p67yalzq1w8am40nnr2khyyb5y4bwxgpms8z391fm";
+          name = "maven-test-mode";
+        };
+        packageRequires = [ emacs s ];
+        meta = {
+          homepage = "http://melpa.org/#/maven-test-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    maxframe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "maxframe";
+        version = "0.5";
+        src = fetchFromGitHub {
+          owner = "rmm5t";
+          repo = "maxframe.el";
+          rev = "4f1dbbe68048864037eae277b9280b90fd701ff1";
+          sha256 = "08gbkd8wln89j9yxp0zzd539hbwy1db31gca3vxxrpszixx8280y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/maxframe";
+          sha256 = "10cwy3gi3xb3pfdh6xiafxp3vvssawci3y26jda6550d0w5vardj";
+          name = "maxframe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/maxframe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mb-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mb-url";
+        version = "0.0.3";
+        src = fetchFromGitHub {
+          owner = "dochang";
+          repo = "mb-url";
+          rev = "34234214d1e62b9980cc64dac582e6771c92638d";
+          sha256 = "1si2givpzihjb1szbcdm3iy9kkm7bj0hq10s0h2dfm8axdnlirm5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mb-url";
+          sha256 = "1nf8ssan00qsn3d4dc6h6qzdwqzh977qb5d2m33kiwi6qb98988h";
+          name = "mb-url";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/mb-url";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mbe = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mbe";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "ijp";
+          repo = "mbe.el";
+          rev = "b022030d6e26198bb8a93a5b0bfe7aa891cd59ec";
+          sha256 = "00gwd2jf5ncgyay5w2jc2mhv18jf4ydnzpfkxaxw9zjbdxg4ym2i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mbe";
+          sha256 = "0h18mbcjy8nh4gl12kg2v8x6ps320yk7sbgq5alqnx2shp80kri3";
+          name = "mbe";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/mbe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mc-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
+    melpaBuild {
+        pname = "mc-extras";
+        version = "1.2.1";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "mc-extras.el";
+          rev = "71cf966be06d9c74e781a87bb30fa4cf657ee852";
+          sha256 = "0252wdq4sd6jhzfy0pn3gdm6aq2h13nnp8hvrn1mpml9x473a5n1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mc-extras";
+          sha256 = "0b110x6ygc95v5pb9lk1i731x5s6dagl5afzv37l1qchys36xrym";
+          name = "mc-extras";
+        };
+        packageRequires = [ multiple-cursors ];
+        meta = {
+          homepage = "http://melpa.org/#/mc-extras";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mediawiki";
+        version = "2.2.5";
+        src = fetchFromGitHub {
+          owner = "hexmode";
+          repo = "mediawiki-el";
+          rev = "f8f95722193cb74da2f6a01a0e558707c9b8c46d";
+          sha256 = "1vsla0a5x4kfyj3ca4r1v8cspp12dadi0frpailclaxfmpmpl5d3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mediawiki";
+          sha256 = "17cbrzfdp6jbbf74mn2fi1cwv7d1hvdbw9j84p43jzscnaa5ikx6";
+          name = "mediawiki";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mediawiki";
+          license = lib.licenses.free;
+        };
+      }) {};
+    melpa-upstream-visit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "melpa-upstream-visit";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "laynor";
+          repo = "melpa-upstream-visit";
+          rev = "7310c74fdead3c0f86ad6eff76cf989e63f70f66";
+          sha256 = "12cp56ppmwpdgf5afx7hd2qb8d1qq8z27191fbbf5zqw8cq5zkpd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/melpa-upstream-visit";
+          sha256 = "0j4afy9ipzr7pwkij8ab207mabd7srganlyyif9h1hvclj9svdmf";
+          name = "melpa-upstream-visit";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "http://melpa.org/#/melpa-upstream-visit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mentor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mentor";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "skangas";
+          repo = "mentor";
+          rev = "bd8e4b89341686bbaf4c44680bbae778b96fb8f0";
+          sha256 = "1y4ra5z3ayw3w7dszzlkk3qz3nv2jg1vvx8cf0y5j1pqpx8vy3jf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mentor";
+          sha256 = "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s";
+          name = "mentor";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mentor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    merlin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "merlin";
+        version = "2.3.1";
+        src = fetchFromGitHub {
+          owner = "the-lambda-church";
+          repo = "merlin";
+          rev = "6f9915e0d87bf721ea2859ffa17d3fbeeabcfb9d";
+          sha256 = "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/merlin";
+          sha256 = "0wnh7512sknagdk56j6gd8vamh9ns3vnggm56s73pik0m009w0xr";
+          name = "merlin";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/merlin";
+          license = lib.licenses.free;
+        };
+      }) {};
+    metaweblog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
+    melpaBuild {
+        pname = "metaweblog";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "punchagan";
+          repo = "metaweblog.el";
+          rev = "c8b50a6edf0fd2f396570c9a1c2ef8cd207606fb";
+          sha256 = "06mbdb4zb07skq1jpv05hr45k5x96d9hgkb358jiq0kfsqlrbbb4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/metaweblog";
+          sha256 = "11y5x3a8iv0hjj7ppi2sa7vawn7r475qfsh1jg415j4y4fzwpk6y";
+          name = "metaweblog";
+        };
+        packageRequires = [ xml-rpc ];
+        meta = {
+          homepage = "http://melpa.org/#/metaweblog";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mew = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mew";
+        version = "6.7";
+        src = fetchFromGitHub {
+          owner = "kazu-yamamoto";
+          repo = "Mew";
+          rev = "08289430ce14780a03789b71d2060ff4392fbae6";
+          sha256 = "1dhws4a298zrm88cdn66sikdk06n0p60d32cxsgybakkhg5c5wgr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mew";
+          sha256 = "0423xxn3cw6jmsd7vrw30hx9phga5chxzi6x7cvpswg1mhcyn9fk";
+          name = "mew";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mew";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mhc";
+        version = "1.1.1";
+        src = fetchFromGitHub {
+          owner = "yoshinari-nomura";
+          repo = "mhc";
+          rev = "46d2a983b77b3139c9694ffba16ae875edc7d5b0";
+          sha256 = "1bp4xqklf422n0zwwyj0ag3a4nndg8klazrga6rlvpy01hgg3drl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mhc";
+          sha256 = "02ikn9hx0kcfc2xrx4f38zpkfi6vgz7chcxk6q5d0vcsp93b4lql";
+          name = "mhc";
+        };
+        packageRequires = [ calfw ];
+        meta = {
+          homepage = "http://melpa.org/#/mhc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    migemo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "migemo";
+        version = "1.9.1";
+        src = fetchFromGitHub {
+          owner = "emacs-jp";
+          repo = "migemo";
+          rev = "97e07796573c4c47f286bfe8eeb6428cb474526e";
+          sha256 = "1ckb5hymwj4wmsxakalsky4mkzn9vxhxr6416b2cr6r5jxj4xgsl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/migemo";
+          sha256 = "0y49imdwygv5zd7cyh9ngda4gyb2mld2a4s7zh4yzlh7z5ha9qkr";
+          name = "migemo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/migemo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    milkode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "milkode";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "ongaeshi";
+          repo = "emacs-milkode";
+          rev = "ba97e2aeefa1d9d0b3835bf08edd0de248b0c513";
+          sha256 = "1qg64mxsm2cswk52mlj7sx7k6gfnrsdwnf68i7cachri0i8aq4ap";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/milkode";
+          sha256 = "07v6xgalx7vcw5sghckwvz584746cba05ql8flv8n556glm7hibh";
+          name = "milkode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/milkode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    minibuffer-complete-cycle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "minibuffer-complete-cycle";
+        version = "1.25.20130814";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "minibuffer-complete-cycle";
+          rev = "3df80135887d0169e02294a948711f6dfeca4a6f";
+          sha256 = "1zyb6c3xwdzk7dpn7xi0mvbcjdfxvzz1a0zlbs053pfar8iim5fk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minibuffer-complete-cycle";
+          sha256 = "0y1mxs6q9a8lzprrlb22qff6x5mvkw4gp2l6p2js2r0j9jzyffq2";
+          name = "minibuffer-complete-cycle";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/minibuffer-complete-cycle";
+          license = lib.licenses.free;
+        };
+      }) {};
+    minibuffer-cua = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "minibuffer-cua";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "minibuffer-cua.el";
+          rev = "e8dcddc24d4f2e8d7987336fb58259e3cc78bbcb";
+          sha256 = "07nbn2pwlp33kr136xsm6lzddhjs538xkz0fbays89psblmy4kwj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minibuffer-cua";
+          sha256 = "1ragvr73ykbvpgynnq3z0z4yzrlfhfqlwc1vbxclb8x2xmxq7pzw";
+          name = "minibuffer-cua";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/minibuffer-cua";
+          license = lib.licenses.free;
+        };
+      }) {};
+    miniedit = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "miniedit";
+        version = "2.0";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "miniedit";
+          rev = "e12bf659c3eb92dd8a4cb77642dc0865c54667a3";
+          sha256 = "1850z96gly0jnr50472idqz1drzqarr0n23bbasslrc501xkg0bq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/miniedit";
+          sha256 = "10s407q7igdi2hsaaahbw8vckalrl7z3s6l9cflf51q16xh2ih87";
+          name = "miniedit";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/miniedit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    minimal-session-saver = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "minimal-session-saver";
+        version = "0.6.2";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "minimal-session-saver";
+          rev = "aaba48a8525e1310b221eeb96763304c22e9a4b4";
+          sha256 = "0kjhn48sf2ps3k5pv06gqmqc4hlk6di9ld3ssw6vwfh8313x1fc5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minimal-session-saver";
+          sha256 = "1ay7wvriga28bdmarpfwagqzmmk93ri9f3idhr6z6iivwggwyy2i";
+          name = "minimal-session-saver";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/minimal-session-saver";
+          license = lib.licenses.free;
+        };
+      }) {};
+    minitest = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "minitest";
+        version = "0.8.0";
+        src = fetchFromGitHub {
+          owner = "arthurnn";
+          repo = "minitest-emacs";
+          rev = "2bed01262b0d888473468b5c7bd7d73694d31320";
+          sha256 = "0nd0jl5r5drnh98wdpqj2i7pgs7zvcizsh4qbvh8n0iw0c3f0pwh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minitest";
+          sha256 = "0x6nd4kkhiw8hh79r69861pf41j8p1y39kzf2rl61zlmyjz9zpmw";
+          name = "minitest";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/minitest";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mmm-mako = callPackage ({ fetchhg, fetchurl, lib, melpaBuild, mmm-mode }:
+    melpaBuild {
+        pname = "mmm-mako";
+        version = "1.1";
+        src = fetchhg {
+          url = "https://bitbucket.com/pjenvey/mmm-mako";
+          rev = "5c9ff92137b5";
+          sha256 = "0rpp748ym79sxccp9pyrwri14m7624zzb80srfgjfdpysrrs0jrr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mmm-mako";
+          sha256 = "0a4af5q9wxafrid8visp30cz6073ig0c961b78vmmgqrwvvxd3kn";
+          name = "mmm-mako";
+        };
+        packageRequires = [ mmm-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/mmm-mako";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mmm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mmm-mode";
+        version = "0.5.4";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "mmm-mode";
+          rev = "4085494df67e0a3207839a175ac62673dfd0acc1";
+          sha256 = "097s4xnwfy8d1wzmz65g2f8bnjjjlj67w1yzwn4d3yasb171nbv8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mmm-mode";
+          sha256 = "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw";
+          name = "mmm-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mmm-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mmt = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mmt";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "mmt";
+          rev = "e77b809e39b9ab437b662ee759e990163bc89377";
+          sha256 = "05nmcx3f63ds31cj3qwwp03ksflkfwlcn3z2xyxbny83r0dxbgvc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mmt";
+          sha256 = "0hal3qcw6x9658xpdaw6q9l2rr2z107pvg5bdzshf67p1b3lf9dq";
+          name = "mmt";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/mmt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mocker = callPackage ({ eieio ? null, el-x, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mocker";
+        version = "0.3.1";
+        src = fetchFromGitHub {
+          owner = "sigma";
+          repo = "mocker.el";
+          rev = "55b078b53ea49e48bd1821d96f0fb86f794fdc6c";
+          sha256 = "1lav7am41v63xgavq8pr88y828jmd1cxd4prjq7jlbxm6nvrwxh2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mocker";
+          sha256 = "1g90jp1czrrzrmn7n4linby3q4fb4gcflzv2amjv0sdimw1ln1w3";
+          name = "mocker";
+        };
+        packageRequires = [ eieio el-x ];
+        meta = {
+          homepage = "http://melpa.org/#/mocker";
+          license = lib.licenses.free;
+        };
+      }) {};
+    modalka = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "modalka";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "modalka";
+          rev = "f8ee86264a8e961b5821e11fdd490d5c4fc489c3";
+          sha256 = "1pgr1zlp26c7xy77qfvjfmv5i2j1c45xp59x83k8nllyhckxyqn6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/modalka";
+          sha256 = "0bkjykvl6sw797h7j76dzn1viy598asly98gcl5wrq13n4w1md4c";
+          name = "modalka";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/modalka";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mode-icons = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mode-icons";
+        version = "0.1.0";
+        src = fetchgit {
+          url = "git://ryuslash.org/mode-icons.git";
+          rev = "cbf412d0c47dfdbeac7587a0c12c96f58f546467";
+          sha256 = "b7afff1d8fb0b3f044d266af479df51fbb6021ff433628a9dc669695c1ddae40";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mode-icons";
+          sha256 = "18w221zjrrsfcymprv5x75i3qv04zy4bxl9mqjv0ys7qcc8xf1dp";
+          name = "mode-icons";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mode-icons";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mode-line-debug = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mode-line-debug";
+        version = "1.2.2";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "mode-line-debug";
+          rev = "da44422eeb6a1f055b4ec2f822962c5162fce001";
+          sha256 = "1lkw9nnlns6v7r6nx915f85whq1ri4w8lccwyxrvam40hfvq60s1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mode-line-debug";
+          sha256 = "0ppj14bm3rx3xgg4mfxa5zcm2r129jgmsx817wq3h7akjngcbfkd";
+          name = "mode-line-debug";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mode-line-debug";
+          license = lib.licenses.free;
+        };
+      }) {};
+    monokai-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "monokai-theme";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "oneKelvinSmith";
+          repo = "monokai-emacs";
+          rev = "9a6f126e1f02ec49d41fe2ee79670ca96a563f1a";
+          sha256 = "02w7k4s4698p4adjy4a36na28sb1s2zw4xsjs7p2hv9iiw9kmyvz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/monokai-theme";
+          sha256 = "13mv4vgsmdbf3v748lqi7b42hvr3yp86n97rb6792bcgd3kbdx7a";
+          name = "monokai-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/monokai-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    monroe = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "monroe";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "sanel";
+          repo = "monroe";
+          rev = "2f8aed286de47f5c4f65b352b6e4f72b47cac279";
+          sha256 = "1a0pv8fkv1cjdb0k5bmjd67a273bzcmxjwzgy4jpb3ng1qbb2xnm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/monroe";
+          sha256 = "04rhninxppvilk7s90g0wwa0g9vfcg7mk8mrb2m2c7cb9vj6wyig";
+          name = "monroe";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/monroe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    morlock = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "morlock";
+        version = "0.5.0";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "morlock";
+          rev = "804131c7cff5dafa762c666fd66458111e4ee36f";
+          sha256 = "1ndgw4799d816pkn2bwja5kmigydpmj9znn8cax4dxsd9fg2hzjy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/morlock";
+          sha256 = "0693jr1k8mzd7hwp52azkl62c1g1p5yinarjcmdksfyqblqq5jna";
+          name = "morlock";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/morlock";
+          license = lib.licenses.free;
+        };
+      }) {};
+    move-dup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "move-dup";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "wyuenho";
+          repo = "move-dup";
+          rev = "4df67072eebac69d6be7619335b03f56f9960235";
+          sha256 = "01mdy7sps0xryz5gfpl083rv7ixkxs2rkz5yaqjlam2rypdcsyy2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/move-dup";
+          sha256 = "0b0lmiisl9yckblwf7619if88qsmbka3bl4qiaqam7fka7psxs7f";
+          name = "move-dup";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/move-dup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mowedline = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mowedline";
+        version = "0.2.8";
+        src = fetchFromGitHub {
+          owner = "retroj";
+          repo = "mowedline";
+          rev = "c299991ace6f55e9edbf26c1d53b054873899101";
+          sha256 = "1mg7arw4wbbm84frq3sws5937fh901qn0xnjk9jcp3pvc4d0sxwd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mowedline";
+          sha256 = "0c2hvvwa7s5iyz517jaskshdcq9zs15zr6xsvrcb3biahrh4bmfb";
+          name = "mowedline";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mowedline";
+          license = lib.licenses.free;
+        };
+      }) {};
+    moz = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "moz";
+        version = "1.1.0";
+        src = fetchFromGitHub {
+          owner = "bard";
+          repo = "mozrepl";
+          rev = "646208b67e6c9c56d188db1eba999846d518935f";
+          sha256 = "13bf5jn1kgqg59j5czlzvajq2fw1rz4h5jqfc7x8w1a067nymf2c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/moz";
+          sha256 = "0ar2xgsi7csjj6fgiamrjwjc58j942dm32j3f3lz21yn2c4pnyxi";
+          name = "moz";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/moz";
+          license = lib.licenses.free;
+        };
+      }) {};
+    moz-controller = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, moz }:
+    melpaBuild {
+        pname = "moz-controller";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "RenWenshan";
+          repo = "emacs-moz-controller";
+          rev = "42fd842039620de7fb122f7e4ffc1ab802ee97c5";
+          sha256 = "1w1i1clkjg9mj1g4i2y3xw3hyj8s7h9gr04qgyb9c1q8vh11z8d0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/moz-controller";
+          sha256 = "18gca1csl9dfi9995mky8cbgi3xzf1if8pzdjiz5404gzcqk0rfd";
+          name = "moz-controller";
+        };
+        packageRequires = [ moz ];
+        meta = {
+          homepage = "http://melpa.org/#/moz-controller";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mpv = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, names, org }:
+    melpaBuild {
+        pname = "mpv";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "kljohann";
+          repo = "mpv.el";
+          rev = "059135de3979e044f14503806047476d9be9f0e8";
+          sha256 = "1pjhch8vah0kf73fl2fk6khhrx1kflggd3zlxrf7w4fxr0qn8la3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mpv";
+          sha256 = "1vq308ac6jj1h8qa2b2sypisb38hbvwjimqndhpfir06fghkw94l";
+          name = "mpv";
+        };
+        packageRequires = [ cl-lib emacs json names org ];
+        meta = {
+          homepage = "http://melpa.org/#/mpv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    msvc = callPackage ({ ac-clang, cedet ? null, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "msvc";
+        version = "1.2.2";
+        src = fetchFromGitHub {
+          owner = "yaruopooner";
+          repo = "msvc";
+          rev = "e7a61fa5b98a129637f970ac6db9163e330b3d02";
+          sha256 = "1draiwbwb8zfi6rdr5irv8091xv2pmnifq7pzi3rrvjb8swb28z3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/msvc";
+          sha256 = "04gq2klana557qvsi3bv6416l0319jsqb6bdfs7y6729qd94hlq3";
+          name = "msvc";
+        };
+        packageRequires = [ ac-clang cedet cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/msvc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "mu4e-alert";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "iqbalansari";
+          repo = "mu4e-alert";
+          rev = "83e6232b43902c7124fea16145de0da881bfe865";
+          sha256 = "0wrg6f7czn61f9wmrk27dzcdskznm5i1pwwjck5h768j0y9dfv6a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mu4e-alert";
+          sha256 = "15nwj09iyrvjsc9lrxla6qa0s8izcllxghw5gx3ffncfcrx2l8qm";
+          name = "mu4e-alert";
+        };
+        packageRequires = [ alert emacs s ];
+        meta = {
+          homepage = "http://melpa.org/#/mu4e-alert";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mu4e-maildirs-extension = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mu4e-maildirs-extension";
+        version = "0.8";
+        src = fetchFromGitHub {
+          owner = "agpchil";
+          repo = "mu4e-maildirs-extension";
+          rev = "8b384b0bbda46c473dea3ee7dc68c2b3f2548528";
+          sha256 = "1lyd8pcawn106zwlbq6gdq05i2zhry1qh9cdyjiw61nvgbbfi0yx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mu4e-maildirs-extension";
+          sha256 = "1xz19dxrj1grnl7wy9qglh08xb3dr509232l3xizpkxgqqk8pwbi";
+          name = "mu4e-maildirs-extension";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mu4e-maildirs-extension";
+          license = lib.licenses.free;
+        };
+      }) {};
+    multi = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "multi";
+        version = "2.0.1";
+        src = fetchFromGitHub {
+          owner = "kurisuwhyte";
+          repo = "emacs-multi";
+          rev = "884203b11fdac8374ec644cca975469aab263404";
+          sha256 = "11zabs7qpdhri6n90ck7pgwcbz46d813nyl73h5m1i8jvz1wzx7v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi";
+          sha256 = "1c240d1c1g8wb2ld944344zklnv86d9rycmya4z53b2ai10642ig";
+          name = "multi";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/multi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    multi-web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "multi-web-mode";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "fgallina";
+          repo = "multi-web-mode";
+          rev = "0517b9e2b3052533ac0cb71eba7073ed309fce06";
+          sha256 = "1d9y3dw27pgzgv6wk575d5ign55xdqgbl3ycyq1z7sji1477lz6b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi-web-mode";
+          sha256 = "0vi4yvahr10aqpcz4127c8pcqpr5srwc1yhgipnbnm86qnh34ql5";
+          name = "multi-web-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/multi-web-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    multiple-cursors = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "multiple-cursors";
+        version = "1.3.0";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "multiple-cursors.el";
+          rev = "d17c89e41847cf9292004590ba5b1c8cec0b1c50";
+          sha256 = "10k4c9vl0bfidrry0msyqamijizjghg54g26yaqbr2vi0mbbz22k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multiple-cursors";
+          sha256 = "0mky5p9wpd3270wr5vfna8rkk2ff81wk7vicyxli39195m0qgg0x";
+          name = "multiple-cursors";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/multiple-cursors";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mustache-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mustache-mode";
+        version = "1.3";
+        src = fetchFromGitHub {
+          owner = "mustache";
+          repo = "emacs";
+          rev = "bf9897eb287ca47ced65d7d4e07ea61ea0aec39f";
+          sha256 = "15gw4d0hp15rglsj8hzd290li4p0kadj2dsz0dgfcxld7hnimihk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mustache-mode";
+          sha256 = "076ar57qhwcpl4n634ma827r2rh61670778wqr5za2444a6ax1gs";
+          name = "mustache-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mustache-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mwim";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "alezost";
+          repo = "mwim.el";
+          rev = "dc1b5c358e0bfe607527f1b7c082188105fe6c75";
+          sha256 = "0hvq6z754niqjyv79jzb833wrwbspc7npfg85scwdv8vzwassjx4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mwim";
+          sha256 = "0bsibwplvyv96y5i5svm2b0jwzs5a7jr2aara7v7xnpj0nqaxm8k";
+          name = "mwim";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/mwim";
+          license = lib.licenses.free;
+        };
+      }) {};
+    mykie = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mykie";
+        version = "0.3.1";
+        src = fetchFromGitHub {
+          owner = "yuutayamada";
+          repo = "mykie-el";
+          rev = "ab8f7549f9018c26278d101af1b90997c9e5e0b3";
+          sha256 = "0550k0rfm0zai306642v689mcpsw9pbd5vs0il82cihwvrxjifc5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mykie";
+          sha256 = "12ram39fp3m9ar6q184rsnpkxb14y0ajibng7ia2ck54ck7n36cj";
+          name = "mykie";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/mykie";
+          license = lib.licenses.free;
+        };
+      }) {};
+    name-this-color = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "name-this-color";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "knl";
+          repo = "name-this-color.el";
+          rev = "e37cd1291d5d68d4c8d6386eab9cb9d94fd3bcfa";
+          sha256 = "0amhw630hgc0j8wr8m6aav399ixi3vbwrck79hhlr3pmyh91vv7n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/name-this-color";
+          sha256 = "12nrk1ww766jb4gb4iz6w485nimh2iv8wni2jq4l38v8ndh490zb";
+          name = "name-this-color";
+        };
+        packageRequires = [ cl-lib dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/name-this-color";
+          license = lib.licenses.free;
+        };
+      }) {};
+    names = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "names";
+        version = "20151201.0";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "names";
+          rev = "00862c57ae6363ba86d1e5ce138929a1b6d5c7e6";
+          sha256 = "0m82g27gwf9mvicivmcilqghz5b24ijmnw0jf0wl2skfbbg0sydh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/names";
+          sha256 = "1q784606jlakw1z6sx2g2x8hz8c8arywrm2r626wj0v105v510vg";
+          name = "names";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/names";
+          license = lib.licenses.free;
+        };
+      }) {};
+    narrow-reindent = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "narrow-reindent";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "emallson";
+          repo = "narrow-reindent.el";
+          rev = "87466aac4dbeb79597124dd077bf5c704872fd3d";
+          sha256 = "10yn215xb4s6kshk108y75im1xbdp0vwc9kah5bbaflp9234i0zh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/narrow-reindent";
+          sha256 = "0fybal70kk62zlra63x4jb72694m0mzv4cx746prx9anvq1ss2i0";
+          name = "narrow-reindent";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/narrow-reindent";
+          license = lib.licenses.free;
+        };
+      }) {};
+    narrowed-page-navigation = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "narrowed-page-navigation";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "david-christiansen";
+          repo = "narrowed-page-navigation";
+          rev = "b215adbac4873f56fbab65772062f0f5be8058a1";
+          sha256 = "0ydxj6dc10knambma2hpimqrhfz216nbj96w1dcwgjixs4cd4nax";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/narrowed-page-navigation";
+          sha256 = "1yrmih60dd69qnin505jlmfidm2svzpdrz46286r7nm6pk7s4pb7";
+          name = "narrowed-page-navigation";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/narrowed-page-navigation";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nasm-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nasm-mode";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "nasm-mode";
+          rev = "6e208d54eabe3339f22cd775f7e6237757f5eb36";
+          sha256 = "1l7asqwi5gcvb2mn8608025lwypf2vqzrkc3a9phdfjp0qn2apdn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nasm-mode";
+          sha256 = "1626yf9mmqlsw8w01vzqsyb5ipa56259d4kl6w871k7rvhxwff17";
+          name = "nasm-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/nasm-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nav-flash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nav-flash";
+        version = "1.1.0";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "nav-flash";
+          rev = "9054a0f9b51da9e5207672efc029ba265ba28f34";
+          sha256 = "119hy8rs83f17d6zizdaxn2ck3sylxbyz7adszbznjc8zrbaw0ic";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nav-flash";
+          sha256 = "0936kr0s6zxxmjwaqm7ywdw2im4dxai1xb7j6xa2gp7c70qvvsx3";
+          name = "nav-flash";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nav-flash";
+          license = lib.licenses.free;
+        };
+      }) {};
+    navi-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "navi-mode";
+        version = "2.0";
+        src = fetchFromGitHub {
+          owner = "tj64";
+          repo = "navi";
+          rev = "5c979b3b3873b0e67751a1321a9e271d066f2022";
+          sha256 = "15jh1lsgqfnpbmrikm8kdh5bj60yb96f2as2anppjjsgl6w96glh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/navi-mode";
+          sha256 = "0f5db983w9kxq8mcjr22zfrm7cpxydml4viac62lvab2kwbpbrmi";
+          name = "navi-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/navi-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    navorski = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, multi-term, s }:
+    melpaBuild {
+        pname = "navorski";
+        version = "0.2.7";
+        src = fetchFromGitHub {
+          owner = "roman";
+          repo = "navorski.el";
+          rev = "4546d4e4dfbec20ee8c423c045408a3388a9eab9";
+          sha256 = "09cb07f98aclgq8jf5419305zydkk1hz4nvzrwqz7syrlpvx8xi5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/navorski";
+          sha256 = "0dnzpsm0ya8rbcik5wp378hc9k7gjb3gwmkqqj889c38q5cdwsx7";
+          name = "navorski";
+        };
+        packageRequires = [ dash multi-term s ];
+        meta = {
+          homepage = "http://melpa.org/#/navorski";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ncl-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ncl-mode";
+        version = "0.99.1";
+        src = fetchFromGitHub {
+          owner = "yyr";
+          repo = "ncl-mode";
+          rev = "4a1a3f133c8c74a01b5c527496b56052bacac2ab";
+          sha256 = "16i1k1zr6ng1dlxb1b73mxjf25f4kvf3x5vfffsi3qnfm960bg3q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ncl-mode";
+          sha256 = "0hmd606xgapzbc79px9l1q6pphrhdzip495yprvg20xsdpmjlfw9";
+          name = "ncl-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ncl-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nemerle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nemerle";
+        version = "1.2";
+        src = fetchFromGitHub {
+          owner = "rsdn";
+          repo = "nemerle";
+          rev = "556270ce8b97668a65e9ec20a05f78c3dffeac60";
+          sha256 = "19xxg4ya6vndk2ljdnl284zs8qf9dkq4ghr7pmsclp9n7zh46v48";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nemerle";
+          sha256 = "0698hbgk80w7wp0ssx9pl13aapm7rc6l3y2zydfkyqdfwy5y71v6";
+          name = "nemerle";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nemerle";
+          license = lib.licenses.free;
+        };
+      }) {};
+    neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "neotree";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "jaypei";
+          repo = "emacs-neotree";
+          rev = "c4f32b489fb1f5f00897a7dbb58a27ee704f5493";
+          sha256 = "1gmi0xxwkh33w5gxc8488m1vv6ycizqhlw1kpn81zhqdzzq3s06n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/neotree";
+          sha256 = "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06";
+          name = "neotree";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/neotree";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nginx-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nginx-mode";
+        version = "1.1.4";
+        src = fetchFromGitHub {
+          owner = "ajc";
+          repo = "nginx-mode";
+          rev = "8a296e30b01adbc40d1aa9ccde369a972ac5ceab";
+          sha256 = "08bpyk0brx0x2l0y8hn8zpkaxb2ndmxz22kzxxypj6hdz303wf38";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nginx-mode";
+          sha256 = "07k17m64zhv6gik8v4n73d8l1k6fsp4qp8cl94r384ny0187y65c";
+          name = "nginx-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nginx-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ninja-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ninja-mode";
+        version = "1.6.0";
+        src = fetchFromGitHub {
+          owner = "martine";
+          repo = "ninja";
+          rev = "484c16336f19bd8970bb6e75322d61b92a229899";
+          sha256 = "1wc0cvmfhpvfzdy127d1n812q93dd9sp3mmqnc8jzy8i3frqqqq6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ninja-mode";
+          sha256 = "1m7f25sbkz8k343giczrnw2ah5i3mk4c7csi8kk9x5y16030asik";
+          name = "ninja-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ninja-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nix-mode";
+        version = "1.10";
+        src = fetchFromGitHub {
+          owner = "NixOS";
+          repo = "nix";
+          rev = "71a5161365f40699092e491bbff88473237fc432";
+          sha256 = "03kbdrar5w475qng4j7bbak5y6ipb7pgpxj3hblcn3pnvgh7whv6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nix-mode";
+          sha256 = "00rqawi8zs2x79c91gmk0anfyqbwalvfwmpak20i11lfzmdsza1s";
+          name = "nix-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nix-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nixos-options = callPackage ({ emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nixos-options";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "travisbhartwell";
+          repo = "nix-emacs";
+          rev = "5fc8fa29bea9dd8e9c822af92f9bc6ddc223635f";
+          sha256 = "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nixos-options";
+          sha256 = "1m3jipidk10zj68rzjbacgjlal31jf80gqjxlgj4qs8lm671gxmm";
+          name = "nixos-options";
+        };
+        packageRequires = [ emacs json ];
+        meta = {
+          homepage = "http://melpa.org/#/nixos-options";
+          license = lib.licenses.free;
+        };
+      }) {};
+    noccur = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "noccur";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "NicolasPetton";
+          repo = "noccur.el";
+          rev = "6cc02ce07178a61ae38a849f80472c01969272bc";
+          sha256 = "0wk86gm0by9c8mfbvydz5va07qd30n6wx067inqfa7wjffaq0xr7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/noccur";
+          sha256 = "0a8l50v09bgap7rsls808k9wyjpjbcxaffsvz7hh9rw9s7m5fz5g";
+          name = "noccur";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/noccur";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nodejs-repl = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nodejs-repl";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "abicky";
+          repo = "nodejs-repl.el";
+          rev = "a7fd82b2fafe086da442f0f2f62b4dd7c8107ab9";
+          sha256 = "03vcs458rcn1hgfvmgmijadjvri7zlh2z4lxgaplzfnga13mapym";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nodejs-repl";
+          sha256 = "0rvhhrsw87kfrwdhm8glq6b3nr0v90ivm7fcc0da4yc2jmcyk907";
+          name = "nodejs-repl";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nodejs-repl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nose = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "nose";
+        version = "0.1.1";
+        src = fetchhg {
+          url = "https://bitbucket.com/durin42/nosemacs";
+          rev = "194d7789bf79";
+          sha256 = "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nose";
+          sha256 = "0l77hsmn3qk934ppdav1gy9sq48g0v1dzc5qy0rp9vv4yz2jx2jk";
+          name = "nose";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nose";
+          license = lib.licenses.free;
+        };
+      }) {};
+    notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "notmuch";
+        version = "0.21";
+        src = fetchgit {
+          url = "git://git.notmuchmail.org/git/notmuch";
+          rev = "bf511cb6979ede33d17d9da6f46f71ea287461d8";
+          sha256 = "fd2669401c276af12b6c9b739e835ee76b7910bba34bf850e4909c00e79adbd4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/notmuch";
+          sha256 = "1sy9k6xbfl035qhnp8sdq9cb3xvgw3lkmdczyd6fw6yrzm5n0g1r";
+          name = "notmuch";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/notmuch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    notmuch-labeler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, notmuch }:
+    melpaBuild {
+        pname = "notmuch-labeler";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "notmuch-labeler";
+          rev = "d65d1129555d368243df4770ecc1e7ccb88efc58";
+          sha256 = "1ss87vlp7625lnn2iah3rc1xfxcbpx4kmiww9n16jx073fs2rj18";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/notmuch-labeler";
+          sha256 = "1c0cbkk5k8ps01xl63a0xa2adkqaj0znw8qs8ca4ai8v1420bpl0";
+          name = "notmuch-labeler";
+        };
+        packageRequires = [ notmuch ];
+        meta = {
+          homepage = "http://melpa.org/#/notmuch-labeler";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nrepl-sync = callPackage ({ cider, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nrepl-sync";
+        version = "0.3.1";
+        src = fetchFromGitHub {
+          owner = "phillord";
+          repo = "lein-sync";
+          rev = "471a08df87687a3eab61b3b8bf25a2e0962b5d5b";
+          sha256 = "1l07nrlfd5qj8jnqacjba7mb6prapg8d8h3881l3kb66sn02ahgy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nrepl-sync";
+          sha256 = "01b504b4d8rrhlf3sfq3kk9i222fch6jd5jbm02kqw20fgv6q3jd";
+          name = "nrepl-sync";
+        };
+        packageRequires = [ cider ];
+        meta = {
+          homepage = "http://melpa.org/#/nrepl-sync";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nsis-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nsis-mode";
+        version = "0.44";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "nsis-mode";
+          rev = "f1bf701c37680553c8f51462e0829d0dd6c53187";
+          sha256 = "0c4qfbb345yna5c30czq8nhcx283z1fnpp6h16p7vjqs6y37czsl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nsis-mode";
+          sha256 = "0pc047ryw906sz5mv0awvl67kh20prsgx6fbh0j1qm0cali2792l";
+          name = "nsis-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nsis-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nvm = callPackage ({ dash, dash-functional, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "nvm";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "nvm.el";
+          rev = "d18b13e8275a57ee6c55dc71b671f02a8e6522ad";
+          sha256 = "1624jj922l0bbav1v8szdr0lpyx0ng959fg3sspg1j15kgkir8kf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nvm";
+          sha256 = "03gy7wavc2q02lnr9pmp3l1pn0lzbdq0kwnmg9fvklmq6r6n3x34";
+          name = "nvm";
+        };
+        packageRequires = [ dash dash-functional f s ];
+        meta = {
+          homepage = "http://melpa.org/#/nvm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nyan-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nyan-mode";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "TeMPOraL";
+          repo = "nyan-mode";
+          rev = "251d8f9c3686183294d76abcd816c8d69b6a71a3";
+          sha256 = "14vd0f4y5l470hx7kg54sx3352459mhjnrh7jl822gkl8c904lmw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nyan-mode";
+          sha256 = "1z2wnsbjllqa533g1ab5cgbv3d9hjix7fsd7z9c45nqh5cmadmyv";
+          name = "nyan-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nyan-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nyan-prompt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nyan-prompt";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "PuercoPop";
+          repo = "nyan-prompt";
+          rev = "b5137f2ee9afe640f59786eed17b308df6356c73";
+          sha256 = "0bgspjy8h3d7v12sfjnd2ghj4183pdf0z48g5xs129jwd3nycykp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nyan-prompt";
+          sha256 = "1s0qyhpfpncsv9qfxy07rbp4gv8pp5xzb48rbd3r14nkjlnylnfb";
+          name = "nyan-prompt";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/nyan-prompt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    o-blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "o-blog";
+        version = "2.0";
+        src = fetchFromGitHub {
+          owner = "renard";
+          repo = "o-blog";
+          rev = "5db9594c6e3439c000b183551d7975c2e29131f4";
+          sha256 = "0r12023yy8j96bp8z2ml6ffyr2c9rcd5abkh6vqnkwsdxkzx6wrs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/o-blog";
+          sha256 = "08grkyvg27wd5232q3y8p0v7higfq7bmsdzmvhja96v6qy2xsbja";
+          name = "o-blog";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/o-blog";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "ob-http";
+        version = "0.0.3";
+        src = fetchFromGitHub {
+          owner = "zweifisch";
+          repo = "ob-http";
+          rev = "89ba18b22cf6b8533358a9c76a82326343391f0b";
+          sha256 = "1zbqiqilms8vxqlvzb3gjh8gh2cl7cpmh3yiqsj94jx69w8dy4xl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-http";
+          sha256 = "0b7ghz9pqbyn3b52cpmnwa2wnd4svj23p6gc48ybwzwiid42wiss";
+          name = "ob-http";
+        };
+        packageRequires = [ cl-lib s ];
+        meta = {
+          homepage = "http://melpa.org/#/ob-http";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-sml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sml-mode }:
+    melpaBuild {
+        pname = "ob-sml";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "swannodette";
+          repo = "ob-sml";
+          rev = "5dc966acbe65e9e158bfa90018035bf52d4dafd4";
+          sha256 = "1xx6hyq3gk4bavcx6i9bhipbn4mn5rv2ga9lryq09qgq2l9znclk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-sml";
+          sha256 = "04qvzhwjr8ipvq3znnhn0wbl4pbb1rwxi90iidavzk3phbkpaskn";
+          name = "ob-sml";
+        };
+        packageRequires = [ sml-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/ob-sml";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ob-translate = callPackage ({ fetchFromGitHub, fetchurl, google-translate, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ob-translate";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "krisajenkins";
+          repo = "ob-translate";
+          rev = "6b39cc1a94a1071107a4391684b1bffb5b9826f3";
+          sha256 = "10hm20dzhkxk61ass3bd5gdn1bs2l60y3zjnpkxinzn7m6aaniia";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-translate";
+          sha256 = "1hi0rxbyxvk9sbk2fy3kqw7l4lgri921vya1mn4i1q2i1979r2gz";
+          name = "ob-translate";
+        };
+        packageRequires = [ google-translate org ];
+        meta = {
+          homepage = "http://melpa.org/#/ob-translate";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ocodo-svg-modelines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, svg-mode-line-themes }:
+    melpaBuild {
+        pname = "ocodo-svg-modelines";
+        version = "0.1.4";
+        src = fetchFromGitHub {
+          owner = "ocodo";
+          repo = "ocodo-svg-modelines";
+          rev = "a6c5b9a7536c7a8fa3bd9d9dafdebc8d99903018";
+          sha256 = "05ay599nc6jdw2fjss4izz1ynv2wc4svff932n8j9hvrhygipb2w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ocodo-svg-modelines";
+          sha256 = "0fa88ns70wsr9i9gf4zx3fvmn1a32mrjsda105n0cx6c965kfmay";
+          name = "ocodo-svg-modelines";
+        };
+        packageRequires = [ svg-mode-line-themes ];
+        meta = {
+          homepage = "http://melpa.org/#/ocodo-svg-modelines";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ocp-indent = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ocp-indent";
+        version = "1.5.2";
+        src = fetchFromGitHub {
+          owner = "OCamlPro";
+          repo = "ocp-indent";
+          rev = "e6f15bdf7d5ad6e4addbf24dce74823f953db900";
+          sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ocp-indent";
+          sha256 = "0wc4z9dsnnyr24n3vg1npvc3rm53av8bpbvrl8kldxxdiwgnbkjw";
+          name = "ocp-indent";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ocp-indent";
+          license = lib.licenses.free;
+        };
+      }) {};
+    octicons = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "octicons";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-octicons";
+          rev = "77bb1a49045f89b3eaf9bcffeefbb9e1abaee556";
+          sha256 = "19fg6r7aiirfsbp2h1a824476sn1ln4nz8kvpdzkzvyf1hzx68gw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/octicons";
+          sha256 = "02f37bvnc5qvkvfbyx5wp54nz71bqm747mq1p5361sx091lllkxk";
+          name = "octicons";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/octicons";
+          license = lib.licenses.free;
+        };
+      }) {};
+    offlineimap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "offlineimap";
+        version = "1";
+        src = fetchFromGitHub {
+          owner = "jd";
+          repo = "offlineimap.el";
+          rev = "646482203aacdf847d57d0a96263fddcfc33fb61";
+          sha256 = "0az4llfgva4wvpljyc5s2m7ggfnj06ssp32x8bncr5fzksha3r7b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/offlineimap";
+          sha256 = "0nza7lrz7cn06njcblwh9hy3050j8ja4awbxx7jzv6nazjg7201b";
+          name = "offlineimap";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/offlineimap";
+          license = lib.licenses.free;
+        };
+      }) {};
+    olivetti = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "olivetti";
+        version = "1.3.0";
+        src = fetchFromGitHub {
+          owner = "rnkn";
+          repo = "olivetti";
+          rev = "26f3db0bc37324444e41a1d4797056b61b56b004";
+          sha256 = "1rj97yg2n9fi80qlb4z6iahqid3yinlhx9mrbh6gi1niz58ws69h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/olivetti";
+          sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd";
+          name = "olivetti";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/olivetti";
+          license = lib.licenses.free;
+        };
+      }) {};
+    omni-kill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "omni-kill";
+        version = "0.2.3";
+        src = fetchFromGitHub {
+          owner = "AdrieanKhisbe";
+          repo = "omni-kill.el";
+          rev = "8a1145b58b4736c9163bcd5b28c8fea80b2ea97b";
+          sha256 = "07grj81alrr6qgs3jmqkjzphkvi26w6jm5hf1f5wyx7h6q293ady";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-kill";
+          sha256 = "03kydl16rd9mnc1rnan2byqa6f70891fhcj16wkavl2r68rfj75k";
+          name = "omni-kill";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/omni-kill";
+          license = lib.licenses.free;
+        };
+      }) {};
+    omni-log = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "omni-log";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "AdrieanKhisbe";
+          repo = "omni-log.el";
+          rev = "7eb30e42cc89064abb7acbec63cb9644c2ad7c9b";
+          sha256 = "030f983n19n64f8irif102nncvam04xpx020vfgja9886wlj40pk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-log";
+          sha256 = "0c29243zq8r89ax4rxlmb8imag12icnldcb0q0xsnhjccw8lyw1r";
+          name = "omni-log";
+        };
+        packageRequires = [ dash emacs ht s ];
+        meta = {
+          homepage = "http://melpa.org/#/omni-log";
+          license = lib.licenses.free;
+        };
+      }) {};
+    omni-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "omni-scratch";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "AdrieanKhisbe";
+          repo = "omni-scratch.el";
+          rev = "517b340427d5906002234832a01d0bc1ad27bac5";
+          sha256 = "1rfs6z56pnacy6m7yvm2hrb0ykfvaiyichivcmb9ssdgqp92cbxx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-scratch";
+          sha256 = "190dkqcw8xywzrq8a99w4rqi0y1h2aj23s84g2ln1sf7jaf6d6n9";
+          name = "omni-scratch";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/omni-scratch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    omni-tags = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pcre2el }:
+    melpaBuild {
+        pname = "omni-tags";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "AdrieanKhisbe";
+          repo = "omni-tags.el";
+          rev = "a7078bfbc9a6256efd0e57530df9fd7808bc2185";
+          sha256 = "0c34rci5793hd674x2srhqvnj46llrbkrw1xpzf73s4ib5zhh7xi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-tags";
+          sha256 = "133ww1jf14jbw02ssbx2a46mp52j18a2wwzb6x77azb0akmf1lzl";
+          name = "omni-tags";
+        };
+        packageRequires = [ cl-lib pcre2el ];
+        meta = {
+          homepage = "http://melpa.org/#/omni-tags";
+          license = lib.licenses.free;
+        };
+      }) {};
+    omnisharp = callPackage ({ auto-complete, cl-lib ? null, csharp-mode, dash, fetchFromGitHub, fetchurl, flycheck, json ? null, lib, melpaBuild, popup, s }:
+    melpaBuild {
+        pname = "omnisharp";
+        version = "3.9";
+        src = fetchFromGitHub {
+          owner = "OmniSharp";
+          repo = "omnisharp-emacs";
+          rev = "725796278fa8a391e244f2e50676dd6d6b67585d";
+          sha256 = "1iq8yzjv7wb0jfi3lqqyx4n7whvb7xf8ls0q0w7pgsrsslrxbwcm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omnisharp";
+          sha256 = "0dwya22y92k7x2s223az1g8hmrpfmk1sgwbr9z47raaa8kd52iad";
+          name = "omnisharp";
+        };
+        packageRequires = [
+          auto-complete
+          cl-lib
+          csharp-mode
+          dash
+          flycheck
+          json
+          popup
+          s
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/omnisharp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    opam = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "opam";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "lunaryorn";
+          repo = "opam.el";
+          rev = "83fb2850d29ec792754e0af18b015e089aad2695";
+          sha256 = "119pk7gg4fw5bdvir8077ra603b5nbqvd7ph9cqrwxa056jzvry8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/opam";
+          sha256 = "004r93nn1ranvxkcc0y5m3p8gh4axgghgnsvim38nc1sqda5h6xa";
+          name = "opam";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/opam";
+          license = lib.licenses.free;
+        };
+      }) {};
+    operate-on-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "operate-on-number";
+        version = "1.1.0";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "operate-on-number.el";
+          rev = "6a17272e2b6e23260edb1b5eeb01905a1f37e0a6";
+          sha256 = "12q09kdcgv6hl1hmgarl73j4g9gi4h7sj865655mdja0ns9n1pdb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/operate-on-number";
+          sha256 = "1rw3fqbzfizgcbz3yaf99rr2546msna4z7dyfa8dbi8h7yzl4fhk";
+          name = "operate-on-number";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/operate-on-number";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-ac = callPackage ({ auto-complete-pcmp, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
+    melpaBuild {
+        pname = "org-ac";
+        version = "0.0.2";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "org-ac";
+          rev = "9cbbda79e2fe964ded3f39cf7a2e74f1be3d6b9a";
+          sha256 = "1xckin2d6s40kgr2293g72ipc57f8gp6y63303kmqcv3qm8q13ca";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-ac";
+          sha256 = "059jr3v3558cgw626zbqfwmwwv5f4637ai26h7b6psqh0x9sf3mr";
+          name = "org-ac";
+        };
+        packageRequires = [ auto-complete-pcmp log4e yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/org-ac";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-agenda-property = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-agenda-property";
+        version = "1.3.1";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "org-agenda-property";
+          rev = "2ff628a14a3e758863bbd88fba4db9f77fd2c3a8";
+          sha256 = "0gkxxzdk8bd1yi5x9217pkq9d01ccq8znxc7h8qcw0p1336rigfc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-agenda-property";
+          sha256 = "0zsjzjw52asl609q7a2s4jcsm478p4cxzhnd3azyr9ypxydjf6qk";
+          name = "org-agenda-property";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/org-agenda-property";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-autolist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-autolist";
+        version = "0.13";
+        src = fetchFromGitHub {
+          owner = "calvinwyoung";
+          repo = "org-autolist";
+          rev = "da332fadcd9be4c5eb21c5e98c392b89743750b2";
+          sha256 = "0j6fqgzvbmvvdh0dgwsxq004wxys2zwnq9wa3idm087ynp2a2ani";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-autolist";
+          sha256 = "1jvspxhxlvd7h1srk9dbk1v5dykmf8jsjaqicpll7ial6i0qgikj";
+          name = "org-autolist";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-autolist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-bullets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-bullets";
+        version = "0.2.4";
+        src = fetchFromGitHub {
+          owner = "sabof";
+          repo = "org-bullets";
+          rev = "b70ac2ec805bcb626a6e39ea696354577c681b36";
+          sha256 = "10nr4sjffnqbllv6gmak6pviyynrb7pi5nvrq331h5alm3xcpq0w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-bullets";
+          sha256 = "1kxhlabaqi1g6pz215afp65d9cp324s8mvabjh7q1h7ari32an75";
+          name = "org-bullets";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-bullets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-elisp-help = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-elisp-help";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "org-elisp-help";
+          rev = "0ead4f715b0a8fd21428f763cfc502177d82b3db";
+          sha256 = "18x8c6jcqkfam79z4hskr8h1lvzvd5rlfgymmj1ps6p6hd3j4ihl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-elisp-help";
+          sha256 = "0a4wvz52hkcw5nrml3h1yp8w97vg5jw22wnpfbb827zh7iwb259h";
+          name = "org-elisp-help";
+        };
+        packageRequires = [ cl-lib org ];
+        meta = {
+          homepage = "http://melpa.org/#/org-elisp-help";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-gcal = callPackage ({ alert, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org, request-deferred }:
+    melpaBuild {
+        pname = "org-gcal";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "org-gcal.el";
+          rev = "badd3629e6243563c30ff1dd0452b7601f6cc036";
+          sha256 = "1pxfcyf447h18220izi8qlnwdr8rlwn5kds8gr5i1v90s6hpa498";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-gcal";
+          sha256 = "1mp6cm0rhd4r9pfvsjjp86sdqxjbbg7gk41zx0zf0s772smddy3q";
+          name = "org-gcal";
+        };
+        packageRequires = [ alert cl-lib emacs org request-deferred ];
+        meta = {
+          homepage = "http://melpa.org/#/org-gcal";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-gnome = callPackage ({ alert, fetchFromGitHub, fetchurl, gnome-calendar, lib, melpaBuild, telepathy }:
+    melpaBuild {
+        pname = "org-gnome";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "NicolasPetton";
+          repo = "org-gnome.el";
+          rev = "1012d47886cfd30eed25b73d9f18e475e0155f88";
+          sha256 = "0b57ik05iax2h3nrj96kysbk4hxmxlaabd0n6lv1xsayrlli3sj1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-gnome";
+          sha256 = "0c37gfs6xs0jbvg6ypd4z5ip1khm26wr5lxgmv1dzcc383ynzg0v";
+          name = "org-gnome";
+        };
+        packageRequires = [ alert gnome-calendar telepathy ];
+        meta = {
+          homepage = "http://melpa.org/#/org-gnome";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-if = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-if";
+        version = "0.2.0";
+        src = fetchFromGitLab {
+          owner = "elzair";
+          repo = "org-if";
+          rev = "fab602cc1bbee7a4e99c0083e129219d3f9ed2e8";
+          sha256 = "1iyqv34b7q2k73srshcnpvfzcadq47w4rzkqp6m1d3ajk8x2vypq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-if";
+          sha256 = "0h0jdyawz2j4mp33w85z8q77l37qid8palvw5n4z379qa0wr5h96";
+          name = "org-if";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-if";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-journal = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-journal";
+        version = "1.10.2";
+        src = fetchFromGitHub {
+          owner = "bastibe";
+          repo = "emacs-journal";
+          rev = "68974d86f1ef518defb3085e415d882ba4575714";
+          sha256 = "0980scx1dzslbdzmhv720branc4jd4bdkyji34gahinx4w9brj79";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-journal";
+          sha256 = "078z9b9hxbvmmxib6098f49rn7n3d0v4x37p7xxb0v8cv4izlb4s";
+          name = "org-journal";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-journal";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-link-travis = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-link-travis";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "org-link-travis";
+          rev = "596615ad8373d9090bd4138da683524f0ad0bda5";
+          sha256 = "1797pd264zn19zk93nifyw6pwk2a7wrpfir373qclk601yv2g5h8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-link-travis";
+          sha256 = "0hj4x7cw7a3ry8xislkz9bnavy77z4cpmnvns02yi3gnib53mlfs";
+          name = "org-link-travis";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "http://melpa.org/#/org-link-travis";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-linkany = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
+    melpaBuild {
+        pname = "org-linkany";
+        version = "0.0.2";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "org-linkany";
+          rev = "ed4a6614b56c9baef31647ea728b3d5fae6ed3a2";
+          sha256 = "1bggz782ci0z6aw76v51ykbmfzh5g6cxh43w798as1152sn7im3p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-linkany";
+          sha256 = "0arjj3c23yqm1ljvbnl7v9cqvd9lbz4381g8f3jyqbafs25bdc3c";
+          name = "org-linkany";
+        };
+        packageRequires = [ log4e yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/org-linkany";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-mac-iCal = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-mac-iCal";
+        version = "7.9.3.5";
+        src = fetchgit {
+          url = "git://orgmode.org/org-mode.git";
+          rev = "592dc2ee7e4c80b9b61efb77117c8dc22d6cefd1";
+          sha256 = "5cb84c3c4bf3f7c3e0c9ab869dababb785d44198b1e1072dc9c0937fc483aa14";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-mac-iCal";
+          sha256 = "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw";
+          name = "org-mac-iCal";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-mac-iCal";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-multiple-keymap = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-multiple-keymap";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "org-multiple-keymap.el";
+          rev = "20eb3be6be9f0abbad9f0d007e40cb00c8109201";
+          sha256 = "0yxfhzygiki8sha1dddac4g72r51yi4jnga2scmk51f9jgwqbihp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-multiple-keymap";
+          sha256 = "16iv5575634asvn1b2k535ml8g4lqgy8z5w6ykma5f9phq5idb9f";
+          name = "org-multiple-keymap";
+        };
+        packageRequires = [ cl-lib emacs org ];
+        meta = {
+          homepage = "http://melpa.org/#/org-multiple-keymap";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-outlook = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-outlook";
+        version = "0.11";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "org-outlook.el";
+          rev = "070c37d017ccb71d94c3c69c99632fa6570ec2cc";
+          sha256 = "15fy6xpz6mk4j3nkrhiqal2dp77rhxmk8a7xiw037xr1jgq9sd9a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-outlook";
+          sha256 = "0cn8h6yy67jr5h1yxsfqmr8q7ii4f99pgghfp821m01pj55qyjx9";
+          name = "org-outlook";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-outlook";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-page = callPackage ({ fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org }:
+    melpaBuild {
+        pname = "org-page";
+        version = "0.41";
+        src = fetchFromGitHub {
+          owner = "kelvinh";
+          repo = "org-page";
+          rev = "09febf89d8dcb226aeedf8164169b31937b64439";
+          sha256 = "0zc20m63a1iz9aziid5jsvcbl86k9dg9js4k3almchh55az4a0i3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-page";
+          sha256 = "1326m3w7vz22zk7rx40z28fddsccy5fl1qhbb7clci8l69blcc2v";
+          name = "org-page";
+        };
+        packageRequires = [ ht htmlize mustache org ];
+        meta = {
+          homepage = "http://melpa.org/#/org-page";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }:
+    melpaBuild {
+        pname = "org-pdfview";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "markus1189";
+          repo = "org-pdfview";
+          rev = "c1ca137ef90e442592ce88ef16437dc7dfa9c5dd";
+          sha256 = "14lshgyrlzjcrqdfsn17llm70ijbs86cv9mccy87vlr01rbsz6lj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-pdfview";
+          sha256 = "1z4gb5lw7ngphixw06b5484kwlxbc098w2xshzml5sywr16a4iab";
+          name = "org-pdfview";
+        };
+        packageRequires = [ org pdf-tools ];
+        meta = {
+          homepage = "http://melpa.org/#/org-pdfview";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-pomodoro = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-pomodoro";
+        version = "2.0.3";
+        src = fetchFromGitHub {
+          owner = "lolownia";
+          repo = "org-pomodoro";
+          rev = "26452a3d070f4814b191a9de9e3493a54161b910";
+          sha256 = "1fjdza723615bhdm5x6gbd03vi7ywzpbjn8p59saimczqngfdpmw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-pomodoro";
+          sha256 = "1vdi07hrhniyhhvg0hcr5mlixy6bjynvwm89z2lvfyvnnxpx0r27";
+          name = "org-pomodoro";
+        };
+        packageRequires = [ alert cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/org-pomodoro";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-projectile = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+    melpaBuild {
+        pname = "org-projectile";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "IvanMalison";
+          repo = "org-projectile";
+          rev = "c2141ac997f4af49257595bab88adb9dd7b9b700";
+          sha256 = "16aq5p65q5a0an14q9xzsnkaa5bzkrwhm9cv5ljajjfcjsjcvmb6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-projectile";
+          sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm";
+          name = "org-projectile";
+        };
+        packageRequires = [ dash projectile ];
+        meta = {
+          homepage = "http://melpa.org/#/org-projectile";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-protocol-jekyll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-protocol-jekyll";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "vonavi";
+          repo = "org-protocol-jekyll";
+          rev = "c1ac46793eb9bf22b1a601e841947428be5c9766";
+          sha256 = "1cxjzj955rvp0ijbp7ifpmkxdhimz8hqjw5c9gv6zwjqb5iih9ry";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-protocol-jekyll";
+          sha256 = "18wg489n2d1sx9jk00ki6p2rxkqz67kqwnmy2kb1ga1rmb6x9wfs";
+          name = "org-protocol-jekyll";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-protocol-jekyll";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-readme = callPackage ({ fetchFromGitHub, fetchurl, header2, http-post-simple, lib, lib-requires, melpaBuild, yaoddmuse }:
+    melpaBuild {
+        pname = "org-readme";
+        version = "20130322.926";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "org-readme";
+          rev = "15054e42351b5ec6b629c55760a578516e035355";
+          sha256 = "0hhgfw0sqvl9jmmslwxn6v3dii99v09yz2h0ia5np9lzyxsc207a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-readme";
+          sha256 = "1qqbsgspd006gy0kc614w7bg6na0ygmflvqkmw47899pbgj81hxh";
+          name = "org-readme";
+        };
+        packageRequires = [ header2 http-post-simple lib-requires yaoddmuse ];
+        meta = {
+          homepage = "http://melpa.org/#/org-readme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-repo-todo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-repo-todo";
+        version = "0.0.2";
+        src = fetchFromGitHub {
+          owner = "waymondo";
+          repo = "org-repo-todo";
+          rev = "904a26089d87db59a40421d6f857b189e70dfbe3";
+          sha256 = "03c88jzwvl95dl39703mknkvnk3cmw4gss5c1y2k9py2rgh6bpr9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-repo-todo";
+          sha256 = "0l5ns1hs3i4dhrpmvzl34zc9zysgjkfa7j8apbda59n9jdvml5v1";
+          name = "org-repo-todo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-repo-todo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-sync = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-sync";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "arbox";
+          repo = "org-sync";
+          rev = "8c65dceaa2f3d436f83ed591916f22556a6e7f91";
+          sha256 = "0zx9gpvm5gy9k45lbhaks9s935id727lszsh40gmpdp5zxf3rjk1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-sync";
+          sha256 = "0n8fz2d1vg9r8dszgasbnb6pgaxr2i8mqrp953prf1nhmfpjpxad";
+          name = "org-sync";
+        };
+        packageRequires = [ cl-lib emacs org ];
+        meta = {
+          homepage = "http://melpa.org/#/org-sync";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-table-comment = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-table-comment";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "org-table-comment.el";
+          rev = "33b9966c33ecbc3e27cca67c2f2cdea04364d74e";
+          sha256 = "1qx3kd02sxs9k7adlvdlbmyhkc5kr7ni5lw4gxjw3nphnc536bkb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-table-comment";
+          sha256 = "1d40vl8aa1x27z4gwnkzxgrqp7vd3ln2pc445ijjxp1wr8bjxvdz";
+          name = "org-table-comment";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-table-comment";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-time-budgets = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-time-budgets";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "leoc";
+          repo = "org-time-budgets";
+          rev = "f2a8fe3d9d6104f3dd61fabbb385a596363b360b";
+          sha256 = "09iw2jffb2qrx5r07zd1j8sk5wafamjkc2khqyfwc5kx6xyp1f46";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-time-budgets";
+          sha256 = "0r8km586n6xdnjha7xnzlh03nw1dp066hydaz8kxfmhvygl9cpah";
+          name = "org-time-budgets";
+        };
+        packageRequires = [ alert cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/org-time-budgets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-toodledo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-toodledo";
+        version = "2.1.0";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "org-toodledo";
+          rev = "5473c1a2762371b198862aa8fd83fd3ec57485a4";
+          sha256 = "0qqa62fsmra6v4061kpki8wbhfcwkgnb2gzxwvnaqlcmhivksg6v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-toodledo";
+          sha256 = "0c7qr0jsc4iyrwkc22xp9nmk6984v7q1k0rvpd62m07lb5gvbiq3";
+          name = "org-toodledo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-toodledo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-tracktable = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-tracktable";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "tty-tourist";
+          repo = "org-tracktable";
+          rev = "28ef6772cdcf436cf38095f15c6bb681473180ce";
+          sha256 = "053wf36lq9piyzq7rv2lid34zanj6l9fvawp3r3nsniy5nlfckqx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-tracktable";
+          sha256 = "0mngf9q2ffxq32cgng0xl30661mj15wmr9y4hr3xddj626kxrp00";
+          name = "org-tracktable";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/org-tracktable";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-transform-tree-table = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "org-transform-tree-table";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "jplindstrom";
+          repo = "emacs-org-transform-tree-table";
+          rev = "0a9bf07f01bc5fc3b349aff64e83999a8de83b52";
+          sha256 = "1h15fr16kgbyrxambmk4hsmha6hx4c4yqkccb82g3wlvzmnqj5x3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-transform-tree-table";
+          sha256 = "0n68cw769nk90ms6w1w6cc1nxjwn1navkz56mf11bsiqvsk3km7r";
+          name = "org-transform-tree-table";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/org-transform-tree-table";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-tree-slide = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-tree-slide";
+        version = "2.8.4";
+        src = fetchFromGitHub {
+          owner = "takaxp";
+          repo = "org-tree-slide";
+          rev = "dccd80418a4444df5e8301695ff0d0dfe86a3c21";
+          sha256 = "0aacxxwhwjzby0f9r4q0lra5lqcrw5snnm1yc63jrs6c0ifakk45";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-tree-slide";
+          sha256 = "0v857zplv0wdbg4li667v2p5pn5zcf9fgbqcwa75x8babilkl6jn";
+          name = "org-tree-slide";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-tree-slide";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-trello = callPackage ({ dash, dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }:
+    melpaBuild {
+        pname = "org-trello";
+        version = "0.7.5";
+        src = fetchFromGitHub {
+          owner = "org-trello";
+          repo = "org-trello";
+          rev = "3718ed704094e5e5a491749f1f722d76ba4b7d73";
+          sha256 = "1561nxjva8892via0l8315y3fih4r4q9gzycmvh33db8gqzq4l86";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-trello";
+          sha256 = "1rm91xccvdsqghdnrnjvyp8xfvrw5ac677vzzz24rz9dssh2mz9b";
+          name = "org-trello";
+        };
+        packageRequires = [
+          dash
+          dash-functional
+          deferred
+          emacs
+          request-deferred
+          s
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/org-trello";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-vcard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-vcard";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "flexibeast";
+          repo = "org-vcard";
+          rev = "5c4e17c166fb0406d5dfdc8876b0e182ba7af8fd";
+          sha256 = "1qf4pqsg12y1qx7di0y5dp0f4slyp69h2q6y21hldzknhwxx4yy4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-vcard";
+          sha256 = "0l6azshvzl1wws582njqr3qx4h73gwrdqwa3jcic1qbs9hg2l4yl";
+          name = "org-vcard";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/org-vcard";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org2blog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, metaweblog, org, xml-rpc }:
+    melpaBuild {
+        pname = "org2blog";
+        version = "0.9.2";
+        src = fetchFromGitHub {
+          owner = "punchagan";
+          repo = "org2blog";
+          rev = "ad389ae994d269a57e56fbea68df7e6fe5c2ff55";
+          sha256 = "0av1477jn3s4s5kymd7sbb0av437vb5mnfc6rpfgzwji7b8mfr7l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org2blog";
+          sha256 = "0ancvn4ji4552k4nfd2ijclsd027am93ngg241ll8f6h6k0wpmzq";
+          name = "org2blog";
+        };
+        packageRequires = [ metaweblog org xml-rpc ];
+        meta = {
+          homepage = "http://melpa.org/#/org2blog";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org2jekyll = callPackage ({ dash-functional, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "org2jekyll";
+        version = "0.1.8";
+        src = fetchFromGitHub {
+          owner = "ardumont";
+          repo = "org2jekyll";
+          rev = "a12173b9507b3ef54dfebb5751503ba1ee93c6aa";
+          sha256 = "064kw64w9snm0lbshxn8d6yd9xvyislhg37fmhq1w7vy8lm61xvf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org2jekyll";
+          sha256 = "1j9d6xf5nsakifxwd4zmjc29lbj46ffn3z109k2y2yhz7q3r9hzv";
+          name = "org2jekyll";
+        };
+        packageRequires = [ dash-functional deferred s ];
+        meta = {
+          homepage = "http://melpa.org/#/org2jekyll";
+          license = lib.licenses.free;
+        };
+      }) {};
+    orgbox = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "orgbox";
+        version = "0.5.0";
+        src = fetchFromGitHub {
+          owner = "yasuhito";
+          repo = "orgbox";
+          rev = "ecaf5a064431cf92922338c974df8fce1a8f1734";
+          sha256 = "02mxp17p7bj4xamg0m6zk832hmpqcgzc7bjbjcnvbvrawhc255hy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orgbox";
+          sha256 = "12wfqlpjh9nr7zgqs4h8kmfsk825n68qcbn8z2fw2mpshg3nj7l8";
+          name = "orgbox";
+        };
+        packageRequires = [ cl-lib org ];
+        meta = {
+          homepage = "http://melpa.org/#/orgbox";
+          license = lib.licenses.free;
+        };
+      }) {};
+    orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }:
+    melpaBuild {
+        pname = "orgit";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "orgit";
+          rev = "731c5cb4f1c7e2ee5b819ca159c0c01e2b306c73";
+          sha256 = "0d7rh5bi5v04njj1nh8q8kdr6aw68lcw4ghx6kwq97aff4qmcrp1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orgit";
+          sha256 = "0askccb3h98v8gmylwxaph3gbyv5b1sp4slws76aqz1kq9x0jy7w";
+          name = "orgit";
+        };
+        packageRequires = [ dash emacs magit org ];
+        meta = {
+          homepage = "http://melpa.org/#/orgit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    orglink = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "orglink";
+        version = "0.2.3";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "orglink";
+          rev = "4f3750227b9279f248bc8ee5724d3c27ea97e2e1";
+          sha256 = "00vhzblzscp3mkl6x1nz116i4isjwcc5gkpdksym3mr5nqvqhd97";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orglink";
+          sha256 = "0ldrvvqs3hlazj0dch162gsbnbxcg6fgrxid8p7w9gj19vbcl52b";
+          name = "orglink";
+        };
+        packageRequires = [ dash org ];
+        meta = {
+          homepage = "http://melpa.org/#/orglink";
+          license = lib.licenses.free;
+        };
+      }) {};
+    osx-browse = callPackage ({ browse-url-dwim, fetchFromGitHub, fetchurl, lib, melpaBuild, string-utils }:
+    melpaBuild {
+        pname = "osx-browse";
+        version = "0.8.8";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "osx-browse";
+          rev = "6186a6020e143e90d557c8d062c44fcdba0516c7";
+          sha256 = "0g1xhh88a65vcq6rlh7ii16pra4pv519ajcws0h93ldbbjiy7p0m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-browse";
+          sha256 = "06rfzq2hxhzg6jh2zs28r7ffxwlq40nz954j13ly8403c7rmbrfm";
+          name = "osx-browse";
+        };
+        packageRequires = [ browse-url-dwim string-utils ];
+        meta = {
+          homepage = "http://melpa.org/#/osx-browse";
+          license = lib.licenses.free;
+        };
+      }) {};
+    osx-dictionary = callPackage ({ chinese-word-at-point, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "osx-dictionary";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "osx-dictionary.el";
+          rev = "b909e38723caa37157ad6be90ac107c1c7102e07";
+          sha256 = "1vywqzw8hydi944q4ghgxbbvvmwfpa9wj5nmrnixfcw8h4mfcxvv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-dictionary";
+          sha256 = "13033fxc5vjd1f7mm6znmprcp3mwxbvblb2d25shr8d4imqqhv82";
+          name = "osx-dictionary";
+        };
+        packageRequires = [ chinese-word-at-point cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/osx-dictionary";
+          license = lib.licenses.free;
+        };
+      }) {};
+    osx-location = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "osx-location";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "osx-location";
+          rev = "110aee945b53ea550e4debe69bf3c077d940ec8c";
+          sha256 = "1csnxpsfnv9lv07kgvc60qx5c33sshmnz60p3qjz7ym7rnjy9b5x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-location";
+          sha256 = "1p12mmrw70p3b04zlprkdxdfnb7m3vkm6gci3fwhr5zyfvwxvn0c";
+          name = "osx-location";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/osx-location";
+          license = lib.licenses.free;
+        };
+      }) {};
+    osx-plist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "osx-plist";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "emacsmirror";
+          repo = "osx-plist";
+          rev = "5e6de2622fdfe552d4902904f05ea03bc5a6ebd0";
+          sha256 = "0830kkmvc3ss7ygqfwz3j75s7mhxfxyadaksrp0v2cc4y6wn6nfv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-plist";
+          sha256 = "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8";
+          name = "osx-plist";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/osx-plist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    osx-trash = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "osx-trash";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "lunaryorn";
+          repo = "osx-trash.el";
+          rev = "a5ecee69f514ad9ee78fd9d6b20f3dd49512f5b4";
+          sha256 = "1pn6xvq41di1jb5d3i8wgs54w0m2414cq3f1vk0xpibshkq7sr4a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-trash";
+          sha256 = "1f6pi53mhp2pvrfjm8544lqqj36gzpzxq245lzvv91lvqkxr9ysj";
+          name = "osx-trash";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/osx-trash";
+          license = lib.licenses.free;
+        };
+      }) {};
+    outorg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "outorg";
+        version = "2.0";
+        src = fetchFromGitHub {
+          owner = "tj64";
+          repo = "outorg";
+          rev = "e946cda497bae53fca6fa1579910237e216170bf";
+          sha256 = "1v9kx5xr7xcr6i664h2g6j8824yjsjdn5pvgmawvxrrplbjmiqnp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/outorg";
+          sha256 = "04swss84p33a9baa4swqc1a9lfp6wziqrwa7vcyi3y0yzllx36cx";
+          name = "outorg";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/outorg";
+          license = lib.licenses.free;
+        };
+      }) {};
+    outshine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "outshine";
+        version = "2.0";
+        src = fetchFromGitHub {
+          owner = "tj64";
+          repo = "outshine";
+          rev = "cf1097692b3ea0367d3c821769399fec5831e200";
+          sha256 = "1v04iyx57w8scw3iqrivii7q0sh8sa7xacswdhd18mw9kvjrbj98";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/outshine";
+          sha256 = "1i8c3q6n9hpfbpg2f8n8brwgaq36af1jn3g5js88yiyyb5dknxq4";
+          name = "outshine";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/outshine";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ov = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ov";
+        version = "1.0.6";
+        src = fetchFromGitHub {
+          owner = "ShingoFukuyama";
+          repo = "ov.el";
+          rev = "4e1c254d74bc1773c92f1613c3865cdcb4bc7095";
+          sha256 = "0qxk2rf84j86syxi8xknsq252irwg7sz396v3bb4wqz4prpj0kzc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ov";
+          sha256 = "0d71mpv74cfxcnwixbrl90nr22cw4kv5sdgpny5wycvh6cgmd6qb";
+          name = "ov";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ov";
+          license = lib.licenses.free;
+        };
+      }) {};
+    overseer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
+    melpaBuild {
+        pname = "overseer";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "tonini";
+          repo = "overseer.el";
+          rev = "cf532a4e373e3da2077ccbaa48d4bfacd14661ba";
+          sha256 = "0jz8p6bwpfncxwi6ssmi6ngx8sjjica565i6ln0gsr5i11zfb7nx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/overseer";
+          sha256 = "04wfwcal051jrnmm5dga6vl4c9j10pm416586yxb8smi6fxws2jg";
+          name = "overseer";
+        };
+        packageRequires = [ dash emacs pkg-info ];
+        meta = {
+          homepage = "http://melpa.org/#/overseer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    owdriver = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, smartrep, yaxception }:
+    melpaBuild {
+        pname = "owdriver";
+        version = "0.0.6";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "owdriver";
+          rev = "0479389d9df9e70ff9ce69dff06252d3aa40fc86";
+          sha256 = "0f2psx4lq98l3q3fnibsfqxp2hvvwk7b30zjvjlry3bffg3l7pfk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/owdriver";
+          sha256 = "0j8z7ynan0zj581x50gsi9lljkbi6bwmzpfyha3i6q8ch5qkdxfd";
+          name = "owdriver";
+        };
+        packageRequires = [ log4e smartrep yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/owdriver";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ox-ioslide = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ox-ioslide";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "coldnew";
+          repo = "org-ioslide";
+          rev = "e81f7a6dab512da7eaa8c2c50c673538b97db267";
+          sha256 = "047fcvpvwzaqisw4q3p6hxgjyqsi2n9nms1qx9w4znvxrnjq8jz3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-ioslide";
+          sha256 = "0z0qnvpw64wxbgz8203rphswlh9hd2i11pz2mlay8l3bzz4gx4vc";
+          name = "ox-ioslide";
+        };
+        packageRequires = [ cl-lib emacs f org ];
+        meta = {
+          homepage = "http://melpa.org/#/ox-ioslide";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ox-pandoc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "ox-pandoc";
+        version = "1.150707";
+        src = fetchFromGitHub {
+          owner = "kawabata";
+          repo = "ox-pandoc";
+          rev = "035f1d60a0139349232c382cfd23a96902b7003d";
+          sha256 = "0h49pfl97vl796sm7r62rpv3slj0z5krm4zrqkgz0q6zlyrjay29";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-pandoc";
+          sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc";
+          name = "ox-pandoc";
+        };
+        packageRequires = [ dash emacs ht org ];
+        meta = {
+          homepage = "http://melpa.org/#/ox-pandoc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ox-twbs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ox-twbs";
+        version = "1.0.5";
+        src = fetchFromGitHub {
+          owner = "marsmining";
+          repo = "ox-twbs";
+          rev = "cfe67353d148e65a7676f1609d8cc22a4c8fbc78";
+          sha256 = "026g48sgqwnqs5zmrabhiv3l8052l4c1vsbsf6bdxv4a6yp0l654";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-twbs";
+          sha256 = "15csgnph5wh2dvcc2dnvrlm7whh428rq8smqji1509ib7aw9y5mx";
+          name = "ox-twbs";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ox-twbs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pabbrev = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pabbrev";
+        version = "4.1";
+        src = fetchFromGitHub {
+          owner = "phillord";
+          repo = "pabbrev";
+          rev = "127a8b10cf352b0491fefd2f4178ba78ee587564";
+          sha256 = "073qpa223ja673p63mhvy4l6yyv3k7z05ifwvn7bmq4b5fq42hw6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pabbrev";
+          sha256 = "1mbfa40pbzbi00sp155zm43sj6nw221mcayc2rk3ppin9ps95hx3";
+          name = "pabbrev";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pabbrev";
+          license = lib.licenses.free;
+        };
+      }) {};
+    package-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "package-plus";
+        version = "1.1.0";
+        src = fetchFromGitHub {
+          owner = "zenspider";
+          repo = "package";
+          rev = "4a9618a44ec4f26a14e0136cd9d3c4855fceb25b";
+          sha256 = "1xv0ra130qg0ksgqi4npspnv0ckq77k7f5kcibavj030h578kj97";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/package+";
+          sha256 = "1mbsxr4llz8ny7n7w3lykld9yvbaywlfqnvr9l0aiv9rvmdv03bn";
+          name = "package-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/package+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    package-safe-delete = callPackage ({ emacs, epl, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "package-safe-delete";
+        version = "0.1.7";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "package-safe-delete";
+          rev = "138171e4fc03c0ef05a8260cbb5cd2e114c1c194";
+          sha256 = "1pdv6d6bm5jmpgjqf9ycvzasxz1205zdi0zjrmkr33c03azwz7rd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/package-safe-delete";
+          sha256 = "12ss5yjhnyxsif4vlbgxamn5jfa0wxkkphffxnv6drhvmpq226jw";
+          name = "package-safe-delete";
+        };
+        packageRequires = [ emacs epl ];
+        meta = {
+          homepage = "http://melpa.org/#/package-safe-delete";
+          license = lib.licenses.free;
+        };
+      }) {};
+    package-utils = callPackage ({ epl, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "package-utils";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "Silex";
+          repo = "package-utils";
+          rev = "4a56f411f98fd455556a3f1d6c16a577a22057a2";
+          sha256 = "138l07qmxj4fkvf43f1hdn4skadxb50c023bc5101l3njzmf74wa";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/package-utils";
+          sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r";
+          name = "package-utils";
+        };
+        packageRequires = [ epl ];
+        meta = {
+          homepage = "http://melpa.org/#/package-utils";
+          license = lib.licenses.free;
+        };
+      }) {};
+    packed = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "packed";
+        version = "0.5.0";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "packed";
+          rev = "478613da38b0a47f4419acc50017ac871433b13c";
+          sha256 = "0k5l0l4vjw38r911zd9c9cv015vpw2y8abp82s2s9pm8nqc3bnci";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/packed";
+          sha256 = "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z";
+          name = "packed";
+        };
+        packageRequires = [ cl-lib dash ];
+        meta = {
+          homepage = "http://melpa.org/#/packed";
+          license = lib.licenses.free;
+        };
+      }) {};
+    page-break-lines = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "page-break-lines";
+        version = "0.10";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "page-break-lines";
+          rev = "36d3f93a23b767e7558b9c90f3631b03ce9fbdce";
+          sha256 = "1acz3w2zdcds0h6p2k9h3lmjsk519asqrxjw7f3pyrcq7x2qbhc4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/page-break-lines";
+          sha256 = "0q1166z190dxznzgf2f29klj2jkaqlic483p4h3bylihkqp93ij7";
+          name = "page-break-lines";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/page-break-lines";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pallet = callPackage ({ cask, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "pallet";
+        version = "0.9.2";
+        src = fetchFromGitHub {
+          owner = "rdallasgray";
+          repo = "pallet";
+          rev = "0e1ae11e1ebfe644cbf832df62ac2dbf6ecd0501";
+          sha256 = "03mlg6dmpjw8fq2s3c4gpqj20kjhzldz3m51bf6s0mxq9bclx2xw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pallet";
+          sha256 = "0q50cdwnn2w1n5h4bappncjjyi5yaixxannwgy23fngdrz1mxwd7";
+          name = "pallet";
+        };
+        packageRequires = [ cask dash f s ];
+        meta = {
+          homepage = "http://melpa.org/#/pallet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pandoc-mode";
+        version = "2.13.3";
+        src = fetchFromGitHub {
+          owner = "joostkremers";
+          repo = "pandoc-mode";
+          rev = "067f9aa8ba27bd50b602dbfdaa155e2f381c7139";
+          sha256 = "14kxmcsgdrq9r8c17x8hz8vid0bn6rikvmddhc6wpbmp7shngvr1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pandoc-mode";
+          sha256 = "0qvc6cf87h1jqf590kd68jfg25snxaxayfds634wj4z6gp70l781";
+          name = "pandoc-mode";
+        };
+        packageRequires = [ dash hydra ];
+        meta = {
+          homepage = "http://melpa.org/#/pandoc-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pangu-spacing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pangu-spacing";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "coldnew";
+          repo = "pangu-spacing";
+          rev = "034b4ef8a1b29bf7bfed6a916380941506ed26ed";
+          sha256 = "0gmdzagyg0p7q1gyj2a3aqp2g4asljpib3n67nikr0v99c2mki5y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pangu-spacing";
+          sha256 = "082qh26vlk7kifz1800lyai17yvngwjygrfrsh1dsd8dxhk6l9j8";
+          name = "pangu-spacing";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pangu-spacing";
+          license = lib.licenses.free;
+        };
+      }) {};
+    paper-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, hexrgb, lib, melpaBuild }:
+    melpaBuild {
+        pname = "paper-theme";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "cadadr";
+          repo = "paper-theme";
+          rev = "15af5e31492f79dc0d47787150ef39d6318a2608";
+          sha256 = "1xh614czldjvfl66vhkyaai5k4qsg1l3mz6wd5b1w6kd45qrc54i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paper-theme";
+          sha256 = "04diqm2c9fm29zyms3hplkzb4kb7b2kyrxdsy0jxyjj5kabypd50";
+          name = "paper-theme";
+        };
+        packageRequires = [ emacs hexrgb ];
+        meta = {
+          homepage = "http://melpa.org/#/paper-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    paradox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, hydra, json ? null, let-alist, lib, melpaBuild, seq, spinner }:
+    melpaBuild {
+        pname = "paradox";
+        version = "2.3.6";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "paradox";
+          rev = "d62d883b8c980d679970bed79c12091df9120a77";
+          sha256 = "06c2a55bmnhfvjpd43kq6d2l9yijgiq16yq19x6m8050f8hzxnyb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paradox";
+          sha256 = "1xq14nfvprsq18464qr4mhphq7cl1f570lji5n8z6j9vpfm9a4p2";
+          name = "paradox";
+        };
+        packageRequires = [ cl-lib emacs hydra json let-alist seq spinner ];
+        meta = {
+          homepage = "http://melpa.org/#/paradox";
+          license = lib.licenses.free;
+        };
+      }) {};
+    paredit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "paredit";
+        version = "24";
+        src = fetchgit {
+          url = "http://mumble.net/~campbell/git/paredit.git";
+          rev = "82bb75ceb2ddc272d6618d94874b7fc13181a409";
+          sha256 = "7587cd2cf6e5b245678bbca8cbad07db8576ff976a504cd8d6e52fa85cf99f8f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paredit";
+          sha256 = "1rp859y4qyqdfvp261l8mmbd62p1pw0dypm1mng6838b6q6ycakr";
+          name = "paredit";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/paredit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    paredit-everywhere = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
+    melpaBuild {
+        pname = "paredit-everywhere";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "paredit-everywhere";
+          rev = "72b7cd5dcdc02233a32e9f1a6c2d21dc30532170";
+          sha256 = "0jbjwjl92pf0kih3p2x20ms2kpyzzam8fir661nimpmk802ahgkj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paredit-everywhere";
+          sha256 = "0gbkwk8mrbjr2l8pz3q4y6j8q4m12zmzl31c88ngs1k5d86wav36";
+          name = "paredit-everywhere";
+        };
+        packageRequires = [ paredit ];
+        meta = {
+          homepage = "http://melpa.org/#/paredit-everywhere";
+          license = lib.licenses.free;
+        };
+      }) {};
+    paren-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "paren-face";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "paren-face";
+          rev = "835d817295d81e2a6def9beb37f05aaf97870e86";
+          sha256 = "033gdya7f6p4kkapnmnbxlm88g4rbsmym4cc4jkcmp91idh63syq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paren-face";
+          sha256 = "0dmzk66m3rd8x0rb925pyrfpc2qsvayks4kmhpb2ccdrx68pg8gf";
+          name = "paren-face";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/paren-face";
+          license = lib.licenses.free;
+        };
+      }) {};
+    parent-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "parent-mode";
+        version = "2.3";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "parent-mode";
+          rev = "db692cf08deff2f0e973e6e86e26662b44813d1b";
+          sha256 = "0i5bc7lyyrx6swqlrp9l5x72yzwi53qn6ldrfs99gh08b3yvsnni";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/parent-mode";
+          sha256 = "1ndn6m6aasmk9yrml9xqj8141100nw7qi1bhnlsss3v8b6njwwig";
+          name = "parent-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/parent-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    parsebib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "parsebib";
+        version = "1.0.5";
+        src = fetchFromGitHub {
+          owner = "joostkremers";
+          repo = "parsebib";
+          rev = "9a1f60bed2814dfb5cec2b92efb5951a4b465cce";
+          sha256 = "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/parsebib";
+          sha256 = "07br2x68scsxykdk2ajc4mfqhdb7vjkcfgz3vnpy91sirxzgfjdd";
+          name = "parsebib";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/parsebib";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }:
+    melpaBuild {
+        pname = "pass";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "NicolasPetton";
+          repo = "pass";
+          rev = "93d99883a95e70f931d2abad87e697f5243115d3";
+          sha256 = "18m0973l670cjbzpa1vfv06gymhsa2f1pjcp329s0npb735x5whj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pass";
+          sha256 = "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr";
+          name = "pass";
+        };
+        packageRequires = [ emacs f password-store ];
+        meta = {
+          homepage = "http://melpa.org/#/pass";
+          license = lib.licenses.free;
+        };
+      }) {};
+    passthword = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "passthword";
+        version = "1.4";
+        src = fetchFromGitHub {
+          owner = "pidu";
+          repo = "passthword";
+          rev = "58a91defdbeec9014b4e46f909a7411b3a627285";
+          sha256 = "1g0mvg9i8f2qccb4b0m4d74zkjx9gjfv47x57by6cdaf9yywqryi";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/passthword";
+          sha256 = "076jayziipjx260yk3p37pf5k0qsagalidah3y6hiflrlq4sfgjn";
+          name = "passthword";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/passthword";
+          license = lib.licenses.free;
+        };
+      }) {};
+    password-store = callPackage ({ dash, f, fetchgit, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "password-store";
+        version = "1.6.5";
+        src = fetchgit {
+          url = "http://git.zx2c4.com/password-store";
+          rev = "1aac79d9617431bbaf218f9a9d270929762d2816";
+          sha256 = "f71d0b36570983c35e08b6672c186b5c308b57536a96a747f09665bab794be30";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/password-store";
+          sha256 = "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss";
+          name = "password-store";
+        };
+        packageRequires = [ dash f s ];
+        meta = {
+          homepage = "http://melpa.org/#/password-store";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pastehub = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pastehub";
+        version = "0.5.2";
+        src = fetchFromGitHub {
+          owner = "kiyoka";
+          repo = "pastehub";
+          rev = "37b045c67659c078f1517d0fbd5282dab58dca23";
+          sha256 = "0m6qjsq6qfwwszm95lj8c58l75vbmx9r5hm9bfywyympfgy0fa1n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pastehub";
+          sha256 = "1slvqn5ay6gkbi0ai1gy1wmc02h4g3n6srrh4fqn72y7b9nv5i0v";
+          name = "pastehub";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pastehub";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pastelmac-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pastelmac-theme";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "bmastenbrook";
+          repo = "pastelmac-theme-el";
+          rev = "bead21741e3f46f6506e8aef4469d4240a819389";
+          sha256 = "1v5mpjb8kavbqhvg4rizwg8cypgmi6ngdiy8qp9pimmkb56y42ly";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pastelmac-theme";
+          sha256 = "168zzqhp2dbfcnknwfqxk68rgmibfw71ksghvi6h2j2c1m08l23f";
+          name = "pastelmac-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/pastelmac-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    paxedit = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
+    melpaBuild {
+        pname = "paxedit";
+        version = "1.1.7";
+        src = fetchFromGitHub {
+          owner = "promethial";
+          repo = "paxedit";
+          rev = "0d06c72b18b4eccb8668b2dc3e7884f2cef7871b";
+          sha256 = "0kkgqaxyrv65rfg2ng1vmmmrc9bm98yqpsv2pcb760287dn0l27m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paxedit";
+          sha256 = "06ymilr0zrwfpyzql7dcpg48lhkx73f2jlaw3caxgsjaz7x3n4ic";
+          name = "paxedit";
+        };
+        packageRequires = [ cl-lib paredit ];
+        meta = {
+          homepage = "http://melpa.org/#/paxedit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pcache = callPackage ({ eieio ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pcache";
+        version = "0.3.2";
+        src = fetchFromGitHub {
+          owner = "sigma";
+          repo = "pcache";
+          rev = "4b090f46182fd2ed1f44905dc04acc3121bcf622";
+          sha256 = "0xbbq8ddlirhvv921nrf7bwazh0i98bk0a9xzyx8iqpyg66vbfa8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcache";
+          sha256 = "1q2wlbc58lyf3dxfs9ppdxvdsp81jmkq874zbd7f39wvc5ckbz0l";
+          name = "pcache";
+        };
+        packageRequires = [ eieio ];
+        meta = {
+          homepage = "http://melpa.org/#/pcache";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pcomplete-extension = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pcomplete-extension";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "thierryvolpiatto";
+          repo = "pcomplete-extension";
+          rev = "839740c90de857e18db2f578d6660951522faab5";
+          sha256 = "0h0p4c08z0dqxmg55fzch1d2f38rywfk1j0an2f4sc94lj7ckbm6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcomplete-extension";
+          sha256 = "0m0c9ir44p21rj93fkisvpvi08936717ljmzsr4qdf69b3i54cwc";
+          name = "pcomplete-extension";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/pcomplete-extension";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pcsv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pcsv";
+        version = "1.3.6";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-pcsv";
+          rev = "91599aaba70a8e8593fa2f36165af82cbd35e41e";
+          sha256 = "03k3xhrim4s3yvbnl8g8ci5g7chlffycdw7d6a1pz3077mxf1f1z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcsv";
+          sha256 = "1zphndkbva59g1fd319a240yvq8fjk315b1fyrb8zvmqpgk9n0dl";
+          name = "pcsv";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pcsv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }:
+    melpaBuild {
+        pname = "pdf-tools";
+        version = "0.70";
+        src = fetchFromGitHub {
+          owner = "politza";
+          repo = "pdf-tools";
+          rev = "0107f80dcf268d08ac075b01729820062c0fbd67";
+          sha256 = "19sy49r3ijh36m7hl4vspw5c4i8pnfqdn4ldm2sqchxigkw56ayl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pdf-tools";
+          sha256 = "1hnc8cci00mw78h7d7gs8smzrgihqz871sdc9hfvamb7iglmdlxw";
+          name = "pdf-tools";
+        };
+        packageRequires = [ emacs let-alist tablist ];
+        meta = {
+          homepage = "http://melpa.org/#/pdf-tools";
+          license = lib.licenses.free;
+        };
+      }) {};
+    peg = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "peg";
+        version = "0.6";
+        src = fetchFromGitHub {
+          owner = "ellerh";
+          repo = "peg.el";
+          rev = "081efeca91d790c7fbc90871ac22c40935f4833b";
+          sha256 = "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/peg";
+          sha256 = "0nxy9xn99myz0p36m4jflfj48qxhhn1sspbfx8d90030xg3cc2gm";
+          name = "peg";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/peg";
+          license = lib.licenses.free;
+        };
+      }) {};
+    per-buffer-theme = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "per-buffer-theme";
+        version = "1.3";
+        src = fetchhg {
+          url = "https://bitbucket.com/inigoserna/per-buffer-theme.el";
+          rev = "2b82a04b28d0";
+          sha256 = "1rh87jf0a15q35a8h00bx6k5wa931rb6gh600zbs7j4r3y8qsylf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/per-buffer-theme";
+          sha256 = "1czcaybpfmx4mwff7hs07iayyvgvlhifkickccap6kpd0cp4n6hn";
+          name = "per-buffer-theme";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/per-buffer-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    persistent-scratch = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "persistent-scratch";
+        version = "0.2.3";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "persistent-scratch";
+          rev = "f0554b9edb4b05150f297b5c14a2da003209d3bf";
+          sha256 = "0h05j55y3csq91a5m2fg99y4rzsh7zca7hnifb6kic5zb3nahi00";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/persistent-scratch";
+          sha256 = "0iai65lsg3zxj07hdb9201w3rwrvdb3wffr6k2jdl8hzg5idghn1";
+          name = "persistent-scratch";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/persistent-scratch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    persistent-soft = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache }:
+    melpaBuild {
+        pname = "persistent-soft";
+        version = "0.8.10";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "persistent-soft";
+          rev = "a1e0ddf2a12a6f18cab565dee250f070384cbe02";
+          sha256 = "14p20br8vzxs39d4hswzrrkgwql5nnmn5j17cpbabzjvck42rixc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/persistent-soft";
+          sha256 = "0a4xiwpgyyynjf69s8p183mqd3z53absv544ggvhb2gkpm6jravc";
+          name = "persistent-soft";
+        };
+        packageRequires = [ list-utils pcache ];
+        meta = {
+          homepage = "http://melpa.org/#/persistent-soft";
+          license = lib.licenses.free;
+        };
+      }) {};
+    persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "persp-mode";
+        version = "1.1.7";
+        src = fetchFromGitHub {
+          owner = "Bad-ptr";
+          repo = "persp-mode.el";
+          rev = "00e5f345f13b2b9e615082ac9ccbfd076592cc22";
+          sha256 = "129cl5az4rr5j7krpyyi5khhbl8klw7ji9ysarz0s7ivy096jq7b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/persp-mode";
+          sha256 = "1bgni7y5xsn4a21494npr90w3320snfzw1hvql30xrr57pw3765w";
+          name = "persp-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/persp-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    perspective = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "perspective";
+        version = "1.12";
+        src = fetchFromGitHub {
+          owner = "nex3";
+          repo = "perspective-el";
+          rev = "3a8d59045a6370fae1ec2011865190a7465d707f";
+          sha256 = "12c2rrhysrcl2arc6hpzv6lxbb1r3bzlvdp23hnp9sci6yc10k3q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/perspective";
+          sha256 = "150dxcsd0ylvfi9mmfpcki1wd3nl8q9mbszd3dgqfnm40yncklml";
+          name = "perspective";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/perspective";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ph = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ph";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "gromnitsky";
+          repo = "ph";
+          rev = "ed45c371642e313810b56c45af08fdfbd71a7dfe";
+          sha256 = "1qxsc5wyk8l9gkgmqy3mzwxdhji1ljqw9s1jfxkax7fyv4d1v31p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ph";
+          sha256 = "0azx4cpfdn01yrqyn0q1gg9z7w0h0rn7zl39v3dx6yidd76ysh0l";
+          name = "ph";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ph";
+          license = lib.licenses.free;
+        };
+      }) {};
+    phi-search-mc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors, phi-search }:
+    melpaBuild {
+        pname = "phi-search-mc";
+        version = "2.2.1";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "phi-search-mc.el";
+          rev = "4c6d2d39feb502febb81fc98b7b5854d88150c69";
+          sha256 = "0r6cl1ng41s6wsy5syjlkaip0mp8h491diipdc1psbhnpk4vabsv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phi-search-mc";
+          sha256 = "07hd80rbyzr5n3yd7hv1j51nl6pvcxmln20g6xvw8gh5yfl9k0m8";
+          name = "phi-search-mc";
+        };
+        packageRequires = [ multiple-cursors phi-search ];
+        meta = {
+          homepage = "http://melpa.org/#/phi-search-mc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    php-auto-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, yasnippet }:
+    melpaBuild {
+        pname = "php-auto-yasnippets";
+        version = "2.3.1";
+        src = fetchFromGitHub {
+          owner = "ejmr";
+          repo = "php-auto-yasnippets";
+          rev = "1950d83cbcc5c5d62cd3bc432e1595870fe8cabf";
+          sha256 = "0zs11811kx6x1zgc1icd8gw420saa7z6zshpzmrddnbznya4qql6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php-auto-yasnippets";
+          sha256 = "1hhddvpc80b6wvjpbpibsf24rp5a5p45m0bg7m0c8mx181h9mqgn";
+          name = "php-auto-yasnippets";
+        };
+        packageRequires = [ php-mode yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/php-auto-yasnippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    php-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "php-mode";
+        version = "1.17.0";
+        src = fetchFromGitHub {
+          owner = "ejmr";
+          repo = "php-mode";
+          rev = "f3201eebfebf1757cf6a636fe3c7a3b810ab6612";
+          sha256 = "0pwhw59ki19f9rkgvvnjzhby67s0y9hpsrg6cwqxakjlm66w96q3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php-mode";
+          sha256 = "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y";
+          name = "php-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/php-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    phpcbf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "phpcbf";
+        version = "0.9.2";
+        src = fetchFromGitHub {
+          owner = "nishimaki10";
+          repo = "emacs-phpcbf";
+          rev = "b556b548ceb061b002389d6165d2cc63d8bddb5d";
+          sha256 = "09rinyx0621d7613xmbyvrrlav6d4ia332wkgg0m9dn265g3h56z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phpcbf";
+          sha256 = "1hf88ys4grffpqgavrbc72dn3m7crafgid2ygzx9c5j55syh8mfv";
+          name = "phpcbf";
+        };
+        packageRequires = [ s ];
+        meta = {
+          homepage = "http://melpa.org/#/phpcbf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    phpunit = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
+    melpaBuild {
+        pname = "phpunit";
+        version = "0.7.0";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "phpunit.el";
+          rev = "d9e9092d664463b7cc8e0a433a76b8c9598ab2c9";
+          sha256 = "1s4a0ygm79shv6f0rghrkq9jb7jc7sh9cjxzlzj0c8zpvsxl0hlz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phpunit";
+          sha256 = "0nj8ss1yjkcqnbnn4jgbp0403ljjk2xhipzikdrl3dbxlf14i4f8";
+          name = "phpunit";
+        };
+        packageRequires = [ f pkg-info s ];
+        meta = {
+          homepage = "http://melpa.org/#/phpunit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pinyin-search = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pinyin-search";
+        version = "1.1.0";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "pinyin-search.el";
+          rev = "5895cccfa6b43263ee243c5642cc16dd9a69fb4e";
+          sha256 = "12jhdkgfck2a6d5jj65l9d98dm34gsyi0ya4h21dbbvz35zivz70";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pinyin-search";
+          sha256 = "1si693nmmxgg0kp5mxvj5nq946kfc5cv3wfsl4znbqzps8qb2b7z";
+          name = "pinyin-search";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pinyin-search";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pip-requirements = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pip-requirements";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "Wilfred";
+          repo = "pip-requirements.el";
+          rev = "733ec3e4c30875944601b566e9dba6ef05812fcd";
+          sha256 = "1dsg49156mfhkd8ip4ny03sc06zchxr1qpbcx48f5sn4m9j5d3vs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pip-requirements";
+          sha256 = "1wsjfyqga7pzp8gsm5x53qrkn40srairbjpifyrqbi2fpzmwhrnz";
+          name = "pip-requirements";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/pip-requirements";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pixiv-novel-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pixiv-novel-mode";
+        version = "0.0.3";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "pixiv-novel-mode.el";
+          rev = "4dd9caf749190fab8f0b33862b3894b635de46c5";
+          sha256 = "1wg8pcwd70ixn2bxh01934zl12ry4pgx3l9dccpbjdi40gira00d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pixiv-novel-mode";
+          sha256 = "0f1rxvf9nrw984122i6dzsgik9axfjv6yscmg203s065n9lz17px";
+          name = "pixiv-novel-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pixiv-novel-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pkg-info = callPackage ({ epl, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pkg-info";
+        version = "0.6";
+        src = fetchFromGitHub {
+          owner = "lunaryorn";
+          repo = "pkg-info.el";
+          rev = "f9bb471ee95d1c5fe9adc6b0e98db2ddff3ddc0e";
+          sha256 = "0nk12dcppdyhav6m6yf7abpywyd7amxd4237zsfd32w4zxsx39k1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pkg-info";
+          sha256 = "0whcvralk76mfmvbvwn57va5dkb1irj7iwffgddi7r0ima49iszx";
+          name = "pkg-info";
+        };
+        packageRequires = [ epl ];
+        meta = {
+          homepage = "http://melpa.org/#/pkg-info";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pkgbuild-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pkgbuild-mode";
+        version = "0.14";
+        src = fetchFromGitHub {
+          owner = "juergenhoetzel";
+          repo = "pkgbuild-mode";
+          rev = "6bb7cb3b0599ac0ae3c1d8d5014aefc1ecff7965";
+          sha256 = "0a8qb1ldk6bjs7fpxgxrf90md7q46fhl71gmay8yafdkh6hn0kqr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pkgbuild-mode";
+          sha256 = "1lp7frjahcpr4xnzxz77qj5hbpxbxm2g28apkixrnc1xjha66v3x";
+          name = "pkgbuild-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pkgbuild-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    platformio-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
+    melpaBuild {
+        pname = "platformio-mode";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "zachmassia";
+          repo = "platformio-mode";
+          rev = "6d12f34548f93dec3c6fe40843d87a8a67ec25c7";
+          sha256 = "1k3bqv5y2xp1jl2hpf8qhs11yzhcl8k40fxqjzv7mvc0ysq9y6wb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/platformio-mode";
+          sha256 = "022l20sfyfkvp6kmmqxr7gcmcdx6b1dgsakjjnx8fknrpxr5kyps";
+          name = "platformio-mode";
+        };
+        packageRequires = [ projectile ];
+        meta = {
+          homepage = "http://melpa.org/#/platformio-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    plenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "plenv";
+        version = "0.32";
+        src = fetchFromGitHub {
+          owner = "karupanerura";
+          repo = "plenv.el";
+          rev = "ee937d0f3a1a7ba2d035f45be896d3ed8fefaee2";
+          sha256 = "11cbpgjsnw8fiqf1s12hbm9qxgjcw6y2zxx7wz4wg7idmi7m0b7g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plenv";
+          sha256 = "0dw9fy5wd9wm76ag6yyw3f9jnlj7rcdcxgdjm30h514qfi9hxbw4";
+          name = "plenv";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/plenv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    plsense = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
+    melpaBuild {
+        pname = "plsense";
+        version = "0.4.7";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "emacs-plsense";
+          rev = "f6fb22607a5252b2556d2e7fa14f1bcab5d9747a";
+          sha256 = "0f00dv5jwbhs99j4jc6lvr5n0mv1y80yg7zpp6yrmhww6829l5rg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plsense";
+          sha256 = "1ka06r4ashhjkfyzql9mfvs3gj7n684h4gaycj29w4nfqrhcw9va";
+          name = "plsense";
+        };
+        packageRequires = [ auto-complete log4e yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/plsense";
+          license = lib.licenses.free;
+        };
+      }) {};
+    plsense-direx = callPackage ({ direx, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, plsense, yaxception }:
+    melpaBuild {
+        pname = "plsense-direx";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "plsense-direx";
+          rev = "8a2f465264c74e04524cc789cdad0190ace43f6c";
+          sha256 = "0s34nbqqy6aqi113xj452pbmqp43046wfbfbbfv1xwhybgq0c1j1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plsense-direx";
+          sha256 = "0qd4b7gkmn5ydadhp70995rap3643s1aa8gfi5izgllzhg0i864j";
+          name = "plsense-direx";
+        };
+        packageRequires = [ direx log4e plsense yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/plsense-direx";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pophint = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, popup, yaxception }:
+    melpaBuild {
+        pname = "pophint";
+        version = "0.9.3";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "emacs-pophint";
+          rev = "28dc6a76e726f371bcca3160c27ae2017324399c";
+          sha256 = "18i0kivn6prh5pwdr7b4pxfxqsc8l4mks1h6cfs7iwnfn15g5k19";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pophint";
+          sha256 = "1chq2j79hg095jxw5z3pz4qicqrccw0gj4sxrin0a55hnprzzp72";
+          name = "pophint";
+        };
+        packageRequires = [ log4e popup yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/pophint";
+          license = lib.licenses.free;
+        };
+      }) {};
+    popup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "popup";
+        version = "0.5.3";
+        src = fetchFromGitHub {
+          owner = "auto-complete";
+          repo = "popup-el";
+          rev = "46632ab9652dacad56fd961cd6def25a015170ae";
+          sha256 = "1y538siabcf1n00wr4iz5gbxfndw661kx2mn9w1g4lg7yi4n0h0h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popup";
+          sha256 = "151g00h9rkid76qf6c53n8bncsfaikmhj8fqcb3r3a6mbngcd5k2";
+          name = "popup";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/popup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    popup-complete = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "popup-complete";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-popup-complete";
+          rev = "e362d4a005b36646ffbaa6be604e9e31bc406ca9";
+          sha256 = "084hb3zn1aiabbyxgaalszb2qjf9z64z960ks5fvz8nh7n6y7ny4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popup-complete";
+          sha256 = "04bpm31zx87j390r2xi1yl4kyqgalmyqc48xarsm67zfww9fw9c1";
+          name = "popup-complete";
+        };
+        packageRequires = [ popup ];
+        meta = {
+          homepage = "http://melpa.org/#/popup-complete";
+          license = lib.licenses.free;
+        };
+      }) {};
+    popup-imenu = callPackage ({ dash, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "popup-imenu";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "ancane";
+          repo = "popup-imenu";
+          rev = "bc363f34d1764300708f9cd3a71a57a2ff4a0d53";
+          sha256 = "083q5q53j1dcv4m2jdamh28bdk6ajzcypmyb3xr52dnqdm3bw6im";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popup-imenu";
+          sha256 = "0lxwfaa9vhdn55dj3idp8c3fg1g26qsqq46y5bimfd0s89bjbaxn";
+          name = "popup-imenu";
+        };
+        packageRequires = [ dash flx-ido popup ];
+        meta = {
+          homepage = "http://melpa.org/#/popup-imenu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    popwin = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "popwin";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "m2ym";
+          repo = "popwin-el";
+          rev = "95dea14c60019d6cccf9a3b33e0dec4e1f22c304";
+          sha256 = "0nips9npm4zmz3f37vvb4s0g1ci0p9cl6w0z4sc6agg4rybjhpdp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popwin";
+          sha256 = "1zp54nv8rh0b3g8y5aj4793miiw2r1ijwbzq31lkwmbdr09mixmf";
+          name = "popwin";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/popwin";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pos-tip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pos-tip";
+        version = "0.4.6";
+        src = fetchFromGitHub {
+          owner = "pitkali";
+          repo = "pos-tip";
+          rev = "1b81694d1dc29253db0e855b82563f84a32b38d4";
+          sha256 = "0w8bnspnk871qndp18hs0wk4x9x31xr9rwbvf5dc8mcbnj29ch33";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pos-tip";
+          sha256 = "13qjz112qlrnq34lr70087gshzq8m44knfl6694hfprzjgix84vh";
+          name = "pos-tip";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pos-tip";
+          license = lib.licenses.free;
+        };
+      }) {};
+    powerline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "powerline";
+        version = "2.2";
+        src = fetchFromGitHub {
+          owner = "milkypostman";
+          repo = "powerline";
+          rev = "240bad5ebea4c7298e86ed76bd44c45d9062cb33";
+          sha256 = "1nx3b24i26kgm52xw21x4m15qjkxw3sg5r6qyvck0fyhj0gw69gr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/powerline";
+          sha256 = "0gsffr6ilmckrzifsmhwd42vr85vs42pc26f1205pbxb7ma34dhx";
+          name = "powerline";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/powerline";
+          license = lib.licenses.free;
+        };
+      }) {};
+    powershell = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "powershell";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "jschaf";
+          repo = "powershell.el";
+          rev = "7316f44d0b528552f5a0692f778e5f0efd964299";
+          sha256 = "010b151wblgxlfpy590yanbl2r8qhpbqgi02v0pyir340frm9ngn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/powershell";
+          sha256 = "162k8y9k2n48whaq93sqk86zy3p9qvsfxgyfv9n1nvk4l5wn70wk";
+          name = "powershell";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/powershell";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ppd-sr-speedbar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, project-persist-drawer, sr-speedbar }:
+    melpaBuild {
+        pname = "ppd-sr-speedbar";
+        version = "0.0.6";
+        src = fetchFromGitHub {
+          owner = "rdallasgray";
+          repo = "ppd-sr-speedbar";
+          rev = "19d3e924407f40a6bb38c8fe427a159af755adce";
+          sha256 = "0pv671j8g09pn61kkfb3pa9axfa9zd2jdrkgr81rm2gqb2vh1hsq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ppd-sr-speedbar";
+          sha256 = "1m2918hqvb9c6rgb5szs95ds99gdjdxggcbdfqzmbb5sz2936av8";
+          name = "ppd-sr-speedbar";
+        };
+        packageRequires = [ project-persist-drawer sr-speedbar ];
+        meta = {
+          homepage = "http://melpa.org/#/ppd-sr-speedbar";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pretty-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pretty-mode";
+        version = "2.0.3";
+        src = fetchFromGitHub {
+          owner = "akatov";
+          repo = "pretty-mode";
+          rev = "4ba8fceb7dd733361ed975d80ac2caa3612fa78b";
+          sha256 = "013fig9i4fyx16krp2vfv953p3rwdzr38zs6i50af4pqz4vrcfvh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pretty-mode";
+          sha256 = "1zxi4nj7vnchiiz1ndx17b719a1wipiqniykzn4pa1w7dsnqg21f";
+          name = "pretty-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pretty-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    processing-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "processing-mode";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "ptrv";
+          repo = "processing2-emacs";
+          rev = "228bc56369675787d60f637223b50ce3a1afebbd";
+          sha256 = "08ljf39jfmfpdk36nws2dnwpm7y8252zsdprsc85hr1h1ig5xy15";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/processing-mode";
+          sha256 = "184yg9z14ighz9djg53ji5dgnb98dnxkkwx55m8f0f879x31i89m";
+          name = "processing-mode";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/processing-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    processing-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "processing-snippets";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "ptrv";
+          repo = "processing2-emacs";
+          rev = "228bc56369675787d60f637223b50ce3a1afebbd";
+          sha256 = "08ljf39jfmfpdk36nws2dnwpm7y8252zsdprsc85hr1h1ig5xy15";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/processing-snippets";
+          sha256 = "09vkm9asmjz1in0f63s7bf4amifspsqf5w9pxiy5y0qvmn28fr2r";
+          name = "processing-snippets";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/processing-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    prodigy = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "prodigy";
+        version = "0.6.0";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "prodigy.el";
+          rev = "7034873908a616853b3a65258a7580a3b402e8a2";
+          sha256 = "0r32rjfsbna0g2376gdv0c0im1lzw1cwbp9690rgqjj95ls4saa3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/prodigy";
+          sha256 = "032868bgy2wmb2ws48lfibs4118inpna7mmml8m7i4m4y9ll6g85";
+          name = "prodigy";
+        };
+        packageRequires = [ dash emacs f s ];
+        meta = {
+          homepage = "http://melpa.org/#/prodigy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    project-explorer = callPackage ({ cl-lib ? null, emacs, es-lib, es-windows, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "project-explorer";
+        version = "0.14.3";
+        src = fetchFromGitHub {
+          owner = "sabof";
+          repo = "project-explorer";
+          rev = "7c2cc86a81f679dda355110f916366b64893a5d4";
+          sha256 = "1hv8ifrpwn434sm41vkgbwni21ma5kfybkwasi6zp0f2b5i9ziw7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-explorer";
+          sha256 = "076lzmyi1n7yrgdgyh9qinq271qk6k64x0msbzarihr3p4psrn8m";
+          name = "project-explorer";
+        };
+        packageRequires = [ cl-lib emacs es-lib es-windows ];
+        meta = {
+          homepage = "http://melpa.org/#/project-explorer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    project-persist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "project-persist";
+        version = "0.3.2";
+        src = fetchFromGitHub {
+          owner = "rdallasgray";
+          repo = "project-persist";
+          rev = "a4e5de1833edb60656d8a04357c527d34e81d27c";
+          sha256 = "1x7hwda1w59b8hvzxyk996wdz6phs6rchh3f1ydf0ab6x7m7xvjr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-persist";
+          sha256 = "0csjwj0qaw0hz2qrj8kxgxlixh2hi3aqib98vm19sr3f1b8qab24";
+          name = "project-persist";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/project-persist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    project-persist-drawer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, project-persist }:
+    melpaBuild {
+        pname = "project-persist-drawer";
+        version = "0.0.4";
+        src = fetchFromGitHub {
+          owner = "rdallasgray";
+          repo = "project-persist-drawer";
+          rev = "35bbe132a4fab6a0fec15ce6c0fd2fe6a4aa9626";
+          sha256 = "1nq320ph8fs9a197ji4mnw2xa24dld0r1nka476yvkg4azmcc9x8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-persist-drawer";
+          sha256 = "1jv2y2hcqakyvfibclzm7g4diw0bvsv3a8fa43yf19wb64jm8hdb";
+          name = "project-persist-drawer";
+        };
+        packageRequires = [ project-persist ];
+        meta = {
+          homepage = "http://melpa.org/#/project-persist-drawer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    project-root = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "project-root";
+        version = "0.7";
+        src = fetchhg {
+          url = "https://bitbucket.com/piranha/project-root";
+          rev = "fcd9df2eadca";
+          sha256 = "08dd2y6hdsj1rxcqa2hnjypnn9c2z43y7z2hz0fi4vny547qybz8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-root";
+          sha256 = "0xjir204zk254y2x70k9vqwirx2ljmrikpsgn5kn170d1bxvhwmb";
+          name = "project-root";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/project-root";
+          license = lib.licenses.free;
+        };
+      }) {};
+    projectile = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
+    melpaBuild {
+        pname = "projectile";
+        version = "0.13.0";
+        src = fetchFromGitHub {
+          owner = "bbatsov";
+          repo = "projectile";
+          rev = "1159110e83490f3b30d4d39e8c48022d3006900a";
+          sha256 = "1rl6n6v9f4m7m969frx8b51a4lzfix2bxx6rfcfbh6kzhc00qnxf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projectile";
+          sha256 = "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn";
+          name = "projectile";
+        };
+        packageRequires = [ dash pkg-info ];
+        meta = {
+          homepage = "http://melpa.org/#/projectile";
+          license = lib.licenses.free;
+        };
+      }) {};
+    projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
+    melpaBuild {
+        pname = "projectile-rails";
+        version = "0.6.7";
+        src = fetchFromGitHub {
+          owner = "asok";
+          repo = "projectile-rails";
+          rev = "dee51e39003489ece8077750d3cf93dee6b373fa";
+          sha256 = "03z9zsldzj0nwksw3bj4j58p7n14n6cqv917pwn1sb67l0wziqg2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projectile-rails";
+          sha256 = "0fgvignqdqh0ma91z9385782l89mvwfn77rp1gmy8cbkwi3b7fkq";
+          name = "projectile-rails";
+        };
+        packageRequires = [ emacs f inf-ruby inflections projectile rake ];
+        meta = {
+          homepage = "http://melpa.org/#/projectile-rails";
+          license = lib.licenses.free;
+        };
+      }) {};
+    projectile-sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, projectile, sift }:
+    melpaBuild {
+        pname = "projectile-sift";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "sift.el";
+          rev = "8c3f3d14a351a2394027d72ee0599aa73b9f0d13";
+          sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projectile-sift";
+          sha256 = "1wbgpwq9yy3v7hqidaczrvvsw5ajj7m3n4gsy3b169xv5h673a0i";
+          name = "projectile-sift";
+        };
+        packageRequires = [ projectile sift ];
+        meta = {
+          homepage = "http://melpa.org/#/projectile-sift";
+          license = lib.licenses.free;
+        };
+      }) {};
+    projekt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "projekt";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "tekai";
+          repo = "projekt";
+          rev = "107232c191375b59d065354470d0af83062e2a4c";
+          sha256 = "1rw55w2fpb3rw7j136kclkhppz21f7d7di4cvlv7zj5zpdl5zz88";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projekt";
+          sha256 = "1bhb24701flihl54w8xrj6yxhynpq4dk0fp5ciac7k28n4930lw8";
+          name = "projekt";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/projekt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    prompt-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "prompt-text";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "10sr";
+          repo = "prompt-text-el";
+          rev = "bb9265ebfada42d0e3c67c809665e1e5d980691e";
+          sha256 = "1hq8426i8rpb3qzkd5akv3i08pa4jsp9lwsskn38bfgp71pwild2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/prompt-text";
+          sha256 = "1b9sj9kzx5ydq2zsfmkwsx78pzg0vsvrn92397js6b2cm24vrwwc";
+          name = "prompt-text";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/prompt-text";
+          license = lib.licenses.free;
+        };
+      }) {};
+    prop-menu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "prop-menu";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "david-christiansen";
+          repo = "prop-menu-el";
+          rev = "50b102c1c0935fd3e0c465feed7f27d66b21cdf3";
+          sha256 = "18ap2liz5r5a8ja2zz9182fnfm47jnsbyblpq859zks356k37iwc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/prop-menu";
+          sha256 = "0dhy52fxxpa058mhhx0slw3sly3dlxm9vkax6fd1sap6f6v00p5i";
+          name = "prop-menu";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/prop-menu";
+          license = lib.licenses.free;
+        };
+      }) {};
+    protobuf-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "protobuf-mode";
+        version = "2.6.1";
+        src = fetchFromGitHub {
+          owner = "google";
+          repo = "protobuf";
+          rev = "bba83652e1be610bdb7ee1566ad18346d98b843c";
+          sha256 = "03df8zvx2sry3jz2x4pi3l32qyfqa7w8kj8jdbz30nzy0h7aa070";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/protobuf-mode";
+          sha256 = "1hh0w93fg6mfwsbb9wvp335ry8kflj50k8hybchpjcn6f4x39xsj";
+          name = "protobuf-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/protobuf-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    psci = callPackage ({ dash, deferred, f, fetchFromGitHub, fetchurl, lib, melpaBuild, purescript-mode, s }:
+    melpaBuild {
+        pname = "psci";
+        version = "0.0.6";
+        src = fetchFromGitHub {
+          owner = "ardumont";
+          repo = "emacs-psci";
+          rev = "8c2d5a0ba604ec593f83f632b2830a87f41f84d4";
+          sha256 = "0wgxrwl7dpy084sc76wiwpixycb171g7xwc66m5gnlrv79qyac73";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/psci";
+          sha256 = "0sgrz8byz2pcsad2pydinp4hh2xb48pdb03r93wg2vvyy8p15j9g";
+          name = "psci";
+        };
+        packageRequires = [ dash deferred f purescript-mode s ];
+        meta = {
+          homepage = "http://melpa.org/#/psci";
+          license = lib.licenses.free;
+        };
+      }) {};
+    psession = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "psession";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "thierryvolpiatto";
+          repo = "psession";
+          rev = "138b27f57bdc3ff53ec5896439e8ed00294a5ea2";
+          sha256 = "0msa8c29djhy5h3zpdvx25f4y1c50rgsk8iz6r127psrxdlfrvg8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/psession";
+          sha256 = "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a";
+          name = "psession";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/psession";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pt";
+        version = "0.0.3";
+        src = fetchFromGitHub {
+          owner = "bling";
+          repo = "pt.el";
+          rev = "a539dc11ecb2d69760ff50f76c96f49895ce1e1e";
+          sha256 = "1p0k770h96iw8bxm8ssi0a91m050s615q036870lrlsz35mzc5kw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pt";
+          sha256 = "0zmz1hcr4ajc2ydvpdxhy1dlhp7hvlkv6y6w1b79ffvq6acdd5mj";
+          name = "pt";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pt";
+          license = lib.licenses.free;
+        };
+      }) {};
+    puml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "puml-mode";
+        version = "0.6.4";
+        src = fetchFromGitHub {
+          owner = "skuro";
+          repo = "puml-mode";
+          rev = "9d3b5e326d1e68f87711c2ccb0920e2f5db5550b";
+          sha256 = "15c2p5ffvkp80v6fvxa3bgrk8mj18famngqkz2dammxnbppvnvvz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/puml-mode";
+          sha256 = "131ghjq6lsbhbx5hdg36swnkqijdb9bx6zg73hg0nw8qk0z742vn";
+          name = "puml-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/puml-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    punctuality-logger = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "punctuality-logger";
+        version = "0.8";
+        src = fetchFromGitLab {
+          owner = "elzair";
+          repo = "punctuality-logger";
+          rev = "708cae8e67dbae293c7c4be0ca5e49d76fac6714";
+          sha256 = "1v48i37iqrrwbyy3bscicfq66vbbml4sg0f0n950bnk0qagjx8py";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/punctuality-logger";
+          sha256 = "0q9s74hkfqvcx67xpq9rlvh38nyjnz230bll6ks7y5yzxvl4qhcm";
+          name = "punctuality-logger";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/punctuality-logger";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pungi = callPackage ({ fetchFromGitHub, fetchurl, jedi, lib, melpaBuild, pyvenv }:
+    melpaBuild {
+        pname = "pungi";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "mgrbyte";
+          repo = "pungi";
+          rev = "41c9f8b7795e083bfd63ba0d06c789c250998723";
+          sha256 = "012lv7hrwlhvins81vw3yjkhdwbpi6g1dx55i101qyrpzv5ifngm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pungi";
+          sha256 = "1v9fsd764z5wdcips63z53rcipdz7bha4q6s4pnn114jn3a93ls1";
+          name = "pungi";
+        };
+        packageRequires = [ jedi pyvenv ];
+        meta = {
+          homepage = "http://melpa.org/#/pungi";
+          license = lib.licenses.free;
+        };
+      }) {};
+    puppet-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
+    melpaBuild {
+        pname = "puppet-mode";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "lunaryorn";
+          repo = "puppet-mode";
+          rev = "d943149691abd7b66c85d58aee9657bfcf822c02";
+          sha256 = "0xr3s56p6fbm6wgw17galsl3kqvv8c7l1l1qvbhbay39yzs4ff14";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/puppet-mode";
+          sha256 = "1s2hap6fs6rg5q80dmzhaf4qqaf5sglhs8p896i3i5hq51w0ciyc";
+          name = "puppet-mode";
+        };
+        packageRequires = [ cl-lib emacs pkg-info ];
+        meta = {
+          homepage = "http://melpa.org/#/puppet-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    purescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "purescript-mode";
+        version = "13.10";
+        src = fetchFromGitHub {
+          owner = "dysinger";
+          repo = "purescript-mode";
+          rev = "6a4d4bdd178c65183a715c7729941a0b8fe5f253";
+          sha256 = "1wk319akv0scvyyjsd48pisi2i1gkahhsan9hfszrs6xx3anvfd9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/purescript-mode";
+          sha256 = "00gz752mh7144nsaka5q3q4681jp845kc5vcy2nbfnqp9b24l55m";
+          name = "purescript-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/purescript-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pushbullet = callPackage ({ fetchFromGitHub, fetchurl, grapnel, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pushbullet";
+        version = "0.5.2";
+        src = fetchFromGitHub {
+          owner = "theanalyst";
+          repo = "revolver";
+          rev = "73c59a0f1dc04875b3e5a2c8afbc26c32128e445";
+          sha256 = "03ivg3ddhy5zh410wgwxa17m98wywqhk62jgijhjd00b6l8i4aym";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pushbullet";
+          sha256 = "1swzl25rcw7anl7q099qh14yhnwlbn3m20ib9kis0l1rv59kkarl";
+          name = "pushbullet";
+        };
+        packageRequires = [ grapnel json ];
+        meta = {
+          homepage = "http://melpa.org/#/pushbullet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    py-autopep8 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "py-autopep8";
+        version = "0.7.0";
+        src = fetchFromGitHub {
+          owner = "paetzke";
+          repo = "py-autopep8.el";
+          rev = "685414b19106b99a4384fa0c9ce4817c659e0e81";
+          sha256 = "06xdq2slwhkcqlbv7x86zmv55drzif9cwjlj543cwhncphl2x9rd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-autopep8";
+          sha256 = "1argjdmh0x9c90zkb6cr4z3zkpgjp2mkpsw0dr4v6gg83jcggfpp";
+          name = "py-autopep8";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/py-autopep8";
+          license = lib.licenses.free;
+        };
+      }) {};
+    py-isort = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "py-isort";
+        version = "0.8";
+        src = fetchFromGitHub {
+          owner = "paetzke";
+          repo = "py-isort.el";
+          rev = "cfbb576784fe4501909c15299607ce2a2d0bf164";
+          sha256 = "0150q6xcnzzrkn9fa9njm973l1d49c48ad8qia71k4jwrxjjj6zr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-isort";
+          sha256 = "0k5gn3bjn5pv6dn6p0m9xghn0sx3m29bj3pfrmyh6gd5ic0l00yb";
+          name = "py-isort";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/py-isort";
+          license = lib.licenses.free;
+        };
+      }) {};
+    py-yapf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "py-yapf";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "paetzke";
+          repo = "py-yapf.el";
+          rev = "56807d28bf288afec2e2999982074bdd5e9bf932";
+          sha256 = "09z739w4fjg9xnv3mbh7v8j59mnbsfq4ygq616pj4xcw3nsh0rbg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-yapf";
+          sha256 = "1381x0ffpllxwgkr2d8xxbv1nd4k475m1aff8l5qijw7d1fqga2f";
+          name = "py-yapf";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/py-yapf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pycarddavel = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pycarddavel";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "pycarddavel";
+          rev = "6ead921066fa0156f20155b7126e5875ce11c328";
+          sha256 = "0qg1kjzsv2mcvlsivqy8ys3djbs5yala37r9h2zcxdicl88q0l11";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pycarddavel";
+          sha256 = "12k2mnzkd8yv17csfhclsnd479vcabawmac23yw6dsw7ic53jf1a";
+          name = "pycarddavel";
+        };
+        packageRequires = [ emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/pycarddavel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pyenv-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic }:
+    melpaBuild {
+        pname = "pyenv-mode";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "proofit404";
+          repo = "pyenv-mode";
+          rev = "b96c15fa1b83cad855e472eda06319ad35e34513";
+          sha256 = "1y3q1k195wp2kgp00a1y34i20zm80wdv2kxigh6gbn2r6qzkqrar";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pyenv-mode";
+          sha256 = "00yqrk92knv9gq1m9xcg78gavv70jsjlwzkllzxl63iva9qrch59";
+          name = "pyenv-mode";
+        };
+        packageRequires = [ pythonic ];
+        meta = {
+          homepage = "http://melpa.org/#/pyenv-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    python-environment = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "python-environment";
+        version = "0.0.2";
+        src = fetchFromGitHub {
+          owner = "tkf";
+          repo = "emacs-python-environment";
+          rev = "401006584e32864a10c69d29f14414828909362e";
+          sha256 = "0q6bib9nr6xiq6npzbngyfcjk87yyvwzq1zirr3z1h5wadm34lsk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-environment";
+          sha256 = "1pq16rddw76ic5d02j5bswl9qcydi47hqmhs7r06jk46vsfzxpl7";
+          name = "python-environment";
+        };
+        packageRequires = [ deferred ];
+        meta = {
+          homepage = "http://melpa.org/#/python-environment";
+          license = lib.licenses.free;
+        };
+      }) {};
+    python-x = callPackage ({ fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }:
+    melpaBuild {
+        pname = "python-x";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "wavexx";
+          repo = "python-x.el";
+          rev = "e606469aafec2e6beda8c589540b88a5a6f6f33f";
+          sha256 = "00i7cc4r7275l22k3708xi4hqw2j44yivdb1madzrpf314v3kabr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-x";
+          sha256 = "115mvhqfa0fa8kdk64biba7ri4xjk74qqi6vm1a5z3psam9mjcmn";
+          name = "python-x";
+        };
+        packageRequires = [ folding python ];
+        meta = {
+          homepage = "http://melpa.org/#/python-x";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pythonic = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "pythonic";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "proofit404";
+          repo = "pythonic";
+          rev = "959b3f5d5607eb41ef26ad61d7ec15ceecb8e37a";
+          sha256 = "1af9cd8l5ac58mj92xc7a3diy995cv29abnbb3fl6x4208l4xs3c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pythonic";
+          sha256 = "1hq0r3vg8vmgw89wfjdqknwm76pimlk0dy56wmh9vffh06gqsb51";
+          name = "pythonic";
+        };
+        packageRequires = [ cl-lib dash emacs f s ];
+        meta = {
+          homepage = "http://melpa.org/#/pythonic";
+          license = lib.licenses.free;
+        };
+      }) {};
+    pyvenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pyvenv";
+        version = "1.9";
+        src = fetchFromGitHub {
+          owner = "jorgenschaefer";
+          repo = "pyvenv";
+          rev = "5c48de2419ddf10c00e38f5940ed97a84c43f1ce";
+          sha256 = "0jidmc608amd0chs4598zkj0nvyll0al093121hkczsbpgbllq9z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pyvenv";
+          sha256 = "0gai9idss1wvryxyqk3pv854mc2xg9hd0r55r2blql8n5rd2yv8v";
+          name = "pyvenv";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pyvenv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    qiita = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "qiita";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "gongo";
+          repo = "qiita-el";
+          rev = "33b6d3450bb4b3d0186c2475f6c78269c71fd1ff";
+          sha256 = "110z27n3h7p2yalicfhnv832ikfcf7p0hrf5qkryz1sdmz79wb3f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/qiita";
+          sha256 = "1kzk7pc68ks9gxm2l2d28al23gxh56z0cmkl80qwg7sh4gsmhyxl";
+          name = "qiita";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/qiita";
+          license = lib.licenses.free;
+        };
+      }) {};
+    qml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "qml-mode";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "coldnew";
+          repo = "qml-mode";
+          rev = "efb465917f260b4b18c30bd45c58bc291c8246f0";
+          sha256 = "1mlka59gyylj4cabi1b552h11qx54kjqwx3bkmsdngjrd4da222a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/qml-mode";
+          sha256 = "123mlibviplzra558x87da4zx0kpbhsgfigjjgjgp3mdg897084n";
+          name = "qml-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/qml-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    quasi-monochrome-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "quasi-monochrome-theme";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "lbolla";
+          repo = "emacs-quasi-monochrome";
+          rev = "e329a8d55b22151e29df1f81552a4361f85aeafa";
+          sha256 = "0lfmdlb626b3gbmlvacwn84vpqam6gk9lp29wk0hcraw69vaw1v8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quasi-monochrome-theme";
+          sha256 = "0h5pqrklyga40jg8qc47lwmf8khn0vcs5jx2sdycl2ipy0ikmfs0";
+          name = "quasi-monochrome-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/quasi-monochrome-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    quickrun = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "quickrun";
+        version = "2.2.6";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-quickrun";
+          rev = "31c61de338c7b689bbb78e0aa691bd68f7c20941";
+          sha256 = "09sdv5lf5k347415r9fzljm374rb29gq6kldx2awd164fkdnm8ds";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quickrun";
+          sha256 = "1szgirakfnkn9ksls16p233sr7x9ck5m1f1kbk6ancj36yja2nki";
+          name = "quickrun";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/quickrun";
+          license = lib.licenses.free;
+        };
+      }) {};
+    r-autoyas = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "r-autoyas";
+        version = "0.28";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "r-autoyas.el";
+          rev = "563254f01ce530ca4c9be1f23395e3fd7d520ff9";
+          sha256 = "02bddznlqys37fnhdpp2g9xa9m7kfgrj1vl0hc5kr42hggk9wwmg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/r-autoyas";
+          sha256 = "18zifadsgbwnga205jvpx61wa2dvjxmxs5v7cjqhny45a524nbv4";
+          name = "r-autoyas";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/r-autoyas";
+          license = lib.licenses.free;
+        };
+      }) {};
+    racer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }:
+    melpaBuild {
+        pname = "racer";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "racer-rust";
+          repo = "emacs-racer";
+          rev = "9b7b4b1e8b04f630d29f771ad268025ff9380236";
+          sha256 = "0pbswxzgfqcp6vjlwhvnablj91kxq588j2fmcjzhf0aigkj7dxfb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/racer";
+          sha256 = "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi";
+          name = "racer";
+        };
+        packageRequires = [ dash emacs rust-mode s ];
+        meta = {
+          homepage = "http://melpa.org/#/racer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rainbow-blocks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rainbow-blocks";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "istib";
+          repo = "rainbow-blocks";
+          rev = "8335993563aadd4290c5fa09dd7a6a81691b0690";
+          sha256 = "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rainbow-blocks";
+          sha256 = "08p41wvrw1j3h7j7lyl8nxk1gcc2id9ikljmiklg0kc6s8ijhng8";
+          name = "rainbow-blocks";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rainbow-blocks";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rainbow-delimiters = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rainbow-delimiters";
+        version = "2.1.1";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "rainbow-delimiters";
+          rev = "0823d0c67f935a4c36a1c945e93051102963c7fb";
+          sha256 = "0gxc8j5a14bc9mp43cbcz41ipc0z1yvmypg52dnl8hadirry20gd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rainbow-delimiters";
+          sha256 = "132nslbnszvbgkl0819z811yar3lms1hp5na4ybi9gkmnb7bg4rg";
+          name = "rainbow-delimiters";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rainbow-delimiters";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rainbow-identifiers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rainbow-identifiers";
+        version = "0.2.2";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "rainbow-identifiers";
+          rev = "19fbfded1baa98d12335f26f6d7b20e5ae44ce2e";
+          sha256 = "05i0jpmxzsj2lsj48cafn3v93z37l7k5kaza2ik3yirdpjdibyrh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rainbow-identifiers";
+          sha256 = "0lw790ymrgpyh0sxwmzinl2ik5vl5vggbg14cd0cx5yagkw5y3mp";
+          name = "rainbow-identifiers";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/rainbow-identifiers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rake = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rake";
+        version = "0.4.0";
+        src = fetchFromGitHub {
+          owner = "asok";
+          repo = "rake";
+          rev = "a9e65cb23d3dc700f5b41ff365153ef6a259d4f0";
+          sha256 = "1q65jj6bghvzhlqmpg61a7vn8izc01wp2fjiqx013zxpg9awvzmq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rake";
+          sha256 = "0cw47g6cjnkh3z4hbwwq1f8f5vrvs84spn06k53bx898brqdh8ns";
+          name = "rake";
+        };
+        packageRequires = [ cl-lib dash f ];
+        meta = {
+          homepage = "http://melpa.org/#/rake";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ranger";
+        version = "0.9.7";
+        src = fetchFromGitHub {
+          owner = "ralesi";
+          repo = "ranger.el";
+          rev = "4b778da7aafe1dc4077a3c891ae918eae929fae6";
+          sha256 = "0fkj89p0rb0r472p1rk8xpx8c74pg968pc2mmw3838y4fpc8i198";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ranger";
+          sha256 = "14g4r4iaz0nzfsklslrswsik670pvfd0605xfjghvpngn2a8ych4";
+          name = "ranger";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ranger";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rase = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rase";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "m00natic";
+          repo = "rase";
+          rev = "59b5f7e8102570b65040e8d55781c7ea28de7338";
+          sha256 = "1i16361klpdsxphcjdpxqswab3ing69j1wb9nygws7ghil85h0bx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rase";
+          sha256 = "1g7v2z7l4csl5by64hc3zg4kgrkvv81iq30mfqq4nvy1jc0xa6j0";
+          name = "rase";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rase";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rbenv = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rbenv";
+        version = "0.0.3";
+        src = fetchFromGitHub {
+          owner = "senny";
+          repo = "rbenv.el";
+          rev = "a613ee1941efa48ef5321bad39ac1ed8ad1540b8";
+          sha256 = "09c6v4lnv6vm2cckbdpx2fdi9xkz9l68qvhx35vaawxhrkgvypzp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rbenv";
+          sha256 = "09nw7sz6rdgs7hdw517qwgzgyrdmxb16sgldfkifk41rhiyqhr65";
+          name = "rbenv";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rbenv";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rcirc-styles = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rcirc-styles";
+        version = "1.3.1";
+        src = fetchFromGitHub {
+          owner = "aaron-em";
+          repo = "rcirc-styles.el";
+          rev = "d0547eda261d0885951b283e5622345f999d2083";
+          sha256 = "0yhmdkvswnn5rga5xzysfpivbz9wdkzbm49licilc2fp1dgcvd6i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rcirc-styles";
+          sha256 = "01dxhnzsnljig769dk9axdi970b3lw2s6p1z3ljf29qlb5j4548r";
+          name = "rcirc-styles";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/rcirc-styles";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rdf-prefix = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rdf-prefix";
+        version = "1.3";
+        src = fetchFromGitHub {
+          owner = "simenheg";
+          repo = "rdf-prefix";
+          rev = "1ab1464172c7563a7dbf1224572e4ffbfc6608e6";
+          sha256 = "0r95fzi0x8r18x7r574mp503qaiqyicrq78zlggyz6qihi95pmqj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rdf-prefix";
+          sha256 = "1vxgn5f2kws17ndfdv1vj5p9ks3rp6sikzpc258j07bhsfpjz5qm";
+          name = "rdf-prefix";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rdf-prefix";
+          license = lib.licenses.free;
+        };
+      }) {};
+    real-auto-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "real-auto-save";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "chillaranand";
+          repo = "real-auto-save";
+          rev = "879144ca7e9bfa09a4fb57d5fe92a80250311f1e";
+          sha256 = "1ka5q2q18hgh7wl5yn04489121bq4nx369rz8nb7dr5l14cas0xm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/real-auto-save";
+          sha256 = "03dbbizpyg62v6zbq8hd16ikrifz8m2bdlbb3g67f2834xqmxha8";
+          name = "real-auto-save";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/real-auto-save";
+          license = lib.licenses.free;
+        };
+      }) {};
+    realgud = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, load-relative, loc-changes, melpaBuild, test-simple }:
+    melpaBuild {
+        pname = "realgud";
+        version = "1.2";
+        src = fetchFromGitHub {
+          owner = "rocky";
+          repo = "emacs-dbgr";
+          rev = "0dd37e233f315a5666eefc6a3e9fc088fcc6561f";
+          sha256 = "07j1grdbqv3iv5ghmgsjw678bxjajcxi27clz4krcz3ys5b1h70v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/realgud";
+          sha256 = "15vlln4w4wlgrk5i5nhgvjcbardpahgs9kwwayb1vmj10c8a837s";
+          name = "realgud";
+        };
+        packageRequires = [ list-utils load-relative loc-changes test-simple ];
+        meta = {
+          homepage = "http://melpa.org/#/realgud";
+          license = lib.licenses.free;
+        };
+      }) {};
+    recover-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "recover-buffers";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "tripleee";
+          repo = "recover-buffers";
+          rev = "a1db7f084977697081da3497628e3514e032b966";
+          sha256 = "114ssmby614xjs7mrpbbsdd4gj5ra6klfh8h6z8iij8xn3kii83q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/recover-buffers";
+          sha256 = "0g40d7440hzlc9b45v63ng0anvmgip4dhbd9wcm2sn8qjfr4w11b";
+          name = "recover-buffers";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/recover-buffers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rect-plus = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rect-plus";
+        version = "1.0.10";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-rectplus";
+          rev = "299b742faa0bc4448e0d5fe9cb98ab1eb93b8dcc";
+          sha256 = "1vpsihrl03hkd6n6b7mrjccm0a023qf3154a8rw4chihikxw27pj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rect+";
+          sha256 = "0vk0jwpl6yp2md9nh0ghp2qn883a8lr3cq8c9mgq0g552dwdiv5m";
+          name = "rect-plus";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rect+";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rectangle-utils = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rectangle-utils";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "thierryvolpiatto";
+          repo = "rectangle-utils";
+          rev = "9328291ad043fdf617cd2191692f13fba5f9a9bb";
+          sha256 = "048pjrd04w6w4v6r56yblbqgkjh01xib7k1i6rjc6288jh5vr1vm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rectangle-utils";
+          sha256 = "1w5z2gykydsfp30ahqjihpvq04c5v0cfslbrrg429hycys8apws7";
+          name = "rectangle-utils";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/rectangle-utils";
+          license = lib.licenses.free;
+        };
+      }) {};
+    redpen-paragraph = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "redpen-paragraph";
+        version = "0.22";
+        src = fetchFromGitHub {
+          owner = "karronoli";
+          repo = "redpen-paragraph.el";
+          rev = "e942c41c0308d8fbac1f145387d4f6ea1091e26b";
+          sha256 = "19c5rkb4nn6fs85lixrgrv8gagr69h430inig31dvm4fip9xdjp9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/redpen-paragraph";
+          sha256 = "0jr707ik6fhznq0q421l986w85ah0n9b4is91zrgbk1v6miqrhca";
+          name = "redpen-paragraph";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/redpen-paragraph";
+          license = lib.licenses.free;
+        };
+      }) {};
+    relative-line-numbers = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "relative-line-numbers";
+        version = "0.3.2";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "relative-line-numbers";
+          rev = "64157db08b0c2f5fada3209fc8d3e4b4c7429978";
+          sha256 = "1r8fhs7d2vkrbv15ic2bm79i9a8swbc38vk566vnxkhl3rfd5a0a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/relative-line-numbers";
+          sha256 = "0mj1w5a4ax8hwz41vn02bacxlnifd14hvf3p288ljvwchvlf0hn3";
+          name = "relative-line-numbers";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/relative-line-numbers";
+          license = lib.licenses.free;
+        };
+      }) {};
+    relax = callPackage ({ fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "relax";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "technomancy";
+          repo = "relax.el";
+          rev = "6e33892623ab87833082262321dc8e1977209626";
+          sha256 = "0lqbhwi1f8b4sv9p1rf0gyjllk0l7g6v6mlws496079wxx1n5j66";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/relax";
+          sha256 = "0gfr4ym6aakawhkfz40ar2n0rfz503hq428yj6rbf7jmq3ajaysk";
+          name = "relax";
+        };
+        packageRequires = [ json ];
+        meta = {
+          homepage = "http://melpa.org/#/relax";
+          license = lib.licenses.free;
+        };
+      }) {};
+    repeatable-motion = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "repeatable-motion";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "willghatch";
+          repo = "emacs-repeatable-motion";
+          rev = "e664b0a4a3e39c4085378a28b5136b349a0afb22";
+          sha256 = "007lqahjbig6yygqik6fgbq114784z6l40a3vrc4qs9361zqizck";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/repeatable-motion";
+          sha256 = "12z4z8apd8ksf6dfvqm54l71mx68j0yg4hrjypa9p77fpcd6p0zw";
+          name = "repeatable-motion";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/repeatable-motion";
+          license = lib.licenses.free;
+        };
+      }) {};
+    repl-toggle = callPackage ({ fetchFromGitHub, fetchurl, fullframe, lib, melpaBuild }:
+    melpaBuild {
+        pname = "repl-toggle";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "tomterl";
+          repo = "repl-toggle";
+          rev = "84541e0d734d6608bc8bff87c997aaefe5e1f092";
+          sha256 = "14ij4daddbkpay28g15zfafslh7fd5265j7az0gagvx4qymgficn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/repl-toggle";
+          sha256 = "1jyaksxgyygfv1wn9c6y8sykb4hicwgs9n5vrdikd2i0iix29zpb";
+          name = "repl-toggle";
+        };
+        packageRequires = [ fullframe ];
+        meta = {
+          homepage = "http://melpa.org/#/repl-toggle";
+          license = lib.licenses.free;
+        };
+      }) {};
+    replace-symbol = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "replace-symbol";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "bmastenbrook";
+          repo = "replace-symbol-el";
+          rev = "153197a4631a1ed0c3485d210efb41b4b727326c";
+          sha256 = "1pxvwiqhv2nmsxkdwn9jx7na1vgk9dg9yxidglxpmvpid6fy4qdk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/replace-symbol";
+          sha256 = "07ljmw6aw9hsqffhwmiq2pvhry27acg6f4vgxgi91vjr8jj3r4ng";
+          name = "replace-symbol";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/replace-symbol";
+          license = lib.licenses.free;
+        };
+      }) {};
+    repo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "repo";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "canatella";
+          repo = "repo-el";
+          rev = "98bde6fdc840d42a24c5784ee440cad39e8264d9";
+          sha256 = "0hs80g3npgb6qfcaivdfkpsc9mss1kdmyp5j7s922qcy2k4yxmgl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/repo";
+          sha256 = "0z4lcswh0c6xnsxlv33bsxh0nh26ydzfl8sv8xabdp5a2gk6bhpb";
+          name = "repo";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/repo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    req-package = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, use-package }:
+    melpaBuild {
+        pname = "req-package";
+        version = "0.9";
+        src = fetchFromGitHub {
+          owner = "edvorg";
+          repo = "req-package";
+          rev = "374c6d1a81b5448a66295be8c132c42ca44eeddb";
+          sha256 = "1xzp2hnkr9lsjx50cxlpki9mvyhjsv0vyc77480jrlnpspakj7qs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/req-package";
+          sha256 = "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf";
+          name = "req-package";
+        };
+        packageRequires = [ dash log4e use-package ];
+        meta = {
+          homepage = "http://melpa.org/#/req-package";
+          license = lib.licenses.free;
+        };
+      }) {};
+    request = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "request";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "emacs-request";
+          rev = "b548f8bd9c4372232cb3d3633b9fcfffb2f535ff";
+          sha256 = "0j7nakxj750rhdnm0nk075s7rx38rc9npbb55kg7r9vb2qilnvmr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/request";
+          sha256 = "09gxfy34a13wr0agmhn0nldxaiyc72rx9xi56jirsvji4dg5j6mm";
+          name = "request";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/request";
+          license = lib.licenses.free;
+        };
+      }) {};
+    request-deferred = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "request-deferred";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "emacs-request";
+          rev = "b548f8bd9c4372232cb3d3633b9fcfffb2f535ff";
+          sha256 = "0j7nakxj750rhdnm0nk075s7rx38rc9npbb55kg7r9vb2qilnvmr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/request-deferred";
+          sha256 = "19s8q9a01v0g897s9ass1mr5wbzy82rrfcnqpvcvp05q4y787dn9";
+          name = "request-deferred";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/request-deferred";
+          license = lib.licenses.free;
+        };
+      }) {};
+    requirejs = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, popup, s }:
+    melpaBuild {
+        pname = "requirejs";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "joeheyming";
+          repo = "requirejs-emacs";
+          rev = "7d73453653b6b97cca59fcde8d529b5a228fbc01";
+          sha256 = "1b832r7779rmr6rhzj7klc0l5xzwc4rids87g2hczpb5dhqnchca";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/requirejs";
+          sha256 = "09z6r9wcag3gj075wq215zcslyknl1izap595rn48xvizxi06c6k";
+          name = "requirejs";
+        };
+        packageRequires = [ cl-lib js2-mode popup s ];
+        meta = {
+          homepage = "http://melpa.org/#/requirejs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    resize-window = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "resize-window";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "dpsutton";
+          repo = "resize-window";
+          rev = "d4aa9e6e950f5e0455b20f4443fda20742ec0403";
+          sha256 = "1ywcnrrr4wp6c951mqfscvdgcmwyvxy80p40vi27nzbl977lb1xv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/resize-window";
+          sha256 = "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l";
+          name = "resize-window";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/resize-window";
+          license = lib.licenses.free;
+        };
+      }) {};
+    restart-emacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "restart-emacs";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "iqbalansari";
+          repo = "restart-emacs";
+          rev = "e9292fe88d8be7d0ecf9f4f30ed98ffbc6bd689b";
+          sha256 = "0y4ga1lj2x2f0r535ivs09m2l0q76iz72w42wknhsw9lmdsyl5nz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/restart-emacs";
+          sha256 = "03aabz7fmy99nwimvjn7qz6pvc94i470hfgiwmjz3348cw02k0n6";
+          name = "restart-emacs";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/restart-emacs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    reveal-in-osx-finder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "reveal-in-osx-finder";
+        version = "0.3.3";
+        src = fetchFromGitHub {
+          owner = "kaz-yos";
+          repo = "reveal-in-osx-finder";
+          rev = "5710e5936e47139a610ec9a06899f72e77ddc7bc";
+          sha256 = "1q13cgpz4wzhnqv84ablawy3y2wgdwy46sp7454mmfx9m77jzb2v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/reveal-in-osx-finder";
+          sha256 = "00jgrmh5s3vlpj1jjf8l3c3h4hjk5x781m95sidw6chimizvfmfc";
+          name = "reveal-in-osx-finder";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/reveal-in-osx-finder";
+          license = lib.licenses.free;
+        };
+      }) {};
+    reverse-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "reverse-theme";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-reverse-theme";
+          rev = "3105c950bcb51c662c79b59ca102ef662c2b0be0";
+          sha256 = "15xnz4fi22wsximimwmirlz11v4ksfj8nilyjfw6acd92yrhzg6h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/reverse-theme";
+          sha256 = "1lq8nwhf8n5i280v0kqksndm4b3n6x34wnd5fa5i48ljwr5cinih";
+          name = "reverse-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/reverse-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rich-minority = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rich-minority";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "rich-minority";
+          rev = "311ac8ee54078f95b7279e532da6cf5a2afb4125";
+          sha256 = "11hwf9y5ax207w6rwrsmi3pmn7pn7ap6iys0z8hni2f5zzxjrmx3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rich-minority";
+          sha256 = "11xd76w5k3b3q5bxqjb55vi6dsal9drvyc1nh7z83awm59hvgczc";
+          name = "rich-minority";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/rich-minority";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rigid-tabs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rigid-tabs";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "wavexx";
+          repo = "rigid-tabs.el";
+          rev = "c7c6b726806df7e8cb25a41b213a207850c91cb7";
+          sha256 = "0p044wg9d4i6f5x7bdshmisgwvw424y16lixac93q6v5bh3xmab5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rigid-tabs";
+          sha256 = "06n0bcvc3nnp84pcq3lywwga7l92jz8hnkilhbq59kydf5zbjldp";
+          name = "rigid-tabs";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/rigid-tabs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rinari = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, jump, lib, melpaBuild, ruby-compilation, ruby-mode ? null }:
+    melpaBuild {
+        pname = "rinari";
+        version = "2.11";
+        src = fetchFromGitHub {
+          owner = "eschulte";
+          repo = "rinari";
+          rev = "e2ed2fa55ac3435a86b1cf6a4f2d29aebc309135";
+          sha256 = "1wqhqv2fc5h10igv1php51bayx0s7qw4m9gzx9by80dab8lwa0vk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rinari";
+          sha256 = "0qknicg3vzl7zbkwsdvp10hrvlng6mbi8hgslx4ir522dflrf9p0";
+          name = "rinari";
+        };
+        packageRequires = [ inf-ruby jump ruby-compilation ruby-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/rinari";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rnc-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rnc-mode";
+        version = "1.0.6";
+        src = fetchFromGitHub {
+          owner = "TreeRex";
+          repo = "rnc-mode";
+          rev = "b39dc23218213336b55f28e12a1d0e49ef7c1e21";
+          sha256 = "1drvyf5asjp3lgpss7llff35q8r89vmh73n1axaj2qp9jx5a5jih";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rnc-mode";
+          sha256 = "09ly7ln6qrcmmim9bl7kd50h4axrhy6ig406r352xm4a9zc8n22q";
+          name = "rnc-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rnc-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
+    melpaBuild {
+        pname = "robe";
+        version = "0.7.8";
+        src = fetchFromGitHub {
+          owner = "dgutov";
+          repo = "robe";
+          rev = "c5a0ae6f68c699ec3cdbb73a3e01e76f62d75f48";
+          sha256 = "1fckb18x9ikm6dlwwdfg9q4wyjjwdqy3r1w2ic01xb0dbyls41gw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/robe";
+          sha256 = "19py2lwi7maya90kh1mgwqb16j72f7gm05dwla6xrzq1aks18wrk";
+          name = "robe";
+        };
+        packageRequires = [ inf-ruby ];
+        meta = {
+          homepage = "http://melpa.org/#/robe";
+          license = lib.licenses.free;
+        };
+      }) {};
+    roguel-ike = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "roguel-ike";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "stevenremot";
+          repo = "roguel-ike";
+          rev = "6d9322ad9d43d0c7465f125c8e08b222866e6923";
+          sha256 = "108j3106n9anas07mj26xlrvscsl5irshd39czkippla84gwmgyc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/roguel-ike";
+          sha256 = "1a7sa6nhgi0s4gjh55bhk5cg6q6s7564fk008ibmrm05gfq9wlg8";
+          name = "roguel-ike";
+        };
+        packageRequires = [ popup ];
+        meta = {
+          homepage = "http://melpa.org/#/roguel-ike";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rope-read-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rope-read-mode";
+        version = "0.3.1";
+        src = fetchFromGitHub {
+          owner = "marcowahl";
+          repo = "rope-read-mode";
+          rev = "cb550afeedd369c80d1ccb54bb48494d170a5569";
+          sha256 = "133ficdghshlmwq5dn42cg3h51jdg4lcwqr4cd2s2s52rz8plw9h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rope-read-mode";
+          sha256 = "0grnn5k6rbck0hz4c6cadgj3a4dv62habyingznisg2kx9i3m0dw";
+          name = "rope-read-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rope-read-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rsense = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rsense";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "m2ym";
+          repo = "rsense";
+          rev = "e4297052ef32d06237e8bd1534a0caf70a34ad28";
+          sha256 = "0mfkq8n28lal4lqwp6v0ilz8wrwgg61sbm0jggznwisjqqy3lzrh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rsense";
+          sha256 = "1901xqlpc8fg4sl9j58jn40i2djs8s0cdcqcrzrq02lvk8ssfdf5";
+          name = "rsense";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rsense";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
+    melpaBuild {
+        pname = "rspec-mode";
+        version = "1.11";
+        src = fetchFromGitHub {
+          owner = "pezra";
+          repo = "rspec-mode";
+          rev = "e289e52ec4b3aa1caf35957d721e5568eca2a3bb";
+          sha256 = "0hrn5n7aaymwimk511kjij44vqaxbmhly1gwmlmsrnbvvma7f2mp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rspec-mode";
+          sha256 = "0nyib9rx9w9cbsgkcjx9n8fp77xkzxg923z0rdm3f9kc7njcn0zx";
+          name = "rspec-mode";
+        };
+        packageRequires = [ cl-lib ruby-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/rspec-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rtags";
+        version = "2.0";
+        src = fetchFromGitHub {
+          owner = "Andersbakken";
+          repo = "rtags";
+          rev = "ba85598841648490e64246be802fc2dcdd45bc3c";
+          sha256 = "0ndyvpgbvfcnxf74ffaby36rqsnwj10j1s9vr3gan9mqi6spcggf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rtags";
+          sha256 = "16jvbr4nm48p3dj9wmysjaxyz4ajcay19risqrs9fzrifkr21c9p";
+          name = "rtags";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rtags";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rubocop = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rubocop";
+        version = "0.4.0";
+        src = fetchFromGitHub {
+          owner = "bbatsov";
+          repo = "rubocop-emacs";
+          rev = "405e0fd4c57adb125e3d04208bc86081e3e78d4c";
+          sha256 = "10djjp1520xc05qkciaiaiiciscaln6c74h7ymba40mvzlf67y9q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rubocop";
+          sha256 = "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q";
+          name = "rubocop";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/rubocop";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ruby-compilation = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ruby-compilation";
+        version = "2.11";
+        src = fetchFromGitHub {
+          owner = "eschulte";
+          repo = "rinari";
+          rev = "e2ed2fa55ac3435a86b1cf6a4f2d29aebc309135";
+          sha256 = "1wqhqv2fc5h10igv1php51bayx0s7qw4m9gzx9by80dab8lwa0vk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-compilation";
+          sha256 = "1x1vpkjpx95sfcjhkx4cafypj0nkbd1i0mzxx3lmcrsmg8iv0rjc";
+          name = "ruby-compilation";
+        };
+        packageRequires = [ inf-ruby ];
+        meta = {
+          homepage = "http://melpa.org/#/ruby-compilation";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ruby-end = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ruby-end";
+        version = "0.4.1";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "ruby-end";
+          rev = "648b81af136a581bcef387744d93c011d9cdf54b";
+          sha256 = "1cpz9vkp57nk682c5xm20g7bfj5g2aq5ahpk4nhgx7pvd3xvr1ds";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-end";
+          sha256 = "0cx121hji8ws6s3p2xfdgidm363y05g2n880fqrmzyz27cqkljis";
+          name = "ruby-end";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ruby-end";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ruby-hash-syntax = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ruby-hash-syntax";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "ruby-hash-syntax";
+          rev = "a0362c2dc449a1e67ef75ad736bcf8b03b083226";
+          sha256 = "01n9j7sag49m4bdl6065jklnxnc5kck51izg884s1is459qgy86k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-hash-syntax";
+          sha256 = "0bvwyagfh7mn457iibrpv1ay75089gp8pg608gbm24m0ix82xvb5";
+          name = "ruby-hash-syntax";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ruby-hash-syntax";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ruby-test-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ruby-test-mode";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "r0man";
+          repo = "ruby-test-mode";
+          rev = "7d3c04b60721665af93ffb4abc2a7b3191926431";
+          sha256 = "008zj9rg2cmh0xd7g6kgx6snm5sspxs4jmfa8hd43wx5y9pmlb8f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-test-mode";
+          sha256 = "113ysf08bfh2ipk55f8h741j05999yrgx57mzh53rim5n63a312w";
+          name = "ruby-test-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ruby-test-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ruby-tools = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ruby-tools";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "ruby-tools";
+          rev = "6e7fb376085bfa7010ecd3dfad63adacc6e2b4ac";
+          sha256 = "1zvhq9l717rjgkm7bxz5gqkmh5i49cshwzlimb3h78kpjw3hxl2k";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-tools";
+          sha256 = "1zs2vzcrw11xyj2a7lgqzw4slcha20206jvjbxkm68d57rffpk8y";
+          name = "ruby-tools";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ruby-tools";
+          license = lib.licenses.free;
+        };
+      }) {};
+    rvm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "rvm";
+        version = "1.4.0";
+        src = fetchFromGitHub {
+          owner = "senny";
+          repo = "rvm.el";
+          rev = "8e45a9bad8e317ff195f384dab14d3402497dc79";
+          sha256 = "0iblk0vagjcg3c8q9hlpwk7426ms7aq0s80izgvascfmyqycv6qm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rvm";
+          sha256 = "08i7cmav2cz73jp88ww0ay2yjhk9dj8146836q4sij1bl1slbaf8";
+          name = "rvm";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/rvm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    s = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "s";
+        version = "1.11.0";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "s.el";
+          rev = "a56f0d0fedf9754e1728067ac868100f2499357d";
+          sha256 = "08vf62fcrnbmf2ppb759kzznjdz8x72fqdwbc4n8nbswrwgm2ikl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/s";
+          sha256 = "0b2lj6nj08pk5fnxvjkc1d9hvi29rnjjy4n5ns4pq6wxpfnlcw64";
+          name = "s";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/s";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sackspace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sackspace";
+        version = "0.8.2";
+        src = fetchFromGitHub {
+          owner = "cofi";
+          repo = "sackspace.el";
+          rev = "fd0480eaaf6d3d11fd30ac5feb2da2f4f7572708";
+          sha256 = "06gqqbkn85l2p05whmr4wkg9axqyzb7r7sgm3r8wfshm99kgpxvl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sackspace";
+          sha256 = "1m10iw83k6m7v7sg2dxzdy83zxq6svk8h9fh4ankyn3baqrdxg5z";
+          name = "sackspace";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sackspace";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sage-shell-mode = callPackage ({ cl-lib ? null, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sage-shell-mode";
+        version = "0.0.8.9";
+        src = fetchFromGitHub {
+          owner = "stakemori";
+          repo = "sage-shell-mode";
+          rev = "8e659438ff419f7f1fddd1b56fb706dbecf9e469";
+          sha256 = "0aw95qkql6apyn79la0jbpr0nlixhl9zvi9miry2h5y5pawb3yvf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sage-shell-mode";
+          sha256 = "18k7yh8rczng0kn2wsawjml70cb5bnc5jr2gj0hini5f7jq449wx";
+          name = "sage-shell-mode";
+        };
+        packageRequires = [ cl-lib deferred ];
+        meta = {
+          homepage = "http://melpa.org/#/sage-shell-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sass-mode = callPackage ({ fetchFromGitHub, fetchurl, haml-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sass-mode";
+        version = "3.0.18";
+        src = fetchFromGitHub {
+          owner = "nex3";
+          repo = "sass-mode";
+          rev = "26a66e331b507fb420e3bb7d0a6a8fbb04294343";
+          sha256 = "0lxrq3mzabkwj5bv0mgd7fnx3dsx8vxd5kjgb79rjfra0m7pfgln";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sass-mode";
+          sha256 = "1byjk5zpzjlyiwkp780c4kh7s9l56y686sxji89wc59d19rp8800";
+          name = "sass-mode";
+        };
+        packageRequires = [ haml-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/sass-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sauron = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sauron";
+        version = "0.10";
+        src = fetchFromGitHub {
+          owner = "djcb";
+          repo = "sauron";
+          rev = "a9877f0efa9418c41d25002b58d1c2f8c69ec975";
+          sha256 = "1mcag7qad1npjn096byakb8pmmi2g64nlf2vcc12irzmwia85fml";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sauron";
+          sha256 = "01fk1xfh7r16fb1xg5ibbs7gci9dja49msdlf7964hiq7pnnhxgb";
+          name = "sauron";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sauron";
+          license = lib.licenses.free;
+        };
+      }) {};
+    save-sexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "save-sexp";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "save-sexp";
+          rev = "dce78d8630af6b2e29e3ec83b819a3d688d37dfc";
+          sha256 = "1gh97rc528cpam3jsncc03cyf4pps71b8blmdikml71lks07lgwb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/save-sexp";
+          sha256 = "12jx47picdpw668q75qsp9gncrnxnlk1slhzvxsk5pvkdwh26h66";
+          name = "save-sexp";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/save-sexp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sbt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, scala-mode2 }:
+    melpaBuild {
+        pname = "sbt-mode";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "ensime";
+          repo = "emacs-sbt-mode";
+          rev = "be70372bb0890a4f8bec1b6ef10b30ed2e3f5236";
+          sha256 = "0y846zmcz5x2jn5bndm0mfi18jc5cd1fkidgc4wvqmm0w30gyx4q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sbt-mode";
+          sha256 = "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8";
+          name = "sbt-mode";
+        };
+        packageRequires = [ scala-mode2 ];
+        meta = {
+          homepage = "http://melpa.org/#/sbt-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scala-mode2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "scala-mode2";
+        version = "0.22";
+        src = fetchFromGitHub {
+          owner = "ensime";
+          repo = "emacs-scala-mode";
+          rev = "34888c094990bc669347f106dbd516f487e55ae3";
+          sha256 = "1gfhk595vnf6565nv6m1v8dc4a3a9z34jj1qdh02lk8azg5ylk89";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scala-mode2";
+          sha256 = "0rnkln6jwwqc968w3qpc6zjjv8ylw0w6c2hsjpq2slja3jn5khch";
+          name = "scala-mode2";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/scala-mode2";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scala-outline-popup = callPackage ({ dash, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, popup, scala-mode2 }:
+    melpaBuild {
+        pname = "scala-outline-popup";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "ancane";
+          repo = "scala-outline-popup";
+          rev = "c79a06fb99cbf6f29d94da77a8a22cfafb15a1b6";
+          sha256 = "0hhsgyil8aqdkkip5325yrdq89gnijglcbf1dsvl4wvnmq7a1rik";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scala-outline-popup";
+          sha256 = "1fq0k6l57wkya1ycm4cc190kg90j2k9clnl0sc70achp4i47qbk7";
+          name = "scala-outline-popup";
+        };
+        packageRequires = [ dash flx-ido popup scala-mode2 ];
+        meta = {
+          homepage = "http://melpa.org/#/scala-outline-popup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scpaste = callPackage ({ fetchFromGitHub, fetchurl, htmlize, lib, melpaBuild }:
+    melpaBuild {
+        pname = "scpaste";
+        version = "0.6.5";
+        src = fetchFromGitHub {
+          owner = "technomancy";
+          repo = "scpaste";
+          rev = "cca8f4ee5402bbf9a4bbb24e81372067cb21bba4";
+          sha256 = "13s8hp16wxd9fb8gf05dn0xr692kkgiqg7v49fgr00gas4xgpfpm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scpaste";
+          sha256 = "02dqmx6v3jxdn5yz1z74624sc6sz2bm4qjyi78w9akhp2jplwlk1";
+          name = "scpaste";
+        };
+        packageRequires = [ htmlize ];
+        meta = {
+          homepage = "http://melpa.org/#/scpaste";
+          license = lib.licenses.free;
+        };
+      }) {};
+    scss-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "scss-mode";
+        version = "0.5.0";
+        src = fetchFromGitHub {
+          owner = "antonj";
+          repo = "scss-mode";
+          rev = "d663069667d9b158d56e863b80dd4cc02984e49f";
+          sha256 = "0zpjf9cp8g4rgnwgmhlpwnanf9lzqm3rm1mkihf0gk5qzxvwsdh9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scss-mode";
+          sha256 = "1g27xnp6bjaicxjlb9m0njc6fg962j3hlvvzmxvmyk7gsdgcgpkv";
+          name = "scss-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/scss-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    search-web = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "search-web";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "tomoya";
+          repo = "search-web.el";
+          rev = "c4ae86ac1acfc572b81f3d78764bd9a54034c331";
+          sha256 = "08yc67a4ji7z8s0zh500wiscziqsxi92i1d33fjla2mcr8sxxn0i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/search-web";
+          sha256 = "0qqx9l8dn1as4gqpq80jfacn6lz0132m91pjzxv0fx6al2iz0m36";
+          name = "search-web";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/search-web";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sekka = callPackage ({ cl-lib ? null, concurrent, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "sekka";
+        version = "1.6.4";
+        src = fetchFromGitHub {
+          owner = "kiyoka";
+          repo = "sekka";
+          rev = "2b0facc87e743e21534672aadac6db3164e38daf";
+          sha256 = "0nsm7z056rh32sq7abgdwyaz4dbz8v9pgbha5jvpk7y0zmnabrgs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sekka";
+          sha256 = "1jj4ly9p7m3xvb31nfn171lbpm9y70y8cbf8p24w0fhv665dx0cp";
+          name = "sekka";
+        };
+        packageRequires = [ cl-lib concurrent popup ];
+        meta = {
+          homepage = "http://melpa.org/#/sekka";
+          license = lib.licenses.free;
+        };
+      }) {};
+    selectric-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "selectric-mode";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "rbanffy";
+          repo = "selectric-mode";
+          rev = "0dd7ef28a9d9d6fbb95fdeeab6b576ad8762ad16";
+          sha256 = "18xdkisxvdizsk51pnyimp9mwc6k9cpcxqr5hgndkz9q97p5dp79";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/selectric-mode";
+          sha256 = "1k4l0lr68rqyi37wvqp1cnfci6jfkz0gvrd1hwbgx04cjgmz56n4";
+          name = "selectric-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/selectric-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    servant = callPackage ({ ansi, commander, dash, epl, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s, shut-up, web-server }:
+    melpaBuild {
+        pname = "servant";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "servant.el";
+          rev = "4d2aa8250b54b28e6e7ee4cd5ebd98a33db2c134";
+          sha256 = "15lx6qvmq3vp84ys8dzbx1nzxcnzlq41whawc2yhrnd1dbq4mv2d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/servant";
+          sha256 = "048xg0gcwnf4l2p56iw4iawi3ywjz7f6icnjfi8qzk1z912iyl9h";
+          name = "servant";
+        };
+        packageRequires = [ ansi commander dash epl f s shut-up web-server ];
+        meta = {
+          homepage = "http://melpa.org/#/servant";
+          license = lib.licenses.free;
+        };
+      }) {};
+    serverspec = callPackage ({ dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "serverspec";
+        version = "0.0.7";
+        src = fetchFromGitHub {
+          owner = "k1LoW";
+          repo = "emacs-serverspec";
+          rev = "b6dfe82af9869438de5e5d860ced196641f372c0";
+          sha256 = "1h58q41wixjlapia1ggf83jxcllq7492k55mc0fq7hbx3hw1q1y2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/serverspec";
+          sha256 = "001d57yd0wmz4d7qmhnanac8g29wls0sqw194003hrgirakg82id";
+          name = "serverspec";
+        };
+        packageRequires = [ dash f helm s ];
+        meta = {
+          homepage = "http://melpa.org/#/serverspec";
+          license = lib.licenses.free;
+        };
+      }) {};
+    session = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "session";
+        version = "2.3.1";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "session";
+          rev = "19ea0806873daac3539a4b956e15655e99e3dd6c";
+          sha256 = "0sp952abz7dkq8b8kkzzmnwnkq5w15zsx5dr3h8lzxb92lnank9v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/session";
+          sha256 = "0fghxbnf1d5iyrx1q8xd0lbw9nvkdgg2v2f89j6apnawisrsbhwx";
+          name = "session";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/session";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sexp-move = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sexp-move";
+        version = "0.2.6";
+        src = fetchFromGitLab {
+          owner = "elzair";
+          repo = "sexp-move";
+          rev = "117f7a91ab7c25e438413753e916570122011ce7";
+          sha256 = "11h5z2gmwq07c4gqzj2c9apksvqk3k8kpbb9kg78bbif2xfajr3m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sexp-move";
+          sha256 = "0lcxmr2xqh8z7xinxbv1wyrh786zlahhhj5nnbv83i8m23i3ymmd";
+          name = "sexp-move";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sexp-move";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shackle = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shackle";
+        version = "0.9.0";
+        src = fetchFromGitHub {
+          owner = "wasamasa";
+          repo = "shackle";
+          rev = "4069e0cbff0d172de2cd7d588de971d8b02915c6";
+          sha256 = "0yy162sz7vwj0i9w687a5x1c2fq31vc3i6gqhbywspviczdp4q1y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shackle";
+          sha256 = "159z0cwg7afrmym0xk902d8z093sqv39jig25ds7z4a224yrv5w6";
+          name = "shackle";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/shackle";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shampoo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shampoo";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "dmatveev";
+          repo = "shampoo-emacs";
+          rev = "9bf488ad4025beef6eef63d2d5b72bc1c9b9e142";
+          sha256 = "11g9lsgakq8nf689k49p9l536ffi62g3bh11mh9ix1l058xamqw2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shampoo";
+          sha256 = "01ssgw4cnnx8d86g3r1d5hqcib4qyhmpqvcvx47xs7zh0jscps61";
+          name = "shampoo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/shampoo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shell-pop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shell-pop";
+        version = "0.63";
+        src = fetchFromGitHub {
+          owner = "kyagi";
+          repo = "shell-pop-el";
+          rev = "4531d234ca471ed80458252cba0ed005a0720b27";
+          sha256 = "0fzywfdaisvvdbcl813n1shz0r8v1k9kcgxgynv5l0i4nkrgkww5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-pop";
+          sha256 = "02s17ln0hbi9gy3di8fksp3mqc7d8ahhf5vwyz4vrc1bg77glxw8";
+          name = "shell-pop";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/shell-pop";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shell-split-string = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shell-split-string";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "10sr";
+          repo = "shell-split-string-el";
+          rev = "6d01c9249853fe1f8fd925ee80f97232d4e3e5eb";
+          sha256 = "0mcxp74sk9bn36gbhhimgns07iqa4dgbq2pvpqy41igqwb84w306";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-split-string";
+          sha256 = "1yj1h7za4ylxh2nikj7s1qqlilpsk05x9571a2fymfyznm3iq77m";
+          name = "shell-split-string";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/shell-split-string";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shell-switcher = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shell-switcher";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "shell-switcher";
+          rev = "2c5575ae859a82041a4bacd1793b844bfc24c34f";
+          sha256 = "0ia7sdip4hl27avckv3qpqgm3k4ynvp3xxq1cy53bqfzzx0gcria";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-switcher";
+          sha256 = "07g9naiv2jk9jxwjywrbb05dy0pbfdx6g8pkra38rn3vqrjzvhyx";
+          name = "shell-switcher";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/shell-switcher";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shell-toggle = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shell-toggle";
+        version = "1.3.1";
+        src = fetchFromGitHub {
+          owner = "knu";
+          repo = "shell-toggle.el";
+          rev = "9820b0ad6f22c700759555aae8a454a7dc5a46b3";
+          sha256 = "0wvaa5nrbblayjvzjyj6cd942ywg7xz5d8fqaffxcvwlcdihvm7q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-toggle";
+          sha256 = "1ai0ks7smr8b221j9hmsikswpxqraa9b13fpwv4wwagavnlah446";
+          name = "shell-toggle";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/shell-toggle";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shelldoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "shelldoc";
+        version = "0.0.5";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-shelldoc";
+          rev = "1d40c73969347586906ca1dde2adb50afcd73b1b";
+          sha256 = "1nli26llyfkj1cz2dwn18c5pz1pnpz3866hapfibvdmwrg4z6cax";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shelldoc";
+          sha256 = "1xlp03aaidp7dp8349v8drzhl4lcngvxgdrwwn9cahfqlrvvbbbx";
+          name = "shelldoc";
+        };
+        packageRequires = [ cl-lib s ];
+        meta = {
+          homepage = "http://melpa.org/#/shelldoc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shelltest-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shelltest-mode";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "rtrn";
+          repo = "shelltest-mode";
+          rev = "fead97c7ff1b39715ec033a793de41176f1788f5";
+          sha256 = "0mn7bwvj1yv75a2531jp929j6ypckdfqdg6b5ig0kkbcrrwb7kxs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shelltest-mode";
+          sha256 = "1inb0vq34fbwkr0jg4dv2lljag8djggi8kyssrzhfawri50m81nh";
+          name = "shelltest-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/shelltest-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shm";
+        version = "1.0.20";
+        src = fetchFromGitHub {
+          owner = "chrisdone";
+          repo = "structured-haskell-mode";
+          rev = "8abc5cd73e59ea85bef906e14e87dc388c4f350f";
+          sha256 = "1vf766ja8f4xp1f5pmwgz6a85km0nxvc5dn571lwidfrrdbr9rkk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shm";
+          sha256 = "1qmp8cc83dcz25xbyqd4987i0d8ywvh16wq2wfs4km3ia8a2vi3c";
+          name = "shm";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/shm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shpec-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shpec-mode";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "shpec";
+          repo = "shpec-mode";
+          rev = "76bccd63e3b70233a6c9ca0798dd03550952cc76";
+          sha256 = "09454mcjd8n1090pjc5mk1dc6bn3bgh60ddpnv9hkajkzpcjxx4h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shpec-mode";
+          sha256 = "155hc1nym3fsvflps8d3ixaqw1cafqp97zcaywdppp47n7vj8zjl";
+          name = "shpec-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/shpec-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shrink-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shrink-whitespace";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "jcpetkovich";
+          repo = "shrink-whitespace.el";
+          rev = "24518d58e8e692fa98a73d5e7cd44c1536ab4e42";
+          sha256 = "050gmxdk88zlfjwi07jsj2mvsfcv5imhzcpa6ip3cqkzpmw3pl32";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shrink-whitespace";
+          sha256 = "12if0000i3rrxcm732layrv2h464wbb4xflbbfc844c83dbx1jmq";
+          name = "shrink-whitespace";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/shrink-whitespace";
+          license = lib.licenses.free;
+        };
+      }) {};
+    shut-up = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "shut-up";
+        version = "0.3.2";
+        src = fetchFromGitHub {
+          owner = "cask";
+          repo = "shut-up";
+          rev = "dccd8f7d6af2dde96718f557b37bc25adc61dd12";
+          sha256 = "103yvfgkj78i4bnv1fwk76izsa8h4wyj3vwj1vq7xggj607hkxzq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shut-up";
+          sha256 = "1bcqrnnafnimfcg1s7vrgq4cb4rxi5sgpd92jj7xywvkalr3kh26";
+          name = "shut-up";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/shut-up";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sift";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "sift.el";
+          rev = "8c3f3d14a351a2394027d72ee0599aa73b9f0d13";
+          sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sift";
+          sha256 = "0mv5zk140kjilwvzccj75ym7wlkkqryb532mbsy7i9bs3q7m916d";
+          name = "sift";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sift";
+          license = lib.licenses.free;
+        };
+      }) {};
+    simple-httpd = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "simple-httpd";
+        version = "1.4.6";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "emacs-http-server";
+          rev = "b191b07c942e44c946a22a826c4d9c9a0475fd7e";
+          sha256 = "1qmkc0w28l53zzf5yd2grrk1sq222g5qnsm35ph25s1cfvc1qb2g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simple-httpd";
+          sha256 = "18dharsdiwfkmhd9ibz9f47yfq9c2d78i886pi6gsjh8iwcpzx59";
+          name = "simple-httpd";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/simple-httpd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    simpleclip = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "simpleclip";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "simpleclip";
+          rev = "eba19a21da2e4d1e11abdc158f72d6513afaa669";
+          sha256 = "0v0vmkix9f0hb2183irr6xra8mwi47g6rn843sas7jy2ycaqd91v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simpleclip";
+          sha256 = "07qkfwlg8vw5kb097qbsv082hxir047q2bcvc8scbak2dr6pl12s";
+          name = "simpleclip";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/simpleclip";
+          license = lib.licenses.free;
+        };
+      }) {};
+    simplenote2 = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred }:
+    melpaBuild {
+        pname = "simplenote2";
+        version = "2.2.2";
+        src = fetchFromGitHub {
+          owner = "alpha22jp";
+          repo = "simplenote2.el";
+          rev = "9984ad77e63ae8d40e863cf1b0d8339ede986792";
+          sha256 = "04giklbd1fsw2zysr7aqg17h6cpyn4i9jbknm4d4v6581f2pcl93";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simplenote2";
+          sha256 = "1qdzbwhzmsga65wmrd0mb3rbs71nlyqqb6f4v7kvfxzyis50cswm";
+          name = "simplenote2";
+        };
+        packageRequires = [ request-deferred ];
+        meta = {
+          homepage = "http://melpa.org/#/simplenote2";
+          license = lib.licenses.free;
+        };
+      }) {};
+    simplezen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "simplezen";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "simplezen.el";
+          rev = "c0ddaefbb38fcc1c9775434f734f89227d246a30";
+          sha256 = "1p1771qm3jndnf4rdhb1bri5cjiksvxizagi7vfb7mjmsmx18w61";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simplezen";
+          sha256 = "13f2anhfsxmx1vdd209gxkhpywsi3nn6pazhc6bkswmn27yiig7j";
+          name = "simplezen";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/simplezen";
+          license = lib.licenses.free;
+        };
+      }) {};
+    skeletor = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "skeletor";
+        version = "1.6.1";
+        src = fetchFromGitHub {
+          owner = "chrisbarrett";
+          repo = "skeletor.el";
+          rev = "d986806559628623b591542143707de8d76347d0";
+          sha256 = "101xn4glqi7b5vhdqqahj2ib4pm30pzq8sad7zagxw9csihcri3q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/skeletor";
+          sha256 = "1vfvg5l12dzksr24dxwc6ngawsqzpxjs97drw48qav9dy1vyl10v";
+          name = "skeletor";
+        };
+        packageRequires = [ cl-lib dash emacs f let-alist s ];
+        meta = {
+          homepage = "http://melpa.org/#/skeletor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    skewer-less = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, skewer-mode }:
+    melpaBuild {
+        pname = "skewer-less";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "skewer-less";
+          rev = "593001930f1d68c85233f34c5f6fb04173fc98d6";
+          sha256 = "0g5sapd76pjnfhxlw149zj0fpn6l3pz3l8qlcn2c237vm8vn6qv3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/skewer-less";
+          sha256 = "0fhv5cnp5bgw3krfmb0jl18kw2hzx2p81falj57lg3p8rn23dryl";
+          name = "skewer-less";
+        };
+        packageRequires = [ skewer-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/skewer-less";
+          license = lib.licenses.free;
+        };
+      }) {};
+    skewer-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild, simple-httpd }:
+    melpaBuild {
+        pname = "skewer-mode";
+        version = "1.6.2";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "skewer-mode";
+          rev = "8a3a22ef4fe4d9d0831e82fde08c6355d0b19ed4";
+          sha256 = "05jndz0c26q60s416vqgvr66axdmxb7qsr2g70fvl5iqavnayhpv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/skewer-mode";
+          sha256 = "1zp4myi9f7pw6zkgc0xg12585iihn7khcsf20pvqyc0vn4ajdwqm";
+          name = "skewer-mode";
+        };
+        packageRequires = [ emacs js2-mode simple-httpd ];
+        meta = {
+          homepage = "http://melpa.org/#/skewer-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    slamhound = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "slamhound";
+        version = "1.5.4";
+        src = fetchFromGitHub {
+          owner = "technomancy";
+          repo = "slamhound";
+          rev = "2f896d6ba15d09aae66b5fdecc0d855f6b03abc9";
+          sha256 = "09ccdgg2wgw3xmlkpjsaqmnmf7f8rhjy4g6ypsn1sk5rgbgk8aj8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slamhound";
+          sha256 = "14zlcw0zw86awd6g98l4h2whav9amz4m8ik877d1wsdjf69g7k9x";
+          name = "slamhound";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/slamhound";
+          license = lib.licenses.free;
+        };
+      }) {};
+    slideview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "slideview";
+        version = "0.6.1";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "Emacs-slideview";
+          rev = "ec2340e7b0e74201206d14e3eaef1e77149f122d";
+          sha256 = "0rk12am1dq52khwkwrmg70zarhni2avj4sy44jqckb4x7sv7djfk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slideview";
+          sha256 = "0zr08yrnrz49zds1651ysmgjqgbnhfdcqbg90sbsb086iw89rxl1";
+          name = "slideview";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/slideview";
+          license = lib.licenses.free;
+        };
+      }) {};
+    slim-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "slim-mode";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "slim-template";
+          repo = "emacs-slim";
+          rev = "fe8abb644b7b9cc0ed1e76d9ca8d6c01edccbdb8";
+          sha256 = "1cl8amk1kc7a953l1khjms04j40mfkpnbsjz3qa123msgachrsg7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slim-mode";
+          sha256 = "1hip0r22irr9sah3b65ky71ic508bhqvj9hj95a81qvy1zi9rcac";
+          name = "slim-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/slim-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "slime";
+        version = "2.15";
+        src = fetchFromGitHub {
+          owner = "slime";
+          repo = "slime";
+          rev = "da7c32d0c54a6f2d9a4be0662c7b2d576b11eda1";
+          sha256 = "10ydinwsm7m5jlggynhsihxl18zl8cph4rliic8i72hjc3nhqfmy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime";
+          sha256 = "04zcvjg0bbx5mdbsk9yn7rlprakl89dq6jmnq5v2g0n6q0mh6ign";
+          name = "slime";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/slime";
+          license = lib.licenses.free;
+        };
+      }) {};
+    slime-company = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
+    melpaBuild {
+        pname = "slime-company";
+        version = "0.9.1";
+        src = fetchFromGitHub {
+          owner = "anwyn";
+          repo = "slime-company";
+          rev = "b4a770b1c1e9638f13e339e7debbdb3b25217e39";
+          sha256 = "0rdhd6kymbzhkc96dxy3nr21ajrkc7iy6zvq1va22r90f96jj9x4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime-company";
+          sha256 = "195s5fi2dl3h2jyy4d45q22jac35sciz81n13b4lgw94mkxx4rq2";
+          name = "slime-company";
+        };
+        packageRequires = [ company slime ];
+        meta = {
+          homepage = "http://melpa.org/#/slime-company";
+          license = lib.licenses.free;
+        };
+      }) {};
+    slime-ritz = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "slime-ritz";
+        version = "0.6.0";
+        src = fetchFromGitHub {
+          owner = "pallet";
+          repo = "ritz";
+          rev = "1cc6faedae26323994ea8dd1a4f555db8acbf244";
+          sha256 = "0lp584k35asqlvbhglv124jazdgp3h7pzl0akfwbdmby9zayqk96";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime-ritz";
+          sha256 = "1y1439y07l1a0sp9wn110hw4yyxj8n1cnd6h17rmsr549m2qbg1a";
+          name = "slime-ritz";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/slime-ritz";
+          license = lib.licenses.free;
+        };
+      }) {};
+    slime-volleyball = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "slime-volleyball";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "fitzsim";
+          repo = "slime-volleyball";
+          rev = "159b5c0f40b109e3854e94b89ec5383854c46ae3";
+          sha256 = "00v4mh04affd8kkw4rn51djpyga2rb8f63mgy86napglqnkz40r3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime-volleyball";
+          sha256 = "1dzvj8z3l5l9ixjl3nc3c7zzi23zc2300r7jzw2l3bvg64cfbdg7";
+          name = "slime-volleyball";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/slime-volleyball";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sly = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sly";
+        version = "2.14";
+        src = fetchFromGitHub {
+          owner = "capitaomorte";
+          repo = "sly";
+          rev = "1942c53fc40fd6ace0e822b5c9bf551f59061f32";
+          sha256 = "1aihr5pbdqjb5j6xsghi7qbrmp46kddv76xmyx5z98m93n70wzqf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sly";
+          sha256 = "1pmyqjk8fdlzwvrlx8h6fq0savksfny78fhmr8r7b07pi20y6n9l";
+          name = "sly";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sly";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sly-company = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
+    melpaBuild {
+        pname = "sly-company";
+        version = "0.8";
+        src = fetchFromGitHub {
+          owner = "capitaomorte";
+          repo = "sly-company";
+          rev = "930e14fee9cdc837ae26299c7f5e379c53cee1af";
+          sha256 = "11p89pz6zmnjng5177w31ilcmifvnhv9mfjy79ic7amg01h09hsr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sly-company";
+          sha256 = "1n8bx0qis2bs49c589cbh59xcv06r8sx6y4lxprc9pfpycx7h6v2";
+          name = "sly-company";
+        };
+        packageRequires = [ company emacs sly ];
+        meta = {
+          homepage = "http://melpa.org/#/sly-company";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }:
+    melpaBuild {
+        pname = "smart-mode-line";
+        version = "2.9";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "smart-mode-line";
+          rev = "d98b985c44b2c771cac1eea758f21e16e169a8a0";
+          sha256 = "0yvlmwnhdph5qj1998jz0idcl7901j6fxa9hivr7kic57j8kbq71";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-mode-line";
+          sha256 = "0qmhzlkc6mfqyaw4jaw6195b8sw0wg9pfjcijb4p0mlywf5mh5q6";
+          name = "smart-mode-line";
+        };
+        packageRequires = [ emacs rich-minority ];
+        meta = {
+          homepage = "http://melpa.org/#/smart-mode-line";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smart-mode-line-powerline-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, smart-mode-line }:
+    melpaBuild {
+        pname = "smart-mode-line-powerline-theme";
+        version = "2.9";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "smart-mode-line";
+          rev = "d98b985c44b2c771cac1eea758f21e16e169a8a0";
+          sha256 = "0yvlmwnhdph5qj1998jz0idcl7901j6fxa9hivr7kic57j8kbq71";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-mode-line-powerline-theme";
+          sha256 = "0hv3mx39m3l35xhz351zp98321ilr6qq9wzwn1f0ziiv814khcn4";
+          name = "smart-mode-line-powerline-theme";
+        };
+        packageRequires = [ emacs powerline smart-mode-line ];
+        meta = {
+          homepage = "http://melpa.org/#/smart-mode-line-powerline-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smart-tabs-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smart-tabs-mode";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "jcsalomon";
+          repo = "smarttabs";
+          rev = "8b196d596b331f03fba0efdb4e31d2fd0752c4a7";
+          sha256 = "1kfihh4s8578cwqyzn5kp3iib7f9vvg6rfc3klqzgads187ryd4z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-tabs-mode";
+          sha256 = "1fmbi0ypzhsizzb1vm92hfaq23swiyiqvg0pmibavzqyc9lczhhl";
+          name = "smart-tabs-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/smart-tabs-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smartparens";
+        version = "1.6.3";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "smartparens";
+          rev = "6b9b415b3655ac92631c8c5ca1247eebc68b7110";
+          sha256 = "1mx4hdbrk6v52y5r47fbd6kgqyk3lvqgq8lw3hkww0pqfwwp4x6h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smartparens";
+          sha256 = "025nfrfw0992024i219jzm4phwf29smc5hib45s6h1s67942mqh6";
+          name = "smartparens";
+        };
+        packageRequires = [ cl-lib dash ];
+        meta = {
+          homepage = "http://melpa.org/#/smartparens";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smartrep = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smartrep";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "myuhe";
+          repo = "smartrep.el";
+          rev = "0b73bf3d1a3c795671bfee0a36cecfaa54729446";
+          sha256 = "0j5lg9gryl8vbzw8d3r2fl0c9wxa0c193mcvdfidd25b98wccc3f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smartrep";
+          sha256 = "1ypls52d51lcqhz737rqg73c6jwl6q8b3bwb29z51swyamf37rbn";
+          name = "smartrep";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/smartrep";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smartscan = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smartscan";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "mickeynp";
+          repo = "smart-scan";
+          rev = "13c9fd6c0e38831f78dec55051e6b4a643963176";
+          sha256 = "1sd7dh9114mvr4xnp43xx4b7qmwkaj1a1fv7pwc28fhiy89d2md4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smartscan";
+          sha256 = "0vghgmx8vnjbvsw7q5zs0qz2wm6dcng9m69b8dq81g2cq9dflbwb";
+          name = "smartscan";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/smartscan";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smeargle = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smeargle";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-smeargle";
+          rev = "fe0494bb859ea51800d6e7ae7d9eda2fe98e0097";
+          sha256 = "1pcpg3lalbrc24z3vwcaysps8dbdzmncdgqdd5ig6yk2a9wyj9ng";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smeargle";
+          sha256 = "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd";
+          name = "smeargle";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/smeargle";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smex";
+        version = "3.0";
+        src = fetchFromGitHub {
+          owner = "nonsequitur";
+          repo = "smex";
+          rev = "97b4a4d82a4449e3f1a3fa8a93387d6eb0ef9c26";
+          sha256 = "1hcjh577xz3inx28r8wb4g2b1424ccw8pffvgdmpf80xp1llldj5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smex";
+          sha256 = "1rwyi7gdzswafkwpfqd6zkxka1mrf4xz17kld95d2ram6cxl6zda";
+          name = "smex";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/smex";
+          license = lib.licenses.free;
+        };
+      }) {};
+    smooth-scrolling = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smooth-scrolling";
+        version = "1.0.4";
+        src = fetchFromGitHub {
+          owner = "aspiers";
+          repo = "smooth-scrolling";
+          rev = "0d9b228f952c53ad456f98e2c761dda70ed72174";
+          sha256 = "05kf3hb3nb32jzw50a2z9vlf3f0pj40klzxvqj4fxlci777imsvk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smooth-scrolling";
+          sha256 = "0zy2xsmr05l2narslfgril36d7qfb55f52qm2ki6fy1r18lfiyc6";
+          name = "smooth-scrolling";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/smooth-scrolling";
+          license = lib.licenses.free;
+        };
+      }) {};
+    solarized-theme = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "solarized-theme";
+        version = "1.2.2";
+        src = fetchFromGitHub {
+          owner = "bbatsov";
+          repo = "solarized-emacs";
+          rev = "210dbef0186f87048d50face41d1d374d6154b3a";
+          sha256 = "0zcj9jf8nlsj9vms888z2vs76q54n8g8r9sh381xad3x8d6lrlb3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/solarized-theme";
+          sha256 = "15d8k32sj8i11806byvf7r57rivz391ljr0zb4dx8n8vjjkyja12";
+          name = "solarized-theme";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/solarized-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sos = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "sos";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "omouse";
+          repo = "emacs-sos";
+          rev = "c3906ca6872f460c0bdd276410519308626313f1";
+          sha256 = "0b5w3vdr8llg3hqd22gnc6b6y089lq6vfk0ajkws6gfldz2gg2v1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sos";
+          sha256 = "1gkd0plx7152s3dj8a9lwlwh8bgs1m006s80l10agclx6aay8rvb";
+          name = "sos";
+        };
+        packageRequires = [ org ];
+        meta = {
+          homepage = "http://melpa.org/#/sos";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sotlisp = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sotlisp";
+        version = "1.4.1";
+        src = fetchFromGitHub {
+          owner = "Malabarba";
+          repo = "speed-of-thought-lisp";
+          rev = "6e0ebc97000dc505f72ad9cc793ac857b0585f5a";
+          sha256 = "1wbd7v5bnd4qgqk8rrgllal0i949n8xzvb3yhf0vnxr06wdzy0a4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sotlisp";
+          sha256 = "0zjnn6hhwy6cjvc5rhvhxcq5pmrhcyil14a48fcgwvg4lv7fbljk";
+          name = "sotlisp";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/sotlisp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sound-wav = callPackage ({ cl-lib ? null, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sound-wav";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-sound-wav";
+          rev = "215e23b118fba11a7132b7c79326ad0a723e2605";
+          sha256 = "0q2ragq4hw89d3w48ykwljb19n2nhz8z6bsmb10shimaf203652g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sound-wav";
+          sha256 = "1vrwzk6zqma7r0w5ivbx16shys6hsifj52fwlf5rxs6jg1gqdb4f";
+          name = "sound-wav";
+        };
+        packageRequires = [ cl-lib deferred ];
+        meta = {
+          homepage = "http://melpa.org/#/sound-wav";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sourcekit = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sourcekit";
+        version = "0.1.4";
+        src = fetchFromGitHub {
+          owner = "nathankot";
+          repo = "company-sourcekit";
+          rev = "ea26c1284ccf72d6e3a850c6725433f0f8e2b3f9";
+          sha256 = "1l9xrw88wq32wm3qx922ihdb9mlv9rrdalwvz9i2790fmw7y84vz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sourcekit";
+          sha256 = "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks";
+          name = "sourcekit";
+        };
+        packageRequires = [ dash dash-functional emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/sourcekit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sourcemap = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sourcemap";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-sourcemap";
+          rev = "065a0c3bd8ca5fe6a45e8f983f932c3c9fac5db9";
+          sha256 = "1k2gfw4dydzqxbfdmcghajbb2lyg1j4wgdhp8chlql3dax1f503d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sourcemap";
+          sha256 = "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5";
+          name = "sourcemap";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/sourcemap";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sourcetalk = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "sourcetalk";
+        version = "1.2.0";
+        src = fetchFromGitHub {
+          owner = "malroc";
+          repo = "sourcetalk_emacs";
+          rev = "aced89fa8776e6d5e42dad4a863e159959f08de6";
+          sha256 = "0j4qm1y7rhb95k1zbl3c60a46l9rchzslzq36mayyw61s6yysjnv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sourcetalk";
+          sha256 = "0qaf2q784xgl1s3m88jpwdzghpi4f3nybga3lnr1w7sb7b3yvj3z";
+          name = "sourcetalk";
+        };
+        packageRequires = [ request ];
+        meta = {
+          homepage = "http://melpa.org/#/sourcetalk";
+          license = lib.licenses.free;
+        };
+      }) {};
+    spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
+    melpaBuild {
+        pname = "spaceline";
+        version = "1.1.0";
+        src = fetchFromGitHub {
+          owner = "TheBB";
+          repo = "spaceline";
+          rev = "3ad012e9a86a40c86460408dcdde704b125a1888";
+          sha256 = "13sqigkw41jmh0f7c1lmx4ipvcrlsp7k8h7vs2drpacf84yl6dn9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spaceline";
+          sha256 = "0jpcj0i8ckdylrisx9b4l9kam6kkjzhhv1s7mwwi4b744rx942iw";
+          name = "spaceline";
+        };
+        packageRequires = [ cl-lib dash emacs powerline s ];
+        meta = {
+          homepage = "http://melpa.org/#/spaceline";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sparkline = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sparkline";
+        version = "1.0.2";
+        src = fetchFromGitHub {
+          owner = "woudshoo";
+          repo = "sparkline";
+          rev = "e44498cf1a58fb165991198fe5104d51c92ea904";
+          sha256 = "1gmmmkzxxlpz2ml6qk24vndlrbyl55r5cba76jn342zrxvb357ny";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sparkline";
+          sha256 = "081jzaxjb32nydvr1kmyafxqxi610n0yf8lwz9vldm84famf3g7y";
+          name = "sparkline";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/sparkline";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sparql-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sparql-mode";
+        version = "0.11.2";
+        src = fetchFromGitHub {
+          owner = "ljos";
+          repo = "sparql-mode";
+          rev = "303858e7f91829ec720141482c777460e66f310b";
+          sha256 = "1gk2ps7fn9z8n6r923qzn518gz9mrj7mb6j726cz8qb585ndjbij";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sparql-mode";
+          sha256 = "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d";
+          name = "sparql-mode";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/sparql-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    speech-tagger = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "speech-tagger";
+        version = "0.0.0";
+        src = fetchFromGitHub {
+          owner = "cosmicexplorer";
+          repo = "speech-tagger";
+          rev = "e6595bd0eea93ede1534c536c1746c9cf763b73c";
+          sha256 = "1k6c7450v0ln6l9b8z1hib2s2b4rmjbskynvwwyilgdnvginfhi3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/speech-tagger";
+          sha256 = "0sqil949ny9qjxq7kpb4zmjd7770r0qvq4sz80agw6a27mqnaajc";
+          name = "speech-tagger";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/speech-tagger";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sphinx-doc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "sphinx-doc";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "naiquevin";
+          repo = "sphinx-doc.el";
+          rev = "b3459ecb9e6d3fffdee3cb7342563a56a32ce666";
+          sha256 = "1q6v0xfdxm57lyj4zxyqv6n5ik5w9drk7yf9w8spb5r22jg0dg8c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sphinx-doc";
+          sha256 = "00h3wx2p5hzbw6sggggdrzv4jrn1wc051iqql5y2m1hsh772ic5z";
+          name = "sphinx-doc";
+        };
+        packageRequires = [ cl-lib s ];
+        meta = {
+          homepage = "http://melpa.org/#/sphinx-doc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    splitjoin = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "splitjoin";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-splitjoin";
+          rev = "0eb91e7beec915065cd6c00ceaca180a64d85cda";
+          sha256 = "17qsmjsbk8aq3azjxid6h9fzz77bils74scp21sqn8vdnijx8991";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/splitjoin";
+          sha256 = "0l1x98fvvia8qx8g125h4d76slv0xnb3h1zxiq9xb5qh7a1h069l";
+          name = "splitjoin";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/splitjoin";
+          license = lib.licenses.free;
+        };
+      }) {};
+    spotify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "spotify";
+        version = "0.3.2";
+        src = fetchFromGitHub {
+          owner = "remvee";
+          repo = "spotify-el";
+          rev = "07a44ecdbdaa93977e97f2a2e5d280ef0b2e8545";
+          sha256 = "05y8xv6zapspwr5bii41lgirslas22wsbm0kgb4dm79qbk9j1kzw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spotify";
+          sha256 = "0pmsvxi1dsi580wkhhx8iw329agkh5yzk61bqvxzign3cd6fbq6k";
+          name = "spotify";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/spotify";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sprintly-mode = callPackage ({ fetchFromGitHub, fetchurl, furl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sprintly-mode";
+        version = "0.0.4";
+        src = fetchFromGitHub {
+          owner = "sprintly";
+          repo = "sprintly-mode";
+          rev = "6695892bae5860b5268bf3ae62be990ee9b63c11";
+          sha256 = "06rk07h92s5sljprs41y3q31q64cprx9kgs56c2j6v4c8cmsq5h6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sprintly-mode";
+          sha256 = "15i3rrv27ccpn12wwj9raaxpj7nlnrrj3lsp8vdfwph6ydvnfza4";
+          name = "sprintly-mode";
+        };
+        packageRequires = [ furl ];
+        meta = {
+          homepage = "http://melpa.org/#/sprintly-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sqlup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sqlup-mode";
+        version = "0.5.3";
+        src = fetchFromGitHub {
+          owner = "trevoke";
+          repo = "sqlup-mode.el";
+          rev = "7a51e34685c65952cd0635c3d35a36337fde361b";
+          sha256 = "1dcb18fq84vlfgb038i2x6vy7mhin2q6jn4jl9fh256n12cx4nrn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sqlup-mode";
+          sha256 = "06a0v2qagpd9p2bh19bfw14a6if8kjjc4yyhm5nwp8a8d2vnl5l7";
+          name = "sqlup-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sqlup-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    srefactor = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "srefactor";
+        version = "0.5";
+        src = fetchFromGitHub {
+          owner = "tuhdo";
+          repo = "semantic-refactor";
+          rev = "ecd40713f736b243285c07f4cfd77113794d4f9f";
+          sha256 = "0wx8l8gkh8rbf2g149f35gpnmkk45s9x4r844aqw5by4zkvix4rc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/srefactor";
+          sha256 = "01cd40jm4h00c5q2ix7cskp7klbkcd3n5763y5lqfv59bjxwdqd2";
+          name = "srefactor";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/srefactor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    stash = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "stash";
+        version = "0.4.1";
+        src = fetchFromGitHub {
+          owner = "vermiculus";
+          repo = "stash.el";
+          rev = "638ae8a4f6d33af54fe77d57c2c0eb1800dd2e19";
+          sha256 = "0igqifws73cayvjnhhrsqpy14sr27avymfhaqzrpj76m2fsh6fj4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stash";
+          sha256 = "116k40ispv7sq3jskwc1lvmhmk3jjz4j967r732s07f5h11vk1z9";
+          name = "stash";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/stash";
+          license = lib.licenses.free;
+        };
+      }) {};
+    status = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "status";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "tromey";
+          repo = "emacs-status";
+          rev = "b62c74bf272566f82a68622f29fb9edafea0f241";
+          sha256 = "0jpxmzfvg4k5q3h3gn6lrg891wjzlcps2kkij1jbdjk4jkgq386i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/status";
+          sha256 = "0a9lqa7a5nki5711bjrmx214kah5ndqpwh3i240gdd08mcm07ps3";
+          name = "status";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/status";
+          license = lib.licenses.free;
+        };
+      }) {};
+    stekene-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "stekene-theme";
+        version = "1.0.15";
+        src = fetchFromGitHub {
+          owner = "Fanael";
+          repo = "stekene-theme";
+          rev = "5a5ed0aed5c6c6c56aa1e59516a40c697b04a673";
+          sha256 = "0pik6mq8syhxk9l9ns8wgvg5312qkckm3cilb3irwdm1dvnl5hpf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stekene-theme";
+          sha256 = "0v1kwlnrqaygzaz376a5njg9kv4yf5l35k87xga4wdd2mxfwrmf1";
+          name = "stekene-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/stekene-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    stgit = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "stgit";
+        version = "0.17.1";
+        src = fetchgit {
+          url = "git://repo.or.cz/stgit.git";
+          rev = "48e5cef14cea5c810833d119900cd484c2a6ca85";
+          sha256 = "12c5df549d653c8ec3476ed271a4e9a4065a61a467229c070bb2e6295e285e16";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stgit";
+          sha256 = "102s9lllrcxsqs0lgbrcljwq1l3s8ri4276wck6rcypck5zgzj89";
+          name = "stgit";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/stgit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    string-edit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "string-edit";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "string-edit.el";
+          rev = "9f9c9cd659156fd2217be814eb4e91da48d44647";
+          sha256 = "15gdcpbba3h84s7xnpk69nav6bixdixnirdh5n1rly010q0m5s5x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/string-edit";
+          sha256 = "1l1hqsfyi6pp4x4g1rk4s7x9zjc03wfmhy16izia8nkjhzz88fi8";
+          name = "string-edit";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/string-edit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    string-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild }:
+    melpaBuild {
+        pname = "string-utils";
+        version = "0.3.2";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "string-utils";
+          rev = "3ae530143899f533a9ef5e1f26f28b577ebe72ee";
+          sha256 = "03azfs6z0jg66ppalijcxl973vdbhj4c3g84sm5dm8xv6rnxrv2s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/string-utils";
+          sha256 = "1vsvxc06fd3wardldb83i5hjfibvmiqnxvcgdns7i5i8qlsrsx4v";
+          name = "string-utils";
+        };
+        packageRequires = [ list-utils ];
+        meta = {
+          homepage = "http://melpa.org/#/string-utils";
+          license = lib.licenses.free;
+        };
+      }) {};
+    stripe-buffer = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "stripe-buffer";
+        version = "0.2.5";
+        src = fetchFromGitHub {
+          owner = "sabof";
+          repo = "stripe-buffer";
+          rev = "d9f009b92cf16fe2c40cd92b8f842a3872e6c190";
+          sha256 = "035ym1c1vzg6hjsnd258z4dkrfc11lj4c0y4gpgybhk54dq3w9dk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stripe-buffer";
+          sha256 = "02wkb9y6vykrn6a5nfnimaplj7ig8i8h6m2rvwv08f5ilbccj16a";
+          name = "stripe-buffer";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/stripe-buffer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    stumpwm-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "stumpwm-mode";
+        version = "0.9.8";
+        src = fetchgit {
+          url = "git://git.savannah.nongnu.org/stumpwm.git";
+          rev = "4d0603e52b5bab993b3be63e3654c74f641e677d";
+          sha256 = "f5e3b0fdbdb1c747c40f7b6746de195e37bd4caccdcc05c6aa14124f29e71428";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stumpwm-mode";
+          sha256 = "0a77mh7h7033adfbwg2fbx84789962par43q31s9msjlqw15gs86";
+          name = "stumpwm-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/stumpwm-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    stylus-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sws-mode }:
+    melpaBuild {
+        pname = "stylus-mode";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "brianc";
+          repo = "jade-mode";
+          rev = "4e7a20db492719062f40b225ed730ed50be5db56";
+          sha256 = "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stylus-mode";
+          sha256 = "152k74q6qn2xa38v2zyd5y7ya5n26nvai5v7z5fmq7jrcndp27r5";
+          name = "stylus-mode";
+        };
+        packageRequires = [ sws-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/stylus-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    subemacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "subemacs";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "kbauer";
+          repo = "subemacs";
+          rev = "24f0896f1995a3ea42a58b0452d250dcc6802944";
+          sha256 = "189547d0g9ax0nr221bkdchlfcj60dsy8lgbbrvq3n3xrmlvl362";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/subemacs";
+          sha256 = "0sqh80jhh3v37l5af7w6k9lqvj39bd91pn6a9rwdlfk389hp90zm";
+          name = "subemacs";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/subemacs";
+          license = lib.licenses.free;
+        };
+      }) {};
+    subshell-proc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "subshell-proc";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "andrewmains12";
+          repo = "subshell-proc";
+          rev = "bf475eb7b0684af967755e91c9cabd19f953b03b";
+          sha256 = "0mx892vn4a32df30iqmf2vsz1gdl3i557fw0194g6a66n9w2q7xf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/subshell-proc";
+          sha256 = "1fnp49yhnhsj7paj0b25vr6r03hr5kpgcrci439ffpbd2c85fkw2";
+          name = "subshell-proc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/subshell-proc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sudden-death = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sudden-death";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "yewton";
+          repo = "sudden-death.el";
+          rev = "c58fb9a672f306604dde4fbb0ff079e65a5e40be";
+          sha256 = "1kmyivsyxr6gb2k36ssyr779rpk8qsrb27q5rjsir9fgc95qhvjb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sudden-death";
+          sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh";
+          name = "sudden-death";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sudden-death";
+          license = lib.licenses.free;
+        };
+      }) {};
+    suomalainen-kalenteri = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "suomalainen-kalenteri";
+        version = "2015.11.29";
+        src = fetchFromGitHub {
+          owner = "tlikonen";
+          repo = "suomalainen-kalenteri";
+          rev = "b7991cb35624ebc04a89bbe759d40f186c9c097e";
+          sha256 = "1b637p2cyc8a83qv9vba4yamzhk08f62zykqh5p35jwvym8wkann";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/suomalainen-kalenteri";
+          sha256 = "1wzijbgcr3jc47ccr7nrdkqha16s6gw0xiccnmdczi48cvnvvlkh";
+          name = "suomalainen-kalenteri";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/suomalainen-kalenteri";
+          license = lib.licenses.free;
+        };
+      }) {};
+    super-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "super-save";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "bbatsov";
+          repo = "super-save";
+          rev = "4eb8aef705237d706b30cf722c5ad4909ea3acf1";
+          sha256 = "1pq71simdb4pcbzzavlxdfbgh548m15f493h821k04n67ydzlmj3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/super-save";
+          sha256 = "0ikfw7n2rvm3xcgnj1si92ly8w75x26071ki551ims7a8sawh52p";
+          name = "super-save";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/super-save";
+          license = lib.licenses.free;
+        };
+      }) {};
+    svg-mode-line-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xmlgen }:
+    melpaBuild {
+        pname = "svg-mode-line-themes";
+        version = "0.1.3";
+        src = fetchFromGitHub {
+          owner = "sabof";
+          repo = "svg-mode-line-themes";
+          rev = "80a0e01839cafbd66899202e7764c33231974259";
+          sha256 = "14h40s0arc2i898r9yysn256z6l8jkrnmqvrdg7p7658c0klz5ic";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/svg-mode-line-themes";
+          sha256 = "12lnszcb9bl32n9wir7vf8xiyyv7njw4xg21aj9x4dasmidyx506";
+          name = "svg-mode-line-themes";
+        };
+        packageRequires = [ xmlgen ];
+        meta = {
+          homepage = "http://melpa.org/#/svg-mode-line-themes";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sweetgreen = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, request }:
+    melpaBuild {
+        pname = "sweetgreen";
+        version = "0.5";
+        src = fetchFromGitHub {
+          owner = "CestDiego";
+          repo = "sweetgreen.el";
+          rev = "9de3916023872ab054e1c7301175fa27fdb1de0c";
+          sha256 = "1h56qkbx5abz1l94wrdpbzspiz24mfgkppzfalvbvx5qwl079cvs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sweetgreen";
+          sha256 = "1v75wk0gq5fkz8i1r8pl4gqnxbv1d80isyn48w2hxj2fmdn2xhpy";
+          name = "sweetgreen";
+        };
+        packageRequires = [ cl-lib dash helm request ];
+        meta = {
+          homepage = "http://melpa.org/#/sweetgreen";
+          license = lib.licenses.free;
+        };
+      }) {};
+    swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "swift-mode";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "chrisbarrett";
+          repo = "swift-mode";
+          rev = "e09694f0f95a64b2c96487cbdcb66636a77ea22a";
+          sha256 = "1fi5zdvplw7h5hnyi37k92c8s8qnjgizbnv1mah18y8d30n1r77n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swift-mode";
+          sha256 = "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d";
+          name = "swift-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/swift-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "swiper";
+        version = "0.7.0";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "swiper";
+          rev = "706349fcfae297ee285552af9246bc0cf00d9b7f";
+          sha256 = "1kahl3h18vsjkbqvd84fb2w45s4srsiydn6jiv49vvg1yaxzxcbm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swiper";
+          sha256 = "13lld7kjz1n1ryxvrfsy0iym5l9m9ybrf7bpcmkzsalpp15j3mvm";
+          name = "swiper";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/swiper";
+          license = lib.licenses.free;
+        };
+      }) {};
+    swiper-helm = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, swiper }:
+    melpaBuild {
+        pname = "swiper-helm";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "abo-abo";
+          repo = "swiper-helm";
+          rev = "f3d6dba865629eed8fb14f92dab1fad50734891b";
+          sha256 = "1y2dbd3ikdpjvi8xz10jkrx2773h7cgr6jxm5b2bldm81lvi8x64";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swiper-helm";
+          sha256 = "011ln6vny7z5vw67cpzldxf5n6sk2hjdkllyf7v6sf4m62ws93ph";
+          name = "swiper-helm";
+        };
+        packageRequires = [ emacs helm swiper ];
+        meta = {
+          homepage = "http://melpa.org/#/swiper-helm";
+          license = lib.licenses.free;
+        };
+      }) {};
+    switch-window = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "switch-window";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "dimitri";
+          repo = "switch-window";
+          rev = "cd4b06121aa5bac4c4b13b63526a99008def5f2b";
+          sha256 = "1zpfilcaycj0l2q3zyvpjbwp5j3d9rrkacd5swzlr1n1klvbji48";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/switch-window";
+          sha256 = "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2";
+          name = "switch-window";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/switch-window";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sws-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "sws-mode";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "brianc";
+          repo = "jade-mode";
+          rev = "4e7a20db492719062f40b225ed730ed50be5db56";
+          sha256 = "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sws-mode";
+          sha256 = "0b12dsad0piih1qygjj0n7rni0pl8cizbzwqm9h1dr8imy53ak4i";
+          name = "sws-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/sws-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }:
+    melpaBuild {
+        pname = "sx";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "vermiculus";
+          repo = "sx.el";
+          rev = "4892f45746fb217d059f4fa074a237c5bac7dd6c";
+          sha256 = "02f63k8rzb3bcch6vj6w5c5ncccqg83siqnc8hyi0lhy1bfx240p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sx";
+          sha256 = "1ml1rkhhk3hkd16ij2zwng591rxs2yppsfq9gwd4ppk02if4v517";
+          name = "sx";
+        };
+        packageRequires = [ cl-lib emacs json let-alist markdown-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/sx";
+          license = lib.licenses.free;
+        };
+      }) {};
+    synosaurus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "synosaurus";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "rootzlevel";
+          repo = "synosaurus";
+          rev = "56efdc38952b9bd56a445591fcdeb626aede8678";
+          sha256 = "0hi2jflrlpp7xkbj852vp9hcl8bfmf04jqw1hawxrw4bxdp95jh2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/synosaurus";
+          sha256 = "16i2ag4l824h1kq4cy01zf01zrms4v6ldwlsixwfyb1mh97lqljg";
+          name = "synosaurus";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/synosaurus";
+          license = lib.licenses.free;
+        };
+      }) {};
+    syntactic-sugar = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "syntactic-sugar";
+        version = "0.9.4";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "syntactic-sugar";
+          rev = "06d943c6ad9507603bb6ab6d37be2d359d0763a9";
+          sha256 = "1pn69f4w48jdj3wd1myj6qq2mhvygmlzbq2dws2qkjlp3kbwa6da";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/syntactic-sugar";
+          sha256 = "12b2vpvz5h4wzxrk8jrbgc8v0w6bzzvxcyfs083fi1791qq1rw7r";
+          name = "syntactic-sugar";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/syntactic-sugar";
+          license = lib.licenses.free;
+        };
+      }) {};
+    syntax-subword = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "syntax-subword";
+        version = "0.2";
+        src = fetchhg {
+          url = "https://bitbucket.com/jpkotta/syntax-subword";
+          rev = "a1e0accb754d";
+          sha256 = "1p9bp09nibw7rra3r6nj496zdx09db6k82dxnxs1lfgdiswfdq2h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/syntax-subword";
+          sha256 = "1as89ffqz2h69fdwybgs5wibnrvskm7hd58vagfjkla9pjlpffpm";
+          name = "syntax-subword";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/syntax-subword";
+          license = lib.licenses.free;
+        };
+      }) {};
+    system-specific-settings = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "system-specific-settings";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "DarwinAwardWinner";
+          repo = "emacs-system-specific-settings";
+          rev = "0050d85b2175095aa5ecf580a2fe43c069b0eef3";
+          sha256 = "1hixilnnybv2v3p1wpn7a0ybwah17grawszs3jycsjgzahpgckv7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/system-specific-settings";
+          sha256 = "1ydmxi8aw2lf78wv4m39yswbqkmcadqg0wmzg9s8b5h9bxxwvppp";
+          name = "system-specific-settings";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/system-specific-settings";
+          license = lib.licenses.free;
+        };
+      }) {};
+    systemd = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "systemd";
+        version = "1.3.1";
+        src = fetchFromGitHub {
+          owner = "holomorph";
+          repo = "systemd-mode";
+          rev = "aa9f4f64e99d5912153eef0726e26fd4dfb4d7c3";
+          sha256 = "0axskr4q0kw8pmnl1pv2z3n6x3pn6v28qcgz3qf745lqgmsgbng9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/systemd";
+          sha256 = "1biais0cmidy3d0hf2ifdlr6qv1z8k8c8bczi07bsfk4md3idbir";
+          name = "systemd";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/systemd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ta = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ta";
+        version = "1.5";
+        src = fetchFromGitHub {
+          owner = "kuanyui";
+          repo = "ta.el";
+          rev = "9226afbe7abbefb825844ef3ba4ca15f1934cfc2";
+          sha256 = "09nndx83ws5v2i9x0dzk6l1a0lq29ffzh3y05n0n64nf5j0a7zvk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ta";
+          sha256 = "0kn2k4n0xfwsrniaqb36v3rxj2pf2sai3bmjksbn1g2kf5g156ll";
+          name = "ta";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ta";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tabbar-ruler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, tabbar }:
+    melpaBuild {
+        pname = "tabbar-ruler";
+        version = "0.45";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "tabbar-ruler.el";
+          rev = "7df2e4814018e84ef9261d04a2ade8168a44e3d7";
+          sha256 = "1xd67s92gyr49v73j7r7cbhsc40bkw8aqh21whgbypdgzpyc7azc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tabbar-ruler";
+          sha256 = "10dwjj6r74g9rzdd650wa1wxhqc0q6dmff4j0qbbhmjsxvsr3y0d";
+          name = "tabbar-ruler";
+        };
+        packageRequires = [ tabbar ];
+        meta = {
+          homepage = "http://melpa.org/#/tabbar-ruler";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tablist = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tablist";
+        version = "0.70";
+        src = fetchFromGitHub {
+          owner = "politza";
+          repo = "tablist";
+          rev = "ef38312867bc0268b1584dd890b1c420bb77ec11";
+          sha256 = "0gy9hxm7bca0l1hfy2pzn86avpifrz3bs8xzpicj4kxw5wi4ygns";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tablist";
+          sha256 = "0c10g86xjhzpmc2sqjmzcmi393qskyw6d9bydqzjk3ffjzklm45p";
+          name = "tablist";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/tablist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tagedit = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "tagedit";
+        version = "1.4.0";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "tagedit";
+          rev = "3fcf54b824b75c5ad68f5438d5638103049a389f";
+          sha256 = "0kq40g46s8kgiafrhdq99h79rz9h5fvgz59k7ralmf86bl4sdmdb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tagedit";
+          sha256 = "0vfkbrxmrw4fwdz324s734zxdxm2nj3df6i8m6lgb9pizqyp2g6z";
+          name = "tagedit";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/tagedit";
+          license = lib.licenses.free;
+        };
+      }) {};
+    telepathy = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "telepathy";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "NicolasPetton";
+          repo = "telepathy.el";
+          rev = "211d785b02a29ddc254422fdcc3db45262582f8c";
+          sha256 = "16kr1p4lzi1ysd5r2dh0mxk60zsm5fvwa9345nfyrgdic340yscc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/telepathy";
+          sha256 = "0c3d6vk7d6vqzjndlym2kk7d2zm0b15ac4142ir03p6f19rqq9pr";
+          name = "telepathy";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/telepathy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    telephone-line = callPackage ({ cl-lib ? null, eieio ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, seq }:
+    melpaBuild {
+        pname = "telephone-line";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "dbordak";
+          repo = "telephone-line";
+          rev = "70c113bea37719c83961023afd893044398e681d";
+          sha256 = "0smdlzrcbmip6c6c3rd0871wv5xyagavwsxhhgvki6ybyzdj9a19";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/telephone-line";
+          sha256 = "0dyh9h1yk9y0217b6rxsm7m372n910vpfgw5w23lkkrwa8x8qpx3";
+          name = "telephone-line";
+        };
+        packageRequires = [ cl-lib eieio emacs s seq ];
+        meta = {
+          homepage = "http://melpa.org/#/telephone-line";
+          license = lib.licenses.free;
+        };
+      }) {};
+    term-alert = callPackage ({ alert, fetchFromGitHub, fetchurl, lib, melpaBuild, term-cmd }:
+    melpaBuild {
+        pname = "term-alert";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "CallumCameron";
+          repo = "term-alert";
+          rev = "879ea638120639299aae602f06c46d9c27312ff1";
+          sha256 = "1d1hrnxhi7h5d5i4198hx5lj7fbc280lpkxmk2nb8z6j7z0aki7g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term-alert";
+          sha256 = "0x4rc1y311ivaj6mlks1j8sgzrrwqn8vx171vw7s1kgf1qzk826n";
+          name = "term-alert";
+        };
+        packageRequires = [ alert term-cmd ];
+        meta = {
+          homepage = "http://melpa.org/#/term-alert";
+          license = lib.licenses.free;
+        };
+      }) {};
+    term-cmd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "term-cmd";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "CallumCameron";
+          repo = "term-cmd";
+          rev = "52651fcfbd0b0be0bddc66bf27f36243140698a4";
+          sha256 = "1idz9c38q47lll55w1znya00hlkwa42029ys70sb14inc51cml51";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term-cmd";
+          sha256 = "0fn4f32zpl0p2lid159q59lzjv4xqmc23a64kcclqp9db8b1m5fy";
+          name = "term-cmd";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/term-cmd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    term-run = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "term-run";
+        version = "0.1.5";
+        src = fetchFromGitHub {
+          owner = "10sr";
+          repo = "term-run-el";
+          rev = "54650dbbabb13cb2a6c0670ff6b24b29717a6a8b";
+          sha256 = "149pl3zxg5kriydk5h6j95jyly6i23w4w4g4a99s4zi6ljiny6c6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term-run";
+          sha256 = "1bx3s68rgr9slsw9k01gfg7sxd4z7sarg4pi2ivril7108mhg2cs";
+          name = "term-run";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/term-run";
+          license = lib.licenses.free;
+        };
+      }) {};
+    termbright-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "termbright-theme";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "bmastenbrook";
+          repo = "termbright-theme-el";
+          rev = "bec6ab14336c0611e85f45486276004f16d20607";
+          sha256 = "0gfsqpza8phvma5y3ck0n6p197x1i33w39m3c7jmja4ml121n73d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/termbright-theme";
+          sha256 = "14q88qdbnyzxr8sr8i5glj674sb4150b9y6nag0dqrxs629is6xj";
+          name = "termbright-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/termbright-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tern = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tern";
+        version = "0.17.0";
+        src = fetchFromGitHub {
+          owner = "marijnh";
+          repo = "tern";
+          rev = "41ac9287252b6d305a690fa415956cdfbd8c7d7a";
+          sha256 = "1n4z5hgpv1f0360zgdxz1q4gmhjjrxm7ygxh1g4zjy6kbhgylmxb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tern";
+          sha256 = "06bgwizn9dcd8hsvimjvb28j0mpxg7rrv9knhv5kkdapa6gggxif";
+          name = "tern";
+        };
+        packageRequires = [ cl-lib emacs json ];
+        meta = {
+          homepage = "http://melpa.org/#/tern";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tern-auto-complete = callPackage ({ auto-complete, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }:
+    melpaBuild {
+        pname = "tern-auto-complete";
+        version = "0.17.0";
+        src = fetchFromGitHub {
+          owner = "marijnh";
+          repo = "tern";
+          rev = "41ac9287252b6d305a690fa415956cdfbd8c7d7a";
+          sha256 = "1n4z5hgpv1f0360zgdxz1q4gmhjjrxm7ygxh1g4zjy6kbhgylmxb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tern-auto-complete";
+          sha256 = "0lq924c5f6bhlgyqqzc346n381qf0fp66h50a0zqz2ch66kanni1";
+          name = "tern-auto-complete";
+        };
+        packageRequires = [ auto-complete cl-lib emacs tern ];
+        meta = {
+          homepage = "http://melpa.org/#/tern-auto-complete";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tern-django = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }:
+    melpaBuild {
+        pname = "tern-django";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "proofit404";
+          repo = "tern-django";
+          rev = "6d616c5f802d3432c4065dc306d7977d254df49f";
+          sha256 = "0l63lzm96gg3ihgc4l671i342qxigwdbn4xfkbxnarb0206gnb5p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tern-django";
+          sha256 = "1pjaaffadaw8h2n7yv01ks19gw59dmh8bp8vw51hx1082r3yfvv0";
+          name = "tern-django";
+        };
+        packageRequires = [ emacs f tern ];
+        meta = {
+          homepage = "http://melpa.org/#/tern-django";
+          license = lib.licenses.free;
+        };
+      }) {};
+    terraform-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, hcl-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "terraform-mode";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-terraform-mode";
+          rev = "6157690efce03ff20b16b85e2be6b0964efec2fb";
+          sha256 = "0mz2yl9jaw7chzv9d9hhv7gcvdwwvi676y9wpn7vp85hxpda7xg7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/terraform-mode";
+          sha256 = "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn";
+          name = "terraform-mode";
+        };
+        packageRequires = [ cl-lib hcl-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/terraform-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    test-case-mode = callPackage ({ fetchFromGitHub, fetchurl, fringe-helper, lib, melpaBuild }:
+    melpaBuild {
+        pname = "test-case-mode";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "ieure";
+          repo = "test-case-mode";
+          rev = "26e397c0f930b7eb0be413ef7dd257b1da052bec";
+          sha256 = "108csr1d7w0105rb6brzgbksb9wmq1p573vxbq0miv5k894j447f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/test-case-mode";
+          sha256 = "1iba97yvbi5vr7gvc58gq2ah6jg2s7apc9ssq7mdzki823n8z2qi";
+          name = "test-case-mode";
+        };
+        packageRequires = [ fringe-helper ];
+        meta = {
+          homepage = "http://melpa.org/#/test-case-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    test-kitchen = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "test-kitchen";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "jjasghar";
+          repo = "test-kitchen-el";
+          rev = "9464c7dda14020099053218e959971117396091e";
+          sha256 = "02vp4m3aw7rs4gxn91v6j3y8pr04hpydrg05ck3ivv46snkfagdn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/test-kitchen";
+          sha256 = "1bl3yvj56dq147yplrcwphcxiwvmx5n97y4qpkm9imiv8cnjm1g0";
+          name = "test-kitchen";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/test-kitchen";
+          license = lib.licenses.free;
+        };
+      }) {};
+    test-simple = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "test-simple";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "rocky";
+          repo = "emacs-test-simple";
+          rev = "75eea25bae04d8e5e3e835a2770f02f0ff4602c4";
+          sha256 = "08g7fan1y3wi4w7cdij14awadqss6prqg3k7qzf0wrnbm13dzhmk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/test-simple";
+          sha256 = "1l6y77fqd0l0mh2my23psi66v5ya6pbr2hgvcbsaqjnpmfm90w3g";
+          name = "test-simple";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/test-simple";
+          license = lib.licenses.free;
+        };
+      }) {};
+    textmate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "textmate";
+        version = "1";
+        src = fetchFromGitHub {
+          owner = "defunkt";
+          repo = "textmate.el";
+          rev = "484845493a3c9b570799aea5195a5435a5a01b76";
+          sha256 = "1a0fzn66gv421by0x6wj3z6bvzv274a9p8c2aaax0dskncl5lgk1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/textmate";
+          sha256 = "119w944pwarpqzcr9vys17svy1rkfs9hiln8903q9ff4lnjkpf1v";
+          name = "textmate";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/textmate";
+          license = lib.licenses.free;
+        };
+      }) {};
+    textmate-to-yas = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "textmate-to-yas";
+        version = "0.21";
+        src = fetchFromGitHub {
+          owner = "mattfidler";
+          repo = "textmate-to-yas.el";
+          rev = "8805e5159329e1b74629b7b584373fc446f57d31";
+          sha256 = "0fjapb7naysf34g4ac5gsa90b2s2ss7qgpyd9mfv3mdqrsp2dyw7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/textmate-to-yas";
+          sha256 = "04agz4a41h0givfdw88qjd3c7pd418qyigsij4la5f37j5rh338l";
+          name = "textmate-to-yas";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/textmate-to-yas";
+          license = lib.licenses.free;
+        };
+      }) {};
+    theme-changer = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "theme-changer";
+        version = "2.1.0";
+        src = fetchFromGitHub {
+          owner = "hadronzoo";
+          repo = "theme-changer";
+          rev = "d3d9c9f62a138958262ac5dd61837df427268611";
+          sha256 = "09vf3qs949n4iqzd14iq2kgvypwdwdv8ii8l5jcqfppgspd8m8yd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/theme-changer";
+          sha256 = "1qbmsghkl5gs728q0gaalc7p8q7nzv3l045jc0jdxxnb7na3gc5w";
+          name = "theme-changer";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/theme-changer";
+          license = lib.licenses.free;
+        };
+      }) {};
+    thrift = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "thrift";
+        version = "0.9.3";
+        src = fetchFromGitHub {
+          owner = "apache";
+          repo = "thrift";
+          rev = "53dd39833a08ce33582e5ff31fa18bb4735d6731";
+          sha256 = "1srylw9wwkyq92f9v6ds9zp9z8sl800wbxjbir80g1lwv4hghaii";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thrift";
+          sha256 = "0p1hxmm7gvhyigz8aylncgqbhk6cyf75rbcqis7x552g605mhiy9";
+          name = "thrift";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/thrift";
+          license = lib.licenses.free;
+        };
+      }) {};
+    timer-revert = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "timer-revert";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "yyr";
+          repo = "timer-revert";
+          rev = "31ad8d94b85807cd9f63fcba0c90c3e9a9515fa2";
+          sha256 = "1vq5yp6pyjam2csz22mcp353a4d5r7f9m6bsjizfmgr2ld7bwhx7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/timer-revert";
+          sha256 = "0lvm2irfx9rb5psm1lf53fv2jjx745n1c172xmyqip5xwgmf6msy";
+          name = "timer-revert";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/timer-revert";
+          license = lib.licenses.free;
+        };
+      }) {};
+    timesheet = callPackage ({ auctex, fetchFromGitHub, fetchurl, lib, melpaBuild, org, s }:
+    melpaBuild {
+        pname = "timesheet";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "tmarble";
+          repo = "timesheet.el";
+          rev = "354131b1216ccca51a68da74e9491b5518fd7820";
+          sha256 = "0p7piqbhwxp2idslqnzl5x4y9aqgba9ryxrjy3d0avky5z9kappl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/timesheet";
+          sha256 = "1gy6bf4wqvp8cw2wjnrr9ijnzwav3p7j46m7qrn6l0517shwl506";
+          name = "timesheet";
+        };
+        packageRequires = [ auctex org s ];
+        meta = {
+          homepage = "http://melpa.org/#/timesheet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tox";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "chmouel";
+          repo = "tox.el";
+          rev = "5c1a7c18cb7f2fd2da2386debf86012e6953e15d";
+          sha256 = "16217i8rjhgaa5kv8iq0s14b42v5rs8m2qlr60a0x6qzy65chq39";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tox";
+          sha256 = "1z81x8fs5q6r19hpqphsilk8wdwwnfr8w78x5x298x74s9mcsywl";
+          name = "tox";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tox";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tracking = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tracking";
+        version = "2.1";
+        src = fetchFromGitHub {
+          owner = "jorgenschaefer";
+          repo = "circe";
+          rev = "ac1cddf946e0af90ab453dd816f7173e0d4000e5";
+          sha256 = "0q3rv6lk37yybkbswmn4pgzca0nfhvf4h3ac395fr16k5ixybc5q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tracking";
+          sha256 = "096h5bl7jcwz5hpbm2139bf8a784hijfy40vzf42y1c9794al46z";
+          name = "tracking";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tracking";
+          license = lib.licenses.free;
+        };
+      }) {};
+    transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
+    melpaBuild {
+        pname = "transmission";
+        version = "0.7";
+        src = fetchFromGitHub {
+          owner = "holomorph";
+          repo = "transmission";
+          rev = "2769c9b17fa464e0634ac03046be74cefdb28880";
+          sha256 = "14fzgpafry3v072f22krap81jfpdc17bpimp16hv7f20sny29a5v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/transmission";
+          sha256 = "0w0hlr4y4xpcrpvclqqqasggkgrwnzrdib51mhkh3f3mqyiw8gs9";
+          name = "transmission";
+        };
+        packageRequires = [ emacs let-alist ];
+        meta = {
+          homepage = "http://melpa.org/#/transmission";
+          license = lib.licenses.free;
+        };
+      }) {};
+    travis = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, request, s }:
+    melpaBuild {
+        pname = "travis";
+        version = "0.6.0";
+        src = fetchFromGitHub {
+          owner = "nlamirault";
+          repo = "emacs-travis";
+          rev = "c8769d3db10ed4604969049e3bd276afa0a0138e";
+          sha256 = "1jd7xsvs4m55fscp62a9lk59ip4sgifv4kazl55b7543nz1i31bz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/travis";
+          sha256 = "1km496cq1vni9gy2d3z4c9524q62750ywz745rjz4r7178ip9mix";
+          name = "travis";
+        };
+        packageRequires = [ dash pkg-info request s ];
+        meta = {
+          homepage = "http://melpa.org/#/travis";
+          license = lib.licenses.free;
+        };
+      }) {};
+    truthy = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild }:
+    melpaBuild {
+        pname = "truthy";
+        version = "0.2.8";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "truthy";
+          rev = "276a7e6b13606d28e4f2e423bb1ea30904c5def3";
+          sha256 = "18na22fhwqz80qinmnpsvp6ghc9irva1scixi6s4q6plmgr4m397";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/truthy";
+          sha256 = "1a56zmqars9fd03bkqzwpvgblq5fvq19n4jw04c4hpga92sq8wqg";
+          name = "truthy";
+        };
+        packageRequires = [ list-utils ];
+        meta = {
+          homepage = "http://melpa.org/#/truthy";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tss = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, json-mode, lib, log4e, melpaBuild, yaxception }:
+    melpaBuild {
+        pname = "tss";
+        version = "0.6.0";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "emacs-tss";
+          rev = "1f302deea3d74462c71a9c62031f48b753e8915f";
+          sha256 = "1ma3k9bbw427cj1n2gjajbqii482jhs2lgjggz9clpc21bn5wqfb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tss";
+          sha256 = "0d16x5r2xfy6mrwy0mqzpr9b3inqmyyxgawrxlfh83j1xb903dhm";
+          name = "tss";
+        };
+        packageRequires = [ auto-complete json-mode log4e yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/tss";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ttrss = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ttrss";
+        version = "1.7.5";
+        src = fetchFromGitHub {
+          owner = "pedros";
+          repo = "ttrss.el";
+          rev = "3b1e34518294a1fa6fa29355fd4e141f3fcaf3b6";
+          sha256 = "060jksd9aamqx1n4l0bb9v4icsf7cr8jkyw0mbhgyz32nmxh3v6g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ttrss";
+          sha256 = "08921cssvwpq33w87v08dafi2rz2rl1b3bhbhijn4bwjqgxi9w7z";
+          name = "ttrss";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/ttrss";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tuareg = callPackage ({ caml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tuareg";
+        version = "2.0.9";
+        src = fetchFromGitHub {
+          owner = "ocaml";
+          repo = "tuareg";
+          rev = "f97b800db79d9856c70b4988bd39bd7aa623158e";
+          sha256 = "0jpcjy2a77mywba2vm61knj26pgylsmv5a21cdp80q40bac4i6bb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tuareg";
+          sha256 = "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q";
+          name = "tuareg";
+        };
+        packageRequires = [ caml ];
+        meta = {
+          homepage = "http://melpa.org/#/tuareg";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tumble = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tumble";
+        version = "1.5";
+        src = fetchFromGitHub {
+          owner = "febuiles";
+          repo = "tumble";
+          rev = "a1db6dac5720b9f468a79e0efce04f77c0a458e3";
+          sha256 = "0ihjjw5wxz5ybl3600k937pszw3442cijs4gbqqip9vhd5y9m8gy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tumble";
+          sha256 = "1c9ybq0mb2a0pw15fmm13vfwcnr2h9fb1xsm5nrff1cg7913pgv9";
+          name = "tumble";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tumble";
+          license = lib.licenses.free;
+        };
+      }) {};
+    tup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "tup-mode";
+        version = "1.3.1";
+        src = fetchFromGitHub {
+          owner = "ejmr";
+          repo = "tup-mode";
+          rev = "945af9c8e6c402e10cd3bf8e28a9591174023d6d";
+          sha256 = "0asd024n5v23wdsg1959sszq568wg3a1bp4jrk0cllfji1z0n78y";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tup-mode";
+          sha256 = "0pzpn1ljfcc2dl9fg7jc8lmjwz2baays4axjqk1qsbj0kqbc8j0l";
+          name = "tup-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/tup-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    twilight-anti-bright-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "twilight-anti-bright-theme";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "jimeh";
+          repo = "twilight-anti-bright-theme";
+          rev = "16d4ff2606789b506f0d2f53d12f02d5b1b64f9b";
+          sha256 = "0glw5lns7hwp8jznnfm6dyjw454sv2n84gy07ma7s1q3yczhq5bc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/twilight-anti-bright-theme";
+          sha256 = "1qfybk5akaxdahmjffqaw712v8d7kk4jqkj3hzp96kys2zv1r6f9";
+          name = "twilight-anti-bright-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/twilight-anti-bright-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    twittering-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "twittering-mode";
+        version = "3.0.0";
+        src = fetchFromGitHub {
+          owner = "hayamiz";
+          repo = "twittering-mode";
+          rev = "27e7f3aab238bd0788fd3b471c645c3ceceb0f13";
+          sha256 = "193v98i84xybm3n0f30jin5q10i87vbcnbdhl4zqi7jij9p5v98z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/twittering-mode";
+          sha256 = "0v9ijxw5jazh2hc0qab48y71za2l9ryff0mpkxhr3f79irlqy0a1";
+          name = "twittering-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/twittering-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    typed-clojure-mode = callPackage ({ cider, clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "typed-clojure-mode";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "typedclojure";
+          repo = "typed-clojure-mode";
+          rev = "00bc20db78901204a67722ab47482660e36d0463";
+          sha256 = "1risfbsaafh760vnl4ryys91g4k78g0fxj2zlcndpxxv34gwkhy7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/typed-clojure-mode";
+          sha256 = "1579zkhk2lwl5ij7dm9n2drggs5fmhpljrshc4ghhvig7nlyqjy3";
+          name = "typed-clojure-mode";
+        };
+        packageRequires = [ cider clojure-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/typed-clojure-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    typo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "typo";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "jorgenschaefer";
+          repo = "typoel";
+          rev = "e72171e4eb0b9ec80b9dabc3198d137d9fb4f972";
+          sha256 = "1jhd4grch5iz12gyxwfbsgh4dmz5hj4bg4gnvphccg8dsnni05k2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/typo";
+          sha256 = "07hmqrnbxbrhcbxdls8i4786lkqmfr3hv6va41xih1lxj0mk60bx";
+          name = "typo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/typo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ubuntu-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ubuntu-theme";
+        version = "4.2";
+        src = fetchFromGitHub {
+          owner = "rocher";
+          repo = "ubuntu-theme";
+          rev = "41f09ca6c203da93bdadb2077556efd48e3b5d5a";
+          sha256 = "0k41hwb6jgv3hngfrphlyhmfhvy4k05mvn0brm64xk7lj56y8q2c";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ubuntu-theme";
+          sha256 = "160z59aaxb2v6c24nki6bn7pjm9r4jl1mgxs4h4sivzxkaw811s2";
+          name = "ubuntu-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ubuntu-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ucs-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, pcache, persistent-soft }:
+    melpaBuild {
+        pname = "ucs-utils";
+        version = "0.8.4";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "ucs-utils";
+          rev = "cbfd42f822bf5717934fa2d92060e6e24a813433";
+          sha256 = "0qw9vwl1p0pjw1xmshxar1a8kn6gmin5rdvvnnly8b5z9hpkjf3m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ucs-utils";
+          sha256 = "111fwg2cqqzpa79rcqxidppb12c8g12zszppph2ydfvkgkryb6z2";
+          name = "ucs-utils";
+        };
+        packageRequires = [ list-utils pcache persistent-soft ];
+        meta = {
+          homepage = "http://melpa.org/#/ucs-utils";
+          license = lib.licenses.free;
+        };
+      }) {};
+    undercover = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, shut-up }:
+    melpaBuild {
+        pname = "undercover";
+        version = "0.5.0";
+        src = fetchFromGitHub {
+          owner = "sviridov";
+          repo = "undercover.el";
+          rev = "068d39745304a06152c3e68a0b6772394c9e6d39";
+          sha256 = "0dmkn8qlnyvgaj7dqh82mqj1fik59zfi2yxcic9i6q9walxc3cas";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/undercover";
+          sha256 = "1s30c3i6y4r3mgrrs3lda3rrwmy9ff11ihdmshyziv9v5879sdjf";
+          name = "undercover";
+        };
+        packageRequires = [ dash emacs shut-up ];
+        meta = {
+          homepage = "http://melpa.org/#/undercover";
+          license = lib.licenses.free;
+        };
+      }) {};
+    underwater-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "underwater-theme";
+        version = "1.1.0";
+        src = fetchFromGitHub {
+          owner = "jmdeldin";
+          repo = "underwater-theme.el";
+          rev = "1fbd4ecd4538256c6c46f9638f883072c73ac927";
+          sha256 = "1g1ldyz42q3i2xlgvhd4s93cvkh0fm8m3l344zjcw8rvqaisyphj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/underwater-theme";
+          sha256 = "0ab2bcqfdi9ml3z9d511pbfwcbp8hkkd36xxp61k36gkyi3acvlr";
+          name = "underwater-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/underwater-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    unfill = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "unfill";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "unfill";
+          rev = "99388d79f971db70c5d18dab4257301f750ed907";
+          sha256 = "1qy0q1fp7cmvmxynqrb086dkb727lmk5h1k98y14j75b94ilpy0w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unfill";
+          sha256 = "0b21dk45vbz4vqdbdx0n6wx30rm38w1jjqbsxfj7b96p3i5shwqv";
+          name = "unfill";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/unfill";
+          license = lib.licenses.free;
+        };
+      }) {};
+    unicode-enbox = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, persistent-soft, string-utils, ucs-utils }:
+    melpaBuild {
+        pname = "unicode-enbox";
+        version = "0.1.4";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "unicode-enbox";
+          rev = "ff313f6778bb96481c0ee3291b07a7db46f21ff5";
+          sha256 = "0n06dvf6r7qblz8vz38qc37xrn29wa1c0jyzis1qw9zzf6hmmzj7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-enbox";
+          sha256 = "1phb2qq3pg6z6bl96kl9yfq4jxhgardjpaa4lhgqbxymmqdm7gzv";
+          name = "unicode-enbox";
+        };
+        packageRequires = [ pcache persistent-soft string-utils ucs-utils ];
+        meta = {
+          homepage = "http://melpa.org/#/unicode-enbox";
+          license = lib.licenses.free;
+        };
+      }) {};
+    unicode-fonts = callPackage ({ fetchFromGitHub, fetchurl, font-utils, lib, list-utils, melpaBuild, pcache, persistent-soft, ucs-utils }:
+    melpaBuild {
+        pname = "unicode-fonts";
+        version = "0.4.8";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "unicode-fonts";
+          rev = "a36597d83e0248bd0e6b2c1d5fb95bff72add527";
+          sha256 = "0fbwncna6gxlynq9196djpkjhayzk8kxlsxg0gasdgqx1nyxl0mk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-fonts";
+          sha256 = "0plipwb30qqay8691qzqdyg6smpbs9dsxxi49psb8sq0xnxl84q3";
+          name = "unicode-fonts";
+        };
+        packageRequires = [
+          font-utils
+          list-utils
+          pcache
+          persistent-soft
+          ucs-utils
+        ];
+        meta = {
+          homepage = "http://melpa.org/#/unicode-fonts";
+          license = lib.licenses.free;
+        };
+      }) {};
+    unicode-progress-reporter = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, persistent-soft, ucs-utils }:
+    melpaBuild {
+        pname = "unicode-progress-reporter";
+        version = "0.5.4";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "unicode-progress-reporter";
+          rev = "f4705332412b12fc72ca868b77c78465561bda75";
+          sha256 = "0qy1hla7vf674ynqdzsaw2cnk92nhpcimww5q94rc0a95pzw64wd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-progress-reporter";
+          sha256 = "03z7p27470fqy3gd356l9cpp44a35sfrxz94dxmx388rzlygk7y7";
+          name = "unicode-progress-reporter";
+        };
+        packageRequires = [ emacs pcache persistent-soft ucs-utils ];
+        meta = {
+          homepage = "http://melpa.org/#/unicode-progress-reporter";
+          license = lib.licenses.free;
+        };
+      }) {};
+    unicode-whitespace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, persistent-soft, ucs-utils }:
+    melpaBuild {
+        pname = "unicode-whitespace";
+        version = "0.2.4";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "unicode-whitespace";
+          rev = "6d29f25d46b3344c74ce289fc80b3d4fc17ed6db";
+          sha256 = "0q7cbl89yg3fjxaxsqsksxhw7ibdslbb004z5y1m579n7zgcrljy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-whitespace";
+          sha256 = "1b3jgha8va42b89pdp41sab2w9wllp7dicqg4lxl67bg6wn147wy";
+          name = "unicode-whitespace";
+        };
+        packageRequires = [ pcache persistent-soft ucs-utils ];
+        meta = {
+          homepage = "http://melpa.org/#/unicode-whitespace";
+          license = lib.licenses.free;
+        };
+      }) {};
+    unify-opening = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "unify-opening";
+        version = "1.1.0";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "unify-opening";
+          rev = "2812e43029cab7183197ce5e3c9577856bfd22c5";
+          sha256 = "1vbx10s2zmhpxjg26ik947bcg9f7w3g2w45wmm0shjp743fsdq8p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unify-opening";
+          sha256 = "1gpmklbdbmv8va8d3yr94r1ydkcyvdzcgxv56rp0bxwbcgmk0as8";
+          name = "unify-opening";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/unify-opening";
+          license = lib.licenses.free;
+        };
+      }) {};
+    unkillable-scratch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "unkillable-scratch";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "EricCrosson";
+          repo = "unkillable-scratch";
+          rev = "4451f82eb98f9b159745ca1a79ac60b9d224fd5b";
+          sha256 = "1w2w0gmyr0nbq8kv3ldj30h9xma76gi1khbdia1y30kss677rr8m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unkillable-scratch";
+          sha256 = "0ghbpa9pf7k6vd2mjxkpqg2qfl4sd40ir6mrk1rxr1rv8s0afkf7";
+          name = "unkillable-scratch";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/unkillable-scratch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "use-package";
+        version = "2.1";
+        src = fetchFromGitHub {
+          owner = "jwiegley";
+          repo = "use-package";
+          rev = "2b077f6e485e8c5c167413c03246068022b6bc71";
+          sha256 = "07vwg0bg719gb8ln1n5a33103903vvrphnkbvvfn43904pkrf14w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/use-package";
+          sha256 = "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8";
+          name = "use-package";
+        };
+        packageRequires = [ bind-key diminish ];
+        meta = {
+          homepage = "http://melpa.org/#/use-package";
+          license = lib.licenses.free;
+        };
+      }) {};
+    utop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "utop";
+        version = "1.18.1";
+        src = fetchFromGitHub {
+          owner = "diml";
+          repo = "utop";
+          rev = "59f5b9c3fcc3fa8102e8a892e21ff8a477f80872";
+          sha256 = "1azv6grd5h2r1spy996nv6q1c5l6qawv6k0dc2i5k96szl0r668r";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/utop";
+          sha256 = "0lv16kl29gc9hdcpn04l85pf7x93vkl41s4mgqp678cllzyr0cq7";
+          name = "utop";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/utop";
+          license = lib.licenses.free;
+        };
+      }) {};
+    uzumaki = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "uzumaki";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "geyslan";
+          repo = "uzumaki";
+          rev = "a75956e1757f4b98aad3384a4616481aede70cb1";
+          sha256 = "0z53n9qsglp87f6q1pa3sixrjni9k46j31zg15gcwrmflmfrw8ds";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/uzumaki";
+          sha256 = "1fvhzz2qpyc819rjvzyf42jmb70hlg7a9ybqwi81w7rydpabg61q";
+          name = "uzumaki";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/uzumaki";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vagrant = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vagrant";
+        version = "0.5.2";
+        src = fetchFromGitHub {
+          owner = "ottbot";
+          repo = "vagrant.el";
+          rev = "dabf69b7146f8a035bba15285b1fafc1e9ef4b3c";
+          sha256 = "04r73s3fhvdcryv0l57awkpg1hi3kg6zcqxbxb03jc89h0f9vdlh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vagrant";
+          sha256 = "0g6sqzsx3lixcn09fkxhhcfp45qnqgf1ms0l7nkzyljavb7151cf";
+          name = "vagrant";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/vagrant";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vbasense = callPackage ({ auto-complete, fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
+    melpaBuild {
+        pname = "vbasense";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "emacs-vbasense";
+          rev = "8c61a492d7c15218ae1a96e2aebfe6f78bfff6db";
+          sha256 = "19j5q2f6pybvjq3ryjcyihzlw348hqyjhfcy3qflry6w786dqcgn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vbasense";
+          sha256 = "1440q2bi4arpl5lbqh7zscg7v3884clqx54p2fdfcfkz47ky4z9n";
+          name = "vbasense";
+        };
+        packageRequires = [ auto-complete log4e yaxception ];
+        meta = {
+          homepage = "http://melpa.org/#/vbasense";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vcomp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vcomp";
+        version = "0.3.1";
+        src = fetchFromGitHub {
+          owner = "tarsius";
+          repo = "vcomp";
+          rev = "a12363c3a66576b68955abcadf7280de32eaa051";
+          sha256 = "07dx3dyvkwcin0gb6j4jx0ldfxs4rqhygl56a8i81yy05adkaq2x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vcomp";
+          sha256 = "02cj2nlyxvgvl2rjfgacljvcsnfm9crmmkhcm2pznj9xw10y8pq0";
+          name = "vcomp";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/vcomp";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vdirel = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, org-vcard, seq }:
+    melpaBuild {
+        pname = "vdirel";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "DamienCassou";
+          repo = "vdirel";
+          rev = "aab19692e2c2084a0d5b554a96a64a2e3e2a3d09";
+          sha256 = "034475m2d2vlrlc2l88gdx0ga3krsdh08wkjxwnbb2dfyz3p8r9v";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vdirel";
+          sha256 = "11cc7bw7x5h3bwnlsjyhw6k5fh2fk7wffarrcny562v4cmr013cj";
+          name = "vdirel";
+        };
+        packageRequires = [ emacs helm org-vcard seq ];
+        meta = {
+          homepage = "http://melpa.org/#/vdirel";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vector-utils = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vector-utils";
+        version = "0.1.2";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "vector-utils";
+          rev = "2bd63c8ade1a2b6f8aac403c5f25adda2215a685";
+          sha256 = "0lzq31zqnk32vfp3kicnvgfr3nkv8amjzxmk9nrz1kwgmq7gvkjk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vector-utils";
+          sha256 = "07armr23pq5pd47lqhir6a59r86c84zikbc51d8vfcaw8y71yr5n";
+          name = "vector-utils";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/vector-utils";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vhdl-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, ggtags, lib, melpaBuild, outshine }:
+    melpaBuild {
+        pname = "vhdl-tools";
+        version = "4.1";
+        src = fetchFromGitHub {
+          owner = "csantosb";
+          repo = "vhdl-tools";
+          rev = "bf948bddc4db144ca1b650a50e687f0a58e4d07a";
+          sha256 = "0k8wbylvws4yxh2jzxkz0fw5kwgblxvmagz54igbjj5mfm45pgsp";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vhdl-tools";
+          sha256 = "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw";
+          name = "vhdl-tools";
+        };
+        packageRequires = [ emacs ggtags outshine ];
+        meta = {
+          homepage = "http://melpa.org/#/vhdl-tools";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vim-region = callPackage ({ expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vim-region";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "ongaeshi";
+          repo = "emacs-vim-region";
+          rev = "e5359cc584a0cfa9270a76866a5eff7d3f44eb3d";
+          sha256 = "1750gx65ymibam8ahx5blfv5jc26f3mzbklk1jrmfwpsalyghdd9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vim-region";
+          sha256 = "1dcnx799lpjsdnnjxqzgskkfj2nx7f4kwf0xjhbg35ny4nyn81dx";
+          name = "vim-region";
+        };
+        packageRequires = [ expand-region ];
+        meta = {
+          homepage = "http://melpa.org/#/vim-region";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vimgolf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vimgolf";
+        version = "0.10.0";
+        src = fetchFromGitHub {
+          owner = "timvisher";
+          repo = "vimgolf";
+          rev = "9fd8aaf68bc69d1dd628de4c7cbb070e366545a9";
+          sha256 = "1f94qx8rbnn21cl0grxqa9gzkbrz68vmqsihv8vvi8qf1c1dmd0i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vimgolf";
+          sha256 = "1hvw2pfa5a984hm6wd33bf6zz6hmlprc6qs3g789dfx91qm890vn";
+          name = "vimgolf";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/vimgolf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vimish-fold = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vimish-fold";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "vimish-fold";
+          rev = "bf10662ff5d2ac2c0d0d84a87577c5425cff7639";
+          sha256 = "082qrbljlahkq1fz2dfl434f1xv47jc1v9k0srh7lrm14616dzq3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vimish-fold";
+          sha256 = "017by9w53d8pqlsazfycmhdv16yylks308p5vxp1rcw2qacpc5m3";
+          name = "vimish-fold";
+        };
+        packageRequires = [ cl-lib emacs f ];
+        meta = {
+          homepage = "http://melpa.org/#/vimish-fold";
+          license = lib.licenses.free;
+        };
+      }) {};
+    visual-fill-column = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "visual-fill-column";
+        version = "1.5";
+        src = fetchFromGitHub {
+          owner = "joostkremers";
+          repo = "visual-fill-column";
+          rev = "261e27c062fbfd59ab20c9a084c35b99bcec598d";
+          sha256 = "100w8rxdqln4xiwi0df15pvyaiyhjlwcjdh8nb0j95qpwji41vmf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/visual-fill-column";
+          sha256 = "19y0pwaybjal2rc7migdbnafpi4dfbxvrzgfqr8dlvd9q68v08y5";
+          name = "visual-fill-column";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/visual-fill-column";
+          license = lib.licenses.free;
+        };
+      }) {};
+    vlf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vlf";
+        version = "1.7";
+        src = fetchFromGitHub {
+          owner = "m00natic";
+          repo = "vlfi";
+          rev = "4eaf763cadac62d7a74f7b2d2436d7793c8f7b43";
+          sha256 = "0vl0hwxzzvgna8sysf517qq08fi1zsff3dmcgwvsgzhc47sq8mng";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vlf";
+          sha256 = "1ipkv5kmda0l39xwbf7ns9p0mx3kb781mxsm9vmbkhr5x577s2j8";
+          name = "vlf";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/vlf";
+          license = lib.licenses.free;
+        };
+      }) {};
+    voca-builder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "voca-builder";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "yitang";
+          repo = "voca-builder";
+          rev = "224402532da28e45edd398fda61ecbddb97d22d3";
+          sha256 = "0q1rwqjwqcnsr57s531pwlm464q8wx5vvdm5rj2xy9b3yi6phis1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/voca-builder";
+          sha256 = "0mbw87mpbb8rw7xzhmg6yjla2c80x9820kw4q00x00ny5rbhm76y";
+          name = "voca-builder";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/voca-builder";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wacspace = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wacspace";
+        version = "0.4.2";
+        src = fetchFromGitHub {
+          owner = "shosti";
+          repo = "wacspace.el";
+          rev = "b951995c204ff23699d2bda515a96221147a725d";
+          sha256 = "0jl3n79wmbxnrbf83qjq0v5pzhvv67i9r5sp2zj8nc86hh7dvjsd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wacspace";
+          sha256 = "1xy0mprvyi37zmgj1yrlh5ni08j47lpag1jm3a76cgghgmlfjxrl";
+          name = "wacspace";
+        };
+        packageRequires = [ cl-lib dash ];
+        meta = {
+          homepage = "http://melpa.org/#/wacspace";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wc-goal-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wc-goal-mode";
+        version = "2.1";
+        src = fetchFromGitHub {
+          owner = "bnbeckwith";
+          repo = "wc-goal-mode";
+          rev = "a8aa227b1a692dd6399855add84b5e37f6c5d9cb";
+          sha256 = "0mnfk2ys8axjh696cq5msr5cdr91icl1i3mi0dd2y00lvh6sbm7w";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wc-goal-mode";
+          sha256 = "0l3gh96njjldp7n13jn1zjrp17h7ivjak102j6wwspgg6v2h5419";
+          name = "wc-goal-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/wc-goal-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wcheck-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wcheck-mode";
+        version = "2015.11.29";
+        src = fetchFromGitHub {
+          owner = "tlikonen";
+          repo = "wcheck-mode";
+          rev = "866954f040217059607633cf4c0f5e8a1ff5fd9a";
+          sha256 = "1l92k59yvdfhmj4yghcl5bqprynavr3s28v7h8y98v82laxp2q9m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wcheck-mode";
+          sha256 = "0cmdvhgax6r5svn3wkwll4j271qj70g8182c58riwnkhiajxmn3k";
+          name = "wcheck-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/wcheck-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    weather-metno = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "weather-metno";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "ruediger";
+          repo = "weather-metno-el";
+          rev = "b59680c1ab908b32513954034ba894dfb8564dd8";
+          sha256 = "0qx92jqzsimjk92pql2h8pzhq66mqijwqgjqwp7rmq5b6k0nvx1z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/weather-metno";
+          sha256 = "0h7p4l8y75h27pgk45f0mk3gjd43jk8q97gjf85a9b0afd63d3f6";
+          name = "weather-metno";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/weather-metno";
+          license = lib.licenses.free;
+        };
+      }) {};
+    web-completion-data = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "web-completion-data";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "osv";
+          repo = "web-completion-data";
+          rev = "3685b8c7eff06a2064b4f4304e7faf00a22a920a";
+          sha256 = "1w7jnsc6lzlrlkj0nrlfnyca78lw53144hrf9k43b0g0zl8n9zqj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/web-completion-data";
+          sha256 = "1zzdmhyn6bjaidk808s4pdk25a5rn4287949ps5vbpyniaf6gny9";
+          name = "web-completion-data";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/web-completion-data";
+          license = lib.licenses.free;
+        };
+      }) {};
+    web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "web-mode";
+        version = "13.1";
+        src = fetchFromGitHub {
+          owner = "fxbois";
+          repo = "web-mode";
+          rev = "d6b865de9076b48563e6d132e97a31321af1f1bf";
+          sha256 = "00fzzjqa1v2dzlpgjxb2qj3nn6iizg177mk7vjvcv4814g4dhcal";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/web-mode";
+          sha256 = "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i";
+          name = "web-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/web-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    weblogger = callPackage ({ fetchbzr, fetchurl, lib, melpaBuild, xml-rpc }:
+    melpaBuild {
+        pname = "weblogger";
+        version = "1.4.5";
+        src = fetchbzr {
+          url = "lp:weblogger-el";
+          rev = "38";
+          sha256 = "1z7ld9d0crwdh778fyaapx75vpnlnslsh9nf07ywkylhz4w68yyv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/weblogger";
+          sha256 = "189zs1321rybgi4zihps7d2jll5z13726jsg5mi7iycg85nkv2fk";
+          name = "weblogger";
+        };
+        packageRequires = [ xml-rpc ];
+        meta = {
+          homepage = "http://melpa.org/#/weblogger";
+          license = lib.licenses.free;
+        };
+      }) {};
+    weechat = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tracking }:
+    melpaBuild {
+        pname = "weechat";
+        version = "0.2.2";
+        src = fetchFromGitHub {
+          owner = "the-kenny";
+          repo = "weechat.el";
+          rev = "f01cdd4d874cf09fee5a78d7b29eb96bc21be2be";
+          sha256 = "0f90m2s40jish4wjwfpmbgw024r7n2l5b9q9wr6rd3vdcwks3mcl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/weechat";
+          sha256 = "0sxrms5024bi4irv8x8s8j1zcyd62cpqm0zv4dgpm65wnpc7xc46";
+          name = "weechat";
+        };
+        packageRequires = [ cl-lib emacs s tracking ];
+        meta = {
+          homepage = "http://melpa.org/#/weechat";
+          license = lib.licenses.free;
+        };
+      }) {};
+    weibo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "weibo";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "austin-----";
+          repo = "weibo.emacs";
+          rev = "a8af467e5660a35342029c2796de99cd551454b2";
+          sha256 = "14vmgfz45wmpjfhfx3pfjn3bak8qvj1zk1w4xc5w1cfl6vnij6hv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/weibo";
+          sha256 = "1ndgfqqb0gvy8p2fisi57s9bsa2nrnv80smg78m89i4cwagbz6yd";
+          name = "weibo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/weibo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "which-key";
+        version = "0.8";
+        src = fetchFromGitHub {
+          owner = "justbur";
+          repo = "emacs-which-key";
+          rev = "ad60a6c7206752d9b9cf4ba17c2293dba365e9fb";
+          sha256 = "11mi23djk690n4984hk3pv61rrkdnxpkmywsqibi3xki27v2al36";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/which-key";
+          sha256 = "0vqbhfzcv9m58w41zdhpiymhgl38n15c6d7ffd99narxlkckcj59";
+          name = "which-key";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/which-key";
+          license = lib.licenses.free;
+        };
+      }) {};
+    whitaker = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "whitaker";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "Fuco1";
+          repo = "whitaker";
+          rev = "28172edce0f727f0f7f17d8ba71d5510d877bb45";
+          sha256 = "01fwhrfi92pcrwc4yn03pflc9wj07mhzj0a0i5amar4f9bj6m5b4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/whitaker";
+          sha256 = "17fnvb3jh6fi4wddn5qnp6i6ndidg8jf9ac69q9j032c2msr07nj";
+          name = "whitaker";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/whitaker";
+          license = lib.licenses.free;
+        };
+      }) {};
+    whitespace-cleanup-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "whitespace-cleanup-mode";
+        version = "0.10";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "whitespace-cleanup-mode";
+          rev = "e1e250aa6f5b1a526778c7a501cdec98ba29c0a4";
+          sha256 = "0xmwhybb8x6wwfr55ym5xg4dhy1aqx1abxy9qskn7h3zf1z4pgg2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/whitespace-cleanup-mode";
+          sha256 = "1fhdjrxxyfx4xsgfjqq9p7vhj98wmqf2r00mv8k27vdaxwsnm5p3";
+          name = "whitespace-cleanup-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/whitespace-cleanup-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    whole-line-or-region = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "whole-line-or-region";
+        version = "1.3.1";
+        src = fetchFromGitHub {
+          owner = "purcell";
+          repo = "whole-line-or-region";
+          rev = "a60e022b30c2f4d3118bcaef1adb77b90e0ca941";
+          sha256 = "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/whole-line-or-region";
+          sha256 = "1vs2i4cy1zc6nj660i9h36jbfgc3kvqivjnzlq5zwlxk5hcibqa1";
+          name = "whole-line-or-region";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/whole-line-or-region";
+          license = lib.licenses.free;
+        };
+      }) {};
+    widget-mvc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "widget-mvc";
+        version = "0.0.2";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-widget-mvc";
+          rev = "2576e6f0c35d8dedfa9c2cd6ea4fb4c14cb72b63";
+          sha256 = "0fqv63m8z5m5ghh4j8ccdnmgcdkvi4jqpg9z7lp17g4p9pq3xfjf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/widget-mvc";
+          sha256 = "0njzvdlxb7z480r6dvmksgivhz7rvnil517aj86qx0jbc5mr3l2f";
+          name = "widget-mvc";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/widget-mvc";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wiki-nav = callPackage ({ button-lock, fetchFromGitHub, fetchurl, lib, melpaBuild, nav-flash }:
+    melpaBuild {
+        pname = "wiki-nav";
+        version = "1.0.2";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "button-lock";
+          rev = "cd0bf4a3c2f224d851e6ed8a54a6e80c129b225f";
+          sha256 = "1kqcc1d56jz107bswlzvdng6ny6qwp93yck2i2j921msn62qvbb2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wiki-nav";
+          sha256 = "19mabz0y3fcqsm68ijwwbbqylxgp71anc0a31zgc1blha9jivvwy";
+          name = "wiki-nav";
+        };
+        packageRequires = [ button-lock nav-flash ];
+        meta = {
+          homepage = "http://melpa.org/#/wiki-nav";
+          license = lib.licenses.free;
+        };
+      }) {};
+    win-switch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "win-switch";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "genovese";
+          repo = "win-switch";
+          rev = "a0da96c23e8775a2dfdbe55ed3ec5b57f1ebb26a";
+          sha256 = "0ib20zl8l1fs69ca9rry27qz69sgf6ws1ca5nhm5llvpkjcgv53i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/win-switch";
+          sha256 = "1s6inp5kf763rngn58r02fd7n7z3dd55j6hb7s9dgvc856d5z3my";
+          name = "win-switch";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/win-switch";
+          license = lib.licenses.free;
+        };
+      }) {};
+    window-end-visible = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "window-end-visible";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "rolandwalker";
+          repo = "window-end-visible";
+          rev = "bdc3d182e5f76e75f1b8cc49357194b36e48b67c";
+          sha256 = "049bwa5g0z1b9nrsc1vc4511aqcq9fvl16xg493wj651g6q9qigb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-end-visible";
+          sha256 = "1p78n7yysj18404cdc6vahfrzwn5pixyfnja8ch48rj4fm4jbxwq";
+          name = "window-end-visible";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/window-end-visible";
+          license = lib.licenses.free;
+        };
+      }) {};
+    window-layout = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "window-layout";
+        version = "1.3";
+        src = fetchFromGitHub {
+          owner = "kiwanami";
+          repo = "emacs-window-layout";
+          rev = "9caf5be4ff1b5d1e141783d7133dab7a46424fef";
+          sha256 = "0jyymmbz03zj2ydca1rv6ra0b2brjl7pyl4897zd00j5kvqjdyif";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-layout";
+          sha256 = "1n4a6z00lxsffirjrmbaaw432w798b9vv34qawgn1k17y9l7gb85";
+          name = "window-layout";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/window-layout";
+          license = lib.licenses.free;
+        };
+      }) {};
+    window-numbering = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "window-numbering";
+        version = "1.1.2";
+        src = fetchFromGitHub {
+          owner = "nschum";
+          repo = "window-numbering.el";
+          rev = "653afce73854d629c2b9d63dad73126032d6a24c";
+          sha256 = "1rz2a1l3apavsknlfy0faaivqgpj4x9jz3hbysbg9pydpcwqgf64";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-numbering";
+          sha256 = "0x3n0ni16q69lfpyjz61spqghmhvc3cwa4aj80ihii3pk80f769x";
+          name = "window-numbering";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/window-numbering";
+          license = lib.licenses.free;
+        };
+      }) {};
+    window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }:
+    melpaBuild {
+        pname = "window-purpose";
+        version = "1.4";
+        src = fetchFromGitHub {
+          owner = "bmag";
+          repo = "emacs-purpose";
+          rev = "7e492cbdd4259a177625a3f47001d7281f295349";
+          sha256 = "08j0akwjp4arkw3zm0lazb13f6dq0m8y9k9nmypd7xk0m77byymd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-purpose";
+          sha256 = "1ib5ia7armghvmcw8qywcil4nxzwwakmfsp7ybawb0xr53h1w96d";
+          name = "window-purpose";
+        };
+        packageRequires = [ cl-lib emacs imenu-list let-alist ];
+        meta = {
+          homepage = "http://melpa.org/#/window-purpose";
+          license = lib.licenses.free;
+        };
+      }) {};
+    windsize = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "windsize";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "grammati";
+          repo = "windsize";
+          rev = "014b0836f9ffe45fa7e0ccc84576fbef74815a59";
+          sha256 = "1f4v0xd341qs4kfnjqhgf8j26valvg6pz4rwcz0zj0s23niy2yil";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/windsize";
+          sha256 = "1xhfw77168942rcn246qndii0hv0q6vkgzj67jg4mxh8n46m50m9";
+          name = "windsize";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/windsize";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wisp-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wisp-mode";
+        version = "0.9.0";
+        src = fetchhg {
+          url = "https://bitbucket.com/ArneBab/wisp";
+          rev = "34fc6f12d740";
+          sha256 = "0ppj8mrlc20i2syyiwvj5rp53swrm929h0ksxxlqvn3nvl9gsajd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wisp-mode";
+          sha256 = "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc";
+          name = "wisp-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/wisp-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wispjs-mode = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wispjs-mode";
+        version = "0.2.0";
+        src = fetchFromGitHub {
+          owner = "krisajenkins";
+          repo = "wispjs-mode";
+          rev = "be094c3c3223c07b26b5d8bb8fa7aa6866369b3f";
+          sha256 = "188h1sy4mxzrkwi3zgiw108c5f71rkj5agdkf9yy9v8c1bkawm4x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wispjs-mode";
+          sha256 = "0qzm0dcvjndasnbqpkdc56f1qv66gxv8dfgfcwq5l1bp5wyx813p";
+          name = "wispjs-mode";
+        };
+        packageRequires = [ clojure-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/wispjs-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "with-editor";
+        version = "2.4.0";
+        src = fetchFromGitHub {
+          owner = "magit";
+          repo = "magit";
+          rev = "2e757a8c919b53edddb186e36e055e011e3b0ab3";
+          sha256 = "0hklwwzi2gqywysxn16ps1fvn48max52cpk2nx7r4df4h52yk6wn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/with-editor";
+          sha256 = "042fa55yakdn2di4l5dilnmqpslac46wpr1zpl4xk3v3i4nn9ndv";
+          name = "with-editor";
+        };
+        packageRequires = [ async dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/with-editor";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wn-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wn-mode";
+        version = "1.4";
+        src = fetchFromGitHub {
+          owner = "luismbo";
+          repo = "wn-mode";
+          rev = "6e7029b0d5773a79914a289937be068784931cad";
+          sha256 = "0nmzh6dynbm8vglp4pqz81s2z68jbnasvamvi1x1iawf8g9zfyix";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wn-mode";
+          sha256 = "1qy1pkfdnm4pska4cnff9cx2c812ilymajhpmsfc9jdbvhzwrwg3";
+          name = "wn-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/wn-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wonderland = callPackage ({ dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multi }:
+    melpaBuild {
+        pname = "wonderland";
+        version = "0.1.1";
+        src = fetchFromGitHub {
+          owner = "kurisuwhyte";
+          repo = "emacs-wonderland";
+          rev = "28cf6b37000c395ece9519db53147fb826a42bc4";
+          sha256 = "018r35dz8z03wcrx9s28pjisayy21549i232mp6wy9mxkrkxbzpc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wonderland";
+          sha256 = "1b4p49mbzqffm2b2y8sbbi56vnkxap2jscsmla9l6l8brybqjppi";
+          name = "wonderland";
+        };
+        packageRequires = [ dash dash-functional emacs multi ];
+        meta = {
+          homepage = "http://melpa.org/#/wonderland";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wordsmith-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wordsmith-mode";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "istib";
+          repo = "wordsmith-mode";
+          rev = "41b10f2fe3589da9812395cb417c3dcf906f0969";
+          sha256 = "0s3mjmfjiidn3spklndw0dvcwbb9x034xyphp60aad8vjaflbchs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wordsmith-mode";
+          sha256 = "1570h1sjjaks6bnhd4xrbx6nna4v7hz6dmrzwjq37rwvallasg1n";
+          name = "wordsmith-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/wordsmith-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wrap-region = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wrap-region";
+        version = "0.7.3";
+        src = fetchFromGitHub {
+          owner = "rejeep";
+          repo = "wrap-region";
+          rev = "5a910ad23ebb0649e644bf62ad042587341da5da";
+          sha256 = "03hjwm51sngkh7jjiwnqhflllqq6i99ib47rm2ja9ii0qyhj1qa0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wrap-region";
+          sha256 = "0mby3m49vm2pw127divspgivqam27zd4r70wx5ra05xwfxywaibq";
+          name = "wrap-region";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/wrap-region";
+          license = lib.licenses.free;
+        };
+      }) {};
+    writegood-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "writegood-mode";
+        version = "2.0.2";
+        src = fetchFromGitHub {
+          owner = "bnbeckwith";
+          repo = "writegood-mode";
+          rev = "4302169c1563cab9319745083f9b9a7f5f4af0bd";
+          sha256 = "1nnjn1r669hvvzfycllwap4w04m8rfsk4nzcg8057m1f263kj31b";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/writegood-mode";
+          sha256 = "1lxammisaj04g5vr5lwms64ywf39w8knrq72x4i94wwzwx5ywi1d";
+          name = "writegood-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/writegood-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    writeroom-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, visual-fill-column }:
+    melpaBuild {
+        pname = "writeroom-mode";
+        version = "3.1";
+        src = fetchFromGitHub {
+          owner = "joostkremers";
+          repo = "writeroom-mode";
+          rev = "48b179879c6614afcae3fc4386fd88b52b2bcc17";
+          sha256 = "0f554h834p12255mhwjnxbh1ls65476k60cwddqyl844ph75w8jv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/writeroom-mode";
+          sha256 = "1kpsrp3agw8bg3qbf5rf5k1a7ww30q5xsa8z5ywxajsaywjzx1bk";
+          name = "writeroom-mode";
+        };
+        packageRequires = [ emacs visual-fill-column ];
+        meta = {
+          homepage = "http://melpa.org/#/writeroom-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ws-butler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ws-butler";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "lewang";
+          repo = "ws-butler";
+          rev = "106d313c0dad532c2da3cc78770a8a2f0396aa85";
+          sha256 = "1lv0l27lrp6xyl0c5yhlnyjwx872izq02z8x34da9jv3walxpk8f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ws-butler";
+          sha256 = "072k67z2lx0ampwzdiszi64xs0w6frp4nbmrd2r0wpx0pd211vbn";
+          name = "ws-butler";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/ws-butler";
+          license = lib.licenses.free;
+        };
+      }) {};
+    wsd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "wsd-mode";
+        version = "0.4.2";
+        src = fetchFromGitHub {
+          owner = "josteink";
+          repo = "wsd-mode";
+          rev = "a6f58e1c47587cb8f0bd8d1fc280cf8605732883";
+          sha256 = "0qfbf9xmln60yd0na1508xmxkvnx0pis4dvbf16cjv0i41dq6i87";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wsd-mode";
+          sha256 = "07vclmnj18wx9wlrcnsl99f9jlk3sb9g6pcdv8x1smk84gccpakc";
+          name = "wsd-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/wsd-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    x86-lookup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "x86-lookup";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "skeeto";
+          repo = "x86-lookup";
+          rev = "cac42bd9f27bff92e0b1cf6fb20563061885239f";
+          sha256 = "13id1vf590gc0kwkhh6mgq2gj2bra2kycxjlvql7v0s7cdvamjhq";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/x86-lookup";
+          sha256 = "1clv1npvdkzsy0a08xrb880yflwzl4d5cc2c5xrs7b837mqpj8hd";
+          name = "x86-lookup";
+        };
+        packageRequires = [ cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/x86-lookup";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xbm-life = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xbm-life";
+        version = "0.1.3";
+        src = fetchFromGitHub {
+          owner = "wasamasa";
+          repo = "xbm-life";
+          rev = "bde2b3730a02d237f7d95a8e3f3722f23f2d9201";
+          sha256 = "154xnfcmil9xjjmq4cyrfpir4ga4mgcmmbd7dja1m7rpk1734xk6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xbm-life";
+          sha256 = "1pglxjd4cs630sayx17ai1xflpbyj3hry3156682bgwhqs1vw68q";
+          name = "xbm-life";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/xbm-life";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xcscope = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xcscope";
+        version = "1.1";
+        src = fetchFromGitHub {
+          owner = "dkogan";
+          repo = "xcscope.el";
+          rev = "4775aae4ce4caa92fb8b752907d7b66b96ccbe03";
+          sha256 = "1n1msmqap4a2qnjwrchf9cjkzcl20hbrx0vsc4lkbvq3p5riv5p7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xcscope";
+          sha256 = "06xh29cm5v3b5xwj32y0i0h0kvvy995840db4hvab2wn9jw68m8w";
+          name = "xcscope";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/xcscope";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xquery-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xquery-tool";
+        version = "0.1.3";
+        src = fetchFromGitHub {
+          owner = "paddymcall";
+          repo = "xquery-tool.el";
+          rev = "248db2c5bace1232508ad69a5616205dda92d5cf";
+          sha256 = "1yxf0byq6d4cl3g25q4f2fqp4x9zpz1hm74yg9v1nr0lk5sgas95";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xquery-tool";
+          sha256 = "069injmvv9zzcbqbms94qx5wjj740jnik6sf3b4xjhln7z1yskp0";
+          name = "xquery-tool";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/xquery-tool";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xterm-color = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xterm-color";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "atomontage";
+          repo = "xterm-color";
+          rev = "380cc8c6c6969f8a262ad4ddc61117691db7f4d1";
+          sha256 = "1zdj4664gvwc4kyx7fx5232l3c5anm0xyrrnrw596q604q6xxj2x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xterm-color";
+          sha256 = "0bvzi1mkxgm4vbq2va1sr0k9h3fdmppq79hkvbizc2xgk72sazpj";
+          name = "xterm-color";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/xterm-color";
+          license = lib.licenses.free;
+        };
+      }) {};
+    xtest = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xtest";
+        version = "1.1.0";
+        src = fetchFromGitHub {
+          owner = "promethial";
+          repo = "xtest";
+          rev = "b227414d714e7baddef79bd306a43024b9a34d45";
+          sha256 = "1wqx6hlqcmqiljydih5fx89dw06g8w728pyn4iqsap8jwgjngb09";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xtest";
+          sha256 = "1vbs4sb4frzg8d3l96ip9cc6lc86nbj50vpdfqazvxmdfd1sg4i7";
+          name = "xtest";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/xtest";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yafolding = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yafolding";
+        version = "0.1.4";
+        src = fetchFromGitHub {
+          owner = "zenozeng";
+          repo = "yafolding.el";
+          rev = "9b5a3f1b8dff6ddaf6369681820753afbbd1f388";
+          sha256 = "1rplafm6mldsirj7xg66vsx03n263yii3il3fkws69xmv7sx1a6i";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yafolding";
+          sha256 = "1z70ismfwmh9a83a7h5lbhw7iywfib5fis7y8gx8020wfjq9g2yq";
+          name = "yafolding";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/yafolding";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yagist = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yagist";
+        version = "0.8.12";
+        src = fetchFromGitHub {
+          owner = "mhayashi1120";
+          repo = "yagist.el";
+          rev = "97723a34750ccab5439eb9f6a2f67e4e0e234167";
+          sha256 = "0l9b888wv72j4hhkcfzsh09iqjxp2qjbjcjcfmvfhxf7il11pv8h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yagist";
+          sha256 = "1mz86fq0pb4w54c66vd19m2492mkrzq2qi6ssnn2xwmn8vv02wdd";
+          name = "yagist";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/yagist";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yaml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yaml-mode";
+        version = "0.0.12";
+        src = fetchFromGitHub {
+          owner = "yoshiki";
+          repo = "yaml-mode";
+          rev = "a817e46cc55eb90b7e1dd7cff74e43e080f0f690";
+          sha256 = "1mj1gwrflpdlmc7wl1axygn1jqlrjys1dh3cpdh27zrgsjvhd6c1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yaml-mode";
+          sha256 = "0afp83xcr8h153cayyaszwkgpap0iyk351dlykmv6bv9d2m774mc";
+          name = "yaml-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/yaml-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yascroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yascroll";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "m2ym";
+          repo = "yascroll-el";
+          rev = "0a8b531b3a3c8afe7235c8c212e08bfe2021a629";
+          sha256 = "007837w6gd7k253h7g2in6l3ihcbwv733yiffs26pnymgk21xdqz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yascroll";
+          sha256 = "11g7wn4hgdwnx3n7ra0sh8gk6rykwvrg9g2cihvcv7mjbqgcv53f";
+          name = "yascroll";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/yascroll";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yasnippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yasnippet";
+        version = "0.9.0.1";
+        src = fetchFromGitHub {
+          owner = "capitaomorte";
+          repo = "yasnippet";
+          rev = "be2f815c43deb74e0f809ed47debc4aa2e67ea1e";
+          sha256 = "04cqcv10i6mym8j9fhd4fklmwa1q4nfg99kpp0bwx7issqhziqv5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yasnippet";
+          sha256 = "1j6hcpzxljz1axh0xfbwr4ysbixkwgxawsvsgicls8r8kl2xvjvf";
+          name = "yasnippet";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/yasnippet";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yatemplate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "yatemplate";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "mineo";
+          repo = "yatemplate";
+          rev = "a49a218b6fcfbbf6e51021be78aee6d3b220e3f6";
+          sha256 = "1yplaj7pry43qps8hvqxj9983ah4jvaiq94l171a7f8qi28386s8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yatemplate";
+          sha256 = "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q";
+          name = "yatemplate";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/yatemplate";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yatex = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
+        pname = "yatex";
+        version = "1.78";
+        src = fetchhg {
+          url = "https://www.yatex.org/hgrepos/yatex/";
+          rev = "e78a87bc2c9e";
+          sha256 = "08iwfpsjs36pqr2l85avxhsjx8z0sdfw8cqwwf3brn7i4x67f7z5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yatex";
+          sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6";
+          name = "yatex";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/yatex";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yaxception = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "yaxception";
+        version = "0.3.3";
+        src = fetchFromGitHub {
+          owner = "aki2o";
+          repo = "yaxception";
+          rev = "4e94cf3e0b9b5631b0e90eb4b7de597ee7185875";
+          sha256 = "0nqyn1b01v1qxv7rcf46qypca61lmpm8d7kqv63jazw3n05qdnj8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yaxception";
+          sha256 = "18n2kjbgfhkhcwigxmv8dk72jp57vsqqd20lc26v5amx6mrhgh58";
+          name = "yaxception";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/yaxception";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ycmd = callPackage ({ dash, deferred, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    melpaBuild {
+        pname = "ycmd";
+        version = "0.9";
+        src = fetchFromGitHub {
+          owner = "abingham";
+          repo = "emacs-ycmd";
+          rev = "8fb29b84d42c0aea71fe7db088b0b7a5a0c6b34c";
+          sha256 = "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ycmd";
+          sha256 = "06psmcr5132vn72l0amzj14dy43aradnbmlvvms55srvici6r60q";
+          name = "ycmd";
+        };
+        packageRequires = [ dash deferred emacs f popup ];
+        meta = {
+          homepage = "http://melpa.org/#/ycmd";
+          license = lib.licenses.free;
+        };
+      }) {};
+    yesql-ghosts = callPackage ({ cider, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "yesql-ghosts";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "magnars";
+          repo = "yesql-ghosts";
+          rev = "bd834e97f263f9f981758c1462bc6297a83ca852";
+          sha256 = "0yvz7lmid4jcikb9jmc7h2lcry3fdyy809k25nyasj2bk41xqqsd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yesql-ghosts";
+          sha256 = "1hxzbnfd15f0ifdqjbw9nhxd0z46x705v2bc0xl71nav78fgpswf";
+          name = "yesql-ghosts";
+        };
+        packageRequires = [ cider dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/yesql-ghosts";
+          license = lib.licenses.free;
+        };
+      }) {};
+    youdao-dictionary = callPackage ({ chinese-word-at-point, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names, popup }:
+    melpaBuild {
+        pname = "youdao-dictionary";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "xuchunyang";
+          repo = "youdao-dictionary.el";
+          rev = "5b4f716ca41fa0cdb18a4949ac5cdcd470182c57";
+          sha256 = "0016qff7hdnd0xkyhxakfzzscwlwkpzppvc4wxfw0iacpjkz1fnr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/youdao-dictionary";
+          sha256 = "1qfk7s18br9jask1bpida0cjxks098qpz0ssmw8misi3bjax0fym";
+          name = "youdao-dictionary";
+        };
+        packageRequires = [ chinese-word-at-point emacs names popup ];
+        meta = {
+          homepage = "http://melpa.org/#/youdao-dictionary";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zenburn-theme";
+        version = "2.3";
+        src = fetchFromGitHub {
+          owner = "bbatsov";
+          repo = "zenburn-emacs";
+          rev = "ad938d2322b417783889ee3885adff012ab49f7b";
+          sha256 = "0bgq34k7p9qkxhrg7dvmkfpi1r47czyw12l0cm93z3m817z5hjrk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zenburn-theme";
+          sha256 = "1kb371j9aissj0vy07jw4ydfn554blc8b2rbi0x1dvfksr2rhsn9";
+          name = "zenburn-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/zenburn-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zerodark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zerodark-theme";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "NicolasPetton";
+          repo = "zerodark-theme";
+          rev = "5f7e16b35b2b42e4a286ca0cece4766a69cd7321";
+          sha256 = "1pxy6ia7di3i5kigybkz78f7fgbsyr1js9asrfbbx3kkpxpm2vfc";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zerodark-theme";
+          sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9";
+          name = "zerodark-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/zerodark-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zombie-trellys-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zombie-trellys-mode";
+        version = "0.2.1";
+        src = fetchFromGitHub {
+          owner = "david-christiansen";
+          repo = "zombie-trellys-mode";
+          rev = "9e99d444a387dd1634cab62ef802683f5bf5d907";
+          sha256 = "1ksjd3askc3k1l0b3nia5mzkxa74bidh2x0xlrj4qs4im5445vnz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zombie-trellys-mode";
+          sha256 = "19xzvppw7f35s82hm0y7sga8dyjjyy0dxy6vji4hxdpjziz7lggv";
+          name = "zombie-trellys-mode";
+        };
+        packageRequires = [ cl-lib emacs haskell-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/zombie-trellys-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zone-nyan = callPackage ({ esxml, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zone-nyan";
+        version = "0.2.2";
+        src = fetchFromGitHub {
+          owner = "wasamasa";
+          repo = "zone-nyan";
+          rev = "e36875d83ad3dce14f23864688959fa0d98ba410";
+          sha256 = "1lrgirfvcvbir7csshkhhwj99jj1x5aprhw7xfiicv7nan9m6gjy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zone-nyan";
+          sha256 = "165sgjaahz038isii971m02hr2g5iqhbhiwf5kdn8c739cjaa17b";
+          name = "zone-nyan";
+        };
+        packageRequires = [ esxml ];
+        meta = {
+          homepage = "http://melpa.org/#/zone-nyan";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zoom-window = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zoom-window";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "syohex";
+          repo = "emacs-zoom-window";
+          rev = "d92dcf265170cf8ea0294d1aaf2e6025eda228e6";
+          sha256 = "1dwf3980rnwc85s73j8accwgpcdhsa6fqdrppbrqb8f7c05q8303";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zoom-window";
+          sha256 = "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3";
+          name = "zoom-window";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/zoom-window";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zop-to-char = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zop-to-char";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "thierryvolpiatto";
+          repo = "zop-to-char";
+          rev = "7888bb6f09ae24e8e10bd3095edd31940e6a1c46";
+          sha256 = "0j6x3az8vpq2ggafjxdl8x3ln7lhh58c27z72mwywp4a2ca1g496";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zop-to-char";
+          sha256 = "0jnspvqqvnaplld083j7cqqxw122qazh88ab7hymci36m3ka9hga";
+          name = "zop-to-char";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/zop-to-char";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zotelo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zotelo";
+        version = "1.3";
+        src = fetchFromGitHub {
+          owner = "vitoshka";
+          repo = "zotelo";
+          rev = "56eaaa76f80bd15710e68af4a1e585394af987d3";
+          sha256 = "0qwdbzfi8mddmchdd9ab9ms1ynlc8dx08i6g2mf3za1sbcivdqsr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zotelo";
+          sha256 = "0ai516lqj9yw7ymvfm4n5inv53sp6mg90wy56lr1laflizwxzg8z";
+          name = "zotelo";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/zotelo";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zygospore = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zygospore";
+        version = "0.0.3";
+        src = fetchFromGitHub {
+          owner = "louiskottmann";
+          repo = "zygospore.el";
+          rev = "1af5ee663f5a7aa08d96a77cacff834dcdf55ea8";
+          sha256 = "0v73fgb0gf81vlihiicy32v6x86rr2hv0bxlpw7d3pk4ng1a0l3z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zygospore";
+          sha256 = "03mmxqbliwd1g73cxd9kqkngdy4jdavcs6j12b4wp27xmhgaj40z";
+          name = "zygospore";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/zygospore";
+          license = lib.licenses.free;
+        };
+      }) {};
+    zzz-to-char = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zzz-to-char";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "zzz-to-char";
+          rev = "82dc3382e58091ae32160a91e8c781b813faf856";
+          sha256 = "1hif9jrp4w7xvca0a4qm29scpkwhf5n61c4i5x8n5p7gbwjhh98q";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zzz-to-char";
+          sha256 = "16vwp0krshmn5x3ry1j512g4kydx39znjqzri4j7wgg49bz1n7vh";
+          name = "zzz-to-char";
+        };
+        packageRequires = [ avy cl-lib emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/zzz-to-char";
+          license = lib.licenses.free;
+        };
+      }) {};
+  }
\ No newline at end of file
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.json b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.json
deleted file mode 100644
index ca70c6e6b37a..000000000000
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.json
+++ /dev/null
@@ -1,20813 +0,0 @@
-{
-    "qiita": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gongo",
-            "repo": "qiita-el",
-            "sha256": "110z27n3h7p2yalicfhnv832ikfcf7p0hrf5qkryz1sdmz79wb3f",
-            "rev": "33b6d3450bb4b3d0186c2475f6c78269c71fd1ff"
-        },
-        "recipe": {
-            "sha256": "1kzk7pc68ks9gxm2l2d28al23gxh56z0cmkl80qwg7sh4gsmhyxl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.1",
-        "deps": []
-    },
-    "outorg": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tj64",
-            "repo": "outorg",
-            "sha256": "1v9kx5xr7xcr6i664h2g6j8824yjsjdn5pvgmawvxrrplbjmiqnp",
-            "rev": "e946cda497bae53fca6fa1579910237e216170bf"
-        },
-        "recipe": {
-            "sha256": "04swss84p33a9baa4swqc1a9lfp6wziqrwa7vcyi3y0yzllx36cx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.0",
-        "deps": []
-    },
-    "helm-ls-hg": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-helm",
-            "repo": "helm-ls-hg",
-            "sha256": "1hma79i69l8ilkr3l4b8zqk3ny62vqr1ym2blymia4ibwk4zqbda",
-            "rev": "fa709b6354d84e1c88ccef096d29410fa16f7f5f"
-        },
-        "recipe": {
-            "sha256": "0ca0xn7n8bagxb504xgkcv04rpm1vxhx2m77biqrx5886pwl25bh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.7.8",
-        "deps": [
-            "helm"
-        ]
-    },
-    "color-theme-sanityinc-tomorrow": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "color-theme-sanityinc-tomorrow",
-            "sha256": "0w99ypq048xldl1mrgc7qr4n2770dm48aknhp7q0176l43nvxnqf",
-            "rev": "55db9979397bd66446eb1927e08c5a22df9f0eea"
-        },
-        "recipe": {
-            "sha256": "1k8iwjc7iidq5sxybs47rnswa6c5dwqfdzfw7w0by2h1id2z6nqd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.16",
-        "deps": []
-    },
-    "focus": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "larstvei",
-            "repo": "Focus",
-            "sha256": "0aj5qxzlfxxp7z27fiw9bvir5yi2zj0xzj5kbh17ix4wnhi03bhc",
-            "rev": "0a6e9624ea5607dadd0f2cd4d3eaa2b10b788eb9"
-        },
-        "recipe": {
-            "sha256": "0jw26j8npyl3dgsrs7ap2djxmkafn2hl6gfqvi7v76bccs4jkyv8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "buffer-move": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lukhas",
-            "repo": "buffer-move",
-            "sha256": "0xdks4jfqyhkh34y48iq3gz8swp0f526kwnaai5mhgvazvs4za8c",
-            "rev": "9bf3ff940011c7af3fdd172fa3ea2511c7a8a190"
-        },
-        "recipe": {
-            "sha256": "0wysywff2bggrha7lpl83c8x6ln7zgdj9gsqmjva6gramqb260fg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.2",
-        "deps": []
-    },
-    "youdao-dictionary": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xuchunyang",
-            "repo": "youdao-dictionary.el",
-            "sha256": "0016qff7hdnd0xkyhxakfzzscwlwkpzppvc4wxfw0iacpjkz1fnr",
-            "rev": "5b4f716ca41fa0cdb18a4949ac5cdcd470182c57"
-        },
-        "recipe": {
-            "sha256": "1qfk7s18br9jask1bpida0cjxks098qpz0ssmw8misi3bjax0fym",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "chinese-word-at-point",
-            "emacs",
-            "names",
-            "popup"
-        ]
-    },
-    "emacsql": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "emacsql",
-            "sha256": "0ph0462shk00rhrkpvwgsr4biykimky2d89pvkbg377951jdga7i",
-            "rev": "03d478870834a683f433e7f0e288476748eec624"
-        },
-        "recipe": {
-            "sha256": "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.0.0",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "finalize"
-        ]
-    },
-    "cmake-ide": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "atilaneves",
-            "repo": "cmake-ide",
-            "sha256": "14z5izpgby7lak6hzjwsph31awg5126hcjzld21ihknhlg09sw7q",
-            "rev": "b6953102d022adb60678eb5c4186008de987cdce"
-        },
-        "recipe": {
-            "sha256": "0xvy7l80zw67jgvk1rkhwzjvsqjqckmd8zj6s67rgbm56z6ypmcg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "jammer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wasamasa",
-            "repo": "jammer",
-            "sha256": "0x0vz7m9kn7b2aiqvrdqx8qh84ynbpzy2asz2b18l47bcwa7r5bh",
-            "rev": "1ba232b71507b468c60dc53c2bc8888bef36c858"
-        },
-        "recipe": {
-            "sha256": "01c4bii7gswhp6z9dgx4bhvsywiwbbdv7mg1zj6vp1530l74zx6z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": []
-    },
-    "go-eldoc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-go-eldoc",
-            "sha256": "0ha07nhd2g43l84r1r5dz6c8m3fmmn4bx5mhvi6as33achhip7bn",
-            "rev": "af6bfdcbcf12c240da46412efb381a5ee6c3aec5"
-        },
-        "recipe": {
-            "sha256": "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.26",
-        "deps": [
-            "cl-lib",
-            "go-mode"
-        ]
-    },
-    "cerbere": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nlamirault",
-            "repo": "cerbere",
-            "sha256": "08hqgsjvs62l1cfzshbpj80xd8365qmx2b5r5jq20d5cj68s36wl",
-            "rev": "11de1e7ec5126083ae697f5a9993facdb9895f9d"
-        },
-        "recipe": {
-            "sha256": "1g3svmh5dlh5mvyag3hmiy90dfkk6f7ppd9qpwckxqyll9vl7r06",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "f",
-            "go-mode",
-            "pkg-info",
-            "s"
-        ]
-    },
-    "grandshell-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "steckerhalter",
-            "repo": "grandshell-theme",
-            "sha256": "1202fwwwdr74q6s5jv1n0mvmq4n9mra85l14hdhwh2kks513s6vs",
-            "rev": "6bf34fb1a3117244629a7fb23daf610f50854bed"
-        },
-        "recipe": {
-            "sha256": "1mnnjsw1kx40b6ws8wmk25fz9rq8rd70xia9cjpwdfkg7kh8xvsa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "mmt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mrkkrp",
-            "repo": "mmt",
-            "sha256": "05nmcx3f63ds31cj3qwwp03ksflkfwlcn3z2xyxbny83r0dxbgvc",
-            "rev": "e77b809e39b9ab437b662ee759e990163bc89377"
-        },
-        "recipe": {
-            "sha256": "0hal3qcw6x9658xpdaw6q9l2rr2z107pvg5bdzshf67p1b3lf9dq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "vimish-fold": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mrkkrp",
-            "repo": "vimish-fold",
-            "sha256": "082qrbljlahkq1fz2dfl434f1xv47jc1v9k0srh7lrm14616dzq3",
-            "rev": "bf10662ff5d2ac2c0d0d84a87577c5425cff7639"
-        },
-        "recipe": {
-            "sha256": "017by9w53d8pqlsazfycmhdv16yylks308p5vxp1rcw2qacpc5m3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.1",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "f"
-        ]
-    },
-    "stripe-buffer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sabof",
-            "repo": "stripe-buffer",
-            "sha256": "035ym1c1vzg6hjsnd258z4dkrfc11lj4c0y4gpgybhk54dq3w9dk",
-            "rev": "d9f009b92cf16fe2c40cd92b8f842a3872e6c190"
-        },
-        "recipe": {
-            "sha256": "02wkb9y6vykrn6a5nfnimaplj7ig8i8h6m2rvwv08f5ilbccj16a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.5",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "web-completion-data": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "osv",
-            "repo": "web-completion-data",
-            "sha256": "1w7jnsc6lzlrlkj0nrlfnyca78lw53144hrf9k43b0g0zl8n9zqj",
-            "rev": "3685b8c7eff06a2064b4f4304e7faf00a22a920a"
-        },
-        "recipe": {
-            "sha256": "1zzdmhyn6bjaidk808s4pdk25a5rn4287949ps5vbpyniaf6gny9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "slime-company": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "anwyn",
-            "repo": "slime-company",
-            "sha256": "0rdhd6kymbzhkc96dxy3nr21ajrkc7iy6zvq1va22r90f96jj9x4",
-            "rev": "b4a770b1c1e9638f13e339e7debbdb3b25217e39"
-        },
-        "recipe": {
-            "sha256": "195s5fi2dl3h2jyy4d45q22jac35sciz81n13b4lgw94mkxx4rq2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.1",
-        "deps": [
-            "company",
-            "slime"
-        ]
-    },
-    "flymake-php": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-php",
-            "sha256": "0dzyid0av9icp77wv0zcsygpw46z24qibq1ra0iwnkzl3kqvkyzh",
-            "rev": "91f867e209011af31a2ca2d8f6874b994403bcb2"
-        },
-        "recipe": {
-            "sha256": "12ds2l5kvs7fz38syp4amasbjkpqd36rlpajnb3xxll0hbk6vffk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "jade-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "brianc",
-            "repo": "jade-mode",
-            "sha256": "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n",
-            "rev": "4e7a20db492719062f40b225ed730ed50be5db56"
-        },
-        "recipe": {
-            "sha256": "156j0d9wx6hrhph0nsjsi1jha4h65rcbrbff1j2yr8vdsszjrs94",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": []
-    },
-    "smart-mode-line-powerline-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "smart-mode-line",
-            "sha256": "0yvlmwnhdph5qj1998jz0idcl7901j6fxa9hivr7kic57j8kbq71",
-            "rev": "d98b985c44b2c771cac1eea758f21e16e169a8a0"
-        },
-        "recipe": {
-            "sha256": "0hv3mx39m3l35xhz351zp98321ilr6qq9wzwn1f0ziiv814khcn4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.9",
-        "deps": [
-            "emacs",
-            "powerline",
-            "smart-mode-line"
-        ]
-    },
-    "unfill": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "unfill",
-            "sha256": "1qy0q1fp7cmvmxynqrb086dkb727lmk5h1k98y14j75b94ilpy0w",
-            "rev": "99388d79f971db70c5d18dab4257301f750ed907"
-        },
-        "recipe": {
-            "sha256": "0b21dk45vbz4vqdbdx0n6wx30rm38w1jjqbsxfj7b96p3i5shwqv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "org-page": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kelvinh",
-            "repo": "org-page",
-            "sha256": "0zc20m63a1iz9aziid5jsvcbl86k9dg9js4k3almchh55az4a0i3",
-            "rev": "09febf89d8dcb226aeedf8164169b31937b64439"
-        },
-        "recipe": {
-            "sha256": "1326m3w7vz22zk7rx40z28fddsccy5fl1qhbb7clci8l69blcc2v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.41",
-        "deps": [
-            "ht",
-            "htmlize",
-            "mustache",
-            "org"
-        ]
-    },
-    "grails-projectile-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yveszoundi",
-            "repo": "grails-projectile-mode",
-            "sha256": "1rv6klh59y70shc7kwdzlksdzmy0881ss49c0h5m93cn5pd6aj1l",
-            "rev": "e6667dc737cdb224bbadc70a5fcfb82d0fce6f8f"
-        },
-        "recipe": {
-            "sha256": "0dy8v2mila7ccvb7j5jlfkhfjsjfk3bm3rcy84m0rgbqjai67amn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.1",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "projectile"
-        ]
-    },
-    "inf-clojure": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "clojure-emacs",
-            "repo": "inf-clojure",
-            "sha256": "0lnxd0fxclialhwzbqry5xb2l2slg80wi2ygv51d76prc2gdvdv0",
-            "rev": "286b935b90123d5e2dd3c36c804d796413864256"
-        },
-        "recipe": {
-            "sha256": "0n8w0vx1dnbfz88j45a57z9bsmkxr2zyh6ld72ady8asanf17zhl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3.0",
-        "deps": [
-            "clojure-mode",
-            "emacs"
-        ]
-    },
-    "git-wip-timemachine": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "itsjeyd",
-            "repo": "git-wip-timemachine",
-            "sha256": "0igawn43i81icshimj5agv33ab120hd6182knlrn3i46p7lcs3lx",
-            "rev": "7da7f2acec0b1d1252d7474b13190ae88e5b205d"
-        },
-        "recipe": {
-            "sha256": "02fi51k6l23cgnwjp507ylkiwb8azmnhc0fips68nwn9dghzp6dw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": [
-            "s"
-        ]
-    },
-    "shell-pop": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kyagi",
-            "repo": "shell-pop-el",
-            "sha256": "0fzywfdaisvvdbcl813n1shz0r8v1k9kcgxgynv5l0i4nkrgkww5",
-            "rev": "4531d234ca471ed80458252cba0ed005a0720b27"
-        },
-        "recipe": {
-            "sha256": "02s17ln0hbi9gy3di8fksp3mqc7d8ahhf5vwyz4vrc1bg77glxw8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.63",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "j-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zellio",
-            "repo": "j-mode",
-            "sha256": "07kbicf760nw4qlb2lkf1ns8yzqy0r5jqqwqjbsnqxx4sm52hml9",
-            "rev": "caa55dfaae01d1875380929826952c2b3ef8a653"
-        },
-        "recipe": {
-            "sha256": "0f9lsr9hjhdvmzx565ivlncfzb4iq4rjjn6a41053cjy50bl066i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.1",
-        "deps": []
-    },
-    "persistent-scratch": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "persistent-scratch",
-            "sha256": "0vzifam1a3gy27phvhgi081v99pim669xymfwd9f96pnh0pwsqbh",
-            "rev": "52be8e41fe1e23a1f2b912fc119af06cc051bd28"
-        },
-        "recipe": {
-            "sha256": "0iai65lsg3zxj07hdb9201w3rwrvdb3wffr6k2jdl8hzg5idghn1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.2",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "map-regexp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "map-regexp",
-            "sha256": "0kk1sk3cr4dbmgq4wzml8kdf14dn9jbyq4bwmvk0i7dic9vwn21c",
-            "rev": "b8e06284ec1c593d7d2bda5f35597a63de46333f"
-        },
-        "recipe": {
-            "sha256": "0yiif0033lhaqggywzfizfia3siggwcz7yv4z7przhnr04akdmbj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.0",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "sauron": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "djcb",
-            "repo": "sauron",
-            "sha256": "1mcag7qad1npjn096byakb8pmmi2g64nlf2vcc12irzmwia85fml",
-            "rev": "a9877f0efa9418c41d25002b58d1c2f8c69ec975"
-        },
-        "recipe": {
-            "sha256": "01fk1xfh7r16fb1xg5ibbs7gci9dja49msdlf7964hiq7pnnhxgb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.10",
-        "deps": []
-    },
-    "company-ansible": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "krzysztof-magosa",
-            "repo": "company-ansible",
-            "sha256": "1dds3fynbd6yb0874aw6g4qk5zmq3pgl3jmcp38md027qalgqmym",
-            "rev": "b9b4b22bc8c109de3ae3a5bb4c6b2be89bd644db"
-        },
-        "recipe": {
-            "sha256": "084l9dr2hvm00952y4m3jhchzxjhcd61sfn5ywj9b9a1d4sr110d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "company",
-            "emacs"
-        ]
-    },
-    "flycheck-ocaml": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "flycheck",
-            "repo": "flycheck-ocaml",
-            "sha256": "1phfarws2aajkgcl96hqa4ydmb1yncg10q2ldzf8ff6yd6mvk51l",
-            "rev": "9b4cd83ad2a87cc94b5d4e1ac26ac235475f1e6c"
-        },
-        "recipe": {
-            "sha256": "1cv2bb66aql2kj1y1gsl4xji8yrzrq6rd8hxxs5vpfsk47052lf7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "emacs",
-            "flycheck",
-            "let-alist",
-            "merlin"
-        ]
-    },
-    "eshell-z": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xuchunyang",
-            "repo": "eshell-z",
-            "sha256": "179xqh0rs8w3d03gygg9sy4qp5xqgfgl4c0ycrknip9zrnbmph4i",
-            "rev": "cc9a4b505953a9b56222896a6f973145aeb154b9"
-        },
-        "recipe": {
-            "sha256": "14ixazj0nscyqsdv7brqnfr0q8llir1pwb91yhl9jdqypmadpm6d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.1",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "fix-word": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mrkkrp",
-            "repo": "fix-word",
-            "sha256": "1hj5jp4vbkcmnc8l2hqsvjc76f7c9zcsq8znwcwv2nv9xj9hlbkr",
-            "rev": "256a87d4b871ead0975fa0e7f76a1ecbaa074582"
-        },
-        "recipe": {
-            "sha256": "0a8w09cx8p5pkkd4533nd199axkhdhs2a7blp7syfn40bkscx6xc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "celery": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ardumont",
-            "repo": "emacs-celery",
-            "sha256": "07h5g905i1jglsryl0dnqxz8yya5kkyjjggzbk4nl3rcj41lyas7",
-            "rev": "163ebede3f6a7f59202ff319675b0873dd1de365"
-        },
-        "recipe": {
-            "sha256": "0m3hmvp6xz2m7z1kbb0ii0j3c95zi19652gfixq5a5x23kz8y59h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.3",
-        "deps": [
-            "dash-functional",
-            "deferred",
-            "emacs",
-            "s"
-        ]
-    },
-    "charmap": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lateau",
-            "repo": "charmap",
-            "sha256": "0crnd64cnsnaj5mcy55q0sc1rnamxa1xbpwpmirhyhxz780klww6",
-            "rev": "165193d91ef96f563ae8366ed4c1a2df5a4eaed2"
-        },
-        "recipe": {
-            "sha256": "1j7762d2i17ysn9ys8j7wfv989avmax8iylml2hc26mwbpyfpm84",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.1",
-        "deps": []
-    },
-    "parsebib": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joostkremers",
-            "repo": "parsebib",
-            "sha256": "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml",
-            "rev": "9a1f60bed2814dfb5cec2b92efb5951a4b465cce"
-        },
-        "recipe": {
-            "sha256": "07br2x68scsxykdk2ajc4mfqhdb7vjkcfgz3vnpy91sirxzgfjdd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.5",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "hindent": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chrisdone",
-            "repo": "hindent",
-            "sha256": "0hb74j5137yj3rm2si16xzwmcvkiwx8ywh1qrlnrzv5gl4viyjzb",
-            "rev": "726c692d234581c853495165472c78f4c7fb9297"
-        },
-        "recipe": {
-            "sha256": "1f3vzgnqigwbwvglxv0ziz3kyp5dxjraw3vlghkpw39f57mky4xz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "5.4.3",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "sudden-death": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yewton",
-            "repo": "sudden-death.el",
-            "sha256": "1kmyivsyxr6gb2k36ssyr779rpk8qsrb27q5rjsir9fgc95qhvjb",
-            "rev": "c58fb9a672f306604dde4fbb0ff079e65a5e40be"
-        },
-        "recipe": {
-            "sha256": "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": []
-    },
-    "simplenote2": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alpha22jp",
-            "repo": "simplenote2.el",
-            "sha256": "04giklbd1fsw2zysr7aqg17h6cpyn4i9jbknm4d4v6581f2pcl93",
-            "rev": "9984ad77e63ae8d40e863cf1b0d8339ede986792"
-        },
-        "recipe": {
-            "sha256": "1qdzbwhzmsga65wmrd0mb3rbs71nlyqqb6f4v7kvfxzyis50cswm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.2.2",
-        "deps": [
-            "request-deferred"
-        ]
-    },
-    "cake": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k1LoW",
-            "repo": "emacs-cake",
-            "sha256": "0bvrwzjx93qyx97qqw0imvnkkx4w91yk99rnhcmk029zj1fy0kzg",
-            "rev": "a7c9f3bee71eb3865060123d4d98e5397c2f967e"
-        },
-        "recipe": {
-            "sha256": "06qlqrazz2jr08g44q73hx9vpp6xnjvkpd6ky108g0xc5p9q2hcr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.4.3",
-        "deps": [
-            "anything",
-            "cake-inflector",
-            "historyf"
-        ]
-    },
-    "realgud": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rocky",
-            "repo": "emacs-dbgr",
-            "sha256": "07j1grdbqv3iv5ghmgsjw678bxjajcxi27clz4krcz3ys5b1h70v",
-            "rev": "0dd37e233f315a5666eefc6a3e9fc088fcc6561f"
-        },
-        "recipe": {
-            "sha256": "15vlln4w4wlgrk5i5nhgvjcbardpahgs9kwwayb1vmj10c8a837s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2",
-        "deps": [
-            "list-utils",
-            "load-relative",
-            "loc-changes",
-            "test-simple"
-        ]
-    },
-    "js2-refactor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "js2-refactor.el",
-            "sha256": "08wxsz90x5zhma3q8kqfd01avhzxjmcrjc95s757l5xaynsc2bly",
-            "rev": "ac3da94a33b714d44d4f0adc670a829fdc522e34"
-        },
-        "recipe": {
-            "sha256": "09dcfwpxxyw0ffgjjjaaxbsj0x2nwfrmxy1a05h8ba3r3jl4kl1r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7.1",
-        "deps": [
-            "dash",
-            "js2-mode",
-            "multiple-cursors",
-            "s",
-            "yasnippet"
-        ]
-    },
-    "ecb": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alexott",
-            "repo": "ecb",
-            "sha256": "1s9r1qj7cjsjvvphdpyjff6y598xpbrm9qjv5ncq15w6ac7yxzvc",
-            "rev": "1e9ddf472d7b6006dc92684b82de22e6148f38b4"
-        },
-        "recipe": {
-            "sha256": "097hdskhfh255znrqamcssx4ns1sgkxchlbc7pjqwzpflsi0fx89",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.24",
-        "deps": []
-    },
-    "quickrun": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-quickrun",
-            "sha256": "09sdv5lf5k347415r9fzljm374rb29gq6kldx2awd164fkdnm8ds",
-            "rev": "31c61de338c7b689bbb78e0aa691bd68f7c20941"
-        },
-        "recipe": {
-            "sha256": "1szgirakfnkn9ksls16p233sr7x9ck5m1f1kbk6ancj36yja2nki",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.2.6",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "rsense": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "m2ym",
-            "repo": "rsense",
-            "sha256": "0mfkq8n28lal4lqwp6v0ilz8wrwgg61sbm0jggznwisjqqy3lzrh",
-            "rev": "e4297052ef32d06237e8bd1534a0caf70a34ad28"
-        },
-        "recipe": {
-            "sha256": "1901xqlpc8fg4sl9j58jn40i2djs8s0cdcqcrzrq02lvk8ssfdf5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": []
-    },
-    "ocodo-svg-modelines": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ocodo",
-            "repo": "ocodo-svg-modelines",
-            "sha256": "05ay599nc6jdw2fjss4izz1ynv2wc4svff932n8j9hvrhygipb2w",
-            "rev": "a6c5b9a7536c7a8fa3bd9d9dafdebc8d99903018"
-        },
-        "recipe": {
-            "sha256": "0fa88ns70wsr9i9gf4zx3fvmn1a32mrjsda105n0cx6c965kfmay",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.4",
-        "deps": [
-            "svg-mode-line-themes"
-        ]
-    },
-    "jedi-core": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tkf",
-            "repo": "emacs-jedi",
-            "sha256": "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7",
-            "rev": "8da022c8cda511428c72a6dc4c5be3c0a0c88584"
-        },
-        "recipe": {
-            "sha256": "0pzi32zdb4g9n4kvpmkdflmqypa7nckmnjq60a3ngym4wlzbb32f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.7",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "epc",
-            "python-environment"
-        ]
-    },
-    "dim-autoload": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "dim-autoload",
-            "sha256": "0bw1gkaycbbv2glnaa36gwzkl1l6lsq7i2i7jinka92b27zvrans",
-            "rev": "d68ef0d2f9204ffe0d521e2647e6d8f473588fd3"
-        },
-        "recipe": {
-            "sha256": "0lhzzjrgfvbqnzwhjywrk3skdb7x10xdq7d21q6kdk3h5r0np9f9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.4",
-        "deps": []
-    },
-    "pkgbuild-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "juergenhoetzel",
-            "repo": "pkgbuild-mode",
-            "sha256": "0a8qb1ldk6bjs7fpxgxrf90md7q46fhl71gmay8yafdkh6hn0kqr",
-            "rev": "6bb7cb3b0599ac0ae3c1d8d5014aefc1ecff7965"
-        },
-        "recipe": {
-            "sha256": "1lp7frjahcpr4xnzxz77qj5hbpxbxm2g28apkixrnc1xjha66v3x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.14",
-        "deps": []
-    },
-    "erc-youtube": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kidd",
-            "repo": "erc-youtube.el",
-            "sha256": "0p1j08rrdsqmkb8zz8h8ba24hr59nx3xh2m044ry468hfd2bp6vd",
-            "rev": "3629583031f3a59797a01e29abe9cc061e337294"
-        },
-        "recipe": {
-            "sha256": "12ylxkskkgfv5x7vlkib963ichb3rlmdzkf4zh8a39cgl8wsmacx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0alpha",
-        "deps": [
-            "erc"
-        ]
-    },
-    "roguel-ike": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "stevenremot",
-            "repo": "roguel-ike",
-            "sha256": "108j3106n9anas07mj26xlrvscsl5irshd39czkippla84gwmgyc",
-            "rev": "6d9322ad9d43d0c7465f125c8e08b222866e6923"
-        },
-        "recipe": {
-            "sha256": "1a7sa6nhgi0s4gjh55bhk5cg6q6s7564fk008ibmrm05gfq9wlg8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "popup"
-        ]
-    },
-    "name-this-color": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knl",
-            "repo": "name-this-color.el",
-            "sha256": "0amhw630hgc0j8wr8m6aav399ixi3vbwrck79hhlr3pmyh91vv7n",
-            "rev": "e37cd1291d5d68d4c8d6386eab9cb9d94fd3bcfa"
-        },
-        "recipe": {
-            "sha256": "12nrk1ww766jb4gb4iz6w485nimh2iv8wni2jq4l38v8ndh490zb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.0",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "emacs"
-        ]
-    },
-    "git-messenger": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-git-messenger",
-            "sha256": "139yivbxdpmv8j6qz406769b040nbmj3j8r28n9gqy54zlwblgv8",
-            "rev": "c45cdd9805d52a82bdd23907bd0f91dc7760d78d"
-        },
-        "recipe": {
-            "sha256": "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.16",
-        "deps": [
-            "cl-lib",
-            "popup"
-        ]
-    },
-    "maven-test-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rranelli",
-            "repo": "maven-test-mode",
-            "sha256": "0x92b1qrhyrdh0z0xriyjc12h0wpk16x4yawj5i828ca6mz0qh5g",
-            "rev": "f79409907375591283291eb96af4754b1ccc0e6f"
-        },
-        "recipe": {
-            "sha256": "1k9w51rh003p67yalzq1w8am40nnr2khyyb5y4bwxgpms8z391fm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.5",
-        "deps": [
-            "emacs",
-            "s"
-        ]
-    },
-    "discover-my-major": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "steckerhalter",
-            "repo": "discover-my-major",
-            "sha256": "1wlqyl03hhnflbyay3qlvdzqzvv5rbybcjpfddggda7ias9h0pr4",
-            "rev": "57d76fd21ec54706289cf9396fc871250569951e"
-        },
-        "recipe": {
-            "sha256": "0ch2y4grdjp7pvw2kxqnqdl7jd3q609n3pm3r0gn6k0xmcw85fgg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": [
-            "makey"
-        ]
-    },
-    "helm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-helm",
-            "repo": "helm",
-            "sha256": "0awr4nvzgp1kckxqli1xw4pk16gc22i8hchin63fqvk0gllcy454",
-            "rev": "fe96a398aa09ed0d25f6782efa5833085aa63791"
-        },
-        "recipe": {
-            "sha256": "0xsf4rg7kn0m5wjlbwhd1mc38lg2822037dyd0h66h6x2gbs3fd9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.9.1",
-        "deps": [
-            "async",
-            "cl-lib",
-            "emacs",
-            "helm-core"
-        ]
-    },
-    "pastelmac-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bmastenbrook",
-            "repo": "pastelmac-theme-el",
-            "sha256": "1v5mpjb8kavbqhvg4rizwg8cypgmi6ngdiy8qp9pimmkb56y42ly",
-            "rev": "bead21741e3f46f6506e8aef4469d4240a819389"
-        },
-        "recipe": {
-            "sha256": "168zzqhp2dbfcnknwfqxk68rgmibfw71ksghvi6h2j2c1m08l23f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "omni-scratch": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "AdrieanKhisbe",
-            "repo": "omni-scratch.el",
-            "sha256": "1rfs6z56pnacy6m7yvm2hrb0ykfvaiyichivcmb9ssdgqp92cbxx",
-            "rev": "517b340427d5906002234832a01d0bc1ad27bac5"
-        },
-        "recipe": {
-            "sha256": "190dkqcw8xywzrq8a99w4rqi0y1h2aj23s84g2ln1sf7jaf6d6n9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": []
-    },
-    "flycheck-hdevtools": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "flycheck",
-            "repo": "flycheck-hdevtools",
-            "sha256": "136mdg21a8sqxhijsjsvpli7r7sb40nmf80p6gmgb1ghwmhlm8k3",
-            "rev": "fbf90b9a7d2d90f69ac55b57d18f0f4a47afed61"
-        },
-        "recipe": {
-            "sha256": "0ahvai1q4x59ryiyccvqvjisgqbaiahx4gk8ssaxhblhj0sqga93",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "flycheck"
-        ]
-    },
-    "sly-company": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "capitaomorte",
-            "repo": "sly-company",
-            "sha256": "11p89pz6zmnjng5177w31ilcmifvnhv9mfjy79ic7amg01h09hsr",
-            "rev": "930e14fee9cdc837ae26299c7f5e379c53cee1af"
-        },
-        "recipe": {
-            "sha256": "1n8bx0qis2bs49c589cbh59xcv06r8sx6y4lxprc9pfpycx7h6v2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8",
-        "deps": [
-            "company",
-            "emacs",
-            "sly"
-        ]
-    },
-    "ht": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Wilfred",
-            "repo": "ht.el",
-            "sha256": "0k09n66jar0prq9aal2h3izp1y67jibdx0gjr0g4jx1p1yxig1dg",
-            "rev": "285c8752b7d3ab4b3d0c53bab6ba05d328577960"
-        },
-        "recipe": {
-            "sha256": "16vmxksannn2wyn8r44jbkdp19jvz1bg57ggbs1vn0yi7nkanwbd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.0",
-        "deps": []
-    },
-    "elisp-slime-nav": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "elisp-slime-nav",
-            "sha256": "1k7kprdknqm18dc0nwl7gachm0rivcpa8ng7p7ximalja3nsg2j1",
-            "rev": "551a6045969756d4aaee9e82b44cfbcdd0670cea"
-        },
-        "recipe": {
-            "sha256": "009zgp68i4naprpjr8lcp06lh3i5ickn0nh0lgvrqs0niprnzh8c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "vlf": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "m00natic",
-            "repo": "vlfi",
-            "sha256": "0vl0hwxzzvgna8sysf517qq08fi1zsff3dmcgwvsgzhc47sq8mng",
-            "rev": "4eaf763cadac62d7a74f7b2d2436d7793c8f7b43"
-        },
-        "recipe": {
-            "sha256": "1ipkv5kmda0l39xwbf7ns9p0mx3kb781mxsm9vmbkhr5x577s2j8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.7",
-        "deps": []
-    },
-    "recover-buffers": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tripleee",
-            "repo": "recover-buffers",
-            "sha256": "114ssmby614xjs7mrpbbsdd4gj5ra6klfh8h6z8iij8xn3kii83q",
-            "rev": "a1db7f084977697081da3497628e3514e032b966"
-        },
-        "recipe": {
-            "sha256": "0g40d7440hzlc9b45v63ng0anvmgip4dhbd9wcm2sn8qjfr4w11b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "evil-args": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wcsmith",
-            "repo": "evil-args",
-            "sha256": "1nh7wa4ynr7ln42x32znzqsmh7ijzy5ymd7rszf49l8677alvazq",
-            "rev": "2a88b4d19953a11227cc1e91973b92149116f44c"
-        },
-        "recipe": {
-            "sha256": "1bwdvf1i3jc77bw2as1wr1djm8z3a7wms60694xkyqh0m909hs2w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": [
-            "evil"
-        ]
-    },
-    "real-auto-save": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chillaranand",
-            "repo": "real-auto-save",
-            "sha256": "1ka5q2q18hgh7wl5yn04489121bq4nx369rz8nb7dr5l14cas0xm",
-            "rev": "879144ca7e9bfa09a4fb57d5fe92a80250311f1e"
-        },
-        "recipe": {
-            "sha256": "03dbbizpyg62v6zbq8hd16ikrifz8m2bdlbb3g67f2834xqmxha8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": []
-    },
-    "ebib": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joostkremers",
-            "repo": "ebib",
-            "sha256": "159w19hx3gmhv8n2amkm6i999vdrz5132bjwk28qpiq37v1v7dd5",
-            "rev": "e9f92df575d747992e9ada768b18dee475cfee55"
-        },
-        "recipe": {
-            "sha256": "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.5.2",
-        "deps": [
-            "dash",
-            "emacs",
-            "parsebib"
-        ]
-    },
-    "multiple-cursors": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "multiple-cursors.el",
-            "sha256": "10k4c9vl0bfidrry0msyqamijizjghg54g26yaqbr2vi0mbbz22k",
-            "rev": "d17c89e41847cf9292004590ba5b1c8cec0b1c50"
-        },
-        "recipe": {
-            "sha256": "0mky5p9wpd3270wr5vfna8rkk2ff81wk7vicyxli39195m0qgg0x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3.0",
-        "deps": []
-    },
-    "tss": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "emacs-tss",
-            "sha256": "1ma3k9bbw427cj1n2gjajbqii482jhs2lgjggz9clpc21bn5wqfb",
-            "rev": "1f302deea3d74462c71a9c62031f48b753e8915f"
-        },
-        "recipe": {
-            "sha256": "0d16x5r2xfy6mrwy0mqzpr9b3inqmyyxgawrxlfh83j1xb903dhm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.0",
-        "deps": [
-            "auto-complete",
-            "json-mode",
-            "log4e",
-            "yaxception"
-        ]
-    },
-    "espuds": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ecukes",
-            "repo": "espuds",
-            "sha256": "16r4j27j9yfdiy841w9q5ykkc6n3wrm7hvfacagb32mydk821ijg",
-            "rev": "1405972873339e056517217136de4ad3202d744a"
-        },
-        "recipe": {
-            "sha256": "16yzw9l64ahf5v92jzb7vyb4zqxxplq6qh0y9rkfmvm59s4nhk6c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.3",
-        "deps": [
-            "dash",
-            "f",
-            "s"
-        ]
-    },
-    "nav-flash": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "nav-flash",
-            "sha256": "119hy8rs83f17d6zizdaxn2ck3sylxbyz7adszbznjc8zrbaw0ic",
-            "rev": "9054a0f9b51da9e5207672efc029ba265ba28f34"
-        },
-        "recipe": {
-            "sha256": "0936kr0s6zxxmjwaqm7ywdw2im4dxai1xb7j6xa2gp7c70qvvsx3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.0",
-        "deps": []
-    },
-    "osx-location": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "osx-location",
-            "sha256": "1csnxpsfnv9lv07kgvc60qx5c33sshmnz60p3qjz7ym7rnjy9b5x",
-            "rev": "110aee945b53ea550e4debe69bf3c077d940ec8c"
-        },
-        "recipe": {
-            "sha256": "1p12mmrw70p3b04zlprkdxdfnb7m3vkm6gci3fwhr5zyfvwxvn0c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": []
-    },
-    "unify-opening": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DamienCassou",
-            "repo": "unify-opening",
-            "sha256": "1vbx10s2zmhpxjg26ik947bcg9f7w3g2w45wmm0shjp743fsdq8p",
-            "rev": "2812e43029cab7183197ce5e3c9577856bfd22c5"
-        },
-        "recipe": {
-            "sha256": "1gpmklbdbmv8va8d3yr94r1ydkcyvdzcgxv56rp0bxwbcgmk0as8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.0",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "ghc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kazu-yamamoto",
-            "repo": "ghc-mod",
-            "sha256": "1wiwkp4qcgdwnr4h1bn27hh1kyl2wjlrz2bbfv638y9gzc06rgch",
-            "rev": "edfce196107dbd43958d72c174ad66e4a7d30643"
-        },
-        "recipe": {
-            "sha256": "0xqriwggd1ahla5aff7k0j4admx6q18rmqsx3ipn4nfk86wrhb8g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "5.4.0.0",
-        "deps": [
-            "haskell-mode"
-        ]
-    },
-    "ninja-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "martine",
-            "repo": "ninja",
-            "sha256": "1wc0cvmfhpvfzdy127d1n812q93dd9sp3mmqnc8jzy8i3frqqqq6",
-            "rev": "484c16336f19bd8970bb6e75322d61b92a229899"
-        },
-        "recipe": {
-            "sha256": "1m7f25sbkz8k343giczrnw2ah5i3mk4c7csi8kk9x5y16030asik",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.6.0",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "el-x": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sigma",
-            "repo": "el-x",
-            "sha256": "1i6j44ssxm1xdg0mf91nh1lnprwsaxsx8vsrf720nan7mfr283h5",
-            "rev": "e96541c1f32e0a3aca4ad0a0eb382bd898250163"
-        },
-        "recipe": {
-            "sha256": "1721d9mljlcbdwb5b9934q7a48y30x6706pp4bjvgys0r64dml5g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.1",
-        "deps": []
-    },
-    "migemo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-jp",
-            "repo": "migemo",
-            "sha256": "1ckb5hymwj4wmsxakalsky4mkzn9vxhxr6416b2cr6r5jxj4xgsl",
-            "rev": "97e07796573c4c47f286bfe8eeb6428cb474526e"
-        },
-        "recipe": {
-            "sha256": "0y49imdwygv5zd7cyh9ngda4gyb2mld2a4s7zh4yzlh7z5ha9qkr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.9.1",
-        "deps": []
-    },
-    "easy-repeat": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xuchunyang",
-            "repo": "easy-repeat.el",
-            "sha256": "18bm5ns1qrxq0rrz9sylshr62wkymh1m6b7ch2y74f8rcwdwjgnq",
-            "rev": "060f0e6801c82c40c06961dc0528a00e18947a8c"
-        },
-        "recipe": {
-            "sha256": "1vx57gpw0nbxh976s18va4ali1nqxqffhaxv1c5rhf4pwlk2fa06",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "weblogger": {
-        "fetch": {
-            "tag": "fetchbzr",
-            "url": "lp:weblogger-el",
-            "sha256": "1z7ld9d0crwdh778fyaapx75vpnlnslsh9nf07ywkylhz4w68yyv",
-            "rev": "38"
-        },
-        "recipe": {
-            "sha256": "189zs1321rybgi4zihps7d2jll5z13726jsg5mi7iycg85nkv2fk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.4.5",
-        "deps": [
-            "xml-rpc"
-        ]
-    },
-    "pophint": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "emacs-pophint",
-            "sha256": "18i0kivn6prh5pwdr7b4pxfxqsc8l4mks1h6cfs7iwnfn15g5k19",
-            "rev": "28dc6a76e726f371bcca3160c27ae2017324399c"
-        },
-        "recipe": {
-            "sha256": "1chq2j79hg095jxw5z3pz4qicqrccw0gj4sxrin0a55hnprzzp72",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.3",
-        "deps": [
-            "log4e",
-            "popup",
-            "yaxception"
-        ]
-    },
-    "find-file-in-project": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "technomancy",
-            "repo": "find-file-in-project",
-            "sha256": "0bf32nhpmjvvgnr6g9xqh8pqnhr3dl24y3g40lsv4pc8ffs70ydm",
-            "rev": "908cc56c0fd715001da4d97b30cba5eb7af3a609"
-        },
-        "recipe": {
-            "sha256": "0aznnv82xhnilc9j4cdmcgh6ksv7bhjjm3pa76hynnyrfn7kq7wy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "4.5",
-        "deps": [
-            "emacs",
-            "swiper"
-        ]
-    },
-    "paren-face": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "paren-face",
-            "sha256": "033gdya7f6p4kkapnmnbxlm88g4rbsmym4cc4jkcmp91idh63syq",
-            "rev": "835d817295d81e2a6def9beb37f05aaf97870e86"
-        },
-        "recipe": {
-            "sha256": "0dmzk66m3rd8x0rb925pyrfpc2qsvayks4kmhpb2ccdrx68pg8gf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": []
-    },
-    "writeroom-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joostkremers",
-            "repo": "writeroom-mode",
-            "sha256": "0f554h834p12255mhwjnxbh1ls65476k60cwddqyl844ph75w8jv",
-            "rev": "48b179879c6614afcae3fc4386fd88b52b2bcc17"
-        },
-        "recipe": {
-            "sha256": "1kpsrp3agw8bg3qbf5rf5k1a7ww30q5xsa8z5ywxajsaywjzx1bk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "3.1",
-        "deps": [
-            "emacs",
-            "visual-fill-column"
-        ]
-    },
-    "use-package": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jwiegley",
-            "repo": "use-package",
-            "sha256": "07vwg0bg719gb8ln1n5a33103903vvrphnkbvvfn43904pkrf14w",
-            "rev": "2b077f6e485e8c5c167413c03246068022b6bc71"
-        },
-        "recipe": {
-            "sha256": "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.1",
-        "deps": [
-            "bind-key",
-            "diminish"
-        ]
-    },
-    "highlight-defined": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "highlight-defined",
-            "sha256": "08czwa165rnd5z0dwwdddn7zi5w63sdk31l47bj0598kbly01n7r",
-            "rev": "9cc03c7136b56c04ea053fbe08a3a4a6af26b90e"
-        },
-        "recipe": {
-            "sha256": "1vjxm35wf4c2qphpkjh57hf03a5qdssdlmfj0n0gwxsdw1q5rpms",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.5",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "historyf": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k1LoW",
-            "repo": "emacs-historyf",
-            "sha256": "1mxicha6m61qxz1mv9z76x4g9fpqk4ch9i6jf7nnpxd6x4xz3f7z",
-            "rev": "64ab6c9d2cd6dec6982622bf675326e011373cd2"
-        },
-        "recipe": {
-            "sha256": "15pcaqfjpkfwcy46yqqw10q8kpw7aamcg0gr4frbdgzbv0yld08s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.9",
-        "deps": []
-    },
-    "ess-smart-underscore": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "ess-smart-underscore.el",
-            "sha256": "1avb6dng4xgw3bp7bw0j60wl6s4y26alfys9vwwj29rlzvjrlh74",
-            "rev": "ef18a160aeb3b1a7ae5fe93759f8e92147da8746"
-        },
-        "recipe": {
-            "sha256": "01pki1xa8zpgvldcbjwg6vmslj7ddf44hsx976xipc95vrdk15r2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.79",
-        "deps": []
-    },
-    "narrowed-page-navigation": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "david-christiansen",
-            "repo": "narrowed-page-navigation",
-            "sha256": "0ydxj6dc10knambma2hpimqrhfz216nbj96w1dcwgjixs4cd4nax",
-            "rev": "b215adbac4873f56fbab65772062f0f5be8058a1"
-        },
-        "recipe": {
-            "sha256": "1yrmih60dd69qnin505jlmfidm2svzpdrz46286r7nm6pk7s4pb7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "conkeror-minor-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "conkeror-minor-mode",
-            "sha256": "0sz3qx1bn0lwjhka2l6wfl4b5486ji9dklgjs7fdlkg3dgpp1ahx",
-            "rev": "476e81c27b056e21c192391fe674a2bf875466b0"
-        },
-        "recipe": {
-            "sha256": "1ch108f20k7xbf79azsp31hh4wmw7iycsxddcszgxkbm7pj11933",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.6.2",
-        "deps": []
-    },
-    "pycarddavel": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DamienCassou",
-            "repo": "pycarddavel",
-            "sha256": "0qg1kjzsv2mcvlsivqy8ys3djbs5yala37r9h2zcxdicl88q0l11",
-            "rev": "6ead921066fa0156f20155b7126e5875ce11c328"
-        },
-        "recipe": {
-            "sha256": "12k2mnzkd8yv17csfhclsnd479vcabawmac23yw6dsw7ic53jf1a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.1",
-        "deps": [
-            "emacs",
-            "helm"
-        ]
-    },
-    "emoji-cheat-sheet-plus": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syl20bnr",
-            "repo": "emacs-emoji-cheat-sheet-plus",
-            "sha256": "1rk7am0xvpnv98yi7a62wlyh576md4n2ddj7nm201bjd4wdl2yxk",
-            "rev": "96a003127d646a2683d81ca906a17eace0a6413e"
-        },
-        "recipe": {
-            "sha256": "1ciwlbw0ihm0p5gnnl3safcj7dxwiy53bkj8cmw3i334al0gjnnv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2.1",
-        "deps": [
-            "emacs",
-            "helm"
-        ]
-    },
-    "helm-proc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "markus1189",
-            "repo": "helm-proc",
-            "sha256": "0y0a18bj2k459fk51z7svnnasqkl78bx61y5ha1yv3sqnppgdw2h",
-            "rev": "babf86d7d0e1f325f18095a51116c49cda2c5fec"
-        },
-        "recipe": {
-            "sha256": "1bq60giy2bs9m3hlbc5nwvy51702a98s0vqass3b290hdgki4bnx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.4",
-        "deps": [
-            "helm"
-        ]
-    },
-    "evil-lisp-state": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syl20bnr",
-            "repo": "evil-lisp-state",
-            "sha256": "12l3gnhirq8jz0dqyj9m02l1fg5rh78fdyskslprxp5vfa4ngzkh",
-            "rev": "e5792ec68a5615bd07bf2c6e9eb3f49d1bc7810d"
-        },
-        "recipe": {
-            "sha256": "117irac05fs73n7sgja3zd7yh4nz9h0gw5b1b57lfkav6y3ndgcy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "7.1",
-        "deps": [
-            "evil",
-            "evil-leader",
-            "smartparens"
-        ]
-    },
-    "popwin": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "m2ym",
-            "repo": "popwin-el",
-            "sha256": "0nips9npm4zmz3f37vvb4s0g1ci0p9cl6w0z4sc6agg4rybjhpdp",
-            "rev": "95dea14c60019d6cccf9a3b33e0dec4e1f22c304"
-        },
-        "recipe": {
-            "sha256": "1zp54nv8rh0b3g8y5aj4793miiw2r1ijwbzq31lkwmbdr09mixmf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": []
-    },
-    "py-isort": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "paetzke",
-            "repo": "py-isort.el",
-            "sha256": "0150q6xcnzzrkn9fa9njm973l1d49c48ad8qia71k4jwrxjjj6zr",
-            "rev": "cfbb576784fe4501909c15299607ce2a2d0bf164"
-        },
-        "recipe": {
-            "sha256": "0k5gn3bjn5pv6dn6p0m9xghn0sx3m29bj3pfrmyh6gd5ic0l00yb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8",
-        "deps": []
-    },
-    "paredit": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "http://mumble.net/~campbell/git/paredit.git",
-            "sha256": "7587cd2cf6e5b245678bbca8cbad07db8576ff976a504cd8d6e52fa85cf99f8f",
-            "rev": "82bb75ceb2ddc272d6618d94874b7fc13181a409"
-        },
-        "recipe": {
-            "sha256": "1rp859y4qyqdfvp261l8mmbd62p1pw0dypm1mng6838b6q6ycakr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "24",
-        "deps": []
-    },
-    "gh": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sigma",
-            "repo": "gh.el",
-            "sha256": "0a5v91k9gm9vv15d3m8czicv8n39f0hvqhcr6lfw0w82n26xwsms",
-            "rev": "33b88251e8989069cc08f3f5d6886635f276f42e"
-        },
-        "recipe": {
-            "sha256": "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.2",
-        "deps": [
-            "eieio",
-            "logito",
-            "pcache"
-        ]
-    },
-    "lispy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "lispy",
-            "sha256": "05iqhnhj61f30yk4ih63rimmyp134gyq18frc8qgrnwym64dsm6l",
-            "rev": "7756a8fbbadbebbd5e20768569ed92ad6c402c5c"
-        },
-        "recipe": {
-            "sha256": "12qk2gpwzz7chfz7x3wds39r4iiipvcw2rjqncir46b6zzlb1q0g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.26.0",
-        "deps": [
-            "ace-window",
-            "emacs",
-            "hydra",
-            "iedit",
-            "multiple-cursors",
-            "swiper"
-        ]
-    },
-    "request-deferred": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tkf",
-            "repo": "emacs-request",
-            "sha256": "0j7nakxj750rhdnm0nk075s7rx38rc9npbb55kg7r9vb2qilnvmr",
-            "rev": "b548f8bd9c4372232cb3d3633b9fcfffb2f535ff"
-        },
-        "recipe": {
-            "sha256": "1dcxqnzmvddk61dzmfx8vjbzd8m44lscr3pjdp3r7211zhwfk40n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": []
-    },
-    "ace-flyspell": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cute-jumper",
-            "repo": "ace-flyspell",
-            "sha256": "1pzh5l8dybrrmglj55nbff6065pxlbx14501p3a1qx1wvf24g1sv",
-            "rev": "a850fa913b3d1bab4c00bacee41da934929cef52"
-        },
-        "recipe": {
-            "sha256": "0f24qrpcvyg7h6ylyggn4zrbydci537iigshac1d8yywsr0j47gd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.2",
-        "deps": [
-            "ace-jump-mode"
-        ]
-    },
-    "list-unicode-display": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "list-unicode-display",
-            "sha256": "05nn4db8s8h4mn3fxhwsa111ayvlq1raf6bifh7jciyw7a2c3aww",
-            "rev": "59770cf3572bd36c3e9ba044846dc420c0dca09b"
-        },
-        "recipe": {
-            "sha256": "01x9i5k5vhjscmkx0l6r27w1cdp9n6xk1pdjf98z3y88dnsmyfha",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "import-popwin": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-import-popwin",
-            "sha256": "0ycsdwwfb27g85aby4jix1aj41a4vq6bf541iwla0xh3wsyxb01w",
-            "rev": "34c3b34ffcadafea71600acb8f4e5ba385e6da19"
-        },
-        "recipe": {
-            "sha256": "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9",
-        "deps": [
-            "cl-lib",
-            "popwin"
-        ]
-    },
-    "company-tern": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "proofit404",
-            "repo": "company-tern",
-            "sha256": "11cinjsyf24d4a682ikniprxd1vkwn6mynsp5dzab6yzq09np78i",
-            "rev": "9a2cb8427a1a93c9c5021c01df1b47c69d79e176"
-        },
-        "recipe": {
-            "sha256": "17pw4jx3f1hymj6sc0ri18jz9ngggj4a41kxx14fnmmm8adqn6wh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": [
-            "cl-lib",
-            "company",
-            "dash",
-            "dash-functional",
-            "s",
-            "tern"
-        ]
-    },
-    "lit-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "HectorAE",
-            "repo": "lit-mode",
-            "sha256": "0mr0king5dj20vdycpszxnfs9ch808fhcz3q7svxfngj3d3671wd",
-            "rev": "c61c403afc8333a5649c5421ab1a6341dc1c7d92"
-        },
-        "recipe": {
-            "sha256": "05rf7ki060nqnvircn0dkpdrg7xbh7phb8bqgsab89ycc7l9vv59",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": []
-    },
-    "miniedit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsorphanage",
-            "repo": "miniedit",
-            "sha256": "1850z96gly0jnr50472idqz1drzqarr0n23bbasslrc501xkg0bq",
-            "rev": "e12bf659c3eb92dd8a4cb77642dc0865c54667a3"
-        },
-        "recipe": {
-            "sha256": "10s407q7igdi2hsaaahbw8vckalrl7z3s6l9cflf51q16xh2ih87",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.0",
-        "deps": []
-    },
-    "magit-gh-pulls": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sigma",
-            "repo": "magit-gh-pulls",
-            "sha256": "19iqa2kzarpa75xy34hqvpy1y7dzx84pj540wwkj04dnpb4fwj2z",
-            "rev": "e4a73781e3c1c7e4a09232b25e3474463cdf77b6"
-        },
-        "recipe": {
-            "sha256": "0qn9vjxi33pya9s8v3g95scmhwrn2yf5pjm7d24frq766wigjv8d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.2",
-        "deps": [
-            "emacs",
-            "gh",
-            "magit",
-            "pcache",
-            "s"
-        ]
-    },
-    "firestarter": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wasamasa",
-            "repo": "firestarter",
-            "sha256": "0s8rml5xbskvnjpi8qp7vqflxhh5yis6zr6ay2bxmd2chjlhli55",
-            "rev": "4b7428477980e12578ebbbb121115696b352d6b2"
-        },
-        "recipe": {
-            "sha256": "1cpx664hyrdnpb1jps1x6lm7idwlfjblkfygj48cjz9pzd6ld5mp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.4",
-        "deps": []
-    },
-    "adoc-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sensorflo",
-            "repo": "adoc-mode",
-            "sha256": "1mb7dlyd5w161xagwn6w5h4q660dppkd50m71vz0w3zmxsc9a0vq",
-            "rev": "b6d54d9007b97f2553c238e0c36586079b666f4f"
-        },
-        "recipe": {
-            "sha256": "0wgagcsh0fkb51fy17ilrs20z2vzdpmz97vpwijcfy2b9rypxq15",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.4",
-        "deps": [
-            "markup-faces"
-        ]
-    },
-    "racer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "racer-rust",
-            "repo": "emacs-racer",
-            "sha256": "0pbswxzgfqcp6vjlwhvnablj91kxq588j2fmcjzhf0aigkj7dxfb",
-            "rev": "9b7b4b1e8b04f630d29f771ad268025ff9380236"
-        },
-        "recipe": {
-            "sha256": "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.1",
-        "deps": [
-            "dash",
-            "emacs",
-            "rust-mode",
-            "s"
-        ]
-    },
-    "simplezen": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "simplezen.el",
-            "sha256": "1p1771qm3jndnf4rdhb1bri5cjiksvxizagi7vfb7mjmsmx18w61",
-            "rev": "c0ddaefbb38fcc1c9775434f734f89227d246a30"
-        },
-        "recipe": {
-            "sha256": "13f2anhfsxmx1vdd209gxkhpywsi3nn6pazhc6bkswmn27yiig7j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": []
-    },
-    "geiser": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jaor",
-            "repo": "geiser",
-            "sha256": "1667zln7bav0bdhrc4b5z36n8rn36xvwh4y9ffgns67zfgwi64kk",
-            "rev": "c6f17b25200e36f80d812684a2127b451fc11817"
-        },
-        "recipe": {
-            "sha256": "067rrjvyn5sz60w9h7qn542d9iycm2q4ryvx3n6xlard0dky5596",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8.1",
-        "deps": []
-    },
-    "tup-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ejmr",
-            "repo": "tup-mode",
-            "sha256": "0asd024n5v23wdsg1959sszq568wg3a1bp4jrk0cllfji1z0n78y",
-            "rev": "945af9c8e6c402e10cd3bf8e28a9591174023d6d"
-        },
-        "recipe": {
-            "sha256": "0pzpn1ljfcc2dl9fg7jc8lmjwz2baays4axjqk1qsbj0kqbc8j0l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3.1",
-        "deps": []
-    },
-    "voca-builder": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yitang",
-            "repo": "voca-builder",
-            "sha256": "0q1rwqjwqcnsr57s531pwlm464q8wx5vvdm5rj2xy9b3yi6phis1",
-            "rev": "224402532da28e45edd398fda61ecbddb97d22d3"
-        },
-        "recipe": {
-            "sha256": "0mbw87mpbb8rw7xzhmg6yjla2c80x9820kw4q00x00ny5rbhm76y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": []
-    },
-    "zotelo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vitoshka",
-            "repo": "zotelo",
-            "sha256": "0qwdbzfi8mddmchdd9ab9ms1ynlc8dx08i6g2mf3za1sbcivdqsr",
-            "rev": "56eaaa76f80bd15710e68af4a1e585394af987d3"
-        },
-        "recipe": {
-            "sha256": "0ai516lqj9yw7ymvfm4n5inv53sp6mg90wy56lr1laflizwxzg8z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3",
-        "deps": []
-    },
-    "helm-dash": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "areina",
-            "repo": "helm-dash",
-            "sha256": "0s503q56acv70i5qahrdgk3nhvdpb3wa22a8jh1kvb7lykaw74ai",
-            "rev": "a0f5d6539da873cd0c51d8ef714930c970a66aa0"
-        },
-        "recipe": {
-            "sha256": "1cnxssj2ilszq94v5cc4ixblar1nlilv9askqjp9gfnkj2z1n9cy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2.0",
-        "deps": [
-            "cl-lib",
-            "helm"
-        ]
-    },
-    "vcomp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "vcomp",
-            "sha256": "07dx3dyvkwcin0gb6j4jx0ldfxs4rqhygl56a8i81yy05adkaq2x",
-            "rev": "a12363c3a66576b68955abcadf7280de32eaa051"
-        },
-        "recipe": {
-            "sha256": "02cj2nlyxvgvl2rjfgacljvcsnfm9crmmkhcm2pznj9xw10y8pq0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.1",
-        "deps": []
-    },
-    "jsx-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jsx",
-            "repo": "jsx-mode.el",
-            "sha256": "1wx28rr5dk238yz07xn95v88qmv10c1gz9pcxard2kszpnmrn6dx",
-            "rev": "1ca260b76f6e6251c528ed89501597a5b456c179"
-        },
-        "recipe": {
-            "sha256": "1lnjnyn8qf3biqr92z443z6b58dly7glksp1g986vgqzdprq3n1b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.10",
-        "deps": []
-    },
-    "gradle-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jacobono",
-            "repo": "emacs-gradle-mode",
-            "sha256": "0k86lrb55d701nj6pvlw3kjp1dcd3lzfya0hv6q56c529y69d782",
-            "rev": "579de06674551919cddac9cfe42129f4fb0155c9"
-        },
-        "recipe": {
-            "sha256": "0lx9qi93wmiy9pxjxqp68scbcb4bx88b6jiqk3y8jg5cajizh24g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.5",
-        "deps": [
-            "s"
-        ]
-    },
-    "ess-R-data-view": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "ess-R-data-view.el",
-            "sha256": "1ya2ay52gkrd31pmw45ban8kkxgnzhhwkzkypwdhjfccq3ys835x",
-            "rev": "d6e98d3ae1e2a2ea39a56eebcdb73e99d29562e9"
-        },
-        "recipe": {
-            "sha256": "0r2fzwayf3yb7fqk6f31x4xfqiiczwik8qw4rrvkqx2h3s1kz7i0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": [
-            "ctable",
-            "ess",
-            "popup"
-        ]
-    },
-    "keyfreq": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dacap",
-            "repo": "keyfreq",
-            "sha256": "0ways4ksb9pk2kkpgclsxgc0ycfwcr8vghlbv5ic4y0c4ycmlb2d",
-            "rev": "0c0a36a895a34d802614d34d7a3cc986e502ea35"
-        },
-        "recipe": {
-            "sha256": "1rw6hzmw7h5ngvndy7aa41pq911y2hr9kqc9w4gdd5v2p4ln1qh7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.7",
-        "deps": []
-    },
-    "sourcetalk": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "malroc",
-            "repo": "sourcetalk_emacs",
-            "sha256": "0j4qm1y7rhb95k1zbl3c60a46l9rchzslzq36mayyw61s6yysjnv",
-            "rev": "aced89fa8776e6d5e42dad4a863e159959f08de6"
-        },
-        "recipe": {
-            "sha256": "0qaf2q784xgl1s3m88jpwdzghpi4f3nybga3lnr1w7sb7b3yvj3z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2.0",
-        "deps": [
-            "request"
-        ]
-    },
-    "kaesar": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-kaesar",
-            "sha256": "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8",
-            "rev": "4fa74851cd928f30e9f2ee1aa27ee6074ad253ea"
-        },
-        "recipe": {
-            "sha256": "0zhi1dv1ay1azh7afq4x6bdg91clwpsr13nrzy7539yrn9sglj5l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.0",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "image-dired+": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-image-diredx",
-            "sha256": "1n2ya9s0ld257a8iryjd0dz0z2zs1xhzfiwsdkq4l4azwxl54m29",
-            "rev": "b68094625d963056ad64e0e44af0e2266b2eadc7"
-        },
-        "recipe": {
-            "sha256": "0hhwqfn490n7p12n7ij4xbjh15gfvicmn21fvwbnrmfqc343pcdy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7.2",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "anything-sage": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "stakemori",
-            "repo": "anything-sage",
-            "sha256": "1bcvin2694ypqgiw0mqk82riq7gw6ra10vbkzng1yp9jp2qr6wmm",
-            "rev": "8335657d3f0611bd5fc8858160bbe87dfdbaf0f2"
-        },
-        "recipe": {
-            "sha256": "1878vj8hzrwfyd2yvxcm0f1vm9m0ndwnj0pcq7j8zm9lxj0w48p3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.1",
-        "deps": [
-            "anything",
-            "cl-lib",
-            "sage-shell-mode"
-        ]
-    },
-    "ignoramus": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "ignoramus",
-            "sha256": "1j40ldvgd7nr7pabi8mhzdvi0ml9n62m8mfjlh9nrbnkcsifs9rk",
-            "rev": "37536286eb1da6d7bb9590e039485c456fdfd245"
-        },
-        "recipe": {
-            "sha256": "1czqdmlrds1l5afi8ldg7nrxcwav86538z2w1npad3dz8xk67da9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7.0",
-        "deps": []
-    },
-    "telephone-line": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dbordak",
-            "repo": "telephone-line",
-            "sha256": "0smdlzrcbmip6c6c3rd0871wv5xyagavwsxhhgvki6ybyzdj9a19",
-            "rev": "70c113bea37719c83961023afd893044398e681d"
-        },
-        "recipe": {
-            "sha256": "0dyh9h1yk9y0217b6rxsm7m372n910vpfgw5w23lkkrwa8x8qpx3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "cl-lib",
-            "eieio",
-            "emacs",
-            "s",
-            "seq"
-        ]
-    },
-    "ac-php": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xcwen",
-            "repo": "ac-php",
-            "sha256": "1rpp6njgqpi7sq4iyh65glhnbfw414w7srz90whadhkz5pzawr7z",
-            "rev": "1f606698934a7d60d0d60f6f15240a2bf78c8b9f"
-        },
-        "recipe": {
-            "sha256": "0p9qq8nszp5jb71s35cxnmcxp50b62y2jv1ha7vvqfz5p8miallk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.7.0",
-        "deps": [
-            "auto-complete",
-            "company",
-            "dash",
-            "emacs",
-            "f",
-            "php-mode",
-            "popup",
-            "s",
-            "xcscope",
-            "yasnippet"
-        ]
-    },
-    "helm-ghq": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "masutaka",
-            "repo": "emacs-helm-ghq",
-            "sha256": "0rlk9016rxj292kpxrnqgrm4xsjs4m4gk2fwh8z3fcihi013lxaw",
-            "rev": "2997646b2fb5421ab435b772dd2dbaeb92d70166"
-        },
-        "recipe": {
-            "sha256": "14f3cbsj7jhlhrp561d8pasllnx1cmi7jk6v2fja7ghzj76dnvq6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.5.1",
-        "deps": [
-            "helm"
-        ]
-    },
-    "haskell-tab-indent": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "https://git.spwhitton.name/haskell-tab-indent",
-            "sha256": "02786f437bbbbb221c9c810a8d110bb4af172b986733ac35c932b18b38af7201",
-            "rev": "38d50e9bb8f64ba13ffbd9bcff32db820403a0fc"
-        },
-        "recipe": {
-            "sha256": "0vdfmy56w5yi202nbd28v1bzj97v1wxnfnb5z3dh9687p2abgnr7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": []
-    },
-    "helm-gtags": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-helm-gtags",
-            "sha256": "0gd158ymj0rpm3qmz17ky4lfhvw15cnq0xvhg6q1imjjay2md62q",
-            "rev": "9131a1439860198d51a9dfa6955c586da4bb60bd"
-        },
-        "recipe": {
-            "sha256": "0snx0b8b4yc507q3i4fzvrd68xgzqxly8kn5cwp26ik6cv840y29",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.5.1",
-        "deps": [
-            "cl-lib",
-            "helm"
-        ]
-    },
-    "company-cabal": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "iquiw",
-            "repo": "company-cabal",
-            "sha256": "1pja44g15d11kl47abzykrp28j782nkbmb0db0ilpc96xf1fjlsw",
-            "rev": "a570559ff92522598b5ed40e21c4539fffb3e976"
-        },
-        "recipe": {
-            "sha256": "0pbjidj88c9qri6xw8023yqwnczad5ig224cbsz6vsmdla2nlxra",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "cl-lib",
-            "company",
-            "emacs"
-        ]
-    },
-    "idle-highlight-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nonsequitur",
-            "repo": "idle-highlight-mode",
-            "sha256": "0x4w1ksrw7dicl84zpf4d4scg672dyan9g95jkn6zvri0lr8xciv",
-            "rev": "c466f2a9e291f9da1167dc879577b2e1a7880482"
-        },
-        "recipe": {
-            "sha256": "1i5ky61bq0dpk71yasfpjhsrv29mmp9nly9f5xxin7gz3x0f36fc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.3",
-        "deps": []
-    },
-    "highlight-blocks": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "highlight-blocks",
-            "sha256": "0c65jk00j88qxfki2g88hy9g6n92rzskwcn1fbmwcw3qgaz4b6w5",
-            "rev": "9c4240a5d16008db430d1a81c76dad474d3deb0c"
-        },
-        "recipe": {
-            "sha256": "1a32iv5kgf6g6ygbs559w156dh578k45m860czazfx0d6ap3k5m1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.16",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "simple-httpd": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "emacs-http-server",
-            "sha256": "1qmkc0w28l53zzf5yd2grrk1sq222g5qnsm35ph25s1cfvc1qb2g",
-            "rev": "b191b07c942e44c946a22a826c4d9c9a0475fd7e"
-        },
-        "recipe": {
-            "sha256": "18dharsdiwfkmhd9ibz9f47yfq9c2d78i886pi6gsjh8iwcpzx59",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.4.6",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "actionscript-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "austinhaas",
-            "repo": "actionscript-mode",
-            "sha256": "0zybch8hz3mj63i0pxynb4d76ywqcy7b4fsa4hh71c2kb0bnczb3",
-            "rev": "fddd7220342d29e7eca734f6b798b7a2849717a5"
-        },
-        "recipe": {
-            "sha256": "1dkiay9jmizvslji5kzab4dxm1dq0jm8ps7sjq6710g7a5aqdvwq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "7.2.2",
-        "deps": []
-    },
-    "sos": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "omouse",
-            "repo": "emacs-sos",
-            "sha256": "0b5w3vdr8llg3hqd22gnc6b6y089lq6vfk0ajkws6gfldz2gg2v1",
-            "rev": "c3906ca6872f460c0bdd276410519308626313f1"
-        },
-        "recipe": {
-            "sha256": "1gkd0plx7152s3dj8a9lwlwh8bgs1m006s80l10agclx6aay8rvb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "org"
-        ]
-    },
-    "nasm-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "nasm-mode",
-            "sha256": "1l7asqwi5gcvb2mn8608025lwypf2vqzrkc3a9phdfjp0qn2apdn",
-            "rev": "6e208d54eabe3339f22cd775f7e6237757f5eb36"
-        },
-        "recipe": {
-            "sha256": "1626yf9mmqlsw8w01vzqsyb5ipa56259d4kl6w871k7rvhxwff17",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.1",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "markup-faces": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sensorflo",
-            "repo": "markup-faces",
-            "sha256": "0nk2rm14ccwrh1aaxzm80rllsz8g38h9w52m0pf3nnwh6sa757nk",
-            "rev": "c43612633c6c161857a3bab5752ae192bb03f5f3"
-        },
-        "recipe": {
-            "sha256": "12z92j9f0mpn7w2qkiwg54wh743q3inx56q3f8qcpfzyks546grq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": []
-    },
-    "calfw": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiwanami",
-            "repo": "emacs-calfw",
-            "sha256": "1rv6slk3a7ca2q16isjlkmgxbxmbqx4lx2ip7z33fvnq10r5h60n",
-            "rev": "50e0e0261568f84f31fe7f87c9f863e21d30132f"
-        },
-        "recipe": {
-            "sha256": "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.5",
-        "deps": [
-            "google-maps"
-        ]
-    },
-    "tabbar-ruler": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "tabbar-ruler.el",
-            "sha256": "1xd67s92gyr49v73j7r7cbhsc40bkw8aqh21whgbypdgzpyc7azc",
-            "rev": "7df2e4814018e84ef9261d04a2ade8168a44e3d7"
-        },
-        "recipe": {
-            "sha256": "10dwjj6r74g9rzdd650wa1wxhqc0q6dmff4j0qbbhmjsxvsr3y0d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.45",
-        "deps": [
-            "tabbar"
-        ]
-    },
-    "gruber-darker-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rexim",
-            "repo": "gruber-darker-theme",
-            "sha256": "14h0rcd3nkw3pmx8jwip20p6rzl9qdkip5g52gfjjbqfvaffsrkd",
-            "rev": "0c08d77e615aceb9e6e1ca66b1fbde275200cfe4"
-        },
-        "recipe": {
-            "sha256": "0vn4msixb77xj6p5mlfchjyyjhzah0lcmp0z82s8849zd194fxqi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6",
-        "deps": []
-    },
-    "orgbox": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yasuhito",
-            "repo": "orgbox",
-            "sha256": "02mxp17p7bj4xamg0m6zk832hmpqcgzc7bjbjcnvbvrawhc255hy",
-            "rev": "ecaf5a064431cf92922338c974df8fce1a8f1734"
-        },
-        "recipe": {
-            "sha256": "12wfqlpjh9nr7zgqs4h8kmfsk825n68qcbn8z2fw2mpshg3nj7l8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.0",
-        "deps": [
-            "cl-lib",
-            "org"
-        ]
-    },
-    "mew": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kazu-yamamoto",
-            "repo": "Mew",
-            "sha256": "1dhws4a298zrm88cdn66sikdk06n0p60d32cxsgybakkhg5c5wgr",
-            "rev": "08289430ce14780a03789b71d2060ff4392fbae6"
-        },
-        "recipe": {
-            "sha256": "0423xxn3cw6jmsd7vrw30hx9phga5chxzi6x7cvpswg1mhcyn9fk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "6.7",
-        "deps": []
-    },
-    "helm-circe": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lesharris",
-            "repo": "helm-circe",
-            "sha256": "1iqjc15pz5qr8zjxaxz1b2vys2689ri76jacmipxvgjk0y7vc5f0",
-            "rev": "0b7ecf5380971ee7b6291fca6a2805c320638238"
-        },
-        "recipe": {
-            "sha256": "12jfzg03573lih2aapvv5h2mi3pwqc9nrmv538ivjywix5117k3v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "circe",
-            "cl-lib",
-            "emacs",
-            "helm"
-        ]
-    },
-    "ruby-hash-syntax": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "ruby-hash-syntax",
-            "sha256": "01n9j7sag49m4bdl6065jklnxnc5kck51izg884s1is459qgy86k",
-            "rev": "a0362c2dc449a1e67ef75ad736bcf8b03b083226"
-        },
-        "recipe": {
-            "sha256": "0bvwyagfh7mn457iibrpv1ay75089gp8pg608gbm24m0ix82xvb5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": []
-    },
-    "nodejs-repl": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abicky",
-            "repo": "nodejs-repl.el",
-            "sha256": "1qvs73nimqzhcjgw77vaipqbmnvailc1q6w8rb5vc9c425xsi7an",
-            "rev": "53a0d00d5854ac67d50dcf495e66f49a68e152e7"
-        },
-        "recipe": {
-            "sha256": "0rvhhrsw87kfrwdhm8glq6b3nr0v90ivm7fcc0da4yc2jmcyk907",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.3",
-        "deps": []
-    },
-    "ido-completing-read+": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DarwinAwardWinner",
-            "repo": "ido-ubiquitous",
-            "sha256": "0byairx5nxbzgdyiw658p7yiysfr7r1bd3b2prawq72bslb1c5cn",
-            "rev": "1a97a38f2d1a51371853e44da659caa6baf78cbe"
-        },
-        "recipe": {
-            "sha256": "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "3.10",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "sekka": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiyoka",
-            "repo": "sekka",
-            "sha256": "0nsm7z056rh32sq7abgdwyaz4dbz8v9pgbha5jvpk7y0zmnabrgs",
-            "rev": "2b0facc87e743e21534672aadac6db3164e38daf"
-        },
-        "recipe": {
-            "sha256": "1jj4ly9p7m3xvb31nfn171lbpm9y70y8cbf8p24w0fhv665dx0cp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.6.4",
-        "deps": [
-            "cl-lib",
-            "concurrent",
-            "popup"
-        ]
-    },
-    "auto-complete-exuberant-ctags": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k1LoW",
-            "repo": "auto-complete-exuberant-ctags",
-            "sha256": "1fqgyg986fg1dzac5wa97bx82mfddqb6qrfnpr3zksmw3vgykxr0",
-            "rev": "ff6121ff8b71beb5aa606d28fd389c484ed49765"
-        },
-        "recipe": {
-            "sha256": "1i2s3ycc8jafkzdsz3kbvx1hh95ydi5s6rq6n0wzw1kyy3km35gd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.7",
-        "deps": [
-            "auto-complete"
-        ]
-    },
-    "full-ack": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nschum",
-            "repo": "full-ack",
-            "sha256": "0c3w3xs2jbdqgsqw0qmdbwii6p395qfznird4gg0hfr7lby2kmjq",
-            "rev": "0aef4be1686535f83217cafb1524818071bd8325"
-        },
-        "recipe": {
-            "sha256": "09ikhyhpvkcl6yl6pa4abnw6i7yfsx5jkmzypib94w7khikvb309",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "helm-nixos-options": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "travisbhartwell",
-            "repo": "nix-emacs",
-            "sha256": "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld",
-            "rev": "5fc8fa29bea9dd8e9c822af92f9bc6ddc223635f"
-        },
-        "recipe": {
-            "sha256": "1nsi4hfw53iwn29fp33dkri1c6w8kdyn4sa0yn2fi6144ilmq933",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.1",
-        "deps": [
-            "helm",
-            "nixos-options"
-        ]
-    },
-    "magit-annex": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "magit-annex",
-            "sha256": "0d7dick96g1vj6c9wh10rgwhwv5j3ixgw1m3z45szszswlrp1bih",
-            "rev": "b51962dcc1080a35a91e2667f7c26fb33960c711"
-        },
-        "recipe": {
-            "sha256": "1ri58s1ly416ksmb7mql6vnmx7hq59lmhi7qijknjarw7qs3bqys",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.0",
-        "deps": [
-            "cl-lib",
-            "magit"
-        ]
-    },
-    "matrix-client": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://fort.kickass.systems/personal/rrix/pub/matrix.el",
-            "sha256": "0516772e4aae604359bee659d101fb62b73cc9016cbbe0b749c77402954ec341",
-            "rev": "de09c69d2d5ca604839239fe49b10a2ed5ac2809"
-        },
-        "recipe": {
-            "sha256": "09mgxk0xngw8j46vz6f5nwkb01iq96bf9m51w2q61wxivypnsyr6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": [
-            "json",
-            "request"
-        ]
-    },
-    "helm-hatena-bookmark": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "masutaka",
-            "repo": "emacs-helm-hatena-bookmark",
-            "sha256": "189dv3qqqmfyhsqa1n52cgcn1xv7k49f92ndn43y2v20234nhl9f",
-            "rev": "1ba352b858869a32323d4e6f9ca4b3eae055809e"
-        },
-        "recipe": {
-            "sha256": "14091zrp4vj7752rb5s3pkyvrrsdl7iaj3q9ys8rjmbsjwcv30id",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.1.0",
-        "deps": [
-            "helm"
-        ]
-    },
-    "emacsql-psql": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "emacsql",
-            "sha256": "0ph0462shk00rhrkpvwgsr4biykimky2d89pvkbg377951jdga7i",
-            "rev": "03d478870834a683f433e7f0e288476748eec624"
-        },
-        "recipe": {
-            "sha256": "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.0.0",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "emacsql",
-            "pg"
-        ]
-    },
-    "yaml-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yoshiki",
-            "repo": "yaml-mode",
-            "sha256": "1mj1gwrflpdlmc7wl1axygn1jqlrjys1dh3cpdh27zrgsjvhd6c1",
-            "rev": "a817e46cc55eb90b7e1dd7cff74e43e080f0f690"
-        },
-        "recipe": {
-            "sha256": "0afp83xcr8h153cayyaszwkgpap0iyk351dlykmv6bv9d2m774mc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.12",
-        "deps": []
-    },
-    "ncl-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yyr",
-            "repo": "ncl-mode",
-            "sha256": "16i1k1zr6ng1dlxb1b73mxjf25f4kvf3x5vfffsi3qnfm960bg3q",
-            "rev": "4a1a3f133c8c74a01b5c527496b56052bacac2ab"
-        },
-        "recipe": {
-            "sha256": "0hmd606xgapzbc79px9l1q6pphrhdzip495yprvg20xsdpmjlfw9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.99.1",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "go-direx": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-go-direx",
-            "sha256": "05yc0nylg3457an5j7yp3x23157j0hbi21qhcpgsa01144mwnwln",
-            "rev": "aecb9fef4d56d04d230d37c75c260c8392b5ad9f"
-        },
-        "recipe": {
-            "sha256": "0dq5d7fsld4hww8fl68c18qp6fl3781dqqwd98cg68bihw2wwni7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": [
-            "cl-lib",
-            "direx"
-        ]
-    },
-    "shampoo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dmatveev",
-            "repo": "shampoo-emacs",
-            "sha256": "11g9lsgakq8nf689k49p9l536ffi62g3bh11mh9ix1l058xamqw2",
-            "rev": "9bf488ad4025beef6eef63d2d5b72bc1c9b9e142"
-        },
-        "recipe": {
-            "sha256": "01ssgw4cnnx8d86g3r1d5hqcib4qyhmpqvcvx47xs7zh0jscps61",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.1",
-        "deps": []
-    },
-    "window-purpose": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bmag",
-            "repo": "emacs-purpose",
-            "sha256": "08j0akwjp4arkw3zm0lazb13f6dq0m8y9k9nmypd7xk0m77byymd",
-            "rev": "7e492cbdd4259a177625a3f47001d7281f295349"
-        },
-        "recipe": {
-            "sha256": "1ib5ia7armghvmcw8qywcil4nxzwwakmfsp7ybawb0xr53h1w96d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.4",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "imenu-list",
-            "let-alist"
-        ]
-    },
-    "boxquote": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "davep",
-            "repo": "boxquote.el",
-            "sha256": "0235l4f1cxj7nysfnay4fz52mg0c13pzqxbhw65vdpfzz1gl1p73",
-            "rev": "4c49b2046647ed187920c885e175ed388f4833dc"
-        },
-        "recipe": {
-            "sha256": "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.22",
-        "deps": []
-    },
-    "ein": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "millejoh",
-            "repo": "emacs-ipython-notebook",
-            "sha256": "055hyvdcnbbzxs66v06d5flylhsz1qnmff758736f84cyxm76ayy",
-            "rev": "3aa290ed91832ba28a99c5f4b53ef40459eea539"
-        },
-        "recipe": {
-            "sha256": "1nksj1cpf4d9brr3rb80bgp2x05qdq9xmlp8mwbic1s27mw80bpp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7.0",
-        "deps": [
-            "request",
-            "websocket"
-        ]
-    },
-    "magic-filetype": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zonuexe",
-            "repo": "magic-filetype.el",
-            "sha256": "128dqgh7kvjywiq0wq6ipnr1l1v2dzrz5j0rd3n2783r9nz0i7r5",
-            "rev": "1a3e425ab5b7b6614b7ece5885d23f12f45572f0"
-        },
-        "recipe": {
-            "sha256": "0gcys45cqn5ghppkn0rmyvfybprlfz1x6hqr21yv93mf79h75zhg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "emacs",
-            "s"
-        ]
-    },
-    "py-yapf": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "paetzke",
-            "repo": "py-yapf.el",
-            "sha256": "03hki4v61340x0xp47lckxabz51abcazcahmr6wfn9n4bvfqjr9x",
-            "rev": "766e57448639ff95eeb018f6d8bdf09170094218"
-        },
-        "recipe": {
-            "sha256": "1381x0ffpllxwgkr2d8xxbv1nd4k475m1aff8l5qijw7d1fqga2f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": []
-    },
-    "paper-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cadadr",
-            "repo": "paper-theme",
-            "sha256": "1fhj2g82lf2rz8c8l88acyrspnbmbj87m5n76cvc0ls40k1mgww3",
-            "rev": "551859066afe926380b6fcdc95851db45599944e"
-        },
-        "recipe": {
-            "sha256": "04diqm2c9fm29zyms3hplkzb4kb7b2kyrxdsy0jxyjj5kabypd50",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": []
-    },
-    "finalize": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "elisp-finalize",
-            "sha256": "1r9y9zschavi28c5ysrlh56vxszjfyhh5r36fhn74i0b5iiy15rx",
-            "rev": "72c8eaab3deb150ee2cf7f1473114cecffb5204a"
-        },
-        "recipe": {
-            "sha256": "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": [
-            "cl-lib",
-            "eieio",
-            "emacs"
-        ]
-    },
-    "paredit-everywhere": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "paredit-everywhere",
-            "sha256": "0jbjwjl92pf0kih3p2x20ms2kpyzzam8fir661nimpmk802ahgkj",
-            "rev": "72b7cd5dcdc02233a32e9f1a6c2d21dc30532170"
-        },
-        "recipe": {
-            "sha256": "0gbkwk8mrbjr2l8pz3q4y6j8q4m12zmzl31c88ngs1k5d86wav36",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": [
-            "paredit"
-        ]
-    },
-    "eval-in-repl": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kaz-yos",
-            "repo": "eval-in-repl",
-            "sha256": "1s8h2d2h9gw05srwwvgdph0m38qhnn81azzwfxzl0ym5a49cxacl",
-            "rev": "c79ba77bdd6f1534f379953fc6e0ec0e1c866151"
-        },
-        "recipe": {
-            "sha256": "10h5vy9wdiqf9dgk1d1bsvp93y8sfcxghzg8zbhhn7m5cqg2wh63",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7.0",
-        "deps": [
-            "dash",
-            "paredit"
-        ]
-    },
-    "helm-perldoc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-helm-perldoc",
-            "sha256": "01cj2897hqz02mfz32nxlyyp59iwm0gz1zj11s8ll7pwy9q3r90g",
-            "rev": "18645f2065a07acce2c6b50a2f9d7a2554e532a3"
-        },
-        "recipe": {
-            "sha256": "0b0cl2xj5w1r71zrjhnqhrzsnz1296jv21qx5adzslra6lk55q2r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7",
-        "deps": [
-            "cl-lib",
-            "deferred",
-            "helm"
-        ]
-    },
-    "ttrss": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pedros",
-            "repo": "ttrss.el",
-            "sha256": "060jksd9aamqx1n4l0bb9v4icsf7cr8jkyw0mbhgyz32nmxh3v6g",
-            "rev": "3b1e34518294a1fa6fa29355fd4e141f3fcaf3b6"
-        },
-        "recipe": {
-            "sha256": "08921cssvwpq33w87v08dafi2rz2rl1b3bhbhijn4bwjqgxi9w7z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.7.5",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "term-run": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "10sr",
-            "repo": "term-run-el",
-            "sha256": "1lwkm1mnnwhwrnali7ljxw7gvyhrnas200bvfcirngvfjv1q0xzl",
-            "rev": "9b20497bec2537ca6b36a66322a2d99107030679"
-        },
-        "recipe": {
-            "sha256": "1bx3s68rgr9slsw9k01gfg7sxd4z7sarg4pi2ivril7108mhg2cs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.4",
-        "deps": []
-    },
-    "smooth-scrolling": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aspiers",
-            "repo": "smooth-scrolling",
-            "sha256": "05kf3hb3nb32jzw50a2z9vlf3f0pj40klzxvqj4fxlci777imsvk",
-            "rev": "0d9b228f952c53ad456f98e2c761dda70ed72174"
-        },
-        "recipe": {
-            "sha256": "0zy2xsmr05l2narslfgril36d7qfb55f52qm2ki6fy1r18lfiyc6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.4",
-        "deps": []
-    },
-    "flymake-python-pyflakes": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-python-pyflakes",
-            "sha256": "0l8qpcbzfi32h3vy7iwydx3hg2w60x9l3v3rabzjx412m5d00gsh",
-            "rev": "78806a25b0f01f03df4210a79a6eaeec59511d7a"
-        },
-        "recipe": {
-            "sha256": "0asbjxv03zkbcjayanv13qzbv4z7b6fi0z1j6yv7fl6q9mgvm497",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "flycheck-cask": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "flycheck",
-            "repo": "flycheck-cask",
-            "sha256": "1c3igqfd42dm42kfjm2q2xgr673vws10n9jn2jjlsk4g33brc7h4",
-            "rev": "bad0b7bc25fdfc200ec383db852120aa0fcdba4b"
-        },
-        "recipe": {
-            "sha256": "1lq559nyhkpnagncj68h84i3cq85vhdikr534kj018n2zcilsyw7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "dash",
-            "emacs",
-            "flycheck"
-        ]
-    },
-    "el-get": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dimitri",
-            "repo": "el-get",
-            "sha256": "1awyh9ffd6a4cia239s89asb88ddqlnrv757d76vcb701pq412bz",
-            "rev": "bfffd553f4c72b818e9ee94f05458eae7a16056b"
-        },
-        "recipe": {
-            "sha256": "1438v2sw5n67q404c93y2py226v469nagqwp4w9l6yyy40h4myhz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "5.1",
-        "deps": []
-    },
-    "markdown-mode+": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "milkypostman",
-            "repo": "markdown-mode-plus",
-            "sha256": "1adl36fj506kgfw40gpagzsd7aypfdvy60141raggd5844i6y96r",
-            "rev": "f35e63284c5caed19b29501730e134018a78e441"
-        },
-        "recipe": {
-            "sha256": "1535kcj9nmcgmk2448jxc0jmnqy7f50cw2ngffjq5w8bfhgf7q00",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8",
-        "deps": [
-            "markdown-mode"
-        ]
-    },
-    "feature-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "michaelklishin",
-            "repo": "cucumber.el",
-            "sha256": "1cxjygg05v8s96c8z6plk3hl34jaiwg7s7dl7dsk20rj5f54kgw7",
-            "rev": "4bd8f19da816115094beb4b0e085822eb298ac37"
-        },
-        "recipe": {
-            "sha256": "0ryinmpqb3c91qcna6gbijcmqv3skxdc947dlr5s1w623z9nxgqg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": []
-    },
-    "unkillable-scratch": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "EricCrosson",
-            "repo": "unkillable-scratch",
-            "sha256": "1w2w0gmyr0nbq8kv3ldj30h9xma76gi1khbdia1y30kss677rr8m",
-            "rev": "4451f82eb98f9b159745ca1a79ac60b9d224fd5b"
-        },
-        "recipe": {
-            "sha256": "0ghbpa9pf7k6vd2mjxkpqg2qfl4sd40ir6mrk1rxr1rv8s0afkf7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "crm-custom": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DarwinAwardWinner",
-            "repo": "crm-custom",
-            "sha256": "1fhjz2x9jpz53g9j83kznhy2nhfap3jaf6i69k62243kcw31qyz0",
-            "rev": "fbcf8bf3c87f56cb872d840dd79b6727b886e90d"
-        },
-        "recipe": {
-            "sha256": "14w15skxr44p9ilhpswlgdbqfw8jghxi69l37yk4m449m7g9694c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": []
-    },
-    "ace-link": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "ace-link",
-            "sha256": "1v127ld04gn16bgismbcz91kfjk71f3g8yf10r4scfp603y41zgz",
-            "rev": "f88b70fda761c235afe8d3f7735ef14bc82226f5"
-        },
-        "recipe": {
-            "sha256": "1jl805r2s3wa0xyhss1q28rcy6y2fngf0yfcrcd9wf8kamhpajk5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.0",
-        "deps": [
-            "ace-jump-mode"
-        ]
-    },
-    "anaphora": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "anaphora",
-            "sha256": "0fnxxvw81c34zhmiyr5awl92wr5941n4gklvzjc4jphaf2nhkg4w",
-            "rev": "20bf7dcfa502538d23525f0905b4f845d97993d3"
-        },
-        "recipe": {
-            "sha256": "1wb7fb3pc4gxvpjlm6gjbyx0rbhjiwd93qwc4vfw6p865ikl19y2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": []
-    },
-    "grass-mode": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/tws/grass-mode.el",
-            "sha256": "0djv2ps2ahw9b1b5i45hgy7l7cch7cgh7rzq601c0r6vi7gm2ac5",
-            "rev": "aa8cc5eff764"
-        },
-        "recipe": {
-            "sha256": "1lq6bk4bwgcy4ra3d9rlca3fk87ydg7xnnqcqjg0pw4m9xnr3f7v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "cl-lib",
-            "dash"
-        ]
-    },
-    "fish-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wwwjfy",
-            "repo": "emacs-fish",
-            "sha256": "1vwq0h88yassa0m0cizfvj5b9rrx5cb7w1n5mbczv54q97lq530n",
-            "rev": "ac38e249dc260790ae32a24e101311990d9a84df"
-        },
-        "recipe": {
-            "sha256": "0l6k06bs0qdhj3h8vf5fv8c3rbhiqfwszrpb0v2cgnb6xhwzmq14",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "ercn": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "leathekd",
-            "repo": "ercn",
-            "sha256": "19jninbf0dhdw3kn4d38bxmklg0v7sh3m9dwj6z69w99r5pcw480",
-            "rev": "73b00dadf83b97dd9edd8381a4b27f583c08b7f6"
-        },
-        "recipe": {
-            "sha256": "0yvis02bypw6v1zv7i326y8s6j0id558n0bdri52hr5pw85imnlp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.1",
-        "deps": []
-    },
-    "jump": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "eschulte",
-            "repo": "jump.el",
-            "sha256": "1fm69g4mrmdchvxr062bk7n1jvs2rrscddb02cldb5bgdrcw8g6j",
-            "rev": "fb7355615276f00397b15182076bf472336448a9"
-        },
-        "recipe": {
-            "sha256": "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.3",
-        "deps": [
-            "findr",
-            "inflections"
-        ]
-    },
-    "list-packages-ext": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "laynor",
-            "repo": "list-packages-ext",
-            "sha256": "197cqkiwxgamhfwbc8h492cmjll3fypkwzcphj26dfnr22v63kwq",
-            "rev": "344719b313c208c644490f8f1130e21405402f05"
-        },
-        "recipe": {
-            "sha256": "15m4888fm5xv697y7jspghg1ra49fyrny4y2x7h8ivcbslvpglvk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "ht",
-            "persistent-soft",
-            "s"
-        ]
-    },
-    "ert-junit": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "https://bitbucket.org/olanilsson/ert-junit",
-            "sha256": "63a8fb532260f56569ce20f911788054624a7a29f149ed6036d9f997ae0457c3",
-            "rev": "341c755e7b60f8d2081303951377968b1d1a6c23"
-        },
-        "recipe": {
-            "sha256": "0bv22mhh1ahbjwi6s1csxkh11dmy0srabkddjd33l4havykxlg6g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "ert"
-        ]
-    },
-    "clj-refactor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "clojure-emacs",
-            "repo": "clj-refactor.el",
-            "sha256": "1w0lv2d916wxfakcy11avmn9f6nsmxff02dpyih5kx6ncgqv1bnd",
-            "rev": "a0a35b6fb0a2f31973d5e5b711f0aac0314d7168"
-        },
-        "recipe": {
-            "sha256": "1qvds6dylazvrzz1ji2z2ldw72pa2nxqacb9d04gasmkqc32ipvz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.0",
-        "deps": [
-            "cider",
-            "dash",
-            "edn",
-            "emacs",
-            "multiple-cursors",
-            "paredit",
-            "s",
-            "yasnippet"
-        ]
-    },
-    "org-autolist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "calvinwyoung",
-            "repo": "org-autolist",
-            "sha256": "0j6fqgzvbmvvdh0dgwsxq004wxys2zwnq9wa3idm087ynp2a2ani",
-            "rev": "da332fadcd9be4c5eb21c5e98c392b89743750b2"
-        },
-        "recipe": {
-            "sha256": "1jvspxhxlvd7h1srk9dbk1v5dykmf8jsjaqicpll7ial6i0qgikj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.13",
-        "deps": []
-    },
-    "evil-escape": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syl20bnr",
-            "repo": "evil-escape",
-            "sha256": "0cj17gk7cxia2p9xzqnlnmqqbw2afd3x61gfw9fpf65j9wik5hbz",
-            "rev": "befb07d03c0c06ff5c40eb9cdd436c97fc49f394"
-        },
-        "recipe": {
-            "sha256": "0rlwnnshcvsb5kn7db5qy39s89qmqlllvg2z8cnxyri8bsssks4k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "3.12",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "evil"
-        ]
-    },
-    "camcorder": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "camcorder.el",
-            "sha256": "0v927m3l5cf0j0rs0nfk5whwqmmxs941d8qalxi19j1ihspjz8d6",
-            "rev": "a2b5e0629ee3c01ead684e148965ac68e533efbd"
-        },
-        "recipe": {
-            "sha256": "1kbnpz3kn8ycpy8nlp8bsnnd1k1h7m02h7w5f7raw97sk4cnpvbi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "names"
-        ]
-    },
-    "make-color": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alezost",
-            "repo": "make-color.el",
-            "sha256": "0fp5gbin1sgsdz39spk74vadkzig3ydwhpzx9vg7f231kk5f6wzx",
-            "rev": "b19cb40c0619e267f2948ed37aff67b712a6deed"
-        },
-        "recipe": {
-            "sha256": "0mrv8b67lpid5m8rfbhcik76bvnjlw4xmcrd2c2iinyl02y07r5k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": []
-    },
-    "german-holidays": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rudolfochrist",
-            "repo": "german-holidays",
-            "sha256": "0344w4sbd6wlgl13j163v0hzjw9nwhvpr5s7658xsdd90wp4i701",
-            "rev": "8388b3bf5b5c38f9b9fcc9216ca26ef0640c6edc"
-        },
-        "recipe": {
-            "sha256": "0fgrxdgyl6va6axjc5l4sp90pyqaz5zha1g73xyhbxblshm5dwxn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": []
-    },
-    "save-sexp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "save-sexp",
-            "sha256": "1gh97rc528cpam3jsncc03cyf4pps71b8blmdikml71lks07lgwb",
-            "rev": "dce78d8630af6b2e29e3ec83b819a3d688d37dfc"
-        },
-        "recipe": {
-            "sha256": "12jx47picdpw668q75qsp9gncrnxnlk1slhzvxsk5pvkdwh26h66",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": []
-    },
-    "fringe-helper": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nschum",
-            "repo": "fringe-helper.el",
-            "sha256": "1c3yx9j3q8fkfiay4nzcabsq9i4ydqf6vxk8vv80h78gg9afrzrj",
-            "rev": "0f10a196c6e57222b8d4c94eafc40a96e7b20f1b"
-        },
-        "recipe": {
-            "sha256": "1vki5jd8jfrlrjcfd12gisgk12y20q3943i2qjgg4qvcj9k28cbv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.1",
-        "deps": []
-    },
-    "bufshow": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pjones",
-            "repo": "bufshow",
-            "sha256": "0x9q4amsmawi8jqj9xxg81khvb3gyyf9hjvb0w6vhrgjwpxiq8sy",
-            "rev": "d8424e412d63dcc721c64fbd2ddd2420a03b4e8b"
-        },
-        "recipe": {
-            "sha256": "027cd0jzb8yxm66q1bhyi75f2m9f2pq3aswgav1d18na3ybwg65h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": []
-    },
-    "ebal": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mrkkrp",
-            "repo": "ebal",
-            "sha256": "0nb0p82fx1qp1q9id88wlfqfvfbqqr20541s59snln1pa25s2agm",
-            "rev": "bd8bca3a57d390c22862179db0afca7008831dd7"
-        },
-        "recipe": {
-            "sha256": "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.2",
-        "deps": [
-            "emacs",
-            "f",
-            "ido-completing-read+"
-        ]
-    },
-    "coffee-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "defunkt",
-            "repo": "coffee-mode",
-            "sha256": "1axp9hixp4vgaqjd3ii9xwb32jhb964zclmpg3zpsl4rp8b9bdz5",
-            "rev": "d19075264dc1f662e2282ca42ce70be0eae61b2a"
-        },
-        "recipe": {
-            "sha256": "1px50hs0x30psa5ljndpcc22c0qwcaxslpjf28cfgxinawnp74g1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.2",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "smartparens": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "smartparens",
-            "sha256": "1mx4hdbrk6v52y5r47fbd6kgqyk3lvqgq8lw3hkww0pqfwwp4x6h",
-            "rev": "6b9b415b3655ac92631c8c5ca1247eebc68b7110"
-        },
-        "recipe": {
-            "sha256": "025nfrfw0992024i219jzm4phwf29smc5hib45s6h1s67942mqh6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.6.3",
-        "deps": [
-            "cl-lib",
-            "dash"
-        ]
-    },
-    "grunt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gempesaw",
-            "repo": "grunt.el",
-            "sha256": "0zpmhjwj64s72iv3dgsy07pfh20f25ngsy3pszmlrfkxk0926d8k",
-            "rev": "e27dbb6b3de9b36c7fb28f69aa06b4b2ea32d4b9"
-        },
-        "recipe": {
-            "sha256": "1qdzqcrff9x97kyy0d4j636d5i751qja10liw8i0lf4lk6n0lywz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3.2",
-        "deps": [
-            "ansi-color",
-            "dash"
-        ]
-    },
-    "buffer-utils": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "buffer-utils",
-            "sha256": "0rp9hiysy13c4in7b420r7yjza2knlmvphj7l01xbxphbilplqk5",
-            "rev": "b4d325543e25518d725a2122b49cd72a0d6a079a"
-        },
-        "recipe": {
-            "sha256": "0cfipdn4fc4fvz513mwiaihvbdi05mza3z5z1379wlljw6r539z2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": []
-    },
-    "elscreen-persist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "robario",
-            "repo": "elscreen-persist",
-            "sha256": "06g7fl2c7cvwsrgi462wf6j13ny56y6zvgkizz9f256xjjq77ymf",
-            "rev": "652b4c738f92c518ead69343ebfcf66bc2a0254c"
-        },
-        "recipe": {
-            "sha256": "1rjfvpsx0y5l9b76wa1ilj5lx39jd0m78nb1a4bqn81z0rkfpl4k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": [
-            "elscreen",
-            "revive"
-        ]
-    },
-    "pyenv-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "proofit404",
-            "repo": "pyenv-mode",
-            "sha256": "1y3q1k195wp2kgp00a1y34i20zm80wdv2kxigh6gbn2r6qzkqrar",
-            "rev": "b96c15fa1b83cad855e472eda06319ad35e34513"
-        },
-        "recipe": {
-            "sha256": "00yqrk92knv9gq1m9xcg78gavv70jsjlwzkllzxl63iva9qrch59",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "pythonic"
-        ]
-    },
-    "iplayer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "csrhodes",
-            "repo": "iplayer-el",
-            "sha256": "043dnij48zdyg081sa7y64lm35z7zvrv8gcymv3l3a98r1yhy3v6",
-            "rev": "48b664e36e1a8e37eeb3eee80b91ff7126ed449a"
-        },
-        "recipe": {
-            "sha256": "0wnxvdlnvlmspqsaqx0ldw8j03qjckkqzvx3cbpc2yfs55pm3p7r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "ruby-tools": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "ruby-tools",
-            "sha256": "1zvhq9l717rjgkm7bxz5gqkmh5i49cshwzlimb3h78kpjw3hxl2k",
-            "rev": "6e7fb376085bfa7010ecd3dfad63adacc6e2b4ac"
-        },
-        "recipe": {
-            "sha256": "1zs2vzcrw11xyj2a7lgqzw4slcha20206jvjbxkm68d57rffpk8y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.2",
-        "deps": []
-    },
-    "hardcore-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "hardcore-mode.el",
-            "sha256": "08l6p9n2ggg4filad1k663qc2gjgfbia4knnnif4sw7h92yb31jl",
-            "rev": "5ab75594a7a0ca236e2ac87882ee439ff6155d96"
-        },
-        "recipe": {
-            "sha256": "1bgi1acpw4z7i03d0i8mrd2hpjn6hyvkdsk0ks9q380yp9mqmiwd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": []
-    },
-    "e2wm-R": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "e2wm-R.el",
-            "sha256": "1yf081rac0chvkjha9z9xi1p983gmhjph0hai6ppsz5hzf2vikpp",
-            "rev": "fe17906bf48324032a1beaec9af32b9b49ea9125"
-        },
-        "recipe": {
-            "sha256": "09v4fz178lch4d6m801ipclfxm2qrap5601aysnzyvc2apvyr3sh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": [
-            "e2wm"
-        ]
-    },
-    "fold-this": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "fold-this.el",
-            "sha256": "1cbabpyp66nl5j8yhyj2jih4mhaljxvjh9ij05clai71z4598ahn",
-            "rev": "90b41d7b588ab1c3295bf69f7dd87bf31b543a6a"
-        },
-        "recipe": {
-            "sha256": "1iri4a6ixw3q7qr803cj2ik7rvmww1b6ybj5q2pvkf1v25r8655d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.0",
-        "deps": []
-    },
-    "mowedline": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "retroj",
-            "repo": "mowedline",
-            "sha256": "1mg7arw4wbbm84frq3sws5937fh901qn0xnjk9jcp3pvc4d0sxwd",
-            "rev": "c299991ace6f55e9edbf26c1d53b054873899101"
-        },
-        "recipe": {
-            "sha256": "0c2hvvwa7s5iyz517jaskshdcq9zs15zr6xsvrcb3biahrh4bmfb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.8",
-        "deps": []
-    },
-    "keychain-environment": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "keychain-environment",
-            "sha256": "07h6s1wdc83cqf08vqm4gh2r7bihbar4a31wr0140fn4rbhicwdw",
-            "rev": "40eba65a3d5581473d6a30f3a7abf73e5832b8c8"
-        },
-        "recipe": {
-            "sha256": "1w77cg00bwx68h0d6k6r1fzwdwz97q12ch2hmpzjnblqs0i4sv8v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.2.0",
-        "deps": []
-    },
-    "parent-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "parent-mode",
-            "sha256": "0i5bc7lyyrx6swqlrp9l5x72yzwi53qn6ldrfs99gh08b3yvsnni",
-            "rev": "db692cf08deff2f0e973e6e86e26662b44813d1b"
-        },
-        "recipe": {
-            "sha256": "1ndn6m6aasmk9yrml9xqj8141100nw7qi1bhnlsss3v8b6njwwig",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.3",
-        "deps": []
-    },
-    "git-gutter": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-git-gutter",
-            "sha256": "1721h4i185wj9nxkb19cnbwk5fwsajaqr54qq9xb669mm4pjn3ra",
-            "rev": "febe69d909beb407d07dfc1b273ae7b7719fdd7c"
-        },
-        "recipe": {
-            "sha256": "12yjl9hsd72dwzl42hdcmjfdbxyi356jcq0kz8k7jvcsn57z4p2k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.85",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "stylus-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "brianc",
-            "repo": "jade-mode",
-            "sha256": "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n",
-            "rev": "4e7a20db492719062f40b225ed730ed50be5db56"
-        },
-        "recipe": {
-            "sha256": "152k74q6qn2xa38v2zyd5y7ya5n26nvai5v7z5fmq7jrcndp27r5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": [
-            "sws-mode"
-        ]
-    },
-    "peg": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ellerh",
-            "repo": "peg.el",
-            "sha256": "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n",
-            "rev": "081efeca91d790c7fbc90871ac22c40935f4833b"
-        },
-        "recipe": {
-            "sha256": "0nxy9xn99myz0p36m4jflfj48qxhhn1sspbfx8d90030xg3cc2gm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6",
-        "deps": []
-    },
-    "cask": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cask",
-            "repo": "cask",
-            "sha256": "1hvm6r6a8rgjwnn2mcamwqrmhz424vlr4mbvbri3wmn0ikbk510l",
-            "rev": "8337237449446e186ccd5ade0b0dc8c6ea7bd728"
-        },
-        "recipe": {
-            "sha256": "11nr6my3vlb1xiyai7qwii3nszda2mnkhkjlbh3d0699h0yw7dk5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7.4",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "epl",
-            "f",
-            "package-build",
-            "s",
-            "shut-up"
-        ]
-    },
-    "ace-jump-helm-line": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cute-jumper",
-            "repo": "ace-jump-helm-line",
-            "sha256": "0rrdh7jq23dyplq5rsf6f3a8v5f8smrzi85dgvqagasv74d19jbv",
-            "rev": "8259c2bd34486c3929c3425f3354d70cdb478c69"
-        },
-        "recipe": {
-            "sha256": "04q8wh6jskvbiq6y2xsp2ir23vgz5zw09rm127sgiqrmn0jc61b9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.3",
-        "deps": [
-            "avy",
-            "helm"
-        ]
-    },
-    "puml-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skuro",
-            "repo": "puml-mode",
-            "sha256": "15c2p5ffvkp80v6fvxa3bgrk8mj18famngqkz2dammxnbppvnvvz",
-            "rev": "9d3b5e326d1e68f87711c2ccb0920e2f5db5550b"
-        },
-        "recipe": {
-            "sha256": "131ghjq6lsbhbx5hdg36swnkqijdb9bx6zg73hg0nw8qk0z742vn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.4",
-        "deps": []
-    },
-    "ac-html-csswatcher": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "osv",
-            "repo": "ac-html-csswatcher",
-            "sha256": "0p18wxyyc1jmcwx9y5i77s25v4jszv7cmm4bkwm4dzhkxd33kh1f",
-            "rev": "dadc3c595cf1708291096c03987f1981f3cabc6b"
-        },
-        "recipe": {
-            "sha256": "0jb9dnm2lxadrxssf0rjqw8yvvskcq4hys8c21shjyj3gkvwbfqn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.7",
-        "deps": [
-            "web-completion-data"
-        ]
-    },
-    "gmail2bbdb": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "redguardtoo",
-            "repo": "gmail2bbdb",
-            "sha256": "0p6n52m3y56nx7chwvmnslrnwc0xmh4fmmlkbkfz9n58hlmw8x1x",
-            "rev": "2043fb8ee90c119b13bc8caf85fdf0a05f494b98"
-        },
-        "recipe": {
-            "sha256": "03jhrk4vpjim3ybzjxy7s9r1cgjysj9vlc4criz5k0w7vqz3r28j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.4",
-        "deps": []
-    },
-    "flymake-easy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-easy",
-            "sha256": "1j35k52na02b59yglfb48w6m5qzydvzqfsylb8ax5ks0f287yf0c",
-            "rev": "2a24f260cdc3b9c8f9263b653a475d90efa1d392"
-        },
-        "recipe": {
-            "sha256": "19p6s9fllgvs35v167xf624k5dn16l9fnvaqcj9ks162gl9vymn7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.10",
-        "deps": []
-    },
-    "org-repo-todo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "waymondo",
-            "repo": "org-repo-todo",
-            "sha256": "03c88jzwvl95dl39703mknkvnk3cmw4gss5c1y2k9py2rgh6bpr9",
-            "rev": "904a26089d87db59a40421d6f857b189e70dfbe3"
-        },
-        "recipe": {
-            "sha256": "0l5ns1hs3i4dhrpmvzl34zc9zysgjkfa7j8apbda59n9jdvml5v1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.2",
-        "deps": []
-    },
-    "anything": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "http://repo.or.cz/r/anything-config.git",
-            "sha256": "86b90766ccb31a492998299092a3d0b892a8ac0bdb8e1833ef75fa6d79c7c721",
-            "rev": "6b9718fba257e6c2912ba70f9895251ab1926928"
-        },
-        "recipe": {
-            "sha256": "13pmks0bsby57v3vp6jcvvzwb771d4qq62djgvrw4ykxqzkcb8fj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3.9",
-        "deps": []
-    },
-    "robe": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dgutov",
-            "repo": "robe",
-            "sha256": "1fckb18x9ikm6dlwwdfg9q4wyjjwdqy3r1w2ic01xb0dbyls41gw",
-            "rev": "c5a0ae6f68c699ec3cdbb73a3e01e76f62d75f48"
-        },
-        "recipe": {
-            "sha256": "19py2lwi7maya90kh1mgwqb16j72f7gm05dwla6xrzq1aks18wrk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7.8",
-        "deps": [
-            "inf-ruby"
-        ]
-    },
-    "git-auto-commit-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ryuslash",
-            "repo": "git-auto-commit-mode",
-            "sha256": "0psmr7749nzxln4b500sl3vrf24x3qijp12ir0i5z4x25k72hrlh",
-            "rev": "075e5f9ded66c2035581a7b216896556cc586814"
-        },
-        "recipe": {
-            "sha256": "0nf4n63xnzcsizjk1yl8qvqj9wjdqy57kvn6r736xvsxwzd44xgl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "4.4.0",
-        "deps": []
-    },
-    "company-go": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nsf",
-            "repo": "gocode",
-            "sha256": "03snnra31b5j6iy94gql240vhkynbjql9b4b5j8bsqp9inmbsia3",
-            "rev": "eef10fdde96a12528a6da32f51bf638b2863a3b1"
-        },
-        "recipe": {
-            "sha256": "1ncy5wlg3ywr17zrxb1d1bap4gdvwr35w9a8b0crz5h3l3y4cp29",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150303",
-        "deps": [
-            "company"
-        ]
-    },
-    "google-translate": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "atykhonov",
-            "repo": "google-translate",
-            "sha256": "0j2x7xvc556bq63c85j4dn8aggz2xfilx4x7hf99p7w6px0pzp29",
-            "rev": "e3f3981895d829a05f6f92d4db065c4b46076ff7"
-        },
-        "recipe": {
-            "sha256": "1crgzdd32mk6hrawdypg496dwh51wzwfb5wqw4a2j5l8y958xf47",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.11.2",
-        "deps": []
-    },
-    "puppet-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lunaryorn",
-            "repo": "puppet-mode",
-            "sha256": "0xr3s56p6fbm6wgw17galsl3kqvv8c7l1l1qvbhbay39yzs4ff14",
-            "rev": "d943149691abd7b66c85d58aee9657bfcf822c02"
-        },
-        "recipe": {
-            "sha256": "1s2hap6fs6rg5q80dmzhaf4qqaf5sglhs8p896i3i5hq51w0ciyc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "pkg-info"
-        ]
-    },
-    "live-code-talks": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "david-christiansen",
-            "repo": "live-code-talks",
-            "sha256": "1cwydbhhbs5v9y2s872zxc5lflqmfrdvnc8xz0qars52d7lg4br5",
-            "rev": "3a2ecdb49b2651d87999d4cad56ba8f1004c7a99"
-        },
-        "recipe": {
-            "sha256": "173mjmxanva13vk2f3a06s4dy62x271kynsa7pbhdg4fd72hdjma",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.1",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "narrowed-page-navigation"
-        ]
-    },
-    "unicode-fonts": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "unicode-fonts",
-            "sha256": "0fbwncna6gxlynq9196djpkjhayzk8kxlsxg0gasdgqx1nyxl0mk",
-            "rev": "a36597d83e0248bd0e6b2c1d5fb95bff72add527"
-        },
-        "recipe": {
-            "sha256": "0plipwb30qqay8691qzqdyg6smpbs9dsxxi49psb8sq0xnxl84q3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4.8",
-        "deps": [
-            "font-utils",
-            "list-utils",
-            "pcache",
-            "persistent-soft",
-            "ucs-utils"
-        ]
-    },
-    "eww-lnum": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "m00natic",
-            "repo": "eww-lnum",
-            "sha256": "0gs6bi3s2sszc6v2b26929azmn5513kvyin99n4d0ark1jdbjmv2",
-            "rev": "daef49974446ed4c1001e0549c3f74679bca6bd3"
-        },
-        "recipe": {
-            "sha256": "1y745z4wa90snizq2g0amdwwgjafd6hkrayn93ca50f1wghdbk79",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": []
-    },
-    "mbe": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ijp",
-            "repo": "mbe.el",
-            "sha256": "00gwd2jf5ncgyay5w2jc2mhv18jf4ydnzpfkxaxw9zjbdxg4ym2i",
-            "rev": "b022030d6e26198bb8a93a5b0bfe7aa891cd59ec"
-        },
-        "recipe": {
-            "sha256": "0h18mbcjy8nh4gl12kg2v8x6ps320yk7sbgq5alqnx2shp80kri3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "relative-line-numbers": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "relative-line-numbers",
-            "sha256": "1r8fhs7d2vkrbv15ic2bm79i9a8swbc38vk566vnxkhl3rfd5a0a",
-            "rev": "64157db08b0c2f5fada3209fc8d3e4b4c7429978"
-        },
-        "recipe": {
-            "sha256": "0mj1w5a4ax8hwz41vn02bacxlnifd14hvf3p288ljvwchvlf0hn3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.2",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "ob-sml": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "swannodette",
-            "repo": "ob-sml",
-            "sha256": "1xx6hyq3gk4bavcx6i9bhipbn4mn5rv2ga9lryq09qgq2l9znclk",
-            "rev": "5dc966acbe65e9e158bfa90018035bf52d4dafd4"
-        },
-        "recipe": {
-            "sha256": "04qvzhwjr8ipvq3znnhn0wbl4pbb1rwxi90iidavzk3phbkpaskn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "sml-mode"
-        ]
-    },
-    "mu4e-alert": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "iqbalansari",
-            "repo": "mu4e-alert",
-            "sha256": "0wrg6f7czn61f9wmrk27dzcdskznm5i1pwwjck5h768j0y9dfv6a",
-            "rev": "83e6232b43902c7124fea16145de0da881bfe865"
-        },
-        "recipe": {
-            "sha256": "15nwj09iyrvjsc9lrxla6qa0s8izcllxghw5gx3ffncfcrx2l8qm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "alert",
-            "emacs",
-            "s"
-        ]
-    },
-    "ham-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "ham-mode",
-            "sha256": "0d3xmagl18pas19zbpg27j0lmdiry23df48z4vkjsrcllqg25v5g",
-            "rev": "3a141986a21c2aa6eefb428983352abb8b7907d2"
-        },
-        "recipe": {
-            "sha256": "000qrdby7d6zmp5066vs4gjlc9ik0ybrgcwzcbfgxb16w1g9xpmz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.2",
-        "deps": [
-            "html-to-markdown",
-            "markdown-mode"
-        ]
-    },
-    "e2wm-direx": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "e2wm-direx",
-            "sha256": "09i7d2rc9zd4s3nqrhd3ggs1ykdpxf0pyhxixxw2xy0q6nbswjia",
-            "rev": "f319625b56c44e601af7c17fc6dbb88e5d70ebae"
-        },
-        "recipe": {
-            "sha256": "0nv8aciq0swxi9ahwc2pvk9c7i3rmlp7vrzqcan58ml0i3nm17wg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.5",
-        "deps": [
-            "direx",
-            "e2wm"
-        ]
-    },
-    "multi-web-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fgallina",
-            "repo": "multi-web-mode",
-            "sha256": "1d9y3dw27pgzgv6wk575d5ign55xdqgbl3ycyq1z7sji1477lz6b",
-            "rev": "0517b9e2b3052533ac0cb71eba7073ed309fce06"
-        },
-        "recipe": {
-            "sha256": "0vi4yvahr10aqpcz4127c8pcqpr5srwc1yhgipnbnm86qnh34ql5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.1",
-        "deps": []
-    },
-    "ctags": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/semente/ctags.el",
-            "sha256": "1xgrb4ivgz7gmingfafmclqqflxdvkarmfkqqv1zjk6yrjhlcvwf",
-            "rev": "afb16c5b2530"
-        },
-        "recipe": {
-            "sha256": "11fp8l99rj4fmi0vd3hkffgpfhk1l82ggglzb74jr3qfzv3dcn6y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.1",
-        "deps": []
-    },
-    "history": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "boyw165",
-            "repo": "history",
-            "sha256": "0dy98sg92xvnr4algm2v2bnjcdwzv0b0vqk0312b0ziinkzisas1",
-            "rev": "adef53ecc2f6067bb61f020a2b66c5185a51632d"
-        },
-        "recipe": {
-            "sha256": "0s8pcz53bk1w4h5847204vb6j838vr8za66ni1b2y4pas76zjr5g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "auto-dictionary": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nschum",
-            "repo": "auto-dictionary-mode",
-            "sha256": "191294k92qp8gmfypf0q8j8qrym96aqikzvyb9p03wqvbr3r1dsk",
-            "rev": "0e3567a81f7bb0ad53ed9f20c7d3d1ac40c26ad1"
-        },
-        "recipe": {
-            "sha256": "1va485a8lxvb3507kr83cr6wpssxnf8y4l42mamn9daa8sjx3q16",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": []
-    },
-    "project-persist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rdallasgray",
-            "repo": "project-persist",
-            "sha256": "1x7hwda1w59b8hvzxyk996wdz6phs6rchh3f1ydf0ab6x7m7xvjr",
-            "rev": "a4e5de1833edb60656d8a04357c527d34e81d27c"
-        },
-        "recipe": {
-            "sha256": "0csjwj0qaw0hz2qrj8kxgxlixh2hi3aqib98vm19sr3f1b8qab24",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.2",
-        "deps": []
-    },
-    "popup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "auto-complete",
-            "repo": "popup-el",
-            "sha256": "1y538siabcf1n00wr4iz5gbxfndw661kx2mn9w1g4lg7yi4n0h0h",
-            "rev": "46632ab9652dacad56fd961cd6def25a015170ae"
-        },
-        "recipe": {
-            "sha256": "151g00h9rkid76qf6c53n8bncsfaikmhj8fqcb3r3a6mbngcd5k2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.3",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "evil-commentary": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "linktohack",
-            "repo": "evil-commentary",
-            "sha256": "1qiym8f56a18j5swrxx5is48nz7z76531k8cw2c7czr6611l8l5a",
-            "rev": "122880a6721fcf16479f406c78c6e490a25efab0"
-        },
-        "recipe": {
-            "sha256": "151iiimmkpn58pl9zn40qssfahbrqy83axyl9dcd6kx2ywv5gcxz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2.1",
-        "deps": [
-            "evil"
-        ]
-    },
-    "shut-up": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cask",
-            "repo": "shut-up",
-            "sha256": "103yvfgkj78i4bnv1fwk76izsa8h4wyj3vwj1vq7xggj607hkxzq",
-            "rev": "dccd8f7d6af2dde96718f557b37bc25adc61dd12"
-        },
-        "recipe": {
-            "sha256": "1bcqrnnafnimfcg1s7vrgq4cb4rxi5sgpd92jj7xywvkalr3kh26",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.2",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "orglink": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "orglink",
-            "sha256": "00vhzblzscp3mkl6x1nz116i4isjwcc5gkpdksym3mr5nqvqhd97",
-            "rev": "4f3750227b9279f248bc8ee5724d3c27ea97e2e1"
-        },
-        "recipe": {
-            "sha256": "0ldrvvqs3hlazj0dch162gsbnbxcg6fgrxid8p7w9gj19vbcl52b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.3",
-        "deps": [
-            "dash",
-            "org"
-        ]
-    },
-    "flymake-shell": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-shell",
-            "sha256": "0c2lz1p91yhprmlbmp0756d96yiy0w92zf0c9vlp0i9abvd0cvkc",
-            "rev": "ec097bd77db5523a04ceb15a128e01689d36fb90"
-        },
-        "recipe": {
-            "sha256": "13ff4r0k29yqgx8ybxz7hh50cjsadcjb7pd0075s9xcrzia5x63i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "rdf-prefix": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "simenheg",
-            "repo": "rdf-prefix",
-            "sha256": "0r95fzi0x8r18x7r574mp503qaiqyicrq78zlggyz6qihi95pmqj",
-            "rev": "1ab1464172c7563a7dbf1224572e4ffbfc6608e6"
-        },
-        "recipe": {
-            "sha256": "1vxgn5f2kws17ndfdv1vj5p9ks3rp6sikzpc258j07bhsfpjz5qm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3",
-        "deps": []
-    },
-    "helm-migemo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-jp",
-            "repo": "helm-migemo",
-            "sha256": "03588hanfa20pjp9w1bqy8wsf5x6az0vfq0bmcnr4xvlf6fhkyxs",
-            "rev": "2d964309a5415cf47f5154271e6fe7b6a7fffec7"
-        },
-        "recipe": {
-            "sha256": "1cjvb1lm1fsg5ky63fvrphwl5a7r7xf6qzb4mvl06ikj8hv2h33x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.22",
-        "deps": [
-            "cl-lib",
-            "helm-core",
-            "migemo"
-        ]
-    },
-    "gather": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-gather",
-            "sha256": "1q9bz294bc6bplwfrfzsczh444v9152wv7zm2l1pcpwv8n8581p6",
-            "rev": "303af57dd2ae0fc1363a3d1a84d475167f58c84a"
-        },
-        "recipe": {
-            "sha256": "1f0cqqp1a7w8g1pfvzxxb0hjrxq4m79a4n85dncqj2xhjxrkm0xk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.0",
-        "deps": []
-    },
-    "test-simple": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rocky",
-            "repo": "emacs-test-simple",
-            "sha256": "08g7fan1y3wi4w7cdij14awadqss6prqg3k7qzf0wrnbm13dzhmk",
-            "rev": "75eea25bae04d8e5e3e835a2770f02f0ff4602c4"
-        },
-        "recipe": {
-            "sha256": "1l6y77fqd0l0mh2my23psi66v5ya6pbr2hgvcbsaqjnpmfm90w3g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "projectile-rails": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "asok",
-            "repo": "projectile-rails",
-            "sha256": "03z9zsldzj0nwksw3bj4j58p7n14n6cqv917pwn1sb67l0wziqg2",
-            "rev": "dee51e39003489ece8077750d3cf93dee6b373fa"
-        },
-        "recipe": {
-            "sha256": "0fgvignqdqh0ma91z9385782l89mvwfn77rp1gmy8cbkwi3b7fkq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.7",
-        "deps": [
-            "emacs",
-            "f",
-            "inf-ruby",
-            "inflections",
-            "projectile",
-            "rake"
-        ]
-    },
-    "super-save": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bbatsov",
-            "repo": "super-save",
-            "sha256": "1pq71simdb4pcbzzavlxdfbgh548m15f493h821k04n67ydzlmj3",
-            "rev": "4eb8aef705237d706b30cf722c5ad4909ea3acf1"
-        },
-        "recipe": {
-            "sha256": "0ikfw7n2rvm3xcgnj1si92ly8w75x26071ki551ims7a8sawh52p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": []
-    },
-    "tabulated-list": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sigma",
-            "repo": "tabulated-list.el",
-            "sha256": "0861shx0yicl3cyik6bsjlc0bm8q4h2krxmsrw7irmnwj4ng8g7g",
-            "rev": "b547d9b728935102d1c418bc0e978c221c37f6ab"
-        },
-        "recipe": {
-            "sha256": "1gp523w11f0aa8mbrb8z6ykqmy6ihvnfs00ff906gdmjx5kk16sr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0",
-        "deps": []
-    },
-    "hippie-expand-slime": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "hippie-expand-slime",
-            "sha256": "0mzk4agkcaaw7gryi0wrxv0blqndqsjf1ivdvr2nrnqi798sdhbr",
-            "rev": "de31fbc9f9d55891a006463bcee7670b47084015"
-        },
-        "recipe": {
-            "sha256": "0kxyv1lpkg33qgfv1jfqx03640py7525bcnc9dk98w6y6y92zf4m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "httpcode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rspivak",
-            "repo": "httpcode.el",
-            "sha256": "1h9n388fi17nbyfciqywgrq3n165kpiildbimx59qyk2ac3v7rqk",
-            "rev": "2c8eb3b5455254ba70fb71f7178886bfc2d3af90"
-        },
-        "recipe": {
-            "sha256": "05k1al1j119x6zf03p7jn2r9qql33859583nbf85k41bhicknpgh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "keyset": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "HKey",
-            "repo": "keyset",
-            "sha256": "0z6sgz8nywsd00zaayafwy5hfi7kzxfifjkfr5cn1l7wlypyksfv",
-            "rev": "25658ef79d26971ce41d9df207dff58d38daa091"
-        },
-        "recipe": {
-            "sha256": "1kfw0pfb6qm2ji1v0kb8xgz8q2yd2k9kxmaz5vxcdixdlax3xiqg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.2",
-        "deps": [
-            "cl-lib",
-            "dash"
-        ]
-    },
-    "editorconfig-fnmatch": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "editorconfig",
-            "repo": "editorconfig-emacs",
-            "sha256": "1z073j9bf31izj05k0vgpv6iwhx0k4m7ikdxgj4sd99svsv84nv9",
-            "rev": "3d1e4797ea3f5a1bb6d0ec296f04ce05e6e368b4"
-        },
-        "recipe": {
-            "sha256": "0ji243vrw527jc3alsgmqi9rdnslxyq48zzx33rbpkqcjssm11iv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.1",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "git-gutter-fringe+": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nonsequitur",
-            "repo": "git-gutter-fringe-plus",
-            "sha256": "1c7ijbpa7xw831k55cdm2gl8r597rxnp22jcmqnfpwqkqmk48ln9",
-            "rev": "ce9d594c0189e78d78df26a0c26bbcf886e373cd"
-        },
-        "recipe": {
-            "sha256": "1zkjb8p08cq2nqskn79rjszlhp9mrblplgamgi66yskz8qb1bgcc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "fringe-helper",
-            "git-gutter+"
-        ]
-    },
-    "milkode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ongaeshi",
-            "repo": "emacs-milkode",
-            "sha256": "1qg64mxsm2cswk52mlj7sx7k6gfnrsdwnf68i7cachri0i8aq4ap",
-            "rev": "ba97e2aeefa1d9d0b3835bf08edd0de248b0c513"
-        },
-        "recipe": {
-            "sha256": "07v6xgalx7vcw5sghckwvz584746cba05ql8flv8n556glm7hibh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": []
-    },
-    "egg": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "byplayer",
-            "repo": "egg",
-            "sha256": "1ryb7smvf66hk307yazkjn9bqzbwzbyyb5db200fq6j2zdjwsmaj",
-            "rev": "499894195528203cfcf309228bf7578dd8cd5698"
-        },
-        "recipe": {
-            "sha256": "144g1fvs2cmn3px0a98nvxl5cz70kx30v936k5ppyi8gvbj0md5i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.9",
-        "deps": []
-    },
-    "tern": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "marijnh",
-            "repo": "tern",
-            "sha256": "14s9740f0kgvgwz17y01f6lg9nv2jmzjilljdli064izsw474i0a",
-            "rev": "d4803588928d22cb18044b2e20fedd97e2d348ee"
-        },
-        "recipe": {
-            "sha256": "06bgwizn9dcd8hsvimjvb28j0mpxg7rrv9knhv5kkdapa6gggxif",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.16.0",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "json"
-        ]
-    },
-    "helm-swoop": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ShingoFukuyama",
-            "repo": "helm-swoop",
-            "sha256": "1lkjrz9ma2bxr8vskdm3sgrmsyiic798q3271dw38d453bhv4bl1",
-            "rev": "d834b05538dd3381c68f1260d39d3a7eb6a8f7f7"
-        },
-        "recipe": {
-            "sha256": "1fqbhj75hcmy7c2vdd0m7fk3m34njmv5s6k1i9y94djpbd13i3d8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.5.1",
-        "deps": [
-            "emacs",
-            "helm"
-        ]
-    },
-    "skeletor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chrisbarrett",
-            "repo": "skeletor.el",
-            "sha256": "101xn4glqi7b5vhdqqahj2ib4pm30pzq8sad7zagxw9csihcri3q",
-            "rev": "d986806559628623b591542143707de8d76347d0"
-        },
-        "recipe": {
-            "sha256": "1vfvg5l12dzksr24dxwc6ngawsqzpxjs97drw48qav9dy1vyl10v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.6.1",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "emacs",
-            "f",
-            "let-alist",
-            "s"
-        ]
-    },
-    "counsel": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "swiper",
-            "sha256": "1kahl3h18vsjkbqvd84fb2w45s4srsiydn6jiv49vvg1yaxzxcbm",
-            "rev": "706349fcfae297ee285552af9246bc0cf00d9b7f"
-        },
-        "recipe": {
-            "sha256": "0y8cb2q4mqvzan5n8ws5pjpm7bkjcghg5q19mzc3gqrq9vrvyzi6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7.0",
-        "deps": [
-            "emacs",
-            "swiper"
-        ]
-    },
-    "visual-fill-column": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joostkremers",
-            "repo": "visual-fill-column",
-            "sha256": "100w8rxdqln4xiwi0df15pvyaiyhjlwcjdh8nb0j95qpwji41vmf",
-            "rev": "261e27c062fbfd59ab20c9a084c35b99bcec598d"
-        },
-        "recipe": {
-            "sha256": "19y0pwaybjal2rc7migdbnafpi4dfbxvrzgfqr8dlvd9q68v08y5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.5",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "popup-imenu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ancane",
-            "repo": "popup-imenu",
-            "sha256": "0pkaic2l0xk2nsqcvxgxqbk152hd42h21j3z1ldgmpy1162viw7z",
-            "rev": "2a03162d9439d80f2eeca1fac14215af0d1b77e2"
-        },
-        "recipe": {
-            "sha256": "0lxwfaa9vhdn55dj3idp8c3fg1g26qsqq46y5bimfd0s89bjbaxn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "dash",
-            "flx-ido",
-            "popup"
-        ]
-    },
-    "android-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "remvee",
-            "repo": "android-mode",
-            "sha256": "0gjynmzqlqz0d57fb4np6xrklqdn11y4vjbm18rlpvmk92bgw740",
-            "rev": "146476c5ae958715520bec2b7f8de6b30c48c19f"
-        },
-        "recipe": {
-            "sha256": "1nqrvq411yg4b9xb5cvc7ai7lfalwc2rfhclzprvymc4vxh6k4cc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4.0",
-        "deps": []
-    },
-    "undercover": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sviridov",
-            "repo": "undercover.el",
-            "sha256": "0dmkn8qlnyvgaj7dqh82mqj1fik59zfi2yxcic9i6q9walxc3cas",
-            "rev": "068d39745304a06152c3e68a0b6772394c9e6d39"
-        },
-        "recipe": {
-            "sha256": "1s30c3i6y4r3mgrrs3lda3rrwmy9ff11ihdmshyziv9v5879sdjf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.0",
-        "deps": [
-            "dash",
-            "emacs",
-            "shut-up"
-        ]
-    },
-    "clojure-quick-repls": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "symfrog",
-            "repo": "clojure-quick-repls",
-            "sha256": "0sw34yjp8934xd2n76lbwyvxkbyz5pxszj6gkflas8lfjvms9z7d",
-            "rev": "90f82e294cfdfb65231adc456177580cd69bfc00"
-        },
-        "recipe": {
-            "sha256": "10glzyd4y3918pwp048pc1y7y7fa34fkqckn1nbys841dbssmay0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "cider",
-            "dash"
-        ]
-    },
-    "rase": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "m00natic",
-            "repo": "rase",
-            "sha256": "1i16361klpdsxphcjdpxqswab3ing69j1wb9nygws7ghil85h0bx",
-            "rev": "59b5f7e8102570b65040e8d55781c7ea28de7338"
-        },
-        "recipe": {
-            "sha256": "1g7v2z7l4csl5by64hc3zg4kgrkvv81iq30mfqq4nvy1jc0xa6j0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": []
-    },
-    "js2-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mooz",
-            "repo": "js2-mode",
-            "sha256": "0xj87grvg7pbhh4d239gaqai5gl72klhpp9yksaqn77qnm98q4fn",
-            "rev": "5c9d8b82dddec2fab370ec8798569c7fc5698093"
-        },
-        "recipe": {
-            "sha256": "0f9cj3n55qnlifxwk1yp8n1kfd319jf7qysnkk28xpvglzw24yjv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150909",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "window-end-visible": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "window-end-visible",
-            "sha256": "049bwa5g0z1b9nrsc1vc4511aqcq9fvl16xg493wj651g6q9qigb",
-            "rev": "bdc3d182e5f76e75f1b8cc49357194b36e48b67c"
-        },
-        "recipe": {
-            "sha256": "1p78n7yysj18404cdc6vahfrzwn5pixyfnja8ch48rj4fm4jbxwq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": []
-    },
-    "rbenv": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "senny",
-            "repo": "rbenv.el",
-            "sha256": "09c6v4lnv6vm2cckbdpx2fdi9xkz9l68qvhx35vaawxhrkgvypzp",
-            "rev": "a613ee1941efa48ef5321bad39ac1ed8ad1540b8"
-        },
-        "recipe": {
-            "sha256": "09nw7sz6rdgs7hdw517qwgzgyrdmxb16sgldfkifk41rhiyqhr65",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.3",
-        "deps": []
-    },
-    "org-agenda-property": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "org-agenda-property",
-            "sha256": "0gkxxzdk8bd1yi5x9217pkq9d01ccq8znxc7h8qcw0p1336rigfc",
-            "rev": "2ff628a14a3e758863bbd88fba4db9f77fd2c3a8"
-        },
-        "recipe": {
-            "sha256": "0zsjzjw52asl609q7a2s4jcsm478p4cxzhnd3azyr9ypxydjf6qk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3.1",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "dart-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nex3",
-            "repo": "dart-mode",
-            "sha256": "1vkn95dyc0pppnflyqlrlx32g9zc7wdcgc9fgf1hgvqp313ydfcs",
-            "rev": "07edf4d4448ede128d13c27bd76cf06f5ef5bb3b"
-        },
-        "recipe": {
-            "sha256": "0wxfh8v716dhrmx1klhpnsrlsj66llk8brmwryjg2h7c391sb5ff",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.14",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "flycheck"
-        ]
-    },
-    "navorski": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "roman",
-            "repo": "navorski.el",
-            "sha256": "09cb07f98aclgq8jf5419305zydkk1hz4nvzrwqz7syrlpvx8xi5",
-            "rev": "4546d4e4dfbec20ee8c423c045408a3388a9eab9"
-        },
-        "recipe": {
-            "sha256": "0dnzpsm0ya8rbcik5wp378hc9k7gjb3gwmkqqj889c38q5cdwsx7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.7",
-        "deps": [
-            "dash",
-            "multi-term",
-            "s"
-        ]
-    },
-    "yasnippet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "capitaomorte",
-            "repo": "yasnippet",
-            "sha256": "04cqcv10i6mym8j9fhd4fklmwa1q4nfg99kpp0bwx7issqhziqv5",
-            "rev": "be2f815c43deb74e0f809ed47debc4aa2e67ea1e"
-        },
-        "recipe": {
-            "sha256": "1j6hcpzxljz1axh0xfbwr4ysbixkwgxawsvsgicls8r8kl2xvjvf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.0.1",
-        "deps": []
-    },
-    "erc-crypt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "atomontage",
-            "repo": "erc-crypt",
-            "sha256": "1xw56sir6gkr0p9g4s6p4qc0rajnl6ifbzrky07j28y9vsa59nsz",
-            "rev": "1573189240d8b58e65385414d9a9514238c77805"
-        },
-        "recipe": {
-            "sha256": "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "log4e": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "log4e",
-            "sha256": "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022",
-            "rev": "6592682ab7de0e3d1915aa4d3c53e083be79fbeb"
-        },
-        "recipe": {
-            "sha256": "1klj59dv8k4r0hily489dp12ra5hq1jnsdc0wcakh6zirmakhs34",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.0",
-        "deps": []
-    },
-    "graphviz-dot-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ppareit",
-            "repo": "graphviz-dot-mode",
-            "sha256": "1zk664ilyz14p11csmqgzs73gx08hy32h3pnyymzqkavmgb6h3s0",
-            "rev": "7301cc276206b6995d265bcb9eb308bb83c760be"
-        },
-        "recipe": {
-            "sha256": "04rkynsrsk6w4sxn1pc0b9b6pij1p7yraywbrk7qvv05fv69kri2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": []
-    },
-    "pcomplete-extension": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thierryvolpiatto",
-            "repo": "pcomplete-extension",
-            "sha256": "0h0p4c08z0dqxmg55fzch1d2f38rywfk1j0an2f4sc94lj7ckbm6",
-            "rev": "839740c90de857e18db2f578d6660951522faab5"
-        },
-        "recipe": {
-            "sha256": "0m0c9ir44p21rj93fkisvpvi08936717ljmzsr4qdf69b3i54cwc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "melpa-upstream-visit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "laynor",
-            "repo": "melpa-upstream-visit",
-            "sha256": "12cp56ppmwpdgf5afx7hd2qb8d1qq8z27191fbbf5zqw8cq5zkpd",
-            "rev": "7310c74fdead3c0f86ad6eff76cf989e63f70f66"
-        },
-        "recipe": {
-            "sha256": "0j4afy9ipzr7pwkij8ab207mabd7srganlyyif9h1hvclj9svdmf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": [
-            "s"
-        ]
-    },
-    "paxedit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "promethial",
-            "repo": "paxedit",
-            "sha256": "1bjv3ny1bicqk6kwy9g607kj6wc3r8kdf8yfj1jynmf5xa4wwdnw",
-            "rev": "7a69ff07d97955fb5412ba1d5259810609e3bca0"
-        },
-        "recipe": {
-            "sha256": "06ymilr0zrwfpyzql7dcpg48lhkx73f2jlaw3caxgsjaz7x3n4ic",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.6",
-        "deps": [
-            "cl-lib",
-            "paredit"
-        ]
-    },
-    "e2wm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiwanami",
-            "repo": "emacs-window-manager",
-            "sha256": "0g0cz5a0vf31w27ljq5sn52mq15ynadl6cfbb97ja5zj1zxsxgjl",
-            "rev": "397cb6c110c9337cfc1a25ea7fddad00f168613c"
-        },
-        "recipe": {
-            "sha256": "0dp360jr3fgxqywkp7g88cp02g37kw2hdsc0f70hjak9n3sy03la",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3",
-        "deps": []
-    },
-    "drupal-spell": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "arnested",
-            "repo": "drupal-spell",
-            "sha256": "156cscpavrp695lp8pgjg5jnq3b8n9c2h8qg8w89dd4vfkc3iikd",
-            "rev": "a69f5e3b62c4c0da74ce26c1d00d5b8f7395e4ae"
-        },
-        "recipe": {
-            "sha256": "117rr2bfnc99g3qsr127grxwaqp54cxjaj3nl2nr6z78nja0fij3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.2",
-        "deps": []
-    },
-    "org-ac": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "org-ac",
-            "sha256": "1xckin2d6s40kgr2293g72ipc57f8gp6y63303kmqcv3qm8q13ca",
-            "rev": "9cbbda79e2fe964ded3f39cf7a2e74f1be3d6b9a"
-        },
-        "recipe": {
-            "sha256": "059jr3v3558cgw626zbqfwmwwv5f4637ai26h7b6psqh0x9sf3mr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.2",
-        "deps": [
-            "auto-complete-pcmp",
-            "log4e",
-            "yaxception"
-        ]
-    },
-    "omnisharp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "OmniSharp",
-            "repo": "omnisharp-emacs",
-            "sha256": "1iq8yzjv7wb0jfi3lqqyx4n7whvb7xf8ls0q0w7pgsrsslrxbwcm",
-            "rev": "725796278fa8a391e244f2e50676dd6d6b67585d"
-        },
-        "recipe": {
-            "sha256": "0dwya22y92k7x2s223az1g8hmrpfmk1sgwbr9z47raaa8kd52iad",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "3.9",
-        "deps": [
-            "auto-complete",
-            "cl-lib",
-            "csharp-mode",
-            "dash",
-            "flycheck",
-            "json",
-            "popup",
-            "s"
-        ]
-    },
-    "highlight-numbers": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "highlight-numbers",
-            "sha256": "0ffhc5s0h34064bix4qyiiyx30m4hpv0phmxwcrwiyvanj9ggfai",
-            "rev": "e1245b27a732ec43c1562f825533fe147759d24e"
-        },
-        "recipe": {
-            "sha256": "1bywrjv9ybr65mwkrxggb52jdqn16z8acgs5vqm0faq43an8i5yv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.1",
-        "deps": [
-            "emacs",
-            "parent-mode"
-        ]
-    },
-    "org-toodledo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "org-toodledo",
-            "sha256": "0qqa62fsmra6v4061kpki8wbhfcwkgnb2gzxwvnaqlcmhivksg6v",
-            "rev": "5473c1a2762371b198862aa8fd83fd3ec57485a4"
-        },
-        "recipe": {
-            "sha256": "0c7qr0jsc4iyrwkc22xp9nmk6984v7q1k0rvpd62m07lb5gvbiq3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.1.0",
-        "deps": []
-    },
-    "js2-highlight-vars": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "unhammer",
-            "repo": "js2-highlight-vars.el",
-            "sha256": "0r2szaxr3q0gvxqd9asn03q8jf3nclxv4mqdsjn96s98n45x388l",
-            "rev": "bf38d12cf65eebc8b81866fd03f6a0389bb2a9ed"
-        },
-        "recipe": {
-            "sha256": "07bq393g2jy8ydvaqyqn6vdyfvyminvgi239yvwzg5g9a1xjc475",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "js2-mode"
-        ]
-    },
-    "processing-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ptrv",
-            "repo": "processing2-emacs",
-            "sha256": "08ljf39jfmfpdk36nws2dnwpm7y8252zsdprsc85hr1h1ig5xy15",
-            "rev": "228bc56369675787d60f637223b50ce3a1afebbd"
-        },
-        "recipe": {
-            "sha256": "184yg9z14ighz9djg53ji5dgnb98dnxkkwx55m8f0f879x31i89m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "csharp-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "josteink",
-            "repo": "csharp-mode",
-            "sha256": "12m90dwbmkdwirdfx1jfib9vk7qinrspkyz9d6m5szam98rpzalz",
-            "rev": "0a61f21e499d99962eca907c7f7eab0149febaa1"
-        },
-        "recipe": {
-            "sha256": "17j84qrprq492dsn103dji8mvh29mbdlqlpsszbgfdgnpvfr1rv0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8.11",
-        "deps": []
-    },
-    "mallard-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jhradilek",
-            "repo": "emacs-mallard-mode",
-            "sha256": "1272fsjzsza9dxm8s64b7x2jzr3ks8wjpwvgcxha2dnsjzklcdcj",
-            "rev": "152cd44d53c881457fe57c1aba77e8e2fca4d1b0"
-        },
-        "recipe": {
-            "sha256": "0y2ikjgy107kb85pz50vv7ywslqgbrrkcfsrd8gsk1jky4qn8izd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.0",
-        "deps": []
-    },
-    "ess-R-object-popup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "ess-R-object-popup.el",
-            "sha256": "0q8pbaa6wahli6fh0kng5zmnypsxi1fr2bzs2mfk3h8vf4nikpv0",
-            "rev": "7e1f601bfba72de0fda44d9c82f96028ecbb9948"
-        },
-        "recipe": {
-            "sha256": "1dxwgahfki6d6ywh85ifk3kq6f2a1114kkd8xcv4lcpzqykp93zj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": [
-            "ess",
-            "popup"
-        ]
-    },
-    "solarized-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bbatsov",
-            "repo": "solarized-emacs",
-            "sha256": "0zcj9jf8nlsj9vms888z2vs76q54n8g8r9sh381xad3x8d6lrlb3",
-            "rev": "210dbef0186f87048d50face41d1d374d6154b3a"
-        },
-        "recipe": {
-            "sha256": "15d8k32sj8i11806byvf7r57rivz391ljr0zb4dx8n8vjjkyja12",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2.2",
-        "deps": [
-            "dash"
-        ]
-    },
-    "osx-trash": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lunaryorn",
-            "repo": "osx-trash.el",
-            "sha256": "1pn6xvq41di1jb5d3i8wgs54w0m2414cq3f1vk0xpibshkq7sr4a",
-            "rev": "a5ecee69f514ad9ee78fd9d6b20f3dd49512f5b4"
-        },
-        "recipe": {
-            "sha256": "1f6pi53mhp2pvrfjm8544lqqj36gzpzxq245lzvv91lvqkxr9ysj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "org-readme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "org-readme",
-            "sha256": "0hhgfw0sqvl9jmmslwxn6v3dii99v09yz2h0ia5np9lzyxsc207a",
-            "rev": "15054e42351b5ec6b629c55760a578516e035355"
-        },
-        "recipe": {
-            "sha256": "1qqbsgspd006gy0kc614w7bg6na0ygmflvqkmw47899pbgj81hxh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130322.926",
-        "deps": [
-            "header2",
-            "http-post-simple",
-            "lib-requires",
-            "yaoddmuse"
-        ]
-    },
-    "org2jekyll": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ardumont",
-            "repo": "org2jekyll",
-            "sha256": "064kw64w9snm0lbshxn8d6yd9xvyislhg37fmhq1w7vy8lm61xvf",
-            "rev": "a12173b9507b3ef54dfebb5751503ba1ee93c6aa"
-        },
-        "recipe": {
-            "sha256": "1j9d6xf5nsakifxwd4zmjc29lbj46ffn3z109k2y2yhz7q3r9hzv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.8",
-        "deps": [
-            "dash-functional",
-            "deferred",
-            "s"
-        ]
-    },
-    "bing-dict": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cute-jumper",
-            "repo": "bing-dict.el",
-            "sha256": "09lg7ah5vkns1kmizcqh8h6n8zmj2n25jksikwpmikpkr6nidaks",
-            "rev": "3d55a306fa50ffad4b374fbf716b5b5200661770"
-        },
-        "recipe": {
-            "sha256": "0s5pd08rcnvmgi1hw17xbzvswlv0yni6h2h2gccrjmf6izi8whh1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.1",
-        "deps": []
-    },
-    "ctable": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiwanami",
-            "repo": "emacs-ctable",
-            "sha256": "13zq8kym1y6bzrpxbcdz32323a6azy5px4ridff6xh8bfprwlay3",
-            "rev": "08a017bde6d24ea585e39ce2637bebe28774d316"
-        },
-        "recipe": {
-            "sha256": "040qmlgfvjc1f908n52m5ll2fizbrhjzbd0kgrsw37bvm3029rx1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.2",
-        "deps": []
-    },
-    "ess": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-ess",
-            "repo": "ESS",
-            "sha256": "0lvr14xlxsdad4ihywkpbwwj9lyal0w4p616ska5rk7gg5i8v74p",
-            "rev": "82d13c36f43efb4ef32fbb515ca58f63b2f0c06e"
-        },
-        "recipe": {
-            "sha256": "02kz4fjxr0vrj5mg13cq758nzykizq4dmsijraxv46snvh337v5i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "15.9",
-        "deps": [
-            "julia-mode"
-        ]
-    },
-    "ocp-indent": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "OCamlPro",
-            "repo": "ocp-indent",
-            "sha256": "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz",
-            "rev": "e6f15bdf7d5ad6e4addbf24dce74823f953db900"
-        },
-        "recipe": {
-            "sha256": "0wc4z9dsnnyr24n3vg1npvc3rm53av8bpbvrl8kldxxdiwgnbkjw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.5.2",
-        "deps": []
-    },
-    "hoa-pp-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hoaproject",
-            "repo": "Contributions-Emacs-Pp",
-            "sha256": "1wg6vc9swwspi6s6jpig3my83i2pq8vkq2cy1q3an87rczacmfzp",
-            "rev": "a72104a191214fba502653643a0d166a8f5341d9"
-        },
-        "recipe": {
-            "sha256": "01ijfn0hd645j6j88rids5dsanmzwmky37slf50yqffnv69jwvla",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.0",
-        "deps": [
-            "emacs",
-            "names"
-        ]
-    },
-    "helm-w32-launcher": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "helm-w32-launcher",
-            "sha256": "0s8zp3kx2kxlfyd26yr3lphwcybhbm8qa9vzmxr3kaylwy6jpz5q",
-            "rev": "01aa370a32900e7521330fba495474f2aa435e19"
-        },
-        "recipe": {
-            "sha256": "0bzn2vhspn6lla815qxwsl9gwfyiwgwmnysr6rjpyacmi17d73ri",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.6",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "helm"
-        ]
-    },
-    "ac-ispell": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-ac-ispell",
-            "sha256": "16qsj3wni4xhcrjx2rnxdzq6jb7jrl4bngi4an37vgdlrx3w8m6l",
-            "rev": "a8c84f7f0b96dc091abc51b1698f24e9c994e6aa"
-        },
-        "recipe": {
-            "sha256": "1vsy2qjh60n5lavivpqhhcpg5pk8zz2r0wy1sb65capn841zdi67",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7",
-        "deps": [
-            "auto-complete",
-            "cl-lib"
-        ]
-    },
-    "alect-themes": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alezost",
-            "repo": "alect-themes",
-            "sha256": "1pk5dgjqrynap85700wdivq41bdqvwd5hkfimgmcd48l5lhj9pbj",
-            "rev": "db7cc6ebf695a71881d803966d672f80fe967da6"
-        },
-        "recipe": {
-            "sha256": "04fq65qnxlvl5nc2q037c6yb4nf422dfw2913gv6zfh9rdmxsks8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "dired-k": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-dired-k",
-            "sha256": "0rpln6m3j4xbhrmmz18hby6xpzpzbf1c5hr7bxvna265cb0i5rn7",
-            "rev": "f4f4a1fe3155c35e212d3e16ed5f7c89c0b32282"
-        },
-        "recipe": {
-            "sha256": "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.16",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "project-persist-drawer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rdallasgray",
-            "repo": "project-persist-drawer",
-            "sha256": "1nq320ph8fs9a197ji4mnw2xa24dld0r1nka476yvkg4azmcc9x8",
-            "rev": "35bbe132a4fab6a0fec15ce6c0fd2fe6a4aa9626"
-        },
-        "recipe": {
-            "sha256": "1jv2y2hcqakyvfibclzm7g4diw0bvsv3a8fa43yf19wb64jm8hdb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.4",
-        "deps": [
-            "project-persist"
-        ]
-    },
-    "image-archive": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-image-archive",
-            "sha256": "0imvxzcja91cd19zm2frqfpxm8j0bc89w9s7q0pkpvyjz44kjbq8",
-            "rev": "699e967fa7b1dfcce2bf2ec878e74f4238bb6e45"
-        },
-        "recipe": {
-            "sha256": "0x0lv5dr1gc9bnr3dn26bc9s1ccq2rp8c4a1licbi929f0jyxxfp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.7",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "el-spice": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vedang",
-            "repo": "el-spice",
-            "sha256": "0390pfgfgj7hwfmkwikwhip0hmwkgx784l529cqvalc31jchi94i",
-            "rev": "53921ffe9a84d9395eea90709309d3d5529921ea"
-        },
-        "recipe": {
-            "sha256": "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.2",
-        "deps": [
-            "thingatpt+"
-        ]
-    },
-    "package-utils": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Silex",
-            "repo": "package-utils",
-            "sha256": "138l07qmxj4fkvf43f1hdn4skadxb50c023bc5101l3njzmf74wa",
-            "rev": "4a56f411f98fd455556a3f1d6c16a577a22057a2"
-        },
-        "recipe": {
-            "sha256": "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.0",
-        "deps": [
-            "epl"
-        ]
-    },
-    "beginend": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DamienCassou",
-            "repo": "beginend",
-            "sha256": "1agrci37bni1vfkxg171l53fvsnjdryhf05v54wj07jngnwf3cw9",
-            "rev": "de3833a1a651532e76df668bd92cfa07893501f1"
-        },
-        "recipe": {
-            "sha256": "1y81kr9q0zrsr3c3s14rm6l86y5wf1a0kia6d98112fy4fwdm7kq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "org-if": {
-        "fetch": {
-            "tag": "fetchFromGitLab",
-            "owner": "elzair",
-            "repo": "org-if",
-            "sha256": "1iyqv34b7q2k73srshcnpvfzcadq47w4rzkqp6m1d3ajk8x2vypq",
-            "rev": "fab602cc1bbee7a4e99c0083e129219d3f9ed2e8"
-        },
-        "recipe": {
-            "sha256": "0h0jdyawz2j4mp33w85z8q77l37qid8palvw5n4z379qa0wr5h96",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": []
-    },
-    "vimgolf": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "timvisher",
-            "repo": "vimgolf",
-            "sha256": "1f94qx8rbnn21cl0grxqa9gzkbrz68vmqsihv8vvi8qf1c1dmd0i",
-            "rev": "9fd8aaf68bc69d1dd628de4c7cbb070e366545a9"
-        },
-        "recipe": {
-            "sha256": "1hvw2pfa5a984hm6wd33bf6zz6hmlprc6qs3g789dfx91qm890vn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.10.0",
-        "deps": []
-    },
-    "ac-geiser": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xiaohanyu",
-            "repo": "ac-geiser",
-            "sha256": "02ifz25rq64z0ifxs52aqdz0iz4mi6xvj88hcn3aakkmsj749vvn",
-            "rev": "0e2e36532336f27e3dc3b01fff55ad1a4329817d"
-        },
-        "recipe": {
-            "sha256": "0v558qz1mp8b1bgk8kgdk5sx5mpd353mw77n5b0pw4b2ikzpz2mx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "auto-complete",
-            "geiser"
-        ]
-    },
-    "tuareg": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ocaml",
-            "repo": "tuareg",
-            "sha256": "0jpcjy2a77mywba2vm61knj26pgylsmv5a21cdp80q40bac4i6bb",
-            "rev": "f97b800db79d9856c70b4988bd39bd7aa623158e"
-        },
-        "recipe": {
-            "sha256": "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.0.9",
-        "deps": [
-            "caml"
-        ]
-    },
-    "twilight-anti-bright-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jimeh",
-            "repo": "twilight-anti-bright-theme",
-            "sha256": "0glw5lns7hwp8jznnfm6dyjw454sv2n84gy07ma7s1q3yczhq5bc",
-            "rev": "16d4ff2606789b506f0d2f53d12f02d5b1b64f9b"
-        },
-        "recipe": {
-            "sha256": "1qfybk5akaxdahmjffqaw712v8d7kk4jqkj3hzp96kys2zv1r6f9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.0",
-        "deps": []
-    },
-    "octicons": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-octicons",
-            "sha256": "19fg6r7aiirfsbp2h1a824476sn1ln4nz8kvpdzkzvyf1hzx68gw",
-            "rev": "77bb1a49045f89b3eaf9bcffeefbb9e1abaee556"
-        },
-        "recipe": {
-            "sha256": "02f37bvnc5qvkvfbyx5wp54nz71bqm747mq1p5361sx091lllkxk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "loc-changes": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rocky",
-            "repo": "emacs-loc-changes",
-            "sha256": "1089sbx20r30sis39vwy29fxhb2n3hh35rdv09lpzdxdq01s8wwp",
-            "rev": "8447baff7cb4839ef8d1d747a14e5da85d0cee5b"
-        },
-        "recipe": {
-            "sha256": "1akgij61b2ixpkchrriabwvx68cg4v5r5w9ncjrjh91hskjprfxh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": []
-    },
-    "initsplit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dabrahams",
-            "repo": "initsplit",
-            "sha256": "1rfw38a63bvzglqx7mb8wlnzjvlmkhkn35hn66snqqgvnmnvi54g",
-            "rev": "950bdc568e3fd08e6106170953caf98ac582a431"
-        },
-        "recipe": {
-            "sha256": "0n9dk3x62vgxfn39jkmdg8wxsik0xqkprifgvqzyvn8xcx1blyyq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.6",
-        "deps": []
-    },
-    "downplay-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tobias",
-            "repo": "downplay-mode",
-            "sha256": "13czcxmmvy4g9ysfjr6lb91c0fqv1xv8ppd27wbfsrgxm3aaqimb",
-            "rev": "225a4b3ca09e6f463dfdd54941c98b02be8d574c"
-        },
-        "recipe": {
-            "sha256": "1v6nga101ljzza8qj3lkmkzzl0vvzj4lsh1m69698s8prnczxr9b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "ruby-compilation": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "eschulte",
-            "repo": "rinari",
-            "sha256": "1wqhqv2fc5h10igv1php51bayx0s7qw4m9gzx9by80dab8lwa0vk",
-            "rev": "e2ed2fa55ac3435a86b1cf6a4f2d29aebc309135"
-        },
-        "recipe": {
-            "sha256": "1x1vpkjpx95sfcjhkx4cafypj0nkbd1i0mzxx3lmcrsmg8iv0rjc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.11",
-        "deps": [
-            "inf-ruby"
-        ]
-    },
-    "alchemist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tonini",
-            "repo": "alchemist.el",
-            "sha256": "0961s25b1bjrh4gzzf7k67ycwafmdrc6jlbhzb25i34dmpigq1hz",
-            "rev": "ddc68f52b16b2ced7646f1389ae15eb6c12c6683"
-        },
-        "recipe": {
-            "sha256": "18jxw0zb7y34qbm4bcpfpb2656f0h9grmrbfskgp4ra4q5q3n369",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.6.0",
-        "deps": [
-            "company",
-            "dash",
-            "elixir-mode",
-            "emacs",
-            "pkg-info"
-        ]
-    },
-    "pretty-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "akatov",
-            "repo": "pretty-mode",
-            "sha256": "013fig9i4fyx16krp2vfv953p3rwdzr38zs6i50af4pqz4vrcfvh",
-            "rev": "4ba8fceb7dd733361ed975d80ac2caa3612fa78b"
-        },
-        "recipe": {
-            "sha256": "1zxi4nj7vnchiiz1ndx17b719a1wipiqniykzn4pa1w7dsnqg21f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.0.3",
-        "deps": []
-    },
-    "function-args": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "function-args",
-            "sha256": "0m7fcw0cswypiwi5abg6vhw7a3agx9vhp10flbbbji6lblb0fya8",
-            "rev": "25e447d8a8930a8c515077de57a7693c6a642514"
-        },
-        "recipe": {
-            "sha256": "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.1",
-        "deps": [
-            "swiper"
-        ]
-    },
-    "splitjoin": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-splitjoin",
-            "sha256": "17qsmjsbk8aq3azjxid6h9fzz77bils74scp21sqn8vdnijx8991",
-            "rev": "0eb91e7beec915065cd6c00ceaca180a64d85cda"
-        },
-        "recipe": {
-            "sha256": "0l1x98fvvia8qx8g125h4d76slv0xnb3h1zxiq9xb5qh7a1h069l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "frame-restore": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lunaryorn",
-            "repo": "frame-restore.el",
-            "sha256": "1vznkbly0lyh5kri9lcgy309ws96q3d5m1lghck9l8ain8hphhqz",
-            "rev": "5bfd06e18cdf5031062de5e052e9a877c3953804"
-        },
-        "recipe": {
-            "sha256": "0b321iyf57nkrm6xv8d1aydivrdapdgng35zcnrg298ws2naysvm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "link": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myrkr",
-            "repo": "dictionary-el",
-            "sha256": "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s",
-            "rev": "9ef1672ecd367827381bbbc9af93685980083c5c"
-        },
-        "recipe": {
-            "sha256": "17jpsg3f2954b740vyj37ikygrg5gmp0bjhbid8bh8vbz7xx9zy8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.10",
-        "deps": []
-    },
-    "button-lock": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "button-lock",
-            "sha256": "1kqcc1d56jz107bswlzvdng6ny6qwp93yck2i2j921msn62qvbb2",
-            "rev": "cd0bf4a3c2f224d851e6ed8a54a6e80c129b225f"
-        },
-        "recipe": {
-            "sha256": "1arrdmb3nm570hgs18y9sz3z9v0wlkr3vwa2zgfnc15lmf0y34mp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.2",
-        "deps": []
-    },
-    "fill-column-indicator": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alpaker",
-            "repo": "Fill-Column-Indicator",
-            "sha256": "0fghhy5xqsdwal4fwlr6hxr5kpnfw71q79mxpp9db59ldnj9f5y9",
-            "rev": "5cbc077083775d4719a294455a8a8a53bb3151f8"
-        },
-        "recipe": {
-            "sha256": "0w8cmijv7ihij9yyncz6lixb6awzzl7n9qpjj2bks1d5rx46blma",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.81",
-        "deps": []
-    },
-    "serverspec": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k1LoW",
-            "repo": "emacs-serverspec",
-            "sha256": "1h58q41wixjlapia1ggf83jxcllq7492k55mc0fq7hbx3hw1q1y2",
-            "rev": "b6dfe82af9869438de5e5d860ced196641f372c0"
-        },
-        "recipe": {
-            "sha256": "001d57yd0wmz4d7qmhnanac8g29wls0sqw194003hrgirakg82id",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.7",
-        "deps": [
-            "dash",
-            "f",
-            "helm",
-            "s"
-        ]
-    },
-    "butler": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "AshtonKem",
-            "repo": "Butler",
-            "sha256": "1pii9dw4skq7nr4na6qxqasl36av8cwjp71bf1fgppqpcd9z8skj",
-            "rev": "0e91e0f01ac9c09422f076a096ee567ee138e7a4"
-        },
-        "recipe": {
-            "sha256": "1jv74l9jy55qpwf5np9nlj6a1wqsm3xirm7wm89d1h2mbsfcr0mq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.4",
-        "deps": [
-            "deferred",
-            "emacs",
-            "json"
-        ]
-    },
-    "iflipb": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jrosdahl",
-            "repo": "iflipb",
-            "sha256": "18rlyjsn9w0zbs0c002s84qzark3rrcmjn9vq4nap7i6zpaq8hki",
-            "rev": "2e0d1719abeec7982341761ee5dabb01574e6862"
-        },
-        "recipe": {
-            "sha256": "1nfrrxgi9nlhn477z8ay7jxycpcghhhmmg9dagdhrlrr20fx697d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3",
-        "deps": []
-    },
-    "ido-complete-space-or-hyphen": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "doitian",
-            "repo": "ido-complete-space-or-hyphen",
-            "sha256": "1ffmsmi31jc0gqnbdxrd8ipsy790bn6hgq3rmayylavmdpg3qfd5",
-            "rev": "ad9baaec10e06be3f85db97b6c8fd970cf20df77"
-        },
-        "recipe": {
-            "sha256": "1wk0cq5gjnprmpyvhh80ksz3fash42hckvmx8m95crbzjg9j0gbc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": []
-    },
-    "sift": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nlamirault",
-            "repo": "sift.el",
-            "sha256": "0g4fql83xbyx1ihaghxm6rk2cffz97jpy13hg865m6hh0j72dlr1",
-            "rev": "02cea9ba11f99b13888ac1842215caf190e3a94b"
-        },
-        "recipe": {
-            "sha256": "13y6nmc317hljch3x8f80jg5sb57imm7w9kdn7ybw59g55zxzz8q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": []
-    },
-    "moz": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bard",
-            "repo": "mozrepl",
-            "sha256": "13bf5jn1kgqg59j5czlzvajq2fw1rz4h5jqfc7x8w1a067nymf2c",
-            "rev": "646208b67e6c9c56d188db1eba999846d518935f"
-        },
-        "recipe": {
-            "sha256": "0ar2xgsi7csjj6fgiamrjwjc58j942dm32j3f3lz21yn2c4pnyxi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.0",
-        "deps": []
-    },
-    "timer-revert": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yyr",
-            "repo": "timer-revert",
-            "sha256": "1vq5yp6pyjam2csz22mcp353a4d5r7f9m6bsjizfmgr2ld7bwhx7",
-            "rev": "31ad8d94b85807cd9f63fcba0c90c3e9a9515fa2"
-        },
-        "recipe": {
-            "sha256": "0lvm2irfx9rb5psm1lf53fv2jjx745n1c172xmyqip5xwgmf6msy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "helm-mt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dfdeshom",
-            "repo": "helm-mt",
-            "sha256": "0gknncyhr2392xkvghgy5mh6gdv6qzvswidx2wy04ypb4s0vxgq2",
-            "rev": "27391022dbf5720cb13ecec8ca8c398c05a7cbf7"
-        },
-        "recipe": {
-            "sha256": "04hx8cg8wmm2w8g942nc9mvm12ammmjnx4k61ljrq76smd8s3x2a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "helm",
-            "multi-term"
-        ]
-    },
-    "darcula-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fommil",
-            "repo": "darcula-theme-emacs",
-            "sha256": "1gdh4izwhyly6dyrmh7lfpd12gnb8hpnafj8br51ksijsssrf21f",
-            "rev": "202a5affe59a5e1ac1d33a7e518d1df772bf2100"
-        },
-        "recipe": {
-            "sha256": "13d21gwzv66ibn0gs56ff3sn76sa2mkjvjmpd2ncxq3mcgxajnjg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "cm-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joostkremers",
-            "repo": "criticmarkup-emacs",
-            "sha256": "1bhnlcsvl1qsi36a5kz8i857spzybprsbsywpqrmjpndn74n8690",
-            "rev": "abc5adc7e00e10c388c2a57c9f1d59f164773082"
-        },
-        "recipe": {
-            "sha256": "1rgfpxbnp8wiq9j8aywm2n07rxzkhqljigwynrkyvrnsgxlq2a9x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": []
-    },
-    "dynamic-fonts": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "dynamic-fonts",
-            "sha256": "1ppwlill1z4vqd566h9zi6zx5jb7hggmnmqrga84j5n7fwqvgz7f",
-            "rev": "d318498b377d8941c7420f51616c78e3440d00f5"
-        },
-        "recipe": {
-            "sha256": "0a210ca41maa755lv1n7hhpxp0f7lfxrxbi0x34icbkfkmijhl6q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.4",
-        "deps": [
-            "font-utils",
-            "pcache",
-            "persistent-soft"
-        ]
-    },
-    "bbdb2erc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "unhammer",
-            "repo": "bbdb2erc",
-            "sha256": "1zkh7dcas80wwjvigl27wj8sp4b5z6lh3qj7zkziinwamwnxbdbs",
-            "rev": "f39a36351e1e6f1105c9e32970e7502b77b0dbcd"
-        },
-        "recipe": {
-            "sha256": "0k1f6mq9xd3568vg01dqqvcdbdshbdsi4ivkjyxis6dqfnqhlfdd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.3",
-        "deps": [
-            "bbdb"
-        ]
-    },
-    "whitespace-cleanup-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "whitespace-cleanup-mode",
-            "sha256": "0xmwhybb8x6wwfr55ym5xg4dhy1aqx1abxy9qskn7h3zf1z4pgg2",
-            "rev": "e1e250aa6f5b1a526778c7a501cdec98ba29c0a4"
-        },
-        "recipe": {
-            "sha256": "1fhdjrxxyfx4xsgfjqq9p7vhj98wmqf2r00mv8k27vdaxwsnm5p3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.10",
-        "deps": []
-    },
-    "m-buffer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "phillord",
-            "repo": "m-buffer-el",
-            "sha256": "1dnp9yj429scg94hkmc6rnrjkcy74mpf9c509k4avmlkdmmi2hzn",
-            "rev": "ea281db21af0dd48ba08f7f8e0cd2902acdf5a96"
-        },
-        "recipe": {
-            "sha256": "0l2rayglv48pcwnr1ggmn8c0az0mffgv02ivnzr9jcfs55ki07fc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.12",
-        "deps": [
-            "dash",
-            "emacs"
-        ]
-    },
-    "marshal": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sigma",
-            "repo": "marshal.el",
-            "sha256": "0sriyjjhgis7fgq276j5mw6n84jdwxf8lq0iqqiaqwmc66l985mv",
-            "rev": "2a3d102af4e996536a71ec38ab54e379c30a1ab0"
-        },
-        "recipe": {
-            "sha256": "17ikd8f1k42f28d4v5dn83zb44bsx7g336db60q068w6z8d4jbgl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.3",
-        "deps": [
-            "eieio",
-            "json"
-        ]
-    },
-    "zygospore": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "louiskottmann",
-            "repo": "zygospore.el",
-            "sha256": "0v73fgb0gf81vlihiicy32v6x86rr2hv0bxlpw7d3pk4ng1a0l3z",
-            "rev": "1af5ee663f5a7aa08d96a77cacff834dcdf55ea8"
-        },
-        "recipe": {
-            "sha256": "03mmxqbliwd1g73cxd9kqkngdy4jdavcs6j12b4wp27xmhgaj40z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.3",
-        "deps": []
-    },
-    "scala-mode2": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ensime",
-            "repo": "emacs-scala-mode",
-            "sha256": "1gfhk595vnf6565nv6m1v8dc4a3a9z34jj1qdh02lk8azg5ylk89",
-            "rev": "34888c094990bc669347f106dbd516f487e55ae3"
-        },
-        "recipe": {
-            "sha256": "0rnkln6jwwqc968w3qpc6zjjv8ylw0w6c2hsjpq2slja3jn5khch",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.22",
-        "deps": []
-    },
-    "rigid-tabs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wavexx",
-            "repo": "rigid-tabs.el",
-            "sha256": "0p044wg9d4i6f5x7bdshmisgwvw424y16lixac93q6v5bh3xmab5",
-            "rev": "c7c6b726806df7e8cb25a41b213a207850c91cb7"
-        },
-        "recipe": {
-            "sha256": "06n0bcvc3nnp84pcq3lywwga7l92jz8hnkilhbq59kydf5zbjldp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "theme-changer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hadronzoo",
-            "repo": "theme-changer",
-            "sha256": "09vf3qs949n4iqzd14iq2kgvypwdwdv8ii8l5jcqfppgspd8m8yd",
-            "rev": "d3d9c9f62a138958262ac5dd61837df427268611"
-        },
-        "recipe": {
-            "sha256": "1qbmsghkl5gs728q0gaalc7p8q7nzv3l045jc0jdxxnb7na3gc5w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.1.0",
-        "deps": []
-    },
-    "hl-sentence": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "milkypostman",
-            "repo": "hl-sentence",
-            "sha256": "1hgigbgppdhmr7rc901r95kyydjk05dck8mwbryh7kpglns365fa",
-            "rev": "f88882772f1a29fabb54194cc8aacd80d7f5b085"
-        },
-        "recipe": {
-            "sha256": "16sjfs0nnpwzj1cqfna9vhmxgznwwhb2qdmjci25hlgrdxwwyahs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "3",
-        "deps": []
-    },
-    "svg-mode-line-themes": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sabof",
-            "repo": "svg-mode-line-themes",
-            "sha256": "14h40s0arc2i898r9yysn256z6l8jkrnmqvrdg7p7658c0klz5ic",
-            "rev": "80a0e01839cafbd66899202e7764c33231974259"
-        },
-        "recipe": {
-            "sha256": "12lnszcb9bl32n9wir7vf8xiyyv7njw4xg21aj9x4dasmidyx506",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.3",
-        "deps": [
-            "xmlgen"
-        ]
-    },
-    "processing-snippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ptrv",
-            "repo": "processing2-emacs",
-            "sha256": "08ljf39jfmfpdk36nws2dnwpm7y8252zsdprsc85hr1h1ig5xy15",
-            "rev": "228bc56369675787d60f637223b50ce3a1afebbd"
-        },
-        "recipe": {
-            "sha256": "09vkm9asmjz1in0f63s7bf4amifspsqf5w9pxiy5y0qvmn28fr2r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "grizzl": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "d11wtq",
-            "repo": "grizzl",
-            "sha256": "1bq73kcx744xnlm2yvccrzlbyx91c492sg7blx2a9z643v3gg1zs",
-            "rev": "c775de1c34d1e5a374e2f40c1ae2396b4b003fe7"
-        },
-        "recipe": {
-            "sha256": "1klds0w9qrsgfppq105qr69c26zi91y575db2hxr6h9vypf2rq24",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": []
-    },
-    "hyde": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nibrahim",
-            "repo": "Hyde",
-            "sha256": "0nwsmc4c3v0wbfy917ik9k7yz8yclfac695p7p9sh9y354k3maw4",
-            "rev": "181f9d2f91c2678a22243c5485162fa7999fd893"
-        },
-        "recipe": {
-            "sha256": "18kjcxm7qmv9bfh4crw37zgax8khjqs9zkp4lrb490zlad2asbs3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": []
-    },
-    "pabbrev": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "phillord",
-            "repo": "pabbrev",
-            "sha256": "073qpa223ja673p63mhvy4l6yyv3k7z05ifwvn7bmq4b5fq42hw6",
-            "rev": "127a8b10cf352b0491fefd2f4178ba78ee587564"
-        },
-        "recipe": {
-            "sha256": "1mbfa40pbzbi00sp155zm43sj6nw221mcayc2rk3ppin9ps95hx3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "4.1",
-        "deps": []
-    },
-    "auto-indent-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "auto-indent-mode.el",
-            "sha256": "1hlsgsdxpx42kmqkjgy9b9ldz5i4dbi879v87pjd2qbkj8iywb6y",
-            "rev": "ad7032ee058a74405d04d775b0b384351536bc53"
-        },
-        "recipe": {
-            "sha256": "1nk78p8lqs8cx90asfs8iaqnwwyy8fi5bafaprm9c0nrxz299ibz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.126",
-        "deps": []
-    },
-    "evil-leader": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cofi",
-            "repo": "evil-leader",
-            "sha256": "1k2zinchs0jjllp8zkpggckyy63dkyi5yig3p46vh4w45jdzysk5",
-            "rev": "753b01eb4958370ae2226b3780ff31fe157c2852"
-        },
-        "recipe": {
-            "sha256": "154s2nb170hzksmc87wnzlwg3ic3w3ravgsfvwkyfi2q285vmra6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4.3",
-        "deps": [
-            "evil"
-        ]
-    },
-    "darktooth-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsfodder",
-            "repo": "emacs-theme-darktooth",
-            "sha256": "1p7ih9fmcxnnxkj2mz56xa403m828wyyqvliabf5amklzjlhb3z9",
-            "rev": "ce2d8d5faeb72205bdcb192dfc1e4769e7088fa3"
-        },
-        "recipe": {
-            "sha256": "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.37",
-        "deps": []
-    },
-    "window-layout": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiwanami",
-            "repo": "emacs-window-layout",
-            "sha256": "0jyymmbz03zj2ydca1rv6ra0b2brjl7pyl4897zd00j5kvqjdyif",
-            "rev": "9caf5be4ff1b5d1e141783d7133dab7a46424fef"
-        },
-        "recipe": {
-            "sha256": "1n4a6z00lxsffirjrmbaaw432w798b9vv34qawgn1k17y9l7gb85",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3",
-        "deps": []
-    },
-    "edit-list": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsmirror",
-            "repo": "edit-list",
-            "sha256": "0981hy1n50yizc3k06vbxqrpfml817a67kab1hkgkw5v6ymm1hc9",
-            "rev": "f460d3f9e208a4e606fe6ded307f1b011916ca71"
-        },
-        "recipe": {
-            "sha256": "0mi12jfgx06i0yr8k5nk80xryqszjv0xykdnri505862rb90xakv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": []
-    },
-    "grapnel": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "leathekd",
-            "repo": "grapnel",
-            "sha256": "0xcj1kqzgxifhrhpl9j2nfpnkd6213ix5z7f97269v3inpzaiyf5",
-            "rev": "7387234eb3f0285a490fddb1e06a4bf029719fb7"
-        },
-        "recipe": {
-            "sha256": "019cdx1wdx8sc2ibqwgp1akgckzxxvrayyp2sv806gha0kn6yf6r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.3",
-        "deps": []
-    },
-    "ducpel": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alezost",
-            "repo": "ducpel",
-            "sha256": "17yldk76mxakhb90bma7r4z9jgx02wankgk17r2di196mc04bj7b",
-            "rev": "ece785baaa102bd2e9d54257af3a92bacc5757bc"
-        },
-        "recipe": {
-            "sha256": "1cqrkgg7n9bhjswnpl7yc6w6yjs4gfbliaqsimmf9z43wk2ml4pc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "elfeed": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "elfeed",
-            "sha256": "1ln0wprk8m2d33z804ld73jwv9x51xkwl9xfsywbh09w3x2zb51j",
-            "rev": "9fd3cf8833e26bf41f52a7e2149734858d2eeb96"
-        },
-        "recipe": {
-            "sha256": "1psga7fcjk2b8xjg10fndp9l0ib72l5ggf43gxp62i4lxixzv8f9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.4.0",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "resize-window": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dpsutton",
-            "repo": "resize-window",
-            "sha256": "1ywcnrrr4wp6c951mqfscvdgcmwyvxy80p40vi27nzbl977lb1xv",
-            "rev": "d4aa9e6e950f5e0455b20f4443fda20742ec0403"
-        },
-        "recipe": {
-            "sha256": "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "forecast": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cadadr",
-            "repo": "forecast.el",
-            "sha256": "1jw888nqmbi9kcd9ycl2fqrmrnqxnmkx72n0b3nf3hp7j956yb21",
-            "rev": "51526906140700f076bd329753abe7ae31b6da90"
-        },
-        "recipe": {
-            "sha256": "0whag2n1120384w304g0w4bqr7svdxxncdhnz4rznfpxlgiw2rsc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.9",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "tox": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chmouel",
-            "repo": "tox.el",
-            "sha256": "16217i8rjhgaa5kv8iq0s14b42v5rs8m2qlr60a0x6qzy65chq39",
-            "rev": "5c1a7c18cb7f2fd2da2386debf86012e6953e15d"
-        },
-        "recipe": {
-            "sha256": "1z81x8fs5q6r19hpqphsilk8wdwwnfr8w78x5x298x74s9mcsywl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": []
-    },
-    "init-open-recentf": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zonuexe",
-            "repo": "init-open-recentf.el",
-            "sha256": "06w1vnfhjy8g62z6xajin5akgh30pa0kk56am61kv6mi5ia8fc96",
-            "rev": "39da6a50e7f39e6ccd9aada0c20d8b6d501cb487"
-        },
-        "recipe": {
-            "sha256": "0xlmfxhxb2car8vfx7krxmxb3d56x0r3zzkj8ds7yqvr65z85x2r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.2",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "date-field": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "emacs-date-field",
-            "sha256": "1lmwnj2fnvijj9qp4rjggl7c4x91vnpb47rqaam6m2wmr5wbrx3w",
-            "rev": "11c9170d1f7b343233f7716d4c0a62be024c1654"
-        },
-        "recipe": {
-            "sha256": "0fmw13sa4ajs1xkrkdpcjpbp0jl9d81cgvwh93myg8yjjn7wbmvk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.1",
-        "deps": [
-            "dash",
-            "log4e",
-            "yaxception"
-        ]
-    },
-    "slamhound": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "technomancy",
-            "repo": "slamhound",
-            "sha256": "09ccdgg2wgw3xmlkpjsaqmnmf7f8rhjy4g6ypsn1sk5rgbgk8aj8",
-            "rev": "2f896d6ba15d09aae66b5fdecc0d855f6b03abc9"
-        },
-        "recipe": {
-            "sha256": "14zlcw0zw86awd6g98l4h2whav9amz4m8ik877d1wsdjf69g7k9x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.5.4",
-        "deps": []
-    },
-    "evil-numbers": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cofi",
-            "repo": "evil-numbers",
-            "sha256": "13jg2xbh4p02x1nj77b6csb93hh56c1nv8kslcq2hjj3caipk4m8",
-            "rev": "8834eb2e8bd93561a706363946701d0d90546a9f"
-        },
-        "recipe": {
-            "sha256": "1lpmkklwjdf7ayhv99g9zh3l9hzrwm0hr0ijvbc7yz3n398zn1b2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": []
-    },
-    "switch-window": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dimitri",
-            "repo": "switch-window",
-            "sha256": "1zpfilcaycj0l2q3zyvpjbwp5j3d9rrkacd5swzlr1n1klvbji48",
-            "rev": "cd4b06121aa5bac4c4b13b63526a99008def5f2b"
-        },
-        "recipe": {
-            "sha256": "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": []
-    },
-    "helm-robe": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-helm-robe",
-            "sha256": "163ljqar3vvbavzc8sk6rnf8awyc2rhh2g117fglswich3c8lnqg",
-            "rev": "7348d0bc0251b51979554ea678b970fd01c0efe9"
-        },
-        "recipe": {
-            "sha256": "1gi4nkm9xvnxv0frmhiiw8dkmnmhfpr9n0b6jpidlvr8xr4s5kyw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "helm"
-        ]
-    },
-    "ac-capf": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-ac-capf",
-            "sha256": "0nyq34yq4jcp3p30ygma3iz1h0q551p33792byj76pa5ps09g1da",
-            "rev": "17571dba0a8f98111f2ab758e9bea285b263781b"
-        },
-        "recipe": {
-            "sha256": "1drgk5iz2wp3rxzd39pj0n4cfmm5z8zqlp50jw5z7ffbbg35qxbm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "auto-complete",
-            "cl-lib"
-        ]
-    },
-    "lice": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "buzztaiki",
-            "repo": "lice-el",
-            "sha256": "0hi8s20vw4a5i5n5jlm5dzgsl1qpfyqbpskqszjls1xrrf3dd4zl",
-            "rev": "69f2d87984f3f3d469db35e241fbbe979384cd03"
-        },
-        "recipe": {
-            "sha256": "1hv2hz3153x0gk7f2js18dbx5pyprfdf2pfxb658fj16vxpp7y6x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": []
-    },
-    "mark-tools": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "stsquad",
-            "repo": "emacs-mark-tools",
-            "sha256": "0fcyspz7n97n84d9203mxgn8ar4rn52qa49s3vayfrbkn038j5qw",
-            "rev": "0e7ac2522ac84155cab341dc49f7f0b81067133c"
-        },
-        "recipe": {
-            "sha256": "1688y7lnzhwdva2ildjabzi10i87klfsgvs947i7gfgxl7jwhisq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": []
-    },
-    "dedicated": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsorphanage",
-            "repo": "dedicated",
-            "sha256": "0pba9s0h37sxyqh733vi6k5raa4cs7aradipf3826inw36jcw414",
-            "rev": "8275fb672f9cc4ba6682ebda0ef91db827e32992"
-        },
-        "recipe": {
-            "sha256": "1ka8n02r3nd2ksbid23g2qd6707c7xsjx7lbbdi6pcmwam5mglw9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": []
-    },
-    "pixiv-novel-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zonuexe",
-            "repo": "pixiv-novel-mode.el",
-            "sha256": "1wg8pcwd70ixn2bxh01934zl12ry4pgx3l9dccpbjdi40gira00d",
-            "rev": "4dd9caf749190fab8f0b33862b3894b635de46c5"
-        },
-        "recipe": {
-            "sha256": "0f1rxvf9nrw984122i6dzsgik9axfjv6yscmg203s065n9lz17px",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.3",
-        "deps": []
-    },
-    "edit-indirect": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "edit-indirect",
-            "sha256": "10c84aad1lnr7z9f75k5ylgchykr3srcdmn88hlcx2n2c4jfbkds",
-            "rev": "d1ab87fdfbc2a894a7eaac8b289a5af2d7c835b0"
-        },
-        "recipe": {
-            "sha256": "0q5jjmrvx5kaajllmhaxihsab2kr1vmcsfqrhxdhw3x3nf41s439",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.2",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "fireplace": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "johanvts",
-            "repo": "emacs-fireplace",
-            "sha256": "0p4b4j4s3r91b691j2330lywz16mmmwfx8s4w98498agxl2vjdnx",
-            "rev": "5bafff73664854519aa36108f9b0e7add3bf8b8d"
-        },
-        "recipe": {
-            "sha256": "1apcypznq23fc7xgy4xy1c5hvfvjx1xhyq3aaq1lf59v99zchciw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.0",
-        "deps": []
-    },
-    "morlock": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "morlock",
-            "sha256": "1ndgw4799d816pkn2bwja5kmigydpmj9znn8cax4dxsd9fg2hzjy",
-            "rev": "804131c7cff5dafa762c666fd66458111e4ee36f"
-        },
-        "recipe": {
-            "sha256": "0693jr1k8mzd7hwp52azkl62c1g1p5yinarjcmdksfyqblqq5jna",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.0",
-        "deps": []
-    },
-    "auto-complete": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "auto-complete",
-            "repo": "auto-complete",
-            "sha256": "0q880dksf3bj1hixa4zhj3ybvrqf1wcnjnmb37i49qwdy6p1ma06",
-            "rev": "70770b17168c30fe482467d7219cfbe8650c5e1c"
-        },
-        "recipe": {
-            "sha256": "1c4ij5bnclg94jdzhkqvq2vxwv6wvs051mbki1ibjm5f2hlacvh3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.5.0",
-        "deps": [
-            "cl-lib",
-            "popup"
-        ]
-    },
-    "sparql-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ljos",
-            "repo": "sparql-mode",
-            "sha256": "1gk2ps7fn9z8n6r923qzn518gz9mrj7mb6j726cz8qb585ndjbij",
-            "rev": "303858e7f91829ec720141482c777460e66f310b"
-        },
-        "recipe": {
-            "sha256": "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.11.2",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "expand-region": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "expand-region.el",
-            "sha256": "0rvkhjfkhamr3ys9iarblfwvwq7n4wishdjgnwj1lx7m80h1hzbg",
-            "rev": "90c4e959ac8bf0bbd857dd679f38a121c592bf7a"
-        },
-        "recipe": {
-            "sha256": "1c7f1nqsqdc75h22fxxnyg0m4yxj6l23sirk3c71fqj14paxqnwg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.10.0",
-        "deps": []
-    },
-    "auto-compile": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "auto-compile",
-            "sha256": "07vnk8az4lcxncqn01jvks38b4hpdmg43nbby2b39zy50agqnwsg",
-            "rev": "90eddfb63bd2b58be8a3fe9400b67ea45f67bb29"
-        },
-        "recipe": {
-            "sha256": "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3.0",
-        "deps": [
-            "dash",
-            "emacs",
-            "packed"
-        ]
-    },
-    "redpen-paragraph": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "karronoli",
-            "repo": "redpen-paragraph.el",
-            "sha256": "19c5rkb4nn6fs85lixrgrv8gagr69h430inig31dvm4fip9xdjp9",
-            "rev": "e942c41c0308d8fbac1f145387d4f6ea1091e26b"
-        },
-        "recipe": {
-            "sha256": "0jr707ik6fhznq0q421l986w85ah0n9b4is91zrgbk1v6miqrhca",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.22",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "r-autoyas": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "r-autoyas.el",
-            "sha256": "02bddznlqys37fnhdpp2g9xa9m7kfgrj1vl0hc5kr42hggk9wwmg",
-            "rev": "563254f01ce530ca4c9be1f23395e3fd7d520ff9"
-        },
-        "recipe": {
-            "sha256": "18zifadsgbwnga205jvpx61wa2dvjxmxs5v7cjqhny45a524nbv4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.28",
-        "deps": []
-    },
-    "search-web": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tomoya",
-            "repo": "search-web.el",
-            "sha256": "08yc67a4ji7z8s0zh500wiscziqsxi92i1d33fjla2mcr8sxxn0i",
-            "rev": "c4ae86ac1acfc572b81f3d78764bd9a54034c331"
-        },
-        "recipe": {
-            "sha256": "0qqx9l8dn1as4gqpq80jfacn6lz0132m91pjzxv0fx6al2iz0m36",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": []
-    },
-    "clips-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "grettke",
-            "repo": "clips-mode",
-            "sha256": "0i6sj5rs4b9v8aqq9l6wr15080qb101hdxspx6innhijhajgmssd",
-            "rev": "a3ab4a3e958d54a16544ec38fe6338f27df20817"
-        },
-        "recipe": {
-            "sha256": "083wrhjn04rg8vr6j0ziffdbdhbfn63wzl4q7yzpkf8qckh6mxhf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7",
-        "deps": []
-    },
-    "kivy-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kivy",
-            "repo": "kivy",
-            "sha256": "0qz2q9c5q0l3ibhil2z10yb161fimgdwyp6q8izs9d59qdlmr8x8",
-            "rev": "7c5b1dc7c50a67079a41f27b1cea1a652119a7bc"
-        },
-        "recipe": {
-            "sha256": "02l230rwivr7rbiqm4vg70458z35f9v9w3mdapcrqd5d07y5mvi1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.9.0",
-        "deps": []
-    },
-    "mpv": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kljohann",
-            "repo": "mpv.el",
-            "sha256": "1pjhch8vah0kf73fl2fk6khhrx1kflggd3zlxrf7w4fxr0qn8la3",
-            "rev": "059135de3979e044f14503806047476d9be9f0e8"
-        },
-        "recipe": {
-            "sha256": "1vq308ac6jj1h8qa2b2sypisb38hbvwjimqndhpfir06fghkw94l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "json",
-            "names",
-            "org"
-        ]
-    },
-    "erlang": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "erlang",
-            "repo": "otp",
-            "sha256": "1dl2sxd77miaqbl9plrg6kgql5jg5vz42lj9f85i771g95h2c6nk",
-            "rev": "21d6192389a04024f7a41ced9d0911a9cce6f4e8"
-        },
-        "recipe": {
-            "sha256": "1gmrdkfanivb9l5lmkl0853snlhl62w34537r82w11z2fbk9lxhc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "18.2.1",
-        "deps": []
-    },
-    "concurrent": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiwanami",
-            "repo": "emacs-deferred",
-            "sha256": "0059jy01ni5irpgrj9fa81ayd9j25nvmjjm79ms3210ysx4pgqdr",
-            "rev": "5ef948e9b4c29a1c02d3f1613b21cd0d6d7ef476"
-        },
-        "recipe": {
-            "sha256": "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.2",
-        "deps": [
-            "deferred"
-        ]
-    },
-    "helm-zhihu-daily": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xuchunyang",
-            "repo": "helm-zhihu-daily",
-            "sha256": "1j6ssbjbm5ym3pg0icpfp735y4dfhlky9qhl9hwp2n3wmba5g9h1",
-            "rev": "fcc534bb42c81070063b28d3d939a53af0fa9a7c"
-        },
-        "recipe": {
-            "sha256": "0hkgail60s9qhxl0pskqxjvfz93iq1qh1kcmcq0x5kq7d08b911r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "helm"
-        ]
-    },
-    "vector-utils": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "vector-utils",
-            "sha256": "0lzq31zqnk32vfp3kicnvgfr3nkv8amjzxmk9nrz1kwgmq7gvkjk",
-            "rev": "2bd63c8ade1a2b6f8aac403c5f25adda2215a685"
-        },
-        "recipe": {
-            "sha256": "07armr23pq5pd47lqhir6a59r86c84zikbc51d8vfcaw8y71yr5n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.2",
-        "deps": []
-    },
-    "bongo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dbrock",
-            "repo": "bongo",
-            "sha256": "1q3ws2vn062dh7ci6jn2k2bcn7szh3ap64sgwkzdd6f1pas37fnr",
-            "rev": "c5280a11fe8ff39fba4b09ec4a39b0f799d2b59c"
-        },
-        "recipe": {
-            "sha256": "07i9gw067r2igp6s2g2iakm1ybvw04q6zznna2cfdf08nax64ghv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "caskxy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "caskxy",
-            "sha256": "1j1lw5zifp7q1ykm6si0nzxfp7n3z2lzla2njkkxmc2s6m7w4x1a",
-            "rev": "279f3ab79bd77fe69cb3148a79896b9bf118a9b3"
-        },
-        "recipe": {
-            "sha256": "0x4s3c8m75zxsvqpgfc5xwll0489zzdnngmnq048z9gkgcd7pd2s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.5",
-        "deps": [
-            "log4e",
-            "yaxception"
-        ]
-    },
-    "aurora-config-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bdd",
-            "repo": "aurora-config.el",
-            "sha256": "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28",
-            "rev": "0a7ca7987c3a0824e25470389c7d25c337a81593"
-        },
-        "recipe": {
-            "sha256": "0yqmpwj1vp0d5w9zw1hbyxzsbvw165dsgk1v1dxizkqwn7b1v7jm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.2",
-        "deps": []
-    },
-    "twittering-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hayamiz",
-            "repo": "twittering-mode",
-            "sha256": "193v98i84xybm3n0f30jin5q10i87vbcnbdhl4zqi7jij9p5v98z",
-            "rev": "27e7f3aab238bd0788fd3b471c645c3ceceb0f13"
-        },
-        "recipe": {
-            "sha256": "0v9ijxw5jazh2hc0qab48y71za2l9ryff0mpkxhr3f79irlqy0a1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "3.0.0",
-        "deps": []
-    },
-    "rtags": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Andersbakken",
-            "repo": "rtags",
-            "sha256": "0ndyvpgbvfcnxf74ffaby36rqsnwj10j1s9vr3gan9mqi6spcggf",
-            "rev": "ba85598841648490e64246be802fc2dcdd45bc3c"
-        },
-        "recipe": {
-            "sha256": "16jvbr4nm48p3dj9wmysjaxyz4ajcay19risqrs9fzrifkr21c9p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.0",
-        "deps": []
-    },
-    "skewer-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "skewer-mode",
-            "sha256": "05jndz0c26q60s416vqgvr66axdmxb7qsr2g70fvl5iqavnayhpv",
-            "rev": "8a3a22ef4fe4d9d0831e82fde08c6355d0b19ed4"
-        },
-        "recipe": {
-            "sha256": "1zp4myi9f7pw6zkgc0xg12585iihn7khcsf20pvqyc0vn4ajdwqm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.6.2",
-        "deps": [
-            "emacs",
-            "js2-mode",
-            "simple-httpd"
-        ]
-    },
-    "yesql-ghosts": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "yesql-ghosts",
-            "sha256": "0yvz7lmid4jcikb9jmc7h2lcry3fdyy809k25nyasj2bk41xqqsd",
-            "rev": "bd834e97f263f9f981758c1462bc6297a83ca852"
-        },
-        "recipe": {
-            "sha256": "1hxzbnfd15f0ifdqjbw9nhxd0z46x705v2bc0xl71nav78fgpswf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "cider",
-            "dash",
-            "s"
-        ]
-    },
-    "latex-extra": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "latex-extra",
-            "sha256": "1rr6cgx70avqf1b19la7g8cav926676a76cflkkw18c1bsw83ss3",
-            "rev": "455b7873de095cbce6aa256f33cf64dba3dbaa29"
-        },
-        "recipe": {
-            "sha256": "1w98ngxymafigjpfalybhs12jcf4916wk4nlxflfjcx8ryd9wjcj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.11",
-        "deps": [
-            "auctex",
-            "cl-lib"
-        ]
-    },
-    "travis": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nlamirault",
-            "repo": "emacs-travis",
-            "sha256": "1jd7xsvs4m55fscp62a9lk59ip4sgifv4kazl55b7543nz1i31bz",
-            "rev": "c8769d3db10ed4604969049e3bd276afa0a0138e"
-        },
-        "recipe": {
-            "sha256": "1km496cq1vni9gy2d3z4c9524q62750ywz745rjz4r7178ip9mix",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.0",
-        "deps": [
-            "dash",
-            "pkg-info",
-            "request",
-            "s"
-        ]
-    },
-    "project-explorer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sabof",
-            "repo": "project-explorer",
-            "sha256": "1hv8ifrpwn434sm41vkgbwni21ma5kfybkwasi6zp0f2b5i9ziw7",
-            "rev": "7c2cc86a81f679dda355110f916366b64893a5d4"
-        },
-        "recipe": {
-            "sha256": "076lzmyi1n7yrgdgyh9qinq271qk6k64x0msbzarihr3p4psrn8m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.14.3",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "es-lib",
-            "es-windows"
-        ]
-    },
-    "ac-helm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yasuyk",
-            "repo": "ac-helm",
-            "sha256": "1gw38phyaslpql7szvlpwgyfngdgd21f6lq406vq0gjwwmxgig34",
-            "rev": "f2110576b0eb35850a7f638c1a991a9fa0c8da3a"
-        },
-        "recipe": {
-            "sha256": "16ajxlhcah5zbvywpc6l4l1arr308gjpgvdx6l1nrv2zvpckhlwq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.1",
-        "deps": [
-            "auto-complete",
-            "helm",
-            "popup"
-        ]
-    },
-    "rainbow-delimiters": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "rainbow-delimiters",
-            "sha256": "0gxc8j5a14bc9mp43cbcz41ipc0z1yvmypg52dnl8hadirry20gd",
-            "rev": "0823d0c67f935a4c36a1c945e93051102963c7fb"
-        },
-        "recipe": {
-            "sha256": "132nslbnszvbgkl0819z811yar3lms1hp5na4ybi9gkmnb7bg4rg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.1.1",
-        "deps": []
-    },
-    "genrnc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "emacs-genrnc",
-            "sha256": "08cw1fa25kbhbq2sp1cpn90bz38i9hjfdj93xf6wvki55b52s0nn",
-            "rev": "da75b1966a73ad215ec2ced4522c25f4d0bf1f9a"
-        },
-        "recipe": {
-            "sha256": "1nwbdscl0yh9j1n421can93m6s8j9dkyb3xmpampr6x528g6z0lm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "concurrent",
-            "deferred",
-            "log4e",
-            "yaxception"
-        ]
-    },
-    "unicode-progress-reporter": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "unicode-progress-reporter",
-            "sha256": "0qy1hla7vf674ynqdzsaw2cnk92nhpcimww5q94rc0a95pzw64wd",
-            "rev": "f4705332412b12fc72ca868b77c78465561bda75"
-        },
-        "recipe": {
-            "sha256": "03z7p27470fqy3gd356l9cpp44a35sfrxz94dxmx388rzlygk7y7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.4",
-        "deps": [
-            "emacs",
-            "pcache",
-            "persistent-soft",
-            "ucs-utils"
-        ]
-    },
-    "fm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsmirror",
-            "repo": "fm",
-            "sha256": "0r2j238iyxnww60xpbxggjmz6y2waayw4m51f0l39hszbhags2cv",
-            "rev": "6266840de17ac396dd7275a71da72cd5120c35a6"
-        },
-        "recipe": {
-            "sha256": "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "company-anaconda": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "proofit404",
-            "repo": "company-anaconda",
-            "sha256": "1i6788qfinh47c5crgr57ykgbp6bvk1afcl00c8gywxsf8srvnvy",
-            "rev": "137ba58960a5feeb23aff34c9225fdf161f49f98"
-        },
-        "recipe": {
-            "sha256": "1s7y47ghy7q35qpfqavh4p9wr91i6r579mdbpvv6h5by856yn4gl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "anaconda-mode",
-            "cl-lib",
-            "company",
-            "dash",
-            "s"
-        ]
-    },
-    "inlineR": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "inlineR.el",
-            "sha256": "15nasjknmzy57ilj1gaz3w5sj8b3ijcpgwcd6w2r9xhgcl86m40q",
-            "rev": "29357186beca825e3d0451b700ec09b9ed65e37b"
-        },
-        "recipe": {
-            "sha256": "1fflq2gkpfn3jkv4a6yywzmxsq6qszfid1ri85ass1ppw6scdvzw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "evil-tutor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syl20bnr",
-            "repo": "evil-tutor",
-            "sha256": "1rskvkmz30xyy8xfjf2i35f3dxh663gb3plfy3f0j6z17i086jl2",
-            "rev": "909273bac88b98a565f1b89bbb13d523b7edce2b"
-        },
-        "recipe": {
-            "sha256": "1hvc2w5ykrgh62n4sxqqqcdk5sd7nmh6xzv4mir5vf9y2dgqcvsn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": [
-            "evil"
-        ]
-    },
-    "flycheck-dmd-dub": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "atilaneves",
-            "repo": "flycheck-dmd-dub",
-            "sha256": "1ap5hgvaccmf2xkfvyp7rqcfjwmiy6mhr6ccgahxm2z0vm51kpyh",
-            "rev": "e8744adaba010415055ac15c702f780dd6e13e14"
-        },
-        "recipe": {
-            "sha256": "0pg3sf7h6xqv65yqclhlb7fx1mp2w0m3qk4vji6m438kxy6fhzqm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9",
-        "deps": [
-            "flycheck"
-        ]
-    },
-    "evil-visualstar": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bling",
-            "repo": "evil-visualstar",
-            "sha256": "1n2c0gkd6s9c8sqzinq17lnn7n5wpfj7ri50bjsk452wq8xfg94j",
-            "rev": "de939b4013f52a19d1e413c601bbcea88f0233ac"
-        },
-        "recipe": {
-            "sha256": "135l9hjfbpn0a6p53picnpydi9qs5vrk2rfn64gxa5ag2apcyycy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "evil"
-        ]
-    },
-    "rainbow-identifiers": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "rainbow-identifiers",
-            "sha256": "05i0jpmxzsj2lsj48cafn3v93z37l7k5kaza2ik3yirdpjdibyrh",
-            "rev": "19fbfded1baa98d12335f26f6d7b20e5ae44ce2e"
-        },
-        "recipe": {
-            "sha256": "0lw790ymrgpyh0sxwmzinl2ik5vl5vggbg14cd0cx5yagkw5y3mp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.2",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "demangle-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "liblit",
-            "repo": "demangle-mode",
-            "sha256": "13jfhc9gavvb9dxmgi3k7ivp5iwh4yw4m11r2s8wpwn6p056bmfl",
-            "rev": "07e62a7f976f6c7366b4b0475bbb5cff881452b8"
-        },
-        "recipe": {
-            "sha256": "0ky0bb6rc99vrdli4lhs656qjndnla9b7inc2ji9l4n1zki5qxzk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "github-clone": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dgtized",
-            "repo": "github-clone.el",
-            "sha256": "18c169nxvdl7iv18pyqx690ldg6pkc8njaxdg1cww6ykqzqnfxh7",
-            "rev": "ab048cf49d9ebda73acae803bc44e731e629d540"
-        },
-        "recipe": {
-            "sha256": "0ffrm4lmcj3d9kx3g2d5xbiih7hn4frs0prjrvcjq8acvsbc50q9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "emacs",
-            "gh",
-            "magit"
-        ]
-    },
-    "shrink-whitespace": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jcpetkovich",
-            "repo": "shrink-whitespace.el",
-            "sha256": "050gmxdk88zlfjwi07jsj2mvsfcv5imhzcpa6ip3cqkzpmw3pl32",
-            "rev": "24518d58e8e692fa98a73d5e7cd44c1536ab4e42"
-        },
-        "recipe": {
-            "sha256": "12if0000i3rrxcm732layrv2h464wbb4xflbbfc844c83dbx1jmq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.1",
-        "deps": []
-    },
-    "hi2": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nilcons",
-            "repo": "hi2",
-            "sha256": "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf",
-            "rev": "c9d199727b5cdcb9e36a972b38131ce4611fd6c8"
-        },
-        "recipe": {
-            "sha256": "1wxkjg1jnw05lqzggi20jy2jl20d8brvv76vmrf6lnz62g6jv9h2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "deferred": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiwanami",
-            "repo": "emacs-deferred",
-            "sha256": "0059jy01ni5irpgrj9fa81ayd9j25nvmjjm79ms3210ysx4pgqdr",
-            "rev": "5ef948e9b4c29a1c02d3f1613b21cd0d6d7ef476"
-        },
-        "recipe": {
-            "sha256": "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.2",
-        "deps": []
-    },
-    "bind-key": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jwiegley",
-            "repo": "use-package",
-            "sha256": "07vwg0bg719gb8ln1n5a33103903vvrphnkbvvfn43904pkrf14w",
-            "rev": "2b077f6e485e8c5c167413c03246068022b6bc71"
-        },
-        "recipe": {
-            "sha256": "1qw2c27016d3yfg0w10is1v72y2jvzhq07ca4h6v17yi94ahj5xm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.1",
-        "deps": []
-    },
-    "bbdb-": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "bbdb-",
-            "sha256": "17nbnkg0zn6p89r27mk9hl6qhv6xscwdsq8iyikdw03svpr16lnp",
-            "rev": "2839e84c894de2513af41053e80a277a1b483d22"
-        },
-        "recipe": {
-            "sha256": "1vzbalcchay4pxl9f1sxg0zclgc095f59dlj15pj0bqq61sbl9jf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.2",
-        "deps": [
-            "bbdb",
-            "log4e",
-            "yaxception"
-        ]
-    },
-    "ace-pinyin": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cute-jumper",
-            "repo": "ace-pinyin",
-            "sha256": "10n01sgdi1zq1fyb5ani1fbvwfnqnj74rxzmw5v0y72cwq27r9kr",
-            "rev": "10f66ba2355bed78ef0a1ad24edb00972a0dbe02"
-        },
-        "recipe": {
-            "sha256": "18gmj71zd0i6yx8ifjxsqz2v81jx0j37f5kxllf31w7fj32ymbkc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.3",
-        "deps": [
-            "ace-jump-mode",
-            "avy"
-        ]
-    },
-    "prop-menu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "david-christiansen",
-            "repo": "prop-menu-el",
-            "sha256": "18ap2liz5r5a8ja2zz9182fnfm47jnsbyblpq859zks356k37iwc",
-            "rev": "50b102c1c0935fd3e0c465feed7f27d66b21cdf3"
-        },
-        "recipe": {
-            "sha256": "0dhy52fxxpa058mhhx0slw3sly3dlxm9vkax6fd1sap6f6v00p5i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.2",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "bbcode-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ejmr",
-            "repo": "bbcode-mode",
-            "sha256": "1xvxz9sk9l57a4kiiavxxdp0v241mfgiy2lg5ilacq1cd6xrrhky",
-            "rev": "e693ab09c3f34cabfd185e7c249c0b5403f0a7e0"
-        },
-        "recipe": {
-            "sha256": "0ixxavmilr6na56yc148prbh3nlhcwir6rxqvh332cr8vr9gmp89",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.0.0",
-        "deps": []
-    },
-    "fold-dwim": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsmirror",
-            "repo": "fold-dwim",
-            "sha256": "1k8z30imlxvqm7lv12kgqdfgc5znxyvl9jxi8j2ymmwlgy11f726",
-            "rev": "4764b0246a722d37eb8ec9f204ffaccaad1755d0"
-        },
-        "recipe": {
-            "sha256": "0c9yxx45zlhb1h4ldgkjv7bndwlagpyingaaqn9dcsxidrvp3p5x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2",
-        "deps": []
-    },
-    "cake-inflector": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k1LoW",
-            "repo": "emacs-cake-inflector",
-            "sha256": "1w7yq35gzzwyf480d8gc5r6jbnawg09l6663q068ir6zr9pp4far",
-            "rev": "40bf11890842ba305954528694e1c39a8b73737b"
-        },
-        "recipe": {
-            "sha256": "04mrqcm1igb638skaq2b3nr5yzxnck2vwhln61rnh7lkfxq7wbwf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.1",
-        "deps": [
-            "s"
-        ]
-    },
-    "purescript-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dysinger",
-            "repo": "purescript-mode",
-            "sha256": "1wk319akv0scvyyjsd48pisi2i1gkahhsan9hfszrs6xx3anvfd9",
-            "rev": "6a4d4bdd178c65183a715c7729941a0b8fe5f253"
-        },
-        "recipe": {
-            "sha256": "00gz752mh7144nsaka5q3q4681jp845kc5vcy2nbfnqp9b24l55m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "13.10",
-        "deps": []
-    },
-    "rectangle-utils": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thierryvolpiatto",
-            "repo": "rectangle-utils",
-            "sha256": "048pjrd04w6w4v6r56yblbqgkjh01xib7k1i6rjc6288jh5vr1vm",
-            "rev": "9328291ad043fdf617cd2191692f13fba5f9a9bb"
-        },
-        "recipe": {
-            "sha256": "1w5z2gykydsfp30ahqjihpvq04c5v0cfslbrrg429hycys8apws7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "hippie-namespace": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "hippie-namespace",
-            "sha256": "0nfr8ad0klqwi97fjchvwx9mfc672lhv3ll166sr8vn6jlh7rkv0",
-            "rev": "79a662dfe9e61341e071b879f4f9101ca027ad10"
-        },
-        "recipe": {
-            "sha256": "1bzjhq116ci9c9f0aw121fn3drmg2pw5ny1w6wcasa4p30syxxf0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.8",
-        "deps": []
-    },
-    "sbt-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ensime",
-            "repo": "emacs-sbt-mode",
-            "sha256": "0y846zmcz5x2jn5bndm0mfi18jc5cd1fkidgc4wvqmm0w30gyx4q",
-            "rev": "be70372bb0890a4f8bec1b6ef10b30ed2e3f5236"
-        },
-        "recipe": {
-            "sha256": "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "scala-mode2"
-        ]
-    },
-    "shpec-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "shpec",
-            "repo": "shpec-mode",
-            "sha256": "09454mcjd8n1090pjc5mk1dc6bn3bgh60ddpnv9hkajkzpcjxx4h",
-            "rev": "76bccd63e3b70233a6c9ca0798dd03550952cc76"
-        },
-        "recipe": {
-            "sha256": "155hc1nym3fsvflps8d3ixaqw1cafqp97zcaywdppp47n7vj8zjl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": []
-    },
-    "anything-replace-string": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k1LoW",
-            "repo": "anything-replace-string",
-            "sha256": "1834yj2vgs4dasdfnppc8iw8ll3yif948biq9hj0sbpsa2d8y44k",
-            "rev": "1962f24243d6013bcef7e8d23136277d42e13130"
-        },
-        "recipe": {
-            "sha256": "1fagi6cn88p6sf1yhx1qsi7nw9zpyx9hdfl66iyskqwddfvywp71",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.2",
-        "deps": [
-            "anything"
-        ]
-    },
-    "discover": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mickeynp",
-            "repo": "discover.el",
-            "sha256": "0qxw30zrlcxhxb0alrgyiclrk44dysal8xsbz2mvgrb6jli8wg18",
-            "rev": "bbfda2b4e429985a8fa7971d264c942767cfa816"
-        },
-        "recipe": {
-            "sha256": "1hf57p90jn1zzhjl63zv9ascbgkcbr0p0zmd3fvzpjsw84235dga",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "makey"
-        ]
-    },
-    "ledger-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ledger",
-            "repo": "ledger",
-            "sha256": "110yvfj01cfl40pf8c1ad8hy07kb6ibjiwvc8svfxrlhw5lca465",
-            "rev": "7eacf5130849b4d53948d4750e11bd08f8a97a27"
-        },
-        "recipe": {
-            "sha256": "0hi9waxmw1bbg88brlr3816vhdi0jj05wcwvrvfc1agvrvzyqq8s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "3.1",
-        "deps": []
-    },
-    "eshell-autojump": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "coldnew",
-            "repo": "eshell-autojump",
-            "sha256": "0nkmwwx224r50y2xnrz3v26l3ngqshvy5hs861gy4zagwllqfmvc",
-            "rev": "c0866d7f2789831665ebb01b812bae89d085bff0"
-        },
-        "recipe": {
-            "sha256": "09l2680hknmdbwr4cncv1v4b0adik0c3sm5i9m3qbwyyxm8m41i5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": []
-    },
-    "company-restclient": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "iquiw",
-            "repo": "company-restclient",
-            "sha256": "0i1fh5lvqwlgn3g3fzh0xacxyljx6gkryipn133vfkv4jbns51n4",
-            "rev": "98e4b2af0e84ba4192c16288123aed96541c6401"
-        },
-        "recipe": {
-            "sha256": "1md0n4k4wmbh9rmbwqh3kg2fj0c34rzqfd56jsq8lcdg14k0kdcb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "cl-lib",
-            "company",
-            "emacs",
-            "know-your-http-well",
-            "restclient"
-        ]
-    },
-    "ac-cake": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k1LoW",
-            "repo": "emacs-ac-cake",
-            "sha256": "12z8nq797hjy0bq5vzpcm7z7bdn0ixc3ma4cj3v51xnwmgknzk6c",
-            "rev": "f01b3da7e2d20ea5a62daf62412c7dc1ad0130ff"
-        },
-        "recipe": {
-            "sha256": "0s2pgf0m98ixgadsnn201vm5gnawanpvxv56sf599f33krqnxzkl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": [
-            "auto-complete",
-            "cake"
-        ]
-    },
-    "org-tree-slide": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "takaxp",
-            "repo": "org-tree-slide",
-            "sha256": "0aacxxwhwjzby0f9r4q0lra5lqcrw5snnm1yc63jrs6c0ifakk45",
-            "rev": "dccd80418a4444df5e8301695ff0d0dfe86a3c21"
-        },
-        "recipe": {
-            "sha256": "0v857zplv0wdbg4li667v2p5pn5zcf9fgbqcwa75x8babilkl6jn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.8.4",
-        "deps": []
-    },
-    "org-transform-tree-table": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jplindstrom",
-            "repo": "emacs-org-transform-tree-table",
-            "sha256": "1h15fr16kgbyrxambmk4hsmha6hx4c4yqkccb82g3wlvzmnqj5x3",
-            "rev": "0a9bf07f01bc5fc3b349aff64e83999a8de83b52"
-        },
-        "recipe": {
-            "sha256": "0n68cw769nk90ms6w1w6cc1nxjwn1navkz56mf11bsiqvsk3km7r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.2",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "asilea": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "asilea",
-            "sha256": "1s973vzivibaqjb8acn4ylrdasxh17jcfmmvqp4wm05nwhg75597",
-            "rev": "2aab1cc63b64ef08d12e84fd7ba5c94065f6039f"
-        },
-        "recipe": {
-            "sha256": "1lb8nr6r6yy06m4pxg8w9ja4zv8k5xwhl95v2wv95y1qwhgnwg3j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.1",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "helm-package": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-helm-package",
-            "sha256": "14ad0b9d07chabjclffjyvnmrasar1di9wmpzf78bw5yg99cbisw",
-            "rev": "117f5f26c96c0854aadaf9c52aaec961195d5798"
-        },
-        "recipe": {
-            "sha256": "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "cl-lib",
-            "helm"
-        ]
-    },
-    "mmm-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "mmm-mode",
-            "sha256": "097s4xnwfy8d1wzmz65g2f8bnjjjlj67w1yzwn4d3yasb171nbv8",
-            "rev": "4085494df67e0a3207839a175ac62673dfd0acc1"
-        },
-        "recipe": {
-            "sha256": "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.4",
-        "deps": []
-    },
-    "git-lens": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pidu",
-            "repo": "git-lens",
-            "sha256": "0s1adgsigaq47vx8bfbmr5z8jq9y230ykwbw0jqka61n4ibg9ish",
-            "rev": "1feacc217c58fd4a41f9378eb09658f664036509"
-        },
-        "recipe": {
-            "sha256": "1vv3s89vk5ncinqh2f724z0qbbzp8g4y5y670ryy56w1l6v2acfb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "emacs-setup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "echosa",
-            "repo": "emacs-setup",
-            "sha256": "15l3ab11vcmzqibkd6h5zqw5a83k8dmgcp4n26px29c0gv6bkpy8",
-            "rev": "cc36ad5318c6c0e65d1b9ff8dff5ea2437675de2"
-        },
-        "recipe": {
-            "sha256": "1x4rh8vx6fsb2d6dz2g9j6jamin1vmpppwy3yzbl1dnf7w4hx4kh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "highlight-quoted": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "highlight-quoted",
-            "sha256": "1ahg9qzss67jpw0wp2izys6lyss4nqjy9320fpa4vdx39msdmjjb",
-            "rev": "cdd7164f9ad3a9929387c08af641ef6f5f013f4f"
-        },
-        "recipe": {
-            "sha256": "0x6gxi0jfxvpx7r1fm43ikxlxilnbk2xbhdy9xivhgmmdyqiqqkl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "wordsmith-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "istib",
-            "repo": "wordsmith-mode",
-            "sha256": "0s3mjmfjiidn3spklndw0dvcwbb9x034xyphp60aad8vjaflbchs",
-            "rev": "41b10f2fe3589da9812395cb417c3dcf906f0969"
-        },
-        "recipe": {
-            "sha256": "1570h1sjjaks6bnhd4xrbx6nna4v7hz6dmrzwjq37rwvallasg1n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": []
-    },
-    "makey": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mickeynp",
-            "repo": "makey",
-            "sha256": "1rr7vpm3xxzcaam3m8xni3ajy8ycyljix07n2jzczayri9sd8csy",
-            "rev": "a61781e69d3b451551e269446e1c5f624ab81137"
-        },
-        "recipe": {
-            "sha256": "06xgrlkqvg288yd4lyhx4vi80jlfarhblxk5m5zzs5as7n08cvk4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "stumpwm-mode": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://git.savannah.nongnu.org/stumpwm.git",
-            "sha256": "f5e3b0fdbdb1c747c40f7b6746de195e37bd4caccdcc05c6aa14124f29e71428",
-            "rev": "4d0603e52b5bab993b3be63e3654c74f641e677d"
-        },
-        "recipe": {
-            "sha256": "0a77mh7h7033adfbwg2fbx84789962par43q31s9msjlqw15gs86",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.8",
-        "deps": []
-    },
-    "magit-gitflow": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jtatarik",
-            "repo": "magit-gitflow",
-            "sha256": "00711dgbzmplqrfww8xf261ymz3jmhisnv9x1rhcw0ywmlfkbckz",
-            "rev": "58c0f83b0fd02db0f6f4a0cb6101a710029caaeb"
-        },
-        "recipe": {
-            "sha256": "0wsqq3xpqqfak4aqwsh5sxjb1m62z3z0ysgdmnrch3qsh480r8vf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.0.0",
-        "deps": [
-            "magit"
-        ]
-    },
-    "wsd-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "josteink",
-            "repo": "wsd-mode",
-            "sha256": "0v4bigqr8dwbn80x87r2wqncxcbb19giyazm1lnajcfg8s5z7jsn",
-            "rev": "2065f07cb813041719aabb1e92fa98aebb2c6ae6"
-        },
-        "recipe": {
-            "sha256": "07vclmnj18wx9wlrcnsl99f9jlk3sb9g6pcdv8x1smk84gccpakc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4.0",
-        "deps": []
-    },
-    "rubocop": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bbatsov",
-            "repo": "rubocop-emacs",
-            "sha256": "10djjp1520xc05qkciaiaiiciscaln6c74h7ymba40mvzlf67y9q",
-            "rev": "405e0fd4c57adb125e3d04208bc86081e3e78d4c"
-        },
-        "recipe": {
-            "sha256": "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4.0",
-        "deps": [
-            "dash",
-            "emacs"
-        ]
-    },
-    "ert-runner": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "ert-runner.el",
-            "sha256": "0rdgdslspzb4s0n4a68hnwfm8vm8baasa8nzrdinf0nryn7rrhbf",
-            "rev": "00056c37817f15b1870ccedd13cedf102e3194dd"
-        },
-        "recipe": {
-            "sha256": "0fnb8rmjr5lvc3dq0fnyxhws8ync1lj5xp8ycs63z4ax6gmdqr48",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7.0",
-        "deps": [
-            "ansi",
-            "commander",
-            "dash",
-            "f",
-            "s",
-            "shut-up"
-        ]
-    },
-    "zenburn-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bbatsov",
-            "repo": "zenburn-emacs",
-            "sha256": "1zspqpwgyv3969irg8p7zj3g4hww4bmnlvx33bvjyvvv5c4mg5wv",
-            "rev": "ae42a7f3ec9491ddec001a2e57c7eb2f38d421cd"
-        },
-        "recipe": {
-            "sha256": "1kb371j9aissj0vy07jw4ydfn554blc8b2rbi0x1dvfksr2rhsn9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.2",
-        "deps": []
-    },
-    "web-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fxbois",
-            "repo": "web-mode",
-            "sha256": "0b6izvqm3017hrys31ppcs76k0858r74a0jarb8djdi3hxzsgqfv",
-            "rev": "ee276c14f086c8f3b8b47e895b9593fd5d74acc8"
-        },
-        "recipe": {
-            "sha256": "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "13",
-        "deps": []
-    },
-    "gitconfig-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "git-modes",
-            "sha256": "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd",
-            "rev": "9d8f6eda6ee97963e4085da8988cad2c0547b8df"
-        },
-        "recipe": {
-            "sha256": "0hqky40kcgxdnghnf56gpi0xp7ik45ssia1x84v0mvfwqc50dgn1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2.0",
-        "deps": []
-    },
-    "mwim": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alezost",
-            "repo": "mwim.el",
-            "sha256": "0hvq6z754niqjyv79jzb833wrwbspc7npfg85scwdv8vzwassjx4",
-            "rev": "dc1b5c358e0bfe607527f1b7c082188105fe6c75"
-        },
-        "recipe": {
-            "sha256": "0bsibwplvyv96y5i5svm2b0jwzs5a7jr2aara7v7xnpj0nqaxm8k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": []
-    },
-    "transmission": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "holomorph",
-            "repo": "transmission",
-            "sha256": "14fzgpafry3v072f22krap81jfpdc17bpimp16hv7f20sny29a5v",
-            "rev": "2769c9b17fa464e0634ac03046be74cefdb28880"
-        },
-        "recipe": {
-            "sha256": "0w0hlr4y4xpcrpvclqqqasggkgrwnzrdib51mhkh3f3mqyiw8gs9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7",
-        "deps": [
-            "emacs",
-            "let-alist"
-        ]
-    },
-    "dyalog-mode": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/harsman/dyalog-mode",
-            "sha256": "0ghxnzi2iy1g633fshl9wdpg2asrcl0v5rkk61gqd6axm7fjaxcj",
-            "rev": "ce795beb8747"
-        },
-        "recipe": {
-            "sha256": "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "notmuch": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://git.notmuchmail.org/git/notmuch",
-            "sha256": "fd2669401c276af12b6c9b739e835ee76b7910bba34bf850e4909c00e79adbd4",
-            "rev": "bf511cb6979ede33d17d9da6f46f71ea287461d8"
-        },
-        "recipe": {
-            "sha256": "1sy9k6xbfl035qhnp8sdq9cb3xvgw3lkmdczyd6fw6yrzm5n0g1r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.21",
-        "deps": []
-    },
-    "nixos-options": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "travisbhartwell",
-            "repo": "nix-emacs",
-            "sha256": "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld",
-            "rev": "5fc8fa29bea9dd8e9c822af92f9bc6ddc223635f"
-        },
-        "recipe": {
-            "sha256": "1m3jipidk10zj68rzjbacgjlal31jf80gqjxlgj4qs8lm671gxmm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.1",
-        "deps": [
-            "emacs",
-            "json"
-        ]
-    },
-    "pythonic": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "proofit404",
-            "repo": "pythonic",
-            "sha256": "1af9cd8l5ac58mj92xc7a3diy995cv29abnbb3fl6x4208l4xs3c",
-            "rev": "959b3f5d5607eb41ef26ad61d7ec15ceecb8e37a"
-        },
-        "recipe": {
-            "sha256": "1hq0r3vg8vmgw89wfjdqknwm76pimlk0dy56wmh9vffh06gqsb51",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "emacs",
-            "f",
-            "s"
-        ]
-    },
-    "emms-mode-line-cycle": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "momomo5717",
-            "repo": "emms-mode-line-cycle",
-            "sha256": "1pz2xvv5hzfg4a8s6xnbr14mpwnr94cwsa1bpk83i7x15hmxj938",
-            "rev": "0488de1f9b4d0be6aa7dfe2fe0231cfd9b4d4295"
-        },
-        "recipe": {
-            "sha256": "1jdmfh1i9v84iy7bj2dbc3s2wfzkrby3pabd99gnqzd9gn1cn8ca",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.4",
-        "deps": [
-            "emacs",
-            "emms"
-        ]
-    },
-    "go-errcheck": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dominikh",
-            "repo": "go-errcheck.el",
-            "sha256": "1fm6xd3vsi8mqh0idddjpfxlsmz1ljmjppw3qkxl1vr0qz3598k3",
-            "rev": "1b0cd6af048a8b2074ace14ab51fb6c987beb430"
-        },
-        "recipe": {
-            "sha256": "11a75h32cd5h5xjv30x83k60s49k9fhgis31358q46y2gbvqp5bs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.2",
-        "deps": []
-    },
-    "minimal-session-saver": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "minimal-session-saver",
-            "sha256": "0kjhn48sf2ps3k5pv06gqmqc4hlk6di9ld3ssw6vwfh8313x1fc5",
-            "rev": "aaba48a8525e1310b221eeb96763304c22e9a4b4"
-        },
-        "recipe": {
-            "sha256": "1ay7wvriga28bdmarpfwagqzmmk93ri9f3idhr6z6iivwggwyy2i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.2",
-        "deps": []
-    },
-    "popup-complete": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-popup-complete",
-            "sha256": "084hb3zn1aiabbyxgaalszb2qjf9z64z960ks5fvz8nh7n6y7ny4",
-            "rev": "e362d4a005b36646ffbaa6be604e9e31bc406ca9"
-        },
-        "recipe": {
-            "sha256": "04bpm31zx87j390r2xi1yl4kyqgalmyqc48xarsm67zfww9fw9c1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "popup"
-        ]
-    },
-    "cake2": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k1LoW",
-            "repo": "emacs-cake2",
-            "sha256": "15w21r0gqblbn9wlvb4wlm3706wf01r38mp465snjzi839f6sazb",
-            "rev": "0a9d0b3a1c49ba1730088416f50507f53221c70b"
-        },
-        "recipe": {
-            "sha256": "03q8vqqjlhahgnyy976c46x52splwdjpmb9ngrj5c2z7d8n9145x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.1.0",
-        "deps": [
-            "anything",
-            "cake-inflector",
-            "dash",
-            "f",
-            "historyf",
-            "ht",
-            "json",
-            "s"
-        ]
-    },
-    "async": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jwiegley",
-            "repo": "emacs-async",
-            "sha256": "0z91alzf4ajj3r7pnwazynvp81cg67csy9kf87fk98024xldpkdp",
-            "rev": "c25bf17b34a1608da45e8a1ca02e1c89a34acd34"
-        },
-        "recipe": {
-            "sha256": "063ci4f35x1zm9ixy110i5ds0vsrcafpixrz3xkvpnfqdn29si3f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.6",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "gotest": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nlamirault",
-            "repo": "gotest.el",
-            "sha256": "1b6zn1fmqvfb7bcpmhzkgcy5003dl22w3f293arlsd1xkbjgkxa2",
-            "rev": "ab0da939aad5cec301126c59b7718cd3158b3233"
-        },
-        "recipe": {
-            "sha256": "1kan3gykhci33jgg67jjiiz7rqlz5mpxp8sh6mb0n6kpfmgb4ly9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.0",
-        "deps": [
-            "emacs",
-            "f",
-            "go-mode",
-            "s"
-        ]
-    },
-    "floobits": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Floobits",
-            "repo": "floobits-emacs",
-            "sha256": "1b9zxyv5bn1ja0gcv5p3dk3lq3gp3g1dhbnizx7ifgpzc36sp374",
-            "rev": "c75af788d089b701dc71fd79c2baefe82d0d17eb"
-        },
-        "recipe": {
-            "sha256": "1jpk0q4mkf9ag1rqyai993nz5ngzfvxq9n9avmaaq59gkk9cjraf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.6.2",
-        "deps": [
-            "highlight",
-            "json"
-        ]
-    },
-    "annoying-arrows-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "annoying-arrows-mode.el",
-            "sha256": "1ppq3kszzj2fgr7mwj565bjs8bs285ymy384cnnw7paddgcr9z02",
-            "rev": "fe59f3fd464e7a87cc43fb8a1f135b3bdf8a2fb3"
-        },
-        "recipe": {
-            "sha256": "13bwqv3mv7kgi1gms58f5g03q5g7q98n4vv6n28zqmppxm5z33s7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": []
-    },
-    "mode-icons": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://ryuslash.org/mode-icons.git",
-            "sha256": "b7afff1d8fb0b3f044d266af479df51fbb6021ff433628a9dc669695c1ddae40",
-            "rev": "cbf412d0c47dfdbeac7587a0c12c96f58f546467"
-        },
-        "recipe": {
-            "sha256": "18w221zjrrsfcymprv5x75i3qv04zy4bxl9mqjv0ys7qcc8xf1dp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": []
-    },
-    "weibo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "austin-----",
-            "repo": "weibo.emacs",
-            "sha256": "14vmgfz45wmpjfhfx3pfjn3bak8qvj1zk1w4xc5w1cfl6vnij6hv",
-            "rev": "a8af467e5660a35342029c2796de99cd551454b2"
-        },
-        "recipe": {
-            "sha256": "1ndgfqqb0gvy8p2fisi57s9bsa2nrnv80smg78m89i4cwagbz6yd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "stan-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "stan-dev",
-            "repo": "stan-mode",
-            "sha256": "0s633nnaprqq0svs0v4zfk9p47izbvjwx1x2xa9b9rid69bpx54s",
-            "rev": "60e31cd0dedc36ee6d5ddde01c5b8cb121c2e844"
-        },
-        "recipe": {
-            "sha256": "17ph5khwwrcpyl96xnp3rsbmnk7mpwmgskxka3cfgkm190qihfqy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "8.0.0",
-        "deps": []
-    },
-    "edts": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tjarvstrand",
-            "repo": "edts",
-            "sha256": "1a1apa48n24yisd2zw5k4lfkngx3016x6y11qi80hg75vrnmg7f1",
-            "rev": "61855db6f1315ea45f97ed95b47a3f182ec4c6be"
-        },
-        "recipe": {
-            "sha256": "0f0rbd0mqqwn743qmr1g5mmi1sbmlcglclww8jxvbvb61jq8vspr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": []
-    },
-    "avy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "avy",
-            "sha256": "15xfgmsy4sqs3cmk7dwmj21g3r9dqb3fra7n7ly306bwgzh4vm8k",
-            "rev": "44d76b9d2aad5477521675747a5c769f3f9a69a0"
-        },
-        "recipe": {
-            "sha256": "0gjq79f8jagbngp0shkcqmwhisc3hpgwfk34kq30nb929nbnlmag",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.0",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "marmalade": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nex3",
-            "repo": "marmalade",
-            "sha256": "0pbli67wia8pximvgd68x6i9acdgsk51g9hjpqfm49rqg5nqalh9",
-            "rev": "01d6ddf5f0e822d6df393aa4546b069b2d6545d7"
-        },
-        "recipe": {
-            "sha256": "0ppa2s1fma1lc01byanfxpxfrjqk2snxbsmdbkcipjdi5dpb0a9s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.4",
-        "deps": [
-            "furl"
-        ]
-    },
-    "per-buffer-theme": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/inigoserna/per-buffer-theme.el",
-            "sha256": "1rh87jf0a15q35a8h00bx6k5wa931rb6gh600zbs7j4r3y8qsylf",
-            "rev": "2b82a04b28d0"
-        },
-        "recipe": {
-            "sha256": "1czcaybpfmx4mwff7hs07iayyvgvlhifkickccap6kpd0cp4n6hn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "zop-to-char": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thierryvolpiatto",
-            "repo": "zop-to-char",
-            "sha256": "0j6x3az8vpq2ggafjxdl8x3ln7lhh58c27z72mwywp4a2ca1g496",
-            "rev": "7888bb6f09ae24e8e10bd3095edd31940e6a1c46"
-        },
-        "recipe": {
-            "sha256": "0jnspvqqvnaplld083j7cqqxw122qazh88ab7hymci36m3ka9hga",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "connection": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myrkr",
-            "repo": "dictionary-el",
-            "sha256": "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s",
-            "rev": "9ef1672ecd367827381bbbc9af93685980083c5c"
-        },
-        "recipe": {
-            "sha256": "1y68d2kay8p5vapailxhrc5dl7b8k8nkvp7pa54md3fsivwp1d0q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.10",
-        "deps": []
-    },
-    "gmail-message-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "gmail-mode",
-            "sha256": "0j3pay3gd1wdnpc853gy5j68hbavrwy6cc2bgmd12ag29xki3hcg",
-            "rev": "2e0286e4a3c80889692f8da63a3b15d7a96abdea"
-        },
-        "recipe": {
-            "sha256": "0py0i7b893ihb8l1hmk3jfl0xil450znadcd18q7svr3zl2m0gkk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3.2",
-        "deps": [
-            "ham-mode"
-        ]
-    },
-    "bug-reference-github": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "arnested",
-            "repo": "bug-reference-github",
-            "sha256": "07jzg58a3jxs4mmsgb35f5f8awazlvzak9wrhif6xb60jq1wrp0v",
-            "rev": "671d32083aad5cf813a5e61075b70889bc95dec5"
-        },
-        "recipe": {
-            "sha256": "18yzxwanbrxsab6ba75z1196x0m6dapdhbvy6df5b5x5viz99cf6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": []
-    },
-    "clojure-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "clojure-emacs",
-            "repo": "clojure-mode",
-            "sha256": "0mrkw8l736pddddl0vx9j910g1l492mascqb93h0sxv8ps4xcc53",
-            "rev": "8b01df6c881929540b59444a54b37c03ffe6fc17"
-        },
-        "recipe": {
-            "sha256": "11n0rjhs1mmlzdqy711g432an5ybdka5xj0ipsk8dx6xcyab70np",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "5.0.1",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "utop": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "diml",
-            "repo": "utop",
-            "sha256": "1azv6grd5h2r1spy996nv6q1c5l6qawv6k0dc2i5k96szl0r668r",
-            "rev": "59f5b9c3fcc3fa8102e8a892e21ff8a477f80872"
-        },
-        "recipe": {
-            "sha256": "0lv16kl29gc9hdcpn04l85pf7x93vkl41s4mgqp678cllzyr0cq7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.18.1",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "with-editor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "magit",
-            "sha256": "01x9kahr3szzc00wlfrihl4x28yrq065fq4rpzx9dxiksayk24pd",
-            "rev": "16a7a12c44d63e78e9b223fca7c1c23a144d3ef1"
-        },
-        "recipe": {
-            "sha256": "042fa55yakdn2di4l5dilnmqpslac46wpr1zpl4xk3v3i4nn9ndv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.3.1",
-        "deps": [
-            "async",
-            "dash",
-            "emacs"
-        ]
-    },
-    "evil-jumper": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bling",
-            "repo": "evil-jumper",
-            "sha256": "04l1vb07qkqb3cvdpy9cyric5nvq2j1s5f3kkczy9ia9rkicrxgp",
-            "rev": "ab87e865a1ffd815f937c98c2ecf70bf13510715"
-        },
-        "recipe": {
-            "sha256": "0zwsk7slzvcgvgh8fjrwangylishrwc1w0glxcr71sybxph2g46x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": [
-            "evil"
-        ]
-    },
-    "lingr": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lugecy",
-            "repo": "lingr-el",
-            "sha256": "11sw43z5b0vypmhi0yysf2bxjy8fqpzl61y503jb7nhcfywmfkys",
-            "rev": "c9c20dd9b4967aa2f8873d6890d6797e6a498d23"
-        },
-        "recipe": {
-            "sha256": "1445bxiirsxl9kgm0j86xc9d0pbaa5f07c1i66pw2vl40bvhrjff",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": []
-    },
-    "auto-complete-sage": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "stakemori",
-            "repo": "auto-complete-sage",
-            "sha256": "0l49ciic7g30vklxq6l1ny3mz87l5p8qc30rmkjvkzvg8r52ksn3",
-            "rev": "a61a4e58b14134712e0737280281c0b10e56da93"
-        },
-        "recipe": {
-            "sha256": "02sxbir3arvmnkvxgndlkln9y05jnlv6i8czd6a0wcxk4nj43lq1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.5",
-        "deps": [
-            "auto-complete",
-            "sage-shell-mode"
-        ]
-    },
-    "rich-minority": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "rich-minority",
-            "sha256": "11hwf9y5ax207w6rwrsmi3pmn7pn7ap6iys0z8hni2f5zzxjrmx3",
-            "rev": "311ac8ee54078f95b7279e532da6cf5a2afb4125"
-        },
-        "recipe": {
-            "sha256": "11xd76w5k3b3q5bxqjb55vi6dsal9drvyc1nh7z83awm59hvgczc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.1",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "marcopolo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nlamirault",
-            "repo": "marcopolo",
-            "sha256": "0y4b69r2l6kvh7g8f1y9v1pdall3n668ci24lp04lcms6rxcrsnh",
-            "rev": "ce6ad40d7feab0568924e3bd9659b76e3eecd55e"
-        },
-        "recipe": {
-            "sha256": "1nbck1m7lhync7n474578d2g1zc72c841hi236xjbdd2lnxz3zz0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.0",
-        "deps": [
-            "dash",
-            "pkg-info",
-            "request",
-            "s"
-        ]
-    },
-    "el-mock": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "el-mock.el",
-            "sha256": "13mv1rhgkwiww2wh5w926jz7idppp492wir1vdl245c5x50dh4f7",
-            "rev": "3069931de75bb6704ecf565af5390009dc4dae00"
-        },
-        "recipe": {
-            "sha256": "07m7w7n202nijnxidy0j0r4nbcvlnbkm9b0n8qb2bwi3d4cfp77l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.25.1",
-        "deps": []
-    },
-    "hydra": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "hydra",
-            "sha256": "08iw95lyizcyf6cjl37fm8wvay0vsk9758pk9gq9f2xiafcchl7f",
-            "rev": "4bf7f1c9e46fb819c673e55d8a1891774e139f98"
-        },
-        "recipe": {
-            "sha256": "1c59l43p39ins3dn9690gm6llwm4b9p0pk78lip0dwlx736drdbw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.13.3",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "browse-kill-ring": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "browse-kill-ring",
-            "repo": "browse-kill-ring",
-            "sha256": "0y9m6cv70pzcm0v2v8nwmyh1xx40831chx72m85h5ic5db03gy7b",
-            "rev": "2a7acf98c348c4f405a6b2ab216224ca14915be8"
-        },
-        "recipe": {
-            "sha256": "1d97ap0vrg5ymp96z7y6si98fspxzy02jh1i4clvw5lggjfibhq4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.0.0",
-        "deps": []
-    },
-    "auto-shell-command": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ongaeshi",
-            "repo": "auto-shell-command",
-            "sha256": "1h8zsgw30axprs7a5kkygbhvilillzazxgqz01ng36il65fi28s6",
-            "rev": "59d4abce779a3ce3e920592bf5696b54b2e192c7"
-        },
-        "recipe": {
-            "sha256": "1i78fh72i8yv91rnabf0vs78r43qrjkr36hndmn5ya2xs3b1g41j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.2",
-        "deps": [
-            "deferred",
-            "popwin"
-        ]
-    },
-    "shelldoc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-shelldoc",
-            "sha256": "1nli26llyfkj1cz2dwn18c5pz1pnpz3866hapfibvdmwrg4z6cax",
-            "rev": "1d40c73969347586906ca1dde2adb50afcd73b1b"
-        },
-        "recipe": {
-            "sha256": "1xlp03aaidp7dp8349v8drzhl4lcngvxgdrwwn9cahfqlrvvbbbx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.5",
-        "deps": [
-            "cl-lib",
-            "s"
-        ]
-    },
-    "malabar-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "m0smith",
-            "repo": "malabar-mode",
-            "sha256": "0z0ml7l1a45ych61qfc5fvkybl9hh37pgl6lzkaz6mcif1sl8gn1",
-            "rev": "4c5fde559f518509763a55040fdb0e4b6b04856a"
-        },
-        "recipe": {
-            "sha256": "026ing7v22rz1pfzs2j9z09pm6dajpys992n45gzhwirz5f0q1rk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140303.946",
-        "deps": [
-            "fringe-helper"
-        ]
-    },
-    "fullframe": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tomterl",
-            "repo": "fullframe",
-            "sha256": "09jqaq81vbch93qwrmg0rm6a26pchqdraw374j13hgkhs849gx90",
-            "rev": "b9c3e54c8928c5ba994c55de7794b5f739b43ced"
-        },
-        "recipe": {
-            "sha256": "08sh8lmb6g8asv28fcb36ilcn0ka4fc6ka0pnslid0h4c32fxp2a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "cperl-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jrockway",
-            "repo": "cperl-mode",
-            "sha256": "02fl9y72prykh6qmxlnyn7fl27rqsk5kgcm4vdhj3i6fvl1iqdm6",
-            "rev": "06f5668653a114991836139344dbe8f0674577af"
-        },
-        "recipe": {
-            "sha256": "0hkmpa0vg1miv8qqpnml4xblzvn9w4ba02fqp6qa2nnv554i7azp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "6.3",
-        "deps": []
-    },
-    "comment-dwim-2": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "remyferre",
-            "repo": "comment-dwim-2",
-            "sha256": "0kzlv2my0cc7d3nki2rlm32nmb2nyjb38inmvlf13z0m2kybg2ps",
-            "rev": "8cedecde018b5872195bfead6511af822776a430"
-        },
-        "recipe": {
-            "sha256": "1w9w2a72ygsj5w47vjqcljajmmbz0mi8dhz5gjnpwxjwsr6fn6lj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2.2",
-        "deps": []
-    },
-    "ctags-update": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jixiuf",
-            "repo": "helm-etags-plus",
-            "sha256": "05vhryqcydvcfm18fwby344931kzzh47x4l5ixy95xkcjkzrj8c7",
-            "rev": "d3f3162d5a3291d84b15fd325859c87e1a374923"
-        },
-        "recipe": {
-            "sha256": "1k43l667mvr2y33nblachdlvdqvn256gysc1iwv5zgv7gj9i65qf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": []
-    },
-    "pcsv": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-pcsv",
-            "sha256": "03k3xhrim4s3yvbnl8g8ci5g7chlffycdw7d6a1pz3077mxf1f1z",
-            "rev": "91599aaba70a8e8593fa2f36165af82cbd35e41e"
-        },
-        "recipe": {
-            "sha256": "1zphndkbva59g1fd319a240yvq8fjk315b1fyrb8zvmqpgk9n0dl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3.6",
-        "deps": []
-    },
-    "helm-unicode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "shosti",
-            "repo": "helm-unicode",
-            "sha256": "14lbdvs9xdnipsn3lywbvgsqwqnbm8fxm6d1ilq0cj5z6zkxkya0",
-            "rev": "e68cc60f7efd93b410844f3722bc6681dc65e2fd"
-        },
-        "recipe": {
-            "sha256": "052xqzvcfzpsbl75ylqb1khqndvc2dqdymqlwivs0darlds0w8y4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.2",
-        "deps": [
-            "emacs",
-            "helm"
-        ]
-    },
-    "company-quickhelp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "expez",
-            "repo": "company-quickhelp",
-            "sha256": "0hg3wrfhz3qlfb6zv6j5a4xzmm4jk25pkv8h3ryg7sl7h602idgl",
-            "rev": "05e0ee9b854f90ff2b007b3e19446a02513f43dc"
-        },
-        "recipe": {
-            "sha256": "042bwv0wd4hksbm528zb7pbllzk83p8qjq5f8z46p84c8mmxfp9g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2.0",
-        "deps": [
-            "company",
-            "emacs",
-            "pos-tip"
-        ]
-    },
-    "fxrd-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "msherry",
-            "repo": "fxrd-mode",
-            "sha256": "003iqzwzf950dvn6q901y0jjadz7hqaafa9wrhzplay3kjnkjj9b",
-            "rev": "122afe6b7edeff117edf92dab1ba011ae71a5910"
-        },
-        "recipe": {
-            "sha256": "17zimg64lqc1yh9gnp5izshkvviz996aym7q6n9p61a4kqq37z4r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "s"
-        ]
-    },
-    "gnus-desktop-notify": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wavexx",
-            "repo": "gnus-desktop-notify",
-            "sha256": "08j8x0iaz5s9q0b68d8h3153w0z6vak5l8qgw3dd1drz5p9xnvyw",
-            "rev": "210c70f0021ee78e724f1d8e00ca96e1e99928ca"
-        },
-        "recipe": {
-            "sha256": "0hf2dszk5d7vn80bm0msaqv7iji384n85dxgw8ng64c0f9f6752b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.4",
-        "deps": [
-            "gnus"
-        ]
-    },
-    "js-comint": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "redguardtoo",
-            "repo": "js-comint",
-            "sha256": "1gf6ir4viy8zr9fwmjz4s7zkr3m7947sa8mai56bnv83r2k3s9ir",
-            "rev": "69c8475573f1ef1f59331027a0fe445161b51000"
-        },
-        "recipe": {
-            "sha256": "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.3",
-        "deps": [
-            "nvm"
-        ]
-    },
-    "qml-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "coldnew",
-            "repo": "qml-mode",
-            "sha256": "069hbpawmcmbbvaqp63d6p34hg0h7zq294qrz0m1zwrm188bmhzl",
-            "rev": "a69ee2d23e079dbedab22fde85181a8320af2222"
-        },
-        "recipe": {
-            "sha256": "123mlibviplzra558x87da4zx0kpbhsgfigjjgjgp3mdg897084n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "org-journal": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bastibe",
-            "repo": "emacs-journal",
-            "sha256": "0980scx1dzslbdzmhv720branc4jd4bdkyji34gahinx4w9brj79",
-            "rev": "68974d86f1ef518defb3085e415d882ba4575714"
-        },
-        "recipe": {
-            "sha256": "078z9b9hxbvmmxib6098f49rn7n3d0v4x37p7xxb0v8cv4izlb4s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.10.2",
-        "deps": []
-    },
-    "selectric-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rbanffy",
-            "repo": "selectric-mode",
-            "sha256": "18xdkisxvdizsk51pnyimp9mwc6k9cpcxqr5hgndkz9q97p5dp79",
-            "rev": "0dd7ef28a9d9d6fbb95fdeeab6b576ad8762ad16"
-        },
-        "recipe": {
-            "sha256": "1k4l0lr68rqyi37wvqp1cnfci6jfkz0gvrd1hwbgx04cjgmz56n4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": []
-    },
-    "circe": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jorgenschaefer",
-            "repo": "circe",
-            "sha256": "0q3rv6lk37yybkbswmn4pgzca0nfhvf4h3ac395fr16k5ixybc5q",
-            "rev": "ac1cddf946e0af90ab453dd816f7173e0d4000e5"
-        },
-        "recipe": {
-            "sha256": "1f54d8490gfx0r0cdvgmcjdxqpni43msy0k2mgqd1qz88a4b5l07",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.1",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "evm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "evm.el",
-            "sha256": "0739v0m9vj70a55z0canslyqgafzys815i7a0r6bxj2f9iwq6rhb",
-            "rev": "d0623b2355436a5fd9f7238b419782080c79196b"
-        },
-        "recipe": {
-            "sha256": "19l6cs5schbnph0pwhhj66gkxsswd4bmjpy79l9kxzpjf107wc03",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4.2",
-        "deps": [
-            "dash",
-            "f"
-        ]
-    },
-    "truthy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "truthy",
-            "sha256": "18na22fhwqz80qinmnpsvp6ghc9irva1scixi6s4q6plmgr4m397",
-            "rev": "276a7e6b13606d28e4f2e423bb1ea30904c5def3"
-        },
-        "recipe": {
-            "sha256": "1a56zmqars9fd03bkqzwpvgblq5fvq19n4jw04c4hpga92sq8wqg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.8",
-        "deps": [
-            "list-utils"
-        ]
-    },
-    "php-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ejmr",
-            "repo": "php-mode",
-            "sha256": "0pwhw59ki19f9rkgvvnjzhby67s0y9hpsrg6cwqxakjlm66w96q3",
-            "rev": "f3201eebfebf1757cf6a636fe3c7a3b810ab6612"
-        },
-        "recipe": {
-            "sha256": "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.17.0",
-        "deps": []
-    },
-    "sotlisp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "speed-of-thought-lisp",
-            "sha256": "1wbd7v5bnd4qgqk8rrgllal0i949n8xzvb3yhf0vnxr06wdzy0a4",
-            "rev": "6e0ebc97000dc505f72ad9cc793ac857b0585f5a"
-        },
-        "recipe": {
-            "sha256": "0zjnn6hhwy6cjvc5rhvhxcq5pmrhcyil14a48fcgwvg4lv7fbljk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.4.1",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "helm-spaces": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yasuyk",
-            "repo": "helm-spaces",
-            "sha256": "0kz0vfp43n7f9l53rji2pb8v6ylg63i37q0bmidmjjvsinimwj44",
-            "rev": "8b4f5a1e3cb823ceee1e341ce45f9b18a1b8057c"
-        },
-        "recipe": {
-            "sha256": "0hdvkk173k98iycvii5xpbiblx044125pl7jyz4kb8r1vvwcv791",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "helm",
-            "spaces"
-        ]
-    },
-    "logito": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sigma",
-            "repo": "logito",
-            "sha256": "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr",
-            "rev": "824acb89d2cc18cb47281a4fbddd81ad244a2052"
-        },
-        "recipe": {
-            "sha256": "0bk4qnz66kvhzsk88lw45209778y53kg17iih70ix4ma1x6a3v5l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "eieio"
-        ]
-    },
-    "org-tracktable": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tty-tourist",
-            "repo": "org-tracktable",
-            "sha256": "053wf36lq9piyzq7rv2lid34zanj6l9fvawp3r3nsniy5nlfckqx",
-            "rev": "28ef6772cdcf436cf38095f15c6bb681473180ce"
-        },
-        "recipe": {
-            "sha256": "0mngf9q2ffxq32cgng0xl30661mj15wmr9y4hr3xddj626kxrp00",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "electric-operator": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "davidshepherd7",
-            "repo": "electric-operator",
-            "sha256": "1bqdg5sr4hkiqndr4hcdjscfdyj56jb4wr1kqgwy1hy4ccr9mkrr",
-            "rev": "3d34101e065396389cfbb8fec333c78641a71dc6"
-        },
-        "recipe": {
-            "sha256": "043bkpvvk42lmkll5jnz4q8i0m44y4wdxvkz6hiqhqcp1rv03nw2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "dash",
-            "emacs",
-            "names"
-        ]
-    },
-    "owdriver": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "owdriver",
-            "sha256": "0f2psx4lq98l3q3fnibsfqxp2hvvwk7b30zjvjlry3bffg3l7pfk",
-            "rev": "0479389d9df9e70ff9ce69dff06252d3aa40fc86"
-        },
-        "recipe": {
-            "sha256": "0j8z7ynan0zj581x50gsi9lljkbi6bwmzpfyha3i6q8ch5qkdxfd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.6",
-        "deps": [
-            "log4e",
-            "smartrep",
-            "yaxception"
-        ]
-    },
-    "spotify": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "remvee",
-            "repo": "spotify-el",
-            "sha256": "05y8xv6zapspwr5bii41lgirslas22wsbm0kgb4dm79qbk9j1kzw",
-            "rev": "07a44ecdbdaa93977e97f2a2e5d280ef0b2e8545"
-        },
-        "recipe": {
-            "sha256": "0pmsvxi1dsi580wkhhx8iw329agkh5yzk61bqvxzign3cd6fbq6k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.2",
-        "deps": []
-    },
-    "mustache-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mustache",
-            "repo": "emacs",
-            "sha256": "15gw4d0hp15rglsj8hzd290li4p0kadj2dsz0dgfcxld7hnimihk",
-            "rev": "bf9897eb287ca47ced65d7d4e07ea61ea0aec39f"
-        },
-        "recipe": {
-            "sha256": "076ar57qhwcpl4n634ma827r2rh61670778wqr5za2444a6ax1gs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3",
-        "deps": []
-    },
-    "persistent-soft": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "persistent-soft",
-            "sha256": "14p20br8vzxs39d4hswzrrkgwql5nnmn5j17cpbabzjvck42rixc",
-            "rev": "a1e0ddf2a12a6f18cab565dee250f070384cbe02"
-        },
-        "recipe": {
-            "sha256": "0a4xiwpgyyynjf69s8p183mqd3z53absv544ggvhb2gkpm6jravc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8.10",
-        "deps": [
-            "list-utils",
-            "pcache"
-        ]
-    },
-    "key-combo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "uk-ar",
-            "repo": "key-combo",
-            "sha256": "14ijniyvcfmj4y77yhiplsclincng2r3jbdnmmdnwzliv65f7l6q",
-            "rev": "0bc0cf6466a4257047a21a6d01913e92e6862165"
-        },
-        "recipe": {
-            "sha256": "1v8saw92jphvjkyy7j9jx7cxzgisl4zpf4wjzdjfw3la5lz11waf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.6",
-        "deps": []
-    },
-    "magit-filenotify": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "magit-filenotify",
-            "sha256": "1vn6x53kpwv3zf2b5xjswyz6v853r8b9dg88qhwd2h480hrx6kal",
-            "rev": "575c4321f61fb8f25e4779f9ffd4514ac086ae96"
-        },
-        "recipe": {
-            "sha256": "00a77czdi24n3zkx6jwaj2asablzpxq16iqd8s84kkqxcfiiahn7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "emacs",
-            "magit"
-        ]
-    },
-    "xterm-color": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "atomontage",
-            "repo": "xterm-color",
-            "sha256": "1zdj4664gvwc4kyx7fx5232l3c5anm0xyrrnrw596q604q6xxj2x",
-            "rev": "380cc8c6c6969f8a262ad4ddc61117691db7f4d1"
-        },
-        "recipe": {
-            "sha256": "0bvzi1mkxgm4vbq2va1sr0k9h3fdmppq79hkvbizc2xgk72sazpj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "phpunit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nlamirault",
-            "repo": "phpunit.el",
-            "sha256": "1s4a0ygm79shv6f0rghrkq9jb7jc7sh9cjxzlzj0c8zpvsxl0hlz",
-            "rev": "d9e9092d664463b7cc8e0a433a76b8c9598ab2c9"
-        },
-        "recipe": {
-            "sha256": "0nj8ss1yjkcqnbnn4jgbp0403ljjk2xhipzikdrl3dbxlf14i4f8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7.0",
-        "deps": [
-            "f",
-            "pkg-info",
-            "s"
-        ]
-    },
-    "org-gcal": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "org-gcal.el",
-            "sha256": "1pxfcyf447h18220izi8qlnwdr8rlwn5kds8gr5i1v90s6hpa498",
-            "rev": "badd3629e6243563c30ff1dd0452b7601f6cc036"
-        },
-        "recipe": {
-            "sha256": "1mp6cm0rhd4r9pfvsjjp86sdqxjbbg7gk41zx0zf0s772smddy3q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "alert",
-            "cl-lib",
-            "emacs",
-            "org",
-            "request-deferred"
-        ]
-    },
-    "helm-rubygems-org": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "neomantic",
-            "repo": "helm-rubygems-org",
-            "sha256": "1sff8kagyhmwcxf9062il1077d4slvr2kq76abj496610gpb75i0",
-            "rev": "6aaed984f698cbdf9f9aceb0221404563e28764d"
-        },
-        "recipe": {
-            "sha256": "04ni03ak53z3rggdgf68qh7ksgcf3s0f2cv6skwjqw7v8qhph6qs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.1",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "helm"
-        ]
-    },
-    "ag": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Wilfred",
-            "repo": "ag.el",
-            "sha256": "0hpsv2zyhhfm53hrd2lzvc9gpvfn6g5dpwmzxfl8l1sqjisips2a",
-            "rev": "12f22a4a9f4ff3c8a0b6f089b8cf6d85a3f8b7eb"
-        },
-        "recipe": {
-            "sha256": "1r4ai09vdckkg4h4i7dp781qqmm4kky53p4q8azp3n2c78i1vz6g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.46",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "s"
-        ]
-    },
-    "smartscan": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mickeynp",
-            "repo": "smart-scan",
-            "sha256": "1sd7dh9114mvr4xnp43xx4b7qmwkaj1a1fv7pwc28fhiy89d2md4",
-            "rev": "13c9fd6c0e38831f78dec55051e6b4a643963176"
-        },
-        "recipe": {
-            "sha256": "0vghgmx8vnjbvsw7q5zs0qz2wm6dcng9m69b8dq81g2cq9dflbwb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": []
-    },
-    "el-init": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "HKey",
-            "repo": "el-init",
-            "sha256": "1mzla7ijmq1mgzr6bf16mjdycbf8ylsf4zdk4j6fh5kw5n4k6c5n",
-            "rev": "25fd21d820bca1cf576b8f70c8d5a3bc76792597"
-        },
-        "recipe": {
-            "sha256": "121n6z8p9kzi7axp4i2kyi621gw20635w4j81i1bryblaqrv5kl5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": [
-            "anaphora",
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "alert": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jwiegley",
-            "repo": "alert",
-            "sha256": "1vpc3q40m6dcrslki4bg725j4kv6c6xfxwjjl1ilg7la49fwwf26",
-            "rev": "b301478e34a5c8bd27c17fc7605e6dd576e97935"
-        },
-        "recipe": {
-            "sha256": "0x3cvczq09jvshz435jw2fjm69457x2wxdvvbbjq46nfnybhi118",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2",
-        "deps": [
-            "gntp",
-            "log4e"
-        ]
-    },
-    "slime-ritz": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pallet",
-            "repo": "ritz",
-            "sha256": "0lp584k35asqlvbhglv124jazdgp3h7pzl0akfwbdmby9zayqk96",
-            "rev": "1cc6faedae26323994ea8dd1a4f555db8acbf244"
-        },
-        "recipe": {
-            "sha256": "1y1439y07l1a0sp9wn110hw4yyxj8n1cnd6h17rmsr549m2qbg1a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.0",
-        "deps": []
-    },
-    "buffer-flip": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "killdash9",
-            "repo": "buffer-flip.el",
-            "sha256": "0ck6d1z8j9yc32wrbwmxl8rgm19la7ijvsh740sd0sfmhwqxc1kz",
-            "rev": "2bbf74fac037ace991d03336c515c499a8e69c95"
-        },
-        "recipe": {
-            "sha256": "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": [
-            "key-chord"
-        ]
-    },
-    "tern-django": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "proofit404",
-            "repo": "tern-django",
-            "sha256": "0l63lzm96gg3ihgc4l671i342qxigwdbn4xfkbxnarb0206gnb5p",
-            "rev": "6d616c5f802d3432c4065dc306d7977d254df49f"
-        },
-        "recipe": {
-            "sha256": "1pjaaffadaw8h2n7yv01ks19gw59dmh8bp8vw51hx1082r3yfvv0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "emacs",
-            "f",
-            "tern"
-        ]
-    },
-    "ido-ubiquitous": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DarwinAwardWinner",
-            "repo": "ido-ubiquitous",
-            "sha256": "0byairx5nxbzgdyiw658p7yiysfr7r1bd3b2prawq72bslb1c5cn",
-            "rev": "1a97a38f2d1a51371853e44da659caa6baf78cbe"
-        },
-        "recipe": {
-            "sha256": "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "3.10",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "ido-completing-read+",
-            "s"
-        ]
-    },
-    "merlin": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "the-lambda-church",
-            "repo": "merlin",
-            "sha256": "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn",
-            "rev": "6f9915e0d87bf721ea2859ffa17d3fbeeabcfb9d"
-        },
-        "recipe": {
-            "sha256": "0wnh7512sknagdk56j6gd8vamh9ns3vnggm56s73pik0m009w0xr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.3.1",
-        "deps": []
-    },
-    "org-multiple-keymap": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "org-multiple-keymap.el",
-            "sha256": "0yxfhzygiki8sha1dddac4g72r51yi4jnga2scmk51f9jgwqbihp",
-            "rev": "20eb3be6be9f0abbad9f0d007e40cb00c8109201"
-        },
-        "recipe": {
-            "sha256": "16iv5575634asvn1b2k535ml8g4lqgy8z5w6ykma5f9phq5idb9f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "org"
-        ]
-    },
-    "vagrant": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ottbot",
-            "repo": "vagrant.el",
-            "sha256": "04r73s3fhvdcryv0l57awkpg1hi3kg6zcqxbxb03jc89h0f9vdlh",
-            "rev": "dabf69b7146f8a035bba15285b1fafc1e9ef4b3c"
-        },
-        "recipe": {
-            "sha256": "0g6sqzsx3lixcn09fkxhhcfp45qnqgf1ms0l7nkzyljavb7151cf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.2",
-        "deps": []
-    },
-    "windsize": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "grammati",
-            "repo": "windsize",
-            "sha256": "1f4v0xd341qs4kfnjqhgf8j26valvg6pz4rwcz0zj0s23niy2yil",
-            "rev": "014b0836f9ffe45fa7e0ccc84576fbef74815a59"
-        },
-        "recipe": {
-            "sha256": "1xhfw77168942rcn246qndii0hv0q6vkgzj67jg4mxh8n46m50m9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "anti-zenburn-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "m00natic",
-            "repo": "anti-zenburn-theme",
-            "sha256": "0q8495ivlkismlghk3chra8rkpqx9abnxahaq1lkp77aiyyhpadg",
-            "rev": "9a33476a0dad3c6dd2d5c0a0ff75e30aa5eacb01"
-        },
-        "recipe": {
-            "sha256": "1sp9p6m2jy4m9fdn1hz25cmasy0mwwgn46qmvm92i56f5x6jlzzk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.3",
-        "deps": []
-    },
-    "sws-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "brianc",
-            "repo": "jade-mode",
-            "sha256": "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n",
-            "rev": "4e7a20db492719062f40b225ed730ed50be5db56"
-        },
-        "recipe": {
-            "sha256": "0b12dsad0piih1qygjj0n7rni0pl8cizbzwqm9h1dr8imy53ak4i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": []
-    },
-    "ibuffer-projectile": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "ibuffer-projectile",
-            "sha256": "1zcnp61c9cp2kvns3v499hifk072rxm4rhw4pvdv2mm966vcxzvc",
-            "rev": "8b225dc779088ce65b81d8d86dc5d394baa53e2e"
-        },
-        "recipe": {
-            "sha256": "1qh4krggmsc6lx5mg60n8aakmi3f6ppl1gw094vfcsni96jl34fk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "projectile"
-        ]
-    },
-    "lentic": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "phillord",
-            "repo": "lentic",
-            "sha256": "0x0vz6sn4ignbxihzydc3d5dhlk1aywa4264mhqxb3adq4n1ryc6",
-            "rev": "8885bfcde8c6b60b79e7f07cf84c95578107491f"
-        },
-        "recipe": {
-            "sha256": "0y94y1qwj23kqp491b1fzqsrjak96k1dmmzmakbl7q8vc9bncl5m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.10",
-        "deps": [
-            "dash",
-            "emacs",
-            "f",
-            "m-buffer",
-            "s"
-        ]
-    },
-    "ubuntu-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rocher",
-            "repo": "ubuntu-theme",
-            "sha256": "0k41hwb6jgv3hngfrphlyhmfhvy4k05mvn0brm64xk7lj56y8q2c",
-            "rev": "41f09ca6c203da93bdadb2077556efd48e3b5d5a"
-        },
-        "recipe": {
-            "sha256": "160z59aaxb2v6c24nki6bn7pjm9r4jl1mgxs4h4sivzxkaw811s2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "4.2",
-        "deps": []
-    },
-    "lfe-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rvirding",
-            "repo": "lfe",
-            "sha256": "1w9n5v4g4w34gii6nk2aan4w230dmm0dhml4s9q1fzmvk1ngld6k",
-            "rev": "d7bc80da04aedd0a607f17d8d149eba363872b4b"
-        },
-        "recipe": {
-            "sha256": "06b382ncgk4zz3q8akyzfy55j86a53r97gf0l92qvlca7fbs8jjx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.10.1",
-        "deps": []
-    },
-    "nyan-prompt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "PuercoPop",
-            "repo": "nyan-prompt",
-            "sha256": "0bgspjy8h3d7v12sfjnd2ghj4183pdf0z48g5xs129jwd3nycykp",
-            "rev": "b5137f2ee9afe640f59786eed17b308df6356c73"
-        },
-        "recipe": {
-            "sha256": "1s0qyhpfpncsv9qfxy07rbp4gv8pp5xzb48rbd3r14nkjlnylnfb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": []
-    },
-    "keymap-utils": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "keymap-utils",
-            "sha256": "06ajkqxv71hcrwc707ybzwfw4yzbsp6basnbs493ryr41gnvmnzs",
-            "rev": "dd396093899a3792ef88742657e799339fd8aed5"
-        },
-        "recipe": {
-            "sha256": "0nbcwz4nls0pva79lbx91bpzkl38g98yavwkvg2rxbhn9vjbhzs9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.2",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "xcscope": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dkogan",
-            "repo": "xcscope.el",
-            "sha256": "1n1msmqap4a2qnjwrchf9cjkzcl20hbrx0vsc4lkbvq3p5riv5p7",
-            "rev": "4775aae4ce4caa92fb8b752907d7b66b96ccbe03"
-        },
-        "recipe": {
-            "sha256": "06xh29cm5v3b5xwj32y0i0h0kvvy995840db4hvab2wn9jw68m8w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": []
-    },
-    "weechat": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "the-kenny",
-            "repo": "weechat.el",
-            "sha256": "0f90m2s40jish4wjwfpmbgw024r7n2l5b9q9wr6rd3vdcwks3mcl",
-            "rev": "f01cdd4d874cf09fee5a78d7b29eb96bc21be2be"
-        },
-        "recipe": {
-            "sha256": "0sxrms5024bi4irv8x8s8j1zcyd62cpqm0zv4dgpm65wnpc7xc46",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.2",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "s",
-            "tracking"
-        ]
-    },
-    "psci": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ardumont",
-            "repo": "emacs-psci",
-            "sha256": "0wgxrwl7dpy084sc76wiwpixycb171g7xwc66m5gnlrv79qyac73",
-            "rev": "8c2d5a0ba604ec593f83f632b2830a87f41f84d4"
-        },
-        "recipe": {
-            "sha256": "0sgrz8byz2pcsad2pydinp4hh2xb48pdb03r93wg2vvyy8p15j9g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.6",
-        "deps": [
-            "dash",
-            "deferred",
-            "f",
-            "purescript-mode",
-            "s"
-        ]
-    },
-    "go-scratch": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "shosti",
-            "repo": "go-scratch.el",
-            "sha256": "1a6vg2vwgnafb61pwrd837fwlq5gs80wawbzjsnykawnmcaag8pm",
-            "rev": "3f68cbcce04f59eb8e83af109164731ec0454be0"
-        },
-        "recipe": {
-            "sha256": "11ahvmxbh67wa39cymymxmcpkq0kcn5jz0rrvazjy2p1hx3x1ma5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.1",
-        "deps": [
-            "emacs",
-            "go-mode"
-        ]
-    },
-    "plenv": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "karupanerura",
-            "repo": "plenv.el",
-            "sha256": "11cbpgjsnw8fiqf1s12hbm9qxgjcw6y2zxx7wz4wg7idmi7m0b7g",
-            "rev": "ee937d0f3a1a7ba2d035f45be896d3ed8fefaee2"
-        },
-        "recipe": {
-            "sha256": "0dw9fy5wd9wm76ag6yyw3f9jnlj7rcdcxgdjm30h514qfi9hxbw4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.32",
-        "deps": []
-    },
-    "git-gutter+": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nonsequitur",
-            "repo": "git-gutter-plus",
-            "sha256": "101hracd77mici778x3ixwrcicd6fqkcr9z76kapkr0dq5z42yjb",
-            "rev": "f8daebb6569bb116086d8653da3505382e03d940"
-        },
-        "recipe": {
-            "sha256": "1w78p5cz6kyl9kmndgvwnfrs80ha707s8952hycrihgfb6lixmp0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": [
-            "git-commit"
-        ]
-    },
-    "wrap-region": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "wrap-region",
-            "sha256": "03hjwm51sngkh7jjiwnqhflllqq6i99ib47rm2ja9ii0qyhj1qa0",
-            "rev": "5a910ad23ebb0649e644bf62ad042587341da5da"
-        },
-        "recipe": {
-            "sha256": "0mby3m49vm2pw127divspgivqam27zd4r70wx5ra05xwfxywaibq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7.3",
-        "deps": [
-            "dash"
-        ]
-    },
-    "flymake-gjshint": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yasuyk",
-            "repo": "flymake-gjshint-el",
-            "sha256": "002s01cymgx4z4l3j2pqirg7899pljdx2hmbz8k6cksdxlymzmkd",
-            "rev": "71495ee5303de18293decd57ab9f9abdbaabfa05"
-        },
-        "recipe": {
-            "sha256": "19jcd5z4883z3fzlrdn4fzmsvn16f4hfnhgw4vbs5b0ma6a8ka44",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.6",
-        "deps": []
-    },
-    "rnc-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "TreeRex",
-            "repo": "rnc-mode",
-            "sha256": "1drvyf5asjp3lgpss7llff35q8r89vmh73n1axaj2qp9jx5a5jih",
-            "rev": "b39dc23218213336b55f28e12a1d0e49ef7c1e21"
-        },
-        "recipe": {
-            "sha256": "09ly7ln6qrcmmim9bl7kd50h4axrhy6ig406r352xm4a9zc8n22q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.6",
-        "deps": []
-    },
-    "pangu-spacing": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "coldnew",
-            "repo": "pangu-spacing",
-            "sha256": "0gmdzagyg0p7q1gyj2a3aqp2g4asljpib3n67nikr0v99c2mki5y",
-            "rev": "034b4ef8a1b29bf7bfed6a916380941506ed26ed"
-        },
-        "recipe": {
-            "sha256": "082qh26vlk7kifz1800lyai17yvngwjygrfrsh1dsd8dxhk6l9j8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": []
-    },
-    "protobuf-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "google",
-            "repo": "protobuf",
-            "sha256": "03df8zvx2sry3jz2x4pi3l32qyfqa7w8kj8jdbz30nzy0h7aa070",
-            "rev": "bba83652e1be610bdb7ee1566ad18346d98b843c"
-        },
-        "recipe": {
-            "sha256": "1hh0w93fg6mfwsbb9wvp335ry8kflj50k8hybchpjcn6f4x39xsj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.6.1",
-        "deps": []
-    },
-    "metaweblog": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "punchagan",
-            "repo": "metaweblog.el",
-            "sha256": "06mbdb4zb07skq1jpv05hr45k5x96d9hgkb358jiq0kfsqlrbbb4",
-            "rev": "c8b50a6edf0fd2f396570c9a1c2ef8cd207606fb"
-        },
-        "recipe": {
-            "sha256": "11y5x3a8iv0hjj7ppi2sa7vawn7r475qfsh1jg415j4y4fzwpk6y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "xml-rpc"
-        ]
-    },
-    "imenus": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alezost",
-            "repo": "imenus.el",
-            "sha256": "18nx5z2vn0ikv4gxjprsqr63pcgf9s02gc3f769h8dji560kqxd4",
-            "rev": "7409021864a4e74a237a00d1e1d2597dc80ef7f0"
-        },
-        "recipe": {
-            "sha256": "1q0j6r2n5vjlbgchkz9zdglmmbpd8agawzcg61knqrgzpc4lk82r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "systemd": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "holomorph",
-            "repo": "systemd-mode",
-            "sha256": "0axskr4q0kw8pmnl1pv2z3n6x3pn6v28qcgz3qf745lqgmsgbng9",
-            "rev": "aa9f4f64e99d5912153eef0726e26fd4dfb4d7c3"
-        },
-        "recipe": {
-            "sha256": "1biais0cmidy3d0hf2ifdlr6qv1z8k8c8bczi07bsfk4md3idbir",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3.1",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "ov": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ShingoFukuyama",
-            "repo": "ov.el",
-            "sha256": "0qxk2rf84j86syxi8xknsq252irwg7sz396v3bb4wqz4prpj0kzc",
-            "rev": "4e1c254d74bc1773c92f1613c3865cdcb4bc7095"
-        },
-        "recipe": {
-            "sha256": "0d71mpv74cfxcnwixbrl90nr22cw4kv5sdgpny5wycvh6cgmd6qb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.6",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "ibuffer-vc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "ibuffer-vc",
-            "sha256": "0bqdi5w120256g74k0j4jj81x804x1gcg4dxa74w3mb6fl5xlvs8",
-            "rev": "b2bac7aa69335933ebb2e6f34259fa96d2c8d46a"
-        },
-        "recipe": {
-            "sha256": "0bn5qyiq07cgzci10xl57ss5wsk7bfhi3hjq2v6yvpy9v704dvla",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.10",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "servant": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "servant.el",
-            "sha256": "15lx6qvmq3vp84ys8dzbx1nzxcnzlq41whawc2yhrnd1dbq4mv2d",
-            "rev": "4d2aa8250b54b28e6e7ee4cd5ebd98a33db2c134"
-        },
-        "recipe": {
-            "sha256": "048xg0gcwnf4l2p56iw4iawi3ywjz7f6icnjfi8qzk1z912iyl9h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.0",
-        "deps": [
-            "ansi",
-            "commander",
-            "dash",
-            "epl",
-            "f",
-            "s",
-            "shut-up",
-            "web-server"
-        ]
-    },
-    "moz-controller": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "RenWenshan",
-            "repo": "emacs-moz-controller",
-            "sha256": "1w1i1clkjg9mj1g4i2y3xw3hyj8s7h9gr04qgyb9c1q8vh11z8d0",
-            "rev": "42fd842039620de7fb122f7e4ffc1ab802ee97c5"
-        },
-        "recipe": {
-            "sha256": "18gca1csl9dfi9995mky8cbgi3xzf1if8pzdjiz5404gzcqk0rfd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": [
-            "moz"
-        ]
-    },
-    "dired-efap": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "juan-leon",
-            "repo": "dired-efap",
-            "sha256": "1m0nx8wd6q56qbp5mbp9n466kyglrz34nflwvgd1qnmi08jwswgv",
-            "rev": "2b849bc5c09d0b752a177495ea1b851ee821f5bf"
-        },
-        "recipe": {
-            "sha256": "01j5v6584qi8ia7zmk03kx3i3kmm6hn6ycfgqlh5va6lp2h9sr00",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8",
-        "deps": []
-    },
-    "form-feed": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wasamasa",
-            "repo": "form-feed",
-            "sha256": "171jna631b2iqcimfsik9c66gii8nc0zdb58m077w00rn7rcxbh2",
-            "rev": "eac6724c093458745e9ae0e37221077fa2ad0ff6"
-        },
-        "recipe": {
-            "sha256": "1abwjkzi3irw0jwpv3f584zc72my9n8iq8zp5s0354xk6iwrl1rh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.2",
-        "deps": []
-    },
-    "auto-complete-nxml": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "auto-complete-nxml",
-            "sha256": "18bf1kw85mab0zp7rn85cm1nxjxg5c1dmiv0j0mjwzsv8an4px5y",
-            "rev": "ac7b09a23e45f9bd02affb31847263de4180163a"
-        },
-        "recipe": {
-            "sha256": "0viscr5k1carn9vhflry16kgihr6fvh6h36b049pgnk6ww085k6a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.0",
-        "deps": [
-            "auto-complete"
-        ]
-    },
-    "ws-butler": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lewang",
-            "repo": "ws-butler",
-            "sha256": "1lv0l27lrp6xyl0c5yhlnyjwx872izq02z8x34da9jv3walxpk8f",
-            "rev": "106d313c0dad532c2da3cc78770a8a2f0396aa85"
-        },
-        "recipe": {
-            "sha256": "072k67z2lx0ampwzdiszi64xs0w6frp4nbmrd2r0wpx0pd211vbn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": []
-    },
-    "nsis-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "nsis-mode",
-            "sha256": "0c4qfbb345yna5c30czq8nhcx283z1fnpp6h16p7vjqs6y37czsl",
-            "rev": "f1bf701c37680553c8f51462e0829d0dd6c53187"
-        },
-        "recipe": {
-            "sha256": "0pc047ryw906sz5mv0awvl67kh20prsgx6fbh0j1qm0cali2792l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.44",
-        "deps": []
-    },
-    "punctuality-logger": {
-        "fetch": {
-            "tag": "fetchFromGitLab",
-            "owner": "elzair",
-            "repo": "punctuality-logger",
-            "sha256": "1v48i37iqrrwbyy3bscicfq66vbbml4sg0f0n950bnk0qagjx8py",
-            "rev": "708cae8e67dbae293c7c4be0ca5e49d76fac6714"
-        },
-        "recipe": {
-            "sha256": "0q9s74hkfqvcx67xpq9rlvh38nyjnz230bll6ks7y5yzxvl4qhcm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8",
-        "deps": []
-    },
-    "less-css-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "less-css-mode",
-            "sha256": "1w6mbk4gc63sh2p9rsy851x2kid0dp2ja4ai5badkr5prxkcpfdn",
-            "rev": "d59a3ff4031ae75fbbe77b6cfce7843205394c28"
-        },
-        "recipe": {
-            "sha256": "188iplnwwhawq3dby3388kimy0jh1k9r8v9nxz52hy9rhh9hykf8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.20",
-        "deps": []
-    },
-    "python-x": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wavexx",
-            "repo": "python-x.el",
-            "sha256": "00i7cc4r7275l22k3708xi4hqw2j44yivdb1madzrpf314v3kabr",
-            "rev": "e606469aafec2e6beda8c589540b88a5a6f6f33f"
-        },
-        "recipe": {
-            "sha256": "115mvhqfa0fa8kdk64biba7ri4xjk74qqi6vm1a5z3psam9mjcmn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": [
-            "folding",
-            "python"
-        ]
-    },
-    "ruby-test-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "r0man",
-            "repo": "ruby-test-mode",
-            "sha256": "008zj9rg2cmh0xd7g6kgx6snm5sspxs4jmfa8hd43wx5y9pmlb8f",
-            "rev": "7d3c04b60721665af93ffb4abc2a7b3191926431"
-        },
-        "recipe": {
-            "sha256": "113ysf08bfh2ipk55f8h741j05999yrgx57mzh53rim5n63a312w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "font-utils": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "font-utils",
-            "sha256": "1k90w8v5rpswqb8fn1cc8sq5w12gf4sn6say5dhvqd63512b0055",
-            "rev": "9192d3f8ee6a4e75f34c3fed10378674cc2b11d3"
-        },
-        "recipe": {
-            "sha256": "0k33jdchjkj7j211a23kfp5axg74cfsrrq4axsb1pfp124swh2n5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7.8",
-        "deps": [
-            "pcache",
-            "persistent-soft"
-        ]
-    },
-    "digistar-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "retroj",
-            "repo": "digistar-mode",
-            "sha256": "0jzwaivsqh66py9hd3dg1ys5rc3p6pn8ndpwpvgyivk4pg6zhhj6",
-            "rev": "0dcde58ec6e473042e55d4f283b223554546de5b"
-        },
-        "recipe": {
-            "sha256": "0khzxlrm09h31i1nqz6rnzhrdssb3kppc4klpxza612l306fih0s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": []
-    },
-    "yatex": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://www.yatex.org/hgrepos/yatex/",
-            "sha256": "1n38fn6hcsl5ilq8vdaakv6id426lr7hdnvccqy6jdplqymgj7h6",
-            "rev": "5b49aea3810d"
-        },
-        "recipe": {
-            "sha256": "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.78",
-        "deps": []
-    },
-    "pandoc-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joostkremers",
-            "repo": "pandoc-mode",
-            "sha256": "14kxmcsgdrq9r8c17x8hz8vid0bn6rikvmddhc6wpbmp7shngvr1",
-            "rev": "067f9aa8ba27bd50b602dbfdaa155e2f381c7139"
-        },
-        "recipe": {
-            "sha256": "0qvc6cf87h1jqf590kd68jfg25snxaxayfds634wj4z6gp70l781",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.13.3",
-        "deps": [
-            "dash",
-            "hydra"
-        ]
-    },
-    "highlight-parentheses": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nschum",
-            "repo": "highlight-parentheses.el",
-            "sha256": "08ld4wjrkd77cghmrf1n2hn2yzid7bdqwz6b1rzzqaiwxl138iy9",
-            "rev": "5aa800a68e3795716de1e7f2722e836781190f31"
-        },
-        "recipe": {
-            "sha256": "1b0n9mz4a6baljvvgb881w53391smm35c9pwd45g861hk1qvrk5k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.0",
-        "deps": []
-    },
-    "elx": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "elx",
-            "sha256": "12svv24qclkcdb5sniq0xbbsj34hq835s2v636xkb07dpmy644lg",
-            "rev": "8f339d0c266713ca8398b01d51ccfdbe1dbb9aeb"
-        },
-        "recipe": {
-            "sha256": "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.10.0",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "hyai": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "iquiw",
-            "repo": "hyai",
-            "sha256": "1b8992vzq5bh01pjlj181nzqjrqs4fbjpwvv8h7gjq42sf8w59sm",
-            "rev": "7c644d31f62943c75ccf5a772e43450b462cc08f"
-        },
-        "recipe": {
-            "sha256": "00ns7q5b11c5amwkq11fs4p5vrmdfmjljfrcxbwb39gc12yrhn7s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "hackernews": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "clarete",
-            "repo": "hackernews.el",
-            "sha256": "1ffk39lnmg9gfffkaj595p768d1p99q6sqym5g5ch6fmi6cx3a84",
-            "rev": "97b178acfa26b929fc23177b25fb0c62d2958e32"
-        },
-        "recipe": {
-            "sha256": "1x1jf5gkhmpiby5rmy0sziywh6c1f1n0p4f6dlz6ifbwns7har6a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "json"
-        ]
-    },
-    "powerline": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "milkypostman",
-            "repo": "powerline",
-            "sha256": "1nx3b24i26kgm52xw21x4m15qjkxw3sg5r6qyvck0fyhj0gw69gr",
-            "rev": "240bad5ebea4c7298e86ed76bd44c45d9062cb33"
-        },
-        "recipe": {
-            "sha256": "0gsffr6ilmckrzifsmhwd42vr85vs42pc26f1205pbxb7ma34dhx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.2",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "helm-sage": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "stakemori",
-            "repo": "helm-sage",
-            "sha256": "1s6aw1viyzhhrfiazzi82n7bkvshp7clwi6539660m72lfwc5zdl",
-            "rev": "b42b4ba5fd1b17c4b54c30376a053281686beeb8"
-        },
-        "recipe": {
-            "sha256": "1vnq15fjaap0ai7dadi64sm4415xssmahk2j7kx45sasy4qaxlbj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.4",
-        "deps": [
-            "cl-lib",
-            "helm",
-            "sage-shell-mode"
-        ]
-    },
-    "skewer-less": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "skewer-less",
-            "sha256": "0g5sapd76pjnfhxlw149zj0fpn6l3pz3l8qlcn2c237vm8vn6qv3",
-            "rev": "593001930f1d68c85233f34c5f6fb04173fc98d6"
-        },
-        "recipe": {
-            "sha256": "0fhv5cnp5bgw3krfmb0jl18kw2hzx2p81falj57lg3p8rn23dryl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "skewer-mode"
-        ]
-    },
-    "flymake-perlcritic": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "illusori",
-            "repo": "emacs-flymake-perlcritic",
-            "sha256": "11r982h5fhjkmm9ld8wfdip0ghinw523nm1w4fmy830g0bbkgkrq",
-            "rev": "0692d6ad5495f6e5438bde0a10345829b8e1def8"
-        },
-        "recipe": {
-            "sha256": "0hibnh463wzhvpix7gygpgs04gi6salwjrsjc6d43lxlsn3y1im8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.3",
-        "deps": [
-            "flymake"
-        ]
-    },
-    "emamux": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-emamux",
-            "sha256": "1a9925n0jcgxcgiz2kmh9zbb1rg9039rlrbr9fr80by9znfwmy67",
-            "rev": "53177ca59ed2824cc0837677af5a13a580691a71"
-        },
-        "recipe": {
-            "sha256": "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.13",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "kill-or-bury-alive": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mrkkrp",
-            "repo": "kill-or-bury-alive",
-            "sha256": "11cqrjxfiflz89gkl9g5m0wx041s28xz879cvhl3i1yjnwyhzqay",
-            "rev": "6e0d1ff08889d9cf3f89e366e327d9de930cf67c"
-        },
-        "recipe": {
-            "sha256": "0mm0m8hpy5v98cap4f0s38dcviirm7s6ra4l94mknyvnx0f73lz8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "ggtags": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "leoliu",
-            "repo": "ggtags",
-            "sha256": "1qjh7av046ax4240iw40hv5fc0k23c36my9hili7fp4y2ak99l8n",
-            "rev": "d4fb6d40b71cad3fd5a2141b8456f27e2b2dc731"
-        },
-        "recipe": {
-            "sha256": "1cmry4knxbx9257ivhfxsd09z07z3g3wjihi99nrwmhb9h4mpqyw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8.11",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "ac-cake2": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k1LoW",
-            "repo": "emacs-ac-cake2",
-            "sha256": "0mlmhdl9s28z981y8bnpj8jpfzm6bgfiyl0zmpgvhyqw1wzqywwv",
-            "rev": "ffbb679c0d5c261b05abde06d8d1d1e5d5990b6a"
-        },
-        "recipe": {
-            "sha256": "0qxilldx23wqf8ilif2nin119bvd0l7b6f6wifixx28a6kl1vsgy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.1",
-        "deps": [
-            "auto-complete",
-            "cake2"
-        ]
-    },
-    "cfengine-code-style": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cfengine",
-            "repo": "core",
-            "sha256": "11a89pyz8zdjdkimpqaywp702xf9cmwz1djkjp5dghgpwi1aid72",
-            "rev": "afed90c14a2b30bc36595626b959522c34a6565f"
-        },
-        "recipe": {
-            "sha256": "1ny8xvdnz740qmw9m81xnwd0gh0a516arpvl3nfimglaai5bfc9a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "3.8.0.2.1",
-        "deps": []
-    },
-    "corral": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nivekuil",
-            "repo": "corral",
-            "sha256": "0gpckp12b0hllgn821q3rqfxh5h7ny5gfhhvfdbvszb7kwl1f6cx",
-            "rev": "bcd1d90b2280f93ed139e4aa82838a8e62a4bac9"
-        },
-        "recipe": {
-            "sha256": "1drccqk4qzkgvkgkzlrrfd1dcgj8ziqriijrjihrzjgjsbpzv6da",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": []
-    },
-    "cacoo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiwanami",
-            "repo": "emacs-cacoo",
-            "sha256": "1k2hmc87ifww95k3m8ksiswkk2z0y8grssba7381g8dnlp6jgprx",
-            "rev": "c2e6a8830144810cd4e51de3646cb8200bcebbc6"
-        },
-        "recipe": {
-            "sha256": "0kri4vi6dpsf0zk24psm16f3aa27cq5b54ga7zygmr02csq24a6z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.1.2",
-        "deps": [
-            "concurrent"
-        ]
-    },
-    "sprintly-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sprintly",
-            "repo": "sprintly-mode",
-            "sha256": "06rk07h92s5sljprs41y3q31q64cprx9kgs56c2j6v4c8cmsq5h6",
-            "rev": "6695892bae5860b5268bf3ae62be990ee9b63c11"
-        },
-        "recipe": {
-            "sha256": "15i3rrv27ccpn12wwj9raaxpj7nlnrrj3lsp8vdfwph6ydvnfza4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.4",
-        "deps": [
-            "furl"
-        ]
-    },
-    "multi": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kurisuwhyte",
-            "repo": "emacs-multi",
-            "sha256": "11zabs7qpdhri6n90ck7pgwcbz46d813nyl73h5m1i8jvz1wzx7v",
-            "rev": "884203b11fdac8374ec644cca975469aab263404"
-        },
-        "recipe": {
-            "sha256": "1c240d1c1g8wb2ld944344zklnv86d9rycmya4z53b2ai10642ig",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.0.1",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "json-reformat": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gongo",
-            "repo": "json-reformat",
-            "sha256": "0qp4n2k6s69jj4gwwimkpadjv245y54wk3bxb1x96f034gkp81vs",
-            "rev": "b9bd375ec1deb10d2ba09c409bdcf99c56d7a716"
-        },
-        "recipe": {
-            "sha256": "1m5p895w9qdgb8f67xykhzriribgmp20a1lvj64iap4aam6wp8na",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.6",
-        "deps": []
-    },
-    "unicode-whitespace": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "unicode-whitespace",
-            "sha256": "0q7cbl89yg3fjxaxsqsksxhw7ibdslbb004z5y1m579n7zgcrljy",
-            "rev": "6d29f25d46b3344c74ce289fc80b3d4fc17ed6db"
-        },
-        "recipe": {
-            "sha256": "1b3jgha8va42b89pdp41sab2w9wllp7dicqg4lxl67bg6wn147wy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.4",
-        "deps": [
-            "pcache",
-            "persistent-soft",
-            "ucs-utils"
-        ]
-    },
-    "kakapo-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "listx",
-            "repo": "kakapo-mode",
-            "sha256": "0b6af8hnrn0v4z1xpahjfpw5iga2bmgd3qwfn3is2rygsn5rkm40",
-            "rev": "fe3d579867f7465cd3ad04f29b4b2b3b820edc01"
-        },
-        "recipe": {
-            "sha256": "0a99cqflpzasl4wcmmf99aj8xgywkym37j7mvnsajrsk5wawdlss",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "omni-tags": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "AdrieanKhisbe",
-            "repo": "omni-tags.el",
-            "sha256": "0c34rci5793hd674x2srhqvnj46llrbkrw1xpzf73s4ib5zhh7xi",
-            "rev": "a7078bfbc9a6256efd0e57530df9fd7808bc2185"
-        },
-        "recipe": {
-            "sha256": "133ww1jf14jbw02ssbx2a46mp52j18a2wwzb6x77azb0akmf1lzl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.2",
-        "deps": [
-            "cl-lib",
-            "pcre2el"
-        ]
-    },
-    "hcl-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-hcl-mode",
-            "sha256": "15h1wkl1d9f2xfhm0nffqicg31rw7z2q0sizjphys9ljgxm43is4",
-            "rev": "f9757d4122d75ffdff92c97ec9e75694506caba5"
-        },
-        "recipe": {
-            "sha256": "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "page-break-lines": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "page-break-lines",
-            "sha256": "1acz3w2zdcds0h6p2k9h3lmjsk519asqrxjw7f3pyrcq7x2qbhc4",
-            "rev": "36d3f93a23b767e7558b9c90f3631b03ce9fbdce"
-        },
-        "recipe": {
-            "sha256": "0q1166z190dxznzgf2f29klj2jkaqlic483p4h3bylihkqp93ij7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.10",
-        "deps": []
-    },
-    "rope-read-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "marcowahl",
-            "repo": "rope-read-mode",
-            "sha256": "133ficdghshlmwq5dn42cg3h51jdg4lcwqr4cd2s2s52rz8plw9h",
-            "rev": "cb550afeedd369c80d1ccb54bb48494d170a5569"
-        },
-        "recipe": {
-            "sha256": "0grnn5k6rbck0hz4c6cadgj3a4dv62habyingznisg2kx9i3m0dw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.1",
-        "deps": []
-    },
-    "desktop+": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ffevotte",
-            "repo": "desktop-plus",
-            "sha256": "184zi5fv7ranghfx1hpx7j2wnk6kim8ysliyw2c5c1294sxxq3f3",
-            "rev": "a484d24ca673c7536387368729421dad9dde5059"
-        },
-        "recipe": {
-            "sha256": "0w7i6k4814hwb19l7ly9yq59674xiw57ylrwxq7yprwx52sgs2r8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "bash-completion": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "szermatt",
-            "repo": "emacs-bash-completion",
-            "sha256": "11rlmrjdpa3vnf0h9vcd75946q9jyf1mpbm7h12hmpj6g2pavgdd",
-            "rev": "9588a9c0ddf18f9869d4145a67e6446a4b66eba2"
-        },
-        "recipe": {
-            "sha256": "0l41yj0sb87i27hw6dh35l32hg4qkka6r3bpkckjnfm0xifrd9hj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.0.0",
-        "deps": []
-    },
-    "angular-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "omouse",
-            "repo": "angularjs-mode",
-            "sha256": "1798nv4djhxzbin68zf6w7dbfm9sc39d0kygky52ii36arg5r1zp",
-            "rev": "7c0fb37f59dfd9e69f00b50e90a0e88c4e25d8c2"
-        },
-        "recipe": {
-            "sha256": "1bwfmjldnxki0lqi3ys6r2a3nlhbwm1dibsg2dvzirq8qql02w1i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "ctxmenu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "emacs-ctxmenu",
-            "sha256": "1jlr2miwqsg06hk2clvsrw9fa98m2n76qfq8qv5svrb8dpil04wb",
-            "rev": "5c2376859562b98c07c985d2b483658e4c0e888e"
-        },
-        "recipe": {
-            "sha256": "03g9px858mg19wapqszwav3599slljdyam8bvn1ri85fpa5ydvdp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.0",
-        "deps": [
-            "log4e",
-            "popup",
-            "yaxception"
-        ]
-    },
-    "python-environment": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tkf",
-            "repo": "emacs-python-environment",
-            "sha256": "0q6bib9nr6xiq6npzbngyfcjk87yyvwzq1zirr3z1h5wadm34lsk",
-            "rev": "401006584e32864a10c69d29f14414828909362e"
-        },
-        "recipe": {
-            "sha256": "1pq16rddw76ic5d02j5bswl9qcydi47hqmhs7r06jk46vsfzxpl7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.2",
-        "deps": [
-            "deferred"
-        ]
-    },
-    "gotham-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wasamasa",
-            "repo": "gotham-theme",
-            "sha256": "0pxzi56lw9ry91f70hjnvrsbyhcaqknlwicjjbhf6rhv57fplw8h",
-            "rev": "d41b0ea37ad5a4d0060ea05e25d80581f113b662"
-        },
-        "recipe": {
-            "sha256": "0jars6rvf7hkyf71vq06mqki1r840i1dvv43dissqjg5i4lr79cl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.5",
-        "deps": []
-    },
-    "evil-quickscope": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "blorbx",
-            "repo": "evil-quickscope",
-            "sha256": "0yx5ry102hzhqx1aql58fkd986xgj250bbcxabpnvy27gim2b977",
-            "rev": "d2f512fa4bd0b0603529a441e474ca551f621650"
-        },
-        "recipe": {
-            "sha256": "0xym1mh4p68i00l1lshywf5fdg1vw3szxp3fk9fwfcg04z6vd489",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.3",
-        "deps": [
-            "evil"
-        ]
-    },
-    "xbm-life": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wasamasa",
-            "repo": "xbm-life",
-            "sha256": "154xnfcmil9xjjmq4cyrfpir4ga4mgcmmbd7dja1m7rpk1734xk6",
-            "rev": "bde2b3730a02d237f7d95a8e3f3722f23f2d9201"
-        },
-        "recipe": {
-            "sha256": "1pglxjd4cs630sayx17ai1xflpbyj3hry3156682bgwhqs1vw68q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.3",
-        "deps": []
-    },
-    "elpa-mirror": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "redguardtoo",
-            "repo": "elpa-mirror",
-            "sha256": "1hjmvn3kls63alh0ihb5c8gf90lrfvq1hxrlf4162qiaa0s15f8a",
-            "rev": "6c32875c2317736e590e067820996010b21acb1d"
-        },
-        "recipe": {
-            "sha256": "1jnviav2ybr13cgllg26kfjrwrl25adggnqiiwyjwgbbzxfycah8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2.1",
-        "deps": []
-    },
-    "edit-server": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "stsquad",
-            "repo": "emacs_chrome",
-            "sha256": "12dp1xj09jrp0kxp9xb6cak9dn6zkyis1wfn4fnhzmxxnrd8c5rn",
-            "rev": "f0db18f0d6e9885e4aef3ace8342fd6f635fadf6"
-        },
-        "recipe": {
-            "sha256": "0ffxcgmnz0f2c1i3vfwm8vlm6jyd7ibf4kq5z8c6n50zkwfdmns0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.13",
-        "deps": []
-    },
-    "dynamic-ruler": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rocher",
-            "repo": "dynamic-ruler",
-            "sha256": "05z7gshrn7wp0qkb9ns6rgmcp375yllmkwhdsm4amg0dk3j2slbr",
-            "rev": "2d69a7aec21d3d9dbc8ae7520e5c513e98d64ebb"
-        },
-        "recipe": {
-            "sha256": "13jc3xbsyc3apkdfy0iafmsfvgqs0zfa5w8jxp7zj4dhb7pxpnmc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.4",
-        "deps": []
-    },
-    "fontawesome": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-fontawesome",
-            "sha256": "0qq13jhn9i2ls6n3fbay4i2r0hfs426pkmmif43b87gjxb510irc",
-            "rev": "ccb03b8329daa3130491c9c4d285b325dbeb5cc7"
-        },
-        "recipe": {
-            "sha256": "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "cl-lib",
-            "helm-core"
-        ]
-    },
-    "o-blog": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "renard",
-            "repo": "o-blog",
-            "sha256": "0r12023yy8j96bp8z2ml6ffyr2c9rcd5abkh6vqnkwsdxkzx6wrs",
-            "rev": "5db9594c6e3439c000b183551d7975c2e29131f4"
-        },
-        "recipe": {
-            "sha256": "08grkyvg27wd5232q3y8p0v7higfq7bmsdzmvhja96v6qy2xsbja",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.0",
-        "deps": []
-    },
-    "love-minor-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ejmr",
-            "repo": "love-minor-mode",
-            "sha256": "11y5jyq4xg9zlm1qi2y97nh05vhva9pai9yyr4x2pr41xz3s8fpk",
-            "rev": "1634ff3a8b657c63a5cffd9a937812a289f2c954"
-        },
-        "recipe": {
-            "sha256": "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": []
-    },
-    "erc-hl-nicks": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "leathekd",
-            "repo": "erc-hl-nicks",
-            "sha256": "0bc71s1cx4z6a9cpfygmzv1xzzx9s74366kzqnlg22sxxpb9ajhq",
-            "rev": "f7e9c378072ecc689f2a0ef66d73db8bbcc07d87"
-        },
-        "recipe": {
-            "sha256": "1lhw77n2nrjnb5yhnpm6yhbcp022xxjcmdgqf21z9rd0igss9mja",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3.0",
-        "deps": []
-    },
-    "dash-functional": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "dash.el",
-            "sha256": "1njv5adcm96kdch0jb941l8pm51yfdx7mlz83y0pq6jlzjs9mwaa",
-            "rev": "fec6f5480d0ce03ead0e6117ac77dc7e757e76f8"
-        },
-        "recipe": {
-            "sha256": "0hx36hs12mf4nmskaaqrqpcgwrfjdqj6qcxn6bwb0s5m2jf9hs8p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.12.1",
-        "deps": [
-            "dash",
-            "emacs"
-        ]
-    },
-    "pdf-tools": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "politza",
-            "repo": "pdf-tools",
-            "sha256": "19sy49r3ijh36m7hl4vspw5c4i8pnfqdn4ldm2sqchxigkw56ayl",
-            "rev": "0107f80dcf268d08ac075b01729820062c0fbd67"
-        },
-        "recipe": {
-            "sha256": "1hnc8cci00mw78h7d7gs8smzrgihqz871sdc9hfvamb7iglmdlxw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.70",
-        "deps": [
-            "emacs",
-            "let-alist",
-            "tablist"
-        ]
-    },
-    "image+": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-imagex",
-            "sha256": "0k69xbih0273xvmj035vcmm67l6hgjb99pb1jbva5x0pnszb1vdv",
-            "rev": "967508a6c151e6ab6e97d3ac332dc5599011830d"
-        },
-        "recipe": {
-            "sha256": "1a9dxswnqn6cvx28180kclpjc0vc6fimzp7n91gpdwnmy123x6hg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.2",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "dockerfile-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "spotify",
-            "repo": "dockerfile-mode",
-            "sha256": "1cmh8pwwa6dhl4w66wy8s5yqxs326mnaalg1ig2yhl4bjk8gi4m2",
-            "rev": "9a75fcd119c5b2a1d723d440bbe4b1db56df90cc"
-        },
-        "recipe": {
-            "sha256": "1dxvzn35a9qd3x8pjvrvb2g71yf84404g6vz81y0p353rf2zknpa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2",
-        "deps": []
-    },
-    "telepathy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "NicolasPetton",
-            "repo": "telepathy.el",
-            "sha256": "16kr1p4lzi1ysd5r2dh0mxk60zsm5fvwa9345nfyrgdic340yscc",
-            "rev": "211d785b02a29ddc254422fdcc3db45262582f8c"
-        },
-        "recipe": {
-            "sha256": "0c3d6vk7d6vqzjndlym2kk7d2zm0b15ac4142ir03p6f19rqq9pr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "flycheck-haskell": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "flycheck",
-            "repo": "flycheck-haskell",
-            "sha256": "0143lcn6g46g7skm4r6lqq09s8mr3268rikbzlh65qg80rpg9frj",
-            "rev": "57756b8f0e4e0a775a702a1b8f2a4be7bb0088cc"
-        },
-        "recipe": {
-            "sha256": "12lgirz3j6n5ns2ikq4n41z0d33qp1lb5lfz1q11qvpbpn9d0jn7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7.2",
-        "deps": [
-            "dash",
-            "emacs",
-            "flycheck",
-            "haskell-mode",
-            "let-alist"
-        ]
-    },
-    "evil-iedit-state": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syl20bnr",
-            "repo": "evil-iedit-state",
-            "sha256": "0r2367lbzcdhglvjjcamrzn5fmqy0jalcws8r0yc2al1vbsrn0fr",
-            "rev": "0bf8d5d1777f1e8a3c46b6a1c7dceb082fcc6779"
-        },
-        "recipe": {
-            "sha256": "1dihyh7vqcp7kvfic613k7v33czr93hz04d635awrsyzgy8savhl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": [
-            "evil",
-            "iedit"
-        ]
-    },
-    "unicode-enbox": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "unicode-enbox",
-            "sha256": "0n06dvf6r7qblz8vz38qc37xrn29wa1c0jyzis1qw9zzf6hmmzj7",
-            "rev": "ff313f6778bb96481c0ee3291b07a7db46f21ff5"
-        },
-        "recipe": {
-            "sha256": "1phb2qq3pg6z6bl96kl9yfq4jxhgardjpaa4lhgqbxymmqdm7gzv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.4",
-        "deps": [
-            "pcache",
-            "persistent-soft",
-            "string-utils",
-            "ucs-utils"
-        ]
-    },
-    "flycheck-pos-tip": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "flycheck",
-            "repo": "flycheck-pos-tip",
-            "sha256": "0v23yc8znzjp44lrpfzqb4hc3psad14hsnvqcp8f1yyhgvdx35n8",
-            "rev": "0c2b31b615fa294f329f3cc387b464525ce3392d"
-        },
-        "recipe": {
-            "sha256": "09i2jmwj8b915fhyczwdb1j7c551ggbva33avis77ga1s9v3nsf9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "dash",
-            "flycheck",
-            "pos-tip"
-        ]
-    },
-    "ac-dcd": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "atilaneves",
-            "repo": "ac-dcd",
-            "sha256": "0a3s880nswc2s6yh2v5zsmws550q917i7av8nrxc5sp1d03xqwmn",
-            "rev": "4cb14b1e9fcfc4bf4a084765bc1eb10abfbbbd49"
-        },
-        "recipe": {
-            "sha256": "086jp9c6bilc361n1hscza3pbhgvqlq944z7cil2jm1kicsf8s7r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": [
-            "auto-complete",
-            "flycheck-dmd-dub"
-        ]
-    },
-    "es-windows": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sabof",
-            "repo": "es-windows",
-            "sha256": "0cjchwrhk7bw87bg10zgcwkga50rvs0jn5v2jf6bbsxbcqx2nfc9",
-            "rev": "7ebe6c6e0831373847d7adbedeaa2e506b54b2af"
-        },
-        "recipe": {
-            "sha256": "112ngkan0hv3y7m71479f46x5gwdmf0vhbqrzs5kcjwlacqlrahx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "find-by-pinyin-dired": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "redguardtoo",
-            "repo": "find-by-pinyin-dired",
-            "sha256": "1xjb66pydm3yf0jxnm2mri98pxq3b26xvwjkaj1488qgj27i05jr",
-            "rev": "3137c367d58958858daa6d3dee1993b2eb9dd9b4"
-        },
-        "recipe": {
-            "sha256": "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.2",
-        "deps": []
-    },
-    "smart-mode-line": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "smart-mode-line",
-            "sha256": "0yvlmwnhdph5qj1998jz0idcl7901j6fxa9hivr7kic57j8kbq71",
-            "rev": "d98b985c44b2c771cac1eea758f21e16e169a8a0"
-        },
-        "recipe": {
-            "sha256": "0qmhzlkc6mfqyaw4jaw6195b8sw0wg9pfjcijb4p0mlywf5mh5q6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.9",
-        "deps": [
-            "emacs",
-            "rich-minority"
-        ]
-    },
-    "live-py-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "donkirkby",
-            "repo": "live-py-plugin",
-            "sha256": "1y81qqsjj2sa319xkwhvq7bl3f5gma4cs7w8x2w510ms32fgqa8x",
-            "rev": "75c27e0110257e3138e24dc2de2a19244635a0bf"
-        },
-        "recipe": {
-            "sha256": "0yn1a0gf9yn068xifpv8p77d917mnalc56pll800zlpsdk8ljicq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.8.1",
-        "deps": []
-    },
-    "pos-tip": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pitkali",
-            "repo": "pos-tip",
-            "sha256": "0w8bnspnk871qndp18hs0wk4x9x31xr9rwbvf5dc8mcbnj29ch33",
-            "rev": "1b81694d1dc29253db0e855b82563f84a32b38d4"
-        },
-        "recipe": {
-            "sha256": "13qjz112qlrnq34lr70087gshzq8m44knfl6694hfprzjgix84vh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4.6",
-        "deps": []
-    },
-    "helm-gitlab": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nlamirault",
-            "repo": "emacs-gitlab",
-            "sha256": "1hc7j3gwljb1wk2727f66m3f7ga4icbklp54vlm0vf2bmii1ynil",
-            "rev": "90be6027eb59a967e5bbceaa5f32c098472ca245"
-        },
-        "recipe": {
-            "sha256": "010ihx3yddhb8j3jqcssc49qnf3i7xlz0s380mpgrdxgz6yahsmd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7.0",
-        "deps": [
-            "dash",
-            "gitlab",
-            "helm",
-            "s"
-        ]
-    },
-    "jabber": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://git.code.sf.net/p/emacs-jabber/git",
-            "sha256": "af89d7052e555c7b5efb0c21387a50699056659fb83698691b70e75c88e4cd34",
-            "rev": "2999f58619dd9c20cc6cac8060c4c850a504cbbd"
-        },
-        "recipe": {
-            "sha256": "1g5pc80n3cd5pzs3hmpbnmxbldwakd72pdn3vvb0h26j9v073pa8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8.92",
-        "deps": []
-    },
-    "magit-gerrit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "terranpro",
-            "repo": "magit-gerrit",
-            "sha256": "0ym24gjd6c04zry08abcb09zvjbgj8nc1j12q0r51fhzzadxcxbb",
-            "rev": "699c5c39c6dbdc8d730721eaf1491f982dd78142"
-        },
-        "recipe": {
-            "sha256": "1iwvg10ly6dlf8llz9f8d4qfdbvd3s28wf48qgn1wjlxpka6zrd4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "magit"
-        ]
-    },
-    "org-pomodoro": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lolownia",
-            "repo": "org-pomodoro",
-            "sha256": "1fjdza723615bhdm5x6gbd03vi7ywzpbjn8p59saimczqngfdpmw",
-            "rev": "26452a3d070f4814b191a9de9e3493a54161b910"
-        },
-        "recipe": {
-            "sha256": "1vdi07hrhniyhhvg0hcr5mlixy6bjynvwm89z2lvfyvnnxpx0r27",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.0.3",
-        "deps": [
-            "alert",
-            "cl-lib"
-        ]
-    },
-    "monokai-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "oneKelvinSmith",
-            "repo": "monokai-emacs",
-            "sha256": "02w7k4s4698p4adjy4a36na28sb1s2zw4xsjs7p2hv9iiw9kmyvz",
-            "rev": "9a6f126e1f02ec49d41fe2ee79670ca96a563f1a"
-        },
-        "recipe": {
-            "sha256": "13mv4vgsmdbf3v748lqi7b42hvr3yp86n97rb6792bcgd3kbdx7a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": []
-    },
-    "kurecolor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsfodder",
-            "repo": "kurecolor",
-            "sha256": "0da4y9pf6vq0i6w7bmvrszg9bji3ylhr44hmyrmxvah28pigb2fz",
-            "rev": "c8c72cea04e51f57701d2dd9be7dba5f3412e2f3"
-        },
-        "recipe": {
-            "sha256": "0q0q0dfv376h7j3sgwxqwfpxy1qjbvb6i5clsxz9xp4ly89w4d4f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2.2",
-        "deps": [
-            "emacs",
-            "s"
-        ]
-    },
-    "flymake-haml": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-haml",
-            "sha256": "1b3lf5jwan03k7rb97g4bb982dacdwsfdddnwc0inx9gs3qq1zni",
-            "rev": "343449920866238db343d61343bc845cc8bc5e1b"
-        },
-        "recipe": {
-            "sha256": "0dmdhh12h4xrx6mc0qrwavngk2sx0l4pfqkjjyavabsgcs9wlgp1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "highlight-indentation": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "antonj",
-            "repo": "Highlight-Indentation-for-Emacs",
-            "sha256": "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k",
-            "rev": "cd6d8168ccb04c6c0394f42e9512c58f23c01689"
-        },
-        "recipe": {
-            "sha256": "0iblrrbssjwfn71n8xxjcl98pjv1qw1igf3hlz6mh8740fsca3d6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7.0",
-        "deps": []
-    },
-    "monroe": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sanel",
-            "repo": "monroe",
-            "sha256": "1a0pv8fkv1cjdb0k5bmjd67a273bzcmxjwzgy4jpb3ng1qbb2xnm",
-            "rev": "2f8aed286de47f5c4f65b352b6e4f72b47cac279"
-        },
-        "recipe": {
-            "sha256": "04rhninxppvilk7s90g0wwa0g9vfcg7mk8mrb2m2c7cb9vj6wyig",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": []
-    },
-    "names": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "names",
-            "sha256": "05jvd272x92s6wk17l0hymdj8b4979maalkmk54dp7n4nrcmzx2f",
-            "rev": "a6865f901dd94f92ae23af8aef3f6ae863901855"
-        },
-        "recipe": {
-            "sha256": "1q784606jlakw1z6sx2g2x8hz8c8arywrm2r626wj0v105v510vg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150723.0",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "log4j-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsorphanage",
-            "repo": "log4j-mode",
-            "sha256": "14dmmjdmcc0zag8i947n59ihjc2df2l44f7issf66767ym3839kk",
-            "rev": "ec3de92cfe60dd3d0de613e9062476196dea0faf"
-        },
-        "recipe": {
-            "sha256": "0axr0x8mdxif0xbvs83mxc3gqgs84jb4b9la9n62i3lldckghwmg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3",
-        "deps": []
-    },
-    "gnus-x-gm-raw": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "gnus-x-gm-raw",
-            "sha256": "1i3f67x2l9l5c5agspbkxr2mmh3rpq3009d8yzh6r1lih0b4hril",
-            "rev": "978bdfcecc8844465b71641c2e909fcdc66b22be"
-        },
-        "recipe": {
-            "sha256": "1a5iccghzqmcndql2bppvr48535sf6jbvc83iypr1031z1b5k4wg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.1",
-        "deps": [
-            "log4e",
-            "yaxception"
-        ]
-    },
-    "docker": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Silex",
-            "repo": "docker.el",
-            "sha256": "06vb6r1k9ml799h44fm9jhf3amldzhawxnm0lnr501hrmj4bz36x",
-            "rev": "77f646cc10909403a945d188cf9d81abd3bfc2a0"
-        },
-        "recipe": {
-            "sha256": "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": [
-            "dash",
-            "emacs",
-            "magit-popup",
-            "s"
-        ]
-    },
-    "auto-package-update": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rranelli",
-            "repo": "auto-package-update.el",
-            "sha256": "05llpa6g4nb4qswmcn7j3bs7hnmkrkax7hsk7wvklr0wrljyg9a2",
-            "rev": "cdef79f9fc6f8347fdd05664978fb9a948ea0410"
-        },
-        "recipe": {
-            "sha256": "0fdcniq5mrwbc7yvma4088r0frdfvc2ydfil0s003faz0nrjcp8k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.6.1",
-        "deps": [
-            "dash",
-            "emacs"
-        ]
-    },
-    "map-progress": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "map-progress",
-            "sha256": "1fkijm0gikbwmxa9hf7s1rcwb0ipzjygd1mlicsm78rxvdd8k877",
-            "rev": "6b8ef6b60626772082b2e80ec54d1f1275e1a1b8"
-        },
-        "recipe": {
-            "sha256": "0zc5vii72gbfwbb35w8m30c8r9zck971hwgcn1a4wjczgn4vkln7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.0",
-        "deps": []
-    },
-    "omni-log": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "AdrieanKhisbe",
-            "repo": "omni-log.el",
-            "sha256": "030f983n19n64f8irif102nncvam04xpx020vfgja9886wlj40pk",
-            "rev": "7eb30e42cc89064abb7acbec63cb9644c2ad7c9b"
-        },
-        "recipe": {
-            "sha256": "0c29243zq8r89ax4rxlmb8imag12icnldcb0q0xsnhjccw8lyw1r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.2",
-        "deps": [
-            "dash",
-            "emacs",
-            "ht",
-            "s"
-        ]
-    },
-    "zombie-trellys-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "david-christiansen",
-            "repo": "zombie-trellys-mode",
-            "sha256": "1ksjd3askc3k1l0b3nia5mzkxa74bidh2x0xlrj4qs4im5445vnz",
-            "rev": "9e99d444a387dd1634cab62ef802683f5bf5d907"
-        },
-        "recipe": {
-            "sha256": "19xzvppw7f35s82hm0y7sga8dyjjyy0dxy6vji4hxdpjziz7lggv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.1",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "haskell-mode"
-        ]
-    },
-    "karma": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tonini",
-            "repo": "karma.el",
-            "sha256": "0avcg307r4navvgj3hjkggk4gr7mzs4mljhxh223r8g69l9bm6m8",
-            "rev": "f4ee856e7f59649e9d9021c46f872f9b4f5b7e6e"
-        },
-        "recipe": {
-            "sha256": "19wl7js7wmw7jv2q3l4r5zl718lhy2a0jhl79k57ihwhxdc58fwc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": []
-    },
-    "imenu-anywhere": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vitoshka",
-            "repo": "imenu-anywhere",
-            "sha256": "0qc96p5f7paxaxzv73w072cba8jb6ibdbhml7n7cm85b0rz1wf16",
-            "rev": "a090132492a3a98b6547240babe0bc0fa6154bb2"
-        },
-        "recipe": {
-            "sha256": "0p93g7ay9n4nhf1qk24mbax0w9sr06xd2kjmrz00gbg75sr9r2s8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.0",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "js3-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thomblake",
-            "repo": "js3-mode",
-            "sha256": "17d0nf1kz7mgv5qz57q6khy4w5vrmsliqirggahk9s6nnsx1j56n",
-            "rev": "5ccda46ba39998a74bd724fdffb34634be5b6563"
-        },
-        "recipe": {
-            "sha256": "12s5qf6zfcv4m5kqxvh9b4zgwf433x39a210d957gjjp5mywbb1r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.0",
-        "deps": []
-    },
-    "aproject": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vietor",
-            "repo": "aproject",
-            "sha256": "1wyz8jvdy4m0cn75mm3zvxagm2gl10q51479f91gnqv14b4rndfc",
-            "rev": "3c7d23c341862dfd77fd0a64775df12ddb44ab54"
-        },
-        "recipe": {
-            "sha256": "0v3gx2mff2s7knm69y253pm1yr4svy8w00pqbn1chrvymb62jhp2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": []
-    },
-    "ahk-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ralesi",
-            "repo": "ahk-mode",
-            "sha256": "1qqrf9ncc3blkv4p2bhh9q6y41pp9p4wr667mm80vb5j8rkpsaa8",
-            "rev": "7b47b40952708ea4e9a0f1969f00caa92700513a"
-        },
-        "recipe": {
-            "sha256": "066l4hsb49wbyv381qgn9k4hn8gxlzi20h3qaim9grngjj5ljbni",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.5.5",
-        "deps": []
-    },
-    "requirejs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joeheyming",
-            "repo": "requirejs-emacs",
-            "sha256": "1b832r7779rmr6rhzj7klc0l5xzwc4rids87g2hczpb5dhqnchca",
-            "rev": "7d73453653b6b97cca59fcde8d529b5a228fbc01"
-        },
-        "recipe": {
-            "sha256": "09z6r9wcag3gj075wq215zcslyknl1izap595rn48xvizxi06c6k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": [
-            "cl-lib",
-            "js2-mode",
-            "popup",
-            "s"
-        ]
-    },
-    "pastehub": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiyoka",
-            "repo": "pastehub",
-            "sha256": "0m6qjsq6qfwwszm95lj8c58l75vbmx9r5hm9bfywyympfgy0fa1n",
-            "rev": "37b045c67659c078f1517d0fbd5282dab58dca23"
-        },
-        "recipe": {
-            "sha256": "1slvqn5ay6gkbi0ai1gy1wmc02h4g3n6srrh4fqn72y7b9nv5i0v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.2",
-        "deps": []
-    },
-    "langtool": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-langtool",
-            "sha256": "16wmc89jnn7qqcqw6702c9ccmwpb8pkxasa17ikmmmnggmg50lfh",
-            "rev": "443b3804f9e33e6d96ee8e15ddede7f152ece378"
-        },
-        "recipe": {
-            "sha256": "1xq70jyhzg0qmvialy015crbdk9rdibhwpl36khab9hi2999wxyw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.5.0",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "uzumaki": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "geyslan",
-            "repo": "uzumaki",
-            "sha256": "0z53n9qsglp87f6q1pa3sixrjni9k46j31zg15gcwrmflmfrw8ds",
-            "rev": "a75956e1757f4b98aad3384a4616481aede70cb1"
-        },
-        "recipe": {
-            "sha256": "1fvhzz2qpyc819rjvzyf42jmb70hlg7a9ybqwi81w7rydpabg61q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "fvwm-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "theBlackDragon",
-            "repo": "fvwm-mode",
-            "sha256": "0c3g0yfclczdh6nxmg9lljjf288zibqy51bhh1b1cgdmxcbpg8bv",
-            "rev": "d48a309bb7db21f5404b6619c6ee861fe0457704"
-        },
-        "recipe": {
-            "sha256": "07y32cnp4qfhncp7s24gmlxljdrj5miicinfaf4gc7hihb4bkrkb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.6.4",
-        "deps": []
-    },
-    "factlog": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tkf",
-            "repo": "factlog",
-            "sha256": "01l8dlfpyy97b17djbza46rq11xlbkhd5kn2r26r2xac8klj4pka",
-            "rev": "c834fdab81ec5b1bdc0ee2721a12cecb48a319bf"
-        },
-        "recipe": {
-            "sha256": "163482vfpa52b5ya5xps4qnclbaql1x0q54gqdwwmm04as8qbfz7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.1",
-        "deps": []
-    },
-    "kaesar-file": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-kaesar",
-            "sha256": "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8",
-            "rev": "4fa74851cd928f30e9f2ee1aa27ee6074ad253ea"
-        },
-        "recipe": {
-            "sha256": "0dcizg82maad98mbqqw5lamwz7n2lpai09jsrc66x3wy8k784alc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.0",
-        "deps": [
-            "kaesar"
-        ]
-    },
-    "boon": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jyp",
-            "repo": "boon",
-            "sha256": "1apxgj14hgfpz6hjp3384yjf2zrkv4pcncf2zklijs668igvaskq",
-            "rev": "82458a944e9cf3e4c959e63ebad09312aafe6d2c"
-        },
-        "recipe": {
-            "sha256": "0gryw7x97jd46jgrm93cjagj4p7w93cjc36i2ps9ajf0d8m4gajb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "emacs",
-            "expand-region",
-            "multiple-cursors"
-        ]
-    },
-    "inflections": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "eschulte",
-            "repo": "jump.el",
-            "sha256": "1fm69g4mrmdchvxr062bk7n1jvs2rrscddb02cldb5bgdrcw8g6j",
-            "rev": "fb7355615276f00397b15182076bf472336448a9"
-        },
-        "recipe": {
-            "sha256": "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.3",
-        "deps": []
-    },
-    "color-theme-sanityinc-solarized": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "color-theme-sanityinc-solarized",
-            "sha256": "13jmg05skv409z8pg5m9rzkajj9knyln0ff8a3i1pbpyrnpngmmc",
-            "rev": "554e941131d009c0a5d7129ed96796182b4cc590"
-        },
-        "recipe": {
-            "sha256": "0xg79hgb893f1nqx6q4q6hp4w6rvgp1aah1v2r3scg2jk057qxkf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.29",
-        "deps": []
-    },
-    "ido-yes-or-no": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DarwinAwardWinner",
-            "repo": "ido-yes-or-no",
-            "sha256": "0i3s80ws3qbhb3vsvf09mbq661c5140v4phgbl4cz6z545ha2bj7",
-            "rev": "ff9d28ca86c8cbfe2fbeb3ee1a60e3983aa776e4"
-        },
-        "recipe": {
-            "sha256": "0glag4yb9xyf1lxxbdhph2nq6s1vg44i6f2z1ii8bkxpambz2ana",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2",
-        "deps": []
-    },
-    "mode-line-debug": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "mode-line-debug",
-            "sha256": "1lkw9nnlns6v7r6nx915f85whq1ri4w8lccwyxrvam40hfvq60s1",
-            "rev": "da44422eeb6a1f055b4ec2f822962c5162fce001"
-        },
-        "recipe": {
-            "sha256": "0ppj14bm3rx3xgg4mfxa5zcm2r129jgmsx817wq3h7akjngcbfkd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2.2",
-        "deps": []
-    },
-    "helm-mode-manager": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "istib",
-            "repo": "helm-mode-manager",
-            "sha256": "1srx5f0s9x7zan7ayqd6scxfhcvr3nkd4yzs96hphd87rb18apzk",
-            "rev": "1fc1d65a27bc57d3a5bbd359f3eb77a6353fa4a5"
-        },
-        "recipe": {
-            "sha256": "1w9svq1kyyj8mmljardhbdvykb334nq1y18s956g4rvqyas2ciyd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": [
-            "helm"
-        ]
-    },
-    "helm-aws": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "istib",
-            "repo": "helm-aws",
-            "sha256": "015p5sszd54x81qm96gx6xwjkvbi4f3j9i2nhcvlkk75s95w1ijv",
-            "rev": "172a4a3427d31c999e27e9ee06aa8e3822364a8c"
-        },
-        "recipe": {
-            "sha256": "0sjgdjpznjxsf6nlv2ah45fw17j8j5apdphd1fp43rjv1lskkgc5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": [
-            "helm"
-        ]
-    },
-    "pcache": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sigma",
-            "repo": "pcache",
-            "sha256": "0xbbq8ddlirhvv921nrf7bwazh0i98bk0a9xzyx8iqpyg66vbfa8",
-            "rev": "4b090f46182fd2ed1f44905dc04acc3121bcf622"
-        },
-        "recipe": {
-            "sha256": "1q2wlbc58lyf3dxfs9ppdxvdsp81jmkq874zbd7f39wvc5ckbz0l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.2",
-        "deps": [
-            "eieio"
-        ]
-    },
-    "reverse-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-reverse-theme",
-            "sha256": "15xnz4fi22wsximimwmirlz11v4ksfj8nilyjfw6acd92yrhzg6h",
-            "rev": "3105c950bcb51c662c79b59ca102ef662c2b0be0"
-        },
-        "recipe": {
-            "sha256": "1lq8nwhf8n5i280v0kqksndm4b3n6x34wnd5fa5i48ljwr5cinih",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": []
-    },
-    "perspective": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nex3",
-            "repo": "perspective-el",
-            "sha256": "12c2rrhysrcl2arc6hpzv6lxbb1r3bzlvdp23hnp9sci6yc10k3q",
-            "rev": "3a8d59045a6370fae1ec2011865190a7465d707f"
-        },
-        "recipe": {
-            "sha256": "150dxcsd0ylvfi9mmfpcki1wd3nl8q9mbszd3dgqfnm40yncklml",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.12",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "offlineimap": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jd",
-            "repo": "offlineimap.el",
-            "sha256": "0az4llfgva4wvpljyc5s2m7ggfnj06ssp32x8bncr5fzksha3r7b",
-            "rev": "646482203aacdf847d57d0a96263fddcfc33fb61"
-        },
-        "recipe": {
-            "sha256": "0nza7lrz7cn06njcblwh9hy3050j8ja4awbxx7jzv6nazjg7201b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1",
-        "deps": []
-    },
-    "es-lib": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sabof",
-            "repo": "es-lib",
-            "sha256": "0jq4yp80wiphlpsc0429rg8n50g8l4lf78q0l3nywz2p93smjy9b",
-            "rev": "753b27363e39c10edc9e4e452bdbbbe4d190df4a"
-        },
-        "recipe": {
-            "sha256": "0mwvgf5385qsp91zsdw75ipif1h90xy277xdmrpwixsxd7abbn0n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "pt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bling",
-            "repo": "pt.el",
-            "sha256": "1p0k770h96iw8bxm8ssi0a91m050s615q036870lrlsz35mzc5kw",
-            "rev": "a539dc11ecb2d69760ff50f76c96f49895ce1e1e"
-        },
-        "recipe": {
-            "sha256": "0zmz1hcr4ajc2ydvpdxhy1dlhp7hvlkv6y6w1b79ffvq6acdd5mj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.3",
-        "deps": []
-    },
-    "gitignore-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "git-modes",
-            "sha256": "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd",
-            "rev": "9d8f6eda6ee97963e4085da8988cad2c0547b8df"
-        },
-        "recipe": {
-            "sha256": "1i98ribmnxr4hwphd95f9hcfm5wfwgdbcxw3g0w17ws7z0ir61mn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2.0",
-        "deps": []
-    },
-    "fold-dwim-org": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "fold-dwim-org",
-            "sha256": "14jvbkahwvv4wb0s9vp8gqmlpv1d4269j5rsjxn79q5pawjzslxw",
-            "rev": "c09bb2b46d65afbd1d0febc6fded7495be7a3037"
-        },
-        "recipe": {
-            "sha256": "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6",
-        "deps": [
-            "fold-dwim"
-        ]
-    },
-    "ac-mozc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "igjit",
-            "repo": "ac-mozc",
-            "sha256": "19cb8kq8gmrplkxil22ahvbyq5cng1l2vh2lrfiyqpjsap7zfjz5",
-            "rev": "4c6c8be4701010d9362184437c0f783e0335c631"
-        },
-        "recipe": {
-            "sha256": "1v3iiid8cq50i076q98ycks9m827xzncgxqwqs2rqhab0ncy3h0f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.4",
-        "deps": [
-            "auto-complete",
-            "cl-lib",
-            "mozc"
-        ]
-    },
-    "logalimacs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "logaling",
-            "repo": "logalimacs",
-            "sha256": "0g5vq9xy9lwczs77lr91c1srhhfmasnnnmjvgc55hbl6iwmbizbm",
-            "rev": "cfd7aaa925934f876eee6e8c550cf6e7a239a2ac"
-        },
-        "recipe": {
-            "sha256": "0ai7a01bdi3a0amgi63pwgdp8wgcgx10an4nhc627wgb1cqxb7p6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": []
-    },
-    "company-nixos-options": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "travisbhartwell",
-            "repo": "nix-emacs",
-            "sha256": "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld",
-            "rev": "5fc8fa29bea9dd8e9c822af92f9bc6ddc223635f"
-        },
-        "recipe": {
-            "sha256": "1yrqqdadmf7qfxpqp8wwb325zjnwwjmn2hhnl7i3j0ckg6hqyqf0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.1",
-        "deps": [
-            "cl-lib",
-            "company",
-            "nixos-options"
-        ]
-    },
-    "flymake-json": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-json",
-            "sha256": "0rzlw80mi39147yqnpzcvw9wvr5svksd3kn6s3w8191f2kc6xzzv",
-            "rev": "ad8e482db1ad29e23bdd9d089b9bc3615649ce65"
-        },
-        "recipe": {
-            "sha256": "1p5kajiycpqy2id664bs0fb1mbf73a43qqfdi4c57n6j9x7fxp4d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "sass-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nex3",
-            "repo": "sass-mode",
-            "sha256": "0lxrq3mzabkwj5bv0mgd7fnx3dsx8vxd5kjgb79rjfra0m7pfgln",
-            "rev": "26a66e331b507fb420e3bb7d0a6a8fbb04294343"
-        },
-        "recipe": {
-            "sha256": "1byjk5zpzjlyiwkp780c4kh7s9l56y686sxji89wc59d19rp8800",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "3.0.18",
-        "deps": [
-            "haml-mode"
-        ]
-    },
-    "string-edit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "string-edit.el",
-            "sha256": "15gdcpbba3h84s7xnpk69nav6bixdixnirdh5n1rly010q0m5s5x",
-            "rev": "9f9c9cd659156fd2217be814eb4e91da48d44647"
-        },
-        "recipe": {
-            "sha256": "1l1hqsfyi6pp4x4g1rk4s7x9zjc03wfmhy16izia8nkjhzz88fi8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "dash"
-        ]
-    },
-    "flymake-haskell-multi": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-haskell-multi",
-            "sha256": "0k1qc0r0gr7f9l5if2a67cv4k73z5yxd6vxd6l1bqw500y0aajxz",
-            "rev": "d2c9aeffd33440d360c1ea0c5aef6d1f171599f9"
-        },
-        "recipe": {
-            "sha256": "0cyzmmghwkkv6020s6n436lwymi6dr49i7gkci5n0hw5pdywcaij",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "git-timemachine": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pidu",
-            "repo": "git-timemachine",
-            "sha256": "1wkjh7pwrkdnihyknr76anyj41i6sv3qhq61kmw83clyh64yp6as",
-            "rev": "bde589fbeb3b5326e89573cbb9a6fd08d832d073"
-        },
-        "recipe": {
-            "sha256": "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.7",
-        "deps": []
-    },
-    "evil-search-highlight-persist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "juanjux",
-            "repo": "evil-search-highlight-persist",
-            "sha256": "1jfi2k9dm0cc9bx8klppm965ydhdw17a2n664199vhxrap6g27yk",
-            "rev": "0e2b3d4e3dec5f38ae95f62519eb2736f73c0b85"
-        },
-        "recipe": {
-            "sha256": "0iia136js364iygi1mydyzwvizhic6w5z9pbwmhva4654pq8dzqy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.8",
-        "deps": [
-            "highlight"
-        ]
-    },
-    "edn": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "expez",
-            "repo": "edn.el",
-            "sha256": "06v34l9dkykrrdfpnm3zi5wjm0fdvy76pbkfnk92wqkjp8fqimhd",
-            "rev": "bb035dcbeccccdb2c899d2cce8e81486764d0ad7"
-        },
-        "recipe": {
-            "sha256": "00cy8axhy2p3zalzl8k2083l5a7s3aswb9qfk9wsmf678m8pqwqg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.2",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "emacs",
-            "peg",
-            "s"
-        ]
-    },
-    "org-table-comment": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "org-table-comment.el",
-            "sha256": "1qx3kd02sxs9k7adlvdlbmyhkc5kr7ni5lw4gxjw3nphnc536bkb",
-            "rev": "33b9966c33ecbc3e27cca67c2f2cdea04364d74e"
-        },
-        "recipe": {
-            "sha256": "1d40vl8aa1x27z4gwnkzxgrqp7vd3ln2pc445ijjxp1wr8bjxvdz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": []
-    },
-    "hl-sexp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsmirror",
-            "repo": "hl-sexp",
-            "sha256": "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw",
-            "rev": "0606100422321c18db51ceda80f25cd7717c2e01"
-        },
-        "recipe": {
-            "sha256": "0kg0m20i9ylphf4w0qcvii8yp65abdl2q5flyphilk0jahwbj9jy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": []
-    },
-    "avy-migemo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "momomo5717",
-            "repo": "avy-migemo",
-            "sha256": "098bkqb2cndjx93jacj6p54xfy14m1iknvpv1y5rffy9p4l2cbd3",
-            "rev": "f2498ed4a476a554c84716f5a8131f9b78a45185"
-        },
-        "recipe": {
-            "sha256": "1zvgkhma445gj1zjl8j25prw95bdpjbvfy8yr0r5liay6g2hf296",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.11",
-        "deps": [
-            "avy",
-            "emacs",
-            "migemo"
-        ]
-    },
-    "osx-browse": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "osx-browse",
-            "sha256": "0g1xhh88a65vcq6rlh7ii16pra4pv519ajcws0h93ldbbjiy7p0m",
-            "rev": "6186a6020e143e90d557c8d062c44fcdba0516c7"
-        },
-        "recipe": {
-            "sha256": "06rfzq2hxhzg6jh2zs28r7ffxwlq40nz954j13ly8403c7rmbrfm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8.8",
-        "deps": [
-            "browse-url-dwim",
-            "string-utils"
-        ]
-    },
-    "helm-orgcard": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-jp",
-            "repo": "helm-orgcard",
-            "sha256": "1zyjxrrda7nxxjqczv2p3sfimxy2pq734kf51j6v2y0biclc4bk3",
-            "rev": "9655ac340d1ccc5f3d1c0f7c49be8dd3556d4d0d"
-        },
-        "recipe": {
-            "sha256": "1a56y8fny7qxxidc357n7l3yi7h66hidhvwhkam8y5wk6k61460p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "helm-core"
-        ]
-    },
-    "phpcbf": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nishimaki10",
-            "repo": "emacs-phpcbf",
-            "sha256": "09rinyx0621d7613xmbyvrrlav6d4ia332wkgg0m9dn265g3h56z",
-            "rev": "b556b548ceb061b002389d6165d2cc63d8bddb5d"
-        },
-        "recipe": {
-            "sha256": "1hf88ys4grffpqgavrbc72dn3m7crafgid2ygzx9c5j55syh8mfv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.2",
-        "deps": [
-            "s"
-        ]
-    },
-    "dispass": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ryuslash",
-            "repo": "dispass.el",
-            "sha256": "1b1a1bwc6nv6wkd8jg1cqmjb9m9pxi5i2wbrz97fgii23dwfmlnl",
-            "rev": "38b880e72cfe5e65179b16791903b0900c73eff4"
-        },
-        "recipe": {
-            "sha256": "08c1s4zgl4rha10mva48cfkxzrqnpdhy03pxq51ihw94v6vxzg3z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.2",
-        "deps": []
-    },
-    "ac-inf-ruby": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "ac-inf-ruby",
-            "sha256": "1acm13n59sdgvvzicscxzrr5j1x5sa5x4rc4cnkbwb28nw5a5ysm",
-            "rev": "3e22b66d3d3e2712a0fe783b5cdd0583a0d4c318"
-        },
-        "recipe": {
-            "sha256": "04jclf0yxz78x1fsaf5sh1p466947nqrcx337kyhqn0nkj3hplqr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": [
-            "auto-complete",
-            "inf-ruby"
-        ]
-    },
-    "cider-eval-sexp-fu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "clojure-emacs",
-            "repo": "cider-eval-sexp-fu",
-            "sha256": "1rkd76561h93si4lpisz3qnaj48dx8x01nd59a3lgpqsbbibnccf",
-            "rev": "dbe6a19c835ea42b099dd17f040db0baf9774aaf"
-        },
-        "recipe": {
-            "sha256": "1n4sgv042qd9560pllabysx0c5snly6i22bk126y8f8rn0zj58iq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": [
-            "emacs",
-            "eval-sexp-fu",
-            "highlight"
-        ]
-    },
-    "wn-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "luismbo",
-            "repo": "wn-mode",
-            "sha256": "0nmzh6dynbm8vglp4pqz81s2z68jbnasvamvi1x1iawf8g9zfyix",
-            "rev": "6e7029b0d5773a79914a289937be068784931cad"
-        },
-        "recipe": {
-            "sha256": "1qy1pkfdnm4pska4cnff9cx2c812ilymajhpmsfc9jdbvhzwrwg3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.4",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "goto-last-change": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "camdez",
-            "repo": "goto-last-change.el",
-            "sha256": "1f0zlvva7d7iza1v79yjp0bm7vd011q4cy14g1saryll32z115z5",
-            "rev": "58b0928bc255b47aad318cd183a5dce8f62199cc"
-        },
-        "recipe": {
-            "sha256": "1yl9p95ls04bkmf4d6az72pycp27bv7q7wxxzvj8sj97bgwvwajx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2.1",
-        "deps": []
-    },
-    "flymake-css": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-css",
-            "sha256": "054ws88fcfz3hf3cha7dvndm52v5n4jc4vzif1lif44xq0iggwqa",
-            "rev": "3e56d47d3c53e39741aa4f702bb9fb827cce22ed"
-        },
-        "recipe": {
-            "sha256": "0kqm3wn9symqc9ivnh11gqgq8ql2bhpqvxfm86d8vwm082hd92c5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "auto-yasnippet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "auto-yasnippet",
-            "sha256": "0n3r7j83csby2s7284hy5pycynazyrkljxkn6xqn08gvxbbbdpdq",
-            "rev": "5cc54edbe03c0061bf69883a3e39d3bb16019e0f"
-        },
-        "recipe": {
-            "sha256": "02281gyy07cy72a29fjsixg9byqq3izb9m1jxv98ni8pcy3bpsqa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.0",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "emacsql-sqlite": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "emacsql",
-            "sha256": "0ph0462shk00rhrkpvwgsr4biykimky2d89pvkbg377951jdga7i",
-            "rev": "03d478870834a683f433e7f0e288476748eec624"
-        },
-        "recipe": {
-            "sha256": "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.0.0",
-        "deps": []
-    },
-    "haskell-snippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "haskell",
-            "repo": "haskell-snippets",
-            "sha256": "0b3d7rvqvvcsp51aqfhl0zg9zg8j0p6vlfvga6jp9xc7626vh6f6",
-            "rev": "bcf12cf33a67ddc2f023a55072859e637fe4fa25"
-        },
-        "recipe": {
-            "sha256": "10bvv7q694fahcpm83v8lpqihg1gvfzrp1hdzwiffxydfvdbalh2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "typed-clojure-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "typedclojure",
-            "repo": "typed-clojure-mode",
-            "sha256": "1risfbsaafh760vnl4ryys91g4k78g0fxj2zlcndpxxv34gwkhy7",
-            "rev": "00bc20db78901204a67722ab47482660e36d0463"
-        },
-        "recipe": {
-            "sha256": "1579zkhk2lwl5ij7dm9n2drggs5fmhpljrshc4ghhvig7nlyqjy3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": [
-            "cider",
-            "clojure-mode"
-        ]
-    },
-    "vim-region": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ongaeshi",
-            "repo": "emacs-vim-region",
-            "sha256": "1750gx65ymibam8ahx5blfv5jc26f3mzbklk1jrmfwpsalyghdd9",
-            "rev": "e5359cc584a0cfa9270a76866a5eff7d3f44eb3d"
-        },
-        "recipe": {
-            "sha256": "1dcnx799lpjsdnnjxqzgskkfj2nx7f4kwf0xjhbg35ny4nyn81dx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.0",
-        "deps": [
-            "expand-region"
-        ]
-    },
-    "tumble": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "febuiles",
-            "repo": "tumble",
-            "sha256": "0ihjjw5wxz5ybl3600k937pszw3442cijs4gbqqip9vhd5y9m8gy",
-            "rev": "a1db6dac5720b9f468a79e0efce04f77c0a458e3"
-        },
-        "recipe": {
-            "sha256": "1c9ybq0mb2a0pw15fmm13vfwcnr2h9fb1xsm5nrff1cg7913pgv9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.5",
-        "deps": []
-    },
-    "aurel": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alezost",
-            "repo": "aurel",
-            "sha256": "01ig5v5f2xya7hyq678nd8j8x972yfbni813c0imxkkba996a2k7",
-            "rev": "3458214e0d2942b03c2926de67ca06cbe42b37d0"
-        },
-        "recipe": {
-            "sha256": "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7",
-        "deps": []
-    },
-    "anaconda-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "proofit404",
-            "repo": "anaconda-mode",
-            "sha256": "0sj6cr2bghy80dnwgl7rg61abdlvgfzi0jjc7jrxz7fdzwkcq714",
-            "rev": "2ad7c1ee5b786d900154982270e4c68a4fe5b404"
-        },
-        "recipe": {
-            "sha256": "0gz16aam4zrm3s9ms13h4qcdflf55506kgkpyncq3bi54cvv8n1r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "dash",
-            "emacs",
-            "f",
-            "pythonic",
-            "s"
-        ]
-    },
-    "js2-closure": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jart",
-            "repo": "js2-closure",
-            "sha256": "0d2hqlgm09rw0azha5dxmq63b56sa8b9qj7gd7invibl6nnyjh4a",
-            "rev": "e1b3e7db13285e63c3c428d87c018289352bd043"
-        },
-        "recipe": {
-            "sha256": "19732bf98lk2ah2ssgkr1ngxx7rz3nhsiw84lsfmydb0vvm4fpk7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.4",
-        "deps": [
-            "js2-mode"
-        ]
-    },
-    "drag-stuff": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "drag-stuff",
-            "sha256": "0wncdlc45flggn6sq5a95y7k6q11hy7zxp0ddhsjqccl30mdwax5",
-            "rev": "3265e4fe93323bc9089d12db3d466d49bc44a99d"
-        },
-        "recipe": {
-            "sha256": "0hzbh58ijv1akamav8r0zs76pwda2zd9mjaj31ffalzhhsm5jnyc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": []
-    },
-    "clocker": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "roman",
-            "repo": "clocker.el",
-            "sha256": "1s05644m048clz0lxizzgarh1bkyjxr96b0mbpxi2p003322aw09",
-            "rev": "6faf5a23dc9cbe506f21a11fae4f6c4bbb1d4b01"
-        },
-        "recipe": {
-            "sha256": "0cckrk40k1labiqjh7ghzpx5zi136xz70j3ipp117x52qf24k10k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.10",
-        "deps": [
-            "dash",
-            "projectile"
-        ]
-    },
-    "instapaper": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/jfm/emacs-instapaper",
-            "sha256": "0krscid3yz2b7kv75gd9fs92zgfl7pnl77dbp5gycv5rmw5mivp8",
-            "rev": "8daa0058ede7"
-        },
-        "recipe": {
-            "sha256": "1yibdpj3lx6vr33s75s1y415lxqljrk7pqc901f8nfa01kca7axn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.5",
-        "deps": []
-    },
-    "tracking": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jorgenschaefer",
-            "repo": "circe",
-            "sha256": "0q3rv6lk37yybkbswmn4pgzca0nfhvf4h3ac395fr16k5ixybc5q",
-            "rev": "ac1cddf946e0af90ab453dd816f7173e0d4000e5"
-        },
-        "recipe": {
-            "sha256": "096h5bl7jcwz5hpbm2139bf8a784hijfy40vzf42y1c9794al46z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.1",
-        "deps": []
-    },
-    "whitaker": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "whitaker",
-            "sha256": "01fwhrfi92pcrwc4yn03pflc9wj07mhzj0a0i5amar4f9bj6m5b4",
-            "rev": "28172edce0f727f0f7f17d8ba71d5510d877bb45"
-        },
-        "recipe": {
-            "sha256": "17fnvb3jh6fi4wddn5qnp6i6ndidg8jf9ac69q9j032c2msr07nj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "dash"
-        ]
-    },
-    "company": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "company-mode",
-            "repo": "company-mode",
-            "sha256": "08rrjfp2amgya1hswjz3vd5ja6lg2nfmm7454p0h1naz00hlmmw0",
-            "rev": "e085a333867959a1b36015a3ad8e12e5bd6550d9"
-        },
-        "recipe": {
-            "sha256": "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8.12",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "macro-math": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nschum",
-            "repo": "macro-math.el",
-            "sha256": "0dgsl1x6r8m9vvff1ia0kmz21h0dji2jl5cqlpx1m947zh45dahj",
-            "rev": "105e03c80290d1b88984b2d265a149a13d722920"
-        },
-        "recipe": {
-            "sha256": "1r7splwq5kdrdhbmw5zn81vxymsrllgil48g8dl0r60293384h00",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "elscreen-mew": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "masutaka",
-            "repo": "elscreen-mew",
-            "sha256": "091dxsb73bhqmrddwnmvblmfpwa7v7fa0ha18daxc8j0lrhzdhlh",
-            "rev": "f66a2a5a8dd904791ede5133fdd183522b061bba"
-        },
-        "recipe": {
-            "sha256": "06g4wcfjs036nn64ac0zsvr08cfmak2hyj83y7a0r35yxr1853w4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.1",
-        "deps": [
-            "elscreen"
-        ]
-    },
-    "helm-backup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "antham",
-            "repo": "helm-backup",
-            "sha256": "0d6h4gbb69abxxgm85pdi5rsaf9h72yryg72ykd5633i1g4s8a76",
-            "rev": "184026b9fe454aab8e7730106b4ca494fe307769"
-        },
-        "recipe": {
-            "sha256": "182jbm36yzayxi9y3vhpyn25ivrgay37sncqvah35vbw52lnjcn3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.1",
-        "deps": [
-            "cl-lib",
-            "helm",
-            "s"
-        ]
-    },
-    "rinari": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "eschulte",
-            "repo": "rinari",
-            "sha256": "1wqhqv2fc5h10igv1php51bayx0s7qw4m9gzx9by80dab8lwa0vk",
-            "rev": "e2ed2fa55ac3435a86b1cf6a4f2d29aebc309135"
-        },
-        "recipe": {
-            "sha256": "0qknicg3vzl7zbkwsdvp10hrvlng6mbi8hgslx4ir522dflrf9p0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.11",
-        "deps": [
-            "inf-ruby",
-            "jump",
-            "ruby-compilation",
-            "ruby-mode"
-        ]
-    },
-    "ucs-utils": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "ucs-utils",
-            "sha256": "0qw9vwl1p0pjw1xmshxar1a8kn6gmin5rdvvnnly8b5z9hpkjf3m",
-            "rev": "cbfd42f822bf5717934fa2d92060e6e24a813433"
-        },
-        "recipe": {
-            "sha256": "111fwg2cqqzpa79rcqxidppb12c8g12zszppph2ydfvkgkryb6z2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8.4",
-        "deps": [
-            "list-utils",
-            "pcache",
-            "persistent-soft"
-        ]
-    },
-    "string-utils": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "string-utils",
-            "sha256": "03azfs6z0jg66ppalijcxl973vdbhj4c3g84sm5dm8xv6rnxrv2s",
-            "rev": "3ae530143899f533a9ef5e1f26f28b577ebe72ee"
-        },
-        "recipe": {
-            "sha256": "1vsvxc06fd3wardldb83i5hjfibvmiqnxvcgdns7i5i8qlsrsx4v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.2",
-        "deps": [
-            "list-utils"
-        ]
-    },
-    "nose": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/durin42/nosemacs",
-            "sha256": "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm",
-            "rev": "194d7789bf79"
-        },
-        "recipe": {
-            "sha256": "0l77hsmn3qk934ppdav1gy9sq48g0v1dzc5qy0rp9vv4yz2jx2jk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": []
-    },
-    "egison-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "egisatoshi",
-            "repo": "egison3",
-            "sha256": "16m7h477z10bmaymmgpj2id6l98iyrsp5wf69wd56534kh6qcajg",
-            "rev": "6debb5f36074811a1b2f9c9741dc8c1f3bd869de"
-        },
-        "recipe": {
-            "sha256": "0x11fhv8kkx34h831k2q70y5qfz7wnfia4ka5mbmps7mpr68zcwi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "3.5.10",
-        "deps": []
-    },
-    "ido-occur": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "danil",
-            "repo": "ido-occur",
-            "sha256": "1xv8bryinn9qhjjxaxci4jnmz87jdm4nnhghl5lbpy7vzbhij490",
-            "rev": "13dc79ac2bb148b9fcbb470509a06ad1cb7008bb"
-        },
-        "recipe": {
-            "sha256": "058l2pklg12wkvyyshk8va6shphpbc508fv9a8x25pw857a28pji",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "dash",
-            "ido-vertical-mode"
-        ]
-    },
-    "outshine": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tj64",
-            "repo": "outshine",
-            "sha256": "1v04iyx57w8scw3iqrivii7q0sh8sa7xacswdhd18mw9kvjrbj98",
-            "rev": "cf1097692b3ea0367d3c821769399fec5831e200"
-        },
-        "recipe": {
-            "sha256": "1i8c3q6n9hpfbpg2f8n8brwgaq36af1jn3g5js88yiyyb5dknxq4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.0",
-        "deps": []
-    },
-    "ack-menu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chumpage",
-            "repo": "ack-menu",
-            "sha256": "0hib4a8385q2czi1yqs0hwnva2xi7kw0bdfnrgha1hrl30rilp2f",
-            "rev": "37e9979eb65e3803fc00829377397b4e6f2bd059"
-        },
-        "recipe": {
-            "sha256": "1d2kw04ndxji2qjcm1b65qnxpp08zx8gbia8bl6x6mnjb2isc2d9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.3",
-        "deps": []
-    },
-    "golden-ratio": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "roman",
-            "repo": "golden-ratio.el",
-            "sha256": "00igv83hiyx7x3pf2grmjpd379brn33fm85f05k104mkkrhg99nm",
-            "rev": "79b1743fc1a2f3462445e9ddd0a869f30065bb6d"
-        },
-        "recipe": {
-            "sha256": "15fkrv0sgpzmnw2h4fp2gb83d8s42khkfq1h76l241njjayk1f81",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "evil-mark-replace": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "redguardtoo",
-            "repo": "evil-mark-replace",
-            "sha256": "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv",
-            "rev": "56cf191724a3e82239ca47a17b071c20aedb0617"
-        },
-        "recipe": {
-            "sha256": "03cq43vlv1b53w4kw7mjvk026i8rzhhryfb27ddn6ipgc6xh68a0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.4",
-        "deps": [
-            "evil"
-        ]
-    },
-    "helm-ag": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-helm-ag",
-            "sha256": "11m1r4bcwk3w2g8wsgc1fbmkj5c30qfljwxhg1zw3hakvmycnpg6",
-            "rev": "47aca7f291eccd81f1b1a4a8f96b8d8caec5242e"
-        },
-        "recipe": {
-            "sha256": "023zvgmi5b5b2qga3jqd7jrq9ap8n3rhvl6jrv9fsi565sg1fv43",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.48",
-        "deps": [
-            "cl-lib",
-            "helm"
-        ]
-    },
-    "direx-grep": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "direx-grep",
-            "sha256": "0swdh0qynpijsv6a2d308i42hfa0jwqsnmf4sm8vrhaf3vv25f5h",
-            "rev": "1109a512a80b2673a70b18b8568514049017faad"
-        },
-        "recipe": {
-            "sha256": "0y2wrzq06prm55akwgaqjg56znknyvbayav13asirqzg258skvm2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "direx"
-        ]
-    },
-    "cmake-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Kitware",
-            "repo": "CMake",
-            "sha256": "054i416l7kwdnwlb55ya89zpnsyxg9h4b2ll3d4dhx2qpph7w9s2",
-            "rev": "fd7180f0c0c2554c31afda235469df986a109fe4"
-        },
-        "recipe": {
-            "sha256": "0zbn8syb5lw5xp1qcy3qcl75zfiyik30xvqyl38gdqddm9h7qmz7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "3.4.1",
-        "deps": []
-    },
-    "interleave": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rudolfochrist",
-            "repo": "interleave",
-            "sha256": "1bidhc4pgszx2gqsm125nw7i5ysy0mzc1ifcfkfgns1cpjr74rpn",
-            "rev": "d7bfe03dfdfbdd2abd0a96174cacd2ef1ecd2041"
-        },
-        "recipe": {
-            "sha256": "18b3fpxn07y5abkcnaw9is9ihdhik7xjdj6kzl1pz958lk9f4hfy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": []
-    },
-    "eyebrowse": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wasamasa",
-            "repo": "eyebrowse",
-            "sha256": "0jc5wv2hkc89yh5ypa324xlfqdna20msr63g30njxq4g2vd0iqa7",
-            "rev": "6d75409a81a6447765ad2171e3d0b5a272e1f207"
-        },
-        "recipe": {
-            "sha256": "09fkzm8z8nkr4s9fbmfcjc80h50051f48v6n14l76xicglr5p861",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.9",
-        "deps": [
-            "dash",
-            "emacs"
-        ]
-    },
-    "speech-tagger": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cosmicexplorer",
-            "repo": "speech-tagger",
-            "sha256": "1k6c7450v0ln6l9b8z1hib2s2b4rmjbskynvwwyilgdnvginfhi3",
-            "rev": "e6595bd0eea93ede1534c536c1746c9cf763b73c"
-        },
-        "recipe": {
-            "sha256": "0sqil949ny9qjxq7kpb4zmjd7770r0qvq4sz80agw6a27mqnaajc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.0",
-        "deps": []
-    },
-    "whole-line-or-region": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "whole-line-or-region",
-            "sha256": "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d",
-            "rev": "a60e022b30c2f4d3118bcaef1adb77b90e0ca941"
-        },
-        "recipe": {
-            "sha256": "1vs2i4cy1zc6nj660i9h36jbfgc3kvqivjnzlq5zwlxk5hcibqa1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3.1",
-        "deps": []
-    },
-    "git-link": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sshaw",
-            "repo": "git-link",
-            "sha256": "171w8vx1r2v9yclnlk3mwbfaxhg0kbvk575jvi6vr9shpjqnrb0z",
-            "rev": "8ed8f209fe40b3852613691bd968484d6da79e5b"
-        },
-        "recipe": {
-            "sha256": "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.0",
-        "deps": []
-    },
-    "evil-nerd-commenter": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "redguardtoo",
-            "repo": "evil-nerd-commenter",
-            "sha256": "1c8zh5vykl4v57jrxcpyrbd1ih6nv306sfmb6ihiak6ncvllp8cx",
-            "rev": "770981cffd7e8d967e6291c738534a04bcd7f753"
-        },
-        "recipe": {
-            "sha256": "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.2",
-        "deps": []
-    },
-    "aes": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Sauermann",
-            "repo": "emacs-aes",
-            "sha256": "1y9bw2vkl952pha2dsi18swyr94mihgwlcg5m8hg4d5bfg2fzcb2",
-            "rev": "d78796facc034b09f379cda5f27090f3139305ec"
-        },
-        "recipe": {
-            "sha256": "11vl9x3ldrv7q7rd29xk4xmlvfxs0m6iys84f6mlgf00190l5r5v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8",
-        "deps": []
-    },
-    "orgit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "orgit",
-            "sha256": "0d7rh5bi5v04njj1nh8q8kdr6aw68lcw4ghx6kwq97aff4qmcrp1",
-            "rev": "731c5cb4f1c7e2ee5b819ca159c0c01e2b306c73"
-        },
-        "recipe": {
-            "sha256": "0askccb3h98v8gmylwxaph3gbyv5b1sp4slws76aqz1kq9x0jy7w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": [
-            "dash",
-            "emacs",
-            "magit",
-            "org"
-        ]
-    },
-    "jump-to-line": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ongaeshi",
-            "repo": "jump-to-line",
-            "sha256": "1s9plmg323m1p625xqnks0yqz0zlsjacdj7pv8f783r0d9jmfq3s",
-            "rev": "01ef8c3529d85e6c59cc20840acbc4a8e8325bc8"
-        },
-        "recipe": {
-            "sha256": "09ifhsggl5mrb6l8nqnl38yph0v26v30y98ic8hl23i455hqkkdr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": []
-    },
-    "pkg-info": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lunaryorn",
-            "repo": "pkg-info.el",
-            "sha256": "0nk12dcppdyhav6m6yf7abpywyd7amxd4237zsfd32w4zxsx39k1",
-            "rev": "f9bb471ee95d1c5fe9adc6b0e98db2ddff3ddc0e"
-        },
-        "recipe": {
-            "sha256": "0whcvralk76mfmvbvwn57va5dkb1irj7iwffgddi7r0ima49iszx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6",
-        "deps": [
-            "epl"
-        ]
-    },
-    "evil-space": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "linktohack",
-            "repo": "evil-space",
-            "sha256": "1rchanv0vq9rx6x69608dlpdybvkn8a9ymx8wzm7gqpz9qh6xqrk",
-            "rev": "f77860fa00662e2def3e1885adac777f051e1e61"
-        },
-        "recipe": {
-            "sha256": "1asvh873r1xgffvz3nr653yn8h5ifaphnafp6wf1b1mja6as7f23",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.6",
-        "deps": [
-            "evil"
-        ]
-    },
-    "wcheck-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tlikonen",
-            "repo": "wcheck-mode",
-            "sha256": "1l92k59yvdfhmj4yghcl5bqprynavr3s28v7h8y98v82laxp2q9m",
-            "rev": "866954f040217059607633cf4c0f5e8a1ff5fd9a"
-        },
-        "recipe": {
-            "sha256": "0cmdvhgax6r5svn3wkwll4j271qj70g8182c58riwnkhiajxmn3k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2015.11.29",
-        "deps": []
-    },
-    "overseer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tonini",
-            "repo": "overseer.el",
-            "sha256": "0jz8p6bwpfncxwi6ssmi6ngx8sjjica565i6ln0gsr5i11zfb7nx",
-            "rev": "cf532a4e373e3da2077ccbaa48d4bfacd14661ba"
-        },
-        "recipe": {
-            "sha256": "04wfwcal051jrnmm5dga6vl4c9j10pm416586yxb8smi6fxws2jg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.0",
-        "deps": [
-            "dash",
-            "emacs",
-            "pkg-info"
-        ]
-    },
-    "win-switch": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "genovese",
-            "repo": "win-switch",
-            "sha256": "0ib20zl8l1fs69ca9rry27qz69sgf6ws1ca5nhm5llvpkjcgv53i",
-            "rev": "a0da96c23e8775a2dfdbe55ed3ec5b57f1ebb26a"
-        },
-        "recipe": {
-            "sha256": "1s6inp5kf763rngn58r02fd7n7z3dd55j6hb7s9dgvc856d5z3my",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": []
-    },
-    "nrepl-sync": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "phillord",
-            "repo": "lein-sync",
-            "sha256": "1l07nrlfd5qj8jnqacjba7mb6prapg8d8h3881l3kb66sn02ahgy",
-            "rev": "471a08df87687a3eab61b3b8bf25a2e0962b5d5b"
-        },
-        "recipe": {
-            "sha256": "01b504b4d8rrhlf3sfq3kk9i222fch6jd5jbm02kqw20fgv6q3jd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.1",
-        "deps": [
-            "cider"
-        ]
-    },
-    "erefactor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-erefactor",
-            "sha256": "17i567nfm0rykimh6bpcc5f2l7wsf8zcdy2jzd7sgrl54dvb0g9i",
-            "rev": "fde3fd42c815c76e8015f69518a92f6bfcfde990"
-        },
-        "recipe": {
-            "sha256": "0ma9sbrq4n8y5w7vvbhhgmw25aiykbq5yhxzm0knj32bgpviprw7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7.0",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "identica-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gabrielsaldana",
-            "repo": "Emacs-Identica-mode",
-            "sha256": "047gzycr49cs8wlmm9j4ry7b7jxmfhmbayx6rbbxs49lba8dgwlk",
-            "rev": "cf9183ee11ac922e85c7c908f04e2d00b03111b3"
-        },
-        "recipe": {
-            "sha256": "1r69ylykjap305g23cry4wajiqhpgw08nw3b5d9i1y3mwx0j253q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3.1",
-        "deps": []
-    },
-    "mentor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skangas",
-            "repo": "mentor",
-            "sha256": "1y4ra5z3ayw3w7dszzlkk3qz3nv2jg1vvx8cf0y5j1pqpx8vy3jf",
-            "rev": "bd8e4b89341686bbaf4c44680bbae778b96fb8f0"
-        },
-        "recipe": {
-            "sha256": "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "ac-alchemist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-ac-alchemist",
-            "sha256": "0a8widshsm39cbala17pmnk1sazazhhyqppwalysli170whk49c5",
-            "rev": "31114f3e1e7cc1e101d0b81819d7876d8861df92"
-        },
-        "recipe": {
-            "sha256": "02ll3hcixgdb8zyszn78714gy1h2q0vkhpbnwap9302mr2racwl0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "alchemist",
-            "auto-complete",
-            "cl-lib"
-        ]
-    },
-    "jvm-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "martintrojer",
-            "repo": "jvm-mode.el",
-            "sha256": "1785nsv61m51lpykai2wxrv6zmwbm5654v937fgw177p37054s83",
-            "rev": "16d84c8c80bb214367bae6ed30b08756521c27d6"
-        },
-        "recipe": {
-            "sha256": "1r283b4s0pzq4hgwcz5cnhlvdvq4gy0x51g3vp0762s8qx969a5w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": [
-            "dash",
-            "emacs"
-        ]
-    },
-    "replace-symbol": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bmastenbrook",
-            "repo": "replace-symbol-el",
-            "sha256": "1pxvwiqhv2nmsxkdwn9jx7na1vgk9dg9yxidglxpmvpid6fy4qdk",
-            "rev": "153197a4631a1ed0c3485d210efb41b4b727326c"
-        },
-        "recipe": {
-            "sha256": "07ljmw6aw9hsqffhwmiq2pvhry27acg6f4vgxgi91vjr8jj3r4ng",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "which-key": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "justbur",
-            "repo": "emacs-which-key",
-            "sha256": "11mi23djk690n4984hk3pv61rrkdnxpkmywsqibi3xki27v2al36",
-            "rev": "ad60a6c7206752d9b9cf4ba17c2293dba365e9fb"
-        },
-        "recipe": {
-            "sha256": "0vqbhfzcv9m58w41zdhpiymhgl38n15c6d7ffd99narxlkckcj59",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "esxml": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tali713",
-            "repo": "esxml",
-            "sha256": "0k4vqlbk3h2snfiriraxhnjpdxgs49vcaazl191p9s2f799msd8p",
-            "rev": "cd096242fadbf878d9428786306e54ed60522b43"
-        },
-        "recipe": {
-            "sha256": "0nn074abkxz7p4w59l1za586p5ya392xhl3sx92yys8a3194n6hz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.1",
-        "deps": [
-            "kv"
-        ]
-    },
-    "fwb-cmds": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "fwb-cmds",
-            "sha256": "08qnyr945938hwjg1ypkf2x4mfxbh3bbf1xrgz1rk2ddrfv7hmkm",
-            "rev": "93504c2022799a84cc14d598e1413f8d9df4ee0e"
-        },
-        "recipe": {
-            "sha256": "0wnjvi0v0l2h1mhwlsk2d8ggwh3nk7pks48l55gp18nmj00jxycx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4.0",
-        "deps": []
-    },
-    "notmuch-labeler": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DamienCassou",
-            "repo": "notmuch-labeler",
-            "sha256": "1ss87vlp7625lnn2iah3rc1xfxcbpx4kmiww9n16jx073fs2rj18",
-            "rev": "d65d1129555d368243df4770ecc1e7ccb88efc58"
-        },
-        "recipe": {
-            "sha256": "1c0cbkk5k8ps01xl63a0xa2adkqaj0znw8qs8ca4ai8v1420bpl0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "notmuch"
-        ]
-    },
-    "helm-c-yasnippet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-jp",
-            "repo": "helm-c-yasnippet",
-            "sha256": "108584bmadgidqkdfvf333zkyb5v9f84pasz5h01fkh57ks8by9f",
-            "rev": "1fa400233ba8e990066c47cca1e2af64bd192d4d"
-        },
-        "recipe": {
-            "sha256": "0jwj4giv6lxb3h7vqqb2alkwq5kp0shy2nraik33956p4l8dfs90",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.7",
-        "deps": [
-            "cl-lib",
-            "helm-core",
-            "yasnippet"
-        ]
-    },
-    "codic": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-codic",
-            "sha256": "14jcxrs3b02pbppvdsabr7c74i3c6d1lmd6l1p9dj8gv413pghsz",
-            "rev": "52bbb6997ef4ab9fb7fea43bbfff7f04671aa557"
-        },
-        "recipe": {
-            "sha256": "0fq2qfqhkd6injgl66vcpd61j67shl9xj260aj6cgb2nriq0jxgn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "spaceline": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "TheBB",
-            "repo": "spaceline",
-            "sha256": "1xyhayzr2mbsq9w448bxy7ja9cgy3vrgh70w36nqrrkl1pi7lm3b",
-            "rev": "2cc31a94b8b8c3eefc81ab409071365d120d2535"
-        },
-        "recipe": {
-            "sha256": "0jpcj0i8ckdylrisx9b4l9kam6kkjzhhv1s7mwwi4b744rx942iw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.2",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "emacs",
-            "powerline",
-            "s"
-        ]
-    },
-    "auto-complete-clang-async": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Golevka",
-            "repo": "emacs-clang-complete-async",
-            "sha256": "1kp2l1cgzlg2g3wllz4gl1ssn4lnx2sn26xqigfrpr8y5rj2bsfj",
-            "rev": "a5114e3477793ccb9420acc5cd6a1cb26be65964"
-        },
-        "recipe": {
-            "sha256": "1jj0jn1v3070g7g0j5gvpybv145kki8nsjxqb8fjf9qag8ilfkjh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5",
-        "deps": []
-    },
-    "gscholar-bibtex": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cute-jumper",
-            "repo": "gscholar-bibtex",
-            "sha256": "1dfd22629gz0c8r4wplvbn0n7bm20549mg5chq289s826ca0kxqk",
-            "rev": "00b32521de3aa689bc58516ae10ba7f3ef1b6c92"
-        },
-        "recipe": {
-            "sha256": "0d41gr9amf9vdn9pl9lamhp2swqllxslv9r3wsgzqvjl7zayd1az",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.1",
-        "deps": []
-    },
-    "anyins": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "antham",
-            "repo": "anyins",
-            "sha256": "1z6l72dn98icqsmxb3rrj6l63ijc3xgfa3vdl19yqa2rfy6ya721",
-            "rev": "1ff4673ca197c9bf64c65f718573bf7d478fc562"
-        },
-        "recipe": {
-            "sha256": "0ncf3kn8rackcidkgda2zs60km3hx87rwr9daj7ksmbb6am09s7c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": []
-    },
-    "d-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Emacs-D-Mode-Maintainers",
-            "repo": "Emacs-D-Mode",
-            "sha256": "0apg6cpwjhp8spqq8yyfp56y3pn991sfc85kfnifyhz6v3y6vwv6",
-            "rev": "9b22a9373fc38cf3bc1ea9a814bcd8191d4c6626"
-        },
-        "recipe": {
-            "sha256": "060k9ndjx0n5vlpzfxlv5zxnizx72d7y9vk7gz7gdvpm6w2ha0a2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.0.6",
-        "deps": []
-    },
-    "google-this": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "emacs-google-this",
-            "sha256": "0j31062zfqmcd0zsbp19f3h7gq7dn78sg4xf2x838sr9421x6w8x",
-            "rev": "879ab00f6b5584cfe327eb1c04cd9ff2323b3b11"
-        },
-        "recipe": {
-            "sha256": "0hg9y1b03aiamyn3mam3hyxmxy21wygxrnrww91zcbwlzgp4dd2c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.10",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "dired-fdclone": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knu",
-            "repo": "dired-fdclone.el",
-            "sha256": "0lrc4082ghg77x5jl26hj8c7cp48yjvqhv4g3j0pznpzb4qyfnq0",
-            "rev": "8144c013d46c55b0471f31cdc3b5ead303286cbf"
-        },
-        "recipe": {
-            "sha256": "11aikq2q3m9h4zpgl24f8npvpwd98jgh8ygjwy2x5q8as8i89vf9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.5.2",
-        "deps": []
-    },
-    "package-safe-delete": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "package-safe-delete",
-            "sha256": "1pdv6d6bm5jmpgjqf9ycvzasxz1205zdi0zjrmkr33c03azwz7rd",
-            "rev": "138171e4fc03c0ef05a8260cbb5cd2e114c1c194"
-        },
-        "recipe": {
-            "sha256": "12ss5yjhnyxsif4vlbgxamn5jfa0wxkkphffxnv6drhvmpq226jw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.7",
-        "deps": [
-            "emacs",
-            "epl"
-        ]
-    },
-    "emacsc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knu",
-            "repo": "emacsc",
-            "sha256": "1r6cpb7fck5znb7q7zrxcsjn7d3xiqhq8dp1ar1rsd6k4h05by4j",
-            "rev": "69607bdc3a0c070e924a3bcac93180f917992368"
-        },
-        "recipe": {
-            "sha256": "1fbf9al3yds0il18jz6hbpj1fsjlpb1kgp450gb6r09lc46x77mk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2.20131027",
-        "deps": []
-    },
-    "fuzzy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "auto-complete",
-            "repo": "fuzzy-el",
-            "sha256": "1g7my9ha5cnwg3pjwa86wncg5gphv18xpnpmj3xc3vg7z5m45rss",
-            "rev": "939f4e9a3f08d83925b41dd3d23b2321f3f6b09c"
-        },
-        "recipe": {
-            "sha256": "1hwdh9bx4g4vzzyc20vdwxsii611za37kc9ik40kwjjk62qmll8h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "evil-snipe": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hlissner",
-            "repo": "evil-snipe",
-            "sha256": "143lgpvbjrddbgnyh9dfdhjj0gp69slv4fkiq53czz85ffwli5ig",
-            "rev": "9df049eb83789ea5711632672e077cebf4c54e14"
-        },
-        "recipe": {
-            "sha256": "0gcmpjw3iw7rjk86b2k6clfigp48vakfjd1a9n8qramhnc85rgkn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "jedi": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tkf",
-            "repo": "emacs-jedi",
-            "sha256": "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7",
-            "rev": "8da022c8cda511428c72a6dc4c5be3c0a0c88584"
-        },
-        "recipe": {
-            "sha256": "1777060q25k9n2g6h1lm5lkki900pmjqkxq72mrk3j19jr4pk9m4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.7",
-        "deps": [
-            "auto-complete",
-            "emacs",
-            "jedi-core"
-        ]
-    },
-    "cask-package-toolset": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "AdrieanKhisbe",
-            "repo": "cask-package-toolset.el",
-            "sha256": "0a2cyx80w2ijp6v6jngahqc0df5vjaf71wm6kq55p0ws511h7184",
-            "rev": "22f0c0bbc89d68004af5c6fcb5a6bda2591ed187"
-        },
-        "recipe": {
-            "sha256": "13ix093c0a58rjqj7zfp3914xj3hvj276gb2d8zhvrx9vvs1345g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.0",
-        "deps": [
-            "ansi",
-            "cl-lib",
-            "commander",
-            "dash",
-            "emacs",
-            "f",
-            "s",
-            "shut-up"
-        ]
-    },
-    "wc-goal-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bnbeckwith",
-            "repo": "wc-goal-mode",
-            "sha256": "0mnfk2ys8axjh696cq5msr5cdr91icl1i3mi0dd2y00lvh6sbm7w",
-            "rev": "a8aa227b1a692dd6399855add84b5e37f6c5d9cb"
-        },
-        "recipe": {
-            "sha256": "0l3gh96njjldp7n13jn1zjrp17h7ivjak102j6wwspgg6v2h5419",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.1",
-        "deps": []
-    },
-    "grin": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/dariusp686/emacs-grin",
-            "sha256": "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2",
-            "rev": "f541aa22da52"
-        },
-        "recipe": {
-            "sha256": "0mvzwmws5pi6hpzgkc43fjxs98ngkr0jvqbclza2jbbqawifzzbk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "window-numbering": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nschum",
-            "repo": "window-numbering.el",
-            "sha256": "1rz2a1l3apavsknlfy0faaivqgpj4x9jz3hbysbg9pydpcwqgf64",
-            "rev": "653afce73854d629c2b9d63dad73126032d6a24c"
-        },
-        "recipe": {
-            "sha256": "0x3n0ni16q69lfpyjz61spqghmhvc3cwa4aj80ihii3pk80f769x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.2",
-        "deps": []
-    },
-    "company-math": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vspinu",
-            "repo": "company-math",
-            "sha256": "009f0p0sggfn0yz7sivkcv8zygvv4ssbwqykbxgdxh9n6zk4hjky",
-            "rev": "e82c91d960f9418774959f299d0e064fcb6ba0ad"
-        },
-        "recipe": {
-            "sha256": "0chig8k8l65bnd0a6734fiy0ikl20k9v2wlndh3ckz5a8h963g87",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.1",
-        "deps": [
-            "company",
-            "math-symbol-lists"
-        ]
-    },
-    "minibuffer-complete-cycle": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knu",
-            "repo": "minibuffer-complete-cycle",
-            "sha256": "1zyb6c3xwdzk7dpn7xi0mvbcjdfxvzz1a0zlbs053pfar8iim5fk",
-            "rev": "3df80135887d0169e02294a948711f6dfeca4a6f"
-        },
-        "recipe": {
-            "sha256": "0y1mxs6q9a8lzprrlb22qff6x5mvkw4gp2l6p2js2r0j9jzyffq2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.25.20130814",
-        "deps": []
-    },
-    "imgix": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "imgix",
-            "repo": "imgix-emacs",
-            "sha256": "19jqcbiwqknlpij9q63m1p69k4zb3v1qdx0858drprc2rl1p55cd",
-            "rev": "cf3994f69b34a36f627e9ceaf3e6f4309ee9ec30"
-        },
-        "recipe": {
-            "sha256": "0dh7qsz5c9mflldcw60vc8mrxrw76n2ydd7blv6jfmsnr19ila4q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "ht",
-            "json",
-            "s"
-        ]
-    },
-    "bog": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kyleam",
-            "repo": "bog",
-            "sha256": "1jm7qg7c75yrynrj66304p6ajamr8qxpaqbx9mjw5025936gsd18",
-            "rev": "19c70efa3e4e9bd27308f68bdae62dff16852c0f"
-        },
-        "recipe": {
-            "sha256": "1ci8xxca7dclmi5v37y5k45qlmzs6a9hi6m7czgiwxii902w5pkl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "fixmee": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "fixmee",
-            "sha256": "1hnxdmzqmnp3dr7mpr58pjmigykb3cxwphxzia013kfi37ipf5a0",
-            "rev": "aa3be8ad9fcc9c0c7ff15f70cda4ba77de96dd74"
-        },
-        "recipe": {
-            "sha256": "0wnp6h8f547fsi1lkk4ajny7g21dnr76qfhxl82n0l5h1ps4w8mp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8.6",
-        "deps": [
-            "back-button",
-            "button-lock",
-            "nav-flash",
-            "smartrep",
-            "string-utils",
-            "tabulated-list"
-        ]
-    },
-    "relax": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "technomancy",
-            "repo": "relax.el",
-            "sha256": "0lqbhwi1f8b4sv9p1rf0gyjllk0l7g6v6mlws496079wxx1n5j66",
-            "rev": "6e33892623ab87833082262321dc8e1977209626"
-        },
-        "recipe": {
-            "sha256": "0gfr4ym6aakawhkfz40ar2n0rfz503hq428yj6rbf7jmq3ajaysk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "json"
-        ]
-    },
-    "omni-kill": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "AdrieanKhisbe",
-            "repo": "omni-kill.el",
-            "sha256": "07grj81alrr6qgs3jmqkjzphkvi26w6jm5hf1f5wyx7h6q293ady",
-            "rev": "8a1145b58b4736c9163bcd5b28c8fea80b2ea97b"
-        },
-        "recipe": {
-            "sha256": "03kydl16rd9mnc1rnan2byqa6f70891fhcj16wkavl2r68rfj75k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.3",
-        "deps": []
-    },
-    "git": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "git.el",
-            "sha256": "06ws3x5qa92drmn6rcp502jk2yil6q9gkzdmb2gww9gb2g695wl5",
-            "rev": "8b7f1477ef367b5b7de452589dd9a8ab30150d0a"
-        },
-        "recipe": {
-            "sha256": "1nd2yvfgin13m368gjn7xah99glspnam4g4fh348x4makxcaw8w5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "dash",
-            "f",
-            "s"
-        ]
-    },
-    "operate-on-number": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knu",
-            "repo": "operate-on-number.el",
-            "sha256": "12q09kdcgv6hl1hmgarl73j4g9gi4h7sj865655mdja0ns9n1pdb",
-            "rev": "6a17272e2b6e23260edb1b5eeb01905a1f37e0a6"
-        },
-        "recipe": {
-            "sha256": "1rw3fqbzfizgcbz3yaf99rr2546msna4z7dyfa8dbi8h7yzl4fhk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.0",
-        "deps": []
-    },
-    "browse-url-dwim": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "browse-url-dwim",
-            "sha256": "08qz9l0gb7fvknzkp67srhldzkk8cylnbn0qwkflxgcs6ndfk95y",
-            "rev": "11f1c53126619c7ef1bb5f5d6914ce0b3cce0e30"
-        },
-        "recipe": {
-            "sha256": "13bv2ka5pp9k4kwrxfqfawwxzsqlakvpi9a32gxgx7qfi0dcb1rf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.8",
-        "deps": [
-            "string-utils"
-        ]
-    },
-    "emmet-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "smihica",
-            "repo": "emmet",
-            "sha256": "1dsa85bk33j90h1ypaz1ylqh9yp2xvlga237h3kwa5y3sb0d5ydi",
-            "rev": "bf76d717c60f33d223cdac35513105e9f9244885"
-        },
-        "recipe": {
-            "sha256": "0w5nnhha70mndpk2a58raaxqanv868z05mfy1a8prgapm56mm819",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.8",
-        "deps": []
-    },
-    "edbi": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiwanami",
-            "repo": "emacs-edbi",
-            "sha256": "0xy3q68i47a3s81jwr0rdvc1722bp78ng56xm53pri05g1z0db9s",
-            "rev": "39b833d2e51ae5ce66ebdec7c5425ff0d34e02d2"
-        },
-        "recipe": {
-            "sha256": "0qq0j16n8lyvkqqlcsrq1m7r7f0in6b92d74mpx5c6siv6z2vxlr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.2",
-        "deps": [
-            "concurrent",
-            "ctable",
-            "epc"
-        ]
-    },
-    "markdown-toc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ardumont",
-            "repo": "markdown-toc",
-            "sha256": "0jgr327qlh7acwi6sld27xdsvr89parspk6wmfklwszvy1v13633",
-            "rev": "c2ac578113015ba7d3377c0756a4d00c61ba2e17"
-        },
-        "recipe": {
-            "sha256": "0slky735yzmbfi4ld264vw64b4a4nllhywp19ya0sljbsfycbihv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.9",
-        "deps": [
-            "dash",
-            "markdown-mode",
-            "s"
-        ]
-    },
-    "ac-html": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cheunghy",
-            "repo": "ac-html",
-            "sha256": "19v9515ixg22m7h7riix8w3vyhzax1m2pbwdirp59v532xn9b0cz",
-            "rev": "415a78c3b84855b0c0411832d21a0fb63239b184"
-        },
-        "recipe": {
-            "sha256": "0qf8f75b6dvy844dq8vh8d9c6k599rh1ynjcif9bwvdpf6pxwvqa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.31",
-        "deps": [
-            "auto-complete",
-            "web-completion-data"
-        ]
-    },
-    "swiper": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "swiper",
-            "sha256": "1kahl3h18vsjkbqvd84fb2w45s4srsiydn6jiv49vvg1yaxzxcbm",
-            "rev": "706349fcfae297ee285552af9246bc0cf00d9b7f"
-        },
-        "recipe": {
-            "sha256": "13lld7kjz1n1ryxvrfsy0iym5l9m9ybrf7bpcmkzsalpp15j3mvm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7.0",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "eldoc-eval": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thierryvolpiatto",
-            "repo": "eldoc-eval",
-            "sha256": "1fh9dx669czkwy4msylcg64azz3az27akx55ipnazb5ghmsi7ivk",
-            "rev": "deca5e39f31282a06531002d289258cd099433c0"
-        },
-        "recipe": {
-            "sha256": "0z4scgi2xgrgd47aqqmyv1ww8alh43s0qny5qmh3f1nnppz3nd7c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": []
-    },
-    "elm-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jcollard",
-            "repo": "elm-mode",
-            "sha256": "055bnhkw0nvry3n20a980nrq3y2rlihp59pmrm1s4rlb0f5drckc",
-            "rev": "3462740eb2add23fc294aa5b2b549ee08f5f711e"
-        },
-        "recipe": {
-            "sha256": "18hky1d1d2q5paz271w17r6n1k2sb7rrski8dxq3q586k4lqykj2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.3",
-        "deps": [
-            "emacs",
-            "f",
-            "let-alist",
-            "s"
-        ]
-    },
-    "helm-descbinds": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-helm",
-            "repo": "helm-descbinds",
-            "sha256": "1cm2vaw0j1x2w2m45k6iqbzm7nydfdx1x89673vsvb90whdgvjbp",
-            "rev": "5d8e84e6c047ce8a042fdcd827abb421f4848ac7"
-        },
-        "recipe": {
-            "sha256": "1890ss4pimjxskzzllf57fg07xbs8zqcrp6r8r6x989llrfvd1h7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.8",
-        "deps": [
-            "helm"
-        ]
-    },
-    "wispjs-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "krisajenkins",
-            "repo": "wispjs-mode",
-            "sha256": "188h1sy4mxzrkwi3zgiw108c5f71rkj5agdkf9yy9v8c1bkawm4x",
-            "rev": "be094c3c3223c07b26b5d8bb8fa7aa6866369b3f"
-        },
-        "recipe": {
-            "sha256": "0qzm0dcvjndasnbqpkdc56f1qv66gxv8dfgfcwq5l1bp5wyx813p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": [
-            "clojure-mode"
-        ]
-    },
-    "neotree": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jaypei",
-            "repo": "emacs-neotree",
-            "sha256": "1gmi0xxwkh33w5gxc8488m1vv6ycizqhlw1kpn81zhqdzzq3s06n",
-            "rev": "c4f32b489fb1f5f00897a7dbb58a27ee704f5493"
-        },
-        "recipe": {
-            "sha256": "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.1",
-        "deps": []
-    },
-    "magit-topgit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "magit-topgit",
-            "sha256": "0dj183vphnvz9k2amga0ydcb4gkjxr28qz67055mxrf89q1qjq33",
-            "rev": "732de604c31c74e9da24616428c6e9668b57c881"
-        },
-        "recipe": {
-            "sha256": "1ngrgf40n1g6ncd5nqgr0zgxwlkmv9k4fik96dgzysgwincx683i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.1.1",
-        "deps": [
-            "emacs",
-            "magit"
-        ]
-    },
-    "express": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "express",
-            "sha256": "106yh793scbyharsk1dvrirkj3c6666w8jqilpkaz78vwyw3zs5y",
-            "rev": "e6dc9abdc395ef537408befebeb4fd3ed4ee5c60"
-        },
-        "recipe": {
-            "sha256": "0lhisy4ds96bwpc7k8w9ws1zi1qh0d36nhxsp36bqzfi09ig0nb9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.0",
-        "deps": [
-            "string-utils"
-        ]
-    },
-    "company-web": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "osv",
-            "repo": "company-web",
-            "sha256": "0b0k75rg43h48dbcqiid947nspqiqxkiqcmvph9aqpxlfr67bz5r",
-            "rev": "ffb6b969813041d2d90680a7696a9e0208eaed61"
-        },
-        "recipe": {
-            "sha256": "0dj0m6wcc8cyvblp9b5b3am95gc18j9y4va44hvljxv1h7l5hhvy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9",
-        "deps": [
-            "cl-lib",
-            "company",
-            "dash",
-            "web-completion-data"
-        ]
-    },
-    "helm-recoll": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-helm",
-            "repo": "helm-recoll",
-            "sha256": "16bwsmxqv7gnzh2hgn181h7fl1hficabzd8iq404g114a07p3hh1",
-            "rev": "957a099b9425b91d1c6a1fc43110aa5fc834e2e1"
-        },
-        "recipe": {
-            "sha256": "0pr2pllplml55k1xx9inr3dm90ichg2wb62dvgvmbq2sqdf4606b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "helm"
-        ]
-    },
-    "emr": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chrisbarrett",
-            "repo": "emacs-refactor",
-            "sha256": "0pl7i2a0mf2s33qpsc14dcvqbl6jm5xrvcnrhfr7visvnih29cy4",
-            "rev": "fd20fc1887e2ebcf752f0170b1f3bf697043fd4b"
-        },
-        "recipe": {
-            "sha256": "05vpfxg6lviclnms2zyrza8dc87m60mimlwd11ihvsbngi9gcw8x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.6",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "emacs",
-            "list-utils",
-            "paredit",
-            "popup",
-            "projectile",
-            "redshank",
-            "s"
-        ]
-    },
-    "emacs-eclim": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-eclim",
-            "repo": "emacs-eclim",
-            "sha256": "0b9hr3xg53nap6sik9d2cwqi8vfwzv8yqjcin4hab6rg2fkr5mra",
-            "rev": "c5c7272ae30e5017ebd08d4e03508abc6b23bf4c"
-        },
-        "recipe": {
-            "sha256": "1l55jhz5mb3bqw90cbf4jhcqgwj962br706qhm2wn5i2a1mg8xlv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "dash",
-            "json",
-            "popup",
-            "s"
-        ]
-    },
-    "typo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jorgenschaefer",
-            "repo": "typoel",
-            "sha256": "1jhd4grch5iz12gyxwfbsgh4dmz5hj4bg4gnvphccg8dsnni05k2",
-            "rev": "e72171e4eb0b9ec80b9dabc3198d137d9fb4f972"
-        },
-        "recipe": {
-            "sha256": "07hmqrnbxbrhcbxdls8i4786lkqmfr3hv6va41xih1lxj0mk60bx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": []
-    },
-    "foreman-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zweifisch",
-            "repo": "foreman-mode",
-            "sha256": "199kybf2bvywqfnwr5w893km82829k1j7sp079y6s2601hq8ylw9",
-            "rev": "e90d2b56e83ab914f9ba9e78126bd7a534d5b8fb"
-        },
-        "recipe": {
-            "sha256": "0p3kwbld05wf3dwcv0k6ynz727fiy0ik2srx4js9wvagy57x98kv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.1",
-        "deps": [
-            "dash",
-            "dash-functional",
-            "emacs",
-            "f",
-            "s"
-        ]
-    },
-    "timesheet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tmarble",
-            "repo": "timesheet.el",
-            "sha256": "0p7piqbhwxp2idslqnzl5x4y9aqgba9ryxrjy3d0avky5z9kappl",
-            "rev": "354131b1216ccca51a68da74e9491b5518fd7820"
-        },
-        "recipe": {
-            "sha256": "1gy6bf4wqvp8cw2wjnrr9ijnzwav3p7j46m7qrn6l0517shwl506",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.0",
-        "deps": [
-            "auctex",
-            "org",
-            "s"
-        ]
-    },
-    "slideview": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-slideview",
-            "sha256": "0rk12am1dq52khwkwrmg70zarhni2avj4sy44jqckb4x7sv7djfk",
-            "rev": "ec2340e7b0e74201206d14e3eaef1e77149f122d"
-        },
-        "recipe": {
-            "sha256": "0zr08yrnrz49zds1651ysmgjqgbnhfdcqbg90sbsb086iw89rxl1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.1",
-        "deps": []
-    },
-    "direx": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "m2ym",
-            "repo": "direx-el",
-            "sha256": "0p8c2hjgr81idm1psv3i3v5hr5rv0875ig8app2yqjwzvl0nn73f",
-            "rev": "423caeed13249e37afc937dc8134cb3c53e0f111"
-        },
-        "recipe": {
-            "sha256": "1x3rnrhhyrrvgry9n7kc0734la1zp4gc4bpy50f2qpfd452jwqdm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": []
-    },
-    "yaxception": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "yaxception",
-            "sha256": "0nqyn1b01v1qxv7rcf46qypca61lmpm8d7kqv63jazw3n05qdnj8",
-            "rev": "4e94cf3e0b9b5631b0e90eb4b7de597ee7185875"
-        },
-        "recipe": {
-            "sha256": "18n2kjbgfhkhcwigxmv8dk72jp57vsqqd20lc26v5amx6mrhgh58",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.3",
-        "deps": []
-    },
-    "haskell-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "haskell",
-            "repo": "haskell-mode",
-            "sha256": "1gmpmfkr54sfzrif87zf92a1i13wx75bhp66h1rxhflg216m62yv",
-            "rev": "ea81bbb966a839527a786739b7628fd9cd777456"
-        },
-        "recipe": {
-            "sha256": "0wijvcpfdbl17iwzy47vf8brkj2djarfr8y28rw0wqvbs381zzwp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "13.16",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "linum-relative": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "coldnew",
-            "repo": "linum-relative",
-            "sha256": "1m4g4b96cxs05pfln7kdi6gvrdbv76f8dk806py5lq0gq7da2csc",
-            "rev": "1074e12904d08e00dda438d9700f2a3bff238bd5"
-        },
-        "recipe": {
-            "sha256": "0s1lc3lppazv0481dxknm6qrxhvkv0r9hw8xmdrpjc282l91whkj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": []
-    },
-    "flymake-jslint": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-jslint",
-            "sha256": "00zkm3wqlss386qd6jiq0siga7c48n5ykh0vf9q5v83rmpd79yri",
-            "rev": "30693f75059bab53a9d2eb676c68751f4d8b091c"
-        },
-        "recipe": {
-            "sha256": "1cq8fni4p0qhigx0qh34ypmcsbnilra1ixgnrn9mgg8x3cvcm4cm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.23",
-        "deps": []
-    },
-    "org-bullets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sabof",
-            "repo": "org-bullets",
-            "sha256": "10nr4sjffnqbllv6gmak6pviyynrb7pi5nvrq331h5alm3xcpq0w",
-            "rev": "b70ac2ec805bcb626a6e39ea696354577c681b36"
-        },
-        "recipe": {
-            "sha256": "1kxhlabaqi1g6pz215afp65d9cp324s8mvabjh7q1h7ari32an75",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.4",
-        "deps": []
-    },
-    "org-projectile": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "IvanMalison",
-            "repo": "org-projectile",
-            "sha256": "16aq5p65q5a0an14q9xzsnkaa5bzkrwhm9cv5ljajjfcjsjcvmb6",
-            "rev": "c2141ac997f4af49257595bab88adb9dd7b9b700"
-        },
-        "recipe": {
-            "sha256": "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": [
-            "dash",
-            "projectile"
-        ]
-    },
-    "flyspell-popup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xuchunyang",
-            "repo": "flyspell-popup",
-            "sha256": "1rk7fsill0salrhb4anbf698nd21nxj8pni35brbmv64nj9fhfic",
-            "rev": "a3890c9272c0cfa1e2cde6526f7d6280ad4af00c"
-        },
-        "recipe": {
-            "sha256": "0wp15ra1ry6xpwal6mb53ixh3f0s4nps0rdyfli7hhaiwbr9bhql",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "popup"
-        ]
-    },
-    "pyvenv": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jorgenschaefer",
-            "repo": "pyvenv",
-            "sha256": "0jidmc608amd0chs4598zkj0nvyll0al093121hkczsbpgbllq9z",
-            "rev": "5c48de2419ddf10c00e38f5940ed97a84c43f1ce"
-        },
-        "recipe": {
-            "sha256": "0gai9idss1wvryxyqk3pv854mc2xg9hd0r55r2blql8n5rd2yv8v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.9",
-        "deps": []
-    },
-    "persp-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Bad-ptr",
-            "repo": "persp-mode.el",
-            "sha256": "129cl5az4rr5j7krpyyi5khhbl8klw7ji9ysarz0s7ivy096jq7b",
-            "rev": "00e5f345f13b2b9e615082ac9ccbfd076592cc22"
-        },
-        "recipe": {
-            "sha256": "1bgni7y5xsn4a21494npr90w3320snfzw1hvql30xrr57pw3765w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.7",
-        "deps": []
-    },
-    "fuel": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://factorcode.org/git/factor.git",
-            "sha256": "b348e285923e480fe696f888783c95becb392a6e05abc553d8be649987c7d190",
-            "rev": "905ec06d864537fb6be9c46ad98f1b6d101dfbf0"
-        },
-        "recipe": {
-            "sha256": "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.96",
-        "deps": []
-    },
-    "helm-core": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-helm",
-            "repo": "helm",
-            "sha256": "0awr4nvzgp1kckxqli1xw4pk16gc22i8hchin63fqvk0gllcy454",
-            "rev": "fe96a398aa09ed0d25f6782efa5833085aa63791"
-        },
-        "recipe": {
-            "sha256": "1dyv8rv1728vwsp6vfdq954sp878jbp3srbfxl9gsgjnv1l6vjda",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.9.1",
-        "deps": [
-            "async",
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "wonderland": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kurisuwhyte",
-            "repo": "emacs-wonderland",
-            "sha256": "018r35dz8z03wcrx9s28pjisayy21549i232mp6wy9mxkrkxbzpc",
-            "rev": "28cf6b37000c395ece9519db53147fb826a42bc4"
-        },
-        "recipe": {
-            "sha256": "1b4p49mbzqffm2b2y8sbbi56vnkxap2jscsmla9l6l8brybqjppi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "dash",
-            "dash-functional",
-            "emacs",
-            "multi"
-        ]
-    },
-    "plsense": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "emacs-plsense",
-            "sha256": "0f00dv5jwbhs99j4jc6lvr5n0mv1y80yg7zpp6yrmhww6829l5rg",
-            "rev": "f6fb22607a5252b2556d2e7fa14f1bcab5d9747a"
-        },
-        "recipe": {
-            "sha256": "1ka06r4ashhjkfyzql9mfvs3gj7n684h4gaycj29w4nfqrhcw9va",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4.7",
-        "deps": [
-            "auto-complete",
-            "log4e",
-            "yaxception"
-        ]
-    },
-    "dionysos": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nlamirault",
-            "repo": "dionysos",
-            "sha256": "1xg9cschjd2m0zal296q54ifk5i4s1s3azwfdkbgshxxgvxaky0w",
-            "rev": "92578e813b92c8aae12948b44e0c7757cc9b3d9b"
-        },
-        "recipe": {
-            "sha256": "1wjgj74dnlwd79gc3l7ymbx75jka8rw9smzbb10dsfppw3rrzfmz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.0",
-        "deps": [
-            "dash",
-            "libmpdee",
-            "pkg-info",
-            "s"
-        ]
-    },
-    "graphene": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rdallasgray",
-            "repo": "graphene",
-            "sha256": "1f34bhjxmbf2jjrkpdvqg2gwp83ka6d5vrxmsxdl3r57yc6rbrwa",
-            "rev": "dcc0e34c6c4632d5d5445ec023f5b1ca04c7d1b7"
-        },
-        "recipe": {
-            "sha256": "1wz3rvd8b7gx5d0k7yi4dd69ax5bybcm10vdc7xp4yn296lmyl9k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.5",
-        "deps": [
-            "company",
-            "dash",
-            "exec-path-from-shell",
-            "flycheck",
-            "graphene-meta-theme",
-            "ido-ubiquitous",
-            "ppd-sr-speedbar",
-            "smartparens",
-            "smex",
-            "sr-speedbar",
-            "web-mode"
-        ]
-    },
-    "flycheck-package": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flycheck-package",
-            "sha256": "0aa8cnh9f0f2zr2kkba2kf9djzjnsd51fzj8l578pbj016zdarwd",
-            "rev": "ff93e8986a1021daf542c441c1fd50436ee83cba"
-        },
-        "recipe": {
-            "sha256": "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "flycheck"
-        ]
-    },
-    "org-mac-iCal": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://orgmode.org/org-mode.git",
-            "sha256": "5cb84c3c4bf3f7c3e0c9ab869dababb785d44198b1e1072dc9c0937fc483aa14",
-            "rev": "592dc2ee7e4c80b9b61efb77117c8dc22d6cefd1"
-        },
-        "recipe": {
-            "sha256": "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "7.9.3.5",
-        "deps": []
-    },
-    "annotate": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bastibe",
-            "repo": "annotate.el",
-            "sha256": "18ninv1z8zdqpqnablbds4zgxgk4c1nmznlfdicj6qs738c5c30s",
-            "rev": "a1690384317ce366e5a33aec916949e3328a0117"
-        },
-        "recipe": {
-            "sha256": "1ajykgara2m713blj2kfmdz12fzm8jw7klyakkyi6i3c3a9m44jy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4.4",
-        "deps": []
-    },
-    "zerodark-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "NicolasPetton",
-            "repo": "zerodark-theme",
-            "sha256": "1pxy6ia7di3i5kigybkz78f7fgbsyr1js9asrfbbx3kkpxpm2vfc",
-            "rev": "5f7e16b35b2b42e4a286ca0cece4766a69cd7321"
-        },
-        "recipe": {
-            "sha256": "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "flx": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lewang",
-            "repo": "flx",
-            "sha256": "0sjybrcnb2sl33swy3q664vqrparajcl0m455gciiih2j87hwadc",
-            "rev": "7fce6a4cdb65ac1b52e2b409ba548767581ce34c"
-        },
-        "recipe": {
-            "sha256": "04plfhrnw7jx2jaxhbhw4ypydfcb8v0x2m5hyacvrli1mca2iyf9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.1",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "hardhat": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "hardhat",
-            "sha256": "0mbdnsm903s380ajjgjjqa0m4mxsddzqfjdafrngy0pxgs16iv1f",
-            "rev": "fa42fa4a07dc59f253950c5a8aa5257263a41cdf"
-        },
-        "recipe": {
-            "sha256": "16pdbpm647ag9cadmdm75nwwyzrqsd9y1b4zgkl3pg669mi5vl5z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4.4",
-        "deps": [
-            "ignoramus"
-        ]
-    },
-    "pinyin-search": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xuchunyang",
-            "repo": "pinyin-search.el",
-            "sha256": "12jhdkgfck2a6d5jj65l9d98dm34gsyi0ya4h21dbbvz35zivz70",
-            "rev": "5895cccfa6b43263ee243c5642cc16dd9a69fb4e"
-        },
-        "recipe": {
-            "sha256": "1si693nmmxgg0kp5mxvj5nq946kfc5cv3wfsl4znbqzps8qb2b7z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.0",
-        "deps": []
-    },
-    "sexp-move": {
-        "fetch": {
-            "tag": "fetchFromGitLab",
-            "owner": "elzair",
-            "repo": "sexp-move",
-            "sha256": "11h5z2gmwq07c4gqzj2c9apksvqk3k8kpbb9kg78bbif2xfajr3m",
-            "rev": "117f7a91ab7c25e438413753e916570122011ce7"
-        },
-        "recipe": {
-            "sha256": "0lcxmr2xqh8z7xinxbv1wyrh786zlahhhj5nnbv83i8m23i3ymmd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.6",
-        "deps": []
-    },
-    "mc-extras": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knu",
-            "repo": "mc-extras.el",
-            "sha256": "0252wdq4sd6jhzfy0pn3gdm6aq2h13nnp8hvrn1mpml9x473a5n1",
-            "rev": "71cf966be06d9c74e781a87bb30fa4cf657ee852"
-        },
-        "recipe": {
-            "sha256": "0b110x6ygc95v5pb9lk1i731x5s6dagl5afzv37l1qchys36xrym",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2.1",
-        "deps": [
-            "multiple-cursors"
-        ]
-    },
-    "desktop-registry": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://ryuslash.org/desktop-registry.git",
-            "sha256": "7c7727dd1d63be98e428700bfe340f2c4e7ff713fcc9b2b743a3366d786ae02d",
-            "rev": "244c2e7f9f0a1050aa8a47ad0b38f4e4584682dd"
-        },
-        "recipe": {
-            "sha256": "02mj0nlawx6vpksqsvp1q7l8rd6b1bs8f9c8c2rmda46jaf5npyr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2.0",
-        "deps": []
-    },
-    "test-kitchen": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jjasghar",
-            "repo": "test-kitchen-el",
-            "sha256": "02vp4m3aw7rs4gxn91v6j3y8pr04hpydrg05ck3ivv46snkfagdn",
-            "rev": "9464c7dda14020099053218e959971117396091e"
-        },
-        "recipe": {
-            "sha256": "1bl3yvj56dq147yplrcwphcxiwvmx5n97y4qpkm9imiv8cnjm1g0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.1",
-        "deps": []
-    },
-    "thrift": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "apache",
-            "repo": "thrift",
-            "sha256": "1srylw9wwkyq92f9v6ds9zp9z8sl800wbxjbir80g1lwv4hghaii",
-            "rev": "53dd39833a08ce33582e5ff31fa18bb4735d6731"
-        },
-        "recipe": {
-            "sha256": "0p1hxmm7gvhyigz8aylncgqbhk6cyf75rbcqis7x552g605mhiy9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.3",
-        "deps": []
-    },
-    "better-defaults": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "technomancy",
-            "repo": "better-defaults",
-            "sha256": "09cn3dnaq88jwmmxfg76168s8f4wbmp6y2dv13rhwagihx9mf20m",
-            "rev": "c286d55528f148733c696fe07eb01073dc412fb8"
-        },
-        "recipe": {
-            "sha256": "13bqcmx2gagm2ykg921ik3awp8zvw5d4lb69rr6gkpjlqp7nq2cm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.2",
-        "deps": []
-    },
-    "plsense-direx": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "plsense-direx",
-            "sha256": "0s34nbqqy6aqi113xj452pbmqp43046wfbfbbfv1xwhybgq0c1j1",
-            "rev": "8a2f465264c74e04524cc789cdad0190ace43f6c"
-        },
-        "recipe": {
-            "sha256": "0qd4b7gkmn5ydadhp70995rap3643s1aa8gfi5izgllzhg0i864j",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": [
-            "direx",
-            "log4e",
-            "plsense",
-            "yaxception"
-        ]
-    },
-    "stgit": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://repo.or.cz/stgit.git",
-            "sha256": "12c5df549d653c8ec3476ed271a4e9a4065a61a467229c070bb2e6295e285e16",
-            "rev": "48e5cef14cea5c810833d119900cd484c2a6ca85"
-        },
-        "recipe": {
-            "sha256": "102s9lllrcxsqs0lgbrcljwq1l3s8ri4276wck6rcypck5zgzj89",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.17.1",
-        "deps": []
-    },
-    "ac-html-bootstrap": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "osv",
-            "repo": "ac-html-bootstrap",
-            "sha256": "1zmjqnlbfchnb7n2v7ms7q06xma1lmf9ry3v6f4pfnwlmz5lsf3a",
-            "rev": "591e1e996c820da218ea1eee0a500c556769f128"
-        },
-        "recipe": {
-            "sha256": "0z71m6xws0k9smhsswaivpikr64mv0wh6klnmi5cwhwcqas6kdi1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.3",
-        "deps": [
-            "web-completion-data"
-        ]
-    },
-    "julia-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "JuliaLang",
-            "repo": "julia",
-            "sha256": "0ahn6bdl6vmy71knag1m4nq4s8gsmf239fhjn0mhpnavx9lv1apq",
-            "rev": "bb73f3489d837e3339fce2c1aab283d3b2e97a4c"
-        },
-        "recipe": {
-            "sha256": "0c5bdgh98hw7484s2is84af7hznd8c4z5vlzfd98s8qxi7bldqjm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4.2",
-        "deps": []
-    },
-    "flycheck-status-emoji": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "liblit",
-            "repo": "flycheck-status-emoji",
-            "sha256": "0yi2xmk0bxzqmjf9sy3r3gacqw7z1jrf6hwn05zaqqgn7y78z37i",
-            "rev": "37ed04b76b7338afd2237d3a11487bef3970ff0f"
-        },
-        "recipe": {
-            "sha256": "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": [
-            "emacs",
-            "flycheck",
-            "let-alist"
-        ]
-    },
-    "gitlab": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nlamirault",
-            "repo": "emacs-gitlab",
-            "sha256": "1hc7j3gwljb1wk2727f66m3f7ga4icbklp54vlm0vf2bmii1ynil",
-            "rev": "90be6027eb59a967e5bbceaa5f32c098472ca245"
-        },
-        "recipe": {
-            "sha256": "0vxsqfnipgapnd2ijvdnkspk68dlnki3pkpkzg2h6hyazmzrsqnq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7.0",
-        "deps": [
-            "dash",
-            "pkg-info",
-            "request",
-            "s"
-        ]
-    },
-    "common-lisp-snippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mrkkrp",
-            "repo": "common-lisp-snippets",
-            "sha256": "1cc9ak9193m92g6l4mrfxbkkmvljl3c51d0xzdidwww978q3x6ad",
-            "rev": "3b2b50fda8b1526d45a74e3d30f560d6b6bbb284"
-        },
-        "recipe": {
-            "sha256": "0ig8cz00cbfx0jckqk1xhsvm18ivl2mjvcn65s941nblsywfvxjl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "apples-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tequilasunset",
-            "repo": "apples-mode",
-            "sha256": "13j2r4nx2x6j3qx50d5rdnqd8nl5idxdkhizsk7ccz3v2607fbyy",
-            "rev": "fac47b6255e79a373c5d5e1abe66ea5d74588e9f"
-        },
-        "recipe": {
-            "sha256": "05ssnxs9ybc26jhr69xl9jpb41bz1688minmlc9msq2nvyfnj97s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.2",
-        "deps": []
-    },
-    "reveal-in-osx-finder": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kaz-yos",
-            "repo": "reveal-in-osx-finder",
-            "sha256": "1q13cgpz4wzhnqv84ablawy3y2wgdwy46sp7454mmfx9m77jzb2v",
-            "rev": "5710e5936e47139a610ec9a06899f72e77ddc7bc"
-        },
-        "recipe": {
-            "sha256": "00jgrmh5s3vlpj1jjf8l3c3h4hjk5x781m95sidw6chimizvfmfc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.3",
-        "deps": []
-    },
-    "minitest": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "arthurnn",
-            "repo": "minitest-emacs",
-            "sha256": "0nd0jl5r5drnh98wdpqj2i7pgs7zvcizsh4qbvh8n0iw0c3f0pwh",
-            "rev": "2bed01262b0d888473468b5c7bd7d73694d31320"
-        },
-        "recipe": {
-            "sha256": "0x6nd4kkhiw8hh79r69861pf41j8p1y39kzf2rl61zlmyjz9zpmw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8.0",
-        "deps": [
-            "dash"
-        ]
-    },
-    "evil-matchit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "redguardtoo",
-            "repo": "evil-matchit",
-            "sha256": "0kf4m1ghpxfalqx2zwm1d8xav4d6l6bpk79g5cvssk5jz5913fbi",
-            "rev": "8b80b3df9472217d55962981025539f2da603296"
-        },
-        "recipe": {
-            "sha256": "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.1.2",
-        "deps": []
-    },
-    "sqlup-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "trevoke",
-            "repo": "sqlup-mode.el",
-            "sha256": "1dcb18fq84vlfgb038i2x6vy7mhin2q6jn4jl9fh256n12cx4nrn",
-            "rev": "7a51e34685c65952cd0635c3d35a36337fde361b"
-        },
-        "recipe": {
-            "sha256": "06a0v2qagpd9p2bh19bfw14a6if8kjjc4yyhm5nwp8a8d2vnl5l7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.3",
-        "deps": []
-    },
-    "flycheck-gometalinter": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "favadi",
-            "repo": "flycheck-gometalinter",
-            "sha256": "1ypa4x096wlvgl5nak8sgpgxslv3px3f21mmvqjb4p1sc8vbbb1p",
-            "rev": "554a806e9ad6ddb6299bcfe469dd7d20cf98b473"
-        },
-        "recipe": {
-            "sha256": "1bnvj5kwgbh0dv989rsjcvmcij1ahwcz0vpr6a8f2p6wwvksw1h2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "emacs",
-            "flycheck"
-        ]
-    },
-    "ir-black-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jmdeldin",
-            "repo": "ir-black-theme.el",
-            "sha256": "036q933yw7pimnnq43ydaqqfccgf4iwvjhjmsavp7l6y1w16rvmy",
-            "rev": "b1ca1d0778e3e6228ff756e7fdaf5f5982000fa2"
-        },
-        "recipe": {
-            "sha256": "1qpq9zbv63ywzk5mlr8x53g3rn37k0mdv6x1l1hcd90gka7vga9v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.1",
-        "deps": []
-    },
-    "password-store": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "http://git.zx2c4.com/password-store",
-            "sha256": "f71d0b36570983c35e08b6672c186b5c308b57536a96a747f09665bab794be30",
-            "rev": "1aac79d9617431bbaf218f9a9d270929762d2816"
-        },
-        "recipe": {
-            "sha256": "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.6.5",
-        "deps": [
-            "dash",
-            "f",
-            "s"
-        ]
-    },
-    "extend-dnd": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "extend-dnd",
-            "sha256": "1k2j8szavyq2wy5c0skvs03a88cr9njy7y63b7knh2m92nw4830d",
-            "rev": "a1923d57f8f5e862cc66c189b5e6627bc84a2119"
-        },
-        "recipe": {
-            "sha256": "0rknpvp8yw051pg3blvmjpp3c9a82jw7f10mq67ggbz98w227417",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5",
-        "deps": []
-    },
-    "ac-haskell-process": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "ac-haskell-process",
-            "sha256": "0m33v9iy3y37sicfmpx7kvmn8v1a8k6cs7d0v9v5k93p4d5ila41",
-            "rev": "0362d4323511107ec70e7165cb612f3ab01b712f"
-        },
-        "recipe": {
-            "sha256": "0kv4z850kv03wiax1flnrp6sgqja25j23l719w7rkr7ck110q8rw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7",
-        "deps": [
-            "auto-complete",
-            "haskell-mode"
-        ]
-    },
-    "flx-ido": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lewang",
-            "repo": "flx",
-            "sha256": "0sjybrcnb2sl33swy3q664vqrparajcl0m455gciiih2j87hwadc",
-            "rev": "7fce6a4cdb65ac1b52e2b409ba548767581ce34c"
-        },
-        "recipe": {
-            "sha256": "00wcwbvfjbcx8kyap7rl1b6nsgqdwjzlpv6al2cdpdd19rm1vgdc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.1",
-        "deps": [
-            "cl-lib",
-            "flx"
-        ]
-    },
-    "helm-open-github": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-helm-open-github",
-            "sha256": "1hq1nnmgkx0a8sv6g8k4v9f0102qg7jga0hcjnr8lcji51nqrcya",
-            "rev": "95140bbacc66320a032d3cdd9e1c31aeb47eb83d"
-        },
-        "recipe": {
-            "sha256": "121sszwvihbv688nq5lhdclvsjj8759glh42h82r4pcw30lxggxb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.14",
-        "deps": [
-            "cl-lib",
-            "gh",
-            "helm-core"
-        ]
-    },
-    "nvm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "nvm.el",
-            "sha256": "1624jj922l0bbav1v8szdr0lpyx0ng959fg3sspg1j15kgkir8kf",
-            "rev": "d18b13e8275a57ee6c55dc71b671f02a8e6522ad"
-        },
-        "recipe": {
-            "sha256": "03gy7wavc2q02lnr9pmp3l1pn0lzbdq0kwnmg9fvklmq6r6n3x34",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": [
-            "dash",
-            "dash-functional",
-            "f",
-            "s"
-        ]
-    },
-    "editorconfig-core": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "editorconfig",
-            "repo": "editorconfig-emacs",
-            "sha256": "1z073j9bf31izj05k0vgpv6iwhx0k4m7ikdxgj4sd99svsv84nv9",
-            "rev": "3d1e4797ea3f5a1bb6d0ec296f04ce05e6e368b4"
-        },
-        "recipe": {
-            "sha256": "18d7byqkxn6lyw3nqsvqs5vyj9alh9wjd2mim44a3zcc9r2j061r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.1",
-        "deps": [
-            "cl-lib",
-            "editorconfig-fnmatch"
-        ]
-    },
-    "imenu-list": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bmag",
-            "repo": "imenu-list",
-            "sha256": "192i3iaykw5a9fb9xaivfjj2pbziqdnadlrvqbxbl9h5wi52qq9c",
-            "rev": "1324cffd571df5e35113efc57e1cdc8490068f9c"
-        },
-        "recipe": {
-            "sha256": "092fsn7hnbfabcyakbqyk20pk62sr8xrs45aimkv1l91681np98s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "flymake-less": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-less",
-            "sha256": "0ggvmsjj6p6a7cwr2bzhlcf8ab4v6a2bz5djsscd2ryy570p367z",
-            "rev": "8cbb5e41c8f4b988cee3ef4449cfa9aea3540893"
-        },
-        "recipe": {
-            "sha256": "05k5daphxy94164c73ia7f4l1gv2cmlw8xzs8xnddg7ly22gjhi0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "less-css-mode"
-        ]
-    },
-    "malinka": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "LefterisJP",
-            "repo": "malinka",
-            "sha256": "0hwxwwjzjxv2mmkxmalr2hp3x8apwcyvn2bz4d4yd4wrzcscay97",
-            "rev": "81cf7dd81fbf124ceda31ee963cce8c3616f28f1"
-        },
-        "recipe": {
-            "sha256": "1245mpxsxwnnpdsf0pd28mddgdfhh7x32a2l3sxfq0dyg2xlgvrp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.1",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "f",
-            "projectile",
-            "rtags",
-            "s"
-        ]
-    },
-    "aggressive-indent": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "aggressive-indent-mode",
-            "sha256": "0nss26rz8qly0q00iq7i7q4ss3xvs4s5ndjjmfxhybmnb71a8y9k",
-            "rev": "970c5e3bd4519deed8b8b604a5a96269166bf697"
-        },
-        "recipe": {
-            "sha256": "1qi8jbr28gax35siim3hnnkiy8pa2vcrzqzc6axr98wzny46x0i2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.4.2",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "helm-pt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ralesi",
-            "repo": "helm-pt",
-            "sha256": "0jm6nnnjyd4kmm1knh0mq3xhnw2hvs3linwlynj8yaliqvlv6brv",
-            "rev": "03e35e2bb5b683d79897d07acb57ee67009cc6cd"
-        },
-        "recipe": {
-            "sha256": "1imhy0bsm9aldv0pvf88280qdya01lznxpx5gi5wffhrz17yh4pi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "helm"
-        ]
-    },
-    "subemacs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kbauer",
-            "repo": "subemacs",
-            "sha256": "189547d0g9ax0nr221bkdchlfcj60dsy8lgbbrvq3n3xrmlvl362",
-            "rev": "24f0896f1995a3ea42a58b0452d250dcc6802944"
-        },
-        "recipe": {
-            "sha256": "0sqh80jhh3v37l5af7w6k9lqvj39bd91pn6a9rwdlfk389hp90zm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "magit-find-file": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bradleywright",
-            "repo": "magit-find-file.el",
-            "sha256": "1jlww053s580d7rlvmr1dl79wxasa0hhh2jnwb1ra353d6h3a73w",
-            "rev": "035da838b1a19e7a5ee135b4ca8475f4e235b61e"
-        },
-        "recipe": {
-            "sha256": "1d5flydyhwhvhlhi541zcnz2b03bi07zrp21bfz5sm069bf2c96b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.1.0",
-        "deps": [
-            "dash",
-            "magit"
-        ]
-    },
-    "ace-isearch": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tam17aki",
-            "repo": "ace-isearch",
-            "sha256": "0233ai62zhsy5yhv72016clygwp2pcg80y6kr4cjm2k1k2wwy7m9",
-            "rev": "7e041d058492c5c35ec70de0e7c5586043e7e5ec"
-        },
-        "recipe": {
-            "sha256": "0n8qf08z9n8c2sp5ks29nxcfks5mil1jj6wq348apda8safk36hm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.4",
-        "deps": [
-            "ace-jump-mode",
-            "avy",
-            "emacs",
-            "helm-swoop"
-        ]
-    },
-    "sparkline": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "woudshoo",
-            "repo": "sparkline",
-            "sha256": "1gmmmkzxxlpz2ml6qk24vndlrbyl55r5cba76jn342zrxvb357ny",
-            "rev": "e44498cf1a58fb165991198fe5104d51c92ea904"
-        },
-        "recipe": {
-            "sha256": "081jzaxjb32nydvr1kmyafxqxi610n0yf8lwz9vldm84famf3g7y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.2",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "slime-volleyball": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "fitzsim",
-            "repo": "slime-volleyball",
-            "sha256": "00v4mh04affd8kkw4rn51djpyga2rb8f63mgy86napglqnkz40r3",
-            "rev": "159b5c0f40b109e3854e94b89ec5383854c46ae3"
-        },
-        "recipe": {
-            "sha256": "1dzvj8z3l5l9ixjl3nc3c7zzi23zc2300r7jzw2l3bvg64cfbdg7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": []
-    },
-    "emms-player-simple-mpv": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "momomo5717",
-            "repo": "emms-player-simple-mpv",
-            "sha256": "15bb8fp2lwr5brfrsjwa47yvja5g2wyaac5a4sh5rn734s64x2sq",
-            "rev": "ae4c0032d4d2d0b069ee147b19f962e6a8a73c79"
-        },
-        "recipe": {
-            "sha256": "15aljprjd74ha7wpzsmv3d873i6fy3x1jwhzm03hvw0sw18m25i1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.0",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "emms"
-        ]
-    },
-    "ta": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kuanyui",
-            "repo": "ta.el",
-            "sha256": "09nndx83ws5v2i9x0dzk6l1a0lq29ffzh3y05n0n64nf5j0a7zvk",
-            "rev": "9226afbe7abbefb825844ef3ba4ca15f1934cfc2"
-        },
-        "recipe": {
-            "sha256": "0kn2k4n0xfwsrniaqb36v3rxj2pf2sai3bmjksbn1g2kf5g156ll",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.5",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "enlive": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zweifisch",
-            "repo": "enlive",
-            "sha256": "08j6b79vy8ry4ad1abk3hvxjbb4ylrhkvrbrnq1gcikl4h1p2v63",
-            "rev": "60facaf8bc48b660d209551c0ce4d17e5c907ab8"
-        },
-        "recipe": {
-            "sha256": "1dyayk37zik12qfh8zbjmhsch64yqsx3acrlm7hcnavx465hmhnz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.1",
-        "deps": []
-    },
-    "rake": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "asok",
-            "repo": "rake",
-            "sha256": "1q65jj6bghvzhlqmpg61a7vn8izc01wp2fjiqx013zxpg9awvzmq",
-            "rev": "a9e65cb23d3dc700f5b41ff365153ef6a259d4f0"
-        },
-        "recipe": {
-            "sha256": "0cw47g6cjnkh3z4hbwwq1f8f5vrvs84spn06k53bx898brqdh8ns",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4.0",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "f"
-        ]
-    },
-    "slim-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "slim-template",
-            "repo": "emacs-slim",
-            "sha256": "1cl8amk1kc7a953l1khjms04j40mfkpnbsjz3qa123msgachrsg7",
-            "rev": "fe8abb644b7b9cc0ed1e76d9ca8d6c01edccbdb8"
-        },
-        "recipe": {
-            "sha256": "1hip0r22irr9sah3b65ky71ic508bhqvj9hj95a81qvy1zi9rcac",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": []
-    },
-    "mu4e-maildirs-extension": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "agpchil",
-            "repo": "mu4e-maildirs-extension",
-            "sha256": "1lyd8pcawn106zwlbq6gdq05i2zhry1qh9cdyjiw61nvgbbfi0yx",
-            "rev": "8b384b0bbda46c473dea3ee7dc68c2b3f2548528"
-        },
-        "recipe": {
-            "sha256": "1xz19dxrj1grnl7wy9qglh08xb3dr509232l3xizpkxgqqk8pwbi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8",
-        "deps": []
-    },
-    "move-dup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wyuenho",
-            "repo": "move-dup",
-            "sha256": "01mdy7sps0xryz5gfpl083rv7ixkxs2rkz5yaqjlam2rypdcsyy2",
-            "rev": "4df67072eebac69d6be7619335b03f56f9960235"
-        },
-        "recipe": {
-            "sha256": "0b0lmiisl9yckblwf7619if88qsmbka3bl4qiaqam7fka7psxs7f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.1",
-        "deps": []
-    },
-    "stash": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vermiculus",
-            "repo": "stash.el",
-            "sha256": "0igqifws73cayvjnhhrsqpy14sr27avymfhaqzrpj76m2fsh6fj4",
-            "rev": "638ae8a4f6d33af54fe77d57c2c0eb1800dd2e19"
-        },
-        "recipe": {
-            "sha256": "116k40ispv7sq3jskwc1lvmhmk3jjz4j967r732s07f5h11vk1z9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4.1",
-        "deps": []
-    },
-    "autopair": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "capitaomorte",
-            "repo": "autopair",
-            "sha256": "0g6kd1r0wizamw26bhp5jkvpsd98rcybkfchc622b9v5b89a07nq",
-            "rev": "2d1eb81d12f71248ad305e70cceddf08d4fe2b39"
-        },
-        "recipe": {
-            "sha256": "161qhk8rc1ldj9hpg0k9phka0gflz9vny7gc8rnylk90p6asmr28",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.1",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "chinese-word-at-point": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xuchunyang",
-            "repo": "chinese-word-at-point.el",
-            "sha256": "1jsy43avingxxccs0zw2qm5ysx8g76xhhh1mnyypxskl9m60qb4j",
-            "rev": "36a03cce32fe059d2b581cb2e029715c0be81074"
-        },
-        "recipe": {
-            "sha256": "0pjs4ckncv84qrdj0pyibrbiy86f1gmjla9n2cgh10xbc7j9y0c4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.3",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "key-seq": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vlevit",
-            "repo": "key-seq.el",
-            "sha256": "05vpydcgiaya35b62cdjxna9y02vnwzzg6p8jh0dkr9k44h4iy3f",
-            "rev": "e29b083a6427d061638749194fc249ef69ad2cc0"
-        },
-        "recipe": {
-            "sha256": "166k6hl9vvsnnksvhrv5cbhv9bdiclnbfv7qf67q4c1an9xzqi74",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.1",
-        "deps": [
-            "key-chord"
-        ]
-    },
-    "ox-pandoc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kawabata",
-            "repo": "ox-pandoc",
-            "sha256": "0h49pfl97vl796sm7r62rpv3slj0z5krm4zrqkgz0q6zlyrjay29",
-            "rev": "035f1d60a0139349232c382cfd23a96902b7003d"
-        },
-        "recipe": {
-            "sha256": "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.150707",
-        "deps": [
-            "dash",
-            "emacs",
-            "ht",
-            "org"
-        ]
-    },
-    "helm-ghc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "david-christiansen",
-            "repo": "helm-ghc",
-            "sha256": "00ls9v3jdpz3wka90crd193z3ipwnf1b0slmldn4vb9ivrndh6wn",
-            "rev": "d3603ee18299b789be255297dc42af16dd431869"
-        },
-        "recipe": {
-            "sha256": "1q5ia8sgpflv2hhvw7hjpkfb25vmrjwlrqz1f9qj2qgmki5mix2d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "ghc",
-            "helm"
-        ]
-    },
-    "projectile": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bbatsov",
-            "repo": "projectile",
-            "sha256": "1rl6n6v9f4m7m969frx8b51a4lzfix2bxx6rfcfbh6kzhc00qnxf",
-            "rev": "1159110e83490f3b30d4d39e8c48022d3006900a"
-        },
-        "recipe": {
-            "sha256": "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.13.0",
-        "deps": [
-            "dash",
-            "pkg-info"
-        ]
-    },
-    "fabric": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nlamirault",
-            "repo": "fabric.el",
-            "sha256": "0crhkdbxz1ldbrvppi95g005ni5zg99z1271rkrnk5i6cvc4hlq5",
-            "rev": "004934318f63d8cf955022f87b2c33eb97ada280"
-        },
-        "recipe": {
-            "sha256": "1mkblsakdhvi10b67bv3j0jsf7hr8lf9sibmprvx8smqsih7l88m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": []
-    },
-    "sage-shell-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "stakemori",
-            "repo": "sage-shell-mode",
-            "sha256": "0aw95qkql6apyn79la0jbpr0nlixhl9zvi9miry2h5y5pawb3yvf",
-            "rev": "8e659438ff419f7f1fddd1b56fb706dbecf9e469"
-        },
-        "recipe": {
-            "sha256": "18k7yh8rczng0kn2wsawjml70cb5bnc5jr2gj0hini5f7jq449wx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.8.9",
-        "deps": [
-            "cl-lib",
-            "deferred"
-        ]
-    },
-    "flycheck": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "flycheck",
-            "repo": "flycheck",
-            "sha256": "19mnx2zm71qrf7qf3mk5kriv5vgq0nl67lj029n63wqd8jcjb5fi",
-            "rev": "efaf2e3894428fec065ac6ab0b204db66dbdaa85"
-        },
-        "recipe": {
-            "sha256": "045k214dq8bmrai13da6gwdz97a2i998gggxqswqs4g52l1h6hvr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.25.1",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "emacs",
-            "let-alist",
-            "pkg-info",
-            "seq"
-        ]
-    },
-    "cuda-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chachi",
-            "repo": "cuda-mode",
-            "sha256": "1y685qfdkjyl7dwyvivlgc2lwp102vy6hvcb9zynw84c49f726sn",
-            "rev": "c8cf7d92b8039cdd0bd525c258ab42f49a0f91cf"
-        },
-        "recipe": {
-            "sha256": "0ip4vax93x72bjrh6prik6ddmrvszpsmgm0fxfz772rp24smc300",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": []
-    },
-    "mocker": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sigma",
-            "repo": "mocker.el",
-            "sha256": "1lav7am41v63xgavq8pr88y828jmd1cxd4prjq7jlbxm6nvrwxh2",
-            "rev": "55b078b53ea49e48bd1821d96f0fb86f794fdc6c"
-        },
-        "recipe": {
-            "sha256": "1g90jp1czrrzrmn7n4linby3q4fb4gcflzv2amjv0sdimw1ln1w3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.1",
-        "deps": [
-            "eieio",
-            "el-x"
-        ]
-    },
-    "pungi": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mgrbyte",
-            "repo": "pungi",
-            "sha256": "012lv7hrwlhvins81vw3yjkhdwbpi6g1dx55i101qyrpzv5ifngm",
-            "rev": "41c9f8b7795e083bfd63ba0d06c789c250998723"
-        },
-        "recipe": {
-            "sha256": "1v9fsd764z5wdcips63z53rcipdz7bha4q6s4pnn114jn3a93ls1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": [
-            "jedi",
-            "pyvenv"
-        ]
-    },
-    "colorsarenice-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "colorsarenice-theme",
-            "sha256": "18hzm7yzwlfjlbkx46rgdl31p9xyfqnxlvg8337h2bicpks7kjia",
-            "rev": "3cae55d0c7aeda3a8ef731ebc3886b2449ad87e6"
-        },
-        "recipe": {
-            "sha256": "09zlglldjbjr97clwyzyz7c0k8hswclnk2zbkm03nnn9n9yyg2qi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.20",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "ace-jump-buffer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "waymondo",
-            "repo": "ace-jump-buffer",
-            "sha256": "1z82a0lrb61msamqpsy7rxcgs2nfhhckkk4zw0aw49l248p2nrgs",
-            "rev": "41f8bb0744cdf9c219d25b417f2ffbd0883469e7"
-        },
-        "recipe": {
-            "sha256": "0hkxa0ps0v1hwmjafqbnyr6rc4s0w95igk8y3w53asl7f5sj5mpi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.1",
-        "deps": [
-            "ace-jump-mode",
-            "dash"
-        ]
-    },
-    "ac-octave": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "coldnew",
-            "repo": "ac-octave",
-            "sha256": "16f8hvdz6y8nsfj7094yrvw194ag3w1jvz81h287vcgcvmyb7wdf",
-            "rev": "eb6463631a69dfd06fe750c1c155594d11de0590"
-        },
-        "recipe": {
-            "sha256": "1g5s4dk1rcgkjn17jfw6g201pw0vfhqcx1nhigmnizpnzy0man9z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": [
-            "auto-complete"
-        ]
-    },
-    "ansi": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "ansi",
-            "sha256": "1hbddxarr40ygvaw4pwaivq2l4f0brszw73w1r50lkjlggb7bl3g",
-            "rev": "a042c5954453bab9a74177e2b78ad17a824caebc"
-        },
-        "recipe": {
-            "sha256": "04n0kvaqq8214prdk20bplqyzlsnlzfzsg23ifkrzjgqjjpdcyi1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4.1",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "ido-describe-bindings": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "danil",
-            "repo": "ido-describe-bindings",
-            "sha256": "1xd86jx6j5livsdsplq5yawz1wmkflkvnjmccjjlcy8f5ncl80ax",
-            "rev": "2076b7e8a418008fb503357df2f0f99de3d9aa1d"
-        },
-        "recipe": {
-            "sha256": "1lsa09h025vd908r9q571iq2ia0zdpnq04mlihb3crpp5v9n9ws2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.6",
-        "deps": [
-            "dash",
-            "ido-vertical-mode"
-        ]
-    },
-    "birds-of-paradise-plus-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jimeh",
-            "repo": "birds-of-paradise-plus-theme.el",
-            "sha256": "1r3f5d67x257g8kvdbdsl4w3y1dvc1d6s9x8bygbkvyahfi5m5hn",
-            "rev": "ba2c4443388a73f2c5e2de0c24d3106676aeb6fa"
-        },
-        "recipe": {
-            "sha256": "0vdv2siy30kf1qhzrc39sygjk17lwm3ix58pcs3shwkg1y5amj3m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": []
-    },
-    "elixir-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "elixir-lang",
-            "repo": "emacs-elixir",
-            "sha256": "07kgzdla31nc146xya21rn4hyr76h5lyabla8yh4qjsvnknb7cbj",
-            "rev": "bfc95d9d444bf4002d340d37ad30954dd86c0e94"
-        },
-        "recipe": {
-            "sha256": "1dba3jfg210i2rw8qy866396xn2xjgmbcyl006d6fibpr3j4lxaf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.2.8",
-        "deps": [
-            "emacs",
-            "pkg-info"
-        ]
-    },
-    "hookify": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Silex",
-            "repo": "hookify",
-            "sha256": "1yvz9d5h7npxhsdf6s9fgxpmqk5ixx91iwivbhzcz935gs2886hc",
-            "rev": "e76127230716f7fab6662410c03c3872d17a172b"
-        },
-        "recipe": {
-            "sha256": "0prls539ifk2fsqklcxmbrwmgbm9hya50z486d7sw426lh648qmy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.1",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "gntp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tekai",
-            "repo": "gntp.el",
-            "sha256": "1nvyjjjydrimpxy4cpg90si7sr8lmldbhlcm2mx8npklp9pn5y3a",
-            "rev": "767571135e2c0985944017dc59b0be79af222ef5"
-        },
-        "recipe": {
-            "sha256": "1ywj3p082g54dcpy8q4jnkqfr12npikx8yz14r0njxdlr0janh4f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "github-browse-file": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "osener",
-            "repo": "github-browse-file",
-            "sha256": "07vgnmfn0kbg3h3vhf3xk443yi1b55761x881xlmw9sr9nraa578",
-            "rev": "fa5cc00a40869430fb44596792961a4cddf9c265"
-        },
-        "recipe": {
-            "sha256": "03xvgxlw7wmfby898din7dfcg87ihahkhlav1n7qklw6qi7skjcr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.0",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "diminish": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myrjola",
-            "repo": "diminish.el",
-            "sha256": "0qpgfgp8hrzz4vdifxq8h25n0a0jlzgf7aa1fpy6r0080v5rqbb6",
-            "rev": "0211de96b7cfba9c9dc8d2d392dbd4ccdb22bc65"
-        },
-        "recipe": {
-            "sha256": "1h6a31jllypk47akjflz89xk6h47na96pim17d6g4rpqcafc2k43",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.45",
-        "deps": []
-    },
-    "easy-kill-extras": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knu",
-            "repo": "easy-kill-extras.el",
-            "sha256": "18fdlxz9k961k8wafdw0gq0y514bvrfvx6qc1lmm4pk3gdcfbbi0",
-            "rev": "242844bc95b9015396405d84c4335338037968c3"
-        },
-        "recipe": {
-            "sha256": "0xzlzv57nvrc142saydwfib51fyqcdzjccc1hj6xvgcdbwadlnjy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.4",
-        "deps": [
-            "easy-kill"
-        ]
-    },
-    "projekt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tekai",
-            "repo": "projekt",
-            "sha256": "1rw55w2fpb3rw7j136kclkhppz21f7d7di4cvlv7zj5zpdl5zz88",
-            "rev": "107232c191375b59d065354470d0af83062e2a4c"
-        },
-        "recipe": {
-            "sha256": "1bhb24701flihl54w8xrj6yxhynpq4dk0fp5ciac7k28n4930lw8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "ranger": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ralesi",
-            "repo": "ranger.el",
-            "sha256": "0fkj89p0rb0r472p1rk8xpx8c74pg968pc2mmw3838y4fpc8i198",
-            "rev": "4b778da7aafe1dc4077a3c891ae918eae929fae6"
-        },
-        "recipe": {
-            "sha256": "14g4r4iaz0nzfsklslrswsik670pvfd0605xfjghvpngn2a8ych4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.7",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "yascroll": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "m2ym",
-            "repo": "yascroll-el",
-            "sha256": "007837w6gd7k253h7g2in6l3ihcbwv733yiffs26pnymgk21xdqz",
-            "rev": "0a8b531b3a3c8afe7235c8c212e08bfe2021a629"
-        },
-        "recipe": {
-            "sha256": "11g7wn4hgdwnx3n7ra0sh8gk6rykwvrg9g2cihvcv7mjbqgcv53f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "date-at-point": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alezost",
-            "repo": "date-at-point.el",
-            "sha256": "06aprbhhxb6bbzmf0r5yq2ry6x7708vp4d94ja3ir6zcwc96wn0k",
-            "rev": "662f8350a83311503dc0aae47a28752f9f1270c9"
-        },
-        "recipe": {
-            "sha256": "0r26df6px6q5jlxj29nhl3qbp6kzy9hs5vd72kpiirgn4wlmagp0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "flycheck-ledger": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flycheck-ledger",
-            "sha256": "1pdssw5k88ym5fczllfjv26sp4brlyrywnlzq5baha5pq91h9cb6",
-            "rev": "9401b6c83f60bfd29edfc62fee76f75e17a3a41e"
-        },
-        "recipe": {
-            "sha256": "0807pd2km4r60wgd6jakscbx63ab22d9kvf1cml0ad8wynsap7jl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": [
-            "flycheck"
-        ]
-    },
-    "killer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "killer",
-            "sha256": "0imylcaiwpzvvb3g8kpsna1vk7v7bwdjfcsa98i41m1rv9yla86l",
-            "rev": "52256640aebbb8c25f8527843c2425b848031cd8"
-        },
-        "recipe": {
-            "sha256": "10z4vqwrpss7mk0gq8xdsbsl0qibpp7s1g0l8wlmrsgn6kjkr2ma",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.2",
-        "deps": []
-    },
-    "flycheck-tip": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yuutayamada",
-            "repo": "flycheck-tip",
-            "sha256": "0azjr5mfb3hnb66m1b2319i035mn5i9qz24y7fj5crhnc9vp8w3s",
-            "rev": "0bfddf52ae4ec48d970324f8336a5d62986bbc9e"
-        },
-        "recipe": {
-            "sha256": "0zab1zknrnsw5xh5pwzzcpz7p40bbywkf9zx99sgsd6b5j1jz656",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.0",
-        "deps": [
-            "emacs",
-            "flycheck",
-            "popup"
-        ]
-    },
-    "tablist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "politza",
-            "repo": "tablist",
-            "sha256": "0gy9hxm7bca0l1hfy2pzn86avpifrz3bs8xzpicj4kxw5wi4ygns",
-            "rev": "ef38312867bc0268b1584dd890b1c420bb77ec11"
-        },
-        "recipe": {
-            "sha256": "0c10g86xjhzpmc2sqjmzcmi393qskyw6d9bydqzjk3ffjzklm45p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.70",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "iedit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "victorhge",
-            "repo": "iedit",
-            "sha256": "06qv95bgcb6n3zcjs2i1q80v9040z7m9pb9xbhxmqzcx68vpbpdm",
-            "rev": "b95c35107a429d63b99f888b52eb0f74105d0da0"
-        },
-        "recipe": {
-            "sha256": "02gjshvkcvyr58yf6vlg3s2pzls5sd54xpxggdmqajfg8xmpkq04",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.9",
-        "deps": []
-    },
-    "term-alert": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "CallumCameron",
-            "repo": "term-alert",
-            "sha256": "1d1hrnxhi7h5d5i4198hx5lj7fbc280lpkxmk2nb8z6j7z0aki7g",
-            "rev": "879ea638120639299aae602f06c46d9c27312ff1"
-        },
-        "recipe": {
-            "sha256": "0x4rc1y311ivaj6mlks1j8sgzrrwqn8vx171vw7s1kgf1qzk826n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": [
-            "alert",
-            "term-cmd"
-        ]
-    },
-    "org-vcard": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "flexibeast",
-            "repo": "org-vcard",
-            "sha256": "1qf4pqsg12y1qx7di0y5dp0f4slyp69h2q6y21hldzknhwxx4yy4",
-            "rev": "5c4e17c166fb0406d5dfdc8876b0e182ba7af8fd"
-        },
-        "recipe": {
-            "sha256": "0l6azshvzl1wws582njqr3qx4h73gwrdqwa3jcic1qbs9hg2l4yl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": []
-    },
-    "eide": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git",
-            "sha256": "3f41ade3332a3f1dc5cfb0b33077396feb7b683b2cf2c235b7a5f07f0b2e3271",
-            "rev": "524494fd2b23217c6807b30b43bb95b5724f809e"
-        },
-        "recipe": {
-            "sha256": "16cf32n2l4wy1px7fm6x4vxx7pbqdp7zh2jn3bymg0b40i2321sz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.1.1",
-        "deps": []
-    },
-    "weather-metno": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ruediger",
-            "repo": "weather-metno-el",
-            "sha256": "0qx92jqzsimjk92pql2h8pzhq66mqijwqgjqwp7rmq5b6k0nvx1z",
-            "rev": "b59680c1ab908b32513954034ba894dfb8564dd8"
-        },
-        "recipe": {
-            "sha256": "0h7p4l8y75h27pgk45f0mk3gjd43jk8q97gjf85a9b0afd63d3f6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "gitconfig": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tonini",
-            "repo": "gitconfig.el",
-            "sha256": "0j0w6ywhiapmx7dk20yw3zgf8803kmccnjsr664am3g85kbb644v",
-            "rev": "6c313a39e20702ddcebc12d146f69db1ce668901"
-        },
-        "recipe": {
-            "sha256": "126znl1c4vwgskj7ka9id8v2bdrdn5nkyx3mmc6cz9ylc27ainm7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": []
-    },
-    "auth-password-store": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DamienCassou",
-            "repo": "auth-password-store",
-            "sha256": "0gi65n1np63zi2ylc4y1licwvk97jl92s1v98fv5y61kppi1d8sq",
-            "rev": "d7fc1f026c3f43190cacedfa6eff8da916e607f5"
-        },
-        "recipe": {
-            "sha256": "118ll12dhhxmlsp2mxmy5cd91166a1qsk406yhap5zw1qvyg58w5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.3",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "password-store",
-            "seq"
-        ]
-    },
-    "cpputils-cmake": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "redguardtoo",
-            "repo": "cpputils-cmake",
-            "sha256": "03nzbrvvs31xgaqhxmrj9bypywsg42q06k4z4z1fpjssg9az0j4p",
-            "rev": "d11e5496a0bf885900e7d0d004decc66f95dda3f"
-        },
-        "recipe": {
-            "sha256": "0fswmmmrjv897n51nidmn8gs8yp00595g35vwjafsq6rzfg58j60",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.2",
-        "deps": []
-    },
-    "anzu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-anzu",
-            "sha256": "1d2laybz1igrr9nnkmfsnrvsjw7qmrgby4wnrxprins9gq263lra",
-            "rev": "6fded24b366efc4cf27166104c1928f7d1fedaa7"
-        },
-        "recipe": {
-            "sha256": "0i2ia0jisj31vc2pjx9bhv8jccbp24q7c406x3nhh9hxjzs1f41i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.59",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "format-sql": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "paetzke",
-            "repo": "format-sql.el",
-            "sha256": "0mikksamljps1czacgqavlnzzhgs8s3f8q4jza6v3csf8kgp5zd0",
-            "rev": "97f475c245cd6c81a72a265678e2087cee66ac7b"
-        },
-        "recipe": {
-            "sha256": "0684xqzs933vj9d3n3lv7afk4gii41kaqykbb05cribaswapsanj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": []
-    },
-    "writegood-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bnbeckwith",
-            "repo": "writegood-mode",
-            "sha256": "1nnjn1r669hvvzfycllwap4w04m8rfsk4nzcg8057m1f263kj31b",
-            "rev": "4302169c1563cab9319745083f9b9a7f5f4af0bd"
-        },
-        "recipe": {
-            "sha256": "1lxammisaj04g5vr5lwms64ywf39w8knrq72x4i94wwzwx5ywi1d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.0.2",
-        "deps": []
-    },
-    "simpleclip": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "simpleclip",
-            "sha256": "0v0vmkix9f0hb2183irr6xra8mwi47g6rn843sas7jy2ycaqd91v",
-            "rev": "eba19a21da2e4d1e11abdc158f72d6513afaa669"
-        },
-        "recipe": {
-            "sha256": "07qkfwlg8vw5kb097qbsv082hxir047q2bcvc8scbak2dr6pl12s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": []
-    },
-    "pallet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rdallasgray",
-            "repo": "pallet",
-            "sha256": "03mlg6dmpjw8fq2s3c4gpqj20kjhzldz3m51bf6s0mxq9bclx2xw",
-            "rev": "0e1ae11e1ebfe644cbf832df62ac2dbf6ecd0501"
-        },
-        "recipe": {
-            "sha256": "0q50cdwnn2w1n5h4bappncjjyi5yaixxannwgy23fngdrz1mxwd7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.2",
-        "deps": [
-            "cask",
-            "dash",
-            "f",
-            "s"
-        ]
-    },
-    "org-sync": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "arbox",
-            "repo": "org-sync",
-            "sha256": "0zx9gpvm5gy9k45lbhaks9s935id727lszsh40gmpdp5zxf3rjk1",
-            "rev": "8c65dceaa2f3d436f83ed591916f22556a6e7f91"
-        },
-        "recipe": {
-            "sha256": "0n8fz2d1vg9r8dszgasbnb6pgaxr2i8mqrp953prf1nhmfpjpxad",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.0",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "org"
-        ]
-    },
-    "rcirc-styles": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aaron-em",
-            "repo": "rcirc-styles.el",
-            "sha256": "1f4jy4mndf1m1j9y23mvsvlp732zd2f17khr82lbbfmsxnwzjyq5",
-            "rev": "47b4b289acf4c5839fa463207223a52649a3f574"
-        },
-        "recipe": {
-            "sha256": "01dxhnzsnljig769dk9axdi970b3lw2s6p1z3ljf29qlb5j4548r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "yatemplate": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mineo",
-            "repo": "yatemplate",
-            "sha256": "1yplaj7pry43qps8hvqxj9983ah4jvaiq94l171a7f8qi28386s8",
-            "rev": "a49a218b6fcfbbf6e51021be78aee6d3b220e3f6"
-        },
-        "recipe": {
-            "sha256": "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "nginx-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ajc",
-            "repo": "nginx-mode",
-            "sha256": "08bpyk0brx0x2l0y8hn8zpkaxb2ndmxz22kzxxypj6hdz303wf38",
-            "rev": "8a296e30b01adbc40d1aa9ccde369a972ac5ceab"
-        },
-        "recipe": {
-            "sha256": "07k17m64zhv6gik8v4n73d8l1k6fsp4qp8cl94r384ny0187y65c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.4",
-        "deps": []
-    },
-    "emoji-fontset": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zonuexe",
-            "repo": "emoji-fontset.el",
-            "sha256": "0qi7p1grann3mhaq8kc0yc27cp9fm983g2gaqddljchn7lmgagrr",
-            "rev": "3b8c2204284b95934383836b5b36efeefb65663b"
-        },
-        "recipe": {
-            "sha256": "19affsvlm1rzrzdh1k6xsv79icdkzx4izxivrd2ia6y2wcg9wc5d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": []
-    },
-    "ergoemacs-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ergoemacs",
-            "repo": "ergoemacs-mode",
-            "sha256": "19m6chwc2awbsk5z03q1yhq84m481pff2609a8bxymcvm6yaamvf",
-            "rev": "295ce7a4a5341d9e144a06e91befeebfac1239d9"
-        },
-        "recipe": {
-            "sha256": "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "5.14.7.3.1",
-        "deps": [
-            "emacs",
-            "undo-tree"
-        ]
-    },
-    "cyphejor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mrkkrp",
-            "repo": "cyphejor",
-            "sha256": "1vkwm1n0amf0y0jdyvqskp00b6aijqhd7wclzkzrq7glrvj2z1xw",
-            "rev": "1025d82a9abaca132f5855e72d56c0c2ccc0eef4"
-        },
-        "recipe": {
-            "sha256": "18l5km4xm5j3vv19k3fxs8i3rg4qnhrvx7b62vmyfcqmpiasrh6g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "guide-key-tip": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "guide-key-tip",
-            "sha256": "040mcfhj2gggp8w1pgip7rxb1bnb23rxlm02wl6x1qv5i0q7g5x3",
-            "rev": "e08b2585228529aeaae5e0ae0948f898e83a6200"
-        },
-        "recipe": {
-            "sha256": "0h2vkkbxq361dkn6irm1v19qj7bkhxcjljiksd5wwlq5zsq6bd06",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.1",
-        "deps": [
-            "guide-key",
-            "pos-tip"
-        ]
-    },
-    "ac-racer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-ac-racer",
-            "sha256": "0g7xbfsfqpmcay56y8xbmif52ccz430s3rjxf5bgl9ahkk7zgkzl",
-            "rev": "2708b0a49afc89fb99a6d74a016cff6b94138ed0"
-        },
-        "recipe": {
-            "sha256": "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "auto-complete",
-            "cl-lib",
-            "racer"
-        ]
-    },
-    "nemerle": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rsdn",
-            "repo": "nemerle",
-            "sha256": "19xxg4ya6vndk2ljdnl284zs8qf9dkq4ghr7pmsclp9n7zh46v48",
-            "rev": "556270ce8b97668a65e9ec20a05f78c3dffeac60"
-        },
-        "recipe": {
-            "sha256": "0698hbgk80w7wp0ssx9pl13aapm7rc6l3y2zydfkyqdfwy5y71v6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2",
-        "deps": []
-    },
-    "haskell-emacs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knupfer",
-            "repo": "haskell-emacs",
-            "sha256": "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0",
-            "rev": "f242ac4d0312aee5d162be82ae14b7154bb0db19"
-        },
-        "recipe": {
-            "sha256": "1wkh7qws35c32hha0p9rpjz5pls2844920nh919lvp2wmq9l6jd6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "3.1.2",
-        "deps": []
-    },
-    "terraform-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-terraform-mode",
-            "sha256": "0mz2yl9jaw7chzv9d9hhv7gcvdwwvi676y9wpn7vp85hxpda7xg7",
-            "rev": "6157690efce03ff20b16b85e2be6b0964efec2fb"
-        },
-        "recipe": {
-            "sha256": "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": [
-            "cl-lib",
-            "hcl-mode"
-        ]
-    },
-    "elpa-audit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "elpa-audit",
-            "sha256": "1q4krfrc2dy0vr7q148msfpkcwj55mlsrn4n5xjnya4xj0134ib7",
-            "rev": "a7a1806278c73ea6cb6d235714e7bc8088971df5"
-        },
-        "recipe": {
-            "sha256": "0l8har14zrlh9kdkh9vlmkmzg49vb0r8j1wnznryaidalvk84a52",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": []
-    },
-    "inline-crypt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Sodel-the-Vociferous",
-            "repo": "inline-crypt-el",
-            "sha256": "0jipds844432a8m4d5gxbbkk2h1rsq9fg748g6bxy2q066kyzfz6",
-            "rev": "497ce9dc29a8ccac0b6dd6854f5d120514350282"
-        },
-        "recipe": {
-            "sha256": "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.4",
-        "deps": []
-    },
-    "fsharp-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rneatherway",
-            "repo": "emacs-fsharp-mode-bin",
-            "sha256": "133fb08j6z09zpjqcr69yvx9csdzwcnfmnkwk8g4dw2yllc94gz3",
-            "rev": "21ec2209cf0aa33f6046735e2455fe58490b7406"
-        },
-        "recipe": {
-            "sha256": "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.7.1",
-        "deps": [
-            "auto-complete",
-            "dash",
-            "popup",
-            "pos-tip",
-            "s"
-        ]
-    },
-    "mmm-mako": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/pjenvey/mmm-mako",
-            "sha256": "0rpp748ym79sxccp9pyrwri14m7624zzb80srfgjfdpysrrs0jrr",
-            "rev": "5c9ff92137b5"
-        },
-        "recipe": {
-            "sha256": "0a4af5q9wxafrid8visp30cz6073ig0c961b78vmmgqrwvvxd3kn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": [
-            "mmm-mode"
-        ]
-    },
-    "auto-complete-pcmp": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "auto-complete-pcmp",
-            "sha256": "1hf2f903hy9afahrgy2fx9smgn631drs6733188zgqi3nkyizj26",
-            "rev": "2595d3dab1ef3549271ca922f212928e9d830eec"
-        },
-        "recipe": {
-            "sha256": "1mpgkwj8jwpvxphlm6iaprwjrldmihbgg97jav0fbm1kjnm4azna",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.2",
-        "deps": [
-            "auto-complete",
-            "log4e",
-            "yaxception"
-        ]
-    },
-    "macrostep": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joddie",
-            "repo": "macrostep",
-            "sha256": "0dkigxa39f3cmndxw79mgadwsj7w3bphns6l2hzhv6w0wdllpifp",
-            "rev": "8950313a4e6e3e4bc1d9b0ce4ad4e3bf2f3eb73a"
-        },
-        "recipe": {
-            "sha256": "1wjibxbdsp5qfhq8xy0mcf3ms0q74qhdrhqndprn6jh3kcn5q63c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8",
-        "deps": []
-    },
-    "keydef": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsorphanage",
-            "repo": "keydef",
-            "sha256": "0dkc51bmix4b8czs2wg6vz8vk32qlll1b9fjmx6xshrxm85cyhvv",
-            "rev": "dff2be9f58d12d8c6a490ad0c1b2b10b55528dc0"
-        },
-        "recipe": {
-            "sha256": "0yb2vgj7abyg8j7qmv74nsanv50lf350q1m58rjv8wm31yykg992",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.15",
-        "deps": []
-    },
-    "flymake-coffee": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-coffee",
-            "sha256": "1svj5n7mmzhq03azlv4n33rz0nyqb00qr8ihdbc8hh2xnp63j5rc",
-            "rev": "d4ef325255ea36d1dd622f29284fe72c3fc9abc0"
-        },
-        "recipe": {
-            "sha256": "1aig1d4fgjdg31vrg8k43z5hbqiydgfvxi45p1695s3kbdm8pr2d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.12",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "magit-svn": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "magit-svn",
-            "sha256": "1g8zq0s38di96wlhljp370kyj4a0ir1z3vb94k66v2m5nj83ap68",
-            "rev": "c6222981d4aae088d658cce5e58a14efea8590d6"
-        },
-        "recipe": {
-            "sha256": "02n732z06f0bhxqkxzlvm36bpqr40pas09zbzpfdk4pb6f9f80s0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.1.1",
-        "deps": [
-            "emacs",
-            "magit"
-        ]
-    },
-    "diffview": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mgalgs",
-            "repo": "diffview-mode",
-            "sha256": "1ci2gmyl0i736b2sxh77fyg4hs2pkn6rn9z7v2hzv6xlgqd6j3z6",
-            "rev": "471dc36af93e68849bf2da0db991e186283b3546"
-        },
-        "recipe": {
-            "sha256": "0vlzmykvxjwjww313brl1nr13kz41jypsk0s3l8q3rbsnkpfic5k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "helm-cscope": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alpha22jp",
-            "repo": "helm-cscope.el",
-            "sha256": "0xnqkc4z22m41v5lgf87dd8xc4gmf932zbnbdhf9xic1gal1779c",
-            "rev": "b82db54071bd2d1c77db2e648f8b4e61b1abe288"
-        },
-        "recipe": {
-            "sha256": "13a76wc1ia4c0v701dxqc9ycbb43d5k09m5pfsvs8mccisfzk9y4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "helm",
-            "xcscope"
-        ]
-    },
-    "cil-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ForNeVeR",
-            "repo": "cil-mode",
-            "sha256": "1w0ya0446rqsg1j59fd1mp4wavv2f3h1k3mw9svm5glymdirw4d1",
-            "rev": "1cacd8bca125dbdeb97fdf156e32c2b74bac2186"
-        },
-        "recipe": {
-            "sha256": "1h18r086bqspyn5n252yzw8x2zgyaqzdd8pbcf5gqlh1w8kapq4y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": []
-    },
-    "babel": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "juergenhoetzel",
-            "repo": "babel",
-            "sha256": "0px1xggk6qyrwkma1p3d7b4z2id2gbrsxkliw3nwc1q4zndg1zr7",
-            "rev": "65b55ad89017c9b3a1c8c241ac4b4541eabdaf5f"
-        },
-        "recipe": {
-            "sha256": "0sdpp4iym61ni32zv75n48ylj4jib8ca6n9hyqwj1b7nqg76mm1c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.4",
-        "deps": []
-    },
-    "helm-firefox": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-helm",
-            "repo": "helm-firefox",
-            "sha256": "0xzwnfkz22ljgwfb1lwsfpdj1nhhp1w9f7hsrbqsg2c16rvmkqj4",
-            "rev": "8be9312e8751dce73c7cdbd33a525bbbbff1736f"
-        },
-        "recipe": {
-            "sha256": "0677nj0zsk11vvp3q3xl9nk8dhz3ki9yl3kfb57wgnmprp109wgs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "helm"
-        ]
-    },
-    "engine-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hrs",
-            "repo": "engine-mode",
-            "sha256": "1dsa3r39ip20ddbw0m9vq8z3r4ahrxvb37adyqi4mbdgyr6fq6sw",
-            "rev": "9e8b10b029f63bc0399f8975a28247eaa78dfcbc"
-        },
-        "recipe": {
-            "sha256": "1gg7i93163m7k7lr3pnal1svymnhzwrfpfcdc0798d7ybv26gg8c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": []
-    },
-    "textmate": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "defunkt",
-            "repo": "textmate.el",
-            "sha256": "1a0fzn66gv421by0x6wj3z6bvzv274a9p8c2aaax0dskncl5lgk1",
-            "rev": "484845493a3c9b570799aea5195a5435a5a01b76"
-        },
-        "recipe": {
-            "sha256": "119w944pwarpqzcr9vys17svy1rkfs9hiln8903q9ff4lnjkpf1v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1",
-        "deps": []
-    },
-    "flycheck-clojure": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "clojure-emacs",
-            "repo": "squiggly-clojure",
-            "sha256": "1i824iyjsg4d786kx5chsb64wlqd8vn2vsrhq6rmdx2x3gzdfcsx",
-            "rev": "9e07fd2526ab6e2c4db7d7d6b8c9e44be6e90298"
-        },
-        "recipe": {
-            "sha256": "1b20gcs6fvq9pm4nl2qwsf34sg6wxngdql921q2pyh5n1xsxhm28",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.3",
-        "deps": [
-            "cider",
-            "emacs",
-            "flycheck",
-            "let-alist"
-        ]
-    },
-    "el-autoyas": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "el-autoyas.el",
-            "sha256": "0dbp2zz993cm7mrd58c4iflbzqwg50wzgn2cpwfivk14w1mznh4n",
-            "rev": "bde0251ecb504f585dfa27c205c8e312655310cc"
-        },
-        "recipe": {
-            "sha256": "0hh5j79f3z82nmb3kqry8k8lgc1qswk6ni3g9jg60pasc3wkbh6c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5",
-        "deps": []
-    },
-    "system-specific-settings": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DarwinAwardWinner",
-            "repo": "emacs-system-specific-settings",
-            "sha256": "1hixilnnybv2v3p1wpn7a0ybwah17grawszs3jycsjgzahpgckv7",
-            "rev": "0050d85b2175095aa5ecf580a2fe43c069b0eef3"
-        },
-        "recipe": {
-            "sha256": "1ydmxi8aw2lf78wv4m39yswbqkmcadqg0wmzg9s8b5h9bxxwvppp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": []
-    },
-    "haskell-emacs-base": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knupfer",
-            "repo": "haskell-emacs",
-            "sha256": "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0",
-            "rev": "f242ac4d0312aee5d162be82ae14b7154bb0db19"
-        },
-        "recipe": {
-            "sha256": "1fwkds6qyhbxxdgxfzmgd7dlcxr08ynrrg5jdp9r7f924pd536vb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "3.1.2",
-        "deps": [
-            "haskell-emacs"
-        ]
-    },
-    "ert-async": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "ert-async.el",
-            "sha256": "0hn9i405nfhjd1h9vnwj43nxbbz00khrwkjq0acfyxjaz1shfac9",
-            "rev": "f64a7ed5b0d2900c9a3d8cc33294bf8a79bc8526"
-        },
-        "recipe": {
-            "sha256": "004798ckri5j72j0xvzkyciss1iz4lw9gya2749hkjxlamg14cn5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.2",
-        "deps": []
-    },
-    "textmate-to-yas": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "textmate-to-yas.el",
-            "sha256": "0fjapb7naysf34g4ac5gsa90b2s2ss7qgpyd9mfv3mdqrsp2dyw7",
-            "rev": "8805e5159329e1b74629b7b584373fc446f57d31"
-        },
-        "recipe": {
-            "sha256": "04agz4a41h0givfdw88qjd3c7pd418qyigsij4la5f37j5rh338l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.21",
-        "deps": []
-    },
-    "dracula-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zenorocha",
-            "repo": "dracula-theme",
-            "sha256": "1x7hyj5qi9f222zwhwjqr98zzcvqjqfwxlglph8nsbadkv4s8c3v",
-            "rev": "ee065fed126eecdfe33a1a578d9f1e20687d2f3a"
-        },
-        "recipe": {
-            "sha256": "0ayv00wvajia8kbfrqkrkpb3qp3k70qcnqkav7am16p5kbvzp10r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2.0",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "elixir-yasnippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hisea",
-            "repo": "elixir-yasnippets",
-            "sha256": "0dx5h3sfccc2bp1jxnqqki95x5hp1skw8n5n4lnh703yjga5gkrz",
-            "rev": "6b55c88ce483932f226b6bca0212b589d1d393ea"
-        },
-        "recipe": {
-            "sha256": "0927znqd9j91wc51hdwcl2rxb66i1h549nyr1h39r13353gbwk3a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.1",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "drupal-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "arnested",
-            "repo": "drupal-mode",
-            "sha256": "12lxqrcfv5salmcslw3kggymcwwc0lzq1b6iqd7x4zizp0sjf09s",
-            "rev": "cf0364cbaf727bcd21ab7c2a14cc987c49fd97d0"
-        },
-        "recipe": {
-            "sha256": "14jvk4phq3wcff3yvhygix0c9cpbphh0dvm961i93jpsx7g9awgn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.1",
-        "deps": [
-            "php-mode"
-        ]
-    },
-    "company-jedi": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-company-jedi",
-            "sha256": "1ihqapp4dv92794rsgyq0rmhwika60cmradqd4bn9b72ss6plxs1",
-            "rev": "ad49407451c7f28fe137f9c8f3a7fc89e8693a1b"
-        },
-        "recipe": {
-            "sha256": "1krrgrjq967c3j02y0i345yx6w4crisnj1k3bhih6j849fvy3fvj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": [
-            "cl-lib",
-            "company",
-            "emacs",
-            "jedi-core"
-        ]
-    },
-    "termbright-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bmastenbrook",
-            "repo": "termbright-theme-el",
-            "sha256": "0gfsqpza8phvma5y3ck0n6p197x1i33w39m3c7jmja4ml121n73d",
-            "rev": "bec6ab14336c0611e85f45486276004f16d20607"
-        },
-        "recipe": {
-            "sha256": "14q88qdbnyzxr8sr8i5glj674sb4150b9y6nag0dqrxs629is6xj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "list-utils": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "list-utils",
-            "sha256": "0dmcmvf3dxmp1f71nq5xwsdrnyb04qr14ay4ckpaca2bmi7q0x5x",
-            "rev": "ecd6c91c71e37734af9ff4df003cb96b9d236a97"
-        },
-        "recipe": {
-            "sha256": "0bknprr4jb1d20i9lj2aa17vpg1kqwdyzzwmy1kfydnkpf5scnr3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4.2",
-        "deps": []
-    },
-    "helm-ack": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-helm-ack",
-            "sha256": "0ps86zpyywibjwcm9drmamla979ad61fyqr8d6bv71fr56k9ak21",
-            "rev": "5982f3cb6ec9f460ebbe06ec0ce7b3590bca3118"
-        },
-        "recipe": {
-            "sha256": "1a8sc5gd2g57dl9g18wyydfmihy74yniwhjr27h7vxylnf2g3pni",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.13",
-        "deps": [
-            "cl-lib",
-            "helm"
-        ]
-    },
-    "packed": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "packed",
-            "sha256": "0k5l0l4vjw38r911zd9c9cv015vpw2y8abp82s2s9pm8nqc3bnci",
-            "rev": "478613da38b0a47f4419acc50017ac871433b13c"
-        },
-        "recipe": {
-            "sha256": "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.0",
-        "deps": [
-            "cl-lib",
-            "dash"
-        ]
-    },
-    "guide-key": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kai2nenobu",
-            "repo": "guide-key",
-            "sha256": "1bmcvn8a7g9ahpv2fww673hx9pa7nnrj9kpljq65azf61vq2an2g",
-            "rev": "626f3aacfe4561eddc46617570426246b88e9cab"
-        },
-        "recipe": {
-            "sha256": "0zjrdvppcg8b2k6hfdj45rswc1ks9xgimcr2yvgpc8prrwk1yjsf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2.5",
-        "deps": [
-            "popwin"
-        ]
-    },
-    "pip-requirements": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Wilfred",
-            "repo": "pip-requirements.el",
-            "sha256": "1dsg49156mfhkd8ip4ny03sc06zchxr1qpbcx48f5sn4m9j5d3vs",
-            "rev": "733ec3e4c30875944601b566e9dba6ef05812fcd"
-        },
-        "recipe": {
-            "sha256": "1wsjfyqga7pzp8gsm5x53qrkn40srairbjpifyrqbi2fpzmwhrnz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": [
-            "dash"
-        ]
-    },
-    "cliphist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "redguardtoo",
-            "repo": "cliphist",
-            "sha256": "11c0zpk8gg70d4xiiyjc7v13knwb2ihbrxnlaxzh3rdg2c12676q",
-            "rev": "c0db2da95fa3d3a58160f465c636989bb4b251d5"
-        },
-        "recipe": {
-            "sha256": "0mg6pznijba3kvp3r57pi54v6mgih2vfwj2kg6qmcy1abrc0xq29",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "popup"
-        ]
-    },
-    "haskell-emacs-text": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knupfer",
-            "repo": "haskell-emacs",
-            "sha256": "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0",
-            "rev": "f242ac4d0312aee5d162be82ae14b7154bb0db19"
-        },
-        "recipe": {
-            "sha256": "1j18fhhra6lv32xrq8jc6l8i56fgn68da81wymcimpmpbp0hl5fy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "3.1.2",
-        "deps": [
-            "haskell-emacs"
-        ]
-    },
-    "synosaurus": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rootzlevel",
-            "repo": "synosaurus",
-            "sha256": "0hi2jflrlpp7xkbj852vp9hcl8bfmf04jqw1hawxrw4bxdp95jh2",
-            "rev": "56efdc38952b9bd56a445591fcdeb626aede8678"
-        },
-        "recipe": {
-            "sha256": "16i2ag4l824h1kq4cy01zf01zrms4v6ldwlsixwfyb1mh97lqljg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "flycheck-color-mode-line": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "flycheck",
-            "repo": "flycheck-color-mode-line",
-            "sha256": "11xc08xld758xx9myqjsiqz8vk3gh4d9c4yswswvky6mrx34c0y5",
-            "rev": "c85319f8d2579e770c9060bfef11bedc1370d8be"
-        },
-        "recipe": {
-            "sha256": "0hw19nsh5h2l8qbp7brqmml2fhs8a0x850vlvq3qfd7z248gvhrq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "dash",
-            "emacs",
-            "flycheck"
-        ]
-    },
-    "ph": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gromnitsky",
-            "repo": "ph",
-            "sha256": "1qxsc5wyk8l9gkgmqy3mzwxdhji1ljqw9s1jfxkax7fyv4d1v31p",
-            "rev": "ed45c371642e313810b56c45af08fdfbd71a7dfe"
-        },
-        "recipe": {
-            "sha256": "0azx4cpfdn01yrqyn0q1gg9z7w0h0rn7zl39v3dx6yidd76ysh0l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "es-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dakrone",
-            "repo": "es-mode",
-            "sha256": "105ydizdlak951kfr5mjmk7vkqfkj6r1z0gs5ldz1g19wwc7rhjk",
-            "rev": "bee766109b8da1bba925d6998ef288b8a55f3c8f"
-        },
-        "recipe": {
-            "sha256": "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "4.0.0",
-        "deps": []
-    },
-    "flymake-ruby": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-ruby",
-            "sha256": "0d2vmpgr5c2cbpxcqm5x1ckfysbpwcbaa9frcnp2yfp8scvkvqj0",
-            "rev": "e14e8e2abda223bd3920dbad0eefd5af5973ae6d"
-        },
-        "recipe": {
-            "sha256": "1shr6d03vx85nmyxnysglzlc1pz0zy3n28nrcmxqgdm02g197bzr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "commander": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "commander.el",
-            "sha256": "1j6hhyzww7wfwk6bllbb5mk4hw4qs8hsgfbfdifsam9c6i4spm45",
-            "rev": "2c8a57b9c619e29ccbe2d5a85921b9c689e95bf9"
-        },
-        "recipe": {
-            "sha256": "17y0hg6a90hflgwn24ww23qmvc1alzivpipca8zvpf0nih4fl393",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7.0",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "f",
-            "s"
-        ]
-    },
-    "olivetti": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rnkn",
-            "repo": "olivetti",
-            "sha256": "1rj97yg2n9fi80qlb4z6iahqid3yinlhx9mrbh6gi1niz58ws69h",
-            "rev": "26f3db0bc37324444e41a1d4797056b61b56b004"
-        },
-        "recipe": {
-            "sha256": "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3.0",
-        "deps": []
-    },
-    "gmpl-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cute-jumper",
-            "repo": "gmpl-mode",
-            "sha256": "0x0a94bfkk72kqyr5m6arx450qsg1axmp5r0c4r9m84z8j08r4v1",
-            "rev": "25d20f9d24594e85cb6f80d35d7c73b7e82cbc71"
-        },
-        "recipe": {
-            "sha256": "1f60xim8h85jmqpvgfg402ff8mjd66gla8fa0cwi7l18ijnjblpz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": []
-    },
-    "back-button": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "back-button",
-            "sha256": "0hmn3jlsqgpc602lbcs9wzw0hgr5qpjdcxi2hjlc1cp27ilyscnf",
-            "rev": "c7b50a3e087a8dc5588d7292379cd387a1afff87"
-        },
-        "recipe": {
-            "sha256": "0vyhvm445d0rs14j5xi419akk5nd88d4hvm4251z62fmnvs50j85",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.6",
-        "deps": [
-            "nav-flash",
-            "pcache",
-            "persistent-soft",
-            "smartrep",
-            "ucs-utils"
-        ]
-    },
-    "ox-twbs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "marsmining",
-            "repo": "ox-twbs",
-            "sha256": "10mshzmjh03nr434qyvh0dc8qi2z0aybn945l2v1f3hlz6xss8n9",
-            "rev": "b54058ae4e26e8ce2318c36e5b7369cbbed7c4b1"
-        },
-        "recipe": {
-            "sha256": "15csgnph5wh2dvcc2dnvrlm7whh428rq8smqji1509ib7aw9y5mx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.3",
-        "deps": []
-    },
-    "mediawiki": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hexmode",
-            "repo": "mediawiki-el",
-            "sha256": "1vsla0a5x4kfyj3ca4r1v8cspp12dadi0frpailclaxfmpmpl5d3",
-            "rev": "f8f95722193cb74da2f6a01a0e558707c9b8c46d"
-        },
-        "recipe": {
-            "sha256": "17cbrzfdp6jbbf74mn2fi1cwv7d1hvdbw9j84p43jzscnaa5ikx6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.2.5",
-        "deps": []
-    },
-    "helm-pydoc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-helm-pydoc",
-            "sha256": "1ik0vllakh73kc2zbgii4sm33n9pj388gaz69j4drz2mik307zvs",
-            "rev": "30f1814b5b16db0413ffe74b0d0420b38e153df9"
-        },
-        "recipe": {
-            "sha256": "0cnbhjw951f8sci63cvzcc65d0ffdx3rb8l1g38qql5rzkam48fn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7",
-        "deps": [
-            "cl-lib",
-            "helm-core"
-        ]
-    },
-    "org-pdfview": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "markus1189",
-            "repo": "org-pdfview",
-            "sha256": "14lshgyrlzjcrqdfsn17llm70ijbs86cv9mccy87vlr01rbsz6lj",
-            "rev": "c1ca137ef90e442592ce88ef16437dc7dfa9c5dd"
-        },
-        "recipe": {
-            "sha256": "1z4gb5lw7ngphixw06b5484kwlxbc098w2xshzml5sywr16a4iab",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "org",
-            "pdf-tools"
-        ]
-    },
-    "pushbullet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "theanalyst",
-            "repo": "revolver",
-            "sha256": "03ivg3ddhy5zh410wgwxa17m98wywqhk62jgijhjd00b6l8i4aym",
-            "rev": "73c59a0f1dc04875b3e5a2c8afbc26c32128e445"
-        },
-        "recipe": {
-            "sha256": "1swzl25rcw7anl7q099qh14yhnwlbn3m20ib9kis0l1rv59kkarl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.2",
-        "deps": [
-            "grapnel",
-            "json"
-        ]
-    },
-    "artbollocks-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sachac",
-            "repo": "artbollocks-mode",
-            "sha256": "133c1n4ra7z3vb6y47400y71a6ac19pyji0bgd4kr9fcbx0flx91",
-            "rev": "583c7048a1b09cd79554423d5115f5ddd129d190"
-        },
-        "recipe": {
-            "sha256": "0dlnxicn6nzyiz44y92pbl4nzr9jxfb9a99wacjrwq2ahdrwhhjp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.2",
-        "deps": []
-    },
-    "org-elisp-help": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "org-elisp-help",
-            "sha256": "18x8c6jcqkfam79z4hskr8h1lvzvd5rlfgymmj1ps6p6hd3j4ihl",
-            "rev": "0ead4f715b0a8fd21428f763cfc502177d82b3db"
-        },
-        "recipe": {
-            "sha256": "0a4wvz52hkcw5nrml3h1yp8w97vg5jw22wnpfbb827zh7iwb259h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "cl-lib",
-            "org"
-        ]
-    },
-    "elpy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jorgenschaefer",
-            "repo": "elpy",
-            "sha256": "0kzara7r6gvgf3p06xswxbhq01dbhmwx1pldx3mmv7knvm2mdxq8",
-            "rev": "96fa05708629600fd79c4b0fcafe63ec97f5ce07"
-        },
-        "recipe": {
-            "sha256": "051irp7k0cp1hqp3hzrmapllf2iim7cq0iz38489g4fkh2ybk709",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.10.0",
-        "deps": [
-            "company",
-            "find-file-in-project",
-            "highlight-indentation",
-            "pyvenv",
-            "yasnippet"
-        ]
-    },
-    "fcitx": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cute-jumper",
-            "repo": "fcitx.el",
-            "sha256": "1b0xm3zkdqj1k4bz9dnqhmgs3z9wfhzxbbrq86s1iqpvzvzrza1x",
-            "rev": "bdcbccc04934766e6d3fc54b2bccfe38c25859c1"
-        },
-        "recipe": {
-            "sha256": "0a8wd588c26p3czfp5hn2n46f2vwyg5v301sv0y07b55b1i3ynmx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": []
-    },
-    "avy-zap": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cute-jumper",
-            "repo": "avy-zap",
-            "sha256": "0lmv34pi9qdh76fi3w4lrfyfhzr824nsiif4nyjvpnmrabxgk309",
-            "rev": "67fed60d0dfe9087ca4fe3332f4a78e775b8d239"
-        },
-        "recipe": {
-            "sha256": "1zbkf21ggrmg1w0xaw40i3swgc1g4fz0j8p0r9djm9j120d94zkx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.4",
-        "deps": [
-            "avy"
-        ]
-    },
-    "inf-ruby": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nonsequitur",
-            "repo": "inf-ruby",
-            "sha256": "11zsprv5ycnfqi358dd4cx70dbn6a8hccd4prf28lln7vhldbmjz",
-            "rev": "d130ede56a1203d0aa1c8e5bca5fedbfb14e7ce8"
-        },
-        "recipe": {
-            "sha256": "02f01vwzr6j9iqcdns4l579bhia99sw8hwdqfwqjs9gk3xampfpp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.4.0",
-        "deps": []
-    },
-    "dictionary": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myrkr",
-            "repo": "dictionary-el",
-            "sha256": "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s",
-            "rev": "9ef1672ecd367827381bbbc9af93685980083c5c"
-        },
-        "recipe": {
-            "sha256": "0zr9sm5rmr0frxdr0za72wiffip9391fn9dm5y5x0aj1z4c1n28w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.10",
-        "deps": []
-    },
-    "cl-lib-highlight": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "cl-lib-highlight",
-            "sha256": "12vgi5dicx3lxzngjcg9g3nflrhfy9wdw6ldm72zarp1h96jy5cw",
-            "rev": "c117451df8455769701af6c8e92a8fb29c05e1fa"
-        },
-        "recipe": {
-            "sha256": "13qdrvpxq928p27b1xdcbsscyhqk042rwfa17037gp9h02fd42j8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "ob-http": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zweifisch",
-            "repo": "ob-http",
-            "sha256": "1zbqiqilms8vxqlvzb3gjh8gh2cl7cpmh3yiqsj94jx69w8dy4xl",
-            "rev": "89ba18b22cf6b8533358a9c76a82326343391f0b"
-        },
-        "recipe": {
-            "sha256": "0b7ghz9pqbyn3b52cpmnwa2wnd4svj23p6gc48ybwzwiid42wiss",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.3",
-        "deps": [
-            "cl-lib",
-            "s"
-        ]
-    },
-    "wiki-nav": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "button-lock",
-            "sha256": "1kqcc1d56jz107bswlzvdng6ny6qwp93yck2i2j921msn62qvbb2",
-            "rev": "cd0bf4a3c2f224d851e6ed8a54a6e80c129b225f"
-        },
-        "recipe": {
-            "sha256": "19mabz0y3fcqsm68ijwwbbqylxgp71anc0a31zgc1blha9jivvwy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.2",
-        "deps": [
-            "button-lock",
-            "nav-flash"
-        ]
-    },
-    "ac-clang": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yaruopooner",
-            "repo": "ac-clang",
-            "sha256": "1sdgpyq5p824dnxv6r7djwvhyhdmnis8k6992klr8iz7anhxzdam",
-            "rev": "610ff778697eb5499394be3fc3652756d0bfb772"
-        },
-        "recipe": {
-            "sha256": "070s06xhkzaqfc3j8c4i44rks6gn8z66lwd54j17p8d91x3qjpr4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.6.0",
-        "deps": [
-            "auto-complete",
-            "cl-lib",
-            "emacs",
-            "pos-tip",
-            "yasnippet"
-        ]
-    },
-    "stekene-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fanael",
-            "repo": "stekene-theme",
-            "sha256": "0pik6mq8syhxk9l9ns8wgvg5312qkckm3cilb3irwdm1dvnl5hpf",
-            "rev": "5a5ed0aed5c6c6c56aa1e59516a40c697b04a673"
-        },
-        "recipe": {
-            "sha256": "0v1kwlnrqaygzaz376a5njg9kv4yf5l35k87xga4wdd2mxfwrmf1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.15",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "checkbox": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "camdez",
-            "repo": "checkbox.el",
-            "sha256": "09ypxhfad3v1pz0xhw4xgxvfj7ad2kb3ff9zy1mnw7fzsa7gw6nj",
-            "rev": "2afc2011fa35ccfa0ce9ef46cb1896911fa340d1"
-        },
-        "recipe": {
-            "sha256": "17gw6w1m6bs3sfx8nqa8nzdq26m8w85a0fca5qw3bmd18bcmknqa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.1",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "color-theme-modern": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-jp",
-            "repo": "replace-colorthemes",
-            "sha256": "0q9ss11i31iiv0vn8238922fkic7j6d02f9ykbip04sm46p5k6kj",
-            "rev": "0a804c611da57b2d7c02c95f26eb8a7fc305f159"
-        },
-        "recipe": {
-            "sha256": "0f662ham430fgxpqw96zcl1whcm28cv710g6wvg4fma60sblaxcm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.1",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "opam": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lunaryorn",
-            "repo": "opam.el",
-            "sha256": "119pk7gg4fw5bdvir8077ra603b5nbqvd7ph9cqrwxa056jzvry8",
-            "rev": "83fb2850d29ec792754e0af18b015e089aad2695"
-        },
-        "recipe": {
-            "sha256": "004r93nn1ranvxkcc0y5m3p8gh4axgghgnsvim38nc1sqda5h6xa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "ycmd": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abingham",
-            "repo": "emacs-ycmd",
-            "sha256": "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia",
-            "rev": "8fb29b84d42c0aea71fe7db088b0b7a5a0c6b34c"
-        },
-        "recipe": {
-            "sha256": "06psmcr5132vn72l0amzj14dy43aradnbmlvvms55srvici6r60q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9",
-        "deps": [
-            "dash",
-            "deferred",
-            "emacs",
-            "f",
-            "popup"
-        ]
-    },
-    "zone-nyan": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wasamasa",
-            "repo": "zone-nyan",
-            "sha256": "1lrgirfvcvbir7csshkhhwj99jj1x5aprhw7xfiicv7nan9m6gjy",
-            "rev": "e36875d83ad3dce14f23864688959fa0d98ba410"
-        },
-        "recipe": {
-            "sha256": "165sgjaahz038isii971m02hr2g5iqhbhiwf5kdn8c739cjaa17b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.2",
-        "deps": [
-            "esxml"
-        ]
-    },
-    "gitattributes-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "git-modes",
-            "sha256": "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd",
-            "rev": "9d8f6eda6ee97963e4085da8988cad2c0547b8df"
-        },
-        "recipe": {
-            "sha256": "1gjs0pjh6ap0h54savamzx94lq6vqrg58jxqaq5n5qplrbg15a6x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2.0",
-        "deps": []
-    },
-    "emojify": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "iqbalansari",
-            "repo": "emacs-emojify",
-            "sha256": "0nrf6p4h66i17nz850kpdrnk5h5ra4l3icjjrq34sxvmsssp6zhp",
-            "rev": "fec788f09ab1c131b89f296ebd3e73df97e96cfe"
-        },
-        "recipe": {
-            "sha256": "15v2h5jfksfc208qphiczplg56yka07qv4w4482c10yzwq76zp17",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "emacs",
-            "ht",
-            "seq"
-        ]
-    },
-    "sx": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vermiculus",
-            "repo": "sx.el",
-            "sha256": "02f63k8rzb3bcch6vj6w5c5ncccqg83siqnc8hyi0lhy1bfx240p",
-            "rev": "4892f45746fb217d059f4fa074a237c5bac7dd6c"
-        },
-        "recipe": {
-            "sha256": "1ml1rkhhk3hkd16ij2zwng591rxs2yppsfq9gwd4ppk02if4v517",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "json",
-            "let-alist",
-            "markdown-mode"
-        ]
-    },
-    "mykie": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yuutayamada",
-            "repo": "mykie-el",
-            "sha256": "0550k0rfm0zai306642v689mcpsw9pbd5vs0il82cihwvrxjifc5",
-            "rev": "ab8f7549f9018c26278d101af1b90997c9e5e0b3"
-        },
-        "recipe": {
-            "sha256": "12ram39fp3m9ar6q184rsnpkxb14y0ajibng7ia2ck54ck7n36cj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.1",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "esup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jschaf",
-            "repo": "esup",
-            "sha256": "1pzbd2ka6h5ipiivfwfgq1hq80ww59xvyldmx406mdd5vn7yqk5z",
-            "rev": "f9514db82c06680c7f354a2e50c2ca66e8aa0171"
-        },
-        "recipe": {
-            "sha256": "0cv3zc2zzm38ki3kxq58g9sp4gsk3dffa398wky6z83a3zc02zs0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": []
-    },
-    "evil-rsi": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "linktohack",
-            "repo": "evil-rsi",
-            "sha256": "1ygrpffa847144i74z2yy5r5vcvd334gad5mg18ffydacddcyqmq",
-            "rev": "4e0cb07d0e1c2a5e463ea1ea146f019c47a29e61"
-        },
-        "recipe": {
-            "sha256": "0mc39n72420n36kwyf9zpw1pgyih0aigfnmkbywb0yxgj7myc345",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.1",
-        "deps": [
-            "evil"
-        ]
-    },
-    "letcheck": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "letcheck",
-            "sha256": "1l9qjmyb4a3f6i2iimpmjczbx890cd1p24n941s13sg67xfbm7hn",
-            "rev": "e85b185993a2eaeec6490709f4c131fde2edd672"
-        },
-        "recipe": {
-            "sha256": "1sjwi1ldg6b1qvj9cvfwxq3qlkfas6pm8zasf43baljmnz38mxh2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": []
-    },
-    "find-file-in-repository": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hoffstaetter",
-            "repo": "find-file-in-repository",
-            "sha256": "0wbmmrd7brf4498pdyilz17rzv7221cj8sd4h11gac2r72f1q2md",
-            "rev": "8b888f85029a2ff9159a724b42aeacdb051c3420"
-        },
-        "recipe": {
-            "sha256": "0q1ym06w2yn3nzpj018dj6h68f7rmkxczyl061mirjp8z9c6a9q6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2",
-        "deps": []
-    },
-    "clojure-snippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mpenet",
-            "repo": "clojure-snippets",
-            "sha256": "1p0w83m9j4a6va4g68a4gcfbdkp8nic0q8cm28l8nr7czd5s0yl6",
-            "rev": "30cd52379b856cf80eab2b541c32b1bcdcff3db2"
-        },
-        "recipe": {
-            "sha256": "15622mdd6b3fpwp22d32p78yap08pyscs2vc83sv1xz4338i0lij",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": [
-            "yasnippet"
-        ]
-    },
-    "helm-lobsters": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "julienXX",
-            "repo": "helm-lobste.rs",
-            "sha256": "1nd562lffc41r3y5x7y46f37ra97avllk2m95w23f9g42h47f1ar",
-            "rev": "d798bebb1a65e255c8ec791753a0c78e6b19243b"
-        },
-        "recipe": {
-            "sha256": "0dkb78n373kywxj8zba2s5a2g85vx19rdswv9i78xjwv1lqh8cpp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": []
-    },
-    "helm-commandlinefu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xuchunyang",
-            "repo": "helm-commandlinefu",
-            "sha256": "1l61csd1gqz7kg5zjx60cfy824g42p682z7pk0rqzlrz8498wvkh",
-            "rev": "e11cd3e961c1c4c973b51d8d12592e7235a4971b"
-        },
-        "recipe": {
-            "sha256": "150nqib0sr4n35vdj1xrxcja8gkv3chzhdbgkjxqgkz2yq10xxnd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "emacs",
-            "helm",
-            "json",
-            "let-alist"
-        ]
-    },
-    "ac-emoji": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-ac-emoji",
-            "sha256": "0cc3jpc4pihbyznyzvf6i3xwc2x78gb5m36ba9gkvxhabsljnlfg",
-            "rev": "53677f754929ead403ccde64b714ebb6b8fc808e"
-        },
-        "recipe": {
-            "sha256": "0msh3dh89jzk6hxva34gp9d5pazchgdknxjbi72z26rss9bkp1mw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "auto-complete",
-            "cl-lib"
-        ]
-    },
-    "ido-load-library": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "ido-load-library",
-            "sha256": "1z7az7h90v72llxvdclcywvf1qd0nhkfa45bp99xi7cy7sqsqssf",
-            "rev": "8589cb1e4303066eb333f1cfc789835d1cbe21df"
-        },
-        "recipe": {
-            "sha256": "13f83gqh39p3yjy7r7qc7kzgdcmqh4b5c07zl7rwzb8y9rz59lhj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": [
-            "pcache",
-            "persistent-soft"
-        ]
-    },
-    "elmacro": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Silex",
-            "repo": "elmacro",
-            "sha256": "0l2iincskpks9yvj3y9zh1b48xli1q39wybr5n96rys5gv0drc9h",
-            "rev": "20a0d1e220984ec6079dda9419b3bb44a88edae3"
-        },
-        "recipe": {
-            "sha256": "0644rgwawivrq1shsjx1x2p53z7jgr6bxqgn2smzql8pp6azy7xz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.0",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "s"
-        ]
-    },
-    "helm-make": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "helm-make",
-            "sha256": "17ls0bplnja2qvg3129x2irgsgs7l4bjj0qi7b9z16i6knjkwfya",
-            "rev": "6558a79d20d04465419b312da198190be6832647"
-        },
-        "recipe": {
-            "sha256": "1r6jjy1rlsii6p6pinbz7h6gcw4vmcycd3vj338bfbnqp5rrf2mc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "helm",
-            "projectile"
-        ]
-    },
-    "go-autocomplete": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nsf",
-            "repo": "gocode",
-            "sha256": "03snnra31b5j6iy94gql240vhkynbjql9b4b5j8bsqp9inmbsia3",
-            "rev": "eef10fdde96a12528a6da32f51bf638b2863a3b1"
-        },
-        "recipe": {
-            "sha256": "1ldsq81a167dk2r2mvzyp3v3j2mxc4l9p6b12i7pv8zrjlkhma5a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20150303",
-        "deps": [
-            "auto-complete"
-        ]
-    },
-    "beeminder": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "sodaware",
-            "repo": "beeminder.el",
-            "sha256": "01d10algmi9a4xd7mzf7n3zxfs2qf5as66wx17mff5cd8dahxj1q",
-            "rev": "54cc1277f2a7667a7b0d999dc49ceffcf2862b44"
-        },
-        "recipe": {
-            "sha256": "0aj7ix7nrsl89f9c449kik8fbzhfk9li50wrh50cdwgfh8gda0fx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": []
-    },
-    "idris-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "idris-hackers",
-            "repo": "idris-mode",
-            "sha256": "0iwgbaq2797k1f7ql86i2pjfa67cha4s2v0mgmrd0qcgqkxsdq92",
-            "rev": "314a0baea5752069de08e814bb134a9643fb675d"
-        },
-        "recipe": {
-            "sha256": "0hiiizz976hz3z3ciwg1gs9y10qhxbs8givhz89kvyn4s4861a1s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.19",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "prop-menu"
-        ]
-    },
-    "exec-path-from-shell": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "exec-path-from-shell",
-            "sha256": "0nhc3m88i6rl2y426ksmjbbaqwfrjnwbzqq1bvd6r0bkcwgfwfml",
-            "rev": "30c793b388312e5044afb7549b50996bf2b71941"
-        },
-        "recipe": {
-            "sha256": "1j6f52qs1m43878ikl6nplgb72pdbxfznkfn66wyzcfiz2hrvvm9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.10",
-        "deps": []
-    },
-    "highlight-symbol": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nschum",
-            "repo": "highlight-symbol.el",
-            "sha256": "09z13kv2g21kjjkkm3iyaz93sdjmdy2d563r8n7r7ng94acrn7f6",
-            "rev": "6136dac6d4328c19077a838dfbae2efc4caa4db2"
-        },
-        "recipe": {
-            "sha256": "0gw8ffr64s58qdbvm034s1b9xz1hynzvbk8ld67j06fxpc98qaj4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3",
-        "deps": []
-    },
-    "ppd-sr-speedbar": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rdallasgray",
-            "repo": "ppd-sr-speedbar",
-            "sha256": "0pv671j8g09pn61kkfb3pa9axfa9zd2jdrkgr81rm2gqb2vh1hsq",
-            "rev": "19d3e924407f40a6bb38c8fe427a159af755adce"
-        },
-        "recipe": {
-            "sha256": "1m2918hqvb9c6rgb5szs95ds99gdjdxggcbdfqzmbb5sz2936av8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.6",
-        "deps": [
-            "project-persist-drawer",
-            "sr-speedbar"
-        ]
-    },
-    "vbasense": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "emacs-vbasense",
-            "sha256": "19j5q2f6pybvjq3ryjcyihzlw348hqyjhfcy3qflry6w786dqcgn",
-            "rev": "8c61a492d7c15218ae1a96e2aebfe6f78bfff6db"
-        },
-        "recipe": {
-            "sha256": "1440q2bi4arpl5lbqh7zscg7v3884clqx54p2fdfcfkz47ky4z9n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "auto-complete",
-            "log4e",
-            "yaxception"
-        ]
-    },
-    "creds": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ardumont",
-            "repo": "emacs-creds",
-            "sha256": "169ai0xkh3988racnhaapxw0v1pbxvcaq470x1qacdzdpka4a7bs",
-            "rev": "00ebefd10005c170b790a01380cb6a98f798ce5c"
-        },
-        "recipe": {
-            "sha256": "0n11xxaf93bbc9ih25wj09zzw4sj32wb99qig4zcy8bpkl5y3llk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.6.1",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "helm-project-persist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Sliim",
-            "repo": "helm-project-persist",
-            "sha256": "1q7hfj8ldwivhjp9ns5pvsn0ds6pyvl2zhl366c22s6q8jmbr8ik",
-            "rev": "df63a21b9118f9639f0f4a336127b4fb8ec6deec"
-        },
-        "recipe": {
-            "sha256": "1n87kn1n3453mpdj6amyrgivslskmnzdafpspvkz7b0smf9mv2ld",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": [
-            "helm",
-            "project-persist"
-        ]
-    },
-    "eval-sexp-fu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "hchbaw",
-            "repo": "eval-sexp-fu.el",
-            "sha256": "0lwpl9akdxml9f51pgsv0g7k7mr8dvqm94l01i7vq8jl6vd6v6i5",
-            "rev": "b28d9c4d57511072aa17b2464693e38b769482e0"
-        },
-        "recipe": {
-            "sha256": "17cazf81z4cszflnfp66zyq2cclw5sp9539pxskdf267cf7r0ycs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4.0",
-        "deps": []
-    },
-    "httprepl": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gregsexton",
-            "repo": "httprepl.el",
-            "sha256": "0dd257988bdar9hl2711ch5qshx9jc11fqxcvbrd7rc1va5cshs9",
-            "rev": "d2de8a676544deed1a5e084631a7799e487dbe55"
-        },
-        "recipe": {
-            "sha256": "0899qb1yfnsyf04hhvnk47qnq4d1f4vd5ghj43x4743wd2b9qawh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": [
-            "dash",
-            "emacs",
-            "s"
-        ]
-    },
-    "tern-auto-complete": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "marijnh",
-            "repo": "tern",
-            "sha256": "14s9740f0kgvgwz17y01f6lg9nv2jmzjilljdli064izsw474i0a",
-            "rev": "d4803588928d22cb18044b2e20fedd97e2d348ee"
-        },
-        "recipe": {
-            "sha256": "0lq924c5f6bhlgyqqzc346n381qf0fp66h50a0zqz2ch66kanni1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.16.0",
-        "deps": [
-            "auto-complete",
-            "cl-lib",
-            "emacs",
-            "tern"
-        ]
-    },
-    "ox-ioslide": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "coldnew",
-            "repo": "org-ioslide",
-            "sha256": "047fcvpvwzaqisw4q3p6hxgjyqsi2n9nms1qx9w4znvxrnjq8jz3",
-            "rev": "e81f7a6dab512da7eaa8c2c50c673538b97db267"
-        },
-        "recipe": {
-            "sha256": "0z0qnvpw64wxbgz8203rphswlh9hd2i11pz2mlay8l3bzz4gx4vc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "f",
-            "org"
-        ]
-    },
-    "quasi-monochrome-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lbolla",
-            "repo": "emacs-quasi-monochrome",
-            "sha256": "0lfmdlb626b3gbmlvacwn84vpqam6gk9lp29wk0hcraw69vaw1v8",
-            "rev": "e329a8d55b22151e29df1f81552a4361f85aeafa"
-        },
-        "recipe": {
-            "sha256": "0h5pqrklyga40jg8qc47lwmf8khn0vcs5jx2sdycl2ipy0ikmfs0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "editorconfig": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "editorconfig",
-            "repo": "editorconfig-emacs",
-            "sha256": "1z073j9bf31izj05k0vgpv6iwhx0k4m7ikdxgj4sd99svsv84nv9",
-            "rev": "3d1e4797ea3f5a1bb6d0ec296f04ce05e6e368b4"
-        },
-        "recipe": {
-            "sha256": "0na5lfi9bs4k1q73pph3ff0v8k8vzrfpzh47chyzk8nxsmvklw35",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.1",
-        "deps": [
-            "editorconfig-core"
-        ]
-    },
-    "evil-anzu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-evil-anzu",
-            "sha256": "0lw7fg4gqwj30r0l6k2ni36sxqkf65zf0d0z3rxnpwbxlf8dlkrr",
-            "rev": "64cc08a3546373f28cd7bfd76a3e93bd78efa251"
-        },
-        "recipe": {
-            "sha256": "19cmc61l370mm4h2m6jw5pdcsvj4wcv9zpa8z7k1fjg57mwmmn70",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "anzu",
-            "evil"
-        ]
-    },
-    "hl-anything": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "boyw165",
-            "repo": "hl-anything",
-            "sha256": "12ab825dldiqymy4md8ssfnbbhrgczkwdiwd3llsdq6sayar16as",
-            "rev": "990fe4b323b6222d6c6a35898d8128cddda34848"
-        },
-        "recipe": {
-            "sha256": "15n998nhirvg3f719b7x9s7jpqv6gzkr22kp4zbbq99lbx2wfc1k",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.9",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "restart-emacs": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "iqbalansari",
-            "repo": "restart-emacs",
-            "sha256": "0y4ga1lj2x2f0r535ivs09m2l0q76iz72w42wknhsw9lmdsyl5nz",
-            "rev": "e9292fe88d8be7d0ecf9f4f30ed98ffbc6bd689b"
-        },
-        "recipe": {
-            "sha256": "03aabz7fmy99nwimvjn7qz6pvc94i470hfgiwmjz3348cw02k0n6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": []
-    },
-    "passthword": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pidu",
-            "repo": "passthword",
-            "sha256": "1g0mvg9i8f2qccb4b0m4d74zkjx9gjfv47x57by6cdaf9yywqryi",
-            "rev": "58a91defdbeec9014b4e46f909a7411b3a627285"
-        },
-        "recipe": {
-            "sha256": "076jayziipjx260yk3p37pf5k0qsagalidah3y6hiflrlq4sfgjn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.4",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "s": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "s.el",
-            "sha256": "16b0xh2n33v9q47223rfvcvl7x08c70zaa8f62vm7yfif6mmjln9",
-            "rev": "b16c6641649cb79435f745863bd76aaed3da3698"
-        },
-        "recipe": {
-            "sha256": "0b2lj6nj08pk5fnxvjkc1d9hvi29rnjjy4n5ns4pq6wxpfnlcw64",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.10.0",
-        "deps": []
-    },
-    "sweetgreen": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "CestDiego",
-            "repo": "sweetgreen.el",
-            "sha256": "1h56qkbx5abz1l94wrdpbzspiz24mfgkppzfalvbvx5qwl079cvs",
-            "rev": "9de3916023872ab054e1c7301175fa27fdb1de0c"
-        },
-        "recipe": {
-            "sha256": "1v75wk0gq5fkz8i1r8pl4gqnxbv1d80isyn48w2hxj2fmdn2xhpy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5",
-        "deps": [
-            "cl-lib",
-            "dash",
-            "helm",
-            "request"
-        ]
-    },
-    "javadoc-lookup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "javadoc-lookup",
-            "sha256": "0ljpqgp2w3lr61n2vr748n3wyshlqnnbin0643jffa319l99z35r",
-            "rev": "0d5316407c9ec183040ca5c6ab71091b9444276f"
-        },
-        "recipe": {
-            "sha256": "1fffs0iqkk9rg5vbxifvn09j4i2751p81bzcvy5fslr3r1r2nv79",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "immutant-server": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "leathekd",
-            "repo": "immutant-server.el",
-            "sha256": "1pf7pqh8yzyvh4gzvp5npfq8kcfjcbzra0kkw7zmz769xxc8v84x",
-            "rev": "6f3d303354a229780a33e6bae64460a95bfefe60"
-        },
-        "recipe": {
-            "sha256": "15vcxag1ni41ja4b3q0444sq5ysrisis59la7li6h3617wy8r02i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2.0",
-        "deps": []
-    },
-    "git-ps1-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "10sr",
-            "repo": "git-ps1-mode-el",
-            "sha256": "073c7b64nv0623mcf7ipajkdxkgp5ff70zrndxr3830s1swk0nfk",
-            "rev": "fb86e89dc106e87d87ad2ae4d5ae0e52df528321"
-        },
-        "recipe": {
-            "sha256": "15gswi9s0m3hrsl1qqyjnjgbglsai95klbdp51h3pcq7zj22wkn6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": []
-    },
-    "evil-textobj-anyblock": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "noctuid",
-            "repo": "evil-textobj-anyblock",
-            "sha256": "0vsf7yzlb2j7c5c7cnk81y1979psy6a9v7klg6c2j9lkcn3cqpvj",
-            "rev": "068d26a625cd6202aaf70a8ff399f9130c0ffa68"
-        },
-        "recipe": {
-            "sha256": "03vk30s2wkcszcjxmh5ww39rihnag9cp678wdzq4bnqy0c6rnjwa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "cl-lib",
-            "evil"
-        ]
-    },
-    "osx-plist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsmirror",
-            "repo": "osx-plist",
-            "sha256": "0830kkmvc3ss7ygqfwz3j75s7mhxfxyadaksrp0v2cc4y6wn6nfv",
-            "rev": "5e6de2622fdfe552d4902904f05ea03bc5a6ebd0"
-        },
-        "recipe": {
-            "sha256": "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": []
-    },
-    "cyberpunk-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "n3mo",
-            "repo": "cyberpunk-theme.el",
-            "sha256": "12lkhlsi48wc5cy3zw57wihh9d4ixs2mcbvz9mdgjyhc2xhx3na8",
-            "rev": "08ac966ce38be4a3de0a6f6051b8763b5c85e534"
-        },
-        "recipe": {
-            "sha256": "0l2bwb5afkkhrbh99v2gns1vil9s5911hbnlq5w35nmg1wvbmbc9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.16",
-        "deps": []
-    },
-    "elwm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Fuco1",
-            "repo": "elwm",
-            "sha256": "1k7npf93xbmrsq607x8zlgrpzqvplgia3ixz5w1lr1jlv1m2m8x2",
-            "rev": "c33b183f006ad476c3a44dab316f580f8b369930"
-        },
-        "recipe": {
-            "sha256": "0rf663ih3lfg4n4pj4dpp133967zha5m1wr46riaxpha7xr59al9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.2",
-        "deps": [
-            "dash"
-        ]
-    },
-    "airline-themes": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "AnthonyDiGirolamo",
-            "repo": "airline-themes",
-            "sha256": "0q9m7lih760p7yrpqvpxdks5h6ac7dj4fi0qviyicbjlz9mqw7wp",
-            "rev": "b7d06424ce7d596f5bff3105d3eaa416f173436a"
-        },
-        "recipe": {
-            "sha256": "0jkhb6nigyjmwqny7g59h4ssfy64vl3qnwcw46wnx5k9i73cjyih",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2",
-        "deps": [
-            "powerline"
-        ]
-    },
-    "shackle": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "wasamasa",
-            "repo": "shackle",
-            "sha256": "0yy162sz7vwj0i9w687a5x1c2fq31vc3i6gqhbywspviczdp4q1y",
-            "rev": "4069e0cbff0d172de2cd7d588de971d8b02915c6"
-        },
-        "recipe": {
-            "sha256": "159z0cwg7afrmym0xk902d8z093sqv39jig25ds7z4a224yrv5w6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.0",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "scpaste": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "technomancy",
-            "repo": "scpaste",
-            "sha256": "13s8hp16wxd9fb8gf05dn0xr692kkgiqg7v49fgr00gas4xgpfpm",
-            "rev": "cca8f4ee5402bbf9a4bbb24e81372067cb21bba4"
-        },
-        "recipe": {
-            "sha256": "02dqmx6v3jxdn5yz1z74624sc6sz2bm4qjyi78w9akhp2jplwlk1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.5",
-        "deps": [
-            "htmlize"
-        ]
-    },
-    "helm-themes": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-helm-themes",
-            "sha256": "0rzbdrs5d5a0icpxrqik2iaz8i5bacw6nm2caf75s9w9j0j6s9li",
-            "rev": "8c979f4efc6174eed7df5f3b62db955246202818"
-        },
-        "recipe": {
-            "sha256": "1j64w6dnxmq0rfycci9wfy2z5lbddsggf486pknxfgwwqgvns90l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5",
-        "deps": [
-            "helm"
-        ]
-    },
-    "gnuplot": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bruceravel",
-            "repo": "gnuplot-mode",
-            "sha256": "0bwri3cvm2vr27kyqkrddm28fs08axnd4nm9amfgp54xp20bn4yn",
-            "rev": "aefd4f671485fbcea42511ce79a7a60e5e0110a3"
-        },
-        "recipe": {
-            "sha256": "06c5gqf02fkra8c52xck1lqvf4yg45zfibyf9zqmnbwk7p2jxrds",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7.0",
-        "deps": []
-    },
-    "ac-etags": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-ac-etags",
-            "sha256": "0ijni3qgd68jhznhirhgcl59cr7hwfvbwgf6z120x56jmp8h01d2",
-            "rev": "8cd188b2e4908285ba8178bbd18a555edd7282e8"
-        },
-        "recipe": {
-            "sha256": "0ag49k9izrs4ikzac9lifvvwhcn5n89lr2vb20pngsvg1czdyhzb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6",
-        "deps": [
-            "auto-complete"
-        ]
-    },
-    "rect+": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-rectplus",
-            "sha256": "1vpsihrl03hkd6n6b7mrjccm0a023qf3154a8rw4chihikxw27pj",
-            "rev": "299b742faa0bc4448e0d5fe9cb98ab1eb93b8dcc"
-        },
-        "recipe": {
-            "sha256": "0vk0jwpl6yp2md9nh0ghp2qn883a8lr3cq8c9mgq0g552dwdiv5m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.10",
-        "deps": []
-    },
-    "flymake-hlint": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-hlint",
-            "sha256": "1ygg51r4ym4x7h4svizwllsvr72x9np6jvjqpk8ayv3w2fpb9l31",
-            "rev": "d540e250a80a09da3036c16bf86f9deb6d738c9c"
-        },
-        "recipe": {
-            "sha256": "0wq1ijhn3ypy31yk8jywl5hnz0r0vlhcxjyznzccwqbdc5vf7b2x",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "flycheck-ycmd": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abingham",
-            "repo": "emacs-ycmd",
-            "sha256": "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia",
-            "rev": "8fb29b84d42c0aea71fe7db088b0b7a5a0c6b34c"
-        },
-        "recipe": {
-            "sha256": "0m99ssynrqxgzf32d35n17iqyh1lyc6948inxpnwgcb98rfamchv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9",
-        "deps": [
-            "dash",
-            "emacs",
-            "flycheck",
-            "ycmd"
-        ]
-    },
-    "ansible-doc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lunaryorn",
-            "repo": "ansible-doc.el",
-            "sha256": "05z379k6a7xq9d2zapf687x3f37jpmh6kfghpgxdd18v0hzca8ds",
-            "rev": "6ab94392c860e23439ea3213b74ca56834d1ab14"
-        },
-        "recipe": {
-            "sha256": "03idvnn79fr9id81aivkm7g7cmlsg0c520wcq4da8g013xvi342w",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "ido-vertical-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "creichert",
-            "repo": "ido-vertical-mode.el",
-            "sha256": "1lv82q639xjnmvby56nwqn23ijh6f163bk675s33dkingm8csj8k",
-            "rev": "c3e0514405ba5c15b5527e7f8e2d42dff259788f"
-        },
-        "recipe": {
-            "sha256": "1vg5s6nd6v2g8ychz1q9cdqvsdw6vag7d9w68sn7blpmlr0nqhfm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.6",
-        "deps": []
-    },
-    "stan-snippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "stan-dev",
-            "repo": "stan-mode",
-            "sha256": "0s633nnaprqq0svs0v4zfk9p47izbvjwx1x2xa9b9rid69bpx54s",
-            "rev": "60e31cd0dedc36ee6d5ddde01c5b8cb121c2e844"
-        },
-        "recipe": {
-            "sha256": "021skkvak645483s7haz1hsz98q3zd8hqi9k5zdzaqlabwdjwh85",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "8.0.0",
-        "deps": [
-            "stan-mode",
-            "yasnippet"
-        ]
-    },
-    "emacsql-mysql": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "emacsql",
-            "sha256": "0ph0462shk00rhrkpvwgsr4biykimky2d89pvkbg377951jdga7i",
-            "rev": "03d478870834a683f433e7f0e288476748eec624"
-        },
-        "recipe": {
-            "sha256": "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.0.0",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "emacsql"
-        ]
-    },
-    "cdlatex": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cdominik",
-            "repo": "cdlatex",
-            "sha256": "1jj9vmhc4s3ych08bjm1c2xwi81z1p20rj7bvxrgvb5aga2ghi9d",
-            "rev": "b7183c2200392b6d85fca69390f4a65fac7a7b19"
-        },
-        "recipe": {
-            "sha256": "1jsfmzl13fykbg7l4wv9si7z11ai5lzvkndzbxh9cyqlvznq0m64",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "4.7",
-        "deps": []
-    },
-    "sourcekit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nathankot",
-            "repo": "company-sourcekit",
-            "sha256": "1l9xrw88wq32wm3qx922ihdb9mlv9rrdalwvz9i2790fmw7y84vz",
-            "rev": "ea26c1284ccf72d6e3a850c6725433f0f8e2b3f9"
-        },
-        "recipe": {
-            "sha256": "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.4",
-        "deps": [
-            "dash",
-            "dash-functional",
-            "emacs"
-        ]
-    },
-    "guru-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bbatsov",
-            "repo": "guru-mode",
-            "sha256": "1y46qd9cgkfb0wp2cvksjncyp77hd2jnr4bm4zafqirc3qhbysx0",
-            "rev": "62a9a0025249f2f8866b94683c4114c39f48e1fa"
-        },
-        "recipe": {
-            "sha256": "0j25nxs3ndybq1ik36qyqdprmhav4ba8ny7v2z61s23id8hz3xjs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": []
-    },
-    "msvc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yaruopooner",
-            "repo": "msvc",
-            "sha256": "1draiwbwb8zfi6rdr5irv8091xv2pmnifq7pzi3rrvjb8swb28z3",
-            "rev": "e7a61fa5b98a129637f970ac6db9163e330b3d02"
-        },
-        "recipe": {
-            "sha256": "04gq2klana557qvsi3bv6416l0319jsqb6bdfs7y6729qd94hlq3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2.2",
-        "deps": [
-            "ac-clang",
-            "cedet",
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "describe-number": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "netromdk",
-            "repo": "describe-number",
-            "sha256": "13fasbhdjwc4jh3cy25gm5sbbg56hq8la271098qpx6dhqm2wycq",
-            "rev": "40618345a37831804b29589849a785ef5aa5ac24"
-        },
-        "recipe": {
-            "sha256": "0gvriailni2ppz69g0bwnb1ik1ghjkj341k45vllz30j0frp9iji",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.1",
-        "deps": [
-            "yabin"
-        ]
-    },
-    "smex": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nonsequitur",
-            "repo": "smex",
-            "sha256": "1hcjh577xz3inx28r8wb4g2b1424ccw8pffvgdmpf80xp1llldj5",
-            "rev": "97b4a4d82a4449e3f1a3fa8a93387d6eb0ef9c26"
-        },
-        "recipe": {
-            "sha256": "1rwyi7gdzswafkwpfqd6zkxka1mrf4xz17kld95d2ram6cxl6zda",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "3.0",
-        "deps": []
-    },
-    "fancy-battery": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "lunaryorn",
-            "repo": "fancy-battery.el",
-            "sha256": "05lwcwf412m717yhwpjrswqkm8c3i7391rmiwv2k8xc1vk6dpp4g",
-            "rev": "5b8115bbeb67c52d4202a12dcd5726fb66e0a1ff"
-        },
-        "recipe": {
-            "sha256": "03rkfdkrzyal9abdiv8c73w10sm974hxf3xg5015hibfi6kzg8ii",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "org-trello": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "org-trello",
-            "repo": "org-trello",
-            "sha256": "1561nxjva8892via0l8315y3fih4r4q9gzycmvh33db8gqzq4l86",
-            "rev": "3718ed704094e5e5a491749f1f722d76ba4b7d73"
-        },
-        "recipe": {
-            "sha256": "1rm91xccvdsqghdnrnjvyp8xfvrw5ac677vzzz24rz9dssh2mz9b",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7.5",
-        "deps": [
-            "dash",
-            "dash-functional",
-            "deferred",
-            "emacs",
-            "request-deferred",
-            "s"
-        ]
-    },
-    "know-your-http-well": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "for-GET",
-            "repo": "know-your-http-well",
-            "sha256": "08q43k4450kgygyvqv18gwcmmb7y9x445401048lbixc4cp6p3cg",
-            "rev": "e208d856ce1b036d2dc1454813c6fc81f0269def"
-        },
-        "recipe": {
-            "sha256": "0k2x0ajxkivim8nfpli716y7f4ssrmvwi56r94y34x4j3ib3px3q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4.0",
-        "deps": []
-    },
-    "homebrew-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dunn",
-            "repo": "homebrew-mode",
-            "sha256": "1n8r4jrk71dg25ca6bsw11ky0dszdj4pvqwsmy3msqlji1ckvqyn",
-            "rev": "359b5a0e42c6dab618bb9bcf03ad3dfe3b2a3d12"
-        },
-        "recipe": {
-            "sha256": "088wc5fq4r5yj1nbh7mriyqf0xwqmbxvblj9d2wwrkkdm5flc8mj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3.2",
-        "deps": [
-            "dash",
-            "emacs",
-            "inf-ruby"
-        ]
-    },
-    "deft": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://jblevins.org/git/deft.git",
-            "sha256": "eb5c178337c0bd6a001114aac685bb0d23167050970274203d93c1c0caece1e8",
-            "rev": "4001a55cf5f79cdbfa00f1405e8a4645af4acd40"
-        },
-        "recipe": {
-            "sha256": "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7",
-        "deps": []
-    },
-    "autodisass-java-bytecode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gbalats",
-            "repo": "autodisass-java-bytecode",
-            "sha256": "1pf2mwnicj5x2kksxwmrzz2vfxj9y9r6rzgc1fl8028mfrmrmg8s",
-            "rev": "3d61dbe266133c950b39e880f78d142751c7dc4c"
-        },
-        "recipe": {
-            "sha256": "1k19nkbxnysm3qkpdhz4gv2x9nnrp94xl40x84q8n84s6xaan4dc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3",
-        "deps": []
-    },
-    "helm-bundle-show": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "masutaka",
-            "repo": "emacs-helm-bundle-show",
-            "sha256": "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30",
-            "rev": "b34523aa8a7f82ed9a1bf3643c35b65866a7877a"
-        },
-        "recipe": {
-            "sha256": "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.5",
-        "deps": [
-            "helm"
-        ]
-    },
-    "irony": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Sarcasm",
-            "repo": "irony-mode",
-            "sha256": "1wsh72dzm54srxdnlhnmbi8llc30syhbckycj5wmsamw8b89p7c2",
-            "rev": "9f0b33a5369806ba9c2f62238f64d6455a67af9e"
-        },
-        "recipe": {
-            "sha256": "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.2",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "swiper-helm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "swiper-helm",
-            "sha256": "1y2dbd3ikdpjvi8xz10jkrx2773h7cgr6jxm5b2bldm81lvi8x64",
-            "rev": "f3d6dba865629eed8fb14f92dab1fad50734891b"
-        },
-        "recipe": {
-            "sha256": "011ln6vny7z5vw67cpzldxf5n6sk2hjdkllyf7v6sf4m62ws93ph",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "emacs",
-            "helm",
-            "swiper"
-        ]
-    },
-    "e2wm-sww": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "e2wm-sww",
-            "sha256": "0mz43mwcgyc1c9p9b7nflnjxdxjm2nxbhl0scj6llzphikicr35g",
-            "rev": "1063f9854bd34db5ac771cd1036cecc89834729d"
-        },
-        "recipe": {
-            "sha256": "0x45j62cjivf9v7jp1b41yya3f9akp92md6cbv0v7bwz98g2vsk8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.2",
-        "deps": [
-            "e2wm"
-        ]
-    },
-    "wisp-mode": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/ArneBab/wisp",
-            "sha256": "0ppj8mrlc20i2syyiwvj5rp53swrm929h0ksxxlqvn3nvl9gsajd",
-            "rev": "34fc6f12d740"
-        },
-        "recipe": {
-            "sha256": "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.0",
-        "deps": []
-    },
-    "syntactic-sugar": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "syntactic-sugar",
-            "sha256": "1pn69f4w48jdj3wd1myj6qq2mhvygmlzbq2dws2qkjlp3kbwa6da",
-            "rev": "06d943c6ad9507603bb6ab6d37be2d359d0763a9"
-        },
-        "recipe": {
-            "sha256": "12b2vpvz5h4wzxrk8jrbgc8v0w6bzzvxcyfs083fi1791qq1rw7r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.4",
-        "deps": []
-    },
-    "smartrep": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "myuhe",
-            "repo": "smartrep.el",
-            "sha256": "0j5lg9gryl8vbzw8d3r2fl0c9wxa0c193mcvdfidd25b98wccc3f",
-            "rev": "0b73bf3d1a3c795671bfee0a36cecfaa54729446"
-        },
-        "recipe": {
-            "sha256": "1ypls52d51lcqhz737rqg73c6jwl6q8b3bwb29z51swyamf37rbn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": []
-    },
-    "prodigy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "prodigy.el",
-            "sha256": "0r32rjfsbna0g2376gdv0c0im1lzw1cwbp9690rgqjj95ls4saa3",
-            "rev": "7034873908a616853b3a65258a7580a3b402e8a2"
-        },
-        "recipe": {
-            "sha256": "032868bgy2wmb2ws48lfibs4118inpna7mmml8m7i4m4y9ll6g85",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.0",
-        "deps": [
-            "dash",
-            "emacs",
-            "f",
-            "s"
-        ]
-    },
-    "scss-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "antonj",
-            "repo": "scss-mode",
-            "sha256": "0zpjf9cp8g4rgnwgmhlpwnanf9lzqm3rm1mkihf0gk5qzxvwsdh9",
-            "rev": "d663069667d9b158d56e863b80dd4cc02984e49f"
-        },
-        "recipe": {
-            "sha256": "1g27xnp6bjaicxjlb9m0njc6fg962j3hlvvzmxvmyk7gsdgcgpkv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.0",
-        "deps": []
-    },
-    "buttercup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jorgenschaefer",
-            "repo": "emacs-buttercup",
-            "sha256": "1qqy8rmx7d62hf6a8j9d5gc49mvhllgyi7rfpilqiwnfpxs8gxgl",
-            "rev": "d7ab5923f26bb4d2af4d2489ae3e4fb27fd08dc1"
-        },
-        "recipe": {
-            "sha256": "1grrrdk5pl9l1jvnwzl8g0102gipvxb5qn6k2nmv28jpl57v8dkb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2",
-        "deps": []
-    },
-    "emms-player-mpv": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dochang",
-            "repo": "emms-player-mpv",
-            "sha256": "1yy4dmjp53l2df5qix31g4vizhv80wm88vjqq6qqa9p822732n0m",
-            "rev": "a1be1d266530ede3780dd69a7243d898f1016127"
-        },
-        "recipe": {
-            "sha256": "175rmqx3bgys4chw8ylyf9rk07sg0llwbs9ivrv2d3ayhcz1lg9y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.7",
-        "deps": [
-            "emms"
-        ]
-    },
-    "kibit-helper": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "brunchboy",
-            "repo": "kibit-helper",
-            "sha256": "0ky167xh1hrmqsldybzjhyqjizgjzs1grn5mf8sm2j9qwcvjw2zv",
-            "rev": "ec5f154db3bb0c838e86f527353f08644cede926"
-        },
-        "recipe": {
-            "sha256": "15viybjqksylvm5ash2kzsil0cpdka56wj1rryixa8y1bwlj8y4s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "emacs",
-            "s"
-        ]
-    },
-    "slime": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "slime",
-            "repo": "slime",
-            "sha256": "10ydinwsm7m5jlggynhsihxl18zl8cph4rliic8i72hjc3nhqfmy",
-            "rev": "da7c32d0c54a6f2d9a4be0662c7b2d576b11eda1"
-        },
-        "recipe": {
-            "sha256": "04zcvjg0bbx5mdbsk9yn7rlprakl89dq6jmnq5v2g0n6q0mh6ign",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.15",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "define-word": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "define-word",
-            "sha256": "1lyqd9cgj7cb2lasf6ycw5j8wnsx2nrfm8ra4sg3dgcspm01a89g",
-            "rev": "38e2f94779652fc6280a51b68dc910431513a8e1"
-        },
-        "recipe": {
-            "sha256": "035fdfwnxw0mir1dyvrimygx2gafcgnvlcsmwmry1rsfh39n5b9a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "ecukes": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ecukes",
-            "repo": "ecukes",
-            "sha256": "1r5hlcspznvfm111l1z0r4isd582qj64sa8cqk6hyi3y1hyp1xxs",
-            "rev": "2bba6266a3fff772cd54a6cd1b1aee2c36872aa5"
-        },
-        "recipe": {
-            "sha256": "0ava8hrc7r1mzv6xgbrb84qak5xrf6fj8g9qr4i4g0cr7843nrw0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.15",
-        "deps": [
-            "ansi",
-            "commander",
-            "dash",
-            "espuds",
-            "f",
-            "s"
-        ]
-    },
-    "shell-switcher": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DamienCassou",
-            "repo": "shell-switcher",
-            "sha256": "0ia7sdip4hl27avckv3qpqgm3k4ynvp3xxq1cy53bqfzzx0gcria",
-            "rev": "2c5575ae859a82041a4bacd1793b844bfc24c34f"
-        },
-        "recipe": {
-            "sha256": "07g9naiv2jk9jxwjywrbb05dy0pbfdx6g8pkra38rn3vqrjzvhyx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.1",
-        "deps": []
-    },
-    "dash": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "dash.el",
-            "sha256": "1njv5adcm96kdch0jb941l8pm51yfdx7mlz83y0pq6jlzjs9mwaa",
-            "rev": "fec6f5480d0ce03ead0e6117ac77dc7e757e76f8"
-        },
-        "recipe": {
-            "sha256": "0azm47900bk2frpjsgy108fr3p1jk4h9kmp4b5j5pibgsm26azgz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.12.1",
-        "deps": []
-    },
-    "haml-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nex3",
-            "repo": "haml-mode",
-            "sha256": "0fmr7ji8x5ki9fzybpbg3xbhzws6n7ffk7d0zf9jl1x3jd8d6988",
-            "rev": "5e0baf7b795b9e41ac03b55f8feff6b51027c43b"
-        },
-        "recipe": {
-            "sha256": "0ih0m7zr6kgn6zd45zbp1jgs1ydc5i5gmq6l080wma83v5w1436f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "3.1.9",
-        "deps": [
-            "ruby-mode"
-        ]
-    },
-    "helm-github-stars": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Sliim",
-            "repo": "helm-github-stars",
-            "sha256": "1sbhh3dmb47sy3r2iw6vmvbq5bpjac4xdg8i5a0m0c392a38nfqn",
-            "rev": "9211be3fbb65ca8819e0d1a54524ed8abbfaa4fa"
-        },
-        "recipe": {
-            "sha256": "1r4mc4v71171sq9rbbhm346s92fb7jnvvl91y2q52jqmrnzzl9zy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3.2",
-        "deps": [
-            "emacs",
-            "helm"
-        ]
-    },
-    "elmine": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "leoc",
-            "repo": "elmine",
-            "sha256": "080nnw6ddsczbm7gk50x4dkahi77fsybfiki5iyp39fjpa7lfzq3",
-            "rev": "091f61c70c9e7630a74b7b127488051d143a35e7"
-        },
-        "recipe": {
-            "sha256": "1gi94dyz9x50swkvryd4vj36rqgz4s58nrb4h4vwwviiiqmc8fvz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": []
-    },
-    "ace-jump-zap": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "waymondo",
-            "repo": "ace-jump-zap",
-            "sha256": "0yng6qayzqadk4cdviri84ghld4can35q134hm3n3j3vprhpbmca",
-            "rev": "0acdd83a5abd59606495e67a4ee01f7856e5d359"
-        },
-        "recipe": {
-            "sha256": "07bkmly3lvlbby2m13nj3m1q0gcnwy5sas7d6ws6vr9jh0d36byb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "ace-jump-mode",
-            "dash"
-        ]
-    },
-    "smeargle": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-smeargle",
-            "sha256": "1pcpg3lalbrc24z3vwcaysps8dbdzmncdgqdd5ig6yk2a9wyj9ng",
-            "rev": "fe0494bb859ea51800d6e7ae7d9eda2fe98e0097"
-        },
-        "recipe": {
-            "sha256": "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "epc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "kiwanami",
-            "repo": "emacs-epc",
-            "sha256": "05r2m7zghbdrgscg0x78jnhk1g6fq8iylar4cx699zm6pzvlq98z",
-            "rev": "152e6e10a79b56ebc7568054589cf6c3c44595c7"
-        },
-        "recipe": {
-            "sha256": "1l9rcx07pa4b9z5654gyw6b64c95lcigzg15amphwr56v2g3rbzx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "concurrent",
-            "ctable"
-        ]
-    },
-    "suomalainen-kalenteri": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tlikonen",
-            "repo": "suomalainen-kalenteri",
-            "sha256": "1b637p2cyc8a83qv9vba4yamzhk08f62zykqh5p35jwvym8wkann",
-            "rev": "b7991cb35624ebc04a89bbe759d40f186c9c097e"
-        },
-        "recipe": {
-            "sha256": "1wzijbgcr3jc47ccr7nrdkqha16s6gw0xiccnmdczi48cvnvvlkh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2015.11.29",
-        "deps": []
-    },
-    "init-loader": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-jp",
-            "repo": "init-loader",
-            "sha256": "031vb7ndz68x0119v4pyizz0ykd341ywcp5s7i4z35zx1vcqj8az",
-            "rev": "128ee76adbf431f0b8c30a3a29cb20c9c5100cde"
-        },
-        "recipe": {
-            "sha256": "0rq7759abp0ml0l8dycvdl0j5wsxw9z5y9pyx68973a4ssbx2i0r",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": []
-    },
-    "session": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacsorphanage",
-            "repo": "session",
-            "sha256": "0sp952abz7dkq8b8kkzzmnwnkq5w15zsx5dr3h8lzxb92lnank9v",
-            "rev": "19ea0806873daac3539a4b956e15655e99e3dd6c"
-        },
-        "recipe": {
-            "sha256": "0fghxbnf1d5iyrx1q8xd0lbw9nvkdgg2v2f89j6apnawisrsbhwx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.3.1",
-        "deps": []
-    },
-    "bundler": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tobiassvn",
-            "repo": "bundler.el",
-            "sha256": "18d74nwcpk1i8adxzfwz1lgqqcxsc4wkrb490v64pph79dxsi80h",
-            "rev": "4cb4fafe092d587cc9e58ff61cf900fb7f409adf"
-        },
-        "recipe": {
-            "sha256": "0i5ybc6i8ackxpaa75kwrg44zdq3jkvy48c42vaaafpddjwjnsy4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.0",
-        "deps": [
-            "inf-ruby"
-        ]
-    },
-    "jsfmt": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "brettlangdon",
-            "repo": "jsfmt.el",
-            "sha256": "0pjmslxwmlb9cb3j5qfsyxq1lg1ywzw1p9dvj330c2m7nla1j70x",
-            "rev": "c5d9742872509143db0250a77db705ef78f02cd0"
-        },
-        "recipe": {
-            "sha256": "1syy32sv2d57b3gja0ly65h36mfnyq6hzf5lnnl3r58yvbdzngqd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": []
-    },
-    "go-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dominikh",
-            "repo": "go-mode.el",
-            "sha256": "1qqsck11v3ki18qld7hrb7dis60c2ylmq15s7srsppzwil8wm3fx",
-            "rev": "dce210fdde620bed3d179816fda79dc83a66b8de"
-        },
-        "recipe": {
-            "sha256": "1852zjxandmq0cpbf7m56ar3rbdi7bx613gdgsf1bg8hsdvkgzfx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3.1",
-        "deps": []
-    },
-    "xtest": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "promethial",
-            "repo": "xtest",
-            "sha256": "1wqx6hlqcmqiljydih5fx89dw06g8w728pyn4iqsap8jwgjngb09",
-            "rev": "b227414d714e7baddef79bd306a43024b9a34d45"
-        },
-        "recipe": {
-            "sha256": "1vbs4sb4frzg8d3l96ip9cc6lc86nbj50vpdfqazvxmdfd1sg4i7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.0",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "noccur": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "NicolasPetton",
-            "repo": "noccur.el",
-            "sha256": "0wk86gm0by9c8mfbvydz5va07qd30n6wx067inqfa7wjffaq0xr7",
-            "rev": "6cc02ce07178a61ae38a849f80472c01969272bc"
-        },
-        "recipe": {
-            "sha256": "0a8l50v09bgap7rsls808k9wyjpjbcxaffsvz7hh9rw9s7m5fz5g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": []
-    },
-    "lispyscript-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "krisajenkins",
-            "repo": "lispyscript-mode",
-            "sha256": "0qyj04p63fdh3iasp5cna1z5fhibmfyl9lvwyh22ajzsfbr3nhnk",
-            "rev": "9a4200085e2a15725a58616d131a56f5edce214b"
-        },
-        "recipe": {
-            "sha256": "02biai45l5xl2m9l1drphrlj6r01msmadhyg774ijdk1x4gm5nhr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.5",
-        "deps": []
-    },
-    "latex-math-preview": {
-        "fetch": {
-            "tag": "fetchFromGitLab",
-            "owner": "latex-math-preview",
-            "repo": "latex-math-preview",
-            "sha256": "0pa6b7r0671zz3gp3fp8zjjk6s590fj5rkgbg34czd82w60rd91b",
-            "rev": "863e68481e76121ca4653aba50e97e48fe11a052"
-        },
-        "recipe": {
-            "sha256": "14bn0q5czrrkb1vjdkwx6f2x4zwjkxgrc0bcncv23l13qls1gkmr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7.1",
-        "deps": []
-    },
-    "ac-anaconda": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "proofit404",
-            "repo": "ac-anaconda",
-            "sha256": "0vrd6g9cl02jjxrjxpshq4pd748b5xszhpmakywrw8s08nh8jf44",
-            "rev": "d0dec5c026235f65f9fd6594540df8886ed1b6a8"
-        },
-        "recipe": {
-            "sha256": "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "anaconda-mode",
-            "auto-complete",
-            "dash"
-        ]
-    },
-    "magit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "magit",
-            "sha256": "01x9kahr3szzc00wlfrihl4x28yrq065fq4rpzx9dxiksayk24pd",
-            "rev": "16a7a12c44d63e78e9b223fca7c1c23a144d3ef1"
-        },
-        "recipe": {
-            "sha256": "0kcx8pqzvl7xgx7f8q7xck83ghkx6cjsa2nczxj1virap1nkfhkw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.3.1",
-        "deps": [
-            "async",
-            "dash",
-            "emacs",
-            "git-commit",
-            "magit-popup",
-            "with-editor"
-        ]
-    },
-    "sly": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "capitaomorte",
-            "repo": "sly",
-            "sha256": "1aihr5pbdqjb5j6xsghi7qbrmp46kddv76xmyx5z98m93n70wzqf",
-            "rev": "1942c53fc40fd6ace0e822b5c9bf551f59061f32"
-        },
-        "recipe": {
-            "sha256": "1pmyqjk8fdlzwvrlx8h6fq0savksfny78fhmr8r7b07pi20y6n9l",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.14",
-        "deps": []
-    },
-    "magit-stgit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "magit-stgit",
-            "sha256": "1mk8g8rr9vf8jm0mmsj33p8gc71nhlv3847hvqywy6z40nhcjnyb",
-            "rev": "d1793345a8d32b2c509077d634ca73148a68de4b"
-        },
-        "recipe": {
-            "sha256": "12wg1ig2jzy2np76brpwxdix9pwv75chviq3c24qyv4y80pd11sv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.1.2",
-        "deps": [
-            "emacs",
-            "magit"
-        ]
-    },
-    "shelltest-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rtrn",
-            "repo": "shelltest-mode",
-            "sha256": "0mn7bwvj1yv75a2531jp929j6ypckdfqdg6b5ig0kkbcrrwb7kxs",
-            "rev": "fead97c7ff1b39715ec033a793de41176f1788f5"
-        },
-        "recipe": {
-            "sha256": "1inb0vq34fbwkr0jg4dv2lljag8djggi8kyssrzhfawri50m81nh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": []
-    },
-    "tagedit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "tagedit",
-            "sha256": "0kq40g46s8kgiafrhdq99h79rz9h5fvgz59k7ralmf86bl4sdmdb",
-            "rev": "3fcf54b824b75c5ad68f5438d5638103049a389f"
-        },
-        "recipe": {
-            "sha256": "0vfkbrxmrw4fwdz324s734zxdxm2nj3df6i8m6lgb9pizqyp2g6z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.4.0",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "navi-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tj64",
-            "repo": "navi",
-            "sha256": "15jh1lsgqfnpbmrikm8kdh5bj60yb96f2as2anppjjsgl6w96glh",
-            "rev": "5c979b3b3873b0e67751a1321a9e271d066f2022"
-        },
-        "recipe": {
-            "sha256": "0f5db983w9kxq8mcjr22zfrm7cpxydml4viac62lvab2kwbpbrmi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.0",
-        "deps": []
-    },
-    "flymake-sass": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "flymake-sass",
-            "sha256": "0c74qdgy9c4hv3nyjnbqdzypbg9399vq3p5ngp5lasc7iz6vi0h8",
-            "rev": "1c7664818db539de7f3dab396c013528a3f5b8b4"
-        },
-        "recipe": {
-            "sha256": "0sz6n5r9pdphgvvaljg9zdwj3dqayaxzxmb4s8x4b05c8yx3ba0d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6",
-        "deps": [
-            "flymake-easy"
-        ]
-    },
-    "sackspace": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cofi",
-            "repo": "sackspace.el",
-            "sha256": "06gqqbkn85l2p05whmr4wkg9axqyzb7r7sgm3r8wfshm99kgpxvl",
-            "rev": "fd0480eaaf6d3d11fd30ac5feb2da2f4f7572708"
-        },
-        "recipe": {
-            "sha256": "1m10iw83k6m7v7sg2dxzdy83zxq6svk8h9fh4ankyn3baqrdxg5z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8.2",
-        "deps": []
-    },
-    "org2blog": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "punchagan",
-            "repo": "org2blog",
-            "sha256": "0av1477jn3s4s5kymd7sbb0av437vb5mnfc6rpfgzwji7b8mfr7l",
-            "rev": "ad389ae994d269a57e56fbea68df7e6fe5c2ff55"
-        },
-        "recipe": {
-            "sha256": "0ancvn4ji4552k4nfd2ijclsd027am93ngg241ll8f6h6k0wpmzq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.2",
-        "deps": [
-            "metaweblog",
-            "org",
-            "xml-rpc"
-        ]
-    },
-    "mhc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "yoshinari-nomura",
-            "repo": "mhc",
-            "sha256": "1bp4xqklf422n0zwwyj0ag3a4nndg8klazrga6rlvpy01hgg3drl",
-            "rev": "46d2a983b77b3139c9694ffba16ae875edc7d5b0"
-        },
-        "recipe": {
-            "sha256": "02ikn9hx0kcfc2xrx4f38zpkfi6vgz7chcxk6q5d0vcsp93b4lql",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.1",
-        "deps": [
-            "calfw"
-        ]
-    },
-    "company-ghc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "iquiw",
-            "repo": "company-ghc",
-            "sha256": "0y9i0q37xjbnlnlxq7xjvnpn6ykzbd55g6nbw10z1wg0m2v7f96r",
-            "rev": "64e4f9d0cf9377138a8dee34c69e7d578fd71090"
-        },
-        "recipe": {
-            "sha256": "07adykza4dqs64bk8vjmgryr54khxmcy28hms5z8i1qpsk9vmvnn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.0",
-        "deps": [
-            "cl-lib",
-            "company",
-            "emacs",
-            "ghc"
-        ]
-    },
-    "evil": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/lyro/evil",
-            "sha256": "0m1nd5v0f72lvispjrsfph8iyv2z7gsf8awwmfdghag348bmvjn3",
-            "rev": "73ad80e8fea1"
-        },
-        "recipe": {
-            "sha256": "09qrhy7l229w0qk3ba1i2xg4vqz8525v8scrbm031lqp30jp54hc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2.8",
-        "deps": [
-            "goto-chg",
-            "undo-tree"
-        ]
-    },
-    "ruby-end": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "ruby-end",
-            "sha256": "1cpz9vkp57nk682c5xm20g7bfj5g2aq5ahpk4nhgx7pvd3xvr1ds",
-            "rev": "648b81af136a581bcef387744d93c011d9cdf54b"
-        },
-        "recipe": {
-            "sha256": "0cx121hji8ws6s3p2xfdgidm363y05g2n880fqrmzyz27cqkljis",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4.1",
-        "deps": []
-    },
-    "f": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rejeep",
-            "repo": "f.el",
-            "sha256": "13issmwp77mswrqwhx2qcyxavv68x7lrql5za5cz24yzzy6zrp2x",
-            "rev": "7003428ead6d80e81ff14c3614239efdbce7391b"
-        },
-        "recipe": {
-            "sha256": "0s7fqav0dc9g4y5kqjjyqjs90gi34cahaxyx2s0kf9fwcgn23ja2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.18.0",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "ac-cider": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "clojure-emacs",
-            "repo": "ac-cider",
-            "sha256": "1vpj0lxbvlxffj2z29l109w70hcphiavyvglsw524agxql3c8yf9",
-            "rev": "0dcb8e3028f9f658cacbe1ac3e99b02575e2ecd4"
-        },
-        "recipe": {
-            "sha256": "1dszpb706h34miq2bxqyq1ycbran5ax36vcniwp8vvhgcjsw5sz6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.1",
-        "deps": [
-            "auto-complete",
-            "cider",
-            "cl-lib"
-        ]
-    },
-    "project-root": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/piranha/project-root",
-            "sha256": "08dd2y6hdsj1rxcqa2hnjypnn9c2z43y7z2hz0fi4vny547qybz8",
-            "rev": "fcd9df2eadca"
-        },
-        "recipe": {
-            "sha256": "0xjir204zk254y2x70k9vqwirx2ljmrikpsgn5kn170d1bxvhwmb",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7",
-        "deps": []
-    },
-    "sound-wav": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-sound-wav",
-            "sha256": "0q2ragq4hw89d3w48ykwljb19n2nhz8z6bsmb10shimaf203652g",
-            "rev": "215e23b118fba11a7132b7c79326ad0a723e2605"
-        },
-        "recipe": {
-            "sha256": "1vrwzk6zqma7r0w5ivbx16shys6hsifj52fwlf5rxs6jg1gqdb4f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": [
-            "cl-lib",
-            "deferred"
-        ]
-    },
-    "psession": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thierryvolpiatto",
-            "repo": "psession",
-            "sha256": "0msa8c29djhy5h3zpdvx25f4y1c50rgsk8iz6r127psrxdlfrvg8",
-            "rev": "138b27f57bdc3ff53ec5896439e8ed00294a5ea2"
-        },
-        "recipe": {
-            "sha256": "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "elfeed-web": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "elfeed",
-            "sha256": "1ln0wprk8m2d33z804ld73jwv9x51xkwl9xfsywbh09w3x2zb51j",
-            "rev": "9fd3cf8833e26bf41f52a7e2149734858d2eeb96"
-        },
-        "recipe": {
-            "sha256": "14ydwvjjc6wbhkj4g4xdh0c3nh4asqsz8ln7my5vjib881vmaq1n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.4.0",
-        "deps": [
-            "elfeed",
-            "emacs",
-            "simple-httpd"
-        ]
-    },
-    "cljr-helm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "philjackson",
-            "repo": "cljr-helm",
-            "sha256": "18gv8vmmpiyq16cq4nr9nk2bmc5y2rsv21wjl4ji29rc7566shha",
-            "rev": "916d070503d0f484f36626c7a42f156b737e3fab"
-        },
-        "recipe": {
-            "sha256": "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7",
-        "deps": [
-            "clj-refactor",
-            "helm"
-        ]
-    },
-    "ansible": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k1LoW",
-            "repo": "emacs-ansible",
-            "sha256": "03d240jngxw51ybrsjw8kdxygrr0ymdckzwga2jr1bqf26v559j2",
-            "rev": "e9b9431738de4808d8ef70871069f68885cc0d98"
-        },
-        "recipe": {
-            "sha256": "1xdc05fdglqfbizra6s1zl6knnvaq526dkxqnw9g7w269j8f4z8g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "f",
-            "s"
-        ]
-    },
-    "japanlaw": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "japanlaw.el",
-            "sha256": "08gkxxaw789g1r0dql11skz6i8bdrrz4wp87fzs9f5rgx99xxr6h",
-            "rev": "d90b204b018893d5d75286c92948c0bddf94cce2"
-        },
-        "recipe": {
-            "sha256": "1pxss1mjk5660k80r1xqgslnbrsr6r4apgp9abjwjfxpg4f6d0sa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.1",
-        "deps": []
-    },
-    "link-hint": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "noctuid",
-            "repo": "link-hint.el",
-            "sha256": "1v4fadxv7ym6lc09nd2xpz2k5vrikjv7annw99ii5cqrwhqa5838",
-            "rev": "d26b5330e6e42b4bed4e4730054b4c5e308ceab2"
-        },
-        "recipe": {
-            "sha256": "12fb2zm9jnh92fc2nzmzmwjlhi64rhakwbh9lsydx9svsvkgcs89",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "git-commit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "magit",
-            "sha256": "01x9kahr3szzc00wlfrihl4x28yrq065fq4rpzx9dxiksayk24pd",
-            "rev": "16a7a12c44d63e78e9b223fca7c1c23a144d3ef1"
-        },
-        "recipe": {
-            "sha256": "1i7122fydqga68cilgzir80xfq77hnrw75zrvn52mjymfli6aza2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.3.1",
-        "deps": [
-            "dash",
-            "emacs",
-            "with-editor"
-        ]
-    },
-    "json-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "joshwnj",
-            "repo": "json-mode",
-            "sha256": "0sxkp9m68rvff8dbr8jlsx85w5ngifn19lwhcydysm7grbwzrdi3",
-            "rev": "ce275e004dc7265047a80dec68b24eb058b200f0"
-        },
-        "recipe": {
-            "sha256": "014j10wgxsqy6d6aksnkz2dr5cmpsi8c7v4a825si1vgb4622a70",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.6.0",
-        "deps": [
-            "json-reformat",
-            "json-snatcher"
-        ]
-    },
-    "fountain-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rnkn",
-            "repo": "fountain-mode",
-            "sha256": "0yycn339vqglny1bs4c8jsaf85cyj0rzzn8wzsf5k5srh9yivzdq",
-            "rev": "167238b3cdd5e510300abe3afd02b820f026b501"
-        },
-        "recipe": {
-            "sha256": "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.5.0",
-        "deps": [
-            "s"
-        ]
-    },
-    "ace-jump-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "winterTTr",
-            "repo": "ace-jump-mode",
-            "sha256": "1bwvzh056ls2v7y26a0s4j5mj582dmds04lx4x6iqihs04ss74bb",
-            "rev": "a62a6867811cd739dd98a5e00a2d2e17edfb5b71"
-        },
-        "recipe": {
-            "sha256": "0yk0kppjyblr5wamncrjm3ym3n8jcl0r0g0cbnwni89smvpngij6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.0",
-        "deps": []
-    },
-    "ob-translate": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "krisajenkins",
-            "repo": "ob-translate",
-            "sha256": "10hm20dzhkxk61ass3bd5gdn1bs2l60y3zjnpkxinzn7m6aaniia",
-            "rev": "6b39cc1a94a1071107a4391684b1bffb5b9826f3"
-        },
-        "recipe": {
-            "sha256": "1hi0rxbyxvk9sbk2fy3kqw7l4lgri921vya1mn4i1q2i1979r2gz",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.2",
-        "deps": [
-            "google-translate",
-            "org"
-        ]
-    },
-    "default-text-scale": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "default-text-scale",
-            "sha256": "031f8ls1q80j717cg6b4pjd37wk7vrl5hcycsn8ca7yssmqa8q81",
-            "rev": "c90c08b9fe5f25474067a00c4a4babdb413b25b1"
-        },
-        "recipe": {
-            "sha256": "18r90ic38fnlsbg4gi3r962vban398x2bf3rqhrc6z4jk4aiv3mi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "shm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chrisdone",
-            "repo": "structured-haskell-mode",
-            "sha256": "1vf766ja8f4xp1f5pmwgz6a85km0nxvc5dn571lwidfrrdbr9rkk",
-            "rev": "8abc5cd73e59ea85bef906e14e87dc388c4f350f"
-        },
-        "recipe": {
-            "sha256": "1qmp8cc83dcz25xbyqd4987i0d8ywvh16wq2wfs4km3ia8a2vi3c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.20",
-        "deps": []
-    },
-    "git-gutter-fringe": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-git-gutter-fringe",
-            "sha256": "1cw5x1w14lxy8mqpxdrd9brgps0nig2prjjjda4a19wfsvy3clmv",
-            "rev": "3efa997ec8330d3e408a225616273d1d40327aec"
-        },
-        "recipe": {
-            "sha256": "14wyiyyi2rram2sz3habvmygy5a5m2jfi6x9fqcyfr3vpcjn1k4i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.22",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "fringe-helper",
-            "git-gutter"
-        ]
-    },
-    "flyspell-lazy": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rolandwalker",
-            "repo": "flyspell-lazy",
-            "sha256": "1g09s57b773nm9xqslzbin5i2h18k55nx00s5nnkvx1qg0n0mzkm",
-            "rev": "31786fe04a4732d2f845e1c7e96fcb030182ef10"
-        },
-        "recipe": {
-            "sha256": "0lzazrhsfh5m7n57dzx0v46d5mg87wpwwkjzf5j9gpv1mc1xfg1y",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.6.10",
-        "deps": []
-    },
-    "insert-shebang": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "psachin",
-            "repo": "insert-shebang",
-            "sha256": "1mqnz40zirnyn3wa71wzzjph3a0sbgvzcywcr7xnzqpl6sp7g93f",
-            "rev": "4161cc8c7d07d0979684838fa8e3eec582351d97"
-        },
-        "recipe": {
-            "sha256": "0z88l1q925v9lwzr6nas9qjy0f57qxilg6smgpx9wj6lll3f7p5v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.4",
-        "deps": []
-    },
-    "anything-exuberant-ctags": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "k1LoW",
-            "repo": "anything-exuberant-ctags",
-            "sha256": "01lw9159axg5w9bpdy55m4zc902zmsqvk213ky1nmgnln0fvq3rd",
-            "rev": "97fa91eb04df11bdf4558fe7bb2f6aebf8be0d6c"
-        },
-        "recipe": {
-            "sha256": "0p0jq2ggdgaxv2gd9m5iza0y3mjjc82xmgp899yr15pfffa4wihk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.2",
-        "deps": [
-            "anything"
-        ]
-    },
-    "py-autopep8": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "paetzke",
-            "repo": "py-autopep8.el",
-            "sha256": "06xdq2slwhkcqlbv7x86zmv55drzif9cwjlj543cwhncphl2x9rd",
-            "rev": "685414b19106b99a4384fa0c9ce4817c659e0e81"
-        },
-        "recipe": {
-            "sha256": "1argjdmh0x9c90zkb6cr4z3zkpgjp2mkpsw0dr4v6gg83jcggfpp",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7.0",
-        "deps": []
-    },
-    "syntax-subword": {
-        "fetch": {
-            "tag": "fetchhg",
-            "url": "https://bitbucket.com/jpkotta/syntax-subword",
-            "sha256": "1p9bp09nibw7rra3r6nj496zdx09db6k82dxnxs1lfgdiswfdq2h",
-            "rev": "a1e0accb754d"
-        },
-        "recipe": {
-            "sha256": "1as89ffqz2h69fdwybgs5wibnrvskm7hd58vagfjkla9pjlpffpm",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": []
-    },
-    "nyan-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "TeMPOraL",
-            "repo": "nyan-mode",
-            "sha256": "14vd0f4y5l470hx7kg54sx3352459mhjnrh7jl822gkl8c904lmw",
-            "rev": "251d8f9c3686183294d76abcd816c8d69b6a71a3"
-        },
-        "recipe": {
-            "sha256": "1z2wnsbjllqa533g1ab5cgbv3d9hjix7fsd7z9c45nqh5cmadmyv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": []
-    },
-    "repeatable-motion": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "willghatch",
-            "repo": "emacs-repeatable-motion",
-            "sha256": "007lqahjbig6yygqik6fgbq114784z6l40a3vrc4qs9361zqizck",
-            "rev": "e664b0a4a3e39c4085378a28b5136b349a0afb22"
-        },
-        "recipe": {
-            "sha256": "12z4z8apd8ksf6dfvqm54l71mx68j0yg4hrjypa9p77fpcd6p0zw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "abc-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mkjunker",
-            "repo": "abc-mode",
-            "sha256": "13f4l9xzx4xm5m80kkb49zh31w0bn0kw9m5ca28rrx4aysqmwryv",
-            "rev": "6b5ab7402287dab5a091e94fec9982dc45d9d287"
-        },
-        "recipe": {
-            "sha256": "0qf5lbszyscmagiqhc0d05vzkhdky7ini4w33z1h3j5417sscrcx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20140225.944",
-        "deps": []
-    },
-    "enotify": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "laynor",
-            "repo": "enotify",
-            "sha256": "1in4wbwkxn8qfcsfjbczzk73z74w4ixlml61wk666dw0kpscgbs5",
-            "rev": "75c84b53703e5d52cb18acc9251b87ffa400f388"
-        },
-        "recipe": {
-            "sha256": "0mii6m6zw9y8njgzi79rcf1n251iw7qz3yqjjij3c19rk3zpm5qi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.3",
-        "deps": []
-    },
-    "org-outlook": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mattfidler",
-            "repo": "org-outlook.el",
-            "sha256": "15fy6xpz6mk4j3nkrhiqal2dp77rhxmk8a7xiw037xr1jgq9sd9a",
-            "rev": "070c37d017ccb71d94c3c69c99632fa6570ec2cc"
-        },
-        "recipe": {
-            "sha256": "0cn8h6yy67jr5h1yxsfqmr8q7ii4f99pgghfp821m01pj55qyjx9",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.11",
-        "deps": []
-    },
-    "kill-ring-search": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nschum",
-            "repo": "kill-ring-search.el",
-            "sha256": "0axvhikhg4fikiz4ifg0p4a5ygphbpjs0wd0gcbx29n0y54d1i93",
-            "rev": "3a5bc1767f742c91aa788df79ecec836a0946edb"
-        },
-        "recipe": {
-            "sha256": "1pg4j1rrji64rrdv2xpwz33vlyk8r0hz4j4fikzwpbcbmni3skan",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": []
-    },
-    "scala-outline-popup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ancane",
-            "repo": "scala-outline-popup",
-            "sha256": "0hhsgyil8aqdkkip5325yrdq89gnijglcbf1dsvl4wvnmq7a1rik",
-            "rev": "c79a06fb99cbf6f29d94da77a8a22cfafb15a1b6"
-        },
-        "recipe": {
-            "sha256": "1fq0k6l57wkya1ycm4cc190kg90j2k9clnl0sc70achp4i47qbk7",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": [
-            "dash",
-            "flx-ido",
-            "popup",
-            "scala-mode2"
-        ]
-    },
-    "smart-tabs-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jcsalomon",
-            "repo": "smarttabs",
-            "sha256": "1kfihh4s8578cwqyzn5kp3iib7f9vvg6rfc3klqzgads187ryd4z",
-            "rev": "8b196d596b331f03fba0efdb4e31d2fd0752c4a7"
-        },
-        "recipe": {
-            "sha256": "1fmbi0ypzhsizzb1vm92hfaq23swiyiqvg0pmibavzqyc9lczhhl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "amd-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "NicolasPetton",
-            "repo": "amd-mode.el",
-            "sha256": "00kfnkr0rclzbir2xxzr9wf2g0hf1alc004v8i9mqf3ab6dgdqiy",
-            "rev": "16500ccc16e98bf28395b576afa83ec7bcb7b101"
-        },
-        "recipe": {
-            "sha256": "17ry6vm5xlmdfs0mykdyn05cik38yswq5axdgn8hxrvvb6f58d06",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": [
-            "dash",
-            "f",
-            "js2-mode",
-            "js2-refactor",
-            "makey",
-            "projectile",
-            "s"
-        ]
-    },
-    "lua-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "immerrr",
-            "repo": "lua-mode",
-            "sha256": "1psk4202rmkkfy1ir1ax4x4djfngd5pfry7x30ybq2ifqzymb9qb",
-            "rev": "bdf121b2c05bc74d3d7961a91d7afeb6176e0f45"
-        },
-        "recipe": {
-            "sha256": "0gyi7w2h192h3pmrhq39lxwlwd9qyqs303lnp2655pikdzk9js94",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20151025",
-        "deps": []
-    },
-    "ace-window": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abo-abo",
-            "repo": "ace-window",
-            "sha256": "07mcdzjmgrqdvjs94f2n5bkrf5vrq2fwzz256wbm3wzqxqkfy1q6",
-            "rev": "eef897e590c4ce63c28fd29ebff3c97aec8a69ae"
-        },
-        "recipe": {
-            "sha256": "1k0x8m1phmvgdxb5aj841iai9q96a5lfq8i4b5vnlbc3w888n3xa",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.0",
-        "deps": [
-            "avy"
-        ]
-    },
-    "ace-popup-menu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mrkkrp",
-            "repo": "ace-popup-menu",
-            "sha256": "061gi4w43dvdys2i0ffc3bnzhrkc83h5x2c43yv4fwb3xz0zn9h0",
-            "rev": "eb8d0d938debdf89575d2ed204aeb7c0b52060b0"
-        },
-        "recipe": {
-            "sha256": "1cq1mpv7v98bqrpsm598krq1741b6rwih71cx3yjifpbagrv4m5s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "avy",
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "zoom-window": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-zoom-window",
-            "sha256": "1dwf3980rnwc85s73j8accwgpcdhsa6fqdrppbrqb8f7c05q8303",
-            "rev": "d92dcf265170cf8ea0294d1aaf2e6025eda228e6"
-        },
-        "recipe": {
-            "sha256": "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": []
-    },
-    "ghc-imported-from": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "david-christiansen",
-            "repo": "ghc-imported-from-el",
-            "sha256": "1ywwyc2kz1c1s26c412nmzh55cinh84cfiazyyi3jsy5zzwhrbhi",
-            "rev": "fcff08628a19f5d26151564659218cc677779b79"
-        },
-        "recipe": {
-            "sha256": "10cxz4c341lknyz4ns63bri00mya39278xav12c73if03llsyzy5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.2",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "company-emoji": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dunn",
-            "repo": "company-emoji",
-            "sha256": "1f8sjjms9kxni153pia6b45p2ih2mhm2r07d0j3fmxmz3q2jdldd",
-            "rev": "c77e9c6f87a7853787c70eae885e12b6162d4cc5"
-        },
-        "recipe": {
-            "sha256": "1mflqqw9gnfcqjb6g8ivdfl7s4mdyjg7j0457hamgyvgvpxsh8x3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.3.0",
-        "deps": [
-            "cl-lib",
-            "company"
-        ]
-    },
-    "graphene-meta-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rdallasgray",
-            "repo": "graphene-meta-theme",
-            "sha256": "1bidfn4x5lb6dylhadyf05g4l2k7jg83mi058cmv76av1glawk17",
-            "rev": "5d848233ac91c1e3560160a4eba60944f5837d35"
-        },
-        "recipe": {
-            "sha256": "1cqdr93lccdpxkzgap3r3qc92dh8vqgdlnxvqkw7lrcbs31fvf3q",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.2",
-        "deps": []
-    },
-    "e2wm-term": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "e2wm-term",
-            "sha256": "0qv3kh6q3q7vgfsd8x25x8agi3fp96dkpjnxdidkwk6k8h9n0jzw",
-            "rev": "65b5ac88043d5c4048920a048f3599904ca55981"
-        },
-        "recipe": {
-            "sha256": "0wrq06yap80a96l9l0hs7x7rng7sx6vi1hz778kknb6il4f2f45g",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.5",
-        "deps": [
-            "e2wm",
-            "log4e",
-            "yaxception"
-        ]
-    },
-    "x86-lookup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "skeeto",
-            "repo": "x86-lookup",
-            "sha256": "13id1vf590gc0kwkhh6mgq2gj2bra2kycxjlvql7v0s7cdvamjhq",
-            "rev": "cac42bd9f27bff92e0b1cf6fb20563061885239f"
-        },
-        "recipe": {
-            "sha256": "1clv1npvdkzsy0a08xrb880yflwzl4d5cc2c5xrs7b837mqpj8hd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "badwolf-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "bkruczyk",
-            "repo": "badwolf-emacs",
-            "sha256": "1plh7i4zhs5p7qkv7p7lnfrmkszn8b3znwvbxgp7wpxay5safc5j",
-            "rev": "24a557f92a702f632901a5b7bee59945a0a8cde9"
-        },
-        "recipe": {
-            "sha256": "03plkzpmlh0pgfp1c9padsh4w2g23clsznym8x4jabxnk0ynhq41",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "rspec-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pezra",
-            "repo": "rspec-mode",
-            "sha256": "0hrn5n7aaymwimk511kjij44vqaxbmhly1gwmlmsrnbvvma7f2mp",
-            "rev": "e289e52ec4b3aa1caf35957d721e5568eca2a3bb"
-        },
-        "recipe": {
-            "sha256": "0nyib9rx9w9cbsgkcjx9n8fp77xkzxg923z0rdm3f9kc7njcn0zx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.11",
-        "deps": [
-            "cl-lib",
-            "ruby-mode"
-        ]
-    },
-    "mb-url": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "dochang",
-            "repo": "mb-url",
-            "sha256": "1si2givpzihjb1szbcdm3iy9kkm7bj0hq10s0h2dfm8axdnlirm5",
-            "rev": "34234214d1e62b9980cc64dac582e6771c92638d"
-        },
-        "recipe": {
-            "sha256": "1nf8ssan00qsn3d4dc6h6qzdwqzh977qb5d2m33kiwi6qb98988h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.3",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "shell-toggle": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knu",
-            "repo": "shell-toggle.el",
-            "sha256": "0wvaa5nrbblayjvzjyj6cd942ywg7xz5d8fqaffxcvwlcdihvm7q",
-            "rev": "9820b0ad6f22c700759555aae8a454a7dc5a46b3"
-        },
-        "recipe": {
-            "sha256": "1ai0ks7smr8b221j9hmsikswpxqraa9b13fpwv4wwagavnlah446",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3.1",
-        "deps": []
-    },
-    "idomenu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "birkenfeld",
-            "repo": "idomenu",
-            "sha256": "0bq0kx0889rdy8aasxbpmb0a4awpk2b24zv6x1dmhacmc5rj11i0",
-            "rev": "5daaf7e06e4704ae43c825488109d7eb8c049321"
-        },
-        "recipe": {
-            "sha256": "0mg601ak9mhp2fg5n13npcfzphgyms4vkqd18ldmv098z2z1412h",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "goto-gem": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "pidu",
-            "repo": "goto-gem",
-            "sha256": "188q7jr1y872as3w32m8lf6vwl2by1ibgdk6zk7dhpcjwd0ik7x7",
-            "rev": "6f5bd405c096ef879fed1298c09d0daa0bae5dac"
-        },
-        "recipe": {
-            "sha256": "06vy9m01qccvahxr5xn0plzw9knl5ig7gi5q5r1smfx92bmzkg3a",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.2",
-        "deps": [
-            "s"
-        ]
-    },
-    "minibuffer-cua": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knu",
-            "repo": "minibuffer-cua.el",
-            "sha256": "07nbn2pwlp33kr136xsm6lzddhjs538xkz0fbays89psblmy4kwj",
-            "rev": "e8dcddc24d4f2e8d7987336fb58259e3cc78bbcb"
-        },
-        "recipe": {
-            "sha256": "1ragvr73ykbvpgynnq3z0z4yzrlfhfqlwc1vbxclb8x2xmxq7pzw",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": []
-    },
-    "yagist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "yagist.el",
-            "sha256": "0l9b888wv72j4hhkcfzsh09iqjxp2qjbjcjcfmvfhxf7il11pv8h",
-            "rev": "97723a34750ccab5439eb9f6a2f67e4e0e234167"
-        },
-        "recipe": {
-            "sha256": "1mz86fq0pb4w54c66vd19m2492mkrzq2qi6ssnn2xwmn8vv02wdd",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8.12",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "maxframe": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "rmm5t",
-            "repo": "maxframe.el",
-            "sha256": "08gbkd8wln89j9yxp0zzd539hbwy1db31gca3vxxrpszixx8280y",
-            "rev": "4f1dbbe68048864037eae277b9280b90fd701ff1"
-        },
-        "recipe": {
-            "sha256": "10cwy3gi3xb3pfdh6xiafxp3vvssawci3y26jda6550d0w5vardj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5",
-        "deps": []
-    },
-    "company-irony": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Sarcasm",
-            "repo": "company-irony",
-            "sha256": "1gdsaa8zcs3layivn3ndbd5z1zflblmbxl251ld67bq763ga49cz",
-            "rev": "29becb8824cacb1ea6f8c823d06ba65512c62e3d"
-        },
-        "recipe": {
-            "sha256": "15adamk1b9y1i6k06i5ahf1wn70cgwlhgk0x6fk8pl5izg05z1km",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "cl-lib",
-            "company",
-            "emacs",
-            "irony"
-        ]
-    },
-    "easy-kill": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "leoliu",
-            "repo": "easy-kill",
-            "sha256": "0r56nqrj6iaz57ys6hqdq5qkyliv7dj6dv274l228r7x0axrwd9m",
-            "rev": "e3b2442e2096cefff94ea8656e49af07fee58f47"
-        },
-        "recipe": {
-            "sha256": "10jcv7a4vcnaj3wkabip2xwzcwlmvdlqkl409a9lnzfasxcpf32i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.3",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "dired-imenu": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "DamienCassou",
-            "repo": "dired-imenu",
-            "sha256": "088h9yn6wndq4pq6f7q4iz17f9f4ci29z9nh595idljp3vwr7qid",
-            "rev": "610e21fe0988c85931d34894d3eee2442c79ab0a"
-        },
-        "recipe": {
-            "sha256": "09yix4fkr03jq6j2rmvyg6gkmcnraw49a8m9649r3m525qdnhxs1",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5.0",
-        "deps": []
-    },
-    "nix-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "NixOS",
-            "repo": "nix",
-            "sha256": "03kbdrar5w475qng4j7bbak5y6ipb7pgpxj3hblcn3pnvgh7whv6",
-            "rev": "71a5161365f40699092e491bbff88473237fc432"
-        },
-        "recipe": {
-            "sha256": "00rqawi8zs2x79c91gmk0anfyqbwalvfwmpak20i11lfzmdsza1s",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.10",
-        "deps": []
-    },
-    "angular-snippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magnars",
-            "repo": "angular-snippets.el",
-            "sha256": "0h9i0iimanbvhbqy0cj9na335rs961pvhxjj4k8y53qc73xm102a",
-            "rev": "8f737c2cf5fce758a7a3833ebad2952b5398568d"
-        },
-        "recipe": {
-            "sha256": "057phgizn1c6njvdfigb23ljs31knq247gr0rcpqfrdaxsnnzm5c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.3",
-        "deps": [
-            "dash",
-            "s"
-        ]
-    },
-    "emacsagist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "echosa",
-            "repo": "emacsagist",
-            "sha256": "0ciqxyahlzaxq854jm25zbrbmrhcaj5csdhxa0az9crwha8wkmw2",
-            "rev": "aba342ba59c254a88017f25e9fb7a8cd6f2fda83"
-        },
-        "recipe": {
-            "sha256": "1cyz7nf0zxa21979jf5kdmkgwiyd17vsmpcmrw1af37ly27l8l64",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "yafolding": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zenozeng",
-            "repo": "yafolding.el",
-            "sha256": "1rplafm6mldsirj7xg66vsx03n263yii3il3fkws69xmv7sx1a6i",
-            "rev": "9b5a3f1b8dff6ddaf6369681820753afbbd1f388"
-        },
-        "recipe": {
-            "sha256": "1z70ismfwmh9a83a7h5lbhw7iywfib5fis7y8gx8020wfjq9g2yq",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.4",
-        "deps": []
-    },
-    "term-cmd": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "CallumCameron",
-            "repo": "term-cmd",
-            "sha256": "1idz9c38q47lll55w1znya00hlkwa42029ys70sb14inc51cml51",
-            "rev": "52651fcfbd0b0be0bddc66bf27f36243140698a4"
-        },
-        "recipe": {
-            "sha256": "0fn4f32zpl0p2lid159q59lzjv4xqmc23a64kcclqp9db8b1m5fy",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": []
-    },
-    "shell-split-string": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "10sr",
-            "repo": "shell-split-string-el",
-            "sha256": "0mcxp74sk9bn36gbhhimgns07iqa4dgbq2pvpqy41igqwb84w306",
-            "rev": "6d01c9249853fe1f8fd925ee80f97232d4e3e5eb"
-        },
-        "recipe": {
-            "sha256": "1yj1h7za4ylxh2nikj7s1qqlilpsk05x9571a2fymfyznm3iq77m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "evil-visual-mark-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "roman",
-            "repo": "evil-visual-mark-mode",
-            "sha256": "07cmql8zsqz1qchq2mp3qybbay499dk1yglisig6jfddcmrbbggz",
-            "rev": "094ee37599492885ff3144918fcdd9b74dadaaa0"
-        },
-        "recipe": {
-            "sha256": "1qgr2dfhfz6imnlznicl7lplajd1s8wny7mlxs1bkms3xjcjfi48",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.3",
-        "deps": [
-            "dash",
-            "evil"
-        ]
-    },
-    "package+": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "zenspider",
-            "repo": "package",
-            "sha256": "1xv0ra130qg0ksgqi4npspnv0ckq77k7f5kcibavj030h578kj97",
-            "rev": "4a9618a44ec4f26a14e0136cd9d3c4855fceb25b"
-        },
-        "recipe": {
-            "sha256": "1mbsxr4llz8ny7n7w3lykld9yvbaywlfqnvr9l0aiv9rvmdv03bn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.0",
-        "deps": []
-    },
-    "import-js": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "trotzig",
-            "repo": "import-js",
-            "sha256": "029dsxll790f76mdjwjgx4ccsh08hq2haq6l7xj2y0rzi81a51an",
-            "rev": "92f298873e1c2a6d79c6aa936173db36b39029b7"
-        },
-        "recipe": {
-            "sha256": "1grvzy378qj14wlbmhb3j7fx2zkl9wp65b5g0brjimav08nz7bls",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.3",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "rvm": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "senny",
-            "repo": "rvm.el",
-            "sha256": "0iblk0vagjcg3c8q9hlpwk7426ms7aq0s80izgvascfmyqycv6qm",
-            "rev": "8e45a9bad8e317ff195f384dab14d3402497dc79"
-        },
-        "recipe": {
-            "sha256": "08i7cmav2cz73jp88ww0ay2yjhk9dj8146836q4sij1bl1slbaf8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.4.0",
-        "deps": []
-    },
-    "isgd": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chmouel",
-            "repo": "isgd.el",
-            "sha256": "09hx28lmldm7z3x22a0qx34id09fdp3z61pdr61flgny213q1ach",
-            "rev": "764306dadd5a9213799081a48aba22f7c75cca9a"
-        },
-        "recipe": {
-            "sha256": "0yc9mkjzj3w64f48flnjvd193mk9gndrrqbxz3cvmvq3vgahhzyi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": []
-    },
-    "swift-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "chrisbarrett",
-            "repo": "swift-mode",
-            "sha256": "1fi5zdvplw7h5hnyi37k92c8s8qnjgizbnv1mah18y8d30n1r77n",
-            "rev": "e09694f0f95a64b2c96487cbdcb66636a77ea22a"
-        },
-        "recipe": {
-            "sha256": "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.0",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "logview": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "doublep",
-            "repo": "logview",
-            "sha256": "1yacic778ranlqblrcdhyf5igbrcin8aj30vjdm4klpmqb73hf1s",
-            "rev": "f53693b37b46af448d0ac102ebbb152a1cb915aa"
-        },
-        "recipe": {
-            "sha256": "0gks3j5avx8k3427a36lv7gr95id3cylaamgn5qwbg14s54y0vsh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4.2",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "narrow-reindent": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emallson",
-            "repo": "narrow-reindent.el",
-            "sha256": "10yn215xb4s6kshk108y75im1xbdp0vwc9kah5bbaflp9234i0zh",
-            "rev": "87466aac4dbeb79597124dd077bf5c704872fd3d"
-        },
-        "recipe": {
-            "sha256": "0fybal70kk62zlra63x4jb72694m0mzv4cx746prx9anvq1ss2i0",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.0",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "epl": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cask",
-            "repo": "epl",
-            "sha256": "0sjxd5y5hxhrbgfkpwx6m724r3841b53hgc61a0g5zwispw5pmrr",
-            "rev": "a76ec344a7fee3ca7e7dfb98b86ebc3b8c1a3837"
-        },
-        "recipe": {
-            "sha256": "0zr3r2hn9jaxscrl83hyixznb8l5dzfr6fsac76aa8x12xgsc5hn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8",
-        "deps": [
-            "cl-lib"
-        ]
-    },
-    "paradox": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "paradox",
-            "sha256": "06c2a55bmnhfvjpd43kq6d2l9yijgiq16yq19x6m8050f8hzxnyb",
-            "rev": "d62d883b8c980d679970bed79c12091df9120a77"
-        },
-        "recipe": {
-            "sha256": "1xq14nfvprsq18464qr4mhphq7cl1f570lji5n8z6j9vpfm9a4p2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.3.6",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "hydra",
-            "json",
-            "let-alist",
-            "seq",
-            "spinner"
-        ]
-    },
-    "ix": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "theanalyst",
-            "repo": "ix.el",
-            "sha256": "0rpxh1jv98dl9b5ldjkljk70z4hkl61kcmvy1lhpj3lxn8ysv87a",
-            "rev": "498dac674f4f1910d39087b1457c5da5465a0614"
-        },
-        "recipe": {
-            "sha256": "1fl76dk8vgw3mrh5iz99lrsllwya6ij9d1lj3szcrs4qnj0b5ql3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7",
-        "deps": [
-            "grapnel"
-        ]
-    },
-    "req-package": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "edvorg",
-            "repo": "req-package",
-            "sha256": "1xzp2hnkr9lsjx50cxlpki9mvyhjsv0vyc77480jrlnpspakj7qs",
-            "rev": "374c6d1a81b5448a66295be8c132c42ca44eeddb"
-        },
-        "recipe": {
-            "sha256": "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9",
-        "deps": [
-            "dash",
-            "log4e",
-            "use-package"
-        ]
-    },
-    "cmake-project": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "alamaison",
-            "repo": "emacs-cmake-project",
-            "sha256": "10xlny2agxjknvnjdnw41cyb3d361yy0wvpc8l1d0xwnmmfh3bxk",
-            "rev": "ec61f687772cccdb699f64ebe1e8dc8ba83f790f"
-        },
-        "recipe": {
-            "sha256": "13n6j9ljvzjzkknbm9zkhxljcn12avl39gxqq95hah44dr11rns3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.7",
-        "deps": []
-    },
-    "org-time-budgets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "leoc",
-            "repo": "org-time-budgets",
-            "sha256": "09iw2jffb2qrx5r07zd1j8sk5wafamjkc2khqyfwc5kx6xyp1f46",
-            "rev": "f2a8fe3d9d6104f3dd61fabbb385a596363b360b"
-        },
-        "recipe": {
-            "sha256": "0r8km586n6xdnjha7xnzlh03nw1dp066hydaz8kxfmhvygl9cpah",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.1",
-        "deps": [
-            "alert",
-            "cl-lib"
-        ]
-    },
-    "fancy-narrow": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "fancy-narrow",
-            "sha256": "10ds6nlzm1s5xsp53a52qlzrnph7in6gib67qhgnwpj33wp8gs91",
-            "rev": "cd381c1acd5e0d9b6acd7f3e76c3b1de21e8b6df"
-        },
-        "recipe": {
-            "sha256": "15i86jz6rdpva1az7gqp1wbm8kispcfc8h6v9fqsbag9sbzvgcyv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.4",
-        "deps": []
-    },
-    "test-case-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ieure",
-            "repo": "test-case-mode",
-            "sha256": "108csr1d7w0105rb6brzgbksb9wmq1p573vxbq0miv5k894j447f",
-            "rev": "26e397c0f930b7eb0be413ef7dd257b1da052bec"
-        },
-        "recipe": {
-            "sha256": "1iba97yvbi5vr7gvc58gq2ah6jg2s7apc9ssq7mdzki823n8z2qi",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0",
-        "deps": [
-            "fringe-helper"
-        ]
-    },
-    "fiplr": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "d11wtq",
-            "repo": "fiplr",
-            "sha256": "0lwgbd9zwdv7qs39c3fp4hrc17d9wrwwjgba7a14zwrhb27m7j07",
-            "rev": "100dfc33f43da8c49e50e8a2222b9d95532f6e24"
-        },
-        "recipe": {
-            "sha256": "0l68rl5cy2maynny6iq6c4qr6c99y44i0i1z613k9rk08z7h0k5i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.4",
-        "deps": [
-            "grizzl"
-        ]
-    },
-    "rainbow-blocks": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "istib",
-            "repo": "rainbow-blocks",
-            "sha256": "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c",
-            "rev": "8335993563aadd4290c5fa09dd7a6a81691b0690"
-        },
-        "recipe": {
-            "sha256": "08p41wvrw1j3h7j7lyl8nxk1gcc2id9ikljmiklg0kc6s8ijhng8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": []
-    },
-    "ido-grid-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "larkery",
-            "repo": "ido-grid-mode.el",
-            "sha256": "0f1p6cnl0arcc2y1h99nqcflp7byvyf6hj6fmv5xqggs66qc72lb",
-            "rev": "8bbd66e365d4f6f352bbb17673be5869ab26d7ab"
-        },
-        "recipe": {
-            "sha256": "1wl1yclcxmkbfnvp0il23csdf6gprzf7fkcknpivk784fhl19acr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.5",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "company-sourcekit": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "nathankot",
-            "repo": "company-sourcekit",
-            "sha256": "1l9xrw88wq32wm3qx922ihdb9mlv9rrdalwvz9i2790fmw7y84vz",
-            "rev": "ea26c1284ccf72d6e3a850c6725433f0f8e2b3f9"
-        },
-        "recipe": {
-            "sha256": "0hr5j1ginf43h4qf3fvsh3z53z0c7w5a9lhrvdwmlzj396qhqmzs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.4",
-        "deps": [
-            "company",
-            "dash",
-            "dash-functional",
-            "emacs",
-            "sourcekit"
-        ]
-    },
-    "kaesar-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mhayashi1120",
-            "repo": "Emacs-kaesar",
-            "sha256": "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8",
-            "rev": "4fa74851cd928f30e9f2ee1aa27ee6074ad253ea"
-        },
-        "recipe": {
-            "sha256": "0yqnlchbpmhsqc8j531n08vybwa32cy0v9sy4f9fgxa90rfqczry",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9.0",
-        "deps": [
-            "cl-lib",
-            "kaesar"
-        ]
-    },
-    "e2wm-pkgex4pl": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "e2wm-pkgex4pl",
-            "sha256": "1vrlfzy1wynm7x4m7pl8vim7ykqd6qkcilwz7sjc1lbckz11ig0d",
-            "rev": "7ea994450727190c4f3cb46cb429ba41b692ecc0"
-        },
-        "recipe": {
-            "sha256": "0hgdbqfw3015fr929m36kfiqqzsid6afs3222iqq0apg7gfj7jil",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.1",
-        "deps": [
-            "e2wm",
-            "plsense-direx"
-        ]
-    },
-    "org-linkany": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "org-linkany",
-            "sha256": "1bggz782ci0z6aw76v51ykbmfzh5g6cxh43w798as1152sn7im3p",
-            "rev": "ed4a6614b56c9baef31647ea728b3d5fae6ed3a2"
-        },
-        "recipe": {
-            "sha256": "0arjj3c23yqm1ljvbnl7v9cqvd9lbz4381g8f3jyqbafs25bdc3c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.2",
-        "deps": [
-            "log4e",
-            "yaxception"
-        ]
-    },
-    "powershell": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jschaf",
-            "repo": "powershell.el",
-            "sha256": "010b151wblgxlfpy590yanbl2r8qhpbqgi02v0pyir340frm9ngn",
-            "rev": "7316f44d0b528552f5a0692f778e5f0efd964299"
-        },
-        "recipe": {
-            "sha256": "162k8y9k2n48whaq93sqk86zy3p9qvsfxgyfv9n1nvk4l5wn70wk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "underwater-theme": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "jmdeldin",
-            "repo": "underwater-theme.el",
-            "sha256": "1g1ldyz42q3i2xlgvhd4s93cvkh0fm8m3l344zjcw8rvqaisyphj",
-            "rev": "1fbd4ecd4538256c6c46f9638f883072c73ac927"
-        },
-        "recipe": {
-            "sha256": "0ab2bcqfdi9ml3z9d511pbfwcbp8hkkd36xxp61k36gkyi3acvlr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1.0",
-        "deps": []
-    },
-    "magit-popup": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "magit",
-            "repo": "magit",
-            "sha256": "01x9kahr3szzc00wlfrihl4x28yrq065fq4rpzx9dxiksayk24pd",
-            "rev": "16a7a12c44d63e78e9b223fca7c1c23a144d3ef1"
-        },
-        "recipe": {
-            "sha256": "0w6m384bbmp3bd4qbss5h1jvcfp4qnpqvzlfykhdgjwpv2b2a2fj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.3.1",
-        "deps": [
-            "async",
-            "dash",
-            "emacs"
-        ]
-    },
-    "bbdb-vcard": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tohojo",
-            "repo": "bbdb-vcard",
-            "sha256": "0fg72qnb40djyciy4gzj359lqlcbbrq0indbkzd0dj09zipkx0df",
-            "rev": "9e11fafef1a94bc6395bd1eeacd00f94848ac560"
-        },
-        "recipe": {
-            "sha256": "1kn98b7mh9a28933r4yl8qfl9p92rpix4vkp71sar9cka0m71ilj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": []
-    },
-    "helm-hayoo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "markus1189",
-            "repo": "helm-hayoo",
-            "sha256": "1imfzz6cfdq7fgrcgrafy2nln929mgh31vybk9frm7a9jpamqdxp",
-            "rev": "f49a77e8b8704bb7eb0d1097eefb8010a6617664"
-        },
-        "recipe": {
-            "sha256": "0xdvl6q2rpfsma4hx8m4snbd05s4z0bi8psdalixywlp5s4vzr32",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.5",
-        "deps": [
-            "haskell-mode",
-            "helm",
-            "json"
-        ]
-    },
-    "gnome-calendar": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "NicolasPetton",
-            "repo": "gnome-calendar.el",
-            "sha256": "160qm8xf0yghygb52p8cykhb5vpg9ww3gjprcdkcxplr4b230nnc",
-            "rev": "58c3a3c32aff9901c679bdf9091ed934897b84a0"
-        },
-        "recipe": {
-            "sha256": "00clamlm5b42zqggxywdqrf6s2dnsxir5rpd8mjpyc502kqmsfn6",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": []
-    },
-    "evil-org": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "edwtjo",
-            "repo": "evil-org-mode",
-            "sha256": "09l0ph9rc941kr718zq0dw27fq6l7rb0h2003ihw7q0a5yr8fpk7",
-            "rev": "2d7c58dbeca0d4ac7b4eab5f47b77946951f27e9"
-        },
-        "recipe": {
-            "sha256": "18w07fbafry3wb87f55kd8y0yra3s18a52f3m5kkdlcz5zwagi1c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "evil",
-            "org"
-        ]
-    },
-    "modalka": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mrkkrp",
-            "repo": "modalka",
-            "sha256": "1pgr1zlp26c7xy77qfvjfmv5i2j1c45xp59x83k8nllyhckxyqn6",
-            "rev": "f8ee86264a8e961b5821e11fdd490d5c4fc489c3"
-        },
-        "recipe": {
-            "sha256": "0bkjykvl6sw797h7j76dzn1viy598asly98gcl5wrq13n4w1md4c",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "subshell-proc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "andrewmains12",
-            "repo": "subshell-proc",
-            "sha256": "0mx892vn4a32df30iqmf2vsz1gdl3i557fw0194g6a66n9w2q7xf",
-            "rev": "bf475eb7b0684af967755e91c9cabd19f953b03b"
-        },
-        "recipe": {
-            "sha256": "1fnp49yhnhsj7paj0b25vr6r03hr5kpgcrci439ffpbd2c85fkw2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "phi-search-mc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "knu",
-            "repo": "phi-search-mc.el",
-            "sha256": "0r6cl1ng41s6wsy5syjlkaip0mp8h491diipdc1psbhnpk4vabsv",
-            "rev": "4c6d2d39feb502febb81fc98b7b5854d88150c69"
-        },
-        "recipe": {
-            "sha256": "07hd80rbyzr5n3yd7hv1j51nl6pvcxmln20g6xvw8gh5yfl9k0m8",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.2.1",
-        "deps": [
-            "multiple-cursors",
-            "phi-search"
-        ]
-    },
-    "bury-successful-compilation": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "EricCrosson",
-            "repo": "bury-successful-compilation",
-            "sha256": "03hab3iw2jjckal20zwsw7cm38nf7pan0m96d8ab4i75phy6liyw",
-            "rev": "ca58a5df0aa3f266a8df0e3e5d3d962c086be0a9"
-        },
-        "recipe": {
-            "sha256": "1gkq4r1573m6m57fp7x69k7kcpqchpcqfcz3792v0wxr22zhkwr3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "html-to-markdown": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Malabarba",
-            "repo": "html-to-markdown",
-            "sha256": "0c648dl5zwjrqx9n6zr6nyzx2zcnv05d5i4hvhjpl9q3y011ncns",
-            "rev": "0fa0effd71acd8981a425ef11e0e63d53aea3199"
-        },
-        "recipe": {
-            "sha256": "1gjh9ndqsb3nfb7w5h7carjckkgy6qh63b4mg141j19dsyx9rrjv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.5.1",
-        "deps": []
-    },
-    "srefactor": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tuhdo",
-            "repo": "semantic-refactor",
-            "sha256": "0wx8l8gkh8rbf2g149f35gpnmkk45s9x4r844aqw5by4zkvix4rc",
-            "rev": "ecd40713f736b243285c07f4cfd77113794d4f9f"
-        },
-        "recipe": {
-            "sha256": "01cd40jm4h00c5q2ix7cskp7klbkcd3n5763y5lqfv59bjxwdqd2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.5",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "wacspace": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "shosti",
-            "repo": "wacspace.el",
-            "sha256": "0jl3n79wmbxnrbf83qjq0v5pzhvv67i9r5sp2zj8nc86hh7dvjsd",
-            "rev": "b951995c204ff23699d2bda515a96221147a725d"
-        },
-        "recipe": {
-            "sha256": "1xy0mprvyi37zmgj1yrlh5ni08j47lpag1jm3a76cgghgmlfjxrl",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4.2",
-        "deps": [
-            "cl-lib",
-            "dash"
-        ]
-    },
-    "helm-pages": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "david-christiansen",
-            "repo": "helm-pages",
-            "sha256": "1r2ndmrw5ivawb940j8jnmqzxv46qrzd3cqh9fvxx5yicf020fjf",
-            "rev": "e334ca3312e51d6fdfa989df5d3ebe683d673c0e"
-        },
-        "recipe": {
-            "sha256": "1v3w8100invb5wsmm3dyl41pjs7s889s3b1rlr6vlcspa1ncv3wj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.1",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "helm"
-        ]
-    },
-    "php-auto-yasnippets": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "ejmr",
-            "repo": "php-auto-yasnippets",
-            "sha256": "0zs11811kx6x1zgc1icd8gw420saa7z6zshpzmrddnbznya4qql6",
-            "rev": "1950d83cbcc5c5d62cd3bc432e1595870fe8cabf"
-        },
-        "recipe": {
-            "sha256": "1hhddvpc80b6wvjpbpibsf24rp5a5p45m0bg7m0c8mx181h9mqgn",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.3.1",
-        "deps": [
-            "php-mode",
-            "yasnippet"
-        ]
-    },
-    "helm-ls-git": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "emacs-helm",
-            "repo": "helm-ls-git",
-            "sha256": "0azs971d7pqd4ddxzy7bfs52cmrjbafwrcnf57afw39d772rzpdf",
-            "rev": "c5e43f4083af3949c5d5afdfbbf26d01881cb0e2"
-        },
-        "recipe": {
-            "sha256": "08rsy9479nk03kinjfkxddrq6wi4sx2a0wrz37cl2q517qi7sibj",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.8.0",
-        "deps": [
-            "helm"
-        ]
-    },
-    "hl-todo": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tarsius",
-            "repo": "hl-todo",
-            "sha256": "07irwpg794fdzsixmcbi1lnafj5gynhrdam7frcpmvb26a0l8fxq",
-            "rev": "878220c111add155b9ee1aeb3d3475cc5e488525"
-        },
-        "recipe": {
-            "sha256": "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.4.5",
-        "deps": []
-    },
-    "cython-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "cython",
-            "repo": "cython",
-            "sha256": "0kbk2gp2avp0da32mr003ziigmi98zi0fvwia4knylllmrkl3pvq",
-            "rev": "dc00a176d896f0df892aad8b305d946d3ed632a0"
-        },
-        "recipe": {
-            "sha256": "0asai1f1pncrfxx296fn6ky09hj1qam5j0dpxxkzhy0a34xz0k2i",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.23.4",
-        "deps": []
-    },
-    "cider": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "clojure-emacs",
-            "repo": "cider",
-            "sha256": "1bcmqbqc5p4m31rximdpzwlrv2nann5mkbfxiba2xm7fgl2iym64",
-            "rev": "7cc4a192323ef0911c150e6150d3bbd319253342"
-        },
-        "recipe": {
-            "sha256": "1a6hb728a3ir18c2dn9zfd3jn79fi5xjn5gqr7ljy6qb063xd4qx",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.10.0",
-        "deps": [
-            "clojure-mode",
-            "emacs",
-            "pkg-info",
-            "queue",
-            "seq",
-            "spinner"
-        ]
-    },
-    "ac-slime": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "purcell",
-            "repo": "ac-slime",
-            "sha256": "13yghv7p6c91fn8mrxbwrb6ldk5n3b6nj6a7pwsvks1q73i1pl88",
-            "rev": "df6c4e88b5ba2d15d47a651ecf7edc0986624112"
-        },
-        "recipe": {
-            "sha256": "0mk3k1lcbqa16xvsbgk28x09vzqyaidqaqpq934xdbrwhdgwgckg",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.8",
-        "deps": [
-            "auto-complete",
-            "cl-lib",
-            "slime"
-        ]
-    },
-    "fastnav": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gleber",
-            "repo": "fastnav.el",
-            "sha256": "0h32w63vv451797zi6206j529fd4j8l3fp7rqip3s8xn8d4728x1",
-            "rev": "54626e9e7cc7be5bc2bd01732e95ed2afc2312a1"
-        },
-        "recipe": {
-            "sha256": "08hg256w8k9f5nzgpyl1jykbf28vmvv09kkhzs0s2zhwbl2158a5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.7",
-        "deps": []
-    },
-    "traad-autocomplete": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abingham",
-            "repo": "traad",
-            "sha256": "1w2haj7grs4h9wiqkcpb28kl7zqlyba4pcgc07n1mvgksvnj729m",
-            "rev": "8852b4dc2b2113a1597301c0b03712b65f50747f"
-        },
-        "recipe": {
-            "sha256": "0psk4gb903slcsppgplawz6gsv1w1nw1vqj4y0rfql6rxnbl3jf2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": []
-    },
-    "el-init-viewer": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "HKey",
-            "repo": "el-init-viewer",
-            "sha256": "1488wv0f9ihzzf9fl8cki044k61b0kva604hdwpb2qk9gnjr4g1l",
-            "rev": "dcc595ba51b5aff972292278aa528c7ddb46f1b5"
-        },
-        "recipe": {
-            "sha256": "0kkmsml9xf2n8nlrcicfg2l78s3dlhd6ssx0s62v77v4wdpl297m",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "anaphora",
-            "cl-lib",
-            "ctable",
-            "dash",
-            "el-init",
-            "emacs"
-        ]
-    },
-    "gist": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "defunkt",
-            "repo": "gist.el",
-            "sha256": "0q3ps5f6mr9hyf6nq1wshcm1z6a5yhskqd7dbbwq5dm78552z6z8",
-            "rev": "144280f5353bceb902d5278fa64078337e99fa4d"
-        },
-        "recipe": {
-            "sha256": "053fl8aw0ram9wsabzvmlm5w2klwd2pgcn2w9r1yqfs4xqja5sd3",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.3.1",
-        "deps": [
-            "emacs",
-            "gh"
-        ]
-    },
-    "clojure-mode-extra-font-locking": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "clojure-emacs",
-            "repo": "clojure-mode",
-            "sha256": "0mrkw8l736pddddl0vx9j910g1l492mascqb93h0sxv8ps4xcc53",
-            "rev": "8b01df6c881929540b59444a54b37c03ffe6fc17"
-        },
-        "recipe": {
-            "sha256": "00nff9mkj61i76dj21x87vhz0bbkzgvkx1ypkxcv6yf3pfhq7r8n",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "5.0.1",
-        "deps": [
-            "clojure-mode"
-        ]
-    },
-    "ggo-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mkjunker",
-            "repo": "ggo-mode",
-            "sha256": "1m9ra9qp7bgf6anfqyn56n3xa9a25ran10k9wd355qknd5skq1zz",
-            "rev": "ea5097f87072309c7b77204888d459d084bf630f"
-        },
-        "recipe": {
-            "sha256": "1403x530n90jlfz3lq2vfiqx84cxsrhgs6hhmniq960cjj31q35p",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "20130521",
-        "deps": []
-    },
-    "clojure-cheatsheet": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "clojure-emacs",
-            "repo": "clojure-cheatsheet",
-            "sha256": "1x1kfycf3023z0r3v7xqci59k8jv5wn2vqc9y0nx7k5qgifmswrx",
-            "rev": "f8db406b7b13a580c142d08865c9a03c101235fa"
-        },
-        "recipe": {
-            "sha256": "05sw3bkdcadslpsk64ds0ciavmdgqk7fr5q3z505vvafmszfnaqv",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4.0",
-        "deps": [
-            "cider",
-            "helm"
-        ]
-    },
-    "org-gnome": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "NicolasPetton",
-            "repo": "org-gnome.el",
-            "sha256": "0b57ik05iax2h3nrj96kysbk4hxmxlaabd0n6lv1xsayrlli3sj1",
-            "rev": "1012d47886cfd30eed25b73d9f18e475e0155f88"
-        },
-        "recipe": {
-            "sha256": "0c37gfs6xs0jbvg6ypd4z5ip1khm26wr5lxgmv1dzcc383ynzg0v",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3",
-        "deps": [
-            "alert",
-            "gnome-calendar",
-            "telepathy"
-        ]
-    },
-    "osx-dictionary": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "xuchunyang",
-            "repo": "osx-dictionary.el",
-            "sha256": "1vywqzw8hydi944q4ghgxbbvvmwfpa9wj5nmrnixfcw8h4mfcxvv",
-            "rev": "b909e38723caa37157ad6be90ac107c1c7102e07"
-        },
-        "recipe": {
-            "sha256": "13033fxc5vjd1f7mm6znmprcp3mwxbvblb2d25shr8d4imqqhv82",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2.1",
-        "deps": [
-            "chinese-word-at-point",
-            "cl-lib"
-        ]
-    },
-    "zzz-to-char": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "mrkkrp",
-            "repo": "zzz-to-char",
-            "sha256": "1hif9jrp4w7xvca0a4qm29scpkwhf5n61c4i5x8n5p7gbwjhh98q",
-            "rev": "82dc3382e58091ae32160a91e8c781b813faf856"
-        },
-        "recipe": {
-            "sha256": "16vwp0krshmn5x3ry1j512g4kydx39znjqzri4j7wgg49bz1n7vh",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "avy",
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "pass": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "NicolasPetton",
-            "repo": "pass",
-            "sha256": "18m0973l670cjbzpa1vfv06gymhsa2f1pjcp329s0npb735x5whj",
-            "rev": "93d99883a95e70f931d2abad87e697f5243115d3"
-        },
-        "recipe": {
-            "sha256": "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": [
-            "emacs",
-            "f",
-            "password-store"
-        ]
-    },
-    "request": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "tkf",
-            "repo": "emacs-request",
-            "sha256": "0j7nakxj750rhdnm0nk075s7rx38rc9npbb55kg7r9vb2qilnvmr",
-            "rev": "b548f8bd9c4372232cb3d3633b9fcfffb2f535ff"
-        },
-        "recipe": {
-            "sha256": "0h4jqg98px9dqqvjp08vi2z1lhmk0ca59lnrcl96bi7gkkj3jiji",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": []
-    },
-    "markdown-mode": {
-        "fetch": {
-            "tag": "fetchgit",
-            "url": "git://jblevins.org/git/markdown-mode.git",
-            "sha256": "89a2577a17836715d06cbeba64364accedaf603bb4cca9627b7e3116ea51ddd8",
-            "rev": "a3f710de163ec729090ecc13d03e400793fb9e95"
-        },
-        "recipe": {
-            "sha256": "02lmhihv495drv9cb40h6l0xsbx7yglbvsdzc4r0vf78j87rs33f",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "2.0",
-        "deps": []
-    },
-    "sphinx-doc": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "naiquevin",
-            "repo": "sphinx-doc.el",
-            "sha256": "1q6v0xfdxm57lyj4zxyqv6n5ik5w9drk7yf9w8spb5r22jg0dg8c",
-            "rev": "b3459ecb9e6d3fffdee3cb7342563a56a32ce666"
-        },
-        "recipe": {
-            "sha256": "00h3wx2p5hzbw6sggggdrzv4jrn1wc051iqql5y2m1hsh772ic5z",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": [
-            "cl-lib",
-            "s"
-        ]
-    },
-    "evil-smartparens": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "expez",
-            "repo": "evil-smartparens",
-            "sha256": "0j2m3rsszivyjhv8bjid5fdqaf1vwp8rf55b27y4vc2489wrw415",
-            "rev": "12521212b8e4a02cbec733882bb89c6fac37301f"
-        },
-        "recipe": {
-            "sha256": "1viwrd6gfqmwhlil80pk68dikn3cjf9ddsy0z781z3qfx0j35qza",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.3.0",
-        "deps": [
-            "cl-lib",
-            "emacs",
-            "evil",
-            "smartparens"
-        ]
-    },
-    "org-protocol-jekyll": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "vonavi",
-            "repo": "org-protocol-jekyll",
-            "sha256": "1cxjzj955rvp0ijbp7ifpmkxdhimz8hqjw5c9gv6zwjqb5iih9ry",
-            "rev": "c1ac46793eb9bf22b1a601e841947428be5c9766"
-        },
-        "recipe": {
-            "sha256": "18wg489n2d1sx9jk00ki6p2rxkqz67kqwnmy2kb1ga1rmb6x9wfs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1",
-        "deps": []
-    },
-    "autodisass-llvm-bitcode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "gbalats",
-            "repo": "autodisass-llvm-bitcode",
-            "sha256": "1hyp49bidwc53cr25wwwyzcd0cbbqzxkfcpnccimphv24qfsai85",
-            "rev": "14bb1bfe2be3b04d6e0c87a7a9d1e88ce15506d0"
-        },
-        "recipe": {
-            "sha256": "0bh73nzll9jp7kiqfnb5dwkipw85p3c3cyq58s0nghig02z63j01",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.1",
-        "deps": []
-    },
-    "sourcemap": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-sourcemap",
-            "sha256": "1k2gfw4dydzqxbfdmcghajbb2lyg1j4wgdhp8chlql3dax1f503d",
-            "rev": "065a0c3bd8ca5fe6a45e8f983f932c3c9fac5db9"
-        },
-        "recipe": {
-            "sha256": "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.2",
-        "deps": [
-            "cl-lib",
-            "emacs"
-        ]
-    },
-    "json-snatcher": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "Sterlingg",
-            "repo": "json-snatcher",
-            "sha256": "05zsgnk7grgw9jzwl80h5sxfpifxlr37b4mkbvx7mjq4z14xc2jw",
-            "rev": "c4cecc0a5051bd364373aa499c47a1bb7a5ac51c"
-        },
-        "recipe": {
-            "sha256": "0f6j9g3c5fz3wlqa88706cbzinrs3dnfpgsr2d3h3117gic4iwp4",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "1.0.0",
-        "deps": [
-            "emacs"
-        ]
-    },
-    "org-link-travis": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "aki2o",
-            "repo": "org-link-travis",
-            "sha256": "1797pd264zn19zk93nifyw6pwk2a7wrpfir373qclk601yv2g5h8",
-            "rev": "596615ad8373d9090bd4138da683524f0ad0bda5"
-        },
-        "recipe": {
-            "sha256": "0hj4x7cw7a3ry8xislkz9bnavy77z4cpmnvns02yi3gnib53mlfs",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.0.1",
-        "deps": [
-            "org"
-        ]
-    },
-    "cryptol-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "thoughtpolice",
-            "repo": "cryptol-mode",
-            "sha256": "00wgbcw09xn9xi52swi4wyi9dj9p9hyin7i431xi6zkhxysw4q7w",
-            "rev": "a54d000d24757fad2a91ae2853b16a97ebe52771"
-        },
-        "recipe": {
-            "sha256": "08iq69gqmps8cckybhj9065b8a2a49p0rpzgx883qxnypsmjfmf2",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.1.0",
-        "deps": []
-    },
-    "company-ycmd": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "abingham",
-            "repo": "emacs-ycmd",
-            "sha256": "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia",
-            "rev": "8fb29b84d42c0aea71fe7db088b0b7a5a0c6b34c"
-        },
-        "recipe": {
-            "sha256": "0fqmkb0q8ai605jzn2kwd585b2alwxbmnb3yqnn9fgkcvyc9f0pk",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.9",
-        "deps": [
-            "company",
-            "deferred",
-            "s",
-            "ycmd"
-        ]
-    },
-    "literate-coffee-mode": {
-        "fetch": {
-            "tag": "fetchFromGitHub",
-            "owner": "syohex",
-            "repo": "emacs-literate-coffee-mode",
-            "sha256": "1fh9wrw5irn0g3dy8gkk63csdcxgi3w2038mxx3sk6ki3r2bmhw8",
-            "rev": "39fe3bfa1f68a7b8b91160875589219b214a2cd6"
-        },
-        "recipe": {
-            "sha256": "1bll1y9q3kcg3v250asjvx2k9kb314qadaq1iwanwgdlp3qvvs40",
-            "commit": "2b3eb31c077fcaff94b74b757c1ce17650333943"
-        },
-        "version": "0.4",
-        "deps": [
-            "coffee-mode"
-        ]
-    }
-}
\ No newline at end of file
diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
index 2dadbae85358..0d9061d9808e 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
@@ -16,62 +16,146 @@ To update the list of packages from MELPA Stable,
 
 { lib }:
 
-let
-
-  inherit (lib) makeScope mapAttrs;
-
-  json = builtins.readFile ./melpa-stable-packages.json;
-  manifest = builtins.fromJSON json;
-
-  mkPackage = self: name: recipe:
-    let drv =
-          { melpaBuild, stdenv, fetchbzr, fetchcvs, fetchFromGitHub, fetchFromGitLab
-          , fetchgit, fetchhg, fetchsvn, fetchurl }:
-          let
-            unknownFetcher =
-              abort "emacs-${name}: unknown fetcher '${recipe.fetch.tag}'";
-            fetch =
-              {
-                inherit fetchbzr fetchcvs fetchFromGitHub fetchFromGitLab fetchgit fetchhg
-                        fetchsvn fetchurl;
-              }."${recipe.fetch.tag}"
-              or unknownFetcher;
-            args = builtins.removeAttrs recipe.fetch [ "tag" ];
-            src = fetch args;
-            recipeFile = fetchurl {
-              url = "https://raw.githubusercontent.com/milkypostman/melpa/${recipe.recipe.commit}/recipes/${name}";
-              inherit (recipe.recipe) sha256;
-            };
-          in melpaBuild {
-            pname = name;
-            inherit (recipe) version;
-            inherit recipeFile src;
-            packageRequires =
-              let lookupDep = d: self."${d}" or null;
-              in map lookupDep recipe.deps;
-            meta = {
-              homepage = "http://stable.melpa.org/#/${name}";
-              license = stdenv.lib.licenses.free;
-            };
-          };
-    in self.callPackage drv {};
-
-in
-
 self:
 
   let
-    super = mapAttrs (mkPackage self) manifest;
+    imported = import ./melpa-stable-generated.nix { inherit (self) callPackage; };
 
-    markBroken = pkg: pkg.override {
-      melpaBuild = args: self.melpaBuild (args // {
-        meta = (args.meta or {}) // { broken = true; };
+    super = imported;
+
+    dontConfigure = pkg: pkg.override (args: {
+      melpaBuild = drv: args.melpaBuild (drv // {
+        configureScript = "true";
       });
+    });
+
+    markBroken = pkg: pkg.override (args: {
+      melpaBuild = drv: args.melpaBuild (drv // {
+        meta = (drv.meta or {}) // { broken = true; };
+      });
+    });
+
+    overrides = {
+      ac-php = super.ac-php.override {
+        inherit (self.melpaPackages) company popup;
+      };
+
+      # upstream issue: mismatched filename
+      ack-menu = markBroken super.ack-menu;
+
+      airline-themes = super.airline-themes.override {
+        inherit (self.melpaPackages) powerline;
+      };
+
+      # upstream issue: missing file header
+      bufshow = markBroken super.bufshow;
+
+      # part of a larger package
+      # upstream issue: missing package version
+      cmake-mode = markBroken (dontConfigure super.cmake-mode);
+
+      # upstream issue: missing file header
+      connection = markBroken super.connection;
+
+      # upstream issue: missing file header
+      crux = markBroken super.crux;
+
+      # upstream issue: missing file header
+      dictionary = markBroken super.dictionary;
+
+      easy-kill-extras = super.easy-kill-extras.override {
+        inherit (self.melpaPackages) easy-kill;
+      };
+
+      # missing git
+      egg = markBroken super.egg;
+
+      # upstream issue: missing file header
+      elmine = markBroken super.elmine;
+
+      ess-R-data-view = super.ess-R-data-view.override {
+        inherit (self.melpaPackages) ess ctable popup;
+      };
+
+      ess-R-object-popup = super.ess-R-object-popup.override {
+        inherit (self.melpaPackages) ess popup;
+      };
+
+      # missing OCaml
+      flycheck-ocaml = markBroken super.flycheck-ocaml;
+
+      # upstream issue: missing file header
+      fold-dwim = markBroken super.fold-dwim;
+
+      # upstream issue: mismatched filename
+      helm-lobsters = markBroken super.helm-lobsters;
+
+      # upstream issue: missing file header
+      ido-complete-space-or-hyphen = markBroken super.ido-complete-space-or-hyphen;
+
+      # upstream issue: missing file header
+      initsplit = markBroken super.initsplit;
+
+      # upstream issue: missing file header
+      jsfmt = markBroken super.jsfmt;
+
+      # upstream issue: missing file header
+      link = markBroken super.link;
+
+      # upstream issue: mismatched filename
+      link-hint = markBroken super.link-hint;
+
+      # upstream issue: missing file header
+      maxframe = markBroken super.maxframe;
+
+      # missing OCaml
+      merlin = markBroken super.merlin;
+
+      mhc = super.mhc.override {
+        inherit (self.melpaPackages) calfw;
+      };
+
+      # missing .NET
+      nemerle = markBroken super.nemerle;
+
+      # part of a larger package
+      notmuch = dontConfigure super.notmuch;
+
+      # missing OCaml
+      ocp-indent = markBroken super.ocp-indent;
+
+      # upstream issue: truncated file
+      powershell = markBroken super.powershell;
+
+      # upstream issue: mismatched filename
+      processing-snippets = markBroken super.processing-snippets;
+
+      # upstream issue: missing file header
+      qiita = markBroken super.qiita;
+
+      spaceline = super.spaceline.override {
+        inherit (self.melpaPackages) powerline;
+      };
+
+      # upstream issue: missing file header
+      speech-tagger = markBroken super.speech-tagger;
+
+      # upstream issue: missing file header
+      stgit = markBroken super.stgit;
+
+      # upstream issue: missing file header
+      textmate = markBroken super.textmate;
+
+      # missing OCaml
+      utop = markBroken super.utop;
+
+      # upstream issue: missing file header
+      voca-builder = markBroken super.voca-builder;
+
+      # upstream issue: missing file header
+      window-numbering = markBroken super.window-numbering;
     };
 
-    melpaStablePackages = super // {
-      # broken upstream
-      ack-menu = markBroken super.ack-menu;
-    };
+    melpaStablePackages = super // overrides;
   in
     melpaStablePackages // { inherit melpaStablePackages; }

From 61436c90e291145e829ae23dcf3bf742126c9eeb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 15 Jan 2016 16:15:26 -0600
Subject: [PATCH 0096/2285] emacsPackagesNg: prefer melpaStablePackages to
 elpaPackages

Both package sets are stable, but elpaPackages is an ad hoc set, so we
should prefer melpaStablePackages.
---
 pkgs/top-level/emacs-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 57ec5821e5e9..f97659215fca 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1926,7 +1926,7 @@ in
   lib.makeScope newScope (self:
     {}
     // melpaPackages self
-    // melpaStablePackages self
     // elpaPackages self
+    // melpaStablePackages self
     // packagesFun self
   )

From 4b2303b8c9758e9bff119d4dfe7bc8b039a73ef1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 15 Jan 2016 17:53:54 -0600
Subject: [PATCH 0097/2285] melpaBuild: get Emacs package name from recipe

When building a package from a Melpa recipe file, get the Emacs package
name from the recipe. Nix is more restrictive about packages names than
Emacs, so the Nix name for a package is sometimes different.
---
 pkgs/build-support/emacs/melpa.nix    | 2 +-
 pkgs/build-support/emacs/melpa2nix.el | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix
index 8fd2a00b50a8..ae228f48b025 100644
--- a/pkgs/build-support/emacs/melpa.nix
+++ b/pkgs/build-support/emacs/melpa.nix
@@ -54,7 +54,7 @@ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
       else
       ''
       -f melpa2nix-build-package-from-recipe \
-      ${pname} ${version} ${recipeFile}
+      ${recipeFile} ${version}
       ''}
 
     runHook postBuild
diff --git a/pkgs/build-support/emacs/melpa2nix.el b/pkgs/build-support/emacs/melpa2nix.el
index f1309fc0d57b..babca25277c8 100644
--- a/pkgs/build-support/emacs/melpa2nix.el
+++ b/pkgs/build-support/emacs/melpa2nix.el
@@ -25,8 +25,10 @@
   (if (not noninteractive)
       (error "`melpa2nix-build-package' is to be used only with -batch"))
   (pcase command-line-args-left
-    (`(,package ,version ,recipe-file)
-     (let* ((rcp (cdr (package-build--read-from-file recipe-file)))
+    (`(,recipe-file ,version)
+     (let* ((recipe (package-build--read-from-file recipe-file))
+            (rcp (cdr recipe))
+            (package (car recipe))
             (files (package-build--config-file-list rcp)))
        (melpa2nix-package-build-archive package version files)))))
 

From 18251778c956bf18a8a70d687ac2b66967c459dd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 16 Jan 2016 10:01:33 -0600
Subject: [PATCH 0098/2285] melpaBuild: don't guess archive file name

package-build can tell us exactly what the archive file name is, instead
of globbing for it.
---
 pkgs/build-support/emacs/melpa.nix    | 40 +++++++++++++--------------
 pkgs/build-support/emacs/melpa2nix.el |  9 ++++--
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix
index ae228f48b025..fb2440811476 100644
--- a/pkgs/build-support/emacs/melpa.nix
+++ b/pkgs/build-support/emacs/melpa.nix
@@ -28,8 +28,6 @@ let
     sha256 = "1biwg2pqmmdz5iwqbjdszljazqymvgyyjcnc255nr6qz8mhnx67j";
   };
 
-  fname = "${pname}-${version}";
-
   targets = concatStringsSep " " (if files == null then fileSpecs else files);
 
   defaultMeta = {
@@ -41,31 +39,33 @@ in
 import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
   inherit packageBuild;
 
-  buildPhase = ''
-    runHook preBuild
+  buildPhase =
+    if recipeFile == null
+      then ''
+        runHook preBuild
 
-    emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \
-    ${if recipeFile == null
-      then
-      ''
-      -f melpa2nix-build-package \
-      ${pname} ${version} ${targets}
-      ''
-      else
-      ''
-      -f melpa2nix-build-package-from-recipe \
-      ${recipeFile} ${version}
-      ''}
+        export archive=$(emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \
+            -f melpa2nix-build-package \
+            ${pname} ${version} ${targets})
 
-    runHook postBuild
-  '';
+        runHook postBuild
+      ''
+      else ''
+        runHook preBuild
+
+        export archive=$(emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \
+            -f melpa2nix-build-package-from-recipe \
+            ${recipeFile} ${version})
+
+        runHook postBuild
+      '';
 
   installPhase = ''
     runHook preInstall
 
     emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \
-      -f melpa2nix-install-package \
-      ${fname}.* $out/share/emacs/site-lisp/elpa
+        -f melpa2nix-install-package \
+        "$archive" "$out/share/emacs/site-lisp/elpa"
 
     runHook postInstall
   '';
diff --git a/pkgs/build-support/emacs/melpa2nix.el b/pkgs/build-support/emacs/melpa2nix.el
index babca25277c8..ea5b1390ad8c 100644
--- a/pkgs/build-support/emacs/melpa2nix.el
+++ b/pkgs/build-support/emacs/melpa2nix.el
@@ -40,8 +40,11 @@
                                                version
                                                files
                                                package-build-working-dir
-                                               package-build-archive-dir)))
+                                               package-build-archive-dir))
+         (archive-file (package-build--archive-file-name archive-entry)))
 
-    (package-build--message "Built in %.3fs, finished at %s"
+    (progn
+      (package-build--message "Built in %.3fs, finished at %s"
                             (time-to-seconds (time-since start-time))
-                            (current-time-string))))
+                            (current-time-string))
+      (princ (format "%s\n" archive-file)))))

From cd54d7af471213736b989fcc16192f779ff13873 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 16 Jan 2016 10:02:49 -0600
Subject: [PATCH 0099/2285] melpaBuild: don't download dependencies

Stop package.el from trying to download dependencies. It wouldn't work
anyway.
---
 pkgs/build-support/emacs/melpa2nix.el | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/emacs/melpa2nix.el b/pkgs/build-support/emacs/melpa2nix.el
index ea5b1390ad8c..fb35fc681257 100644
--- a/pkgs/build-support/emacs/melpa2nix.el
+++ b/pkgs/build-support/emacs/melpa2nix.el
@@ -12,7 +12,7 @@
   (pcase command-line-args-left
     (`(,archive ,elpa)
      (progn (setq package-user-dir elpa)
-            (package-install-file archive)))))
+            (melpa2nix-install-file archive)))))
 
 (defun melpa2nix-build-package ()
   (if (not noninteractive)
@@ -48,3 +48,20 @@
                             (time-to-seconds (time-since start-time))
                             (current-time-string))
       (princ (format "%s\n" archive-file)))))
+
+(defun melpa2nix-install-from-buffer ()
+  "Install a package from the current buffer."
+  (let ((pkg-desc (if (derived-mode-p 'tar-mode)
+                      (package-tar-file-info)
+                    (package-buffer-info))))
+    ;; Install the package itself.
+    (package-unpack pkg-desc)
+    pkg-desc))
+
+(defun melpa2nix-install-file (file)
+  "Install a package from a file.
+The file can either be a tar file or an Emacs Lisp file."
+  (with-temp-buffer
+    (insert-file-contents-literally file)
+    (when (string-match "\\.tar\\'" file) (tar-mode))
+    (melpa2nix-install-from-buffer)))

From d40e9bed1514f36f7750e508fa30afff68acf656 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 16 Jan 2016 10:24:15 -0600
Subject: [PATCH 0100/2285] emacs-let-alist: use generated package

---
 pkgs/top-level/emacs-packages.nix | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index f97659215fca..b2480ac78615 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1172,23 +1172,6 @@ let
     };
   };
 
-  let-alist = melpaBuild rec {
-    pname   = "let-alist";
-    version = "1.0.4";
-    src = fetchurl {
-      url    = "http://elpa.gnu.org/packages/${pname}-${version}.el";
-      sha256 = "07312bvvyz86lf64vdkxg2l1wgfjl25ljdjwlf1bdzj01c4hm88x";
-    };
-    unpackPhase = "true";
-    buildPhase = ''
-      cp $src ${pname}-${version}.el
-    '';
-    meta = {
-      description = "Easily let-bind values of an assoc-list by their names";
-      license = gpl3Plus;
-    };
-  };
-
   log4e = melpaBuild rec {
     pname = "log4e";
     version = "0.3.0";

From e01a41aee1f0e973fab9cbfdc9a004d82ddab23a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 16 Jan 2016 10:55:39 -0600
Subject: [PATCH 0101/2285] emacs-auctex: 11.87.7 -> 11.89

Uses generated package from ELPA.
---
 pkgs/top-level/emacs-packages.nix | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index b2480ac78615..44121945fece 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -235,23 +235,6 @@ let
     };
   };
 
-  auctex = melpaBuild rec {
-    pname   = "auctex";
-    version = "11.87.7";
-    src = fetchurl {
-      url    = "http://elpa.gnu.org/packages/${pname}-${version}.tar";
-      sha256 = "07bhw8zc3d1f2basjy80njmxpsp4f70kg3ynkch9ghlai3mm2b7n";
-    };
-    buildPhase = ''
-      cp $src ${pname}-${version}.tar
-    '';
-    meta = {
-      description = "Extensible package for writing and formatting TeX files in GNU Emacs and XEmacs";
-      homepage = https://www.gnu.org/software/auctex/;
-      license = gpl3Plus;
-    };
-  };
-
   autotetris = melpaBuild {
     pname = "autotetris-mode";
     version = "20141114.846";

From 001341f8c98af998da57d5b15a279b64efff4689 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 16 Jan 2016 11:05:29 -0600
Subject: [PATCH 0102/2285] emacs-org-plus-contrib: use elpaBuild

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 44121945fece..f8cf47a1659e 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -1347,16 +1347,13 @@ let
     };
   };
 
-  org-plus-contrib = melpaBuild rec {
+  org-plus-contrib = elpaBuild rec {
     pname   = "org-plus-contrib";
     version = "20150406";
     src = fetchurl {
       url    = "http://orgmode.org/elpa/${pname}-${version}.tar";
       sha256 = "1ny2myg4rm75ab2gl5rqrwy7h53q0vv18df8gk3zv13kljj76c6i";
     };
-    buildPhase = ''
-      cp $src ${pname}-${version}.tar
-    '';
     meta = {
       description = "Notes, TODO lists, projects, and authoring in plain-text with Emacs";
       license = gpl3Plus;

From b81c8b9013469d156087869177d3d4c6b52b40a8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 16 Jan 2016 11:06:48 -0600
Subject: [PATCH 0103/2285] emacsPackagesNg: add note about elpaBuild

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index f8cf47a1659e..0e267b5374d5 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -24,6 +24,9 @@
 ## FOR CONTRIBUTORS
 #
 # When adding a new package here please note that
+# * please use `elpaBuild` for pre-built package.el packages and
+#   `melpaBuild` or `trivialBuild` if the package must actually
+#   be built from the source.
 # * lib.licenses are `with`ed on top of the file here
 # * both trivialBuild and melpaBuild will automatically derive a
 #   `meta` with `platforms` and `homepage` set to something you are

From 1724a07e2e06a7de4c30fc0983dfd4411771183e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 16 Jan 2016 16:47:22 -0600
Subject: [PATCH 0104/2285] melpaBuild: keep original source file names without
 hash

---
 pkgs/build-support/emacs/generic.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/emacs/generic.nix b/pkgs/build-support/emacs/generic.nix
index d41f90ebd05d..6fa27f098392 100644
--- a/pkgs/build-support/emacs/generic.nix
+++ b/pkgs/build-support/emacs/generic.nix
@@ -32,8 +32,11 @@ stdenv.mkDerivation ({
   unpackCmd = ''
     case "$curSrc" in
       *.el)
-        cp $curSrc $pname.el
-        chmod +w $pname.el
+        # keep original source filename without the hash
+        local filename=$(basename "$curSrc")
+        filename="''${filename:33}"
+        cp $curSrc $filename
+        chmod +w $filename
         sourceRoot="."
         ;;
       *)

From decb5802c91915814fc6551442cd3f586a78de30 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 16 Jan 2016 17:20:06 -0600
Subject: [PATCH 0105/2285] elpaBuild: factor out package installation

Building packages requires package-build.el from Melpa, but installing
packages only requires package.el. Packages from ELPA are already built,
so there is no need to involve package-build.el.
---
 .../editors/emacs-modes/elpa-packages.nix     |  2 +-
 pkgs/build-support/emacs/elpa.nix             | 30 +++++++++++++++++++
 pkgs/build-support/emacs/elpa2nix.el          | 27 +++++++++++++++++
 pkgs/build-support/emacs/melpa.nix            |  4 +--
 pkgs/build-support/emacs/melpa2nix.el         | 25 ----------------
 5 files changed, 60 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/build-support/emacs/elpa.nix
 create mode 100644 pkgs/build-support/emacs/elpa2nix.el

diff --git a/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
index 60cd4251888f..7fc8a06644f9 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-packages.nix
@@ -23,7 +23,7 @@ self:
 
     super = removeAttrs imported [ "dash" ];
 
-    elpaBuild = import ../../../build-support/emacs/melpa.nix {
+    elpaBuild = import ../../../build-support/emacs/elpa.nix {
       inherit fetchurl lib stdenv texinfo;
       inherit (self) emacs;
     };
diff --git a/pkgs/build-support/emacs/elpa.nix b/pkgs/build-support/emacs/elpa.nix
new file mode 100644
index 000000000000..79a26abcb831
--- /dev/null
+++ b/pkgs/build-support/emacs/elpa.nix
@@ -0,0 +1,30 @@
+# builder for Emacs packages built for packages.el
+
+{ lib, stdenv, fetchurl, emacs, texinfo }:
+
+with lib;
+
+{ pname
+, version
+, src
+, ...
+}@args:
+
+import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
+
+  phases = "installPhase fixupPhase distPhase";
+
+  installPhase = ''
+    runHook preInstall
+
+    emacs --batch -Q -l ${./elpa2nix.el} \
+        -f elpa2nix-install-package \
+        "${src}" "$out/share/emacs/site-lisp/elpa"
+
+    runHook postInstall
+  '';
+}
+
+// removeAttrs args [ "files" "fileSpecs"
+                      "meta"
+                    ])
diff --git a/pkgs/build-support/emacs/elpa2nix.el b/pkgs/build-support/emacs/elpa2nix.el
new file mode 100644
index 000000000000..3a2d65d640f4
--- /dev/null
+++ b/pkgs/build-support/emacs/elpa2nix.el
@@ -0,0 +1,27 @@
+(require 'package)
+(package-initialize)
+
+(defun elpa2nix-install-package ()
+  (if (not noninteractive)
+      (error "`elpa2nix-install-package' is to be used only with -batch"))
+  (pcase command-line-args-left
+    (`(,archive ,elpa)
+     (progn (setq package-user-dir elpa)
+            (elpa2nix-install-file archive)))))
+
+(defun elpa2nix-install-from-buffer ()
+  "Install a package from the current buffer."
+  (let ((pkg-desc (if (derived-mode-p 'tar-mode)
+                      (package-tar-file-info)
+                    (package-buffer-info))))
+    ;; Install the package itself.
+    (package-unpack pkg-desc)
+    pkg-desc))
+
+(defun elpa2nix-install-file (file)
+  "Install a package from a file.
+The file can either be a tar file or an Emacs Lisp file."
+  (with-temp-buffer
+    (insert-file-contents-literally file)
+    (when (string-match "\\.tar\\'" file) (tar-mode))
+    (elpa2nix-install-from-buffer)))
diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix
index fb2440811476..3b8a23d8c2a4 100644
--- a/pkgs/build-support/emacs/melpa.nix
+++ b/pkgs/build-support/emacs/melpa.nix
@@ -63,8 +63,8 @@ import ./generic.nix { inherit lib stdenv emacs texinfo; } ({
   installPhase = ''
     runHook preInstall
 
-    emacs --batch -Q -l $packageBuild -l ${./melpa2nix.el} \
-        -f melpa2nix-install-package \
+    emacs --batch -Q -l ${./elpa2nix.el} \
+        -f elpa2nix-install-package \
         "$archive" "$out/share/emacs/site-lisp/elpa"
 
     runHook postInstall
diff --git a/pkgs/build-support/emacs/melpa2nix.el b/pkgs/build-support/emacs/melpa2nix.el
index fb35fc681257..3cd5bbdb954a 100644
--- a/pkgs/build-support/emacs/melpa2nix.el
+++ b/pkgs/build-support/emacs/melpa2nix.el
@@ -6,14 +6,6 @@
 (setq package-build-working-dir (expand-file-name ".")
       package-build-archive-dir (expand-file-name "."))
 
-(defun melpa2nix-install-package ()
-  (if (not noninteractive)
-      (error "`melpa2nix-install-package' is to be used only with -batch"))
-  (pcase command-line-args-left
-    (`(,archive ,elpa)
-     (progn (setq package-user-dir elpa)
-            (melpa2nix-install-file archive)))))
-
 (defun melpa2nix-build-package ()
   (if (not noninteractive)
       (error "`melpa2nix-build-package' is to be used only with -batch"))
@@ -48,20 +40,3 @@
                             (time-to-seconds (time-since start-time))
                             (current-time-string))
       (princ (format "%s\n" archive-file)))))
-
-(defun melpa2nix-install-from-buffer ()
-  "Install a package from the current buffer."
-  (let ((pkg-desc (if (derived-mode-p 'tar-mode)
-                      (package-tar-file-info)
-                    (package-buffer-info))))
-    ;; Install the package itself.
-    (package-unpack pkg-desc)
-    pkg-desc))
-
-(defun melpa2nix-install-file (file)
-  "Install a package from a file.
-The file can either be a tar file or an Emacs Lisp file."
-  (with-temp-buffer
-    (insert-file-contents-literally file)
-    (when (string-match "\\.tar\\'" file) (tar-mode))
-    (melpa2nix-install-from-buffer)))

From 9dfd9fe0bffeadb1b1f0e6f56ec3245fe5a26097 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 16 Jan 2016 18:38:06 -0600
Subject: [PATCH 0106/2285] elpa2nix: fix packages with DOS line endings

---
 pkgs/build-support/emacs/elpa2nix.el | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/emacs/elpa2nix.el b/pkgs/build-support/emacs/elpa2nix.el
index 3a2d65d640f4..7eef81b9e7ab 100644
--- a/pkgs/build-support/emacs/elpa2nix.el
+++ b/pkgs/build-support/emacs/elpa2nix.el
@@ -21,7 +21,10 @@
 (defun elpa2nix-install-file (file)
   "Install a package from a file.
 The file can either be a tar file or an Emacs Lisp file."
-  (with-temp-buffer
-    (insert-file-contents-literally file)
-    (when (string-match "\\.tar\\'" file) (tar-mode))
-    (elpa2nix-install-from-buffer)))
+  (let ((is-tar (string-match "\\.tar\\'" file)))
+    (with-temp-buffer
+      (if is-tar
+          (insert-file-contents-literally file)
+        (insert-file-contents file))
+      (when is-tar (tar-mode))
+      (elpa2nix-install-from-buffer))))

From a7f7698e046d491725f1764965974c8cc36e5077 Mon Sep 17 00:00:00 2001
From: Gleb Peregud <gleber.p@gmail.com>
Date: Mon, 18 Jan 2016 23:01:48 +0100
Subject: [PATCH 0107/2285] hex2nix: 0.0.2 -> 0.0.3

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

diff --git a/pkgs/development/tools/erlang/hex2nix/default.nix b/pkgs/development/tools/erlang/hex2nix/default.nix
index 8bb8f68e3a42..e7d237cfea22 100644
--- a/pkgs/development/tools/erlang/hex2nix/default.nix
+++ b/pkgs/development/tools/erlang/hex2nix/default.nix
@@ -2,13 +2,13 @@
 
 buildRebar3 rec {
     name = "hex2nix";
-    version = "0.0.2";
+    version = "0.0.3";
 
     src = fetchFromGitHub {
          owner = "erlang-nix";
          repo = "hex2nix";
          rev = "${version}";
-         sha256 = "18gkq5fkdiwq5zj98cz4kqxbpzjkpqcplpsw987drxwdbvq4hkwm";
+         sha256 = "1snlcb60al7fz3z4c4rqrb9gqdyihyhsrr90n40v9rdm98csry3k";
      };
 
     erlangDeps = [ ibrowse jsx erlware_commons getopt ];

From 8d6dd873a93505b9a494bc95e1bba582b9925447 Mon Sep 17 00:00:00 2001
From: Gleb Peregud <gleber.p@gmail.com>
Date: Mon, 18 Jan 2016 23:02:03 +0100
Subject: [PATCH 0108/2285] rebar3-nix-bootstrap: 0.0.1 -> 0.0.2

---
 .../development/tools/erlang/rebar3-nix-bootstrap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix b/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix
index b32d196272b7..7a2b89f7f05b 100644
--- a/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix
+++ b/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
     name = "rebar3-nix-bootstrap";
-    version = "0.0.1";
+    version = "0.0.2";
 
     src = fetchFromGitHub {
         owner = "erlang-nix";
         repo = "rebar3-nix-bootstrap";
         rev = "${version}";
-        sha256 = "0xyj7j59dmxyl5nhhsmb0r1pihmk0s4k02ga1rfgm30rij6n7431";
+        sha256 = "1zvrjljvi5plx8qc8sn6krymv8hk8ihx766hrc8v4d840xphl236";
     };
 
     buildInputs = [ erlang ];

From 0dd8e03308a4e300b22282358511fc0296327859 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Tue, 19 Jan 2016 09:32:49 +0900
Subject: [PATCH 0109/2285] i3 service: added i3status and dmenu dependency

---
 nixos/modules/services/x11/window-managers/i3.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/window-managers/i3.nix b/nixos/modules/services/x11/window-managers/i3.nix
index 0d5816e363d6..d43dacb1be6b 100644
--- a/nixos/modules/services/x11/window-managers/i3.nix
+++ b/nixos/modules/services/x11/window-managers/i3.nix
@@ -34,6 +34,6 @@ in
         '';
       }];
     };
-    environment.systemPackages = [ pkgs.i3 ];
+    environment.systemPackages = with pkgs; [ i3 i3status dmenu ];
   };
 }

From 9f38c9a67557f23c38ee0098c3235c250a6b551c Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Tue, 19 Jan 2016 09:41:21 +0900
Subject: [PATCH 0110/2285] albert: init at 0.8.0

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

diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix
new file mode 100644
index 000000000000..b6c0feede6cd
--- /dev/null
+++ b/pkgs/applications/misc/albert/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, qtbase, qtx11extras, makeQtWrapper, muparser, cmake }:
+
+stdenv.mkDerivation rec {
+  name    = "albert-${version}";
+  version = "0.8.0";
+
+  src = fetchFromGitHub {
+    owner  = "manuelschneid3r";
+    repo   = "albert";
+    rev    = "v${version}";
+    sha256 = "0lzj1gbcc5sp2x1c0d3s21y55kcnnn4dmy8d205mrgnyavjrak7n";
+  };
+
+  buildInputs = [ cmake qtbase qtx11extras muparser makeQtWrapper ];
+
+  fixupPhase = ''
+    wrapQtProgram $out/bin/albert
+  '';
+
+  meta = {
+    homepage    = https://github.com/manuelSchneid3r/albert;
+    description = "Desktop agnostic launcher";
+    license     = stdenv.lib.licenses.gpl3Plus;
+    maintainers = [ stdenv.lib.maintainers.ericsagnes ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a14986b6b311..0024b915acac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -525,6 +525,8 @@ let
 
   aj-snapshot  = callPackage ../applications/audio/aj-snapshot { };
 
+  albert = qt5.callPackage ../applications/misc/albert {};
+
   analog = callPackage ../tools/admin/analog {};
 
   apktool = callPackage ../development/tools/apktool {

From 097c82f6c5db7dcd6fb4884680e8ba39b99dc00c Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 19 Jan 2016 01:44:21 +0100
Subject: [PATCH 0111/2285] fstar: init at 2016-01-12

---
 pkgs/development/compilers/fstar/default.nix | 78 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  4 +
 pkgs/top-level/dotnet-packages.nix           |  7 ++
 3 files changed, 89 insertions(+)
 create mode 100644 pkgs/development/compilers/fstar/default.nix

diff --git a/pkgs/development/compilers/fstar/default.nix b/pkgs/development/compilers/fstar/default.nix
new file mode 100644
index 000000000000..e6fe97c6fe8f
--- /dev/null
+++ b/pkgs/development/compilers/fstar/default.nix
@@ -0,0 +1,78 @@
+{ stdenv, fetchFromGitHub, mono, fsharp, dotnetPackages, z3, ocamlPackages, openssl, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "fstar-${version}";
+  version = "2016-01-12";
+
+  src = fetchFromGitHub {
+    owner = "FStarLang";
+    repo = "FStar";
+    rev = "af9a231566ca52c9bc3409398c801ae9e8191cfa";
+    sha256 = "1zri4gqr6j6hygnh0ckfhq93mqwk9i19vng8chnmvlr27zq734a2";
+  };
+
+  buildInputs = with ocamlPackages; [
+    mono fsharp z3 dotnetPackages.FsLexYacc ocaml findlib ocaml_batteries openssl makeWrapper
+  ];
+
+  preBuild = ''
+    substituteInPlace src/Makefile --replace "\$(RUNTIME) VS/.nuget/NuGet.exe" "true"
+
+    source setenv.sh
+  '';
+
+  makeFlags = [
+    "FSYACC=${dotnetPackages.FsLexYacc}/bin/fsyacc"
+    "FSLEX=${dotnetPackages.FsLexYacc}/bin/fslex"
+    "NUGET=true"
+    "PREFIX=$(out)"
+  ];
+
+  buildFlags = "-C src";
+
+  # Now that the .NET fstar.exe is built, use it to build the native OCaml binary
+  postBuild = ''
+    patchShebangs bin/fstar.exe
+
+    # Workaround for fsharp/fsharp#419
+    cp ${fsharp}/lib/mono/4.5/FSharp.Core.dll bin/
+
+    # Use the built .NET binary to extract the sources of itself from F* to OCaml
+    make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} \
+        $makeFlags "''${makeFlagsArray[@]}" \
+        ocaml -C src
+
+    # Build the extracted OCaml sources
+    make ''${enableParallelBuilding:+-j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} \
+        $makeFlags "''${makeFlagsArray[@]}" \
+        -C src/ocaml-output
+  '';
+
+  doCheck = true;
+
+  preCheck = "ulimit -s unlimited";
+
+  # Basic test suite:
+  #checkFlags = "VERBOSE=y -C examples";
+
+  # Complete, but heavyweight test suite:
+  checkTarget = "regressions";
+  checkFlags = "VERBOSE=y -C src";
+
+  installFlags = "-C src/ocaml-output";
+
+  postInstall = ''
+    # Workaround for FStarLang/FStar#456
+    mv $out/lib/fstar/* $out/lib/
+    rmdir $out/lib/fstar
+
+    wrapProgram $out/bin/fstar.exe --prefix PATH ":" "${z3}/bin"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "ML-like functional programming language aimed at program verification";
+    homepage = "https://www.fstar-lang.org";
+    license = licenses.asl20;
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a14986b6b311..5e5be73ea745 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4180,6 +4180,10 @@ let
 
   fsharp = callPackage ../development/compilers/fsharp {};
 
+  fstar = callPackage ../development/compilers/fstar {
+    ocamlPackages = ocamlPackages_4_02;
+  };
+
   dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {});
 
   go_1_4 = callPackage ../development/compilers/go/1.4.nix {
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index b66a37c69351..a1c54074622e 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -67,6 +67,13 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "lib/net45/*" ];
   };
 
+  FsLexYacc = fetchNuGet {
+    baseName = "FsLexYacc";
+    version = "6.1.0";
+    sha256 = "1v5myn62zqs431i046gscqw2v0c969fc7pdplx7z9cnpy0p2s4rv";
+    outputFiles = [ "build/*" ];
+  };
+
   FsPickler = fetchNuGet {
     baseName = "FsPickler";
     version = "1.2.9";

From 593489b1446e8b526dab2e360bd3c419f1e119c1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 18 Jan 2016 19:45:04 +0100
Subject: [PATCH 0112/2285] snapper: remove outdated (no-op) substitution

---
 pkgs/tools/misc/snapper/default.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
index 111cf1b75d28..4f66a7b23813 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -24,11 +24,7 @@ stdenv.mkDerivation rec {
   patchPhase = ''
     # work around missing btrfs/version.h; otherwise, use "-DHAVE_BTRFS_VERSION_H"
     substituteInPlace snapper/Btrfs.cc --replace "define BTRFS_LIB_VERSION (100)" "define BTRFS_LIB_VERSION (200)";
-    # fix strange SuSE boost naming
-    substituteInPlace snapper/Makefile.am --replace \
-      "libsnapper_la_LIBADD = -lboost_thread-mt -lboost_system-mt -lxml2 -lacl -lz -lm" \
-      "libsnapper_la_LIBADD = -lboost_thread -lboost_system -lxml2 -lacl -lz -lm";
-    '';
+  '';
 
   configurePhase = ''
     ./configure --disable-silent-rules --disable-ext4 --disable-btrfs-quota --prefix=$out

From 33e2c9c29ad5c8de1a9ff16029b0f8eaffc8f100 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 19 Jan 2016 01:20:58 +0100
Subject: [PATCH 0113/2285] dpkg: 1.18.2 -> 1.18.4

---
 pkgs/tools/package-management/dpkg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index 680a8ef1bda0..7b4486a8d862 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper }:
 
-let version = "1.18.2"; in
+let version = "1.18.4"; in
 
 stdenv.mkDerivation {
   name = "dpkg-${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
-    sha256 = "192pqjd0c7i91kiqzn3cq2sqp5vivf0079i0wybdc9yhfcm4yj0i";
+    sha256 = "1nh6y6xvnq6f4qd6y3dx9m77sxjg4qk1z1j5pwayg348d0w292gy";
   };
 
   postPatch = ''

From f499c03ec0ac949cdd0ce6a6124a7d01c53898c6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 19 Jan 2016 01:39:34 +0100
Subject: [PATCH 0114/2285] snapper: add missing dependencies (chattr, lv*)

---
 pkgs/tools/misc/snapper/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
index 4f66a7b23813..1a0c805a2ec6 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchFromGitHub
-, autoreconfHook, diffutils, pkgconfig, docbook_xsl, libxml2, libxslt, docbook_xml_dtd_45
-, acl, attr, boost, btrfs-progs, dbus_libs, pam, utillinux }:
+, autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45
+, acl, attr, boost, btrfs-progs, dbus_libs, diffutils, e2fsprogs, libxml2
+, lvm2, pam, utillinux }:
 
 stdenv.mkDerivation rec {
   name = "snapper-${ver}";
@@ -13,12 +14,13 @@ stdenv.mkDerivation rec {
     sha256 = "1rj8vy6hq140pbnc7mjjb34mfqdgdah1dmlv2073izdgakh7p38j";
   };
 
-  buildInputs = [
-    acl attr boost btrfs-progs dbus_libs pam utillinux
-  ];
   nativeBuildInputs = [
-    autoreconfHook diffutils pkgconfig
-    docbook_xsl libxml2 libxslt docbook_xml_dtd_45
+    autoreconfHook pkgconfig
+    docbook_xsl libxslt docbook_xml_dtd_45
+  ];
+  buildInputs = [
+    acl attr boost btrfs-progs dbus_libs diffutils e2fsprogs libxml2
+    lvm2 pam utillinux
   ];
 
   patchPhase = ''

From 37598195e5b830b61d7fafff006a88c02f287d97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 19 Jan 2016 08:24:55 +0100
Subject: [PATCH 0115/2285] protobuf-3.0: enableParallelBuilding = true

Otherwise it takes quite a long time to build.
---
 pkgs/development/libraries/protobuf/3.0.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/protobuf/3.0.nix b/pkgs/development/libraries/protobuf/3.0.nix
index f0bc0ca79f2b..a06d4cef968a 100644
--- a/pkgs/development/libraries/protobuf/3.0.nix
+++ b/pkgs/development/libraries/protobuf/3.0.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ autoreconfHook zlib ];
 
+  enableParallelBuilding = true;
+
   doCheck = true;
 
   meta = {

From e775690e5cebb438ecb2522d7b2ba993e19dfd6a Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 19 Jan 2016 09:28:52 +0000
Subject: [PATCH 0116/2285] Fix nixops URL

---
 pkgs/tools/package-management/nixops/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index 5bf156b62e37..b49491cf15ff 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -3,7 +3,7 @@
 callPackage ./generic.nix (rec {
   version = "1.3.1";
   src = fetchurl {
-    url = "http://nixos.org/releases/nixops/nixops/nixops-${version}.tar.bz2";
+    url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
     sha256 = "04j8s0gg1aj3wmj1bs7dwscfmlzk2xpwfw9rk4xzxwxw1y0j64nd";
   };
 })

From ce2756f701886313180655a069202f3771621404 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 19 Jan 2016 10:00:32 +0000
Subject: [PATCH 0117/2285] Fix nixops URL

---
 pkgs/tools/package-management/nixops/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/package-management/nixops/default.nix b/pkgs/tools/package-management/nixops/default.nix
index 4388cbc5b3da..b49491cf15ff 100644
--- a/pkgs/tools/package-management/nixops/default.nix
+++ b/pkgs/tools/package-management/nixops/default.nix
@@ -1,9 +1,9 @@
 { callPackage, fetchurl }:
 
 callPackage ./generic.nix (rec {
-  version = "1.3";
+  version = "1.3.1";
   src = fetchurl {
-    url = "http://nixos.org/releases/nixops/nixops/nixops-${version}.tar.bz2";
-    sha256 = "d80b0fe3bb31bb84a8545f9ea804ec8137172c8df44f03326ed7639e5a4bad55";
+    url = "http://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2";
+    sha256 = "04j8s0gg1aj3wmj1bs7dwscfmlzk2xpwfw9rk4xzxwxw1y0j64nd";
   };
 })

From cdd07d166b4a62dbc5ec595343fcc0822b05732a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 18 Jan 2016 16:11:52 +0100
Subject: [PATCH 0118/2285] uhc: the build is broken (and will be for the
 foreseeable future)

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

diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix
index eda5157bb757..0d91ca2ff3b2 100644
--- a/pkgs/development/compilers/uhc/default.nix
+++ b/pkgs/development/compilers/uhc/default.nix
@@ -51,5 +51,7 @@ in stdenv.mkDerivation rec {
     # support the -static flag and thus breaks the build.
     platforms = ["x86_64-linux"];
 
+    broken = true;  # https://github.com/UU-ComputerScience/uhc/issues/69
+
   };
 }

From c7383cb34b749306552b13f27a9f5edcebbd90ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 19 Jan 2016 11:17:49 +0100
Subject: [PATCH 0119/2285] fetchurl: support executables

---
 pkgs/build-support/fetchurl/builder.sh  | 5 +++++
 pkgs/build-support/fetchurl/default.nix | 7 +++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchurl/builder.sh b/pkgs/build-support/fetchurl/builder.sh
index 29565d7cdb9a..c4fd18e46caf 100644
--- a/pkgs/build-support/fetchurl/builder.sh
+++ b/pkgs/build-support/fetchurl/builder.sh
@@ -45,6 +45,11 @@ tryDownload() {
 
 finish() {
     set +o noglob
+
+    if [[ $executable == "1" ]]; then
+      chmod +x $downloadedFile
+    fi
+
     runHook postFetch
     stopNest
     exit 0
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index b1dc6e7be31b..804974954d10 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -73,6 +73,9 @@ in
   # is communicated to postFetch via $downloadedFile.
   downloadToTemp ? false
 
+, # If true, set executable bit on downloaded file
+  executable ? false
+
 , # If set, don't download the file, but write a list of all possible
   # URLs (resulting from resolving mirror:// URLs) to $out.
   showURLs ? false
@@ -116,9 +119,9 @@ if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${s
   outputHash = if outputHash != "" then outputHash else
       if sha256 != "" then sha256 else if sha1 != "" then sha1 else md5;
 
-  outputHashMode = if recursiveHash then "recursive" else "flat";
+  outputHashMode = if (recursiveHash || executable) then "recursive" else "flat";
 
-  inherit curlOpts showURLs mirrorsFile impureEnvVars postFetch downloadToTemp;
+  inherit curlOpts showURLs mirrorsFile impureEnvVars postFetch downloadToTemp executable;
 
   # Doing the download on a remote machine just duplicates network
   # traffic, so don't do that.

From 44d0d58c843cede9b6a4e1114a0ab8029fba87b7 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Tue, 19 Jan 2016 11:31:27 +0100
Subject: [PATCH 0120/2285] gnome3: 3.18.1 -> 3.18.2

---
 pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix b/pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix
index bb02f9c6f844..6448f9aa99df 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gtksourceview/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gtksourceview-3.18.1";
+  name = "gtksourceview-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gtksourceview/3.18/gtksourceview-3.18.1.tar.xz;
-    sha256 = "7be95faf068b9f0ac7540cc1e8d607baa98a482850ef11a6471b53c9327aede6";
+    url = mirror://gnome/sources/gtksourceview/3.18/gtksourceview-3.18.2.tar.xz;
+    sha256 = "60f75a9f0039e13a2281fc595b5ef7344afa06732cc53b57d13234bfb0a5b7b2";
   };
 }

From c860e27ef22e29a19aac205942223b8dfefe90ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 19 Jan 2016 12:13:26 +0100
Subject: [PATCH 0121/2285] zeroad: do not build on Hydra

It should be possible to build binaries without data and then compose by
a wrapper, e.g. similarly to what simutrans does.
---
 pkgs/games/0ad/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix
index f9eb90f34f8c..eee1d34745f6 100644
--- a/pkgs/games/0ad/default.nix
+++ b/pkgs/games/0ad/default.nix
@@ -126,5 +126,6 @@ stdenv.mkDerivation rec {
       licenses.zlib # otherwise masked by pkgs.zlib
     ];
     platforms = [ "x86_64-linux" "i686-linux" ];
+    hydraPlatforms = []; # the data are too big (~1.5 GB)
   };
 }

From 28fc526f169c8a87be4caaa0349ac0a79001d876 Mon Sep 17 00:00:00 2001
From: Gleb Peregud <gleber.p@gmail.com>
Date: Tue, 19 Jan 2016 12:33:46 +0100
Subject: [PATCH 0122/2285] Update Erlang hex.pm packages at 2016-01-19.

This is a first fully automatic build.
---
 .../erlang-modules/hex-packages.nix           | 5916 ++++++++---------
 1 file changed, 2818 insertions(+), 3098 deletions(-)

diff --git a/pkgs/development/erlang-modules/hex-packages.nix b/pkgs/development/erlang-modules/hex-packages.nix
index 0bceb47452f9..485d35b42ad4 100644
--- a/pkgs/development/erlang-modules/hex-packages.nix
+++ b/pkgs/development/erlang-modules/hex-packages.nix
@@ -1,3715 +1,3435 @@
-/* hex-packages.nix is an auto-generated file -- DO NOT EDIT!
-*
-* Unbuildable Packages:
-*
-* active_0_9_0
-* conferl_0_0_1
-* db_0_9_0
-* ekstat_0_2_2
-* erltrace_0_1_4
-* escalus_2_6_4
-* fqc_0_1_5
-*  - libsnarlmatch_0_1_5
-*  - rankmatcher_0_1_2
-* fqc_0_1_7
-* hash_ring_ex_1_1_2
-* gpb_3_18_10
-* gpb_3_18_8
-*  - rebar_protobuffs_0_1_0
-* jose_1_4_2
-* jsxn_0_2_1
-* kvs_2_1_0
-* lager_2_1_1
-* - dqe_0_1_22
-* - ensq_0_1_6
-* - eplugin_0_1_4
-* - fifo_utils_0_1_18
-* - lager_watchdog_0_1_10
-* - mdns_client_0_1_7
-* - mdns_client_lib_0_1_33
-* lasp_0_0_3
-* libleofs_0_1_2
-* ezmq_0_2_0
-* mad_0_9_0
-* hackney_1_4_8
-* mmath_0_1_15
-*  - ddb_client_0_1_17
-*    - folsom_ddb_0_1_20
-*  - dproto_0_1_12
-*  - mstore_0_1_9
-* mmath_0_1_16
-* n2o_2_3_0
-* nodefinder_1_4_0
-*  - cloudi_core_1_4_0_rc_4
-*    - cloudi_service_db_cassandra_1_3_3
-*    - cloudi_service_db_elasticsearch_1_3_3
-*    - cloudi_service_db_riak_1_3_3
-* nodefinder_1_5_1
-*   - cloudi_core_1_5_1
-*   - cloudi_service_api_requests_1_5_1
-*   - cloudi_service_db_1_5_1
-*   - cloudi_service_db_cassandra_cql_1_5_1
-*   - cloudi_service_db_couchdb_1_5_1
-*   - cloudi_service_db_http_elli_1_5_1
-*   - cloudi_service_db_memcached_1_5_1
-*   - cloudi_service_db_mysql_1_5_1
-*   - cloudi_service_db_pgsql_1_5_1
-*   - cloudi_service_db_tokyotyrant_1_5_0
-*   - cloudi_service_filesystem_1_5_1
-*   - cloudi_service_http_client_1_5_1
-*   - cloudi_service_http_cowboy_1_5_1
-*   - cloudi_service_http_rest_1_5_1
-*   - cloudi_service_map_reduce_1_5_1
-*   - cloudi_service_monitoring_1_5_1
-*   - cloudi_service_queue_1_5_1
-*   - cloudi_service_quorum_1_5_1
-*   - cloudi_service_router_1_5_1
-*   - cloudi_service_tcp_1_5_1
-*   - cloudi_service_timers_1_5_1
-*   - cloudi_service_udp_1_5_1
-*   - cloudi_service_validate_1_5_1
-*   - cloudi_service_zeromq_1_5_1
-*   - service_1_5_1
-* fast_yaml_1_0_1
-* parse_trans_2_9_0
-* pooler_1_4_0
-* protobuffs_0_8_2
-*   - rebar3_protobuffs_0_2_0
-*   - riak_pb_2_1_0
-*     - riakc_2_1_1
-* locker_1_0_8
-* cowboy_1_0_4
-*  - cet_0_2_0
-* amqp_client_3_5_6
-* rebar3_abnfc_plugin_0_1_0
-* rebar3_eqc_0_0_8
-* rebar3_exunit_0_1_1
-* rebar3_proper_0_5_0
-* rebar3_yang_plugin_0_2_1
-* hackney_1_1_0
-*  - erlastic_search_1_1_1
-* hackney_1_3_1
-*  - craterl_0_2_3
-* hackney_1_3_2
-*  - epubnub_0_1_0
-* cpg_1_4_0
-* cpg_1_5_1
-* uuid_erl_1_4_0
-* uuid_erl_1_5_1
-* ucol_nif_1_1_5
-* katipo_0_2_4
-* xref_runner_0_2_4
-* erlexec_1_0_1
-* exec_1_0_1
+/* hex-packages.nix is an auto-generated file -- DO NOT EDIT! */
+
+/* Unbuildable packages: 
+
+ * active_0_9_0
+ * amqp_client_3_5_6
+ * aws_http_0_2_4
+ * barrel_jiffy_0_14_4
+ * barrel_jiffy_0_14_5
+ * cet_0_2_1
+ * 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
+ * cloudi_service_db_cassandra_1_3_3
+ * cloudi_service_db_cassandra_cql_1_5_1
+ * cloudi_service_db_couchdb_1_5_1
+ * cloudi_service_db_elasticsearch_1_3_3
+ * cloudi_service_db_http_elli_1_5_1
+ * cloudi_service_db_memcached_1_5_1
+ * cloudi_service_db_mysql_1_5_1
+ * cloudi_service_db_pgsql_1_5_1
+ * cloudi_service_db_riak_1_3_3
+ * cloudi_service_db_tokyotyrant_1_5_0
+ * cloudi_service_filesystem_1_5_1
+ * cloudi_service_http_client_1_5_1
+ * cloudi_service_http_cowboy_1_5_1
+ * cloudi_service_http_rest_1_5_1
+ * cloudi_service_map_reduce_1_5_1
+ * cloudi_service_monitoring_1_5_1
+ * cloudi_service_queue_1_5_1
+ * cloudi_service_quorum_1_5_1
+ * cloudi_service_router_1_5_1
+ * cloudi_service_tcp_1_5_1
+ * cloudi_service_timers_1_5_1
+ * cloudi_service_udp_1_5_1
+ * cloudi_service_validate_1_5_1
+ * cloudi_service_zeromq_1_5_1
+ * cmark_0_6_2
+ * comeonin_2_0_1
+ * conferl_0_0_1
+ * cowboy_1_0_4
+ * cpg_1_4_0
+ * cpg_1_5_1
+ * craterl_0_2_3
+ * db_0_9_0
+ * ddb_client_0_1_17
+ * denrei_0_2_3
+ * dproto_0_1_12
+ * dqe_0_1_22
+ * ekstat_0_2_2
+ * elibphonenumber_0_1_1
+ * enotify_0_1_0
+ * ensq_0_1_6
+ * eplugin_0_1_4
+ * epubnub_0_1_0
+ * eredis_cluster_0_5_4
+ * erlang_lua_0_1_0
+ * erlastic_search_1_1_1
+ * erlaudio_0_2_3
+ * erltrace_0_1_4
+ * escalus_2_6_4
+ * ex_bitcask_0_1_0
+ * ezmq_0_2_0
+ * fast_tls_1_0_0
+ * fast_xml_1_1_2
+ * fast_yaml_1_0_1
+ * fifo_utils_0_1_18
+ * folsom_ddb_0_1_20
+ * fqc_0_1_7
+ * gpb_3_18_10
+ * gpb_3_18_8
+ * hackney_1_1_0
+ * hackney_1_3_1
+ * hackney_1_3_2
+ * hackney_1_4_8
+ * hash_ring_ex_1_1_2
+ * jc_1_0_4
+ * jose_1_4_2
+ * jsxn_0_2_1
+ * katipo_0_2_4
+ * kvs_2_1_0
+ * lager_2_1_1
+ * lager_watchdog_0_1_10
+ * lasp_0_0_3
+ * libleofs_0_1_2
+ * locker_1_0_8
+ * mad_0_9_0
+ * mcrypt_0_1_0
+ * mdns_client_0_1_7
+ * mdns_client_lib_0_1_33
+ * mmath_0_1_15
+ * mmath_0_1_16
+ * mstore_0_1_9
+ * n2o_2_3_0
+ * nacl_0_3_0
+ * nodefinder_1_4_0
+ * nodefinder_1_5_1
+ * observer_cli_1_0_3
+ * p1_xml_1_1_1
+ * parse_trans_2_9_0
+ * picosat_0_1_0
+ * pooler_1_4_0
+ * protobuffs_0_8_2
+ * rankmatcher_0_1_2
+ * rebar3_abnfc_plugin_0_1_0
+ * rebar3_auto_0_3_0
+ * rebar3_eqc_0_0_8
+ * rebar3_exunit_0_1_1
+ * rebar3_live_0_1_3
+ * rebar3_proper_0_5_0
+ * rebar3_protobuffs_0_2_0
+ * rebar3_run_0_2_0
+ * rebar3_yang_plugin_0_2_1
+ * rebar_protobuffs_0_1_0
+ * riak_pb_2_1_0
+ * riakc_2_1_1
+ * service_1_5_1
+ * sfmt_0_12_8
+ * siphash_2_1_1
+ * snappy_1_1_1
+ * stun_1_0_0
+ * syslog_1_0_2
+ * ucol_nif_1_1_5
+ * uuid_erl_1_4_0
+ * uuid_erl_1_5_1
+ * xref_runner_0_2_5
+ * yomel_0_5_0
+
 */
 { stdenv, callPackage }:
 
 let
   self = rec {
-
     backoff_1_1_3 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "backoff";
-            version = "1.1.3";
-            sha256 =
-              "30cead738d20e4c8d36cd37857dd5e23aeba57cb868bf64766d47d371422bdff";
-
-            meta = {
-              description = "Exponential backoffs library";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ferd/backoff";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "backoff";
+	    version = "1.1.3";
+	    sha256 =
+	      "30cead738d20e4c8d36cd37857dd5e23aeba57cb868bf64766d47d371422bdff";
+	      
+	    meta = {
+	      description = "Exponential backoffs library";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/ferd/backoff";
+	    };
+	  }
       ) {};
-
+    
     backoff = backoff_1_1_3;
-
+    
     barrel_ibrowse_4_2_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "barrel_ibrowse";
-            version = "4.2.0";
-            sha256 =
-              "58bd9e45932c10fd3d0ceb5c4e47952c3243ea300b388192761ac20be197b2ca";
-
-            meta = {
-              description = "Erlang HTTP client application";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/barrel-db/ibrowse";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "barrel_ibrowse";
+	    version = "4.2.0";
+	    sha256 =
+	      "58bd9e45932c10fd3d0ceb5c4e47952c3243ea300b388192761ac20be197b2ca";
+	      
+	    meta = {
+	      description = "Erlang HTTP client application";
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/barrel-db/ibrowse";
+	    };
+	  }
       ) {};
-
+    
     barrel_ibrowse = barrel_ibrowse_4_2_0;
-
-    barrel_jiffy_0_14_4 = callPackage
-      (
-        {  buildHex }:
-          buildHex {
-            name = "barrel_jiffy";
-            version = "0.14.4";
-            sha256 =
-              "3b730d6a18e988b8411f449bbb5df3637eb7bea864302924581b2391dd6b6e71";
-            compilePort = true;
-
-            meta = {
-              description = "JSON Decoder/Encoder.";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/barrel-db/jiffy";
-            };
-          }
-      ) {};
-
-    barrel_jiffy_0_14_5 = callPackage
-      (
-        {  buildHex }:
-          buildHex {
-            name = "barrel_jiffy";
-            version = "0.14.5";
-            sha256 =
-              "8a874c6dbcf439a7d7b300b4463f47e088fd54e2b715ef7261e21807ee421f47";
-            compilePort = true;
-
-            meta = {
-              description = "JSON Decoder/Encoder.";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/barrel-db/jiffy";
-            };
-          }
-      ) {};
-
-    barrel_jiffy = barrel_jiffy_0_14_5;
-
+    
     barrel_oauth_1_6_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "barrel_oauth";
-            version = "1.6.0";
-            sha256 =
-              "b2a800b771d45f32a9a55d416054b3bdfab3a925b62e8000f2c08b719390d4dd";
-
-            meta = {
-              description = "An Erlang OAuth 1.0 implementation";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/barrel-db/erlang-oauth";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "barrel_oauth";
+	    version = "1.6.0";
+	    sha256 =
+	      "b2a800b771d45f32a9a55d416054b3bdfab3a925b62e8000f2c08b719390d4dd";
+	      
+	    meta = {
+	      description = "An Erlang OAuth 1.0 implementation";
+	      license = stdenv.lib.licenses.bsd3;
+	      homepage = "https://github.com/barrel-db/erlang-oauth";
+	    };
+	  }
       ) {};
-
+    
     barrel_oauth = barrel_oauth_1_6_0;
-
+    
     base16_1_0_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "base16";
-            version = "1.0.0";
-            sha256 =
-              "02afd0827e61a7b07093873e063575ca3a2b07520567c7f8cec7c5d42f052d76";
-
-            meta = {
-              description = "Base16 encoding and decoding";
-              license = with stdenv.lib.licenses; [ bsd3 free ];
-              homepage = "https://github.com/goj/base16";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "base16";
+	    version = "1.0.0";
+	    sha256 =
+	      "02afd0827e61a7b07093873e063575ca3a2b07520567c7f8cec7c5d42f052d76";
+	      
+	    meta = {
+	      description = "Base16 encoding and decoding";
+	      license = with stdenv.lib.licenses; [ bsd3 free ];
+	      homepage = "https://github.com/goj/base16";
+	    };
+	  }
       ) {};
-
+    
     base16 = base16_1_0_0;
-
+    
     base64url_0_0_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "base64url";
-            version = "0.0.1";
-            sha256 =
-              "fab09b20e3f5db886725544cbcf875b8e73ec93363954eb8a1a9ed834aa8c1f9";
-
-            meta = {
-              description = "URL safe base64-compatible codec";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/dvv/base64url";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "base64url";
+	    version = "0.0.1";
+	    sha256 =
+	      "fab09b20e3f5db886725544cbcf875b8e73ec93363954eb8a1a9ed834aa8c1f9";
+	      
+	    meta = {
+	      description = "URL safe base64-compatible codec";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/dvv/base64url";
+	    };
+	  }
       ) {};
-
+    
     base64url = base64url_0_0_1;
-
+    
     bbmustache_1_0_4 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "bbmustache";
-            version = "1.0.4";
-            sha256 =
-              "03b0d47db66e86df993896dce7578d7e4aae5f84636809b45fa8a3e34ee59b12";
-
-            meta = {
-              description =
-                "Binary pattern match Based Mustache template engine for Erlang/OTP";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/soranoba/bbmustache";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "bbmustache";
+	    version = "1.0.4";
+	    sha256 =
+	      "03b0d47db66e86df993896dce7578d7e4aae5f84636809b45fa8a3e34ee59b12";
+	      
+	    meta = {
+	      description =
+		"Binary pattern match Based Mustache template engine for Erlang/OTP";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/soranoba/bbmustache";
+	    };
+	  }
       ) {};
-
+    
     bbmustache_1_1_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "bbmustache";
-            version = "1.1.0";
-            sha256 =
-              "aa22469836bb8a9928ad741bdd2038d49116228bfbe0c2d6c792e1bdd4b256d9";
-
-            meta = {
-              description =
-                "Binary pattern match Based Mustache template engine for Erlang/OTP";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/soranoba/bbmustache";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "bbmustache";
+	    version = "1.1.0";
+	    sha256 =
+	      "aa22469836bb8a9928ad741bdd2038d49116228bfbe0c2d6c792e1bdd4b256d9";
+	      
+	    meta = {
+	      description =
+		"Binary pattern match Based Mustache template engine for Erlang/OTP";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/soranoba/bbmustache";
+	    };
+	  }
       ) {};
-
+    
     bbmustache = bbmustache_1_1_0;
-
+    
     bear_0_8_3 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "bear";
-            version = "0.8.3";
-            sha256 =
-              "0a04ce4702e00e0a43c0fcdd63e38c9c7d64dceb32b27ffed261709e7c3861ad";
-
-            meta = {
-              description = "Statistics functions for Erlang";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/puzza007/bear";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "bear";
+	    version = "0.8.3";
+	    sha256 =
+	      "0a04ce4702e00e0a43c0fcdd63e38c9c7d64dceb32b27ffed261709e7c3861ad";
+	      
+	    meta = {
+	      description = "Statistics functions for Erlang";
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/puzza007/bear";
+	    };
+	  }
       ) {};
-
+    
     bear = bear_0_8_3;
-
+    
     bstr_0_3_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "bstr";
-            version = "0.3.0";
-            sha256 =
-              "0fb4e05619663d48dabcd21023915741277ba392f2a5710dde7ab6034760284d";
-
-            meta = {
-              description = "Erlang library that uses binaries as strings";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/jcomellas/bstr";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "bstr";
+	    version = "0.3.0";
+	    sha256 =
+	      "0fb4e05619663d48dabcd21023915741277ba392f2a5710dde7ab6034760284d";
+	      
+	    meta = {
+	      description = "Erlang library that uses binaries as strings";
+	      license = stdenv.lib.licenses.bsd3;
+	      homepage = "https://github.com/jcomellas/bstr";
+	    };
+	  }
       ) {};
-
+    
     bstr = bstr_0_3_0;
-
+    
     cache_tab_1_0_1 = callPackage
       (
-        {  buildHex, p1_utils_1_0_1 }:
-          buildHex {
-            name = "cache_tab";
-            version = "1.0.1";
-            sha256 =
-              "717a91101e03535ab65e4a9ce028ae3f0ddfb4ce0fd4144bf8816082c6dc2933";
-
-            erlangDeps = [ p1_utils_1_0_1 ];
-
-            meta = {
-              description = "In-memory cache Erlang / Elixir library";
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/processone/cache_tab";
-            };
-          }
+	{ buildHex, p1_utils_1_0_1 }:
+	  buildHex {
+	    name = "cache_tab";
+	    version = "1.0.1";
+	    sha256 =
+	      "717a91101e03535ab65e4a9ce028ae3f0ddfb4ce0fd4144bf8816082c6dc2933";
+	     
+	    erlangDeps  = [ p1_utils_1_0_1 ];
+	    
+	    meta = {
+	      description = "In-memory cache Erlang / Elixir library";
+	      license = stdenv.lib.licenses.asl20;
+	      homepage = "https://github.com/processone/cache_tab";
+	    };
+	  }
       ) {};
-
+    
     cache_tab = cache_tab_1_0_1;
-
+    
     certifi_0_1_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "certifi";
-            version = "0.1.1";
-            sha256 =
-              "e6d1dda48fad1b1c5b454c8402e2ac375ae12bf85a9910decaf791f330a7de29";
-
-            meta = {
-              description = "An OTP library";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/certifi/erlang-certifi";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "certifi";
+	    version = "0.1.1";
+	    sha256 =
+	      "e6d1dda48fad1b1c5b454c8402e2ac375ae12bf85a9910decaf791f330a7de29";
+	      
+	    meta = {
+	      description = "An OTP library";
+	      license = stdenv.lib.licenses.bsd3;
+	      homepage = "https://github.com/certifi/erlang-certifi";
+	    };
+	  }
       ) {};
-
+    
     certifi_0_3_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "certifi";
-            version = "0.3.0";
-            sha256 =
-              "42ae85fe91c038a634a5fb8d0c77f4fc581914c508f087c7138e9366a1517f6a";
-
-            meta = {
-              description = "An OTP library";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/certifi/erlang-certifi";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "certifi";
+	    version = "0.3.0";
+	    sha256 =
+	      "42ae85fe91c038a634a5fb8d0c77f4fc581914c508f087c7138e9366a1517f6a";
+	      
+	    meta = {
+	      description = "An OTP library";
+	      license = stdenv.lib.licenses.bsd3;
+	      homepage = "https://github.com/certifi/erlang-certifi";
+	    };
+	  }
       ) {};
-
+    
     certifi = certifi_0_3_0;
-
+    
     cf_0_1_2 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "cf";
-            version = "0.1.2";
-            sha256 =
-              "c86f56bca74dd3616057b28574d920973fe665ecb064aa458dc6a2447f3f4924";
-
-            meta = {
-              description = "Terminal colour helper";
-              license = stdenv.lib.licenses.mit;
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "cf";
+	    version = "0.1.2";
+	    sha256 =
+	      "c86f56bca74dd3616057b28574d920973fe665ecb064aa458dc6a2447f3f4924";
+	      
+	    meta = {
+	      description = "Terminal colour helper";
+	      license = stdenv.lib.licenses.mit; 
+	    };
+	  }
       ) {};
-
+    
     cf_0_2_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "cf";
-            version = "0.2.1";
-            sha256 =
-              "baee9aa7ec2dfa3cb4486b67211177caa293f876780f0b313b45718edef6a0a5";
-
-            meta = {
-              description = "Terminal colour helper";
-              license = stdenv.lib.licenses.mit;
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "cf";
+	    version = "0.2.1";
+	    sha256 =
+	      "baee9aa7ec2dfa3cb4486b67211177caa293f876780f0b313b45718edef6a0a5";
+	      
+	    meta = {
+	      description = "Terminal colour helper";
+	      license = stdenv.lib.licenses.mit; 
+	    };
+	  }
       ) {};
-
+    
     cf = cf_0_2_1;
-
-    cmark_0_6_2 = callPackage
-      (
-        {  buildHex }:
-          buildHex {
-            name = "cmark";
-            version = "0.6.2";
-            sha256 =
-              "c17bbc354864cc8dfd352c772eb1655a5c67718c76d76df0aaf6179a833c76ef";
-            compilePort = true;
-
-            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";
-            };
-          }
-      ) {};
-
-    cmark = cmark_0_6_2;
-
-    comeonin_2_0_1 = callPackage
-      (
-        {  buildHex }:
-          buildHex {
-            name = "comeonin";
-            version = "2.0.1";
-            sha256 =
-              "7f7468625058ab1b817c00efa473d8117b0113a73a429f25cf663d5e2416572f";
-            compilePort = true;
-
-            meta = {
-              description =
-                "Password hashing (bcrypt, pbkdf2_sha512) library for Elixir.";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/elixircnx/comeonin";
-            };
-          }
-      ) {};
-
-    comeonin = comeonin_2_0_1;
-
+    
     couchbeam_1_2_1 = callPackage
       (
-        {  buildHex, hackney_1_4_4, jsx_2_8_0 }:
-          buildHex {
-            name = "couchbeam";
-            version = "1.2.1";
-            sha256 =
-              "ed19f0412aa0539ecf622ac8ade1ca0e316f424e3334ad015a3fb8db19e91194";
-
-            erlangDeps = [ hackney_1_4_4 jsx_2_8_0 ];
-
-            meta = {
-              description = "Erlang CouchDB client";
-              license = stdenv.lib.licenses.free;
-            };
-          }
+	{ buildHex, hackney_1_4_4, jsx_2_8_0 }:
+	  buildHex {
+	    name = "couchbeam";
+	    version = "1.2.1";
+	    sha256 =
+	      "ed19f0412aa0539ecf622ac8ade1ca0e316f424e3334ad015a3fb8db19e91194";
+	     
+	    erlangDeps  = [ hackney_1_4_4 jsx_2_8_0 ];
+	    
+	    meta = {
+	      description = "Erlang CouchDB client";
+	      license = stdenv.lib.licenses.free; 
+	    };
+	  }
       ) {};
-
+    
     couchbeam = couchbeam_1_2_1;
-
+    
     cowlib_1_0_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "cowlib";
-            version = "1.0.0";
-            sha256 =
-              "4dacd60356177ec8cf93dbff399de17435b613f3318202614d3d5acbccee1474";
-
-            meta = {
-              description = "Support library for manipulating Web protocols.";
-              license = stdenv.lib.licenses.isc;
-              homepage = "https://github.com/ninenines/cowlib";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "cowlib";
+	    version = "1.0.0";
+	    sha256 =
+	      "4dacd60356177ec8cf93dbff399de17435b613f3318202614d3d5acbccee1474";
+	      
+	    meta = {
+	      description = "Support library for manipulating Web protocols.";
+	      license = stdenv.lib.licenses.isc;
+	      homepage = "https://github.com/ninenines/cowlib";
+	    };
+	  }
       ) {};
-
+    
     cowlib_1_0_2 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "cowlib";
-            version = "1.0.2";
-            sha256 =
-              "db622da03aa039e6366ab953e31186cc8190d32905e33788a1acb22744e6abd2";
-
-            meta = {
-              description = "Support library for manipulating Web protocols.";
-              license = stdenv.lib.licenses.isc;
-              homepage = "https://github.com/ninenines/cowlib";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "cowlib";
+	    version = "1.0.2";
+	    sha256 =
+	      "db622da03aa039e6366ab953e31186cc8190d32905e33788a1acb22744e6abd2";
+	      
+	    meta = {
+	      description = "Support library for manipulating Web protocols.";
+	      license = stdenv.lib.licenses.isc;
+	      homepage = "https://github.com/ninenines/cowlib";
+	    };
+	  }
       ) {};
-
+    
     cowlib_1_3_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "cowlib";
-            version = "1.3.0";
-            sha256 =
-              "2b1ac020ec92e7a59cb7322779870c2d3adc7c904ecb3b9fa406f04dc9816b73";
-
-            meta = {
-              description = "Support library for manipulating Web protocols.";
-              license = stdenv.lib.licenses.isc;
-              homepage = "https://github.com/ninenines/cowlib";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "cowlib";
+	    version = "1.3.0";
+	    sha256 =
+	      "2b1ac020ec92e7a59cb7322779870c2d3adc7c904ecb3b9fa406f04dc9816b73";
+	      
+	    meta = {
+	      description = "Support library for manipulating Web protocols.";
+	      license = stdenv.lib.licenses.isc;
+	      homepage = "https://github.com/ninenines/cowlib";
+	    };
+	  }
       ) {};
-
+    
     cowlib = cowlib_1_3_0;
-
+    
     crc_0_3_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "crc";
-            version = "0.3.0";
-            sha256 =
-              "23d7cb6a18cca461f46f5a0f341c74fd0a680cdae62460687f1a24f0a7faabd4";
-
-            meta = {
-              description =
-                "A library used to calculate CRC checksums for binary data";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/TattdCodeMonkey/crc";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "crc";
+	    version = "0.3.0";
+	    sha256 =
+	      "23d7cb6a18cca461f46f5a0f341c74fd0a680cdae62460687f1a24f0a7faabd4";
+	      
+	    meta = {
+	      description =
+		"A library used to calculate CRC checksums for binary data";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/TattdCodeMonkey/crc";
+	    };
+	  }
       ) {};
-
+    
     crc = crc_0_3_0;
-
+    
     crypto_rsassa_pss_1_0_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "crypto_rsassa_pss";
-            version = "1.0.0";
-            sha256 =
-              "d8f48874dbef940a8954126249499714e702d8ae0a8f23230a6c2f4a92833313";
-
-            meta = {
-              description =
-                "RSASSA-PSS Public Key Cryptographic Signature Algorithm for Erlang";
-              license = stdenv.lib.licenses.free;
-              homepage =
-                "https://github.com/potatosalad/erlang-crypto_rsassa_pss";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "crypto_rsassa_pss";
+	    version = "1.0.0";
+	    sha256 =
+	      "d8f48874dbef940a8954126249499714e702d8ae0a8f23230a6c2f4a92833313";
+	      
+	    meta = {
+	      description =
+		"RSASSA-PSS Public Key Cryptographic Signature Algorithm for Erlang";
+	      license = stdenv.lib.licenses.free;
+	      homepage =
+		"https://github.com/potatosalad/erlang-crypto_rsassa_pss";
+	    };
+	  }
       ) {};
-
+    
     crypto_rsassa_pss = crypto_rsassa_pss_1_0_0;
-
+    
     cth_readable_1_2_0 = callPackage
       (
-        {  buildHex, cf_0_2_1 }:
-          buildHex {
-            name = "cth_readable";
-            version = "1.2.0";
-            sha256 =
-              "41dee2a37e0f266c590b3ea9542ca664e84ebc781a3949115eba658afc08026d";
-
-            erlangDeps = [ cf_0_2_1 ];
-
-            meta = {
-              description = "Common Test hooks for more readable logs";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/ferd/cth_readable";
-            };
-          }
+	{ buildHex, cf_0_2_1 }:
+	  buildHex {
+	    name = "cth_readable";
+	    version = "1.2.0";
+	    sha256 =
+	      "41dee2a37e0f266c590b3ea9542ca664e84ebc781a3949115eba658afc08026d";
+	     
+	    erlangDeps  = [ cf_0_2_1 ];
+	    
+	    meta = {
+	      description = "Common Test hooks for more readable logs";
+	      license = stdenv.lib.licenses.bsd3;
+	      homepage = "https://github.com/ferd/cth_readable";
+	    };
+	  }
       ) {};
-
+    
     cth_readable = cth_readable_1_2_0;
-
+    
     cucumberl_0_0_6 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "cucumberl";
-            version = "0.0.6";
-            sha256 =
-              "3b9ea813997fd8c1e3d2b004e89288496dc21d2e5027f432e5900569d2c61cf3";
-
-            meta = {
-              description = "A pure-erlang implementation of Cucumber.";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/ericbmerritt/cucumberl";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "cucumberl";
+	    version = "0.0.6";
+	    sha256 =
+	      "3b9ea813997fd8c1e3d2b004e89288496dc21d2e5027f432e5900569d2c61cf3";
+	      
+	    meta = {
+	      description = "A pure-erlang implementation of Cucumber.";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/ericbmerritt/cucumberl";
+	    };
+	  }
       ) {};
-
+    
     cucumberl = cucumberl_0_0_6;
-
-    denrei_0_2_3 = callPackage
-      (
-        {  buildHex, lager_3_0_1, ranch }:
-          buildHex {
-            name = "denrei";
-            version = "0.2.3";
-            sha256 =
-              "bc0e8cf7e085dda6027df83ef5d63c41b93988bcd7f3db7c68e4dad3cd599744";
-
-            erlangDeps = [ lager_3_0_1 ranch ];
-
-            meta = {
-              description = "Denrei - a lightweight Erlang messaging system.";
-              license = stdenv.lib.licenses.mit;
-            };
-          }
-      ) {};
-
-    denrei = denrei_0_2_3;
-
+    
     detergent_0_3_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "detergent";
-            version = "0.3.0";
-            sha256 =
-              "510cfb5d35b4b344762f074b73c8696b4bdde654ea046b3365cf92760ae33362";
-
-            meta = {
-              description = "An emulsifying Erlang SOAP library";
-              license = with stdenv.lib.licenses; [ unlicense bsd3 ];
-              homepage = "https://github.com/devinus/detergent";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "detergent";
+	    version = "0.3.0";
+	    sha256 =
+	      "510cfb5d35b4b344762f074b73c8696b4bdde654ea046b3365cf92760ae33362";
+	      
+	    meta = {
+	      description = "An emulsifying Erlang SOAP library";
+	      license = with stdenv.lib.licenses; [ unlicense bsd3 ];
+	      homepage = "https://github.com/devinus/detergent";
+	    };
+	  }
       ) {};
-
+    
     detergent = detergent_0_3_0;
-
+    
     dflow_0_1_5 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "dflow";
-            version = "0.1.5";
-            sha256 =
-              "f08e73f22d4c620ef5f358a0b40f8fe3b91219ca3922fbdbe7e42f1cb58f737e";
-
-            meta = {
-              description = "Pipelined flow processing engine";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/dalmatinerdb/dflow";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "dflow";
+	    version = "0.1.5";
+	    sha256 =
+	      "f08e73f22d4c620ef5f358a0b40f8fe3b91219ca3922fbdbe7e42f1cb58f737e";
+	      
+	    meta = {
+	      description = "Pipelined flow processing engine";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/dalmatinerdb/dflow";
+	    };
+	  }
       ) {};
-
+    
     dflow = dflow_0_1_5;
-
+    
     discount_0_7_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "discount";
-            version = "0.7.0";
-            sha256 =
-              "a37b7890620f93aa2fae06eee364cd906991588bc8897e659f51634179519c97";
-
-            meta = {
-              description = "Elixir NIF for discount, a Markdown parser";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/asaaki/discount.ex";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "discount";
+	    version = "0.7.0";
+	    sha256 =
+	      "a37b7890620f93aa2fae06eee364cd906991588bc8897e659f51634179519c97";
+	      
+	    meta = {
+	      description = "Elixir NIF for discount, a Markdown parser";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/asaaki/discount.ex";
+	    };
+	  }
       ) {};
-
+    
     discount = discount_0_7_0;
-
+    
     dynamic_compile_1_0_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "dynamic_compile";
-            version = "1.0.0";
-            sha256 =
-              "eb73d8e9a6334914f79c15ee8214acad9659c42222d49beda3e8b6f6789a980a";
-
-            meta = {
-              description =
-                "compile and load erlang modules from string input";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/okeuday/dynamic_compile";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "dynamic_compile";
+	    version = "1.0.0";
+	    sha256 =
+	      "eb73d8e9a6334914f79c15ee8214acad9659c42222d49beda3e8b6f6789a980a";
+	      
+	    meta = {
+	      description =
+		"compile and load erlang modules from string input";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/okeuday/dynamic_compile";
+	    };
+	  }
       ) {};
-
+    
     dynamic_compile = dynamic_compile_1_0_0;
-
+    
     econfig_0_7_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "econfig";
-            version = "0.7.1";
-            sha256 =
-              "b11d68e3d288b5cb4bd34e668e03176c4ea42790c09f1f449cdbd46a649ea7f3";
-
-            meta = {
-              description = "simple Erlang config handler using INI files";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/benoitc/econfig";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "econfig";
+	    version = "0.7.1";
+	    sha256 =
+	      "b11d68e3d288b5cb4bd34e668e03176c4ea42790c09f1f449cdbd46a649ea7f3";
+	      
+	    meta = {
+	      description = "simple Erlang config handler using INI files";
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/benoitc/econfig";
+	    };
+	  }
       ) {};
-
+    
     econfig = econfig_0_7_1;
-
+    
     edown_0_7_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "edown";
-            version = "0.7.0";
-            sha256 =
-              "6d7365a7854cd724e8d1fd005f5faa4444eae6a87eb6df9b789b6e7f6f09110a";
-
-            meta = {
-              description = "Markdown generated from Edoc.";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/uwiger/edown";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "edown";
+	    version = "0.7.0";
+	    sha256 =
+	      "6d7365a7854cd724e8d1fd005f5faa4444eae6a87eb6df9b789b6e7f6f09110a";
+	      
+	    meta = {
+	      description = "Markdown generated from Edoc.";
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/uwiger/edown";
+	    };
+	  }
       ) {};
-
+    
     edown = edown_0_7_0;
-
+    
     elixir_ale_0_4_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "elixir_ale";
-            version = "0.4.1";
-            sha256 =
-              "2ee5c6989a8005a0ab8f1aea0b4f89b5feae75be78a70bade6627c3624c59c46";
-
-            meta = {
-              description =
-                "Elixir access to hardware I/O interfaces such as GPIO, I2C, and SPI.";
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/fhunleth/elixir_ale";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "elixir_ale";
+	    version = "0.4.1";
+	    sha256 =
+	      "2ee5c6989a8005a0ab8f1aea0b4f89b5feae75be78a70bade6627c3624c59c46";
+	      
+	    meta = {
+	      description =
+		"Elixir access to hardware I/O interfaces such as GPIO, I2C, and SPI.";
+	      license = stdenv.lib.licenses.asl20;
+	      homepage = "https://github.com/fhunleth/elixir_ale";
+	    };
+	  }
       ) {};
-
+    
     elixir_ale = elixir_ale_0_4_1;
-
+    
     elli_1_0_4 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "elli";
-            version = "1.0.4";
-            sha256 =
-              "87641b9c069b1372dac4e1bdda795076ea3142af78aac0d63896a38079e89e8e";
-
-            meta = {
-              description =
-                "Fast and robust web server for building high-throughput, low-latency apps";
-              license = stdenv.lib.licenses.free;
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "elli";
+	    version = "1.0.4";
+	    sha256 =
+	      "87641b9c069b1372dac4e1bdda795076ea3142af78aac0d63896a38079e89e8e";
+	      
+	    meta = {
+	      description =
+		"Fast and robust web server for building high-throughput, low-latency apps";
+	      license = stdenv.lib.licenses.free; 
+	    };
+	  }
       ) {};
-
+    
     elli = elli_1_0_4;
-
-    enotify_0_1_0 = callPackage
-      (
-        {  buildHex }:
-          buildHex {
-            name = "enotify";
-            version = "0.1.0";
-            sha256 =
-              "8e48da763ce15bfd75cc857ddfe5011b03189d597f47bcdd8acc6fbbe8e6b6f4";
-            compilePort = true;
-
-            meta = {
-              description = "Filesystem listener";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/tsloughter/enotify";
-            };
-          }
-      ) {};
-
-    enotify = enotify_0_1_0;
-
+    
     eper_0_94_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "eper";
-            version = "0.94.0";
-            sha256 =
-              "8d853792fa61a7fd068fe9c113a8a44bc839e11ad70cb8d5d2884566e3bede39";
-
-            meta = {
-              longDescription = ''Erlang Performance and Debugging Tools sherk
-                                - a profiler, similar to Linux oprofile or MacOs
-                                shark gperf - a graphical performance monitor;
-                                shows CPU, memory and network usage dtop -
-                                similar to unix top redbug- similar to the OTP
-                                dbg application, but safer, better etc.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/massemanet/eper";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "eper";
+	    version = "0.94.0";
+	    sha256 =
+	      "8d853792fa61a7fd068fe9c113a8a44bc839e11ad70cb8d5d2884566e3bede39";
+	      
+	    meta = {
+	      longDescription = ''Erlang Performance and Debugging Tools sherk
+				- a profiler, similar to Linux oprofile or MacOs
+				shark gperf - a graphical performance monitor;
+				shows CPU, memory and network usage dtop -
+				similar to unix top redbug- similar to the OTP
+				dbg application, but safer, better etc.'';
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/massemanet/eper";
+	    };
+	  }
       ) {};
-
+    
     eper = eper_0_94_0;
-
+    
     epgsql_3_1_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "epgsql";
-            version = "3.1.1";
-            sha256 =
-              "4b3f478ad090aed7200b2a8c9f2d5ef45c3aaa167be896b5237bba4b40f461d8";
-
-            meta = {
-              description = "PostgreSQL Client";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/epgsql/epgsql";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "epgsql";
+	    version = "3.1.1";
+	    sha256 =
+	      "4b3f478ad090aed7200b2a8c9f2d5ef45c3aaa167be896b5237bba4b40f461d8";
+	      
+	    meta = {
+	      description = "PostgreSQL Client";
+	      license = stdenv.lib.licenses.bsd3;
+	      homepage = "https://github.com/epgsql/epgsql";
+	    };
+	  }
       ) {};
-
+    
     epgsql = epgsql_3_1_1;
-
+    
     episcina_1_1_0 = callPackage
       (
-        {  buildHex, gproc_0_3_1 }:
-          buildHex {
-            name = "episcina";
-            version = "1.1.0";
-            sha256 =
-              "16238717bfbc8cb226342f6b098bb1fafb48c7547265a10ad3e6e83899abc46f";
-
-            erlangDeps = [ gproc_0_3_1 ];
-
-            meta = {
-              description = "Erlang Connection Pool";
-              license = stdenv.lib.licenses.free;
-            };
-          }
+	{ buildHex, gproc_0_3_1 }:
+	  buildHex {
+	    name = "episcina";
+	    version = "1.1.0";
+	    sha256 =
+	      "16238717bfbc8cb226342f6b098bb1fafb48c7547265a10ad3e6e83899abc46f";
+	     
+	    erlangDeps  = [ gproc_0_3_1 ];
+	    
+	    meta = {
+	      description = "Erlang Connection Pool";
+	      license = stdenv.lib.licenses.free; 
+	    };
+	  }
       ) {};
-
+    
     episcina = episcina_1_1_0;
-
+    
     eql_0_1_2 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "eql";
-            version = "0.1.2";
-            sha256 =
-              "3b1a85c491d44262802058c0de97a2c90678d5d45851b88a076b1a45a8d6d4b3";
-
-            meta = {
-              description = "Erlang with SQL";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/artemeff/eql";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "eql";
+	    version = "0.1.2";
+	    sha256 =
+	      "3b1a85c491d44262802058c0de97a2c90678d5d45851b88a076b1a45a8d6d4b3";
+	      
+	    meta = {
+	      description = "Erlang with SQL";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/artemeff/eql";
+	    };
+	  }
       ) {};
-
+    
     eql = eql_0_1_2;
-
+    
     eredis_1_0_8 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "eredis";
-            version = "1.0.8";
-            sha256 =
-              "f303533e72129b264a2d8217c4ddc977c7527ff4b8a6a55f92f62b7fcc099334";
-
-            meta = {
-              description = "Erlang Redis client";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/wooga/eredis";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "eredis";
+	    version = "1.0.8";
+	    sha256 =
+	      "f303533e72129b264a2d8217c4ddc977c7527ff4b8a6a55f92f62b7fcc099334";
+	      
+	    meta = {
+	      description = "Erlang Redis client";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/wooga/eredis";
+	    };
+	  }
       ) {};
-
+    
     eredis = eredis_1_0_8;
-
-    erlang_lua_0_1_0 = callPackage
-      (
-        {  buildHex }:
-          buildHex {
-            name = "erlang_lua";
-            version = "0.1.0";
-            sha256 =
-              "4376a57f86e43ae1d687dca8b6c7c7f692b95d30091a9550636328358026e6eb";
-            compilePort = true;
-
-            meta = {
-              longDescription = ''Erlang-lua hex package, using Erlang's Port
-                                and C Node to run Lua VM as an external Node'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/rtraschke/erlang-lua";
-            };
-          }
-      ) {};
-
-    erlang_lua = erlang_lua_0_1_0;
-
+    
     erlang_term_1_4_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "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";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "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";
+	    };
+	  }
       ) {};
-
+    
     erlang_term_1_5_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "erlang_term";
-            version = "1.5.1";
-            sha256 =
-              "88bae81a80306e82fd3fc43e2d8228049e666f3cfe4627687832cd7edb878e06";
-
-            meta = {
-              description = "Provide the in-memory size of Erlang terms";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/okeuday/erlang_term";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "erlang_term";
+	    version = "1.5.1";
+	    sha256 =
+	      "88bae81a80306e82fd3fc43e2d8228049e666f3cfe4627687832cd7edb878e06";
+	      
+	    meta = {
+	      description = "Provide the in-memory size of Erlang terms";
+	      license = stdenv.lib.licenses.bsd3;
+	      homepage = "https://github.com/okeuday/erlang_term";
+	    };
+	  }
       ) {};
-
+    
     erlang_term = erlang_term_1_5_1;
-
+    
     erlang_version_0_2_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "erlang_version";
-            version = "0.2.0";
-            sha256 =
-              "74daddba65a247ec57913e5de8f243af42bbbc3d6a0c411a1252da81c09ae661";
-
-            meta = {
-              description = "Retrieve Erlang/OTP version like `18.1'";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/sapporo-beam/erlang_version";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "erlang_version";
+	    version = "0.2.0";
+	    sha256 =
+	      "74daddba65a247ec57913e5de8f243af42bbbc3d6a0c411a1252da81c09ae661";
+	      
+	    meta = {
+	      description = "Retrieve Erlang/OTP version like `18.1'";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/sapporo-beam/erlang_version";
+	    };
+	  }
       ) {};
-
+    
     erlang_version = erlang_version_0_2_0;
-
-    erlaudio_0_2_3 = callPackage
-      (
-        {  buildHex }:
-          buildHex {
-            name = "erlaudio";
-            version = "0.2.3";
-            sha256 =
-              "cb9efb0ce80faae003ab39f8cc2d3fccbb4bd1c8f5f525aea392f28662517032";
-            compilePort = true;
-
-            meta = {
-              description = "Erlang audio bindings to portaudio";
-              license = stdenv.lib.licenses.apsl20;
-              homepage = "https://github.com/asonge/erlaudio";
-            };
-          }
-      ) {};
-
-    erlaudio = erlaudio_0_2_3;
-
+    
     erlcloud_0_11_0 = callPackage
       (
-        {  buildHex, jsx_2_6_2, lhttpc_1_3_0, meck_0_8_3 }:
-          buildHex {
-            name = "erlcloud";
-            version = "0.11.0";
-            sha256 =
-              "ca9876dab57ed8fb5fb75ab6ce11e59a346387d357d7a038a2e18d1d31a30716";
-
-            erlangDeps = [ jsx_2_6_2 lhttpc_1_3_0 meck_0_8_3 ];
-
-            meta = {
-              description = "Cloud Computing library for erlang";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/gleber/erlcloud";
-            };
-          }
+	{ buildHex, jsx_2_6_2, lhttpc_1_3_0, meck_0_8_3 }:
+	  buildHex {
+	    name = "erlcloud";
+	    version = "0.11.0";
+	    sha256 =
+	      "ca9876dab57ed8fb5fb75ab6ce11e59a346387d357d7a038a2e18d1d31a30716";
+	     
+	    erlangDeps  = [ jsx_2_6_2 lhttpc_1_3_0 meck_0_8_3 ];
+	    
+	    meta = {
+	      description = "Cloud Computing library for erlang";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/gleber/erlcloud";
+	    };
+	  }
       ) {};
-
+    
     erlcloud_0_12_0 = callPackage
       (
-        {  buildHex, jsx_2_7_2, lhttpc_1_3_0, meck_0_8_3 }:
-          buildHex {
-            name = "erlcloud";
-            version = "0.12.0";
-            sha256 =
-              "2ff2631a4e405a645cedf2713ec66728023e93ac80ed47035554a7d6205d412d";
-
-            erlangDeps = [ jsx_2_7_2 lhttpc_1_3_0 meck_0_8_3 ];
-
-            meta = {
-              description = "Cloud Computing library for erlang";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/gleber/erlcloud";
-            };
-          }
+	{ buildHex, jsx_2_7_2, lhttpc_1_3_0, meck_0_8_3 }:
+	  buildHex {
+	    name = "erlcloud";
+	    version = "0.12.0";
+	    sha256 =
+	      "2ff2631a4e405a645cedf2713ec66728023e93ac80ed47035554a7d6205d412d";
+	     
+	    erlangDeps  = [ jsx_2_7_2 lhttpc_1_3_0 meck_0_8_3 ];
+	    
+	    meta = {
+	      description = "Cloud Computing library for erlang";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/gleber/erlcloud";
+	    };
+	  }
       ) {};
-
+    
     erlcloud = erlcloud_0_12_0;
-
+    
     erldn_1_0_2 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "erldn";
-            version = "1.0.2";
-            sha256 =
-              "51a721f1aac9c5fcc6abb0fa156a97ac8e033ee7cbee1624345ec6e47dfe0aa0";
-
-            meta = {
-              description = "An edn parser for the Erlang platform.
+	{ buildHex }:
+	  buildHex {
+	    name = "erldn";
+	    version = "1.0.2";
+	    sha256 =
+	      "51a721f1aac9c5fcc6abb0fa156a97ac8e033ee7cbee1624345ec6e47dfe0aa0";
+	      
+	    meta = {
+	      description = "An edn parser for the Erlang platform.
 ";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/marianoguerra/erldn";
-            };
-          }
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/marianoguerra/erldn";
+	    };
+	  }
       ) {};
-
+    
     erldn = erldn_1_0_2;
-
+    
+    erlexec_1_0_1 = callPackage
+      (
+	{ buildHex }:
+	  buildHex {
+	    name = "erlexec";
+	    version = "1.0.1";
+	    sha256 =
+	      "eb1e11f16288db4ea35af08503eabf1250d5540c1e8bd35ba04312f5f703e14f";
+	    compilePorts = true;
+	     
+	    meta = {
+	      description = "OS Process Manager";
+	      license = stdenv.lib.licenses.bsd3;
+	      homepage = "https://github.com/saleyn/erlexec";
+	    };
+	  }
+      ) {};
+    
+    erlexec = erlexec_1_0_1;
+    
     erlsh_0_1_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "erlsh";
-            version = "0.1.0";
-            sha256 =
-              "94ef1492dd59fef211f01ffd40c47b6e51c0f59e2a3d0739366e4890961332d9";
-            compilePort = true;
-
-            meta = {
-              longDescription = ''Family of functions and ports involving
-                                interacting with the system shell, paths and
-                                external programs.'';
-              license = stdenv.lib.licenses.free;
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "erlsh";
+	    version = "0.1.0";
+	    sha256 =
+	      "94ef1492dd59fef211f01ffd40c47b6e51c0f59e2a3d0739366e4890961332d9";
+	    compilePorts = true;
+	     
+	    meta = {
+	      longDescription = ''Family of functions and ports involving
+				interacting with the system shell, paths and
+				external programs.'';
+	      license = stdenv.lib.licenses.free; 
+	    };
+	  }
       ) {};
-
+    
     erlsh = erlsh_0_1_0;
-
+    
     erlsom_1_2_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "erlsom";
-            version = "1.2.1";
-            sha256 =
-              "e8f4d1d83583df7d1db8346aa30b82a6599b93fcc4b2d9165007e02ed40e7cae";
-
-            meta = {
-              description = "erlsom XSD parser";
-              license = stdenv.lib.licenses.free;
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "erlsom";
+	    version = "1.2.1";
+	    sha256 =
+	      "e8f4d1d83583df7d1db8346aa30b82a6599b93fcc4b2d9165007e02ed40e7cae";
+	      
+	    meta = {
+	      description = "erlsom XSD parser";
+	      license = stdenv.lib.licenses.free; 
+	    };
+	  }
       ) {};
-
+    
     erlsom = erlsom_1_2_1;
-
+    
     erlware_commons_0_18_0 = callPackage
       (
-        {  buildHex, cf_0_2_1 }:
-          buildHex {
-            name = "erlware_commons";
-            version = "0.18.0";
-            sha256 =
-              "e71dda7cd5dcf34c9d07255d49c67e1d229dd230c101fdb996820bcdb5b03c49";
-
-            erlangDeps = [ cf_0_2_1 ];
-
-            meta = {
-              description = "Additional standard library for Erlang";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/erlware/erlware_commons";
-            };
-          }
+	{ buildHex, cf_0_2_1 }:
+	  buildHex {
+	    name = "erlware_commons";
+	    version = "0.18.0";
+	    sha256 =
+	      "e71dda7cd5dcf34c9d07255d49c67e1d229dd230c101fdb996820bcdb5b03c49";
+	     
+	    erlangDeps  = [ cf_0_2_1 ];
+	    
+	    meta = {
+	      description = "Additional standard library for Erlang";
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/erlware/erlware_commons";
+	    };
+	  }
       ) {};
-
+    
     erlware_commons = erlware_commons_0_18_0;
-
+    
     erlzk_0_6_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "erlzk";
-            version = "0.6.1";
-            sha256 =
-              "6bba045ad0b7beb566825b463ada2464929655ce01e291022c1efed81a674759";
-
-            meta = {
-              description = "A Pure Erlang ZooKeeper Client (no C dependency)";
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/huaban/erlzk";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "erlzk";
+	    version = "0.6.1";
+	    sha256 =
+	      "6bba045ad0b7beb566825b463ada2464929655ce01e291022c1efed81a674759";
+	      
+	    meta = {
+	      description = "A Pure Erlang ZooKeeper Client (no C dependency)";
+	      license = stdenv.lib.licenses.asl20;
+	      homepage = "https://github.com/huaban/erlzk";
+	    };
+	  }
       ) {};
-
+    
     erlzk = erlzk_0_6_1;
-
+    
     esel_0_1_2 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "esel";
-            version = "0.1.2";
-            sha256 =
-              "874d1775c86d27d9e88486a37351ffc09f826ef062c8ea211e65d08e103f946c";
-
-            meta = {
-              description = "An wrapper around openssl";
-              license = stdenv.lib.licenses.mit;
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "esel";
+	    version = "0.1.2";
+	    sha256 =
+	      "874d1775c86d27d9e88486a37351ffc09f826ef062c8ea211e65d08e103f946c";
+	      
+	    meta = {
+	      description = "An wrapper around openssl";
+	      license = stdenv.lib.licenses.mit; 
+	    };
+	  }
       ) {};
-
+    
     esel = esel_0_1_2;
-
+    
     esqlite_0_2_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "esqlite";
-            version = "0.2.1";
-            sha256 =
-              "79f2d1d05e6e29e50228af794dac8900ce47dd60bc11fbf1279f924f83752689";
-            compilePort = true;
-
-            meta = {
-              description = "A Sqlite3 NIF";
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/mmzeeman/esqlite";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "esqlite";
+	    version = "0.2.1";
+	    sha256 =
+	      "79f2d1d05e6e29e50228af794dac8900ce47dd60bc11fbf1279f924f83752689";
+	    compilePorts = true;
+	     
+	    meta = {
+	      description = "A Sqlite3 NIF";
+	      license = stdenv.lib.licenses.asl20;
+	      homepage = "https://github.com/mmzeeman/esqlite";
+	    };
+	  }
       ) {};
-
+    
     esqlite = esqlite_0_2_1;
-
+    
     eunit_formatters_0_3_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "eunit_formatters";
-            version = "0.3.1";
-            sha256 =
-              "64a40741429b7aff149c605d5a6135a48046af394a7282074e6003b3b56ae931";
-
-            meta = {
-              description = "Better output for eunit suites";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/seancribbs/eunit_formatters";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "eunit_formatters";
+	    version = "0.3.1";
+	    sha256 =
+	      "64a40741429b7aff149c605d5a6135a48046af394a7282074e6003b3b56ae931";
+	      
+	    meta = {
+	      description = "Better output for eunit suites";
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/seancribbs/eunit_formatters";
+	    };
+	  }
       ) {};
-
+    
     eunit_formatters = eunit_formatters_0_3_1;
-
-    ex_bitcask_0_1_0 = callPackage
+    
+    exec_1_0_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "ex_bitcask";
-            version = "0.1.0";
-            sha256 =
-              "dc771229aae3c07c31a5523303f0c4dbe3c700d5025a09dfcca9cc357222c463";
-            compilePort = true;
-
-            meta = {
-              longDescription = ''Elixir wrapper of Basho's Bitcask Key/Value
-                                store. Bitcask as a Log-Structured Hash Table
-                                for Fast Key/Value Data. '';
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/JonGretar/ExBitcask";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "exec";
+	    version = "1.0.1";
+	    sha256 =
+	      "87c7ef2dea2bb503bb0eec8cb34776172999aecc6e12d90f7629796a7a3ccb1f";
+	    compilePorts = true;
+	     
+	    meta = {
+	      description = "OS Process Manager";
+	      license = stdenv.lib.licenses.bsd3;
+	      homepage = "https://github.com/saleyn/erlexec";
+	    };
+	  }
       ) {};
-
-    ex_bitcask = ex_bitcask_0_1_0;
-
+    
+    exec = exec_1_0_1;
+    
     exmerl_0_1_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "exmerl";
-            version = "0.1.1";
-            sha256 =
-              "4bb5d6c1863c5e381b460416c9b517a211db9abd9abf0f32c99b07e128b842aa";
-
-            meta = {
-              description =
-                "An Elixir wrapper for parsing XML through the xmerl_* suite of modules
+	{ buildHex }:
+	  buildHex {
+	    name = "exmerl";
+	    version = "0.1.1";
+	    sha256 =
+	      "4bb5d6c1863c5e381b460416c9b517a211db9abd9abf0f32c99b07e128b842aa";
+	      
+	    meta = {
+	      description =
+		"An Elixir wrapper for parsing XML through the xmerl_* suite of modules
 ";
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/pwoolcoc/exmerl";
-            };
-          }
+	      license = stdenv.lib.licenses.asl20;
+	      homepage = "https://github.com/pwoolcoc/exmerl";
+	    };
+	  }
       ) {};
-
+    
     exmerl = exmerl_0_1_1;
-
-    fast_xml_1_1_2 = callPackage
-      (
-        {  buildHex, p1_utils_1_0_1 }:
-          buildHex {
-            name = "fast_xml";
-            version = "1.1.2";
-            sha256 =
-              "becac16805254bc8399558f0eb5d3ed733a1e3c0c511d9c7e95244f43626f9bf";
-            compilePort = true;
-            erlangDeps = [ p1_utils_1_0_1 ];
-
-            meta = {
-              description = "Fast Expat based Erlang XML parsing library";
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/processone/fast_xml";
-            };
-          }
-      ) {};
-
-    fast_xml = fast_xml_1_1_2;
-
+    
     feeder_2_0_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "feeder";
-            version = "2.0.0";
-            sha256 =
-              "9780c5f032d3480cf7d9fd71d3f0c5f73211e0d3a8d9cdabcb1327b3a4ff758e";
-
-            meta = {
-              description = "Stream parse RSS and Atom formatted XML feeds.
+	{ buildHex }:
+	  buildHex {
+	    name = "feeder";
+	    version = "2.0.0";
+	    sha256 =
+	      "9780c5f032d3480cf7d9fd71d3f0c5f73211e0d3a8d9cdabcb1327b3a4ff758e";
+	      
+	    meta = {
+	      description = "Stream parse RSS and Atom formatted XML feeds.
 ";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/michaelnisi/feeder";
-            };
-          }
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/michaelnisi/feeder";
+	    };
+	  }
       ) {};
-
+    
     feeder = feeder_2_0_0;
-
+    
     fn_1_0_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "fn";
-            version = "1.0.0";
-            sha256 =
-              "1433b353c8739bb28ac0d6826c9f6a05033f158e8c8195faf01a863668b3bbc7";
-
-            meta = {
-              description = "More functional Erlang";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/artemeff/fn";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "fn";
+	    version = "1.0.0";
+	    sha256 =
+	      "1433b353c8739bb28ac0d6826c9f6a05033f158e8c8195faf01a863668b3bbc7";
+	      
+	    meta = {
+	      description = "More functional Erlang";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/artemeff/fn";
+	    };
+	  }
       ) {};
-
+    
     fn = fn_1_0_0;
-
+    
     folsom_0_8_3 = callPackage
       (
-        {  buildHex, bear_0_8_3 }:
-          buildHex {
-            name = "folsom";
-            version = "0.8.3";
-            sha256 =
-              "afaa1ea4cd2a10a32242ac5d76fa7b17e98d202883859136b791d9a383b26820";
-
-            erlangDeps = [ bear_0_8_3 ];
-
-            meta = {
-              description = "Erlang based metrics system";
-              license = stdenv.lib.licenses.free;
-            };
-          }
+	{ buildHex, bear_0_8_3 }:
+	  buildHex {
+	    name = "folsom";
+	    version = "0.8.3";
+	    sha256 =
+	      "afaa1ea4cd2a10a32242ac5d76fa7b17e98d202883859136b791d9a383b26820";
+	     
+	    erlangDeps  = [ bear_0_8_3 ];
+	    
+	    meta = {
+	      description = "Erlang based metrics system";
+	      license = stdenv.lib.licenses.free; 
+	    };
+	  }
       ) {};
-
+    
     folsom = folsom_0_8_3;
-
+    
     folsomite_1_2_8 = callPackage
       (
-        {  buildHex, folsom_0_8_3 }:
-          buildHex {
-            name = "folsomite";
-            version = "1.2.8";
-            sha256 =
-              "9ce64603cdffb8ad55e950142146b3fe05533020906a81aa9c2f524635d813dc";
-
-            erlangDeps = [ folsom_0_8_3 ];
-
-            meta = {
-              description = "Blow up your Graphite server with Folsom metrics";
-              license = stdenv.lib.licenses.free;
-            };
-          }
+	{ buildHex, folsom_0_8_3 }:
+	  buildHex {
+	    name = "folsomite";
+	    version = "1.2.8";
+	    sha256 =
+	      "9ce64603cdffb8ad55e950142146b3fe05533020906a81aa9c2f524635d813dc";
+	     
+	    erlangDeps  = [ folsom_0_8_3 ];
+	    
+	    meta = {
+	      description = "Blow up your Graphite server with Folsom metrics";
+	      license = stdenv.lib.licenses.free; 
+	    };
+	  }
       ) {};
-
+    
     folsomite = folsomite_1_2_8;
-
+    
+    fqc_0_1_5 = callPackage
+      (
+	{ buildHex }:
+	  buildHex {
+	    name = "fqc";
+	    version = "0.1.5";
+	    sha256 =
+	      "47536dec351a12e1cbe0bc3b52bfff3b0690b0aec660472b5cf49f812eb9aa4f";
+	      
+	    meta = {
+	      description = "FiFo EQC helper";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/project-fifo/fqc";
+	    };
+	  }
+      ) {};
+    
     fs_0_9_2 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "fs";
-            version = "0.9.2";
-            sha256 =
-              "9a00246e8af58cdf465ae7c48fd6fd7ba2e43300413dfcc25447ecd3bf76f0c1";
-            compilePort = true;
-
-            meta = {
-              description = "Erlang FileSystem Listener";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/synrc/fs";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "fs";
+	    version = "0.9.2";
+	    sha256 =
+	      "9a00246e8af58cdf465ae7c48fd6fd7ba2e43300413dfcc25447ecd3bf76f0c1";
+	    compilePorts = true;
+	     
+	    meta = {
+	      description = "Erlang FileSystem Listener";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/synrc/fs";
+	    };
+	  }
       ) {};
-
+    
     fs = fs_0_9_2;
-
+    
     fuse_2_0_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "fuse";
-            version = "2.0.0";
-            sha256 =
-              "e2c55c0629ce418974165a65b342e54527333303d7e9c1f0493679144c9698cb";
-
-            meta = {
-              description = "A Circuit breaker implementation for Erlang";
-              license = stdenv.lib.licenses.free;
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "fuse";
+	    version = "2.0.0";
+	    sha256 =
+	      "e2c55c0629ce418974165a65b342e54527333303d7e9c1f0493679144c9698cb";
+	      
+	    meta = {
+	      description = "A Circuit breaker implementation for Erlang";
+	      license = stdenv.lib.licenses.free; 
+	    };
+	  }
       ) {};
-
+    
     fuse = fuse_2_0_0;
-
+    
     gen_listener_tcp_0_3_2 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "gen_listener_tcp";
-            version = "0.3.2";
-            sha256 =
-              "b3c3fbc525ba2b32d947b06811d38470d5b0abe2ca81b623192a71539ed22336";
-
-            meta = {
-              description = "Generic TCP Server";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/travelping/gen_listener_tcp";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "gen_listener_tcp";
+	    version = "0.3.2";
+	    sha256 =
+	      "b3c3fbc525ba2b32d947b06811d38470d5b0abe2ca81b623192a71539ed22336";
+	      
+	    meta = {
+	      description = "Generic TCP Server";
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/travelping/gen_listener_tcp";
+	    };
+	  }
       ) {};
-
+    
     gen_listener_tcp = gen_listener_tcp_0_3_2;
-
+    
     gen_smtp_0_9_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "gen_smtp";
-            version = "0.9.0";
-            sha256 =
-              "5a05f23a7cbe0c6242d290b445c6bbc0c287e3d0e09d3fcdc6bcd2c8973b6688";
-
-            meta = {
-              longDescription = ''A generic Erlang SMTP server framework that
-                                can be extended via callback modules in the OTP
-                                style. '';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/Vagabond/gen_smtp";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "gen_smtp";
+	    version = "0.9.0";
+	    sha256 =
+	      "5a05f23a7cbe0c6242d290b445c6bbc0c287e3d0e09d3fcdc6bcd2c8973b6688";
+	      
+	    meta = {
+	      longDescription = ''A generic Erlang SMTP server framework that
+				can be extended via callback modules in the OTP
+				style. '';
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/Vagabond/gen_smtp";
+	    };
+	  }
       ) {};
-
+    
     gen_smtp = gen_smtp_0_9_0;
-
+    
     getopt_0_8_2 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "getopt";
-            version = "0.8.2";
-            sha256 =
-              "736e6db3679fbbad46373efb96b69509f8e420281635e9d92989af9f0a0483f7";
-
-            meta = {
-              description = "Command-line options parser for Erlang";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/jcomellas/getopt";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "getopt";
+	    version = "0.8.2";
+	    sha256 =
+	      "736e6db3679fbbad46373efb96b69509f8e420281635e9d92989af9f0a0483f7";
+	      
+	    meta = {
+	      description = "Command-line options parser for Erlang";
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/jcomellas/getopt";
+	    };
+	  }
       ) {};
-
+    
     getopt = getopt_0_8_2;
-
+    
     goldrush_0_1_7 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "goldrush";
-            version = "0.1.7";
-            sha256 =
-              "a94a74cd363ce5f4970ed8242c551ec62b71939db1bbfd2e030142cab25a4ffe";
-
-            meta = {
-              description =
-                "Small, Fast event processing and monitoring for Erlang/OTP applications.
+	{ buildHex }:
+	  buildHex {
+	    name = "goldrush";
+	    version = "0.1.7";
+	    sha256 =
+	      "a94a74cd363ce5f4970ed8242c551ec62b71939db1bbfd2e030142cab25a4ffe";
+	      
+	    meta = {
+	      description =
+		"Small, Fast event processing and monitoring for Erlang/OTP applications.
 ";
-              license = stdenv.lib.licenses.isc;
-              homepage = "https://github.com/DeadZen/goldrush";
-            };
-          }
+	      license = stdenv.lib.licenses.isc;
+	      homepage = "https://github.com/DeadZen/goldrush";
+	    };
+	  }
       ) {};
-
+    
     goldrush = goldrush_0_1_7;
-
+    
     gproc_0_3_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "gproc";
-            version = "0.3.1";
-            sha256 =
-              "3c449925a5cbf57cc40d13c6c282bc1080b5ed3bad97e1acdbe969fd63a65fce";
-
-            meta = {
-              longDescription = ''Gproc is a process dictionary for Erlang,
-                                which provides a number of useful features
-                                beyond what the built-in dictionary has: * Use
-                                any term as a process alias * Register a process
-                                under several aliases * Non-unique properties
-                                can be registered simultaneously by many
-                                processes * QLC and match specification
-                                interface for efficient queries on the
-                                dictionary * Await registration, let's you wait
-                                until a process registers itself * Atomically
-                                give away registered names and properties to
-                                another process * Counters, and aggregated
-                                counters, which automatically maintain the total
-                                of all counters with a given name * Global
-                                registry, with all the above functions applied
-                                to a network of nodes'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/uwiger/gproc";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "gproc";
+	    version = "0.3.1";
+	    sha256 =
+	      "3c449925a5cbf57cc40d13c6c282bc1080b5ed3bad97e1acdbe969fd63a65fce";
+	      
+	    meta = {
+	      longDescription = ''Gproc is a process dictionary for Erlang,
+				which provides a number of useful features
+				beyond what the built-in dictionary has: * Use
+				any term as a process alias * Register a process
+				under several aliases * Non-unique properties
+				can be registered simultaneously by many
+				processes * QLC and match specification
+				interface for efficient queries on the
+				dictionary * Await registration, let's you wait
+				until a process registers itself * Atomically
+				give away registered names and properties to
+				another process * Counters, and aggregated
+				counters, which automatically maintain the total
+				of all counters with a given name * Global
+				registry, with all the above functions applied
+				to a network of nodes'';
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/uwiger/gproc";
+	    };
+	  }
       ) {};
-
+    
     gproc_0_5_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "gproc";
-            version = "0.5.0";
-            sha256 =
-              "5bc0fa4e999a6665b92ce57a7f12d7e9d1c26bfc39b0f657994be05cd3818b18";
-
-            meta = {
-              longDescription = ''Gproc is a process dictionary for Erlang,
-                                which provides a number of useful features
-                                beyond what the built-in dictionary has: * Use
-                                any term as a process alias * Register a process
-                                under several aliases * Non-unique properties
-                                can be registered simultaneously by many
-                                processes * QLC and match specification
-                                interface for efficient queries on the
-                                dictionary * Await registration, let's you wait
-                                until a process registers itself * Atomically
-                                give away registered names and properties to
-                                another process * Counters, and aggregated
-                                counters, which automatically maintain the total
-                                of all counters with a given name * Global
-                                registry, with all the above functions applied
-                                to a network of nodes'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/uwiger/gproc";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "gproc";
+	    version = "0.5.0";
+	    sha256 =
+	      "5bc0fa4e999a6665b92ce57a7f12d7e9d1c26bfc39b0f657994be05cd3818b18";
+	      
+	    meta = {
+	      longDescription = ''Gproc is a process dictionary for Erlang,
+				which provides a number of useful features
+				beyond what the built-in dictionary has: * Use
+				any term as a process alias * Register a process
+				under several aliases * Non-unique properties
+				can be registered simultaneously by many
+				processes * QLC and match specification
+				interface for efficient queries on the
+				dictionary * Await registration, let's you wait
+				until a process registers itself * Atomically
+				give away registered names and properties to
+				another process * Counters, and aggregated
+				counters, which automatically maintain the total
+				of all counters with a given name * Global
+				registry, with all the above functions applied
+				to a network of nodes'';
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/uwiger/gproc";
+	    };
+	  }
       ) {};
-
+    
     gproc = gproc_0_5_0;
-
+    
     gurka_0_1_7 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "gurka";
-            version = "0.1.7";
-            sha256 =
-              "b46c96446f46a53411a3b45d126ec19e724178818206ca1d2dd16abff28df6b5";
-
-            meta = {
-              description = "Erlang implementation of Cucumber";
-              license = stdenv.lib.licenses.mit;
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "gurka";
+	    version = "0.1.7";
+	    sha256 =
+	      "b46c96446f46a53411a3b45d126ec19e724178818206ca1d2dd16abff28df6b5";
+	      
+	    meta = {
+	      description = "Erlang implementation of Cucumber";
+	      license = stdenv.lib.licenses.mit; 
+	    };
+	  }
       ) {};
-
+    
     gurka = gurka_0_1_7;
-
+    
     hackney_1_4_4 = callPackage
       (
-        {
-          buildHex,
-          certifi_0_1_1,
-          idna_1_0_2,
-          mimerl_1_0_0,
-          ssl_verify_hostname_1_0_5
-        }:
-          buildHex {
-            name = "hackney";
-            version = "1.4.4";
-            sha256 =
-              "c8ab2436556d6bce7e85a85adec67f6abeb8c7508668a3e29750be3c4bf4e3a8";
-
-            erlangDeps = [
-                           certifi_0_1_1
-                           idna_1_0_2
-                           mimerl_1_0_0
-                           ssl_verify_hostname_1_0_5
-                         ];
-
-            meta = {
-              description = "simple HTTP client";
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/benoitc/hackney";
-            };
-          }
+	{
+	  buildHex,
+	  certifi_0_1_1,
+	  idna_1_0_2,
+	  mimerl_1_0_0,
+	  ssl_verify_hostname_1_0_5
+	}:
+	  buildHex {
+	    name = "hackney";
+	    version = "1.4.4";
+	    sha256 =
+	      "c8ab2436556d6bce7e85a85adec67f6abeb8c7508668a3e29750be3c4bf4e3a8";
+	     
+	    erlangDeps  = [
+			    certifi_0_1_1
+			    idna_1_0_2
+			    mimerl_1_0_0
+			    ssl_verify_hostname_1_0_5
+			  ];
+	    
+	    meta = {
+	      description = "simple HTTP client";
+	      license = stdenv.lib.licenses.asl20;
+	      homepage = "https://github.com/benoitc/hackney";
+	    };
+	  }
       ) {};
-
+    
     hamcrest_0_1_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "hamcrest";
-            version = "0.1.1";
-            sha256 =
-              "5207b83e8d3168b9cbbeb3b4c4d83817a38a05f55478510e9c4db83ef83fa0ca";
-
-            meta = {
-              description = "Erlang port of Hamcrest";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/hyperthunk/hamcrest-erlang";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "hamcrest";
+	    version = "0.1.1";
+	    sha256 =
+	      "5207b83e8d3168b9cbbeb3b4c4d83817a38a05f55478510e9c4db83ef83fa0ca";
+	      
+	    meta = {
+	      description = "Erlang port of Hamcrest";
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/hyperthunk/hamcrest-erlang";
+	    };
+	  }
       ) {};
-
+    
     hamcrest = hamcrest_0_1_1;
-
+    
     hlc_2_0_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "hlc";
-            version = "2.0.0";
-            sha256 =
-              "460ac04654e920e068d1fd17aec1f78b1879cc42ac7f3def7497f0d1cc5056ad";
-
-            meta = {
-              description = "hybrid logical clock";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/barrel-db/hlc";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "hlc";
+	    version = "2.0.0";
+	    sha256 =
+	      "460ac04654e920e068d1fd17aec1f78b1879cc42ac7f3def7497f0d1cc5056ad";
+	      
+	    meta = {
+	      description = "hybrid logical clock";
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/barrel-db/hlc";
+	    };
+	  }
       ) {};
-
+    
     hlc = hlc_2_0_0;
-
+    
     hooks_1_1_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "hooks";
-            version = "1.1.1";
-            sha256 =
-              "6834ad3a2a624a5ffd49e9cb146ff49ded423b67f31905b122d24128c72c5c85";
-
-            meta = {
-              description = "generic plugin & hook system";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/barrel-db/hooks";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "hooks";
+	    version = "1.1.1";
+	    sha256 =
+	      "6834ad3a2a624a5ffd49e9cb146ff49ded423b67f31905b122d24128c72c5c85";
+	      
+	    meta = {
+	      description = "generic plugin & hook system";
+	      license = stdenv.lib.licenses.bsd3;
+	      homepage = "https://github.com/barrel-db/hooks";
+	    };
+	  }
       ) {};
-
+    
     hooks = hooks_1_1_1;
-
+    
     http_signature_1_1_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "http_signature";
-            version = "1.1.0";
-            sha256 =
-              "3e6036d9c29289ed0e35dd6f41821dec9061ce20aad3c4d35dcbae8c84eb3baa";
-
-            meta = {
-              description =
-                "Erlang and Elixir implementations of Joyent's HTTP Signature Scheme.";
-              license = stdenv.lib.licenses.free;
-              homepage =
-                "https://github.com/potatosalad/erlang-http_signature";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "http_signature";
+	    version = "1.1.0";
+	    sha256 =
+	      "3e6036d9c29289ed0e35dd6f41821dec9061ce20aad3c4d35dcbae8c84eb3baa";
+	      
+	    meta = {
+	      description =
+		"Erlang and Elixir implementations of Joyent's HTTP Signature Scheme.";
+	      license = stdenv.lib.licenses.free;
+	      homepage =
+		"https://github.com/potatosalad/erlang-http_signature";
+	    };
+	  }
       ) {};
-
+    
     http_signature = http_signature_1_1_0;
-
+    
     ibrowse_4_2_2 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "ibrowse";
-            version = "4.2.2";
-            sha256 =
-              "b800cb7442bcc852c6832821e9d0a7098ff626e1415bddaeff4596640b31c0ae";
-
-            meta = {
-              description = "Erlang HTTP client application";
-              license = with stdenv.lib.licenses; [ free bsd3 ];
-              homepage = "https://github.com/cmullaparthi/ibrowse";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "ibrowse";
+	    version = "4.2.2";
+	    sha256 =
+	      "b800cb7442bcc852c6832821e9d0a7098ff626e1415bddaeff4596640b31c0ae";
+	      
+	    meta = {
+	      description = "Erlang HTTP client application";
+	      license = with stdenv.lib.licenses; [ free bsd3 ];
+	      homepage = "https://github.com/cmullaparthi/ibrowse";
+	    };
+	  }
       ) {};
-
+    
     ibrowse = ibrowse_4_2_2;
-
+    
     idna_1_0_2 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "idna";
-            version = "1.0.2";
-            sha256 =
-              "a5d645e307aa4f67efe31682f720b7eaf431ab148b3d6fb66cbaf6314499610f";
-
-            meta = {
-              description = "A pure Erlang IDNA implementation";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/benoitc/erlang-idna";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "idna";
+	    version = "1.0.2";
+	    sha256 =
+	      "a5d645e307aa4f67efe31682f720b7eaf431ab148b3d6fb66cbaf6314499610f";
+	      
+	    meta = {
+	      description = "A pure Erlang IDNA implementation";
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/benoitc/erlang-idna";
+	    };
+	  }
       ) {};
-
+    
     idna_1_0_3 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "idna";
-            version = "1.0.3";
-            sha256 =
-              "357d489a51112db4f216034406834f9172b3c0ff5a12f83fb28b25ca271541d1";
-
-            meta = {
-              description = "A pure Erlang IDNA implementation";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/benoitc/erlang-idna";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "idna";
+	    version = "1.0.3";
+	    sha256 =
+	      "357d489a51112db4f216034406834f9172b3c0ff5a12f83fb28b25ca271541d1";
+	      
+	    meta = {
+	      description = "A pure Erlang IDNA implementation";
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/benoitc/erlang-idna";
+	    };
+	  }
       ) {};
-
+    
     idna = idna_1_0_3;
-
-    inaka_aleppo_0_9_5 = callPackage
+    
+    inaka_aleppo_0_9_6 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "inaka_aleppo";
-            version = "0.9.5";
-            sha256 =
-              "58e65aa708a0aae828ad8072f521edca8ce19fc3373223180a348a27a3722eb4";
-
-            meta = {
-              description = "Aleppo: ALternative Erlang Pre-ProcessOr";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/inaka/aleppo";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "inaka_aleppo";
+	    version = "0.9.6";
+	    sha256 =
+	      "774171dc84a300f63a15fe732773edf535d7414286890e961e754f1f794dbc85";
+	      
+	    meta = {
+	      description = "Aleppo: ALternative Erlang Pre-ProcessOr";
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/inaka/aleppo";
+	    };
+	  }
       ) {};
-
-    inaka_aleppo = inaka_aleppo_0_9_5;
-
+    
+    inaka_aleppo = inaka_aleppo_0_9_6;
+    
     inaka_mixer_0_1_5 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "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";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "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";
+	    };
+	  }
       ) {};
-
+    
     inaka_mixer = inaka_mixer_0_1_5;
-
-    jc_1_0_4 = callPackage
+    
+    jiffy_0_14_7 = callPackage
       (
-        {  buildHex, jsone_1_2_0, jwalk_1_1_0, lager_3_0_1, ranch }:
-          buildHex {
-            name = "jc";
-            version = "1.0.4";
-            sha256 =
-              "8bcfe202084109fc80fcf521e630466fc53cbb909aff4283bed43252664023df";
-
-            erlangDeps = [ jsone_1_2_0 jwalk_1_1_0 lager_3_0_1 ranch ];
-
-            meta = {
-              description = "A simple, distributed, in-memory caching system";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jr0senblum/jc";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "jiffy";
+	    version = "0.14.7";
+	    sha256 =
+	      "2b3b0f7976dae9c8266036e0d7e0398b64ac5207e3beee4c57896e44b2c17e97";
+	    compilePorts = true;
+	     
+	    meta = {
+	      description = "JSON Decoder/Encoder.";
+	      license = with stdenv.lib.licenses; [ mit bsd3 ];
+	      homepage = "https://github.com/davisp/jiffy";
+	    };
+	  }
       ) {};
-
-    jc = jc_1_0_4;
-
+    
+    jiffy = jiffy_0_14_7;
+    
     jsone_1_2_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "jsone";
-            version = "1.2.0";
-            sha256 =
-              "a60e74284d3a923cde65c00a39dd4542fd7da7c22e8385c0378ad419c54b2e08";
-
-            meta = {
-              description = "Erlang JSON Library";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/sile/jsone";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "jsone";
+	    version = "1.2.0";
+	    sha256 =
+	      "a60e74284d3a923cde65c00a39dd4542fd7da7c22e8385c0378ad419c54b2e08";
+	      
+	    meta = {
+	      description = "Erlang JSON Library";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/sile/jsone";
+	    };
+	  }
       ) {};
-
+    
     jsone = jsone_1_2_0;
-
+    
     jsx_1_4_5 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "jsx";
-            version = "1.4.5";
-            sha256 =
-              "ff5115611c5dd789cebe3addc07d18b86340f701c52ad063caba6fe8da3a489b";
-
-            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";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "jsx";
+	    version = "1.4.5";
+	    sha256 =
+	      "ff5115611c5dd789cebe3addc07d18b86340f701c52ad063caba6fe8da3a489b";
+	      
+	    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";
+	    };
+	  }
       ) {};
-
+    
     jsx_2_2_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "jsx";
-            version = "2.2.0";
-            sha256 =
-              "d0bbc1ef47fd2fed84e28faed66918cf9eceed03b7ded48a23076e716fdbc84f";
-
-            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";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "jsx";
+	    version = "2.2.0";
+	    sha256 =
+	      "d0bbc1ef47fd2fed84e28faed66918cf9eceed03b7ded48a23076e716fdbc84f";
+	      
+	    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";
+	    };
+	  }
       ) {};
-
+    
     jsx_2_6_2 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "jsx";
-            version = "2.6.2";
-            sha256 =
-              "6bfccb6461cc3c7d5cc63f3e69ffeb2f1f8de50eca5980065311c056a69a907f";
-
-            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";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "jsx";
+	    version = "2.6.2";
+	    sha256 =
+	      "6bfccb6461cc3c7d5cc63f3e69ffeb2f1f8de50eca5980065311c056a69a907f";
+	      
+	    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";
+	    };
+	  }
       ) {};
-
+    
     jsx_2_7_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "jsx";
-            version = "2.7.1";
-            sha256 =
-              "52d0e8bda0c8624bc59c3119236eb49bb66289702ea3d59ad76fd2a56cdf9089";
-
-            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";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "jsx";
+	    version = "2.7.1";
+	    sha256 =
+	      "52d0e8bda0c8624bc59c3119236eb49bb66289702ea3d59ad76fd2a56cdf9089";
+	      
+	    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";
+	    };
+	  }
       ) {};
-
+    
     jsx_2_7_2 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "jsx";
-            version = "2.7.2";
-            sha256 =
-              "36ca4772c09d69efc9e069aec7327cbd57d53d56c9a2777d8fb3bf3c1eab6df3";
-
-            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";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "jsx";
+	    version = "2.7.2";
+	    sha256 =
+	      "36ca4772c09d69efc9e069aec7327cbd57d53d56c9a2777d8fb3bf3c1eab6df3";
+	      
+	    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";
+	    };
+	  }
       ) {};
-
+    
     jsx_2_8_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "jsx";
-            version = "2.8.0";
-            sha256 =
-              "a8ba15d5bac2c48b2be1224a0542ad794538d79e2cc16841a4e24ca75f0f8378";
-
-            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";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "jsx";
+	    version = "2.8.0";
+	    sha256 =
+	      "a8ba15d5bac2c48b2be1224a0542ad794538d79e2cc16841a4e24ca75f0f8378";
+	      
+	    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";
+	    };
+	  }
       ) {};
-
+    
     jsx = jsx_2_8_0;
-
+    
     jsxd_0_1_10 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "jsxd";
-            version = "0.1.10";
-            sha256 =
-              "f71a8238f08a1dee130e8959ff5343524891fa6531392667a5b911cead5f5082";
-
-            meta = {
-              description =
-                "jsx data structire traversing and modification library.";
-              license = stdenv.lib.licenses.cddl;
-              homepage = "https://github.com/Licenser/jsxd";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "jsxd";
+	    version = "0.1.10";
+	    sha256 =
+	      "f71a8238f08a1dee130e8959ff5343524891fa6531392667a5b911cead5f5082";
+	      
+	    meta = {
+	      description =
+		"jsx data structire traversing and modification library.";
+	      license = stdenv.lib.licenses.cddl;
+	      homepage = "https://github.com/Licenser/jsxd";
+	    };
+	  }
       ) {};
-
+    
     jsxd = jsxd_0_1_10;
-
+    
     jwalk_1_1_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "jwalk";
-            version = "1.1.0";
-            sha256 =
-              "10c150910ba3539583887cb2b5c3f70d602138471e6f6b5c22498aa18ed654e1";
-
-            meta = {
-              longDescription = ''Helper module for working with Erlang
-                                proplist, map, EEP-18 and mochijson-style
-                                representations of JSON'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/jr0senblum/jwalk";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "jwalk";
+	    version = "1.1.0";
+	    sha256 =
+	      "10c150910ba3539583887cb2b5c3f70d602138471e6f6b5c22498aa18ed654e1";
+	      
+	    meta = {
+	      longDescription = ''Helper module for working with Erlang
+				proplist, map, EEP-18 and mochijson-style
+				representations of JSON'';
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/jr0senblum/jwalk";
+	    };
+	  }
       ) {};
-
+    
     jwalk = jwalk_1_1_0;
-
+    
     jwt_0_1_1 = callPackage
       (
-        {  buildHex, base64url_0_0_1, jsx_2_8_0 }:
-          buildHex {
-            name = "jwt";
-            version = "0.1.1";
-            sha256 =
-              "abcff4a2a42af2b7b7bdf55eeb2b73ce2e3bef760750004e74bc5835d64d2188";
-
-            erlangDeps = [ base64url_0_0_1 jsx_2_8_0 ];
-
-            meta = {
-              description = "Erlang JWT library";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/artemeff/jwt";
-            };
-          }
+	{ buildHex, base64url_0_0_1, jsx_2_8_0 }:
+	  buildHex {
+	    name = "jwt";
+	    version = "0.1.1";
+	    sha256 =
+	      "abcff4a2a42af2b7b7bdf55eeb2b73ce2e3bef760750004e74bc5835d64d2188";
+	     
+	    erlangDeps  = [ base64url_0_0_1 jsx_2_8_0 ];
+	    
+	    meta = {
+	      description = "Erlang JWT library";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/artemeff/jwt";
+	    };
+	  }
       ) {};
-
+    
     jwt = jwt_0_1_1;
-
+    
     key2value_1_4_0 = callPackage
       (
-        {  buildHex, lager_3_0_1, barrel_jiffy }:
-          buildHex {
-            name = "key2value";
-            version = "1.4.0";
-            sha256 =
-              "ad63453fcf54ab853581b78c6d2df56be41ea691ba4bc05920264c19f35a0ded";
-
-            erlangDeps = [ lager_3_0_1 barrel_jiffy ];
-
-            meta = {
-              description = "Erlang 2-way Map";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/okeuday/key2value";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "key2value";
+	    version = "1.4.0";
+	    sha256 =
+	      "ad63453fcf54ab853581b78c6d2df56be41ea691ba4bc05920264c19f35a0ded";
+	      
+	    meta = {
+	      description = "Erlang 2-way Map";
+	      license = stdenv.lib.licenses.bsd3;
+	      homepage = "https://github.com/okeuday/key2value";
+	    };
+	  }
       ) {};
-
+    
     key2value_1_5_1 = callPackage
       (
-        {  buildHex, lager_3_0_1, barrel_jiffy }:
-          buildHex {
-            name = "key2value";
-            version = "1.5.1";
-            sha256 =
-              "2a40464b9f8ef62e8828d869ac8d2bf9135b4956d29ba4eb044e8522b2d35ffa";
-
-            erlangDeps = [ lager_3_0_1 barrel_jiffy ];
-
-            meta = {
-              description = "Erlang 2-way Map";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/okeuday/key2value";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "key2value";
+	    version = "1.5.1";
+	    sha256 =
+	      "2a40464b9f8ef62e8828d869ac8d2bf9135b4956d29ba4eb044e8522b2d35ffa";
+	      
+	    meta = {
+	      description = "Erlang 2-way Map";
+	      license = stdenv.lib.licenses.bsd3;
+	      homepage = "https://github.com/okeuday/key2value";
+	    };
+	  }
       ) {};
-
+    
     key2value = key2value_1_5_1;
-
+    
     keys1value_1_5_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "keys1value";
-            version = "1.5.1";
-            sha256 =
-              "2385132be0903c170fe21e54a0c3e746a604777b66ee458bb6e5f25650d3354f";
-
-            meta = {
-              description = "Erlang Set Associative Map For Key Lists";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/okeuday/keys1value";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "keys1value";
+	    version = "1.5.1";
+	    sha256 =
+	      "2385132be0903c170fe21e54a0c3e746a604777b66ee458bb6e5f25650d3354f";
+	      
+	    meta = {
+	      description = "Erlang Set Associative Map For Key Lists";
+	      license = stdenv.lib.licenses.bsd3;
+	      homepage = "https://github.com/okeuday/keys1value";
+	    };
+	  }
       ) {};
-
+    
     keys1value = keys1value_1_5_1;
-
+    
     lager_3_0_1 = callPackage
       (
-        {  buildHex, goldrush_0_1_7 }:
-          buildHex {
-            name = "lager";
-            version = "3.0.1";
-            sha256 =
-              "d32c9233105b72dc5c1f6a8fe9a33cc205ecccc359c4449950060cee5a329e35";
-
-            erlangDeps = [ goldrush_0_1_7 ];
-
-            meta = {
-              description = "Erlang logging framework";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/basho/lager";
-            };
-          }
+	{ buildHex, goldrush_0_1_7 }:
+	  buildHex {
+	    name = "lager";
+	    version = "3.0.1";
+	    sha256 =
+	      "d32c9233105b72dc5c1f6a8fe9a33cc205ecccc359c4449950060cee5a329e35";
+	     
+	    erlangDeps  = [ goldrush_0_1_7 ];
+	    
+	    meta = {
+	      description = "Erlang logging framework";
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/basho/lager";
+	    };
+	  }
       ) {};
-
+    
     lager_3_0_2 = callPackage
       (
-        {  buildHex, goldrush_0_1_7 }:
-          buildHex {
-            name = "lager";
-            version = "3.0.2";
-            sha256 =
-              "527f3b233e01b6cb68780c14ef675ed08ec02247dc029cacecbb56c78dfca100";
-
-            erlangDeps = [ goldrush_0_1_7 ];
-
-            meta = {
-              description = "Erlang logging framework";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/basho/lager";
-            };
-          }
+	{ buildHex, goldrush_0_1_7 }:
+	  buildHex {
+	    name = "lager";
+	    version = "3.0.2";
+	    sha256 =
+	      "527f3b233e01b6cb68780c14ef675ed08ec02247dc029cacecbb56c78dfca100";
+	     
+	    erlangDeps  = [ goldrush_0_1_7 ];
+	    
+	    meta = {
+	      description = "Erlang logging framework";
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/basho/lager";
+	    };
+	  }
       ) {};
-
+    
     lager = lager_3_0_2;
-
-
+    
+    lasse_1_1_0 = callPackage
+      (
+	{ buildHex }:
+	  buildHex {
+	    name = "lasse";
+	    version = "1.1.0";
+	    sha256 =
+	      "53e70ea9031f7583331a9f9bdbb29da933e591e5c4cce521b4bf85c68e7f3385";
+	      
+	    meta = {
+	      description = "Lasse: Server-Sent Event handler for Cowboy.";
+	      license = stdenv.lib.licenses.asl20;
+	      homepage = "https://github.com/inaka/lasse";
+	    };
+	  }
+      ) {};
+    
+    lasse = lasse_1_1_0;
+    
     lhttpc_1_3_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "lhttpc";
-            version = "1.3.0";
-            sha256 =
-              "ddd2bd4b85159bc987c954b14877168e6a3c3e516105702189776e97c50296a4";
-
-            meta = {
-              description = "Lightweight HTTP/1.1 client";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/talko/lhttpc";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "lhttpc";
+	    version = "1.3.0";
+	    sha256 =
+	      "ddd2bd4b85159bc987c954b14877168e6a3c3e516105702189776e97c50296a4";
+	      
+	    meta = {
+	      description = "Lightweight HTTP/1.1 client";
+	      license = stdenv.lib.licenses.bsd3;
+	      homepage = "https://github.com/talko/lhttpc";
+	    };
+	  }
       ) {};
-
+    
     lhttpc = lhttpc_1_3_0;
-
+    
+    libsnarlmatch_0_1_5 = callPackage
+      (
+	{ buildHex, fqc_0_1_5 }:
+	  buildHex {
+	    name = "libsnarlmatch";
+	    version = "0.1.5";
+	    sha256 =
+	      "11410122ca7a0685c4a7df1795d7f5a1e7bf9c5f17096414402fd9d1f0e1ac04";
+	     
+	    erlangDeps  = [ fqc_0_1_5 ];
+	    
+	    meta = {
+	      description = "permission matcher library";
+	      license = stdenv.lib.licenses.cddl;
+	      homepage = "https://github.com/project-fifo/libsnarlmatch";
+	    };
+	  }
+      ) {};
+    
     libsnarlmatch_0_1_7 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "libsnarlmatch";
-            version = "0.1.7";
-            sha256 =
-              "72e9bcf7968e75774393778146ac6596116f1c60136dd607ad249183684ee380";
-
-            meta = {
-              description = "permission matcher library";
-              license = stdenv.lib.licenses.cddl;
-              homepage = "https://github.com/project-fifo/libsnarlmatch";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "libsnarlmatch";
+	    version = "0.1.7";
+	    sha256 =
+	      "72e9bcf7968e75774393778146ac6596116f1c60136dd607ad249183684ee380";
+	      
+	    meta = {
+	      description = "permission matcher library";
+	      license = stdenv.lib.licenses.cddl;
+	      homepage = "https://github.com/project-fifo/libsnarlmatch";
+	    };
+	  }
       ) {};
-
+    
     libsnarlmatch = libsnarlmatch_0_1_7;
-
+    
     lru_1_3_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "lru";
-            version = "1.3.1";
-            sha256 =
-              "cd6ac15c383d58cd2933df9cb918617b24b12b6e5fb24d94c4c8f200fd93f619";
-
-            meta = {
-              description = "implements a fixed-size LRU cache";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/barrel-db/erlang-lru";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "lru";
+	    version = "1.3.1";
+	    sha256 =
+	      "cd6ac15c383d58cd2933df9cb918617b24b12b6e5fb24d94c4c8f200fd93f619";
+	      
+	    meta = {
+	      description = "implements a fixed-size LRU cache";
+	      license = stdenv.lib.licenses.bsd3;
+	      homepage = "https://github.com/barrel-db/erlang-lru";
+	    };
+	  }
       ) {};
-
+    
     lru = lru_1_3_1;
-
+    
     lz4_0_2_2 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "lz4";
-            version = "0.2.2";
-            sha256 =
-              "a59522221e7cdfe3792bf8b3bb21cfe7ac657790e5826201fa2c5d0bc7484a2d";
-            compilePort = true;
-
-            meta = {
-              description = "LZ4 bindings for Erlang";
-              license = stdenv.lib.licenses.isc;
-              homepage = "https://github.com/szktty/erlang-lz4.git";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "lz4";
+	    version = "0.2.2";
+	    sha256 =
+	      "a59522221e7cdfe3792bf8b3bb21cfe7ac657790e5826201fa2c5d0bc7484a2d";
+	    compilePorts = true;
+	     
+	    meta = {
+	      description = "LZ4 bindings for Erlang";
+	      license = stdenv.lib.licenses.isc;
+	      homepage = "https://github.com/szktty/erlang-lz4.git";
+	    };
+	  }
       ) {};
-
+    
     lz4 = lz4_0_2_2;
-
-    mcrypt_0_1_0 = callPackage
-      (
-        {  buildHex }:
-          buildHex {
-            name = "mcrypt";
-            version = "0.1.0";
-            sha256 =
-              "508a35ba255190f80309dcabf9c81c88b86b9ec13af180627ad51b8e5cf2a4cd";
-            compilePort = true;
-
-            meta = {
-              description = "NIF wrapper around libmcrypt.";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/system76/elixir-mcrypt";
-            };
-          }
-      ) {};
-
-    mcrypt = mcrypt_0_1_0;
-
+    
     mdns_server_0_2_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "mdns_server";
-            version = "0.2.0";
-            sha256 =
-              "bc9465880e15e57033960ab6820258b87134bef69032210c67e53e3718e289d0";
-
-            meta = {
-              description = "mDNS service discovery server";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/Licenser/erlang-mdns-server";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "mdns_server";
+	    version = "0.2.0";
+	    sha256 =
+	      "bc9465880e15e57033960ab6820258b87134bef69032210c67e53e3718e289d0";
+	      
+	    meta = {
+	      description = "mDNS service discovery server";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/Licenser/erlang-mdns-server";
+	    };
+	  }
       ) {};
-
+    
     mdns_server = mdns_server_0_2_0;
-
+    
     mdns_server_lib_0_2_3 = callPackage
       (
-        {  buildHex, lager_3_0_2, mdns_server_0_2_0, ranch_1_1_0 }:
-          buildHex {
-            name = "mdns_server_lib";
-            version = "0.2.3";
-            sha256 =
-              "078775ccea5d768095716ca6bd82f657601203352495d9726f4cc080c8c07695";
-
-            erlangDeps = [ lager_3_0_2 mdns_server_0_2_0 ranch_1_1_0 ];
-
-            meta = {
-              description =
-                "server side for mdns client server implementation";
-              license = stdenv.lib.licenses.cddl;
-              homepage = "https://github.com/Licenser/mdns_server_lib";
-            };
-          }
+	{ buildHex, lager_3_0_2, mdns_server_0_2_0, ranch_1_1_0 }:
+	  buildHex {
+	    name = "mdns_server_lib";
+	    version = "0.2.3";
+	    sha256 =
+	      "078775ccea5d768095716ca6bd82f657601203352495d9726f4cc080c8c07695";
+	     
+	    erlangDeps  = [ lager_3_0_2 mdns_server_0_2_0 ranch_1_1_0 ];
+	    
+	    meta = {
+	      description =
+		"server side for mdns client server implementation";
+	      license = stdenv.lib.licenses.cddl;
+	      homepage = "https://github.com/Licenser/mdns_server_lib";
+	    };
+	  }
       ) {};
-
+    
     mdns_server_lib = mdns_server_lib_0_2_3;
-
+    
     meck_0_8_3 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "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";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "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";
+	    };
+	  }
       ) {};
-
+    
     meck_0_8_4 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "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";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "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";
+	    };
+	  }
       ) {};
-
+    
     meck = meck_0_8_4;
-
+    
     metrics_0_2_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "metrics";
-            version = "0.2.1";
-            sha256 =
-              "1cccc3534fa5a7861a3dcc0414afba00a616937e82c95d6172a523a5d2e97c03";
-
-            meta = {
-              description =
-                "A generic interface to different metrics systems in Erlang.";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/benoitc/erlang-metrics";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "metrics";
+	    version = "0.2.1";
+	    sha256 =
+	      "1cccc3534fa5a7861a3dcc0414afba00a616937e82c95d6172a523a5d2e97c03";
+	      
+	    meta = {
+	      description =
+		"A generic interface to different metrics systems in Erlang.";
+	      license = stdenv.lib.licenses.bsd3;
+	      homepage = "https://github.com/benoitc/erlang-metrics";
+	    };
+	  }
       ) {};
-
+    
     metrics = metrics_0_2_1;
-
+    
     mimerl_1_0_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "mimerl";
-            version = "1.0.0";
-            sha256 =
-              "a30b01104a29bd3a363db8646e4ce0f7980f9ecd23a98707c46c3ced918c41b4";
-
-            meta = {
-              description = "Library to handle mimetypes";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/benoitc/mimerl";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "mimerl";
+	    version = "1.0.0";
+	    sha256 =
+	      "a30b01104a29bd3a363db8646e4ce0f7980f9ecd23a98707c46c3ced918c41b4";
+	      
+	    meta = {
+	      description = "Library to handle mimetypes";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/benoitc/mimerl";
+	    };
+	  }
       ) {};
-
+    
     mimerl_1_0_2 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "mimerl";
-            version = "1.0.2";
-            sha256 =
-              "7a4c8e1115a2732a67d7624e28cf6c9f30c66711a9e92928e745c255887ba465";
-
-            meta = {
-              description = "Library to handle mimetypes";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/benoitc/mimerl";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "mimerl";
+	    version = "1.0.2";
+	    sha256 =
+	      "7a4c8e1115a2732a67d7624e28cf6c9f30c66711a9e92928e745c255887ba465";
+	      
+	    meta = {
+	      description = "Library to handle mimetypes";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/benoitc/mimerl";
+	    };
+	  }
       ) {};
-
+    
     mimerl_1_1_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "mimerl";
-            version = "1.1.0";
-            sha256 =
-              "def0f1922a5dcdeeee6e4f41139b364e7f0f40239774b528a0986b12bcb42ddc";
-
-            meta = {
-              description = "Library to handle mimetypes";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/benoitc/mimerl";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "mimerl";
+	    version = "1.1.0";
+	    sha256 =
+	      "def0f1922a5dcdeeee6e4f41139b364e7f0f40239774b528a0986b12bcb42ddc";
+	      
+	    meta = {
+	      description = "Library to handle mimetypes";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/benoitc/mimerl";
+	    };
+	  }
       ) {};
-
+    
     mimerl = mimerl_1_1_0;
-
+    
     mochiweb_2_12_2 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "mochiweb";
-            version = "2.12.2";
-            sha256 =
-              "d3e681d4054b74a96cf2efcd09e94157ab83a5f55ddc4ce69f90b8144673bd7a";
-
-            meta = {
-              description =
-                "MochiWeb is an Erlang library for building lightweight HTTP servers.
+	{ buildHex }:
+	  buildHex {
+	    name = "mochiweb";
+	    version = "2.12.2";
+	    sha256 =
+	      "d3e681d4054b74a96cf2efcd09e94157ab83a5f55ddc4ce69f90b8144673bd7a";
+	      
+	    meta = {
+	      description =
+		"MochiWeb is an Erlang library for building lightweight HTTP servers.
 ";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/mochi/mochiweb";
-            };
-          }
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/mochi/mochiweb";
+	    };
+	  }
       ) {};
-
+    
     mochiweb = mochiweb_2_12_2;
-
+    
+    msgpack_0_4_0 = callPackage
+      (
+	{ buildHex }:
+	  buildHex {
+	    name = "msgpack";
+	    version = "0.4.0";
+	    sha256 =
+	      "cb69184b254bcddfd0b3b813fa9ffc87dd4642ad026bb8117e2384b55239eae4";
+	      
+	    meta = {
+	      description = "MessagePack serializer/deserializer";
+	      license = stdenv.lib.licenses.free;
+	      homepage = "http://msgpack.org";
+	    };
+	  }
+      ) {};
+    
+    msgpack = msgpack_0_4_0;
+    
     mtx_1_0_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "mtx";
-            version = "1.0.0";
-            sha256 =
-              "3bdcb209fe3cdfc5a6b5b95f619ecd123b7ee1d9203ace2178c8ff73be5bb90f";
-
-            meta = {
-              description = "Metrics Client";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/synrc/mtx";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "mtx";
+	    version = "1.0.0";
+	    sha256 =
+	      "3bdcb209fe3cdfc5a6b5b95f619ecd123b7ee1d9203ace2178c8ff73be5bb90f";
+	      
+	    meta = {
+	      description = "Metrics Client";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/synrc/mtx";
+	    };
+	  }
       ) {};
-
+    
     mtx = mtx_1_0_0;
-
-    nacl_0_3_0 = callPackage
-      (
-        {  buildHex }:
-          buildHex {
-            name = "nacl";
-            version = "0.3.0";
-            sha256 =
-              "83a626d0ddd17a9c9528aa57a79e0e19746a42def007bc48c4984f0905098a7b";
-            compilePort = true;
-
-            meta = {
-              description = "Erlang-NaCl hex package";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/tonyg/erlang-nacl";
-            };
-          }
-      ) {};
-
-    nacl = nacl_0_3_0;
-
+    
     neotoma_1_7_3 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "neotoma";
-            version = "1.7.3";
-            sha256 =
-              "2da322b9b1567ffa0706a7f30f6bbbde70835ae44a1050615f4b4a3d436e0f28";
-
-            meta = {
-              description = "PEG/Packrat toolkit and parser-generator.";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/seancribbs/neotoma";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "neotoma";
+	    version = "1.7.3";
+	    sha256 =
+	      "2da322b9b1567ffa0706a7f30f6bbbde70835ae44a1050615f4b4a3d436e0f28";
+	      
+	    meta = {
+	      description = "PEG/Packrat toolkit and parser-generator.";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/seancribbs/neotoma";
+	    };
+	  }
       ) {};
-
+    
     neotoma = neotoma_1_7_3;
-
+    
     p1_stringprep_1_0_0 = callPackage
       (
-        {  buildHex, p1_utils_1_0_1 }:
-          buildHex {
-            name = "p1_stringprep";
-            version = "1.0.0";
-            sha256 =
-              "2a9ce90acb64089f0a34cc592690b398830a5b6fd3c8a84689af5d2feb85d876";
-            compilePort = true;
-            erlangDeps = [ p1_utils_1_0_1 ];
-
-            meta = {
-              description = "Fast Stringprep Erlang / Elixir implementation";
-              license = with stdenv.lib.licenses; [ asl20 free ];
-              homepage = "https://github.com/processone/stringprep";
-            };
-          }
+	{ buildHex, p1_utils_1_0_1 }:
+	  buildHex {
+	    name = "p1_stringprep";
+	    version = "1.0.0";
+	    sha256 =
+	      "2a9ce90acb64089f0a34cc592690b398830a5b6fd3c8a84689af5d2feb85d876";
+	    compilePorts = true;
+	    
+	    erlangDeps  = [ p1_utils_1_0_1 ];
+	    
+	    meta = {
+	      description = "Fast Stringprep Erlang / Elixir implementation";
+	      license = with stdenv.lib.licenses; [ asl20 free ];
+	      homepage = "https://github.com/processone/stringprep";
+	    };
+	  }
       ) {};
-
+    
     p1_stringprep = p1_stringprep_1_0_0;
-
+    
     p1_utils_1_0_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "p1_utils";
-            version = "1.0.0";
-            sha256 =
-              "b2c6316286b071f2f667fb1c59b44fe0c996917515fa93374a4a3264affc5105";
-
-            meta = {
-              description = "Erlang utility modules from ProcessOne";
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/processone/p1_utils";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "p1_utils";
+	    version = "1.0.0";
+	    sha256 =
+	      "b2c6316286b071f2f667fb1c59b44fe0c996917515fa93374a4a3264affc5105";
+	      
+	    meta = {
+	      description = "Erlang utility modules from ProcessOne";
+	      license = stdenv.lib.licenses.asl20;
+	      homepage = "https://github.com/processone/p1_utils";
+	    };
+	  }
       ) {};
-
+    
     p1_utils_1_0_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "p1_utils";
-            version = "1.0.1";
-            sha256 =
-              "8e19478439c3ef05229fbd4fb65ff2e4aee02458a9c2b86a103a7f1384b76fdb";
-
-            meta = {
-              description = "Erlang utility modules from ProcessOne";
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/processone/p1_utils";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "p1_utils";
+	    version = "1.0.1";
+	    sha256 =
+	      "8e19478439c3ef05229fbd4fb65ff2e4aee02458a9c2b86a103a7f1384b76fdb";
+	      
+	    meta = {
+	      description = "Erlang utility modules from ProcessOne";
+	      license = stdenv.lib.licenses.asl20;
+	      homepage = "https://github.com/processone/p1_utils";
+	    };
+	  }
       ) {};
-
+    
     p1_utils_1_0_2 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "p1_utils";
-            version = "1.0.2";
-            sha256 =
-              "c4b770fd925f2fc6c301a1e27f1bfb77aff3fff8d0951cc56c06bef9835af918";
-
-            meta = {
-              description = "Erlang utility modules from ProcessOne";
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/processone/p1_utils";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "p1_utils";
+	    version = "1.0.2";
+	    sha256 =
+	      "c4b770fd925f2fc6c301a1e27f1bfb77aff3fff8d0951cc56c06bef9835af918";
+	      
+	    meta = {
+	      description = "Erlang utility modules from ProcessOne";
+	      license = stdenv.lib.licenses.asl20;
+	      homepage = "https://github.com/processone/p1_utils";
+	    };
+	  }
       ) {};
-
+    
     p1_utils_1_0_3 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "p1_utils";
-            version = "1.0.3";
-            sha256 =
-              "6bf7dc7108eee70e036ea745faf5f55b4354e267f14371ea13338f58ce402d5e";
-
-            meta = {
-              description = "Erlang utility modules from ProcessOne";
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/processone/p1_utils";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "p1_utils";
+	    version = "1.0.3";
+	    sha256 =
+	      "6bf7dc7108eee70e036ea745faf5f55b4354e267f14371ea13338f58ce402d5e";
+	      
+	    meta = {
+	      description = "Erlang utility modules from ProcessOne";
+	      license = stdenv.lib.licenses.asl20;
+	      homepage = "https://github.com/processone/p1_utils";
+	    };
+	  }
       ) {};
-
+    
     p1_utils = p1_utils_1_0_3;
-
-    p1_xml_1_1_1 = callPackage
-      (
-        {  buildHex, p1_utils_1_0_0 }:
-          buildHex {
-            name = "p1_xml";
-            version = "1.1.1";
-            sha256 =
-              "ab68956163cc5ff8c749c503507a36c543841259e78c58a2bbe0ebe76a0b7ce3";
-            compilePort = true;
-            erlangDeps = [ p1_utils_1_0_0 ];
-
-            meta = {
-              description =
-                "XML parsing library. Now obsolete. Use fast_xml instead";
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/processone/xml";
-            };
-          }
-      ) {};
-
-    p1_xml = p1_xml_1_1_1;
-
+    
     pc_1_2_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "pc";
-            version = "1.2.0";
-            sha256 =
-              "ef0f59d26a25af0a5247ef1a06d28d8300f8624647b02dc521ac79a7eceb8883";
-
-            meta = {
-              description = "a rebar3 port compiler for native code";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/blt/port_compiler";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "pc";
+	    version = "1.2.0";
+	    sha256 =
+	      "ef0f59d26a25af0a5247ef1a06d28d8300f8624647b02dc521ac79a7eceb8883";
+	      
+	    meta = {
+	      description = "a rebar3 port compiler for native code";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/blt/port_compiler";
+	    };
+	  }
       ) {};
-
+    
     pc = pc_1_2_0;
-
-    picosat_0_1_0 = callPackage
-      (
-        {  buildHex }:
-          buildHex {
-            name = "picosat";
-            version = "0.1.0";
-            sha256 =
-              "d9bfa31240906306a6dae6bdd6fb1cb452e9462a391efa63017b17b2877cab51";
-            compilePort = true;
-
-            meta = {
-              description = "Erlang bindings for PicoSAT";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/tsloughter/picosat";
-            };
-          }
-      ) {};
-
-    picosat = picosat_0_1_0;
-
+    
     png_0_1_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "png";
-            version = "0.1.1";
-            sha256 =
-              "f8d4a17c118dcc16bb18d0fda6e26947001f9312bc6c061d2236b424fc3dd9ea";
-
-            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";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "png";
+	    version = "0.1.1";
+	    sha256 =
+	      "f8d4a17c118dcc16bb18d0fda6e26947001f9312bc6c061d2236b424fc3dd9ea";
+	      
+	    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";
+	    };
+	  }
       ) {};
-
+    
     png = png_0_1_1;
-
+    
     poolboy_1_5_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "poolboy";
-            version = "1.5.1";
-            sha256 =
-              "8f7168911120e13419e086e78d20e4d1a6776f1eee2411ac9f790af10813389f";
-
-            meta = {
-              description = "A hunky Erlang worker pool factory";
-              license = with stdenv.lib.licenses; [ unlicense asl20 ];
-              homepage = "https://github.com/devinus/poolboy";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "poolboy";
+	    version = "1.5.1";
+	    sha256 =
+	      "8f7168911120e13419e086e78d20e4d1a6776f1eee2411ac9f790af10813389f";
+	      
+	    meta = {
+	      description = "A hunky Erlang worker pool factory";
+	      license = with stdenv.lib.licenses; [ unlicense asl20 ];
+	      homepage = "https://github.com/devinus/poolboy";
+	    };
+	  }
       ) {};
-
+    
     poolboy = poolboy_1_5_1;
-
+    
     pooler_1_5_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "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";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "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";
+	    };
+	  }
       ) {};
-
+    
     pooler = pooler_1_5_0;
-
+    
     pot_0_9_3 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "pot";
-            version = "0.9.3";
-            sha256 =
-              "752d2605c15605cd455cb3514b1ce329309eb61dfa88397dce49772dac9ad581";
-
-            meta = {
-              description = "One Time Passwords for Erlang";
-              license = stdenv.lib.licenses.free;
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "pot";
+	    version = "0.9.3";
+	    sha256 =
+	      "752d2605c15605cd455cb3514b1ce329309eb61dfa88397dce49772dac9ad581";
+	      
+	    meta = {
+	      description = "One Time Passwords for Erlang";
+	      license = stdenv.lib.licenses.free; 
+	    };
+	  }
       ) {};
-
+    
     pot = pot_0_9_3;
-
+    
     pqueue_1_5_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "pqueue";
-            version = "1.5.1";
-            sha256 =
-              "7ba01afe6b50ea4b239fa770f9e2c2db4871b3927ac44aea180d1fd52601b317";
-
-            meta = {
-              description = "Erlang Priority Queue Implementation";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/okeuday/pqueue";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "pqueue";
+	    version = "1.5.1";
+	    sha256 =
+	      "7ba01afe6b50ea4b239fa770f9e2c2db4871b3927ac44aea180d1fd52601b317";
+	      
+	    meta = {
+	      description = "Erlang Priority Queue Implementation";
+	      license = stdenv.lib.licenses.bsd3;
+	      homepage = "https://github.com/okeuday/pqueue";
+	    };
+	  }
       ) {};
-
+    
     pqueue = pqueue_1_5_1;
-
+    
+    proper_1_1_1_beta = callPackage
+      (
+	{ buildHex }:
+	  buildHex {
+	    name = "proper";
+	    version = "1.1.1-beta";
+	    sha256 =
+	      "bde5c0fef0f8d804a7c06aab4f293d19f42149e5880b3412b75efa608e86d342";
+	      
+	    meta = {
+	      description =
+		"QuickCheck-inspired property-based testing tool for Erlang.";
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/manopapad/proper";
+	    };
+	  }
+      ) {};
+    
+    proper = proper_1_1_1_beta;
+    
     providers_1_6_0 = callPackage
       (
-        {  buildHex, getopt_0_8_2 }:
-          buildHex {
-            name = "providers";
-            version = "1.6.0";
-            sha256 =
-              "0f6876529a613d34224de8c61d3660388eb981142360f2699486d8536050ce2f";
-
-            erlangDeps = [ getopt_0_8_2 ];
-
-            meta = {
-              description = "Providers provider.";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/tsloughter/providers";
-            };
-          }
+	{ buildHex, getopt_0_8_2 }:
+	  buildHex {
+	    name = "providers";
+	    version = "1.6.0";
+	    sha256 =
+	      "0f6876529a613d34224de8c61d3660388eb981142360f2699486d8536050ce2f";
+	     
+	    erlangDeps  = [ getopt_0_8_2 ];
+	    
+	    meta = {
+	      description = "Providers provider.";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/tsloughter/providers";
+	    };
+	  }
       ) {};
-
+    
     providers = providers_1_6_0;
-
+    
     quickrand_1_5_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "quickrand";
-            version = "1.5.1";
-            sha256 =
-              "0b3dcc6ddb23319c1f6a5ed143778864b8ad2f0ebd693a2d121cf5ae0c4db507";
-
-            meta = {
-              longDescription = ''Quick Random Number Generation: Provides a
-                                simple interface to call efficient random number
-                                generation functions based on the context.
-                                Proper random number seeding is enforced.'';
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/okeuday/quickrand";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "quickrand";
+	    version = "1.5.1";
+	    sha256 =
+	      "0b3dcc6ddb23319c1f6a5ed143778864b8ad2f0ebd693a2d121cf5ae0c4db507";
+	      
+	    meta = {
+	      longDescription = ''Quick Random Number Generation: Provides a
+				simple interface to call efficient random number
+				generation functions based on the context.
+				Proper random number seeding is enforced.'';
+	      license = stdenv.lib.licenses.bsd3;
+	      homepage = "https://github.com/okeuday/quickrand";
+	    };
+	  }
       ) {};
-
+    
     quickrand = quickrand_1_5_1;
-
+    
     quintana_0_2_0 = callPackage
       (
-        {  buildHex, folsom_0_8_3 }:
-          buildHex {
-            name = "quintana";
-            version = "0.2.0";
-            sha256 =
-              "0646fe332ca3415ca6b0b273b4a5689ec902b9f9004ca62229ded00bd5f64cda";
-
-            erlangDeps = [ folsom_0_8_3 ];
-
-            meta = {
-              description = "Wrapper around some Folsom functions";
-              license = stdenv.lib.licenses.free;
-            };
-          }
+	{ buildHex, folsom_0_8_3 }:
+	  buildHex {
+	    name = "quintana";
+	    version = "0.2.0";
+	    sha256 =
+	      "0646fe332ca3415ca6b0b273b4a5689ec902b9f9004ca62229ded00bd5f64cda";
+	     
+	    erlangDeps  = [ folsom_0_8_3 ];
+	    
+	    meta = {
+	      description = "Wrapper around some Folsom functions";
+	      license = stdenv.lib.licenses.free; 
+	    };
+	  }
       ) {};
-
+    
     quintana_0_2_1 = callPackage
       (
-        {  buildHex, folsom_0_8_3 }:
-          buildHex {
-            name = "quintana";
-            version = "0.2.1";
-            sha256 =
-              "d4683eb33c71f6cab3b17b896b4fa9180f17a0a8b086440bfe0c5675182f0194";
-
-            erlangDeps = [ folsom_0_8_3 ];
-
-            meta = {
-              description = "Wrapper around some Folsom functions";
-              license = stdenv.lib.licenses.free;
-            };
-          }
+	{ buildHex, folsom_0_8_3 }:
+	  buildHex {
+	    name = "quintana";
+	    version = "0.2.1";
+	    sha256 =
+	      "d4683eb33c71f6cab3b17b896b4fa9180f17a0a8b086440bfe0c5675182f0194";
+	     
+	    erlangDeps  = [ folsom_0_8_3 ];
+	    
+	    meta = {
+	      description = "Wrapper around some Folsom functions";
+	      license = stdenv.lib.licenses.free; 
+	    };
+	  }
       ) {};
-
+    
     quintana = quintana_0_2_1;
-
+    
     rabbit_common_3_5_6 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "rabbit_common";
-            version = "3.5.6";
-            sha256 =
-              "9335ab3ebc4e8e140d7bc9b1b0e7ee99c0aa87d0a746b704184121ba35c04f1c";
-
-            meta = {
-              longDescription = ''Includes modules which are a runtime
-                                dependency of the RabbitMQ/AMQP Erlang client
-                                and are common to the RabbitMQ server.'';
-              license = stdenv.lib.licenses.mpl11;
-              homepage = "https://github.com/jbrisbin/rabbit_common";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "rabbit_common";
+	    version = "3.5.6";
+	    sha256 =
+	      "9335ab3ebc4e8e140d7bc9b1b0e7ee99c0aa87d0a746b704184121ba35c04f1c";
+	      
+	    meta = {
+	      longDescription = ''Includes modules which are a runtime
+				dependency of the RabbitMQ/AMQP Erlang client
+				and are common to the RabbitMQ server.'';
+	      license = stdenv.lib.licenses.mpl11;
+	      homepage = "https://github.com/jbrisbin/rabbit_common";
+	    };
+	  }
       ) {};
-
+    
     rabbit_common = rabbit_common_3_5_6;
-
+    
     ranch_1_1_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "ranch";
-            version = "1.1.0";
-            sha256 =
-              "98ade939e63e6567da5dec5bc5bd93cbdc53d53f8b1aa998adec60dc4057f048";
-
-            meta = {
-              description = "Socket acceptor pool for TCP protocols.";
-              license = stdenv.lib.licenses.isc;
-              homepage = "https://github.com/ninenines/ranch";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "ranch";
+	    version = "1.1.0";
+	    sha256 =
+	      "98ade939e63e6567da5dec5bc5bd93cbdc53d53f8b1aa998adec60dc4057f048";
+	      
+	    meta = {
+	      description = "Socket acceptor pool for TCP protocols.";
+	      license = stdenv.lib.licenses.isc;
+	      homepage = "https://github.com/ninenines/ranch";
+	    };
+	  }
       ) {};
-
+    
     ranch_1_2_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "ranch";
-            version = "1.2.0";
-            sha256 =
-              "82bbb48cdad151000f7ad600d7a29afd972df409fde600bbc9b1ed4fdc08c399";
-
-            meta = {
-              description = "Socket acceptor pool for TCP protocols.";
-              license = stdenv.lib.licenses.isc;
-              homepage = "https://github.com/ninenines/ranch";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "ranch";
+	    version = "1.2.0";
+	    sha256 =
+	      "82bbb48cdad151000f7ad600d7a29afd972df409fde600bbc9b1ed4fdc08c399";
+	      
+	    meta = {
+	      description = "Socket acceptor pool for TCP protocols.";
+	      license = stdenv.lib.licenses.isc;
+	      homepage = "https://github.com/ninenines/ranch";
+	    };
+	  }
       ) {};
-
+    
     ranch = ranch_1_2_0;
-
+    
     ratx_0_1_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "ratx";
-            version = "0.1.0";
-            sha256 =
-              "fbf933ff32fdc127200880f5b567820bf03504ade1bd697ffbc0535dbafc23d6";
-
-            meta = {
-              description =
-                "Rate limiter and overload protection for erlang and elixir applications.
+	{ buildHex }:
+	  buildHex {
+	    name = "ratx";
+	    version = "0.1.0";
+	    sha256 =
+	      "fbf933ff32fdc127200880f5b567820bf03504ade1bd697ffbc0535dbafc23d6";
+	      
+	    meta = {
+	      description =
+		"Rate limiter and overload protection for erlang and elixir applications.
 ";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/liveforeverx/ratx";
-            };
-          }
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/liveforeverx/ratx";
+	    };
+	  }
       ) {};
-
+    
     ratx = ratx_0_1_0;
-
+    
     rebar3_asn1_compiler_1_0_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "rebar3_asn1_compiler";
-            version = "1.0.0";
-            sha256 =
-              "25ec1d5c97393195650ac8c7a06a267a886a1479950ee047c43b5228c07b30b9";
-
-            meta = {
-              description = "Compile ASN.1 modules with Rebar3";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/pyykkis/rebar3_asn1_compiler";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "rebar3_asn1_compiler";
+	    version = "1.0.0";
+	    sha256 =
+	      "25ec1d5c97393195650ac8c7a06a267a886a1479950ee047c43b5228c07b30b9";
+	      
+	    meta = {
+	      description = "Compile ASN.1 modules with Rebar3";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/pyykkis/rebar3_asn1_compiler";
+	    };
+	  }
       ) {};
-
+    
     rebar3_asn1_compiler = rebar3_asn1_compiler_1_0_0;
-
-    rebar3_auto_0_3_0 = callPackage
-      (
-        {  buildHex, enotify_0_1_0 }:
-          buildHex {
-            name = "rebar3_auto";
-            version = "0.3.0";
-            sha256 =
-              "9fcca62411b0b7680426bd911002c0769690aef3838829583ffa4547fd5038b5";
-
-            erlangDeps = [ enotify_0_1_0 ];
-
-            meta = {
-              description = "Rebar3 plugin for auto compiling on changes";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/tsloughter/rebar3_auto";
-            };
-          }
-      ) {};
-
-    rebar3_auto = rebar3_auto_0_3_0;
-
+    
     rebar3_diameter_compiler_0_3_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "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";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "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";
+	    };
+	  }
       ) {};
-
+    
     rebar3_diameter_compiler = rebar3_diameter_compiler_0_3_1;
-
-    rebar3_hex_1_12_0 = callPackage
+    
+    rebar3_hex_1_14_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "rebar3_hex";
-            version = "1.12.0";
-            sha256 =
-              "45467e93ae8d776c6038fdaeaffbc55d8f2f097f300a54dab9b81c6d1cf21f73";
-
-            meta = {
-              description = "Hex.pm plugin for rebar3";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/tsloughter/rebar3_hex";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "rebar3_hex";
+	    version = "1.14.0";
+	    sha256 =
+	      "e655ba352835654d41b8077695415792a0de01f3200aa1ce0c8458f785ec2311";
+	      
+	    meta = {
+	      description = "Hex.pm plugin for rebar3";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/tsloughter/rebar3_hex";
+	    };
+	  }
       ) {};
-
-    rebar3_hex = rebar3_hex_1_12_0;
-
+    
+    rebar3_hex = rebar3_hex_1_14_0;
+    
     rebar3_idl_compiler_0_3_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "rebar3_idl_compiler";
-            version = "0.3.0";
-            sha256 =
-              "31ba95205c40b990cb3c49abb397abc47b4d5f9c402db83f9daebbc44e69789d";
-
-            meta = {
-              description = "Rebar3 IDL Compiler";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/sebastiw/rebar3_idl_compiler";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "rebar3_idl_compiler";
+	    version = "0.3.0";
+	    sha256 =
+	      "31ba95205c40b990cb3c49abb397abc47b4d5f9c402db83f9daebbc44e69789d";
+	      
+	    meta = {
+	      description = "Rebar3 IDL Compiler";
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/sebastiw/rebar3_idl_compiler";
+	    };
+	  }
       ) {};
-
+    
     rebar3_idl_compiler = rebar3_idl_compiler_0_3_0;
-
-    rebar3_live_0_1_3 = callPackage
-      (
-        {  buildHex, enotify_0_1_0 }:
-          buildHex {
-            name = "rebar3_live";
-            version = "0.1.3";
-            sha256 =
-              "d9ee2ff022fc73ac94f206c13ff8aa7591a536704f49c4cbacabf37d181a4391";
-
-            erlangDeps = [ enotify_0_1_0 ];
-
-            meta = {
-              description = "Rebar3 live plugin";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/pvmart/rebar3_live";
-            };
-          }
-      ) {};
-
-    rebar3_live = rebar3_live_0_1_3;
-
+    
     rebar3_neotoma_plugin_0_2_0 = callPackage
       (
-        {  buildHex, neotoma_1_7_3 }:
-          buildHex {
-            name = "rebar3_neotoma_plugin";
-            version = "0.2.0";
-            sha256 =
-              "c0ebbdb08c017cac90c7d3310a9bd4a5088a46abd4e2fef9e9a9805a657396b8";
-
-            erlangDeps = [ neotoma_1_7_3 ];
-
-            meta = {
-              description = "Neotoma rebar plugin";
-              license = stdenv.lib.licenses.free;
-              homepage =
-                "https://github.com/zamotivator/rebar3_neotoma_plugin";
-            };
-          }
+	{ buildHex, neotoma_1_7_3 }:
+	  buildHex {
+	    name = "rebar3_neotoma_plugin";
+	    version = "0.2.0";
+	    sha256 =
+	      "c0ebbdb08c017cac90c7d3310a9bd4a5088a46abd4e2fef9e9a9805a657396b8";
+	     
+	    erlangDeps  = [ neotoma_1_7_3 ];
+	    
+	    meta = {
+	      description = "Neotoma rebar plugin";
+	      license = stdenv.lib.licenses.free;
+	      homepage =
+		"https://github.com/zamotivator/rebar3_neotoma_plugin";
+	    };
+	  }
       ) {};
-
+    
     rebar3_neotoma_plugin = rebar3_neotoma_plugin_0_2_0;
-
+    
     rebar3_proper_plugin_0_1_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "rebar3_proper_plugin";
-            version = "0.1.0";
-            sha256 =
-              "7071555afb623e73a2c572de6d4379f9c197b44e68608944eb2835617faed10d";
-
-            meta = {
-              description = "A rebar plugin";
-              license = stdenv.lib.licenses.free;
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "rebar3_proper_plugin";
+	    version = "0.1.0";
+	    sha256 =
+	      "7071555afb623e73a2c572de6d4379f9c197b44e68608944eb2835617faed10d";
+	      
+	    meta = {
+	      description = "A rebar plugin";
+	      license = stdenv.lib.licenses.free; 
+	    };
+	  }
       ) {};
-
+    
     rebar3_proper_plugin = rebar3_proper_plugin_0_1_0;
-
-    rebar3_run_0_2_0 = callPackage
-      (
-        {  buildHex }:
-          buildHex {
-            name = "rebar3_run";
-            version = "0.2.0";
-            sha256 =
-              "321e0647893957d1bb05a88d940a8a3b9129097d63529e13f815c4857bf29497";
-            compilePort = true;
-
-            meta = {
-              description = "A rebar plugin";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/tsloughter/rebar3_run";
-            };
-          }
-      ) {};
-
-    rebar3_run = rebar3_run_0_2_0;
-
+    
     rebar_alias_0_1_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "rebar_alias";
-            version = "0.1.0";
-            sha256 =
-              "59fb42b39964af3a29ebe94c11247f618dd4d5e4e1a69cfaffabbed03ccff70f";
-
-            meta = {
-              description = "A rebar plugin";
-              license = stdenv.lib.licenses.free;
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "rebar_alias";
+	    version = "0.1.0";
+	    sha256 =
+	      "59fb42b39964af3a29ebe94c11247f618dd4d5e4e1a69cfaffabbed03ccff70f";
+	      
+	    meta = {
+	      description = "A rebar plugin";
+	      license = stdenv.lib.licenses.free; 
+	    };
+	  }
       ) {};
-
+    
     rebar_alias = rebar_alias_0_1_0;
-
+    
     rebar_erl_vsn_0_1_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "rebar_erl_vsn";
-            version = "0.1.0";
-            sha256 =
-              "7cf1e2e85a80785a4e4e1529a2c837dbd2d540214cf791214e56f931e5e9865d";
-
-            meta = {
-              description = "defines for erlang versions";
-              license = stdenv.lib.licenses.mit;
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "rebar_erl_vsn";
+	    version = "0.1.0";
+	    sha256 =
+	      "7cf1e2e85a80785a4e4e1529a2c837dbd2d540214cf791214e56f931e5e9865d";
+	      
+	    meta = {
+	      description = "defines for erlang versions";
+	      license = stdenv.lib.licenses.mit; 
+	    };
+	  }
       ) {};
-
+    
     rebar_erl_vsn = rebar_erl_vsn_0_1_0;
-
+    
     recon_2_2_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "recon";
-            version = "2.2.1";
-            sha256 =
-              "6c548ad0f4916495a78977674a251847869f85b5125b7c2a44da3178955adfd1";
-
-            meta = {
-              longDescription = ''Recon wants to be a set of tools usable in
-                                production to diagnose Erlang problems or
-                                inspect production environment safely.'';
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/ferd/recon";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "recon";
+	    version = "2.2.1";
+	    sha256 =
+	      "6c548ad0f4916495a78977674a251847869f85b5125b7c2a44da3178955adfd1";
+	      
+	    meta = {
+	      longDescription = ''Recon wants to be a set of tools usable in
+				production to diagnose Erlang problems or
+				inspect production environment safely.'';
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/ferd/recon";
+	    };
+	  }
       ) {};
-
+    
     recon = recon_2_2_1;
-
+    
     redo_2_0_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "redo";
-            version = "2.0.1";
-            sha256 =
-              "f7b2be8c825ec34413c54d8f302cc935ce4ecac8421ae3914c5dadd816dcb1e6";
-
-            meta = {
-              description = "Pipelined Redis Erlang Driver";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/heroku/redo";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "redo";
+	    version = "2.0.1";
+	    sha256 =
+	      "f7b2be8c825ec34413c54d8f302cc935ce4ecac8421ae3914c5dadd816dcb1e6";
+	      
+	    meta = {
+	      description = "Pipelined Redis Erlang Driver";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/heroku/redo";
+	    };
+	  }
       ) {};
-
+    
     redo = redo_2_0_1;
-
+    
     relflow_1_0_4 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "relflow";
-            version = "1.0.4";
-            sha256 =
-              "e6d9652ed7511aea18fa012d5abc19301acd8cbe81a44a159391086a5be12e1f";
-
-            meta = {
-              description = "Rebar3 release workflow plugin";
-              license = stdenv.lib.licenses.free;
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "relflow";
+	    version = "1.0.4";
+	    sha256 =
+	      "e6d9652ed7511aea18fa012d5abc19301acd8cbe81a44a159391086a5be12e1f";
+	      
+	    meta = {
+	      description = "Rebar3 release workflow plugin";
+	      license = stdenv.lib.licenses.free; 
+	    };
+	  }
       ) {};
-
+    
     relflow = relflow_1_0_4;
-
+    
     reltool_util_1_4_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "reltool_util";
-            version = "1.4.0";
-            sha256 =
-              "a625874976fffe8ab56d4b5b7d5fd37620a2692462bbe24ae003ab13052ef0d3";
-
-            meta = {
-              description = "Erlang reltool utility functionality application";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/okeuday/reltool_util";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "reltool_util";
+	    version = "1.4.0";
+	    sha256 =
+	      "a625874976fffe8ab56d4b5b7d5fd37620a2692462bbe24ae003ab13052ef0d3";
+	      
+	    meta = {
+	      description = "Erlang reltool utility functionality application";
+	      license = stdenv.lib.licenses.bsd3;
+	      homepage = "https://github.com/okeuday/reltool_util";
+	    };
+	  }
       ) {};
-
+    
     reltool_util_1_5_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "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";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "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";
+	    };
+	  }
       ) {};
-
+    
     reltool_util = reltool_util_1_5_1;
-
-    relx_3_11_0 = callPackage
+    
+    relx_3_13_0 = callPackage
       (
-        {
-          buildHex,
-          bbmustache_1_0_4,
-          cf_0_2_1,
-          erlware_commons_0_18_0,
-          getopt_0_8_2,
-          providers_1_6_0
-        }:
-          buildHex {
-            name = "relx";
-            version = "3.11.0";
-            sha256 =
-              "cf212af96003417ff710e0c9df46034ae14c880a74919df91563e4f149d5c798";
-
-            erlangDeps = [
-                           bbmustache_1_0_4
-                           cf_0_2_1
-                           erlware_commons_0_18_0
-                           getopt_0_8_2
-                           providers_1_6_0
-                         ];
-
-            meta = {
-              description = "Release assembler for Erlang/OTP Releases";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/erlware/relx";
-            };
-          }
+	{
+	  buildHex,
+	  bbmustache_1_0_4,
+	  cf_0_2_1,
+	  erlware_commons_0_18_0,
+	  getopt_0_8_2,
+	  providers_1_6_0
+	}:
+	  buildHex {
+	    name = "relx";
+	    version = "3.13.0";
+	    sha256 =
+	      "1ccadc6c9c6883807be0a6250411d2c299c532928e0a6d07db812400a2303ec1";
+	     
+	    erlangDeps  = [
+			    bbmustache_1_0_4
+			    cf_0_2_1
+			    erlware_commons_0_18_0
+			    getopt_0_8_2
+			    providers_1_6_0
+			  ];
+	    
+	    meta = {
+	      description = "Release assembler for Erlang/OTP Releases";
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/erlware/relx";
+	    };
+	  }
       ) {};
-
-    relx = relx_3_11_0;
-
+    
+    relx = relx_3_13_0;
+    
     reup_0_1_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "reup";
-            version = "0.1.0";
-            sha256 =
-              "949a672190119f8b24160167e3685fdd5397474f98dc875ccfd31378ebd68506";
-
-            meta = {
-              description =
-                "dev watcher that auto compiles and reloads modules";
-              license = stdenv.lib.licenses.free;
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "reup";
+	    version = "0.1.0";
+	    sha256 =
+	      "949a672190119f8b24160167e3685fdd5397474f98dc875ccfd31378ebd68506";
+	      
+	    meta = {
+	      description =
+		"dev watcher that auto compiles and reloads modules";
+	      license = stdenv.lib.licenses.free; 
+	    };
+	  }
       ) {};
-
+    
     reup = reup_0_1_0;
-
+    
     savory_0_0_2 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "savory";
-            version = "0.0.2";
-            sha256 =
-              "a45ef32a6f45092e1328bc1eb47bda3c8f992afe863aaa73c455f31b0c8591b9";
-
-            meta = {
-              longDescription = ''An Elixir implementation of Freza's salt_nif
-                                which interfaces with libsodium, a wrapper for
-                                the cryptographic primitive libary NaCl. '';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/electricFeel/savory";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "savory";
+	    version = "0.0.2";
+	    sha256 =
+	      "a45ef32a6f45092e1328bc1eb47bda3c8f992afe863aaa73c455f31b0c8591b9";
+	      
+	    meta = {
+	      longDescription = ''An Elixir implementation of Freza's salt_nif
+				which interfaces with libsodium, a wrapper for
+				the cryptographic primitive libary NaCl. '';
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/electricFeel/savory";
+	    };
+	  }
       ) {};
-
+    
     savory = savory_0_0_2;
-
+    
     sbroker_0_7_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "sbroker";
-            version = "0.7.0";
-            sha256 =
-              "5bc0bfd79896fd5b92072a71fa4a1e120f4110f2cf9562a0b9dd2fcfe9e5cfd2";
-
-            meta = {
-              description =
-                "Process broker for dispatching with backpressure and load shedding";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/fishcakez/sbroker";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "sbroker";
+	    version = "0.7.0";
+	    sha256 =
+	      "5bc0bfd79896fd5b92072a71fa4a1e120f4110f2cf9562a0b9dd2fcfe9e5cfd2";
+	      
+	    meta = {
+	      description =
+		"Process broker for dispatching with backpressure and load shedding";
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/fishcakez/sbroker";
+	    };
+	  }
       ) {};
-
+    
     sbroker = sbroker_0_7_0;
-
+    
     serial_0_1_2 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "serial";
-            version = "0.1.2";
-            sha256 =
-              "c0aed287f565b7ce1e1091a6a3dd08fd99bf0884c81b53ecf978c502ef652231";
-
-            meta = {
-              description = "Serial communication through Elixir ports";
-              license = stdenv.lib.licenses.isc;
-              homepage = "https://github.com/bitgamma/elixir_serial";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "serial";
+	    version = "0.1.2";
+	    sha256 =
+	      "c0aed287f565b7ce1e1091a6a3dd08fd99bf0884c81b53ecf978c502ef652231";
+	      
+	    meta = {
+	      description = "Serial communication through Elixir ports";
+	      license = stdenv.lib.licenses.isc;
+	      homepage = "https://github.com/bitgamma/elixir_serial";
+	    };
+	  }
       ) {};
-
+    
     serial = serial_0_1_2;
-
-    sfmt_0_10_1 = callPackage
-      (
-        {  buildHex }:
-          buildHex {
-            name = "sfmt";
-            version = "0.10.1";
-            sha256 =
-              "5f9d8206762306743986a3f35602bb40b35bcff68752a8ae12519c0b7c25fab2";
-            compilePort = true;
-
-            meta = {
-              description =
-                "SIMD-oriented Fast Mersenne Twister (SFMT) for Erlang.
-";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/jj1bdx/sfmt-erlang/";
-            };
-          }
-      ) {};
-
-    sfmt = sfmt_0_10_1;
-
+    
     sidejob_2_0_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "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";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "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";
+	    };
+	  }
       ) {};
-
+    
     sidejob = sidejob_2_0_0;
-
-    siphash_2_1_1 = callPackage
-      (
-        {  buildHex }:
-          buildHex {
-            name = "siphash";
-            version = "2.1.1";
-            sha256 =
-              "69f2a3b8acac101f7894ea80c15b29dbf7dfa55ea2800731cd5d04621cc22eee";
-            compilePort = true;
-
-            meta = {
-              description = "Elixir implementation of the SipHash hash family";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/zackehh/siphash-elixir";
-            };
-          }
-      ) {};
-
-    siphash = siphash_2_1_1;
-
+    
     slp_0_0_2 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "slp";
-            version = "0.0.2";
-            sha256 =
-              "27e5f7330c7ce631f16e3ec5781b31cbb2247d2bcdeab1e979a66dcc4397bd77";
-
-            meta = {
-              longDescription = ''An Elixir application for using the Service
-                                Location Protocol. SLP is a commonly used
-                                service discovery protocol.'';
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/stuart/elixir_slp";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "slp";
+	    version = "0.0.2";
+	    sha256 =
+	      "27e5f7330c7ce631f16e3ec5781b31cbb2247d2bcdeab1e979a66dcc4397bd77";
+	      
+	    meta = {
+	      longDescription = ''An Elixir application for using the Service
+				Location Protocol. SLP is a commonly used
+				service discovery protocol.'';
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/stuart/elixir_slp";
+	    };
+	  }
       ) {};
-
+    
     slp = slp_0_0_2;
-
+    
     smurf_0_1_3 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "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";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "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";
+	    };
+	  }
       ) {};
-
+    
     smurf = smurf_0_1_3;
-
-    snappy_1_1_1 = callPackage
-      (
-        {  buildHex }:
-          buildHex {
-            name = "snappy";
-            version = "1.1.1";
-            sha256 =
-              "7faed3ec6bcac363c2a6f09b4f000a12c8166b42b3bf70228d532f8afcfbcb6a";
-            compilePort = true;
-
-            meta = {
-              description =
-                "snappy compressor/decompressor Erlang NIF wrapper";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/barrel-db/snappy";
-            };
-          }
-      ) {};
-
-    snappy = snappy_1_1_1;
-
+    
     ssl_verify_hostname_1_0_5 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "ssl_verify_hostname";
-            version = "1.0.5";
-            sha256 =
-              "f2cb11e6144e10ab39d1e14bf9fb2437b690979c70bf5428e9dc4bfaf1dfeabf";
-
-            meta = {
-              description = "Hostname verification library for Erlang";
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/deadtrickster/ssl_verify_hostname.erl";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "ssl_verify_hostname";
+	    version = "1.0.5";
+	    sha256 =
+	      "f2cb11e6144e10ab39d1e14bf9fb2437b690979c70bf5428e9dc4bfaf1dfeabf";
+	      
+	    meta = {
+	      description = "Hostname verification library for Erlang";
+	      license = stdenv.lib.licenses.mit;
+	      homepage =
+		"https://github.com/deadtrickster/ssl_verify_hostname.erl";
+	    };
+	  }
       ) {};
-
+    
     ssl_verify_hostname_1_0_6 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "ssl_verify_hostname";
-            version = "1.0.6";
-            sha256 =
-              "72b2fc8a8e23d77eed4441137fefa491bbf4a6dc52e9c0045f3f8e92e66243b5";
-
-            meta = {
-              description = "Hostname verification library for Erlang";
-              license = stdenv.lib.licenses.mit;
-              homepage =
-                "https://github.com/deadtrickster/ssl_verify_hostname.erl";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "ssl_verify_hostname";
+	    version = "1.0.6";
+	    sha256 =
+	      "72b2fc8a8e23d77eed4441137fefa491bbf4a6dc52e9c0045f3f8e92e66243b5";
+	      
+	    meta = {
+	      description = "Hostname verification library for Erlang";
+	      license = stdenv.lib.licenses.mit;
+	      homepage =
+		"https://github.com/deadtrickster/ssl_verify_hostname.erl";
+	    };
+	  }
       ) {};
-
+    
     ssl_verify_hostname = ssl_verify_hostname_1_0_6;
-
-    strftimerl_0_1_0 = callPackage
+    
+    strftimerl_0_1_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "strftimerl";
-            version = "0.1.0";
-            sha256 =
-              "8c372b282b31f3de24ed1281d4974087421fc44a27d0f31b285ad97a9e6bb616";
-
-            meta = {
-              description = "strftime formatting in erlang";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/gmr/strftimerl";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "strftimerl";
+	    version = "0.1.1";
+	    sha256 =
+	      "c09c7cd6a421bcbc1020c1440a2e73e312b852adbb3034d11f3dffa27d7953b1";
+	      
+	    meta = {
+	      description = "strftime formatting in erlang";
+	      license = stdenv.lib.licenses.bsd3;
+	      homepage = "https://github.com/gmr/strftimerl";
+	    };
+	  }
       ) {};
-
-    strftimerl = strftimerl_0_1_0;
-
+    
+    strftimerl = strftimerl_0_1_1;
+    
     supool_1_5_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "supool";
-            version = "1.5.1";
-            sha256 =
-              "c191d63ff19ae177bf4cfba02303ae4552d8b48ec4133e24053e037513dfae09";
-
-            meta = {
-              description = "Erlang Process Pool as a Supervisor";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/okeuday/supool";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "supool";
+	    version = "1.5.1";
+	    sha256 =
+	      "c191d63ff19ae177bf4cfba02303ae4552d8b48ec4133e24053e037513dfae09";
+	      
+	    meta = {
+	      description = "Erlang Process Pool as a Supervisor";
+	      license = stdenv.lib.licenses.bsd3;
+	      homepage = "https://github.com/okeuday/supool";
+	    };
+	  }
       ) {};
-
+    
     supool = supool_1_5_1;
-
-    syslog_1_0_2 = callPackage
-      (
-        {  buildHex }:
-          buildHex {
-            name = "syslog";
-            version = "1.0.2";
-            sha256 =
-              "ca158a84afe482f77cb4668383a6108f1e9190fcdf3035858f426b91b2021bf6";
-            compilePort = true;
-
-            meta = {
-              description =
-                "Erlang port driver for interacting with syslog via syslog";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/Vagabond/erlang-syslog";
-            };
-          }
-      ) {};
-
-    syslog = syslog_1_0_2;
-
+    
     tea_crypto_1_0_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "tea_crypto";
-            version = "1.0.0";
-            sha256 =
-              "0e7e60d0afe79f0624faa8a358a3a00c912cfa548f3632383927abca4db29cc6";
-
-            meta = {
-              description = "A TEA implementation in Erlang.
+	{ buildHex }:
+	  buildHex {
+	    name = "tea_crypto";
+	    version = "1.0.0";
+	    sha256 =
+	      "0e7e60d0afe79f0624faa8a358a3a00c912cfa548f3632383927abca4db29cc6";
+	      
+	    meta = {
+	      description = "A TEA implementation in Erlang.
 ";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/keichan34/tea_crypto";
-            };
-          }
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/keichan34/tea_crypto";
+	    };
+	  }
       ) {};
-
+    
     tea_crypto = tea_crypto_1_0_0;
-
+    
     termcap_0_1_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "termcap";
-            version = "0.1.0";
-            sha256 =
-              "8c5167d68759bd1cd020eeaf5fd94153430fd19fa5a5fdeeb0b3129f0aba2a21";
-
-            meta = {
-              description = "Pure erlang termcap library";
-              license = stdenv.lib.licenses.mit;
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "termcap";
+	    version = "0.1.0";
+	    sha256 =
+	      "8c5167d68759bd1cd020eeaf5fd94153430fd19fa5a5fdeeb0b3129f0aba2a21";
+	      
+	    meta = {
+	      description = "Pure erlang termcap library";
+	      license = stdenv.lib.licenses.mit; 
+	    };
+	  }
       ) {};
-
+    
     termcap = termcap_0_1_0;
-
-    tinymt_0_2_0 = callPackage
+    
+    tinymt_0_3_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "tinymt";
-            version = "0.2.0";
-            sha256 =
-              "1ab2b2bd4e02ccf3f83ca6b2429c41110adaf2068c727d37a2e27a0207eccfe0";
-
-            meta = {
-              description = "Tiny Mersenne Twister (TinyMT) for Erlang
-";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/jj1bdx/tinymt-erlang/";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "tinymt";
+	    version = "0.3.1";
+	    sha256 =
+	      "9de8fcedf254661bc4aa550aac317e28be35d4a5d91adf3fa3689dfad6cc1e5a";
+	      
+	    meta = {
+	      description = "Tiny Mersenne Twister (TinyMT) for Erlang";
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/jj1bdx/tinymt-erlang/";
+	    };
+	  }
       ) {};
-
-    tinymt = tinymt_0_2_0;
-
+    
+    tinymt = tinymt_0_3_1;
+    
     trie_1_5_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "trie";
-            version = "1.5.0";
-            sha256 =
-              "613981536e33f58d92e44bd31801376f71deee0e57c63372fe8ab5fbbc37f7dc";
-
-            meta = {
-              description = "Erlang Trie Implementation";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/okeuday/trie";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "trie";
+	    version = "1.5.0";
+	    sha256 =
+	      "613981536e33f58d92e44bd31801376f71deee0e57c63372fe8ab5fbbc37f7dc";
+	      
+	    meta = {
+	      description = "Erlang Trie Implementation";
+	      license = stdenv.lib.licenses.bsd3;
+	      homepage = "https://github.com/okeuday/trie";
+	    };
+	  }
       ) {};
-
+    
     trie_1_5_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "trie";
-            version = "1.5.1";
-            sha256 =
-              "4b845dccfca8962b90584e98d270e2ff43e2e181bb046c4aae0e0f457679f98d";
-
-            meta = {
-              description = "Erlang Trie Implementation";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/okeuday/trie";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "trie";
+	    version = "1.5.1";
+	    sha256 =
+	      "4b845dccfca8962b90584e98d270e2ff43e2e181bb046c4aae0e0f457679f98d";
+	      
+	    meta = {
+	      description = "Erlang Trie Implementation";
+	      license = stdenv.lib.licenses.bsd3;
+	      homepage = "https://github.com/okeuday/trie";
+	    };
+	  }
       ) {};
-
+    
     trie = trie_1_5_1;
-
+    
     tsuru_1_0_2 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "tsuru";
-            version = "1.0.2";
-            sha256 =
-              "b586ad8d47799a086e4225494f5e3cf4e306ca255a173a4b48fe51d542cefb6b";
-
-            meta = {
-              description =
-                "A collection of useful tools for Erlang applications";
-              license = stdenv.lib.licenses.mit;
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "tsuru";
+	    version = "1.0.2";
+	    sha256 =
+	      "b586ad8d47799a086e4225494f5e3cf4e306ca255a173a4b48fe51d542cefb6b";
+	      
+	    meta = {
+	      description =
+		"A collection of useful tools for Erlang applications";
+	      license = stdenv.lib.licenses.mit; 
+	    };
+	  }
       ) {};
-
+    
     tsuru = tsuru_1_0_2;
-
+    
     ui_0_1_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "ui";
-            version = "0.1.1";
-            sha256 =
-              "492da59ca39055c0dfc794a2ebd564adb9ed635402c7b46659981f32aa9d94c1";
-
-            meta = {
-              description = "An OTP application";
-              license = stdenv.lib.licenses.free;
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "ui";
+	    version = "0.1.1";
+	    sha256 =
+	      "492da59ca39055c0dfc794a2ebd564adb9ed635402c7b46659981f32aa9d94c1";
+	      
+	    meta = {
+	      description = "An OTP application";
+	      license = stdenv.lib.licenses.free; 
+	    };
+	  }
       ) {};
-
+    
     ui = ui_0_1_1;
-
+    
     uri_0_1_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "uri";
-            version = "0.1.0";
-            sha256 =
-              "3833c3b5745fc0822df86c3a3591219048026fea8a535223b440d26029218996";
-
-            meta = {
-              description = "URI Parsing/Encoding Library";
-              license = stdenv.lib.licenses.free;
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "uri";
+	    version = "0.1.0";
+	    sha256 =
+	      "3833c3b5745fc0822df86c3a3591219048026fea8a535223b440d26029218996";
+	      
+	    meta = {
+	      description = "URI Parsing/Encoding Library";
+	      license = stdenv.lib.licenses.free; 
+	    };
+	  }
       ) {};
-
+    
     uri = uri_0_1_0;
-
+    
     varpool_1_5_1 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "varpool";
-            version = "1.5.1";
-            sha256 =
-              "ff6059bdcd0efad606e8c54ee623cfeaef59778c18e343dd772e84d99d188e26";
-
-            meta = {
-              description = "Erlang Process Pools as a Local Variable";
-              license = stdenv.lib.licenses.bsd3;
-              homepage = "https://github.com/okeuday/varpool";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "varpool";
+	    version = "1.5.1";
+	    sha256 =
+	      "ff6059bdcd0efad606e8c54ee623cfeaef59778c18e343dd772e84d99d188e26";
+	      
+	    meta = {
+	      description = "Erlang Process Pools as a Local Variable";
+	      license = stdenv.lib.licenses.bsd3;
+	      homepage = "https://github.com/okeuday/varpool";
+	    };
+	  }
       ) {};
-
+    
     varpool = varpool_1_5_1;
-
+    
     weber_0_1_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "weber";
-            version = "0.1.0";
-            sha256 =
-              "742c45b3c99e207dd0aeccb818edd2ace4af10699c96fbcee0ce2f692dc5fe12";
-
-            meta = {
-              description = "weber - is Elixir MVC web framework.";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/elixir-web/weber";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "weber";
+	    version = "0.1.0";
+	    sha256 =
+	      "742c45b3c99e207dd0aeccb818edd2ace4af10699c96fbcee0ce2f692dc5fe12";
+	      
+	    meta = {
+	      description = "weber - is Elixir MVC web framework.";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/elixir-web/weber";
+	    };
+	  }
       ) {};
-
+    
     weber = weber_0_1_0;
-
+    
     websocket_client_1_1_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "websocket_client";
-            version = "1.1.0";
-            sha256 =
-              "21c3d0df073634f2ca349af5b54a61755d637d6390c34d8d57c064f68ca92acd";
-
-            meta = {
-              description = "Erlang websocket client";
-              license = stdenv.lib.licenses.mit;
-              homepage = "https://github.com/sanmiguel/websocket_client";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "websocket_client";
+	    version = "1.1.0";
+	    sha256 =
+	      "21c3d0df073634f2ca349af5b54a61755d637d6390c34d8d57c064f68ca92acd";
+	      
+	    meta = {
+	      description = "Erlang websocket client";
+	      license = stdenv.lib.licenses.mit;
+	      homepage = "https://github.com/sanmiguel/websocket_client";
+	    };
+	  }
       ) {};
-
+    
     websocket_client = websocket_client_1_1_0;
-
+    
     worker_pool_1_0_4 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "worker_pool";
-            version = "1.0.4";
-            sha256 =
-              "7854a3b94e9624728db3a0475d00e7d0728adf3bf2ee3802bbf8ca10356d6f64";
-
-            meta = {
-              description = "Erlang Worker Pool";
-              license = stdenv.lib.licenses.free;
-              homepage = "https://github.com/inaka/worker_pool";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "worker_pool";
+	    version = "1.0.4";
+	    sha256 =
+	      "7854a3b94e9624728db3a0475d00e7d0728adf3bf2ee3802bbf8ca10356d6f64";
+	      
+	    meta = {
+	      description = "Erlang Worker Pool";
+	      license = stdenv.lib.licenses.free;
+	      homepage = "https://github.com/inaka/worker_pool";
+	    };
+	  }
       ) {};
-
+    
     worker_pool = worker_pool_1_0_4;
-
+    
     wpa_supplicant_0_1_0 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "wpa_supplicant";
-            version = "0.1.0";
-            sha256 =
-              "8a73ca51203401755d42ba636918106540aa3723006dab344dc8a7ec8fa2f3d5";
-
-            meta = {
-              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";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "wpa_supplicant";
+	    version = "0.1.0";
+	    sha256 =
+	      "8a73ca51203401755d42ba636918106540aa3723006dab344dc8a7ec8fa2f3d5";
+	      
+	    meta = {
+	      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";
+	    };
+	  }
       ) {};
-
+    
     wpa_supplicant = wpa_supplicant_0_1_0;
-
-    zipper_0_1_4 = callPackage
+    
+    zipper_0_1_5 = callPackage
       (
-        {  buildHex }:
-          buildHex {
-            name = "zipper";
-            version = "0.1.4";
-            sha256 =
-              "0037f29a5c5a96a9db49e9131f1071a48fcbd5959b74f1d8b6d22945a7ac46b9";
-
-            meta = {
-              description = "Generic Zipper Implementation for Erlang";
-              license = stdenv.lib.licenses.asl20;
-              homepage = "https://github.com/inaka/zipper";
-            };
-          }
+	{ buildHex }:
+	  buildHex {
+	    name = "zipper";
+	    version = "0.1.5";
+	    sha256 =
+	      "7df5552f41169a8feb1a2e81e2753ec4e4debb7d48cdf1edc77037205782d547";
+	      
+	    meta = {
+	      description = "Generic Zipper Implementation for Erlang";
+	      license = stdenv.lib.licenses.asl20;
+	      homepage = "https://github.com/inaka/zipper";
+	    };
+	  }
       ) {};
-
-    zipper = zipper_0_1_4;
-
+    
+    zipper = zipper_0_1_5;
+    
   };
-in self
+in self
\ No newline at end of file

From 6dc5dc10684b73cbd1d7b8ef3a4ebc153b344864 Mon Sep 17 00:00:00 2001
From: Gleb Peregud <gleber.p@gmail.com>
Date: Tue, 19 Jan 2016 12:36:24 +0100
Subject: [PATCH 0123/2285] rebar3-nix-bootstrap: 0.0.2 -> 0.0.3

---
 .../development/tools/erlang/rebar3-nix-bootstrap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix b/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix
index 7a2b89f7f05b..39ec59e849f2 100644
--- a/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix
+++ b/pkgs/development/tools/erlang/rebar3-nix-bootstrap/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
     name = "rebar3-nix-bootstrap";
-    version = "0.0.2";
+    version = "0.0.3";
 
     src = fetchFromGitHub {
         owner = "erlang-nix";
         repo = "rebar3-nix-bootstrap";
         rev = "${version}";
-        sha256 = "1zvrjljvi5plx8qc8sn6krymv8hk8ihx766hrc8v4d840xphl236";
+        sha256 = "01yyaz104jj3mxx8k10q3rwpn2rh13q1ja5r0iq37qyjmg8xflhq";
     };
 
     buildInputs = [ erlang ];

From 73c8aa49e445abe8beec8f9b8142477ddfdc6d05 Mon Sep 17 00:00:00 2001
From: Gleb Peregud <gleber.p@gmail.com>
Date: Tue, 19 Jan 2016 12:54:57 +0100
Subject: [PATCH 0124/2285] Update hex-packages.nix with hermetic rebar3.

This made some packages not build, because rebar3 tries to download
`rebar3_hex` for them.
---
 .../erlang-modules/hex-packages.nix           | 452 +-----------------
 1 file changed, 22 insertions(+), 430 deletions(-)

diff --git a/pkgs/development/erlang-modules/hex-packages.nix b/pkgs/development/erlang-modules/hex-packages.nix
index 485d35b42ad4..81fc1308e1e6 100644
--- a/pkgs/development/erlang-modules/hex-packages.nix
+++ b/pkgs/development/erlang-modules/hex-packages.nix
@@ -7,6 +7,8 @@
  * aws_http_0_2_4
  * barrel_jiffy_0_14_4
  * barrel_jiffy_0_14_5
+ * cache_tab_1_0_1
+ * certifi_0_1_1
  * cet_0_2_1
  * cloudi_core_1_4_0_rc_4
  * cloudi_core_1_5_1
@@ -39,10 +41,12 @@
  * cmark_0_6_2
  * comeonin_2_0_1
  * conferl_0_0_1
+ * couchbeam_1_2_1
  * cowboy_1_0_4
  * cpg_1_4_0
  * cpg_1_5_1
  * craterl_0_2_3
+ * cucumberl_0_0_6
  * db_0_9_0
  * ddb_client_0_1_17
  * denrei_0_2_3
@@ -50,6 +54,7 @@
  * dqe_0_1_22
  * ekstat_0_2_2
  * elibphonenumber_0_1_1
+ * elli_1_0_4
  * enotify_0_1_0
  * ensq_0_1_6
  * eplugin_0_1_4
@@ -58,6 +63,7 @@
  * erlang_lua_0_1_0
  * erlastic_search_1_1_1
  * erlaudio_0_2_3
+ * erlcloud_0_12_0
  * erltrace_0_1_4
  * escalus_2_6_4
  * ex_bitcask_0_1_0
@@ -73,10 +79,12 @@
  * hackney_1_1_0
  * hackney_1_3_1
  * hackney_1_3_2
+ * hackney_1_4_4
  * hackney_1_4_8
  * hash_ring_ex_1_1_2
  * jc_1_0_4
  * jose_1_4_2
+ * jsx_2_7_2
  * jsxn_0_2_1
  * katipo_0_2_4
  * kvs_2_1_0
@@ -89,17 +97,26 @@
  * mcrypt_0_1_0
  * mdns_client_0_1_7
  * mdns_client_lib_0_1_33
+ * mimerl_1_0_0
  * mmath_0_1_15
  * mmath_0_1_16
+ * msgpack_0_4_0
  * mstore_0_1_9
  * n2o_2_3_0
  * nacl_0_3_0
+ * neotoma_1_7_3
  * nodefinder_1_4_0
  * nodefinder_1_5_1
  * observer_cli_1_0_3
+ * p1_stringprep_1_0_0
+ * p1_utils_1_0_0
+ * p1_utils_1_0_1
+ * p1_utils_1_0_2
+ * p1_utils_1_0_3
  * p1_xml_1_1_1
  * parse_trans_2_9_0
  * picosat_0_1_0
+ * png_0_1_1
  * pooler_1_4_0
  * protobuffs_0_8_2
  * rankmatcher_0_1_2
@@ -108,11 +125,15 @@
  * rebar3_eqc_0_0_8
  * rebar3_exunit_0_1_1
  * rebar3_live_0_1_3
+ * rebar3_neotoma_plugin_0_2_0
  * rebar3_proper_0_5_0
+ * rebar3_proper_plugin_0_1_0
  * rebar3_protobuffs_0_2_0
  * rebar3_run_0_2_0
  * rebar3_yang_plugin_0_2_1
  * rebar_protobuffs_0_1_0
+ * relflow_1_0_4
+ * reup_0_1_0
  * riak_pb_2_1_0
  * riakc_2_1_1
  * service_1_5_1
@@ -122,6 +143,7 @@
  * stun_1_0_0
  * syslog_1_0_2
  * ucol_nif_1_1_5
+ * ui_0_1_1
  * uuid_erl_1_4_0
  * uuid_erl_1_5_1
  * xref_runner_0_2_5
@@ -303,44 +325,6 @@ let
     
     bstr = bstr_0_3_0;
     
-    cache_tab_1_0_1 = callPackage
-      (
-	{ buildHex, p1_utils_1_0_1 }:
-	  buildHex {
-	    name = "cache_tab";
-	    version = "1.0.1";
-	    sha256 =
-	      "717a91101e03535ab65e4a9ce028ae3f0ddfb4ce0fd4144bf8816082c6dc2933";
-	     
-	    erlangDeps  = [ p1_utils_1_0_1 ];
-	    
-	    meta = {
-	      description = "In-memory cache Erlang / Elixir library";
-	      license = stdenv.lib.licenses.asl20;
-	      homepage = "https://github.com/processone/cache_tab";
-	    };
-	  }
-      ) {};
-    
-    cache_tab = cache_tab_1_0_1;
-    
-    certifi_0_1_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "certifi";
-	    version = "0.1.1";
-	    sha256 =
-	      "e6d1dda48fad1b1c5b454c8402e2ac375ae12bf85a9910decaf791f330a7de29";
-	      
-	    meta = {
-	      description = "An OTP library";
-	      license = stdenv.lib.licenses.bsd3;
-	      homepage = "https://github.com/certifi/erlang-certifi";
-	    };
-	  }
-      ) {};
-    
     certifi_0_3_0 = callPackage
       (
 	{ buildHex }:
@@ -394,26 +378,6 @@ let
     
     cf = cf_0_2_1;
     
-    couchbeam_1_2_1 = callPackage
-      (
-	{ buildHex, hackney_1_4_4, jsx_2_8_0 }:
-	  buildHex {
-	    name = "couchbeam";
-	    version = "1.2.1";
-	    sha256 =
-	      "ed19f0412aa0539ecf622ac8ade1ca0e316f424e3334ad015a3fb8db19e91194";
-	     
-	    erlangDeps  = [ hackney_1_4_4 jsx_2_8_0 ];
-	    
-	    meta = {
-	      description = "Erlang CouchDB client";
-	      license = stdenv.lib.licenses.free; 
-	    };
-	  }
-      ) {};
-    
-    couchbeam = couchbeam_1_2_1;
-    
     cowlib_1_0_0 = callPackage
       (
 	{ buildHex }:
@@ -529,25 +493,6 @@ let
     
     cth_readable = cth_readable_1_2_0;
     
-    cucumberl_0_0_6 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "cucumberl";
-	    version = "0.0.6";
-	    sha256 =
-	      "3b9ea813997fd8c1e3d2b004e89288496dc21d2e5027f432e5900569d2c61cf3";
-	      
-	    meta = {
-	      description = "A pure-erlang implementation of Cucumber.";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/ericbmerritt/cucumberl";
-	    };
-	  }
-      ) {};
-    
-    cucumberl = cucumberl_0_0_6;
-    
     detergent_0_3_0 = callPackage
       (
 	{ buildHex }:
@@ -683,25 +628,6 @@ let
     
     elixir_ale = elixir_ale_0_4_1;
     
-    elli_1_0_4 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "elli";
-	    version = "1.0.4";
-	    sha256 =
-	      "87641b9c069b1372dac4e1bdda795076ea3142af78aac0d63896a38079e89e8e";
-	      
-	    meta = {
-	      description =
-		"Fast and robust web server for building high-throughput, low-latency apps";
-	      license = stdenv.lib.licenses.free; 
-	    };
-	  }
-      ) {};
-    
-    elli = elli_1_0_4;
-    
     eper_0_94_0 = callPackage
       (
 	{ buildHex }:
@@ -877,27 +803,6 @@ let
 	  }
       ) {};
     
-    erlcloud_0_12_0 = callPackage
-      (
-	{ buildHex, jsx_2_7_2, lhttpc_1_3_0, meck_0_8_3 }:
-	  buildHex {
-	    name = "erlcloud";
-	    version = "0.12.0";
-	    sha256 =
-	      "2ff2631a4e405a645cedf2713ec66728023e93ac80ed47035554a7d6205d412d";
-	     
-	    erlangDeps  = [ jsx_2_7_2 lhttpc_1_3_0 meck_0_8_3 ];
-	    
-	    meta = {
-	      description = "Cloud Computing library for erlang";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/gleber/erlcloud";
-	    };
-	  }
-      ) {};
-    
-    erlcloud = erlcloud_0_12_0;
-    
     erldn_1_0_2 = callPackage
       (
 	{ buildHex }:
@@ -1413,36 +1318,6 @@ let
     
     gurka = gurka_0_1_7;
     
-    hackney_1_4_4 = callPackage
-      (
-	{
-	  buildHex,
-	  certifi_0_1_1,
-	  idna_1_0_2,
-	  mimerl_1_0_0,
-	  ssl_verify_hostname_1_0_5
-	}:
-	  buildHex {
-	    name = "hackney";
-	    version = "1.4.4";
-	    sha256 =
-	      "c8ab2436556d6bce7e85a85adec67f6abeb8c7508668a3e29750be3c4bf4e3a8";
-	     
-	    erlangDeps  = [
-			    certifi_0_1_1
-			    idna_1_0_2
-			    mimerl_1_0_0
-			    ssl_verify_hostname_1_0_5
-			  ];
-	    
-	    meta = {
-	      description = "simple HTTP client";
-	      license = stdenv.lib.licenses.asl20;
-	      homepage = "https://github.com/benoitc/hackney";
-	    };
-	  }
-      ) {};
-    
     hamcrest_0_1_1 = callPackage
       (
 	{ buildHex }:
@@ -1729,25 +1604,6 @@ let
 	  }
       ) {};
     
-    jsx_2_7_2 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "jsx";
-	    version = "2.7.2";
-	    sha256 =
-	      "36ca4772c09d69efc9e069aec7327cbd57d53d56c9a2777d8fb3bf3c1eab6df3";
-	      
-	    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";
-	    };
-	  }
-      ) {};
-    
     jsx_2_8_0 = callPackage
       (
 	{ buildHex }:
@@ -2138,23 +1994,6 @@ let
     
     metrics = metrics_0_2_1;
     
-    mimerl_1_0_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "mimerl";
-	    version = "1.0.0";
-	    sha256 =
-	      "a30b01104a29bd3a363db8646e4ce0f7980f9ecd23a98707c46c3ced918c41b4";
-	      
-	    meta = {
-	      description = "Library to handle mimetypes";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/benoitc/mimerl";
-	    };
-	  }
-      ) {};
-    
     mimerl_1_0_2 = callPackage
       (
 	{ buildHex }:
@@ -2212,25 +2051,6 @@ let
     
     mochiweb = mochiweb_2_12_2;
     
-    msgpack_0_4_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "msgpack";
-	    version = "0.4.0";
-	    sha256 =
-	      "cb69184b254bcddfd0b3b813fa9ffc87dd4642ad026bb8117e2384b55239eae4";
-	      
-	    meta = {
-	      description = "MessagePack serializer/deserializer";
-	      license = stdenv.lib.licenses.free;
-	      homepage = "http://msgpack.org";
-	    };
-	  }
-      ) {};
-    
-    msgpack = msgpack_0_4_0;
-    
     mtx_1_0_0 = callPackage
       (
 	{ buildHex }:
@@ -2250,117 +2070,6 @@ let
     
     mtx = mtx_1_0_0;
     
-    neotoma_1_7_3 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "neotoma";
-	    version = "1.7.3";
-	    sha256 =
-	      "2da322b9b1567ffa0706a7f30f6bbbde70835ae44a1050615f4b4a3d436e0f28";
-	      
-	    meta = {
-	      description = "PEG/Packrat toolkit and parser-generator.";
-	      license = stdenv.lib.licenses.mit;
-	      homepage = "https://github.com/seancribbs/neotoma";
-	    };
-	  }
-      ) {};
-    
-    neotoma = neotoma_1_7_3;
-    
-    p1_stringprep_1_0_0 = callPackage
-      (
-	{ buildHex, p1_utils_1_0_1 }:
-	  buildHex {
-	    name = "p1_stringprep";
-	    version = "1.0.0";
-	    sha256 =
-	      "2a9ce90acb64089f0a34cc592690b398830a5b6fd3c8a84689af5d2feb85d876";
-	    compilePorts = true;
-	    
-	    erlangDeps  = [ p1_utils_1_0_1 ];
-	    
-	    meta = {
-	      description = "Fast Stringprep Erlang / Elixir implementation";
-	      license = with stdenv.lib.licenses; [ asl20 free ];
-	      homepage = "https://github.com/processone/stringprep";
-	    };
-	  }
-      ) {};
-    
-    p1_stringprep = p1_stringprep_1_0_0;
-    
-    p1_utils_1_0_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "p1_utils";
-	    version = "1.0.0";
-	    sha256 =
-	      "b2c6316286b071f2f667fb1c59b44fe0c996917515fa93374a4a3264affc5105";
-	      
-	    meta = {
-	      description = "Erlang utility modules from ProcessOne";
-	      license = stdenv.lib.licenses.asl20;
-	      homepage = "https://github.com/processone/p1_utils";
-	    };
-	  }
-      ) {};
-    
-    p1_utils_1_0_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "p1_utils";
-	    version = "1.0.1";
-	    sha256 =
-	      "8e19478439c3ef05229fbd4fb65ff2e4aee02458a9c2b86a103a7f1384b76fdb";
-	      
-	    meta = {
-	      description = "Erlang utility modules from ProcessOne";
-	      license = stdenv.lib.licenses.asl20;
-	      homepage = "https://github.com/processone/p1_utils";
-	    };
-	  }
-      ) {};
-    
-    p1_utils_1_0_2 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "p1_utils";
-	    version = "1.0.2";
-	    sha256 =
-	      "c4b770fd925f2fc6c301a1e27f1bfb77aff3fff8d0951cc56c06bef9835af918";
-	      
-	    meta = {
-	      description = "Erlang utility modules from ProcessOne";
-	      license = stdenv.lib.licenses.asl20;
-	      homepage = "https://github.com/processone/p1_utils";
-	    };
-	  }
-      ) {};
-    
-    p1_utils_1_0_3 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "p1_utils";
-	    version = "1.0.3";
-	    sha256 =
-	      "6bf7dc7108eee70e036ea745faf5f55b4354e267f14371ea13338f58ce402d5e";
-	      
-	    meta = {
-	      description = "Erlang utility modules from ProcessOne";
-	      license = stdenv.lib.licenses.asl20;
-	      homepage = "https://github.com/processone/p1_utils";
-	    };
-	  }
-      ) {};
-    
-    p1_utils = p1_utils_1_0_3;
-    
     pc_1_2_0 = callPackage
       (
 	{ buildHex }:
@@ -2380,28 +2089,6 @@ let
     
     pc = pc_1_2_0;
     
-    png_0_1_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "png";
-	    version = "0.1.1";
-	    sha256 =
-	      "f8d4a17c118dcc16bb18d0fda6e26947001f9312bc6c061d2236b424fc3dd9ea";
-	      
-	    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";
-	    };
-	  }
-      ) {};
-    
-    png = png_0_1_1;
-    
     poolboy_1_5_1 = callPackage
       (
 	{ buildHex }:
@@ -2733,46 +2420,6 @@ let
     
     rebar3_idl_compiler = rebar3_idl_compiler_0_3_0;
     
-    rebar3_neotoma_plugin_0_2_0 = callPackage
-      (
-	{ buildHex, neotoma_1_7_3 }:
-	  buildHex {
-	    name = "rebar3_neotoma_plugin";
-	    version = "0.2.0";
-	    sha256 =
-	      "c0ebbdb08c017cac90c7d3310a9bd4a5088a46abd4e2fef9e9a9805a657396b8";
-	     
-	    erlangDeps  = [ neotoma_1_7_3 ];
-	    
-	    meta = {
-	      description = "Neotoma rebar plugin";
-	      license = stdenv.lib.licenses.free;
-	      homepage =
-		"https://github.com/zamotivator/rebar3_neotoma_plugin";
-	    };
-	  }
-      ) {};
-    
-    rebar3_neotoma_plugin = rebar3_neotoma_plugin_0_2_0;
-    
-    rebar3_proper_plugin_0_1_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "rebar3_proper_plugin";
-	    version = "0.1.0";
-	    sha256 =
-	      "7071555afb623e73a2c572de6d4379f9c197b44e68608944eb2835617faed10d";
-	      
-	    meta = {
-	      description = "A rebar plugin";
-	      license = stdenv.lib.licenses.free; 
-	    };
-	  }
-      ) {};
-    
-    rebar3_proper_plugin = rebar3_proper_plugin_0_1_0;
-    
     rebar_alias_0_1_0 = callPackage
       (
 	{ buildHex }:
@@ -2849,24 +2496,6 @@ let
     
     redo = redo_2_0_1;
     
-    relflow_1_0_4 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "relflow";
-	    version = "1.0.4";
-	    sha256 =
-	      "e6d9652ed7511aea18fa012d5abc19301acd8cbe81a44a159391086a5be12e1f";
-	      
-	    meta = {
-	      description = "Rebar3 release workflow plugin";
-	      license = stdenv.lib.licenses.free; 
-	    };
-	  }
-      ) {};
-    
-    relflow = relflow_1_0_4;
-    
     reltool_util_1_4_0 = callPackage
       (
 	{ buildHex }:
@@ -2937,25 +2566,6 @@ let
     
     relx = relx_3_13_0;
     
-    reup_0_1_0 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "reup";
-	    version = "0.1.0";
-	    sha256 =
-	      "949a672190119f8b24160167e3685fdd5397474f98dc875ccfd31378ebd68506";
-	      
-	    meta = {
-	      description =
-		"dev watcher that auto compiles and reloads modules";
-	      license = stdenv.lib.licenses.free; 
-	    };
-	  }
-      ) {};
-    
-    reup = reup_0_1_0;
-    
     savory_0_0_2 = callPackage
       (
 	{ buildHex }:
@@ -3276,24 +2886,6 @@ let
     
     tsuru = tsuru_1_0_2;
     
-    ui_0_1_1 = callPackage
-      (
-	{ buildHex }:
-	  buildHex {
-	    name = "ui";
-	    version = "0.1.1";
-	    sha256 =
-	      "492da59ca39055c0dfc794a2ebd564adb9ed635402c7b46659981f32aa9d94c1";
-	      
-	    meta = {
-	      description = "An OTP application";
-	      license = stdenv.lib.licenses.free; 
-	    };
-	  }
-      ) {};
-    
-    ui = ui_0_1_1;
-    
     uri_0_1_0 = callPackage
       (
 	{ buildHex }:

From 3f9ff30f6d3972b2dada00b022b1bced8f83cd42 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@prime.vc>
Date: Tue, 19 Jan 2016 15:59:10 +0100
Subject: [PATCH 0125/2285] glib: fix compilation on SmartOS/Illumos (close
 #12477)

Recent illumos includes a linux-incompatible `inotify.h` header, which configure detects: compilation fails.
Also, a newer `dtrace` on SmartOS fails creating the probes ELF linkable object (with `dtrace -G`). Disable for now.

Remove old configure option `--disable-modular-tests`.
---
 pkgs/development/libraries/glib/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 538a40615f14..47ed65eb561a 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -68,12 +68,17 @@ stdenv.mkDerivation rec {
 
   configureFlags =
     optional stdenv.isDarwin "--disable-compile-warnings"
-    ++ optional stdenv.isFreeBSD "--with-libiconv=gnu"
-    ++ optional stdenv.isSunOS ["--disable-modular-tests" "--with-libiconv"];
+    ++ optional (stdenv.isFreeBSD || stdenv.isSunOS) "--with-libiconv=gnu"
+    ++ optional stdenv.isSunOS "--disable-dtrace";
 
   NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"
     + optionalString stdenv.isSunOS " -DBSD_COMP";
 
+  preConfigure = optionalString stdenv.isSunOS
+    ''
+      sed -i -e 's|inotify.h|foobar-inotify.h|g' configure
+    '';
+
   preBuild = optionalString stdenv.isDarwin
     ''
       export MACOSX_DEPLOYMENT_TARGET=

From fe53cb56d94a4334a1f5e9a1e2f9548540fd2a2a Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 13 Jan 2016 17:07:30 +0100
Subject: [PATCH 0126/2285] spl: 0.6.5.3 -> 0.6.5.4

---
 pkgs/os-specific/linux/spl/const.patch          |  8 ++++----
 pkgs/os-specific/linux/spl/default.nix          |  4 ++--
 pkgs/os-specific/linux/spl/install_prefix.patch | 17 +++++++++--------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pkgs/os-specific/linux/spl/const.patch b/pkgs/os-specific/linux/spl/const.patch
index 3bfcaa22b13c..932e8a9eb1c4 100644
--- a/pkgs/os-specific/linux/spl/const.patch
+++ b/pkgs/os-specific/linux/spl/const.patch
@@ -1,10 +1,10 @@
 diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c
-index f25239a..b731123 100644
+index eb00505..6f38cef 100644
 --- a/module/spl/spl-proc.c
 +++ b/module/spl/spl-proc.c
-@@ -38,7 +38,7 @@
- 
- #define SS_DEBUG_SUBSYS SS_PROC
+@@ -36,7 +36,7 @@
+ #include <linux/uaccess.h>
+ #include <linux/version.h>
  
 -#if defined(CONSTIFY_PLUGIN) && LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
 +#if defined(CONSTIFY_PLUGIN)
diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix
index b8aad109c5a8..959523ec5971 100644
--- a/pkgs/os-specific/linux/spl/default.nix
+++ b/pkgs/os-specific/linux/spl/default.nix
@@ -17,13 +17,13 @@ assert buildKernel -> kernel != null;
 stdenv.mkDerivation rec {
   name = "spl-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
 
-  version = "0.6.5.3";
+  version = "0.6.5.4";
 
   src = fetchFromGitHub {
     owner = "zfsonlinux";
     repo = "spl";
     rev = "spl-${version}";
-    sha256 = "0lj57apwsy8cfwsvg9z62k71r3qms2p87lgcdk54g7352cwziqps";
+    sha256 = "0k80xvl15ahbs0mylfl2bd5widxhngpf7dl6zq46s21wk0795jl4";
   };
 
   patches = [ ./const.patch ./install_prefix.patch ];
diff --git a/pkgs/os-specific/linux/spl/install_prefix.patch b/pkgs/os-specific/linux/spl/install_prefix.patch
index 0f12f531f7ae..dc91392bd2fe 100644
--- a/pkgs/os-specific/linux/spl/install_prefix.patch
+++ b/pkgs/os-specific/linux/spl/install_prefix.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile.am b/Makefile.am
-index 89af931..674420c 100644
+index 4977448..ac17217 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -12,10 +12,10 @@ endif
@@ -40,10 +40,10 @@ index e0da4b3..d6d7af0 100644
  kernel_HEADERS = $(KERNEL_H)
  endif
 diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
-index 1cca44a..e0d843b 100644
+index 712e94e..4af9fb7 100644
 --- a/include/linux/Makefile.am
 +++ b/include/linux/Makefile.am
-@@ -19,6 +19,6 @@ USER_H =
+@@ -18,6 +18,6 @@ USER_H =
  EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
  
  if CONFIG_KERNEL
@@ -76,10 +76,10 @@ index 10e7093..febecdf 100644
  kernel_HEADERS = $(KERNEL_H)
  endif
 diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
-index 2d21c57..3958cfd 100644
+index 73c4a84..31a9f50 100644
 --- a/include/sys/Makefile.am
 +++ b/include/sys/Makefile.am
-@@ -104,7 +104,7 @@ USER_H =
+@@ -107,7 +107,7 @@ USER_H =
  EXTRA_DIST = $(COMMON_H) $(KERNEL_H) $(USER_H)
  
  if CONFIG_KERNEL
@@ -125,7 +125,7 @@ index 63d9af3..de1aa18 100644
  kernel_HEADERS = $(KERNEL_H)
  endif
 diff --git a/include/util/Makefile.am b/include/util/Makefile.am
-index b721b50..cbb9a05 100644
+index e2bf09f..3f5d6ce 100644
 --- a/include/util/Makefile.am
 +++ b/include/util/Makefile.am
 @@ -9,6 +9,6 @@ USER_H =
@@ -149,7 +149,7 @@ index 7faab0a..8148b3d 100644
  kernel_HEADERS = $(KERNEL_H)
  endif
 diff --git a/module/Makefile.in b/module/Makefile.in
-index 41c1010..3141397 100644
+index d4e62e1..73fa01c 100644
 --- a/module/Makefile.in
 +++ b/module/Makefile.in
 @@ -21,15 +21,15 @@ clean:
@@ -162,8 +162,9 @@ index 41c1010..3141397 100644
  		KERNELRELEASE=@LINUX_VERSION@
  	@# Remove extraneous build products when packaging
 -	kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
+-	if [ -n "$(DESTDIR)" ]; then \
 +	kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
- 	if [ -n $$kmoddir ]; then \
++	if [ -n "@prefix@" ]; then \
  		find $$kmoddir -name 'modules.*' | xargs $(RM); \
  	fi
 -	sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \

From d51204e8dec7995bc4cb44f5776102258e713e1e Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 13 Jan 2016 17:07:33 +0100
Subject: [PATCH 0127/2285] zfs: 0.6.5.3 -> 0.6.5.4

---
 pkgs/os-specific/linux/zfs/default.nix     |  4 ++--
 pkgs/os-specific/linux/zfs/nix-build.patch | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix
index 28fc35efbd46..42da97a7a7b7 100644
--- a/pkgs/os-specific/linux/zfs/default.nix
+++ b/pkgs/os-specific/linux/zfs/default.nix
@@ -20,13 +20,13 @@ assert buildKernel -> kernel != null && spl != null;
 stdenv.mkDerivation rec {
   name = "zfs-${configFile}-${version}${optionalString buildKernel "-${kernel.version}"}";
 
-  version = "0.6.5.3";
+  version = "0.6.5.4";
 
   src = fetchFromGitHub {
     owner = "zfsonlinux";
     repo = "zfs";
     rev = "zfs-${version}";
-    sha256 = "1hq65kq50hzhd1zqgyzqq2whg1fckigq8jmhhdsnbwrwmx5y76lh";
+    sha256 = "10zf1kdgmdiaaa3zmz4sz5aj5ql6v24wcwixlxbwhwc51mr46k50";
   };
 
   patches = [ ./nix-build.patch ];
diff --git a/pkgs/os-specific/linux/zfs/nix-build.patch b/pkgs/os-specific/linux/zfs/nix-build.patch
index ae8e82f703af..cc9e36838c7e 100644
--- a/pkgs/os-specific/linux/zfs/nix-build.patch
+++ b/pkgs/os-specific/linux/zfs/nix-build.patch
@@ -1,8 +1,8 @@
 diff --git a/Makefile.am b/Makefile.am
-index 49b417a..f4af44d 100644
+index f8abb5f..82e8fb6 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -12,10 +12,10 @@ endif
+@@ -11,10 +11,10 @@ endif
  if CONFIG_KERNEL
  SUBDIRS += module
  
@@ -28,10 +28,10 @@ index a94cad5..a160fe2 100644
  kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
  endif
 diff --git a/include/linux/Makefile.am b/include/linux/Makefile.am
-index d00b1c8..3242d2e 100644
+index 595d1db..d41375d 100644
 --- a/include/linux/Makefile.am
 +++ b/include/linux/Makefile.am
-@@ -17,6 +17,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
+@@ -18,6 +18,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
  endif
  
  if CONFIG_KERNEL
@@ -40,10 +40,10 @@ index d00b1c8..3242d2e 100644
  kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
  endif
 diff --git a/include/sys/Makefile.am b/include/sys/Makefile.am
-index 7ddace0..8da3870 100644
+index 77ecfb2..52b3612 100644
 --- a/include/sys/Makefile.am
 +++ b/include/sys/Makefile.am
-@@ -102,6 +102,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
+@@ -114,6 +114,6 @@ libzfs_HEADERS = $(COMMON_H) $(USER_H)
  endif
  
  if CONFIG_KERNEL
@@ -88,7 +88,7 @@ index 0859b9f..b0c6eec 100644
  kernel_HEADERS = $(COMMON_H) $(KERNEL_H)
  endif
 diff --git a/module/Makefile.in b/module/Makefile.in
-index 686402b..9cbf598 100644
+index d4ddee2..876c811 100644
 --- a/module/Makefile.in
 +++ b/module/Makefile.in
 @@ -18,9 +18,9 @@ modules:
@@ -107,7 +107,7 @@ index 686402b..9cbf598 100644
  		"*** - @SPL_OBJ@/module/@SPL_SYMBOLS@\n"; \
  		exit 1; \
  	fi
-+	@# when copying a file out of the nix store, we need to make it writable again. 
++	@# when copying a file out of the nix store, we need to make it writable again.
 +	chmod +w @SPL_SYMBOLS@
  	$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_ZFS=m $@
  
@@ -122,8 +122,9 @@ index 686402b..9cbf598 100644
  		KERNELRELEASE=@LINUX_VERSION@
  	@# Remove extraneous build products when packaging
 -	kmoddir=$(DESTDIR)$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
+-	if [ -n "$(DESTDIR)" ]; then \
 +	kmoddir=@prefix@/$(INSTALL_MOD_PATH)/lib/modules/@LINUX_VERSION@; \
- 	if [ -n $$kmoddir ]; then \
++	if [ -n "@prefix@" ]; then \
  		find $$kmoddir -name 'modules.*' | xargs $(RM); \
  	fi
 -	sysmap=$(DESTDIR)$(INSTALL_MOD_PATH)/boot/System.map-@LINUX_VERSION@; \

From e67717bc8d545c593f974163a8a496f5f898b73d Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@prime.vc>
Date: Tue, 19 Jan 2016 15:59:10 +0100
Subject: [PATCH 0128/2285] glib: fix compilation on SmartOS/Illumos (close
 #12479)

Recent illumos includes a linux-incompatible `inotify.h` header, which configure detects: compilation fails.
Also, a newer `dtrace` on SmartOS fails creating the probes ELF linkable object (with `dtrace -G`). Disable for now.

Remove old configure option `--disable-modular-tests`.
---
 pkgs/development/libraries/glib/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 538a40615f14..9a3303684a15 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -68,12 +68,17 @@ stdenv.mkDerivation rec {
 
   configureFlags =
     optional stdenv.isDarwin "--disable-compile-warnings"
-    ++ optional stdenv.isFreeBSD "--with-libiconv=gnu"
-    ++ optional stdenv.isSunOS ["--disable-modular-tests" "--with-libiconv"];
+    ++ optional (stdenv.isFreeBSD || stdenv.isSunOS) "--with-libiconv=gnu"
+    ++ optional stdenv.isSunOS "--disable-dtrace";
 
   NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"
     + optionalString stdenv.isSunOS " -DBSD_COMP";
 
+  preConfigure = if !stdenv.isSunOS then null else
+    ''
+      sed -i -e 's|inotify.h|foobar-inotify.h|g' configure
+    '';
+
   preBuild = optionalString stdenv.isDarwin
     ''
       export MACOSX_DEPLOYMENT_TARGET=

From a7ca9c2105e99e241d6b7e105de4e43ae9a2277d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 19 Jan 2016 17:39:35 +0100
Subject: [PATCH 0129/2285] Revert "glib: fix compilation on SmartOS/Illumos
 (close #12477)"

This reverts commit 3f9ff30f6d3972b2dada00b022b1bced8f83cd42.
Let's go without changing hash instead: e67717bc8d545c
---
 pkgs/development/libraries/glib/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 47ed65eb561a..538a40615f14 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -68,17 +68,12 @@ stdenv.mkDerivation rec {
 
   configureFlags =
     optional stdenv.isDarwin "--disable-compile-warnings"
-    ++ optional (stdenv.isFreeBSD || stdenv.isSunOS) "--with-libiconv=gnu"
-    ++ optional stdenv.isSunOS "--disable-dtrace";
+    ++ optional stdenv.isFreeBSD "--with-libiconv=gnu"
+    ++ optional stdenv.isSunOS ["--disable-modular-tests" "--with-libiconv"];
 
   NIX_CFLAGS_COMPILE = optionalString stdenv.isDarwin " -lintl"
     + optionalString stdenv.isSunOS " -DBSD_COMP";
 
-  preConfigure = optionalString stdenv.isSunOS
-    ''
-      sed -i -e 's|inotify.h|foobar-inotify.h|g' configure
-    '';
-
   preBuild = optionalString stdenv.isDarwin
     ''
       export MACOSX_DEPLOYMENT_TARGET=

From 319acb0af5b453e08ddae3464c11261b9e0354e1 Mon Sep 17 00:00:00 2001
From: Joe Hermaszewski <git@monoid.al>
Date: Tue, 19 Jan 2016 13:16:17 +0000
Subject: [PATCH 0130/2285] openimageio: 1.4.16 -> 1.6.9

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

diff --git a/pkgs/applications/graphics/openimageio/default.nix b/pkgs/applications/graphics/openimageio/default.nix
index 6bffa834ae0b..97607e819514 100644
--- a/pkgs/applications/graphics/openimageio/default.nix
+++ b/pkgs/applications/graphics/openimageio/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "openimageio-${version}";
-  version = "1.4.16";
+  version = "1.6.9";
 
   src = fetchurl {
     url = "https://github.com/OpenImageIO/oiio/archive/Release-${version}.zip";
-    sha256 = "0f9gspsjhniz992c04dm4lvffzz7zjqn1n34nqn6c32r498kimcj";
+    sha256 = "0942xj877875f4dpfg7aqwyw015y82vkhaqap7yhybmvzsfj7wki";
   };
 
   buildInputs = [

From 553ab970bd2c76ec3d835d92162819f3508269a1 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 19 Jan 2016 20:19:09 +0100
Subject: [PATCH 0131/2285] svtplay-dl: 0.20.2015.11.29 -> 0.30.2016.01.10

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

diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index dafc30bd6472..97737bce783f 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "svtplay-dl-${version}";
-  version = "0.20.2015.11.29";
+  version = "0.30.2016.01.10";
 
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    sha256 = "10y0qxyyfw9kxiax3b0gdd38yz2y3lii75mgvlq6q6h77r3wham4";
+    sha256 = "1npgjgbri7g27f9ayx39d3pbv7pa22860c0aipwwvayggs27g1sr";
   };
 
   pythonPaths = [ pycrypto requests2 ];

From b364428b4bd0241c574e165ba4ec58c656a4234c Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 19 Jan 2016 20:01:02 +0100
Subject: [PATCH 0132/2285] perl-Software-License: 0.103010 -> 0.103011

---
 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 1e8dfa91d2d2..dbebee8d4faf 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10245,10 +10245,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   SoftwareLicense = buildPerlPackage rec {
-    name = "Software-License-0.103010";
+    name = "Software-License-0.103011";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
-      sha256 = "929fbace96f69a0977a0380000820c93fc1af4e973a422c73e6cd254405fa47c";
+      sha256 = "03dyc5sx0asq1m3276l224q5776ng24fw5llf3gr9mbgklkgj05s";
     };
     propagatedBuildInputs = [ DataSection TextTemplate TryTiny ];
     meta = {

From ac0c49970b7356d9fc4ccaeeed69a44705bf23b0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 19 Jan 2016 21:25:08 +0100
Subject: [PATCH 0133/2285] make-tarball.nix: Allow passing in a different Nix

Used by the Nix tests (https://github.com/NixOS/nix/commit/9fff4925613d44ac12775ad8840709130b9498d1).
---
 pkgs/top-level/make-tarball.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix
index c14f94d95fd7..ebf19af943f5 100644
--- a/pkgs/top-level/make-tarball.nix
+++ b/pkgs/top-level/make-tarball.nix
@@ -2,7 +2,11 @@
    also builds the documentation and tests whether the Nix expressions
    evaluate correctly. */
 
-{ pkgs, nixpkgs, officialRelease }:
+{ nixpkgs
+, officialRelease
+, pkgs ? import nixpkgs.outPath {}
+, nix ? pkgs.nix
+}:
 
 with pkgs;
 

From 38c83e291681d16273dd68749117dc64c756d0e7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 19 Jan 2016 17:51:56 +0100
Subject: [PATCH 0134/2285] pythonPackages.pygments: 2.0.2 -> 2.1

- Added lexers, styles, formatters.
- New "filename" option for HTML formatter (PR#527).
- Improved performance of the HTML formatter for long lines (PR#504).
- Updated autopygmentize script (PR#445).
- Fixed style inheritance for non-standard token types in HTML
  output.
- Added support for async/await to Python 3 lexer.
- Rewrote linenos option for TerminalFormatter (it's better, but
  slightly different output than before) (#1147).
- Javascript lexer now supports most of ES6 (#1100).
- Cocoa builtins updated for iOS 8.1 (PR#433).
- Combined BashSessionLexer and ShellSessionLexer, new version
  should support the prompt styles of either.
- Added option to pygmentize to show a full traceback on exceptions.
- Fixed incomplete output on Windows and Python 3 (e.g. when using
  iPython Notebook) (#1153).
- Allowed more traceback styles in Python console lexer (PR#253).
- Added decorators to TypeScript (PR#509).
- Fix highlighting of certain IRC logs formats (#1076).

More: https://bitbucket.org/birkenfeld/pygments-main/src/tip/CHANGES
---
 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 598863c31d75..565afe68940d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15555,12 +15555,12 @@ in modules // {
   };
 
   pygments = buildPythonPackage rec {
-    version = "2.0.2";
+    version = "2.1";
     name = "Pygments-${version}";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz";
-      sha256 = "0lagrwifsgn0s8bzqahpr87p7gd38xja8f06akscinp6hj89283k";
+      sha256 = "0yx4p3w9lw1kw24zr87xnaqxm007mdxgwa5wjpwnrcfpmxgyz80k";
     };
 
     propagatedBuildInputs = with self; [ docutils ];

From 94a47eeea1237046349e79142efebb9a67a66b69 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 19 Jan 2016 18:10:03 +0100
Subject: [PATCH 0135/2285] debian_devscripts: 2.15.8 -> 2.15.10

Changes: http://metadata.ftp-master.debian.org/changelogs/main/d/devscripts/
---
 pkgs/tools/misc/debian-devscripts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index b6158ab64454..9a4dcae7dd26 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.15.8";
+  version = "2.15.10";
   name = "debian-devscripts-${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz";
-    sha256 = "1zw7phaigncblxb3jp4m8pk165hylk1f088k51nhj9d7z5iz6bbx";
+    sha256 = "1yb26xpjxp9q5vsjzc9bv8vydpx2rs1v0i7phxhylfjn0fgpfnc6";
   };
 
   buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile 

From 8871de95f5277dc88d991437ac3e782faada4846 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 19 Jan 2016 21:32:54 +0100
Subject: [PATCH 0136/2285] fuze: remove dead package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Last maintained in 2013. Building fails due to vanished sources.
Upstream has the following to say:

  “As of February 11th 2015, Fuze will no longer support a native
   Linux-based client. This means that any customers attempting to
   install or use our previous Linux client will be unable to do
   so. There are currently no plans to create an updated version
   of the Linux client for Fuze. For Linux based customers that
   still wish to use Fuze, we recommend that you try our browser
   client.” -- https://support.fuze.com/hc/en-us/articles/201527877-Does-Fuze-Support-Linux-

Never marked as broken, but has been so for quite some time.
---
 .../instant-messengers/fuze/default.nix       | 53 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 55 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/fuze/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/fuze/default.nix b/pkgs/applications/networking/instant-messengers/fuze/default.nix
deleted file mode 100644
index 33ffe87a4ffb..000000000000
--- a/pkgs/applications/networking/instant-messengers/fuze/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv, fetchurl, dpkg, openssl, alsaLib, libXext, libXfixes, libXrandr
-, libjpeg, curl, libX11, libXmu, libXv, libXtst, qt4, mesa, zlib
-, gnome, libidn, rtmpdump, c-ares, openldap, makeWrapper
-}:
-assert stdenv.system == "x86_64-linux";
-let
-  curl_custom =
-    stdenv.lib.overrideDerivation curl (args: { 
-      configureFlags = args.configureFlags ++ ["--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"] ; 
-    } );
-in
-stdenv.mkDerivation {
-  name = "fuze-1.0.5";
-  src = fetchurl {
-    url = http://apt.fuzebox.com/apt/pool/lucid/main/f/fuzelinuxclient/fuzelinuxclient_1.0.5.lucid_amd64.deb;
-    sha256 = "0gvxc8qj526cigr1lif8vdn1aawj621camkc8kvps23r7zijhnqv";
-  };
-  buildInputs = [ dpkg makeWrapper ];
-  libPath =
-    stdenv.lib.makeLibraryPath [
-      openssl alsaLib libXext libXfixes libXrandr libjpeg curl_custom
-      libX11 libXmu libXv qt4 libXtst mesa stdenv.cc.cc zlib
-      gnome.GConf libidn rtmpdump c-ares openldap
-    ];
-  buildCommand = ''
-    dpkg-deb -x $src .
-    mkdir -p $out/lib $out/bin
-    cp -R usr/lib/fuzebox $out/lib
-
-    patchelf \
-      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath $out/lib/fuzebox:$libPath \
-      $out/lib/fuzebox/FuzeLinuxApp
-
-    wrapProgram $out/lib/fuzebox/FuzeLinuxApp --prefix LD_LIBRARY_PATH : $libPath
-    for f in $out/lib/fuzebox/*.so.*; do
-      patchelf \
-        --set-rpath $out/lib/fuzebox:$libPath \
-        $f
-    done
-
-    ln -s ${openssl}/lib/libssl.so.1.0.0 $out/lib/fuzebox/libssl.so.0.9.8
-    ln -s ${openssl}/lib/libcrypto.so.1.0.0 $out/lib/fuzebox/libcrypto.so.0.9.8
-
-    ln -s $out/lib/fuzebox/FuzeLinuxApp $out/bin/fuze
-  '';
-
-  meta = {
-    description = "Internet and mobile based unified communications solutions (Linux client)";
-    homepage = http://www.fuzebox.com;
-    license = "unknown";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c9fd96800ae..f38f205f1f0b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11929,8 +11929,6 @@ let
     boost = boost155;
   };
 
-  fuze = callPackage ../applications/networking/instant-messengers/fuze {};
-
   game-music-emu = callPackage ../applications/audio/game-music-emu { };
 
   gcolor2 = callPackage ../applications/graphics/gcolor2 { };

From 5e468b96b432c938665ac056463a29fde40067b7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Jan 2016 21:50:27 +0100
Subject: [PATCH 0137/2285] nixos: add 'networking.dnsExtensionMechanism'
 option to enable edns0 (for DNSSEC)

Set this option to 'true' (default: 'false') to enable extension mechanisms for
DNS (EDNS) in your local glibc resolver. This is required for supporting
DNSSEC, for example.

Implementation detail: the patch changes assignments to "resolv_conf_options"
to use "+=" instead of "=" to ensure that multiple users of that variable don't
overwrite each other. The generated config file is a shell script, after all,
so this should work fine.

Closes https://github.com/NixOS/nixpkgs/issues/12470.
---
 nixos/modules/config/networking.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index 293a42d38b5a..d4b1e6d6b968 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -39,6 +39,17 @@ in
       '';
     };
 
+    networking.dnsExtensionMechanism = lib.mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Enable the <code>edns0</code> option in <filename>resolv.conf</filename>. With
+        that option set, <code>glibc</code> supports use of the extension mechanisms for
+        DNS (EDNS) specified in RFC 2671. The most popular user of that feature is DNSSEC,
+        which does not work without it.
+      '';
+    };
+
     networking.extraResolvconfConf = lib.mkOption {
       type = types.lines;
       default = "";
@@ -162,7 +173,10 @@ in
               libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service 2> /dev/null'
             '' + optionalString cfg.dnsSingleRequest ''
               # only send one DNS request at a time
-              resolv_conf_options='single-request'
+              resolv_conf_options+=' single-request'
+            '' + optionalString dnsExtensionMechanism ''
+              # enable extension mechanisms for DNS
+              resolv_conf_options+=' edns0'
             '' + optionalString hasLocalResolver ''
               # This hosts runs a full-blown DNS resolver.
               name_servers='127.0.0.1'

From 465e965e38343359e88a8e1e73cc52fc3c0bb4f4 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Tue, 19 Jan 2016 22:41:31 +0100
Subject: [PATCH 0138/2285] vimPlugins.youcompleteme: enable on unix

---
 pkgs/misc/vim-plugins/default.nix                               | 2 +-
 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 470c1960c7ca..59a46ea7bf8a 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -906,7 +906,7 @@ rec {
       homepage = http://github.com/Valloric/YouCompleteMe;
       license = stdenv.lib.licenses.gpl3;
       maintainers = with stdenv.lib.maintainers; [marcweber jagajaga];
-      platforms = stdenv.lib.platforms.linux;
+      platforms = stdenv.lib.platforms.unix;
     };
   };
 
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
index e498eef8c0b5..48f5322267b8 100644
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
+++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/youcompleteme
@@ -22,5 +22,5 @@
       homepage = http://github.com/Valloric/YouCompleteMe;
       license = stdenv.lib.licenses.gpl3;
       maintainers = with stdenv.lib.maintainers; [marcweber jagajaga];
-      platforms = stdenv.lib.platforms.linux;
+      platforms = stdenv.lib.platforms.unix;
     };

From 322a69137754aecf8ce9860b55d7c2bedcc7d873 Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Tue, 19 Jan 2016 14:16:15 -0800
Subject: [PATCH 0139/2285] emacs-packages: update diminish 0.44 -> 0.45

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

diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 0e267b5374d5..0bd7b0efad39 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -415,12 +415,12 @@ let
 
   diminish = melpaBuild rec {
     pname   = "diminish";
-    version = "0.44";
+    version = "0.45";
     src = fetchFromGitHub {
-      owner  = "emacsmirror";
-      repo   = pname;
-      rev    = version;
-      sha256 = "0hshw7z5f8pqxvgxw74kbj6nvprsgfvy45fl854xarnkvqcara09";
+      owner  = "myrjola";
+      repo   = "${pname}.el";
+      rev    = "v${version}";
+      sha256 = "0qpgfgp8hrzz4vdifxq8h25n0a0jlzgf7aa1fpy6r0080v5rqbb6";
     };
     meta = {
       description = "Diminishes the amount of space taken on the mode-line by Emacs minor modes";

From df82096af06deaa8ddd53accaaa488474575b6d6 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Tue, 19 Jan 2016 18:11:36 +0100
Subject: [PATCH 0140/2285] activation-script module: add environment.usrbinenv
 option

---
 .../system/activation/activation-script.nix   | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index 02b3e25a313d..d78ec0d7bf3d 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -94,6 +94,18 @@ in
 
     };
 
+    environment.usrbinenv = mkOption {
+      default = "${pkgs.coreutils}/bin/env";
+      example = literalExample ''
+        "''${pkgs.busybox}/bin/env"
+      '';
+      type = types.nullOr types.path;
+      visible = false;
+      description = ''
+        The env(1) executable that is linked system-wide to
+        <literal>/usr/bin/env</literal>.
+      '';
+    };
   };
 
 
@@ -128,11 +140,15 @@ in
         mkdir -m 0555 -p /var/empty
       '';
 
-    system.activationScripts.usrbinenv =
-      ''
+    system.activationScripts.usrbinenv = if config.environment.usrbinenv != null
+      then ''
         mkdir -m 0755 -p /usr/bin
-        ln -sfn ${pkgs.coreutils}/bin/env /usr/bin/.env.tmp
+        ln -sfn ${config.environment.usrbinenv} /usr/bin/.env.tmp
         mv /usr/bin/.env.tmp /usr/bin/env # atomically replace /usr/bin/env
+      ''
+      else ''
+        rm -f /usr/bin/env
+        rmdir --ignore-fail-on-non-empty /usr/bin /usr
       '';
 
     system.activationScripts.tmpfs =

From d96893647de5c519c458c1254f043f2d67d9b29c Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Thu, 17 Dec 2015 17:02:40 -0500
Subject: [PATCH 0141/2285] cc-wrapper: fix on darwin

The ld-wrapper.sh script calls `readlink` in some circumstances. We need
to ensure that this is the `readlink` from the `coreutils` package so
that flag support is as expected.

This is accomplished by explicitly setting PATH at the top of each shell
script.

Without doing this, the following happens with a trivial `main.c`:

```
nix-env -f "<nixpkgs>" -iA pkgs.clang
$ clang main.c -L /nix/../nix/store/2ankvagznq062x1gifpxwkk7fp3xwy63-xnu-2422.115.4/Library -o a.out
readlink: illegal option -- f
usage: readlink [-n] [file ...]
```

The key element is the `..` in the path supplied to the linker via a
`-L` flag. With this patch, the above invocation works correctly on
darwin, whose native `/usr/bin/readlink` does not support the `-f` flag.

The explicit path also ensures that the `grep` called by `cc-wrapper.sh`
is the one from Nix.

Fixes #6447
---
 pkgs/build-support/cc-wrapper/cc-wrapper.sh   |  5 +++++
 pkgs/build-support/cc-wrapper/default.nix     | 13 ++++++++-----
 pkgs/build-support/cc-wrapper/gnat-wrapper.sh |  5 +++++
 pkgs/build-support/cc-wrapper/ld-wrapper.sh   |  5 +++++
 pkgs/stdenv/darwin/default.nix                |  2 +-
 5 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index 5bd59f8c5850..f7541b15a828 100644
--- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -1,4 +1,8 @@
 #! @shell@ -e
+path_backup=$PATH
+if [ -n "@coreutils@" ]; then
+  PATH="@coreutils@/bin:@gnugrep@/bin"
+fi
 
 if [ -n "$NIX_CC_WRAPPER_START_HOOK" ]; then
     source "$NIX_CC_WRAPPER_START_HOOK"
@@ -141,4 +145,5 @@ if [ -n "$NIX_CC_WRAPPER_EXEC_HOOK" ]; then
     source "$NIX_CC_WRAPPER_EXEC_HOOK"
 fi
 
+PATH=$path_backup
 exec @prog@ ${extraBefore[@]} "${params[@]}" "${extraAfter[@]}"
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index bea7e07a2029..110f51891417 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -9,13 +9,14 @@
 , cc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? stdenv.shell
 , zlib ? null, extraPackages ? [], extraBuildCommands ? ""
 , dyld ? null # TODO: should this be a setup-hook on dyld?
-, isGNU ? false, isClang ? cc.isClang or false
+, isGNU ? false, isClang ? cc.isClang or false, gnugrep ? null
 }:
 
 with stdenv.lib;
 
 assert nativeTools -> nativePrefix != "";
-assert !nativeTools -> cc != null && binutils != null && coreutils != null;
+assert !nativeTools ->
+  cc != null && binutils != null && coreutils != null && gnugrep != null;
 assert !nativeLibc -> libc != null;
 
 # For ghdl (the vhdl language provider to gcc) we need zlib in the wrapper.
@@ -37,9 +38,11 @@ stdenv.mkDerivation {
 
   inherit cc shell;
   libc = if nativeLibc then null else libc;
-  binutils = if nativeTools then null else binutils;
-  # The wrapper scripts use 'cat', so we may need coreutils.
-  coreutils = if nativeTools then null else coreutils;
+  binutils = if nativeTools then "" else binutils;
+  # The wrapper scripts use 'cat' and 'grep', so we may need coreutils
+  # and gnugrep.
+  coreutils = if nativeTools then "" else coreutils;
+  gnugrep = if nativeTools then "" else gnugrep;
 
   passthru = { inherit nativeTools nativeLibc nativePrefix isGNU isClang; };
 
diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
index 3514ccd67325..603275e4e695 100644
--- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
@@ -1,4 +1,8 @@
 #! @shell@ -e
+path_backup=$PATH
+if [ -n "@coreutils@" ]; then
+  PATH="@coreutils@/bin"
+fi
 
 if [ -n "$NIX_GNAT_WRAPPER_START_HOOK" ]; then
     source "$NIX_GNAT_WRAPPER_START_HOOK"
@@ -100,4 +104,5 @@ if [ -n "$NIX_GNAT_WRAPPER_EXEC_HOOK" ]; then
     source "$NIX_GNAT_WRAPPER_EXEC_HOOK"
 fi
 
+PATH=$path_backup
 exec @prog@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]}
diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
index 30c531b76479..a7ed2f364cdd 100644
--- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
@@ -1,4 +1,8 @@
 #! @shell@ -e
+path_backup=$PATH
+if [ -n "@coreutils@" ]; then
+  PATH="@coreutils@/bin"
+fi
 
 if [ -n "$NIX_LD_WRAPPER_START_HOOK" ]; then
     source "$NIX_LD_WRAPPER_START_HOOK"
@@ -163,4 +167,5 @@ if [ -n "$NIX_LD_WRAPPER_EXEC_HOOK" ]; then
     source "$NIX_LD_WRAPPER_EXEC_HOOK"
 fi
 
+PATH=$path_backup
 exec @prog@ ${extraBefore[@]} "${params[@]}" ${extra[@]}
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index c0c19a64c3c7..0af7071e2186 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -278,7 +278,7 @@ in rec {
       inherit stdenv shell;
       nativeTools = false;
       nativeLibc  = false;
-      inherit (pkgs) coreutils binutils;
+      inherit (pkgs) coreutils binutils gnugrep;
       inherit (pkgs.darwin) dyld;
       cc   = pkgs.llvmPackages.clang-unwrapped;
       libc = pkgs.darwin.Libsystem;

From f75a122d24f34517fd7e7eee30da8f990733e2e8 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 20 Jan 2016 00:20:36 +0100
Subject: [PATCH 0142/2285] pythonPackages: turses 0.2.23->0.3.1, tweepy
 2.3.0->3.5.0, closes #12286

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 565afe68940d..90a651032dc2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19931,18 +19931,29 @@ in modules // {
 
 
   turses = buildPythonPackage (rec {
-    name = "turses-0.2.23";
+    name = "turses-0.3.1";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz";
-      md5 = "71b9e3ab12d9186798e739b5273d1438";
+      sha256 = "15mkhm3b5ka42h8qph0mhh8izfc1200v7651c62k7ldcs50ib9j6";
     };
 
-    propagatedBuildInputs = with self; [ oauth2 urwid tweepy ] ++ optional isPy26 argparse;
+    buildInputs = with self; [ mock pytest coverage tox ];
+    propagatedBuildInputs = with self; [ urwid tweepy future ] ++ optional isPy26 argparse;
 
-    #buildInputs = [ tox ];
-    # needs tox
-    doCheck = false;
+    checkPhase = ''
+      TMP_TURSES=`echo turses-$RANDOM`
+      mkdir $TMP_TURSES
+      HOME=$TMP_TURSES py.test tests/
+      rm -rf $TMP_TURSES
+    '';
+
+    patchPhase = ''
+      sed -i -e "s|future==0.14.3|future==${pkgs.lib.getVersion self.future}|" setup.py
+      sed -i -e "s|tweepy==3.3.0|tweepy==${pkgs.lib.getVersion self.tweepy}|" setup.py
+      sed -i -e "s|config.generate_config_file.assert_called_once()|assert config.generate_config_file.call_count == 1|" tests/test_config.py
+      sed -i -e "s|self.observer.update.assert_called_once()|assert self.observer.update.call_count == 1|" tests/test_meta.py
+    '';
 
     meta = {
       homepage = https://github.com/alejandrogomez/turses;
@@ -19954,14 +19965,15 @@ in modules // {
   });
 
   tweepy = buildPythonPackage (rec {
-    name = "tweepy-2.3.0";
-    disabled = isPy3k;
+    name = "tweepy-3.5.0";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/t/tweepy/${name}.tar.gz";
-      md5 = "065c80d244360988c61d64b5dfb7e229";
+      sha256 = "0n2shilamgwhzmvf534xg7f6hrnznbixyl5pw2f5a3f391gwy37h";
     };
 
+    propagatedBuildInputs = with self; [ requests2 six requests_oauthlib ];
+
     meta = {
       homepage = "https://github.com/tweepy/tweepy";
       description = "Twitter library for python";

From 077f7ceaab8d6ad258a643f88414903e59d94f73 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 20 Jan 2016 00:28:41 +0100
Subject: [PATCH 0143/2285] pythonPackages.turses: disabled pypy and py3k
 builds

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 90a651032dc2..588c952b2302 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19932,6 +19932,7 @@ in modules // {
 
   turses = buildPythonPackage (rec {
     name = "turses-0.3.1";
+    disabled = isPyPy || isPy3k;
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/t/turses/${name}.tar.gz";

From df29b0d23f51dcb6538701178bd4a58a9ce51652 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 20 Jan 2016 01:18:57 +0100
Subject: [PATCH 0144/2285] nixos: fix evaluation
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

After commit 5e468b9, evaluation failed with:

  error: undefined variable ‘dnsExtensionMechanism’ at
  .../nixpkgs/nixos/modules/config/networking.nix:177:33
---
 nixos/modules/config/networking.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix
index d4b1e6d6b968..ca498ca499eb 100644
--- a/nixos/modules/config/networking.nix
+++ b/nixos/modules/config/networking.nix
@@ -174,7 +174,7 @@ in
             '' + optionalString cfg.dnsSingleRequest ''
               # only send one DNS request at a time
               resolv_conf_options+=' single-request'
-            '' + optionalString dnsExtensionMechanism ''
+            '' + optionalString cfg.dnsExtensionMechanism ''
               # enable extension mechanisms for DNS
               resolv_conf_options+=' edns0'
             '' + optionalString hasLocalResolver ''

From 69ba6c1d30d3b891e4fcda8544ddc5763bf2b6d0 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 20 Jan 2016 00:54:38 +0200
Subject: [PATCH 0145/2285] mmc-utils: init at 2015-11-18, fixes #12489

---
 pkgs/os-specific/linux/mmc-utils/default.nix | 26 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/os-specific/linux/mmc-utils/default.nix

diff --git a/pkgs/os-specific/linux/mmc-utils/default.nix b/pkgs/os-specific/linux/mmc-utils/default.nix
new file mode 100644
index 000000000000..8f7881b13e8f
--- /dev/null
+++ b/pkgs/os-specific/linux/mmc-utils/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchgit }:
+
+stdenv.mkDerivation rec {
+  name = "mmc-utils-${version}";
+  version = "2015-11-18";
+
+  src = fetchgit {
+    url = "git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc-utils.git";
+    rev = "44f94b925894577f9ffcf2c418dd013a5e582648";
+    sha256 = "1c1g9jpyhykhmidz7mjzrf63w3xlzqkijrqz1g6j4dz6p9pv1gax";
+  };
+
+  installPhase = ''
+    make install prefix=$out
+    mkdir -p $out/share/man/man1
+    cp man/mmc.1 $out/share/man/man1/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Configure MMC storage devices from userspace";
+    homepage = http://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.dezgeg ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5790e561dad8..09cfafd7e921 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10369,6 +10369,8 @@ let
 
   mkinitcpio-nfs-utils = callPackage ../os-specific/linux/mkinitcpio-nfs-utils { };
 
+  mmc-utils = callPackage ../os-specific/linux/mmc-utils { };
+
   module_init_tools = callPackage ../os-specific/linux/module-init-tools { };
 
   aggregateModules = modules:

From 8da914cad47afe146ee0e575259b522933ebc47b Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 20 Jan 2016 01:59:45 +0100
Subject: [PATCH 0146/2285] minissdpd: 1.5 -> 1.5.20160119

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

diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix
index b197d16abdb2..92b6d9ff9b5f 100644
--- a/pkgs/tools/networking/minissdpd/default.nix
+++ b/pkgs/tools/networking/minissdpd/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, libnfnetlink }:
 
 let
-  version = "1.5";
+  version = "1.5.20160119";
   name = "minissdpd-${version}";
 in stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
-    sha256 = "03w9zg8i8bfjlr0haa08r823rfcff6lzm1ia875il7kkhnqkgmnz";
+    sha256 = "0z0h2fqjlys9g08fbv0jg8l53h8cjlpdk45z4g71kwdk1m9ld8r2";
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
     name = "${name}.tar.gz";
   };

From 1c393cbb3c60b85070950c8abc30a5308015ce3d Mon Sep 17 00:00:00 2001
From: Mark Laws <mdl@60hz.org>
Date: Mon, 18 Jan 2016 11:54:23 -0800
Subject: [PATCH 0147/2285] gale service: fix permissions configuration, fixes
 #12457

---
 nixos/modules/services/networking/gale.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/networking/gale.nix b/nixos/modules/services/networking/gale.nix
index 3a5d9bd63c7b..bc975159cdfd 100644
--- a/nixos/modules/services/networking/gale.nix
+++ b/nixos/modules/services/networking/gale.nix
@@ -76,7 +76,7 @@ in
 
        system.activationScripts.gale = mkIf cfg.enable (
          stringAfter [ "users" "groups" ] ''
-           chmod -R 755 ${home}
+           chmod 755 ${home}
            mkdir -m 0777 -p ${home}/auth/cache
            mkdir -m 1777 -p ${home}/auth/local # GALE_DOMAIN.gpub
            mkdir -m 0700 -p ${home}/auth/private # ROOT.gpub
@@ -86,7 +86,8 @@ in
            mkdir -m 0700 -p ${home}/.gale/auth/private # GALE_DOMAIN.gpri
 
            ln -sf ${pkgs.gale}/etc/gale/auth/trusted/ROOT "${home}/auth/trusted/ROOT"
-           chown -R ${cfg.user}:${cfg.group} ${home}
+           chown ${cfg.user}:${cfg.group} ${home} ${home}/auth ${home}/auth/*
+           chown ${cfg.user}:${cfg.group} ${home}/.gale ${home}/.gale/auth ${home}/.gale/auth/private
          ''
        );
 
@@ -149,10 +150,9 @@ in
          after = [ "network.target" ];
 
          preStart = ''
-           install -m 0640 ${keyPath}/${cfg.domain}.gpri "${home}/.gale/auth/private/"
-           install -m 0644 ${gpubFile} "${home}/.gale/auth/private/${cfg.domain}.gpub"
-           install -m 0644 ${gpubFile} "${home}/auth/local/${cfg.domain}.gpub"
-           chown -R ${cfg.user}:${cfg.group} ${home}
+           install -m 0640 -o ${cfg.user} -g ${cfg.group} ${keyPath}/${cfg.domain}.gpri "${home}/.gale/auth/private/"
+           install -m 0644 -o ${cfg.user} -g ${cfg.group} ${gpubFile} "${home}/.gale/auth/private/${cfg.domain}.gpub"
+           install -m 0644 -o ${cfg.user} -g ${cfg.group} ${gpubFile} "${home}/auth/local/${cfg.domain}.gpub"
          '';
 
          serviceConfig = {

From f8ff4691ed10a078edb527dea56a7fc788df81a6 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Tue, 17 Nov 2015 09:48:31 +0100
Subject: [PATCH 0148/2285] linux-mptcp: init at 0.90 (kernel 3.18.20), fixes
 #11149

---
 pkgs/os-specific/linux/kernel/linux-mptcp.nix | 49 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 10 ++++
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/linux-mptcp.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
new file mode 100644
index 000000000000..2b0e3017979f
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
+
+import ./generic.nix (args // rec {
+  mptcpVersion = "0.90";
+  modDirVersion = "3.18.20";
+  version = "${modDirVersion}-mptcp_v${mptcpVersion}";
+
+  extraMeta = {
+    branch = "3.18";
+    maintainer = stdenv.lib.maintainers.layus;
+  };
+
+  src = fetchurl {
+    url = "https://github.com/multipath-tcp/mptcp/archive/v${mptcpVersion}.tar.gz";
+    sha256 = "1wzdvd1j1wqjkysj98g451y6mxr9a5hff5kn9inxwbzm9yg4icj5";
+  };
+
+  extraConfig = ''
+    IPV6 y
+    MPTCP y
+    IP_MULTIPLE_TABLES y
+
+    # Enable advanced path-managers...
+    MPTCP_PM_ADVANCED y
+    MPTCP_FULLMESH y
+    MPTCP_NDIFFPORTS y
+    # ... but use none by default.
+    # The default is safer if source policy routing is not setup.
+    DEFAULT_DUMMY y
+    DEFAULT_MPTCP_PM "default"
+
+    # MPTCP scheduler selection.
+    # Disabled as the only non-default is the useless round-robin.
+    MPTCP_SCHED_ADVANCED n
+    DEFAULT_MPTCP_SCHED "default"
+
+    # Smarter TCP congestion controllers
+    TCP_CONG_LIA m
+    TCP_CONG_OLIA m
+    TCP_CONG_WVEGAS m
+    TCP_CONG_BALIA m
+  '';
+
+  features.iwlwifi = true;
+  features.efiBootStub = true;
+  features.needsCifsUtils = true;
+  features.canDisableNetfilterConntrackHelpers = true;
+  features.netfilterRPFilter = true;
+} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09cfafd7e921..88cfc2dbba9b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10026,6 +10026,15 @@ let
 
   kernelPatches = callPackage ../os-specific/linux/kernel/patches.nix { };
 
+  linux_mptcp = callPackage ../os-specific/linux/kernel/linux-mptcp.nix {
+    kernelPatches = [ kernelPatches.bridge_stp_helper ]
+      ++ lib.optionals ((platform.kernelArch or null) == "mips")
+      [ kernelPatches.mips_fpureg_emu
+        kernelPatches.mips_fpu_sigill
+        kernelPatches.mips_ext3_n32
+      ];
+  };
+
   linux_rpi = callPackage ../os-specific/linux/kernel/linux-rpi.nix {
     kernelPatches = [ kernelPatches.bridge_stp_helper ];
   };
@@ -10266,6 +10275,7 @@ let
   linux_latest = linuxPackages_latest.kernel;
 
   # Build the kernel modules for the some of the kernels.
+  linuxPackages_mptcp = linuxPackagesFor pkgs.linux_mptcp linuxPackages_mptcp;
   linuxPackages_rpi = linuxPackagesFor pkgs.linux_rpi linuxPackages_rpi;
   linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10);
   linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice;

From 36fc03edb6ad8f9c5b29bfba43d11d8526e4f682 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 20 Jan 2016 02:17:29 +0100
Subject: [PATCH 0149/2285] fetchgit: import impure GIT_PROXY_COMMAND and
 SOCKS_SERVER, fixes #8605

These environment variables allow using fetchgit with git:// URLs using
the SOCKS proxy technique described in 'Using Git with a SOCKS proxy':

  http://www.patthoyts.tk/blog/using-git-with-socks-proxy.html

Briefly, GIT_PROXY_COMMAND is set to a script which invokes connect[1],
which reads SOCKS_PROXY, which might be pointing to a local instance of
'ssh -D'.

[1] pkgs/tools/networking/connect
---
 pkgs/build-support/fetchgit/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 127693d42f2a..7f98c97fc55b 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation {
     # easy proxy configuration.  This is impure, but a fixed-output
     # derivation like fetchurl is allowed to do so since its result is
     # by definition pure.
-    "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
+    "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" "GIT_PROXY_COMMAND" "SOCKS_SERVER"
     ];
 
   preferLocalBuild = true;

From dd9bad4aa43e6ee5ec8a67adc13578cedda084bc Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 20 Jan 2016 03:28:26 +0100
Subject: [PATCH 0150/2285] rubygems: 2.4.1 -> 2.4.8, fixes #8492

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

diff --git a/pkgs/development/interpreters/ruby/rubygems.nix b/pkgs/development/interpreters/ruby/rubygems.nix
index b6ac04808979..fb210ceff4bf 100644
--- a/pkgs/development/interpreters/ruby/rubygems.nix
+++ b/pkgs/development/interpreters/ruby/rubygems.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "rubygems-${version}";
-  version = "2.4.1";
+  version = "2.4.8";
   src = fetchurl {
     url = "http://production.cf.rubygems.org/rubygems/${name}.tgz";
-    sha256 = "0cpr6cx3h74ykpb0cp4p4xg7a8j0bhz3sk271jq69l4mm4zy4h4f";
+    sha256 = "0pl4civyf0vhqsqbqaivvxrb3fsg8sid9a8jv5vfnk4hypz3ahss";
   };
 
   patches = [ ./gem_hook.patch ];

From 109ba4c86166f9b7aa31ba45869ee93b0eecb2e0 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 20 Jan 2016 03:42:59 +0100
Subject: [PATCH 0151/2285] nixos: add test for postgresql, fixes #11146

---
 nixos/release.nix          |  1 +
 nixos/tests/postgresql.nix | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+)
 create mode 100644 nixos/tests/postgresql.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index 8a502ae2baa1..3c7cf84c6729 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -287,6 +287,7 @@ in rec {
   tests.openssh = callTest tests/openssh.nix {};
   tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; });
   tests.peerflix = callTest tests/peerflix.nix {};
+  tests.postgresql = callTest tests/postgresql.nix {};
   tests.printing = callTest tests/printing.nix {};
   tests.proxy = callTest tests/proxy.nix {};
   tests.pumpio = callTest tests/pump.io.nix {};
diff --git a/nixos/tests/postgresql.nix b/nixos/tests/postgresql.nix
new file mode 100644
index 000000000000..f17384b44ba6
--- /dev/null
+++ b/nixos/tests/postgresql.nix
@@ -0,0 +1,26 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "postgresql";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ zagy ];
+  };
+
+  nodes = {
+    master =
+      { pkgs, config, ... }:
+
+      {
+        services.postgresql.enable = true;
+        services.postgresql.initialScript =  pkgs.writeText "postgresql-init.sql"
+          ''
+          CREATE ROLE postgres WITH superuser login createdb;
+          '';
+      };
+  };
+
+  testScript = ''
+    startAll;
+    $master->waitForUnit("postgresql");
+    $master->sleep(10); # Hopefully this is long enough!!
+    $master->succeed("echo 'select 1' | sudo -u postgres psql");
+  '';
+})

From 5b8c8718420671f7af2b0189299a55e43c252d5b Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@pmade.com>
Date: Wed, 18 Nov 2015 10:47:25 -0700
Subject: [PATCH 0152/2285] If container name is already unique, don't append
 "-0"

When using `--ensure-unique-name`, don't needlessly append `"-0"` if the
container name is already unique.

This is especially helpful with NixOps since when it deploys to a
container it uses `--ensure-unique-name`.  This means that the container
name will never match the deployment host due to the `"-0"`.  Having the
container name and the host name match isn't exactly a requirement, but
it's nice to have and a small change.
---
 nixos/modules/virtualisation/nixos-container.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 nixos/modules/virtualisation/nixos-container.pl

diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl
old mode 100644
new mode 100755
index 004385f728c6..eda57a9751eb
--- a/nixos/modules/virtualisation/nixos-container.pl
+++ b/nixos/modules/virtualisation/nixos-container.pl
@@ -97,10 +97,10 @@ if ($action eq "create") {
     if ($ensureUniqueName) {
         my $base = $containerName;
         for (my $nr = 0; ; $nr++) {
-            $containerName = "$base-$nr";
             $confFile = "/etc/containers/$containerName.conf";
             $root = "/var/lib/containers/$containerName";
             last unless -e $confFile || -e $root;
+            $containerName = "$base-$nr";
         }
     }
 

From f8c3130e0fb0bc1545fed1ef2974c9509208c59f Mon Sep 17 00:00:00 2001
From: Rick Yang <rick68@gmail.com>
Date: Thu, 10 Dec 2015 00:52:44 +0800
Subject: [PATCH 0153/2285] softether: Fixed problems with using systemd
 services

---
 .../modules/services/networking/softether.nix | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/networking/softether.nix b/nixos/modules/services/networking/softether.nix
index a421b32f02c2..5e49efc3aa3a 100644
--- a/nixos/modules/services/networking/softether.nix
+++ b/nixos/modules/services/networking/softether.nix
@@ -61,11 +61,14 @@ in
             dataDir = cfg.dataDir;
           }))
         ];
-      systemd.services.softether = {
-        description = "SoftEther VPN services initial job";
-        after = [ "network-interfaces.target" ];
-        wantedBy = [ "multi-user.target" ];
-        preStart = ''
+      systemd.services."softether-init" = {
+        description = "SoftEther VPN services initial task";
+        wantedBy = [ "network-interfaces.target" ];
+        serviceConfig = {
+          Type = "oneshot";
+          RemainAfterExit = false;
+        };
+        script = ''
             for d in vpnserver vpnbridge vpnclient vpncmd; do
                 if ! test -e ${cfg.dataDir}/$d; then
                     ${pkgs.coreutils}/bin/mkdir -m0700 -p ${cfg.dataDir}/$d
@@ -81,12 +84,12 @@ in
     (mkIf (cfg.vpnserver.enable) {
       systemd.services.vpnserver = {
         description = "SoftEther VPN Server";
-        after = [ "network-interfaces.target" ];
-        wantedBy = [ "multi-user.target" ];
+        after = [ "softether-init.service" ];
+        wantedBy = [ "network-interfaces.target" ];
         serviceConfig = {
+          Type = "forking";
           ExecStart = "${pkg}/bin/vpnserver start";
           ExecStop = "${pkg}/bin/vpnserver stop";
-          Type = "forking";
         };
         preStart = ''
             rm -rf ${cfg.dataDir}/vpnserver/vpnserver
@@ -101,12 +104,12 @@ in
     (mkIf (cfg.vpnbridge.enable) {
       systemd.services.vpnbridge = {
         description = "SoftEther VPN Bridge";
-        after = [ "network-interfaces.target" ];
-        wantedBy = [ "multi-user.target" ];
+        after = [ "softether-init.service" ];
+        wantedBy = [ "network-interfaces.target" ];
         serviceConfig = {
+          Type = "forking";
           ExecStart = "${pkg}/bin/vpnbridge start";
           ExecStop = "${pkg}/bin/vpnbridge stop";
-          Type = "forking";
         };
         preStart = ''
             rm -rf ${cfg.dataDir}/vpnbridge/vpnbridge
@@ -121,12 +124,12 @@ in
     (mkIf (cfg.vpnclient.enable) {
       systemd.services.vpnclient = {
         description = "SoftEther VPN Client";
-        after = [ "network-interfaces.target" ];
-        wantedBy = [ "multi-user.target" ];
+        after = [ "softether-init.service" ];
+        wantedBy = [ "network-interfaces.target" ];
         serviceConfig = {
+          Type = "forking";
           ExecStart = "${pkg}/bin/vpnclient start";
           ExecStop = "${pkg}/bin/vpnclient stop";
-          Type = "forking";
         };
         preStart = ''
             rm -rf ${cfg.dataDir}/vpnclient/vpnclient

From 9d9cb9f087c36f711f329fe02ddc435a964a94d7 Mon Sep 17 00:00:00 2001
From: Wei-Ming Yang <rick68@gmail.com>
Date: Mon, 4 Jan 2016 14:51:08 +0800
Subject: [PATCH 0154/2285] softether: move package in SERVERS section, fixes
 #11576

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 88cfc2dbba9b..9f52ef9be8ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3134,9 +3134,6 @@ let
 
   socat2pre = lowPrio (callPackage ../tools/networking/socat/2.x.nix { });
 
-  softether_4_18 = callPackage ../servers/softether/4.18.nix { };
-  softether = softether_4_18;
-
   sourceHighlight = callPackage ../tools/text/source-highlight { };
 
   spaceFM = callPackage ../applications/misc/spacefm { adwaita-icon-theme = gnome3.adwaita-icon-theme; };
@@ -9471,6 +9468,9 @@ let
 
   oracleXE = callPackage ../servers/sql/oracle-xe { };
 
+  softether_4_18 = callPackage ../servers/softether/4.18.nix { };
+  softether = softether_4_18;
+
   qboot = callPackage ../applications/virtualization/qboot { stdenv = stdenv_32bit; };
 
   OVMF = callPackage ../applications/virtualization/OVMF { seabios=false; openssl=null; };

From 71fa82826375ab854c79230a86bf475efa8d4f36 Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Wed, 20 Jan 2016 10:59:18 +0800
Subject: [PATCH 0155/2285] emem: 0.2.11 -> 0.2.12

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

diff --git a/pkgs/applications/misc/emem/default.nix b/pkgs/applications/misc/emem/default.nix
index 8c4fa09a214e..3d8e4742fa64 100644
--- a/pkgs/applications/misc/emem/default.nix
+++ b/pkgs/applications/misc/emem/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   pname = "emem";
-  version = "0.2.11";
+  version = "0.2.12";
   name = "${pname}-${version}";
 
   inherit jdk;
 
   src = fetchurl {
     url = "https://github.com/ebzzry/${pname}/releases/download/v${version}/${pname}.jar";
-    sha256 = "0b514nc1s5jff3586jmfx9js57j7hl8zdwi2jxlwiavwv46rl436";
+    sha256 = "1ynn72n9pw9zk29c9q2zybxjg8dniilp05vghrc9vnslyi8ml90d";
   };
 
   buildInputs = [ ];

From 5cb1e43fd6eb7f87c9b17e9dc6d1a92ae7c360a4 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 19 Jan 2016 22:28:42 -0500
Subject: [PATCH 0156/2285] nodejs-5: fix on darwin

Turns out the darwin-flavored patches aren't needed anymore.

Fixes #12305
---
 pkgs/development/web/nodejs/v5.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix
index f9e9ee12edc7..403abef23dfa 100644
--- a/pkgs/development/web/nodejs/v5.nix
+++ b/pkgs/development/web/nodejs/v5.nix
@@ -38,11 +38,8 @@ in stdenv.mkDerivation {
   dontDisableStatic = true;
   prePatch = ''
     patchShebangs .
-    sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py
   '';
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./pkg-libpath.patch ];
-
   buildInputs = [ python which zlib libuv openssl python ]
     ++ optionals stdenv.isLinux [ utillinux http-parser ]
     ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ];

From 48513dfb2293f8413129a68d08c5a9ce8f48ce84 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Tue, 19 Jan 2016 22:29:02 -0500
Subject: [PATCH 0157/2285] nodejs: remove unreferenced patchfile

---
 .../web/nodejs/no-xcode-4.1.0.patch           | 95 -------------------
 1 file changed, 95 deletions(-)
 delete mode 100644 pkgs/development/web/nodejs/no-xcode-4.1.0.patch

diff --git a/pkgs/development/web/nodejs/no-xcode-4.1.0.patch b/pkgs/development/web/nodejs/no-xcode-4.1.0.patch
deleted file mode 100644
index 137158b01b71..000000000000
--- a/pkgs/development/web/nodejs/no-xcode-4.1.0.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/configure b/configure
-index d199975..66d903b 100755
---- a/configure
-+++ b/configure
-@@ -734,7 +734,7 @@ def configure_library(lib, output):
-     # libpath needs to be provided ahead libraries
-     if pkg_libpath:
-       output['libraries'] += (
--          filter(None, map(str.strip, pkg_cflags.split('-L'))))
-+          pkg_libpath.split())
- 
-     default_libs = getattr(options, shared_lib + '_libname')
-     default_libs = map('-l{0}'.format, default_libs.split(','))
-diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py
-index c002b11..fefb765 100644
---- a/tools/gyp/pylib/gyp/xcode_emulation.py
-+++ b/tools/gyp/pylib/gyp/xcode_emulation.py
-@@ -446,10 +446,17 @@ class XcodeSettings(object):
- 
-   def _XcodeSdkPath(self, sdk_root):
-     if sdk_root not in XcodeSettings._sdk_path_cache:
--      sdk_path = self._GetSdkVersionInfoItem(sdk_root, 'Path')
--      XcodeSettings._sdk_path_cache[sdk_root] = sdk_path
--      if sdk_root:
--        XcodeSettings._sdk_root_cache[sdk_path] = sdk_root
-+      try:
-+        sdk_path = self._GetSdkVersionInfoItem(sdk_root, 'Path')
-+        XcodeSettings._sdk_path_cache[sdk_root] = sdk_path
-+        if sdk_root:
-+          XcodeSettings._sdk_root_cache[sdk_path] = sdk_root
-+      except:
-+        # if this fails it's because xcodebuild failed, which means
-+        # the user is probably on a CLT-only system, where there
-+        # is no valid SDK root
-+        XcodeSettings._sdk_path_cache[sdk_root] = None
-+        
-     return XcodeSettings._sdk_path_cache[sdk_root]
- 
-   def _AppendPlatformVersionMinFlags(self, lst):
-@@ -572,10 +579,12 @@ class XcodeSettings(object):
-       framework_root = sdk_root
-     else:
-       framework_root = ''
--    config = self.spec['configurations'][self.configname]
--    framework_dirs = config.get('mac_framework_dirs', [])
--    for directory in framework_dirs:
--      cflags.append('-F' + directory.replace('$(SDKROOT)', framework_root))
-+    
-+    if 'SDKROOT' in self._Settings():
-+      config = self.spec['configurations'][self.configname]
-+      framework_dirs = config.get('mac_framework_dirs', [])
-+      for directory in framework_dirs:
-+        cflags.append('-F' + directory.replace('$(SDKROOT)', framework_root))
- 
-     self.configname = None
-     return cflags
-@@ -826,10 +835,12 @@ class XcodeSettings(object):
-     sdk_root = self._SdkPath()
-     if not sdk_root:
-       sdk_root = ''
--    config = self.spec['configurations'][self.configname]
--    framework_dirs = config.get('mac_framework_dirs', [])
--    for directory in framework_dirs:
--      ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root))
-+    
-+    if 'SDKROOT' in self._Settings():
-+      config = self.spec['configurations'][self.configname]
-+      framework_dirs = config.get('mac_framework_dirs', [])
-+      for directory in framework_dirs:
-+        ldflags.append('-F' + directory.replace('$(SDKROOT)', sdk_root))
- 
-     is_extension = self._IsIosAppExtension() or self._IsIosWatchKitExtension()
-     if sdk_root and is_extension:
-@@ -1032,7 +1043,11 @@ class XcodeSettings(object):
-     sdk_root = self._SdkPath(config_name)
-     if not sdk_root:
-       sdk_root = ''
--    return l.replace('$(SDKROOT)', sdk_root)
-+    
-+    if self._SdkPath():
-+      return l.replace('$(SDKROOT)', sdk_root)
-+    else:
-+      return l
- 
-   def AdjustLibraries(self, libraries, config_name=None):
-     """Transforms entries like 'Cocoa.framework' in libraries into entries like
-@@ -1248,7 +1263,7 @@ def XcodeVersion():
-     if version:
-       version = re.match(r'(\d\.\d\.?\d*)', version).groups()[0]
-     else:
--      raise GypError("No Xcode or CLT version detected!")
-+      version = "7.0.0"
-     # The CLT has no build information, so we return an empty string.
-     version_list = [version, '']
-   version = version_list[0]

From 4f40a4542643d46f6e0d58fe6cd9f329ccee443d Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 20 Jan 2016 04:39:41 +0100
Subject: [PATCH 0158/2285] oraclejdk8: 8u65 -> 8u72

---
 pkgs/development/compilers/oraclejdk/jdk8-linux.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
index 258af23a1bc9..f4bb68500d23 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "65";
+  patchVersion = "72";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "1shri8mw648piivyparbpzskiq4i0z6kain9kr7ylav5mv7h66fg";
-  sha256_x86_64 = "1rr6g2sb0f1vyf3l9nvj49ah28bsid92z0lj9pfjlb12vjn2mnw8";
+  sha256_i686 = "023rnlm5v7d9w4d7bgcac8j0r1vqkbv6fl20k8354pzpdjg6liaq";
+  sha256_x86_64 = "167ca39a6y0n8l87kdm5nv2hrp0wf6g4mw1rbychjc04f5igkrs6";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";

From 95db340fd0b0d2710285846cc682156f9aa6c8ab Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 20 Jan 2016 03:54:49 +0100
Subject: [PATCH 0159/2285] ib-tws, ib-controller: init at 9542 and 2.14.0,
 fixes #8142

---
 .../office/ib/controller/default.nix          | 162 ++++++++++++++++++
 pkgs/applications/office/ib/tws/default.nix   |  96 +++++++++++
 pkgs/top-level/all-packages.nix               |   4 +
 3 files changed, 262 insertions(+)
 create mode 100644 pkgs/applications/office/ib/controller/default.nix
 create mode 100644 pkgs/applications/office/ib/tws/default.nix

diff --git a/pkgs/applications/office/ib/controller/default.nix b/pkgs/applications/office/ib/controller/default.nix
new file mode 100644
index 000000000000..b39617e02db2
--- /dev/null
+++ b/pkgs/applications/office/ib/controller/default.nix
@@ -0,0 +1,162 @@
+{ stdenv, fetchurl, unzip, jdk, ib-tws, xpra }:
+
+stdenv.mkDerivation rec {
+  version = "2.14.0";
+  name = "ib-controller-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/ib-controller/ib-controller/archive/${version}.tar.gz";
+    sha256 = "17a8bcgg9z3b4y38k035hm2lgvhmf8srlz59c7n2q3fdw2i95i68";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  buildInputs = [ unzip jdk ib-tws ];
+
+  installPhase = ''
+    mkdir -p $out $out/bin $out/etc/ib/controller $out/share/IBController
+    cp resources/*.jar $out/share/IBController/.
+    cp resources/*.ini $out/etc/ib/controller/.
+    classpath=""
+    for jar in ${ib-tws}/share/IBJts/*.jar; do
+      classpath="$classpath:$jar"
+    done
+    for jar in $out/share/IBController/*.jar; do
+      classpath="$classpath:$jar"
+    done
+    # strings to use below; separated to avoid nix specific substitutions
+    javaOptions={JAVA_OPTIONS:--Xmx1024M}
+    ibProfileDir={IB_PROFILE_DIR:-~/IB/}
+    cat<<EOF > $out/bin/ib-tws-c
+    #!$SHELL
+    if [[ \$1 == /* ]] || [[ \$1 == ./* ]]; then
+      IB_USER_PROFILE=\`realpath \$1\`
+      IB_USER_PROFILE_TITLE=\`basename \$1\`
+    else
+      if [[ x\$1 != "x" ]] && [[ \$1 != -* ]]; then
+        IB_USER_PROFILE=\`realpath \$$ibProfileDir\$1\`
+        IB_USER_PROFILE_TITLE=\$1
+      else
+        echo "ERROR: \"\$1\" is not a valid name of a profile."
+        exit 1
+      fi
+    fi
+    shift
+    if [ ! -e \$IB_USER_PROFILE ]; then mkdir -p \$IB_USER_PROFILE; fi
+    if [ ! -d \$IB_USER_PROFILE ]; then echo "ERROR: \$IB_USER_PROFILE must be a directory!" && echo 1; fi
+    if [ ! -e \$IB_USER_PROFILE/jts.ini ]; then cp ${ib-tws}/etc/ib/tws/jts.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/jts.ini; fi
+    if [ ! -e \$IB_USER_PROFILE/IBController.ini ]; then cp $out/etc/ib/controller/IBController.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/IBController.ini; fi
+    if [[ \$1 == "-q" ]]; then
+      if [ -f \$IB_USER_PROFILE/xpra/run ]; then
+        ${xpra}/bin/xpra stop \`cat \$IB_USER_PROFILE/xpra/run\` --socket-dir=\$IB_USER_PROFILE/xpra/ &> /dev/null
+      fi
+      exit 0
+    fi
+    if [[ \$1 == "-d" ]] && [ ! -f \$IB_USER_PROFILE/xpra/run ]; then
+      ( sleep infinity ) &
+      WAIT_DUMMY_PID=\$!
+      ( trap "" INT;
+        DISPLAYNUM=100
+        while [ -f /tmp/.X\$DISPLAYNUM-lock ]; do DISPLAYNUM=\$((\$DISPLAYNUM + 1)); done
+        mkdir -p \$IB_USER_PROFILE/xpra
+        cd \$IB_USER_PROFILE
+        nohup ${xpra}/bin/xpra start :\$DISPLAYNUM \
+          --socket-dir=\$IB_USER_PROFILE/xpra/ \
+          --start-child="echo -n :\$DISPLAYNUM > \$IB_USER_PROFILE/xpra/run \
+                         && kill \$WAIT_DUMMY_PID &> /dev/null \
+                         && ${jdk}/bin/java -cp $classpath \$$javaOptions ibcontroller.IBController \$IB_USER_PROFILE/IBController.ini" \
+          --exit-with-children \
+          --no-pulseaudio \
+          --no-mdns \
+          --no-notification \
+          --no-daemon \
+          &> \$IB_USER_PROFILE/xpra/server.log
+        rm -f \$IB_USER_PROFILE/xpra/run
+        rm -f /tmp/.X\$DISPLAYNUM-lock
+      ) &
+      wait \$WAIT_DUMMY_PID
+      exit 0
+    fi
+    if [ -f \$IB_USER_PROFILE/xpra/run ]; then
+      ${xpra}/bin/xpra attach \`cat \$IB_USER_PROFILE/xpra/run\` --socket-dir=\$IB_USER_PROFILE/xpra/ \
+      --windows \
+      --no-speaker \
+      --no-microphone \
+      --no-tray \
+      --title="\$IB_USER_PROFILE_TITLE: @title@" \
+      &> \$IB_USER_PROFILE/xpra/client.log
+    fi
+    EOF
+    chmod u+x $out/bin/ib-tws-c
+    cat<<EOF > $out/bin/ib-gw-c
+    #!$SHELL
+    if [[ \$1 == /* ]] || [[ \$1 == ./* ]]; then
+      IB_USER_PROFILE=\`realpath \$1\`
+      IB_USER_PROFILE_TITLE=\`basename \$1\`
+    else
+      if [[ x\$1 != "x" ]] && [[ \$1 != -* ]]; then
+        IB_USER_PROFILE=\`realpath \$$ibProfileDir\$1\`
+        IB_USER_PROFILE_TITLE=\$1
+      else
+        echo "ERROR: \"\$1\" is not a valid name of a profile."
+        exit 1
+      fi
+    fi
+    shift
+    if [ ! -e \$IB_USER_PROFILE ]; then mkdir -p \$IB_USER_PROFILE; fi
+    if [ ! -d \$IB_USER_PROFILE ]; then echo "ERROR: \$IB_USER_PROFILE must be a directory!" && echo 1; fi
+    if [ ! -e \$IB_USER_PROFILE/jts.ini ]; then cp ${ib-tws}/etc/ib/tws/jts.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/jts.ini; fi
+    if [ ! -e \$IB_USER_PROFILE/IBController.ini ]; then cp $out/etc/ib/controller/IBController.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/IBController.ini; fi
+    if [[ \$1 == "-q" ]]; then
+      if [ -f \$IB_USER_PROFILE/xpra/run ]; then
+        ${xpra}/bin/xpra stop \`cat \$IB_USER_PROFILE/xpra/run\` --socket-dir=\$IB_USER_PROFILE/xpra/ &> /dev/null
+      fi
+      exit 0
+    fi
+    if [[ \$1 == "-d" ]] && [ ! -f \$IB_USER_PROFILE/xpra/run ]; then
+      ( sleep infinity ) &
+      WAIT_DUMMY_PID=\$!
+      ( trap "" INT;
+        DISPLAYNUM=100
+        while [ -f /tmp/.X\$DISPLAYNUM-lock ]; do DISPLAYNUM=\$((\$DISPLAYNUM + 1)); done
+        mkdir -p \$IB_USER_PROFILE/xpra
+        cd \$IB_USER_PROFILE
+        nohup ${xpra}/bin/xpra start :\$DISPLAYNUM \
+          --socket-dir=\$IB_USER_PROFILE/xpra/ \
+          --start-child="echo -n :\$DISPLAYNUM > \$IB_USER_PROFILE/xpra/run \
+                         && kill \$WAIT_DUMMY_PID &> /dev/null \
+                         && ${jdk}/bin/java -cp $classpath \$$javaOptions ibcontroller.IBGatewayController \$IB_USER_PROFILE/IBController.ini" \
+          --exit-with-children \
+          --no-pulseaudio \
+          --no-mdns \
+          --no-notification \
+          --no-daemon \
+          &> \$IB_USER_PROFILE/xpra/server.log
+        rm -f \$IB_USER_PROFILE/xpra/run
+        rm -f /tmp/.X\$DISPLAYNUM-lock
+      ) &
+      wait \$WAIT_DUMMY_PID
+      exit 0
+    fi
+    if [ -f \$IB_USER_PROFILE/xpra/run ]; then
+      ${xpra}/bin/xpra attach \`cat \$IB_USER_PROFILE/xpra/run\` --socket-dir=\$IB_USER_PROFILE/xpra/ \
+      --windows \
+      --no-speaker \
+      --no-microphone \
+      --no-tray \
+      --title="\$IB_USER_PROFILE_TITLE: @title@" \
+      &> \$IB_USER_PROFILE/xpra/client.log
+    fi
+    EOF
+    chmod u+x $out/bin/ib-gw-c
+    '';
+
+
+  meta = with stdenv.lib; {
+    description = "Automation Controller for the Trader Work Station of Interactive Brokers";
+    homepage = https://github.com/ib-controller/ib-controller;
+    license = licenses.gpl3;
+    maintainers = [ maintainers.tstrobel ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/applications/office/ib/tws/default.nix b/pkgs/applications/office/ib/tws/default.nix
new file mode 100644
index 000000000000..b8844391c7d9
--- /dev/null
+++ b/pkgs/applications/office/ib/tws/default.nix
@@ -0,0 +1,96 @@
+{ stdenv, requireFile, jdk }:
+
+stdenv.mkDerivation rec {
+  version = "9542";
+  name = "ib-tws-${version}";
+
+  src = requireFile rec {
+    name = "ibtws_${version}.jar";
+    message = ''
+      This nix expression requires that ${name} is already part of the store.
+      Download the TWS from
+      https://download2.interactivebrokers.com/download/unixmacosx_latest.jar,
+      rename the file to ${name}, and add it to the nix store with
+      "nix-prefetch-url file://${name}".
+    '';
+    sha256 = "1a2jiwwnr5g3xfba1a89c257bdbnq4zglri8hz021vk7f6s4rlrf";
+  };
+
+  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
+
+  buildInputs = [ jdk ];
+
+  buildPhase = ''
+    jar -xf IBJts/jts.jar
+    cp trader/common/images/ibapp_icon.gif ibtws_icon.gif
+    '';
+
+  unpackPhase = ''
+    jar xf ${src}
+    '';
+
+  installPhase = ''
+    mkdir -p $out $out/bin $out/etc/ib/tws $out/share/IBJts $out/share/icons
+    cp IBJts/*.jar $out/share/IBJts/.
+    cp IBJts/*.ini $out/etc/ib/tws/.
+    cp ibtws_icon.gif $out/share/icons/.
+    classpath=""
+    for jar in $out/share/IBJts/*.jar; do
+      classpath="$classpath:$jar"
+    done
+    # strings to use below; separated to avoid nix specific substitutions
+    javaOptions={JAVA_OPTIONS:-'-Xmx1024M -Dawt.useSystemAAFontSettings=lcd -Dsun.java2d.xrender=True -Dsun.java2d.opengl=False'}
+    # OTHER JAVA_OPTIONS: -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true -Dswing.defaultlaf=com.sun.java
+    ibProfileDir={IB_PROFILE_DIR:-~/IB/}
+    cat<<EOF > $out/bin/ib-tws
+    #!$SHELL
+    if [[ \$1 == /* ]] || [[ \$1 == ./* ]]; then
+      IB_USER_PROFILE=\`realpath \$1\`
+      IB_USER_PROFILE_TITLE=\`basename \$1\`
+    else
+      if [[ x\$1 != "x" ]] && [[ \$1 != -* ]]; then
+        IB_USER_PROFILE=\`realpath \$$ibProfileDir\$1\`
+        IB_USER_PROFILE_TITLE=\$1
+      else
+        echo "ERROR: \"\$1\" is not a valid name of a profile."
+        exit 1
+      fi
+    fi
+    shift
+    if [ ! -e \$IB_USER_PROFILE ]; then mkdir -p \$IB_USER_PROFILE; fi
+    if [ ! -d \$IB_USER_PROFILE ]; then echo "ERROR: \$IB_USER_PROFILE must be a directory!" && echo 1; fi
+    if [ ! -e \$IB_USER_PROFILE/jts.ini ]; then cp $out/etc/ib/tws/jts.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/jts.ini; fi
+    ${jdk}/bin/java -cp $classpath \$$javaOptions jclient.LoginFrame \$IB_USER_PROFILE
+    EOF
+    chmod u+x $out/bin/ib-tws
+    cat<<EOF > $out/bin/ib-gw
+    #!$SHELL
+    if [[ \$1 == /* ]] || [[ \$1 == ./* ]]; then
+      IB_USER_PROFILE=\`realpath \$1\`
+      IB_USER_PROFILE_TITLE=\`basename \$1\`
+    else
+      if [[ x\$1 != "x" ]] && [[ \$1 != -* ]]; then
+        IB_USER_PROFILE=\`realpath \$$ibProfileDir\$1\`
+        IB_USER_PROFILE_TITLE=\$1
+      else
+        echo "ERROR: \"\$1\" is not a valid name of a profile."
+        exit 1
+      fi
+    fi
+    shift
+    if [ ! -e \$IB_USER_PROFILE ]; then mkdir -p \$IB_USER_PROFILE; fi
+    if [ ! -d \$IB_USER_PROFILE ]; then echo "ERROR: \$IB_USER_PROFILE must be a directory!" && echo 1; fi
+    if [ ! -e \$IB_USER_PROFILE/jts.ini ]; then cp $out/etc/ib/tws/jts.ini \$IB_USER_PROFILE/. && chmod +w \$IB_USER_PROFILE/jts.ini; fi
+    ${jdk}/bin/java -cp $classpath -Dsun.java2d.noddraw=true \$$javaOptions ibgateway.GWClient \$IB_USER_PROFILE
+    EOF
+    chmod u+x $out/bin/ib-gw
+    '';
+
+  meta = with stdenv.lib; {
+    description = "Trader Work Station of Interactive Brokers";
+    homepage = https://www.interactivebrokers.com;
+    license = licenses.unfree;
+    maintainers = [ maintainers.tstrobel ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9f52ef9be8ef..91f74bc3056a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15678,6 +15678,10 @@ let
 
   texLiveModerntimeline = builderDefsPackage (callPackage ../tools/typesetting/tex/texlive/moderntimeline.nix) {};
 
+  ib-tws = callPackage ../applications/office/ib/tws { jdk=oraclejdk8; };
+
+  ib-controller = callPackage ../applications/office/ib/controller { jdk=oraclejdk8; };
+
   thermald = callPackage ../tools/system/thermald { };
 
   thinkfan = callPackage ../tools/system/thinkfan { };

From 2a88417f033cd9ac656a75e1f5734895f8a247d5 Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Sat, 28 Feb 2015 15:30:06 +0100
Subject: [PATCH 0160/2285] nixos/doc: fix to: ~/.nix-defexpr wasn't created,
 fixes #6606

---
 nixos/doc/manual/configuration/user-mgmt.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml
index 40362fbbb23f..631742059278 100644
--- a/nixos/doc/manual/configuration/user-mgmt.xml
+++ b/nixos/doc/manual/configuration/user-mgmt.xml
@@ -65,6 +65,14 @@ account named <literal>alice</literal>:
 <screen>
 $ useradd -m alice</screen>
 
+To make all nix tools available to this new user use `su - USER` which 
+opens a login shell (==shell that loads the profile) for given user. 
+This will create the ~/.nix-defexpr symlink. So run:
+
+<screen>
+$ su - alice -c "true"</screen>
+
+
 The flag <option>-m</option> causes the creation of a home directory
 for the new user, which is generally what you want.  The user does not
 have an initial password and therefore cannot log in.  A password can

From 535b1120388209f2a6038ba1b1c035cb572b4541 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 20 Jan 2016 09:02:07 +0100
Subject: [PATCH 0161/2285] imagemagick: add a more "reliable" mirror to fix
 #12493

---
 pkgs/applications/graphics/ImageMagick/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index c25cc11c203c..8fa86041414f 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -15,7 +15,11 @@ stdenv.mkDerivation rec {
   version = "6.9.2-0";
 
   src = fetchurl {
-    url = "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz";
+    urls = [
+      "mirror://imagemagick/releases/ImageMagick-${version}.tar.xz"
+      # the original source above removes tarballs quickly
+      "http://distfiles.macports.org/ImageMagick/ImageMagick-${version}.tar.xz"
+    ];
     sha256 = "17ir8bw1j7g7srqmsz3rx780sgnc21zfn0kwyj78iazrywldx8h7";
   };
 

From 72cd96a0e14775a92e677bc82841e95206f5d5a6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 20 Jan 2016 07:07:57 +0100
Subject: [PATCH 0162/2285] libpsl: list 2016-01-09 -> 2016-01-15

---
 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 7368729a881d..a1beee602d71 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -5,10 +5,10 @@ let
 
   version = "${libVersion}-list-${listVersion}";
 
-  listVersion = "2016-01-09";
+  listVersion = "2016-01-15";
   listSources = fetchFromGitHub {
-    sha256 = "1xsal9vyan954ahyn9pxvqpipmpcf6drp30xz7ag5xp3f2clcx8s";
-    rev = "0f7cc8b00498812ddaa983c56d67ef3713e48350";
+    sha256 = "1smn4fl0fhldy7gdn0k1diyghbxdxnr4cj921bjdl2i4wxas41g5";
+    rev = "77cb90dce70827bda40384e1ae8bff3c958daef3";
     repo = "list";
     owner = "publicsuffix";
   };

From f1f2b87fdd64c08c7b8625ffcdefa5fa7628e735 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 20 Jan 2016 08:00:06 +0100
Subject: [PATCH 0163/2285] snapper: various tweaks and fixes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fix numerous configuration files referring to ‘/usr’ and ‘/lib’.

Some paths were still ending up in ‘/nix/store/.../nix/store/...’,
despite some well-intended hacks meant to avoid that. Replace them
with other hacks. It's all very fragile and ugly, so snapper should
feel right at home.

Oh, and `snapper create-config ~` still won't actually *do*
anything, because D-Bus (#12452). Use `--no-dbus` and add files
to ‘/etc’ as long as it complains.

Only fair that I help maintain this mess.
---
 pkgs/tools/misc/snapper/default.nix | 51 +++++++++++++++++++----------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix
index 1a0c805a2ec6..933788f57855 100644
--- a/pkgs/tools/misc/snapper/default.nix
+++ b/pkgs/tools/misc/snapper/default.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchFromGitHub
 , autoreconfHook, pkgconfig, docbook_xsl, libxslt, docbook_xml_dtd_45
 , acl, attr, boost, btrfs-progs, dbus_libs, diffutils, e2fsprogs, libxml2
-, lvm2, pam, utillinux }:
+, lvm2, pam, python, utillinux }:
 
 stdenv.mkDerivation rec {
-  name = "snapper-${ver}";
-  ver = "0.2.8";
+  name = "snapper-${version}";
+  version = "0.2.8";
 
   src = fetchFromGitHub {
     owner = "openSUSE";
     repo = "snapper";
-    rev = "v${ver}";
+    rev = "v${version}";
     sha256 = "1rj8vy6hq140pbnc7mjjb34mfqdgdah1dmlv2073izdgakh7p38j";
   };
 
@@ -20,33 +20,48 @@ stdenv.mkDerivation rec {
   ];
   buildInputs = [
     acl attr boost btrfs-progs dbus_libs diffutils e2fsprogs libxml2
-    lvm2 pam utillinux
+    lvm2 pam python utillinux
   ];
 
-  patchPhase = ''
-    # work around missing btrfs/version.h; otherwise, use "-DHAVE_BTRFS_VERSION_H"
-    substituteInPlace snapper/Btrfs.cc --replace "define BTRFS_LIB_VERSION (100)" "define BTRFS_LIB_VERSION (200)";
+  postPatch = ''
+    # Hard-coded root paths, hard-coded root paths everywhere...
+    for file in {client,data,pam,scripts}/Makefile.am; do
+      substituteInPlace $file \
+        --replace '$(DESTDIR)/usr' "$out" \
+        --replace "DESTDIR" "out" \
+        --replace "/usr" "$out"
+    done
+    substituteInPlace pam/Makefile.am \
+      --replace '/`basename $(libdir)`' "$out/lib"
   '';
 
-  configurePhase = ''
-    ./configure --disable-silent-rules --disable-ext4 --disable-btrfs-quota --prefix=$out
-    '';
+  configureFlags = [
+    "--disable-ext4"	# requires patched kernel & e2fsprogs
+  ];
 
-  makeFlags = "DESTDIR=$(out)";
+  enableParallelBuilding = true;
 
-  NIX_CFLAGS_COMPILE = [ "-I${libxml2}/include/libxml2" ];
+  NIX_CFLAGS_COMPILE = [
+    "-I${libxml2}/include/libxml2"
+  ];
 
-  # Probably a hack, but using DESTDIR and PREFIX makes everything work!
   postInstall = ''
-    cp -r $out/$out/* $out
-    rm -r $out/nix
-    '';
+    rm -r $out/etc/cron.*
+    patchShebangs $out/lib/zypp/plugins/commit/*
+    for file in \
+      $out/lib/pam_snapper/* \
+      $out/lib/systemd/system/* \
+      $out/share/dbus-1/system-services/* \
+    ; do
+      substituteInPlace $file --replace "/usr" "$out"
+    done
+  '';
 
   meta = with stdenv.lib; {
     description = "Tool for Linux filesystem snapshot management";
     homepage = http://snapper.io;
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainers = [ maintainers.tstrobel ];
+    maintainers = with maintainers; [ nckx tstrobel ];
   };
 }

From 23f5e3c90fb4a28a25f7a5dd41b8cf7b9fc4d6fa Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Wed, 20 Jan 2016 02:19:16 +0100
Subject: [PATCH 0164/2285] linux: patch CVE-2016-0728 (close #12492)

The PoC provided successfully escalates privileges from a local user to
root. The vulnerability affects any Linux Kernel version 3.8 and higher.
http://perception-point.io/2016/01/14/analysis-and-exploitation-of-a-linux-kernel-vulnerability-cve-2016-0728/
---
 .../linux/kernel/cve-2016-0728.patch          | 78 +++++++++++++++++++
 pkgs/os-specific/linux/kernel/linux-3.10.nix  |  2 +
 pkgs/os-specific/linux/kernel/linux-3.12.nix  |  2 +
 pkgs/os-specific/linux/kernel/linux-3.14.nix  |  2 +
 pkgs/os-specific/linux/kernel/linux-3.18.nix  |  2 +
 pkgs/os-specific/linux/kernel/linux-4.1.nix   |  2 +
 pkgs/os-specific/linux/kernel/linux-4.2.nix   |  2 +
 pkgs/os-specific/linux/kernel/linux-4.3.nix   |  2 +
 pkgs/os-specific/linux/kernel/linux-4.4.nix   |  2 +
 9 files changed, 94 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/cve-2016-0728.patch

diff --git a/pkgs/os-specific/linux/kernel/cve-2016-0728.patch b/pkgs/os-specific/linux/kernel/cve-2016-0728.patch
new file mode 100644
index 000000000000..5eec95c62930
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/cve-2016-0728.patch
@@ -0,0 +1,78 @@
+From 05fd13592b60c3e9873f56705f80ff934e98b046 Mon Sep 17 00:00:00 2001
+From: David Howells <dhowells@redhat.com>
+Date: Mon, 18 Jan 2016 10:53:31 +0000
+Subject: [PATCH] KEYS: Fix keyring ref leak in join_session_keyring()
+
+This fixes CVE-2016-0728.
+
+If a thread is asked to join as a session keyring the keyring that's already
+set as its session, we leak a keyring reference.
+
+This can be tested with the following program:
+
+	#include <stddef.h>
+	#include <stdio.h>
+	#include <sys/types.h>
+	#include <keyutils.h>
+
+	int main(int argc, const char *argv[])
+	{
+		int i = 0;
+		key_serial_t serial;
+
+		serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING,
+				"leaked-keyring");
+		if (serial < 0) {
+			perror("keyctl");
+			return -1;
+		}
+
+		if (keyctl(KEYCTL_SETPERM, serial,
+			   KEY_POS_ALL | KEY_USR_ALL) < 0) {
+			perror("keyctl");
+			return -1;
+		}
+
+		for (i = 0; i < 100; i++) {
+			serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING,
+					"leaked-keyring");
+			if (serial < 0) {
+				perror("keyctl");
+				return -1;
+			}
+		}
+
+		return 0;
+	}
+
+If, after the program has run, there something like the following line in
+/proc/keys:
+
+3f3d898f I--Q---   100 perm 3f3f0000     0     0 keyring   leaked-keyring: empty
+
+with a usage count of 100 * the number of times the program has been run,
+then the kernel is malfunctioning.  If leaked-keyring has zero usages or
+has been garbage collected, then the problem is fixed.
+
+Reported-by: Yevgeny Pats <yevgeny@perception-point.io>
+Signed-off-by: David Howells <dhowells@redhat.com>
+RH-bugzilla: 1298036
+---
+ security/keys/process_keys.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
+index 43b4cddbf2b3..7877e5cd4e23 100644
+--- a/security/keys/process_keys.c
++++ b/security/keys/process_keys.c
+@@ -794,6 +794,7 @@ long join_session_keyring(const char *name)
+ 		ret = PTR_ERR(keyring);
+ 		goto error2;
+ 	} else if (keyring == new->session_keyring) {
++		key_put(keyring);
+ 		ret = 0;
+ 		goto error2;
+ 	}
+-- 
+2.5.0
+
diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index a231b551dc06..6a4531d9deb4 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -9,6 +9,8 @@ import ./generic.nix (args // rec {
     sha256 = "0z0jdix1mfpnnc8cxw7rzpnhxdayckpnrasvxi1qf0dwhcqgk92d";
   };
 
+  kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ];
+
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 7ed6cd142d15..1e58d4e50291 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -9,6 +9,8 @@ import ./generic.nix (args // rec {
     sha256 = "1bn07wsrcbg4qgqd4v2810c3qc0ifbcza0fyj8s54yd78g9qj4lj";
   };
 
+  kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ];
+
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index 987452618f04..62f1be8b92b1 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -10,6 +10,8 @@ import ./generic.nix (args // rec {
     sha256 = "0jw1023cpn4bjmi0db86lrxri9xj75cj8p2iqs44jabvh35idl7l";
   };
 
+  kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ];
+
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix
index 24a568f5feb1..86258308c1e0 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix
@@ -9,6 +9,8 @@ import ./generic.nix (args // rec {
     sha256 = "14pz8mvk48i2y1ffkhczjcm2icpb2g9xlpzyrvvis42n5178fjf6";
   };
 
+  kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ];
+
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix
index d9efce840fab..29d4870597a3 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix
@@ -9,6 +9,8 @@ import ./generic.nix (args // rec {
     sha256 = "18sr0dl5ax6pcx6nqp9drb4l6a38g07vxihiqpbwb231jv68h8j7";
   };
 
+  kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ];
+
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.2.nix b/pkgs/os-specific/linux/kernel/linux-4.2.nix
index 6d2deead3a2a..fbeecb3984d5 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.2.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.2.nix
@@ -10,6 +10,8 @@ import ./generic.nix (args // rec {
     sha256 = "0p7v6v3v9kn7w5iragi5hx0dylhis0jy6xmk77gka486q1ynpnqp";
   };
 
+  kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ];
+
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.3.nix b/pkgs/os-specific/linux/kernel/linux-4.3.nix
index 1a33f4828cd1..8d590a72d743 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.3.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.3.nix
@@ -10,6 +10,8 @@ import ./generic.nix (args // rec {
     sha256 = "8cad4ce7d049c2ecc041b0844bd478bf85f0d3071c93e0c885a776d57cbca3cf";
   };
 
+  kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ];
+
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index 36a297b95e57..cf17e915f8bf 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -10,6 +10,8 @@ import ./generic.nix (args // rec {
     sha256 = "401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2";
   };
 
+  kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ];
+
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;

From fb2eae08d53606823051dead0d07b6461e82ec1b Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 11 Jan 2016 19:41:48 +0100
Subject: [PATCH 0165/2285] Revert "Revert "nixos-rebuild: Add option for
 building and/or deploying on a remote host""

This reverts commit 78be7f5a53e3945b72482a99c639f5fe8cc75fd6.
---
 .../modules/installer/tools/nixos-rebuild.sh  | 187 +++++++++++++++---
 1 file changed, 160 insertions(+), 27 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 6792690b4c3b..1071460097e8 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -19,6 +19,8 @@ rollback=
 upgrade=
 repair=
 profile=/nix/var/nix/profiles/system
+buildHost=
+targetHost=
 
 while [ "$#" -gt 0 ]; do
     i="$1"; shift 1
@@ -73,6 +75,14 @@ while [ "$#" -gt 0 ]; do
         fi
         shift 1
         ;;
+      --build-host|h)
+        buildHost="$1"
+        shift 1
+        ;;
+      --target-host|t)
+        targetHost="$1"
+        shift 1
+        ;;
       *)
         echo "$0: unknown option \`$i'"
         exit 1
@@ -80,6 +90,90 @@ while [ "$#" -gt 0 ]; do
     esac
 done
 
+
+if [ -z "$buildHost" -a -n "$targetHost" ]; then
+    buildHost="$targetHost"
+fi
+if [ "$targetHost" = localhost ]; then
+    targetHost=
+fi
+if [ "$buildHost" = localhost ]; then
+    buildHost=
+fi
+
+buildHostCmd() {
+    if [ -z "$buildHost" ]; then
+        "$@"
+    elif [ -n "$remoteNix" ]; then
+        ssh $SSHOPTS "$buildHost" PATH="$remoteNix:$PATH" "$@"
+    else
+        ssh $SSHOPTS "$buildHost" "$@"
+    fi
+}
+
+targetHostCmd() {
+    if [ -z "$targetHost" ]; then
+        "$@"
+    else
+        ssh $SSHOPTS "$targetHost" "$@"
+    fi
+}
+
+copyToTarget() {
+    if ! [ "$targetHost" = "$buildHost" ]; then
+        if [ -z "$targetHost" ]; then
+            NIX_SSHOPTS=$SSH_OPTS nix-copy-closure --from "$buildHost" "$1"
+        elif [ -z "$buildHost" ]; then
+            NIX_SSHOPTS=$SSH_OPTS nix-copy-closure --to "$targetHost" "$1"
+        else
+            buildHostCmd nix-copy-closure --to "$targetHost" "$1"
+        fi
+    fi
+}
+
+nixBuild() {
+    if [ -z "$buildHost" ]; then
+        nix-build "$@"
+    else
+        local instArgs=()
+        local buildArgs=()
+
+        while [ "$#" -gt 0 ]; do
+            local i="$1"; shift 1
+            case "$i" in
+              -o)
+                local out="$1"; shift 1
+                buildArgs+=("--add-root" "$out" "--indirect")
+                ;;
+              -A)
+                local j="$1"; shift 1
+                instArgs+=("$i" "$j")
+                ;;
+              -I)
+                # We don't want this in buildArgs
+                shift 1
+                ;;
+              "<"*) # nix paths
+                instArgs+=("$i")
+                ;;
+              *)
+                buildArgs+=("$i")
+                ;;
+            esac
+        done
+
+        local drv="$(nix-instantiate "${instArgs[@]}" "${extraBuildFlags[@]}")"
+        if [ -a "$drv" ]; then
+            NIX_SSHOPTS=$SSH_OPTS nix-copy-closure --to "$buildHost" "$drv"
+            buildHostCmd nix-store -r "$drv" "${buildArgs[@]}"
+        else
+            echo "nix-instantiate failed"
+            exit 1
+        fi
+  fi
+}
+
+
 if [ -z "$action" ]; then showSyntax; fi
 
 # Only run shell scripts from the Nixpkgs tree if the action is
@@ -128,7 +222,16 @@ fi
 
 
 tmpDir=$(mktemp -t -d nixos-rebuild.XXXXXX)
-trap 'rm -rf "$tmpDir"' EXIT
+SSHOPTS="$NIX_SSHOPTS -o ControlMaster=auto -o ControlPath=$tmpDir/ssh-%n -o ControlPersist=60"
+
+cleanup() {
+    for ctrl in "$tmpDir"/ssh-*; do
+        ssh -o ControlPath="$ctrl" -O exit dummyhost 2>/dev/null || true
+    done
+    rm -rf "$tmpDir"
+}
+trap cleanup EXIT
+
 
 
 # If the Nix daemon is running, then use it.  This allows us to use
@@ -150,30 +253,56 @@ if [ -n "$rollback" -o "$action" = dry-build ]; then
     buildNix=
 fi
 
+prebuiltNix() {
+    machine="$1"
+    if [ "$machine" = x86_64 ]; then
+        return /nix/store/xryr9g56h8yjddp89d6dw12anyb4ch7c-nix-1.10
+    elif [[ "$machine" =~ i.86 ]]; then
+        return /nix/store/2w92k5wlpspf0q2k9mnf2z42prx3bwmv-nix-1.10
+    else
+        echo "$0: unsupported platform"
+        exit 1
+    fi
+}
+
+remotePATH=
+
 if [ -n "$buildNix" ]; then
     echo "building Nix..." >&2
-    if ! nix-build '<nixpkgs/nixos>' -A config.nix.package -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
-        if ! nix-build '<nixpkgs/nixos>' -A nixFallback -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
-            if ! nix-build '<nixpkgs>' -A nix -o $tmpDir/nix "${extraBuildFlags[@]}" > /dev/null; then
-                machine="$(uname -m)"
-                if [ "$machine" = x86_64 ]; then
-                    nixStorePath=/nix/store/xryr9g56h8yjddp89d6dw12anyb4ch7c-nix-1.10
-                elif [[ "$machine" =~ i.86 ]]; then
-                    nixStorePath=/nix/store/2w92k5wlpspf0q2k9mnf2z42prx3bwmv-nix-1.10
-                else
-                    echo "$0: unsupported platform"
-                    exit 1
-                fi
+    nixDrv=
+    if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nixdrv --indirect -A config.nix.package "${extraBuildFlags[@]}")"; then
+        if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nixdrv --indirect -A nixFallback "${extraBuildFlags[@]}")"; then
+            if ! nixDrv="$(nix-instantiate '<nixpkgs>' --add-root $tmpDir/nixdrv --indirect -A nix "${extraBuildFlags[@]}")"; then
+                nixStorePath="$(prebuiltNix "$(uname -m)")"
                 if ! nix-store -r $nixStorePath --add-root $tmpDir/nix --indirect \
                     --option extra-binary-caches https://cache.nixos.org/; then
                     echo "warning: don't know how to get latest Nix" >&2
                 fi
                 # Older version of nix-store -r don't support --add-root.
                 [ -e $tmpDir/nix ] || ln -sf $nixStorePath $tmpDir/nix
+                if [ -n "$buildHost" ]; then
+                    remoteNixStorePath="$(prebuiltNix "$(buildHostCmd uname -m)")"
+                    remoteNix="$remoteNixStorePath/bin"
+                    if ! buildHostCmd nix-store -r $remoteNixStorePath \
+                      --option extra-binary-caches https://cache.nixos.org/ >/dev/null; then
+                        remoteNix=
+                        echo "warning: don't know how to get latest Nix" >&2
+                    fi
+                fi
             fi
         fi
     fi
-    PATH=$tmpDir/nix/bin:$PATH
+    if [ -a "$nixDrv" ]; then
+        nix-store -r "$nixDrv" --add-root $tmpDir/nix --indirect >/dev/null
+        if [ -n "$buildHost" ]; then
+            nix-copy-closure --to "$buildHost" "$nixDrv"
+            # The nix build produces multiple outputs, we add them all to the remote path
+            for p in $(buildHostCmd nix-store -r "$(readlink "$nixDrv")" "${buildArgs[@]}"); do
+                remoteNix="$remoteNix${remoteNix:+:}$p/bin"
+            done
+        fi
+    fi
+    PATH="$tmpDir/nix/bin:$PATH"
 fi
 
 
@@ -200,31 +329,35 @@ fi
 if [ -z "$rollback" ]; then
     echo "building the system configuration..." >&2
     if [ "$action" = switch -o "$action" = boot ]; then
-        nix-env "${extraBuildFlags[@]}" -p "$profile" -f '<nixpkgs/nixos>' --set -A system
-        pathToConfig="$profile"
+        pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A system "${extraBuildFlags[@]}")"
+        copyToTarget "$pathToConfig"
+        targetHostCmd nix-env -p "$profile" --set "$pathToConfig"
     elif [ "$action" = test -o "$action" = build -o "$action" = dry-build -o "$action" = dry-activate ]; then
-        nix-build '<nixpkgs/nixos>' -A system -k "${extraBuildFlags[@]}" > /dev/null
-        pathToConfig=./result
+        pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A system -k "${extraBuildFlags[@]}")"
     elif [ "$action" = build-vm ]; then
-        nix-build '<nixpkgs/nixos>' -A vm -k "${extraBuildFlags[@]}" > /dev/null
-        pathToConfig=./result
+        pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A vm -k "${extraBuildFlags[@]}")"
     elif [ "$action" = build-vm-with-bootloader ]; then
-        nix-build '<nixpkgs/nixos>' -A vmWithBootLoader -k "${extraBuildFlags[@]}" > /dev/null
-        pathToConfig=./result
+        pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A vmWithBootLoader -k "${extraBuildFlags[@]}")"
     else
         showSyntax
     fi
+    # Copy build to target host if we haven't already done it
+    if ! [ "$action" = switch -o "$action" = boot ]; then
+        copyToTarget "$pathToConfig"
+    fi
 else # [ -n "$rollback" ]
     if [ "$action" = switch -o "$action" = boot ]; then
-        nix-env --rollback -p "$profile"
+        targetHostCmd nix-env --rollback -p "$profile"
         pathToConfig="$profile"
     elif [ "$action" = test -o "$action" = build ]; then
         systemNumber=$(
-            nix-env -p "$profile" --list-generations |
+            targetHostCmd nix-env -p "$profile" --list-generations |
             sed -n '/current/ {g; p;}; s/ *\([0-9]*\).*/\1/; h'
         )
-        ln -sT "$profile"-${systemNumber}-link ./result
-        pathToConfig=./result
+        pathToConfig="$profile"-${systemNumber}-link
+        if [ -z "$targetHost" ]; then
+            ln -sT "$pathToConfig" ./result
+        fi
     else
         showSyntax
     fi
@@ -234,7 +367,7 @@ fi
 # If we're not just building, then make the new configuration the boot
 # default and/or activate it now.
 if [ "$action" = switch -o "$action" = boot -o "$action" = test -o "$action" = dry-activate ]; then
-    if ! $pathToConfig/bin/switch-to-configuration "$action"; then
+    if ! targetHostCmd $pathToConfig/bin/switch-to-configuration "$action"; then
         echo "warning: error(s) occurred while switching to the new configuration" >&2
         exit 1
     fi

From 51c6383ebd10ea58094e80bdb0ead73b838f8b9c Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 11 Jan 2016 19:43:05 +0100
Subject: [PATCH 0166/2285] nixos-rebuild: Build only the 'out' output of nix
 (not 'doc' and 'debug' too)

This fixes the failing NixOS installer tests.
---
 nixos/modules/installer/tools/nixos-rebuild.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 1071460097e8..105d1cd16252 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -270,9 +270,9 @@ remotePATH=
 if [ -n "$buildNix" ]; then
     echo "building Nix..." >&2
     nixDrv=
-    if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nixdrv --indirect -A config.nix.package "${extraBuildFlags[@]}")"; then
-        if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nixdrv --indirect -A nixFallback "${extraBuildFlags[@]}")"; then
-            if ! nixDrv="$(nix-instantiate '<nixpkgs>' --add-root $tmpDir/nixdrv --indirect -A nix "${extraBuildFlags[@]}")"; then
+    if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nix.drv --indirect -A config.nix.package "${extraBuildFlags[@]}")"; then
+        if ! nixDrv="$(nix-instantiate '<nixpkgs/nixos>' --add-root $tmpDir/nix.drv --indirect -A nixFallback "${extraBuildFlags[@]}")"; then
+            if ! nixDrv="$(nix-instantiate '<nixpkgs>' --add-root $tmpDir/nix.drv --indirect -A nix "${extraBuildFlags[@]}")"; then
                 nixStorePath="$(prebuiltNix "$(uname -m)")"
                 if ! nix-store -r $nixStorePath --add-root $tmpDir/nix --indirect \
                     --option extra-binary-caches https://cache.nixos.org/; then
@@ -293,7 +293,7 @@ if [ -n "$buildNix" ]; then
         fi
     fi
     if [ -a "$nixDrv" ]; then
-        nix-store -r "$nixDrv" --add-root $tmpDir/nix --indirect >/dev/null
+        nix-store -r "$nixDrv"'!'"out" --add-root $tmpDir/nix --indirect >/dev/null
         if [ -n "$buildHost" ]; then
             nix-copy-closure --to "$buildHost" "$nixDrv"
             # The nix build produces multiple outputs, we add them all to the remote path

From 9763e6bf8991ba4a853329b9b81af4cca7c38ea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 20 Jan 2016 11:27:37 +0100
Subject: [PATCH 0167/2285] zeroad: fix 0ad.desktop after #12421

---
 pkgs/games/0ad/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/0ad/default.nix b/pkgs/games/0ad/default.nix
index eee1d34745f6..e854af588651 100644
--- a/pkgs/games/0ad/default.nix
+++ b/pkgs/games/0ad/default.nix
@@ -109,7 +109,7 @@ stdenv.mkDerivation rec {
     mkdir -p "$out"/share/applications
     while read LINE; do
       if [[ $LINE = "Exec=0ad" ]]; then
-        echo "Exec=$out/bin/pyrogenesis"
+        echo "Exec=$out/bin/zeroad"
       elif [[ $LINE = "Icon=0ad" ]]; then
         echo "Icon=$out/share/icons/0ad.png"
       else

From 2f6ef9aa6a7eecea9ff7e185ca40855f36597327 Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Wed, 20 Jan 2016 13:01:04 +0100
Subject: [PATCH 0168/2285] python-setproctitle: init at 1.1.9

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 588c952b2302..030cca19ff31 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23405,6 +23405,23 @@ in modules // {
      };
   };
 
+  setproctitle = buildPythonPackage rec {
+    name = "python-setproctitle-${version}";
+    version = "1.1.9";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/s/setproctitle/setproctitle-${version}.tar.gz";
+      sha256 = "1mqadassxcm0m9r1l02m5vr4bbandn48xz8gifvxmb4wiz8i8d0w";
+    };
+
+    meta = {
+      description = "Allows a process to change its title (as displayed by system tools such as ps and top)";
+      homepage =  https://github.com/dvarrazzo/py-setproctitle;
+      license = licenses.bsdOriginal;
+      maintainers = with maintainers; [ exi ];
+    };
+  };
+
   thrift = buildPythonPackage rec {
     name = "thrift-${version}";
     version = "0.9.2";

From b5c2587698fbe11b1a8224439fe206cda0e9c111 Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Wed, 20 Jan 2016 13:08:28 +0100
Subject: [PATCH 0169/2285] add id3lib easytag patch for proper unicode
 handling.

This patch is directly taken from easytag. id3lib is not maintained any longer
and the last release is 13 years old.
This patch fixes some unicode issues.
---
 pkgs/development/libraries/id3lib/default.nix |  5 ++-
 .../patch_id3lib_3.8.3_UTF16_writing_bug.diff | 39 +++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff

diff --git a/pkgs/development/libraries/id3lib/default.nix b/pkgs/development/libraries/id3lib/default.nix
index 0ea1e96947ea..9f880e3ea9f7 100644
--- a/pkgs/development/libraries/id3lib/default.nix
+++ b/pkgs/development/libraries/id3lib/default.nix
@@ -3,7 +3,10 @@
 stdenv.mkDerivation {
   name = "id3lib-3.8.3";
 
-  patches = [ ./id3lib-3.8.3-gcc43-1.patch ];
+  patches = [
+    ./id3lib-3.8.3-gcc43-1.patch
+    ./patch_id3lib_3.8.3_UTF16_writing_bug.diff
+  ];
 
   buildInputs = [ zlib ];
   
diff --git a/pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff b/pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff
new file mode 100644
index 000000000000..b05d2cf298d3
--- /dev/null
+++ b/pkgs/development/libraries/id3lib/patch_id3lib_3.8.3_UTF16_writing_bug.diff
@@ -0,0 +1,39 @@
+diff -ruN id3lib-3.8.3.orig/ChangeLog id3lib-3.8.3/ChangeLog
+--- id3lib-3.8.3.orig/ChangeLog	2003-03-02 01:23:00.000000000 +0100
++++ id3lib-3.8.3/ChangeLog	2006-02-22 00:33:59.946214472 +0100
+@@ -1,3 +1,8 @@
++2006-02-17  Jerome Couderc
++
++    * Patch from Spoon to fix UTF-16 writing bug
++      http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979
++
+ 2003-03-02 Sunday 17:38   Thijmen Klok <thijmen@id3lib.org>
+ 
+ 	* THANKS (1.20): added more people 
+diff -ruN id3lib-3.8.3.orig/src/io_helpers.cpp id3lib-3.8.3/src/io_helpers.cpp
+--- id3lib-3.8.3.orig/src/io_helpers.cpp	2003-03-02 01:23:00.000000000 +0100
++++ id3lib-3.8.3/src/io_helpers.cpp	2006-02-22 00:35:02.926639992 +0100
+@@ -363,11 +363,22 @@
+     // Write the BOM: 0xFEFF
+     unicode_t BOM = 0xFEFF;
+     writer.writeChars((const unsigned char*) &BOM, 2);
++    // Patch from Spoon : 2004-08-25 14:17
++    //   http://sourceforge.net/tracker/index.php?func=detail&aid=1016290&group_id=979&atid=300979
++    // Wrong code
++    //for (size_t i = 0; i < size; i += 2)
++    //{
++    //  unicode_t ch = (data[i] << 8) | data[i+1];
++    //  writer.writeChars((const unsigned char*) &ch, 2);
++    //}
++    // Right code
++    unsigned char *pdata = (unsigned char *) data.c_str();
+     for (size_t i = 0; i < size; i += 2)
+     {
+-      unicode_t ch = (data[i] << 8) | data[i+1];
++      unicode_t ch = (pdata[i] << 8) | pdata[i+1];
+       writer.writeChars((const unsigned char*) &ch, 2);
+     }
++    // End patch
+   }
+   return writer.getCur() - beg;
+ }

From a11c1f8e3988ce1d3bb4b12c31a0d984010cf603 Mon Sep 17 00:00:00 2001
From: Philip Potter <philip.g.potter@gmail.com>
Date: Wed, 20 Jan 2016 12:27:25 +0000
Subject: [PATCH 0170/2285] certificate-transparency: 2015-11-27 -> 2016-01-14

Bump to latest master.  Among other things, this pulls in
google/certificate-transparency#1088 which fixes a problem with running
xjson-server in clustering mode.
---
 pkgs/servers/certificate-transparency/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/certificate-transparency/default.nix b/pkgs/servers/certificate-transparency/default.nix
index ebfa7427fc00..80fae89c76d8 100644
--- a/pkgs/servers/certificate-transparency/default.nix
+++ b/pkgs/servers/certificate-transparency/default.nix
@@ -3,8 +3,8 @@
 stdenv.mkDerivation rec {
   name = "certificate-transparency-${version}";
 
-  version = "2015-11-27";
-  rev = "dc5a51e55af989ff5871a6647166d00d0de478ab";
+  version = "2016-01-14";
+  rev = "250672b5aef3666edbdfc9a75b95a09e7a57ed08";
 
   meta = with stdenv.lib; {
     homepage = https://www.certificate-transparency.org/;
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     owner = "google";
     repo  = "certificate-transparency";
     rev   = rev;
-    sha256 = "14sgc2kcjjsnrykwcjin21h1f3v4kg83w6jqiq9qdm1ha165yhvx";
+    sha256 = "1gn0bqzkf09jvc2aq3da8fwhl65y7q57msqsh6iczvd6fdmrpfdj";
   };
 
   # need to disable regex support in evhtp or building will fail

From 39bd9be5a9dc8d8efe6016e3234302ab027dc4cf Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Mon, 18 Jan 2016 23:10:58 +0200
Subject: [PATCH 0171/2285] postfix: use built-in set-permission tool to setup
 queue

Make top level /var/lib/postfix as root:root 0755

After generating custom configs in /var/lib/postfix/conf,
`postfix set-permissions` called, to perform all required tricks
related to queue handling (postfix use file mode bits to keep
some internal statuses, so `chmod -R` not recommended by authors,
see comments in $out/libexec/postfix/post-install for details)

Also post-install script was patched, to skip permission check/update
for files inside $out, as well as symlinks following to $NIX_STORE.

Config file `main.cf` extended with all default directory locations,
to prevent post-install script from guessing and overwrite them.

And finally all actions in activation script snippets performed
by postmap/postalias/postfix tools from current build, not random one
from paths.
---
 nixos/modules/services/mail/postfix.nix       | 37 +++++++++++++++----
 pkgs/servers/mail/postfix/3.0.nix             |  6 ++-
 .../mail/postfix/post-install-script.patch    | 28 ++++++++++++++
 3 files changed, 62 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/servers/mail/postfix/post-install-script.patch

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 6c5d7e92702b..f2d8189de6ef 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -20,6 +20,23 @@ let
       mail_owner = ${user}
       default_privs = nobody
 
+      # NixOS specific locations
+      data_directory = /var/lib/postfix/data
+      queue_directory = /var/lib/postfix/queue
+
+      # Default location of everything in package
+      meta_directory = ${pkgs.postfix}/etc/postfix
+      command_directory = ${pkgs.postfix}/bin
+      sample_directory = /etc/postfix
+      newaliases_path = ${pkgs.postfix}/bin/newaliases
+      mailq_path = ${pkgs.postfix}/bin/mailq
+      readme_directory = no
+      sendmail_path = ${pkgs.postfix}/bin/sendmail
+      daemon_directory = ${pkgs.postfix}/libexec/postfix
+      manpage_directory = ${pkgs.postfix}/share/man
+      html_directory = ${pkgs.postfix}/share/postfix/doc/html
+      shlib_directory = no
+
     ''
     + optionalString config.networking.enableIPv6 ''
       inet_protocols = all
@@ -435,31 +452,35 @@ in
               mkdir -p /var/lib
               mv /var/postfix /var/lib/postfix
             fi
-            mkdir -p /var/lib/postfix/data /var/lib/postfix/queue/{pid,public,maildrop}
 
-            chown -R ${user}:${group} /var/lib/postfix
-            chown root /var/lib/postfix/queue
-            chown root /var/lib/postfix/queue/pid
-            chgrp -R ${setgidGroup} /var/lib/postfix/queue/{public,maildrop}
-            chmod 770 /var/lib/postfix/queue/{public,maildrop}
+            # All permissions set according ${pkgs.postfix}/etc/postfix/postfix-files script
+            mkdir -p /var/lib/postfix /var/lib/postfix/queue/{pid,public,maildrop}
+            chmod 0755 /var/lib/postfix
+            chown root:root /var/lib/postfix
 
             rm -rf /var/lib/postfix/conf
             mkdir -p /var/lib/postfix/conf
+            chmod 0755 /var/lib/postfix/conf
+            ln -sf ${pkgs.postfix}/etc/postfix/postfix-files
             ln -sf ${mainCfFile} /var/lib/postfix/conf/main.cf
             ln -sf ${masterCfFile} /var/lib/postfix/conf/master.cf
+
             ${concatStringsSep "\n" (mapAttrsToList (to: from: ''
               ln -sf ${from} /var/lib/postfix/conf/${to}
-              postalias /var/lib/postfix/conf/${to}
+              ${pkgs.postfix}/bin/postalias /var/lib/postfix/conf/${to}
             '') cfg.aliasFiles)}
             ${concatStringsSep "\n" (mapAttrsToList (to: from: ''
               ln -sf ${from} /var/lib/postfix/conf/${to}
-              postmap /var/lib/postfix/conf/${to}
+              ${pkgs.postfix}/bin/postmap /var/lib/postfix/conf/${to}
             '') cfg.mapFiles)}
 
             mkdir -p /var/spool/mail
             chown root:root /var/spool/mail
             chmod a+rwxt /var/spool/mail
             ln -sf /var/spool/mail /var/
+
+            #Finally delegate to postfix checking remain directories in /var/lib/postfix and set permissions on them
+            ${pkgs.postfix}/bin/postfix set-permissions config_directory=/var/lib/postfix/conf
           '';
         };
     }
diff --git a/pkgs/servers/mail/postfix/3.0.nix b/pkgs/servers/mail/postfix/3.0.nix
index 73ab8c8116f3..8ccd9f3a3f9a 100644
--- a/pkgs/servers/mail/postfix/3.0.nix
+++ b/pkgs/servers/mail/postfix/3.0.nix
@@ -35,10 +35,14 @@ in stdenv.mkDerivation rec {
                 ++ lib.optional withMySQL libmysql
                 ++ lib.optional withSQLite sqlite;
 
-  patches = [ ./postfix-script-shell.patch ./postfix-3.0-no-warnings.patch ];
+  patches = [ ./postfix-script-shell.patch ./postfix-3.0-no-warnings.patch ./post-install-script.patch ];
 
   preBuild = ''
     sed -e '/^PATH=/d' -i postfix-install
+    sed -e "s|@PACKAGE@|$out|" -i conf/post-install
+
+    # post-install need skip permissions check/set on all symlinks following to /nix/store
+    sed -e "s|@NIX_STORE@|$NIX_STORE|" -i conf/post-install
 
     export command_directory=$out/sbin
     export config_directory=/etc/postfix
diff --git a/pkgs/servers/mail/postfix/post-install-script.patch b/pkgs/servers/mail/postfix/post-install-script.patch
new file mode 100644
index 000000000000..350fbf929b74
--- /dev/null
+++ b/pkgs/servers/mail/postfix/post-install-script.patch
@@ -0,0 +1,28 @@
+--- a/conf/post-install	1970-01-01 03:00:01.000000000 +0300
++++ b/conf/post-install	2016-01-20 13:25:18.382233172 +0200
+@@ -254,6 +254,8 @@
+ }
+ 
+ # Bootstrapping problem.
++meta_directory="@PACKAGE@/etc/postfix"
++command_directory="@PACKAGE@/bin"
+ 
+ if [ -n "$command_directory" ]
+ then
+@@ -528,7 +530,16 @@
+ 	    # Skip uninstalled files.
+ 	    case $path in
+ 	    no|no/*) continue;;
++        # Skip immutable files from package, correct permissions provided by Nix.
++        @PACKAGE@/*) continue;
+ 	    esac
++        # Also skip symlinks following to /nix/store
++        if test -L $path; then
++            case "$(readlink $path)" in
++                @NIX_STORE@/*) continue;
++            esac
++        fi
++
+ 	    # Pick up the flags.
+ 	    case $flags in *u*) upgrade_flag=1;; *) upgrade_flag=;; esac
+ 	    case $flags in *c*) create_flag=1;; *) create_flag=;; esac

From 5e8e9647943b94f59f5b9879f834fff46348b15c Mon Sep 17 00:00:00 2001
From: Wander Nauta <info@wandernauta.nl>
Date: Wed, 20 Jan 2016 13:56:09 +0100
Subject: [PATCH 0172/2285] idea.clion: 1.0.4 -> 1.2.4

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

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 932f31d86509..429594440009 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -166,13 +166,13 @@ in
 
   clion = buildClion rec {
     name = "clion-${version}";
-    version = "1.0.4";
-    build = "141.874";
+    version = "1.2.4";
+    build = "143.1186";
     description  = "C/C++ IDE. New. Intelligent. Cross-platform";
     license = stdenv.lib.licenses.unfree;
     src = fetchurl {
       url = "https://download.jetbrains.com/cpp/${name}.tar.gz";
-      sha256 = "1cz59h2znzjy7zncc049f2w30kc89rvmk7l51a1y6ymf9s7cj4cm";
+      sha256 = "0asjgfshbximjk6i57fz3d2ykby5qw5x6nhw91cpzrzszc59dmm2";
     };
   };
 

From 4e75d74aafda6fe26cf479bfc41bf98b3c8990d5 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Jan 2016 11:30:51 +0100
Subject: [PATCH 0173/2285] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20151217-9-geddefc2 using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/4f748814968d78483430954df5f1886a4b363f0c
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/b70bc194eff3a4562927c5d3991497b6263b486c
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/cf055c2754aa9858a857c28595024da1fde9eb14
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/3184791ff4ab56cd3b79b8be1d6271c223a51e37
---
 .../haskell-modules/configuration-lts-0.0.nix |   16 +
 .../haskell-modules/configuration-lts-0.1.nix |   16 +
 .../haskell-modules/configuration-lts-0.2.nix |   16 +
 .../haskell-modules/configuration-lts-0.3.nix |   16 +
 .../haskell-modules/configuration-lts-0.4.nix |   16 +
 .../haskell-modules/configuration-lts-0.5.nix |   16 +
 .../haskell-modules/configuration-lts-0.6.nix |   16 +
 .../haskell-modules/configuration-lts-0.7.nix |   16 +
 .../haskell-modules/configuration-lts-1.0.nix |   16 +
 .../haskell-modules/configuration-lts-1.1.nix |   16 +
 .../configuration-lts-1.10.nix                |   18 +
 .../configuration-lts-1.11.nix                |   18 +
 .../configuration-lts-1.12.nix                |   19 +
 .../configuration-lts-1.13.nix                |   19 +
 .../configuration-lts-1.14.nix                |   20 +
 .../configuration-lts-1.15.nix                |   21 +
 .../haskell-modules/configuration-lts-1.2.nix |   16 +
 .../haskell-modules/configuration-lts-1.4.nix |   16 +
 .../haskell-modules/configuration-lts-1.5.nix |   16 +
 .../haskell-modules/configuration-lts-1.7.nix |   17 +
 .../haskell-modules/configuration-lts-1.8.nix |   17 +
 .../haskell-modules/configuration-lts-1.9.nix |   17 +
 .../haskell-modules/configuration-lts-2.0.nix |   22 +
 .../haskell-modules/configuration-lts-2.1.nix |   23 +
 .../configuration-lts-2.10.nix                |   26 +
 .../configuration-lts-2.11.nix                |   26 +
 .../configuration-lts-2.12.nix                |   26 +
 .../configuration-lts-2.13.nix                |   26 +
 .../configuration-lts-2.14.nix                |   27 +
 .../configuration-lts-2.15.nix                |   27 +
 .../configuration-lts-2.16.nix                |   27 +
 .../configuration-lts-2.17.nix                |   27 +
 .../configuration-lts-2.18.nix                |   27 +
 .../configuration-lts-2.19.nix                |   27 +
 .../haskell-modules/configuration-lts-2.2.nix |   23 +
 .../configuration-lts-2.20.nix                |   28 +
 .../configuration-lts-2.21.nix                |   28 +
 .../configuration-lts-2.22.nix                |   28 +
 .../haskell-modules/configuration-lts-2.3.nix |   23 +
 .../haskell-modules/configuration-lts-2.4.nix |   23 +
 .../haskell-modules/configuration-lts-2.5.nix |   24 +
 .../haskell-modules/configuration-lts-2.6.nix |   24 +
 .../haskell-modules/configuration-lts-2.7.nix |   24 +
 .../haskell-modules/configuration-lts-2.8.nix |   24 +
 .../haskell-modules/configuration-lts-2.9.nix |   25 +
 .../haskell-modules/configuration-lts-3.0.nix |   33 +
 .../haskell-modules/configuration-lts-3.1.nix |   33 +
 .../configuration-lts-3.10.nix                |   41 +
 .../configuration-lts-3.11.nix                |   41 +
 .../configuration-lts-3.12.nix                |   41 +
 .../configuration-lts-3.13.nix                |   41 +
 .../configuration-lts-3.14.nix                |   42 +
 .../configuration-lts-3.15.nix                |   44 +
 .../configuration-lts-3.16.nix                |   44 +
 .../configuration-lts-3.17.nix                |   49 +
 .../configuration-lts-3.18.nix                |   51 +
 .../configuration-lts-3.19.nix                |   52 +
 .../haskell-modules/configuration-lts-3.2.nix |   34 +
 .../configuration-lts-3.20.nix                |   53 +
 .../configuration-lts-3.21.nix                |   53 +
 .../configuration-lts-3.22.nix                |   53 +
 .../haskell-modules/configuration-lts-3.3.nix |   34 +
 .../haskell-modules/configuration-lts-3.4.nix |   34 +
 .../haskell-modules/configuration-lts-3.5.nix |   36 +
 .../haskell-modules/configuration-lts-3.6.nix |   38 +
 .../haskell-modules/configuration-lts-3.7.nix |   40 +
 .../haskell-modules/configuration-lts-3.8.nix |   40 +
 .../haskell-modules/configuration-lts-3.9.nix |   41 +
 .../haskell-modules/configuration-lts-4.0.nix |   78 +
 .../haskell-modules/configuration-lts-4.1.nix |   79 +
 .../haskell-modules/configuration-lts-4.2.nix | 7669 +++++++++++++++++
 .../haskell-modules/hackage-packages.nix      | 2136 ++++-
 72 files changed, 11474 insertions(+), 415 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/configuration-lts-4.2.nix

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index 43a49c4da4ef..2a8c8706126b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -770,6 +770,7 @@ self: super: {
   "PDBtools" = dontDistribute super."PDBtools";
   "PSQueue" = dontDistribute super."PSQueue";
   "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
   "PageIO" = dontDistribute super."PageIO";
   "Paillier" = dontDistribute super."Paillier";
   "PandocAgda" = dontDistribute super."PandocAgda";
@@ -1486,6 +1487,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1787,6 +1790,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -2026,6 +2030,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_1";
@@ -2449,6 +2454,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2615,6 +2621,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2733,8 +2740,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-ghc" = doDistribute super."djinn-ghc_0_0_2_2";
   "djinn-th" = dontDistribute super."djinn-th";
@@ -3707,6 +3716,7 @@ self: super: {
   "graphs" = doDistribute super."graphs_0_5_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_1";
+  "grasp" = dontDistribute super."grasp";
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
@@ -3939,6 +3949,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -5448,6 +5459,7 @@ self: super: {
   "logfloat" = doDistribute super."logfloat_0_12_1";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5701,6 +5713,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5749,6 +5762,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -6228,6 +6242,7 @@ self: super: {
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
   "pager" = dontDistribute super."pager";
+  "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palette" = dontDistribute super."palette";
   "palindromes" = dontDistribute super."palindromes";
@@ -6299,6 +6314,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_1_4";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index 0b06311a9801..f1067b8c532c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -770,6 +770,7 @@ self: super: {
   "PDBtools" = dontDistribute super."PDBtools";
   "PSQueue" = dontDistribute super."PSQueue";
   "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
   "PageIO" = dontDistribute super."PageIO";
   "Paillier" = dontDistribute super."Paillier";
   "PandocAgda" = dontDistribute super."PandocAgda";
@@ -1486,6 +1487,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1787,6 +1790,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -2026,6 +2030,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_1";
@@ -2449,6 +2454,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2615,6 +2621,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2733,8 +2740,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-ghc" = doDistribute super."djinn-ghc_0_0_2_2";
   "djinn-th" = dontDistribute super."djinn-th";
@@ -3707,6 +3716,7 @@ self: super: {
   "graphs" = doDistribute super."graphs_0_5_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_1";
+  "grasp" = dontDistribute super."grasp";
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
@@ -3939,6 +3949,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -5448,6 +5459,7 @@ self: super: {
   "logfloat" = doDistribute super."logfloat_0_12_1";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5701,6 +5713,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5749,6 +5762,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -6228,6 +6242,7 @@ self: super: {
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
   "pager" = dontDistribute super."pager";
+  "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palette" = dontDistribute super."palette";
   "palindromes" = dontDistribute super."palindromes";
@@ -6299,6 +6314,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_1_4";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 1d59562cc850..41cb615271e6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -770,6 +770,7 @@ self: super: {
   "PDBtools" = dontDistribute super."PDBtools";
   "PSQueue" = dontDistribute super."PSQueue";
   "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
   "PageIO" = dontDistribute super."PageIO";
   "Paillier" = dontDistribute super."Paillier";
   "PandocAgda" = dontDistribute super."PandocAgda";
@@ -1486,6 +1487,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1787,6 +1790,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -2026,6 +2030,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_1";
@@ -2449,6 +2454,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2615,6 +2621,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2733,8 +2740,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-ghc" = doDistribute super."djinn-ghc_0_0_2_2";
   "djinn-th" = dontDistribute super."djinn-th";
@@ -3707,6 +3716,7 @@ self: super: {
   "graphs" = doDistribute super."graphs_0_5_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_1";
+  "grasp" = dontDistribute super."grasp";
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
@@ -3939,6 +3949,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -5448,6 +5459,7 @@ self: super: {
   "logfloat" = doDistribute super."logfloat_0_12_1";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5701,6 +5713,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5749,6 +5762,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -6228,6 +6242,7 @@ self: super: {
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
   "pager" = dontDistribute super."pager";
+  "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palette" = dontDistribute super."palette";
   "palindromes" = dontDistribute super."palindromes";
@@ -6299,6 +6314,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_1_4";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index 0cb0c6e68f11..0218ed14429f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -770,6 +770,7 @@ self: super: {
   "PDBtools" = dontDistribute super."PDBtools";
   "PSQueue" = dontDistribute super."PSQueue";
   "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
   "PageIO" = dontDistribute super."PageIO";
   "Paillier" = dontDistribute super."Paillier";
   "PandocAgda" = dontDistribute super."PandocAgda";
@@ -1486,6 +1487,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1787,6 +1790,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -2026,6 +2030,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_1";
@@ -2449,6 +2454,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2615,6 +2621,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2733,8 +2740,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-ghc" = doDistribute super."djinn-ghc_0_0_2_2";
   "djinn-th" = dontDistribute super."djinn-th";
@@ -3707,6 +3716,7 @@ self: super: {
   "graphs" = doDistribute super."graphs_0_5_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_1";
+  "grasp" = dontDistribute super."grasp";
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
@@ -3939,6 +3949,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -5448,6 +5459,7 @@ self: super: {
   "logfloat" = doDistribute super."logfloat_0_12_1";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5701,6 +5713,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5749,6 +5762,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -6228,6 +6242,7 @@ self: super: {
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
   "pager" = dontDistribute super."pager";
+  "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palette" = dontDistribute super."palette";
   "palindromes" = dontDistribute super."palindromes";
@@ -6299,6 +6314,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_1_4";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index 22c6d25ab42c..9f4c43b850d5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -770,6 +770,7 @@ self: super: {
   "PDBtools" = dontDistribute super."PDBtools";
   "PSQueue" = dontDistribute super."PSQueue";
   "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
   "PageIO" = dontDistribute super."PageIO";
   "Paillier" = dontDistribute super."Paillier";
   "PandocAgda" = dontDistribute super."PandocAgda";
@@ -1486,6 +1487,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1787,6 +1790,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -2026,6 +2030,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_1";
@@ -2449,6 +2454,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2614,6 +2620,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2732,8 +2739,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-ghc" = doDistribute super."djinn-ghc_0_0_2_2";
   "djinn-th" = dontDistribute super."djinn-th";
@@ -3706,6 +3715,7 @@ self: super: {
   "graphs" = doDistribute super."graphs_0_5_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_1";
+  "grasp" = dontDistribute super."grasp";
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
@@ -3936,6 +3946,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -5445,6 +5456,7 @@ self: super: {
   "logfloat" = doDistribute super."logfloat_0_12_1";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5698,6 +5710,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5746,6 +5759,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -6225,6 +6239,7 @@ self: super: {
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
   "pager" = dontDistribute super."pager";
+  "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palette" = dontDistribute super."palette";
   "palindromes" = dontDistribute super."palindromes";
@@ -6296,6 +6311,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_1_5";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index 8c2d85f2499d..dc01c1d3197a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -770,6 +770,7 @@ self: super: {
   "PDBtools" = dontDistribute super."PDBtools";
   "PSQueue" = dontDistribute super."PSQueue";
   "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
   "PageIO" = dontDistribute super."PageIO";
   "Paillier" = dontDistribute super."Paillier";
   "PandocAgda" = dontDistribute super."PandocAgda";
@@ -1486,6 +1487,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1787,6 +1790,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -2026,6 +2030,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_1";
@@ -2449,6 +2454,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2614,6 +2620,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2732,8 +2739,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-ghc" = doDistribute super."djinn-ghc_0_0_2_2";
   "djinn-th" = dontDistribute super."djinn-th";
@@ -3706,6 +3715,7 @@ self: super: {
   "graphs" = doDistribute super."graphs_0_5_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_1";
+  "grasp" = dontDistribute super."grasp";
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
@@ -3936,6 +3946,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -5445,6 +5456,7 @@ self: super: {
   "logfloat" = doDistribute super."logfloat_0_12_1";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5698,6 +5710,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5746,6 +5759,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -6225,6 +6239,7 @@ self: super: {
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
   "pager" = dontDistribute super."pager";
+  "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palette" = dontDistribute super."palette";
   "palindromes" = dontDistribute super."palindromes";
@@ -6296,6 +6311,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_1_5";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index 71b640e0c70f..814e9f36a485 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -769,6 +769,7 @@ self: super: {
   "PDBtools" = dontDistribute super."PDBtools";
   "PSQueue" = dontDistribute super."PSQueue";
   "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
   "PageIO" = dontDistribute super."PageIO";
   "Paillier" = dontDistribute super."Paillier";
   "PandocAgda" = dontDistribute super."PandocAgda";
@@ -1483,6 +1484,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1784,6 +1787,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -2023,6 +2027,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_1";
@@ -2446,6 +2451,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2611,6 +2617,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2729,8 +2736,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-ghc" = doDistribute super."djinn-ghc_0_0_2_2";
   "djinn-th" = dontDistribute super."djinn-th";
@@ -3703,6 +3712,7 @@ self: super: {
   "graphs" = doDistribute super."graphs_0_5_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_1";
+  "grasp" = dontDistribute super."grasp";
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
@@ -3933,6 +3943,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -5441,6 +5452,7 @@ self: super: {
   "logfloat" = doDistribute super."logfloat_0_12_1";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5694,6 +5706,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5742,6 +5755,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -6220,6 +6234,7 @@ self: super: {
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
   "pager" = dontDistribute super."pager";
+  "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palette" = dontDistribute super."palette";
   "palindromes" = dontDistribute super."palindromes";
@@ -6291,6 +6306,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_1_5";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index c1ac7b7a6866..99c19cd1cc93 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -769,6 +769,7 @@ self: super: {
   "PDBtools" = dontDistribute super."PDBtools";
   "PSQueue" = dontDistribute super."PSQueue";
   "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
   "PageIO" = dontDistribute super."PageIO";
   "Paillier" = dontDistribute super."Paillier";
   "PandocAgda" = dontDistribute super."PandocAgda";
@@ -1483,6 +1484,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1784,6 +1787,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -2023,6 +2027,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_1";
@@ -2446,6 +2451,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2611,6 +2617,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2729,8 +2736,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-ghc" = doDistribute super."djinn-ghc_0_0_2_2";
   "djinn-th" = dontDistribute super."djinn-th";
@@ -3703,6 +3712,7 @@ self: super: {
   "graphs" = doDistribute super."graphs_0_5_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_1";
+  "grasp" = dontDistribute super."grasp";
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
@@ -3933,6 +3943,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -5441,6 +5452,7 @@ self: super: {
   "logfloat" = doDistribute super."logfloat_0_12_1";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5694,6 +5706,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5742,6 +5755,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -6220,6 +6234,7 @@ self: super: {
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
   "pager" = dontDistribute super."pager";
+  "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palette" = dontDistribute super."palette";
   "palindromes" = dontDistribute super."palindromes";
@@ -6291,6 +6306,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_1_5";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index b6218ae4ab28..8cb57c46e956 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -765,6 +765,7 @@ self: super: {
   "PDBtools" = dontDistribute super."PDBtools";
   "PSQueue" = dontDistribute super."PSQueue";
   "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
   "PageIO" = dontDistribute super."PageIO";
   "Paillier" = dontDistribute super."Paillier";
   "PandocAgda" = dontDistribute super."PandocAgda";
@@ -1479,6 +1480,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1779,6 +1782,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -2016,6 +2020,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_1";
@@ -2437,6 +2442,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2602,6 +2608,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2720,8 +2727,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-ghc" = doDistribute super."djinn-ghc_0_0_2_2";
   "djinn-th" = dontDistribute super."djinn-th";
@@ -3692,6 +3701,7 @@ self: super: {
   "graphs" = doDistribute super."graphs_0_5_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
@@ -3923,6 +3933,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -5429,6 +5440,7 @@ self: super: {
   "logfloat" = doDistribute super."logfloat_0_12_1";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5682,6 +5694,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5730,6 +5743,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -6208,6 +6222,7 @@ self: super: {
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
   "pager" = dontDistribute super."pager";
+  "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palette" = dontDistribute super."palette";
   "palindromes" = dontDistribute super."palindromes";
@@ -6279,6 +6294,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_1_5";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index c86e0ee5569a..f56ea186e054 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -765,6 +765,7 @@ self: super: {
   "PDBtools" = dontDistribute super."PDBtools";
   "PSQueue" = dontDistribute super."PSQueue";
   "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
   "PageIO" = dontDistribute super."PageIO";
   "Paillier" = dontDistribute super."Paillier";
   "PandocAgda" = dontDistribute super."PandocAgda";
@@ -1479,6 +1480,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1779,6 +1782,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -2014,6 +2018,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_1";
@@ -2434,6 +2439,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2599,6 +2605,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2717,8 +2724,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1";
@@ -3688,6 +3697,7 @@ self: super: {
   "graphs" = doDistribute super."graphs_0_5_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
@@ -3918,6 +3928,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -5422,6 +5433,7 @@ self: super: {
   "logfloat" = doDistribute super."logfloat_0_12_1";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5674,6 +5686,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5722,6 +5735,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -6200,6 +6214,7 @@ self: super: {
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
   "pager" = dontDistribute super."pager";
+  "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palette" = dontDistribute super."palette";
   "palindromes" = dontDistribute super."palindromes";
@@ -6271,6 +6286,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_1_5";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index b74623b09d7e..cb5ad00d5519 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -764,6 +764,7 @@ self: super: {
   "PDBtools" = dontDistribute super."PDBtools";
   "PSQueue" = dontDistribute super."PSQueue";
   "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
   "PageIO" = dontDistribute super."PageIO";
   "Paillier" = dontDistribute super."Paillier";
   "PandocAgda" = dontDistribute super."PandocAgda";
@@ -1478,6 +1479,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1778,6 +1781,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -2012,6 +2016,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_1";
@@ -2430,6 +2435,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2595,6 +2601,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2713,8 +2720,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1";
@@ -3679,6 +3688,7 @@ self: super: {
   "graphs" = doDistribute super."graphs_0_5_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
@@ -3908,6 +3918,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4870,6 +4881,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -5404,6 +5416,7 @@ self: super: {
   "logfloat" = doDistribute super."logfloat_0_12_1";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5656,6 +5669,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5704,6 +5718,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -6179,6 +6194,7 @@ self: super: {
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
   "pager" = dontDistribute super."pager";
+  "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palette" = dontDistribute super."palette";
   "palindromes" = dontDistribute super."palindromes";
@@ -6250,6 +6266,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_1_5";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -7964,6 +7981,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index 79ab2e6f67fb..c357d2ab45ff 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -764,6 +764,7 @@ self: super: {
   "PDBtools" = dontDistribute super."PDBtools";
   "PSQueue" = dontDistribute super."PSQueue";
   "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
   "PageIO" = dontDistribute super."PageIO";
   "Paillier" = dontDistribute super."Paillier";
   "PandocAgda" = dontDistribute super."PandocAgda";
@@ -1478,6 +1479,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1778,6 +1781,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -2012,6 +2016,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_1";
@@ -2430,6 +2435,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2595,6 +2601,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2713,8 +2720,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1";
@@ -3678,6 +3687,7 @@ self: super: {
   "graphs" = doDistribute super."graphs_0_5_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
@@ -3907,6 +3917,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4867,6 +4878,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -5400,6 +5412,7 @@ self: super: {
   "logfloat" = doDistribute super."logfloat_0_12_1";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5652,6 +5665,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5700,6 +5714,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -6175,6 +6190,7 @@ self: super: {
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
   "pager" = dontDistribute super."pager";
+  "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palette" = dontDistribute super."palette";
   "palindromes" = dontDistribute super."palindromes";
@@ -6246,6 +6262,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_1_5";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -7960,6 +7977,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index be460c8f810c..cc767290f9d2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -764,6 +764,7 @@ self: super: {
   "PDBtools" = dontDistribute super."PDBtools";
   "PSQueue" = dontDistribute super."PSQueue";
   "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
   "PageIO" = dontDistribute super."PageIO";
   "Paillier" = dontDistribute super."Paillier";
   "PandocAgda" = dontDistribute super."PandocAgda";
@@ -1478,6 +1479,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1778,6 +1781,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -2012,6 +2016,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_1";
@@ -2430,6 +2435,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2595,6 +2601,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2713,8 +2720,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1";
@@ -3678,6 +3687,7 @@ self: super: {
   "graphs" = doDistribute super."graphs_0_5_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
@@ -3907,6 +3917,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4866,6 +4877,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -5399,6 +5411,7 @@ self: super: {
   "logfloat" = doDistribute super."logfloat_0_12_1";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5651,6 +5664,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5699,6 +5713,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -6174,6 +6189,7 @@ self: super: {
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
   "pager" = dontDistribute super."pager";
+  "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palette" = dontDistribute super."palette";
   "palindromes" = dontDistribute super."palindromes";
@@ -6245,6 +6261,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_1_5";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -7505,6 +7522,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7957,6 +7975,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 610bba03009c..326970272ed5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -764,6 +764,7 @@ self: super: {
   "PDBtools" = dontDistribute super."PDBtools";
   "PSQueue" = dontDistribute super."PSQueue";
   "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
   "PageIO" = dontDistribute super."PageIO";
   "Paillier" = dontDistribute super."Paillier";
   "PandocAgda" = dontDistribute super."PandocAgda";
@@ -1478,6 +1479,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1778,6 +1781,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -2012,6 +2016,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_1";
@@ -2430,6 +2435,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2595,6 +2601,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2713,8 +2720,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1";
@@ -3678,6 +3687,7 @@ self: super: {
   "graphs" = doDistribute super."graphs_0_5_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
@@ -3906,6 +3916,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4865,6 +4876,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -5398,6 +5410,7 @@ self: super: {
   "logfloat" = doDistribute super."logfloat_0_12_1";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5650,6 +5663,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5698,6 +5712,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -6173,6 +6188,7 @@ self: super: {
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
   "pager" = dontDistribute super."pager";
+  "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palette" = dontDistribute super."palette";
   "palindromes" = dontDistribute super."palindromes";
@@ -6244,6 +6260,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_1_5";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -7504,6 +7521,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7955,6 +7973,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 2d8fb74ed501..638fadf1dd5f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -763,6 +763,7 @@ self: super: {
   "PDBtools" = dontDistribute super."PDBtools";
   "PSQueue" = dontDistribute super."PSQueue";
   "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
   "PageIO" = dontDistribute super."PageIO";
   "Paillier" = dontDistribute super."Paillier";
   "PandocAgda" = dontDistribute super."PandocAgda";
@@ -1477,6 +1478,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1776,6 +1779,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -2010,6 +2014,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_2";
@@ -2427,6 +2432,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2592,6 +2598,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2710,8 +2717,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -3675,6 +3684,7 @@ self: super: {
   "graphs" = doDistribute super."graphs_0_5_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
@@ -3903,6 +3913,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4861,6 +4872,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -5393,6 +5405,7 @@ self: super: {
   "logfloat" = doDistribute super."logfloat_0_12_1";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5644,6 +5657,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5692,6 +5706,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5714,6 +5729,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6166,6 +6182,7 @@ self: super: {
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
   "pager" = dontDistribute super."pager";
+  "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palette" = dontDistribute super."palette";
   "palindromes" = dontDistribute super."palindromes";
@@ -6237,6 +6254,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_1_5";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -7496,6 +7514,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7947,6 +7966,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index f4f7b038eef7..83c3fb2b83ef 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -763,6 +763,7 @@ self: super: {
   "PDBtools" = dontDistribute super."PDBtools";
   "PSQueue" = dontDistribute super."PSQueue";
   "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
   "PageIO" = dontDistribute super."PageIO";
   "Paillier" = dontDistribute super."Paillier";
   "PandocAgda" = dontDistribute super."PandocAgda";
@@ -1476,6 +1477,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1775,6 +1778,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -2009,6 +2013,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_2";
@@ -2194,6 +2199,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2423,6 +2429,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2588,6 +2595,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2706,8 +2714,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -3670,6 +3680,7 @@ self: super: {
   "graphs" = doDistribute super."graphs_0_5_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
@@ -3898,6 +3909,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4856,6 +4868,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -5388,6 +5401,7 @@ self: super: {
   "logfloat" = doDistribute super."logfloat_0_12_1";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5639,6 +5653,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5687,6 +5702,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5709,6 +5725,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6159,6 +6176,7 @@ self: super: {
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
   "pager" = dontDistribute super."pager";
+  "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palette" = dontDistribute super."palette";
   "palindromes" = dontDistribute super."palindromes";
@@ -6230,6 +6248,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_1_5";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -7487,6 +7506,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7936,6 +7956,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index c386c5791a7a..412075b04f8a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -765,6 +765,7 @@ self: super: {
   "PDBtools" = dontDistribute super."PDBtools";
   "PSQueue" = dontDistribute super."PSQueue";
   "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
   "PageIO" = dontDistribute super."PageIO";
   "Paillier" = dontDistribute super."Paillier";
   "PandocAgda" = dontDistribute super."PandocAgda";
@@ -1479,6 +1480,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1779,6 +1782,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -2014,6 +2018,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_1";
@@ -2432,6 +2437,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2597,6 +2603,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2715,8 +2722,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1";
@@ -3685,6 +3694,7 @@ self: super: {
   "graphs" = doDistribute super."graphs_0_5_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
@@ -3915,6 +3925,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -5419,6 +5430,7 @@ self: super: {
   "logfloat" = doDistribute super."logfloat_0_12_1";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5671,6 +5683,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5719,6 +5732,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -6196,6 +6210,7 @@ self: super: {
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
   "pager" = dontDistribute super."pager";
+  "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palette" = dontDistribute super."palette";
   "palindromes" = dontDistribute super."palindromes";
@@ -6267,6 +6282,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_1_5";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index 883954c95755..e671fefe4b10 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -764,6 +764,7 @@ self: super: {
   "PDBtools" = dontDistribute super."PDBtools";
   "PSQueue" = dontDistribute super."PSQueue";
   "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
   "PageIO" = dontDistribute super."PageIO";
   "Paillier" = dontDistribute super."Paillier";
   "PandocAgda" = dontDistribute super."PandocAgda";
@@ -1478,6 +1479,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1778,6 +1781,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -2013,6 +2017,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_1";
@@ -2431,6 +2436,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2596,6 +2602,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2714,8 +2721,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1";
@@ -3683,6 +3692,7 @@ self: super: {
   "graphs" = doDistribute super."graphs_0_5_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
@@ -3913,6 +3923,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -5416,6 +5427,7 @@ self: super: {
   "logfloat" = doDistribute super."logfloat_0_12_1";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5668,6 +5680,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5716,6 +5729,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -6192,6 +6206,7 @@ self: super: {
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
   "pager" = dontDistribute super."pager";
+  "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palette" = dontDistribute super."palette";
   "palindromes" = dontDistribute super."palindromes";
@@ -6263,6 +6278,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_1_5";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index 8410cc120120..e9a469fd5fb7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -764,6 +764,7 @@ self: super: {
   "PDBtools" = dontDistribute super."PDBtools";
   "PSQueue" = dontDistribute super."PSQueue";
   "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
   "PageIO" = dontDistribute super."PageIO";
   "Paillier" = dontDistribute super."Paillier";
   "PandocAgda" = dontDistribute super."PandocAgda";
@@ -1478,6 +1479,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1778,6 +1781,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -2012,6 +2016,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_1";
@@ -2430,6 +2435,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2595,6 +2601,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2713,8 +2720,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1";
@@ -3682,6 +3691,7 @@ self: super: {
   "graphs" = doDistribute super."graphs_0_5_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
@@ -3912,6 +3922,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -5415,6 +5426,7 @@ self: super: {
   "logfloat" = doDistribute super."logfloat_0_12_1";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5667,6 +5679,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5715,6 +5728,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -6191,6 +6205,7 @@ self: super: {
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
   "pager" = dontDistribute super."pager";
+  "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palette" = dontDistribute super."palette";
   "palindromes" = dontDistribute super."palindromes";
@@ -6262,6 +6277,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_1_5";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index 36c41b867d86..c65c260519ec 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -764,6 +764,7 @@ self: super: {
   "PDBtools" = dontDistribute super."PDBtools";
   "PSQueue" = dontDistribute super."PSQueue";
   "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
   "PageIO" = dontDistribute super."PageIO";
   "Paillier" = dontDistribute super."Paillier";
   "PandocAgda" = dontDistribute super."PandocAgda";
@@ -1478,6 +1479,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1778,6 +1781,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -2012,6 +2016,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_1";
@@ -2430,6 +2435,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2595,6 +2601,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2713,8 +2720,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1";
@@ -3682,6 +3691,7 @@ self: super: {
   "graphs" = doDistribute super."graphs_0_5_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
@@ -3912,6 +3922,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4874,6 +4885,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -5409,6 +5421,7 @@ self: super: {
   "logfloat" = doDistribute super."logfloat_0_12_1";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5661,6 +5674,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5709,6 +5723,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -6185,6 +6200,7 @@ self: super: {
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
   "pager" = dontDistribute super."pager";
+  "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palette" = dontDistribute super."palette";
   "palindromes" = dontDistribute super."palindromes";
@@ -6256,6 +6272,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_1_5";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index 6348ae3020db..44c4bde28313 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -764,6 +764,7 @@ self: super: {
   "PDBtools" = dontDistribute super."PDBtools";
   "PSQueue" = dontDistribute super."PSQueue";
   "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
   "PageIO" = dontDistribute super."PageIO";
   "Paillier" = dontDistribute super."Paillier";
   "PandocAgda" = dontDistribute super."PandocAgda";
@@ -1478,6 +1479,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1778,6 +1781,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -2012,6 +2016,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_1";
@@ -2430,6 +2435,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2595,6 +2601,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2713,8 +2720,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1";
@@ -3680,6 +3689,7 @@ self: super: {
   "graphs" = doDistribute super."graphs_0_5_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
@@ -3909,6 +3919,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4871,6 +4882,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -5405,6 +5417,7 @@ self: super: {
   "logfloat" = doDistribute super."logfloat_0_12_1";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5657,6 +5670,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5705,6 +5719,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -6181,6 +6196,7 @@ self: super: {
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
   "pager" = dontDistribute super."pager";
+  "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palette" = dontDistribute super."palette";
   "palindromes" = dontDistribute super."palindromes";
@@ -6252,6 +6268,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_1_5";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index d8a3baeb71fd..f0995fa0b9b6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -764,6 +764,7 @@ self: super: {
   "PDBtools" = dontDistribute super."PDBtools";
   "PSQueue" = dontDistribute super."PSQueue";
   "PTQ" = dontDistribute super."PTQ";
+  "PUH-Project" = dontDistribute super."PUH-Project";
   "PageIO" = dontDistribute super."PageIO";
   "Paillier" = dontDistribute super."Paillier";
   "PandocAgda" = dontDistribute super."PandocAgda";
@@ -1478,6 +1479,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1778,6 +1781,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -2012,6 +2016,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_1";
@@ -2430,6 +2435,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2595,6 +2601,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2713,8 +2720,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1";
@@ -3679,6 +3688,7 @@ self: super: {
   "graphs" = doDistribute super."graphs_0_5_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
@@ -3908,6 +3918,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4870,6 +4881,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -5404,6 +5416,7 @@ self: super: {
   "logfloat" = doDistribute super."logfloat_0_12_1";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5656,6 +5669,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5704,6 +5718,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -6180,6 +6195,7 @@ self: super: {
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
   "pager" = dontDistribute super."pager";
+  "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palette" = dontDistribute super."palette";
   "palindromes" = dontDistribute super."palindromes";
@@ -6251,6 +6267,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_1_5";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 6fabd0b50d9f..2d9bc2b2a9ed 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -756,6 +756,7 @@ self: super: {
   "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";
@@ -1466,6 +1467,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1763,6 +1766,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1997,6 +2001,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_2";
@@ -2181,6 +2186,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2407,6 +2413,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2572,6 +2579,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2690,8 +2698,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2815,6 +2825,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -3646,8 +3657,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_2";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3875,6 +3888,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4823,6 +4837,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -5348,6 +5363,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5597,6 +5613,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5641,6 +5658,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5662,6 +5680,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6177,6 +6196,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -7427,6 +7447,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7873,6 +7894,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index a960694c520e..830961d13b19 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -756,6 +756,7 @@ self: super: {
   "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";
@@ -1466,6 +1467,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1763,6 +1766,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1996,6 +2000,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_2";
@@ -2180,6 +2185,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2406,6 +2412,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2571,6 +2578,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2689,8 +2697,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2814,6 +2824,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -3645,8 +3656,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_2";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3874,6 +3887,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4075,6 +4089,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = dontDistribute super."hedis";
@@ -4821,6 +4836,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -5346,6 +5362,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5595,6 +5612,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5639,6 +5657,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5660,6 +5679,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6175,6 +6195,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -7425,6 +7446,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7871,6 +7893,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index a27fd4535ee1..78d3935c2dc6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -754,6 +754,7 @@ self: super: {
   "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";
@@ -1459,6 +1460,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1754,6 +1757,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1984,6 +1988,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2167,6 +2172,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2392,6 +2398,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2556,6 +2563,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2674,8 +2682,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2798,6 +2808,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -3436,6 +3447,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_0_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3625,8 +3637,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_2";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3852,6 +3866,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4053,6 +4068,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = dontDistribute super."hedis";
@@ -4794,6 +4810,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -4986,6 +5003,7 @@ self: super: {
   "keycode" = dontDistribute super."keycode";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5314,6 +5332,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5559,6 +5578,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5603,6 +5623,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5624,6 +5645,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6137,6 +6159,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -7380,6 +7403,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7459,6 +7483,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-canvas" = dontDistribute super."static-canvas";
@@ -7818,6 +7843,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 2bc005894d8b..076a684b5a41 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -754,6 +754,7 @@ self: super: {
   "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";
@@ -1458,6 +1459,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1753,6 +1756,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1983,6 +1987,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2166,6 +2171,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2391,6 +2397,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2555,6 +2562,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2673,8 +2681,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2797,6 +2807,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -3434,6 +3445,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_0_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3623,8 +3635,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_2";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3850,6 +3864,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4050,6 +4065,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = dontDistribute super."hedis";
@@ -4791,6 +4807,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -4982,6 +4999,7 @@ self: super: {
   "keycode" = dontDistribute super."keycode";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5310,6 +5328,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5555,6 +5574,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5598,6 +5618,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5619,6 +5640,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6131,6 +6153,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -7373,6 +7396,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7452,6 +7476,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-canvas" = dontDistribute super."static-canvas";
@@ -7809,6 +7834,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index e8bb7cb15839..32166166218c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -754,6 +754,7 @@ self: super: {
   "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";
@@ -1458,6 +1459,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1753,6 +1756,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1983,6 +1987,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2166,6 +2171,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2391,6 +2397,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2555,6 +2562,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2673,8 +2681,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2797,6 +2807,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -3434,6 +3445,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_0_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3623,8 +3635,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_2";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3850,6 +3864,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4050,6 +4065,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = dontDistribute super."hedis";
@@ -4791,6 +4807,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -4982,6 +4999,7 @@ self: super: {
   "keycode" = dontDistribute super."keycode";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5310,6 +5328,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5555,6 +5574,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5598,6 +5618,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5619,6 +5640,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6131,6 +6153,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -7372,6 +7395,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7451,6 +7475,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-canvas" = dontDistribute super."static-canvas";
@@ -7808,6 +7833,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index 6391bc0180e9..979e2b294023 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -754,6 +754,7 @@ self: super: {
   "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";
@@ -1458,6 +1459,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1753,6 +1756,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1983,6 +1987,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2166,6 +2171,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2391,6 +2397,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2555,6 +2562,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2673,8 +2681,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2797,6 +2807,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -3434,6 +3445,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_0_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3623,8 +3635,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_2";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3849,6 +3863,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4049,6 +4064,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = dontDistribute super."hedis";
@@ -4789,6 +4805,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -4980,6 +4997,7 @@ self: super: {
   "keycode" = dontDistribute super."keycode";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5308,6 +5326,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5553,6 +5572,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5596,6 +5616,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5617,6 +5638,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6128,6 +6150,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -7369,6 +7392,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7448,6 +7472,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-canvas" = dontDistribute super."static-canvas";
@@ -7805,6 +7830,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 19f39ecba303..7dff9d190cec 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -754,6 +754,7 @@ self: super: {
   "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";
@@ -1457,6 +1458,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1752,6 +1755,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1982,6 +1986,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2165,6 +2170,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2390,6 +2396,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2554,6 +2561,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2672,8 +2680,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2796,6 +2806,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -3432,6 +3443,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_0_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3621,8 +3633,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_2";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3847,6 +3861,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4047,6 +4062,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = dontDistribute super."hedis";
@@ -4786,6 +4802,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -4977,6 +4994,7 @@ self: super: {
   "keycode" = dontDistribute super."keycode";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5305,6 +5323,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5550,6 +5569,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5593,6 +5613,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5614,6 +5635,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6125,6 +6147,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -6437,6 +6460,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -7364,6 +7388,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7443,6 +7468,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-canvas" = dontDistribute super."static-canvas";
@@ -7800,6 +7826,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index 9efae29b78d6..77d9589a617e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -754,6 +754,7 @@ self: super: {
   "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";
@@ -1457,6 +1458,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1752,6 +1755,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1982,6 +1986,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2165,6 +2170,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2390,6 +2396,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2554,6 +2561,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2672,8 +2680,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_2_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2796,6 +2806,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -3431,6 +3442,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_0_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3620,8 +3632,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_2";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3846,6 +3860,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4046,6 +4061,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = dontDistribute super."hedis";
@@ -4785,6 +4801,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -4976,6 +4993,7 @@ self: super: {
   "keycode" = dontDistribute super."keycode";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5304,6 +5322,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5549,6 +5568,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5591,6 +5611,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5612,6 +5633,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6121,6 +6143,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -6433,6 +6456,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -7360,6 +7384,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7438,6 +7463,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-canvas" = dontDistribute super."static-canvas";
@@ -7795,6 +7821,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index 51e0764f82f0..20567d640db6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -753,6 +753,7 @@ self: super: {
   "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";
@@ -1456,6 +1457,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1751,6 +1754,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1981,6 +1985,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2163,6 +2168,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2387,6 +2393,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2551,6 +2558,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2668,8 +2676,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_2_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2792,6 +2802,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -3426,6 +3437,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_0_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3615,8 +3627,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_2";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3841,6 +3855,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4041,6 +4056,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = dontDistribute super."hedis";
@@ -4780,6 +4796,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -4971,6 +4988,7 @@ self: super: {
   "keycode" = dontDistribute super."keycode";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5298,6 +5316,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5543,6 +5562,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5585,6 +5605,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5606,6 +5627,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6115,6 +6137,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -6427,6 +6450,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -7354,6 +7378,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7432,6 +7457,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-canvas" = dontDistribute super."static-canvas";
@@ -7789,6 +7815,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index 4ab2085f1bc7..b92c1dc329c9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -753,6 +753,7 @@ self: super: {
   "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";
@@ -1455,6 +1456,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1749,6 +1752,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1979,6 +1983,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2161,6 +2166,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2385,6 +2391,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2549,6 +2556,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2666,8 +2674,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_2_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2790,6 +2800,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -3421,6 +3432,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_0_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3610,8 +3622,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_2";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3836,6 +3850,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4036,6 +4051,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = dontDistribute super."hedis";
@@ -4775,6 +4791,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -4966,6 +4983,7 @@ self: super: {
   "keycode" = dontDistribute super."keycode";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5293,6 +5311,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5538,6 +5557,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5580,6 +5600,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5601,6 +5622,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6109,6 +6131,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -6421,6 +6444,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -7348,6 +7372,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7426,6 +7451,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-canvas" = dontDistribute super."static-canvas";
@@ -7783,6 +7809,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index 71ad819477a1..5b647aa5c277 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -753,6 +753,7 @@ self: super: {
   "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";
@@ -1455,6 +1456,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1749,6 +1752,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1978,6 +1982,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2160,6 +2165,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2384,6 +2390,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2548,6 +2555,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2665,8 +2673,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_2_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2788,6 +2798,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -3419,6 +3430,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_0_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3608,8 +3620,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_2";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3834,6 +3848,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4034,6 +4049,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = dontDistribute super."hedis";
@@ -4772,6 +4788,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -4963,6 +4980,7 @@ self: super: {
   "keycode" = dontDistribute super."keycode";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5290,6 +5308,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5535,6 +5554,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5577,6 +5597,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5598,6 +5619,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6105,6 +6127,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -6416,6 +6439,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -7343,6 +7367,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7421,6 +7446,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-canvas" = dontDistribute super."static-canvas";
@@ -7777,6 +7803,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index 80547ee44ab8..c8efa4b3274d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -753,6 +753,7 @@ self: super: {
   "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";
@@ -1455,6 +1456,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1749,6 +1752,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1978,6 +1982,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2160,6 +2165,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2384,6 +2390,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2548,6 +2555,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2665,8 +2673,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_2_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2788,6 +2798,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -3418,6 +3429,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_0_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3607,8 +3619,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_2";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3833,6 +3847,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4033,6 +4048,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = dontDistribute super."hedis";
@@ -4771,6 +4787,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -4962,6 +4979,7 @@ self: super: {
   "keycode" = dontDistribute super."keycode";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5289,6 +5307,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5533,6 +5552,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5575,6 +5595,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5596,6 +5617,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6102,6 +6124,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -6413,6 +6436,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -7338,6 +7362,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7416,6 +7441,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-canvas" = dontDistribute super."static-canvas";
@@ -7772,6 +7798,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index f465fc7d0e07..44559155c4fa 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -756,6 +756,7 @@ self: super: {
   "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";
@@ -1465,6 +1466,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1762,6 +1765,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1993,6 +1997,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_2";
@@ -2177,6 +2182,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2403,6 +2409,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2568,6 +2575,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2686,8 +2694,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2811,6 +2821,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -3642,8 +3653,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_2";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3871,6 +3884,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4072,6 +4086,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = dontDistribute super."hedis";
@@ -4818,6 +4833,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -5343,6 +5359,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5592,6 +5609,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5636,6 +5654,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5657,6 +5676,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6172,6 +6192,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -7422,6 +7443,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7868,6 +7890,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index 4564473ba135..bb4eaf6d3b16 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -753,6 +753,7 @@ self: super: {
   "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";
@@ -1455,6 +1456,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1749,6 +1752,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1978,6 +1982,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2159,6 +2164,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2383,6 +2389,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2547,6 +2554,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2664,8 +2672,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_2_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2787,6 +2797,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -3417,6 +3428,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_0_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3606,8 +3618,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_2";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3832,6 +3846,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3847,6 +3862,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -4031,6 +4047,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = dontDistribute super."hedis";
@@ -4769,6 +4786,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -4960,6 +4978,7 @@ self: super: {
   "keycode" = dontDistribute super."keycode";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5287,6 +5306,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = doDistribute super."logging-facade_0_0_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5531,6 +5551,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5573,6 +5594,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5594,6 +5616,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6100,6 +6123,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -6410,6 +6434,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -7334,6 +7359,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7412,6 +7438,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-canvas" = dontDistribute super."static-canvas";
@@ -7768,6 +7795,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index 22d82a721f20..40fcb7593629 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -753,6 +753,7 @@ self: super: {
   "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";
@@ -1455,6 +1456,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1749,6 +1752,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1978,6 +1982,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2159,6 +2164,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2383,6 +2389,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2547,6 +2554,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2664,8 +2672,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_2_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2787,6 +2797,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -3417,6 +3428,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_0_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3606,8 +3618,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_2";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3832,6 +3846,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3847,6 +3862,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -4031,6 +4047,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = dontDistribute super."hedis";
@@ -4769,6 +4786,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -4960,6 +4978,7 @@ self: super: {
   "keycode" = dontDistribute super."keycode";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5286,6 +5305,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = doDistribute super."logging-facade_0_0_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5530,6 +5550,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5572,6 +5593,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5593,6 +5615,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6099,6 +6122,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -6408,6 +6432,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -7332,6 +7357,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7410,6 +7436,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-canvas" = dontDistribute super."static-canvas";
@@ -7766,6 +7793,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 2d29666323aa..5763ddb1702c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -753,6 +753,7 @@ self: super: {
   "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";
@@ -1455,6 +1456,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1749,6 +1752,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1978,6 +1982,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2159,6 +2164,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2383,6 +2389,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2547,6 +2554,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2664,8 +2672,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_2_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2787,6 +2797,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -3417,6 +3428,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_0_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3606,8 +3618,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_2";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3832,6 +3846,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3847,6 +3862,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -4031,6 +4047,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = dontDistribute super."hedis";
@@ -4768,6 +4785,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -4959,6 +4977,7 @@ self: super: {
   "keycode" = dontDistribute super."keycode";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5285,6 +5304,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = doDistribute super."logging-facade_0_0_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5529,6 +5549,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5570,6 +5591,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5591,6 +5613,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6097,6 +6120,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -6406,6 +6430,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -7330,6 +7355,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7408,6 +7434,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-canvas" = dontDistribute super."static-canvas";
@@ -7764,6 +7791,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index 9ce164f18aea..9c7903faf60d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -756,6 +756,7 @@ self: super: {
   "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";
@@ -1465,6 +1466,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1762,6 +1765,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1993,6 +1997,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_2";
@@ -2177,6 +2182,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2403,6 +2409,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2568,6 +2575,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2686,8 +2694,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2811,6 +2821,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -3641,8 +3652,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_2";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3870,6 +3883,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4071,6 +4085,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = dontDistribute super."hedis";
@@ -4816,6 +4831,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -5341,6 +5357,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5590,6 +5607,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5634,6 +5652,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5655,6 +5674,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6170,6 +6190,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -7420,6 +7441,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7866,6 +7888,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 9f312a971328..4901f07287b4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -756,6 +756,7 @@ self: super: {
   "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";
@@ -1465,6 +1466,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1761,6 +1764,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1992,6 +1996,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_2";
@@ -2176,6 +2181,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2402,6 +2408,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2567,6 +2574,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2685,8 +2693,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2810,6 +2820,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -3640,8 +3651,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_2";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3869,6 +3882,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4070,6 +4084,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = dontDistribute super."hedis";
@@ -4815,6 +4830,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -5340,6 +5356,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5588,6 +5605,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5632,6 +5650,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5653,6 +5672,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6167,6 +6187,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -7415,6 +7436,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7861,6 +7883,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 72c3763423fe..bec45042667e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -756,6 +756,7 @@ self: super: {
   "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";
@@ -1465,6 +1466,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1761,6 +1764,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1992,6 +1996,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_2";
@@ -2176,6 +2181,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2401,6 +2407,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2566,6 +2573,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2684,8 +2692,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2809,6 +2819,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -3639,8 +3650,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_2";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3868,6 +3881,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4069,6 +4083,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = dontDistribute super."hedis";
@@ -4814,6 +4829,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -5338,6 +5354,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5586,6 +5603,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5630,6 +5648,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5651,6 +5670,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6165,6 +6185,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -7413,6 +7434,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7497,6 +7519,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-canvas" = dontDistribute super."static-canvas";
@@ -7858,6 +7881,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index 6a7f7dbb61cf..06260ce1f5a0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -756,6 +756,7 @@ self: super: {
   "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";
@@ -1463,6 +1464,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1758,6 +1761,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1989,6 +1993,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2173,6 +2178,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2398,6 +2404,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2563,6 +2570,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2681,8 +2689,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2806,6 +2816,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -3636,8 +3647,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_2";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3863,6 +3876,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4064,6 +4078,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = dontDistribute super."hedis";
@@ -4809,6 +4824,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -5333,6 +5349,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5581,6 +5598,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5625,6 +5643,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5646,6 +5665,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6159,6 +6179,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -7407,6 +7428,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7491,6 +7513,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-canvas" = dontDistribute super."static-canvas";
@@ -7852,6 +7875,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 75470676e94e..9fcd55709abe 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -755,6 +755,7 @@ self: super: {
   "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";
@@ -1462,6 +1463,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1757,6 +1760,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1988,6 +1992,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2172,6 +2177,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2397,6 +2403,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2562,6 +2569,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2680,8 +2688,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2805,6 +2815,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -3635,8 +3646,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_2";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3862,6 +3875,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4063,6 +4077,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = dontDistribute super."hedis";
@@ -4808,6 +4823,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -5332,6 +5348,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5580,6 +5597,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5624,6 +5642,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5645,6 +5664,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6158,6 +6178,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -7406,6 +7427,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7490,6 +7512,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-canvas" = dontDistribute super."static-canvas";
@@ -7851,6 +7874,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index 2c63de232a5a..a72697868af9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -754,6 +754,7 @@ self: super: {
   "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";
@@ -1461,6 +1462,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1756,6 +1759,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1987,6 +1991,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2171,6 +2176,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2396,6 +2402,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2561,6 +2568,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2679,8 +2687,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2804,6 +2814,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -3633,8 +3644,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_2";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3860,6 +3873,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4061,6 +4075,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = dontDistribute super."hedis";
@@ -4805,6 +4820,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -5329,6 +5345,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5577,6 +5594,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5621,6 +5639,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5642,6 +5661,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6155,6 +6175,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -7401,6 +7422,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7483,6 +7505,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-canvas" = dontDistribute super."static-canvas";
@@ -7844,6 +7867,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index ecaa05257910..c7ccb98a93d4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -754,6 +754,7 @@ self: super: {
   "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";
@@ -1459,6 +1460,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1754,6 +1757,7 @@ self: super: {
   "bowntz" = dontDistribute super."bowntz";
   "boxes" = dontDistribute super."boxes";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck" = dontDistribute super."brainfuck";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
@@ -1984,6 +1988,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2168,6 +2173,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2393,6 +2399,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2558,6 +2565,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2676,8 +2684,10 @@ self: super: {
   "distributed-static" = doDistribute super."distributed-static_0_3_1_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2800,6 +2810,7 @@ self: super: {
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
   "editor-open" = dontDistribute super."editor-open";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -3438,6 +3449,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_0_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3627,8 +3639,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = doDistribute super."graphviz_2999_17_0_2";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3854,6 +3868,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -4055,6 +4070,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = dontDistribute super."hedis";
@@ -4797,6 +4813,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = dontDistribute super."invariant";
@@ -5320,6 +5337,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
+  "logging-effect" = dontDistribute super."logging-effect";
   "logging-facade" = dontDistribute super."logging-facade";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
@@ -5567,6 +5585,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5611,6 +5630,7 @@ self: super: {
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-peel" = dontDistribute super."monad-peel";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = dontDistribute super."monad-skeleton";
@@ -5632,6 +5652,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -6145,6 +6166,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = dontDistribute super."path";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -7390,6 +7412,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7470,6 +7493,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-canvas" = dontDistribute super."static-canvas";
@@ -7829,6 +7853,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index e81f80f76ff5..ee02f8d43031 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -740,6 +740,7 @@ self: super: {
   "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";
@@ -1413,6 +1414,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1466,6 +1469,7 @@ self: super: {
   "barrie" = dontDistribute super."barrie";
   "barrier" = dontDistribute super."barrier";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
@@ -1537,6 +1541,7 @@ self: super: {
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1691,6 +1696,7 @@ self: super: {
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
   "break" = dontDistribute super."break";
@@ -1914,6 +1920,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2091,6 +2098,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2216,6 +2224,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2311,6 +2320,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2471,6 +2481,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2581,8 +2592,10 @@ self: super: {
   "distributed-static" = dontDistribute super."distributed-static";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2701,6 +2714,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2747,6 +2761,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -3242,6 +3257,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
   "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3";
@@ -3314,6 +3330,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3501,8 +3518,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3722,6 +3741,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3737,6 +3757,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3919,6 +3940,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = doDistribute super."hedis_0_6_9";
@@ -4636,6 +4658,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2";
@@ -4820,6 +4843,7 @@ self: super: {
   "keycode" = doDistribute super."keycode_0_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5127,6 +5151,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -5361,6 +5386,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5400,6 +5426,7 @@ self: super: {
   "monad-parallel" = doDistribute super."monad-parallel_0_7_1_4";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
@@ -5419,6 +5446,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -5912,6 +5940,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = doDistribute super."path_0_5_2";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -6212,6 +6241,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -7124,6 +7154,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7195,6 +7226,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -7545,6 +7577,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index 63c55b1c0239..d89afbb71781 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -740,6 +740,7 @@ self: super: {
   "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";
@@ -1412,6 +1413,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1465,6 +1468,7 @@ self: super: {
   "barrie" = dontDistribute super."barrie";
   "barrier" = dontDistribute super."barrier";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
@@ -1536,6 +1540,7 @@ self: super: {
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1690,6 +1695,7 @@ self: super: {
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
   "break" = dontDistribute super."break";
@@ -1913,6 +1919,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2090,6 +2097,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2215,6 +2223,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2310,6 +2319,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2470,6 +2480,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2580,8 +2591,10 @@ self: super: {
   "distributed-static" = dontDistribute super."distributed-static";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dlist" = doDistribute super."dlist_0_7_1_1";
@@ -2700,6 +2713,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2746,6 +2760,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -3238,6 +3253,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
   "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3";
@@ -3310,6 +3326,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3497,8 +3514,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3718,6 +3737,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3733,6 +3753,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3915,6 +3936,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = doDistribute super."hedis_0_6_9";
@@ -4632,6 +4654,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2";
@@ -4816,6 +4839,7 @@ self: super: {
   "keycode" = doDistribute super."keycode_0_1";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5123,6 +5147,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -5356,6 +5381,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5395,6 +5421,7 @@ self: super: {
   "monad-parallel" = doDistribute super."monad-parallel_0_7_1_4";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
@@ -5414,6 +5441,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -5906,6 +5934,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = doDistribute super."path_0_5_2";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -6205,6 +6234,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -7116,6 +7146,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7187,6 +7218,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -7537,6 +7569,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index 2e42946cd2ad..8e44f5c8a359 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -733,6 +733,7 @@ self: super: {
   "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";
@@ -1102,6 +1103,7 @@ self: super: {
   "addLicenseInfo" = dontDistribute super."addLicenseInfo";
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
+  "adjunctions" = doDistribute super."adjunctions_4_2_2";
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
@@ -1397,6 +1399,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1450,6 +1454,7 @@ self: super: {
   "barrie" = dontDistribute super."barrie";
   "barrier" = dontDistribute super."barrier";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
@@ -1521,6 +1526,7 @@ self: super: {
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1672,6 +1678,7 @@ self: super: {
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
   "break" = dontDistribute super."break";
@@ -1891,6 +1898,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2067,6 +2075,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2188,6 +2197,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2283,6 +2293,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2443,6 +2454,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2547,8 +2559,10 @@ self: super: {
   "distributed-static" = dontDistribute super."distributed-static";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dnscache" = dontDistribute super."dnscache";
@@ -2664,6 +2678,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2710,6 +2725,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -2797,6 +2813,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2";
   "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exhaustive" = doDistribute super."exhaustive_1_1_1";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
@@ -2869,6 +2886,7 @@ self: super: {
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_3";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
@@ -2978,6 +2996,7 @@ self: super: {
   "fn-extra" = dontDistribute super."fn-extra";
   "fold-debounce" = dontDistribute super."fold-debounce";
   "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_2";
   "foldl-incremental" = dontDistribute super."foldl-incremental";
   "foldl-transduce" = dontDistribute super."foldl-transduce";
   "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
@@ -3192,6 +3211,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
   "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3";
@@ -3262,6 +3282,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3449,8 +3470,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3669,6 +3692,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3684,6 +3708,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3864,6 +3889,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = doDistribute super."hedis_0_6_9";
@@ -4575,8 +4601,10 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invariant" = doDistribute super."invariant_0_2_2";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-reactive" = dontDistribute super."io-reactive";
@@ -4755,6 +4783,7 @@ self: super: {
   "kevin" = dontDistribute super."kevin";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5059,6 +5088,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -5139,6 +5169,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_1";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -5289,6 +5320,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5327,6 +5359,7 @@ self: super: {
   "monad-ox" = dontDistribute super."monad-ox";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
@@ -5346,6 +5379,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -5831,6 +5865,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = doDistribute super."path_0_5_2";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -6091,6 +6126,7 @@ self: super: {
   "prefork" = dontDistribute super."prefork";
   "pregame" = dontDistribute super."pregame";
   "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2";
   "prelude-generalize" = dontDistribute super."prelude-generalize";
   "prelude-plus" = dontDistribute super."prelude-plus";
   "prelude-prime" = dontDistribute super."prelude-prime";
@@ -6121,6 +6157,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -6694,6 +6731,7 @@ self: super: {
   "selinux" = dontDistribute super."selinux";
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
   "semigroups" = doDistribute super."semigroups_0_16_2_2";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
@@ -7017,6 +7055,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7087,6 +7126,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -7431,6 +7471,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index d80c005eb5d3..e6ffde4d57a9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -733,6 +733,7 @@ self: super: {
   "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";
@@ -1102,6 +1103,7 @@ self: super: {
   "addLicenseInfo" = dontDistribute super."addLicenseInfo";
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
+  "adjunctions" = doDistribute super."adjunctions_4_2_2";
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
@@ -1397,6 +1399,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1450,6 +1454,7 @@ self: super: {
   "barrie" = dontDistribute super."barrie";
   "barrier" = dontDistribute super."barrier";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
@@ -1521,6 +1526,7 @@ self: super: {
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1671,6 +1677,7 @@ self: super: {
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
   "break" = dontDistribute super."break";
@@ -1889,6 +1896,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2065,6 +2073,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2186,6 +2195,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2281,6 +2291,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2441,6 +2452,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2545,8 +2557,10 @@ self: super: {
   "distributed-static" = dontDistribute super."distributed-static";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dnscache" = dontDistribute super."dnscache";
@@ -2662,6 +2676,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2708,6 +2723,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -2795,6 +2811,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2";
   "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -2866,6 +2883,7 @@ self: super: {
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_3";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
@@ -2975,6 +2993,7 @@ self: super: {
   "fn-extra" = dontDistribute super."fn-extra";
   "fold-debounce" = dontDistribute super."fold-debounce";
   "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_2";
   "foldl-incremental" = dontDistribute super."foldl-incremental";
   "foldl-transduce" = dontDistribute super."foldl-transduce";
   "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
@@ -3189,6 +3208,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
   "ghc-vis" = dontDistribute super."ghc-vis";
@@ -3258,6 +3278,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3445,8 +3466,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3665,6 +3688,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3680,6 +3704,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3860,6 +3885,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = doDistribute super."hedis_0_6_9";
@@ -4571,8 +4597,10 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invariant" = doDistribute super."invariant_0_2_2";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-reactive" = dontDistribute super."io-reactive";
@@ -4751,6 +4779,7 @@ self: super: {
   "kevin" = dontDistribute super."kevin";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5055,6 +5084,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -5135,6 +5165,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_1";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -5285,6 +5316,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5323,6 +5355,7 @@ self: super: {
   "monad-ox" = dontDistribute super."monad-ox";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
@@ -5342,6 +5375,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -5827,6 +5861,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = doDistribute super."path_0_5_2";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -6086,6 +6121,7 @@ self: super: {
   "prefork" = dontDistribute super."prefork";
   "pregame" = dontDistribute super."pregame";
   "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2";
   "prelude-generalize" = dontDistribute super."prelude-generalize";
   "prelude-plus" = dontDistribute super."prelude-plus";
   "prelude-prime" = dontDistribute super."prelude-prime";
@@ -6116,6 +6152,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -6688,6 +6725,7 @@ self: super: {
   "selinux" = dontDistribute super."selinux";
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
   "semigroups" = doDistribute super."semigroups_0_16_2_2";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
@@ -7010,6 +7048,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7080,6 +7119,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -7424,6 +7464,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index e0f180cdc612..27573342f040 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -732,6 +732,7 @@ self: super: {
   "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";
@@ -1101,6 +1102,7 @@ self: super: {
   "addLicenseInfo" = dontDistribute super."addLicenseInfo";
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
+  "adjunctions" = doDistribute super."adjunctions_4_2_2";
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
@@ -1396,6 +1398,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1449,6 +1453,7 @@ self: super: {
   "barrie" = dontDistribute super."barrie";
   "barrier" = dontDistribute super."barrier";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
@@ -1520,6 +1525,7 @@ self: super: {
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1670,6 +1676,7 @@ self: super: {
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
   "break" = dontDistribute super."break";
@@ -1888,6 +1895,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "chell-hunit" = dontDistribute super."chell-hunit";
@@ -2060,6 +2068,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2181,6 +2190,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2276,6 +2286,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2436,6 +2447,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2540,8 +2552,10 @@ self: super: {
   "distributed-static" = dontDistribute super."distributed-static";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dnscache" = dontDistribute super."dnscache";
@@ -2657,6 +2671,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2703,6 +2718,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -2790,6 +2806,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2";
   "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -2861,6 +2878,7 @@ self: super: {
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_3";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
@@ -2970,6 +2988,7 @@ self: super: {
   "fn-extra" = dontDistribute super."fn-extra";
   "fold-debounce" = dontDistribute super."fold-debounce";
   "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_2";
   "foldl-incremental" = dontDistribute super."foldl-incremental";
   "foldl-transduce" = dontDistribute super."foldl-transduce";
   "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
@@ -3184,6 +3203,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
   "ghc-vis" = dontDistribute super."ghc-vis";
@@ -3253,6 +3273,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3439,8 +3460,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3659,6 +3682,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3674,6 +3698,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3854,6 +3879,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = doDistribute super."hedis_0_6_9";
@@ -4565,8 +4591,10 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invariant" = doDistribute super."invariant_0_2_2";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-reactive" = dontDistribute super."io-reactive";
@@ -4745,6 +4773,7 @@ self: super: {
   "kevin" = dontDistribute super."kevin";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5049,6 +5078,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -5129,6 +5159,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_1";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -5279,6 +5310,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5317,6 +5349,7 @@ self: super: {
   "monad-ox" = dontDistribute super."monad-ox";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
@@ -5336,6 +5369,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -5821,6 +5855,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = doDistribute super."path_0_5_2";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
   "pathtype" = dontDistribute super."pathtype";
@@ -6079,6 +6114,7 @@ self: super: {
   "prefork" = dontDistribute super."prefork";
   "pregame" = dontDistribute super."pregame";
   "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2";
   "prelude-generalize" = dontDistribute super."prelude-generalize";
   "prelude-plus" = dontDistribute super."prelude-plus";
   "prelude-prime" = dontDistribute super."prelude-prime";
@@ -6109,6 +6145,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -6681,6 +6718,7 @@ self: super: {
   "selinux" = dontDistribute super."selinux";
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
   "semigroups" = doDistribute super."semigroups_0_16_2_2";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
@@ -7003,6 +7041,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7073,6 +7112,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -7415,6 +7455,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index f77465dd8e89..cc0b732e2c5e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -732,6 +732,7 @@ self: super: {
   "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";
@@ -1101,6 +1102,7 @@ self: super: {
   "addLicenseInfo" = dontDistribute super."addLicenseInfo";
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
+  "adjunctions" = doDistribute super."adjunctions_4_2_2";
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
@@ -1396,6 +1398,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1449,6 +1453,7 @@ self: super: {
   "barrie" = dontDistribute super."barrie";
   "barrier" = dontDistribute super."barrier";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
@@ -1520,6 +1525,7 @@ self: super: {
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1670,6 +1676,7 @@ self: super: {
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
   "break" = dontDistribute super."break";
@@ -1888,6 +1895,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "chell-hunit" = dontDistribute super."chell-hunit";
@@ -2060,6 +2068,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2181,6 +2190,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2276,6 +2286,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2436,6 +2447,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2540,8 +2552,10 @@ self: super: {
   "distributed-static" = dontDistribute super."distributed-static";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dnscache" = dontDistribute super."dnscache";
@@ -2657,6 +2671,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2703,6 +2718,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -2790,6 +2806,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2";
   "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -2861,6 +2878,7 @@ self: super: {
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_3";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
@@ -2970,6 +2988,7 @@ self: super: {
   "fn-extra" = dontDistribute super."fn-extra";
   "fold-debounce" = dontDistribute super."fold-debounce";
   "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_2";
   "foldl-incremental" = dontDistribute super."foldl-incremental";
   "foldl-transduce" = dontDistribute super."foldl-transduce";
   "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
@@ -3184,6 +3203,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
   "ghc-vis" = dontDistribute super."ghc-vis";
@@ -3253,6 +3273,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3439,8 +3460,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3659,6 +3682,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3674,6 +3698,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3854,6 +3879,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = doDistribute super."hedis_0_6_9";
@@ -4564,8 +4590,10 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invariant" = doDistribute super."invariant_0_2_2";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-reactive" = dontDistribute super."io-reactive";
@@ -4744,6 +4772,7 @@ self: super: {
   "kevin" = dontDistribute super."kevin";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5047,6 +5076,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -5127,6 +5157,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_1";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -5277,6 +5308,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5315,6 +5347,7 @@ self: super: {
   "monad-ox" = dontDistribute super."monad-ox";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
@@ -5334,6 +5367,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -5819,6 +5853,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = doDistribute super."path_0_5_2";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
   "pathtype" = dontDistribute super."pathtype";
@@ -6076,6 +6111,7 @@ self: super: {
   "prefork" = dontDistribute super."prefork";
   "pregame" = dontDistribute super."pregame";
   "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2";
   "prelude-generalize" = dontDistribute super."prelude-generalize";
   "prelude-plus" = dontDistribute super."prelude-plus";
   "prelude-prime" = dontDistribute super."prelude-prime";
@@ -6106,6 +6142,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -6678,6 +6715,7 @@ self: super: {
   "selinux" = dontDistribute super."selinux";
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
   "semigroups" = doDistribute super."semigroups_0_16_2_2";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
@@ -7000,6 +7038,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7070,6 +7109,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -7411,6 +7451,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index c825eb20d7ce..f73d746cd8c4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -732,6 +732,7 @@ self: super: {
   "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";
@@ -1099,6 +1100,7 @@ self: super: {
   "addLicenseInfo" = dontDistribute super."addLicenseInfo";
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
+  "adjunctions" = doDistribute super."adjunctions_4_2_2";
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
@@ -1394,6 +1396,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1447,6 +1451,7 @@ self: super: {
   "barrie" = dontDistribute super."barrie";
   "barrier" = dontDistribute super."barrier";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
@@ -1518,6 +1523,7 @@ self: super: {
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1668,6 +1674,7 @@ self: super: {
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
   "break" = dontDistribute super."break";
@@ -1885,6 +1892,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "chell-hunit" = dontDistribute super."chell-hunit";
@@ -2057,6 +2065,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2177,6 +2186,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2272,6 +2282,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2432,6 +2443,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2534,8 +2546,10 @@ self: super: {
   "distributed-static" = dontDistribute super."distributed-static";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dnscache" = dontDistribute super."dnscache";
@@ -2650,6 +2664,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2696,6 +2711,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -2783,6 +2799,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2";
   "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -2854,6 +2871,7 @@ self: super: {
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_3";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
@@ -2963,6 +2981,7 @@ self: super: {
   "fn-extra" = dontDistribute super."fn-extra";
   "fold-debounce" = dontDistribute super."fold-debounce";
   "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_2";
   "foldl-incremental" = dontDistribute super."foldl-incremental";
   "foldl-transduce" = dontDistribute super."foldl-transduce";
   "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
@@ -3177,6 +3196,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
   "ghc-vis" = dontDistribute super."ghc-vis";
@@ -3246,6 +3266,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3432,8 +3453,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3652,6 +3675,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3667,6 +3691,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3847,6 +3872,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = doDistribute super."hedis_0_6_9";
@@ -4556,8 +4582,10 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invariant" = doDistribute super."invariant_0_2_2";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-reactive" = dontDistribute super."io-reactive";
@@ -4736,6 +4764,7 @@ self: super: {
   "kevin" = dontDistribute super."kevin";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5039,6 +5068,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -5118,6 +5148,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_1";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -5268,6 +5299,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5306,6 +5338,7 @@ self: super: {
   "monad-ox" = dontDistribute super."monad-ox";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
@@ -5325,6 +5358,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -5809,6 +5843,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = doDistribute super."path_0_5_2";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
   "pathtype" = dontDistribute super."pathtype";
@@ -5912,6 +5947,7 @@ self: super: {
   "pinchot" = dontDistribute super."pinchot";
   "pipe-enumerator" = dontDistribute super."pipe-enumerator";
   "pipeclip" = dontDistribute super."pipeclip";
+  "pipes" = doDistribute super."pipes_4_1_7";
   "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
@@ -6065,6 +6101,7 @@ self: super: {
   "prefork" = dontDistribute super."prefork";
   "pregame" = dontDistribute super."pregame";
   "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2";
   "prelude-generalize" = dontDistribute super."prelude-generalize";
   "prelude-plus" = dontDistribute super."prelude-plus";
   "prelude-prime" = dontDistribute super."prelude-prime";
@@ -6095,6 +6132,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -6667,6 +6705,7 @@ self: super: {
   "selinux" = dontDistribute super."selinux";
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
   "semigroups" = doDistribute super."semigroups_0_16_2_2";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
@@ -6989,6 +7028,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7059,6 +7099,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -7399,6 +7440,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 196ce6307915..5e0af3866c17 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -650,6 +650,7 @@ self: super: {
   "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
   "MonadCompose" = dontDistribute super."MonadCompose";
   "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_1";
   "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
   "MonadStack" = dontDistribute super."MonadStack";
   "Monadius" = dontDistribute super."Monadius";
@@ -731,6 +732,7 @@ self: super: {
   "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";
@@ -1098,6 +1100,7 @@ self: super: {
   "addLicenseInfo" = dontDistribute super."addLicenseInfo";
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
+  "adjunctions" = doDistribute super."adjunctions_4_2_2";
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
@@ -1393,6 +1396,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1446,6 +1451,7 @@ self: super: {
   "barrie" = dontDistribute super."barrie";
   "barrier" = dontDistribute super."barrier";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
@@ -1517,6 +1523,7 @@ self: super: {
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1667,6 +1674,7 @@ self: super: {
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
   "break" = dontDistribute super."break";
@@ -1884,6 +1892,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "chell-hunit" = dontDistribute super."chell-hunit";
@@ -2056,6 +2065,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2176,6 +2186,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2271,6 +2282,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2431,6 +2443,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2533,8 +2546,10 @@ self: super: {
   "distributed-static" = dontDistribute super."distributed-static";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dnscache" = dontDistribute super."dnscache";
@@ -2649,6 +2664,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2695,6 +2711,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -2782,6 +2799,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2";
   "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -2853,6 +2871,7 @@ self: super: {
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_3";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
@@ -2962,6 +2981,7 @@ self: super: {
   "fn-extra" = dontDistribute super."fn-extra";
   "fold-debounce" = dontDistribute super."fold-debounce";
   "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_2";
   "foldl-incremental" = dontDistribute super."foldl-incremental";
   "foldl-transduce" = dontDistribute super."foldl-transduce";
   "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
@@ -3175,6 +3195,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
   "ghc-vis" = dontDistribute super."ghc-vis";
@@ -3244,6 +3265,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3430,8 +3452,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3650,6 +3674,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3665,6 +3690,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3844,6 +3870,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = doDistribute super."hedis_0_6_9";
@@ -4551,8 +4578,10 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invariant" = doDistribute super."invariant_0_2_2";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-reactive" = dontDistribute super."io-reactive";
@@ -4731,6 +4760,7 @@ self: super: {
   "kevin" = dontDistribute super."kevin";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5034,6 +5064,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -5113,6 +5144,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_1";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -5263,6 +5295,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5301,6 +5334,7 @@ self: super: {
   "monad-ox" = dontDistribute super."monad-ox";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
@@ -5320,6 +5354,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -5803,6 +5838,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = doDistribute super."path_0_5_2";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
   "pathtype" = dontDistribute super."pathtype";
@@ -5906,6 +5942,7 @@ self: super: {
   "pinchot" = dontDistribute super."pinchot";
   "pipe-enumerator" = dontDistribute super."pipe-enumerator";
   "pipeclip" = dontDistribute super."pipeclip";
+  "pipes" = doDistribute super."pipes_4_1_7";
   "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
@@ -6059,6 +6096,7 @@ self: super: {
   "prefork" = dontDistribute super."prefork";
   "pregame" = dontDistribute super."pregame";
   "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2";
   "prelude-generalize" = dontDistribute super."prelude-generalize";
   "prelude-plus" = dontDistribute super."prelude-plus";
   "prelude-prime" = dontDistribute super."prelude-prime";
@@ -6089,6 +6127,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -6660,6 +6699,7 @@ self: super: {
   "selinux" = dontDistribute super."selinux";
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
   "semigroups" = doDistribute super."semigroups_0_16_2_2";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
@@ -6981,6 +7021,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7051,6 +7092,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -7387,9 +7429,11 @@ self: super: {
   "th-instances" = dontDistribute super."th-instances";
   "th-kinds" = dontDistribute super."th-kinds";
   "th-kinds-fork" = dontDistribute super."th-kinds-fork";
+  "th-lift" = doDistribute super."th-lift_0_7_5";
   "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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index 61f0822da0d9..e3e3b2ea0200 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -649,6 +649,7 @@ self: super: {
   "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
   "MonadCompose" = dontDistribute super."MonadCompose";
   "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_1";
   "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
   "MonadStack" = dontDistribute super."MonadStack";
   "Monadius" = dontDistribute super."Monadius";
@@ -730,6 +731,7 @@ self: super: {
   "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";
@@ -1097,6 +1099,7 @@ self: super: {
   "addLicenseInfo" = dontDistribute super."addLicenseInfo";
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
+  "adjunctions" = doDistribute super."adjunctions_4_2_2";
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
@@ -1392,6 +1395,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1444,6 +1449,7 @@ self: super: {
   "barrie" = dontDistribute super."barrie";
   "barrier" = dontDistribute super."barrier";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
@@ -1515,6 +1521,7 @@ self: super: {
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1665,6 +1672,7 @@ self: super: {
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
   "break" = dontDistribute super."break";
@@ -1882,6 +1890,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "chell-hunit" = dontDistribute super."chell-hunit";
@@ -2054,6 +2063,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2174,6 +2184,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2269,6 +2280,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2429,6 +2441,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2531,8 +2544,10 @@ self: super: {
   "distributed-static" = dontDistribute super."distributed-static";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dnscache" = dontDistribute super."dnscache";
@@ -2647,6 +2662,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2693,6 +2709,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -2779,6 +2796,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2";
   "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -2850,6 +2868,7 @@ self: super: {
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_3";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
@@ -2959,6 +2978,7 @@ self: super: {
   "fn-extra" = dontDistribute super."fn-extra";
   "fold-debounce" = dontDistribute super."fold-debounce";
   "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_2";
   "foldl-incremental" = dontDistribute super."foldl-incremental";
   "foldl-transduce" = dontDistribute super."foldl-transduce";
   "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
@@ -3172,6 +3192,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
   "ghc-vis" = dontDistribute super."ghc-vis";
@@ -3241,6 +3262,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3427,8 +3449,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3646,6 +3670,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3661,6 +3686,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3840,6 +3866,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = doDistribute super."hedis_0_6_9";
@@ -4547,8 +4574,10 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invariant" = doDistribute super."invariant_0_2_2";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-reactive" = dontDistribute super."io-reactive";
@@ -4727,6 +4756,7 @@ self: super: {
   "kevin" = dontDistribute super."kevin";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5029,6 +5059,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -5108,6 +5139,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_1";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -5257,6 +5289,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5295,6 +5328,7 @@ self: super: {
   "monad-ox" = dontDistribute super."monad-ox";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
@@ -5314,6 +5348,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -5796,6 +5831,7 @@ self: super: {
   "patch-image" = dontDistribute super."patch-image";
   "patches-vector" = dontDistribute super."patches-vector";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
   "pathtype" = dontDistribute super."pathtype";
@@ -5899,6 +5935,7 @@ self: super: {
   "pinchot" = dontDistribute super."pinchot";
   "pipe-enumerator" = dontDistribute super."pipe-enumerator";
   "pipeclip" = dontDistribute super."pipeclip";
+  "pipes" = doDistribute super."pipes_4_1_7";
   "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
@@ -6051,6 +6088,7 @@ self: super: {
   "prefork" = dontDistribute super."prefork";
   "pregame" = dontDistribute super."pregame";
   "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2";
   "prelude-generalize" = dontDistribute super."prelude-generalize";
   "prelude-plus" = dontDistribute super."prelude-plus";
   "prelude-prime" = dontDistribute super."prelude-prime";
@@ -6081,6 +6119,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -6650,6 +6689,7 @@ self: super: {
   "selinux" = dontDistribute super."selinux";
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
   "semigroups" = doDistribute super."semigroups_0_16_2_2";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
@@ -6971,6 +7011,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7041,6 +7082,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -7374,9 +7416,11 @@ self: super: {
   "th-instances" = dontDistribute super."th-instances";
   "th-kinds" = dontDistribute super."th-kinds";
   "th-kinds-fork" = dontDistribute super."th-kinds-fork";
+  "th-lift" = doDistribute super."th-lift_0_7_5";
   "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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index 2fe2d0755b03..11a923340ff2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -648,6 +648,7 @@ self: super: {
   "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
   "MonadCompose" = dontDistribute super."MonadCompose";
   "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_1";
   "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
   "MonadStack" = dontDistribute super."MonadStack";
   "Monadius" = dontDistribute super."Monadius";
@@ -729,6 +730,7 @@ self: super: {
   "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";
@@ -1096,6 +1098,7 @@ self: super: {
   "addLicenseInfo" = dontDistribute super."addLicenseInfo";
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
+  "adjunctions" = doDistribute super."adjunctions_4_2_2";
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
@@ -1390,6 +1393,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1442,6 +1447,7 @@ self: super: {
   "barrie" = dontDistribute super."barrie";
   "barrier" = dontDistribute super."barrier";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
@@ -1513,6 +1519,7 @@ self: super: {
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1663,6 +1670,7 @@ self: super: {
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
   "break" = dontDistribute super."break";
@@ -1701,6 +1709,7 @@ self: super: {
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
+  "bytes" = doDistribute super."bytes_0_15_1";
   "byteset" = dontDistribute super."byteset";
   "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary";
   "bytestring-class" = dontDistribute super."bytestring-class";
@@ -1878,6 +1887,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "chell-hunit" = dontDistribute super."chell-hunit";
@@ -2050,6 +2060,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2169,6 +2180,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2264,6 +2276,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2424,6 +2437,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2442,6 +2456,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_1";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
@@ -2525,8 +2540,10 @@ self: super: {
   "distributed-static" = dontDistribute super."distributed-static";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dnscache" = dontDistribute super."dnscache";
@@ -2641,6 +2658,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2687,6 +2705,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -2773,6 +2792,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2";
   "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -2844,6 +2864,7 @@ self: super: {
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_3";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
@@ -2953,6 +2974,7 @@ self: super: {
   "fn-extra" = dontDistribute super."fn-extra";
   "fold-debounce" = dontDistribute super."fold-debounce";
   "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_2";
   "foldl-incremental" = dontDistribute super."foldl-incremental";
   "foldl-transduce" = dontDistribute super."foldl-transduce";
   "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
@@ -3166,6 +3188,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
   "ghc-vis" = dontDistribute super."ghc-vis";
@@ -3235,6 +3258,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3421,8 +3445,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3639,6 +3665,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3654,6 +3681,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3833,6 +3861,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = doDistribute super."hedis_0_6_9";
@@ -4539,8 +4568,10 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invariant" = doDistribute super."invariant_0_2_2";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-reactive" = dontDistribute super."io-reactive";
@@ -4719,6 +4750,7 @@ self: super: {
   "kevin" = dontDistribute super."kevin";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5020,6 +5052,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -5099,6 +5132,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_1";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -5248,6 +5282,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5286,6 +5321,7 @@ self: super: {
   "monad-ox" = dontDistribute super."monad-ox";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-state" = dontDistribute super."monad-state";
@@ -5304,6 +5340,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -5786,6 +5823,7 @@ self: super: {
   "patch-image" = dontDistribute super."patch-image";
   "patches-vector" = dontDistribute super."patches-vector";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
   "pathtype" = dontDistribute super."pathtype";
@@ -5846,6 +5884,7 @@ self: super: {
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_2";
   "persistent-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-postgresql" = doDistribute super."persistent-postgresql_2_2_1_2";
   "persistent-protobuf" = dontDistribute super."persistent-protobuf";
   "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
   "persistent-redis" = dontDistribute super."persistent-redis";
@@ -5888,6 +5927,7 @@ self: super: {
   "pinchot" = dontDistribute super."pinchot";
   "pipe-enumerator" = dontDistribute super."pipe-enumerator";
   "pipeclip" = dontDistribute super."pipeclip";
+  "pipes" = doDistribute super."pipes_4_1_7";
   "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
@@ -6040,6 +6080,7 @@ self: super: {
   "prefork" = dontDistribute super."prefork";
   "pregame" = dontDistribute super."pregame";
   "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2";
   "prelude-generalize" = dontDistribute super."prelude-generalize";
   "prelude-plus" = dontDistribute super."prelude-plus";
   "prelude-prime" = dontDistribute super."prelude-prime";
@@ -6070,6 +6111,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -6085,6 +6127,7 @@ self: super: {
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
+  "profunctors" = doDistribute super."profunctors_5_1_2";
   "progress" = dontDistribute super."progress";
   "progressbar" = dontDistribute super."progressbar";
   "progression" = dontDistribute super."progression";
@@ -6637,6 +6680,7 @@ self: super: {
   "selinux" = dontDistribute super."selinux";
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
   "semigroups" = doDistribute super."semigroups_0_16_2_2";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
@@ -6958,6 +7002,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7028,6 +7073,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -7361,9 +7407,11 @@ self: super: {
   "th-instances" = dontDistribute super."th-instances";
   "th-kinds" = dontDistribute super."th-kinds";
   "th-kinds-fork" = dontDistribute super."th-kinds-fork";
+  "th-lift" = doDistribute super."th-lift_0_7_5";
   "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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -8107,6 +8155,7 @@ self: super: {
   "yajl-enumerator" = dontDistribute super."yajl-enumerator";
   "yall" = dontDistribute super."yall";
   "yamemo" = dontDistribute super."yamemo";
+  "yaml" = doDistribute super."yaml_0_8_15_2";
   "yaml-config" = dontDistribute super."yaml-config";
   "yaml-light" = dontDistribute super."yaml-light";
   "yaml-light-lens" = dontDistribute super."yaml-light-lens";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index 478bbdcfa283..96cb5ed5517a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -648,6 +648,7 @@ self: super: {
   "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
   "MonadCompose" = dontDistribute super."MonadCompose";
   "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_1";
   "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
   "MonadStack" = dontDistribute super."MonadStack";
   "Monadius" = dontDistribute super."Monadius";
@@ -729,6 +730,7 @@ self: super: {
   "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";
@@ -1096,6 +1098,7 @@ self: super: {
   "addLicenseInfo" = dontDistribute super."addLicenseInfo";
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
+  "adjunctions" = doDistribute super."adjunctions_4_2_2";
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
@@ -1390,6 +1393,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1442,6 +1447,7 @@ self: super: {
   "barrie" = dontDistribute super."barrie";
   "barrier" = dontDistribute super."barrier";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
@@ -1513,6 +1519,7 @@ self: super: {
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1663,6 +1670,7 @@ self: super: {
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
   "break" = dontDistribute super."break";
@@ -1701,6 +1709,7 @@ self: super: {
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
+  "bytes" = doDistribute super."bytes_0_15_1";
   "byteset" = dontDistribute super."byteset";
   "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary";
   "bytestring-class" = dontDistribute super."bytestring-class";
@@ -1877,6 +1886,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "chell-hunit" = dontDistribute super."chell-hunit";
@@ -2049,6 +2059,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2168,6 +2179,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2263,6 +2275,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2423,6 +2436,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2441,6 +2455,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_1";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
@@ -2524,8 +2539,10 @@ self: super: {
   "distributed-static" = dontDistribute super."distributed-static";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dnscache" = dontDistribute super."dnscache";
@@ -2640,6 +2657,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2686,6 +2704,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -2772,6 +2791,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2";
   "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -2843,6 +2863,7 @@ self: super: {
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_3";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
@@ -2952,6 +2973,7 @@ self: super: {
   "fn-extra" = dontDistribute super."fn-extra";
   "fold-debounce" = dontDistribute super."fold-debounce";
   "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_2";
   "foldl-incremental" = dontDistribute super."foldl-incremental";
   "foldl-transduce" = dontDistribute super."foldl-transduce";
   "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
@@ -3165,6 +3187,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
   "ghc-vis" = dontDistribute super."ghc-vis";
@@ -3233,6 +3256,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3418,8 +3442,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3573,6 +3599,7 @@ self: super: {
   "hakyll-elm" = dontDistribute super."hakyll-elm";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
+  "half" = doDistribute super."half_0_2_2_2";
   "halfs" = dontDistribute super."halfs";
   "halipeto" = dontDistribute super."halipeto";
   "halive" = dontDistribute super."halive";
@@ -3634,6 +3661,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3649,6 +3677,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3827,6 +3856,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = doDistribute super."hedis_0_6_9";
@@ -4529,8 +4559,10 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invariant" = doDistribute super."invariant_0_2_2";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-reactive" = dontDistribute super."io-reactive";
@@ -4709,6 +4741,7 @@ self: super: {
   "kevin" = dontDistribute super."kevin";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5010,6 +5043,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -5089,6 +5123,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_1";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -5238,6 +5273,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5276,6 +5312,7 @@ self: super: {
   "monad-ox" = dontDistribute super."monad-ox";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-state" = dontDistribute super."monad-state";
@@ -5294,6 +5331,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -5775,6 +5813,7 @@ self: super: {
   "patch-image" = dontDistribute super."patch-image";
   "patches-vector" = dontDistribute super."patches-vector";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
   "pathtype" = dontDistribute super."pathtype";
@@ -5835,6 +5874,7 @@ self: super: {
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_2";
   "persistent-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-postgresql" = doDistribute super."persistent-postgresql_2_2_1_2";
   "persistent-protobuf" = dontDistribute super."persistent-protobuf";
   "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
   "persistent-redis" = dontDistribute super."persistent-redis";
@@ -5877,6 +5917,7 @@ self: super: {
   "pinchot" = dontDistribute super."pinchot";
   "pipe-enumerator" = dontDistribute super."pipe-enumerator";
   "pipeclip" = dontDistribute super."pipeclip";
+  "pipes" = doDistribute super."pipes_4_1_7";
   "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
@@ -6029,6 +6070,7 @@ self: super: {
   "prefork" = dontDistribute super."prefork";
   "pregame" = dontDistribute super."pregame";
   "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2";
   "prelude-generalize" = dontDistribute super."prelude-generalize";
   "prelude-plus" = dontDistribute super."prelude-plus";
   "prelude-prime" = dontDistribute super."prelude-prime";
@@ -6059,6 +6101,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -6074,6 +6117,7 @@ self: super: {
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
+  "profunctors" = doDistribute super."profunctors_5_1_2";
   "progress" = dontDistribute super."progress";
   "progressbar" = dontDistribute super."progressbar";
   "progression" = dontDistribute super."progression";
@@ -6624,6 +6668,7 @@ self: super: {
   "selinux" = dontDistribute super."selinux";
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
   "semigroups" = doDistribute super."semigroups_0_16_2_2";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
@@ -6944,6 +6989,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7014,6 +7060,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -7346,9 +7393,11 @@ self: super: {
   "th-instances" = dontDistribute super."th-instances";
   "th-kinds" = dontDistribute super."th-kinds";
   "th-kinds-fork" = dontDistribute super."th-kinds-fork";
+  "th-lift" = doDistribute super."th-lift_0_7_5";
   "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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7822,6 +7871,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
+  "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_1_3";
@@ -8090,6 +8140,7 @@ self: super: {
   "yajl-enumerator" = dontDistribute super."yajl-enumerator";
   "yall" = dontDistribute super."yall";
   "yamemo" = dontDistribute super."yamemo";
+  "yaml" = doDistribute super."yaml_0_8_15_2";
   "yaml-config" = dontDistribute super."yaml-config";
   "yaml-light" = dontDistribute super."yaml-light";
   "yaml-light-lens" = dontDistribute super."yaml-light-lens";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index 2aee00860bc5..239263221a6b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -647,6 +647,7 @@ self: super: {
   "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
   "MonadCompose" = dontDistribute super."MonadCompose";
   "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_1";
   "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
   "MonadStack" = dontDistribute super."MonadStack";
   "Monadius" = dontDistribute super."Monadius";
@@ -728,6 +729,7 @@ self: super: {
   "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";
@@ -1095,6 +1097,7 @@ self: super: {
   "addLicenseInfo" = dontDistribute super."addLicenseInfo";
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
+  "adjunctions" = doDistribute super."adjunctions_4_2_2";
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
@@ -1387,6 +1390,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1439,9 +1444,11 @@ self: super: {
   "barrie" = dontDistribute super."barrie";
   "barrier" = dontDistribute super."barrier";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
+  "base-orphans" = doDistribute super."base-orphans_0_4_5";
   "base-prelude" = doDistribute super."base-prelude_0_1_20";
   "base32-bytestring" = dontDistribute super."base32-bytestring";
   "base58-bytestring" = dontDistribute super."base58-bytestring";
@@ -1509,6 +1516,7 @@ self: super: {
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1658,6 +1666,7 @@ self: super: {
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
   "break" = dontDistribute super."break";
@@ -1695,6 +1704,7 @@ self: super: {
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
+  "bytes" = doDistribute super."bytes_0_15_1";
   "byteset" = dontDistribute super."byteset";
   "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary";
   "bytestring-class" = dontDistribute super."bytestring-class";
@@ -1871,6 +1881,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "chell-hunit" = dontDistribute super."chell-hunit";
@@ -2042,6 +2053,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2161,6 +2173,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2256,6 +2269,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2416,6 +2430,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2434,6 +2449,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_1";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
@@ -2517,8 +2533,10 @@ self: super: {
   "distributed-static" = dontDistribute super."distributed-static";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dnscache" = dontDistribute super."dnscache";
@@ -2633,6 +2651,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2679,6 +2698,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -2765,6 +2785,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2";
   "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -2836,6 +2857,7 @@ self: super: {
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_3";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
@@ -2945,6 +2967,7 @@ self: super: {
   "fn-extra" = dontDistribute super."fn-extra";
   "fold-debounce" = dontDistribute super."fold-debounce";
   "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_2";
   "foldl-incremental" = dontDistribute super."foldl-incremental";
   "foldl-transduce" = dontDistribute super."foldl-transduce";
   "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
@@ -3158,6 +3181,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
   "ghc-vis" = dontDistribute super."ghc-vis";
@@ -3226,6 +3250,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3411,8 +3436,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3566,6 +3593,7 @@ self: super: {
   "hakyll-elm" = dontDistribute super."hakyll-elm";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
+  "half" = doDistribute super."half_0_2_2_2";
   "halfs" = dontDistribute super."halfs";
   "halipeto" = dontDistribute super."halipeto";
   "halive" = dontDistribute super."halive";
@@ -3627,6 +3655,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3642,6 +3671,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3820,6 +3850,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = doDistribute super."hedis_0_6_9";
@@ -4519,8 +4550,10 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invariant" = doDistribute super."invariant_0_2_2";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-reactive" = dontDistribute super."io-reactive";
@@ -4698,6 +4731,7 @@ self: super: {
   "kevin" = dontDistribute super."kevin";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -4998,6 +5032,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -5077,6 +5112,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_1";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -5226,6 +5262,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5264,6 +5301,7 @@ self: super: {
   "monad-ox" = dontDistribute super."monad-ox";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-state" = dontDistribute super."monad-state";
@@ -5282,6 +5320,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -5762,6 +5801,7 @@ self: super: {
   "patch-image" = dontDistribute super."patch-image";
   "patches-vector" = dontDistribute super."patches-vector";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
   "pathtype" = dontDistribute super."pathtype";
@@ -5821,6 +5861,7 @@ self: super: {
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_2";
   "persistent-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-postgresql" = doDistribute super."persistent-postgresql_2_2_1_2";
   "persistent-protobuf" = dontDistribute super."persistent-protobuf";
   "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
   "persistent-redis" = dontDistribute super."persistent-redis";
@@ -5863,6 +5904,7 @@ self: super: {
   "pinchot" = dontDistribute super."pinchot";
   "pipe-enumerator" = dontDistribute super."pipe-enumerator";
   "pipeclip" = dontDistribute super."pipeclip";
+  "pipes" = doDistribute super."pipes_4_1_7";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
@@ -6014,6 +6056,7 @@ self: super: {
   "prefork" = dontDistribute super."prefork";
   "pregame" = dontDistribute super."pregame";
   "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2";
   "prelude-generalize" = dontDistribute super."prelude-generalize";
   "prelude-plus" = dontDistribute super."prelude-plus";
   "prelude-prime" = dontDistribute super."prelude-prime";
@@ -6044,6 +6087,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -6059,6 +6103,7 @@ self: super: {
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
+  "profunctors" = doDistribute super."profunctors_5_1_2";
   "progress" = dontDistribute super."progress";
   "progressbar" = dontDistribute super."progressbar";
   "progression" = dontDistribute super."progression";
@@ -6608,6 +6653,7 @@ self: super: {
   "selinux" = dontDistribute super."selinux";
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
   "semigroups" = doDistribute super."semigroups_0_16_2_2";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
@@ -6927,6 +6973,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -6997,6 +7044,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -7329,9 +7377,11 @@ self: super: {
   "th-instances" = dontDistribute super."th-instances";
   "th-kinds" = dontDistribute super."th-kinds";
   "th-kinds-fork" = dontDistribute super."th-kinds-fork";
+  "th-lift" = doDistribute super."th-lift_0_7_5";
   "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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7805,6 +7855,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
+  "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_1_4";
@@ -8072,6 +8123,7 @@ self: super: {
   "yajl-enumerator" = dontDistribute super."yajl-enumerator";
   "yall" = dontDistribute super."yall";
   "yamemo" = dontDistribute super."yamemo";
+  "yaml" = doDistribute super."yaml_0_8_15_2";
   "yaml-config" = dontDistribute super."yaml-config";
   "yaml-light" = dontDistribute super."yaml-light";
   "yaml-light-lens" = dontDistribute super."yaml-light-lens";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index 27ea82620b70..7b68bca8ee47 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -738,6 +738,7 @@ self: super: {
   "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";
@@ -1409,6 +1410,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1462,6 +1465,7 @@ self: super: {
   "barrie" = dontDistribute super."barrie";
   "barrier" = dontDistribute super."barrier";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
@@ -1533,6 +1537,7 @@ self: super: {
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1687,6 +1692,7 @@ self: super: {
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
   "break" = dontDistribute super."break";
@@ -1910,6 +1916,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2087,6 +2094,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2212,6 +2220,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2307,6 +2316,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2467,6 +2477,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2577,8 +2588,10 @@ self: super: {
   "distributed-static" = dontDistribute super."distributed-static";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dns" = doDistribute super."dns_2_0_0";
@@ -2696,6 +2709,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2742,6 +2756,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -3233,6 +3248,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
   "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3";
@@ -3305,6 +3321,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3492,8 +3509,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3713,6 +3732,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3728,6 +3748,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3910,6 +3931,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = doDistribute super."hedis_0_6_9";
@@ -4627,6 +4649,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2";
@@ -4810,6 +4833,7 @@ self: super: {
   "kevin" = dontDistribute super."kevin";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5116,6 +5140,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -5349,6 +5374,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5388,6 +5414,7 @@ self: super: {
   "monad-parallel" = doDistribute super."monad-parallel_0_7_1_4";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
@@ -5407,6 +5434,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -5899,6 +5927,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = doDistribute super."path_0_5_2";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -6197,6 +6226,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -6776,6 +6806,7 @@ self: super: {
   "selinux" = dontDistribute super."selinux";
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
   "semigroups" = doDistribute super."semigroups_0_16_2_2";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
@@ -7104,6 +7135,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7175,6 +7207,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -7524,6 +7557,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index b310053158ea..035d473ea11e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -646,6 +646,7 @@ self: super: {
   "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
   "MonadCompose" = dontDistribute super."MonadCompose";
   "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_1";
   "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
   "MonadStack" = dontDistribute super."MonadStack";
   "Monadius" = dontDistribute super."Monadius";
@@ -727,6 +728,7 @@ self: super: {
   "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";
@@ -875,6 +877,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_2";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1093,6 +1096,7 @@ self: super: {
   "addLicenseInfo" = dontDistribute super."addLicenseInfo";
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
+  "adjunctions" = doDistribute super."adjunctions_4_2_2";
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
@@ -1384,6 +1388,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1436,9 +1442,11 @@ self: super: {
   "barrie" = dontDistribute super."barrie";
   "barrier" = dontDistribute super."barrier";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
+  "base-orphans" = doDistribute super."base-orphans_0_4_5";
   "base-prelude" = doDistribute super."base-prelude_0_1_20";
   "base32-bytestring" = dontDistribute super."base32-bytestring";
   "base58-bytestring" = dontDistribute super."base58-bytestring";
@@ -1505,6 +1513,7 @@ self: super: {
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1654,6 +1663,7 @@ self: super: {
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
   "break" = dontDistribute super."break";
@@ -1691,6 +1701,7 @@ self: super: {
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
+  "bytes" = doDistribute super."bytes_0_15_1";
   "byteset" = dontDistribute super."byteset";
   "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary";
   "bytestring-class" = dontDistribute super."bytestring-class";
@@ -1866,6 +1877,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "chell-hunit" = dontDistribute super."chell-hunit";
@@ -2037,6 +2049,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2156,6 +2169,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2251,6 +2265,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2411,6 +2426,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2429,6 +2445,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_1";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
@@ -2512,8 +2529,10 @@ self: super: {
   "distributed-static" = dontDistribute super."distributed-static";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dnscache" = dontDistribute super."dnscache";
@@ -2628,6 +2647,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2674,6 +2694,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -2760,6 +2781,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2";
   "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -2831,6 +2853,7 @@ self: super: {
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_3";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
@@ -2940,6 +2963,7 @@ self: super: {
   "fn-extra" = dontDistribute super."fn-extra";
   "fold-debounce" = dontDistribute super."fold-debounce";
   "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_2";
   "foldl-incremental" = dontDistribute super."foldl-incremental";
   "foldl-transduce" = dontDistribute super."foldl-transduce";
   "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
@@ -3153,6 +3177,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
   "ghc-vis" = dontDistribute super."ghc-vis";
@@ -3221,6 +3246,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3406,8 +3432,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3561,6 +3589,7 @@ self: super: {
   "hakyll-elm" = dontDistribute super."hakyll-elm";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
+  "half" = doDistribute super."half_0_2_2_2";
   "halfs" = dontDistribute super."halfs";
   "halipeto" = dontDistribute super."halipeto";
   "halive" = dontDistribute super."halive";
@@ -3622,6 +3651,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3637,6 +3667,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3815,6 +3846,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = doDistribute super."hedis_0_6_9";
@@ -4513,8 +4545,10 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invariant" = doDistribute super."invariant_0_2_2";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-reactive" = dontDistribute super."io-reactive";
@@ -4692,6 +4726,7 @@ self: super: {
   "kevin" = dontDistribute super."kevin";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -4991,6 +5026,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -5070,6 +5106,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_1";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -5219,6 +5256,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5257,6 +5295,7 @@ self: super: {
   "monad-ox" = dontDistribute super."monad-ox";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-state" = dontDistribute super."monad-state";
@@ -5275,6 +5314,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -5755,6 +5795,7 @@ self: super: {
   "patch-image" = dontDistribute super."patch-image";
   "patches-vector" = dontDistribute super."patches-vector";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
   "pathtype" = dontDistribute super."pathtype";
@@ -5814,6 +5855,7 @@ self: super: {
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_2";
   "persistent-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-postgresql" = doDistribute super."persistent-postgresql_2_2_1_2";
   "persistent-protobuf" = dontDistribute super."persistent-protobuf";
   "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
   "persistent-redis" = dontDistribute super."persistent-redis";
@@ -5855,6 +5897,7 @@ self: super: {
   "pinchot" = dontDistribute super."pinchot";
   "pipe-enumerator" = dontDistribute super."pipe-enumerator";
   "pipeclip" = dontDistribute super."pipeclip";
+  "pipes" = doDistribute super."pipes_4_1_7";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
@@ -6006,6 +6049,7 @@ self: super: {
   "prefork" = dontDistribute super."prefork";
   "pregame" = dontDistribute super."pregame";
   "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2";
   "prelude-generalize" = dontDistribute super."prelude-generalize";
   "prelude-plus" = dontDistribute super."prelude-plus";
   "prelude-prime" = dontDistribute super."prelude-prime";
@@ -6036,6 +6080,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -6051,6 +6096,7 @@ self: super: {
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
+  "profunctors" = doDistribute super."profunctors_5_1_2";
   "progress" = dontDistribute super."progress";
   "progressbar" = dontDistribute super."progressbar";
   "progression" = dontDistribute super."progression";
@@ -6599,6 +6645,7 @@ self: super: {
   "selinux" = dontDistribute super."selinux";
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
   "semigroups" = doDistribute super."semigroups_0_16_2_2";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
@@ -6918,6 +6965,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -6988,6 +7036,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -7318,9 +7367,11 @@ self: super: {
   "th-instances" = dontDistribute super."th-instances";
   "th-kinds" = dontDistribute super."th-kinds";
   "th-kinds-fork" = dontDistribute super."th-kinds-fork";
+  "th-lift" = doDistribute super."th-lift_0_7_5";
   "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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7794,6 +7845,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
+  "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-app-static" = doDistribute super."wai-app-static_3_1_4";
@@ -8059,6 +8111,7 @@ self: super: {
   "yajl-enumerator" = dontDistribute super."yajl-enumerator";
   "yall" = dontDistribute super."yall";
   "yamemo" = dontDistribute super."yamemo";
+  "yaml" = doDistribute super."yaml_0_8_15_2";
   "yaml-config" = dontDistribute super."yaml-config";
   "yaml-light" = dontDistribute super."yaml-light";
   "yaml-light-lens" = dontDistribute super."yaml-light-lens";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index 24b1a57b29b7..352bcfa78fa5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -645,6 +645,7 @@ self: super: {
   "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
   "MonadCompose" = dontDistribute super."MonadCompose";
   "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_1";
   "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
   "MonadStack" = dontDistribute super."MonadStack";
   "Monadius" = dontDistribute super."Monadius";
@@ -726,6 +727,7 @@ self: super: {
   "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";
@@ -874,6 +876,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_2";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1092,6 +1095,7 @@ self: super: {
   "addLicenseInfo" = dontDistribute super."addLicenseInfo";
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
+  "adjunctions" = doDistribute super."adjunctions_4_2_2";
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
@@ -1383,6 +1387,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1435,9 +1441,11 @@ self: super: {
   "barrie" = dontDistribute super."barrie";
   "barrier" = dontDistribute super."barrier";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
+  "base-orphans" = doDistribute super."base-orphans_0_4_5";
   "base32-bytestring" = dontDistribute super."base32-bytestring";
   "base58-bytestring" = dontDistribute super."base58-bytestring";
   "base58address" = dontDistribute super."base58address";
@@ -1503,6 +1511,7 @@ self: super: {
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1651,6 +1660,7 @@ self: super: {
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
   "break" = dontDistribute super."break";
@@ -1688,6 +1698,7 @@ self: super: {
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
+  "bytes" = doDistribute super."bytes_0_15_1";
   "byteset" = dontDistribute super."byteset";
   "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary";
   "bytestring-class" = dontDistribute super."bytestring-class";
@@ -1863,6 +1874,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "chell-hunit" = dontDistribute super."chell-hunit";
@@ -2033,6 +2045,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2151,6 +2164,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2246,6 +2260,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2406,6 +2421,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2424,6 +2440,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_1";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
@@ -2507,8 +2524,10 @@ self: super: {
   "distributed-static" = dontDistribute super."distributed-static";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dnscache" = dontDistribute super."dnscache";
@@ -2623,6 +2642,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2669,6 +2689,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -2755,6 +2776,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2";
   "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -2824,6 +2846,7 @@ self: super: {
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_3";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
@@ -2933,6 +2956,7 @@ self: super: {
   "fn-extra" = dontDistribute super."fn-extra";
   "fold-debounce" = dontDistribute super."fold-debounce";
   "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_2";
   "foldl-incremental" = dontDistribute super."foldl-incremental";
   "foldl-transduce" = dontDistribute super."foldl-transduce";
   "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
@@ -3146,6 +3170,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
   "ghc-vis" = dontDistribute super."ghc-vis";
@@ -3214,6 +3239,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3399,8 +3425,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3553,6 +3581,7 @@ self: super: {
   "hakyll-elm" = dontDistribute super."hakyll-elm";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
+  "half" = doDistribute super."half_0_2_2_2";
   "halfs" = dontDistribute super."halfs";
   "halipeto" = dontDistribute super."halipeto";
   "halive" = dontDistribute super."halive";
@@ -3614,6 +3643,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3629,6 +3659,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3807,6 +3838,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = doDistribute super."hedis_0_6_9";
@@ -4503,8 +4535,10 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invariant" = doDistribute super."invariant_0_2_2";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-reactive" = dontDistribute super."io-reactive";
@@ -4682,6 +4716,7 @@ self: super: {
   "kevin" = dontDistribute super."kevin";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -4981,6 +5016,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -5060,6 +5096,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_1";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -5209,6 +5246,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5247,6 +5285,7 @@ self: super: {
   "monad-ox" = dontDistribute super."monad-ox";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-state" = dontDistribute super."monad-state";
@@ -5265,6 +5304,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -5743,6 +5783,7 @@ self: super: {
   "patch-image" = dontDistribute super."patch-image";
   "patches-vector" = dontDistribute super."patches-vector";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
   "pathtype" = dontDistribute super."pathtype";
@@ -5802,6 +5843,7 @@ self: super: {
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_2";
   "persistent-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-postgresql" = doDistribute super."persistent-postgresql_2_2_1_2";
   "persistent-protobuf" = dontDistribute super."persistent-protobuf";
   "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
   "persistent-redis" = dontDistribute super."persistent-redis";
@@ -5843,6 +5885,7 @@ self: super: {
   "pinchot" = dontDistribute super."pinchot";
   "pipe-enumerator" = dontDistribute super."pipe-enumerator";
   "pipeclip" = dontDistribute super."pipeclip";
+  "pipes" = doDistribute super."pipes_4_1_7";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
@@ -5993,6 +6036,7 @@ self: super: {
   "prefork" = dontDistribute super."prefork";
   "pregame" = dontDistribute super."pregame";
   "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2";
   "prelude-generalize" = dontDistribute super."prelude-generalize";
   "prelude-plus" = dontDistribute super."prelude-plus";
   "prelude-prime" = dontDistribute super."prelude-prime";
@@ -6023,6 +6067,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -6038,6 +6083,7 @@ self: super: {
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
+  "profunctors" = doDistribute super."profunctors_5_1_2";
   "progress" = dontDistribute super."progress";
   "progressbar" = dontDistribute super."progressbar";
   "progression" = dontDistribute super."progression";
@@ -6583,6 +6629,7 @@ self: super: {
   "selinux" = dontDistribute super."selinux";
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
   "semigroups" = doDistribute super."semigroups_0_16_2_2";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
@@ -6893,6 +6940,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -6963,6 +7011,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -7293,9 +7342,11 @@ self: super: {
   "th-instances" = dontDistribute super."th-instances";
   "th-kinds" = dontDistribute super."th-kinds";
   "th-kinds-fork" = dontDistribute super."th-kinds-fork";
+  "th-lift" = doDistribute super."th-lift_0_7_5";
   "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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7768,6 +7819,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
+  "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-devel" = dontDistribute super."wai-devel";
@@ -8028,6 +8080,7 @@ self: super: {
   "yajl-enumerator" = dontDistribute super."yajl-enumerator";
   "yall" = dontDistribute super."yall";
   "yamemo" = dontDistribute super."yamemo";
+  "yaml" = doDistribute super."yaml_0_8_15_2";
   "yaml-config" = dontDistribute super."yaml-config";
   "yaml-light" = dontDistribute super."yaml-light";
   "yaml-light-lens" = dontDistribute super."yaml-light-lens";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
index 43b306a20fe9..8c03b3e2a578 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -645,6 +645,7 @@ self: super: {
   "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
   "MonadCompose" = dontDistribute super."MonadCompose";
   "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_1";
   "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
   "MonadStack" = dontDistribute super."MonadStack";
   "Monadius" = dontDistribute super."Monadius";
@@ -726,6 +727,7 @@ self: super: {
   "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";
@@ -874,6 +876,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_2";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1092,6 +1095,7 @@ self: super: {
   "addLicenseInfo" = dontDistribute super."addLicenseInfo";
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
+  "adjunctions" = doDistribute super."adjunctions_4_2_2";
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
@@ -1383,6 +1387,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1435,9 +1441,11 @@ self: super: {
   "barrie" = dontDistribute super."barrie";
   "barrier" = dontDistribute super."barrier";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
+  "base-orphans" = doDistribute super."base-orphans_0_4_5";
   "base32-bytestring" = dontDistribute super."base32-bytestring";
   "base58-bytestring" = dontDistribute super."base58-bytestring";
   "base58address" = dontDistribute super."base58address";
@@ -1503,6 +1511,7 @@ self: super: {
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1651,6 +1660,7 @@ self: super: {
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
   "break" = dontDistribute super."break";
@@ -1688,6 +1698,7 @@ self: super: {
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
+  "bytes" = doDistribute super."bytes_0_15_1";
   "byteset" = dontDistribute super."byteset";
   "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary";
   "bytestring-class" = dontDistribute super."bytestring-class";
@@ -1863,6 +1874,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "chell-hunit" = dontDistribute super."chell-hunit";
@@ -2033,6 +2045,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2151,6 +2164,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2246,6 +2260,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2406,6 +2421,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2424,6 +2440,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_1";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
@@ -2507,8 +2524,10 @@ self: super: {
   "distributed-static" = dontDistribute super."distributed-static";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dnscache" = dontDistribute super."dnscache";
@@ -2623,6 +2642,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2669,6 +2689,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -2755,6 +2776,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2";
   "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -2823,6 +2845,7 @@ self: super: {
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_3";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
@@ -2931,6 +2954,7 @@ self: super: {
   "fn-extra" = dontDistribute super."fn-extra";
   "fold-debounce" = dontDistribute super."fold-debounce";
   "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_2";
   "foldl-incremental" = dontDistribute super."foldl-incremental";
   "foldl-transduce" = dontDistribute super."foldl-transduce";
   "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
@@ -3144,6 +3168,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
   "ghc-vis" = dontDistribute super."ghc-vis";
@@ -3212,6 +3237,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3397,8 +3423,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3551,6 +3579,7 @@ self: super: {
   "hakyll-elm" = dontDistribute super."hakyll-elm";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
+  "half" = doDistribute super."half_0_2_2_2";
   "halfs" = dontDistribute super."halfs";
   "halipeto" = dontDistribute super."halipeto";
   "halive" = dontDistribute super."halive";
@@ -3612,6 +3641,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3627,6 +3657,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3805,6 +3836,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis-config" = dontDistribute super."hedis-config";
@@ -4498,8 +4530,10 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invariant" = doDistribute super."invariant_0_2_2";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-reactive" = dontDistribute super."io-reactive";
@@ -4676,6 +4710,7 @@ self: super: {
   "kevin" = dontDistribute super."kevin";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -4975,6 +5010,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -5054,6 +5090,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_1";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -5203,6 +5240,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5241,6 +5279,7 @@ self: super: {
   "monad-ox" = dontDistribute super."monad-ox";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-state" = dontDistribute super."monad-state";
@@ -5259,6 +5298,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -5737,6 +5777,7 @@ self: super: {
   "patch-image" = dontDistribute super."patch-image";
   "patches-vector" = dontDistribute super."patches-vector";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
   "pathtype" = dontDistribute super."pathtype";
@@ -5796,6 +5837,7 @@ self: super: {
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-mysql" = doDistribute super."persistent-mysql_2_2";
   "persistent-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-postgresql" = doDistribute super."persistent-postgresql_2_2_1_2";
   "persistent-protobuf" = dontDistribute super."persistent-protobuf";
   "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
   "persistent-redis" = dontDistribute super."persistent-redis";
@@ -5837,6 +5879,7 @@ self: super: {
   "pinchot" = dontDistribute super."pinchot";
   "pipe-enumerator" = dontDistribute super."pipe-enumerator";
   "pipeclip" = dontDistribute super."pipeclip";
+  "pipes" = doDistribute super."pipes_4_1_7";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
@@ -5987,6 +6030,7 @@ self: super: {
   "prefork" = dontDistribute super."prefork";
   "pregame" = dontDistribute super."pregame";
   "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2";
   "prelude-generalize" = dontDistribute super."prelude-generalize";
   "prelude-plus" = dontDistribute super."prelude-plus";
   "prelude-prime" = dontDistribute super."prelude-prime";
@@ -6017,6 +6061,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -6032,6 +6077,7 @@ self: super: {
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
+  "profunctors" = doDistribute super."profunctors_5_1_2";
   "progress" = dontDistribute super."progress";
   "progressbar" = dontDistribute super."progressbar";
   "progression" = dontDistribute super."progression";
@@ -6577,6 +6623,7 @@ self: super: {
   "selinux" = dontDistribute super."selinux";
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
   "semigroups" = doDistribute super."semigroups_0_16_2_2";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
@@ -6887,6 +6934,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -6957,6 +7005,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -7287,9 +7336,11 @@ self: super: {
   "th-instances" = dontDistribute super."th-instances";
   "th-kinds" = dontDistribute super."th-kinds";
   "th-kinds-fork" = dontDistribute super."th-kinds-fork";
+  "th-lift" = doDistribute super."th-lift_0_7_5";
   "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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7762,6 +7813,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
+  "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-devel" = dontDistribute super."wai-devel";
@@ -8022,6 +8074,7 @@ self: super: {
   "yajl-enumerator" = dontDistribute super."yajl-enumerator";
   "yall" = dontDistribute super."yall";
   "yamemo" = dontDistribute super."yamemo";
+  "yaml" = doDistribute super."yaml_0_8_15_2";
   "yaml-config" = dontDistribute super."yaml-config";
   "yaml-light" = dontDistribute super."yaml-light";
   "yaml-light-lens" = dontDistribute super."yaml-light-lens";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index 285564af2495..bfbb6f30347f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -738,6 +738,7 @@ self: super: {
   "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";
@@ -1408,6 +1409,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1461,6 +1464,7 @@ self: super: {
   "barrie" = dontDistribute super."barrie";
   "barrier" = dontDistribute super."barrier";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
@@ -1532,6 +1536,7 @@ self: super: {
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1686,6 +1691,7 @@ self: super: {
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
   "break" = dontDistribute super."break";
@@ -1909,6 +1915,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2085,6 +2092,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2208,6 +2216,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2303,6 +2312,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2463,6 +2473,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2573,8 +2584,10 @@ self: super: {
   "distributed-static" = dontDistribute super."distributed-static";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dns" = doDistribute super."dns_2_0_0";
@@ -2692,6 +2705,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2738,6 +2752,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -3228,6 +3243,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
   "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3";
@@ -3300,6 +3316,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3487,8 +3504,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3708,6 +3727,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3723,6 +3743,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3905,6 +3926,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = doDistribute super."hedis_0_6_9";
@@ -4620,6 +4642,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2";
@@ -4803,6 +4826,7 @@ self: super: {
   "kevin" = dontDistribute super."kevin";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5109,6 +5133,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -5342,6 +5367,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5381,6 +5407,7 @@ self: super: {
   "monad-parallel" = doDistribute super."monad-parallel_0_7_1_4";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
@@ -5400,6 +5427,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -5892,6 +5920,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = doDistribute super."path_0_5_2";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -6190,6 +6219,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -6768,6 +6798,7 @@ self: super: {
   "selinux" = dontDistribute super."selinux";
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
   "semigroups" = doDistribute super."semigroups_0_16_2_2";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
@@ -7095,6 +7126,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7166,6 +7198,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -7514,6 +7547,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index eccead0048d6..aa7539f857e2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -738,6 +738,7 @@ self: super: {
   "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";
@@ -1408,6 +1409,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1461,6 +1464,7 @@ self: super: {
   "barrie" = dontDistribute super."barrie";
   "barrier" = dontDistribute super."barrier";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
@@ -1532,6 +1536,7 @@ self: super: {
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1686,6 +1691,7 @@ self: super: {
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
   "break" = dontDistribute super."break";
@@ -1908,6 +1914,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2084,6 +2091,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2207,6 +2215,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2302,6 +2311,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2462,6 +2472,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2572,8 +2583,10 @@ self: super: {
   "distributed-static" = dontDistribute super."distributed-static";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dns" = doDistribute super."dns_2_0_0";
@@ -2691,6 +2704,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2737,6 +2751,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -3227,6 +3242,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
   "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3";
@@ -3299,6 +3315,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3486,8 +3503,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3707,6 +3726,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3722,6 +3742,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3904,6 +3925,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = doDistribute super."hedis_0_6_9";
@@ -4619,6 +4641,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2";
@@ -4802,6 +4825,7 @@ self: super: {
   "kevin" = dontDistribute super."kevin";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5108,6 +5132,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -5341,6 +5366,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5380,6 +5406,7 @@ self: super: {
   "monad-parallel" = doDistribute super."monad-parallel_0_7_1_4";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
@@ -5399,6 +5426,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -5891,6 +5919,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = doDistribute super."path_0_5_2";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -6189,6 +6218,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -6766,6 +6796,7 @@ self: super: {
   "selinux" = dontDistribute super."selinux";
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
   "semigroups" = doDistribute super."semigroups_0_16_2_2";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
@@ -7093,6 +7124,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7163,6 +7195,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -7511,6 +7544,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index 46addfdb0a8a..eeac482e3aba 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -738,6 +738,7 @@ self: super: {
   "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";
@@ -1407,6 +1408,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1460,6 +1463,7 @@ self: super: {
   "barrie" = dontDistribute super."barrie";
   "barrier" = dontDistribute super."barrier";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
@@ -1531,6 +1535,7 @@ self: super: {
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1685,6 +1690,7 @@ self: super: {
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
   "break" = dontDistribute super."break";
@@ -1906,6 +1912,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2082,6 +2089,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2204,6 +2212,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2299,6 +2308,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2459,6 +2469,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2569,8 +2580,10 @@ self: super: {
   "distributed-static" = dontDistribute super."distributed-static";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dns" = doDistribute super."dns_2_0_0";
@@ -2688,6 +2701,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2734,6 +2748,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -2896,6 +2911,7 @@ self: super: {
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_3";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
@@ -3222,6 +3238,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
   "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3";
@@ -3294,6 +3311,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3481,8 +3499,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3702,6 +3722,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3717,6 +3738,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3898,6 +3920,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = doDistribute super."hedis_0_6_9";
@@ -4609,6 +4632,7 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
   "invariant" = doDistribute super."invariant_0_2";
@@ -4792,6 +4816,7 @@ self: super: {
   "kevin" = dontDistribute super."kevin";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5098,6 +5123,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -5331,6 +5357,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5370,6 +5397,7 @@ self: super: {
   "monad-parallel" = doDistribute super."monad-parallel_0_7_1_4";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
@@ -5389,6 +5417,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -5879,6 +5908,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = doDistribute super."path_0_5_2";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -6142,6 +6172,7 @@ self: super: {
   "prefork" = dontDistribute super."prefork";
   "pregame" = dontDistribute super."pregame";
   "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2";
   "prelude-generalize" = dontDistribute super."prelude-generalize";
   "prelude-plus" = dontDistribute super."prelude-plus";
   "prelude-prime" = dontDistribute super."prelude-prime";
@@ -6174,6 +6205,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -6751,6 +6783,7 @@ self: super: {
   "selinux" = dontDistribute super."selinux";
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
   "semigroups" = doDistribute super."semigroups_0_16_2_2";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
@@ -7078,6 +7111,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7148,6 +7182,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -7493,6 +7528,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index 9e490a7387c7..8d96df619323 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -738,6 +738,7 @@ self: super: {
   "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";
@@ -1107,6 +1108,7 @@ self: super: {
   "addLicenseInfo" = dontDistribute super."addLicenseInfo";
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
+  "adjunctions" = doDistribute super."adjunctions_4_2_2";
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
@@ -1406,6 +1408,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1459,6 +1463,7 @@ self: super: {
   "barrie" = dontDistribute super."barrie";
   "barrier" = dontDistribute super."barrier";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
@@ -1530,6 +1535,7 @@ self: super: {
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1684,6 +1690,7 @@ self: super: {
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
   "break" = dontDistribute super."break";
@@ -1905,6 +1912,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2081,6 +2089,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2203,6 +2212,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2298,6 +2308,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2458,6 +2469,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2568,8 +2580,10 @@ self: super: {
   "distributed-static" = dontDistribute super."distributed-static";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dns" = doDistribute super."dns_2_0_0";
@@ -2687,6 +2701,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2733,6 +2748,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -2895,6 +2911,7 @@ self: super: {
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_3";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
@@ -3220,6 +3237,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
   "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3";
@@ -3290,6 +3308,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3477,8 +3496,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3698,6 +3719,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3713,6 +3735,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3894,6 +3917,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = doDistribute super."hedis_0_6_9";
@@ -4605,8 +4629,10 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invariant" = doDistribute super."invariant_0_2_2";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-reactive" = dontDistribute super."io-reactive";
@@ -4786,6 +4812,7 @@ self: super: {
   "kevin" = dontDistribute super."kevin";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5090,6 +5117,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -5323,6 +5351,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5362,6 +5391,7 @@ self: super: {
   "monad-parallel" = doDistribute super."monad-parallel_0_7_1_4";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
@@ -5381,6 +5411,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -5870,6 +5901,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = doDistribute super."path_0_5_2";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -6132,6 +6164,7 @@ self: super: {
   "prefork" = dontDistribute super."prefork";
   "pregame" = dontDistribute super."pregame";
   "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2";
   "prelude-generalize" = dontDistribute super."prelude-generalize";
   "prelude-plus" = dontDistribute super."prelude-plus";
   "prelude-prime" = dontDistribute super."prelude-prime";
@@ -6164,6 +6197,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -6741,6 +6775,7 @@ self: super: {
   "selinux" = dontDistribute super."selinux";
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
   "semigroups" = doDistribute super."semigroups_0_16_2_2";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
@@ -7068,6 +7103,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7138,6 +7174,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -7483,6 +7520,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 4dea3fcf33ac..89e35e6dee11 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -738,6 +738,7 @@ self: super: {
   "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";
@@ -1107,6 +1108,7 @@ self: super: {
   "addLicenseInfo" = dontDistribute super."addLicenseInfo";
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
+  "adjunctions" = doDistribute super."adjunctions_4_2_2";
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
@@ -1403,6 +1405,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1456,6 +1460,7 @@ self: super: {
   "barrie" = dontDistribute super."barrie";
   "barrier" = dontDistribute super."barrier";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
@@ -1527,6 +1532,7 @@ self: super: {
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1681,6 +1687,7 @@ self: super: {
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
   "break" = dontDistribute super."break";
@@ -1902,6 +1909,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2078,6 +2086,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2199,6 +2208,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2294,6 +2304,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2454,6 +2465,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2563,8 +2575,10 @@ self: super: {
   "distributed-static" = dontDistribute super."distributed-static";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dns" = doDistribute super."dns_2_0_0";
@@ -2682,6 +2696,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2728,6 +2743,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -2890,6 +2906,7 @@ self: super: {
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_3";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
@@ -3000,6 +3017,7 @@ self: super: {
   "fn-extra" = dontDistribute super."fn-extra";
   "fold-debounce" = dontDistribute super."fold-debounce";
   "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_2";
   "foldl-incremental" = dontDistribute super."foldl-incremental";
   "foldl-transduce" = dontDistribute super."foldl-transduce";
   "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
@@ -3214,6 +3232,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
   "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3";
@@ -3284,6 +3303,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3471,8 +3491,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3692,6 +3714,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3707,6 +3730,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3887,6 +3911,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = doDistribute super."hedis_0_6_9";
@@ -4598,8 +4623,10 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invariant" = doDistribute super."invariant_0_2_2";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-reactive" = dontDistribute super."io-reactive";
@@ -4778,6 +4805,7 @@ self: super: {
   "kevin" = dontDistribute super."kevin";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5082,6 +5110,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -5163,6 +5192,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_1";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -5314,6 +5344,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5353,6 +5384,7 @@ self: super: {
   "monad-parallel" = doDistribute super."monad-parallel_0_7_1_4";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
@@ -5372,6 +5404,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -5860,6 +5893,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = doDistribute super."path_0_5_2";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -6121,6 +6155,7 @@ self: super: {
   "prefork" = dontDistribute super."prefork";
   "pregame" = dontDistribute super."pregame";
   "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2";
   "prelude-generalize" = dontDistribute super."prelude-generalize";
   "prelude-plus" = dontDistribute super."prelude-plus";
   "prelude-prime" = dontDistribute super."prelude-prime";
@@ -6152,6 +6187,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -6727,6 +6763,7 @@ self: super: {
   "selinux" = dontDistribute super."selinux";
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
   "semigroups" = doDistribute super."semigroups_0_16_2_2";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
@@ -7052,6 +7089,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7122,6 +7160,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -7467,6 +7506,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 150196e22deb..da171791ef4a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -738,6 +738,7 @@ self: super: {
   "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";
@@ -1107,6 +1108,7 @@ self: super: {
   "addLicenseInfo" = dontDistribute super."addLicenseInfo";
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
+  "adjunctions" = doDistribute super."adjunctions_4_2_2";
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
@@ -1403,6 +1405,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1456,6 +1460,7 @@ self: super: {
   "barrie" = dontDistribute super."barrie";
   "barrier" = dontDistribute super."barrier";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
@@ -1527,6 +1532,7 @@ self: super: {
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1679,6 +1685,7 @@ self: super: {
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
   "break" = dontDistribute super."break";
@@ -1899,6 +1906,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2075,6 +2083,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2196,6 +2205,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2291,6 +2301,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2451,6 +2462,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2555,8 +2567,10 @@ self: super: {
   "distributed-static" = dontDistribute super."distributed-static";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dns" = doDistribute super."dns_2_0_0";
@@ -2674,6 +2688,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2720,6 +2735,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -2882,6 +2898,7 @@ self: super: {
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_3";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
@@ -2992,6 +3009,7 @@ self: super: {
   "fn-extra" = dontDistribute super."fn-extra";
   "fold-debounce" = dontDistribute super."fold-debounce";
   "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_2";
   "foldl-incremental" = dontDistribute super."foldl-incremental";
   "foldl-transduce" = dontDistribute super."foldl-transduce";
   "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
@@ -3206,6 +3224,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
   "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3";
@@ -3276,6 +3295,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3463,8 +3483,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3684,6 +3706,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3699,6 +3722,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3879,6 +3903,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = doDistribute super."hedis_0_6_9";
@@ -4590,8 +4615,10 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invariant" = doDistribute super."invariant_0_2_2";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-reactive" = dontDistribute super."io-reactive";
@@ -4770,6 +4797,7 @@ self: super: {
   "kevin" = dontDistribute super."kevin";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5074,6 +5102,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -5154,6 +5183,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_1";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -5304,6 +5334,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5343,6 +5374,7 @@ self: super: {
   "monad-parallel" = doDistribute super."monad-parallel_0_7_1_4";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
@@ -5362,6 +5394,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -5850,6 +5883,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = doDistribute super."path_0_5_2";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -6110,6 +6144,7 @@ self: super: {
   "prefork" = dontDistribute super."prefork";
   "pregame" = dontDistribute super."pregame";
   "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2";
   "prelude-generalize" = dontDistribute super."prelude-generalize";
   "prelude-plus" = dontDistribute super."prelude-plus";
   "prelude-prime" = dontDistribute super."prelude-prime";
@@ -6141,6 +6176,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -6714,6 +6750,7 @@ self: super: {
   "selinux" = dontDistribute super."selinux";
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
   "semigroups" = doDistribute super."semigroups_0_16_2_2";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
@@ -7039,6 +7076,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7109,6 +7147,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -7453,6 +7492,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 6cfc9e6a4dc7..099aa3d78b29 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -736,6 +736,7 @@ self: super: {
   "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";
@@ -1105,6 +1106,7 @@ self: super: {
   "addLicenseInfo" = dontDistribute super."addLicenseInfo";
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
+  "adjunctions" = doDistribute super."adjunctions_4_2_2";
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
@@ -1401,6 +1403,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1454,6 +1458,7 @@ self: super: {
   "barrie" = dontDistribute super."barrie";
   "barrier" = dontDistribute super."barrier";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
@@ -1525,6 +1530,7 @@ self: super: {
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1676,6 +1682,7 @@ self: super: {
   "boundingboxes" = dontDistribute super."boundingboxes";
   "bowntz" = dontDistribute super."bowntz";
   "bpann" = dontDistribute super."bpann";
+  "braid" = dontDistribute super."braid";
   "brainfuck-monad" = dontDistribute super."brainfuck-monad";
   "brainfuck-tut" = dontDistribute super."brainfuck-tut";
   "break" = dontDistribute super."break";
@@ -1895,6 +1902,7 @@ self: super: {
   "chatty-text" = dontDistribute super."chatty-text";
   "chatty-utils" = dontDistribute super."chatty-utils";
   "cheapskate" = dontDistribute super."cheapskate";
+  "cheapskate-terminal" = dontDistribute super."cheapskate-terminal";
   "check-pvp" = dontDistribute super."check-pvp";
   "checked" = dontDistribute super."checked";
   "checkers" = doDistribute super."checkers_0_4_3";
@@ -2071,6 +2079,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "condor" = dontDistribute super."condor";
@@ -2192,6 +2201,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2287,6 +2297,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2447,6 +2458,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2551,8 +2563,10 @@ self: super: {
   "distributed-static" = dontDistribute super."distributed-static";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = dontDistribute super."diversity";
   "dixi" = dontDistribute super."dixi";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dns" = doDistribute super."dns_2_0_0";
@@ -2669,6 +2683,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2715,6 +2730,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -2804,6 +2820,7 @@ self: super: {
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2";
   "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exhaustive" = doDistribute super."exhaustive_1_1_1";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
@@ -2876,6 +2893,7 @@ self: super: {
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_3";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
@@ -2985,6 +3003,7 @@ self: super: {
   "fn-extra" = dontDistribute super."fn-extra";
   "fold-debounce" = dontDistribute super."fold-debounce";
   "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_2";
   "foldl-incremental" = dontDistribute super."foldl-incremental";
   "foldl-transduce" = dontDistribute super."foldl-transduce";
   "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
@@ -3199,6 +3218,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
   "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3";
@@ -3269,6 +3289,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3456,8 +3477,10 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
   "graphviz" = dontDistribute super."graphviz";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3677,6 +3700,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3692,6 +3716,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashable-time" = dontDistribute super."hashable-time";
   "hashabler" = dontDistribute super."hashabler";
@@ -3872,6 +3897,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = doDistribute super."hedis_0_6_9";
@@ -4583,8 +4609,10 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invariant" = doDistribute super."invariant_0_2_2";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-reactive" = dontDistribute super."io-reactive";
@@ -4763,6 +4791,7 @@ self: super: {
   "kevin" = dontDistribute super."kevin";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -5067,6 +5096,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -5147,6 +5177,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_1";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -5297,6 +5328,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -5336,6 +5368,7 @@ self: super: {
   "monad-parallel" = doDistribute super."monad-parallel_0_7_1_4";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-skeleton" = doDistribute super."monad-skeleton_0_1_2_1";
@@ -5355,6 +5388,7 @@ self: super: {
   "monadbi" = dontDistribute super."monadbi";
   "monadcryptorandom" = doDistribute super."monadcryptorandom_0_6_1";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -5842,6 +5876,7 @@ self: super: {
   "patches-vector" = dontDistribute super."patches-vector";
   "path" = doDistribute super."path_0_5_2";
   "path-extra" = dontDistribute super."path-extra";
+  "path-io" = dontDistribute super."path-io";
   "path-pieces" = doDistribute super."path-pieces_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
@@ -6102,6 +6137,7 @@ self: super: {
   "prefork" = dontDistribute super."prefork";
   "pregame" = dontDistribute super."pregame";
   "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2";
   "prelude-generalize" = dontDistribute super."prelude-generalize";
   "prelude-plus" = dontDistribute super."prelude-plus";
   "prelude-prime" = dontDistribute super."prelude-prime";
@@ -6133,6 +6169,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -6706,6 +6743,7 @@ self: super: {
   "selinux" = dontDistribute super."selinux";
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
   "semigroups" = doDistribute super."semigroups_0_16_2_2";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
@@ -7031,6 +7069,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "speedy-slice" = dontDistribute super."speedy-slice";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
@@ -7101,6 +7140,7 @@ self: super: {
   "stateWriter" = dontDistribute super."stateWriter";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -7445,6 +7485,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-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index dcc4f2a695c1..304758bad52e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -627,6 +627,7 @@ self: super: {
   "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
   "MonadCompose" = dontDistribute super."MonadCompose";
   "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_1";
   "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
   "MonadStack" = dontDistribute super."MonadStack";
   "Monadius" = dontDistribute super."Monadius";
@@ -707,6 +708,7 @@ self: super: {
   "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";
@@ -852,6 +854,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_2";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1064,9 +1067,11 @@ self: super: {
   "addLicenseInfo" = dontDistribute super."addLicenseInfo";
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
+  "adjunctions" = doDistribute super."adjunctions_4_2_2";
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson" = doDistribute super."aeson_0_10_0_0";
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-diff" = dontDistribute super."aeson-diff";
@@ -1284,6 +1289,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1334,8 +1341,10 @@ self: super: {
   "barley" = dontDistribute super."barley";
   "barrie" = dontDistribute super."barrie";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
+  "base-orphans" = doDistribute super."base-orphans_0_4_5";
   "base32-bytestring" = dontDistribute super."base32-bytestring";
   "base58-bytestring" = dontDistribute super."base58-bytestring";
   "base58address" = dontDistribute super."base58address";
@@ -1377,6 +1386,7 @@ self: super: {
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
+  "bifunctors" = doDistribute super."bifunctors_5_1";
   "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
@@ -1384,6 +1394,7 @@ self: super: {
   "billeksah-main-static" = dontDistribute super."billeksah-main-static";
   "billeksah-pane" = dontDistribute super."billeksah-pane";
   "billeksah-services" = dontDistribute super."billeksah-services";
+  "bimap" = doDistribute super."bimap_0_3_0";
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
@@ -1395,6 +1406,7 @@ self: super: {
   "binary-literal-qq" = dontDistribute super."binary-literal-qq";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1534,6 +1546,7 @@ self: super: {
   "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";
@@ -1571,6 +1584,7 @@ self: super: {
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
+  "bytes" = doDistribute super."bytes_0_15_1";
   "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary";
   "bytestring-class" = dontDistribute super."bytestring-class";
   "bytestring-csv" = dontDistribute super."bytestring-csv";
@@ -1599,6 +1613,7 @@ self: super: {
   "cabal-cargs" = dontDistribute super."cabal-cargs";
   "cabal-constraints" = dontDistribute super."cabal-constraints";
   "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-debian" = doDistribute super."cabal-debian_4_31_9";
   "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
   "cabal-dev" = dontDistribute super."cabal-dev";
   "cabal-dir" = dontDistribute super."cabal-dir";
@@ -1738,6 +1753,7 @@ self: super: {
   "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";
@@ -1898,6 +1914,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "cond" = dontDistribute super."cond";
@@ -1931,6 +1948,7 @@ self: super: {
   "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
   "constrained-categories" = dontDistribute super."constrained-categories";
   "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraints" = doDistribute super."constraints_0_6";
   "constructible" = dontDistribute super."constructible";
   "constructive-algebra" = dontDistribute super."constructive-algebra";
   "consumers" = dontDistribute super."consumers";
@@ -2010,6 +2028,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2099,6 +2118,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2253,6 +2273,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2271,6 +2292,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_1";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
@@ -2347,8 +2369,10 @@ self: super: {
   "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = doDistribute super."diversity_0_7_1_1";
   "dixi" = doDistribute super."dixi_0_6_0_2";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dnscache" = dontDistribute super."dnscache";
@@ -2459,6 +2483,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2501,6 +2526,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -2584,6 +2610,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-mtl" = dontDistribute super."exception-mtl";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2";
   "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -2650,6 +2677,7 @@ self: super: {
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_3";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
@@ -2754,6 +2782,7 @@ self: super: {
   "fmark" = dontDistribute super."fmark";
   "fold-debounce" = dontDistribute super."fold-debounce";
   "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_2";
   "foldl-incremental" = dontDistribute super."foldl-incremental";
   "foldl-transduce" = dontDistribute super."foldl-transduce";
   "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
@@ -2956,6 +2985,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-vis" = dontDistribute super."ghc-vis";
   "ghci-diagrams" = dontDistribute super."ghci-diagrams";
@@ -3018,6 +3048,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3202,7 +3233,9 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3352,6 +3385,7 @@ self: super: {
   "hakyll-elm" = dontDistribute super."hakyll-elm";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
+  "half" = doDistribute super."half_0_2_2_2";
   "halfs" = dontDistribute super."halfs";
   "halipeto" = dontDistribute super."halipeto";
   "halive" = dontDistribute super."halive";
@@ -3408,6 +3442,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3422,6 +3457,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
@@ -3596,6 +3632,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis" = doDistribute super."hedis_0_6_9";
@@ -3975,12 +4012,16 @@ self: super: {
   "hsparklines" = dontDistribute super."hsparklines";
   "hsparql" = dontDistribute super."hsparql";
   "hspear" = dontDistribute super."hspear";
+  "hspec" = doDistribute super."hspec_2_2_1";
   "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-core" = doDistribute super."hspec-core_2_2_1";
+  "hspec-discover" = doDistribute super."hspec-discover_2_2_1";
   "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-meta" = doDistribute super."hspec-meta_2_2_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
@@ -4064,6 +4105,7 @@ self: super: {
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
   "http-wget" = dontDistribute super."http-wget";
+  "http2" = doDistribute super."http2_1_3_1";
   "httpd-shed" = dontDistribute super."httpd-shed";
   "https-everywhere-rules" = dontDistribute super."https-everywhere-rules";
   "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw";
@@ -4243,8 +4285,10 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invariant" = doDistribute super."invariant_0_2_2";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-reactive" = dontDistribute super."io-reactive";
@@ -4264,6 +4308,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_2_5_0";
   "irc-colors" = dontDistribute super."irc-colors";
   "irc-core" = dontDistribute super."irc-core";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -4409,6 +4454,7 @@ self: super: {
   "kevin" = dontDistribute super."kevin";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -4616,6 +4662,7 @@ self: super: {
   "lindenmayer" = dontDistribute super."lindenmayer";
   "line-break" = dontDistribute super."line-break";
   "line2pdf" = dontDistribute super."line2pdf";
+  "linear" = doDistribute super."linear_1_20_3";
   "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas";
   "linear-circuit" = dontDistribute super."linear-circuit";
   "linear-grammar" = dontDistribute super."linear-grammar";
@@ -4707,6 +4754,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -4748,6 +4796,7 @@ self: super: {
   "lui" = dontDistribute super."lui";
   "luka" = dontDistribute super."luka";
   "luminance" = doDistribute super."luminance_0_9_1";
+  "luminance-samples" = doDistribute super."luminance-samples_0_9";
   "lushtags" = dontDistribute super."lushtags";
   "luthor" = dontDistribute super."luthor";
   "lvish" = dontDistribute super."lvish";
@@ -4784,6 +4833,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_1";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -4925,6 +4975,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -4959,6 +5010,7 @@ self: super: {
   "monad-ox" = dontDistribute super."monad-ox";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-state" = dontDistribute super."monad-state";
@@ -4975,6 +5027,7 @@ self: super: {
   "monadacme" = dontDistribute super."monadacme";
   "monadbi" = dontDistribute super."monadbi";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -4988,6 +5041,7 @@ self: super: {
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
   "mono-foldable" = dontDistribute super."mono-foldable";
+  "mono-traversable" = doDistribute super."mono-traversable_0_10_0_1";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
@@ -5331,6 +5385,7 @@ self: super: {
   "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
+  "optparse-applicative" = doDistribute super."optparse-applicative_0_12_0_0";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -5366,6 +5421,7 @@ self: super: {
   "pacman-memcache" = dontDistribute super."pacman-memcache";
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
+  "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
@@ -5424,6 +5480,7 @@ self: super: {
   "patch-combinators" = dontDistribute super."patch-combinators";
   "patch-image" = dontDistribute super."patch-image";
   "patches-vector" = doDistribute super."patches-vector_0_1_5_0";
+  "path-io" = dontDistribute super."path-io";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
   "pathtype" = dontDistribute super."pathtype";
@@ -5475,6 +5532,7 @@ self: super: {
   "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-postgresql" = doDistribute super."persistent-postgresql_2_2_1_2";
   "persistent-protobuf" = dontDistribute super."persistent-protobuf";
   "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
   "persistent-redis" = dontDistribute super."persistent-redis";
@@ -5513,6 +5571,7 @@ self: super: {
   "pinboard" = dontDistribute super."pinboard";
   "pipe-enumerator" = dontDistribute super."pipe-enumerator";
   "pipeclip" = dontDistribute super."pipeclip";
+  "pipes" = doDistribute super."pipes_4_1_7";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
@@ -5619,6 +5678,7 @@ self: super: {
   "posix-waitpid" = dontDistribute super."posix-waitpid";
   "possible" = dontDistribute super."possible";
   "postcodes" = dontDistribute super."postcodes";
+  "postgresql-binary" = doDistribute super."postgresql-binary_0_7_4_1";
   "postgresql-config" = dontDistribute super."postgresql-config";
   "postgresql-connector" = dontDistribute super."postgresql-connector";
   "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape";
@@ -5651,6 +5711,7 @@ self: super: {
   "prefork" = dontDistribute super."prefork";
   "pregame" = dontDistribute super."pregame";
   "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2";
   "prelude-generalize" = dontDistribute super."prelude-generalize";
   "prelude-plus" = dontDistribute super."prelude-plus";
   "prelude-prime" = dontDistribute super."prelude-prime";
@@ -5681,6 +5742,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -5696,6 +5758,7 @@ self: super: {
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
+  "profunctors" = doDistribute super."profunctors_5_1_2";
   "progress" = dontDistribute super."progress";
   "progressbar" = dontDistribute super."progressbar";
   "progression" = dontDistribute super."progression";
@@ -5992,6 +6055,7 @@ self: super: {
   "request-monad" = dontDistribute super."request-monad";
   "reserve" = dontDistribute super."reserve";
   "resistor-cube" = dontDistribute super."resistor-cube";
+  "resolve-trivial-conflicts" = doDistribute super."resolve-trivial-conflicts_0_3_2_1";
   "resource-effect" = dontDistribute super."resource-effect";
   "resource-embed" = dontDistribute super."resource-embed";
   "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
@@ -6205,6 +6269,7 @@ self: super: {
   "selinux" = dontDistribute super."selinux";
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
   "semiring" = dontDistribute super."semiring";
@@ -6498,6 +6563,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
   "sphero" = dontDistribute super."sphero";
@@ -6548,9 +6614,11 @@ self: super: {
   "stable-marriage" = dontDistribute super."stable-marriage";
   "stable-memo" = dontDistribute super."stable-memo";
   "stable-tree" = dontDistribute super."stable-tree";
+  "stack" = doDistribute super."stack_1_0_0";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
   "stack-run" = dontDistribute super."stack-run";
+  "stackage-curator" = doDistribute super."stackage-curator_0_11_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -6563,6 +6631,7 @@ self: super: {
   "state-record" = dontDistribute super."state-record";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -6680,6 +6749,7 @@ self: super: {
   "svm-light-utils" = dontDistribute super."svm-light-utils";
   "svm-simple" = dontDistribute super."svm-simple";
   "svndump" = dontDistribute super."svndump";
+  "swagger2" = doDistribute super."swagger2_1_1_1";
   "swapper" = dontDistribute super."swapper";
   "swearjure" = dontDistribute super."swearjure";
   "swf" = dontDistribute super."swf";
@@ -6782,6 +6852,7 @@ self: super: {
   "telegram" = dontDistribute super."telegram";
   "telegram-api" = dontDistribute super."telegram-api";
   "teleport" = dontDistribute super."teleport";
+  "tellbot" = doDistribute super."tellbot_0_6_0_10";
   "template-default" = dontDistribute super."template-default";
   "template-haskell-util" = dontDistribute super."template-haskell-util";
   "template-hsml" = dontDistribute super."template-hsml";
@@ -6871,8 +6942,10 @@ self: super: {
   "th-instances" = dontDistribute super."th-instances";
   "th-kinds" = dontDistribute super."th-kinds";
   "th-kinds-fork" = dontDistribute super."th-kinds-fork";
+  "th-lift" = doDistribute super."th-lift_0_7_5";
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7102,6 +7175,7 @@ self: super: {
   "typehash" = dontDistribute super."typehash";
   "typelevel" = dontDistribute super."typelevel";
   "typelevel-tensor" = dontDistribute super."typelevel-tensor";
+  "typelits-witnesses" = doDistribute super."typelits-witnesses_0_1_1_0";
   "typeof" = dontDistribute super."typeof";
   "typeparams" = dontDistribute super."typeparams";
   "typesafe-endian" = dontDistribute super."typesafe-endian";
@@ -7314,6 +7388,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
+  "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-devel" = dontDistribute super."wai-devel";
@@ -7361,8 +7436,10 @@ self: super: {
   "wait-handle" = dontDistribute super."wait-handle";
   "waitfree" = dontDistribute super."waitfree";
   "warc" = dontDistribute super."warc";
+  "warp" = doDistribute super."warp_3_1_12";
   "warp-dynamic" = dontDistribute super."warp-dynamic";
   "warp-static" = dontDistribute super."warp-static";
+  "warp-tls" = doDistribute super."warp-tls_3_1_5";
   "warp-tls-uid" = dontDistribute super."warp-tls-uid";
   "watchdog" = dontDistribute super."watchdog";
   "watcher" = dontDistribute super."watcher";
@@ -7549,6 +7626,7 @@ self: super: {
   "yajl-enumerator" = dontDistribute super."yajl-enumerator";
   "yall" = dontDistribute super."yall";
   "yamemo" = dontDistribute super."yamemo";
+  "yaml" = doDistribute super."yaml_0_8_15_2";
   "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-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index 22c9cb7b2f6b..0e60720b4b33 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -626,6 +626,7 @@ self: super: {
   "MonadCatchIO-transformers-foreign" = dontDistribute super."MonadCatchIO-transformers-foreign";
   "MonadCompose" = dontDistribute super."MonadCompose";
   "MonadLab" = dontDistribute super."MonadLab";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_1";
   "MonadRandomLazy" = dontDistribute super."MonadRandomLazy";
   "MonadStack" = dontDistribute super."MonadStack";
   "Monadius" = dontDistribute super."Monadius";
@@ -706,6 +707,7 @@ self: super: {
   "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";
@@ -851,6 +853,7 @@ self: super: {
   "SpreadsheetML" = dontDistribute super."SpreadsheetML";
   "Sprig" = dontDistribute super."Sprig";
   "Stasis" = dontDistribute super."Stasis";
+  "StateVar" = doDistribute super."StateVar_1_1_0_2";
   "StateVar-transformer" = dontDistribute super."StateVar-transformer";
   "StatisticalMethods" = dontDistribute super."StatisticalMethods";
   "Stomp" = dontDistribute super."Stomp";
@@ -1062,9 +1065,11 @@ self: super: {
   "addLicenseInfo" = dontDistribute super."addLicenseInfo";
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
+  "adjunctions" = doDistribute super."adjunctions_4_2_2";
   "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
   "adp-multi" = dontDistribute super."adp-multi";
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson" = doDistribute super."aeson_0_10_0_0";
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-diff" = dontDistribute super."aeson-diff";
@@ -1281,6 +1286,8 @@ self: super: {
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
   "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1331,8 +1338,10 @@ self: super: {
   "barley" = dontDistribute super."barley";
   "barrie" = dontDistribute super."barrie";
   "barrier-monad" = dontDistribute super."barrier-monad";
+  "base-compat" = doDistribute super."base-compat_0_8_2";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
+  "base-orphans" = doDistribute super."base-orphans_0_4_5";
   "base32-bytestring" = dontDistribute super."base32-bytestring";
   "base58-bytestring" = dontDistribute super."base58-bytestring";
   "base58address" = dontDistribute super."base58address";
@@ -1374,6 +1383,7 @@ self: super: {
   "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
   "bidispec" = dontDistribute super."bidispec";
   "bidispec-extras" = dontDistribute super."bidispec-extras";
+  "bifunctors" = doDistribute super."bifunctors_5_1";
   "bighugethesaurus" = dontDistribute super."bighugethesaurus";
   "billboard-parser" = dontDistribute super."billboard-parser";
   "billeksah-forms" = dontDistribute super."billeksah-forms";
@@ -1381,6 +1391,7 @@ self: super: {
   "billeksah-main-static" = dontDistribute super."billeksah-main-static";
   "billeksah-pane" = dontDistribute super."billeksah-pane";
   "billeksah-services" = dontDistribute super."billeksah-services";
+  "bimap" = doDistribute super."bimap_0_3_0";
   "bimaps" = dontDistribute super."bimaps";
   "binary-bits" = dontDistribute super."binary-bits";
   "binary-communicator" = dontDistribute super."binary-communicator";
@@ -1392,6 +1403,7 @@ self: super: {
   "binary-literal-qq" = dontDistribute super."binary-literal-qq";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
+  "binary-search" = doDistribute super."binary-search_0_1";
   "binary-shared" = dontDistribute super."binary-shared";
   "binary-state" = dontDistribute super."binary-state";
   "binary-store" = dontDistribute super."binary-store";
@@ -1531,6 +1543,7 @@ self: super: {
   "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";
@@ -1568,6 +1581,7 @@ self: super: {
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
   "bytable" = dontDistribute super."bytable";
+  "bytes" = doDistribute super."bytes_0_15_1";
   "bytestring-arbitrary" = dontDistribute super."bytestring-arbitrary";
   "bytestring-class" = dontDistribute super."bytestring-class";
   "bytestring-csv" = dontDistribute super."bytestring-csv";
@@ -1596,6 +1610,7 @@ self: super: {
   "cabal-cargs" = dontDistribute super."cabal-cargs";
   "cabal-constraints" = dontDistribute super."cabal-constraints";
   "cabal-db" = dontDistribute super."cabal-db";
+  "cabal-debian" = doDistribute super."cabal-debian_4_31_9";
   "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
   "cabal-dev" = dontDistribute super."cabal-dev";
   "cabal-dir" = dontDistribute super."cabal-dir";
@@ -1735,6 +1750,7 @@ self: super: {
   "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";
@@ -1895,6 +1911,7 @@ self: super: {
   "concurrent-sa" = dontDistribute super."concurrent-sa";
   "concurrent-split" = dontDistribute super."concurrent-split";
   "concurrent-state" = dontDistribute super."concurrent-state";
+  "concurrent-supply" = doDistribute super."concurrent-supply_0_1_7_1";
   "concurrent-utilities" = dontDistribute super."concurrent-utilities";
   "concurrentoutput" = dontDistribute super."concurrentoutput";
   "cond" = dontDistribute super."cond";
@@ -1928,6 +1945,7 @@ self: super: {
   "const-math-ghc-plugin" = dontDistribute super."const-math-ghc-plugin";
   "constrained-categories" = dontDistribute super."constrained-categories";
   "constrained-normal" = dontDistribute super."constrained-normal";
+  "constraints" = doDistribute super."constraints_0_6";
   "constructible" = dontDistribute super."constructible";
   "constructive-algebra" = dontDistribute super."constructive-algebra";
   "consumers" = dontDistribute super."consumers";
@@ -2007,6 +2025,7 @@ self: super: {
   "cqrs-types" = dontDistribute super."cqrs-types";
   "cr" = dontDistribute super."cr";
   "crack" = dontDistribute super."crack";
+  "crackNum" = doDistribute super."crackNum_1_3";
   "craftwerk" = dontDistribute super."craftwerk";
   "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
   "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
@@ -2096,6 +2115,7 @@ self: super: {
   "darkplaces-rcon-util" = dontDistribute super."darkplaces-rcon-util";
   "darkplaces-text" = dontDistribute super."darkplaces-text";
   "dash-haskell" = dontDistribute super."dash-haskell";
+  "data-accessor" = doDistribute super."data-accessor_0_2_2_6";
   "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";
@@ -2250,6 +2270,7 @@ self: super: {
   "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";
   "deriving-compat" = dontDistribute super."deriving-compat";
@@ -2268,6 +2289,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_1";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
@@ -2344,7 +2366,10 @@ self: super: {
   "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
   "diversity" = doDistribute super."diversity_0_7_1_1";
+  "dixi" = doDistribute super."dixi_0_6_0_3";
+  "djembe" = dontDistribute super."djembe";
   "djinn" = dontDistribute super."djinn";
   "djinn-th" = dontDistribute super."djinn-th";
   "dnscache" = dontDistribute super."dnscache";
@@ -2454,6 +2479,7 @@ self: super: {
   "edit-lenses-demo" = dontDistribute super."edit-lenses-demo";
   "editable" = dontDistribute super."editable";
   "editline" = dontDistribute super."editline";
+  "effect-handlers" = doDistribute super."effect-handlers_0_1_0_6";
   "effect-monad" = dontDistribute super."effect-monad";
   "effective-aspects" = dontDistribute super."effective-aspects";
   "effective-aspects-mzv" = dontDistribute super."effective-aspects-mzv";
@@ -2496,6 +2522,7 @@ self: super: {
   "email" = dontDistribute super."email";
   "email-header" = dontDistribute super."email-header";
   "email-postmark" = dontDistribute super."email-postmark";
+  "email-validate" = doDistribute super."email-validate_2_1_3";
   "email-validator" = dontDistribute super."email-validator";
   "embeddock" = dontDistribute super."embeddock";
   "embeddock-example" = dontDistribute super."embeddock-example";
@@ -2578,6 +2605,7 @@ self: super: {
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
   "exception-monads-tf" = dontDistribute super."exception-monads-tf";
   "exception-mtl" = dontDistribute super."exception-mtl";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2";
   "exceptions" = doDistribute super."exceptions_0_8_0_2";
   "exherbo-cabal" = dontDistribute super."exherbo-cabal";
   "exif" = dontDistribute super."exif";
@@ -2643,6 +2671,7 @@ self: super: {
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_3";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
@@ -2746,6 +2775,7 @@ self: super: {
   "fmark" = dontDistribute super."fmark";
   "fold-debounce" = dontDistribute super."fold-debounce";
   "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_2";
   "foldl-incremental" = dontDistribute super."foldl-incremental";
   "foldl-transduce" = dontDistribute super."foldl-transduce";
   "foldl-transduce-attoparsec" = dontDistribute super."foldl-transduce-attoparsec";
@@ -2948,6 +2978,7 @@ self: super: {
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
+  "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-vis" = dontDistribute super."ghc-vis";
   "ghci-diagrams" = dontDistribute super."ghci-diagrams";
@@ -3010,6 +3041,7 @@ self: super: {
   "gitlib-utils" = dontDistribute super."gitlib-utils";
   "gitrev" = doDistribute super."gitrev_1_1_0";
   "gitter" = dontDistribute super."gitter";
+  "gl" = doDistribute super."gl_0_7_7";
   "gl-capture" = dontDistribute super."gl-capture";
   "glade" = dontDistribute super."glade";
   "gladexml-accessor" = dontDistribute super."gladexml-accessor";
@@ -3194,7 +3226,9 @@ self: super: {
   "graphicstools" = dontDistribute super."graphicstools";
   "graphmod" = dontDistribute super."graphmod";
   "graphql" = dontDistribute super."graphql";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
   "graphtype" = dontDistribute super."graphtype";
+  "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
   "greencard" = dontDistribute super."greencard";
@@ -3344,6 +3378,7 @@ self: super: {
   "hakyll-elm" = dontDistribute super."hakyll-elm";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
+  "half" = doDistribute super."half_0_2_2_2";
   "halfs" = dontDistribute super."halfs";
   "halipeto" = dontDistribute super."halipeto";
   "halive" = dontDistribute super."halive";
@@ -3400,6 +3435,7 @@ self: super: {
   "happybara-webkit-server" = dontDistribute super."happybara-webkit-server";
   "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";
@@ -3414,6 +3450,7 @@ self: super: {
   "hascat-system" = dontDistribute super."hascat-system";
   "hash" = dontDistribute super."hash";
   "hashable" = doDistribute super."hashable_1_2_3_3";
+  "hashable-extras" = doDistribute super."hashable-extras_0_2_2";
   "hashable-generics" = dontDistribute super."hashable-generics";
   "hashabler" = dontDistribute super."hashabler";
   "hashed-storage" = dontDistribute super."hashed-storage";
@@ -3588,6 +3625,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis-config" = dontDistribute super."hedis-config";
@@ -3966,12 +4004,16 @@ self: super: {
   "hsparklines" = dontDistribute super."hsparklines";
   "hsparql" = dontDistribute super."hsparql";
   "hspear" = dontDistribute super."hspear";
+  "hspec" = doDistribute super."hspec_2_2_1";
   "hspec-checkers" = dontDistribute super."hspec-checkers";
+  "hspec-core" = doDistribute super."hspec-core_2_2_1";
+  "hspec-discover" = doDistribute super."hspec-discover_2_2_1";
   "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-meta" = doDistribute super."hspec-meta_2_2_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
@@ -4055,6 +4097,7 @@ self: super: {
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
   "http-wget" = dontDistribute super."http-wget";
+  "http2" = doDistribute super."http2_1_3_1";
   "httpd-shed" = dontDistribute super."httpd-shed";
   "https-everywhere-rules" = dontDistribute super."https-everywhere-rules";
   "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw";
@@ -4230,8 +4273,10 @@ self: super: {
   "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
   "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
   "interpolation" = dontDistribute super."interpolation";
+  "intervals" = doDistribute super."intervals_0_7_1";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invariant" = doDistribute super."invariant_0_2_2";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-reactive" = dontDistribute super."io-reactive";
@@ -4250,6 +4295,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_2_5_0";
   "irc-colors" = dontDistribute super."irc-colors";
   "irc-core" = dontDistribute super."irc-core";
   "irc-fun-bot" = dontDistribute super."irc-fun-bot";
@@ -4395,6 +4441,7 @@ self: super: {
   "kevin" = dontDistribute super."kevin";
   "keyed" = dontDistribute super."keyed";
   "keyring" = dontDistribute super."keyring";
+  "keys" = doDistribute super."keys_3_10_2";
   "keystore" = dontDistribute super."keystore";
   "keyvaluehash" = dontDistribute super."keyvaluehash";
   "keyword-args" = dontDistribute super."keyword-args";
@@ -4599,6 +4646,7 @@ self: super: {
   "lindenmayer" = dontDistribute super."lindenmayer";
   "line-break" = dontDistribute super."line-break";
   "line2pdf" = dontDistribute super."line2pdf";
+  "linear" = doDistribute super."linear_1_20_3";
   "linear-algebra-cblas" = dontDistribute super."linear-algebra-cblas";
   "linear-circuit" = dontDistribute super."linear-circuit";
   "linear-grammar" = dontDistribute super."linear-grammar";
@@ -4690,6 +4738,7 @@ self: super: {
   "logfloat" = dontDistribute super."logfloat";
   "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";
@@ -4731,6 +4780,7 @@ self: super: {
   "lui" = dontDistribute super."lui";
   "luka" = dontDistribute super."luka";
   "luminance" = doDistribute super."luminance_0_9_1";
+  "luminance-samples" = doDistribute super."luminance-samples_0_9";
   "lushtags" = dontDistribute super."lushtags";
   "luthor" = dontDistribute super."luthor";
   "lvish" = dontDistribute super."lvish";
@@ -4767,6 +4817,7 @@ self: super: {
   "make-hard-links" = dontDistribute super."make-hard-links";
   "make-package" = dontDistribute super."make-package";
   "makedo" = dontDistribute super."makedo";
+  "managed" = doDistribute super."managed_1_0_1";
   "manatee" = dontDistribute super."manatee";
   "manatee-all" = dontDistribute super."manatee-all";
   "manatee-anything" = dontDistribute super."manatee-anything";
@@ -4908,6 +4959,7 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_4";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
@@ -4942,6 +4994,7 @@ self: super: {
   "monad-ox" = dontDistribute super."monad-ox";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
+  "monad-products" = doDistribute super."monad-products_4_0_0_1";
   "monad-ran" = dontDistribute super."monad-ran";
   "monad-resumption" = dontDistribute super."monad-resumption";
   "monad-state" = dontDistribute super."monad-state";
@@ -4958,6 +5011,7 @@ self: super: {
   "monadacme" = dontDistribute super."monadacme";
   "monadbi" = dontDistribute super."monadbi";
   "monadfibre" = dontDistribute super."monadfibre";
+  "monadic-arrays" = doDistribute super."monadic-arrays_0_2_1_4";
   "monadiccp" = dontDistribute super."monadiccp";
   "monadiccp-gecode" = dontDistribute super."monadiccp-gecode";
   "monadio-unwrappable" = dontDistribute super."monadio-unwrappable";
@@ -4971,6 +5025,7 @@ self: super: {
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
   "mono-foldable" = dontDistribute super."mono-foldable";
+  "mono-traversable" = doDistribute super."mono-traversable_0_10_0_1";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
@@ -5314,6 +5369,7 @@ self: super: {
   "option" = dontDistribute super."option";
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
+  "optparse-applicative" = doDistribute super."optparse-applicative_0_12_0_0";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -5349,6 +5405,7 @@ self: super: {
   "pacman-memcache" = dontDistribute super."pacman-memcache";
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
+  "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
@@ -5406,6 +5463,7 @@ self: super: {
   "pasty" = dontDistribute super."pasty";
   "patch-combinators" = dontDistribute super."patch-combinators";
   "patch-image" = dontDistribute super."patch-image";
+  "path-io" = dontDistribute super."path-io";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
   "pathtype" = dontDistribute super."pathtype";
@@ -5457,6 +5515,7 @@ self: super: {
   "persistent-iproute" = dontDistribute super."persistent-iproute";
   "persistent-map" = dontDistribute super."persistent-map";
   "persistent-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-postgresql" = doDistribute super."persistent-postgresql_2_2_1_2";
   "persistent-protobuf" = dontDistribute super."persistent-protobuf";
   "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
   "persistent-redis" = dontDistribute super."persistent-redis";
@@ -5495,6 +5554,7 @@ self: super: {
   "pinboard" = dontDistribute super."pinboard";
   "pipe-enumerator" = dontDistribute super."pipe-enumerator";
   "pipeclip" = dontDistribute super."pipeclip";
+  "pipes" = doDistribute super."pipes_4_1_7";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
@@ -5600,6 +5660,7 @@ self: super: {
   "posix-waitpid" = dontDistribute super."posix-waitpid";
   "possible" = dontDistribute super."possible";
   "postcodes" = dontDistribute super."postcodes";
+  "postgresql-binary" = doDistribute super."postgresql-binary_0_7_4_1";
   "postgresql-config" = dontDistribute super."postgresql-config";
   "postgresql-connector" = dontDistribute super."postgresql-connector";
   "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape";
@@ -5632,6 +5693,7 @@ self: super: {
   "prefork" = dontDistribute super."prefork";
   "pregame" = dontDistribute super."pregame";
   "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-extras" = doDistribute super."prelude-extras_0_4_0_2";
   "prelude-generalize" = dontDistribute super."prelude-generalize";
   "prelude-plus" = dontDistribute super."prelude-plus";
   "prelude-prime" = dontDistribute super."prelude-prime";
@@ -5662,6 +5724,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_5";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -5677,6 +5740,7 @@ self: super: {
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
+  "profunctors" = doDistribute super."profunctors_5_1_2";
   "progress" = dontDistribute super."progress";
   "progressbar" = dontDistribute super."progressbar";
   "progression" = dontDistribute super."progression";
@@ -5972,6 +6036,7 @@ self: super: {
   "request-monad" = dontDistribute super."request-monad";
   "reserve" = dontDistribute super."reserve";
   "resistor-cube" = dontDistribute super."resistor-cube";
+  "resolve-trivial-conflicts" = doDistribute super."resolve-trivial-conflicts_0_3_2_1";
   "resource-effect" = dontDistribute super."resource-effect";
   "resource-embed" = dontDistribute super."resource-embed";
   "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
@@ -6185,6 +6250,7 @@ self: super: {
   "selinux" = dontDistribute super."selinux";
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
+  "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
   "semiring" = dontDistribute super."semiring";
@@ -6478,6 +6544,7 @@ self: super: {
   "special-keys" = dontDistribute super."special-keys";
   "specialize-th" = dontDistribute super."specialize-th";
   "species" = dontDistribute super."species";
+  "speculation" = doDistribute super."speculation_1_5_0_2";
   "speculation-transformers" = dontDistribute super."speculation-transformers";
   "spelling-suggest" = dontDistribute super."spelling-suggest";
   "sphero" = dontDistribute super."sphero";
@@ -6528,9 +6595,11 @@ self: super: {
   "stable-marriage" = dontDistribute super."stable-marriage";
   "stable-memo" = dontDistribute super."stable-memo";
   "stable-tree" = dontDistribute super."stable-tree";
+  "stack" = doDistribute super."stack_1_0_0";
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
   "stack-run" = dontDistribute super."stack-run";
+  "stackage-curator" = doDistribute super."stackage-curator_0_11_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -6543,6 +6612,7 @@ self: super: {
   "state-record" = dontDistribute super."state-record";
   "statechart" = dontDistribute super."statechart";
   "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
   "statethread" = dontDistribute super."statethread";
   "statgrab" = dontDistribute super."statgrab";
   "static-hash" = dontDistribute super."static-hash";
@@ -6660,6 +6730,7 @@ self: super: {
   "svm-light-utils" = dontDistribute super."svm-light-utils";
   "svm-simple" = dontDistribute super."svm-simple";
   "svndump" = dontDistribute super."svndump";
+  "swagger2" = doDistribute super."swagger2_1_1_1";
   "swapper" = dontDistribute super."swapper";
   "swearjure" = dontDistribute super."swearjure";
   "swf" = dontDistribute super."swf";
@@ -6762,6 +6833,7 @@ self: super: {
   "telegram" = dontDistribute super."telegram";
   "telegram-api" = dontDistribute super."telegram-api";
   "teleport" = dontDistribute super."teleport";
+  "tellbot" = doDistribute super."tellbot_0_6_0_10";
   "template-default" = dontDistribute super."template-default";
   "template-haskell-util" = dontDistribute super."template-haskell-util";
   "template-hsml" = dontDistribute super."template-hsml";
@@ -6851,8 +6923,10 @@ self: super: {
   "th-instances" = dontDistribute super."th-instances";
   "th-kinds" = dontDistribute super."th-kinds";
   "th-kinds-fork" = dontDistribute super."th-kinds-fork";
+  "th-lift" = doDistribute super."th-lift_0_7_5";
   "th-lift-instances" = dontDistribute super."th-lift-instances";
   "th-printf" = dontDistribute super."th-printf";
+  "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
   "th-sccs" = dontDistribute super."th-sccs";
   "th-traced" = dontDistribute super."th-traced";
   "th-typegraph" = dontDistribute super."th-typegraph";
@@ -7081,6 +7155,7 @@ self: super: {
   "typehash" = dontDistribute super."typehash";
   "typelevel" = dontDistribute super."typelevel";
   "typelevel-tensor" = dontDistribute super."typelevel-tensor";
+  "typelits-witnesses" = doDistribute super."typelits-witnesses_0_1_1_0";
   "typeof" = dontDistribute super."typeof";
   "typeparams" = dontDistribute super."typeparams";
   "typesafe-endian" = dontDistribute super."typesafe-endian";
@@ -7293,6 +7368,7 @@ self: super: {
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
   "waddle" = dontDistribute super."waddle";
+  "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
   "wai-devel" = dontDistribute super."wai-devel";
@@ -7339,8 +7415,10 @@ self: super: {
   "wait-handle" = dontDistribute super."wait-handle";
   "waitfree" = dontDistribute super."waitfree";
   "warc" = dontDistribute super."warc";
+  "warp" = doDistribute super."warp_3_1_12";
   "warp-dynamic" = dontDistribute super."warp-dynamic";
   "warp-static" = dontDistribute super."warp-static";
+  "warp-tls" = doDistribute super."warp-tls_3_1_5";
   "warp-tls-uid" = dontDistribute super."warp-tls-uid";
   "watchdog" = dontDistribute super."watchdog";
   "watcher" = dontDistribute super."watcher";
@@ -7527,6 +7605,7 @@ self: super: {
   "yajl-enumerator" = dontDistribute super."yajl-enumerator";
   "yall" = dontDistribute super."yall";
   "yamemo" = dontDistribute super."yamemo";
+  "yaml" = doDistribute super."yaml_0_8_15_2";
   "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-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
new file mode 100644
index 000000000000..097a87c50e9f
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
@@ -0,0 +1,7669 @@
+{ 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-4.2 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";
+  "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";
+  "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";
+  "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-diagrams" = dontDistribute super."Chart-diagrams";
+  "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";
+  "DescriptiveKeys" = dontDistribute super."DescriptiveKeys";
+  "Dflow" = dontDistribute super."Dflow";
+  "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" = dontDistribute super."EdisonAPI";
+  "EdisonCore" = dontDistribute super."EdisonCore";
+  "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";
+  "FindBin" = dontDistribute super."FindBin";
+  "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";
+  "ForkableT" = dontDistribute super."ForkableT";
+  "FormalGrammars" = dontDistribute super."FormalGrammars";
+  "Foster" = dontDistribute super."Foster";
+  "FpMLv53" = dontDistribute super."FpMLv53";
+  "FractalArt" = dontDistribute super."FractalArt";
+  "Fractaler" = dontDistribute super."Fractaler";
+  "Frames" = dontDistribute super."Frames";
+  "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";
+  "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";
+  "H" = dontDistribute super."H";
+  "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";
+  "HDBC-session" = dontDistribute super."HDBC-session";
+  "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";
+  "Hclip" = dontDistribute super."Hclip";
+  "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";
+  "IntervalMap" = doDistribute super."IntervalMap_0_4_1_1";
+  "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";
+  "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";
+  "LDAP" = dontDistribute super."LDAP";
+  "LRU" = dontDistribute super."LRU";
+  "LTree" = dontDistribute super."LTree";
+  "LambdaCalculator" = dontDistribute super."LambdaCalculator";
+  "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";
+  "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";
+  "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";
+  "MonadRandom" = doDistribute super."MonadRandom_0_4_2_1";
+  "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";
+  "NoTrace" = dontDistribute super."NoTrace";
+  "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";
+  "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";
+  "OneTuple" = dontDistribute super."OneTuple";
+  "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";
+  "OpenGLRaw" = doDistribute super."OpenGLRaw_3_0_0_0";
+  "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";
+  "PortMidi" = dontDistribute super."PortMidi";
+  "PostgreSQL" = dontDistribute super."PostgreSQL";
+  "PrimitiveArray" = dontDistribute super."PrimitiveArray";
+  "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";
+  "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";
+  "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";
+  "SVGFonts" = dontDistribute super."SVGFonts";
+  "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";
+  "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";
+  "Spintax" = dontDistribute super."Spintax";
+  "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";
+  "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-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";
+  "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-utility" = dontDistribute super."accelerate-utility";
+  "accentuateus" = dontDistribute super."accentuateus";
+  "access-time" = dontDistribute super."access-time";
+  "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-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";
+  "adjunctions" = doDistribute super."adjunctions_4_2_2";
+  "adobe-swatch-exchange" = dontDistribute super."adobe-swatch-exchange";
+  "adp-multi" = dontDistribute super."adp-multi";
+  "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
+  "aeson" = doDistribute super."aeson_0_10_0_0";
+  "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-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-lens" = dontDistribute super."aeson-lens";
+  "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
+  "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";
+  "agda-server" = dontDistribute super."agda-server";
+  "agda-snippets" = dontDistribute super."agda-snippets";
+  "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
+  "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";
+  "aivika" = dontDistribute super."aivika";
+  "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-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";
+  "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";
+  "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-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";
+  "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";
+  "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "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";
+  "arithmoi" = dontDistribute super."arithmoi";
+  "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-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-conduit" = dontDistribute super."atom-conduit";
+  "atom-msp430" = dontDistribute super."atom-msp430";
+  "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign";
+  "atomic-primops-vector" = dontDistribute super."atomic-primops-vector";
+  "atomic-write" = dontDistribute super."atomic-write";
+  "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";
+  "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";
+  "avers" = dontDistribute super."avers";
+  "avers-api" = dontDistribute super."avers-api";
+  "avers-server" = dontDistribute super."avers-server";
+  "avl-static" = dontDistribute super."avl-static";
+  "avr-shake" = dontDistribute super."avr-shake";
+  "awesomium" = dontDistribute super."awesomium";
+  "awesomium-glut" = dontDistribute super."awesomium-glut";
+  "awesomium-raw" = dontDistribute super."awesomium-raw";
+  "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-compat" = doDistribute super."base-compat_0_8_2";
+  "base-generics" = dontDistribute super."base-generics";
+  "base-io-access" = dontDistribute super."base-io-access";
+  "base-orphans" = doDistribute super."base-orphans_0_4_5";
+  "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";
+  "bdd" = dontDistribute super."bdd";
+  "bdelta" = dontDistribute super."bdelta";
+  "bdo" = dontDistribute super."bdo";
+  "beamable" = dontDistribute super."beamable";
+  "beautifHOL" = dontDistribute super."beautifHOL";
+  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
+  "bein" = dontDistribute super."bein";
+  "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";
+  "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_1";
+  "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";
+  "bimap" = doDistribute super."bimap_0_3_0";
+  "bimaps" = dontDistribute super."bimaps";
+  "binary-bits" = dontDistribute super."binary-bits";
+  "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-search" = doDistribute super."binary-search_0_1";
+  "binary-shared" = dontDistribute super."binary-shared";
+  "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-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";
+  "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-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-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";
+  "blank-canvas" = dontDistribute super."blank-canvas";
+  "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";
+  "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";
+  "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";
+  "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_3_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-class" = dontDistribute super."bytestring-class";
+  "bytestring-csv" = dontDistribute super."bytestring-csv";
+  "bytestring-delta" = dontDistribute super."bytestring-delta";
+  "bytestring-from" = dontDistribute super."bytestring-from";
+  "bytestring-handle" = dontDistribute super."bytestring-handle";
+  "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";
+  "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder";
+  "bytestringparser" = dontDistribute super."bytestringparser";
+  "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
+  "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "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-debian" = doDistribute super."cabal-debian_4_31_9";
+  "cabal-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
+  "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-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";
+  "cached-io" = dontDistribute super."cached-io";
+  "cached-traversable" = dontDistribute super."cached-traversable";
+  "caf" = dontDistribute super."caf";
+  "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
+  "caffegraph" = dontDistribute super."caffegraph";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "codo-notation" = dontDistribute super."codo-notation";
+  "cofunctor" = dontDistribute super."cofunctor";
+  "cognimeta-utils" = dontDistribute super."cognimeta-utils";
+  "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";
+  "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";
+  "commodities" = dontDistribute super."commodities";
+  "commsec" = dontDistribute super."commsec";
+  "commsec-keyexchange" = dontDistribute super."commsec-keyexchange";
+  "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";
+  "conceit" = dontDistribute super."conceit";
+  "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-extra" = dontDistribute super."concurrent-extra";
+  "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "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";
+  "conf" = dontDistribute super."conf";
+  "config-select" = dontDistribute super."config-select";
+  "config-value" = dontDistribute super."config-value";
+  "configifier" = dontDistribute super."configifier";
+  "configuration" = dontDistribute super."configuration";
+  "configuration-tools" = dontDistribute super."configuration-tools";
+  "configurator-export" = dontDistribute super."configurator-export";
+  "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";
+  "constraints" = doDistribute super."constraints_0_6";
+  "constructible" = dontDistribute super."constructible";
+  "constructive-algebra" = dontDistribute super."constructive-algebra";
+  "consumers" = dontDistribute super."consumers";
+  "container" = dontDistribute super."container";
+  "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";
+  "continued-fractions" = dontDistribute super."continued-fractions";
+  "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-omega" = dontDistribute super."control-monad-omega";
+  "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";
+  "converge" = dontDistribute super."converge";
+  "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";
+  "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";
+  "crackNum" = doDistribute super."crackNum_1_3";
+  "craftwerk" = dontDistribute super."craftwerk";
+  "craftwerk-cairo" = dontDistribute super."craftwerk-cairo";
+  "craftwerk-gtk" = dontDistribute super."craftwerk-gtk";
+  "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";
+  "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-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";
+  "d3js" = dontDistribute super."d3js";
+  "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
+  "daemons" = dontDistribute super."daemons";
+  "dag" = dontDistribute super."dag";
+  "damnpacket" = dontDistribute super."damnpacket";
+  "dao" = dontDistribute super."dao";
+  "dapi" = dontDistribute super."dapi";
+  "darcs" = dontDistribute super."darcs";
+  "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" = doDistribute super."data-accessor_0_2_2_6";
+  "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-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-generics" = dontDistribute super."data-default-generics";
+  "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-interval" = dontDistribute super."data-interval";
+  "data-ivar" = dontDistribute super."data-ivar";
+  "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-or" = dontDistribute super."data-or";
+  "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-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";
+  "dataurl" = dontDistribute super."dataurl";
+  "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";
+  "dawg-ord" = dontDistribute super."dawg-ord";
+  "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";
+  "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-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";
+  "debian-build" = dontDistribute super."debian-build";
+  "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
+  "decepticons" = dontDistribute super."decepticons";
+  "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-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";
+  "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";
+  "demarcate" = dontDistribute super."demarcate";
+  "denominate" = dontDistribute super."denominate";
+  "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";
+  "deriving-compat" = dontDistribute super."deriving-compat";
+  "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-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
+  "diagrams-gtk" = dontDistribute super."diagrams-gtk";
+  "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-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-tikz" = dontDistribute super."diagrams-tikz";
+  "dialog" = dontDistribute super."dialog";
+  "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
+  "dicom" = dontDistribute super."dicom";
+  "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";
+  "dirfiles" = dontDistribute super."dirfiles";
+  "dirstream" = dontDistribute super."dirstream";
+  "disassembler" = dontDistribute super."disassembler";
+  "discordian-calendar" = dontDistribute super."discordian-calendar";
+  "discount" = dontDistribute super."discount";
+  "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-closure" = dontDistribute super."distributed-closure";
+  "distributed-process-async" = dontDistribute super."distributed-process-async";
+  "distributed-process-azure" = dontDistribute super."distributed-process-azure";
+  "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-execution" = dontDistribute super."distributed-process-execution";
+  "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "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-registry" = dontDistribute super."distributed-process-registry";
+  "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet";
+  "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor";
+  "distributed-process-task" = dontDistribute super."distributed-process-task";
+  "distributed-process-tests" = dontDistribute super."distributed-process-tests";
+  "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
+  "distribution" = dontDistribute super."distribution";
+  "distribution-plot" = dontDistribute super."distribution-plot";
+  "distributive" = doDistribute super."distributive_0_4_4";
+  "diversity" = doDistribute super."diversity_0_7_1_1";
+  "dixi" = doDistribute super."dixi_0_6_0_3";
+  "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" = dontDistribute super."doctest-discover";
+  "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
+  "doctest-prop" = dontDistribute super."doctest-prop";
+  "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";
+  "dotenv" = dontDistribute super."dotenv";
+  "dotfs" = dontDistribute super."dotfs";
+  "dotgen" = dontDistribute super."dotgen";
+  "double-metaphone" = dontDistribute super."double-metaphone";
+  "dove" = dontDistribute super."dove";
+  "dow" = dontDistribute super."dow";
+  "download" = dontDistribute super."download";
+  "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";
+  "drClickOn" = dontDistribute super."drClickOn";
+  "draw-poker" = dontDistribute super."draw-poker";
+  "drifter" = dontDistribute super."drifter";
+  "drifter-postgresql" = dontDistribute super."drifter-postgresql";
+  "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";
+  "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";
+  "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";
+  "ekg-statsd" = dontDistribute super."ekg-statsd";
+  "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";
+  "elm-build-lib" = dontDistribute super."elm-build-lib";
+  "elm-compiler" = dontDistribute super."elm-compiler";
+  "elm-get" = dontDistribute super."elm-get";
+  "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" = doDistribute super."email-validate_2_1_3";
+  "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";
+  "envy" = dontDistribute super."envy";
+  "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";
+  "errors" = doDistribute super."errors_2_0_1";
+  "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";
+  "every-bit-counts" = dontDistribute super."every-bit-counts";
+  "ewe" = dontDistribute super."ewe";
+  "ex-pool" = dontDistribute super."ex-pool";
+  "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "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";
+  "exception-mtl" = dontDistribute super."exception-mtl";
+  "exception-transformers" = doDistribute super."exception-transformers_0_4_0_2";
+  "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";
+  "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";
+  "extensible-effects" = dontDistribute super."extensible-effects";
+  "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";
+  "failable-list" = dontDistribute super."failable-list";
+  "failure" = dontDistribute super."failure";
+  "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";
+  "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
+  "fcd" = dontDistribute super."fcd";
+  "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_3";
+  "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-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";
+  "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-mcmc" = dontDistribute super."flat-mcmc";
+  "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";
+  "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-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";
+  "fold-debounce" = dontDistribute super."fold-debounce";
+  "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "foldl" = doDistribute super."foldl_1_1_3";
+  "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";
+  "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";
+  "free-vl" = dontDistribute super."free-vl";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "gamma" = dontDistribute super."gamma";
+  "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-server" = dontDistribute super."generic-server";
+  "generic-storable" = dontDistribute super."generic-storable";
+  "generic-tree" = dontDistribute super."generic-tree";
+  "generic-trie" = dontDistribute super."generic-trie";
+  "generic-xml" = dontDistribute super."generic-xml";
+  "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";
+  "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-imported-from" = dontDistribute super."ghc-imported-from";
+  "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-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
+  "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-codemirror" = dontDistribute super."ghcjs-codemirror";
+  "ghcjs-dom" = dontDistribute super."ghcjs-dom";
+  "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
+  "ghcjs-websockets" = dontDistribute super."ghcjs-websockets";
+  "ghclive" = dontDistribute super."ghclive";
+  "ghczdecode" = dontDistribute super."ghczdecode";
+  "ght" = dontDistribute super."ght";
+  "gi-atk" = dontDistribute super."gi-atk";
+  "gi-cairo" = dontDistribute super."gi-cairo";
+  "gi-gdk" = dontDistribute super."gi-gdk";
+  "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
+  "gi-gio" = dontDistribute super."gi-gio";
+  "gi-glib" = dontDistribute super."gi-glib";
+  "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gtk" = dontDistribute super."gi-gtk";
+  "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
+  "gi-notify" = dontDistribute super."gi-notify";
+  "gi-pango" = dontDistribute super."gi-pango";
+  "gi-soup" = dontDistribute super."gi-soup";
+  "gi-vte" = dontDistribute super."gi-vte";
+  "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gimlh" = dontDistribute super."gimlh";
+  "ginger" = dontDistribute super."ginger";
+  "ginsu" = dontDistribute super."ginsu";
+  "gist" = dontDistribute super."gist";
+  "git-all" = dontDistribute super."git-all";
+  "git-annex" = doDistribute super."git-annex_5_20151218";
+  "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" = dontDistribute super."github";
+  "github-backup" = dontDistribute super."github-backup";
+  "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";
+  "gitrev" = doDistribute super."gitrev_1_1_0";
+  "gitter" = dontDistribute super."gitter";
+  "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";
+  "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";
+  "gpah" = dontDistribute super."gpah";
+  "gpcsets" = dontDistribute super."gpcsets";
+  "gpolyline" = dontDistribute super."gpolyline";
+  "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";
+  "graphs" = doDistribute super."graphs_0_6_0_1";
+  "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";
+  "grid" = dontDistribute super."grid";
+  "gridland" = dontDistribute super."gridland";
+  "grm" = dontDistribute super."grm";
+  "groundhog-inspector" = dontDistribute super."groundhog-inspector";
+  "group-with" = dontDistribute super."group-with";
+  "groupoid" = dontDistribute super."groupoid";
+  "growler" = dontDistribute super."growler";
+  "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-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-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-mac-integration" = dontDistribute super."gtk3-mac-integration";
+  "gtkglext" = dontDistribute super."gtkglext";
+  "gtkimageview" = dontDistribute super."gtkimageview";
+  "gtkrsync" = dontDistribute super."gtkrsync";
+  "gtksourceview2" = dontDistribute super."gtksourceview2";
+  "gtksourceview3" = dontDistribute super."gtksourceview3";
+  "guarded-rewriting" = dontDistribute super."guarded-rewriting";
+  "guess-combinator" = dontDistribute super."guess-combinator";
+  "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_2_1";
+  "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";
+  "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-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-leksah" = dontDistribute super."haddock-leksah";
+  "haddocset" = dontDistribute super."haddocset";
+  "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";
+  "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-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-sass" = dontDistribute super."hakyll-sass";
+  "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";
+  "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";
+  "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";
+  "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_2";
+  "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-formatter" = dontDistribute super."haskell-formatter";
+  "haskell-ftp" = dontDistribute super."haskell-ftp";
+  "haskell-generate" = dontDistribute super."haskell-generate";
+  "haskell-gi" = dontDistribute super."haskell-gi";
+  "haskell-gi-base" = dontDistribute super."haskell-gi-base";
+  "haskell-import-graph" = dontDistribute super."haskell-import-graph";
+  "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpi" = dontDistribute super."haskell-mpi";
+  "haskell-names" = dontDistribute super."haskell-names";
+  "haskell-openflow" = dontDistribute super."haskell-openflow";
+  "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
+  "haskell-platform-test" = dontDistribute super."haskell-platform-test";
+  "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" = doDistribute super."hasql_0_15_1_1";
+  "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-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-amazonka" = dontDistribute super."haxl-amazonka";
+  "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";
+  "hbayes" = dontDistribute super."hbayes";
+  "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";
+  "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";
+  "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-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";
+  "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";
+  "hesql" = dontDistribute super."hesql";
+  "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";
+  "hformat" = dontDistribute super."hformat";
+  "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";
+  "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";
+  "hinquire" = dontDistribute super."hinquire";
+  "hinstaller" = dontDistribute super."hinstaller";
+  "hint-server" = dontDistribute super."hint-server";
+  "hinvaders" = dontDistribute super."hinvaders";
+  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hipbot" = dontDistribute super."hipbot";
+  "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";
+  "hjcase" = dontDistribute super."hjcase";
+  "hjpath" = dontDistribute super."hjpath";
+  "hjs" = dontDistribute super."hjs";
+  "hjson" = dontDistribute super."hjson";
+  "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";
+  "hledger-chart" = dontDistribute super."hledger-chart";
+  "hledger-diff" = dontDistribute super."hledger-diff";
+  "hledger-irr" = dontDistribute super."hledger-irr";
+  "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" = dontDistribute super."hmt";
+  "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";
+  "hoauth2" = doDistribute super."hoauth2_0_5_0_1";
+  "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";
+  "hopfield" = dontDistribute super."hopfield";
+  "hopfield-networks" = dontDistribute super."hopfield-networks";
+  "hopfli" = dontDistribute super."hopfli";
+  "hops" = dontDistribute super."hops";
+  "hoq" = dontDistribute super."hoq";
+  "horizon" = dontDistribute super."horizon";
+  "hosc" = dontDistribute super."hosc";
+  "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";
+  "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";
+  "hpack" = dontDistribute super."hpack";
+  "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";
+  "hpc-strobe" = dontDistribute super."hpc-strobe";
+  "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hplayground" = dontDistribute super."hplayground";
+  "hplaylist" = dontDistribute super."hplaylist";
+  "hpodder" = dontDistribute super."hpodder";
+  "hpp" = dontDistribute super."hpp";
+  "hpqtypes" = dontDistribute super."hpqtypes";
+  "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-GeoIP" = dontDistribute super."hs-GeoIP";
+  "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";
+  "hsb2hs" = dontDistribute super."hsb2hs";
+  "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";
+  "hsdev" = dontDistribute super."hsdev";
+  "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-monad-control" = dontDistribute super."hspec-monad-control";
+  "hspec-server" = dontDistribute super."hspec-server";
+  "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "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";
+  "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-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";
+  "htoml" = dontDistribute super."htoml";
+  "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-streams" = dontDistribute super."http-client-streams";
+  "http-conduit-browser" = dontDistribute super."http-conduit-browser";
+  "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-encodings" = dontDistribute super."http-encodings";
+  "http-enumerator" = dontDistribute super."http-enumerator";
+  "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-server" = dontDistribute super."http-server";
+  "http-shed" = dontDistribute super."http-shed";
+  "http-test" = dontDistribute super."http-test";
+  "http-wget" = dontDistribute super."http-wget";
+  "http2" = doDistribute super."http2_1_3_1";
+  "httpd-shed" = dontDistribute super."httpd-shed";
+  "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";
+  "human-readable-duration" = doDistribute super."human-readable-duration_0_1_1_0";
+  "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";
+  "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";
+  "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";
+  "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";
+  "identifiers" = dontDistribute super."identifiers";
+  "idiii" = dontDistribute super."idiii";
+  "idna" = dontDistribute super."idna";
+  "idna2008" = dontDistribute super."idna2008";
+  "idris" = dontDistribute super."idris";
+  "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-inline-r" = dontDistribute super."ihaskell-inline-r";
+  "ihaskell-parsec" = dontDistribute super."ihaskell-parsec";
+  "ihaskell-plot" = dontDistribute super."ihaskell-plot";
+  "ihaskell-widgets" = dontDistribute super."ihaskell-widgets";
+  "ihttp" = dontDistribute super."ihttp";
+  "illuminate" = dontDistribute super."illuminate";
+  "image-type" = dontDistribute super."image-type";
+  "imagefilters" = dontDistribute super."imagefilters";
+  "imagemagick" = dontDistribute super."imagemagick";
+  "imagepaste" = dontDistribute super."imagepaste";
+  "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-params" = dontDistribute super."implicit-params";
+  "imports" = dontDistribute super."imports";
+  "improve" = dontDistribute super."improve";
+  "inc-ref" = dontDistribute super."inc-ref";
+  "inch" = dontDistribute super."inch";
+  "incremental-computing" = dontDistribute super."incremental-computing";
+  "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
+  "increments" = dontDistribute super."increments";
+  "indentation" = dontDistribute super."indentation";
+  "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-r" = dontDistribute super."inline-r";
+  "inquire" = dontDistribute super."inquire";
+  "inserts" = dontDistribute super."inserts";
+  "inspection-proxy" = dontDistribute super."inspection-proxy";
+  "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";
+  "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";
+  "intern" = dontDistribute super."intern";
+  "internetmarke" = dontDistribute super."internetmarke";
+  "interpol" = dontDistribute super."interpol";
+  "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
+  "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
+  "interpolation" = dontDistribute super."interpolation";
+  "intricacy" = dontDistribute super."intricacy";
+  "intset" = dontDistribute super."intset";
+  "invariant" = doDistribute super."invariant_0_2_2";
+  "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-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-colors" = dontDistribute super."irc-colors";
+  "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";
+  "ircbot" = dontDistribute super."ircbot";
+  "ircbouncer" = dontDistribute super."ircbouncer";
+  "ireal" = dontDistribute super."ireal";
+  "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";
+  "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-backend-c" = dontDistribute super."ivory-backend-c";
+  "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "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-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";
+  "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";
+  "jose" = dontDistribute super."jose";
+  "jpeg" = dontDistribute super."jpeg";
+  "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_11_3";
+  "jsaddle" = dontDistribute super."jsaddle";
+  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
+  "jsc" = dontDistribute super."jsc";
+  "jsmw" = dontDistribute super."jsmw";
+  "json-assertions" = dontDistribute super."json-assertions";
+  "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-litobj" = dontDistribute super."json-litobj";
+  "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";
+  "judy" = dontDistribute super."judy";
+  "jukebox" = dontDistribute super."jukebox";
+  "jumpthefive" = dontDistribute super."jumpthefive";
+  "jvm-parser" = dontDistribute super."jvm-parser";
+  "kademlia" = dontDistribute super."kademlia";
+  "kafka-client" = dontDistribute super."kafka-client";
+  "kangaroo" = dontDistribute super."kangaroo";
+  "kansas-comet" = dontDistribute super."kansas-comet";
+  "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";
+  "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";
+  "keys" = doDistribute super."keys_3_10_2";
+  "keystore" = dontDistribute super."keystore";
+  "keyvaluehash" = dontDistribute super."keyvaluehash";
+  "keyword-args" = dontDistribute super."keyword-args";
+  "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";
+  "lackey" = dontDistribute super."lackey";
+  "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-samples" = dontDistribute super."lambdacube-samples";
+  "lambdatex" = dontDistribute super."lambdatex";
+  "lambdatwit" = dontDistribute super."lambdatwit";
+  "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-c-quote" = dontDistribute super."language-c-quote";
+  "language-cil" = dontDistribute super."language-cil";
+  "language-css" = dontDistribute super."language-css";
+  "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_6_2_0";
+  "language-typescript" = dontDistribute super."language-typescript";
+  "language-vhdl" = dontDistribute super."language-vhdl";
+  "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";
+  "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";
+  "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";
+  "leksah-server" = dontDistribute super."leksah-server";
+  "lendingclub" = dontDistribute super."lendingclub";
+  "lens-datetime" = dontDistribute super."lens-datetime";
+  "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";
+  "lentil" = dontDistribute super."lentil";
+  "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";
+  "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";
+  "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";
+  "libxml" = dontDistribute super."libxml";
+  "libxml-enumerator" = dontDistribute super."libxml-enumerator";
+  "libxslt" = dontDistribute super."libxslt";
+  "life" = dontDistribute super."life";
+  "lift-generics" = dontDistribute super."lift-generics";
+  "lifted-async" = doDistribute super."lifted-async_0_7_0_2";
+  "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" = doDistribute super."linear_1_20_3";
+  "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";
+  "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";
+  "load-env" = dontDistribute super."load-env";
+  "loadavg" = dontDistribute super."loadavg";
+  "local-address" = dontDistribute super."local-address";
+  "local-search" = dontDistribute super."local-search";
+  "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";
+  "logfloat" = dontDistribute super."logfloat";
+  "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";
+  "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";
+  "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";
+  "ltk" = dontDistribute super."ltk";
+  "ltl" = dontDistribute super."ltl";
+  "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";
+  "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";
+  "maccatcher" = dontDistribute super."maccatcher";
+  "machinecell" = dontDistribute super."machinecell";
+  "machines-binary" = dontDistribute super."machines-binary";
+  "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";
+  "mainland-pretty" = dontDistribute super."mainland-pretty";
+  "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";
+  "managed" = doDistribute super."managed_1_0_1";
+  "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";
+  "manifold-random" = dontDistribute super."manifold-random";
+  "manifolds" = dontDistribute super."manifolds";
+  "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";
+  "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";
+  "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_2_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";
+  "memory" = doDistribute super."memory_0_10";
+  "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" = doDistribute super."microlens_0_3_5_1";
+  "microlens-aeson" = dontDistribute super."microlens-aeson";
+  "microlens-contra" = dontDistribute super."microlens-contra";
+  "microlens-each" = dontDistribute super."microlens-each";
+  "microlens-ghc" = doDistribute super."microlens-ghc_0_3_1_0";
+  "microlens-mtl" = doDistribute super."microlens-mtl_0_1_6_0";
+  "microlens-platform" = doDistribute super."microlens-platform_0_1_7_0";
+  "microlens-th" = doDistribute super."microlens-th_0_2_2_0";
+  "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";
+  "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-exception" = dontDistribute super."monad-exception";
+  "monad-fork" = dontDistribute super."monad-fork";
+  "monad-gen" = dontDistribute super."monad-gen";
+  "monad-interleave" = dontDistribute super."monad-interleave";
+  "monad-levels" = dontDistribute super."monad-levels";
+  "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-stlike-io" = dontDistribute super."monad-stlike-io";
+  "monad-stlike-stm" = dontDistribute super."monad-stlike-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";
+  "monadplus" = dontDistribute super."monadplus";
+  "monads-fd" = dontDistribute super."monads-fd";
+  "monadtransform" = dontDistribute super."monadtransform";
+  "monarch" = dontDistribute super."monarch";
+  "mongodb-queue" = dontDistribute super."mongodb-queue";
+  "mongrel2-handler" = dontDistribute super."mongrel2-handler";
+  "monitor" = dontDistribute super."monitor";
+  "mono-foldable" = dontDistribute super."mono-foldable";
+  "mono-traversable" = doDistribute super."mono-traversable_0_10_0_1";
+  "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-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";
+  "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";
+  "multext-east-msd" = dontDistribute super."multext-east-msd";
+  "multi-cabal" = dontDistribute super."multi-cabal";
+  "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";
+  "multiset-comb" = dontDistribute super."multiset-comb";
+  "multisetrewrite" = dontDistribute super."multisetrewrite";
+  "multistate" = dontDistribute super."multistate";
+  "muon" = dontDistribute super."muon";
+  "murder" = dontDistribute super."murder";
+  "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" = dontDistribute super."mustache";
+  "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";
+  "names-th" = dontDistribute super."names-th";
+  "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";
+  "nanq" = dontDistribute super."nanq";
+  "narc" = dontDistribute super."narc";
+  "nat" = dontDistribute super."nat";
+  "nats-queue" = dontDistribute super."nats-queue";
+  "natural-number" = dontDistribute super."natural-number";
+  "natural-numbers" = dontDistribute super."natural-numbers";
+  "natural-transformation" = dontDistribute super."natural-transformation";
+  "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" = dontDistribute super."nested-routes";
+  "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-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-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
+  "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";
+  "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";
+  "niagra" = dontDistribute super."niagra";
+  "nibblestring" = dontDistribute super."nibblestring";
+  "nicify" = dontDistribute super."nicify";
+  "nicify-lib" = dontDistribute super."nicify-lib";
+  "nicovideo-translator" = dontDistribute super."nicovideo-translator";
+  "nikepub" = dontDistribute super."nikepub";
+  "nimber" = dontDistribute super."nimber";
+  "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";
+  "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";
+  "number" = dontDistribute super."number";
+  "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";
+  "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";
+  "octohat" = dontDistribute super."octohat";
+  "octopus" = dontDistribute super."octopus";
+  "oculus" = dontDistribute super."oculus";
+  "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-classy" = dontDistribute super."opaleye-classy";
+  "opaleye-sqlite" = dontDistribute super."opaleye-sqlite";
+  "opaleye-trans" = dontDistribute super."opaleye-trans";
+  "open-haddock" = dontDistribute super."open-haddock";
+  "open-pandoc" = dontDistribute super."open-pandoc";
+  "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";
+  "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-applicative" = doDistribute super."optparse-applicative_0_12_0_0";
+  "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-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";
+  "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";
+  "overture" = dontDistribute super."overture";
+  "pack" = dontDistribute super."pack";
+  "package-o-tron" = dontDistribute super."package-o-tron";
+  "package-vt" = dontDistribute super."package-vt";
+  "packdeps" = dontDistribute super."packdeps";
+  "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";
+  "pagerduty" = dontDistribute super."pagerduty";
+  "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palindromes" = dontDistribute super."palindromes";
+  "pam" = dontDistribute super."pam";
+  "panda" = dontDistribute super."panda";
+  "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-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";
+  "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";
+  "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";
+  "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";
+  "path-io" = dontDistribute super."path-io";
+  "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";
+  "period" = dontDistribute super."period";
+  "perm" = dontDistribute super."perm";
+  "permutation" = dontDistribute super."permutation";
+  "permute" = dontDistribute super."permute";
+  "persist2er" = dontDistribute super."persist2er";
+  "persistable-record" = dontDistribute super."persistable-record";
+  "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-cereal" = dontDistribute super."persistent-cereal";
+  "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-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-postgresql" = doDistribute super."persistent-postgresql_2_2_1_2";
+  "persistent-protobuf" = dontDistribute super."persistent-protobuf";
+  "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
+  "persistent-redis" = dontDistribute super."persistent-redis";
+  "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";
+  "pgdl" = dontDistribute super."pgdl";
+  "pgm" = dontDistribute super."pgm";
+  "pgsql-simple" = dontDistribute super."pgsql-simple";
+  "pgstream" = dontDistribute super."pgstream";
+  "phasechange" = dontDistribute super."phasechange";
+  "phizzle" = dontDistribute super."phizzle";
+  "phoityne" = dontDistribute super."phoityne";
+  "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";
+  "pipe-enumerator" = dontDistribute super."pipe-enumerator";
+  "pipeclip" = dontDistribute super."pipeclip";
+  "pipes" = doDistribute super."pipes_4_1_7";
+  "pipes-async" = dontDistribute super."pipes-async";
+  "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "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-http" = dontDistribute super."pipes-http";
+  "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "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-shell" = dontDistribute super."pipes-shell";
+  "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-transduce" = dontDistribute super."pipes-transduce";
+  "pipes-vector" = dontDistribute super."pipes-vector";
+  "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
+  "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";
+  "pointfree" = dontDistribute super."pointfree";
+  "pointful" = dontDistribute super."pointful";
+  "pointless-fun" = dontDistribute super."pointless-fun";
+  "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";
+  "polyToMonoid" = dontDistribute super."polyToMonoid";
+  "polymap" = dontDistribute super."polymap";
+  "polynomial" = dontDistribute super."polynomial";
+  "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
+  "polyseq" = dontDistribute super."polyseq";
+  "polysoup" = dontDistribute super."polysoup";
+  "polytypeable" = dontDistribute super."polytypeable";
+  "polytypeable-utils" = dontDistribute super."polytypeable-utils";
+  "ponder" = dontDistribute super."ponder";
+  "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-binary" = doDistribute super."postgresql-binary_0_7_4_1";
+  "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-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-mtl" = dontDistribute super."pqueue-mtl";
+  "practice-room" = dontDistribute super."practice-room";
+  "precis" = dontDistribute super."precis";
+  "pred-trie" = dontDistribute super."pred-trie";
+  "predicates" = dontDistribute super."predicates";
+  "prednote-test" = dontDistribute super."prednote-test";
+  "prefork" = dontDistribute super."prefork";
+  "pregame" = dontDistribute super."pregame";
+  "prelude-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-generalize" = dontDistribute super."prelude-generalize";
+  "prelude-plus" = dontDistribute super."prelude-plus";
+  "prelude-prime" = dontDistribute super."prelude-prime";
+  "prelude-safeenum" = dontDistribute super."prelude-safeenum";
+  "preprocess-haskell" = dontDistribute super."preprocess-haskell";
+  "preprocessor-tools" = dontDistribute super."preprocessor-tools";
+  "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-hex" = dontDistribute super."pretty-hex";
+  "pretty-ncols" = dontDistribute super."pretty-ncols";
+  "pretty-sop" = dontDistribute super."pretty-sop";
+  "pretty-tree" = dontDistribute super."pretty-tree";
+  "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-uniq" = dontDistribute super."prim-uniq";
+  "primula-board" = dontDistribute super."primula-board";
+  "primula-bot" = dontDistribute super."primula-bot";
+  "printf-mauke" = dontDistribute super."printf-mauke";
+  "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_6";
+  "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";
+  "process-streaming" = dontDistribute super."process-streaming";
+  "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";
+  "profiteur" = dontDistribute super."profiteur";
+  "profunctors" = doDistribute super."profunctors_5_1_2";
+  "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";
+  "promise" = dontDistribute super."promise";
+  "promises" = dontDistribute super."promises";
+  "prompt" = dontDistribute super."prompt";
+  "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-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";
+  "pseudo-boolean" = dontDistribute super."pseudo-boolean";
+  "pseudo-trie" = dontDistribute super."pseudo-trie";
+  "pseudomacros" = dontDistribute super."pseudomacros";
+  "pub" = dontDistribute super."pub";
+  "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-simple" = dontDistribute super."pulse-simple";
+  "punkt" = dontDistribute super."punkt";
+  "punycode" = dontDistribute super."punycode";
+  "puppetresources" = dontDistribute super."puppetresources";
+  "pure-cdb" = dontDistribute super."pure-cdb";
+  "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-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "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-http-haskell" = dontDistribute super."pusher-http-haskell";
+  "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";
+  "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-simple" = dontDistribute super."quickcheck-simple";
+  "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver";
+  "quicklz" = dontDistribute super."quicklz";
+  "quickpull" = dontDistribute super."quickpull";
+  "quickset" = dontDistribute super."quickset";
+  "quickspec" = dontDistribute super."quickspec";
+  "quicktest" = dontDistribute super."quicktest";
+  "quickwebapp" = dontDistribute super."quickwebapp";
+  "quiver" = dontDistribute super."quiver";
+  "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-http" = dontDistribute super."quiver-http";
+  "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-set-list" = dontDistribute super."range-set-list";
+  "range-space" = dontDistribute super."range-space";
+  "rangemin" = dontDistribute super."rangemin";
+  "ranges" = dontDistribute super."ranges";
+  "rascal" = dontDistribute super."rascal";
+  "rate-limit" = dontDistribute super."rate-limit";
+  "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";
+  "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-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";
+  "reactor" = dontDistribute super."reactor";
+  "read-bounded" = dontDistribute super."read-bounded";
+  "readable" = dontDistribute super."readable";
+  "readline-statevar" = dontDistribute super."readline-statevar";
+  "readpyc" = dontDistribute super."readpyc";
+  "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
+  "reasonable-lens" = dontDistribute super."reasonable-lens";
+  "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "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";
+  "recursion-schemes" = dontDistribute super."recursion-schemes";
+  "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";
+  "reedsolomon" = dontDistribute super."reedsolomon";
+  "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-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
+  "reflex-transformers" = dontDistribute super."reflex-transformers";
+  "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
+  "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-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";
+  "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-query" = dontDistribute super."relational-query";
+  "relational-query-HDBC" = dontDistribute super."relational-query-HDBC";
+  "relational-record" = dontDistribute super."relational-record";
+  "relational-record-examples" = dontDistribute super."relational-record-examples";
+  "relational-schemas" = dontDistribute super."relational-schemas";
+  "relative-date" = dontDistribute super."relative-date";
+  "relit" = dontDistribute super."relit";
+  "rematch" = dontDistribute super."rematch";
+  "rematch-text" = dontDistribute super."rematch-text";
+  "remote" = dontDistribute super."remote";
+  "remote-debugger" = dontDistribute super."remote-debugger";
+  "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";
+  "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-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-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";
+  "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";
+  "rmonad" = dontDistribute super."rmonad";
+  "rncryptor" = dontDistribute super."rncryptor";
+  "rng-utils" = dontDistribute super."rng-utils";
+  "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";
+  "rotating-log" = dontDistribute super."rotating-log";
+  "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";
+  "s3-signer" = dontDistribute super."s3-signer";
+  "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";
+  "sandlib" = dontDistribute super."sandlib";
+  "sarasvati" = dontDistribute super."sarasvati";
+  "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";
+  "sbv" = doDistribute super."sbv_5_9";
+  "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";
+  "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-rest" = dontDistribute super."scotty-rest";
+  "scotty-session" = dontDistribute super."scotty-session";
+  "scotty-tls" = dontDistribute super."scotty-tls";
+  "scp-streams" = dontDistribute super."scp-streams";
+  "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "scrobble" = dontDistribute super."scrobble";
+  "scroll" = dontDistribute super."scroll";
+  "scrypt" = dontDistribute super."scrypt";
+  "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";
+  "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";
+  "semiring-simple" = dontDistribute super."semiring-simple";
+  "semver-range" = dontDistribute super."semver-range";
+  "sendgrid-haskell" = dontDistribute super."sendgrid-haskell";
+  "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";
+  "serialport" = dontDistribute super."serialport";
+  "serv" = dontDistribute super."serv";
+  "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-ede" = dontDistribute super."servant-ede";
+  "servant-examples" = dontDistribute super."servant-examples";
+  "servant-github" = dontDistribute super."servant-github";
+  "servant-lucid" = dontDistribute super."servant-lucid";
+  "servant-mock" = dontDistribute super."servant-mock";
+  "servant-pool" = dontDistribute super."servant-pool";
+  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-response" = dontDistribute super."servant-response";
+  "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-swagger" = dontDistribute super."servant-swagger";
+  "ses-html" = dontDistribute super."ses-html";
+  "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-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";
+  "shelltestrunner" = dontDistribute super."shelltestrunner";
+  "shelly-extra" = dontDistribute super."shelly-extra";
+  "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" = dontDistribute super."simple-log";
+  "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-smt" = dontDistribute super."simple-smt";
+  "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" = dontDistribute super."simpleirc";
+  "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";
+  "sink" = dontDistribute super."sink";
+  "sirkel" = dontDistribute super."sirkel";
+  "sitemap" = dontDistribute super."sitemap";
+  "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";
+  "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";
+  "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";
+  "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-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-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";
+  "soegtk" = dontDistribute super."soegtk";
+  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
+  "sophia" = dontDistribute super."sophia";
+  "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
+  "sorted" = dontDistribute super."sorted";
+  "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";
+  "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";
+  "spool" = dontDistribute super."spool";
+  "spoonutil" = dontDistribute super."spoonutil";
+  "spoty" = dontDistribute super."spoty";
+  "spreadsheet" = dontDistribute super."spreadsheet";
+  "spritz" = dontDistribute super."spritz";
+  "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";
+  "sql-words" = dontDistribute super."sql-words";
+  "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";
+  "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" = doDistribute super."stack_1_0_0";
+  "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
+  "stack-prism" = dontDistribute super."stack-prism";
+  "stack-run" = dontDistribute super."stack-run";
+  "stackage-curator" = doDistribute super."stackage-curator_0_11_0";
+  "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-plus" = dontDistribute super."state-plus";
+  "state-record" = dontDistribute super."state-record";
+  "statechart" = dontDistribute super."statechart";
+  "stateful-mtl" = dontDistribute super."stateful-mtl";
+  "statestack" = doDistribute super."statestack_0_2_0_4";
+  "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-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";
+  "stopwatch" = dontDistribute super."stopwatch";
+  "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";
+  "str" = dontDistribute super."str";
+  "stratum-tool" = dontDistribute super."stratum-tool";
+  "stream-fusion" = dontDistribute super."stream-fusion";
+  "stream-monad" = dontDistribute super."stream-monad";
+  "streamed" = dontDistribute super."streamed";
+  "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "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-conv" = dontDistribute super."string-conv";
+  "string-convert" = dontDistribute super."string-convert";
+  "string-quote" = dontDistribute super."string-quote";
+  "string-similarity" = dontDistribute super."string-similarity";
+  "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" = dontDistribute super."stripe-core";
+  "stripe-haskell" = dontDistribute super."stripe-haskell";
+  "stripe-http-streams" = dontDistribute super."stripe-http-streams";
+  "strive" = dontDistribute super."strive";
+  "strptime" = dontDistribute super."strptime";
+  "structs" = dontDistribute super."structs";
+  "structural-induction" = dontDistribute super."structural-induction";
+  "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";
+  "suffixarray" = dontDistribute super."suffixarray";
+  "suffixtree" = dontDistribute super."suffixtree";
+  "sugarhaskell" = dontDistribute super."sugarhaskell";
+  "suitable" = dontDistribute super."suitable";
+  "sump" = dontDistribute super."sump";
+  "sundown" = dontDistribute super."sundown";
+  "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";
+  "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_1_1_1";
+  "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";
+  "symbol" = dontDistribute super."symbol";
+  "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-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";
+  "ta" = dontDistribute super."ta";
+  "table" = dontDistribute super."table";
+  "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-transformer" = dontDistribute super."tagged-transformer";
+  "tagging" = dontDistribute super."tagging";
+  "taggy" = dontDistribute super."taggy";
+  "taggy-lens" = dontDistribute super."taggy-lens";
+  "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";
+  "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";
+  "tar" = doDistribute super."tar_0_4_2_2";
+  "target" = dontDistribute super."target";
+  "task" = dontDistribute super."task";
+  "taskpool" = dontDistribute super."taskpool";
+  "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";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "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";
+  "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-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" = dontDistribute super."test-framework-th-prime";
+  "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";
+  "test-simple" = dontDistribute super."test-simple";
+  "testPkg" = dontDistribute super."testPkg";
+  "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-and-plots" = dontDistribute super."text-and-plots";
+  "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-ldap" = dontDistribute super."text-ldap";
+  "text-locale-encoding" = dontDistribute super."text-locale-encoding";
+  "text-normal" = dontDistribute super."text-normal";
+  "text-position" = dontDistribute super."text-position";
+  "text-postgresql" = dontDistribute super."text-postgresql";
+  "text-printer" = dontDistribute super."text-printer";
+  "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
+  "text-register-machine" = dontDistribute super."text-register-machine";
+  "text-render" = dontDistribute super."text-render";
+  "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";
+  "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-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-lift" = doDistribute super."th-lift_0_7_5";
+  "th-lift-instances" = dontDistribute super."th-lift-instances";
+  "th-printf" = dontDistribute super."th-printf";
+  "th-reify-many" = doDistribute super."th-reify-many_0_1_3";
+  "th-sccs" = dontDistribute super."th-sccs";
+  "th-traced" = dontDistribute super."th-traced";
+  "th-typegraph" = dontDistribute super."th-typegraph";
+  "themoviedb" = dontDistribute super."themoviedb";
+  "themplate" = dontDistribute super."themplate";
+  "theoremquest" = dontDistribute super."theoremquest";
+  "theoremquest-client" = dontDistribute super."theoremquest-client";
+  "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";
+  "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" = dontDistribute super."tidal";
+  "tidal-midi" = dontDistribute super."tidal-midi";
+  "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-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-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-time" = dontDistribute super."timelike-time";
+  "timemap" = dontDistribute super."timemap";
+  "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";
+  "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-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";
+  "tracker" = dontDistribute super."tracker";
+  "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-compose" = dontDistribute super."transformers-compose";
+  "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-runnable" = dontDistribute super."transformers-runnable";
+  "transformers-supply" = dontDistribute super."transformers-supply";
+  "transient" = dontDistribute super."transient";
+  "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";
+  "true-name" = doDistribute super."true-name_0_0_0_2";
+  "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";
+  "tslogger" = dontDistribute super."tslogger";
+  "tsp-viz" = dontDistribute super."tsp-viz";
+  "tsparse" = dontDistribute super."tsparse";
+  "tst" = dontDistribute super."tst";
+  "tsvsql" = dontDistribute super."tsvsql";
+  "tubes" = dontDistribute super."tubes";
+  "tuntap" = dontDistribute super."tuntap";
+  "tup-functor" = dontDistribute super."tup-functor";
+  "tuple" = dontDistribute super."tuple";
+  "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";
+  "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
+  "turni" = dontDistribute super."turni";
+  "tweak" = dontDistribute super."tweak";
+  "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";
+  "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-conduit" = dontDistribute super."twitter-conduit";
+  "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-types" = dontDistribute super."twitter-types";
+  "twitter-types-lens" = dontDistribute super."twitter-types-lens";
+  "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-aligned" = dontDistribute super."type-aligned";
+  "type-booleans" = dontDistribute super."type-booleans";
+  "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-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";
+  "typelits-witnesses" = doDistribute super."typelits-witnesses_0_1_1_0";
+  "typeof" = dontDistribute super."typeof";
+  "typeparams" = dontDistribute super."typeparams";
+  "typesafe-endian" = dontDistribute super."typesafe-endian";
+  "typescript-docs" = dontDistribute super."typescript-docs";
+  "typical" = dontDistribute super."typical";
+  "typography-geometry" = dontDistribute super."typography-geometry";
+  "uAgda" = dontDistribute super."uAgda";
+  "ua-parser" = dontDistribute super."ua-parser";
+  "uacpid" = dontDistribute super."uacpid";
+  "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";
+  "unexceptionalio" = dontDistribute super."unexceptionalio";
+  "unfoldable" = dontDistribute super."unfoldable";
+  "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-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";
+  "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-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";
+  "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";
+  "vado" = dontDistribute super."vado";
+  "valid-names" = dontDistribute super."valid-names";
+  "validate" = dontDistribute super."validate";
+  "validated-literals" = dontDistribute super."validated-literals";
+  "validation" = dontDistribute super."validation";
+  "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";
+  "vcd" = dontDistribute super."vcd";
+  "vcs-revision" = dontDistribute super."vcs-revision";
+  "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
+  "vcsgui" = dontDistribute super."vcsgui";
+  "vcswrapper" = dontDistribute super."vcswrapper";
+  "vect" = dontDistribute super."vect";
+  "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-space-map" = dontDistribute super."vector-space-map";
+  "vector-space-opengl" = dontDistribute super."vector-space-opengl";
+  "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" = dontDistribute super."versions";
+  "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-utils" = dontDistribute super."vinyl-utils";
+  "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";
+  "vivid" = dontDistribute super."vivid";
+  "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";
+  "waddle" = dontDistribute super."waddle";
+  "wai" = doDistribute super."wai_3_0_5_0";
+  "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-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-request-spec" = dontDistribute super."wai-request-spec";
+  "wai-responsible" = dontDistribute super."wai-responsible";
+  "wai-router" = dontDistribute super."wai-router";
+  "wai-routes" = doDistribute super."wai-routes_0_9_5";
+  "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" = doDistribute super."warp_3_1_12";
+  "warp-dynamic" = dontDistribute super."warp-dynamic";
+  "warp-static" = dontDistribute super."warp-static";
+  "warp-tls" = doDistribute super."warp-tls_3_1_5";
+  "warp-tls-uid" = dontDistribute super."warp-tls-uid";
+  "watchdog" = dontDistribute super."watchdog";
+  "watcher" = dontDistribute super."watcher";
+  "watchit" = dontDistribute super."watchit";
+  "wavconvert" = dontDistribute super."wavconvert";
+  "wavefront" = dontDistribute super."wavefront";
+  "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-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";
+  "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" = dontDistribute super."webkitgtk3";
+  "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "webrtc-vad" = dontDistribute super."webrtc-vad";
+  "webserver" = dontDistribute super."webserver";
+  "websnap" = dontDistribute super."websnap";
+  "websockets-snap" = dontDistribute super."websockets-snap";
+  "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";
+  "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";
+  "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";
+  "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";
+  "wuss" = dontDistribute super."wuss";
+  "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-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";
+  "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" = doDistribute super."yaml_0_8_15_2";
+  "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";
+  "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-oauth2" = dontDistribute super."yesod-auth-oauth2";
+  "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-json" = dontDistribute super."yesod-json";
+  "yesod-links" = dontDistribute super."yesod-links";
+  "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "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";
+  "yjtools" = dontDistribute super."yjtools";
+  "yocto" = dontDistribute super."yocto";
+  "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-conduit" = dontDistribute super."zip-conduit";
+  "zipedit" = dontDistribute super."zipedit";
+  "zipkin" = dontDistribute super."zipkin";
+  "zipper" = dontDistribute super."zipper";
+  "zippers" = dontDistribute super."zippers";
+  "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";
+  "zot" = dontDistribute super."zot";
+  "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 e24b039d786b..9fcaa3e41f27 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -6578,6 +6578,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "GPipe_2_1_6" = callPackage
+    ({ mkDerivation, base, Boolean, containers, exception-transformers
+     , gl, hashtables, linear, transformers
+     }:
+     mkDerivation {
+       pname = "GPipe";
+       version = "2.1.6";
+       sha256 = "2ab8d54731b9e0a5a799cb592f83c9d131534b9d9b1dc8098c36e698d23808f6";
+       libraryHaskellDepends = [
+         base Boolean containers exception-transformers gl hashtables linear
+         transformers
+       ];
+       homepage = "http://tobbebex.blogspot.se/";
+       description = "Typesafe functional GPU graphics programming";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "GPipe-Collada" = callPackage
     ({ mkDerivation, array, base, containers, GPipe, HaXml, mtl, Vec }:
      mkDerivation {
@@ -7715,8 +7733,8 @@ self: {
     ({ mkDerivation, array, base, X11 }:
      mkDerivation {
        pname = "HGL";
-       version = "3.2.2";
-       sha256 = "16a355c102ba057b8c9df363bfc65f6cf24a2d3fd9296cae911ab68eef0d762a";
+       version = "3.2.3.1";
+       sha256 = "d05dee7a9ebc45aba82922707c29033ca491a58adb88a63ab180d7459b163e55";
        libraryHaskellDepends = [ array base X11 ];
        description = "A simple graphics library based on X11 or Win32";
        license = stdenv.lib.licenses.bsd3;
@@ -9221,6 +9239,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "HUnit_1_3_1_1" = callPackage
+    ({ mkDerivation, base, deepseq, filepath }:
+     mkDerivation {
+       pname = "HUnit";
+       version = "1.3.1.1";
+       sha256 = "93e5fc4290ab685b469209f04d9858338ffff486e15c23a11260c47e32da8ef8";
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [ base deepseq filepath ];
+       homepage = "https://github.com/hspec/HUnit#readme";
+       description = "A unit testing framework for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "HUnit-Diff" = callPackage
     ({ mkDerivation, ansi-terminal, base, Diff, groom, HUnit }:
      mkDerivation {
@@ -9558,13 +9590,12 @@ self: {
      }:
      mkDerivation {
        pname = "HaTeX-qq";
-       version = "0.0.1.1";
-       sha256 = "34b73b1a3bc09d881ef4966a2e3324400877f99bb8cef6fa3fc09ebad36b50ce";
+       version = "0.0.1.2";
+       sha256 = "60db927820811c1bbc17890e21188caeb9441f40c6a5fb5c5436101eca4a0c61";
        libraryHaskellDepends = [
          antiquoter base haskell-src-meta HaTeX template-haskell text
          uniplate
        ];
-       jailbreak = true;
        description = "Quasiquoters for HaTeX";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -12244,6 +12275,22 @@ self: {
      }) {inherit (pkgs) ncurses;};
 
   "LibZip" = callPackage
+    ({ mkDerivation, base, bindings-libzip, bytestring, filepath, mtl
+     , time
+     }:
+     mkDerivation {
+       pname = "LibZip";
+       version = "0.10.2";
+       sha256 = "54d81de73bd7f4acd7cebe28e26931c0afd9fece905e289aaecbe103e2ab973a";
+       libraryHaskellDepends = [
+         base bindings-libzip bytestring filepath mtl time
+       ];
+       homepage = "http://bitbucket.org/astanin/hs-libzip/";
+       description = "Bindings to libzip, a library for manipulating zip archives";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "LibZip_0_11_1" = callPackage
     ({ mkDerivation, base, bindings-libzip, bytestring, directory
      , filepath, HUnit, mtl, time, utf8-string
      }:
@@ -12258,9 +12305,11 @@ self: {
          base bindings-libzip bytestring directory filepath HUnit mtl time
          utf8-string
        ];
+       jailbreak = true;
        homepage = "http://bitbucket.org/astanin/hs-libzip/";
        description = "Bindings to libzip, a library for manipulating zip archives";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Limit" = callPackage
@@ -13302,7 +13351,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "MonadRandom" = callPackage
+  "MonadRandom_0_4_1" = callPackage
     ({ mkDerivation, base, mtl, random, transformers
      , transformers-compat
      }:
@@ -13315,6 +13364,7 @@ self: {
        ];
        description = "Random-number generation monad";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MonadRandom_0_4_2_1" = callPackage
@@ -13333,6 +13383,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "MonadRandom" = callPackage
+    ({ mkDerivation, base, mtl, random, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "MonadRandom";
+       version = "0.4.2.2";
+       sha256 = "07cdf3801ae55a3e89298e902aecfc78d6d34096f7adefd4a826175dcd892a10";
+       libraryHaskellDepends = [
+         base mtl random transformers transformers-compat
+       ];
+       description = "Random-number generation monad";
+       license = "unknown";
+     }) {};
+
   "MonadRandomLazy" = callPackage
     ({ mkDerivation, base, MonadRandom, mtl, random }:
      mkDerivation {
@@ -14940,6 +15005,25 @@ self: {
        license = "LGPL";
      }) {};
 
+  "PUH-Project" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, mime-mail
+     , network, old-locale, persistent, persistent-sqlite
+     , persistent-template, pwstore-fast, random, smtp-mail, text, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "PUH-Project";
+       version = "0.1.0.0";
+       sha256 = "511308eeeea64fe89f13e6e1ccbd2cbd912c95f670926f2b181a7234c58dac6a";
+       libraryHaskellDepends = [
+         base bytestring containers directory mime-mail network old-locale
+         persistent persistent-sqlite persistent-template pwstore-fast
+         random smtp-mail text time transformers
+       ];
+       description = "This is a package which includes Assignments, Email, User and Reviews modules for Programming in Haskell course";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "PageIO" = callPackage
     ({ mkDerivation, array, attoparsec, base, base64-string, bytestring
      , containers, directory, iconv, network, old-time, regex-base
@@ -18114,7 +18198,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "StateVar" = callPackage
+  "StateVar_1_1_0_2" = callPackage
     ({ mkDerivation, base, stm, transformers }:
      mkDerivation {
        pname = "StateVar";
@@ -18124,9 +18208,10 @@ self: {
        homepage = "https://github.com/haskell-opengl/StateVar";
        description = "State variables";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "StateVar_1_1_0_3" = callPackage
+  "StateVar" = callPackage
     ({ mkDerivation, base, stm, transformers }:
      mkDerivation {
        pname = "StateVar";
@@ -18136,7 +18221,6 @@ self: {
        homepage = "https://github.com/haskell-opengl/StateVar";
        description = "State variables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "StateVar-transformer" = callPackage
@@ -19006,7 +19090,6 @@ self: {
        version = "0.9.11";
        sha256 = "124c2f9971aa8e45c8cc4f706407f9c28805e63b387400a0b2b9e115aa22044a";
        libraryHaskellDepends = [ base base-orphans ];
-       jailbreak = true;
        homepage = "https://github.com/conal/TypeCompose";
        description = "Type composition classes & instances";
        license = stdenv.lib.licenses.bsd3;
@@ -20872,8 +20955,8 @@ self: {
      }:
      mkDerivation {
        pname = "accelerate-cuda";
-       version = "0.15.1.0";
-       sha256 = "c05cb24ac4a98a0b962ffd5eaed2befe2b02815e1f8ed219e1d3d6a8b7f60650";
+       version = "0.15.1.1";
+       sha256 = "6140c60df329f78d77d258ae3029522cb7a3fb038c531e23792dd8b307ff379d";
        libraryHaskellDepends = [
          accelerate array base binary bytestring cryptohash cuda directory
          fclabels filepath hashable hashtables language-c-quote
@@ -22129,7 +22212,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "adjunctions" = callPackage
+  "adjunctions_4_2_2" = callPackage
     ({ mkDerivation, array, base, comonad, containers, contravariant
      , distributive, free, mtl, profunctors, semigroupoids, semigroups
      , tagged, transformers, void
@@ -22145,9 +22228,10 @@ self: {
        homepage = "http://github.com/ekmett/adjunctions/";
        description = "Adjunctions and representable functors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "adjunctions_4_3" = callPackage
+  "adjunctions" = callPackage
     ({ mkDerivation, array, base, comonad, containers, contravariant
      , distributive, free, mtl, profunctors, semigroupoids, semigroups
      , tagged, transformers, transformers-compat, void
@@ -22156,6 +22240,8 @@ self: {
        pname = "adjunctions";
        version = "4.3";
        sha256 = "b948a14fafe8857f451ae3e474f5264c907b5a2d841d52bf78249ae4749c3ecc";
+       revision = "1";
+       editedCabalFile = "f88c4f5440736d64ad6a478e9feccc116727b5dc616fc6535cfe64ff75a2e980";
        libraryHaskellDepends = [
          array base comonad containers contravariant distributive free mtl
          profunctors semigroupoids semigroups tagged transformers
@@ -22164,7 +22250,6 @@ self: {
        homepage = "http://github.com/ekmett/adjunctions/";
        description = "Adjunctions and representable functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "adobe-swatch-exchange" = callPackage
@@ -22295,6 +22380,35 @@ self: {
      }) {};
 
   "aeson" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
+     , dlist, ghc-prim, hashable, HUnit, mtl, QuickCheck, scientific
+     , syb, template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson";
+       version = "0.9.0.1";
+       sha256 = "92b97dbc4968a2af6bc13b499629118f85b22efe113a4d60e578fbfb0f6ef8bc";
+       revision = "1";
+       editedCabalFile = "651b27c1cd2730cd0234cc1fb5860dd74728e5ecc6682b2a5e857fd42d41fe22";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers deepseq dlist ghc-prim
+         hashable mtl scientific syb template-haskell text time transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring containers ghc-prim HUnit QuickCheck
+         template-haskell test-framework test-framework-hunit
+         test-framework-quickcheck2 text time unordered-containers vector
+       ];
+       doCheck = false;
+       homepage = "https://github.com/bos/aeson";
+       description = "Fast JSON parsing and encoding";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "aeson_0_10_0_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
      , dlist, ghc-prim, hashable, HUnit, mtl, QuickCheck, scientific
      , syb, template-haskell, test-framework, test-framework-hunit
@@ -22321,6 +22435,7 @@ self: {
        homepage = "https://github.com/bos/aeson";
        description = "Fast JSON parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-applicative" = callPackage
@@ -22625,6 +22740,7 @@ self: {
        libraryHaskellDepends = [
          aeson base parsec scientific text unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/FPBrno/aeson-parsec-picky";
        description = "Alternative JSON parser based on Parsec and Aeson";
        license = stdenv.lib.licenses.bsd3;
@@ -23224,6 +23340,7 @@ self: {
          base bytestring tasty tasty-hunit tasty-quickcheck text
          transformers wai
        ];
+       jailbreak = true;
        homepage = "https://github.com/helium/airship/";
        description = "A Webmachine-inspired HTTP library";
        license = stdenv.lib.licenses.mit;
@@ -23255,6 +23372,7 @@ self: {
          base bytestring tasty tasty-hunit tasty-quickcheck text
          transformers wai
        ];
+       jailbreak = true;
        homepage = "https://github.com/helium/airship/";
        description = "A Webmachine-inspired HTTP library";
        license = stdenv.lib.licenses.mit;
@@ -28185,6 +28303,8 @@ self: {
        pname = "apache-md5";
        version = "0.6.1.4";
        sha256 = "c84f882f6aca7b72d89ee662d358f40fe89ab3267ec418f3bee24a0d80b096b7";
+       revision = "1";
+       editedCabalFile = "a02fc33fc22e8a719df4c1c5a8974f4f60e9c7b42c916157611c9f7f72e1b516";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [
@@ -28453,6 +28573,7 @@ self: {
          apiary base bytestring data-default-class helics helics-wai
          monad-control text transformers types-compat vault wai
        ];
+       jailbreak = true;
        homepage = "https://github.com/philopon/apiary";
        description = "helics support for apiary web framework";
        license = stdenv.lib.licenses.mit;
@@ -29210,7 +29331,6 @@ self: {
          pcre-light process-extras tasty tasty-golden tasty-hunit time
          transformers unix utf8-string
        ];
-       jailbreak = true;
        homepage = "http://arbtt.nomeata.de/";
        description = "Automatic Rule-Based Time Tracker";
        license = "GPL";
@@ -31571,8 +31691,8 @@ self: {
      }:
      mkDerivation {
        pname = "avers";
-       version = "0.0.12";
-       sha256 = "fa8c71676e1400b94d38b5af8a8f0aa0335db1b867f1d22cc857b835aa61b90a";
+       version = "0.0.13";
+       sha256 = "419abfc046fdb3561d20ed65e4dfc07e140e1cc03406832060d5b218a3cf3f18";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring clock containers
          cryptohash filepath inflections MonadRandom mtl network network-uri
@@ -31585,12 +31705,48 @@ self: {
          rethinkdb-client-driver scrypt stm text time unordered-containers
          vector
        ];
-       jailbreak = true;
        description = "empty";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "avers-api" = callPackage
+    ({ mkDerivation, aeson, avers, base, bytestring, cookie, servant
+     , text, time
+     }:
+     mkDerivation {
+       pname = "avers-api";
+       version = "0.0.1";
+       sha256 = "a4b129911501494d231ecb13397b8bcac05ec6225a4122ec9b4f00e31b4cbd1b";
+       libraryHaskellDepends = [
+         aeson avers base bytestring cookie servant text time
+       ];
+       doHaddock = false;
+       homepage = "http://github.com/wereHamster/avers-api";
+       description = "Types describing the core and extended Avers APIs";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "avers-server" = callPackage
+    ({ mkDerivation, aeson, avers, avers-api, base, bytestring
+     , bytestring-conversion, cookie, either, http-types, mtl
+     , resource-pool, rethinkdb-client-driver, servant, servant-server
+     , text, time, transformers, wai, wai-websockets, websockets
+     }:
+     mkDerivation {
+       pname = "avers-server";
+       version = "0.0.1";
+       sha256 = "e61d4ec267e3ad71096360dde4081da4e044bb1a39b2b29b507c28ae5cae06c0";
+       libraryHaskellDepends = [
+         aeson avers avers-api base bytestring bytestring-conversion cookie
+         either http-types mtl resource-pool rethinkdb-client-driver servant
+         servant-server text time transformers wai wai-websockets websockets
+       ];
+       homepage = "http://github.com/wereHamster/avers-server";
+       description = "Server implementation of the Avers API";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "avl-static" = callPackage
     ({ mkDerivation, base, QuickCheck, test-framework
      , test-framework-quickcheck2
@@ -33153,7 +33309,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base-compat" = callPackage
+  "base-compat_0_8_2" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck, unix }:
      mkDerivation {
        pname = "base-compat";
@@ -33165,9 +33321,10 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A compatibility layer for base";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base-compat_0_9_0" = callPackage
+  "base-compat" = callPackage
     ({ mkDerivation, base, hspec, QuickCheck, unix }:
      mkDerivation {
        pname = "base-compat";
@@ -33177,7 +33334,6 @@ self: {
        testHaskellDepends = [ base hspec QuickCheck ];
        description = "A compatibility layer for base";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-generics" = callPackage
@@ -33252,7 +33408,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base-orphans" = callPackage
+  "base-orphans_0_4_5" = callPackage
     ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
      mkDerivation {
        pname = "base-orphans";
@@ -33263,9 +33419,10 @@ self: {
        homepage = "https://github.com/haskell-compat/base-orphans#readme";
        description = "Backwards-compatible orphan instances for base";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base-orphans_0_5_0" = callPackage
+  "base-orphans" = callPackage
     ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
      mkDerivation {
        pname = "base-orphans";
@@ -33276,7 +33433,6 @@ self: {
        homepage = "https://github.com/haskell-compat/base-orphans#readme";
        description = "Backwards-compatible orphan instances for base";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-prelude_0_1_6" = callPackage
@@ -34433,7 +34589,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "bifunctors" = callPackage
+  "bifunctors_5_1" = callPackage
     ({ mkDerivation, base, containers, hspec, QuickCheck, semigroups
      , tagged, template-haskell, transformers, transformers-compat
      }:
@@ -34452,9 +34608,10 @@ self: {
        homepage = "http://github.com/ekmett/bifunctors/";
        description = "Bifunctors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "bifunctors_5_2" = callPackage
+  "bifunctors" = callPackage
     ({ mkDerivation, base, comonad, containers, hspec, QuickCheck
      , semigroups, tagged, template-haskell, transformers
      , transformers-compat
@@ -34473,7 +34630,6 @@ self: {
        homepage = "http://github.com/ekmett/bifunctors/";
        description = "Bifunctors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bighugethesaurus" = callPackage
@@ -34615,7 +34771,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "bimap" = callPackage
+  "bimap_0_3_0" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "bimap";
@@ -34625,18 +34781,17 @@ self: {
        homepage = "https://github.com/joelwilliamson/bimap";
        description = "Bidirectional mapping between two key types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "bimap_0_3_1" = callPackage
+  "bimap" = callPackage
     ({ mkDerivation, base, containers, exceptions, QuickCheck
      , template-haskell
      }:
      mkDerivation {
        pname = "bimap";
-       version = "0.3.1";
-       sha256 = "b4e07666e79b81a00f43982191848b76a96784f0b29792290fbdec0b08ba4c0f";
-       revision = "1";
-       editedCabalFile = "b83cd7c739e00af80b8f73caa1661f1118541a50f679367d44ff33d48b29892a";
+       version = "0.3.2";
+       sha256 = "148fc2d9784aa79faf49a979881a2304102a70d13e32fa8ce9f18ab466dc3db8";
        libraryHaskellDepends = [ base containers exceptions ];
        testHaskellDepends = [
          base containers exceptions QuickCheck template-haskell
@@ -34644,7 +34799,6 @@ self: {
        homepage = "https://github.com/joelwilliamson/bimap";
        description = "Bidirectional mapping between two key types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bimap-server" = callPackage
@@ -35032,7 +35186,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "binary-search" = callPackage
+  "binary-search_0_1" = callPackage
     ({ mkDerivation, base, containers, directory, doctest, filepath
      , hspec, QuickCheck
      }:
@@ -35046,6 +35200,40 @@ self: {
        ];
        description = "Binary and exponential searches";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "binary-search" = callPackage
+    ({ mkDerivation, base, containers, directory, doctest, filepath
+     , hspec, QuickCheck
+     }:
+     mkDerivation {
+       pname = "binary-search";
+       version = "0.9";
+       sha256 = "6687d2a1ec0a759aabda6899ff4fda59ed929c497a90ae05507ed854b33bffda";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [
+         base directory doctest filepath hspec QuickCheck
+       ];
+       description = "Binary and exponential searches";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "binary-search_1_0_0_1" = callPackage
+    ({ mkDerivation, base, containers, directory, doctest, filepath
+     , hspec, QuickCheck
+     }:
+     mkDerivation {
+       pname = "binary-search";
+       version = "1.0.0.1";
+       sha256 = "4d5694054f6ef69aacc9e0135932e01a6bb20e6c49d69e39b2c9657ce4ae3795";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [
+         base directory doctest filepath hspec QuickCheck
+       ];
+       description = "Binary and exponential searches";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-shared" = callPackage
@@ -35803,6 +35991,19 @@ self: {
      }) {v4l2 = null;};
 
   "bindings-libzip" = callPackage
+    ({ mkDerivation, base, bindings-DSL, libzip }:
+     mkDerivation {
+       pname = "bindings-libzip";
+       version = "0.10.2";
+       sha256 = "e722c5da93f366bf81d390291098b43fd9bc0aa228f280bc7a0c9143a14c4897";
+       libraryHaskellDepends = [ base bindings-DSL ];
+       libraryPkgconfigDepends = [ libzip ];
+       homepage = "http://bitbucket.org/astanin/hs-libzip/";
+       description = "Low level bindings to libzip";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) libzip;};
+
+  "bindings-libzip_0_11" = callPackage
     ({ mkDerivation, base, bindings-DSL, libzip }:
      mkDerivation {
        pname = "bindings-libzip";
@@ -35813,6 +36014,7 @@ self: {
        homepage = "http://bitbucket.org/astanin/hs-libzip/";
        description = "Low level bindings to libzip";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libzip;};
 
   "bindings-linux-videodev2" = callPackage
@@ -36230,8 +36432,8 @@ self: {
      }:
      mkDerivation {
        pname = "biohazard";
-       version = "0.6.2";
-       sha256 = "0038256ab3a4072bd542b7fcdcf4a68ee2bd4afce14664bf4c2b3cb04fdef8c2";
+       version = "0.6.3";
+       sha256 = "063e812cb4c5c9c518363525cec4f309f9ebdf4c8af12e8bf88ca9f39edb47e5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38126,7 +38328,6 @@ self: {
          monad-loops pretty QuickCheck tasty tasty-golden tasty-hunit
          tasty-quickcheck text
        ];
-       jailbreak = true;
        homepage = "https://github.com/Microsoft/bond";
        description = "Bond schema compiler and code generator";
        license = stdenv.lib.licenses.mit;
@@ -38521,6 +38722,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "braid" = callPackage
+    ({ mkDerivation, base, containers, diagrams-contrib, diagrams-core
+     , diagrams-lib, diagrams-svg, split
+     }:
+     mkDerivation {
+       pname = "braid";
+       version = "0.1.0.0";
+       sha256 = "19a5f45ca45b30fcd09fe2909d3c07169a5c5216efbe4d2df7fcbc4f0b28ed99";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers diagrams-contrib diagrams-core diagrams-lib
+         diagrams-svg split
+       ];
+       executableHaskellDepends = [
+         base containers diagrams-contrib diagrams-core diagrams-lib
+         diagrams-svg split
+       ];
+       homepage = "http://github.com/githubuser/braid#readme";
+       description = "Types and functions to work with braids and Khovanov homology";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "brainfuck" = callPackage
     ({ mkDerivation, array, base, mtl, unix }:
      mkDerivation {
@@ -39545,7 +39769,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "bytes" = callPackage
+  "bytes_0_15_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, cereal, containers
      , directory, doctest, filepath, hashable, mtl, scientific, text
      , time, transformers, transformers-compat, unordered-containers
@@ -39564,9 +39788,10 @@ self: {
        homepage = "https://github.com/ekmett/bytes";
        description = "Sharing code for serialization between binary and cereal";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "bytes_0_15_2" = callPackage
+  "bytes" = callPackage
     ({ mkDerivation, base, binary, bytestring, cereal, containers
      , directory, doctest, filepath, hashable, mtl, scientific, text
      , time, transformers, transformers-compat, unordered-containers
@@ -39585,7 +39810,6 @@ self: {
        homepage = "https://github.com/ekmett/bytes";
        description = "Sharing code for serialization between binary and cereal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "byteset" = callPackage
@@ -39816,6 +40040,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        jailbreak = true;
+       doCheck = false;
        homepage = "http://hub.darcs.net/ganesh/bytestring-handle";
        description = "ByteString-backed Handles";
        license = stdenv.lib.licenses.bsd3;
@@ -40470,7 +40695,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cabal-debian" = callPackage
+  "cabal-debian_4_31_9" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, bifunctors, Cabal
      , containers, data-default, debian, deepseq, Diff, directory
      , exceptions, filepath, hsemail, HUnit, lens, memoize, mtl
@@ -40505,6 +40730,41 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "cabal-debian" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, bifunctors, Cabal
+     , containers, data-default, debian, deepseq, Diff, directory
+     , exceptions, filepath, hsemail, HUnit, lens, memoize, mtl
+     , network-uri, newtype-generics, optparse-applicative, parsec
+     , pretty, process, pureMD5, regex-tdfa, set-extra, syb, text, unix
+     , Unixutils, utf8-string
+     }:
+     mkDerivation {
+       pname = "cabal-debian";
+       version = "4.32.2";
+       sha256 = "63f80fc612511bc36857d05483fa67234b729e1847a8cf93985778bc0fb143ad";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-wl-pprint base bifunctors Cabal containers data-default debian
+         deepseq Diff directory exceptions filepath hsemail HUnit lens
+         memoize mtl network-uri newtype-generics optparse-applicative
+         parsec pretty process pureMD5 regex-tdfa set-extra syb text unix
+         Unixutils utf8-string
+       ];
+       executableHaskellDepends = [
+         base Cabal debian lens mtl pretty Unixutils
+       ];
+       testHaskellDepends = [
+         base Cabal containers debian Diff directory filepath hsemail HUnit
+         lens pretty process text
+       ];
+       doCheck = false;
+       homepage = "https://github.com/ddssff/cabal-debian";
+       description = "Create a Debianization for a Cabal package";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cabal-dependency-licenses" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath }:
      mkDerivation {
@@ -40677,6 +40937,35 @@ self: {
        license = stdenv.lib.licenses.agpl3;
      }) {};
 
+  "cabal-helper_0_6_3_1" = callPackage
+    ({ mkDerivation, base, bytestring, Cabal, cabal-install, directory
+     , extra, filepath, ghc-prim, mtl, process, template-haskell
+     , temporary, transformers, unix, utf8-string
+     }:
+     mkDerivation {
+       pname = "cabal-helper";
+       version = "0.6.3.1";
+       sha256 = "c19a9a87c54f6649e0f8cbb3a070244bff9fcc5b9ae783c00c049867fb1a7afe";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base Cabal directory filepath ghc-prim mtl process transformers
+       ];
+       executableHaskellDepends = [
+         base bytestring Cabal directory filepath ghc-prim process
+         template-haskell temporary transformers utf8-string
+       ];
+       testHaskellDepends = [
+         base bytestring Cabal directory extra filepath ghc-prim mtl process
+         template-haskell temporary transformers unix utf8-string
+       ];
+       testToolDepends = [ cabal-install ];
+       doCheck = false;
+       description = "Simple interface to some of Cabal's configuration state used by ghc-mod";
+       license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cabal-install_1_18_0_5" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , directory, filepath, HTTP, HUnit, mtl, network, pretty, process
@@ -42973,6 +43262,8 @@ self: {
        pname = "cassava";
        version = "0.4.2.3";
        sha256 = "4eb0cfc9ddd351e643d4787d3b778614b331431d5ab7e2f9c91376ea478dd08d";
+       revision = "1";
+       editedCabalFile = "2b71712f064f50be8f752c9f6f433f5df985091de4a01a7d0be3a520e1652807";
        libraryHaskellDepends = [
          array attoparsec base blaze-builder bytestring containers deepseq
          text unordered-containers vector
@@ -42999,6 +43290,8 @@ self: {
        pname = "cassava";
        version = "0.4.2.4";
        sha256 = "0a81bd1cb4c78158ffce0feec4d3f55f020a7e9abfc656e64f239662c916c4ed";
+       revision = "1";
+       editedCabalFile = "b04f4bc6b14e22b08f335f02e5c0dfe8adf04006bd5e55fefba07d33767265c0";
        libraryHaskellDepends = [
          array attoparsec base blaze-builder bytestring containers deepseq
          text unordered-containers vector
@@ -43025,8 +43318,8 @@ self: {
        pname = "cassava";
        version = "0.4.3.0";
        sha256 = "a38bdbb85e00b5650797c2c8ff2cbcddd67238e1d1152e383417d856c3ee8c5f";
-       revision = "1";
-       editedCabalFile = "6410ddebd594ccd8c068cbfb6b064ac43bcebb48fb74cbc25078c89f55e051a7";
+       revision = "2";
+       editedCabalFile = "201c58372b964b372dffcafb6774bee04329640d4bedf0c98d9a1b5cf34cc565";
        libraryHaskellDepends = [
          array attoparsec base blaze-builder bytestring containers deepseq
          hashable text unordered-containers vector
@@ -43053,8 +43346,8 @@ self: {
        pname = "cassava";
        version = "0.4.3.1";
        sha256 = "e389ea01f6f346246e7002d5eb925518d134185f260cbdf1e81628eb4cffc2ac";
-       revision = "1";
-       editedCabalFile = "924891b69a808202b1f77b2993137103d3301088634782e673138db2d5c5e50b";
+       revision = "2";
+       editedCabalFile = "698c3f8bf72c561280944d2ace8be7c0b271c83557426a9474699930644b3828";
        libraryHaskellDepends = [
          array attoparsec base blaze-builder bytestring containers deepseq
          hashable text unordered-containers vector
@@ -43080,6 +43373,8 @@ self: {
        pname = "cassava";
        version = "0.4.4.0";
        sha256 = "0733ede68d2670fd3e676f5a19b6d31233b266a8dc42387316e6ec7ed5e5df3f";
+       revision = "1";
+       editedCabalFile = "0293422ddf8cc18edba220088560c5d5a6bdba54cd784a5d7cb2eb8cd430166b";
        libraryHaskellDepends = [
          array attoparsec base blaze-builder bytestring containers deepseq
          hashable text unordered-containers vector
@@ -43094,6 +43389,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cassava_0_4_5_0" = callPackage
+    ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring
+     , containers, deepseq, hashable, HUnit, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "cassava";
+       version = "0.4.5.0";
+       sha256 = "7320a1c764efd3baae6944b31f7fdb438ae307876dce283a242e8f1deeb371c9";
+       libraryHaskellDepends = [
+         array attoparsec base blaze-builder bytestring containers deepseq
+         hashable text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring hashable HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2 text
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/hvr/cassava";
+       description = "A CSV parsing and encoding library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cassava-conduit" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, cassava
      , conduit, conduit-extra, containers, mtl, QuickCheck
@@ -43891,6 +44211,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cgi_3001_2_2_3" = callPackage
+    ({ mkDerivation, base, bytestring, containers, exceptions, mtl
+     , multipart, network, network-uri, old-locale, old-time, parsec
+     , xhtml
+     }:
+     mkDerivation {
+       pname = "cgi";
+       version = "3001.2.2.3";
+       sha256 = "db57fe55805e3d639f18c594a07106926dd7d86345cf4889f8c512a09d3cfca4";
+       libraryHaskellDepends = [
+         base bytestring containers exceptions mtl multipart network
+         network-uri old-locale old-time parsec xhtml
+       ];
+       homepage = "https://github.com/cheecheeo/haskell-cgi";
+       description = "A library for writing CGI programs";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cgi-undecidable" = callPackage
     ({ mkDerivation, base, cgi, mtl }:
      mkDerivation {
@@ -44262,6 +44601,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cheapskate-terminal" = callPackage
+    ({ mkDerivation, ansi-terminal, base, cheapskate, data-default
+     , directory, hpygments, hscolour, terminal-size, text
+     }:
+     mkDerivation {
+       pname = "cheapskate-terminal";
+       version = "0.1.0.0";
+       sha256 = "8601c50c9979b463bf695d41d4111bdb0d7824f9600306b08b874bacea1fe9b9";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         ansi-terminal base cheapskate data-default directory hpygments
+         hscolour terminal-size text
+       ];
+       executableHaskellDepends = [
+         ansi-terminal base cheapskate data-default directory hpygments
+         hscolour terminal-size text
+       ];
+       testHaskellDepends = [
+         ansi-terminal base cheapskate data-default directory hpygments
+         hscolour terminal-size text
+       ];
+       homepage = "http://github.com/yamadapc/cheapskate-terminal#readme";
+       description = "Initial project template from stack";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "check-email" = callPackage
     ({ mkDerivation, base, bytestring, email-validate, resolv }:
      mkDerivation {
@@ -45128,7 +45494,6 @@ self: {
          lens lens-aeson mtl mtl-compat QuickCheck tasty tasty-hunit
          tasty-th transformers-compat
        ];
-       jailbreak = true;
        homepage = "http://clafer.org";
        description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot";
        license = stdenv.lib.licenses.mit;
@@ -48093,6 +48458,7 @@ self: {
          random scientific tasty tasty-hunit tasty-quickcheck tasty-th time
          transformers unordered-containers uuid websockets
        ];
+       jailbreak = true;
        description = "Connector library for the coinbase exchange";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -49621,7 +49987,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "concurrent-supply" = callPackage
+  "concurrent-supply_0_1_7_1" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, hashable }:
      mkDerivation {
        pname = "concurrent-supply";
@@ -49632,9 +49998,10 @@ self: {
        homepage = "http://github.com/ekmett/concurrent-supply/";
        description = "A fast concurrent unique identifier supply with a pure API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "concurrent-supply_0_1_8" = callPackage
+  "concurrent-supply" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, hashable }:
      mkDerivation {
        pname = "concurrent-supply";
@@ -49645,7 +50012,6 @@ self: {
        homepage = "http://github.com/ekmett/concurrent-supply/";
        description = "A fast concurrent unique identifier supply with a pure API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-utilities" = callPackage
@@ -51048,7 +51414,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "constraints" = callPackage
+  "constraints_0_6" = callPackage
     ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl
      , transformers, transformers-compat
      }:
@@ -51063,9 +51429,10 @@ self: {
        homepage = "http://github.com/ekmett/constraints/";
        description = "Constraint manipulation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "constraints_0_8" = callPackage
+  "constraints" = callPackage
     ({ mkDerivation, base, binary, deepseq, ghc-prim, hashable, mtl
      , transformers, transformers-compat
      }:
@@ -51080,7 +51447,6 @@ self: {
        homepage = "http://github.com/ekmett/constraints/";
        description = "Constraint manipulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constructible" = callPackage
@@ -52515,7 +52881,6 @@ self: {
        libraryHaskellDepends = [ aeson base shakespeare text ];
        executableHaskellDepends = [ base tagsoup text ];
        testHaskellDepends = [ aeson base HTF HUnit ];
-       jailbreak = true;
        homepage = "https://github.com/prowdsponsor/country-codes";
        description = "ISO 3166 country codes and i18n names";
        license = stdenv.lib.licenses.bsd3;
@@ -53224,7 +53589,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {crack = null;};
 
-  "crackNum" = callPackage
+  "crackNum_1_3" = callPackage
     ({ mkDerivation, base, data-binary-ieee754, ieee754 }:
      mkDerivation {
        pname = "crackNum";
@@ -53236,6 +53601,21 @@ self: {
        executableHaskellDepends = [ base data-binary-ieee754 ieee754 ];
        description = "Crack various integer, floating-point data formats";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "crackNum" = callPackage
+    ({ mkDerivation, base, data-binary-ieee754, ieee754 }:
+     mkDerivation {
+       pname = "crackNum";
+       version = "1.4";
+       sha256 = "5d66f4f51b8600cdc48a3d4b999322ec8efa0f26fd8a41b4bb125412e3dea009";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base data-binary-ieee754 ieee754 ];
+       executableHaskellDepends = [ base data-binary-ieee754 ieee754 ];
+       description = "Crack various integer, floating-point data formats";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "craftwerk" = callPackage
@@ -54314,6 +54694,40 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cryptol_2_3_0" = callPackage
+    ({ mkDerivation, alex, ansi-terminal, array, async, base
+     , base-compat, bytestring, containers, deepseq, deepseq-generics
+     , directory, filepath, generic-trie, gitrev, GraphSCC, happy
+     , haskeline, heredoc, monad-control, monadLib, old-time, presburger
+     , pretty, process, QuickCheck, random, sbv, simple-smt, smtLib, syb
+     , template-haskell, text, tf-random, transformers
+     , transformers-base, utf8-string
+     }:
+     mkDerivation {
+       pname = "cryptol";
+       version = "2.3.0";
+       sha256 = "403577bb14a3ebb5683b2221d9b424ff53b8e8faddb64b27f47a6b00414138ce";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array async base base-compat bytestring containers deepseq
+         deepseq-generics directory filepath generic-trie gitrev GraphSCC
+         heredoc monad-control monadLib old-time presburger pretty process
+         QuickCheck random sbv simple-smt smtLib syb template-haskell text
+         tf-random transformers transformers-base utf8-string
+       ];
+       libraryToolDepends = [ alex happy ];
+       executableHaskellDepends = [
+         ansi-terminal base base-compat containers deepseq directory
+         filepath haskeline monad-control monadLib process random sbv
+         tf-random transformers
+       ];
+       homepage = "http://www.cryptol.net/";
+       description = "Cryptol: The Language of Cryptography";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cryptonite_0_6" = callPackage
     ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim
      , integer-gmp, memory, tasty, tasty-hunit, tasty-kat
@@ -55733,7 +56147,7 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
-  "data-accessor" = callPackage
+  "data-accessor_0_2_2_6" = callPackage
     ({ mkDerivation, array, base, containers, transformers }:
      mkDerivation {
        pname = "data-accessor";
@@ -55743,6 +56157,19 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Utilities for accessing and manipulating fields of records";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "data-accessor" = callPackage
+    ({ mkDerivation, array, base, containers, transformers }:
+     mkDerivation {
+       pname = "data-accessor";
+       version = "0.2.2.7";
+       sha256 = "3465227ad5f81059a885d354e2f3c108d550287580e6939e18350fa65e78c2ed";
+       libraryHaskellDepends = [ array base containers transformers ];
+       homepage = "http://www.haskell.org/haskellwiki/Record_access";
+       description = "Utilities for accessing and manipulating fields of records";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "data-accessor-monadLib" = callPackage
@@ -55818,8 +56245,8 @@ self: {
     ({ mkDerivation, base, data-accessor, transformers }:
      mkDerivation {
        pname = "data-accessor-transformers";
-       version = "0.2.1.6";
-       sha256 = "ca81138e44d1a7729fa20b6505b4ae08387b88cd5204d995c8d62303c3855cc5";
+       version = "0.2.1.7";
+       sha256 = "20c8823dc16c7ca6f55c64eb5564c9aae4b5565406987a046ded2ea73618e07a";
        libraryHaskellDepends = [ base data-accessor transformers ];
        homepage = "http://www.haskell.org/haskellwiki/Record_access";
        description = "Use Accessor to access state in transformers State monad";
@@ -56995,7 +57422,6 @@ self: {
          aeson auto-update base buffer-builder bytestring lens lifted-base
          monad-control network old-locale text time transformers-base
        ];
-       jailbreak = true;
        homepage = "https://github.com/iand675/datadog";
        description = "Datadog client for Haskell. Currently only StatsD supported, other support forthcoming.";
        license = stdenv.lib.licenses.mit;
@@ -57900,8 +58326,8 @@ self: {
      }:
      mkDerivation {
        pname = "debian-build";
-       version = "0.9.0.0";
-       sha256 = "7199e8a97005bce57cf9e3f157f3923d08891981006353eaf5af226b0a56f601";
+       version = "0.9.1.0";
+       sha256 = "0087c11290576edd02dddcafb9a85dd95743025758c9e078f5e24abafc2fc9cd";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -58902,6 +59328,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "derive-monoid" = callPackage
+    ({ mkDerivation, base, semigroups, template-haskell }:
+     mkDerivation {
+       pname = "derive-monoid";
+       version = "0.0.0";
+       sha256 = "d0da3cac1639996e2095ae3058ec32704ec85e2e95d61415d8896090f58255d3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base semigroups template-haskell ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base semigroups ];
+       homepage = "https://github.com/sboosali/derive-monoid#readme";
+       description = "derive Semigroup/Monoid/IsList";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "derive-topdown" = callPackage
     ({ mkDerivation, base, derive, mtl, template-haskell
      , template-haskell-util
@@ -59380,7 +59822,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-builder" = callPackage
+  "diagrams-builder_0_7_2_1" = callPackage
     ({ mkDerivation, base, base-orphans, bytestring, cmdargs
      , diagrams-cairo, diagrams-lib, diagrams-postscript
      , diagrams-rasterific, diagrams-svg, directory, exceptions
@@ -59403,12 +59845,14 @@ self: {
          diagrams-postscript diagrams-rasterific diagrams-svg directory
          filepath JuicyPixels lens lucid-svg
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-builder_0_7_2_2" = callPackage
+  "diagrams-builder" = callPackage
     ({ mkDerivation, base, base-orphans, bytestring, cmdargs
      , diagrams-cairo, diagrams-lib, diagrams-postscript
      , diagrams-rasterific, diagrams-svg, directory, exceptions
@@ -59434,7 +59878,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "hint-based build service for the diagrams graphics EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-cairo_1_2_0_4" = callPackage
@@ -62112,6 +62555,8 @@ self: {
        pname = "discrimination";
        version = "0.2.1";
        sha256 = "b431a43f635af98df8677a44c0e76726b95d12ea338e47db248aa3bbc3be2ccf";
+       revision = "1";
+       editedCabalFile = "6adf13db8d07059ac4f484c51fc13a7a3ab00e0a2a9c02899a44fedd24b550f3";
        libraryHaskellDepends = [
          array base containers contravariant deepseq ghc-prim hashable
          primitive profunctors promises semigroups transformers
@@ -63052,7 +63497,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "distributive" = callPackage
+  "distributive_0_4_4" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, ghc-prim
      , tagged, transformers, transformers-compat
      }:
@@ -63067,9 +63512,10 @@ self: {
        homepage = "http://github.com/ekmett/distributive/";
        description = "Distributive functors -- Dual to Traversable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "distributive_0_5_0_2" = callPackage
+  "distributive" = callPackage
     ({ mkDerivation, base, base-orphans, directory, doctest, filepath
      , tagged, transformers, transformers-compat
      }:
@@ -63081,11 +63527,9 @@ self: {
          base base-orphans tagged transformers transformers-compat
        ];
        testHaskellDepends = [ base directory doctest filepath ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/distributive/";
        description = "Distributive functors -- Dual to Traversable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diversity_0_7_1_1" = callPackage
@@ -63165,13 +63609,14 @@ self: {
          aeson aeson-pretty attoparsec base bytestring lens patches-vector
          servant servant-blaze servant-docs shakespeare text time vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/liamoc/dixi";
        description = "A wiki implemented with a firm theoretical foundation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "dixi" = callPackage
+  "dixi_0_6_0_3" = callPackage
     ({ mkDerivation, acid-state, aeson, aeson-pretty, attoparsec, base
      , blaze-html, blaze-markup, bytestring, composition-tree
      , containers, data-default, directory, either, filepath, heredoc
@@ -63204,6 +63649,61 @@ self: {
        homepage = "https://github.com/liamoc/dixi";
        description = "A wiki implemented with a firm theoretical foundation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "dixi" = callPackage
+    ({ mkDerivation, acid-state, aeson, aeson-pretty, attoparsec, base
+     , base-orphans, blaze-html, blaze-markup, bytestring
+     , composition-tree, containers, data-default, directory, either
+     , filepath, heredoc, lens, network-uri, pandoc, pandoc-types
+     , patches-vector, safecopy, servant, servant-blaze, servant-docs
+     , servant-server, shakespeare, template-haskell, text, time
+     , time-locale-compat, timezone-olson, timezone-series, transformers
+     , vector, warp, yaml
+     }:
+     mkDerivation {
+       pname = "dixi";
+       version = "0.6.0.4";
+       sha256 = "d4e99071e0c2f5b7922dad5a85c02abbbeed27f71e72d091f8a3a00ae8f97418";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         acid-state aeson base base-orphans blaze-html blaze-markup
+         bytestring composition-tree containers data-default either heredoc
+         lens network-uri pandoc pandoc-types patches-vector safecopy
+         servant servant-blaze servant-server shakespeare template-haskell
+         text time time-locale-compat timezone-olson timezone-series
+         transformers vector
+       ];
+       executableHaskellDepends = [
+         acid-state base base-orphans directory filepath servant-server text
+         warp yaml
+       ];
+       testHaskellDepends = [
+         aeson aeson-pretty attoparsec base base-orphans bytestring lens
+         patches-vector servant servant-blaze servant-docs shakespeare text
+         time vector
+       ];
+       homepage = "https://github.com/liamoc/dixi";
+       description = "A wiki implemented with a firm theoretical foundation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "djembe" = callPackage
+    ({ mkDerivation, base, hmidi, hspec, lens, mtl, QuickCheck, random
+     }:
+     mkDerivation {
+       pname = "djembe";
+       version = "0.1.1.0";
+       sha256 = "911e4824e432e3d486c464e63c8d37930cb381ce9b47e0cc338f0fad63c6ee88";
+       libraryHaskellDepends = [
+         base hmidi hspec lens mtl QuickCheck random
+       ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/reedrosenbluth/Djembe";
+       description = "Hit drums with haskell";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "djinn" = callPackage
@@ -65766,7 +66266,7 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
-  "effect-handlers" = callPackage
+  "effect-handlers_0_1_0_6" = callPackage
     ({ mkDerivation, base, free, hspec, hspec-discover, HUnit
      , kan-extensions, mtl, QuickCheck
      }:
@@ -65781,9 +66281,10 @@ self: {
        homepage = "https://github.com/edofic/effect-handlers";
        description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers.";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "effect-handlers_0_1_0_7" = callPackage
+  "effect-handlers" = callPackage
     ({ mkDerivation, base, free, hspec, hspec-discover, HUnit
      , kan-extensions, mtl, QuickCheck
      }:
@@ -65798,7 +66299,6 @@ self: {
        homepage = "https://github.com/edofic/effect-handlers";
        description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "effect-monad" = callPackage
@@ -66969,7 +67469,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "email-validate" = callPackage
+  "email-validate_2_1_3" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, ghc-prim, HUnit
      , QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2
@@ -66986,9 +67486,10 @@ self: {
        homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct";
        description = "Validating an email address string against RFC 5322";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "email-validate_2_2_0" = callPackage
+  "email-validate" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, ghc-prim, HUnit
      , QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2
@@ -67005,7 +67506,6 @@ self: {
        homepage = "http://porg.es/blog/email-address-validation-simpler-faster-more-correct";
        description = "Validating an email address string against RFC 5322";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "email-validator" = callPackage
@@ -67198,7 +67698,6 @@ self: {
          free monad-loops mwc-random stm stm-delay text transformers
          unordered-containers vector websockets
        ];
-       jailbreak = true;
        homepage = "http://github.com/ocharles/engine.io";
        description = "A Haskell implementation of Engine.IO";
        license = stdenv.lib.licenses.bsd3;
@@ -67293,6 +67792,7 @@ self: {
          base bytestring conduit conduit-extra engine-io http-types text
          unordered-containers wai wai-websockets websockets yesod-core
        ];
+       jailbreak = true;
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -68130,21 +68630,6 @@ self: {
      }) {};
 
   "errors" = callPackage
-    ({ mkDerivation, base, safe, transformers, transformers-compat
-     , unexceptionalio
-     }:
-     mkDerivation {
-       pname = "errors";
-       version = "2.1.0";
-       sha256 = "8689fa17307692eed702a87460506e407f746f2ac1fa2183953cc6204bda0658";
-       libraryHaskellDepends = [
-         base safe transformers transformers-compat unexceptionalio
-       ];
-       description = "Simplified error-handling";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "errors_2_1_1" = callPackage
     ({ mkDerivation, base, safe, transformers, transformers-compat
      , unexceptionalio
      }:
@@ -68157,7 +68642,6 @@ self: {
        ];
        description = "Simplified error-handling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ersatz_0_2_6_1" = callPackage
@@ -69120,7 +69604,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "exception-transformers" = callPackage
+  "exception-transformers_0_4_0_2" = callPackage
     ({ mkDerivation, base, HUnit, stm, test-framework
      , test-framework-hunit, transformers, transformers-compat
      }:
@@ -69137,6 +69621,26 @@ self: {
        ];
        description = "Type classes and monads for unchecked extensible exceptions";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "exception-transformers" = callPackage
+    ({ mkDerivation, base, HUnit, stm, test-framework
+     , test-framework-hunit, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "exception-transformers";
+       version = "0.4.0.3";
+       sha256 = "0e8bd44231d6b5478f93cffa9c1f3e59ff44130c610fc20fcfa3880eb58d2a88";
+       libraryHaskellDepends = [
+         base stm transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit transformers
+         transformers-compat
+       ];
+       description = "Type classes and monads for unchecked extensible exceptions";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "exceptional" = callPackage
@@ -69197,29 +69701,6 @@ self: {
      }) {};
 
   "exceptions" = callPackage
-    ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell
-     , test-framework, test-framework-quickcheck2, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "exceptions";
-       version = "0.8.1";
-       sha256 = "8e2835cf2d6714d3f687e892872519e8ef8e3c51f4048386474ced94dd1bdbb0";
-       libraryHaskellDepends = [
-         base mtl stm template-haskell transformers transformers-compat
-       ];
-       testHaskellDepends = [
-         base mtl QuickCheck stm template-haskell test-framework
-         test-framework-quickcheck2 transformers transformers-compat
-       ];
-       jailbreak = true;
-       doCheck = false;
-       homepage = "http://github.com/ekmett/exceptions/";
-       description = "Extensible optionally-pure exceptions";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "exceptions_0_8_2_1" = callPackage
     ({ mkDerivation, base, mtl, QuickCheck, stm, template-haskell
      , test-framework, test-framework-quickcheck2, transformers
      , transformers-compat
@@ -69235,10 +69716,10 @@ self: {
          base mtl QuickCheck stm template-haskell test-framework
          test-framework-quickcheck2 transformers transformers-compat
        ];
+       doCheck = false;
        homepage = "http://github.com/ekmett/exceptions/";
        description = "Extensible optionally-pure exceptions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "executable-hash_0_2_0_0" = callPackage
@@ -69465,8 +69946,8 @@ self: {
     ({ mkDerivation, base, compensated, log-domain }:
      mkDerivation {
        pname = "exp-extended";
-       version = "0.1.1";
-       sha256 = "275f074e88748acd68c0b1aadd8ca56a3cc021c5da5fcdbb68300f18cc532f33";
+       version = "0.1.1.1";
+       sha256 = "fe4c8955f0fdff62525d7457b7be08147d063838cbb0f39bc2600256e24008a7";
        libraryHaskellDepends = [ base compensated log-domain ];
        homepage = "http://code.mathr.co.uk/exp-extended";
        description = "floating point with extended exponent range";
@@ -70746,6 +71227,7 @@ self: {
          utf8-string vector
        ];
        executableHaskellDepends = [ base mtl optparse-applicative split ];
+       jailbreak = true;
        homepage = "https://github.com/faylang/fay/wiki";
        description = "A compiler for Fay, a Haskell subset that compiles to JavaScript";
        license = stdenv.lib.licenses.bsd3;
@@ -71437,7 +71919,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "fclabels" = callPackage
+  "fclabels_2_0_2_3" = callPackage
     ({ mkDerivation, base, HUnit, mtl, template-haskell, transformers
      }:
      mkDerivation {
@@ -71451,6 +71933,23 @@ self: {
        homepage = "https://github.com/sebastiaanvisser/fclabels";
        description = "First class accessor labels implemented as lenses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "fclabels" = callPackage
+    ({ mkDerivation, base, HUnit, mtl, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "fclabels";
+       version = "2.0.2.4";
+       sha256 = "f030940b23701aa2580a8c3f8af3c8a7c0a5ed83b30e07607ce9ef75eb4f60b7";
+       libraryHaskellDepends = [ base mtl template-haskell transformers ];
+       testHaskellDepends = [
+         base HUnit mtl template-haskell transformers
+       ];
+       homepage = "https://github.com/sebastiaanvisser/fclabels";
+       description = "First class accessor labels implemented as lenses";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "fclabels-monadlib" = callPackage
@@ -72404,6 +72903,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "file-embed_0_0_9_1" = callPackage
+    ({ mkDerivation, base, bytestring, directory, filepath
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "file-embed";
+       version = "0.0.9.1";
+       sha256 = "fdbde52cdf03067661944d072d95578ade8a27d709669f4ed40314fc729e460f";
+       libraryHaskellDepends = [
+         base bytestring directory filepath template-haskell
+       ];
+       testHaskellDepends = [ base filepath ];
+       homepage = "https://github.com/snoyberg/file-embed";
+       description = "Use Template Haskell to embed file contents directly";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "file-location_0_4_5_3" = callPackage
     ({ mkDerivation, base, containers, lifted-base, process
      , template-haskell, transformers
@@ -73376,14 +73893,13 @@ self: {
      }:
      mkDerivation {
        pname = "flaccuraterip";
-       version = "0.3.4";
-       sha256 = "108d589f27754da0f2716787c99bdcec03e6cf85326e2030805844d48275a46f";
+       version = "0.3.5";
+       sha256 = "fa572869a54dfcea3aac395c9f1e116f9fb69cf04134411d5e8b4a88ea8ff229";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base binary deepseq HTTP optparse-applicative process
        ];
-       jailbreak = true;
        homepage = "http://noaxiom.org/flAccurateRip";
        description = "Verify FLAC files ripped form CD using AccurateRip™";
        license = stdenv.lib.licenses.gpl3;
@@ -73722,7 +74238,6 @@ self: {
          lens lens-action mtl network pipes pipes-aeson pipes-http
          pipes-parse template-haskell text unordered-containers uuid
        ];
-       jailbreak = true;
        homepage = "https://github.com/brewtown/hs-flowdock";
        description = "Flowdock client library for Haskell";
        license = stdenv.lib.licenses.mit;
@@ -74097,6 +74612,8 @@ self: {
        pname = "foldl";
        version = "1.0.7";
        sha256 = "4991d3a39f10459e47b4c094327e93d437e299cd6225ff57b4d8d1ece28a1d57";
+       revision = "1";
+       editedCabalFile = "00f694d3c7be565194e9404f4ff8014a2b005866ed70311c869377b2668cceec";
        libraryHaskellDepends = [
          base bytestring containers primitive text transformers vector
        ];
@@ -74188,12 +74705,13 @@ self: {
          base bytestring containers mwc-random primitive profunctors text
          transformers vector
        ];
+       jailbreak = true;
        description = "Composable, streaming, and efficient left folds";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "foldl" = callPackage
+  "foldl_1_1_2" = callPackage
     ({ mkDerivation, base, bytestring, comonad, containers, mwc-random
      , primitive, profunctors, text, transformers, vector
      }:
@@ -74205,8 +74723,10 @@ self: {
          base bytestring comonad containers mwc-random primitive profunctors
          text transformers vector
        ];
+       jailbreak = true;
        description = "Composable, streaming, and efficient left folds";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foldl_1_1_3" = callPackage
@@ -74226,6 +74746,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "foldl" = callPackage
+    ({ mkDerivation, base, bytestring, comonad, containers, mwc-random
+     , primitive, profunctors, text, transformers, vector
+     }:
+     mkDerivation {
+       pname = "foldl";
+       version = "1.1.4";
+       sha256 = "6d6473970896924a7de1c4dd5777b9b094c28ac1a33f6c8b774c0bb82d936943";
+       libraryHaskellDepends = [
+         base bytestring comonad containers mwc-random primitive profunctors
+         text transformers vector
+       ];
+       description = "Composable, streaming, and efficient left folds";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "foldl-incremental" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, foldl
      , histogram-fill, mwc-random, pipes, QuickCheck, tasty
@@ -75342,26 +75878,6 @@ self: {
      }) {};
 
   "free" = callPackage
-    ({ mkDerivation, base, bifunctors, comonad, containers
-     , distributive, exceptions, mtl, prelude-extras, profunctors
-     , semigroupoids, semigroups, template-haskell, transformers
-     , transformers-compat
-     }:
-     mkDerivation {
-       pname = "free";
-       version = "4.12.2";
-       sha256 = "9b65172e90ff03d4daf1d533ed5e967d8a24286ac5facc1edd05e203fe88461b";
-       libraryHaskellDepends = [
-         base bifunctors comonad containers distributive exceptions mtl
-         prelude-extras profunctors semigroupoids semigroups
-         template-haskell transformers transformers-compat
-       ];
-       homepage = "http://github.com/ekmett/free/";
-       description = "Monads for free";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "free_4_12_4" = callPackage
     ({ mkDerivation, base, bifunctors, comonad, containers
      , distributive, exceptions, mtl, prelude-extras, profunctors
      , semigroupoids, semigroups, template-haskell, transformers
@@ -75379,7 +75895,6 @@ self: {
        homepage = "http://github.com/ekmett/free/";
        description = "Monads for free";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-concurrent" = callPackage
@@ -75406,6 +75921,7 @@ self: {
          algebraic-classes base comonad constraints template-haskell
          transformers void
        ];
+       jailbreak = true;
        homepage = "https://github.com/sjoerdvisscher/free-functors";
        description = "Free functors, adjoint to functors that forget class constraints";
        license = stdenv.lib.licenses.bsd3;
@@ -76043,17 +76559,18 @@ self: {
      }) {};
 
   "fswatcher" = callPackage
-    ({ mkDerivation, base, directory, fsnotify, process
-     , system-filepath, unix
+    ({ mkDerivation, base, directory, fsnotify, optparse-applicative
+     , process, regex-pcre-builtin, system-filepath, unix
      }:
      mkDerivation {
        pname = "fswatcher";
-       version = "0.1.3";
-       sha256 = "e0b7aea8d9b6adfe1045b7484b84faa1487638e7d3c16a598d9aa82083230351";
+       version = "0.2.0";
+       sha256 = "dcaa449b48c5c767adeb5bce6fd250982dcc65049dfca9dc79bfc059b14d73bc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base directory fsnotify process system-filepath unix
+         base directory fsnotify optparse-applicative process
+         regex-pcre-builtin system-filepath unix
        ];
        homepage = "http://www.github.com/ehamberg/fswatcher/";
        description = "Watch a file/directory and run a command when it's modified";
@@ -77370,6 +77887,8 @@ self: {
        pname = "generic-deriving";
        version = "1.9.0";
        sha256 = "f1805c59ae4586ae29736c05d0ee033bf99ec1a6062a375bf3e1ca9651a5bfd7";
+       revision = "1";
+       editedCabalFile = "ffc03b6a6adb54c6433a7af5956e420d65c151a820047189cf3150b387e769ef";
        libraryHaskellDepends = [
          base containers ghc-prim template-haskell
        ];
@@ -78382,8 +78901,8 @@ self: {
      }:
      mkDerivation {
        pname = "ghc-imported-from";
-       version = "0.2.0.7";
-       sha256 = "3b035e4e4792e2920c2af48e2b3e1bb5e643ae29e7b15ca92539b84699f2484e";
+       version = "0.2.1.0";
+       sha256 = "2c0af9dbfd887e0f32abd2ffa99acf5ce1344da18402e337eb4a39b59488982c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -78401,7 +78920,6 @@ self: {
          ghc-syb-utils hspec mtl optparse-applicative parsec process safe
          syb transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/carlohamalainen/ghc-imported-from";
        description = "Find the Haddock documentation for a symbol";
        license = stdenv.lib.licenses.bsd3;
@@ -78547,6 +79065,38 @@ self: {
        license = stdenv.lib.licenses.agpl3;
      }) {};
 
+  "ghc-mod_5_5_0_0" = callPackage
+    ({ mkDerivation, base, binary, bytestring, cabal-helper, containers
+     , deepseq, directory, djinn-ghc, doctest, extra, fclabels, filepath
+     , ghc, ghc-paths, ghc-syb-utils, haskell-src-exts, hlint, hspec
+     , monad-control, monad-journal, mtl, old-time, optparse-applicative
+     , pipes, pretty, process, safe, split, syb, temporary, text, time
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "ghc-mod";
+       version = "5.5.0.0";
+       sha256 = "d05be8f3541e875cd4ebefb28968cfc095fc323e49328f2e40581f6f5de70d31";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring cabal-helper containers deepseq directory
+         djinn-ghc extra fclabels filepath ghc ghc-paths ghc-syb-utils
+         haskell-src-exts hlint monad-control monad-journal mtl old-time
+         pipes pretty process safe split syb temporary text time
+         transformers transformers-base
+       ];
+       executableHaskellDepends = [
+         base binary deepseq directory fclabels filepath ghc monad-control
+         mtl old-time optparse-applicative pretty process split time
+       ];
+       testHaskellDepends = [ base doctest hspec ];
+       homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
+       description = "Happy Haskell Programming";
+       license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-mtl" = callPackage
     ({ mkDerivation, base, exceptions, extensible-exceptions, ghc, mtl
      }:
@@ -78809,7 +79359,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc-tcplugins-extra" = callPackage
+  "ghc-tcplugins-extra_0_1" = callPackage
     ({ mkDerivation, base, ghc }:
      mkDerivation {
        pname = "ghc-tcplugins-extra";
@@ -78819,6 +79369,19 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "Utilities for writing GHC type-checker plugins";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "ghc-tcplugins-extra" = callPackage
+    ({ mkDerivation, base, ghc }:
+     mkDerivation {
+       pname = "ghc-tcplugins-extra";
+       version = "0.2";
+       sha256 = "f3542b6734b20e3e25f851589944d1d185533c0f0a5428eee86f422ad3687374";
+       libraryHaskellDepends = [ base ghc ];
+       homepage = "http://github.com/clash-lang/ghc-tcplugins-extra";
+       description = "Utilities for writing GHC type-checker plugins";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "ghc-time-alloc-prof" = callPackage
@@ -78853,6 +79416,25 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ghc-typelits-extra_0_1_1" = callPackage
+    ({ mkDerivation, base, ghc, ghc-tcplugins-extra
+     , ghc-typelits-natnormalise, tasty, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-extra";
+       version = "0.1.1";
+       sha256 = "e9727920a2c00bb8881277af2a6c2df8a46644e292501520e3677f9853691c1e";
+       libraryHaskellDepends = [ base ghc ghc-tcplugins-extra ];
+       testHaskellDepends = [
+         base ghc-typelits-natnormalise tasty tasty-hunit
+       ];
+       jailbreak = true;
+       homepage = "http://www.clash-lang.org/";
+       description = "Additional type-level operations on GHC.TypeLits.Nat";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-typelits-natnormalise_0_3" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra, tasty, tasty-hunit
      }:
@@ -78882,6 +79464,22 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "ghc-typelits-natnormalise_0_4" = callPackage
+    ({ mkDerivation, base, ghc, ghc-tcplugins-extra, tasty, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-natnormalise";
+       version = "0.4";
+       sha256 = "8b6f0188b3bc04bef2c7083811eeb4c12a32436a95a797e38e4883067b4c3354";
+       libraryHaskellDepends = [ base ghc ghc-tcplugins-extra ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       jailbreak = true;
+       homepage = "http://www.clash-lang.org/";
+       description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghc-vis" = callPackage
     ({ mkDerivation, base, cairo, containers, deepseq, fgl
      , ghc-heap-view, graphviz, gtk, mtl, svgcairo, text, transformers
@@ -79707,7 +80305,6 @@ self: {
          gitlib gitlib-libgit2 scientific shake split tagged text
          unordered-containers vector yaml
        ];
-       jailbreak = true;
        homepage = "https://github.com/nomeata/gipeda";
        description = "Git Performance Dashboard";
        license = stdenv.lib.licenses.mit;
@@ -80104,6 +80701,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base base-compat process ];
+       jailbreak = true;
        homepage = "https://github.com/Peaker/git-jump";
        description = "Move a git branch";
        license = stdenv.lib.licenses.bsd3;
@@ -80996,7 +81594,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mesa;};
 
-  "gl" = callPackage
+  "gl_0_7_7" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, fixed, half
      , hxt, mesa, split, transformers
      }:
@@ -81011,16 +81609,17 @@ self: {
        librarySystemDepends = [ mesa ];
        description = "Complete OpenGL raw bindings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mesa;};
 
-  "gl_0_7_8" = callPackage
+  "gl" = callPackage
     ({ mkDerivation, base, containers, directory, filepath, fixed, half
      , hxt, mesa, split, transformers
      }:
      mkDerivation {
        pname = "gl";
-       version = "0.7.8";
-       sha256 = "4ee12e21d759399f56932a14d5aa7e4266c387fa834103680011a0914b9e8db6";
+       version = "0.7.8.1";
+       sha256 = "ed792ee75d32489857295ef9ae6a4a49900e2ed4a01cd2bac9fdd17959a6219a";
        libraryHaskellDepends = [
          base containers directory filepath fixed half hxt split
          transformers
@@ -81028,7 +81627,6 @@ self: {
        librarySystemDepends = [ mesa ];
        description = "Complete OpenGL raw bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mesa;};
 
   "gl-capture" = callPackage
@@ -84075,7 +84673,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "graphs" = callPackage
+  "graphs_0_6_0_1" = callPackage
     ({ mkDerivation, array, base, containers, transformers, void }:
      mkDerivation {
        pname = "graphs";
@@ -84087,9 +84685,10 @@ self: {
        homepage = "http://github.com/ekmett/graphs";
        description = "A simple monadic graph library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "graphs_0_7" = callPackage
+  "graphs" = callPackage
     ({ mkDerivation, array, base, containers, transformers
      , transformers-compat, void
      }:
@@ -84103,7 +84702,6 @@ self: {
        homepage = "http://github.com/ekmett/graphs";
        description = "A simple monadic graph library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphtype" = callPackage
@@ -84210,6 +84808,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "grasp" = callPackage
+    ({ mkDerivation, base, clock, directory, extra, filepath, hashable
+     , lens, megaparsec, MonadRandom, mtl, pcre-heavy, primitive
+     , process, random-shuffle, safe, split, system-filepath, text
+     , transformers, turtle, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "grasp";
+       version = "0.1.0.0";
+       sha256 = "54a2bae281c97f655b025bd50c0fd27f09eb7d6926ed9b57807b4e5d96ab5a2f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base clock directory extra filepath hashable lens megaparsec
+         MonadRandom mtl pcre-heavy primitive process random-shuffle safe
+         split system-filepath text transformers turtle unordered-containers
+         vector
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "https://bitbucket.org/janmasrovira/am3-project/overview";
+       description = "GRASP implementation for the AMMM project";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gravatar_0_6" = callPackage
     ({ mkDerivation, base, bytestring, data-default, HTTP, pureMD5
      , text
@@ -88597,7 +89220,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "half" = callPackage
+  "half_0_2_2_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "half";
@@ -88607,9 +89230,10 @@ self: {
        homepage = "http://github.com/ekmett/half";
        description = "Half-precision floating-point";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "half_0_2_2_3" = callPackage
+  "half" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "half";
@@ -88619,7 +89243,6 @@ self: {
        homepage = "http://github.com/ekmett/half";
        description = "Half-precision floating-point";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "halfs" = callPackage
@@ -88865,6 +89488,7 @@ self: {
          aeson array base binary data-default GLUT OpenGL opengl-dlp-stereo
          split vector-space
        ];
+       jailbreak = true;
        homepage = "https://bitbucket.org/bwbush/handa-opengl";
        description = "Utility functions for OpenGL and GLUT";
        license = stdenv.lib.licenses.mit;
@@ -89199,6 +89823,7 @@ self: {
          time unordered-containers userid web-routes web-routes-boomerang
          web-routes-happstack web-routes-hsp web-routes-th
        ];
+       jailbreak = true;
        homepage = "http://www.happstack.com/";
        description = "Happstack Authentication Library";
        license = stdenv.lib.licenses.bsd3;
@@ -89983,6 +90608,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl; inherit (pkgs) sqlite;};
 
+  "hardware-edsl" = callPackage
+    ({ mkDerivation, array, base, bytestring, constraints, containers
+     , language-vhdl, mtl, operational-alacarte, pretty, syntactic
+     }:
+     mkDerivation {
+       pname = "hardware-edsl";
+       version = "0.1.0.0";
+       sha256 = "13fe072ff4fbad2d16c4e80749db3cfe56a90df8499e86e615c4afda38589143";
+       libraryHaskellDepends = [
+         array base bytestring constraints containers language-vhdl mtl
+         operational-alacarte pretty syntactic
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/markus-git/hardware-edsl";
+       description = "Deep embedding of hardware descriptions with code generation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hark" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, haskell98
      , mtl, old-locale, old-time, regex-pcre
@@ -90401,7 +91044,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hashable-extras" = callPackage
+  "hashable-extras_0_2_2" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, directory, doctest
      , filepath, hashable, transformers
      }:
@@ -90416,9 +91059,10 @@ self: {
        homepage = "http://github.com/analytics/hashable-extras/";
        description = "Higher-rank Hashable";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hashable-extras_0_2_3" = callPackage
+  "hashable-extras" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, directory, doctest
      , filepath, hashable, transformers, transformers-compat
      }:
@@ -90434,7 +91078,6 @@ self: {
        homepage = "http://github.com/analytics/hashable-extras/";
        description = "Higher-rank Hashable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashable-generics" = callPackage
@@ -93428,6 +94071,38 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hasql_0_15_1_1" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
+     , contravariant, contravariant-extras, data-default-class, dlist
+     , either, hashable, hashtables, loch-th, placeholders
+     , postgresql-binary, postgresql-libpq, profunctors, QuickCheck
+     , quickcheck-instances, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text, time, transformers
+     , uuid, vector
+     }:
+     mkDerivation {
+       pname = "hasql";
+       version = "0.15.1.1";
+       sha256 = "79a3019362f0973daa719eb8b52d31524c7453833c19044e1c1d9a67b650ce57";
+       libraryHaskellDepends = [
+         aeson attoparsec base base-prelude bytestring contravariant
+         contravariant-extras data-default-class dlist either hashable
+         hashtables loch-th placeholders postgresql-binary postgresql-libpq
+         profunctors scientific text time transformers uuid vector
+       ];
+       testHaskellDepends = [
+         base base-prelude bytestring contravariant contravariant-extras
+         data-default-class dlist either hashable profunctors QuickCheck
+         quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck text time transformers uuid vector
+       ];
+       doCheck = false;
+       homepage = "https://github.com/nikita-volkov/hasql";
+       description = "A very efficient PostgreSQL driver and a flexible mapping API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hasql" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
      , contravariant, contravariant-extras, data-default-class, dlist
@@ -94441,6 +95116,7 @@ self: {
          network network-uri old-locale old-time template-haskell time
          utf8-string
        ];
+       jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/HaXR";
        description = "XML-RPC client and server library";
        license = stdenv.lib.licenses.bsd3;
@@ -94463,6 +95139,7 @@ self: {
          network network-uri old-locale old-time template-haskell time
          utf8-string
        ];
+       jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/HaXR";
        description = "XML-RPC client and server library";
        license = stdenv.lib.licenses.bsd3;
@@ -95489,7 +96166,6 @@ self: {
          aeson aeson-pretty base bytestring directory filepath haskeline
          time
        ];
-       jailbreak = true;
        homepage = "https://github.com/aka-bash0r/headergen";
        description = "Creates a header for a haskell source file";
        license = stdenv.lib.licenses.mit;
@@ -95541,7 +96217,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "heaps" = callPackage
+  "heaps_0_3_2_1" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath }:
      mkDerivation {
        pname = "heaps";
@@ -95554,9 +96230,10 @@ self: {
        homepage = "http://github.com/ekmett/heaps/";
        description = "Asymptotically optimal Brodal/Okasaki heaps";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "heaps_0_3_3" = callPackage
+  "heaps" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath }:
      mkDerivation {
        pname = "heaps";
@@ -95565,10 +96242,10 @@ self: {
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base directory doctest filepath ];
        jailbreak = true;
+       doCheck = false;
        homepage = "http://github.com/ekmett/heaps/";
        description = "Asymptotically optimal Brodal/Okasaki heaps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heapsort" = callPackage
@@ -95937,6 +96614,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring data-default-class helics vault wai
        ];
+       jailbreak = true;
        homepage = "https://github.com/philopon/helics";
        description = "New Relic® agent SDK wrapper for wai";
        license = stdenv.lib.licenses.mit;
@@ -100797,13 +101475,14 @@ self: {
          aeson base bytestring containers http-conduit http-types text wai
          warp
        ];
+       jailbreak = true;
        homepage = "https://github.com/freizl/hoauth2";
        description = "hoauth2";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hoauth2" = callPackage
+  "hoauth2_0_5_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, http-conduit
      , http-types, text, wai, warp
      }:
@@ -100820,19 +101499,21 @@ self: {
          aeson base bytestring containers http-conduit http-types text wai
          warp
        ];
+       jailbreak = true;
        homepage = "https://github.com/freizl/hoauth2";
        description = "Haskell OAuth2 authentication client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hoauth2_0_5_1" = callPackage
+  "hoauth2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, http-conduit
      , http-types, text, wai, warp
      }:
      mkDerivation {
        pname = "hoauth2";
-       version = "0.5.1";
-       sha256 = "266ddc04f2d0e0a2a60d89ba019da267a2a3c310a5bac6677b3105bbaf5a1cc4";
+       version = "0.5.2";
+       sha256 = "68a8d591d47e24f3a2bfe5b103512dee48805217af771c1de64612fc19f8084f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -100842,11 +101523,9 @@ self: {
          aeson base bytestring containers http-conduit http-types text wai
          warp
        ];
-       jailbreak = true;
        homepage = "https://github.com/freizl/hoauth2";
        description = "Haskell OAuth2 authentication client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hob" = callPackage
@@ -102814,8 +103493,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpqtypes";
-       version = "1.4.3";
-       sha256 = "7cacff688476d271f7ad9515d44a612f8c15e5e731e1eb9f9cb50e06cb5ae67f";
+       version = "1.4.4";
+       sha256 = "4e1bcfc35caaa8abcee28316f8b0bdd6fadbebe223bacfb3118dec4d980fee36";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -104546,8 +105225,8 @@ self: {
      }:
      mkDerivation {
        pname = "hscope";
-       version = "0.4.2";
-       sha256 = "849d52e616abffda54d70d41f66d7e92539a1b20eef05b73877815e8c71a64b9";
+       version = "0.4.3";
+       sha256 = "6d632a174906977d51d06a368437cdc83fdce9888eb362135e9dc0249258532a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -104557,7 +105236,6 @@ self: {
        testHaskellDepends = [
          base directory mtl process test-simple Unixutils
        ];
-       jailbreak = true;
        homepage = "https://github.com/bosu/hscope";
        description = "cscope like browser for Haskell code";
        license = stdenv.lib.licenses.bsd3;
@@ -105832,7 +106510,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hspec" = callPackage
+  "hspec_2_2_1" = callPackage
     ({ mkDerivation, base, directory, hspec-core, hspec-discover
      , hspec-expectations, hspec-meta, HUnit, QuickCheck, stringbuilder
      , transformers
@@ -105848,12 +106526,14 @@ self: {
        testHaskellDepends = [
          base directory hspec-core hspec-meta stringbuilder
        ];
+       jailbreak = true;
        homepage = "http://hspec.github.io/";
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hspec_2_2_2" = callPackage
+  "hspec" = callPackage
     ({ mkDerivation, base, directory, hspec-core, hspec-discover
      , hspec-expectations, hspec-meta, HUnit, QuickCheck, stringbuilder
      , transformers
@@ -105869,11 +106549,9 @@ self: {
        testHaskellDepends = [
          base directory hspec-core hspec-meta stringbuilder
        ];
-       jailbreak = true;
        homepage = "http://hspec.github.io/";
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-attoparsec" = callPackage
@@ -106116,7 +106794,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hspec-core" = callPackage
+  "hspec-core_2_2_1" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, deepseq
      , hspec-expectations, hspec-meta, HUnit, process, QuickCheck
      , quickcheck-io, random, setenv, silently, tf-random, time
@@ -106140,9 +106818,10 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hspec-core_2_2_2" = callPackage
+  "hspec-core" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, deepseq
      , hspec-expectations, hspec-meta, HUnit, process, QuickCheck
      , quickcheck-io, random, setenv, silently, tf-random, time
@@ -106164,7 +106843,6 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "A Testing Framework for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-discover_2_1_2" = callPackage
@@ -106287,7 +106965,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hspec-discover" = callPackage
+  "hspec-discover_2_2_1" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta }:
      mkDerivation {
        pname = "hspec-discover";
@@ -106301,9 +106979,10 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "Automatically discover and run Hspec tests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hspec-discover_2_2_2" = callPackage
+  "hspec-discover" = callPackage
     ({ mkDerivation, base, directory, filepath, hspec-meta }:
      mkDerivation {
        pname = "hspec-discover";
@@ -106317,7 +106996,6 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "Automatically discover and run Hspec tests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-expectations_0_6_1" = callPackage
@@ -106547,7 +107225,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hspec-meta" = callPackage
+  "hspec-meta_2_2_0" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, deepseq, directory
      , filepath, hspec-expectations, HUnit, QuickCheck, quickcheck-io
      , random, setenv, time, transformers
@@ -106566,9 +107244,10 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "A version of Hspec which is used to test Hspec itself";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hspec-meta_2_2_1" = callPackage
+  "hspec-meta" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, deepseq, directory
      , filepath, hspec-expectations, HUnit, QuickCheck, quickcheck-io
      , random, setenv, time, transformers
@@ -106587,7 +107266,6 @@ self: {
        homepage = "http://hspec.github.io/";
        description = "A version of Hspec which is used to test Hspec itself";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-monad-control" = callPackage
@@ -109230,6 +109908,7 @@ self: {
          http-client http-types HUnit lifted-base network streaming-commons
          text time transformers utf8-string wai wai-conduit warp warp-tls
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "http://www.yesodweb.com/book/http-conduit";
        description = "HTTP client package with conduit interface and HTTPS support";
@@ -109259,6 +109938,7 @@ self: {
          http-client http-types HUnit lifted-base network streaming-commons
          text time transformers utf8-string wai wai-conduit warp warp-tls
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "http://www.yesodweb.com/book/http-conduit";
        description = "HTTP client package with conduit interface and HTTPS support";
@@ -109926,7 +110606,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "http2" = callPackage
+  "http2_1_3_1" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
      , bytestring-builder, containers, directory, doctest, filepath
      , Glob, hex, hspec, mwc-random, psqueues, stm, text
@@ -109955,9 +110635,10 @@ self: {
        doCheck = false;
        description = "HTTP/2.0 library including frames and HPACK";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "http2_1_4_2" = callPackage
+  "http2" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
      , bytestring-builder, containers, directory, doctest, filepath
      , Glob, hex, hspec, mwc-random, psqueues, stm, text
@@ -109965,8 +110646,8 @@ self: {
      }:
      mkDerivation {
        pname = "http2";
-       version = "1.4.2";
-       sha256 = "721c4a0e70594e6750cedbaa795b44a0b1f1ea332c4ac5eb453e42464f86e2d9";
+       version = "1.4.3";
+       sha256 = "f074760594e1599d3585f666762e96f86a9f6f546d6d3ed05379617b14729778";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -109985,6 +110666,36 @@ self: {
        ];
        description = "HTTP/2.0 library including frames and HPACK";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "http2_1_4_4" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
+     , bytestring-builder, containers, directory, doctest, filepath
+     , Glob, hex, hspec, psqueues, stm, text, unordered-containers
+     , vector, word8
+     }:
+     mkDerivation {
+       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
+         text unordered-containers vector word8
+       ];
+       description = "HTTP/2.0 library including frames and HPACK";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -110230,6 +110941,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "human-readable-duration_0_1_1_0" = callPackage
+    ({ mkDerivation, base, time }:
+     mkDerivation {
+       pname = "human-readable-duration";
+       version = "0.1.1.0";
+       sha256 = "dfd07e9a6077834c65a5f7989eb9e77e207e446acfa261cec1d4c9d0f7424fb8";
+       libraryHaskellDepends = [ base time ];
+       homepage = "http://github.com/yogsototh/human-readable-duration#readme";
+       description = "Provide duration helper";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "human-readable-duration" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -112588,7 +113312,6 @@ self: {
          mtl pretty-show pureMD5 tagged template-haskell temporary text
          transformers unix
        ];
-       jailbreak = true;
        description = "Shared library used be ide-backend and ide-backend-server";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -112610,7 +113333,6 @@ self: {
          monad-logger mtl pretty-show pureMD5 tagged template-haskell
          temporary text transformers unix
        ];
-       jailbreak = true;
        description = "Shared library used be ide-backend and ide-backend-server";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -114737,7 +115459,6 @@ self: {
        testHaskellDepends = [
          aeson base instant-generics tasty tasty-quickcheck
        ];
-       jailbreak = true;
        homepage = "https://github.com/k0001/instant-aeson";
        description = "Generic Aeson instances through instant-generics";
        license = stdenv.lib.licenses.bsd3;
@@ -115158,7 +115879,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "intervals" = callPackage
+  "intervals_0_7_1" = callPackage
     ({ mkDerivation, array, base, directory, distributive, doctest
      , filepath, ghc-prim
      }:
@@ -115171,9 +115892,10 @@ self: {
        homepage = "http://github.com/ekmett/intervals";
        description = "Interval Arithmetic";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "intervals_0_7_2" = callPackage
+  "intervals" = callPackage
     ({ mkDerivation, array, base, directory, distributive, doctest
      , filepath, ghc-prim, QuickCheck, template-haskell
      }:
@@ -115188,7 +115910,6 @@ self: {
        homepage = "http://github.com/ekmett/intervals";
        description = "Interval Arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "intricacy" = callPackage
@@ -115255,7 +115976,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "invariant" = callPackage
+  "invariant_0_2_2" = callPackage
     ({ mkDerivation, array, base, bifunctors, containers, contravariant
      , ghc-prim, hspec, profunctors, QuickCheck, semigroups, stm, tagged
      , template-haskell, transformers, transformers-compat
@@ -115276,6 +115997,28 @@ self: {
        homepage = "https://github.com/nfrisby/invariant-functors";
        description = "Haskell 98 invariant functors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "invariant" = callPackage
+    ({ mkDerivation, array, base, bifunctors, containers, contravariant
+     , ghc-prim, hspec, profunctors, QuickCheck, semigroups, StateVar
+     , stm, tagged, template-haskell, transformers, transformers-compat
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "invariant";
+       version = "0.3";
+       sha256 = "c45b9a150b3b48b22ec41964481bbe85567b3eab0ae15b784dd75b9a666a7a00";
+       libraryHaskellDepends = [
+         array base bifunctors containers contravariant ghc-prim profunctors
+         semigroups StateVar stm tagged template-haskell transformers
+         transformers-compat unordered-containers
+       ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/nfrisby/invariant-functors";
+       description = "Haskell 98 invariant functors";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "invertible-syntax" = callPackage
@@ -115861,7 +116604,6 @@ self: {
        executableHaskellDepends = [
          base filepath mtl parsec text transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/gibiansky/IHaskell";
        description = "A library for creating kernels for IPython frontends";
        license = stdenv.lib.licenses.mit;
@@ -115921,7 +116663,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "irc-client" = callPackage
+  "irc-client_0_2_5_0" = callPackage
     ({ mkDerivation, base, bytestring, conduit, data-default-class
      , irc-conduit, irc-ctcp, old-locale, stm, stm-conduit, text, time
      , transformers
@@ -115937,6 +116679,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.2.6.0";
+       sha256 = "8d14293adb106f1755358bd7c2e9f1193537ef87333e0492d54fa8b8611b795d";
+       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;
      }) {};
 
   "irc-colors" = callPackage
@@ -117544,6 +118305,7 @@ self: {
          aeson aeson-qq base bytestring cryptonite doctest either hspec
          HUnit memory mtl QuickCheck text unordered-containers vector
        ];
+       doCheck = false;
        homepage = "http://github.com/tekul/jose-jwt";
        description = "JSON Object Signing and Encryption Library";
        license = stdenv.lib.licenses.bsd3;
@@ -120037,7 +120799,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "keys" = callPackage
+  "keys_3_10_2" = callPackage
     ({ mkDerivation, array, base, comonad, containers, free, hashable
      , semigroupoids, semigroups, transformers, unordered-containers
      }:
@@ -120052,9 +120814,10 @@ self: {
        homepage = "http://github.com/ekmett/keys/";
        description = "Keyed functors and containers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "keys_3_11" = callPackage
+  "keys" = callPackage
     ({ mkDerivation, array, base, comonad, containers, free, hashable
      , semigroupoids, semigroups, transformers, transformers-compat
      , unordered-containers
@@ -120063,6 +120826,8 @@ self: {
        pname = "keys";
        version = "3.11";
        sha256 = "0cf397b7e6eb8cda930a02118c0bf262f9ef80c5a2f91822238b7778042cc4b2";
+       revision = "1";
+       editedCabalFile = "b1a0c0d734a3dba396f4df1418e521da6f2287a56ed344ddda78d6133d27cfd3";
        libraryHaskellDepends = [
          array base comonad containers free hashable semigroupoids
          semigroups transformers transformers-compat unordered-containers
@@ -120070,7 +120835,6 @@ self: {
        homepage = "http://github.com/ekmett/keys/";
        description = "Keyed functors and containers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keystore" = callPackage
@@ -123798,7 +124562,6 @@ self: {
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
-       jailbreak = true;
        homepage = "http://github.com/lens/lens-aeson/";
        description = "Law-abiding lenses for aeson";
        license = stdenv.lib.licenses.bsd3;
@@ -125161,6 +125924,7 @@ self: {
          async base HUnit lifted-base monad-control mtl tasty tasty-hunit
          tasty-th
        ];
+       jailbreak = true;
        homepage = "https://github.com/maoe/lifted-async";
        description = "Run lifted IO operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
@@ -125174,8 +125938,8 @@ self: {
      }:
      mkDerivation {
        pname = "lifted-async";
-       version = "0.8.0";
-       sha256 = "81b2ebf0ae0e2154dca047a3ddd5f3cda2305245549b52487249f53c8f70ee7d";
+       version = "0.8.0.1";
+       sha256 = "ef8ca870155abb93e4ce742c46606ac59ab031ed86da31c75a6179c62be5f9bf";
        libraryHaskellDepends = [
          async base constraints lifted-base monad-control transformers-base
        ];
@@ -125643,7 +126407,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "linear" = callPackage
+  "linear_1_20_3" = callPackage
     ({ mkDerivation, adjunctions, base, binary, bytes, bytestring
      , cereal, containers, deepseq, directory, distributive, doctest
      , filepath, ghc-prim, hashable, HUnit, lens, reflection
@@ -125669,9 +126433,10 @@ self: {
        homepage = "http://github.com/ekmett/linear/";
        description = "Linear Algebra";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "linear_1_20_4" = callPackage
+  "linear" = callPackage
     ({ mkDerivation, adjunctions, base, base-orphans, binary, bytes
      , bytestring, cereal, containers, deepseq, directory, distributive
      , doctest, filepath, ghc-prim, hashable, HUnit, lens, reflection
@@ -125694,11 +126459,9 @@ self: {
          base binary bytestring directory doctest filepath HUnit lens
          simple-reflect test-framework test-framework-hunit
        ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/linear/";
        description = "Linear Algebra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linear-accelerate" = callPackage
@@ -127418,6 +128181,8 @@ self: {
        pname = "lock-file";
        version = "0.5.0.2";
        sha256 = "274ecb94d0af66fed7b624fca402381d7f262f510ac7c4271037153efda49ad0";
+       revision = "1";
+       editedCabalFile = "ef22bf7dfd46708eebcc8a895a0a265e6bbf1d05a7ebfdf0f9ee6513d838df8e";
        libraryHaskellDepends = [
          base data-default-class directory exceptions tagged-exception-core
          transformers
@@ -127792,6 +128557,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "logging-effect" = callPackage
+    ({ mkDerivation, async, base, exceptions, free, monad-control, mtl
+     , stm, stm-delay, text, time, transformers, transformers-base
+     , wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "logging-effect";
+       version = "1.0.0";
+       sha256 = "9c7deabf027c2e7bfc800b26f103b259e25ee9ef814ce53260df3950aa682e8f";
+       libraryHaskellDepends = [
+         async base exceptions free monad-control mtl stm stm-delay text
+         time transformers transformers-base wl-pprint-text
+       ];
+       homepage = "https://github.com/ocharles/logging-effect";
+       description = "A mtl-style monad transformer for general purpose & compositional logging";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "logging-facade_0_0_0" = callPackage
     ({ mkDerivation, base, hspec, template-haskell, transformers }:
      mkDerivation {
@@ -128762,23 +129545,6 @@ self: {
      }) {};
 
   "luminance" = callPackage
-    ({ mkDerivation, base, containers, contravariant, dlist, gl, linear
-     , mtl, resourcet, semigroups, transformers, vector, void
-     }:
-     mkDerivation {
-       pname = "luminance";
-       version = "0.9.1.1";
-       sha256 = "5173588f12ec9949a483db6607cf6583132fb6b958a09c8473e025fa191210c2";
-       libraryHaskellDepends = [
-         base containers contravariant dlist gl linear mtl resourcet
-         semigroups transformers vector void
-       ];
-       homepage = "https://github.com/phaazon/luminance";
-       description = "Type-safe, type-level and stateless graphics framework";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "luminance_0_9_1_2" = callPackage
     ({ mkDerivation, base, containers, contravariant, dlist, gl, linear
      , mtl, resourcet, semigroups, transformers, vector, void
      }:
@@ -128793,10 +129559,9 @@ self: {
        homepage = "https://github.com/phaazon/luminance";
        description = "Type-safe, type-level and stateless graphics framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "luminance-samples" = callPackage
+  "luminance-samples_0_9" = callPackage
     ({ mkDerivation, base, contravariant, GLFW-b, JuicyPixels, linear
      , luminance, mtl, resourcet, transformers
      }:
@@ -128813,10 +129578,10 @@ self: {
        homepage = "https://github.com/phaazon/luminance-samples";
        description = "Luminance samples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "luminance-samples_0_9_1" = callPackage
+  "luminance-samples" = callPackage
     ({ mkDerivation, base, contravariant, GLFW-b, JuicyPixels, linear
      , luminance, mtl, resourcet, transformers
      }:
@@ -128833,7 +129598,7 @@ self: {
        homepage = "https://github.com/phaazon/luminance-samples";
        description = "Luminance samples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "lushtags" = callPackage
@@ -129269,6 +130034,7 @@ self: {
          transformers-compat void
        ];
        testHaskellDepends = [ base directory doctest filepath ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/machines/";
        description = "Networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
@@ -129581,6 +130347,7 @@ self: {
        version = "0.4.0.0";
        sha256 = "7fbef4ce5d50c30f6c386707e655c74626246f4bc8bb84a826a73182ae1a49a3";
        libraryHaskellDepends = [ base deepseq profunctors semigroups ];
+       jailbreak = true;
        homepage = "https://github.com/cutsea110/magma";
        description = "magma is an algebraic structure consisting a set together with an binary operation";
        license = stdenv.lib.licenses.bsd3;
@@ -129826,6 +130593,22 @@ self: {
        pname = "managed";
        version = "1.0.0";
        sha256 = "c5beb44a281e80d67cb2cbf8f116bce4b8d8f29ce56b4494a1a522d36e38cb1a";
+       revision = "1";
+       editedCabalFile = "e785d7abda6ca46246fcb4531202a68c71a17c0f1bfffe07bbcf7408bf0b1986";
+       libraryHaskellDepends = [ base transformers ];
+       description = "A monad for managed values";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "managed_1_0_1" = callPackage
+    ({ mkDerivation, base, transformers }:
+     mkDerivation {
+       pname = "managed";
+       version = "1.0.1";
+       sha256 = "d2efbf081803303fb42b7bc105004a49be6f41719ad3e817400cba3a504dcb5f";
+       revision = "1";
+       editedCabalFile = "0baecb7e8c20aadcb65399e72b2db383cca207b7a3fafd22c637cff387e022ba";
        libraryHaskellDepends = [ base transformers ];
        description = "A monad for managed values";
        license = stdenv.lib.licenses.bsd3;
@@ -129836,8 +130619,8 @@ self: {
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "managed";
-       version = "1.0.1";
-       sha256 = "d2efbf081803303fb42b7bc105004a49be6f41719ad3e817400cba3a504dcb5f";
+       version = "1.0.2";
+       sha256 = "f2f562c1c9a1c5b2a73593fe9989c651fda86f67eee65be20861d151911a663c";
        libraryHaskellDepends = [ base transformers ];
        description = "A monad for managed values";
        license = stdenv.lib.licenses.bsd3;
@@ -130323,7 +131106,6 @@ self: {
          aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit
          tasty-quickcheck text
        ];
-       jailbreak = true;
        description = "Library for interfacing with the Mandrill JSON API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130348,7 +131130,6 @@ self: {
          aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit
          tasty-quickcheck text
        ];
-       jailbreak = true;
        description = "Library for interfacing with the Mandrill JSON API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -130473,6 +131254,7 @@ self: {
          template-haskell text time tls transformers transformers-base
          unordered-containers utf8-string vector wai warp x509-system
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Bindings to the MangoPay API";
@@ -132985,7 +133767,6 @@ self: {
          transformers unix wai wai-app-file-cgi wai-logger warp
        ];
        testHaskellDepends = [ base hspec http-client ];
-       jailbreak = true;
        homepage = "http://www.mew.org/~kazu/proj/mighttpd/";
        description = "High performance web server on WAI/warp";
        license = stdenv.lib.licenses.bsd3;
@@ -133802,7 +134583,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "mmorph" = callPackage
+  "mmorph_1_0_4" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "mmorph";
@@ -133811,9 +134592,10 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Monad morphisms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mmorph_1_0_5" = callPackage
+  "mmorph" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "mmorph";
@@ -133822,7 +134604,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Monad morphisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mmtl" = callPackage
@@ -134464,8 +135245,8 @@ self: {
        pname = "monad-http";
        version = "0.1.0.0";
        sha256 = "a333b087835aa4902d0814e76fe4f32a523092fd7b13526aad415160a8317192";
-       revision = "1";
-       editedCabalFile = "6dc1e9978860f42d76fc6f82d5166c9396ebdb2a555575c589970334200f5ad5";
+       revision = "2";
+       editedCabalFile = "7f2d5927cf21949017fce8d2c46c3f768e1be144e57ae4c845b409707d11313a";
        libraryHaskellDepends = [
          base base-compat bytestring exceptions http-client http-client-tls
          http-types monad-logger monadcryptorandom MonadRandom mtl text
@@ -135079,7 +135860,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "monad-products" = callPackage
+  "monad-products_4_0_0_1" = callPackage
     ({ mkDerivation, base, semigroupoids }:
      mkDerivation {
        pname = "monad-products";
@@ -135091,9 +135872,10 @@ self: {
        homepage = "http://github.com/ekmett/monad-products";
        description = "Monad products";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monad-products_4_0_1" = callPackage
+  "monad-products" = callPackage
     ({ mkDerivation, base, semigroupoids }:
      mkDerivation {
        pname = "monad-products";
@@ -135103,7 +135885,6 @@ self: {
        homepage = "http://github.com/ekmett/monad-products";
        description = "Monad products";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-ran" = callPackage
@@ -135448,7 +136229,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monadic-arrays" = callPackage
+  "monadic-arrays_0_2_1_4" = callPackage
     ({ mkDerivation, array, base, stm, transformers }:
      mkDerivation {
        pname = "monadic-arrays";
@@ -135458,9 +136239,10 @@ self: {
        homepage = "http://github.com/ekmett/monadic-arrays/";
        description = "Boxed and unboxed arrays for monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monadic-arrays_0_2_2" = callPackage
+  "monadic-arrays" = callPackage
     ({ mkDerivation, array, base, stm, transformers
      , transformers-compat
      }:
@@ -135474,7 +136256,6 @@ self: {
        homepage = "http://github.com/ekmett/monadic-arrays/";
        description = "Boxed and unboxed arrays for monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monadiccp" = callPackage
@@ -135973,6 +136754,8 @@ self: {
        pname = "mono-traversable";
        version = "0.9.2.1";
        sha256 = "34c3827b49e47e83bdbed647ae6ca27e049be8887904007b57b03dc006b542ef";
+       revision = "1";
+       editedCabalFile = "ab0be6e2bbdc22be03cf722277972a7bd3c11732567fe33f7f12af56a09f533e";
        libraryHaskellDepends = [
          base bytestring comonad containers dlist dlist-instances hashable
          semigroupoids semigroups text transformers unordered-containers
@@ -135998,6 +136781,35 @@ self: {
        pname = "mono-traversable";
        version = "0.9.3";
        sha256 = "d73b495b65cdc3951e2407d07e46b3cb5b3ab074b474c0742687b616f4e7e4db";
+       revision = "1";
+       editedCabalFile = "021ce075d81cc8dbadfa395895ba0511fc35230f12e1ba409a553eded8c96d1f";
+       libraryHaskellDepends = [
+         base bytestring comonad containers dlist dlist-instances hashable
+         semigroupoids semigroups split text transformers
+         unordered-containers vector vector-algorithms vector-instances
+       ];
+       testHaskellDepends = [
+         base bytestring containers foldl hspec HUnit QuickCheck semigroups
+         text transformers unordered-containers vector
+       ];
+       homepage = "https://github.com/snoyberg/mono-traversable";
+       description = "Type classes for mapping, folding, and traversing monomorphic containers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "mono-traversable_0_10_0_1" = callPackage
+    ({ mkDerivation, base, bytestring, comonad, containers, dlist
+     , dlist-instances, foldl, hashable, hspec, HUnit, QuickCheck
+     , semigroupoids, semigroups, split, text, transformers
+     , unordered-containers, vector, vector-algorithms, vector-instances
+     }:
+     mkDerivation {
+       pname = "mono-traversable";
+       version = "0.10.0.1";
+       sha256 = "2e25c24ed3cf644cd4818cfb6d4e122cffcac2a375f0edb544b6814f871af45d";
+       revision = "1";
+       editedCabalFile = "49283811dc1e565bdc4a3e7cfd2e3744866906e1267ffb018f3e271c05e2d169";
        libraryHaskellDepends = [
          base bytestring comonad containers dlist dlist-instances hashable
          semigroupoids semigroups split text transformers
@@ -136021,8 +136833,8 @@ self: {
      }:
      mkDerivation {
        pname = "mono-traversable";
-       version = "0.10.0.1";
-       sha256 = "2e25c24ed3cf644cd4818cfb6d4e122cffcac2a375f0edb544b6814f871af45d";
+       version = "0.10.1";
+       sha256 = "a82e63352ed854319bca7d33e3aa13a42a18648e47d01109f8c306ee54b9418b";
        libraryHaskellDepends = [
          base bytestring comonad containers dlist dlist-instances hashable
          semigroupoids semigroups split text transformers
@@ -137241,7 +138053,6 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
        ];
-       jailbreak = true;
        homepage = "https://github.com/aka-bash0r/multi-cabal";
        description = "A tool supporting multi cabal project builds";
        license = stdenv.lib.licenses.mit;
@@ -138106,8 +138917,8 @@ self: {
      }:
      mkDerivation {
        pname = "mvc";
-       version = "1.1.0";
-       sha256 = "31f4d34cb82ac5a404bf11c80191d0e1ae7dd228a372d8f0901fcc49fb79ac84";
+       version = "1.1.1";
+       sha256 = "b97122c1df6b5eb569e75cbc2a4c84a06e8ab942f68110a2f56b9cdac1bd34f5";
        libraryHaskellDepends = [
          async base contravariant foldl managed mmorph pipes
          pipes-concurrency transformers
@@ -139100,8 +139911,8 @@ self: {
      }:
      mkDerivation {
        pname = "ncurses";
-       version = "0.2.14";
-       sha256 = "0aec2ed4a70c08d45b225a9096711ef3edf6c4b01e8d4de389069939ff1662cc";
+       version = "0.2.15";
+       sha256 = "d66088846d7b82ac7921a81e6456492277f1d81c0b115afe1a35b23e0ec0b198";
        libraryHaskellDepends = [ base containers text transformers ];
        librarySystemDepends = [ ncurses ];
        libraryToolDepends = [ c2hs ];
@@ -141141,6 +141952,7 @@ self: {
        version = "0.3.0.1";
        sha256 = "299e21e75cfe2c3c7914d05b5fe142209cbd50553369318cffc643b57660d8ba";
        libraryHaskellDepends = [ base wai ];
+       jailbreak = true;
        description = "A routing library for wai";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -142560,7 +143372,6 @@ self: {
          aeson base bytestring lens lens-aeson pipes pipes-aeson
          pipes-bytestring pipes-http pipes-parse text time wreq
        ];
-       jailbreak = true;
        homepage = "https://github.com/bts/nylas-hs";
        description = "Client for the Nylas API";
        license = stdenv.lib.licenses.bsd3;
@@ -143370,8 +144181,8 @@ self: {
        pname = "opaleye";
        version = "0.4.2.0";
        sha256 = "b924c4d0fa7151c0dbaee5ddcd89adfa569614204a805392625752ea6dc13c20";
-       revision = "1";
-       editedCabalFile = "64de3c71480e306843b335e7672e38548c4c6396222a466901096fa72c49fc17";
+       revision = "2";
+       editedCabalFile = "bf554e82c1ac3c72f9df13494052197f0e8f131d0f44487073443a180c51395a";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring case-insensitive
          contravariant postgresql-simple pretty product-profunctors
@@ -144402,7 +145213,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "optparse-applicative" = callPackage
+  "optparse-applicative_0_12_0_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, process, transformers
      , transformers-compat
      }:
@@ -144416,6 +145227,23 @@ self: {
        homepage = "https://github.com/pcapriotti/optparse-applicative";
        description = "Utilities and combinators for parsing command line options";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "optparse-applicative" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, process, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "optparse-applicative";
+       version = "0.12.1.0";
+       sha256 = "18b46d6d2c17e941bb02f84e980390f056795dce73ece946d71d3d4d002313d5";
+       libraryHaskellDepends = [
+         ansi-wl-pprint base process transformers transformers-compat
+       ];
+       homepage = "https://github.com/pcapriotti/optparse-applicative";
+       description = "Utilities and combinators for parsing command line options";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "optparse-declarative" = callPackage
@@ -145230,6 +146058,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "pagerduty" = callPackage
+    ({ mkDerivation, aeson, base, bifunctors, bytestring
+     , bytestring-conversion, conduit, data-default-class, exceptions
+     , generics-sop, http-client, http-types, lens, lens-aeson, mmorph
+     , monad-control, mtl, template-haskell, text, time
+     , time-locale-compat, transformers, transformers-base
+     , transformers-compat, unordered-containers
+     }:
+     mkDerivation {
+       pname = "pagerduty";
+       version = "0.0.4";
+       sha256 = "41549771fe6689ffb97806e615e86a3c7384177cbcc1c77873167a3e9d05be9c";
+       libraryHaskellDepends = [
+         aeson base bifunctors bytestring bytestring-conversion conduit
+         data-default-class exceptions generics-sop http-client http-types
+         lens lens-aeson mmorph monad-control mtl template-haskell text time
+         time-locale-compat transformers transformers-base
+         transformers-compat unordered-containers
+       ];
+       homepage = "http://github.com/brendanhay/pagerduty";
+       description = "Client library for PagerDuty Integration and REST APIs";
+       license = "unknown";
+     }) {};
+
   "pagure-hook-receiver" = callPackage
     ({ mkDerivation, base, containers, scotty, shelly, text
      , transformers, unix
@@ -145841,7 +146693,6 @@ self: {
          aeson base bytestring directory filepath pandoc pandoc-types
          process temporary text yaml
        ];
-       jailbreak = true;
        doCheck = false;
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
@@ -145874,7 +146725,6 @@ self: {
          aeson base bytestring directory filepath pandoc pandoc-types
          process temporary text yaml
        ];
-       jailbreak = true;
        doCheck = false;
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
@@ -145907,7 +146757,6 @@ self: {
          aeson base bytestring directory filepath pandoc pandoc-types
          process temporary text yaml
        ];
-       jailbreak = true;
        doCheck = false;
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
@@ -147370,6 +148219,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "path-io" = callPackage
+    ({ mkDerivation, base, directory, exceptions, filepath, path, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "path-io";
+       version = "0.1.1";
+       sha256 = "252633966f9a2c76297260c517b5a4d45597ffe4b3b8f53dbd44a363a4eb55cc";
+       libraryHaskellDepends = [
+         base directory exceptions filepath path time transformers
+       ];
+       homepage = "https://github.com/mrkkrp/path-io";
+       description = "Interface to ‘directory’ package for users of ‘path’";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "path-pieces_0_1_4" = callPackage
     ({ mkDerivation, base, hspec, HUnit, QuickCheck, text, time }:
      mkDerivation {
@@ -149574,7 +150439,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
-  "persistent-postgresql" = callPackage
+  "persistent-postgresql_2_2_1_2" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
      , containers, monad-control, monad-logger, persistent
      , postgresql-libpq, postgresql-simple, resourcet, text, time
@@ -149592,6 +150457,28 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Backend for the persistent library using postgresql";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ psibi ];
+     }) {};
+
+  "persistent-postgresql" = callPackage
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit
+     , containers, monad-control, monad-logger, persistent
+     , postgresql-libpq, postgresql-simple, resourcet, text, time
+     , transformers
+     }:
+     mkDerivation {
+       pname = "persistent-postgresql";
+       version = "2.2.2";
+       sha256 = "7ec31242349f8ea7da149991fbe3366a6a83f3e3915392c997b3c34fc27671cd";
+       libraryHaskellDepends = [
+         aeson base blaze-builder bytestring conduit containers
+         monad-control monad-logger persistent postgresql-libpq
+         postgresql-simple resourcet text time transformers
+       ];
+       homepage = "http://www.yesodweb.com/book/persistent";
+       description = "Backend for the persistent library using postgresql";
+       license = stdenv.lib.licenses.mit;
        maintainers = with stdenv.lib.maintainers; [ psibi ];
      }) {};
 
@@ -150046,7 +150933,6 @@ self: {
        testHaskellDepends = [
          aeson base bytestring hspec persistent QuickCheck text transformers
        ];
-       jailbreak = true;
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, non-relational, multi-backend persistence";
        license = stdenv.lib.licenses.mit;
@@ -150072,7 +150958,6 @@ self: {
        testHaskellDepends = [
          aeson base bytestring hspec persistent QuickCheck text transformers
        ];
-       jailbreak = true;
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Type-safe, non-relational, multi-backend persistence";
        license = stdenv.lib.licenses.mit;
@@ -151049,7 +151934,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pipes" = callPackage
+  "pipes_4_1_7" = callPackage
     ({ mkDerivation, base, mmorph, mtl, QuickCheck, test-framework
      , test-framework-quickcheck2, transformers
      }:
@@ -151064,6 +151949,24 @@ self: {
        ];
        description = "Compositional pipelines";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "pipes" = callPackage
+    ({ mkDerivation, base, mmorph, mtl, QuickCheck, test-framework
+     , test-framework-quickcheck2, transformers
+     }:
+     mkDerivation {
+       pname = "pipes";
+       version = "4.1.8";
+       sha256 = "5a5cf658f5bd6d6cf8298841d89a1819f85d02b233937ff19e5ad55c126ece34";
+       libraryHaskellDepends = [ base mmorph mtl transformers ];
+       testHaskellDepends = [
+         base mtl QuickCheck test-framework test-framework-quickcheck2
+         transformers
+       ];
+       description = "Compositional pipelines";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "pipes-aeson_0_4_1_2" = callPackage
@@ -151116,7 +152019,6 @@ self: {
          aeson attoparsec base bytestring pipes pipes-attoparsec
          pipes-bytestring pipes-parse transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/k0001/pipes-aeson";
        description = "Encode and decode JSON streams using Aeson and Pipes";
        license = stdenv.lib.licenses.bsd3;
@@ -151985,6 +152887,7 @@ self: {
        libraryHaskellDepends = [
          base blaze-builder bytestring http-types pipes transformers wai
        ];
+       jailbreak = true;
        homepage = "http://github.com/brewtown/pipes-wai";
        description = "A port of wai-conduit for the pipes ecosystem";
        license = stdenv.lib.licenses.mit;
@@ -153837,7 +154740,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "postgresql-binary" = callPackage
+  "postgresql-binary_0_7_4_1" = callPackage
     ({ mkDerivation, aeson, base, base-prelude, binary-parser
      , bytestring, conversion, conversion-bytestring, conversion-text
      , either, foldl, loch-th, placeholders, postgresql-libpq
@@ -153860,6 +154763,37 @@ self: {
          tasty-quickcheck tasty-smallcheck text time transformers uuid
          vector
        ];
+       jailbreak = true;
+       doCheck = false;
+       homepage = "https://github.com/nikita-volkov/postgresql-binary";
+       description = "Encoders and decoders for the PostgreSQL's binary format";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "postgresql-binary" = callPackage
+    ({ mkDerivation, aeson, base, base-prelude, binary-parser
+     , bytestring, conversion, conversion-bytestring, conversion-text
+     , either, foldl, loch-th, placeholders, postgresql-libpq
+     , QuickCheck, quickcheck-instances, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text, time, transformers
+     , uuid, vector
+     }:
+     mkDerivation {
+       pname = "postgresql-binary";
+       version = "0.7.5.1";
+       sha256 = "d35b169d7bd2d5f81106643e59725859446739dc69c6695136ff535cf7f55948";
+       libraryHaskellDepends = [
+         aeson base base-prelude binary-parser bytestring foldl loch-th
+         placeholders scientific text time transformers uuid vector
+       ];
+       testHaskellDepends = [
+         base base-prelude bytestring conversion conversion-bytestring
+         conversion-text either loch-th placeholders postgresql-libpq
+         QuickCheck quickcheck-instances scientific tasty tasty-hunit
+         tasty-quickcheck tasty-smallcheck text time transformers uuid
+         vector
+       ];
        doCheck = false;
        homepage = "https://github.com/nikita-volkov/postgresql-binary";
        description = "Encoders and decoders for the PostgreSQL's binary format";
@@ -154843,7 +155777,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "prelude-extras" = callPackage
+  "prelude-extras_0_4_0_2" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "prelude-extras";
@@ -154853,9 +155787,10 @@ self: {
        homepage = "http://github.com/ekmett/prelude-extras";
        description = "Higher order versions of Prelude classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "prelude-extras_0_4_0_3" = callPackage
+  "prelude-extras" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "prelude-extras";
@@ -154865,7 +155800,6 @@ self: {
        homepage = "http://github.com/ekmett/prelude-extras";
        description = "Higher order versions of Prelude classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prelude-generalize" = callPackage
@@ -155544,7 +156478,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "process-extras" = callPackage
+  "process-extras_0_3_3_5" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, ListLike, process, text
      }:
      mkDerivation {
@@ -155559,6 +156493,7 @@ self: {
        homepage = "https://github.com/seereason/process-extras";
        description = "Process extras";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "process-extras_0_3_3_6" = callPackage
@@ -155579,6 +156514,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "process-extras" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, ListLike, process, text
+     }:
+     mkDerivation {
+       pname = "process-extras";
+       version = "0.3.3.7";
+       sha256 = "50e0cfdfb1225e99c04e839270cf2b06502494b8f1953d12a04f1ddaf04fa9e1";
+       revision = "1";
+       editedCabalFile = "b671c93f8c252555f6a8a0dcd2335b6409a823ae36310f7518bbc7a55d593812";
+       libraryHaskellDepends = [
+         base bytestring deepseq ListLike process text
+       ];
+       homepage = "https://github.com/seereason/process-extras";
+       description = "Process extras";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "process-iterio" = callPackage
     ({ mkDerivation, base, bytestring, cpphs, iterIO, process
      , transformers
@@ -155824,6 +156776,7 @@ self: {
          base contravariant profunctors template-haskell
        ];
        testHaskellDepends = [ base profunctors ];
+       jailbreak = true;
        homepage = "https://github.com/tomjaguarpaw/product-profunctors";
        description = "product-profunctors";
        license = stdenv.lib.licenses.bsd3;
@@ -155841,6 +156794,7 @@ self: {
          base contravariant profunctors template-haskell
        ];
        testHaskellDepends = [ base profunctors ];
+       jailbreak = true;
        homepage = "https://github.com/tomjaguarpaw/product-profunctors";
        description = "product-profunctors";
        license = stdenv.lib.licenses.bsd3;
@@ -155854,6 +156808,8 @@ self: {
        pname = "product-profunctors";
        version = "0.6.3.1";
        sha256 = "44e082ea161dc3f2b844fd59afbadfaeea3bd88ee4a07ba0fbaf369cc6e4311d";
+       revision = "1";
+       editedCabalFile = "a249282eea8fad3325c86ec23d4b6af68ce46c2bd2a99d7be3272cfc94359ce1";
        libraryHaskellDepends = [
          base contravariant profunctors template-haskell
        ];
@@ -155987,7 +156943,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "profunctors" = callPackage
+  "profunctors_5_1_2" = callPackage
     ({ mkDerivation, base, bifunctors, comonad, contravariant
      , distributive, tagged, transformers
      }:
@@ -156002,9 +156958,10 @@ self: {
        homepage = "http://github.com/ekmett/profunctors/";
        description = "Profunctors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "profunctors_5_2" = callPackage
+  "profunctors" = callPackage
     ({ mkDerivation, base, base-orphans, bifunctors, comonad
      , contravariant, distributive, tagged, transformers
      }:
@@ -156016,11 +156973,9 @@ self: {
          base base-orphans bifunctors comonad contravariant distributive
          tagged transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/ekmett/profunctors/";
        description = "Profunctors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "progress" = callPackage
@@ -156891,6 +157846,8 @@ self: {
        pname = "pseudo-trie";
        version = "0.0.4.3";
        sha256 = "6bc3d45069da2d418e00a1403a80be933a2cb1fe86e6d549f8c40568f29b1208";
+       revision = "1";
+       editedCabalFile = "4566dd5a8847365d789eda525e2a8a61475cda0476102bda375affd3305387f5";
        libraryHaskellDepends = [ base semigroups ];
        description = "A tagged rose-tree with short circuited unique leaves";
        license = stdenv.lib.licenses.bsd3;
@@ -157271,8 +158228,8 @@ self: {
      }:
      mkDerivation {
        pname = "pure-cdb";
-       version = "0.1.1";
-       sha256 = "16d87f4304d02dd1f4f2f61337ef8a22dc359aab0e1fbbdf161d4e28003c50fa";
+       version = "0.1.2";
+       sha256 = "25228a3052ad7f6cfc003569668c94c5ecaa7665a5e205b54f221bf42ff3f840";
        libraryHaskellDepends = [
          base binary bytestring containers directory mtl vector
        ];
@@ -157721,8 +158678,8 @@ self: {
      }:
      mkDerivation {
        pname = "pusher-http-haskell";
-       version = "0.3.0.0";
-       sha256 = "50b4a5974e7e5fbf2fb77b3c59d5a790e7151c03e4ea046432548a2eb7d8d6ec";
+       version = "0.3.0.1";
+       sha256 = "b71151cf6b8e39e0025930d393bde031693270b536e37af23b9c425b290bf3dc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -157738,7 +158695,6 @@ self: {
          aeson base bytestring hspec http-client http-types mtl QuickCheck
          text transformers unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/pusher-community/pusher-http-haskell";
        description = "Haskell client library for the Pusher HTTP API";
        license = stdenv.lib.licenses.mit;
@@ -161259,6 +162215,7 @@ self: {
          http-types lens mtl random readable reflex reflex-dom safe
          string-conv text time transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/reflex-frp/reflex-dom-contrib";
        description = "A playground for experimenting with infrastructure and common code for reflex applications";
        license = stdenv.lib.licenses.bsd3;
@@ -163202,7 +164159,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "resolve-trivial-conflicts" = callPackage
+  "resolve-trivial-conflicts_0_3_2_1" = callPackage
     ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory
      , filepath, mtl, optparse-applicative, process, unix
      }:
@@ -163216,12 +164173,14 @@ self: {
          ansi-terminal base base-compat Diff directory filepath mtl
          optparse-applicative process unix
        ];
+       jailbreak = true;
        homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts";
        description = "Remove trivial conflict markers in a git repository";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "resolve-trivial-conflicts_0_3_2_2" = callPackage
+  "resolve-trivial-conflicts" = callPackage
     ({ mkDerivation, ansi-terminal, base, base-compat, Diff, directory
      , filepath, mtl, optparse-applicative, process, unix
      }:
@@ -163238,7 +164197,6 @@ self: {
        homepage = "https://github.com/ElastiLotem/resolve-trivial-conflicts";
        description = "Remove trivial conflict markers in a git repository";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "resource-effect" = callPackage
@@ -164830,16 +165788,16 @@ self: {
   "rethinkdb-client-driver" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , hashable, hspec, hspec-smallcheck, mtl, network, old-locale
-     , scientific, smallcheck, template-haskell, text, time
+     , scientific, smallcheck, stm, template-haskell, text, time
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "rethinkdb-client-driver";
-       version = "0.0.21";
-       sha256 = "27bfbca15e5bff5215deed35c19d2ec17d1c27e9cc6b9fe147e8b9ed50cd76d0";
+       version = "0.0.22";
+       sha256 = "4a192e989e1f1b60398123ad2c74701203b66a33a220f1b5c47ad495e98575bb";
        libraryHaskellDepends = [
          aeson base binary bytestring containers hashable mtl network
-         old-locale scientific template-haskell text time
+         old-locale scientific stm template-haskell text time
          unordered-containers vector
        ];
        testHaskellDepends = [
@@ -169480,12 +170438,13 @@ self: {
        pname = "semigroupoids";
        version = "4.2";
        sha256 = "88a95d383195307f4e9e20d49f194a192d816bf15fc2f12a63820a8742b9f1a3";
-       revision = "1";
-       editedCabalFile = "0be7058f2eb89390b2752e8596fb47d0cb5c6a4636d33123dfbe4637f2ba451d";
+       revision = "2";
+       editedCabalFile = "610d610c6aeddb4597f1ada0f512b9c60c11b2a570e8f8a2eb5f1a9d91adf89b";
        libraryHaskellDepends = [
          base comonad containers contravariant distributive semigroups
          transformers
        ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/semigroupoids";
        description = "Semigroupoids: Category sans id";
        license = stdenv.lib.licenses.bsd3;
@@ -169501,8 +170460,8 @@ self: {
        pname = "semigroupoids";
        version = "4.3";
        sha256 = "4ea30261a070a6af8dce041041cdb8af67154dbab95f329c9953ffc09ccbc0e2";
-       revision = "1";
-       editedCabalFile = "564644e3fb93fa01f5c45772256a980baa07275a763f1015859816942ab210b3";
+       revision = "2";
+       editedCabalFile = "235598c490e3a2b2996a8c028fa766093f6b72228a3e1a6e0f69f8eafe8199e2";
        libraryHaskellDepends = [
          base comonad containers contravariant distributive semigroups
          transformers transformers-compat
@@ -169538,7 +170497,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "semigroupoids" = callPackage
+  "semigroupoids_5_0_0_4" = callPackage
     ({ mkDerivation, base, base-orphans, bifunctors, comonad
      , containers, contravariant, directory, distributive, doctest
      , filepath, semigroups, tagged, transformers, transformers-compat
@@ -169556,9 +170515,10 @@ self: {
        homepage = "http://github.com/ekmett/semigroupoids";
        description = "Semigroupoids: Category sans id";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "semigroupoids_5_0_1" = callPackage
+  "semigroupoids" = callPackage
     ({ mkDerivation, base, base-orphans, bifunctors, comonad
      , containers, contravariant, directory, distributive, doctest
      , filepath, semigroups, tagged, transformers, transformers-compat
@@ -169577,7 +170537,6 @@ self: {
        homepage = "http://github.com/ekmett/semigroupoids";
        description = "Semigroupoids: Category sans id";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semigroupoids-syntax" = callPackage
@@ -170808,6 +171767,7 @@ self: {
          servant-lucid servant-server text time transformers wai wai-extra
          warp
        ];
+       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "Example programs for servant";
        license = stdenv.lib.licenses.bsd3;
@@ -171301,6 +172261,7 @@ self: {
          network parsec QuickCheck servant string-conversions temporary text
          transformers wai wai-extra warp
        ];
+       jailbreak = true;
        homepage = "http://haskell-servant.github.io/";
        description = "A family of combinators for defining webservices APIs and serving them";
        license = stdenv.lib.licenses.bsd3;
@@ -171699,14 +172660,18 @@ self: {
      }) {};
 
   "set-cover" = callPackage
-    ({ mkDerivation, base, containers, utility-ht }:
+    ({ mkDerivation, base, containers, enummapset, psqueues, utility-ht
+     }:
      mkDerivation {
        pname = "set-cover";
-       version = "0.0.6";
-       sha256 = "6b1554247fda64306c4d47957b00794e06e0744f9996d287dbdb6612774179f9";
+       version = "0.0.8";
+       sha256 = "186d3a1b6e824e3bd1d479347d8310dba9f1cba98e90bc03d885c42558ea95d1";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base containers utility-ht ];
+       libraryHaskellDepends = [
+         base containers enummapset psqueues utility-ht
+       ];
+       jailbreak = true;
        homepage = "http://hub.darcs.net/thielema/set-cover/";
        description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube";
        license = stdenv.lib.licenses.bsd3;
@@ -175708,7 +176673,6 @@ self: {
        version = "0.4.1";
        sha256 = "f29484ce5a765334798b1107be91b4ef555f1e67a81bd3eb1049a91eec9e6e2e";
        libraryHaskellDepends = [ aeson base linear text vector ];
-       jailbreak = true;
        homepage = "https://github.com/phaazon/smoothie";
        description = "Smooth curves via several interpolation modes";
        license = stdenv.lib.licenses.bsd3;
@@ -176886,7 +177850,6 @@ self: {
          aeson base bytestring configurator directory fay filepath mtl snap
          snap-core transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/faylang/snaplet-fay";
        description = "Fay integration for Snap with request- and pre-compilation";
        license = stdenv.lib.licenses.bsd3;
@@ -177911,7 +178874,6 @@ self: {
          aeson attoparsec base bytestring engine-io mtl stm text
          transformers unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "http://github.com/ocharles/engine.io";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -178642,7 +179604,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "speculation" = callPackage
+  "speculation_1_5_0_2" = callPackage
     ({ mkDerivation, base, ghc-prim, stm, transformers }:
      mkDerivation {
        pname = "speculation";
@@ -178652,9 +179614,10 @@ self: {
        homepage = "http://github.com/ekmett/speculation";
        description = "A framework for safe, programmable, speculative parallelism";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "speculation_1_5_0_3" = callPackage
+  "speculation" = callPackage
     ({ mkDerivation, base, ghc-prim, stm, transformers }:
      mkDerivation {
        pname = "speculation";
@@ -178664,7 +179627,6 @@ self: {
        homepage = "http://github.com/ekmett/speculation";
        description = "A framework for safe, programmable, speculative parallelism";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "speculation-transformers" = callPackage
@@ -180262,7 +181224,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
-  "stack" = callPackage
+  "stack_1_0_0" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, base
      , base16-bytestring, base64-bytestring, bifunctors, binary
      , binary-tagged, blaze-builder, byteable, bytestring, Cabal
@@ -180329,6 +181291,77 @@ self: {
        homepage = "http://haskellstack.org";
        description = "The Haskell Tool Stack";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
+     }) {};
+
+  "stack" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, base
+     , base16-bytestring, base64-bytestring, bifunctors, binary
+     , binary-tagged, blaze-builder, byteable, bytestring, Cabal
+     , conduit, conduit-combinators, conduit-extra, containers
+     , cryptohash, cryptohash-conduit, deepseq, directory, edit-distance
+     , either, enclosed-exceptions, errors, exceptions, extra
+     , fast-logger, file-embed, filelock, filepath, fsnotify, gitrev
+     , hashable, hastache, hpc, hspec, http-client, http-client-tls
+     , http-conduit, http-types, lifted-base, monad-control
+     , monad-logger, monad-loops, mtl, old-locale, optparse-applicative
+     , optparse-simple, path, persistent, persistent-sqlite
+     , persistent-template, pretty, process, project-template
+     , QuickCheck, resourcet, retry, safe, semigroups, split, stm
+     , streaming-commons, tar, template-haskell, temporary, text
+     , text-binary, time, transformers, transformers-base, unix
+     , unix-compat, unordered-containers, uuid, vector
+     , vector-binary-instances, void, word8, yaml, zlib
+     }:
+     mkDerivation {
+       pname = "stack";
+       version = "1.0.2";
+       sha256 = "4227f4c4016e5008755a974cbf04a9772319d87d1764da32228e74f13153c5c4";
+       revision = "1";
+       editedCabalFile = "d789ed4dceed4c226571d0f5f5e6d2d5602a6b36b7f4579b78352d330934e3ab";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal async attoparsec base base16-bytestring
+         base64-bytestring bifunctors binary binary-tagged blaze-builder
+         byteable bytestring Cabal conduit conduit-combinators conduit-extra
+         containers cryptohash cryptohash-conduit deepseq directory
+         edit-distance either enclosed-exceptions errors exceptions extra
+         fast-logger file-embed filelock filepath fsnotify hashable hastache
+         hpc http-client http-client-tls http-conduit http-types lifted-base
+         monad-control monad-logger monad-loops mtl old-locale
+         optparse-applicative path persistent persistent-sqlite
+         persistent-template pretty process project-template resourcet retry
+         safe semigroups split stm streaming-commons tar template-haskell
+         temporary text text-binary time transformers transformers-base unix
+         unix-compat unordered-containers uuid vector
+         vector-binary-instances void word8 yaml zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring Cabal conduit containers directory either
+         exceptions filelock filepath gitrev hashable http-client
+         http-conduit lifted-base monad-control monad-logger mtl old-locale
+         optparse-applicative optparse-simple path process resourcet split
+         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
+       ];
+       doHaddock = false;
+       doCheck = false;
+       enableSharedExecutables = false;
+       postInstall = ''
+         exe=$out/bin/stack
+         mkdir -p $out/share/bash-completion/completions
+         $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack
+       '';
+       homepage = "http://haskellstack.org";
+       description = "The Haskell Tool Stack";
+       license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
@@ -180371,6 +181404,7 @@ self: {
          base profunctors tagged template-haskell transformers
        ];
        testHaskellDepends = [ base template-haskell ];
+       jailbreak = true;
        homepage = "https://github.com/MedeaMelana/stack-prism";
        description = "Stack prisms";
        license = stdenv.lib.licenses.bsd3;
@@ -180383,8 +181417,8 @@ self: {
      }:
      mkDerivation {
        pname = "stack-run";
-       version = "0.1.0.2";
-       sha256 = "7ebf14489c52f6b52e38f238f6d5975ceedda95f066a60b224990dac85ca25f4";
+       version = "0.1.0.4";
+       sha256 = "d124831de8efbc0a98f0ba78c03a83c6b5c3c5922d4b22ae68af3e1267b29926";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -180724,7 +181758,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stackage-curator" = callPackage
+  "stackage-curator_0_11_0" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
      , base, base16-bytestring, blaze-html, byteable, bytestring, Cabal
      , classy-prelude-conduit, conduit, conduit-extra, containers
@@ -180770,6 +181804,55 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "stackage-curator" = callPackage
+    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
+     , base, base16-bytestring, binary, binary-tagged, blaze-html
+     , byteable, bytestring, Cabal, classy-prelude-conduit, conduit
+     , conduit-extra, containers, cryptohash, cryptohash-conduit
+     , data-default-class, directory, filepath, hspec, html-conduit
+     , http-client, http-client-tls, http-conduit, lucid, mime-types
+     , monad-unlift, mono-traversable, mtl, old-locale
+     , optparse-applicative, optparse-simple, process, QuickCheck
+     , resourcet, semigroups, stackage-cli, stackage-install
+     , stackage-metadata, stackage-types, stackage-update, stm
+     , streaming-commons, system-fileio, system-filepath, tar, temporary
+     , text, time, transformers, unix-compat, utf8-string, xml-conduit
+     , xml-types, yaml, zlib
+     }:
+     mkDerivation {
+       pname = "stackage-curator";
+       version = "0.12.0";
+       sha256 = "2c226623b1b4edcf8c98c8843cdde4aadd8f441e3c99e50486700e0a323b40e5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson amazonka amazonka-core amazonka-s3 async base
+         base16-bytestring binary binary-tagged blaze-html byteable
+         bytestring Cabal classy-prelude-conduit conduit conduit-extra
+         containers cryptohash cryptohash-conduit data-default-class
+         directory filepath html-conduit http-client http-client-tls
+         http-conduit lucid mime-types monad-unlift mono-traversable mtl
+         old-locale process resourcet semigroups stackage-install
+         stackage-metadata stackage-types stackage-update stm
+         streaming-commons system-fileio system-filepath tar temporary text
+         time transformers unix-compat utf8-string xml-conduit xml-types
+         yaml zlib
+       ];
+       executableHaskellDepends = [
+         base http-client http-client-tls optparse-applicative
+         optparse-simple stackage-cli stackage-update system-filepath text
+       ];
+       testHaskellDepends = [
+         base Cabal classy-prelude-conduit containers hspec http-client
+         http-client-tls QuickCheck text yaml
+       ];
+       doCheck = false;
+       homepage = "https://github.com/fpco/stackage";
+       description = "Tools for curating Stackage bundles";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stackage-install_0_1_0_3" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , cryptohash, directory, filepath, http-client, http-client-tls
@@ -180963,6 +182046,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stackage-types_1_2_0" = callPackage
+    ({ mkDerivation, aeson, base, Cabal, containers, exceptions
+     , hashable, safe, semigroups, text, time, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "stackage-types";
+       version = "1.2.0";
+       sha256 = "c00255049aa5aac04bb67372cea26feadc4f38442cedbe7035d611baa2edf4cb";
+       libraryHaskellDepends = [
+         aeson base Cabal containers exceptions hashable safe semigroups
+         text time unordered-containers vector
+       ];
+       homepage = "https://github.com/fpco/stackage-types";
+       description = "Shared data types between various Stackage packages";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stackage-update_0_1_1_1" = callPackage
     ({ mkDerivation, base, directory, filepath, process }:
      mkDerivation {
@@ -181159,11 +182261,10 @@ self: {
     ({ mkDerivation, base, checkers, mtl, QuickCheck }:
      mkDerivation {
        pname = "state-plus";
-       version = "0.1.1";
-       sha256 = "e191eef939e409e3684352435f07c918055293013015faaa08f8ee5f7d26ec27";
+       version = "0.1.2";
+       sha256 = "c6ed155137d40262bf8aa38155bd93ecdc4bdbcb4ac83f5b980eeb8545ee377d";
        libraryHaskellDepends = [ base mtl ];
        testHaskellDepends = [ base checkers mtl QuickCheck ];
-       jailbreak = true;
        description = "MonadPlus for StateT";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -181244,7 +182345,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "statestack" = callPackage
+  "statestack_0_2_0_4" = callPackage
     ({ mkDerivation, base, mtl, transformers, transformers-compat }:
      mkDerivation {
        pname = "statestack";
@@ -181255,6 +182356,20 @@ self: {
        ];
        description = "Simple State-like monad transformer with saveable and restorable state";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "statestack" = callPackage
+    ({ mkDerivation, base, mtl, transformers, transformers-compat }:
+     mkDerivation {
+       pname = "statestack";
+       version = "0.2.0.5";
+       sha256 = "f4eadcf9b08c14cb084436f81e16edf78d6eeda77a3f93e38ba5d7e263ea5f66";
+       libraryHaskellDepends = [
+         base mtl transformers transformers-compat
+       ];
+       description = "Simple State-like monad transformer with saveable and restorable state";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "statethread" = callPackage
@@ -182382,12 +183497,14 @@ self: {
      }) {};
 
   "storable-tuple" = callPackage
-    ({ mkDerivation, base, storable-record, utility-ht }:
+    ({ mkDerivation, base, base-orphans, storable-record, utility-ht }:
      mkDerivation {
        pname = "storable-tuple";
-       version = "0.0.3.1";
-       sha256 = "d6f035e56e7a786dc1b0fdf820260a55fec16cf8df486f9fc5ecadb13f583585";
-       libraryHaskellDepends = [ base storable-record utility-ht ];
+       version = "0.0.3.2";
+       sha256 = "35d3f35bbffc9acc1f81e5718cfac59d6d86ac229c740f6dde22f2374b5e8982";
+       libraryHaskellDepends = [
+         base base-orphans storable-record utility-ht
+       ];
        homepage = "http://code.haskell.org/~thielema/storable-tuple/";
        description = "Storable instance for pairs and triples";
        license = stdenv.lib.licenses.bsd3;
@@ -182884,7 +184001,6 @@ self: {
          json-stream mtl pipes resourcet streaming streaming-bytestring
          transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/michaelt/streaming-utils";
        description = "http, attoparsec, pipes and conduit utilities for the streaming libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -183342,7 +184458,6 @@ self: {
          aeson base bytestring mtl text time transformers
          unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/dmjio/stripe-haskell";
        description = "Stripe API for Haskell - Pure Core";
        license = stdenv.lib.licenses.mit;
@@ -183372,7 +184487,6 @@ self: {
          aeson base bytestring HsOpenSSL http-streams io-streams stripe-core
          text
        ];
-       jailbreak = true;
        doCheck = false;
        description = "Stripe API for Haskell - http-streams backend";
        license = stdenv.lib.licenses.mit;
@@ -184478,7 +185592,7 @@ self: {
        license = "unknown";
      }) {};
 
-  "swagger2" = callPackage
+  "swagger2_1_1_1" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, containers, doctest, Glob
      , hashable, hspec, http-media, HUnit, lens, mtl, network
      , QuickCheck, scientific, text, time, unordered-containers, vector
@@ -184498,6 +185612,29 @@ self: {
        homepage = "https://github.com/GetShopTV/swagger2";
        description = "Swagger 2.0 data model";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "swagger2" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, containers, doctest, Glob
+     , hashable, hspec, http-media, HUnit, lens, mtl, network
+     , QuickCheck, scientific, text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "swagger2";
+       version = "1.2.1";
+       sha256 = "4eba65057202562d1f57bb10dad930f4cf6e4521c414005afb83213b3901d6d9";
+       libraryHaskellDepends = [
+         aeson base containers hashable http-media lens mtl network
+         scientific text time unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base containers doctest Glob hspec HUnit lens
+         QuickCheck text unordered-containers vector
+       ];
+       homepage = "https://github.com/GetShopTV/swagger2";
+       description = "Swagger 2.0 data model";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "swapper" = callPackage
@@ -184578,8 +185715,8 @@ self: {
      }:
      mkDerivation {
        pname = "swish";
-       version = "0.9.1.5";
-       sha256 = "37e2fe2e0bba49c23c20118821a5b274da676783b79731919d1d9a9f63b28571";
+       version = "0.9.1.7";
+       sha256 = "f816c8e7e6b264043ac7d6d8572e74aedbf3c455907fc6ab6d077d2f47893b80";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -186129,8 +187266,8 @@ self: {
        pname = "tagged-exception-core";
        version = "2.1.0.0";
        sha256 = "5d31398c2780363254d7593b3b3ece476e6114cc92a811aab7bb38b3301080f0";
-       revision = "1";
-       editedCabalFile = "8f3f0eba857169c03927f8605ed326b7a4a5395582aeac4edcee44369b4c9689";
+       revision = "2";
+       editedCabalFile = "da217c59c330c63984c85be6a669d1c5c990985fa8911ea537087823a45bb8cf";
        libraryHaskellDepends = [
          base exceptions mmorph mtl transformers
        ];
@@ -186680,7 +187817,6 @@ self: {
          array base bytestring bytestring-handle containers deepseq
          directory filepath QuickCheck tasty tasty-quickcheck time
        ];
-       doCheck = false;
        description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -186777,6 +187913,8 @@ self: {
        pname = "tasty";
        version = "0.10.1";
        sha256 = "855699f3b1d7bc8aea5b10345eaa5550064f994b059aa23543753814c0810ad1";
+       revision = "1";
+       editedCabalFile = "5299d4b3a7175fa19834ad139198e934bca6285439fd3f4d2b91888b2b58ae42";
        libraryHaskellDepends = [
          ansi-terminal async base containers deepseq mtl
          optparse-applicative regex-tdfa-rc stm tagged time unbounded-delays
@@ -186796,6 +187934,8 @@ self: {
        pname = "tasty";
        version = "0.10.1.1";
        sha256 = "360f64d2aa94a36279cebe485f7a7b38be0f9a649d11523f29fd844c0bad7dbd";
+       revision = "1";
+       editedCabalFile = "e506d7dd9e4d4897508b67e88af1ead3c795f1d8d8d2aa68e02c11e59507f78c";
        libraryHaskellDepends = [
          ansi-terminal async base containers deepseq mtl
          optparse-applicative regex-tdfa-rc stm tagged time unbounded-delays
@@ -187345,6 +188485,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "tasty-silver_3_1_8_1" = callPackage
+    ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
+     , deepseq, directory, filepath, mtl, optparse-applicative, process
+     , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit
+     , temporary, text, transformers
+     }:
+     mkDerivation {
+       pname = "tasty-silver";
+       version = "3.1.8.1";
+       sha256 = "0dc1bcced319abc9984aa8e61c4bb88c30279f1b87d4d4e0f368eade99525fb0";
+       libraryHaskellDepends = [
+         ansi-terminal async base bytestring containers deepseq directory
+         filepath mtl optparse-applicative process process-extras regex-tdfa
+         stm tagged tasty temporary text
+       ];
+       testHaskellDepends = [
+         base directory filepath process tasty tasty-hunit temporary
+         transformers
+       ];
+       homepage = "https://github.com/phile314/tasty-silver";
+       description = "A fancy test runner, including support for golden tests";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tasty-smallcheck_0_8_0_1" = callPackage
     ({ mkDerivation, async, base, smallcheck, tagged, tasty }:
      mkDerivation {
@@ -187603,7 +188768,6 @@ self: {
        libraryHaskellDepends = [
          aeson base bytestring data-default http-conduit url utf8-string
        ];
-       jailbreak = true;
        description = "Telegram API client";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -187650,7 +188814,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tellbot" = callPackage
+  "tellbot_0_6_0_10" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, containers
      , http-conduit, mtl, network, regex-pcre, split, tagsoup, text
      , time, transformers
@@ -187665,12 +188829,14 @@ self: {
          base bifunctors bytestring containers http-conduit mtl network
          regex-pcre split tagsoup text time transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/phaazon/tellbot";
        description = "IRC tellbot";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tellbot_0_6_0_11" = callPackage
+  "tellbot" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, containers
      , http-conduit, mtl, network, regex-pcre, split, tagsoup, text
      , time, transformers
@@ -187688,7 +188854,6 @@ self: {
        homepage = "https://github.com/phaazon/tellbot";
        description = "IRC tellbot";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "template" = callPackage
@@ -188641,15 +189806,14 @@ self: {
      }:
      mkDerivation {
        pname = "test-simple";
-       version = "0.1.7";
-       sha256 = "6a36da295bc9b96dc3c669acbc47b1004e8d16e68276a887c5410eb177093edd";
+       version = "0.1.8";
+       sha256 = "8e8bacb6299e82d1f3f3643144e24ce574b99b2f052bd630930a4c2e62267895";
        libraryHaskellDepends = [
          base mtl QuickCheck state-plus template-haskell
        ];
        testHaskellDepends = [
          base executable-path mtl process QuickCheck
        ];
-       jailbreak = true;
        description = "Simple Perl inspired testing";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -189962,6 +191126,8 @@ self: {
        pname = "th-desugar";
        version = "1.4.2";
        sha256 = "69a10e29337f68af0a97776cf7a7ecb0a49a8a79d5dcab53b5f772d1259c809a";
+       revision = "1";
+       editedCabalFile = "1ec55cb7234a4e2b229484198407fc76df4b40512df6097b07ae252a0c522b32";
        libraryHaskellDepends = [
          base containers mtl syb template-haskell
        ];
@@ -189969,6 +191135,7 @@ self: {
          base containers hspec HUnit mtl syb template-haskell
        ];
        doHaddock = false;
+       jailbreak = true;
        doCheck = false;
        homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar";
        description = "Functions to desugar Template Haskell";
@@ -189984,12 +191151,15 @@ self: {
        pname = "th-desugar";
        version = "1.4.2.1";
        sha256 = "59f27b6a076f71f02bb1688bd0dd078e093cb83463dc9cd1ba83eabd619047fb";
+       revision = "1";
+       editedCabalFile = "c7e3641a1eeafc122866550771d0e1802079d394aadfd9b52ec4eba4cce42bd5";
        libraryHaskellDepends = [
          base containers mtl syb template-haskell
        ];
        testHaskellDepends = [
          base containers hspec HUnit mtl syb template-haskell
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "http://www.cis.upenn.edu/~eir/packages/th-desugar";
        description = "Functions to desugar Template Haskell";
@@ -190260,12 +191430,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "th-lift" = callPackage
+  "th-lift_0_7_5" = callPackage
     ({ mkDerivation, base, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "th-lift";
        version = "0.7.5";
        sha256 = "f3d483f1f85556e0be70b3c4f6570bb2828cda68a83b9d0a70f035c8c29cad8f";
+       revision = "1";
+       editedCabalFile = "89d1cfba7e4a65b09078476bbbd2a0d0e843922ca8d17885fd63d9ace06c25cc";
+       libraryHaskellDepends = [ base ghc-prim template-haskell ];
+       testHaskellDepends = [ base ghc-prim template-haskell ];
+       homepage = "http://github.com/mboes/th-lift";
+       description = "Derive Template Haskell's Lift class for datatypes";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "th-lift" = callPackage
+    ({ mkDerivation, base, ghc-prim, template-haskell }:
+     mkDerivation {
+       pname = "th-lift";
+       version = "0.7.6";
+       sha256 = "326a2c9dac32506d5b7e5d9f3234c0e7a33a612256e4745bfb8de5a32803ecd1";
        libraryHaskellDepends = [ base ghc-prim template-haskell ];
        testHaskellDepends = [ base ghc-prim template-haskell ];
        homepage = "http://github.com/mboes/th-lift";
@@ -190418,7 +191604,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "th-reify-many" = callPackage
+  "th-reify-many_0_1_3" = callPackage
     ({ mkDerivation, base, containers, mtl, safe, template-haskell
      , th-expand-syns
      }:
@@ -190433,6 +191619,24 @@ self: {
        homepage = "http://github.com/mgsloan/th-reify-many";
        description = "Recurseively reify template haskell datatype info";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "th-reify-many" = callPackage
+    ({ mkDerivation, base, containers, mtl, safe, template-haskell
+     , th-expand-syns
+     }:
+     mkDerivation {
+       pname = "th-reify-many";
+       version = "0.1.4";
+       sha256 = "6de5daac837af9d845bb2bbd302db35109b5d20ae298c5ee35eb3c7889850c42";
+       libraryHaskellDepends = [
+         base containers mtl safe template-haskell th-expand-syns
+       ];
+       testHaskellDepends = [ base template-haskell ];
+       homepage = "http://github.com/mgsloan/th-reify-many";
+       description = "Recurseively reify template haskell datatype info";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "th-sccs" = callPackage
@@ -190570,6 +191774,8 @@ self: {
        pname = "these";
        version = "0.6.2.0";
        sha256 = "9802c398812396525789156b39e23dcb03fe3d218d588f33700386897993bee7";
+       revision = "1";
+       editedCabalFile = "3eb49900e4884ffe0296f8fb963b2cbf078f2ee368509c8e51a7304a7bdb5681";
        libraryHaskellDepends = [
          base bifunctors containers data-default-class hashable mtl
          profunctors semigroupoids semigroups transformers
@@ -191381,6 +192587,8 @@ self: {
        pname = "time-parsers";
        version = "0.1.0.0";
        sha256 = "e4eb246c3d97e69785a26ecd91381b4cf80e4d1d4313381ad68861b7e72ccff8";
+       revision = "1";
+       editedCabalFile = "57e4187d557fd911e5578d0daf7ccc5734bb968820e211c1a3c64c291b423132";
        libraryHaskellDepends = [ base parsers template-haskell time ];
        testHaskellDepends = [
          attoparsec base bifunctors parsec parsers tasty tasty-hunit
@@ -191957,6 +193165,7 @@ self: {
          aeson attoparsec base errors text unordered-containers vector
        ];
        testHaskellDepends = [ aeson base hspec vector ];
+       jailbreak = true;
        homepage = "https://github.com/llhotka/tiphys";
        description = "Navigating and editing JSON data";
        license = stdenv.lib.licenses.bsd3;
@@ -193002,12 +194211,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "transformers_0_5_0_2" = callPackage
+  "transformers_0_5_1_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "transformers";
-       version = "0.5.0.2";
-       sha256 = "3fb9c00cae4b0531a05d29c8d21de775352b97c8ab1091f35e9acdbee28facc6";
+       version = "0.5.1.0";
+       sha256 = "d1bd8fefc1bb73ac3bad35ade9af0919bed2be6d6734cdf959d9a31ba1e70cdd";
        libraryHaskellDepends = [ base ];
        description = "Concrete functor and monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -193884,7 +195093,6 @@ self: {
          filepath hashable haskeline JuicyPixels mtl parsec process random
          template-haskell time vector yaml
        ];
-       jailbreak = true;
        homepage = "https://github.com/entropia/tip-toi-reveng";
        description = "Working with files for the Tiptoi® pen";
        license = stdenv.lib.licenses.mit;
@@ -193908,7 +195116,6 @@ self: {
          filepath hashable haskeline JuicyPixels mtl parsec process random
          template-haskell time vector yaml
        ];
-       jailbreak = true;
        homepage = "https://github.com/entropia/tip-toi-reveng";
        description = "Working with files for the Tiptoi® pen";
        license = stdenv.lib.licenses.mit;
@@ -194593,22 +195800,20 @@ self: {
      }) {};
 
   "twitch" = callPackage
-    ({ mkDerivation, base, data-default, directory, fsnotify, Glob
-     , hspec, optparse-applicative, QuickCheck, system-fileio
-     , system-filepath, time, transformers
+    ({ mkDerivation, base, data-default, directory, filepath, fsnotify
+     , Glob, hspec, optparse-applicative, time, transformers
      }:
      mkDerivation {
        pname = "twitch";
-       version = "0.1.6.1";
-       sha256 = "53d566864c4467f9937e7c70707b8f475dbdb38fd51f85015871a82aa7657c43";
+       version = "0.1.7.0";
+       sha256 = "45579aee9ce53f729477a378320bc37755e9daf146df8297db0ed8cbf056fb36";
        libraryHaskellDepends = [
-         base data-default directory fsnotify Glob optparse-applicative
-         system-fileio system-filepath time transformers
+         base data-default directory filepath fsnotify Glob
+         optparse-applicative time transformers
        ];
        testHaskellDepends = [
-         base data-default directory fsnotify Glob hspec
-         optparse-applicative QuickCheck system-fileio system-filepath time
-         transformers
+         base data-default directory filepath fsnotify Glob hspec
+         optparse-applicative time transformers
        ];
        homepage = "https://github.com/jfischoff/twitch";
        description = "A high level file watcher DSL";
@@ -194727,7 +195932,6 @@ self: {
        testHaskellDepends = [
          base containers HUnit test-framework test-framework-hunit
        ];
-       jailbreak = true;
        homepage = "https://github.com/stackbuilders/twitter-feed";
        description = "Client for fetching Twitter timeline via Oauth";
        license = stdenv.lib.licenses.mit;
@@ -195532,7 +196736,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "typelits-witnesses" = callPackage
+  "typelits-witnesses_0_1_1_0" = callPackage
     ({ mkDerivation, base, constraints, reflection }:
      mkDerivation {
        pname = "typelits-witnesses";
@@ -195542,6 +196746,19 @@ self: {
        homepage = "https://github.com/mstksg/typelits-witnesses";
        description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "typelits-witnesses" = callPackage
+    ({ mkDerivation, base, constraints, reflection }:
+     mkDerivation {
+       pname = "typelits-witnesses";
+       version = "0.2.0.0";
+       sha256 = "e4119460d139dde387863da5b1169d8f5213ff03c5487e35189015c701b0c362";
+       libraryHaskellDepends = [ base constraints reflection ];
+       homepage = "https://github.com/mstksg/typelits-witnesses";
+       description = "Existential witnesses, singletons, and classes for operations on GHC TypeLits";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "typeof" = callPackage
@@ -195868,6 +197085,8 @@ self: {
        pname = "uhc-light";
        version = "1.1.9.2";
        sha256 = "f77b28c6e49fd36bb5369714283d72d37b8dc2f90b444e5789a5503e864d0ee7";
+       revision = "1";
+       editedCabalFile = "9281e38cd36593fbdd779caa5c3e678b4d4f967f496b5d3df5d55b1cd5a8a85f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -195880,6 +197099,7 @@ self: {
          hashable mtl network old-locale primitive process syb transformers
          uhc-util uulib vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/UU-ComputerScience/uhc";
        description = "Part of UHC packaged as cabal/hackage installable library";
        license = stdenv.lib.licenses.bsd3;
@@ -195894,10 +197114,13 @@ self: {
        pname = "uhc-util";
        version = "0.1.6.3";
        sha256 = "6d64396e186a2a05a5f3a0ace58b768e83e9655b22ab3fde42d0154152358046";
+       revision = "1";
+       editedCabalFile = "eedc35cfdb41a84edc0a70661797a7ea98684f7b30a506309d40975370f55c0a";
        libraryHaskellDepends = [
          array base binary bytestring containers directory fclabels fgl
          hashable mtl process syb time time-compat uulib
        ];
+       jailbreak = true;
        homepage = "https://github.com/UU-ComputerScience/uhc-util";
        description = "UHC utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -196781,6 +198004,8 @@ self: {
        pname = "universe-instances-extended";
        version = "1.0.0.1";
        sha256 = "665b272701b16a6bb8d40a5396aa1dcb038f002452ebdc29d353e3be2070c997";
+       revision = "1";
+       editedCabalFile = "19250a2533aa23a84169d72218dc3f5a055253a866901bb78853fb2b271951db";
        libraryHaskellDepends = [
          adjunctions base comonad universe-instances-base void
        ];
@@ -196797,6 +198022,8 @@ self: {
        pname = "universe-instances-trans";
        version = "1.0.0.1";
        sha256 = "0d047cf1eb4af9f2052f44f487e7d2d44c86f51b54a3cc1fc5243ad816e8310e";
+       revision = "1";
+       editedCabalFile = "c96cbeb4bf0240bbe09476ca360e9d35cb07cb0af4324bfbfa5cce55df7a9c35";
        libraryHaskellDepends = [
          base mtl transformers universe-base universe-instances-base
        ];
@@ -197285,6 +198512,7 @@ self: {
          units-parser
        ];
        testHaskellDepends = [ base tasty tasty-hunit ];
+       jailbreak = true;
        homepage = "https://github.com/adamgundry/uom-plugin";
        description = "Units of measure as a GHC typechecker plugin";
        license = stdenv.lib.licenses.bsd3;
@@ -199908,8 +201136,8 @@ self: {
        pname = "vector-th-unbox";
        version = "0.2.1.0";
        sha256 = "30dfe03ef275d327006396c2de14a625acb067596156e48748756e388cec1e65";
-       revision = "1";
-       editedCabalFile = "5c71ff12b57058a0bb8f9dd2db98e705618bfbb6b1fa2181025a669a41f78d82";
+       revision = "2";
+       editedCabalFile = "ca09cfbd155faf95ea8bccab39ce28368e70b473fa2249a0c44b308cea8ecb3a";
        libraryHaskellDepends = [ base template-haskell vector ];
        testHaskellDepends = [ base data-default vector ];
        description = "Deriver for Data.Vector.Unboxed using Template Haskell";
@@ -199923,8 +201151,8 @@ self: {
        pname = "vector-th-unbox";
        version = "0.2.1.2";
        sha256 = "0df696462d424bab569cc7a8ba1b1d0057bc5a71c510567fe5bcd1a940ae4d05";
-       revision = "1";
-       editedCabalFile = "bddeef74d6aab09ec3f1b5c9781f96b4a92f6f1234836cbaff78a493e73ca1fa";
+       revision = "2";
+       editedCabalFile = "8818c78bc7bb1b72b6963416e90c75e4eea18b7f7dd367a2a33d742f5b55f46d";
        libraryHaskellDepends = [ base template-haskell vector ];
        testHaskellDepends = [ base data-default vector ];
        jailbreak = true;
@@ -199939,6 +201167,8 @@ self: {
        pname = "vector-th-unbox";
        version = "0.2.1.3";
        sha256 = "33db750d3d867f23d0406a7165952b030831ed610b06ef777cfae8439b382689";
+       revision = "1";
+       editedCabalFile = "45fb308090cd50c13a24b46c0eef6bb9afcbf82fdcf944e3dc9bba27c63d5868";
        libraryHaskellDepends = [ base template-haskell vector ];
        testHaskellDepends = [ base data-default vector ];
        description = "Deriver for Data.Vector.Unboxed using Template Haskell";
@@ -200004,6 +201234,7 @@ self: {
        testHaskellDepends = [
          aeson base containers hspec unordered-containers vector verdict
        ];
+       jailbreak = true;
        description = "JSON instances and JSON Schema for verdict";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -200316,8 +201547,8 @@ self: {
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "visibility";
-       version = "0.1.0.1";
-       sha256 = "5218ceb6f0e6e396a67721e88f00392f9348f59ade898f1a07bee08f920bc434";
+       version = "0.1.0.2";
+       sha256 = "a4c32de7a4e069f97b3b6248c5cd81013a2ae6a6aa1d5b6bef8130f1245f2a28";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://github.com/LukaHorvat/visibility";
        description = "Simple computation of visibility polygons";
@@ -200828,7 +202059,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai" = callPackage
+  "wai_3_0_5_0" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring
      , bytestring-builder, hspec, http-types, network, text
      , transformers, unix-compat, vault
@@ -200845,9 +202076,10 @@ self: {
        homepage = "https://github.com/yesodweb/wai";
        description = "Web Application Interface";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai_3_2_0" = callPackage
+  "wai" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring
      , bytestring-builder, hspec, http-types, network, text
      , transformers, vault
@@ -200864,7 +202096,6 @@ self: {
        homepage = "https://github.com/yesodweb/wai";
        description = "Web Application Interface";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-accept-language" = callPackage
@@ -200913,7 +202144,6 @@ self: {
          base bytestring conduit conduit-extra directory doctest filepath
          hspec HTTP http-types unix wai warp
        ];
-       jailbreak = true;
        homepage = "http://www.mew.org/~kazu/proj/mighttpd/";
        description = "File/CGI/Rev Proxy App of WAI";
        license = stdenv.lib.licenses.bsd3;
@@ -201170,6 +202400,7 @@ self: {
          base bytestring hspec http-date http-types mime-types network
          old-locale text time transformers unix-compat wai wai-extra zlib
        ];
+       jailbreak = true;
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "WAI application for static serving";
        license = stdenv.lib.licenses.mit;
@@ -201207,6 +202438,7 @@ self: {
          network old-locale temporary text time transformers unix-compat wai
          wai-extra zlib
        ];
+       jailbreak = true;
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "WAI application for static serving";
        license = stdenv.lib.licenses.mit;
@@ -201244,6 +202476,7 @@ self: {
          network old-locale temporary text time transformers unix-compat wai
          wai-extra zlib
        ];
+       jailbreak = true;
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "WAI application for static serving";
        license = stdenv.lib.licenses.mit;
@@ -201281,6 +202514,7 @@ self: {
          network old-locale temporary text time transformers unix-compat wai
          wai-extra zlib
        ];
+       jailbreak = true;
        homepage = "http://www.yesodweb.com/book/web-application-interface";
        description = "WAI application for static serving";
        license = stdenv.lib.licenses.mit;
@@ -201334,6 +202568,7 @@ self: {
        libraryHaskellDepends = [
          base blaze-builder bytestring conduit http-types transformers wai
        ];
+       jailbreak = true;
        homepage = "https://github.com/yesodweb/wai";
        description = "conduit wrappers for WAI";
        license = stdenv.lib.licenses.mit;
@@ -201351,6 +202586,7 @@ self: {
        libraryHaskellDepends = [
          base blaze-builder bytestring conduit http-types transformers wai
        ];
+       jailbreak = true;
        homepage = "https://github.com/yesodweb/wai";
        description = "conduit wrappers for WAI";
        license = stdenv.lib.licenses.mit;
@@ -201860,6 +203096,7 @@ self: {
          base blaze-builder bytestring case-insensitive cookie fast-logger
          hspec http-types HUnit resourcet text time transformers wai zlib
        ];
+       jailbreak = true;
        homepage = "http://github.com/yesodweb/wai";
        description = "Provides some basic WAI handlers and middleware";
        license = stdenv.lib.licenses.mit;
@@ -201889,6 +203126,7 @@ self: {
          base blaze-builder bytestring case-insensitive cookie fast-logger
          hspec http-types HUnit resourcet text time transformers wai zlib
        ];
+       jailbreak = true;
        homepage = "http://github.com/yesodweb/wai";
        description = "Provides some basic WAI handlers and middleware";
        license = stdenv.lib.licenses.mit;
@@ -201919,6 +203157,7 @@ self: {
          base blaze-builder bytestring case-insensitive cookie fast-logger
          hspec http-types HUnit resourcet text time transformers wai zlib
        ];
+       jailbreak = true;
        homepage = "http://github.com/yesodweb/wai";
        description = "Provides some basic WAI handlers and middleware";
        license = stdenv.lib.licenses.mit;
@@ -201949,6 +203188,7 @@ self: {
          base blaze-builder bytestring case-insensitive cookie fast-logger
          hspec http-types HUnit resourcet text time transformers wai zlib
        ];
+       jailbreak = true;
        homepage = "http://github.com/yesodweb/wai";
        description = "Provides some basic WAI handlers and middleware";
        license = stdenv.lib.licenses.mit;
@@ -201979,6 +203219,7 @@ self: {
          base blaze-builder bytestring case-insensitive cookie fast-logger
          hspec http-types HUnit resourcet text time transformers wai zlib
        ];
+       jailbreak = true;
        homepage = "http://github.com/yesodweb/wai";
        description = "Provides some basic WAI handlers and middleware";
        license = stdenv.lib.licenses.mit;
@@ -202140,6 +203381,7 @@ self: {
          base blaze-builder bytestring http-types process streaming-commons
          transformers wai warp
        ];
+       jailbreak = true;
        description = "Launch a web app in the default browser";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -202551,6 +203793,7 @@ self: {
          shakespeare tasty tasty-hspec text transformers transformers-base
          unordered-containers urlpath wai wai-transformers warp
        ];
+       jailbreak = true;
        description = "Route to different middlewares based on the incoming Accept header";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -203094,6 +204337,7 @@ self: {
          base bytestring http-types mtl QuickCheck tasty tasty-quickcheck
          wai
        ];
+       jailbreak = true;
        description = "Minimalistic, efficient routing for WAI";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -203177,7 +204421,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-routes" = callPackage
+  "wai-routes_0_9_5" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring
      , case-insensitive, containers, cookie, data-default-class
      , filepath, hspec, hspec-wai, hspec-wai-json, http-types
@@ -203200,6 +204444,32 @@ self: {
        homepage = "https://ajnsit.github.io/wai-routes/";
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-routes" = callPackage
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring
+     , case-insensitive, containers, cookie, data-default-class
+     , filepath, hspec, hspec-wai, hspec-wai-json, http-types
+     , mime-types, monad-loops, mtl, path-pieces, random
+     , template-haskell, text, vault, wai, wai-app-static, wai-extra
+     }:
+     mkDerivation {
+       pname = "wai-routes";
+       version = "0.9.6";
+       sha256 = "347725c4e42cca525b376ea7a5017c3aaa55c15af73b600e597aee2d98f0b80b";
+       libraryHaskellDepends = [
+         aeson base blaze-builder bytestring case-insensitive containers
+         cookie data-default-class filepath http-types mime-types
+         monad-loops mtl path-pieces random template-haskell text vault wai
+         wai-app-static wai-extra
+       ];
+       testHaskellDepends = [
+         aeson base hspec hspec-wai hspec-wai-json text wai
+       ];
+       homepage = "https://ajnsit.github.io/wai-routes/";
+       description = "Typesafe URLs for Wai applications";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "wai-routing_0_12_1" = callPackage
@@ -203318,6 +204588,7 @@ self: {
        testHaskellDepends = [
          base bytestring data-default postgresql-simple text wai-session
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/hce/postgresql-session#readme";
        description = "PostgreSQL backed Wai session store";
@@ -203579,6 +204850,7 @@ self: {
          http-types network text transformers wai wai-app-static warp
          websockets
        ];
+       jailbreak = true;
        homepage = "http://github.com/yesodweb/wai";
        description = "Provide a bridge betweeen WAI and the websockets package";
        license = stdenv.lib.licenses.mit;
@@ -203605,6 +204877,7 @@ self: {
          http-types network text transformers wai wai-app-static warp
          websockets
        ];
+       jailbreak = true;
        homepage = "http://github.com/yesodweb/wai";
        description = "Provide a bridge between WAI and the websockets package";
        license = stdenv.lib.licenses.mit;
@@ -203631,6 +204904,7 @@ self: {
          http-types network text transformers wai wai-app-static warp
          websockets
        ];
+       jailbreak = true;
        homepage = "http://github.com/yesodweb/wai";
        description = "Provide a bridge between WAI and the websockets package";
        license = stdenv.lib.licenses.mit;
@@ -204416,7 +205690,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "warp" = callPackage
+  "warp_3_1_12" = callPackage
     ({ mkDerivation, array, async, auto-update, base, blaze-builder
      , bytestring, bytestring-builder, case-insensitive, containers
      , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date
@@ -204443,13 +205717,15 @@ self: {
          streaming-commons text time transformers unix unix-compat
          unordered-containers vault wai word8
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "http://github.com/yesodweb/wai";
        description = "A fast, light-weight web server for WAI applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "warp_3_2_2" = callPackage
+  "warp" = callPackage
     ({ mkDerivation, array, async, auto-update, base, blaze-builder
      , bytestring, bytestring-builder, case-insensitive, containers
      , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date
@@ -204475,11 +205751,10 @@ self: {
          streaming-commons text time transformers unix unix-compat vault wai
          word8
        ];
-       jailbreak = true;
+       doCheck = false;
        homepage = "http://github.com/yesodweb/wai";
        description = "A fast, light-weight web server for WAI applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp-dynamic" = callPackage
@@ -204744,6 +206019,7 @@ self: {
          base bytestring cprng-aes data-default-class network
          streaming-commons tls wai warp
        ];
+       jailbreak = true;
        homepage = "http://github.com/yesodweb/wai";
        description = "HTTP over TLS support for Warp via the TLS package";
        license = stdenv.lib.licenses.mit;
@@ -204762,6 +206038,7 @@ self: {
          base bytestring cprng-aes data-default-class network
          streaming-commons tls wai warp
        ];
+       jailbreak = true;
        homepage = "http://github.com/yesodweb/wai";
        description = "HTTP over TLS support for Warp via the TLS package";
        license = stdenv.lib.licenses.mit;
@@ -204780,6 +206057,7 @@ self: {
          base bytestring cprng-aes data-default-class network
          streaming-commons tls wai warp
        ];
+       jailbreak = true;
        homepage = "http://github.com/yesodweb/wai";
        description = "HTTP over TLS support for Warp via the TLS package";
        license = stdenv.lib.licenses.mit;
@@ -204798,6 +206076,26 @@ self: {
          base bytestring cprng-aes data-default-class network
          streaming-commons tls wai warp
        ];
+       jailbreak = true;
+       homepage = "http://github.com/yesodweb/wai";
+       description = "HTTP over TLS support for Warp via the TLS package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "warp-tls_3_1_5" = callPackage
+    ({ mkDerivation, base, bytestring, cprng-aes, data-default-class
+     , network, streaming-commons, tls, wai, warp
+     }:
+     mkDerivation {
+       pname = "warp-tls";
+       version = "3.1.5";
+       sha256 = "abb057ba735e455c354837f5daf07ea2c0274d8edfb7d39ac48412a6ebb9759f";
+       libraryHaskellDepends = [
+         base bytestring cprng-aes data-default-class network
+         streaming-commons tls wai warp
+       ];
+       jailbreak = true;
        homepage = "http://github.com/yesodweb/wai";
        description = "HTTP over TLS support for Warp via the TLS package";
        license = stdenv.lib.licenses.mit;
@@ -204805,23 +206103,6 @@ self: {
      }) {};
 
   "warp-tls" = callPackage
-    ({ mkDerivation, base, bytestring, cprng-aes, data-default-class
-     , network, streaming-commons, tls, wai, warp
-     }:
-     mkDerivation {
-       pname = "warp-tls";
-       version = "3.1.5";
-       sha256 = "abb057ba735e455c354837f5daf07ea2c0274d8edfb7d39ac48412a6ebb9759f";
-       libraryHaskellDepends = [
-         base bytestring cprng-aes data-default-class network
-         streaming-commons tls wai warp
-       ];
-       homepage = "http://github.com/yesodweb/wai";
-       description = "HTTP over TLS support for Warp via the TLS package";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "warp-tls_3_2_0" = callPackage
     ({ mkDerivation, base, bytestring, cprng-aes, data-default-class
      , network, streaming-commons, tls, wai, warp
      }:
@@ -204833,11 +206114,9 @@ self: {
          base bytestring cprng-aes data-default-class network
          streaming-commons tls wai warp
        ];
-       jailbreak = true;
        homepage = "http://github.com/yesodweb/wai";
        description = "HTTP over TLS support for Warp via the TLS package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp-tls-uid" = callPackage
@@ -205332,29 +206611,24 @@ self: {
      }) {};
 
   "webapp" = callPackage
-    ({ mkDerivation, alex, attoparsec, base, base16-bytestring
-     , blaze-builder, bytestring, cryptohash, css-text, data-default
-     , directory, filepath, fsnotify, happy, hashtables, hjsmin
-     , http-types, mime-types, mtl, network, optparse-applicative
-     , scotty, stm, streaming-commons, text, time, transformers, unix
-     , unordered-containers, wai, wai-extra, warp, warp-tls, zlib
+    ({ mkDerivation, aeson, base, base16-bytestring, blaze-builder
+     , bytestring, case-insensitive, http-types, mtl, network
+     , optparse-applicative, regex-posix, stm, streaming-commons, text
+     , transformers, unix, wai, warp, warp-tls, zlib
      }:
      mkDerivation {
        pname = "webapp";
-       version = "0.1.2";
-       sha256 = "90d46c20134075352f6626509d01bd51d6862ef6c4509e524f299205e1063d0c";
+       version = "0.2.0";
+       sha256 = "47c0e2d790cc43318241764b73be95f53d651afcbfb9c9e7e7e1fe3348ff7572";
        libraryHaskellDepends = [
-         attoparsec base base16-bytestring blaze-builder bytestring
-         cryptohash css-text data-default directory filepath fsnotify
-         hashtables hjsmin http-types mime-types mtl network
-         optparse-applicative scotty stm streaming-commons text time
-         transformers unix unordered-containers wai wai-extra warp warp-tls
-         zlib
+         aeson base base16-bytestring blaze-builder bytestring
+         case-insensitive http-types mtl network optparse-applicative
+         regex-posix stm streaming-commons text transformers unix wai warp
+         warp-tls zlib
        ];
-       libraryToolDepends = [ alex happy ];
        jailbreak = true;
        homepage = "https://github.com/fhsjaagshs/webapp";
-       description = "Haskell web scaffolding using Scotty, WAI, and Warp";
+       description = "Haskell web app framework based on WAI & Warp";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -206407,6 +207681,7 @@ self: {
          monadLib pretty pretty-show profunctors text
        ];
        libraryToolDepends = [ alex happy ];
+       jailbreak = true;
        description = "Haskell support for the Why3 input format";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -210718,7 +211993,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libyaml;};
 
-  "yaml" = callPackage
+  "yaml_0_8_15_2" = callPackage
     ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
      , bytestring, conduit, containers, directory, enclosed-exceptions
      , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific
@@ -210745,6 +212020,36 @@ 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" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
+     , bytestring, conduit, containers, directory, enclosed-exceptions
+     , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific
+     , text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "yaml";
+       version = "0.8.15.3";
+       sha256 = "f90444f327d8bbcbcab7a99bacbc79236528daf2a1e98aed03d146f1a2202a10";
+       configureFlags = [ "-fsystem-libyaml" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring conduit containers directory
+         enclosed-exceptions filepath resourcet scientific 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;
      }) {inherit (pkgs) libyaml;};
 
   "yaml-config" = callPackage
@@ -217040,6 +218345,7 @@ self: {
        executableHaskellDepends = [
          base bytestring docopt raw-strings-qq
        ];
+       jailbreak = true;
        description = "Post to 0bin services";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;

From 203579fb255db66d9e96b03fe4ad0c155257886d Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Jan 2016 17:46:44 +0100
Subject: [PATCH 0174/2285] Add LTS Haskell 4.2.

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 130a4e7006ef..e6986a5b5498 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -330,6 +330,9 @@ rec {
     lts-4_1 = packages.ghc7103.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-4.1.nix { };
     };
+    lts-4_2 = packages.ghc7103.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-4.2.nix { };
+    };
 
   };
 }

From 18916022e4d8f91c9c4a6e97165c0b092effd568 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Jan 2016 18:37:40 +0100
Subject: [PATCH 0175/2285] haskell-hspec: update overrides for LTS 4.2

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index e562d910f8f6..1b5b3b74f184 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -21,13 +21,14 @@ self: super: {
   clock = dontCheck super.clock;
   Dust-crypto = dontCheck super.Dust-crypto;
   hasql-postgres = dontCheck super.hasql-postgres;
-  hspec_2_1_10 = super.hspec_2_1_10.override { stringbuilder = dontCheck super.stringbuilder; };
   hspec_2_1_2 = super.hspec_2_1_2.override { stringbuilder = dontCheck super.stringbuilder; };
   hspec_2_1_3 = super.hspec_2_1_3.override { stringbuilder = dontCheck super.stringbuilder; };
   hspec_2_1_4 = super.hspec_2_1_4.override { stringbuilder = dontCheck super.stringbuilder; };
   hspec_2_1_5 = super.hspec_2_1_5.override { stringbuilder = dontCheck super.stringbuilder; };
   hspec_2_1_6 = super.hspec_2_1_6.override { stringbuilder = dontCheck super.stringbuilder; };
   hspec_2_1_7 = super.hspec_2_1_7.override { stringbuilder = dontCheck super.stringbuilder; };
+  hspec_2_1_10 = super.hspec_2_1_10.override { stringbuilder = dontCheck super.stringbuilder; };
+  hspec_2_2_1 = super.hspec_2_2_1.override { stringbuilder = dontCheck super.stringbuilder; };
   hspec-expectations_0_6_1_1 = dontCheck super.hspec-expectations_0_6_1_1;
   hspec-expectations_0_6_1 = dontCheck super.hspec-expectations_0_6_1;
   hspec-expectations_0_7_1 = dontCheck super.hspec-expectations_0_7_1;

From 23c5fbf7cb4b0c56ac6dab0619d592134a66acbd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 19 Jan 2016 17:45:15 +0100
Subject: [PATCH 0176/2285] Use latest version of async when compiling with GHC
 8.0.x.

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index cc5034008bb6..dd544a769724 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -51,4 +51,7 @@ self: super: {
   # https://github.com/hspec/HUnit/issues/7
   HUnit = dontCheck super.HUnit;
 
+  # Older versions don't support our version of base.
+  async = self.async_2_1_0;
+
 }

From dd09d2357c733c1591ba22a5fc610cb729aef6c8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 20 Jan 2016 16:40:15 +0300
Subject: [PATCH 0177/2285] postfix: fix etc/etc path

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

diff --git a/pkgs/servers/mail/postfix/3.0.nix b/pkgs/servers/mail/postfix/3.0.nix
index 73ab8c8116f3..57c529ac0b65 100644
--- a/pkgs/servers/mail/postfix/3.0.nix
+++ b/pkgs/servers/mail/postfix/3.0.nix
@@ -63,7 +63,7 @@ in stdenv.mkDerivation rec {
   postInstall = ''
     mkdir -p $out
     mv -v installdir/$out/* $out/
-    mv -v installdir/etc $out/etc
+    cp -rv installdir/etc $out
     sed -e '/^PATH=/d' -i $out/libexec/postfix/post-install
     wrapProgram $out/libexec/postfix/post-install \
       --prefix PATH ":" ${coreutils}/bin:${findutils}/bin:${gnugrep}/bin

From b19d702b6575daf686cbec28c3de6f9d24a1cd9e Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Wed, 20 Jan 2016 16:10:36 +0100
Subject: [PATCH 0178/2285] oraclejdk: 8u65, 8u66 -> 8u71, 8u72, fixes #12498

---
 pkgs/development/compilers/oraclejdk/jdk8-linux.nix    | 6 +++---
 pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
index f4bb68500d23..b71c97d56224 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "72";
+  patchVersion = "71";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "023rnlm5v7d9w4d7bgcac8j0r1vqkbv6fl20k8354pzpdjg6liaq";
-  sha256_x86_64 = "167ca39a6y0n8l87kdm5nv2hrp0wf6g4mw1rbychjc04f5igkrs6";
+  sha256_i686 = "11wcizv4gvlffzn2wj34ffwrq21xwh4ikg2vjv63avdfp2hazjqv";
+  sha256_x86_64 = "18jqdrlbv4sdds2hlmp437waq7r9b33f7hdp8kb6l7pkrizr9nwv";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
index 5900e08e19f8..f4bb68500d23 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "66";
+  patchVersion = "72";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "18l4r89na4z92djcdgyinjlhl6fmgz4x1sm40lwrsiwzg26nl0i1";
-  sha256_x86_64 = "02nwcgplq14vj1vkz99r5x20lg86hscrxb5aaifwcny7l5gsv5by";
+  sha256_i686 = "023rnlm5v7d9w4d7bgcac8j0r1vqkbv6fl20k8354pzpdjg6liaq";
+  sha256_x86_64 = "167ca39a6y0n8l87kdm5nv2hrp0wf6g4mw1rbychjc04f5igkrs6";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";

From c46625f98eba61ccfefc819ec72628c60adf322a Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Wed, 20 Jan 2016 17:47:43 +0100
Subject: [PATCH 0179/2285] nim: 0.11.2 -> 0.13.0

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

diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix
index 6e552959fdbf..a4dbfeac8342 100644
--- a/pkgs/development/compilers/nim/default.nix
+++ b/pkgs/development/compilers/nim/default.nix
@@ -1,13 +1,11 @@
 { stdenv, fetchurl, unzip }:
 
 stdenv.mkDerivation rec {
-  name = "nim-0.11.2";
-
-  buildInputs = [ unzip ];
+  name = "nim-0.13.0";
 
   src = fetchurl {
-    url = "http://nim-lang.org/download/${name}.zip";
-    sha256 = "0ay8gkd8fki3d8kbnw2px7rjdlr54kyqh5n1rjhq4vjmqs2wg5s4";
+    url = "http://nim-lang.org/download/${name}.tar.xz";
+    sha256 = "1adiij20n1cigsc44dbp60jdbydmkfp7ixbddmcn6h4dfvjzaqfd";
   };
 
   buildPhase   = "sh build.sh";

From 7f58e162bc60daf51961fda6f5e721dde529539b Mon Sep 17 00:00:00 2001
From: Matthijs Steen <emailmatthijs@gmail.com>
Date: Sun, 15 Nov 2015 00:16:52 +0100
Subject: [PATCH 0180/2285] guake: init at 0.8.3 (close #11027)

There's a catch noted at the top of the expression.
(vcunat moved it there from the commit message)
---
 pkgs/applications/misc/guake/default.nix      | 77 +++++++++++++++++++
 .../libraries/libutempter/default.nix         | 29 +++++++
 pkgs/top-level/all-packages.nix               |  7 ++
 3 files changed, 113 insertions(+)
 create mode 100644 pkgs/applications/misc/guake/default.nix
 create mode 100644 pkgs/development/libraries/libutempter/default.nix

diff --git a/pkgs/applications/misc/guake/default.nix b/pkgs/applications/misc/guake/default.nix
new file mode 100644
index 000000000000..4f6733e7d8de
--- /dev/null
+++ b/pkgs/applications/misc/guake/default.nix
@@ -0,0 +1,77 @@
+/* Beware!
+After starting Guake it will give the error message "Guake can not init! Gconf Error. Have you installed guake.schemas properly?",
+which will have to be resolved manually, because I have not found a way to automate this, without being impure.
+
+If you have Guake installed, you can use `nix-build -A gnome3.guake` to get the path to the build directory in the nix store,
+which then can be used in the following command to install the schemas file of Guake:
+gconftool-2 --install-schema-file /path/returned/by/nix-build/share/gconf/schemas/guake.schemas
+
+It can be removed again by the following command:
+gconftool-2 --recursive-unset /apps/guake
+*/
+{ stdenv, fetchurl, lib
+, pkgconfig, libtool, intltool, makeWrapper
+, dbus, gtk2, gconf, python2, python2Packages, libutempter, vte, keybinder, gnome2, gnome3 }:
+
+with lib;
+
+let inputs = [ dbus gtk2 gconf python2 libutempter vte keybinder gnome3.gnome_common ];
+    pySubDir = "lib/${python2.libPrefix}/site-packages";
+    pyPath = makeSearchPath pySubDir (attrVals [ "dbus" "notify" "pyGtkGlade" "pyxdg" ] python2Packages ++ [ gnome2.gnome_python ]);
+ in stdenv.mkDerivation rec {
+  name = "guake-${version}";
+  version = "0.8.3";
+
+  src = fetchurl {
+    url = "https://github.com/Guake/guake/archive/${version}.tar.gz";
+    sha256 = "1lbmdz3i9a97840h8239s360hd37nmhy3hs6kancxbzl1512ak1y";
+  };
+
+  nativeBuildInputs = [ pkgconfig libtool intltool makeWrapper ];
+
+  buildInputs = inputs ++ (with python2Packages; [ pyGtkGlade pyxdg ]);
+
+  patchPhase = ''
+    patchShebangs .
+  '';
+
+  configureScript = "./autogen.sh";
+
+  configureFlags = [
+    "--sysconfdir=/etc"
+    "--localstatedir=/var"
+    "--disable-schemas-install"
+  ];
+
+  installFlags = [
+    # Configuring the installation to not install gconf schemas is not always supported,
+    # therefore gconftool-2 has this variable, which will make gconftool-2 not update any of the databases.
+    "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
+    "sysconfdir=\${out}/etc"
+    "localstatedir=\${TMPDIR}"
+  ];
+
+  postInstall = ''
+    mkdir -p $out/share/gconf/schemas
+    cp data/guake.schemas $out/share/gconf/schemas
+  '';
+
+  postFixup = ''
+    for bin in $out/bin/{guake,guake-prefs}; do
+      substituteInPlace $bin \
+        --replace '/usr/bin/env python2' ${python2}/bin/python2
+      wrapProgram $bin \
+        --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
+        --prefix LD_LIBRARY_PATH : ${makeLibraryPath inputs} \
+        --prefix PYTHONPATH : "$out/${pySubDir}:${pyPath}:$PYTHONPATH"
+    done
+  '';
+
+  meta = {
+    description = "Drop-down terminal for GNOME";
+    homepage = http://guake-project.org;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.msteen ];
+  };
+}
diff --git a/pkgs/development/libraries/libutempter/default.nix b/pkgs/development/libraries/libutempter/default.nix
new file mode 100644
index 000000000000..8481f857b2ce
--- /dev/null
+++ b/pkgs/development/libraries/libutempter/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, lib, glib }:
+
+with lib;
+
+stdenv.mkDerivation rec {
+  name = "libutempter-${version}";
+  version = "1.1.6";
+
+  src = fetchurl {
+    url = "http://archive.ubuntu.com/ubuntu/pool/main/libu/libutempter/libutempter_${version}.orig.tar.bz2";
+    sha256 = "15y3xbgznjxnfmix4xg3bwmqdvghdw7slbhazb0ybmyf65gmd65q";
+  };
+
+  buildInputs = [ glib ];
+
+  installFlags = [
+    "libdir=\${out}/lib"
+    "libexecdir=\${out}/lib"
+    "includedir=\${out}/include"
+    "mandir=\${out}/share/man"
+  ];
+
+  meta = {
+    description = "Interface for terminal emulators such as screen and xterm to record user sessions to utmp and wtmp files";
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.msteen ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 91f74bc3056a..b1e7d5efc958 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7689,6 +7689,8 @@ let
 
   libusbmuxd = callPackage ../development/libraries/libusbmuxd { };
 
+  libutempter = callPackage ../development/libraries/libutempter { };
+
   libunwind = if stdenv.isDarwin
     then darwin.libunwind
     else callPackage ../development/libraries/libunwind { };
@@ -12117,6 +12119,11 @@ let
     inherit (gnome2) gtk;
   };
 
+  guake = callPackage ../applications/misc/guake {
+    gconf = gnome.GConf;
+    vte = gnome.vte.override { pythonSupport = true; };
+  };
+
   guitone = callPackage ../applications/version-management/guitone {
     graphviz = graphviz_2_32;
   };

From 97e1258dedf64bc4049d572f5d2e756dd6c5dfa6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 20 Jan 2016 12:43:00 -0600
Subject: [PATCH 0181/2285] emacsWithPackages: use local variables correctly

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

diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix
index dc4ff03f9e78..742b2cf5cde6 100644
--- a/pkgs/build-support/emacs/wrapper.nix
+++ b/pkgs/build-support/emacs/wrapper.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
   inherit emacs explicitRequires;
   phases = [ "installPhase" ];
   installPhase = ''
-    requires=""
+    local requires
     for pkg in $explicitRequires; do
       findInputs $pkg requires propagated-user-env-packages
     done

From 2b1024646b42958a874446ec7155cc6c6b247d78 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 20 Jan 2016 12:43:21 -0600
Subject: [PATCH 0182/2285] emacsWithPackages: defer loading package.el

Also stops duplicating load paths.
---
 pkgs/build-support/emacs/wrapper.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix
index 742b2cf5cde6..ad1a54886a61 100644
--- a/pkgs/build-support/emacs/wrapper.nix
+++ b/pkgs/build-support/emacs/wrapper.nix
@@ -68,11 +68,10 @@ stdenv.mkDerivation {
       fi
     }
 
-    # Add a dependency's paths to site-start.el
-    addToEmacsPaths() {
+    # Add a package's paths to site-start.el
+    addEmacsPackage() {
       addEmacsPath "exec-path" "$1/bin"
       addEmacsPath "load-path" "$1/share/emacs/site-lisp"
-      addEmacsPath "package-directory-list" "$1/share/emacs/site-lisp/elpa"
     }
 
     mkdir -p $out/share/emacs/site-lisp
@@ -80,7 +79,6 @@ stdenv.mkDerivation {
     # NixOS-specific paths. Paths are searched in the reverse of the order
     # they are specified in, so user and system profile paths are searched last.
     echo "(load-file \"$emacs/share/emacs/site-lisp/site-start.el\")" >"$siteStart"
-    echo "(require 'package)" >>"$siteStart"
 
     # Set paths for the dependencies of the requested packages. These paths are
     # searched before the profile paths, but after the explicitly-required paths.
@@ -88,14 +86,14 @@ stdenv.mkDerivation {
       # The explicitly-required packages are also in the list, but we will add
       # those paths last.
       if ! ( echo "$explicitRequires" | grep "$pkg" >/dev/null ) ; then
-        addToEmacsPaths $pkg
+        addEmacsPackage $pkg
       fi
     done
 
     # Finally, add paths for all the explicitly-required packages. These paths
     # will be searched first.
     for pkg in $explicitRequires; do
-      addToEmacsPaths $pkg
+      addEmacsPackage $pkg
     done
 
     # Byte-compiling improves start-up time only slightly, but costs nothing.

From 32c30411cfbb6e26512a299fe4830bed05b67b3e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 20 Jan 2016 12:53:11 -0600
Subject: [PATCH 0183/2285] emacsWithPackages: link packages into single
 load-path

This should provide a small speed improvement by avoiding having to set
hundreds of load-paths.
---
 pkgs/build-support/emacs/wrapper.nix | 58 ++++++++++++++--------------
 pkgs/top-level/all-packages.nix      |  1 +
 pkgs/top-level/emacs-packages.nix    |  4 +-
 3 files changed, 32 insertions(+), 31 deletions(-)

diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix
index ad1a54886a61..efee43d852ea 100644
--- a/pkgs/build-support/emacs/wrapper.nix
+++ b/pkgs/build-support/emacs/wrapper.nix
@@ -32,7 +32,7 @@ in customEmacsPackages.emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ])
 
 */
 
-{ lib, makeWrapper, stdenv }: self:
+{ lib, lndir, makeWrapper, stdenv }: self:
 
 with lib; let inherit (self) emacs; in
 
@@ -47,10 +47,13 @@ in
 
 stdenv.mkDerivation {
   name = (appendToName "with-packages" emacs).name;
-  nativeBuildInputs = [ emacs makeWrapper ];
+  nativeBuildInputs = [ emacs lndir makeWrapper ];
   inherit emacs explicitRequires;
   phases = [ "installPhase" ];
   installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/emacs/site-lisp
+
     local requires
     for pkg in $explicitRequires; do
       findInputs $pkg requires propagated-user-env-packages
@@ -59,50 +62,47 @@ stdenv.mkDerivation {
 
     siteStart="$out/share/emacs/site-lisp/site-start.el"
 
-    addEmacsPath() {
-      local list=$1
+    # Begin the new site-start.el by loading the original, which sets some
+    # NixOS-specific paths. Paths are searched in the reverse of the order
+    # they are specified in, so user and system profile paths are searched last.
+    cat >"$siteStart" <<EOF
+(load-file "$emacs/share/emacs/site-lisp/site-start.el")
+(add-to-list 'load-path "$out/share/emacs/site-lisp")
+EOF
+
+    linkPath() {
+      local pkg=$1
       local path=$2
       # Add the path to the search path list, but only if it exists
-      if [[ -d "$path" ]]; then
-        echo "(add-to-list '$list \"$path\")" >>"$siteStart"
+      if [[ -d "$pkg/$path" ]]; then
+        lndir -silent "$pkg/$path" "$out/$path"
       fi
     }
 
     # Add a package's paths to site-start.el
-    addEmacsPackage() {
-      addEmacsPath "exec-path" "$1/bin"
-      addEmacsPath "load-path" "$1/share/emacs/site-lisp"
+    linkEmacsPackage() {
+      linkPath "$1" "bin"
+      linkPath "$1" "share/emacs/site-lisp"
     }
 
-    mkdir -p $out/share/emacs/site-lisp
-    # Begin the new site-start.el by loading the original, which sets some
-    # NixOS-specific paths. Paths are searched in the reverse of the order
-    # they are specified in, so user and system profile paths are searched last.
-    echo "(load-file \"$emacs/share/emacs/site-lisp/site-start.el\")" >"$siteStart"
-
-    # Set paths for the dependencies of the requested packages. These paths are
-    # searched before the profile paths, but after the explicitly-required paths.
-    for pkg in $requires; do
-      # The explicitly-required packages are also in the list, but we will add
-      # those paths last.
-      if ! ( echo "$explicitRequires" | grep "$pkg" >/dev/null ) ; then
-        addEmacsPackage $pkg
-      fi
+    # First, link all the explicitly-required packages.
+    for pkg in $explicitRequires; do
+      linkEmacsPackage $pkg
     done
 
-    # Finally, add paths for all the explicitly-required packages. These paths
-    # will be searched first.
-    for pkg in $explicitRequires; do
-      addEmacsPackage $pkg
+    # Next, link all the dependencies.
+    for pkg in $requires; do
+      linkEmacsPackage $pkg
     done
 
     # Byte-compiling improves start-up time only slightly, but costs nothing.
     emacs --batch -f batch-byte-compile "$siteStart"
 
-    mkdir -p $out/bin
     # Wrap emacs and friends so they find our site-start.el before the original.
     for prog in $emacs/bin/*; do # */
-      makeWrapper "$prog" $out/bin/$(basename "$prog") \
+      local progname=$(basename "$prog")
+      rm -f "$out/bin/$progname"
+      makeWrapper "$prog" "$out/bin/$progname" \
         --suffix EMACSLOADPATH ":" "$out/share/emacs/site-lisp:"
     done
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 91f74bc3056a..d6aff3086356 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11720,6 +11720,7 @@ let
     inherit lib newScope stdenv;
     inherit fetchFromGitHub fetchgit fetchhg fetchurl;
     inherit emacs texinfo makeWrapper;
+    inherit (xorg) lndir;
 
     trivialBuild = callPackage ../build-support/emacs/trivial.nix {
       inherit emacs;
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 0bd7b0efad39..896e324c51bf 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -36,7 +36,7 @@
 
 , lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg
 
-, emacs, texinfo, makeWrapper
+, emacs, texinfo, lndir, makeWrapper
 , trivialBuild
 , melpaBuild
 
@@ -60,7 +60,7 @@ let
   };
 
   emacsWithPackages = import ../build-support/emacs/wrapper.nix {
-    inherit lib makeWrapper stdenv;
+    inherit lib lndir makeWrapper stdenv;
   };
 
   packagesFun = self: with self; {

From 4824f73cb3cd41c962f35548dfa2351c0f48633e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 20 Jan 2016 20:15:07 +0100
Subject: [PATCH 0184/2285] linux-4.2: remove as it's no longer maintained
 upstream

grsecurity still holds a reference to it,
but I prefer it to fail than to use a version
that is most likely not secure anymore.
---
 pkgs/os-specific/linux/kernel/linux-4.2.nix | 20 --------------------
 pkgs/top-level/all-packages.nix             | 10 ----------
 2 files changed, 30 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-4.2.nix

diff --git a/pkgs/os-specific/linux/kernel/linux-4.2.nix b/pkgs/os-specific/linux/kernel/linux-4.2.nix
deleted file mode 100644
index fbeecb3984d5..000000000000
--- a/pkgs/os-specific/linux/kernel/linux-4.2.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, perl, buildLinux, ... } @ args:
-
-import ./generic.nix (args // rec {
-  version = "4.2.6";
-  # Remember to update grsecurity!
-  extraMeta.branch = "4.2";
-
-  src = fetchurl {
-    url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0p7v6v3v9kn7w5iragi5hx0dylhis0jy6xmk77gka486q1ynpnqp";
-  };
-
-  kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ];
-
-  features.iwlwifi = true;
-  features.efiBootStub = true;
-  features.needsCifsUtils = true;
-  features.canDisableNetfilterConntrackHelpers = true;
-  features.netfilterRPFilter = true;
-} // (args.argsOverride or {}))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b1e7d5efc958..86e73bee8313 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10086,15 +10086,6 @@ let
       ];
   };
 
-  linux_4_2 = callPackage ../os-specific/linux/kernel/linux-4.2.nix {
-    kernelPatches = [ kernelPatches.bridge_stp_helper ]
-      ++ lib.optionals ((platform.kernelArch or null) == "mips")
-      [ kernelPatches.mips_fpureg_emu
-        kernelPatches.mips_fpu_sigill
-        kernelPatches.mips_ext3_n32
-      ];
-  };
-
   linux_4_3 = callPackage ../os-specific/linux/kernel/linux-4.3.nix {
     kernelPatches = [ kernelPatches.bridge_stp_helper ]
       ++ lib.optionals ((platform.kernelArch or null) == "mips")
@@ -10285,7 +10276,6 @@ let
   linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14);
   linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18);
   linuxPackages_4_1 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_1 linuxPackages_4_1);
-  linuxPackages_4_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_2 linuxPackages_4_2);
   linuxPackages_4_3 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_3 linuxPackages_4_3);
   linuxPackages_4_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_4_4 linuxPackages_4_4);
   linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing);

From 722c616b8ff0ca93703504c64526713017ac8dbf Mon Sep 17 00:00:00 2001
From: Tony White <white.tw.tw@gmail.com>
Date: Wed, 20 Jan 2016 19:51:52 +0000
Subject: [PATCH 0185/2285] ati-drivers: Restore opengl & direct rendering

- Removed a collision in the nix store
- Removed dependency on qt
- Fixed opengl and direct rendering by correcting some link paths
- Some code refactored in builder.sh
- Comments added/modified

This pull request fixes #11740 and I recommend that it be considered
as a hotfix for the stable channel due to the fact that opengl
and direct rendering are broken there too.
---
 pkgs/os-specific/linux/ati-drivers/builder.sh | 94 +++++++++++--------
 .../os-specific/linux/ati-drivers/default.nix | 86 ++++++++++++-----
 2 files changed, 116 insertions(+), 64 deletions(-)

diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh
index 520f20e2ed6e..844f30e0c60d 100644
--- a/pkgs/os-specific/linux/ati-drivers/builder.sh
+++ b/pkgs/os-specific/linux/ati-drivers/builder.sh
@@ -6,15 +6,14 @@ set -x
 
 die(){ echo $@; exit 1; }
 
-# custom unpack:
-mkdir fglrx
+mkdir fglrx # custom unpack:
 cd fglrx
 unzip $src
 cd ..
 run_file=$(echo fglrx/amd-driver-installer-*)
 sh $run_file --extract .
 
-eval "$patchPhase"
+eval "$patchPhase1"
 
 case "$system" in
   x86_64-linux)
@@ -31,6 +30,7 @@ case "$system" in
 esac
 
 # Handle/Build the kernel module.
+
 if test -z "$libsOnly"; then
 
   kernelVersion=$(cd ${kernel}/lib/modules && ls)
@@ -41,6 +41,7 @@ if test -z "$libsOnly"; then
   # current kbuild infrastructure allows using CONFIG_* defines
   # but ati sources don't use them yet..
   # copy paste from make.sh
+
   setSMP(){
 
     linuxincludes=$kernelBuild/include
@@ -68,7 +69,6 @@ if test -z "$libsOnly"; then
     if [ "$SMP" = 0 ]; then
       echo "assuming default: SMP=$SMP"
     fi
-
     # act on final result
     if [ ! "$SMP" = 0 ]; then
       smp="-SMP"
@@ -147,19 +147,15 @@ if test -z "$libsOnly"; then
 fi
 
 { # install
-
   mkdir -p $out/lib/xorg
-
   cp -r common/usr/include $out
   cp -r common/usr/sbin $out
   cp -r common/usr/share $out
-  cp -r common/usr/X11R6 $out
-
+  mkdir $out/bin/
+  cp -f common/usr/X11R6/bin/* $out/bin/
   # cp -r arch/$arch/lib $out/lib
-
   # what are those files used for?
   cp -r common/etc $out
-
   cp -r $DIR_DEPENDING_ON_XORG_VERSION/usr/X11R6/$lib_arch/* $out/lib/xorg
 
   # install kernel module
@@ -179,30 +175,26 @@ fi
   cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/modules/dri/* $out/lib
   cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/*.so* $out/lib
   cp -r $TMP/arch/$arch/usr/X11R6/$lib_arch/fglrx/fglrx-libGL.so.1.2 $out/lib/fglrx-libGL.so.1.2
-
   cp -r $TMP/arch/$arch/usr/$lib_arch/* $out/lib
-
-  # cp -r $TMP/arch/$arch/usr/$lib_arch/* $out/lib
   ln -s libatiuki.so.1.0 $out/lib/libatiuki.so.1
   ln -s fglrx-libGL.so.1.2 $out/lib/libGL.so.1
   ln -s fglrx-libGL.so.1.2 $out/lib/libGL.so
-
-  ln -s libfglrx_gamma.so.1.0 $out/lib/libfglrx_gamma.so.1
+  # FIXME : This file is missing or has changed versions
+  #ln -s libfglrx_gamma.so.1.0 $out/lib/libfglrx_gamma.so.1
   # make xorg use the ati version
   ln -s $out/lib/xorg/modules/extensions/{fglrx/fglrx-libglx.so,libglx.so}
-
   # Correct some paths that are hardcoded into binary libs.
   if [ "$arch" ==  "x86_64" ]; then
     for lib in \
-      lib/xorg/modules/extensions/fglrx/fglrx-libglx.so \
-      lib/xorg/modules/glesx.so \
-      lib/dri/fglrx_dri.so \
-      lib/fglrx_dri.so \
-      lib/fglrx-libGL.so.1.2
+      xorg/modules/extensions/fglrx/fglrx-libglx.so \
+      xorg/modules/glesx.so \
+      dri/fglrx_dri.so \
+      fglrx_dri.so \
+      fglrx-libGL.so.1.2
     do
       oldPaths="/usr/X11R6/lib/modules/dri"
       newPaths="/run/opengl-driver/lib/dri"
-      sed -i -e "s|$oldPaths|$newPaths|" $out/$lib
+      sed -i -e "s|$oldPaths|$newPaths|" $out/lib/$lib
     done
   else
     oldPaths="/usr/X11R6/lib32/modules/dri\x00/usr/lib32/dri"
@@ -211,34 +203,45 @@ fi
       $out/lib/xorg/modules/extensions/fglrx/fglrx-libglx.so
 
     for lib in \
-      lib/dri/fglrx_dri.so \
-      lib/fglrx_dri.so \
-      lib/xorg/modules/glesx.so
+      dri/fglrx_dri.so \
+      fglrx_dri.so \
+      xorg/modules/glesx.so
     do
       oldPaths="/usr/X11R6/lib32/modules/dri/"
       newPaths="/run/opengl-driver-32/lib/dri"
-      sed -i -e "s|$oldPaths|$newPaths|" $out/$lib
+      sed -i -e "s|$oldPaths|$newPaths|" $out/lib/$lib
     done
 
     oldPaths="/usr/X11R6/lib32/modules/dri\x00"
     newPaths="/run/opengl-driver-32/lib/dri"
     sed -i -e "s|$oldPaths|$newPaths|" $out/lib/fglrx-libGL.so.1.2
   fi
-
   # libstdc++ and gcc are needed by some libs
-  patchelf --set-rpath $gcc/$lib_arch $out/lib/libatiadlxx.so
-  patchelf --set-rpath $gcc/$lib_arch $out/lib/xorg/modules/glesx.so
+  for pelib1 in \
+    fglrx_dri.so \
+    dri/fglrx_dri.so
+  do
+    patchelf --remove-needed libX11.so.6 $out/lib/$pelib1
+  done
+
+  for pelib2 in \
+    libatiadlxx.so \
+    xorg/modules/glesx.so \
+    dri/fglrx_dri.so \
+    fglrx_dri.so \
+    libaticaldd.so
+  do
+    patchelf --set-rpath $gcc/$lib_arch/ $out/lib/$pelib2
+  done
 }
 
 if test -z "$libsOnly"; then
 
 { # build samples
   mkdir -p $out/bin
-
   mkdir -p samples
   cd samples
   tar xfz ../common/usr/src/ati/fglrx_sample_source.tgz
-
   eval "$patchPhaseSamples"
 
   ( # build and install fgl_glxgears
@@ -252,27 +255,42 @@ if test -z "$libsOnly"; then
 
   true || ( # build and install
 
+    ###
+    ## FIXME ?
     # doesn't build  undefined reference to `FGLRX_X11SetGamma'
-    # wich should be contained in -lfglrx_gamma
+    # which should be contained in -lfglrx_gamma
+    # This should create $out/lib/libfglrx_gamma.so.1.0 ? because there is
+    # a symlink named libfglrx_gamma.so.1 linking to libfglrx_gamma.so.1.0 in $out/lib/
 
     cd programs/fglrx_gamma
     gcc -fPIC -I${libXxf86vm}/include \
 	    -I${xf86vidmodeproto}/include \
 	    -I$out/X11R6/include \
 	    -L$out/lib \
-	    -Wall -lm -lfglrx_gamma -lX11 -lXext -o fglrx_xgamma fglrx_xgamma.c 
+	    -Wall -lm -lfglrx_gamma -lX11 -lXext -o $out/bin/fglrx_xgamma fglrx_xgamma.c 
   )
 
-  { # copy binaries and wrap them:
+  {
+    # patch and copy statically linked qt libs used by amdcccle
+    patchelf --set-interpreter $(echo $glibc/lib/ld-linux*.so.2) $TMP/arch/$arch/usr/share/ati/$lib_arch/libQtCore.so.4 &&
+    patchelf  --set-rpath $gcc/$lib_arch/ $TMP/arch/$arch/usr/share/ati/$lib_arch/libQtCore.so.4 &&
+    patchelf --set-rpath $gcc/$lib_arch/:$out/share/ati/:$libXrender/lib/:$libSM/lib/:$libICE/lib/:$libfontconfig/lib/:$libfreetype/lib/ $TMP/arch/$arch/usr/share/ati/$lib_arch/libQtGui.so.4 &&
+    mkdir -p $out/share/ati
+    cp -r $TMP/arch/$arch/usr/share/ati/$lib_arch/libQtCore.so.4 $out/share/ati/
+    cp -r $TMP/arch/$arch/usr/share/ati/$lib_arch/libQtGui.so.4 $out/share/ati/
+    # copy binaries and wrap them:
     BIN=$TMP/arch/$arch/usr/X11R6/bin
-    cp $BIN/* $out/bin
+    patchelf --set-rpath $gcc/$lib_arch/:$out/share/ati/:$libXinerama/lib/:$libXrandr/lib/ $TMP/arch/$arch/usr/X11R6/bin/amdcccle
+    patchelf --set-rpath $libXrender/lib/:$libXrandr/lib/ $TMP/arch/$arch/usr/X11R6/bin/aticonfig
+    patchelf --shrink-rpath $BIN/amdcccle
     for prog in $BIN/*; do
-      patchelf --set-interpreter $(echo $glibc/lib/ld-linux*.so.2) $out/bin/$(basename $prog)
-      wrapProgram $out/bin/$(basename $prog) --prefix LD_LIBRARY_PATH : $out/lib:$gcc/lib:$qt4/lib:$LD_LIBRARY_PATH
+      cp -f $prog $out/bin &&
+      patchelf --set-interpreter $(echo $glibc/lib/ld-linux*.so.2) $out/bin/$(basename $prog) &&
+      wrapProgram $out/bin/$(basename $prog) --prefix LD_LIBRARY_PATH : $out/lib/:$gcc/lib/:$out/share/ati/:$libXinerama/lib/:$libXrandr/lib/:$libfontconfig/lib/:$libfreetype/lib/:$LD_LIBRARY_PATH
     done
   }
 
-  rm -fr $out/lib/modules/fglrx # don't think those .a files are needed. They cause failure of the mod
+  rm -f $out/lib/fglrx/switchlibglx && rm -f $out/lib/fglrx/switchlibGL
 
 }
 
diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index bb0888855095..377297feaf75 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -1,9 +1,6 @@
-{ stdenv, fetchurl, kernel ? null, which, imake
-, mesa # for fgl_glxgears
-, libXxf86vm, xf86vidmodeproto # for fglrx_gamma
-, xorg, makeWrapper, glibc, patchelf
-, unzip
-, qt4 # for amdcccle
+{ stdenv, fetchurl, kernel ? null, which
+, xorg, makeWrapper, glibc, patchelf, unzip
+, fontconfig, freetype, mesa # for fgl_glxgears
 , # Whether to build the libraries only (i.e. not the kernel module or
   # driver utils). Used to support 32-bit binaries on 64-bit
   # Linux.
@@ -12,6 +9,15 @@
 
 assert (!libsOnly) -> kernel != null;
 
+with stdenv.lib;
+
+let
+  version = "15.7";
+in
+
+# This derivation requires a maximum of gcc49, Linux kernel 4.1 and xorg.xserver 1.17
+# and will not build or run using versions newer
+
 # If you want to use a different Xorg version probably
 # DIR_DEPENDING_ON_XORG_VERSION in builder.sh has to be adopted (?)
 # make sure libglx.so of ati is used. xorg.xorgserver does provide it as well
@@ -20,23 +26,37 @@ assert (!libsOnly) -> kernel != null;
 # See http://thread.gmane.org/gmane.linux.distributions.nixos/4145 for a
 # workaround (TODO)
 
-# The gentoo ebuild contains much more magic and is usually a great resource to
-# find patches :)
+# The gentoo ebuild contains much more "magic" and is usually a great resource to
+# find patches XD
 
 # http://wiki.cchtml.com/index.php/Main_Page
 
-# There is one issue left:
+# 
 # /usr/lib/dri/fglrx_dri.so must point to /run/opengl-driver/lib/fglrx_dri.so
-
-with stdenv.lib;
+# This is done in the builder script.
 
 stdenv.mkDerivation {
-  name = "ati-drivers-15.7" + (optionalString (!libsOnly) "-${kernel.version}");
+
+  linuxonly =
+    if stdenv.system == "i686-linux" then
+      true
+    else if stdenv.system == "x86_64-linux" then
+      true
+    else throw "ati-drivers are Linux only. Sorry. The build was stopped.";
+
+  name = "ati-drivers-${version}" + (optionalString (!libsOnly) "-${kernel.version}");
 
   builder = ./builder.sh;
-
-  inherit libXxf86vm xf86vidmodeproto;
   gcc = stdenv.cc.cc;
+  libXinerama = xorg.libXinerama;
+  libXrandr = xorg.libXrandr;
+  libXrender = xorg.libXrender;
+  libXxf86vm = xorg.libXxf86vm;
+  xf86vidmodeproto = xorg.xf86vidmodeproto;
+  libSM = xorg.libSM;
+  libICE = xorg.libICE;
+  libfreetype = freetype;
+  libfontconfig = fontconfig;
 
   src = fetchurl {
     url = "http://www2.ati.com/drivers/linux/amd-driver-installer-15.20.1046-x86.x86_64.zip";
@@ -44,16 +64,19 @@ stdenv.mkDerivation {
     curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64";
   };
 
-  patchPhase = "patch -p1 < ${./kernel-api-fixes.patch}";
   patchPhaseSamples = "patch -p2 < ${./patch-samples.patch}";
+  patchPhase1 = "patch -p1 < ${./kernel-api-fixes.patch}";
 
   buildInputs =
-    [ xorg.libXext xorg.libX11 xorg.libXinerama
-      xorg.libXrandr which imake makeWrapper
+    [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM
+      xorg.libXrandr xorg.libXxf86vm xorg.xf86vidmodeproto xorg.imake xorg.libICE
       patchelf
       unzip
       mesa
-      qt4
+      fontconfig
+      freetype
+      makeWrapper
+      which
     ];
 
   inherit libsOnly;
@@ -63,26 +86,37 @@ stdenv.mkDerivation {
   inherit glibc /* glibc only used for setting interpreter */;
 
   LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":"
-    [ "${xorg.libXrandr}/lib"
-      "${xorg.libXrender}/lib"
-      "${xorg.libXext}/lib"
-      "${xorg.libX11}/lib"
-      "${xorg.libXinerama}/lib"
+    [ "${xorg.libXrandr}/lib/"
+      "${xorg.libXrender}/lib/"
+      "${xorg.libXext}/lib/"
+      "${xorg.libX11}/lib/"
+      "${xorg.libXinerama}/lib/"
+      "${xorg.libSM}/lib/"
+      "${xorg.libICE}/lib/"
+      "${stdenv.cc.cc}/lib/"
     ];
 
   # without this some applications like blender don't start, but they start
   # with nvidia. This causes them to be symlinked to $out/lib so that they
   # appear in /run/opengl-driver/lib which get's added to LD_LIBRARY_PATH
-  extraDRIlibs = [ xorg.libXext ];
 
-  inherit mesa qt4; # only required to build examples and amdcccle
+  extraDRIlibs = [ xorg.libXrandr xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM xorg.libICE ];
+
+  inherit mesa; # only required to build the examples
+
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    description = "ATI drivers";
+    description = "ATI Catalyst display drivers";
     homepage = http://support.amd.com/us/gpudownload/Pages/index.aspx;
     license = licenses.unfree;
     maintainers = with maintainers; [ marcweber offline jgeerds ];
     platforms = platforms.linux;
     hydraPlatforms = [];
+    # Copied from the nvidia default.nix to prevent a store collision.
+    priority = 4;
   };
+
+
+
 }

From 34fe26d7c2eb00cf9c6c1ce59aa2e6f0fdbaee0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 20 Jan 2016 21:22:05 +0100
Subject: [PATCH 0186/2285] grsecurity: disable stuff depending on 4.2 kernel

... to avoid evaluation problems (4.2 was unmaintained and removed).
---
 pkgs/top-level/all-packages.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86e73bee8313..4d8221ba7a78 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10146,10 +10146,10 @@ let
   linux_grsec_stable_server_xen = throw "No longer supporteddue to https://grsecurity.net/announce.php. "
     + "Please use linux_grsec_testing_server_xen.";
 
-  # Testing kernels
-  linux_grsec_testing_desktop = grKernel grFlavors.linux_grsec_testing_desktop;
-  linux_grsec_testing_server  = grKernel grFlavors.linux_grsec_testing_server;
-  linux_grsec_testing_server_xen = grKernel grFlavors.linux_grsec_testing_server_xen;
+  # Testing kernels: outdated ATM
+  #linux_grsec_testing_desktop = grKernel grFlavors.linux_grsec_testing_desktop;
+  #linux_grsec_testing_server  = grKernel grFlavors.linux_grsec_testing_server;
+  #linux_grsec_testing_server_xen = grKernel grFlavors.linux_grsec_testing_server_xen;
 
   /* Linux kernel modules are inherently tied to a specific kernel.  So
      rather than provide specific instances of those packages for a
@@ -10294,10 +10294,10 @@ let
   linuxPackages_grsec_stable_server     = grPackage grFlavors.linux_grsec_stable_server;
   linuxPackages_grsec_stable_server_xen = grPackage grFlavors.linux_grsec_stable_server_xen;
 
-  # Testing kernels
-  linuxPackages_grsec_testing_desktop = grPackage grFlavors.linux_grsec_testing_desktop;
-  linuxPackages_grsec_testing_server  = grPackage grFlavors.linux_grsec_testing_server;
-  linuxPackages_grsec_testing_server_xen = grPackage grFlavors.linux_grsec_testing_server_xen;
+  # Testing kernels: outdated ATM
+  #linuxPackages_grsec_testing_desktop = grPackage grFlavors.linux_grsec_testing_desktop;
+  #linuxPackages_grsec_testing_server  = grPackage grFlavors.linux_grsec_testing_server;
+  #linuxPackages_grsec_testing_server_xen = grPackage grFlavors.linux_grsec_testing_server_xen;
 
   # A function to build a manually-configured kernel
   linuxManualConfig = pkgs.buildLinux;

From 6271300819b7414ca5a07050a27e0e328b46f2f7 Mon Sep 17 00:00:00 2001
From: Bojan Nikolic <bojan@bnikolic.co.uk>
Date: Sun, 3 Jan 2016 19:32:06 +0000
Subject: [PATCH 0187/2285] wcslib: init at 5.12

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

diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix
new file mode 100644
index 000000000000..ba2d1ab11fc0
--- /dev/null
+++ b/pkgs/development/libraries/wcslib/default.nix
@@ -0,0 +1,25 @@
+{ fetchurl,  stdenv, flex }:
+
+stdenv.mkDerivation rec {
+  version = "5.12";
+  name = "wcslib-${version}";
+
+  buildInputs = [ flex ];
+
+  src = fetchurl {
+    url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2";
+    sha256 ="1r4dz5514pba2d5cc2ydpnqm85xsvy65hlvzdqayl6sl40liizsh";
+  };
+
+  meta = {
+    description = "World Coordinate System Library for Astronomy";
+    homepage = http://www.atnf.csiro.au/people/mcalabre/WCS/;
+
+    longDescription = ''Library for world coordinate systems for
+    spherical geometries and their conversion to image coordinate
+    systems. This is the standard library for this purpose in
+    astronomy.'';
+
+    license = stdenv.lib.licenses.lgpl3Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d8221ba7a78..8f3483b85e72 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8686,6 +8686,8 @@ let
 
   webkit = webkitgtk;
 
+  wcslib = callPackage ../development/libraries/wcslib { };
+
   webkitgtk = callPackage ../development/libraries/webkitgtk {
     harfbuzz = harfbuzz-icu;
     gst-plugins-base = gst_all_1.gst-plugins-base;

From 313faf07ba17e275c0b534e54b3c2ebd267b85da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 20 Jan 2016 22:28:50 +0100
Subject: [PATCH 0188/2285] brotli: init at 0.3.0

---
 pkgs/tools/compression/brotli/default.nix | 47 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/tools/compression/brotli/default.nix

diff --git a/pkgs/tools/compression/brotli/default.nix b/pkgs/tools/compression/brotli/default.nix
new file mode 100644
index 000000000000..eac4af0ec5f0
--- /dev/null
+++ b/pkgs/tools/compression/brotli/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub }:
+
+# ?TODO: there's also python lib in there
+
+stdenv.mkDerivation rec {
+  name = "brotli-${version}";
+  version = "0.3.0";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "brotli";
+    rev = "v" + version;
+    sha256 = "1ijwr8fbrajp4gh8x6lrrpf8gymm0i6w06s97rv294q5dcszn299";
+  };
+
+  preConfigure = "cd tools";
+
+  # Debian installs "brotli" instead of "bro" but let's keep upstream choice for now.
+  installPhase = ''
+    mkdir -p "$out/bin"
+    mv ./bro "$out/bin/"
+  '';
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+
+    description = "A generic-purpose lossless compression algorithm and tool";
+
+    longDescription =
+      ''  Brotli is a generic-purpose lossless compression algorithm that
+          compresses data using a combination of a modern variant of the LZ77
+          algorithm, Huffman coding and 2nd order context modeling, with a
+          compression ratio comparable to the best currently available
+          general-purpose compression methods. It is similar in speed with
+          deflate but offers more dense compression.
+
+          The specification of the Brotli Compressed Data Format is defined
+          in the following internet draft:
+          http://www.ietf.org/id/draft-alakuijala-brotli
+      '';
+
+    license = licenses.mit;
+    maintainers = [ maintainers.vcunat ];
+    platforms = platforms.all;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d8221ba7a78..993f8d8be12b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1142,6 +1142,8 @@ let
 
   ibus-table-others = callPackage ../tools/inputmethods/ibus-table-others { };
 
+  brotli = callPackage ../tools/compression/brotli { };
+
   biosdevname = callPackage ../tools/networking/biosdevname { };
 
   checkbashism = callPackage ../development/tools/misc/checkbashisms { };

From 9ecc06dca5128d7d52d94096c6f780ff4c56bc2c Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Wed, 20 Jan 2016 23:56:02 +0100
Subject: [PATCH 0189/2285] lpod-python: 1.1.5 -> 1.1.7

---
 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 94d19e7b028d..d4b13492f52b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5932,7 +5932,7 @@ in modules // {
   };
 
   lpod = buildPythonPackage rec {
-    version = "1.1.5";
+    version = "1.1.7";
     name = "python-lpod-${version}";
     # lpod library currently does not support Python 3.x
     disabled = isPy3k;
@@ -5942,8 +5942,8 @@ in modules // {
     src = pkgs.fetchFromGitHub {
       owner = "lpod";
       repo = "lpod-python";
-      rev = "v${version}";
-      sha256 = "1g909li511jkpcl26j1dzg8gn1ipkc374sh8vv54dx30sl0xfqxf";
+      rev = "dee32120ee582ff337b0c52a95a9a87cca71fd67";
+      sha256 = "1mikvzp27wxkzpr2lii4wg1hhx8h610agckqynvsrdc8v3nw9ciw";
     };
 
     meta = {

From 39a07cabe870fb64e972981d961a5a4b9ddbdaca Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 21 Jan 2016 01:26:17 +0100
Subject: [PATCH 0190/2285] gpgme: Use fixed path for GnuPG binaries

By default, GPGME tries to search in $PATH for the gpg and gpgconf
binaries. This has the downside, that the library won't work by its own
and needs to have GnuPG in systemPackages or the user environment.

I've stumbled on this while working on one of the dependencies of
nixos-assimilate and nixpart (volume_key), where the testing environment
didn't come with GnuPG in $PATH and thus the tests have failed.

After testing this with a few programs using GPGME, I haven't found any
weird behavior in conjunction with the GnuPG agent.

However one possible implication could be that if the GnuPG used in
$PATH (and the config files in the user's home directory) should be
vastly incompatible, it could lead to failures.

In practice however, the GnuPG1/2 versions pretty much seem to stay
compatible within their major releases so it shouldn't pose a problem.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/gpgme/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix
index 1657ceaeece6..4572387e2252 100644
--- a/pkgs/development/libraries/gpgme/default.nix
+++ b/pkgs/development/libraries/gpgme/default.nix
@@ -5,10 +5,8 @@ assert useGnupg1 -> gnupg1 != null;
 assert !useGnupg1 -> gnupg != null;
 
 let
-  gpgPath = if useGnupg1 then
-    "${gnupg1}/bin/gpg"
-  else
-    "${gnupg}/bin/gpg2";
+  gpgStorePath = if useGnupg1 then gnupg1 else gnupg;
+  gpgProgram = if useGnupg1 then "gpg" else "gpg2";
 in
 stdenv.mkDerivation rec {
   name = "gpgme-1.6.0";
@@ -22,7 +20,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig gnupg ];
 
-  configureFlags = "--with-gpg=${gpgPath}";
+  configureFlags = [
+    "--with-gpg=${gpgStorePath}/bin/${gpgProgram}"
+    "--enable-fixed-path=${gpgStorePath}/bin"
+  ];
 
   meta = {
     homepage = "http://www.gnupg.org/related_software/gpgme";

From 67c487f243fd6ae6b734507a186104764b632211 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 21 Jan 2016 01:40:55 +0100
Subject: [PATCH 0191/2285] pythonPackages.sphinx: 1.3.1 -> 1.3.4

Mainly bugfixes. Far too many to summarise here:
http://www.sphinx-doc.org/en/stable/changes.html#release-1-3-4-released-jan-12-2016
---
 .../python-modules/sphinx-1.3.1-pr-1946.patch | 35 -------------------
 pkgs/top-level/python-packages.nix            |  5 ++-
 2 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/development/python-modules/sphinx-1.3.1-pr-1946.patch

diff --git a/pkgs/development/python-modules/sphinx-1.3.1-pr-1946.patch b/pkgs/development/python-modules/sphinx-1.3.1-pr-1946.patch
deleted file mode 100644
index 2933040141aa..000000000000
--- a/pkgs/development/python-modules/sphinx-1.3.1-pr-1946.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 7ce3b991229c74262f81ab7692a1dc6bde2416ee Mon Sep 17 00:00:00 2001
-From: Barry Warsaw <barry@python.org>
-Date: Thu, 25 Jun 2015 11:54:05 -0400
-Subject: [PATCH] One way to work around the lack of
- html.parser.HTMLParserError in Python 3.5
-
----
- sphinx/builders/linkcheck.py | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/sphinx/builders/linkcheck.py b/sphinx/builders/linkcheck.py
-index 9f5c213..b05c5b2 100644
---- a/sphinx/builders/linkcheck.py
-+++ b/sphinx/builders/linkcheck.py
-@@ -19,9 +19,19 @@
- from six.moves.urllib.request import build_opener, Request, HTTPRedirectHandler
- from six.moves.urllib.parse import unquote, urlsplit, quote
- from six.moves.urllib.error import HTTPError
--from six.moves.html_parser import HTMLParser, HTMLParseError
-+from six.moves.html_parser import HTMLParser
- from docutils import nodes
- 
-+# 2015-06-25 barry@python.org.  This exception was deprecated in Python 3.3 and
-+# removed in Python 3.5, however for backward compatibility reasons, we're not
-+# going to just remove it.  If it doesn't exist, define an exception that will
-+# never be caught but leaves the code in check_anchor() intact.
-+try:
-+    from six.moves.html_parser import HTMLParseError
-+except ImportError:
-+    class HTMLParseError(Exception):
-+        pass
-+
- from sphinx.builders import Builder
- from sphinx.util.console import purple, red, darkgreen, darkgray, \
-     darkred, turquoise
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 94d19e7b028d..fc041acd47dd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18903,14 +18903,13 @@ in modules // {
 
 
   sphinx = buildPythonPackage (rec {
-    name = "Sphinx-1.3.1";
+    name = "Sphinx-1.3.4";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/S/Sphinx/${name}.tar.gz";
-      sha256 = "052i5c7cgvs5iv011dkq3r8d6jycg2gjjg3907ijsbdlq8q52vhs";
+      sha256 = "0mw06q7bzzjylgwh0wnnaxmwc95hx8w95as4vcgpan579brw7b4a";
     };
 
-    patches = [ ../development/python-modules/sphinx-1.3.1-pr-1946.patch ];
     LC_ALL = "en_US.UTF-8";
     checkPhase = ''
       PYTHON=${python.executable} make test

From 9f6ca0fe15a1f01ad2960648fc1e9d2d5a5cdb9e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 21 Jan 2016 01:46:51 +0100
Subject: [PATCH 0192/2285] pythonPackages.sphinx: fix tests with Pygments 2.1

Close #12511.
---
 .../sphinx-fix-tests-with-pygments-2.1.patch  | 63 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  1 +
 2 files changed, 64 insertions(+)
 create mode 100644 pkgs/development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch

diff --git a/pkgs/development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch b/pkgs/development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch
new file mode 100644
index 000000000000..5aa4af873cd5
--- /dev/null
+++ b/pkgs/development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch
@@ -0,0 +1,63 @@
+From 5574aba60ed76f2bae947722122ac4d71ab8ed5a Mon Sep 17 00:00:00 2001
+From: Takeshi KOMIYA <i.tkomiya@gmail.com>
+Date: Mon, 18 Jan 2016 12:38:02 +0900
+Subject: [PATCH] Fix tests are broken with pygments-2.1
+
+---
+ tests/test_build_html.py |  2 +-
+ tests/test_intl.py       | 10 ++++++----
+ 2 files changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/tests/test_build_html.py b/tests/test_build_html.py
+index e330761..17ea089 100644
+--- a/tests/test_build_html.py
++++ b/tests/test_build_html.py
+@@ -82,7 +82,7 @@ def checker(nodes):
+         (".//a[@href='_downloads/img1.png']", ''),
+         (".//pre", u'"quotes"'),
+         (".//pre", u"'included'"),
+-        (".//pre/span[@class='s']", u'üöä'),
++        (".//pre/span[@class='s2']", u'üöä'),
+         (".//div[@class='inc-pyobj1 highlight-text']//pre",
+             r'^class Foo:\n    pass\n\s*$'),
+         (".//div[@class='inc-pyobj2 highlight-text']//pre",
+diff --git a/tests/test_intl.py b/tests/test_intl.py
+index 4c665d4..b24ec65 100644
+--- a/tests/test_intl.py
++++ b/tests/test_intl.py
+@@ -694,14 +694,15 @@ def test_additional_targets_should_not_be_translated(app, status, warning):
+     yield assert_count(expected_expr, result, 1)
+ 
+     # C code block with lang should not be translated but be *C* highlighted
+-    expected_expr = """<span class="cp">#include &lt;stdio.h&gt;</span>"""
++    expected_expr = ("""<span class="cp">#include</span> """
++                     """<span class="cpf">&lt;stdio.h&gt;</span>""")
+     yield assert_count(expected_expr, result, 1)
+ 
+     # doctest block should not be translated but be highlighted
+     expected_expr = (
+         """<span class="gp">&gt;&gt;&gt; </span>"""
+         """<span class="kn">import</span> <span class="nn">sys</span>  """
+-        """<span class="c"># sys importing</span>""")
++        """<span class="c1"># sys importing</span>""")
+     yield assert_count(expected_expr, result, 1)
+ 
+     ## raw.txt
+@@ -754,14 +755,15 @@ def test_additional_targets_should_be_translated(app, status, warning):
+     yield assert_count(expected_expr, result, 1)
+ 
+     # C code block with lang should be translated and be *C* highlighted
+-    expected_expr = """<span class="cp">#include &lt;STDIO.H&gt;</span>"""
++    expected_expr = ("""<span class="cp">#include</span> """
++                     """<span class="cpf">&lt;STDIO.H&gt;</span>""")
+     yield assert_count(expected_expr, result, 1)
+ 
+     # doctest block should not be translated but be highlighted
+     expected_expr = (
+         """<span class="gp">&gt;&gt;&gt; </span>"""
+         """<span class="kn">import</span> <span class="nn">sys</span>  """
+-        """<span class="c"># SYS IMPORTING</span>""")
++        """<span class="c1"># SYS IMPORTING</span>""")
+     yield assert_count(expected_expr, result, 1)
+ 
+     ## raw.txt
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fc041acd47dd..5739de28ddf2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18910,6 +18910,7 @@ in modules // {
       sha256 = "0mw06q7bzzjylgwh0wnnaxmwc95hx8w95as4vcgpan579brw7b4a";
     };
 
+    patches = [ ../development/python-modules/sphinx-fix-tests-with-pygments-2.1.patch ];
     LC_ALL = "en_US.UTF-8";
     checkPhase = ''
       PYTHON=${python.executable} make test

From d561179789d19676887f7dec6984b3d0a13cd941 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 21 Jan 2016 04:02:43 +0100
Subject: [PATCH 0193/2285] pythonPackages.sphinx_1_2: disable checks

They would require keeping a pygments_2_0_2 branch around, just for
this outdated package. Doesn't seem worth it.
---
 pkgs/top-level/python-packages.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5739de28ddf2..a4cfb988259a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18938,6 +18938,8 @@ in modules // {
     };
     patches = [];
     disabled = isPy35;
+    # Tests requires Pygments >=2.0.2 which isn't worth keeping around for this:
+    doCheck = false;
   };
 
   sphinx_rtd_theme = buildPythonPackage (rec {

From fb30e5fccd6d253db5db1cc686b51e0ea0b8b428 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Thu, 21 Jan 2016 07:20:39 +0000
Subject: [PATCH 0194/2285] weechat: 1.3 -> 1.4

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

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index 82c1504ebd9b..a781a8ceb353 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -4,12 +4,12 @@
 , extraBuildInputs ? [] }:
 
 stdenv.mkDerivation rec {
-  version = "1.3";
+  version = "1.4";
   name = "weechat-${version}";
 
   src = fetchurl {
     url = "http://weechat.org/files/src/weechat-${version}.tar.bz2";
-    sha256 = "0j2ic1c69ksf78wi0cmc4yi5348x6c92g6annsx928sayxqxfgbh";
+    sha256 = "1m6xq6izcac5186xvvmm8znfjzrg9hq42p69jabdvv7cri4rjvg0";
   };
 
   cmakeFlags = stdenv.lib.optional stdenv.isDarwin

From 4948bdadd67a927864092b9f3c67399bffad19cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Thu, 21 Jan 2016 10:01:42 +0100
Subject: [PATCH 0195/2285] nixos: ihaskell, wrong type restriction redacted

---
 nixos/modules/services/misc/ihaskell.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix
index 1927922909ee..13c41466eab2 100644
--- a/nixos/modules/services/misc/ihaskell.nix
+++ b/nixos/modules/services/misc/ihaskell.nix
@@ -22,7 +22,6 @@ in
       };
 
       haskellPackages = mkOption {
-        type = types.attrsOf types.package;
         default = pkgs.haskellPackages;
         defaultText = "pkgs.haskellPackages";
         example = literalExample "pkgs.haskell.packages.ghc784";

From 3eb35b290d910ce041f66090e89666d5a4d81c20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Thu, 21 Jan 2016 10:06:52 +0100
Subject: [PATCH 0196/2285] idea.idea-{community,ultimate}: 15.0.2 -> 15.0.3

---
 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 429594440009..1f1dee8d197a 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -190,25 +190,25 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "15.0.2";
-    build = "IC-143.1184";
+    version = "15.0.3";
+    build = "IC-143.1821";
     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 = "0y8rrbsb87avn1dhw5r1xb4axpbm1qvgcd0aysir9bqzhx8qg64c";
+      sha256 = "15hj4kqlpg3b4xp2v4f4iidascrc8s97mq8022nvbcs879gpajqa";
     };
   };
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "15.0.2";
-    build = "IU-143.1184";
+    version = "15.0.3";
+    build = "IU-143.1821";
     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 = "1r8gw7mv1b0k223k76ib08f4yrrgrw24qmhkbx88rknmls5nsgss";
+      sha256 = "02v8v2a7p620l4mlk7jqw9sl2455a1nya1dy84y23h9vq20aihlh";
     };
   };
 

From a265c8a05db8175e81904092a52237e40caa3335 Mon Sep 17 00:00:00 2001
From: Tobias Pflug <tobias.pflug@holidaycheck.com>
Date: Wed, 20 Jan 2016 20:14:42 +0100
Subject: [PATCH 0197/2285] nodejs: 5.1.1 -> 5.4.1

---
 pkgs/development/web/nodejs/v5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix
index 403abef23dfa..8068e0163cee 100644
--- a/pkgs/development/web/nodejs/v5.nix
+++ b/pkgs/development/web/nodejs/v5.nix
@@ -7,7 +7,7 @@
 assert stdenv.system != "armv5tel-linux";
 
 let
-  version = "5.1.1";
+  version = "5.4.1";
 
   deps = {
     inherit openssl zlib libuv;
@@ -31,7 +31,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "1hr2zjwrah8yrih1jsm3v8b449d7xla1rykmyd8yrd80z0jf0yd7";
+    sha256 = "032ylpjrnjpc4cjqkrax3slli40025kw74yk2dynp86ywgr5wibq";
   };
 
   configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];

From 15ea50733d781faa5035436dc356ddb62d52a840 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 21 Jan 2016 12:41:59 +0300
Subject: [PATCH 0198/2285] nixos changelog: mention ejabberd fixes

---
 nixos/doc/manual/release-notes/rl-unstable.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index cd828dfc8887..3c0a4990a815 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -158,6 +158,11 @@ nginx.override {
     <command>nix-shell</command> (without installing anything). </para>
   </listitem>
 
+  <listitem>
+    <para><literal>ejabberd</literal> module is brought back and now works on
+    NixOS.</para>
+  </listitem>
+
 </itemizedlist></para>
 
 </section>

From 9fe72b34edc978c3a034419439f7ac0e110e175d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 21 Jan 2016 12:47:16 +0300
Subject: [PATCH 0199/2285] nixos changelog: mention postfix changes

---
 nixos/doc/manual/release-notes/rl-unstable.xml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 3c0a4990a815..6099b5218714 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -145,6 +145,15 @@ nginx.override {
     from the ELPA, MELPA, and MELPA Stable repositories.
     </para>
   </listitem>
+
+  <listitem>
+    <para>Data directory for Postfix MTA server is moved from
+    <filename>/var/postfix</filename> to <filename>/var/lib/postfix</filename>.
+    Old configurations are migrated automatically. <literal>service.postfix</literal>
+    module has also received many improvements, such as correct directories' access
+    rights, new <literal>aliasFiles</literal> and <literal>mapFiles</literal>
+    options and more.</para>
+  </listitem>
 </itemizedlist>
 
 

From 2e5b76ecc64a01c07cc7a9a8425f8f5fffbc752a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 6 Jan 2016 00:18:03 +0300
Subject: [PATCH 0200/2285] dovecot22: 2.2.19 -> 2.2.21

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

diff --git a/pkgs/servers/mail/dovecot/2.2.x.nix b/pkgs/servers/mail/dovecot/2.2.x.nix
index 2d38f3f5cef3..ac0df550080b 100644
--- a/pkgs/servers/mail/dovecot/2.2.x.nix
+++ b/pkgs/servers/mail/dovecot/2.2.x.nix
@@ -2,14 +2,14 @@
 , inotify-tools, clucene_core_2, sqlite }:
 
 stdenv.mkDerivation rec {
-  name = "dovecot-2.2.19";
+  name = "dovecot-2.2.21";
 
   buildInputs = [ perl openssl bzip2 zlib openldap clucene_core_2 sqlite ]
     ++ stdenv.lib.optionals (stdenv.isLinux) [ systemd pam inotify-tools ];
 
   src = fetchurl {
     url = "http://dovecot.org/releases/2.2/${name}.tar.gz";
-    sha256 = "17sf5aancad4pg1vx1606k99389wg76blpqzmnmxlz4hklzix7km";
+    sha256 = "080bil83gr2dski4gk2bxykg2g497kqm2hn2z4xkbw71b6g17dvs";
   };
 
   preConfigure = ''

From 97e3c42523083b9217b42f54c888c6895ca1ea5b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 9 Jan 2016 16:37:28 +0300
Subject: [PATCH 0201/2285] dovecot22: move modules dir to /etc

---
 .../mail/dovecot/2.2.x-module_dir.patch       | 20 +++++++++----------
 pkgs/servers/mail/dovecot/2.2.x.nix           |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
index 3ba11d41b1bd..a6edc8d83ee9 100644
--- a/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
+++ b/pkgs/servers/mail/dovecot/2.2.x-module_dir.patch
@@ -6,7 +6,7 @@ diff -ur dovecot-2.2.12-orig/src/auth/main.c dovecot-2.2.12/src/auth/main.c
  	mod_set.filter_callback = auth_module_filter;
  
 -	modules = module_dir_load(AUTH_MODULE_DIR, NULL, &mod_set);
-+	modules = module_dir_load("/var/lib/dovecot/modules/auth", NULL, &mod_set);
++	modules = module_dir_load("/etc/dovecot/modules/auth", NULL, &mod_set);
  	module_dir_init(modules);
  
  	if (!worker)
@@ -15,7 +15,7 @@ diff -ur dovecot-2.2.12-orig/src/auth/main.c dovecot-2.2.12/src/auth/main.c
  	mod_set.ignore_missing = TRUE;
  
 -	modules = module_dir_load_missing(modules, AUTH_MODULE_DIR, names,
-+	modules = module_dir_load_missing(modules, "/var/lib/dovecot/modules/auth", names,
++	modules = module_dir_load_missing(modules, "/etc/dovecot/modules/auth", names,
  					  &mod_set);
  	module_dir_init(modules);
  }
@@ -27,7 +27,7 @@ diff -ur dovecot-2.2.12-orig/src/config/all-settings.c dovecot-2.2.12/src/config
  
  	.mail_plugins = "",
 -	.mail_plugin_dir = MODULEDIR,
-+	.mail_plugin_dir = "/var/lib/dovecot/modules",
++	.mail_plugin_dir = "/etc/dovecot/modules",
  
  	.mail_log_prefix = "%s(%u): ",
  
@@ -36,7 +36,7 @@ diff -ur dovecot-2.2.12-orig/src/config/all-settings.c dovecot-2.2.12/src/config
  	.libexec_dir = PKG_LIBEXECDIR,
  	.mail_plugins = "",
 -	.mail_plugin_dir = MODULEDIR,
-+	.mail_plugin_dir = "/var/lib/dovecot/modules",
++	.mail_plugin_dir = "/etc/dovecot/modules",
  	.auth_socket_path = "auth-userdb",
  	.doveadm_socket_path = "doveadm-server",
  	.doveadm_worker_count = 0,
@@ -49,7 +49,7 @@ diff -ur dovecot-2.2.12-orig/src/config/config-parser.c dovecot-2.2.12/src/confi
  	memset(&mod_set, 0, sizeof(mod_set));
  	mod_set.abi_version = DOVECOT_ABI_VERSION;
 -	modules = module_dir_load(CONFIG_MODULE_DIR, NULL, &mod_set);
-+	modules = module_dir_load("/var/lib/dovecot/modules/settings", NULL, &mod_set);
++	modules = module_dir_load("/etc/dovecot/modules/settings", NULL, &mod_set);
  	module_dir_init(modules);
  
  	i_array_init(&new_roots, 64);
@@ -61,7 +61,7 @@ diff -ur dovecot-2.2.12-orig/src/dict/main.c dovecot-2.2.12/src/dict/main.c
  	mod_set.require_init_funcs = TRUE;
  
 -	modules = module_dir_load(DICT_MODULE_DIR, NULL, &mod_set);
-+	modules = module_dir_load("/var/lib/dovecot/modules/dict", NULL, &mod_set);
++	modules = module_dir_load("/etc/dovecot/modules/dict", NULL, &mod_set);
  	module_dir_init(modules);
  
  	/* Register only after loading modules. They may contain SQL drivers,
@@ -73,7 +73,7 @@ diff -ur dovecot-2.2.12-orig/src/doveadm/doveadm-settings.c dovecot-2.2.12/src/d
  	.libexec_dir = PKG_LIBEXECDIR,
  	.mail_plugins = "",
 -	.mail_plugin_dir = MODULEDIR,
-+	.mail_plugin_dir = "/var/lib/dovecot/modules",
++	.mail_plugin_dir = "/etc/dovecot/modules",
  	.auth_socket_path = "auth-userdb",
  	.doveadm_socket_path = "doveadm-server",
  	.doveadm_worker_count = 0,
@@ -86,7 +86,7 @@ diff -ur dovecot-2.2.12-orig/src/lib-fs/fs-api.c dovecot-2.2.12/src/lib-fs/fs-ap
  	mod_set.ignore_missing = TRUE;
  
 -	fs_modules = module_dir_load_missing(fs_modules, MODULE_DIR,
-+	fs_modules = module_dir_load_missing(fs_modules, "/var/lib/dovecot/modules",
++	fs_modules = module_dir_load_missing(fs_modules, "/etc/dovecot/modules",
  					     module_name, &mod_set);
  	module_dir_init(fs_modules);
  
@@ -99,7 +99,7 @@ diff -ur dovecot-2.2.12-orig/src/lib-ssl-iostream/iostream-ssl.c dovecot-2.2.12/
  	mod_set.abi_version = DOVECOT_ABI_VERSION;
  	mod_set.setting_name = "<built-in lib-ssl-iostream lookup>";
 -	ssl_module = module_dir_load(MODULE_DIR, plugin_name, &mod_set);
-+	ssl_module = module_dir_load("/var/lib/dovecot/modules", plugin_name, &mod_set);
++	ssl_module = module_dir_load("/etc/dovecot/modules", plugin_name, &mod_set);
  
  	ssl_vfuncs = module_get_symbol(ssl_module, "ssl_vfuncs");
  	if (ssl_vfuncs == NULL) {
@@ -112,7 +112,7 @@ diff -ur dovecot-2.2.12-orig/src/lib-storage/mail-storage-settings.c dovecot-2.2
  
  	.mail_plugins = "",
 -	.mail_plugin_dir = MODULEDIR,
-+	.mail_plugin_dir = "/var/lib/dovecot/modules",
++	.mail_plugin_dir = "/etc/dovecot/modules",
  
  	.mail_log_prefix = "%s(%u): ",
  
diff --git a/pkgs/servers/mail/dovecot/2.2.x.nix b/pkgs/servers/mail/dovecot/2.2.x.nix
index ac0df550080b..4488e8c86b1f 100644
--- a/pkgs/servers/mail/dovecot/2.2.x.nix
+++ b/pkgs/servers/mail/dovecot/2.2.x.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   '';
 
   patches = [
-    # Make dovecot look for plugins in /var/lib/dovecot/modules
+    # Make dovecot look for plugins in /etc/dovecot/modules
     # so we can symlink plugins from several packages there
     # The symlinking needs to be done in NixOS, as part of the
     # dovecot service start-up

From cc0e255ab975b50adb895d8d9bec5a9a66665e4a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 9 Jan 2016 19:25:05 +0300
Subject: [PATCH 0202/2285] dovecot22: add options for building auth modules

---
 pkgs/servers/mail/dovecot/2.2.x.nix | 40 ++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/pkgs/servers/mail/dovecot/2.2.x.nix b/pkgs/servers/mail/dovecot/2.2.x.nix
index 4488e8c86b1f..2237a09a6a68 100644
--- a/pkgs/servers/mail/dovecot/2.2.x.nix
+++ b/pkgs/servers/mail/dovecot/2.2.x.nix
@@ -1,11 +1,21 @@
-{ stdenv, fetchurl, perl, systemd, openssl, pam, bzip2, zlib, openldap
-, inotify-tools, clucene_core_2, sqlite }:
+{ stdenv, lib, fetchurl, perl, pkgconfig, systemd, openssl
+, bzip2, zlib, inotify-tools, pam, libcap
+, clucene_core_2, icu, openldap
+# Auth modules
+, withMySQL ? false, libmysql
+, withPgSQL ? false, postgresql
+, withSQLite ? true, sqlite
+}:
 
 stdenv.mkDerivation rec {
   name = "dovecot-2.2.21";
 
-  buildInputs = [ perl openssl bzip2 zlib openldap clucene_core_2 sqlite ]
-    ++ stdenv.lib.optionals (stdenv.isLinux) [ systemd pam inotify-tools ];
+  nativeBuildInputs = [ perl pkgconfig ];
+  buildInputs = [ openssl bzip2 zlib clucene_core_2 icu openldap ]
+    ++ lib.optionals (stdenv.isLinux) [ systemd pam libcap inotify-tools ]
+    ++ lib.optional withMySQL libmysql
+    ++ lib.optional withPgSQL postgresql
+    ++ lib.optional withSQLite sqlite;
 
   src = fetchurl {
     url = "http://dovecot.org/releases/2.2/${name}.tar.gz";
@@ -13,11 +23,10 @@ stdenv.mkDerivation rec {
   };
 
   preConfigure = ''
-    substituteInPlace src/config/settings-get.pl --replace \
-      "/usr/bin/env perl" "${perl}/bin/perl"
+    patchShebangs src/config/settings-get.pl
   '';
 
-  postInstall = stdenv.lib.optionalString stdenv.isDarwin ''
+  postInstall = lib.optionalString stdenv.isDarwin ''
     install_name_tool -change libclucene-shared.1.dylib \
         ${clucene_core_2}/lib/libclucene-shared.1.dylib \
         $out/lib/dovecot/lib21_fts_lucene_plugin.so
@@ -28,9 +37,8 @@ stdenv.mkDerivation rec {
 
   patches = [
     # Make dovecot look for plugins in /etc/dovecot/modules
-    # so we can symlink plugins from several packages there
-    # The symlinking needs to be done in NixOS, as part of the
-    # dovecot service start-up
+    # so we can symlink plugins from several packages there.
+    # The symlinking needs to be done in NixOS.
     ./2.2.x-module_dir.patch
   ];
 
@@ -39,14 +47,16 @@ stdenv.mkDerivation rec {
     # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626211
     "--localstatedir=/var"
     "--with-ldap"
-    "--with-lucene"
     "--with-ssl=openssl"
-    "--with-sqlite"
     "--with-zlib"
     "--with-bzlib"
-  ] ++ stdenv.lib.optionals (stdenv.isLinux) [
-    "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
-  ];
+    "--with-ldap"
+    "--with-lucene"
+    "--with-icu"
+  ] ++ lib.optional (stdenv.isLinux) "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
+    ++ lib.optional withMySQL "--with-mysql"
+    ++ lib.optional withPgSQL "--with-pgsql"
+    ++ lib.optional withSQLite "--with-sqlite";
 
   meta = {
     homepage = "http://dovecot.org/";

From 57234b97df21accb693e0ac1049772b776c8d454 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 9 Jan 2016 19:25:48 +0300
Subject: [PATCH 0203/2285] dovecot22: specify sysconfdir to use system-wide
 config

---
 pkgs/servers/mail/dovecot/2.2.x.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/mail/dovecot/2.2.x.nix b/pkgs/servers/mail/dovecot/2.2.x.nix
index 2237a09a6a68..ec4c5c935af0 100644
--- a/pkgs/servers/mail/dovecot/2.2.x.nix
+++ b/pkgs/servers/mail/dovecot/2.2.x.nix
@@ -26,7 +26,13 @@ stdenv.mkDerivation rec {
     patchShebangs src/config/settings-get.pl
   '';
 
-  postInstall = lib.optionalString stdenv.isDarwin ''
+  # We need this for sysconfdir, see remark below.
+  installFlags = [ "DESTDIR=$(out)" ];
+
+  postInstall = ''
+    cp -r $out/$out/* $out
+    rm -rf $out/$(echo "$out" | cut -d "/" -f2)
+  '' + lib.optionalString stdenv.isDarwin ''
     install_name_tool -change libclucene-shared.1.dylib \
         ${clucene_core_2}/lib/libclucene-shared.1.dylib \
         $out/lib/dovecot/lib21_fts_lucene_plugin.so
@@ -46,6 +52,8 @@ stdenv.mkDerivation rec {
     # It will hardcode this for /var/lib/dovecot.
     # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626211
     "--localstatedir=/var"
+    # We need this so utilities default to reading /etc/dovecot/dovecot.conf file.
+    "--sysconfdir=/etc"
     "--with-ldap"
     "--with-ssl=openssl"
     "--with-zlib"

From cf1883f10671d556613c24346baf3f05b5c2fec5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 9 Jan 2016 16:39:55 +0300
Subject: [PATCH 0204/2285] dovecot: default to 2.2

---
 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 993f8d8be12b..f686ce754324 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9228,7 +9228,7 @@ let
 
   dnschain = callPackage ../servers/dnschain { };
 
-  dovecot = dovecot21;
+  dovecot = dovecot22;
 
   dovecot21 = callPackage ../servers/mail/dovecot { };
 

From c956bc774b77d9e60ed50e6d28329f71afe5bc7b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 3 Jan 2016 05:55:19 +0300
Subject: [PATCH 0205/2285] dovecot_pigeonhole: 0.4.3 -> 0.4.10

---
 .../plugins/pigeonhole}/default.nix           | 23 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  4 +++-
 2 files changed, 16 insertions(+), 11 deletions(-)
 rename pkgs/servers/mail/{dovecot-pigeonhole => dovecot/plugins/pigeonhole}/default.nix (73%)

diff --git a/pkgs/servers/mail/dovecot-pigeonhole/default.nix b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
similarity index 73%
rename from pkgs/servers/mail/dovecot-pigeonhole/default.nix
rename to pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
index 3ee73520d7ad..385cf7d35ba8 100644
--- a/pkgs/servers/mail/dovecot-pigeonhole/default.nix
+++ b/pkgs/servers/mail/dovecot/plugins/pigeonhole/default.nix
@@ -1,15 +1,15 @@
-{stdenv, fetchurl, dovecot22, openssl}:
+{ stdenv, fetchurl, dovecot, openssl }:
 
 stdenv.mkDerivation rec {
   name = "dovecot-pigeonhole-${version}";
-  version = "0.4.3";
+  version = "0.4.10";
 
   src = fetchurl {
     url = "http://pigeonhole.dovecot.org/releases/2.2/dovecot-2.2-pigeonhole-${version}.tar.gz";
-    sha256 = "0mypnkc980s3kd1bmy4f93dliwg6n8jfsac8r51jrpvv0ymz94nn";
-  };  
+    sha256 = "0vvjj1yjr189rn8f41z5rj8gfvk24a8j33q6spb6bd6k1wbfgpz9";
+  };
 
-  buildInputs = [ dovecot22 openssl ];
+  buildInputs = [ dovecot openssl ];
 
   preConfigure = ''
     substituteInPlace src/managesieve/managesieve-settings.c --replace \
@@ -18,18 +18,21 @@ stdenv.mkDerivation rec {
     substituteInPlace src/managesieve-login/managesieve-login-settings.c --replace \
       ".executable = \"managesieve-login\"" \
       ".executable = \"$out/libexec/dovecot/managesieve-login\""
-  ''; 
+  '';
 
-  configureFlags = [ 
-    "--with-dovecot=${dovecot22}/lib/dovecot"
+  configureFlags = [
+    "--with-dovecot=${dovecot}/lib/dovecot"
     "--without-dovecot-install-dirs"
     "--with-moduledir=$(out)/lib/dovecot"
-  ];  
+  ];
+
+  enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
     homepage = http://pigeonhole.dovecot.org/;
     description = "A sieve plugin for the Dovecot IMAP server";
     license = licenses.lgpl21;
     maintainers = [ maintainers.rickynils ];
-  };  
+    platforms = platforms.linux;
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f686ce754324..a4abd6a54a28 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9234,7 +9234,9 @@ let
 
   dovecot22 = callPackage ../servers/mail/dovecot/2.2.x.nix { };
 
-  dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { };
+  dovecot_pigeonhole = callPackage ../servers/mail/dovecot/plugins/pigeonhole {
+    dovecot = dovecot22;
+  };
 
   dspam = callPackage ../servers/mail/dspam {
     inherit (perlPackages) NetSMTP;

From ec15cea84f185846702ed366ac82e2f068eb74ea Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 6 Jan 2016 00:19:42 +0300
Subject: [PATCH 0206/2285] dovecot_antispam: init at 20130429

---
 .../mail/dovecot/plugins/antispam/default.nix | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/servers/mail/dovecot/plugins/antispam/default.nix

diff --git a/pkgs/servers/mail/dovecot/plugins/antispam/default.nix b/pkgs/servers/mail/dovecot/plugins/antispam/default.nix
new file mode 100644
index 000000000000..1a1ba1ad4486
--- /dev/null
+++ b/pkgs/servers/mail/dovecot/plugins/antispam/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchhg, autoconf, automake, dovecot, openssl }:
+
+stdenv.mkDerivation {
+  name = "dovecot-antispam-20130429";
+
+  src = fetchhg {
+    url = "http://hg.dovecot.org/dovecot-antispam-plugin/";
+    rev = "5ebc6aae4d7c";
+    sha256 = "181i79c9sf3a80mgmycfq1f77z7fpn3j2s0qiddrj16h3yklf4gv";
+  };
+
+  buildInputs = [ dovecot openssl ];
+  nativeBuildInputs = [ autoconf automake ];
+
+  preConfigure = ''
+    ./autogen.sh
+    # Ugly hack; any ideas?
+    sed "s,^dovecot_moduledir=.*,dovecot_moduledir=$out/lib/dovecot," ${dovecot}/lib/dovecot/dovecot-config > dovecot-config
+  '';
+
+  configureFlags = [
+    "--with-dovecot=."
+  ];
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    homepage = http://wiki2.dovecot.org/Plugins/Antispam;
+    description = "An antispam plugin for the Dovecot IMAP server";
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ abbradar ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a4abd6a54a28..d162b6fe10f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9238,6 +9238,8 @@ let
     dovecot = dovecot22;
   };
 
+  dovecot_antispam = callPackage ../servers/mail/dovecot/plugins/antispam { };
+
   dspam = callPackage ../servers/mail/dspam {
     inherit (perlPackages) NetSMTP;
   };

From d1a9c55d910af49a93023f9e7de44bdf4a5cc03c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 6 Jan 2016 23:09:06 +0300
Subject: [PATCH 0207/2285] nixos/dovecot: add reload command

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

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 36bdcaca47a3..e8eaeafff3e9 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -162,7 +162,7 @@ in
     enablePAM = mkOption {
       type = types.bool;
       default = true;
-      description = "Wether to create a own Dovecot PAM service and configure PAM user logins.";
+      description = "Whether to create a own Dovecot PAM service and configure PAM user logins.";
     };
 
     showPAMFailure = mkOption {
@@ -211,6 +211,7 @@ in
 
       serviceConfig = {
         ExecStart = "${dovecotPkg}/sbin/dovecot -F -c ${cfg.configFile}";
+        ExecReload = "${dovecotPkg}/sbin/doveadm reload -c ${cfg.configFile}";
         Restart = "on-failure";
         RestartSec = "1s";
         StartLimitInterval = "1min";

From 9c7b067c6a22338b91f77638c06f1f9e545755cc Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 7 Jan 2016 01:27:06 +0300
Subject: [PATCH 0208/2285] nixos/dovecot: create user/group only if they are
 default

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

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index e8eaeafff3e9..ae9de6445906 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -178,22 +178,22 @@ in
     security.pam.services.dovecot2 = mkIf cfg.enablePAM {};
 
     users.extraUsers = [
-      { name = cfg.user;
-        uid = config.ids.uids.dovecot2;
-        description = "Dovecot user";
-        group = cfg.group;
-      }
       { name = "dovenull";
         uid = config.ids.uids.dovenull2;
         description = "Dovecot user for untrusted logins";
         group = cfg.group;
       }
-    ];
+    ] ++ optional (cfg.user == "dovecot2")
+         { name = "dovecot2";
+           uid = config.ids.uids.dovecot2;
+           description = "Dovecot user";
+           group = cfg.group;
+         };
 
-    users.extraGroups = singleton {
-      name = cfg.group;
-      gid = config.ids.gids.dovecot2;
-    };
+    users.extraGroups = optional (cfg.group == "dovecot2")
+      { name = "dovecot2";
+        gid = config.ids.gids.dovecot2;
+      };
 
     systemd.services.dovecot2 = {
       description = "Dovecot IMAP/POP3 server";

From 122929cda74f92555c40e9888c968e02611cb3e8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 9 Jan 2016 04:15:25 +0300
Subject: [PATCH 0209/2285] nixos/dovecot: use systemd's RuntimeDirectory
 instead of creating it by ourselves

---
 nixos/modules/services/mail/dovecot.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index ae9de6445906..c9406a2ac516 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -203,8 +203,6 @@ in
       wantedBy = [ "multi-user.target" ];
 
       preStart = ''
-        mkdir -p "${baseDir}/login"
-        chown -R ${cfg.user}:${cfg.group} "${baseDir}"
         rm -f "${stateDir}/modules"
         ln -s "${modulesDir}" "${stateDir}/modules"
       '';
@@ -215,6 +213,7 @@ in
         Restart = "on-failure";
         RestartSec = "1s";
         StartLimitInterval = "1min";
+        RuntimeDirectory = [ "dovecot2" ];
       };
     };
 

From b2b58642fedd4b315bf8b92a3352792fa3d77bce Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 10 Jan 2016 06:54:07 +0300
Subject: [PATCH 0210/2285] nixos/dovecot: add 'protocols' option

---
 nixos/modules/services/mail/dovecot.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index c9406a2ac516..e244bdbd30bb 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -9,16 +9,10 @@ let
   baseDir = "/run/dovecot2";
   stateDir = "/var/lib/dovecot";
 
-  protocols = concatStrings [
-    (optionalString cfg.enableImap "imap")
-    (optionalString cfg.enablePop3 "pop3")
-    (optionalString cfg.enableLmtp "lmtp")
-  ];
-
   dovecotConf = concatStrings [
     ''
       base_dir = ${baseDir}
-      protocols = ${protocols}
+      protocols = ${concatStringsSep " " cfg.protocols}
     ''
 
     (if isNull cfg.sslServerCert then ''
@@ -87,6 +81,12 @@ in
       description = "Start the LMTP listener (when Dovecot is enabled).";
     };
 
+    protocols = mkOption {
+      type = types.listOf types.str;
+      default = [ ];
+      description = "Additional listeners to start when Dovecot is enabled.";
+    };
+
     package = mkOption {
       type = types.package;
       default = pkgs.dovecot22;
@@ -177,6 +177,11 @@ in
 
     security.pam.services.dovecot2 = mkIf cfg.enablePAM {};
 
+    services.dovecot2.protocols =
+     optional cfg.enableImap "imap"
+     ++ optional cfg.enablePop3 "pop3"
+     ++ optional cfg.enableLmtp "lmtp";
+
     users.extraUsers = [
       { name = "dovenull";
         uid = config.ids.uids.dovenull2;
@@ -220,7 +225,7 @@ in
     environment.systemPackages = [ dovecotPkg ];
 
     assertions = [
-      { assertion = cfg.enablePop3 || cfg.enableImap;
+      { assertion = intersectLists cfg.protocols [ "pop3" "imap" ] != [];
         message = "dovecot needs at least one of the IMAP or POP3 listeners enabled";
       }
       { assertion = isNull cfg.sslServerCert == isNull cfg.sslServerKey

From 94a43b41af1204f4a87261ddb0820c5c8e3bc2c8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 10 Jan 2016 06:58:56 +0300
Subject: [PATCH 0211/2285] nixos/dovecot: add dovecot package to modules,
 force proper dovecot version

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

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index e244bdbd30bb..c034e5e04700 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -55,7 +55,7 @@ let
   ];
 
   modulesDir = pkgs.symlinkJoin "dovecot-modules"
-    (map (module: "${module}/lib/dovecot") cfg.modules);
+    (map (pkg: "${pkg}/lib/dovecot") ([ dovecotPkg ] ++ map (module: module.override { dovecot = dovecotPkg; }) cfg.modules));
 
 in
 {

From 70e77f9b53b036edfc9300ce3a16ecc637c5f6c3 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 10 Jan 2016 07:00:34 +0300
Subject: [PATCH 0212/2285] nixos/dovecot: use new modules directory

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

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index c034e5e04700..974dfb708f1b 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -135,7 +135,7 @@ in
       example = literalExample "[ pkgs.dovecot_pigeonhole ]";
       description = ''
         Symlinks the contents of lib/dovecot of every given package into
-        /var/lib/dovecot/modules. This will make the given modules available
+        /etc/dovecot/modules. This will make the given modules available
         if a dovecot package with the module_dir patch applied (like
         pkgs.dovecot22, the default) is being used.
       '';
@@ -200,6 +200,8 @@ in
         gid = config.ids.gids.dovecot2;
       };
 
+    environment.etc."dovecot/modules".source = modulesDir;
+
     systemd.services.dovecot2 = {
       description = "Dovecot IMAP/POP3 server";
 
@@ -207,11 +209,6 @@ in
       wants = [ "keys.target" ];
       wantedBy = [ "multi-user.target" ];
 
-      preStart = ''
-        rm -f "${stateDir}/modules"
-        ln -s "${modulesDir}" "${stateDir}/modules"
-      '';
-
       serviceConfig = {
         ExecStart = "${dovecotPkg}/sbin/dovecot -F -c ${cfg.configFile}";
         ExecReload = "${dovecotPkg}/sbin/doveadm reload -c ${cfg.configFile}";

From 39bbac96afce0624b7ea57461431efcdabdd5fc8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 10 Jan 2016 07:02:24 +0300
Subject: [PATCH 0213/2285] nixos/dovecot: symlink system-wide config and use
 it

---
 nixos/modules/services/mail/dovecot.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 974dfb708f1b..a2a93a520e9b 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -201,6 +201,7 @@ in
       };
 
     environment.etc."dovecot/modules".source = modulesDir;
+    environment.etc."dovecot/dovecot.conf".source = cfg.configFile;
 
     systemd.services.dovecot2 = {
       description = "Dovecot IMAP/POP3 server";
@@ -208,10 +209,11 @@ in
       after = [ "keys.target" "network.target" ];
       wants = [ "keys.target" ];
       wantedBy = [ "multi-user.target" ];
+      restartTriggers = [ cfg.configFile ];
 
       serviceConfig = {
-        ExecStart = "${dovecotPkg}/sbin/dovecot -F -c ${cfg.configFile}";
-        ExecReload = "${dovecotPkg}/sbin/doveadm reload -c ${cfg.configFile}";
+        ExecStart = "${dovecotPkg}/sbin/dovecot -F";
+        ExecReload = "${dovecotPkg}/sbin/doveadm reload";
         Restart = "on-failure";
         RestartSec = "1s";
         StartLimitInterval = "1min";

From b781cf1a12ce77fd29ec0656bb04895b0cdaecf7 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 10 Jan 2016 07:05:12 +0300
Subject: [PATCH 0214/2285] nixos/dovecot: add sieveScripts support

---
 nixos/modules/services/mail/dovecot.nix | 28 +++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index a2a93a520e9b..efe6a3beb9ae 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -51,6 +51,12 @@ let
       }
     '')
 
+    (optionalString (cfg.sieveScripts != {}) ''
+      plugin {
+        ${concatStringsSep "\n" (mapAttrsToList (to: from: "sieve_${to} = ${stateDir}/sieve/${to}") cfg.sieveScripts)}
+      }
+    '')
+
     cfg.extraConfig
   ];
 
@@ -165,6 +171,12 @@ in
       description = "Whether to create a own Dovecot PAM service and configure PAM user logins.";
     };
 
+    sieveScripts = mkOption {
+      type = types.attrsOf types.path;
+      default = {};
+      description = "Sieve scripts to be executed. Key is a sequence, e.g. 'before2', 'after' etc.";
+    };
+
     showPAMFailure = mkOption {
       type = types.bool;
       default = false;
@@ -219,6 +231,22 @@ in
         StartLimitInterval = "1min";
         RuntimeDirectory = [ "dovecot2" ];
       };
+
+      preStart = ''
+        rm -rf ${stateDir}/sieve
+      '' + optionalString (cfg.sieveScripts != {}) ''
+        mkdir -p ${stateDir}/sieve
+        ${concatStringsSep "\n" (mapAttrsToList (to: from: ''
+          if [ -d '${from}' ]; then
+            mkdir '${stateDir}/sieve/${to}'
+            cp ${from}/*.sieve '${stateDir}/sieve/${to}'
+          else
+            cp '${from}' '${stateDir}/sieve/${to}'
+          fi
+           ${pkgs.dovecot_pigeonhole}/bin/sievec '${stateDir}/sieve/${to}'
+        '') cfg.sieveScripts)}
+        chown -R '${cfg.user}:${cfg.group}' ${stateDir}/sieve
+      '';
     };
 
     environment.systemPackages = [ dovecotPkg ];

From 5b5e2c05c41de4d0aa298eab133923f2feb851a2 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 10 Jan 2016 07:07:26 +0300
Subject: [PATCH 0215/2285] nixos/dovecot: add mail user and group

---
 nixos/modules/services/mail/dovecot.nix | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index efe6a3beb9ae..11e8b26c75ef 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -27,6 +27,8 @@ let
 
     ''
       default_internal_user = ${cfg.user}
+      ${optionalString (cfg.mailUser != null) "mail_uid = ${cfg.mailUser}"}
+      ${optionalString (cfg.mailGroup != null) "mail_gid = ${cfg.mailGroup}"}
 
       mail_location = ${cfg.mailLocation}
 
@@ -135,6 +137,18 @@ in
       '';
     };
 
+    mailUser = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = "Default user to store mail for virtual users.";
+    };
+
+    mailGroup = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = "Default group to store mail for virtual users.";
+    };
+
     modules = mkOption {
       type = types.listOf types.package;
       default = [];
@@ -245,7 +259,7 @@ in
           fi
            ${pkgs.dovecot_pigeonhole}/bin/sievec '${stateDir}/sieve/${to}'
         '') cfg.sieveScripts)}
-        chown -R '${cfg.user}:${cfg.group}' ${stateDir}/sieve
+        chown -R '${cfg.mailUser}:${cfg.mailGroup}' '${stateDir}/sieve'
       '';
     };
 

From a98dfaa6b96a00b6822f25ca7638d4ae7d57a855 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 21 Jan 2016 13:07:56 +0300
Subject: [PATCH 0216/2285] nix manual: add bundlerEnv.env and .wrapper items
 descriptions

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

diff --git a/doc/languages-frameworks/ruby.xml b/doc/languages-frameworks/ruby.xml
index a2b4475a4a54..d81422b610ee 100644
--- a/doc/languages-frameworks/ruby.xml
+++ b/doc/languages-frameworks/ruby.xml
@@ -42,5 +42,37 @@ and scalable.";
 <para>Please check in the <filename>Gemfile</filename>, <filename>Gemfile.lock</filename> and the <filename>gemset.nix</filename> so future updates can be run easily.
 </para>
 
+<para>Resulting derivations also have two helpful items, <literal>env</literal> and <literal>wrapper</literal>. The first one allows one to quickly drop into
+<command>nix-shell</command> with the specified environment present. E.g. <command>nix-shell -A sensu.env</command> would give you an environment with Ruby preset
+so it has all the libraries necessary for <literal>sensu</literal> in its paths. The second one can be used to make derivations from custom Ruby scripts which have
+<filename>Gemfile</filename>s with their dependencies specified. It is a derivation with <command>ruby</command> wrapped so it can find all the needed dependencies.
+For example, to make a derivation <literal>my-script</literal> for a <filename>my-script.rb</filename> (which should be placed in <filename>bin</filename>) you should
+run <command>bundix</command> as specified above and then use <literal>bundlerEnv</literal> lile this:</para>
+
+<programlisting>
+<![CDATA[let env = bundlerEnv {
+  name = "my-script-env";
+
+  inherit ruby;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+};
+
+in stdenv.mkDerivation {
+  name = "my-script";
+
+  buildInputs = [ env.wrapper ];
+
+  script = ./my-script.rb;
+
+  buildCommand = ''
+    mkdir -p $out/bin
+    install -D -m755 $script $out/bin/my-script
+    patchShebangs $out/bin/my-script
+  '';
+}]]>
+</programlisting>
+
 </section>
 

From d714963d1b49733db07f7cb34eb338cc2cd76ac1 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 21 Jan 2016 11:26:10 +0100
Subject: [PATCH 0217/2285] metis-prover: 2.3.20160101 -> 2.3.20160102

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

diff --git a/pkgs/applications/science/logic/metis-prover/default.nix b/pkgs/applications/science/logic/metis-prover/default.nix
index 308ca79eab28..772d755b233e 100644
--- a/pkgs/applications/science/logic/metis-prover/default.nix
+++ b/pkgs/applications/science/logic/metis-prover/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "metis-prover-${version}";
-  version = "2.3.20160101";
+  version = "2.3.20160102";
 
   src = fetchurl {
     url = "http://www.gilith.com/software/metis/metis.tar.gz";
-    sha256 = "0wkh506ggwmfacwl19n84n1xi6ak4xhrc96d9pdkpk8zdwh5w58l";
+    sha256 = "13csr90i9lsxdyzxqiwgi98pa7phfl28drjcv4qdjhzi71wcdc66";
   };
 
   nativeBuildInputs = [ perl ];

From 97f4fa51965705ff34053cef41fd5d5bf28ef619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 21 Jan 2016 11:35:18 +0100
Subject: [PATCH 0218/2285] gnome3*.epiphany: fix https when not running
 gnome-3

This (only) fixes the probem of not finding glib_networking,
not any certificate problems. Discussion: #12518.
---
 pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix | 3 ++-
 pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
index 5ec07d01b2e0..7dcba4173644 100644
--- a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu
 , bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool
-, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit
+, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit
 , sqlite, gcr, avahi, nss, isocodes, itstool, file, which
 , gdk_pixbuf, librsvg, gnome_common }:
 
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
     for f in $out/bin/* $out/libexec/*; do
       wrapProgram "$f" \
         --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
         --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
     done
   '';
diff --git a/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix
index 5a98770b6632..ff21da4a28c8 100644
--- a/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/epiphany/default.nix
@@ -1,6 +1,6 @@
 { stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu
 , bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool
-, webkitgtk, libsoup, libsecret, gnome_desktop, libnotify, p11_kit
+, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit
 , sqlite, gcr, avahi, nss, isocodes, itstool, file, which
 , gdk_pixbuf, librsvg, gnome_common }:
 
@@ -28,6 +28,7 @@ stdenv.mkDerivation rec {
     for f in $out/bin/* $out/libexec/*; do
       wrapProgram "$f" \
         --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
+        --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
         --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
     done
   '';

From 194168b7225b341399ccd8948faf2075896033ca Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Thu, 21 Jan 2016 12:52:00 +0100
Subject: [PATCH 0219/2285] z3: 4.4.0 -> 4.4.1

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

diff --git a/pkgs/applications/science/logic/z3/default.nix b/pkgs/applications/science/logic/z3/default.nix
index fb3fb959ae63..43ce46b8e7a0 100644
--- a/pkgs/applications/science/logic/z3/default.nix
+++ b/pkgs/applications/science/logic/z3/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "z3-${version}";
-  version = "4.4.0";
+  version = "4.4.1";
 
   src = fetchFromGitHub {
     owner  = "Z3Prover";
     repo   = "z3";
-    rev    = "7f6ef0b6c0813f2e9e8f993d45722c0e5b99e152";
-    sha256 = "1xllvq9fcj4cz34biq2a9dn2sj33bdgrzyzkj26hqw70wkzv1kzx";
+    rev    = "z3-${version}";
+    sha256 = "1ix100r1h00iph1bk5qx5963gpqaxmmx42r2vb5zglynchjif07c";
   };
 
   buildInputs = [ python ];

From 889ebe6b28f482d404500da69e6b5b761ef7ccac Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Thu, 21 Jan 2016 14:39:52 +0000
Subject: [PATCH 0220/2285] bluez5: 5.36 -> 5.37

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

diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix
index 753771bf44e0..cc132ddc397e 100644
--- a/pkgs/os-specific/linux/bluez/bluez5.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5.nix
@@ -5,11 +5,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "bluez-5.36";
+  name = "bluez-5.37";
    
   src = fetchurl {
     url = "mirror://kernel/linux/bluetooth/${name}.tar.xz";
-    sha256 = "1wkqwmi5krr37mxcqqlp5m2xnw7vw70v3ww7j09vvlskxcdflhx3";
+    sha256 = "c14ba9ddcb0055522073477b8fd8bf1ddf5d219e75fdfd4699b7e0ce5350d6b0";
   };
 
   pythonPath = with pythonPackages;

From 4d5293d8c37e66dd18e9539cf65fc79391e8d301 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 21 Jan 2016 16:05:42 +0100
Subject: [PATCH 0221/2285] gparted: 0.24.0 -> 0.25.0

Key changes include:
- Add progress bar during additional ext2/3/4 and ntfs operations
- Enhance SWRaid member detection and file system clearing
- Always use blkid file system detection before libparted

See the Release Notes for more details:
https://sourceforge.net/projects/gparted/files/gparted/gparted-0.25.0/gparted-0.25.0-README.md/view
---
 pkgs/tools/misc/gparted/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/gparted/default.nix b/pkgs/tools/misc/gparted/default.nix
index be5eb0e66214..808fb2c841c0 100644
--- a/pkgs/tools/misc/gparted/default.nix
+++ b/pkgs/tools/misc/gparted/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "gparted-0.24.0";
+  name = "gparted-0.25.0";
 
   src = fetchurl {
-    sha256 = "0q6d1s9f4qgdivj4vm9w87qmdfyq8s65jzkhv05rp9cl72rqlf82";
-    url = "mirror://sourceforge/gparted/${name}.tar.bz2";
+    sha256 = "1bllvj66rka8f9h9rfwvxaqrj4mbp2n2860ahnp9xm1195gnv69d";
+    url = "mirror://sourceforge/gparted/${name}.tar.gz";
   };
 
   configureFlags = [ "--disable-doc" ];

From 05fed13de3b4afcd7b65869e6807858af3d9e20d Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 21 Jan 2016 15:29:02 +0100
Subject: [PATCH 0222/2285] multipath_tools: Cleanup and update to v0.5.0

Previously, version 0.4.9 was a tarbomb and in version 0.5.0 this
fortunately isn't the case anymore so we don't need to set sourceRoot by
ourselves.

I've also moved the definition of makeFlagsArray to the attribute
makeFlags, because we can use $(var) to substitute shell variables
within make.

The references to /lib/udev/scsi_id no longer exist in version 0.5.0 and
it seems that libudev is used directly.

Nevertheless, there are still references to FHS paths such as /var/run,
/etc/multipath.conf and /etc/multipath but these are only relevant at
runtime and can be configured to point to a different path elsewhere.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../linux/multipath-tools/default.nix         | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/pkgs/os-specific/linux/multipath-tools/default.nix b/pkgs/os-specific/linux/multipath-tools/default.nix
index 3da37a89923a..ba69b421c3d3 100644
--- a/pkgs/os-specific/linux/multipath-tools/default.nix
+++ b/pkgs/os-specific/linux/multipath-tools/default.nix
@@ -1,30 +1,32 @@
 { stdenv, fetchurl, lvm2, libaio, gzip, readline, udev }:
 
 stdenv.mkDerivation rec {
-  name = "multipath-tools-0.4.9";
+  name = "multipath-tools-0.5.0";
 
   src = fetchurl {
     url = "http://christophe.varoqui.free.fr/multipath-tools/${name}.tar.bz2";
-    sha256 = "04n7kazp1zrlqfza32phmqla0xkcq4zwn176qff5ida4a60whi4d";
+    sha256 = "1yd6l1l1c62xjr1xnij2x49kr416anbgfs4y06r86kp9hkmz2g7i";
   };
 
-  sourceRoot = ".";
+  postPatch = ''
+    sed -i -re '
+      s,^( *#define +DEFAULT_MULTIPATHDIR\>).*,\1 "'"$out/lib/multipath"'",
+    ' libmultipath/defaults.h
+    sed -i -e 's,\$(DESTDIR)/\(usr/\)\?,$(prefix)/,g' \
+      kpartx/Makefile libmpathpersist/Makefile
+  '';
 
-  buildInputs = [ lvm2 libaio readline ];
+  nativeBuildInputs = [ gzip ];
+  buildInputs = [ udev lvm2 libaio readline ];
 
-  preBuild =
-    ''
-      makeFlagsArray=(GZIP="${gzip}/bin/gzip -9n -c" prefix=$out mandir=$out/share/man/man8 man5dir=$out/share/man/man5 LIB=lib)
-      
-      substituteInPlace multipath/Makefile --replace /etc $out/etc
-      substituteInPlace kpartx/Makefile --replace /etc $out/etc
-      
-      substituteInPlace kpartx/kpartx.rules --replace /sbin/kpartx $out/sbin/kpartx
-      substituteInPlace kpartx/kpartx_id --replace /sbin/dmsetup ${lvm2}/sbin/dmsetup
-
-      substituteInPlace libmultipath/defaults.h --replace /lib/udev/scsi_id ${udev}/lib/udev/scsi_id
-      substituteInPlace libmultipath/hwtable.c --replace /lib/udev/scsi_id ${udev}/lib/udev/scsi_id
-    '';
+  makeFlags = [
+    "LIB=lib"
+    "prefix=$(out)"
+    "mandir=$(out)/share/man/man8"
+    "man5dir=$(out)/share/man/man5"
+    "man3dir=$(out)/share/man/man3"
+    "unitdir=$(out)/lib/systemd/system"
+  ];
 
   meta = {
     description = "Tools for the Linux multipathing driver";

From c92d7481a5aec31394ab885c86dde93ade04576c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 21 Jan 2016 16:07:38 +0100
Subject: [PATCH 0223/2285] multipath_tools: Rename to multipath-tools

See http://nixos.org/nixpkgs/manual/#sec-package-naming

I've added an alias for multipath_tools to make sure that we don't break
existing configurations referencing the old name.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/virtualisation/nova.nix              | 2 +-
 pkgs/applications/virtualization/xen/generic.nix   | 4 ++--
 pkgs/development/python-modules/blivet/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                    | 3 ++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/virtualisation/nova.nix b/nixos/modules/virtualisation/nova.nix
index f356445abe46..c2837d0e2e24 100644
--- a/nixos/modules/virtualisation/nova.nix
+++ b/nixos/modules/virtualisation/nova.nix
@@ -146,7 +146,7 @@ in
 
         path =
           [ pkgs.sudo pkgs.vlan pkgs.nettools pkgs.iptables pkgs.qemu_kvm
-            pkgs.e2fsprogs pkgs.utillinux pkgs.multipath_tools pkgs.iproute
+            pkgs.e2fsprogs pkgs.utillinux pkgs.multipath-tools pkgs.iproute
             pkgs.bridge-utils
           ];
 
diff --git a/pkgs/applications/virtualization/xen/generic.nix b/pkgs/applications/virtualization/xen/generic.nix
index 71c26c5f99c9..6774675266c4 100644
--- a/pkgs/applications/virtualization/xen/generic.nix
+++ b/pkgs/applications/virtualization/xen/generic.nix
@@ -5,7 +5,7 @@
 , flex, cmake, ocaml, ocamlPackages, figlet, libaio, yajl
 , checkpolicy, transfig, glusterfs, acl, fetchgit, xz, spice
 , spice_protocol, usbredir, alsaLib, quilt
-, coreutils, gawk, gnused, gnugrep, diffutils, multipath_tools
+, coreutils, gawk, gnused, gnugrep, diffutils, multipath-tools
 , inetutils, iptables, openvswitch, nbd, drbd, xenConfig
 , xenserverPatched ? false, ... }:
 
@@ -51,7 +51,7 @@ let
     ];
 
   scriptEnvPath = stdenv.lib.concatStrings (stdenv.lib.intersperse ":" (map (x: "${x}/bin")
-    [ coreutils gawk gnused gnugrep which perl diffutils utillinux multipath_tools
+    [ coreutils gawk gnused gnugrep which perl diffutils utillinux multipath-tools
       iproute inetutils iptables bridge-utils openvswitch nbd drbd ]));
 in
 
diff --git a/pkgs/development/python-modules/blivet/default.nix b/pkgs/development/python-modules/blivet/default.nix
index 240fe6388348..a55e1993ac37 100644
--- a/pkgs/development/python-modules/blivet/default.nix
+++ b/pkgs/development/python-modules/blivet/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, buildPythonPackage, pykickstart, pyparted, pyblock
-, pyudev, six, libselinux, cryptsetup, multipath_tools, lsof, utillinux
+, pyudev, six, libselinux, cryptsetup, multipath-tools, lsof, utillinux
 }:
 
 let
@@ -19,7 +19,7 @@ in buildPythonPackage rec {
 
   postPatch = ''
     sed -i \
-      -e 's|"multipath"|"${multipath_tools}/sbin/multipath"|' \
+      -e 's|"multipath"|"${multipath-tools}/sbin/multipath"|' \
       -e '/^def set_friendly_names/a \    return False' \
       blivet/devicelibs/mpath.py
     sed -i -e '/"wipefs"/ {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f98465f45f4f..1c283e4acb10 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10384,7 +10384,7 @@ let
       inherit modules;
     };
 
-  multipath_tools = callPackage ../os-specific/linux/multipath-tools { };
+  multipath-tools = callPackage ../os-specific/linux/multipath-tools { };
 
   musl = callPackage ../os-specific/linux/musl { };
 
@@ -15880,6 +15880,7 @@ aliases = with self; rec {
   lttngUst = lttng-ust;  # added 2014-07-31
   midoriWrapper = midori; # added 2015-01
   mlt-qt5 = qt5.mlt;  # added 2015-12-19
+  multipath_tools = multipath-tools;  # added 2016-01-21
   nfsUtils = nfs-utils;  # added 2014-12-06
   phonon_qt5 = qt5.phonon;  # added 2015-12-19
   phonon_qt5_backend_gstreamer = qt5.phonon-backend-gstreamer;  # added 2015-12-19

From f727f815cb075f6ff466f8c8a02a275502709eec Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 21 Jan 2016 18:43:52 +0300
Subject: [PATCH 0224/2285] nixpkgs manual: mention preferLocalBuild and
 enableParallelBuilding

---
 doc/stdenv.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 6bb1002a4c67..8df23c911522 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -224,6 +224,30 @@ genericBuild
 
 </variablelist>
 
+<variablelist>
+  <title>Variables affecting build properties</title>
+
+  <varlistentry>
+    <term><varname>enableParallelBuilding</varname></term>
+    <listitem><para>If set, <literal>stdenv</literal> will pass specific
+    flags to <literal>make</literal> and other build tools to enable
+    parallel building with up to <literal>build-cores</literal>
+    workers.</para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>preferLocalBuild</varname></term>
+    <listitem><para>If set, specifies that the package is so lightweight
+    in terms of build operations (e.g. write a text file from a Nix string
+    to the store) that there's no need to look for it in binary caches --
+    it's faster to just build it locally. It also tells Hydra and other
+    facilities that this package doesn't need to be exported in binary
+    caches (noone would use it, after all).</para></listitem>
+  </varlistentry>
+
+</variablelist>
+
+
 </section>
 
 

From e32172612a83e889045004e7cd9c61394e879acd Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 21 Jan 2016 17:16:28 +0100
Subject: [PATCH 0225/2285] Improve LibreOffice src list generation

---
 .../office/libreoffice/generate-libreoffice-srcs.sh  | 12 ++++++++++++
 .../office/libreoffice/libreoffice-srcs-additions.sh |  1 +
 .../office/libreoffice/libreoffice-srcs.nix          |  1 +
 3 files changed, 14 insertions(+)
 create mode 100644 pkgs/applications/office/libreoffice/libreoffice-srcs-additions.sh

diff --git a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
index d77b41a0480e..bba1ad9c213d 100755
--- a/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
+++ b/pkgs/applications/office/libreoffice/generate-libreoffice-srcs.sh
@@ -1,7 +1,11 @@
 #!/run/current-system/sw/bin/bash
 
+# Ideally we would move as much as possible into derivation dependencies
+
 # Take the list of files from the main package, ooo.lst.in
 
+# This script wants an argument: download list file
+
 cat <<EOF
 [
 EOF
@@ -11,11 +15,18 @@ write_entry(){
   echo "  name = \"${name}\";"
   echo "  md5 = \"${md5}\";"
   echo "  brief = ${brief};"
+  eval "echo -n \"\$additions_${name%%[-_.]*}\""
+  eval "test -n \"\$additions_${name%%[-_.]*}\" && echo"
   echo '}'
 }
 
+cat "$(dirname "$0")/libreoffice-srcs-additions.sh" "$@" |
 while read line; do
   case "$line" in
+    EVAL\ *)
+      echo "${line#* }" >&2;
+      eval "${line#* }";
+      ;;
     \#*)
       echo Skipping comment: "$line" >&2;
       ;;
@@ -42,6 +53,7 @@ while read line; do
       line="${line#,}"
       md5=${line:0:32};
       name=${line:33};
+      name="${name%)}"
       brief=false;
       write_entry;
       ;;
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.sh b/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.sh
new file mode 100644
index 000000000000..dcc12a1a7b05
--- /dev/null
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.sh
@@ -0,0 +1 @@
+EVAL additions_libgltf='  subDir = "libgltf";'
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index 0e7525782c6b..cf9a2711347b 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -323,6 +323,7 @@
   name = "libgltf-0.0.2.tar.bz2";
   md5 = "d63a9f47ab048f5009d90693d6aa6424";
   brief = true;
+  subDir = "libgltf";
 }
 {
   name = "liblangtag-0.5.1.tar.bz2";

From 6349f50bde157711defde59b31979a6337a79d9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 21 Jan 2016 14:39:57 +0100
Subject: [PATCH 0226/2285] Add gtreap gopackage.

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index f363dea9db47..abfc29833c63 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1682,6 +1682,15 @@ let
     excludedPackages = "\\(test\\|benchmark\\)";
   };
 
+  gtreap = buildFromGitHub {
+    rev = "0abe01ef9be25c4aedc174758ec2d917314d6d70";
+    date = "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}";

From 082f2e6938df4e7991856ccca35bb558cdee03ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 21 Jan 2016 15:05:40 +0100
Subject: [PATCH 0227/2285] go builder: respect enableParallelBuilding

It was parallelizing for $NIX_BUILD_CORES regardless of
enableParallelBuilding.
---
 pkgs/development/go-modules/generic/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index bd2289723f8d..260e8d66c58a 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -112,6 +112,9 @@ go.stdenv.mkDerivation (
     }
 
     export -f buildGoDir # parallel needs to see the function
+    if [ -z "$enableParallelBuilding" ]; then
+        export NIX_BUILD_CORES=1
+    fi
     getGoDirs "" | parallel -j $NIX_BUILD_CORES buildGoDir install
 
     runHook postBuild

From 7880317da2d2d10c5e8b1a9202c17d21e0fd4450 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 21 Jan 2016 15:08:17 +0100
Subject: [PATCH 0228/2285] go packages: add kagome

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index abfc29833c63..43cd559663f7 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1859,6 +1859,17 @@ let
     sha256 = "0m8867afsvka5gp2idrmlarpjg7kxx7qacpwrz1wl8y3zxyn3945";
   };
 
+  kagome = buildFromGitHub {
+    rev = "1bbdbdd590e13a8c2f4508c67a079113cd7b9f51";
+    date = "2016-01-19";
+    owner = "ikawaha";
+    repo = "kagome";
+    sha256 = "1isnjdkn9hnrkp5g37p2k5bbsrx0ma32v3icwlmwwyc5mppa4blb";
+    buildFlags = "-p 1";
+    enableParallelBuilding = false;
+    goPackagePath = "github.com/ikawaha/kagome";
+  };
+
   ldap = buildGoPackage rec {
     rev = "83e65426fd1c06626e88aa8a085e5bfed0208e29";
     name = "ldap-${stdenv.lib.strings.substring 0 7 rev}";

From 5133f63257f27c5bb392b2ed6c9ad4f77b3c734d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 21 Jan 2016 15:21:45 +0100
Subject: [PATCH 0229/2285] go packages: adding bleve

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 43cd559663f7..6ad9c391d7d3 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -304,6 +304,17 @@ let
     ];
   };
 
+  bleve = buildFromGitHub {
+    rev    = "fc34a97875840b2ae24517e7d746b69bdae9be90";
+    date   = "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";
@@ -311,6 +322,14 @@ let
     sha256 = "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3";
   };
 
+  bitset = buildFromGitHub {
+    rev    = "bb0da3785c4fe9d26f6029c77c8fce2aa4d0b291";
+    date   = "2016-01-13";
+    owner  = "willf";
+    repo   = "bitset";
+    sha256 = "1d4z2hjjs9jk6aysi4mf50p8lbbzag4ir4y1f0z4sz8gkwagh7b7";
+  };
+
   blackfriday = buildFromGitHub {
     rev    = "d18b67ae0afd61dae240896eae1785f00709aa31";
     owner  = "russross";
@@ -1489,6 +1508,14 @@ let
     sha256 = "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm";
   };
 
+  go-porterstemmer = buildFromGitHub {
+    rev    = "23a2c8e5cf1f380f27722c6d2ae8896431dc7d0e";
+    date   = "2014-12-30";
+    owner  = "blevesearch";
+    repo   = "go-porterstemmer";
+    sha256 = "0rcfbrad79xd114h3dhy5d3zs3b5bcgqwm3h5ih1lk69zr9wi91d";
+  };
+
   go-querystring = buildFromGitHub {
     rev    = "547ef5ac979778feb2f760cdb5f4eae1a2207b86";
     owner  = "google";
@@ -3035,6 +3062,14 @@ let
     sha256 = "1f0rwgqlffv1a7b05736a4gf4l9dn80wsfyqcnz6qd2skhwnzv29";
   };
 
+  segment = buildFromGitHub {
+    rev    = "db70c57796cc8c310613541dfade3dce627d09c7";
+    date   = "2016-01-05";
+    owner  = "blevesearch";
+    repo   = "segment";
+    sha256 = "09xfdlcc6bsrr5grxp6fgnw9p4cf6jc0wwa9049fd1l0zmhj2m1g";
+  };
+
   semver = buildFromGitHub {
     rev = "31b736133b98f26d5e078ec9eb591666edfd091f";
     date = "2015-07-20";

From 99077ff6486b1bbb02365290cb94c49799dbb425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 21 Jan 2016 15:52:40 +0100
Subject: [PATCH 0230/2285] go packages: add gozim and dependencies.

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 6ad9c391d7d3..812955f50e81 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1199,6 +1199,15 @@ let
     buildInputs = [ iochan ];
   };
 
+  gozim = buildFromGitHub {
+    rev    = "ea9b7c39cb1d13bd8bf19ba4dc4e2a16bab52f14";
+    date   = "2016-01-15";
+    owner  = "akhenakh";
+    repo   = "gozim";
+    sha256 = "1n50fdd56r3s1sgjbpa72nvdh50gfpf6fq55c077w2p3bxn6p8k6";
+    propagatedBuildInputs = [ bleve go-liblzma groupcache go-rice goquery ];
+  };
+
   go-assert = buildGoPackage rec {
     rev = "e17e99893cb6509f428e1728281c2ad60a6b31e3";
     name = "assert-${stdenv.lib.strings.substring 0 7 rev}";
@@ -1404,6 +1413,14 @@ let
     sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa";
   };
 
+  go-incremental = buildFromGitHub {
+    rev    = "92fd0ce4a694213e8b3dfd2d39b16e51d26d0fbf";
+    date   = "2015-02-20";
+    owner  = "GeertJohan";
+    repo   = "go.incremental";
+    sha256 = "160cspmq73bk6cvisa6kq1dwrrp1yqpkrpq8dl69wcnaf91cbnml";
+  };
+
   go-isatty = buildFromGitHub {
     rev    = "ae0b1f8f8004be68d791a576e3d8e7648ab41449";
     owner  = "mattn";
@@ -1411,6 +1428,15 @@ let
     sha256 = "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj";
   };
 
+  go-liblzma = buildFromGitHub {
+    rev    = "e74be71c3c60411922b5424e875d7692ea638b78";
+    date   = "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}";
@@ -1570,6 +1596,16 @@ let
     buildInputs = [ tools ];
   };
 
+  go-rice = buildFromGitHub {
+    rev    = "4f3c5af2322e393f305d9674845bc36cd1dea589";
+    date   = "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";
@@ -1593,6 +1629,14 @@ let
     sha256 = "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6";
   };
 
+  go-spew = buildFromGitHub {
+    rev    = "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d";
+    date   = "2015-11-05";
+    owner  = "davecgh";
+    repo   = "go-spew";
+    sha256 = "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk";
+  };
+
   go-sqlite3 = buildFromGitHub {
     rev    = "b4142c444a8941d0d92b0b7103a24df9cd815e42";
     date   = "2015-07-29";
@@ -1656,6 +1700,14 @@ let
     sha256 = "1rway6sls6fl2s2jk20ajj36rrlzh9944ncc9pdd19kifix54z32";
   };
 
+  go-zipexe = buildFromGitHub {
+    rev    = "a5fe2436ffcb3236e175e5149162b41cd28bd27d";
+    date   = "2015-03-29";
+    owner  = "daaku";
+    repo   = "go.zipexe";
+    sha256 = "0vi5pskhifb6zw78w2j97qbhs09zmrlk4b48mybgk5b3sswp6510";
+  };
+
   go-zookeeper = buildFromGitHub {
     rev    = "5bb5cfc093ad18a28148c578f8632cfdb4d802e4";
     date   = "2015-06-02";
@@ -3015,6 +3067,14 @@ let
     sha256 = "010jsclnmkaywdlyfqdmq372q7kh3qbz2zra0c4wn91qnkmkrnw1";
   };
 
+  rsrc = buildFromGitHub {
+    rev    = "ba14da1f827188454a4591717fff29999010887f";
+    date   = "2015-11-03";
+    owner  = "akavel";
+    repo   = "rsrc";
+    sha256 = "0g9fj10xnxcv034c8hpcgbhswv6as0d8l176c5nfgh1lh6klmmzc";
+  };
+
   sandblast = buildGoPackage rec {
     rev = "694d24817b9b7b8bacb6d458b7989b30d7fe3555";
     name = "sandblast-${stdenv.lib.strings.substring 0 7 rev}";

From 23b76d310033c4db5e91635311f06b3672f450a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 21 Jan 2016 16:34:15 +0100
Subject: [PATCH 0231/2285] gozim: fix gozimhttpd with rice

Otherwise it does not run.
---
 pkgs/top-level/go-packages.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 812955f50e81..f7a2d8904f3b 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1206,6 +1206,13 @@ let
     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-assert = buildGoPackage rec {

From 9c1d8037c07340bd2b88645eeefb7cc30fc312a5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 21 Jan 2016 19:43:52 +0300
Subject: [PATCH 0232/2285] nixpkgs manual: add a section about passthru

---
 doc/stdenv.xml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index 8df23c911522..bab4a8b292e4 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -247,6 +247,39 @@ genericBuild
 
 </variablelist>
 
+<variablelist>
+  <title>Special variables</title>
+
+  <varlistentry>
+    <term><varname>passthru</varname></term>
+    <listitem><para>This is an attribute set which can be filled with arbitrary
+    values. For example:
+
+<programlisting>
+passthru = {
+  foo = "bar";
+  baz = {
+    value1 = 4;
+    value2 = 5;
+  };
+}
+</programlisting>
+
+</para>
+
+    <para>Values inside it are not passed to the builder, so you can change
+    them without triggering a rebuild. However, they can be accessed outside of a
+    derivation directly, as if they were set inside a derivation itself, e.g.
+    <literal>hello.baz.value1</literal>. We don't specify any usage or
+    schema of <literal>passthru</literal> - it is meant for values that would be
+    useful outside the derivation in other parts of a Nix expression (e.g. in other
+    derivations). An example would be to convey some specific dependency of your
+    derivation which contains a program with plugins support.  Later, others who
+    make derivations with plugins can use passed-through dependency to ensure that
+    their plugin would be binary-compatible with built program.</para></listitem>
+  </varlistentry>
+
+</variablelist>
 
 </section>
 

From 3ade072aade5ba4ce4a09ce286f4229070926f22 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 21 Jan 2016 12:38:03 +0300
Subject: [PATCH 0233/2285] nixos changelog: mention CUPS changes

---
 .../doc/manual/release-notes/rl-unstable.xml  | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index cd828dfc8887..ffe8171171ac 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -145,6 +145,26 @@ nginx.override {
     from the ELPA, MELPA, and MELPA Stable repositories.
     </para>
   </listitem>
+
+  <listitem>
+    <para>CUPS, installed by <literal>services.printing</literal> module, now
+    has its data directory in <filename>/var/lib/cups</filename>. Old
+    configurations from <filename>/etc/cups</filename> are moved there
+    automatically, but there might be problems. Also configuration options
+    <literal>services.printing.cupsdConf</literal> and
+    <literal>services.printing.cupsdFilesConf</literal> were removed
+    because they had been allowing one to override configuration variables
+    required for CUPS to work at all on NixOS. For most use cases,
+    <literal>services.printing.extraConf</literal> and new option
+    <literal>services.printing.extraFilesConf</literal> should be enough;
+    if you encounter a situation when they are not, please file a bug.</para>
+
+    <para>There are also Gutenprint improvements; in particular, a new option
+    <literal>services.printing.gutenprint</literal> is added to enable automatic
+    updating of Gutenprint PPMs; it's greatly recommended to enable it instead
+    of adding <literal>gutenprint</literal> to the <literal>drivers</literal> list.
+    </para>
+  </listitem>
 </itemizedlist>
 
 

From 767f7c8901f9dab673d1371f0d8bdb5cad0796c8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 21 Jan 2016 18:21:43 +0100
Subject: [PATCH 0234/2285] libreoffice: libgltf src: fix subDir with missing
 slash in the end

---
 .../office/libreoffice/libreoffice-srcs-additions.sh            | 2 +-
 pkgs/applications/office/libreoffice/libreoffice-srcs.nix       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.sh b/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.sh
index dcc12a1a7b05..d505aa7a4cbb 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.sh
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs-additions.sh
@@ -1 +1 @@
-EVAL additions_libgltf='  subDir = "libgltf";'
+EVAL additions_libgltf='  subDir = "libgltf/";'
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index cf9a2711347b..a70d5a7c77c3 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -323,7 +323,7 @@
   name = "libgltf-0.0.2.tar.bz2";
   md5 = "d63a9f47ab048f5009d90693d6aa6424";
   brief = true;
-  subDir = "libgltf";
+  subDir = "libgltf/";
 }
 {
   name = "liblangtag-0.5.1.tar.bz2";

From 71ab92a39628b79b1f038874fae6501ee1bcf201 Mon Sep 17 00:00:00 2001
From: Simon Vandel Sillesen <simon.vandel@gmail.com>
Date: Wed, 20 Jan 2016 10:10:51 +0100
Subject: [PATCH 0235/2285] qbittorrent: 3.3.1 -> 3.3.3

---
 pkgs/applications/networking/p2p/qbittorrent/default.nix | 4 ++--
 .../networking/p2p/qbittorrent/fix-lrelease.patch        | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/p2p/qbittorrent/default.nix b/pkgs/applications/networking/p2p/qbittorrent/default.nix
index bc5289f80935..31931aa75d92 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/default.nix
+++ b/pkgs/applications/networking/p2p/qbittorrent/default.nix
@@ -10,11 +10,11 @@ assert guiSupport -> (dbus_libs != null);
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "qbittorrent-${version}";
-  version = "3.3.1";
+  version = "3.3.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/qbittorrent/${name}.tar.xz";
-    sha256 = "1li9law732n4vc7sn6i92pwxn8li7ypqaxcmfpm17kk978immlfs";
+    sha256 = "0lyv230vqwb77isjqm6fwwgv8hdap88zir9yrccj0qxj7zf8p3cw";
   };
 
   nativeBuildInputs = [ pkgconfig which ];
diff --git a/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch b/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch
index 9e3e484667fe..a906803e4336 100644
--- a/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch
+++ b/pkgs/applications/networking/p2p/qbittorrent/fix-lrelease.patch
@@ -1,12 +1,17 @@
 diff --git a/qm_gen.pri b/qm_gen.pri
-index ed29b76..2d5990c 100644
+index 5454440..2d5990c 100644
 --- a/qm_gen.pri
 +++ b/qm_gen.pri
-@@ -5,7 +5,7 @@ isEmpty(QMAKE_LRELEASE) {
+@@ -5,12 +5,7 @@ isEmpty(QMAKE_LRELEASE) {
      win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
      else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
      unix {
+-      equals(QT_MAJOR_VERSION, 4) {
 -        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 }
+-      } 
+-      equals(QT_MAJOR_VERSION, 5) {
+-        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt5 }
+-      }
 +        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
      } else {
          !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }

From c21f9365b805491351e500e53bff66d0e50af472 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 21 Jan 2016 20:06:57 +0100
Subject: [PATCH 0236/2285] release.nix: remove troubling glib-tested, add
 python

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

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 2be6201ab065..f9aa4dbc0769 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -40,11 +40,15 @@ let
               jobs.stdenv.x86_64-darwin
               jobs.linux.x86_64-linux
               jobs.linux.i686-linux
+              jobs.python.x86_64-linux
+              jobs.python.i686-linux
+              jobs.python.x86_64-darwin
+              jobs.python3.x86_64-linux
+              jobs.python3.i686-linux
+              jobs.python3.x86_64-darwin
               # Ensure that X11/GTK+ are in order.
               jobs.thunderbird.x86_64-linux
               jobs.thunderbird.i686-linux
-              jobs.glib-tested.x86_64-linux # standard glib doesn't do checks
-              jobs.glib-tested.i686-linux
               # Ensure that basic stuff works on darwin
               jobs.git.x86_64-darwin
               jobs.mysql.x86_64-darwin

From 93e17506ee1df1b6ff381cb217cc98bd5e4c4a34 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Mon, 18 Jan 2016 22:07:03 +0100
Subject: [PATCH 0237/2285] Rewrite acpid module in a more generic way

---
 nixos/modules/services/hardware/acpid.nix | 176 ++++++----------------
 1 file changed, 45 insertions(+), 131 deletions(-)

diff --git a/nixos/modules/services/hardware/acpid.nix b/nixos/modules/services/hardware/acpid.nix
index 48b2b6be09ed..bb17c8859d84 100644
--- a/nixos/modules/services/hardware/acpid.nix
+++ b/nixos/modules/services/hardware/acpid.nix
@@ -4,112 +4,39 @@ with lib;
 
 let
 
+  canonicalHandlers = {
+    powerEvent = {
+      event = "button/power.*";
+      action = config.services.acpid.powerEventCommands;
+    };
+
+    lidEvent = {
+      event = "button/lid.*";
+      action = config.services.acpid.lidEventCommands;
+    };
+
+    acEvent = {
+      event = "ac_adapter.*";
+      action = config.services.acpid.acEventCommands;
+    };
+  };
+
   acpiConfDir = pkgs.runCommand "acpi-events" {}
     ''
       mkdir -p $out
       ${
         # Generate a configuration file for each event. (You can't have
         # multiple events in one config file...)
-        let f = event:
+        let f = name: handler:
           ''
-            fn=$out/${event.name}
-            echo "event=${event.event}" > $fn
-            echo "action=${pkgs.writeScript "${event.name}.sh" event.action}" >> $fn
+            fn=$out/${name}
+            echo "event=${handler.event}" > $fn
+            echo "action=${pkgs.writeScript "${name}.sh" (concatStringsSep "\n" [ "#! ${pkgs.bash}/bin/sh" handler.action ])}" >> $fn
           '';
-        in lib.concatMapStrings f events
+        in concatStringsSep "\n" (mapAttrsToList f (canonicalHandlers // config.services.acpid.handlers))
       }
     '';
 
-  events = [powerEvent lidEvent acEvent muteEvent volumeDownEvent volumeUpEvent cdPlayEvent cdNextEvent cdPrevEvent];
-
-  # Called when the power button is pressed.
-  powerEvent =
-    { name = "power-button";
-      event = "button/power.*";
-      action =
-        ''
-          #! ${pkgs.bash}/bin/sh
-          ${config.services.acpid.powerEventCommands}
-        '';
-    };
-
-  # Called when the laptop lid is opened/closed.
-  lidEvent =
-    { name = "lid";
-      event = "button/lid.*";
-      action =
-        ''
-          #! ${pkgs.bash}/bin/sh
-          ${config.services.acpid.lidEventCommands}
-        '';
-    };
-
-  # Called when the AC power is connected or disconnected.
-  acEvent =
-    { name = "ac-power";
-      event = "ac_adapter.*";
-      action =
-        ''
-          #! ${pkgs.bash}/bin/sh
-          ${config.services.acpid.acEventCommands}
-        '';
-    };
-
-  muteEvent = {
-    name = "mute";
-    event = "button/mute.*";
-    action = ''
-      #! ${pkgs.bash}/bin/sh
-      ${config.services.acpid.muteCommands}
-    '';
-  };
-
-  volumeDownEvent = {
-    name = "volume-down";
-    event = "button/volumedown.*";
-    action = ''
-      #! ${pkgs.bash}/bin/sh
-      ${config.services.acpid.volumeDownEventCommands}
-    '';
-  };
-
-  volumeUpEvent = {
-    name = "volume-up";
-    event = "button/volumeup.*";
-    action = ''
-      #! ${pkgs.bash}/bin/sh
-      ${config.services.acpid.volumeUpEventCommands}
-    '';
-  };
-
-  cdPlayEvent = {
-    name = "cd-play";
-    event = "cd/play.*";
-    action = ''
-      #! ${pkgs.bash}/bin/sh
-      ${config.services.acpid.cdPlayEventCommands}
-    '';
-  };
-
-  cdNextEvent = {
-    name = "cd-next";
-    event = "cd/next.*";
-    action = ''
-      #! ${pkgs.bash}/bin/sh
-      ${config.services.acpid.cdNextEventCommands}
-    '';
-  };
-
-  cdPrevEvent = {
-    name = "cd-prev";
-    event = "cd/prev.*";
-    action = ''
-      #! ${pkgs.bash}/bin/sh
-      ${config.services.acpid.cdPrevEventCommands}
-    '';
-  };
-
-
 in
 
 {
@@ -126,6 +53,29 @@ in
         description = "Whether to enable the ACPI daemon.";
       };
 
+      handlers = mkOption {
+        type = types.attrsOf (types.submodule {
+          options = {
+            event = mkOption {
+              type = types.str;
+              example = [ "button/power.*" "button/lid.*" "ac_adapter.*" "button/mute.*" "button/volumedown.*" "cd/play.*" "cd/next.*" ];
+              description = "Event type.";
+            };
+
+            action = mkOption {
+              type = types.lines;
+              description = "Shell commands to execute when the event is triggered.";
+            };
+          };
+        });
+
+        description = "Event handlers.";
+        default = {};
+        example = { mute = { event = "button/mute.*"; action = "amixer set Master toggle"; }; };
+
+
+      };
+
       powerEventCommands = mkOption {
         type = types.lines;
         default = "";
@@ -144,42 +94,6 @@ in
         description = "Shell commands to execute on an ac_adapter.* event.";
       };
 
-      muteCommands = mkOption {
-        type = types.lines;
-        default = "";
-        description = "Shell commands to execute on an button/mute.* event.";
-      };
-
-      volumeDownEventCommands = mkOption {
-        type = types.lines;
-        default = "";
-        description = "Shell commands to execute on an button/volumedown.* event.";
-      };
-
-      volumeUpEventCommands = mkOption {
-        type = types.lines;
-        default = "";
-        description = "Shell commands to execute on an button/volumeup.* event.";
-      };
-
-      cdPlayEventCommands = mkOption {
-        type = types.lines;
-        default = "";
-        description = "Shell commands to execute on an cd/play.* event.";
-      };
-
-      cdNextEventCommands = mkOption {
-        type = types.lines;
-        default = "";
-        description = "Shell commands to execute on an cd/next.* event.";
-      };
-
-      cdPrevEventCommands = mkOption {
-        type = types.lines;
-        default = "";
-        description = "Shell commands to execute on an cd/prev.* event.";
-      };
-
     };
 
   };

From 3b64fec18dff995afd343bce22a2c404a72449d1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 21 Jan 2016 18:32:19 +0100
Subject: [PATCH 0238/2285] eid-mw: 4.1.12 -> 4.1.13

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

diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index 725242914414..ff062ab50946 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gtk3, nssTools, pcsclite
 , pkgconfig }:
 
-let version = "4.1.12"; in
+let version = "4.1.13"; in
 stdenv.mkDerivation {
   name = "eid-mw-${version}";
 
   src = fetchFromGitHub {
-    sha256 = "12nnzh3idnl5bdjqmm8si5nj7yr42mkxhzq70s760bnfmvbqgbmc";
+    sha256 = "1fkazhw6gs191w789fnp6mwnxrx9p38b3kh5bngb1ir0zhkgghkq";
     rev = "v${version}";
     repo = "eid-mw";
     owner = "Fedict";

From eda3e938d720b6415cb4f1a76838712d755b00c1 Mon Sep 17 00:00:00 2001
From: Thomas Bereknyei <tomberek@gmail.com>
Date: Thu, 21 Jan 2016 17:16:02 -0500
Subject: [PATCH 0239/2285] IHaskell: remove un-needed inherit

---
 nixos/modules/services/misc/ihaskell.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix
index 13c41466eab2..d0e9b839e754 100644
--- a/nixos/modules/services/misc/ihaskell.nix
+++ b/nixos/modules/services/misc/ihaskell.nix
@@ -6,7 +6,6 @@ let
 
   cfg = config.services.ihaskell;
   ihaskell = pkgs.ihaskell.override {
-    inherit (cfg.haskellPackages) ihaskell ghcWithPackages;
     packages = self: cfg.extraPackages self;
   };
 

From 9e2bb09ea07d889d546d444e2fc2a6963fd48513 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Mon, 11 Jan 2016 22:19:21 +0100
Subject: [PATCH 0240/2285] wine[-stable,tricks]: version updates

wine-unstable, wine-staging: 1.9.0    -> 1.9.1
winetricks:                  20151116 -> 20160109
---
 pkgs/misc/emulators/wine/versions.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix
index 7858a655b4e0..56a20a971ef9 100644
--- a/pkgs/misc/emulators/wine/versions.nix
+++ b/pkgs/misc/emulators/wine/versions.nix
@@ -12,8 +12,8 @@ rec {
     monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c";
   };
   unstable = {
-    wineVersion = "1.9.0";
-    wineSha256 = "1yfmcckb8biyp1d4czjxlfd10537dpi636g3zsj1cxp7jyn228mp";
+    wineVersion = "1.9.1";
+    wineSha256 = "1dhbp2jy9s3rqsbgc43jz967n2rls8dwdfi96qdxybg8kbxnachb";
     inherit (stable)
       geckoVersion geckoSha256
       gecko64Version gecko64Sha256
@@ -21,10 +21,10 @@ rec {
   };
   staging = {
     version = unstable.wineVersion;
-    sha256 = "1frp7zrgvx24m6yqmpvsz99rn18jjgg1bxl5qgcsf3kiych4i8r1";
+    sha256 = "05072wgxy8n6i71bb6649sm0ggh5c4g97clryrr8vkmgsklfkadi";
   };
   winetricks = {
-    version = "20151116";
-    sha256 = "1iih2b85s7f4if1mn36infc43hd4pdp8bl84q0nml3gh3fh8zqpr";
+    version = "20160109";
+    sha256 = "0pnl5362g5q7py368vj07swbdp1fqbpvpq4jv4l5ddyclps8ajg8";
   };
 }

From c38fae0a2c9b4f53d160333f6331cc51c473f3a3 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 21 Jan 2016 23:16:22 +0000
Subject: [PATCH 0241/2285] packer: 0.7.5 -> 0.8.6

---
 pkgs/development/tools/packer/default.nix |   2 +-
 pkgs/development/tools/packer/deps.nix    | 662 ++++++++++++----------
 2 files changed, 363 insertions(+), 301 deletions(-)

diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix
index 651e64467c49..716b489d3d77 100644
--- a/pkgs/development/tools/packer/default.nix
+++ b/pkgs/development/tools/packer/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, go, gox, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "packer-0.7.5";
+  name = "packer-0.8.6";
 
   src = import ./deps.nix {
     inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub;
diff --git a/pkgs/development/tools/packer/deps.nix b/pkgs/development/tools/packer/deps.nix
index e2272574f81e..5f8e69679c18 100644
--- a/pkgs/development/tools/packer/deps.nix
+++ b/pkgs/development/tools/packer/deps.nix
@@ -4,205 +4,21 @@
 let
   goDeps = [
     {
-      root = "code.google.com/p/go.crypto";
-      src = fetchhg {
-        url = "https://code.google.com/p/go.crypto";
-        rev = "235";
-        sha256 = "0b3nlkhmraj84n9mhg5nqcd3815ipyj1xx1yzkajcdf2pz2ym4l6";
-      };
-    }
-    {
-      root = "code.google.com/p/goauth2";
-      src = fetchhg {
-        url = "https://code.google.com/p/goauth2";
-        rev = "80";
-        sha256 = "0xgkgcb97hv2rvzvh21rvydq5cc83j7sdsdb1chrymq8k7l4dzc1";
-      };
-    }
-    {
-      root = "code.google.com/p/google-api-go-client";
-      src = fetchhg {
-        url = "https://code.google.com/p/google-api-go-client";
-        rev = "135";
-        sha256 = "17a0mlq76cmgv84xh5vjzi72r6rjq0abl6gv3zkbmj3cphl9cis9";
-      };
-    }
-    {
-      root = "code.google.com/p/goprotobuf";
-      src = fetchhg {
-        url = "https://code.google.com/p/goprotobuf";
-        rev = "267";
-        sha256 = "0kamslfmxs6hi9ww52izmsq48ldaf67xawwhzwwdsbslhv0b9lf7";
-      };
-    }
-    {
-      root = "code.google.com/p/gosshold";
-      src = fetchhg {
-        url = "https://code.google.com/p/gosshold";
-        rev = "2";
-        sha256 = "1ljl8pcxxfz5rv89b2ajd31gxxzifl57kzpksvdhyjdxh98gkvg8";
-      };
-    }
-    {
-      root = "github.com/ActiveState/tail";
-      src = fetchFromGitHub {
-        owner = "ActiveState";
-        repo = "tail";
-        rev = "068b72961a6bc5b4a82cf4fc14ccc724c0cfa73a";
-        sha256 = "08zwlrsyr75cqdar51cihhp1qfm6wnn03i9srdkyzllw4zfymcd2";
-      };
-    }
-    {
-      root = "github.com/bmizerany/assert";
-      src = fetchFromGitHub {
-        owner = "bmizerany";
-        repo = "assert";
-        rev = "e17e99893cb6509f428e1728281c2ad60a6b31e3";
-        sha256 = "1lfrvqqmb09y6pcr76yjv4r84cshkd4s7fpmiy7268kfi2cvqnpc";
-      };
-    }
-    {
-      root = "github.com/going/toolkit";
-      src = fetchFromGitHub {
-        owner = "going";
-        repo = "toolkit";
-        rev = "6185c1893604d52d36a97dd6bb1247ace93a9b80";
-        sha256 = "1kzy5yppalcidsmv5yxmr6lpqplqj07kdqpn77fdp6fbb0y0sg11";
-      };
-    }
-    {
-      root = "github.com/golang/protobuf";
-      src = fetchFromGitHub {
-        owner = "golang";
-        repo = "protobuf";
-        rev = "a11b6342f0e28eab4059c0cabbad38cef38b9b6e";
-        sha256 = "1bjig0bwgw1r56r8paskm880lw36nh4c6n64v4ww6mszwmk7dkn7";
-      };
-    }
-    {
-      root = "github.com/hashicorp/atlas-go";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "atlas-go";
-        rev = "137646809ce33b755be51e5e82b40775217ff74d";
-        sha256 = "06ilw0bwd3ijfcpkg84j3q9gwgllzwg0g6gab3w08cn1p49jicjg";
-      };
-    }
-    {
-      root = "github.com/hashicorp/go-checkpoint";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "go-checkpoint";
-        rev = "efefdc69845f7fa7245d20827d31fb27b848d955";
-        sha256 = "1vpi414bw3rsyg5rx52hpvjhnk2qazmsvl3f13g79zwwkvbj2vvq";
-      };
-    }
-    {
-      root = "github.com/hashicorp/go-msgpack";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "go-msgpack";
-        rev = "71c2886f5a673a35f909803f38ece5810165097b";
-        sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j";
-      };
-    }
-    {
-      root = "github.com/hashicorp/go-version";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "go-version";
-        rev = "bb92dddfa9792e738a631f04ada52858a139bcf7";
-        sha256 = "0fl5a6j6nk1xsxwjdpa24a24fxvgnvm3jjlgpyrnmbdn380zil3m";
-      };
-    }
-    {
-      root = "github.com/hashicorp/yamux";
-      src = fetchFromGitHub {
-        owner = "hashicorp";
-        repo = "yamux";
-        rev = "9feabe6854fadca1abec9cd3bd2a613fe9a34000";
-        sha256 = "03lgbhwhiqk6rivc5cl6zxph5n2pdbdz95h0x7m0ngp3yk3aqgan";
-      };
-    }
-    {
-      root = "github.com/howeyc/fsnotify";
-      src = fetchFromGitHub {
-        owner = "howeyc";
-        repo = "fsnotify";
-        rev = "4894fe7efedeeef21891033e1cce3b23b9af7ad2";
-        sha256 = "09r3h200nbw8a4d3rn9wxxmgma2a8i6ssaplf3zbdc2ykizsq7mn";
-      };
-    }
-    {
-      root = "github.com/kr/pretty";
-      src = fetchFromGitHub {
-        owner = "kr";
-        repo = "pretty";
-        rev = "cb0850c1681cbca3233e84f7e6ec3e4c3f352085";
-        sha256 = "0j3jd7qlfv6iw7icn66y1fpdn88ri29n9qv9di92mkc6vjw4ifb1";
-      };
-    }
-    {
-      root = "github.com/kr/pty";
-      src = fetchFromGitHub {
-        owner = "kr";
-        repo = "pty";
-        rev = "05017fcccf23c823bfdea560dcc958a136e54fb7";
-        sha256 = "0f7xa8lkazif2jzacryryrg8rqz5lfl3j7hqvnis4qa8cjy5dpqb";
-      };
-    }
-    {
-      root = "github.com/kr/text";
-      src = fetchFromGitHub {
-        owner = "kr";
-        repo = "text";
-        rev = "6807e777504f54ad073ecef66747de158294b639";
-        sha256 = "1wkszsg08zar3wgspl9sc8bdsngiwdqmg3ws4y0bh02sjx5a4698";
-      };
-    }
-    {
-      root = "github.com/mitchellh/cli";
+      root = "github.com/mitchellh/packer";
       src = fetchFromGitHub {
         owner = "mitchellh";
-        repo = "cli";
-        rev = "e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0";
-        sha256 = "1fwf7wmlhri19bl2yyjd4zlgndgwwqrdry45clpszzjsr8b5wfgm";
+        repo = "packer";
+        rev = "f8f7b7a34c1be06058f5aca23a51247db12cdbc5";
+        sha256 = "162ja4klyb3nv44rhdg2gd3xrr4n0l0gi49cn1mr1s2h9yznphyp";
       };
     }
     {
-      root = "github.com/mitchellh/go-fs";
+      root = "github.com/mitchellh/gox";
       src = fetchFromGitHub {
         owner = "mitchellh";
-        repo = "go-fs";
-        rev = "faaa223588dd7005e49bf66fa2d19e35c8c4d761";
-        sha256 = "19jsvy35g14f18ckymzxasy0zfd6n99zlqg6grpj1yqdfxfvqn9b";
-      };
-    }
-    {
-      root = "github.com/mitchellh/go-vnc";
-      src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "go-vnc";
-        rev = "fc93dd80f5da4ccde0a9d97f0c73e56e04e0cf72";
-        sha256 = "03rwsp1frvfx6c7yxr711lq7jdgsr1gcwg14jw26xvbzzxwjvnsf";
-      };
-    }
-    {
-      root = "github.com/mitchellh/goamz";
-      src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "goamz";
-        rev = "6932a73f35dfdd5489a95284552c0ae868be0944";
-        sha256 = "03hbakfxvxkj1r0xy2c4b8xpb7bw6nbryyxpwlii6qv7gsx478yw";
-      };
-    }
-    {
-      root = "github.com/mitchellh/gophercloud-fork-40444fb";
-      src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "gophercloud-fork-40444fb";
-        rev = "40444fbc2b10960682b34e6822eb9179216e1ae1";
-        sha256 = "06bm7hfi03c75npzy51wbl9qyln35c3kzj9yn2w4fhn0k9dia9s3";
+        repo = "gox";
+        rev = "ef1967b9f538fe467e6a82fc42ec5dff966ad4ea";
+        sha256 = "0i9s8fp6m2igx93ffv3rf5v5hz7cwrx7pbxrz4cg94hba3sy3nfj";
       };
     }
     {
@@ -210,8 +26,71 @@ let
       src = fetchFromGitHub {
         owner = "mitchellh";
         repo = "iochan";
-        rev = "b584a329b193e206025682ae6c10cdbe03b0cd77";
-        sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b";
+        rev = "87b45ffd0e9581375c491fef3d32130bb15c5bd7";
+        sha256 = "1435kdcx3j1xgr6mm5c7w7hjx015jb20yfqlkp93q143hspf02fx";
+      };
+    }
+    {
+      root = "github.com/hashicorp/atlas-go";
+      src = fetchFromGitHub {
+        owner = "hashicorp";
+        repo = "atlas-go";
+        rev = "d1d08e8e25f0659388ede7bb8157aaa4895f5347";
+        sha256 = "0bbqh94i8qllp51ln1mmcjy5srny7s4xg0l353kccvk3c7s68m03";
+      };
+    }
+    {
+      root = "github.com/hashicorp/go-checkpoint";
+      src = fetchFromGitHub {
+        owner = "hashicorp";
+        repo = "go-checkpoint";
+        rev = "88326f6851319068e7b34981032128c0b1a6524d";
+        sha256 = "1npasn9lmvx57nw3wkswwvl5k0wmn01jpalbwv832x5wq4r0nsz4";
+      };
+    }
+    {
+      root = "github.com/hashicorp/go-msgpack";
+      src = fetchFromGitHub {
+        owner = "hashicorp";
+        repo = "go-msgpack";
+        rev = "fa3f63826f7c23912c15263591e65d54d080b458";
+        sha256 = "1f6rd6bm2dm2rk46x8cqrxh5nks1gpk6dvvsag7s5pdjgdxy951k";
+      };
+    }
+    {
+      root = "github.com/hashicorp/go-multierror";
+      src = fetchFromGitHub {
+        owner = "hashicorp";
+        repo = "go-multierror";
+        rev = "56912fb08d85084aa318edcf2bba735b97cf35c5";
+        sha256 = "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r";
+      };
+    }
+    {
+      root = "github.com/hashicorp/go-version";
+      src = fetchFromGitHub {
+        owner = "hashicorp";
+        repo = "go-version";
+        rev = "999359b6b7a041ce16e695d51e92145b83f01087";
+        sha256 = "0z2bzphrdkaxh5vnvjh3g25d6cykchshwwbyqgji91mpgjd30pbm";
+      };
+    }
+    {
+      root = "github.com/hashicorp/yamux";
+      src = fetchFromGitHub {
+        owner = "hashicorp";
+        repo = "yamux";
+        rev = "ae139c4ae7fe21e9d99459d2acc57967cebb6918";
+        sha256 = "1p5h2wklj8lb1vnjnd5kw7cshfmiw7jmzw9radln955hzd5xzbnl";
+      };
+    }
+    {
+      root = "github.com/mitchellh/cli";
+      src = fetchFromGitHub {
+        owner = "mitchellh";
+        repo = "cli";
+        rev = "8102d0ed5ea2709ade1243798785888175f6e415";
+        sha256 = "08mj1l94pww72jy34gk9a483hpic0rrackskfw13r3ycy997w7m2";
       };
     }
     {
@@ -219,17 +98,8 @@ let
       src = fetchFromGitHub {
         owner = "mitchellh";
         repo = "mapstructure";
-        rev = "442e588f213303bec7936deba67901f8fc8f18b1";
-        sha256 = "076svhy5jlnw4jykm3dsrx2dswifajrpr7d09mz9y6g3lg901rqd";
-      };
-    }
-    {
-      root = "github.com/mitchellh/multistep";
-      src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "multistep";
-        rev = "162146fc57112954184d90266f4733e900ed05a5";
-        sha256 = "0ydhbxziy9204qr43pjdh88y2jg34g2mhzdapjyfpf8a1rin6dn3";
+        rev = "281073eb9eb092240d33ef253c404f1cca550309";
+        sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh";
       };
     }
     {
@@ -241,15 +111,6 @@ let
         sha256 = "02pczqml6p1mnfdrygm3rs02g0r65qx8v1bi3x24dx8wv9dr5y23";
       };
     }
-    {
-      root = "github.com/mitchellh/packer";
-      src = fetchFromGitHub {
-        owner = "mitchellh";
-        repo = "packer";
-        rev = "e3c2f01cb8d8f759c02bd3cfc9d27cc1a941d498";
-        sha256 = "0sp2qjdsf0cqmw11a3vfs9alyz76vf415vv71bwdarfagz466inw";
-      };
-    }
     {
       root = "github.com/mitchellh/panicwrap";
       src = fetchFromGitHub {
@@ -269,12 +130,114 @@ let
       };
     }
     {
-      root = "github.com/motain/gocheck";
+      root = "github.com/mitchellh/reflectwalk";
       src = fetchFromGitHub {
-        owner = "motain";
-        repo = "gocheck";
-        rev = "9beb271d26e640863a5bf4a3c5ea40ccdd466b84";
-        sha256 = "07arpwfdb51b5f7kzqnm5s5ndfmxv5j793hpn30nbdcya46diwjd";
+        owner = "mitchellh";
+        repo = "reflectwalk";
+        rev = "eecf4c70c626c7cfbb95c90195bc34d386c74ac6";
+        sha256 = "1nm2ig7gwlmf04w7dbqd8d7p64z2030fnnfbgnd56nmd7dz8gpxq";
+      };
+    }
+    {
+      root = "github.com/mitchellh/go-fs";
+      src = fetchFromGitHub {
+        owner = "mitchellh";
+        repo = "go-fs";
+        rev = "a34c1b9334e86165685a9449b782f20465eb8c69";
+        sha256 = "11sy85p77ffmavpiichzybrfvjm1ilsi4clx98n3363arksavs5i";
+      };
+    }
+    {
+      root = "github.com/mitchellh/goamz";
+      src = fetchFromGitHub {
+        owner = "mitchellh";
+        repo = "goamz";
+        rev = "caaaea8b30ee15616494ee68abd5d8ebbbef05cf";
+        sha256 = "0bshq69ir9h2nszbr74yvcg5wnd9a5skfmr9bgk014k9wwk7dc72";
+      };
+    }
+    {
+      root = "github.com/mitchellh/multistep";
+      src = fetchFromGitHub {
+        owner = "mitchellh";
+        repo = "multistep";
+        rev = "162146fc57112954184d90266f4733e900ed05a5";
+        sha256 = "0ydhbxziy9204qr43pjdh88y2jg34g2mhzdapjyfpf8a1rin6dn3";
+      };
+    }
+    {
+      root = "github.com/ActiveState/tail";
+      src = fetchFromGitHub {
+        owner = "ActiveState";
+        repo = "tail";
+        rev = "4b368d1590196ade29993d6a0896591403180bbd";
+        sha256 = "183y44skn75lkpsjd3zlbx8vc3b930p3nkpc1ybq3k50s4bzhsll";
+      };
+    }
+    {
+      root = "google.golang.org/api";
+      src = fetchgit {
+        url = "https://github.com/google/google-api-go-client.git";
+        rev = "a5c3e2a4792aff40e59840d9ecdff0542a202a80";
+        sha256 = "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8";
+      };
+    }
+    {
+      root = "golang.org/x/crypto";
+      src = fetchgit {
+        url = "https://go.googlesource.com/crypto.git";
+        rev = "81bf7719a6b7ce9b665598222362b50122dfc13b";
+        sha256 = "0rwzc2ls842d0g588b5xik59srwzawch3nb1dlcqwm4a1132mvmr";
+      };
+    }
+    {
+      root = "golang.org/x/oauth2";
+      src = fetchgit {
+        url = "https://go.googlesource.com/oauth2.git";
+        rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a";
+        sha256 = "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8";
+      };
+    }
+    {
+      root = "golang.org/x/net";
+      src = fetchgit {
+        url = "https://go.googlesource.com/net.git";
+        rev = "7654728e381988afd88e58cabfd6363a5ea91810";
+        sha256 = "08i6kkzbckbc5k15bdlqkbird48zmc24qr505hlxlb11djjgdiml";
+      };
+    }
+    {
+      root = "google.golang.org/appengine";
+      src = fetchgit {
+        url = "https://github.com/golang/appengine.git";
+        rev = "cdd515334b113fdc9b35cb1e7a3b457eeb5ad5cf";
+        sha256 = "0l0rddpfbddbi8kizg2n25w7bdhf99f0iz7ghwz7fq6k4rmq44ws";
+      };
+    }
+    {
+      root = "google.golang.org/cloud";
+      src = fetchgit {
+        url = "https://github.com/GoogleCloudPlatform/gcloud-golang.git";
+        rev = "e34a32f9b0ecbc0784865fb2d47f3818c09521d4";
+        sha256 = "1rzac44kzhd7r6abdy5qyj69y64wy9r73vnxsdalfr5m0i55fqk4";
+      };
+    }
+    {
+      root = "github.com/golang/protobuf";
+      src = fetchFromGitHub {
+        owner = "golang";
+        repo = "protobuf";
+        rev = "59b73b37c1e45995477aae817e4a653c89a858db";
+        sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa";
+      };
+    }
+    {
+      root = "github.com/mitchellh/gophercloud-fork-40444fb";
+      src = fetchFromGitHub {
+        owner = "mitchellh";
+        repo = "gophercloud-fork-40444fb";
+        rev = "40444fbc2b10960682b34e6822eb9179216e1ae1";
+        sha256 = "06bm7hfi03c75npzy51wbl9qyln35c3kzj9yn2w4fhn0k9dia9s3";
       };
     }
     {
@@ -287,39 +250,38 @@ let
       };
     }
     {
-      root = "github.com/rackspace/gophercloud";
+      root = "github.com/going/toolkit";
       src = fetchFromGitHub {
-        owner = "rackspace";
-        repo = "gophercloud";
-        rev = "d7f07fc0a7ff4b608c6f9e34197930093c7c7ee1";
-        sha256 = "1cyfvynwl5z6f9s0lmj92mhsriy7nl7kq5f8jay67wmdn0nhyybs";
+        owner = "going";
+        repo = "toolkit";
+        rev = "5bff591dc40da25dcc875d3fa1a3373d74d45411";
+        sha256 = "15gnlqignm7xcp2chrz7d7qqlibkbfrrsvbcysk8lrj9l7md8vjf";
       };
     }
     {
-      root = "github.com/rasa/oauth2-fork-b3f9a68";
+      root = "github.com/mitchellh/go-vnc";
       src = fetchFromGitHub {
-        owner = "rasa";
-        repo = "oauth2-fork-b3f9a68";
-        rev = "94a7bc9691e0841393b875eaad68fbfd069b2a18";
-        sha256 = "101bv0zwbchdql86x8c4qhvmlahkfcw4bnqw7v8hihqxd5zf9fxp";
+        owner = "mitchellh";
+        repo = "go-vnc";
+        rev = "723ed9867aed0f3209a81151e52ddc61681f0b01";
+        sha256 = "0nlya2rbmwb3jycqsyah1pn4386712mfrfiprprkbzcna9q7lp1h";
       };
     }
     {
-      root = "github.com/ugorji/go";
+      root = "github.com/howeyc/fsnotify";
       src = fetchFromGitHub {
-        owner = "ugorji";
-        repo = "go";
-        rev = "39815c8993d27d88435f3d267be35a6d26e43f03";
-        sha256 = "1g5nbcs3900chwv0jz1a9x0s3scxjhksi1268w112mq2k1rinq3j";
+        owner = "howeyc";
+        repo = "fsnotify";
+        rev = "4894fe7efedeeef21891033e1cce3b23b9af7ad2";
+        sha256 = "09r3h200nbw8a4d3rn9wxxmgma2a8i6ssaplf3zbdc2ykizsq7mn";
       };
     }
     {
-      root = "github.com/ugorji/go-msgpack";
-      src = fetchFromGitHub {
-        owner = "ugorji";
-        repo = "go-msgpack";
-        rev = "75092644046c5e38257395b86ed26c702dc95b92";
-        sha256 = "1bmqi16bfiqw7qhb3d5hbh0dfzhx2bbq1g15nh2pxwxckwh80x98";
+      root = "gopkg.in/tomb.v1";
+      src = fetchgit {
+        url = "https://gopkg.in/tomb.v1.git";
+        rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8";
+        sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
       };
     }
     {
@@ -332,101 +294,201 @@ let
       };
     }
     {
-      root = "github.com/vmihailenco/msgpack";
+      root = "github.com/aws/aws-sdk-go";
       src = fetchFromGitHub {
-        owner = "vmihailenco";
-        repo = "msgpack";
-        rev = "1efcd9943dd320d41d8a00189e568d794f1b4e78";
-        sha256 = "0brbrss7hja2d06cca633ggn5jawqwb8p0prp5cg1m26w9f3hzis";
+        owner = "aws";
+        repo = "aws-sdk-go";
+        rev = "f096b7d61df3d7d6d97f0e701f92616d1ea5420d";
+        sha256 = "0z2fknqxdyb5vw4am46cn60m15p9fjsqzpzaj2pamp436l0cpjkw";
       };
     }
     {
-      root = "github.com/xiocode/toolkit";
+      root = "github.com/digitalocean/godo";
       src = fetchFromGitHub {
-        owner = "xiocode";
-        repo = "toolkit";
-        rev = "352fd7c6700074a81056cdfc9e82b3e8c5681ac5";
-        sha256 = "0p33zh57xpxyk2wyp9xahdxyrkq48ysihpr0n9kj713q0dh7x4a3";
+        owner = "digitalocean";
+        repo = "godo";
+        rev = "2a0d64a42bb60a95677748a4d5729af6184330b4";
+        sha256 = "0854577b08fw9bjflk044ph16p15agxhh6xbzn71rhfvxg5yg5mi";
       };
     }
     {
-      root = "golang.org/x/crypto";
-      src = fetchgit {
-        url = "https://go.googlesource.com/crypto";
-        rev = "bfc286917c5fcb7420d7e3092b50bbfd31b38a98";
-        sha256 = "04ryvpbd2z4q4wqaffmj4wc541y744rfjg6arhwf4qn64r171am0";
+      root = "github.com/dylanmei/winrmtest";
+      src = fetchFromGitHub {
+        owner = "dylanmei";
+        repo = "winrmtest";
+        rev = "025617847eb2cf9bd1d851bc3b22ed28e6245ce5";
+        sha256 = "1i0wq6r1vm3nhnia3ycm5l590gyia7cwh6971ppnn4rrdmvsw2qh";
       };
     }
     {
-      root = "golang.org/x/net";
-      src = fetchgit {
-        url = "https://go.googlesource.com/net";
-        rev = "2033b3a5e8688bdd590c647ca70a12384ddc6824";
-        sha256 = "06zla6nja6af735b2rskb5l2pjggw99v05fl4n306dcnvwj3gvg6";
+      root = "github.com/klauspost/pgzip";
+      src = fetchFromGitHub {
+        owner = "klauspost";
+        repo = "pgzip";
+        rev = "47f36e165cecae5382ecf1ec28ebf7d4679e307d";
+        sha256 = "1bfka02xrhp4fg9pz2v4ppxa46b59bwy5n88c7hbbxqxm8z30yca";
       };
     }
     {
-      root = "golang.org/x/text";
-      src = fetchgit {
-        url = "https://go.googlesource.com/text";
-        rev = "bfad311ce93436dc888b40d76c78f99dc3104473";
-        sha256 = "1mbhp5q24drz2l2x6ib3180i42f9015ry80bn7jhr7rwizvyp6lh";
+      root = "github.com/masterzen/winrm";
+      src = fetchFromGitHub {
+        owner = "masterzen";
+        repo = "winrm";
+        rev = "54ea5d01478cfc2afccec1504bd0dfcd8c260cfa";
+        sha256 = "0qzdmsjgcf5n0jzjf4gd22lhqwn9yagynk1izjz3978gr025p2zm";
       };
     }
     {
-      root = "google.golang.org/appengine";
-      src = fetchgit {
-        url = "https://github.com/golang/appengine.git";
-        rev = "d1e7e222a24d1e085466ed8b44aedd572f5a51c4";
-        sha256 = "045dmq0m56m1n16fygdghmkaqh7xb2g80xrm7lkcbkf3763w8gfw";
+      root = "github.com/google/go-querystring";
+      src = fetchFromGitHub {
+        owner = "google";
+        repo = "go-querystring";
+        rev = "2a60fc2ba6c19de80291203597d752e9ba58e4c0";
+        sha256 = "0raf6r3dd8rxxppzrbhp1y6k5csgfkfs7b0jylj65sbg0hbzxvbr";
       };
     }
     {
-      root = "gopkg.in/check.v1";
-      src = fetchgit {
-        url = "https://gopkg.in/check.v1";
-        rev = "64131543e7896d5bcc6bd5a76287eb75ea96c673";
-        sha256 = "0ybxgxkkmfhgd4pmjf7hgpp7d7zxsskc7kv9dklqbaf6aszsqbxl";
+      root = "github.com/go-ini/ini";
+      src = fetchFromGitHub {
+        owner = "go-ini";
+        repo = "ini";
+        rev = "afbd495e5aaea13597b5e14fe514ddeaa4d76fc3";
+        sha256 = "0xi8zr9qw38sdbv95c2ip31yczbm4axdvmj3ljyivn9xh2nbxfia";
       };
     }
     {
-      root = "gopkg.in/tomb.v1";
-      src = fetchgit {
-        url = "https://gopkg.in/tomb.v1";
-        rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8";
-        sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv";
+      root = "github.com/klauspost/compress";
+      src = fetchFromGitHub {
+        owner = "klauspost";
+        repo = "compress";
+        rev = "112706bf3743c241303219f9c5ce2e6635f69221";
+        sha256 = "1gyf5hf8wivbx6s99x2rxq2a335b49av2xb43nikgbzm4qn7win7";
       };
     }
     {
-      root = "gopkg.in/vmihailenco/msgpack.v2";
-      src = fetchgit {
-        url = "https://gopkg.in/vmihailenco/msgpack.v2";
-        rev = "1efcd9943dd320d41d8a00189e568d794f1b4e78";
-        sha256 = "0brbrss7hja2d06cca633ggn5jawqwb8p0prp5cg1m26w9f3hzis";
+      root = "github.com/masterzen/simplexml";
+      src = fetchFromGitHub {
+        owner = "masterzen";
+        repo = "simplexml";
+        rev = "95ba30457eb1121fa27753627c774c7cd4e90083";
+        sha256 = "0pwsis1f5n4is0nmn6dnggymj32mldhbvihv8ikn3nglgxclz4kz";
       };
     }
     {
-      root = "labix.org/v2/mgo";
-      src = fetchbzr {
-        url = "https://launchpad.net/mgo/v2";
-        rev = "287";
-        sha256 = "0602x0liyp3w2v8cj1nyq73576vbxlxx1z1a8nn173pajxx9pm2z";
+      root = "github.com/masterzen/xmlpath";
+      src = fetchFromGitHub {
+        owner = "masterzen";
+        repo = "xmlpath";
+        rev = "13f4951698adc0fa9c1dda3e275d489a24201161";
+        sha256 = "1y81h7ymk3dp3w3a2iy6qd1dkm323rkxa27dzxw8vwy888j5z8bk";
       };
     }
     {
-      root = "launchpad.net/gocheck";
-      src = fetchbzr {
-        url = "https://launchpad.net/gocheck";
-        rev = "87";
-        sha256 = "1y9fa2mv61if51gpik9isls48idsdz87zkm1p3my7swjdix7fcl0";
+      root = "github.com/jmespath/go-jmespath";
+      src = fetchFromGitHub {
+        owner = "jmespath";
+        repo = "go-jmespath";
+        rev = "c01cf91b011868172fdcd9f41838e80c9d716264";
+        sha256 = "0gfrqwl648qngp77g8m1g9g7difggq2cac4ydjw9bpx4bd7mw1rw";
       };
     }
     {
-      root = "launchpad.net/mgo";
-      src = fetchbzr {
-        url = "https://launchpad.net/mgo";
-        rev = "2";
-        sha256 = "0h1dxzyx5c4r4gfnmjxv92hlhjxrgx9p4g53p4fhmz6x2fdglb0x";
+      root = "github.com/klauspost/cpuid";
+      src = fetchFromGitHub {
+        owner = "klauspost";
+        repo = "cpuid";
+        rev = "349c675778172472f5e8f3a3e0fe187e302e5a10";
+        sha256 = "1s8baj42k66ny77qkm3n06kwayk4srwf4b9ss42612f3h86ka5i2";
+      };
+    }
+    {
+      root = "github.com/nu7hatch/gouuid";
+      src = fetchFromGitHub {
+        owner = "nu7hatch";
+        repo = "gouuid";
+        rev = "179d4d0c4d8d407a32af483c2354df1d2c91e6c3";
+        sha256 = "1isyfix5w1wm26y3a15ha3nnpsxqaxz5ngq06hnh6c6y0inl2fwj";
+      };
+    }
+    {
+      root = "github.com/klauspost/crc32";
+      src = fetchFromGitHub {
+        owner = "klauspost";
+        repo = "crc32";
+        rev = "999f3125931f6557b991b2f8472172bdfa578d38";
+        sha256 = "00ws3hrszxdnyj0cjk9b8b44xc8x5hizm0h22x6m3bb4c5b487wv";
+      };
+    }
+    {
+      root = "github.com/pierrec/lz4";
+      src = fetchFromGitHub {
+        owner = "pierrec";
+        repo = "lz4";
+        rev = "383c0d87b5dd7c090d3cddefe6ff0c2ffbb88470";
+        sha256 = "0l23bmzqfvgh61zlikj6iakg0kz7lybs8zf0nscylskl2hlr09rp";
+      };
+    }
+    {
+      root = "github.com/packer-community/winrmcp";
+      src = fetchFromGitHub {
+        owner = "packer-community";
+        repo = "winrmcp";
+        rev = "3d184cea22ee1c41ec1697e0d830ff0c78f7ea97";
+        sha256 = "0g2rwwhykm1z099gwkg1nmb1ggnizqlm2pbmy3qsdvjnl5246ca4";
+      };
+    }
+    {
+      root = "github.com/dylanmei/iso8601";
+      src = fetchFromGitHub {
+        owner = "dylanmei";
+        repo = "iso8601";
+        rev = "2075bf119b58e5576c6ed9f867b8f3d17f2e54d4";
+        sha256 = "0px5aq4w96yyjii586h3049xm7rvw5r8w7ph3axhyismrqddqgx1";
+      };
+    }
+    {
+      root = "github.com/pierrec/xxHash";
+      src = fetchFromGitHub {
+        owner = "pierrec";
+        repo = "xxHash";
+        rev = "5a004441f897722c627870a981d02b29924215fa";
+        sha256 = "146ibrgvgh61jhbbv9wks0mabkci3s0m68sg6shmlv1yixkw6gja";
+      };
+    }
+    {
+      root = "github.com/satori/go.uuid";
+      src = fetchFromGitHub {
+        owner = "satori";
+        repo = "go.uuid";
+        rev = "d41af8bb6a7704f00bc3b7cba9355ae6a5a80048";
+        sha256 = "0lw8k39s7hab737rn4nngpbsganrniiv7px6g41l6f6vci1skyn2";
+      };
+    }
+    {
+      root = "github.com/rackspace/gophercloud";
+      src = fetchFromGitHub {
+        owner = "rackspace";
+        repo = "gophercloud";
+        rev = "680aa02616313d8399abc91f17a444cf9292f0e1";
+        sha256 = "0pxzvhh6l1gfn31k6g8fz3x4b6mz88cx2rgpims0ys5cl212zrp1";
+      };
+    }
+    {
+      root = "gopkg.in/fsnotify.v0";
+      src = fetchFromGitHub {
+        owner = "go-fsnotify";
+        repo = "fsnotify";
+        rev = "ea925a0a47d225b2ca7f9932b01d2ed4f3ec74f6";
+        sha256 = "15wqjpkfzsxnaxbz6y4r91hw6812g3sc4ipagxw1bya9klbnkdc9";
+      };
+    }
+    {
+      root = "github.com/tent/http-link-go";
+      src = fetchFromGitHub {
+        owner = "tent";
+        repo = "http-link-go";
+        rev = "ac974c61c2f990f4115b119354b5e0b47550e888";
+        sha256 = "1fph21b6vp4cm73fkkykffggi57m656x9fd1k369fr6jbvq5fffj";
       };
     }
   ];

From 40890b2b95b4bce62e1296855046d6cacbd440a2 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 6 Jan 2016 22:00:53 +0100
Subject: [PATCH 0242/2285] eclipseWithPlugins: lazier evaluation

Unfortunately the `readFile`/`writeText` functions forces realisation of
the eclipse package at evaluation time. By creating the configuration
file inside the build command we avoid realisation until installation.
---
 pkgs/applications/editors/eclipse/default.nix | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 3fed254d6e92..42cb0fa8914a 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -327,21 +327,20 @@ rec {
       dropinProp = "-D${dropinPropName}=${pluginEnv}/eclipse/dropins";
       jvmArgsText = stdenv.lib.concatStringsSep "\n" (jvmArgs ++ [dropinProp]);
 
-      # Prepare an eclipse.ini with the plugin directory.
-      origEclipseIni = builtins.readFile "${eclipse}/eclipse/eclipse.ini";
-      eclipseIniFile = writeText "eclipse.ini" ''
-        ${origEclipseIni}
-        ${jvmArgsText}
-      '';
-
       # Base the derivation name on the name of the underlying
       # Eclipse.
       name = (stdenv.lib.meta.appendToName "with-plugins" eclipse).name;
     in
       runCommand name { buildInputs = [ makeWrapper ]; } ''
-        mkdir -p $out/bin
+        mkdir -p $out/bin $out/etc
+
+        # Prepare an eclipse.ini with the plugin directory.
+        cat ${eclipse}/eclipse/eclipse.ini - > $out/etc/eclipse.ini <<EOF
+        ${jvmArgsText}
+        EOF
+
         makeWrapper ${eclipse}/bin/eclipse $out/bin/eclipse \
-          --add-flags "--launcher.ini ${eclipseIniFile}"
+          --add-flags "--launcher.ini $out/etc/eclipse.ini"
 
         ln -s ${eclipse}/share $out/
       '';

From 887bed2853422a5b9ff4ead3fcb76375c9f5c9d1 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 20 Jan 2016 20:28:53 +0100
Subject: [PATCH 0243/2285] eclipse-platform: 4.5 -> 4.5.1

---
 pkgs/applications/editors/eclipse/default.nix | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 42cb0fa8914a..75736356fb27 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -296,7 +296,9 @@ rec {
     };
   };
 
-  eclipse-platform = buildEclipse {
+  eclipse-platform = eclipse-platform-451;
+
+  eclipse-platform-45 = buildEclipse {
     name = "eclipse-platform-4.5";
     description = "Eclipse platform";
     sources = {
@@ -311,6 +313,21 @@ rec {
     };
   };
 
+  eclipse-platform-451 = buildEclipse {
+    name = "eclipse-platform-4.5.1";
+    description = "Eclipse platform";
+    sources = {
+      "x86_64-linux" = fetchurl {
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.1-201509040015/eclipse-platform-4.5.1-linux-gtk-x86_64.tar.gz;
+          sha256 = "1m7bzyi20yss6cz74d7hvhxj1cddcpgzxjia5wcjycsvq33kkny0";
+        };
+      "i686-linux" = fetchurl {
+          url = https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.1-201509040015/eclipse-platform-4.5.1-linux-gtk.tar.gz;
+          sha256 = "17x8w4k0rba0c0v9ghxdl0zqfadla5c1aakfd5k0q9q3x3qi6rxp";
+        };
+    };
+  };
+
   eclipseWithPlugins = { eclipse, plugins ? [], jvmArgs ? [] }:
     let
       # Gather up the desired plugins.

From 799296d9e7de187ae9f573fefb72beff27146398 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 20 Oct 2015 00:35:36 +0200
Subject: [PATCH 0244/2285] eclipse-plugin-jdt: 4.5 -> 4.5.1

---
 pkgs/applications/editors/eclipse/plugins.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 9e6002e93985..b56c185c1c8e 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -298,12 +298,12 @@ rec {
 
   jdt = buildEclipseUpdateSite rec {
     name = "jdt-${version}";
-    version = "4.5";
+    version = "4.5.1";
 
     src = fetchzip {
       stripRoot = false;
-      url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5-201506032000/org.eclipse.jdt-4.5.zip";
-      sha256 = "0zrdn26f7qsms2xfiyc049bhhh0czsbf989pgyq736b8hfmmh9iy";
+      url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/eclipse/downloads/drops4/R-4.5.1-201509040015/org.eclipse.jdt-4.5.1.zip";
+      sha256 = "0nxi552vvpjalnsqhc0zi6fgaj9p22amxsiczpv7za4kr7m47x73";
     };
 
     meta = with stdenv.lib; {

From bf00cf745777b88e461f351aff497039178b6a9e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 20 Oct 2015 00:35:58 +0200
Subject: [PATCH 0245/2285] eclipse-plugin-cdt: 8.7.0 -> 8.8.0

---
 pkgs/applications/editors/eclipse/plugins.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index b56c185c1c8e..7a1643e6d2a8 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -152,12 +152,12 @@ rec {
 
   cdt = buildEclipseUpdateSite rec {
     name = "cdt-${version}";
-    version = "8.7.0";
+    version = "8.8.0";
 
     src = fetchzip {
       stripRoot = false;
-      url = "http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/8.7/${name}.zip";
-      sha256 = "0qpcjcl6n98x7ys4qz8p1x5hhk2ydrgh8w3r1kqk0zc7liqrx7vg";
+      url = "https://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/tools/cdt/releases/8.8/${name}.zip";
+      sha256 = "1i1m7g5128q21njgrkiw71y4vi4aqzz8xdd4iv80j3nsvhbv6cnm";
     };
 
     meta = with stdenv.lib; {

From 23fa59f08b69440c035d348035822b27da455a14 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 18 Jan 2016 21:22:47 +0100
Subject: [PATCH 0246/2285] ncmpcpp: 0.7 -> 0.7.2

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

diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix
index 70cde4b0c706..488fe45e6c84 100644
--- a/pkgs/applications/audio/ncmpcpp/default.nix
+++ b/pkgs/applications/audio/ncmpcpp/default.nix
@@ -15,11 +15,11 @@ assert taglibSupport -> (taglib != null);
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "ncmpcpp-${version}";
-  version = "0.7";
+  version = "0.7.2";
 
   src = fetchurl {
     url = "http://ncmpcpp.rybczak.net/stable/${name}.tar.bz2";
-    sha256 = "0xzz0g9whqjcjaaqmsw5ph1zvpi2j5v3i5k73g7916rca3q4z4jh";
+    sha256 = "0fq9nk796cp7gs0gwrabb6wp7f5h7pph10hrkrik1wf4k3mzb4k3";
   };
 
   configureFlags = [ "BOOST_LIB_SUFFIX=" ]

From 421989fb5a5a3eb19a569cb0502a40572b3b1686 Mon Sep 17 00:00:00 2001
From: Maciek Starzyk <mstarzyk@gmail.com>
Date: Wed, 20 Jan 2016 22:32:24 +0100
Subject: [PATCH 0247/2285] obnam: 1.18.2 -> 1.19

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

diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix
index a861d4c8f77b..1854071d6cc2 100644
--- a/pkgs/tools/backup/obnam/default.nix
+++ b/pkgs/tools/backup/obnam/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "obnam-${version}";
-  version = "1.18.2";
+  version = "1.19";
 
   namePrefix = "";
 
   src = fetchurl rec {
     url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz";
-    sha256 = "185pjd77lnq99x2sskpl7n6h25z0v069575l4qz206npsywbypnb";
+    sha256 = "1591f3mqhgda486wkpb8q4mq685sy6yn3ypbpzx77wii51licxar";
   };
 
   buildInputs = [ pythonPackages.sphinx attr ];

From 721a091fb1b6c006baff535a337027de3c79528c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 19 Jan 2016 12:27:51 +0100
Subject: [PATCH 0248/2285] kde5.konversation: init at 1.6

Currently we have `kde4.konversation` which is version 1.5 of
Konversation.
This adds `kde5.konversation` which is version 1.6 and builds
against the latest KDE Frameworks 5.
---
 .../networking/irc/konversation/1.6.nix       | 84 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 +
 2 files changed, 87 insertions(+)
 create mode 100644 pkgs/applications/networking/irc/konversation/1.6.nix

diff --git a/pkgs/applications/networking/irc/konversation/1.6.nix b/pkgs/applications/networking/irc/konversation/1.6.nix
new file mode 100644
index 000000000000..158fe886b8b0
--- /dev/null
+++ b/pkgs/applications/networking/irc/konversation/1.6.nix
@@ -0,0 +1,84 @@
+{ stdenv
+, lib
+, fetchurl
+, cmake
+, extra-cmake-modules
+, kbookmarks
+, karchive
+, kconfig
+, kconfigwidgets
+, kcoreaddons
+, kdbusaddons
+, kdoctools
+, kemoticons
+, kglobalaccel
+, ki18n
+, kiconthemes
+, kidletime
+, kitemviews
+, knotifications
+, knotifyconfig
+, kio
+, kparts
+, kwallet
+, makeQtWrapper
+, solid
+, sonnet
+, phonon}:
+
+let
+  pn = "konversation";
+  v = "1.6";
+in
+
+stdenv.mkDerivation rec {
+  name = "${pn}-${v}";
+
+  src = fetchurl {
+    url = "mirror://kde/stable/${pn}/${v}/src/${name}.tar.xz";
+    sha256 = "789fd75644bf54606778971310433dbe2bc01ac0917b34bc4e8cac88e204d5b6";
+  };
+
+  buildInputs = [
+    cmake
+    extra-cmake-modules
+    kbookmarks
+    karchive
+    kconfig
+    kconfigwidgets
+    kcoreaddons
+    kdbusaddons
+    kdoctools
+    kemoticons
+    kglobalaccel
+    ki18n
+    kiconthemes
+    kidletime
+    kitemviews
+    knotifications
+    knotifyconfig
+    kio
+    kparts
+    kwallet
+    solid
+    sonnet
+    phonon
+  ];
+
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+    makeQtWrapper
+  ];
+
+  postInstall = ''
+    wrapQtProgram "$out/bin/konversation"
+  '';
+
+  meta = {
+    description = "Integrated IRC client for KDE";
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ fridh ];
+    homepage = https://konversation.kde.org;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index af737bdd7fa8..5c548919d15e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14739,6 +14739,9 @@ let
 
     k9copy = callPackage ../applications/video/k9copy {};
 
+    konversation = callPackage ../applications/networking/irc/konversation/1.6.nix {
+    };
+
     quassel = callPackage ../applications/networking/irc/quassel/qt-5.nix {
       monolithic = true;
       daemon = false;

From fb2675c5cf8fe4ae8ac85faefc8a47258c7c00a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 22 Jan 2016 13:07:46 +0100
Subject: [PATCH 0249/2285] scim -> sc-im

---
 pkgs/applications/misc/scim/default.nix | 2 +-
 pkgs/top-level/all-packages.nix         | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/scim/default.nix b/pkgs/applications/misc/scim/default.nix
index 98594157211c..0014784abd12 100644
--- a/pkgs/applications/misc/scim/default.nix
+++ b/pkgs/applications/misc/scim/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
   name = "scim-${version}";
 
   src = fetchurl {
-    url = "https://github.com/andmarti1424/scim/archive/v${version}.tar.gz";
+    url = "https://github.com/andmarti1424/sc-im/archive/v${version}.tar.gz";
     sha256 = "00rjz344acw0bxv78x1w9jz8snl9lb9qhr9z22phxinidnd3vaaz";
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c283e4acb10..093bc63bbac9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13106,7 +13106,7 @@ let
     boost = boost155;
   };
 
-  scim = callPackage ../applications/misc/scim { };
+  sc-im = callPackage ../applications/misc/scim { };
 
   scite = callPackage ../applications/editors/scite { };
 
@@ -15920,6 +15920,7 @@ aliases = with self; rec {
   btrfsProgs = btrfs-progs; # added 2016-01-03
   aircrackng = aircrack-ng; # added 2016-01-14
   quake3game = ioquake3; # added 2016-01-14
+  scim = sc-im; # added 2016-01-22
 };
 
 tweakAlias = _n: alias: with lib;

From a2db14925b9e8c84c080b8e4d48c22e6c8aa72a2 Mon Sep 17 00:00:00 2001
From: Robert Klotzner <robert.klotzner@gmx.at>
Date: Fri, 18 Sep 2015 17:29:10 +0200
Subject: [PATCH 0250/2285] nixos: Added libinput configuration

like there was for synaptics
---
 nixos/modules/module-list.nix                 |   1 +
 .../services/x11/hardware/libinput.nix        | 125 ++++++++++++++++++
 2 files changed, 126 insertions(+)
 create mode 100644 nixos/modules/services/x11/hardware/libinput.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 2ff61877c23d..de6a6a5844b2 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -437,6 +437,7 @@
   ./services/x11/display-managers/lightdm.nix
   ./services/x11/display-managers/sddm.nix
   ./services/x11/display-managers/slim.nix
+  ./services/x11/hardware/libinput.nix
   ./services/x11/hardware/multitouch.nix
   ./services/x11/hardware/synaptics.nix
   ./services/x11/hardware/wacom.nix
diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix
new file mode 100644
index 000000000000..0b4637dc55f9
--- /dev/null
+++ b/nixos/modules/services/x11/hardware/libinput.nix
@@ -0,0 +1,125 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let cfg = config.services.xserver.libinput;
+in {
+
+  options = {
+
+    services.xserver.libinput = {
+
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        example = true;
+        description = "Whether to enable libinput support.";
+      };
+
+      dev = mkOption {
+        type = types.nullOr types.str;
+        default = null;
+        example = "/dev/input/event0";
+        description =
+          ''
+            Path for touchpad device.  Set to null to apply to any
+            auto-detected touchpad.
+          '';
+      };
+
+      accelSpeed = mkOption {
+        type = types.nullOr types.string;
+        default = null;
+        description = "Cursor acceleration (how fast speed increases from minSpeed to maxSpeed).";
+      };
+
+      buttonMapping = mkOption {
+        type = types.nullOr types.string;
+        default = null;
+        description =
+          ''
+            Sets the logical button mapping for this device, see XSetPointerMapping(3). The string  must
+            be  a  space-separated  list  of  button mappings in the order of the logical buttons on the
+            device, starting with button 1.  The default mapping is "1 2 3 ... 32". A mapping of 0 deac‐
+            tivates the button. Multiple buttons can have the same mapping.  Invalid mapping strings are
+            discarded and the default mapping is used for all buttons.  Buttons  not  specified  in  the
+            user's mapping use the default mapping. See section BUTTON MAPPING for more details.
+          '';
+      };
+
+      calibrationMatrix = mkOption {
+        type = types.nullOr types.string;
+        default = null;
+        description =
+          ''
+            A  string  of  9 space-separated floating point numbers.  Sets the calibration matrix to the
+            3x3 matrix where the first row is (abc), the second row is (def) and the third row is (ghi).
+          '';
+      };
+
+      tapping = mkOption {
+        type = types.bool;
+        default = true;
+        example = false;
+        description =
+          ''
+            Enables or disables tap-to-click behavior.
+          '';
+      };
+
+      tappingDragLock = mkOption {
+        type = types.bool;
+        default = true;
+        example = false;
+        description =
+          ''
+            Enables or disables drag lock during tapping behavior. When enabled, a finger up during tap-
+            and-drag will not immediately release the button. If the finger is set down again within the
+            timeout, the draging process continues.
+          '';
+      };
+
+
+      additionalOptions = mkOption {
+        type = types.str;
+        default = "";
+        example = ''
+          Option "RTCornerButton" "2"
+          Option "RBCornerButton" "3"
+        '';
+        description = ''
+          Additional options for libinput touchpad driver.
+        '';
+      };
+
+    };
+
+  };
+
+
+  config = mkIf cfg.enable {
+
+    services.xserver.modules = [ pkgs.xorg.xf86inputlibinput ];
+
+    environment.systemPackages = [ pkgs.xorg.xf86inputlibinput ];
+
+    services.xserver.config =
+      ''
+        # Automatically enable the libinput driver for all touchpads.
+        Section "InputClass"
+          Identifier "libinputConfiguration"
+          MatchIsTouchpad "on"
+          ${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''}
+          Driver "libinput"
+          ${optionalString (cfg.accelSpeed != null) ''Option "AccelSpeed" "${cfg.accelSpeed}"''}
+          ${optionalString (cfg.buttonMapping != null) ''Option "ButtonMapping" "${cfg.buttonMapping}"''}
+          ${optionalString (cfg.calibrationMatrix != null) ''Option "CalibrationMatrix" "${cfg.calibrationMatrix}"''}
+          ${if cfg.tapping then ''Option "Tapping" "1"'' else ""}
+          ${if cfg.tappingDragLock then ''Option "TappingDragLock" "1"'' else ""}
+          ${cfg.additionalOptions}
+        EndSection
+      '';
+
+  };
+
+}

From d3f687951a18f184e609a44aa06af3b271e39d81 Mon Sep 17 00:00:00 2001
From: Robert Klotzner <robert.klotzner@gmx.at>
Date: Wed, 13 Jan 2016 09:27:02 +0100
Subject: [PATCH 0251/2285] nixos: libinput added options

- natural scrolling
- scroll method
- disable while typing
---
 .../services/x11/hardware/libinput.nix        | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix
index 0b4637dc55f9..a5629db53fe0 100644
--- a/nixos/modules/services/x11/hardware/libinput.nix
+++ b/nixos/modules/services/x11/hardware/libinput.nix
@@ -57,6 +57,13 @@ in {
           '';
       };
 
+      naturalScrolling = mkOption {
+        type = types.bool;
+        default = false;
+        example = true;
+        description = "Enables or disables natural scrolling behavior.";
+      };
+
       tapping = mkOption {
         type = types.bool;
         default = true;
@@ -67,6 +74,27 @@ in {
           '';
       };
 
+      scrollMethod = mkOption {
+        type = types.enum [ "twofinger" "edge" "none" ];
+        default = "twofinger";
+        example = "edge";
+        description =
+          ''
+            Specify the scrolling method.
+          '';
+      };
+
+      disableWhileTyping = mkOption {
+        type = types.bool;
+        default = true;
+        example = false;
+        description =
+          ''
+            Disable input method while typing.
+          '';
+      };
+
+
       tappingDragLock = mkOption {
         type = types.bool;
         default = true;
@@ -114,8 +142,11 @@ in {
           ${optionalString (cfg.accelSpeed != null) ''Option "AccelSpeed" "${cfg.accelSpeed}"''}
           ${optionalString (cfg.buttonMapping != null) ''Option "ButtonMapping" "${cfg.buttonMapping}"''}
           ${optionalString (cfg.calibrationMatrix != null) ''Option "CalibrationMatrix" "${cfg.calibrationMatrix}"''}
+          ${optionalString cfg.naturalScrolling ''Option "NaturalScrolling" "on"''}
           ${if cfg.tapping then ''Option "Tapping" "1"'' else ""}
           ${if cfg.tappingDragLock then ''Option "TappingDragLock" "1"'' else ""}
+          Option "ScrollMethod" "${cfg.scrollMethod}"
+          ${optionalString cfg.disableWhileTyping ''Option "DisableWhileTyping" "on"''}
           ${cfg.additionalOptions}
         EndSection
       '';

From 5d4948e18368aa65fd65d8ad13f95c543d1f7889 Mon Sep 17 00:00:00 2001
From: Robert Klotzner <robert.klotzner@gmx.at>
Date: Fri, 22 Jan 2016 11:46:02 +0100
Subject: [PATCH 0252/2285] libinput: configuration support: Polishing

+ addition of missing options
---
 .../services/x11/hardware/libinput.nix        | 113 +++++++++++++++---
 1 file changed, 96 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix
index a5629db53fe0..fb9e24160e9f 100644
--- a/nixos/modules/services/x11/hardware/libinput.nix
+++ b/nixos/modules/services/x11/hardware/libinput.nix
@@ -3,6 +3,7 @@
 with lib;
 
 let cfg = config.services.xserver.libinput;
+    xorgBool = v: if v then "on" else "off";
 in {
 
   options = {
@@ -27,6 +28,18 @@ in {
           '';
       };
 
+      accelProfile = mkOption {
+        type = types.enum [ "flat" "adaptive" ];
+        default = "flat";
+        example = "adaptive";
+        description =
+          ''
+            Sets  the pointer acceleration profile to the given profile. Permitted values are adaptive, flat.
+            Not all devices support this option or all profiles. If a profile is unsupported, the default profile
+            for this is used. For a description on the profiles and their behavior, see the libinput documentation.
+          '';
+      };    
+      
       accelSpeed = mkOption {
         type = types.nullOr types.string;
         default = null;
@@ -57,6 +70,36 @@ in {
           '';
       };
 
+      clickMethod = mkOption {
+        type = types.nullOr (types.enum [ "none" "buttonareas" "clickfinger" ]);
+        default = null;
+        example = "none";
+        description =
+          ''
+            Enables a click method. Permitted values are none, buttonareas, clickfinger.
+            Not all devices support all methods, if an option is unsupported,
+            the default click method for this device is used. 
+          '';
+      };
+      
+      leftHanded = mkOption {
+        type = types.bool;
+        default = false;
+        example = true;
+        description = "Enables left-handed button orientation, i.e. swapping left and right buttons.";
+      };
+
+      middleEmulation = mkOption {
+        type = types.bool;
+        default = true;
+        example = false;
+        description =
+          ''
+            Enables middle button emulation. When enabled, pressing the left and right buttons
+            simultaneously produces a middle mouse button click.
+          '';
+      };
+      
       naturalScrolling = mkOption {
         type = types.bool;
         default = false;
@@ -64,13 +107,14 @@ in {
         description = "Enables or disables natural scrolling behavior.";
       };
 
-      tapping = mkOption {
-        type = types.bool;
-        default = true;
-        example = false;
+      scrollButton = mkOption {
+        type = types.nullOr types.int;
+        default = null;
+        example = 1;
         description =
           ''
-            Enables or disables tap-to-click behavior.
+            Designates a button as scroll button. If the ScrollMethod is button and the button is logically
+            held down, x/y axis movement is converted into scroll events.
           '';
       };
 
@@ -84,16 +128,37 @@ in {
           '';
       };
 
-      disableWhileTyping = mkOption {
+      horizontalScrolling = mkOption {
         type = types.bool;
         default = true;
         example = false;
         description =
           ''
-            Disable input method while typing.
+            Disables horizontal scrolling. When disabled, this driver will discard any horizontal scroll
+            events from libinput. Note that this does not disable horizontal scrolling, it merely
+            discards the horizontal axis from any scroll events.
           '';
       };
 
+      sendEventsMode = mkOption {
+        type = types.enum [ "disabled" "enabled" "disabled-on-external-mouse" ];
+        default = "enabled";
+        example = "disabled";
+        description =
+          ''
+            Sets the send events mode to disabled, enabled, or "disable when an external mouse is connected".
+          '';
+      };
+
+      tapping = mkOption {
+        type = types.bool;
+        default = true;
+        example = false;
+        description =
+          ''
+            Enables or disables tap-to-click behavior.
+          '';
+      };
 
       tappingDragLock = mkOption {
         type = types.bool;
@@ -107,17 +172,24 @@ in {
           '';
       };
 
+      disableWhileTyping = mkOption {
+        type = types.bool;
+        default = true;
+        example = false;
+        description =
+          ''
+            Disable input method while typing.
+          '';
+      };
 
       additionalOptions = mkOption {
         type = types.str;
         default = "";
-        example = ''
-          Option "RTCornerButton" "2"
-          Option "RBCornerButton" "3"
-        '';
-        description = ''
-          Additional options for libinput touchpad driver.
+        example =
+        ''
+          Option "DragLockButtons" "L1 B1 L2 B2"
         '';
+        description = "Additional options for libinput touchpad driver.";
       };
 
     };
@@ -139,14 +211,21 @@ in {
           MatchIsTouchpad "on"
           ${optionalString (cfg.dev != null) ''MatchDevicePath "${cfg.dev}"''}
           Driver "libinput"
+          Option "AccelProfile" "${cfg.accelProfile}"
           ${optionalString (cfg.accelSpeed != null) ''Option "AccelSpeed" "${cfg.accelSpeed}"''}
           ${optionalString (cfg.buttonMapping != null) ''Option "ButtonMapping" "${cfg.buttonMapping}"''}
           ${optionalString (cfg.calibrationMatrix != null) ''Option "CalibrationMatrix" "${cfg.calibrationMatrix}"''}
-          ${optionalString cfg.naturalScrolling ''Option "NaturalScrolling" "on"''}
-          ${if cfg.tapping then ''Option "Tapping" "1"'' else ""}
-          ${if cfg.tappingDragLock then ''Option "TappingDragLock" "1"'' else ""}
+          ${optionalString (cfg.clickMethod != null) ''Option "ClickMethod" "${cfg.clickMethod}"''}
+          Option "LeftHanded" "${xorgBool cfg.leftHanded}"
+          Option "MiddleEmulation" "${xorgBool cfg.middleEmulation}"
+          Option "NaturalScrolling" "${xorgBool cfg.naturalScrolling}"
+          ${optionalString (cfg.scrollButton != null) ''Option "ScrollButton" "${cfg.scrollButton}"''}
           Option "ScrollMethod" "${cfg.scrollMethod}"
-          ${optionalString cfg.disableWhileTyping ''Option "DisableWhileTyping" "on"''}
+          Option "HorizontalScrolling" "${xorgBool cfg.horizontalScrolling}"
+          Option "SendEventsMode" "${cfg.sendEventsMode}"
+          Option "Tapping" "${xorgBool cfg.tapping}"
+          Option "TappingDragLock" "${xorgBool cfg.tappingDragLock}"
+          Option "DisableWhileTyping" "${xorgBool cfg.disableWhileTyping}"
           ${cfg.additionalOptions}
         EndSection
       '';

From 255a49cb7b29e26d4bb3ddbebdca2448d34ed862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 22 Jan 2016 13:11:28 +0100
Subject: [PATCH 0253/2285] sdlmame: mark as broken due to URL cc @lovek323

---
 pkgs/games/sdlmame/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix
index 7cc4c2b96b1e..15b7f87ed10f 100644
--- a/pkgs/games/sdlmame/default.nix
+++ b/pkgs/games/sdlmame/default.nix
@@ -40,5 +40,6 @@ stdenv.mkDerivation rec {
     license     = "MAME";
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.linux;
+    broken = true; # URL doesn't work anymore
   };
 }

From c6ff65ca5aee364b8c72d00d75be0dcb386e3e9c Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Fri, 22 Jan 2016 12:16:52 +0000
Subject: [PATCH 0254/2285] citrix-receiver: 13.2.1 -> 13.3.0

---
 .../networking/remote/citrix-receiver/default.nix    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/remote/citrix-receiver/default.nix b/pkgs/applications/networking/remote/citrix-receiver/default.nix
index 2523c4459ece..056d28eb3cd8 100644
--- a/pkgs/applications/networking/remote/citrix-receiver/default.nix
+++ b/pkgs/applications/networking/remote/citrix-receiver/default.nix
@@ -24,22 +24,22 @@
 
 stdenv.mkDerivation rec {
   name = "citrix-receiver-${version}";
-  version = "13.2.1";
-  homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-1321.html;
+  version = "13.3.0";
+  homepage = https://www.citrix.com/downloads/citrix-receiver/linux/receiver-for-linux-latest.html;
 
   prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86";
 
   src = requireFile rec {
-    name = "${prefixWithBitness}-${version}.328635.tar.gz";
+    name = "${prefixWithBitness}-${version}.344519.tar.gz";
     sha256 =
       if stdenv.is64bit
-      then "3a11d663b1a11cc4ebb3e3595405d520ec279e1330462645c53edd5cc79d9ca0"
-      else "0yjw8q8mh4adns2i04m4p273vb4ifakixal7yi3hnbg43b36wfaw";
+      then "11l0s4f1si43qlxai053ps4nks7v4bahipsmcdpnrdzq0vps17ls"
+      else "0sbgkb9a3ss2n08lal7qk8pmxyqbvkm7jj7l995ddjaa6jbkr3fz";
     message = ''
       In order to use Citrix Receiver, you need to comply with the Citrix EULA and download
       the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from:
 
-      ${homepage}#ctx-dl-eula
+      ${homepage}
 
       Once you have downloaded the file, please use the following command and re-run the
       installation:

From 856256f8c55c2035fc0a862d076397b5ea3f3ef1 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Fri, 22 Jan 2016 13:22:49 +0100
Subject: [PATCH 0255/2285] direwolf: Fix src.

Project moved to Github.
---
 pkgs/applications/misc/direwolf/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix
index fc8d0ec36c85..51a48db34e91 100644
--- a/pkgs/applications/misc/direwolf/default.nix
+++ b/pkgs/applications/misc/direwolf/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, alsaLib }:
+{ stdenv, fetchFromGitHub, unzip, alsaLib }:
 let
   version = "1.2";
 in
@@ -6,9 +6,11 @@ stdenv.mkDerivation rec {
   name = "direwolf-${version}";
   inherit version;
 
-  src = fetchurl {
-    url = "http://home.comcast.net/~wb2osz/Version%201.2/direwolf-${version}-src.zip";
-    sha256 = "0csl6harx7gmjmamxy0ylzhbamppphffisk8j33dc6g08k6rc77f";
+  src = fetchFromGitHub {
+    owner = "wb2osz";
+    repo = "direwolf";
+    rev = "8b81a32";
+    sha256 = "0r4fgdxghh292bzhqshr7zl5cg2lfsvlgmy4d5vqcli7x6qa1gcs";
   };
 
   buildInputs = [

From 8c4256e6514dee65321fad3ce148ff200afb50d3 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 22 Jan 2016 12:53:42 +0100
Subject: [PATCH 0256/2285] lvm2: 2.02.132 -> 2.02.140

Upstream changelog can be found at:

https://git.fedorahosted.org/cgit/lvm2.git/tree/WHATS_NEW?h=v2_02_140&id=0faa27d4f55abcda5fa94ef92343eb44e95ada89

I have tested this with:

nix-build nixos/release.nix -A tests.installer.lvm.x86_64-linux

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/os-specific/linux/lvm2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix
index 0e6bf512aa26..351c2f609814 100644
--- a/pkgs/os-specific/linux/lvm2/default.nix
+++ b/pkgs/os-specific/linux/lvm2/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils, enable_dmeventd ? false }:
 
 let
-  version = "2.02.132";
+  version = "2.02.140";
 in
 
 stdenv.mkDerivation {
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz";
-    sha256 = "0ac8izssflj371zzar16965zlia6a6zd97i0n00jxfxssnfa0fj1";
+    sha256 = "1jd46diyv7074fw8kxwq7imn4pl76g01d8y7z4scq0lkxf8jmpai";
   };
 
   configureFlags = [

From 24ae34c0d7a762d2b56a687e8770e8250d7c3382 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 22 Jan 2016 13:22:46 +0100
Subject: [PATCH 0257/2285] nixpart0: Fix race condition in formatting devices

This adds a backport of rhinstaller/blivet#39 to the pinned blivet
version 0.17, it's addressing the following upstream bug:

https://bugzilla.redhat.com/show_bug.cgi?id=1196397

It has been reported at aszlig/nixpart#7 and tested by @manveru (the
issue reporter), thanks a lot.

Thanks also to @domenkozar for finding the upstream issue.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: Michael Fellinger <m.fellinger@gmail.com>
Fixes: aszlig/nixpart#7
---
 pkgs/tools/filesystems/nixpart/0.4/blivet.patch | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.patch b/pkgs/tools/filesystems/nixpart/0.4/blivet.patch
index 1758d18442d2..d53231a84fd6 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/blivet.patch
+++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.patch
@@ -37,3 +37,15 @@ index 705b93d..7268d71 100644
  
  # load the udev library
  libudev = CDLL(libudev)
+diff --git a/blivet/deviceaction.py b/blivet/deviceaction.py
+index 705b93d..60f8f32 100644
+--- a/blivet/deviceaction.py
++++ b/blivet/deviceaction.py
+@@ -467,6 +467,7 @@ def execute(self):
+ 
+                 self.device.disk.format.commitToDisk()
+ 
++            self.device.setup()
+             self.device.format.create(device=self.device.path,
+                                       options=self.device.formatArgs)
+ 

From 542bf5bf4187ec13d83d9aea64212b1dbb5a1bd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 22 Jan 2016 13:39:13 +0100
Subject: [PATCH 0258/2285] elm: recurseIntroAtrs and use GHC 7.10.3

---
 pkgs/development/compilers/elm/default.nix | 2 +-
 pkgs/top-level/all-packages.nix            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/elm/default.nix b/pkgs/development/compilers/elm/default.nix
index 9b9773e6973f..408af6e75c66 100644
--- a/pkgs/development/compilers/elm/default.nix
+++ b/pkgs/development/compilers/elm/default.nix
@@ -34,7 +34,7 @@ let
       EOF
     '' + lib.concatStrings cmds;
 
-  hsPkgs = haskell.packages.ghc7102.override {
+  hsPkgs = haskell.packages.ghc7103.override {
     overrides = self: super:
       let hlib = haskell.lib;
           elmRelease = import ./packages/release.nix { inherit (self) callPackage; };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b184f26edc1..2d87fae76b5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3889,7 +3889,7 @@ let
 
   eql = callPackage ../development/compilers/eql {};
 
-  elmPackages = callPackage ../development/compilers/elm { };
+  elmPackages = recurseIntoAttrs (callPackage ../development/compilers/elm { });
 
   adobe_flex_sdk = callPackage ../development/compilers/adobe-flex-sdk { };
 

From 23e18ab88ee6d3d4dc131e6d8ab23a14825ad870 Mon Sep 17 00:00:00 2001
From: Siarhei Zirukin <ftrvxmtrx@gmail.com>
Date: Fri, 22 Jan 2016 14:03:39 +0100
Subject: [PATCH 0259/2285] fldigi: 3.22.02 -> 3.23.07

---
 pkgs/applications/audio/fldigi/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix
index 8e80992d7cad..a75de090033a 100644
--- a/pkgs/applications/audio/fldigi/default.nix
+++ b/pkgs/applications/audio/fldigi/default.nix
@@ -2,13 +2,13 @@
   libsamplerate, libpulseaudio, libXinerama, gettext, pkgconfig, alsaLib }:
 
 stdenv.mkDerivation rec {
-  version = "3.22.02";
+  version = "3.23.07";
   pname = "fldigi";
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "http://www.w1hkj.com/downloads/${pname}/${name}.tar.gz";
-    sha256 = "1gry3r133j2x99h0ji56v6yjxzvbi0hb18p1lbkr9djzjvf591j3";
+    url = "mirror://sourceforge/${pname}/${name}.tar.gz";
+    sha256 = "0v78sk9bllxw640wxd4q2qy0h8z2j1d077nxhmpkjpf6mn6vwcda";
   };
 
   buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio
@@ -16,9 +16,9 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Digital modem program";
-    homepage = http://www.w1hkj.com/Fldigi.html;
+    homepage = http://sourceforge.net/projects/fldigi/;
     license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = with stdenv.lib.maintainers; [ relrod ];
+    maintainers = with stdenv.lib.maintainers; [ relrod ftrvxmtrx ];
     platforms = stdenv.lib.platforms.linux;
   };
 }

From 6fe1909a1df9bb07cb7eab9d961aef3999cdcce2 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Fri, 22 Jan 2016 13:50:58 +0100
Subject: [PATCH 0260/2285] gnome3.gnome-dictionary: 3.18.0 -> 3.18.1

---
 pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/src.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/src.nix
index 9e3660f207b3..07fe6eceb13b 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-dictionary/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-dictionary-3.18.0";
+  name = "gnome-dictionary-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-dictionary/3.18/gnome-dictionary-3.18.0.tar.xz;
-    sha256 = "5338962124f6d784920ed4968d98734a7589513b36e4f4a6ff00d1ed5afb4ead";
+    url = mirror://gnome/sources/gnome-dictionary/3.18/gnome-dictionary-3.18.1.tar.xz;
+    sha256 = "92cf2d519335b125018468c22405499fdb320e4446201c7b0f55f1a441bf05cc";
   };
 }

From 4e8a898492c59e82ea0dfe2821161de42dc4bc9b Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Fri, 22 Jan 2016 13:52:16 +0100
Subject: [PATCH 0261/2285] gnome3.gnome-bluetooth: 3.18.1 -> 3.18.2

---
 pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix
index 2e0df487ee49..30edc3ab50ee 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-bluetooth/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-bluetooth-3.18.1";
+  name = "gnome-bluetooth-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-bluetooth/3.18/gnome-bluetooth-3.18.1.tar.xz;
-    sha256 = "c51d5b896d32845a2b5bb6ccd48926c88c8e9ef0915c32d3c56cb7e7974d4a49";
+    url = mirror://gnome/sources/gnome-bluetooth/3.18/gnome-bluetooth-3.18.2.tar.xz;
+    sha256 = "d8df073c331df0f97261869fb77ffcdbf4e3e4eaf460d3c3ed2b16e03d9c5398";
   };
 }

From 23b3276ba9e36c43263ec4c392b958b0491b10f2 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Fri, 22 Jan 2016 14:00:48 +0100
Subject: [PATCH 0262/2285] gnome3.evolution_data_server: 3.18.3 -> 3.18.4

---
 .../gnome-3/3.18/core/evolution-data-server/src.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/src.nix b/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/src.nix
index 9f899fb6e42d..5b465be415be 100644
--- a/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/evolution-data-server/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "evolution-data-server-3.18.3";
+  name = "evolution-data-server-3.18.4";
 
   src = fetchurl {
-    url = mirror://gnome/sources/evolution-data-server/3.18/evolution-data-server-3.18.3.tar.xz;
-    sha256 = "9de9d6392822bb4b89318a88f5db1fd2f0f09899b793a0dd5525a656ed0e8163";
+    url = mirror://gnome/sources/evolution-data-server/3.18/evolution-data-server-3.18.4.tar.xz;
+    sha256 = "0b756f05feae538676832acc122407046a89d4dd32da725789229dc3c416433f";
   };
 }

From 843bc26c4dd3c6612aa0810731786cc40e47b710 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Fri, 22 Jan 2016 14:03:13 +0100
Subject: [PATCH 0263/2285] gnome3.gedit: 3.18.2 -> 3.18.3

---
 pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix b/pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix
index e368fd2cdd98..167acabee917 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/gedit/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gedit-3.18.2";
+  name = "gedit-3.18.3";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gedit/3.18/gedit-3.18.2.tar.xz;
-    sha256 = "856e451aec29ee45980011de57cadfe89c3cbc53968f6cc865f8efe0bd0d49b1";
+    url = mirror://gnome/sources/gedit/3.18/gedit-3.18.3.tar.xz;
+    sha256 = "6762ac0d793b0f754a2da5f88739d04fa39daa7491c5c46401d24bcef76c32e7";
   };
 }

From 15ff41f516863becc1caa1a2f970c1b8d44b4f79 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Fri, 22 Jan 2016 14:03:28 +0100
Subject: [PATCH 0264/2285] gnome3.evolution: 3.18.3 -> 3.18.4

---
 pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix b/pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix
index 1dbbd3908775..81bbd443e967 100644
--- a/pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/apps/evolution/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "evolution-3.18.3";
+  name = "evolution-3.18.4";
 
   src = fetchurl {
-    url = mirror://gnome/sources/evolution/3.18/evolution-3.18.3.tar.xz;
-    sha256 = "f073b7cbef4ecc3dc4c3e0b80f98198eec577a20cae93e784659e8cf5af7c9b9";
+    url = mirror://gnome/sources/evolution/3.18/evolution-3.18.4.tar.xz;
+    sha256 = "8161a0ebc77e61904dfaca9745595fefbf84d834a07ee1132d1f8d030dabfefb";
   };
 }

From 889a05ea5b83711ed9dfabc4b807d5fd25a312e7 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 22 Jan 2016 14:19:23 +0100
Subject: [PATCH 0265/2285] qutebrowser: 0.5.0 -> 0.5.1

---
 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 1d53ea2aceb3..61b02d2a6394 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.5.0"; in
+let version = "0.5.1"; in
 
 buildPythonPackage rec {
   name = "qutebrowser-${version}";
@@ -10,7 +10,7 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "https://github.com/The-Compiler/qutebrowser/releases/download/v${version}/${name}.tar.gz";
-    sha256 = "16cyw0jg6qg9ksr6xwgnkm1a2bwgii2s35nrgk3g705ywfsf02j7";
+    sha256 = "1pxgap04rv94kgcp9a05xx2kwg3j6jv8f6d3ww7hqs2xnkj8wzqb";
   };
 
   # Needs tox

From 323c4f43c38a2cffc73e55a894091d3e7d448d61 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Fri, 22 Jan 2016 14:21:04 +0100
Subject: [PATCH 0266/2285] gnome3.pomodoro: 3.18-624945d -> 3.18-4844fad

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

diff --git a/pkgs/desktops/gnome-3/3.18/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.18/misc/pomodoro/default.nix
index 0440af440fec..ec8b6c622289 100644
--- a/pkgs/desktops/gnome-3/3.18/misc/pomodoro/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/misc/pomodoro/default.nix
@@ -4,14 +4,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  rev = "624945d";
+  rev = "4844fada548ba4d30e1441e063565f9e46334ffd";
   name = "gnome-shell-pomodoro-${gnome3.version}-${rev}";
 
   src = fetchFromGitHub {
       owner = "codito";
       repo = "gnome-pomodoro";
       rev = "${rev}";
-      sha256 = "0vjy95zvd309n8g13fa80qhqlv7k6wswhrjw7gddxrnmr662xdqq";
+      sha256 = "11vqlz0gcvrvf87hwwxvpw3lv50ail16nlynlzkqfd2dac028mag";
   };
 
   configureScript = ''./autogen.sh'';

From 98a9bf6759997c8f7bd1931c856626e39785268d Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Fri, 22 Jan 2016 14:33:28 +0100
Subject: [PATCH 0267/2285] numix-icon-theme: 20151023 -> 20160120

---
 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 ee4e0af93697..909750aec6fb 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -1,17 +1,17 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  version = "0f7641b048a07eb614662c502eb209dad5eb6d97";
+  version = "a704451830d343670721cbf1391df18611d61901";
 
   package-name = "numix-icon-theme";
 
-  name = "${package-name}-20151023";
+  name = "${package-name}-20160120-${version}";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = package-name;
     rev = version;
-    sha256 = "16kbasgbb5mgiyl9b240215kivdnl8ynpkxhp5gairba9l4jpbih";
+    sha256 = "0kk0rvywbm074nskjvvy0vjf6giw54jgvrw7sz9kwnv6h75ki96m";
   };
 
   dontBuild = true;

From 73a22693eaf54be4c768c2cc749e55cda54a1c6f Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Fri, 22 Jan 2016 14:37:21 +0100
Subject: [PATCH 0268/2285] numix-icon-theme-circle: 20151014 -> 20160121

---
 pkgs/data/icons/numix-icon-theme-circle/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix
index a1594047af6e..8a70b2949afe 100644
--- a/pkgs/data/icons/numix-icon-theme-circle/default.nix
+++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchFromGitHub, unzip }:
 
 stdenv.mkDerivation rec {
-  version = "129da4d8036c9ea52ba8b94cdfa0148e4c2cff96";
+  version = "e7008b488edfe37379ba9c4b8d5245dfd6125fc3";
 
   package-name = "numix-icon-theme-circle";
   
-  name = "${package-name}-20151014";
+  name = "${package-name}-20160121-${version}";
 
   buildInputs = [ unzip ];
   
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "numixproject";
     repo = package-name;
     rev = version;
-    sha256 = "1505j63qh96hy04x3ywc6kspavzgjd848cgdkda23kjdbx0fpij4";
+    sha256 = "0pfcz50b9g7zzskws94m6wvd8zm3sjvhpbzq9vjqi1q02nzflap6";
   };
 
   dontBuild = true;

From 4d68077528b172c4789673f101a8f7d11aa8dbed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 22 Jan 2016 14:49:32 +0100
Subject: [PATCH 0269/2285] goPackages: adding restic

I make it use its supplied dependencies. Easier.
---
 pkgs/top-level/go-packages.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index f7a2d8904f3b..75f96bf5177f 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3060,6 +3060,16 @@ let
     ];
   };
 
+  restic = buildFromGitHub {
+    rev    = "4d7e802c44369b40177cd52938bc5b0930bd2be1";
+    date   = "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";

From 77f8f35d57618c1ba456d968524f2fb2c3448295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 22 Jan 2016 14:51:24 +0100
Subject: [PATCH 0270/2285] goPackages: comment on kagome about no parallel
 build

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 75f96bf5177f..a519233e3af0 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1951,8 +1951,12 @@ let
     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";
   };
 

From 984409db686463ee213f379bd3609134b5ac829a Mon Sep 17 00:00:00 2001
From: Matthew O'Gorman <mog@rldn.net>
Date: Tue, 19 Jan 2016 21:50:03 -0500
Subject: [PATCH 0271/2285] sopel: 6.1.1 -> 6.2.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 588c952b2302..0ae841378828 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18315,17 +18315,21 @@ in modules // {
   };
 
   sopel = buildPythonPackage rec {
-    name = "sopel-6.1.1";
+    name = "sopel-6.2.1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/s/sopel/${name}.tar.gz";
-      sha256 = "0nr2a88bkxg2593dd947qkh96g8j32q7pl7x9zvx4158h4bgx99y";
+      sha256 = "06m5clmg9x0bsnhvl5d75mskwqnxvkdd00p0dqnpwip9vmq6n8cz";
     };
 
+    buildInputs = with self; [ pytest ];
     propagatedBuildInputs = with self; [ praw xmltodict pytz pyenchant pygeoip ];
 
     disabled = isPyPy || isPy26 || isPy27;
 
+    checkPhase = ''
+    ${python.interpreter} test/*.py
+    '';
     meta = {
       description = "Simple and extensible IRC bot";
       homepage = "http://sopel.chat";

From 6e586a32fd53604225aa8ffd368a7c779e726f47 Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Thu, 21 Jan 2016 00:15:25 +0100
Subject: [PATCH 0272/2285] odpdown: init at 0.4.1

---
 pkgs/tools/typesetting/odpdown/default.nix | 33 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  4 +++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/tools/typesetting/odpdown/default.nix

diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix
new file mode 100644
index 000000000000..9ff33b2fb698
--- /dev/null
+++ b/pkgs/tools/typesetting/odpdown/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, buildPythonPackage, libreoffice, lpod, lxml, mistune, pillow
+, pygments
+}:
+
+buildPythonPackage rec {
+
+  name = "odpdown-${version}";
+  version = "0.4.1";
+
+  src = fetchurl {
+    url = "https://github.com/thorstenb/odpdown/archive/v${version}.tar.gz";
+    sha256 = "005eecc73c65b9d4c09532547940718a7b308cd565f62a213dfa040827d4d565";
+  };
+
+  propagatedBuildInputs = [ libreoffice lpod lxml mistune pillow pygments ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/thorstenb/odpdown;
+    repositories.git = https://github.com/thorstenb/odpdown.git;
+    description = "Create nice-looking slides from your favourite text editor";
+    longDescription = ''
+      Have a tool like pandoc, latex beamer etc, that you can write (or
+      auto-generate) input for within your favourite hacker's editor, and
+      generate nice-looking slides from. Using your corporation's mandatory,
+      CI-compliant and lovely-artsy Impress template. Including
+      syntax-highlighted code snippets of your latest hack, auto-fitted into the
+      slides.
+    '';
+    license = licenses.bsd3;
+    platforms = with platforms; linux ++ darwin;
+    maintainers = with maintainers; [ vandenoever ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 993f8d8be12b..2aa9d7522826 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2523,6 +2523,10 @@ let
 
   obnam = callPackage ../tools/backup/obnam { };
 
+  odpdown = callPackage ../tools/typesetting/odpdown {
+    inherit (pythonPackages) lpod lxml mistune pillow pygments;
+  };
+
   odt2txt = callPackage ../tools/text/odt2txt { };
 
   offlineimap = callPackage ../tools/networking/offlineimap {

From cc3f5b40a352afcf4951251ed2b7c4f5217fd57f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 20 Jan 2016 18:10:35 +0100
Subject: [PATCH 0273/2285] mopidy: 1.1.1 -> 1.1.2

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

diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index a6209884aa3a..ae53008d58c4 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -5,11 +5,11 @@
 pythonPackages.buildPythonPackage rec {
   name = "mopidy-${version}";
 
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchurl {
     url = "https://github.com/mopidy/mopidy/archive/v${version}.tar.gz";
-    sha256 = "1xfyg8xqgnrb98wx7a4fzr4vlzkffjhkc1s36ka63rwmx86vqhyw";
+    sha256 = "1vn4knpmnp3krmn627iv1r7xa50zl816ac6b24b8ph50cq2sqjfv";
   };
 
   buildInputs = [
@@ -34,7 +34,7 @@ pythonPackages.buildPythonPackage rec {
       SoundCloud, Google Play Music, and more
     '';
     license = licenses.asl20;
-    maintainers = [ maintainers.rickynils ];
+    maintainers = with maintainers; [ rickynils fpletz ];
     hydraPlatforms = [];
   };
 }

From 4a6602c3cd0efeaa7cb1bfe3550867f83285bc84 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 22 Jan 2016 10:35:42 -0600
Subject: [PATCH 0274/2285] awscli: Install less to fix help docs

Without less, we get:

```
2016-01-22 10:31:59,098 - MainThread - awscli.help - DEBUG - Running command: ['groff', '-man', '-T', 'ascii']
2016-01-22 10:31:59,109 - MainThread - awscli.help - DEBUG - Running command: ['less', '-R']
2016-01-22 10:31:59,111 - MainThread - awscli.clidriver - DEBUG - Exception caught in main()
Traceback (most recent call last):
  File "/nix/store/jmgflkyf1yfz6an82pvhq084mp1j0bjn-awscli-1.7.41/lib/python2.7/site-packages/awscli/clidriver.py", line 183, in main
    return command_table[parsed_args.command](remaining, parsed_args)
  File "/nix/store/jmgflkyf1yfz6an82pvhq084mp1j0bjn-awscli-1.7.41/lib/python2.7/site-packages/awscli/help.py", line 245, in __call__
    self.renderer.render(self.doc.getvalue())
  File "/nix/store/jmgflkyf1yfz6an82pvhq084mp1j0bjn-awscli-1.7.41/lib/python2.7/site-packages/awscli/help.py", line 81, in render
    self._send_output_to_pager(converted_content)
  File "/nix/store/jmgflkyf1yfz6an82pvhq084mp1j0bjn-awscli-1.7.41/lib/python2.7/site-packages/awscli/help.py", line 86, in _send_output_to_pager
    p = self._popen(cmdline, stdin=PIPE)
  File "/nix/store/jmgflkyf1yfz6an82pvhq084mp1j0bjn-awscli-1.7.41/lib/python2.7/site-packages/awscli/help.py", line 90, in _popen
    return Popen(*args, **kwargs)
  File "/nix/store/6a1x9r9wywa27v9gvp0yqgq0mmkfa3ww-python-2.7.11/lib/python2.7/subprocess.py", line 710, in __init__
    errread, errwrite)
  File "/nix/store/6a1x9r9wywa27v9gvp0yqgq0mmkfa3ww-python-2.7.11/lib/python2.7/subprocess.py", line 1335, in _execute_child
    raise child_exception
OSError: [Errno 2] No such file or directory
2016-01-22 10:31:59,112 - MainThread - awscli.clidriver - DEBUG - Exiting with rc 255

[Errno 2] No such file or directory
```

Import less along with groff

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5757afabc32c..3e9fe466fdd3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1110,6 +1110,7 @@ in modules // {
       rsa
       pyasn1
       pkgs.groff
+      pkgs.less
     ];
 
     postInstall = ''

From d9a407a8c4de4e8db79a5dfb32623d48fcaf3c48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 22 Jan 2016 11:45:46 -0200
Subject: [PATCH 0275/2285] awesome: 3.5.6 -> 3.5.7

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

diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 9c9d3d5f4514..2b0d44e61c8a 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "3.5.6";
+  version = "3.5.7";
 in with luaPackages;
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url    = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
-    sha256 = "1ms6a3l1i2jdhzrd1zr25cqckznmb44qgz4n635jam42hzhrvx1p";
+    sha256 = "ba7f92b0ab8b729c569b19b098b0a08339d8654e3c040d07ad02cf99641ceecf";
   };
 
   meta = with stdenv.lib; {

From bde97e0417964f1ae215319ac32874ab6d8bac76 Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Fri, 22 Jan 2016 18:04:52 +0000
Subject: [PATCH 0276/2285] get_iplayer: remove irrelevant warning

---
 pkgs/applications/misc/get_iplayer/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix
index 08fad5a021d0..3786f6effb1b 100644
--- a/pkgs/applications/misc/get_iplayer/default.nix
+++ b/pkgs/applications/misc/get_iplayer/default.nix
@@ -8,10 +8,15 @@ buildPerlPackage {
   preConfigure = "touch Makefile.PL";
   doCheck = false;
 
+  patchPhase = ''
+    sed -e 's|^update_script|#update_script|' \
+        -e '/WARNING.*updater/d' \
+        -i get_iplayer
+  '';
+
   installPhase = '' 
     mkdir -p $out/bin
     cp get_iplayer $out/bin
-    sed -i 's|^update_script|#update_script|' $out/bin/get_iplayer
     wrapProgram $out/bin/get_iplayer --suffix PATH : ${ffmpeg}/bin:${flvstreamer}/bin:${vlc}/bin:${rtmpdump}/bin --prefix PERL5LIB : $PERL5LIB
   '';  
   

From 546679f2e30c12bd91b24d1ada95b5cfd8b9bb59 Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Fri, 22 Jan 2016 18:05:27 +0000
Subject: [PATCH 0277/2285] get_iplayer: 2.86 -> 2.94

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

diff --git a/pkgs/applications/misc/get_iplayer/default.nix b/pkgs/applications/misc/get_iplayer/default.nix
index 3786f6effb1b..488a9a3732e2 100644
--- a/pkgs/applications/misc/get_iplayer/default.nix
+++ b/pkgs/applications/misc/get_iplayer/default.nix
@@ -1,9 +1,9 @@
 {stdenv, fetchurl, flvstreamer, ffmpeg, makeWrapper, perl, buildPerlPackage, perlPackages, vlc, rtmpdump}:
 buildPerlPackage {
-  name = "get_iplayer-2.86";
+  name = "get_iplayer-2.94";
 
   buildInputs = [makeWrapper perl];
-  propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP];
+  propagatedBuildInputs = with perlPackages; [HTMLParser HTTPCookies LWP XMLSimple];
 
   preConfigure = "touch Makefile.PL";
   doCheck = false;
@@ -21,8 +21,8 @@ buildPerlPackage {
   '';  
   
   src = fetchurl {
-    url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.86.tar.gz;
-    sha256 = "0zhcw0ikxrrz1jayx7jjgxmdf7gzk4pmzfvpraxmv64xwzgc1sc1";
+    url = ftp://ftp.infradead.org/pub/get_iplayer/get_iplayer-2.94.tar.gz;
+    sha256 = "16p0bw879fl8cs6rp37g1hgrcai771z6rcqk2nvm49kk39dx1zi4";
   };
   
 }

From de1aba33e8133b9c22fe2e1f363cb6e6fe4aa883 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 22 Jan 2016 19:37:25 +0100
Subject: [PATCH 0278/2285] progress: 0.9 -> 0.12.1

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

diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix
index cf70b234b88a..3d0d03f6c4a2 100644
--- a/pkgs/tools/misc/progress/default.nix
+++ b/pkgs/tools/misc/progress/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "progress-${version}";
-  version = "0.9";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "Xfennec";
     repo = "progress";
     rev = "v${version}";
-    sha256 = "07bl5fsr538nk4l8vwj1kf5bivlh3a8cy8jliqfadxmhf1knn2mw";
+    sha256 = "0lwj0zdcdsl1wczk3yq7wfpyw3zi87h8x2z8yjp0wgnr45bbqibl";
   };
 
   buildInputs = [ ncurses ];

From e6cd147ae7ae05900ec2ab8ad933bfac7428feac Mon Sep 17 00:00:00 2001
From: Ryan Artecona <ryanartecona@gmail.com>
Date: Fri, 22 Jan 2016 14:22:12 -0500
Subject: [PATCH 0279/2285] nixos manual: allow options from nix packages

---
 nixos/doc/manual/default.nix | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index bd558dac971d..eb2ceb7fd021 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, options, version, revision }:
+{ pkgs, options, version, revision, extraSources ? [] }:
 
 with pkgs;
 with pkgs.lib;
@@ -17,19 +17,27 @@ let
 
   # Clean up declaration sites to not refer to the NixOS source tree.
   optionsList' = flip map optionsList (opt: opt // {
-    declarations = map (fn: stripPrefix fn) opt.declarations;
+    declarations = map (fn: stripAnyPrefixes fn) opt.declarations;
   }
   // optionalAttrs (opt ? example) { example = substFunction opt.example; }
   // optionalAttrs (opt ? default) { default = substFunction opt.default; }
   // optionalAttrs (opt ? type) { type = substFunction opt.type; });
 
-  prefix = toString ../../..;
+  # We need to strip references to /nix/store/* from options,
+  # including any `extraSources` if some modules came from elsewhere,
+  # or else the build will fail.
+  #
+  # E.g. if some `options` came from modules in ${pkgs.customModules}/nix,
+  # you'd need to include `extraSources = [ "#{pkgs.customModules}" ]`
+  herePrefix = toString ../../..;
+  prefixesToStrip = [ herePrefix ] ++ extraSources;
 
-  stripPrefix = fn:
-    if substring 0 (stringLength prefix) fn == prefix then
-      substring (stringLength prefix + 1) 1000 fn
-    else
-      fn;
+  stripAnyPrefixes = fn:
+    flip (flip fold fn) prefixesToStrip (fn: prefix:
+      if substring 0 (stringLength prefix) fn == prefix then
+        substring (stringLength prefix + 1) 1000 fn
+      else
+        fn);
 
   # Convert the list of options into an XML file.
   optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList');

From a8aecdcc20008427964945bc2f6c1eff9b8dab4b Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Fri, 22 Jan 2016 18:25:25 +0000
Subject: [PATCH 0280/2285] xcftools: init at 1.0.7

---
 pkgs/tools/graphics/xcftools/default.nix | 39 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/tools/graphics/xcftools/default.nix

diff --git a/pkgs/tools/graphics/xcftools/default.nix b/pkgs/tools/graphics/xcftools/default.nix
new file mode 100644
index 000000000000..457f47f75d61
--- /dev/null
+++ b/pkgs/tools/graphics/xcftools/default.nix
@@ -0,0 +1,39 @@
+{stdenv, fetchurl, libpng, perl, gettext }:
+
+stdenv.mkDerivation {
+  name = "xcftools-1.0.7";
+
+  src = fetchurl {
+    url = "http://henning.makholm.net/xcftools/xcftools-1.0.7.tar.gz";
+    sha256 = "19i0x7yhlw6hd2gp013884zchg63yzjdj4hpany011il0n26vgqy";
+  };
+
+  buildInputs = [ libpng perl gettext ];
+
+  patchPhase = ''
+    # Required if building with libpng-1.6, innocuous otherwise
+    substituteInPlace xcf2png.c         \
+      --replace png_voidp_NULL NULL     \
+      --replace png_error_ptr_NULL NULL
+
+    # xcfview needs mailcap and isn't that useful anyway
+    sed -i -e '/BINARIES/s/xcfview//' Makefile.in
+  '';
+
+  meta = {
+    homepage = http://henning.makholm.net/software;
+    description = "Command-line tools for converting Gimp XCF files";
+    longDescription = ''
+      A set of fast command-line tools for extracting information from
+      the Gimp's native file format XCF.
+
+      The tools are designed to allow efficient use of layered XCF
+      files as sources in a build system that use 'make' and similar
+      tools to manage automatic processing of the graphics.
+
+      These tools work independently of the Gimp engine and do not
+      require the Gimp to even be installed.
+    '';
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e5311e65c651..a8f01dda21f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15759,6 +15759,8 @@ let
 
   xboxdrv = callPackage ../misc/drivers/xboxdrv { };
 
+  xcftools = callPackage ../tools/graphics/xcftools { };
+
   xhyve = callPackage ../applications/virtualization/xhyve { };
 
   xinput_calibrator = callPackage ../tools/X11/xinput_calibrator {};

From 8df0951f592be7fdc6c14218534857c2274a77d8 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Fri, 22 Jan 2016 23:02:39 +0300
Subject: [PATCH 0281/2285] vimPlugins: update 2016-01-22

---
 pkgs/misc/vim-plugins/default.nix | 222 +++++++++++++++---------------
 1 file changed, 111 insertions(+), 111 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 59a46ea7bf8a..264a60cc2058 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -152,22 +152,22 @@ rec {
   };
 
   Supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Supertab-2015-08-28";
+    name = "Supertab-2016-01-03";
     src = fetchgit {
       url = "git://github.com/ervandew/supertab";
-      rev = "9f7da6d4988daf863ebc414f221bb12c2614f59e";
-      sha256 = "18c74fde13eced99e492c7747a7924d1b2c33bfb99a87a6d7c44f1c8ca9e9225";
+      rev = "66511772a430a5eaad7f7d03dbb02e8f33c4a641";
+      sha256 = "fd49314e9f3ca3262e40b67f05311de94f50d03c946fc53e25b3bd61e33eb418";
     };
     dependencies = [];
 
   };
 
   Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2016-01-08";
+    name = "Syntastic-2016-01-18";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "c57ba0da9f0e935ecc87363c1ac3339b1e1cb75f";
-      sha256 = "0f4d73b024bd6e43f7b27bee629f1ff46bcb5f773eebdcda09652f101ab70504";
+      rev = "d1a179d750bd1d136d7f38e69f2c5b8439886de7";
+      sha256 = "e2cfa0fa27b0249b1e5d783883f4c72a13a167a869218d73ae1b2cad631c3a28";
     };
     dependencies = [];
 
@@ -218,11 +218,11 @@ rec {
   };
 
   UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "UltiSnips-2015-12-22";
+    name = "UltiSnips-2016-01-20";
     src = fetchgit {
       url = "git://github.com/SirVer/ultisnips";
-      rev = "dbd43ad27cbfed14c9dc3de6d5acb5f4edb8f649";
-      sha256 = "3a1c59ae4097e72c91724157249d6a578e7ef2b10ed675e4372ce9968d66af66";
+      rev = "3f2c591c3b547e7d7b80d15897ac7a9e3bf85ec8";
+      sha256 = "6644e8603202adc1ade58a972164e5e6470248ca1d2c40cd949b8f35e67b8019";
     };
     dependencies = [];
 
@@ -278,11 +278,11 @@ rec {
   };
 
   ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-py-matcher-2015-12-22";
+    name = "ctrlp-py-matcher-2016-01-13";
     src = fetchgit {
       url = "git://github.com/FelikZ/ctrlp-py-matcher";
-      rev = "08b98ff7ba5191616fa4f099a63cdcbad70a0c0f";
-      sha256 = "72514b65e12dfa249e51d676d38ff88933309827ef0ece71f3a90a21b4a943e6";
+      rev = "8a803267a741cff3d6147650745f83c8f2125578";
+      sha256 = "27fc887bdad36bd33a0e8645465e287c20158533408b241f46141528313baa34";
     };
     dependencies = [];
 
@@ -311,22 +311,22 @@ rec {
   };
 
   fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2015-12-26";
+    name = "fugitive-2016-01-08";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "18d6d1ab82d9ac15586d7d3c1a36f9ef6fb50eae";
-      sha256 = "f448970d07eaf35c0a6d29634ee2114650934943602da8f2bf5a4e3920d62aa2";
+      rev = "fd36aa9c61e06d71befdbe8931f97137c489b065";
+      sha256 = "ef87be5ad469368f11185db32a8acc14ac08f1b151d0c58492042b0a9314c87e";
     };
     dependencies = [];
 
   };
 
   ghcmod = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ghcmod-2015-12-10";
+    name = "ghcmod-2016-01-20";
     src = fetchgit {
       url = "git://github.com/eagletmt/ghcmod-vim";
-      rev = "1cab59653ef0fba71574c7f64e60a27df2bc38fc";
-      sha256 = "34556e0d4d7059fb6842eabfc4e9d0065e69b0e45b54e224b684e562f2917556";
+      rev = "a7c76b979918889fa6de02a3f712925931f62cb8";
+      sha256 = "2ad76948c97e9141eca81423a8d27d092e0f5c62818c66f08679d9cae70268f6";
     };
     dependencies = [];
 
@@ -355,11 +355,11 @@ rec {
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2015-12-31";
+    name = "neomake-2016-01-21";
     src = fetchgit {
       url = "git://github.com/benekastah/neomake";
-      rev = "6342a7d7e09083a549800a3cdc0ef95358a73ba7";
-      sha256 = "b7d3637b8575ae94dc0e68c4e5fcc41197b3083d1d7302c2e038431a24a3e9d7";
+      rev = "e0fa23401c1231bd942779c79c5c71d08f28e440";
+      sha256 = "0d0536188127538cacedda77a81e0749d6207fa882ca1f34f36852d009aa73f9";
     };
     dependencies = [];
 
@@ -388,33 +388,33 @@ rec {
   };
 
   ctrlp-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ctrlp-vim-2016-01-06";
+    name = "ctrlp-vim-2016-01-18";
     src = fetchgit {
       url = "git://github.com/ctrlpvim/ctrlp.vim";
-      rev = "0fb2c58353ee041500eb67fb5bde2377bf486417";
-      sha256 = "5731f5fb2ac024ca3b53fdb56ff6ad5809db166f91dccf5494343ff490fe80e9";
+      rev = "7f74368d85bb521951dd58123349ce66b947d058";
+      sha256 = "fecd1137845ccfe72a1d2e3e1660f8e2264dc46cc34dfa9f1037f14f84115f33";
     };
     dependencies = [];
 
   };
 
   vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jade-2016-01-03";
+    name = "vim-jade-2016-01-21";
     src = fetchgit {
       url = "git://github.com/digitaltoad/vim-jade";
-      rev = "999cd2859a7772de707a70afc97f5a7d41a82df9";
-      sha256 = "039c1e9b91ac6417c2f38e8b30647115b10ad5485e78782a84100f22ae2da1d8";
+      rev = "319cba1ee5313e8b50fd912d10dfe40a171f0312";
+      sha256 = "280ef32d862793b42685aba4802f919928b52b93328d0cef35584a83baf884d0";
     };
     dependencies = [];
 
   };
 
   neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neco-ghc-2015-11-20";
+    name = "neco-ghc-2016-01-20";
     src = fetchgit {
       url = "git://github.com/eagletmt/neco-ghc";
-      rev = "53a3d63bc4ecc10d8506a40a0472987f262050da";
-      sha256 = "85ff5e1564a7fd81bbfcec1f4d16e675c2dd1fba38223dbae134f665f03985a8";
+      rev = "26515b4219c04448d37d6cb4a3c54f2d3080b056";
+      sha256 = "265ee24be8f9bf6d067213a751fd54ddcb53570831e7520af41c3eb7f5184fcd";
     };
     dependencies = [];
 
@@ -432,11 +432,11 @@ rec {
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2016-01-04";
+    name = "vim-go-2016-01-22";
     src = fetchgit {
       url = "git://github.com/fatih/vim-go";
-      rev = "eec4e3e8a8227fe24618e114ff2e644615f51ad6";
-      sha256 = "6868d9e9cd8ddad25526407ef843530e86f62e734649e600c8aef9cc2adea381";
+      rev = "1beac4aadccb921b3cb264a8e254b75c8a326c21";
+      sha256 = "02e92ab38a667c0355a4e5c48e1fc53a7ad416208e9151ff4a9cbd7d477c0fc6";
     };
     dependencies = [];
 
@@ -454,33 +454,33 @@ rec {
   };
 
   idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "idris-vim-2016-01-04";
+    name = "idris-vim-2016-01-14";
     src = fetchgit {
       url = "git://github.com/idris-hackers/idris-vim";
-      rev = "f8e7fda4b8984c7248fd805b62c4a3a2e61bce94";
-      sha256 = "3b4ca5a65acea2c429fc721d1ab00c7ba286c929c31bd131896d8e508df1caaf";
+      rev = "09772ea37a83f8633890fc5cd9221bcf6e22c157";
+      sha256 = "28eab2793950781a416e76657dfdcb58601c31ffafb336e3beb9790eef6a268d";
     };
     dependencies = [];
 
   };
 
   calendar-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "calendar-vim-2015-10-01";
+    name = "calendar-vim-2016-01-19";
     src = fetchgit {
       url = "git://github.com/itchyny/calendar.vim";
-      rev = "9aa130feab18fd142265487ce86f664746a080e0";
-      sha256 = "03b1ddec54f0b06be61dae2c42ac3cffd52833ecbcebd269f0e2a0d720aa9b83";
+      rev = "2a6c13ee8056fe5b82ce6529f426ed63096dc6bc";
+      sha256 = "8228b6e97c42254eb8e8e35e391f24a7fc2f55753af913fe1605b9ade0ff9d98";
     };
     dependencies = [];
 
   };
 
   thumbnail-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "thumbnail-vim-2015-03-15";
+    name = "thumbnail-vim-2016-01-14";
     src = fetchgit {
       url = "git://github.com/itchyny/thumbnail.vim";
-      rev = "19bd717307a8d0986a4a77116f47168fbe11e178";
-      sha256 = "c8c100e1b0ee9c75fc3b6db00b68c47d91bcca8979f6de046aade43fd09e3882";
+      rev = "cf4463dc31722ab116bc61779c515a4b7a1e9af1";
+      sha256 = "7037916b16f72ea2aaff666e4fa3e1f9546995c0d6fb4634d2dbfac5b184bb26";
     };
     dependencies = [];
 
@@ -509,11 +509,11 @@ rec {
   };
 
   vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-buffergator-2015-12-16";
+    name = "vim-buffergator-2016-01-21";
     src = fetchgit {
       url = "git://github.com/jeetsukumaran/vim-buffergator";
-      rev = "ab5ef1a2c3b5076204ed3ee1601fcedda379967b";
-      sha256 = "5c479d884bccf6a07891aff2cb09fbaf59d8460bdc91ad9fb19cf0d8e020c29d";
+      rev = "9a6a946a41bcf492dfe8da5eee4cc2ee3d55c77f";
+      sha256 = "6df3d1bffb42f7a96b3136ed80534380ba9e2f508b14dbd665260ffe240ccfee";
     };
     dependencies = [];
 
@@ -619,33 +619,33 @@ rec {
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2016-01-07";
+    name = "vimtex-2016-01-15";
     src = fetchgit {
       url = "git://github.com/lervag/vimtex";
-      rev = "db137566d540ac01a6013263069463a95f64a61d";
-      sha256 = "352436cd29aba8919f05d0e5e544c9d9addd62d850572d06bcbb58d15e9f8f8a";
+      rev = "1aedd5a7464c93af5af86fec2f4cfce97d5f2947";
+      sha256 = "5fcc46c0dcfd41e15dfdbc66417834e1b933cfb7ae3de9e16cfd3975bc196ba1";
     };
     dependencies = [];
 
   };
 
   vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easymotion-2016-01-03";
+    name = "vim-easymotion-2016-01-22";
     src = fetchgit {
       url = "git://github.com/lokaltog/vim-easymotion";
-      rev = "39abbf30a7bfc16de139b52ce0d7d2a286da52a8";
-      sha256 = "5c0be765c2fdb95c632020e0d03a70a2683a9d8f5b2d934be94b89cdb9bbd089";
+      rev = "799491e007515890aff363b6eac5dbc9c5aa7f80";
+      sha256 = "037ee34adc0811571c536cdd37fcfa2d483dd76276380c8858dfe134893bf5e7";
     };
     dependencies = [];
 
   };
 
   vim-xkbswitch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-xkbswitch-2016-01-08";
+    name = "vim-xkbswitch-2016-01-12";
     src = fetchgit {
       url = "git://github.com/lyokha/vim-xkbswitch";
-      rev = "89d7719ca1b69d4d18eda271b8fa75af2eec0aa9";
-      sha256 = "afb8bdba422cc176f18ee3d23cdd9c208bf7f87c488f0b230071806c45c71d0f";
+      rev = "46858cbe11a8d1a2abc94de8c817465d0020d6f6";
+      sha256 = "36f89ca04c4fa15f4b792620660fefc48f31233351dcc0387d2c4ee0f3c50bbf";
     };
     dependencies = [];
     patchPhase = ''
@@ -656,11 +656,11 @@ rec {
   };
 
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2016-01-05";
+    name = "vim-startify-2016-01-12";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-startify";
-      rev = "e3fb0cd845f9726d30d92ac6293a84bece687c64";
-      sha256 = "42c77cca362aa8b40345d3296689fc1df564362ea3bd781d114315e64fc9a380";
+      rev = "8545f6f553640dc0318582c9749c893f2be3345e";
+      sha256 = "cf98c35c106998d7432df572501f7e3d9e452e8104eec3726e9fa6c94c592029";
     };
     dependencies = [];
 
@@ -700,22 +700,22 @@ rec {
   };
 
   vim-watchdogs = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-watchdogs-2015-12-27";
+    name = "vim-watchdogs-2016-01-13";
     src = fetchgit {
       url = "git://github.com/osyo-manga/vim-watchdogs";
-      rev = "52842b03ab0c2e60563ff121d274f8a66ca7e0fc";
-      sha256 = "bbf304319a40e755d47afbe0f172ad47aea35f5253669e5da60d8bd717b67070";
+      rev = "ebcf3df39007aa5d65910f44eb20c9caea9007df";
+      sha256 = "3261d098ae472ec29159b724cf4851d6304d7798e3da6daa4d34be8d308b1a2c";
     };
     dependencies = [];
 
   };
 
   racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "racer-2016-01-02";
+    name = "racer-2016-01-22";
     src = fetchgit {
       url = "git://github.com/phildawes/racer";
-      rev = "c94a17f844c13d2f115a53013c0f9e063bc31f23";
-      sha256 = "fc42c224fbe12459e17c941ab6d084c838f11b1aabec55eaeebf617df2037124";
+      rev = "1021df4b42436673f0124a62cad09e62d181635d";
+      sha256 = "cef501a639da79bce31532b5f06570bd9c255a3d29ac97c6a4b67d640758bddb";
     };
     dependencies = [];
     buildPhase = ''
@@ -725,44 +725,44 @@ rec {
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neocomplete-vim-2016-01-03";
+    name = "neocomplete-vim-2016-01-22";
     src = fetchgit {
       url = "git://github.com/shougo/neocomplete.vim";
-      rev = "4c108ddadcf44c83c2ee38e5ac0dc8b0b31ed9a8";
-      sha256 = "b112cfac177c142f09e4904f9d1b30ca402ed7642f0a4f8f003808dd804df52a";
+      rev = "1606b89be1c4718115503156a657344bb3c62593";
+      sha256 = "18c11d7f2aab440d895a742d63c58df5aa7d6353cbbf396ff31d1c85c617295a";
     };
     dependencies = [];
 
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-snippets-2016-01-04";
+    name = "neosnippet-snippets-2016-01-22";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet-snippets";
-      rev = "1c6dacb99fcbeb186646ecafda3f07e07484b326";
-      sha256 = "fd834aa6d612f124d9d443d1ac11a0749d4df18f012de0c3729de2ecc3cbead5";
+      rev = "ac866f64a507f8a9c7e2691d947e5eaea679e50b";
+      sha256 = "b1493c4b26ec68fab5e994f462c71f8db0341a2d4b8e42c4ee4f2604562b1247";
     };
     dependencies = [];
 
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2016-01-04";
+    name = "neosnippet-vim-2016-01-20";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet.vim";
-      rev = "ac6ac62a5bf259f2db5aaf0751b919b377d1a9b2";
-      sha256 = "e9eaf68211965a71619bd3ff477982af7eccc30e6cb430a8fbf553469b22c127";
+      rev = "52f8a2948957018572760837c165113dbb450e2b";
+      sha256 = "a3451afd1896c0198fa9a3f3fd354efd2d0c7f1b59c15b43adf5db1b6c5e276b";
     };
     dependencies = [];
 
   };
 
   unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "unite-vim-2016-01-06";
+    name = "unite-vim-2016-01-17";
     src = fetchgit {
       url = "git://github.com/shougo/unite.vim";
-      rev = "98e9f3922b058145a0de08c5eb47990d34175252";
-      sha256 = "eebec7f7c292ecbcc84219f79f1b74fa4183b1147fa577e9f1035f9c553fc95e";
+      rev = "c9ce3b13c19352e3b791db227aa373c0b028d656";
+      sha256 = "34319f371b11d97ca3b08b367c919f534bff13a8ab10cf532207e1bf62092f72";
     };
     dependencies = [];
 
@@ -798,11 +798,11 @@ rec {
   };
 
   gundo-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "gundo-vim-2015-12-07";
+    name = "gundo-vim-2016-01-19";
     src = fetchgit {
       url = "git://github.com/sjl/gundo.vim";
-      rev = "dd5ab1e930deb8c74ea9046654dd0587df0cf459";
-      sha256 = "6fe21b7398d8eb9b18f2015f64b7d40768123c2dbbde829d654d3dbf1ffb8070";
+      rev = "e7fe41024ace9047eee610f23311d44fd9d917c0";
+      sha256 = "30955656dd2cb6017e14658a3a5e98c79ec87ff1264b70cd6f628a4f3216bfcd";
     };
     dependencies = [];
 
@@ -875,11 +875,11 @@ rec {
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2016-01-05";
+    name = "youcompleteme-2016-01-20";
     src = fetchgit {
       url = "git://github.com/valloric/youcompleteme";
-      rev = "4168a829accbe895ebc82b54de6f929afe4ac9a5";
-      sha256 = "a6df584dd9f244f8888bae0e60bb5742b841169fcf8efef9a052c0353c775405";
+      rev = "d05bf551a677ac70d5b6de707a7174a97dccd4dd";
+      sha256 = "28478612ddd2b917170e88d069687b65778fcb71a31f4aca7c26aa478b09a849";
     };
     dependencies = [];
     buildInputs = [
@@ -1010,22 +1010,22 @@ rec {
   };
 
   vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-wakatime-2016-01-06";
+    name = "vim-wakatime-2016-01-11";
     src = fetchgit {
       url = "git://github.com/wakatime/vim-wakatime";
-      rev = "044b2138fb536df7e90fc4b3b2257eda43e76378";
-      sha256 = "2a9589bdf89471c090394bfb4001e673d1da9064dfe3d100e1f9ac3672d7250b";
+      rev = "91262cb3c04fe4d98ecdffe8da2197537c66359c";
+      sha256 = "992e41ba32d575bb0bced8b2616cf08aab73f9980292fbc58c94c7f99f914540";
     };
     dependencies = [];
     buildInputs = [ python ];
   };
 
   command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "command-t-2016-01-01";
+    name = "command-t-2016-01-19";
     src = fetchgit {
       url = "git://github.com/wincent/command-t";
-      rev = "978c0a6bbd8a318023a19787f95cc2041c614db6";
-      sha256 = "954bf0285ec37e975b227d3a1e80165fc52be673d9c5e510265dc911e06ff066";
+      rev = "b772049e7e92a354702a9400ad185070ac7e7646";
+      sha256 = "425f50d0c21c7f95bdd29532f487d00c7bccb97fb2e372a87a6a5bf2fd11a916";
     };
     dependencies = [];
     buildInputs = [ perl ruby ];
@@ -1071,11 +1071,11 @@ rec {
   };
 
   pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "pathogen-2015-12-25";
+    name = "pathogen-2016-01-19";
     src = fetchgit {
       url = "git://github.com/tpope/vim-pathogen";
-      rev = "4d584ea8c85408ca0d68b7b1693f3e2db8aa762a";
-      sha256 = "1a1b5e650aa5ff107ce68fecf4d9a57cafc2c15ab74686c5ea3c5985de07470d";
+      rev = "b4f20ff0acc8267875ca7a3841756fe18d55db15";
+      sha256 = "649bdbc573fff16bf4bbb2f50f87978576a86af6fd836bef4f64e1e7996fdfe2";
     };
     dependencies = [];
 
@@ -1202,11 +1202,11 @@ rec {
   };
 
   tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tlib-2016-01-06";
+    name = "tlib-2016-01-21";
     src = fetchgit {
       url = "git://github.com/tomtom/tlib_vim";
-      rev = "e8b53d80f73d98a9accd8b33344fd8821c8e71f7";
-      sha256 = "5269b8949170443ebfccd8ce21238ef3c5cb2aeb857b1ea4aa5733298a75a382";
+      rev = "3232708995e0e61d8e39af40e7a92598e30b84e8";
+      sha256 = "525c31d4fdef8c44709b8d0b77d8ef70acf77b2375df40837088aeb0d4368747";
     };
     dependencies = [];
 
@@ -1433,11 +1433,11 @@ rec {
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2016-01-05";
+    name = "vim-airline-2016-01-22";
     src = fetchgit {
       url = "git://github.com/bling/vim-airline";
-      rev = "ca6ab34e3ce2d25e5625fe56ef31d5032c69dbec";
-      sha256 = "0a4352d8d1602c8eba62ab5c97c418c14eee9be142eb949d49c7b2866892e259";
+      rev = "fb255b570de5582af13563e243fba743dfd0edc9";
+      sha256 = "2dbd61c157ba58213bdccb595bfa13951f4e1db8fa4fbce8ddf94aa3a87c938c";
     };
     dependencies = [];
 
@@ -1466,22 +1466,22 @@ rec {
   };
 
   vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gista-2015-09-30";
+    name = "vim-gista-2016-01-23";
     src = fetchgit {
       url = "git://github.com/lambdalisue/vim-gista";
-      rev = "a6cc5edc4e6dfcf7f6d7cf4dbcfbca6082f78957";
-      sha256 = "68ecb6e1700e4e8f16c4096a8a554e3517e15d84bd1c07dbec4680c3947d1970";
+      rev = "2021858d9cada2289a866387ba728dd025093aa1";
+      sha256 = "1e3e925cdb6a9296f20c2261efb96eac0792e12c3b7a4f6a1637ac0a96255eb4";
     };
     dependencies = [];
 
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2015-12-16";
+    name = "vim-gitgutter-2016-01-19";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
-      rev = "f52f875fc7b25b601366bd6c0d67c53ad84f9559";
-      sha256 = "43e36cff7c12115f05dc3dc5225f38e6c084bf37f8a43a600ad54861392eadf7";
+      rev = "4510e9b33506b4b09168c99934c42ee1ce89bba2";
+      sha256 = "77d97922e8970fcdb037272a53c2ab4209d804aced7ae654f6aeb4501705bcd8";
     };
     dependencies = [];
 
@@ -1510,11 +1510,11 @@ rec {
   };
 
   vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-multiple-cursors-2016-01-01";
+    name = "vim-multiple-cursors-2016-01-14";
     src = fetchgit {
       url = "git://github.com/terryma/vim-multiple-cursors";
-      rev = "0dfd3f91b0ea1c70be8873d0a9e5c7d00369610f";
-      sha256 = "820662a93102bc1fac679f108d5e3400f7f5431196d84abf24484849e004c325";
+      rev = "e543fc86f0c6a8981c9679beceb06482778c3531";
+      sha256 = "d10506c2196b32d389027a359f382d41c7c972f615a6745b9ee41c17741e062a";
     };
     dependencies = [];
 
@@ -1532,22 +1532,22 @@ rec {
   };
 
   vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2016-01-07";
+    name = "vim-signify-2016-01-15";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-signify";
-      rev = "e134c152e05ec750091349629f048fe3d5d49962";
-      sha256 = "68615d43c4d8a2573c19011a77409d8de62eede252759d84f6318409009e15d3";
+      rev = "4f69c11c7cd7b75bb23cf7565f278af918816546";
+      sha256 = "816f7472f04043139f216b91fc36612a9d73cddd86ca6c1cf86a7d48ca2d20e3";
     };
     dependencies = [];
 
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2016-01-08";
+    name = "vim-snippets-2016-01-17";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "ac2c763c05fa5ff27ed66b3a0f22f0f41c22192d";
-      sha256 = "52ccca1e588a15745754651c3cbc57ae706d42d2dff8d4401374502b02787d60";
+      rev = "0fc7fd1181f33b26c015d0f306d149b756f9d679";
+      sha256 = "d67ccdcfa42e8e713e7a5bee34b5b150fb955a81fdddfe9c956a1f652f1235b6";
     };
     dependencies = [];
 

From ee81df1a92970c80d0079dac0ecaf4cb34f07b53 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 22 Jan 2016 15:13:41 -0600
Subject: [PATCH 0282/2285] melpaPackages.graphene: mark broken

---
 pkgs/applications/editors/emacs-modes/melpa-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
index e5135b2c0c35..f213ba396a7b 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-packages.nix
@@ -89,6 +89,9 @@ self:
       # upstream issue: missing file header
       fold-dwim = markBroken super.fold-dwim;
 
+      # build timeout
+      graphene = markBroken super.graphene;
+
       # upstream issue: mismatched filename
       helm-lobsters = markBroken super.helm-lobsters;
 

From c5393b7b247935e2e4fab94920e5720ea19b7ca5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 22 Jan 2016 15:14:05 -0600
Subject: [PATCH 0283/2285] melpaStablePackages.graphene: mark broken

---
 .../applications/editors/emacs-modes/melpa-stable-packages.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
index 0d9061d9808e..e026625398ae 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-stable-packages.nix
@@ -87,6 +87,9 @@ self:
       # upstream issue: missing file header
       fold-dwim = markBroken super.fold-dwim;
 
+      # build timeout
+      graphene = markBroken super.graphene;
+
       # upstream issue: mismatched filename
       helm-lobsters = markBroken super.helm-lobsters;
 

From aeda2a129f2eeb3c0600e86ac8d9967ca9c5f0ad Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 22 Jan 2016 15:18:12 -0600
Subject: [PATCH 0284/2285] emacs-isearch-plus: 20160115.1122 -> 20160118.1030

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

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index ea8ffb52f152..e146b9cb4106 100644
--- a/pkgs/applications/editors/emacs-modes/melpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
@@ -29697,10 +29697,10 @@
       }) {};
     isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "isearch-plus";
-        version = "20160115.1122";
+        version = "20160118.1030";
         src = fetchurl {
           url = "http://www.emacswiki.org/emacs/download/isearch+.el";
-          sha256 = "0wgfjl083nz7p5j9gbsq7ki7wpjikb8546iiaydkx5ay3lrcg7nf";
+          sha256 = "176krgrrjvj6r6iahr53ncxm2hrc4nmkyz43lc2rbnpivih4z9i6";
         };
         recipeFile = fetchurl {
           url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/isearch+";

From ecc48af0ce20e24a7e4d56e663f5752d69384644 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 20 Jan 2016 15:31:20 +0100
Subject: [PATCH 0285/2285] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20151217-9-geddefc2 using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/a28e076b479ce0ef15fa8d2249718b9154f1ff6a
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/c63083af590a6a4f6bcce8b20cdb371a0548bbef
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/cf055c2754aa9858a857c28595024da1fde9eb14
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/8f10b44c120432146160af46c2e0a5456e3b5a10
---
 .../haskell-modules/configuration-lts-0.0.nix |    8 +
 .../haskell-modules/configuration-lts-0.1.nix |    8 +
 .../haskell-modules/configuration-lts-0.2.nix |    8 +
 .../haskell-modules/configuration-lts-0.3.nix |    8 +
 .../haskell-modules/configuration-lts-0.4.nix |    8 +
 .../haskell-modules/configuration-lts-0.5.nix |    8 +
 .../haskell-modules/configuration-lts-0.6.nix |    9 +
 .../haskell-modules/configuration-lts-0.7.nix |    9 +
 .../haskell-modules/configuration-lts-1.0.nix |    9 +
 .../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                |   11 +
 .../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 |   12 +
 .../haskell-modules/configuration-lts-2.1.nix |   12 +
 .../configuration-lts-2.10.nix                |   12 +
 .../configuration-lts-2.11.nix                |   12 +
 .../configuration-lts-2.12.nix                |   12 +
 .../configuration-lts-2.13.nix                |   13 +
 .../configuration-lts-2.14.nix                |   13 +
 .../configuration-lts-2.15.nix                |   13 +
 .../configuration-lts-2.16.nix                |   13 +
 .../configuration-lts-2.17.nix                |   13 +
 .../configuration-lts-2.18.nix                |   13 +
 .../configuration-lts-2.19.nix                |   13 +
 .../haskell-modules/configuration-lts-2.2.nix |   12 +
 .../configuration-lts-2.20.nix                |   13 +
 .../configuration-lts-2.21.nix                |   13 +
 .../configuration-lts-2.22.nix                |   13 +
 .../haskell-modules/configuration-lts-2.3.nix |   12 +
 .../haskell-modules/configuration-lts-2.4.nix |   12 +
 .../haskell-modules/configuration-lts-2.5.nix |   12 +
 .../haskell-modules/configuration-lts-2.6.nix |   12 +
 .../haskell-modules/configuration-lts-2.7.nix |   12 +
 .../haskell-modules/configuration-lts-2.8.nix |   12 +
 .../haskell-modules/configuration-lts-2.9.nix |   12 +
 .../haskell-modules/configuration-lts-3.0.nix |   16 +
 .../haskell-modules/configuration-lts-3.1.nix |   17 +
 .../configuration-lts-3.10.nix                |   19 +
 .../configuration-lts-3.11.nix                |   21 +
 .../configuration-lts-3.12.nix                |   21 +
 .../configuration-lts-3.13.nix                |   21 +
 .../configuration-lts-3.14.nix                |   22 +
 .../configuration-lts-3.15.nix                |   22 +
 .../configuration-lts-3.16.nix                |   22 +
 .../configuration-lts-3.17.nix                |   23 +
 .../configuration-lts-3.18.nix                |   23 +
 .../configuration-lts-3.19.nix                |   24 +
 .../haskell-modules/configuration-lts-3.2.nix |   17 +
 .../configuration-lts-3.20.nix                |   25 +
 .../configuration-lts-3.21.nix                |   25 +
 .../configuration-lts-3.22.nix                |   25 +
 .../haskell-modules/configuration-lts-3.3.nix |   17 +
 .../haskell-modules/configuration-lts-3.4.nix |   18 +
 .../haskell-modules/configuration-lts-3.5.nix |   19 +
 .../haskell-modules/configuration-lts-3.6.nix |   19 +
 .../haskell-modules/configuration-lts-3.7.nix |   19 +
 .../haskell-modules/configuration-lts-3.8.nix |   19 +
 .../haskell-modules/configuration-lts-3.9.nix |   19 +
 .../haskell-modules/configuration-lts-4.0.nix |   34 +
 .../haskell-modules/configuration-lts-4.1.nix |   35 +
 .../haskell-modules/configuration-lts-4.2.nix |   37 +
 .../haskell-modules/hackage-packages.nix      | 1056 +++++++++++++----
 72 files changed, 1886 insertions(+), 241 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index 2a8c8706126b..4e3fda8b5d23 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -380,6 +380,7 @@ self: super: {
   "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";
@@ -1157,6 +1158,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -3059,6 +3061,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
   "fake-type" = dontDistribute super."fake-type";
@@ -3390,6 +3393,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_0_3";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4189,6 +4193,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "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";
@@ -6254,6 +6259,7 @@ self: super: {
   "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";
@@ -6525,6 +6531,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyparse" = doDistribute super."polyparse_1_9";
@@ -8688,6 +8695,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index f1067b8c532c..a9ab5b582103 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -380,6 +380,7 @@ self: super: {
   "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";
@@ -1157,6 +1158,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -3059,6 +3061,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
   "fake-type" = dontDistribute super."fake-type";
@@ -3390,6 +3393,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_0_3";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4189,6 +4193,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "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";
@@ -6254,6 +6259,7 @@ self: super: {
   "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";
@@ -6525,6 +6531,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyparse" = doDistribute super."polyparse_1_9";
@@ -8688,6 +8695,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 41cb615271e6..6818ecf8d0fb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -380,6 +380,7 @@ self: super: {
   "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";
@@ -1157,6 +1158,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -3059,6 +3061,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
   "fake-type" = dontDistribute super."fake-type";
@@ -3390,6 +3393,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_0_3";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4189,6 +4193,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "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";
@@ -6254,6 +6259,7 @@ self: super: {
   "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";
@@ -6525,6 +6531,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyparse" = doDistribute super."polyparse_1_9";
@@ -8688,6 +8695,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index 0218ed14429f..295e11b60b2d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -380,6 +380,7 @@ self: super: {
   "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";
@@ -1157,6 +1158,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -3059,6 +3061,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
   "fake-type" = dontDistribute super."fake-type";
@@ -3390,6 +3393,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_0_3";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4189,6 +4193,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "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";
@@ -6254,6 +6259,7 @@ self: super: {
   "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";
@@ -6525,6 +6531,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyparse" = doDistribute super."polyparse_1_9";
@@ -8688,6 +8695,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index 9f4c43b850d5..0334003db169 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -380,6 +380,7 @@ self: super: {
   "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";
@@ -1157,6 +1158,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -3058,6 +3060,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
   "fake-type" = dontDistribute super."fake-type";
@@ -3389,6 +3392,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_0_4";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4186,6 +4190,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "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";
@@ -6251,6 +6256,7 @@ self: super: {
   "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";
@@ -6522,6 +6528,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyparse" = doDistribute super."polyparse_1_9";
@@ -8684,6 +8691,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index dc01c1d3197a..4042ab797b9a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -380,6 +380,7 @@ self: super: {
   "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";
@@ -1157,6 +1158,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -3058,6 +3060,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
   "fake-type" = dontDistribute super."fake-type";
@@ -3389,6 +3392,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_0_4";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4186,6 +4190,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "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";
@@ -6251,6 +6256,7 @@ self: super: {
   "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";
@@ -6522,6 +6528,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyparse" = doDistribute super."polyparse_1_9";
@@ -8684,6 +8691,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index 814e9f36a485..f1ef0fc40118 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -380,6 +380,7 @@ self: super: {
   "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";
@@ -1156,6 +1157,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1470,6 +1472,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authenticate-oauth" = dontDistribute super."authenticate-oauth";
@@ -3055,6 +3058,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
   "fake-type" = dontDistribute super."fake-type";
@@ -3386,6 +3390,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_0_4";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4182,6 +4187,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "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";
@@ -6246,6 +6252,7 @@ self: super: {
   "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";
@@ -6517,6 +6524,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyparse" = doDistribute super."polyparse_1_9";
@@ -8678,6 +8686,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index 99c19cd1cc93..56377c59a86e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -380,6 +380,7 @@ self: super: {
   "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";
@@ -1156,6 +1157,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1470,6 +1472,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authenticate-oauth" = dontDistribute super."authenticate-oauth";
@@ -3055,6 +3058,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
   "fake-type" = dontDistribute super."fake-type";
@@ -3386,6 +3390,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_0_4";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4182,6 +4187,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "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";
@@ -6246,6 +6252,7 @@ self: super: {
   "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";
@@ -6517,6 +6524,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyparse" = doDistribute super."polyparse_1_9";
@@ -8678,6 +8686,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index 8cb57c46e956..4ddb79ea5c30 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -378,6 +378,7 @@ self: super: {
   "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";
@@ -1152,6 +1153,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1466,6 +1468,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authenticate-oauth" = dontDistribute super."authenticate-oauth";
@@ -3045,6 +3048,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
   "fake-type" = dontDistribute super."fake-type";
@@ -3376,6 +3380,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_0_4";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4172,6 +4177,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "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";
@@ -6234,6 +6240,7 @@ self: super: {
   "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";
@@ -6505,6 +6512,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyparse" = doDistribute super."polyparse_1_10";
@@ -8663,6 +8671,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index f56ea186e054..3ff3228c11e0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -378,6 +378,7 @@ self: super: {
   "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";
@@ -1152,6 +1153,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1466,6 +1468,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authenticate-oauth" = dontDistribute super."authenticate-oauth";
@@ -1983,6 +1986,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -3041,6 +3045,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
   "fake-type" = dontDistribute super."fake-type";
@@ -3372,6 +3377,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4167,6 +4173,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "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";
@@ -6226,6 +6233,7 @@ self: super: {
   "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";
@@ -6497,6 +6505,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyparse" = doDistribute super."polyparse_1_10";
@@ -8649,6 +8658,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index cb5ad00d5519..156834d1b014 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -378,6 +378,7 @@ self: super: {
   "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";
@@ -1151,6 +1152,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1465,6 +1467,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authenticate-oauth" = dontDistribute super."authenticate-oauth";
@@ -1981,6 +1984,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -3037,6 +3041,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
   "fake-type" = dontDistribute super."fake-type";
@@ -3364,6 +3369,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4156,6 +4162,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "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";
@@ -6206,6 +6213,7 @@ self: super: {
   "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";
@@ -6477,6 +6485,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyparse" = doDistribute super."polyparse_1_10";
@@ -8621,6 +8630,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index c357d2ab45ff..68580bd646a2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -378,6 +378,7 @@ self: super: {
   "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";
@@ -1151,6 +1152,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1465,6 +1467,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authenticate-oauth" = dontDistribute super."authenticate-oauth";
@@ -1981,6 +1984,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -3037,6 +3041,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
   "fake-type" = dontDistribute super."fake-type";
@@ -3363,6 +3368,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4155,6 +4161,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "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";
@@ -6202,6 +6209,7 @@ self: super: {
   "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";
@@ -6473,6 +6481,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyparse" = doDistribute super."polyparse_1_10";
@@ -8617,6 +8626,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index cc767290f9d2..94567fa0531c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -378,6 +378,7 @@ self: super: {
   "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";
@@ -1151,6 +1152,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1465,6 +1467,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authenticate-oauth" = dontDistribute super."authenticate-oauth";
@@ -1981,6 +1984,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -3037,6 +3041,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
   "fake-type" = dontDistribute super."fake-type";
@@ -3363,6 +3368,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4154,6 +4160,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -6201,6 +6208,7 @@ self: super: {
   "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";
@@ -6472,6 +6480,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyparse" = doDistribute super."polyparse_1_10";
@@ -8615,6 +8624,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 326970272ed5..0dca6ed6feb7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -378,6 +378,7 @@ self: super: {
   "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";
@@ -1151,6 +1152,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1465,6 +1467,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authenticate-oauth" = dontDistribute super."authenticate-oauth";
@@ -1981,6 +1984,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -3037,6 +3041,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
   "fake-type" = dontDistribute super."fake-type";
@@ -3363,6 +3368,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4153,6 +4159,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -6200,6 +6207,7 @@ self: super: {
   "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";
@@ -6471,6 +6479,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyparse" = doDistribute super."polyparse_1_10";
@@ -8613,6 +8622,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 638fadf1dd5f..25759fe1307b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -377,6 +377,7 @@ self: super: {
   "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";
@@ -1150,6 +1151,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1464,6 +1466,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authenticate-oauth" = dontDistribute super."authenticate-oauth";
@@ -1979,6 +1982,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -3034,6 +3038,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
   "fake-type" = dontDistribute super."fake-type";
@@ -3360,6 +3365,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_1";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4149,6 +4155,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -6194,6 +6201,7 @@ self: super: {
   "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";
@@ -6465,6 +6473,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyparse" = doDistribute super."polyparse_1_10";
@@ -8606,6 +8615,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index 83c3fb2b83ef..f03bbb954901 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -377,6 +377,7 @@ self: super: {
   "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";
@@ -1149,6 +1150,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1463,6 +1465,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authenticate-oauth" = dontDistribute super."authenticate-oauth";
@@ -1978,6 +1981,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -3030,6 +3034,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
   "fake-type" = dontDistribute super."fake-type";
@@ -3356,6 +3361,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4145,6 +4151,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -6188,6 +6195,7 @@ self: super: {
   "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";
@@ -6459,6 +6467,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyparse" = doDistribute super."polyparse_1_10";
@@ -6682,6 +6691,7 @@ self: super: {
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
   "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -8596,6 +8606,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index 412075b04f8a..0a3a26697ebc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -378,6 +378,7 @@ self: super: {
   "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";
@@ -1152,6 +1153,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1466,6 +1468,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authenticate-oauth" = dontDistribute super."authenticate-oauth";
@@ -1983,6 +1986,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -3039,6 +3043,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
   "fake-type" = dontDistribute super."fake-type";
@@ -3370,6 +3375,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4164,6 +4170,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "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";
@@ -6222,6 +6229,7 @@ self: super: {
   "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";
@@ -6493,6 +6501,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyparse" = doDistribute super."polyparse_1_10";
@@ -8643,6 +8652,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index e671fefe4b10..11546e04a4ab 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -378,6 +378,7 @@ self: super: {
   "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";
@@ -1151,6 +1152,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1465,6 +1467,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authenticate-oauth" = dontDistribute super."authenticate-oauth";
@@ -1982,6 +1985,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -3038,6 +3042,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
   "fake-type" = dontDistribute super."fake-type";
@@ -3368,6 +3373,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4161,6 +4167,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "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";
@@ -6218,6 +6225,7 @@ self: super: {
   "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";
@@ -6489,6 +6497,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyparse" = doDistribute super."polyparse_1_10";
@@ -8638,6 +8647,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index e9a469fd5fb7..974e9e051864 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -378,6 +378,7 @@ self: super: {
   "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";
@@ -1151,6 +1152,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1465,6 +1467,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authenticate-oauth" = dontDistribute super."authenticate-oauth";
@@ -1981,6 +1984,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -3037,6 +3041,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
   "fake-type" = dontDistribute super."fake-type";
@@ -3367,6 +3372,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4160,6 +4166,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "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";
@@ -6217,6 +6224,7 @@ self: super: {
   "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";
@@ -6488,6 +6496,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyparse" = doDistribute super."polyparse_1_10";
@@ -8635,6 +8644,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index c65c260519ec..554ba8f04202 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -378,6 +378,7 @@ self: super: {
   "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";
@@ -1151,6 +1152,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1465,6 +1467,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authenticate-oauth" = dontDistribute super."authenticate-oauth";
@@ -1981,6 +1984,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -3037,6 +3041,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
   "fake-type" = dontDistribute super."fake-type";
@@ -3367,6 +3372,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4160,6 +4166,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "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";
@@ -6212,6 +6219,7 @@ self: super: {
   "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";
@@ -6483,6 +6491,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyparse" = doDistribute super."polyparse_1_10";
@@ -8630,6 +8639,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index 44c4bde28313..d79f2da11d62 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -378,6 +378,7 @@ self: super: {
   "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";
@@ -1151,6 +1152,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1465,6 +1467,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authenticate-oauth" = dontDistribute super."authenticate-oauth";
@@ -1981,6 +1984,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -3037,6 +3041,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
   "fake-type" = dontDistribute super."fake-type";
@@ -3365,6 +3370,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4157,6 +4163,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "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";
@@ -6208,6 +6215,7 @@ self: super: {
   "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";
@@ -6479,6 +6487,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyparse" = doDistribute super."polyparse_1_10";
@@ -8625,6 +8634,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index f0995fa0b9b6..64c8026b7291 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -378,6 +378,7 @@ self: super: {
   "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";
@@ -1151,6 +1152,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1465,6 +1467,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authenticate-oauth" = dontDistribute super."authenticate-oauth";
@@ -1981,6 +1984,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -3037,6 +3041,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "fair-predicates" = dontDistribute super."fair-predicates";
   "fake-type" = dontDistribute super."fake-type";
@@ -3364,6 +3369,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = dontDistribute super."generic-xmlpickler";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4156,6 +4162,7 @@ self: super: {
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
   "here" = doDistribute super."here_1_2_6";
+  "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";
@@ -6207,6 +6214,7 @@ self: super: {
   "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";
@@ -6478,6 +6486,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyparse" = doDistribute super."polyparse_1_10";
@@ -8624,6 +8633,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 2d9bc2b2a9ed..3a14233ea2e3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -228,6 +228,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -375,6 +376,7 @@ self: super: {
   "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";
@@ -1141,6 +1143,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1454,6 +1457,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1967,6 +1971,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -3014,6 +3019,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3338,6 +3344,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_0";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4124,6 +4131,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -6137,6 +6145,7 @@ self: super: {
   "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";
@@ -6405,6 +6414,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6627,6 +6637,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -8531,6 +8542,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 830961d13b19..82b1a353a114 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -228,6 +228,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -375,6 +376,7 @@ self: super: {
   "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";
@@ -1141,6 +1143,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1454,6 +1457,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1966,6 +1970,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -3013,6 +3018,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3337,6 +3343,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_0";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4123,6 +4130,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -6136,6 +6144,7 @@ self: super: {
   "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";
@@ -6404,6 +6413,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6626,6 +6636,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -8529,6 +8540,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index 78d3935c2dc6..5ebadb1e29ba 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -228,6 +228,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -374,6 +375,7 @@ self: super: {
   "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";
@@ -1136,6 +1138,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_1";
+  "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";
@@ -1447,6 +1450,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1954,6 +1958,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -2996,6 +3001,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3318,6 +3324,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_2";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4102,6 +4109,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -6100,6 +6108,7 @@ self: super: {
   "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";
@@ -6365,6 +6374,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6586,6 +6596,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -8477,6 +8488,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 076a684b5a41..623c57152547 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -228,6 +228,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -374,6 +375,7 @@ self: super: {
   "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";
@@ -1136,6 +1138,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_1";
+  "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";
@@ -1446,6 +1449,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1953,6 +1957,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -2995,6 +3000,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3317,6 +3323,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_2";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4099,6 +4106,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -6094,6 +6102,7 @@ self: super: {
   "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";
@@ -6359,6 +6368,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6580,6 +6590,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -8468,6 +8479,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 32166166218c..60498ad14a0d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -228,6 +228,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -374,6 +375,7 @@ self: super: {
   "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";
@@ -1136,6 +1138,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_1";
+  "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";
@@ -1446,6 +1449,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1953,6 +1957,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -2995,6 +3000,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3317,6 +3323,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_2";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4099,6 +4106,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -6094,6 +6102,7 @@ self: super: {
   "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";
@@ -6359,6 +6368,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6580,6 +6590,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -8467,6 +8478,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index 979e2b294023..37ab6fddf3a2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -228,6 +228,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -374,6 +375,7 @@ self: super: {
   "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";
@@ -1136,6 +1138,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_1";
+  "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";
@@ -1446,6 +1449,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1953,6 +1957,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -2995,6 +3000,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3317,6 +3323,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_2";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4098,6 +4105,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5829,6 +5837,7 @@ self: super: {
   "netrc" = dontDistribute super."netrc";
   "netspec" = dontDistribute super."netspec";
   "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle" = doDistribute super."nettle_0_1_1";
   "nettle-frp" = dontDistribute super."nettle-frp";
   "nettle-netkit" = dontDistribute super."nettle-netkit";
   "nettle-openflow" = dontDistribute super."nettle-openflow";
@@ -6091,6 +6100,7 @@ self: super: {
   "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";
@@ -6356,6 +6366,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6577,6 +6588,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -8464,6 +8476,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 7dff9d190cec..e5f971b07b8b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -228,6 +228,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -374,6 +375,7 @@ self: super: {
   "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";
@@ -1136,6 +1138,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_1";
+  "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";
@@ -1445,6 +1448,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1952,6 +1956,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -2994,6 +2999,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3315,6 +3321,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_2";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4096,6 +4103,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5826,6 +5834,7 @@ self: super: {
   "netrc" = dontDistribute super."netrc";
   "netspec" = dontDistribute super."netspec";
   "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle" = doDistribute super."nettle_0_1_1";
   "nettle-frp" = dontDistribute super."nettle-frp";
   "nettle-netkit" = dontDistribute super."nettle-netkit";
   "nettle-openflow" = dontDistribute super."nettle-openflow";
@@ -6088,6 +6097,7 @@ self: super: {
   "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";
@@ -6353,6 +6363,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6574,6 +6585,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -8460,6 +8472,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index 77d9589a617e..daf74d57f499 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -228,6 +228,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -374,6 +375,7 @@ self: super: {
   "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";
@@ -1136,6 +1138,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_1";
+  "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";
@@ -1445,6 +1448,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1952,6 +1956,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -2993,6 +2998,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3314,6 +3320,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_2";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4095,6 +4102,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5824,6 +5832,7 @@ self: super: {
   "netrc" = dontDistribute super."netrc";
   "netspec" = dontDistribute super."netspec";
   "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle" = doDistribute super."nettle_0_1_1";
   "nettle-frp" = dontDistribute super."nettle-frp";
   "nettle-netkit" = dontDistribute super."nettle-netkit";
   "nettle-openflow" = dontDistribute super."nettle-openflow";
@@ -6084,6 +6093,7 @@ self: super: {
   "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";
@@ -6349,6 +6359,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6570,6 +6581,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -8455,6 +8467,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index 20567d640db6..9d7781af7e71 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -227,6 +227,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -373,6 +374,7 @@ self: super: {
   "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";
@@ -1135,6 +1137,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_1";
+  "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";
@@ -1444,6 +1447,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1951,6 +1955,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -2989,6 +2994,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3309,6 +3315,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_2";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4090,6 +4097,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5818,6 +5826,7 @@ self: super: {
   "netrc" = dontDistribute super."netrc";
   "netspec" = dontDistribute super."netspec";
   "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle" = doDistribute super."nettle_0_1_1";
   "nettle-frp" = dontDistribute super."nettle-frp";
   "nettle-netkit" = dontDistribute super."nettle-netkit";
   "nettle-openflow" = dontDistribute super."nettle-openflow";
@@ -6078,6 +6087,7 @@ self: super: {
   "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";
@@ -6343,6 +6353,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6564,6 +6575,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -8449,6 +8461,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index b92c1dc329c9..994024d52987 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -227,6 +227,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -373,6 +374,7 @@ self: super: {
   "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";
@@ -1135,6 +1137,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_1";
+  "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";
@@ -1443,6 +1446,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1949,6 +1953,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -2986,6 +2991,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3304,6 +3310,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4085,6 +4092,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5813,6 +5821,7 @@ self: super: {
   "netrc" = dontDistribute super."netrc";
   "netspec" = dontDistribute super."netspec";
   "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle" = doDistribute super."nettle_0_1_1";
   "nettle-frp" = dontDistribute super."nettle-frp";
   "nettle-netkit" = dontDistribute super."nettle-netkit";
   "nettle-openflow" = dontDistribute super."nettle-openflow";
@@ -6072,6 +6081,7 @@ self: super: {
   "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";
@@ -6337,6 +6347,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6558,6 +6569,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -8443,6 +8455,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index 5b647aa5c277..ddbb61c0e6cd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -227,6 +227,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -373,6 +374,7 @@ self: super: {
   "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";
@@ -1135,6 +1137,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_1";
+  "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";
@@ -1443,6 +1446,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1948,6 +1952,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -2984,6 +2989,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3302,6 +3308,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4082,6 +4089,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5810,6 +5818,7 @@ self: super: {
   "netrc" = dontDistribute super."netrc";
   "netspec" = dontDistribute super."netspec";
   "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle" = doDistribute super."nettle_0_1_1";
   "nettle-frp" = dontDistribute super."nettle-frp";
   "nettle-netkit" = dontDistribute super."nettle-netkit";
   "nettle-openflow" = dontDistribute super."nettle-openflow";
@@ -6068,6 +6077,7 @@ self: super: {
   "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";
@@ -6332,6 +6342,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6553,6 +6564,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -8437,6 +8449,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index c8efa4b3274d..0806b361a3a1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -227,6 +227,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -373,6 +374,7 @@ self: super: {
   "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";
@@ -1135,6 +1137,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_1";
+  "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";
@@ -1443,6 +1446,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1948,6 +1952,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -2984,6 +2989,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3301,6 +3307,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4081,6 +4088,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5807,6 +5815,7 @@ self: super: {
   "netrc" = dontDistribute super."netrc";
   "netspec" = dontDistribute super."netspec";
   "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle" = doDistribute super."nettle_0_1_1";
   "nettle-frp" = dontDistribute super."nettle-frp";
   "nettle-netkit" = dontDistribute super."nettle-netkit";
   "nettle-openflow" = dontDistribute super."nettle-openflow";
@@ -6065,6 +6074,7 @@ self: super: {
   "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";
@@ -6329,6 +6339,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6550,6 +6561,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -8432,6 +8444,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index 44559155c4fa..a9525906ddad 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -228,6 +228,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -375,6 +376,7 @@ self: super: {
   "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";
@@ -1140,6 +1142,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1453,6 +1456,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1963,6 +1967,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -3010,6 +3015,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3334,6 +3340,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_0";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4120,6 +4127,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -6133,6 +6141,7 @@ self: super: {
   "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";
@@ -6401,6 +6410,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6623,6 +6633,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -8526,6 +8537,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index bb4eaf6d3b16..6e027c872069 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -227,6 +227,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -373,6 +374,7 @@ self: super: {
   "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";
@@ -1135,6 +1137,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_1";
+  "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";
@@ -1443,6 +1446,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1948,6 +1952,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -2983,6 +2988,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3300,6 +3306,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4080,6 +4087,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5806,6 +5814,7 @@ self: super: {
   "netrc" = dontDistribute super."netrc";
   "netspec" = dontDistribute super."netspec";
   "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle" = doDistribute super."nettle_0_1_1";
   "nettle-frp" = dontDistribute super."nettle-frp";
   "nettle-netkit" = dontDistribute super."nettle-netkit";
   "nettle-openflow" = dontDistribute super."nettle-openflow";
@@ -6064,6 +6073,7 @@ self: super: {
   "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";
@@ -6327,6 +6337,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6548,6 +6559,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -8429,6 +8441,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index 40fcb7593629..dadf8a23dd41 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -227,6 +227,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -373,6 +374,7 @@ self: super: {
   "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";
@@ -1135,6 +1137,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_1";
+  "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";
@@ -1443,6 +1446,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1948,6 +1952,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -2983,6 +2988,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3300,6 +3306,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4080,6 +4087,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5805,6 +5813,7 @@ self: super: {
   "netrc" = dontDistribute super."netrc";
   "netspec" = dontDistribute super."netspec";
   "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle" = doDistribute super."nettle_0_1_1";
   "nettle-frp" = dontDistribute super."nettle-frp";
   "nettle-netkit" = dontDistribute super."nettle-netkit";
   "nettle-openflow" = dontDistribute super."nettle-openflow";
@@ -6063,6 +6072,7 @@ self: super: {
   "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";
@@ -6326,6 +6336,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6546,6 +6557,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -8425,6 +8437,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 5763ddb1702c..e08526634eb5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -227,6 +227,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -373,6 +374,7 @@ self: super: {
   "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";
@@ -1135,6 +1137,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_1";
+  "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";
@@ -1443,6 +1446,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1948,6 +1952,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -2983,6 +2988,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3300,6 +3306,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4080,6 +4087,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5803,6 +5811,7 @@ self: super: {
   "netrc" = dontDistribute super."netrc";
   "netspec" = dontDistribute super."netspec";
   "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle" = doDistribute super."nettle_0_1_1";
   "nettle-frp" = dontDistribute super."nettle-frp";
   "nettle-netkit" = dontDistribute super."nettle-netkit";
   "nettle-openflow" = dontDistribute super."nettle-openflow";
@@ -6061,6 +6070,7 @@ self: super: {
   "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";
@@ -6324,6 +6334,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6544,6 +6555,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -8423,6 +8435,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index 9c7903faf60d..a7b174ac6973 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -228,6 +228,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -375,6 +376,7 @@ self: super: {
   "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";
@@ -1140,6 +1142,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1453,6 +1456,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1963,6 +1967,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -3010,6 +3015,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3333,6 +3339,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_0";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4119,6 +4126,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -6131,6 +6139,7 @@ self: super: {
   "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";
@@ -6399,6 +6408,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6621,6 +6631,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -8524,6 +8535,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 4901f07287b4..bd91cd5d3abe 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -228,6 +228,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -375,6 +376,7 @@ self: super: {
   "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";
@@ -1140,6 +1142,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1453,6 +1456,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1962,6 +1966,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -3009,6 +3014,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3332,6 +3338,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_0";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4118,6 +4125,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -6128,6 +6136,7 @@ self: super: {
   "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";
@@ -6395,6 +6404,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6617,6 +6627,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -8519,6 +8530,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index bec45042667e..635a2891ed7d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -228,6 +228,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -375,6 +376,7 @@ self: super: {
   "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";
@@ -1140,6 +1142,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1453,6 +1456,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1962,6 +1966,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -3008,6 +3013,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3331,6 +3337,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_0";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4117,6 +4124,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -6126,6 +6134,7 @@ self: super: {
   "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";
@@ -6393,6 +6402,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6615,6 +6625,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -8517,6 +8528,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index 06260ce1f5a0..8f980cca42f0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -228,6 +228,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -375,6 +376,7 @@ self: super: {
   "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";
@@ -1138,6 +1140,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1451,6 +1454,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1959,6 +1963,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -3005,6 +3010,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3328,6 +3334,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_0";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4112,6 +4119,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -6120,6 +6128,7 @@ self: super: {
   "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";
@@ -6387,6 +6396,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6609,6 +6619,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -8509,6 +8520,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 9fcd55709abe..374c8cb12a05 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -228,6 +228,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -374,6 +375,7 @@ self: super: {
   "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";
@@ -1137,6 +1139,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1450,6 +1453,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1958,6 +1962,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -3004,6 +3009,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3327,6 +3333,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_0";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4111,6 +4118,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -6119,6 +6127,7 @@ self: super: {
   "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";
@@ -6386,6 +6395,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6608,6 +6618,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -8508,6 +8519,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index a72697868af9..0f7c80b6b1c7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -228,6 +228,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -374,6 +375,7 @@ self: super: {
   "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";
@@ -1136,6 +1138,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2";
+  "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";
@@ -1449,6 +1452,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1957,6 +1961,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -3003,6 +3008,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3325,6 +3331,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_0";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4109,6 +4116,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -6116,6 +6124,7 @@ self: super: {
   "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";
@@ -6383,6 +6392,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6605,6 +6615,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -8501,6 +8512,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index c7ccb98a93d4..5fac6754c242 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -228,6 +228,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -374,6 +375,7 @@ self: super: {
   "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";
@@ -1136,6 +1138,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_1";
+  "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";
@@ -1447,6 +1450,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1954,6 +1958,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -2998,6 +3003,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3320,6 +3326,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_0";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -4104,6 +4111,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -6107,6 +6115,7 @@ self: super: {
   "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";
@@ -6373,6 +6382,7 @@ self: super: {
   "poly-arity" = dontDistribute super."poly-arity";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6595,6 +6605,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -8487,6 +8498,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index ee02f8d43031..b9924f20fbd9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -217,6 +217,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -363,6 +364,7 @@ self: super: {
   "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";
@@ -1111,6 +1113,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_1";
+  "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";
@@ -1402,6 +1405,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1887,6 +1891,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -1900,6 +1905,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -2894,6 +2900,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -3203,6 +3210,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3973,6 +3981,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5319,6 +5328,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_7";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5882,6 +5893,7 @@ self: super: {
   "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";
@@ -6135,6 +6147,7 @@ self: super: {
   "poly-arity" = doDistribute super."poly-arity_0_0_4_1";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6354,6 +6367,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7213,6 +7227,7 @@ self: super: {
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
   "stackage-sandbox" = doDistribute super."stackage-sandbox_0_1_5";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -8185,6 +8200,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index d89afbb71781..c81484ff3fb6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -217,6 +217,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -363,6 +364,7 @@ self: super: {
   "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";
@@ -1111,6 +1113,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_1";
+  "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";
@@ -1401,6 +1404,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1886,6 +1890,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -1899,6 +1904,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -2893,6 +2899,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2961,6 +2968,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "file-modules" = dontDistribute super."file-modules";
   "filecache" = dontDistribute super."filecache";
   "filediff" = dontDistribute super."filediff";
@@ -3199,6 +3207,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3969,6 +3978,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5314,6 +5324,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_7";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5876,6 +5888,7 @@ self: super: {
   "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";
@@ -6128,6 +6141,7 @@ self: super: {
   "poly-arity" = doDistribute super."poly-arity_0_0_4_1";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6347,6 +6361,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7205,6 +7220,7 @@ self: super: {
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
   "stackage-sandbox" = doDistribute super."stackage-sandbox_0_1_5";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -8176,6 +8192,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index 8e44f5c8a359..c9947c4a0ca1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -214,6 +214,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -359,6 +360,7 @@ self: super: {
   "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";
@@ -1104,6 +1106,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_2";
+  "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";
@@ -1387,6 +1390,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1843,6 +1847,7 @@ self: super: {
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava" = doDistribute super."cassava_0_4_4_0";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
   "cassava-streams" = dontDistribute super."cassava-streams";
   "cassette" = dontDistribute super."cassette";
@@ -1865,6 +1870,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -1878,6 +1884,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -2128,6 +2135,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant" = doDistribute super."contravariant_1_3_3";
   "contravariant-extras" = dontDistribute super."contravariant-extras";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
@@ -2856,6 +2864,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2923,6 +2932,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "file-modules" = dontDistribute super."file-modules";
   "filecache" = dontDistribute super."filecache";
   "filediff" = dontDistribute super."filediff";
@@ -3158,6 +3168,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3922,6 +3933,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5254,6 +5266,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_7";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5809,6 +5823,7 @@ self: super: {
   "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";
@@ -6055,6 +6070,7 @@ self: super: {
   "poll" = dontDistribute super."poll";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6268,6 +6284,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7113,6 +7130,7 @@ self: super: {
   "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -8067,6 +8085,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index e6ffde4d57a9..a2908fa2174f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -214,6 +214,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -359,6 +360,7 @@ self: super: {
   "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";
@@ -1104,6 +1106,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_2";
+  "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";
@@ -1387,6 +1390,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1841,6 +1845,7 @@ self: super: {
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava" = doDistribute super."cassava_0_4_4_0";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
   "cassava-streams" = dontDistribute super."cassava-streams";
   "cassette" = dontDistribute super."cassette";
@@ -1863,6 +1868,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -1876,6 +1882,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -2126,6 +2133,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant" = doDistribute super."contravariant_1_3_3";
   "contravariant-extras" = dontDistribute super."contravariant-extras";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
@@ -2853,6 +2861,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2920,6 +2929,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "file-modules" = dontDistribute super."file-modules";
   "filecache" = dontDistribute super."filecache";
   "filediff" = dontDistribute super."filediff";
@@ -3155,6 +3165,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3211,6 +3222,7 @@ self: super: {
   "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
+  "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1";
   "ghc-vis" = dontDistribute super."ghc-vis";
   "ghci-diagrams" = dontDistribute super."ghci-diagrams";
   "ghci-haskeline" = dontDistribute super."ghci-haskeline";
@@ -3918,6 +3930,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5250,6 +5263,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_7";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5805,6 +5820,7 @@ self: super: {
   "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";
@@ -6050,6 +6066,7 @@ self: super: {
   "poll" = dontDistribute super."poll";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6263,6 +6280,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6615,6 +6633,7 @@ self: super: {
   "safe-length" = dontDistribute super."safe-length";
   "safe-plugins" = dontDistribute super."safe-plugins";
   "safe-printf" = dontDistribute super."safe-printf";
+  "safecopy" = doDistribute super."safecopy_0_8_6";
   "safeint" = dontDistribute super."safeint";
   "safer-file-handles" = dontDistribute super."safer-file-handles";
   "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
@@ -7106,6 +7125,7 @@ self: super: {
   "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -8060,6 +8080,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index 27573342f040..84dc56c88d00 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -213,6 +213,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -358,6 +359,7 @@ self: super: {
   "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";
@@ -1103,6 +1105,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_2";
+  "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";
@@ -1386,6 +1389,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1840,6 +1844,7 @@ self: super: {
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava" = doDistribute super."cassava_0_4_4_0";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
   "cassava-streams" = dontDistribute super."cassava-streams";
   "cassette" = dontDistribute super."cassette";
@@ -1862,6 +1867,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -1875,6 +1881,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -2121,6 +2128,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant" = doDistribute super."contravariant_1_3_3";
   "contravariant-extras" = dontDistribute super."contravariant-extras";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
@@ -2848,6 +2856,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2915,6 +2924,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "file-modules" = dontDistribute super."file-modules";
   "filecache" = dontDistribute super."filecache";
   "filediff" = dontDistribute super."filediff";
@@ -3150,6 +3160,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3206,6 +3217,7 @@ self: super: {
   "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
+  "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1";
   "ghc-vis" = dontDistribute super."ghc-vis";
   "ghci-diagrams" = dontDistribute super."ghci-diagrams";
   "ghci-haskeline" = dontDistribute super."ghci-haskeline";
@@ -3912,6 +3924,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5244,6 +5257,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_7";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5799,6 +5814,7 @@ self: super: {
   "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";
@@ -6043,6 +6059,7 @@ self: super: {
   "poll" = dontDistribute super."poll";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6256,6 +6273,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6608,6 +6626,7 @@ self: super: {
   "safe-length" = dontDistribute super."safe-length";
   "safe-plugins" = dontDistribute super."safe-plugins";
   "safe-printf" = dontDistribute super."safe-printf";
+  "safecopy" = doDistribute super."safecopy_0_8_6";
   "safeint" = dontDistribute super."safeint";
   "safer-file-handles" = dontDistribute super."safer-file-handles";
   "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
@@ -7099,6 +7118,7 @@ self: super: {
   "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -8051,6 +8071,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index cc0b732e2c5e..47528726e077 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -213,6 +213,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -358,6 +359,7 @@ self: super: {
   "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";
@@ -1103,6 +1105,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_2";
+  "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";
@@ -1386,6 +1389,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1840,6 +1844,7 @@ self: super: {
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava" = doDistribute super."cassava_0_4_4_0";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
   "cassava-streams" = dontDistribute super."cassava-streams";
   "cassette" = dontDistribute super."cassette";
@@ -1862,6 +1867,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -1875,6 +1881,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -2121,6 +2128,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant" = doDistribute super."contravariant_1_3_3";
   "contravariant-extras" = dontDistribute super."contravariant-extras";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
@@ -2848,6 +2856,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2915,6 +2924,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "file-modules" = dontDistribute super."file-modules";
   "filecache" = dontDistribute super."filecache";
   "filediff" = dontDistribute super."filediff";
@@ -3150,6 +3160,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3206,6 +3217,7 @@ self: super: {
   "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
+  "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1";
   "ghc-vis" = dontDistribute super."ghc-vis";
   "ghci-diagrams" = dontDistribute super."ghci-diagrams";
   "ghci-haskeline" = dontDistribute super."ghci-haskeline";
@@ -3912,6 +3924,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5242,6 +5255,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_7";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5797,6 +5812,7 @@ self: super: {
   "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";
@@ -6040,6 +6056,7 @@ self: super: {
   "poll" = dontDistribute super."poll";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6253,6 +6270,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6605,6 +6623,7 @@ self: super: {
   "safe-length" = dontDistribute super."safe-length";
   "safe-plugins" = dontDistribute super."safe-plugins";
   "safe-printf" = dontDistribute super."safe-printf";
+  "safecopy" = doDistribute super."safecopy_0_8_6";
   "safeint" = dontDistribute super."safeint";
   "safer-file-handles" = dontDistribute super."safer-file-handles";
   "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
@@ -7096,6 +7115,7 @@ self: super: {
   "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -8046,6 +8066,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index f73d746cd8c4..296fbd0b7209 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -213,6 +213,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -358,6 +359,7 @@ self: super: {
   "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";
@@ -1101,6 +1103,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_2";
+  "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";
@@ -1384,6 +1387,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1837,6 +1841,7 @@ self: super: {
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava" = doDistribute super."cassava_0_4_4_0";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
   "cassava-streams" = dontDistribute super."cassava-streams";
   "cassette" = dontDistribute super."cassette";
@@ -1859,6 +1864,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -1872,6 +1878,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -2118,6 +2125,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant" = doDistribute super."contravariant_1_3_3";
   "contravariant-extras" = dontDistribute super."contravariant-extras";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
@@ -2841,6 +2849,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2908,6 +2917,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "file-modules" = dontDistribute super."file-modules";
   "filecache" = dontDistribute super."filecache";
   "filediff" = dontDistribute super."filediff";
@@ -3143,6 +3153,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3199,6 +3210,7 @@ self: super: {
   "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
+  "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1";
   "ghc-vis" = dontDistribute super."ghc-vis";
   "ghci-diagrams" = dontDistribute super."ghci-diagrams";
   "ghci-haskeline" = dontDistribute super."ghci-haskeline";
@@ -3905,6 +3917,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5233,6 +5246,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_7";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5787,6 +5802,7 @@ self: super: {
   "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";
@@ -6030,6 +6046,7 @@ self: super: {
   "poll" = dontDistribute super."poll";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6243,6 +6260,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6595,6 +6613,7 @@ self: super: {
   "safe-length" = dontDistribute super."safe-length";
   "safe-plugins" = dontDistribute super."safe-plugins";
   "safe-printf" = dontDistribute super."safe-printf";
+  "safecopy" = doDistribute super."safecopy_0_8_6";
   "safeint" = dontDistribute super."safeint";
   "safer-file-handles" = dontDistribute super."safer-file-handles";
   "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
@@ -7086,6 +7105,7 @@ self: super: {
   "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -7324,6 +7344,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_8";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
@@ -8033,6 +8054,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 5e0af3866c17..62c422826bc6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -213,6 +213,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -358,6 +359,7 @@ self: super: {
   "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";
@@ -1101,6 +1103,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_2";
+  "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";
@@ -1384,6 +1387,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1837,6 +1841,7 @@ self: super: {
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava" = doDistribute super."cassava_0_4_4_0";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
   "cassava-streams" = dontDistribute super."cassava-streams";
   "cassette" = dontDistribute super."cassette";
@@ -1859,6 +1864,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -1872,6 +1878,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -2118,6 +2125,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant" = doDistribute super."contravariant_1_3_3";
   "contravariant-extras" = dontDistribute super."contravariant-extras";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
@@ -2841,6 +2849,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2908,6 +2917,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "file-modules" = dontDistribute super."file-modules";
   "filecache" = dontDistribute super."filecache";
   "filediff" = dontDistribute super."filediff";
@@ -3142,6 +3152,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3198,6 +3209,7 @@ self: super: {
   "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
+  "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1";
   "ghc-vis" = dontDistribute super."ghc-vis";
   "ghci-diagrams" = dontDistribute super."ghci-diagrams";
   "ghci-haskeline" = dontDistribute super."ghci-haskeline";
@@ -3903,6 +3915,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5229,6 +5242,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_7";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5782,6 +5797,7 @@ self: super: {
   "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";
@@ -6025,6 +6041,7 @@ self: super: {
   "poll" = dontDistribute super."poll";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6237,6 +6254,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6589,6 +6607,7 @@ self: super: {
   "safe-length" = dontDistribute super."safe-length";
   "safe-plugins" = dontDistribute super."safe-plugins";
   "safe-printf" = dontDistribute super."safe-printf";
+  "safecopy" = doDistribute super."safecopy_0_8_6";
   "safeint" = dontDistribute super."safeint";
   "safer-file-handles" = dontDistribute super."safer-file-handles";
   "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
@@ -7079,6 +7098,7 @@ self: super: {
   "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -7317,6 +7337,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_8";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
@@ -8026,6 +8047,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index e3e3b2ea0200..5bd2c57df75b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -213,6 +213,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -358,6 +359,7 @@ self: super: {
   "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";
@@ -1100,6 +1102,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_2";
+  "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";
@@ -1383,6 +1386,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1835,6 +1839,7 @@ self: super: {
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava" = doDistribute super."cassava_0_4_4_0";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
   "cassava-streams" = dontDistribute super."cassava-streams";
   "cassette" = dontDistribute super."cassette";
@@ -1857,6 +1862,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -1870,6 +1876,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -2116,6 +2123,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant" = doDistribute super."contravariant_1_3_3";
   "contravariant-extras" = dontDistribute super."contravariant-extras";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
@@ -2838,6 +2846,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2905,6 +2914,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "file-modules" = dontDistribute super."file-modules";
   "filecache" = dontDistribute super."filecache";
   "filediff" = dontDistribute super."filediff";
@@ -3139,6 +3149,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3195,6 +3206,7 @@ self: super: {
   "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
+  "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1";
   "ghc-vis" = dontDistribute super."ghc-vis";
   "ghci-diagrams" = dontDistribute super."ghci-diagrams";
   "ghci-haskeline" = dontDistribute super."ghci-haskeline";
@@ -3899,6 +3911,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5223,6 +5236,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_7";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5776,6 +5791,7 @@ self: super: {
   "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";
@@ -6018,6 +6034,7 @@ self: super: {
   "poll" = dontDistribute super."poll";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6229,6 +6246,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6580,6 +6598,7 @@ self: super: {
   "safe-length" = dontDistribute super."safe-length";
   "safe-plugins" = dontDistribute super."safe-plugins";
   "safe-printf" = dontDistribute super."safe-printf";
+  "safecopy" = doDistribute super."safecopy_0_8_6";
   "safeint" = dontDistribute super."safeint";
   "safer-file-handles" = dontDistribute super."safer-file-handles";
   "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
@@ -7069,6 +7088,7 @@ self: super: {
   "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -7305,6 +7325,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_8";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
@@ -8012,6 +8033,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index 11a923340ff2..c0b0a8b92a17 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -213,6 +213,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -358,6 +359,7 @@ self: super: {
   "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";
@@ -1099,6 +1101,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_2";
+  "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";
@@ -1381,6 +1384,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1833,6 +1837,7 @@ self: super: {
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava" = doDistribute super."cassava_0_4_4_0";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
   "cassava-streams" = dontDistribute super."cassava-streams";
   "cassette" = dontDistribute super."cassette";
@@ -1855,6 +1860,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
   "cereal-ieee754" = dontDistribute super."cereal-ieee754";
@@ -1867,6 +1873,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -2112,6 +2119,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant" = doDistribute super."contravariant_1_3_3";
   "contravariant-extras" = dontDistribute super."contravariant-extras";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
@@ -2834,6 +2842,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2901,6 +2910,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "file-modules" = dontDistribute super."file-modules";
   "filecache" = dontDistribute super."filecache";
   "filediff" = dontDistribute super."filediff";
@@ -3135,6 +3145,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3191,6 +3202,7 @@ self: super: {
   "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
+  "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1";
   "ghc-vis" = dontDistribute super."ghc-vis";
   "ghci-diagrams" = dontDistribute super."ghci-diagrams";
   "ghci-haskeline" = dontDistribute super."ghci-haskeline";
@@ -3894,6 +3906,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5216,6 +5229,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_7";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5768,6 +5783,7 @@ self: super: {
   "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";
@@ -6010,6 +6026,7 @@ self: super: {
   "poll" = dontDistribute super."poll";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6221,6 +6238,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6571,6 +6589,7 @@ self: super: {
   "safe-length" = dontDistribute super."safe-length";
   "safe-plugins" = dontDistribute super."safe-plugins";
   "safe-printf" = dontDistribute super."safe-printf";
+  "safecopy" = doDistribute super."safecopy_0_8_6";
   "safeint" = dontDistribute super."safeint";
   "safer-file-handles" = dontDistribute super."safer-file-handles";
   "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
@@ -7060,6 +7079,7 @@ self: super: {
   "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -7296,6 +7316,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_8";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
@@ -8002,6 +8023,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8181,6 +8203,7 @@ self: super: {
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index 96cb5ed5517a..2ae19af57cd7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -213,6 +213,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -358,6 +359,7 @@ self: super: {
   "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";
@@ -1099,6 +1101,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_2";
+  "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";
@@ -1381,6 +1384,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1832,6 +1836,7 @@ self: super: {
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava" = doDistribute super."cassava_0_4_4_0";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
   "cassava-streams" = dontDistribute super."cassava-streams";
   "cassette" = dontDistribute super."cassette";
@@ -1854,6 +1859,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
   "cereal-ieee754" = dontDistribute super."cereal-ieee754";
@@ -1866,6 +1872,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -2111,6 +2118,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant" = doDistribute super."contravariant_1_3_3";
   "contravariant-extras" = dontDistribute super."contravariant-extras";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
@@ -2833,6 +2841,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2900,6 +2909,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "file-modules" = dontDistribute super."file-modules";
   "filecache" = dontDistribute super."filecache";
   "filediff" = dontDistribute super."filediff";
@@ -3134,6 +3144,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3190,6 +3201,7 @@ self: super: {
   "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
+  "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1";
   "ghc-vis" = dontDistribute super."ghc-vis";
   "ghci-diagrams" = dontDistribute super."ghci-diagrams";
   "ghci-haskeline" = dontDistribute super."ghci-haskeline";
@@ -3889,6 +3901,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5207,6 +5220,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_7";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5759,6 +5774,7 @@ self: super: {
   "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";
@@ -6000,6 +6016,7 @@ self: super: {
   "poll" = dontDistribute super."poll";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6209,6 +6226,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6559,6 +6577,7 @@ self: super: {
   "safe-length" = dontDistribute super."safe-length";
   "safe-plugins" = dontDistribute super."safe-plugins";
   "safe-printf" = dontDistribute super."safe-printf";
+  "safecopy" = doDistribute super."safecopy_0_8_6";
   "safeint" = dontDistribute super."safeint";
   "safer-file-handles" = dontDistribute super."safer-file-handles";
   "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
@@ -7047,6 +7066,7 @@ self: super: {
   "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -7283,6 +7303,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_8";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
@@ -7987,6 +8008,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8166,6 +8188,7 @@ self: super: {
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index 239263221a6b..736b83494093 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -212,6 +212,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -357,6 +358,7 @@ self: super: {
   "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";
@@ -1098,6 +1100,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_2";
+  "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";
@@ -1379,6 +1382,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1827,6 +1831,7 @@ self: super: {
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava" = doDistribute super."cassava_0_4_4_0";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
   "cassava-streams" = dontDistribute super."cassava-streams";
   "cassette" = dontDistribute super."cassette";
@@ -1849,6 +1854,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
   "cereal-ieee754" = dontDistribute super."cereal-ieee754";
@@ -1861,6 +1867,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -2105,6 +2112,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant" = doDistribute super."contravariant_1_3_3";
   "contravariant-extras" = dontDistribute super."contravariant-extras";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
@@ -2827,6 +2835,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2894,6 +2903,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "file-modules" = dontDistribute super."file-modules";
   "filecache" = dontDistribute super."filecache";
   "filediff" = dontDistribute super."filediff";
@@ -3128,6 +3138,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3184,6 +3195,7 @@ self: super: {
   "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
+  "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1";
   "ghc-vis" = dontDistribute super."ghc-vis";
   "ghci-diagrams" = dontDistribute super."ghci-diagrams";
   "ghci-haskeline" = dontDistribute super."ghci-haskeline";
@@ -3883,6 +3895,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5196,6 +5209,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_7";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5747,6 +5762,7 @@ self: super: {
   "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";
@@ -5986,6 +6002,7 @@ self: super: {
   "poll" = dontDistribute super."poll";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6195,6 +6212,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6544,6 +6562,7 @@ self: super: {
   "safe-length" = dontDistribute super."safe-length";
   "safe-plugins" = dontDistribute super."safe-plugins";
   "safe-printf" = dontDistribute super."safe-printf";
+  "safecopy" = doDistribute super."safecopy_0_8_6";
   "safeint" = dontDistribute super."safeint";
   "safer-file-handles" = dontDistribute super."safer-file-handles";
   "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
@@ -7031,6 +7050,7 @@ self: super: {
   "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -7267,6 +7287,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_8";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
@@ -7971,6 +7992,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8149,6 +8171,7 @@ self: super: {
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
@@ -8164,6 +8187,7 @@ self: super: {
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
   "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-core" = doDistribute super."yesod-core_1_4_18_1";
   "yesod-crud" = dontDistribute super."yesod-crud";
   "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
   "yesod-csp" = dontDistribute super."yesod-csp";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index 7b68bca8ee47..32d91ba7c6a4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -217,6 +217,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -362,6 +363,7 @@ self: super: {
   "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";
@@ -1109,6 +1111,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_1";
+  "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";
@@ -1398,6 +1401,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1883,6 +1887,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -1896,6 +1901,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -2889,6 +2895,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2957,6 +2964,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "file-modules" = dontDistribute super."file-modules";
   "filecache" = dontDistribute super."filecache";
   "filediff" = dontDistribute super."filediff";
@@ -3195,6 +3203,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3964,6 +3973,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5307,6 +5317,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_7";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5869,6 +5881,7 @@ self: super: {
   "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";
@@ -6120,6 +6133,7 @@ self: super: {
   "poly-arity" = doDistribute super."poly-arity_0_0_5";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6339,6 +6353,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7194,6 +7209,7 @@ self: super: {
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
   "stackage-sandbox" = doDistribute super."stackage-sandbox_0_1_5";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -8163,6 +8179,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index 035d473ea11e..acb0e1c24b58 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -212,6 +212,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -357,6 +358,7 @@ self: super: {
   "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";
@@ -1097,6 +1099,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_2";
+  "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";
@@ -1377,6 +1380,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1823,6 +1827,7 @@ self: super: {
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava" = doDistribute super."cassava_0_4_4_0";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
   "cassava-streams" = dontDistribute super."cassava-streams";
   "cassette" = dontDistribute super."cassette";
@@ -1845,6 +1850,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
   "cereal-ieee754" = dontDistribute super."cereal-ieee754";
@@ -1857,6 +1863,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -2101,6 +2108,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant" = doDistribute super."contravariant_1_3_3";
   "contravariant-extras" = dontDistribute super."contravariant-extras";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
@@ -2823,6 +2831,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2890,6 +2899,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "file-modules" = dontDistribute super."file-modules";
   "filecache" = dontDistribute super."filecache";
   "filediff" = dontDistribute super."filediff";
@@ -3124,6 +3134,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3180,6 +3191,7 @@ self: super: {
   "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
+  "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1";
   "ghc-vis" = dontDistribute super."ghc-vis";
   "ghci-diagrams" = dontDistribute super."ghci-diagrams";
   "ghci-haskeline" = dontDistribute super."ghci-haskeline";
@@ -3879,6 +3891,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -4331,6 +4344,7 @@ self: super: {
   "htsn-import" = dontDistribute super."htsn-import";
   "http-accept" = dontDistribute super."http-accept";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
+  "http-client" = doDistribute super."http-client_0_4_26_2";
   "http-client-auth" = dontDistribute super."http-client-auth";
   "http-client-conduit" = dontDistribute super."http-client-conduit";
   "http-client-lens" = dontDistribute super."http-client-lens";
@@ -5190,6 +5204,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_7";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5741,6 +5757,7 @@ self: super: {
   "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";
@@ -5979,6 +5996,7 @@ self: super: {
   "poll" = dontDistribute super."poll";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6188,6 +6206,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6536,6 +6555,7 @@ self: super: {
   "safe-length" = dontDistribute super."safe-length";
   "safe-plugins" = dontDistribute super."safe-plugins";
   "safe-printf" = dontDistribute super."safe-printf";
+  "safecopy" = doDistribute super."safecopy_0_8_6";
   "safeint" = dontDistribute super."safeint";
   "safer-file-handles" = dontDistribute super."safer-file-handles";
   "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
@@ -7023,6 +7043,7 @@ self: super: {
   "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -7258,6 +7279,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_8";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
@@ -7961,6 +7983,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8137,6 +8160,7 @@ self: super: {
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
@@ -8152,6 +8176,7 @@ self: super: {
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
   "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-core" = doDistribute super."yesod-core_1_4_18_1";
   "yesod-crud" = dontDistribute super."yesod-crud";
   "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
   "yesod-csp" = dontDistribute super."yesod-csp";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index 352bcfa78fa5..03242664366d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -212,6 +212,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -357,6 +358,7 @@ self: super: {
   "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";
@@ -1096,6 +1098,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_2";
+  "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";
@@ -1376,6 +1379,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1820,6 +1824,7 @@ self: super: {
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava" = doDistribute super."cassava_0_4_4_0";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
   "cassava-streams" = dontDistribute super."cassava-streams";
   "cassette" = dontDistribute super."cassette";
@@ -1842,6 +1847,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
   "cereal-ieee754" = dontDistribute super."cereal-ieee754";
@@ -1854,6 +1860,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -2096,6 +2103,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant" = doDistribute super."contravariant_1_3_3";
   "contravariant-extras" = dontDistribute super."contravariant-extras";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
@@ -2818,6 +2826,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2883,6 +2892,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "file-modules" = dontDistribute super."file-modules";
   "filecache" = dontDistribute super."filecache";
   "filediff" = dontDistribute super."filediff";
@@ -3117,6 +3127,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3173,6 +3184,7 @@ self: super: {
   "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
+  "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1";
   "ghc-vis" = dontDistribute super."ghc-vis";
   "ghci-diagrams" = dontDistribute super."ghci-diagrams";
   "ghci-haskeline" = dontDistribute super."ghci-haskeline";
@@ -3871,6 +3883,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -4323,6 +4336,7 @@ self: super: {
   "htsn-import" = dontDistribute super."htsn-import";
   "http-accept" = dontDistribute super."http-accept";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
+  "http-client" = doDistribute super."http-client_0_4_26_2";
   "http-client-auth" = dontDistribute super."http-client-auth";
   "http-client-conduit" = dontDistribute super."http-client-conduit";
   "http-client-lens" = dontDistribute super."http-client-lens";
@@ -5180,6 +5194,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_7";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5730,6 +5746,7 @@ self: super: {
   "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";
@@ -5966,6 +5983,7 @@ self: super: {
   "poll" = dontDistribute super."poll";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6175,6 +6193,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6521,6 +6540,7 @@ self: super: {
   "safe-length" = dontDistribute super."safe-length";
   "safe-plugins" = dontDistribute super."safe-plugins";
   "safe-printf" = dontDistribute super."safe-printf";
+  "safecopy" = doDistribute super."safecopy_0_8_6";
   "safeint" = dontDistribute super."safeint";
   "safer-file-handles" = dontDistribute super."safer-file-handles";
   "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
@@ -6998,6 +7018,7 @@ self: super: {
   "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -7233,6 +7254,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_8";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
@@ -7930,6 +7952,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8106,6 +8129,7 @@ self: super: {
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
@@ -8121,6 +8145,7 @@ self: super: {
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
   "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-core" = doDistribute super."yesod-core_1_4_18_1";
   "yesod-crud" = dontDistribute super."yesod-crud";
   "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
   "yesod-csp" = dontDistribute super."yesod-csp";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
index 8c03b3e2a578..4f35f7def845 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -212,6 +212,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -357,6 +358,7 @@ self: super: {
   "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";
@@ -1096,6 +1098,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_2";
+  "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";
@@ -1376,6 +1379,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1820,6 +1824,7 @@ self: super: {
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava" = doDistribute super."cassava_0_4_4_0";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
   "cassava-streams" = dontDistribute super."cassava-streams";
   "cassette" = dontDistribute super."cassette";
@@ -1842,6 +1847,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
   "cereal-ieee754" = dontDistribute super."cereal-ieee754";
@@ -1854,6 +1860,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -2096,6 +2103,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant" = doDistribute super."contravariant_1_3_3";
   "contravariant-extras" = dontDistribute super."contravariant-extras";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
@@ -2817,6 +2825,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2881,6 +2890,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "file-modules" = dontDistribute super."file-modules";
   "filecache" = dontDistribute super."filecache";
   "filediff" = dontDistribute super."filediff";
@@ -3115,6 +3125,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3171,6 +3182,7 @@ self: super: {
   "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
   "ghc-typelits-extra" = dontDistribute super."ghc-typelits-extra";
+  "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1";
   "ghc-vis" = dontDistribute super."ghc-vis";
   "ghci-diagrams" = dontDistribute super."ghci-diagrams";
   "ghci-haskeline" = dontDistribute super."ghci-haskeline";
@@ -3868,6 +3880,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -4320,6 +4333,7 @@ self: super: {
   "htsn-import" = dontDistribute super."htsn-import";
   "http-accept" = dontDistribute super."http-accept";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
+  "http-client" = doDistribute super."http-client_0_4_26_2";
   "http-client-auth" = dontDistribute super."http-client-auth";
   "http-client-conduit" = dontDistribute super."http-client-conduit";
   "http-client-lens" = dontDistribute super."http-client-lens";
@@ -5174,6 +5188,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_7";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5724,6 +5740,7 @@ self: super: {
   "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";
@@ -5960,6 +5977,7 @@ self: super: {
   "poll" = dontDistribute super."poll";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6169,6 +6187,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6515,6 +6534,7 @@ self: super: {
   "safe-length" = dontDistribute super."safe-length";
   "safe-plugins" = dontDistribute super."safe-plugins";
   "safe-printf" = dontDistribute super."safe-printf";
+  "safecopy" = doDistribute super."safecopy_0_8_6";
   "safeint" = dontDistribute super."safeint";
   "safer-file-handles" = dontDistribute super."safer-file-handles";
   "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
@@ -6992,6 +7012,7 @@ self: super: {
   "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -7227,6 +7248,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_8";
   "tasty-tap" = dontDistribute super."tasty-tap";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
@@ -7924,6 +7946,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -8100,6 +8123,7 @@ self: super: {
   "yes-precure5-command" = dontDistribute super."yes-precure5-command";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
   "yesod-auth-account-fork" = dontDistribute super."yesod-auth-account-fork";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
@@ -8114,6 +8138,7 @@ self: super: {
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
   "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-core" = doDistribute super."yesod-core_1_4_18_1";
   "yesod-crud" = dontDistribute super."yesod-crud";
   "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
   "yesod-csp" = dontDistribute super."yesod-csp";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index bfbb6f30347f..23ee3d7e7bb9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -217,6 +217,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -362,6 +363,7 @@ self: super: {
   "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";
@@ -1109,6 +1111,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_1";
+  "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";
@@ -1397,6 +1400,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1882,6 +1886,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -1895,6 +1900,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -2885,6 +2891,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2953,6 +2960,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "file-modules" = dontDistribute super."file-modules";
   "filecache" = dontDistribute super."filecache";
   "filediff" = dontDistribute super."filediff";
@@ -3190,6 +3198,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3959,6 +3968,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5300,6 +5310,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_7";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5862,6 +5874,7 @@ self: super: {
   "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";
@@ -6113,6 +6126,7 @@ self: super: {
   "poly-arity" = doDistribute super."poly-arity_0_0_5";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6332,6 +6346,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7185,6 +7200,7 @@ self: super: {
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
   "stackage-sandbox" = doDistribute super."stackage-sandbox_0_1_5";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -8152,6 +8168,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index aa7539f857e2..f3c454184d9a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -217,6 +217,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -362,6 +363,7 @@ self: super: {
   "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";
@@ -1109,6 +1111,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_1";
+  "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";
@@ -1397,6 +1400,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1859,6 +1863,7 @@ self: super: {
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava" = doDistribute super."cassava_0_4_4_0";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
   "cassava-streams" = dontDistribute super."cassava-streams";
   "cassette" = dontDistribute super."cassette";
@@ -1881,6 +1886,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -1894,6 +1900,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -2884,6 +2891,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2952,6 +2960,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "file-modules" = dontDistribute super."file-modules";
   "filecache" = dontDistribute super."filecache";
   "filediff" = dontDistribute super."filediff";
@@ -3189,6 +3198,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3958,6 +3968,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5299,6 +5310,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_7";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5861,6 +5874,7 @@ self: super: {
   "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";
@@ -6112,6 +6126,7 @@ self: super: {
   "poly-arity" = doDistribute super."poly-arity_0_0_5";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6331,6 +6346,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7182,6 +7198,7 @@ self: super: {
   "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -8148,6 +8165,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index eeac482e3aba..c7dc33ed0448 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -217,6 +217,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -362,6 +363,7 @@ self: super: {
   "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";
@@ -1109,6 +1111,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_1";
+  "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";
@@ -1396,6 +1399,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1857,6 +1861,7 @@ self: super: {
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava" = doDistribute super."cassava_0_4_4_0";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
   "cassava-streams" = dontDistribute super."cassava-streams";
   "cassette" = dontDistribute super."cassette";
@@ -1879,6 +1884,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -1892,6 +1898,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -2142,6 +2149,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant" = doDistribute super."contravariant_1_3_3";
   "contravariant-extras" = dontDistribute super."contravariant-extras";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
@@ -2881,6 +2889,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2948,6 +2957,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "file-modules" = dontDistribute super."file-modules";
   "filecache" = dontDistribute super."filecache";
   "filediff" = dontDistribute super."filediff";
@@ -3185,6 +3195,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3953,6 +3964,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5290,6 +5302,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_7";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5851,6 +5865,7 @@ self: super: {
   "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";
@@ -6100,6 +6115,7 @@ self: super: {
   "poly-arity" = doDistribute super."poly-arity_0_0_6";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6318,6 +6334,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7169,6 +7186,7 @@ self: super: {
   "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -8132,6 +8150,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index 8d96df619323..d86b8a1b53ae 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -217,6 +217,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -362,6 +363,7 @@ self: super: {
   "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";
@@ -1109,6 +1111,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_2";
+  "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";
@@ -1396,6 +1399,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1857,6 +1861,7 @@ self: super: {
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava" = doDistribute super."cassava_0_4_4_0";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
   "cassava-streams" = dontDistribute super."cassava-streams";
   "cassette" = dontDistribute super."cassette";
@@ -1879,6 +1884,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -1892,6 +1898,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -2142,6 +2149,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant" = doDistribute super."contravariant_1_3_3";
   "contravariant-extras" = dontDistribute super."contravariant-extras";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
@@ -2881,6 +2889,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2948,6 +2957,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "file-modules" = dontDistribute super."file-modules";
   "filecache" = dontDistribute super."filecache";
   "filediff" = dontDistribute super."filediff";
@@ -3184,6 +3194,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3950,6 +3961,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5284,6 +5296,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_7";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5844,6 +5858,7 @@ self: super: {
   "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";
@@ -6092,6 +6107,7 @@ self: super: {
   "poly-arity" = doDistribute super."poly-arity_0_0_6";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6310,6 +6326,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7161,6 +7178,7 @@ self: super: {
   "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -8121,6 +8139,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 89e35e6dee11..0e57de424297 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -217,6 +217,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -362,6 +363,7 @@ self: super: {
   "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";
@@ -1109,6 +1111,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_2";
+  "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";
@@ -1393,6 +1396,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1854,6 +1858,7 @@ self: super: {
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava" = doDistribute super."cassava_0_4_4_0";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
   "cassava-streams" = dontDistribute super."cassava-streams";
   "cassette" = dontDistribute super."cassette";
@@ -1876,6 +1881,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -1889,6 +1895,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -2139,6 +2146,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant" = doDistribute super."contravariant_1_3_3";
   "contravariant-extras" = dontDistribute super."contravariant-extras";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
@@ -2876,6 +2884,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2943,6 +2952,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "file-modules" = dontDistribute super."file-modules";
   "filecache" = dontDistribute super."filecache";
   "filediff" = dontDistribute super."filediff";
@@ -3179,6 +3189,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3944,6 +3955,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5277,6 +5289,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_7";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5837,6 +5851,7 @@ self: super: {
   "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";
@@ -6083,6 +6098,7 @@ self: super: {
   "poll" = dontDistribute super."poll";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6299,6 +6315,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7147,6 +7164,7 @@ self: super: {
   "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -8106,6 +8124,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index da171791ef4a..f7e8e71727f7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -217,6 +217,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -362,6 +363,7 @@ self: super: {
   "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";
@@ -1109,6 +1111,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_2";
+  "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";
@@ -1393,6 +1396,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1851,6 +1855,7 @@ self: super: {
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava" = doDistribute super."cassava_0_4_4_0";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
   "cassava-streams" = dontDistribute super."cassava-streams";
   "cassette" = dontDistribute super."cassette";
@@ -1873,6 +1878,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -1886,6 +1892,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -2136,6 +2143,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant" = doDistribute super."contravariant_1_3_3";
   "contravariant-extras" = dontDistribute super."contravariant-extras";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
@@ -2868,6 +2876,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2935,6 +2944,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "file-modules" = dontDistribute super."file-modules";
   "filecache" = dontDistribute super."filecache";
   "filediff" = dontDistribute super."filediff";
@@ -3171,6 +3181,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3936,6 +3947,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5268,6 +5280,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_7";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5827,6 +5841,7 @@ self: super: {
   "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";
@@ -6073,6 +6088,7 @@ self: super: {
   "poll" = dontDistribute super."poll";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6287,6 +6303,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7134,6 +7151,7 @@ self: super: {
   "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -8092,6 +8110,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 099aa3d78b29..32d43a1a6119 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -217,6 +217,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -362,6 +363,7 @@ self: super: {
   "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";
@@ -1107,6 +1109,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_2";
+  "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";
@@ -1391,6 +1394,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1847,6 +1851,7 @@ self: super: {
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava" = doDistribute super."cassava_0_4_4_0";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
   "cassava-streams" = dontDistribute super."cassava-streams";
   "cassette" = dontDistribute super."cassette";
@@ -1869,6 +1874,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-conduit" = doDistribute super."cereal-conduit_0_7_2_3";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
@@ -1882,6 +1888,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -2132,6 +2139,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant" = doDistribute super."contravariant_1_3_3";
   "contravariant-extras" = dontDistribute super."contravariant-extras";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
@@ -2863,6 +2871,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2930,6 +2939,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "file-modules" = dontDistribute super."file-modules";
   "filecache" = dontDistribute super."filecache";
   "filediff" = dontDistribute super."filediff";
@@ -3165,6 +3175,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_3";
+  "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3930,6 +3941,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -5262,6 +5274,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_7";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5820,6 +5834,7 @@ self: super: {
   "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";
@@ -6066,6 +6081,7 @@ self: super: {
   "poll" = dontDistribute super."poll";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -6280,6 +6296,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7127,6 +7144,7 @@ self: super: {
   "stack-run" = dontDistribute super."stack-run";
   "stack-run-auto" = dontDistribute super."stack-run-auto";
   "stackage-curator" = dontDistribute super."stackage-curator";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -8085,6 +8103,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index 304758bad52e..cb8f0729fe84 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -211,6 +211,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -331,6 +332,7 @@ self: super: {
   "GLUT" = doDistribute super."GLUT_2_7_0_5";
   "GLUtil" = dontDistribute super."GLUtil";
   "GPX" = dontDistribute super."GPX";
+  "GPipe" = doDistribute super."GPipe_2_1_5";
   "GPipe-Collada" = dontDistribute super."GPipe-Collada";
   "GPipe-Examples" = dontDistribute super."GPipe-Examples";
   "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
@@ -349,6 +351,7 @@ self: super: {
   "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";
@@ -1068,6 +1071,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_2";
+  "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";
@@ -1278,6 +1282,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1701,6 +1706,7 @@ self: super: {
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava" = doDistribute super."cassava_0_4_4_0";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
   "cassava-streams" = dontDistribute super."cassava-streams";
   "cassette" = dontDistribute super."cassette";
@@ -1723,6 +1729,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
   "cereal-ieee754" = dontDistribute super."cereal-ieee754";
@@ -1735,6 +1742,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -1962,6 +1970,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant" = doDistribute super."contravariant_1_3_3";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
   "control-monad-exception" = dontDistribute super."control-monad-exception";
@@ -2054,6 +2063,7 @@ self: super: {
   "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh";
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
+  "cryptol" = doDistribute super."cryptol_2_2_6";
   "cryptsy-api" = dontDistribute super."cryptsy-api";
   "crystalfontz" = dontDistribute super."crystalfontz";
   "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin";
@@ -2651,6 +2661,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2712,6 +2723,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "filediff" = dontDistribute super."filediff";
   "filepath-io-access" = dontDistribute super."filepath-io-access";
   "filepather" = dontDistribute super."filepather";
@@ -2780,6 +2792,8 @@ self: super: {
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
   "fmark" = dontDistribute super."fmark";
+  "fn" = doDistribute super."fn_0_2_0_1";
+  "fn-extra" = doDistribute super."fn-extra_0_2_0_0";
   "fold-debounce" = dontDistribute super."fold-debounce";
   "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
   "foldl" = doDistribute super."foldl_1_1_2";
@@ -2938,6 +2952,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generics-eot" = dontDistribute super."generics-eot";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
   "geni-gui" = dontDistribute super."geni-gui";
@@ -2976,6 +2991,7 @@ self: super: {
   "ghc-imported-from" = dontDistribute super."ghc-imported-from";
   "ghc-make" = dontDistribute super."ghc-make";
   "ghc-man-completion" = dontDistribute super."ghc-man-completion";
+  "ghc-mod" = doDistribute super."ghc-mod_5_4_0_0";
   "ghc-options" = dontDistribute super."ghc-options";
   "ghc-parmake" = dontDistribute super."ghc-parmake";
   "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix";
@@ -2987,6 +3003,8 @@ self: super: {
   "ghc-syb" = dontDistribute super."ghc-syb";
   "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
+  "ghc-typelits-extra" = doDistribute super."ghc-typelits-extra_0_1";
+  "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1";
   "ghc-vis" = dontDistribute super."ghc-vis";
   "ghci-diagrams" = dontDistribute super."ghci-diagrams";
   "ghci-haskeline" = dontDistribute super."ghci-haskeline";
@@ -3665,6 +3683,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -4086,6 +4105,7 @@ self: super: {
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
+  "http-client" = doDistribute super."http-client_0_4_26_2";
   "http-client-auth" = dontDistribute super."http-client-auth";
   "http-client-conduit" = dontDistribute super."http-client-conduit";
   "http-client-lens" = dontDistribute super."http-client-lens";
@@ -4911,6 +4931,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_10";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5198,6 +5220,7 @@ self: super: {
   "netrc" = dontDistribute super."netrc";
   "netspec" = dontDistribute super."netspec";
   "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle" = doDistribute super."nettle_0_1_1";
   "nettle-frp" = dontDistribute super."nettle-frp";
   "nettle-netkit" = dontDistribute super."nettle-netkit";
   "nettle-openflow" = dontDistribute super."nettle-openflow";
@@ -5430,6 +5453,7 @@ self: super: {
   "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";
@@ -5644,6 +5668,7 @@ self: super: {
   "poll" = dontDistribute super."poll";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -5844,6 +5869,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6164,6 +6190,7 @@ self: super: {
   "safe-length" = dontDistribute super."safe-length";
   "safe-plugins" = dontDistribute super."safe-plugins";
   "safe-printf" = dontDistribute super."safe-printf";
+  "safecopy" = doDistribute super."safecopy_0_8_6";
   "safeint" = dontDistribute super."safeint";
   "safer-file-handles" = dontDistribute super."safer-file-handles";
   "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
@@ -6619,6 +6646,7 @@ self: super: {
   "stack-prism" = dontDistribute super."stack-prism";
   "stack-run" = dontDistribute super."stack-run";
   "stackage-curator" = doDistribute super."stackage-curator_0_11_0";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -6837,6 +6865,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_8";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -6953,6 +6982,7 @@ self: super: {
   "themplate" = dontDistribute super."themplate";
   "theoremquest" = dontDistribute super."theoremquest";
   "theoremquest-client" = dontDistribute super."theoremquest-client";
+  "these" = doDistribute super."these_0_6_2_0";
   "thespian" = dontDistribute super."thespian";
   "theta-functions" = dontDistribute super."theta-functions";
   "thih" = dontDistribute super."thih";
@@ -7411,6 +7441,7 @@ self: super: {
   "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-content-type" = doDistribute super."wai-middleware-content-type_0_2_0";
   "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_3";
   "wai-middleware-etag" = dontDistribute super."wai-middleware-etag";
   "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip";
@@ -7483,6 +7514,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -7650,6 +7682,7 @@ self: super: {
   "yeller" = dontDistribute super."yeller";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
@@ -7665,6 +7698,7 @@ self: super: {
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
   "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-core" = doDistribute super."yesod-core_1_4_18_1";
   "yesod-crud" = dontDistribute super."yesod-crud";
   "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
   "yesod-csp" = dontDistribute super."yesod-csp";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index 0e60720b4b33..bf9a7ad51ca0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -211,6 +211,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -331,6 +332,7 @@ self: super: {
   "GLUT" = doDistribute super."GLUT_2_7_0_5";
   "GLUtil" = dontDistribute super."GLUtil";
   "GPX" = dontDistribute super."GPX";
+  "GPipe" = doDistribute super."GPipe_2_1_5";
   "GPipe-Collada" = dontDistribute super."GPipe-Collada";
   "GPipe-Examples" = dontDistribute super."GPipe-Examples";
   "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
@@ -349,6 +351,7 @@ self: super: {
   "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";
@@ -460,6 +463,7 @@ self: super: {
   "HaLeX" = dontDistribute super."HaLeX";
   "HaMinitel" = dontDistribute super."HaMinitel";
   "HaPy" = dontDistribute super."HaPy";
+  "HaRe" = doDistribute super."HaRe_0_8_2_2";
   "HaTeX-meta" = dontDistribute super."HaTeX-meta";
   "HaTeX-qq" = dontDistribute super."HaTeX-qq";
   "HaVSA" = dontDistribute super."HaVSA";
@@ -1066,6 +1070,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_2";
+  "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";
@@ -1275,6 +1280,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1698,6 +1704,7 @@ self: super: {
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava" = doDistribute super."cassava_0_4_4_0";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
   "cassava-streams" = dontDistribute super."cassava-streams";
   "cassette" = dontDistribute super."cassette";
@@ -1720,6 +1727,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
   "cereal-ieee754" = dontDistribute super."cereal-ieee754";
@@ -1732,6 +1740,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -1959,6 +1968,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant" = doDistribute super."contravariant_1_3_3";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
   "control-monad-exception" = dontDistribute super."control-monad-exception";
@@ -2051,6 +2061,7 @@ self: super: {
   "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh";
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
+  "cryptol" = doDistribute super."cryptol_2_2_6";
   "cryptsy-api" = dontDistribute super."cryptsy-api";
   "crystalfontz" = dontDistribute super."crystalfontz";
   "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin";
@@ -2645,6 +2656,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2705,6 +2717,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "filediff" = dontDistribute super."filediff";
   "filepath-io-access" = dontDistribute super."filepath-io-access";
   "filepather" = dontDistribute super."filepather";
@@ -2773,6 +2786,8 @@ self: super: {
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
   "fmark" = dontDistribute super."fmark";
+  "fn" = doDistribute super."fn_0_2_0_1";
+  "fn-extra" = doDistribute super."fn-extra_0_2_0_0";
   "fold-debounce" = dontDistribute super."fold-debounce";
   "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
   "foldl" = doDistribute super."foldl_1_1_2";
@@ -2931,6 +2946,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generics-eot" = dontDistribute super."generics-eot";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
   "geni-gui" = dontDistribute super."geni-gui";
@@ -2969,6 +2985,7 @@ self: super: {
   "ghc-imported-from" = dontDistribute super."ghc-imported-from";
   "ghc-make" = dontDistribute super."ghc-make";
   "ghc-man-completion" = dontDistribute super."ghc-man-completion";
+  "ghc-mod" = doDistribute super."ghc-mod_5_4_0_0";
   "ghc-options" = dontDistribute super."ghc-options";
   "ghc-parmake" = dontDistribute super."ghc-parmake";
   "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix";
@@ -2980,6 +2997,8 @@ self: super: {
   "ghc-syb" = dontDistribute super."ghc-syb";
   "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
+  "ghc-typelits-extra" = doDistribute super."ghc-typelits-extra_0_1";
+  "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1";
   "ghc-vis" = dontDistribute super."ghc-vis";
   "ghci-diagrams" = dontDistribute super."ghci-diagrams";
   "ghci-haskeline" = dontDistribute super."ghci-haskeline";
@@ -3657,6 +3676,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -4078,6 +4098,7 @@ self: super: {
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
+  "http-client" = doDistribute super."http-client_0_4_26_2";
   "http-client-auth" = dontDistribute super."http-client-auth";
   "http-client-conduit" = dontDistribute super."http-client-conduit";
   "http-client-lens" = dontDistribute super."http-client-lens";
@@ -4895,6 +4916,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_10";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5182,6 +5205,7 @@ self: super: {
   "netrc" = dontDistribute super."netrc";
   "netspec" = dontDistribute super."netspec";
   "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle" = doDistribute super."nettle_0_1_1";
   "nettle-frp" = dontDistribute super."nettle-frp";
   "nettle-netkit" = dontDistribute super."nettle-netkit";
   "nettle-openflow" = dontDistribute super."nettle-openflow";
@@ -5414,6 +5438,7 @@ self: super: {
   "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";
@@ -5626,6 +5651,7 @@ self: super: {
   "poll" = dontDistribute super."poll";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -5826,6 +5852,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6145,6 +6172,7 @@ self: super: {
   "safe-length" = dontDistribute super."safe-length";
   "safe-plugins" = dontDistribute super."safe-plugins";
   "safe-printf" = dontDistribute super."safe-printf";
+  "safecopy" = doDistribute super."safecopy_0_8_6";
   "safeint" = dontDistribute super."safeint";
   "safer-file-handles" = dontDistribute super."safer-file-handles";
   "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
@@ -6600,6 +6628,7 @@ self: super: {
   "stack-prism" = dontDistribute super."stack-prism";
   "stack-run" = dontDistribute super."stack-run";
   "stackage-curator" = doDistribute super."stackage-curator_0_11_0";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -6818,6 +6847,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_8";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -6934,6 +6964,7 @@ self: super: {
   "themplate" = dontDistribute super."themplate";
   "theoremquest" = dontDistribute super."theoremquest";
   "theoremquest-client" = dontDistribute super."theoremquest-client";
+  "these" = doDistribute super."these_0_6_2_0";
   "thespian" = dontDistribute super."thespian";
   "theta-functions" = dontDistribute super."theta-functions";
   "thih" = dontDistribute super."thih";
@@ -7391,6 +7422,7 @@ self: super: {
   "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-content-type" = doDistribute super."wai-middleware-content-type_0_2_0";
   "wai-middleware-crowd" = doDistribute super."wai-middleware-crowd_0_1_3";
   "wai-middleware-etag" = dontDistribute super."wai-middleware-etag";
   "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip";
@@ -7462,6 +7494,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -7629,6 +7662,7 @@ self: super: {
   "yeller" = dontDistribute super."yeller";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
@@ -7644,6 +7678,7 @@ self: super: {
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
   "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-core" = doDistribute super."yesod-core_1_4_18_1";
   "yesod-crud" = dontDistribute super."yesod-crud";
   "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
   "yesod-csp" = dontDistribute super."yesod-csp";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
index 097a87c50e9f..33edb1148d81 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
@@ -211,6 +211,7 @@ self: super: {
   "DOM" = dontDistribute super."DOM";
   "DP" = dontDistribute super."DP";
   "DPM" = dontDistribute super."DPM";
+  "DRBG" = doDistribute super."DRBG_0_5_4";
   "DSA" = dontDistribute super."DSA";
   "DSH" = dontDistribute super."DSH";
   "DSTM" = dontDistribute super."DSTM";
@@ -329,6 +330,7 @@ self: super: {
   "GLMatrix" = dontDistribute super."GLMatrix";
   "GLUtil" = dontDistribute super."GLUtil";
   "GPX" = dontDistribute super."GPX";
+  "GPipe" = doDistribute super."GPipe_2_1_5";
   "GPipe-Collada" = dontDistribute super."GPipe-Collada";
   "GPipe-Examples" = dontDistribute super."GPipe-Examples";
   "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
@@ -347,6 +349,7 @@ self: super: {
   "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";
@@ -449,6 +452,7 @@ self: super: {
   "HTTP-Simple" = dontDistribute super."HTTP-Simple";
   "HTab" = dontDistribute super."HTab";
   "HTicTacToe" = dontDistribute super."HTicTacToe";
+  "HUnit" = doDistribute super."HUnit_1_3_1_0";
   "HUnit-Diff" = dontDistribute super."HUnit-Diff";
   "HUnit-Plus" = dontDistribute super."HUnit-Plus";
   "HUnit-approx" = dontDistribute super."HUnit-approx";
@@ -457,6 +461,7 @@ self: super: {
   "HaLeX" = dontDistribute super."HaLeX";
   "HaMinitel" = dontDistribute super."HaMinitel";
   "HaPy" = dontDistribute super."HaPy";
+  "HaRe" = doDistribute super."HaRe_0_8_2_2";
   "HaTeX-meta" = dontDistribute super."HaTeX-meta";
   "HaTeX-qq" = dontDistribute super."HaTeX-qq";
   "HaVSA" = dontDistribute super."HaVSA";
@@ -1061,6 +1066,7 @@ self: super: {
   "adhoc-network" = dontDistribute super."adhoc-network";
   "adict" = dontDistribute super."adict";
   "adjunctions" = doDistribute super."adjunctions_4_2_2";
+  "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";
@@ -1269,6 +1275,7 @@ self: super: {
   "augeas" = dontDistribute super."augeas";
   "augur" = dontDistribute super."augur";
   "aur" = dontDistribute super."aur";
+  "authenticate" = doDistribute super."authenticate_1_3_2_11";
   "authenticate-kerberos" = dontDistribute super."authenticate-kerberos";
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
@@ -1609,6 +1616,7 @@ self: super: {
   "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_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";
@@ -1687,6 +1695,7 @@ self: super: {
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
   "cassandra-thrift" = dontDistribute super."cassandra-thrift";
+  "cassava" = doDistribute super."cassava_0_4_4_0";
   "cassava-conduit" = dontDistribute super."cassava-conduit";
   "cassava-streams" = dontDistribute super."cassava-streams";
   "cassette" = dontDistribute super."cassette";
@@ -1708,6 +1717,7 @@ self: super: {
   "ceilometer-common" = dontDistribute super."ceilometer-common";
   "cellrenderer-cairo" = dontDistribute super."cellrenderer-cairo";
   "cerberus" = dontDistribute super."cerberus";
+  "cereal" = doDistribute super."cereal_0_4_1_1";
   "cereal-derive" = dontDistribute super."cereal-derive";
   "cereal-enumerator" = dontDistribute super."cereal-enumerator";
   "cereal-ieee754" = dontDistribute super."cereal-ieee754";
@@ -1720,6 +1730,7 @@ self: super: {
   "cfopu" = dontDistribute super."cfopu";
   "cg" = dontDistribute super."cg";
   "cgen" = dontDistribute super."cgen";
+  "cgi" = doDistribute super."cgi_3001_2_2_2";
   "cgi-undecidable" = dontDistribute super."cgi-undecidable";
   "cgi-utils" = dontDistribute super."cgi-utils";
   "cgrep" = dontDistribute super."cgrep";
@@ -1939,6 +1950,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant" = doDistribute super."contravariant_1_3_3";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
   "control-monad-exception" = dontDistribute super."control-monad-exception";
@@ -2031,6 +2043,7 @@ self: super: {
   "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh";
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
+  "cryptol" = doDistribute super."cryptol_2_2_6";
   "cryptsy-api" = dontDistribute super."cryptsy-api";
   "crystalfontz" = dontDistribute super."crystalfontz";
   "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin";
@@ -2617,6 +2630,7 @@ self: super: {
   "factory" = dontDistribute super."factory";
   "factual-api" = dontDistribute super."factual-api";
   "fad" = dontDistribute super."fad";
+  "fail" = dontDistribute super."fail";
   "failable-list" = dontDistribute super."failable-list";
   "failure" = dontDistribute super."failure";
   "fair-predicates" = dontDistribute super."fair-predicates";
@@ -2676,6 +2690,7 @@ self: super: {
   "fig" = dontDistribute super."fig";
   "file-collection" = dontDistribute super."file-collection";
   "file-command-qq" = dontDistribute super."file-command-qq";
+  "file-embed" = doDistribute super."file-embed_0_0_9";
   "filediff" = dontDistribute super."filediff";
   "filepath-io-access" = dontDistribute super."filepath-io-access";
   "filepather" = dontDistribute super."filepather";
@@ -2744,6 +2759,8 @@ self: super: {
   "fluent-logger-conduit" = dontDistribute super."fluent-logger-conduit";
   "fluidsynth" = dontDistribute super."fluidsynth";
   "fmark" = dontDistribute super."fmark";
+  "fn" = doDistribute super."fn_0_2_0_1";
+  "fn-extra" = doDistribute super."fn-extra_0_2_0_0";
   "fold-debounce" = dontDistribute super."fold-debounce";
   "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
   "foldl" = doDistribute super."foldl_1_1_3";
@@ -2901,6 +2918,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generics-eot" = dontDistribute super."generics-eot";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
   "geni-gui" = dontDistribute super."geni-gui";
@@ -2938,6 +2956,7 @@ self: super: {
   "ghc-imported-from" = dontDistribute super."ghc-imported-from";
   "ghc-make" = dontDistribute super."ghc-make";
   "ghc-man-completion" = dontDistribute super."ghc-man-completion";
+  "ghc-mod" = doDistribute super."ghc-mod_5_4_0_0";
   "ghc-options" = dontDistribute super."ghc-options";
   "ghc-parmake" = dontDistribute super."ghc-parmake";
   "ghc-pkg-autofix" = dontDistribute super."ghc-pkg-autofix";
@@ -2949,6 +2968,8 @@ self: super: {
   "ghc-syb" = dontDistribute super."ghc-syb";
   "ghc-tcplugins-extra" = doDistribute super."ghc-tcplugins-extra_0_1";
   "ghc-time-alloc-prof" = dontDistribute super."ghc-time-alloc-prof";
+  "ghc-typelits-extra" = doDistribute super."ghc-typelits-extra_0_1";
+  "ghc-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_3_1";
   "ghc-vis" = dontDistribute super."ghc-vis";
   "ghci-diagrams" = dontDistribute super."ghci-diagrams";
   "ghci-haskeline" = dontDistribute super."ghci-haskeline";
@@ -3617,6 +3638,7 @@ self: super: {
   "her-lexer" = dontDistribute super."her-lexer";
   "her-lexer-parsec" = dontDistribute super."her-lexer-parsec";
   "herbalizer" = dontDistribute super."herbalizer";
+  "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";
@@ -4033,6 +4055,7 @@ self: super: {
   "htsn-common" = dontDistribute super."htsn-common";
   "htsn-import" = dontDistribute super."htsn-import";
   "http-attoparsec" = dontDistribute super."http-attoparsec";
+  "http-client" = doDistribute super."http-client_0_4_26_2";
   "http-client-auth" = dontDistribute super."http-client-auth";
   "http-client-conduit" = dontDistribute super."http-client-conduit";
   "http-client-lens" = dontDistribute super."http-client-lens";
@@ -4843,6 +4866,8 @@ self: super: {
   "memory" = doDistribute super."memory_0_10";
   "memscript" = dontDistribute super."memscript";
   "mersenne-random" = dontDistribute super."mersenne-random";
+  "messagepack" = doDistribute super."messagepack_0_4_0";
+  "messagepack-rpc" = doDistribute super."messagepack-rpc_0_2_0_0";
   "messente" = dontDistribute super."messente";
   "meta-misc" = dontDistribute super."meta-misc";
   "meta-par" = dontDistribute super."meta-par";
@@ -5125,6 +5150,7 @@ self: super: {
   "netrc" = dontDistribute super."netrc";
   "netspec" = dontDistribute super."netspec";
   "netstring-enumerator" = dontDistribute super."netstring-enumerator";
+  "nettle" = doDistribute super."nettle_0_1_1";
   "nettle-frp" = dontDistribute super."nettle-frp";
   "nettle-netkit" = dontDistribute super."nettle-netkit";
   "nettle-openflow" = dontDistribute super."nettle-openflow";
@@ -5357,6 +5383,7 @@ self: super: {
   "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";
@@ -5569,6 +5596,7 @@ self: super: {
   "poll" = dontDistribute super."poll";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
   "polynomial" = dontDistribute super."polynomial";
   "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
   "polyseq" = dontDistribute super."polyseq";
@@ -5766,6 +5794,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6081,6 +6110,7 @@ self: super: {
   "safe-length" = dontDistribute super."safe-length";
   "safe-plugins" = dontDistribute super."safe-plugins";
   "safe-printf" = dontDistribute super."safe-printf";
+  "safecopy" = doDistribute super."safecopy_0_8_6";
   "safeint" = dontDistribute super."safeint";
   "safer-file-handles" = dontDistribute super."safer-file-handles";
   "safer-file-handles-bytestring" = dontDistribute super."safer-file-handles-bytestring";
@@ -6529,6 +6559,7 @@ self: super: {
   "stack-prism" = dontDistribute super."stack-prism";
   "stack-run" = dontDistribute super."stack-run";
   "stackage-curator" = doDistribute super."stackage-curator_0_11_0";
+  "stackage-types" = doDistribute super."stackage-types_1_1_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -6746,6 +6777,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-silver" = doDistribute super."tasty-silver_3_1_8";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -6861,6 +6893,7 @@ self: super: {
   "themplate" = dontDistribute super."themplate";
   "theoremquest" = dontDistribute super."theoremquest";
   "theoremquest-client" = dontDistribute super."theoremquest-client";
+  "these" = doDistribute super."these_0_6_2_0";
   "thespian" = dontDistribute super."thespian";
   "theta-functions" = dontDistribute super."theta-functions";
   "thih" = dontDistribute super."thih";
@@ -7316,6 +7349,7 @@ self: super: {
   "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-content-type" = doDistribute super."wai-middleware-content-type_0_2_0";
   "wai-middleware-etag" = dontDistribute super."wai-middleware-etag";
   "wai-middleware-gunzip" = dontDistribute super."wai-middleware-gunzip";
   "wai-middleware-headers" = dontDistribute super."wai-middleware-headers";
@@ -7385,6 +7419,7 @@ self: super: {
   "weighted-regexp" = dontDistribute super."weighted-regexp";
   "weighted-search" = dontDistribute super."weighted-search";
   "welshy" = dontDistribute super."welshy";
+  "werewolf" = dontDistribute super."werewolf";
   "wheb-mongo" = dontDistribute super."wheb-mongo";
   "wheb-redis" = dontDistribute super."wheb-redis";
   "wheb-strapped" = dontDistribute super."wheb-strapped";
@@ -7552,6 +7587,7 @@ self: super: {
   "yeller" = dontDistribute super."yeller";
   "yesod-angular" = dontDistribute super."yesod-angular";
   "yesod-angular-ui" = dontDistribute super."yesod-angular-ui";
+  "yesod-auth" = doDistribute super."yesod-auth_1_4_11";
   "yesod-auth-bcrypt" = dontDistribute super."yesod-auth-bcrypt";
   "yesod-auth-kerberos" = dontDistribute super."yesod-auth-kerberos";
   "yesod-auth-ldap" = dontDistribute super."yesod-auth-ldap";
@@ -7566,6 +7602,7 @@ self: super: {
   "yesod-comments" = dontDistribute super."yesod-comments";
   "yesod-content-pdf" = dontDistribute super."yesod-content-pdf";
   "yesod-continuations" = dontDistribute super."yesod-continuations";
+  "yesod-core" = doDistribute super."yesod-core_1_4_18_1";
   "yesod-crud" = dontDistribute super."yesod-crud";
   "yesod-crud-persist" = dontDistribute super."yesod-crud-persist";
   "yesod-csp" = dontDistribute super."yesod-csp";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 9fcaa3e41f27..6c2feb4946e5 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1610,6 +1610,7 @@ self: {
          vector-th-unbox
        ];
        executableHaskellDepends = [ base cmdargs ];
+       jailbreak = true;
        homepage = "https://github.com/choener/BiobaseXNA";
        description = "Efficient RNA/DNA representations";
        license = stdenv.lib.licenses.gpl3;
@@ -3995,7 +3996,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "DRBG" = callPackage
+  "DRBG_0_5_4" = callPackage
     ({ mkDerivation, base, binary, bytestring, cereal, cipher-aes128
      , crypto-api, crypto-api-tests, cryptohash-cryptoapi, entropy
      , HUnit, mtl, parallel, prettyclass, QuickCheck, tagged
@@ -4016,12 +4017,14 @@ self: {
          crypto-api-tests cryptohash-cryptoapi entropy HUnit mtl parallel
          prettyclass QuickCheck tagged test-framework test-framework-hunit
        ];
+       jailbreak = true;
        doCheck = false;
        description = "Deterministic random bit generator (aka RNG, PRNG) based HMACs, Hashes, and Ciphers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "DRBG_0_5_5" = callPackage
+  "DRBG" = callPackage
     ({ mkDerivation, base, binary, bytestring, cereal, cipher-aes128
      , crypto-api, crypto-api-tests, cryptohash-cryptoapi, entropy
      , HUnit, mtl, parallel, prettyclass, QuickCheck, tagged
@@ -4040,10 +4043,9 @@ self: {
          crypto-api-tests cryptohash-cryptoapi entropy HUnit mtl parallel
          prettyclass QuickCheck tagged test-framework test-framework-hunit
        ];
-       jailbreak = true;
+       doCheck = false;
        description = "Deterministic random bit generator (aka RNG, PRNG) based HMACs, Hashes, and Ciphers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DSA" = callPackage
@@ -6561,7 +6563,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "GPipe" = callPackage
+  "GPipe_2_1_5" = callPackage
     ({ mkDerivation, base, Boolean, containers, exception-transformers
      , gl, hashtables, linear, transformers
      }:
@@ -6576,9 +6578,10 @@ self: {
        homepage = "http://tobbebex.blogspot.se/";
        description = "Typesafe functional GPU graphics programming";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "GPipe_2_1_6" = callPackage
+  "GPipe" = callPackage
     ({ mkDerivation, base, Boolean, containers, exception-transformers
      , gl, hashtables, linear, transformers
      }:
@@ -6593,7 +6596,6 @@ self: {
        homepage = "http://tobbebex.blogspot.se/";
        description = "Typesafe functional GPU graphics programming";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GPipe-Collada" = callPackage
@@ -6942,6 +6944,20 @@ self: {
        license = "GPL";
      }) {};
 
+  "Gifcurry" = callPackage
+    ({ mkDerivation, base, gtk3, process, temporary }:
+     mkDerivation {
+       pname = "Gifcurry";
+       version = "0.1.0.0";
+       sha256 = "b2b6eadd35889f996931887b21c85a9dbd397f988567981479266752e21537bf";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base gtk3 process temporary ];
+       homepage = "https://github.com/lettier/gifcurry";
+       description = "Create animated GIFs, overlaid with optional text, from movies";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "GiveYouAHead" = callPackage
     ({ mkDerivation, base, directory, extra, old-time, process }:
      mkDerivation {
@@ -9226,7 +9242,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "HUnit" = callPackage
+  "HUnit_1_3_1_0" = callPackage
     ({ mkDerivation, base, deepseq, filepath }:
      mkDerivation {
        pname = "HUnit";
@@ -9237,9 +9253,10 @@ self: {
        homepage = "http://hunit.sourceforge.net/";
        description = "A unit testing framework for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "HUnit_1_3_1_1" = callPackage
+  "HUnit" = callPackage
     ({ mkDerivation, base, deepseq, filepath }:
      mkDerivation {
        pname = "HUnit";
@@ -9250,7 +9267,6 @@ self: {
        homepage = "https://github.com/hspec/HUnit#readme";
        description = "A unit testing framework for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HUnit-Diff" = callPackage
@@ -9433,7 +9449,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "HaRe" = callPackage
+  "HaRe_0_8_2_2" = callPackage
     ({ mkDerivation, array, base, Cabal, cabal-helper, containers
      , deepseq, Diff, directory, filepath, ghc, ghc-exactprint, ghc-mod
      , ghc-paths, ghc-prim, ghc-syb-utils, hslogger, hspec, HUnit
@@ -9470,6 +9486,51 @@ self: {
          Strafunski-StrategyLib stringbuilder syb syz time transformers
          transformers-base
        ];
+       jailbreak = true;
+       doCheck = false;
+       homepage = "https://github.com/RefactoringTools/HaRe/wiki";
+       description = "the Haskell Refactorer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "HaRe" = callPackage
+    ({ mkDerivation, array, base, Cabal, cabal-helper, containers
+     , deepseq, Diff, directory, filepath, ghc, ghc-exactprint, ghc-mod
+     , ghc-paths, ghc-prim, ghc-syb-utils, hslogger, hspec, HUnit
+     , monad-control, monoid-extras, mtl, old-time, parsec, pretty
+     , process, QuickCheck, rosezipper, semigroups, silently
+     , Strafunski-StrategyLib, stringbuilder, syb, syz, time
+     , transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "HaRe";
+       version = "0.8.2.3";
+       sha256 = "8ccd728cd666929cc59ac1ad9fc16a5a462454a6c04c7c5019767f0b490a0e04";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base Cabal cabal-helper containers directory filepath ghc
+         ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils hslogger
+         monad-control monoid-extras mtl old-time pretty rosezipper
+         semigroups Strafunski-StrategyLib syb syz time transformers
+         transformers-base
+       ];
+       executableHaskellDepends = [
+         array base Cabal cabal-helper containers directory filepath ghc
+         ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils hslogger
+         monad-control monoid-extras mtl old-time parsec pretty rosezipper
+         semigroups Strafunski-StrategyLib syb syz time transformers
+         transformers-base
+       ];
+       testHaskellDepends = [
+         base Cabal cabal-helper containers deepseq Diff directory filepath
+         ghc ghc-exactprint ghc-mod ghc-paths ghc-prim ghc-syb-utils
+         hslogger hspec HUnit monad-control monoid-extras mtl old-time
+         process QuickCheck rosezipper semigroups silently
+         Strafunski-StrategyLib stringbuilder syb syz time transformers
+         transformers-base
+       ];
        doCheck = false;
        homepage = "https://github.com/RefactoringTools/HaRe/wiki";
        description = "the Haskell Refactorer";
@@ -12358,6 +12419,7 @@ self: {
          aeson base binary cereal QuickCheck stringable test-framework
          test-framework-quickcheck2 test-framework-th
        ];
+       jailbreak = true;
        homepage = "https://github.com/choener/LinguisticsTypes";
        description = "Collection of types for natural language";
        license = stdenv.lib.licenses.bsd3;
@@ -13720,15 +13782,15 @@ self: {
      }:
      mkDerivation {
        pname = "NTRU";
-       version = "1.0.0.0";
-       sha256 = "0a6e9e4dacb3da068566a775440d51ac1c7021807a163c3bd03facb27f872659";
+       version = "1.0.0.1";
+       sha256 = "4639599d4459e01a6876a2d51847d2d72161616d4dcda18d7e9e5d5e02b02cc1";
        libraryHaskellDepends = [
          arithmoi base bytestring containers crypto-api polynomial random
          SHA split
        ];
        jailbreak = true;
        description = "NTRU Cryptography";
-       license = stdenv.lib.licenses.bsd3;
+       license = "GPL";
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
@@ -13815,6 +13877,7 @@ self: {
          test-framework test-framework-quickcheck2 test-framework-th text
          unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/choener/NaturalLanguageAlphabets";
        description = "Simple scoring schemes for word alignments";
        license = stdenv.lib.licenses.bsd3;
@@ -15013,8 +15076,8 @@ self: {
      }:
      mkDerivation {
        pname = "PUH-Project";
-       version = "0.1.0.0";
-       sha256 = "511308eeeea64fe89f13e6e1ccbd2cbd912c95f670926f2b181a7234c58dac6a";
+       version = "0.1.0.1";
+       sha256 = "3ae48511d92c0d0794b1de80363ab718400e9a44f80cb0e4f03b225ed4c0c522";
        libraryHaskellDepends = [
          base bytestring containers directory mime-mail network old-locale
          persistent persistent-sqlite persistent-template pwstore-fast
@@ -15475,6 +15538,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
+       jailbreak = true;
        homepage = "https://github.com/choener/PrimitiveArray";
        description = "Efficient multidimensional arrays";
        license = stdenv.lib.licenses.bsd3;
@@ -21207,6 +21271,7 @@ self: {
          extensible-exceptions filepath mtl network safecopy stm
          template-haskell unix
        ];
+       jailbreak = true;
        homepage = "http://acid-state.seize.it/";
        description = "Add ACID guarantees to any serializable Haskell data structure";
        license = stdenv.lib.licenses.publicDomain;
@@ -22252,6 +22317,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "adler32" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, zlib }:
+     mkDerivation {
+       pname = "adler32";
+       version = "0.1.0.0";
+       sha256 = "c2bdbdd971e28ed4abb321280c3d77965ed425a848b3ef08ac66a6233c5d5328";
+       libraryHaskellDepends = [ base bytestring ];
+       librarySystemDepends = [ zlib ];
+       testHaskellDepends = [ base bytestring hspec ];
+       homepage = "https://github.com/redneb/hs-adler32";
+       description = "An implementation of Adler-32, supporting rolling checksum operation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) zlib;};
+
   "adobe-swatch-exchange" = callPackage
     ({ mkDerivation, base, binary, bytestring, data-binary-ieee754
      , language-css, mtl, pretty
@@ -28303,8 +28382,8 @@ self: {
        pname = "apache-md5";
        version = "0.6.1.4";
        sha256 = "c84f882f6aca7b72d89ee662d358f40fe89ab3267ec418f3bee24a0d80b096b7";
-       revision = "1";
-       editedCabalFile = "a02fc33fc22e8a719df4c1c5a8974f4f60e9c7b42c916157611c9f7f72e1b516";
+       revision = "2";
+       editedCabalFile = "e41d43eba938331a51fb0ead7cd004c6f539820c06aed48a77eb67e04eee39f2";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ openssl ];
        testHaskellDepends = [
@@ -29083,6 +29162,7 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath semigroups simple-reflect
        ];
+       jailbreak = true;
        homepage = "http://github.com/analytics/approximate/";
        description = "Approximate discrete values and numbers";
        license = stdenv.lib.licenses.bsd3;
@@ -29531,12 +29611,17 @@ self: {
      }) {};
 
   "argon2" = callPackage
-    ({ mkDerivation, base, bytestring, text, transformers }:
+    ({ mkDerivation, base, bytestring, QuickCheck, tasty
+     , tasty-quickcheck, text, transformers
+     }:
      mkDerivation {
        pname = "argon2";
-       version = "1.0.0";
-       sha256 = "29691e8019104b724466766b5031335e9dea185a84b886e2f9d895f4fe01eae3";
+       version = "1.1.0";
+       sha256 = "42fc5495434739408115cd932e7b3a6853e4f999e86bd408422ed0abfa19837a";
        libraryHaskellDepends = [ base bytestring text transformers ];
+       testHaskellDepends = [
+         base bytestring QuickCheck tasty tasty-quickcheck text
+       ];
        homepage = "https://github.com/ocharles/argon2.git";
        description = "Haskell bindings to libargon2 - the reference implementation of the Argon2 password-hashing function";
        license = stdenv.lib.licenses.bsd3;
@@ -30919,8 +31004,8 @@ self: {
     ({ mkDerivation, base, mtl }:
      mkDerivation {
        pname = "atrans";
-       version = "0.1.0.1";
-       sha256 = "84440b6c0a27c656a580df640db912a19eb0fb5aaa09a1437f451b5809ee6035";
+       version = "0.1.1.0";
+       sha256 = "9119df84f2dacc53935238c4c225f26937e25898d91b8c2d973e4cf467249b66";
        libraryHaskellDepends = [ base mtl ];
        homepage = "https://github.com/aphorisme/atrans";
        description = "A small collection of monad (transformer) instances";
@@ -31419,7 +31504,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "authenticate" = callPackage
+  "authenticate_1_3_2_11" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
      , case-insensitive, conduit, containers, http-conduit, http-types
      , monad-control, network-uri, resourcet, tagstream-conduit, text
@@ -31438,6 +31523,28 @@ self: {
        homepage = "http://github.com/yesodweb/authenticate";
        description = "Authentication methods for Haskell web applications";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "authenticate" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring
+     , case-insensitive, conduit, containers, http-conduit, http-types
+     , monad-control, network-uri, resourcet, tagstream-conduit, text
+     , transformers, unordered-containers, xml-conduit
+     }:
+     mkDerivation {
+       pname = "authenticate";
+       version = "1.3.3";
+       sha256 = "6807cd32c5ff9b23cd6f184ffd7fb7f99c4a7f0dc645eae82f2d6dfbd1899bbe";
+       libraryHaskellDepends = [
+         aeson attoparsec base blaze-builder bytestring case-insensitive
+         conduit containers http-conduit http-types monad-control
+         network-uri resourcet tagstream-conduit text transformers
+         unordered-containers xml-conduit
+       ];
+       homepage = "http://github.com/yesodweb/authenticate";
+       description = "Authentication methods for Haskell web applications";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "authenticate-kerberos" = callPackage
@@ -32035,6 +32142,8 @@ self: {
        pname = "aws";
        version = "0.13.0";
        sha256 = "3504c96a00d12fa0fe4ae5ab4dafa3eec7ca576a02ed7906cff70a75625a75a6";
+       revision = "1";
+       editedCabalFile = "57beb101b4203e6784df90817aadfbda98972052e31f85fa620f2d7dcdf6a446";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -33080,8 +33189,8 @@ self: {
     ({ mkDerivation, base, hspec, HUnit, QuickCheck, time }:
      mkDerivation {
        pname = "bank-holiday-usa";
-       version = "0.1.0";
-       sha256 = "c5de8ab4ffc24c11d60762057c9261adc2b05762e8465b27afe6f4f7a499dbc8";
+       version = "0.1.1";
+       sha256 = "5fbd4b6a9cc86717530430dae50e6fe2fc049d336e97c8bb7ebcec25d738448b";
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base hspec HUnit QuickCheck time ];
        homepage = "https://github.com/tippenein/BankHoliday";
@@ -35205,13 +35314,13 @@ self: {
 
   "binary-search" = callPackage
     ({ mkDerivation, base, containers, directory, doctest, filepath
-     , hspec, QuickCheck
+     , hspec, QuickCheck, transformers
      }:
      mkDerivation {
        pname = "binary-search";
-       version = "0.9";
-       sha256 = "6687d2a1ec0a759aabda6899ff4fda59ed929c497a90ae05507ed854b33bffda";
-       libraryHaskellDepends = [ base containers ];
+       version = "1.0.0.3";
+       sha256 = "b0e32df46aeddceac57bd6afa940f84f275f82fb251479e10fadd7c14414f6fa";
+       libraryHaskellDepends = [ base containers transformers ];
        testHaskellDepends = [
          base directory doctest filepath hspec QuickCheck
        ];
@@ -35219,23 +35328,6 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "binary-search_1_0_0_1" = callPackage
-    ({ mkDerivation, base, containers, directory, doctest, filepath
-     , hspec, QuickCheck
-     }:
-     mkDerivation {
-       pname = "binary-search";
-       version = "1.0.0.1";
-       sha256 = "4d5694054f6ef69aacc9e0135932e01a6bb20e6c49d69e39b2c9657ce4ae3795";
-       libraryHaskellDepends = [ base containers ];
-       testHaskellDepends = [
-         base directory doctest filepath hspec QuickCheck
-       ];
-       description = "Binary and exponential searches";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "binary-shared" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, mtl }:
      mkDerivation {
@@ -36034,11 +36126,10 @@ self: {
     ({ mkDerivation, base, bindings-DSL, lxc }:
      mkDerivation {
        pname = "bindings-lxc";
-       version = "0.2.0.1";
-       sha256 = "82a47461390fa5e510887954ede3971664a1f29dea689f94bb21e789faefc170";
+       version = "0.2.1";
+       sha256 = "4fee45e55c7cb2ae75a83005213eb7aa2dae7ee97704db3e0cd4ae918ae13087";
        libraryHaskellDepends = [ base bindings-DSL ];
        librarySystemDepends = [ lxc ];
-       jailbreak = true;
        homepage = "https://github.com/fizruk/bindings-lxc";
        description = "Direct Haskell bindings to LXC (Linux containers) C API";
        license = stdenv.lib.licenses.bsd3;
@@ -36324,14 +36415,14 @@ self: {
      }) {};
 
   "bini" = callPackage
-    ({ mkDerivation, base, binary, bytestring }:
+    ({ mkDerivation, base, binary, bytestring, data-binary-ieee754 }:
      mkDerivation {
        pname = "bini";
-       version = "0.1.3";
-       sha256 = "0230985959d9bd82d014ce62e14768cb46cb0b78b77f7ab34d07208976c00981";
-       revision = "1";
-       editedCabalFile = "9ea37e003df728ff0addc67d1ff8d15533a4baa4c525339c4638bad137d6c953";
-       libraryHaskellDepends = [ base binary bytestring ];
+       version = "0.1.5";
+       sha256 = "b83bc415d2d08bfbaadccd8723ad4945d0cb4c519a414cc28a56572b9cd08cb4";
+       libraryHaskellDepends = [
+         base binary bytestring data-binary-ieee754
+       ];
        description = "A collection of various methods for reading and writing bini files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -38158,6 +38249,7 @@ self: {
        executableHaskellDepends = [
          base blubber-server bytestring cereal containers gloss network unix
        ];
+       jailbreak = true;
        homepage = "https://secure.plaimi.net/games/blubber.html";
        description = "The blubber client; connects to the blubber server";
        license = stdenv.lib.licenses.gpl3;
@@ -38367,11 +38459,12 @@ self: {
        pname = "boolean-normal-forms";
        version = "0.0.0.1";
        sha256 = "2c8a8a9b2e868e29fab7467272c6c54792417bcd8c0e349963b3aff82137c287";
+       revision = "1";
+       editedCabalFile = "c4ca8c0d91be170e201800c3c26de19dea859afa56d69bdab323315e31a74075";
        libraryHaskellDepends = [ base cond containers ];
        testHaskellDepends = [
          base cond containers QuickCheck tasty tasty-quickcheck
        ];
-       jailbreak = true;
        description = "Boolean normal form: NNF, DNF & CNF";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -39719,6 +39812,7 @@ self: {
          transformers-compat void
        ];
        testHaskellDepends = [ base directory doctest filepath ];
+       jailbreak = true;
        homepage = "http://github.com/analytics/bytes";
        description = "Sharing code for serialization between binary and cereal";
        license = stdenv.lib.licenses.bsd3;
@@ -39741,6 +39835,7 @@ self: {
          transformers-compat void
        ];
        testHaskellDepends = [ base directory doctest filepath ];
+       jailbreak = true;
        homepage = "http://github.com/analytics/bytes";
        description = "Sharing code for serialization between binary and cereal";
        license = stdenv.lib.licenses.bsd3;
@@ -39763,6 +39858,7 @@ self: {
          transformers-compat void
        ];
        testHaskellDepends = [ base directory doctest filepath ];
+       jailbreak = true;
        homepage = "https://github.com/ekmett/bytes";
        description = "Sharing code for serialization between binary and cereal";
        license = stdenv.lib.licenses.bsd3;
@@ -39974,6 +40070,8 @@ self: {
        pname = "bytestring-conversion";
        version = "0.3.1";
        sha256 = "13b7ea48737dc7a7fd4c894ff1fb9344cf8d9ef8f4201e813d578b613e874ef8";
+       revision = "2";
+       editedCabalFile = "c3a83596c9955edb5558503dfd698d9a99e0da65bdf53edf6eceacef98200cf5";
        libraryHaskellDepends = [
          attoparsec base bytestring case-insensitive double-conversion text
        ];
@@ -40910,7 +41008,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cabal-helper" = callPackage
+  "cabal-helper_0_6_3_0" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, directory, extra
      , filepath, ghc-prim, mtl, process, template-haskell, temporary
      , transformers, unix, utf8-string
@@ -40935,9 +41033,10 @@ self: {
        doCheck = false;
        description = "Simple interface to some of Cabal's configuration state used by ghc-mod";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cabal-helper_0_6_3_1" = callPackage
+  "cabal-helper" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cabal-install, directory
      , extra, filepath, ghc-prim, mtl, process, template-haskell
      , temporary, transformers, unix, utf8-string
@@ -40963,7 +41062,6 @@ self: {
        doCheck = false;
        description = "Simple interface to some of Cabal's configuration state used by ghc-mod";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-install_1_18_0_5" = callPackage
@@ -43363,7 +43461,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cassava" = callPackage
+  "cassava_0_4_4_0" = callPackage
     ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring
      , containers, deepseq, hashable, HUnit, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text
@@ -43387,9 +43485,10 @@ self: {
        homepage = "https://github.com/tibbe/cassava";
        description = "A CSV parsing and encoding library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cassava_0_4_5_0" = callPackage
+  "cassava" = callPackage
     ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring
      , containers, deepseq, hashable, HUnit, QuickCheck, test-framework
      , test-framework-hunit, test-framework-quickcheck2, text
@@ -43411,7 +43510,6 @@ self: {
        homepage = "https://github.com/hvr/cassava";
        description = "A CSV parsing and encoding library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cassava-conduit" = callPackage
@@ -43708,8 +43806,8 @@ self: {
      }:
      mkDerivation {
        pname = "cblrepo";
-       version = "0.19.0";
-       sha256 = "4608d1b3437c3dd00310b7accf53c1d904eb0390feec25075ad2bdef3ab01a19";
+       version = "0.19.1";
+       sha256 = "e06276a14157bf82b86f3a534bc51620134253b1e9472e676616cec58ab8b436";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -43889,7 +43987,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cereal" = callPackage
+  "cereal_0_4_1_1" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, ghc-prim }:
      mkDerivation {
        pname = "cereal";
@@ -43900,9 +43998,10 @@ self: {
        ];
        description = "A binary serialization library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cereal_0_5_1_0" = callPackage
+  "cereal" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, ghc-prim
      , QuickCheck, test-framework, test-framework-quickcheck2
      }:
@@ -43920,7 +44019,6 @@ self: {
        homepage = "https://github.com/GaloisInc/cereal";
        description = "A binary serialization library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cereal-conduit_0_7_2_3" = callPackage
@@ -43937,6 +44035,7 @@ self: {
        testHaskellDepends = [
          base bytestring cereal conduit HUnit mtl resourcet transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/snoyberg/conduit";
        description = "Turn Data.Serialize Gets and Puts into Sources, Sinks, and Conduits";
        license = stdenv.lib.licenses.bsd3;
@@ -44167,6 +44266,7 @@ self: {
          hashable mtl parallel parsec process split text
          unordered-containers utf8-string void
        ];
+       jailbreak = true;
        description = "Parser for categorial grammars";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
@@ -44193,7 +44293,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cgi" = callPackage
+  "cgi_3001_2_2_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, mtl
      , multipart, network, network-uri, old-locale, old-time, parsec
      , xhtml
@@ -44209,9 +44309,10 @@ self: {
        homepage = "https://github.com/cheecheeo/haskell-cgi";
        description = "A library for writing CGI programs";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cgi_3001_2_2_3" = callPackage
+  "cgi" = callPackage
     ({ mkDerivation, base, bytestring, containers, exceptions, mtl
      , multipart, network, network-uri, old-locale, old-time, parsec
      , xhtml
@@ -44227,7 +44328,6 @@ self: {
        homepage = "https://github.com/cheecheeo/haskell-cgi";
        description = "A library for writing CGI programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cgi-undecidable" = callPackage
@@ -44529,6 +44629,7 @@ self: {
          quickcheck-instances tasty tasty-ant-xml tasty-hunit
          tasty-quickcheck text tokenize unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://github.com/creswick/chatter";
        description = "A library of simple NLP algorithms";
        license = stdenv.lib.licenses.bsd3;
@@ -49904,8 +50005,8 @@ self: {
      }:
      mkDerivation {
        pname = "concurrent-machines";
-       version = "0.1.0.2";
-       sha256 = "50b9de838e91fd6161f1a19940236132e28348871e6c01ad1c1586aad9113e89";
+       version = "0.2.0";
+       sha256 = "85c6050bc86f0a421e39ca6c7a9ac71fa2601d6b8be7792ac57d43fdddd95e4c";
        libraryHaskellDepends = [
          async base containers lifted-async machines monad-control
          semigroups time transformers transformers-base
@@ -51908,7 +52009,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "contravariant" = callPackage
+  "contravariant_1_3_3" = callPackage
     ({ mkDerivation, base, semigroups, StateVar, transformers
      , transformers-compat, void
      }:
@@ -51922,9 +52023,10 @@ self: {
        homepage = "http://github.com/ekmett/contravariant/";
        description = "Contravariant functors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "contravariant_1_4" = callPackage
+  "contravariant" = callPackage
     ({ mkDerivation, base, semigroups, StateVar, transformers
      , transformers-compat, void
      }:
@@ -51938,7 +52040,6 @@ self: {
        homepage = "http://github.com/ekmett/contravariant/";
        description = "Contravariant functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "contravariant-extras" = callPackage
@@ -53301,6 +53402,7 @@ self: {
          base bytestring cereal Decimal iproute network QuickCheck tasty
          tasty-quickcheck text time uuid
        ];
+       jailbreak = true;
        homepage = "https://github.com/twittner/cql/";
        description = "Cassandra CQL binary protocol";
        license = stdenv.lib.licenses.mpl20;
@@ -54186,6 +54288,7 @@ self: {
          base bytestring cereal conduit conduit-extra crypto-api
          cryptocipher cryptohash-cryptoapi hspec skein transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/prowdsponsor/crypto-conduit";
        description = "Conduit interface for cryptographic operations (from crypto-api)";
        license = stdenv.lib.licenses.bsd3;
@@ -54665,7 +54768,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cryptol" = callPackage
+  "cryptol_2_2_6" = callPackage
     ({ mkDerivation, alex, ansi-terminal, array, async, base
      , base-compat, containers, deepseq, directory, filepath, gitrev
      , GraphSCC, happy, haskeline, heredoc, monadLib, old-time
@@ -54692,9 +54795,10 @@ self: {
        homepage = "http://www.cryptol.net/";
        description = "Cryptol: The Language of Cryptography";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cryptol_2_3_0" = callPackage
+  "cryptol" = callPackage
     ({ mkDerivation, alex, ansi-terminal, array, async, base
      , base-compat, bytestring, containers, deepseq, deepseq-generics
      , directory, filepath, generic-trie, gitrev, GraphSCC, happy
@@ -54725,7 +54829,6 @@ self: {
        homepage = "http://www.cryptol.net/";
        description = "Cryptol: The Language of Cryptography";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cryptonite_0_6" = callPackage
@@ -56562,6 +56665,7 @@ self: {
          base bytestring cereal containers directory executable-path
          hashable utf8-string
        ];
+       jailbreak = true;
        homepage = "https://github.com/valderman/data-embed";
        description = "Embed files and other binary blobs inside executables without Template Haskell";
        license = stdenv.lib.licenses.mit;
@@ -57770,6 +57874,7 @@ self: {
          filepath libxml-sax network parsec process QuickCheck random text
          transformers unix vector xml-types
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "https://john-millikin.com/software/haskell-dbus/";
        description = "A client library for the D-Bus IPC system";
@@ -63695,8 +63800,8 @@ self: {
      }:
      mkDerivation {
        pname = "djembe";
-       version = "0.1.1.0";
-       sha256 = "911e4824e432e3d486c464e63c8d37930cb381ce9b47e0cc338f0fad63c6ee88";
+       version = "0.1.1.2";
+       sha256 = "522a89f1f9c29dfaf17b4dd0a0dcb7e88eba511948e8fd94ea618a4757eb7a28";
        libraryHaskellDepends = [
          base hmidi hspec lens mtl QuickCheck random
        ];
@@ -66960,6 +67065,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "elm-bridge_0_2_1_0" = callPackage
+    ({ mkDerivation, aeson, base, containers, hspec, QuickCheck
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "elm-bridge";
+       version = "0.2.1.0";
+       sha256 = "13cffa6de3be713b7003f2c525164bf749c1e9e3127b177b27818164bbeb22c1";
+       libraryHaskellDepends = [ aeson base template-haskell ];
+       testHaskellDepends = [
+         aeson base containers hspec QuickCheck text
+       ];
+       homepage = "http://github.com/agrafix/elm-bridge";
+       description = "Derive Elm types from Haskell types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "elm-build-lib" = callPackage
     ({ mkDerivation, base, bytestring, containers, elm-compiler
      , elm-core-sources, file-embed, template-haskell
@@ -70619,6 +70742,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "fail" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "fail";
+       version = "4.9.0.0";
+       sha256 = "6d5cdb1a5c539425a9665f740e364722e1d9d6ae37fbc55f30fe3dbbbb91d4a2";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://prime.haskell.org/wiki/Libraries/Proposals/MonadFail";
+       description = "Forward-compatible MonadFail class";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "failable-list" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -71800,6 +71935,7 @@ self: {
        version = "0.3.5";
        sha256 = "1086428a9e4463f26882438405f4df84a5d7a9d15ef7af901ec7aebc48e5bd45";
        libraryHaskellDepends = [ base cereal fb persistent text time ];
+       jailbreak = true;
        homepage = "https://github.com/prowdsponsor/fb-persistent";
        description = "Provides Persistent instances to Facebook types";
        license = stdenv.lib.licenses.bsd3;
@@ -72886,7 +73022,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "file-embed" = callPackage
+  "file-embed_0_0_9" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, HUnit
      , template-haskell
      }:
@@ -72901,9 +73037,10 @@ self: {
        homepage = "https://github.com/snoyberg/file-embed";
        description = "Use Template Haskell to embed file contents directly";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "file-embed_0_0_9_1" = callPackage
+  "file-embed" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath
      , template-haskell
      }:
@@ -72918,7 +73055,6 @@ self: {
        homepage = "https://github.com/snoyberg/file-embed";
        description = "Use Template Haskell to embed file contents directly";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "file-location_0_4_5_3" = callPackage
@@ -74499,7 +74635,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "fn" = callPackage
+  "fn_0_2_0_1" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, directory
      , filepath, hspec, http-types, text, unordered-containers, wai
      , wai-extra
@@ -74519,6 +74655,47 @@ self: {
        homepage = "http://github.com/dbp/fn#readme";
        description = "A functional web framework";
        license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "fn" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, directory
+     , filepath, hspec, http-types, text, unordered-containers, wai
+     , wai-extra
+     }:
+     mkDerivation {
+       pname = "fn";
+       version = "0.2.0.2";
+       sha256 = "e305abe5735e0bb58a932766ca910371c8352821683c9b574db8de918c8bd612";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring directory filepath http-types text
+         unordered-containers wai wai-extra
+       ];
+       testHaskellDepends = [
+         base directory filepath hspec http-types text unordered-containers
+         wai wai-extra
+       ];
+       homepage = "http://github.com/dbp/fn#readme";
+       description = "A functional web framework";
+       license = stdenv.lib.licenses.isc;
+     }) {};
+
+  "fn-extra_0_2_0_0" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, either, fn, heist
+     , http-types, lens, mtl, text, wai, wai-util, xmlhtml
+     }:
+     mkDerivation {
+       pname = "fn-extra";
+       version = "0.2.0.0";
+       sha256 = "4463c870b596532599fdfcd0dca53420119bf92d422f4344b5859b0108456538";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring either fn heist http-types lens mtl
+         text wai wai-util xmlhtml
+       ];
+       homepage = "http://github.com/dbp/fn#readme";
+       description = "Extras for Fn, a functional web framework";
+       license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fn-extra" = callPackage
@@ -74527,8 +74704,8 @@ self: {
      }:
      mkDerivation {
        pname = "fn-extra";
-       version = "0.2.0.0";
-       sha256 = "4463c870b596532599fdfcd0dca53420119bf92d422f4344b5859b0108456538";
+       version = "0.2.0.1";
+       sha256 = "4820af377ee54757dbf027f17c91a83afe122cc65b8d8a63a0d3b5762268da44";
        libraryHaskellDepends = [
          base blaze-builder bytestring either fn heist http-types lens mtl
          text wai wai-util xmlhtml
@@ -74762,6 +74939,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "foldl_1_1_5" = callPackage
+    ({ mkDerivation, base, bytestring, comonad, containers, mwc-random
+     , primitive, profunctors, text, transformers, vector
+     }:
+     mkDerivation {
+       pname = "foldl";
+       version = "1.1.5";
+       sha256 = "2053b44ba2a82c247df195f8fdfa159741ffae21c70131bee2e11143577b115a";
+       libraryHaskellDepends = [
+         base bytestring comonad containers mwc-random primitive profunctors
+         text transformers vector
+       ];
+       description = "Composable, streaming, and efficient left folds";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "foldl-incremental" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, foldl
      , histogram-fill, mwc-random, pipes, QuickCheck, tasty
@@ -78085,6 +78279,43 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "generics-eot" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, hspec
+     , interpolate, mockery, QuickCheck, shake
+     }:
+     mkDerivation {
+       pname = "generics-eot";
+       version = "0.1";
+       sha256 = "f293d60d5c2a4aa3065f23e022fd74cf27d8f255e6e9cd44d75d7a44f3f2ab1a";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base directory doctest filepath hspec interpolate mockery
+         QuickCheck shake
+       ];
+       homepage = "https://github.com/soenkehahn/generics-eot#readme";
+       description = "A library for generic programming that aims to be easy to understand";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "generics-eot_0_2" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, hspec
+     , interpolate, mockery, QuickCheck, shake
+     }:
+     mkDerivation {
+       pname = "generics-eot";
+       version = "0.2";
+       sha256 = "732db9692db812b178a7d0bf4b89321c4630722bfe719966023cc9d7fc00820f";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base directory doctest filepath hspec interpolate mockery
+         QuickCheck shake
+       ];
+       homepage = "https://github.com/soenkehahn/generics-eot#readme";
+       description = "A library for generic programming that aims to be easy to understand";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "generics-sop_0_1_0_3" = callPackage
     ({ mkDerivation, base, ghc-prim, template-haskell }:
      mkDerivation {
@@ -79031,7 +79262,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-mod" = callPackage
+  "ghc-mod_5_4_0_0" = callPackage
     ({ mkDerivation, async, base, bytestring, cabal-helper, cereal
      , containers, deepseq, directory, djinn-ghc, doctest, extra
      , fclabels, filepath, ghc, ghc-paths, ghc-syb-utils
@@ -79059,13 +79290,15 @@ self: {
          process split time
        ];
        testHaskellDepends = [ base doctest hspec ];
+       jailbreak = true;
        doCheck = false;
        homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
        description = "Happy Haskell Programming";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-mod_5_5_0_0" = callPackage
+  "ghc-mod" = callPackage
     ({ mkDerivation, base, binary, bytestring, cabal-helper, containers
      , deepseq, directory, djinn-ghc, doctest, extra, fclabels, filepath
      , ghc, ghc-paths, ghc-syb-utils, haskell-src-exts, hlint, hspec
@@ -79091,10 +79324,10 @@ self: {
          mtl old-time optparse-applicative pretty process split time
        ];
        testHaskellDepends = [ base doctest hspec ];
+       doCheck = false;
        homepage = "http://www.mew.org/~kazu/proj/ghc-mod/";
        description = "Happy Haskell Programming";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-mtl" = callPackage
@@ -79399,7 +79632,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc-typelits-extra" = callPackage
+  "ghc-typelits-extra_0_1" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra
      , ghc-typelits-natnormalise, tasty, tasty-hunit
      }:
@@ -79414,9 +79647,10 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "Additional type-level operations on GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-typelits-extra_0_1_1" = callPackage
+  "ghc-typelits-extra" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra
      , ghc-typelits-natnormalise, tasty, tasty-hunit
      }:
@@ -79428,11 +79662,9 @@ self: {
        testHaskellDepends = [
          base ghc-typelits-natnormalise tasty tasty-hunit
        ];
-       jailbreak = true;
        homepage = "http://www.clash-lang.org/";
        description = "Additional type-level operations on GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-typelits-natnormalise_0_3" = callPackage
@@ -79450,7 +79682,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-typelits-natnormalise" = callPackage
+  "ghc-typelits-natnormalise_0_3_1" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra, tasty, tasty-hunit
      }:
      mkDerivation {
@@ -79462,9 +79694,10 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-typelits-natnormalise_0_4" = callPackage
+  "ghc-typelits-natnormalise" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra, tasty, tasty-hunit
      }:
      mkDerivation {
@@ -79473,11 +79706,9 @@ self: {
        sha256 = "8b6f0188b3bc04bef2c7083811eeb4c12a32436a95a797e38e4883067b4c3354";
        libraryHaskellDepends = [ base ghc ghc-tcplugins-extra ];
        testHaskellDepends = [ base tasty tasty-hunit ];
-       jailbreak = true;
        homepage = "http://www.clash-lang.org/";
        description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-vis" = callPackage
@@ -80814,6 +81045,7 @@ self: {
        testHaskellDepends = [
          base containers directory filepath hspec process temporary
        ];
+       jailbreak = true;
        homepage = "https://github.com/oswynb/git-vogue";
        description = "A framework for pre-commit checks";
        license = stdenv.lib.licenses.bsd3;
@@ -84207,6 +84439,8 @@ self: {
        pname = "graph-core";
        version = "0.2.1.0";
        sha256 = "ee783ae89a04fbcebd96166de2813ec7a75c6e136b42006f4ee7d910c54da977";
+       revision = "1";
+       editedCabalFile = "cd8cb2bd5155841338cb527029e919c4320620e3be93ad4c86e1cd2dfecd0629";
        libraryHaskellDepends = [
          base containers deepseq hashable mtl QuickCheck safe
          unordered-containers vector
@@ -84230,6 +84464,8 @@ self: {
        pname = "graph-core";
        version = "0.2.2.0";
        sha256 = "291b63c29296ae9aec1b2c2ed9ea4fc7163b4ba069a531e83b541d7e5e63f833";
+       revision = "1";
+       editedCabalFile = "d9314f075fecb0674ef9c6ee42d4b2224407e2da959add39eb8651cd8a97d5d3";
        libraryHaskellDepends = [
          base containers deepseq hashable mtl QuickCheck safe
          unordered-containers vector
@@ -84981,6 +85217,7 @@ self: {
          base containers QuickCheck test-framework
          test-framework-quickcheck2
        ];
+       jailbreak = true;
        homepage = "https://github.com/mhwombat/grid";
        description = "Tools for working with regular grids (graphs, lattices)";
        license = stdenv.lib.licenses.bsd3;
@@ -94135,6 +94372,38 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hasql_0_19_3_2" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
+     , contravariant, contravariant-extras, data-default-class, dlist
+     , either, hashable, hashtables, loch-th, mtl, placeholders
+     , postgresql-binary, postgresql-libpq, profunctors, QuickCheck
+     , quickcheck-instances, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text, time, transformers
+     , uuid, vector
+     }:
+     mkDerivation {
+       pname = "hasql";
+       version = "0.19.3.2";
+       sha256 = "eabeb40cea7f430add6ed3b25bf3b079427b76e5f5f2a039c5709026ef253949";
+       libraryHaskellDepends = [
+         aeson attoparsec base base-prelude bytestring contravariant
+         contravariant-extras data-default-class dlist either hashable
+         hashtables loch-th mtl placeholders postgresql-binary
+         postgresql-libpq profunctors scientific text time transformers uuid
+         vector
+       ];
+       testHaskellDepends = [
+         base base-prelude bytestring contravariant contravariant-extras
+         data-default-class dlist either hashable profunctors QuickCheck
+         quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck text time transformers uuid vector
+       ];
+       homepage = "https://github.com/nikita-volkov/hasql";
+       description = "A very efficient PostgreSQL driver and a flexible mapping API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hasql-backend_0_2_1" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, list-t, text
      , vector
@@ -97010,6 +97279,18 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "herf-time" = callPackage
+    ({ mkDerivation, base, doctest, time }:
+     mkDerivation {
+       pname = "herf-time";
+       version = "0.2.0";
+       sha256 = "7c1c4762af5bbd493841f291855e7de5ab4b12a5260e8fd95d1f6c9e5a012d7a";
+       libraryHaskellDepends = [ base time ];
+       testHaskellDepends = [ base doctest ];
+       description = "haskell time manipulation in a 'kerf like' style";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hermit" = callPackage
     ({ mkDerivation, alex, ansi-terminal, array, base, base-compat
      , containers, data-default-class, directory, ghc, happy, haskeline
@@ -97631,6 +97912,7 @@ self: {
        version = "0.1.5";
        sha256 = "b348be81f278bcbf384a59029a0135c4aef6b687f2a7168a66aeea54a494e942";
        libraryHaskellDepends = [ base bytestring cereal mtl text unix ];
+       jailbreak = true;
        homepage = "http://github.com/luite/hfsevents";
        description = "File/folder watching for OS X";
        license = stdenv.lib.licenses.bsd3;
@@ -98200,6 +98482,7 @@ self: {
          base bytestring cereal hspec leveldb-haskell lifted-base
          monad-control mtl process resourcet transformers transformers-base
        ];
+       jailbreak = true;
        homepage = "https://github.com/jeremyjh/higher-leveldb";
        description = "A rich monadic API for working with leveldb databases";
        license = stdenv.lib.licenses.bsd3;
@@ -105378,6 +105661,7 @@ self: {
        testHaskellDepends = [
          async base containers data-default deepseq hformat lens mtl text
        ];
+       jailbreak = true;
        homepage = "https://github.com/mvoidex/hsdev";
        description = "Haskell development library and tool with support of autocompletion, symbol info, go to declaration, find references etc";
        license = stdenv.lib.licenses.bsd3;
@@ -109646,7 +109930,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "http-client" = callPackage
+  "http-client_0_4_26_2" = callPackage
     ({ mkDerivation, array, async, base, base64-bytestring
      , blaze-builder, bytestring, case-insensitive, containers, cookie
      , data-default-class, deepseq, directory, exceptions, filepath
@@ -109674,6 +109958,37 @@ self: {
        homepage = "https://github.com/snoyberg/http-client";
        description = "An HTTP client engine, intended as a base layer for more user-friendly packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "http-client" = callPackage
+    ({ mkDerivation, array, async, base, base64-bytestring
+     , blaze-builder, bytestring, case-insensitive, containers, cookie
+     , data-default-class, deepseq, directory, exceptions, filepath
+     , ghc-prim, hspec, http-types, mime-types, monad-control, network
+     , network-uri, random, streaming-commons, text, time, transformers
+     , zlib
+     }:
+     mkDerivation {
+       pname = "http-client";
+       version = "0.4.27";
+       sha256 = "3700731ca44470847b9a6429c61b7501318443ded995c33c7f52c9a7fd23a88b";
+       libraryHaskellDepends = [
+         array base base64-bytestring blaze-builder bytestring
+         case-insensitive containers cookie data-default-class deepseq
+         exceptions filepath ghc-prim http-types mime-types network
+         network-uri random streaming-commons text time transformers
+       ];
+       testHaskellDepends = [
+         async base base64-bytestring blaze-builder bytestring
+         case-insensitive containers deepseq directory hspec http-types
+         monad-control network network-uri streaming-commons text time
+         transformers zlib
+       ];
+       doCheck = false;
+       homepage = "https://github.com/snoyberg/http-client";
+       description = "An HTTP client engine, intended as a base layer for more user-friendly packages";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "http-client-auth" = callPackage
@@ -110639,36 +110954,6 @@ self: {
      }) {};
 
   "http2" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
-     , bytestring-builder, containers, directory, doctest, filepath
-     , Glob, hex, hspec, mwc-random, psqueues, stm, text
-     , unordered-containers, vector, word8
-     }:
-     mkDerivation {
-       pname = "http2";
-       version = "1.4.3";
-       sha256 = "f074760594e1599d3585f666762e96f86a9f6f546d6d3ed05379617b14729778";
-       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
-         psqueues stm text unordered-containers vector word8
-       ];
-       description = "HTTP/2.0 library including frames and HPACK";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "http2_1_4_4" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
      , bytestring-builder, containers, directory, doctest, filepath
      , Glob, hex, hspec, psqueues, stm, text, unordered-containers
@@ -110696,7 +110981,6 @@ self: {
        ];
        description = "HTTP/2.0 library including frames and HPACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "httpd-shed" = callPackage
@@ -112449,6 +112733,7 @@ self: {
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
+       jailbreak = true;
        homepage = "http://github.com/analytics/hyperloglog";
        description = "An approximate streaming (constant space) unique object counter";
        license = stdenv.lib.licenses.bsd3;
@@ -113595,27 +113880,27 @@ self: {
 
   "idris" = callPackage
     ({ mkDerivation, annotated-wl-pprint, ansi-terminal, ansi-wl-pprint
-     , base, base64-bytestring, binary, blaze-html, blaze-markup
+     , async, base, base64-bytestring, binary, blaze-html, blaze-markup
      , bytestring, cheapskate, containers, deepseq, directory, filepath
-     , fingertree, gmp, haskeline, hscurses, libffi, mtl, network
-     , optparse-applicative, parsers, pretty, process, safe, split, text
-     , time, transformers, transformers-compat, trifecta, uniplate, unix
-     , unordered-containers, utf8-string, vector
+     , fingertree, fsnotify, gmp, haskeline, hscurses, libffi, mtl
+     , network, optparse-applicative, parsers, pretty, process, safe
+     , split, text, time, transformers, transformers-compat, trifecta
+     , uniplate, unix, unordered-containers, utf8-string, vector
      , vector-binary-instances, zip-archive
      }:
      mkDerivation {
        pname = "idris";
-       version = "0.9.20.2";
-       sha256 = "499339fc6a443dd2902ae76114eba6a61ebbd5955dcf3d3687199df5829a0f47";
+       version = "0.10";
+       sha256 = "5593feca2cdd00ff819f37135da496111b3af06b664f4cd1f4aecba6ac6e6a10";
        configureFlags = [ "-fcurses" "-fffi" "-fgmp" ];
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         annotated-wl-pprint ansi-terminal ansi-wl-pprint base
+         annotated-wl-pprint ansi-terminal ansi-wl-pprint async base
          base64-bytestring binary blaze-html blaze-markup bytestring
          cheapskate containers deepseq directory filepath fingertree
-         haskeline hscurses libffi mtl network optparse-applicative parsers
-         pretty process safe split text time transformers
+         fsnotify haskeline hscurses libffi mtl network optparse-applicative
+         parsers pretty process safe split text time transformers
          transformers-compat trifecta uniplate unix unordered-containers
          utf8-string vector vector-binary-instances zip-archive
        ];
@@ -113623,7 +113908,6 @@ self: {
        executableHaskellDepends = [
          base directory filepath haskeline transformers
        ];
-       jailbreak = true;
        homepage = "http://www.idris-lang.org/";
        description = "Functional Programming Language with Dependent Types";
        license = stdenv.lib.licenses.bsd3;
@@ -114594,11 +114878,10 @@ self: {
     ({ mkDerivation, base, directory, filepath, mtl }:
      mkDerivation {
        pname = "imports";
-       version = "0.1.2.1";
-       sha256 = "ffe56b95d29919f3a8c885f8f0e4db180fc5e711e8c78f278c0cf17ac06ba4c2";
+       version = "0.2.0.0";
+       sha256 = "8a423866bce4862f65926a67519f23c3262ea2f85f01104a5a2e03ee63f2dc61";
        libraryHaskellDepends = [ base directory filepath mtl ];
        testHaskellDepends = [ base directory filepath mtl ];
-       jailbreak = true;
        homepage = "https://github.com/CindyLinz/Haskell-imports";
        description = "Generate code for importing directories automatically";
        license = stdenv.lib.licenses.mit;
@@ -119522,8 +119805,8 @@ self: {
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.1.4";
-       sha256 = "3eb93af7edc985d4fa7be6a88638e4987c795828a83469436f04d312cba4ea1d";
+       version = "0.1.6";
+       sha256 = "1bde5dd2fadd0b598c11657199ee90bfe8f822807a394857ef902d2d8fec366a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122838,6 +123121,7 @@ self: {
        version = "0.1.2";
        sha256 = "e08e6e05f45d03659d813caf03905a6ac314b83b39cd4d12b1ac8205039bb63d";
        libraryHaskellDepends = [ base bytestring cereal containers ];
+       jailbreak = true;
        description = "Guess at which language a text is written in using trigrams";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -125222,17 +125506,17 @@ self: {
      }) {archive = null;};
 
   "libconfig" = callPackage
-    ({ mkDerivation, base, binary, c2hs, cereal, cereal-text, deepseq
-     , doctest, doctest-prop, hashable, libconfig, text, text-binary
-     , transformers, transformers-compat
+    ({ mkDerivation, base, binary, c2hs, deepseq, doctest, doctest-prop
+     , hashable, libconfig, text, text-binary, transformers
+     , transformers-compat
      }:
      mkDerivation {
        pname = "libconfig";
        version = "0.3.0.0";
        sha256 = "22605b11f7e9e9b9a94cbbc12172660e177e968384bbc462573c79c3bcdb5994";
        libraryHaskellDepends = [
-         base binary cereal cereal-text deepseq hashable text text-binary
-         transformers transformers-compat
+         base binary deepseq hashable text text-binary transformers
+         transformers-compat
        ];
        librarySystemDepends = [ libconfig ];
        libraryToolDepends = [ c2hs ];
@@ -126400,6 +126684,7 @@ self: {
          base binary bytestring directory doctest filepath HUnit lens
          simple-reflect test-framework test-framework-hunit
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "http://github.com/ekmett/linear/";
        description = "Linear Algebra";
@@ -128409,6 +128694,7 @@ self: {
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
+       jailbreak = true;
        homepage = "http://github.com/analytics/log-domain/";
        description = "Log-domain arithmetic";
        license = stdenv.lib.licenses.bsd3;
@@ -128433,6 +128719,7 @@ self: {
          base directory doctest filepath generic-deriving semigroups
          simple-reflect
        ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/log-domain/";
        description = "Log-domain arithmetic";
        license = stdenv.lib.licenses.bsd3;
@@ -129538,6 +129825,7 @@ self: {
          base containers contravariant dlist gl linear mtl resourcet
          semigroups transformers vector void
        ];
+       jailbreak = true;
        homepage = "https://github.com/phaazon/luminance";
        description = "Type-safe, type-level and stateless graphics framework";
        license = stdenv.lib.licenses.bsd3;
@@ -129575,6 +129863,7 @@ self: {
          base contravariant GLFW-b JuicyPixels linear luminance mtl
          resourcet transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/phaazon/luminance-samples";
        description = "Luminance samples";
        license = stdenv.lib.licenses.bsd3;
@@ -129699,10 +129988,9 @@ self: {
     ({ mkDerivation, base, bindings-lxc, mtl, transformers }:
      mkDerivation {
        pname = "lxc";
-       version = "0.3.1.1";
-       sha256 = "f98f1310e5bcc7ab6bbc39c3bb94efb88dfc76d505fa80560866512baaca7ad6";
+       version = "0.3.2";
+       sha256 = "9ba3d9bff03cc213318124c279c216011f9b56ee8dd51f7a23edf2e5d8aabc5b";
        libraryHaskellDepends = [ base bindings-lxc mtl transformers ];
-       jailbreak = true;
        homepage = "https://github.com/fizruk/lxc";
        description = "High level Haskell bindings to LXC (Linux containers)";
        license = stdenv.lib.licenses.bsd3;
@@ -129749,6 +130037,8 @@ self: {
        pname = "lzma";
        version = "0.0.0.1";
        sha256 = "576583fa5ac2110ca62f24dea62a1bb6effeba51c31b9fe06862dcfa8f7a38ac";
+       revision = "1";
+       editedCabalFile = "8ceb5cde6e8f9769e12c1fdb1a5f5c25f1d1aaa045741c991c29659dc6c74fa1";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ lzma ];
        testHaskellDepends = [
@@ -129901,12 +130191,13 @@ self: {
        pname = "lzma-streams";
        version = "0.1.0.0";
        sha256 = "b6c90e493f6c367f79c1cee6c3ed978c3515139bf2c7174ed083a1cf76071af1";
+       revision = "1";
+       editedCabalFile = "7f2c0b8a7b6134789e1e2117ba70d536a050f3cc5cc6a438ab69ffd28785046c";
        libraryHaskellDepends = [ base bytestring io-streams lzma ];
        testHaskellDepends = [
          base bytestring HUnit io-streams QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
-       jailbreak = true;
        homepage = "https://github.com/hvr/lzma-streams";
        description = "IO-Streams interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
@@ -132880,7 +133171,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "messagepack" = callPackage
+  "messagepack_0_4_0" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, QuickCheck
      , test-framework, test-framework-quickcheck2, test-framework-th
      }:
@@ -132893,12 +133184,14 @@ self: {
          base bytestring cereal containers QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th
        ];
+       jailbreak = true;
        homepage = "https://github.com/rodrigosetti/messagepack";
        description = "Serialize instance for Message Pack Object";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "messagepack_0_5_1" = callPackage
+  "messagepack" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, QuickCheck
      , test-framework, test-framework-quickcheck2, test-framework-th
      }:
@@ -132911,11 +133204,9 @@ self: {
          base bytestring cereal containers QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th
        ];
-       jailbreak = true;
        homepage = "https://github.com/rodrigosetti/messagepack";
        description = "Serialize instance for Message Pack Object";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "messagepack-rpc_0_1_0_3" = callPackage
@@ -132929,6 +133220,25 @@ self: {
        libraryHaskellDepends = [
          base bytestring cereal containers messagepack network-simple text
        ];
+       jailbreak = true;
+       homepage = "http://github.com/rodrigosetti/messagepack-rpc";
+       description = "Message Pack RPC over TCP";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "messagepack-rpc_0_2_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, containers, messagepack
+     , network-simple
+     }:
+     mkDerivation {
+       pname = "messagepack-rpc";
+       version = "0.2.0.0";
+       sha256 = "a82366e59578f2971214ad2d9d2881f11ec031e1fb0354c45fd4df40b6c7a053";
+       libraryHaskellDepends = [
+         base bytestring cereal containers messagepack network-simple
+       ];
+       jailbreak = true;
        homepage = "http://github.com/rodrigosetti/messagepack-rpc";
        description = "Message Pack RPC over TCP";
        license = stdenv.lib.licenses.mit;
@@ -132936,22 +133246,6 @@ self: {
      }) {};
 
   "messagepack-rpc" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, messagepack
-     , network-simple
-     }:
-     mkDerivation {
-       pname = "messagepack-rpc";
-       version = "0.2.0.0";
-       sha256 = "a82366e59578f2971214ad2d9d2881f11ec031e1fb0354c45fd4df40b6c7a053";
-       libraryHaskellDepends = [
-         base bytestring cereal containers messagepack network-simple
-       ];
-       homepage = "http://github.com/rodrigosetti/messagepack-rpc";
-       description = "Message Pack RPC over TCP";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "messagepack-rpc_0_5_1" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, messagepack
      , network-simple
      }:
@@ -132962,11 +133256,9 @@ self: {
        libraryHaskellDepends = [
          base bytestring cereal containers messagepack network-simple
        ];
-       jailbreak = true;
        homepage = "http://github.com/rodrigosetti/messagepack-rpc";
        description = "Message Pack RPC over TCP";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "messente" = callPackage
@@ -137758,8 +138050,8 @@ self: {
        pname = "mtl-compat";
        version = "0.2.1.1";
        sha256 = "ac06e0ad010045e8bb1fc894303d6060fffc9d14bf6e8d90c83d1c7eb23b95e9";
-       revision = "2";
-       editedCabalFile = "7d1c037df6cdcbf8573f518a370c9beec0adee9f2b8001b1719df6f407bb6a53";
+       revision = "3";
+       editedCabalFile = "1847f7f92b4878613f0f7b0062f3a3744bbd5c6aed0eb1cfd5c2ddfc5e41689b";
        libraryHaskellDepends = [ base mtl transformers-compat ];
        jailbreak = true;
        homepage = "https://github.com/haskell-compat/mtl-compat";
@@ -137774,8 +138066,8 @@ self: {
        pname = "mtl-compat";
        version = "0.2.1.3";
        sha256 = "6458ca53593a31ebce1d94ef8dd4f6a06d050dd7ed32335f6cc6b6e5d3456894";
-       revision = "2";
-       editedCabalFile = "6f72b1e8e7cc62b9631024e64e70a806a1018a1b4ac62e5e32a7b36e97d420dc";
+       revision = "3";
+       editedCabalFile = "6c94536cf0a7415c1fb740d1a98a109928e77ac0bc1fc2f77b460c7c58d6ee45";
        libraryHaskellDepends = [ base mtl ];
        doHaddock = false;
        homepage = "https://github.com/haskell-compat/mtl-compat";
@@ -138923,6 +139215,7 @@ self: {
          async base contravariant foldl managed mmorph pipes
          pipes-concurrency transformers
        ];
+       jailbreak = true;
        description = "Model-view-controller";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -140525,7 +140818,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) nettle;};
 
-  "nettle" = callPackage
+  "nettle_0_1_1" = callPackage
     ({ mkDerivation, array, base, byteable, bytestring
      , crypto-cipher-tests, crypto-cipher-types, HUnit, nettle
      , QuickCheck, securemem, tagged, test-framework
@@ -140551,7 +140844,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) nettle;};
 
-  "nettle_0_2_0" = callPackage
+  "nettle" = callPackage
     ({ mkDerivation, array, base, byteable, bytestring
      , crypto-cipher-tests, crypto-cipher-types, HUnit, nettle
      , QuickCheck, securemem, tagged, test-framework
@@ -140570,6 +140863,7 @@ self: {
          QuickCheck tagged test-framework test-framework-hunit
          test-framework-quickcheck2
        ];
+       doCheck = false;
        homepage = "https://github.com/stbuehler/haskell-nettle";
        description = "safe nettle binding";
        license = stdenv.lib.licenses.mit;
@@ -142173,8 +142467,8 @@ self: {
      }:
      mkDerivation {
        pname = "niagra";
-       version = "0.2.0";
-       sha256 = "ad2432ca574c5626a7340d09d37113670ae75e7db5e371469983db0676560d34";
+       version = "0.2.1";
+       sha256 = "5b6cb93d70015fc48a200f4937470b73c1e1fd152ce6dd2a4413e3b547d6ee00";
        libraryHaskellDepends = [
          base containers ghc-prim mtl text transformers
        ];
@@ -143940,6 +144234,7 @@ self: {
        libraryHaskellDepends = [
          base contravariant ghc-prim transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/sjoerdvisscher/one-liner";
        description = "Constraint-based generics";
        license = stdenv.lib.licenses.bsd3;
@@ -146908,6 +147203,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pandoc-japanese-filters" = callPackage
+    ({ mkDerivation, base, containers, data-default, effin, HaTeX
+     , HaTeX-qq, hxt, pandoc, pandoc-types, shelly, system-fileio
+     , system-filepath, text
+     }:
+     mkDerivation {
+       pname = "pandoc-japanese-filters";
+       version = "0.1.0.1";
+       sha256 = "dc97d57265b7b5f5a40fcdf3ec422e03cd04fd7c4dc5a71045642dfde0d41301";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base containers data-default effin HaTeX HaTeX-qq hxt pandoc
+         pandoc-types shelly system-fileio system-filepath text
+       ];
+       description = "Japanese-specific markup filters for pandoc";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "pandoc-lens" = callPackage
     ({ mkDerivation, base, containers, lens, pandoc-types }:
      mkDerivation {
@@ -148235,6 +148549,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "path-io_0_2_0" = callPackage
+    ({ mkDerivation, base, directory, exceptions, filepath, path
+     , temporary, time, transformers
+     }:
+     mkDerivation {
+       pname = "path-io";
+       version = "0.2.0";
+       sha256 = "bb72cdbefe7083f2ad9e7eada730e6297bff9941989c0652f698342c4359e735";
+       libraryHaskellDepends = [
+         base directory exceptions filepath path temporary time transformers
+       ];
+       homepage = "https://github.com/mrkkrp/path-io";
+       description = "Interface to ‘directory’ package for users of ‘path’";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "path-pieces_0_1_4" = callPackage
     ({ mkDerivation, base, hspec, HUnit, QuickCheck, text, time }:
      mkDerivation {
@@ -149304,8 +149635,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistable-record";
-       version = "0.2.0.0";
-       sha256 = "5b8549ec3ed38b92a724c6a5c2fb75749d4faad31784d63354fd3f90e9877859";
+       version = "0.3.0.0";
+       sha256 = "9b9383f1dfa6d3c8b700fa4417a27538175143259a3410dfd72a39e5ac299b4f";
        libraryHaskellDepends = [
          array base containers dlist names-th template-haskell transformers
        ];
@@ -152261,6 +152592,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring cereal mtl pipes pipes-bytestring pipes-parse
        ];
+       jailbreak = true;
        description = "Encode and decode binary streams using the pipes and cereal libraries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -152836,25 +153168,22 @@ self: {
      }) {};
 
   "pipes-transduce" = callPackage
-    ({ mkDerivation, base, bifunctors, bytestring, comonad, conceit
-     , containers, doctest, foldl, free, lens-family-core
-     , monoid-subclasses, pipes, pipes-bytestring, pipes-concurrency
-     , pipes-group, pipes-parse, pipes-safe, pipes-text, semigroupoids
-     , semigroups, tasty, tasty-hunit, text, transformers, void
+    ({ mkDerivation, base, bifunctors, bytestring, conceit, doctest
+     , foldl, free, lens-family-core, pipes, pipes-bytestring
+     , pipes-concurrency, pipes-group, pipes-parse, pipes-safe
+     , pipes-text, tasty, tasty-hunit, text, transformers, void
      }:
      mkDerivation {
        pname = "pipes-transduce";
-       version = "0.2.0.0";
-       sha256 = "378a636143751acb414bdedfc13053653ec02a38299cd03ba3097784c7943bb3";
+       version = "0.3.0.0";
+       sha256 = "073c2ac2534fa8a29d65fb42b49ae1cff752513c69b3752145681b7a8d27c62b";
        libraryHaskellDepends = [
-         base bifunctors bytestring comonad conceit containers foldl free
-         lens-family-core monoid-subclasses pipes pipes-bytestring
-         pipes-concurrency pipes-group pipes-parse pipes-safe pipes-text
-         semigroupoids semigroups text transformers void
+         base bifunctors bytestring conceit foldl free lens-family-core
+         pipes pipes-bytestring pipes-concurrency pipes-group pipes-parse
+         pipes-safe pipes-text text transformers void
        ];
        testHaskellDepends = [
-         base doctest foldl free monoid-subclasses pipes tasty tasty-hunit
-         text
+         base doctest foldl free pipes tasty tasty-hunit text
        ];
        description = "Interfacing pipes with foldl folds";
        license = stdenv.lib.licenses.bsd3;
@@ -154032,6 +154361,26 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "polynom" = callPackage
+    ({ mkDerivation, algebra, base, base-unicode-symbols, clist
+     , containers, peano, smallcheck, tasty, tasty-smallcheck
+     , transformers
+     }:
+     mkDerivation {
+       pname = "polynom";
+       version = "0.1.0.0";
+       sha256 = "904326a098409341a6b710f2fe36b48918cc41b954b98034fb6b68e5eb92efb1";
+       libraryHaskellDepends = [
+         algebra base base-unicode-symbols containers
+       ];
+       testHaskellDepends = [
+         algebra base base-unicode-symbols clist containers peano smallcheck
+         tasty tasty-smallcheck transformers
+       ];
+       description = "Polynomial types and operations";
+       license = "unknown";
+     }) {};
+
   "polynomial" = callPackage
     ({ mkDerivation, base, deepseq, pretty, vector, vector-space
      , vector-th-unbox
@@ -159355,7 +159704,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "quickcheck-instances" = callPackage
+  "quickcheck-instances_0_3_11" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, hashable
      , old-time, QuickCheck, text, time, unordered-containers
      }:
@@ -159372,6 +159721,25 @@ self: {
        homepage = "https://github.com/aslatter/qc-instances";
        description = "Common quickcheck instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "quickcheck-instances" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, hashable
+     , old-time, QuickCheck, scientific, text, time
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "quickcheck-instances";
+       version = "0.3.12";
+       sha256 = "ddd5b988da50eff7f56737bff516fba52309f7461297698f04f1e8aaee9f9bf3";
+       libraryHaskellDepends = [
+         array base bytestring containers hashable old-time QuickCheck
+         scientific text time unordered-containers vector
+       ];
+       homepage = "https://github.com/aslatter/qc-instances";
+       description = "Common quickcheck instances";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "quickcheck-io_0_1_1" = callPackage
@@ -160460,14 +160828,16 @@ self: {
      }:
      mkDerivation {
        pname = "range-set-list";
-       version = "0.1.1.0";
-       sha256 = "091b01e7b98b232fcaae126c8b5701e63c08064ff5c29174c85c2a4d5a2cef3c";
-       libraryHaskellDepends = [ base deepseq hashable semigroups ];
+       version = "0.1.2.0";
+       sha256 = "3b749cf447dcf1f81f263c9c43dd61ee533b4fb25e6e4ca3bdbe2321702bab67";
+       libraryHaskellDepends = [
+         base containers deepseq hashable semigroups
+       ];
        testHaskellDepends = [
          base containers deepseq hashable semigroups tasty tasty-quickcheck
        ];
        homepage = "https://github.com/phadej/range-set-list#readme";
-       description = "Memory efficient sets with continuous ranges of elements";
+       description = "Memory efficient sets with ranges of elements";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -163204,8 +163574,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.7.1.0";
-       sha256 = "04fbd9d0cfee03a299a9642d40470a8d6c89bc8163905ffa232dbd8499eb6c9d";
+       version = "0.8.0.1";
+       sha256 = "6484cb21a69e27c01edb4ecfe1155ed5780a7b7d608d42c5570eea402755e015";
        libraryHaskellDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text time time-locale-compat
@@ -163226,8 +163596,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query-HDBC";
-       version = "0.4.0.0";
-       sha256 = "b5ae3dccfb6a32b6f64f350c0349d253a3b5ff8d28f0832f5189cea7974b7650";
+       version = "0.5.0.0";
+       sha256 = "b6d3fb55175eab8d816b15628a24fcf401a768122a8d3db02141605f054ff789";
        libraryHaskellDepends = [
          base containers convertible dlist HDBC HDBC-session names-th
          persistable-record relational-query relational-schemas
@@ -163277,8 +163647,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-schemas";
-       version = "0.1.2.1";
-       sha256 = "648373d8931953dcfcbc770e4d9919469535b445581d3dbe03a51ffe8b7110fb";
+       version = "0.1.2.2";
+       sha256 = "aaab90384f20c5cbf3badab61b1dd7a0579acc7edcccc96af3ff07ebe9269626";
        libraryHaskellDepends = [
          base bytestring containers persistable-record relational-query
          template-haskell time
@@ -167736,7 +168106,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "safecopy" = callPackage
+  "safecopy_0_8_6" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers, lens
      , lens-action, old-time, quickcheck-instances, tasty
      , tasty-quickcheck, template-haskell, text, time, vector
@@ -167755,13 +168125,15 @@ self: {
          array base cereal containers lens lens-action quickcheck-instances
          tasty tasty-quickcheck template-haskell time vector
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "http://acid-state.seize.it/safecopy";
        description = "Binary serialization with version control";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "safecopy_0_9_0_1" = callPackage
+  "safecopy" = callPackage
     ({ mkDerivation, array, base, bytestring, cereal, containers, lens
      , lens-action, old-time, quickcheck-instances, tasty
      , tasty-quickcheck, template-haskell, text, time, vector
@@ -167778,11 +168150,10 @@ self: {
          array base cereal containers lens lens-action quickcheck-instances
          tasty tasty-quickcheck template-haskell time vector
        ];
-       jailbreak = true;
+       doCheck = false;
        homepage = "http://acid-state.seize.it/safecopy";
        description = "Binary serialization with version control";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safeint" = callPackage
@@ -172320,6 +172691,28 @@ self: {
        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
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "servant-swagger";
+       version = "0.1.1";
+       sha256 = "d89df7e8ee82978f6db32c2f278591df26bcdd6ef4282dff53933d3417d53a6c";
+       libraryHaskellDepends = [
+         aeson base bytestring http-media lens servant swagger2 text
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base hspec lens servant swagger2 text time
+       ];
+       homepage = "https://github.com/dmjio/servant-swagger";
+       description = "Generate Swagger specification for your servant API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-yaml" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, http-media
      , servant, servant-server, wai, warp, yaml
@@ -172404,6 +172797,7 @@ self: {
          acid-state base containers hspec mtl safecopy serversession
          unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/yesodweb/serversession";
        description = "Storage backend for serversession using acid-state";
        license = stdenv.lib.licenses.mit;
@@ -175990,6 +176384,7 @@ self: {
        testHaskellDepends = [
          base bytestring cereal crypto-api filepath hspec tagged
        ];
+       jailbreak = true;
        homepage = "https://github.com/meteficha/skein";
        description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
        license = stdenv.lib.licenses.bsd3;
@@ -176010,6 +176405,7 @@ self: {
        testHaskellDepends = [
          base bytestring cereal crypto-api filepath hspec tagged
        ];
+       jailbreak = true;
        homepage = "https://github.com/meteficha/skein";
        description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
        license = stdenv.lib.licenses.bsd3;
@@ -176418,6 +176814,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "slug_0_1_2" = callPackage
+    ({ mkDerivation, aeson, base, exceptions, path-pieces, persistent
+     , QuickCheck, test-framework, test-framework-quickcheck2, text
+     }:
+     mkDerivation {
+       pname = "slug";
+       version = "0.1.2";
+       sha256 = "4f4a85b88dbac7b11aae52ad22947328dfdbfb1f0472d70dbd52aa63098c9d5d";
+       libraryHaskellDepends = [
+         aeson base exceptions path-pieces persistent text
+       ];
+       testHaskellDepends = [
+         base exceptions path-pieces QuickCheck test-framework
+         test-framework-quickcheck2 text
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/mrkkrp/slug";
+       description = "Type-safe slugs for Yesod ecosystem";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "smallarray" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, hashable }:
      mkDerivation {
@@ -176460,6 +176878,8 @@ self: {
        pname = "smallcheck";
        version = "1.1.1";
        sha256 = "4d17607c1a620491e7e495a17575b73952932c761e7f9bdfa87e0102fb52f9f9";
+       revision = "1";
+       editedCabalFile = "b19c841b12cc34f6379c2b72bc4c250da9b0346c46690dae419caaa0310478fa";
        libraryHaskellDepends = [ base ghc-prim logict mtl pretty ];
        homepage = "https://github.com/feuerbach/smallcheck";
        description = "A property-based testing library";
@@ -181417,8 +181837,8 @@ self: {
      }:
      mkDerivation {
        pname = "stack-run";
-       version = "0.1.0.4";
-       sha256 = "d124831de8efbc0a98f0ba78c03a83c6b5c3c5922d4b22ae68af3e1267b29926";
+       version = "0.1.0.5";
+       sha256 = "6625d1fbfde871ae88689a3ae18550a4582d68974e5f541e014c45629c1821c7";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -181453,6 +181873,7 @@ self: {
          async base extract-dependencies file-modules lens lens-aeson
          MissingH process stm-containers text time wreq
        ];
+       doCheck = false;
        homepage = "http://github.com/yamadapc/stack-run-auto#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
@@ -181814,15 +182235,15 @@ self: {
      , monad-unlift, mono-traversable, mtl, old-locale
      , optparse-applicative, optparse-simple, process, QuickCheck
      , resourcet, semigroups, stackage-cli, stackage-install
-     , stackage-metadata, stackage-types, stackage-update, stm
-     , streaming-commons, system-fileio, system-filepath, tar, temporary
-     , text, time, transformers, unix-compat, utf8-string, xml-conduit
-     , xml-types, yaml, zlib
+     , stackage-metadata, stackage-types, stm, streaming-commons
+     , system-fileio, system-filepath, tar, temporary, text, time
+     , transformers, unix-compat, utf8-string, xml-conduit, xml-types
+     , yaml, zlib
      }:
      mkDerivation {
        pname = "stackage-curator";
-       version = "0.12.0";
-       sha256 = "2c226623b1b4edcf8c98c8843cdde4aadd8f441e3c99e50486700e0a323b40e5";
+       version = "0.13.0";
+       sha256 = "fcbc1ff3f378f96a23a169a73a6e081c896cdb88846ecd2ff78afb06b505d612";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -181833,20 +182254,18 @@ self: {
          directory filepath html-conduit http-client http-client-tls
          http-conduit lucid mime-types monad-unlift mono-traversable mtl
          old-locale process resourcet semigroups stackage-install
-         stackage-metadata stackage-types stackage-update stm
-         streaming-commons system-fileio system-filepath tar temporary text
-         time transformers unix-compat utf8-string xml-conduit xml-types
-         yaml zlib
+         stackage-metadata stackage-types stm streaming-commons
+         system-fileio system-filepath tar temporary text time transformers
+         unix-compat utf8-string xml-conduit xml-types yaml zlib
        ];
        executableHaskellDepends = [
          base http-client http-client-tls optparse-applicative
-         optparse-simple stackage-cli stackage-update system-filepath text
+         optparse-simple stackage-cli system-filepath text
        ];
        testHaskellDepends = [
          base Cabal classy-prelude-conduit containers hspec http-client
          http-client-tls QuickCheck text yaml
        ];
-       doCheck = false;
        homepage = "https://github.com/fpco/stackage";
        description = "Tools for curating Stackage bundles";
        license = stdenv.lib.licenses.mit;
@@ -182028,7 +182447,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stackage-types" = callPackage
+  "stackage-types_1_1_0" = callPackage
     ({ mkDerivation, aeson, base, Cabal, containers, exceptions
      , hashable, safe, semigroups, text, time, unordered-containers
      , vector
@@ -182044,9 +182463,10 @@ self: {
        homepage = "https://github.com/fpco/stackage-types";
        description = "Shared data types between various Stackage packages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stackage-types_1_2_0" = callPackage
+  "stackage-types" = callPackage
     ({ mkDerivation, aeson, base, Cabal, containers, exceptions
      , hashable, safe, semigroups, text, time, unordered-containers
      , vector
@@ -182062,7 +182482,6 @@ self: {
        homepage = "https://github.com/fpco/stackage-types";
        description = "Shared data types between various Stackage packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stackage-update_0_1_1_1" = callPackage
@@ -183994,8 +184413,8 @@ self: {
      }:
      mkDerivation {
        pname = "streaming-utils";
-       version = "0.1.4.1";
-       sha256 = "f38fd329658f5d1e2f8aa720c5266458cffa58d744cbc6d93c208599c414e78a";
+       version = "0.1.4.2";
+       sha256 = "7a672d1a52b424e0a2ef53e04ca8d0776f41fda6db223d6d989895f9357eaa61";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring http-client http-client-tls
          json-stream mtl pipes resourcet streaming streaming-bytestring
@@ -188461,7 +188880,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tasty-silver" = callPackage
+  "tasty-silver_3_1_8" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
      , deepseq, directory, filepath, mtl, optparse-applicative, process
      , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit
@@ -188483,9 +188902,10 @@ self: {
        homepage = "https://github.com/phile314/tasty-silver";
        description = "A fancy test runner, including support for golden tests";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tasty-silver_3_1_8_1" = callPackage
+  "tasty-silver" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, bytestring, containers
      , deepseq, directory, filepath, mtl, optparse-applicative, process
      , process-extras, regex-tdfa, stm, tagged, tasty, tasty-hunit
@@ -188507,7 +188927,6 @@ self: {
        homepage = "https://github.com/phile314/tasty-silver";
        description = "A fancy test runner, including support for golden tests";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-smallcheck_0_8_0_1" = callPackage
@@ -191764,7 +192183,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "these" = callPackage
+  "these_0_6_2_0" = callPackage
     ({ mkDerivation, base, bifunctors, containers, data-default-class
      , hashable, mtl, profunctors, QuickCheck, quickcheck-instances
      , semigroupoids, semigroups, tasty, tasty-quickcheck, transformers
@@ -191788,6 +192207,31 @@ self: {
        homepage = "https://github.com/isomorphism/these";
        description = "An either-or-both data type & a generalized 'zip with padding' typeclass";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "these" = callPackage
+    ({ mkDerivation, base, bifunctors, containers, data-default-class
+     , hashable, mtl, profunctors, QuickCheck, quickcheck-instances
+     , semigroupoids, semigroups, tasty, tasty-quickcheck, transformers
+     , transformers-compat, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "these";
+       version = "0.6.2.1";
+       sha256 = "41dd6403ec489deef66632fcae4cd058f636badb162aedff7c8b4930affb99bb";
+       libraryHaskellDepends = [
+         base bifunctors containers data-default-class hashable mtl
+         profunctors semigroupoids semigroups transformers
+         transformers-compat unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base bifunctors containers hashable QuickCheck quickcheck-instances
+         tasty tasty-quickcheck transformers unordered-containers vector
+       ];
+       homepage = "https://github.com/isomorphism/these";
+       description = "An either-or-both data type & a generalized 'zip with padding' typeclass";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "thespian" = callPackage
@@ -201497,6 +201941,7 @@ self: {
        version = "0.2.0.2";
        sha256 = "e38f74e57ef29514c3e655f9ae6415e6005c971a46504c1859b5ba602672297c";
        libraryHaskellDepends = [ base contravariant transformers vinyl ];
+       jailbreak = true;
        homepage = "https://github.com/marcinmrotek/vinyl-utils";
        description = "Utilities for vinyl";
        license = stdenv.lib.licenses.bsd3;
@@ -203766,7 +204211,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "wai-middleware-content-type" = callPackage
+  "wai-middleware-content-type_0_2_0" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring
      , clay, exceptions, hashable, hspec, hspec-wai, http-media
      , http-types, lucid, mmorph, monad-control, monad-logger, mtl
@@ -203796,6 +204241,36 @@ self: {
        jailbreak = true;
        description = "Route to different middlewares based on the incoming Accept header";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-middleware-content-type" = callPackage
+    ({ mkDerivation, aeson, base, blaze-builder, blaze-html, bytestring
+     , clay, exceptions, hashable, hspec, hspec-wai, http-media
+     , http-types, lucid, mmorph, monad-control, monad-logger, mtl
+     , pandoc, pandoc-types, resourcet, shakespeare, tasty, tasty-hspec
+     , text, transformers, transformers-base, unordered-containers
+     , urlpath, wai, wai-transformers, warp
+     }:
+     mkDerivation {
+       pname = "wai-middleware-content-type";
+       version = "0.3.0";
+       sha256 = "2fadb84ee1f8a25d3e3d4f07bb8c92056eccf8bd3c0dabadb0a860653407f7c4";
+       libraryHaskellDepends = [
+         aeson base blaze-builder blaze-html bytestring clay exceptions
+         hashable http-media http-types lucid mmorph monad-control
+         monad-logger mtl pandoc resourcet shakespeare text transformers
+         transformers-base unordered-containers urlpath wai wai-transformers
+       ];
+       testHaskellDepends = [
+         aeson base blaze-builder blaze-html bytestring clay exceptions
+         hashable hspec hspec-wai http-media http-types lucid mmorph
+         monad-control monad-logger mtl pandoc pandoc-types resourcet
+         shakespeare tasty tasty-hspec text transformers transformers-base
+         unordered-containers urlpath wai wai-transformers warp
+       ];
+       description = "Route to different middlewares based on the incoming Accept header";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "wai-middleware-crowd_0_1_1_2" = callPackage
@@ -207552,6 +208027,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "werewolf" = callPackage
+    ({ mkDerivation, aeson, base, containers, directory, extra
+     , filepath, lens, MonadRandom, mtl, optparse-applicative
+     , QuickCheck, random-shuffle, tasty, tasty-quickcheck, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "werewolf";
+       version = "0.3.3.2";
+       sha256 = "828d060f58e92ce91f22e9b732abe5f8058a0592e701d4baf2abdd207b475440";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base containers directory extra filepath lens MonadRandom mtl
+         random-shuffle text transformers
+       ];
+       executableHaskellDepends = [
+         aeson base directory extra filepath lens mtl optparse-applicative
+         text transformers
+       ];
+       testHaskellDepends = [
+         base containers extra lens mtl QuickCheck tasty tasty-quickcheck
+         text
+       ];
+       homepage = "https://github.com/hjwylde/werewolf";
+       description = "A game engine for running werewolf in a chat client";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "wheb-mongo" = callPackage
     ({ mkDerivation, base, bson, mongoDB, mtl, text, Wheb }:
      mkDerivation {
@@ -213100,7 +213604,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-auth" = callPackage
+  "yesod-auth_1_4_11" = callPackage
     ({ mkDerivation, aeson, authenticate, base, base16-bytestring
      , base64-bytestring, binary, blaze-builder, blaze-html
      , blaze-markup, byteable, bytestring, conduit, conduit-extra
@@ -213127,6 +213631,36 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Authentication for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-auth" = callPackage
+    ({ mkDerivation, aeson, authenticate, base, base16-bytestring
+     , base64-bytestring, binary, blaze-builder, blaze-html
+     , blaze-markup, byteable, bytestring, conduit, conduit-extra
+     , containers, cryptohash, data-default, email-validate, file-embed
+     , http-client, http-conduit, http-types, lifted-base, mime-mail
+     , network-uri, nonce, persistent, persistent-template, random
+     , resourcet, safe, shakespeare, template-haskell, text, time
+     , transformers, unordered-containers, wai, yesod-core, yesod-form
+     , yesod-persistent
+     }:
+     mkDerivation {
+       pname = "yesod-auth";
+       version = "1.4.12";
+       sha256 = "d1baf7dc08ee591fd8ba50a8e64a377a3a8d42575963b44e50ab0c145c2d9fa7";
+       libraryHaskellDepends = [
+         aeson authenticate base base16-bytestring base64-bytestring binary
+         blaze-builder blaze-html blaze-markup byteable bytestring conduit
+         conduit-extra containers cryptohash data-default email-validate
+         file-embed http-client http-conduit http-types lifted-base
+         mime-mail network-uri nonce persistent persistent-template random
+         resourcet safe shakespeare template-haskell text time transformers
+         unordered-containers wai yesod-core yesod-form yesod-persistent
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Authentication for Yesod";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "yesod-auth-account" = callPackage
@@ -215596,7 +216130,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-core" = callPackage
+  "yesod-core_1_4_18_1" = callPackage
     ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
      , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
      , cereal, clientsession, conduit, conduit-extra, containers, cookie
@@ -215633,6 +216167,46 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Creation of type-safe, RESTful web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-core" = callPackage
+    ({ mkDerivation, aeson, async, auto-update, base, blaze-builder
+     , blaze-html, blaze-markup, byteable, bytestring, case-insensitive
+     , cereal, clientsession, conduit, conduit-extra, containers, cookie
+     , data-default, deepseq, directory, exceptions, fast-logger, hspec
+     , hspec-expectations, http-types, HUnit, lifted-base, monad-control
+     , monad-logger, mtl, mwc-random, network, old-locale, parsec
+     , path-pieces, primitive, QuickCheck, random, resourcet, safe
+     , semigroups, shakespeare, streaming-commons, template-haskell
+     , text, time, transformers, transformers-base, unix-compat
+     , unordered-containers, vector, wai, wai-extra, wai-logger, warp
+     , word8
+     }:
+     mkDerivation {
+       pname = "yesod-core";
+       version = "1.4.18.2";
+       sha256 = "298088fbccd63a323a5bab689464848cacd014ea73ef845969c898a59c022d64";
+       libraryHaskellDepends = [
+         aeson auto-update base blaze-builder blaze-html blaze-markup
+         byteable bytestring case-insensitive cereal clientsession conduit
+         conduit-extra containers cookie data-default deepseq directory
+         exceptions fast-logger http-types lifted-base monad-control
+         monad-logger mtl mwc-random old-locale parsec path-pieces primitive
+         random resourcet safe semigroups shakespeare template-haskell text
+         time transformers transformers-base unix-compat
+         unordered-containers vector wai wai-extra wai-logger warp word8
+       ];
+       testHaskellDepends = [
+         async base blaze-builder bytestring clientsession conduit
+         conduit-extra containers cookie hspec hspec-expectations http-types
+         HUnit lifted-base mwc-random network path-pieces QuickCheck random
+         resourcet shakespeare streaming-commons template-haskell text
+         transformers wai wai-extra
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Creation of type-safe, RESTful web applications";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "yesod-crud" = callPackage

From c420de6b05710cccee5b0d9e5573ae36c3e31c5e Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 22 Jan 2016 18:49:33 +0100
Subject: [PATCH 0286/2285] gobject-introspection: Fix patching shared objects

The gi-r-scanner is generating a list of shared libraries that are
referenced in the shared-library attribute of the <namespace/> element
of the GIR file. However, this attribute only contains the names of the
libraries and not the full store paths, like for example while preparing
to package libblockdev, the following items were included in the
shared-library attribute:

  /nix/store/...-libblockdev-1.3/lib/libblockdev.so.0
  libm.so.6
  libdmraid.so.1.0.0.rc16
  libbd_utils.so.0

Unfortunately, loading such a library without setting LD_LIBRARY_PATH is
going to fail finding libm.so.6 and libdmraid.so.1.0.0.rc16.

Now the first attempt at solving this was to put absolute paths of all
the libraries referenced in the shared-library attribute, but this also
led up to including paths of build-time shared objects into that
attribute:

  /nix/store/...-libblockdev-1.3/lib/libblockdev.so.0
  /nix/store/...-glibc-2.21/lib/libm.so.6
  /nix/store/...-dmraid-1.0.0.rc16/lib/libdmraid.so.1.0.0.rc16
  /tmp/nix-build-libblockdev-1.3.drv-0/.../utils/.libs/libbd_utils.so.0

This of course is not what we want, so the final solution is to only
use the absolute path whenever it is a Nix path and leave the library
name as-is if the path doesn't reside within the store, like this:

  /nix/store/...-libblockdev-1.3/lib/libblockdev.so.0
  /nix/store/...-glibc-2.21/lib/libm.so.6
  /nix/store/...-dmraid-1.0.0.rc16/lib/libdmraid.so.1.0.0.rc16
  libbd_utils.so.0

The downside of this approach is that if not even the output path of the
library is in LD_LIBRARY_PATH, even loading of libbd_utils.so.0 could
fail, so we need to patch the loader as well.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../absolute_shlib_path.patch                 | 40 +++++++++++++++++--
 .../gobject-introspection/default.nix         |  9 ++++-
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 47 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
index 04bcc42a032f..2803d767dc71 100644
--- a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
+++ b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
@@ -1,6 +1,40 @@
---- ./giscanner/utils.py.orig	2014-08-14 22:05:05.055334080 +0200
-+++ ./giscanner/utils.py	2014-08-14 22:05:24.687497334 +0200
-@@ -110,17 +110,11 @@
+diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
+index 838d343..9dbdc0f 100644
+--- a/giscanner/shlibs.py
++++ b/giscanner/shlibs.py
+@@ -53,10 +53,24 @@ def _resolve_libtool(options, binary, libraries):
+ # Match absolute paths on OS X to conform to how libraries are usually
+ # referenced on OS X systems.
+ def _ldd_library_pattern(library_name):
++    nix_store_dir = re.escape('@nixStoreDir@'.rstrip('/'))
+     pattern = "(?<![A-Za-z0-9_-])(lib*%s[^A-Za-z0-9_-][^\s\(\)]*)"
+-    if platform.system() == 'Darwin':
+-        pattern = "([^\s]*lib*%s[^A-Za-z0-9_-][^\s\(\)]*)"
+-    return re.compile(pattern % re.escape(library_name))
++    pattern = r'''
++        (
++          (?:
++            # First match Nix store paths because they need to be absolute.
++            (?:%s(?:/[^/]*)+)
++            # Everything else not a store path remains relative, because we
++            # would end up having absolute build paths in the resulting GIR
++            # file.
++            | (?<=/)
++          )
++          # And finally the library itself:
++          (?:lib%s[^A-Za-z0-9_-][^\s\(\)]*)
++        )
++    '''
++    return re.compile(pattern % (nix_store_dir, re.escape(library_name)),
++                      re.VERBOSE)
+ 
+ 
+ # This is a what we do for non-la files. We assume that we are on an
+diff --git a/giscanner/utils.py b/giscanner/utils.py
+index 660081e..c9c767a 100644
+--- a/giscanner/utils.py
++++ b/giscanner/utils.py
+@@ -109,17 +109,11 @@ def extract_libtool_shlib(la_file):
      if dlname is None:
          return None
  
diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index f429e1dc6c36..c2f60d460d7e 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python
-, libintlOrEmpty, autoconf, automake, otool }:
+, libintlOrEmpty, autoconf, automake, otool
+, substituteAll, nixStoreDir ? "/nix/store"
+}:
 # now that gobjectIntrospection creates large .gir files (eg gtk3 case)
 # it may be worth thinking about using multiple derivation outputs
 # In that case its about 6MB which could be separated
@@ -33,7 +35,10 @@ stdenv.mkDerivation rec {
 
   setupHook = ./setup-hook.sh;
 
-  patches = [ ./absolute_shlib_path.patch ];
+  patches = stdenv.lib.singleton (substituteAll {
+    src = ./absolute_shlib_path.patch;
+    inherit nixStoreDir;
+  });
 
   meta = with stdenv.lib; {
     description = "A middleware layer between C libraries and language bindings";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8f01dda21f0..b04d2c1457bc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6639,7 +6639,9 @@ let
   #GMP ex-satellite, so better keep it near gmp
   mpfr = callPackage ../development/libraries/mpfr/default.nix { };
 
-  gobjectIntrospection = callPackage ../development/libraries/gobject-introspection { };
+  gobjectIntrospection = callPackage ../development/libraries/gobject-introspection {
+    nixStoreDir = config.nix.storeDir or "/nix/store";
+  };
 
   goocanvas = callPackage ../development/libraries/goocanvas { };
 

From c83e697aa0c3a1e3125db703f97e1048b92d0be1 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 22 Jan 2016 22:37:00 +0100
Subject: [PATCH 0287/2285] gobject-introspection: Add fallback for libraries

After patching up the shared libraries in c420de6 to use absolute paths,
there are still some libraries left which do not get an absolute paths
assigned.

Those libraries are the ones which have an absolute path outside of the
Nix store, so we assume that they're build products of the current build
and make them absolute by prepending "$out/lib" or "$lib/lib" (depending
on whether it's a multiple output derivation or not) to its basename.

So for my test case, the resulting library paths now look like this:

  /nix/store/...-libblockdev-1.3/lib/libblockdev.so.0
  /nix/store/...-glibc-2.21/lib/libm.so.6
  /nix/store/...-dmraid-1.0.0.rc16/lib/libdmraid.so.1.0.0.rc16
  /nix/store/...-libblockdev-1.3/lib/libbd_utils.so.0

Which is perfectly fine and everything gets resolved correctly after
importing the library using GI.

However, I didn't test it against other libraries and programs, so this
still needs testing, especially for Darwin.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../absolute_shlib_path.patch                 | 65 ++++++++++++++++++-
 1 file changed, 64 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
index 2803d767dc71..84f303b42a0d 100644
--- a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
+++ b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
@@ -1,5 +1,55 @@
+diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
+index 89ec193..8ee92c3 100755
+--- a/giscanner/scannermain.py
++++ b/giscanner/scannermain.py
+@@ -94,6 +94,34 @@ def get_windows_option_group(parser):
+     return group
+ 
+ 
++def _get_default_fallback_libpath():
++    outputs = os.environ.get("outputs", "out").split()
++    if "lib" in outputs:
++        # For multiple output derivations let's try whether there is a $lib
++        # environment variable and use that as the base store path.
++        store_path = os.environ.get("lib")
++    elif "out" in outputs:
++        # Otherwise we have a single output derivation, so the libraries most
++        # certainly will end up in "$out/lib".
++        store_path = os.environ.get("out")
++
++    if store_path is not None:
++        # Even if we have a $lib as output, there still should be a $lib/lib
++        # directory.
++        return os.path.join(store_path, 'lib')
++    else:
++        # If we haven't found a possible scenario, let's return an empty string
++        # so that the shared library won't be prepended with a path.
++        #
++        # Note that this doesn't mean that all hope is lost, because after all
++        # we can still use --fallback-library-path to set one.
++        #
++        # Also, we're not returning None, because that would make it very
++        # difficult to disable adding fallback paths altogether using something
++        # like: --fallback-library-path=""
++        return ""
++
++
+ def _get_option_parser():
+     parser = optparse.OptionParser('%prog [options] sources')
+     parser.add_option('', "--quiet",
+@@ -200,6 +228,10 @@ match the namespace prefix.""")
+     parser.add_option("", "--filelist",
+                       action="store", dest="filelist", default=[],
+                       help="file containing headers and sources to be scanned")
++    parser.add_option("", "--fallback-library-path",
++                      action="store", dest="fallback_libpath",
++                      default=_get_default_fallback_libpath(),
++                      help="Path to prepend to unknown shared libraries")
+ 
+     group = get_preprocessor_option_group(parser)
+     parser.add_option_group(group)
 diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
-index 838d343..9dbdc0f 100644
+index 838d343..35b6dab 100644
 --- a/giscanner/shlibs.py
 +++ b/giscanner/shlibs.py
 @@ -53,10 +53,24 @@ def _resolve_libtool(options, binary, libraries):
@@ -30,6 +80,19 @@ index 838d343..9dbdc0f 100644
  
  
  # This is a what we do for non-la files. We assume that we are on an
+@@ -115,7 +129,11 @@ def _resolve_non_libtool(options, binary, libraries):
+                 m = pattern.search(line)
+                 if m:
+                     del patterns[library]
+-                    shlibs.append(m.group(1))
++                    match = m.group(1)
++                    if not match.startswith('/') \
++                       and len(options.fallback_libpath) > 0:
++                        match = os.path.join(options.fallback_libpath, match)
++                    shlibs.append(match)
+                     break
+ 
+         if len(patterns) > 0:
 diff --git a/giscanner/utils.py b/giscanner/utils.py
 index 660081e..c9c767a 100644
 --- a/giscanner/utils.py

From 723f7f8f4fc44f0621227e1feaf61901fca12db9 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 22 Jan 2016 23:55:31 +0100
Subject: [PATCH 0288/2285] gobject-introspection: Don't hardcode /nix/store

If no config.nix.storeDir has been set, don't fall back to "/nix/store"
but use builtins.storeDir instead so we always should end up with the
correct store path no matter whether config.nix.storeDir has been set.

Thanks to @lethalman for pointing this out.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/development/libraries/gobject-introspection/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix
index c2f60d460d7e..2567975aa660 100644
--- a/pkgs/development/libraries/gobject-introspection/default.nix
+++ b/pkgs/development/libraries/gobject-introspection/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, glib, flex, bison, pkgconfig, libffi, python
 , libintlOrEmpty, autoconf, automake, otool
-, substituteAll, nixStoreDir ? "/nix/store"
+, substituteAll, nixStoreDir ? builtins.storeDir
 }:
 # now that gobjectIntrospection creates large .gir files (eg gtk3 case)
 # it may be worth thinking about using multiple derivation outputs
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b04d2c1457bc..8d270ce7f860 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6640,7 +6640,7 @@ let
   mpfr = callPackage ../development/libraries/mpfr/default.nix { };
 
   gobjectIntrospection = callPackage ../development/libraries/gobject-introspection {
-    nixStoreDir = config.nix.storeDir or "/nix/store";
+    nixStoreDir = config.nix.storeDir or builtins.storeDir;
   };
 
   goocanvas = callPackage ../development/libraries/goocanvas { };

From b3b444a79e53d4362a5995d01401b732f0b67eef Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 23 Jan 2016 00:14:53 +0100
Subject: [PATCH 0289/2285] gobject-introspection: Improve comment in patch

As the comment needed explanation, that it's about temporary build
files, this should do better.

Thanks again to @lethalman for pointing that out.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../gobject-introspection/absolute_shlib_path.patch         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
index 84f303b42a0d..1cec9c1e1a55 100644
--- a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
+++ b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
@@ -49,7 +49,7 @@ index 89ec193..8ee92c3 100755
      group = get_preprocessor_option_group(parser)
      parser.add_option_group(group)
 diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
-index 838d343..35b6dab 100644
+index 838d343..ca7fc0d 100644
 --- a/giscanner/shlibs.py
 +++ b/giscanner/shlibs.py
 @@ -53,10 +53,24 @@ def _resolve_libtool(options, binary, libraries):
@@ -67,8 +67,8 @@ index 838d343..35b6dab 100644
 +            # First match Nix store paths because they need to be absolute.
 +            (?:%s(?:/[^/]*)+)
 +            # Everything else not a store path remains relative, because we
-+            # would end up having absolute build paths in the resulting GIR
-+            # file.
++            # would end up with temporary paths that are only valid during
++            # build time in the resulting GIR file.
 +            | (?<=/)
 +          )
 +          # And finally the library itself:

From a892be1018d90e97ccf92e53ede864f900f9b1ac Mon Sep 17 00:00:00 2001
From: Tomas Vestelind <tomas.vestelind@gmail.com>
Date: Sat, 9 Jan 2016 01:04:41 +0100
Subject: [PATCH 0290/2285] haka: building binaries

---
 lib/maintainers.nix                  |  1 +
 pkgs/tools/security/haka/default.nix | 34 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 3 files changed, 37 insertions(+)
 create mode 100644 pkgs/tools/security/haka/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index f73312db99e7..5cac6af5b3e4 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -313,6 +313,7 @@
   tstrobel = "Thomas Strobel <ts468@cam.ac.uk>";
   ttuegel = "Thomas Tuegel <ttuegel@gmail.com>";
   tv = "Tomislav Viljetić <tv@shackspace.de>";
+  tvestelind = "Tomas Vestelind <tomas.vestelind@fripost.org>";
   twey = "James ‘Twey’ Kay <twey@twey.co.uk>";
   urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
   vandenoever = "Jos van den Oever <jos@vandenoever.info>";
diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/tools/security/haka/default.nix
new file mode 100644
index 000000000000..95d40c72f191
--- /dev/null
+++ b/pkgs/tools/security/haka/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, cmake, swig, wireshark, check, rsync, libpcap, gawk, libedit, pcre }:
+
+let version = "0.3.0"; in
+
+stdenv.mkDerivation rec {
+  name = "haka-${version}";
+
+  src = fetchurl {
+    name = "haka_${version}_source.tar.gz";
+    url = "https://github.com/haka-security/haka/releases/download/v${version}";
+
+    # https://github.com/haka-security/haka/releases/download/v${version}/haka_${version}_source.tar.gz.sha1.txt
+    sha1 = "87625ed32841cc0b3aa92aa49397ce71ce434bc2";
+  };
+
+  preConfigure = ''
+    sed -i 's,/etc,'$out'/etc,' src/haka/haka.c
+    sed -i 's,/etc,'$out'/etc,' src/haka/CMakeLists.txt
+    sed -i 's,/opt/haka/etc,$out/opt/haka/etc,' src/haka/haka.1
+    sed -i 's,/etc,'$out'/etc,' doc/user/tool_suite_haka.rst
+  '';
+
+  buildInputs = [ cmake swig wireshark check rsync libpcap gawk libedit pcre ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    dscription = "A collection of tools that allows capturing TCP/IP packets and filtering them based on Lua policy files";
+    homepage = http://www.haka-security.org/;
+    license = stdenv.lib.licenses.mpl20;
+    maintaineres = [ stdenv.lib.maintainers.tvestelind ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8f01dda21f0..c699e22c393c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9285,6 +9285,8 @@ let
 
   groovebasin = callPackage ../applications/audio/groovebasin { };
 
+  haka = callPackage ../tools/security/haka { };
+
   heapster = (callPackage ../servers/monitoring/heapster { }).bin // { outputs = ["bin"]; };
 
   hbase = callPackage ../servers/hbase {};

From 11d475af2994f26d9daf5a682402726d367c21e7 Mon Sep 17 00:00:00 2001
From: Tomas Vestelind <tomas.vestelind@gmail.com>
Date: Mon, 18 Jan 2016 05:54:19 +0100
Subject: [PATCH 0291/2285] haka: options for nixos

---
 nixos/modules/module-list.nix            |   1 +
 nixos/modules/services/security/haka.nix | 156 +++++++++++++++++++++++
 pkgs/tools/security/haka/default.nix     |   2 +-
 3 files changed, 158 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/services/security/haka.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 2ff61877c23d..dcce04b0a28b 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -395,6 +395,7 @@
   ./services/security/fprintd.nix
   ./services/security/fprot.nix
   ./services/security/frandom.nix
+  ./services/security/haka.nix
   ./services/security/haveged.nix
   ./services/security/hologram.nix
   ./services/security/munge.nix
diff --git a/nixos/modules/services/security/haka.nix b/nixos/modules/services/security/haka.nix
new file mode 100644
index 000000000000..4f2bdd29cc49
--- /dev/null
+++ b/nixos/modules/services/security/haka.nix
@@ -0,0 +1,156 @@
+# This module defines global configuration for Haka.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.haka;
+
+  haka = cfg.package;
+
+  hakaConf = pkgs.writeText "haka.conf"
+  ''
+    [general]
+    configuration = ${if lib.strings.hasPrefix "/" cfg.configFile
+      then "${cfg.configFile}"
+      else "${haka}/share/haka/sample/${cfg.configFile}"}
+    ${optionalString (builtins.lessThan 0 cfg.threads) "thread = ${cfg.threads}"}
+
+    [packet]
+    ${optionalString cfg.pcap ''module = "packet/pcap"''}
+    ${optionalString cfg.nfqueue ''module = "packet/nqueue"''}
+    ${optionalString cfg.dump.enable ''dump = "yes"''}
+    ${optionalString cfg.dump.enable ''dump_input = "${cfg.dump.input}"''}
+    ${optionalString cfg.dump.enable ''dump_output = "${cfg.dump.output}"''}
+
+    interfaces = "${lib.strings.concatStringsSep "," cfg.interfaces}"
+
+    [log]
+    # Select the log module
+    module = "log/syslog"
+
+    # Set the default logging level
+    #level = "info,packet=debug"
+
+    [alert]
+    # Select the alert module
+    module = "alert/syslog"
+
+    # Disable alert on standard output
+    #alert_on_stdout = no
+
+    # alert/file module option
+    #file = "/dev/null"
+  '';
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.haka = {
+
+      enable = mkEnableOption "Haka";
+
+      package = mkOption {
+        default = pkgs.haka;
+        type = types.package;
+        description = "
+          Which Haka derivation to use.
+        ";
+      };
+
+      configFile = mkOption {
+        default = "empty.lua";
+        example = "/srv/haka/myfilter.lua";
+        type = types.string;
+        description = ''
+          Specify which configuration file Haka uses.
+          It can be absolute path or a path relative to the sample directory of
+          the haka git repo.
+        '';
+      };
+
+      interfaces = mkOption {
+        default = [ "eth0" ];
+        example = [ "any" ];
+        type = with types; listOf string;
+        description = ''
+          Specify which interface(s) Haka listens to.
+          Use 'any' to listen to all interfaces.
+        '';
+      };
+
+      threads = mkOption {
+        default = 0;
+        example = 4;
+        type = types.int;
+        description = ''
+          The number of threads that will be used.
+          All system threads are used by default.
+        '';
+      };
+
+      pcap = mkOption {
+        default = true;
+        example = false;
+        type = types.bool;
+        description = "Whether to enable pcap";
+      };
+
+      nfqueue = mkEnableOption "nfqueue";
+
+      dump.enable = mkEnableOption "dump";
+      dump.input  = mkOption {
+        default = "/tmp/input.pcap";
+        example = "/path/to/file.pcap";
+        type = types.path;
+        description = "Path to file where incoming packets are dumped";
+      };
+
+      dump.output  = mkOption {
+        default = "/tmp/output.pcap";
+        example = "/path/to/file.pcap";
+        type = types.path;
+        description = "Path to file where outgoing packets are dumped";
+      };
+    };
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    assertions = [
+      { assertion = cfg.pcap != cfg.nfqueue;
+        message = "either pcap or nfqueue can be enabled, not both.";
+      }
+      { assertion = cfg.nfqueue -> !dump.enable;
+        message = "dump can only be used with nfqueue.";
+      }
+      { assertion = cfg.interfaces != [];
+        message = "at least one interface must be specified.";
+      }];
+
+
+    environment.systemPackages = [ haka ];
+
+    systemd.services.haka = {
+      description = "Haka";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      serviceConfig = {
+        ExecStart = "${haka}/bin/haka -c ${hakaConf}";
+        ExecStop = "${haka}/bin/hakactl stop";
+        User = "root";
+        Type = "forking";
+      };
+    };
+  };
+}
diff --git a/pkgs/tools/security/haka/default.nix b/pkgs/tools/security/haka/default.nix
index 95d40c72f191..d040aaa6aea8 100644
--- a/pkgs/tools/security/haka/default.nix
+++ b/pkgs/tools/security/haka/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     name = "haka_${version}_source.tar.gz";
-    url = "https://github.com/haka-security/haka/releases/download/v${version}";
+    url = "https://github.com/haka-security/haka/releases/download/v${version}/haka_${version}_source.tar.gz";
 
     # https://github.com/haka-security/haka/releases/download/v${version}/haka_${version}_source.tar.gz.sha1.txt
     sha1 = "87625ed32841cc0b3aa92aa49397ce71ce434bc2";

From 198c03bffe189dd06cabd23caede8c2e6b447614 Mon Sep 17 00:00:00 2001
From: Tomas Vestelind <tomas.vestelind@gmail.com>
Date: Sat, 23 Jan 2016 00:44:35 +0100
Subject: [PATCH 0292/2285] haka: very basic testing

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

diff --git a/nixos/tests/haka.nix b/nixos/tests/haka.nix
new file mode 100644
index 000000000000..40548f34690f
--- /dev/null
+++ b/nixos/tests/haka.nix
@@ -0,0 +1,24 @@
+# This test runs haka and probes it with hakactl
+
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "haka";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ tvestelind ];
+  };
+
+  nodes = {
+    haka =
+      { config, pkgs, ... }:
+        {
+          services.haka.enable = true;
+        };
+    };
+
+  testScript = ''
+    startAll;
+
+    $haka->waitForUnit("haka.service");
+    $haka->succeed("hakactl status");
+    $haka->succeed("hakactl stop");
+  '';
+})

From 2e62f785d49f0dc386b3b93ceb20965ee9ce39cd Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Fri, 22 Jan 2016 14:08:30 -0800
Subject: [PATCH 0293/2285] racket: fix on darwin

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

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 129c0ac60774..9d1c0c0e319b 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
 
   FONTCONFIG_FILE = fontsConf;
   LD_LIBRARY_PATH = libPath;
-  NIX_LDFLAGS = "-lgcc_s";
+  NIX_LDFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lgcc_s";
 
   buildInputs = [ fontconfig libffi libtool makeWrapper sqlite ];
 
@@ -51,8 +51,10 @@ stdenv.mkDerivation rec {
     cd src/build
   '';
 
-  configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ]
-                   ++ stdenv.lib.optional disableDocs [ "--disable-docs" ];
+  shared = if stdenv.isDarwin then "dylib" else "shared";
+  configureFlags = [ "--enable-${shared}" "--enable-lt=${libtool}/bin/libtool" ]
+                   ++ stdenv.lib.optional disableDocs [ "--disable-docs" ]
+                   ++ stdenv.lib.optional stdenv.isDarwin [ "--enable-xonx" ];
 
   configureScript = "../configure";
 

From 5284416c14114a9fbeff3bf76720b9ea7c14677a Mon Sep 17 00:00:00 2001
From: Tomas Vestelind <tomas.vestelind@gmail.com>
Date: Sat, 23 Jan 2016 02:42:51 +0100
Subject: [PATCH 0294/2285] vassal: new package

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

diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix
new file mode 100644
index 000000000000..bbdd11d8587f
--- /dev/null
+++ b/pkgs/games/vassal/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, jre, makeWrapper }:
+
+stdenv.mkDerivation rec {
+  name = "VASSAL-3.2.15";
+
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/vassalengine/${name}-linux.tar.bz2";
+    sha256 = "10ng571nxr5zc2nlviyrk5bci8my67kq3qvhfn9bifzkxmjlqmk9";
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/vassal $out/doc
+
+    cp CHANGES LICENSE README $out
+    cp -R lib/* $out/share/vassal
+    cp -R doc/* $out/doc
+
+    makeWrapper ${jre}/bin/java $out/bin/vassal \
+      --add-flags "-Duser.dir=$out -cp $out/share/vassal/Vengine.jar \
+      VASSAL.launch.ModuleManager"
+  '';
+
+  # Don't move doc to share/, VASSAL expects it to be in the root
+  forceShare = [ "man" "info" ];
+
+  meta = with stdenv.lib; {
+      description = "A free, open-source boardgame engine.";
+      homepage = http://www.vassalengine.org/;
+      license = licenses.lgpg21;
+      maintainers = with maintainers; [ tvestelind ];
+      platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e15eac8c7b13..9f587fc4fdfe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14385,6 +14385,8 @@ let
 
   ut2004demo = callPackage ../games/ut2004demo { };
 
+  vassal = callPackage ../games/vassal { };
+
   vdrift = callPackage ../games/vdrift { };
 
   vectoroids = callPackage ../games/vectoroids { };

From c1eec0017957e22468454e7a703ff6bbbe3a6d91 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Sat, 16 Jan 2016 00:36:34 +0000
Subject: [PATCH 0295/2285] heimdall: 1.4.1 -> 1.4.2pre

---
 pkgs/tools/misc/heimdall/default.nix | 61 ++++++++++++----------------
 1 file changed, 25 insertions(+), 36 deletions(-)

diff --git a/pkgs/tools/misc/heimdall/default.nix b/pkgs/tools/misc/heimdall/default.nix
index 17689a4848ae..e82f61e69f5b 100644
--- a/pkgs/tools/misc/heimdall/default.nix
+++ b/pkgs/tools/misc/heimdall/default.nix
@@ -1,54 +1,43 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libusb1, udev
-, enableGUI ? true, qt4 ? null
-}:
+{ stdenv, fetchFromGitHub, zlib, libusb1, cmake, qt5
+, enableGUI ? false }:
+
+let version = "d0526a3"; in
+let verName = "1.4.2pre"; in
 
 stdenv.mkDerivation rec {
-  version = "1.4.1";
-  name = "heimdall-${version}";
+  name = "heimdall-${verName}";
 
   src = fetchFromGitHub {
     owner  = "Benjamin-Dobell";
     repo   = "Heimdall";
-    rev    = "v${version}";
-    sha256 = "1b7xpamwvw5r2d9yf73f0axv35vg8zaz1345xs3lmsr105phnnp4";
+    rev    = "${version}";
+    sha256 = "1y8gvqprajlml1z6mjcrlj54m9xsr8691nqagakkkis7hs1lgzmp";
   };
 
-  buildInputs =
-    [ pkgconfig libusb1 udev ]
-    ++ stdenv.lib.optional enableGUI qt4 ;
-
-  makeFlags = "udevrulesdir=$(out)/lib/udev/rules.d";
+  buildInputs = [ zlib libusb1 cmake ];
+  patchPhase = stdenv.lib.optional (!enableGUI) ''
+    sed -i '/heimdall-frontend/d' CMakeLists.txt
+  '';
+  enableParallelBuilding = true;
+  cmakeFlags = ["-DQt5Widgets_DIR=${qt5.qtbase}/lib/cmake/Qt5Widgets"
+                "-DQt5Gui_DIR=${qt5.qtbase}/lib/cmake/Qt5Gui"
+                "-DQt5Core_DIR=${qt5.qtbase}/lib/cmake/Qt5Core"
+                "-DBUILD_TYPE=Release"];
 
   preConfigure =
     ''
-      pushd libpit
-      ./configure
-      make
-      popd
-
-      cd heimdall
-      substituteInPlace Makefile.in --replace sudo true
-
-      # Give ownership of the Galaxy S USB device to the logged in
-      # user.
-      substituteInPlace 60-heimdall-galaxy-s.rules --replace 'MODE="0666"' 'TAG+="udev-acl"'
+      # Give ownership of the Galaxy S USB device to the logged in user.
+      substituteInPlace heimdall/60-heimdall.rules --replace 'MODE="0666"' 'TAG+="uaccess"'
     '';
 
-  postBuild = stdenv.lib.optionalString enableGUI
+  installPhase =
     ''
-      pushd ../heimdall-frontend
-      substituteInPlace Source/mainwindow.cpp --replace /usr/bin $out/bin
-      qmake heimdall-frontend.pro OUTPUTDIR=$out/bin
-      make
-      popd
-    '';
-
-  postInstall =
-    ''
-      mkdir -p $out/share/doc/heimdall
-      cp ../Linux/README $out/share/doc/heimdall/
+      mkdir -p $out/bin $out/share/doc/heimdall $out/lib/udev/rules.d
+      cp bin/heimdall $out/bin
+      cp ../Linux/README $out/share/doc/heimdall
+      cp ../heimdall/60-heimdall.rules $out/lib/udev/rules.d
     '' + stdenv.lib.optionalString enableGUI ''
-      make -C ../heimdall-frontend install
+      cp bin/heimdall-frontend $out/bin
     '';
 
   meta = {

From b47d2f8029df4d40f29ae5eaa313d883ca83bf70 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 23 Jan 2016 09:54:07 +0100
Subject: [PATCH 0296/2285] openjdk8: do not symlink icc profiles

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

diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix
index bbbae38f6b8e..45bef9819aab 100644
--- a/pkgs/development/compilers/openjdk/8.nix
+++ b/pkgs/development/compilers/openjdk/8.nix
@@ -141,6 +141,11 @@ let
       rm -rf $out/lib/openjdk/jre/bina
       ln -s $out/lib/openjdk/bin $out/lib/openjdk/jre/bin
 
+      # Make sure cmm/*.pf are not symlinks:
+      # https://youtrack.jetbrains.com/issue/IDEA-147272
+      rm -rf $out/lib/openjdk/jre/lib/cmm
+      ln -s {$jre,$out}/lib/openjdk/jre/lib/cmm
+
       # Set PaX markings
       exes=$(file $out/lib/openjdk/bin/* $jre/lib/openjdk/jre/bin/* 2> /dev/null | grep -E 'ELF.*(executable|shared object)' | sed -e 's/: .*$//')
       echo "to mark: *$exes*"

From a8d6ad8690e22bc1961c4efce4b8cdb534077606 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sat, 23 Jan 2016 13:22:07 +0100
Subject: [PATCH 0297/2285] idea: use openjdk8 again

---
 pkgs/applications/editors/idea/common.nix  | 4 ++--
 pkgs/applications/editors/idea/default.nix | 9 ++-------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/editors/idea/common.nix b/pkgs/applications/editors/idea/common.nix
index 96689fa75ad6..36f600c14860 100644
--- a/pkgs/applications/editors/idea/common.nix
+++ b/pkgs/applications/editors/idea/common.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip
-, coreutils, gnugrep, which, git, python, unzip, androidsdk }:
+, coreutils, gnugrep, which, git, python, unzip, jdk }:
 
-{ name, product, version, build, src, meta, jdk } @ attrs:
+{ name, product, version, build, src, meta } @ attrs:
 
 with stdenv.lib;
 
diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 1f1dee8d197a..acc3a75cca10 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -1,6 +1,6 @@
 { stdenv, callPackage, fetchurl, makeDesktopItem, makeWrapper, patchelf
 , coreutils, gnugrep, which, git, python, unzip, p7zip
-, androidsdk, jdk, oraclejdk8
+, androidsdk, jdk
 }:
 
 assert stdenv.isLinux;
@@ -8,12 +8,7 @@ assert stdenv.isLinux;
 let
 
   bnumber = with stdenv.lib; build: last (splitString "-" build);
-  mkIdeaProduct' = callPackage ./common.nix { };
-  mkIdeaProduct = attrs: mkIdeaProduct' ({
-      # After IDEA 15 we can no longer use OpenJDK.
-      # https://youtrack.jetbrains.com/issue/IDEA-147272
-      jdk = if (bnumber attrs.build) < "143" then jdk else oraclejdk8;
-  } // attrs);
+  mkIdeaProduct = callPackage ./common.nix { };
 
   buildAndroidStudio = { name, version, build, src, license, description }:
     let drv = (mkIdeaProduct rec {

From f18317885a51ec613d05762c04a7e5cd745d5768 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 23 Jan 2016 15:44:52 +0300
Subject: [PATCH 0298/2285] fhs-userenv: don't use bash login mode

Login mode can cause hidden problems, e.g. #12406. Generally we don't want
to read user's .bash_profile when we don't start an interactive shell inside
a chroot.
---
 pkgs/build-support/build-fhs-userenv/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/build-fhs-userenv/default.nix b/pkgs/build-support/build-fhs-userenv/default.nix
index 5db0d98b79a8..4177846c4336 100644
--- a/pkgs/build-support/build-fhs-userenv/default.nix
+++ b/pkgs/build-support/build-fhs-userenv/default.nix
@@ -12,6 +12,8 @@ let
   '';
 
   init = run: writeText "${name}-init" ''
+    source /etc/profile
+
     # Make /tmp directory
     mkdir -m 1777 /tmp
 
@@ -44,7 +46,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'} -l ${init runScript} "\$(pwd)" "\$@"
+  exec ${chroot-user}/bin/chroot-user ${env} ${bash'} ${init runScript} "\$(pwd)" "\$@"
   EOF
   chmod +x $out/bin/${name}
   ${extraInstallCommands}

From ef582b2805fca03c7f4aa9848cf7935407295139 Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <sveina@gmail.com>
Date: Fri, 22 Jan 2016 23:54:49 +0000
Subject: [PATCH 0299/2285] factorio: init at 0.12.20

---
 pkgs/games/factorio/default.nix | 100 ++++++++++++++++++++++++++++++++
 pkgs/games/factorio/fetch.nix   |  33 +++++++++++
 pkgs/games/factorio/fetch.sh    |  44 ++++++++++++++
 pkgs/top-level/all-packages.nix |   2 +
 4 files changed, 179 insertions(+)
 create mode 100644 pkgs/games/factorio/default.nix
 create mode 100644 pkgs/games/factorio/fetch.nix
 create mode 100644 pkgs/games/factorio/fetch.sh

diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
new file mode 100644
index 000000000000..b08f977cda6b
--- /dev/null
+++ b/pkgs/games/factorio/default.nix
@@ -0,0 +1,100 @@
+{ stdenv, callPackage, fetchurl, makeWrapper
+# Begin libraries
+, alsaLib, libX11, libXcursor, libXinerama, libXrandr, libXi
+# Begin download parameters
+, username ? ""
+, password ? ""
+}:
+
+let
+  version = "0.12.20";
+
+  fetch = callPackage ./fetch.nix { username = username; password = password; };
+  arch = if stdenv.system == "x86_64-linux" then "x64"
+         else if stdenv.system == "i686-linux" then "x32"
+         else abort "Unsupported platform";
+
+  variants = {
+    x64 = {
+      url = "https://www.factorio.com/get-download/${version}/alpha/linux64";
+      sha256 = "1xpzrx3q678519qgjl92fxn3qv55hd188x9jp6dcfk2ljhi1gmqk";
+    };
+
+    x32 = {
+      url = "https://www.factorio.com/get-download/${version}/alpha/linux32";
+      sha256 = "1dl1dsp4nni5nda437ckyw1ss6w168g19v51h7cdvb3cgsdb7sab";
+    };
+  };
+in
+
+stdenv.mkDerivation rec {
+  name = "factorio-${version}";
+
+  src = fetch variants.${arch};
+
+  libPath = stdenv.lib.makeLibraryPath [
+    alsaLib
+    libX11
+    libXcursor
+    libXinerama
+    libXrandr
+    libXi
+  ];
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/{bin,share/factorio}
+    cp -a bin/${arch}/factorio $out/bin/factorio.${arch}
+    cp -a doc-html data $out/share/factorio/
+
+    # Fortunately, Factorio already supports system-wide installs.
+    # Unfortunately it's a bit inconvenient to set the paths.
+    cat > $out/share/factorio/config-base.cfg <<EOF
+use-system-read-write-data-directories=false
+[path]
+read-data=$out/share/factorio/data/
+EOF
+
+    cat > $out/share/factorio/update-config.sh <<EOF
+if [[ -e ~/.factorio/config.cfg ]]; then
+  # Config file exists, but may have wrong path.
+  # Try to edit it. I'm sure this is perfectly safe and will never go wrong.
+  sed -i 's|^read-data=.*|read-data=$out/share/factorio/data/|' ~/.factorio/config.cfg
+else
+  # Config file does not exist. Phew.
+  install -D $out/share/factorio/config-base.cfg ~/.factorio/config.cfg
+fi
+EOF
+    chmod a+x $out/share/factorio/update-config.sh
+
+    patchelf \
+      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+      $out/bin/factorio.${arch}
+
+    makeWrapper $out/bin/factorio.${arch} $out/bin/factorio \
+      --prefix LD_LIBRARY_PATH : /run/opengl-driver/lib:$libPath \
+      --run "$out/share/factorio/update-config.sh" \
+      --add-flags "-c \$HOME/.factorio/config.cfg"
+  '';
+
+  meta = {
+    description = "A game in which you build and maintain factories.";
+    longDescription = ''
+      Factorio is a game in which you build and maintain factories.
+
+      You will be mining resources, researching technologies, building
+      infrastructure, automating production and fighting enemies. Use your
+      imagination to design your factory, combine simple elements into
+      ingenious structures, apply management skills to keep it working and
+      finally protect it from the creatures who don't really like you.
+
+      Factorio has been in development since spring of 2012 and it is
+      currently in late alpha.
+    '';
+    homepage = https://www.factorio.com/;
+    license = stdenv.lib.licenses.unfree;
+    maintainers = [ stdenv.lib.maintainers.Baughn ];
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/games/factorio/fetch.nix b/pkgs/games/factorio/fetch.nix
new file mode 100644
index 000000000000..03dc786492a2
--- /dev/null
+++ b/pkgs/games/factorio/fetch.nix
@@ -0,0 +1,33 @@
+{ stdenv, curl
+# Begin download parameters
+, username ? ""
+, password ? ""
+}:
+
+{
+  # URL to fetch.
+  url ? ""
+
+  # Login URL.
+, loginUrl ? "https://www.factorio.com/login"
+
+  # SHA256 of the fetched URL.
+, sha256 ? ""
+}:
+
+stdenv.mkDerivation {
+  name = "factorio.tar.gz";
+
+  buildInputs = [ curl ];
+
+  inherit url loginUrl username password;
+
+  builder = ./fetch.sh;
+
+  outputHashAlgo = "sha256";
+  outputHash = sha256;
+  outputHashMode = "flat";
+
+  # There's no point in downloading remotely, we'd just slow things down.
+  preferLocalBuild = true;
+}
diff --git a/pkgs/games/factorio/fetch.sh b/pkgs/games/factorio/fetch.sh
new file mode 100644
index 000000000000..ad9766736867
--- /dev/null
+++ b/pkgs/games/factorio/fetch.sh
@@ -0,0 +1,44 @@
+source $stdenv/setup
+
+# Curl flags to increase reliability a bit.
+#
+# Can't use fetchurl, for several reasons. One is that we definitely
+# don't want --insecure for the login, though we need it for the
+# download as their download cert isn't in the standard linux bundle.
+curl="curl \
+ --max-redirs 20 \
+ --retry 3 \
+ --cacert /etc/ssl/certs/ca-bundle.crt \
+ $curlOpts \
+ $NIX_CURL_FLAGS"
+
+# We don't want the password to be on any program's argv, as it may be
+# visible in /proc. Writing it to file with echo should be safe, since
+# it's a shell builtin.
+echo "password=$password" > password
+# Might as well hide the username as well.
+echo "username-or-email=$username" > username
+
+# Log in. We don't especially care about the result, but let's check if login failed.
+$curl -c cookies -d @username -d @password $loginUrl -D headers > /dev/null
+
+if grep -q 'Location: /' headers; then
+    # Now download. We need --insecure for this, but the sha256 should cover us.
+    $curl -b cookies --insecure --location $url > $out
+else
+    echo 'Login failed'
+    echo 'Please set username and password with config.nix,'
+    echo 'or /etc/nix/nixpkgs-config.nix if on NixOS.'
+    echo
+    echo 'Example:'
+    echo '{'
+    echo '  packageOverrides = pkgs: rec {'
+    echo '    factorio = pkgs.factorio.override {'
+    echo '      username = "<username or email address>";'
+    echo '      password = "<password>";'
+    echo '    };'
+    echo '  };'
+    echo '}'
+
+    exit 1
+fi
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8f01dda21f0..24e9808654d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14110,6 +14110,8 @@ let
 
   exult = callPackage ../games/exult { };
 
+  factorio = callPackage ../games/factorio {};
+
   fairymax = callPackage ../games/fairymax {};
 
   fish-fillets-ng = callPackage ../games/fish-fillets-ng {};

From 33cf0792b1d253b2994ae23d313ab0191ddfa2cf Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 23 Jan 2016 14:29:34 +0000
Subject: [PATCH 0300/2285] grsecurity-testing: update patches and associated
 kernel version

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

diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix
index 3bf40a2e8d6b..db450ab9eb99 100644
--- a/pkgs/build-support/grsecurity/default.nix
+++ b/pkgs/build-support/grsecurity/default.nix
@@ -33,7 +33,7 @@ let
 
     grKernel = if cfg.stable
                then mkKernel pkgs.linux_3_14 stable-patch
-               else mkKernel pkgs.linux_4_2 test-patch;
+               else mkKernel pkgs.linux_4_3 test-patch;
 
     ## -- grsecurity configuration ---------------------------------------------
 
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 93b11ed892ba..c74c4c5a944b 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -87,10 +87,10 @@ rec {
     };
 
   grsecurity_unstable = grsecPatch
-    { kversion  = "4.2.3";
-      revision  = "201510130858";
+    { kversion  = "4.3.3";
+      revision  = "201601051958";
       branch    = "test";
-      sha256    = "0ndzcx9i94c065dlyvgykmin5bfkbydrv0kxxq52a4c9is6nlsrb";
+      sha256    = "0hdf9fp5kyd9g8p3qp76jwqvqf561k61wynsq7q9aabvy0p1s18k";
     };
 
   grsec_fix_path =

From bffc4463941020a8752de4efa52720f5b0d24dff Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 23 Jan 2016 14:36:08 +0000
Subject: [PATCH 0301/2285] paxtest: init at 0.9.14

---
 pkgs/os-specific/linux/paxtest/default.nix | 28 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/os-specific/linux/paxtest/default.nix

diff --git a/pkgs/os-specific/linux/paxtest/default.nix b/pkgs/os-specific/linux/paxtest/default.nix
new file mode 100644
index 000000000000..7c8e5eb70a15
--- /dev/null
+++ b/pkgs/os-specific/linux/paxtest/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name    = "paxtest-${version}";
+  version = "0.9.14";
+
+  src = fetchurl {
+    url    = "https://www.grsecurity.net/~spender/${name}.tar.gz";
+    sha256 = "0j40h3x42k5mr5gc5np4wvr9cdf9szk2f46swf42zny8rlgxiskx";
+  };
+
+  buildPhase = ''
+    make $makeFlags RUNDIR=$out/bin/ linux
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    find . -executable -exec cp {} $out/bin \;
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Test various memory protection measures";
+    license     = licenses.gpl2;
+    platforms   = platforms.linux;
+    maintainer  = [ maintainers.copumpkin ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d1e2fe9a2a4..08bd06243c9c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10469,6 +10469,8 @@ let
 
   paxctl = callPackage ../os-specific/linux/paxctl { };
 
+  paxtest = callPackage ../os-specific/linux/paxtest { };
+
   pax-utils = callPackage ../os-specific/linux/pax-utils { };
 
   pcmciaUtils = callPackage ../os-specific/linux/pcmciautils {

From 63485280ddabbf0abac62b04e5642c32d0b1d34a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <deroiste@syslab.com>
Date: Sat, 23 Jan 2016 14:50:56 +0100
Subject: [PATCH 0302/2285] mixxx: 1.11.0 -> 2.0.0

---
 pkgs/applications/audio/mixxx/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index e3422d4ba069..3dcae7a50a6d 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -1,20 +1,21 @@
 { stdenv, fetchurl, scons, pkgconfig, qt4, portaudio, portmidi, libusb1
 , libmad, protobuf, libvorbis, taglib, libid3tag, flac, libsndfile, libshout
-, fftw, vampSDK
+, rubberband, fftw, vampSDK, chromaprint, libopus, sqlite
 }:
 
 stdenv.mkDerivation rec {
   name = "mixxx-${version}";
-  version = "1.11.0";
+  version = "2.0.0";
 
   src = fetchurl {
     url = "http://downloads.mixxx.org/${name}/${name}-src.tar.gz";
-    sha256 = "0c833gf4169xvpfn7car9vzvwfwl9d3xwmbfsy36cv8ydifip5h0";
+    sha256 = "0vb71w1yq0xwwsclrn2jj9bk8w4n14rfv5c0aw46c11mp8xz7f71";
   };
 
   buildInputs = [
     scons pkgconfig qt4 portaudio portmidi libusb1 libmad protobuf libvorbis
-    taglib libid3tag flac libsndfile libshout fftw vampSDK
+    taglib libid3tag flac libsndfile libshout rubberband fftw vampSDK chromaprint
+    libopus sqlite
   ];
 
   sconsFlags = [

From 85f9d04319116a3cd631f5068154272e06a39100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <deroiste@syslab.com>
Date: Sat, 23 Jan 2016 15:46:44 +0100
Subject: [PATCH 0303/2285] mixxx: tidy up, remove obsolete patch, co-adopt

---
 pkgs/applications/audio/mixxx/default.nix | 27 ++++++++++-------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix
index 3dcae7a50a6d..d7cdfcf0d081 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/applications/audio/mixxx/default.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchurl, scons, pkgconfig, qt4, portaudio, portmidi, libusb1
-, libmad, protobuf, libvorbis, taglib, libid3tag, flac, libsndfile, libshout
-, rubberband, fftw, vampSDK, chromaprint, libopus, sqlite
+{ stdenv, fetchurl, chromaprint, fftw, flac, libid3tag, libmad
+, libopus, libshout, libsndfile, libusb1, libvorbis, pkgconfig
+, portaudio, portmidi, protobuf, qt4, rubberband, scons, sqlite
+, taglib, vampSDK
 }:
 
 stdenv.mkDerivation rec {
@@ -13,9 +14,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    scons pkgconfig qt4 portaudio portmidi libusb1 libmad protobuf libvorbis
-    taglib libid3tag flac libsndfile libshout rubberband fftw vampSDK chromaprint
-    libopus sqlite
+    chromaprint fftw flac libid3tag libmad libopus libshout libsndfile
+    libusb1 libvorbis pkgconfig portaudio portmidi protobuf qt4
+    rubberband scons sqlite taglib vampSDK
   ];
 
   sconsFlags = [
@@ -23,10 +24,6 @@ stdenv.mkDerivation rec {
     "qtdir=${qt4}"
   ];
 
-  postPatch = ''
-    sed -i -e 's/"which /"type -P /' build/depends.py
-  '';
-
   buildPhase = ''
     runHook preBuild
     mkdir -p "$out"
@@ -42,11 +39,11 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = {
-    homepage = "http://mixxx.org/";
+  meta = with stdenv.lib; {
+    homepage = http://mixxx.org;
     description = "Digital DJ mixing software";
-    license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = [ stdenv.lib.maintainers.aszlig ];
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl2Plus;
+    maintainers = [ maintainers.aszlig maintainers.goibhniu ];
+    platforms = platforms.linux;
   };
 }

From 740b30b937ee42a3ae3596e6c9ba0a08742db5d9 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 23 Jan 2016 16:24:03 +0100
Subject: [PATCH 0304/2285] gobject-introspection: Deal with $outputLib

Once #7701 gets merged, we have another environment variable called
$outputLib, which then points to another environment variable which is
the final library output.

This was brought up in discussion with @lethalman and @vcunat in:

https://github.com/NixOS/nixpkgs/pull/12558#discussion_r50599813

The closure-size branch is not yet merged into master, so this is only
a preparation and we're still falling back to $out and $lib whenever
$outputLib isn't available.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../absolute_shlib_path.patch                 | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
index 1cec9c1e1a55..49e059befdb9 100644
--- a/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
+++ b/pkgs/development/libraries/gobject-introspection/absolute_shlib_path.patch
@@ -1,21 +1,26 @@
 diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
-index 89ec193..8ee92c3 100755
+index 89ec193..54f1d2e 100755
 --- a/giscanner/scannermain.py
 +++ b/giscanner/scannermain.py
-@@ -94,6 +94,34 @@ def get_windows_option_group(parser):
+@@ -94,6 +94,39 @@ def get_windows_option_group(parser):
      return group
  
  
 +def _get_default_fallback_libpath():
-+    outputs = os.environ.get("outputs", "out").split()
-+    if "lib" in outputs:
-+        # For multiple output derivations let's try whether there is a $lib
-+        # environment variable and use that as the base store path.
-+        store_path = os.environ.get("lib")
-+    elif "out" in outputs:
-+        # Otherwise we have a single output derivation, so the libraries most
-+        # certainly will end up in "$out/lib".
-+        store_path = os.environ.get("out")
++    # Newer multiple-output-optimized stdenv has an environment variable
++    # $outputLib which in turn specifies another variable which then is used as
++    # the destination for the library contents (${!outputLib}/lib).
++    store_path = os.environ.get(os.environ.get("outputLib"))
++    if store_path is None:
++        outputs = os.environ.get("outputs", "out").split()
++        if "lib" in outputs:
++            # For multiple output derivations let's try whether there is a $lib
++            # environment variable and use that as the base store path.
++            store_path = os.environ.get("lib")
++        elif "out" in outputs:
++            # Otherwise we have a single output derivation, so the libraries
++            # most certainly will end up in "$out/lib".
++            store_path = os.environ.get("out")
 +
 +    if store_path is not None:
 +        # Even if we have a $lib as output, there still should be a $lib/lib
@@ -37,7 +42,7 @@ index 89ec193..8ee92c3 100755
  def _get_option_parser():
      parser = optparse.OptionParser('%prog [options] sources')
      parser.add_option('', "--quiet",
-@@ -200,6 +228,10 @@ match the namespace prefix.""")
+@@ -200,6 +233,10 @@ match the namespace prefix.""")
      parser.add_option("", "--filelist",
                        action="store", dest="filelist", default=[],
                        help="file containing headers and sources to be scanned")

From 2eab353a4a8dca888b21c2feef28a514eecc365f Mon Sep 17 00:00:00 2001
From: Tomas Vestelind <tomas.vestelind@gmail.com>
Date: Sat, 23 Jan 2016 17:36:57 +0100
Subject: [PATCH 0305/2285] license lgpg21 -> lgpl21

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

diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix
index bbdd11d8587f..c39d06408ae5 100644
--- a/pkgs/games/vassal/default.nix
+++ b/pkgs/games/vassal/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
       description = "A free, open-source boardgame engine.";
       homepage = http://www.vassalengine.org/;
-      license = licenses.lgpg21;
+      license = licenses.lgpl21;
       maintainers = with maintainers; [ tvestelind ];
       platforms = platforms.linux;
   };

From 8f9aea9ccc1fda3fc3b1573d4afa9c26d96ad693 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 23 Jan 2016 16:58:35 +0000
Subject: [PATCH 0306/2285] grsecurity: fix kernel config and uncomment
 grsecurity kernels

---
 pkgs/build-support/grsecurity/default.nix | 1 +
 pkgs/os-specific/linux/kernel/generic.nix | 4 ++--
 pkgs/top-level/all-packages.nix           | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/grsecurity/default.nix b/pkgs/build-support/grsecurity/default.nix
index db450ab9eb99..841effcfca11 100644
--- a/pkgs/build-support/grsecurity/default.nix
+++ b/pkgs/build-support/grsecurity/default.nix
@@ -142,6 +142,7 @@ let
         };
         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);
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index b42892f9f2d8..59d3642e6227 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -23,6 +23,7 @@
   # symbolic name and `patch' is the actual patch.  The patch may
   # optionally be compressed with gzip or bzip2.
   kernelPatches ? []
+, ignoreConfigErrors ? stdenv.platform.name != "pc"
 , extraMeta ? {}
 , ...
 }:
@@ -41,14 +42,13 @@ let
     in lib.concatStringsSep "\n" ([baseConfig] ++ configFromPatches);
 
   configfile = stdenv.mkDerivation {
+    inherit ignoreConfigErrors;
     name = "linux-config-${version}";
 
     generateConfig = ./generate-config.pl;
 
     kernelConfig = kernelConfigFun config;
 
-    ignoreConfigErrors = stdenv.platform.name != "pc";
-
     nativeBuildInputs = [ perl ];
 
     platformName = stdenv.platform.name;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 08bd06243c9c..e9b96d00a74d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10321,9 +10321,9 @@ let
   linuxPackages_grsec_stable_server_xen = grPackage grFlavors.linux_grsec_stable_server_xen;
 
   # Testing kernels: outdated ATM
-  #linuxPackages_grsec_testing_desktop = grPackage grFlavors.linux_grsec_testing_desktop;
-  #linuxPackages_grsec_testing_server  = grPackage grFlavors.linux_grsec_testing_server;
-  #linuxPackages_grsec_testing_server_xen = grPackage grFlavors.linux_grsec_testing_server_xen;
+  linuxPackages_grsec_testing_desktop = grPackage grFlavors.linux_grsec_testing_desktop;
+  linuxPackages_grsec_testing_server  = grPackage grFlavors.linux_grsec_testing_server;
+  linuxPackages_grsec_testing_server_xen = grPackage grFlavors.linux_grsec_testing_server_xen;
 
   # ChromiumOS kernels
   linuxPackages_chromiumos_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_chromiumos_3_14 linuxPackages_chromiumos_3_14);

From d787c2258b1836b30a5b1241a7ebd8daaa7dc665 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Sun, 12 Apr 2015 14:47:51 -0500
Subject: [PATCH 0307/2285] nixpkgs: systemd - add some more dependencies

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/os-specific/linux/systemd/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 3cff6512fe46..d13417ad032b 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, dbus, kmod
 , xz, pam, acl, cryptsetup, libuuid, m4, utillinux
-, glib, kbd, libxslt, coreutils, libgcrypt
+, glib, kbd, libxslt, coreutils, libgcrypt, libapparmor, audit, lz4
 , kexectools, libmicrohttpd, linuxHeaders, libseccomp
 , autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
 , enableKDbus ? false
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ linuxHeaders pkgconfig intltool gperf libcap kmod xz pam acl
       /* cryptsetup */ libuuid m4 glib libxslt libgcrypt
-      libmicrohttpd kexectools libseccomp
+      libmicrohttpd kexectools libseccomp audit lz4 libapparmor
       /* FIXME: we may be able to prevent the following dependencies
          by generating an autoconf'd tarball, but that's probably not
          worth it. */
@@ -45,6 +45,7 @@ stdenv.mkDerivation rec {
       "--enable-compat-libs" # get rid of this eventually
       "--disable-tests"
 
+      "--enable-lz4"
       "--enable-hostnamed"
       "--enable-networkd"
       "--disable-sysusers"

From c90c30dd1e9db82d8a60c9578cddd87dd130e89b Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 30 Oct 2015 01:04:31 +0100
Subject: [PATCH 0308/2285] nix-generate-from-cpan: large refactor

This commit includes a substantial refactoring of
`nix-generate-from-cpan`. This somewhat simplifies the code through the
use of the CPAN::Meta module while adding the following features:

 - The program now takes an optional maintainer on the command line that
   is subsequently added into the generated package.

 - An attempt is made to convert the license specified inside the
   META.json or META.yaml file to a license in `stdenv.lib.licenses`.

 - An attempt is made to disambiguate attribute names of packages whose
   name is a reserved word in Nix.

 - Write logging output using Log::Log4perl.

 - Print module RSS feed URL. The RSS feed, hosted by MetaCPAN, can be
   used to track updates to the module.
---
 .../scripts/nix-generate-from-cpan.nix        |  12 +-
 maintainers/scripts/nix-generate-from-cpan.pl | 477 ++++++++++++++----
 2 files changed, 390 insertions(+), 99 deletions(-)

diff --git a/maintainers/scripts/nix-generate-from-cpan.nix b/maintainers/scripts/nix-generate-from-cpan.nix
index 056cd994ba22..864fd4e83f62 100644
--- a/maintainers/scripts/nix-generate-from-cpan.nix
+++ b/maintainers/scripts/nix-generate-from-cpan.nix
@@ -1,22 +1,24 @@
 { stdenv, makeWrapper, perl, perlPackages }:
 
 stdenv.mkDerivation {
-  name = "nix-generate-from-cpan-1";
+  name = "nix-generate-from-cpan-2";
 
-  buildInputs = [ makeWrapper perl perlPackages.YAMLLibYAML perlPackages.JSON perlPackages.CPANPLUS ];
+  buildInputs = with perlPackages; [
+    makeWrapper perl CPANMeta GetoptLongDescriptive CPANPLUS Readonly Log4Perl
+  ];
 
-  unpackPhase = "true";
-  buildPhase = "true";
+  phases = [ "installPhase" ];
 
   installPhase =
     ''
       mkdir -p $out/bin
       cp ${./nix-generate-from-cpan.pl} $out/bin/nix-generate-from-cpan
+      patchShebangs $out/bin/nix-generate-from-cpan
       wrapProgram $out/bin/nix-generate-from-cpan --set PERL5LIB $PERL5LIB
     '';
 
   meta = {
-    maintainers = [ stdenv.lib.maintainers.eelco ];
+    maintainers = with stdenv.lib.maintainers; [ eelco rycee ];
     description = "Utility to generate a Nix expression for a Perl package from CPAN";
   };
 }
diff --git a/maintainers/scripts/nix-generate-from-cpan.pl b/maintainers/scripts/nix-generate-from-cpan.pl
index 56709ca8000b..f1159c6d2907 100755
--- a/maintainers/scripts/nix-generate-from-cpan.pl
+++ b/maintainers/scripts/nix-generate-from-cpan.pl
@@ -1,154 +1,440 @@
-#! /run/current-system/sw/bin/perl -w
+#!/usr/bin/env perl
 
+use utf8;
 use strict;
-use CPANPLUS::Backend;
-use YAML::XS;
-use JSON;
+use warnings;
 
-my $module_name = $ARGV[0];
-die "syntax: $0 <MODULE-NAME>\n" unless defined $module_name;
+use CPAN::Meta();
+use CPANPLUS::Backend();
+use Getopt::Long::Descriptive qw( describe_options );
+use JSON::PP qw( encode_json );
+use Log::Log4perl qw(:easy);
+use Readonly();
 
-my $cb = CPANPLUS::Backend->new;
+# Readonly hash that maps CPAN style license strings to information
+# necessary to generate a Nixpkgs style license attribute.
+Readonly::Hash my %LICENSE_MAP => (
 
-my @modules = $cb->search(type => "name", allow => [$module_name]);
-die "module $module_name not found\n" if scalar @modules == 0;
-die "multiple packages that match module $module_name\n" if scalar @modules > 1;
-my $module = $modules[0];
+    # The Perl 5 License (Artistic 1 & GPL 1 or later).
+    perl_5 => {
+        licenses => [qw( artistic1 gpl1Plus )]
+    },
+
+    # GNU Affero General Public License, Version 3.
+    agpl_3 => {
+        licenses => [qw( agpl3Plus )],
+        amb      => 1
+    },
+
+    # Apache Software License, Version 1.1.
+    apache_1_1 => {
+        licenses => ["Apache License 1.1"],
+        in_set   => 0
+    },
+
+    # Apache License, Version 2.0.
+    apache_2_0 => {
+        licenses => [qw( asl20 )]
+    },
+
+    # Artistic License, (Version 1).
+    artistic_1 => {
+        licenses => [qw( artistic1 )]
+    },
+
+    # Artistic License, Version 2.0.
+    artistic_2 => {
+        licenses => [qw( artistic2 )]
+    },
+
+    # BSD License (three-clause).
+    bsd => {
+        licenses => [qw( bsd3 )],
+        amb      => 1
+    },
+
+    # FreeBSD License (two-clause).
+    freebsd => {
+        licenses => [qw( bsd2 )]
+    },
+
+    # GNU Free Documentation License, Version 1.2.
+    gfdl_1_2 => {
+        licenses => [qw( fdl12 )]
+    },
+
+    # GNU Free Documentation License, Version 1.3.
+    gfdl_1_3 => {
+        licenses => [qw( fdl13 )]
+    },
+
+    # GNU General Public License, Version 1.
+    gpl_1 => {
+        licenses => [qw( gpl1Plus )],
+        amb      => 1
+    },
+
+    # GNU General Public License, Version 2. Note, we will interpret
+    # "gpl" alone as GPL v2+.
+    gpl_2 => {
+        licenses => [qw( gpl2Plus )],
+        amb      => 1
+    },
+
+    # GNU General Public License, Version 3.
+    gpl_3 => {
+        licenses => [qw( gpl3Plus )],
+        amb      => 1
+    },
+
+    # GNU Lesser General Public License, Version 2.1. Note, we will
+    # interpret "gpl" alone as LGPL v2.1+.
+    lgpl_2_1 => {
+        licenses => [qw( lgpl21Plus )],
+        amb      => 1
+    },
+
+    # GNU Lesser General Public License, Version 3.0.
+    lgpl_3_0 => {
+        licenses => [qw( lgpl3Plus )],
+        amb      => 1
+    },
+
+    # MIT (aka X11) License.
+    mit => {
+        licenses => [qw( mit )]
+    },
+
+    # Mozilla Public License, Version 1.0.
+    mozilla_1_0 => {
+        licenses => [qw( mpl10 )]
+    },
+
+    # Mozilla Public License, Version 1.1.
+    mozilla_1_1 => {
+        licenses => [qw( mpl11 )]
+    },
+
+    # OpenSSL License.
+    openssl => {
+        licenses => [qw( openssl )]
+    },
+
+    # Q Public License, Version 1.0.
+    qpl_1_0 => {
+        licenses => [qw( qpl )]
+    },
+
+    # Original SSLeay License.
+    ssleay => {
+        licenses => ["Original SSLeay License"],
+        in_set   => 0
+    },
+
+    # Sun Internet Standards Source License (SISSL).
+    sun => {
+        licenses => ["Sun Industry Standards Source License v1.1"],
+        in_set   => 0
+    },
+
+    # zlib License.
+    zlib => {
+        licenses => [qw( zlib )]
+    },
+
+    # Other Open Source Initiative (OSI) approved license.
+    open_source => {
+        licenses => [qw( free )],
+        amb      => 1
+    },
+
+    # Requires special permission from copyright holder.
+    restricted => {
+        licenses => [qw( unfree )],
+        amb      => 1
+    },
+
+    # Not an OSI approved license, but not restricted. Note, we
+    # currently map this to unfreeRedistributable, which is a
+    # conservative choice.
+    unrestricted => {
+        licenses => [qw( unfreeRedistributable )],
+        amb      => 1
+    },
+
+    # License not provided in metadata.
+    unknown => {
+        licenses => [qw( unknown )],
+        amb      => 1
+    }
+);
+
+sub handle_opts {
+    my ( $opt, $usage ) = describe_options(
+        'usage: $0 %o MODULE',
+        [ 'maintainer|m=s', 'the package maintainer' ],
+        [ 'debug|d',        'enable debug output' ],
+        [ 'help',           'print usage message and exit' ]
+    );
+
+    if ( $opt->help ) {
+        print $usage->text;
+        exit;
+    }
+
+    my $module_name = $ARGV[0];
+
+    if ( !defined $module_name ) {
+        print STDERR "Missing module name\n";
+        print STDERR $usage->text;
+        exit 1;
+    }
+
+    return ( $opt, $module_name );
+}
+
+# Takes a Perl package attribute name and returns 1 if the name cannot
+# be referred to as a bareword. This typically happens if the package
+# name is a reserved Nix keyword.
+sub is_reserved {
+    my ($pkg) = @_;
+
+    return $pkg =~ /^(?: assert    |
+                         else      |
+                         if        |
+                         import    |
+                         in        |
+                         inherit   |
+                         let       |
+                         rec       |
+                         then      |
+                         while     |
+                         with      )$/x;
+}
 
 sub pkg_to_attr {
-    my ($pkg_name) = @_;
-    my $attr_name = $pkg_name;
-    $attr_name =~ s/-\d.*//; # strip version
-    return "LWP" if $attr_name eq "libwww-perl";
-    $attr_name =~ s/-//g;
-    return $attr_name;
+    my ($module) = @_;
+    my $attr_name = $module->package_name;
+    if ( $attr_name eq "libwww-perl" ) {
+        return "LWP";
+    }
+    else {
+        $attr_name =~ s/-//g;
+        return $attr_name;
+    }
 }
 
 sub get_pkg_name {
     my ($module) = @_;
-    my $pkg_name = $module->package;
-    $pkg_name =~ s/\.tar.*//;
-    $pkg_name =~ s/\.zip//;
-    return $pkg_name;
+    return $module->package_name . '-' . $module->package_version;
 }
 
-my $pkg_name = get_pkg_name $module;
-my $attr_name = pkg_to_attr $pkg_name;
+sub read_meta {
+    my ($pkg_path) = @_;
 
-print STDERR "attribute name: ", $attr_name, "\n";
-print STDERR "module: ", $module->module, "\n";
-print STDERR "version: ", $module->version, "\n";
-print STDERR "package: ", $module->package, , " (", $pkg_name, ", ", $attr_name, ")\n";
-print STDERR "path: ", $module->path, "\n";
+    my $yaml_path = "$pkg_path/META.yml";
+    my $json_path = "$pkg_path/META.json";
+    my $meta;
 
-my $tar_path = $module->fetch();
-print STDERR "downloaded to: $tar_path\n";
-print STDERR "sha-256: ", $module->status->checksum_value, "\n";
-
-my $pkg_path = $module->extract();
-print STDERR "unpacked to: $pkg_path\n";
-
-my $meta;
-if (-e "$pkg_path/META.yml") {
-    eval {
-        $meta = YAML::XS::LoadFile("$pkg_path/META.yml");
-    };
-    if ($@) {
-        system("iconv -f windows-1252 -t utf-8 '$pkg_path/META.yml' > '$pkg_path/META.yml.tmp'");
-        $meta = YAML::XS::LoadFile("$pkg_path/META.yml.tmp");
+    if ( -r $json_path ) {
+        $meta = CPAN::Meta->load_file($json_path);
+    }
+    elsif ( -r $yaml_path ) {
+        $meta = CPAN::Meta->load_file($yaml_path);
+    }
+    else {
+        WARN("package has no META.yml or META.json");
     }
-} elsif (-e "$pkg_path/META.json") {
-    local $/;
-    open(my $fh, '<', "$pkg_path/META.json") or die;
-    $meta = decode_json(<$fh>);
-} else {
-    warn "package has no META.yml or META.json\n";
-}
 
-print STDERR "metadata: ", encode_json($meta), "\n" if defined $meta;
+    return $meta;
+}
 
 # Map a module to the attribute corresponding to its package
 # (e.g. HTML::HeadParser will be mapped to HTMLParser, because that
 # module is in the HTML-Parser package).
 sub module_to_pkg {
-    my ($module_name) = @_;
-    my @modules = $cb->search(type => "name", allow => [$module_name]);
-    if (scalar @modules == 0) {
+    my ( $cb, $module_name ) = @_;
+    my @modules = $cb->search( type => "name", allow => [$module_name] );
+    if ( scalar @modules == 0 ) {
+
         # Fallback.
         $module_name =~ s/:://g;
         return $module_name;
     }
-    my $module = $modules[0];
-    my $attr_name = pkg_to_attr(get_pkg_name $module);
-    print STDERR "mapped dep $module_name to $attr_name\n";
+    my $module    = $modules[0];
+    my $attr_name = pkg_to_attr($module);
+    DEBUG("mapped dep $module_name to $attr_name");
     return $attr_name;
 }
 
 sub get_deps {
-    my ($type) = @_;
-    my $deps;
-    if (defined $meta->{prereqs}) {
-        die "unimplemented";
-    } elsif ($type eq "runtime") {
-        $deps = $meta->{requires};
-    } elsif ($type eq "configure") {
-        $deps = $meta->{configure_requires};
-    } elsif ($type eq "build") {
-        $deps = $meta->{build_requires};
-    }
+    my ( $cb, $meta, $type ) = @_;
+
+    return if !defined $meta;
+
+    my $prereqs = $meta->effective_prereqs;
+    my $deps = $prereqs->requirements_for( $type, "requires" );
     my @res;
-    foreach my $n (keys %{$deps}) {
+    foreach my $n ( $deps->required_modules ) {
         next if $n eq "perl";
+
         # Hacky way to figure out if this module is part of Perl.
-        if ($n !~ /^JSON/ && $n !~ /^YAML/ && $n !~ /^Module::Pluggable/) {
+        if ( $n !~ /^JSON/ && $n !~ /^YAML/ && $n !~ /^Module::Pluggable/ ) {
             eval "use $n;";
-            if (!$@) {
-                print STDERR "skipping Perl-builtin module $n\n";
+            if ( !$@ ) {
+                DEBUG("skipping Perl-builtin module $n");
                 next;
             }
         }
-        push @res, module_to_pkg($n);
+
+        my $pkg = module_to_pkg( $cb, $n );
+
+        # If the package name is reserved then we need to refer to it
+        # through the "self" variable.
+        $pkg = "self.\"$pkg\"" if is_reserved($pkg);
+
+        push @res, $pkg;
     }
     return @res;
 }
 
 sub uniq {
-    return keys %{{ map { $_ => 1 } @_ }};
+    return keys %{ { map { $_ => 1 } @_ } };
 }
 
-my @build_deps = sort(uniq(get_deps("configure"), get_deps("build"), get_deps("test")));
-print STDERR "build deps: @build_deps\n";
+sub render_license {
+    my ($cpan_license) = @_;
 
-my @runtime_deps = sort(uniq(get_deps("runtime")));
-print STDERR "runtime deps: @runtime_deps\n";
+    return if !defined $cpan_license;
 
-my $homepage = $meta->{resources}->{homepage};
-print STDERR "homepage: $homepage\n" if defined $homepage;
+    my $licenses;
 
-my $description = $meta->{abstract};
-if (defined $description) {
-    $description = uc(substr($description, 0, 1)) . substr($description, 1); # capitalise first letter
-    $description =~ s/\.$//; # remove period at the end
+    # If the license is ambiguous then we'll print an extra warning.
+    # For example, "gpl_2" is ambiguous since it may refer to exactly
+    # "GPL v2" or to "GPL v2 or later".
+    my $amb = 0;
+
+    # Whether the license is available inside `stdenv.lib.licenses`.
+    my $in_set = 1;
+
+    my $nix_license = $LICENSE_MAP{$cpan_license};
+    if ( !$nix_license ) {
+        WARN("Unknown license: $cpan_license");
+        $licenses = [$cpan_license];
+        $in_set   = 0;
+    }
+    else {
+        $licenses = $nix_license->{licenses};
+        $amb      = $nix_license->{amb};
+        $in_set   = !$nix_license->{in_set};
+    }
+
+    my $license_line;
+
+    if ( @$licenses == 0 ) {
+
+        # Avoid defining the license line.
+    }
+    elsif ($in_set) {
+        my $lic = 'stdenv.lib.licenses';
+        if ( @$licenses == 1 ) {
+            $license_line = "$lic.$licenses->[0]";
+        }
+        else {
+            $license_line = "with $lic; [ " . join( ' ', @$licenses ) . " ]";
+        }
+    }
+    else {
+        if ( @$licenses == 1 ) {
+            $license_line = $licenses->[0];
+        }
+        else {
+            $license_line = '[ ' . join( ' ', @$licenses ) . ' ]';
+        }
+    }
+
+    INFO("license: $cpan_license");
+    WARN("License '$cpan_license' is ambiguous, please verify") if $amb;
+
+    return $license_line;
+}
+
+my ( $opt, $module_name ) = handle_opts();
+
+Log::Log4perl->easy_init(
+    {
+        level => $opt->debug ? $DEBUG : $INFO,
+        layout => '%m%n'
+    }
+);
+
+my $cb = CPANPLUS::Backend->new;
+
+my @modules = $cb->search( type => "name", allow => [$module_name] );
+die "module $module_name not found\n" if scalar @modules == 0;
+die "multiple packages that match module $module_name\n" if scalar @modules > 1;
+my $module = $modules[0];
+
+my $pkg_name  = get_pkg_name $module;
+my $attr_name = pkg_to_attr $module;
+
+INFO( "attribute name: ", $attr_name );
+INFO( "module: ",         $module->module );
+INFO( "version: ",        $module->version );
+INFO( "package: ", $module->package, " (", $pkg_name, ", ", $attr_name, ")" );
+INFO( "path: ",    $module->path );
+
+my $tar_path = $module->fetch();
+INFO( "downloaded to: ", $tar_path );
+INFO( "sha-256: ",       $module->status->checksum_value );
+
+my $pkg_path = $module->extract();
+INFO( "unpacked to: ", $pkg_path );
+
+my $meta = read_meta($pkg_path);
+
+DEBUG( "metadata: ", encode_json( $meta->as_struct ) ) if defined $meta;
+
+my @build_deps = sort( uniq(
+        get_deps( $cb, $meta, "configure" ),
+        get_deps( $cb, $meta, "build" ),
+        get_deps( $cb, $meta, "test" )
+) );
+INFO("build deps: @build_deps");
+
+my @runtime_deps = sort( uniq( get_deps( $cb, $meta, "runtime" ) ) );
+INFO("runtime deps: @runtime_deps");
+
+my $homepage = $meta ? $meta->resources->{homepage} : undef;
+INFO("homepage: $homepage") if defined $homepage;
+
+my $description = $meta ? $meta->abstract : undef;
+if ( defined $description ) {
+    $description = uc( substr( $description, 0, 1 ) )
+      . substr( $description, 1 );    # capitalise first letter
+    $description =~ s/\.$//;          # remove period at the end
     $description =~ s/\s*$//;
     $description =~ s/^\s*//;
-    print STDERR "description: $description\n";
+    $description =~ s/\n+/ /;         # Replace new lines by space.
+    INFO("description: $description");
 }
 
-my $license = $meta->{license};
-if (defined $license) {
-    $license = "perl5" if $license eq "perl_5";
-    print STDERR "license: $license\n";
-}
+#print(Data::Dumper::Dumper($meta->licenses) . "\n");
+my $license = $meta ? render_license( $meta->licenses ) : undef;
 
-my $build_fun = -e "$pkg_path/Build.PL" && ! -e "$pkg_path/Makefile.PL" ? "buildPerlModule" : "buildPerlPackage";
+INFO( "RSS feed: https://metacpan.org/feed/distribution/",
+    $module->package_name );
+
+my $build_fun = -e "$pkg_path/Build.PL"
+  && !-e "$pkg_path/Makefile.PL" ? "buildPerlModule" : "buildPerlPackage";
 
 print STDERR "===\n";
 
 print <<EOF;
-  $attr_name = $build_fun {
+  "$attr_name" = $build_fun rec {
     name = "$pkg_name";
     src = fetchurl {
-      url = mirror://cpan/${\$module->path}/${\$module->package};
+      url = "mirror://cpan/${\$module->path}/\${name}.${\$module->package_extension}";
       sha256 = "${\$module->status->checksum_value}";
     };
 EOF
@@ -168,7 +454,10 @@ print <<EOF if defined $description;
       description = "$description";
 EOF
 print <<EOF if defined $license;
-      license = "$license";
+      license = $license;
+EOF
+print <<EOF if $opt->maintainer;
+      maintainers = [ maintainers.${\$opt->maintainer} ];
 EOF
 print <<EOF;
     };

From 7ccda42007b892d82b0a89d511d93acec771a83e Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 23 Jan 2016 19:28:01 +0000
Subject: [PATCH 0309/2285] nixos: uptimed - rewrite and harden a bit (#7220)

This is mostly @thoughtpolice's work, but I cleaned it up a bit.
---
 nixos/modules/services/system/uptimed.nix | 71 ++++++++++-------------
 1 file changed, 30 insertions(+), 41 deletions(-)

diff --git a/nixos/modules/services/system/uptimed.nix b/nixos/modules/services/system/uptimed.nix
index 5f8916bbf9a4..b20d60968032 100644
--- a/nixos/modules/services/system/uptimed.nix
+++ b/nixos/modules/services/system/uptimed.nix
@@ -1,66 +1,55 @@
-{pkgs, config, lib, ...}:
+{ config, lib, pkgs, ... }:
+
+with lib;
 
 let
-
-  inherit (lib) mkOption mkIf singleton;
-
-  inherit (pkgs) uptimed;
-
+  cfg = config.services.uptimed;
   stateDir = "/var/spool/uptimed";
-
-  uptimedUser = "uptimed";
-
 in
-
 {
-
-  ###### interface
-
   options = {
-
     services.uptimed = {
-
       enable = mkOption {
         default = false;
         description = ''
-          Uptimed allows you to track your highest uptimes.
+          Enable <literal>uptimed</literal>, allowing you to track
+          your highest uptimes.
         '';
       };
-
     };
-
   };
 
-
-  ###### implementation
-
-  config = mkIf config.services.uptimed.enable {
-
-    environment.systemPackages = [ uptimed ];
-
-    users.extraUsers = singleton
-      { name = uptimedUser;
-        uid = config.ids.uids.uptimed;
-        description = "Uptimed daemon user";
-        home = stateDir;
-      };
+  config = mkIf cfg.enable {
+    users.extraUsers.uptimed = {
+      description = "Uptimed daemon user";
+      home        = stateDir;
+      createHome  = true;
+      uid         = config.ids.uids.uptimed;
+    };
 
     systemd.services.uptimed = {
-      description = "Uptimed daemon";
-      wantedBy = [ "multi-user.target" ];
+      unitConfig.Documentation = "man:uptimed(8) man:uprecords(1)";
+      description = "uptimed service";
+      wantedBy    = [ "multi-user.target" ];
+
+      serviceConfig = {
+        Restart                 = "on-failure";
+        User                    = "uptimed";
+        Nice                    = 19;
+        IOSchedulingClass       = "idle";
+        PrivateTmp              = "yes";
+        PrivateNetwork          = "yes";
+        NoNewPrivileges         = "yes";
+        ReadWriteDirectories    = stateDir;
+        InaccessibleDirectories = "/home";
+        ExecStart               = "${pkgs.uptimed}/sbin/uptimed -f -p ${stateDir}/pid";
+      };
 
       preStart = ''
-        mkdir -m 0755 -p ${stateDir}
-        chown ${uptimedUser} ${stateDir}
-
         if ! test -f ${stateDir}/bootid ; then
-          ${uptimed}/sbin/uptimed -b
+          ${pkgs.uptimed}/sbin/uptimed -b
         fi
       '';
-
-      script = "${uptimed}/sbin/uptimed";
     };
-
   };
-
 }

From 0ed01e04258f789af8295e92a5df0bb5266cb653 Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Wed, 20 Jan 2016 01:06:35 +0100
Subject: [PATCH 0310/2285] rarcrack: init at 0.2

---
 pkgs/tools/security/rarcrack/default.nix | 39 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/tools/security/rarcrack/default.nix

diff --git a/pkgs/tools/security/rarcrack/default.nix b/pkgs/tools/security/rarcrack/default.nix
new file mode 100644
index 000000000000..3491feccc45c
--- /dev/null
+++ b/pkgs/tools/security/rarcrack/default.nix
@@ -0,0 +1,39 @@
+{stdenv, fetchFromGitHub, libxml2, file, p7zip, unrar, unzip}:
+
+stdenv.mkDerivation rec {
+  name = "rarcrack-${version}";
+  version = "0.2";
+
+  src = fetchFromGitHub {
+    owner = "jaredsburrows";
+    repo = "Rarcrack";
+    rev = "35ead64cd2b967eec3e3e3a4c328b89b11ff32a0";
+    sha256 = "134fq84896w5vp8vg4qg0ybpb466njibigyd7bqqm1xydr07qrgn";
+  };
+
+  buildInputs = [ libxml2 file p7zip unrar unzip ];
+  buildFlags = if stdenv.cc.isClang then [ "CC=clang" ] else null;
+  installFlags = "PREFIX=\${out}";
+
+  patchPhase = ''
+   substituteInPlace rarcrack.c --replace "file -i" "${file}/bin/file -i"
+  '';
+
+  preInstall = ''
+    mkdir -p $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "This program can crack zip,7z and rar file passwords";
+    longDescription = ''
+    If you forget your password for compressed archive (rar, 7z, zip), this program is the solution.
+    This program uses bruteforce algorithm to find correct password. You can specify wich characters will be used in password generations.
+    Warning: Please don't use this program for any illegal things!
+    '';
+    homepage = https://github.com/jaredsburrows/Rarcrack;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ davidak ];
+    platforms = with platforms; unix;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa24c4bbf754..e94fe7e0a64c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2893,6 +2893,8 @@ let
 
   ranger = callPackage ../applications/misc/ranger { };
 
+  rarcrack = callPackage ../tools/security/rarcrack { };
+
   rawdog = callPackage ../applications/networking/feedreaders/rawdog { };
 
   read-edid = callPackage ../os-specific/linux/read-edid { };

From e409d0fed3b5d50147b61b6d223d9aa272863485 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 23 Jan 2016 20:44:30 +0000
Subject: [PATCH 0311/2285] nixos: update-locatedb - harden via systemd (#7220)

Also, use systemd timers.

Most of the work is by @thoughtpolice but I changed enough of it to warrant changing commit author.
---
 .../manual/development/writing-modules.xml    |  78 +++++-----
 nixos/modules/misc/locate.nix                 | 137 +++++++++---------
 2 files changed, 113 insertions(+), 102 deletions(-)

diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml
index a699e74e5f62..971e586f20bd 100644
--- a/nixos/doc/manual/development/writing-modules.xml
+++ b/nixos/doc/manual/development/writing-modules.xml
@@ -107,12 +107,12 @@ the file system.  This module declares two options that can be defined
 by other modules (typically the user’s
 <filename>configuration.nix</filename>):
 <option>services.locate.enable</option> (whether the database should
-be updated) and <option>services.locate.period</option> (when the
+be updated) and <option>services.locate.interval</option> (when the
 update should be done).  It implements its functionality by defining
 two options declared by other modules:
 <option>systemd.services</option> (the set of all systemd services)
-and <option>services.cron.systemCronJobs</option> (the list of
-commands to be executed periodically by <command>cron</command>).</para>
+and <option>systemd.timers</option> (the list of commands to be
+executed periodically by <command>systemd</command>).</para>
 
 <example xml:id='locate-example'><title>NixOS Module for the “locate” Service</title>
 <programlisting>
@@ -120,53 +120,59 @@ commands to be executed periodically by <command>cron</command>).</para>
 
 with lib;
 
-let locatedb = "/var/cache/locatedb"; in
-
-{
-  options = {
-
-    services.locate = {
-
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          If enabled, NixOS will periodically update the database of
-          files used by the <command>locate</command> command.
-        '';
-      };
-
-      period = mkOption {
-        type = types.str;
-        default = "15 02 * * *";
-        description = ''
-          This option defines (in the format used by cron) when the
-          locate database is updated.  The default is to update at
-          02:15 at night every day.
-        '';
-      };
-
+let
+  cfg = config.services.locate;
+in {
+  options.services.locate = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        If enabled, NixOS will periodically update the database of
+        files used by the <command>locate</command> command.
+      '';
     };
 
+    interval = mkOption {
+      type = types.str;
+      default = "02:15";
+      example = "hourly";
+      description = ''
+        Update the locate database at this interval. Updates by
+        default at 2:15 AM every day.
+
+        The format is described in
+        <citerefentry><refentrytitle>systemd.time</refentrytitle>
+        <manvolnum>7</manvolnum></citerefentry>.
+      '';
+    };
+
+    # Other options omitted for documentation
   };
 
   config = {
-
     systemd.services.update-locatedb =
       { description = "Update Locate Database";
         path  = [ pkgs.su ];
         script =
           ''
-            mkdir -m 0755 -p $(dirname ${locatedb})
-            exec updatedb --localuser=nobody --output=${locatedb} --prunepaths='/tmp /var/tmp /run'
+            mkdir -m 0755 -p $(dirname ${toString cfg.output})
+            exec updatedb \
+              --localuser=${cfg.localuser} \
+              ${optionalString (!cfg.includeStore) "--prunepaths='/nix/store'"} \
+              --output=${toString cfg.output} ${concatStringsSep " " cfg.extraFlags}
           '';
       };
 
-    services.cron.systemCronJobs = optional config.services.locate.enable
-      "${config.services.locate.period} root ${config.systemd.package}/bin/systemctl start update-locatedb.service";
-
+    systemd.timers.update-locatedb = mkIf cfg.enable
+      { description = "Update timer for locate database";
+        partOf      = [ "update-locatedb.service" ];
+        wantedBy    = [ "timers.target" ];
+        timerConfig.OnCalendar = cfg.interval;
+      };
   };
-}</programlisting>
+}
+</programlisting>
 </example>
 
 <xi:include href="option-declarations.xml" />
diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index 4f9c8d4e5ba1..318b81ca07c2 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -1,76 +1,74 @@
-{ config, lib, pkgs, ... }:
+{ config, options, lib, pkgs, ... }:
 
 with lib;
 
 let
   cfg = config.services.locate;
 in {
-
-  ###### interface
-
-  options = {
-
-    services.locate = {
-
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          If enabled, NixOS will periodically update the database of
-          files used by the <command>locate</command> command.
-        '';
-      };
-
-      period = mkOption {
-        type = types.str;
-        default = "15 02 * * *";
-        description = ''
-          This option defines (in the format used by cron) when the
-          locate database is updated.
-          The default is to update at 02:15 at night every day.
-        '';
-      };
-
-      extraFlags = mkOption {
-        type = types.listOf types.str;
-        default = [ ];
-        description = ''
-          Extra flags to pass to <command>updatedb</command>.
-        '';
-      };
-
-      output = mkOption {
-        type = types.path;
-        default = "/var/cache/locatedb";
-        description = ''
-          The database file to build.
-        '';
-      };
-
-      localuser = mkOption {
-        type = types.str;
-        default = "nobody";
-        description = ''
-          The user to search non-network directories as, using
-          <command>su</command>.
-        '';
-      };
-
-      includeStore = mkOption {
-        type = types.bool;
-        default = false;
-        description = ''
-          Whether to include <filename>/nix/store</filename> in the locate database.
-        '';
-      };
-
+  options.services.locate = {
+    enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        If enabled, NixOS will periodically update the database of
+        files used by the <command>locate</command> command.
+      '';
     };
 
+    interval = mkOption {
+      type = types.str;
+      default = "02:15";
+      example = "hourly";
+      description = ''
+        Update the locate database at this interval. Updates by
+        default at 2:15 AM every day.
+
+        The format is described in
+        <citerefentry><refentrytitle>systemd.time</refentrytitle>
+        <manvolnum>7</manvolnum></citerefentry>.
+      '';
+    };
+
+    # This is no longer supported, but we keep it to give a better warning below
+    period = mkOption { visible = false; };
+
+    extraFlags = mkOption {
+      type = types.listOf types.str;
+      default = [ ];
+      description = ''
+        Extra flags to pass to <command>updatedb</command>.
+      '';
+    };
+
+    output = mkOption {
+      type = types.path;
+      default = "/var/cache/locatedb";
+      description = ''
+        The database file to build.
+      '';
+    };
+
+    localuser = mkOption {
+      type = types.str;
+      default = "nobody";
+      description = ''
+        The user to search non-network directories as, using
+        <command>su</command>.
+      '';
+    };
+
+    includeStore = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Whether to include <filename>/nix/store</filename> in the locate database.
+      '';
+    };
   };
 
-  ###### implementation
-
   config = {
+    warnings = let opt = options.services.locate.period; in optional opt.isDefined "The `period` definition in ${showFiles opt.files} has been removed; please replace it with `interval`, using the new systemd.time interval specifier.";
+
     systemd.services.update-locatedb =
       { description = "Update Locate Database";
         path  = [ pkgs.su ];
@@ -84,11 +82,18 @@ in {
           '';
         serviceConfig.Nice = 19;
         serviceConfig.IOSchedulingClass = "idle";
+        serviceConfig.PrivateTmp = "yes";
+        serviceConfig.PrivateNetwork = "yes";
+        serviceConfig.NoNewPrivileges = "yes";
+        serviceConfig.ReadOnlyDirectories = "/";
+        serviceConfig.ReadWriteDirectories = cfg.output;
       };
 
-    services.cron.systemCronJobs = optional config.services.locate.enable
-      "${config.services.locate.period} root ${config.systemd.package}/bin/systemctl start update-locatedb.service";
-
+    systemd.timers.update-locatedb = mkIf cfg.enable
+      { description = "Update timer for locate database";
+        partOf      = [ "update-locatedb.service" ];
+        wantedBy    = [ "timers.target" ];
+        timerConfig.OnCalendar = cfg.interval;
+      };
   };
-
 }

From d0b7d528e85b87654317f1bcd5778d94228cee2c Mon Sep 17 00:00:00 2001
From: Aistis Raulinaitis <sheganinans@gmail.com>
Date: Sat, 23 Jan 2016 00:47:32 -0800
Subject: [PATCH 0312/2285] kdb 3.2 -> 3.3

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

diff --git a/pkgs/applications/misc/kdbplus/default.nix b/pkgs/applications/misc/kdbplus/default.nix
index ffde422c18b3..bf1b77534ce6 100644
--- a/pkgs/applications/misc/kdbplus/default.nix
+++ b/pkgs/applications/misc/kdbplus/default.nix
@@ -8,17 +8,17 @@ let
 in
 stdenv.mkDerivation rec {
   name    = "kdbplus-${version}";
-  version = "3.2";
+  version = "3.3";
 
   src = requireFile {
     message = ''
       Nix can't download kdb+ for you automatically. Go to
       http://kx.com and download the free, 32-bit version for
       Linux. Then run "nix-prefetch-url file:///linux.zip" in the
-      directory where you saved it. Note you need version 3.2.
+      directory where you saved it. Note you need version 3.3.
     '';
     name   = "linux.zip";
-    sha256 = "0ah1kfvxnrck1kg8j7rpzgj6amji62zbm4ya6q55l54gm3qq6q0r";
+    sha256 = "5fd0837599e24f0f437a8314510888a86ab0787684120a8fcf592299800aa940";
   };
 
   dontStrip = true;

From c445ec36cbf241c69f07830d59a28b0942ff8f2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 23 Jan 2016 22:14:41 +0100
Subject: [PATCH 0313/2285] add ipmiview: supermicro ikvm and remote control

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

diff --git a/pkgs/applications/misc/ipmiview/default.nix b/pkgs/applications/misc/ipmiview/default.nix
new file mode 100644
index 000000000000..6a111d48cee4
--- /dev/null
+++ b/pkgs/applications/misc/ipmiview/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, patchelf, makeWrapper, xorg, gcc }:
+
+assert stdenv.isLinux;
+
+stdenv.mkDerivation rec {
+   name = "IPMIView-${version}";
+   version = "20151223";
+
+   src = fetchurl {
+     url = "ftp://ftp.supermicro.com/utility/IPMIView/Linux/IPMIView_V2.11.0_bundleJRE_Linux_x64_${version}.tar.gz";
+     sha256 = "1rv9j0id7i2ipm25n60bpfdm1gj44xg2aj8rnx4s6id3ln90q121";
+   };
+
+   buildInputs = [ patchelf makeWrapper ];
+
+   buildPhase = with xorg; ''
+     patchelf --set-rpath "${libX11}/lib:${libXext}/lib:${libXrender}/lib:${libXtst}/lib:${libXi}/lib" ./jre/lib/amd64/xawt/libmawt.so
+     patchelf --set-rpath "${gcc.cc}/lib" ./libiKVM64.so
+     patchelf --set-rpath "${libXcursor}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${libXtst}/lib:${libXi}/lib" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/javaws
+     patchelf --set-rpath "${gcc.cc}/lib:$out/jre/lib/amd64/jli" --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" ./jre/bin/java
+   '';
+
+   installPhase = ''
+     mkdir -p $out/bin
+     cp -R . $out/
+     echo "$out/jre/bin/java -jar $out/IPMIView20.jar" > $out/bin/IPMIView
+     chmod +x $out/bin/IPMIView
+   '';
+
+   meta = with stdenv.lib; {
+    license = licenses.unfree;
+   };
+  }
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9b96d00a74d..5ceb8ff80d63 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1968,6 +1968,8 @@ let
 
   ipmiutil = callPackage ../tools/system/ipmiutil {};
 
+  ipmiview = callPackage ../applications/misc/ipmiview {};
+
   ipcalc = callPackage ../tools/networking/ipcalc {};
 
   ipv6calc = callPackage ../tools/networking/ipv6calc {};

From 7c4830f3b777b0685c38038122891b9bad3055ee Mon Sep 17 00:00:00 2001
From: Philipp Volguine <phil.volguine@gmail.com>
Date: Sat, 23 Jan 2016 21:17:56 +0000
Subject: [PATCH 0314/2285] Version bump of e1000e driver (2.5.4 -> 3.3.1)

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

diff --git a/pkgs/os-specific/linux/e1000e/default.nix b/pkgs/os-specific/linux/e1000e/default.nix
index db5f88b935fd..0b67a5382f75 100644
--- a/pkgs/os-specific/linux/e1000e/default.nix
+++ b/pkgs/os-specific/linux/e1000e/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, kernel }:
 
 stdenv.mkDerivation {
-  name = "e1000e-2.5.4-${kernel.version}";
+  name = "e1000e-3.3.1-${kernel.version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/e1000/e1000e-2.5.4.tar.gz";
-    sha256 = "0bmihkc7y37jzwi996ryqblnyflyhhbimbnrnmlk419vxlzg1pzi";
+    url = "mirror://sourceforge/e1000/e1000e-3.3.1.tar.gz";
+    sha256 = "07hg6xxqgqshnys1qs9wbl9qr7d4ixdkd1y1fj27cg6bn8s2n797";
   };
 
   configurePhase = ''

From daa188107d7f04d486416faef882958571cc7d23 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 23 Jan 2016 18:24:20 +0100
Subject: [PATCH 0315/2285] perl-if: 0.0601 -> 0.0606

Also, move the package into an attribute called "if" with the old "if_"
attribute referencing the new one.
---
 pkgs/top-level/perl-packages.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1e8dfa91d2d2..70dbec444296 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -5899,14 +5899,22 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  if_ = buildPerlPackage {
-    name = "if-0.0601";
+  "if" = buildPerlPackage rec {
+    name = "if-0.0606";
     src = fetchurl {
-      url = mirror://cpan/authors/id/I/IL/ILYAZ/modules/if-0.0601.tar.gz;
-      sha256 = "fb2b7329aa111a673cd22dc2889167e52058aead0de2fe0855b32dd658d5c1b7";
+      url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
+      sha256 = "63d69282d6c4c9e76370b78d770ca720cea88cfe5ee5b612709240fc6078d50e";
+    };
+    meta = {
+      description = "C<use> a Perl module if a condition holds (also can C<no> a module)";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
   };
 
+  # For backwards compatibility.
+  if_ = self."if";
+
   ImageSize = buildPerlPackage rec {
     name = "Image-Size-3.232";
     src = fetchurl {

From f79c8df3e8f84c86391b9af55ddeca5736b14c84 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 23 Jan 2016 19:01:39 +0100
Subject: [PATCH 0316/2285] perl-CGI: 4.21 -> 4.25

Also add license information and myself as maintainer.
---
 pkgs/top-level/perl-packages.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 70dbec444296..708935b31299 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1415,17 +1415,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  CGI = buildPerlPackage {
-    name = "CGI-4.21";
+  "CGI" = buildPerlPackage rec {
+    name = "CGI-4.25";
     src = fetchurl {
-      url = mirror://cpan/authors/id/L/LE/LEEJO/CGI-4.21.tar.gz;
-      sha256 = "340d20a2b67211752d7c270c589e463d71aea8b8d75d9417250618219d3cf884";
+      url = "mirror://cpan/authors/id/L/LE/LEEJO/${name}.tar.gz";
+      sha256 = "efb3e5235ada6a91f97ca2905399a686bedea60f6b525e52f4a147baff4f131a";
     };
-    propagatedBuildInputs = [ HTMLParser if_ ];
-    doCheck = false;
+    buildInputs = [ TestDeep TestWarn ];
+    propagatedBuildInputs = [ HTMLParser self."if" ];
     meta = {
       homepage = https://metacpan.org/module/CGI;
       description = "Handle Common Gateway Interface requests and responses";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
   };
 

From f53ecf051d2079b4715638357b45db7465216b86 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 23 Jan 2016 21:48:18 +0100
Subject: [PATCH 0317/2285] perl-SubExporterForMethods: 0.100051 -> 0.100052

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 708935b31299..902fb031fd22 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10707,16 +10707,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  SubExporterForMethods = buildPerlPackage {
-    name = "Sub-Exporter-ForMethods-0.100051";
+  "SubExporterForMethods" = buildPerlPackage rec {
+    name = "Sub-Exporter-ForMethods-0.100052";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RJ/RJBS/Sub-Exporter-ForMethods-0.100051.tar.gz;
-      sha256 = "127wniw53p7pp7r2vazicply3v1gmnhw4w7jl6p74i0grnsixipm";
+      url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
+      sha256 = "421fbba4f6ffcf13c4335f2c20630d709e6fa659c07545d094dbc5a558ad3006";
     };
+    buildInputs = [ namespaceautoclean ];
     propagatedBuildInputs = [ SubExporter SubName ];
     meta = {
+      homepage = https://github.com/rjbs/Sub-Exporter-ForMethods;
       description = "Helper routines for using Sub::Exporter to build methods";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
   };
 

From d8b8344b0e0a64be3837ca46b95d944ce5f1a4b8 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 23 Jan 2016 19:03:05 +0100
Subject: [PATCH 0318/2285] perl-MooseXTypes: 0.45 -> 0.46

Also fix license field and add myself as maintainer.
---
 pkgs/top-level/perl-packages.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 902fb031fd22..f000a5653255 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8234,18 +8234,19 @@ let self = _self // overrides; _self = with self; {
       [ ClassMOP Moose namespaceautoclean ListMoreUtils ];
   };
 
-  MooseXTypes = buildPerlPackage {
-    name = "MooseX-Types-0.45";
+  "MooseXTypes" = buildPerlPackage rec {
+    name = "MooseX-Types-0.46";
     src = fetchurl {
-      url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-0.45.tar.gz;
-      sha256 = "d01ff4a3db78e1150101b4b63569e4bce3ced3b5b0024c52c87575e0820609c7";
+      url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
+      sha256 = "e9e8c36284cf1adc6563c980c0a4f0a7df720dbaaece0dd6be66b975dde5db7a";
     };
-    buildInputs = [ ModuleBuildTiny Moose TestFatal TestRequires if_ ];
-    propagatedBuildInputs = [ CarpClan ModuleRuntime Moose SubExporter SubName namespaceautoclean ];
+    buildInputs = [ ModuleBuildTiny Moose TestFatal TestRequires self."if" ];
+    propagatedBuildInputs = [ CarpClan Moose SubExporterForMethods SubName namespaceautoclean ];
     meta = {
       homepage = https://github.com/moose/MooseX-Types;
       description = "Organise your Moose types in libraries";
-      license = "perl";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
   };
 

From 6190c57226b9f93affab244ec89dfc6a3092f4e3 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 23 Jan 2016 19:03:44 +0100
Subject: [PATCH 0319/2285] perl-MooseXTypesCommon: 0.001008 -> 0.001013

Also add some meta data and myself as maintainer.
---
 pkgs/top-level/perl-packages.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index f000a5653255..71d8bd41e422 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8250,17 +8250,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  MooseXTypesCommon = buildPerlPackage rec {
-    name = "MooseX-Types-Common-0.001008";
+  "MooseXTypesCommon" = buildPerlPackage rec {
+    name = "MooseX-Types-Common-0.001013";
     src = fetchurl {
-      url = "mirror://cpan/modules/by-module/MooseX/${name}.tar.gz";
-      sha256 = "0s0z6v32vyykni8an6jzyvl0icr5d5b8kbi4qqp4vwc5438jrpdz";
+      url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
+      sha256 = "ff0c963f5e8304acb5f64bdf9ba1f19284311148e1a8f0d1f81f123f9950f5f2";
     };
-    buildInputs = [ TestFatal ];
-    propagatedBuildInputs = [ Moose MooseXTypes ];
+    buildInputs = [ ModuleBuildTiny TestDeep TestWarnings perl ];
+    propagatedBuildInputs = [ MooseXTypes self."if" ];
     meta = {
-      maintainers = with maintainers; [ ocharles ];
-      platforms   = stdenv.lib.platforms.unix;
+      homepage = https://github.com/moose/MooseX-Types-Common;
+      description = "A library of commonly used type constraints";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = with maintainers; [ ocharles rycee ];
     };
   };
 

From 9bad9c8bf3b22910d7ec0cad0e386ae2ff2adc9a Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <bstaffin@fitbit.com>
Date: Sat, 23 Jan 2016 17:25:49 -0500
Subject: [PATCH 0320/2285] nginx: add statsd to the available modules

---
 pkgs/servers/http/nginx/modules.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index d0d587eb0410..efa84f0fa670 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -108,4 +108,13 @@
     };
     inputs = [ pkgs.pam ];
   };
+
+  statsd = {
+    src = fetchFromGitHub {
+      owner = "zebrafishlabs";
+      repo = "nginx-statsd";
+      rev = "b756a12abf110b9e36399ab7ede346d4bb86d691";
+      sha256 = "1psrb5v071idlplvbnaq904nlhqw1zrbw4aawfs278zcdmq67zn8";
+    };
+  };
 }

From 420bb27a7be8e540ee981ba64931eb704ce52199 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <bstaffin@fitbit.com>
Date: Sat, 23 Jan 2016 17:45:46 -0500
Subject: [PATCH 0321/2285] docs: Mention autoreconfHook in Package Setup Hooks

---
 doc/stdenv.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/doc/stdenv.xml b/doc/stdenv.xml
index bab4a8b292e4..f8d9acb2fb0c 100644
--- a/doc/stdenv.xml
+++ b/doc/stdenv.xml
@@ -1243,6 +1243,14 @@ echo @foo@
     environment variable.</para></listitem>
   </varlistentry>
 
+  <varlistentry>
+    <term>Autoconf</term>
+    <listitem><para>The <varname>autoreconfHook</varname> derivation adds
+    <varname>autoreconfPhase</varname>, which runs autoreconf, libtoolize and
+    automake, essentially preparing the configure script in autotools-based
+    builds.</para></listitem>
+  </varlistentry>
+
   <varlistentry>
     <term>libxml2</term>
     <listitem><para>Adds every file named

From 32d40f0f98e7cb50a979a596d61f757fda4ab27d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 24 Jan 2016 02:02:21 +0100
Subject: [PATCH 0322/2285] Remove no longer (or never) referenced patches

55 files changed, 6041 deletions. Tested with `nix-build -A tarball`.
---
 .../inkscape/configure-python-libs.patch      |  15 -
 .../kdelibs/polkit-install.patch              |  12 -
 .../misc/slic3r/fix-no-display.patch          |  59 --
 .../fribid/emulated-version.patch             |  12 -
 .../mplayerplug-in/icecat3-idldir.patch       |  16 -
 .../freetalk/01_callbacks_const_fix.diff      |  25 -
 .../silc-client/server_setup.patch            |  28 -
 .../sync/lsyncd/configure-a2x-fix.patch       |  18 -
 .../electronics/qucs/tr1-complex.patch        |  10 -
 .../science/logic/isabelle/settings.patch     |  33 -
 .../files/kdelibs-cve-2014-5033.patch         |  36 -
 .../kde-4.14/files/polkit-install.patch       |  12 -
 .../libkscreen/libkscreen-backend-path.patch  | 130 ---
 .../compilers/ecl/libffi-prefix.patch         |  39 -
 .../compilers/ghc/osx-dylib-resolver.patch    |  60 --
 ...a2ccceb98230ff517601ad60aa6bee36e2c4.patch |  40 -
 ...a31c26cc42fee79363a14c4a8f4fcbfffe63.patch |  40 -
 .../0001-work-around-buggy-wcwidth.patch      |  24 -
 .../compilers/openjdk/linux-4.0.patch         |  12 -
 .../coq-modules/ssreflect/threads.patch       |  16 -
 .../patches/regex-tdfa-text.patch             |  21 -
 .../libraries/aterm/aterm-mingw-asm.patch     | 498 ---------
 .../libraries/boost/boost-155-clang.patch     |  90 --
 .../libraries/libedit/freebsd_weak_ref.patch  |  20 -
 .../r-modules/patches/BayesBridge_cblas.patch |   9 -
 .../r-modules/patches/BayesLogit_cblas.patch  |  12 -
 .../r-modules/patches/CARramps.patch          |  12 -
 .../r-modules/patches/WideLM.patch            |  19 -
 pkgs/development/r-modules/patches/rpud.patch |  29 -
 .../tools/boomerang/dlopen_path.patch         |  13 -
 .../build-managers/cmake/2.8.11-cygwin.patch  | 237 -----
 ...nd_openssl_for_openssl-1.0.1m_and_up.patch |  11 -
 .../haskell/ihaskell/use-classy-prelude.patch |  34 -
 .../hedgewars/fix-ghc-7.8-build-failure.diff  |  16 -
 .../kernel-headers/unifdef-getline.patch      |  35 -
 ...bility-patch-for-v5-network-controll.patch | 553 ----------
 ...compatibility-patch-for-v5-interface.patch | 391 -------
 ...fa-backward-compatibility-with-broke.patch |  69 --
 ...Armor-Add-profile-introspection-file.patch | 264 -----
 ...AUCE-AppArmor-basic-networking-rules.patch | 603 -----------
 ...armor-Add-the-ability-to-mediate-mou.patch | 957 ------------------
 pkgs/os-specific/linux/libselinux/fPIC.patch  |  13 -
 .../linux/udisks/cve-2014-0004.patch          |  82 --
 ...D-element-length-before-copying-it-C.patch |  42 -
 ...__glXEnableExtension-to-build-extens.patch |  78 --
 ...C-clipping-problem-in-miPaintWindow-.patch | 165 ---
 ...Revert-fb-changes-that-broke-XQuartz.patch | 316 ------
 .../xorg/darwin/function-pointer-test.patch   |  46 -
 .../ceph/0001-Cleanup-boost-optionals.patch   |  42 -
 pkgs/tools/filesystems/ceph/boost-158.patch   |  27 -
 .../filesystems/ceph/fix-pgrefdebugging.patch |  17 -
 pkgs/tools/misc/debootstrap/subst.patch       | 190 ----
 .../isync/isync-recursice-imap.patch          | 114 ---
 pkgs/tools/networking/mtr/edd425.patch        | 218 ----
 pkgs/tools/networking/ntp/no-openssl.patch    | 161 ---
 55 files changed, 6041 deletions(-)
 delete mode 100644 pkgs/applications/graphics/inkscape/configure-python-libs.patch
 delete mode 100644 pkgs/applications/kde-apps-15.12/kdelibs/polkit-install.patch
 delete mode 100644 pkgs/applications/misc/slic3r/fix-no-display.patch
 delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/fribid/emulated-version.patch
 delete mode 100644 pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/icecat3-idldir.patch
 delete mode 100644 pkgs/applications/networking/instant-messengers/freetalk/01_callbacks_const_fix.diff
 delete mode 100644 pkgs/applications/networking/instant-messengers/silc-client/server_setup.patch
 delete mode 100644 pkgs/applications/networking/sync/lsyncd/configure-a2x-fix.patch
 delete mode 100644 pkgs/applications/science/electronics/qucs/tr1-complex.patch
 delete mode 100644 pkgs/applications/science/logic/isabelle/settings.patch
 delete mode 100644 pkgs/desktops/kde-4.14/files/kdelibs-cve-2014-5033.patch
 delete mode 100644 pkgs/desktops/kde-4.14/files/polkit-install.patch
 delete mode 100644 pkgs/desktops/plasma-5.5/libkscreen/libkscreen-backend-path.patch
 delete mode 100644 pkgs/development/compilers/ecl/libffi-prefix.patch
 delete mode 100644 pkgs/development/compilers/ghc/osx-dylib-resolver.patch
 delete mode 100644 pkgs/development/compilers/hhvm/3918a2ccceb98230ff517601ad60aa6bee36e2c4.patch
 delete mode 100644 pkgs/development/compilers/hhvm/8207a31c26cc42fee79363a14c4a8f4fcbfffe63.patch
 delete mode 100644 pkgs/development/compilers/julia/0001-work-around-buggy-wcwidth.patch
 delete mode 100644 pkgs/development/compilers/openjdk/linux-4.0.patch
 delete mode 100644 pkgs/development/coq-modules/ssreflect/threads.patch
 delete mode 100644 pkgs/development/haskell-modules/patches/regex-tdfa-text.patch
 delete mode 100644 pkgs/development/libraries/aterm/aterm-mingw-asm.patch
 delete mode 100644 pkgs/development/libraries/boost/boost-155-clang.patch
 delete mode 100644 pkgs/development/libraries/libedit/freebsd_weak_ref.patch
 delete mode 100644 pkgs/development/r-modules/patches/BayesBridge_cblas.patch
 delete mode 100644 pkgs/development/r-modules/patches/BayesLogit_cblas.patch
 delete mode 100644 pkgs/development/r-modules/patches/CARramps.patch
 delete mode 100644 pkgs/development/r-modules/patches/WideLM.patch
 delete mode 100644 pkgs/development/r-modules/patches/rpud.patch
 delete mode 100644 pkgs/development/tools/boomerang/dlopen_path.patch
 delete mode 100644 pkgs/development/tools/build-managers/cmake/2.8.11-cygwin.patch
 delete mode 100644 pkgs/development/tools/build-managers/cmake/cmake_find_openssl_for_openssl-1.0.1m_and_up.patch
 delete mode 100644 pkgs/development/tools/haskell/ihaskell/use-classy-prelude.patch
 delete mode 100644 pkgs/games/hedgewars/fix-ghc-7.8-build-failure.diff
 delete mode 100644 pkgs/os-specific/linux/kernel-headers/unifdef-getline.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0002-AppArmor-compatibility-patch-for-v5-interface.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch
 delete mode 100644 pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch
 delete mode 100644 pkgs/os-specific/linux/libselinux/fPIC.patch
 delete mode 100644 pkgs/os-specific/linux/udisks/cve-2014-0004.patch
 delete mode 100644 pkgs/os-specific/linux/wpa_supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
 delete mode 100644 pkgs/servers/x11/xorg/darwin/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch
 delete mode 100644 pkgs/servers/x11/xorg/darwin/0003-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
 delete mode 100644 pkgs/servers/x11/xorg/darwin/0005-fb-Revert-fb-changes-that-broke-XQuartz.patch
 delete mode 100644 pkgs/servers/x11/xorg/darwin/function-pointer-test.patch
 delete mode 100644 pkgs/tools/filesystems/ceph/0001-Cleanup-boost-optionals.patch
 delete mode 100644 pkgs/tools/filesystems/ceph/boost-158.patch
 delete mode 100644 pkgs/tools/filesystems/ceph/fix-pgrefdebugging.patch
 delete mode 100644 pkgs/tools/misc/debootstrap/subst.patch
 delete mode 100644 pkgs/tools/networking/isync/isync-recursice-imap.patch
 delete mode 100644 pkgs/tools/networking/mtr/edd425.patch
 delete mode 100644 pkgs/tools/networking/ntp/no-openssl.patch

diff --git a/pkgs/applications/graphics/inkscape/configure-python-libs.patch b/pkgs/applications/graphics/inkscape/configure-python-libs.patch
deleted file mode 100644
index c79006d33201..000000000000
--- a/pkgs/applications/graphics/inkscape/configure-python-libs.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Work around Python misdetection and set `PYTHON_LIBS' to
-"-L/nix/store/... -lpython2.4" instead of "/nix/store/.../libpython2.4.so".
-Changed to 2.5.
-
---- inkscape-0.45.1/configure	2007-03-20 14:56:43.000000000 +0100
-+++ inkscape-0.45.1/configure	2008-02-22 16:19:10.000000000 +0100
-@@ -10202,7 +10202,7 @@ if test "x$with_python" = "xyes"; then
-     if test "$?" -gt "0"; then
-         with_python="no"
-     else
--        checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '%s/%s %s' % (distutils.sysconfig.get_config_var('LIBPL'),distutils.sysconfig.get_config_var('LDLIBRARY'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
-+        checkPYTHON_LIBS=`python -c "import distutils.sysconfig ; print '-L%s -lpython2.5 %s' % (distutils.sysconfig.get_config_var('LIBDIR'),distutils.sysconfig.get_config_var('LIBS'))" 2>/dev/null`
-         if test "$?" -gt "0"; then
-             with_python="no"
-         else
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/polkit-install.patch b/pkgs/applications/kde-apps-15.12/kdelibs/polkit-install.patch
deleted file mode 100644
index d2ecac663ec5..000000000000
--- a/pkgs/applications/kde-apps-15.12/kdelibs/polkit-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
---- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake	2011-05-20 22:24:54.000000000 +0200
-+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake	2011-07-12 14:03:00.000000000 +0200
-@@ -139,7 +139,7 @@
-         ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
-         ${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
- 
--    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING 
-+    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING 
-         "Where policy files generated by KAuth will be installed" FORCE)
- elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
-     set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
diff --git a/pkgs/applications/misc/slic3r/fix-no-display.patch b/pkgs/applications/misc/slic3r/fix-no-display.patch
deleted file mode 100644
index b5aeca3a4167..000000000000
--- a/pkgs/applications/misc/slic3r/fix-no-display.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff --git a/Build.PL b/Build.PL
-index 8b21c15..fd3aff0 100644
---- a/Build.PL
-+++ b/Build.PL
-@@ -33,9 +33,6 @@ my $sudo    = grep { $_ eq '--sudo' } @ARGV;
- my $gui     = grep { $_ eq '--gui' } @ARGV;
- my $xs_only = grep { $_ eq '--xs' }  @ARGV;
- if ($gui) {
--    %prereqs = qw(
--    Wx                              0.9918
--    );
-     %recommends = qw(
-     Growl::GNTP                     0.15
-     Wx::GLCanvas                    0
-diff --git a/lib/Slic3r/GUI.pm b/lib/Slic3r/GUI.pm
-index 842ff44..ea0af64 100644
---- a/lib/Slic3r/GUI.pm
-+++ b/lib/Slic3r/GUI.pm
-@@ -26,7 +26,7 @@ use Slic3r::GUI::OptionsGroup::Field;
- use Slic3r::GUI::SimpleTab;
- use Slic3r::GUI::Tab;
- 
--our $have_OpenGL = eval "use Slic3r::GUI::PreviewCanvas; 1";
-+our $have_OpenGL = 0;
- 
- use Wx 0.9901 qw(:bitmap :dialog :icon :id :misc :systemsettings :toplevelwindow
-     :filedialog);
-diff --git a/lib/Slic3r/GUI/Plater/2DToolpaths.pm b/lib/Slic3r/GUI/Plater/2DToolpaths.pm
-index 8e48a72..7bed973 100644
---- a/lib/Slic3r/GUI/Plater/2DToolpaths.pm
-+++ b/lib/Slic3r/GUI/Plater/2DToolpaths.pm
-@@ -90,18 +90,20 @@ sub set_z {
- package Slic3r::GUI::Plater::2DToolpaths::Canvas;
- 
- use Wx::Event qw(EVT_PAINT EVT_SIZE EVT_ERASE_BACKGROUND EVT_IDLE EVT_MOUSEWHEEL EVT_MOUSE_EVENTS);
--use OpenGL qw(:glconstants :glfunctions :glufunctions);
--use base qw(Wx::GLCanvas Class::Accessor);
--use Wx::GLCanvas qw(:all);
- use List::Util qw(min first);
- use Slic3r::Geometry qw(scale unscale epsilon);
- 
- __PACKAGE__->mk_accessors(qw(print z layers color init dirty bb));
- 
--# make OpenGL::Array thread-safe
--{
--    no warnings 'redefine';
--    *OpenGL::Array::CLONE_SKIP = sub { 1 };
-+if ($Slic3r::GUI::have_OpenGL) {
-+    use OpenGL qw(:glconstants :glfunctions :glufunctions);
-+    use Wx::GLCanvas qw(:all);
-+    use base qw(Wx::GLCanvas Class::Accessor);
-+    # make OpenGL::Array thread-safe
-+    {
-+        no warnings 'redefine';
-+        *OpenGL::Array::CLONE_SKIP = sub { 1 };
-+    }
- }
- 
- sub new {
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/emulated-version.patch b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/emulated-version.patch
deleted file mode 100644
index f730ad017b1d..000000000000
--- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/emulated-version.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/common/defines.h  2012-11-14 18:02:43.000000000 +0100
-+++ b/common/defines.h  2013-09-20 19:17:45.669290630 +0200
-@@ -39,7 +39,7 @@
- #define RELEASE_TIME        1352912534
- #define IPCVERSION          "10"
- 
--#define EMULATED_VERSION    "4.15.0.14"
-+#define EMULATED_VERSION    "4.17.0.11" // Was 4.15.0.14
- #define DNSVERSION          "2"
- #define STATUSDOMAIN        ".status.fribid.se"
- 
-
diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/icecat3-idldir.patch b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/icecat3-idldir.patch
deleted file mode 100644
index 39dbc7a3ed05..000000000000
--- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/icecat3-idldir.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-We have to run `xpidl', but we need to provide it with the right IDL
-directory.  With GNU IceCat 3 (and possibly Firefox 3), this happens to be
-"$(pkg-config --variable=idldir libxul)/stable".
-
---- mplayerplug-in-3.55/Makefile.in	2008-01-03 01:20:33.000000000 +0100
-+++ mplayerplug-in-3.55/Makefile.in	2008-09-29 22:47:20.000000000 +0200
-@@ -46,7 +46,7 @@ datadir=@datadir@
- LOCALEDIR=$(datadir)/locale
- MOZILLA_HOME=@MOZILLA_HOME@
- GECKO_XPIDL=@GECKO_XPIDL@
--GECKO_IDLDIR=@GECKO_IDLDIR@
-+GECKO_IDLDIR=@GECKO_IDLDIR@/stable
- 
- PIXMAPS=pixmaps/logo.xpm pixmaps/progress_left.xpm pixmaps/progress_right.xpm \
- 	pixmaps/progress_fill.xpm pixmaps/progress_middle.xpm
-
diff --git a/pkgs/applications/networking/instant-messengers/freetalk/01_callbacks_const_fix.diff b/pkgs/applications/networking/instant-messengers/freetalk/01_callbacks_const_fix.diff
deleted file mode 100644
index 5fe871601229..000000000000
--- a/pkgs/applications/networking/instant-messengers/freetalk/01_callbacks_const_fix.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Patch to fix FTBFS due to a modified const in src/callbacks.cc
-Forwarded: yes
-Origin: Ubuntu,
-https://bugs.launchpad.net/ubuntu/+source/freetalk/+bug/443241
-Bug-Debian: http://bugs.debian.org/560535
-Author: Jon Bernard <bernardj@gmail.com>
---- 3.2-1.orig/src/callbacks.cc	2008-11-15 10:41:22.000000000 +0000
-+++ 3.2-1/src/callbacks.cc	2009-10-21 15:50:49.000000000 +0100
-@@ -116,13 +116,13 @@ ft_msg_msg_handler (LmMessageHandler *ha
- 		    LmMessage *msg, gpointer user_data)
- {
-   LmMessageNode *root, *body, *x;
--  const char *from, *msg_str, *type;
--  char *ts = NULL;
-+  const char *msg_str, *type;
-+  char *from, *ts = NULL;
- 
-   root = lm_message_get_node (msg);
-   body = lm_message_node_get_child (root, "body");
- 
--  from = lm_message_node_get_attribute (msg->node, "from");
-+  from = (char *) lm_message_node_get_attribute (msg->node, "from");
- 
-   /* since the file-transfer happens in-band with messages, we can no longer
-    * ignore messages with no 'body' */
diff --git a/pkgs/applications/networking/instant-messengers/silc-client/server_setup.patch b/pkgs/applications/networking/instant-messengers/silc-client/server_setup.patch
deleted file mode 100644
index 466194c0a8fe..000000000000
--- a/pkgs/applications/networking/instant-messengers/silc-client/server_setup.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Add function to replace the behaviour of server_setup_find_port which was removed from irssi on revision 5125. Fixes bug #577501.
---- a/apps/irssi/src/silc/core/client_ops.c
-+++ b/apps/irssi/src/silc/core/client_ops.c
-@@ -2790,6 +2790,15 @@
-   silc_free(a);
- }
- 
-+/* helper function to emulate server_setup_find_port */
-+static SERVER_SETUP_REC *silc_server_setup_find_port(const char *address,
-+						     int port) {
-+  SERVER_SETUP_REC *rec;
-+
-+  rec = server_setup_find(address, port, NULL);
-+  return (rec == NULL || rec->port != port) ? NULL : rec;
-+}
-+
- /* Find authentication data by hostname and port. The hostname may be IP
-    address as well.*/
- 
-@@ -2811,7 +2820,7 @@
- 
-   /* Check whether we find the password for this server in our
-      configuration.  If it's set, always send it server. */
--  setup = server_setup_find_port(hostname, port);
-+  setup = silc_server_setup_find_port(hostname, port);
-   if (setup && setup->password) {
-     completion(SILC_AUTH_PASSWORD, setup->password, strlen(setup->password),
- 	       context);
diff --git a/pkgs/applications/networking/sync/lsyncd/configure-a2x-fix.patch b/pkgs/applications/networking/sync/lsyncd/configure-a2x-fix.patch
deleted file mode 100644
index 73b479946918..000000000000
--- a/pkgs/applications/networking/sync/lsyncd/configure-a2x-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -aur lsyncd-release-2.1.5.orig/configure.ac lsyncd-release-2.1.5/configure.ac
---- lsyncd-release-2.1.5.orig/configure.ac	2013-06-07 18:24:02.000000000 +0600
-+++ lsyncd-release-2.1.5/configure.ac	2014-03-04 13:24:15.390350812 +0600
-@@ -15,10 +15,10 @@
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
- 
--#AC_PATH_PROG([A2X], [a2x], [no])
--#if test x${A2X} = xno ; then
--#	AC_MSG_ERROR([Program 'a2x' (package asciidoc) is required])
--#fi
-+AC_PATH_PROG([A2X], [a2x], [no])
-+if test x${A2X} = xno ; then
-+	AC_MSG_ERROR([Program 'a2x' (package asciidoc) is required])
-+fi
- 
- ###
- # Checks for Lua
\ No newline at end of file
diff --git a/pkgs/applications/science/electronics/qucs/tr1-complex.patch b/pkgs/applications/science/electronics/qucs/tr1-complex.patch
deleted file mode 100644
index 0be7ae00eb95..000000000000
--- a/pkgs/applications/science/electronics/qucs/tr1-complex.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- qucs-core/configure.orig	2011-07-03 07:34:09.069218113 -0500
-+++ qucs-core/configure	2011-07-03 07:34:46.618990497 -0500
-@@ -5884,7 +5884,6 @@
- 
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
--#include <tr1/complex>
- using namespace std;
- using namespace std::tr1;
- int
diff --git a/pkgs/applications/science/logic/isabelle/settings.patch b/pkgs/applications/science/logic/isabelle/settings.patch
deleted file mode 100644
index bf509a4bac46..000000000000
--- a/pkgs/applications/science/logic/isabelle/settings.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Nuar Isabelle2011/etc/settings Isabelle2011-fix/etc/settings
---- Isabelle2011/etc/settings	2011-01-30 13:02:18.000000000 +0100
-+++ Isabelle2011-fix/etc/settings	2011-05-14 22:56:04.000000000 +0200
-@@ -17,13 +17,7 @@
- 
- # Poly/ML 5.x (automated settings)
- ML_PLATFORM="$ISABELLE_PLATFORM"
--ML_HOME="$(choosefrom \
--  "$ISABELLE_HOME/contrib/polyml/$ML_PLATFORM" \
--  "$ISABELLE_HOME/../polyml/$ML_PLATFORM" \
--  "/usr/local/polyml/$ML_PLATFORM" \
--  "/usr/share/polyml/$ML_PLATFORM" \
--  "/opt/polyml/$ML_PLATFORM" \
--  "")"
-+ML_HOME=@ML_HOME@
- ML_SYSTEM=$("$ISABELLE_HOME/lib/scripts/polyml-version")
- ML_OPTIONS="-H 200"
- ML_SOURCES="$ML_HOME/../src"
-@@ -175,13 +169,7 @@
- ###
- 
- # Proof General home, look in a variety of places
--PROOFGENERAL_HOME="$(choosefrom \
--  "$ISABELLE_HOME/contrib/ProofGeneral" \
--  "$ISABELLE_HOME/../ProofGeneral" \
--  "/usr/local/ProofGeneral" \
--  "/usr/share/ProofGeneral" \
--  "/opt/ProofGeneral" \
--  "")"
-+PROOFGENERAL_HOME=@PROOFGENERAL_HOME@
- 
- PROOFGENERAL_OPTIONS=""
- #PROOFGENERAL_OPTIONS="-m no_brackets -m no_type_brackets"
diff --git a/pkgs/desktops/kde-4.14/files/kdelibs-cve-2014-5033.patch b/pkgs/desktops/kde-4.14/files/kdelibs-cve-2014-5033.patch
deleted file mode 100644
index c85eccd6beb6..000000000000
--- a/pkgs/desktops/kde-4.14/files/kdelibs-cve-2014-5033.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
-+++ b/kdecore/auth/backends/polkit-1/Polkit1Backend.cpp
-@@ -144,7 +144,7 @@
- 
- Action::AuthStatus Polkit1Backend::actionStatus(const QString &action)
- {
--    PolkitQt1::UnixProcessSubject subject(QCoreApplication::applicationPid());
-+    PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID()));
-     PolkitQt1::Authority::Result r = PolkitQt1::Authority::instance()->checkAuthorizationSync(action, subject,
-                                                                                               PolkitQt1::Authority::None);
-     switch (r) {
-@@ -160,21 +160,12 @@
- 
- QByteArray Polkit1Backend::callerID() const
- {
--    QByteArray a;
--    QDataStream s(&a, QIODevice::WriteOnly);
--    s << QCoreApplication::applicationPid();
--
--    return a;
-+    return QDBusConnection::systemBus().baseService().toUtf8();
- }
- 
- bool Polkit1Backend::isCallerAuthorized(const QString &action, QByteArray callerID)
- {
--    QDataStream s(&callerID, QIODevice::ReadOnly);
--    qint64 pid;
--
--    s >> pid;
--
--    PolkitQt1::UnixProcessSubject subject(pid);
-+    PolkitQt1::SystemBusNameSubject subject(QString::fromUtf8(callerID));
-     PolkitQt1::Authority *authority = PolkitQt1::Authority::instance();
- 
-     PolkitResultEventLoop e;
-
diff --git a/pkgs/desktops/kde-4.14/files/polkit-install.patch b/pkgs/desktops/kde-4.14/files/polkit-install.patch
deleted file mode 100644
index d2ecac663ec5..000000000000
--- a/pkgs/desktops/kde-4.14/files/polkit-install.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake
---- kdelibs-4.6.90-orig/kdecore/auth/ConfigureChecks.cmake	2011-05-20 22:24:54.000000000 +0200
-+++ kdelibs-4.6.90/kdecore/auth/ConfigureChecks.cmake	2011-07-12 14:03:00.000000000 +0200
-@@ -139,7 +139,7 @@
-         ${CMAKE_INSTALL_PREFIX} _KDE4_AUTH_POLICY_FILES_INSTALL_DIR
-         ${POLKITQT-1_POLICY_FILES_INSTALL_DIR})
- 
--    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR ${_KDE4_AUTH_POLICY_FILES_INSTALL_DIR} CACHE STRING 
-+    set(KDE4_AUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions" CACHE STRING 
-         "Where policy files generated by KAuth will be installed" FORCE)
- elseif(KDE4_AUTH_BACKEND_NAME STREQUAL "FAKE")
-     set (KAUTH_COMPILING_FAKE_BACKEND TRUE)
diff --git a/pkgs/desktops/plasma-5.5/libkscreen/libkscreen-backend-path.patch b/pkgs/desktops/plasma-5.5/libkscreen/libkscreen-backend-path.patch
deleted file mode 100644
index d5797924d233..000000000000
--- a/pkgs/desktops/plasma-5.5/libkscreen/libkscreen-backend-path.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 460022f..422a708 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -1,5 +1,7 @@
- include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES})
- 
-+configure_file(config-libkscreen.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-libkscreen.h)
-+
- set(libkscreen_SRCS
-     backendloader.cpp
-     config.cpp
-diff --git a/src/backendloader.cpp b/src/backendloader.cpp
-index b93e469..8aebc14 100644
---- a/src/backendloader.cpp
-+++ b/src/backendloader.cpp
-@@ -16,6 +16,7 @@
-  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA       *
-  *************************************************************************************/
- 
-+#include "config-libkscreen.h"
- #include "backendloader.h"
- #include "debug_p.h"
- #include "backends/abstractbackend.h"
-@@ -40,55 +41,54 @@ bool BackendLoader::init()
-     const QString backend = qgetenv("KSCREEN_BACKEND").constData();
-     const QString backendFilter = QString::fromLatin1("KSC_%1*").arg(backend);
- 
--    const QStringList paths = QCoreApplication::libraryPaths();
--    Q_FOREACH (const QString &path, paths) {
--        const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"),
--                       backendFilter,
--                       QDir::SortFlags(QDir::QDir::NoSort),
--                       QDir::NoDotAndDotDot | QDir::Files);
--        const QFileInfoList finfos = dir.entryInfoList();
--        Q_FOREACH (const QFileInfo &finfo, finfos) {
--            // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND
--            if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) {
--                continue;
--            }
-+    QString path = QFile::decodeName(CMAKE_INSTALL_PREFIX "/" PLUGIN_INSTALL_DIR "/");
- 
--            // When on X11, skip the QScreen backend, instead use the XRandR backend,
--            // if not specified in KSCREEN_BACKEND
--            if (backend.isEmpty() &&
--                    finfo.fileName().contains(QLatin1String("KSC_QScreen")) &&
--                    QX11Info::isPlatformX11()) {
--                continue;
--            }
-+    const QDir dir(path + QDir::separator() + QLatin1String("/kf5/kscreen/"),
-+                   backendFilter,
-+                   QDir::SortFlags(QDir::QDir::NoSort),
-+                   QDir::NoDotAndDotDot | QDir::Files);
-+    const QFileInfoList finfos = dir.entryInfoList();
-+    Q_FOREACH (const QFileInfo &finfo, finfos) {
-+        // Skip "Fake" backend unless explicitly specified via KSCREEN_BACKEND
-+        if (backend.isEmpty() && finfo.fileName().contains(QLatin1String("KSC_Fake"))) {
-+            continue;
-+        }
- 
--            // When not on X11, skip the XRandR backend, and fall back to QSCreen
--            // if not specified in KSCREEN_BACKEND
--            if (backend.isEmpty() &&
--                    finfo.fileName().contains(QLatin1String("KSC_XRandR")) &&
--                    !QX11Info::isPlatformX11()) {
--                continue;
--            }
-+        // When on X11, skip the QScreen backend, instead use the XRandR backend,
-+        // if not specified in KSCREEN_BACKEND
-+        if (backend.isEmpty() &&
-+                finfo.fileName().contains(QLatin1String("KSC_QScreen")) &&
-+                QX11Info::isPlatformX11()) {
-+            continue;
-+        }
-+
-+        // When not on X11, skip the XRandR backend, and fall back to QSCreen
-+        // if not specified in KSCREEN_BACKEND
-+        if (backend.isEmpty() &&
-+                finfo.fileName().contains(QLatin1String("KSC_XRandR")) &&
-+                !QX11Info::isPlatformX11()) {
-+            continue;
-+        }
- 
--            QPluginLoader loader(finfo.filePath());
--            loader.load();
--            QObject *instance = loader.instance();
--            if (!instance) {
-+        QPluginLoader loader(finfo.filePath());
-+        loader.load();
-+        QObject *instance = loader.instance();
-+        if (!instance) {
-+            loader.unload();
-+            continue;
-+        }
-+
-+        s_backend = qobject_cast< AbstractBackend* >(instance);
-+        if (s_backend) {
-+            if (!s_backend->isValid()) {
-+                qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend";
-+                delete s_backend;
-+                s_backend = 0;
-                 loader.unload();
-                 continue;
-             }
--
--            s_backend = qobject_cast< AbstractBackend* >(instance);
--            if (s_backend) {
--                if (!s_backend->isValid()) {
--                    qCDebug(KSCREEN) << "Skipping" << s_backend->name() << "backend";
--                    delete s_backend;
--                    s_backend = 0;
--                    loader.unload();
--                    continue;
--                }
--                qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend";
--                return true;
--            }
-+            qCDebug(KSCREEN) << "Loading" << s_backend->name() << "backend";
-+            return true;
-         }
-     }
- 
-diff --git a/src/config-libkscreen.h.cmake b/src/config-libkscreen.h.cmake
-new file mode 100644
-index 0000000..a99f3d1
---- /dev/null
-+++ b/src/config-libkscreen.h.cmake
-@@ -0,0 +1,2 @@
-+#define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}"
-+#define PLUGIN_INSTALL_DIR "${PLUGIN_INSTALL_DIR}"
diff --git a/pkgs/development/compilers/ecl/libffi-prefix.patch b/pkgs/development/compilers/ecl/libffi-prefix.patch
deleted file mode 100644
index d02cc214f31f..000000000000
--- a/pkgs/development/compilers/ecl/libffi-prefix.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/src/configure.in b/src/configure.in
-index 434da49..642c66c 100644
---- ecl-15.3.7.orig/src/configure.ac
-+++ ecl-15.3.7/src/configure.ac
-@@ -191,6 +191,11 @@ AC_ARG_WITH(dffi,
-                   [(system|included|auto|no, default=AUTO if libffi available)]),
-   [enable_libffi=${withval}], [enable_libffi=auto])
- 
-+AC_ARG_WITH(libffi-prefix,
-+  AS_HELP_STRING( [--with-libffi-prefix=path],
-+                  [prefix for system LIBFFI includes and libraries] ),
-+  [LIBFFI_INCDIR="$withval/include"; LIBFFI_LIBDIR="$withval/lib"], [])
-+
- AC_ARG_WITH(fpe,
-   AS_HELP_STRING( [--with-fpe],
-                   [detect floating point exceptions]
-@@ -368,6 +373,22 @@ else
-   INFOEXT=info
- fi
- 
-+dnl libffi
-+
-+if test "x$LIBFFI_INCDIR" != "x"; then
-+  LIBFFI_CPPFLAGS="-I$LIBFFI_INCDIR"
-+fi
-+if test "x$LIBFFI_LIBDIR" != "x"; then
-+  LIBFFI_LDFLAGS="-L$LIBFFI_LIBDIR"
-+  if test "$enable_rpath" = "yes"; then
-+    if (echo "$ECL_LDRPATH" | grep '~A') > /dev/null; then
-+      LIBFFI_LDFLAGS=`echo $ECL_LDRPATH | sed "s,~A,$LIBFFI_LIBDIR,"`" $LIBFFI_LDFLAGS"
-+    fi
-+  fi
-+fi
-+CPPFLAGS="$CPPFLAGS $LIBFFI_CPPFLAGS"
-+LDFLAGS="$LDFLAGS $LIBFFI_LDFLAGS"
-+
- dnl ======================================================================
- dnl GNU multiprecision library
- dnl
diff --git a/pkgs/development/compilers/ghc/osx-dylib-resolver.patch b/pkgs/development/compilers/ghc/osx-dylib-resolver.patch
deleted file mode 100644
index 50236026031e..000000000000
--- a/pkgs/development/compilers/ghc/osx-dylib-resolver.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/compiler/ghci/Linker.hs b/compiler/ghci/Linker.hs
---- a/compiler/ghci/Linker.hs
-+++ b/compiler/ghci/Linker.hs
-@@ -119,9 +119,9 @@
-         -- that is really important
-         pkgs_loaded :: ![PackageKey],
- 
--        -- we need to remember the name of the last temporary DLL/.so
--        -- so we can link it
--        last_temp_so :: !(Maybe (FilePath, String)) }
-+        -- we need to remember the name of previous temporary DLL/.so
-+        -- libraries so we can link them (see #10322)
-+        temp_sos :: ![(FilePath, String)] }
- 
- 
- emptyPLS :: DynFlags -> PersistentLinkerState
-@@ -131,7 +131,7 @@
-                         pkgs_loaded = init_pkgs,
-                         bcos_loaded = [],
-                         objs_loaded = [],
--                        last_temp_so = Nothing }
-+                        temp_sos = [] }
- 
-   -- Packages that don't need loading, because the compiler
-   -- shares them with the interpreted program.
-@@ -841,19 +841,19 @@
-         dflags2 = dflags1 {
-                       -- We don't want the original ldInputs in
-                       -- (they're already linked in), but we do want
--                      -- to link against the previous dynLoadObjs
--                      -- library if there was one, so that the linker
-+                      -- to link against previous dynLoadObjs
-+                      -- libraries if there were any, so that the linker
-                       -- can resolve dependencies when it loads this
-                       -- library.
-                       ldInputs =
--                        case last_temp_so pls of
--                          Nothing -> []
--                          Just (lp, l)  ->
-+                        concatMap
-+                            (\(lp, l) ->
-                                  [ Option ("-L" ++ lp)
-                                  , Option ("-Wl,-rpath")
-                                  , Option ("-Wl," ++ lp)
-                                  , Option ("-l" ++  l)
--                                 ],
-+                                 ])
-+                            (temp_sos pls),
-                       -- Even if we're e.g. profiling, we still want
-                       -- the vanilla dynamic libraries, so we set the
-                       -- ways / build tag to be just WayDyn.
-@@ -868,7 +868,7 @@
-     consIORef (filesToNotIntermediateClean dflags) soFile
-     m <- loadDLL soFile
-     case m of
--        Nothing -> return pls { last_temp_so = Just (libPath, libName) }
-+        Nothing -> return pls { temp_sos = (libPath, libName) : temp_sos pls }
-         Just err -> panic ("Loading temp shared object failed: " ++ err)
- 
- rmDupLinkables :: [Linkable]    -- Already loaded
diff --git a/pkgs/development/compilers/hhvm/3918a2ccceb98230ff517601ad60aa6bee36e2c4.patch b/pkgs/development/compilers/hhvm/3918a2ccceb98230ff517601ad60aa6bee36e2c4.patch
deleted file mode 100644
index 8ee5b31925f8..000000000000
--- a/pkgs/development/compilers/hhvm/3918a2ccceb98230ff517601ad60aa6bee36e2c4.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 3918a2ccceb98230ff517601ad60aa6bee36e2c4 Mon Sep 17 00:00:00 2001
-From: Alex Malyshev <alexanderm@fb.com>
-Date: Tue, 28 Oct 2014 15:55:34 -0700
-Subject: [PATCH] Replace use of MAX macro with std::max in ZendPack
-
-Summary: This has randomly bitten me in open source builds. I intermittently get
-an error saying that MAX isn't defined.
-
-Instead of trying to figure out what's going on, I'm just gonna switch
-it to std::max.
-
-Reviewed By: @paulbiss
-
-Differential Revision: D1636740
----
- hphp/runtime/base/zend-pack.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/hphp/runtime/base/zend-pack.cpp b/hphp/runtime/base/zend-pack.cpp
-index d878ea4..c3ee14d 100644
---- a/hphp/runtime/base/zend-pack.cpp
-+++ b/hphp/runtime/base/zend-pack.cpp
-@@ -21,6 +21,8 @@
- #include "hphp/runtime/base/builtin-functions.h"
- #include "hphp/util/tiny-vector.h"
- 
-+#include <algorithm>
-+
- namespace HPHP {
- 
- #define INC_OUTPUTPOS(a,b)                                              \
-@@ -294,7 +296,7 @@ Variant ZendPack::pack(const String& fmt, const Array& argv) {
-     case 'a':
-     case 'A':
-     case 'Z': {
--      int arg_cp = (code != 'Z') ? arg : MAX(0, arg - 1);
-+      int arg_cp = (code != 'Z') ? arg : std::max(0, arg - 1);
-       memset(&output[outputpos], (code != 'A') ? '\0' : ' ', arg);
-       val = argv[currentarg++].toString();
-       s = val.c_str();
diff --git a/pkgs/development/compilers/hhvm/8207a31c26cc42fee79363a14c4a8f4fcbfffe63.patch b/pkgs/development/compilers/hhvm/8207a31c26cc42fee79363a14c4a8f4fcbfffe63.patch
deleted file mode 100644
index f7cf29b739f0..000000000000
--- a/pkgs/development/compilers/hhvm/8207a31c26cc42fee79363a14c4a8f4fcbfffe63.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8207a31c26cc42fee79363a14c4a8f4fcbfffe63 Mon Sep 17 00:00:00 2001
-From: Jordan DeLong <jdelong@fb.com>
-Date: Mon, 6 Oct 2014 18:30:28 -0700
-Subject: [PATCH] Remove some MIN/MAX macro uses in the emitter
-
-Summary: <algorithm> has preferable type-safe versions that don't double-eval
-their args.
-
-Reviewed By: @paulbiss
-
-Differential Revision: D1599803
----
- hphp/compiler/analysis/emitter.cpp | 6 +++---
- hphp/util/compatibility.h          | 4 ----
- 2 files changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/hphp/compiler/analysis/emitter.cpp b/hphp/compiler/analysis/emitter.cpp
-index 321e637..b1d3f2d 100644
---- a/hphp/compiler/analysis/emitter.cpp
-+++ b/hphp/compiler/analysis/emitter.cpp
-@@ -799,8 +799,8 @@ void SymbolicStack::push(char sym) {
-   if (sym != StackSym::W && sym != StackSym::K && sym != StackSym::L &&
-       sym != StackSym::T && sym != StackSym::I && sym != StackSym::H) {
-     m_actualStack.push_back(m_symStack.size());
--    *m_actualStackHighWaterPtr = MAX(*m_actualStackHighWaterPtr,
--                                     (int)m_actualStack.size());
-+    *m_actualStackHighWaterPtr = std::max(*m_actualStackHighWaterPtr,
-+                                          (int)m_actualStack.size());
-   }
-   m_symStack.push_back(SymEntry(sym));
- }
-@@ -1010,7 +1010,7 @@ int SymbolicStack::sizeActual() const {
- 
- void SymbolicStack::pushFDesc() {
-   m_fdescCount += kNumActRecCells;
--  *m_fdescHighWaterPtr = MAX(*m_fdescHighWaterPtr, m_fdescCount);
-+  *m_fdescHighWaterPtr = std::max(*m_fdescHighWaterPtr, m_fdescCount);
- }
- 
- void SymbolicStack::popFDesc() {
diff --git a/pkgs/development/compilers/julia/0001-work-around-buggy-wcwidth.patch b/pkgs/development/compilers/julia/0001-work-around-buggy-wcwidth.patch
deleted file mode 100644
index 7c4870fb2a89..000000000000
--- a/pkgs/development/compilers/julia/0001-work-around-buggy-wcwidth.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From b9070aeab0ab672ffe321089631f9afe263b0caa Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Thu, 4 Jun 2015 12:03:32 -0500
-Subject: [PATCH] work around buggy wcwidth
-
----
- test/unicode.jl | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/test/unicode.jl b/test/unicode.jl
-index 52c3e6a..f1ef698 100644
---- a/test/unicode.jl
-+++ b/test/unicode.jl
-@@ -103,5 +103,6 @@ end
- 
- # handling of embedded NUL chars (#10958)
- @test length("\0w") == length("\0α") == 2
--@test strwidth("\0w") == strwidth("\0α") == 1
-+@test strwidth("\0w") == charwidth('\0') + charwidth('w')
-+@test strwidth("\0α") == charwidth('\0') + charwidth('α')
- @test normalize_string("\0W", casefold=true) == "\0w"
--- 
-2.4.1
-
diff --git a/pkgs/development/compilers/openjdk/linux-4.0.patch b/pkgs/development/compilers/openjdk/linux-4.0.patch
deleted file mode 100644
index c3d7cf8b6ca5..000000000000
--- a/pkgs/development/compilers/openjdk/linux-4.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur openjdk-7u65-b32/hotspot/make/linux/Makefile openjdk-7u65-b32-patch/hotspot/make/linux/Makefile
---- openjdk-7u65-b32/hotspot/make/linux/Makefile	2014-07-17 03:08:38.000000000 -0700
-+++ openjdk-7u65-b32-patch/hotspot/make/linux/Makefile	2015-04-21 05:33:12.170190385 -0700
-@@ -231,7 +231,7 @@
- # Solaris 2.5.1, 2.6).
- # Disable this check by setting DISABLE_HOTSPOT_OS_VERSION_CHECK=ok.
- 
--SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3%
-+SUPPORTED_OS_VERSION = 2.4% 2.5% 2.6% 3% 4%
- OS_VERSION := $(shell uname -r)
- EMPTY_IF_NOT_SUPPORTED = $(filter $(SUPPORTED_OS_VERSION),$(OS_VERSION))
- 
diff --git a/pkgs/development/coq-modules/ssreflect/threads.patch b/pkgs/development/coq-modules/ssreflect/threads.patch
deleted file mode 100644
index d60a645f6ee8..000000000000
--- a/pkgs/development/coq-modules/ssreflect/threads.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- a/Make  2015-04-20 13:37:06.000000000 +0200
-+++ b/Make  2015-04-25 11:32:53.885194600 +0200
-@@ -1,9 +1,9 @@
- ### Uncomment for static linking
- ##
--#-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -opt -o bin/ssrcoq src/ssrmatching.cmx src/ssreflect.cmx" "src/ssrmatching.cmx src/ssreflect.cmx" bin/ssrcoq
--#-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -o bin/ssrcoq.byte src/ssrmatching.cmo src/ssreflect.cmo" "src/ssrmatching.cmo src/ssreflect.cmo" bin/ssrcoq.byte
--#-custom "$(SSRCOQ) $(COQFLAGS) -compile $*" "%.v $(SSRCOQ)" "%.vo"
--#SSRCOQ = bin/ssrcoq
-+-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -opt -o bin/ssrcoq -I +threads src/ssrmatching.cmx src/ssreflect.cmx" "src/ssrmatching.cmx src/ssreflect.cmx" bin/ssrcoq
-+-custom "$(COQBIN)coqmktop -coqlib `$(COQBIN)coqtop -where` -o bin/ssrcoq.byte -I +threads src/ssrmatching.cmo src/ssreflect.cmo" "src/ssrmatching.cmo src/ssreflect.cmo" bin/ssrcoq.byte
-+-custom "$(SSRCOQ) $(COQFLAGS) -compile $*" "%.v $(SSRCOQ)" "%.vo"
-+SSRCOQ = bin/ssrcoq
- ##
-
- ## What follows should be left untouched by the final user of ssreflect
diff --git a/pkgs/development/haskell-modules/patches/regex-tdfa-text.patch b/pkgs/development/haskell-modules/patches/regex-tdfa-text.patch
deleted file mode 100644
index ef349b1cb641..000000000000
--- a/pkgs/development/haskell-modules/patches/regex-tdfa-text.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- regex-tdfa-text-1.0.0.2/Text/Regex/TDFA/Text/Lazy.orig.hs	2015-08-05 20:30:01.228983428 +0100
-+++ regex-tdfa-text-1.0.0.2/Text/Regex/TDFA/Text/Lazy.hs	2015-08-05 20:39:25.682563005 +0100
-@@ -26,7 +26,7 @@
- import Data.Array.IArray((!),elems,amap)
- import qualified Data.Text.Lazy as L(Text,empty,take,drop,uncons,unpack)
-
--import Text.Regex.Base(MatchArray,RegexContext(..),Extract(..),RegexMaker(..),RegexLike(..))
-+import Text.Regex.Base(MatchText,MatchArray,RegexContext(..),Extract(..),RegexMaker(..),RegexLike(..))
- import Text.Regex.Base.Impl(polymatch,polymatchM)
- import Text.Regex.TDFA.ReadRegex(parseRegex)
- import Text.Regex.TDFA.String() -- piggyback on RegexMaker for String
-@@ -74,7 +74,8 @@
-                ,after (o+l) source))
-          (matchOnce regex source)
-   matchAllText regex source =
--    let go i _ _ | i `seq` False = undefined
-+    let go :: Int -> L.Text -> [MatchArray] -> [MatchText L.Text]
-+        go i _ _ | i `seq` False = undefined
-         go _i _t [] = []
-         go i t (x:xs) =
-           let (off0,len0) = x!0
diff --git a/pkgs/development/libraries/aterm/aterm-mingw-asm.patch b/pkgs/development/libraries/aterm/aterm-mingw-asm.patch
deleted file mode 100644
index ce09ead90429..000000000000
--- a/pkgs/development/libraries/aterm/aterm-mingw-asm.patch
+++ /dev/null
@@ -1,498 +0,0 @@
-diff -rc aterm-2.8/aterm/gc.c aterm-2.8-new/aterm/gc.c
-*** aterm-2.8/aterm/gc.c	2008-11-10 13:54:22.000000000 +0100
---- aterm-2.8-new/aterm/gc.c	2010-08-23 17:04:56.000000000 +0200
-***************
-*** 260,317 ****
-    AFun oddSym;
-  #endif
-  
-- #ifdef WIN32
-- 
--   unsigned int r_eax, r_ebx, r_ecx, r_edx, \
--     r_esi, r_edi, r_esp, r_ebp;
--   ATerm reg[8], real_term;
-- 
--   __asm {
--       /* Get the registers into local variables to check them
--          for aterms later. */
--     mov r_eax, eax
--       mov r_ebx, ebx
--       mov r_ecx, ecx
--       mov r_edx, edx
--       mov r_esi, esi
--       mov r_edi, edi
--       mov r_esp, esp
--       mov r_ebp, ebp
--       }
--     /* Put the register-values into an array */
--   reg[0] = (ATerm) r_eax;
--   reg[1] = (ATerm) r_ebx;
--   reg[2] = (ATerm) r_ecx;
--   reg[3] = (ATerm) r_edx;
--   reg[4] = (ATerm) r_esi;
--   reg[5] = (ATerm) r_edi;
--   reg[6] = (ATerm) r_esp;
--   reg[7] = (ATerm) r_ebp;
-- 
--   for(i=0; i<8; i++) {
--     real_term = AT_isInsideValidTerm(reg[i]);
--     if (real_term != NULL) {
--       AT_markTerm(real_term);
--     }
--     if (AT_isValidSymbol((Symbol)reg[i])) {
--       AT_markSymbol((Symbol)reg[i]);
--     }
--   }
-- 
--     /* The register variables are on the stack aswell
--        I set them to zero so they won't be processed again when
--        the stack is traversed. The reg-array is also in the stack
--        but that will be adjusted later */
--   r_eax = 0;
--   r_ebx = 0;
--   r_ecx = 0;
--   r_edx = 0;
--   r_esi = 0;
--   r_edi = 0;
--   r_esp = 0;
--   r_ebp = 0;
-- 
-- #else
-    jmp_buf env;
-  
-    /* Traverse possible register variables */
---- 260,265 ----
-***************
-*** 320,326 ****
-    start = (ATerm *)((char *)env);
-    stop  = ((ATerm *)(((char *)env) + sizeof(jmp_buf)));
-    mark_memory(start, stop);
-- #endif
-  
-    stackTop = stack_top();
-  
---- 268,273 ----
-***************
-*** 385,442 ****
-    AFun oddSym;
-  #endif
-  
-- #ifdef WIN32
-- 
--   unsigned int r_eax, r_ebx, r_ecx, r_edx, \
--     r_esi, r_edi, r_esp, r_ebp;
--   ATerm reg[8], real_term;
-- 
--   __asm {
--       /* Get the registers into local variables to check them
--          for aterms later. */
--     mov r_eax, eax
--       mov r_ebx, ebx
--       mov r_ecx, ecx
--       mov r_edx, edx
--       mov r_esi, esi
--       mov r_edi, edi
--       mov r_esp, esp
--       mov r_ebp, ebp
--       }
--     /* Put the register-values into an array */
--   reg[0] = (ATerm) r_eax;
--   reg[1] = (ATerm) r_ebx;
--   reg[2] = (ATerm) r_ecx;
--   reg[3] = (ATerm) r_edx;
--   reg[4] = (ATerm) r_esi;
--   reg[5] = (ATerm) r_edi;
--   reg[6] = (ATerm) r_esp;
--   reg[7] = (ATerm) r_ebp;
-- 
--   for(i=0; i<8; i++) {
--     real_term = AT_isInsideValidTerm(reg[i]);
--     if (real_term != NULL) {
--       AT_markTerm_young(real_term);
--     }
--     if (AT_isValidSymbol((Symbol)reg[i])) {
--        AT_markSymbol_young((Symbol)reg[i]);
--     }
--   }
-- 
--     /* The register variables are on the stack aswell
--        I set them to zero so they won't be processed again when
--        the stack is traversed. The reg-array is also in the stack
--        but that will be adjusted later */
--   r_eax = 0;
--   r_ebx = 0;
--   r_ecx = 0;
--   r_edx = 0;
--   r_esi = 0;
--   r_edi = 0;
--   r_esp = 0;
--   r_ebp = 0;
-- 
-- #else
-    jmp_buf env;
-  
-      /* Traverse possible register variables */
---- 332,337 ----
-***************
-*** 445,451 ****
-    start = (ATerm *)((char *)env);
-    stop  = ((ATerm *)(((char *)env) + sizeof(jmp_buf)));
-    mark_memory_young(start, stop);
-- #endif
-  
-    stackTop = stack_top();
-    start = MIN(stackTop, stackBot);
---- 340,345 ----
-Only in aterm-2.8-new/aterm: gc.c.orig
-diff -rc aterm-2.8/configure aterm-2.8-new/configure
-*** aterm-2.8/configure	2008-11-10 13:54:27.000000000 +0100
---- aterm-2.8-new/configure	2010-08-23 17:08:10.000000000 +0200
-***************
-*** 19970,20295 ****
-  CURDATE=`date`
-  
-  
-- echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-- echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
-- if test "${ac_cv_c_bigendian+set}" = set; then
--   echo $ECHO_N "(cached) $ECHO_C" >&6
-- else
--   # See if sys/param.h defines the BYTE_ORDER macro.
-- cat >conftest.$ac_ext <<_ACEOF
-- /* confdefs.h.  */
-- _ACEOF
-- cat confdefs.h >>conftest.$ac_ext
-- cat >>conftest.$ac_ext <<_ACEOF
-- /* end confdefs.h.  */
-- #include <sys/types.h>
-- #include <sys/param.h>
-- 
-- int
-- main ()
-- {
-- #if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN
--  bogus endian macros
-- #endif
-- 
--   ;
--   return 0;
-- }
-- _ACEOF
-- rm -f conftest.$ac_objext
-- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--   (eval $ac_compile) 2>conftest.er1
--   ac_status=$?
--   grep -v '^ *+' conftest.er1 >conftest.err
--   rm -f conftest.er1
--   cat conftest.err >&5
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); } &&
-- 	 { ac_try='test -z "$ac_c_werror_flag"
-- 			 || test ! -s conftest.err'
--   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--   (eval $ac_try) 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); }; } &&
-- 	 { ac_try='test -s conftest.$ac_objext'
--   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--   (eval $ac_try) 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); }; }; then
--   # It does; now see whether it defined to BIG_ENDIAN or not.
-- cat >conftest.$ac_ext <<_ACEOF
-- /* confdefs.h.  */
-- _ACEOF
-- cat confdefs.h >>conftest.$ac_ext
-- cat >>conftest.$ac_ext <<_ACEOF
-- /* end confdefs.h.  */
-- #include <sys/types.h>
-- #include <sys/param.h>
-- 
-- int
-- main ()
-- {
-- #if BYTE_ORDER != BIG_ENDIAN
--  not big endian
-- #endif
-- 
--   ;
--   return 0;
-- }
-- _ACEOF
-- rm -f conftest.$ac_objext
-- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--   (eval $ac_compile) 2>conftest.er1
--   ac_status=$?
--   grep -v '^ *+' conftest.er1 >conftest.err
--   rm -f conftest.er1
--   cat conftest.err >&5
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); } &&
-- 	 { ac_try='test -z "$ac_c_werror_flag"
-- 			 || test ! -s conftest.err'
--   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--   (eval $ac_try) 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); }; } &&
-- 	 { ac_try='test -s conftest.$ac_objext'
--   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--   (eval $ac_try) 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); }; }; then
--   ac_cv_c_bigendian=yes
-- else
--   echo "$as_me: failed program was:" >&5
-- sed 's/^/| /' conftest.$ac_ext >&5
-- 
-- ac_cv_c_bigendian=no
-- fi
-- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- else
--   echo "$as_me: failed program was:" >&5
-- sed 's/^/| /' conftest.$ac_ext >&5
-- 
-- # It does not; compile a test program.
-- if test "$cross_compiling" = yes; then
--   # try to guess the endianness by grepping values into an object file
--   ac_cv_c_bigendian=unknown
--   cat >conftest.$ac_ext <<_ACEOF
-- /* confdefs.h.  */
-- _ACEOF
-- cat confdefs.h >>conftest.$ac_ext
-- cat >>conftest.$ac_ext <<_ACEOF
-- /* end confdefs.h.  */
-- short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
-- short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 };
-- void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; }
-- short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 };
-- short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 };
-- void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; }
-- int
-- main ()
-- {
--  _ascii (); _ebcdic ();
--   ;
--   return 0;
-- }
-- _ACEOF
-- rm -f conftest.$ac_objext
-- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--   (eval $ac_compile) 2>conftest.er1
--   ac_status=$?
--   grep -v '^ *+' conftest.er1 >conftest.err
--   rm -f conftest.er1
--   cat conftest.err >&5
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); } &&
-- 	 { ac_try='test -z "$ac_c_werror_flag"
-- 			 || test ! -s conftest.err'
--   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--   (eval $ac_try) 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); }; } &&
-- 	 { ac_try='test -s conftest.$ac_objext'
--   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--   (eval $ac_try) 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); }; }; then
--   if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then
--   ac_cv_c_bigendian=yes
-- fi
-- if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then
--   if test "$ac_cv_c_bigendian" = unknown; then
--     ac_cv_c_bigendian=no
--   else
--     # finding both strings is unlikely to happen, but who knows?
--     ac_cv_c_bigendian=unknown
--   fi
-- fi
-- else
--   echo "$as_me: failed program was:" >&5
-- sed 's/^/| /' conftest.$ac_ext >&5
-- 
-- fi
-- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- else
--   cat >conftest.$ac_ext <<_ACEOF
-- /* confdefs.h.  */
-- _ACEOF
-- cat confdefs.h >>conftest.$ac_ext
-- cat >>conftest.$ac_ext <<_ACEOF
-- /* end confdefs.h.  */
-- int
-- main ()
-- {
--   /* Are we little or big endian?  From Harbison&Steele.  */
--   union
--   {
--     long l;
--     char c[sizeof (long)];
--   } u;
--   u.l = 1;
--   exit (u.c[sizeof (long) - 1] == 1);
-- }
-- _ACEOF
-- rm -f conftest$ac_exeext
-- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--   (eval $ac_link) 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--   (eval $ac_try) 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); }; }; then
--   ac_cv_c_bigendian=no
-- else
--   echo "$as_me: program exited with status $ac_status" >&5
-- echo "$as_me: failed program was:" >&5
-- sed 's/^/| /' conftest.$ac_ext >&5
-- 
-- ( exit $ac_status )
-- ac_cv_c_bigendian=yes
-- fi
-- rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-- fi
-- fi
-- rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-- fi
-- echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5
-- echo "${ECHO_T}$ac_cv_c_bigendian" >&6
-- case $ac_cv_c_bigendian in
--   yes)
-- 
-- cat >>confdefs.h <<\_ACEOF
-- #define WORDS_BIGENDIAN 1
-- _ACEOF
--  ;;
--   no)
--      ;;
--   *)
--     { { echo "$as_me:$LINENO: error: unknown endianness
-- presetting ac_cv_c_bigendian=no (or yes) will help" >&5
-- echo "$as_me: error: unknown endianness
-- presetting ac_cv_c_bigendian=no (or yes) will help" >&2;}
--    { (exit 1); exit 1; }; } ;;
-- esac
-- 
-- 
-- 		echo "$as_me:$LINENO: checking whether float word ordering is big endian" >&5
-- echo $ECHO_N "checking whether float word ordering is big endian... $ECHO_C" >&6
-- if test "${ax_cv_c_float_word_order_big+set}" = set; then
--   echo $ECHO_N "(cached) $ECHO_C" >&6
-- else
-- 
-- 				if test "$cross_compiling" = yes; then
--   { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling
-- See \`config.log' for more details." >&5
-- echo "$as_me: error: cannot run test program while cross compiling
-- See \`config.log' for more details." >&2;}
--    { (exit 1); exit 1; }; }
-- else
--   cat >conftest.$ac_ext <<_ACEOF
-- 
-- 						/* This code returns 0 if the float word order is big endian and >= 1 if it is little endian. */
-- 						main(){
-- 							#ifdef WORDS_BIGENDIAN
-- 								return 0; /* If the system's encoding is big endian, so is the float word order. NOTE: If the encoding is big endian and WORDS_BIGENDIAN isn't defined, the code below will still return the correct float word order (big). */
-- 							#else
-- 								union
-- 								{
-- 									double d;
-- 									/* IEEE754 little endian encoded floating point number structure with little endian float word order. */
-- 									struct{
-- 										unsigned int mantissa1:32;
-- 										unsigned int mantissa0:20;
-- 										unsigned int exponent:11;
-- 										unsigned int negative:1;
-- 									} ieee;
-- 								} u;
-- 								u.d = -1;
-- 								return (u.ieee.negative == 1);
-- 							#endif
-- 						}
-- 
-- _ACEOF
-- rm -f conftest$ac_exeext
-- if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--   (eval $ac_link) 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
--   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--   (eval $ac_try) 2>&5
--   ac_status=$?
--   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--   (exit $ac_status); }; }; then
--   ax_cv_c_float_word_order_big=yes
-- else
--   echo "$as_me: program exited with status $ac_status" >&5
-- echo "$as_me: failed program was:" >&5
-- sed 's/^/| /' conftest.$ac_ext >&5
-- 
-- ( exit $ac_status )
-- ax_cv_c_float_word_order_big=no
-- fi
-- rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-- fi
-- 
-- 
-- fi
-- echo "$as_me:$LINENO: result: $ax_cv_c_float_word_order_big" >&5
-- echo "${ECHO_T}$ax_cv_c_float_word_order_big" >&6
-- 
-- 		case $ax_cv_c_float_word_order_big in
-- 			yes)
-- 
-- 
-- cat >>confdefs.h <<\_ACEOF
-- #define FLOAT_WORD_ORDER_BIG 1
-- _ACEOF
-- 
-- 
-- 				 ;;
-- 			no)
-- 		    	 ;;
-- 		  	*)
-- 
-- 					{ { echo "$as_me:$LINENO: error: Unable to determain float word ordering. You need to manually preset ax_cv_c_float_word_order_big=(yes / no).
-- 		    		" >&5
-- echo "$as_me: error: Unable to determain float word ordering. You need to manually preset ax_cv_c_float_word_order_big=(yes / no).
-- 		    		" >&2;}
--    { (exit 1); exit 1; }; }
-- 
-- 		     ;;
-- 		esac
-- 
-- 
-  
-  
-  for ac_func in strdup
---- 19970,19975 ----
-diff -rc aterm-2.8/Makefile.in aterm-2.8-new/Makefile.in
-*** aterm-2.8/Makefile.in	2008-11-10 13:54:28.000000000 +0100
---- aterm-2.8-new/Makefile.in	2010-08-23 17:05:27.000000000 +0200
-***************
-*** 217,223 ****
-  
-  pkgconfig_DATA = ${PACKAGE}.pc
-  
-! SUBDIRS = aterm utils test  
-  
-  ACLOCAL_AMFLAGS = -I .
-  subdir = .
---- 217,223 ----
-  
-  pkgconfig_DATA = ${PACKAGE}.pc
-  
-! SUBDIRS = aterm utils 
-  
-  ACLOCAL_AMFLAGS = -I .
-  subdir = .
diff --git a/pkgs/development/libraries/boost/boost-155-clang.patch b/pkgs/development/libraries/boost/boost-155-clang.patch
deleted file mode 100644
index 9c4e3a74cd25..000000000000
--- a/pkgs/development/libraries/boost/boost-155-clang.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-diff --git a/boost/atomic/detail/cas128strong.hpp b/boost/atomic/detail/cas128strong.hpp
-index 906c13e..dcb4d7d 100644
---- a/boost/atomic/detail/cas128strong.hpp
-+++ b/boost/atomic/detail/cas128strong.hpp
-@@ -196,15 +196,17 @@ class base_atomic<T, void, 16, Sign>
- 
- public:
-     BOOST_DEFAULTED_FUNCTION(base_atomic(void), {})
--    explicit base_atomic(value_type const& v) BOOST_NOEXCEPT : v_(0)
-+    explicit base_atomic(value_type const& v) BOOST_NOEXCEPT
-     {
-+        memset(&v_, 0, sizeof(v_));
-         memcpy(&v_, &v, sizeof(value_type));
-     }
- 
-     void
-     store(value_type const& value, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
-     {
--        storage_type value_s = 0;
-+        storage_type value_s;
-+        memset(&value_s, 0, sizeof(value_s));
-         memcpy(&value_s, &value, sizeof(value_type));
-         platform_fence_before_store(order);
-         platform_store128(value_s, &v_);
-@@ -247,7 +249,9 @@ class base_atomic<T, void, 16, Sign>
-         memory_order success_order,
-         memory_order failure_order) volatile BOOST_NOEXCEPT
-     {
--        storage_type expected_s = 0, desired_s = 0;
-+        storage_type expected_s, desired_s;
-+        memset(&expected_s, 0, sizeof(expected_s));
-+        memset(&desired_s, 0, sizeof(desired_s));
-         memcpy(&expected_s, &expected, sizeof(value_type));
-         memcpy(&desired_s, &desired, sizeof(value_type));
-
-diff --git a/boost/atomic/detail/gcc-atomic.hpp b/boost/atomic/detail/gcc-atomic.hpp
-index a130590..4af99a1 100644
---- a/boost/atomic/detail/gcc-atomic.hpp
-+++ b/boost/atomic/detail/gcc-atomic.hpp
-@@ -958,14 +958,16 @@ class base_atomic<T, void, 16, Sign>
- 
- public:
-     BOOST_DEFAULTED_FUNCTION(base_atomic(void), {})
--    explicit base_atomic(value_type const& v) BOOST_NOEXCEPT : v_(0)
-+    explicit base_atomic(value_type const& v) BOOST_NOEXCEPT
-     {
-+        memset(&v_, 0, sizeof(v_));
-         memcpy(&v_, &v, sizeof(value_type));
-     }
- 
-     void store(value_type const& v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
-     {
--        storage_type tmp = 0;
-+        storage_type tmp;
-+        memset(&tmp, 0, sizeof(tmp));
-         memcpy(&tmp, &v, sizeof(value_type));
-         __atomic_store_n(&v_, tmp, atomics::detail::convert_memory_order_to_gcc(order));
-     }
-@@ -980,7 +982,8 @@ class base_atomic<T, void, 16, Sign>
- 
-     value_type exchange(value_type const& v, memory_order order = memory_order_seq_cst) volatile BOOST_NOEXCEPT
-     {
--        storage_type tmp = 0;
-+        storage_type tmp;
-+        memset(&tmp, 0, sizeof(tmp));
-         memcpy(&tmp, &v, sizeof(value_type));
-         tmp = __atomic_exchange_n(&v_, tmp, atomics::detail::convert_memory_order_to_gcc(order));
-         value_type res;
-@@ -994,7 +997,9 @@ class base_atomic<T, void, 16, Sign>
-         memory_order success_order,
-         memory_order failure_order) volatile BOOST_NOEXCEPT
-     {
--        storage_type expected_s = 0, desired_s = 0;
-+        storage_type expected_s, desired_s;
-+        memset(&expected_s, 0, sizeof(expected_s));
-+        memset(&desired_s, 0, sizeof(desired_s));
-         memcpy(&expected_s, &expected, sizeof(value_type));
-         memcpy(&desired_s, &desired, sizeof(value_type));
-         const bool success = __atomic_compare_exchange_n(&v_, &expected_s, desired_s, false,
-@@ -1010,7 +1015,9 @@ class base_atomic<T, void, 16, Sign>
-         memory_order success_order,
-         memory_order failure_order) volatile BOOST_NOEXCEPT
-     {
--        storage_type expected_s = 0, desired_s = 0;
-+        storage_type expected_s, desired_s;
-+        memset(&expected_s, 0, sizeof(expected_s));
-+        memset(&desired_s, 0, sizeof(desired_s));
-         memcpy(&expected_s, &expected, sizeof(value_type));
-         memcpy(&desired_s, &desired, sizeof(value_type));
-         const bool success = __atomic_compare_exchange_n(&v_, &expected_s, desired_s, true,
diff --git a/pkgs/development/libraries/libedit/freebsd_weak_ref.patch b/pkgs/development/libraries/libedit/freebsd_weak_ref.patch
deleted file mode 100644
index a4399593d636..000000000000
--- a/pkgs/development/libraries/libedit/freebsd_weak_ref.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libedit-20110709-3.0/src/vi.c.old	2011-07-11 18:21:16.000000000 +0000
-+++ libedit-20110709-3.0/src/vi.c	2011-07-11 18:24:29.000000000 +0000
-@@ -918,7 +918,7 @@
-  * NB: posix implies that we should enter insert mode, however
-  * this is against historical precedent...
-  */
--#ifdef __weak_reference
-+#if defined(__weak_reference) && defined(__NetBSD__)
- __weakref_visible char *my_get_alias_text(const char *)
-     __weak_reference(get_alias_text);
- #endif
-@@ -926,7 +926,7 @@
- /*ARGSUSED*/
- vi_alias(EditLine *el, Int c)
- {
--#ifdef __weak_reference
-+#if defined(__weak_reference) && defined(__NetBSD__)
- 	char alias_name[3];
- 	char *alias_text;
- 
diff --git a/pkgs/development/r-modules/patches/BayesBridge_cblas.patch b/pkgs/development/r-modules/patches/BayesBridge_cblas.patch
deleted file mode 100644
index 418a6b95ee71..000000000000
--- a/pkgs/development/r-modules/patches/BayesBridge_cblas.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -ru -x '*~' BayesBridge_orig/src/Makevars BayesBridge/src/Makevars
---- BayesBridge_orig/src/Makevars	2014-07-19 05:08:55.000000000 +0900
-+++ BayesBridge/src/Makevars	2014-10-25 14:44:23.422592445 +0900
-@@ -9,4 +9,4 @@
- # PKG_CPPFLAGS = -DUSE_R -DDISABLE_FIO -I../inst/include/ -DDISABLE_SINGLE -DNTHROW
- PKG_CPPFLAGS = -DUSE_R -DDISABLE_FIO -DDISABLE_SINGLE -DNTHROW
- # PKG_CPPFLAGS = -DUSE_R -DDISABLE_SINGLE -DNTHROW -Wall -pedantic -Wshadow  -ansi -Wsequence-point
--PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) 
-+PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) -lcblas
diff --git a/pkgs/development/r-modules/patches/BayesLogit_cblas.patch b/pkgs/development/r-modules/patches/BayesLogit_cblas.patch
deleted file mode 100644
index ef776f3531da..000000000000
--- a/pkgs/development/r-modules/patches/BayesLogit_cblas.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' BayesLogit_orig/src/Makevars BayesLogit/src/Makevars
---- BayesLogit_orig/src/Makevars	2014-04-24 23:31:13.000000000 +0900
-+++ BayesLogit/src/Makevars	2014-10-21 21:00:15.570699136 +0900
-@@ -6,7 +6,7 @@
- ## W/OUT Dynamic Stuff
- OBJECTS = Matrix.o MatrixFrame.o RRNG.o RNG.o FSF_nmix.o LogitWrapper.o \
- 	PolyaGamma.o PolyaGammaAlt.o PolyaGammaSP.o InvertY.o
--PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) 
-+PKG_LIBS = $(BLAS_LIBS) $(FLIBS) $(LAPACK_LIBS) -lopenblas
- # PKG_CPPFLAGS = -DUSE_R -DNDEBUG -DDISABLE_SINGLE -DNTHROW -Wall -pedantic -Wextra
- PKG_CPPFLAGS = -DUSE_R -DNDEBUG -DDISABLE_SINGLE -DNTHROW 
- 
diff --git a/pkgs/development/r-modules/patches/CARramps.patch b/pkgs/development/r-modules/patches/CARramps.patch
deleted file mode 100644
index add01b28fc15..000000000000
--- a/pkgs/development/r-modules/patches/CARramps.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' CARramps_orig/src/combo1colForR1Q_d.cu CARramps/src/combo1colForR1Q_d.cu
---- CARramps_orig/src/combo1colForR1Q_d.cu	2011-12-01 22:27:06.000000000 +0900
-+++ CARramps/src/combo1colForR1Q_d.cu	2014-10-25 14:59:06.869299163 +0900
-@@ -4,7 +4,7 @@
- #include <cuda.h>
- #include <R.h>
- #include <Rmath.h>
--#include <combo1colForR1Q_d.h>
-+#include "combo1colForR1Q_d.h"
- 
- #define BLOCKSIZE 256 
- 
diff --git a/pkgs/development/r-modules/patches/WideLM.patch b/pkgs/development/r-modules/patches/WideLM.patch
deleted file mode 100644
index 02bbfb7e0dab..000000000000
--- a/pkgs/development/r-modules/patches/WideLM.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ru -x '*~' WideLM_orig/src/Makefile.in WideLM/src/Makefile.in
---- WideLM_orig/src/Makefile.in	2012-02-17 04:28:05.000000000 +0900
-+++ WideLM/src/Makefile.in	2014-10-25 18:54:49.110011921 +0900
-@@ -12,12 +12,12 @@
- #compiler/preprocessor options
- R_INCS := @R_INCL@ @RCPP_INCL@
- CC_ARGS := @CU_PARAMS@ -Xcompiler @R_CPIC@
--CU_INCS := -I@CUDA_HOME@/include
-+CU_INCS := -I@CUDA_HOME@/include
- CU_ARCH := -gencode arch=compute_20,code=sm_20
- 
- #linker options
--LD_PARAMS := -Xlinker "@RCPP_LDFLAGS@"
--RCU_LIBS :=  @R_LIB@ -L@CU_LIBDIR@ -lcublas
-+LD_PARAMS := -Xlinker "--export-dynamic -fopenmp -L${R_HOME}/lib -lR"
-+RCU_LIBS := -Xlinker "-L@CU_LIBDIR@ -lcublas"
- 
- all : WideLM.so
- 
diff --git a/pkgs/development/r-modules/patches/rpud.patch b/pkgs/development/r-modules/patches/rpud.patch
deleted file mode 100644
index bb904b68989c..000000000000
--- a/pkgs/development/r-modules/patches/rpud.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ru -x '*~' rpud_orig/configure rpud/configure
---- rpud_orig/configure	2010-09-08 02:14:55.000000000 +0900
-+++ rpud/configure	2014-10-25 16:46:39.479098648 +0900
-@@ -1794,7 +1794,7 @@
- fi
- 
- LIBS="-L${CUDA_HOME}${CUDA_LIB_DIR} -lcublas -lcuda"
--RPATHFLAG="-Wl,-rpath,${CUDA_HOME}${CUDA_LIB_DIR}"
-+RPATHFLAG="-Xlinker -rpath=${CUDA_HOME}${CUDA_LIB_DIR}"
- 
- 
- 
-diff -ru -x '*~' rpud_orig/src/Makefile.in rpud/src/Makefile.in
---- rpud_orig/src/Makefile.in	2010-08-31 01:53:50.000000000 +0900
-+++ rpud/src/Makefile.in	2014-10-25 16:45:30.248109883 +0900
-@@ -3,11 +3,11 @@
- OBJS := rpud.o rpudist.o
- 
- #compiler/preprocessor options
--INCS := -I@CUDA_HOME@/include
-+INCS := -I@CUDA_HOME@/include
- PARAMS := -Xcompiler "@R_INCLUDE@ @CPICFLAGS@"
- 
- #linker options
--LD_PARAMS := -Xlinker "@R_LIB@ @RPATHFLAG@"
-+LD_PARAMS := -Xlinker "--export-dynamic -fopenmp -L${R_HOME}/lib -lR @RPATHFLAG@" 
- LIBS :=  @LIBS@
- 
- TARGETS := rpud.so
diff --git a/pkgs/development/tools/boomerang/dlopen_path.patch b/pkgs/development/tools/boomerang/dlopen_path.patch
deleted file mode 100644
index 1e4bf3c75a30..000000000000
--- a/pkgs/development/tools/boomerang/dlopen_path.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/loader/BinaryFileFactory.cpp b/loader/BinaryFileFactory.cpp
-index 889a4ed..ca86765 100644
---- a/loader/BinaryFileFactory.cpp
-+++ b/loader/BinaryFileFactory.cpp
-@@ -109,7 +109,7 @@ BinaryFile* BinaryFileFactory::getInstanceFor( const char *sName ) {
- 	
- // Load the specific loader library
- #ifndef _WIN32		// Cygwin, Unix/Linux
--	libName = std::string("lib/lib") + libName;
-+	libName = std::string("lib") + libName;
- #ifdef	__CYGWIN__
- 	libName += ".dll";		// Cygwin wants .dll, but is otherwise like Unix
- #else
diff --git a/pkgs/development/tools/build-managers/cmake/2.8.11-cygwin.patch b/pkgs/development/tools/build-managers/cmake/2.8.11-cygwin.patch
deleted file mode 100644
index e16dab32632f..000000000000
--- a/pkgs/development/tools/build-managers/cmake/2.8.11-cygwin.patch
+++ /dev/null
@@ -1,237 +0,0 @@
---- cmake-2.8.10/Source/cmFileCommand.cxx	2012-10-31 10:32:06.000000000 -0500
-+++ cmake-2.8.10/Source/cmFileCommand.cxx	2013-03-16 22:55:11.306681100 -0500
-@@ -1002,7 +1002,7 @@ protected:
-   MatchProperties CollectMatchProperties(const char* file)
-     {
-     // Match rules are case-insensitive on some platforms.
--#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
-+#if defined(_WIN32) || defined(__APPLE__)
-     std::string lower = cmSystemTools::LowerCase(file);
-     const char* file_to_match = lower.c_str();
- #else
---- cmake-2.8.10/Source/cmInstallCommand.cxx	2012-10-31 10:32:06.000000000 -0500
-+++ cmake-2.8.10/Source/cmInstallCommand.cxx	2013-03-16 22:56:21.008667800 -0500
-@@ -1090,7 +1090,7 @@ cmInstallCommand::HandleDirectoryMode(st
-       {
-       literal_args += " REGEX \"";
-     // Match rules are case-insensitive on some platforms.
--#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
-+#if defined(_WIN32) || defined(__APPLE__)
-       std::string regex = cmSystemTools::LowerCase(args[i]);
- #else
-       std::string regex = args[i];
---- cmake-2.8.10/Source/kwsys/Glob.cxx	2012-10-31 10:32:06.000000000 -0500
-+++ cmake-2.8.10/Source/kwsys/Glob.cxx	2013-03-16 22:58:54.192429400 -0500
-@@ -37,7 +37,7 @@
- #include <string.h>
- namespace KWSYS_NAMESPACE
- {
--#if defined(_WIN32) || defined(__APPLE__) || defined(__CYGWIN__)
-+#if defined(_WIN32) || defined(__APPLE__)
- // On Windows and apple, no difference between lower and upper case
- # define KWSYS_GLOB_CASE_INDEPENDENT
- #endif
---- cmake-2.8.11/Source/kwsys/SystemInformation.cxx	2013-05-15 12:38:13.000000000 -0500
-+++ cmake-2.8.11/Source/kwsys/SystemInformation.cxx	2013-07-08 01:57:31.216321800 -0500
-@@ -888,7 +888,7 @@ void SystemInformation::RunMemoryCheck()
- // Hide implementation details in an anonymous namespace.
- namespace {
- // *****************************************************************************
--#if defined(__linux) || defined(__APPLE__)
-+#if defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__)
- int LoadLines(
-       FILE *file,
-       kwsys_stl::vector<kwsys_stl::string> &lines)
-@@ -918,7 +918,7 @@ int LoadLines(
-   return nRead;
- }
- 
--# if defined(__linux)
-+# if defined(__linux) || defined(__CYGWIN__)
- // *****************************************************************************
- int LoadLines(
-       const char *fileName,
-@@ -957,7 +957,7 @@ int NameValue(
- }
- #endif
- 
--#if defined(__linux)
-+#if defined(__linux) || defined(__CYGWIN__)
- // ****************************************************************************
- template<typename T>
- int GetFieldsFromFile(
-@@ -2869,7 +2869,6 @@ bool SystemInformationImplementation::Re
-     pos = buffer.find("processor\t",pos+1);
-     }
- 
--#ifdef __linux
-   // Find the largest physical id.
-   int maxId = -1;
-   kwsys_stl::string idc =
-@@ -2893,14 +2892,6 @@ bool SystemInformationImplementation::Re
-   this->NumberOfPhysicalCPU=static_cast<unsigned int>(
-     numberOfCoresPerCPU*(maxId+1));
- 
--#else // __CYGWIN__
--  // does not have "physical id" entries, neither "cpu cores"
--  // this has to be fixed for hyper-threading.
--  kwsys_stl::string cpucount =
--    this->ExtractValueFromCpuInfoFile(buffer,"cpu count");
--  this->NumberOfPhysicalCPU=
--    this->NumberOfLogicalCPU = atoi(cpucount.c_str());
--#endif
-   // gotta have one, and if this is 0 then we get a / by 0n
-   // better to have a bad answer than a crash
-   if(this->NumberOfPhysicalCPU <= 0)
-@@ -3086,7 +3077,7 @@ SystemInformationImplementation::GetHost
-   GlobalMemoryStatusEx(&statex);
-   return statex.ullTotalPhys/1024;
- # endif
--#elif defined(__linux)
-+#elif defined(__linux) || defined(__CYGWIN__)
-   SystemInformation::LongLong memTotal=0;
-   int ierr=GetFieldFromFile("/proc/meminfo","MemTotal:",memTotal);
-   if (ierr)
-@@ -3217,7 +3208,7 @@ SystemInformationImplementation::GetHost
-   GlobalMemoryStatusEx(&statex);
-   return (statex.ullTotalPhys - statex.ullAvailPhys)/1024;
- # endif
--#elif defined(__linux)
-+#elif defined(__linux) || defined(__CYGWIN__)
-   const char *names[3]={"MemTotal:","MemFree:",NULL};
-   SystemInformation::LongLong values[2]={SystemInformation::LongLong(0)};
-   int ierr=GetFieldsFromFile("/proc/meminfo",names,values);
-@@ -3276,7 +3267,7 @@ SystemInformationImplementation::GetProc
-     return -2;
-     }
-   return pmc.WorkingSetSize/1024;
--#elif defined(__linux)
-+#elif defined(__linux) || defined(__CYGWIN__)
-   SystemInformation::LongLong memUsed=0;
-   int ierr=GetFieldFromFile("/proc/self/status","VmRSS:",memUsed);
-   if (ierr)
-@@ -3328,7 +3319,7 @@ SystemInformationImplementation::GetProc
- {
- #if defined(_WIN32)
-   return GetCurrentProcessId();
--#elif defined(__linux) || defined(__APPLE__)
-+#elif defined(__linux) || defined(__APPLE__) || defined(__CYGWIN__)
-   return getpid();
- #else
-   return -1;
---- cmake-2.8.10/Source/kwsys/SystemTools.cxx	2012-10-31 10:32:06.000000000 -0500
-+++ cmake-2.8.10/Source/kwsys/SystemTools.cxx	2013-03-16 22:52:11.830415600 -0500
-@@ -75,19 +75,12 @@
- // Windows API.
- #if defined(_WIN32)
- # include <windows.h>
--#elif defined (__CYGWIN__)
--# include <windows.h>
--# undef _WIN32
- #endif
- 
- #if !KWSYS_CXX_HAS_ENVIRON_IN_STDLIB_H
- extern char **environ;
- #endif
- 
--#ifdef __CYGWIN__
--extern "C" void cygwin_conv_to_win32_path(const char *path, char *win32_path);
--#endif
--
- // getpwnam doesn't exist on Windows and Cray Xt3/Catamount
- // same for TIOCGWINSZ
- #if defined(_WIN32) || defined (__LIBCATAMOUNT__)
-@@ -1068,7 +1061,7 @@ bool SystemTools::SameFile(const char* f
- }
- 
- //----------------------------------------------------------------------------
--#if defined(_WIN32) || defined(__CYGWIN__)
-+#if defined(_WIN32)
- static bool WindowsFileExists(const char* filename)
- {
-   WIN32_FILE_ATTRIBUTE_DATA fd;
-@@ -1083,7 +1076,7 @@ bool SystemTools::FileExists(const char*
-     {
-     return false;
-     }
--#if defined(__CYGWIN__)
-+#if 0
-   // Convert filename to native windows path if possible.
-   char winpath[MAX_PATH];
-   if(SystemTools::PathCygwinToWin32(filename, winpath))
-@@ -1111,7 +1104,7 @@ bool SystemTools::FileExists(const char*
- }
- 
- //----------------------------------------------------------------------------
--#ifdef __CYGWIN__
-+#if 0
- bool SystemTools::PathCygwinToWin32(const char *path, char *win32_path)
- {
-   SystemToolsTranslationMap::iterator i =
-@@ -3894,7 +3887,7 @@ bool SystemTools::LocateFileInDir(const
- bool SystemTools::FileIsFullPath(const char* in_name)
- {
-   kwsys_stl::string name = in_name;
--#if defined(_WIN32) || defined(__CYGWIN__)
-+#if defined(_WIN32)
-   // On Windows, the name must be at least two characters long.
-   if(name.length() < 2)
-     {
-@@ -4712,9 +4705,6 @@ bool SystemTools::ParseURL( const kwsys_
- unsigned int SystemToolsManagerCount;
- SystemToolsTranslationMap *SystemTools::TranslationMap;
- SystemToolsTranslationMap *SystemTools::LongPathMap;
--#ifdef __CYGWIN__
--SystemToolsTranslationMap *SystemTools::Cyg2Win32Map;
--#endif
- 
- // SystemToolsManager manages the SystemTools singleton.
- // SystemToolsManager should be included in any translation unit
-@@ -4760,9 +4750,6 @@ void SystemTools::ClassInitialize()
-   // Allocate the translation map first.
-   SystemTools::TranslationMap = new SystemToolsTranslationMap;
-   SystemTools::LongPathMap = new SystemToolsTranslationMap;
--#ifdef __CYGWIN__
--  SystemTools::Cyg2Win32Map = new SystemToolsTranslationMap;
--#endif
- 
-   // Add some special translation paths for unix.  These are not added
-   // for windows because drive letters need to be maintained.  Also,
-@@ -4817,9 +4804,6 @@ void SystemTools::ClassFinalize()
- {
-   delete SystemTools::TranslationMap;
-   delete SystemTools::LongPathMap;
--#ifdef __CYGWIN__
--  delete SystemTools::Cyg2Win32Map;
--#endif
- }
- 
- 
---- cmake-2.8.10/Source/kwsys/SystemTools.hxx.in	2012-10-31 10:32:06.000000000 -0500
-+++ cmake-2.8.10/Source/kwsys/SystemTools.hxx.in	2013-03-16 23:10:30.185237900 -0500
-@@ -277,15 +277,6 @@ public:
-   static bool FileExists(const char* filename);
- 
-   /**
--   * Converts Cygwin path to Win32 path. Uses dictionary container for
--   * caching and calls to cygwin_conv_to_win32_path from Cygwin dll
--   * for actual translation.  Returns true on success, else false.
--   */
--#ifdef __CYGWIN__
--  static bool PathCygwinToWin32(const char *path, char *win32_path);
--#endif
--
--  /**
-    * Return file length
-    */
-   static unsigned long FileLength(const char *filename);
-@@ -887,9 +878,6 @@ private:
-    */
-   static SystemToolsTranslationMap *TranslationMap;
-   static SystemToolsTranslationMap *LongPathMap;
--#ifdef __CYGWIN__
--  static SystemToolsTranslationMap *Cyg2Win32Map;
--#endif
-   friend class SystemToolsManager;
- };
- 
diff --git a/pkgs/development/tools/build-managers/cmake/cmake_find_openssl_for_openssl-1.0.1m_and_up.patch b/pkgs/development/tools/build-managers/cmake/cmake_find_openssl_for_openssl-1.0.1m_and_up.patch
deleted file mode 100644
index 25bbd2a91ba1..000000000000
--- a/pkgs/development/tools/build-managers/cmake/cmake_find_openssl_for_openssl-1.0.1m_and_up.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./Modules/FindOpenSSL.cmake
-+++ ./Modules/FindOpenSSL.cmake
-@@ -264,7 +264,7 @@
-     set(OPENSSL_VERSION "${_OPENSSL_VERSION}")
-   elseif(OPENSSL_INCLUDE_DIR AND EXISTS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h")
-     file(STRINGS "${OPENSSL_INCLUDE_DIR}/openssl/opensslv.h" openssl_version_str
--         REGEX "^#define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
-+         REGEX "^# *define[\t ]+OPENSSL_VERSION_NUMBER[\t ]+0x([0-9a-fA-F])+.*")
-
-     # The version number is encoded as 0xMNNFFPPS: major minor fix patch status
-     # The status gives if this is a developer or prerelease and is ignored here.
diff --git a/pkgs/development/tools/haskell/ihaskell/use-classy-prelude.patch b/pkgs/development/tools/haskell/ihaskell/use-classy-prelude.patch
deleted file mode 100644
index b2c1362b62fa..000000000000
--- a/pkgs/development/tools/haskell/ihaskell/use-classy-prelude.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From fad4e38079e91b13bf1e94732b7494504071b224 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
-Date: Sun, 28 Sep 2014 09:27:40 +0200
-Subject: [PATCH] catMaybes, explicitly use ClassyPrelude
-
----
- src/IHaskell/Eval/Completion.hs | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/IHaskell/Eval/Completion.hs b/src/IHaskell/Eval/Completion.hs
-index 790c903..93d7ac1 100644
---- a/src/IHaskell/Eval/Completion.hs
-+++ b/src/IHaskell/Eval/Completion.hs
-@@ -141,7 +141,7 @@ getTrueModuleName name = do
-       onlyImportDecl _ = Nothing
- 
-   -- Get all imports that we use.
--  imports <- catMaybes <$> map onlyImportDecl <$> getContext
-+  imports <- ClassyPrelude.catMaybes <$> map onlyImportDecl <$> getContext
- 
-   -- Find the ones that have a qualified name attached.
-   -- If this name isn't one of them, it already is the true name.
-@@ -178,7 +178,7 @@ completionType line loc target
-     = Empty
- 
-   -- When in a string, complete filenames.
--  | cursorInString line loc 
-+  | cursorInString line loc
-     = FilePath (getStringTarget lineUpToCursor) (getStringTarget lineUpToCursor)
- 
-   -- Complete module names in imports and elsewhere.
--- 
-2.1.0
-
diff --git a/pkgs/games/hedgewars/fix-ghc-7.8-build-failure.diff b/pkgs/games/hedgewars/fix-ghc-7.8-build-failure.diff
deleted file mode 100644
index 7974c6797fc5..000000000000
--- a/pkgs/games/hedgewars/fix-ghc-7.8-build-failure.diff
+++ /dev/null
@@ -1,16 +0,0 @@
-## fix-ghc-7.8-build-failure.diff [diff]
-diff --git a/gameServer/Actions.hs b/gameServer/Actions.hs
-index 2cebe4f..355ee26 100644
---- a/gameServer/Actions.hs
-+++ b/gameServer/Actions.hs
-@@ -562,7 +562,7 @@ processAction (AddClient cl) = do
-     si <- gets serverInfo
-     newClId <- io $ do
-         ci <- addClient rnc cl
--        _ <- Exception.mask (forkIO . clientRecvLoop (clientSocket cl) (coreChan si) (sendChan cl) ci)
-+        _ <- Exception.mask (\x -> forkIO $ clientRecvLoop (clientSocket cl) (coreChan si) (sendChan cl) ci x)
- 
-         infoM "Clients" (show ci ++ ": New client. Time: " ++ show (connectTime cl))
- 
-
-
diff --git a/pkgs/os-specific/linux/kernel-headers/unifdef-getline.patch b/pkgs/os-specific/linux/kernel-headers/unifdef-getline.patch
deleted file mode 100644
index 8caabfd3286b..000000000000
--- a/pkgs/os-specific/linux/kernel-headers/unifdef-getline.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-This patch fixes a trivial compilation error with glibc 2.11.
-From http://patchwork.kernel.org/patch/11166/ .
-
-diff --git a/scripts/unifdef.c b/scripts/unifdef.c
-index 552025e..977e682 100644
---- a/scripts/unifdef.c
-+++ b/scripts/unifdef.c
-@@ -206,7 +206,7 @@  static void             done(void);
- static void             error(const char *);
- static int              findsym(const char *);
- static void             flushline(bool);
--static Linetype         getline(void);
-+static Linetype         parseline(void);
- static Linetype         ifeval(const char **);
- static void             ignoreoff(void);
- static void             ignoreon(void);
-@@ -512,7 +512,7 @@  process(void)
- 
- 	for (;;) {
- 		linenum++;
--		lineval = getline();
-+		lineval = parseline();
- 		trans_table[ifstate[depth]][lineval]();
- 		debug("process %s -> %s depth %d",
- 		    linetype_name[lineval],
-@@ -526,7 +526,7 @@  process(void)
-  * help from skipcomment().
-  */
- static Linetype
--getline(void)
-+parseline(void)
- {
- 	const char *cp;
- 	int cursym;
-
diff --git a/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch b/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch
deleted file mode 100644
index b411f43298c9..000000000000
--- a/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch
+++ /dev/null
@@ -1,553 +0,0 @@
-From 125fccb600288968aa3395883c0a394c47176fcd Mon Sep 17 00:00:00 2001
-From: John Johansen <john.johansen@canonical.com>
-Date: Wed, 10 Aug 2011 22:02:39 -0700
-Subject: [PATCH 1/3] AppArmor: compatibility patch for v5 network controll
-
-Add compatibility for v5 network rules.
-
-Signed-off-by: John Johansen <john.johansen@canonical.com>
----
- include/linux/lsm_audit.h          |    4 +
- security/apparmor/Makefile         |   19 +++-
- security/apparmor/include/net.h    |   40 +++++++++
- security/apparmor/include/policy.h |    3 +
- security/apparmor/lsm.c            |  112 ++++++++++++++++++++++++
- security/apparmor/net.c            |  170 ++++++++++++++++++++++++++++++++++++
- security/apparmor/policy.c         |    1 +
- security/apparmor/policy_unpack.c  |   48 +++++++++-
- 8 files changed, 394 insertions(+), 3 deletions(-)
- create mode 100644 security/apparmor/include/net.h
- create mode 100644 security/apparmor/net.c
-
-diff --git a/include/linux/lsm_audit.h b/include/linux/lsm_audit.h
-index 88e78de..c63979a 100644
---- a/include/linux/lsm_audit.h
-+++ b/include/linux/lsm_audit.h
-@@ -124,6 +124,10 @@ struct common_audit_data {
- 					u32 denied;
- 					uid_t ouid;
- 				} fs;
-+				struct {
-+					int type, protocol;
-+					struct sock *sk;
-+				} net;
- 			};
- 		} apparmor_audit_data;
- #endif
-diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile
-index 2dafe50..7cefef9 100644
---- a/security/apparmor/Makefile
-+++ b/security/apparmor/Makefile
-@@ -4,9 +4,9 @@ obj-$(CONFIG_SECURITY_APPARMOR) += apparmor.o
- 
- apparmor-y := apparmorfs.o audit.o capability.o context.o ipc.o lib.o match.o \
-               path.o domain.o policy.o policy_unpack.o procattr.o lsm.o \
--              resource.o sid.o file.o
-+              resource.o sid.o file.o net.o
- 
--clean-files := capability_names.h rlim_names.h
-+clean-files := capability_names.h rlim_names.h af_names.h
- 
- 
- # Build a lower case string table of capability names
-@@ -44,9 +44,24 @@ cmd_make-rlim = echo "static const char *rlim_names[] = {" > $@ ;\
- 	sed -r -n "s/^\# ?define[ \t]+(RLIMIT_[A-Z0-9_]+).*/\1,/p" $< >> $@ ;\
- 	echo "};" >> $@
- 
-+# Build a lower case string table of address family names.
-+# Transform lines from
-+# #define AF_INET		2	/* Internet IP Protocol 	*/
-+# to
-+# [2] = "inet",
-+quiet_cmd_make-af = GEN     $@
-+cmd_make-af = echo "static const char *address_family_names[] = {" > $@ ;\
-+	sed $< >> $@ -r -n -e "/AF_MAX/d" -e "/AF_LOCAL/d" -e \
-+	  's/^\#define[ \t]+AF_([A-Z0-9_]+)[ \t]+([0-9]+).*/[\2] = "\L\1",/p';\
-+	echo "};" >> $@
-+
-+
- $(obj)/capability.o : $(obj)/capability_names.h
- $(obj)/resource.o : $(obj)/rlim_names.h
-+$(obj)/net.o : $(obj)/af_names.h
- $(obj)/capability_names.h : $(srctree)/include/linux/capability.h
- 	$(call cmd,make-caps)
- $(obj)/rlim_names.h : $(srctree)/include/asm-generic/resource.h
- 	$(call cmd,make-rlim)
-+$(obj)/af_names.h : $(srctree)/include/linux/socket.h
-+	$(call cmd,make-af)
-\ No newline at end of file
-diff --git a/security/apparmor/include/net.h b/security/apparmor/include/net.h
-new file mode 100644
-index 0000000..3c7d599
---- /dev/null
-+++ b/security/apparmor/include/net.h
-@@ -0,0 +1,40 @@
-+/*
-+ * AppArmor security module
-+ *
-+ * This file contains AppArmor network mediation definitions.
-+ *
-+ * Copyright (C) 1998-2008 Novell/SUSE
-+ * Copyright 2009-2010 Canonical Ltd.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation, version 2 of the
-+ * License.
-+ */
-+
-+#ifndef __AA_NET_H
-+#define __AA_NET_H
-+
-+#include <net/sock.h>
-+
-+/* struct aa_net - network confinement data
-+ * @allowed: basic network families permissions
-+ * @audit_network: which network permissions to force audit
-+ * @quiet_network: which network permissions to quiet rejects
-+ */
-+struct aa_net {
-+	u16 allow[AF_MAX];
-+	u16 audit[AF_MAX];
-+	u16 quiet[AF_MAX];
-+};
-+
-+extern int aa_net_perm(int op, struct aa_profile *profile, u16 family,
-+		       int type, int protocol, struct sock *sk);
-+extern int aa_revalidate_sk(int op, struct sock *sk);
-+
-+static inline void aa_free_net_rules(struct aa_net *new)
-+{
-+	/* NOP */
-+}
-+
-+#endif /* __AA_NET_H */
-diff --git a/security/apparmor/include/policy.h b/security/apparmor/include/policy.h
-index aeda5cf..6776929 100644
---- a/security/apparmor/include/policy.h
-+++ b/security/apparmor/include/policy.h
-@@ -27,6 +27,7 @@
- #include "capability.h"
- #include "domain.h"
- #include "file.h"
-+#include "net.h"
- #include "resource.h"
- 
- extern const char *profile_mode_names[];
-@@ -145,6 +146,7 @@ struct aa_namespace {
-  * @size: the memory consumed by this profiles rules
-  * @file: The set of rules governing basic file access and domain transitions
-  * @caps: capabilities for the profile
-+ * @net: network controls for the profile
-  * @rlimits: rlimits for the profile
-  *
-  * The AppArmor profile contains the basic confinement data.  Each profile
-@@ -181,6 +183,7 @@ struct aa_profile {
- 
- 	struct aa_file_rules file;
- 	struct aa_caps caps;
-+	struct aa_net net;
- 	struct aa_rlimit rlimits;
- };
- 
-diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
-index 3783202..7459547 100644
---- a/security/apparmor/lsm.c
-+++ b/security/apparmor/lsm.c
-@@ -32,6 +32,7 @@
- #include "include/context.h"
- #include "include/file.h"
- #include "include/ipc.h"
-+#include "include/net.h"
- #include "include/path.h"
- #include "include/policy.h"
- #include "include/procattr.h"
-@@ -621,6 +622,104 @@ static int apparmor_task_setrlimit(struct task_struct *task,
- 	return error;
- }
- 
-+static int apparmor_socket_create(int family, int type, int protocol, int kern)
-+{
-+	struct aa_profile *profile;
-+	int error = 0;
-+
-+	if (kern)
-+		return 0;
-+
-+	profile = __aa_current_profile();
-+	if (!unconfined(profile))
-+		error = aa_net_perm(OP_CREATE, profile, family, type, protocol,
-+				    NULL);
-+	return error;
-+}
-+
-+static int apparmor_socket_bind(struct socket *sock,
-+				struct sockaddr *address, int addrlen)
-+{
-+	struct sock *sk = sock->sk;
-+
-+	return aa_revalidate_sk(OP_BIND, sk);
-+}
-+
-+static int apparmor_socket_connect(struct socket *sock,
-+				   struct sockaddr *address, int addrlen)
-+{
-+	struct sock *sk = sock->sk;
-+
-+	return aa_revalidate_sk(OP_CONNECT, sk);
-+}
-+
-+static int apparmor_socket_listen(struct socket *sock, int backlog)
-+{
-+	struct sock *sk = sock->sk;
-+
-+	return aa_revalidate_sk(OP_LISTEN, sk);
-+}
-+
-+static int apparmor_socket_accept(struct socket *sock, struct socket *newsock)
-+{
-+	struct sock *sk = sock->sk;
-+
-+	return aa_revalidate_sk(OP_ACCEPT, sk);
-+}
-+
-+static int apparmor_socket_sendmsg(struct socket *sock,
-+				   struct msghdr *msg, int size)
-+{
-+	struct sock *sk = sock->sk;
-+
-+	return aa_revalidate_sk(OP_SENDMSG, sk);
-+}
-+
-+static int apparmor_socket_recvmsg(struct socket *sock,
-+				   struct msghdr *msg, int size, int flags)
-+{
-+	struct sock *sk = sock->sk;
-+
-+	return aa_revalidate_sk(OP_RECVMSG, sk);
-+}
-+
-+static int apparmor_socket_getsockname(struct socket *sock)
-+{
-+	struct sock *sk = sock->sk;
-+
-+	return aa_revalidate_sk(OP_GETSOCKNAME, sk);
-+}
-+
-+static int apparmor_socket_getpeername(struct socket *sock)
-+{
-+	struct sock *sk = sock->sk;
-+
-+	return aa_revalidate_sk(OP_GETPEERNAME, sk);
-+}
-+
-+static int apparmor_socket_getsockopt(struct socket *sock, int level,
-+				      int optname)
-+{
-+	struct sock *sk = sock->sk;
-+
-+	return aa_revalidate_sk(OP_GETSOCKOPT, sk);
-+}
-+
-+static int apparmor_socket_setsockopt(struct socket *sock, int level,
-+				      int optname)
-+{
-+	struct sock *sk = sock->sk;
-+
-+	return aa_revalidate_sk(OP_SETSOCKOPT, sk);
-+}
-+
-+static int apparmor_socket_shutdown(struct socket *sock, int how)
-+{
-+	struct sock *sk = sock->sk;
-+
-+	return aa_revalidate_sk(OP_SOCK_SHUTDOWN, sk);
-+}
-+
- static struct security_operations apparmor_ops = {
- 	.name =				"apparmor",
- 
-@@ -652,6 +751,19 @@ static struct security_operations apparmor_ops = {
- 	.getprocattr =			apparmor_getprocattr,
- 	.setprocattr =			apparmor_setprocattr,
- 
-+	.socket_create =		apparmor_socket_create,
-+	.socket_bind =			apparmor_socket_bind,
-+	.socket_connect =		apparmor_socket_connect,
-+	.socket_listen =		apparmor_socket_listen,
-+	.socket_accept =		apparmor_socket_accept,
-+	.socket_sendmsg =		apparmor_socket_sendmsg,
-+	.socket_recvmsg =		apparmor_socket_recvmsg,
-+	.socket_getsockname =		apparmor_socket_getsockname,
-+	.socket_getpeername =		apparmor_socket_getpeername,
-+	.socket_getsockopt =		apparmor_socket_getsockopt,
-+	.socket_setsockopt =		apparmor_socket_setsockopt,
-+	.socket_shutdown =		apparmor_socket_shutdown,
-+
- 	.cred_alloc_blank =		apparmor_cred_alloc_blank,
- 	.cred_free =			apparmor_cred_free,
- 	.cred_prepare =			apparmor_cred_prepare,
-diff --git a/security/apparmor/net.c b/security/apparmor/net.c
-new file mode 100644
-index 0000000..1765901
---- /dev/null
-+++ b/security/apparmor/net.c
-@@ -0,0 +1,170 @@
-+/*
-+ * AppArmor security module
-+ *
-+ * This file contains AppArmor network mediation
-+ *
-+ * Copyright (C) 1998-2008 Novell/SUSE
-+ * Copyright 2009-2010 Canonical Ltd.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation, version 2 of the
-+ * License.
-+ */
-+
-+#include "include/apparmor.h"
-+#include "include/audit.h"
-+#include "include/context.h"
-+#include "include/net.h"
-+#include "include/policy.h"
-+
-+#include "af_names.h"
-+
-+static const char *sock_type_names[] = {
-+	"unknown(0)",
-+	"stream",
-+	"dgram",
-+	"raw",
-+	"rdm",
-+	"seqpacket",
-+	"dccp",
-+	"unknown(7)",
-+	"unknown(8)",
-+	"unknown(9)",
-+	"packet",
-+};
-+
-+/* audit callback for net specific fields */
-+static void audit_cb(struct audit_buffer *ab, void *va)
-+{
-+	struct common_audit_data *sa = va;
-+
-+	audit_log_format(ab, " family=");
-+	if (address_family_names[sa->u.net.family]) {
-+		audit_log_string(ab, address_family_names[sa->u.net.family]);
-+	} else {
-+		audit_log_format(ab, " \"unknown(%d)\"", sa->u.net.family);
-+	}
-+
-+	audit_log_format(ab, " sock_type=");
-+	if (sock_type_names[sa->aad.net.type]) {
-+		audit_log_string(ab, sock_type_names[sa->aad.net.type]);
-+	} else {
-+		audit_log_format(ab, "\"unknown(%d)\"", sa->aad.net.type);
-+	}
-+
-+	audit_log_format(ab, " protocol=%d", sa->aad.net.protocol);
-+}
-+
-+/**
-+ * audit_net - audit network access
-+ * @profile: profile being enforced  (NOT NULL)
-+ * @op: operation being checked
-+ * @family: network family
-+ * @type:   network type
-+ * @protocol: network protocol
-+ * @sk: socket auditing is being applied to
-+ * @error: error code for failure else 0
-+ *
-+ * Returns: %0 or sa->error else other errorcode on failure
-+ */
-+static int audit_net(struct aa_profile *profile, int op, u16 family, int type,
-+		     int protocol, struct sock *sk, int error)
-+{
-+	int audit_type = AUDIT_APPARMOR_AUTO;
-+	struct common_audit_data sa;
-+	if (sk) {
-+		COMMON_AUDIT_DATA_INIT(&sa, NET);
-+	} else {
-+		COMMON_AUDIT_DATA_INIT(&sa, NONE);
-+	}
-+	/* todo fill in socket addr info */
-+
-+	sa.aad.op = op,
-+	sa.u.net.family = family;
-+	sa.u.net.sk = sk;
-+	sa.aad.net.type = type;
-+	sa.aad.net.protocol = protocol;
-+	sa.aad.error = error;
-+
-+	if (likely(!sa.aad.error)) {
-+		u16 audit_mask = profile->net.audit[sa.u.net.family];
-+		if (likely((AUDIT_MODE(profile) != AUDIT_ALL) &&
-+			   !(1 << sa.aad.net.type & audit_mask)))
-+			return 0;
-+		audit_type = AUDIT_APPARMOR_AUDIT;
-+	} else {
-+		u16 quiet_mask = profile->net.quiet[sa.u.net.family];
-+		u16 kill_mask = 0;
-+		u16 denied = (1 << sa.aad.net.type) & ~quiet_mask;
-+
-+		if (denied & kill_mask)
-+			audit_type = AUDIT_APPARMOR_KILL;
-+
-+		if ((denied & quiet_mask) &&
-+		    AUDIT_MODE(profile) != AUDIT_NOQUIET &&
-+		    AUDIT_MODE(profile) != AUDIT_ALL)
-+			return COMPLAIN_MODE(profile) ? 0 : sa.aad.error;
-+	}
-+
-+	return aa_audit(audit_type, profile, GFP_KERNEL, &sa, audit_cb);
-+}
-+
-+/**
-+ * aa_net_perm - very course network access check
-+ * @op: operation being checked
-+ * @profile: profile being enforced  (NOT NULL)
-+ * @family: network family
-+ * @type:   network type
-+ * @protocol: network protocol
-+ *
-+ * Returns: %0 else error if permission denied
-+ */
-+int aa_net_perm(int op, struct aa_profile *profile, u16 family, int type,
-+		int protocol, struct sock *sk)
-+{
-+	u16 family_mask;
-+	int error;
-+
-+	if ((family < 0) || (family >= AF_MAX))
-+		return -EINVAL;
-+
-+	if ((type < 0) || (type >= SOCK_MAX))
-+		return -EINVAL;
-+
-+	/* unix domain and netlink sockets are handled by ipc */
-+	if (family == AF_UNIX || family == AF_NETLINK)
-+		return 0;
-+
-+	family_mask = profile->net.allow[family];
-+
-+	error = (family_mask & (1 << type)) ? 0 : -EACCES;
-+
-+	return audit_net(profile, op, family, type, protocol, sk, error);
-+}
-+
-+/**
-+ * aa_revalidate_sk - Revalidate access to a sock
-+ * @op: operation being checked
-+ * @sk: sock being revalidated  (NOT NULL)
-+ *
-+ * Returns: %0 else error if permission denied
-+ */
-+int aa_revalidate_sk(int op, struct sock *sk)
-+{
-+	struct aa_profile *profile;
-+	int error = 0;
-+
-+	/* aa_revalidate_sk should not be called from interrupt context
-+	 * don't mediate these calls as they are not task related
-+	 */
-+	if (in_interrupt())
-+		return 0;
-+
-+	profile = __aa_current_profile();
-+	if (!unconfined(profile))
-+		error = aa_net_perm(op, profile, sk->sk_family, sk->sk_type,
-+				    sk->sk_protocol, sk);
-+
-+	return error;
-+}
-diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
-index 4f0eade..4d5ce13 100644
---- a/security/apparmor/policy.c
-+++ b/security/apparmor/policy.c
-@@ -745,6 +745,7 @@ static void free_profile(struct aa_profile *profile)
- 
- 	aa_free_file_rules(&profile->file);
- 	aa_free_cap_rules(&profile->caps);
-+	aa_free_net_rules(&profile->net);
- 	aa_free_rlimit_rules(&profile->rlimits);
- 
- 	aa_free_sid(profile->sid);
-diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
-index 741dd13..ee8043e 100644
---- a/security/apparmor/policy_unpack.c
-+++ b/security/apparmor/policy_unpack.c
-@@ -190,6 +190,19 @@ fail:
- 	return 0;
- }
- 
-+static bool unpack_u16(struct aa_ext *e, u16 *data, const char *name)
-+{
-+	if (unpack_nameX(e, AA_U16, name)) {
-+		if (!inbounds(e, sizeof(u16)))
-+			return 0;
-+		if (data)
-+			*data = le16_to_cpu(get_unaligned((u16 *) e->pos));
-+		e->pos += sizeof(u16);
-+		return 1;
-+	}
-+	return 0;
-+}
-+
- static bool unpack_u32(struct aa_ext *e, u32 *data, const char *name)
- {
- 	if (unpack_nameX(e, AA_U32, name)) {
-@@ -468,7 +481,8 @@ static struct aa_profile *unpack_profile(struct aa_ext *e)
- {
- 	struct aa_profile *profile = NULL;
- 	const char *name = NULL;
--	int error = -EPROTO;
-+	size_t size = 0;
-+	int i, error = -EPROTO;
- 	kernel_cap_t tmpcap;
- 	u32 tmp;
- 
-@@ -559,6 +573,38 @@ static struct aa_profile *unpack_profile(struct aa_ext *e)
- 	if (!unpack_rlimits(e, profile))
- 		goto fail;
- 
-+	size = unpack_array(e, "net_allowed_af");
-+	if (size) {
-+
-+		for (i = 0; i < size; i++) {
-+			/* discard extraneous rules that this kernel will
-+			 * never request
-+			 */
-+			if (i >= AF_MAX) {
-+				u16 tmp;
-+				if (!unpack_u16(e, &tmp, NULL) ||
-+				    !unpack_u16(e, &tmp, NULL) ||
-+				    !unpack_u16(e, &tmp, NULL))
-+					goto fail;
-+				continue;
-+			}
-+			if (!unpack_u16(e, &profile->net.allow[i], NULL))
-+				goto fail;
-+			if (!unpack_u16(e, &profile->net.audit[i], NULL))
-+				goto fail;
-+			if (!unpack_u16(e, &profile->net.quiet[i], NULL))
-+				goto fail;
-+		}
-+		if (!unpack_nameX(e, AA_ARRAYEND, NULL))
-+			goto fail;
-+		/*
-+		 * allow unix domain and netlink sockets they are handled
-+		 * by IPC
-+		 */
-+	}
-+	profile->net.allow[AF_UNIX] = 0xffff;
-+	profile->net.allow[AF_NETLINK] = 0xffff;
-+
- 	/* get file rules */
- 	profile->file.dfa = unpack_dfa(e);
- 	if (IS_ERR(profile->file.dfa)) {
--- 
-1.7.9.5
-
diff --git a/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0002-AppArmor-compatibility-patch-for-v5-interface.patch b/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0002-AppArmor-compatibility-patch-for-v5-interface.patch
deleted file mode 100644
index aa4b6b1109f5..000000000000
--- a/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0002-AppArmor-compatibility-patch-for-v5-interface.patch
+++ /dev/null
@@ -1,391 +0,0 @@
-From 004192fb5223c7b81a949e36a080a5da56132826 Mon Sep 17 00:00:00 2001
-From: John Johansen <john.johansen@canonical.com>
-Date: Wed, 10 Aug 2011 22:02:40 -0700
-Subject: [PATCH 2/3] AppArmor: compatibility patch for v5 interface
-
-Signed-off-by: John Johansen <john.johansen@canonical.com>
----
- security/apparmor/Kconfig              |    9 +
- security/apparmor/Makefile             |    1 +
- security/apparmor/apparmorfs-24.c      |  287 ++++++++++++++++++++++++++++++++
- security/apparmor/apparmorfs.c         |   18 +-
- security/apparmor/include/apparmorfs.h |    6 +
- 5 files changed, 319 insertions(+), 2 deletions(-)
- create mode 100644 security/apparmor/apparmorfs-24.c
-
-diff --git a/security/apparmor/Kconfig b/security/apparmor/Kconfig
-index 9b9013b..51ebf96 100644
---- a/security/apparmor/Kconfig
-+++ b/security/apparmor/Kconfig
-@@ -29,3 +29,12 @@ config SECURITY_APPARMOR_BOOTPARAM_VALUE
- 	  boot.
- 
- 	  If you are unsure how to answer this question, answer 1.
-+
-+config SECURITY_APPARMOR_COMPAT_24
-+	bool "Enable AppArmor 2.4 compatability"
-+	depends on SECURITY_APPARMOR
-+	default y
-+	help
-+	  This option enables compatability with AppArmor 2.4.  It is
-+          recommended if compatability with older versions of AppArmor
-+          is desired.
-diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile
-index 7cefef9..0bb604b 100644
---- a/security/apparmor/Makefile
-+++ b/security/apparmor/Makefile
-@@ -5,6 +5,7 @@ obj-$(CONFIG_SECURITY_APPARMOR) += apparmor.o
- apparmor-y := apparmorfs.o audit.o capability.o context.o ipc.o lib.o match.o \
-               path.o domain.o policy.o policy_unpack.o procattr.o lsm.o \
-               resource.o sid.o file.o net.o
-+apparmor-$(CONFIG_SECURITY_APPARMOR_COMPAT_24) += apparmorfs-24.o
- 
- clean-files := capability_names.h rlim_names.h af_names.h
- 
-diff --git a/security/apparmor/apparmorfs-24.c b/security/apparmor/apparmorfs-24.c
-new file mode 100644
-index 0000000..dc8c744
---- /dev/null
-+++ b/security/apparmor/apparmorfs-24.c
-@@ -0,0 +1,287 @@
-+/*
-+ * AppArmor security module
-+ *
-+ * This file contains AppArmor /sys/kernel/secrutiy/apparmor interface functions
-+ *
-+ * Copyright (C) 1998-2008 Novell/SUSE
-+ * Copyright 2009-2010 Canonical Ltd.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation, version 2 of the
-+ * License.
-+ *
-+ *
-+ * This file contain functions providing an interface for <= AppArmor 2.4
-+ * compatibility.  It is dependent on CONFIG_SECURITY_APPARMOR_COMPAT_24
-+ * being set (see Makefile).
-+ */
-+
-+#include <linux/security.h>
-+#include <linux/vmalloc.h>
-+#include <linux/module.h>
-+#include <linux/seq_file.h>
-+#include <linux/uaccess.h>
-+#include <linux/namei.h>
-+
-+#include "include/apparmor.h"
-+#include "include/audit.h"
-+#include "include/context.h"
-+#include "include/policy.h"
-+
-+
-+/* apparmor/matching */
-+static ssize_t aa_matching_read(struct file *file, char __user *buf,
-+				size_t size, loff_t *ppos)
-+{
-+	const char matching[] = "pattern=aadfa audit perms=crwxamlk/ "
-+	    "user::other";
-+
-+	return simple_read_from_buffer(buf, size, ppos, matching,
-+				       sizeof(matching) - 1);
-+}
-+
-+const struct file_operations aa_fs_matching_fops = {
-+	.read = aa_matching_read,
-+};
-+
-+/* apparmor/features */
-+static ssize_t aa_features_read(struct file *file, char __user *buf,
-+				size_t size, loff_t *ppos)
-+{
-+	const char features[] = "file=3.1 capability=2.0 network=1.0 "
-+	    "change_hat=1.5 change_profile=1.1 " "aanamespaces=1.1 rlimit=1.1";
-+
-+	return simple_read_from_buffer(buf, size, ppos, features,
-+				       sizeof(features) - 1);
-+}
-+
-+const struct file_operations aa_fs_features_fops = {
-+	.read = aa_features_read,
-+};
-+
-+/**
-+ * __next_namespace - find the next namespace to list
-+ * @root: root namespace to stop search at (NOT NULL)
-+ * @ns: current ns position (NOT NULL)
-+ *
-+ * Find the next namespace from @ns under @root and handle all locking needed
-+ * while switching current namespace.
-+ *
-+ * Returns: next namespace or NULL if at last namespace under @root
-+ * NOTE: will not unlock root->lock
-+ */
-+static struct aa_namespace *__next_namespace(struct aa_namespace *root,
-+					     struct aa_namespace *ns)
-+{
-+	struct aa_namespace *parent;
-+
-+	/* is next namespace a child */
-+	if (!list_empty(&ns->sub_ns)) {
-+		struct aa_namespace *next;
-+		next = list_first_entry(&ns->sub_ns, typeof(*ns), base.list);
-+		read_lock(&next->lock);
-+		return next;
-+	}
-+
-+	/* check if the next ns is a sibling, parent, gp, .. */
-+	parent = ns->parent;
-+	while (parent) {
-+		read_unlock(&ns->lock);
-+		list_for_each_entry_continue(ns, &parent->sub_ns, base.list) {
-+			read_lock(&ns->lock);
-+			return ns;
-+		}
-+		if (parent == root)
-+			return NULL;
-+		ns = parent;
-+		parent = parent->parent;
-+	}
-+
-+	return NULL;
-+}
-+
-+/**
-+ * __first_profile - find the first profile in a namespace
-+ * @root: namespace that is root of profiles being displayed (NOT NULL)
-+ * @ns: namespace to start in   (NOT NULL)
-+ *
-+ * Returns: unrefcounted profile or NULL if no profile
-+ */
-+static struct aa_profile *__first_profile(struct aa_namespace *root,
-+					  struct aa_namespace *ns)
-+{
-+	for ( ; ns; ns = __next_namespace(root, ns)) {
-+		if (!list_empty(&ns->base.profiles))
-+			return list_first_entry(&ns->base.profiles,
-+						struct aa_profile, base.list);
-+	}
-+	return NULL;
-+}
-+
-+/**
-+ * __next_profile - step to the next profile in a profile tree
-+ * @profile: current profile in tree (NOT NULL)
-+ *
-+ * Perform a depth first taversal on the profile tree in a namespace
-+ *
-+ * Returns: next profile or NULL if done
-+ * Requires: profile->ns.lock to be held
-+ */
-+static struct aa_profile *__next_profile(struct aa_profile *p)
-+{
-+	struct aa_profile *parent;
-+	struct aa_namespace *ns = p->ns;
-+
-+	/* is next profile a child */
-+	if (!list_empty(&p->base.profiles))
-+		return list_first_entry(&p->base.profiles, typeof(*p),
-+					base.list);
-+
-+	/* is next profile a sibling, parent sibling, gp, subling, .. */
-+	parent = p->parent;
-+	while (parent) {
-+		list_for_each_entry_continue(p, &parent->base.profiles,
-+					     base.list)
-+				return p;
-+		p = parent;
-+		parent = parent->parent;
-+	}
-+
-+	/* is next another profile in the namespace */
-+	list_for_each_entry_continue(p, &ns->base.profiles, base.list)
-+		return p;
-+
-+	return NULL;
-+}
-+
-+/**
-+ * next_profile - step to the next profile in where ever it may be
-+ * @root: root namespace  (NOT NULL)
-+ * @profile: current profile  (NOT NULL)
-+ *
-+ * Returns: next profile or NULL if there isn't one
-+ */
-+static struct aa_profile *next_profile(struct aa_namespace *root,
-+				       struct aa_profile *profile)
-+{
-+	struct aa_profile *next = __next_profile(profile);
-+	if (next)
-+		return next;
-+
-+	/* finished all profiles in namespace move to next namespace */
-+	return __first_profile(root, __next_namespace(root, profile->ns));
-+}
-+
-+/**
-+ * p_start - start a depth first traversal of profile tree
-+ * @f: seq_file to fill
-+ * @pos: current position
-+ *
-+ * Returns: first profile under current namespace or NULL if none found
-+ *
-+ * acquires first ns->lock
-+ */
-+static void *p_start(struct seq_file *f, loff_t *pos)
-+	__acquires(root->lock)
-+{
-+	struct aa_profile *profile = NULL;
-+	struct aa_namespace *root = aa_current_profile()->ns;
-+	loff_t l = *pos;
-+	f->private = aa_get_namespace(root);
-+
-+
-+	/* find the first profile */
-+	read_lock(&root->lock);
-+	profile = __first_profile(root, root);
-+
-+	/* skip to position */
-+	for (; profile && l > 0; l--)
-+		profile = next_profile(root, profile);
-+
-+	return profile;
-+}
-+
-+/**
-+ * p_next - read the next profile entry
-+ * @f: seq_file to fill
-+ * @p: profile previously returned
-+ * @pos: current position
-+ *
-+ * Returns: next profile after @p or NULL if none
-+ *
-+ * may acquire/release locks in namespace tree as necessary
-+ */
-+static void *p_next(struct seq_file *f, void *p, loff_t *pos)
-+{
-+	struct aa_profile *profile = p;
-+	struct aa_namespace *root = f->private;
-+	(*pos)++;
-+
-+	return next_profile(root, profile);
-+}
-+
-+/**
-+ * p_stop - stop depth first traversal
-+ * @f: seq_file we are filling
-+ * @p: the last profile writen
-+ *
-+ * Release all locking done by p_start/p_next on namespace tree
-+ */
-+static void p_stop(struct seq_file *f, void *p)
-+	__releases(root->lock)
-+{
-+	struct aa_profile *profile = p;
-+	struct aa_namespace *root = f->private, *ns;
-+
-+	if (profile) {
-+		for (ns = profile->ns; ns && ns != root; ns = ns->parent)
-+			read_unlock(&ns->lock);
-+	}
-+	read_unlock(&root->lock);
-+	aa_put_namespace(root);
-+}
-+
-+/**
-+ * seq_show_profile - show a profile entry
-+ * @f: seq_file to file
-+ * @p: current position (profile)    (NOT NULL)
-+ *
-+ * Returns: error on failure
-+ */
-+static int seq_show_profile(struct seq_file *f, void *p)
-+{
-+	struct aa_profile *profile = (struct aa_profile *)p;
-+	struct aa_namespace *root = f->private;
-+
-+	if (profile->ns != root)
-+		seq_printf(f, ":%s://", aa_ns_name(root, profile->ns));
-+	seq_printf(f, "%s (%s)\n", profile->base.hname,
-+		   COMPLAIN_MODE(profile) ? "complain" : "enforce");
-+
-+	return 0;
-+}
-+
-+static const struct seq_operations aa_fs_profiles_op = {
-+	.start = p_start,
-+	.next = p_next,
-+	.stop = p_stop,
-+	.show = seq_show_profile,
-+};
-+
-+static int profiles_open(struct inode *inode, struct file *file)
-+{
-+	return seq_open(file, &aa_fs_profiles_op);
-+}
-+
-+static int profiles_release(struct inode *inode, struct file *file)
-+{
-+	return seq_release(inode, file);
-+}
-+
-+const struct file_operations aa_fs_profiles_fops = {
-+	.open = profiles_open,
-+	.read = seq_read,
-+	.llseek = seq_lseek,
-+	.release = profiles_release,
-+};
-diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
-index 69ddb47..867995c 100644
---- a/security/apparmor/apparmorfs.c
-+++ b/security/apparmor/apparmorfs.c
-@@ -187,7 +187,11 @@ void __init aa_destroy_aafs(void)
- 		aafs_remove(".remove");
- 		aafs_remove(".replace");
- 		aafs_remove(".load");
--
-+#ifdef CONFIG_SECURITY_APPARMOR_COMPAT_24
-+		aafs_remove("profiles");
-+		aafs_remove("matching");
-+		aafs_remove("features");
-+#endif
- 		securityfs_remove(aa_fs_dentry);
- 		aa_fs_dentry = NULL;
- 	}
-@@ -218,7 +222,17 @@ static int __init aa_create_aafs(void)
- 		aa_fs_dentry = NULL;
- 		goto error;
- 	}
--
-+#ifdef CONFIG_SECURITY_APPARMOR_COMPAT_24
-+	error = aafs_create("matching", 0444, &aa_fs_matching_fops);
-+	if (error)
-+		goto error;
-+	error = aafs_create("features", 0444, &aa_fs_features_fops);
-+	if (error)
-+		goto error;
-+#endif
-+	error = aafs_create("profiles", 0440, &aa_fs_profiles_fops);
-+	if (error)
-+		goto error;
- 	error = aafs_create(".load", 0640, &aa_fs_profile_load);
- 	if (error)
- 		goto error;
-diff --git a/security/apparmor/include/apparmorfs.h b/security/apparmor/include/apparmorfs.h
-index cb1e93a..14f955c 100644
---- a/security/apparmor/include/apparmorfs.h
-+++ b/security/apparmor/include/apparmorfs.h
-@@ -17,4 +17,10 @@
- 
- extern void __init aa_destroy_aafs(void);
- 
-+#ifdef CONFIG_SECURITY_APPARMOR_COMPAT_24
-+extern const struct file_operations aa_fs_matching_fops;
-+extern const struct file_operations aa_fs_features_fops;
-+extern const struct file_operations aa_fs_profiles_fops;
-+#endif
-+
- #endif /* __AA_APPARMORFS_H */
--- 
-1.7.9.5
-
diff --git a/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch b/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch
deleted file mode 100644
index 7dd55781fdaa..000000000000
--- a/pkgs/os-specific/linux/kernel/apparmor-patches/3.2/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From e5d90918aa31f948ecec2f3c088567dbab30c90b Mon Sep 17 00:00:00 2001
-From: John Johansen <john.johansen@canonical.com>
-Date: Wed, 10 Aug 2011 22:02:41 -0700
-Subject: [PATCH 3/3] AppArmor: Allow dfa backward compatibility with broken
- userspace
-
-The apparmor_parser when compiling policy could generate invalid dfas
-that did not have sufficient padding to avoid invalid references, when
-used by the kernel.  The kernels check to verify the next/check table
-size was broken meaning invalid dfas were being created by userspace
-and not caught.
-
-To remain compatible with old tools that are not fixed, pad the loaded
-dfas next/check table.  The dfa's themselves are valid except for the
-high padding for potentially invalid transitions (high bounds error),
-which have a maximimum is 256 entries.  So just allocate an extra null filled
-256 entries for the next/check tables.  This will guarentee all bounds
-are good and invalid transitions go to the null (0) state.
-
-Signed-off-by: John Johansen <john.johansen@canonical.com>
----
- security/apparmor/match.c |   17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/security/apparmor/match.c b/security/apparmor/match.c
-index 94de6b4..081491e 100644
---- a/security/apparmor/match.c
-+++ b/security/apparmor/match.c
-@@ -57,8 +57,17 @@ static struct table_header *unpack_table(char *blob, size_t bsize)
- 	if (bsize < tsize)
- 		goto out;
- 
-+	/* Pad table allocation for next/check by 256 entries to remain
-+	 * backwards compatible with old (buggy) tools and remain safe without
-+	 * run time checks
-+	 */
-+	if (th.td_id == YYTD_ID_NXT || th.td_id == YYTD_ID_CHK)
-+		tsize += 256 * th.td_flags;
-+
- 	table = kvmalloc(tsize);
- 	if (table) {
-+		/* ensure the pad is clear, else there will be errors */
-+		memset(table, 0, tsize);
- 		*table = th;
- 		if (th.td_flags == YYTD_DATA8)
- 			UNPACK_ARRAY(table->td_data, blob, th.td_lolen,
-@@ -134,11 +143,19 @@ static int verify_dfa(struct aa_dfa *dfa, int flags)
- 		goto out;
- 
- 	if (flags & DFA_FLAG_VERIFY_STATES) {
-+		int warning = 0;
- 		for (i = 0; i < state_count; i++) {
- 			if (DEFAULT_TABLE(dfa)[i] >= state_count)
- 				goto out;
- 			/* TODO: do check that DEF state recursion terminates */
- 			if (BASE_TABLE(dfa)[i] + 255 >= trans_count) {
-+				if (warning)
-+					continue;
-+				printk(KERN_WARNING "AppArmor DFA next/check "
-+				       "upper bounds error fixed, upgrade "
-+				       "user space tools \n");
-+				warning = 1;
-+			} else if (BASE_TABLE(dfa)[i] >= trans_count) {
- 				printk(KERN_ERR "AppArmor DFA next/check upper "
- 				       "bounds error\n");
- 				goto out;
--- 
-1.7.9.5
-
diff --git a/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch b/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch
deleted file mode 100644
index 88a50ca780ae..000000000000
--- a/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0001-UBUNTU-SAUCE-AppArmor-Add-profile-introspection-file.patch
+++ /dev/null
@@ -1,264 +0,0 @@
-From 8de755e4dfdbc40bfcaca848ae6b5aeaf0ede0e8 Mon Sep 17 00:00:00 2001
-From: John Johansen <john.johansen@canonical.com>
-Date: Thu, 22 Jul 2010 02:32:02 -0700
-Subject: [PATCH 1/3] UBUNTU: SAUCE: AppArmor: Add profile introspection file
- to interface
-
-Add the dynamic profiles file to the interace, to allow load policy
-introspection.
-
-Signed-off-by: John Johansen <john.johansen@canonical.com>
-Acked-by: Kees Cook <kees@ubuntu.com>
-Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
----
- security/apparmor/apparmorfs.c |  227 ++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 227 insertions(+)
-
-diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
-index 16c15ec..89bdc62 100644
---- a/security/apparmor/apparmorfs.c
-+++ b/security/apparmor/apparmorfs.c
-@@ -182,6 +182,232 @@ const struct file_operations aa_fs_seq_file_ops = {
- 	.release	= single_release,
- };
- 
-+/**
-+ * __next_namespace - find the next namespace to list
-+ * @root: root namespace to stop search at (NOT NULL)
-+ * @ns: current ns position (NOT NULL)
-+ *
-+ * Find the next namespace from @ns under @root and handle all locking needed
-+ * while switching current namespace.
-+ *
-+ * Returns: next namespace or NULL if at last namespace under @root
-+ * NOTE: will not unlock root->lock
-+ */
-+static struct aa_namespace *__next_namespace(struct aa_namespace *root,
-+					     struct aa_namespace *ns)
-+{
-+	struct aa_namespace *parent;
-+
-+	/* is next namespace a child */
-+	if (!list_empty(&ns->sub_ns)) {
-+		struct aa_namespace *next;
-+		next = list_first_entry(&ns->sub_ns, typeof(*ns), base.list);
-+		read_lock(&next->lock);
-+		return next;
-+	}
-+
-+	/* check if the next ns is a sibling, parent, gp, .. */
-+	parent = ns->parent;
-+	while (parent) {
-+		read_unlock(&ns->lock);
-+		list_for_each_entry_continue(ns, &parent->sub_ns, base.list) {
-+			read_lock(&ns->lock);
-+			return ns;
-+		}
-+		if (parent == root)
-+			return NULL;
-+		ns = parent;
-+		parent = parent->parent;
-+	}
-+
-+	return NULL;
-+}
-+
-+/**
-+ * __first_profile - find the first profile in a namespace
-+ * @root: namespace that is root of profiles being displayed (NOT NULL)
-+ * @ns: namespace to start in   (NOT NULL)
-+ *
-+ * Returns: unrefcounted profile or NULL if no profile
-+ */
-+static struct aa_profile *__first_profile(struct aa_namespace *root,
-+					  struct aa_namespace *ns)
-+{
-+	for ( ; ns; ns = __next_namespace(root, ns)) {
-+		if (!list_empty(&ns->base.profiles))
-+			return list_first_entry(&ns->base.profiles,
-+						struct aa_profile, base.list);
-+	}
-+	return NULL;
-+}
-+
-+/**
-+ * __next_profile - step to the next profile in a profile tree
-+ * @profile: current profile in tree (NOT NULL)
-+ *
-+ * Perform a depth first taversal on the profile tree in a namespace
-+ *
-+ * Returns: next profile or NULL if done
-+ * Requires: profile->ns.lock to be held
-+ */
-+static struct aa_profile *__next_profile(struct aa_profile *p)
-+{
-+	struct aa_profile *parent;
-+	struct aa_namespace *ns = p->ns;
-+
-+	/* is next profile a child */
-+	if (!list_empty(&p->base.profiles))
-+		return list_first_entry(&p->base.profiles, typeof(*p),
-+					base.list);
-+
-+	/* is next profile a sibling, parent sibling, gp, subling, .. */
-+	parent = p->parent;
-+	while (parent) {
-+		list_for_each_entry_continue(p, &parent->base.profiles,
-+					     base.list)
-+				return p;
-+		p = parent;
-+		parent = parent->parent;
-+	}
-+
-+	/* is next another profile in the namespace */
-+	list_for_each_entry_continue(p, &ns->base.profiles, base.list)
-+		return p;
-+
-+	return NULL;
-+}
-+
-+/**
-+ * next_profile - step to the next profile in where ever it may be
-+ * @root: root namespace  (NOT NULL)
-+ * @profile: current profile  (NOT NULL)
-+ *
-+ * Returns: next profile or NULL if there isn't one
-+ */
-+static struct aa_profile *next_profile(struct aa_namespace *root,
-+				       struct aa_profile *profile)
-+{
-+	struct aa_profile *next = __next_profile(profile);
-+	if (next)
-+		return next;
-+
-+	/* finished all profiles in namespace move to next namespace */
-+	return __first_profile(root, __next_namespace(root, profile->ns));
-+}
-+
-+/**
-+ * p_start - start a depth first traversal of profile tree
-+ * @f: seq_file to fill
-+ * @pos: current position
-+ *
-+ * Returns: first profile under current namespace or NULL if none found
-+ *
-+ * acquires first ns->lock
-+ */
-+static void *p_start(struct seq_file *f, loff_t *pos)
-+	__acquires(root->lock)
-+{
-+	struct aa_profile *profile = NULL;
-+	struct aa_namespace *root = aa_current_profile()->ns;
-+	loff_t l = *pos;
-+	f->private = aa_get_namespace(root);
-+
-+
-+	/* find the first profile */
-+	read_lock(&root->lock);
-+	profile = __first_profile(root, root);
-+
-+	/* skip to position */
-+	for (; profile && l > 0; l--)
-+		profile = next_profile(root, profile);
-+
-+	return profile;
-+}
-+
-+/**
-+ * p_next - read the next profile entry
-+ * @f: seq_file to fill
-+ * @p: profile previously returned
-+ * @pos: current position
-+ *
-+ * Returns: next profile after @p or NULL if none
-+ *
-+ * may acquire/release locks in namespace tree as necessary
-+ */
-+static void *p_next(struct seq_file *f, void *p, loff_t *pos)
-+{
-+	struct aa_profile *profile = p;
-+	struct aa_namespace *root = f->private;
-+	(*pos)++;
-+
-+	return next_profile(root, profile);
-+}
-+
-+/**
-+ * p_stop - stop depth first traversal
-+ * @f: seq_file we are filling
-+ * @p: the last profile writen
-+ *
-+ * Release all locking done by p_start/p_next on namespace tree
-+ */
-+static void p_stop(struct seq_file *f, void *p)
-+	__releases(root->lock)
-+{
-+	struct aa_profile *profile = p;
-+	struct aa_namespace *root = f->private, *ns;
-+
-+	if (profile) {
-+		for (ns = profile->ns; ns && ns != root; ns = ns->parent)
-+			read_unlock(&ns->lock);
-+	}
-+	read_unlock(&root->lock);
-+	aa_put_namespace(root);
-+}
-+
-+/**
-+ * seq_show_profile - show a profile entry
-+ * @f: seq_file to file
-+ * @p: current position (profile)    (NOT NULL)
-+ *
-+ * Returns: error on failure
-+ */
-+static int seq_show_profile(struct seq_file *f, void *p)
-+{
-+	struct aa_profile *profile = (struct aa_profile *)p;
-+	struct aa_namespace *root = f->private;
-+
-+	if (profile->ns != root)
-+		seq_printf(f, ":%s://", aa_ns_name(root, profile->ns));
-+	seq_printf(f, "%s (%s)\n", profile->base.hname,
-+		   COMPLAIN_MODE(profile) ? "complain" : "enforce");
-+
-+	return 0;
-+}
-+
-+static const struct seq_operations aa_fs_profiles_op = {
-+	.start = p_start,
-+	.next = p_next,
-+	.stop = p_stop,
-+	.show = seq_show_profile,
-+};
-+
-+static int profiles_open(struct inode *inode, struct file *file)
-+{
-+	return seq_open(file, &aa_fs_profiles_op);
-+}
-+
-+static int profiles_release(struct inode *inode, struct file *file)
-+{
-+	return seq_release(inode, file);
-+}
-+
-+const struct file_operations aa_fs_profiles_fops = {
-+	.open = profiles_open,
-+	.read = seq_read,
-+	.llseek = seq_lseek,
-+	.release = profiles_release,
-+};
-+
- /** Base file system setup **/
- 
- static struct aa_fs_entry aa_fs_entry_file[] = {
-@@ -210,6 +436,7 @@ static struct aa_fs_entry aa_fs_entry_apparmor[] = {
- 	AA_FS_FILE_FOPS(".load", 0640, &aa_fs_profile_load),
- 	AA_FS_FILE_FOPS(".replace", 0640, &aa_fs_profile_replace),
- 	AA_FS_FILE_FOPS(".remove", 0640, &aa_fs_profile_remove),
-+	AA_FS_FILE_FOPS("profiles", 0640, &aa_fs_profiles_fops),
- 	AA_FS_DIR("features", aa_fs_entry_features),
- 	{ }
- };
--- 
-1.7.9.5
-
diff --git a/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch b/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch
deleted file mode 100644
index 01316b9db78b..000000000000
--- a/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0002-UBUNTU-SAUCE-AppArmor-basic-networking-rules.patch
+++ /dev/null
@@ -1,603 +0,0 @@
-From 423e2cb454d75d6185eecd0c1b5cf6ccc2d8482d Mon Sep 17 00:00:00 2001
-From: John Johansen <john.johansen@canonical.com>
-Date: Mon, 4 Oct 2010 15:03:36 -0700
-Subject: [PATCH 2/3] UBUNTU: SAUCE: AppArmor: basic networking rules
-
-Base support for network mediation.
-
-Signed-off-by: John Johansen <john.johansen@canonical.com>
----
- security/apparmor/.gitignore       |    2 +-
- security/apparmor/Makefile         |   42 +++++++++-
- security/apparmor/apparmorfs.c     |    1 +
- security/apparmor/include/audit.h  |    4 +
- security/apparmor/include/net.h    |   44 ++++++++++
- security/apparmor/include/policy.h |    3 +
- security/apparmor/lsm.c            |  112 +++++++++++++++++++++++++
- security/apparmor/net.c            |  162 ++++++++++++++++++++++++++++++++++++
- security/apparmor/policy.c         |    1 +
- security/apparmor/policy_unpack.c  |   46 ++++++++++
- 10 files changed, 414 insertions(+), 3 deletions(-)
- create mode 100644 security/apparmor/include/net.h
- create mode 100644 security/apparmor/net.c
-
-diff --git a/security/apparmor/.gitignore b/security/apparmor/.gitignore
-index 4d995ae..d5b291e 100644
---- a/security/apparmor/.gitignore
-+++ b/security/apparmor/.gitignore
-@@ -1,6 +1,6 @@
- #
- # Generated include files
- #
--af_names.h
-+net_names.h
- capability_names.h
- rlim_names.h
-diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile
-index 806bd19..19daa85 100644
---- a/security/apparmor/Makefile
-+++ b/security/apparmor/Makefile
-@@ -4,9 +4,9 @@ obj-$(CONFIG_SECURITY_APPARMOR) += apparmor.o
- 
- apparmor-y := apparmorfs.o audit.o capability.o context.o ipc.o lib.o match.o \
-               path.o domain.o policy.o policy_unpack.o procattr.o lsm.o \
--              resource.o sid.o file.o
-+              resource.o sid.o file.o net.o
- 
--clean-files := capability_names.h rlim_names.h
-+clean-files := capability_names.h rlim_names.h net_names.h
- 
- 
- # Build a lower case string table of capability names
-@@ -20,6 +20,38 @@ cmd_make-caps = echo "static const char *const capability_names[] = {" > $@ ;\
- 	-e 's/^\#define[ \t]+CAP_([A-Z0-9_]+)[ \t]+([0-9]+)/[\2] = "\L\1",/p';\
- 	echo "};" >> $@
- 
-+# Build a lower case string table of address family names
-+# Transform lines from
-+#    define AF_LOCAL	1	/* POSIX name for AF_UNIX	*/
-+#    #define AF_INET		2	/* Internet IP Protocol 	*/
-+# to
-+#    [1] = "local",
-+#    [2] = "inet",
-+#
-+# and build the securityfs entries for the mapping.
-+# Transforms lines from
-+#    #define AF_INET		2	/* Internet IP Protocol 	*/
-+# to
-+#    #define AA_FS_AF_MASK "local inet"
-+quiet_cmd_make-af = GEN     $@
-+cmd_make-af = echo "static const char *address_family_names[] = {" > $@ ;\
-+	sed $< >>$@ -r -n -e "/AF_MAX/d" -e "/AF_LOCAL/d" -e \
-+	 's/^\#define[ \t]+AF_([A-Z0-9_]+)[ \t]+([0-9]+)(.*)/[\2] = "\L\1",/p';\
-+	echo "};" >> $@ ;\
-+	echo -n '\#define AA_FS_AF_MASK "' >> $@ ;\
-+	sed -r -n 's/^\#define[ \t]+AF_([A-Z0-9_]+)[ \t]+([0-9]+)(.*)/\L\1/p'\
-+	 $< | tr '\n' ' ' | sed -e 's/ $$/"\n/' >> $@
-+
-+# Build a lower case string table of sock type names
-+# Transform lines from
-+#    SOCK_STREAM	= 1,
-+# to
-+#    [1] = "stream",
-+quiet_cmd_make-sock = GEN     $@
-+cmd_make-sock = echo "static const char *sock_type_names[] = {" >> $@ ;\
-+	sed $^ >>$@ -r -n \
-+	-e 's/^\tSOCK_([A-Z0-9_]+)[\t]+=[ \t]+([0-9]+)(.*)/[\2] = "\L\1",/p';\
-+	echo "};" >> $@
- 
- # Build a lower case string table of rlimit names.
- # Transforms lines from
-@@ -56,6 +88,7 @@ cmd_make-rlim = echo "static const char *const rlim_names[RLIM_NLIMITS] = {" \
- 	    tr '\n' ' ' | sed -e 's/ $$/"\n/' >> $@
- 
- $(obj)/capability.o : $(obj)/capability_names.h
-+$(obj)/net.o : $(obj)/net_names.h
- $(obj)/resource.o : $(obj)/rlim_names.h
- $(obj)/capability_names.h : $(srctree)/include/linux/capability.h \
- 			    $(src)/Makefile
-@@ -63,3 +96,8 @@ $(obj)/capability_names.h : $(srctree)/include/linux/capability.h \
- $(obj)/rlim_names.h : $(srctree)/include/asm-generic/resource.h \
- 		      $(src)/Makefile
- 	$(call cmd,make-rlim)
-+$(obj)/net_names.h : $(srctree)/include/linux/socket.h \
-+		     $(srctree)/include/linux/net.h \
-+		     $(src)/Makefile
-+	$(call cmd,make-af)
-+	$(call cmd,make-sock)
-diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
-index 89bdc62..c66315d 100644
---- a/security/apparmor/apparmorfs.c
-+++ b/security/apparmor/apparmorfs.c
-@@ -427,6 +427,7 @@ static struct aa_fs_entry aa_fs_entry_domain[] = {
- static struct aa_fs_entry aa_fs_entry_features[] = {
- 	AA_FS_DIR("domain",			aa_fs_entry_domain),
- 	AA_FS_DIR("file",			aa_fs_entry_file),
-+	AA_FS_DIR("network",                    aa_fs_entry_network),
- 	AA_FS_FILE_U64("capability",		VFS_CAP_FLAGS_MASK),
- 	AA_FS_DIR("rlimit",			aa_fs_entry_rlimit),
- 	{ }
-diff --git a/security/apparmor/include/audit.h b/security/apparmor/include/audit.h
-index 3868b1e..c1ff09c 100644
---- a/security/apparmor/include/audit.h
-+++ b/security/apparmor/include/audit.h
-@@ -126,6 +126,10 @@ struct apparmor_audit_data {
- 			u32 denied;
- 			uid_t ouid;
- 		} fs;
-+		struct {
-+			int type, protocol;
-+			struct sock *sk;
-+		} net;
- 	};
- };
- 
-diff --git a/security/apparmor/include/net.h b/security/apparmor/include/net.h
-new file mode 100644
-index 0000000..cb8a121
---- /dev/null
-+++ b/security/apparmor/include/net.h
-@@ -0,0 +1,44 @@
-+/*
-+ * AppArmor security module
-+ *
-+ * This file contains AppArmor network mediation definitions.
-+ *
-+ * Copyright (C) 1998-2008 Novell/SUSE
-+ * Copyright 2009-2012 Canonical Ltd.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation, version 2 of the
-+ * License.
-+ */
-+
-+#ifndef __AA_NET_H
-+#define __AA_NET_H
-+
-+#include <net/sock.h>
-+
-+#include "apparmorfs.h"
-+
-+/* struct aa_net - network confinement data
-+ * @allowed: basic network families permissions
-+ * @audit_network: which network permissions to force audit
-+ * @quiet_network: which network permissions to quiet rejects
-+ */
-+struct aa_net {
-+	u16 allow[AF_MAX];
-+	u16 audit[AF_MAX];
-+	u16 quiet[AF_MAX];
-+};
-+
-+extern struct aa_fs_entry aa_fs_entry_network[];
-+
-+extern int aa_net_perm(int op, struct aa_profile *profile, u16 family,
-+		       int type, int protocol, struct sock *sk);
-+extern int aa_revalidate_sk(int op, struct sock *sk);
-+
-+static inline void aa_free_net_rules(struct aa_net *new)
-+{
-+	/* NOP */
-+}
-+
-+#endif /* __AA_NET_H */
-diff --git a/security/apparmor/include/policy.h b/security/apparmor/include/policy.h
-index bda4569..eb13a73 100644
---- a/security/apparmor/include/policy.h
-+++ b/security/apparmor/include/policy.h
-@@ -27,6 +27,7 @@
- #include "capability.h"
- #include "domain.h"
- #include "file.h"
-+#include "net.h"
- #include "resource.h"
- 
- extern const char *const profile_mode_names[];
-@@ -157,6 +158,7 @@ struct aa_policydb {
-  * @policy: general match rules governing policy
-  * @file: The set of rules governing basic file access and domain transitions
-  * @caps: capabilities for the profile
-+ * @net: network controls for the profile
-  * @rlimits: rlimits for the profile
-  *
-  * The AppArmor profile contains the basic confinement data.  Each profile
-@@ -194,6 +196,7 @@ struct aa_profile {
- 	struct aa_policydb policy;
- 	struct aa_file_rules file;
- 	struct aa_caps caps;
-+	struct aa_net net;
- 	struct aa_rlimit rlimits;
- };
- 
-diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
-index ad05d39..3cde194 100644
---- a/security/apparmor/lsm.c
-+++ b/security/apparmor/lsm.c
-@@ -32,6 +32,7 @@
- #include "include/context.h"
- #include "include/file.h"
- #include "include/ipc.h"
-+#include "include/net.h"
- #include "include/path.h"
- #include "include/policy.h"
- #include "include/procattr.h"
-@@ -622,6 +623,104 @@ static int apparmor_task_setrlimit(struct task_struct *task,
- 	return error;
- }
- 
-+static int apparmor_socket_create(int family, int type, int protocol, int kern)
-+{
-+	struct aa_profile *profile;
-+	int error = 0;
-+
-+	if (kern)
-+		return 0;
-+
-+	profile = __aa_current_profile();
-+	if (!unconfined(profile))
-+		error = aa_net_perm(OP_CREATE, profile, family, type, protocol,
-+				    NULL);
-+	return error;
-+}
-+
-+static int apparmor_socket_bind(struct socket *sock,
-+				struct sockaddr *address, int addrlen)
-+{
-+	struct sock *sk = sock->sk;
-+
-+	return aa_revalidate_sk(OP_BIND, sk);
-+}
-+
-+static int apparmor_socket_connect(struct socket *sock,
-+				   struct sockaddr *address, int addrlen)
-+{
-+	struct sock *sk = sock->sk;
-+
-+	return aa_revalidate_sk(OP_CONNECT, sk);
-+}
-+
-+static int apparmor_socket_listen(struct socket *sock, int backlog)
-+{
-+	struct sock *sk = sock->sk;
-+
-+	return aa_revalidate_sk(OP_LISTEN, sk);
-+}
-+
-+static int apparmor_socket_accept(struct socket *sock, struct socket *newsock)
-+{
-+	struct sock *sk = sock->sk;
-+
-+	return aa_revalidate_sk(OP_ACCEPT, sk);
-+}
-+
-+static int apparmor_socket_sendmsg(struct socket *sock,
-+				   struct msghdr *msg, int size)
-+{
-+	struct sock *sk = sock->sk;
-+
-+	return aa_revalidate_sk(OP_SENDMSG, sk);
-+}
-+
-+static int apparmor_socket_recvmsg(struct socket *sock,
-+				   struct msghdr *msg, int size, int flags)
-+{
-+	struct sock *sk = sock->sk;
-+
-+	return aa_revalidate_sk(OP_RECVMSG, sk);
-+}
-+
-+static int apparmor_socket_getsockname(struct socket *sock)
-+{
-+	struct sock *sk = sock->sk;
-+
-+	return aa_revalidate_sk(OP_GETSOCKNAME, sk);
-+}
-+
-+static int apparmor_socket_getpeername(struct socket *sock)
-+{
-+	struct sock *sk = sock->sk;
-+
-+	return aa_revalidate_sk(OP_GETPEERNAME, sk);
-+}
-+
-+static int apparmor_socket_getsockopt(struct socket *sock, int level,
-+				      int optname)
-+{
-+	struct sock *sk = sock->sk;
-+
-+	return aa_revalidate_sk(OP_GETSOCKOPT, sk);
-+}
-+
-+static int apparmor_socket_setsockopt(struct socket *sock, int level,
-+				      int optname)
-+{
-+	struct sock *sk = sock->sk;
-+
-+	return aa_revalidate_sk(OP_SETSOCKOPT, sk);
-+}
-+
-+static int apparmor_socket_shutdown(struct socket *sock, int how)
-+{
-+	struct sock *sk = sock->sk;
-+
-+	return aa_revalidate_sk(OP_SOCK_SHUTDOWN, sk);
-+}
-+
- static struct security_operations apparmor_ops = {
- 	.name =				"apparmor",
- 
-@@ -653,6 +752,19 @@ static struct security_operations apparmor_ops = {
- 	.getprocattr =			apparmor_getprocattr,
- 	.setprocattr =			apparmor_setprocattr,
- 
-+	.socket_create =		apparmor_socket_create,
-+	.socket_bind =			apparmor_socket_bind,
-+	.socket_connect =		apparmor_socket_connect,
-+	.socket_listen =		apparmor_socket_listen,
-+	.socket_accept =		apparmor_socket_accept,
-+	.socket_sendmsg =		apparmor_socket_sendmsg,
-+	.socket_recvmsg =		apparmor_socket_recvmsg,
-+	.socket_getsockname =		apparmor_socket_getsockname,
-+	.socket_getpeername =		apparmor_socket_getpeername,
-+	.socket_getsockopt =		apparmor_socket_getsockopt,
-+	.socket_setsockopt =		apparmor_socket_setsockopt,
-+	.socket_shutdown =		apparmor_socket_shutdown,
-+
- 	.cred_alloc_blank =		apparmor_cred_alloc_blank,
- 	.cred_free =			apparmor_cred_free,
- 	.cred_prepare =			apparmor_cred_prepare,
-diff --git a/security/apparmor/net.c b/security/apparmor/net.c
-new file mode 100644
-index 0000000..084232b
---- /dev/null
-+++ b/security/apparmor/net.c
-@@ -0,0 +1,162 @@
-+/*
-+ * AppArmor security module
-+ *
-+ * This file contains AppArmor network mediation
-+ *
-+ * Copyright (C) 1998-2008 Novell/SUSE
-+ * Copyright 2009-2012 Canonical Ltd.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation, version 2 of the
-+ * License.
-+ */
-+
-+#include "include/apparmor.h"
-+#include "include/audit.h"
-+#include "include/context.h"
-+#include "include/net.h"
-+#include "include/policy.h"
-+
-+#include "net_names.h"
-+
-+struct aa_fs_entry aa_fs_entry_network[] = {
-+	AA_FS_FILE_STRING("af_mask", AA_FS_AF_MASK),
-+	{ }
-+};
-+
-+/* audit callback for net specific fields */
-+static void audit_cb(struct audit_buffer *ab, void *va)
-+{
-+	struct common_audit_data *sa = va;
-+
-+	audit_log_format(ab, " family=");
-+	if (address_family_names[sa->u.net->family]) {
-+		audit_log_string(ab, address_family_names[sa->u.net->family]);
-+	} else {
-+		audit_log_format(ab, "\"unknown(%d)\"", sa->u.net->family);
-+	}
-+	audit_log_format(ab, " sock_type=");
-+	if (sock_type_names[sa->aad->net.type]) {
-+		audit_log_string(ab, sock_type_names[sa->aad->net.type]);
-+	} else {
-+		audit_log_format(ab, "\"unknown(%d)\"", sa->aad->net.type);
-+	}
-+	audit_log_format(ab, " protocol=%d", sa->aad->net.protocol);
-+}
-+
-+/**
-+ * audit_net - audit network access
-+ * @profile: profile being enforced  (NOT NULL)
-+ * @op: operation being checked
-+ * @family: network family
-+ * @type:   network type
-+ * @protocol: network protocol
-+ * @sk: socket auditing is being applied to
-+ * @error: error code for failure else 0
-+ *
-+ * Returns: %0 or sa->error else other errorcode on failure
-+ */
-+static int audit_net(struct aa_profile *profile, int op, u16 family, int type,
-+		     int protocol, struct sock *sk, int error)
-+{
-+	int audit_type = AUDIT_APPARMOR_AUTO;
-+	struct common_audit_data sa;
-+	struct apparmor_audit_data aad = { };
-+	struct lsm_network_audit net = { };
-+	if (sk) {
-+		COMMON_AUDIT_DATA_INIT(&sa, NET);
-+	} else {
-+		COMMON_AUDIT_DATA_INIT(&sa, NONE);
-+	}
-+	/* todo fill in socket addr info */
-+	sa.aad = &aad;
-+	sa.u.net = &net;
-+	sa.aad->op = op,
-+	sa.u.net->family = family;
-+	sa.u.net->sk = sk;
-+	sa.aad->net.type = type;
-+	sa.aad->net.protocol = protocol;
-+	sa.aad->error = error;
-+
-+	if (likely(!sa.aad->error)) {
-+		u16 audit_mask = profile->net.audit[sa.u.net->family];
-+		if (likely((AUDIT_MODE(profile) != AUDIT_ALL) &&
-+			   !(1 << sa.aad->net.type & audit_mask)))
-+			return 0;
-+		audit_type = AUDIT_APPARMOR_AUDIT;
-+	} else {
-+		u16 quiet_mask = profile->net.quiet[sa.u.net->family];
-+		u16 kill_mask = 0;
-+		u16 denied = (1 << sa.aad->net.type) & ~quiet_mask;
-+
-+		if (denied & kill_mask)
-+			audit_type = AUDIT_APPARMOR_KILL;
-+
-+		if ((denied & quiet_mask) &&
-+		    AUDIT_MODE(profile) != AUDIT_NOQUIET &&
-+		    AUDIT_MODE(profile) != AUDIT_ALL)
-+			return COMPLAIN_MODE(profile) ? 0 : sa.aad->error;
-+	}
-+
-+	return aa_audit(audit_type, profile, GFP_KERNEL, &sa, audit_cb);
-+}
-+
-+/**
-+ * aa_net_perm - very course network access check
-+ * @op: operation being checked
-+ * @profile: profile being enforced  (NOT NULL)
-+ * @family: network family
-+ * @type:   network type
-+ * @protocol: network protocol
-+ *
-+ * Returns: %0 else error if permission denied
-+ */
-+int aa_net_perm(int op, struct aa_profile *profile, u16 family, int type,
-+		int protocol, struct sock *sk)
-+{
-+	u16 family_mask;
-+	int error;
-+
-+	if ((family < 0) || (family >= AF_MAX))
-+		return -EINVAL;
-+
-+	if ((type < 0) || (type >= SOCK_MAX))
-+		return -EINVAL;
-+
-+	/* unix domain and netlink sockets are handled by ipc */
-+	if (family == AF_UNIX || family == AF_NETLINK)
-+		return 0;
-+
-+	family_mask = profile->net.allow[family];
-+
-+	error = (family_mask & (1 << type)) ? 0 : -EACCES;
-+
-+	return audit_net(profile, op, family, type, protocol, sk, error);
-+}
-+
-+/**
-+ * aa_revalidate_sk - Revalidate access to a sock
-+ * @op: operation being checked
-+ * @sk: sock being revalidated  (NOT NULL)
-+ *
-+ * Returns: %0 else error if permission denied
-+ */
-+int aa_revalidate_sk(int op, struct sock *sk)
-+{
-+	struct aa_profile *profile;
-+	int error = 0;
-+
-+	/* aa_revalidate_sk should not be called from interrupt context
-+	 * don't mediate these calls as they are not task related
-+	 */
-+	if (in_interrupt())
-+		return 0;
-+
-+	profile = __aa_current_profile();
-+	if (!unconfined(profile))
-+		error = aa_net_perm(op, profile, sk->sk_family, sk->sk_type,
-+				    sk->sk_protocol, sk);
-+
-+	return error;
-+}
-diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
-index f1f7506..b8100a7 100644
---- a/security/apparmor/policy.c
-+++ b/security/apparmor/policy.c
-@@ -745,6 +745,7 @@ static void free_profile(struct aa_profile *profile)
- 
- 	aa_free_file_rules(&profile->file);
- 	aa_free_cap_rules(&profile->caps);
-+	aa_free_net_rules(&profile->net);
- 	aa_free_rlimit_rules(&profile->rlimits);
- 
- 	aa_free_sid(profile->sid);
-diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
-index deab7c7..8f8e9c1 100644
---- a/security/apparmor/policy_unpack.c
-+++ b/security/apparmor/policy_unpack.c
-@@ -193,6 +193,19 @@ fail:
- 	return 0;
- }
- 
-+static bool unpack_u16(struct aa_ext *e, u16 *data, const char *name)
-+{
-+	if (unpack_nameX(e, AA_U16, name)) {
-+		if (!inbounds(e, sizeof(u16)))
-+			return 0;
-+		if (data)
-+			*data = le16_to_cpu(get_unaligned((u16 *) e->pos));
-+		e->pos += sizeof(u16);
-+		return 1;
-+	}
-+	return 0;
-+}
-+
- static bool unpack_u32(struct aa_ext *e, u32 *data, const char *name)
- {
- 	if (unpack_nameX(e, AA_U32, name)) {
-@@ -471,6 +484,7 @@ static struct aa_profile *unpack_profile(struct aa_ext *e)
- {
- 	struct aa_profile *profile = NULL;
- 	const char *name = NULL;
-+	size_t size = 0;
- 	int i, error = -EPROTO;
- 	kernel_cap_t tmpcap;
- 	u32 tmp;
-@@ -564,6 +578,38 @@ static struct aa_profile *unpack_profile(struct aa_ext *e)
- 	if (!unpack_rlimits(e, profile))
- 		goto fail;
- 
-+	size = unpack_array(e, "net_allowed_af");
-+	if (size) {
-+
-+		for (i = 0; i < size; i++) {
-+			/* discard extraneous rules that this kernel will
-+			 * never request
-+			 */
-+			if (i >= AF_MAX) {
-+				u16 tmp;
-+				if (!unpack_u16(e, &tmp, NULL) ||
-+				    !unpack_u16(e, &tmp, NULL) ||
-+				    !unpack_u16(e, &tmp, NULL))
-+					goto fail;
-+				continue;
-+			}
-+			if (!unpack_u16(e, &profile->net.allow[i], NULL))
-+				goto fail;
-+			if (!unpack_u16(e, &profile->net.audit[i], NULL))
-+				goto fail;
-+			if (!unpack_u16(e, &profile->net.quiet[i], NULL))
-+				goto fail;
-+		}
-+		if (!unpack_nameX(e, AA_ARRAYEND, NULL))
-+			goto fail;
-+	}
-+	/*
-+	 * allow unix domain and netlink sockets they are handled
-+	 * by IPC
-+	 */
-+	profile->net.allow[AF_UNIX] = 0xffff;
-+	profile->net.allow[AF_NETLINK] = 0xffff;
-+
- 	if (unpack_nameX(e, AA_STRUCT, "policydb")) {
- 		/* generic policy dfa - optional and may be NULL */
- 		profile->policy.dfa = unpack_dfa(e);
--- 
-1.7.9.5
-
diff --git a/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch b/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch
deleted file mode 100644
index 48b34343e0b8..000000000000
--- a/pkgs/os-specific/linux/kernel/apparmor-patches/3.4/0003-UBUNTU-SAUCE-apparmor-Add-the-ability-to-mediate-mou.patch
+++ /dev/null
@@ -1,957 +0,0 @@
-From a94d5e11c0484af59e5feebf144cc48c186892ad Mon Sep 17 00:00:00 2001
-From: John Johansen <john.johansen@canonical.com>
-Date: Wed, 16 May 2012 10:58:05 -0700
-Subject: [PATCH 3/3] UBUNTU: SAUCE: apparmor: Add the ability to mediate
- mount
-
-Add the ability for apparmor to do mediation of mount operations. Mount
-rules require an updated apparmor_parser (2.8 series) for policy compilation.
-
-The basic form of the rules are.
-
-  [audit] [deny] mount [conds]* [device] [ -> [conds] path],
-  [audit] [deny] remount [conds]* [path],
-  [audit] [deny] umount [conds]* [path],
-  [audit] [deny] pivotroot [oldroot=<value>] <path>
-
-  remount is just a short cut for mount options=remount
-
-  where [conds] can be
-    fstype=<expr>
-    options=<expr>
-
-Example mount commands
-  mount,		# allow all mounts, but not umount or pivotroot
-
-  mount fstype=procfs,  # allow mounting procfs anywhere
-
-  mount options=(bind, ro) /foo -> /bar,  # readonly bind mount
-
-  mount /dev/sda -> /mnt,
-
-  mount /dev/sd** -> /mnt/**,
-
-  mount fstype=overlayfs options=(rw,upperdir=/tmp/upper/,lowerdir=/) -> /mnt/
-
-  umount,
-
-  umount /m*,
-
-See the apparmor userspace for full documentation
-
-Signed-off-by: John Johansen <john.johansen@canonical.com>
-Acked-by: Kees Cook <kees@ubuntu.com>
----
- security/apparmor/Makefile           |    2 +-
- security/apparmor/apparmorfs.c       |   13 +
- security/apparmor/audit.c            |    4 +
- security/apparmor/domain.c           |    2 +-
- security/apparmor/include/apparmor.h |    3 +-
- security/apparmor/include/audit.h    |   11 +
- security/apparmor/include/domain.h   |    2 +
- security/apparmor/include/mount.h    |   54 +++
- security/apparmor/lsm.c              |   59 ++++
- security/apparmor/mount.c            |  620 ++++++++++++++++++++++++++++++++++
- 10 files changed, 767 insertions(+), 3 deletions(-)
- create mode 100644 security/apparmor/include/mount.h
- create mode 100644 security/apparmor/mount.c
-
-diff --git a/security/apparmor/Makefile b/security/apparmor/Makefile
-index 19daa85..63e0a4c 100644
---- a/security/apparmor/Makefile
-+++ b/security/apparmor/Makefile
-@@ -4,7 +4,7 @@ obj-$(CONFIG_SECURITY_APPARMOR) += apparmor.o
- 
- apparmor-y := apparmorfs.o audit.o capability.o context.o ipc.o lib.o match.o \
-               path.o domain.o policy.o policy_unpack.o procattr.o lsm.o \
--              resource.o sid.o file.o net.o
-+              resource.o sid.o file.o net.o mount.o
- 
- clean-files := capability_names.h rlim_names.h net_names.h
- 
-diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c
-index c66315d..ff19009 100644
---- a/security/apparmor/apparmorfs.c
-+++ b/security/apparmor/apparmorfs.c
-@@ -424,10 +424,23 @@ static struct aa_fs_entry aa_fs_entry_domain[] = {
- 	{ }
- };
- 
-+static struct aa_fs_entry aa_fs_entry_mount[] = {
-+	AA_FS_FILE_STRING("mask", "mount umount"),
-+	{ }
-+};
-+
-+static struct aa_fs_entry aa_fs_entry_namespaces[] = {
-+	AA_FS_FILE_BOOLEAN("profile",           1),
-+	AA_FS_FILE_BOOLEAN("pivot_root",        1),
-+	{ }
-+};
-+
- static struct aa_fs_entry aa_fs_entry_features[] = {
- 	AA_FS_DIR("domain",			aa_fs_entry_domain),
- 	AA_FS_DIR("file",			aa_fs_entry_file),
- 	AA_FS_DIR("network",                    aa_fs_entry_network),
-+	AA_FS_DIR("mount",                      aa_fs_entry_mount),
-+	AA_FS_DIR("namespaces",                 aa_fs_entry_namespaces),
- 	AA_FS_FILE_U64("capability",		VFS_CAP_FLAGS_MASK),
- 	AA_FS_DIR("rlimit",			aa_fs_entry_rlimit),
- 	{ }
-diff --git a/security/apparmor/audit.c b/security/apparmor/audit.c
-index cc3520d..b9f5ee9 100644
---- a/security/apparmor/audit.c
-+++ b/security/apparmor/audit.c
-@@ -44,6 +44,10 @@ const char *const op_table[] = {
- 	"file_mmap",
- 	"file_mprotect",
- 
-+	"pivotroot",
-+	"mount",
-+	"umount",
-+
- 	"create",
- 	"post_create",
- 	"bind",
-diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c
-index 6327685..dfdc47b 100644
---- a/security/apparmor/domain.c
-+++ b/security/apparmor/domain.c
-@@ -242,7 +242,7 @@ static const char *next_name(int xtype, const char *name)
-  *
-  * Returns: refcounted profile, or NULL on failure (MAYBE NULL)
-  */
--static struct aa_profile *x_table_lookup(struct aa_profile *profile, u32 xindex)
-+struct aa_profile *x_table_lookup(struct aa_profile *profile, u32 xindex)
- {
- 	struct aa_profile *new_profile = NULL;
- 	struct aa_namespace *ns = profile->ns;
-diff --git a/security/apparmor/include/apparmor.h b/security/apparmor/include/apparmor.h
-index 40aedd9..e243d96 100644
---- a/security/apparmor/include/apparmor.h
-+++ b/security/apparmor/include/apparmor.h
-@@ -29,8 +29,9 @@
- #define AA_CLASS_NET		4
- #define AA_CLASS_RLIMITS	5
- #define AA_CLASS_DOMAIN		6
-+#define AA_CLASS_MOUNT		7
- 
--#define AA_CLASS_LAST		AA_CLASS_DOMAIN
-+#define AA_CLASS_LAST		AA_CLASS_MOUNT
- 
- /* Control parameters settable through module/boot flags */
- extern enum audit_mode aa_g_audit;
-diff --git a/security/apparmor/include/audit.h b/security/apparmor/include/audit.h
-index c1ff09c..7b90900c 100644
---- a/security/apparmor/include/audit.h
-+++ b/security/apparmor/include/audit.h
-@@ -73,6 +73,10 @@ enum aa_ops {
- 	OP_FMMAP,
- 	OP_FMPROT,
- 
-+	OP_PIVOTROOT,
-+	OP_MOUNT,
-+	OP_UMOUNT,
-+
- 	OP_CREATE,
- 	OP_POST_CREATE,
- 	OP_BIND,
-@@ -121,6 +125,13 @@ struct apparmor_audit_data {
- 			unsigned long max;
- 		} rlim;
- 		struct {
-+			const char *src_name;
-+			const char *type;
-+			const char *trans;
-+			const char *data;
-+			unsigned long flags;
-+		} mnt;
-+		struct {
- 			const char *target;
- 			u32 request;
- 			u32 denied;
-diff --git a/security/apparmor/include/domain.h b/security/apparmor/include/domain.h
-index de04464..a3f70c5 100644
---- a/security/apparmor/include/domain.h
-+++ b/security/apparmor/include/domain.h
-@@ -23,6 +23,8 @@ struct aa_domain {
- 	char **table;
- };
- 
-+struct aa_profile *x_table_lookup(struct aa_profile *profile, u32 xindex);
-+
- int apparmor_bprm_set_creds(struct linux_binprm *bprm);
- int apparmor_bprm_secureexec(struct linux_binprm *bprm);
- void apparmor_bprm_committing_creds(struct linux_binprm *bprm);
-diff --git a/security/apparmor/include/mount.h b/security/apparmor/include/mount.h
-new file mode 100644
-index 0000000..bc17a53
---- /dev/null
-+++ b/security/apparmor/include/mount.h
-@@ -0,0 +1,54 @@
-+/*
-+ * AppArmor security module
-+ *
-+ * This file contains AppArmor file mediation function definitions.
-+ *
-+ * Copyright 2012 Canonical Ltd.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation, version 2 of the
-+ * License.
-+ */
-+
-+#ifndef __AA_MOUNT_H
-+#define __AA_MOUNT_H
-+
-+#include <linux/fs.h>
-+#include <linux/path.h>
-+
-+#include "domain.h"
-+#include "policy.h"
-+
-+/* mount perms */
-+#define AA_MAY_PIVOTROOT	0x01
-+#define AA_MAY_MOUNT		0x02
-+#define AA_MAY_UMOUNT		0x04
-+#define AA_AUDIT_DATA		0x40
-+#define AA_CONT_MATCH		0x40
-+
-+#define AA_MS_IGNORE_MASK (MS_KERNMOUNT | MS_NOSEC | MS_ACTIVE | MS_BORN)
-+
-+int aa_remount(struct aa_profile *profile, struct path *path,
-+	       unsigned long flags, void *data);
-+
-+int aa_bind_mount(struct aa_profile *profile, struct path *path,
-+		  const char *old_name, unsigned long flags);
-+
-+
-+int aa_mount_change_type(struct aa_profile *profile, struct path *path,
-+			 unsigned long flags);
-+
-+int aa_move_mount(struct aa_profile *profile, struct path *path,
-+		  const char *old_name);
-+
-+int aa_new_mount(struct aa_profile *profile, const char *dev_name,
-+		 struct path *path, const char *type, unsigned long flags,
-+		 void *data);
-+
-+int aa_umount(struct aa_profile *profile, struct vfsmount *mnt, int flags);
-+
-+int aa_pivotroot(struct aa_profile *profile, struct path *old_path,
-+		  struct path *new_path);
-+
-+#endif /* __AA_MOUNT_H */
-diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c
-index 3cde194..4512cc6 100644
---- a/security/apparmor/lsm.c
-+++ b/security/apparmor/lsm.c
-@@ -36,6 +36,7 @@
- #include "include/path.h"
- #include "include/policy.h"
- #include "include/procattr.h"
-+#include "include/mount.h"
- 
- /* Flag indicating whether initialization completed */
- int apparmor_initialized __initdata;
-@@ -512,6 +513,60 @@ static int apparmor_file_mprotect(struct vm_area_struct *vma,
- 			   !(vma->vm_flags & VM_SHARED) ? MAP_PRIVATE : 0);
- }
- 
-+static int apparmor_sb_mount(char *dev_name, struct path *path, char *type,
-+			     unsigned long flags, void *data)
-+{
-+	struct aa_profile *profile;
-+	int error = 0;
-+
-+	/* Discard magic */
-+	if ((flags & MS_MGC_MSK) == MS_MGC_VAL)
-+		flags &= ~MS_MGC_MSK;
-+
-+	flags &= ~AA_MS_IGNORE_MASK;
-+
-+	profile = __aa_current_profile();
-+	if (!unconfined(profile)) {
-+		if (flags & MS_REMOUNT)
-+			error = aa_remount(profile, path, flags, data);
-+		else if (flags & MS_BIND)
-+			error = aa_bind_mount(profile, path, dev_name, flags);
-+		else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE |
-+				  MS_UNBINDABLE))
-+			error = aa_mount_change_type(profile, path, flags);
-+		else if (flags & MS_MOVE)
-+			error = aa_move_mount(profile, path, dev_name);
-+		else
-+			error = aa_new_mount(profile, dev_name, path, type,
-+					     flags, data);
-+	}
-+	return error;
-+}
-+
-+static int apparmor_sb_umount(struct vfsmount *mnt, int flags)
-+{
-+	struct aa_profile *profile;
-+	int error = 0;
-+
-+	profile = __aa_current_profile();
-+	if (!unconfined(profile))
-+		error = aa_umount(profile, mnt, flags);
-+
-+	return error;
-+}
-+
-+static int apparmor_sb_pivotroot(struct path *old_path, struct path *new_path)
-+{
-+	struct aa_profile *profile;
-+	int error = 0;
-+
-+	profile = __aa_current_profile();
-+	if (!unconfined(profile))
-+		error = aa_pivotroot(profile, old_path, new_path);
-+
-+	return error;
-+}
-+
- static int apparmor_getprocattr(struct task_struct *task, char *name,
- 				char **value)
- {
-@@ -729,6 +784,10 @@ static struct security_operations apparmor_ops = {
- 	.capget =			apparmor_capget,
- 	.capable =			apparmor_capable,
- 
-+	.sb_mount =			apparmor_sb_mount,
-+	.sb_umount =			apparmor_sb_umount,
-+	.sb_pivotroot =			apparmor_sb_pivotroot,
-+
- 	.path_link =			apparmor_path_link,
- 	.path_unlink =			apparmor_path_unlink,
- 	.path_symlink =			apparmor_path_symlink,
-diff --git a/security/apparmor/mount.c b/security/apparmor/mount.c
-new file mode 100644
-index 0000000..63d8493
---- /dev/null
-+++ b/security/apparmor/mount.c
-@@ -0,0 +1,620 @@
-+/*
-+ * AppArmor security module
-+ *
-+ * This file contains AppArmor mediation of files
-+ *
-+ * Copyright (C) 1998-2008 Novell/SUSE
-+ * Copyright 2009-2012 Canonical Ltd.
-+ *
-+ * This program is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU General Public License as
-+ * published by the Free Software Foundation, version 2 of the
-+ * License.
-+ */
-+
-+#include <linux/fs.h>
-+#include <linux/mount.h>
-+#include <linux/namei.h>
-+
-+#include "include/apparmor.h"
-+#include "include/audit.h"
-+#include "include/context.h"
-+#include "include/domain.h"
-+#include "include/file.h"
-+#include "include/match.h"
-+#include "include/mount.h"
-+#include "include/path.h"
-+#include "include/policy.h"
-+
-+
-+static void audit_mnt_flags(struct audit_buffer *ab, unsigned long flags)
-+{
-+	if (flags & MS_RDONLY)
-+		audit_log_format(ab, "ro");
-+	else
-+		audit_log_format(ab, "rw");
-+	if (flags & MS_NOSUID)
-+		audit_log_format(ab, ", nosuid");
-+	if (flags & MS_NODEV)
-+		audit_log_format(ab, ", nodev");
-+	if (flags & MS_NOEXEC)
-+		audit_log_format(ab, ", noexec");
-+	if (flags & MS_SYNCHRONOUS)
-+		audit_log_format(ab, ", sync");
-+	if (flags & MS_REMOUNT)
-+		audit_log_format(ab, ", remount");
-+	if (flags & MS_MANDLOCK)
-+		audit_log_format(ab, ", mand");
-+	if (flags & MS_DIRSYNC)
-+		audit_log_format(ab, ", dirsync");
-+	if (flags & MS_NOATIME)
-+		audit_log_format(ab, ", noatime");
-+	if (flags & MS_NODIRATIME)
-+		audit_log_format(ab, ", nodiratime");
-+	if (flags & MS_BIND)
-+		audit_log_format(ab, flags & MS_REC ? ", rbind" : ", bind");
-+	if (flags & MS_MOVE)
-+		audit_log_format(ab, ", move");
-+	if (flags & MS_SILENT)
-+		audit_log_format(ab, ", silent");
-+	if (flags & MS_POSIXACL)
-+		audit_log_format(ab, ", acl");
-+	if (flags & MS_UNBINDABLE)
-+		audit_log_format(ab, flags & MS_REC ? ", runbindable" :
-+				 ", unbindable");
-+	if (flags & MS_PRIVATE)
-+		audit_log_format(ab, flags & MS_REC ? ", rprivate" :
-+				 ", private");
-+	if (flags & MS_SLAVE)
-+		audit_log_format(ab, flags & MS_REC ? ", rslave" :
-+				 ", slave");
-+	if (flags & MS_SHARED)
-+		audit_log_format(ab, flags & MS_REC ? ", rshared" :
-+				 ", shared");
-+	if (flags & MS_RELATIME)
-+		audit_log_format(ab, ", relatime");
-+	if (flags & MS_I_VERSION)
-+		audit_log_format(ab, ", iversion");
-+	if (flags & MS_STRICTATIME)
-+		audit_log_format(ab, ", strictatime");
-+	if (flags & MS_NOUSER)
-+		audit_log_format(ab, ", nouser");
-+}
-+
-+/**
-+ * audit_cb - call back for mount specific audit fields
-+ * @ab: audit_buffer  (NOT NULL)
-+ * @va: audit struct to audit values of  (NOT NULL)
-+ */
-+static void audit_cb(struct audit_buffer *ab, void *va)
-+{
-+	struct common_audit_data *sa = va;
-+
-+	if (sa->aad->mnt.type) {
-+		audit_log_format(ab, " fstype=");
-+		audit_log_untrustedstring(ab, sa->aad->mnt.type);
-+	}
-+	if (sa->aad->mnt.src_name) {
-+		audit_log_format(ab, " srcname=");
-+		audit_log_untrustedstring(ab, sa->aad->mnt.src_name);
-+	}
-+	if (sa->aad->mnt.trans) {
-+		audit_log_format(ab, " trans=");
-+		audit_log_untrustedstring(ab, sa->aad->mnt.trans);
-+	}
-+	if (sa->aad->mnt.flags || sa->aad->op == OP_MOUNT) {
-+		audit_log_format(ab, " flags=\"");
-+		audit_mnt_flags(ab, sa->aad->mnt.flags);
-+		audit_log_format(ab, "\"");
-+	}
-+	if (sa->aad->mnt.data) {
-+		audit_log_format(ab, " options=");
-+		audit_log_untrustedstring(ab, sa->aad->mnt.data);
-+	}
-+}
-+
-+/**
-+ * audit_mount - handle the auditing of mount operations
-+ * @profile: the profile being enforced  (NOT NULL)
-+ * @gfp: allocation flags
-+ * @op: operation being mediated (NOT NULL)
-+ * @name: name of object being mediated (MAYBE NULL)
-+ * @src_name: src_name of object being mediated (MAYBE_NULL)
-+ * @type: type of filesystem (MAYBE_NULL)
-+ * @trans: name of trans (MAYBE NULL)
-+ * @flags: filesystem idependent mount flags
-+ * @data: filesystem mount flags
-+ * @request: permissions requested
-+ * @perms: the permissions computed for the request (NOT NULL)
-+ * @info: extra information message (MAYBE NULL)
-+ * @error: 0 if operation allowed else failure error code
-+ *
-+ * Returns: %0 or error on failure
-+ */
-+static int audit_mount(struct aa_profile *profile, gfp_t gfp, int op,
-+		       const char *name, const char *src_name,
-+		       const char *type, const char *trans,
-+		       unsigned long flags, const void *data, u32 request,
-+		       struct file_perms *perms, const char *info, int error)
-+{
-+	int audit_type = AUDIT_APPARMOR_AUTO;
-+	struct common_audit_data sa;
-+	struct apparmor_audit_data aad = { };
-+
-+	if (likely(!error)) {
-+		u32 mask = perms->audit;
-+
-+		if (unlikely(AUDIT_MODE(profile) == AUDIT_ALL))
-+			mask = 0xffff;
-+
-+		/* mask off perms that are not being force audited */
-+		request &= mask;
-+
-+		if (likely(!request))
-+			return 0;
-+		audit_type = AUDIT_APPARMOR_AUDIT;
-+	} else {
-+		/* only report permissions that were denied */
-+		request = request & ~perms->allow;
-+
-+		if (request & perms->kill)
-+			audit_type = AUDIT_APPARMOR_KILL;
-+
-+		/* quiet known rejects, assumes quiet and kill do not overlap */
-+		if ((request & perms->quiet) &&
-+		    AUDIT_MODE(profile) != AUDIT_NOQUIET &&
-+		    AUDIT_MODE(profile) != AUDIT_ALL)
-+			request &= ~perms->quiet;
-+
-+		if (!request)
-+			return COMPLAIN_MODE(profile) ?
-+				complain_error(error) : error;
-+	}
-+
-+	COMMON_AUDIT_DATA_INIT(&sa, NONE);
-+	sa.aad = &aad;
-+	sa.aad->op = op;
-+	sa.aad->name = name;
-+	sa.aad->mnt.src_name = src_name;
-+	sa.aad->mnt.type = type;
-+	sa.aad->mnt.trans = trans;
-+	sa.aad->mnt.flags = flags;
-+	if (data && (perms->audit & AA_AUDIT_DATA))
-+		sa.aad->mnt.data = data;
-+	sa.aad->info = info;
-+	sa.aad->error = error;
-+
-+	return aa_audit(audit_type, profile, gfp, &sa, audit_cb);
-+}
-+
-+/**
-+ * match_mnt_flags - Do an ordered match on mount flags
-+ * @dfa: dfa to match against
-+ * @state: state to start in
-+ * @flags: mount flags to match against
-+ *
-+ * Mount flags are encoded as an ordered match. This is done instead of
-+ * checking against a simple bitmask, to allow for logical operations
-+ * on the flags.
-+ *
-+ * Returns: next state after flags match
-+ */
-+static unsigned int match_mnt_flags(struct aa_dfa *dfa, unsigned int state,
-+				    unsigned long flags)
-+{
-+	unsigned int i;
-+
-+	for (i = 0; i <= 31 ; ++i) {
-+		if ((1 << i) & flags)
-+			state = aa_dfa_next(dfa, state, i + 1);
-+	}
-+
-+	return state;
-+}
-+
-+/**
-+ * compute_mnt_perms - compute mount permission associated with @state
-+ * @dfa: dfa to match against (NOT NULL)
-+ * @state: state match finished in
-+ *
-+ * Returns: mount permissions
-+ */
-+static struct file_perms compute_mnt_perms(struct aa_dfa *dfa,
-+					   unsigned int state)
-+{
-+	struct file_perms perms;
-+
-+	perms.kill = 0;
-+	perms.allow = dfa_user_allow(dfa, state);
-+	perms.audit = dfa_user_audit(dfa, state);
-+	perms.quiet = dfa_user_quiet(dfa, state);
-+	perms.xindex = dfa_user_xindex(dfa, state);
-+
-+	return perms;
-+}
-+
-+static const char const *mnt_info_table[] = {
-+	"match succeeded",
-+	"failed mntpnt match",
-+	"failed srcname match",
-+	"failed type match",
-+	"failed flags match",
-+	"failed data match"
-+};
-+
-+/*
-+ * Returns 0 on success else element that match failed in, this is the
-+ * index into the mnt_info_table above
-+ */
-+static int do_match_mnt(struct aa_dfa *dfa, unsigned int start,
-+			const char *mntpnt, const char *devname,
-+			const char *type, unsigned long flags,
-+			void *data, bool binary, struct file_perms *perms)
-+{
-+	unsigned int state;
-+
-+	state = aa_dfa_match(dfa, start, mntpnt);
-+	state = aa_dfa_null_transition(dfa, state);
-+	if (!state)
-+		return 1;
-+
-+	if (devname)
-+		state = aa_dfa_match(dfa, state, devname);
-+	state = aa_dfa_null_transition(dfa, state);
-+	if (!state)
-+		return 2;
-+
-+	if (type)
-+		state = aa_dfa_match(dfa, state, type);
-+	state = aa_dfa_null_transition(dfa, state);
-+	if (!state)
-+		return 3;
-+
-+	state = match_mnt_flags(dfa, state, flags);
-+	if (!state)
-+		return 4;
-+	*perms = compute_mnt_perms(dfa, state);
-+	if (perms->allow & AA_MAY_MOUNT)
-+		return 0;
-+
-+	/* only match data if not binary and the DFA flags data is expected */
-+	if (data && !binary && (perms->allow & AA_CONT_MATCH)) {
-+		state = aa_dfa_null_transition(dfa, state);
-+		if (!state)
-+			return 4;
-+
-+		state = aa_dfa_match(dfa, state, data);
-+		if (!state)
-+			return 5;
-+		*perms = compute_mnt_perms(dfa, state);
-+		if (perms->allow & AA_MAY_MOUNT)
-+			return 0;
-+	}
-+
-+	/* failed at end of flags match */
-+	return 4;
-+}
-+
-+/**
-+ * match_mnt - handle path matching for mount
-+ * @profile: the confining profile
-+ * @mntpnt: string for the mntpnt (NOT NULL)
-+ * @devname: string for the devname/src_name (MAYBE NULL)
-+ * @type: string for the dev type (MAYBE NULL)
-+ * @flags: mount flags to match
-+ * @data: fs mount data (MAYBE NULL)
-+ * @binary: whether @data is binary
-+ * @perms: Returns: permission found by the match
-+ * @info: Returns: infomation string about the match for logging
-+ *
-+ * Returns: 0 on success else error
-+ */
-+static int match_mnt(struct aa_profile *profile, const char *mntpnt,
-+		     const char *devname, const char *type,
-+		     unsigned long flags, void *data, bool binary,
-+		     struct file_perms *perms, const char **info)
-+{
-+	int pos;
-+
-+	if (!profile->policy.dfa)
-+		return -EACCES;
-+
-+	pos = do_match_mnt(profile->policy.dfa,
-+			   profile->policy.start[AA_CLASS_MOUNT],
-+			   mntpnt, devname, type, flags, data, binary, perms);
-+	if (pos) {
-+		*info = mnt_info_table[pos];
-+		return -EACCES;
-+	}
-+
-+	return 0;
-+}
-+
-+static int path_flags(struct aa_profile *profile, struct path *path)
-+{
-+	return profile->path_flags |
-+		S_ISDIR(path->dentry->d_inode->i_mode) ? PATH_IS_DIR : 0;
-+}
-+
-+int aa_remount(struct aa_profile *profile, struct path *path,
-+	       unsigned long flags, void *data)
-+{
-+	struct file_perms perms = { };
-+	const char *name, *info = NULL;
-+	char *buffer = NULL;
-+	int binary, error;
-+
-+	binary = path->dentry->d_sb->s_type->fs_flags & FS_BINARY_MOUNTDATA;
-+
-+	error = aa_path_name(path, path_flags(profile, path), &buffer, &name,
-+			     &info);
-+	if (error)
-+		goto audit;
-+
-+	error = match_mnt(profile, name, NULL, NULL, flags, data, binary,
-+			  &perms, &info);
-+
-+audit:
-+	error = audit_mount(profile, GFP_KERNEL, OP_MOUNT, name, NULL, NULL,
-+			    NULL, flags, data, AA_MAY_MOUNT, &perms, info,
-+			    error);
-+	kfree(buffer);
-+
-+	return error;
-+}
-+
-+int aa_bind_mount(struct aa_profile *profile, struct path *path,
-+		  const char *dev_name, unsigned long flags)
-+{
-+	struct file_perms perms = { };
-+	char *buffer = NULL, *old_buffer = NULL;
-+	const char *name, *old_name = NULL, *info = NULL;
-+	struct path old_path;
-+	int error;
-+
-+	if (!dev_name || !*dev_name)
-+		return -EINVAL;
-+
-+	flags &= MS_REC | MS_BIND;
-+
-+	error = aa_path_name(path, path_flags(profile, path), &buffer, &name,
-+			     &info);
-+	if (error)
-+		goto audit;
-+
-+	error = kern_path(dev_name, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &old_path);
-+	if (error)
-+		goto audit;
-+
-+	error = aa_path_name(&old_path, path_flags(profile, &old_path),
-+			     &old_buffer, &old_name, &info);
-+	path_put(&old_path);
-+	if (error)
-+		goto audit;
-+
-+	error = match_mnt(profile, name, old_name, NULL, flags, NULL, 0,
-+			  &perms, &info);
-+
-+audit:
-+	error = audit_mount(profile, GFP_KERNEL, OP_MOUNT, name, old_name,
-+			    NULL, NULL, flags, NULL, AA_MAY_MOUNT, &perms,
-+			    info, error);
-+	kfree(buffer);
-+	kfree(old_buffer);
-+
-+	return error;
-+}
-+
-+int aa_mount_change_type(struct aa_profile *profile, struct path *path,
-+			 unsigned long flags)
-+{
-+	struct file_perms perms = { };
-+	char *buffer = NULL;
-+	const char *name, *info = NULL;
-+	int error;
-+
-+	/* These are the flags allowed by do_change_type() */
-+	flags &= (MS_REC | MS_SILENT | MS_SHARED | MS_PRIVATE | MS_SLAVE |
-+		  MS_UNBINDABLE);
-+
-+	error = aa_path_name(path, path_flags(profile, path), &buffer, &name,
-+			     &info);
-+	if (error)
-+		goto audit;
-+
-+	error = match_mnt(profile, name, NULL, NULL, flags, NULL, 0, &perms,
-+			  &info);
-+
-+audit:
-+	error = audit_mount(profile, GFP_KERNEL, OP_MOUNT, name, NULL, NULL,
-+			    NULL, flags, NULL, AA_MAY_MOUNT, &perms, info,
-+			    error);
-+	kfree(buffer);
-+
-+	return error;
-+}
-+
-+int aa_move_mount(struct aa_profile *profile, struct path *path,
-+		  const char *orig_name)
-+{
-+	struct file_perms perms = { };
-+	char *buffer = NULL, *old_buffer = NULL;
-+	const char *name, *old_name = NULL, *info = NULL;
-+	struct path old_path;
-+	int error;
-+
-+	if (!orig_name || !*orig_name)
-+		return -EINVAL;
-+
-+	error = aa_path_name(path, path_flags(profile, path), &buffer, &name,
-+			     &info);
-+	if (error)
-+		goto audit;
-+
-+	error = kern_path(orig_name, LOOKUP_FOLLOW, &old_path);
-+	if (error)
-+		goto audit;
-+
-+	error = aa_path_name(&old_path, path_flags(profile, &old_path),
-+			     &old_buffer, &old_name, &info);
-+	path_put(&old_path);
-+	if (error)
-+		goto audit;
-+
-+	error = match_mnt(profile, name, old_name, NULL, MS_MOVE, NULL, 0,
-+			  &perms, &info);
-+
-+audit:
-+	error = audit_mount(profile, GFP_KERNEL, OP_MOUNT, name, old_name,
-+			    NULL, NULL, MS_MOVE, NULL, AA_MAY_MOUNT, &perms,
-+			    info, error);
-+	kfree(buffer);
-+	kfree(old_buffer);
-+
-+	return error;
-+}
-+
-+int aa_new_mount(struct aa_profile *profile, const char *orig_dev_name,
-+		 struct path *path, const char *type, unsigned long flags,
-+		 void *data)
-+{
-+	struct file_perms perms = { };
-+	char *buffer = NULL, *dev_buffer = NULL;
-+	const char *name = NULL, *dev_name = NULL, *info = NULL;
-+	int binary = 1;
-+	int error;
-+
-+	dev_name = orig_dev_name;
-+	if (type) {
-+		int requires_dev;
-+		struct file_system_type *fstype = get_fs_type(type);
-+		if (!fstype)
-+			return -ENODEV;
-+
-+		binary = fstype->fs_flags & FS_BINARY_MOUNTDATA;
-+		requires_dev = fstype->fs_flags & FS_REQUIRES_DEV;
-+		put_filesystem(fstype);
-+
-+		if (requires_dev) {
-+			struct path dev_path;
-+
-+			if (!dev_name || !*dev_name) {
-+				error = -ENOENT;
-+				goto out;
-+			}
-+
-+			error = kern_path(dev_name, LOOKUP_FOLLOW, &dev_path);
-+			if (error)
-+				goto audit;
-+
-+			error = aa_path_name(&dev_path,
-+					     path_flags(profile, &dev_path),
-+					     &dev_buffer, &dev_name, &info);
-+			path_put(&dev_path);
-+			if (error)
-+				goto audit;
-+		}
-+	}
-+
-+	error = aa_path_name(path, path_flags(profile, path), &buffer, &name,
-+			     &info);
-+	if (error)
-+		goto audit;
-+
-+	error = match_mnt(profile, name, dev_name, type, flags, data, binary,
-+			  &perms, &info);
-+
-+audit:
-+	error = audit_mount(profile, GFP_KERNEL, OP_MOUNT, name,  dev_name,
-+			    type, NULL, flags, data, AA_MAY_MOUNT, &perms, info,
-+			    error);
-+	kfree(buffer);
-+	kfree(dev_buffer);
-+
-+out:
-+	return error;
-+
-+}
-+
-+int aa_umount(struct aa_profile *profile, struct vfsmount *mnt, int flags)
-+{
-+	struct file_perms perms = { };
-+	char *buffer = NULL;
-+	const char *name, *info = NULL;
-+	int error;
-+
-+	struct path path = { mnt, mnt->mnt_root };
-+	error = aa_path_name(&path, path_flags(profile, &path), &buffer, &name,
-+			     &info);
-+	if (error)
-+		goto audit;
-+
-+	if (!error && profile->policy.dfa) {
-+		unsigned int state;
-+		state = aa_dfa_match(profile->policy.dfa,
-+				     profile->policy.start[AA_CLASS_MOUNT],
-+				     name);
-+		perms = compute_mnt_perms(profile->policy.dfa, state);
-+	}
-+
-+	if (AA_MAY_UMOUNT & ~perms.allow)
-+		error = -EACCES;
-+
-+audit:
-+	error = audit_mount(profile, GFP_KERNEL, OP_UMOUNT, name, NULL, NULL,
-+			    NULL, 0, NULL, AA_MAY_UMOUNT, &perms, info, error);
-+	kfree(buffer);
-+
-+	return error;
-+}
-+
-+int aa_pivotroot(struct aa_profile *profile, struct path *old_path,
-+		  struct path *new_path)
-+{
-+	struct file_perms perms = { };
-+	struct aa_profile *target = NULL;
-+	char *old_buffer = NULL, *new_buffer = NULL;
-+	const char *old_name, *new_name = NULL, *info = NULL;
-+	int error;
-+
-+	error = aa_path_name(old_path, path_flags(profile, old_path),
-+			     &old_buffer, &old_name, &info);
-+	if (error)
-+		goto audit;
-+
-+	error = aa_path_name(new_path, path_flags(profile, new_path),
-+			     &new_buffer, &new_name, &info);
-+	if (error)
-+		goto audit;
-+
-+	if (profile->policy.dfa) {
-+		unsigned int state;
-+		state = aa_dfa_match(profile->policy.dfa,
-+				     profile->policy.start[AA_CLASS_MOUNT],
-+				     new_name);
-+		state = aa_dfa_null_transition(profile->policy.dfa, state);
-+		state = aa_dfa_match(profile->policy.dfa, state, old_name);
-+		perms = compute_mnt_perms(profile->policy.dfa, state);
-+	}
-+
-+	if (AA_MAY_PIVOTROOT & perms.allow) {
-+		if ((perms.xindex & AA_X_TYPE_MASK) == AA_X_TABLE) {
-+			target = x_table_lookup(profile, perms.xindex);
-+			if (!target)
-+				error = -ENOENT;
-+			else
-+				error = aa_replace_current_profile(target);
-+		}
-+	} else
-+		error = -EACCES;
-+
-+audit:
-+	error = audit_mount(profile, GFP_KERNEL, OP_PIVOTROOT, new_name,
-+			    old_name, NULL, target ? target->base.name : NULL,
-+			    0, NULL,  AA_MAY_PIVOTROOT, &perms, info, error);
-+	aa_put_profile(target);
-+	kfree(old_buffer);
-+	kfree(new_buffer);
-+
-+	return error;
-+}
--- 
-1.7.9.5
-
diff --git a/pkgs/os-specific/linux/libselinux/fPIC.patch b/pkgs/os-specific/linux/libselinux/fPIC.patch
deleted file mode 100644
index fdc1fa41a335..000000000000
--- a/pkgs/os-specific/linux/libselinux/fPIC.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/Makefile b/src/Makefile
-index ac019df..00432b9 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -132,7 +132,7 @@ $(AUDIT2WHYSO): $(AUDIT2WHYLOBJ)
- 	$(CC) $(CFLAGS) $(LDFLAGS) -shared -o $@ $^ -L. -lselinux $(LIBDIR)/libsepol.a -L$(LIBDIR)
- 
- %.o:  %.c policy.h
--	$(CC) $(CFLAGS) $(TLSFLAGS) -c -o $@ $<
-+	$(CC) $(CFLAGS) $(TLSFLAGS) -fPIC -c -o $@ $<
- 
- %.lo:  %.c policy.h
- 	$(CC) $(CFLAGS) -fPIC -DSHARED -c -o $@ $<
diff --git a/pkgs/os-specific/linux/udisks/cve-2014-0004.patch b/pkgs/os-specific/linux/udisks/cve-2014-0004.patch
deleted file mode 100644
index ce907507538f..000000000000
--- a/pkgs/os-specific/linux/udisks/cve-2014-0004.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-commit ebf61ed8471a45cf8bce7231de00cb1bbc140708
-Author: Martin Pitt <martin.pitt@ubuntu.com>
-Date:   Wed Mar 5 14:07:44 2014 +0100
-
-    Fix buffer overflow in mount path parsing
-    
-    In the mount monitor we parse mount points from /proc/self/mountinfo.  Ensure
-    that we don't overflow the buffers on platforms where mount paths could be
-    longer than PATH_MAX (unknown if that can actually happen), as at least the
-    mount paths for hotpluggable devices are somewhat user-controlled.
-    
-    Thanks to Florian Weimer for discovering this bug, and to David Zeuthen
-    for his initial patch!
-    
-    CVE-2014-0004
-
-Index: udisks-1.0.4/src/mount-monitor.c
-===================================================================
---- udisks-1.0.4.orig/src/mount-monitor.c	2011-08-25 20:27:33.000000000 +0200
-+++ udisks-1.0.4/src/mount-monitor.c	2014-03-10 13:38:18.309406561 +0100
-@@ -39,6 +39,11 @@
- #include "mount.h"
- #include "private.h"
- 
-+/* build a %Ns format string macro with N == PATH_MAX */
-+#define xstr(s) str(s)
-+#define str(s) #s
-+#define PATH_MAX_FMT "%" xstr(PATH_MAX) "s"
-+
- /*--------------------------------------------------------------------------------------------------------------*/
- 
- enum
-@@ -320,8 +325,8 @@ mount_monitor_ensure (MountMonitor *moni
-       guint mount_id;
-       guint parent_id;
-       guint major, minor;
--      gchar encoded_root[PATH_MAX];
--      gchar encoded_mount_point[PATH_MAX];
-+      gchar encoded_root[PATH_MAX + 1];
-+      gchar encoded_mount_point[PATH_MAX + 1];
-       gchar *mount_point;
-       dev_t dev;
- 
-@@ -329,7 +334,7 @@ mount_monitor_ensure (MountMonitor *moni
-         continue;
- 
-       if (sscanf (lines[n],
--                  "%d %d %d:%d %s %s",
-+                  "%d %d %d:%d " PATH_MAX_FMT " " PATH_MAX_FMT,
-                   &mount_id,
-                   &parent_id,
-                   &major,
-@@ -340,6 +345,8 @@ mount_monitor_ensure (MountMonitor *moni
-           g_warning ("Error parsing line '%s'", lines[n]);
-           continue;
-         }
-+      encoded_root[sizeof encoded_root - 1] = '\0';
-+      encoded_mount_point[sizeof encoded_mount_point - 1] = '\0';
- 
-       /* ignore mounts where only a subtree of a filesystem is mounted */
-       if (g_strcmp0 (encoded_root, "/") != 0)
-@@ -358,15 +365,17 @@ mount_monitor_ensure (MountMonitor *moni
-           sep = strstr (lines[n], " - ");
-           if (sep != NULL)
-             {
--              gchar fstype[PATH_MAX];
--              gchar mount_source[PATH_MAX];
-+              gchar fstype[PATH_MAX + 1];
-+              gchar mount_source[PATH_MAX + 1];
-               struct stat statbuf;
- 
--              if (sscanf (sep + 3, "%s %s", fstype, mount_source) != 2)
-+              if (sscanf (sep + 3, PATH_MAX_FMT " " PATH_MAX_FMT, fstype, mount_source) != 2)
-                 {
-                   g_warning ("Error parsing things past - for '%s'", lines[n]);
-                   continue;
-                 }
-+              fstype[sizeof fstype - 1] = '\0';
-+              mount_source[sizeof mount_source - 1] = '\0';
- 
-               if (g_strcmp0 (fstype, "btrfs") != 0)
-                 continue;
diff --git a/pkgs/os-specific/linux/wpa_supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch b/pkgs/os-specific/linux/wpa_supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
deleted file mode 100644
index de1964ca7697..000000000000
--- a/pkgs/os-specific/linux/wpa_supplicant/0001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9ed4eee345f85e3025c33c6e20aa25696e341ccd Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <jouni@qca.qualcomm.com>
-Date: Tue, 7 Apr 2015 11:32:11 +0300
-Subject: [PATCH] P2P: Validate SSID element length before copying it
- (CVE-2015-1863)
-
-This fixes a possible memcpy overflow for P2P dev->oper_ssid in
-p2p_add_device(). The length provided by the peer device (0..255 bytes)
-was used without proper bounds checking and that could have resulted in
-arbitrary data of up to 223 bytes being written beyond the end of the
-dev->oper_ssid[] array (of which about 150 bytes would be beyond the
-heap allocation) when processing a corrupted management frame for P2P
-peer discovery purposes.
-
-This could result in corrupted state in heap, unexpected program
-behavior due to corrupted P2P peer device information, denial of service
-due to process crash, exposure of memory contents during GO Negotiation,
-and potentially arbitrary code execution.
-
-Thanks to Google security team for reporting this issue and smart
-hardware research group of Alibaba security team for discovering it.
-
-Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
----
- src/p2p/p2p.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c
-index f584fae..a45fe73 100644
---- a/src/p2p/p2p.c
-+++ b/src/p2p/p2p.c
-@@ -778,6 +778,7 @@ int p2p_add_device(struct p2p_data *p2p, const u8 *addr, int freq,
- 	if (os_memcmp(addr, p2p_dev_addr, ETH_ALEN) != 0)
- 		os_memcpy(dev->interface_addr, addr, ETH_ALEN);
- 	if (msg.ssid &&
-+	    msg.ssid[1] <= sizeof(dev->oper_ssid) &&
- 	    (msg.ssid[1] != P2P_WILDCARD_SSID_LEN ||
- 	     os_memcmp(msg.ssid + 2, P2P_WILDCARD_SSID, P2P_WILDCARD_SSID_LEN)
- 	     != 0)) {
--- 
-1.9.1
-
diff --git a/pkgs/servers/x11/xorg/darwin/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch b/pkgs/servers/x11/xorg/darwin/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch
deleted file mode 100644
index ff297a8df96a..000000000000
--- a/pkgs/servers/x11/xorg/darwin/0001-XQuartz-GLX-Use-__glXEnableExtension-to-build-extens.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From fff30cdea46616eb92f4dd9402ebd27fdb55e13b Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Sun, 1 Jun 2014 04:29:19 -0700
-Subject: [PATCH 1/6] XQuartz: GLX: Use __glXEnableExtension to build
- extensions list
-
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-(cherry picked from commit 3790001ea29658872aebda00a03170e392b47878)
----
- hw/xquartz/GL/indirect.c | 37 +++++++++++++++++++++++++++++++------
- 1 file changed, 31 insertions(+), 6 deletions(-)
-
-diff --git a/hw/xquartz/GL/indirect.c b/hw/xquartz/GL/indirect.c
-index 19b7d86..4e6ab3d 100644
---- a/hw/xquartz/GL/indirect.c
-+++ b/hw/xquartz/GL/indirect.c
-@@ -52,6 +52,7 @@
- 
- #include "visualConfigs.h"
- #include "dri.h"
-+#include "extension_string.h"
- 
- #include "darwin.h"
- #define GLAQUA_DEBUG_MSG(msg, args ...) ASL_LOG(ASL_LEVEL_DEBUG, "GLXAqua", \
-@@ -111,6 +112,10 @@ typedef struct __GLXAquaDrawable __GLXAquaDrawable;
-  */
- struct __GLXAquaScreen {
-     __GLXscreen base;
-+
-+    /* Supported GLX extensions */
-+    unsigned char glx_enable_bits[__GLX_EXT_BYTES];
-+
-     int index;
-     int num_vis;
- };
-@@ -541,13 +546,33 @@ __glXAquaScreenProbe(ScreenPtr pScreen)
- 
-     screen->base.GLXmajor = 1;
-     screen->base.GLXminor = 4;
--    screen->base.GLXextensions = strdup("GLX_SGIX_fbconfig "
--                                        "GLX_SGIS_multisample "
--                                        "GLX_ARB_multisample "
--                                        "GLX_EXT_visual_info "
--                                        "GLX_EXT_import_context ");
- 
--    /*We may be able to add more GLXextensions at a later time. */
-+    memset(screen->glx_enable_bits, 0, __GLX_EXT_BYTES);
-+
-+    __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_info");
-+    __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_visual_rating");
-+    __glXEnableExtension(screen->glx_enable_bits, "GLX_EXT_import_context");
-+    __glXEnableExtension(screen->glx_enable_bits, "GLX_OML_swap_method");
-+    __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIX_fbconfig");
-+
-+    __glXEnableExtension(screen->glx_enable_bits, "GLX_SGIS_multisample");
-+    __glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_multisample");
-+
-+    //__glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_create_context");
-+    //__glXEnableExtension(screen->glx_enable_bits, "GLX_ARB_create_context_profile");
-+
-+    // Generate the GLX extensions string (overrides that set by __glXScreenInit())
-+    {
-+        unsigned int buffer_size =
-+            __glXGetExtensionString(screen->glx_enable_bits, NULL);
-+        if (buffer_size > 0) {
-+            free(screen->base.GLXextensions);
-+
-+            screen->base.GLXextensions = xnfalloc(buffer_size);
-+            __glXGetExtensionString(screen->glx_enable_bits,
-+                                    screen->base.GLXextensions);
-+        }
-+    }
- 
-     return &screen->base;
- }
--- 
-2.3.2 (Apple Git-55)
-
diff --git a/pkgs/servers/x11/xorg/darwin/0003-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch b/pkgs/servers/x11/xorg/darwin/0003-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
deleted file mode 100644
index 395853f940fe..000000000000
--- a/pkgs/servers/x11/xorg/darwin/0003-Workaround-the-GC-clipping-problem-in-miPaintWindow-.patch
+++ /dev/null
@@ -1,165 +0,0 @@
-From fa5c83fe9129c9cd9cde1420a32112ca2f17566c Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Fri, 30 Apr 2010 13:08:25 -0700
-Subject: [PATCH 3/6] Workaround the GC clipping problem in miPaintWindow and
- add some debugging output.
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
- mi/miexpose.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
- 1 file changed, 94 insertions(+), 10 deletions(-)
-
-diff --git a/mi/miexpose.c b/mi/miexpose.c
-index fc4dbc0..5e31b83 100644
---- a/mi/miexpose.c
-+++ b/mi/miexpose.c
-@@ -408,7 +408,8 @@ void RootlessSetPixmapOfAncestors(WindowPtr pWin);
- void RootlessStartDrawing(WindowPtr pWin);
- void RootlessDamageRegion(WindowPtr pWin, RegionPtr prgn);
- Bool IsFramedWindow(WindowPtr pWin);
--#endif
-+#include "../fb/fb.h"
-+#endif 
- 
- void
- miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
-@@ -437,23 +438,37 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
-     Bool solid = TRUE;
-     DrawablePtr drawable = &pWin->drawable;
- 
-+#ifdef XQUARTZ_CLIP_DEBUG
-+    ErrorF("START %d BS %d (pR = %ld)\n", what, pWin->backgroundState, ParentRelative);
-+    ErrorF("      Rgn: %d %d %d %d\n", prgn->extents.x1, prgn->extents.y1,
-+	                               prgn->extents.x2 - prgn->extents.x1,
-+	                               prgn->extents.y2 - prgn->extents.y1);
-+    ErrorF("      Win: %d %d (%d %d) %d %d\n", pWin->origin.x, pWin->origin.y,
-+	                                       pWin->winSize.extents.x1, pWin->winSize.extents.y1,
-+	                                       pWin->winSize.extents.x2 - pWin->winSize.extents.x1,
-+					       pWin->winSize.extents.y2 - pWin->winSize.extents.y1);
-+    ErrorF("     Draw: %d %d %d %d\n", pWin->drawable.x, pWin->drawable.y,
-+				       pWin->drawable.width, pWin->drawable.height);
-+#endif
-+
- #ifdef ROOTLESS
-     if (!drawable || drawable->type == UNDRAWABLE_WINDOW)
-         return;
-+#endif
-+    
-+    if (what == PW_BACKGROUND)
-+    {
-+#ifdef ROOTLESS
-+        if(IsFramedWindow(pWin)) {
-+            RootlessStartDrawing(pWin);
-+            RootlessDamageRegion(pWin, prgn);
- 
--    if (IsFramedWindow(pWin)) {
--        RootlessStartDrawing(pWin);
--        RootlessDamageRegion(pWin, prgn);
--
--        if (pWin->backgroundState == ParentRelative) {
--            if ((what == PW_BACKGROUND) ||
--                (what == PW_BORDER && !pWin->borderIsPixel))
-+            if(pWin->backgroundState == ParentRelative) {
-                 RootlessSetPixmapOfAncestors(pWin);
-+            }
-         }
--    }
- #endif
- 
--    if (what == PW_BACKGROUND) {
-         while (pWin->backgroundState == ParentRelative)
-             pWin = pWin->parent;
- 
-@@ -478,6 +493,18 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
-     else {
-         PixmapPtr pixmap;
- 
-+#ifdef ROOTLESS
-+	if(IsFramedWindow(pWin)) {
-+	    RootlessStartDrawing(pWin);
-+	    RootlessDamageRegion(pWin, prgn);
-+	    
-+	    if(!pWin->borderIsPixel &&
-+		pWin->backgroundState == ParentRelative) {
-+		RootlessSetPixmapOfAncestors(pWin);
-+	    }
-+	}
-+#endif
-+
-         tile_x_off = drawable->x;
-         tile_y_off = drawable->y;
- 
-@@ -486,6 +513,12 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
-             return;
-         pixmap = (*pScreen->GetWindowPixmap) ((WindowPtr) drawable);
-         drawable = &pixmap->drawable;
-+
-+#ifdef XQUARTZ_CLIP_DEBUG
-+        ErrorF("     Draw: %d %d %d %d\n",
-+               drawable->x, drawable->y, drawable->width, drawable->height);    
-+#endif
-+	
- #ifdef COMPOSITE
-         draw_x_off = pixmap->screen_x;
-         draw_y_off = pixmap->screen_y;
-@@ -548,6 +581,57 @@ miPaintWindow(WindowPtr pWin, RegionPtr prgn, int what)
-     ChangeGC(NullClient, pGC, gcmask, gcval);
-     ValidateGC(drawable, pGC);
- 
-+#ifdef XQUARTZ_CLIP_DEBUG
-+    ErrorF("       GC: %d %d %d %d\n",
-+	   pGC->pCompositeClip->extents.x1, pGC->pCompositeClip->extents.y1,
-+	   pGC->pCompositeClip->extents.x2 - pGC->pCompositeClip->extents.x1,
-+	   pGC->pCompositeClip->extents.y2 - pGC->pCompositeClip->extents.y1);
-+#endif
-+    
-+#ifdef XQUARTZ
-+    /* Looks like our clipping isn't set right for some reason:
-+     * http://xquartz.macosforge.org/trac/ticket/290
-+     */
-+    if(what == PW_BORDER) {
-+
-+#if 0
-+	if(solid) {
-+#if 1
-+	    fbFillRegionSolid(&pWin->drawable,
-+			      prgn,
-+			      0,
-+			      fbReplicatePixel(fill.pixel,
-+					       pWin->drawable.bitsPerPixel));
-+#else
-+	    fbFillRegionSolid(drawable,
-+			      prgn,
-+			      0,
-+			      fbReplicatePixel(fill.pixel,
-+					       drawable->bitsPerPixel));
-+#endif
-+	    return;
-+	}
-+#endif
-+    
-+	pGC->pCompositeClip->extents.x1 += prgn->extents.x1;
-+	pGC->pCompositeClip->extents.y1 += prgn->extents.y1;
-+	pGC->pCompositeClip->extents.x2 += prgn->extents.x1;
-+	pGC->pCompositeClip->extents.y2 += prgn->extents.y1;
-+	
-+	if(pGC->pCompositeClip->extents.x2 > drawable->pScreen->width)
-+	    pGC->pCompositeClip->extents.x2 = drawable->pScreen->width;
-+	if(pGC->pCompositeClip->extents.y2 > drawable->pScreen->height)
-+	    pGC->pCompositeClip->extents.y2 = drawable->pScreen->height;
-+    }
-+#endif
-+
-+#ifdef XQUARTZ_CLIP_DEBUG
-+    ErrorF("       GC: %d %d %d %d\n",
-+	   pGC->pCompositeClip->extents.x1, pGC->pCompositeClip->extents.y1,
-+	   pGC->pCompositeClip->extents.x2 - pGC->pCompositeClip->extents.x1,
-+	   pGC->pCompositeClip->extents.y2 - pGC->pCompositeClip->extents.y1);    
-+#endif
-+
-     numRects = RegionNumRects(prgn);
-     pbox = RegionRects(prgn);
-     for (i = numRects; --i >= 0; pbox++, prect++) {
--- 
-2.3.2 (Apple Git-55)
-
diff --git a/pkgs/servers/x11/xorg/darwin/0005-fb-Revert-fb-changes-that-broke-XQuartz.patch b/pkgs/servers/x11/xorg/darwin/0005-fb-Revert-fb-changes-that-broke-XQuartz.patch
deleted file mode 100644
index b9d4b18cf82a..000000000000
--- a/pkgs/servers/x11/xorg/darwin/0005-fb-Revert-fb-changes-that-broke-XQuartz.patch
+++ /dev/null
@@ -1,316 +0,0 @@
-From a635e397d5830f7f60e3690a1bb36f7a725b915a Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Fri, 12 Feb 2010 19:48:52 -0800
-Subject: [PATCH 5/6] fb: Revert fb changes that broke XQuartz
-
-http://bugs.freedesktop.org/show_bug.cgi?id=26124
-
-Revert "Fix source pictures getting random transforms after 2d6a8f668342a5190cdf43b5."
-Revert "fb: Adjust transform or composite coordinates for pixman operations"
-
-http://bugs.freedesktop.org/26124
-
-This reverts commit a72c65e9176c51de95db2fdbf4c5d946a4911695.
-This reverts commit a6bd5d2e482a5aa84acb3d4932e2a166d8670ef1.
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
- fb/fb.h     |  3 +--
- fb/fbpict.c | 82 ++++++++++++++++++-------------------------------------------
- fb/fbtrap.c | 43 ++++++++++++++------------------
- 3 files changed, 43 insertions(+), 85 deletions(-)
-
-diff --git a/fb/fb.h b/fb/fb.h
-index ab110f3..59eaac3 100644
---- a/fb/fb.h
-+++ b/fb/fb.h
-@@ -1326,8 +1326,7 @@ fbFillRegionSolid(DrawablePtr pDrawable,
-                   RegionPtr pRegion, FbBits and, FbBits xor);
- 
- extern _X_EXPORT pixman_image_t *image_from_pict(PicturePtr pict,
--                                                 Bool has_clip,
--                                                 int *xoff, int *yoff);
-+                                                 Bool has_clip);
- 
- extern _X_EXPORT void free_pixman_pict(PicturePtr, pixman_image_t *);
- 
-diff --git a/fb/fbpict.c b/fb/fbpict.c
-index cafb027..6ee63e9 100644
---- a/fb/fbpict.c
-+++ b/fb/fbpict.c
-@@ -46,23 +46,18 @@ fbComposite(CARD8 op,
-             INT16 yMask, INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)
- {
-     pixman_image_t *src, *mask, *dest;
--    int src_xoff, src_yoff;
--    int msk_xoff, msk_yoff;
--    int dst_xoff, dst_yoff;
--
-     miCompositeSourceValidate(pSrc);
-     if (pMask)
-         miCompositeSourceValidate(pMask);
- 
--    src = image_from_pict(pSrc, FALSE, &src_xoff, &src_yoff);
--    mask = image_from_pict(pMask, FALSE, &msk_xoff, &msk_yoff);
--    dest = image_from_pict(pDst, TRUE, &dst_xoff, &dst_yoff);
-+    src = image_from_pict(pSrc, TRUE);
-+    mask = image_from_pict(pMask, TRUE);
-+    dest = image_from_pict(pDst, TRUE);
- 
-     if (src && dest && !(pMask && !mask)) {
-         pixman_image_composite(op, src, mask, dest,
--                               xSrc + src_xoff, ySrc + src_yoff,
--                               xMask + msk_xoff, yMask + msk_yoff,
--                               xDst + dst_xoff, yDst + dst_yoff, width, height);
-+                               xSrc, ySrc, xMask, yMask, xDst, yDst,
-+                               width, height);
-     }
- 
-     free_pixman_pict(pSrc, src);
-@@ -289,20 +284,22 @@ create_conical_gradient_image(PictGradient * gradient)
- }
- 
- static pixman_image_t *
--create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
-+create_bits_picture(PicturePtr pict, Bool has_clip)
- {
--    PixmapPtr pixmap;
-     FbBits *bits;
-     FbStride stride;
--    int bpp;
-+    int bpp, xoff, yoff;
-     pixman_image_t *image;
- 
--    fbGetDrawablePixmap(pict->pDrawable, pixmap, *xoff, *yoff);
--    fbGetPixmapBitsData(pixmap, bits, stride, bpp);
-+    fbGetDrawable (pict->pDrawable, bits, stride, bpp, xoff, yoff);
-+
-+    bits = (FbBits*)((CARD8*)bits +
-+                     (pict->pDrawable->y + yoff) * stride * sizeof(FbBits) +
-+                     (pict->pDrawable->x + xoff) * (bpp / 8));
- 
-     image = pixman_image_create_bits((pixman_format_code_t) pict->format,
--                                     pixmap->drawable.width,
--                                     pixmap->drawable.height, (uint32_t *) bits,
-+                                     pict->pDrawable->width,
-+                                     pict->pDrawable->height, (uint32_t *) bits,
-                                      stride * sizeof(FbStride));
- 
-     if (!image)
-@@ -321,57 +318,31 @@ create_bits_picture(PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
-         if (pict->clientClip)
-             pixman_image_set_has_client_clip(image, TRUE);
- 
--        if (*xoff || *yoff)
--            pixman_region_translate(pict->pCompositeClip, *xoff, *yoff);
-+        pixman_region_translate (pict->pCompositeClip, - pict->pDrawable->x, - pict->pDrawable->y);
- 
-         pixman_image_set_clip_region(image, pict->pCompositeClip);
- 
--        if (*xoff || *yoff)
--            pixman_region_translate(pict->pCompositeClip, -*xoff, -*yoff);
-+        pixman_region_translate (pict->pCompositeClip, pict->pDrawable->x, pict->pDrawable->y);
-     }
- 
-     /* Indexed table */
-     if (pict->pFormat->index.devPrivate)
-         pixman_image_set_indexed(image, pict->pFormat->index.devPrivate);
- 
--    /* Add in drawable origin to position within the image */
--    *xoff += pict->pDrawable->x;
--    *yoff += pict->pDrawable->y;
--
-     return image;
- }
- 
- static pixman_image_t *image_from_pict_internal(PicturePtr pict, Bool has_clip,
--                                                int *xoff, int *yoff,
-                                                 Bool is_alpha_map);
- 
- static void
--set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
--                     int *xoff, int *yoff, Bool is_alpha_map)
-+set_image_properties(pixman_image_t * image, PicturePtr pict, Bool is_alpha_map)
- {
-     pixman_repeat_t repeat;
-     pixman_filter_t filter;
- 
-     if (pict->transform) {
--        /* For source images, adjust the transform to account
--         * for the drawable offset within the pixman image,
--         * then set the offset to 0 as it will be used
--         * to compute positions within the transformed image.
--         */
--        if (!has_clip) {
--            struct pixman_transform adjusted;
--
--            adjusted = *pict->transform;
--            pixman_transform_translate(&adjusted,
--                                       NULL,
--                                       pixman_int_to_fixed(*xoff),
--                                       pixman_int_to_fixed(*yoff));
--            pixman_image_set_transform(image, &adjusted);
--            *xoff = 0;
--            *yoff = 0;
--        }
--        else
--            pixman_image_set_transform(image, pict->transform);
-+        pixman_image_set_transform(image, pict->transform);
-     }
- 
-     switch (pict->repeatType) {
-@@ -399,10 +370,8 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
-      * as the alpha map for this operation
-      */
-     if (pict->alphaMap && !is_alpha_map) {
--        int alpha_xoff, alpha_yoff;
-         pixman_image_t *alpha_map =
--            image_from_pict_internal(pict->alphaMap, FALSE, &alpha_xoff,
--                                     &alpha_yoff, TRUE);
-+            image_from_pict_internal(pict->alphaMap, TRUE, TRUE);
- 
-         pixman_image_set_alpha_map(image, alpha_map, pict->alphaOrigin.x,
-                                    pict->alphaOrigin.y);
-@@ -436,8 +405,7 @@ set_image_properties(pixman_image_t * image, PicturePtr pict, Bool has_clip,
- }
- 
- static pixman_image_t *
--image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
--                         Bool is_alpha_map)
-+image_from_pict_internal(PicturePtr pict, Bool has_clip, Bool is_alpha_map)
- {
-     pixman_image_t *image = NULL;
- 
-@@ -445,7 +413,7 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
-         return NULL;
- 
-     if (pict->pDrawable) {
--        image = create_bits_picture(pict, has_clip, xoff, yoff);
-+        image = create_bits_picture(pict, has_clip);
-     }
-     else if (pict->pSourcePict) {
-         SourcePict *sp = pict->pSourcePict;
-@@ -463,19 +431,17 @@ image_from_pict_internal(PicturePtr pict, Bool has_clip, int *xoff, int *yoff,
-             else if (sp->type == SourcePictTypeConical)
-                 image = create_conical_gradient_image(gradient);
-         }
--        *xoff = *yoff = 0;
-     }
- 
-     if (image)
--        set_image_properties(image, pict, has_clip, xoff, yoff, is_alpha_map);
--
-+        set_image_properties (image, pict, is_alpha_map);
-     return image;
- }
- 
- pixman_image_t *
--image_from_pict(PicturePtr pict, Bool has_clip, int *xoff, int *yoff)
-+image_from_pict (PicturePtr pict, Bool has_clip)
- {
--    return image_from_pict_internal(pict, has_clip, xoff, yoff, FALSE);
-+    return image_from_pict_internal (pict, has_clip, FALSE);
- }
- 
- void
-diff --git a/fb/fbtrap.c b/fb/fbtrap.c
-index bf82f8f..0145ce9 100644
---- a/fb/fbtrap.c
-+++ b/fb/fbtrap.c
-@@ -36,13 +36,12 @@ fbAddTraps(PicturePtr pPicture,
-            INT16 x_off, INT16 y_off, int ntrap, xTrap * traps)
- {
-     pixman_image_t *image;
--    int dst_xoff, dst_yoff;
- 
--    if (!(image = image_from_pict(pPicture, FALSE, &dst_xoff, &dst_yoff)))
--        return;
--
--    pixman_add_traps(image, x_off + dst_xoff, y_off + dst_yoff,
--                     ntrap, (pixman_trap_t *) traps);
-+    if (!(image = image_from_pict (pPicture, FALSE)))
-+	return;
-+    
-+    pixman_add_traps(image, x_off, y_off,
-+                     ntrap, (pixman_trap_t *)traps);
- 
-     free_pixman_pict(pPicture, image);
- }
-@@ -52,13 +51,12 @@ fbRasterizeTrapezoid(PicturePtr pPicture,
-                      xTrapezoid * trap, int x_off, int y_off)
- {
-     pixman_image_t *image;
--    int dst_xoff, dst_yoff;
- 
--    if (!(image = image_from_pict(pPicture, FALSE, &dst_xoff, &dst_yoff)))
-+    if (!(image = image_from_pict (pPicture, FALSE)))
-         return;
- 
--    pixman_rasterize_trapezoid(image, (pixman_trapezoid_t *) trap,
--                               x_off + dst_xoff, y_off + dst_yoff);
-+    pixman_rasterize_trapezoid(image, (pixman_trapezoid_t *)trap,
-+                               x_off, y_off);
- 
-     free_pixman_pict(pPicture, image);
- }
-@@ -68,14 +66,12 @@ fbAddTriangles(PicturePtr pPicture,
-                INT16 x_off, INT16 y_off, int ntri, xTriangle * tris)
- {
-     pixman_image_t *image;
--    int dst_xoff, dst_yoff;
- 
--    if (!(image = image_from_pict(pPicture, FALSE, &dst_xoff, &dst_yoff)))
-+    if (!(image = image_from_pict (pPicture, FALSE)))
-         return;
--
--    pixman_add_triangles(image,
--                         dst_xoff + x_off, dst_yoff + y_off,
--                         ntri, (pixman_triangle_t *) tris);
-+    
-+    pixman_add_triangles(image, x_off, y_off, ntri,
-+                         (pixman_triangle_t *)tris);
- 
-     free_pixman_pict(pPicture, image);
- }
-@@ -98,13 +94,11 @@ fbShapes(CompositeShapesFunc composite,
-          int16_t ySrc, int nshapes, int shape_size, const uint8_t * shapes)
- {
-     pixman_image_t *src, *dst;
--    int src_xoff, src_yoff;
--    int dst_xoff, dst_yoff;
- 
-     miCompositeSourceValidate(pSrc);
- 
--    src = image_from_pict(pSrc, FALSE, &src_xoff, &src_yoff);
--    dst = image_from_pict(pDst, TRUE, &dst_xoff, &dst_yoff);
-+    src = image_from_pict(pSrc, FALSE);
-+    dst = image_from_pict(pDst, TRUE);
- 
-     if (src && dst) {
-         pixman_format_code_t format;
-@@ -121,9 +115,8 @@ fbShapes(CompositeShapesFunc composite,
- 
-             for (i = 0; i < nshapes; ++i) {
-                 composite(op, src, dst, format,
--                          xSrc + src_xoff,
--                          ySrc + src_yoff,
--                          dst_xoff, dst_yoff, 1, shapes + i * shape_size);
-+                          xSrc, ySrc, 0, 0, 
-+                          1, shapes + i * shape_size);
-             }
-         }
-         else {
-@@ -143,8 +136,8 @@ fbShapes(CompositeShapesFunc composite,
-             }
- 
-             composite(op, src, dst, format,
--                      xSrc + src_xoff,
--                      ySrc + src_yoff, dst_xoff, dst_yoff, nshapes, shapes);
-+                      xSrc, ySrc, 0, 0,
-+                      nshapes, shapes);
-         }
- 
-         DamageRegionProcessPending(pDst->pDrawable);
--- 
-2.3.2 (Apple Git-55)
-
diff --git a/pkgs/servers/x11/xorg/darwin/function-pointer-test.patch b/pkgs/servers/x11/xorg/darwin/function-pointer-test.patch
deleted file mode 100644
index e521a12ba800..000000000000
--- a/pkgs/servers/x11/xorg/darwin/function-pointer-test.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-These are functions, not function pointers, so they always evaluate to true.
-
-diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
-index 5445c6f..8574bf1 100644
---- a/hw/xquartz/X11Controller.m
-+++ b/hw/xquartz/X11Controller.m
-@@ -364,7 +364,6 @@ extern char *bundle_id_prefix;
-     }
- 
- #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
--    if (asl_log_descriptor) {
-         char *asl_sender;
-         aslmsg amsg = asl_new(ASL_TYPE_MSG);
-         assert(amsg);
-@@ -394,7 +393,6 @@ extern char *bundle_id_prefix;
-         asl_log_descriptor(aslc, amsg, ASL_LEVEL_NOTICE, stderr_pipe[0], ASL_LOG_DESCRIPTOR_READ);
- 
-         asl_free(amsg);
--    }
- #endif
- 
-     /* Do the fork-twice trick to avoid having to reap zombies */
-@@ -414,11 +412,9 @@ extern char *bundle_id_prefix;
- 
-         case 0:                                     /* child2 */
- #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
--            if (asl_log_descriptor) {
-                 /* Replace our stdout/stderr */
-                 dup2(stdout_pipe[1], STDOUT_FILENO);
-                 dup2(stderr_pipe[1], STDERR_FILENO);
--            }
- #endif
- 
-             /* close all open files except for standard streams */
-@@ -443,11 +439,9 @@ extern char *bundle_id_prefix;
-     }
- 
- #if MAC_OS_X_VERSION_MAX_ALLOWED >= 1080
--    if (asl_log_descriptor) {
-         /* Close the write ends of the pipe */
-         close(stdout_pipe[1]);
-         close(stderr_pipe[1]);
--    }
- #endif
- }
- 
diff --git a/pkgs/tools/filesystems/ceph/0001-Cleanup-boost-optionals.patch b/pkgs/tools/filesystems/ceph/0001-Cleanup-boost-optionals.patch
deleted file mode 100644
index a99e16ddc266..000000000000
--- a/pkgs/tools/filesystems/ceph/0001-Cleanup-boost-optionals.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 2507ab33236f0da12899fbcdd36535f7c7b68a06 Mon Sep 17 00:00:00 2001
-From: "William A. Kennington III" <william@wkennington.com>
-Date: Sat, 20 Sep 2014 22:52:31 -0700
-Subject: [PATCH] Cleanup boost optionals
-
----
- src/osd/ECBackend.cc    | 2 +-
- src/osd/ReplicatedPG.cc | 5 ++++-
- 2 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc
-index a87b5b4..c386900 100644
---- a/src/osd/ECBackend.cc
-+++ b/src/osd/ECBackend.cc
-@@ -81,7 +81,7 @@ ostream &operator<<(ostream &lhs, const ECBackend::read_result_t &rhs)
-   lhs << "read_result_t(r=" << rhs.r
-       << ", errors=" << rhs.errors;
-   if (rhs.attrs) {
--    lhs << ", attrs=" << rhs.attrs;
-+    lhs << ", attrs=" << rhs.attrs.get();
-   } else {
-     lhs << ", noattrs";
-   }
-diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
-index 5e5510d..79e8616 100644
---- a/src/osd/ReplicatedPG.cc
-+++ b/src/osd/ReplicatedPG.cc
-@@ -5259,7 +5259,10 @@ void ReplicatedPG::do_osd_op_effects(OpContext *ctx)
-   for (list<OpContext::NotifyAck>::iterator p = ctx->notify_acks.begin();
-        p != ctx->notify_acks.end();
-        ++p) {
--    dout(10) << "notify_ack " << make_pair(p->watch_cookie, p->notify_id) << dendl;
-+    if (p->watch_cookie)
-+      dout(10) << "notify_ack " << make_pair(p->watch_cookie.get(), p->notify_id) << dendl;
-+    else
-+      dout(10) << "notify_ack " << make_pair("NULL", p->notify_id) << dendl;
-     for (map<pair<uint64_t, entity_name_t>, WatchRef>::iterator i =
- 	   ctx->obc->watchers.begin();
- 	 i != ctx->obc->watchers.end();
--- 
-2.1.0
-
diff --git a/pkgs/tools/filesystems/ceph/boost-158.patch b/pkgs/tools/filesystems/ceph/boost-158.patch
deleted file mode 100644
index 11a1d55c4948..000000000000
--- a/pkgs/tools/filesystems/ceph/boost-158.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From e7b196a4a091c0ea258866559ba06e7ed0cc4247 Mon Sep 17 00:00:00 2001
-From: Kefu Chai <kchai@redhat.com>
-Date: Fri, 8 May 2015 15:21:20 +0800
-Subject: [PATCH] mon: remove unused variable
-
-* as a side effect, this change silences
-  http://tracker.ceph.com/issues/11576
-
-Fixes: #11576
-Signed-off-by: Kefu Chai <kchai@redhat.com>
----
- src/mon/OSDMonitor.cc | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
-index 73dcd5f..7caaa45 100644
---- a/src/mon/OSDMonitor.cc
-+++ b/src/mon/OSDMonitor.cc
-@@ -3174,8 +3174,6 @@ bool OSDMonitor::preprocess_command(MMonCommand *m)
-   } else if (prefix == "osd crush get-tunable") {
-     string tunable;
-     cmd_getval(g_ceph_context, cmdmap, "tunable", tunable);
--    int value;
--    cmd_getval(g_ceph_context, cmdmap, "value", value);
-     ostringstream rss;
-     if (f)
-       f->open_object_section("tunable");
diff --git a/pkgs/tools/filesystems/ceph/fix-pgrefdebugging.patch b/pkgs/tools/filesystems/ceph/fix-pgrefdebugging.patch
deleted file mode 100644
index 4d13a0572d87..000000000000
--- a/pkgs/tools/filesystems/ceph/fix-pgrefdebugging.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 38ab682..febb58e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -541,8 +541,10 @@ fi
- #set pg ref debugging?
- AC_ARG_ENABLE([pgrefdebugging],
- 	    [AS_HELP_STRING([--enable-pgrefdebugging], [enable pg ref debugging])],
--			[AC_DEFINE([PG_DEBUG_REFS], [1], [Defined if you want pg ref debugging])],
--			[])
-+			[], [enable_pgrefdebugging=no])
-+AS_IF([test "x$enable_pgrefdebugging" = "xyes"],
-+	  [AC_DEFINE([PG_DEBUG_REFS], [1], [Defined if you want pg ref debugging])],
-+	  [])
- 
- #
- # Java is painful
diff --git a/pkgs/tools/misc/debootstrap/subst.patch b/pkgs/tools/misc/debootstrap/subst.patch
deleted file mode 100644
index 6ead80d6a79f..000000000000
--- a/pkgs/tools/misc/debootstrap/subst.patch
+++ /dev/null
@@ -1,190 +0,0 @@
-diff --git a/usr/sbin/debootstrap b/usr/sbin/debootstrap
-index a0dacf3..6331b3d 100755
---- a/usr/sbin/debootstrap
-+++ b/usr/sbin/debootstrap
-@@ -14,7 +14,7 @@ if [ "$DEBOOTSTRAP_DIR" = "" ]; then
- 	fi
- fi
- 
--if [ -x "/usr/bin/gettext" ]; then
-+if [ -x "@gettext@" ]; then
- 	USE_GETTEXT_INTERACTION=yes
- fi
- 
-@@ -334,12 +334,12 @@ fi
- 
- if [ "$ARCH" != "" ]; then
- 	true
--elif [ -x /usr/bin/dpkg ] && \
--     /usr/bin/dpkg --print-installation-architecture >/dev/null 2>&1; then
--	ARCH=`/usr/bin/dpkg --print-installation-architecture`
-+elif [ -x @dpkg@ ] && \
-+     @dpkg@ --print-installation-architecture >/dev/null 2>&1; then
-+	ARCH=`@dpkg@ --print-installation-architecture`
- elif type udpkg >/dev/null 2>&1 && \
-      udpkg --print-architecture >/dev/null 2>&1; then
--	ARCH=`/usr/bin/udpkg --print-architecture`
-+	ARCH=`@udpkg@ --print-architecture`
- elif [ -e $DEBOOTSTRAP_DIR/arch ]; then
- 	ARCH=`cat $DEBOOTSTRAP_DIR/arch`
- else
-@@ -349,7 +349,7 @@ fi
- export ARCH SUITE TARGET
- 
- if am_doing_phase first_stage second_stage; then
--	if [ -x /usr/bin/id ] && [ `id -u` -ne 0 ]; then
-+	if [ -x @id@ ] && [ `id -u` -ne 0 ]; then
- 		error 1 NEEDROOT "debootstrap can only run as root"
- 	fi
- 	# Ensure that we can create working devices and executables on the target.
-diff --git a/usr/share/debootstrap/functions b/usr/share/debootstrap/functions
-index b9180ba..33feac3 100755
---- a/usr/share/debootstrap/functions
-+++ b/usr/share/debootstrap/functions
-@@ -914,7 +914,7 @@ setup_dselect_method () {
- # For the debootstrap udeb, pkgdetails is provided by the bootstrap-base
- # udeb, so the pkgdetails API needs to be kept in sync with that.
- 
--if [ -x /usr/bin/perl ]; then
-+if [ -x @perl@ ]; then
- 	PKGDETAILS=pkgdetails_perl
- 
- 	pkgdetails_field () {
-@@ -1264,7 +1264,7 @@ close LD_SO_CONF;
- 
- unshift @ld_library_path, split(/:/, $ENV{LD_LIBRARY_PATH});
- 
--$unamearch = `/bin/uname -m`;
-+$unamearch = `@uname -m`;
- chomp $unamearch;
- 
- foreach my $file (@ARGV) {
-
-
-diff --git a/usr/share/debootstrap/functions b/usr/share/debootstrap/functions
-index 730df3a..197b2fb 100755
---- a/usr/share/debootstrap/functions
-+++ b/usr/share/debootstrap/functions
-@@ -18,7 +18,7 @@ error () {
- 		for x in "$@"; do echo "EA: $x"; done
- 		echo "EF: $fmt") >&4
- 	elif [ "$USE_GETTEXT_INTERACTION" ]; then
--		(printf "E: `LANG=$GETTEXT_LANG gettext debootstrap "$fmt"`\n" "$@") >&4
-+		(printf "E: `LANG=$GETTEXT_LANG @gettext@ debootstrap "$fmt"`\n" "$@") >&4
- 	else
- 		(printf "E: $fmt\n" "$@") >&4
- 	fi
-@@ -35,7 +35,7 @@ warning () {
- 		for x in "$@"; do echo "WA: $x"; done
- 		echo "WF: $fmt") >&4
- 	elif [ "$USE_GETTEXT_INTERACTION" ]; then
--		printf "W: `LANG=$GETTEXT_LANG gettext debootstrap "$fmt"`\n" "$@" >&4
-+		printf "W: `LANG=$GETTEXT_LANG @gettext@ debootstrap "$fmt"`\n" "$@" >&4
- 	else
- 		printf "W: $fmt\n" "$@" >&4
- 	fi
-@@ -51,7 +51,7 @@ info () {
- 		for x in "$@"; do echo "IA: $x"; done
- 		echo "IF: $fmt") >&4
- 	elif [ "$USE_GETTEXT_INTERACTION" ]; then
--		printf "I: `LANG=$GETTEXT_LANG gettext debootstrap "$fmt"`\n" "$@" >&4
-+		printf "I: `LANG=$GETTEXT_LANG @gettext@ debootstrap "$fmt"`\n" "$@" >&4
- 	else
- 		printf "I: $fmt\n" "$@" >&4
- 	fi
-
-
-diff --git a/usr/share/debootstrap/functions b/usr/share/debootstrap/functions
-index 98d2056..c1d7430 100755
---- a/usr/share/debootstrap/functions
-+++ b/usr/share/debootstrap/functions
-@@ -501,9 +501,9 @@ download_release_indices () {
- 		local md=
- 		if [ "$normmd" != "" ]; then
- 			md="$normmd"
--		elif [ -x /bin/bunzip2 ] && [ "$bz2md" != "" ]; then
-+		elif [ -x @bunzip2@ ] && [ "$bz2md" != "" ]; then
- 			md="$bz2md"
--		elif [ -x /bin/gunzip ] && [ "$gzmd" != "" ]; then
-+		elif [ -x @gunzip@ ] && [ "$gzmd" != "" ]; then
- 			md="$gzmd"
- 		fi
- 		if [ "$md" != "" ]; then
-@@ -529,11 +529,11 @@ download_release_indices () {
- 			ext="$ext $normmd ."
- 			md="$normmd"
- 		fi
--		if [ -x /bin/bunzip2 ] && [ "$bz2md" != "" ]; then
-+		if [ -x @bunzip2@ ] && [ "$bz2md" != "" ]; then
- 			ext="$ext $bz2md bz2"
- 			md="${md:-$bz2md}"
- 		fi
--		if [ -x /bin/gunzip ] && [ "$gzmd" != "" ]; then
-+		if [ -x @gunzip@ ] && [ "$gzmd" != "" ]; then
- 			ext="$ext $gzmd gz"
- 			md="${md:-$gzmd}"
- 		fi
-@@ -663,7 +663,7 @@ download_main_indices () {
- 	    for c in $COMPONENTS; do
- 		local path="dists/$SUITE/$c/binary-$ARCH/Packages"
- 		local pkgdest="$TARGET/$($DLDEST pkg "$SUITE" "$c" "$ARCH" "$m" "$path")"
--		if [ -x /bin/gunzip ] && get "$m/${path}.gz" "${pkgdest}.gz"; then
-+		if [ -x @gunzip@ ] && get "$m/${path}.gz" "${pkgdest}.gz"; then
- 			rm -f "$pkgdest"
- 			gunzip "$pkgdest.gz"
- 		elif get "$m/$path" "$pkgdest"; then
-
-
-diff --git a/usr/share/debootstrap/functions b/usr/share/debootstrap/functions
-index 15051e8..a5de422 100755
---- a/usr/share/debootstrap/functions
-+++ b/usr/share/debootstrap/functions
-@@ -70,13 +70,13 @@ wgetprogress () {
- 	[ ! "$verbose" ] && QSWITCH="-q"
- 	local ret=0
- 	if [ "$USE_DEBIANINSTALLER_INTERACTION" ] && [ "$PROGRESS_NEXT" ]; then
--		wget "$@" 2>&1 >/dev/null | $PKGDETAILS "WGET%" $PROGRESS_NOW $PROGRESS_NEXT $PROGRESS_END >&3
-+		@wget@ "$@" 2>&1 >/dev/null | $PKGDETAILS "WGET%" $PROGRESS_NOW $PROGRESS_NEXT $PROGRESS_END >&3
- 		ret=$?
- 	elif [ "$USE_BOOTFLOPPIES_INTERACTION" ] && [ "$PROGRESS_NEXT" ]; then
--		wget "$@" 2>&1 >/dev/null | $PKGDETAILS "WGET%" $PROGRESS_NOW $PROGRESS_NEXT $PROGRESS_END "$PROGRESS_WHAT" >&3
-+		@wget@ "$@" 2>&1 >/dev/null | $PKGDETAILS "WGET%" $PROGRESS_NOW $PROGRESS_NEXT $PROGRESS_END "$PROGRESS_WHAT" >&3
- 		ret=$?
- 	else
--		wget $QSWITCH "$@"
-+		@wget@ $QSWITCH "$@"
- 		ret=$?
- 	fi
- 	return $ret
-
-diff --git a/usr/share/debootstrap/functions b/usr/share/debootstrap/functions
-index 8d60d8e..e238644 100755
---- a/usr/share/debootstrap/functions
-+++ b/usr/share/debootstrap/functions
-@@ -921,7 +921,7 @@ if [ -x  ]; then
- 
- 	pkgdetails_field () {
- 		# uniq field mirror Packages values...
--		perl -le '
-+		@perl@ -le '
- $unique = shift @ARGV; $field = lc(shift @ARGV); $mirror = shift @ARGV;
- $cnt = length(@ARGV);
- %fields = map { $_, 0 } @ARGV;
-@@ -959,7 +959,7 @@ for $v (keys %fields) {
- 	pkgdetails_perl () {
- 		if [ "$1" = "WGET%" ]; then
- 			shift;
--			perl -e '
-+			@perl@ -e '
- $v = 0;
- while (read STDIN, $x, 1) {
- 	if ($x =~ m/\d/) {
-@@ -974,7 +974,7 @@ while (read STDIN, $x, 1) {
- }' "$@"
- 		elif [ "$1" = "GETDEPS" ]; then
- 			local pkgdest="$2"; shift; shift
--			perl -e '
-+			@perl@ -e '
- while (<STDIN>) {
- 	chomp;
- 	$in = 1 if (/^Package: (.*)$/ && grep {$_ eq $1} @ARGV);
diff --git a/pkgs/tools/networking/isync/isync-recursice-imap.patch b/pkgs/tools/networking/isync/isync-recursice-imap.patch
deleted file mode 100644
index db12069950fd..000000000000
--- a/pkgs/tools/networking/isync/isync-recursice-imap.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-diff -rupN ../isync-1.0.4_original/./src/drv_imap.c ./src/drv_imap.c
---- ../isync-1.0.4_original/./src/drv_imap.c	2007-09-22 01:44:12.000000000 -0700
-+++ ./src/drv_imap.c	2009-04-22 15:28:58.000000000 -0700
-@@ -1678,7 +1678,7 @@ imap_list( store_t *gctx, string_list_t 
- 	int ret;
- 
- 	imap->boxes = 0;
--	if ((ret = imap_exec_b( ctx, 0, "LIST \"\" \"%s%%\"", ctx->prefix )) != DRV_OK)
-+	if ((ret = imap_exec_b( ctx, 0, "LIST \"\" \"%s*\"", ctx->prefix )) != DRV_OK)
- 		return ret;
- 	*retb = imap->boxes;
- 	return DRV_OK;
-diff -rupN ../isync-1.0.4_original/./src/drv_maildir.c ./src/drv_maildir.c
---- ../isync-1.0.4_original/./src/drv_maildir.c	2008-02-23 01:02:21.000000000 -0800
-+++ ./src/drv_maildir.c	2009-04-22 15:34:05.000000000 -0700
-@@ -24,6 +24,7 @@
- 
- #include "isync.h"
- 
-+#include <assert.h>
- #include <limits.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -46,6 +47,56 @@
- #include <db.h>
- #endif /* USE_DB */
- 
-+static void encode_maildir_box(const char* in, char* out, size_t size)
-+{
-+	const char* p;
-+	char c;
-+	size_t out_chars;
-+
-+	for (p = in, out_chars = 0; (c = *p); ++p, ++out, ++out_chars) {
-+		assert(out_chars < size);
-+		if (c == '/') {
-+			assert(out_chars < size - 1);
-+			*(out++) = '~';
-+			*out = '-';
-+			++out_chars;
-+		}
-+		else if (c == '~') {
-+			assert(out_chars < size - 1);
-+			*(out++) = '~';
-+			*out = '~';
-+			++out_chars;
-+		}
-+		else {
-+			*out = c;
-+		}
-+	}
-+	assert(out_chars < size);
-+	*out = 0;
-+}
-+
-+static void decode_maildir_box(const char* in, char* out, size_t size)
-+{
-+	const char* p;
-+	char c;
-+	size_t out_chars;
-+
-+	for (p = in, out_chars = 0; (c = *p); ++p, ++out, ++out_chars) {
-+		assert(out_chars < size);
-+		if (c == '~') {
-+			assert(out_chars < size - 1);
-+			c = *(++p);
-+			*out = (c == '-' ? '/' : '~');
-+			++out_chars;
-+		}
-+		else {
-+			*out = c;
-+		}
-+	}
-+	assert(out_chars < size);
-+	*out = 0;
-+}
-+
- typedef struct maildir_store_conf {
- 	store_conf_t gen;
- 	char *inbox;
-@@ -164,14 +215,17 @@ maildir_list( store_t *gctx, string_list
- 		const char *inbox = ((maildir_store_conf_t *)gctx->conf)->inbox;
- 		int bl;
- 		struct stat st;
--		char buf[PATH_MAX];
-+ 		char buf[PATH_MAX], box[PATH_MAX];
- 
- 		if (*de->d_name == '.')
- 			continue;
- 		bl = nfsnprintf( buf, sizeof(buf), "%s%s/cur", gctx->conf->path, de->d_name );
- 		if (stat( buf, &st ) || !S_ISDIR(st.st_mode))
- 			continue;
--		add_string_list( retb, !memcmp( buf, inbox, bl - 4 ) && !inbox[bl - 4] ? "INBOX" : de->d_name );
-+ 
-+ 		decode_maildir_box(de->d_name, box, PATH_MAX);
-+  		add_string_list( retb,
-+ 		                 !memcmp( buf, inbox, bl - 4 ) && !inbox[bl - 4] ? "INBOX" : box );
- 	}
- 	closedir (dir);
- 
-@@ -717,8 +771,11 @@ maildir_prepare( store_t *gctx, int opts
- #endif /* USE_DB */
- 	if (!strcmp( gctx->name, "INBOX" ))
- 		gctx->path = nfstrdup( ((maildir_store_conf_t *)gctx->conf)->inbox );
--	else
--		nfasprintf( &gctx->path, "%s%s", gctx->conf->path, gctx->name );
-+ 	else {
-+ 		char box[_POSIX_PATH_MAX];
-+ 		encode_maildir_box(gctx->name, box, _POSIX_PATH_MAX);
-+ 		nfasprintf( &gctx->path, "%s%s", gctx->conf->path, box );
-+ 	}
- 	if (opts & OPEN_SETFLAGS)
- 		opts |= OPEN_OLD;
- 	if (opts & OPEN_EXPUNGE)
diff --git a/pkgs/tools/networking/mtr/edd425.patch b/pkgs/tools/networking/mtr/edd425.patch
deleted file mode 100644
index b950cacd2e57..000000000000
--- a/pkgs/tools/networking/mtr/edd425.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-diff --git a/asn.c b/asn.c
-index eac8d5e..33622ca 100644
---- a/asn.c
-+++ b/asn.c
-@@ -16,6 +16,8 @@
-     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
-+#include "config.h"
-+
- #include <unistd.h>
- #include <stdio.h>
- #include <stdlib.h>
-@@ -35,7 +37,6 @@
- #include <sys/socket.h>
- #include <search.h>
- 
--#include "config.h"
- #include "mtr.h"
- #include "asn.h"
- 
-diff --git a/curses.c b/curses.c
-index eacc40d..b96daee 100644
---- a/curses.c
-+++ b/curses.c
-@@ -16,7 +16,8 @@
-     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
--#include <config.h>
-+#include "config.h"
-+
- #include <strings.h>
- #include <unistd.h>
- 
-diff --git a/display.c b/display.c
-index aa369ee..3545467 100644
---- a/display.c
-+++ b/display.c
-@@ -16,7 +16,8 @@
-     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
--#include <config.h>
-+#include "config.h"
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <sys/types.h>
-diff --git a/dns.c b/dns.c
-index e89fd4b..4076b71 100644
---- a/dns.c
-+++ b/dns.c
-@@ -22,7 +22,8 @@
-     Released under GPL, as above.
- */
- 
--#include <config.h>
-+#include "config.h"
-+
- #include <sys/types.h>
- #include <sys/time.h>
- #include <sys/select.h>
-diff --git a/getopt.c b/getopt.c
-index 3d43e26..e2f8758 100644
---- a/getopt.c
-+++ b/getopt.c
-@@ -27,7 +27,7 @@
- #endif
- 
- #ifdef HAVE_CONFIG_H
--#include <config.h>
-+#include "config.h"
- #endif
- 
- #if !defined (__STDC__) || !__STDC__
-diff --git a/getopt1.c b/getopt1.c
-index bccf8b2..0a2d405 100644
---- a/getopt1.c
-+++ b/getopt1.c
-@@ -16,7 +16,7 @@
-    Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
- 
- #ifdef HAVE_CONFIG_H
--#include <config.h>
-+#include "config.h"
- #endif
- 
- #include "getopt.h"
-diff --git a/gtk.c b/gtk.c
-index 38ed507..7faa132 100644
---- a/gtk.c
-+++ b/gtk.c
-@@ -17,7 +17,7 @@
-     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
--#include <config.h>
-+#include "config.h"
- 
- #include <stdio.h>
- #include <stdlib.h>
-diff --git a/mtr.c b/mtr.c
-index 50eb464..416b744 100644
---- a/mtr.c
-+++ b/mtr.c
-@@ -16,19 +16,21 @@
-     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
-+#include "config.h"
-+
- #include <sys/types.h>
--#include <config.h>
--#include <netdb.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--#include <netinet/in.h>
--#include <sys/socket.h>
- #include <unistd.h>
--#include <strings.h>
--#include <time.h>
- #include <errno.h>
- #include <string.h>
-+#include <strings.h>
-+
-+#include <netdb.h>
-+#include <netinet/in.h>
-+#include <sys/socket.h>
-+#include <time.h>
- #include <ctype.h>
- #include <assert.h>
- #include <fcntl.h>
-diff --git a/net.c b/net.c
-index 1c8d28f..d648804 100644
---- a/net.c
-+++ b/net.c
-@@ -16,7 +16,7 @@
-     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
--#include <config.h>
-+#include "config.h"
- 
- #if defined(HAVE_SYS_XTI_H)
- #include <sys/xti.h>
-@@ -1562,4 +1562,4 @@ void net_harvest_fds(void)
-   net_add_fds(&writefd, &maxfd);
-   select(maxfd, NULL, &writefd, NULL, &tv);
-   net_process_fds(&writefd);
--}
-\ No newline at end of file
-+}
-diff --git a/raw.c b/raw.c
-index 8b0df47..0e1f4f4 100644
---- a/raw.c
-+++ b/raw.c
-@@ -18,7 +18,8 @@
-     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
--#include <config.h>
-+#include "config.h"
-+
- #include <ctype.h>
- #include <stdlib.h>
- #include <stdio.h>
-@@ -27,7 +28,6 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- 
--
- #include "mtr.h"
- #include "raw.h"
- #include "net.h"
-diff --git a/report.c b/report.c
-index 71040e4..39b2fb2 100644
---- a/report.c
-+++ b/report.c
-@@ -16,7 +16,8 @@
-     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
--#include <config.h>
-+#include "config.h"
-+
- #include <sys/types.h>
- #include <stdio.h>
- #include <netdb.h>
-diff --git a/select.c b/select.c
-index 31bfd5f..7553675 100644
---- a/select.c
-+++ b/select.c
-@@ -16,7 +16,8 @@
-     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
--#include <config.h>
-+#include "config.h"
-+
- #include <sys/types.h>
- #include <sys/time.h>
- #include <stdlib.h>
-diff --git a/split.c b/split.c
-index 642353e..5ead235 100644
---- a/split.c
-+++ b/split.c
-@@ -20,7 +20,8 @@
-     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
- 
--#include <config.h>
-+#include "config.h"
-+
- #include <ctype.h>
- #include <stdlib.h>
- #include <stdio.h>
diff --git a/pkgs/tools/networking/ntp/no-openssl.patch b/pkgs/tools/networking/ntp/no-openssl.patch
deleted file mode 100644
index 3a7784016ffa..000000000000
--- a/pkgs/tools/networking/ntp/no-openssl.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-Fix ntp-keygen build without OpenSSL
-
-http://bk1.ntp.org/ntp-stable/?PAGE=patch&REV=5497b345z5MNTuNvJWuqPSje25NQTg
-
-Index: ntp-4.2.8/Makefile.am
-===================================================================
---- ntp-4.2.8.orig/Makefile.am
-+++ ntp-4.2.8/Makefile.am
-@@ -2,7 +2,10 @@ ACLOCAL_AMFLAGS = -I sntp/m4 -I sntp/lib
- 
- NULL =
- 
-+# moved sntp first to get libtool and libevent built.
-+
- SUBDIRS =		\
-+	sntp		\
- 	scripts		\
- 	include		\
- 	libntp		\
-@@ -17,7 +20,6 @@ SUBDIRS =		\
- 	clockstuff	\
- 	kernel		\
- 	util		\
--	sntp		\
- 	tests		\
- 	$(NULL)
- 
-@@ -64,7 +66,6 @@ BUILT_SOURCES =				\
- 	.gcc-warning			\
- 	libtool				\
- 	html/.datecheck			\
--	sntp/built-sources-only		\
- 	$(srcdir)/COPYRIGHT		\
- 	$(srcdir)/.checkChangeLog	\
- 	$(NULL)
-Index: ntp-4.2.8/configure.ac
-===================================================================
---- ntp-4.2.8.orig/configure.ac
-+++ ntp-4.2.8/configure.ac
-@@ -102,7 +102,7 @@ esac
- enable_nls=no
- LIBOPTS_CHECK_NOBUILD([sntp/libopts])
- 
--NTP_ENABLE_LOCAL_LIBEVENT
-+NTP_LIBEVENT_CHECK_NOBUILD([2], [sntp/libevent])
- 
- NTP_LIBNTP
- 
-@@ -771,6 +771,10 @@ esac
- 
- #### 
- 
-+AC_CHECK_FUNCS([arc4random_buf])
-+
-+#### 
-+
- saved_LIBS="$LIBS"
- LIBS="$LIBS $LDADD_LIBNTP"
- AC_CHECK_FUNCS([daemon])
-Index: ntp-4.2.8/libntp/ntp_crypto_rnd.c
-===================================================================
---- ntp-4.2.8.orig/libntp/ntp_crypto_rnd.c
-+++ ntp-4.2.8/libntp/ntp_crypto_rnd.c
-@@ -24,6 +24,21 @@
- int crypto_rand_init = 0;
- #endif
- 
-+#ifndef HAVE_ARC4RANDOM_BUF
-+static void
-+arc4random_buf(void *buf, size_t nbytes);
-+
-+void
-+evutil_secure_rng_get_bytes(void *buf, size_t nbytes);
-+
-+static void
-+arc4random_buf(void *buf, size_t nbytes)
-+{
-+	evutil_secure_rng_get_bytes(buf, nbytes);
-+	return;
-+}
-+#endif
-+
- /*
-  * As of late 2014, here's how we plan to provide cryptographic-quality
-  * random numbers:
-Index: ntp-4.2.8/sntp/configure.ac
-===================================================================
---- ntp-4.2.8.orig/sntp/configure.ac
-+++ ntp-4.2.8/sntp/configure.ac
-@@ -97,11 +97,14 @@ esac
- enable_nls=no
- LIBOPTS_CHECK
- 
--AM_COND_IF(
--    [BUILD_SNTP],
--    [NTP_LIBEVENT_CHECK],
--    [NTP_LIBEVENT_CHECK_NOBUILD]
--)
-+# From when we only used libevent for sntp:
-+#AM_COND_IF(
-+#    [BUILD_SNTP],
-+#    [NTP_LIBEVENT_CHECK],
-+#    [NTP_LIBEVENT_CHECK_NOBUILD]
-+#)
-+
-+NTP_LIBEVENT_CHECK([2])
- 
- # Checks for libraries.
- 
-Index: ntp-4.2.8/sntp/m4/ntp_libevent.m4
-===================================================================
---- ntp-4.2.8.orig/sntp/m4/ntp_libevent.m4
-+++ ntp-4.2.8/sntp/m4/ntp_libevent.m4
-@@ -1,4 +1,25 @@
--dnl NTP_ENABLE_LOCAL_LIBEVENT				     -*- Autoconf -*-
-+# SYNOPSIS						-*- Autoconf -*-
-+#
-+#  NTP_ENABLE_LOCAL_LIBEVENT
-+#  NTP_LIBEVENT_CHECK([MINVERSION [, DIR]])
-+#  NTP_LIBEVENT_CHECK_NOBUILD([MINVERSION [, DIR]])
-+#
-+# DESCRIPTION
-+#
-+# AUTHOR
-+#
-+#  Harlan Stenn
-+#
-+# LICENSE
-+#
-+#  This file is Copyright (c) 2014 Network Time Foundation
-+# 
-+#  Copying and distribution of this file, with or without modification, are
-+#  permitted in any medium without royalty provided the copyright notice,
-+#  author attribution and this notice are preserved.  This file is offered
-+#  as-is, without any warranty.
-+
-+dnl NTP_ENABLE_LOCAL_LIBEVENT
- dnl
- dnl Provide only the --enable-local-libevent command-line option.
- dnl
-@@ -29,7 +50,7 @@ dnl If NOBUILD is provided as the 3rd ar
- dnl but DO NOT invoke DIR/configure if we are going to use our bundled
- dnl version.  This may be the case for nested packages.
- dnl
--dnl provide --enable-local-libevent .
-+dnl provides --enable-local-libevent .
- dnl
- dnl Examples:
- dnl
-Index: ntp-4.2.8/util/Makefile.am
-===================================================================
---- ntp-4.2.8.orig/util/Makefile.am
-+++ ntp-4.2.8/util/Makefile.am
-@@ -19,6 +19,7 @@ AM_LDFLAGS = $(LDFLAGS_NTP)
- LDADD=		../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM) $(PTHREAD_LIBS)
- tg2_LDADD=	../libntp/libntp.a $(LDADD_LIBNTP) $(LIBM)
- ntp_keygen_LDADD  = version.o $(LIBOPTS_LDADD) ../libntp/libntp.a
-+ntp_keygen_LDADD += $(LDADD_LIBEVENT)
- ntp_keygen_LDADD += $(LDADD_LIBNTP) $(PTHREAD_LIBS) $(LDADD_NTP) $(LIBM)
- ntp_keygen_SOURCES = ntp-keygen.c ntp-keygen-opts.c ntp-keygen-opts.h
- 

From e800e5bb11040043bfa2bdda85b4261b93293154 Mon Sep 17 00:00:00 2001
From: Nathaniel Baxter <nathaniel.baxter@gmail.com>
Date: Sun, 24 Jan 2016 13:11:27 +1100
Subject: [PATCH 0323/2285] teamspeak client: bump 3.0.18.1 -> 3.0.18.2

---
 .../instant-messengers/teamspeak/client.nix           | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
index 7eedd997c1b4..0dc00d2f3000 100644
--- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
+++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix
@@ -30,23 +30,22 @@ in
 stdenv.mkDerivation rec {
   name = "teamspeak-client-${version}";
 
-  version = "3.0.18.1";
+  version = "3.0.18.2";
 
   src = fetchurl {
     urls = [
       "http://dl.4players.de/ts/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
       "http://teamspeak.gameserver.gamed.de/ts3/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
-      "http://files.teamspeak-services.com/releases/${version}/TeamSpeak3-Client-linux_${arch}-${version}.run"
     ];
     sha256 = if stdenv.is64bit
-                then "1bc9m2niagqmijmzlki8jmp48vhns041xdjlji9fyqay6l5mx5fw"
-                else "156dirxjys7pbximw19qs7j52my36p4kp98df3kgrsiiv8mz6v68";
+                then "1r0l0jlng1fz0cyvnfa4hqwlszfraj5kcs2lg9qnqvp03x8sqn6h"
+                else "1pgpsv1r216l76fx0grlqmldd9gha3sj84gnm44km8y98b3hj525";
   };
 
   # grab the plugin sdk for the desktop icon
   pluginsdk = fetchurl {
-    url = "http://dl.4players.de/ts/client/pluginsdk/pluginsdk_3.0.16.zip";
-    sha256 = "1qpqpj3r21wff3ly9ail4l6b57pcqycsh2hca926j14sdlvpv7kl";
+    url = "http://dl.4players.de/ts/client/pluginsdk/pluginsdk_3.0.18.1.zip";
+    sha256 = "108y52mfg44cnnhhipnmrr0cxh7ram5c2hnchxjkwvf5766vbaq4";
   };
 
   buildInputs = [ makeWrapper less which unzip ];

From 2bdd64d6dc50579bc75c0ba4162f7f95b101aaf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Czy=C5=BC?= <tomasz.czyz@gmail.com>
Date: Fri, 8 Jan 2016 00:08:43 +0000
Subject: [PATCH 0324/2285] solaar: init at 0.9.2

---
 lib/maintainers.nix                       |  1 +
 pkgs/applications/misc/solaar/default.nix | 43 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 3 files changed, 46 insertions(+)
 create mode 100644 pkgs/applications/misc/solaar/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index f73312db99e7..0aff6df53eac 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -289,6 +289,7 @@
   smironov = "Sergey Mironov <ierton@gmail.com>";
   spacefrogg = "Michael Raitza <spacefrogg-nixos@meterriblecrew.net>";
   spencerjanssen = "Spencer Janssen <spencerjanssen@gmail.com>";
+  spinus = "Tomasz Czyż <tomasz.czyz@gmail.com>";
   sprock = "Roger Mason <rmason@mun.ca>";
   spwhitt = "Spencer Whitt <sw@swhitt.me>";
   stephenmw = "Stephen Weinberg <stephen@q5comm.com>";
diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix
new file mode 100644
index 000000000000..db0798f64cff
--- /dev/null
+++ b/pkgs/applications/misc/solaar/default.nix
@@ -0,0 +1,43 @@
+{fetchurl, stdenv, makeWrapper, gtk3, python3Packages}:
+let
+  version = "0.9.2";
+in
+stdenv.mkDerivation {
+  name = "solaar-${version}";
+  src = fetchurl {
+    sha256 = "0954grz2adggfzcj4df4mpr4d7qyl7w8rb4j2s0f9ymawl92i05j";
+    url = "https://github.com/pwr/Solaar/archive/${version}.tar.gz";
+  };
+
+  buildInputs = [gtk3 python3Packages.pygobject3 python3Packages.pyudev];
+  enableParallelBuilding = true;
+  installPhase = ''
+    mkdir -p "$out";
+  '';
+  postInstall = ''
+    wrapProgram "$out/bin/solaar" \
+      --prefix PYTHONPATH : "$PYTHONPATH" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
+    wrapProgram "$out/bin/solaar-cli" \
+      --prefix PYTHONPATH : "$PYTHONPATH" \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
+  '';
+  meta = with stdenv.lib; {
+    description = "Linux devices manager for the Logitech Unifying Receiver";
+    longDescription = ''
+      Solaar is a Linux device manager for Logitech’s Unifying Receiver
+      peripherals. It is able to pair/unpair devices to the receiver, and for
+      most devices read battery status.
+
+      It comes in two flavors, command-line and GUI. Both are able to list the
+      devices paired to a Unifying Receiver, show detailed info for each
+      device, and also pair/unpair supported devices with the receiver.
+
+      To be able to use it, make sure you have access to /dev/hidraw* files.
+    '';
+    license = licenses.gpl2;
+    homepage = https://pwr.github.io/Solaar/;
+    platforms = platforms.linux;
+    maintainers = [maintainers.spinus];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a8f01dda21f0..19f6132c7eb9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3137,6 +3137,8 @@ let
 
   socat2pre = lowPrio (callPackage ../tools/networking/socat/2.x.nix { });
 
+  solaar = callPackage ../applications/misc/solaar {};
+
   sourceHighlight = callPackage ../tools/text/source-highlight { };
 
   spaceFM = callPackage ../applications/misc/spacefm { adwaita-icon-theme = gnome3.adwaita-icon-theme; };

From 10229032a9799eeca0068b7bd1e05ab1d127c648 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 24 Jan 2016 04:02:03 +0100
Subject: [PATCH 0325/2285] borg: 0.29.0 -> 0.30.0

Compatibility notes:

- you may need to use -v (or --info) more often to actually see
  output emitted at INFO log level (because it is suppressed at
  the default WARNING log level). See the general section in the
  usage docs.
- for borg create, you need --list (additionally to -v) to see
  the long file list (was needed so you can have e.g. --stats
  alone without the long list)
- see link below about BORG_DELETE_I_KNOW_WHAT_I_AM_DOING
  (was: BORG_CHECK_I_KNOW_WHAT_I_AM_DOING)

More: https://github.com/borgbackup/borg/blob/0.30.0/docs/changes.rst
---
 pkgs/tools/backup/borg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index a68a5a7313e5..dd590bb046d9 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -2,12 +2,12 @@
 
 python3Packages.buildPythonPackage rec {
   name = "borgbackup-${version}";
-  version = "0.29.0";
+  version = "0.30.0";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://pypi.python.org/packages/source/b/borgbackup/borgbackup-${version}.tar.gz";
-    sha256 = "1gvx036a7j16hd5rg8cr3ibiig7gwqhmddrilsakcw4wnfimjy5m";
+    sha256 = "0n78c982kdfqbyi9jawcvzgdik4l36c2s7rpzkfr1ka6506k2rx4";
   };
 
   propagatedBuildInputs = with python3Packages;

From aca5edb8f9d001e820b892e97305e825da0f7c7e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 24 Jan 2016 04:02:27 +0100
Subject: [PATCH 0326/2285] borg: build and install documentation

---
 pkgs/tools/backup/borg/default.nix | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index dd590bb046d9..1ea8095bd38c 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python3Packages, openssl, acl, lz4 }:
+{ stdenv, fetchurl, python3Packages, acl, lz4, openssl }:
 
 python3Packages.buildPythonPackage rec {
   name = "borgbackup-${version}";
@@ -10,14 +10,31 @@ python3Packages.buildPythonPackage rec {
     sha256 = "0n78c982kdfqbyi9jawcvzgdik4l36c2s7rpzkfr1ka6506k2rx4";
   };
 
-  propagatedBuildInputs = with python3Packages;
-    [ cython msgpack openssl acl llfuse tox detox lz4 setuptools_scm ];
+  nativeBuildInputs = with python3Packages; [
+    # For building documentation:
+    sphinx
+  ];
+  propagatedBuildInputs = [
+    acl lz4 openssl
+  ] ++ (with python3Packages; [
+    cython msgpack llfuse tox detox setuptools_scm
+  ]);
 
   preConfigure = ''
     export BORG_OPENSSL_PREFIX="${openssl}"
     export BORG_LZ4_PREFIX="${lz4}"
   '';
 
+  postInstall = ''
+    make -C docs singlehtml
+    mkdir -p $out/share/doc/borg
+    cp -R docs/_build/singlehtml $out/share/doc/borg/html
+
+    make -C docs man
+    mkdir -p $out/share/man
+    cp -R docs/_build/man $out/share/man/man1
+  '';
+
   meta = with stdenv.lib; {
     description = "A deduplicating backup program (attic fork)";
     homepage = https://borgbackup.github.io/;

From 9790094f23f199da3e849df659d6151d8d9fa171 Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Sat, 23 Jan 2016 21:49:50 -0600
Subject: [PATCH 0327/2285] libgdiplus: build on darwin

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

diff --git a/pkgs/development/libraries/libgdiplus/default.nix b/pkgs/development/libraries/libgdiplus/default.nix
index 56bc72acff02..60995046982f 100644
--- a/pkgs/development/libraries/libgdiplus/default.nix
+++ b/pkgs/development/libraries/libgdiplus/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, glib, cairo, fontconfig
+{ stdenv, fetchurl, pkgconfig, glib, cairo, Carbon, fontconfig
 , libtiff, giflib, libungif, libjpeg, libpng, monoDLLFixer
 , libXrender, libexif }:
 
@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ pkgconfig glib cairo fontconfig libtiff giflib libungif
       libjpeg libpng libXrender libexif
-    ];
+    ]
+    ++ stdenv.lib.optional stdenv.isDarwin Carbon;
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c283e4acb10..7801abec0483 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7267,7 +7267,9 @@ let
 
   libgcrypt_1_5 = callPackage ../development/libraries/libgcrypt/1.5.nix { };
 
-  libgdiplus = callPackage ../development/libraries/libgdiplus { };
+  libgdiplus = callPackage ../development/libraries/libgdiplus {
+      inherit (darwin.apple_sdk.frameworks) Carbon;
+  };
 
   libgksu = callPackage ../development/libraries/libgksu { };
 

From 78956c77c019456d7528075f9487d6a5620d3588 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 24 Jan 2016 03:53:38 +0000
Subject: [PATCH 0328/2285] linux: 4.3.3 -> 4.34 (and update grsecurity
 patches, too)

---
 .../linux/kernel/cve-2016-0728.patch          | 78 -------------------
 pkgs/os-specific/linux/kernel/linux-4.3.nix   |  6 +-
 pkgs/os-specific/linux/kernel/patches.nix     |  6 +-
 3 files changed, 5 insertions(+), 85 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/cve-2016-0728.patch

diff --git a/pkgs/os-specific/linux/kernel/cve-2016-0728.patch b/pkgs/os-specific/linux/kernel/cve-2016-0728.patch
deleted file mode 100644
index 5eec95c62930..000000000000
--- a/pkgs/os-specific/linux/kernel/cve-2016-0728.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 05fd13592b60c3e9873f56705f80ff934e98b046 Mon Sep 17 00:00:00 2001
-From: David Howells <dhowells@redhat.com>
-Date: Mon, 18 Jan 2016 10:53:31 +0000
-Subject: [PATCH] KEYS: Fix keyring ref leak in join_session_keyring()
-
-This fixes CVE-2016-0728.
-
-If a thread is asked to join as a session keyring the keyring that's already
-set as its session, we leak a keyring reference.
-
-This can be tested with the following program:
-
-	#include <stddef.h>
-	#include <stdio.h>
-	#include <sys/types.h>
-	#include <keyutils.h>
-
-	int main(int argc, const char *argv[])
-	{
-		int i = 0;
-		key_serial_t serial;
-
-		serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING,
-				"leaked-keyring");
-		if (serial < 0) {
-			perror("keyctl");
-			return -1;
-		}
-
-		if (keyctl(KEYCTL_SETPERM, serial,
-			   KEY_POS_ALL | KEY_USR_ALL) < 0) {
-			perror("keyctl");
-			return -1;
-		}
-
-		for (i = 0; i < 100; i++) {
-			serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING,
-					"leaked-keyring");
-			if (serial < 0) {
-				perror("keyctl");
-				return -1;
-			}
-		}
-
-		return 0;
-	}
-
-If, after the program has run, there something like the following line in
-/proc/keys:
-
-3f3d898f I--Q---   100 perm 3f3f0000     0     0 keyring   leaked-keyring: empty
-
-with a usage count of 100 * the number of times the program has been run,
-then the kernel is malfunctioning.  If leaked-keyring has zero usages or
-has been garbage collected, then the problem is fixed.
-
-Reported-by: Yevgeny Pats <yevgeny@perception-point.io>
-Signed-off-by: David Howells <dhowells@redhat.com>
-RH-bugzilla: 1298036
----
- security/keys/process_keys.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
-index 43b4cddbf2b3..7877e5cd4e23 100644
---- a/security/keys/process_keys.c
-+++ b/security/keys/process_keys.c
-@@ -794,6 +794,7 @@ long join_session_keyring(const char *name)
- 		ret = PTR_ERR(keyring);
- 		goto error2;
- 	} else if (keyring == new->session_keyring) {
-+		key_put(keyring);
- 		ret = 0;
- 		goto error2;
- 	}
--- 
-2.5.0
-
diff --git a/pkgs/os-specific/linux/kernel/linux-4.3.nix b/pkgs/os-specific/linux/kernel/linux-4.3.nix
index 8d590a72d743..c8a994ba0b30 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.3.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.3.nix
@@ -1,17 +1,15 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.3.3";
+  version = "4.3.4";
 
   extraMeta.branch = "4.3";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "8cad4ce7d049c2ecc041b0844bd478bf85f0d3071c93e0c885a776d57cbca3cf";
+    sha256 = "0vcsvnpxkpxiidlbw3cy1kl02hfml2jy3cbrvwj2nc4a9y5fb3hj";
   };
 
-  kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ];
-
   features.iwlwifi = true;
   features.efiBootStub = true;
   features.needsCifsUtils = true;
diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index c74c4c5a944b..7e95f1dedb1a 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -87,10 +87,10 @@ rec {
     };
 
   grsecurity_unstable = grsecPatch
-    { kversion  = "4.3.3";
-      revision  = "201601051958";
+    { kversion  = "4.3.4";
+      revision  = "201601231215";
       branch    = "test";
-      sha256    = "0hdf9fp5kyd9g8p3qp76jwqvqf561k61wynsq7q9aabvy0p1s18k";
+      sha256    = "1dacld4zlp8mk6ykc0f1v5crppvq3znbdw9rwfrf6qi90984x0mr";
     };
 
   grsec_fix_path =

From dd184470550d02ca8f89a0c11b9b20de3ecfa3d1 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 24 Jan 2016 04:06:19 +0000
Subject: [PATCH 0329/2285] grsecurity: add NixOS VM test

---
 nixos/release.nix          |  1 +
 nixos/tests/grsecurity.nix | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 nixos/tests/grsecurity.nix

diff --git a/nixos/release.nix b/nixos/release.nix
index 3c7cf84c6729..9c15b1ea0746 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -230,6 +230,7 @@ in rec {
   #tests.gitlab = callTest tests/gitlab.nix {};
   tests.gnome3 = callTest tests/gnome3.nix {};
   tests.gnome3-gdm = callTest tests/gnome3-gdm.nix {};
+  tests.grsecurity = callTest tests/grsecurity.nix {};
   tests.i3wm = callTest tests/i3wm.nix {};
   tests.installer.grub1 = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).grub1.test);
   tests.installer.lvm = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).lvm.test);
diff --git a/nixos/tests/grsecurity.nix b/nixos/tests/grsecurity.nix
new file mode 100644
index 000000000000..14f1aa9ff885
--- /dev/null
+++ b/nixos/tests/grsecurity.nix
@@ -0,0 +1,19 @@
+# Basic test to make sure grsecurity works
+
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "grsecurity";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ copumpkin ];
+  };
+
+  machine = { config, pkgs, ... }:
+    { boot.kernelPackages = pkgs.linuxPackages_grsec_testing_server; };
+
+  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");
+    '';
+})
+

From ef1f64106ff9b5ea40393b7977659e003b028b39 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sun, 24 Jan 2016 04:12:17 +0000
Subject: [PATCH 0330/2285] kernel: add back the patch I just removed by
 accident

---
 .../linux/kernel/cve-2016-0728.patch          | 78 +++++++++++++++++++
 1 file changed, 78 insertions(+)
 create mode 100644 pkgs/os-specific/linux/kernel/cve-2016-0728.patch

diff --git a/pkgs/os-specific/linux/kernel/cve-2016-0728.patch b/pkgs/os-specific/linux/kernel/cve-2016-0728.patch
new file mode 100644
index 000000000000..5eec95c62930
--- /dev/null
+++ b/pkgs/os-specific/linux/kernel/cve-2016-0728.patch
@@ -0,0 +1,78 @@
+From 05fd13592b60c3e9873f56705f80ff934e98b046 Mon Sep 17 00:00:00 2001
+From: David Howells <dhowells@redhat.com>
+Date: Mon, 18 Jan 2016 10:53:31 +0000
+Subject: [PATCH] KEYS: Fix keyring ref leak in join_session_keyring()
+
+This fixes CVE-2016-0728.
+
+If a thread is asked to join as a session keyring the keyring that's already
+set as its session, we leak a keyring reference.
+
+This can be tested with the following program:
+
+	#include <stddef.h>
+	#include <stdio.h>
+	#include <sys/types.h>
+	#include <keyutils.h>
+
+	int main(int argc, const char *argv[])
+	{
+		int i = 0;
+		key_serial_t serial;
+
+		serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING,
+				"leaked-keyring");
+		if (serial < 0) {
+			perror("keyctl");
+			return -1;
+		}
+
+		if (keyctl(KEYCTL_SETPERM, serial,
+			   KEY_POS_ALL | KEY_USR_ALL) < 0) {
+			perror("keyctl");
+			return -1;
+		}
+
+		for (i = 0; i < 100; i++) {
+			serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING,
+					"leaked-keyring");
+			if (serial < 0) {
+				perror("keyctl");
+				return -1;
+			}
+		}
+
+		return 0;
+	}
+
+If, after the program has run, there something like the following line in
+/proc/keys:
+
+3f3d898f I--Q---   100 perm 3f3f0000     0     0 keyring   leaked-keyring: empty
+
+with a usage count of 100 * the number of times the program has been run,
+then the kernel is malfunctioning.  If leaked-keyring has zero usages or
+has been garbage collected, then the problem is fixed.
+
+Reported-by: Yevgeny Pats <yevgeny@perception-point.io>
+Signed-off-by: David Howells <dhowells@redhat.com>
+RH-bugzilla: 1298036
+---
+ security/keys/process_keys.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
+index 43b4cddbf2b3..7877e5cd4e23 100644
+--- a/security/keys/process_keys.c
++++ b/security/keys/process_keys.c
+@@ -794,6 +794,7 @@ long join_session_keyring(const char *name)
+ 		ret = PTR_ERR(keyring);
+ 		goto error2;
+ 	} else if (keyring == new->session_keyring) {
++		key_put(keyring);
+ 		ret = 0;
+ 		goto error2;
+ 	}
+-- 
+2.5.0
+

From c485ba1c661dc5f6f71cefec2a489e8cbe7435c8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 23 Jan 2016 15:21:13 +0100
Subject: [PATCH 0331/2285] batman-adv: 2015.2 -> 2016.0

---
 pkgs/os-specific/linux/batman-adv/alfred.nix  | 4 ++--
 pkgs/os-specific/linux/batman-adv/batctl.nix  | 6 +++---
 pkgs/os-specific/linux/batman-adv/default.nix | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/batman-adv/alfred.nix b/pkgs/os-specific/linux/batman-adv/alfred.nix
index a42194d71932..72f14ff2d68b 100644
--- a/pkgs/os-specific/linux/batman-adv/alfred.nix
+++ b/pkgs/os-specific/linux/batman-adv/alfred.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, gpsd, libcap }:
 
 let
-  ver = "2015.2";
+  ver = "2016.0";
 in
 stdenv.mkDerivation rec {
   name = "alfred-${ver}";
 
   src = fetchurl {
     url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
-    sha256 = "0cyr3bxwypddifg18yi3i5mcdam8izlq3ayrbkjir2b4vqhixs3s";
+    sha256 = "1zlmcp9r1xwp6li56j5ip9x7h5gjdhh0gi6cb3f8x6ydszhynxbf";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/os-specific/linux/batman-adv/batctl.nix b/pkgs/os-specific/linux/batman-adv/batctl.nix
index 3ea4fc5f96ec..c17f7beb74f1 100644
--- a/pkgs/os-specific/linux/batman-adv/batctl.nix
+++ b/pkgs/os-specific/linux/batman-adv/batctl.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, pkgconfig, libnl }:
 
 let
-  ver = "2015.2";
+  ver = "2016.0";
 in
 stdenv.mkDerivation rec {
   name = "batctl-${ver}";
 
   src = fetchurl {
     url = "http://downloads.open-mesh.org/batman/releases/batman-adv-${ver}/${name}.tar.gz";
-    sha256 = "1yv9i304bicm34mgl387c21ynv711yr2m5ycx9hjbxprkyzjlkdi";
+    sha256 = "0khpw0w26j6pc1263phk086chs64p9m6a63azk62pxs1cmmbr80y";
   };
 
   nativeBuildInputs = [ pkgconfig ];
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     homepage = http://www.open-mesh.org/projects/batman-adv/wiki/Wiki;
     description = "B.A.T.M.A.N. routing protocol in a linux kernel module for layer 2, control tool";
     license = stdenv.lib.licenses.gpl2;
-    maintainers = with stdenv.lib.maintainers; [viric];
+    maintainers = with stdenv.lib.maintainers; [ viric fpletz ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }
diff --git a/pkgs/os-specific/linux/batman-adv/default.nix b/pkgs/os-specific/linux/batman-adv/default.nix
index e50d613624d0..b8bef1b5a9a4 100644
--- a/pkgs/os-specific/linux/batman-adv/default.nix
+++ b/pkgs/os-specific/linux/batman-adv/default.nix
@@ -2,14 +2,14 @@
 
 #assert stdenv.lib.versionOlder kernel.version "3.17";
 
-let base = "batman-adv-2015.2"; in
+let base = "batman-adv-2016.0"; in
 
 stdenv.mkDerivation rec {
   name = "${base}-${kernel.version}";
 
   src = fetchurl {
     url = "http://downloads.open-mesh.org/batman/releases/${base}/${base}.tar.gz";
-    sha256 = "0lj8q9fnrf9n434h9wb2385z65skmq8q64svx5hbnlcj0bjhyxw6";
+    sha256 = "0r5faf12ifpj8h1fklkzvy4ck359cadk8xh1l3n7vimh67hxbxbz";
   };
 
   preBuild = ''

From 5986aecc4c4e3d99d815da1ef7ea4ed2092f221e Mon Sep 17 00:00:00 2001
From: Anthony Cowley <acowley@gmail.com>
Date: Sun, 24 Jan 2016 00:18:32 -0500
Subject: [PATCH 0332/2285] Linux stdenv update: pass gnugrep to cc-wrapper

---
 pkgs/stdenv/linux/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 12fc3fed5a5a..4ddf62f0aef7 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -64,7 +64,7 @@ rec {
   # the bootstrap.  In all stages, we build an stdenv and the package
   # set that can be built with that stdenv.
   stageFun =
-    {gccPlain, glibc, binutils, coreutils, name, overrides ? (pkgs: {}), extraBuildInputs ? []}:
+    {gccPlain, glibc, binutils, coreutils, gnugrep, name, overrides ? (pkgs: {}), extraBuildInputs ? []}:
 
     let
 
@@ -93,7 +93,7 @@ rec {
           cc = gccPlain;
           isGNU = true;
           libc = glibc;
-          inherit binutils coreutils;
+          inherit binutils coreutils gnugrep;
           name = name;
           stdenv = stage0.stdenv;
         };
@@ -125,6 +125,7 @@ rec {
     glibc = null;
     binutils = null;
     coreutils = null;
+    gnugrep = null;
     name = null;
 
     overrides = pkgs: {
@@ -160,6 +161,7 @@ rec {
     inherit (stage0.pkgs) glibc;
     binutils = bootstrapTools;
     coreutils = bootstrapTools;
+    gnugrep = bootstrapTools;
     name = "bootstrap-gcc-wrapper";
 
     # Rebuild binutils to use from stage2 onwards.
@@ -184,6 +186,7 @@ rec {
     inherit (stage1.pkgs) glibc;
     binutils = stage1.pkgs.binutils;
     coreutils = bootstrapTools;
+    gnugrep = bootstrapTools;
     name = "bootstrap-gcc-wrapper";
 
     overrides = pkgs: {
@@ -200,6 +203,7 @@ rec {
     gccPlain = bootstrapTools;
     inherit (stage2.pkgs) glibc binutils;
     coreutils = bootstrapTools;
+    gnugrep = bootstrapTools;
     name = "bootstrap-gcc-wrapper";
 
     overrides = pkgs: rec {
@@ -227,7 +231,7 @@ rec {
   # Construct a fourth stdenv that uses the new GCC.  But coreutils is
   # still from the bootstrap tools.
   stage4 = stageFun {
-    inherit (stage3.pkgs) gccPlain glibc binutils;
+    inherit (stage3.pkgs) gccPlain glibc binutils gnugrep;
     coreutils = bootstrapTools;
     name = "";
 
@@ -244,7 +248,7 @@ rec {
         isGNU = true;
         cc = stage4.stdenv.cc.cc;
         libc = stage4.pkgs.glibc;
-        inherit (stage4.pkgs) binutils coreutils;
+        inherit (stage4.pkgs) binutils coreutils gnugrep;
         name = "";
         stdenv = stage4.stdenv;
         shell = stage4.pkgs.bash + "/bin/bash";

From b82d5ef857f581e60af7dbe9ef875aeff70ef7d1 Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Sun, 24 Jan 2016 16:29:35 +1100
Subject: [PATCH 0333/2285] gup: 0.5.1 -> 0.5.3

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

diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix
index dc6f1f8d0023..0f1ecdcaa545 100644
--- a/pkgs/development/tools/build-managers/gup/default.nix
+++ b/pkgs/development/tools/build-managers/gup/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchgit, lib, python, which }:
 let
-  version = "0.5.1";
+  version = "0.5.3";
   src = fetchgit {
     url = "https://github.com/gfxmonk/gup.git";
-    rev = "f185052e2177ed5e46720e6c6cfb529b96cd17e2";
-    sha256 = "c2e27cdba2231017ceb4868f58f5c3b224be0491b81558b4e59bb08a952ad1a5";
+    rev = "55ffd8828ddc28a2a786b75422d672d6569f961f";
+    sha256 = "7c2abbf5d3814c6b84da0de1c91f9f7d299c2362cf091da96f6a68d8fffcb5ce";
   };
 in
 import ./build.nix

From f62dbc01210286d25b7e4814d3897b4b73fcf0d5 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 24 Jan 2016 08:47:46 +0200
Subject: [PATCH 0334/2285] binutils: Add platforms

There are some variants of binutils in all-packages.nix that aren't
getting built by Hydra currently.
---
 pkgs/development/tools/misc/binutils/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 61824eb607be..4cc4cadc280f 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -69,17 +69,15 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Tools for manipulating binaries (linker, assembler, etc.)";
-
     longDescription = ''
       The GNU Binutils are a collection of binary tools.  The main
       ones are `ld' (the GNU linker) and `as' (the GNU assembler).
       They also include the BFD (Binary File Descriptor) library,
       `gprof', `nm', `strip', etc.
     '';
-
     homepage = http://www.gnu.org/software/binutils/;
-
     license = stdenv.lib.licenses.gpl3Plus;
+    platforms = stdenv.lib.platforms.linux;
 
     /* Give binutils a lower priority than gcc-wrapper to prevent a
        collision due to the ld/as wrappers/symlinks in the latter. */

From e865a647f49c5fde4a2f64734b4891cf8fba291b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:56:58 +0200
Subject: [PATCH 0335/2285] brackets: Fix udev reference in multiple-outputs
 branch

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

diff --git a/pkgs/applications/editors/brackets/default.nix b/pkgs/applications/editors/brackets/default.nix
index 131675486bad..127ed981a6c8 100644
--- a/pkgs/applications/editors/brackets/default.nix
+++ b/pkgs/applications/editors/brackets/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, buildEnv, gtk, glib, gdk_pixbuf, alsaLib, nss, nspr, gconf
-, cups, libgcrypt_1_5, makeWrapper, dbus, udev }:
+, cups, libgcrypt_1_5, libudev, makeWrapper, dbus }:
 let
   bracketsEnv = buildEnv {
     name = "env-brackets";
     paths = [
       gtk glib gdk_pixbuf stdenv.cc.cc alsaLib nss nspr gconf cups libgcrypt_1_5
-      dbus udev
+      dbus libudev.out
     ];
   };
 in
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     rmdir $out/usr
     ln -sf $out/opt/brackets/brackets $out/bin/brackets
 
-    ln -s ${udev}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0
+    ln -s ${libudev.out}/lib/libudev.so.1 $out/opt/brackets/lib/libudev.so.0
 
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       --set-rpath "${bracketsEnv}/lib:${bracketsEnv}/lib64" \

From f412f5f3ee1ccfe909cb925fba92a4567f686869 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:28:56 +0200
Subject: [PATCH 0336/2285] treewide: Mass replace 'attr}/lib' to refer the
 'out' output

---
 nixos/modules/security/apparmor-suid.nix    | 2 +-
 pkgs/tools/filesystems/xtreemfs/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix
index 3da6a81158d0..c2dc84e6a75c 100644
--- a/nixos/modules/security/apparmor-suid.nix
+++ b/nixos/modules/security/apparmor-suid.nix
@@ -30,7 +30,7 @@ with lib;
 
         ${pkgs.glibc.out}/lib/*.so mr,
         ${pkgs.libcap}/lib/libcap.so* mr,
-        ${pkgs.attr}/lib/libattr.so* mr,
+        ${pkgs.attr.out}/lib/libattr.so* mr,
 
         ${pkgs.iputils}/bin/ping mixr,
         /var/setuid-wrappers/ping.real r,
diff --git a/pkgs/tools/filesystems/xtreemfs/default.nix b/pkgs/tools/filesystems/xtreemfs/default.nix
index 8f090c297813..556cb674212d 100644
--- a/pkgs/tools/filesystems/xtreemfs/default.nix
+++ b/pkgs/tools/filesystems/xtreemfs/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
       --replace "/usr/local" "${valgrind}"
 
     substituteInPlace cpp/CMakeLists.txt \
-      --replace '"/lib64" "/usr/lib64"' '"${attr}/lib" "${fuse}/lib"'
+      --replace '"/lib64" "/usr/lib64"' '"${attr.out}/lib" "${fuse}/lib"'
 
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${fuse}/include"
     export NIX_CFLAGS_LINK="$NIX_CFLAGS_LINK -L${fuse}/lib"

From c2ceed1ad143bf231402a8e010bcc5270a1930aa Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:28:57 +0200
Subject: [PATCH 0337/2285] treewide: Mass replace 'binutils}/lib' to refer the
 'out' output

---
 pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 2 +-
 pkgs/stdenv/linux/make-bootstrap-tools.nix       | 2 +-
 pkgs/top-level/python-packages.nix               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index ed2154d00d2e..a56d744ab8d4 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -213,7 +213,7 @@ rec {
         for i in as ld ar ranlib nm strip readelf objdump; do
           cp ${binutils}/bin/$i $out/bin
         done
-        cp -d ${binutils}/lib/lib*.so* $out/lib
+        cp -d ${binutils.out}/lib/lib*.so* $out/lib
 
         chmod -R u+w $out
         
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index b1a824983a3e..117346eb4edc 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -121,7 +121,7 @@ rec {
         for i in as ld ar ranlib nm strip readelf objdump; do
           cp ${binutils}/bin/$i $out/bin
         done
-        cp -d ${binutils}/lib/lib*.so* $out/lib
+        cp -d ${binutils.out}/lib/lib*.so* $out/lib
 
         chmod -R u+w $out
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a5fa5974cbf3..48db91f15575 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15067,7 +15067,7 @@ in modules // {
     preConfigure = ''
       substituteInPlace setup.py \
         --replace '"/usr/include"' '"${pkgs.gdb}/include"' \
-        --replace '"/usr/lib"' '"${pkgs.binutils}/lib"'
+        --replace '"/usr/lib"' '"${pkgs.binutils.out}/lib"'
     '';
 
     meta = {

From 79738a639a5d93fc85ec73e382183af98499830a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:28:58 +0200
Subject: [PATCH 0338/2285] treewide: Mass replace 'binutils-raw}/lib' to refer
 the 'out' output

---
 pkgs/os-specific/darwin/binutils/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/darwin/binutils/default.nix b/pkgs/os-specific/darwin/binutils/default.nix
index abe4aa67b143..d671c7c72303 100644
--- a/pkgs/os-specific/darwin/binutils/default.nix
+++ b/pkgs/os-specific/darwin/binutils/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation {
 
     # FIXME: this will give us incorrect man pages for bits of cctools
     ln -s ${binutils-raw}/share $out/share
-    ln -s ${binutils-raw}/lib $out/lib
+    ln -s ${binutils-raw.out}/lib $out/lib
 
     ln -s ${cctools}/libexec $out/libexec
   '';

From d0058081272f58025693581e751facc388b46c86 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:00 +0200
Subject: [PATCH 0339/2285] treewide: Mass replace 'boehmgc}/lib' to refer the
 'out' output

---
 pkgs/development/compilers/gcc/4.3/default.nix | 2 +-
 pkgs/development/compilers/opendylan/bin.nix   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/gcc/4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix
index 3db8ee5f3ea7..e97ae93cd531 100644
--- a/pkgs/development/compilers/gcc/4.3/default.nix
+++ b/pkgs/development/compilers/gcc/4.3/default.nix
@@ -143,7 +143,7 @@ stdenv.mkDerivation ({
   postConfigure = ''
     make configure-gcc
     sed -i gcc/Makefile -e 's@^CFLAGS = .*@& -I${zlib}/include@ ; s@^LDFLAGS = .*@& -L${zlib}/lib@'
-    sed -i gcc/Makefile -e 's@^CFLAGS = .*@& -I${boehmgc}/include@ ; s@^LDFLAGS = .*@& -L${boehmgc}/lib -lgc@'
+    sed -i gcc/Makefile -e 's@^CFLAGS = .*@& -I${boehmgc}/include@ ; s@^LDFLAGS = .*@& -L${boehmgc.out}/lib -lgc@'
   '';
 } else {})
 // (if langVhdl then rec {
diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix
index 4d18b8d328d6..492b1c4b3338 100644
--- a/pkgs/development/compilers/opendylan/bin.nix
+++ b/pkgs/development/compilers/opendylan/bin.nix
@@ -24,10 +24,10 @@ stdenv.mkDerivation {
     interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)"
     for a in "$out"/bin/*; do 
       patchelf --set-interpreter "$interpreter" "$a"
-      patchelf --set-rpath "$out/lib:${boehmgc}/lib" "$a"
+      patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a"
     done
     for a in "$out"/lib/*.so; do 
-      patchelf --set-rpath "$out/lib:${boehmgc}/lib" "$a"
+      patchelf --set-rpath "$out/lib:${boehmgc.out}/lib" "$a"
     done
     sed -i -e "s|\-lgc|\-L${boehmgc}\/lib -lgc|" $out/lib/config.jam
     wrapProgram $out/bin/dylan-compiler --suffix PATH : ${gcc}/bin

From 51bf60b33e0c85e1d3beb5d7a12efe702efae864 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:00 +0200
Subject: [PATCH 0340/2285] treewide: Mass replace 'bzip2}/lib' to refer the
 'out' output

---
 pkgs/applications/editors/sublime3/default.nix       | 2 +-
 pkgs/development/libraries/tokyo-cabinet/default.nix | 2 +-
 pkgs/top-level/perl-packages.nix                     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix
index 49c30a1f6d60..c6cc813d6b11 100644
--- a/pkgs/applications/editors/sublime3/default.nix
+++ b/pkgs/applications/editors/sublime3/default.nix
@@ -57,7 +57,7 @@ in let
         --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects}
 
       # Without this, plugin_host crashes, even though it has the rpath
-      wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2}/lib/libbz2.so
+      wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2.out}/lib/libbz2.so
     '';
   };
 in stdenv.mkDerivation {
diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/development/libraries/tokyo-cabinet/default.nix
index 0b210a589d41..7512e085449c 100644
--- a/pkgs/development/libraries/tokyo-cabinet/default.nix
+++ b/pkgs/development/libraries/tokyo-cabinet/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   postInstall =
     '' sed -i "$out/lib/pkgconfig/tokyocabinet.pc" \
            -e 's|-lz|-L${zlib}/lib -lz|g;
-               s|-lbz2|-L${bzip2}/lib -lbz2|g'
+               s|-lbz2|-L${bzip2.out}/lib -lbz2|g'
     '';
 
   meta = {
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index de1fcc4e27ec..516b42a0274f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1940,7 +1940,7 @@ let self = _self // overrides; _self = with self; {
 
     # Don't build a private copy of bzip2.
     BUILD_BZIP2 = false;
-    BZIP2_LIB = "${pkgs.bzip2}/lib";
+    BZIP2_LIB = "${pkgs.bzip2.out}/lib";
     BZIP2_INCLUDE = "${pkgs.bzip2}/include";
 
     meta = {

From 96372f2edb4b00a71a0aa9a97679853ffb95e3c6 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:01 +0200
Subject: [PATCH 0341/2285] treewide: Mass replace 'cairo}/lib' to refer the
 'out' output

---
 nixos/modules/services/monitoring/graphite.nix | 2 +-
 pkgs/top-level/python-packages.nix             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix
index 976fd253a7cd..e59be1ea6c31 100644
--- a/nixos/modules/services/monitoring/graphite.nix
+++ b/nixos/modules/services/monitoring/graphite.nix
@@ -490,7 +490,7 @@ in {
             "${cfg.api.package}/lib/python2.7/site-packages:" +
             concatMapStringsSep ":" (f: f + "/lib/python2.7/site-packages") cfg.api.finders;
           GRAPHITE_API_CONFIG = graphiteApiConfig;
-          LD_LIBRARY_PATH = "${pkgs.cairo}/lib";
+          LD_LIBRARY_PATH = "${pkgs.cairo.out}/lib";
         };
         serviceConfig = {
           ExecStart = ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 48db91f15575..e0b4223f6f43 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2565,7 +2565,7 @@ in modules // {
 
     patchPhase = ''
       # Hardcode cairo library path
-      sed -e 's,ffi\.dlopen(,&"${pkgs.cairo}/lib/" + ,' -i cairocffi/__init__.py
+      sed -e 's,ffi\.dlopen(,&"${pkgs.cairo.out}/lib/" + ,' -i cairocffi/__init__.py
     '';
 
     meta = {

From dc8e939dbc9816a7b2c85bfd05a2f690f71fe2c8 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:02 +0200
Subject: [PATCH 0342/2285] treewide: Mass replace 'cups}/lib' to refer the
 'out' output

---
 nixos/modules/services/printing/cupsd.nix               | 8 ++++----
 pkgs/applications/networking/browsers/opera/default.nix | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 0fe25b66da08..ba288a5d0611 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -11,21 +11,21 @@ let
   additionalBackends = pkgs.runCommand "additional-cups-backends" { }
     ''
       mkdir -p $out
-      if [ ! -e ${cups}/lib/cups/backend/smb ]; then
+      if [ ! -e ${cups.out}/lib/cups/backend/smb ]; then
         mkdir -p $out/lib/cups/backend
         ln -sv ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb
       fi
 
       # Provide support for printing via HTTPS.
-      if [ ! -e ${cups}/lib/cups/backend/https ]; then
+      if [ ! -e ${cups.out}/lib/cups/backend/https ]; then
         mkdir -p $out/lib/cups/backend
-        ln -sv ${cups}/lib/cups/backend/ipp $out/lib/cups/backend/https
+        ln -sv ${cups.out}/lib/cups/backend/ipp $out/lib/cups/backend/https
       fi
     '';
 
   # Here we can enable additional backends, filters, etc. that are not
   # part of CUPS itself, e.g. the SMB backend is part of Samba.  Since
-  # we can't update ${cups}/lib/cups itself, we create a symlink tree
+  # we can't update ${cups.out}/lib/cups itself, we create a symlink tree
   # here and add the additional programs.  The ServerBin directive in
   # cupsd.conf tells cupsd to use this tree.
   bindir = pkgs.buildEnv {
diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix
index ab199ff97cdf..de7240d3a83b 100644
--- a/pkgs/applications/networking/browsers/opera/default.nix
+++ b/pkgs/applications/networking/browsers/opera/default.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     oldRPATH=`patchelf --print-rpath $out/lib/opera/opera`
-    patchelf --set-rpath $oldRPATH:${cups}/lib $out/lib/opera/opera
+    patchelf --set-rpath $oldRPATH:${cups.out}/lib $out/lib/opera/opera
 
     # This file should normally require a gtk-update-icon-cache -q /usr/share/icons/hicolor command
     # It have no reasons to exist in a redistribuable package

From f12f6c86076618354f020f3b6634e46115794b40 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:06 +0200
Subject: [PATCH 0343/2285] treewide: Mass replace 'dbus_daemon}/lib' to refer
 the 'lib' output

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

diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index 77427ce9606e..2e29ef6a8f53 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -121,7 +121,7 @@ in
 
     security.setuidOwners = singleton
       { program = "dbus-daemon-launch-helper";
-        source = "${pkgs.dbus_daemon}/libexec/dbus-daemon-launch-helper";
+        source = "${pkgs.dbus_daemon.lib}/libexec/dbus-daemon-launch-helper";
         owner = "root";
         group = "messagebus";
         setuid = true;

From f9bf203837469eb7184c24ce9934d6f3b997c785 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:09 +0200
Subject: [PATCH 0344/2285] treewide: Mass replace 'expat}/lib' to refer the
 'out' output

---
 pkgs/tools/graphics/graphviz/2.0.nix  | 2 +-
 pkgs/tools/graphics/graphviz/2.32.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix
index 04fff8053819..263a3d965f84 100644
--- a/pkgs/tools/graphics/graphviz/2.0.nix
+++ b/pkgs/tools/graphics/graphviz/2.0.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
       "--with-jpegincludedir=${libjpeg}/include"
       "--with-jpeglibdir=${libjpeg}/lib"
       "--with-expatincludedir=${expat}/include"
-      "--with-expatlibdir=${expat}/lib"
+      "--with-expatlibdir=${expat.out}/lib"
     ]
     ++ stdenv.lib.optional (xlibsWrapper == null) "--without-x";
 
diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix
index 6eb8b5bceb2e..c8da74d02226 100644
--- a/pkgs/tools/graphics/graphviz/2.32.nix
+++ b/pkgs/tools/graphics/graphviz/2.32.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
       "--with-jpegincludedir=${libjpeg}/include"
       "--with-jpeglibdir=${libjpeg}/lib"
       "--with-expatincludedir=${expat}/include"
-      "--with-expatlibdir=${expat}/lib"
+      "--with-expatlibdir=${expat.out}/lib"
       "--with-cgraph=no"
       "--with-sparse=no"
     ]

From bb5660e873b8c888558abe37157ce9860c13a174 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:10 +0200
Subject: [PATCH 0345/2285] treewide: Mass replace 'fftw}/lib' to refer the
 'out' output

---
 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 e0b4223f6f43..0ec3fd533604 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15427,11 +15427,11 @@ in modules // {
     doCheck = false;
 
     preConfigure = ''
-      export LDFLAGS="-L${pkgs.fftw}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble}/lib"
+      export LDFLAGS="-L${pkgs.fftw.out}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble}/lib"
       export CFLAGS="-I${pkgs.fftw}/include -I${pkgs.fftwFloat}/include -I${pkgs.fftwLongDouble}/include"
     '';
     #+ optionalString isDarwin ''
-    #  export DYLD_LIBRARY_PATH="${pkgs.fftw}/lib"
+    #  export DYLD_LIBRARY_PATH="${pkgs.fftw.out}/lib"
     #'';
 
     meta = {

From fc6acf7a8791f88e11f3be37313828391dcd4a39 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:11 +0200
Subject: [PATCH 0346/2285] treewide: Mass replace 'fftwLongDouble}/lib' to
 refer the 'out' output

---
 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 0ec3fd533604..2834ef96b781 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15427,7 +15427,7 @@ in modules // {
     doCheck = false;
 
     preConfigure = ''
-      export LDFLAGS="-L${pkgs.fftw.out}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble}/lib"
+      export LDFLAGS="-L${pkgs.fftw.out}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble.out}/lib"
       export CFLAGS="-I${pkgs.fftw}/include -I${pkgs.fftwFloat}/include -I${pkgs.fftwLongDouble}/include"
     '';
     #+ optionalString isDarwin ''

From 7a7cc31076be891e800dbf5fe2bc30118c810d92 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:12 +0200
Subject: [PATCH 0347/2285] treewide: Mass replace 'fftwFloat}/lib' to refer
 the 'out' output

---
 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 2834ef96b781..12af1e32832e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15427,7 +15427,7 @@ in modules // {
     doCheck = false;
 
     preConfigure = ''
-      export LDFLAGS="-L${pkgs.fftw.out}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble.out}/lib"
+      export LDFLAGS="-L${pkgs.fftw.out}/lib -L${pkgs.fftwFloat.out}/lib -L${pkgs.fftwLongDouble.out}/lib"
       export CFLAGS="-I${pkgs.fftw}/include -I${pkgs.fftwFloat}/include -I${pkgs.fftwLongDouble}/include"
     '';
     #+ optionalString isDarwin ''

From b56b24f72909aaf156aae78390d8b4e5d21014ca Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:13 +0200
Subject: [PATCH 0348/2285] treewide: Mass replace 'freetype}/lib' to refer the
 'out' output

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

diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix
index b525e3cb0f89..9f2dfbab2ecd 100644
--- a/pkgs/games/warsow/default.nix
+++ b/pkgs/games/warsow/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     cp -rv basewsw libs $dest
     # Since 1.03 some modules are _always_ downloaded from server, thus
     makeWrapper $dest/warsow $out/bin/warsow \
-      --suffix-each LD_LIBRARY_PATH ':' "${freetype}/lib"
+      --suffix-each LD_LIBRARY_PATH ':' "${freetype.out}/lib"
     makeWrapper $dest/wsw_server $out/bin/wsw_server
     makeWrapper $dest/wswtv_server $out/bin/wswtv_server
   '';

From a1909d73800a520b34640693343da7b68d5b7294 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:16 +0200
Subject: [PATCH 0349/2285] treewide: Mass replace 'glibc}/lib' to refer the
 'out' output

---
 nixos/modules/system/boot/initrd-network.nix | 2 +-
 pkgs/applications/audio/baudline/default.nix | 2 +-
 pkgs/applications/editors/idea/common.nix    | 2 +-
 pkgs/applications/misc/kiwix/default.nix     | 2 +-
 pkgs/development/compilers/ponyc/default.nix | 2 +-
 pkgs/games/dwarf-fortress/default.nix        | 2 +-
 pkgs/misc/cups/drivers/mfcj470dw/default.nix | 4 ++--
 pkgs/os-specific/linux/fusionio/util.nix     | 2 +-
 pkgs/servers/plex/default.nix                | 4 ++--
 pkgs/top-level/python-packages.nix           | 2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix
index 6c6e2fafad43..d01222243f5d 100644
--- a/nixos/modules/system/boot/initrd-network.nix
+++ b/nixos/modules/system/boot/initrd-network.nix
@@ -102,7 +102,7 @@ in
     '' + optionalString cfg.ssh.enable ''
       copy_bin_and_libs ${pkgs.dropbear}/bin/dropbear
 
-      cp -pv ${pkgs.glibc}/lib/libnss_files.so.* $out/lib
+      cp -pv ${pkgs.glibc.out}/lib/libnss_files.so.* $out/lib
     '';
 
     boot.initrd.extraUtilsCommandsTest = optionalString cfg.ssh.enable ''
diff --git a/pkgs/applications/audio/baudline/default.nix b/pkgs/applications/audio/baudline/default.nix
index 543329ef679b..2d6b0434d6a1 100644
--- a/pkgs/applications/audio/baudline/default.nix
+++ b/pkgs/applications/audio/baudline/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
 
     cp -r . "$out/libexec/baudline/"
 
-    interpreter="$(echo ${stdenv.glibc}/lib/ld-linux*)"
+    interpreter="$(echo ${stdenv.glibc.out}/lib/ld-linux*)"
     for prog in "$out"/libexec/baudline/baudline*; do
         patchelf --interpreter "$interpreter" "$prog"
         ln -sr "$prog" "$out/bin/"
diff --git a/pkgs/applications/editors/idea/common.nix b/pkgs/applications/editors/idea/common.nix
index 96689fa75ad6..979a374701f8 100644
--- a/pkgs/applications/editors/idea/common.nix
+++ b/pkgs/applications/editors/idea/common.nix
@@ -37,7 +37,7 @@ with stdenv; lib.makeOverridable mkDerivation rec {
         truncate --size=$size $fname
       }
 
-      interpreter=$(echo ${stdenv.glibc}/lib/ld-linux*.so.2)
+      interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2)
       if [ "${stdenv.system}" == "x86_64-linux" ]; then
         target_size=$(get_file_size bin/fsnotifier64)
         patchelf --set-interpreter "$interpreter" bin/fsnotifier64
diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index 30db6a45ea1b..d29e4fca3b29 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -93,7 +93,7 @@ stdenv.mkDerivation rec {
     make install
     cp -r src/dependencies/xulrunner $out/lib/kiwix
 
-    patchelf --set-interpreter ${glibc}/lib/ld-linux${optionalString (stdenv.system == "x86_64-linux") "-x86-64"}.so.2 $out/lib/kiwix/xulrunner/xulrunner
+    patchelf --set-interpreter ${glibc.out}/lib/ld-linux${optionalString (stdenv.system == "x86_64-linux") "-x86-64"}.so.2 $out/lib/kiwix/xulrunner/xulrunner
 
     rm $out/bin/kiwix
     makeWrapper $out/lib/kiwix/kiwix-launcher $out/bin/kiwix \
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index c94ba203c0ff..f05555003f98 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
   checkTarget = "test";
 
   patchPhase = ''
-    sed 's|/usr/lib/x86_64-linux-gnu/|${glibc}/lib/|g' -i src/libponyc/codegen/genexe.c
+    sed 's|/usr/lib/x86_64-linux-gnu/|${glibc.out}/lib/|g' -i src/libponyc/codegen/genexe.c
     sed 's|/lib/x86_64-linux-gnu/|${stdenv.cc.cc}/lib/|g' -i src/libponyc/codegen/genexe.c
   '';
 
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index 317981cd8877..97c793b8a39f 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -194,7 +194,7 @@ stdenv.mkDerivation rec {
     # Fix rpath
     patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc ]}:$out/share/df_linux/libs" $out/share/df_linux/libs/Dwarf_Fortress
 
-    patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 $out/share/df_linux/libs/Dwarf_Fortress
+    patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 $out/share/df_linux/libs/Dwarf_Fortress
 
     # Store new hash
     patched_hash=$(md5sum $out/share/df_linux/libs/Dwarf_Fortress | awk '{ print $1 }')
diff --git a/pkgs/misc/cups/drivers/mfcj470dw/default.nix b/pkgs/misc/cups/drivers/mfcj470dw/default.nix
index d1a1b239371a..b61344d1280e 100644
--- a/pkgs/misc/cups/drivers/mfcj470dw/default.nix
+++ b/pkgs/misc/cups/drivers/mfcj470dw/default.nix
@@ -33,8 +33,8 @@ stdenv.mkDerivation rec {
 
     sed -i '/GHOST_SCRIPT=/c\GHOST_SCRIPT=gs' $out/opt/brother/Printers/mfcj470dw/lpd/psconvertij2
 
-    patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/lpd/brmfcj470dwfilter
-    patchelf --set-interpreter ${stdenv.glibc}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/cupswrapper/brcupsconfpt1
+    patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/lpd/brmfcj470dwfilter
+    patchelf --set-interpreter ${stdenv.glibc.out}/lib/ld-linux.so.2 $out/opt/brother/Printers/mfcj470dw/cupswrapper/brcupsconfpt1
 
     mkdir -p $out/lib/cups/filter/
     ln -s $out/opt/brother/Printers/mfcj470dw/lpd/filtermfcj470dw $out/lib/cups/filter/brother_lpdwrapper_mfcj470dw
diff --git a/pkgs/os-specific/linux/fusionio/util.nix b/pkgs/os-specific/linux/fusionio/util.nix
index e2f8d423a61d..e77d596dc6f8 100644
--- a/pkgs/os-specific/linux/fusionio/util.nix
+++ b/pkgs/os-specific/linux/fusionio/util.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     cp -r $TMPDIR/{etc,usr/{bin,lib,share}} $out
     for BIN in $(find $out/bin -type f); do
       echo Patching $BIN
-      patchelf --set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" --set-rpath "${glibc}/lib:${gcc.cc}/lib:${libuuid}/lib:$out/lib" $BIN
+      patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" --set-rpath "${glibc.out}/lib:${gcc.cc}/lib:${libuuid}/lib:$out/lib" $BIN
 
       # Test our binary to see if it was correctly patched
       set +e
diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 2aeb9379e10f..d88f7a89493d 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -27,12 +27,12 @@ stdenv.mkDerivation rec {
     # Now we need to patch up the executables and libraries to work on Nix.
     # Side note: PLEASE don't put spaces in your binary names. This is stupid.
     for bin in "Plex Media Server" "Plex DLNA Server" "Plex Media Scanner"; do
-      patchelf --set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" "$out/usr/lib/plexmediaserver/$bin"
+      patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" "$out/usr/lib/plexmediaserver/$bin"
       patchelf --set-rpath "$out/usr/lib/plexmediaserver" "$out/usr/lib/plexmediaserver/$bin"
     done
 
     find $out/usr/lib/plexmediaserver/Resources -type f -a -perm -0100 \
-        -print -exec patchelf --set-interpreter "${glibc}/lib/ld-linux-x86-64.so.2" '{}' \;
+        -print -exec patchelf --set-interpreter "${glibc.out}/lib/ld-linux-x86-64.so.2" '{}' \;
 
     # executables need libstdc++.so.6
     ln -s "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc ]}/libstdc++.so.6" "$out/usr/lib/plexmediaserver/libstdc++.so.6"
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 12af1e32832e..64afc8d0b945 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11339,7 +11339,7 @@ in modules // {
 
     patchPhase = optionalString stdenv.isLinux ''
       substituteInPlace monotonic.py --replace \
-        "ctypes.util.find_library('c')" "'${stdenv.glibc}/lib/libc.so.6'"
+        "ctypes.util.find_library('c')" "'${stdenv.glibc.out}/lib/libc.so.6'"
     '';
   };
 

From df8495fb18305bfd926a4e7b4dbf5c27edb70400 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:17 +0200
Subject: [PATCH 0350/2285] treewide: Mass replace 'gmp}/lib' to refer the
 'out' output

---
 pkgs/development/compilers/ghc/7.4.2-binary.nix | 6 +++---
 pkgs/development/compilers/ghc/8.0.1.nix        | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix
index a57aff4d864f..70cd7d21c477 100644
--- a/pkgs/development/compilers/ghc/7.4.2-binary.nix
+++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     # We have to patch the GMP paths for the integer-gmp package.
      ''
       find . -name integer-gmp.buildinfo \
-          -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp}/lib@" {} \;
+          -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${gmp.out}/lib@" {} \;
      '' + stdenv.lib.optionalString stdenv.isDarwin ''
       find . -name base.buildinfo \
           -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \;
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
       ln -sv "${ncurses.lib}/lib/libncurses.so" "$out/lib/libncurses${stdenv.lib.optionalString stdenv.is64bit "w"}.so.5"
       find . -type f -perm -0100 \
           -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-          --set-rpath "$out/lib:${gmp}/lib" {} \;
+          --set-rpath "$out/lib:${gmp.out}/lib" {} \;
       sed -i "s|/usr/bin/perl|perl\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
       sed -i "s|/usr/bin/gcc|gcc\x00        |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2
       for prog in ld ar gcc strip ranlib; do
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
 
   configurePhase = ''
     ./configure --prefix=$out \
-      --with-gmp-libraries=${gmp}/lib --with-gmp-includes=${gmp}/include \
+      --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp}/include \
       ${stdenv.lib.optionalString stdenv.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}"}
   '';
 
diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix
index 7f337c019531..b262a448d4da 100644
--- a/pkgs/development/compilers/ghc/8.0.1.nix
+++ b/pkgs/development/compilers/ghc/8.0.1.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-gcc=${stdenv.cc}/bin/cc"
-    "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib"
+    "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp.out}/lib"
     "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses}/lib"
   ] ++ stdenv.lib.optional stdenv.isDarwin [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"

From 8707bf4a3ca5459cc4d3cec5880df6f55fe73067 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:25 +0200
Subject: [PATCH 0351/2285] treewide: Mass replace 'libcap}/lib' to refer the
 'out' output

---
 nixos/modules/security/apparmor-suid.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/apparmor-suid.nix b/nixos/modules/security/apparmor-suid.nix
index c2dc84e6a75c..d766f6badfc7 100644
--- a/nixos/modules/security/apparmor-suid.nix
+++ b/nixos/modules/security/apparmor-suid.nix
@@ -29,7 +29,7 @@ with lib;
         network inet raw,
 
         ${pkgs.glibc.out}/lib/*.so mr,
-        ${pkgs.libcap}/lib/libcap.so* mr,
+        ${pkgs.libcap.out}/lib/libcap.so* mr,
         ${pkgs.attr.out}/lib/libattr.so* mr,
 
         ${pkgs.iputils}/bin/ping mixr,

From 493349f82aac9aecebb9264ef2748fc32d8aa266 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:29 +0200
Subject: [PATCH 0352/2285] treewide: Mass replace 'libjpeg}/lib' to refer the
 'out' output

---
 pkgs/applications/video/avxsynth/default.nix | 2 +-
 pkgs/tools/graphics/graphviz/2.0.nix         | 2 +-
 pkgs/tools/graphics/graphviz/2.32.nix        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/avxsynth/default.nix b/pkgs/applications/video/avxsynth/default.nix
index d8ec715a38cb..06dcaf31b443 100644
--- a/pkgs/applications/video/avxsynth/default.nix
+++ b/pkgs/applications/video/avxsynth/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     "--enable-subtitle"
     "--enable-ffms2"
     (enableFeature avxeditSupport "avxedit")
-    "--with-jpeg=${libjpeg}/lib"
+    "--with-jpeg=${libjpeg.out}/lib"
   ];
 
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix
index 263a3d965f84..0e261837c8da 100644
--- a/pkgs/tools/graphics/graphviz/2.0.nix
+++ b/pkgs/tools/graphics/graphviz/2.0.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     [ "--with-pngincludedir=${libpng}/include"
       "--with-pnglibdir=${libpng}/lib"
       "--with-jpegincludedir=${libjpeg}/include"
-      "--with-jpeglibdir=${libjpeg}/lib"
+      "--with-jpeglibdir=${libjpeg.out}/lib"
       "--with-expatincludedir=${expat}/include"
       "--with-expatlibdir=${expat.out}/lib"
     ]
diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix
index c8da74d02226..3642f83b7fb9 100644
--- a/pkgs/tools/graphics/graphviz/2.32.nix
+++ b/pkgs/tools/graphics/graphviz/2.32.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     [ "--with-pngincludedir=${libpng}/include"
       "--with-pnglibdir=${libpng}/lib"
       "--with-jpegincludedir=${libjpeg}/include"
-      "--with-jpeglibdir=${libjpeg}/lib"
+      "--with-jpeglibdir=${libjpeg.out}/lib"
       "--with-expatincludedir=${expat}/include"
       "--with-expatlibdir=${expat.out}/lib"
       "--with-cgraph=no"

From 377e942f71753ba040f137c354a2bfd8c2a20a9f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:34 +0200
Subject: [PATCH 0353/2285] treewide: Mass replace 'libpng}/lib' to refer the
 'out' output

---
 pkgs/tools/graphics/graphviz/2.0.nix  | 2 +-
 pkgs/tools/graphics/graphviz/2.32.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix
index 0e261837c8da..02b700111de3 100644
--- a/pkgs/tools/graphics/graphviz/2.0.nix
+++ b/pkgs/tools/graphics/graphviz/2.0.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   
   configureFlags =
     [ "--with-pngincludedir=${libpng}/include"
-      "--with-pnglibdir=${libpng}/lib"
+      "--with-pnglibdir=${libpng.out}/lib"
       "--with-jpegincludedir=${libjpeg}/include"
       "--with-jpeglibdir=${libjpeg.out}/lib"
       "--with-expatincludedir=${expat}/include"
diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix
index 3642f83b7fb9..8da3ea0a1749 100644
--- a/pkgs/tools/graphics/graphviz/2.32.nix
+++ b/pkgs/tools/graphics/graphviz/2.32.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
 
   configureFlags =
     [ "--with-pngincludedir=${libpng}/include"
-      "--with-pnglibdir=${libpng}/lib"
+      "--with-pnglibdir=${libpng.out}/lib"
       "--with-jpegincludedir=${libjpeg}/include"
       "--with-jpeglibdir=${libjpeg.out}/lib"
       "--with-expatincludedir=${expat}/include"

From 035fdf61c6e15d1df42fce4835b83e6828ad3821 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:36 +0200
Subject: [PATCH 0354/2285] treewide: Mass replace 'libpulseaudio}/lib' to
 refer the 'out' output

---
 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 64afc8d0b945..cc7232f235d0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5576,7 +5576,7 @@ in modules // {
 
     propagatedBuildInputs = with self; [ keyring colour netifaces praw psutil
       basiciw pkgs.libpulseaudio ];
-    ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${pkgs.libpulseaudio}/lib\"";
+    ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${pkgs.libpulseaudio.out}/lib\"";
     makeWrapperArgs = [ ldWrapperSuffix ]; # libpulseaudio.so is loaded manually
 
     postInstall = ''

From 3e87411733cd311d0d30cc428a4a74fa111b6602 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:37 +0200
Subject: [PATCH 0355/2285] treewide: Mass replace 'libsamplerate}/lib' to
 refer the 'out' output

---
 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 cc7232f235d0..7132e8076aec 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6742,7 +6742,7 @@ in modules // {
     preConfigure = ''
        cat > site.cfg << END
        [samplerate]
-       library_dirs=${pkgs.libsamplerate}/lib
+       library_dirs=${pkgs.libsamplerate.out}/lib
        include_dirs=${pkgs.libsamplerate}/include
        END
     '';

From 052ce8112445710515f756e58b60ca3c1f0e0934 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:38 +0200
Subject: [PATCH 0356/2285] treewide: Mass replace 'libsndfile}/lib' to refer
 the 'out' output

---
 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 7132e8076aec..171a5f8b8ad8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14360,7 +14360,7 @@ in modules // {
     };
 
     prePatch = ''
-      substituteInPlace soundfile.py --replace "'sndfile'" "'${pkgs.libsndfile}/lib/libsndfile.so'"
+      substituteInPlace soundfile.py --replace "'sndfile'" "'${pkgs.libsndfile.out}/lib/libsndfile.so'"
     '';
 
     # https://github.com/bastibe/PySoundFile/issues/157

From 3916cf476b363e072b27b25b86f5c8f706222e86 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:42 +0200
Subject: [PATCH 0357/2285] treewide: Mass replace 'libtiff}/lib' to refer the
 'out' output

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

diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix
index e69a73ff321e..b39ae1dfd08f 100644
--- a/pkgs/tools/graphics/netpbm/default.nix
+++ b/pkgs/tools/graphics/netpbm/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     cp config.mk.in config.mk
     echo "STATICLIB_TOO = n" >> config.mk
     substituteInPlace "config.mk" \
-        --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff}/lib/libtiff.so" \
+        --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff.out}/lib/libtiff.so" \
         --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff}/include"
   '';
 

From 69498299dd681fe773b474c3dec2d9b5bec468f0 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:44 +0200
Subject: [PATCH 0358/2285] treewide: Mass replace 'libusb1}/lib' to refer the
 'out' output

---
 pkgs/applications/graphics/digikam/default.nix | 2 +-
 pkgs/development/mobile/flashtool/default.nix  | 2 +-
 pkgs/top-level/python-packages.nix             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix
index bdf8077624db..bc3678811a5b 100644
--- a/pkgs/applications/graphics/digikam/default.nix
+++ b/pkgs/applications/graphics/digikam/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   # Help digiKam find libusb, otherwise gphoto2 support is disabled
   cmakeFlags = [
-    "-DLIBUSB_LIBRARIES=${libusb1}/lib"
+    "-DLIBUSB_LIBRARIES=${libusb1.out}/lib"
     "-DLIBUSB_INCLUDE_DIR=${libusb1}/include/libusb-1.0"
     "-DDIGIKAMSC_COMPILE_LIBKFACE=ON"
   ];
diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix
index d22eeb6c2138..b33fc13224a3 100644
--- a/pkgs/development/mobile/flashtool/default.nix
+++ b/pkgs/development/mobile/flashtool/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     ln -s ${platformTools}/platform-tools/adb x10flasher_lib/adb.linux
     ln -s ${platformTools}/platform-tools/fastboot x10flasher_lib/fastboot.linux
-    ln -s ${libusb1}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so
+    ln -s ${libusb1.out}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so
 
     chmod +x x10flasher_lib/unyaffs.linux.x86 x10flasher_lib/bin2elf x10flasher_lib/bin2sin
     patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" x10flasher_lib/unyaffs.linux.x86
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 171a5f8b8ad8..289fec567f57 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22018,7 +22018,7 @@ in modules // {
 
     # Fix the USB backend library lookup
     postPatch = ''
-      libusb=${pkgs.libusb1}/lib/libusb-1.0.so
+      libusb=${pkgs.libusb1.out}/lib/libusb-1.0.so
       test -f $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }
       sed -i -e "s|libname = .*|libname = \"$libusb\"|" usb/backend/libusb1.py
     '';

From 91b40bd9d24a35dedfbceb0d3eeb72dcc0f27d5b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:45 +0200
Subject: [PATCH 0359/2285] treewide: Mass replace 'libusb}/lib' to refer the
 'out' output

---
 pkgs/applications/misc/nut/default.nix         | 2 +-
 pkgs/development/libraries/scmccid/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/nut/default.nix b/pkgs/applications/misc/nut/default.nix
index 3e972f672cc2..25c904880923 100644
--- a/pkgs/applications/misc/nut/default.nix
+++ b/pkgs/applications/misc/nut/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   
   postInstall = ''
     wrapProgram $out/bin/nut-scanner --prefix LD_LIBRARY_PATH : \
-      "$out/lib:${neon}/lib:${libusb}/lib:${avahi}/lib:${freeipmi}/lib"
+      "$out/lib:${neon}/lib:${libusb.out}/lib:${avahi}/lib:${freeipmi}/lib"
   '';
 
   meta = {
diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix
index f9845d60b490..f88bd64f597b 100644
--- a/pkgs/development/libraries/scmccid/default.nix
+++ b/pkgs/development/libraries/scmccid/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ patchelf ];
 
   installPhase = ''
-    RPATH=${libusb}/lib:${stdenv.cc.libc.out}/lib
+    RPATH=${libusb.out}/lib:${stdenv.cc.libc.out}/lib
 
     for a in proprietary/*/Contents/Linux/*.so*; do
         if ! test -L $a; then

From 5d52f5542604fad210a1b16484f31d2f8bb5ed39 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:49 +0200
Subject: [PATCH 0360/2285] treewide: Mass replace 'xorg.libX11}/lib' to refer
 the 'out' output

---
 nixos/modules/services/x11/window-managers/metacity.nix | 2 +-
 pkgs/applications/graphics/gimp/2.8.nix                 | 2 +-
 pkgs/development/tools/selenium/server/default.nix      | 2 +-
 pkgs/os-specific/linux/ati-drivers/default.nix          | 2 +-
 pkgs/top-level/perl-packages.nix                        | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/metacity.nix b/nixos/modules/services/x11/window-managers/metacity.nix
index 3e5229be634f..866bb441de45 100644
--- a/nixos/modules/services/x11/window-managers/metacity.nix
+++ b/nixos/modules/services/x11/window-managers/metacity.nix
@@ -20,7 +20,7 @@ in
     services.xserver.windowManager.session = singleton
       { name = "metacity";
         start = ''
-          env LD_LIBRARY_PATH=${xorg.libX11}/lib:${xorg.libXext}/lib:/usr/lib/
+          env LD_LIBRARY_PATH=${xorg.libX11.out}/lib:${xorg.libXext}/lib:/usr/lib/
           # !!! Hack: load the schemas for Metacity.
           GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
             --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas # */
diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index 954a1d4c19c9..82c4bcbdc369 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   #configureFlags = [ "--disable-print" ];
 
   # "screenshot" needs this.
-  NIX_LDFLAGS = "-rpath ${xorg.libX11}/lib"
+  NIX_LDFLAGS = "-rpath ${xorg.libX11.out}/lib"
     + stdenv.lib.optionalString stdenv.isDarwin " -lintl";
 
   meta = {
diff --git a/pkgs/development/tools/selenium/server/default.nix b/pkgs/development/tools/selenium/server/default.nix
index 2efd85f84010..66d9668fe82d 100644
--- a/pkgs/development/tools/selenium/server/default.nix
+++ b/pkgs/development/tools/selenium/server/default.nix
@@ -29,7 +29,7 @@ in stdenv.mkDerivation rec {
     ${jdk}/bin/jar xf $src launchers/launcher-linux-amd64
     patchelf \
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xorg.libX11}/lib" \
+      --set-rpath "${gcc.cc}/lib/:${gcc.cc}/lib64:${xorg.libX11.out}/lib" \
       launchers/launcher-linux-${arch}
     ${jdk}/bin/jar uf $src launchers/launcher-linux-${arch}
   '';
diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index bb0888855095..e9eba11513bd 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation {
     [ "${xorg.libXrandr}/lib"
       "${xorg.libXrender}/lib"
       "${xorg.libXext}/lib"
-      "${xorg.libX11}/lib"
+      "${xorg.libX11.out}/lib"
       "${xorg.libXinerama}/lib"
     ];
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 516b42a0274f..c4a4640a8b82 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12777,7 +12777,7 @@ let self = _self // overrides; _self = with self; {
       url = "http://search.cpan.org/CPAN/authors/id/S/SR/SREZIC/${name}.tar.gz";
       sha256 = "10fsvyr56gm59chc8b70n6bvhd3lh9c05sp8m4arcahid0rpgbwa";
     };
-    makeMakerFlags = "X11LIB=${pkgs.xorg.libX11}/lib";
+    makeMakerFlags = "X11LIB=${pkgs.xorg.libX11.out}/lib";
     buildInputs = with pkgs; [ xorg.libX11 libpng ];
     configurePhase = ''
       perl Makefile.PL PREFIX=$out $makeMakerFlags
@@ -13219,7 +13219,7 @@ let self = _self // overrides; _self = with self; {
     };
     buildInputs = [ pkgs.xorg.libXext pkgs.xorg.libXScrnSaver pkgs.xorg.libX11 ];
     propagatedBuildInputs = [ InlineC ];
-    patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11}/lib/ -L${pkgs.xorg.libXext}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm'';
+    patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11.out}/lib/ -L${pkgs.xorg.libXext}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm'';
     meta = {
       description = "Get the idle time of X11";
     };

From eec609fcc191857a44a200bc401d6c7f8a51d97f Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:50 +0200
Subject: [PATCH 0361/2285] treewide: Mass replace 'xorg.libxcb}/lib' to refer
 the 'out' output

---
 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 289fec567f57..581e2834d8fd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23731,7 +23731,7 @@ in modules // {
 
     patchPhase = ''
       # Hardcode cairo library path
-      sed -e 's,ffi\.dlopen(,&"${pkgs.xorg.libxcb}/lib/" + ,' -i xcffib/__init__.py
+      sed -e 's,ffi\.dlopen(,&"${pkgs.xorg.libxcb.out}/lib/" + ,' -i xcffib/__init__.py
     '';
 
     propagatedBuildInputs = [ self.cffi self.six ];

From 40ef23e7ed521abb7161dde01806ca62c9ed25ba Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:51 +0200
Subject: [PATCH 0362/2285] treewide: Mass replace 'xorg.libXext}/lib' to refer
 the 'out' output

---
 nixos/modules/services/x11/window-managers/metacity.nix | 2 +-
 pkgs/os-specific/linux/ati-drivers/default.nix          | 2 +-
 pkgs/top-level/perl-packages.nix                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/metacity.nix b/nixos/modules/services/x11/window-managers/metacity.nix
index 866bb441de45..2957ad91be45 100644
--- a/nixos/modules/services/x11/window-managers/metacity.nix
+++ b/nixos/modules/services/x11/window-managers/metacity.nix
@@ -20,7 +20,7 @@ in
     services.xserver.windowManager.session = singleton
       { name = "metacity";
         start = ''
-          env LD_LIBRARY_PATH=${xorg.libX11.out}/lib:${xorg.libXext}/lib:/usr/lib/
+          env LD_LIBRARY_PATH=${xorg.libX11.out}/lib:${xorg.libXext.out}/lib:/usr/lib/
           # !!! Hack: load the schemas for Metacity.
           GCONF_CONFIG_SOURCE=xml::~/.gconf ${gnome.GConf}/bin/gconftool-2 \
             --makefile-install-rule ${gnome.metacity}/etc/gconf/schemas/*.schemas # */
diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index e9eba11513bd..277da6f6e4b5 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -65,7 +65,7 @@ stdenv.mkDerivation {
   LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":"
     [ "${xorg.libXrandr}/lib"
       "${xorg.libXrender}/lib"
-      "${xorg.libXext}/lib"
+      "${xorg.libXext.out}/lib"
       "${xorg.libX11.out}/lib"
       "${xorg.libXinerama}/lib"
     ];
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index c4a4640a8b82..053198bde2a4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13219,7 +13219,7 @@ let self = _self // overrides; _self = with self; {
     };
     buildInputs = [ pkgs.xorg.libXext pkgs.xorg.libXScrnSaver pkgs.xorg.libX11 ];
     propagatedBuildInputs = [ InlineC ];
-    patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11.out}/lib/ -L${pkgs.xorg.libXext}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm'';
+    patchPhase = ''sed -ie 's,-L/usr/X11R6/lib/,-L${pkgs.xorg.libX11.out}/lib/ -L${pkgs.xorg.libXext.out}/lib/ -L${pkgs.xorg.libXScrnSaver}/lib/,' IdleTime.pm'';
     meta = {
       description = "Get the idle time of X11";
     };

From 555292017e361206952acffda2641a59f7c8ae4b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:53 +0200
Subject: [PATCH 0363/2285] treewide: Mass replace 'xorg.libXft}/lib' to refer
 the 'out' output

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

diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 261529fd5239..7a7b603b449b 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -2383,7 +2383,7 @@ let
     });
 
     devEMF = old.devEMF.overrideDerivation (attrs: {
-      NIX_CFLAGS_LINK = "-L${pkgs.xorg.libXft}/lib -lXft";
+      NIX_CFLAGS_LINK = "-L${pkgs.xorg.libXft.out}/lib -lXft";
     });
 
     slfm = old.slfm.overrideDerivation (attrs: {

From 5a6a8213ebefade42f08bfba9ec94652631e0eb1 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:54 +0200
Subject: [PATCH 0364/2285] treewide: Mass replace 'xorg.libXinerama}/lib' to
 refer the 'out' output

---
 pkgs/os-specific/linux/ati-drivers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index 277da6f6e4b5..7bc56a45fc4b 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation {
       "${xorg.libXrender}/lib"
       "${xorg.libXext.out}/lib"
       "${xorg.libX11.out}/lib"
-      "${xorg.libXinerama}/lib"
+      "${xorg.libXinerama.out}/lib"
     ];
 
   # without this some applications like blender don't start, but they start

From 474f921bacefadaa7f123f7531adfa86062f4b0d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:57 +0200
Subject: [PATCH 0365/2285] treewide: Mass replace 'xorg.libXrandr}/lib' to
 refer the 'out' output

---
 pkgs/os-specific/linux/ati-drivers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index 7bc56a45fc4b..67b98211099d 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -63,7 +63,7 @@ stdenv.mkDerivation {
   inherit glibc /* glibc only used for setting interpreter */;
 
   LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":"
-    [ "${xorg.libXrandr}/lib"
+    [ "${xorg.libXrandr.out}/lib"
       "${xorg.libXrender}/lib"
       "${xorg.libXext.out}/lib"
       "${xorg.libX11.out}/lib"

From 1894615f64502d66c2f5c4ad85e8ee50ee75cbf7 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:29:57 +0200
Subject: [PATCH 0366/2285] treewide: Mass replace 'xorg.libXrender}/lib' to
 refer the 'out' output

---
 pkgs/os-specific/linux/ati-drivers/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix
index 67b98211099d..c1e524e224bb 100644
--- a/pkgs/os-specific/linux/ati-drivers/default.nix
+++ b/pkgs/os-specific/linux/ati-drivers/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation {
 
   LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":"
     [ "${xorg.libXrandr.out}/lib"
-      "${xorg.libXrender}/lib"
+      "${xorg.libXrender.out}/lib"
       "${xorg.libXext.out}/lib"
       "${xorg.libX11.out}/lib"
       "${xorg.libXinerama.out}/lib"

From 04c5830432165e60d5ef7bc77ea13618d9943fc5 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:30:00 +0200
Subject: [PATCH 0367/2285] treewide: Mass replace 'mpfr}/lib' to refer the
 'out' output

---
 pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 2 +-
 pkgs/stdenv/linux/make-bootstrap-tools.nix       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index a56d744ab8d4..ed7314878a6f 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -199,7 +199,7 @@ rec {
         rm -rf $out/include/c++/*/ext/parallel
 
         cp -d ${gmpxx}/lib/libgmp*.so* $out/lib
-        cp -d ${mpfr}/lib/libmpfr*.so* $out/lib
+        cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib
         cp -d ${libmpc}/lib/libmpc*.so* $out/lib
         cp -d ${zlib}/lib/libz.so* $out/lib
         cp -d ${libelf}/lib/libelf.so* $out/lib
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 117346eb4edc..abcba396c371 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -112,7 +112,7 @@ rec {
         rm -rf $out/include/c++/*/ext/parallel
 
         cp -d ${gmpxx}/lib/libgmp*.so* $out/lib
-        cp -d ${mpfr}/lib/libmpfr*.so* $out/lib
+        cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib
         cp -d ${libmpc}/lib/libmpc*.so* $out/lib
         cp -d ${zlib}/lib/libz.so* $out/lib
         cp -d ${libelf}/lib/libelf.so* $out/lib

From 8eb5d7d037a484b6c33f035687a0cf22f2600128 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:30:01 +0200
Subject: [PATCH 0368/2285] treewide: Mass replace 'ncurses}/lib' to refer the
 'lib' output

---
 pkgs/applications/editors/emacs-24/macport-24.5.nix   | 4 ++--
 pkgs/development/compilers/ghc/8.0.1.nix              | 2 +-
 pkgs/development/mobile/androidenv/androidndk_r8e.nix | 2 +-
 pkgs/servers/sql/mariadb/default.nix                  | 2 +-
 pkgs/tools/system/gptfdisk/default.nix                | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/emacs-24/macport-24.5.nix b/pkgs/applications/editors/emacs-24/macport-24.5.nix
index c778c42de857..ae0a66b30fee 100644
--- a/pkgs/applications/editors/emacs-24/macport-24.5.nix
+++ b/pkgs/applications/editors/emacs-24/macport-24.5.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "LDFLAGS=-L${ncurses}/lib"
+    "LDFLAGS=-L${ncurses.lib}/lib"
     "--with-xml2=yes"
     "--with-gnutls=yes"
     "--with-mac"
@@ -48,7 +48,7 @@ stdenv.mkDerivation rec {
   ];
 
   CFLAGS = "-O3";
-  LDFLAGS = "-O3 -L${ncurses}/lib";
+  LDFLAGS = "-O3 -L${ncurses.lib}/lib";
 
   postInstall = ''
     mkdir -p $out/share/emacs/site-lisp/
diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix
index b262a448d4da..6e9f4691f73b 100644
--- a/pkgs/development/compilers/ghc/8.0.1.nix
+++ b/pkgs/development/compilers/ghc/8.0.1.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
     "--with-gcc=${stdenv.cc}/bin/cc"
     "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp.out}/lib"
-    "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses}/lib"
+    "--with-curses-includes=${ncurses}/include" "--with-curses-libraries=${ncurses.lib}/lib"
   ] ++ stdenv.lib.optional stdenv.isDarwin [
     "--with-iconv-includes=${libiconv}/include" "--with-iconv-libraries=${libiconv}/lib"
   ];
diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
index d3f66c918ec7..ee649eb89b47 100644
--- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix
+++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
         \( -type f -a -name "*.so*" \) -o \
         \( -type f -a -perm -0100 \) \
         \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
-                          --set-rpath ${zlib}/lib:${ncurses}/lib {} \;
+                          --set-rpath ${zlib}/lib:${ncurses.lib}/lib {} \;
     # fix ineffective PROGDIR / MYNDKDIR determination
     for i in ndk-build ndk-gdb ndk-gdb-py
     do
diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index f23a8f422b3b..340e29e94b3e 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation rec {
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
     "-DWITHOUT_OQGRAPH_STORAGE_ENGINE=1"
     "-DWITHOUT_TOKUDB=1"
-    "-DCURSES_LIBRARY=${ncurses}/lib/libncurses.dylib"
+    "-DCURSES_LIBRARY=${ncurses.lib}/lib/libncurses.dylib"
   ];
 
   # fails to find lex_token.h sometimes
diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix
index 9306b0e84cca..18baf289e8cf 100644
--- a/pkgs/tools/system/gptfdisk/default.nix
+++ b/pkgs/tools/system/gptfdisk/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     substituteInPlace Makefile.mac --replace \
       " -I/opt/local/include -I /usr/local/include -I/opt/local/include" ""
     substituteInPlace Makefile.mac --replace \
-      "/opt/local/lib/libncurses.a" "${ncurses}/lib/libncurses.dylib"
+      "/opt/local/lib/libncurses.a" "${ncurses.lib}/lib/libncurses.dylib"
   '';
 
   buildPhase = stdenv.lib.optionalString stdenv.isDarwin "make -f Makefile.mac";

From 2258aecaa5e1b03b2f6def3bd79b769ee306ab9c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:30:03 +0200
Subject: [PATCH 0369/2285] treewide: Mass replace 'nss}/lib' to refer the
 'out' output

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

diff --git a/pkgs/development/libraries/liboauth/default.nix b/pkgs/development/libraries/liboauth/default.nix
index 479a187cf87c..f62fb400199f 100644
--- a/pkgs/development/libraries/liboauth/default.nix
+++ b/pkgs/development/libraries/liboauth/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     substituteInPlace $out/lib/liboauth.la \
-      --replace "-lnss3" "-L${nss}/lib -lnss3"
+      --replace "-lnss3" "-L${nss.out}/lib -lnss3"
   '';
 
   meta = with stdenv.lib; {

From d91c7347d1f51ec0282a286e4eae69c13edd506a Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:30:05 +0200
Subject: [PATCH 0370/2285] treewide: Mass replace 'openssl}/lib' to refer the
 'out' output

---
 nixos/modules/system/boot/luksroot.nix                 |  2 +-
 pkgs/applications/editors/sublime3/default.nix         |  2 +-
 pkgs/applications/networking/ike/default.nix           |  2 +-
 .../networking/instant-messengers/fuze/default.nix     |  4 ++--
 .../instant-messengers/pybitmessage/default.nix        |  2 +-
 pkgs/development/compilers/ponyc/default.nix           |  4 ++--
 pkgs/servers/nosql/arangodb/default.nix                |  2 +-
 pkgs/servers/shellinabox/default.nix                   |  2 +-
 pkgs/tools/system/monit/default.nix                    |  2 +-
 pkgs/top-level/perl-packages.nix                       | 10 +++++-----
 10 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 59bff5472e84..6ea11e60b263 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -438,7 +438,7 @@ in
         copy_bin_and_libs ${pkgs.ykpers}/bin/ykinfo
         copy_bin_and_libs ${pkgs.openssl}/bin/openssl
 
-        cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto
+        cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl.out}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto
         strip -s pbkdf2-sha512
         copy_bin_and_libs pbkdf2-sha512
 
diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix
index c6cc813d6b11..5a1d10a1468c 100644
--- a/pkgs/applications/editors/sublime3/default.nix
+++ b/pkgs/applications/editors/sublime3/default.nix
@@ -57,7 +57,7 @@ in let
         --set NIX_REDIRECTS ${builtins.concatStringsSep ":" redirects}
 
       # Without this, plugin_host crashes, even though it has the rpath
-      wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2.out}/lib/libbz2.so
+      wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl.out}/lib/libssl.so:${bzip2.out}/lib/libbz2.so
     '';
   };
 in stdenv.mkDerivation {
diff --git a/pkgs/applications/networking/ike/default.nix b/pkgs/applications/networking/ike/default.nix
index afb8c22272e4..5ea0975e15f3 100644
--- a/pkgs/applications/networking/ike/default.nix
+++ b/pkgs/applications/networking/ike/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     make install
     for file in "$out"/bin/* "$out"/sbin/*; do
-        wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl}/lib:${gcc.cc}/lib:${stdenv.glibc.out}/lib::${gcc.cc}/lib64:${stdenv.glibc.out}/lib64:${libedit}/lib:${qt4}/lib"
+        wrapProgram $file --prefix LD_LIBRARY_PATH ":" "$out/lib:${openssl.out}/lib:${gcc.cc}/lib:${stdenv.glibc.out}/lib::${gcc.cc}/lib64:${stdenv.glibc.out}/lib64:${libedit}/lib:${qt4}/lib"
     done
   '';
 
diff --git a/pkgs/applications/networking/instant-messengers/fuze/default.nix b/pkgs/applications/networking/instant-messengers/fuze/default.nix
index 33ffe87a4ffb..9ea2b5a56d1b 100644
--- a/pkgs/applications/networking/instant-messengers/fuze/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fuze/default.nix
@@ -39,8 +39,8 @@ stdenv.mkDerivation {
         $f
     done
 
-    ln -s ${openssl}/lib/libssl.so.1.0.0 $out/lib/fuzebox/libssl.so.0.9.8
-    ln -s ${openssl}/lib/libcrypto.so.1.0.0 $out/lib/fuzebox/libcrypto.so.0.9.8
+    ln -s ${openssl.out}/lib/libssl.so.1.0.0 $out/lib/fuzebox/libssl.so.0.9.8
+    ln -s ${openssl.out}/lib/libcrypto.so.1.0.0 $out/lib/fuzebox/libcrypto.so.0.9.8
 
     ln -s $out/lib/fuzebox/FuzeLinuxApp $out/bin/fuze
   '';
diff --git a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
index c19b5ff31f9d..17462cb75ad5 100644
--- a/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pybitmessage/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   postInstall = ''
     substituteInPlace $out/bin/pybitmessage \
       --replace "exec python2" "exec ${python}/bin/python" \
-      --replace "/opt/openssl-compat-bitcoin/lib/" "${openssl}/lib/"
+      --replace "/opt/openssl-compat-bitcoin/lib/" "${openssl.out}/lib/"
     wrapProgram $out/bin/pybitmessage \
       --prefix PYTHONPATH : "$(toPythonPath $out):$PYTHONPATH"
   '';
diff --git a/pkgs/development/compilers/ponyc/default.nix b/pkgs/development/compilers/ponyc/default.nix
index f05555003f98..076146095196 100644
--- a/pkgs/development/compilers/ponyc/default.nix
+++ b/pkgs/development/compilers/ponyc/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     '';
 
   preCheck = ''
-    export LIBRARY_PATH="$out/lib:${openssl}/lib:${pcre2}/lib"
+    export LIBRARY_PATH="$out/lib:${openssl.out}/lib:${pcre2}/lib"
   '';
 
   installPhase = ''
@@ -34,7 +34,7 @@ stdenv.mkDerivation {
     mv $out/bin/ponyc $out/bin/ponyc.wrapped
     makeWrapper $out/bin/ponyc.wrapped $out/bin/ponyc \
       --prefix LIBRARY_PATH : "$out/lib" \
-      --prefix LIBRARY_PATH : "${openssl}/lib" \
+      --prefix LIBRARY_PATH : "${openssl.out}/lib" \
       --prefix LIBRARY_PATH : "${pcre2}/lib"
   '';
 
diff --git a/pkgs/servers/nosql/arangodb/default.nix b/pkgs/servers/nosql/arangodb/default.nix
index 4ff12f630c9b..473b5d717dea 100644
--- a/pkgs/servers/nosql/arangodb/default.nix
+++ b/pkgs/servers/nosql/arangodb/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     openssl zlib python gyp go readline
   ];
 
-  configureFlagsArray = [ "--with-openssl-lib=${openssl}/lib" ];
+  configureFlagsArray = [ "--with-openssl-lib=${openssl.out}/lib" ];
 
   patchPhase = ''
     substituteInPlace 3rdParty/V8-3.31.74.1/build/gyp/gyp --replace /bin/bash ${bash}/bin/bash
diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix
index 0a651762f185..6df4905af2cd 100644
--- a/pkgs/servers/shellinabox/default.nix
+++ b/pkgs/servers/shellinabox/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram $out/bin/shellinaboxd \
-      --prefix LD_LIBRARY_PATH : ${openssl}/lib
+      --prefix LD_LIBRARY_PATH : ${openssl.out}/lib
     mkdir -p $out/lib
     cp shellinabox/* $out/lib
   '';
diff --git a/pkgs/tools/system/monit/default.nix b/pkgs/tools/system/monit/default.nix
index 1b15fbbb6281..0ee32a49c07b 100644
--- a/pkgs/tools/system/monit/default.nix
+++ b/pkgs/tools/system/monit/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
     "--with-ssl-incl-dir=${openssl}/include"
-    "--with-ssl-lib-dir=${openssl}/lib"
+    "--with-ssl-lib-dir=${openssl.out}/lib"
   ] ++ stdenv.lib.optionals (! usePAM) [ "--without-pam" ];
 
   meta = {
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 053198bde2a4..fb8bba33f374 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -2491,7 +2491,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "b66fab514edf97fc32f58da257582704a210c2b35e297d5c31b7fa2ffd08e908";
     };
     NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include";
-    NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto";
+    NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
     meta = with stdenv.lib; {
       homepage = https://metacpan.org/release/Crypt-OpenSSL-AES;
       description = "Perl wrapper around OpenSSL's AES library";
@@ -2508,7 +2508,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "18vg2bqyhc0ahfdh5dkbgph5nh92qcz5vi99jq8aam4h86if78bk";
     };
     NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include";
-    NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto";
+    NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
   };
 
   CryptOpenSSLRandom = buildPerlPackage rec {
@@ -2518,7 +2518,7 @@ let self = _self // overrides; _self = with self; {
       sha256 = "12pirh1pj8lpvzcwj2if9i6dbr6a7s9g1zc7gzbd3v87d6mx0rdf";
     };
     NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include";
-    NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto";
+    NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
   };
 
   CryptOpenSSLRSA = buildPerlPackage rec {
@@ -2529,7 +2529,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ CryptOpenSSLRandom ];
     NIX_CFLAGS_COMPILE = "-I${pkgs.openssl}/include";
-    NIX_CFLAGS_LINK = "-L${pkgs.openssl}/lib -lcrypto";
+    NIX_CFLAGS_LINK = "-L${pkgs.openssl.out}/lib -lcrypto";
   };
 
   CryptSSLeay = buildPerlPackage rec {
@@ -2538,7 +2538,7 @@ let self = _self // overrides; _self = with self; {
       url = "mirror://cpan/authors/id/N/NA/NANIS/${name}.tar.gz";
       sha256 = "1s7zm6ph37kg8jzaxnhi4ff4snxl7mi5h14arxbri0kp6s0lzlzm";
     };
-    makeMakerFlags = "--libpath=${pkgs.openssl}/lib --incpath=${pkgs.openssl}/include";
+    makeMakerFlags = "--libpath=${pkgs.openssl.out}/lib --incpath=${pkgs.openssl}/include";
     buildInputs = [ PathClass TryTiny ];
   };
 

From ba87da9fd12a7fce91fa08f32dc2ebb6933eac1c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:30:07 +0200
Subject: [PATCH 0371/2285] treewide: Mass replace 'pcre}/lib' to refer the
 'out' output

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

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index abcba396c371..1011ae6689ad 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -86,7 +86,7 @@ rec {
         cp ${curlMinimal}/bin/curl $out/bin
         cp -d ${curlMinimal}/lib/libcurl* $out/lib
 
-        cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep
+        cp -d ${gnugrep.pcre.out}/lib/libpcre*.so* $out/lib # needed by grep
 
         # Copy what we need of GCC.
         cp -d ${gcc.cc}/bin/gcc $out/bin

From 619710268d1e0581f70d4d7c504b05e2d0b989a9 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:30:09 +0200
Subject: [PATCH 0372/2285] treewide: Mass replace 'poppler}/lib' to refer the
 'out' output

---
 pkgs/applications/misc/pdfmod/default.nix        | 2 +-
 pkgs/tools/typesetting/tex/texlive/aggregate.nix | 2 +-
 pkgs/tools/typesetting/tex/texlive/default.nix   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix
index f23238b2dc61..12e3e696777d 100644
--- a/pkgs/applications/misc/pdfmod/default.nix
+++ b/pkgs/applications/misc/pdfmod/default.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
       --prefix LD_LIBRARY_PATH : ${gnome-sharp}/lib \
       --prefix LD_LIBRARY_PATH : ${gtk-sharp.gtk}/lib \
       --prefix LD_LIBRARY_PATH : ${gnome3.gconf}/lib \
-      --prefix LD_LIBRARY_PATH : ${poppler}/lib
+      --prefix LD_LIBRARY_PATH : ${poppler.out}/lib
   '';
 
   dontStrip = true;
diff --git a/pkgs/tools/typesetting/tex/texlive/aggregate.nix b/pkgs/tools/typesetting/tex/texlive/aggregate.nix
index 56b093f921d1..550870b0a6a9 100644
--- a/pkgs/tools/typesetting/tex/texlive/aggregate.nix
+++ b/pkgs/tools/typesetting/tex/texlive/aggregate.nix
@@ -66,7 +66,7 @@ rec {
     # did the same thing in texLive, but couldn't get it to carry to the
     # binaries installed by texLiveFull
     for prog in $out/bin/*; do
-      wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib"
+      wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler.out}/lib"
     done
   '' ) [ "minInit" "defEnsureDir" "addInputs" ];
 
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index 008de2d25209..48a5ae8d6499 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -30,7 +30,7 @@ rec {
   setupHook = ./setup-hook.sh;
 
   doMainBuild = fullDepEntry ( stdenv.lib.optionalString stdenv.isDarwin ''
-    export DYLD_LIBRARY_PATH="${poppler}/lib"
+    export DYLD_LIBRARY_PATH="${poppler.out}/lib"
   '' + ''
     mkdir -p $out
     mkdir -p $out/nix-support
@@ -106,7 +106,7 @@ rec {
     PATH=$PATH:$out/bin mktexlsr $out/share/texmf*
   '' + stdenv.lib.optionalString stdenv.isDarwin ''
     for prog in $out/bin/*; do
-      wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler}/lib"
+      wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${poppler.out}/lib"
     done
   '' ) [ "minInit" "defEnsureDir" "doUnpack" "doMakeInstall" "promoteLibexec" "patchShebangsInterim"];
 

From 0f4244f51f1703132d9205a216180902a75bf33e Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:30:11 +0200
Subject: [PATCH 0373/2285] treewide: Mass replace 'poppler_utils}/lib' to
 refer the 'out' output

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 62da092470ab..f464c3ccd027 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     export HOME=$TMPDIR/fakehome
     export POPPLER_INC_DIR=${poppler_utils}/include/poppler
-    export POPPLER_LIB_DIR=${poppler_utils}/lib
+    export POPPLER_LIB_DIR=${poppler_utils.out}/lib
     export MAGICK_INC=${imagemagick}/include/ImageMagick
     export MAGICK_LIB=${imagemagick}/lib
     export FC_INC_DIR=${fontconfig.dev}/include/fontconfig

From ed7dbb46a81ab7ae7e446e01d0cd9d1a0faea18d Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:30:24 +0200
Subject: [PATCH 0374/2285] treewide: Mass replace 'zlib}/lib' to refer the
 'out' output

---
 pkgs/applications/audio/milkytracker/default.nix            | 2 +-
 pkgs/applications/editors/texmacs/default.nix               | 2 +-
 pkgs/development/compilers/gcc/4.3/default.nix              | 2 +-
 pkgs/development/libraries/tokyo-cabinet/default.nix        | 2 +-
 pkgs/development/mobile/androidenv/androidndk_r8e.nix       | 2 +-
 pkgs/development/ocaml-modules/camlzip/default.nix          | 2 +-
 pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix | 2 +-
 pkgs/development/tools/build-managers/cargo/snapshot.nix    | 2 +-
 pkgs/games/openttd/default.nix                              | 2 +-
 pkgs/servers/meteor/default.nix                             | 4 ++--
 pkgs/stdenv/linux/make-bootstrap-tools-cross.nix            | 2 +-
 pkgs/stdenv/linux/make-bootstrap-tools.nix                  | 2 +-
 pkgs/tools/filesystems/yandex-disk/default.nix              | 2 +-
 pkgs/tools/graphics/pngcheck/default.nix                    | 2 +-
 pkgs/tools/networking/p2p/gtk-gnutella/default.nix          | 2 +-
 15 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/audio/milkytracker/default.nix b/pkgs/applications/audio/milkytracker/default.nix
index 8bc0aebba5a8..f22ccd08a8e8 100644
--- a/pkgs/applications/audio/milkytracker/default.nix
+++ b/pkgs/applications/audio/milkytracker/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   '';
 
   preBuild=''
-    export CPATH=${zlib}/lib
+    export CPATH=${zlib.out}/lib
   '';
 
   buildInputs = [ SDL alsaLib autoconf automake libjack2 perl zlib zziplib ];
diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix
index e415239d76fb..e51813459c6f 100644
--- a/pkgs/applications/editors/texmacs/default.nix
+++ b/pkgs/applications/editors/texmacs/default.nix
@@ -69,7 +69,7 @@ stdenv.mkDerivation rec {
   postFixup = ''
     bin="$out/libexec/TeXmacs/bin/texmacs.bin"
     rpath=$(patchelf --print-rpath "$bin")
-    patchelf --set-rpath "$rpath:${zlib}/lib" "$bin"
+    patchelf --set-rpath "$rpath:${zlib.out}/lib" "$bin"
   '';
 
   meta = {
diff --git a/pkgs/development/compilers/gcc/4.3/default.nix b/pkgs/development/compilers/gcc/4.3/default.nix
index e97ae93cd531..317bd5eb3ed5 100644
--- a/pkgs/development/compilers/gcc/4.3/default.nix
+++ b/pkgs/development/compilers/gcc/4.3/default.nix
@@ -142,7 +142,7 @@ stdenv.mkDerivation ({
 } // (if langJava then {
   postConfigure = ''
     make configure-gcc
-    sed -i gcc/Makefile -e 's@^CFLAGS = .*@& -I${zlib}/include@ ; s@^LDFLAGS = .*@& -L${zlib}/lib@'
+    sed -i gcc/Makefile -e 's@^CFLAGS = .*@& -I${zlib}/include@ ; s@^LDFLAGS = .*@& -L${zlib.out}/lib@'
     sed -i gcc/Makefile -e 's@^CFLAGS = .*@& -I${boehmgc}/include@ ; s@^LDFLAGS = .*@& -L${boehmgc.out}/lib -lgc@'
   '';
 } else {})
diff --git a/pkgs/development/libraries/tokyo-cabinet/default.nix b/pkgs/development/libraries/tokyo-cabinet/default.nix
index 7512e085449c..b8969588b3c5 100644
--- a/pkgs/development/libraries/tokyo-cabinet/default.nix
+++ b/pkgs/development/libraries/tokyo-cabinet/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   postInstall =
     '' sed -i "$out/lib/pkgconfig/tokyocabinet.pc" \
-           -e 's|-lz|-L${zlib}/lib -lz|g;
+           -e 's|-lz|-L${zlib.out}/lib -lz|g;
                s|-lbz2|-L${bzip2.out}/lib -lbz2|g'
     '';
 
diff --git a/pkgs/development/mobile/androidenv/androidndk_r8e.nix b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
index ee649eb89b47..a38d2d6b33cf 100644
--- a/pkgs/development/mobile/androidenv/androidndk_r8e.nix
+++ b/pkgs/development/mobile/androidenv/androidndk_r8e.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
         \( -type f -a -name "*.so*" \) -o \
         \( -type f -a -perm -0100 \) \
         \) -exec patchelf --set-interpreter ${stdenv.cc.libc.out}/lib/ld-*so.? \
-                          --set-rpath ${zlib}/lib:${ncurses.lib}/lib {} \;
+                          --set-rpath ${zlib.out}/lib:${ncurses.lib}/lib {} \;
     # fix ineffective PROGDIR / MYNDKDIR determination
     for i in ndk-build ndk-gdb ndk-gdb-py
     do
diff --git a/pkgs/development/ocaml-modules/camlzip/default.nix b/pkgs/development/ocaml-modules/camlzip/default.nix
index 2024f5a5ab8f..60590c6c1d5f 100644
--- a/pkgs/development/ocaml-modules/camlzip/default.nix
+++ b/pkgs/development/ocaml-modules/camlzip/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
   postPatch = ''
     substitute ${./META} META --subst-var-by VERSION "${version}"
     substituteInPlace Makefile \
-      --subst-var-by ZLIB_LIBDIR "${zlib}/lib" \
+      --subst-var-by ZLIB_LIBDIR "${zlib.out}/lib" \
       --subst-var-by ZLIB_INCLUDE "${zlib}/include"
   '';
 
diff --git a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
index 20362a51a7be..9314481cbcfe 100644
--- a/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
+++ b/pkgs/development/perl-modules/Compress-Raw-Zlib/default.nix
@@ -12,7 +12,7 @@ buildPerlPackage rec {
     cat > config.in <<EOF
       BUILD_ZLIB   = False
       INCLUDE      = ${zlib}/include
-      LIB          = ${zlib}/lib
+      LIB          = ${zlib.out}/lib
       OLD_ZLIB     = False
       GZIP_OS_CODE = AUTO_DETECT
     EOF
diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix
index 8f5467f63112..5a061e4b7c8d 100644
--- a/pkgs/development/tools/build-managers/cargo/snapshot.nix
+++ b/pkgs/development/tools/build-managers/cargo/snapshot.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation {
     ./install.sh "--prefix=$out"
   '' + (if stdenv.isLinux then ''
     patchelf --interpreter "${stdenv.glibc.out}/lib/${stdenv.cc.dynamicLinker}" \
-             --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib}/lib" \
+             --set-rpath "${stdenv.cc.cc}/lib/:${stdenv.cc.cc}/lib64/:${zlib.out}/lib" \
              "$out/bin/cargo"
   '' else "") + postInstall;
 }
diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index 65fab09d04dd..471387320563 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   prefixKey = "--prefix-dir=";
 
   configureFlags = [
-    "--with-zlib=${zlib}/lib/libz.a"
+    "--with-zlib=${zlib.out}/lib/libz.a"
     "--without-liblzo2"
   ];
 
diff --git a/pkgs/servers/meteor/default.nix b/pkgs/servers/meteor/default.nix
index 5e13b4520c9b..7412378f3dec 100644
--- a/pkgs/servers/meteor/default.nix
+++ b/pkgs/servers/meteor/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     popd
     substituteInPlace $out/tools/cli/main.js \
       --replace "@INTERPRETER@" "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --replace "@RPATH@" "${stdenv.cc.cc}/lib:${zlib}/lib" \
+      --replace "@RPATH@" "${stdenv.cc.cc}/lib:${zlib.out}/lib" \
       --replace "@PATCHELF@" "${patchelf}/bin/patchelf"
 
     # Patch node.
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
     for p in $devBundle/mongodb/bin/mongo{,d}; do
       patchelf \
         --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-        --set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc}/lib:${zlib}/lib" \
+        --set-rpath "$(patchelf --print-rpath $p):${stdenv.cc.cc}/lib:${zlib.out}/lib" \
         $p
     done
 
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index ed7314878a6f..6b562eef53c2 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -201,7 +201,7 @@ rec {
         cp -d ${gmpxx}/lib/libgmp*.so* $out/lib
         cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib
         cp -d ${libmpc}/lib/libmpc*.so* $out/lib
-        cp -d ${zlib}/lib/libz.so* $out/lib
+        cp -d ${zlib.out}/lib/libz.so* $out/lib
         cp -d ${libelf}/lib/libelf.so* $out/lib
         
         # TBD: Why are these needed for cross but not native tools?
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 1011ae6689ad..d33d8f9fb663 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -114,7 +114,7 @@ rec {
         cp -d ${gmpxx}/lib/libgmp*.so* $out/lib
         cp -d ${mpfr.out}/lib/libmpfr*.so* $out/lib
         cp -d ${libmpc}/lib/libmpc*.so* $out/lib
-        cp -d ${zlib}/lib/libz.so* $out/lib
+        cp -d ${zlib.out}/lib/libz.so* $out/lib
         cp -d ${libelf}/lib/libelf.so* $out/lib
 
         # Copy binutils.
diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix
index 42308947c07b..df3cca854ed0 100644
--- a/pkgs/tools/filesystems/yandex-disk/default.nix
+++ b/pkgs/tools/filesystems/yandex-disk/default.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
 
     ${patchelf}/bin/patchelf \
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath "${zlib}/lib:${p.gcclib}" \
+      --set-rpath "${zlib.out}/lib:${p.gcclib}" \
       $out/bin/yandex-disk
   '';
 
diff --git a/pkgs/tools/graphics/pngcheck/default.nix b/pkgs/tools/graphics/pngcheck/default.nix
index 160badaf668b..d288e7018e60 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}/lib";
+  makeFlags = "ZPATH=${zlib.out}/lib";
 
   buildInputs = [ zlib ];
 
diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
index 5f335c8f76a9..ec2821f4d818 100644
--- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
+++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [ bison pkgconfig ];
   buildInputs = [ glib gtk libxml2 gettext zlib ];
 
-  NIX_LDFLAGS = "-rpath ${zlib}/lib";
+  NIX_LDFLAGS = "-rpath ${zlib.out}/lib";
   configureScript = "./Configure";
   dontAddPrefix = true;
   configureFlags = "-d -e -D prefix=$out -D gtkversion=2 -D official=true";

From fdae7816e3c68306cf48e59145f8b2d5dc6e811c Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Sun, 24 Jan 2016 09:34:42 +0200
Subject: [PATCH 0375/2285] openttd: Fixup static zlib path

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

diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix
index 471387320563..7411c161146e 100644
--- a/pkgs/games/openttd/default.nix
+++ b/pkgs/games/openttd/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   prefixKey = "--prefix-dir=";
 
   configureFlags = [
-    "--with-zlib=${zlib.out}/lib/libz.a"
+    "--with-zlib=${zlib.static}/lib/libz.a"
     "--without-liblzo2"
   ];
 

From 312bae7fc07c846d70751ff2d414db2b11c43563 Mon Sep 17 00:00:00 2001
From: Reno Reckling <exi@wthack.de>
Date: Sun, 24 Jan 2016 11:18:30 +0100
Subject: [PATCH 0376/2285] nixos-ssh: set SSH_ASKPASS globally and not just on
 interactive shells

If we limit SSH_ASKPASS to interactive shells, users are unable to trigger
the ssh-passphrase dialog from their desktop environment autostart scripts.
Usecase: I call ssh-add during my desktop environment autostart and want to have
the passphrase dialog immediately after startup.
For this to work, SSH_ASKPASS needs to be propagated properly on
non-interactive shells.
---
 nixos/modules/programs/ssh.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 260888be485f..2da8ff738fbc 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -221,10 +221,7 @@ in
         fi
       '';
 
-    environment.interactiveShellInit = optionalString config.services.xserver.enable
-      ''
-        export SSH_ASKPASS=${askPassword}
-      '';
+    environment.variables.SSH_ASKPASS = optionalString config.services.xserver.enable askPassword;
 
     programs.ssh.askPassword = mkDefault "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
 

From 9b980baa9db36aebf1396cafaa4dfc385d7b7009 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 24 Jan 2016 15:59:31 +0300
Subject: [PATCH 0377/2285] bundlerEnv.wrapper: rename to wrappedRuby

---
 pkgs/development/interpreters/ruby/bundler-env/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/bundler-env/default.nix b/pkgs/development/interpreters/ruby/bundler-env/default.nix
index fdafa5f8f126..0c9ed40d3f82 100644
--- a/pkgs/development/interpreters/ruby/bundler-env/default.nix
+++ b/pkgs/development/interpreters/ruby/bundler-env/default.nix
@@ -68,8 +68,8 @@ let
     passthru = rec {
       inherit ruby bundler meta gems;
 
-      wrapper = stdenv.mkDerivation {
-        name = "wrapper-${name}";
+      wrappedRuby = stdenv.mkDerivation {
+        name = "wrapped-ruby-${name}";
         nativeBuildInputs = [ makeWrapper ];
         buildCommand = ''
           mkdir -p $out/bin
@@ -93,7 +93,7 @@ let
         '';
         in stdenv.mkDerivation {
           name = "interactive-${name}-environment";
-          nativeBuildInputs = [ wrapper bundlerEnv ];
+          nativeBuildInputs = [ wrappedRuby bundlerEnv ];
           shellHook = ''
             export OLD_IRBRC="$IRBRC"
             export IRBRC=${irbrc}

From 4537bbf8b9e51a4c700564789642b9e5b498d506 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 13:53:28 +0100
Subject: [PATCH 0378/2285] pythonPackages.CommonMark: 0.5.4 -> 0.6.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2793f3ce3210..ede5bf0e52ac 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2971,13 +2971,18 @@ in modules // {
 
   CommonMark = buildPythonPackage rec {
     name = "CommonMark-${version}";
-    version = "0.5.4";
+    version = "0.6.3";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/C/CommonMark/${name}.tar.gz";
-      sha256 = "34d73ec8085923c023930dfc0bcd1c4286e28a2a82de094bb72fabcc0281cbe5";
+      sha256 = "ee5a88f23678794592efe3fc11033f17fc77b3296a85f5e1d5b715f8e110a773";
     };
 
+    LC_ALL="en_US.UTF-8";
+
+    buildInputs = with self; [ flake8 pkgs.glibcLocales ];
+    propagatedBuildInputs = with self; [ future ];
+
     meta = {
       description = "Python parser for the CommonMark Markdown spec";
       homepage = https://github.com/rolandshoemaker/CommonMark-py;

From 7df300952222eed0938b5d3fecfa299a5626fa47 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 13:53:59 +0100
Subject: [PATCH 0379/2285] pythonPackages.dask: 0.7.5 -> 0.7.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ede5bf0e52ac..85025c5ef816 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4035,11 +4035,11 @@ in modules // {
 
   dask = buildPythonPackage rec {
     name = "dask-${version}";
-    version = "0.7.5";
+    version = "0.7.6";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/d/dask/${name}.tar.gz";
-      sha256 = "05s1jz3y7llzh3373ab6yx0fb47f0mfy9xyqbknkwsnhabj6g2ib";
+      sha256 = "ff27419e059715907afefe6cbcc1f8c748855c7a93be25be211dabcb689cee3b";
     };
 
     propagatedBuildInputs = with self; [numpy toolz dill];

From 9302637819e75097b45b78cb4095c12dcca08af1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 13:54:17 +0100
Subject: [PATCH 0380/2285] pythonPackages.jupyter_console: 4.0.3 -> 4.1.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 85025c5ef816..07d92c47c133 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5880,14 +5880,15 @@ in modules // {
   };
 
   jupyter_console = buildPythonPackage rec {
-    version = "4.0.3";
+    version = "4.1.0";
     name = "jupyter_console-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/j/jupyter_console/${name}.tar.gz";
-      sha256 = "555be6963a8f6431fbe1d424c7ffefee90824758058e4c9a2ab3aa045948eb85";
+      sha256 = "3f9703b632e38d68713fc2ea1f546edc4db2a8f925c94b6dd91a8d0c13816ce9";
     };
 
+    buildInputs = with self; [ nose ];
     propagatedBuildInputs = with self; [
       jupyter_client
       ipython

From 390d6016feb66a3291262b292306b481104d1411 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 13:54:33 +0100
Subject: [PATCH 0381/2285] pythonPackages.ipykernel: 4.2.0 -> 4.2.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 07d92c47c133..12b2aa96ce27 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9663,16 +9663,25 @@ in modules // {
   };
 
   ipykernel = buildPythonPackage rec {
-    version = "4.2.0";
+    version = "4.2.2";
     name = "ipykernel-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/i/ipykernel/${name}.tar.gz";
-      sha256 = "723b3d4baac20f0c9cd91fc75c3e813636ecb6c6e303fb34d628c3df078985a7";
+      sha256 = "a876da43e01acec2c305abdd8e6aa55f052bab1196171ccf1cb9a6aa230298b0";
     };
 
-    buildInputs = with self; [] ++ optionals isPy27 [mock];
-    propagatedBuildInputs = with self; [ipython traitlets jupyter_client pexpect];
+    buildInputs = with self; [ nose ] ++ optionals isPy27 [mock];
+    propagatedBuildInputs = with self; [
+      ipython
+      jupyter_client
+      pexpect
+      traitlets
+    ];
+
+    # Tests require backends.
+    # I don't want to add all supported backends as propagatedBuildInputs
+    doCheck = false;
 
     meta = {
       description = "IPython Kernel for Jupyter";

From 2b708d43f080fc7ab99fd26e350629a9df6fdcf8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 13:54:50 +0100
Subject: [PATCH 0382/2285] pythonPackages.ipython: 4.0.0 -> 4.0.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 12b2aa96ce27..9b66c891c984 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9712,24 +9712,31 @@ in modules // {
   };
 
   ipython = buildPythonPackage rec {
-    version = "4.0.0";
+    version = "4.0.3";
     name = "ipython-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/i/ipython/${name}.tar.gz";
-      sha256 = "2fd276c407fb0b29e5d4884a7029a2c27fef0a06fd7a34924cce69b7cc43f4da";
+      sha256 = "3a928f59e8ac8dd97858c28390867c87c09510f1f8bbe97e4e9c6b036eb84fc0";
     };
 
     prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
       substituteInPlace setup.py --replace "'gnureadline'" " "
     '';
 
-    buildInputs = with self; [nose] ++ optionals isPy27 [mock];
+    buildInputs = with self; [ nose pkgs.glibcLocales pygments ] ++ optionals isPy27 [mock];
 
     propagatedBuildInputs = with self;
       [decorator pickleshare simplegeneric traitlets readline requests2 pexpect sqlite3]
       ++ optionals stdenv.isDarwin [appnope gnureadline];
 
+    LC_ALL="en_US.UTF-8";
+
+    doCheck = false; # Circular dependency with ipykernel
+
+    checkPhase = ''
+      nosetests
+    '';
     meta = {
       description = "IPython: Productive Interactive Computing";
       homepage = http://ipython.org/;

From 4d9bdce5c47c23d9ab61b96ef342c25f7cb67300 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 13:55:12 +0100
Subject: [PATCH 0383/2285] pythonPackages.iso8601: 0.1.10 -> 0.1.11

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9b66c891c984..3d333a9214d9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9866,15 +9866,20 @@ in modules // {
     };
   };
 
-  iso8601 = buildPythonPackage {
-    name = "iso8601-0.1.10";
+  iso8601 = buildPythonPackage rec {
+    name = "iso8601-${version}";
+    version = "0.1.11";
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/i/iso8601/iso8601-0.1.10.tar.gz;
-      sha256 = "1qf01afxh7j4gja71vxv345if8avg6nnm0ry0zsk6j3030xgy4p7";
+      url = "https://pypi.python.org/packages/source/i/iso8601/${name}.tar.gz";
+      sha256 = "e8fb52f78880ae063336c94eb5b87b181e6a0cc33a6c008511bac9a6e980ef30";
     };
 
     buildInputs = [ self.pytest ];
 
+    checkPhase = ''
+      py.test iso8601
+    '';
+
     meta = {
       homepage = https://bitbucket.org/micktwomey/pyiso8601/;
       description = "Simple module to parse ISO 8601 dates";

From bfb414d5c6cd496a9c53878f0d96c02d41d12046 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 13:55:25 +0100
Subject: [PATCH 0384/2285] pythonPackages.nose: 1.3.4 -> 1.3.7

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3d333a9214d9..d8d42253df9c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11848,12 +11848,12 @@ in modules // {
   };
 
   nose = buildPythonPackage rec {
-    version = "1.3.4";
+    version = "1.3.7";
     name = "nose-${version}";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/n/nose/${name}.tar.gz";
-      sha256 = "00qymfgwg4iam4xi0w9bnv7lcb3fypq1hzfafzgs1rfmwaj67g3n";
+      sha256 = "f1bffef9cbc82628f6e7d7b40d7e255aefaa1adb6a1b1d26c69a8b79e6208a98";
     };
 
     propagatedBuildInputs = [ self.coverage ];

From 494e6be6bbf4517934e91909faca5261b8760210 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 13:55:46 +0100
Subject: [PATCH 0385/2285] pythonPackages.numba: 0.22.1 -> 0.23.1

Update numba.
Even when executing the correct file, the tests still fail; cannot
import an extension module.
---
 pkgs/top-level/python-packages.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d8d42253df9c..d6182fbec93a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12070,12 +12070,12 @@ in modules // {
   };
 
   numba = buildPythonPackage rec {
-    version = "0.22.1";
+    version = "0.23.1";
     name = "numba-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/n/numba/${name}.tar.gz";
-      sha256 = "8194c41cdf96c16e3b3d246c0381daf4e587d1ada761f410efecb8315c2cdda3";
+      sha256 = "80ce9968591db7c93e36258cc5e6734eb1e42826332799746dc6c073a6d5d317";
     };
 
     NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${pkgs.libcxx}/include/c++/v1";
@@ -12089,6 +12089,14 @@ in modules // {
     #  export NUMBAPRO_LIBDEVICE=
     #'';
 
+    # Copy test script into $out and run the test suite.
+    checkPhase = ''
+      cp runtests.py $out/${python.sitePackages}/numba/runtests.py
+      ${python.interpreter} $out/${python.sitePackages}/numba/runtests.py
+    '';
+    # ImportError: cannot import name '_typeconv'
+    doCheck = false;
+
     meta = {
       homepage = http://numba.pydata.org/;
       license = licenses.bsd2;

From 881dbe42d5f1bc500ce6cc5c1f94e1de18af081f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 13:56:00 +0100
Subject: [PATCH 0386/2285] pythonPackages.qtconsole: 4.1.0 -> 4.1.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 d6182fbec93a..e05afbeb4c42 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17155,12 +17155,12 @@ in modules // {
   };
 
   qtconsole = buildPythonPackage rec {
-    version = "4.1.0";
+    version = "4.1.1";
     name = "qtconsole-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/q/qtconsole/${name}.tar.gz";
-      sha256 = "61fb6e001dd2619a9fe8bd3a096d91c2c794cd9b2c7550a6df27ab6d5d03eb19";
+      sha256 = "741906acae9e02c0df9138ac88b621ef22e438565aa96d783a9ef88faec3de46";
     };
 
     buildInputs = with self; [] ++ optionals isPy27 [mock];

From 84155c4fdb69c186f4a207964c982469da2b3bd9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 13:56:15 +0100
Subject: [PATCH 0387/2285] pythonPackages.recommonmark: 0.2.0 -> 0.4.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e05afbeb4c42..2cc5f6b4c06c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2990,6 +2990,14 @@ in modules // {
     };
   };
 
+  CommonMark_54 = self.CommonMark.override rec {
+    name = "CommonMark-0.5.4";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/C/CommonMark/${name}.tar.gz";
+      sha256 = "34d73ec8085923c023930dfc0bcd1c4286e28a2a82de094bb72fabcc0281cbe5";
+    };
+  };
+
 
   coilmq = buildPythonPackage (rec {
     name = "coilmq-0.6.1";
@@ -17222,15 +17230,15 @@ in modules // {
 
   recommonmark = buildPythonPackage rec {
     name = "recommonmark-${version}";
-    version = "0.2.0";
+    version = "0.4.0";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/r/recommonmark/${name}.tar.gz";
-      sha256 = "28c0babc79c487280fc5bf5daf1f3f1d734e9e4293ba929a7617524ff6911fd7";
+      sha256 = "6e29c723abcf5533842376d87c4589e62923ecb6002a8e059eb608345ddaff9d";
     };
 
     buildInputs = with self; [ pytest sphinx ];
-    propagatedBuildInputs = with self; [ CommonMark docutils ];
+    propagatedBuildInputs = with self; [ CommonMark_54 docutils ];
 
     meta = {
       description = "A docutils-compatibility bridge to CommonMark";

From 569acd33e599a4c1d1761fcc9bc939985d793e36 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 13:56:31 +0100
Subject: [PATCH 0388/2285] pythonPackages.isodate: 0.5.0 -> 0.5.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2cc5f6b4c06c..db41acb205c9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17501,11 +17501,12 @@ in modules // {
   });
 
   isodate = buildPythonPackage rec {
-    name = "isodate-0.5.0";
+    name = "isodate-${version}";
+    version = "0.5.4";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/i/isodate/${name}.tar.gz";
-      md5 = "9a267e9327feb3d021cae26002ba6e0e";
+      sha256 = "42105c41d037246dc1987e36d96f3752ffd5c0c24834dd12e4fdbe1e79544e31";
     };
 
     meta = {

From bb16c26538969fbfcd7ee9894efa3d18c4703697 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 13:57:06 +0100
Subject: [PATCH 0389/2285] pythonPackages.xarray: 0.6.1 -> 0.7.0

Note that xray has been renamed to xarray.
---
 pkgs/top-level/python-packages.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index db41acb205c9..576fab9f8c8f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20979,21 +20979,21 @@ in modules // {
     };
   });
 
-  xray = buildPythonPackage rec {
-    name = "xray-${version}";
-    version = "0.6.1";
+  xarray = buildPythonPackage rec {
+    name = "xarray-${version}";
+    version = "0.7.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/x/xray/${name}.tar.gz";
-      sha256 = "bfbc307203d5433b4da31c210773c8474c237ff97350874b6e436d452fb9dfc8";
+      url = "https://pypi.python.org/packages/source/x/xarray/${name}.tar.gz";
+      sha256 = "b1562e8e2c61f1c3587d557ff48d2bc7be36574d6a8e86f11186c356bdd794cf";
     };
 
-    buildInputs = with self; [nose];
+    buildInputs = with self; [ pytest ];
     propagatedBuildInputs = with self; [numpy pandas];
 
     meta = {
       description = "N-D labeled arrays and datasets in Python";
-      homepage = https://github.com/xray/xray;
+      homepage = https://github.com/pydata/xarray;
       license = licenses.asl20;
       maintainers = with maintainers; [ fridh ];
     };

From 694c2c149a3534fcf04bf76e7501d9683c4d67e5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 13:57:23 +0100
Subject: [PATCH 0390/2285] pythonPackages.traitlets: 4.0.0 -> 4.1.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 576fab9f8c8f..8adcadab8c4e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19781,12 +19781,12 @@ in modules // {
   };
 
   traitlets = buildPythonPackage rec {
-    version = "4.0.0";
+    version = "4.1.0";
     name = "traitlets-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/t/traitlets/${name}.tar.gz";
-      sha256 = "0b140b4a94a4f1951887d9bce4650da211f79600fc9fdb422acc90c5bbe0233b";
+      sha256 = "440e38dfa5d2a26c086d4b427cfb7aed17d0a2dca78bce90c33354da2592af5b";
     };
 
     propagatedBuildInputs = with self; [ipython_genutils decorator];

From 4d3f714217719373b5e06b36b9b906957fe15114 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 13:58:03 +0100
Subject: [PATCH 0391/2285] pythonPackages.ipython_genutils: add maintainer

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8adcadab8c4e..5a74db78c9a1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9768,6 +9768,7 @@ in modules // {
       description = "Vestigial utilities from IPython";
       homepage = http://ipython.org/;
       license = licenses.bsd3;
+      maintainers = with maintainers; [ fridh ];
     };
   };
 

From 891bec3f77a8c8055a146e24fd71108aa197d8cd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 23 Jan 2016 21:13:44 +0100
Subject: [PATCH 0392/2285] pythonPackages.ipython_gen_utils: fix test runner

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5a74db78c9a1..d73a64ad4a2e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9762,7 +9762,12 @@ in modules // {
       sha256 = "3a0624a251a26463c9dfa0ffa635ec51c4265380980d9a50d65611c3c2bd82a6";
     };
 
-    buildInputs = with self; [ pytest ];
+    LC_ALL = "en_US.UTF-8";
+    buildInputs = with self; [ nose pkgs.glibcLocales ];
+
+    checkPhase = ''
+      nosetests -v ipython_genutils/tests
+    '';
 
     meta = {
       description = "Vestigial utilities from IPython";

From 4df253790adc5895185b197f930b9d97929f017f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 13:58:47 +0100
Subject: [PATCH 0393/2285] pythonPackages.python_statsd: remove myself from
 maintainers

No idea how I became maintainer of this package.
---
 pkgs/top-level/python-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d73a64ad4a2e..a863a29780ec 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19271,7 +19271,6 @@ in modules // {
       description = "A client for Etsy's node-js statsd server";
       homepage = https://github.com/WoLpH/python-statsd;
       license = licenses.bsd3;
-      maintainers = with maintainers; [ fridh ];
     };
   };
 

From 8535503556f2c814e8e322b7928a4d5e5566c5c6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 14:26:34 +0100
Subject: [PATCH 0394/2285] pythonPackages.twisted: 11.1 -> 15.5

---
 pkgs/servers/matrix-synapse/default.nix | 2 +-
 pkgs/top-level/python-packages.nix      | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 66d9e7258f4c..714ff9d002c8 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = with pythonPackages; [
     blist canonicaljson daemonize dateutil frozendict pillow pybcrypt pyasn1
     pydenticon pymacaroons-pynacl pynacl pyopenssl pysaml2 pytz requests2
-    service-identity signedjson systemd twisted15 ujson unpaddedbase64 pyyaml
+    service-identity signedjson systemd twisted ujson unpaddedbase64 pyyaml
     matrix-angular-sdk
   ];
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a863a29780ec..dd3df2310c9c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18216,7 +18216,7 @@ in modules // {
       md5 = "f16f4237c9ee483a0cd13208849d96ad";
     };
 
-    propagatedBuildInputs = with self; [ twisted15 ];
+    propagatedBuildInputs = with self; [ twisted ];
 
     meta = {
       description = "setuptools plug-in that helps run unit tests built with the \"Trial\" framework (from Twisted)";
@@ -20176,7 +20176,7 @@ in modules // {
     };
   };
 
-  twisted = buildPythonPackage rec {
+  twisted_11 = buildPythonPackage rec {
     # NOTE: When updating please check if new versions still cause issues
     # to packages like carbon (http://stackoverflow.com/questions/19894708/cant-start-carbon-12-04-python-error-importerror-cannot-import-name-daem)
     disabled = isPy3k;
@@ -20207,7 +20207,7 @@ in modules // {
     };
   };
 
-  twisted15 = buildPythonPackage rec {
+  twisted = buildPythonPackage rec {
     disabled = isPy3k;
 
     name = "Twisted-15.5.0";

From 1ae037ee28978c65a61623a6bad554e8bfffb728 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 16:15:38 +0100
Subject: [PATCH 0395/2285] pythonPackages.line_profiler: disable for pypy

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dd3df2310c9c..421fb59a8aaa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10313,6 +10313,8 @@ in modules // {
 
     buildInputs = with self; [ cython ];
 
+    disabled = isPyPy;
+
     meta = {
       description = "Line-by-line profiler";
       homepage = https://github.com/rkern/line_profiler;

From 6c8ebec7db678f3dda7799348ec8739721edc811 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 16:15:27 +0100
Subject: [PATCH 0396/2285] pythonPackages.scripttest: Disable tests

Tests are not included. Nose is also not required.
---
 pkgs/top-level/python-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 421fb59a8aaa..47cb218d15b0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18109,7 +18109,10 @@ in modules // {
       md5 = "1d1c5117ccfc7b5961cae6c1020c0848";
     };
 
-    buildInputs = with self; [ nose pytest ];
+    buildInputs = with self; [ pytest ];
+
+    # Tests are not included. See https://github.com/pypa/scripttest/issues/11
+    doCheck = false;
 
     meta = {
       description = "A library for testing interactive command-line applications";

From 2ea4d056b6a9489130f03f9224e8c0a879550d63 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 16:39:32 +0100
Subject: [PATCH 0397/2285] pythonPackages.doctest-ignore-unicode: init at
 0.1.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 47cb218d15b0..0c11b1cedc96 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4587,6 +4587,24 @@ in modules // {
     };
   };
 
+  doctest-ignore-unicode = buildPythonPackage rec {
+    name = "doctest-ignore-unicode-${version}";
+    version = "0.1.2";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/doctest-ignore-unicode/${name}.tar.gz";
+      sha256= "fc90b2d0846477285c6b67fc4cb4d6f39fcf76d8752f4df0a241486f31512ad5";
+    };
+
+    propagatedBuildInputs = with self; [ nose ];
+
+    meta = {
+      description = "Add flag to ignore unicode literal prefixes in doctests";
+      license = with licenses; [ asl20 ];
+      homepage = http://github.com/gnublade/doctest-ignore-unicode;
+    };
+  };
+
   dogpile_cache = buildPythonPackage rec {
     name = "dogpile.cache-0.5.4";
 
@@ -11429,6 +11447,7 @@ in modules // {
       sha256 = "1fhn123hy4qj0zmmmbx0q0r4hwikay13yirsp74niiw5d52y7ib8";
     };
 
+    buildInputs = with self; [ doctest-ignore-unicode ];
     propagatedBuildInputs = [ pkgs.graphviz pkgs.pkgconfig ];
 
     meta = {

From d216359528a5a434b49b4b3fe5f597ccf9e8daee Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 16:58:09 +0100
Subject: [PATCH 0398/2285] pythonPackages.carbon: 0.9.12 -> 0.9.15

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0c11b1cedc96..79c8c35fb898 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22166,18 +22166,15 @@ in modules // {
 
   carbon = buildPythonPackage rec {
     name = "carbon-${version}";
-    version = "0.9.12";
+    version = "0.9.15";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/c/carbon/${name}.tar.gz";
-      md5 = "66967d5a622fd29973838fcd10eb34f3";
+      sha256 = "f01db6d37726c6fc0a8aaa66a7bf14436b0dd0d62ef3c20ecb31605a4d365d2e";
     };
 
     propagatedBuildInputs = with self; [ whisper txamqp zope_interface twisted ];
 
-    # error: invalid command 'test'
-    doCheck = false;
-
     meta = {
       homepage = http://graphite.wikidot.com/;
       description = "Backend data caching and persistence daemon for Graphite";

From d0856b377180c6bc3578a5de4d9037a4754ef8b2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 19:08:14 +0100
Subject: [PATCH 0399/2285] pythonPackages.oauth2: 1.5.211 -> 1.9.0.post1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 79c8c35fb898..858daabf4734 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12335,12 +12335,12 @@ in modules // {
   });
 
   oauth2 = buildPythonPackage (rec {
-    name = "oauth2-1.5.211";
-    disabled = isPy3k;
+    name = "oauth2-${version}";
+    version = "1.9.0.post1";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/o/oauth2/oauth2-1.5.211.tar.gz";
-      sha256 = "82a38f674da1fa496c0fc4df714cbb058540bed72a30c50a2e344b0d984c4d21";
+      url = "http://pypi.python.org/packages/source/o/oauth2/${name}.tar.gz";
+      sha256 = "c006a85e7c60107c7cc6da1b184b5c719f6dd7202098196dfa6e55df669b59bf";
     };
 
     propagatedBuildInputs = with self; [ httplib2 ];

From 97762604753bb25a3feec511059050c7b5126f8c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 19:24:45 +0100
Subject: [PATCH 0400/2285] pythonPackages.pygraphviz: 1.3 -> 1.3.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 858daabf4734..de738a619a4f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11439,12 +11439,12 @@ in modules // {
   };
 
   pygraphviz = buildPythonPackage rec {
-    version = "1.3";
+    version = "1.3.1";
     name = "pygraphviz-${version}";
 
     src = pkgs.fetchurl {
       url = "https://github.com/pygraphviz/pygraphviz/archive/${name}.tar.gz";
-      sha256 = "1fhn123hy4qj0zmmmbx0q0r4hwikay13yirsp74niiw5d52y7ib8";
+      sha256 = "7c294cbc9d88946be671cc0d8602aac176d8c56695c0a7d871eadea75a958408";
     };
 
     buildInputs = with self; [ doctest-ignore-unicode ];

From 6b1065e98b71f906875f5edb51031541a5a244ae Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 19:25:10 +0100
Subject: [PATCH 0401/2285] pythonPackages.psutil: 2.1.1 -> 3.4.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index de738a619a4f..c0b6d1eb49dd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14862,17 +14862,23 @@ in modules // {
 
   psutil = buildPythonPackage rec {
     name = "psutil-${version}";
-    version = "2.1.1";
+    version = "3.4.2";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/psutil/${name}.tar.gz";
-      sha256 = "14smqj57yjrm6hjz5n2annkgv0kmxckdhqvfx784f4d4lr52m0dz";
+      sha256 = "b17fa01aa766daa388362d0eda5c215d77e03a8d37676b68971f37bf3913b725";
     };
 
-    # failed tests: https://code.google.com/p/psutil/issues/detail?id=434
+    # Certain tests fail due to being in a chroot.
+    # See also the older issue: https://code.google.com/p/psutil/issues/detail?id=434
     doCheck = false;
 
-    buildInputs = optional stdenv.isDarwin pkgs.darwin.IOKit;
+    checkPhase = ''
+      ${python.interpreter} test/test_psutil.py
+    '';
+
+    # Test suite needs `free`, therefore we have pkgs.busybox
+    buildInputs = with self; [ mock pkgs.busybox] ++ optionals stdenv.isDarwin [ pkgs.darwin.IOKit ];
 
     meta = {
       description = "Process and system utilization information interface for python";

From 901d2c3074256611855e64e7df1e82a540c6c984 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 19:31:02 +0100
Subject: [PATCH 0402/2285] pythonPackages.tqdm: 3.1.4 -> 3.7.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c0b6d1eb49dd..527218396371 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19977,11 +19977,11 @@ in modules // {
 
   tqdm = buildPythonPackage rec {
     name = "tqdm-${version}";
-    version = "3.1.4";
+    version = "3.7.1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/t/tqdm/${name}.tar.gz";
-      sha256 = "e2dbef0df0fd24c9ae3b2e07bef2a3607ad8431142e76d3294a5a11926d214bf";
+      sha256 = "f12d792685f779e8754e623aff1a25a93b98a90457e3a2b7eb89b4401c2c239e";
     };
 
     buildInputs = with self; [ nose coverage pkgs.glibcLocales flake8 ];

From cebb7a13f205b32c7e99ef1cc7072f2c62279991 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 19:31:13 +0100
Subject: [PATCH 0403/2285] pythonPackages.terminado: 0.5 -> 0.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 527218396371..5d083591b482 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19664,11 +19664,11 @@ in modules // {
 
   terminado = buildPythonPackage rec {
     name = "terminado-${version}";
-    version = "0.5";
+    version = "0.6";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/t/terminado/${name}.tar.gz";
-      sha256 = "63e893eff1ba84f1ee7c4bfcca7676ba1de6394538bb9aa80cbbc8866cb875b6";
+      sha256 = "2c0ba1f624067dccaaead7d2247cfe029806355cef124dc2ccb53c83229f0126";
     };
 
     propagatedBuildInputs = with self; [ ptyprocess tornado ];

From 3f928e47028d9be2ea542757c3fe8e83180a595e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 19:46:04 +0100
Subject: [PATCH 0404/2285] pythonPackages.pytz: 2015.4 -> 2015.7

---
 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 5d083591b482..7f51bf13a0e4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16797,11 +16797,11 @@ in modules // {
 
   pytz = buildPythonPackage rec {
     name = "pytz-${version}";
-    version = "2015.4";
+    version = "2015.7";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/p/pytz/${name}.tar.bz2";
-      md5 = "39f7375c4b1fa34cdcb4b4765d08f817";
+      url = "http://pypi.python.org/packages/source/p/pytz/${name}.tar.gz";
+      sha256 = "99266ef30a37e43932deec2b7ca73e83c8dbc3b9ff703ec73eca6b1dae6befea";
     };
 
     meta = {

From 9cbfa6640ac97b5c88be1a8a1f8386f9c7a3d7f6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 19:46:22 +0100
Subject: [PATCH 0405/2285] pythonPackages.pyzmq: 14.5 -> 15.2

---
 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 7f51bf13a0e4..32ed677bc430 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21952,12 +21952,12 @@ in modules // {
   };
 
   pyzmq = buildPythonPackage rec {
-    name = "pyzmq-14.5.0";
+    name = "pyzmq-15.2.0";
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/p/pyzmq/${name}.tar.gz";
-      sha256 = "1gbpgz4ngfw5x6zlsa1k0jwy5vd5wg9iz1shdx4zav256ib08vjx";
+      sha256 = "2dafa322670a94e20283aba2a44b92134d425bd326419b68ad4db8d0831a26ec";
     };
-    buildInputs = with self; [ pkgs.zeromq3 pytest];
+    buildInputs = with self; [ pkgs.zeromq3 pytest tornado ];
     propagatedBuildInputs = [ self.py ];
     checkPhase = ''
       py.test $out/${python.sitePackages}/zmq/

From 4f31a4b99363545b29e601d3071783576997085b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 19:55:15 +0100
Subject: [PATCH 0406/2285] pythonPackages.rsa: 3.1.4 -> 3.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 32ed677bc430..fdda083d38d1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17819,14 +17819,19 @@ in modules // {
   };
 
   rsa = buildPythonPackage rec {
-    name = "rsa-3.1.4";
+    name = "rsa-${version}";
+    version = "3.3";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/r/rsa/${name}.tar.gz";
-      sha256 = "1842ghkkimzf4fi3np4vwbwnsriv4d9malp1sbnv2xn26rcv1c72";
+      sha256 = "03f3d9bebad06681771016b8752a40b12f615ff32363c7aa19b3798e73ccd615";
     };
 
-    buildInputs = with self; [ self.pyasn1 ];
+    buildInputs = with self; [ pyasn1 unittest2 ];
+
+    checkPhase = ''
+      ${python.interpreter} run_tests.py
+    '';
 
     meta = {
       homepage = http://stuvel.eu/rsa;

From a2805e5f33ce73b95d7809fd6b202bb3056b1e2b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 20:06:13 +0100
Subject: [PATCH 0407/2285] pythonPackages.shapely: 1.3.1 -> 1.5.13

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fdda083d38d1..72723b0c4cb2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18475,14 +18475,17 @@ in modules // {
   };
 
   shapely = buildPythonPackage rec {
-    name = "Shapely-1.3.1";
+    name = "Shapely-${version}";
+    version = "1.5.13";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/S/Shapely/${name}.tar.gz";
-      sha256 = "099sc7ajpp6hbgrx3c0bl6hhkz1mhnr0ahvc7s4i3f3b7q1zfn7l";
+      sha256 = "68f8efb43112e8ef1f7e56e2c9eef64e0cbc1c19528c627696fb07345075a348";
     };
 
-    buildInputs = with self; [ pkgs.geos pkgs.glibcLocales ];
+    buildInputs = with self; [ pkgs.geos pkgs.glibcLocales pytest ];
+
+    propagatedBuildInputs = with self; [ numpy ];
 
     preConfigure = ''
       export LANG="en_US.UTF-8";
@@ -18492,7 +18495,11 @@ in modules // {
       sed -i "s|_lgeos = load_dll('geos_c', fallbacks=.*)|_lgeos = load_dll('geos_c', fallbacks=['${pkgs.geos}/lib/libgeos_c.so'])|" shapely/geos.py
     '';
 
-    doCheck = false; # won't suceed for unknown reasons that look harmless, though
+    # Error when importing extension types. Happens also after install
+
+    checkPhase = ''
+      py.test tests
+    '';
 
     meta = {
       description = "Geometric objects, predicates, and operations";

From 0ae31562d40e6b0a12c60f3e9855b27f61235a67 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 20:14:44 +0100
Subject: [PATCH 0408/2285] pythonPackages.flake8: 2.5.0 -> 2.5.1

---
 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 72723b0c4cb2..bf1d02e970b1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8324,12 +8324,13 @@ in modules // {
     };
   };
 
-  flake8 = buildPythonPackage (rec {
-    name = "flake8-2.5.0";
+  flake8 = buildPythonPackage rec {
+    name = "flake8-${version}";
+    version = "2.5.1";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/f/flake8/${name}.tar.gz";
-      sha256 = "137qwipa4z6z8z7n0zg7kg6qi3348l8ck6zqa4yyjah9xv3ch5l2";
+      sha256 = "448aed48b0671fe6062f47b98c3081f3a4b36fbe99ddb8ac2a3be6e6cb135603";
     };
 
     buildInputs = with self; [ nose mock ];
@@ -8341,7 +8342,7 @@ in modules // {
       license = licenses.mit;
       maintainers = with maintainers; [ garbas ];
     };
-  });
+  };
 
   flask = buildPythonPackage {
     name = "flask-0.10.1";

From f2dd69a7369b6527ef2ba8141a05e09cee4f2a97 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 20:15:47 +0100
Subject: [PATCH 0409/2285] pythonPackages.pep8: 1.5.7 -> 1.7.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bf1d02e970b1..7ec7555067dd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14223,14 +14223,11 @@ in modules // {
 
   pep8 = buildPythonPackage rec {
     name = "pep8-${version}";
-    # 1.6.0 and higher are blocked by flake8
-    version = "1.5.7";
-
-    disabled = isPy35; # Not yet supported
+    version = "1.7.0";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/p/pep8/${name}.tar.gz";
-      sha256 = "12b9bbdbwnspxgak14xg58c130x2n0blxzlms5jn2dszn8qj3d0m";
+      sha256 = "a113d5f5ad7a7abacef9df5ec3f2af23a20a28005921577b15dd584d099d5900";
     };
 
     meta = {

From 2c866e479ad62f0d85343a417d781d03be8dbb43 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 20:27:45 +0100
Subject: [PATCH 0410/2285] pythonPackages: move LC_ALL="en_US.UTF-8"; out of
 phases

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7ec7555067dd..56ee1bf25d49 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4229,9 +4229,7 @@ in modules // {
 
     buildInputs = [ pkgs.glibcLocales ];
 
-    preBuild = ''
-      export LC_ALL="en_US.UTF-8"
-    '';
+    LC_ALL="en_US.UTF-8";
 
     meta = {
       description = "Powerful extensions to the standard datetime module";
@@ -5482,9 +5480,7 @@ in modules // {
 
     buildInputs = [ pkgs.glibcLocales ];
 
-    preBuild = ''
-      export LC_ALL="en_US.UTF-8"
-    '';
+    LC_ALL="en_US.UTF-8";
 
     # TODO: AppIndicator
     propagatedBuildInputs = with self; [ pkgs.gobjectIntrospection pygobject3 pkgs.makeWrapper pkgs.gtk3 ];
@@ -8217,9 +8213,7 @@ in modules // {
 
     buildInputs = [ pkgs.glibcLocales ];
 
-    preConfigure = ''
-      export LC_ALL="en_US.UTF-8"
-    '';
+    LC_ALL="en_US.UTF-8";
 
     propagatedBuildInputs = with self; [ six pytz ];
 
@@ -9301,9 +9295,7 @@ in modules // {
       sha256 = "1d2za9crkgzildx610w3zif2i8phcqhh6n8nzg3yvy2mg0s18mkl";
     };
 
-    preBuild = ''
-      export LC_ALL="en_US.UTF-8"
-    '';
+    LC_ALL="en_US.UTF-8";
 
     buildInputs = with self; [ six pkgs.glibcLocales ];
 
@@ -10844,9 +10836,10 @@ in modules // {
     # sed calls will be unecessary in v3.1.11+
     preConfigure = ''
       sed -i 's/==/>=/' setup.py
-      export LC_ALL="en_US.UTF-8"
     '';
 
+    LC_ALL="en_US.UTF-8";
+
     meta = {
       description = ''
         A content management platform built using the Django framework
@@ -10953,9 +10946,7 @@ in modules // {
       sed -i 's/requests.*"/requests"/' setup.py
     '';
 
-    preBuild = ''
-      export LC_ALL="en_US.UTF-8"
-    '';
+    LC_ALL="en_US.UTF-8";
 
     postInstall = ''
       mkdir -p $out/lib
@@ -11212,10 +11203,7 @@ in modules // {
 
     buildInputs = [ pkgs.glibcLocales self.mock ];
 
-    # some files in tests dir include unicode names
-    preBuild = ''
-      export LC_ALL="en_US.UTF-8"
-    '';
+    LC_ALL="en_US.UTF-8";
 
     propagatedBuildInputs = with self; [ argparse jinja2 six modules.readline ] ++
                             (optionals isPy26 [ importlib ordereddict ]);
@@ -11297,9 +11285,7 @@ in modules // {
 
     buildInputs = [ pkgs.glibcLocales ];
 
-    preCheck = ''
-      export LC_ALL="en_US.UTF-8"
-    '';
+    LC_ALL="en_US.UTF-8";
 
     meta = {
       homepage = http://alastair/python-musicbrainz-ngs;
@@ -14209,9 +14195,7 @@ in modules // {
       sed -i -e "s|'git'|'${pkgs.git}/bin/git'|" pelican/tests/test_pelican.py
     '';
 
-    preConfigure = ''
-      export LC_ALL="en_US.UTF-8"
-    '';
+    LC_ALL="en_US.UTF-8";
 
     meta = {
       description = "A tool to generate a static blog from reStructuredText or Markdown input files";
@@ -18116,8 +18100,10 @@ in modules // {
     buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ];
     propagatedBuildInputs = with self; [ numpy scipy pkgs.openblas ];
 
+    LC_ALL="en_US.UTF-8";
+
     checkPhase = ''
-      LC_ALL="en_US.UTF-8" HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests $out/${python.sitePackages}/sklearn/
+      HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests $out/${python.sitePackages}/sklearn/
     '';
 
     meta = {
@@ -18672,9 +18658,7 @@ in modules // {
     };
 
 
-    preBuild = ''
-      export LC_ALL="en_US.UTF-8"
-    '';
+    LC_ALL="en_US.UTF-8";
 
     checkPhase = ''
       ${python.interpreter} test_clint.py
@@ -19413,9 +19397,7 @@ in modules // {
     name = "sure-${version}";
     version = "1.2.24";
 
-    preBuild = ''
-      export LC_ALL="en_US.UTF-8"
-    '';
+    LC_ALL="en_US.UTF-8";
 
     disabled = isPyPy;
 
@@ -19997,9 +19979,7 @@ in modules // {
     buildInputs = with self; [ nose coverage pkgs.glibcLocales flake8 ];
     propagatedBuildInputs = with self; [ matplotlib pandas ];
 
-    preBuild = ''
-      export LC_ALL="en_US.UTF-8"
-    '';
+    LC_ALL="en_US.UTF-8";
 
     doCheck = false; # Many transient failures in performance tests and due to use of sleep
 
@@ -22225,9 +22205,7 @@ in modules // {
       sha256 = "12hhblqy1ajvidm38im4171x4arg83pfmziyn53nizp29p3m14gi";
     };
 
-    preBuild = ''
-      export LC_ALL="en_US.UTF-8"
-    '';
+    LC_ALL="en_US.UTF-8";
 
     buildInputs = [ pkgs.glibcLocales ];
 
@@ -23780,9 +23758,9 @@ in modules // {
     };
     disabled = isPyPy;
     buildInputs = [ pkgs.glibcLocales ];
-    preConfigure = ''
-      export LC_ALL="en_US.UTF-8"
-    '';
+
+    LC_ALL="en_US.UTF-8";
+
     meta = {
       description = "Copy your docs directly to the gh-pages branch.";
       homepage = "http://github.com/davisp/ghp-import";

From a94703dbb2722f668cd206e2fe7be3f41fd43835 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 20:40:11 +0100
Subject: [PATCH 0411/2285] pythonPackages.shortuuid: 0.4.2 -> 0.4.3

---
 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 56ee1bf25d49..ae41dcb4a326 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18265,13 +18265,13 @@ in modules // {
 
   shortuuid = buildPythonPackage rec {
     name = "shortuuid-${version}";
-    version = "0.4.2";
+    version = "0.4.3";
 
     disabled = isPy26;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/s/shortuuid/${name}.tar.gz";
-      md5 = "142e3ae4e7cd32d41a71deb359db4cfe";
+      sha256 = "4606dbb19124d98109c00e2cafae2df8117aec02115623e18fb2abe3f766d293";
     };
 
     buildInputs = with self; [pep8];

From ec5ca4c55d8fc2ccdbf3d8eb9d9247ed352f16cf Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 21:37:43 +0100
Subject: [PATCH 0412/2285] pythonPackages.umalqurra: init at 0.2

This package has no license specified, so I use public domain here.
---
 pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ae41dcb4a326..84e4a7d9098b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20276,6 +20276,25 @@ in modules // {
     };
   };
 
+  umalqurra = buildPythonPackage rec {
+    name = "umalqurra-${version}";
+    version = "0.2";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/u/umalqurra/umalqurra-0.2.tar.gz";
+      sha256 = "719f6a36f908ada1c29dae0d934dd0f1e1f6e3305784edbec23ad719397de678";
+    };
+
+    # See for license
+    # https://github.com/tytkal/python-hijiri-ummalqura/issues/4
+    meta = {
+      description = "Date Api that support Hijri Umalqurra calendar";
+      homepage = https://github.com/tytkal/python-hijiri-ummalqura;
+      license = with licenses; [ publicDomain ];
+    };
+
+  };
+
   umemcache = buildPythonPackage rec {
     name = "umemcache-${version}";
     version = "1.6.3";

From 46ef50e7ca109276e50b92b9035265f6370e1ccc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 21:38:04 +0100
Subject: [PATCH 0413/2285] pythonPackages.dateparser: 0.3.1 ->
 0.3.2-pre-2016-01-21

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 84e4a7d9098b..a8ec533e62c0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4159,26 +4159,32 @@ in modules // {
     };
   });
 
-  dateparser = buildPythonPackage (rec {
+  dateparser = buildPythonPackage rec {
     name = "dateparser-${version}";
-    version = "0.3.1";
-    disabled = isPy3k;
+    version = "0.3.2-pre-2016-01-21"; # Fix assert year 2016 == 2015
 
-    src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/d/dateparser/${name}.tar.gz";
-      sha256 = "56c291a45398e9172d53201ac213226989295749191c1f02d8f3b593b6f88e48";
+    src = pkgs.fetchgit {
+      url = "https://github.com/scrapinghub/dateparser.git";
+      rev = "d20a63f1d1cee5b4bd19c9f745774cfa9f219549";
+      sha256 = "f04f75d013ba2896681ffeb3669d78e4c496236121da751b89ff0b4a4053f771";
     };
 
-    buildInputs = with self; [ nose nose-parameterized mock ];
+    # Does not seem to work on Python 3 because of relative import.
+    # Upstream Travis configuration is wrong and tests only 2.7
+    disabled = isPy3k;
 
-    propagatedBuildInputs = with self; [ self.six jdatetime pyyaml dateutil ];
+    LC_ALL = "en_US.UTF-8";
+
+    buildInputs = with self; [ nose nose-parameterized mock pkgs.glibcLocales ];
+
+    propagatedBuildInputs = with self; [ six jdatetime pyyaml dateutil umalqurra pytz ];
 
     meta = {
       description = "Date parsing library designed to parse dates from HTML pages";
       homepage = http://pypi.python.org/pypi/dateparser;
       license = licenses.bsd3;
     };
-  });
+  };
 
   dateutil = buildPythonPackage (rec {
     name = "dateutil-${version}";

From 91c5fc3aa9cf64da4f141678b6f44bd7f0098441 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 21:58:42 +0100
Subject: [PATCH 0414/2285] pythonPackages.ledger-autosync: add missing
 buildInput nose

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a8ec533e62c0..df42dd850a12 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5819,11 +5819,14 @@ in modules // {
       sha256 = "f19fa66e656309825887171d84a462e64676b1cc36b62e4dd8679ff63926a469";
     };
 
-    buildInputs = [
-      self.ofxclient self.mock
+    buildInputs = with self; [
+      ofxclient
+      mock
+      nose
       # Used at runtime to translate ofx entries to the ledger
       # format. In fact, user could use either ledger or hledger.
-      pkgs.which pkgs.ledger ];
+      pkgs.which
+      pkgs.ledger ];
 
     # Tests are disable since they require hledger and python-ledger
     doCheck = false;

From 5c565856be654072db745fa08c9c5ab28c00c43b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 23:17:19 +0100
Subject: [PATCH 0415/2285] pythonPackages.pathpy: 7.6 -> 8.1.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index df42dd850a12..09dc0e9c7fbe 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14094,15 +14094,17 @@ in modules // {
   };
 
   pathpy = buildPythonPackage rec {
-    version = "7.6";
+    version = "8.1.2";
     name = "path.py-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/path.py/${name}.tar.gz";
-      sha256 = "5cdf60f359f1add18f8556c9a1855cbd1d517f0780e3d386c256515f698ba0e0";
+      sha256 = "ada95d117c4559abe64080961daf5badda68561afdd34c278f8ca20f2fa466d2";
     };
 
-    buildInputs = with self; [setuptools_scm pytestrunner pytest];
+    buildInputs = with self; [setuptools_scm pytestrunner pytest pkgs.glibcLocales ];
+
+    LC_ALL="en_US.UTF-8";
 
     meta = {
       description = "A module wrapper for os.path";
@@ -14110,10 +14112,9 @@ in modules // {
       license = licenses.mit;
     };
 
-    # Test fails with python 2.7: TestUnicodePaths.test_walkdirs_with_unicode_name
-    # Also during tests with python 3.4: RuntimeError: dictionary changed size during iteration
-    # Caused by pytestrunner
-    doCheck = false;
+    checkPhase = ''
+      py.test test_path.py
+    '';
   };
 
   paypalrestsdk = buildPythonPackage rec {

From e0d0f8dbd2a4980e7a65e702064ffdaa3427c253 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 23 Jan 2016 12:09:44 +0100
Subject: [PATCH 0416/2285] pythonPackages.setuptools and bootstrapped-pip:
 18.2 -> 19.4

Update to latest setuptools. Latest setuptools will always try to run tests.
This can cause some very vague errors. We now need to fix all packages where we do not
invoke the correct test runner.
---
 .../python-modules/bootstrapped-pip/default.nix           | 4 ++--
 pkgs/development/python-modules/setuptools/default.nix    | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 677736270290..43f8cca4c827 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -6,8 +6,8 @@ let
     sha256 = "1sl642ncvipqx0hzypvl5hsiqngy0sib0kq242g4mic7vnid6bn9";
   };
   setuptools_source = fetchurl {
-    url = "https://pypi.python.org/packages/3.4/s/setuptools/setuptools-18.2-py2.py3-none-any.whl";
-    sha256 = "0jhafl8wmjc8xigl1ib5hqiq9crmipcz0zcga52riymgqbf2bzh4";
+    url = "https://pypi.python.org/packages/3.5/s/setuptools/setuptools-19.4-py2.py3-none-any.whl";
+    sha256 = "0801e6d862ca4ce24d918420d62f07ee2fe736dc016e3afa99d2103e7a02e9a6";
   };
 in stdenv.mkDerivation rec {
   name = "python-${python.version}-bootstrapped-pip-${version}";
diff --git a/pkgs/development/python-modules/setuptools/default.nix b/pkgs/development/python-modules/setuptools/default.nix
index 082a16056fd0..74624063ba3c 100644
--- a/pkgs/development/python-modules/setuptools/default.nix
+++ b/pkgs/development/python-modules/setuptools/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, python, wrapPython }:
+{ stdenv, lib, fetchurl, python, wrapPython }:
 
 stdenv.mkDerivation rec {
   shortName = "setuptools-${version}";
   name = "${python.executable}-${shortName}";
 
-  version = "18.2";  # 18.4 breaks python34Packages.characteristic and many others
+  version = "19.4";  # 18.4 and up breaks python34Packages.characteristic and many others
 
   src = fetchurl {
     url = "http://pypi.python.org/packages/source/s/setuptools/${shortName}.tar.gz";
-    sha256 = "07avbdc26yl2a46s76fc7m4vg611g8sh39l26x9dr9byya6sb509";
+    sha256 = "214bf29933f47cf25e6faa569f710731728a07a19cae91ea64f826051f68a8cf";
   };
 
   buildInputs = [ python wrapPython ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Utilities to facilitate the installation of Python packages";
     homepage = http://pypi.python.org/pypi/setuptools;
-    license = [ "PSF" "ZPL" ];
+    license = with lib.licenses; [ psfl zpt20 ];
     platforms = platforms.all;
   };
 }

From cb69ea969b3bc2c48c481524e7b6b2b458f3aa62 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 23 Jan 2016 12:32:06 +0100
Subject: [PATCH 0417/2285] pythonPackages.six: use correct test runner

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 09dc0e9c7fbe..72e9cc2fa50c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18848,6 +18848,12 @@ in modules // {
       sha256 = "0snmb8xffb3vsma0z67i0h0w2g2dy0p3gsgh9gi4i0kgc5l8spqh";
     };
 
+    buildInputs = with self; [ pytest ];
+
+    checkPhase = ''
+      py.test test_six.py
+    '';
+
     meta = {
       description = "A Python 2 and 3 compatibility library";
       homepage = http://pypi.python.org/pypi/six/;

From 30623449cf8dd6b168f06c81f8c08e5e6c908954 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 23 Jan 2016 16:51:25 +0100
Subject: [PATCH 0418/2285] pythonPackages.click: run correct test runner

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 72e9cc2fa50c..ef5431d43b0f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2824,6 +2824,15 @@ in modules // {
       sha256 = "10kavbisnk9m93jl2wi34pw7ryr2qbxshh2cysxwxd7bymqgz87v";
     };
 
+    buildInputs = with self; [ pytest ];
+
+    checkPhase = ''
+      py.test tests
+    '';
+
+    # Python 3.5 str/bytes-like errors with reading files
+    doCheck = !isPy3k;
+
     meta = {
       homepage = http://click.pocoo.org/;
       description = "Create beautiful command line interfaces in Python";

From 05b7ad66123cd68cd0f248bba4cf588abb49f965 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 23 Jan 2016 17:08:38 +0100
Subject: [PATCH 0419/2285] pythonPackages.py: Disable tests due to circular
 dependency

Since we weren't invoking the correct test runner (py.test) the tests
weren't actually ran. Nevertheless, we won't be possible to run them
because of a circular dependency so let's disable them.
---
 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 ef5431d43b0f..bae0cffcba46 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14943,8 +14943,8 @@ in modules // {
       sha256 = "a6501963c725fc2554dabfece8ae9a8fb5e149c0ac0a42fd2b02c5c1c57fc114";
     };
 
-    # some weird errors with paths
-    # doCheck = !isPy3k;
+    # Circular dependency on pytest
+    doCheck = false;
 
     meta = {
       description = "Library with cross-python path, ini-parsing, io, code, log facilities";

From 3633eea4d0489c829926cc9cec7ed40f329dc7b4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 23 Jan 2016 17:17:11 +0100
Subject: [PATCH 0420/2285] pythonPackages.xlrd: 0.9.3 -> 0.9.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bae0cffcba46..a2381c61a8a6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13928,10 +13928,10 @@ in modules // {
 
   xlrd = buildPythonPackage rec {
     name = "xlrd-${version}";
-    version = "0.9.3";
+    version = "0.9.4";
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/x/xlrd/xlrd-${version}.tar.gz";
-      sha256 = "174ks80h0g9p67ahnakf0y7di3gvbhxvb1jlk097gvd7gpi3aflk";
+      sha256 = "8e8d3359f39541a6ff937f4030db54864836a06e42988c452db5b6b86d29ea72";
     };
   };
 

From 8e8f1b14d0cc4190bdb14c4bc89061ca63b572c3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 23 Jan 2016 17:40:24 +0100
Subject: [PATCH 0421/2285] pythonPackages.mock: invoke correct test runner

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a2381c61a8a6..feda966981d5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11049,6 +11049,10 @@ in modules // {
     buildInputs = with self; [ unittest2 ];
     propagatedBuildInputs = with self; [ funcsigs six pbr ];
 
+    checkPhase = ''
+      ${python.interpreter} -m unittest discover
+    '';
+
     meta = {
       description = "Mock objects for Python";
       homepage = http://python-mock.sourceforge.net/;

From 7c2af9fe4f66844c0befa1119524741aabb6141f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 23 Jan 2016 18:54:36 +0100
Subject: [PATCH 0422/2285] pythonPackages.cython: disable tests

Fixed invocation of test suite. Disabled tests due to compiler errors
and testing taking a very long time.
---
 pkgs/top-level/python-packages.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index feda966981d5..4423e1a1db89 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3282,7 +3282,13 @@ in modules // {
       sha256 = "13hdffhd37mx3gjby018xl179jaj957fy7kzi01crmimxvn2zi7y";
     };
 
-    buildInputs = with self; [ pkgs.pkgconfig ];
+    buildInputs = with self; [ pkgs.pkgconfig pkgs.gdb ];
+
+    checkPhase = ''
+      ${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";

From 541fe51a5125ebd61db8099d24561854be0de821 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 23 Jan 2016 19:00:09 +0100
Subject: [PATCH 0423/2285] pythonPackages.bottleneck: fix test runner

---
 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 4423e1a1db89..c8bbafd884fc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13952,7 +13952,12 @@ in modules // {
       url = "https://pypi.python.org/packages/source/B/Bottleneck/Bottleneck-${version}.tar.gz";
       sha256 = "15dl0ll5xmfzj2fsvajzwxsb9dbw5i9fx9i4r6n4i5nzzba7m6wd";
     };
+
+    buildInputs = with self; [ nose ];
     propagatedBuildInputs = [self.numpy];
+    checkPhase = ''
+      nosetests -v $out/${python.sitePackages}
+    '';
   };
 
   paho-mqtt = buildPythonPackage rec {

From a1618008655c8758bab8963436a5461e51361379 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 23 Jan 2016 19:41:26 +0100
Subject: [PATCH 0424/2285] pythonPackages.cytoolz: fix test runner, disable
 tests for 3.5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c8bbafd884fc..66f62f9e825c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3311,10 +3311,12 @@ in modules // {
     buildInputs = with self; [ nose ];
 
     checkPhase = ''
-      nosetests cytoolz/tests
+      nosetests -v $out/${python.sitePackages}
     '';
 
-    doCheck = false; # Cannot import the extension module
+    # Several tests fail with Python 3.5
+    # https://github.com/pytoolz/cytoolz/issues/73
+    doCheck = !isPy35;
 
     meta = {
       homepage = "http://github.com/pytoolz/cytoolz/";

From 18ae7a182bae3b6f023d8e8b35556e939bc8ab95 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 23 Jan 2016 20:47:49 +0100
Subject: [PATCH 0425/2285] pythonPackages.pexpect: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 66f62f9e825c..2f300fcbb4f5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14322,6 +14322,9 @@ in modules // {
       sha256 = "dfea618d43e83cfff21504f18f98019ba520f330e4142e5185ef7c73527de5ba";
     };
 
+    # Wants to run python in a subprocess
+    doCheck = false;
+
     meta = {
       homepage = http://www.noah.org/wiki/Pexpect;
       description = "Automate interactive console applications such as ssh, ftp, etc";

From a086b364dafca9f80eb2690c561b8a108ba94bbf Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 23 Jan 2016 20:50:59 +0100
Subject: [PATCH 0426/2285] pythonPackages.qrcode: disable for python 3.x

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2f300fcbb4f5..45b90c934c71 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19950,6 +19950,10 @@ in modules // {
       sha256 = "0skzrvhjnnacrz52jml4i050vdx5lfcd3np172srxjaghdgfxg9k";
     };
 
+    # Errors in several tests:
+    # TypeError: must be str, not bytes
+    disabled = isPy3k;
+
     propagatedBuildInputs = with self; [ six pillow ];
 
     meta = {

From f1c24d4866e6a59faec9fea5dd69cfbb2808b0fa Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 23 Jan 2016 21:03:23 +0100
Subject: [PATCH 0427/2285] pythonPackages.willow: 0.2.1 -> 0.2.2, disable
 tests

Test data is not included.
---
 pkgs/top-level/python-packages.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 45b90c934c71..61c260778dc0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24174,15 +24174,19 @@ in modules // {
 
   willow = buildPythonPackage rec {
     name = "willow-${version}";
-    version = "0.2.1";
+    version = "0.2.2";
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/W/Willow/Willow-${version}.tar.gz";
-      sha256 = "0mgdpq7cvyvgk0n8ibkym3nsw1xg89kbismsj2y186ldcyxfajwa";
+      sha256 = "111c82fbfcda2710ce6201b0b7e0cfa1ff3c4f2f0dc788cc8dfc8db933c39c73";
     };
 
-    propagatedBuildInputs = with self; [ six ];
+    propagatedBuildInputs = with self; [ six pillow ];
+
+    # Test data is not included
+    # https://github.com/torchbox/Willow/issues/34
+    doCheck = false;
 
     meta = {
       description = "A Python image library that sits on top of Pillow, Wand and OpenCV";

From 7051a66805d2ff13a7be4b71561b566391e19dfe Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 23 Jan 2016 21:11:19 +0100
Subject: [PATCH 0428/2285] pythonPackages.fs: 0.5.0 -> 0.5.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 61c260778dc0..bd7c74d2c7ea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8709,15 +8709,27 @@ in modules // {
   });
 
   fs = buildPythonPackage rec {
-    name = "fs-0.5.0";
+    name = "fs-0.5.4";
 
     src = pkgs.fetchurl {
       url    = "https://pypi.python.org/packages/source/f/fs/${name}.tar.gz";
-      sha256 = "144f4yn2nvnxh2vrnmiabpwx3s637np0d1j1w95zym790d66shir";
+      sha256 = "ba2cca8773435a7c86059d57cb4b8ea30fda40f8610941f7822d1ce3ffd36197";
     };
 
+    LC_ALL = "en_US.UTF-8";
+    buildInputs = [ pkgs.glibcLocales ];
     propagatedBuildInputs = [ self.six ];
 
+    checkPhase = ''
+      ${python.interpreter} -m unittest discover
+    '';
+
+    # Judging from SyntaxError
+    disabled = isPy3k;
+
+    # Lots of errors. Likely due to being in a chroot
+    doCheck = false;
+
     meta = {
       description = "Filesystem abstraction";
       homepage    = http://pypi.python.org/pypi/fs;

From c882af9cf3514157912edd1426bc6fda5f1aadc1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 23 Jan 2016 21:22:03 +0100
Subject: [PATCH 0429/2285] pythonPackages.pystache: fix test runner

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bd7c74d2c7ea..104fc3181554 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16166,6 +16166,18 @@ in modules // {
       sha256 = "f7bbc265fb957b4d6c7c042b336563179444ab313fb93a719759111eabd3b85a";
     };
 
+    LC_ALL = "en_US.UTF-8";
+
+    buildInputs = [ pkgs.glibcLocales ];
+
+    checkPhase = ''
+      ${python.interpreter} -m unittest discover
+    '';
+
+    # SyntaxError Python 3
+    # https://github.com/defunkt/pystache/issues/181
+    disabled = isPy3k;
+
     meta = {
       description = "A framework-agnostic, logic-free templating system inspired by ctemplate and et";
       homepage = https://github.com/defunkt/pystache;

From 945872dc193e4c445cee477858092692eb96ef69 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 23 Jan 2016 21:32:23 +0100
Subject: [PATCH 0430/2285] pythonPackages.fasteners: fix test runner

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 104fc3181554..249c2119fcf5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13649,7 +13649,14 @@ in modules // {
       sha256 = "0nghdq3zihiqg10dp76ls7yn44m5wjncyz7fk8isagkrspkh9a3n";
     };
 
-    propagatedBuildInputs = with self; [ six monotonic ];
+    propagatedBuildInputs = with self; [ six monotonic testtools ];
+
+    checkPhase = ''
+      ${python.interpreter} -m unittest discover
+    '';
+    # Tests are written for Python 3.x only (concurrent.futures)
+    doCheck = isPy3k;
+
 
     meta = with stdenv.lib; {
       description = "Fasteners";

From 8c4831206691965977d41ac910b73a28bfd3b995 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 09:37:02 +0100
Subject: [PATCH 0431/2285] pythonPackages.traitlets: fix test runner

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 249c2119fcf5..2674e22fa144 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19867,6 +19867,9 @@ in modules // {
     name = "testtools-${version}";
     version = "1.8.0";
 
+    # Python 2 only judging from SyntaxError
+    disabled = isPy3k;
+
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/t/testtools/${name}.tar.gz";
       sha256 = "15yxz8d70iy1b1x6gd7spvblq0mjxjardl4vnaqasxafzc069zca";
@@ -19892,8 +19895,13 @@ in modules // {
       sha256 = "440e38dfa5d2a26c086d4b427cfb7aed17d0a2dca78bce90c33354da2592af5b";
     };
 
+    buildInputs = with self; [ nose mock ];
     propagatedBuildInputs = with self; [ipython_genutils decorator];
 
+    checkPhase = ''
+      nosetests -v
+    '';
+
     meta = {
       description = "Traitlets Python config system";
       homepage = http://ipython.org/;

From 3b2e3355db9726a9656761024d3b9c9645640263 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 09:45:56 +0100
Subject: [PATCH 0432/2285] pythonPackages.traits: disable tests

Broken test suite.
---
 pkgs/top-level/python-packages.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2674e22fa144..c1eb0530b90f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20123,6 +20123,18 @@ in modules // {
       md5 = "3ad558eebaedc63c29c80183c0371d2f";
     };
 
+    # Use pytest because its easier to discover tests
+    buildInputs = with self; [ pytest ];
+    checkPhase = ''
+      py.test $out/${python.sitePackages}
+    '';
+
+    # Test suite is broken for 3.x on latest release
+    # https://github.com/enthought/traits/issues/187
+    # https://github.com/enthought/traits/pull/188
+    # Furthermore, some tests fail due to being in a chroot
+    doCheck = false;
+
     propagatedBuildInputs = with self; [ numpy ];
 
     meta = {

From a57a8fae393d54fea4319eff6248f2b8f07789db Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 09:54:39 +0100
Subject: [PATCH 0433/2285] pythonPackages.tidylib: fix test runner, disable
 tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c1eb0530b90f..5e09ae6db408 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18612,6 +18612,17 @@ in modules // {
       md5 = "2a28267370c9409b592cdb786649cb25";
     };
 
+    # Judging from SyntaxError in tests
+    disabled = isPy3k;
+
+    checkPhase = ''
+      ${python.interpreter} -m unittest discover
+    '';
+
+    # Bunch of tests fail
+    # https://github.com/countergram/pytidylib/issues/13
+    doCheck = false;
+
     patchPhase = ''
       sed -i 's#load_library(name)#load_library("${pkgs.html-tidy}/lib/libtidy.so")#' tidylib/__init__.py
     '';

From 61e7978c4698743394014491fff82691e5070ce1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 10:21:06 +0100
Subject: [PATCH 0434/2285] pythonPackages.lazy-object-proxy: init at 1.2.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5e09ae6db408..c527bb70fa5c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10282,6 +10282,30 @@ in modules // {
     };
   };
 
+  lazy-object-proxy = buildPythonPackage rec {
+    name = "lazy-object-proxy-${version}";
+    version = "1.2.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/l/lazy-object-proxy/${name}.tar.gz";
+      sha256 = "22ed751a2c63c6cf718674fd7461b1dfc45215bab4751ca32b6c9b8cb2734cb3";
+    };
+
+    buildInputs = with self; [ pytest ];
+    checkPhase = ''
+      py.test tests
+    '';
+
+    # Broken tests. Seem to be fixed upstream according to Travis.
+    doCheck = false;
+
+    meta = {
+      description = "A fast and thorough lazy object proxy";
+      homepage = https://github.com/ionelmc/python-lazy-object-proxy;
+      license = with licenses; [ bsd2 ];
+    };
+
+  };
 
   le = buildPythonPackage rec {
     name = "le-${version}";

From bb9f1e7e3b75512acc5cfa419ca272cc59b97d0a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 10:20:11 +0100
Subject: [PATCH 0435/2285] pythonPackages.astroid: 1.3.4 -> 1.4.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c527bb70fa5c..8fa31fd7ef2f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -978,14 +978,22 @@ in modules // {
     };
   });
 
-  astroid = buildPythonPackage (rec {
-    name = "astroid-1.3.4";
-    propagatedBuildInputs = with self; [ logilab_common six ];
+  astroid = buildPythonPackage rec {
+    name = "astroid-1.4.4";
+
+    propagatedBuildInputs = with self; [ logilab_common six lazy-object-proxy ];
+
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/a/astroid/${name}.tar.gz";
-      sha256 = "1fz9x21pziy9dmivvlsgl7a86ka2m9jp3pky01da5aj89ym3wi8b";
+      sha256 = "7f7e5512efe515098e77cbd3a60e87c8db8954097b0e025d8d6f72f2e8ddc298";
     };
-  });
+
+    meta = {
+      description = "A abstract syntax tree for Python with inference support";
+      homepage = http://bitbucket.org/logilab/astroid;
+      license = with licenses; [ lgpl2 ];
+    };
+  };
 
   attrdict = buildPythonPackage (rec {
     name = "attrdict-2.0.0";

From 1a8c7c90301d5afb66aadfa24fb4d645af59e040 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 10:20:55 +0100
Subject: [PATCH 0436/2285] pythonPackages.pytest_28: init at 2.8.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8fa31fd7ef2f..0cff9bbdc8e2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3823,6 +3823,15 @@ in modules // {
     };
   };
 
+  pytest_28 = self.pytest.override rec {
+    name = "pytest-2.8.6";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pytest/${name}.tar.gz";
+      sha256 = "ed38a3725b8e4478555dfdb549a4219ca3ba57955751141a1aaa45b706d84194";
+    };
+  };
+
   pytestcache = buildPythonPackage rec {
     name = "pytest-cache-1.0";
     src = pkgs.fetchurl {

From 9441311e932800bf9c1ff48718328c3f0bf4b840 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 10:19:53 +0100
Subject: [PATCH 0437/2285] pythonPackages.pylint: 1.4.1 -> 1.5.4

---
 .../python-modules/pylint/default.nix         | 23 ---------------
 pkgs/top-level/python-packages.nix            | 28 +++++++++++++++++--
 2 files changed, 26 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pylint/default.nix

diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix
deleted file mode 100644
index 09890e8694f7..000000000000
--- a/pkgs/development/python-modules/pylint/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, astroid, buildPythonPackage }:
-
-buildPythonPackage rec {
-  name = "pylint-1.4.1";
-  namePrefix = "";
-
-  src = fetchurl {
-    url = "https://pypi.python.org/packages/source/p/pylint/${name}.tar.gz";
-    sha256 = "0c7hw1pcp5sqmc0v86zygw21isfgzbsqdmlb1sywncnlxmh30f1y";
-  };
-
-  propagatedBuildInputs = [ astroid ];
-
-  postInstall = ''
-    mkdir -p $out/share/emacs/site-lisp
-    cp "elisp/"*.el $out/share/emacs/site-lisp/
-  '';
-
-  meta = {
-    homepage = http://www.logilab.org/project/pylint;
-    description = "A bug and style checker for Python";
-  };
-}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0cff9bbdc8e2..14c6ac9b6317 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -85,8 +85,6 @@ in modules // {
 
   blivet = callPackage ../development/python-modules/blivet { };
 
-  pylint = callPackage ../development/python-modules/pylint { };
-
   dbus = callPackage ../development/python-modules/dbus {
     dbus = pkgs.dbus;
   };
@@ -15836,6 +15834,32 @@ in modules // {
     };
   };
 
+  pylint = buildPythonPackage rec {
+    name = "pylint-${version}";
+    version = "1.5.4";
+
+    src = pkgs.fetchurl {
+        url = "https://pypi.python.org/packages/source/p/pylint/${name}.tar.gz";
+        sha256 = "2fe3cc2fc66a56fdc35dbbc2bf1dd96a534abfc79ee6b2ad9ae4fe166e570c4b";
+    };
+
+    propagatedBuildInputs = with self; [ astroid ];
+
+    checkPhase = ''
+        cd pylint/test; ${python.interpreter} -m unittest discover -p "*test*"
+    '';
+
+    postInstall = ''
+        mkdir -p $out/share/emacs/site-lisp
+        cp "elisp/"*.el $out/share/emacs/site-lisp/
+    '';
+
+    meta = {
+        homepage = http://www.logilab.org/project/pylint;
+        description = "A bug and style checker for Python";
+    };
+  };
+
   pyrr = buildPythonPackage rec {
     name = "pyrr-${version}";
     version = "0.7.2";

From 7beace29affdd8328afafe3c22559aa0ac7a795b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 10:25:06 +0100
Subject: [PATCH 0438/2285] pythonPackages.funcparserlib: fix test runner,
 disable python 3.x

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 14c6ac9b6317..5312ba63254d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5153,6 +5153,13 @@ in modules // {
       md5 = "3aba546bdad5d0826596910551ce37c0";
     };
 
+    checkPhase = ''
+      ${python.interpreter} -m unittest discover
+    '';
+
+    # Judging from SyntaxError in tests.
+    disabled = isPy3k;
+
     meta = {
       description = "Recursive descent parsing library based on functional combinators";
       homepage = https://code.google.com/p/funcparserlib/;

From f46faccbf019c9da5e6949b6c7a596c359cc45c1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 10:30:21 +0100
Subject: [PATCH 0439/2285] pythonPackages.funcy: 1.4 -> 1.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5312ba63254d..cf4691b2ef83 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23129,13 +23129,16 @@ in modules // {
 
 
   funcy = buildPythonPackage rec {
-    name = "funcy-1.4";
+    name = "funcy-1.6";
 
     src = pkgs.fetchurl {
-        url = "https://github.com/Suor/funcy/archive/1.4.tar.gz";
-        sha256 = "694e29aa67d03a6ab006f1854740b65f4f87e581afb33853f80e647ddb5f24e7";
+        url = "https://pypi.python.org/packages/source/f/funcy/${name}.tar.gz";
+        sha256 = "511495db0c5660af18d3151b008c6ce698ae7fbf60887278e79675e35eed1f01";
     };
 
+    # No tests
+    doCheck = false;
+
     meta = {
       description = "Collection of fancy functional tools focused on practicality";
       homepage = "http://funcy.readthedocs.org/";

From 0ea690d4e141497dc7740d13f92eec9b6859382c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 10:34:37 +0100
Subject: [PATCH 0440/2285] pythonPackages.audioread: 1.2.1 -> 2.1.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cf4691b2ef83..639f9b4246e7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1011,13 +1011,17 @@ in modules // {
   });
 
   audioread = buildPythonPackage rec {
-    name = "audioread-1.2.1";
+    name = "audioread-${version}";
+    version = "2.1.1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/a/audioread/${name}.tar.gz";
-      md5 = "01a80357f38dbd9bf8d7403802df89ac";
+      sha256 = "ffb601de7a9e40850d4ec3256a3a6bbe8fa40466dafb5c65f41b08e4bb963f1e";
     };
 
+    # No tests, need to disable or py3k breaks
+    doCheck = false;
+
     meta = {
       description = "Cross-platform audio decoding";
       homepage = "https://github.com/sampsyo/audioread";

From 07e721e18b0b7d72e307b7e9af3d7a6b3be04d57 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 10:37:08 +0100
Subject: [PATCH 0441/2285] pythonPackages.thrift: 0.9.2 -> 0.9.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 639f9b4246e7..9ff75e968e51 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23800,13 +23800,16 @@ in modules // {
 
   thrift = buildPythonPackage rec {
     name = "thrift-${version}";
-    version = "0.9.2";
+    version = "0.9.3";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/t/thrift/${name}.tar.gz";
-      sha256 = "1yla6wg18x2a0l0lrvkp1v464hqhff98ck8pnv8d5j9kn3j6bxh8";
+      sha256 = "dfbc3d3bd19d396718dab05abaf46d93ae8005e2df798ef02e32793cd963877e";
     };
 
+    # No tests. Breaks when not disabling.
+    doCheck = false;
+
     meta = {
       description = "Python bindings for the Apache Thrift RPC system";
       homepage = http://thrift.apache.org/;

From b23586919c12ec395e72505b8c1a92406eb4bfb7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 10:41:45 +0100
Subject: [PATCH 0442/2285] pythonPackages.iniparse: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9ff75e968e51..e1c37eaab4f8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5690,6 +5690,13 @@ in modules // {
       sha256 = "0m60k46vr03x68jckachzsipav0bwhhnqb8715hm1cngs89fxhdb";
     };
 
+    checkPhase = ''
+      ${python.interpreter} runtests.py
+    '';
+
+    # Does not install tests
+    doCheck = false;
+
     meta = with stdenv.lib; {
       description = "Accessing and Modifying INI files";
       license = licenses.mit;

From 2e5ec8d35c3d85eba23c78ab29c3d0a41f8fd72e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 10:45:09 +0100
Subject: [PATCH 0443/2285] pythonPackages.eventlib: Disable python 3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e1c37eaab4f8..c9c6fbc29d99 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4948,6 +4948,9 @@ in modules // {
     name = "python-eventlib-${version}";
     version = "0.2.1";
 
+    # Judging from SyntaxError
+    disabled = isPy3k;
+
     src = pkgs.fetchurl {
       url = "http://download.ag-projects.com/SipClient/${name}.tar.gz";
       sha256 = "25224794420f430946fe46932718b521a6264903fe8c0ed3563dfdb844c623e7";

From 268439eb36c07859907d21080fecd64b05911951 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 10:47:21 +0100
Subject: [PATCH 0444/2285] pythonPackages.fastimport: fix testrunner, disable
 python 3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c9c6fbc29d99..4977abceb522 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8252,11 +8252,18 @@ in modules // {
     name = "fastimport-${version}";
     version = "0.9.4";
 
+    # Judging from SyntaxError
+    disabled = isPy3k;
+
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/f/fastimport/${name}.tar.gz";
       sha256 = "0k8x7552ypx9rc14vbsvg2lc6z0r8pv9laah28pdwyynbq10825d";
     };
 
+    checkPhase = ''
+      ${python.interpreter} -m unittest discover
+    '';
+
     meta = {
       homepage = https://launchpad.net/python-fastimport;
       description = "VCS fastimport/fastexport parser";

From b1152099cdcd3b442b750fdd1fcd2224191a6f49 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:13:42 +0100
Subject: [PATCH 0445/2285] pythonPackages.astroid: fix missing dependency

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4977abceb522..353e8470c7a7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -979,13 +979,20 @@ in modules // {
   astroid = buildPythonPackage rec {
     name = "astroid-1.4.4";
 
-    propagatedBuildInputs = with self; [ logilab_common six lazy-object-proxy ];
+    propagatedBuildInputs = with self; [ logilab_common six lazy-object-proxy wrapt ];
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/a/astroid/${name}.tar.gz";
       sha256 = "7f7e5512efe515098e77cbd3a60e87c8db8954097b0e025d8d6f72f2e8ddc298";
     };
 
+    checkPhase = ''
+        ${python.interpreter} -m unittest discover
+    '';
+
+    # Tests cannot be found because they're named unittest_...
+    # instead of test_...
+
     meta = {
       description = "A abstract syntax tree for Python with inference support";
       homepage = http://bitbucket.org/logilab/astroid;

From 5ce5577cd1e2d54e16674afa6ab91590af3b83a5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:14:05 +0100
Subject: [PATCH 0446/2285] pythonPackages.alabaster: 0.7.3 -> 0.7.7

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 353e8470c7a7..d77229e06d3c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -419,13 +419,18 @@ in modules // {
   };
 
   alabaster = buildPythonPackage rec {
-    name = "alabaster-0.7.3";
+    name = "alabaster-0.7.7";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/a/alabaster/${name}.tar.gz";
-      md5 = "67428d1383fd833f1282fed5deba0898";
+      sha256 = "f416a84e0d0ddbc288f6b8f2c276d10b40ca1238562cd9ed5a751292ec647b71";
     };
 
+    propagatedBuildInputs = with self; [ pygments ];
+
+    # No tests included
+    doCheck = false;
+
     meta = {
       homepage = https://github.com/bitprophet/alabaster;
       description = "a Sphinx theme";

From 18355061b0a5fedcce054813db9849f233f2f3a7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:14:29 +0100
Subject: [PATCH 0447/2285] pythonPackages.setuptools_scm: 1.7.0 -> 1.10.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d77229e06d3c..0058fa36bb55 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18359,11 +18359,11 @@ in modules // {
 
   setuptools_scm = buildPythonPackage rec {
     name = "setuptools_scm-${version}";
-    version = "1.7.0";
+    version = "1.10.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/s/setuptools_scm/${name}.tar.gz";
-      sha256 = "f2f69c782b4f549003edf5b75b356b37f40a4e880b615996c5d9c117913d6f9c";
+      url = "https://pypi.python.org/packages/source/s/setuptools_scm/${name}.tar.bz2";
+      sha256 = "1cdea91bbe1ec4d52b3e9c451ab32ae6e1f3aa3fd91e90580490a9eb75bea286";
     };
 
     buildInputs = with self; [ pip ];

From 8dceb18ae2ec975e4dbd48f0c24603a6e8598a22 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:14:48 +0100
Subject: [PATCH 0448/2285] pythonPackages.snowballstemmer: 1.2.0 -> 1.2.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0058fa36bb55..f70b4c3a9179 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18567,13 +18567,16 @@ in modules // {
   };
 
   snowballstemmer = buildPythonPackage rec {
-    name = "snowballstemmer-1.2.0";
+    name = "snowballstemmer-1.2.1";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/s/snowballstemmer/${name}.tar.gz";
-      md5 = "51f2ef829db8129dd0f2354f0b209970";
+      sha256 = "919f26a68b2c17a7634da993d91339e288964f93c274f1343e3bbbe2096e1128";
     };
 
+    # No tests included
+    doCheck = false;
+
     propagatedBuildInputs = with self; [ PyStemmer ];
 
     meta = {

From 8879d1dc049d900a607cec5f25166f4543e44cfb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:15:09 +0100
Subject: [PATCH 0449/2285] pythonPackages.Babel: 2.1.1 -> 2.2.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f70b4c3a9179..37642bd34017 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15345,11 +15345,11 @@ in modules // {
 
 
   Babel = buildPythonPackage (rec {
-    name = "Babel-2.1.1";
+    name = "Babel-2.2.0";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/B/Babel/${name}.tar.gz";
-      sha256 = "0j2jgfzj1a2m39pm2qc36fzr7a6p5ybwndi0xdzhi2p8zw7dbdkz";
+      sha256 = "d8cb4c0e78148aee89560f9fe21587aa57739c975bb89ff66b1e842cc697428f";
     };
 
     buildInputs = with self; [ pytest ];

From ab870b756e6fa28e6ab73888da62286d265c5065 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:15:47 +0100
Subject: [PATCH 0450/2285] pythonPackages.cytoolz: disable PyPy

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 37642bd34017..5a6a27b08b76 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3330,6 +3330,9 @@ in modules // {
       sha256 = "9c2e3dda8232b6cd5b84b8c8df6c8155c2adeb8734eb7ec38e189affc0f2eba5";
     };
 
+    # Extension types
+    disabled = isPyPy;
+
     buildInputs = with self; [ nose ];
 
     checkPhase = ''

From 2a46ead803895e9e16489452d89058788155062c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:16:09 +0100
Subject: [PATCH 0451/2285] pythonPackages.bsddb3: disable Python 3.x

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5a6a27b08b76..05553a42090f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2169,6 +2169,9 @@ in modules // {
 
     buildInputs = [ pkgs.db ];
 
+    # Judging from SyntaxError in test
+    disabled = isPy3k;
+
     # Path to database need to be set.
     # Somehow the setup.py flag is not propagated.
     #setupPyBuildFlags = [ "--berkeley-db=${pkgs.db}" ];

From 55d363736170a6b891b1f170fb8319f5260fac63 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:26:54 +0100
Subject: [PATCH 0452/2285] pythonPackages.keepalive: 0.4.1 -> 0.5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 05553a42090f..8d9df0db901d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7965,13 +7965,16 @@ in modules // {
 
   keepalive = buildPythonPackage rec {
     name = "keepalive-${version}";
-    version = "0.4.1";
+    version = "0.5";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/k/keepalive/keepalive-${version}.tar.gz";
-      sha256 = "07vn3b67ajwi7vv37h02kw7hg2z5dxhn9947dnvii05rfr5b27iy";
+      sha256 = "3c6b96f9062a5a76022f0c9d41e9ef5552d80b1cadd4fccc1bf8f183ba1d1ec1";
     };
 
+    # No tests included
+    doCheck = false;
+
     meta = with stdenv.lib; {
       description = "An HTTP handler for `urllib2` that supports HTTP 1.1 and keepalive.";
       homepage = "https://github.com/wikier/keepalive";

From 5a6c570b4ef7c30fe5bc0a427636fbac42bd9d39 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:27:24 +0100
Subject: [PATCH 0453/2285] pythonPackages.Fabric: 1.10.0 -> 1.10.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8d9df0db901d..c9343159202b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5102,11 +5102,11 @@ in modules // {
     };
   };
 
-  fabric = buildPythonPackage rec {
-    name = "fabric-${version}";
-    version = "1.10.0";
+  Fabric = buildPythonPackage rec {
+    name = "Fabric-${version}";
+    version = "1.10.2";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/F/Fabric/Fabric-${version}.tar.gz";
+      url = "https://pypi.python.org/packages/source/F/Fabric/${name}.tar.gz";
       sha256 = "0nikc05iz1fx2c9pvxrhrs819cpmg566azm99450yq2m8qmp1cpd";
     };
     disabled = isPy3k;

From f586ff981a7e42ff5e4fafa63d6c1015cb6ddd05 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:28:01 +0100
Subject: [PATCH 0454/2285] pythonPackages.fudge: 0.9.6 -> 1.1.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c9343159202b..008aaf68adab 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5160,13 +5160,19 @@ in modules // {
   };
 
   fudge = buildPythonPackage rec {
-    name = "fudge-0.9.6";
+    name = "fudge-1.1.0";
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/f/fudge/${name}.tar.gz";
-      sha256 = "185ia3vr3qk4f2s1a9hdxb8ci4qc0x0xidrad96pywg8j930qs9l";
+      sha256 = "eba59a926fa1df1ab6dddd69a7a8af21865b16cad800cb4d1af75070b0f52afb";
     };
     buildInputs = with self; [ nose nosejs ];
     propagatedBuildInputs = with self; [ sphinx ];
+
+    disabled = isPy3k;
+
+    checkPhase = ''
+      nosetests -v
+    '';
   };
 
 

From 07d5eae59db0133478bc96249c8e0d176bdbeb4b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:35:49 +0100
Subject: [PATCH 0455/2285] pythonPackages.nose-parameterized: fix test runner

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 008aaf68adab..23caadfe5d5e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4186,8 +4186,17 @@ in modules // {
       sha256 = "a11c41b0cf8218e7cdc19ab7a1bdf5c141d161cd2350daee819473cc63cd0685";
     };
 
+    disabled = !isPy3k;
+
+    LC_ALL = "en_US.UTF-8";
+    buildInputs = with self; [ nose pkgs.glibcLocales ];
     propagatedBuildInputs = with self; [ self.six ];
 
+    checkPhase = ''
+      nosetests -v
+    '';
+
+
     meta = {
       description = "Parameterized testing with any Python test framework";
       homepage = http://pypi.python.org/pypi/nose-parameterized;

From 7e6e897fce2e39886938075783d6d2dabe418c05 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:40:51 +0100
Subject: [PATCH 0456/2285] pythonPackages.fusepy: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 23caadfe5d5e..7a526cbf8416 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8847,6 +8847,9 @@ in modules // {
 
     propagatedBuildInputs = [ pkgs.fuse ];
 
+    # No tests included
+    doCheck = false;
+
     patchPhase = ''
       substituteInPlace fuse.py --replace \
         "find_library('fuse')" "'${pkgs.fuse}/lib/libfuse.so'"

From 4e1ed2fea0f11aeaddcfa051f6e704171ddd6f5a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:41:12 +0100
Subject: [PATCH 0457/2285] pythonPackages.ipywidgets: fix something

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7a526cbf8416..f69072beaf2f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9918,6 +9918,7 @@ in modules // {
       sha256 = "ceeb325e45ade9537c2d115fed9d522e5c6e90bb161592e2f0807375dc661028";
     };
 
+    buildInputs = with self; [ nose ];
     propagatedBuildInputs = with self; [ipython ipykernel traitlets notebook];
 
     meta = {

From f10234eeb8a509b42386be2b7523b15840c08186 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:41:41 +0100
Subject: [PATCH 0458/2285] pythonPackages.jupyter_client: add test runner,
 disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f69072beaf2f..65a6fb5d17ba 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10186,8 +10186,16 @@ in modules // {
       sha256 = "ff1ef5c6c3031a62db46ec6329867b4cb1595e6102a7819b3b5252b0c524bdb8";
     };
 
+    buildInputs = with self; [ nose ];
     propagatedBuildInputs = with self; [traitlets jupyter_core pyzmq] ++ optional isPyPy py;
 
+    checkPhase = ''
+      nosetests -v
+    '';
+
+    # Circular dependency with ipykernel
+    doCheck = false;
+
     meta = {
       description = "Jupyter protocol implementation and client libraries";
       homepage = http://jupyter.org/;

From 7598a2513032ca310c285434303633754101a802 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:42:29 +0100
Subject: [PATCH 0459/2285] pythonPackages.notebook: fix test runner, disable
 tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 65a6fb5d17ba..8e0b9ac0fb0b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12173,10 +12173,19 @@ in modules // {
       sha256 = "b597437ba33538221008e21fea71cd01eda9da1515ca3963d7c74e44f4b03d90";
     };
 
-    buildInputs = with self; [nose]  ++ optionals isPy27 [mock];
+    LC_ALL = "en_US.UTF-8";
+
+    buildInputs = with self; [nose pkgs.glibcLocales]  ++ optionals isPy27 [mock];
 
     propagatedBuildInputs = with self; [jinja2 tornado ipython_genutils traitlets jupyter_core jupyter_client nbformat nbconvert ipykernel terminado requests2 pexpect];
 
+    checkPhase = ''
+      nosetests -v
+    '';
+
+    # Certain tests fail due to being in a chroot.
+    # PermissionError
+    doCheck = false;
     meta = {
       description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing";
       homepage = http://jupyter.org/;

From 0a9e7a5fe82c4cf363a223f22fc7ce3364ef78a6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:45:04 +0100
Subject: [PATCH 0460/2285] pythonPackages.jupyter_core: add test runner,
 disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8e0b9ac0fb0b..c727be0292c4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10213,7 +10213,15 @@ in modules // {
       sha256 = "96a68a3b1d018ff7776270b26b7cb0cfd7a18a53ef2061421daff435707d198c";
     };
 
-    propagatedBuildInputs = with self; [traitlets];
+    buildInputs = with self; [ pytest mock ];
+    propagatedBuildInputs = with self; [ ipython traitlets];
+
+    checkPhase = ''
+      py.test
+    '';
+
+    # Several tests fail due to being in a chroot
+    doCheck = false;
 
     meta = {
       description = "Jupyter core package. A base package on which Jupyter projects rely";

From f9035f473e57a7667873296870c4bd5610d9e663 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:45:27 +0100
Subject: [PATCH 0461/2285] pythonPackages.pygraphviz: fix url

---
 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 c727be0292c4..af99b3b1da04 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11595,7 +11595,7 @@ in modules // {
     name = "pygraphviz-${version}";
 
     src = pkgs.fetchurl {
-      url = "https://github.com/pygraphviz/pygraphviz/archive/${name}.tar.gz";
+      url = "https://pypi.python.org/packages/source/p/pygraphviz/${name}.tar.gz";
       sha256 = "7c294cbc9d88946be671cc0d8602aac176d8c56695c0a7d871eadea75a958408";
     };
 

From 992c5d95f063b1dd51dc3718b44768336dcadd6b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:45:57 +0100
Subject: [PATCH 0462/2285] pythonPackages.nbconvert: add test runner, disable
 tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index af99b3b1da04..07d53a8ebdcb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11761,10 +11761,17 @@ in modules // {
       sha256 = "e0296e45293dd127d028f678e3b6aba3f1db3283a134178bdb49eea402d4cf1c";
     };
 
-    buildInputs = with self; [nose];
+    buildInputs = with self; [nose ipykernel ];
 
     propagatedBuildInputs = with self; [mistune jinja2 pygments traitlets jupyter_core nbformat ipykernel tornado jupyter_client];
 
+    checkPhase = ''
+      nosetests -v
+    '';
+
+    # PermissionError. Likely due to being in a chroot
+    doCheck = false;
+
     meta = {
       description = "Converting Jupyter Notebooks";
       homepage = http://jupyter.org/;

From ca1e2f05b7a6e60cbba0f8ff5c6e2a550246cdbf Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:46:42 +0100
Subject: [PATCH 0463/2285] pythonPackages.nbformat: add nose

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 07d53a8ebdcb..369890f17a07 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11789,6 +11789,7 @@ in modules // {
       sha256 = "5261c957589b9dfcd387c338d59375162ba9ca82c69e378961a1f4e641285db5";
     };
 
+    buildInputs = with self; [ nose ];
     propagatedBuildInputs = with self; [ipython_genutils traitlets jsonschema jupyter_core];
 
     meta = {

From 1a25a73299167de77b9bd75d0cf24d7d100f54c8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:47:18 +0100
Subject: [PATCH 0464/2285] pythonPackages.nose-cover3: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 369890f17a07..b55c1c832e8a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12129,6 +12129,9 @@ in modules // {
 
     propagatedBuildInputs = with self; [ nose ];
 
+    # No tests included
+    doCheck = false;
+
     meta = {
       description = "Coverage 3.x support for Nose";
       homepage = https://github.com/ask/nosecover3;

From e09c4b3a9da26f58d7a7f4dc874f86ea19a7fcec Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:47:50 +0100
Subject: [PATCH 0465/2285] pythonPackages.nosejs: fix test runner

---
 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 b55c1c832e8a..a33c83cb3864 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12165,6 +12165,11 @@ in modules // {
       sha256 = "0qrhkd3sga56qf6k0sqyhwfcladwi05gl6aqmr0xriiq1sgva5dy";
     };
     buildInputs = with self; [ nose ];
+
+    checkPhase = ''
+      nosetests -v
+    '';
+
   };
 
   nose-cprof = buildPythonPackage rec {

From 3bb7c30cca6037096f68d315ad4e651338770f3b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:48:34 +0100
Subject: [PATCH 0466/2285] pythonPackages.ldappool: disable python 3.x

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a33c83cb3864..93aec506175c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13737,6 +13737,9 @@ in modules // {
       sha256 = "1akmzf51cjfvmd0nvvm562z1w9vq45zsx6fa72kraqgsgxhnrhqz";
     };
 
+    # Judging from SyntaxError
+    disabled = isPy3k;
+
     meta = with stdenv.lib; {
       homepage = "https://github.com/mozilla-services/ldappool";
     };

From 4bd7239f500f1fe00ad79c463578673820f09596 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:48:58 +0100
Subject: [PATCH 0467/2285] pythonPackages.pygments: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 93aec506175c..1209a3aaf45a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15914,6 +15914,9 @@ in modules // {
 
     propagatedBuildInputs = with self; [ docutils ];
 
+    # Circular dependency with sphinx
+    doCheck = false;
+
     meta = {
       homepage = http://pygments.org/;
       description = "A generic syntax highlighter";

From 430ddcd65f3a08693777a6ee8e043d0a8ec69ff8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:49:34 +0100
Subject: [PATCH 0468/2285] pythonPackages.PyStemmer: fix test runner

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1209a3aaf45a..593cb78d9b65 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16380,6 +16380,10 @@ in modules // {
       md5 = "46ee623eeeba5a7cc0d95cbfa7e18abd";
     };
 
+    checkPhase = ''
+      ${python.interpreter} runtests.py
+    '';
+
     meta = {
       description = "Snowball stemming algorithms, for information retrieval";
       homepage = http://snowball.tartarus.org/;

From 6a1390aff3443fa71d1cbee6cf0df88d05fcdaf9 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 12:50:31 +0100
Subject: [PATCH 0469/2285] pythonPackages.wrapt: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 593cb78d9b65..d7573f5c2102 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14017,6 +14017,9 @@ in modules // {
     name = "wrapt-${version}";
     version = "1.10.5";
 
+    # No tests in archive
+    doCheck = false;
+
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/w/wrapt/${name}.tar.gz";
       sha256 = "0cq8rlpzkxzk48b50yrfhzn1d1hrq4gjcdqlrgq4v5palgiv9jwr";

From 2144c41530c4f759b6e4339ac7b1763a3aedf9f3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 13:06:03 +0100
Subject: [PATCH 0470/2285] pythonPackages.pypdf2: mark broken

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d7573f5c2102..5df72d24697a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16696,9 +16696,11 @@ in modules // {
       sha256 = "1sw225j9fgsvg1zm7lrij96fihfmq8pc1vg611dc55491zvj9ls3";
     };
 
-    buildInputs = with self; [ ];
+    LC_ALL = "en_US.UTF-8";
+    buildInputs = [ pkgs.glibcLocales ];
 
     meta = {
+      broken = true; # 2 tests, both fail
       description = "A Pure-Python library built as a PDF toolkit";
       homepage = "http://mstamy2.github.com/PyPDF2/";
       license = licenses.bsd3;

From 63804899ecba7298013760f756071663b1e40dfd Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 13:10:52 +0100
Subject: [PATCH 0471/2285] pythonPackages.GitPython: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5df72d24697a..eba96d22f1b1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5425,9 +5425,14 @@ in modules // {
       sha256 = "0q7plxnbbkp5dd0k73736l7gf932a89yy920yrgl8amfpixw324w";
     };
 
-    buildInputs = with self; [ nose ];
+    buildInputs = with self; [ mock nose ];
     propagatedBuildInputs = with self; [ gitdb ];
 
+    # All tests error with
+    # InvalidGitRepositoryError: /tmp/nix-build-python2.7-GitPython-1.0.1.drv-0/GitPython-1.0.1
+    # Maybe due to being in a chroot?
+    doCheck = false;
+
     meta = {
       description = "Python Git Library";
       maintainers = with maintainers; [ mornfall ];

From 9558ab1ba933afda579dbfd986ea12718ac3b33f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 13:29:32 +0100
Subject: [PATCH 0472/2285] pythonPackages.reportlab: fix test runner

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eba96d22f1b1..6c2bf932cffb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17295,7 +17295,17 @@ in modules // {
       sha256 = "14v212cq2w3p0j5xydfr8rav8c8qas1q845r0xj7fm6q5dk8grkj";
     };
 
-    buildInputs = with self; [ freetype pillow pip ];
+    LC_ALL = "en_US.UTF-8";
+    buildInputs = with self; [ freetype pillow pip pkgs.glibcLocales ];
+
+    patchPhase = ''
+      rm tests/test_graphics_barcode.py
+      rm tests/test_graphics_render.py
+    '';
+
+    checkPhase = ''
+      ${python.interpreter} tests/runAll.py
+    '';
 
     meta = {
       description = "An Open Source Python library for generating PDFs and graphics";

From 4afc8dba8418015c27f07d55c693cb59c47a4f25 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 13:32:51 +0100
Subject: [PATCH 0473/2285] pythonPackages.mrbob: 0.1.1 -> 0.1.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6c2bf932cffb..9f38fdab5cd4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11364,15 +11364,17 @@ in modules // {
 
   mrbob = buildPythonPackage rec {
     name = "mrbob-${version}";
-    version = "0.1.1";
+    version = "0.1.2";
 
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/m/mr.bob/mr.bob-${version}.zip";
-      md5 = "84a117c9a75b86842b0fa5f5c9c767f3";
+      url = "http://pypi.python.org/packages/source/m/mr.bob/mr.bob-${version}.tar.gz";
+      sha256 = "6737eaf98aaeae85e07ebef844ee5156df2f06a8b28d7c3dcb056f811c588121";
     };
 
     buildInputs = [ pkgs.glibcLocales self.mock ];
 
+    disabled = isPy3k;
+
     LC_ALL="en_US.UTF-8";
 
     propagatedBuildInputs = with self; [ argparse jinja2 six modules.readline ] ++

From d9193873562af5ab7a45c0a10d6a87477fe5a08f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 13:35:26 +0100
Subject: [PATCH 0474/2285] pythonPackages.cmd2: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9f38fdab5cd4..dc5f01c4024a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13176,6 +13176,9 @@ in modules // {
       sha256 = "1a346zcd46c8gwbbp2cxsmvgfkyy26kwxjzdnkv7n47w6660sy5c";
     };
 
+    # No tests included
+    doCheck = false;
+
     propagatedBuildInputs = with self; [
       pyparsing
     ];

From 8f1ab60ad2944ff2ff363e3218b3413527dcd47f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 13:55:02 +0100
Subject: [PATCH 0475/2285] pythonPackages.slixmpp: 1.0.post5 -> 1.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index dc5f01c4024a..673e608c522f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11845,16 +11845,16 @@ in modules // {
 
   slixmpp = buildPythonPackage rec {
     name = "slixmpp-${version}";
-    version = "1.0.post5";
+    version = "1.1";
 
     disabled = (!isPy34);
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/s/slixmpp/${name}.tar.gz";
-      sha256 = "0ik23w3y52m30z56874wgac07j70k7b06n20j44slii8avf58p4b";
+      sha256 = "030ca7e71cbb7e17fb48f83db97779fdbac0b4424cef01245f3276a110b30a6c";
     };
 
-    propagatedBuildInputs = with self ; [ aiodns pyasn1 ];
+    propagatedBuildInputs = with self ; [ aiodns pyasn1 pkgs.gnupg1];
 
     meta = {
       meta = "Elegant Python library for XMPP";

From 9890ee7bc119bd7791e34d9f09c59f32174a741d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 13:55:19 +0100
Subject: [PATCH 0476/2285] pythonPackages.pycares: 0.7.0 -> 1.0.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 673e608c522f..8e2d7e6d17f1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6554,15 +6554,18 @@ in modules // {
 
   pycares = buildPythonPackage rec {
     name = "pycares-${version}";
-    version = "0.7.0";
+    version = "1.0.0";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/pycares/${name}.tar.gz";
-      sha256 = "10lr3ij67khmfm14cb3sqch3vhv37f3j1whwznq6qy4prfmz5gvl";
+      sha256 = "a18341ea030e2cc0743acdf4aa72302bdf6b820938b36ce4bd76e43faa2276a3";
     };
 
     propagatedBuildInputs = [ pkgs.c-ares ];
 
+    # No tests included
+    doCheck = false;
+
     meta = {
       homepage = http://github.com/saghul/pycares;
       description = "Interface for c-ares";

From b69ff580e295860bd487eedf014257eed943e071 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 13:55:59 +0100
Subject: [PATCH 0477/2285] pythonPackages.poezio: add test runner

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8e2d7e6d17f1..36fde7a49913 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24233,6 +24233,8 @@ in modules // {
 
     namePrefix = "";
     disabled = (!isPy34);
+
+    buildInputs = with self; [ pytest ];
     propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr ];
 
     patches =

From e6e5655926fadf1ab4d872fa830ead353a7714c6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 14:07:13 +0100
Subject: [PATCH 0478/2285] pythonPackages.aiodns: 0.3.2 -> 1.0.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 36fde7a49913..ef84d21e88c5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -377,16 +377,18 @@ in modules // {
 
   aiodns = buildPythonPackage rec {
     name = "aiodns-${version}";
-    version = "0.3.2";
+    version = "1.0.0";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/a/aiodns/${name}.tar.gz";
-      sha256 = "0i9ypv9l4d59j87kkrsh1livfgnspyzcbx26jw9x58xs5z05xj7k";
+      sha256 = "95140e4d2b67ee16dfbf357d9b54d7453b58f1732e81f869a1803a3ba3773b0d";
     };
 
-    propagatedBuildInputs = with self ; [
-      pycares asyncio
-    ] ++ optional (isPy26 || isPy27 || isPyPy) self.trollius;
+    propagatedBuildInputs = with self; [ pycares ] ++ optional isPy33 asyncio ++ optional (isPy26 || isPy27 || isPyPy) trollius;
+
+    # Tests are not distributed
+    # https://github.com/saghul/aiodns/issues/13
+    doCheck = false;
 
     meta = {
       homepage = http://github.com/saghul/aiodns;

From 85a3f52e102a456cb6ab2c5a34644f67634181f2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 14:08:44 +0100
Subject: [PATCH 0479/2285] pythonPackages.futures: 3.0.3 -> 3.0.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ef84d21e88c5..f0ef1db45ed5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8913,16 +8913,23 @@ in modules // {
 
   futures = buildPythonPackage rec {
     name = "futures-${version}";
-    version = "3.0.3";
+    version = "3.0.4";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/f/futures/${name}.tar.gz";
-      sha256 = "2fe2342bb4fe8b8e217f0d21b5921cbe5408bf966d9f92025e707e881b198bed";
+      sha256 = "19485d83f7bd2151c0aeaf88fbba3ee50dadfb222ffc3b66a344ef4952b782a3";
     };
 
     # This module is for backporting functionality to Python 2.x, it's builtin in py3k
     disabled = isPy3k;
 
+    checkPhase = ''
+        ${python.interpreter} -m unittest discover
+    '';
+
+    # Tests fail
+    doCheck = false;
+
     meta = with pkgs.stdenv.lib; {
       description = "Backport of the concurrent.futures package from Python 3.2";
       homepage = "https://github.com/agronholm/pythonfutures";

From 446a99b9d5c84abad513dbf2572f738179df5559 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 14:27:46 +0100
Subject: [PATCH 0480/2285] pythonPackages.ipyparallel: disable tests

---
 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 f0ef1db45ed5..cffee8679e08 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9856,8 +9856,13 @@ in modules // {
       sha256 = "c943f6b3bbabb9332336d15474969e2a7a73d5b583f9786f7b357c75e4b1709a";
     };
 
+    buildInputs = with self; [ nose ];
+
     propagatedBuildInputs = with self; [ipython_genutils decorator pyzmq ipython jupyter_client ipykernel];
 
+    # Requires access to cluster
+    doCheck = false;
+
     meta = {
       description = "Interactive Parallel Computing with IPython";
       homepage = http://ipython.org/;

From d893d1c8ebb1cd15dad4b1aabfc60408dfa70a8b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 14:28:33 +0100
Subject: [PATCH 0481/2285] pythonPackages.fudge_9: init at 0.9.6

needed for Fabric
---
 pkgs/top-level/python-packages.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cffee8679e08..fed8e49eaaa4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5186,6 +5186,14 @@ in modules // {
     '';
   };
 
+  fudge_9 = self.fudge.override rec {
+    name = "fudge-0.9.6";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/f/fudge/${name}.tar.gz";
+      sha256 = "34690c4692e8717f4d6a2ab7d841070c93c8d0ea0d2615b47064e291f750b1a0";
+    };
+  };
+
 
   funcparserlib = buildPythonPackage rec {
     name = "funcparserlib-0.3.6";

From 3da674148be0f57e044e67e0996fe7098aa65cbe Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 14:28:56 +0100
Subject: [PATCH 0482/2285] pythonPackages.Fabric: fix dependency on fudge<1

---
 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 fed8e49eaaa4..ccd9de5bb801 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5123,7 +5123,7 @@ in modules // {
     disabled = isPy3k;
     doCheck = (!isPyPy);  # https://github.com/fabric/fabric/issues/11891
     propagatedBuildInputs = with self; [ paramiko pycrypto ];
-    buildInputs = with self; [ fudge nose ];
+    buildInputs = with self; [ fudge_9 nose ];
   };
 
   fedora_cert = stdenv.mkDerivation (rec {

From 4104f09fab21a23c173eb2072bae0da56e6850fc Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 14:32:10 +0100
Subject: [PATCH 0483/2285] pythonPackages.qtconsole: add nose

---
 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 ccd9de5bb801..bfccc347cad7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17490,7 +17490,7 @@ in modules // {
       sha256 = "741906acae9e02c0df9138ac88b621ef22e438565aa96d783a9ef88faec3de46";
     };
 
-    buildInputs = with self; [] ++ optionals isPy27 [mock];
+    buildInputs = with self; [ nose ] ++ optionals isPy27 [mock];
     propagatedBuildInputs = with self; [traitlets jupyter_core jupyter_client pygments ipykernel pyqt4];
 
     meta = {

From 3a9983b45d3d5f67ffccf924179cf4bc4bc104e2 Mon Sep 17 00:00:00 2001
From: obadz <dav-github@odav.org>
Date: Wed, 20 Jan 2016 16:50:15 +0000
Subject: [PATCH 0484/2285] couchdb: add platform, remove maintainer that was
 added accidentally, fixes #12502

---
 pkgs/servers/http/couchdb/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix
index 54412d2ab400..8b3edb27c17f 100644
--- a/pkgs/servers/http/couchdb/default.nix
+++ b/pkgs/servers/http/couchdb/default.nix
@@ -41,10 +41,11 @@ stdenv.mkDerivation rec {
     --enable-js-trunk
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API";
     homepage = "http://couchdb.apache.org";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [ viric garbas ];
+    license = licenses.asl20;
+    platform = platforms.all;
+    maintainers = with maintainers; [ garbas ];
   };
 }

From dbe8f255619d06e9ffe2386da8e32e26546022f3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 14:47:25 +0100
Subject: [PATCH 0485/2285] pythonPackages.slixmpp: add missing dependency

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bfccc347cad7..bee037247114 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11879,7 +11879,7 @@ in modules // {
       sha256 = "030ca7e71cbb7e17fb48f83db97779fdbac0b4424cef01245f3276a110b30a6c";
     };
 
-    propagatedBuildInputs = with self ; [ aiodns pyasn1 pkgs.gnupg1];
+    propagatedBuildInputs = with self ; [ aiodns pyasn1 pkgs.gnupg1 pyasn1-modules];
 
     meta = {
       meta = "Elegant Python library for XMPP";

From 7d0ed7978edcca88ae4e23a98f249a624a2ce659 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 14:47:41 +0100
Subject: [PATCH 0486/2285] pythonPackages.reportlab: disable for PyPy

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bee037247114..300f6a9e5603 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17337,6 +17337,9 @@ in modules // {
       ${python.interpreter} tests/runAll.py
     '';
 
+    # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit
+    disabled = isPypy;
+
     meta = {
       description = "An Open Source Python library for generating PDFs and graphics";
       homepage = http://www.reportlab.com/;

From 3d565008e88c7c0e36ac897ce087fd14f7d15877 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 14:54:50 +0100
Subject: [PATCH 0487/2285] pythonPackages.readme: fix test runner, disable
 tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 300f6a9e5603..f473457ed126 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17659,12 +17659,17 @@ in modules // {
       sha256 = "08j2w67nilczn1i5r7h22vag9673i6vnfhyq2rv27r1bdmi5a30m";
     };
 
+    buildInputs = with self; [ pytest ];
     propagatedBuildInputs = with self; [
       six docutils pygments bleach html5lib
     ];
-    buildInputs = with self; [
 
-    ];
+    checkPhase = ''
+      py.test
+    '';
+
+    # Tests fail, possibly broken.
+    doCheck = false;
 
     meta = with stdenv.lib; {
       description = "readme";

From 2902ad92f7e896bfd802be0c5f8fa3e3b637ce8d Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 15:07:01 +0100
Subject: [PATCH 0488/2285] pythonPackages.jmespath: fix test runner

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f473457ed126..48cf354ab553 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10176,6 +10176,7 @@ in modules // {
       sha256 = "1lazbx65imassd7h24z49za001rvx1lmx8r0l21h4izs7pp14nnd";
     };
 
+    buildInputs = with self; [ nose ];
     propagatedBuildInputs = with self; [ ply ];
 
     meta = {

From df24802268b7a19b05085cc13a1d5aa83bea76e0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 15:13:41 +0100
Subject: [PATCH 0489/2285] pythonPackages.ply: 3.7 -> 3.8

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 48cf354ab553..487437059283 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12751,13 +12751,21 @@ in modules // {
   };
 
   ply = buildPythonPackage (rec {
-    name = "ply-3.7";
+    name = "ply-3.8";
 
     src = pkgs.fetchurl {
-      url = "http://www.dabeaz.com/ply/${name}.tar.gz";
-      sha256 = "105gw1xayqww99qsls0lv37z4hzg5qnglxkd7s3h96hw9jsbfpzq";
+      url = "https://pypi.python.org/packages/source/p/ply/${name}.tar.gz";
+      sha256 = "e7d1bdff026beb159c9942f7a17e102c375638d9478a7ecd4cc0c76afd8de0b8";
     };
 
+    checkPhase = ''
+      ${python.interpreter} test/testlex.py
+      ${python.interpreter} test/testyacc.py
+    '';
+
+    # Test suite appears broken
+    doCheck = false;
+
     meta = {
       homepage = http://www.dabeaz.com/ply/;
 

From 9226f8783e0e875975124be204c55fd55ce7fc9c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 15:18:39 +0100
Subject: [PATCH 0490/2285] pythonPackages.pyopengl: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 487437059283..be9d6a7b9363 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16779,6 +16779,12 @@ in modules // {
       license = "BSD-style";
       platforms = platforms.mesaPlatforms;
     };
+
+    # Need to fix test runner
+    # Tests have many dependencies
+    # Extension types could not be found.
+    # Should run test suite from $out/${python.sitePackages}
+    doCheck = false;
   };
 
   pyopenssl = buildPythonPackage rec {

From 8ebd757d8baf6353e667c3869ab02b2637d7990e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Jan 2016 15:28:49 +0100
Subject: [PATCH 0491/2285] nixopsUnstable: nixops

---
 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 1c283e4acb10..be51779be12d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15466,7 +15466,7 @@ let
 
   nixops = callPackage ../tools/package-management/nixops { };
 
-  nixopsUnstable = callPackage ../tools/package-management/nixops/unstable.nix { };
+  nixopsUnstable = nixops;# callPackage ../tools/package-management/nixops/unstable.nix { };
 
   nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; };
 

From ac160ab42f19922711328c339e1fa7513779250f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Jan 2016 15:32:46 +0100
Subject: [PATCH 0492/2285] fabric -> Fabric

---
 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 be51779be12d..0f564112dc44 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1452,7 +1452,7 @@ let
 
   f2fs-tools = callPackage ../tools/filesystems/f2fs-tools { };
 
-  fabric = pythonPackages.fabric;
+  Fabric = pythonPackages.Fabric;
 
   fail2ban = callPackage ../tools/security/fail2ban { };
 

From ba82374e3fc827bae6609af83b6e2047f2b4418b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Jan 2016 15:33:35 +0100
Subject: [PATCH 0493/2285] fix eval

---
 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 be9d6a7b9363..54adf571a00c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17353,7 +17353,7 @@ in modules // {
     '';
 
     # See https://bitbucket.org/pypy/compatibility/wiki/reportlab%20toolkit
-    disabled = isPypy;
+    disabled = isPyPy;
 
     meta = {
       description = "An Open Source Python library for generating PDFs and graphics";

From fb4560ceda3b0f033f7d175531e315bad90dca5f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 15:34:00 +0100
Subject: [PATCH 0494/2285] pythonPackage.cffi_0_8: exit at 0.8.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 54adf571a00c..854273227ec9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3749,21 +3749,6 @@ in modules // {
     };
   };
 
-  cffi_0_8 = if isPyPy then null else buildPythonPackage rec {
-    name = "cffi-0.8.6";
-
-    src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/c/cffi/${name}.tar.gz";
-      sha256 = "0406j3sgndmx88idv5zxkkrwfqxmjl18pj8gf47nsg4ymzixjci5";
-    };
-
-    propagatedBuildInputs = with self; [ pkgs.libffi pycparser ];
-
-    meta = {
-      maintainers = with maintainers; [ iElectric ];
-    };
-  };
-
   cffi = if isPyPy then null else buildPythonPackage rec {
     name = "cffi-1.3.0";
 

From e09ad08442f802b7789ff915029f537baf366323 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 15:38:55 +0100
Subject: [PATCH 0495/2285] pythonPackages.qtconsole: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 854273227ec9..14dc8d85f0c4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17496,6 +17496,9 @@ in modules // {
     buildInputs = with self; [ nose ] ++ optionals isPy27 [mock];
     propagatedBuildInputs = with self; [traitlets jupyter_core jupyter_client pygments ipykernel pyqt4];
 
+    # : cannot connect to X server 
+    doCheck = false;
+
     meta = {
       description = "Jupyter Qt console";
       homepage = http://jupyter.org/;

From 32582d2873f5ac0211845a0c8097ae8e2f3b0445 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 15:52:40 +0100
Subject: [PATCH 0496/2285] pythonPackages.pycparser: disable python 3.5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 14dc8d85f0c4..7c63e3cba82e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3797,6 +3797,9 @@ in modules // {
       sha256 = "7959b4a74abdc27b312fed1c21e6caf9309ce0b29ea86b591fd2e99ecdf27f73";
     };
 
+    # Unsupported
+    disabled = isPy35;
+
     meta = {
       description = "C parser in Python";
       homepage = https://github.com/eliben/pycparser;

From baaa62e1a9d7cc1e48524a0600eeb3e305e584c3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 15:53:36 +0100
Subject: [PATCH 0497/2285] python.qtconsole: explain why tests disabled

---
 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 7c63e3cba82e..103e5bdc963c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17499,7 +17499,7 @@ in modules // {
     buildInputs = with self; [ nose ] ++ optionals isPy27 [mock];
     propagatedBuildInputs = with self; [traitlets jupyter_core jupyter_client pygments ipykernel pyqt4];
 
-    # : cannot connect to X server 
+    # : cannot connect to X server
     doCheck = false;
 
     meta = {

From 4d1405091d6322f0a3bc8e2d5caef5ce74b8972c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Jan 2016 15:53:21 +0100
Subject: [PATCH 0498/2285] pythonPackages.shapely: run tests from

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 103e5bdc963c..a73e3adbf0ad 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18800,10 +18800,8 @@ in modules // {
       sed -i "s|_lgeos = load_dll('geos_c', fallbacks=.*)|_lgeos = load_dll('geos_c', fallbacks=['${pkgs.geos}/lib/libgeos_c.so'])|" shapely/geos.py
     '';
 
-    # Error when importing extension types. Happens also after install
-
     checkPhase = ''
-      py.test tests
+      py.test $out
     '';
 
     meta = {

From 9e988d4f702d6504144f0f4f42f277f573d0c699 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Jan 2016 16:00:39 +0100
Subject: [PATCH 0499/2285] pythonPackages.Logbook: 0.4.2 -> 0.11.3, enable
 tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a73e3adbf0ad..b6201c7666e0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22980,14 +22980,20 @@ in modules // {
 
   Logbook = buildPythonPackage rec {
     name = "Logbook-${version}";
-    version = "0.4.2";
+    version = "0.11.3";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/L/Logbook/${name}.tar.gz";
-      # md5 = "143cb15af4c4a784ca785a1546ad1b93";
-      sha256 = "1g2pnhxh7m64qsrs0ifwcmpfk7gqjvrawd8z66i001rsdnq778v0";
+      sha256 = "0bchn00jj0y4dmrmqsm29ffcx37g79jcxjihadmgz2aj0z6dbsrc";
     };
 
+    buildInputs = [ self.pytest ];
+
+    checkPhase = ''
+      find tests -name \*.pyc -delete
+      py.test tests
+    '';
+
     meta = {
       homepage = http://pythonhosted.org/Logbook/;
       description = "A logging replacement for Python";

From e0606c55dcc192ad0685f3cd5e7bd1b65032edad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Jan 2016 16:04:49 +0100
Subject: [PATCH 0500/2285] pythonPackages.nose-progressive: 1.3 -> 1.5.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 b6201c7666e0..2084ab7f19b9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19023,11 +19023,11 @@ in modules // {
   };
 
   nose_progressive = buildPythonPackage rec {
-    name = "nose-progressive-1.3";
+    name = "nose-progressive-1.5.1";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/n/nose-progressive/${name}.tar.gz";
-      md5 = "180be93929c5962044a35489f193259d";
+      sha256 = "0mfbjv3dcg23q0a130670g7xpfyvgza4wxkj991xxh8w9hs43ga4";
     };
 
     buildInputs = with self; [ pillow blessings nose ];

From 09cd68dfb2474d1788208d1e92b9bb99e4463193 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 16:04:06 +0100
Subject: [PATCH 0501/2285] pythonPackages.cairocffi: 0.7.1 -> 0.7.2, mark as
 broken

Fixed the test runner.
Apparently a library could not be opened.
---
 pkgs/top-level/python-packages.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2084ab7f19b9..93dab5b754d7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2581,21 +2581,32 @@ in modules // {
 
 
   cairocffi = buildPythonPackage rec {
-    name = "cairocffi-0.7.1";
+    name = "cairocffi-0.7.2";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/c/cairocffi/${name}.tar.gz";
-      md5 = "e26d06a8d8b16c7210414ce15d453636";
+      sha256 = "e42b4256d27bd960cbf3b91a6c55d602defcdbc2a73f7317849c80279feeb975";
     };
 
+    LC_ALL = "en_US.UTF-8";
+    buildInputs = with self; [ pytest pkgs.glibcLocales ];
     propagatedBuildInputs = with self; [ pkgs.cairo cffi ];
 
+    checkPhase = ''
+      py.test $out/${python.sitePackages}
+    '';
+
+    # Marked broken since according to test
+    # Happens with 0.7.1 and 0.7.2
+    # OSError: dlopen() failed to load a library: gdk_pixbuf-2.0 / gdk_pixbuf-2.0-0
+
     patchPhase = ''
       # Hardcode cairo library path
       sed -e 's,ffi\.dlopen(,&"${pkgs.cairo}/lib/" + ,' -i cairocffi/__init__.py
     '';
 
     meta = {
+      broken = true;
       homepage = https://github.com/SimonSapin/cairocffi;
       license = "bsd";
       description = "cffi-based cairo bindings for Python";

From 62d914d8a2c8759d3f18d0133a3c72e11da80767 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Jan 2016 16:15:31 +0100
Subject: [PATCH 0502/2285] pythonPackages.jedi: 0.8.1 -> 0.9.0, disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 93dab5b754d7..6505a53d0f64 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10081,13 +10081,22 @@ in modules // {
   };
 
   jedi = buildPythonPackage (rec {
-    name = "jedi-0.8.1";
+    name = "jedi-0.9.0";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/j/jedi/${name}.tar.gz";
-      sha256 = "1a7bg159mc1la5p1zsblzpr9hmypa7nz0mpvf7dww57cgi2sw8sd";
+      sha256 = "0c8x962ynpx001fdvp07m2q5jk4igkxbj3rmnydavphvlgxijk1v";
     };
 
+    buildInputs = [ self.pytest ];
+
+    checkPhase = ''
+      py.test test
+    '';
+
+    # 7 failed
+    doCheck = false;
+
     meta = {
       homepage = https://github.com/davidhalter/jedi;
       description = "An autocompletion tool for Python that can be used for text editors";

From cc960f658c70e03d90563332156fc75df921e279 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Jan 2016 16:40:58 +0100
Subject: [PATCH 0503/2285] pythonPackages.deform_bootstrap: fix build

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6505a53d0f64..8dac17020f53 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4408,7 +4408,13 @@ in modules // {
       sha256 = "1hgq3vqsfqdmlyahnlc40w13viawhpzqf4jzigsggdb41x545fda";
     };
 
-    propagatedBuildInputs = with self; [ deform ];
+    buildInputs = [ self.mock ];
+    propagatedBuildInputs = with self; [ deform pyramid ];
+
+    # demo is removed as it depends on deformdemo
+    patchPhase = ''
+      rm -rf deform_bootstrap/demo
+    '';
 
     meta = {
       maintainers = with maintainers; [ iElectric ];

From 6dbec4451cd9fb0eed327ebccb571950901a74af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Jan 2016 16:45:33 +0100
Subject: [PATCH 0504/2285] tlsh: 3.4.1 -> 3.4.5, disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8dac17020f53..f7b16024a6b6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23216,14 +23216,16 @@ in modules // {
   };
 
   tlsh = buildPythonPackage rec {
-    name = "tlsh-3.4.1";
+    name = "tlsh-3.4.5";
     src = pkgs.fetchFromGitHub {
       owner = "trendmicro";
       repo = "tlsh";
-      rev = "b319aed6a270cc765347296b442820c495018833";
-      sha256 = "08ysniihvidcyvh9zip64wwvj7mvxvsqs60ci8cxj28f1ip0n8wg";
+      rev = "22fa9a62068b92c63f2b5a87004a7a7ceaac1930";
+      sha256 = "1ydliir308xn4ywy705mmsh7863ldlixdvpqwdhbipzq9vfpmvll";
     };
     buildInputs = with pkgs; [ cmake ];
+    # no test data
+    doCheck = false;
     preConfigure = ''
       mkdir build
       cd build

From 5a5e0757c5b15e319f74a2bf29b7253871080d22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Jan 2016 16:47:10 +0100
Subject: [PATCH 0505/2285] azure-common: disable on PyPy

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f7b16024a6b6..f703ab97e3e9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1190,6 +1190,7 @@ in modules // {
   azure-common = buildPythonPackage rec {
     version = "1.0.0";
     name = "azure-common-${version}";
+    disabled = isPyPy;
     src = pkgs.fetchurl {
       url = https://pypi.python.org/packages/source/a/azure-common/azure-common-1.0.0.zip;
       sha256 = "074rwwy8zzs7zw3nww5q2wg5lxgdc4rmypp2gfc9mwsz0gb70491";

From ced3914cdc5fdcb7c45186f61b7cc68c50a0db36 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 16:49:10 +0100
Subject: [PATCH 0506/2285] pythonPackages.awscli: disable testing

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f703ab97e3e9..9ba83526b41e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1125,6 +1125,9 @@ in modules // {
       sha256 = "0b50de084c8de70adf45c0e938b6350344d9b6acde8b7cdee02cb32964bc58fd";
     };
 
+    # No tests included
+    doCheck = false;
+
     propagatedBuildInputs = with self; [
       botocore
       bcdoc

From 2c1c74649766a0c6954f647ee40be28de48e1274 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 16:49:26 +0100
Subject: [PATCH 0507/2285] pythonPackages.botocore: fix test runner, disable
 testing

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9ba83526b41e..3d9bcbdedf9b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2296,7 +2296,7 @@ in modules // {
   };
 
   botocore = buildPythonPackage rec {
-    version = "1.3.12";
+    version = "1.3.12"; # This version is required by awscli
     name = "botocore-${version}";
 
     src = pkgs.fetchurl {
@@ -2310,15 +2310,19 @@ in modules // {
         self.jmespath
       ];
 
-    buildInputs = [ self.docutils ];
+    buildInputs = with self; [ docutils mock nose ];
+
+    checkPhase = ''
+      nosetests -v
+    '';
+
+    # Network access
+    doCheck = false;
 
     meta = {
       homepage = https://github.com/boto/botocore;
-
       license = "bsd";
-
       description = "A low-level interface to a growing number of Amazon Web Services";
-
     };
   };
 

From 6985596af880ac068f77eec6e8b140bea78efdf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Jan 2016 16:50:48 +0100
Subject: [PATCH 0508/2285] filebrowser_safe: fix tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3d9bcbdedf9b..8d76f81fd7a1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8431,9 +8431,11 @@ in modules // {
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/f/filebrowser_safe/${name}.tar.gz";
-      md5 = "12a1ad3a1ed6a9377e758c4fa7fee570";
+      sha256 = "02bn60fdslvng2ckn65fms3hjbzgsa8qa5161a8lr720wbx8gpj2";
     };
 
+    buildInputs = [ self.django ];
+
     meta = {
       description = "A snapshot of django-filebrowser for the Mezzanine CMS";
       longDescription = ''

From 215c5e4f78dc75706cac0ba85047f36343b712b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Jan 2016 16:56:01 +0100
Subject: [PATCH 0509/2285] django_1_9: don't run tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8d76f81fd7a1..6ff387a76db2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7597,6 +7597,9 @@ in modules // {
       wrapPythonProgramsIn $out/bin "$out $pythonPath"
     '';
 
+    # too complicated to setup
+    doCheck = false;
+
     meta = {
       description = "A high-level Python Web framework";
       homepage = https://www.djangoproject.com/;
@@ -7613,7 +7616,7 @@ in modules // {
       sha256 = "1n3hb80v7wl5j2mry5pfald6i9z42a9c3m9405877iqw3v49csc2";
     };
 
-    # error: invalid command 'test'
+    # too complicated to setup
     doCheck = false;
 
     # patch only $out/bin to avoid problems with starter templates (see #3134)
@@ -7638,7 +7641,7 @@ in modules // {
       sha256 = "0xbwg6nyvwcbp2hvk0x3s5y823k5kizn0za1bl2rf6g6xcn7sddr";
     };
 
-    # error: invalid command 'test'
+    # too complicated to setup
     doCheck = false;
 
     # patch only $out/bin to avoid problems with starter templates (see #3134)
@@ -7661,7 +7664,7 @@ in modules // {
       sha256 = "0misvia78c14y07zs5xsb9lv54q0v217jpaindrmhhw4wiryal3y";
     };
 
-    # error: invalid command 'test'
+    # too complicated to setup
     doCheck = false;
 
     # patch only $out/bin to avoid problems with starter templates (see #3134)
@@ -7684,7 +7687,7 @@ in modules // {
       sha256 = "1vbcvn6ncg7hq5i1w95h746vkq9lmp120vx63h3p56z5nsz7gpmk";
     };
 
-    # error: invalid command 'test'
+    # too complicated to setup
     doCheck = false;
 
     # patch only $out/bin to avoid problems with starter templates (see #3134)

From 2b3f17f4e8d52c767ec9052ed6e547098736c1c6 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 17:06:03 +0100
Subject: [PATCH 0510/2285] pythonPackages.dateutil_1_5: disable for python 3.x

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6ff387a76db2..4fe590d52bf0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4280,6 +4280,8 @@ in modules // {
   dateutil_1_5 = buildPythonPackage (rec {
     name = "dateutil-1.5";
 
+    disabled = isPy3k;
+
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/p/python-dateutil/python-${name}.tar.gz";
       sha256 = "02dhw57jf5kjcp7ng1if7vdrbnlpb9yjmz7wygwwvf3gni4766bg";

From a98b8f3f111d4d712c1f2a902a3fc85af4893822 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 17:08:11 +0100
Subject: [PATCH 0511/2285] pythonPackages.pygments_2_0: init at 2.0.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4fe590d52bf0..ac21aa9082db 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16001,6 +16001,16 @@ in modules // {
     };
   };
 
+  # For Pelican 3.6.3
+  pygments_2_0 = self.pygments.override rec {
+    version = "2.0.2";
+    name = "Pygments-${version}";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/P/Pygments/${name}.tar.gz";
+      sha256 = "7320919084e6dac8f4540638a46447a3bd730fca172afc17d2c03eed22cf4f51";
+    };
+  };
 
   pygpgme = buildPythonPackage rec {
     version = "0.3";

From 9aac99ccb07ced3fe4f75a43b8934549580d5c85 Mon Sep 17 00:00:00 2001
From: Aaron Schif <aaronschif@gmail.com>
Date: Mon, 18 Jan 2016 19:11:50 -0600
Subject: [PATCH 0512/2285] homesick: init at 1.1.3 (close #12465)

---
 lib/maintainers.nix                   |  1 +
 pkgs/tools/misc/homesick/Gemfile      |  3 +++
 pkgs/tools/misc/homesick/Gemfile.lock | 15 ++++++++++++++
 pkgs/tools/misc/homesick/default.nix  | 28 +++++++++++++++++++++++++++
 pkgs/tools/misc/homesick/gemset.nix   | 16 +++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 6 files changed, 65 insertions(+)
 create mode 100644 pkgs/tools/misc/homesick/Gemfile
 create mode 100644 pkgs/tools/misc/homesick/Gemfile.lock
 create mode 100644 pkgs/tools/misc/homesick/default.nix
 create mode 100644 pkgs/tools/misc/homesick/gemset.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 544e820de20c..7fe0e7a70dc3 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -7,6 +7,7 @@
      so it's easy to ping a package @maintainer.
   */
 
+  aaronschif = "Aaron Schif <aaronschif@gmail.com>";
   a1russell = "Adam Russell <adamlr6+pub@gmail.com>";
   abaldeau = "Andreas Baldeau <andreas@baldeau.net>";
   abbradar = "Nikolay Amiantov <ab@fmap.me>";
diff --git a/pkgs/tools/misc/homesick/Gemfile b/pkgs/tools/misc/homesick/Gemfile
new file mode 100644
index 000000000000..fb1d6a5584f9
--- /dev/null
+++ b/pkgs/tools/misc/homesick/Gemfile
@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gem "homesick"
diff --git a/pkgs/tools/misc/homesick/Gemfile.lock b/pkgs/tools/misc/homesick/Gemfile.lock
new file mode 100644
index 000000000000..cac0e8d083ef
--- /dev/null
+++ b/pkgs/tools/misc/homesick/Gemfile.lock
@@ -0,0 +1,15 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    homesick (1.1.3)
+      thor (>= 0.14.0)
+    thor (0.19.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  homesick
+
+BUNDLED WITH
+   1.10.6
diff --git a/pkgs/tools/misc/homesick/default.nix b/pkgs/tools/misc/homesick/default.nix
new file mode 100644
index 000000000000..9ea54f1f0b32
--- /dev/null
+++ b/pkgs/tools/misc/homesick/default.nix
@@ -0,0 +1,28 @@
+{ lib, bundlerEnv, git}:
+bundlerEnv {
+  name = "homesick-1.1.3";
+
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+
+  # Cannot use `wrapProgram` because the the help is aware of the file name.
+  postInstall = ''
+    rm $out/bin/thor
+    sed 1a'ENV["PATH"] = "${git}/bin:#{ENV["PATH"] ? ":#{ENV["PATH"]}" : "" }"' -i $out/bin/homesick
+  '';
+
+  meta = with lib; {
+    description = "Your home directory is your castle. Don't leave your dotfiles behind.";
+    long_description =
+      ''
+        Homesick is sorta like rip, but for dotfiles. It uses git to clone a repository containing
+        dotfiles, and saves them in ~/.homesick. It then allows you to symlink all the dotfiles into
+        place with a single command.
+      '';
+    homepage = https://github.com/technicalpickles/homesick;
+    license = licenses.mit;
+    maintainers = with maintainers; [ aaronschif ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/misc/homesick/gemset.nix b/pkgs/tools/misc/homesick/gemset.nix
new file mode 100644
index 000000000000..b4a3b608bcb1
--- /dev/null
+++ b/pkgs/tools/misc/homesick/gemset.nix
@@ -0,0 +1,16 @@
+{
+  homesick = {
+    version = "1.1.3";
+    source = {
+        type = "gem";
+        sha256 = "1pqsnbykisc6qamkz1gcbgis4az95sggxfdkq9v5hjr1a46q0s91";
+    };
+  };
+  thor = {
+      version = "0.19.1";
+      source = {
+          type = "gem";
+          sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
+      };
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ceb8ff80d63..9e6ccb141ea3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1880,6 +1880,8 @@ let
     lua = lua5;
   };
 
+  homesick = callPackage ../tools/misc/homesick { };
+
   honcho = callPackage ../tools/system/honcho { };
 
   horst = callPackage ../tools/networking/horst { };

From d9066cd36fec3116a01ed06df97ee5f365698fb9 Mon Sep 17 00:00:00 2001
From: Al Zohali <zohl@fmap.me>
Date: Sun, 24 Jan 2016 18:51:59 +0300
Subject: [PATCH 0513/2285] flashplayer-standalone: init at 11.2.202.559

---
 .../flashplayer-11/default.nix                | 36 +++++++++++++++++--
 pkgs/top-level/all-packages.nix               |  4 +++
 2 files changed, 37 insertions(+), 3 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 9521e1debd7c..f29f569cd3a0 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix
@@ -1,4 +1,5 @@
 { stdenv
+, lib
 , fetchurl
 , zlib
 , alsaLib
@@ -54,6 +55,7 @@ let
       else             "_linux.i386"
     else throw "Flash Player is not supported on this platform";
 
+  is-i686 = (stdenv.system == "i686-linux");
 in
 stdenv.mkDerivation rec {
   name = "flashplayer-${version}";
@@ -67,19 +69,47 @@ stdenv.mkDerivation rec {
   buildInputs = [ unzip ];
 
   postUnpack = ''
-    cd */*${arch}
-    tar -xvzf *${suffix}.tar.gz
+    pushd $sourceRoot
+    tar -xvzf *${arch}/*${suffix}.tar.gz
+
+    ${ lib.optionalString is-i686 ''
+       tar -xvzf */*_sa.*.tar.gz
+       tar -xvzf */*_sa_debug.*.tar.gz
+    ''}
+
+    popd
   '';
 
-  sourceRoot = ".";
+  sourceRoot = "fp_${version}_archive";
 
   dontStrip = true;
   dontPatchELF = true;
 
+  outputs = [ "out" ] ++ lib.optionals is-i686 ["sa" "saDbg" ];
+
   installPhase = ''
     mkdir -p $out/lib/mozilla/plugins
     cp -pv libflashplayer.so $out/lib/mozilla/plugins
     patchelf --set-rpath "$rpath" $out/lib/mozilla/plugins/libflashplayer.so
+
+    ${ lib.optionalString is-i686 ''
+       mkdir -p $sa/bin
+       cp flashplayer $sa/bin/
+
+       patchelf \
+         --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+         --set-rpath "$rpath" \
+         $sa/bin/flashplayer
+
+
+       mkdir -p $saDbg/bin
+       cp flashplayerdebugger $saDbg/bin/
+
+       patchelf \
+         --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+         --set-rpath "$rpath" \
+         $saDbg/bin/flashplayerdebugger
+    ''}
   '';
 
   passthru = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d8a56bcb1795..20011a65bad4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11846,6 +11846,10 @@ let
     debug = config.flashplayer.debug or false;
   };
 
+  flashplayer-standalone = pkgsi686Linux.flashplayer.sa;
+
+  flashplayer-standalone-debugger = pkgsi686Linux.flashplayer.saDbg;
+
   fluxbox = callPackage ../applications/window-managers/fluxbox { };
 
   fme = callPackage ../applications/misc/fme {

From 700e4aebdca96e6e81a5956de59ff16b8347e596 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sun, 24 Jan 2016 13:27:41 -0500
Subject: [PATCH 0514/2285] ghcjs: fix the build

---
 pkgs/development/compilers/ghcjs/default.nix             | 6 ++++--
 pkgs/development/haskell-modules/configuration-ghcjs.nix | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 1dee12ca12c0..5d7b8d65b6a4 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -52,7 +52,7 @@ mkDerivation (rec {
   };
   isLibrary = true;
   isExecutable = true;
-  jailbreak = true;
+  jailbreak = false; # manually jailbreak, until postPatch in mkDerivation is fixed
   doHaddock = false;
   doCheck = false;
   buildDepends = [
@@ -72,6 +72,9 @@ mkDerivation (rec {
   ];
   patches = [ ./ghcjs.patch ];
   postPatch = ''
+    echo "Run jailbreak-cabal to lift version restrictions on build inputs."
+    ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal
+
     substituteInPlace Setup.hs \
       --replace "/usr/bin/env" "${coreutils}/bin/env"
 
@@ -119,5 +122,4 @@ mkDerivation (rec {
   license = stdenv.lib.licenses.bsd3;
   platforms = ghc.meta.platforms;
   maintainers = with stdenv.lib.maintainers; [ jwiegley cstrahan ];
-  broken = true; # depends on outdated versions of its Haskell build inputs
 })
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 6f68dec78e49..ca940e8de31c 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -58,7 +58,7 @@ self: super: {
   # These packages are core libraries in GHC 7.10.x, but not here.
   bin-package-db = null;
   haskeline = self.haskeline_0_7_2_1;
-  hoopl = self.hoopl_3_10_2_0;
+  hoopl = self.hoopl_3_10_2_1;
   hpc = self.hpc_0_6_0_2;
   terminfo = self.terminfo_0_4_0_1;
   xhtml = self.xhtml_3000_2_1;

From 4fd985b9ae242c639fb2cfa4eafb20a8f79c7cea Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sun, 24 Jan 2016 13:32:56 -0500
Subject: [PATCH 0515/2285] haskell-packages: properly set postPatch

The existing code overrode the postPatch, instead of combining the
jailbreak commands with the user supplied postPatch.
---
 pkgs/development/compilers/ghcjs/default.nix         | 5 +----
 pkgs/development/haskell-modules/generic-builder.nix | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 5d7b8d65b6a4..5ddfdc419179 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -52,7 +52,7 @@ mkDerivation (rec {
   };
   isLibrary = true;
   isExecutable = true;
-  jailbreak = false; # manually jailbreak, until postPatch in mkDerivation is fixed
+  jailbreak = true;
   doHaddock = false;
   doCheck = false;
   buildDepends = [
@@ -72,9 +72,6 @@ mkDerivation (rec {
   ];
   patches = [ ./ghcjs.patch ];
   postPatch = ''
-    echo "Run jailbreak-cabal to lift version restrictions on build inputs."
-    ${jailbreak-cabal}/bin/jailbreak-cabal ${pname}.cabal
-
     substituteInPlace Setup.hs \
       --replace "/usr/bin/env" "${coreutils}/bin/env"
 
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index ad820012bd1a..afd30c8283b1 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -299,7 +299,6 @@ stdenv.mkDerivation ({
 // optionalAttrs (configureFlags != []) { inherit configureFlags; }
 // optionalAttrs (patches != [])        { inherit patches; }
 // optionalAttrs (patchPhase != "")     { inherit patchPhase; }
-// optionalAttrs (postPatch != "")      { inherit postPatch; }
 // optionalAttrs (preConfigure != "")   { inherit preConfigure; }
 // optionalAttrs (postConfigure != "")  { inherit postConfigure; }
 // optionalAttrs (preBuild != "")       { inherit preBuild; }

From bea389d7d5255bd81ed280163b32b517abdfcf28 Mon Sep 17 00:00:00 2001
From: Siarhei Zirukin <ftrvxmtrx@gmail.com>
Date: Sat, 23 Jan 2016 23:04:22 +0100
Subject: [PATCH 0516/2285] e19: update

efl: 1.15.0 -> 1.16.1
elementary: 1.15.0 -> 1.16.1
emotion: 1.15.0 -> 1.16.0
enlightenment: 0.19.8 -> 0.20.3
evas: 1.15.0 -> 1.16.0
terminology: 0.8.0 -> 0.9.1
pythonefl_1_16: 1.15.0 -> 1.16.0
---
 pkgs/desktops/e19/default.nix       | 10 ++++------
 pkgs/desktops/e19/econnman.nix      |  4 ++--
 pkgs/desktops/e19/efl.nix           |  6 +++---
 pkgs/desktops/e19/elementary.nix    | 10 +++++-----
 pkgs/desktops/e19/emotion.nix       |  6 +++---
 pkgs/desktops/e19/enlightenment.nix | 10 +++++-----
 pkgs/desktops/e19/evas.nix          |  6 +++---
 pkgs/desktops/e19/terminology.nix   |  6 +++---
 pkgs/top-level/python-packages.nix  | 14 ++++++++++----
 9 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/pkgs/desktops/e19/default.nix b/pkgs/desktops/e19/default.nix
index 9c862734dcc1..4f319159bcc9 100644
--- a/pkgs/desktops/e19/default.nix
+++ b/pkgs/desktops/e19/default.nix
@@ -1,12 +1,11 @@
 { callPackage, pkgs }:
 let
-  openjpeg_1 = with pkgs; lib.overrideDerivation openjpeg (oldAttrs: {
-         name = "openjpeg-1.5.1";
+  openjpeg_1 = with pkgs; lib.overrideDerivation openjpeg (oldAttrs: rec {
+         name = "openjpeg-1.5.2";
          src = fetchurl {
-           url = "http://openjpeg.googlecode.com/files/openjpeg-1.5.1.tar.gz";
-           sha1 = "1b0b74d1af4c297fd82806a9325bb544caf9bb8b";
+           url = "mirror://sourceforge/openjpeg.mirror/${name}.tar.gz";
+           sha1 = "lahbqvjpsfdxsrm0wsy3pdrp3pzrjvj9";
          };
-         #passthru = { incDir = "openjpeg-1.5.1"; };
      });
 in
 rec {
@@ -23,5 +22,4 @@ rec {
   econnman = callPackage ./econnman.nix { };
   terminology = callPackage ./terminology.nix { };
   rage = callPackage ./rage.nix { };
-
 }
diff --git a/pkgs/desktops/e19/econnman.nix b/pkgs/desktops/e19/econnman.nix
index c75af81af1a6..35b58aec638d 100644
--- a/pkgs/desktops/e19/econnman.nix
+++ b/pkgs/desktops/e19/econnman.nix
@@ -8,9 +8,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ makeWrapper pkgconfig e19.efl python27 dbus ];
-  propagatedBuildInputs = [ python27Packages.pythonefl_1_15 python27Packages.dbus e19.elementary ];
+  propagatedBuildInputs = [ python27Packages.pythonefl_1_16 python27Packages.dbus e19.elementary ];
   postInstall = ''
-    wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_15}/lib/python2.7/site-packages
+    wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_16}/lib/python2.7/site-packages
   '';
 
   meta = {
diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix
index aa662f1ed873..39bb3b26325a 100644
--- a/pkgs/desktops/e19/efl.nix
+++ b/pkgs/desktops/e19/efl.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   name = "efl-${version}";
-  version = "1.15.0";
+  version = "1.16.1";
   src = fetchurl {
-    url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz";
-    sha256 = "1x5n2afy5z1akam5y187ajk52mq2k9lwmz7nlrxp92rvx1jf6li5";
+    url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.xz";
+    sha256 = "116s4lcfj5lrfhyvvka3np9glqyrh21cyl9rhw7al0wgb60vw0gg";
   };
 
   buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa
diff --git a/pkgs/desktops/e19/elementary.nix b/pkgs/desktops/e19/elementary.nix
index 17973d530ffd..1793a7e87c47 100644
--- a/pkgs/desktops/e19/elementary.nix
+++ b/pkgs/desktops/e19/elementary.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, e19, libcap, automake, autoconf, libdrm, gdbm }:
+{ stdenv, fetchurl, pkgconfig, e19, libcap, automake114x, autoconf, libdrm, gdbm }:
 stdenv.mkDerivation rec {
   name = "elementary-${version}";
-  version = "1.15.0";
+  version = "1.16.1";
   src = fetchurl {
-    url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz";
-    sha256 = "085s2xw3dhv8xiy7ikaaim5gil423g08wclhk0psi76g0vavgd32";
+    url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.xz";
+    sha256 = "0q58imh7s35q6cq5hsa6gqj84rkckh8s61iass8zyvcw19j66f3y";
   };
-  buildInputs = [ pkgconfig e19.efl libdrm gdbm automake autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
+  buildInputs = [ pkgconfig e19.efl libdrm gdbm automake114x autoconf ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
   NIX_CFLAGS_COMPILE = [ "-I${libdrm}/include/libdrm" ];
   patches = [ ./elementary.patch ];
   enableParallelBuilding = true;
diff --git a/pkgs/desktops/e19/emotion.nix b/pkgs/desktops/e19/emotion.nix
index a95759b6f17e..c38119719a0b 100644
--- a/pkgs/desktops/e19/emotion.nix
+++ b/pkgs/desktops/e19/emotion.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, e19, vlc }:
 stdenv.mkDerivation rec {
   name = "emotion_generic_players-${version}";
-  version = "1.15.0";
+  version = "1.16.0";
   src = fetchurl {
-    url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz";
-    sha256 = "08yl473aiklj0yfxbn88000hmnhl7dbhqixsn22ias8a90rxdfhh";
+    url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.xz";
+    sha256 = "163ay26c6dx49m1am7vsxxn0gy877zhayxq0yxn9zkbq2srzvjym";
   };
   buildInputs = [ pkgconfig e19.efl vlc ];
   NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" ];
diff --git a/pkgs/desktops/e19/enlightenment.nix b/pkgs/desktops/e19/enlightenment.nix
index e4396073c03b..5112058f8c6c 100644
--- a/pkgs/desktops/e19/enlightenment.nix
+++ b/pkgs/desktops/e19/enlightenment.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, e19, xorg, libffi, pam, alsaLib, luajit, bzip2
+{ stdenv, fetchurl, pkgconfig, e19, xorg, libffi, pam, alsaLib, luajit, bzip2, libuuid
 , libpthreadstubs, gdbm, libcap, mesa_glu, xkeyboard_config, set_freqset_setuid ? false }:
 
 stdenv.mkDerivation rec {
   name = "enlightenment-${version}";
-  version = "0.19.8";
+  version = "0.20.3";
   src = fetchurl {
     url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz";
-    sha256 = "1y83jnq01k9i328adgjgpfwgpvvd2a1ixpm029pjcar8p1mvgadi";
+    sha256 = "19z3bwdzwpzwi330l5g5mj7xy6wy8xrc39zivjhm0d1ql3fh649j";
   };
   buildInputs = [ pkgconfig e19.efl e19.elementary xorg.libXdmcp xorg.libxcb
-    xorg.xcbutilkeysyms xorg.libXrandr libffi pam alsaLib luajit bzip2
+    xorg.xcbutilkeysyms xorg.libXrandr libffi pam alsaLib luajit bzip2 libuuid
     libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ];
-  NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" "-I${e19.efl}/include/emile-1" ];
+  NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/eo-1" "-I${e19.efl}/include/emile-1" "-I${libuuid}/include/uuid" ];
   preConfigure = ''
     export USER_SESSION_DIR=$prefix/lib/systemd/user
 
diff --git a/pkgs/desktops/e19/evas.nix b/pkgs/desktops/e19/evas.nix
index 553abec576ef..b777dc893d70 100644
--- a/pkgs/desktops/e19/evas.nix
+++ b/pkgs/desktops/e19/evas.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }:
 stdenv.mkDerivation rec {
   name = "evas_generic_loaders-${version}";
-  version = "1.15.0";
+  version = "1.16.0";
   src = fetchurl {
-    url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz";
-    sha256 = "1k9bmswrgfara4a7znqcv3qbhq3zjbm0ks1zdb0jk5mfl6djr8na";
+    url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.xz";
+    sha256 = "1il3i3rii6ddpj7cw2mdqnb0q2wmhwnvs6qi9janna1n5hhrqyfm";
   };
   buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ];
   meta = {
diff --git a/pkgs/desktops/e19/terminology.nix b/pkgs/desktops/e19/terminology.nix
index 32135bbe2e2c..195a1f436644 100644
--- a/pkgs/desktops/e19/terminology.nix
+++ b/pkgs/desktops/e19/terminology.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchurl, pkgconfig, e19 }:
 stdenv.mkDerivation rec {
   name = "terminology-${version}";
-  version = "0.8.0";
+  version = "0.9.1";
   src = fetchurl {
-    url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz";
-    sha256 = "7a10d44b023cf6134c2483304e4ad33bea6df0f11266aec482f54fa67a3ce628";
+    url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.xz";
+    sha256 = "1kwv9vkhngdm5v38q93xpcykghnyawhjjcb5bgy0p89gpbk7mvpc";
   };
   buildInputs = [ pkgconfig e19.efl e19.elementary ];
   meta = {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3e9fe466fdd3..f7e19b086db7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22725,17 +22725,23 @@ in modules // {
     };
   };
 
-  pythonefl_1_15 = buildPythonPackage rec {
+  pythonefl_1_16 = buildPythonPackage rec {
     name = "python-efl-${version}";
-    version = "1.15.0";
+    version = "1.16.0";
     src = pkgs.fetchurl {
-      url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.gz";
-      sha256 = "1k3vb7pb70l2v1s2mzg91wvmncq93vb04vn60pzdlrnbcns0grhi";
+      url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz";
+      sha256 = "142ffki41xj0z2dnf011g8j4b35waviprk4x1dhvy1wgqdywl61l";
     };
+
     preConfigure = ''
       export NIX_CFLAGS_COMPILE="$(pkg-config --cflags efl) -I${self.dbus}/include/dbus-1.0 $NIX_CFLAGS_COMPILE"
     '';
+    preBuild = "${python}/bin/${python.executable} setup.py build_ext";
+    installPhase= "${python}/bin/${python.executable} setup.py install --prefix=$out";
+
     buildInputs = with self; [ pkgs.pkgconfig pkgs.e19.efl pkgs.e19.elementary ];
+    doCheck = false;
+
     meta = {
       description = "Python bindings for EFL and Elementary";
       homepage = http://enlightenment.org/;

From d39f16fee644dcdc76b4c2aabb3f8621c147d34d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 24 Jan 2016 19:42:41 +0100
Subject: [PATCH 0517/2285] pythonPackages.pelican: fix tests with Pygments 2.1

Broken in 38c83e291681d16273dd68749117dc64c756d0e7.
I'll open an upstream PR with this patch as well.
---
 .../pelican-fix-tests-with-pygments-2.1.patch | 318 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   2 +
 2 files changed, 320 insertions(+)
 create mode 100644 pkgs/development/python-modules/pelican-fix-tests-with-pygments-2.1.patch

diff --git a/pkgs/development/python-modules/pelican-fix-tests-with-pygments-2.1.patch b/pkgs/development/python-modules/pelican-fix-tests-with-pygments-2.1.patch
new file mode 100644
index 000000000000..4568b8b94481
--- /dev/null
+++ b/pkgs/development/python-modules/pelican-fix-tests-with-pygments-2.1.patch
@@ -0,0 +1,318 @@
+diff --git a/pelican/tests/output/basic/feeds/all-en.atom.xml b/pelican/tests/output/basic/feeds/all-en.atom.xml
+index 3ce41d7..3cf97a8 100644
+--- a/pelican/tests/output/basic/feeds/all-en.atom.xml
++++ b/pelican/tests/output/basic/feeds/all-en.atom.xml
+@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+ &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
++&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+ &lt;p&gt;Lovely.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+@@ -58,4 +58,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
+ &lt;p&gt;Lovely.&lt;/p&gt;
+ &lt;/div&gt;
+ </summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+-</summary></entry></feed>
++</summary></entry></feed>
+\ No newline at end of file
+diff --git a/pelican/tests/output/basic/feeds/all.atom.xml b/pelican/tests/output/basic/feeds/all.atom.xml
+index 3a9478a..24d31a9 100644
+--- a/pelican/tests/output/basic/feeds/all.atom.xml
++++ b/pelican/tests/output/basic/feeds/all.atom.xml
+@@ -43,7 +43,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+ &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
++&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+ &lt;p&gt;Lovely.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+@@ -59,4 +59,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
+ &lt;p&gt;Lovely.&lt;/p&gt;
+ &lt;/div&gt;
+ </summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+-</summary></entry></feed>
++</summary></entry></feed>
+\ No newline at end of file
+diff --git a/pelican/tests/output/basic/feeds/misc.atom.xml b/pelican/tests/output/basic/feeds/misc.atom.xml
+index a9b5977..4ad7008 100644
+--- a/pelican/tests/output/basic/feeds/misc.atom.xml
++++ b/pelican/tests/output/basic/feeds/misc.atom.xml
+@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+ &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
++&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+ &lt;p&gt;Lovely.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+@@ -35,4 +35,4 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
+ &lt;p&gt;Lovely.&lt;/p&gt;
+ &lt;/div&gt;
+ </summary></entry><entry><title>The baz tag</title><link href="/tag/baz.html" rel="alternate"></link><updated>2010-03-14T00:00:00+00:00</updated><author><name></name></author><id>tag:,2010-03-14:tag/baz.html</id><summary type="html">&lt;p&gt;This article overrides the listening of the articles under the &lt;em&gt;baz&lt;/em&gt; tag.&lt;/p&gt;
+-</summary></entry></feed>
++</summary></entry></feed>
+\ No newline at end of file
+diff --git a/pelican/tests/output/basic/unbelievable.html b/pelican/tests/output/basic/unbelievable.html
+index dfb0c54..b7f8a7e 100644
+--- a/pelican/tests/output/basic/unbelievable.html
++++ b/pelican/tests/output/basic/unbelievable.html
+@@ -38,7 +38,7 @@
+                 Published: Fri 15 October 2010
+         </abbr>
+ 
+-<p>In <a href="/category/misc.html">misc</a>. </p>
++<p>In <a href="/category/misc.html">misc</a>.</p>
+ 
+ </footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
+ <p><a class="reference external" href="/a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+@@ -58,7 +58,7 @@ pelican.conf, it will have nothing in default.</p>
+ </div>
+ <div class="section" id="testing-more-sourcecode-directives">
+ <h2>Testing more sourcecode directives</h2>
+-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">  </span>     <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span>     <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">  </span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span>     <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">  </span>         <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">  </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span>     <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">  </span>             <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span>         <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">  </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span>     <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">  </span>         <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span>             <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">  </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span>     <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">  </span>     <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span>     <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">  </span>     <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
++<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">   </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">   </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">   </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">   </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">   </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">   </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">   </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">   </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">   </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">   </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+ <p>Lovely.</p>
+ </div>
+ <div class="section" id="testing-even-more-sourcecode-directives">
+@@ -97,4 +97,4 @@ pelican.conf, it will have nothing in default.</p>
+         </footer><!-- /#contentinfo -->
+ 
+ </body>
+-</html>
++</html>
+\ No newline at end of file
+diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
+index cb74637..987f987 100644
+--- a/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
++++ b/pelican/tests/output/custom/feeds/alexis-metaireau.atom.xml
+@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+ &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
++&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+ &lt;p&gt;Lovely.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+diff --git a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
+index 2c4b116..89082ee 100644
+--- a/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
++++ b/pelican/tests/output/custom/feeds/alexis-metaireau.rss.xml
+@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+ &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
++&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+ &lt;p&gt;Lovely.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+diff --git a/pelican/tests/output/custom/feeds/all-en.atom.xml b/pelican/tests/output/custom/feeds/all-en.atom.xml
+index 3574ab4..75b6333 100644
+--- a/pelican/tests/output/custom/feeds/all-en.atom.xml
++++ b/pelican/tests/output/custom/feeds/all-en.atom.xml
+@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+ &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
++&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+ &lt;p&gt;Lovely.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+diff --git a/pelican/tests/output/custom/feeds/all.atom.xml b/pelican/tests/output/custom/feeds/all.atom.xml
+index 391ab85..efb43cd 100644
+--- a/pelican/tests/output/custom/feeds/all.atom.xml
++++ b/pelican/tests/output/custom/feeds/all.atom.xml
+@@ -44,7 +44,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+ &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
++&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+ &lt;p&gt;Lovely.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+diff --git a/pelican/tests/output/custom/feeds/all.rss.xml b/pelican/tests/output/custom/feeds/all.rss.xml
+index a78d2de..548b16c 100644
+--- a/pelican/tests/output/custom/feeds/all.rss.xml
++++ b/pelican/tests/output/custom/feeds/all.rss.xml
+@@ -44,7 +44,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+ &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
++&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+ &lt;p&gt;Lovely.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+diff --git a/pelican/tests/output/custom/feeds/misc.atom.xml b/pelican/tests/output/custom/feeds/misc.atom.xml
+index 91d6b28..dbab63c 100644
+--- a/pelican/tests/output/custom/feeds/misc.atom.xml
++++ b/pelican/tests/output/custom/feeds/misc.atom.xml
+@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+ &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
++&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+ &lt;p&gt;Lovely.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+diff --git a/pelican/tests/output/custom/feeds/misc.rss.xml b/pelican/tests/output/custom/feeds/misc.rss.xml
+index 3493d2a..2d13bda 100644
+--- a/pelican/tests/output/custom/feeds/misc.rss.xml
++++ b/pelican/tests/output/custom/feeds/misc.rss.xml
+@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+ &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
++&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+ &lt;p&gt;Lovely.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+diff --git a/pelican/tests/output/custom/unbelievable.html b/pelican/tests/output/custom/unbelievable.html
+index 2e51cf0..b6d2136 100644
+--- a/pelican/tests/output/custom/unbelievable.html
++++ b/pelican/tests/output/custom/unbelievable.html
+@@ -43,9 +43,9 @@
+         </abbr>
+ 
+         <address class="vcard author">
+-                By <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
++                By                         <a class="url fn" href="./author/alexis-metaireau.html">Alexis Métaireau</a>
+         </address>
+-<p>In <a href="./category/misc.html">misc</a>. </p>
++<p>In <a href="./category/misc.html">misc</a>.</p>
+ 
+ </footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
+ <p><a class="reference external" href="./a-markdown-powered-article.html">a root-relative link to markdown-article</a>
+@@ -65,7 +65,7 @@ pelican.conf, it will have nothing in default.</p>
+ </div>
+ <div class="section" id="testing-more-sourcecode-directives">
+ <h2>Testing more sourcecode directives</h2>
+-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">  </span>     <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span>     <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">  </span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span>     <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">  </span>         <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">  </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span>     <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">  </span>             <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span>         <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">  </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span>     <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">  </span>         <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span>             <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">  </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span>     <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">  </span>     <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span>     <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">  </span>     <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
++<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">   </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">   </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">   </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">   </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">   </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">   </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">   </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">   </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">   </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">   </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+ <p>Lovely.</p>
+ </div>
+ <div class="section" id="testing-even-more-sourcecode-directives">
+diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
+index 8fb3ef6..2090087 100644
+--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
++++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.atom.xml
+@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+ &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
++&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+ &lt;p&gt;Lovely.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+diff --git a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
+index 99255ee..00944ce 100644
+--- a/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
++++ b/pelican/tests/output/custom_locale/feeds/alexis-metaireau.rss.xml
+@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+ &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
++&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+ &lt;p&gt;Lovely.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+diff --git a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
+index 6b2f09b..297558d 100644
+--- a/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
++++ b/pelican/tests/output/custom_locale/feeds/all-en.atom.xml
+@@ -42,7 +42,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+ &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
++&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+ &lt;p&gt;Lovely.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+diff --git a/pelican/tests/output/custom_locale/feeds/all.atom.xml b/pelican/tests/output/custom_locale/feeds/all.atom.xml
+index 5ef59e0..78da527 100644
+--- a/pelican/tests/output/custom_locale/feeds/all.atom.xml
++++ b/pelican/tests/output/custom_locale/feeds/all.atom.xml
+@@ -44,7 +44,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+ &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
++&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+ &lt;p&gt;Lovely.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+diff --git a/pelican/tests/output/custom_locale/feeds/all.rss.xml b/pelican/tests/output/custom_locale/feeds/all.rss.xml
+index 071e2f1..84fd5df 100644
+--- a/pelican/tests/output/custom_locale/feeds/all.rss.xml
++++ b/pelican/tests/output/custom_locale/feeds/all.rss.xml
+@@ -44,7 +44,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+ &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
++&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+ &lt;p&gt;Lovely.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+diff --git a/pelican/tests/output/custom_locale/feeds/misc.atom.xml b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
+index c91d4d7..fde02e6 100644
+--- a/pelican/tests/output/custom_locale/feeds/misc.atom.xml
++++ b/pelican/tests/output/custom_locale/feeds/misc.atom.xml
+@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+ &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
++&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+ &lt;p&gt;Lovely.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+diff --git a/pelican/tests/output/custom_locale/feeds/misc.rss.xml b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
+index 82b5898..bd727bb 100644
+--- a/pelican/tests/output/custom_locale/feeds/misc.rss.xml
++++ b/pelican/tests/output/custom_locale/feeds/misc.rss.xml
+@@ -19,7 +19,7 @@ pelican.conf, it will have nothing in default.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-more-sourcecode-directives"&gt;
+ &lt;h2&gt;Testing more sourcecode directives&lt;/h2&gt;
+-&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8&lt;/span&gt; &lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10&lt;/span&gt;     &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12&lt;/span&gt;     &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingc"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14&lt;/span&gt;         &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16&lt;/span&gt;     &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18&lt;/span&gt;         &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20&lt;/span&gt;     &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;         &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22&lt;/span&gt;             &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt; &lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24&lt;/span&gt;     &lt;span class="testingc"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26&lt;/span&gt;     &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;  &lt;/span&gt;     &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
++&lt;div class="highlight"&gt;&lt;pre&gt;&lt;span id="foo-8"&gt;&lt;a name="foo-8"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt; 8 &lt;/span&gt;&lt;span class="testingk"&gt;def&lt;/span&gt; &lt;span class="testingnf"&gt;run&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-9"&gt;&lt;a name="foo-9"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;assert_has_content&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-10"&gt;&lt;a name="foo-10"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;10 &lt;/span&gt;    &lt;span class="testingk"&gt;try&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-11"&gt;&lt;a name="foo-11"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;get_lexer_by_name&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;arguments&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingmi"&gt;0&lt;/span&gt;&lt;span class="testingp"&gt;])&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-12"&gt;&lt;a name="foo-12"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;12 &lt;/span&gt;    &lt;span class="testingk"&gt;except&lt;/span&gt; &lt;span class="testingne"&gt;ValueError&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-13"&gt;&lt;a name="foo-13"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingc1"&gt;# no lexer found - use the text one instead of an exception&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-14"&gt;&lt;a name="foo-14"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;14 &lt;/span&gt;        &lt;span class="testingn"&gt;lexer&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;TextLexer&lt;/span&gt;&lt;span class="testingp"&gt;()&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-15"&gt;&lt;a name="foo-15"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-16"&gt;&lt;a name="foo-16"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;16 &lt;/span&gt;    &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt; &lt;span class="testingow"&gt;and&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-17"&gt;&lt;a name="foo-17"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingow"&gt;not&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;inline&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-18"&gt;&lt;a name="foo-18"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;18 &lt;/span&gt;        &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;linenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;table&amp;#39;&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-19"&gt;&lt;a name="foo-19"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-20"&gt;&lt;a name="foo-20"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;20 &lt;/span&gt;    &lt;span class="testingk"&gt;for&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;nowrap&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;nobackground&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testings1"&gt;&amp;#39;anchorlinenos&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;):&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-21"&gt;&lt;a name="foo-21"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;        &lt;span class="testingk"&gt;if&lt;/span&gt; &lt;span class="testingn"&gt;flag&lt;/span&gt; &lt;span class="testingow"&gt;in&lt;/span&gt; &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;:&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-22"&gt;&lt;a name="foo-22"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;22 &lt;/span&gt;            &lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;flag&lt;/span&gt;&lt;span class="testingp"&gt;]&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingbp"&gt;True&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-23"&gt;&lt;a name="foo-23"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-24"&gt;&lt;a name="foo-24"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;24 &lt;/span&gt;    &lt;span class="testingc1"&gt;# noclasses should already default to False, but just in case...&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-25"&gt;&lt;a name="foo-25"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingn"&gt;formatter&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;HtmlFormatter&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingn"&gt;noclasses&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testingbp"&gt;False&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingo"&gt;**&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;options&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-26"&gt;&lt;a name="foo-26"&gt;&lt;/a&gt;&lt;span class="lineno special"&gt;26 &lt;/span&gt;    &lt;span class="testingn"&gt;parsed&lt;/span&gt; &lt;span class="testingo"&gt;=&lt;/span&gt; &lt;span class="testingn"&gt;highlight&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingse"&gt;\n&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;join&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testingbp"&gt;self&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;content&lt;/span&gt;&lt;span class="testingp"&gt;),&lt;/span&gt; &lt;span class="testingn"&gt;lexer&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;formatter&lt;/span&gt;&lt;span class="testingp"&gt;)&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;span id="foo-27"&gt;&lt;a name="foo-27"&gt;&lt;/a&gt;&lt;span class="lineno"&gt;   &lt;/span&gt;    &lt;span class="testingk"&gt;return&lt;/span&gt; &lt;span class="testingp"&gt;[&lt;/span&gt;&lt;span class="testingn"&gt;nodes&lt;/span&gt;&lt;span class="testingo"&gt;.&lt;/span&gt;&lt;span class="testingn"&gt;raw&lt;/span&gt;&lt;span class="testingp"&gt;(&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;parsed&lt;/span&gt;&lt;span class="testingp"&gt;,&lt;/span&gt; &lt;span class="testingn"&gt;format&lt;/span&gt;&lt;span class="testingo"&gt;=&lt;/span&gt;&lt;span class="testings1"&gt;&amp;#39;html&amp;#39;&lt;/span&gt;&lt;span class="testingp"&gt;)]&lt;/span&gt;&lt;br&gt;&lt;/span&gt;&lt;/pre&gt;&lt;/div&gt;
+ &lt;p&gt;Lovely.&lt;/p&gt;
+ &lt;/div&gt;
+ &lt;div class="section" id="testing-even-more-sourcecode-directives"&gt;
+diff --git a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+index a6ea869..1e2d78f 100644
+--- a/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
++++ b/pelican/tests/output/custom_locale/posts/2010/octobre/15/unbelievable/index.html
+@@ -45,7 +45,7 @@
+         <address class="vcard author">
+                 By                         <a class="url fn" href="../../../../../author/alexis-metaireau.html">Alexis Métaireau</a>
+         </address>
+-<p>In <a href="../../../../../category/misc.html">misc</a>. </p>
++<p>In <a href="../../../../../category/misc.html">misc</a>.</p>
+ 
+ </footer><!-- /.post-info -->      <p>Or completely awesome. Depends the needs.</p>
+ <p><a class="reference external" href="../../../../../posts/2011/avril/20/a-markdown-powered-article/">a root-relative link to markdown-article</a>
+@@ -65,7 +65,7 @@ pelican.conf, it will have nothing in default.</p>
+ </div>
+ <div class="section" id="testing-more-sourcecode-directives">
+ <h2>Testing more sourcecode directives</h2>
+-<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8</span> <span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">  </span>     <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10</span>     <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">  </span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12</span>     <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">  </span>         <span class="testingc"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14</span>         <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">  </span> <br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16</span>     <span class="testingk">if</span> <span class="testingp">(</span><span class="testings">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">  </span>             <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18</span>         <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">  </span> <br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20</span>     <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">  </span>         <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22</span>             <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">  </span> <br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24</span>     <span class="testingc"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">  </span>     <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26</span>     <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings">&#39;</span><span class="testingse">\n</span><span class="testings">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">  </span>     <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
++<div class="highlight"><pre><span id="foo-8"><a name="foo-8"></a><span class="lineno special"> 8 </span><span class="testingk">def</span> <span class="testingnf">run</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingp">):</span><br></span><span id="foo-9"><a name="foo-9"></a><span class="lineno">   </span>    <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">assert_has_content</span><span class="testingp">()</span><br></span><span id="foo-10"><a name="foo-10"></a><span class="lineno special">10 </span>    <span class="testingk">try</span><span class="testingp">:</span><br></span><span id="foo-11"><a name="foo-11"></a><span class="lineno">   </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">get_lexer_by_name</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">arguments</span><span class="testingp">[</span><span class="testingmi">0</span><span class="testingp">])</span><br></span><span id="foo-12"><a name="foo-12"></a><span class="lineno special">12 </span>    <span class="testingk">except</span> <span class="testingne">ValueError</span><span class="testingp">:</span><br></span><span id="foo-13"><a name="foo-13"></a><span class="lineno">   </span>        <span class="testingc1"># no lexer found - use the text one instead of an exception</span><br></span><span id="foo-14"><a name="foo-14"></a><span class="lineno special">14 </span>        <span class="testingn">lexer</span> <span class="testingo">=</span> <span class="testingn">TextLexer</span><span class="testingp">()</span><br></span><span id="foo-15"><a name="foo-15"></a><span class="lineno">   </span><br></span><span id="foo-16"><a name="foo-16"></a><span class="lineno special">16 </span>    <span class="testingk">if</span> <span class="testingp">(</span><span class="testings1">&#39;linenos&#39;</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span> <span class="testingow">and</span><br></span><span id="foo-17"><a name="foo-17"></a><span class="lineno">   </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingow">not</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;table&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;inline&#39;</span><span class="testingp">)):</span><br></span><span id="foo-18"><a name="foo-18"></a><span class="lineno special">18 </span>        <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testings1">&#39;linenos&#39;</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testings1">&#39;table&#39;</span><br></span><span id="foo-19"><a name="foo-19"></a><span class="lineno">   </span><br></span><span id="foo-20"><a name="foo-20"></a><span class="lineno special">20 </span>    <span class="testingk">for</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingp">(</span><span class="testings1">&#39;nowrap&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;nobackground&#39;</span><span class="testingp">,</span> <span class="testings1">&#39;anchorlinenos&#39;</span><span class="testingp">):</span><br></span><span id="foo-21"><a name="foo-21"></a><span class="lineno">   </span>        <span class="testingk">if</span> <span class="testingn">flag</span> <span class="testingow">in</span> <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">:</span><br></span><span id="foo-22"><a name="foo-22"></a><span class="lineno special">22 </span>            <span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">[</span><span class="testingn">flag</span><span class="testingp">]</span> <span class="testingo">=</span> <span class="testingbp">True</span><br></span><span id="foo-23"><a name="foo-23"></a><span class="lineno">   </span><br></span><span id="foo-24"><a name="foo-24"></a><span class="lineno special">24 </span>    <span class="testingc1"># noclasses should already default to False, but just in case...</span><br></span><span id="foo-25"><a name="foo-25"></a><span class="lineno">   </span>    <span class="testingn">formatter</span> <span class="testingo">=</span> <span class="testingn">HtmlFormatter</span><span class="testingp">(</span><span class="testingn">noclasses</span><span class="testingo">=</span><span class="testingbp">False</span><span class="testingp">,</span> <span class="testingo">**</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">options</span><span class="testingp">)</span><br></span><span id="foo-26"><a name="foo-26"></a><span class="lineno special">26 </span>    <span class="testingn">parsed</span> <span class="testingo">=</span> <span class="testingn">highlight</span><span class="testingp">(</span><span class="testings1">&#39;</span><span class="testingse">\n</span><span class="testings1">&#39;</span><span class="testingo">.</span><span class="testingn">join</span><span class="testingp">(</span><span class="testingbp">self</span><span class="testingo">.</span><span class="testingn">content</span><span class="testingp">),</span> <span class="testingn">lexer</span><span class="testingp">,</span> <span class="testingn">formatter</span><span class="testingp">)</span><br></span><span id="foo-27"><a name="foo-27"></a><span class="lineno">   </span>    <span class="testingk">return</span> <span class="testingp">[</span><span class="testingn">nodes</span><span class="testingo">.</span><span class="testingn">raw</span><span class="testingp">(</span><span class="testings1">&#39;&#39;</span><span class="testingp">,</span> <span class="testingn">parsed</span><span class="testingp">,</span> <span class="testingn">format</span><span class="testingo">=</span><span class="testings1">&#39;html&#39;</span><span class="testingp">)]</span><br></span></pre></div>
+ <p>Lovely.</p>
+ </div>
+ <div class="section" id="testing-even-more-sourcecode-directives">
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3e9fe466fdd3..b373c72b3a15 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14118,6 +14118,8 @@ in modules // {
       sha256 = "1k572anw39rws67mvxl2w6y93y8w8q5smnwc0dd2gnnr16cc2vsh";
     };
 
+    patches = [ ../development/python-modules/pelican-fix-tests-with-pygments-2.1.patch ];
+
     buildInputs = with self; [
       pkgs.glibcLocales
       pkgs.pandoc

From 3479b2f985ac8ebe3f6d8e6be28b0108ecc495ee Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 17:08:46 +0100
Subject: [PATCH 0518/2285] pythonPackages.typogrify: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ac21aa9082db..3883d8271911 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24220,7 +24220,9 @@ in modules // {
       md5 = "63f38f80531996f187d2894cc497ba08";
     };
     disabled = isPyPy;
-    propagatedBuildInputs = with self; [ smartypants ];
+    # Wants to set up Django
+    doCheck = false;
+    propagatedBuildInputs = with self; [ django_1_9 smartypants jinja2 ];
     meta = {
       description = "Filters to enhance web typography, including support for Django & Jinja templates";
       homepage = "https://github.com/mintchaos/typogrify";

From fcd91c453cea3f62201b0aa18b2eecc8c5880685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Jan 2016 17:13:20 +0100
Subject: [PATCH 0519/2285] ndg_httpsclient: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3883d8271911..097d37a11e9c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6295,6 +6295,9 @@ in modules // {
       sha256 = "1prv4j3wcy9kl5ndd5by543xp4cji9k35qncsl995w6sway34s1a";
     };
 
+    # uses networking
+    doCheck = false;
+
     meta = {
       homepage = https://github.com/cedadev/ndg_httpsclient/;
       description = "Provide enhanced HTTPS support for httplib and urllib2 using PyOpenSSL";

From feec7427e561d9dc4e2d02fe7bc989e5b9e95b4a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 17:34:36 +0100
Subject: [PATCH 0520/2285] pythonPackages.pycups: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 097d37a11e9c..707a0719bee9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15707,6 +15707,9 @@ in modules // {
 
     buildInputs = [ pkgs.cups ];
 
+    # Wants to connect to CUPS
+    doCheck = false;
+
     meta = {
       description = "Python bindings for libcups";
       homepage = http://cyberelk.net/tim/software/pycups/;

From 44f8a047f16296d516cbd225c7b98645b18e49ec Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 17:34:46 +0100
Subject: [PATCH 0521/2285] pythonPackages.mysql: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 707a0719bee9..135ae990214f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11683,6 +11683,15 @@ in modules // {
       rev = "refs/tags/pymysql-${version}";
       sha256 = "12v8bw7pp455zqkwraxk69qycz2ngk18bbz60v72kdbp6kssnqhz";
     };
+
+    buildInputs = with self; [ unittest2 ];
+
+    checkPhase = ''
+      ${python.interpreter} runtests.py
+    '';
+
+    # Wants to connect to MySQL
+    doCheck = false;
   };
 
   pymysqlsa = self.buildPythonPackage rec {

From d483ad069fa00e6963a7ca1afe2a16b9c032a89e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Jan 2016 17:35:12 +0100
Subject: [PATCH 0522/2285] pymysql: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 135ae990214f..df4c71f85b65 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11678,6 +11678,8 @@ in modules // {
   pymysql = buildPythonPackage rec {
     name = "pymysql-${version}";
     version = "0.6.6";
+    # expects a local myqsl instance
+    doCheck = false;
     src = pkgs.fetchgit {
       url = https://github.com/PyMySQL/PyMySQL.git;
       rev = "refs/tags/pymysql-${version}";

From 8dda9916e2ad60aea5ba1a9944169710678259aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Jan 2016 17:36:52 +0100
Subject: [PATCH 0523/2285] sqlparse: disable tests on py3k

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index df4c71f85b65..a7b4b9f09c5a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11678,8 +11678,6 @@ in modules // {
   pymysql = buildPythonPackage rec {
     name = "pymysql-${version}";
     version = "0.6.6";
-    # expects a local myqsl instance
-    doCheck = false;
     src = pkgs.fetchgit {
       url = https://github.com/PyMySQL/PyMySQL.git;
       rev = "refs/tags/pymysql-${version}";
@@ -19643,6 +19641,9 @@ in modules // {
     name = "sqlparse-${version}";
     version = "0.1.16";
 
+    # the source wasn't transformed with 2to3 yet
+    doCheck = !isPy3k;
+
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/s/sqlparse/${name}.tar.gz";
       sha256 = "108gy82x7davjrn3jqn7yv4r5v4jrzp892ysfx8l00abr8v6r337";

From 50767cd994c9f2bba318cffe4743f1a684e57956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Jan 2016 17:40:16 +0100
Subject: [PATCH 0524/2285] pygeoip: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a7b4b9f09c5a..f96d272df3a9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15961,6 +15961,9 @@ in modules // {
       md5 = "861664f8be3bed44820356539f2ea5b6";
     };
 
+    # requires geoip samples
+    doCheck = false;
+
     buildInputs = with self; [ nose ];
 
     meta = {

From 5a738e45425555805a776bf7105a15a5e4fc1f47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Jan 2016 17:43:04 +0100
Subject: [PATCH 0525/2285] pygraphviz: force rebuild

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f96d272df3a9..2cec67a82c87 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11656,8 +11656,7 @@ in modules // {
   };
 
   pygraphviz = buildPythonPackage rec {
-    version = "1.3.1";
-    name = "pygraphviz-${version}";
+    name = "pygraphviz-1.3.1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/pygraphviz/${name}.tar.gz";

From e572aff12d65d4aedfd15c4f83556acecf5aadbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Jan 2016 17:50:14 +0100
Subject: [PATCH 0526/2285] futures_2_2: override futures

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2cec67a82c87..eb7c60432de0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8969,7 +8969,7 @@ in modules // {
     };
   };
 
-  futures_2_2 = buildPythonPackage rec {
+  futures_2_2 = self.futures.override {
     version = "2.2.0";
     name = "futures-${version}";
 
@@ -8977,13 +8977,6 @@ in modules // {
       url = "https://pypi.python.org/packages/source/f/futures/${name}.tar.gz";
       sha256 = "1lqfzl3z3pkxakgbcrfy6x7x0fp3q18mj5lpz103ljj7fdqha70m";
     };
-
-    meta = with stdenv.lib; {
-      description = "Backport of the concurrent.futures package from Python 3.2";
-      homepage = "https://github.com/agronholm/pythonfutures";
-      license = licenses.bsd2;
-      maintainers = with maintainers; [ garbas ];
-    };
   };
 
   gcovr = buildPythonPackage rec {

From 7bc2f2413da67a2fd48802afe7dedc2a3bf4cef2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Jan 2016 18:00:29 +0100
Subject: [PATCH 0527/2285] blessings,nose_progressive: bump and fix for py3k

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index eb7c60432de0..85672ea2f593 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19091,8 +19091,11 @@ in modules // {
       sha256 = "0mfbjv3dcg23q0a130670g7xpfyvgza4wxkj991xxh8w9hs43ga4";
     };
 
-    buildInputs = with self; [ pillow blessings nose ];
-    propagatedBuildInputs = with self; [ modules.curses ];
+    buildInputs = with self; [ nose ];
+    propagatedBuildInputs = with self; [ pillow blessings ];
+
+    # fails with obscure error
+    doCheck = !isPy3k;
 
     meta = {
       maintainers = with maintainers; [ iElectric ];
@@ -19100,17 +19103,17 @@ in modules // {
   };
 
   blessings = buildPythonPackage rec {
-    name = "blessings-1.5.1";
+    name = "blessings-1.6";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/b/blessings/${name}.tar.gz";
-      md5 = "fbbddbf20b1f9a13e3fa612b1e086fd8";
+      sha256 = "01rhgn2c3xjf9h1lxij9m05iwf2ba6d0vd7nic26c2gic4q73igd";
     };
 
-    # 4 failing tests
+    # 4 failing tests, 2to3
     doCheck = false;
 
-    buildInputs = with self; [ nose modules.curses ];
+    propagatedBuildInputs = with self; [ modules.curses ];
 
     meta = {
       maintainers = with maintainers; [ iElectric ];

From c0a54c4594af2e11e611a4ea43a907c602e2c424 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 18:03:17 +0100
Subject: [PATCH 0528/2285] pythonPackages.uncertainties: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 85672ea2f593..c58b626913b8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23377,6 +23377,9 @@ in modules // {
       description = "Transparent calculations with uncertainties on the quantities involved (aka error propagation)";
       license = licenses.bsd3;
     };
+
+    # No tests included
+    doCheck = false;
   };
 
 

From 916f770ad4cd05c33606de5b82f576df53ba6aa5 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 18:03:53 +0100
Subject: [PATCH 0529/2285] pythonPackages.testfixtures: fix test runner,
 disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c58b626913b8..e463c0c092f9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22428,6 +22428,16 @@ in modules // {
       sha256 = "0my8zq9d27mc7j78pz9971cn5wz6zi4vxlqa50szr2vq9j2xxkll";
     };
 
+    buildInputs = with self; [ nose mock manuel ];
+
+    checkPhase = ''
+      nosetests -v
+    '';
+
+    # Test suite seems broken
+    # TypeError: TestSuite() missing 1 required positional argument: 'm'
+    # Haven't checked with newer version
+    doCheck = false;
 
     meta = with stdenv.lib; {
       homepage = "https://github.com/Simplistix/testfixtures";

From af6d9c876cdff1243f31859bcf9ca7f0940b339b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 18:04:15 +0100
Subject: [PATCH 0530/2285] pythonPackages.tinycss: fix test runner

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e463c0c092f9..84b3f15fe50f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4035,6 +4035,14 @@ in modules // {
       sha256 = "1pichqra4wk86142hqgvy9s5x6c5k5zhy8l9qxr0620pqk8spbd4";
     };
 
+    buildInputs = with self; [ pytest ];
+
+    propagatedBuildInputs = with self; [ cssutils ];
+
+    checkPhase = ''
+      py.test $out/${python.sitePackages}
+    '';
+
     meta = {
       description = "complete yet simple CSS parser for Python";
       license = licenses.bsd3;

From 707f512c7d951c917b78d303e77a992913d06202 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 18:10:44 +0100
Subject: [PATCH 0531/2285] fix eval

---
 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 84b3f15fe50f..12b3bc4fdad4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8977,7 +8977,7 @@ in modules // {
     };
   };
 
-  futures_2_2 = self.futures.override {
+  futures_2_2 = self.futures.override rec {
     version = "2.2.0";
     name = "futures-${version}";
 

From 31e465b5848ff5cf7f243bc93a1b938ad7971cb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 24 Jan 2016 18:13:53 +0100
Subject: [PATCH 0532/2285] dill: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 12b3bc4fdad4..bfe2fabf9a3d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4527,6 +4527,9 @@ in modules // {
 
     propagatedBuildInputs = with self; [objgraph];
 
+    # failing tests
+    doCheck = false;
+
     meta = {
       description = "Serialize all of python (almost)";
       homepage = http://www.cacr.caltech.edu/~mmckerns/dill.htm;

From e72f0f2a6cd9a154d0c7bb8c874025f3989b48a7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 18:29:45 +0100
Subject: [PATCH 0533/2285] pythonPackages.joblib: 0.9.0b4 -> 0.9.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bfe2fabf9a3d..064dfa4e5ddb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6968,11 +6968,14 @@ in modules // {
 
   joblib = buildPythonPackage rec {
     name = "joblib-${version}";
-    version = "0.9.0b4";
+    version = "0.9.4";
     src = pkgs.fetchurl {
-      url = https://pypi.python.org/packages/source/j/joblib/joblib-0.9.0b4.tar.gz;
-      md5 = "e0d79a085d4773c7a61cd38b4fb6dad5";
+      url = "https://pypi.python.org/packages/source/j/joblib/${name}.tar.gz";
+      sha256 = "e5faacf0da7b3035dbca9d56210962b86564aafca71a25f4ea376a405455cd60";
     };
+
+    buildInputs = with self; [ nose ];
+
   };
 
   samplerate = buildPythonPackage rec {

From 64e4bdf10910289592073b652c3db1dcbf877d0f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 18:29:59 +0100
Subject: [PATCH 0534/2285] pythonPackages.le: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 064dfa4e5ddb..7f159554dcd1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10478,15 +10478,17 @@ in modules // {
 
   le = buildPythonPackage rec {
     name = "le-${version}";
-    version = "1.4.13";
+    version = "1.4.29";
 
-    src = pkgs.fetchFromGitHub {
-      owner = "logentries";
-      repo = "le";
-      rev = "v${version}";
-      sha256 = "12l6fqavykjinq286i9pgbbbrv5lq2mmiji91g0m05lfdx9pg4y1";
+    src = pkgs.fetchurl {
+      url = "https://github.com/logentries/le/archive/v${version}.tar.gz";
+      sha256 = "d29738937cb6e714b6ec2ae74b66b1983482ffd54b4faa40767af18509521d4c";
     };
 
+    disabled = isPy3k;
+
+    doCheck = false;
+
     propagatedBuildInputs = with self; [ simplejson psutil ];
 
     meta = {

From 6d478b3fafe58225e9c551ecad6d37272e295453 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 18:49:16 +0100
Subject: [PATCH 0535/2285] pythonPackages.seaborn: fix test runner, disable
 tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7f159554dcd1..9a4456bd7d69 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18529,15 +18529,23 @@ in modules // {
     };
   };
 
-  seaborn= buildPythonPackage rec {
+  seaborn = buildPythonPackage rec {
     name = "seaborn-0.6.0";
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/s/seaborn/${name}.tar.gz";
       md5 = "bc518f1f45dadb9deb2bb57ca3af3cad";
     };
 
+    buildInputs = with self; [ nose ];
     propagatedBuildInputs = with self; [ pandas matplotlib ];
 
+    checkPhase = ''
+      nosetests -v
+    '';
+
+    # Computationally very demanding tests
+    doCheck = false;
+
     meta = {
       description = "statisitical data visualization";
       homepage = "http://stanford.edu/~mwaskom/software/seaborn/";

From 3f82220c388162ad556afd226738982b7b31486e Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 18:49:42 +0100
Subject: [PATCH 0536/2285] pythonPackages.umalqurra: no tests included

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9a4456bd7d69..14625ea3fa0e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20736,6 +20736,9 @@ in modules // {
       sha256 = "719f6a36f908ada1c29dae0d934dd0f1e1f6e3305784edbec23ad719397de678";
     };
 
+    # No tests included
+    doCheck = false;
+
     # See for license
     # https://github.com/tytkal/python-hijiri-ummalqura/issues/4
     meta = {

From 08d43cd52e167b29c1eeabf49bcfe7989cb53f43 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 19:04:54 +0100
Subject: [PATCH 0537/2285] pythonPackages.cloudpickle: init at 0.1.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 14625ea3fa0e..046a236bd175 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2984,6 +2984,22 @@ in modules // {
     };
   });
 
+  cloudpickle = buildPythonPackage rec {
+    name = "cloudpickle-${version}";
+    version = "0.1.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/c/cloudpickle/${name}.tar.gz";
+      sha256 = "3418303f44c6c4daa184f1dc36c8c0b7ff8261c56d1f922ffd8d09e79caa4b74";
+    };
+
+    meta = {
+      description = "Extended pickling support for Python objects";
+      homepage = https://github.com/cloudpipe/cloudpickle;
+      license = with licenses; [ bsd3 ];
+    };
+  };
+
 
   cogapp = buildPythonPackage rec {
     version = "2.3";

From b194f07fdabdc20a19a65abf5b63c19bcf1d82bf Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 19:05:18 +0100
Subject: [PATCH 0538/2285] pythonPackages.dask: fix test runner, disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 046a236bd175..66e97e76277f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4137,7 +4137,15 @@ in modules // {
       sha256 = "ff27419e059715907afefe6cbcc1f8c748855c7a93be25be211dabcb689cee3b";
     };
 
-    propagatedBuildInputs = with self; [numpy toolz dill];
+    buildInputs = with self; [ pytest ];
+    propagatedBuildInputs = with self; [numpy toolz dill pandas ];
+
+    checkPhase = ''
+      py.test dask
+    '';
+
+    # Segfault, likely in numpy
+    doCheck = false;
 
     meta = {
       description = "Minimal task scheduling abstraction";

From 6f32d2a805bfe537523d969e2651664bfb066645 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 19:13:58 +0100
Subject: [PATCH 0539/2285] pythonPackages.tinycss: fix tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 66e97e76277f..2fb61d3e507f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4059,6 +4059,9 @@ in modules // {
       py.test $out/${python.sitePackages}
     '';
 
+    # Disable Cython tests for PyPy
+    TINYCSS_SKIP_SPEEDUPS_TESTS = optional isPyPy true;
+
     meta = {
       description = "complete yet simple CSS parser for Python";
       license = licenses.bsd3;

From 63353f9270f0304b10240cd275cd94edfaa13d7c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 19:19:57 +0100
Subject: [PATCH 0540/2285] pythonPackages.cloudpickle: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2fb61d3e507f..5db05eb5964e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2993,6 +2993,15 @@ in modules // {
       sha256 = "3418303f44c6c4daa184f1dc36c8c0b7ff8261c56d1f922ffd8d09e79caa4b74";
     };
 
+    buildInputs = with self; [ pytest mock ];
+
+    checkPhase = ''
+      py.test tests
+    '';
+
+    # ImportError of test suite
+    doCheck = false;
+
     meta = {
       description = "Extended pickling support for Python objects";
       homepage = https://github.com/cloudpipe/cloudpickle;

From 33c3e2e4041f22b486327ae0bb96b0351adc16ba Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 19:30:14 +0100
Subject: [PATCH 0541/2285] pythonPackages.xarray: fix test runner

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5db05eb5964e..ea06706417cb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21525,6 +21525,10 @@ in modules // {
     buildInputs = with self; [ pytest ];
     propagatedBuildInputs = with self; [numpy pandas];
 
+    checkPhase = ''
+      py.test $out/${python.sitePackages}
+    '';
+
     meta = {
       description = "N-D labeled arrays and datasets in Python";
       homepage = https://github.com/pydata/xarray;

From 28b460cdaa3c4b55dc9c532e1977a72b1e719a06 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 24 Jan 2016 19:36:07 +0100
Subject: [PATCH 0542/2285] pythonPackages.CommonMark: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ea06706417cb..8a4e29cd266c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3060,6 +3060,8 @@ in modules // {
 
     LC_ALL="en_US.UTF-8";
 
+    doCheck = false;
+
     buildInputs = with self; [ flake8 pkgs.glibcLocales ];
     propagatedBuildInputs = with self; [ future ];
 

From dd6d4ca8cc76b5396d58a1971ffed351bff090ad Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Sun, 24 Jan 2016 11:32:46 -0800
Subject: [PATCH 0543/2285] racket: change meta.platorms to unix

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

diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix
index 9d1c0c0e319b..d22d3849b1bf 100644
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -80,6 +80,6 @@ stdenv.mkDerivation rec {
     homepage = http://racket-lang.org/;
     license = licenses.lgpl3;
     maintainers = with maintainers; [ kkallio henrytill ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From 3e0e641743169cac0a2f88a8e227c5306fd656a8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 24 Jan 2016 16:49:28 +0100
Subject: [PATCH 0544/2285] freetype: 2.5.4 -> 2.6.2

---
 .../libraries/freetype/default.nix            |  29 ++--
 .../freetype/enable-validation.patch          |  22 ---
 .../libraries/freetype/fix-pcf.patch          | 132 ------------------
 3 files changed, 15 insertions(+), 168 deletions(-)
 delete mode 100644 pkgs/development/libraries/freetype/enable-validation.patch
 delete mode 100644 pkgs/development/libraries/freetype/fix-pcf.patch

diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix
index e9e393075b3e..61d8cb582a01 100644
--- a/pkgs/development/libraries/freetype/default.nix
+++ b/pkgs/development/libraries/freetype/default.nix
@@ -1,16 +1,18 @@
 { stdenv, fetchurl, fetchpatch, pkgconfig, which, zlib, bzip2, libpng, gnumake
+, glib /* passthru only */
+
   # FreeType supports sub-pixel rendering.  This is patented by
   # Microsoft, so it is disabled by default.  This option allows it to
   # be enabled.  See http://www.freetype.org/patents.html.
-, glib/*passthru only*/
 , useEncumberedCode ? true
 }:
 
 let
-  version = "2.5.4";
+  version = "2.6.2";
 
-  fetch_bohoomil = name: sha256: fetchpatch {
-    url = https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/e4c99bcf5ac9595e2c64393c0661377685c0ad24/01_freetype2-iu/ + name;
+  # Don't use fetchpatch. It mangles them. That's an hour I'll never get back.
+  fetchbohoomil = name: sha256: fetchurl {
+    url = https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/254b688f96d4a37f78fb594303a43160fc15c7cd/freetype/ + name;
     inherit sha256;
   };
 in
@@ -20,15 +22,17 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/freetype/${name}.tar.bz2";
-    sha256 = "1fxsbk4lp6ymifldzrb86g3x6mz771jmrzphkz92mcrkddk2qkiv";
+    sha256 = "14mqrfgl18q2by1yzv6vcxi97zjy4kppcgsqf312mhfwgkpvvxms";
   };
 
-  patches = [ ./enable-validation.patch ] # from Gentoo, bohoomil has the same patch as well
-    ++ [ ./fix-pcf.patch ]
+  patches = []
     ++ optionals useEncumberedCode [
-      (fetch_bohoomil "02-ftsmooth-2.5.4.patch" "11w4wb7gwgpijc788mpkxj92d7rfdwrdv7jzrpxwv5w5cgpx9iw9")
-      (fetch_bohoomil "03-upstream-2014.12.07.patch" "0gq7y63mg3gc5z69nfkv2kl7xad0bjzsvnl6j1j9q79jjbvaqdq0")
-      (fetch_bohoomil "04-infinality-2.5.4-2014.12.07.patch" "1gph7z9s2221gy5dxn01v3lga0m9yib8yqsaqj5km74bqx1vlalh")
+      (fetchbohoomil "01-freetype-2.6.2-enable-valid.patch"
+        "1szq0zha7n41f4pq179wgfkam034mp2xn0xc36sdl5sjp9s9hv08")
+      (fetchbohoomil "02-upstream-2015.12.05.patch"
+        "0781r9n35kpn8db8nma0l47cpkzh0hbp84ziii5sald90dnrqdj4")
+      (fetchbohoomil "03-infinality-2.6.2-2015.12.05.patch"
+        "0wcjf9hiymplgqm3szla633i417pb57vpzzs2dyl1dnmcxgqa2y8")
     ];
 
   propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype
@@ -46,10 +50,7 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  # compat hacks
-  postInstall = glib.flattenInclude + ''
-    ln -s . "$out"/include/freetype
-  '';
+  postInstall = glib.flattenInclude;
 
   crossAttrs = {
     # Somehow it calls the unwrapped gcc, "i686-pc-linux-gnu-gcc", instead
diff --git a/pkgs/development/libraries/freetype/enable-validation.patch b/pkgs/development/libraries/freetype/enable-validation.patch
deleted file mode 100644
index 44f3bf6e1c94..000000000000
--- a/pkgs/development/libraries/freetype/enable-validation.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Enables gxvalid and otvalid modules for use with ftvalid.
-
---- freetype-2.2.1/modules.cfg.orig	2006-07-07 21:01:09.000000000 -0400
-+++ freetype-2.2.1/modules.cfg	2006-07-07 21:01:54.000000000 -0400
-@@ -110,7 +110,7 @@
- AUX_MODULES += cache
- 
- # TrueType GX/AAT table validation.  Needs ftgxval.c below.
--# AUX_MODULES += gxvalid
-+AUX_MODULES += gxvalid
- 
- # Support for streams compressed with gzip (files with suffix .gz).
- #
-@@ -124,7 +124,7 @@
- 
- # OpenType table validation.  Needs ftotval.c below.
- #
--# AUX_MODULES += otvalid
-+AUX_MODULES += otvalid
- 
- # Auxiliary PostScript driver component to share common code.
- #
diff --git a/pkgs/development/libraries/freetype/fix-pcf.patch b/pkgs/development/libraries/freetype/fix-pcf.patch
deleted file mode 100644
index bb301bcd9caa..000000000000
--- a/pkgs/development/libraries/freetype/fix-pcf.patch
+++ /dev/null
@@ -1,132 +0,0 @@
-Upstream fixes for pcf fonts.
-
-http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=74af85c4b62b35e55b0ce9dec55ee10cbc4962a2
-http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=06842c7b49c21f13c0ab61201daab6ff5a358fcc
-
-diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c
-index 998cbed..e3caf82 100644
---- a/src/pcf/pcfread.c
-+++ b/src/pcf/pcfread.c
-@@ -2,7 +2,7 @@
- 
-     FreeType font driver for pcf fonts
- 
--  Copyright 2000-2010, 2012, 2013 by
-+  Copyright 2000-2010, 2012-2014 by
-   Francesco Zappa Nardelli
- 
- Permission is hereby granted, free of charge, to any person obtaining a copy
-@@ -78,7 +78,7 @@ THE SOFTWARE.
-     FT_FRAME_START( 16  ),
-       FT_FRAME_ULONG_LE( type ),
-       FT_FRAME_ULONG_LE( format ),
--      FT_FRAME_ULONG_LE( size ),
-+      FT_FRAME_ULONG_LE( size ),   /* rounded up to a multiple of 4 */
-       FT_FRAME_ULONG_LE( offset ),
-     FT_FRAME_END
-   };
-@@ -95,9 +95,11 @@ THE SOFTWARE.
-     FT_Memory  memory = FT_FACE( face )->memory;
-     FT_UInt    n;
- 
-+    FT_ULong   size;
- 
--    if ( FT_STREAM_SEEK ( 0 )                          ||
--         FT_STREAM_READ_FIELDS ( pcf_toc_header, toc ) )
-+
-+    if ( FT_STREAM_SEEK( 0 )                          ||
-+         FT_STREAM_READ_FIELDS( pcf_toc_header, toc ) )
-       return FT_THROW( Cannot_Open_Resource );
- 
-     if ( toc->version != PCF_FILE_VERSION                 ||
-@@ -154,14 +156,35 @@ THE SOFTWARE.
-         break;
-     }
- 
--    /* we now check whether the `size' and `offset' values are reasonable: */
--    /* `offset' + `size' must not exceed the stream size                   */
-+    /*
-+     *  We now check whether the `size' and `offset' values are reasonable:
-+     *  `offset' + `size' must not exceed the stream size.
-+     *
-+     *  Note, however, that X11's `pcfWriteFont' routine (used by the
-+     *  `bdftopcf' program to create PDF font files) has two special
-+     *  features.
-+     *
-+     *  - It always assigns the accelerator table a size of 100 bytes in the
-+     *    TOC, regardless of its real size, which can vary between 34 and 72
-+     *    bytes.
-+     *
-+     *  - Due to the way the routine is designed, it ships out the last font
-+     *    table with its real size, ignoring the TOC's size value.  Since
-+     *    the TOC size values are always rounded up to a multiple of 4, the
-+     *    difference can be up to three bytes for all tables except the
-+     *    accelerator table, for which the difference can be as large as 66
-+     *    bytes.
-+     *
-+     */
-+
-     tables = face->toc.tables;
--    for ( n = 0; n < toc->count; n++ )
-+    size   = stream->size;
-+
-+    for ( n = 0; n < toc->count - 1; n++ )
-     {
-       /* we need two checks to avoid overflow */
--      if ( ( tables->size   > stream->size                ) ||
--           ( tables->offset > stream->size - tables->size ) )
-+      if ( ( tables->size   > size                ) ||
-+           ( tables->offset > size - tables->size ) )
-       {
-         error = FT_THROW( Invalid_Table );
-         goto Exit;
-@@ -169,6 +192,15 @@ THE SOFTWARE.
-       tables++;
-     }
- 
-+    /* no check of `tables->size' for last table element ... */
-+    if ( ( tables->offset > size ) )
-+    {
-+      error = FT_THROW( Invalid_Table );
-+      goto Exit;
-+    }
-+    /* ... instead, we adjust `tables->size' to the real value */
-+    tables->size = size - tables->offset;
-+
- #ifdef FT_DEBUG_LEVEL_TRACE
- 
-     {
-@@ -733,8 +765,8 @@ THE SOFTWARE.
- 
-     FT_TRACE4(( "  number of bitmaps: %d\n", nbitmaps ));
- 
--    /* XXX: PCF_Face->nmetrics is singed FT_Long, see pcf.h */
--    if ( face->nmetrics < 0 || nbitmaps != ( FT_ULong )face->nmetrics )
-+    /* XXX: PCF_Face->nmetrics is signed FT_Long, see pcf.h */
-+    if ( face->nmetrics < 0 || nbitmaps != (FT_ULong)face->nmetrics )
-       return FT_THROW( Invalid_File_Format );
- 
-     if ( FT_NEW_ARRAY( offsets, nbitmaps ) )
-diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c
-index e3caf82..a29a9e3 100644
---- a/src/pcf/pcfread.c
-+++ b/src/pcf/pcfread.c
-@@ -192,14 +192,15 @@ THE SOFTWARE.
-       tables++;
-     }
- 
--    /* no check of `tables->size' for last table element ... */
-+    /* only check `tables->offset' for last table element ... */
-     if ( ( tables->offset > size ) )
-     {
-       error = FT_THROW( Invalid_Table );
-       goto Exit;
-     }
--    /* ... instead, we adjust `tables->size' to the real value */
--    tables->size = size - tables->offset;
-+    /* ... and adjust `tables->size' to the real value if necessary */
-+    if ( tables->size > size - tables->offset )
-+      tables->size = size - tables->offset;
- 
- #ifdef FT_DEBUG_LEVEL_TRACE
- 

From 7a853f828d73c11cb4c9b2b71a172f379e5c4ecc Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 24 Jan 2016 21:14:12 +0100
Subject: [PATCH 0545/2285] fontconfig-ultimate: 20141123 -> 2015-12-06

---
 .../libraries/fontconfig-ultimate/confd.nix   | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/fontconfig-ultimate/confd.nix b/pkgs/development/libraries/fontconfig-ultimate/confd.nix
index e522cead8220..160fef5f07e5 100644
--- a/pkgs/development/libraries/fontconfig-ultimate/confd.nix
+++ b/pkgs/development/libraries/fontconfig-ultimate/confd.nix
@@ -1,13 +1,18 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub }:
 
+let version = "2015-12-06"; in
 stdenv.mkDerivation {
-  name = "fontconfig-ultimate-20141123";
-  src = fetchurl {
-    url = "https://github.com/bohoomil/fontconfig-ultimate/archive/2014-11-23.tar.gz";
-    sha256 = "0czfm3hxc41x5mscwrba7p1vhm2w62j1qg7z8kfdrf21z8fvgznw";
+  name = "fontconfig-ultimate-${version}";
+
+  src = fetchFromGitHub {
+    sha256 = "02a811szxkq4q088nxfpdzp6rv0brvgkdhwigk09qffygxd776g6";
+    rev = version;
+    repo = "fontconfig-ultimate";
+    owner = "bohoomil";
   };
 
   phases = "$prePhases unpackPhase installPhase $postPhases";
+
   installPhase = ''
     mkdir -p $out/etc/fonts/conf.d
     cp conf.d.infinality/*.conf $out/etc/fonts/conf.d
@@ -22,8 +27,8 @@ stdenv.mkDerivation {
     rm $out/etc/fonts/conf.d/83-*.conf
 
     # Inclusion of local and user configs handled by global configuration
-    rm $out/etc/fonts/conf.d/97-local.conf
-    rm $out/etc/fonts/conf.d/98-user.conf
+    rm $out/etc/fonts/conf.d/29-local.conf
+    rm $out/etc/fonts/conf.d/28-user.conf
 
     cp fontconfig_patches/fonts-settings/*.conf $out/etc/fonts/conf.d
 

From 80d38d12b42cf1033506b202e390199806e5ab7e Mon Sep 17 00:00:00 2001
From: Thomas Bereknyei <tomberek@gmail.com>
Date: Thu, 17 Dec 2015 13:17:49 -0500
Subject: [PATCH 0546/2285] Gateone: fix cacerts dependency

---
 nixos/modules/services/networking/gateone.nix | 4 +---
 pkgs/top-level/python-packages.nix            | 9 ++++++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/networking/gateone.nix b/nixos/modules/services/networking/gateone.nix
index 93273837181e..78ff0b76198c 100644
--- a/nixos/modules/services/networking/gateone.nix
+++ b/nixos/modules/services/networking/gateone.nix
@@ -21,7 +21,7 @@ options = {
 };
 config = mkIf cfg.enable {
   environment.systemPackages = with pkgs.pythonPackages; [
-    gateone pkgs.openssh pkgs.procps pkgs.coreutils ];
+    gateone pkgs.openssh pkgs.procps pkgs.coreutils pkgs.cacert];
 
   users.extraUsers.gateone = {
     description = "GateOne privilege separation user";
@@ -49,8 +49,6 @@ config = mkIf cfg.enable {
       User = "gateone";
       Group = "gateone";
       WorkingDirectory = cfg.settingsDir;
-      PermissionsStartOnly = true;
-
     };
 
     wantedBy = [ "multi-user.target" ];
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 41f0afd9e705..130abbe8f3b2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5065,18 +5065,21 @@ in modules // {
     name = "gateone-1.2-0d57c3";
     disabled = ! isPy27;
     src = pkgs.fetchFromGitHub {
-      rev = "11ed97c663b3e8c1b8eba473b5cf8362b10d57c3";
+      rev = "1d0e8037fbfb7c270f3710ce24154e24b7031bea";
       owner= "liftoff";
       repo = "GateOne";
-      sha256 ="0zp9vfs6sqbx4d0g45kkjinfmsl9zqwa6bhp3xd81wx3ph9yr1hq";
+      sha256 = "1ghrawlqwv7wnck6alqpbwy9mpv0y21cw2jirrvsxaracmvgk6vv";
     };
-    propagatedBuildInputs = with self; [tornado futures html5lib readline pkgs.openssl];
+    propagatedBuildInputs = with self; [tornado futures html5lib readline pkgs.openssl pkgs.cacert pkgs.openssh];
     meta = {
       homepage = https://liftoffsoftware.com/;
       description = "GateOne is a web-based terminal emulator and SSH client";
       maintainers = with maintainers; [ tomberek ];
 
     };
+    postInstall=''
+    cp -R $out/gateone/* $out/lib/python2.7/site-packages/gateone
+    '';
   };
 
   gcutil = buildPythonPackage rec {

From 95d892ec2666992b588cc7a9ee46b05cba300599 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sun, 24 Jan 2016 17:12:03 -0500
Subject: [PATCH 0547/2285] ghcjs: update and fix ghcjs/reflex libs

Set dontStrip when building ghcjs libs, which fixes the ghcjs-dom lib
and also makes the logs cleaner.
---
 pkgs/development/compilers/ghcjs/shims.nix    |  4 +-
 .../haskell-modules/configuration-ghcjs.nix   | 78 +++++--------------
 .../haskell-modules/generic-builder.nix       |  2 +
 3 files changed, 23 insertions(+), 61 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs/shims.nix b/pkgs/development/compilers/ghcjs/shims.nix
index e596d57d74ee..dbbf15de6c8b 100644
--- a/pkgs/development/compilers/ghcjs/shims.nix
+++ b/pkgs/development/compilers/ghcjs/shims.nix
@@ -2,6 +2,6 @@
 fetchFromGitHub {
   owner = "ghcjs";
   repo = "shims";
-  rev = "09e37565df8bbf876d4b7f36fbc19aa2140844a7";
-  sha256 = "000ds78pv56v4drbdx3y7xncx9224l28n7cal9gy3inns1mq6yhj";
+  rev = "45f44f5f027ec03264b61b8049951e765cc0b23a";
+  sha256 = "090pz4rzwlcrjavbbzxhf6c7rq7rzmr10g89hmhw4c65c4fyyykp";
 }
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index ca940e8de31c..9bea0519151d 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -1,5 +1,10 @@
 { pkgs }:
 
+let
+  removeLibraryHaskellDepends = pnames: depends:
+    builtins.filter (e: !(builtins.elem (e.pname or "") pnames)) depends;
+in
+
 with import ./lib.nix { inherit pkgs; };
 
 self: super: {
@@ -85,8 +90,10 @@ self: super: {
   });
 
   ghcjs-dom = overrideCabal super.ghcjs-dom (drv: {
-    buildDepends = [ self.base self.mtl self.text self.ghcjs-base ];
-    libraryHaskellDepends = [ ];
+    libraryHaskellDepends =
+      removeLibraryHaskellDepends [
+        "glib" "gtk" "gtk3" "webkitgtk" "webkitgtk3"
+      ] drv.libraryHaskellDepends;
   });
 
   ghc-paths = overrideCabal super.ghc-paths (drv: {
@@ -96,72 +103,25 @@ self: super: {
   # reflex 0.3, made compatible with the newest GHCJS.
   reflex = overrideCabal super.reflex (drv: {
     src = pkgs.fetchFromGitHub {
-      owner = "k0001";
+      owner = "ryantrinkle";
       repo = "reflex";
-      rev = "e9b2f777ad07875149614e8337507afd5b1a2466";
-      sha256 = "005hr3s6y369pxfdlixi4wabgav0bb653j98788kq9q9ssgijlwn";
+      rev = "cc62c11a6cde31412582758c236919d4bb766ada";
+      sha256 = "1j4vw0636bkl46lj8ry16i04vgpivjc6bs3ls54ppp1wfp63q7w4";
     };
-    libraryHaskellDepends = [
-      self.base self.containers self.dependent-map_0_1_1_3
-      self.dependent-sum_0_2_0_1 self.exception-transformers self.mtl
-      self.primitive self.ref-tf self.semigroups self.template-haskell
-      self.these self.transformers self.transformers-compat
-    ];
   });
 
   # reflex-dom 0.2, made compatible with the newest GHCJS.
   reflex-dom = overrideCabal super.reflex-dom (drv: {
     src = pkgs.fetchFromGitHub {
-      owner = "k0001";
+      owner = "ryantrinkle";
       repo = "reflex-dom";
-      rev = "a117eae8e101198977611f87605a5cb2ae752fc7";
-      sha256 = "18m8ng2fgsfbqdvx5jxy23ndyyhafnxflq8apg5psdz3aqkfimzh";
+      rev = "639d9ca13c2def075e83344c9afca6eafaf24219";
+      sha256 = "0166ihbh3dbfjiym9w561svpgvj0x4i8i8ws70xaafi0cmpsxrar";
     };
-    libraryHaskellDepends = [
-      self.aeson self.base self.bifunctors self.bytestring self.containers
-      self.data-default self.dependent-map_0_1_1_3 self.dependent-sum_0_2_0_1
-      self.dependent-sum-template self.directory
-      self.exception-transformers self.ghcjs-dom self.lens self.mtl self.ref-tf
-      self.reflex self.safe self.semigroups self.text self.these self.time
-      self.transformers
-    ];
-  });
-
-  # required by reflex, reflex-dom
-  dependent-map_0_1_1_3 = self.callPackage (
-    { mkDerivation, base, containers, dependent-sum_0_2_0_1, stdenv
-    }:
-    mkDerivation {
-      pname = "dependent-map";
-      version = "0.1.1.3";
-      sha256 = "1by83rrv8dfn5lxrpx3qzs1lg31fhnzlqy979h8ampyxd0w93pa4";
-      libraryHaskellDepends = [ base containers dependent-sum_0_2_0_1 ];
-      homepage = "https://github.com/mokus0/dependent-map";
-      description = "Dependent finite maps (partial dependent products)";
-      license = "unknown";
-    }
-  ) {};
-
-  # required by reflex, reflex-dom
-  dependent-sum_0_2_0_1 = self.callPackage (
-    { mkDerivation, base, stdenv
-    }:
-    mkDerivation {
-      pname = "dependent-sum";
-      version = "0.2.1.0";
-      sha256 = "1h6wsrh206k6q3jcfdxvlsswbm47x30psp6x30l2z0j9jyf7jpl3";
-      libraryHaskellDepends = [ base ];
-      homepage = "https://github.com/mokus0/dependent-sum";
-      description = "Dependent sum type";
-      license = stdenv.lib.licenses.publicDomain;
-    }
-  ) {};
-
-  # required by reflex-dom
-  dependent-sum-template = overrideCabal super.dependent-sum-template (drv: {
-    libraryHaskellDepends = [
-      self.base self.dependent-sum_0_2_0_1 self.template-haskell self.th-extras
-    ];
+    libraryHaskellDepends =
+      removeLibraryHaskellDepends [
+        "glib" "gtk3" "webkitgtk3" "webkitgtk3-javascriptcore" "raw-strings-qq" "unix"
+      ] drv.libraryHaskellDepends;
   });
 
 }
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index afd30c8283b1..e3847528ad00 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -3,6 +3,7 @@
 }:
 
 { pname
+, dontStrip ? (ghc.isGhcjs or false)
 , version, revision ? null
 , sha256 ? null
 , src ? fetchurl { url = "mirror://hackage/${pname}-${version}.tar.gz"; inherit sha256; }
@@ -312,5 +313,6 @@ stdenv.mkDerivation ({
 // optionalAttrs (postInstall != "")    { inherit postInstall; }
 // optionalAttrs (preFixup != "")       { inherit preFixup; }
 // optionalAttrs (postFixup != "")      { inherit postFixup; }
+// optionalAttrs (dontStrip)            { inherit dontStrip; }
 // optionalAttrs (stdenv.isLinux)       { LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; }
 )

From 9a55295c49588031ba466a4a851c77fee03ba42e Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 24 Jan 2016 19:00:50 +0000
Subject: [PATCH 0548/2285] buildRubyGem: fix NoMethodError

generate_stub doesn't exist and the output is not used in the code so I just
removed the line.

This was preventing the binstubs from generating properly.
---
 .../interpreters/ruby/build-ruby-gem/nix-bundle-install.rb       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb b/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb
index 647b83b52c38..48ab5270c22f 100644
--- a/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb
+++ b/pkgs/development/interpreters/ruby/build-ruby-gem/nix-bundle-install.rb
@@ -107,7 +107,6 @@ if spec.executables.any?
   spec.executables.each do |exe|
     wrapper = File.join(bin_dir, exe)
     File.open(wrapper, "w") do |f|
-      stub = generate_stub(spec.name, exe)
       f.write(<<-EOF)
 #!#{ruby}
 #

From e9eda43928d5c34275ae4679c82046e71078007b Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 24 Jan 2016 22:48:26 +0000
Subject: [PATCH 0549/2285] buildRubyGem: fix missing libobjc in darwin

This was preventing any ruby gem with a c extension to build.

mkmf would fail with a misleading error:

    /nix/store/dmkcai8fnv21qxiasx628nim3mq4r4wg-ruby-2.2.3-p0/lib/ruby/2.2.0/mkmf.rb:456:in `try_do': The compiler failed to generate an executable file. (RuntimeError)
    You have to install development tools first.
---
 .../development/interpreters/ruby/build-ruby-gem/default.nix | 4 +++-
 pkgs/development/interpreters/ruby/gemconfig/default.nix     | 5 -----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix b/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix
index d050faca2454..c5b9fba37aa0 100644
--- a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix
+++ b/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix
@@ -18,7 +18,8 @@
 # Normal gem packages can be used outside of bundler; a binstub is created in
 # $out/bin.
 
-{ lib, ruby, rubygems, bundler, fetchurl, fetchgit, makeWrapper, git, buildRubyGem
+{ lib, ruby, rubygems, bundler, fetchurl, fetchgit, makeWrapper, git,
+  buildRubyGem, darwin
 } @ defs:
 
 lib.makeOverridable (
@@ -85,6 +86,7 @@ stdenv.mkDerivation (attrs // {
   buildInputs = [
     ruby rubygems makeWrapper
   ] ++ lib.optionals (type == "git") [ git bundler ]
+    ++ lib.optional stdenv.isDarwin darwin.libobjc
     ++ buildInputs;
 
   name = attrs.name or (namePrefix + gemName);
diff --git a/pkgs/development/interpreters/ruby/gemconfig/default.nix b/pkgs/development/interpreters/ruby/gemconfig/default.nix
index ae8c0ee6e6ad..787c3be54e35 100644
--- a/pkgs/development/interpreters/ruby/gemconfig/default.nix
+++ b/pkgs/development/interpreters/ruby/gemconfig/default.nix
@@ -79,7 +79,6 @@ in
       "--with-exslt-lib=${libxslt}/lib"
       "--with-exslt-include=${libxslt}/include"
     ] ++ lib.optional stdenv.isDarwin "--with-iconv-dir=${libiconv}";
-    buildInputs = lib.optional stdenv.isDarwin darwin.libobjc;
   };
 
   patron = attrs: {
@@ -143,10 +142,6 @@ in
     '';
   };
 
-  unf_ext = attrs: {
-    buildInputs = lib.optional stdenv.isDarwin darwin.libobjc;
-  };
-
   xapian-ruby = attrs: {
     # use the system xapian
     dontBuild = false;

From d186a66d33cbd97db312e084b1dc8e20b7e5edf9 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 25 Jan 2016 01:40:14 +0100
Subject: [PATCH 0550/2285] sane-backends-git -> 2016-01-25

---
 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 1b1ccf4e5892..bb5e787ede66 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-01-09";
+  version = "2016-01-25";
   src = fetchgit {
-    sha256 = "440f88a4126841cfd139b17902ceb940bbf189defe21b208e93bfd474cfb16e8";
-    rev = "f78e85cad666492fadd5612af77fa7c84e270a12";
+    sha256 = "db1fecd671bd8b3a777138bb4815285b4364ee3ad01ab05424b4aa0c20ed9919";
+    rev = "056f590f2d147099554d97a89dd5e0ddfa8d6dda";
     url = "git://alioth.debian.org/git/sane/sane-backends.git";
   };
 })

From c5bb4f503b68a80db4b1208ad13895f526c35323 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 25 Jan 2016 02:48:27 +0100
Subject: [PATCH 0551/2285] libconfuse: init at 2.8

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

diff --git a/pkgs/development/libraries/libconfuse/default.nix b/pkgs/development/libraries/libconfuse/default.nix
new file mode 100644
index 000000000000..dbe818ba561c
--- /dev/null
+++ b/pkgs/development/libraries/libconfuse/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, flex }:
+
+stdenv.mkDerivation rec {
+  name = "libconfuse-${version}";
+  version = "2.8";
+
+  src = fetchFromGitHub {
+    sha256 = "0s0asxnml4rlv17ijz5w57x949anag28wx7wdahqx6mgqz0w2j2k";
+    rev = "v${version}";
+    repo = "libconfuse";
+    owner = "martinh";
+  };
+
+  nativeBuildInputs = [ autoreconfHook flex ];
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Small configuration file parser library for C";
+    longDescription = ''
+      libConfuse (previously libcfg) is a configuration file parser library
+      written in C. It supports sections and (lists of) values, as well as
+      some other features. It makes it very easy to add configuration file
+      capability to a program using a simple API.
+
+      The goal of libConfuse is not to be the configuration file parser library
+      with a gazillion of features. Instead, it aims to be easy to use and
+      quick to integrate with your code.
+    '';
+    license = licenses.isc;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99c9a79086a0..53283233285e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7094,6 +7094,8 @@ let
 
   libcommuni = callPackage ../development/libraries/libcommuni { };
 
+  libconfuse = callPackage ../development/libraries/libconfuse { };
+
   inherit (gnome3) libcroco;
 
   libcangjie = callPackage ../development/libraries/libcangjie { };

From 87df7fc7458edeb647770849a0dad526edbbea67 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 25 Jan 2016 03:43:02 +0100
Subject: [PATCH 0552/2285] sane-backends: propagate libjpeg library path

---
 pkgs/applications/graphics/sane/backends/generic.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index e98774a43681..b597250098fe 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl
-, avahi, libusb1, libv4l, net_snmp
+, avahi, libjpeg, libusb1, libv4l, net_snmp
 , gettext, pkgconfig
 
 # List of { src name backend } attibute sets - see installFirmware below:
@@ -50,6 +50,9 @@ stdenv.mkDerivation {
     mkdir -p $out/etc/udev/rules.d/
     ./tools/sane-desc -m udev > $out/etc/udev/rules.d/49-libsane.rules || \
     cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules
+
+    substituteInPlace $out/lib/libsane.la \
+      --replace "-ljpeg" "-L${libjpeg}/lib -ljpeg"
   '' + stdenv.lib.concatStrings (builtins.map installFirmware compatFirmware);
 
   meta = with stdenv.lib; {

From 626c09bb46a877ad7aefa9a93467571ee3e8ed55 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 25 Jan 2016 03:21:29 +0100
Subject: [PATCH 0553/2285] scanbd: init at 1.4.4

---
 pkgs/tools/graphics/scanbd/default.nix | 57 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 +
 2 files changed, 59 insertions(+)
 create mode 100644 pkgs/tools/graphics/scanbd/default.nix

diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix
new file mode 100644
index 000000000000..b3fd986165a7
--- /dev/null
+++ b/pkgs/tools/graphics/scanbd/default.nix
@@ -0,0 +1,57 @@
+{ stdenv, fetchurl, pkgconfig
+, dbus, libconfuse, sane-backends, systemd }:
+
+stdenv.mkDerivation rec {
+  name = "scanbd-${version}";
+  version = "1.4.4";
+
+  src = fetchurl {
+    sha256 = "07a59jk9b2hh49v5lcpckp64f5lny9sq8h0h2p2jcs9cqazf6q9s";
+    url = "mirror://sourceforge/scanbd/${name}.tgz";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ dbus libconfuse sane-backends systemd ];
+
+  configureFlags = [
+    "--disable-Werror"
+    "--enable-udev"
+    "--with-scanbdconfdir=/etc/scanbd"
+    "--with-systemdsystemunitdir=$out/lib/systemd/system"
+  ];
+
+  enableParallelBuilding = true;
+
+  installFlags = [
+    "scanbdconfdir=$(out)/etc/scanbd"
+    "scannerconfdir=$(scanbdconfdir)/scanner.d"
+  ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "Scanner button daemon";
+    longDescription = ''
+      scanbd polls a scanner's buttons, looking for button presses, function
+      knob changes, or other scanner events such as paper inserts and removals,
+      while at the same time allowing scan-applications to access the scanner.
+      
+      Various actions can be submitted (scan, copy, email, ...) via action
+      scripts. The function knob values are passed to the action scripts as
+      well. Scan actions are also signaled via dbus. This can be useful for
+      foreign applications. Scans can also be triggered via dbus from foreign
+      applications.
+      
+      On platforms which support signaling of dynamic device insertion/removal
+      (libudev, dbus, hal), scanbd supports this as well.
+
+      scanbd can use all sane-backends or some special backends from the (old)
+      scanbuttond project. 
+    '';
+    homepage = http://scanbd.sourceforge.net/;
+    downloadPage = http://sourceforge.net/projects/scanbd/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 53283233285e..86fb542f08ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3026,6 +3026,8 @@ let
 
   samplicator = callPackage ../tools/networking/samplicator { };
 
+  scanbd = callPackage ../tools/graphics/scanbd { };
+
   screen = callPackage ../tools/misc/screen {
     inherit (darwin.apple_sdk.libs) utmp;
   };

From 3e1599f57bbc9a83222ba0cbd91e55f09ce48875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 25 Jan 2016 07:55:42 +0100
Subject: [PATCH 0554/2285] nixos-generate-config: fix #12595: broadcom quoting

---
 .../installer/tools/nixos-generate-config.pl    | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index c590c4cde3f0..2284eba07a2d 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -148,7 +148,7 @@ sub pciCheck {
          $device eq "0x4331" || $device eq "0x43a0" || $device eq "0x43b1"
         ) )
      {
-        push @modulePackages, "\${config.boot.kernelPackages.broadcom_sta}";
+        push @modulePackages, "config.boot.kernelPackages.broadcom_sta";
         push @kernelModules, "wl";
      }
 
@@ -422,13 +422,20 @@ EOF
 
 # Generate the hardware configuration file.
 
-sub toNixExpr {
+sub toNixStringList {
     my $res = "";
     foreach my $s (@_) {
         $res .= " \"$s\"";
     }
     return $res;
 }
+sub toNixList {
+    my $res = "";
+    foreach my $s (@_) {
+        $res .= " $s";
+    }
+    return $res;
+}
 
 sub multiLineList {
     my $indent = shift;
@@ -444,9 +451,9 @@ sub multiLineList {
     return $res;
 }
 
-my $initrdAvailableKernelModules = toNixExpr(uniq @initrdAvailableKernelModules);
-my $kernelModules = toNixExpr(uniq @kernelModules);
-my $modulePackages = toNixExpr(uniq @modulePackages);
+my $initrdAvailableKernelModules = toNixStringList(uniq @initrdAvailableKernelModules);
+my $kernelModules = toNixStringList(uniq @kernelModules);
+my $modulePackages = toNixList(uniq @modulePackages);
 
 my $fsAndSwap = "";
 if (!$noFilesystems) {

From 7362936cd6952b24a3ec14f2e961522691892fcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Czy=C5=BC?= <tomasz.czyz@gmail.com>
Date: Mon, 11 Jan 2016 20:42:07 +0000
Subject: [PATCH 0555/2285] quicksynergy: init at 0.9.0 (close #12325)

vcunat moved `version` into the derivation.
---
 .../misc/quicksynergy/default.nix             | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/applications/misc/quicksynergy/default.nix

diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix
new file mode 100644
index 000000000000..90737a344ca2
--- /dev/null
+++ b/pkgs/applications/misc/quicksynergy/default.nix
@@ -0,0 +1,35 @@
+{stdenv, fetchurl, pkgconfig, gtk2, synergy}:
+
+stdenv.mkDerivation rec {
+  name = "quicksynergy-${version}";
+  version = "0.9.0";
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/quicksynergy/Linux/${version}/quicksynergy-${version}.tar.gz";
+    sha256 = "1pi8503bg8q1psw50y6d780i33nnvfjqiy9vnr3v52pdcfip8pix";
+  };
+  buildInputs = [
+    pkgconfig
+    gtk2
+    synergy
+  ];
+  preBuild = "
+    sed -i 's@/usr/bin@${synergy.out}/bin@' src/synergy_config.c
+  ";
+  meta = {
+    description = "GUI application to share mouse and keyboard between computers";
+    longDescription = "
+      QuickSynergy is a graphical interface (GUI) for easily configuring
+      Synergy2, an application that allows the user to share his mouse and
+      keyboard between two or more computers.
+
+      Without the need for any external hardware, Synergy2 uses the TCP-IP
+      protocol to share the resources, even between machines with diferent
+      operating systems, such as Mac OS, Linux and Windows.
+
+      Remember to open port 24800 (used by synergys program) if you want to
+      host mouse and keyboard.";
+    homepage = https://code.google.com/p/quicksynergy/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.spinus ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 86fb542f08ba..1b35d454d231 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8293,6 +8293,8 @@ let
 
   quesoglc = callPackage ../development/libraries/quesoglc { };
 
+  quicksynergy = callPackage ../applications/misc/quicksynergy { };
+
   qwt = callPackage ../development/libraries/qwt {};
 
   qxt = callPackage ../development/libraries/qxt {};

From 8f48a9756b462c8b2eeaf8326feab8abf751ecd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 25 Jan 2016 09:54:10 +0100
Subject: [PATCH 0556/2285] cc-wrapper: quote when saving $PATH

---
 pkgs/build-support/cc-wrapper/cc-wrapper.sh   | 4 ++--
 pkgs/build-support/cc-wrapper/gnat-wrapper.sh | 4 ++--
 pkgs/build-support/cc-wrapper/ld-wrapper.sh   | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index f7541b15a828..6e12a0d8bc8f 100644
--- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -1,5 +1,5 @@
 #! @shell@ -e
-path_backup=$PATH
+path_backup="$PATH"
 if [ -n "@coreutils@" ]; then
   PATH="@coreutils@/bin:@gnugrep@/bin"
 fi
@@ -145,5 +145,5 @@ if [ -n "$NIX_CC_WRAPPER_EXEC_HOOK" ]; then
     source "$NIX_CC_WRAPPER_EXEC_HOOK"
 fi
 
-PATH=$path_backup
+PATH="$path_backup"
 exec @prog@ ${extraBefore[@]} "${params[@]}" "${extraAfter[@]}"
diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
index 603275e4e695..ae46b40ac631 100644
--- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
@@ -1,5 +1,5 @@
 #! @shell@ -e
-path_backup=$PATH
+path_backup="$PATH"
 if [ -n "@coreutils@" ]; then
   PATH="@coreutils@/bin"
 fi
@@ -104,5 +104,5 @@ if [ -n "$NIX_GNAT_WRAPPER_EXEC_HOOK" ]; then
     source "$NIX_GNAT_WRAPPER_EXEC_HOOK"
 fi
 
-PATH=$path_backup
+PATH="$path_backup"
 exec @prog@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]}
diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
index a7ed2f364cdd..6ef06eb70348 100644
--- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
@@ -1,5 +1,5 @@
 #! @shell@ -e
-path_backup=$PATH
+path_backup="$PATH"
 if [ -n "@coreutils@" ]; then
   PATH="@coreutils@/bin"
 fi
@@ -167,5 +167,5 @@ if [ -n "$NIX_LD_WRAPPER_EXEC_HOOK" ]; then
     source "$NIX_LD_WRAPPER_EXEC_HOOK"
 fi
 
-PATH=$path_backup
+PATH="$path_backup"
 exec @prog@ ${extraBefore[@]} "${params[@]}" ${extra[@]}

From 98c7e70a3fde4821bfd45c1cfbbb81adbe8a7ea1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 25 Jan 2016 09:55:00 +0100
Subject: [PATCH 0557/2285] linux stdenv bootstrap: avoid building grep twice

It's perfectly enough when we use the bootstrapped grep everywhere
except the one put into the final stdenv and final pkgs.
---
 pkgs/stdenv/linux/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index 4ddf62f0aef7..ac7d8f5c706c 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -231,7 +231,8 @@ rec {
   # Construct a fourth stdenv that uses the new GCC.  But coreutils is
   # still from the bootstrap tools.
   stage4 = stageFun {
-    inherit (stage3.pkgs) gccPlain glibc binutils gnugrep;
+    inherit (stage3.pkgs) gccPlain glibc binutils;
+    gnugrep = bootstrapTools;
     coreutils = bootstrapTools;
     name = "";
 

From 3622038d20bb88f9a77ffe371721a9f77627e8af Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 25 Jan 2016 12:13:10 +0300
Subject: [PATCH 0558/2285] easyrsa2: init at 2.2.0

---
 pkgs/tools/networking/easyrsa/2.x.nix | 46 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/tools/networking/easyrsa/2.x.nix

diff --git a/pkgs/tools/networking/easyrsa/2.x.nix b/pkgs/tools/networking/easyrsa/2.x.nix
new file mode 100644
index 000000000000..e49c32aac704
--- /dev/null
+++ b/pkgs/tools/networking/easyrsa/2.x.nix
@@ -0,0 +1,46 @@
+{ stdenv, fetchurl, autoconf, automake111x, makeWrapper
+, gnugrep, openssl}:
+
+stdenv.mkDerivation rec {
+  name = "easyrsa-2.2.0";
+
+  src = fetchurl {
+    url = "https://github.com/OpenVPN/easy-rsa/archive/v2.2.0.tar.gz";
+    sha256 = "1xq4by5frb6ikn53ss3y8v7ss639dccxfq8jfrbk07ynkmk668qk";
+  };
+
+  # Copy missing files and autoreconf
+  preConfigure = ''
+    cp ${automake111x}/share/automake/install-sh .
+    cp ${automake111x}/share/automake/missing .
+
+    autoreconf
+  '';
+
+  preBuild = ''
+    mkdir -p $out/share/easy-rsa
+  '';
+
+  nativeBuildInputs = [ autoconf makeWrapper automake111x ];
+  buildInputs = [ gnugrep openssl];
+
+  # Make sane defaults and patch default config vars
+  postInstall = ''
+    cp $out/share/easy-rsa/openssl-1.0.0.cnf $out/share/easy-rsa/openssl.cnf
+    for prog in $(find "$out/share/easy-rsa" -executable -type f); do
+      makeWrapper "$prog" "$out/bin/$(basename $prog)" \
+        --set EASY_RSA "$out/share/easy-rsa" \
+        --set OPENSSL "${openssl}/bin/openssl" \
+        --set GREP "${gnugrep}/bin/grep"
+    done
+    sed -i "/EASY_RSA=\|OPENSSL=\|GREP=/d" $out/share/easy-rsa/vars
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Simple shell based CA utility";
+    homepage = http://openvpn.net/;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.offline ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b35d454d231..905b4c18e8a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1386,6 +1386,8 @@ let
 
   easyrsa = callPackage ../tools/networking/easyrsa { };
 
+  easyrsa2 = callPackage ../tools/networking/easyrsa/2.x.nix { };
+
   ebook_tools = callPackage ../tools/text/ebook-tools { };
 
   ecryptfs = callPackage ../tools/security/ecryptfs { };

From 1f2b819783d00f876865aee20cb63c477331a901 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 25 Jan 2016 11:16:23 +0100
Subject: [PATCH 0559/2285] binutils: extend meta.platforms to unix to fix
 #12606

Also refactor meta.
Maybe we could have platforms.all in there, but I leave it here.
---
 pkgs/development/tools/misc/binutils/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 4cc4cadc280f..86d69d8da8ce 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -67,7 +67,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Tools for manipulating binaries (linker, assembler, etc.)";
     longDescription = ''
       The GNU Binutils are a collection of binary tools.  The main
@@ -76,8 +76,8 @@ stdenv.mkDerivation rec {
       `gprof', `nm', `strip', etc.
     '';
     homepage = http://www.gnu.org/software/binutils/;
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.linux;
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
 
     /* Give binutils a lower priority than gcc-wrapper to prevent a
        collision due to the ld/as wrappers/symlinks in the latter. */

From c0691a0659a06a0edfaa529568982d34b88e7eb9 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Sun, 24 Jan 2016 22:54:53 +0100
Subject: [PATCH 0560/2285] compcert: 2.5 -> 2.6

---
 pkgs/development/compilers/compcert/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                 | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix
index 3b1ebca17965..190f2b7a96af 100644
--- a/pkgs/development/compilers/compcert/default.nix
+++ b/pkgs/development/compilers/compcert/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   name    = "compcert-${version}";
-  version = "2.5";
+  version = "2.6";
 
   src = fetchurl {
     url    = "http://compcert.inria.fr/release/${name}.tgz";
-    sha256 = "15gxarl2a8mz33fdn8pycj0ccazgmllbg2940n7aqdjlz807p11n";
+    sha256 = "05sdxgg2w7ykw6xbcq6dl2kzxdz4qzhjajiawpy6490wqiji7wm1";
   };
 
-  buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml menhir ]);
+  buildInputs = [ coq ] ++ (with ocamlPackages; [ ocaml findlib menhir ]);
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 905b4c18e8a4..a9d1569b24e8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3883,11 +3883,13 @@ let
 
   cmucl_binary = callPackage_i686 ../development/compilers/cmucl/binary.nix { };
 
-  compcert = callPackage ../development/compilers/compcert (
+  compcert = callPackage ../development/compilers/compcert ((
     if system == "x86_64-linux"
     then { tools = pkgsi686Linux.stdenv.cc; }
     else {}
-  );
+  ) // {
+    ocamlPackages = ocamlPackages_4_02;
+  });
 
   cryptol = haskellPackages.cryptol;
 

From a04e3c7615f37cad555ca79aa9030abbce44c57a Mon Sep 17 00:00:00 2001
From: Nicolas Pouillard <nicolas.pouillard@gmail.com>
Date: Thu, 21 Jan 2016 22:43:46 +0100
Subject: [PATCH 0561/2285] interlock: init at 2016.01.14

Also add textsecure on which it depends:
textsecure: init at 505e129c42fc4c5cb2d105520cef7c04fa3a6b64
---
 pkgs/top-level/all-packages.nix |  2 ++
 pkgs/top-level/go-packages.nix  | 34 +++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c283e4acb10..b6f601d5ebc7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -879,6 +879,8 @@ let
 
   heatseeker = callPackage ../tools/misc/heatseeker { };
 
+  interlock = goPackages.interlock.bin // { outputs = [ "bin" ]; };
+
   mathics = pythonPackages.mathics;
 
   mcrl = callPackage ../tools/misc/mcrl { };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index f7a2d8904f3b..83c7564392f5 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3599,4 +3599,38 @@ let
         xargs -d '\n' sed -i -e s,github.com/ericchiang/pup/Godeps/_workspace/src/,,g
     '';
   };
+
+  textsecure = buildFromGitHub rec {
+    rev = "505e129c42fc4c5cb2d105520cef7c04fa3a6b64";
+    owner = "janimo";
+    repo = "textsecure";
+    sha256 = "0sdcqd89dlic0bllb6mjliz4x54rxnm1r3xqd5qdp936n7xs3mc6";
+    propagatedBuildInputs = [ crypto protobuf ed25519 yaml-v2 logrus ];
+    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;
+  };
 }; in self

From 495e8a6906950f73d7a0090b693c9af6dd0a658e Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Mon, 25 Jan 2016 10:21:09 -0500
Subject: [PATCH 0562/2285] rt: Include version in drv

---
 pkgs/servers/rt/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/rt/default.nix b/pkgs/servers/rt/default.nix
index 7f8c372c3355..253f90e68efa 100644
--- a/pkgs/servers/rt/default.nix
+++ b/pkgs/servers/rt/default.nix
@@ -1,7 +1,9 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "rt-4.2.12";
+  name = "rt-${version}";
+
+  version = "4.2.12";
 
   src = fetchurl {
     url = "https://download.bestpractical.com/pub/rt/release/${name}.tar.gz";

From 7b6454cbb959e001a1e421d6cc00a00994fb7518 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 25 Jan 2016 16:37:13 +0100
Subject: [PATCH 0563/2285] geolite-legacy 2016-01-18 -> 2016-01-25

---
 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 c5510b79cc3e..24f987f374cb 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,7 +8,7 @@ let
 
   # Annoyingly, these files are updated without a change in URL. This means that
   # builds will start failing every month or so, until the hashes are updated.
-  version = "2016-01-18";
+  version = "2016-01-25";
 in
 stdenv.mkDerivation {
   name = "geolite-legacy-${version}";
@@ -27,10 +27,10 @@ stdenv.mkDerivation {
     "1fksbnmda2a05cpax41h9r7jhi8102q41kl5nij4ai42d6yqy73x";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "00x6d11l8jxc1dj7p1kwmr3x1zwxwbv7xqbxj17j30s4qjmkb2i1";
+    "1n7zlmnaxvjljyih9yi9hns530by21h42j2kcszbcyvn7rd9rnyw";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "0r84ji86q4f6maw3scx9i054nzhjg4kb26r6fp1jdbiqjp8mhkyw";
+    "1id60almra7mq4v86p37sfph8jrbdnc5pzxvy55wiyrvf6ydvk56";
 
   meta = with stdenv.lib; {
     inherit version;

From 9fb8020e4ec2e74e39a8f28dfb3ef18a70bd1eef Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 24 Jan 2016 20:31:44 +0100
Subject: [PATCH 0564/2285] Add version attribute where maintainers |= nckx

This will probably be mandatory soon, and is a step in the right
direction. Removes the deprecated meta.version, and move some meta
sections to the end of the file where I should have put them in
the first place.
---
 pkgs/applications/audio/fmit/default.nix      |  5 +--
 pkgs/applications/audio/id3v2/default.nix     |  4 +-
 .../audio/keyfinder-cli/default.nix           |  3 +-
 pkgs/applications/audio/keyfinder/default.nix | 39 ++++++++---------
 pkgs/applications/editors/neovim/default.nix  | 11 +++--
 .../graphics/apitrace/default.nix             |  5 +--
 .../graphics/simple-scan/default.nix          |  3 +-
 .../graphics/swingsane/default.nix            |  3 +-
 .../networking/feedreaders/rawdog/default.nix |  3 +-
 .../feedreaders/rsstail/default.nix           |  3 +-
 .../networking/remote/x2goclient/default.nix  | 18 ++++----
 .../networking/vnstat/default.nix             |  3 +-
 .../git-and-tools/git-bz/default.nix          |  6 +--
 .../git-and-tools/git-hub/default.nix         |  3 +-
 pkgs/applications/video/clipgrab/default.nix  |  3 +-
 pkgs/applications/video/minitube/default.nix  | 31 +++++++------
 .../virtualization/remotebox/default.nix      |  5 +--
 pkgs/data/documentation/man-pages/default.nix |  3 +-
 pkgs/data/fonts/hack/default.nix              |  5 +--
 .../misc/sound-theme-freedesktop/default.nix  |  3 +-
 pkgs/data/misc/wireless-regdb/default.nix     |  5 +--
 pkgs/development/compilers/squeak/default.nix | 39 ++++++++---------
 .../interpreters/picoc/default.nix            | 43 +++++++++----------
 .../libraries/accounts-qt/default.nix         | 18 ++++----
 pkgs/development/libraries/bobcat/default.nix | 21 +++++----
 .../libraries/ip2location-c/default.nix       |  5 +--
 pkgs/development/libraries/libcli/default.nix |  4 +-
 .../libraries/libkeyfinder/default.nix        | 21 +++++----
 .../libnetfilter_conntrack/default.nix        |  3 +-
 .../libraries/libxcomp/default.nix            | 21 +++++----
 pkgs/development/libraries/rote/default.nix   |  3 +-
 pkgs/development/tools/alloy/default.nix      | 39 ++++++++---------
 .../tools/analysis/egypt/default.nix          | 11 +++--
 .../analysis/include-what-you-use/default.nix |  5 +--
 pkgs/development/tools/java/cfr/default.nix   | 29 ++++++-------
 .../tools/misc/bin_replace_string/default.nix | 15 +++----
 .../tools/parsing/flexc++/default.nix         | 31 +++++++------
 pkgs/games/2048-in-terminal/default.nix       |  3 +-
 pkgs/games/soi/default.nix                    |  2 +-
 pkgs/misc/cups/drivers/samsung/default.nix    |  6 +--
 pkgs/os-specific/linux/crda/default.nix       |  5 +--
 pkgs/os-specific/linux/fatrace/default.nix    |  3 +-
 .../firmware/b43-firmware/6.30.163.46.nix     |  5 +--
 pkgs/os-specific/linux/freefall/default.nix   |  4 +-
 pkgs/os-specific/linux/ftop/default.nix       |  3 +-
 pkgs/os-specific/linux/kexectools/default.nix |  3 +-
 pkgs/os-specific/linux/mcelog/default.nix     |  5 +--
 pkgs/os-specific/linux/radeontop/default.nix  |  5 +--
 pkgs/os-specific/linux/uksmtools/default.nix  |  5 +--
 pkgs/shells/mksh/default.nix                  |  5 +--
 pkgs/tools/admin/nxproxy/default.nix          | 21 +++++----
 pkgs/tools/cd-dvd/dvdisaster/default.nix      |  3 +-
 pkgs/tools/compression/lz4/default.nix        |  3 +-
 pkgs/tools/compression/zopfli/default.nix     |  3 +-
 pkgs/tools/filesystems/duff/default.nix       |  9 ++--
 pkgs/tools/filesystems/encfs/default.nix      |  4 +-
 pkgs/tools/filesystems/exfat/default.nix      |  3 +-
 pkgs/tools/filesystems/gpart/default.nix      |  3 +-
 pkgs/tools/filesystems/mp3fs/default.nix      |  2 +-
 pkgs/tools/misc/clex/default.nix              | 10 ++---
 pkgs/tools/misc/ipad_charge/default.nix       |  3 +-
 pkgs/tools/misc/ms-sys/default.nix            |  3 +-
 pkgs/tools/misc/tldr/default.nix              |  5 +--
 pkgs/tools/networking/dhcping/default.nix     |  7 ++-
 pkgs/tools/networking/hans/default.nix        | 33 +++++++-------
 pkgs/tools/networking/ip2location/default.nix |  5 +--
 pkgs/tools/networking/ipv6calc/default.nix    |  3 +-
 pkgs/tools/networking/netsniff-ng/default.nix |  5 +--
 pkgs/tools/networking/pcapc/default.nix       |  3 +-
 pkgs/tools/networking/pingtcp/default.nix     |  5 +--
 .../tools/package-management/dpkg/default.nix |  5 +--
 .../package-management/packagekit/default.nix |  5 +--
 pkgs/tools/security/eid-mw/default.nix        |  5 +--
 pkgs/tools/security/eid-viewer/default.nix    |  3 +-
 pkgs/tools/system/foremost/default.nix        |  3 +-
 pkgs/tools/system/gptfdisk/default.nix        |  3 +-
 pkgs/tools/system/suid-chroot/default.nix     |  3 +-
 pkgs/tools/text/aha/default.nix               |  5 +--
 78 files changed, 313 insertions(+), 378 deletions(-)

diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix
index 36988c980917..21d1d0ef4c67 100644
--- a/pkgs/applications/audio/fmit/default.nix
+++ b/pkgs/applications/audio/fmit/default.nix
@@ -7,9 +7,9 @@ assert alsaSupport -> alsaLib != null;
 assert jackSupport -> libjack2 != null;
 assert portaudioSupport -> portaudio != null;
 
-let version = "1.0.8"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "fmit-${version}";
+  version = "1.0.8";
 
   src = fetchFromGitHub {
     sha256 = "04s7xcgmi5g58lirr48vf203n1jwdxf981x1p6ysbax24qwhs2kd";
@@ -37,7 +37,6 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Free Musical Instrument Tuner";
     longDescription = ''
       FMIT is a graphical utility for tuning musical instruments, with error
diff --git a/pkgs/applications/audio/id3v2/default.nix b/pkgs/applications/audio/id3v2/default.nix
index 71dc88b9231e..8780c0133406 100644
--- a/pkgs/applications/audio/id3v2/default.nix
+++ b/pkgs/applications/audio/id3v2/default.nix
@@ -1,8 +1,9 @@
 {stdenv, fetchurl, id3lib, groff, zlib}:
 
-let version = "0.1.12"; in
 stdenv.mkDerivation rec {
   name = "id3v2-${version}";
+  version = "0.1.12";
+
   src = fetchurl {
     url = "mirror://sourceforge/id3v2/${name}.tar.gz";
     sha256 = "1gr22w8gar7zh5pyyvdy7cy26i47l57jp1l1nd60xfwx339zl1c1";
@@ -19,7 +20,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "A command line editor for id3v2 tags";
     homepage = http://id3v2.sourceforge.net/;
     license = licenses.gpl2Plus;
diff --git a/pkgs/applications/audio/keyfinder-cli/default.nix b/pkgs/applications/audio/keyfinder-cli/default.nix
index 701bf6f82f44..6a013e8c604f 100644
--- a/pkgs/applications/audio/keyfinder-cli/default.nix
+++ b/pkgs/applications/audio/keyfinder-cli/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, libav, libkeyfinder }:
 
-let version = "2015-09-13"; in
 stdenv.mkDerivation rec {
   name = "keyfinder-cli-${version}";
+  version = "2015-09-13";
 
   src = fetchFromGitHub {
     repo = "keyfinder-cli";
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    inherit version;
     inherit (src.meta) homepage;
     description = "Musical key detection for digital audio (command-line tool)";
     longDescription = ''
diff --git a/pkgs/applications/audio/keyfinder/default.nix b/pkgs/applications/audio/keyfinder/default.nix
index 74110c5924e3..ae1a8ea1edf4 100644
--- a/pkgs/applications/audio/keyfinder/default.nix
+++ b/pkgs/applications/audio/keyfinder/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, libav_0_8, libkeyfinder, qtbase, qtxmlpatterns, taglib }:
 
-let version = "2.1"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "keyfinder-${version}";
+  version = "2.1";
 
   src = fetchFromGitHub {
     sha256 = "0j9k90ll4cr8j8dywb6zf1bs9vijlx7m4zsh6w9hxwrr7ymz89hn";
@@ -11,24 +11,6 @@ stdenv.mkDerivation {
     owner = "ibsh";
   };
 
-  meta = with stdenv.lib; {
-    inherit version;
-    description = "Musical key detection for digital audio (graphical UI)";
-    longDescription = ''
-      KeyFinder is an open source key detection tool, for DJs interested in
-      harmonic and tonal mixing. Designed primarily for electronic and dance
-      music, it is highly configurable and can be applied to many genres. It
-      supports a huge range of codecs thanks to LibAV, and writes to metadata
-      tags using TagLib. It's intended to be very focused: no library
-      management, no track suggestions, no media player. Just a fast,
-      efficient workflow tool.
-    '';
-    homepage = http://www.ibrahimshaath.co.uk/keyfinder/;
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
-  };
-
   buildInputs = [ libav_0_8 libkeyfinder qtbase qtxmlpatterns taglib ];
 
   postPatch = ''
@@ -43,4 +25,21 @@ stdenv.mkDerivation {
   '';
 
   enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Musical key detection for digital audio (graphical UI)";
+    longDescription = ''
+      KeyFinder is an open source key detection tool, for DJs interested in
+      harmonic and tonal mixing. Designed primarily for electronic and dance
+      music, it is highly configurable and can be applied to many genres. It
+      supports a huge range of codecs thanks to LibAV, and writes to metadata
+      tags using TagLib. It's intended to be very focused: no library
+      management, no track suggestions, no media player. Just a fast,
+      efficient workflow tool.
+    '';
+    homepage = http://www.ibrahimshaath.co.uk/keyfinder/;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
 }
diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index a27027406e2c..dcb274513102 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -15,11 +15,10 @@ with stdenv.lib;
 
 let
 
-  version = "0.1.1";
-
   # Note: this is NOT the libvterm already in nixpkgs, but some NIH silliness:
-  neovimLibvterm = let version = "2015-11-06"; in stdenv.mkDerivation {
+  neovimLibvterm = stdenv.mkDerivation rec {
     name = "neovim-libvterm-${version}";
+    version = "2015-11-06";
 
     src = fetchFromGitHub {
       sha256 = "0f9r0wnr9ajcdd6as24igmch0n8s1annycb9f4k0vg6fngwaypy9";
@@ -59,8 +58,9 @@ let
     ignoreCollisions = true;
   };
 
-  neovim = stdenv.mkDerivation {
+  neovim = stdenv.mkDerivation rec {
     name = "neovim-${version}";
+    version = "0.1.1";
 
     src = fetchFromGitHub {
       sha256 = "0crswjslp687yp1cpn7nmm0j2sccqhcxryzxv1s81cgpai0fzf60";
@@ -146,7 +146,10 @@ let
 
 in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation {
   name = "neovim-${version}-configured";
+  inherit (neovim) version;
+
   nativeBuildInputs = [ makeWrapper ];
+
   buildCommand = ''
     mkdir -p $out/bin
     for item in ${neovim}/bin/*; do
diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix
index 072cc698e920..f54628e0b8de 100644
--- a/pkgs/applications/graphics/apitrace/default.nix
+++ b/pkgs/applications/graphics/apitrace/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, cmake, libX11, procps, python, qtbase }:
 
-let version = "7.1"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "apitrace-${version}";
+  version = "7.1";
 
   src = fetchFromGitHub {
     sha256 = "1n2gmsjnpyam7isg7n1ksggyh6y1l8drvx0a93bnvbcskr7jiz9a";
@@ -20,7 +20,6 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     homepage = https://apitrace.github.io;
     description = "Tools to trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs";
     license = licenses.mit;
diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index a2b7fd77337b..5f8a8ac6b9ae 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, cairo, colord, glib, gtk3, gusb, intltool, itstool
 , libusb1, libxml2, pkgconfig, sane-backends, vala, wrapGAppsHook }:
 
-let version = "3.19.4"; in
 stdenv.mkDerivation rec {
   name = "simple-scan-${version}";
+  version = "3.19.4";
 
   src = fetchurl {
     sha256 = "1v9sify1s38qd5sfg26m7sdg9bkrfmai2nijs4wzah7xa9p23c83";
@@ -26,7 +26,6 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Simple scanning utility";
     longDescription = ''
       A really easy way to scan both documents and photos. You can crop out the
diff --git a/pkgs/applications/graphics/swingsane/default.nix b/pkgs/applications/graphics/swingsane/default.nix
index 0f85bf58c55e..53bdbcd12740 100644
--- a/pkgs/applications/graphics/swingsane/default.nix
+++ b/pkgs/applications/graphics/swingsane/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, makeDesktopItem, unzip, jre }:
 
-let version = "0.2"; in
 stdenv.mkDerivation rec {
   name = "swingsane-${version}";
+  version = "0.2";
 
   src = fetchurl {
     sha256 = "15pgqgyw46yd2i367ax9940pfyvinyw2m8apmwhrn0ix5nywa7ni";
@@ -44,7 +44,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Java GUI for SANE scanner servers (saned)";
     longDescription = ''
       SwingSane is a powerful, cross platform, open source Java front-end for
diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix
index 749e1864fda9..e5e8f823d277 100644
--- a/pkgs/applications/networking/feedreaders/rawdog/default.nix
+++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, pythonPackages }:
 
-let version = "2.21"; in
 pythonPackages.buildPythonPackage rec {
   name = "rawdog-${version}";
+  version = "2.21";
 
   src = fetchurl {
     url = "http://offog.org/files/${name}.tar.gz";
@@ -14,7 +14,6 @@ pythonPackages.buildPythonPackage rec {
   namePrefix = "";
   
   meta = with stdenv.lib; {
-    inherit version;
     homepage = "http://offog.org/code/rawdog/";
     description = "RSS Aggregator Without Delusions Of Grandeur";
     license = licenses.gpl2;
diff --git a/pkgs/applications/networking/feedreaders/rsstail/default.nix b/pkgs/applications/networking/feedreaders/rsstail/default.nix
index 40c165c2540c..fd349b320d28 100644
--- a/pkgs/applications/networking/feedreaders/rsstail/default.nix
+++ b/pkgs/applications/networking/feedreaders/rsstail/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, cppcheck, libmrss }:
 
-let version = "2.1"; in
 stdenv.mkDerivation rec {
   name = "rsstail-${version}";
+  version = "2.1";
 
   src = fetchFromGitHub {
     sha256 = "12p69i3g1fwlw0bds9jqsdmzkid3k5a41w31d227i7vm12wcvjf6";
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Monitor RSS feeds for new entries";
     longDescription = ''
       RSSTail is more or less an RSS reader: it monitors an RSS feed and if it
diff --git a/pkgs/applications/networking/remote/x2goclient/default.nix b/pkgs/applications/networking/remote/x2goclient/default.nix
index fdc27b63e9e3..ffebeb744cea 100644
--- a/pkgs/applications/networking/remote/x2goclient/default.nix
+++ b/pkgs/applications/networking/remote/x2goclient/default.nix
@@ -1,22 +1,14 @@
 { stdenv, fetchurl, cups, libssh, libXpm, nxproxy, openldap, makeWrapper, qt4 }:
 
-let version = "4.0.5.0"; in
 stdenv.mkDerivation rec {
   name = "x2goclient-${version}";
+  version = "4.0.5.0";
 
   src = fetchurl {
     url = "http://code.x2go.org/releases/source/x2goclient/${name}.tar.gz";
     sha256 = "18a2pszh0nq2ir64a1ah1mlzddn4qcd12b339bv30n0y1ir92bi4";
   };
 
-  meta = with stdenv.lib; {
-    description = "Graphical NoMachine NX3 remote desktop client";
-    homepage = http://x2go.org/;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
-  };
-
   buildInputs = [ cups libssh libXpm nxproxy openldap qt4 ];
   nativeBuildInputs = [ makeWrapper ];
 
@@ -35,4 +27,12 @@ stdenv.mkDerivation rec {
   postInstall = ''
     wrapProgram "$out/bin/x2goclient" --suffix PATH : "${nxproxy}/bin";
   '';
+
+  meta = with stdenv.lib; {
+    description = "Graphical NoMachine NX3 remote desktop client";
+    homepage = http://x2go.org/;
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
 }
diff --git a/pkgs/applications/networking/vnstat/default.nix b/pkgs/applications/networking/vnstat/default.nix
index a553de8abb26..1c78f926fe7b 100644
--- a/pkgs/applications/networking/vnstat/default.nix
+++ b/pkgs/applications/networking/vnstat/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, gd, ncurses }:
 
-let version = "1.15"; in
 stdenv.mkDerivation rec {
   name = "vnstat-${version}";
+  version = "1.15";
 
   src = fetchurl {
     sha256 = "0fdw3nbrfm4acv48r0934ls6ld5lwkff3gyym2c72qlbm9dlp0f3";
@@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Console-based network statistics utility for Linux";
     longDescription = ''
       vnStat is a console-based network traffic monitor for Linux and BSD that
diff --git a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
index d43a49ac7514..b5e1cdbcffb9 100644
--- a/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-bz/default.nix
@@ -2,9 +2,9 @@
 , asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, makeWrapper, xmlto
 , pythonPackages }:
 
-let version = "3.2015-09-08"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "git-bz-${version}";
+  version = "3.2015-09-08";
 
   src = fetchgit {
     sha256 = "19d9c81d4eeabe87079d8f60e4cfa7303f776f5a7c9874642cf2bd188851d029";
@@ -12,7 +12,6 @@ stdenv.mkDerivation {
     url = "git://git.fishsoup.net/git-bz";
   };
 
-
   nativeBuildInputs = [
     asciidoc docbook_xml_dtd_45 docbook_xsl libxslt makeWrapper xmlto
   ];
@@ -32,7 +31,6 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Bugzilla integration for git";
     longDescription = ''
       git-bz is a tool for integrating the Git command line with the
diff --git a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
index 271e1244820f..b1626f687d41 100644
--- a/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-hub/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, docutils, python }:
 
-let version = "0.9.0"; in
 stdenv.mkDerivation rec {
   name = "git-hub-${version}";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     sha256 = "0c4kq4a906lr8nzway7qh0560n2ydvidh9rlffh44902rd48kp0h";
@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     inherit (src.meta) homepage;
     description = "Git command line interface to GitHub";
     longDescription = ''
diff --git a/pkgs/applications/video/clipgrab/default.nix b/pkgs/applications/video/clipgrab/default.nix
index d4f968a3b9f3..961471cd9b36 100644
--- a/pkgs/applications/video/clipgrab/default.nix
+++ b/pkgs/applications/video/clipgrab/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, makeDesktopItem, ffmpeg, qt4 }:
 
-let version = "3.5.6"; in
 stdenv.mkDerivation rec {
   name = "clipgrab-${version}";
+  version = "3.5.6";
 
   src = fetchurl {
     sha256 = "0wm6hqaq6ydbvvd0fqkfydxd5h7gf4di7lvq63xgxl4z40jqc25n";
@@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Video downloader for YouTube and other sites";
     longDescription = ''
       ClipGrab is a free downloader and converter for YouTube, Vimeo, Metacafe,
diff --git a/pkgs/applications/video/minitube/default.nix b/pkgs/applications/video/minitube/default.nix
index 9ae200abebb2..f9d887189ec9 100644
--- a/pkgs/applications/video/minitube/default.nix
+++ b/pkgs/applications/video/minitube/default.nix
@@ -2,9 +2,9 @@
 # "Free" API key generated by nckx <tobias.geerinckx.rice@gmail.com>
 , withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }:
 
-let version = "2.4"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "minitube-${version}";
+  version = "2.4";
 
   src = fetchFromGitHub {
     sha256 = "0mm8v2vpspwxh2fqaykb381v6r9apywc1b0x8jkcbp7s43w10lp5";
@@ -13,20 +13,6 @@ stdenv.mkDerivation {
     owner = "flaviotordini";
   };
 
-  meta = with stdenv.lib; {
-    inherit version;
-    description = "Stand-alone YouTube video player";
-    longDescription = ''
-      Watch YouTube videos in a new way: you type a keyword, Minitube gives
-      you an endless video stream. Minitube is not about cloning the YouTube
-      website, it aims to create a new TV-like experience.
-    '';
-    homepage = http://flavio.tordini.org/minitube;
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
-  };
-
   buildInputs = [ phonon phonon_backend_vlc qt4 ];
   nativeBuildInputs = [ makeWrapper ];
 
@@ -40,4 +26,17 @@ stdenv.mkDerivation {
     wrapProgram $out/bin/minitube \
       --prefix QT_PLUGIN_PATH : "${phonon_backend_vlc}/lib/kde4/plugins"
   '';
+
+  meta = with stdenv.lib; {
+    description = "Stand-alone YouTube video player";
+    longDescription = ''
+      Watch YouTube videos in a new way: you type a keyword, Minitube gives
+      you an endless video stream. Minitube is not about cloning the YouTube
+      website, it aims to create a new TV-like experience.
+    '';
+    homepage = http://flavio.tordini.org/minitube;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
 }
diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix
index e07f8d5b92c9..37086f52730f 100644
--- a/pkgs/applications/virtualization/remotebox/default.nix
+++ b/pkgs/applications/virtualization/remotebox/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, makeWrapper, perl, perlPackages }:
 
-let version = "2.0"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "remotebox-${version}";
+  version = "2.0";
 
   src = fetchurl {
     url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2";
@@ -26,7 +26,6 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "VirtualBox client with remote management";
     homepage = http://remotebox.knobgoblin.org.uk/;
     license = licenses.gpl2Plus;
diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 5800b429ae4d..02b4518b63d9 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl }:
 
-let version = "4.04"; in
 stdenv.mkDerivation rec {
   name = "man-pages-${version}";
+  version = "4.04";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz";
@@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
   makeFlags = [ "MANDIR=$(out)/share/man" ];
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Linux development manual pages";
     homepage = http://www.kernel.org/doc/man-pages/;
     repositories.git = http://git.kernel.org/pub/scm/docs/man-pages/man-pages;
diff --git a/pkgs/data/fonts/hack/default.nix b/pkgs/data/fonts/hack/default.nix
index 0b793d53fe6f..44b931f3b1d9 100644
--- a/pkgs/data/fonts/hack/default.nix
+++ b/pkgs/data/fonts/hack/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, unzip }:
 
-let version = "2.019"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "hack-font-${version}";
+  version = "2.019";
 
   src = let
     version_ = with stdenv.lib;
@@ -22,7 +22,6 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "A typeface designed for source code";
     longDescription = ''
       Hack is hand groomed and optically balanced to be a workhorse face for
diff --git a/pkgs/data/misc/sound-theme-freedesktop/default.nix b/pkgs/data/misc/sound-theme-freedesktop/default.nix
index a43a94a0d7c9..986f3d35b7d5 100644
--- a/pkgs/data/misc/sound-theme-freedesktop/default.nix
+++ b/pkgs/data/misc/sound-theme-freedesktop/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, intltool }:
 
-let version = "0.8"; in
 stdenv.mkDerivation rec {
   name = "sound-theme-freedesktop-${version}";
+  version = "0.8";
 
   src = fetchurl {
     sha256 = "054abv4gmfk9maw93fis0bf605rc56dah7ys5plc4pphxqh8nlfb";
@@ -12,7 +12,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ intltool ];
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Freedesktop reference sound theme";
     homepage = http://freedesktop.org/wiki/Specifications/sound-theme-spec;
     # See http://cgit.freedesktop.org/sound-theme-freedesktop/tree/CREDITS:
diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix
index acc1ca5b55ec..123cb7a62089 100644
--- a/pkgs/data/misc/wireless-regdb/default.nix
+++ b/pkgs/data/misc/wireless-regdb/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchgit }:
 
-let version = "2015-12-14"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "wireless-regdb-${version}";
+  version = "2015-12-14";
 
   src = fetchgit {
     sha256 = "1ldfcxn3mdb104czy78b7nj1clsbfp8fc6mshix98zq0bg4k7rsm";
@@ -18,7 +18,6 @@ stdenv.mkDerivation {
   ];
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Wireless regulatory database for CRDA";
     homepage = http://wireless.kernel.org/en/developers/Regulatory/;
     license = licenses.isc;
diff --git a/pkgs/development/compilers/squeak/default.nix b/pkgs/development/compilers/squeak/default.nix
index 19b73a0bde5e..8aa980b72e60 100644
--- a/pkgs/development/compilers/squeak/default.nix
+++ b/pkgs/development/compilers/squeak/default.nix
@@ -1,33 +1,15 @@
 { stdenv, fetchurl, cmake, coreutils, dbus, freetype, glib, gnused
 , libpthreadstubs, pango, pkgconfig, libpulseaudio, which }:
 
-let version = "4.10.2.2614"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "squeak-${version}";
+  version = "4.10.2.2614";
 
   src = fetchurl {
     sha256 = "0bpwbnpy2sb4gylchfx50sha70z36bwgdxraym4vrr93l8pd3dix";
     url = "http://squeakvm.org/unix/release/Squeak-${version}-src.tar.gz";
   };
 
-  meta = with stdenv.lib; {
-    inherit version;
-    description = "Smalltalk programming language and environment";
-    longDescription = ''
-      Squeak is a full-featured implementation of the Smalltalk programming
-      language and environment based on (and largely compatible with) the
-      original Smalltalk-80 system. Squeak has very powerful 2- and 3-D
-      graphics, sound, video, MIDI, animation and other multimedia
-      capabilities. It also includes a customisable framework for creating
-      dynamic HTTP servers and interactively extensible Web sites.
-    '';
-    homepage = http://squeakvm.org/;
-    downloadPage = http://squeakvm.org/unix/index.html;
-    license = with licenses; [ asl20 mit ];
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
-  };
-
   buildInputs = [ coreutils dbus freetype glib gnused libpthreadstubs
     pango libpulseaudio which ];
   nativeBuildInputs = [ cmake pkgconfig ];
@@ -44,4 +26,21 @@ stdenv.mkDerivation {
   '';
 
   enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Smalltalk programming language and environment";
+    longDescription = ''
+      Squeak is a full-featured implementation of the Smalltalk programming
+      language and environment based on (and largely compatible with) the
+      original Smalltalk-80 system. Squeak has very powerful 2- and 3-D
+      graphics, sound, video, MIDI, animation and other multimedia
+      capabilities. It also includes a customisable framework for creating
+      dynamic HTTP servers and interactively extensible Web sites.
+    '';
+    homepage = http://squeakvm.org/;
+    downloadPage = http://squeakvm.org/unix/index.html;
+    license = with licenses; [ asl20 mit ];
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
 }
diff --git a/pkgs/development/interpreters/picoc/default.nix b/pkgs/development/interpreters/picoc/default.nix
index 72e89def4f50..e78b74347198 100644
--- a/pkgs/development/interpreters/picoc/default.nix
+++ b/pkgs/development/interpreters/picoc/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, readline }:
 
-let version = "2015-05-04"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "picoc-${version}";
+  version = "2015-05-04";
 
   src = fetchFromGitHub {
     sha256 = "01w3jwl0vn9fsmh7p20ad4nl9ljzgfn576yvncd9pk9frx3pd8y4";
@@ -11,26 +11,6 @@ stdenv.mkDerivation {
     owner = "zsaleeba";
   };
 
-  meta = with stdenv.lib; {
-    inherit version;
-    description = "Very small C interpreter for scripting";
-    longDescription = ''
-      PicoC is a very small C interpreter for scripting. It was originally
-      written as a script language for a UAV's on-board flight system. It's
-      also very suitable for other robotic, embedded and non-embedded
-      applications. The core C source code is around 3500 lines of code. It's
-      not intended to be a complete implementation of ISO C but it has all the
-      essentials. When compiled it only takes a few k of code space and is also
-      very sparing of data space. This means it can work well in small embedded
-      devices.
-    '';
-    homepage = https://github.com/zsaleeba/picoc;
-    downloadPage = https://code.google.com/p/picoc/downloads/list;
-    license = licenses.bsd3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
-  };
-
   buildInputs = [ readline ];
 
   postPatch = ''
@@ -50,4 +30,23 @@ stdenv.mkDerivation {
     mkdir -p $out/include
     install -m644 *.h $out/include
   '';
+
+  meta = with stdenv.lib; {
+    description = "Very small C interpreter for scripting";
+    longDescription = ''
+      PicoC is a very small C interpreter for scripting. It was originally
+      written as a script language for a UAV's on-board flight system. It's
+      also very suitable for other robotic, embedded and non-embedded
+      applications. The core C source code is around 3500 lines of code. It's
+      not intended to be a complete implementation of ISO C but it has all the
+      essentials. When compiled it only takes a few k of code space and is also
+      very sparing of data space. This means it can work well in small embedded
+      devices.
+    '';
+    homepage = https://github.com/zsaleeba/picoc;
+    downloadPage = https://code.google.com/p/picoc/downloads/list;
+    license = licenses.bsd3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
 }
diff --git a/pkgs/development/libraries/accounts-qt/default.nix b/pkgs/development/libraries/accounts-qt/default.nix
index 315aab074e58..e2e5f079606b 100644
--- a/pkgs/development/libraries/accounts-qt/default.nix
+++ b/pkgs/development/libraries/accounts-qt/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitLab, doxygen, glib, libaccounts-glib, pkgconfig, qtbase }:
 
-let version = "1.13"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "accounts-qt-${version}";
+  version = "1.13";
 
   src = fetchFromGitLab {
     sha256 = "1gpkgw05dwsf2wk5cy3skgss3kw6mqh7iv3fadrxqxfc1za1xmyl";
@@ -11,17 +11,17 @@ stdenv.mkDerivation {
     owner = "accounts-sso";
   };
 
-  meta = with stdenv.lib; {
-    description = "Qt library for accessing the online accounts database";
-    homepage = "http://code.google.com/p/accounts-sso/";
-    license = licenses.lgpl21;
-    maintainers = with maintainers; [ nckx ];
-  };
-
   buildInputs = [ glib libaccounts-glib qtbase ];
   nativeBuildInputs = [ doxygen pkgconfig ];
 
   configurePhase = ''
     qmake PREFIX=$out LIBDIR=$out/lib CMAKE_CONFIG_PATH=$out/lib/cmake
   '';
+
+  meta = with stdenv.lib; {
+    description = "Qt library for accessing the online accounts database";
+    homepage = "http://code.google.com/p/accounts-sso/";
+    license = licenses.lgpl21;
+    maintainers = with maintainers; [ nckx ];
+  };
 }
diff --git a/pkgs/development/libraries/bobcat/default.nix b/pkgs/development/libraries/bobcat/default.nix
index 87eb1e324ce0..b83fd0f74874 100644
--- a/pkgs/development/libraries/bobcat/default.nix
+++ b/pkgs/development/libraries/bobcat/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchFromGitHub, icmake, libmilter, libX11, openssl, readline
 , utillinux, yodl }:
 
-let version = "4.00.00"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "bobcat-${version}";
+  version = "4.00.00";
 
   src = fetchFromGitHub {
     sha256 = "0wdb25sgw7i3jk3lbja6b4ipqfg1sncam6adg2bn8l5fcinrpwgs";
@@ -12,15 +12,6 @@ stdenv.mkDerivation {
     owner = "fbb-git";
   };
 
-  meta = with stdenv.lib; {
-    inherit version;
-    description = "Brokken's Own Base Classes And Templates";
-    homepage = https://fbb-git.github.io/bobcat/;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
-  };
-
   buildInputs = [ libmilter libX11 openssl readline utillinux ];
   nativeBuildInputs = [ icmake yodl ];
 
@@ -39,4 +30,12 @@ stdenv.mkDerivation {
   installPhase = ''
     ./build install
   '';
+
+  meta = with stdenv.lib; {
+    description = "Brokken's Own Base Classes And Templates";
+    homepage = https://fbb-git.github.io/bobcat/;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
 }
diff --git a/pkgs/development/libraries/ip2location-c/default.nix b/pkgs/development/libraries/ip2location-c/default.nix
index 7bf4e746db4c..109510df79b1 100644
--- a/pkgs/development/libraries/ip2location-c/default.nix
+++ b/pkgs/development/libraries/ip2location-c/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, autoreconfHook }:
 
-let version = "7.0.2"; in # meta.homepage might change after a major update
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "ip2location-c-${version}";
+  version = "7.0.2"; # meta.homepage might change after a major update
 
   src = fetchurl {
     sha256 = "1gs43qgcyfn83abrkhvvw1s67d1sbkbj3hab9m17ysn6swafiycx";
@@ -18,7 +18,6 @@ stdenv.mkDerivation {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Library to look up locations of host names and IP addresses";
     longDescription = ''
       A C library to find the country, region, city,coordinates,
diff --git a/pkgs/development/libraries/libcli/default.nix b/pkgs/development/libraries/libcli/default.nix
index 7798eb5f8fc7..1c247f6faa88 100644
--- a/pkgs/development/libraries/libcli/default.nix
+++ b/pkgs/development/libraries/libcli/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub }:
 
-let version = "1.9.7"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "libcli-${version}";
+  version = "1.9.7";
 
   src = fetchFromGitHub {
     sha256 = "08pmjhqkwldhmcwjhi2l27slf1fk6nxxfaihnk2637pqkycy8z0c";
diff --git a/pkgs/development/libraries/libkeyfinder/default.nix b/pkgs/development/libraries/libkeyfinder/default.nix
index bde5db77fdae..9ea4748af4b3 100644
--- a/pkgs/development/libraries/libkeyfinder/default.nix
+++ b/pkgs/development/libraries/libkeyfinder/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, fftw, qtbase }:
 
-let version = "2.1"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "libkeyfinder-${version}";
+  version = "2.1";
 
   src = fetchFromGitHub {
     sha256 = "07kc0cl6kirgmpdgkgmp6r3yvyf7b1w569z01g8rfl1cig80qdc7";
@@ -11,15 +11,6 @@ stdenv.mkDerivation {
     owner = "ibsh";
   };
 
-  meta = with stdenv.lib; {
-    inherit version;
-    description = "Musical key detection for digital audio (C++ library)";
-    homepage = http://www.ibrahimshaath.co.uk/keyfinder/;
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
-  };
-
   buildInputs = [ fftw qtbase ];
 
   postPatch = ''
@@ -40,4 +31,12 @@ stdenv.mkDerivation {
     mkdir -p $out/lib
     cp -a lib*.so* $out/lib
   '';
+
+  meta = with stdenv.lib; {
+    description = "Musical key detection for digital audio (C++ library)";
+    homepage = http://www.ibrahimshaath.co.uk/keyfinder/;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
 }
diff --git a/pkgs/development/libraries/libnetfilter_conntrack/default.nix b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
index 72aaa1593cc2..75cca9a028e1 100644
--- a/pkgs/development/libraries/libnetfilter_conntrack/default.nix
+++ b/pkgs/development/libraries/libnetfilter_conntrack/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }:
 
-let version = "1.0.5"; in
 stdenv.mkDerivation rec {
   name = "libnetfilter_conntrack-${version}";
+  version = "1.0.5";
 
   src = fetchurl {
     url = "http://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2";
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Userspace library providing an API to the in-kernel connection tracking state table";
     longDescription = ''
       libnetfilter_conntrack is a userspace library providing a programming interface (API) to the
diff --git a/pkgs/development/libraries/libxcomp/default.nix b/pkgs/development/libraries/libxcomp/default.nix
index 3a65277abe28..b19706c2c37d 100644
--- a/pkgs/development/libraries/libxcomp/default.nix
+++ b/pkgs/development/libraries/libxcomp/default.nix
@@ -1,23 +1,14 @@
 { stdenv, fetchurl, autoreconfHook, libjpeg, libpng12, libX11, zlib }:
 
-let version = "3.5.0.32"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "libxcomp-${version}";
+  version = "3.5.0.32";
 
   src = fetchurl {
     sha256 = "02n5bdc1jsq999agb4w6dmdj5l2wlln2lka84qz6rpswwc59zaxm";
     url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz";
   };
 
-  meta = with stdenv.lib; {
-    inherit version;
-    description = "NX compression library";
-    homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
-  };
-
   buildInputs = [ libjpeg libpng12 libX11 zlib ];
   nativeBuildInputs = [ autoreconfHook ];
 
@@ -26,4 +17,12 @@ stdenv.mkDerivation {
   '';
 
   enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "NX compression library";
+    homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
 }
diff --git a/pkgs/development/libraries/rote/default.nix b/pkgs/development/libraries/rote/default.nix
index b87d4ed4ee4a..524afd7cf4d2 100644
--- a/pkgs/development/libraries/rote/default.nix
+++ b/pkgs/development/libraries/rote/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, ncurses }:
 
-let version = "0.2.8"; in
 stdenv.mkDerivation rec {
   name = "rote-${version}";
+  version = "0.2.8";
 
   src = fetchurl {
     sha256 = "05v1lw99jv4cwxl7spyi7by61j2scpdsvx809x5cga7dm5dhlmky";
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Our Own Terminal Emulation Library";
     longDescription = ''
       ROTE is a simple C library for VT102 terminal emulation. It allows the
diff --git a/pkgs/development/tools/alloy/default.nix b/pkgs/development/tools/alloy/default.nix
index cb559a128ab3..fbf784db0cc6 100644
--- a/pkgs/development/tools/alloy/default.nix
+++ b/pkgs/development/tools/alloy/default.nix
@@ -1,33 +1,14 @@
 { stdenv, fetchurl, jre, makeDesktopItem }:
 
-let version = "4.2_2015-02-22"; in
 stdenv.mkDerivation rec {
   name = "alloy-${version}";
+  version = "4.2_2015-02-22";
 
   src = fetchurl {
     sha256 = "0p93v8jwx9prijpikkgmfdzb9qn8ljmvga5d9wvrkxddccjx9k28";
     url = "http://alloy.mit.edu/alloy/downloads/alloy${version}.jar";
   };
 
-  meta = with stdenv.lib; {
-    inherit version;
-    description = "Language & tool for relational models";
-    longDescription = ''
-      Alloy is a language for describing structures and a tool for exploring
-      them. An Alloy model is a collection of constraints that describes a set
-      of structures, e.g. all the possible security configurations of a web
-      application, or all the possible topologies of a switching network. The
-      Alloy Analyzer is a solver that takes the constraints of a model and
-      finds structures that satisfy them. Structures are displayed graphically,
-      and their appearance can be customized for the domain at hand.
-    '';
-    homepage = http://alloy.mit.edu/;
-    downloadPage = http://alloy.mit.edu/alloy/download.html;
-    license = licenses.mit;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
-  };
-
   desktopItem = makeDesktopItem rec {
     name = "alloy";
     exec = name;
@@ -57,4 +38,22 @@ stdenv.mkDerivation rec {
     install -Dm644 ${./icon.png} $out/share/pixmaps/alloy.png
     cp -r ${desktopItem}/share/applications $out/share
   '';
+
+  meta = with stdenv.lib; {
+    description = "Language & tool for relational models";
+    longDescription = ''
+      Alloy is a language for describing structures and a tool for exploring
+      them. An Alloy model is a collection of constraints that describes a set
+      of structures, e.g. all the possible security configurations of a web
+      application, or all the possible topologies of a switching network. The
+      Alloy Analyzer is a solver that takes the constraints of a model and
+      finds structures that satisfy them. Structures are displayed graphically,
+      and their appearance can be customized for the domain at hand.
+    '';
+    homepage = http://alloy.mit.edu/;
+    downloadPage = http://alloy.mit.edu/alloy/download.html;
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
 }
diff --git a/pkgs/development/tools/analysis/egypt/default.nix b/pkgs/development/tools/analysis/egypt/default.nix
index 1233c4ce15af..fc63247468c6 100644
--- a/pkgs/development/tools/analysis/egypt/default.nix
+++ b/pkgs/development/tools/analysis/egypt/default.nix
@@ -1,16 +1,19 @@
 { stdenv, fetchurl, buildPerlPackage }:
 
-let version = "1.10"; in
 buildPerlPackage rec {
   name = "egypt-${version}";
+  version = "1.10";
 
   src = fetchurl {
     sha256 = "0r0wj6v8z9fzlh9pb5617kyjdf92ppmlbzajaarrq729bbb6ln5m";
     url = "http://www.gson.org/egypt/download/${name}.tar.gz";
   };
 
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
   meta = with stdenv.lib; {
-    inherit version;
     description = "Tool for making call graphs of C programmes";
     longDescription = ''
       Egypt is a simple tool for creating call graphs of C programs. It neither
@@ -25,8 +28,4 @@ buildPerlPackage rec {
     platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
-
-  enableParallelBuilding = true;
-
-  doCheck = true;
 }
diff --git a/pkgs/development/tools/analysis/include-what-you-use/default.nix b/pkgs/development/tools/analysis/include-what-you-use/default.nix
index 75e4dba003bb..374f0fee3f11 100644
--- a/pkgs/development/tools/analysis/include-what-you-use/default.nix
+++ b/pkgs/development/tools/analysis/include-what-you-use/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, cmake, llvmPackages }:
 
-# Also bump llvmPackages in all-packages.nix to the supported version!
-let version = "0.5"; in
 stdenv.mkDerivation rec {
   name = "include-what-you-use-${version}";
+  # Also bump llvmPackages in all-packages.nix to the supported version!
+  version = "0.5";
 
   src = fetchurl {
     sha256 = "19pwhgwvfr86n8ks099p9r02v7zh8d3qs7g7snzkhpdgq1azww85";
@@ -18,7 +18,6 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Analyze #includes in C/C++ source files with clang";
     longDescription = ''
       For every symbol (type, function variable, or macro) that you use in
diff --git a/pkgs/development/tools/java/cfr/default.nix b/pkgs/development/tools/java/cfr/default.nix
index 3d42de4640eb..46170341437c 100644
--- a/pkgs/development/tools/java/cfr/default.nix
+++ b/pkgs/development/tools/java/cfr/default.nix
@@ -1,28 +1,14 @@
 { stdenv, fetchurl, jre }:
 
-let version = "0_101"; in
 stdenv.mkDerivation rec {
   name = "cfr-${version}";
+  version = "0_101";
 
   src = fetchurl {
     sha256 = "0zwl3whypdm2qrw3hwaqjnifkb4wcdn8fx9scrjkli54bhr6dqch";
     url = "http://www.benf.org/other/cfr/cfr_${version}.jar";
   };
 
-  meta = with stdenv.lib; {
-    inherit version;
-    description = "Another java decompiler";
-    longDescription = ''
-      CFR will decompile modern Java features - Java 8 lambdas (pre and post
-      Java beta 103 changes), Java 7 String switches etc, but is written
-      entirely in Java 6.
-    '';
-    homepage = http://www.benf.org/other/cfr/;
-    license = licenses.mit;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ nckx ];
-  };
-
   buildInputs = [ jre ];
 
   phases = [ "installPhase" ];
@@ -38,4 +24,17 @@ stdenv.mkDerivation rec {
     EOF
     install -Dm755 cfr $out/bin/cfr
   '';
+
+  meta = with stdenv.lib; {
+    description = "Another java decompiler";
+    longDescription = ''
+      CFR will decompile modern Java features - Java 8 lambdas (pre and post
+      Java beta 103 changes), Java 7 String switches etc, but is written
+      entirely in Java 6.
+    '';
+    homepage = http://www.benf.org/other/cfr/;
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ nckx ];
+  };
 }
diff --git a/pkgs/development/tools/misc/bin_replace_string/default.nix b/pkgs/development/tools/misc/bin_replace_string/default.nix
index 82a07d60f9a6..fda527ee905a 100644
--- a/pkgs/development/tools/misc/bin_replace_string/default.nix
+++ b/pkgs/development/tools/misc/bin_replace_string/default.nix
@@ -1,16 +1,20 @@
 { stdenv, fetchurl, libelf, txt2man }:
 
-let version = "0.2"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "bin_replace_string-${version}";
+  version = "0.2";
 
   src = fetchurl {
     sha256 = "1gnpddxwpsfrg4l76x5yplsvbcdbviybciqpn22yq3g3qgnr5c2a";
     url = "ftp://ohnopub.net/mirror/bin_replace_string-0.2.tar.bz2";
   };
 
+  buildInputs = [ libelf ];
+  nativeBuildInputs = [ txt2man ];
+
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
-    inherit version;
     description = "Edit precompiled binaries";
     longDescription = ''
       bin_replace_string edits C-style strings in precompiled binaries. This is
@@ -25,9 +29,4 @@ stdenv.mkDerivation {
     platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
-
-  buildInputs = [ libelf ];
-  nativeBuildInputs = [ txt2man ];
-
-  enableParallelBuilding = true;
 }
diff --git a/pkgs/development/tools/parsing/flexc++/default.nix b/pkgs/development/tools/parsing/flexc++/default.nix
index 3cfd86f477e6..e1426b3a1d4a 100644
--- a/pkgs/development/tools/parsing/flexc++/default.nix
+++ b/pkgs/development/tools/parsing/flexc++/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, bobcat, icmake, yodl }:
 
-let version = "2.03.00"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "flexc++-${version}";
+  version = "2.03.00";
 
   src = fetchFromGitHub {
     sha256 = "1knb5h6l71n5zi9xzml5f6v7wspbk7vrcaiy2div8bnj7na3z717";
@@ -11,20 +11,6 @@ stdenv.mkDerivation {
     owner = "fbb-git";
   };
 
-  meta = with stdenv.lib; {
-    inherit version;
-    description = "C++ tool for generating lexical scanners";
-    longDescription = ''
-      Flexc++ was designed after `flex'. Flexc++ offers a cleaner class design
-      and requires simpler specification files than offered by flex's C++
-      option.
-    '';
-    homepage = https://fbb-git.github.io/flexcpp/;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
-  };
-
   sourceRoot = "flexcpp-${version}-src/flexc++";
 
   buildInputs = [ bobcat ];
@@ -48,4 +34,17 @@ stdenv.mkDerivation {
     ./build install skel
     ./build install std
   '';
+
+  meta = with stdenv.lib; {
+    description = "C++ tool for generating lexical scanners";
+    longDescription = ''
+      Flexc++ was designed after `flex'. Flexc++ offers a cleaner class design
+      and requires simpler specification files than offered by flex's C++
+      option.
+    '';
+    homepage = https://fbb-git.github.io/flexcpp/;
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
 }
diff --git a/pkgs/games/2048-in-terminal/default.nix b/pkgs/games/2048-in-terminal/default.nix
index cbf6a19b319d..30e930c294a6 100644
--- a/pkgs/games/2048-in-terminal/default.nix
+++ b/pkgs/games/2048-in-terminal/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, ncurses }:
 
-let version = "2015-01-15"; in
 stdenv.mkDerivation rec {
   name = "2048-in-terminal-${version}";
+  version = "2015-01-15";
 
   src = fetchFromGitHub {
     sha256 = "1fdfmyhh60sz0xbilxkh2y09lvbcs9lamk2jkjkhxhlhxknmnfgs";
@@ -21,7 +21,6 @@ stdenv.mkDerivation rec {
   installFlags = [ "DESTDIR=$(out)" ];
 
   meta = with stdenv.lib; {
-    inherit version;
     inherit (src.meta) homepage;
     description = "Animated console version of the 2048 game";
     license = licenses.mit;
diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix
index 2e8a085ef474..7c4b2fe823c1 100644
--- a/pkgs/games/soi/default.nix
+++ b/pkgs/games/soi/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, cmake
 , boost, eigen2, lua, luabind, mesa, SDL }:
 
-let version = "0.1.2"; in
 stdenv.mkDerivation rec {
   name = "soi-${version}";
+  version = "0.1.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/soi/Spheres%20of%20Influence-${version}-Source.tar.bz2";
diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/default.nix
index b78104a7ddc0..27d21f862852 100644
--- a/pkgs/misc/cups/drivers/samsung/default.nix
+++ b/pkgs/misc/cups/drivers/samsung/default.nix
@@ -11,13 +11,13 @@
 # }
 # (This advice was tested on 2010 August 2.)
 
-{stdenv, fetchurl, cups, gcc, ghostscript, glibc, patchelf}:
+{ stdenv, fetchurl, cups, gcc, ghostscript, glibc, patchelf }:
 
 # Do not bump lightly! Visit <http://www.bchemnet.com/suldr/supported.html>
 # to see what will break when upgrading. Consider a new versioned attribute.
-let version = "4.00.39"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "samsung-UnifiedLinuxDriver-${version}";
+  version = "4.00.39";
 
   src = fetchurl {
     url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz";
diff --git a/pkgs/os-specific/linux/crda/default.nix b/pkgs/os-specific/linux/crda/default.nix
index 488a6ce1a0fa..d28ae6f50989 100644
--- a/pkgs/os-specific/linux/crda/default.nix
+++ b/pkgs/os-specific/linux/crda/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, libgcrypt, libnl, pkgconfig, pythonPackages, wireless-regdb }:
 
-let version = "3.18"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "crda-${version}";
+  version = "3.18";
 
   src = fetchurl {
     sha256 = "1gydiqgb08d9gbx4l6gv98zg3pljc984m50hmn3ysxcbkxkvkz23";
@@ -36,7 +36,6 @@ stdenv.mkDerivation {
   checkTarget = "verify";
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Linux wireless Central Regulatory Domain Agent";
     longDescription = ''
       CRDA acts as the udev helper for communication between the kernel and
diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix
index 3a2be5435823..ca864091d4bf 100644
--- a/pkgs/os-specific/linux/fatrace/default.nix
+++ b/pkgs/os-specific/linux/fatrace/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, python3, which }:
 
-let version = "0.11"; in
 stdenv.mkDerivation rec {
   name = "fatrace-${version}";
+  version = "0.11";
 
   src = fetchurl {
     url = "http://launchpad.net/fatrace/trunk/${version}/+download/${name}.tar.bz2";
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Report system-wide file access events";
     homepage = https://launchpad.net/fatrace/;
     license = licenses.gpl3Plus;
diff --git a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
index 7afd464620d5..4f09410c75e5 100644
--- a/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
+++ b/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix
@@ -1,9 +1,8 @@
 { stdenv, fetchurl, b43FirmwareCutter }:
 
-let version = "6.30.163.46"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "b43-firmware-${version}";
+  version = "6.30.163.46";
 
   src = fetchurl {
     url = "http://www.lwfinger.com/b43-firmware/broadcom-wl-${version}.tar.bz2";
diff --git a/pkgs/os-specific/linux/freefall/default.nix b/pkgs/os-specific/linux/freefall/default.nix
index e2aa079240a6..590b6b61dd3b 100644
--- a/pkgs/os-specific/linux/freefall/default.nix
+++ b/pkgs/os-specific/linux/freefall/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl }:
 
-let version = "4.3"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "freefall-${version}";
+  version = "4.3";
 
   src = fetchurl {
     sha256 = "1bpkr45i4yzp32p0vpnz8mlv9lk4q2q9awf1kg9khg4a9g42qqja";
diff --git a/pkgs/os-specific/linux/ftop/default.nix b/pkgs/os-specific/linux/ftop/default.nix
index 022fc33a2060..1ca7d43b6a70 100644
--- a/pkgs/os-specific/linux/ftop/default.nix
+++ b/pkgs/os-specific/linux/ftop/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, ncurses }:
 
-let version = "1.0"; in
 stdenv.mkDerivation rec {
   name = "ftop-${version}";
+  version = "1.0";
 
   src = fetchurl {
     url = "http://ftop.googlecode.com/files/${name}.tar.bz2";
@@ -22,7 +22,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Show progress of open files and file systems";
     homepage = https://code.google.com/p/ftop/;
     license = licenses.gpl3Plus;
diff --git a/pkgs/os-specific/linux/kexectools/default.nix b/pkgs/os-specific/linux/kexectools/default.nix
index 5c6114040ff6..2199524154d9 100644
--- a/pkgs/os-specific/linux/kexectools/default.nix
+++ b/pkgs/os-specific/linux/kexectools/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, zlib }:
 
-let version = "2.0.11"; in
 stdenv.mkDerivation rec {
   name = "kexec-tools-${version}";
+  version = "2.0.11";
 
   src = fetchurl {
     urls = [
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
   buildInputs = [ zlib ];
 
   meta = with stdenv.lib; {
-    inherit version;
     homepage = http://horms.net/projects/kexec/kexec-tools;
     description = "Tools related to the kexec Linux feature";
     platforms = platforms.linux;
diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index a6818ae86b90..113d59d641dc 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub }:
 
-let version = "129"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "mcelog-${version}";
+  version = "129";
 
   src = fetchFromGitHub {
     sha256 = "143xh5zvgax88yhg6mg6img64nrda85yybf76fgsk7a8gc57ghyk";
@@ -25,7 +25,6 @@ stdenv.mkDerivation {
   installFlags = [ "DESTDIR=$(out)" "prefix=" "DOCDIR=/share/doc" ];
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Log x86 machine checks: memory, IO, and CPU hardware errors";
     longDescription = ''
       The mcelog daemon accounts memory and some other errors in various ways
diff --git a/pkgs/os-specific/linux/radeontop/default.nix b/pkgs/os-specific/linux/radeontop/default.nix
index b86486d4584c..0ed76e790cc3 100644
--- a/pkgs/os-specific/linux/radeontop/default.nix
+++ b/pkgs/os-specific/linux/radeontop/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, pkgconfig, gettext, ncurses, libdrm, libpciaccess }:
 
-let version = "2015-11-24"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "radeontop-${version}";
+  version = "2015-11-24";
 
   src = fetchFromGitHub {
     sha256 = "0irwq6rps5mnban8cxbrm59wpyv4j80q3xdjm9fxvfpiyys2g2hz";
@@ -23,7 +23,6 @@ stdenv.mkDerivation {
   makeFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Top-like tool for viewing AMD Radeon GPU utilization";
     longDescription = ''
       View GPU utilization, both for the total activity percent and individual
diff --git a/pkgs/os-specific/linux/uksmtools/default.nix b/pkgs/os-specific/linux/uksmtools/default.nix
index 3e8b37a2faff..cd7c7527fe9d 100644
--- a/pkgs/os-specific/linux/uksmtools/default.nix
+++ b/pkgs/os-specific/linux/uksmtools/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchgit, cmake }:
 
-let version = "2015-09-25"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "uksmtools-${version}";
+  version = "2015-09-25";
 
   # This project uses git submodules, which fetchFromGitHub doesn't support:
   src = fetchgit {
@@ -18,7 +18,6 @@ stdenv.mkDerivation {
   doCheck = false;
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Tools to control Linux UKSM (Ultra Kernel Same-page Merging)";
     homepage = https://github.com/pfactum/uksmtools/;
     license = licenses.gpl3Plus;
diff --git a/pkgs/shells/mksh/default.nix b/pkgs/shells/mksh/default.nix
index 4e1570a3838c..dc5f437977c4 100644
--- a/pkgs/shells/mksh/default.nix
+++ b/pkgs/shells/mksh/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, groff }:
 
-let version = "52"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "mksh-${version}";
+  version = "52";
 
   src = fetchurl {
     urls = [
@@ -30,7 +30,6 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "MirBSD Korn Shell";
     longDescription = ''
       The MirBSD Korn Shell is a DFSG-free and OSD-compliant (and OSI
diff --git a/pkgs/tools/admin/nxproxy/default.nix b/pkgs/tools/admin/nxproxy/default.nix
index 70e1b55984dd..42bd284e73f2 100644
--- a/pkgs/tools/admin/nxproxy/default.nix
+++ b/pkgs/tools/admin/nxproxy/default.nix
@@ -1,23 +1,14 @@
 { stdenv, fetchurl, autoreconfHook, libxcomp }:
 
-let version = "3.5.0.32"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "nxproxy-${version}";
+  version = "3.5.0.32";
 
   src = fetchurl {
     sha256 = "02n5bdc1jsq999agb4w6dmdj5l2wlln2lka84qz6rpswwc59zaxm";
     url = "http://code.x2go.org/releases/source/nx-libs/nx-libs-${version}-lite.tar.gz";
   };
 
-  meta = with stdenv.lib; {
-    inherit version;
-    description = "NX compression proxy";
-    homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs";
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
-  };
-
   buildInputs = [ libxcomp ];
   nativeBuildInputs = [ autoreconfHook ];
 
@@ -28,4 +19,12 @@ stdenv.mkDerivation {
   makeFlags = [ "exec_prefix=$(out)" ];
 
   enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "NX compression proxy";
+    homepage = "http://wiki.x2go.org/doku.php/wiki:libs:nx-libs";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
 }
diff --git a/pkgs/tools/cd-dvd/dvdisaster/default.nix b/pkgs/tools/cd-dvd/dvdisaster/default.nix
index a98ce2088bd0..7cb1bf7506da 100644
--- a/pkgs/tools/cd-dvd/dvdisaster/default.nix
+++ b/pkgs/tools/cd-dvd/dvdisaster/default.nix
@@ -3,9 +3,9 @@
 , enableSoftening ? true
 }:
 
-let version = "0.79.5"; in
 stdenv.mkDerivation rec {
   name = "dvdisaster-${version}";
+  version = "0.79.5";
 
   src = fetchurl {
     url = "http://dvdisaster.net/downloads/${name}.tar.bz2";
@@ -70,7 +70,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     homepage = http://dvdisaster.net/;
     description = "Data loss/scratch/aging protection for CD/DVD media";
     longDescription = ''
diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index 13236da5ab44..8340ea3fe8b0 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, valgrind }:
 
-let version = "131"; in
 stdenv.mkDerivation rec {
   name = "lz4-${version}";
+  version = "131";
 
   src = fetchFromGitHub {
     sha256 = "1bhvcq8fxxsqnpg5qa6k3nsyhq0nl0iarh08sqzclww27hlpyay2";
@@ -23,7 +23,6 @@ stdenv.mkDerivation rec {
   patches = [ ./install-on-freebsd.patch ] ;
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Extremely fast compression algorithm";
     longDescription = ''
       Very fast lossless compression algorithm, providing compression speed
diff --git a/pkgs/tools/compression/zopfli/default.nix b/pkgs/tools/compression/zopfli/default.nix
index 3c455ca5635f..8aeeb3b9e516 100644
--- a/pkgs/tools/compression/zopfli/default.nix
+++ b/pkgs/tools/compression/zopfli/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, fetchpatch }:
 
-let version = "1.0.1"; in
 stdenv.mkDerivation rec {
   name = "zopfli-${version}";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "google";
@@ -45,7 +45,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     inherit (src.meta) homepage;
     description = "Very good, but slow, deflate or zlib compression";
     longDescription = ''
diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix
index 1c4d068c4c13..078c80a8b703 100644
--- a/pkgs/tools/filesystems/duff/default.nix
+++ b/pkgs/tools/filesystems/duff/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gettext }:
 
-# The last release (0.5.2) is more than 2 years old and lacks features like -D,
-# limiting its usefulness. Upstream appears comatose if not dead.
-let version = "2014-07-03"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "duff-${version}";
+  # The last release (0.5.2) is more than 2 years old and lacks features like -D,
+  # limiting its usefulness. Upstream appears comatose if not dead.
+  version = "2014-07-03";
 
   src = fetchFromGitHub {
     sha256 = "1k2dx38pjzc5d624vw1cs5ipj9fprsm5vqv55agksc29m63lswnx";
@@ -28,7 +28,6 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Quickly find duplicate files";
     longDescription = ''
       Duff is a Unix command-line utility for quickly finding duplicates in
diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix
index b21054e478df..158050f6291e 100644
--- a/pkgs/tools/filesystems/encfs/default.nix
+++ b/pkgs/tools/filesystems/encfs/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchFromGitHub, autoreconfHook, boost, fuse, openssl, perl
 , pkgconfig, rlog }:
 
-let version = "1.8.1"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "encfs-${version}";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     sha256 = "1cxihqwpnqbzy8qz0134199pwfnd7ikr2835p5p1yzqnl203wcdb";
diff --git a/pkgs/tools/filesystems/exfat/default.nix b/pkgs/tools/filesystems/exfat/default.nix
index 507c5e7a6c0e..7c483c9258a6 100644
--- a/pkgs/tools/filesystems/exfat/default.nix
+++ b/pkgs/tools/filesystems/exfat/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, fuse }:
 
-let version = "1.2.3"; in
 stdenv.mkDerivation rec {
   name = "exfat-${version}";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     sha256 = "147s11sqmn5flbvz2hwpl6kdfqi2gnm1c2nsn5fxygyw7qyhpzda";
@@ -15,7 +15,6 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook pkgconfig ];
 
   meta = with stdenv.lib; {
-    inherit version;
     inherit (src.meta) homepage;
     description = "Free exFAT file system implementation";
     platforms = platforms.linux;
diff --git a/pkgs/tools/filesystems/gpart/default.nix b/pkgs/tools/filesystems/gpart/default.nix
index 359ef16c2b84..dfa6fe3234c2 100644
--- a/pkgs/tools/filesystems/gpart/default.nix
+++ b/pkgs/tools/filesystems/gpart/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, autoreconfHook }:
 
-let version = "0.3"; in
 stdenv.mkDerivation rec {
   name = "gpart-${version}";
+  version = "0.3";
 
   # GitHub repository 'collating patches for gpart from all distributions':
   src = fetchFromGitHub {
@@ -19,7 +19,6 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    inherit version;
     inherit (src.meta) homepage;
     description = "Guess PC-type hard disk partitions";
     longDescription = ''
diff --git a/pkgs/tools/filesystems/mp3fs/default.nix b/pkgs/tools/filesystems/mp3fs/default.nix
index 3b6b3c919cd7..77207cb8b3a1 100644
--- a/pkgs/tools/filesystems/mp3fs/default.nix
+++ b/pkgs/tools/filesystems/mp3fs/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, flac, fuse, lame, libid3tag, pkgconfig }:
 
-let version = "0.91"; in
 stdenv.mkDerivation rec {
   name = "mp3fs-${version}";
+  version = "0.91";
 
   src = fetchurl {
     url = "https://github.com/khenriks/mp3fs/releases/download/v${version}/${name}.tar.gz";
diff --git a/pkgs/tools/misc/clex/default.nix b/pkgs/tools/misc/clex/default.nix
index 996254a54a25..b9e3fc179d50 100644
--- a/pkgs/tools/misc/clex/default.nix
+++ b/pkgs/tools/misc/clex/default.nix
@@ -1,14 +1,18 @@
 { stdenv, fetchurl, ncurses }:
 
-let version = "4.6.patch6"; in
 stdenv.mkDerivation rec {
   name = "clex-${version}";
+  version = "4.6.patch6";
 
   src = fetchurl {
     sha256 = "0bqa2hc9721d62cfsy5c7a5pzgh9b4px7g4q60xlybkwll19qbbp";
     url = "${meta.homepage}/download/${name}.tar.gz";
   };
 
+  buildInputs = [ ncurses ];
+
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "File manager with full-screen terminal interface";
     longDescription = ''
@@ -23,8 +27,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
-
-  buildInputs = [ ncurses ];
-
-  enableParallelBuilding = true;
 }
diff --git a/pkgs/tools/misc/ipad_charge/default.nix b/pkgs/tools/misc/ipad_charge/default.nix
index 73fee38cbf20..9fbc915ad2eb 100644
--- a/pkgs/tools/misc/ipad_charge/default.nix
+++ b/pkgs/tools/misc/ipad_charge/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, libusb1 }:
 
-let version = "2015-02-03"; in
 stdenv.mkDerivation rec {
   name = "ipad_charge-${version}";
+  version = "2015-02-03";
 
   src = fetchFromGitHub {
     sha256 = "0f40hqx1dbqpwrhyf42h5982jwqv8j5zp5hwwakz6600hyqvnnz7";
@@ -27,7 +27,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     inherit (src.meta) homepage;
     description = "Apple device USB charging utility for Linux";
     longDescription = ''
diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix
index f9512b09ce66..c0b1de6c1e8c 100644
--- a/pkgs/tools/misc/ms-sys/default.nix
+++ b/pkgs/tools/misc/ms-sys/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, gettext }:
 
-let version = "2.5.2"; in
 stdenv.mkDerivation rec {
   name = "ms-sys-${version}";
+  version = "2.5.2";
  
   src = fetchurl {
     url = "mirror://sourceforge/ms-sys/${name}.tar.gz";
@@ -16,7 +16,6 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "A program for writing Microsoft compatible boot records";
     homepage = http://ms-sys.sourceforge.net/;
     license = licenses.gpl2Plus;
diff --git a/pkgs/tools/misc/tldr/default.nix b/pkgs/tools/misc/tldr/default.nix
index 46dbc2a2a224..f223a97520b0 100644
--- a/pkgs/tools/misc/tldr/default.nix
+++ b/pkgs/tools/misc/tldr/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, clang, curl, libzip, pkgconfig }:
 
-let version = "1.1.0"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "tldr-${version}";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     sha256 = "0hxkrzp5njhy7c19v8i3svcb148f1jni7dlv36gc1nmcrz5izsiz";
@@ -23,7 +23,6 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Simplified and community-driven man pages";
     longDescription = ''
       tldr pages gives common use cases for commands, so you don't need to hunt
diff --git a/pkgs/tools/networking/dhcping/default.nix b/pkgs/tools/networking/dhcping/default.nix
index 53d87b2e3faf..19c2383c1c28 100644
--- a/pkgs/tools/networking/dhcping/default.nix
+++ b/pkgs/tools/networking/dhcping/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl }:
 
-let version = "1.2"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "dhcping-${version}";
+  version = "1.2";
 
   src = fetchurl {
     sha256 = "0sk4sg3hn88n44dxikipf3ggfj3ixrp22asb7nry9p0bkfaqdvrj";
@@ -14,7 +14,6 @@ stdenv.mkDerivation {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Send DHCP request to find out if a DHCP server is running";
     longDescription = ''
       dhcping sends either a DHCPREQUEST or DHCPINFORM packet to the server
@@ -31,4 +30,4 @@ stdenv.mkDerivation {
     platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
- }
+}
diff --git a/pkgs/tools/networking/hans/default.nix b/pkgs/tools/networking/hans/default.nix
index aecc0bb63fa3..0e838a896cb2 100644
--- a/pkgs/tools/networking/hans/default.nix
+++ b/pkgs/tools/networking/hans/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, nettools }:
 
-let version = "0.4.4"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "hans-${version}";
+  version = "0.4.4";
 
   src = fetchFromGitHub {
     sha256 = "1xskffmmdmg1whlrl5wpkv9z29vh0igrbmsz0b45s9v0761a7kis";
@@ -11,21 +11,6 @@ stdenv.mkDerivation {
     owner = "friedrich";
   };
 
-  meta = with stdenv.lib; {
-    inherit version;
-    description = "Tunnel IPv4 over ICMP";
-    longDescription = ''
-      Hans makes it possible to tunnel IPv4 through ICMP echo packets, so you
-      could call it a ping tunnel. This can be useful when you find yourself in
-      the situation that your Internet access is firewalled, but pings are
-      allowed.
-    '';
-    homepage = http://code.gerade.org/hans/;
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ nckx ];
-  };
-
   buildInputs = [ nettools ];
 
   postPatch = ''
@@ -37,4 +22,18 @@ stdenv.mkDerivation {
   installPhase = ''
     install -D -m0755 hans $out/bin/hans
   '';
+
+  meta = with stdenv.lib; {
+    description = "Tunnel IPv4 over ICMP";
+    longDescription = ''
+      Hans makes it possible to tunnel IPv4 through ICMP echo packets, so you
+      could call it a ping tunnel. This can be useful when you find yourself in
+      the situation that your Internet access is firewalled, but pings are
+      allowed.
+    '';
+    homepage = http://code.gerade.org/hans/;
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
 }
diff --git a/pkgs/tools/networking/ip2location/default.nix b/pkgs/tools/networking/ip2location/default.nix
index 18fd2d12131d..22eb31384a19 100644
--- a/pkgs/tools/networking/ip2location/default.nix
+++ b/pkgs/tools/networking/ip2location/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl }:
 
-let version = "7.0.0"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "ip2location-${version}";
+  version = "7.0.0";
 
   src = fetchurl {
     sha256 = "05zbc02z7vm19byafi05i1rnkxc6yrfkhnm30ly68zzyipkmzx1l";
@@ -14,7 +14,6 @@ stdenv.mkDerivation {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Look up locations of host names and IP addresses";
     longDescription = ''
       A command-line tool to find the country, region, city,coordinates,
diff --git a/pkgs/tools/networking/ipv6calc/default.nix b/pkgs/tools/networking/ipv6calc/default.nix
index a7c844932c96..e41b65d3d25e 100644
--- a/pkgs/tools/networking/ipv6calc/default.nix
+++ b/pkgs/tools/networking/ipv6calc/default.nix
@@ -2,9 +2,9 @@
 , geoip ? null, geolite-legacy ? null
 , ip2location-database ? null }:
 
-let version = "0.99.1"; in
 stdenv.mkDerivation rec {
   name = "ipv6calc-${version}";
+  version = "0.99.1";
 
   src = fetchurl {
     url = "ftp://ftp.deepspace6.net/pub/ds6/sources/ipv6calc/${name}.tar.gz";
@@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Calculate/manipulate (not only) IPv6 addresses";
     longDescription = ''
       ipv6calc is a small utility to manipulate (not only) IPv6 addresses and
diff --git a/pkgs/tools/networking/netsniff-ng/default.nix b/pkgs/tools/networking/netsniff-ng/default.nix
index 535a96c1db7c..b83b7927679d 100644
--- a/pkgs/tools/networking/netsniff-ng/default.nix
+++ b/pkgs/tools/networking/netsniff-ng/default.nix
@@ -2,9 +2,9 @@
 , libnetfilter_conntrack, libnl, libpcap, libsodium, liburcu, ncurses, perl
 , pkgconfig, zlib }:
 
-let version = "0.6.0"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "netsniff-ng-${version}";
+  version = "0.6.0";
 
   # Upstream recommends and supports git
   src = fetchFromGitHub rec {
@@ -41,7 +41,6 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Swiss army knife for daily Linux network plumbing";
     longDescription = ''
       netsniff-ng is a free Linux networking toolkit. Its gain of performance
diff --git a/pkgs/tools/networking/pcapc/default.nix b/pkgs/tools/networking/pcapc/default.nix
index 7da123a377be..66028a973b3c 100644
--- a/pkgs/tools/networking/pcapc/default.nix
+++ b/pkgs/tools/networking/pcapc/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, libpcap }:
 
-let version = "2015-03-06"; in
 stdenv.mkDerivation rec {
   name = "pcapc-${version}";
+  version = "2015-03-06";
 
   src = fetchFromGitHub {
     sha256 = "02j45wmxy8qcji0giwx3364pbqb6849s8y0xfvzx40g98mssl027";
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     inherit (src.meta) homepage;
     description = "Compile libpcap filter expressions into BPF opcodes";
     license = licenses.gpl3;
diff --git a/pkgs/tools/networking/pingtcp/default.nix b/pkgs/tools/networking/pingtcp/default.nix
index 784639b788c3..4d99eaaeff66 100644
--- a/pkgs/tools/networking/pingtcp/default.nix
+++ b/pkgs/tools/networking/pingtcp/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchgit, cmake }:
 
-let version = "0.0.3"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "pingtcp-${version}";
+  version = "0.0.3";
 
   # This project uses git submodules, which fetchFromGitHub doesn't support:
   src = fetchgit {
@@ -27,7 +27,6 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Measure TCP handshake time";
     homepage = https://github.com/LanetNetwork/pingtcp;
     license = licenses.gpl3;
diff --git a/pkgs/tools/package-management/dpkg/default.nix b/pkgs/tools/package-management/dpkg/default.nix
index 7b4486a8d862..f65b25d119d8 100644
--- a/pkgs/tools/package-management/dpkg/default.nix
+++ b/pkgs/tools/package-management/dpkg/default.nix
@@ -1,9 +1,8 @@
 { stdenv, fetchurl, perl, zlib, bzip2, xz, makeWrapper }:
 
-let version = "1.18.4"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "dpkg-${version}";
+  version = "1.18.4";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/dpkg/dpkg_${version}.tar.xz";
diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index b41afd357513..ae8e1b252c4c 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, intltool, glib, pkgconfig, polkit, python, sqlite }:
 
-let version = "1.0.8"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "packagekit-${version}";
+  version = "1.0.8";
 
   src = fetchurl {
     sha256 = "1vaxn4kwdwx6p03n88k4pnbd2l6lb0cbxpcs88kjack1jml17c3l";
@@ -53,7 +53,6 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "System to facilitate installing and updating packages";
     longDescription = ''
       PackageKit is a system designed to make installing and updating software
diff --git a/pkgs/tools/security/eid-mw/default.nix b/pkgs/tools/security/eid-mw/default.nix
index ff062ab50946..32cf4f9a4e2c 100644
--- a/pkgs/tools/security/eid-mw/default.nix
+++ b/pkgs/tools/security/eid-mw/default.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchFromGitHub, autoreconfHook, gtk3, nssTools, pcsclite
 , pkgconfig }:
 
-let version = "4.1.13"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "eid-mw-${version}";
+  version = "4.1.13";
 
   src = fetchFromGitHub {
     sha256 = "1fkazhw6gs191w789fnp6mwnxrx9p38b3kh5bngb1ir0zhkgghkq";
@@ -35,7 +35,6 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Belgian electronic identity card (eID) middleware";
     homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/;
     license = licenses.lgpl3;
diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix
index ac6dee4beaa3..d1b29e137df9 100644
--- a/pkgs/tools/security/eid-viewer/default.nix
+++ b/pkgs/tools/security/eid-viewer/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl, makeWrapper, jre, pcsclite }:
 
-let version = "4.1.9"; in
 stdenv.mkDerivation rec {
   name = "eid-viewer-${version}";
+  version = "4.1.9";
 
   src = fetchurl {
     url = "https://downloads.services.belgium.be/eid/eid-viewer-${version}-v${version}.src.tar.gz";
@@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Belgian electronic identity card (eID) viewer";
     homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/;
     license = licenses.lgpl3;
diff --git a/pkgs/tools/system/foremost/default.nix b/pkgs/tools/system/foremost/default.nix
index af28565f4661..cfac89237795 100644
--- a/pkgs/tools/system/foremost/default.nix
+++ b/pkgs/tools/system/foremost/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl }:
 
-let version = "1.5.7"; in
 stdenv.mkDerivation rec {
   name = "foremost-${version}";
+  version = "1.5.7";
 
   src = fetchurl {
     sha256 = "0d2zxw0ijg8cd3ksgm8cf8jg128zr5x7z779jar90g9f47pm882h";
@@ -20,7 +20,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Recover files based on their contents";
     longDescription = ''
       Foremost is a console program to recover files based on their headers,
diff --git a/pkgs/tools/system/gptfdisk/default.nix b/pkgs/tools/system/gptfdisk/default.nix
index 9306b0e84cca..264dbf1eb279 100644
--- a/pkgs/tools/system/gptfdisk/default.nix
+++ b/pkgs/tools/system/gptfdisk/default.nix
@@ -1,8 +1,8 @@
 { fetchurl, stdenv, libuuid, popt, icu, ncurses }:
 
-let version = "1.0.1"; in
 stdenv.mkDerivation rec {
   name = "gptfdisk-${version}";
+  version = "1.0.1";
 
   src = fetchurl {
     # http://www.rodsbooks.com/gdisk/${name}.tar.gz also works, but the home
@@ -36,7 +36,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Set of text-mode partitioning tools for Globally Unique Identifier (GUID) Partition Table (GPT) disks";
     license = licenses.gpl2;
     homepage = http://www.rodsbooks.com/gdisk/;
diff --git a/pkgs/tools/system/suid-chroot/default.nix b/pkgs/tools/system/suid-chroot/default.nix
index 4aba9f48b764..3d4fe6e18a24 100644
--- a/pkgs/tools/system/suid-chroot/default.nix
+++ b/pkgs/tools/system/suid-chroot/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchurl }:
 
-let version = "1.0.2"; in
 stdenv.mkDerivation rec {
   name = "suid-chroot-${version}";
+  version = "1.0.2";
 
   src = fetchurl {
     sha256 = "1a9xqhck0ikn8kfjk338h9v1yjn113gd83q0c50k78xa68xrnxjx";
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Setuid-safe wrapper for chroot";
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ nckx ];
diff --git a/pkgs/tools/text/aha/default.nix b/pkgs/tools/text/aha/default.nix
index 152a46cd50c4..7eb1c022a959 100644
--- a/pkgs/tools/text/aha/default.nix
+++ b/pkgs/tools/text/aha/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub }:
 
-let version = "0.4.8"; in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "aha-${version}";
+  version = "0.4.8";
 
   src = fetchFromGitHub {
     sha256 = "1209rda6kc9x88b47y1035zs9lxk0x3qzsb87f8m5b55fdkgxqlj";
@@ -16,7 +16,6 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "ANSI HTML Adapter";
     longDescription = ''
       aha takes ANSI SGR-coloured input and produces W3C-conformant HTML code.

From ac33b4724a84ef01f3d25a42e2b63f1a9d3e5cd6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 25 Jan 2016 20:08:34 +0100
Subject: [PATCH 0565/2285] More version attribute tidying where maintainers |=
 nckx

---
 pkgs/applications/audio/dfasma/default.nix           | 11 ++++-------
 pkgs/applications/graphics/sane/backends/generic.nix |  4 +---
 pkgs/applications/misc/ocropus/default.nix           |  7 +++----
 pkgs/applications/misc/redshift/default.nix          |  6 +++---
 pkgs/data/misc/geolite-legacy/default.nix            |  8 ++------
 pkgs/development/libraries/cpp-netlib/default.nix    |  6 +-----
 pkgs/development/libraries/libpsl/default.nix        |  6 ++----
 .../tools/build-managers/icmake/default.nix          |  1 -
 pkgs/development/tools/misc/ccache/default.nix       | 12 +++---------
 pkgs/development/tools/parsing/lemon/default.nix     |  6 ++----
 pkgs/games/eduke32/default.nix                       |  3 +--
 pkgs/misc/drivers/hplip/3.15.9.nix                   |  6 ++----
 pkgs/misc/drivers/hplip/default.nix                  |  4 +---
 pkgs/os-specific/linux/jfbview/default.nix           |  5 ++---
 pkgs/os-specific/linux/phc-intel/default.nix         |  7 +++----
 pkgs/servers/p910nd/default.nix                      |  7 ++-----
 pkgs/tools/compression/xdelta/default.nix            |  5 ++---
 pkgs/tools/compression/xdelta/unstable.nix           |  5 ++---
 pkgs/tools/filesystems/boxfs/default.nix             |  5 ++---
 pkgs/tools/networking/httping/default.nix            |  2 --
 pkgs/tools/networking/minissdpd/default.nix          |  7 ++-----
 pkgs/tools/security/sshuttle/default.nix             |  3 +--
 pkgs/tools/system/stress-ng/default.nix              |  7 ++-----
 23 files changed, 43 insertions(+), 90 deletions(-)

diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/applications/audio/dfasma/default.nix
index 9be3fff6ecbd..b2eda29ead5b 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/applications/audio/dfasma/default.nix
@@ -2,10 +2,6 @@
 
 let
 
-  version = "1.2.5";
-  rev = "v${version}";
-  sha256 = "0mgy2bkmyp7lvaqsr7hkndwdgjf26mlpsj6smrmn1vp0cqyrw72d";
-
   reaperFork = {
     src = fetchFromGitHub {
       sha256 = "07m2wf2gqyya95b65gawrnr4pvc9jyzmg6h8sinzgxlpskz93wwc";
@@ -30,11 +26,13 @@ let
     };
   };
 
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
   name = "dfasma-${version}";
+  version = "1.2.5";
 
   src = fetchFromGitHub {
-    inherit sha256 rev;
+    sha256 = "0mgy2bkmyp7lvaqsr7hkndwdgjf26mlpsj6smrmn1vp0cqyrw72d";
+    rev = "v${version}";
     repo = "dfasma";
     owner = "gillesdegottex";
   };
@@ -60,7 +58,6 @@ in stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Analyse and compare audio files in time and frequency";
     longDescription = ''
       DFasma is free open-source software to compare audio files by time and
diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index b597250098fe..8f46e647252e 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -13,7 +13,7 @@
 }:
 
 stdenv.mkDerivation {
-  inherit src;
+  inherit src version;
 
   name = "sane-backends-${version}";
 
@@ -56,8 +56,6 @@ stdenv.mkDerivation {
   '' + stdenv.lib.concatStrings (builtins.map installFirmware compatFirmware);
 
   meta = with stdenv.lib; {
-    inherit version;
-
     description = "SANE (Scanner Access Now Easy) backends";
     longDescription = ''
       Collection of open-source SANE backends (device drivers).
diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix
index b53a928931b6..0e6b13f9a288 100644
--- a/pkgs/applications/misc/ocropus/default.nix
+++ b/pkgs/applications/misc/ocropus/default.nix
@@ -2,11 +2,11 @@
 
 let
   getmodel = name: sha256: {
+    inherit name;
     src = fetchurl {
       url = "http://www.tmbdev.net/ocropy/${name}";
       inherit sha256;
     };
-    inherit name;
   };
 
   models = [
@@ -16,10 +16,10 @@ let
       "1wlwvxn91ilgmlri1hj81arl3mbzxc24ycdnkf5icq4hdi4c6y8b")
   ];
 
-  version = "20150316";
 in
-pythonPackages.buildPythonPackage {
+pythonPackages.buildPythonPackage rec {
   name = "ocropus-${version}";
+  version = "20150316";
 
   src = fetchFromGitHub {
     sha256 = "0m5bm2ah3p29c13vp7hz7rm058qnlm840zd8xv20byijhlz0447g";
@@ -49,7 +49,6 @@ pythonPackages.buildPythonPackage {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Open source document analysis and OCR system";
     license = licenses.asl20;
     homepage = https://github.com/tmbdev/ocropy/;
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index abe25afda5f7..e62deb9a3488 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -7,13 +7,14 @@
 }:
 
 let
-  version = "1.11";
   mkFlag = flag: name: if flag
     then "--enable-${name}"
     else "--disable-${name}";
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "redshift-${version}";
+  version = "1.11";
+
   src = fetchurl {
     sha256 = "0ngkwj7rg8nfk806w0sg443w6wjr91xdc0zisqfm5h2i77wm1qqh";
     url = "https://github.com/jonls/redshift/releases/download/v${version}/redshift-${version}.tar.xz";
@@ -51,7 +52,6 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Gradually change screen color temperature";
     longDescription = ''
       The color temperature is set according to the position of the
diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index 24f987f374cb..eab577888d11 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -5,13 +5,10 @@ let
     inherit name sha256;
     url = "https://geolite.maxmind.com/download/geoip/database/${src}";
   };
-
-  # Annoyingly, these files are updated without a change in URL. This means that
-  # builds will start failing every month or so, until the hashes are updated.
-  version = "2016-01-25";
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "geolite-legacy-${version}";
+  version = "2016-01-25";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
@@ -33,7 +30,6 @@ stdenv.mkDerivation {
     "1id60almra7mq4v86p37sfph8jrbdnc5pzxvy55wiyrvf6ydvk56";
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "GeoLite Legacy IP geolocation databases";
     homepage = https://geolite.maxmind.com/download/geoip;
     license = licenses.cc-by-sa-30;
diff --git a/pkgs/development/libraries/cpp-netlib/default.nix b/pkgs/development/libraries/cpp-netlib/default.nix
index 685d095a8184..64b223d4ebb1 100644
--- a/pkgs/development/libraries/cpp-netlib/default.nix
+++ b/pkgs/development/libraries/cpp-netlib/default.nix
@@ -1,11 +1,8 @@
 { stdenv, fetchurl, cmake, boost, openssl }:
 
-let
-  version = "0.11.2";
-in
-
 stdenv.mkDerivation rec {
   name = "cpp-netlib-${version}";
+  version = "0.11.2";
 
   src = fetchurl {
     url = "http://downloads.cpp-netlib.org/${version}/${name}-final.tar.bz2";
@@ -19,7 +16,6 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "A collection of open-source libraries for high level network programming";
     homepage    = http://cpp-netlib.org;
     license     = licenses.boost;
diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index a1beee602d71..1dc4c57e979a 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -3,8 +3,6 @@
 
 let
 
-  version = "${libVersion}-list-${listVersion}";
-
   listVersion = "2016-01-15";
   listSources = fetchFromGitHub {
     sha256 = "1smn4fl0fhldy7gdn0k1diyghbxdxnr4cj921bjdl2i4wxas41g5";
@@ -15,8 +13,9 @@ let
 
   libVersion = "0.12.0";
 
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
   name = "libpsl-${version}";
+  version = "${libVersion}-list-${listVersion}";
 
   src = fetchFromGitHub {
     sha256 = "13w3lc752az2swymg408f3w2lbqs0f2h5ri6d5jw1vv9z0ij9xlw";
@@ -54,7 +53,6 @@ in stdenv.mkDerivation {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "C library for the Publix Suffix List";
     longDescription = ''
       libpsl is a C library for the Publix Suffix List (PSL). A "public suffix"
diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix
index 08e6a3b6559b..b3788d7f324d 100644
--- a/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/pkgs/development/tools/build-managers/icmake/default.nix
@@ -30,7 +30,6 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "A program maintenance (make) utility using a C-like grammar";
     homepage = https://fbb-git.github.io/icmake/;
     license = licenses.gpl3;
diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix
index 29fe621d6764..4a278e052fa2 100644
--- a/pkgs/development/tools/misc/ccache/default.nix
+++ b/pkgs/development/tools/misc/ccache/default.nix
@@ -1,15 +1,11 @@
 { stdenv, fetchurl, fetchpatch, runCommand, gcc, zlib }:
 
-let
+let ccache = stdenv.mkDerivation rec {
   name = "ccache-${version}";
   version = "3.2.4";
-  sha256 = "0pga3hvd80f2p7mz88jmmbwzxh4vn5ihyjx5f6na8y2fclzsjg8w";
 
-  ccache =
-stdenv.mkDerivation {
-  inherit name;
   src = fetchurl {
-    inherit sha256;
+    sha256 = "0pga3hvd80f2p7mz88jmmbwzxh4vn5ihyjx5f6na8y2fclzsjg8w";
     url = "mirror://samba/ccache/${name}.tar.xz";
   };
 
@@ -65,7 +61,6 @@ stdenv.mkDerivation {
   };
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Compiler cache for fast recompilation of C/C++ code";
     homepage = http://ccache.samba.org/;
     downloadPage = https://ccache.samba.org/download.html;
@@ -73,5 +68,4 @@ stdenv.mkDerivation {
     maintainers = with maintainers; [ nckx ];
   };
 };
-in
-ccache
+in ccache
diff --git a/pkgs/development/tools/parsing/lemon/default.nix b/pkgs/development/tools/parsing/lemon/default.nix
index 23d4ea911dbe..46aaa8305129 100644
--- a/pkgs/development/tools/parsing/lemon/default.nix
+++ b/pkgs/development/tools/parsing/lemon/default.nix
@@ -2,8 +2,6 @@
 
 let
 
-  version = "1.0";
-
   srcs = {
     lemon = fetchurl {
       sha256 = "1grm95m2cnc61zim332g7z8nchmcy91ljf50k13lm421v0ygyyv6";
@@ -17,8 +15,9 @@ let
     };
   };
 
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
   name = "lemon-${version}";
+  version = "1.0";
 
   phases = [ "buildPhase" "installPhase" ];
 
@@ -32,7 +31,6 @@ in stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "An LALR(1) parser generator";
     longDescription = ''
       The Lemon program is an LALR(1) parser generator that takes a
diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix
index 048688fe033c..beb2bb579089 100644
--- a/pkgs/games/eduke32/default.nix
+++ b/pkgs/games/eduke32/default.nix
@@ -4,9 +4,9 @@
 let
   date = "20150420";
   rev = "5160";
-  version = "${date}-${rev}";
 in stdenv.mkDerivation rec {
   name = "eduke32-${version}";
+  version = "${date}-${rev}";
 
   src = fetchurl {
     url = "http://dukeworld.duke4.net/eduke32/synthesis/${version}/eduke32_src_${version}.tar.xz";
@@ -66,7 +66,6 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Enhanched port of Duke Nukem 3D for various platforms";
     license = licenses.gpl2Plus;
     homepage = http://eduke32.com;
diff --git a/pkgs/misc/drivers/hplip/3.15.9.nix b/pkgs/misc/drivers/hplip/3.15.9.nix
index 722615be46e7..9cd5a7894646 100644
--- a/pkgs/misc/drivers/hplip/3.15.9.nix
+++ b/pkgs/misc/drivers/hplip/3.15.9.nix
@@ -8,9 +8,8 @@
 
 let
 
-  version = "3.15.9";
-
   name = "hplip-${version}";
+  version = "3.15.9";
 
   src = fetchurl {
     url = "mirror://sourceforge/hplip/${name}.tar.gz";
@@ -48,7 +47,7 @@ assert withPlugin -> builtins.elem hplipArch pluginArches
   || throw "HPLIP plugin not supported on ${stdenv.system}";
 
 stdenv.mkDerivation {
-  inherit name src;
+  inherit name src version;
 
   buildInputs = [
     libjpeg
@@ -179,7 +178,6 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Print, scan and fax HP drivers for Linux";
     homepage = http://hplipopensource.com/;
     license = if withPlugin
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix
index 071ffe8c1001..ebe8a4d19abf 100644
--- a/pkgs/misc/drivers/hplip/default.nix
+++ b/pkgs/misc/drivers/hplip/default.nix
@@ -8,9 +8,8 @@
 
 let
 
-  version = "3.15.11";
-
   name = "hplip-${version}";
+  version = "3.15.11";
 
   src = fetchurl {
     url = "mirror://sourceforge/hplip/${name}.tar.gz";
@@ -179,7 +178,6 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Print, scan and fax HP drivers for Linux";
     homepage = http://hplipopensource.com/;
     license = if withPlugin
diff --git a/pkgs/os-specific/linux/jfbview/default.nix b/pkgs/os-specific/linux/jfbview/default.nix
index 467fed744edf..73ce1e7780a0 100644
--- a/pkgs/os-specific/linux/jfbview/default.nix
+++ b/pkgs/os-specific/linux/jfbview/default.nix
@@ -2,11 +2,11 @@
 , mujs, mupdf, ncurses, openjpeg, openssl }:
 
 let
-  version = "0.5.1";
   binaries = [ "jfbpdf" "jfbview" "jpdfcat" "jpdfgrep" ];
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "jfbview-${version}";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     sha256 = "113bkf49q04k9rjps5l28ychmzsfjajp9cjhr433s9ld0972z01m";
@@ -27,7 +27,6 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "PDF and image viewer for the Linux framebuffer";
     longDescription = ''
       A very fast PDF and image viewer for the Linux framebuffer with some
diff --git a/pkgs/os-specific/linux/phc-intel/default.nix b/pkgs/os-specific/linux/phc-intel/default.nix
index 4eed41254f91..2b86238b2df5 100644
--- a/pkgs/os-specific/linux/phc-intel/default.nix
+++ b/pkgs/os-specific/linux/phc-intel/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, kernel, which }:
 
 assert stdenv.isLinux;
-# Don't bother with older versions, though some would probably work:
+# Don't bother with older versions, though some might even work:
 assert stdenv.lib.versionAtLeast kernel.version "4.3";
 # Disable on grsecurity kernels, which break module building:
 assert !kernel.features ? grsecurity;
@@ -9,9 +9,9 @@ assert !kernel.features ? grsecurity;
 let
   release = "0.4.0";
   revbump = "rev19"; # don't forget to change forum download id...
-  version = "${release}-${revbump}";
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
   name = "linux-phc-intel-${version}-${kernel.version}";
+  version = "${release}-${revbump}";
 
   src = fetchurl {
     sha256 = "1apvjp2rpaf3acjvsxgk6xiwrx4n9p565gxvra05pvicwikfiqa8";
@@ -38,7 +38,6 @@ in stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Undervolting kernel driver for Intel processors";
     longDescription = ''
       PHC is a Linux kernel patch to undervolt processors. This can divide the
diff --git a/pkgs/servers/p910nd/default.nix b/pkgs/servers/p910nd/default.nix
index 150bf196b0dd..0f7cc19339d8 100644
--- a/pkgs/servers/p910nd/default.nix
+++ b/pkgs/servers/p910nd/default.nix
@@ -1,10 +1,8 @@
 { stdenv, fetchurl }:
 
-let
-  version = "0.97";
+stdenv.mkDerivation rec {
   name = "p910nd-${version}";
-in stdenv.mkDerivation {
-  inherit name;
+  version = "0.97";
 
   src = fetchurl {
     sha256 = "0vy2qf386dif1nqznmy3j953mq7c4lk6j2hgyzkbmfi4msiq1jaa";
@@ -27,7 +25,6 @@ in stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Small printer daemon passing jobs directly to the printer";
     longDescription = ''
       p910nd is a small printer daemon intended for diskless platforms that
diff --git a/pkgs/tools/compression/xdelta/default.nix b/pkgs/tools/compression/xdelta/default.nix
index 396099df41cc..8bc5e464ee74 100644
--- a/pkgs/tools/compression/xdelta/default.nix
+++ b/pkgs/tools/compression/xdelta/default.nix
@@ -5,12 +5,12 @@
 assert lzmaSupport -> xz != null;
 
 let
-  version = "3.0.11";
   mkWith = flag: name: if flag
     then "--with-${name}"
     else "--without-${name}";
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
   name = "xdelta-${version}";
+  version = "3.0.11";
 
   src = fetchFromGitHub {
     sha256 = "1c7xym7xr26phyf4wb9hh2w88ybzbzh2w3h1kyqq3da0ndidmf2r";
@@ -48,7 +48,6 @@ in stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Binary differential compression in VCDIFF (RFC 3284) format";
     longDescription = ''
       xdelta is a command line program for delta encoding, which generates two
diff --git a/pkgs/tools/compression/xdelta/unstable.nix b/pkgs/tools/compression/xdelta/unstable.nix
index a19fb4de68a4..dd7277c4e8fb 100644
--- a/pkgs/tools/compression/xdelta/unstable.nix
+++ b/pkgs/tools/compression/xdelta/unstable.nix
@@ -5,12 +5,12 @@
 assert lzmaSupport -> xz != null;
 
 let
-  version = "3.1.0";
   mkWith = flag: name: if flag
     then "--with-${name}"
     else "--without-${name}";
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
   name = "xdelta-${version}";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     sha256 = "09mmsalc7dwlvgrda56s2k927rpl3a5dzfa88aslkqcjnr790wjy";
@@ -52,7 +52,6 @@ in stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Binary differential compression in VCDIFF (RFC 3284) format";
     longDescription = ''
       xdelta is a command line program for delta encoding, which generates two
diff --git a/pkgs/tools/filesystems/boxfs/default.nix b/pkgs/tools/filesystems/boxfs/default.nix
index 3c8c1b6e1809..99a118160b7e 100644
--- a/pkgs/tools/filesystems/boxfs/default.nix
+++ b/pkgs/tools/filesystems/boxfs/default.nix
@@ -1,7 +1,6 @@
 { stdenv, fetchFromGitHub, curl, fuse, libxml2, pkgconfig }:
 
 let
-  version = "2-20150109";
   srcs = {
     boxfs2 = fetchFromGitHub {
       sha256 = "10af1l3sjnh25shmq5gdnpyqk4vrq7i1zklv4csf1n2nrahln8j8";
@@ -22,8 +21,9 @@ let
       owner = "vincenthz";
     };
   };
-in stdenv.mkDerivation {
+in stdenv.mkDerivation rec {
   name = "boxfs-${version}";
+  version = "2-20150109";
 
   src = srcs.boxfs2;
 
@@ -45,7 +45,6 @@ in stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "FUSE file system for box.com accounts";
     longDescription = ''
       Store files on box.com (an account is required). The first time you run
diff --git a/pkgs/tools/networking/httping/default.nix b/pkgs/tools/networking/httping/default.nix
index 9b1de33cf6d2..00f7bde429fe 100644
--- a/pkgs/tools/networking/httping/default.nix
+++ b/pkgs/tools/networking/httping/default.nix
@@ -3,7 +3,6 @@
 
 stdenv.mkDerivation rec {
   name = "httping-${version}";
-
   version = "2.4";
 
   src = fetchurl {
@@ -20,7 +19,6 @@ stdenv.mkDerivation rec {
   ];
 
   meta = with stdenv.lib; {
-    inherit version;
     homepage = http://www.vanheusden.com/httping;
     description = "ping with HTTP requests";
     longDescription = ''
diff --git a/pkgs/tools/networking/minissdpd/default.nix b/pkgs/tools/networking/minissdpd/default.nix
index 92b6d9ff9b5f..a414b6f092ee 100644
--- a/pkgs/tools/networking/minissdpd/default.nix
+++ b/pkgs/tools/networking/minissdpd/default.nix
@@ -1,10 +1,8 @@
 { stdenv, fetchurl, libnfnetlink }:
 
-let
-  version = "1.5.20160119";
+stdenv.mkDerivation rec {
   name = "minissdpd-${version}";
-in stdenv.mkDerivation {
-  inherit name;
+  version = "1.5.20160119";
 
   src = fetchurl {
     sha256 = "0z0h2fqjlys9g08fbv0jg8l53h8cjlpdk45z4g71kwdk1m9ld8r2";
@@ -21,7 +19,6 @@ in stdenv.mkDerivation {
   doCheck = true;
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Small daemon to speed up UPnP device discoveries";
     longDescription = ''
       MiniSSDPd receives NOTIFY packets and stores (caches) that information
diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix
index 62d3d2613cc1..b7cefdd86ea4 100644
--- a/pkgs/tools/security/sshuttle/default.nix
+++ b/pkgs/tools/security/sshuttle/default.nix
@@ -2,8 +2,8 @@
 , coreutils, iptables, nettools, openssh, procps }:
   
 pythonPackages.buildPythonPackage rec {
-  version = "0.76";
   name = "sshuttle-${version}";
+  version = "0.76";
 
   src = fetchurl {
     sha256 = "1q0hr0vhdvv23cw5dqndsmf61283mvs6b14662ci00xj6zp5v48b";
@@ -26,7 +26,6 @@ pythonPackages.buildPythonPackage rec {
   '';
   
   meta = with stdenv.lib; {
-    inherit version;
     homepage = https://github.com/sshuttle/sshuttle/;
     description = "Transparent proxy server that works as a poor man's VPN";
     longDescription = ''
diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix
index 12c250788390..a973d143fa97 100644
--- a/pkgs/tools/system/stress-ng/default.nix
+++ b/pkgs/tools/system/stress-ng/default.nix
@@ -1,10 +1,8 @@
 { stdenv, fetchurl, attr, keyutils }:
 
-let
-  version = "0.05.00";
+stdenv.mkDerivation rec {
   name = "stress-ng-${version}";
-in stdenv.mkDerivation {
-  inherit name;
+  version = "0.05.00";
 
   src = fetchurl {
     sha256 = "0ppri86z6fj48nm5l0x1r8mh7mwaf7bvhmi10jz6a8w7apnc181w";
@@ -22,7 +20,6 @@ in stdenv.mkDerivation {
   installFlags = [ "DESTDIR=$(out)" ];
 
   meta = with stdenv.lib; {
-    inherit version;
     description = "Stress test a computer system";
     longDescription = ''
       Stress test a system in various selectable ways, exercising both various

From 5009b4a8cf7fd3e5468d2bd634c04103c49fe703 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 25 Jan 2016 12:33:01 -0800
Subject: [PATCH 0566/2285] coq_8_5: 8.5rc1 -> 8.5

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

diff --git a/pkgs/applications/science/logic/coq/8.5.nix b/pkgs/applications/science/logic/coq/8.5.nix
index df888cf5c793..104fb02fc450 100644
--- a/pkgs/applications/science/logic/coq/8.5.nix
+++ b/pkgs/applications/science/logic/coq/8.5.nix
@@ -6,7 +6,7 @@
 {stdenv, fetchurl, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null, csdp ? null}:
 
 let
-  version = "8.5rc1";
+  version = "8.5";
   coq-version = "8.5";
   buildIde = lablgtk != null;
   ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else "";
@@ -23,8 +23,8 @@ stdenv.mkDerivation {
   inherit ocaml camlp5;
 
   src = fetchurl {
-    url = https://coq.inria.fr/distrib/V8.5rc1/files/coq-8.5rc1.tar.gz;
-    sha256 = "0n8mb7di9iwg8dgy1xmivf2ajx8kqkrj9mafc32vicn2lbg16q2r";
+    url = https://coq.inria.fr/distrib/V8.5/files/coq-8.5.tar.gz;
+    sha256 = "0gdfm6k5q1f8sz1xr9ijdkkvwqsb7v8prj21gmwv0z0yp6w2zac9";
   };
 
   buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ];

From 9e56b18cde11df9807c3cafa8e47a18ff2de3441 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Mon, 25 Jan 2016 23:13:12 +0100
Subject: [PATCH 0567/2285] morituri: Add missing platforms attribute

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

diff --git a/pkgs/applications/audio/morituri/default.nix b/pkgs/applications/audio/morituri/default.nix
index 8ceb0fe3b36f..2a4ec853cbcf 100644
--- a/pkgs/applications/audio/morituri/default.nix
+++ b/pkgs/applications/audio/morituri/default.nix
@@ -48,5 +48,6 @@ stdenv.mkDerivation rec {
     description = "A CD ripper aiming for accuracy over speed";
     maintainers = with maintainers; [ rycee jgeerds ];
     license = licenses.gpl3Plus;
+    platforms = platforms.linux;
   };
 }

From 92cda7a6bb17948523feefece3c20e35bb213daa Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 12 Jan 2016 20:56:59 +0300
Subject: [PATCH 0568/2285] dwarf-fortress: 0.40.24 -> 0.42.05, split
 derivations

This is a massive rework of the current dwarf_fortress package.
The main reason for rework is to split game, its libraries and wrappers,
enabling builds on Hydra and general maintainability.

dfhack, dwarf-fortress-unfuck, dwarf-fortress-original and dwarf-fortress
are now all separate derivations. All were updated to the latest versions
supporting DF 0.42.04 (some things taken from development branches):

dfhack: 20150927 -> 20160118
dwarf-fortress-unfuck: 0.40.24 -> 20160118
dwarf-fortress-original: 0.40.24 -> 0.42.05

dfhack got a patch for using more system libraries.

Wrapper scripts were also redone -- now they support DF_DIR variable (for
setting another data directory) and try to save more space by means of
symlinking. They now try to be more smart, updating those directories that were
not touched by user automatically.

All the new packages now reside in dwarf-fortress-packages. dwarf_fortress was
renamed into dwarf-fortress per our conventions, old name is deprecated. Also
duplicate dfhack derivation is removed.

Also drop dwarfFortress.enableDFHack config option; it can be re-added later
but now is deemed controversial.
---
 pkgs/games/dfhack/default.nix                 |  62 -----
 pkgs/games/dwarf-fortress/default.nix         | 222 +-----------------
 pkgs/games/dwarf-fortress/dfhack-run.in       |  11 -
 pkgs/games/dwarf-fortress/dfhack/default.nix  |  49 ++++
 .../dfhack/use-system-libraries.patch         | 138 +++++++++++
 .../dwarf-fortress/dwarf-fortress-hacked.in   |  13 -
 pkgs/games/dwarf-fortress/dwarf-fortress.in   |  14 --
 pkgs/games/dwarf-fortress/export-libs.sh.in   |  12 -
 .../games/dwarf-fortress/export-workaround.sh |   1 -
 pkgs/games/dwarf-fortress/game.nix            |  52 ++++
 .../install-df-data-content-to-home.sh        |   4 -
 .../dwarf-fortress/install-df-data-to-home.sh |  12 -
 .../install-dfhack-data-to-home.sh            |  16 --
 pkgs/games/dwarf-fortress/unfuck.nix          |  41 ++++
 pkgs/games/dwarf-fortress/wrapper/default.nix |  47 ++++
 pkgs/games/dwarf-fortress/wrapper/dfhack.in   |  17 ++
 .../wrapper/dwarf-fortress-init.in            |  43 ++++
 .../dwarf-fortress/wrapper/dwarf-fortress.in  |   6 +
 pkgs/top-level/all-packages.nix               |  15 +-
 19 files changed, 409 insertions(+), 366 deletions(-)
 delete mode 100644 pkgs/games/dfhack/default.nix
 delete mode 100644 pkgs/games/dwarf-fortress/dfhack-run.in
 create mode 100644 pkgs/games/dwarf-fortress/dfhack/default.nix
 create mode 100644 pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch
 delete mode 100644 pkgs/games/dwarf-fortress/dwarf-fortress-hacked.in
 delete mode 100644 pkgs/games/dwarf-fortress/dwarf-fortress.in
 delete mode 100644 pkgs/games/dwarf-fortress/export-libs.sh.in
 delete mode 100644 pkgs/games/dwarf-fortress/export-workaround.sh
 create mode 100644 pkgs/games/dwarf-fortress/game.nix
 delete mode 100644 pkgs/games/dwarf-fortress/install-df-data-content-to-home.sh
 delete mode 100644 pkgs/games/dwarf-fortress/install-df-data-to-home.sh
 delete mode 100644 pkgs/games/dwarf-fortress/install-dfhack-data-to-home.sh
 create mode 100644 pkgs/games/dwarf-fortress/unfuck.nix
 create mode 100644 pkgs/games/dwarf-fortress/wrapper/default.nix
 create mode 100644 pkgs/games/dwarf-fortress/wrapper/dfhack.in
 create mode 100644 pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
 create mode 100644 pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in

diff --git a/pkgs/games/dfhack/default.nix b/pkgs/games/dfhack/default.nix
deleted file mode 100644
index 046f11545a55..000000000000
--- a/pkgs/games/dfhack/default.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{ stdenv, fetchgit, dwarf_fortress, cmake, zlib, perl, XMLLibXML, XMLLibXSLT
-}:
-
-let
-  baseVersion = "40";
-  patchVersion = "24-r3";
-  src = fetchgit {
-    url = "https://github.com/DFHack/dfhack.git";
-    rev = "0849099f2083e100cae6f64940b4eff4c28ce2eb";
-    sha256 = "0lnqrayi8hwfivkrxb7fw8lb6v95i04pskny1px7084n7nzvyv8b";
-  };
-
-in
-
-assert stdenv.system == "i686-linux";
-assert dwarf_fortress.name == "dwarf-fortress-0.40.24";
-
-stdenv.mkDerivation rec {
-  name = "dfhack-0.${baseVersion}.${patchVersion}";
-
-  inherit baseVersion patchVersion src;
-
-  buildInputs = [ cmake zlib perl XMLLibXML XMLLibXSLT ];
-
-  preConfigure = ''
-    export cmakeFlags="-DCMAKE_INSTALL_PREFIX=$prefix/dfhack $cmakeFlags"
-    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:`pwd`/build/depends/protobuf
-  '';
-
-  installPhase = ''
-    mkdir -p $out/dfhack
-    make install
-    cp ../package/linux/dfhack $out/dfhack/
-    mkdir -p $out/bin
-    cat > $out/bin/dfhack_install_dir <<EOF
-    #!/bin/sh
-    test -z "\$1" && echo "This creates a Dwarf Fortress/DFHack game directory. Please specify a directory (preferably empty or non-existent) for this." && exit 1
-
-    set -e
-    mkdir -p "\$1"
-    cd "\$1"
-    cp -r ${dwarf_fortress}/share/df_linux/* .
-    cp -r $out/dfhack/* .
-    chmod -R u+w .
-    # use LD_LIBRARY_PATH setting from dwarf-fortress wrapper
-    sed -e 's%# Now run%`grep LD_LIBRARY_PATH ${dwarf_fortress}/bin/dwarf-fortress`%' $out/dfhack/dfhack > dfhack
-    # write md5sum of binary
-    sed -e s/c42f55948a448645d6609102ef6439e8/`md5sum ${dwarf_fortress}/share/df_linux/libs/Dwarf_Fortress | cut -f1 -d\ `/ $out/dfhack/hack/symbols.xml > hack/symbols.xml
-
-    echo "DFHack installed successfully in \$1. To play, run ./dfhack in it."
-
-    EOF
-    chmod +x $out/bin/dfhack_install_dir
-  '';
-
-  meta = {
-    description = "A Dwarf Fortress memory access library";
-    homepage = https://github.com/DFHack/dfhack;
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = with stdenv.lib.maintainers; [ robbinch ];
-  };
-}
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index ad2733df079d..d73f932ac032 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -1,217 +1,19 @@
-{ stdenv, fetchgit, fetchurl, cmake, glew, ncurses
-, SDL, SDL_image, SDL_ttf, gtk2, glib
-, mesa, openal, pango, atk, gdk_pixbuf, glibc, libsndfile
-# begin dfhack-only parameters
-, XMLLibXML
-, XMLLibXSLT
-, perl
-, zlib
-# end dfhack-only parameters
-, enableDFHack ? false
-}:
+{ pkgs, pkgsi686Linux }:
 
 let
-  baseVersion = "40";
-  patchVersion = "24";
-  srcs = {
-    df_unfuck = fetchgit {
-      url = "https://github.com/svenstaro/dwarf_fortress_unfuck";
-      rev = "39742d64d2886fb594d79e7cc4b98fb917f26811";
-      sha256 = "19vwx6kpv1sf93bx5v8x47f7x2cgxsqk82v6j1a72sa3q7m5cpc7";
+  callPackage = pkgs.newScope self;
+  callPackage_i686 = pkgsi686Linux.newScope self;
+
+  self = {
+    dwarf-fortress-original = callPackage_i686 ./game.nix { };
+
+    dfhack = callPackage_i686 ./dfhack {
+      inherit (pkgsi686Linux.perlPackages) XMLLibXML XMLLibXSLT;
     };
 
-    dfhack = fetchgit {
-      url = "https://github.com/DFHack/dfhack.git";
-      rev = "0849099f2083e100cae6f64940b4eff4c28ce2eb";
-      sha256 = "0lnqrayi8hwfivkrxb7fw8lb6v95i04pskny1px7084n7nzvyv8b";
-    };
+    dwarf-fortress-unfuck = callPackage_i686 ./unfuck.nix { };
 
-    df = fetchurl {
-      url = "http://www.bay12games.com/dwarves/df_${baseVersion}_${patchVersion}_linux.tar.bz2";
-      sha256 = "0d4jrs45qj89vq9mjg7fxxhis7zivvb0vzjpmkk274b778kccdys";
-    };
+    dwarf-fortress = callPackage ./wrapper { };
   };
 
-  dfHackWorksWithCurrentVersion = true;
-  dfHackEnabled = dfHackWorksWithCurrentVersion && enableDFHack;
-
-in
-
-assert stdenv.system == "i686-linux";
-
-stdenv.mkDerivation rec {
-  name = "dwarf-fortress-0.${baseVersion}.${patchVersion}";
-
-  inherit baseVersion patchVersion;
-
-  buildInputs = [
-    SDL
-    SDL_image
-    SDL_ttf
-    gtk2
-    glib
-    glew
-    mesa
-    ncurses
-    openal
-    glibc
-    libsndfile
-    pango
-    atk
-    cmake
-    gdk_pixbuf
-    XMLLibXML
-    XMLLibXSLT
-    perl
-    zlib
-  ];
-  src = "${srcs.df_unfuck} ${srcs.df}" + stdenv.lib.optionalString dfHackEnabled " ${srcs.dfhack}";
-
-  sourceRoot = srcs.df_unfuck.name;
-  dfHackSourceRoot = srcs.dfhack.name;
-
-  cmakeFlags = [
-    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
-    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include"
-  ];
-
-  permission = ./df_permission;
-  dfHackTemplate = ./dwarf-fortress-hacked.in;
-  dfHackRunTemplate = ./dfhack-run.in;
-  dwarfFortressTemplate = ./dwarf-fortress.in;
-  installDfDataToHome = ./install-df-data-to-home.sh;
-  installDfhackDataToHome = ./install-dfhack-data-to-home.sh;
-  installDfDataContentToHome = ./install-df-data-content-to-home.sh;
-  exportLibsTemplate = ./export-libs.sh.in;
-  exportWorkaround = ./export-workaround.sh;
-
-  postUnpack = stdenv.lib.optionalString dfHackEnabled ''
-    if [ "$dontMakeSourcesWritable" != 1 ]; then
-      chmod -R u+w "$dfHackSourceRoot"
-    fi
-  '';
-
-  preConfigure = stdenv.lib.optionalString dfHackEnabled ''
-    export cmakeFlags="-DCMAKE_INSTALL_PREFIX=$out/share/df_linux $cmakeFlags"
-    export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$(pwd)/build/depends/protobuf
-  '';
-
-  postConfigure = stdenv.lib.optionalString dfHackEnabled ''
-    if [ -z "$originalSourceRoot" ]; then
-
-      originalSourceRoot=$sourceRoot
-      export sourceRoot=$dfHackSourceRoot
-
-      pushd ../../$sourceRoot
-
-      eval "''${configurePhase:-configurePhase}"
-
-      popd
-
-      export sourceRoot=$originalSourceRoot
-      unset originalSourceRoot
-    fi
-  '';
-
-  installPhase = ''
-    set -x
-    mkdir -p $out/bin
-    mkdir -p $out/share/df_linux
-    pushd ../../
-    cp -r ./df_linux/* $out/share/df_linux
-    rm $out/share/df_linux/libs/lib*
-
-    # Store the original hash
-    orig_hash=$(md5sum $out/share/df_linux/libs/Dwarf_Fortress | awk '{ print $1 }')
-    echo $orig_hash | cut -c1-8 > $out/share/df_linux/hash.md5.orig  # for dwarf-therapist
-    echo $orig_hash > $out/share/df_linux/full-hash-orig.md5  # for dfhack
-
-    cp -f ./${srcs.df_unfuck.name}/build/libgraphics.so $out/share/df_linux/libs/libgraphics.so
-
-    cp $permission $out/share/df_linux/nix_permission
-
-    # Placeholder files for hashes of patched binary
-    touch $out/share/df_linux/hash.md5.patched
-    touch $out/share/df_linux/full-hash-patched.md5
-
-    mkdir -p $out/share/df_linux/shell
-    cp $installDfDataToHome $out/share/df_linux/shell/install-df-data-to-home.sh
-    cp $installDfhackDataToHome $out/share/df_linux/shell/install-dfhack-data-to-home.sh
-    cp $installDfDataContentToHome $out/share/df_linux/shell/install-df-data-content-to-home.sh
-    cp $exportWorkaround $out/share/df_linux/shell/export-workaround.sh
-    substitute $exportLibsTemplate $out/share/df_linux/shell/export-libs.sh \
-        --subst-var-by stdenv_cc ${stdenv.cc} \
-        --subst-var-by SDL ${SDL} \
-        --subst-var-by SDL_image ${SDL_image} \
-        --subst-var-by SDL_ttf ${SDL_ttf} \
-        --subst-var-by gtk2 ${gtk2} \
-        --subst-var-by glib ${glib} \
-        --subst-var-by libsndfile ${libsndfile} \
-        --subst-var-by mesa ${mesa} \
-        --subst-var-by openal ${openal} \
-        --subst-var-by zlib ${zlib} \
-
-    substitute $dwarfFortressTemplate $out/bin/dwarf-fortress \
-        --subst-var-by stdenv_shell ${stdenv.shell} \
-        --subst-var prefix
-
-    chmod 755 $out/bin/dwarf-fortress
-
-    popd
-  '' + stdenv.lib.optionalString dfHackEnabled ''
-
-    originalSourceRoot=$sourceRoot
-    export sourceRoot=$dfHackSourceRoot
-
-    pushd ../../$sourceRoot/build
-
-    mkdir -p $out/dfhack
-
-    make install
-
-    cp ../package/linux/dfhack $out/dfhack/
-
-    mkdir -p $out/bin
-
-    substitute $dfHackTemplate $out/bin/dfhack \
-        --subst-var-by stdenv_shell ${stdenv.shell} \
-        --subst-var prefix
-    chmod 755 $out/bin/dfhack
-
-    substitute $dfHackRunTemplate $out/bin/dfhack-run \
-        --subst-var-by stdenv_shell ${stdenv.shell} \
-        --subst-var prefix
-    chmod 755 $out/bin/dfhack-run
-
-    popd
-
-    export sourceRoot=$originalSourceRoot
-    unset originalSourceRoot
-  '';
-
-  fixupPhase = ''
-    # Fix rpath
-    patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc ]}:$out/share/df_linux/libs" $out/share/df_linux/libs/Dwarf_Fortress
-
-    patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 $out/share/df_linux/libs/Dwarf_Fortress
-
-    # Store new hash
-    patched_hash=$(md5sum $out/share/df_linux/libs/Dwarf_Fortress | awk '{ print $1 }')
-    echo $patched_hash | cut -c1-8 > $out/share/df_linux/hash.md5.patched  # for dwarf-therapist
-    echo $patched_hash > $out/share/df_linux/full-hash-patched.md5  # for dfhack
-  '' + stdenv.lib.optionalString dfHackEnabled ''
-    find $out/share/df_linux/hack \( \
-        \( -type f -a -name "*.so*" \) -o \
-        \( -type f -a -perm +0100 \) \
-        \) -print -exec patchelf --shrink-rpath {} \;
-
-    sed -i "s/$(cat $out/share/df_linux/full-hash-orig.md5)/$(cat $out/share/df_linux/full-hash-patched.md5)/" $out/share/df_linux/hack/symbols.xml
-  '';
-
-  meta = {
-    description = "A single-player fantasy game with a randomly generated adventure world";
-    homepage = http://www.bay12games.com/dwarves;
-    license = stdenv.lib.licenses.unfreeRedistributable;
-    maintainers = with stdenv.lib.maintainers; [ a1russell robbinch roconnor the-kenny ];
-  };
-}
+in self
diff --git a/pkgs/games/dwarf-fortress/dfhack-run.in b/pkgs/games/dwarf-fortress/dfhack-run.in
deleted file mode 100644
index 590e5b25acf3..000000000000
--- a/pkgs/games/dwarf-fortress/dfhack-run.in
+++ /dev/null
@@ -1,11 +0,0 @@
-#!@stdenv_shell@
-
-data_dir=${XDG_DATA_HOME:-$HOME/.local/share}/df_linux
-pkg_dir=@prefix@/share/df_linux
-
-. $pkg_dir/shell/install-df-data-to-home.sh
-. $pkg_dir/shell/install-dfhack-data-to-home.sh
-. $pkg_dir/shell/export-libs.sh
-
-cd "$data_dir"
-exec ./dfhack-run "$@"
diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
new file mode 100644
index 000000000000..92b9d57da421
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchgit, cmake, writeScriptBin
+, perl, XMLLibXML, XMLLibXSLT
+, zlib
+, jsoncpp, protobuf, tinyxml
+}:
+
+let
+  rev = "f61ff9147e00f3c379ac0458e79eb556a5de1b68";
+  dfVersion = "0.42.05";
+
+  fakegit = writeScriptBin "git" ''
+    #! ${stdenv.shell}
+    if [ "$*" = "describe --tags --long" ]; then
+      echo "${dfVersion}-unknown"
+    elif [ "$*" = "rev-parse HEAD" ]; then
+      echo "${rev}"
+    else
+      exit 1
+    fi
+  '';
+
+in stdenv.mkDerivation {
+  name = "dfhack-20160118";
+
+  # Beware of submodules
+  src = fetchgit {
+    url = "https://github.com/DFHack/dfhack";
+    inherit rev;
+    sha256 = "1ah3cplp4mb9pq7rm1cmn8klfjxw3y2xfzy7734i81b3iwiwlpi4";
+  };
+
+  patches = [ ./use-system-libraries.patch ];
+
+  nativeBuildInputs = [ cmake perl XMLLibXML XMLLibXSLT fakegit ];
+  # we can't use native Lua; upstream uses private headers
+  buildInputs = [ zlib jsoncpp protobuf tinyxml ];
+
+  enableParallelBuilding = true;
+
+  passthru = { inherit dfVersion; };
+
+  meta = with stdenv.lib; {
+    description = "Memory hacking library for Dwarf Fortress and a set of tools that use it";
+    homepage = https://github.com/DFHack/dfhack/;
+    license = licenses.zlib;
+    platforms = [ "i686-linux" ];
+    maintainers = with maintainers; [ robbinch a1russell abbradar ];
+  };
+}
diff --git a/pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch b/pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch
new file mode 100644
index 000000000000..2ae3620fff6f
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/dfhack/use-system-libraries.patch
@@ -0,0 +1,138 @@
+From 1196fcb987b6aadb49075d817b3615bf8a6d7d51 Mon Sep 17 00:00:00 2001
+From: Nikolay Amiantov <ab@fmap.me>
+Date: Wed, 6 Jan 2016 03:07:20 +0300
+Subject: [PATCH 2/2] Use as much system libraries as possible
+
+---
+ CMakeLists.txt                    |  5 -----
+ depends/CMakeLists.txt            |  3 ---
+ library/CMakeLists.txt            | 10 +++++-----
+ plugins/CMakeLists.txt            |  4 ++--
+ plugins/mapexport/CMakeLists.txt  |  4 ++--
+ plugins/stockpiles/CMakeLists.txt |  4 ++--
+ 6 files changed, 11 insertions(+), 19 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1933390..d871df4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -152,8 +152,6 @@ ELSEIF(MSVC)
+   SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od")
+ ENDIF()
+ 
+-# use shared libraries for protobuf
+-ADD_DEFINITIONS(-DPROTOBUF_USE_DLLS)
+ ADD_DEFINITIONS(-DLUA_BUILD_AS_DLL)
+ 
+ if(APPLE)
+@@ -173,11 +171,8 @@ if(NOT UNIX)
+ endif()
+ set(ZLIB_ROOT /usr/lib/i386-linux-gnu)
+ find_package(ZLIB REQUIRED)
+-include_directories(depends/protobuf)
+ include_directories(depends/lua/include)
+ include_directories(depends/md5)
+-include_directories(depends/jsoncpp)
+-include_directories(depends/tinyxml)
+ include_directories(depends/tthread)
+ include_directories(${ZLIB_INCLUDE_DIRS})
+ include_directories(depends/clsocket/src)
+diff --git a/depends/CMakeLists.txt b/depends/CMakeLists.txt
+index bf0345b..2a1a852 100644
+--- a/depends/CMakeLists.txt
++++ b/depends/CMakeLists.txt
+@@ -1,10 +1,7 @@
+ #list depends here.
+ add_subdirectory(lua)
+ add_subdirectory(md5)
+-add_subdirectory(protobuf)
+-add_subdirectory(tinyxml)
+ add_subdirectory(tthread)
+-add_subdirectory(jsoncpp)
+ # build clsocket static and only as a dependency. Setting those options here overrides its own default settings.
+ OPTION(CLSOCKET_SHARED "Build clsocket lib as shared." OFF)
+ OPTION(CLSOCKET_DEP_ONLY "Build for use inside other CMake projects as dependency." ON)
+diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
+index 5071d9e..d346d1e 100644
+--- a/library/CMakeLists.txt
++++ b/library/CMakeLists.txt
+@@ -203,10 +203,10 @@ LIST(APPEND PROJECT_SOURCES ${PROJECT_PROTO_SRCS})
+ 
+ ADD_CUSTOM_COMMAND(
+     OUTPUT ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS}
+-    COMMAND protoc-bin -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/
++    COMMAND protoc -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/
+             --cpp_out=dllexport_decl=DFHACK_EXPORT:${CMAKE_CURRENT_SOURCE_DIR}/proto/
+             ${PROJECT_PROTOS}
+-    DEPENDS protoc-bin ${PROJECT_PROTOS}
++    DEPENDS ${PROJECT_PROTOS}
+ )
+ 
+ # Merge headers into sources
+@@ -249,12 +249,12 @@ IF(UNIX)
+ ENDIF()
+ 
+ IF(APPLE)
+-  SET(PROJECT_LIBS dl dfhack-md5 dfhack-tinyxml dfhack-tinythread)
++  SET(PROJECT_LIBS dl dfhack-md5 tinyxml dfhack-tinythread)
+ ELSEIF(UNIX)
+-  SET(PROJECT_LIBS rt dl dfhack-md5 dfhack-tinyxml dfhack-tinythread)
++  SET(PROJECT_LIBS rt dl dfhack-md5 tinyxml dfhack-tinythread)
+ ELSE(WIN32)
+   #FIXME: do we really need psapi?
+-  SET(PROJECT_LIBS psapi dfhack-md5 dfhack-tinyxml dfhack-tinythread)
++  SET(PROJECT_LIBS psapi dfhack-md5 tinyxml dfhack-tinythread)
+ ENDIF()
+ 
+ ADD_LIBRARY(dfhack-version STATIC DFHackVersion.cpp)
+diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
+index 9781401..ece508c 100644
+--- a/plugins/CMakeLists.txt
++++ b/plugins/CMakeLists.txt
+@@ -69,11 +69,11 @@ STRING(REPLACE ".proto" ".pb.h" PROJECT_PROTO_HDRS "${PROJECT_PROTOS}")
+ 
+ ADD_CUSTOM_COMMAND(
+     OUTPUT ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS}
+-    COMMAND protoc-bin -I=${dfhack_SOURCE_DIR}/library/proto/
++    COMMAND protoc -I=${dfhack_SOURCE_DIR}/library/proto/
+                        -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/
+             --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/proto/
+             ${PROJECT_PROTOS}
+-    DEPENDS protoc-bin ${PROJECT_PROTOS}
++    DEPENDS ${PROJECT_PROTOS}
+ )
+ add_custom_target(generate_proto DEPENDS ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS})
+ 
+diff --git a/plugins/mapexport/CMakeLists.txt b/plugins/mapexport/CMakeLists.txt
+index 429507a..7e2390a 100644
+--- a/plugins/mapexport/CMakeLists.txt
++++ b/plugins/mapexport/CMakeLists.txt
+@@ -32,8 +32,8 @@ LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS})
+ #Generate sources from our proto files and store them in the source tree
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS}
+-COMMAND protoc-bin -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/proto/ ${PROJECT_PROTOS}
+-DEPENDS protoc-bin ${PROJECT_PROTOS}
++COMMAND protoc -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/proto/ ${PROJECT_PROTOS}
++DEPENDS ${PROJECT_PROTOS}
+ )
+ 
+ IF(WIN32)
+diff --git a/plugins/stockpiles/CMakeLists.txt b/plugins/stockpiles/CMakeLists.txt
+index 713c3d6..dd2d4cb 100644
+--- a/plugins/stockpiles/CMakeLists.txt
++++ b/plugins/stockpiles/CMakeLists.txt
+@@ -33,8 +33,8 @@ LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS})
+ #Generate sources from our proto files and store them in the source tree
+ ADD_CUSTOM_COMMAND(
+ OUTPUT ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS}
+-COMMAND protoc-bin -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/proto/ ${PROJECT_PROTOS}
+-DEPENDS protoc-bin ${PROJECT_PROTOS}
++COMMAND protoc -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/proto/ ${PROJECT_PROTOS}
++DEPENDS ${PROJECT_PROTOS}
+ )
+ 
+ IF(WIN32)
+-- 
+2.6.3
+
diff --git a/pkgs/games/dwarf-fortress/dwarf-fortress-hacked.in b/pkgs/games/dwarf-fortress/dwarf-fortress-hacked.in
deleted file mode 100644
index 027720fc3785..000000000000
--- a/pkgs/games/dwarf-fortress/dwarf-fortress-hacked.in
+++ /dev/null
@@ -1,13 +0,0 @@
-#!@stdenv_shell@
-
-data_dir=${XDG_DATA_HOME:-$HOME/.local/share}/df_linux
-pkg_dir=@prefix@/share/df_linux
-
-. $pkg_dir/shell/install-df-data-to-home.sh
-. $pkg_dir/shell/install-dfhack-data-to-home.sh
-. $pkg_dir/shell/install-df-data-content-to-home.sh
-. $pkg_dir/shell/export-libs.sh
-. $pkg_dir/shell/export-workaround.sh
-
-cd "$data_dir"
-exec ./dfhack "$@"
diff --git a/pkgs/games/dwarf-fortress/dwarf-fortress.in b/pkgs/games/dwarf-fortress/dwarf-fortress.in
deleted file mode 100644
index db06d34efd05..000000000000
--- a/pkgs/games/dwarf-fortress/dwarf-fortress.in
+++ /dev/null
@@ -1,14 +0,0 @@
-#!@stdenv_shell@
-
-set -ex
-
-data_dir=${XDG_DATA_HOME:-$HOME/.local/share}/df_linux
-pkg_dir=@prefix@/share/df_linux
-
-. $pkg_dir/shell/install-df-data-to-home.sh
-. $pkg_dir/shell/install-df-data-content-to-home.sh
-. $pkg_dir/shell/export-libs.sh
-. $pkg_dir/shell/export-workaround.sh
-
-cd $data_dir
-$pkg_dir/libs/Dwarf_Fortress "$@"
diff --git a/pkgs/games/dwarf-fortress/export-libs.sh.in b/pkgs/games/dwarf-fortress/export-libs.sh.in
deleted file mode 100644
index 453295ca6ddb..000000000000
--- a/pkgs/games/dwarf-fortress/export-libs.sh.in
+++ /dev/null
@@ -1,12 +0,0 @@
-export LD_LIBRARY_PATH=\
-@stdenv_cc@/lib:\
-@SDL@/lib:\
-@SDL_image@/lib/:\
-@SDL_ttf@/lib/:\
-@gtk2@/lib/:\
-@glib@/lib/:\
-@mesa@/lib/:\
-@openal@/lib/:\
-@libsndfile@/lib:\
-@zlib@/lib:\
-$data_dir/df_linux/libs/
diff --git a/pkgs/games/dwarf-fortress/export-workaround.sh b/pkgs/games/dwarf-fortress/export-workaround.sh
deleted file mode 100644
index 716d171625c3..000000000000
--- a/pkgs/games/dwarf-fortress/export-workaround.sh
+++ /dev/null
@@ -1 +0,0 @@
-export SDL_DISABLE_LOCK_KEYS=1  # Work around for bug in Debian/Ubuntu SDL patch.
diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
new file mode 100644
index 000000000000..06154e1e57a0
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -0,0 +1,52 @@
+{ stdenv, lib, fetchurl
+, SDL, dwarf-fortress-unfuck
+}:
+
+let
+  baseVersion = "42";
+  patchVersion = "05";
+  dfVersion = "0.${baseVersion}.${patchVersion}";
+  libpath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc dwarf-fortress-unfuck SDL ];
+
+in
+
+assert dwarf-fortress-unfuck.dfVersion == dfVersion;
+
+stdenv.mkDerivation {
+  name = "dwarf-fortress-original-${dfVersion}";
+
+  src = fetchurl {
+    url = "http://www.bay12games.com/dwarves/df_${baseVersion}_${patchVersion}_linux.tar.bz2";
+    sha256 = "0g7r0v2lsqj9ryxh12q8yrk96bgs00rf2ncw228cwwqgmps3xcws";
+  };
+
+  installPhase = ''
+    mkdir -p $out
+    cp -r * $out
+    rm $out/libs/lib*
+
+    # Store the original hash
+    orig_hash=$(md5sum $out/libs/Dwarf_Fortress | awk '{ print $1 }')
+    echo $orig_hash | cut -c1-8 > $out/hash.md5.orig  # for dwarf-therapist
+    echo $orig_hash > $out/full-hash-orig.md5  # for dfhack
+
+    patchelf \
+      --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \
+      --set-rpath "${libpath}" \
+      $out/libs/Dwarf_Fortress
+
+    # Store new hash
+    patched_hash=$(md5sum $out/libs/Dwarf_Fortress | awk '{ print $1 }')
+    echo $patched_hash | cut -c1-8 > $out/hash.md5.patched  # for dwarf-therapist
+    echo $patched_hash > $out/full-hash-patched.md5  # for dfhack
+  '';
+
+  passthru = { inherit baseVersion patchVersion dfVersion; };
+
+  meta = {
+    description = "A single-player fantasy game with a randomly generated adventure world";
+    homepage = http://www.bay12games.com/dwarves;
+    license = lib.licenses.unfreeRedistributable;
+    maintainers = with lib.maintainers; [ a1russell robbinch roconnor the-kenny abbradar ];
+  };
+}
diff --git a/pkgs/games/dwarf-fortress/install-df-data-content-to-home.sh b/pkgs/games/dwarf-fortress/install-df-data-content-to-home.sh
deleted file mode 100644
index 600af6773223..000000000000
--- a/pkgs/games/dwarf-fortress/install-df-data-content-to-home.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-for link in announcement art dipscript help index initial_movies movies shader.fs shader.vs sound speech; do
-  cp -r $pkg_dir/data/$link "$data_dir/data/$link"
-  chmod -R u+rw "$data_dir/data/$link"
-done
diff --git a/pkgs/games/dwarf-fortress/install-df-data-to-home.sh b/pkgs/games/dwarf-fortress/install-df-data-to-home.sh
deleted file mode 100644
index 42c8c4648092..000000000000
--- a/pkgs/games/dwarf-fortress/install-df-data-to-home.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-mkdir -p $data_dir
-if [[ $(readlink $data_dir/raw) != "$pkg_dir/raw" ]]; then
-  rm -f $data_dir/raw
-  ln -s $pkg_dir/raw $data_dir/raw
-fi
-if [[ $(readlink $data_dir/libs) != "$pkg_dir/libs" ]]; then
-  rm -f $data_dir/libs
-  ln -s $pkg_dir/libs $data_dir/libs
-fi
-mkdir -p "$data_dir/data"
-cp -rn $pkg_dir/data/init $data_dir/data/init
-chmod -R u+rw $data_dir/data/init
diff --git a/pkgs/games/dwarf-fortress/install-dfhack-data-to-home.sh b/pkgs/games/dwarf-fortress/install-dfhack-data-to-home.sh
deleted file mode 100644
index 9d316fde9495..000000000000
--- a/pkgs/games/dwarf-fortress/install-dfhack-data-to-home.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-if [[ $(readlink $data_dir/hack) != "$pkg_dir/hack" ]]; then
-  rm -f $data_dir/hack
-  ln -s $pkg_dir/hack $data_dir/hack
-fi
-if [[ $(readlink $data_dir/dfhack) != "$pkg_dir/dfhack" ]]; then
-  rm -f $data_dir/dfhack
-  ln -s $pkg_dir/dfhack $data_dir/dfhack
-fi
-if [[ $(readlink $data_dir/dfhack.init-example) != "$pkg_dir/dfhack.init-example" ]]; then
-  rm -f $data_dir/dfhack.init-example
-  ln -s $pkg_dir/dfhack.init-example $data_dir/dfhack.init-example
-fi
-if [[ $(readlink $data_dir/dfhack-run) != "$pkg_dir/dfhack-run" ]]; then
-  rm -f $data_dir/dfhack-run
-  ln -s $pkg_dir/dfhack-run $data_dir/dfhack-run
-fi
diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
new file mode 100644
index 000000000000..92f4a954330d
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchgit, cmake
+, mesa, SDL, SDL_image, SDL_ttf, glew, openalSoft
+, ncurses, glib, gtk2, libsndfile
+}:
+
+stdenv.mkDerivation {
+  name = "dwarf_fortress_unfuck-20160118";
+
+  src = fetchgit {
+    url = "https://github.com/svenstaro/dwarf_fortress_unfuck";
+    rev = "9a796c6d3cd7d41784e9d1d22a837a1ee0ff8553";
+    sha256 = "0ibxdn684zpk3v2gigardq6z9mydc2s9hns8hlxjyyyhnk1ar61g";
+  };
+
+  cmakeFlags = [
+    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
+    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include"
+  ];
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [
+    mesa SDL SDL_image SDL_ttf glew openalSoft
+    ncurses gtk2 libsndfile
+  ];
+
+  installPhase = ''
+    install -D -m755 ../build/libgraphics.so $out/lib/libgraphics.so
+  '';
+
+  enableParallelBuilding = true;
+
+  passthru.dfVersion = "0.42.05";
+
+  meta = with stdenv.lib; {
+    description = "Unfucked multimedia layer for Dwarf Fortress";
+    homepage = https://github.com/svenstaro/dwarf_fortress_unfuck;
+    license = licenses.free;
+    platforms = [ "i686-linux" ];
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
new file mode 100644
index 000000000000..516cf347066b
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, lib, dwarf-fortress-original, substituteAll
+, enableDFHack ? false, dfhack
+}:
+
+assert enableDFHack -> (dfhack.dfVersion == dwarf-fortress-original.dfVersion);
+
+stdenv.mkDerivation rec {
+  name = "dwarf-fortress-${dwarf-fortress-original.dfVersion}";
+
+  runDF = ./dwarf-fortress.in;
+  runDFHack = ./dfhack.in;
+  dfInit = substituteAll {
+    name = "dwarf-fortress-init";
+    src = ./dwarf-fortress-init.in;
+    dwarfFortress = dwarf-fortress-original;
+  };
+  inherit dfhack;
+  df = dwarf-fortress-original;
+
+  buildCommand = ''
+    mkdir -p $out/bin
+
+    substitute $runDF $out/bin/dwarf-fortress \
+      --subst-var-by stdenv_shell ${stdenv.shell} \
+      --subst-var dfInit
+    chmod 755 $out/bin/dwarf-fortress
+  '' + lib.optionalString enableDFHack ''
+    mkdir -p $out/hack
+    substitute $dfhack/hack/symbols.xml $out/hack/symbols.xml \
+      --replace $(cat $df/full-hash-orig.md5) $(cat $df/full-hash-patched.md5)
+
+    substitute $runDFHack $out/bin/dfhack \
+      --subst-var-by stdenv_shell ${stdenv.shell} \
+      --subst-var dfInit \
+      --subst-var dfhack \
+      --subst-var-by dfhackWrapper $out
+    chmod 755 $out/bin/dfhack
+  '';
+
+  preferLocalBuild = true;
+
+  meta = {
+    description = "A single-player fantasy game with a randomly generated adventure world";
+    homepage = http://www.bay12games.com/dwarves;
+    maintainers = with lib.maintainers; [ a1russell robbinch roconnor the-kenny ];
+  };
+}
diff --git a/pkgs/games/dwarf-fortress/wrapper/dfhack.in b/pkgs/games/dwarf-fortress/wrapper/dfhack.in
new file mode 100644
index 000000000000..af2afa57e9df
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/wrapper/dfhack.in
@@ -0,0 +1,17 @@
+#!@stdenv_shell@ -e
+
+hack_dir="@dfhack@"
+hack_wrap_dir="@dfhackWrapper@"
+
+source @dfInit@
+
+cd "$hack_dir"
+for i in dfhack.init-example dfhack-config/default hack/!(symbols.xml|*.so|dfhack-run|binpatch); do
+  update_path "$hack_dir" "$i"
+done
+
+update_path "$hack_wrap_dir" "hack/symbols.xml"
+
+cd "$DF_DIR"
+LD_LIBRARY_PATH="$hack_dir/hack/libs:$hack_dir/hack:$LD_LIBRARY_PATH" \
+  LD_PRELOAD=$hack_dir/hack/libdfhack.so exec $game_dir/libs/Dwarf_Fortress "$@"
diff --git a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
new file mode 100644
index 000000000000..ac59934f767d
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
@@ -0,0 +1,43 @@
+shopt -s extglob
+
+[ -z "$DF_DIR" ] && DF_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/df_linux"
+game_dir="@dwarfFortress@"
+
+update_path() {
+  local pkg_dir="$1"
+  local path="$2"
+
+  mkdir -p "$DF_DIR/$(dirname "$path")"
+  # If user has replaced these data directories, let them stay.
+  if [ ! -e "$DF_DIR/$path" ] || [ -L "$DF_DIR/$path" ]; then
+    rm -f "$DF_DIR/$path"
+    ln -s "$pkg_dir/$path" "$DF_DIR/$path"
+  fi
+}
+
+forcecopy_path() {
+  local pkg_dir="$1"
+  local path="$2"
+
+  mkdir -p "$DF_DIR/$(dirname "$path")"
+  rm -rf "$DF_DIR/$path"
+  cp -rL --no-preserve=all "$pkg_dir/$path" "$DF_DIR/$path"
+}
+
+mkdir -p "$DF_DIR"
+
+cat <<EOF >&2
+Using $DF_DIR as Dwarf Fortress overlay directory.
+If you do any changes in it, don't forget to clean it when updating the game version!
+We try to detect changes based on data directories being symbolic links -- keep this in mind.
+
+EOF
+
+cd "$game_dir"
+for i in data/init/* data/!(init|index|announcement) raw; do
+  update_path "$game_dir" "$i"
+done
+
+forcecopy_path "$game_dir" data/index
+# For some reason, it's needed to be writable...
+forcecopy_path "$game_dir" data/announcement
diff --git a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in
new file mode 100644
index 000000000000..28f89e8117e8
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in
@@ -0,0 +1,6 @@
+#!@stdenv_shell@ -e
+
+source @dfInit@
+
+cd "$DF_DIR"
+exec $game_dir/libs/Dwarf_Fortress "$@"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9b96d00a74d..41c8dadeffb0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14104,21 +14104,13 @@ let
 
   cuyo = callPackage ../games/cuyo { };
 
-  dfhack = callPackage_i686 ../games/dfhack {
-    inherit (pkgsi686Linux.perlPackages) XMLLibXML XMLLibXSLT;
-  };
-
   dhewm3 = callPackage ../games/dhewm3 {};
 
   drumkv1 = callPackage ../applications/audio/drumkv1 { };
 
-  dwarf_fortress = callPackage_i686 ../games/dwarf-fortress {
-    SDL_image = pkgsi686Linux.SDL_image.override {
-      libpng = pkgsi686Linux.libpng12;
-    };
-    inherit (pkgsi686Linux.perlPackages) XMLLibXML XMLLibXSLT;
-    enableDFHack = config.dwarfFortress.enableDFHack or false;
-  };
+  dwarf-fortress-packages = callPackage ../games/dwarf-fortress { };
+
+  dwarf-fortress = dwarf-fortress-packages.dwarf-fortress.override { };
 
   dwarf-therapist = callPackage ../games/dwarf-therapist { };
 
@@ -15956,6 +15948,7 @@ aliases = with self; rec {
   aircrackng = aircrack-ng; # added 2016-01-14
   quake3game = ioquake3; # added 2016-01-14
   scim = sc-im; # added 2016-01-22
+  dwarf_fortress = dwarf-fortress; # added 2016-01-23
 };
 
 tweakAlias = _n: alias: with lib;

From fdae86fb4e3234441987d9164f6f5b7e2d15d0c3 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 12 Jan 2016 21:17:46 +0300
Subject: [PATCH 0569/2285] dwarf-therapist: 31.0.0 -> 36.0.0

---
 pkgs/games/dwarf-fortress/default.nix         |  8 ++++
 .../dwarf-therapist/default.nix               | 40 ++++++++++++++++
 .../dwarf-therapist/wrapper.nix               | 41 ++++++++++++++++
 pkgs/games/dwarf-therapist/default.nix        | 48 -------------------
 pkgs/top-level/all-packages.nix               |  2 +-
 5 files changed, 90 insertions(+), 49 deletions(-)
 create mode 100644 pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
 create mode 100644 pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
 delete mode 100644 pkgs/games/dwarf-therapist/default.nix

diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index d73f932ac032..84b5f2b0f4b6 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -14,6 +14,14 @@ let
     dwarf-fortress-unfuck = callPackage_i686 ./unfuck.nix { };
 
     dwarf-fortress = callPackage ./wrapper { };
+
+    dwarf-therapist-original = callPackage ./dwarf-therapist {
+      texlive = pkgs.texlive.combine {
+        inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem;
+      };
+    };
+
+    dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix { };
   };
 
 in self
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
new file mode 100644
index 000000000000..07714168e0e8
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, fetchFromGitHub, coreutils, qt4, texlive }:
+
+let
+  version = "36.0.0";
+in
+stdenv.mkDerivation {
+  name = "dwarf-therapist-original-${version}";
+
+  src = fetchFromGitHub {
+    owner = "splintermind";
+    repo = "Dwarf-Therapist";
+    rev = "v${version}";
+    sha256 = "08xjawb25sibkkfqwd4mlq73dgmgc6lxbbd673rx7yhrsjh4z4h3";
+  };
+
+  outputs = [ "out" "layouts" ];
+  buildInputs = [ qt4 ];
+  nativeBuildInputs = [ texlive ];
+
+  enableParallelBuilding = false;
+
+  configurePhase = ''
+    qmake PREFIX=$out
+  '';
+
+  # Move layout files so they cannot be found by Therapist
+  postInstall = ''
+    mkdir -p $layouts
+    mv $out/share/dwarftherapist/memory_layouts/* $layouts
+    rmdir $out/share/dwarftherapist/memory_layouts
+  '';
+
+  meta = {
+    description = "Tool to manage dwarves in in a running game of Dwarf Fortress";
+    maintainers = with stdenv.lib.maintainers; [ the-kenny abbradar ];
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.linux;
+    homepage = https://code.google.com/r/splintermind-attributes/;
+  };
+}
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
new file mode 100644
index 000000000000..6b138ac51029
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
@@ -0,0 +1,41 @@
+{ buildEnv, lib, dwarf-therapist-original, dwarf-fortress-original, makeWrapper }:
+
+let
+  df = dwarf-fortress-original;
+  dt = dwarf-therapist-original;
+  inifile = "linux/v0${df.baseVersion}.${df.patchVersion}.ini";
+  dfHashFile = "${df}/hash.md5";
+
+in buildEnv {
+  name = "dwarf-therapist-${lib.getVersion dt}";
+
+  paths = [ dt ];
+
+  buildInputs = [ makeWrapper ];
+
+  postBuild = ''
+    # DwarfTherapist assumes it's run in $out/share/dwarftherapist and
+    # therefore uses many relative paths.
+    rm $out/bin
+    mkdir $out/bin
+    makeWrapper ${dt}/bin/DwarfTherapist $out/bin/DwarfTherapist \
+      --run "cd $out/share/dwarftherapist"
+
+    # Fix checksum of memory access directives. We really need #4621 fixed!
+    recreate_dir() {
+      rm "$out/$1"
+      mkdir -p "$out/$1"
+      for i in "${dt}/$1/"*; do
+        ln -s "$i" "$out/$1"
+      done
+    }
+
+    recreate_dir share
+    recreate_dir share/dwarftherapist
+    mkdir -p $out/share/dwarftherapist/memory_layouts/linux
+    substitute \
+      ${dt.layouts}/${inifile} \
+      $out/share/dwarftherapist/memory_layouts/${inifile} \
+      --replace $(cat "${dfHashFile}.orig") $(cat "${dfHashFile}.patched")
+  '';
+}
diff --git a/pkgs/games/dwarf-therapist/default.nix b/pkgs/games/dwarf-therapist/default.nix
deleted file mode 100644
index 4e676bf5f9df..000000000000
--- a/pkgs/games/dwarf-therapist/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, coreutils, fetchgit, qt4, dwarf_fortress, bash, makeWrapper }:
-
-let
-  version = "31.0.0";
-  df = dwarf_fortress;
-in
-stdenv.mkDerivation rec {
-  name = "dwarf-therapist-${version}";
-
-  src = fetchgit {
-    url = "https://github.com/splintermind/Dwarf-Therapist.git";
-    rev = "refs/tags/v${version}";
-    sha256 = "02d6k8c3vm401v04ln9q405njarx869jpfyf42lwskijrzjygk9x";
-  };
-
-  # Needed for hashing
-  dfHashFile = "${df}/share/df_linux/hash.md5";
-
-  buildInputs = [ coreutils qt4 df makeWrapper ];
-  enableParallelBuilding = false;
-
-  configurePhase = ''
-    qmake PREFIX=$out
-  '';
-
-  postInstall = ''
-    # DwarfTherapist assumes it's run in $out/share/dwarftherapist and
-    # therefore uses many relative paths.
-    rm $out/bin/dwarftherapist
-    wrapProgram $out/bin/DwarfTherapist \
-      --run "cd $out/share/dwarftherapist"
-  '';
-
-  postFixup = ''
-    # Fix checksum of memory access directives
-    substituteInPlace $out/share/dwarftherapist/memory_layouts/linux/v0${df.baseVersion}.${df.patchVersion}.ini \
-      --replace $(cat "${dfHashFile}.orig") $(cat "${dfHashFile}.patched")
-  '';
-
-  meta = {
-    description = "Tool to manage dwarves in in a running game of Dwarf Fortress";
-    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
-    license = stdenv.lib.licenses.mit;
-    platforms = stdenv.lib.platforms.linux;
-    hydraPlatforms = [];
-    homepage = https://code.google.com/r/splintermind-attributes/;
-  };
-} 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 41c8dadeffb0..c7aa0c8cc0b7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14112,7 +14112,7 @@ let
 
   dwarf-fortress = dwarf-fortress-packages.dwarf-fortress.override { };
 
-  dwarf-therapist = callPackage ../games/dwarf-therapist { };
+  dwarf-therapist = dwarf-fortress-packages.dwarf-therapist;
 
   d1x_rebirth = callPackage ../games/d1x-rebirth { };
 

From 6c9dd963776d108ef05700fe843f1a285e3d7182 Mon Sep 17 00:00:00 2001
From: Adam Russell <adamlr6+pub@gmail.com>
Date: Thu, 26 Nov 2015 21:26:44 -0600
Subject: [PATCH 0570/2285] dwarf-fortress: add phoebus

---
 pkgs/games/dwarf-fortress/themes/phoebus.nix | 36 ++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 pkgs/games/dwarf-fortress/themes/phoebus.nix

diff --git a/pkgs/games/dwarf-fortress/themes/phoebus.nix b/pkgs/games/dwarf-fortress/themes/phoebus.nix
new file mode 100644
index 000000000000..a26abf207d4f
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/themes/phoebus.nix
@@ -0,0 +1,36 @@
+{ dfBaseVersion
+, dfPatchVersion
+, fetchzip
+, ...
+}:
+
+let
+
+  phoebusVersion = "00";
+  phoebusFileName = "Phoebus_${dfBaseVersion}_${dfPatchVersion}v${phoebusVersion}";
+
+in rec {
+
+  src = fetchzip {
+    name = phoebusFileName;
+    url = "http://dffd.bay12games.com/download.php?id=2430&f=${phoebusFileName}.zip";
+    sha256 = "0fb68r6fd7v67mbh2439ygqrmdk4pw94gd293fqxb9qg71ilrb6s";
+    stripRoot = false;
+  };
+
+  sourceRoot = src.name;
+
+  installPhase = ''
+    pushd ../../$themeSourceRoot
+
+    cp data/init/phoebus/* $out/share/df_linux/data/init/
+    cp -rT raw $out/share/df_linux/raw
+    mkdir -p $out/share/df_linux/data/config
+    cp data/config/* $out/share/df_linux/data/config/
+    cp data/art/* $out/share/df_linux/data/art/
+
+    popd
+  '';
+
+}
+

From 7fe01a7279a8a9630ac42b2c7c9dd291c4a7a9a9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 20 Jan 2016 00:43:52 +0300
Subject: [PATCH 0571/2285] phoebus-theme: update for 0.42.05, make a
 derivation

Also specify license, see https://github.com/fricy/Phoebus/issues/5
---
 pkgs/games/dwarf-fortress/default.nix        |  2 +
 pkgs/games/dwarf-fortress/themes/phoebus.nix | 51 +++++++++-----------
 2 files changed, 26 insertions(+), 27 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index 84b5f2b0f4b6..317b532ecbe6 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -22,6 +22,8 @@ let
     };
 
     dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix { };
+
+    phoebus-theme = callPackage ./themes/phoebus.nix { };
   };
 
 in self
diff --git a/pkgs/games/dwarf-fortress/themes/phoebus.nix b/pkgs/games/dwarf-fortress/themes/phoebus.nix
index a26abf207d4f..2183a6245c0c 100644
--- a/pkgs/games/dwarf-fortress/themes/phoebus.nix
+++ b/pkgs/games/dwarf-fortress/themes/phoebus.nix
@@ -1,36 +1,33 @@
-{ dfBaseVersion
-, dfPatchVersion
-, fetchzip
-, ...
-}:
+{ stdenv, fetchFromGitHub }:
 
-let
+# On upgrade check https://github.com/fricy/Phoebus/blob/master/manifest.json
+# for compatibility information.
 
-  phoebusVersion = "00";
-  phoebusFileName = "Phoebus_${dfBaseVersion}_${dfPatchVersion}v${phoebusVersion}";
+stdenv.mkDerivation {
+  name = "phoebus-theme-20160118";
 
-in rec {
-
-  src = fetchzip {
-    name = phoebusFileName;
-    url = "http://dffd.bay12games.com/download.php?id=2430&f=${phoebusFileName}.zip";
-    sha256 = "0fb68r6fd7v67mbh2439ygqrmdk4pw94gd293fqxb9qg71ilrb6s";
-    stripRoot = false;
+  src = fetchFromGitHub {
+    owner = "fricy";
+    repo = "Phoebus";
+    rev = "2c5777b0f307b1d752a8a484c6a05b67531c84a9";
+    sha256 = "0a5ixm181wz7crr3rpa2mh0drb371j5hvizqninvdnhah2mypz8v";
   };
 
-  sourceRoot = src.name;
-
   installPhase = ''
-    pushd ../../$themeSourceRoot
-
-    cp data/init/phoebus/* $out/share/df_linux/data/init/
-    cp -rT raw $out/share/df_linux/raw
-    mkdir -p $out/share/df_linux/data/config
-    cp data/config/* $out/share/df_linux/data/config/
-    cp data/art/* $out/share/df_linux/data/art/
-
-    popd
+    mkdir $out
+    cp -r data raw $out
   '';
 
-}
+  passthru.dfVersion = "0.42.05";
 
+  preferLocalBuild = true;
+
+  meta = with stdenv.lib; {
+    description = "Phoebus graphics set for Dwarf Fortress";
+    homepage = "http://www.bay12forums.com/smf/index.php?topic=137096.0";
+    platforms = platforms.all;
+    maintainers = with maintainers; [ a1russell abbradar ];
+    # https://github.com/fricy/Phoebus/issues/5
+    license = licenses.free;
+  };
+}

From d3b642ce9ad056b60d8cfa576dd3fa800ec57ba4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 20 Jan 2016 00:44:33 +0300
Subject: [PATCH 0572/2285] dwarf-fortress-wrapper: add themes support

Theme can be specified either as a derivation or as a string, in which
case it will be taken by name from a pre-defined set of themes available in
nixpkgs.
---
 pkgs/games/dwarf-fortress/default.nix         |  8 ++-
 pkgs/games/dwarf-fortress/wrapper/default.nix | 61 +++++++++++++------
 pkgs/games/dwarf-fortress/wrapper/dfhack.in   | 14 ++---
 .../wrapper/dwarf-fortress-init.in            | 20 +++---
 .../dwarf-fortress/wrapper/dwarf-fortress.in  |  2 +-
 5 files changed, 61 insertions(+), 44 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index 317b532ecbe6..d91c110c34c0 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -4,7 +4,7 @@ let
   callPackage = pkgs.newScope self;
   callPackage_i686 = pkgsi686Linux.newScope self;
 
-  self = {
+  self = rec {
     dwarf-fortress-original = callPackage_i686 ./game.nix { };
 
     dfhack = callPackage_i686 ./dfhack {
@@ -13,7 +13,11 @@ let
 
     dwarf-fortress-unfuck = callPackage_i686 ./unfuck.nix { };
 
-    dwarf-fortress = callPackage ./wrapper { };
+    dwarf-fortress = callPackage ./wrapper {
+      themes = {
+        "phoebus" = phoebus-theme;
+      };
+    };
 
     dwarf-therapist-original = callPackage ./dwarf-therapist {
       texlive = pkgs.texlive.combine {
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index 516cf347066b..95ff0821d708 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -1,21 +1,54 @@
-{ stdenv, lib, dwarf-fortress-original, substituteAll
+{ stdenv, lib, buildEnv, dwarf-fortress-original, substituteAll
 , enableDFHack ? false, dfhack
+, themes ? {}
+, theme ? null
 }:
 
-assert enableDFHack -> (dfhack.dfVersion == dwarf-fortress-original.dfVersion);
+let
+  ptheme =
+    if builtins.isString theme
+    then builtins.getAttr theme themes
+    else theme;
+
+  # These are in inverse order for first packages to override the next ones.
+  pkgs = lib.optional (theme != null) ptheme
+         ++ lib.optional enableDFHack dfhack
+         ++ [ dwarf-fortress-original ];
+
+  env = buildEnv {
+    name = "dwarf-fortress-env-${dwarf-fortress-original.dfVersion}";
+    paths = pkgs;
+    ignoreCollisions = true;
+    postBuild = lib.optionalString enableDFHack ''
+      # #4621
+      if [ -L "$out/hack" ]; then
+        rm $out/hack
+        mkdir $out/hack
+        for i in ${dfhack}/hack/*; do
+          ln -s $i $out/hack
+        done
+      fi
+      rm $out/hack/symbols.xml
+      substitute ${dfhack}/hack/symbols.xml $out/hack/symbols.xml \
+        --replace $(cat ${dwarf-fortress-original}/full-hash-orig.md5) \
+                  $(cat ${dwarf-fortress-original}/full-hash-patched.md5)
+    '';
+  };
+in
+
+assert lib.all (x: x.dfVersion == dwarf-fortress-original.dfVersion) pkgs;
 
 stdenv.mkDerivation rec {
   name = "dwarf-fortress-${dwarf-fortress-original.dfVersion}";
 
-  runDF = ./dwarf-fortress.in;
-  runDFHack = ./dfhack.in;
   dfInit = substituteAll {
     name = "dwarf-fortress-init";
     src = ./dwarf-fortress-init.in;
-    dwarfFortress = dwarf-fortress-original;
+    inherit env;
   };
-  inherit dfhack;
-  df = dwarf-fortress-original;
+
+  runDF = ./dwarf-fortress.in;
+  runDFHack = ./dfhack.in;
 
   buildCommand = ''
     mkdir -p $out/bin
@@ -25,23 +58,11 @@ stdenv.mkDerivation rec {
       --subst-var dfInit
     chmod 755 $out/bin/dwarf-fortress
   '' + lib.optionalString enableDFHack ''
-    mkdir -p $out/hack
-    substitute $dfhack/hack/symbols.xml $out/hack/symbols.xml \
-      --replace $(cat $df/full-hash-orig.md5) $(cat $df/full-hash-patched.md5)
-
     substitute $runDFHack $out/bin/dfhack \
       --subst-var-by stdenv_shell ${stdenv.shell} \
-      --subst-var dfInit \
-      --subst-var dfhack \
-      --subst-var-by dfhackWrapper $out
+      --subst-var dfInit
     chmod 755 $out/bin/dfhack
   '';
 
   preferLocalBuild = true;
-
-  meta = {
-    description = "A single-player fantasy game with a randomly generated adventure world";
-    homepage = http://www.bay12games.com/dwarves;
-    maintainers = with lib.maintainers; [ a1russell robbinch roconnor the-kenny ];
-  };
 }
diff --git a/pkgs/games/dwarf-fortress/wrapper/dfhack.in b/pkgs/games/dwarf-fortress/wrapper/dfhack.in
index af2afa57e9df..d53769ca4b61 100644
--- a/pkgs/games/dwarf-fortress/wrapper/dfhack.in
+++ b/pkgs/games/dwarf-fortress/wrapper/dfhack.in
@@ -1,17 +1,11 @@
 #!@stdenv_shell@ -e
 
-hack_dir="@dfhack@"
-hack_wrap_dir="@dfhackWrapper@"
-
 source @dfInit@
 
-cd "$hack_dir"
-for i in dfhack.init-example dfhack-config/default hack/!(symbols.xml|*.so|dfhack-run|binpatch); do
-  update_path "$hack_dir" "$i"
+for i in dfhack.init-example dfhack-config/default hack/*; do
+  update_path "$i"
 done
 
-update_path "$hack_wrap_dir" "hack/symbols.xml"
-
 cd "$DF_DIR"
-LD_LIBRARY_PATH="$hack_dir/hack/libs:$hack_dir/hack:$LD_LIBRARY_PATH" \
-  LD_PRELOAD=$hack_dir/hack/libdfhack.so exec $game_dir/libs/Dwarf_Fortress "$@"
+LD_LIBRARY_PATH="$env_dir/hack/libs:$env_dir/hack:$LD_LIBRARY_PATH" \
+  LD_PRELOAD=$env_dir/hack/libdfhack.so exec $env_dir/libs/Dwarf_Fortress "$@"
diff --git a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
index ac59934f767d..1fd6178895db 100644
--- a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
+++ b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
@@ -1,27 +1,25 @@
 shopt -s extglob
 
 [ -z "$DF_DIR" ] && DF_DIR="${XDG_DATA_HOME:-$HOME/.local/share}/df_linux"
-game_dir="@dwarfFortress@"
+env_dir="@env@"
 
 update_path() {
-  local pkg_dir="$1"
-  local path="$2"
+  local path="$1"
 
   mkdir -p "$DF_DIR/$(dirname "$path")"
   # If user has replaced these data directories, let them stay.
   if [ ! -e "$DF_DIR/$path" ] || [ -L "$DF_DIR/$path" ]; then
     rm -f "$DF_DIR/$path"
-    ln -s "$pkg_dir/$path" "$DF_DIR/$path"
+    ln -s "$env_dir/$path" "$DF_DIR/$path"
   fi
 }
 
 forcecopy_path() {
-  local pkg_dir="$1"
-  local path="$2"
+  local path="$1"
 
   mkdir -p "$DF_DIR/$(dirname "$path")"
   rm -rf "$DF_DIR/$path"
-  cp -rL --no-preserve=all "$pkg_dir/$path" "$DF_DIR/$path"
+  cp -rL --no-preserve=all "$env_dir/$path" "$DF_DIR/$path"
 }
 
 mkdir -p "$DF_DIR"
@@ -33,11 +31,11 @@ We try to detect changes based on data directories being symbolic links -- keep
 
 EOF
 
-cd "$game_dir"
+cd "$env_dir"
 for i in data/init/* data/!(init|index|announcement) raw; do
-  update_path "$game_dir" "$i"
+  update_path "$i"
 done
 
-forcecopy_path "$game_dir" data/index
+forcecopy_path data/index
 # For some reason, it's needed to be writable...
-forcecopy_path "$game_dir" data/announcement
+forcecopy_path data/announcement
diff --git a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in
index 28f89e8117e8..f405f1b0e393 100644
--- a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in
+++ b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress.in
@@ -3,4 +3,4 @@
 source @dfInit@
 
 cd "$DF_DIR"
-exec $game_dir/libs/Dwarf_Fortress "$@"
+exec "$env_dir/libs/Dwarf_Fortress" "$@"

From 82a0dde83c1624dabd74a0bf39dd5f7504493f3f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 23 Jan 2016 23:57:58 +0300
Subject: [PATCH 0573/2285] dwarf-fortress: remove short md5 sums

---
 pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix |  4 +++-
 pkgs/games/dwarf-fortress/game.nix                    | 10 +++-------
 pkgs/games/dwarf-fortress/wrapper/default.nix         |  4 ++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
index 6b138ac51029..a16c1284a672 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/wrapper.nix
@@ -33,9 +33,11 @@ in buildEnv {
     recreate_dir share
     recreate_dir share/dwarftherapist
     mkdir -p $out/share/dwarftherapist/memory_layouts/linux
+    origmd5=$(cat "${dfHashFile}.orig" | cut -c1-8)
+    patchedmd5=$(cat "${dfHashFile}" | cut -c1-8)
     substitute \
       ${dt.layouts}/${inifile} \
       $out/share/dwarftherapist/memory_layouts/${inifile} \
-      --replace $(cat "${dfHashFile}.orig") $(cat "${dfHashFile}.patched")
+      --replace "$origmd5" "$patchedmd5"
   '';
 }
diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
index 06154e1e57a0..7e0c1b34af74 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -26,19 +26,15 @@ stdenv.mkDerivation {
     rm $out/libs/lib*
 
     # Store the original hash
-    orig_hash=$(md5sum $out/libs/Dwarf_Fortress | awk '{ print $1 }')
-    echo $orig_hash | cut -c1-8 > $out/hash.md5.orig  # for dwarf-therapist
-    echo $orig_hash > $out/full-hash-orig.md5  # for dfhack
+    md5sum $out/libs/Dwarf_Fortress | awk '{ print $1 }' > $out/hash.md5.orig
 
     patchelf \
       --set-interpreter $(cat ${stdenv.cc}/nix-support/dynamic-linker) \
       --set-rpath "${libpath}" \
       $out/libs/Dwarf_Fortress
 
-    # Store new hash
-    patched_hash=$(md5sum $out/libs/Dwarf_Fortress | awk '{ print $1 }')
-    echo $patched_hash | cut -c1-8 > $out/hash.md5.patched  # for dwarf-therapist
-    echo $patched_hash > $out/full-hash-patched.md5  # for dfhack
+    # Store the new hash
+    md5sum $out/libs/Dwarf_Fortress | awk '{ print $1 }' > $out/hash.md5
   '';
 
   passthru = { inherit baseVersion patchVersion dfVersion; };
diff --git a/pkgs/games/dwarf-fortress/wrapper/default.nix b/pkgs/games/dwarf-fortress/wrapper/default.nix
index 95ff0821d708..5493cdb3faf6 100644
--- a/pkgs/games/dwarf-fortress/wrapper/default.nix
+++ b/pkgs/games/dwarf-fortress/wrapper/default.nix
@@ -30,8 +30,8 @@ let
       fi
       rm $out/hack/symbols.xml
       substitute ${dfhack}/hack/symbols.xml $out/hack/symbols.xml \
-        --replace $(cat ${dwarf-fortress-original}/full-hash-orig.md5) \
-                  $(cat ${dwarf-fortress-original}/full-hash-patched.md5)
+        --replace $(cat ${dwarf-fortress-original}/hash.md5.orig) \
+                  $(cat ${dwarf-fortress-original}/hash.md5)
     '';
   };
 in

From 1bfe78be717728d9ff185e805a37454bd9d95956 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 26 Jan 2016 00:49:50 +0100
Subject: [PATCH 0574/2285] bashburn: init at 3.1.0

---
 pkgs/tools/cd-dvd/bashburn/default.nix | 64 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 +
 2 files changed, 66 insertions(+)
 create mode 100644 pkgs/tools/cd-dvd/bashburn/default.nix

diff --git a/pkgs/tools/cd-dvd/bashburn/default.nix b/pkgs/tools/cd-dvd/bashburn/default.nix
new file mode 100644
index 000000000000..b188b6fb2b2a
--- /dev/null
+++ b/pkgs/tools/cd-dvd/bashburn/default.nix
@@ -0,0 +1,64 @@
+{ stdenv, fetchurl, utillinux
+, cdparanoia, cdrdao, dvdplusrwtools, flac, lame, mpg123, normalize
+, vorbisTools, xorriso }:
+
+stdenv.mkDerivation rec {
+  name = "bashburn-${version}";
+  version = "3.1.0";
+
+  src = fetchurl {
+    sha256 = "0g5va5rjdrvacanmqr6pbxk2rl565ahkfbsvxsp1jvhvxvhmv3dp";
+    url = "http://bashburn.dose.se/index.php?s=file_download&id=25";
+    name = "${name}.tar.gz";
+  };
+
+  nativeBuildInputs = [ utillinux ];
+
+  postPatch = ''
+    for path in \
+      BB_CDBURNCMD=${xorriso}/bin/"xorriso -as cdrecord" \
+      BB_DVDBURNCMD=${dvdplusrwtools}/bin/growisofs \
+      BB_ISOCMD=${xorriso}/bin/"xorriso -as mkisofs" \
+      BB_DVDBLANK=${dvdplusrwtools}/bin/dvd+rw-format \
+      BB_CDIMAGECMD=${cdrdao}/bin/cdrdao \
+      BB_CDAUDIORIP=${cdparanoia}/bin/cdparanoia \
+      BB_READCD=${xorriso}/bin/"xorriso -as mkisofs" \
+      BB_MP3ENC=${lame}/bin/lame \
+      BB_MP3DEC=${mpg123}/bin/mpg123 \
+      BB_OGGENC=${vorbisTools}/bin/oggenc \
+      BB_OGGDEC=${vorbisTools}/bin/oggdec \
+      BB_FLACCMD=${flac}/bin/flac \
+      BB_EJECT=${utillinux}/bin/eject \
+      BB_NORMCMD=${normalize}/bin/normalize \
+    ; do
+      echo $path
+      sed -i BashBurn.sh \
+        -e "s,\(''${path%%=*}:\).*,\1 ''${path#*=},"
+      sed -i menus/advanced.sh \
+        -e "s,\(''${path%%=*}|\).*\('.*\),\1''${path#*=}\2,"
+    done
+  '';
+
+  installPhase = ''
+    sh Install.sh --prefix $out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "bash script CD Burner Writer";
+    longDescription = ''
+      It might not be the best looking application out there, but it works.
+      It’s simple, fast and small, and can handle most things you throw at it.
+      Currently (and with the right dependencies installed), BashBurn can:
+      - burn data CDs/DVDs (Including CDRWs)
+      - burn music CDs
+      - burn CD/DVD-images
+      - rip data/music CDs
+      - manipulate ISO-files
+      - and probably more...
+    '';
+    homepage = http://bashburn.dose.se/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c63448f4a3a2..59c86b25a004 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -675,6 +675,8 @@ let
 
   barcode = callPackage ../tools/graphics/barcode {};
 
+  bashburn = callPackage ../tools/cd-dvd/bashburn { };
+
   bashmount = callPackage ../tools/filesystems/bashmount {};
 
   bc = callPackage ../tools/misc/bc { };

From 0c25292648b0f9172592169bc2d94272a28a0711 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 26 Jan 2016 00:53:13 +0100
Subject: [PATCH 0575/2285] vorbis-tools: rename from old-style vorbisTools

---
 pkgs/applications/audio/abcde/default.nix              | 4 ++--
 pkgs/applications/audio/mhwaveedit/default.nix         | 4 ++--
 pkgs/applications/editors/emacs-modes/emms/default.nix | 6 +++---
 pkgs/applications/video/dvd-slideshow/default.nix      | 4 ++--
 pkgs/development/libraries/snack/default.nix           | 6 +++---
 pkgs/misc/solfege/default.nix                          | 4 ++--
 pkgs/tools/cd-dvd/bashburn/default.nix                 | 6 +++---
 pkgs/tools/cd-dvd/cuetools/default.nix                 | 4 ++--
 pkgs/top-level/all-packages.nix                        | 3 ++-
 pkgs/top-level/python-packages.nix                     | 2 +-
 pkgs/top-level/release.nix                             | 2 +-
 11 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index eec1bdcf31cd..2c02baf99184 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbisTools, id3v2, eyeD3
+{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbis-tools, id3v2, eyeD3
 , lame, flac, eject, mkcue
 , perl, DigestSHA, MusicBrainz, MusicBrainzDiscID
 , makeWrapper }:
@@ -50,7 +50,7 @@ in
          --replace '#!/usr/bin/perl' '#!${perl}/bin/perl'
 
       wrapProgram "$out/bin/abcde" --prefix PATH ":" \
-        "$out/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbisTools}/bin:${id3v2}/bin:${eyeD3}/bin:${lame}/bin"
+        "$out/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbis-tools}/bin:${id3v2}/bin:${eyeD3}/bin:${lame}/bin"
 
       wrapProgram "$out/bin/cddb-tool" --prefix PATH ":" \
         "${wget}/bin"
diff --git a/pkgs/applications/audio/mhwaveedit/default.nix b/pkgs/applications/audio/mhwaveedit/default.nix
index d640ddaeb942..26400ed61da1 100644
--- a/pkgs/applications/audio/mhwaveedit/default.nix
+++ b/pkgs/applications/audio/mhwaveedit/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeWrapper, SDL , alsaLib, gtk, libjack2, ladspaH
 , ladspaPlugins, libsamplerate, libsndfile, pkgconfig, libpulseaudio, lame
-, vorbisTools }:
+, vorbis-tools }:
 
 stdenv.mkDerivation  rec {
   name = "mhwaveedit-${version}";
@@ -19,7 +19,7 @@ stdenv.mkDerivation  rec {
   postInstall = ''
     wrapProgram $out/bin/mhwaveedit \
       --prefix PATH : ${lame}/bin/ \
-      --prefix PATH : ${vorbisTools}/bin/
+      --prefix PATH : ${vorbis-tools}/bin/
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/editors/emacs-modes/emms/default.nix b/pkgs/applications/editors/emacs-modes/emms/default.nix
index 1e9843447d9d..c873a7c0ca8b 100644
--- a/pkgs/applications/editors/emacs-modes/emms/default.nix
+++ b/pkgs/applications/editors/emacs-modes/emms/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, emacs, texinfo
-, mpg321, vorbisTools, taglib, mp3info, alsaUtils }:
+, mpg321, vorbis-tools, taglib, mp3info, alsaUtils }:
 
 # XXX: EMMS also supports Xine, MPlayer, Jack, etc.
 
@@ -25,9 +25,9 @@ stdenv.mkDerivation rec {
     sed -i "emms-player-mpg321-remote.el" \
         -e 's|emms-player-mpg321-remote-command[[:blank:]]\+"mpg321"|emms-player-mpg321-remote-command "${mpg321}/bin/mpg321"|g'
     sed -i "emms-player-simple.el" \
-        -e 's|"ogg123"|"${vorbisTools}/bin/ogg123"|g'
+        -e 's|"ogg123"|"${vorbis-tools}/bin/ogg123"|g'
     sed -i "emms-info-ogginfo.el" \
-        -e 's|emms-info-ogginfo-program-name[[:blank:]]\+"ogginfo"|emms-info-ogginfo-program-name "${vorbisTools}/bin/ogginfo"|g'
+        -e 's|emms-info-ogginfo-program-name[[:blank:]]\+"ogginfo"|emms-info-ogginfo-program-name "${vorbis-tools}/bin/ogginfo"|g'
     sed -i "emms-info-libtag.el" \
         -e "s|\"emms-print-metadata\"|\"$out/bin/emms-print-metadata\"|g"
     sed -i "emms-volume-amixer.el" \
diff --git a/pkgs/applications/video/dvd-slideshow/default.nix b/pkgs/applications/video/dvd-slideshow/default.nix
index a6197c2e6e13..fe95c2c6d7d8 100644
--- a/pkgs/applications/video/dvd-slideshow/default.nix
+++ b/pkgs/applications/video/dvd-slideshow/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbisTools }:
+{ stdenv, fetchurl, writeScript, cdrtools, dvdauthor, ffmpeg, imagemagick, lame, mjpegtools, sox, transcode, vorbis-tools }:
 
 let
   wrapper = writeScript "dvd-slideshow.sh" ''
       #!/bin/bash
       # wrapper script for dvd-slideshow programs
-      export PATH=${cdrtools}/bin:${dvdauthor}/bin:${ffmpeg}/bin:${imagemagick}/bin:${lame}/bin:${mjpegtools}/bin:${sox}/bin:${transcode}/bin:${vorbisTools}/bin:$PATH
+      export PATH=${cdrtools}/bin:${dvdauthor}/bin:${ffmpeg}/bin:${imagemagick}/bin:${lame}/bin:${mjpegtools}/bin:${sox}/bin:${transcode}/bin:${vorbis-tools}/bin:$PATH
 
       dir=`dirname "$0"`
       exe=`basename "$0"`
diff --git a/pkgs/development/libraries/snack/default.nix b/pkgs/development/libraries/snack/default.nix
index ef2db5ae5a6a..c2fdc8036c78 100644
--- a/pkgs/development/libraries/snack/default.nix
+++ b/pkgs/development/libraries/snack/default.nix
@@ -1,6 +1,6 @@
-# alsaLib vorbisTools python can be made optional
+# alsaLib vorbis-tools python can be made optional
 
-{ stdenv, fetchurl, python, tcl, tk, vorbisTools, pkgconfig, xlibsWrapper }:
+{ stdenv, fetchurl, python, tcl, tk, vorbis-tools, pkgconfig, xlibsWrapper }:
 
 stdenv.mkDerivation {
   name = "snack-2.2.10";
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
 
   postUnpack = ''sourceRoot="$sourceRoot/unix"'';
 
-  buildInputs = [ python tcl tk vorbisTools pkgconfig xlibsWrapper ];
+  buildInputs = [ python tcl tk vorbis-tools pkgconfig xlibsWrapper ];
 
   postInstall = "aoeu";
 
diff --git a/pkgs/misc/solfege/default.nix b/pkgs/misc/solfege/default.nix
index 9426684165db..db1c94d7a86c 100644
--- a/pkgs/misc/solfege/default.nix
+++ b/pkgs/misc/solfege/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgconfig, python, pygtk, gettext, texinfo
 , ghostscript, pysqlite, librsvg, gdk_pixbuf, txt2man, timidity, mpg123
-, alsaUtils, vorbisTools, csound, lilypond
+, alsaUtils, vorbis-tools, csound, lilypond
 , makeWrapper
 }:
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
     sed -i -e 's|wav_player=.*|wav_player=${alsaUtils}/bin/aplay|' \
            -e 's|midi_player=.*|midi_player=${timidity}/bin/timidity|' \
            -e 's|mp3_player=.*|mp3_player=${mpg123}/bin/mpg123|' \
-           -e 's|ogg_player=.*|ogg_player=${vorbisTools}/bin/ogg123|' \
+           -e 's|ogg_player=.*|ogg_player=${vorbis-tools}/bin/ogg123|' \
            -e 's|csound=.*|csound=${csound}/bin/csound|' \
            -e 's|lilypond-book=.*|lilypond-book=${lilypond}/bin/lilypond-book|' \
            default.config
diff --git a/pkgs/tools/cd-dvd/bashburn/default.nix b/pkgs/tools/cd-dvd/bashburn/default.nix
index b188b6fb2b2a..5d4ed2414c79 100644
--- a/pkgs/tools/cd-dvd/bashburn/default.nix
+++ b/pkgs/tools/cd-dvd/bashburn/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, utillinux
 , cdparanoia, cdrdao, dvdplusrwtools, flac, lame, mpg123, normalize
-, vorbisTools, xorriso }:
+, vorbis-tools, xorriso }:
 
 stdenv.mkDerivation rec {
   name = "bashburn-${version}";
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
       BB_READCD=${xorriso}/bin/"xorriso -as mkisofs" \
       BB_MP3ENC=${lame}/bin/lame \
       BB_MP3DEC=${mpg123}/bin/mpg123 \
-      BB_OGGENC=${vorbisTools}/bin/oggenc \
-      BB_OGGDEC=${vorbisTools}/bin/oggdec \
+      BB_OGGENC=${vorbis-tools}/bin/oggenc \
+      BB_OGGDEC=${vorbis-tools}/bin/oggdec \
       BB_FLACCMD=${flac}/bin/flac \
       BB_EJECT=${utillinux}/bin/eject \
       BB_NORMCMD=${normalize}/bin/normalize \
diff --git a/pkgs/tools/cd-dvd/cuetools/default.nix b/pkgs/tools/cd-dvd/cuetools/default.nix
index bf876d52d45a..d600f2804004 100644
--- a/pkgs/tools/cd-dvd/cuetools/default.nix
+++ b/pkgs/tools/cd-dvd/cuetools/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoreconfHook
-, bison, flac, flex, id3v2, vorbisTools
+, bison, flac, flex, id3v2, vorbis-tools
 }:
 
 stdenv.mkDerivation rec {
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ autoreconfHook ];
 
-  buildInputs = [ bison flac flex id3v2 vorbisTools ];
+  buildInputs = [ bison flac flex id3v2 vorbis-tools ];
 
   meta = with stdenv.lib; {
     description = "A set of utilities for working with cue files and toc files";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59c86b25a004..7a1714285e19 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13657,7 +13657,7 @@ let
 
   VoiceOfFaust = callPackage ../applications/audio/VoiceOfFaust { };
 
-  vorbisTools = callPackage ../applications/audio/vorbis-tools { };
+  vorbis-tools = callPackage ../applications/audio/vorbis-tools { };
 
   vue = callPackage ../applications/misc/vue { };
 
@@ -15973,6 +15973,7 @@ aliases = with self; rec {
   quake3game = ioquake3; # added 2016-01-14
   scim = sc-im; # added 2016-01-22
   dwarf_fortress = dwarf-fortress; # added 2016-01-23
+  vorbisTools = vorbis-tools; # added 2016-01-26
 };
 
 tweakAlias = _n: alias: with lib;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9717ffda79b5..d6bfce3c762b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11278,7 +11278,7 @@ in modules // {
     };
 
     # Needed for tests only
-    buildInputs = [ pkgs.faad2 pkgs.flac pkgs.vorbisTools pkgs.liboggz ];
+    buildInputs = [ pkgs.faad2 pkgs.flac pkgs.vorbis-tools pkgs.liboggz ];
 
     meta = {
       description = "Python multimedia tagging library";
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index f9aa4dbc0769..a555dcbf4fa3 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -210,7 +210,7 @@ let
       vice = linux;
       vimHugeX = linux;
       vncrec = linux;
-      vorbisTools = linux;
+      vorbis-tools = linux;
       vsftpd = linux;
       w3m = all;
       weechat = linux;

From f8fc5a4dbb179a2dd331f69e023232cadeabaea0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 26 Jan 2016 01:05:44 +0100
Subject: [PATCH 0576/2285] samsung-u-l-d: rename from old-style name; use
 normal gcc

Tested with a Samsung CLP-325. Here goes nothing.
---
 pkgs/top-level/all-packages.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7a1714285e19..d909f127b3ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15628,13 +15628,7 @@ let
 
   mfcj470dw = callPackage_i686 ../misc/cups/drivers/mfcj470dw { };
 
-  samsungUnifiedLinuxDriver = callPackage ../misc/cups/drivers/samsung {
-    gcc = import ../development/compilers/gcc/4.4 {
-      inherit stdenv fetchurl gmp mpfr noSysDirs gettext which;
-      texinfo = texinfo4;
-      profiledCompiler = true;
-    };
-  };
+  samsung-unified-linux-driver = callPackage ../misc/cups/drivers/samsung { };
 
   sane-backends = callPackage ../applications/graphics/sane/backends {
     gt68xxFirmware = config.sane.gt68xxFirmware or null;
@@ -15973,6 +15967,7 @@ aliases = with self; rec {
   quake3game = ioquake3; # added 2016-01-14
   scim = sc-im; # added 2016-01-22
   dwarf_fortress = dwarf-fortress; # added 2016-01-23
+  samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25
   vorbisTools = vorbis-tools; # added 2016-01-26
 };
 

From ba43edc0fb1c6768ef5955e557aa70d089389a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Mon, 25 Jan 2016 22:45:02 -0200
Subject: [PATCH 0577/2285] jrePlugin: add versions 7 and 8

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5218e54c000d..40910d40c2b2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4289,7 +4289,13 @@ let
 
   oraclejre8psu = lowPrio (pkgs.oraclejdk8psu_distro false false);
 
-  jrePlugin = lowPrio (pkgs.jdkdistro false true);
+  jrePlugin = jre8Plugin;
+
+  jre6Plugin = lowPrio (pkgs.jdkdistro false true);
+
+  jre7Plugin = lowPrio (pkgs.oraclejdk7distro false true);
+
+  jre8Plugin = lowPrio (pkgs.oraclejdk8distro false true);
 
   supportsJDK =
     system == "i686-linux" ||

From cb6beb1eb3d22d9a7b6e01dc784157c2ac34db67 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Mon, 25 Jan 2016 20:16:12 -0500
Subject: [PATCH 0578/2285] ghcjs: build haddock documentation

From building reflex-dom (which has quite a few dependencies), it would
appear that building the documentation no longer fails.
---
 pkgs/development/haskell-modules/configuration-ghcjs.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 9bea0519151d..6e8c0be7d0d9 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -14,10 +14,6 @@ self: super: {
 
   inherit (pkgs.haskell.packages.ghc7102) jailbreak-cabal alex happy gtk2hs-buildtools;
 
-  # Many packages fail with:
-  #   haddock: internal error: expectJust getPackageDetails
-  mkDerivation = drv: super.mkDerivation (drv // { doHaddock = false; });
-
   # This is the list of packages that are built into a booted ghcjs installation
   # It can be generated with the command:
   # nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^    \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/-\(.\)/\U\1/' | sed 's/^\([^_]*\)\(.*\)$/\1 = null;/'"

From 77f280cf1822974b85005720b11e417eccec1854 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 24 Jan 2016 20:17:10 +0300
Subject: [PATCH 0579/2285] libvdpau-va-gl: init at 0.3.4

---
 .../libraries/libvdpau-va-gl/default.nix      | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/development/libraries/libvdpau-va-gl/default.nix

diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix
new file mode 100644
index 000000000000..51fb858d8bef
--- /dev/null
+++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, libX11, libpthreadstubs, libvdpau, glib
+, libva, ffmpeg, mesa_glu }:
+
+let
+  version = "0.3.4";
+
+in stdenv.mkDerivation rec {
+  name = "libvdpau-va-gl-${version}";
+
+  src = fetchFromGitHub {
+    owner = "i-rinat";
+    repo = "libvdpau-va-gl";
+    rev = "v${version}";
+    sha256 = "1909f3srm2iy2hv4m6jxg1nxrh9xgsnjs07wfzw3ais1fww0i2nn";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+  buildInputs = [ libX11 libpthreadstubs libvdpau glib libva ffmpeg mesa_glu ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/i-rinat/libvdpau-va-gl;
+    description = "VDPAU driver with OpenGL/VAAPI backend";
+    license = licenses.lgpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1b35d454d231..001f084a701f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7726,6 +7726,8 @@ let
 
   libvdpau = callPackage ../development/libraries/libvdpau { };
 
+  libvdpau-va-gl = callPackage ../development/libraries/libvdpau-va-gl { };
+
   libvirt = callPackage ../development/libraries/libvirt { };
 
   libvirt-glib = callPackage ../development/libraries/libvirt-glib { };

From 364f297bb2d16236de01ef2175f99803665dc4a6 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 25 Jan 2016 02:53:47 +0300
Subject: [PATCH 0580/2285] mesa: leave vdpau libraries in lib/vdpau

---
 pkgs/development/libraries/mesa/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index c6af00d08b87..d9cad5752308 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -154,8 +154,6 @@ stdenv.mkDerivation {
     done
   '' + /* set the default search path for DRI drivers; used e.g. by X server */ ''
     substituteInPlace "$out/lib/pkgconfig/dri.pc" --replace '$(drivers)' "${driverLink}"
-  '' + /* move vdpau drivers to $drivers/lib, so they are found */ ''
-    mv "$drivers"/lib/vdpau/* "$drivers"/lib/ && rmdir "$drivers"/lib/vdpau
   '';
   #ToDo: @vcunat isn't sure if drirc will be found when in $out/etc/, but it doesn't seem important ATM
 

From 6563fa612562a6441794dddf774a001947247ab8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 25 Jan 2016 02:54:08 +0300
Subject: [PATCH 0581/2285] nvidia_x11: move vdpau libraries to lib/vdpau

---
 pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh | 4 ++++
 pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh | 6 +++++-
 pkgs/os-specific/linux/nvidia-x11/builder.sh           | 6 +++++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh
index 20666fdb061f..fe8267831410 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh
@@ -93,6 +93,10 @@ installPhase() {
         substituteInPlace $out/share/applications/nvidia-settings.desktop \
             --replace '__UTILS_PATH__' $out/bin \
             --replace '__PIXMAP_PATH__' $out/share/pixmaps
+
+        # Move VDPAU libraries to their place
+        mkdir "$out"/lib/vdpau
+        mv "$out"/lib/libvdpau* "$out"/lib/vdpau
     fi
 }
 
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh
index d0eec0f7403b..899f12daf6b5 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh
@@ -108,8 +108,12 @@ installPhase() {
     #patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.*
     #patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.*
 
-    # we distribute these separately in `libvdpau`
+    # We distribute these separately in `libvdpau`
     rm "$out"/lib/libvdpau{.*,_trace.*}
+
+    # Move VDPAU libraries to their place
+    mkdir "$out"/lib/vdpau
+    mv "$out"/lib/libvdpau* "$out"/lib/vdpau
 }
 
 
diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh
index 502648c1d513..c1f165c45dd5 100755
--- a/pkgs/os-specific/linux/nvidia-x11/builder.sh
+++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh
@@ -119,8 +119,12 @@ installPhase() {
     # For simplicity and dependency reduction, don't support the gtk3 interface.
     rm $out/lib/libnvidia-gtk3.*
 
-    # we distribute these separately in `libvdpau`
+    # We distribute these separately in `libvdpau`
     rm "$out"/lib/libvdpau{.*,_trace.*}
+
+    # Move VDPAU libraries to their place
+    mkdir "$out"/lib/vdpau
+    mv "$out"/lib/libvdpau* "$out"/lib/vdpau
 }
 
 

From af911744fdbb10cc21d3267c09adc9a06c53d9f3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 26 Jan 2016 04:05:02 +0100
Subject: [PATCH 0582/2285] samsung-unified-linux-driver: add 1.00.37

Very experimental. Probably very broken. Adds support for newer
models but removes it for some older ones.

Hence not the default yet, if ever.
---
 .../drivers/samsung/{ => 4.00.39}/builder.sh  |  0
 .../cups/drivers/samsung/4.00.39/default.nix  | 40 ++++++++
 pkgs/misc/cups/drivers/samsung/default.nix    | 96 ++++++++++++++-----
 pkgs/top-level/all-packages.nix               |  3 +-
 4 files changed, 115 insertions(+), 24 deletions(-)
 rename pkgs/misc/cups/drivers/samsung/{ => 4.00.39}/builder.sh (100%)
 create mode 100644 pkgs/misc/cups/drivers/samsung/4.00.39/default.nix

diff --git a/pkgs/misc/cups/drivers/samsung/builder.sh b/pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh
similarity index 100%
rename from pkgs/misc/cups/drivers/samsung/builder.sh
rename to pkgs/misc/cups/drivers/samsung/4.00.39/builder.sh
diff --git a/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
new file mode 100644
index 000000000000..27d21f862852
--- /dev/null
+++ b/pkgs/misc/cups/drivers/samsung/4.00.39/default.nix
@@ -0,0 +1,40 @@
+# Tested on linux-x86_64.  Might work on linux-i386.  Probably won't work on anything else.
+
+# To use this driver in NixOS, add it to printing.drivers in configuration.nix.
+# configuration.nix might look like this when you're done:
+# { pkgs, ... }: {
+#   printing = {
+#     enable = true;
+#     drivers = [ pkgs.samsungUnifiedLinuxDriver ];
+#   };
+#   (more stuff)
+# }
+# (This advice was tested on 2010 August 2.)
+
+{ stdenv, fetchurl, cups, gcc, ghostscript, glibc, patchelf }:
+
+# Do not bump lightly! Visit <http://www.bchemnet.com/suldr/supported.html>
+# to see what will break when upgrading. Consider a new versioned attribute.
+stdenv.mkDerivation rec {
+  name = "samsung-UnifiedLinuxDriver-${version}";
+  version = "4.00.39";
+
+  src = fetchurl {
+    url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz";
+    sha256 = "144b4xggbzjfq7ga5nza7nra2cf6qn63z5ls7ba1jybkx1vm369k";
+  };
+
+  buildInputs = [ cups gcc ghostscript glibc patchelf ];
+
+  inherit cups gcc ghostscript glibc;
+
+  builder = ./builder.sh;
+
+  meta = with stdenv.lib; {
+    description = "Samsung's Linux printing drivers; includes binaries without source code";
+    homepage = http://www.samsung.com/;
+    license = licenses.unfree;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/misc/cups/drivers/samsung/default.nix b/pkgs/misc/cups/drivers/samsung/default.nix
index 27d21f862852..34b5f58aed51 100644
--- a/pkgs/misc/cups/drivers/samsung/default.nix
+++ b/pkgs/misc/cups/drivers/samsung/default.nix
@@ -1,39 +1,89 @@
-# Tested on linux-x86_64.  Might work on linux-i386.  Probably won't work on anything else.
+{ stdenv, fetchurl, patchelf, cups, libusb, libxml2 }:
 
-# To use this driver in NixOS, add it to printing.drivers in configuration.nix.
-# configuration.nix might look like this when you're done:
-# { pkgs, ... }: {
-#   printing = {
-#     enable = true;
-#     drivers = [ pkgs.samsungUnifiedLinuxDriver ];
-#   };
-#   (more stuff)
-# }
-# (This advice was tested on 2010 August 2.)
+let
 
-{ stdenv, fetchurl, cups, gcc, ghostscript, glibc, patchelf }:
+    arch = if stdenv.system == "x86_64-linux"
+      then "x86_64"
+      else "i386";
 
-# Do not bump lightly! Visit <http://www.bchemnet.com/suldr/supported.html>
-# to see what will break when upgrading. Consider a new versioned attribute.
-stdenv.mkDerivation rec {
-  name = "samsung-UnifiedLinuxDriver-${version}";
-  version = "4.00.39";
+in stdenv.mkDerivation rec {
+  name = "samsung-unified-linux-driver-${version}";
+  version = "1.00.37";
 
   src = fetchurl {
+    sha256 = "0r66l9zp0p1qgakh4j08hynwsr4lsgq5yrpxyr0x4ldvl0z2b1bb";
     url = "http://www.bchemnet.com/suldr/driver/UnifiedLinuxDriver-${version}.tar.gz";
-    sha256 = "144b4xggbzjfq7ga5nza7nra2cf6qn63z5ls7ba1jybkx1vm369k";
   };
 
-  buildInputs = [ cups gcc ghostscript glibc patchelf ];
+  nativeBuildInputs = [ patchelf ];
 
-  inherit cups gcc ghostscript glibc;
+  phases = [ "unpackPhase" "installPhase" ];
 
-  builder = ./builder.sh;
+  installPhase = ''
+    my_patchelf() {
+      opts=(); while [[ "$1" != - ]]; do opts+=( "$1" ); shift; done; shift
+      for binary in "$@"; do
+        echo "Patching ELF file: $binary"
+	patchelf "''${opts[@]}" $binary
+        ldd $binary | grep "not found" && exit 1
+      done; true
+    }
+
+    my_patchelf \
+      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
+      --set-rpath ${cups}/lib:$(cat $NIX_CC/nix-support/orig-cc)/lib:${stdenv.glibc}/lib \
+      - ${arch}/{pstosecps,rastertospl,smfpnetdiscovery}
+
+    mkdir -p $out/etc/sane.d/dll.d/
+    install -m644 noarch/etc/smfp.conf $out/etc/sane.d
+    echo smfp >> $out/etc/sane.d/dll.d/smfp-scanner
+
+    mkdir -p $out/lib
+    my_patchelf \
+      --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/lib:${stdenv.glibc}/lib \
+      - ${arch}/libscmssc.so*
+    install -m755 ${arch}/libscmssc.so* $out/lib
+
+    mkdir -p $out/lib/cups/backend
+    install -m755 ${arch}/smfpnetdiscovery $out/lib/cups/backend
+
+    mkdir -p $out/lib/cups/filter
+    install -m755 ${arch}/{pstosecps,rastertospl} $out/lib/cups/filter
+
+    mkdir -p $out/lib/sane
+    my_patchelf \
+      --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/lib:${stdenv.glibc}/lib:${libusb}/lib:${libxml2}/lib \
+      - ${arch}/libsane-smfp.so*
+    install -m755 ${arch}/libsane-smfp.so* $out/lib/sane
+    ln -s libsane-smfp.so.1.0.1 $out/lib/sane/libsane-smfp.so.1
+    ln -s libsane-smfp.so.1     $out/lib/sane/libsane-smfp.so
+
+    mkdir -p $out/lib/udev/rules.d
+    (
+      OEM_FILE=noarch/oem.conf
+      INSTALL_LOG_FILE=/dev/null
+      . noarch/scripting_utils
+      . noarch/package_utils
+      . noarch/scanner-script.pkg
+      fill_full_template noarch/etc/smfp.rules.in $out/lib/udev/rules.d/60_smfp_samsung.rules
+    )
+
+    mkdir -p $out/share/ppd
+    gzip -9 noarch/share/ppd/*.ppd
+    cp -R noarch/share/ppd $out/share/ppd/suld
+
+    cp -R noarch/share/locale $out/share
+    rm -r $out/share/locale/*/*/install.mo
+  '';
 
   meta = with stdenv.lib; {
-    description = "Samsung's Linux printing drivers; includes binaries without source code";
-    homepage = http://www.samsung.com/;
+    description = "Unified Linux Driver for Samsung printers and scanners";
+    homepage = http://www.bchemnet.com/suldr;
+    downloadPage = http://www.bchemnet.com/suldr/driver/;
     license = licenses.unfree;
+
+    # Tested on linux-x86_64. Might work on linux-i386.
+    # Probably won't work on anything else.
     platforms = platforms.linux;
     maintainers = with maintainers; [ nckx ];
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d909f127b3ff..ecaab504e322 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15628,7 +15628,8 @@ let
 
   mfcj470dw = callPackage_i686 ../misc/cups/drivers/mfcj470dw { };
 
-  samsung-unified-linux-driver = callPackage ../misc/cups/drivers/samsung { };
+  samsung-unified-linux-driver_1_00_37 = callPackage ../misc/cups/drivers/samsung { };
+  samsung-unified-linux-driver = callPackage ../misc/cups/drivers/samsung/4.00.39 { };
 
   sane-backends = callPackage ../applications/graphics/sane/backends {
     gt68xxFirmware = config.sane.gt68xxFirmware or null;

From 663cbd16b8f1fde3ba773be529a227d1a46abdb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Tue, 26 Jan 2016 01:19:18 -0200
Subject: [PATCH 0583/2285] jflex: 1.4.3 -> 1.6.1

---
 .../libraries/java/jflex/builder.sh           |  6 -----
 .../libraries/java/jflex/default.nix          | 25 +++++++++++++++----
 2 files changed, 20 insertions(+), 11 deletions(-)
 delete mode 100755 pkgs/development/libraries/java/jflex/builder.sh

diff --git a/pkgs/development/libraries/java/jflex/builder.sh b/pkgs/development/libraries/java/jflex/builder.sh
deleted file mode 100755
index d95feb5eeb44..000000000000
--- a/pkgs/development/libraries/java/jflex/builder.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-set -e
-source $stdenv/setup
-
-tar zxvf $src
-mkdir -p $out
-mv $name/* $out
diff --git a/pkgs/development/libraries/java/jflex/default.nix b/pkgs/development/libraries/java/jflex/default.nix
index 5e54e800f55b..12f9995b56a9 100644
--- a/pkgs/development/libraries/java/jflex/default.nix
+++ b/pkgs/development/libraries/java/jflex/default.nix
@@ -1,11 +1,26 @@
 {stdenv, fetchurl} :
 
-stdenv.mkDerivation {
-  name = "jflex-1.4.3";
-  builder = ./builder.sh;
+stdenv.mkDerivation rec {
+  name = "jflex-1.6.1";
 
   src = fetchurl {
-    url = http://jflex.de/jflex-1.4.3.tar.gz;
-    sha256 = "0sm74sgjvw01fsiqr5q9ipbm8rfyihf6yn00dqymhyc3wmbhr517";
+    url = "http://jflex.de/${name}.tar.gz";
+    sha256 = "1h7q2vhb4s42g4pqz5xxxliagprray7i9krr6hyaz1mjlx7gnycq";
+  };
+
+  sourceRoot = name;
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out
+    cp -a * $out
+    patchShebangs $out
+  '';
+
+  meta = {
+    homepage = http://www.jflex.de/;
+    description = "Lexical analyzer generator for Java, written in Java";
+    license = stdenv.lib.licenses.bsd3;
   };
 }

From efc359c23135ebccc2835b37513f01adf73e2dac Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 26 Jan 2016 06:12:23 +0100
Subject: [PATCH 0584/2285] lz4: be just a bit more reproducible

---
 pkgs/tools/compression/lz4/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index 8340ea3fe8b0..cdc42e4b8488 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -11,8 +11,17 @@ stdenv.mkDerivation rec {
     owner = "Cyan4973";
   };
 
+  patches = [ ./install-on-freebsd.patch ] ;
+
   buildInputs = stdenv.lib.optional doCheck valgrind;
 
+  # An ever-changing __DATE__ isn't very reproducible, so we must override it.
+  # But rather than displaying "()" or 1970, let --version show useful info:
+  NIX_CFLAGS_COMPILE = [
+    ''-D__DATE__="${stdenv.cc.cc.name}"''
+    "-Wno-builtin-macro-redefined"
+  ];
+
   enableParallelBuilding = true;
 
   makeFlags = [ "PREFIX=$(out)" ];
@@ -20,8 +29,6 @@ stdenv.mkDerivation rec {
   doCheck = false; # tests take a very long time
   checkTarget = "test";
 
-  patches = [ ./install-on-freebsd.patch ] ;
-
   meta = with stdenv.lib; {
     description = "Extremely fast compression algorithm";
     longDescription = ''

From ba0dcb95ad6a11c8fa576f73832d42618279df99 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 26 Jan 2016 06:16:45 +0100
Subject: [PATCH 0585/2285] neovim: fix -configured evaluation

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

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index dcb274513102..1b984c0ff9ce 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -145,7 +145,7 @@ let
   };
 
 in if (vimAlias == false && configure == null) then neovim else stdenv.mkDerivation {
-  name = "neovim-${version}-configured";
+  name = "neovim-${neovim.version}-configured";
   inherit (neovim) version;
 
   nativeBuildInputs = [ makeWrapper ];

From c95bd5d08594ddf26280e7998e7c762aa5f0b01b Mon Sep 17 00:00:00 2001
From: Tony White <white.tw.tw@gmail.com>
Date: Tue, 26 Jan 2016 06:17:32 +0000
Subject: [PATCH 0586/2285] sddm: add numlock switch

- added numlock on boot switch
- simply add :
services.xserver.displayManager.sddm.autoNumlock = true;
to configuration.nix and sddm will start
with numlock enabled.
---
 nixos/modules/services/x11/display-managers/sddm.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/modules/services/x11/display-managers/sddm.nix b/nixos/modules/services/x11/display-managers/sddm.nix
index bcac83aa738b..4d61afe0eaeb 100644
--- a/nixos/modules/services/x11/display-managers/sddm.nix
+++ b/nixos/modules/services/x11/display-managers/sddm.nix
@@ -31,6 +31,9 @@ let
     [General]
     HaltCommand=${pkgs.systemd}/bin/systemctl poweroff
     RebootCommand=${pkgs.systemd}/bin/systemctl reboot
+    ${optionalString cfg.autoNumlock ''
+    Numlock=on
+    ''}
 
     [Theme]
     Current=${cfg.theme}
@@ -110,6 +113,14 @@ in
         '';
       };
 
+      autoNumlock = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable numlock at login.
+        '';
+      };
+
       setupScript = mkOption {
         type = types.str;
         default = "";

From e8fc1ea94b7b33da61479aae6b3c645da8ad210f Mon Sep 17 00:00:00 2001
From: Prayag Verma <prayag.verma@gmail.com>
Date: Tue, 26 Jan 2016 14:19:25 +0530
Subject: [PATCH 0587/2285] COPYING: Update year range to 2016 (close #12621)

---
 COPYING | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/COPYING b/COPYING
index 0d5734a591c6..0408a7e40b7a 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2003-2015 Eelco Dolstra and the Nixpkgs/NixOS contributors
+Copyright (c) 2003-2016 Eelco Dolstra and the Nixpkgs/NixOS contributors
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

From 1b95212a6976dc7b8e3a8e80b8d5fc9cb6ebaa71 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 25 Jan 2016 02:56:27 +0300
Subject: [PATCH 0588/2285] libva: use OpenGL drivers link directory

---
 pkgs/development/libraries/libva/default.nix | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index 12de07ced32d..b1bfa9b8e35e 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi
-, mesa ? null
+, mesa_noglu ? null
 }:
 
 stdenv.mkDerivation rec {
@@ -10,9 +10,20 @@ stdenv.mkDerivation rec {
     sha256 = "0bjfb5s8dk3lql843l91ffxzlq47isqks5sj19cxh7j3nhzw58kz";
   };
 
-  buildInputs = [ libX11 libXext pkgconfig libdrm libXfixes wayland libffi mesa ];
+  buildInputs = [ libX11 libXext pkgconfig libdrm libXfixes wayland libffi mesa_noglu ];
 
-  configureFlags = stdenv.lib.optional (mesa != null) "--enable-glx";
+  configureFlags = stdenv.lib.optionals (mesa_noglu != null) [
+    "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri"
+    "--enable-glx"
+  ];
+
+  installFlags = [ "DESTDIR=$(out)" ];
+
+  postInstall = ''
+    cp -r $out/${mesa_noglu.driverLink}/* $out
+    cp -r $out/$out/* $out
+    rm -rf $out/run $out/$(echo "$out" | cut -d "/" -f2)
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://www.freedesktop.org/wiki/Software/vaapi;

From 768f7d19b54843db8c44030f34d237c013973e40 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 25 Jan 2016 02:56:41 +0300
Subject: [PATCH 0589/2285] libvdpau: use OpenGL drivers link directory

---
 pkgs/development/libraries/libvdpau/default.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix
index 6c5d5a91ad88..f38cc51f6c24 100644
--- a/pkgs/development/libraries/libvdpau/default.nix
+++ b/pkgs/development/libraries/libvdpau/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, xorg }:
+{ stdenv, fetchurl, pkgconfig, xorg, mesa_noglu }:
 
 stdenv.mkDerivation rec {
   name = "libvdpau-1.1.1";
@@ -12,6 +12,16 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ xorg.libX11 ];
 
+  configureFlags = [ "--with-module-dir=${mesa_noglu.driverLink}/lib/vdpau" ];
+
+  installFlags = [ "DESTDIR=$(out)" ];
+
+  postInstall = ''
+    cp -r $out/${mesa_noglu.driverLink}/* $out
+    cp -r $out/$out/* $out
+    rm -rf $out/run $out/$(echo "$out" | cut -d "/" -f2)
+  '';
+
   meta = with stdenv.lib; {
     homepage = http://people.freedesktop.org/~aplattner/vdpau/;
     description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)";

From 1ae1791e8e8b047d2a45221845ca40ed7f928503 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 25 Jan 2016 02:57:15 +0300
Subject: [PATCH 0590/2285] nixos opengl: add extraPackages and extraPackages32

---
 nixos/modules/hardware/opengl.nix | 36 +++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index 7693bd5bb453..fabdfad869cc 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -10,7 +10,7 @@ let
 
   videoDrivers = config.services.xserver.videoDrivers;
 
-  makePackage = p: p.buildEnv {
+  makePackage = p: pkgs.buildEnv {
     name = "mesa-drivers+txc-${p.mesa_drivers.version}";
     paths =
       [ p.mesa_drivers
@@ -19,6 +19,16 @@ let
       ];
   };
 
+  package = pkgs.buildEnv {
+    name = "opengl-drivers";
+    paths = [ cfg.package ] ++ cfg.extraPackages;
+  };
+
+  package32 = pkgs.buildEnv {
+    name = "opengl-drivers-32bit";
+    paths = [ cfg.package32 ] ++ cfg.extraPackages32;
+  };
+
 in
 
 {
@@ -75,7 +85,25 @@ in
       internal = true;
       description = ''
         The package that provides the 32-bit OpenGL implementation on
-        64-bit systems.  Used when <option>driSupport32Bit</option> is
+        64-bit systems. Used when <option>driSupport32Bit</option> is
+        set.
+      '';
+    };
+
+    hardware.opengl.extraPackages = mkOption {
+      type = types.listOf types.package;
+      default = [];
+      description = ''
+        Additional packages to add to OpenGL drivers.
+      '';
+    };
+
+    hardware.opengl.extraPackages32 = mkOption {
+      type = types.listOf types.package;
+      default = [];
+      description = ''
+        Additional packages to add to 32-bit OpenGL drivers on
+        64-bit systems. Used when <option>driSupport32Bit</option> is
         set.
       '';
     };
@@ -91,11 +119,11 @@ in
 
     system.activationScripts.setup-opengl =
       ''
-        ln -sfn ${cfg.package} /run/opengl-driver
+        ln -sfn ${package} /run/opengl-driver
         ${if pkgs.stdenv.isi686 then ''
           ln -sfn opengl-driver /run/opengl-driver-32
         '' else if cfg.driSupport32Bit then ''
-          ln -sfn ${cfg.package32} /run/opengl-driver-32
+          ln -sfn ${package32} /run/opengl-driver-32
         '' else ''
           rm -f /run/opengl-driver-32
         ''}

From b52acfdf0178a3bd3cd3b359dc9dbc354992aff3 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 25 Jan 2016 02:57:28 +0300
Subject: [PATCH 0591/2285] nixos xserver: remove vaapiDrivers

Use hardware.opengl.extraPackages instead.
---
 nixos/doc/manual/release-notes/rl-unstable.xml          | 6 ++++++
 nixos/modules/hardware/opengl.nix                       | 7 +++++--
 nixos/modules/rename.nix                                | 1 +
 nixos/modules/services/x11/display-managers/default.nix | 9 ---------
 nixos/modules/services/x11/xserver.nix                  | 9 ---------
 5 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 092c2a788ed8..ffde542d4e18 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -174,6 +174,12 @@ nginx.override {
     of adding <literal>gutenprint</literal> to the <literal>drivers</literal> list.
     </para>
   </listitem>
+
+  <listitem>
+    <para><literal>services.xserver.vaapiDrivers</literal> has been removed. Use
+    <literal>services.hardware.opengl.extraPackages{,32}</literal> instead. You can
+    also specify VDPAU drivers there.</para>
+  </listitem>
 </itemizedlist>
 
 
diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix
index fabdfad869cc..d3b146be6b33 100644
--- a/nixos/modules/hardware/opengl.nix
+++ b/nixos/modules/hardware/opengl.nix
@@ -93,18 +93,21 @@ in
     hardware.opengl.extraPackages = mkOption {
       type = types.listOf types.package;
       default = [];
+      example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]";
       description = ''
-        Additional packages to add to OpenGL drivers.
+        Additional packages to add to OpenGL drivers. This can be used
+        to add additional VA-API/VDPAU drivers.
       '';
     };
 
     hardware.opengl.extraPackages32 = mkOption {
       type = types.listOf types.package;
       default = [];
+      example = literalExample "with pkgs; [ vaapiIntel libvdpau-va-gl vaapiVdpau ]";
       description = ''
         Additional packages to add to 32-bit OpenGL drivers on
         64-bit systems. Used when <option>driSupport32Bit</option> is
-        set.
+        set. This can be used to add additional VA-API/VDPAU drivers.
       '';
     };
 
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index cc7557c06eb4..6e10b47f03cc 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -77,6 +77,7 @@ with lib;
     (mkRenamedOptionModule [ "services" "xserver" "driSupport32Bit" ] [ "hardware" "opengl" "driSupport32Bit" ])
     (mkRenamedOptionModule [ "services" "xserver" "s3tcSupport" ] [ "hardware" "opengl" "s3tcSupport" ])
     (mkRenamedOptionModule [ "hardware" "opengl" "videoDrivers" ] [ "services" "xserver" "videoDrivers" ])
+    (mkRenamedOptionModule [ "services" "xserver" "vaapiDrivers" ] [ "hardware" "opengl" "extraPackages" ])
 
     (mkRenamedOptionModule [ "services" "mysql55" ] [ "services" "mysql" ])
 
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index bad99ccd8696..d7825400b5ae 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -16,13 +16,6 @@ let
   cfg = config.services.xserver;
   xorg = pkgs.xorg;
 
-  vaapiDrivers = pkgs.buildEnv {
-    name = "vaapi-drivers";
-    paths = cfg.vaapiDrivers;
-    # We only want /lib/dri, but with a single input path, we need "/" for it to work
-    pathsToLink = [ "/" ];
-  };
-
   fontconfig = config.fonts.fontconfig;
   xresourcesXft = pkgs.writeText "Xresources-Xft" ''
     ${optionalString (fontconfig.dpi != 0) ''Xft.dpi: ${toString fontconfig.dpi}''}
@@ -107,8 +100,6 @@ let
           ${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults
       fi
 
-      export LIBVA_DRIVERS_PATH=${vaapiDrivers}/lib/dri
-
       # Speed up application start by 50-150ms according to
       # http://kdemonkey.blogspot.nl/2008/04/magic-trick.html
       rm -rf $HOME/.compose-cache
diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 68745ba8197a..653c97d7e6fa 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -216,15 +216,6 @@ in
         '';
       };
 
-      vaapiDrivers = mkOption {
-        type = types.listOf types.path;
-        default = [ ];
-        example = literalExample "[ pkgs.vaapiIntel pkgs.vaapiVdpau ]";
-        description = ''
-          Packages providing libva acceleration drivers.
-        '';
-      };
-
       startGnuPGAgent = mkOption {
         type = types.bool;
         default = false;

From 2c2497fc2e55d6550f84763d8f0a5de3af37841c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 25 Jan 2016 11:12:34 +0300
Subject: [PATCH 0592/2285] libva: 1.6.1 -> 1.6.2

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

diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index b1bfa9b8e35e..42ce11c7b4d2 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "libva-1.6.1";
+  name = "libva-1.6.2";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/vaapi/releases/libva/${name}.tar.bz2";
-    sha256 = "0bjfb5s8dk3lql843l91ffxzlq47isqks5sj19cxh7j3nhzw58kz";
+    sha256 = "1l4bij21shqbfllbxicmqgmay4v509v9hpxyyia9wm7gvsfg05y4";
   };
 
   buildInputs = [ libX11 libXext pkgconfig libdrm libXfixes wayland libffi mesa_noglu ];

From de26cac3cb1ec12f5a8ccb2b7ff9b58555aae3bc Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 26 Jan 2016 14:26:53 +0300
Subject: [PATCH 0593/2285] mesa: 11.0.8 -> 11.1.1

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

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index d9cad5752308..367159b42537 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -22,7 +22,7 @@ else
 */
 
 let
-  version = "11.0.8";
+  version = "11.1.1";
   # this is the default search path for DRI drivers
   driverLink = "/run/opengl-driver" + stdenv.lib.optionalString stdenv.isi686 "-32";
 in
@@ -38,7 +38,7 @@ stdenv.mkDerivation {
         + head (splitString "." version) + ''.x/${version}/mesa-${version}.tar.xz'')
       "https://launchpad.net/mesa/trunk/${version}/+download/mesa-${version}.tar.xz"
     ];
-    sha256 = "5696e4730518b6805d2ed5def393c4293f425a2c2c01bd5ed4bdd7ad62f7ad75";
+    sha256 = "087xlxl8dzmhzjilpsdiy19dn106spq120c9ndgnn4qlqm7hgnv4";
   };
 
   prePatch = "patchShebangs .";

From 62900b026b30f1639a676cb12f046f955073d49b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 26 Jan 2016 14:01:40 +0100
Subject: [PATCH 0594/2285] haskell-nats: fix overrides for GHC versions prior
 to 7.10.x.

Closes https://github.com/NixOS/nixpkgs/issues/12622.
---
 pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix | 1 +
 pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix  | 1 +
 pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix  | 1 +
 pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix  | 1 +
 pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix  | 1 +
 pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix  | 1 +
 6 files changed, 6 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
index 6d4e7a7bb256..322d7ea30937 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
@@ -89,6 +89,7 @@ self: super: {
   split = super.split_0_1_4_3;
 
   # Needs hashable on pre 7.10.x compilers.
+  nats_1 = addBuildDepend super.nats_1 self.hashable;
   nats = addBuildDepend super.nats self.hashable;
 
   # Needs void on pre 7.10.x compilers.
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
index cc5d03f05f5b..6147be8f0f4b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -68,6 +68,7 @@ self: super: {
   doctest = dontHaddock super.doctest;
 
   # Needs hashable on pre 7.10.x compilers.
+  nats_1 = addBuildDepend super.nats_1 self.hashable;
   nats = addBuildDepend super.nats self.hashable;
 
   # Newer versions require bytestring >=0.10.
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index 51962f161fc0..63aab9e45677 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -69,6 +69,7 @@ self: super: {
   doctest = dontHaddock super.doctest;
 
   # Needs hashable on pre 7.10.x compilers.
+  nats_1 = addBuildDepend super.nats_1 self.hashable;
   nats = addBuildDepend super.nats self.hashable;
 
   # Newer versions require bytestring >=0.10.
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index f1774c04a8fc..da7008b63f15 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -74,6 +74,7 @@ self: super: {
   control-monad-free = super.control-monad-free_0_5_3;
 
   # Needs hashable on pre 7.10.x compilers.
+  nats_1 = addBuildDepend super.nats_1 self.hashable;
   nats = addBuildDepend super.nats self.hashable;
 
   # Test suite won't compile.
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index f89ffc4c7c12..5c0d09127b9d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -77,6 +77,7 @@ self: super: {
   control-monad-free = super.control-monad-free_0_5_3;
 
   # Needs hashable on pre 7.10.x compilers.
+  nats_1 = addBuildDepend super.nats_1 self.hashable;
   nats = addBuildDepend super.nats self.hashable;
 
   # https://github.com/magthe/sandi/issues/7
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 81c060a4c3ec..81379ce9c371 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -112,6 +112,7 @@ self: super: {
                                           self.webkitgtk3-javascriptcore ];
 
   # Needs hashable on pre 7.10.x compilers.
+  nats_1 = addBuildDepend super.nats_1 self.hashable;
   nats = addBuildDepend super.nats self.hashable;
 
   # needs mtl-compat to build with mtl 2.1.x

From 5ff34bac8ce3e8fb6d617cb9ceb5419d4526ef55 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 26 Jan 2016 14:03:06 +0100
Subject: [PATCH 0595/2285] build-support/source-tarball.nix: fix syntax
 highlighting in Emacs

---
 pkgs/build-support/release/source-tarball.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/release/source-tarball.nix b/pkgs/build-support/release/source-tarball.nix
index b50077975c1f..376cd0e1d154 100644
--- a/pkgs/build-support/release/source-tarball.nix
+++ b/pkgs/build-support/release/source-tarball.nix
@@ -66,7 +66,7 @@ stdenv.mkDerivation (
               KEEPBUILDDIR="$out/`basename $TMPDIR`"
               header "Copying build directory to $KEEPBUILDDIR"
               mkdir -p $KEEPBUILDDIR
-              cp -R $TMPDIR/* $KEEPBUILDDIR
+              cp -R "$TMPDIR/"* $KEEPBUILDDIR
               stopNest
           fi
       fi

From 981e8d55824717960809179a47bfeb81c8c1ee70 Mon Sep 17 00:00:00 2001
From: Ollie Charles <ollie@ocharles.org.uk>
Date: Tue, 26 Jan 2016 14:43:22 +0000
Subject: [PATCH 0596/2285] audiofile: Fix build on darwin

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

diff --git a/pkgs/development/libraries/audiofile/default.nix b/pkgs/development/libraries/audiofile/default.nix
index 1fe6d7b15a83..c76115000cb0 100644
--- a/pkgs/development/libraries/audiofile/default.nix
+++ b/pkgs/development/libraries/audiofile/default.nix
@@ -1,10 +1,13 @@
-{ stdenv, fetchurl, alsaLib }:
+{ stdenv, fetchurl, alsaLib, AudioUnit, CoreServices }:
 
 stdenv.mkDerivation rec {
   name = "audiofile-0.3.6";
 
   nativeBuildInputs = stdenv.lib.optional stdenv.isLinux alsaLib;
 
+  buildInputs = (stdenv.lib.optional stdenv.isDarwin CoreServices) ++
+                (stdenv.lib.optional stdenv.isDarwin AudioUnit);
+
   src = fetchurl {
     url = "http://audiofile.68k.org/${name}.tar.gz";
     sha256 = "0rb927zknk9kmhprd8rdr4azql4gn2dp75a36iazx2xhkbqhvind";
@@ -14,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     description = "Library for reading and writing audio files in various formats";
-    homepage    = http://www.68k.org/~michael/audiofile/; 
+    homepage    = http://www.68k.org/~michael/audiofile/;
     license     = licenses.lgpl21Plus;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.unix;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ecaab504e322..96f91be75052 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6195,7 +6195,9 @@ let
 
   aubio = callPackage ../development/libraries/aubio { };
 
-  audiofile = callPackage ../development/libraries/audiofile { };
+  audiofile = callPackage ../development/libraries/audiofile {
+    inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices;
+  };
 
   babl = callPackage ../development/libraries/babl { };
 

From 07f7ecdcce7d1b1fc9a1a241ee4c949cb8debe72 Mon Sep 17 00:00:00 2001
From: Arnaud Spiwack <arnaud@spiwack.net>
Date: Tue, 26 Jan 2016 16:09:52 +0100
Subject: [PATCH 0597/2285] Fix usage message in `nix-prefetch-git`

The comment related to the `deepClone` and `no-deepClone` options was
misleading as these options have no relation with submodules, but on the
the depth in `git clone --depth n`.
---
 pkgs/build-support/fetchgit/nix-prefetch-git | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 6cf694dd2b14..945ba592a0ae 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -32,8 +32,8 @@ Options:
       --url url       Any url understand by 'git clone'.
       --rev ref       Any sha1 or references (such as refs/heads/master)
       --hash h        Expected hash.
-      --deepClone     Clone submodules recursively.
-      --no-deepClone  Do not clone submodules.
+      --deepClone     Clone the entire repository.
+      --no-deepClone  Make a shallow clone of just the required ref.
       --leave-dotGit  Keep the .git directories.
       --fetch-submodules Fetch submodules.
       --builder       Clone as fetchgit does, but url, rev, and out option are mandatory.

From f4553d721972e6a437c9f367af2bb0967b773998 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jan 2016 16:21:43 +0100
Subject: [PATCH 0598/2285] defaultUnpack: Preserve timestamps when copying
 files

Commit 6d928ab684327e0eeb1bf6cd889d57ca7127e8a7 changed this to not
preserve timestamps. However, that results in non-determinism; in
particular, it gives us a broken $SOURCE_DATE_EPOCH (especially for
everything using fetchFromGitHub). Builds affected by timestamps <
1980 should be fixed in some other way (e.g. changing the timestamp to
some fixed date > 1980).
---
 pkgs/stdenv/generic/setup.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index d8de9ab2390b..102a8f2f71c5 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -480,9 +480,11 @@ _defaultUnpack() {
     if [ -d "$fn" ]; then
 
         stripHash "$fn"
-        # We can't preserve hardlinks because they may have been introduced by
-        # store optimization, which might break things in the build
-        cp -pr --reflink=auto --no-preserve=timestamps "$fn" $strippedName
+
+        # We can't preserve hardlinks because they may have been
+        # introduced by store optimization, which might break things
+        # in the build.
+        cp -pr --reflink=auto "$fn" $strippedName
 
     else
 

From 2352e2589ea0de775ffb6b68e66964c694953ea9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 18 Jan 2016 13:57:27 +0100
Subject: [PATCH 0599/2285] audit: Disable in containers

This barfs:

Jan 18 12:46:32 machine 522i0x9l80z7gw56iahxjjsdjp0xi10q-audit-start[506]: The audit system is disabled
---
 nixos/modules/security/audit.nix                  | 4 +++-
 nixos/modules/virtualisation/container-config.nix | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/security/audit.nix b/nixos/modules/security/audit.nix
index 3aa31e079073..f223f52ec487 100644
--- a/nixos/modules/security/audit.nix
+++ b/nixos/modules/security/audit.nix
@@ -93,9 +93,11 @@ in {
 
   config = mkIf (cfg.enable == "lock" || cfg.enable) {
     systemd.services.audit = {
-      description = "pseudo-service representing the kernel audit state";
+      description = "Kernel Auditing";
       wantedBy = [ "basic.target" ];
 
+      unitConfig.ConditionVirtualization = "!container";
+
       path = [ pkgs.audit ];
 
       serviceConfig = {
diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix
index c210c8d5f25e..b4f9d8b6fc17 100644
--- a/nixos/modules/virtualisation/container-config.nix
+++ b/nixos/modules/virtualisation/container-config.nix
@@ -19,6 +19,9 @@ with lib;
     # Shut up warnings about not having a boot loader.
     system.build.installBootLoader = "${pkgs.coreutils}/bin/true";
 
+    # Not supported in systemd-nspawn containers.
+    security.audit.enable = false;
+
   };
 
 }

From 1d20ec0ff9b8b87a9ac66ce587cc45b2f9d884a3 Mon Sep 17 00:00:00 2001
From: Patrick Mahoney <pat@polycrystal.org>
Date: Sun, 24 Jan 2016 23:21:07 -0600
Subject: [PATCH 0600/2285] mono: build on darwin

---
 pkgs/development/compilers/mono/default.nix | 10 ++++++----
 pkgs/top-level/all-packages.nix             |  5 ++++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix
index a7a4d8da4edc..940089cafe92 100644
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert }:
+{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc }:
 
 let
   llvm     = callPackage ./llvm.nix { };
@@ -14,10 +14,12 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib
-    ];
+    ]
+    ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]);
+
   propagatedBuildInputs = [glib];
 
-  NIX_LDFLAGS = "-lgcc_s" ;
+  NIX_LDFLAGS = if stdenv.isDarwin then "" else "-lgcc_s" ;
 
   # To overcome the bug https://bugzilla.novell.com/show_bug.cgi?id=644723
   dontDisableStatic = true;
@@ -68,7 +70,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://mono-project.com/;
     description = "Cross platform, open source .NET development framework";
-    platforms = with stdenv.lib.platforms; linux;
+    platforms = with stdenv.lib.platforms; darwin ++ linux;
     maintainers = with stdenv.lib.maintainers; [ viric thoughtpolice obadz ];
     license = stdenv.lib.licenses.free; # Combination of LGPL/X11/GPL ?
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7801abec0483..d354e635804d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4369,7 +4369,10 @@ let
 
   mlton = callPackage ../development/compilers/mlton { };
 
-  mono = callPackage ../development/compilers/mono {};
+  mono = callPackage ../development/compilers/mono {
+    inherit (darwin) libobjc;
+    inherit (darwin.apple_sdk.frameworks) Foundation;
+  };
 
   monoDLLFixer = callPackage ../build-support/mono-dll-fixer { };
 

From 7d2f8eca1beaae3b94c568707698c6d612b0d645 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 26 Jan 2016 16:48:28 +0100
Subject: [PATCH 0601/2285] Revert "lz4: be just a bit more reproducible"

This reverts commit efc359c23135ebccc2835b37513f01adf73e2dac,
as it is no longer needed.

See: https://github.com/NixOS/nixpkgs/commit/efc359c23135ebccc2835b37513f01adf73e2dac#commitcomment-15680107
---
 pkgs/tools/compression/lz4/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/compression/lz4/default.nix b/pkgs/tools/compression/lz4/default.nix
index cdc42e4b8488..8340ea3fe8b0 100644
--- a/pkgs/tools/compression/lz4/default.nix
+++ b/pkgs/tools/compression/lz4/default.nix
@@ -11,17 +11,8 @@ stdenv.mkDerivation rec {
     owner = "Cyan4973";
   };
 
-  patches = [ ./install-on-freebsd.patch ] ;
-
   buildInputs = stdenv.lib.optional doCheck valgrind;
 
-  # An ever-changing __DATE__ isn't very reproducible, so we must override it.
-  # But rather than displaying "()" or 1970, let --version show useful info:
-  NIX_CFLAGS_COMPILE = [
-    ''-D__DATE__="${stdenv.cc.cc.name}"''
-    "-Wno-builtin-macro-redefined"
-  ];
-
   enableParallelBuilding = true;
 
   makeFlags = [ "PREFIX=$(out)" ];
@@ -29,6 +20,8 @@ stdenv.mkDerivation rec {
   doCheck = false; # tests take a very long time
   checkTarget = "test";
 
+  patches = [ ./install-on-freebsd.patch ] ;
+
   meta = with stdenv.lib; {
     description = "Extremely fast compression algorithm";
     longDescription = ''

From 42e53ba62c46d3f48440a5859f3530ba54fe25d8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 26 Jan 2016 16:54:54 +0100
Subject: [PATCH 0602/2285] nix: 1.10 -> 1.11.1

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index b7b240780773..d615ac10646a 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -89,13 +89,15 @@ in rec {
    nix = nixStable;
 
    nixStable = common rec {
-     name = "nix-1.10";
+     name = "nix-1.11.1";
      src = fetchurl {
        url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-       sha256 = "5612ca7a549dd1ee20b208123e041aaa95a414a0e8f650ea88c672dc023d10f6";
+       sha256 = "21a99b3d0afdbe10241aaf506738fd0a81ff868e3d7c666e3cb6b621a926ea7a";
      };
    };
 
+   nixUnstable = nixStable;
+   /*
    nixUnstable = lib.lowPrio (common rec {
      name = "nix-1.11pre4379_786046c";
      src = fetchurl {
@@ -103,5 +105,6 @@ in rec {
        sha256 = "ff42c70697fce7ca6eade622a31e5fbe45aed0edf1204fb491b40df207a807d5";
      };
    });
+   */
 
 }

From 137c15fa3b0b90a5256a3d6f61565c60cebb7b13 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 26 Jan 2016 17:43:49 +0100
Subject: [PATCH 0603/2285] goPackages.go-humanize: init at git-25.11.2015

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index a519233e3af0..8d90ebf72fa7 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1413,6 +1413,13 @@ let
     sha256 = "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g";
   };
 
+  go-humanize = buildFromGitHub {
+    rev = "8929fe90cee4b2cb9deb468b51fb34eba64d1bf0";
+    owner = "dustin";
+    repo = "go-humanize";
+    sha256 = "1g155kxjh6hd3ibx41nbpj6f7h5bh54zgl9dr53xzg2xlxljgjy0";
+  };
+
   go-ini = buildFromGitHub {
     rev    = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1";
     owner  = "vaughan0";

From f562908040fb59cdd4c10e7dd51b2fa16c61c7e7 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 26 Jan 2016 17:45:20 +0100
Subject: [PATCH 0604/2285] goPackages.uilive: init at git-24.12.2015

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 8d90ebf72fa7..7f975ac5920a 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3416,6 +3416,13 @@ let
     sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw";
   };
 
+  uilive = buildFromGitHub {
+    rev = "1b9b73fa2b2cc24489b1aba4d29a82b12cd0a71f";
+    owner = "gosuri";
+    repo = "uilive";
+    sha256 = "0669f21hd5cw74irrfakdpvxn608cd5xy6s2nyp5kgcy2ijrq4ab";
+  };
+
   urlesc = buildFromGitHub {
     rev    = "5fa9ff0392746aeae1c4b37fcc42c65afa7a9587";
     owner  = "opennota";

From 62227e1ca17a55c69b0c90a1bc88fc172d37dfdc Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 26 Jan 2016 17:46:07 +0100
Subject: [PATCH 0605/2285] goPackages.uiprogress: init at git-24.12.2015

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 7f975ac5920a..e4fe7c8b8091 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3423,6 +3423,14 @@ let
     sha256 = "0669f21hd5cw74irrfakdpvxn608cd5xy6s2nyp5kgcy2ijrq4ab";
   };
 
+  uiprogress = buildFromGitHub {
+    buildInputs = [ uilive ];
+    rev = "fd1c82df78a6c1f5ddbd3b6ec46407ea0acda1ad";
+    owner = "gosuri";
+    repo = "uiprogress";
+    sha256 = "1s61vp2h6n1d8y1zqr2ca613ch5n18rx28waz6a8im94sgzzawp7";
+  };
+
   urlesc = buildFromGitHub {
     rev    = "5fa9ff0392746aeae1c4b37fcc42c65afa7a9587";
     owner  = "opennota";

From 7173d5d0fec36692548e39f97b8f6341c7eeee5b Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 26 Jan 2016 17:47:44 +0100
Subject: [PATCH 0606/2285] goPackages.go-backblaze: init at git-13.12.2015

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index e4fe7c8b8091..b53f7d524039 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1228,6 +1228,15 @@ let
     propagatedBuildInputs = [ pretty ];
   };
 
+  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}";

From 890f000146eb499a9ab292ec875f7bf0c99701af Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 26 Jan 2016 17:54:53 +0100
Subject: [PATCH 0607/2285] goPackages.git-annex-remote-b2: init at 0.2

---
 .../version-management/git-and-tools/default.nix          | 2 ++
 pkgs/top-level/go-packages.nix                            | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 1bf58195f5eb..0aea48cb0562 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -45,6 +45,8 @@ rec {
   git-annex = pkgs.haskellPackages.git-annex-with-assistant;
   gitAnnex = git-annex;
 
+  git-annex-remote-b2 = pkgs.goPackages.git-annex-remote-b2;
+
   qgit = import ./qgit {
     inherit fetchurl stdenv;
     inherit (xorg) libXext libX11;
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index b53f7d524039..7a80200c60d8 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -862,6 +862,14 @@ let
     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";

From cf40e86fb01959787ed99fe8528c97a5c3b4fec7 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Tue, 26 Jan 2016 18:12:01 +0100
Subject: [PATCH 0608/2285] nginx: 1.8.0->1.8.1, 1.9.9->1.9.10

---
 pkgs/servers/http/nginx/default.nix  | 4 ++--
 pkgs/servers/http/nginx/unstable.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index f6b4771e951e..6944a89477ad 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -6,10 +6,10 @@
 with stdenv.lib;
 
 let
-  version = "1.8.0";
+  version = "1.8.1";
   mainSrc = fetchurl {
     url = "http://nginx.org/download/nginx-${version}.tar.gz";
-    sha256 = "1mgkkmmwkhmpn68sdvbd73ssv6lpqhh864fsyvc1ij4hk4is3k13";
+    sha256 = "1dwpyw4pvhj68vxramqxm8f79pqz9lrm8mvifbn49h3615ikqjwg";
   };
 
 in
diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix
index ae8245d57141..994a3a294801 100644
--- a/pkgs/servers/http/nginx/unstable.nix
+++ b/pkgs/servers/http/nginx/unstable.nix
@@ -7,10 +7,10 @@
 with stdenv.lib;
 
 let
-  version = "1.9.9";
+  version = "1.9.10";
   mainSrc = fetchurl {
     url = "http://nginx.org/download/nginx-${version}.tar.gz";
-    sha256 = "0wwd0q00pnkw4gjn3izjr63sndp7piyc5k5mbjm369f824mvnrny";
+    sha256 = "1n9icvi9hq7gak21ixlhcyazjx2yjqlbws07i2habc6a8ildf57v";
   };
 
 in

From 2817a53f2e2eb628e4555a64e8c4124103c0db47 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 26 Jan 2016 17:32:49 +0100
Subject: [PATCH 0609/2285] duplicity: 0.7.02 -> 0.7.06

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

diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix
index 556b96512009..ea58ca3f8c1c 100644
--- a/pkgs/tools/backup/duplicity/default.nix
+++ b/pkgs/tools/backup/duplicity/default.nix
@@ -3,14 +3,14 @@
 }:
 
 let
-  version = "0.7.02";
+  version = "0.7.06";
 in
 stdenv.mkDerivation {
   name = "duplicity-${version}";
 
   src = fetchurl {
     url = "http://code.launchpad.net/duplicity/0.7-series/${version}/+download/duplicity-${version}.tar.gz";
-    sha256 = "0fh3xl4xc7cpi7iam34qd0ndqp1641kfw2609yp40lr78fx65530";
+    sha256 = "133zdi1rbiacvzjys7q3vjm7x84kmr51bsgs037rjhw9vdg5jx80";
   };
 
   installPhase = ''

From 7bec7136c0759be8f1f6f9b556a6ccacd08359d4 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 26 Jan 2016 19:17:10 +0100
Subject: [PATCH 0610/2285] b2: init at git-26.01.2016

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

diff --git a/pkgs/tools/backup/b2/default.nix b/pkgs/tools/backup/b2/default.nix
new file mode 100644
index 000000000000..15a48b765798
--- /dev/null
+++ b/pkgs/tools/backup/b2/default.nix
@@ -0,0 +1,30 @@
+{ fetchFromGitHub, pythonPackages, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "b2-${version}";
+  version = "git-26.01.2016";
+
+  src = fetchFromGitHub {
+    owner = "Backblaze";
+    repo = "B2_Command_Line_Tool";
+    rev = "b3f06fd53eb1c9a07740b962284753cba413a7b8";
+    sha256 = "0kn2lkh8hp6g8q88glyz03z1r8a47pqm91dc5w083i334swqkjp2";
+  };
+
+  buildInputs = [ pythonPackages.wrapPython ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp b2 $out/bin
+  '';
+
+  postInstall = "wrapPythonPrograms";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/Backblaze/B2_Command_Line_Tool;
+    description = "CLI for accessing Backblaze's B2 Cloud Storage";
+    license = licenses.mit;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ hrdinka ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96f91be75052..bd370da16c80 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -972,6 +972,8 @@ let
 
   asynk = callPackage ../tools/networking/asynk { };
 
+  b2 = callPackage ../tools/backup/b2 { };
+
   bacula = callPackage ../tools/backup/bacula { };
 
   bareos = callPackage ../tools/backup/bareos { };

From dc1f06bc47a74f2755a5d6e0a854462d9c08bfb3 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Sat, 5 Dec 2015 18:13:36 +0200
Subject: [PATCH 0611/2285] Use "out", not "dev" for  dlopen'able libraries

---
 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 a5fa5974cbf3..443a4ab5cf97 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2565,7 +2565,7 @@ in modules // {
 
     patchPhase = ''
       # Hardcode cairo library path
-      sed -e 's,ffi\.dlopen(,&"${pkgs.cairo}/lib/" + ,' -i cairocffi/__init__.py
+      sed -e 's,ffi\.dlopen(,&"${pkgs.cairo.out}/lib/" + ,' -i cairocffi/__init__.py
     '';
 
     meta = {
@@ -23731,7 +23731,7 @@ in modules // {
 
     patchPhase = ''
       # Hardcode cairo library path
-      sed -e 's,ffi\.dlopen(,&"${pkgs.xorg.libxcb}/lib/" + ,' -i xcffib/__init__.py
+      sed -e 's,ffi\.dlopen(,&"${pkgs.xorg.libxcb.out}/lib/" + ,' -i xcffib/__init__.py
     '';
 
     propagatedBuildInputs = [ self.cffi self.six ];

From f07a7fc5fde030ac4262324fde94983da385fb80 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Sat, 5 Dec 2015 18:14:35 +0200
Subject: [PATCH 0612/2285] qtile: dlopen'able path now are in "out", not "dev"

---
 pkgs/applications/window-managers/qtile/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix
index 19434da71176..8af46f52354a 100644
--- a/pkgs/applications/window-managers/qtile/default.nix
+++ b/pkgs/applications/window-managers/qtile/default.nix
@@ -24,9 +24,9 @@ buildPythonPackage rec {
 
   postPatch = ''
     substituteInPlace libqtile/manager.py --subst-var-by out $out
-    substituteInPlace libqtile/pangocffi.py --subst-var-by glib ${pkgs.glib}
-    substituteInPlace libqtile/pangocffi.py --subst-var-by pango ${pkgs.pango}
-    substituteInPlace libqtile/xcursors.py --subst-var-by xcb-cursor ${pkgs.xorg.xcbutilcursor}
+    substituteInPlace libqtile/pangocffi.py --subst-var-by glib ${pkgs.glib.out}
+    substituteInPlace libqtile/pangocffi.py --subst-var-by pango ${pkgs.pango.out}
+    substituteInPlace libqtile/xcursors.py --subst-var-by xcb-cursor ${pkgs.xorg.xcbutilcursor.out}
   '';
 
   buildInputs = [ pkgs.pkgconfig pkgs.glib pkgs.xorg.libxcb pkgs.cairo pkgs.pango python27Packages.xcffib ];

From 9c6f3dcbcc52bbfdc98fff6ac781431e3244010d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 26 Jan 2016 22:35:34 +0100
Subject: [PATCH 0613/2285] cpuminer: 2.4.2 -> 2.4.3

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

diff --git a/pkgs/tools/misc/cpuminer/default.nix b/pkgs/tools/misc/cpuminer/default.nix
index 713c0a92329f..67249161e841 100644
--- a/pkgs/tools/misc/cpuminer/default.nix
+++ b/pkgs/tools/misc/cpuminer/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "cpuminer-${version}";
-  version = "2.4.2";
+  version = "2.4.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/cpuminer/pooler-${name}.tar.gz";
-    sha256 = "1ds5yfxf25pd8y5z5gh689qb80m4dqw2dy3yx87hibnprlaiym0n";
+    sha256 = "1p66v96pz3vk1khwlmc26fg2d06c001755rrkcdv5wh8zyg6wv99";
   };
 
   buildInputs = [ curl jansson ];

From 5bbf10409ee2d2a5a8304e440067da6ad7e0277c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 27 Jan 2016 00:45:21 +0300
Subject: [PATCH 0614/2285] steam: actually propagate flags to the runtime, now
 from chrootenv wrapper

Example: instead of

(steamPackages.override { newStdcpp = true; }).steam-chrootenv

(which wasn't working anyway) you now do just:

steam.override { newStdcpp = true; }
---
 pkgs/games/steam/chrootenv.nix | 11 ++++++++---
 pkgs/games/steam/default.nix   | 10 ++--------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix
index fc0e70e43549..e6652d2f0239 100644
--- a/pkgs/games/steam/chrootenv.nix
+++ b/pkgs/games/steam/chrootenv.nix
@@ -1,6 +1,9 @@
 { lib, buildFHSUserEnv, steam
-, withJava   ? false
+, withJava ? false
 , withPrimus ? false
+, nativeOnly ? false
+, runtimeOnly ? false
+, newStdcpp ? false
 }:
 
 buildFHSUserEnv {
@@ -20,7 +23,7 @@ buildFHSUserEnv {
       # Needed by gdialog, including in the steam-runtime
       perl
     ]
-    ++ lib.optional withJava   jdk
+    ++ lib.optional withJava jdk
     ++ lib.optional withPrimus primus
     ;
 
@@ -38,7 +41,9 @@ buildFHSUserEnv {
       gst_all_1.gst-plugins-ugly
       libdrm
 
-      steamPackages.steam-runtime-wrapped
+      (steamPackages.steam-runtime-wrapped.override {
+        inherit nativeOnly runtimeOnly newStdcpp;
+      })
     ];
 
   extraBuildCommands = ''
diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
index dd02903dcb28..64f8cfe2c287 100644
--- a/pkgs/games/steam/default.nix
+++ b/pkgs/games/steam/default.nix
@@ -1,17 +1,11 @@
-{ pkgs, newScope
-, nativeOnly ? false
-, runtimeOnly ? false
-, newStdcpp ? false
-}:
+{ pkgs, newScope }:
 
 let
   callPackage = newScope self;
 
   self = rec {
     steam-runtime = callPackage ./runtime.nix { };
-    steam-runtime-wrapped = callPackage ./runtime-wrapped.nix {
-      inherit nativeOnly runtimeOnly newStdcpp;
-    };
+    steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { };
     steam = callPackage ./steam.nix { };
     steam-chrootenv = callPackage ./chrootenv.nix { };
     steam-fonts = callPackage ./fonts.nix { };

From ed8b81e0df72978e0cbc09723895f9080c757239 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 27 Jan 2016 00:16:14 +0100
Subject: [PATCH 0615/2285] simplescreenrecorder: update to version 0.3.6

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

diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix
index 8560b83d5fa6..a5fb122cf897 100644
--- a/pkgs/applications/video/simplescreenrecorder/default.nix
+++ b/pkgs/applications/video/simplescreenrecorder/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "simplescreenrecorder-${version}";
-  version = "0.3.3";
+  version = "0.3.6";
 
   src = fetchurl {
     url = "https://github.com/MaartenBaert/ssr/archive/${version}.tar.gz";
-    sha256 = "09mcmvqbzq2blv404pklv6fc8ci3a9090p42rdsgmlr775bdyxfb";
+    sha256 = "1d89ncspjd8c4mckf0nb6y3hrxpv4rjpbj868pznhvfmdgr5nvql";
   };
 
   buildInputs = [

From 0d8c3e278be69719e945e2faac0ca159b5e9d2d7 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 22 Jan 2016 22:30:50 +0100
Subject: [PATCH 0616/2285] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20151217-9-geddefc2 using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/066b92d429fc10e5288603162b130b335865da0b
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/e664cee71ef4400b3d1898d5468ec5f8592ffd87
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/9b9c0dc0e337ee769438a8da43f3a7af0279b809
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/c5293e6b9b6dc7eb2066f1cd685e8982149d1d94
---
 .../haskell-modules/configuration-lts-0.0.nix |   15 +
 .../haskell-modules/configuration-lts-0.1.nix |   15 +
 .../haskell-modules/configuration-lts-0.2.nix |   15 +
 .../haskell-modules/configuration-lts-0.3.nix |   15 +
 .../haskell-modules/configuration-lts-0.4.nix |   15 +
 .../haskell-modules/configuration-lts-0.5.nix |   15 +
 .../haskell-modules/configuration-lts-0.6.nix |   16 +
 .../haskell-modules/configuration-lts-0.7.nix |   16 +
 .../haskell-modules/configuration-lts-1.0.nix |   16 +
 .../haskell-modules/configuration-lts-1.1.nix |   16 +
 .../configuration-lts-1.10.nix                |   16 +
 .../configuration-lts-1.11.nix                |   16 +
 .../configuration-lts-1.12.nix                |   16 +
 .../configuration-lts-1.13.nix                |   16 +
 .../configuration-lts-1.14.nix                |   16 +
 .../configuration-lts-1.15.nix                |   17 +-
 .../haskell-modules/configuration-lts-1.2.nix |   16 +
 .../haskell-modules/configuration-lts-1.4.nix |   16 +
 .../haskell-modules/configuration-lts-1.5.nix |   16 +
 .../haskell-modules/configuration-lts-1.7.nix |   16 +
 .../haskell-modules/configuration-lts-1.8.nix |   16 +
 .../haskell-modules/configuration-lts-1.9.nix |   16 +
 .../haskell-modules/configuration-lts-2.0.nix |   17 +-
 .../haskell-modules/configuration-lts-2.1.nix |   17 +-
 .../configuration-lts-2.10.nix                |   17 +-
 .../configuration-lts-2.11.nix                |   17 +-
 .../configuration-lts-2.12.nix                |   17 +-
 .../configuration-lts-2.13.nix                |   17 +-
 .../configuration-lts-2.14.nix                |   17 +-
 .../configuration-lts-2.15.nix                |   17 +-
 .../configuration-lts-2.16.nix                |   17 +-
 .../configuration-lts-2.17.nix                |   17 +-
 .../configuration-lts-2.18.nix                |   17 +-
 .../configuration-lts-2.19.nix                |   17 +-
 .../haskell-modules/configuration-lts-2.2.nix |   17 +-
 .../configuration-lts-2.20.nix                |   17 +-
 .../configuration-lts-2.21.nix                |   17 +-
 .../configuration-lts-2.22.nix                |   17 +-
 .../haskell-modules/configuration-lts-2.3.nix |   17 +-
 .../haskell-modules/configuration-lts-2.4.nix |   17 +-
 .../haskell-modules/configuration-lts-2.5.nix |   17 +-
 .../haskell-modules/configuration-lts-2.6.nix |   17 +-
 .../haskell-modules/configuration-lts-2.7.nix |   17 +-
 .../haskell-modules/configuration-lts-2.8.nix |   17 +-
 .../haskell-modules/configuration-lts-2.9.nix |   17 +-
 .../haskell-modules/configuration-lts-3.0.nix |   22 +-
 .../haskell-modules/configuration-lts-3.1.nix |   22 +-
 .../configuration-lts-3.10.nix                |   27 +-
 .../configuration-lts-3.11.nix                |   27 +-
 .../configuration-lts-3.12.nix                |   27 +-
 .../configuration-lts-3.13.nix                |   27 +-
 .../configuration-lts-3.14.nix                |   27 +-
 .../configuration-lts-3.15.nix                |   28 +-
 .../configuration-lts-3.16.nix                |   28 +-
 .../configuration-lts-3.17.nix                |   29 +-
 .../configuration-lts-3.18.nix                |   29 +-
 .../configuration-lts-3.19.nix                |   29 +-
 .../haskell-modules/configuration-lts-3.2.nix |   22 +-
 .../configuration-lts-3.20.nix                |   30 +-
 .../configuration-lts-3.21.nix                |   31 +-
 .../configuration-lts-3.22.nix                |   31 +-
 .../haskell-modules/configuration-lts-3.3.nix |   23 +-
 .../haskell-modules/configuration-lts-3.4.nix |   23 +-
 .../haskell-modules/configuration-lts-3.5.nix |   23 +-
 .../haskell-modules/configuration-lts-3.6.nix |   23 +-
 .../haskell-modules/configuration-lts-3.7.nix |   24 +-
 .../haskell-modules/configuration-lts-3.8.nix |   24 +-
 .../haskell-modules/configuration-lts-3.9.nix |   25 +-
 .../haskell-modules/configuration-lts-4.0.nix |   36 +-
 .../haskell-modules/configuration-lts-4.1.nix |   36 +-
 .../haskell-modules/configuration-lts-4.2.nix |   36 +-
 .../haskell-modules/configuration-lts-5.0.nix | 7558 +++++++++++++++++
 .../haskell-modules/hackage-packages.nix      | 1746 +++-
 73 files changed, 10269 insertions(+), 482 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/configuration-lts-5.0.nix

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index 4e3fda8b5d23..9cda25a90573 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -1576,6 +1576,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3680,6 +3681,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4601,6 +4609,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4798,6 +4807,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5578,6 +5588,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5935,6 +5946,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6103,6 +6115,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6489,6 +6502,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -7957,6 +7971,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index a9ab5b582103..300a95e2c17c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -1576,6 +1576,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3680,6 +3681,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4601,6 +4609,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4798,6 +4807,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5578,6 +5588,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5935,6 +5946,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6103,6 +6115,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6489,6 +6502,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -7957,6 +7971,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 6818ecf8d0fb..12c95ce49f95 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -1576,6 +1576,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3680,6 +3681,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4601,6 +4609,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4798,6 +4807,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5578,6 +5588,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5935,6 +5946,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6103,6 +6115,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6489,6 +6502,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -7957,6 +7971,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index 295e11b60b2d..6e5603e3a840 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -1576,6 +1576,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3680,6 +3681,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4601,6 +4609,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4798,6 +4807,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5578,6 +5588,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5935,6 +5946,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6103,6 +6115,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6489,6 +6502,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -7957,6 +7971,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index 0334003db169..a69e82064c4e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -1576,6 +1576,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3679,6 +3680,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4598,6 +4606,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4795,6 +4804,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5575,6 +5585,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5932,6 +5943,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6100,6 +6112,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6486,6 +6499,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -7953,6 +7967,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index 4042ab797b9a..be91dee6bc66 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -1576,6 +1576,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3679,6 +3680,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4598,6 +4606,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4795,6 +4804,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5575,6 +5585,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5932,6 +5943,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6100,6 +6112,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6486,6 +6499,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -7953,6 +7967,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index f1ef0fc40118..d62988266a98 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -1428,6 +1428,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1574,6 +1575,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3677,6 +3679,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4595,6 +4604,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4792,6 +4802,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5572,6 +5583,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5929,6 +5941,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6096,6 +6109,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6482,6 +6496,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -7948,6 +7963,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index 56377c59a86e..5e546e41bc22 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -1428,6 +1428,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1574,6 +1575,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3677,6 +3679,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4595,6 +4604,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4792,6 +4802,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5572,6 +5583,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5929,6 +5941,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6096,6 +6109,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6482,6 +6496,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -7948,6 +7963,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index 4ddb79ea5c30..977351aaf2a0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -1424,6 +1424,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1570,6 +1571,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3666,6 +3668,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4583,6 +4592,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4780,6 +4790,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5560,6 +5571,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5917,6 +5929,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6084,6 +6097,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6470,6 +6484,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -7934,6 +7949,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index 3ff3228c11e0..865b55aa960a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -1424,6 +1424,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1570,6 +1571,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3663,6 +3665,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4577,6 +4586,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4774,6 +4784,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5554,6 +5565,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13_1";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5910,6 +5922,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6077,6 +6090,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6463,6 +6477,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -7925,6 +7940,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index 156834d1b014..a420ff8f774f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -1423,6 +1423,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1569,6 +1570,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3654,6 +3656,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4566,6 +4575,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4758,6 +4768,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5537,6 +5548,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13_1";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5892,6 +5904,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6058,6 +6071,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6443,6 +6457,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -7900,6 +7915,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index 68580bd646a2..28c5d043681b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -1423,6 +1423,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1569,6 +1570,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3653,6 +3655,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4565,6 +4574,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4756,6 +4766,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5533,6 +5544,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13_1";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5888,6 +5900,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6054,6 +6067,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6439,6 +6453,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -7896,6 +7911,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 94567fa0531c..2f285e680dd2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -1423,6 +1423,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1569,6 +1570,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3653,6 +3655,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4564,6 +4573,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4755,6 +4765,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5532,6 +5543,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13_1";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5887,6 +5899,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6053,6 +6066,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6438,6 +6452,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -7895,6 +7910,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 0dca6ed6feb7..01a2bf5d0821 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -1423,6 +1423,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1569,6 +1570,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3653,6 +3655,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4563,6 +4572,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4754,6 +4764,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5531,6 +5542,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13_1";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5886,6 +5898,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6052,6 +6065,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6437,6 +6451,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -7893,6 +7908,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 25759fe1307b..6a6e7ca80973 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -1422,6 +1422,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1567,6 +1568,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3650,6 +3652,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4559,6 +4568,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4750,6 +4760,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5526,6 +5537,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13_1";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5880,6 +5892,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6046,6 +6059,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6431,6 +6445,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -7886,6 +7901,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index f03bbb954901..76f95bd450e1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -1421,6 +1421,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1566,6 +1567,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3646,6 +3648,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4555,6 +4564,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4746,6 +4756,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5522,6 +5533,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13_1";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5874,6 +5886,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6040,6 +6053,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6425,6 +6439,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6691,7 +6706,6 @@ self: super: {
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
   "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7877,6 +7891,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index 0a3a26697ebc..8ab51220e9a7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -1424,6 +1424,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1570,6 +1571,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3660,6 +3662,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4574,6 +4583,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4771,6 +4781,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5551,6 +5562,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13_1";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5907,6 +5919,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6074,6 +6087,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6459,6 +6473,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -7919,6 +7934,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index 11546e04a4ab..e4dbbab73874 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -1423,6 +1423,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1569,6 +1570,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3658,6 +3660,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4571,6 +4580,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4768,6 +4778,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5548,6 +5559,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13_1";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5903,6 +5915,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6070,6 +6083,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6455,6 +6469,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -7914,6 +7929,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index 974e9e051864..be2d731b3f3a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -1423,6 +1423,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1569,6 +1570,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3657,6 +3659,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4570,6 +4579,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4767,6 +4777,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5547,6 +5558,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13_1";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5902,6 +5914,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6069,6 +6082,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6454,6 +6468,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -7913,6 +7928,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index 554ba8f04202..6617b79bd822 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -1423,6 +1423,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1569,6 +1570,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3657,6 +3659,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4570,6 +4579,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4762,6 +4772,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5542,6 +5553,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13_1";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5897,6 +5909,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6064,6 +6077,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6449,6 +6463,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -7908,6 +7923,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index d79f2da11d62..a9a8963aa99b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -1423,6 +1423,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1569,6 +1570,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3655,6 +3657,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4567,6 +4576,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4759,6 +4769,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5538,6 +5549,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13_1";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5893,6 +5905,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6060,6 +6073,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6445,6 +6459,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -7904,6 +7919,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index 64c8026b7291..f14ff6234093 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -1423,6 +1423,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1569,6 +1570,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3654,6 +3656,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4566,6 +4575,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_0_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4758,6 +4768,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5537,6 +5548,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13_1";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5892,6 +5904,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -6059,6 +6072,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6444,6 +6458,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -7903,6 +7918,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 3a14233ea2e3..94b073c821dd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -1412,6 +1412,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1557,6 +1558,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3628,6 +3630,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4531,6 +4540,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_5";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4719,6 +4729,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5484,6 +5495,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13_1";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5827,6 +5839,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5990,6 +6003,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6372,6 +6386,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6637,7 +6652,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7816,6 +7830,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 82b1a353a114..ddcf5efcae64 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -1412,6 +1412,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1557,6 +1558,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3627,6 +3629,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4530,6 +4539,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_5";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4718,6 +4728,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5483,6 +5494,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13_1";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5826,6 +5838,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5989,6 +6002,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6371,6 +6385,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6636,7 +6651,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7815,6 +7829,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index 5ebadb1e29ba..c98889fa2aa9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -1407,6 +1407,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1549,6 +1550,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3608,6 +3610,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4507,6 +4516,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4692,6 +4702,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5451,6 +5462,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5793,6 +5805,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5954,6 +5967,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6333,6 +6347,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6596,7 +6611,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7765,6 +7779,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 623c57152547..472a9215257d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -1406,6 +1406,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1548,6 +1549,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3606,6 +3608,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4504,6 +4513,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4689,6 +4699,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5447,6 +5458,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5788,6 +5800,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5949,6 +5962,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6327,6 +6341,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6590,7 +6605,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7756,6 +7770,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 60498ad14a0d..0a81ae1cdf52 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -1406,6 +1406,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1548,6 +1549,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3606,6 +3608,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4504,6 +4513,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4689,6 +4699,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5447,6 +5458,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5788,6 +5800,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5949,6 +5962,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6327,6 +6341,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6590,7 +6605,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7755,6 +7769,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index 37ab6fddf3a2..7c33ed9182ec 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -1406,6 +1406,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1548,6 +1549,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3606,6 +3608,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4503,6 +4512,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4688,6 +4698,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5445,6 +5456,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5786,6 +5798,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5947,6 +5960,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6325,6 +6339,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6588,7 +6603,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7753,6 +7767,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index e5f971b07b8b..16a9b422305c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -1405,6 +1405,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1547,6 +1548,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3604,6 +3606,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4501,6 +4510,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4685,6 +4695,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5442,6 +5453,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5783,6 +5795,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5944,6 +5957,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6322,6 +6336,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6585,7 +6600,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7749,6 +7763,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index daf74d57f499..140483b7aded 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -1405,6 +1405,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1547,6 +1548,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3603,6 +3605,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4500,6 +4509,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4684,6 +4694,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5441,6 +5452,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5781,6 +5793,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5940,6 +5953,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6318,6 +6332,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6581,7 +6596,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7744,6 +7758,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index 9d7781af7e71..0fcd9376f8e5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -1404,6 +1404,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1546,6 +1547,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3598,6 +3600,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4495,6 +4504,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4679,6 +4689,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5435,6 +5446,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5775,6 +5787,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5934,6 +5947,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6312,6 +6326,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6575,7 +6590,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7738,6 +7752,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index 994024d52987..94cf59753ec8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -1403,6 +1403,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1545,6 +1546,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3593,6 +3595,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4490,6 +4499,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4674,6 +4684,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5430,6 +5441,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5770,6 +5782,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5928,6 +5941,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6306,6 +6320,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6569,7 +6584,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7732,6 +7746,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index ddbb61c0e6cd..1426832df281 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -1403,6 +1403,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1545,6 +1546,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3591,6 +3593,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4487,6 +4496,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4671,6 +4681,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5427,6 +5438,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5767,6 +5779,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5924,6 +5937,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6301,6 +6315,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6564,7 +6579,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7726,6 +7740,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index 0806b361a3a1..9a009d2ceeba 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -1403,6 +1403,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1545,6 +1546,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3590,6 +3592,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4486,6 +4495,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4670,6 +4680,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5426,6 +5437,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5764,6 +5776,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5921,6 +5934,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6298,6 +6312,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6561,7 +6576,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7721,6 +7735,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index a9525906ddad..534c29e83259 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -1411,6 +1411,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1556,6 +1557,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3624,6 +3626,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4527,6 +4536,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_5";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4715,6 +4725,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5480,6 +5491,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13_1";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5823,6 +5835,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5986,6 +5999,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6368,6 +6382,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6633,7 +6648,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7812,6 +7826,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index 6e027c872069..5016b16e2faa 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -1403,6 +1403,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1545,6 +1546,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3589,6 +3591,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4485,6 +4494,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4669,6 +4679,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5425,6 +5436,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5763,6 +5775,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5920,6 +5933,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6296,6 +6310,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6559,7 +6574,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7718,6 +7732,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index dadf8a23dd41..0fbfc8cd3a32 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -1403,6 +1403,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1545,6 +1546,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3589,6 +3591,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4485,6 +4494,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4669,6 +4679,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5424,6 +5435,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5762,6 +5774,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5919,6 +5932,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6295,6 +6309,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6557,7 +6572,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7716,6 +7730,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index e08526634eb5..75fc329a187a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -1403,6 +1403,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1545,6 +1546,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3589,6 +3591,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4484,6 +4493,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4668,6 +4678,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5423,6 +5434,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5760,6 +5772,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5917,6 +5930,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6293,6 +6307,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6555,7 +6570,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7714,6 +7728,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index a7b174ac6973..e5d4da7183fc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -1411,6 +1411,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1556,6 +1557,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3623,6 +3625,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4526,6 +4535,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_5";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4713,6 +4723,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5478,6 +5489,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13_1";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5821,6 +5833,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5984,6 +5997,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6366,6 +6380,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6631,7 +6646,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7810,6 +7824,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index bd91cd5d3abe..711211614556 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -1411,6 +1411,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1556,6 +1557,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3622,6 +3624,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4525,6 +4534,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_5";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4712,6 +4722,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5477,6 +5488,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13_1";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5819,6 +5831,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5982,6 +5995,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6362,6 +6376,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6627,7 +6642,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7805,6 +7819,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 635a2891ed7d..535b00d98b8c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -1411,6 +1411,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1556,6 +1557,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3621,6 +3623,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4524,6 +4533,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_5";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4711,6 +4721,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5475,6 +5486,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13_1";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5817,6 +5829,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5980,6 +5993,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6360,6 +6374,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6625,7 +6640,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7803,6 +7817,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index 8f980cca42f0..b395091088a0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -1409,6 +1409,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1553,6 +1554,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3618,6 +3620,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4519,6 +4528,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4706,6 +4716,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5470,6 +5481,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13_1";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5812,6 +5824,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5974,6 +5987,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6354,6 +6368,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6619,7 +6634,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7797,6 +7811,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 374c8cb12a05..d6d8ea553055 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -1408,6 +1408,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1552,6 +1553,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3617,6 +3619,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4518,6 +4527,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4705,6 +4715,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5469,6 +5480,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13_1";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5812,6 +5824,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5973,6 +5986,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6353,6 +6367,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6618,7 +6633,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7796,6 +7810,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index 0f7c80b6b1c7..1186a62ceec3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -1407,6 +1407,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1551,6 +1552,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3615,6 +3617,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4516,6 +4525,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4702,6 +4712,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5466,6 +5477,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown" = doDistribute super."markdown_0_1_13_1";
   "markdown-kate" = dontDistribute super."markdown-kate";
@@ -5809,6 +5821,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5970,6 +5983,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6350,6 +6364,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6615,7 +6630,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7789,6 +7803,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index 5fac6754c242..cbc857982ef9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -1407,6 +1407,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1549,6 +1550,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3610,6 +3612,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4510,6 +4519,7 @@ self: super: {
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-jenkins" = dontDistribute super."hspec-jenkins";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4695,6 +4705,7 @@ self: super: {
   "hyphenate" = dontDistribute super."hyphenate";
   "hyphenation" = doDistribute super."hyphenation_0_4_2_1";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5458,6 +5469,7 @@ self: super: {
   "mangopay" = dontDistribute super."mangopay";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5800,6 +5812,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5961,6 +5974,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6340,6 +6354,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6605,7 +6620,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7775,6 +7789,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index b9924f20fbd9..afbede23b991 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -124,6 +124,7 @@ self: super: {
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
   "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_1";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -1363,6 +1364,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1499,6 +1501,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3491,6 +3494,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4371,6 +4381,7 @@ self: super: {
   "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4550,6 +4561,7 @@ self: super: {
   "hyperpublic" = dontDistribute super."hyperpublic";
   "hyphenate" = dontDistribute super."hyphenate";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5267,6 +5279,7 @@ self: super: {
   "mangopay" = doDistribute super."mangopay_1_11_4";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5591,6 +5604,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5746,6 +5760,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6106,6 +6121,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6367,7 +6383,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7503,6 +7518,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7959,6 +7975,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = dontDistribute super."userid";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index c81484ff3fb6..b6ef780dd644 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -124,6 +124,7 @@ self: super: {
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
   "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_1";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -1362,6 +1363,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1498,6 +1500,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3488,6 +3491,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4368,6 +4378,7 @@ self: super: {
   "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4547,6 +4558,7 @@ self: super: {
   "hyperpublic" = dontDistribute super."hyperpublic";
   "hyphenate" = dontDistribute super."hyphenate";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5263,6 +5275,7 @@ self: super: {
   "mangopay" = doDistribute super."mangopay_1_11_4";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5586,6 +5599,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5741,6 +5755,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6100,6 +6115,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6361,7 +6377,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -7496,6 +7511,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7952,6 +7968,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = dontDistribute super."userid";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index c9947c4a0ca1..02f10dd48581 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -123,6 +123,8 @@ self: super: {
   "BitSyntax" = dontDistribute super."BitSyntax";
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
+  "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_3";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -1349,6 +1351,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1484,6 +1487,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -1772,6 +1776,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_8";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1991,6 +1996,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_4_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -2742,6 +2748,7 @@ self: super: {
   "empty" = dontDistribute super."empty";
   "encoding" = dontDistribute super."encoding";
   "endo" = dontDistribute super."endo";
+  "engine-io" = doDistribute super."engine-io_1_2_11";
   "engine-io-snap" = dontDistribute super."engine-io-snap";
   "engine-io-wai" = dontDistribute super."engine-io-wai";
   "engine-io-yesod" = dontDistribute super."engine-io-yesod";
@@ -3446,6 +3453,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4319,6 +4333,7 @@ self: super: {
   "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4498,6 +4513,7 @@ self: super: {
   "hyperpublic" = dontDistribute super."hyperpublic";
   "hyphenate" = dontDistribute super."hyphenate";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5205,6 +5221,7 @@ self: super: {
   "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5524,6 +5541,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5677,6 +5695,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -5827,6 +5846,7 @@ self: super: {
   "pandoc-lens" = dontDistribute super."pandoc-lens";
   "pandoc-placetable" = dontDistribute super."pandoc-placetable";
   "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-types" = doDistribute super."pandoc-types_1_12_4_7";
   "pandoc-unlit" = dontDistribute super."pandoc-unlit";
   "pango" = doDistribute super."pango_0_13_1_0";
   "papillon" = dontDistribute super."papillon";
@@ -6030,6 +6050,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6284,7 +6305,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7401,6 +7421,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7853,6 +7874,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = dontDistribute super."userid";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index a2908fa2174f..bbd0f94695ac 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -123,6 +123,8 @@ self: super: {
   "BitSyntax" = dontDistribute super."BitSyntax";
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
+  "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_3";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -1349,6 +1351,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1484,6 +1487,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -1770,6 +1774,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_8";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1989,6 +1994,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_4_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -2740,6 +2746,7 @@ self: super: {
   "empty" = dontDistribute super."empty";
   "encoding" = dontDistribute super."encoding";
   "endo" = dontDistribute super."endo";
+  "engine-io" = doDistribute super."engine-io_1_2_11";
   "engine-io-snap" = dontDistribute super."engine-io-snap";
   "engine-io-wai" = dontDistribute super."engine-io-wai";
   "engine-io-yesod" = dontDistribute super."engine-io-yesod";
@@ -3443,6 +3450,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4316,6 +4330,7 @@ self: super: {
   "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4495,6 +4510,7 @@ self: super: {
   "hyperpublic" = dontDistribute super."hyperpublic";
   "hyphenate" = dontDistribute super."hyphenate";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5202,6 +5218,7 @@ self: super: {
   "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5521,6 +5538,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5674,6 +5692,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -5824,6 +5843,7 @@ self: super: {
   "pandoc-lens" = dontDistribute super."pandoc-lens";
   "pandoc-placetable" = dontDistribute super."pandoc-placetable";
   "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-types" = doDistribute super."pandoc-types_1_12_4_7";
   "pandoc-unlit" = dontDistribute super."pandoc-unlit";
   "pango" = doDistribute super."pango_0_13_1_0";
   "papillon" = dontDistribute super."papillon";
@@ -6026,6 +6046,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6280,7 +6301,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7396,6 +7416,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7848,6 +7869,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = dontDistribute super."userid";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index 84dc56c88d00..a6de95aeb09c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -123,6 +123,8 @@ self: super: {
   "BitSyntax" = dontDistribute super."BitSyntax";
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
+  "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_3";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -1348,6 +1350,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1483,6 +1486,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -1769,6 +1773,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_8";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1984,6 +1989,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_4_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -2735,6 +2741,7 @@ self: super: {
   "empty" = dontDistribute super."empty";
   "encoding" = dontDistribute super."encoding";
   "endo" = dontDistribute super."endo";
+  "engine-io" = doDistribute super."engine-io_1_2_11";
   "engine-io-snap" = dontDistribute super."engine-io-snap";
   "engine-io-wai" = dontDistribute super."engine-io-wai";
   "engine-io-yesod" = dontDistribute super."engine-io-yesod";
@@ -3437,6 +3444,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4310,6 +4324,7 @@ self: super: {
   "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4489,6 +4504,7 @@ self: super: {
   "hyperpublic" = dontDistribute super."hyperpublic";
   "hyphenate" = dontDistribute super."hyphenate";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5196,6 +5212,7 @@ self: super: {
   "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5515,6 +5532,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5668,6 +5686,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -5818,6 +5837,7 @@ self: super: {
   "pandoc-lens" = dontDistribute super."pandoc-lens";
   "pandoc-placetable" = dontDistribute super."pandoc-placetable";
   "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-types" = doDistribute super."pandoc-types_1_12_4_7";
   "pandoc-unlit" = dontDistribute super."pandoc-unlit";
   "pango" = doDistribute super."pango_0_13_1_0";
   "papillon" = dontDistribute super."papillon";
@@ -6019,6 +6039,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6273,7 +6294,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7389,6 +7409,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7839,6 +7860,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = dontDistribute super."userid";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index 47528726e077..b556af7d18d0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -123,6 +123,8 @@ self: super: {
   "BitSyntax" = dontDistribute super."BitSyntax";
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
+  "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_3";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -1348,6 +1350,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1483,6 +1486,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -1769,6 +1773,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_8";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1984,6 +1989,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_4_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -2735,6 +2741,7 @@ self: super: {
   "empty" = dontDistribute super."empty";
   "encoding" = dontDistribute super."encoding";
   "endo" = dontDistribute super."endo";
+  "engine-io" = doDistribute super."engine-io_1_2_11";
   "engine-io-snap" = dontDistribute super."engine-io-snap";
   "engine-io-wai" = dontDistribute super."engine-io-wai";
   "engine-io-yesod" = dontDistribute super."engine-io-yesod";
@@ -3437,6 +3444,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4309,6 +4323,7 @@ self: super: {
   "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4488,6 +4503,7 @@ self: super: {
   "hyperpublic" = dontDistribute super."hyperpublic";
   "hyphenate" = dontDistribute super."hyphenate";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5194,6 +5210,7 @@ self: super: {
   "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5513,6 +5530,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5666,6 +5684,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -5816,6 +5835,7 @@ self: super: {
   "pandoc-lens" = dontDistribute super."pandoc-lens";
   "pandoc-placetable" = dontDistribute super."pandoc-placetable";
   "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-types" = doDistribute super."pandoc-types_1_12_4_7";
   "pandoc-unlit" = dontDistribute super."pandoc-unlit";
   "pango" = doDistribute super."pango_0_13_1_0";
   "papillon" = dontDistribute super."papillon";
@@ -6016,6 +6036,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6270,7 +6291,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7385,6 +7405,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7835,6 +7856,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = dontDistribute super."userid";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index 296fbd0b7209..c1d6d27fe835 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -123,6 +123,8 @@ self: super: {
   "BitSyntax" = dontDistribute super."BitSyntax";
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
+  "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_3";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -1346,6 +1348,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1481,6 +1484,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -1766,6 +1770,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_8";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1981,6 +1986,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_4_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -2728,6 +2734,7 @@ self: super: {
   "empty" = dontDistribute super."empty";
   "encoding" = dontDistribute super."encoding";
   "endo" = dontDistribute super."endo";
+  "engine-io" = doDistribute super."engine-io_1_2_11";
   "engine-io-snap" = dontDistribute super."engine-io-snap";
   "engine-io-wai" = dontDistribute super."engine-io-wai";
   "engine-io-yesod" = dontDistribute super."engine-io-yesod";
@@ -3430,6 +3437,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4302,6 +4316,7 @@ self: super: {
   "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4480,6 +4495,7 @@ self: super: {
   "hyperpublic" = dontDistribute super."hyperpublic";
   "hyphenate" = dontDistribute super."hyphenate";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5185,6 +5201,7 @@ self: super: {
   "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5503,6 +5520,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5656,6 +5674,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -5806,6 +5825,7 @@ self: super: {
   "pandoc-lens" = dontDistribute super."pandoc-lens";
   "pandoc-placetable" = dontDistribute super."pandoc-placetable";
   "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-types" = doDistribute super."pandoc-types_1_12_4_7";
   "pandoc-unlit" = dontDistribute super."pandoc-unlit";
   "pango" = doDistribute super."pango_0_13_1_0";
   "papillon" = dontDistribute super."papillon";
@@ -6006,6 +6026,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6260,7 +6281,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7375,6 +7395,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7825,6 +7846,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = dontDistribute super."userid";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 62c422826bc6..3fc3ebf81657 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -123,6 +123,8 @@ self: super: {
   "BitSyntax" = dontDistribute super."BitSyntax";
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
+  "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_3";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -1346,6 +1348,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1481,6 +1484,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -1766,6 +1770,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_8";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1981,6 +1986,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_4_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -2728,6 +2734,7 @@ self: super: {
   "empty" = dontDistribute super."empty";
   "encoding" = dontDistribute super."encoding";
   "endo" = dontDistribute super."endo";
+  "engine-io" = doDistribute super."engine-io_1_2_11";
   "engine-io-snap" = dontDistribute super."engine-io-snap";
   "engine-io-wai" = dontDistribute super."engine-io-wai";
   "engine-io-yesod" = dontDistribute super."engine-io-yesod";
@@ -3429,6 +3436,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4299,6 +4313,7 @@ self: super: {
   "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4476,6 +4491,7 @@ self: super: {
   "hyperpublic" = dontDistribute super."hyperpublic";
   "hyphenate" = dontDistribute super."hyphenate";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5181,6 +5197,7 @@ self: super: {
   "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5499,6 +5516,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5652,6 +5670,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -5792,6 +5811,7 @@ self: super: {
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_15_2_1";
   "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_4";
   "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
   "pandoc-crossref" = dontDistribute super."pandoc-crossref";
@@ -5801,6 +5821,7 @@ self: super: {
   "pandoc-lens" = dontDistribute super."pandoc-lens";
   "pandoc-placetable" = dontDistribute super."pandoc-placetable";
   "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-types" = doDistribute super."pandoc-types_1_12_4_7";
   "pandoc-unlit" = dontDistribute super."pandoc-unlit";
   "pango" = doDistribute super."pango_0_13_1_0";
   "papillon" = dontDistribute super."papillon";
@@ -6001,6 +6022,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6254,7 +6276,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7368,6 +7389,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7818,6 +7840,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = dontDistribute super."userid";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index 5bd2c57df75b..7b3293b28954 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -123,6 +123,8 @@ self: super: {
   "BitSyntax" = dontDistribute super."BitSyntax";
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
+  "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_3";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -1345,6 +1347,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1479,6 +1482,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -1764,6 +1768,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_8";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1979,6 +1984,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_4_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -2726,6 +2732,7 @@ self: super: {
   "empty" = dontDistribute super."empty";
   "encoding" = dontDistribute super."encoding";
   "endo" = dontDistribute super."endo";
+  "engine-io" = doDistribute super."engine-io_1_2_11";
   "engine-io-snap" = dontDistribute super."engine-io-snap";
   "engine-io-wai" = dontDistribute super."engine-io-wai";
   "engine-io-yesod" = dontDistribute super."engine-io-yesod";
@@ -3426,6 +3433,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4295,6 +4309,7 @@ self: super: {
   "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4472,6 +4487,7 @@ self: super: {
   "hyperpublic" = dontDistribute super."hyperpublic";
   "hyphenate" = dontDistribute super."hyphenate";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5176,6 +5192,7 @@ self: super: {
   "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5493,6 +5510,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5646,6 +5664,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -5786,6 +5805,7 @@ self: super: {
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_15_2_1";
   "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_4";
   "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
   "pandoc-crossref" = dontDistribute super."pandoc-crossref";
@@ -5795,6 +5815,7 @@ self: super: {
   "pandoc-lens" = dontDistribute super."pandoc-lens";
   "pandoc-placetable" = dontDistribute super."pandoc-placetable";
   "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-types" = doDistribute super."pandoc-types_1_12_4_7";
   "pandoc-unlit" = dontDistribute super."pandoc-unlit";
   "pango" = doDistribute super."pango_0_13_1_0";
   "papillon" = dontDistribute super."papillon";
@@ -5994,6 +6015,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6246,7 +6268,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7355,6 +7376,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7804,6 +7826,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = dontDistribute super."userid";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index c0b0a8b92a17..186a88404c2f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -123,6 +123,8 @@ self: super: {
   "BitSyntax" = dontDistribute super."BitSyntax";
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
+  "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_3";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -566,6 +568,7 @@ self: super: {
   "Javav" = dontDistribute super."Javav";
   "JsContracts" = dontDistribute super."JsContracts";
   "JsonGrammar" = dontDistribute super."JsonGrammar";
+  "JuicyPixels" = doDistribute super."JuicyPixels_3_2_6_4";
   "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas";
   "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa";
   "JuicyPixels-scale-dct" = dontDistribute super."JuicyPixels-scale-dct";
@@ -1343,6 +1346,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1477,6 +1481,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -1762,6 +1767,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_8";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1976,6 +1982,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_4_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -2722,6 +2729,7 @@ self: super: {
   "empty" = dontDistribute super."empty";
   "encoding" = dontDistribute super."encoding";
   "endo" = dontDistribute super."endo";
+  "engine-io" = doDistribute super."engine-io_1_2_11";
   "engine-io-snap" = dontDistribute super."engine-io-snap";
   "engine-io-wai" = dontDistribute super."engine-io-wai";
   "engine-io-yesod" = dontDistribute super."engine-io-yesod";
@@ -3422,6 +3430,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4290,6 +4305,7 @@ self: super: {
   "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4467,6 +4483,7 @@ self: super: {
   "hyperpublic" = dontDistribute super."hyperpublic";
   "hyphenate" = dontDistribute super."hyphenate";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5169,6 +5186,7 @@ self: super: {
   "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5485,6 +5503,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5638,6 +5657,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -5778,6 +5798,7 @@ self: super: {
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_15_2_1";
   "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_4";
   "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
   "pandoc-crossref" = dontDistribute super."pandoc-crossref";
@@ -5787,6 +5808,7 @@ self: super: {
   "pandoc-lens" = dontDistribute super."pandoc-lens";
   "pandoc-placetable" = dontDistribute super."pandoc-placetable";
   "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-types" = doDistribute super."pandoc-types_1_12_4_7";
   "pandoc-unlit" = dontDistribute super."pandoc-unlit";
   "pango" = doDistribute super."pango_0_13_1_0";
   "papillon" = dontDistribute super."papillon";
@@ -5986,6 +6008,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6238,7 +6261,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7346,6 +7368,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7795,6 +7818,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = dontDistribute super."userid";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index 2ae19af57cd7..beb24114b595 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -123,6 +123,8 @@ self: super: {
   "BitSyntax" = dontDistribute super."BitSyntax";
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
+  "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_3";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -566,6 +568,7 @@ self: super: {
   "Javav" = dontDistribute super."Javav";
   "JsContracts" = dontDistribute super."JsContracts";
   "JsonGrammar" = dontDistribute super."JsonGrammar";
+  "JuicyPixels" = doDistribute super."JuicyPixels_3_2_6_4";
   "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas";
   "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa";
   "JuicyPixels-scale-dct" = dontDistribute super."JuicyPixels-scale-dct";
@@ -1343,6 +1346,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1477,6 +1481,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -1762,6 +1767,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_8";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1975,6 +1981,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_4_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -2721,6 +2728,7 @@ self: super: {
   "empty" = dontDistribute super."empty";
   "encoding" = dontDistribute super."encoding";
   "endo" = dontDistribute super."endo";
+  "engine-io" = doDistribute super."engine-io_1_2_11";
   "engine-io-snap" = dontDistribute super."engine-io-snap";
   "engine-io-wai" = dontDistribute super."engine-io-wai";
   "engine-io-yesod" = dontDistribute super."engine-io-yesod";
@@ -3419,6 +3427,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4283,6 +4298,7 @@ self: super: {
   "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4458,6 +4474,7 @@ self: super: {
   "hyperpublic" = dontDistribute super."hyperpublic";
   "hyphenate" = dontDistribute super."hyphenate";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5160,6 +5177,7 @@ self: super: {
   "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5476,6 +5494,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5629,6 +5648,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -5769,6 +5789,7 @@ self: super: {
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_15_2_1";
   "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_4";
   "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
   "pandoc-crossref" = dontDistribute super."pandoc-crossref";
@@ -5778,6 +5799,7 @@ self: super: {
   "pandoc-lens" = dontDistribute super."pandoc-lens";
   "pandoc-placetable" = dontDistribute super."pandoc-placetable";
   "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-types" = doDistribute super."pandoc-types_1_12_4_7";
   "pandoc-unlit" = dontDistribute super."pandoc-unlit";
   "papillon" = dontDistribute super."papillon";
   "pappy" = dontDistribute super."pappy";
@@ -5976,6 +5998,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6226,7 +6249,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7333,6 +7355,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7780,6 +7803,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = dontDistribute super."userid";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index 736b83494093..b755da4a37f4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -122,6 +122,8 @@ self: super: {
   "BitSyntax" = dontDistribute super."BitSyntax";
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
+  "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_3";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -565,6 +567,7 @@ self: super: {
   "Javav" = dontDistribute super."Javav";
   "JsContracts" = dontDistribute super."JsContracts";
   "JsonGrammar" = dontDistribute super."JsonGrammar";
+  "JuicyPixels" = doDistribute super."JuicyPixels_3_2_6_4";
   "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas";
   "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa";
   "JuicyPixels-scale-dct" = dontDistribute super."JuicyPixels-scale-dct";
@@ -1341,6 +1344,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1474,6 +1478,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -1757,6 +1762,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_8";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1970,6 +1976,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_4_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -2715,6 +2722,7 @@ self: super: {
   "empty" = dontDistribute super."empty";
   "encoding" = dontDistribute super."encoding";
   "endo" = dontDistribute super."endo";
+  "engine-io" = doDistribute super."engine-io_1_2_11";
   "engine-io-snap" = dontDistribute super."engine-io-snap";
   "engine-io-wai" = dontDistribute super."engine-io-wai";
   "engine-io-yesod" = dontDistribute super."engine-io-yesod";
@@ -3413,6 +3421,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4274,6 +4289,7 @@ self: super: {
   "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4449,6 +4465,7 @@ self: super: {
   "hyperpublic" = dontDistribute super."hyperpublic";
   "hyphenate" = dontDistribute super."hyphenate";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5149,6 +5166,7 @@ self: super: {
   "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5465,6 +5483,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5617,6 +5636,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -5757,6 +5777,7 @@ self: super: {
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_15_2_1";
   "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_4";
   "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
   "pandoc-crossref" = dontDistribute super."pandoc-crossref";
@@ -5766,6 +5787,7 @@ self: super: {
   "pandoc-lens" = dontDistribute super."pandoc-lens";
   "pandoc-placetable" = dontDistribute super."pandoc-placetable";
   "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-types" = doDistribute super."pandoc-types_1_12_4_7";
   "pandoc-unlit" = dontDistribute super."pandoc-unlit";
   "papillon" = dontDistribute super."papillon";
   "pappy" = dontDistribute super."pappy";
@@ -5962,6 +5984,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6212,7 +6235,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7317,6 +7339,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7764,6 +7787,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = dontDistribute super."userid";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index 32d91ba7c6a4..7e32f849b6d2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -124,6 +124,7 @@ self: super: {
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
   "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_1";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -1359,6 +1360,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1495,6 +1497,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -3483,6 +3486,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4363,6 +4373,7 @@ self: super: {
   "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4542,6 +4553,7 @@ self: super: {
   "hyperpublic" = dontDistribute super."hyperpublic";
   "hyphenate" = dontDistribute super."hyphenate";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5256,6 +5268,7 @@ self: super: {
   "mangopay" = doDistribute super."mangopay_1_11_4";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5579,6 +5592,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5734,6 +5748,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6092,6 +6107,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6353,7 +6369,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7484,6 +7499,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7940,6 +7956,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = dontDistribute super."userid";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index acb0e1c24b58..cc1db2819f23 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -122,6 +122,8 @@ self: super: {
   "BitSyntax" = dontDistribute super."BitSyntax";
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
+  "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_3";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -564,6 +566,7 @@ self: super: {
   "Javav" = dontDistribute super."Javav";
   "JsContracts" = dontDistribute super."JsContracts";
   "JsonGrammar" = dontDistribute super."JsonGrammar";
+  "JuicyPixels" = doDistribute super."JuicyPixels_3_2_6_4";
   "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas";
   "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa";
   "JuicyPixels-scale-dct" = dontDistribute super."JuicyPixels-scale-dct";
@@ -1339,6 +1342,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1472,6 +1476,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -1514,6 +1519,7 @@ self: super: {
   "binary-generic" = dontDistribute super."binary-generic";
   "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
   "binary-literal-qq" = dontDistribute super."binary-literal-qq";
+  "binary-orphans" = doDistribute super."binary-orphans_0_1_3_0";
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
@@ -1753,6 +1759,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_8";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1966,6 +1973,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_4_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -2711,6 +2719,7 @@ self: super: {
   "empty" = dontDistribute super."empty";
   "encoding" = dontDistribute super."encoding";
   "endo" = dontDistribute super."endo";
+  "engine-io" = doDistribute super."engine-io_1_2_11";
   "engine-io-snap" = dontDistribute super."engine-io-snap";
   "engine-io-wai" = dontDistribute super."engine-io-wai";
   "engine-io-yesod" = dontDistribute super."engine-io-yesod";
@@ -3409,6 +3418,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4270,6 +4286,7 @@ self: super: {
   "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4445,6 +4462,7 @@ self: super: {
   "hyperpublic" = dontDistribute super."hyperpublic";
   "hyphenate" = dontDistribute super."hyphenate";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5144,6 +5162,7 @@ self: super: {
   "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5460,6 +5479,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5612,6 +5632,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -5752,6 +5773,7 @@ self: super: {
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_15_2_1";
   "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_4";
   "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
   "pandoc-crossref" = dontDistribute super."pandoc-crossref";
@@ -5761,6 +5783,7 @@ self: super: {
   "pandoc-lens" = dontDistribute super."pandoc-lens";
   "pandoc-placetable" = dontDistribute super."pandoc-placetable";
   "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-types" = doDistribute super."pandoc-types_1_12_4_7";
   "pandoc-unlit" = dontDistribute super."pandoc-unlit";
   "papillon" = dontDistribute super."papillon";
   "pappy" = dontDistribute super."pappy";
@@ -5956,6 +5979,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6206,7 +6230,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7309,6 +7332,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7755,6 +7779,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = dontDistribute super."userid";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index 03242664366d..f47982478568 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -122,6 +122,8 @@ self: super: {
   "BitSyntax" = dontDistribute super."BitSyntax";
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
+  "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_3";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -462,6 +464,7 @@ self: super: {
   "HSoundFile" = dontDistribute super."HSoundFile";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
+  "HTTP" = doDistribute super."HTTP_4000_2_23";
   "HTTP-Simple" = dontDistribute super."HTTP-Simple";
   "HTab" = dontDistribute super."HTab";
   "HTicTacToe" = dontDistribute super."HTicTacToe";
@@ -563,6 +566,7 @@ self: super: {
   "Javav" = dontDistribute super."Javav";
   "JsContracts" = dontDistribute super."JsContracts";
   "JsonGrammar" = dontDistribute super."JsonGrammar";
+  "JuicyPixels" = doDistribute super."JuicyPixels_3_2_6_4";
   "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas";
   "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa";
   "JuicyPixels-scale-dct" = dontDistribute super."JuicyPixels-scale-dct";
@@ -1338,6 +1342,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1470,6 +1475,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -1512,6 +1518,7 @@ self: super: {
   "binary-generic" = dontDistribute super."binary-generic";
   "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
   "binary-literal-qq" = dontDistribute super."binary-literal-qq";
+  "binary-orphans" = doDistribute super."binary-orphans_0_1_3_0";
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
@@ -1750,6 +1757,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_8";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1963,6 +1971,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_4_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -2706,6 +2715,7 @@ self: super: {
   "empty" = dontDistribute super."empty";
   "encoding" = dontDistribute super."encoding";
   "endo" = dontDistribute super."endo";
+  "engine-io" = doDistribute super."engine-io_1_2_11";
   "engine-io-snap" = dontDistribute super."engine-io-snap";
   "engine-io-wai" = dontDistribute super."engine-io-wai";
   "engine-io-yesod" = dontDistribute super."engine-io-yesod";
@@ -3402,6 +3412,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4262,6 +4279,7 @@ self: super: {
   "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4437,6 +4455,7 @@ self: super: {
   "hyperpublic" = dontDistribute super."hyperpublic";
   "hyphenate" = dontDistribute super."hyphenate";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5134,6 +5153,7 @@ self: super: {
   "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5449,6 +5469,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5601,6 +5622,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -5741,6 +5763,7 @@ self: super: {
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_15_2_1";
   "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_4";
   "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
   "pandoc-crossref" = dontDistribute super."pandoc-crossref";
@@ -5750,6 +5773,7 @@ self: super: {
   "pandoc-lens" = dontDistribute super."pandoc-lens";
   "pandoc-placetable" = dontDistribute super."pandoc-placetable";
   "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-types" = doDistribute super."pandoc-types_1_12_4_7";
   "pandoc-unlit" = dontDistribute super."pandoc-unlit";
   "papillon" = dontDistribute super."papillon";
   "pappy" = dontDistribute super."pappy";
@@ -5943,6 +5967,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6193,7 +6218,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7284,6 +7308,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7729,6 +7754,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = dontDistribute super."userid";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
index 4f35f7def845..5b6cb97c1408 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -122,6 +122,8 @@ self: super: {
   "BitSyntax" = dontDistribute super."BitSyntax";
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
+  "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_3";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -462,6 +464,7 @@ self: super: {
   "HSoundFile" = dontDistribute super."HSoundFile";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
+  "HTTP" = doDistribute super."HTTP_4000_2_23";
   "HTTP-Simple" = dontDistribute super."HTTP-Simple";
   "HTab" = dontDistribute super."HTab";
   "HTicTacToe" = dontDistribute super."HTicTacToe";
@@ -563,6 +566,7 @@ self: super: {
   "Javav" = dontDistribute super."Javav";
   "JsContracts" = dontDistribute super."JsContracts";
   "JsonGrammar" = dontDistribute super."JsonGrammar";
+  "JuicyPixels" = doDistribute super."JuicyPixels_3_2_6_4";
   "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas";
   "JuicyPixels-repa" = dontDistribute super."JuicyPixels-repa";
   "JuicyPixels-scale-dct" = dontDistribute super."JuicyPixels-scale-dct";
@@ -1338,6 +1342,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1470,6 +1475,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -1512,6 +1518,7 @@ self: super: {
   "binary-generic" = dontDistribute super."binary-generic";
   "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
   "binary-literal-qq" = dontDistribute super."binary-literal-qq";
+  "binary-orphans" = doDistribute super."binary-orphans_0_1_3_0";
   "binary-parser" = dontDistribute super."binary-parser";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
@@ -1750,6 +1757,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_8";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1963,6 +1971,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_4_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -2706,6 +2715,7 @@ self: super: {
   "empty" = dontDistribute super."empty";
   "encoding" = dontDistribute super."encoding";
   "endo" = dontDistribute super."endo";
+  "engine-io" = doDistribute super."engine-io_1_2_11";
   "engine-io-snap" = dontDistribute super."engine-io-snap";
   "engine-io-wai" = dontDistribute super."engine-io-wai";
   "engine-io-yesod" = dontDistribute super."engine-io-yesod";
@@ -3400,6 +3410,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4259,6 +4276,7 @@ self: super: {
   "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4434,6 +4452,7 @@ self: super: {
   "hyperpublic" = dontDistribute super."hyperpublic";
   "hyphenate" = dontDistribute super."hyphenate";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5128,6 +5147,7 @@ self: super: {
   "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5443,6 +5463,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5595,6 +5616,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -5735,6 +5757,7 @@ self: super: {
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_15_2_1";
   "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_7_4";
   "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
   "pandoc-crossref" = dontDistribute super."pandoc-crossref";
@@ -5744,6 +5767,7 @@ self: super: {
   "pandoc-lens" = dontDistribute super."pandoc-lens";
   "pandoc-placetable" = dontDistribute super."pandoc-placetable";
   "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-types" = doDistribute super."pandoc-types_1_12_4_7";
   "pandoc-unlit" = dontDistribute super."pandoc-unlit";
   "papillon" = dontDistribute super."papillon";
   "pappy" = dontDistribute super."pappy";
@@ -5937,6 +5961,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6187,7 +6212,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7278,6 +7302,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7723,6 +7748,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = dontDistribute super."userid";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index 23ee3d7e7bb9..fe69a6af07da 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -124,6 +124,7 @@ self: super: {
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
   "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_1";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -1358,6 +1359,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1494,6 +1496,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -2007,6 +2010,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_4_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -3478,6 +3482,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4356,6 +4367,7 @@ self: super: {
   "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4535,6 +4547,7 @@ self: super: {
   "hyperpublic" = dontDistribute super."hyperpublic";
   "hyphenate" = dontDistribute super."hyphenate";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5249,6 +5262,7 @@ self: super: {
   "mangopay" = doDistribute super."mangopay_1_11_4";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5572,6 +5586,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5727,6 +5742,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6085,6 +6101,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6346,7 +6363,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7474,6 +7490,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7930,6 +7947,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = dontDistribute super."userid";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index f3c454184d9a..e204b4662741 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -124,6 +124,7 @@ self: super: {
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
   "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_1";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -1358,6 +1359,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1494,6 +1496,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -2007,6 +2010,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_4_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -3478,6 +3482,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4356,6 +4367,7 @@ self: super: {
   "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4535,6 +4547,7 @@ self: super: {
   "hyperpublic" = dontDistribute super."hyperpublic";
   "hyphenate" = dontDistribute super."hyphenate";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5249,6 +5262,7 @@ self: super: {
   "mangopay" = doDistribute super."mangopay_1_11_4";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5572,6 +5586,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5727,6 +5742,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6085,6 +6101,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6346,7 +6363,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7472,6 +7488,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7928,6 +7945,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = dontDistribute super."userid";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index c7dc33ed0448..c8a7531a27df 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -124,6 +124,7 @@ self: super: {
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
   "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_1";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -1357,6 +1358,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1493,6 +1495,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -2005,6 +2008,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_4_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -3475,6 +3479,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4350,6 +4361,7 @@ self: super: {
   "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4529,6 +4541,7 @@ self: super: {
   "hyperpublic" = dontDistribute super."hyperpublic";
   "hyphenate" = dontDistribute super."hyphenate";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5241,6 +5254,7 @@ self: super: {
   "mangopay" = doDistribute super."mangopay_1_11_4";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5563,6 +5577,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5718,6 +5733,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6074,6 +6090,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6334,7 +6351,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7458,6 +7474,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7913,6 +7930,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = dontDistribute super."userid";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index d86b8a1b53ae..5094fac64711 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -124,6 +124,7 @@ self: super: {
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
   "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_1";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -1357,6 +1358,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1493,6 +1495,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -2005,6 +2008,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_4_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -3472,6 +3476,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4347,6 +4358,7 @@ self: super: {
   "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4526,6 +4538,7 @@ self: super: {
   "hyperpublic" = dontDistribute super."hyperpublic";
   "hyphenate" = dontDistribute super."hyphenate";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5235,6 +5248,7 @@ self: super: {
   "mangopay" = doDistribute super."mangopay_1_11_4";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5556,6 +5570,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5711,6 +5726,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -6066,6 +6082,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6326,7 +6343,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7450,6 +7466,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7904,6 +7921,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = dontDistribute super."userid";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 0e57de424297..89ac31497cc5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -124,6 +124,7 @@ self: super: {
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
   "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_2";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -1354,6 +1355,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1490,6 +1492,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -2002,6 +2005,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_4_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -3467,6 +3471,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4341,6 +4352,7 @@ self: super: {
   "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4520,6 +4532,7 @@ self: super: {
   "hyperpublic" = dontDistribute super."hyperpublic";
   "hyphenate" = dontDistribute super."hyphenate";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5228,6 +5241,7 @@ self: super: {
   "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5549,6 +5563,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5704,6 +5719,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -5855,6 +5871,7 @@ self: super: {
   "pandoc-lens" = dontDistribute super."pandoc-lens";
   "pandoc-placetable" = dontDistribute super."pandoc-placetable";
   "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-types" = doDistribute super."pandoc-types_1_12_4_7";
   "pandoc-unlit" = dontDistribute super."pandoc-unlit";
   "pango" = doDistribute super."pango_0_13_1_0";
   "papillon" = dontDistribute super."papillon";
@@ -6058,6 +6075,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6315,7 +6333,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7436,6 +7453,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7889,6 +7907,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = dontDistribute super."userid";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index f7e8e71727f7..1a980f587413 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -124,6 +124,7 @@ self: super: {
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
   "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_2";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -1354,6 +1355,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1490,6 +1492,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -1999,6 +2002,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_4_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -3459,6 +3463,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4333,6 +4344,7 @@ self: super: {
   "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4512,6 +4524,7 @@ self: super: {
   "hyperpublic" = dontDistribute super."hyperpublic";
   "hyphenate" = dontDistribute super."hyphenate";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5219,6 +5232,7 @@ self: super: {
   "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5539,6 +5553,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5694,6 +5709,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -5845,6 +5861,7 @@ self: super: {
   "pandoc-lens" = dontDistribute super."pandoc-lens";
   "pandoc-placetable" = dontDistribute super."pandoc-placetable";
   "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-types" = doDistribute super."pandoc-types_1_12_4_7";
   "pandoc-unlit" = dontDistribute super."pandoc-unlit";
   "pango" = doDistribute super."pango_0_13_1_0";
   "papillon" = dontDistribute super."papillon";
@@ -6048,6 +6065,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6303,7 +6321,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7422,6 +7439,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7875,6 +7893,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = dontDistribute super."userid";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 32d43a1a6119..4f5197bb6c69 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -124,6 +124,7 @@ self: super: {
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
   "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_2";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -1352,6 +1353,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-dejafu" = dontDistribute super."async-dejafu";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
@@ -1488,6 +1490,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -1776,6 +1779,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_8";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1995,6 +1999,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_4_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -3453,6 +3458,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -4327,6 +4339,7 @@ self: super: {
   "hspec-expectations-pretty-diff" = dontDistribute super."hspec-expectations-pretty-diff";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_1_7";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4506,6 +4519,7 @@ self: super: {
   "hyperpublic" = dontDistribute super."hyperpublic";
   "hyphenate" = dontDistribute super."hyphenate";
   "hypher" = dontDistribute super."hypher";
+  "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
   "hzulip" = dontDistribute super."hzulip";
   "i18n" = dontDistribute super."i18n";
@@ -5213,6 +5227,7 @@ self: super: {
   "mangopay" = doDistribute super."mangopay_1_11_5";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5533,6 +5548,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5688,6 +5704,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -5838,6 +5855,7 @@ self: super: {
   "pandoc-lens" = dontDistribute super."pandoc-lens";
   "pandoc-placetable" = dontDistribute super."pandoc-placetable";
   "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-types" = doDistribute super."pandoc-types_1_12_4_7";
   "pandoc-unlit" = dontDistribute super."pandoc-unlit";
   "pango" = doDistribute super."pango_0_13_1_0";
   "papillon" = dontDistribute super."papillon";
@@ -6041,6 +6059,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -6296,7 +6315,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -7415,6 +7433,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7868,6 +7887,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = dontDistribute super."userid";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index cb8f0729fe84..41d40d31cee5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -122,6 +122,8 @@ self: super: {
   "BitSyntax" = dontDistribute super."BitSyntax";
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
+  "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_3";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -451,6 +453,7 @@ self: super: {
   "HSoundFile" = dontDistribute super."HSoundFile";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
+  "HTTP" = doDistribute super."HTTP_4000_2_23";
   "HTTP-Simple" = dontDistribute super."HTTP-Simple";
   "HTab" = dontDistribute super."HTab";
   "HTicTacToe" = dontDistribute super."HTicTacToe";
@@ -550,6 +553,7 @@ self: super: {
   "Javav" = dontDistribute super."Javav";
   "JsContracts" = dontDistribute super."JsContracts";
   "JsonGrammar" = dontDistribute super."JsonGrammar";
+  "JuicyPixels" = doDistribute super."JuicyPixels_3_2_6_4";
   "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas";
   "JunkDB" = dontDistribute super."JunkDB";
   "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm";
@@ -1243,6 +1247,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
   "async-pool" = dontDistribute super."async-pool";
@@ -1369,6 +1374,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -1409,6 +1415,7 @@ self: super: {
   "binary-generic" = dontDistribute super."binary-generic";
   "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
   "binary-literal-qq" = dontDistribute super."binary-literal-qq";
+  "binary-orphans" = doDistribute super."binary-orphans_0_1_3_0";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
   "binary-search" = doDistribute super."binary-search_0_1";
@@ -1636,6 +1643,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_8";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1837,6 +1845,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_4_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -2520,6 +2529,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elm-bridge" = doDistribute super."elm-bridge_0_1_0_0";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-get" = dontDistribute super."elm-get";
@@ -2545,6 +2555,7 @@ self: super: {
   "empty" = dontDistribute super."empty";
   "encoding" = dontDistribute super."encoding";
   "endo" = dontDistribute super."endo";
+  "engine-io" = doDistribute super."engine-io_1_2_11";
   "engine-io-growler" = dontDistribute super."engine-io-growler";
   "engine-io-snap" = dontDistribute super."engine-io-snap";
   "engine-io-yesod" = doDistribute super."engine-io-yesod_1_0_3";
@@ -3216,6 +3227,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -3873,6 +3891,7 @@ self: super: {
   "hoovie" = dontDistribute super."hoovie";
   "hopencc" = dontDistribute super."hopencc";
   "hopencl" = dontDistribute super."hopencl";
+  "hopenpgp-tools" = doDistribute super."hopenpgp-tools_0_16_3";
   "hopfield" = dontDistribute super."hopfield";
   "hopfield-networks" = dontDistribute super."hopfield-networks";
   "hopfli" = dontDistribute super."hopfli";
@@ -4040,6 +4059,7 @@ self: super: {
   "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_2_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4197,6 +4217,7 @@ self: super: {
   "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";
@@ -4875,6 +4896,7 @@ self: super: {
   "mandulia" = dontDistribute super."mandulia";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5174,6 +5196,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5316,6 +5339,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -5449,6 +5473,8 @@ self: super: {
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_15_2_1";
+  "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_8_1_3";
   "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
   "pandoc-crossref" = dontDistribute super."pandoc-crossref";
   "pandoc-csv2table" = dontDistribute super."pandoc-csv2table";
@@ -5457,6 +5483,7 @@ self: super: {
   "pandoc-lens" = dontDistribute super."pandoc-lens";
   "pandoc-placetable" = dontDistribute super."pandoc-placetable";
   "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-types" = doDistribute super."pandoc-types_1_12_4_7";
   "pandoc-unlit" = dontDistribute super."pandoc-unlit";
   "papillon" = dontDistribute super."papillon";
   "pappy" = dontDistribute super."pappy";
@@ -5633,6 +5660,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -5869,7 +5897,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -5925,6 +5952,7 @@ self: super: {
   "range-space" = dontDistribute super."range-space";
   "rangemin" = dontDistribute super."rangemin";
   "ranges" = dontDistribute super."ranges";
+  "rank1dynamic" = doDistribute super."rank1dynamic_0_3_1_0";
   "rascal" = dontDistribute super."rascal";
   "rate-limit" = dontDistribute super."rate-limit";
   "ratio-int" = dontDistribute super."ratio-int";
@@ -6470,6 +6498,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = doDistribute super."slug_0_1_1";
   "smallarray" = dontDistribute super."smallarray";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
   "smallcheck-lens" = dontDistribute super."smallcheck-lens";
@@ -6894,6 +6923,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7313,6 +7343,10 @@ self: super: {
   "usb-id-database" = dontDistribute super."usb-id-database";
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index bf9a7ad51ca0..ec7cbbf490f2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -122,6 +122,8 @@ self: super: {
   "BitSyntax" = dontDistribute super."BitSyntax";
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
+  "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_3";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -451,6 +453,7 @@ self: super: {
   "HSoundFile" = dontDistribute super."HSoundFile";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
+  "HTTP" = doDistribute super."HTTP_4000_2_23";
   "HTTP-Simple" = dontDistribute super."HTTP-Simple";
   "HTab" = dontDistribute super."HTab";
   "HTicTacToe" = dontDistribute super."HTicTacToe";
@@ -550,6 +553,7 @@ self: super: {
   "Javav" = dontDistribute super."Javav";
   "JsContracts" = dontDistribute super."JsContracts";
   "JsonGrammar" = dontDistribute super."JsonGrammar";
+  "JuicyPixels" = doDistribute super."JuicyPixels_3_2_6_4";
   "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas";
   "JunkDB" = dontDistribute super."JunkDB";
   "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm";
@@ -1241,6 +1245,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
   "async-pool" = dontDistribute super."async-pool";
@@ -1367,6 +1372,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -1407,6 +1413,7 @@ self: super: {
   "binary-generic" = dontDistribute super."binary-generic";
   "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
   "binary-literal-qq" = dontDistribute super."binary-literal-qq";
+  "binary-orphans" = doDistribute super."binary-orphans_0_1_3_0";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
   "binary-search" = doDistribute super."binary-search_0_1";
@@ -1634,6 +1641,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_8";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1835,6 +1843,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_4_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -2517,6 +2526,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elm-bridge" = doDistribute super."elm-bridge_0_1_0_0";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-get" = dontDistribute super."elm-get";
@@ -2542,6 +2552,7 @@ self: super: {
   "empty" = dontDistribute super."empty";
   "encoding" = dontDistribute super."encoding";
   "endo" = dontDistribute super."endo";
+  "engine-io" = doDistribute super."engine-io_1_2_11";
   "engine-io-growler" = dontDistribute super."engine-io-growler";
   "engine-io-snap" = dontDistribute super."engine-io-snap";
   "engineering-units" = dontDistribute super."engineering-units";
@@ -3210,6 +3221,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -3866,6 +3884,7 @@ self: super: {
   "hoovie" = dontDistribute super."hoovie";
   "hopencc" = dontDistribute super."hopencc";
   "hopencl" = dontDistribute super."hopencl";
+  "hopenpgp-tools" = doDistribute super."hopenpgp-tools_0_16_3";
   "hopfield" = dontDistribute super."hopfield";
   "hopfield-networks" = dontDistribute super."hopfield-networks";
   "hopfli" = dontDistribute super."hopfli";
@@ -4033,6 +4052,7 @@ self: super: {
   "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-meta" = doDistribute super."hspec-meta_2_2_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
@@ -4190,6 +4210,7 @@ self: super: {
   "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";
@@ -4860,6 +4881,7 @@ self: super: {
   "mandulia" = dontDistribute super."mandulia";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5159,6 +5181,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5301,6 +5324,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -5434,6 +5458,8 @@ self: super: {
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_15_2_1";
+  "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_8_1_3";
   "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
   "pandoc-crossref" = dontDistribute super."pandoc-crossref";
   "pandoc-csv2table" = dontDistribute super."pandoc-csv2table";
@@ -5442,6 +5468,7 @@ self: super: {
   "pandoc-lens" = dontDistribute super."pandoc-lens";
   "pandoc-placetable" = dontDistribute super."pandoc-placetable";
   "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-types" = doDistribute super."pandoc-types_1_12_4_7";
   "pandoc-unlit" = dontDistribute super."pandoc-unlit";
   "papillon" = dontDistribute super."papillon";
   "pappy" = dontDistribute super."pappy";
@@ -5616,6 +5643,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -5852,7 +5880,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -5908,6 +5935,7 @@ self: super: {
   "range-space" = dontDistribute super."range-space";
   "rangemin" = dontDistribute super."rangemin";
   "ranges" = dontDistribute super."ranges";
+  "rank1dynamic" = doDistribute super."rank1dynamic_0_3_1_0";
   "rascal" = dontDistribute super."rascal";
   "rate-limit" = dontDistribute super."rate-limit";
   "ratio-int" = dontDistribute super."ratio-int";
@@ -6452,6 +6480,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = doDistribute super."slug_0_1_1";
   "smallarray" = dontDistribute super."smallarray";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
   "smallcheck-lens" = dontDistribute super."smallcheck-lens";
@@ -6876,6 +6905,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7294,6 +7324,10 @@ self: super: {
   "usb-id-database" = dontDistribute super."usb-id-database";
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
index 33edb1148d81..9ca6a8a3c8fb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
@@ -122,6 +122,8 @@ self: super: {
   "BitSyntax" = dontDistribute super."BitSyntax";
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
+  "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_3";
+  "BlogLiterately-diagrams" = doDistribute super."BlogLiterately-diagrams_0_2_0_1";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -449,6 +451,7 @@ self: super: {
   "HSoundFile" = dontDistribute super."HSoundFile";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
+  "HTTP" = doDistribute super."HTTP_4000_2_23";
   "HTTP-Simple" = dontDistribute super."HTTP-Simple";
   "HTab" = dontDistribute super."HTab";
   "HTicTacToe" = dontDistribute super."HTicTacToe";
@@ -548,6 +551,7 @@ self: super: {
   "Javav" = dontDistribute super."Javav";
   "JsContracts" = dontDistribute super."JsContracts";
   "JsonGrammar" = dontDistribute super."JsonGrammar";
+  "JuicyPixels" = doDistribute super."JuicyPixels_3_2_6_4";
   "JuicyPixels-canvas" = dontDistribute super."JuicyPixels-canvas";
   "JunkDB" = dontDistribute super."JunkDB";
   "JunkDB-driver-gdbm" = dontDistribute super."JunkDB-driver-gdbm";
@@ -1236,6 +1240,7 @@ self: super: {
   "astrds" = dontDistribute super."astrds";
   "astview" = dontDistribute super."astview";
   "astview-utils" = dontDistribute super."astview-utils";
+  "async" = doDistribute super."async_2_0_2";
   "async-extras" = dontDistribute super."async-extras";
   "async-manager" = dontDistribute super."async-manager";
   "async-pool" = dontDistribute super."async-pool";
@@ -1362,6 +1367,7 @@ self: super: {
   "bdd" = dontDistribute super."bdd";
   "bdelta" = dontDistribute super."bdelta";
   "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
   "beamable" = dontDistribute super."beamable";
   "beautifHOL" = dontDistribute super."beautifHOL";
   "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
@@ -1402,6 +1408,7 @@ self: super: {
   "binary-generic" = dontDistribute super."binary-generic";
   "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
   "binary-literal-qq" = dontDistribute super."binary-literal-qq";
+  "binary-orphans" = doDistribute super."binary-orphans_0_1_3_0";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
   "binary-search" = doDistribute super."binary-search_0_1";
@@ -1627,6 +1634,7 @@ self: super: {
   "cabal-nirvana" = dontDistribute super."cabal-nirvana";
   "cabal-progdeps" = dontDistribute super."cabal-progdeps";
   "cabal-query" = dontDistribute super."cabal-query";
+  "cabal-rpm" = doDistribute super."cabal-rpm_0_9_8";
   "cabal-scripts" = dontDistribute super."cabal-scripts";
   "cabal-setup" = dontDistribute super."cabal-setup";
   "cabal-sign" = dontDistribute super."cabal-sign";
@@ -1819,6 +1827,7 @@ self: super: {
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
   "cmaes" = dontDistribute super."cmaes";
+  "cmark" = doDistribute super."cmark_0_4_1";
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
@@ -2494,6 +2503,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elm-bridge" = doDistribute super."elm-bridge_0_1_0_0";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-get" = dontDistribute super."elm-get";
@@ -2519,6 +2529,7 @@ self: super: {
   "empty" = dontDistribute super."empty";
   "encoding" = dontDistribute super."encoding";
   "endo" = dontDistribute super."endo";
+  "engine-io" = doDistribute super."engine-io_1_2_11";
   "engine-io-growler" = dontDistribute super."engine-io-growler";
   "engine-io-snap" = dontDistribute super."engine-io-snap";
   "engineering-units" = dontDistribute super."engineering-units";
@@ -3180,6 +3191,13 @@ self: super: {
   "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
   "gpolyline" = dontDistribute super."gpolyline";
@@ -3827,6 +3845,7 @@ self: super: {
   "hoovie" = dontDistribute super."hoovie";
   "hopencc" = dontDistribute super."hopencc";
   "hopencl" = dontDistribute super."hopencl";
+  "hopenpgp-tools" = doDistribute super."hopenpgp-tools_0_16_3";
   "hopfield" = dontDistribute super."hopfield";
   "hopfield-networks" = dontDistribute super."hopfield-networks";
   "hopfli" = dontDistribute super."hopfli";
@@ -3991,6 +4010,7 @@ self: super: {
   "hspec-expectations-pretty" = dontDistribute super."hspec-expectations-pretty";
   "hspec-experimental" = dontDistribute super."hspec-experimental";
   "hspec-laws" = dontDistribute super."hspec-laws";
+  "hspec-megaparsec" = dontDistribute super."hspec-megaparsec";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
@@ -4147,6 +4167,7 @@ self: super: {
   "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";
@@ -4810,6 +4831,7 @@ self: super: {
   "mandulia" = dontDistribute super."mandulia";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
+  "mappy" = dontDistribute super."mappy";
   "marionetta" = dontDistribute super."marionetta";
   "markdown-kate" = dontDistribute super."markdown-kate";
   "markdown-pap" = dontDistribute super."markdown-pap";
@@ -5104,6 +5126,7 @@ self: super: {
   "names" = dontDistribute super."names";
   "names-th" = dontDistribute super."names-th";
   "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
   "nano-hmac" = dontDistribute super."nano-hmac";
   "nano-md5" = dontDistribute super."nano-md5";
   "nanoAgda" = dontDistribute super."nanoAgda";
@@ -5246,6 +5269,7 @@ self: super: {
   "null-canvas" = dontDistribute super."null-canvas";
   "nullary" = dontDistribute super."nullary";
   "number" = dontDistribute super."number";
+  "number-length" = dontDistribute super."number-length";
   "numbering" = dontDistribute super."numbering";
   "numerals" = dontDistribute super."numerals";
   "numerals-base" = dontDistribute super."numerals-base";
@@ -5379,6 +5403,8 @@ self: super: {
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
+  "pandoc" = doDistribute super."pandoc_1_15_2_1";
+  "pandoc-citeproc" = doDistribute super."pandoc-citeproc_0_8_1_3";
   "pandoc-citeproc-preamble" = dontDistribute super."pandoc-citeproc-preamble";
   "pandoc-crossref" = dontDistribute super."pandoc-crossref";
   "pandoc-csv2table" = dontDistribute super."pandoc-csv2table";
@@ -5387,6 +5413,7 @@ self: super: {
   "pandoc-lens" = dontDistribute super."pandoc-lens";
   "pandoc-placetable" = dontDistribute super."pandoc-placetable";
   "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-types" = doDistribute super."pandoc-types_1_12_4_7";
   "pandoc-unlit" = dontDistribute super."pandoc-unlit";
   "papillon" = dontDistribute super."papillon";
   "pappy" = dontDistribute super."pappy";
@@ -5561,6 +5588,7 @@ self: super: {
   "pkggraph" = dontDistribute super."pkggraph";
   "pktree" = dontDistribute super."pktree";
   "plailude" = dontDistribute super."plailude";
+  "plan-b" = dontDistribute super."plan-b";
   "planar-graph" = dontDistribute super."planar-graph";
   "plat" = dontDistribute super."plat";
   "playlists" = dontDistribute super."playlists";
@@ -5794,7 +5822,6 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
-  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -5850,6 +5877,7 @@ self: super: {
   "range-space" = dontDistribute super."range-space";
   "rangemin" = dontDistribute super."rangemin";
   "ranges" = dontDistribute super."ranges";
+  "rank1dynamic" = doDistribute super."rank1dynamic_0_3_1_0";
   "rascal" = dontDistribute super."rascal";
   "rate-limit" = dontDistribute super."rate-limit";
   "ratio-int" = dontDistribute super."ratio-int";
@@ -6385,6 +6413,7 @@ self: super: {
   "sloane" = dontDistribute super."sloane";
   "slot-lambda" = dontDistribute super."slot-lambda";
   "sloth" = dontDistribute super."sloth";
+  "slug" = doDistribute super."slug_0_1_1";
   "smallarray" = dontDistribute super."smallarray";
   "smallcheck-laws" = dontDistribute super."smallcheck-laws";
   "smallcheck-lens" = dontDistribute super."smallcheck-lens";
@@ -6805,6 +6834,7 @@ self: super: {
   "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" = doDistribute super."temporary_1_2_0_3";
   "temporary-resourcet" = dontDistribute super."temporary-resourcet";
   "tempus" = dontDistribute super."tempus";
   "tempus-fugit" = dontDistribute super."tempus-fugit";
@@ -7223,6 +7253,10 @@ self: super: {
   "usb-id-database" = dontDistribute super."usb-id-database";
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
+  "users" = doDistribute super."users_0_3_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
+  "users-test" = doDistribute super."users-test_0_3_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
new file mode 100644
index 000000000000..5a4647fc77f5
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
@@ -0,0 +1,7558 @@
+{ 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-5.0 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";
+  "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";
+  "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";
+  "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-diagrams" = dontDistribute super."Chart-diagrams";
+  "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";
+  "DescriptiveKeys" = dontDistribute super."DescriptiveKeys";
+  "Dflow" = dontDistribute super."Dflow";
+  "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" = dontDistribute super."EdisonAPI";
+  "EdisonCore" = dontDistribute super."EdisonCore";
+  "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";
+  "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";
+  "HDBC-session" = dontDistribute super."HDBC-session";
+  "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";
+  "Hclip" = dontDistribute super."Hclip";
+  "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";
+  "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";
+  "LDAP" = dontDistribute super."LDAP";
+  "LRU" = dontDistribute super."LRU";
+  "LTree" = dontDistribute super."LTree";
+  "LambdaCalculator" = dontDistribute super."LambdaCalculator";
+  "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";
+  "LazyVault" = dontDistribute super."LazyVault";
+  "Level0" = dontDistribute super."Level0";
+  "LibClang" = dontDistribute super."LibClang";
+  "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";
+  "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";
+  "NoTrace" = dontDistribute super."NoTrace";
+  "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";
+  "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";
+  "OneTuple" = dontDistribute super."OneTuple";
+  "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";
+  "PortMidi" = dontDistribute super."PortMidi";
+  "PostgreSQL" = dontDistribute super."PostgreSQL";
+  "PrimitiveArray" = dontDistribute super."PrimitiveArray";
+  "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";
+  "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";
+  "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";
+  "SVGFonts" = dontDistribute super."SVGFonts";
+  "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";
+  "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";
+  "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-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";
+  "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-utility" = dontDistribute super."accelerate-utility";
+  "accentuateus" = dontDistribute super."accentuateus";
+  "access-time" = dontDistribute super."access-time";
+  "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-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-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-lens" = dontDistribute super."aeson-lens";
+  "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
+  "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";
+  "agda-server" = dontDistribute super."agda-server";
+  "agda-snippets" = dontDistribute super."agda-snippets";
+  "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
+  "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";
+  "aivika" = dontDistribute super."aivika";
+  "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-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";
+  "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";
+  "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-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";
+  "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";
+  "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "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";
+  "arithmoi" = dontDistribute super."arithmoi";
+  "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-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-conduit" = dontDistribute super."atom-conduit";
+  "atom-msp430" = dontDistribute super."atom-msp430";
+  "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign";
+  "atomic-primops-vector" = dontDistribute super."atomic-primops-vector";
+  "atomic-write" = dontDistribute super."atomic-write";
+  "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";
+  "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";
+  "awesomium" = dontDistribute super."awesomium";
+  "awesomium-glut" = dontDistribute super."awesomium-glut";
+  "awesomium-raw" = dontDistribute super."awesomium-raw";
+  "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";
+  "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";
+  "bdd" = dontDistribute super."bdd";
+  "bdelta" = dontDistribute super."bdelta";
+  "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
+  "beamable" = dontDistribute super."beamable";
+  "beautifHOL" = dontDistribute super."beautifHOL";
+  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
+  "bein" = dontDistribute super."bein";
+  "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";
+  "bibtex" = dontDistribute super."bibtex";
+  "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
+  "bidispec" = dontDistribute super."bidispec";
+  "bidispec-extras" = dontDistribute super."bidispec-extras";
+  "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-bits" = dontDistribute super."binary-bits";
+  "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-shared" = dontDistribute super."binary-shared";
+  "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-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-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";
+  "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-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-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" = dontDistribute super."bloodhound";
+  "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";
+  "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";
+  "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";
+  "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-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";
+  "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder";
+  "bytestringparser" = dontDistribute super."bytestringparser";
+  "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
+  "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "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-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
+  "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-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";
+  "cached-io" = dontDistribute super."cached-io";
+  "cached-traversable" = dontDistribute super."cached-traversable";
+  "caf" = dontDistribute super."caf";
+  "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
+  "caffegraph" = dontDistribute super."caffegraph";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "codo-notation" = dontDistribute super."codo-notation";
+  "cofunctor" = dontDistribute super."cofunctor";
+  "cognimeta-utils" = dontDistribute super."cognimeta-utils";
+  "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";
+  "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";
+  "commodities" = dontDistribute super."commodities";
+  "commsec" = dontDistribute super."commsec";
+  "commsec-keyexchange" = dontDistribute super."commsec-keyexchange";
+  "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";
+  "conceit" = dontDistribute super."conceit";
+  "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-extra" = dontDistribute super."concurrent-extra";
+  "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "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";
+  "conf" = dontDistribute super."conf";
+  "config-select" = dontDistribute super."config-select";
+  "config-value" = dontDistribute super."config-value";
+  "configifier" = dontDistribute super."configifier";
+  "configuration" = dontDistribute super."configuration";
+  "configuration-tools" = dontDistribute super."configuration-tools";
+  "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";
+  "constructible" = dontDistribute super."constructible";
+  "constructive-algebra" = dontDistribute super."constructive-algebra";
+  "consumers" = dontDistribute super."consumers";
+  "container" = dontDistribute super."container";
+  "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";
+  "continued-fractions" = dontDistribute super."continued-fractions";
+  "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-omega" = dontDistribute super."control-monad-omega";
+  "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";
+  "converge" = dontDistribute super."converge";
+  "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";
+  "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";
+  "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";
+  "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-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";
+  "d3js" = dontDistribute super."d3js";
+  "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
+  "daemons" = dontDistribute super."daemons";
+  "dag" = dontDistribute super."dag";
+  "damnpacket" = dontDistribute super."damnpacket";
+  "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-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-generics" = dontDistribute super."data-default-generics";
+  "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-interval" = dontDistribute super."data-interval";
+  "data-ivar" = dontDistribute super."data-ivar";
+  "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-or" = dontDistribute super."data-or";
+  "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-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";
+  "dataenc" = dontDistribute super."dataenc";
+  "dataflow" = dontDistribute super."dataflow";
+  "datalog" = dontDistribute super."datalog";
+  "datapacker" = dontDistribute super."datapacker";
+  "dataurl" = dontDistribute super."dataurl";
+  "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";
+  "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-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";
+  "debian-build" = dontDistribute super."debian-build";
+  "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
+  "decepticons" = dontDistribute super."decepticons";
+  "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-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";
+  "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";
+  "demarcate" = dontDistribute super."demarcate";
+  "denominate" = dontDistribute super."denominate";
+  "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";
+  "deriving-compat" = dontDistribute super."deriving-compat";
+  "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-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-tikz" = dontDistribute super."diagrams-tikz";
+  "dialog" = dontDistribute super."dialog";
+  "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
+  "dicom" = dontDistribute super."dicom";
+  "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";
+  "dirfiles" = dontDistribute super."dirfiles";
+  "dirstream" = dontDistribute super."dirstream";
+  "disassembler" = dontDistribute super."disassembler";
+  "discordian-calendar" = dontDistribute super."discordian-calendar";
+  "discount" = dontDistribute super."discount";
+  "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-closure" = dontDistribute super."distributed-closure";
+  "distributed-process-async" = dontDistribute super."distributed-process-async";
+  "distributed-process-azure" = dontDistribute super."distributed-process-azure";
+  "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-execution" = dontDistribute super."distributed-process-execution";
+  "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "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-registry" = dontDistribute super."distributed-process-registry";
+  "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet";
+  "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor";
+  "distributed-process-task" = dontDistribute super."distributed-process-task";
+  "distributed-process-tests" = dontDistribute super."distributed-process-tests";
+  "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" = dontDistribute super."doctest-discover";
+  "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
+  "doctest-prop" = dontDistribute super."doctest-prop";
+  "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" = dontDistribute super."download";
+  "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";
+  "drClickOn" = dontDistribute super."drClickOn";
+  "draw-poker" = dontDistribute super."draw-poker";
+  "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";
+  "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";
+  "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";
+  "ekg-statsd" = dontDistribute super."ekg-statsd";
+  "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";
+  "elm-build-lib" = dontDistribute super."elm-build-lib";
+  "elm-compiler" = dontDistribute super."elm-compiler";
+  "elm-get" = dontDistribute super."elm-get";
+  "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-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";
+  "every-bit-counts" = dontDistribute super."every-bit-counts";
+  "ewe" = dontDistribute super."ewe";
+  "ex-pool" = dontDistribute super."ex-pool";
+  "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "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";
+  "exception-mtl" = dontDistribute super."exception-mtl";
+  "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";
+  "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";
+  "fail" = dontDistribute super."fail";
+  "failable-list" = dontDistribute super."failable-list";
+  "failure" = dontDistribute super."failure";
+  "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";
+  "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-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";
+  "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-mcmc" = dontDistribute super."flat-mcmc";
+  "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";
+  "flow2dot" = dontDistribute super."flow2dot";
+  "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-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";
+  "fold-debounce" = dontDistribute super."fold-debounce";
+  "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "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";
+  "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";
+  "free-vl" = dontDistribute super."free-vl";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "gamma" = dontDistribute super."gamma";
+  "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-server" = dontDistribute super."generic-server";
+  "generic-storable" = dontDistribute super."generic-storable";
+  "generic-tree" = dontDistribute super."generic-tree";
+  "generic-xml" = dontDistribute super."generic-xml";
+  "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";
+  "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-imported-from" = dontDistribute super."ghc-imported-from";
+  "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-codemirror" = dontDistribute super."ghcjs-codemirror";
+  "ghcjs-dom" = dontDistribute super."ghcjs-dom";
+  "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
+  "ghcjs-websockets" = dontDistribute super."ghcjs-websockets";
+  "ghclive" = dontDistribute super."ghclive";
+  "ghczdecode" = dontDistribute super."ghczdecode";
+  "ght" = dontDistribute super."ght";
+  "gi-atk" = dontDistribute super."gi-atk";
+  "gi-cairo" = dontDistribute super."gi-cairo";
+  "gi-gdk" = dontDistribute super."gi-gdk";
+  "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
+  "gi-gio" = dontDistribute super."gi-gio";
+  "gi-glib" = dontDistribute super."gi-glib";
+  "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gtk" = dontDistribute super."gi-gtk";
+  "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
+  "gi-notify" = dontDistribute super."gi-notify";
+  "gi-pango" = dontDistribute super."gi-pango";
+  "gi-soup" = dontDistribute super."gi-soup";
+  "gi-vte" = dontDistribute super."gi-vte";
+  "gi-webkit" = dontDistribute super."gi-webkit";
+  "gi-webkit2" = dontDistribute super."gi-webkit2";
+  "gimlh" = dontDistribute super."gimlh";
+  "ginger" = dontDistribute super."ginger";
+  "ginsu" = dontDistribute super."ginsu";
+  "gist" = dontDistribute super."gist";
+  "git-all" = dontDistribute super."git-all";
+  "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-backup" = dontDistribute super."github-backup";
+  "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";
+  "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";
+  "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";
+  "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-demo" = dontDistribute super."gore-and-ash-demo";
+  "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";
+  "gpolyline" = dontDistribute super."gpolyline";
+  "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";
+  "grid" = dontDistribute super."grid";
+  "gridland" = dontDistribute super."gridland";
+  "grm" = dontDistribute super."grm";
+  "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-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-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-mac-integration" = dontDistribute super."gtk3-mac-integration";
+  "gtkglext" = dontDistribute super."gtkglext";
+  "gtkimageview" = dontDistribute super."gtkimageview";
+  "gtkrsync" = dontDistribute super."gtkrsync";
+  "gtksourceview2" = dontDistribute super."gtksourceview2";
+  "gtksourceview3" = dontDistribute super."gtksourceview3";
+  "guarded-rewriting" = dontDistribute super."guarded-rewriting";
+  "guess-combinator" = dontDistribute super."guess-combinator";
+  "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";
+  "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";
+  "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-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-leksah" = dontDistribute super."haddock-leksah";
+  "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";
+  "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-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-sass" = dontDistribute super."hakyll-sass";
+  "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";
+  "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";
+  "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";
+  "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_2";
+  "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-formatter" = dontDistribute super."haskell-formatter";
+  "haskell-ftp" = dontDistribute super."haskell-ftp";
+  "haskell-generate" = dontDistribute super."haskell-generate";
+  "haskell-gi" = dontDistribute super."haskell-gi";
+  "haskell-gi-base" = dontDistribute super."haskell-gi-base";
+  "haskell-import-graph" = dontDistribute super."haskell-import-graph";
+  "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpi" = dontDistribute super."haskell-mpi";
+  "haskell-names" = dontDistribute super."haskell-names";
+  "haskell-openflow" = dontDistribute super."haskell-openflow";
+  "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
+  "haskell-platform-test" = dontDistribute super."haskell-platform-test";
+  "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-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-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-amazonka" = dontDistribute super."haxl-amazonka";
+  "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";
+  "hbayes" = dontDistribute super."hbayes";
+  "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";
+  "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";
+  "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-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";
+  "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";
+  "hesql" = dontDistribute super."hesql";
+  "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";
+  "hformat" = dontDistribute super."hformat";
+  "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";
+  "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";
+  "hinquire" = dontDistribute super."hinquire";
+  "hinstaller" = dontDistribute super."hinstaller";
+  "hint-server" = dontDistribute super."hint-server";
+  "hinvaders" = dontDistribute super."hinvaders";
+  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hipbot" = dontDistribute super."hipbot";
+  "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";
+  "hjcase" = dontDistribute super."hjcase";
+  "hjpath" = dontDistribute super."hjpath";
+  "hjs" = dontDistribute super."hjs";
+  "hjson" = dontDistribute super."hjson";
+  "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";
+  "hledger-chart" = dontDistribute super."hledger-chart";
+  "hledger-diff" = dontDistribute super."hledger-diff";
+  "hledger-irr" = dontDistribute super."hledger-irr";
+  "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" = dontDistribute super."hmt";
+  "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";
+  "hopfield" = dontDistribute super."hopfield";
+  "hopfield-networks" = dontDistribute super."hopfield-networks";
+  "hopfli" = dontDistribute super."hopfli";
+  "hops" = dontDistribute super."hops";
+  "hoq" = dontDistribute super."hoq";
+  "horizon" = dontDistribute super."horizon";
+  "hosc" = dontDistribute super."hosc";
+  "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";
+  "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";
+  "hpack" = dontDistribute super."hpack";
+  "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";
+  "hpc-strobe" = dontDistribute super."hpc-strobe";
+  "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hplayground" = dontDistribute super."hplayground";
+  "hplaylist" = dontDistribute super."hplaylist";
+  "hpodder" = dontDistribute super."hpodder";
+  "hpp" = dontDistribute super."hpp";
+  "hpqtypes" = dontDistribute super."hpqtypes";
+  "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-GeoIP" = dontDistribute super."hs-GeoIP";
+  "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";
+  "hsb2hs" = dontDistribute super."hsb2hs";
+  "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";
+  "hsdev" = dontDistribute super."hsdev";
+  "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-monad-control" = dontDistribute super."hspec-monad-control";
+  "hspec-server" = dontDistribute super."hspec-server";
+  "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "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";
+  "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-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";
+  "htoml" = dontDistribute super."htoml";
+  "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-streams" = dontDistribute super."http-client-streams";
+  "http-conduit-browser" = dontDistribute super."http-conduit-browser";
+  "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-encodings" = dontDistribute super."http-encodings";
+  "http-enumerator" = dontDistribute super."http-enumerator";
+  "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-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";
+  "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";
+  "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";
+  "identifiers" = dontDistribute super."identifiers";
+  "idiii" = dontDistribute super."idiii";
+  "idna" = dontDistribute super."idna";
+  "idna2008" = dontDistribute super."idna2008";
+  "idris" = dontDistribute super."idris";
+  "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-inline-r" = dontDistribute super."ihaskell-inline-r";
+  "ihaskell-parsec" = dontDistribute super."ihaskell-parsec";
+  "ihaskell-plot" = dontDistribute super."ihaskell-plot";
+  "ihaskell-widgets" = dontDistribute super."ihaskell-widgets";
+  "ihttp" = dontDistribute super."ihttp";
+  "illuminate" = dontDistribute super."illuminate";
+  "image-type" = dontDistribute super."image-type";
+  "imagefilters" = dontDistribute super."imagefilters";
+  "imagemagick" = dontDistribute super."imagemagick";
+  "imagepaste" = dontDistribute super."imagepaste";
+  "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-params" = dontDistribute super."implicit-params";
+  "imports" = dontDistribute super."imports";
+  "improve" = dontDistribute super."improve";
+  "inc-ref" = dontDistribute super."inc-ref";
+  "inch" = dontDistribute super."inch";
+  "incremental-computing" = dontDistribute super."incremental-computing";
+  "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
+  "increments" = dontDistribute super."increments";
+  "indentation" = dontDistribute super."indentation";
+  "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";
+  "inquire" = dontDistribute super."inquire";
+  "inserts" = dontDistribute super."inserts";
+  "inspection-proxy" = dontDistribute super."inspection-proxy";
+  "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";
+  "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";
+  "intern" = dontDistribute super."intern";
+  "internetmarke" = dontDistribute super."internetmarke";
+  "interpol" = dontDistribute super."interpol";
+  "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
+  "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
+  "interpolation" = dontDistribute super."interpolation";
+  "intricacy" = dontDistribute super."intricacy";
+  "intset" = dontDistribute super."intset";
+  "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-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-colors" = dontDistribute super."irc-colors";
+  "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";
+  "ircbot" = dontDistribute super."ircbot";
+  "ircbouncer" = dontDistribute super."ircbouncer";
+  "ireal" = dontDistribute super."ireal";
+  "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";
+  "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-backend-c" = dontDistribute super."ivory-backend-c";
+  "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "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-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";
+  "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";
+  "jose" = dontDistribute super."jose";
+  "jpeg" = dontDistribute super."jpeg";
+  "js-good-parts" = dontDistribute super."js-good-parts";
+  "jsaddle" = dontDistribute super."jsaddle";
+  "jsaddle-hello" = dontDistribute super."jsaddle-hello";
+  "jsc" = dontDistribute super."jsc";
+  "jsmw" = dontDistribute super."jsmw";
+  "json-assertions" = dontDistribute super."json-assertions";
+  "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-litobj" = dontDistribute super."json-litobj";
+  "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";
+  "judy" = dontDistribute super."judy";
+  "jukebox" = dontDistribute super."jukebox";
+  "jumpthefive" = dontDistribute super."jumpthefive";
+  "jvm-parser" = dontDistribute super."jvm-parser";
+  "kademlia" = dontDistribute super."kademlia";
+  "kafka-client" = dontDistribute super."kafka-client";
+  "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";
+  "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";
+  "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";
+  "lackey" = dontDistribute super."lackey";
+  "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-samples" = dontDistribute super."lambdacube-samples";
+  "lambdatex" = dontDistribute super."lambdatex";
+  "lambdatwit" = dontDistribute super."lambdatwit";
+  "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-c-quote" = dontDistribute super."language-c-quote";
+  "language-cil" = dontDistribute super."language-cil";
+  "language-css" = dontDistribute super."language-css";
+  "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-typescript" = dontDistribute super."language-typescript";
+  "language-vhdl" = dontDistribute super."language-vhdl";
+  "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";
+  "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";
+  "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";
+  "leksah-server" = dontDistribute super."leksah-server";
+  "lendingclub" = dontDistribute super."lendingclub";
+  "lens-datetime" = dontDistribute super."lens-datetime";
+  "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";
+  "lentil" = dontDistribute super."lentil";
+  "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";
+  "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";
+  "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";
+  "libxml" = dontDistribute super."libxml";
+  "libxml-enumerator" = dontDistribute super."libxml-enumerator";
+  "libxslt" = dontDistribute super."libxslt";
+  "life" = dontDistribute super."life";
+  "lift-generics" = dontDistribute super."lift-generics";
+  "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";
+  "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";
+  "load-env" = dontDistribute super."load-env";
+  "loadavg" = dontDistribute super."loadavg";
+  "local-address" = dontDistribute super."local-address";
+  "local-search" = dontDistribute super."local-search";
+  "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";
+  "logfloat" = dontDistribute super."logfloat";
+  "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";
+  "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";
+  "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";
+  "ltk" = dontDistribute super."ltk";
+  "ltl" = dontDistribute super."ltl";
+  "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";
+  "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";
+  "maccatcher" = dontDistribute super."maccatcher";
+  "machinecell" = dontDistribute super."machinecell";
+  "machines-binary" = dontDistribute super."machines-binary";
+  "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";
+  "mainland-pretty" = dontDistribute super."mainland-pretty";
+  "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";
+  "manifold-random" = dontDistribute super."manifold-random";
+  "manifolds" = dontDistribute super."manifolds";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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-exception" = dontDistribute super."monad-exception";
+  "monad-fork" = dontDistribute super."monad-fork";
+  "monad-gen" = dontDistribute super."monad-gen";
+  "monad-interleave" = dontDistribute super."monad-interleave";
+  "monad-levels" = dontDistribute super."monad-levels";
+  "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-stlike-io" = dontDistribute super."monad-stlike-io";
+  "monad-stlike-stm" = dontDistribute super."monad-stlike-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";
+  "monadplus" = dontDistribute super."monadplus";
+  "monads-fd" = dontDistribute super."monads-fd";
+  "monadtransform" = dontDistribute super."monadtransform";
+  "monarch" = dontDistribute super."monarch";
+  "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-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";
+  "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";
+  "multext-east-msd" = dontDistribute super."multext-east-msd";
+  "multi-cabal" = dontDistribute super."multi-cabal";
+  "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";
+  "multiset-comb" = dontDistribute super."multiset-comb";
+  "multisetrewrite" = dontDistribute super."multisetrewrite";
+  "multistate" = dontDistribute super."multistate";
+  "muon" = dontDistribute super."muon";
+  "murder" = dontDistribute super."murder";
+  "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";
+  "names-th" = dontDistribute super."names-th";
+  "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
+  "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";
+  "nanq" = dontDistribute super."nanq";
+  "narc" = dontDistribute super."narc";
+  "nat" = dontDistribute super."nat";
+  "nats-queue" = dontDistribute super."nats-queue";
+  "natural-number" = dontDistribute super."natural-number";
+  "natural-numbers" = dontDistribute super."natural-numbers";
+  "natural-transformation" = dontDistribute super."natural-transformation";
+  "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" = dontDistribute super."nested-routes";
+  "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-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-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "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";
+  "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";
+  "niagra" = dontDistribute super."niagra";
+  "nibblestring" = dontDistribute super."nibblestring";
+  "nicify" = dontDistribute super."nicify";
+  "nicify-lib" = dontDistribute super."nicify-lib";
+  "nicovideo-translator" = dontDistribute super."nicovideo-translator";
+  "nikepub" = dontDistribute super."nikepub";
+  "nimber" = dontDistribute super."nimber";
+  "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";
+  "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";
+  "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";
+  "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";
+  "octohat" = dontDistribute super."octohat";
+  "octopus" = dontDistribute super."octopus";
+  "oculus" = dontDistribute super."oculus";
+  "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-classy" = dontDistribute super."opaleye-classy";
+  "opaleye-sqlite" = dontDistribute super."opaleye-sqlite";
+  "opaleye-trans" = dontDistribute super."opaleye-trans";
+  "open-haddock" = dontDistribute super."open-haddock";
+  "open-pandoc" = dontDistribute super."open-pandoc";
+  "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";
+  "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-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";
+  "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";
+  "overture" = dontDistribute super."overture";
+  "pack" = dontDistribute super."pack";
+  "package-o-tron" = dontDistribute super."package-o-tron";
+  "package-vt" = dontDistribute super."package-vt";
+  "packdeps" = dontDistribute super."packdeps";
+  "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-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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "period" = dontDistribute super."period";
+  "perm" = dontDistribute super."perm";
+  "permutation" = dontDistribute super."permutation";
+  "permute" = dontDistribute super."permute";
+  "persist2er" = dontDistribute super."persist2er";
+  "persistable-record" = dontDistribute super."persistable-record";
+  "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-cereal" = dontDistribute super."persistent-cereal";
+  "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-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-protobuf" = dontDistribute super."persistent-protobuf";
+  "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
+  "persistent-redis" = dontDistribute super."persistent-redis";
+  "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";
+  "pgdl" = dontDistribute super."pgdl";
+  "pgm" = dontDistribute super."pgm";
+  "pgsql-simple" = dontDistribute super."pgsql-simple";
+  "pgstream" = dontDistribute super."pgstream";
+  "phasechange" = dontDistribute super."phasechange";
+  "phizzle" = dontDistribute super."phizzle";
+  "phoityne" = dontDistribute super."phoityne";
+  "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";
+  "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-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-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-shell" = dontDistribute super."pipes-shell";
+  "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-transduce" = dontDistribute super."pipes-transduce";
+  "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";
+  "plan-b" = dontDistribute super."plan-b";
+  "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";
+  "pointfree" = dontDistribute super."pointfree";
+  "pointful" = dontDistribute super."pointful";
+  "pointless-fun" = dontDistribute super."pointless-fun";
+  "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";
+  "polyToMonoid" = dontDistribute super."polyToMonoid";
+  "polymap" = dontDistribute super."polymap";
+  "polynom" = dontDistribute super."polynom";
+  "polynomial" = dontDistribute super."polynomial";
+  "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
+  "polyseq" = dontDistribute super."polyseq";
+  "polysoup" = dontDistribute super."polysoup";
+  "polytypeable" = dontDistribute super."polytypeable";
+  "polytypeable-utils" = dontDistribute super."polytypeable-utils";
+  "ponder" = dontDistribute super."ponder";
+  "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-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-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-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-generalize" = dontDistribute super."prelude-generalize";
+  "prelude-plus" = dontDistribute super."prelude-plus";
+  "prelude-prime" = dontDistribute super."prelude-prime";
+  "prelude-safeenum" = dontDistribute super."prelude-safeenum";
+  "preprocess-haskell" = dontDistribute super."preprocess-haskell";
+  "preprocessor-tools" = dontDistribute super."preprocessor-tools";
+  "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-hex" = dontDistribute super."pretty-hex";
+  "pretty-ncols" = dontDistribute super."pretty-ncols";
+  "pretty-sop" = dontDistribute super."pretty-sop";
+  "pretty-tree" = dontDistribute super."pretty-tree";
+  "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-uniq" = dontDistribute super."prim-uniq";
+  "primula-board" = dontDistribute super."primula-board";
+  "primula-bot" = dontDistribute super."primula-bot";
+  "printf-mauke" = dontDistribute super."printf-mauke";
+  "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-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";
+  "process-streaming" = dontDistribute super."process-streaming";
+  "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";
+  "profiteur" = dontDistribute super."profiteur";
+  "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";
+  "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-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";
+  "pseudo-boolean" = dontDistribute super."pseudo-boolean";
+  "pseudo-trie" = dontDistribute super."pseudo-trie";
+  "pseudomacros" = dontDistribute super."pseudomacros";
+  "pub" = dontDistribute super."pub";
+  "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-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-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "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";
+  "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";
+  "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-simple" = dontDistribute super."quickcheck-simple";
+  "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver";
+  "quicklz" = dontDistribute super."quicklz";
+  "quickpull" = dontDistribute super."quickpull";
+  "quickset" = dontDistribute super."quickset";
+  "quickspec" = dontDistribute super."quickspec";
+  "quicktest" = dontDistribute super."quicktest";
+  "quickwebapp" = dontDistribute super."quickwebapp";
+  "quiver" = dontDistribute super."quiver";
+  "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-http" = dontDistribute super."quiver-http";
+  "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";
+  "rascal" = dontDistribute super."rascal";
+  "rate-limit" = dontDistribute super."rate-limit";
+  "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";
+  "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-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";
+  "reactor" = dontDistribute super."reactor";
+  "read-bounded" = dontDistribute super."read-bounded";
+  "readline-statevar" = dontDistribute super."readline-statevar";
+  "readpyc" = dontDistribute super."readpyc";
+  "really-simple-xml-parser" = dontDistribute super."really-simple-xml-parser";
+  "reasonable-lens" = dontDistribute super."reasonable-lens";
+  "reasonable-operational" = dontDistribute super."reasonable-operational";
+  "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";
+  "recursion-schemes" = dontDistribute super."recursion-schemes";
+  "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";
+  "reedsolomon" = dontDistribute super."reedsolomon";
+  "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-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
+  "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-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";
+  "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-query" = dontDistribute super."relational-query";
+  "relational-query-HDBC" = dontDistribute super."relational-query-HDBC";
+  "relational-record" = dontDistribute super."relational-record";
+  "relational-record-examples" = dontDistribute super."relational-record-examples";
+  "relational-schemas" = dontDistribute super."relational-schemas";
+  "relative-date" = dontDistribute super."relative-date";
+  "relit" = dontDistribute super."relit";
+  "rematch" = dontDistribute super."rematch";
+  "rematch-text" = dontDistribute super."rematch-text";
+  "remote" = dontDistribute super."remote";
+  "remote-debugger" = dontDistribute super."remote-debugger";
+  "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";
+  "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-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-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";
+  "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";
+  "rmonad" = dontDistribute super."rmonad";
+  "rncryptor" = dontDistribute super."rncryptor";
+  "rng-utils" = dontDistribute super."rng-utils";
+  "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";
+  "rotating-log" = dontDistribute super."rotating-log";
+  "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";
+  "sandlib" = dontDistribute super."sandlib";
+  "sarasvati" = dontDistribute super."sarasvati";
+  "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";
+  "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";
+  "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-rest" = dontDistribute super."scotty-rest";
+  "scotty-session" = dontDistribute super."scotty-session";
+  "scotty-tls" = dontDistribute super."scotty-tls";
+  "scp-streams" = dontDistribute super."scp-streams";
+  "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "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";
+  "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";
+  "semiring-simple" = dontDistribute super."semiring-simple";
+  "semver-range" = dontDistribute super."semver-range";
+  "sendgrid-haskell" = dontDistribute super."sendgrid-haskell";
+  "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";
+  "serialport" = dontDistribute super."serialport";
+  "serv" = dontDistribute super."serv";
+  "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-ede" = dontDistribute super."servant-ede";
+  "servant-examples" = dontDistribute super."servant-examples";
+  "servant-github" = dontDistribute super."servant-github";
+  "servant-lucid" = dontDistribute super."servant-lucid";
+  "servant-mock" = dontDistribute super."servant-mock";
+  "servant-pandoc" = dontDistribute super."servant-pandoc";
+  "servant-pool" = dontDistribute super."servant-pool";
+  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-response" = dontDistribute super."servant-response";
+  "servant-scotty" = dontDistribute super."servant-scotty";
+  "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-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";
+  "shelly-extra" = dontDistribute super."shelly-extra";
+  "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" = dontDistribute super."simple-log";
+  "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" = dontDistribute super."simpleirc";
+  "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";
+  "sink" = dontDistribute super."sink";
+  "sirkel" = dontDistribute super."sirkel";
+  "sitemap" = dontDistribute super."sitemap";
+  "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";
+  "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";
+  "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";
+  "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-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-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";
+  "soegtk" = dontDistribute super."soegtk";
+  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
+  "sophia" = dontDistribute super."sophia";
+  "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
+  "sorted" = dontDistribute super."sorted";
+  "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";
+  "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";
+  "spool" = dontDistribute super."spool";
+  "spoonutil" = dontDistribute super."spoonutil";
+  "spoty" = dontDistribute super."spoty";
+  "spreadsheet" = dontDistribute super."spreadsheet";
+  "spritz" = dontDistribute super."spritz";
+  "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";
+  "sql-words" = dontDistribute super."sql-words";
+  "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";
+  "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-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";
+  "stopwatch" = dontDistribute super."stopwatch";
+  "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";
+  "str" = dontDistribute super."str";
+  "stratum-tool" = dontDistribute super."stratum-tool";
+  "stream-fusion" = dontDistribute super."stream-fusion";
+  "stream-monad" = dontDistribute super."stream-monad";
+  "streamed" = dontDistribute super."streamed";
+  "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "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-conv" = dontDistribute super."string-conv";
+  "string-convert" = dontDistribute super."string-convert";
+  "string-quote" = dontDistribute super."string-quote";
+  "string-similarity" = dontDistribute super."string-similarity";
+  "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";
+  "strive" = dontDistribute super."strive";
+  "strptime" = dontDistribute super."strptime";
+  "structs" = dontDistribute super."structs";
+  "structural-induction" = dontDistribute super."structural-induction";
+  "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";
+  "suffixarray" = dontDistribute super."suffixarray";
+  "suffixtree" = dontDistribute super."suffixtree";
+  "sugarhaskell" = dontDistribute super."sugarhaskell";
+  "suitable" = dontDistribute super."suitable";
+  "sump" = dontDistribute super."sump";
+  "sundown" = dontDistribute super."sundown";
+  "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";
+  "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";
+  "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";
+  "symbol" = dontDistribute super."symbol";
+  "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-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";
+  "ta" = dontDistribute super."ta";
+  "table" = dontDistribute super."table";
+  "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-transformer" = dontDistribute super."tagged-transformer";
+  "tagging" = dontDistribute super."tagging";
+  "taggy" = dontDistribute super."taggy";
+  "taggy-lens" = dontDistribute super."taggy-lens";
+  "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";
+  "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";
+  "taskpool" = dontDistribute super."taskpool";
+  "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";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "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";
+  "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-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-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";
+  "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-and-plots" = dontDistribute super."text-and-plots";
+  "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-ldap" = dontDistribute super."text-ldap";
+  "text-locale-encoding" = dontDistribute super."text-locale-encoding";
+  "text-normal" = dontDistribute super."text-normal";
+  "text-position" = dontDistribute super."text-position";
+  "text-postgresql" = dontDistribute super."text-postgresql";
+  "text-printer" = dontDistribute super."text-printer";
+  "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
+  "text-register-machine" = dontDistribute super."text-register-machine";
+  "text-render" = dontDistribute super."text-render";
+  "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";
+  "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-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-lift-instances" = dontDistribute super."th-lift-instances";
+  "th-printf" = dontDistribute super."th-printf";
+  "th-sccs" = dontDistribute super."th-sccs";
+  "th-traced" = dontDistribute super."th-traced";
+  "th-typegraph" = dontDistribute super."th-typegraph";
+  "themoviedb" = dontDistribute super."themoviedb";
+  "themplate" = dontDistribute super."themplate";
+  "theoremquest" = dontDistribute super."theoremquest";
+  "theoremquest-client" = dontDistribute super."theoremquest-client";
+  "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";
+  "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" = dontDistribute super."tidal";
+  "tidal-midi" = dontDistribute super."tidal-midi";
+  "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-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-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-time" = dontDistribute super."timelike-time";
+  "timemap" = dontDistribute super."timemap";
+  "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";
+  "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-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";
+  "tracker" = dontDistribute super."tracker";
+  "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-compose" = dontDistribute super."transformers-compose";
+  "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-runnable" = dontDistribute super."transformers-runnable";
+  "transformers-supply" = dontDistribute super."transformers-supply";
+  "transient" = dontDistribute super."transient";
+  "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";
+  "tslogger" = dontDistribute super."tslogger";
+  "tsp-viz" = dontDistribute super."tsp-viz";
+  "tsparse" = dontDistribute super."tsparse";
+  "tst" = dontDistribute super."tst";
+  "tsvsql" = dontDistribute super."tsvsql";
+  "tubes" = dontDistribute super."tubes";
+  "tuntap" = dontDistribute super."tuntap";
+  "tup-functor" = dontDistribute super."tup-functor";
+  "tuple" = dontDistribute super."tuple";
+  "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";
+  "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
+  "turni" = dontDistribute super."turni";
+  "tweak" = dontDistribute super."tweak";
+  "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";
+  "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-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-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";
+  "typography-geometry" = dontDistribute super."typography-geometry";
+  "uAgda" = dontDistribute super."uAgda";
+  "ua-parser" = dontDistribute super."ua-parser";
+  "uacpid" = dontDistribute super."uacpid";
+  "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";
+  "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-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";
+  "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-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";
+  "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";
+  "vado" = dontDistribute super."vado";
+  "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";
+  "vcd" = dontDistribute super."vcd";
+  "vcs-revision" = dontDistribute super."vcs-revision";
+  "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
+  "vcsgui" = dontDistribute super."vcsgui";
+  "vcswrapper" = dontDistribute super."vcswrapper";
+  "vect" = dontDistribute super."vect";
+  "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-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" = dontDistribute super."versions";
+  "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-utils" = dontDistribute super."vinyl-utils";
+  "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";
+  "vivid" = dontDistribute super."vivid";
+  "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";
+  "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-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-content-type" = dontDistribute super."wai-middleware-content-type";
+  "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" = dontDistribute super."wai-middleware-verbs";
+  "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-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";
+  "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" = dontDistribute super."webkitgtk3";
+  "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "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" = dontDistribute super."werewolf";
+  "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";
+  "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";
+  "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";
+  "wuss" = dontDistribute super."wuss";
+  "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-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";
+  "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";
+  "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-json" = dontDistribute super."yesod-json";
+  "yesod-links" = dontDistribute super."yesod-links";
+  "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "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";
+  "yjtools" = dontDistribute super."yjtools";
+  "yocto" = dontDistribute super."yocto";
+  "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-conduit" = dontDistribute super."zip-conduit";
+  "zipedit" = dontDistribute super."zipedit";
+  "zipkin" = dontDistribute super."zipkin";
+  "zipper" = dontDistribute super."zipper";
+  "zippers" = dontDistribute super."zippers";
+  "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";
+  "zot" = dontDistribute super."zot";
+  "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 6c2feb4946e5..8d1090965f8e 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1802,7 +1802,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "BlogLiterately" = callPackage
+  "BlogLiterately_0_8_1_3" = callPackage
     ({ mkDerivation, base, blaze-html, bool-extras, bytestring, cmdargs
      , containers, data-default, directory, filepath, HaXml, haxr
      , highlighting-kate, hscolour, lens, mtl, pandoc, pandoc-citeproc
@@ -1822,12 +1822,14 @@ self: {
          process split strict temporary transformers
        ];
        executableHaskellDepends = [ base cmdargs ];
+       jailbreak = true;
        homepage = "http://byorgey.wordpress.com/blogliterately/";
        description = "A tool for posting Haskelly articles to blogs";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "BlogLiterately_0_8_1_4" = callPackage
+  "BlogLiterately" = callPackage
     ({ mkDerivation, base, blaze-html, bool-extras, bytestring, cmdargs
      , containers, data-default, directory, filepath, HaXml, haxr
      , highlighting-kate, hscolour, lens, mtl, pandoc, pandoc-citeproc
@@ -1847,7 +1849,31 @@ self: {
          process split strict temporary transformers
        ];
        executableHaskellDepends = [ base cmdargs ];
-       jailbreak = true;
+       homepage = "http://byorgey.wordpress.com/blogliterately/";
+       description = "A tool for posting Haskelly articles to blogs";
+       license = "GPL";
+     }) {};
+
+  "BlogLiterately_0_8_1_5" = callPackage
+    ({ mkDerivation, base, blaze-html, bool-extras, bytestring, cmdargs
+     , containers, data-default, directory, filepath, HaXml, haxr
+     , highlighting-kate, hscolour, lens, mtl, pandoc, pandoc-citeproc
+     , pandoc-types, parsec, process, split, strict, temporary
+     , transformers
+     }:
+     mkDerivation {
+       pname = "BlogLiterately";
+       version = "0.8.1.5";
+       sha256 = "d75dca56afba1d391cb9756e52f2d949bbfcd5defc0fcef5371589d06cb21aeb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-html bool-extras bytestring cmdargs containers
+         data-default directory filepath HaXml haxr highlighting-kate
+         hscolour lens mtl pandoc pandoc-citeproc pandoc-types parsec
+         process split strict temporary transformers
+       ];
+       executableHaskellDepends = [ base cmdargs ];
        homepage = "http://byorgey.wordpress.com/blogliterately/";
        description = "A tool for posting Haskelly articles to blogs";
        license = "GPL";
@@ -1877,7 +1903,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "BlogLiterately-diagrams" = callPackage
+  "BlogLiterately-diagrams_0_2_0_1" = callPackage
     ({ mkDerivation, base, BlogLiterately, containers, diagrams-builder
      , diagrams-lib, diagrams-rasterific, directory, filepath
      , JuicyPixels, pandoc, safe
@@ -1893,11 +1919,13 @@ self: {
          diagrams-rasterific directory filepath JuicyPixels pandoc safe
        ];
        executableHaskellDepends = [ base BlogLiterately ];
+       jailbreak = true;
        description = "Include images in blog posts with inline diagrams code";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "BlogLiterately-diagrams_0_2_0_2" = callPackage
+  "BlogLiterately-diagrams" = callPackage
     ({ mkDerivation, base, BlogLiterately, containers, diagrams-builder
      , diagrams-lib, diagrams-rasterific, directory, filepath
      , JuicyPixels, pandoc, safe
@@ -1913,10 +1941,8 @@ self: {
          diagrams-rasterific directory filepath JuicyPixels pandoc safe
        ];
        executableHaskellDepends = [ base BlogLiterately ];
-       jailbreak = true;
        description = "Include images in blog posts with inline diagrams code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BluePrintCSS" = callPackage
@@ -1959,10 +1985,10 @@ self: {
          pandoc-types parseargs
        ];
        testHaskellDepends = [ base process ];
-       jailbreak = true;
        homepage = "http://www.cse.chalmers.se/~emax/bookshelf/Manual.shelf.html";
        description = "A simple document organizer with some wiki functionality";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Boolean" = callPackage
@@ -2446,7 +2472,7 @@ self: {
          opencv_legacy = null; opencv_ml = null; opencv_objdetect = null; 
          opencv_video = null;};
 
-  "Cabal_1_18_1_6" = callPackage
+  "Cabal_1_18_1_7" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , directory, extensible-exceptions, filepath, HUnit, pretty
      , process, QuickCheck, regex-posix, test-framework
@@ -2454,8 +2480,8 @@ self: {
      }:
      mkDerivation {
        pname = "Cabal";
-       version = "1.18.1.6";
-       sha256 = "9cfa9df3472d3b96797d9835040c87a2450c866bb090d5f13dfe63bb9033d696";
+       version = "1.18.1.7";
+       sha256 = "1fc2d4d5110019cee45ffb0777ad8aa33d46673a982cbe58d602d3b17e6e7282";
        libraryHaskellDepends = [
          array base bytestring containers deepseq directory filepath pretty
          process time unix
@@ -2472,7 +2498,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "Cabal_1_20_0_3" = callPackage
+  "Cabal_1_20_0_4" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, deepseq
      , directory, extensible-exceptions, filepath, HUnit, pretty
      , process, QuickCheck, regex-posix, test-framework
@@ -2480,8 +2506,8 @@ self: {
      }:
      mkDerivation {
        pname = "Cabal";
-       version = "1.20.0.3";
-       sha256 = "1ba06ef194db0decdd1994c83cded718699a7da3068d73ff94e4ccbd39eb016f";
+       version = "1.20.0.4";
+       sha256 = "fdf6d934ec74e27e4b5071f4d54932b24828017fe6777f8829ac1271a394e4e0";
        libraryHaskellDepends = [
          array base bytestring containers deepseq directory filepath pretty
          process time unix
@@ -2581,6 +2607,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Cabal_1_22_7_0" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , deepseq, directory, extensible-exceptions, filepath, HUnit
+     , old-time, pretty, process, QuickCheck, regex-posix
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , time, unix
+     }:
+     mkDerivation {
+       pname = "Cabal";
+       version = "1.22.7.0";
+       sha256 = "06133e049631ce0b7b84bde991d9d5de879efd53ec0291af050a416544f57b8b";
+       libraryHaskellDepends = [
+         array base binary bytestring containers deepseq directory filepath
+         pretty process time unix
+       ];
+       testHaskellDepends = [
+         base bytestring containers directory extensible-exceptions filepath
+         HUnit old-time process QuickCheck regex-posix test-framework
+         test-framework-hunit test-framework-quickcheck2 unix
+       ];
+       doCheck = false;
+       homepage = "http://www.haskell.org/cabal/";
+       description = "A framework for packaging Haskell software";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Cabal-ide-backend" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
      , deepseq, directory, extensible-exceptions, filepath, HUnit
@@ -3368,6 +3421,7 @@ self: {
        version = "0.5.0.1";
        sha256 = "addb2abcf81ad9619d42e2f25e5866f7e998f29527409e40c7954078cc9fd676";
        libraryHaskellDepends = [ async base ];
+       jailbreak = true;
        homepage = "http://github.com/avieth/Concurrential";
        description = "Mix concurrent and sequential computation";
        license = stdenv.lib.licenses.bsd3;
@@ -4981,11 +5035,12 @@ self: {
      }:
      mkDerivation {
        pname = "EdisonCore";
-       version = "1.3";
-       sha256 = "ccdf7a5c47baad82c9a9bdcaa848ec36de4818a9cd5ac063e2e1046ca6cfcc4a";
+       version = "1.3.1";
+       sha256 = "9d460a8e51e5b6d36e106a49c07a40f49d7ddcd46d1b32978bccd0c8ae9a4ad8";
        libraryHaskellDepends = [
          array base containers EdisonAPI mtl QuickCheck
        ];
+       jailbreak = true;
        homepage = "http://rwd.rdockins.name/edison/home/";
        description = "A library of efficent, purely-functional data structures (Core Implementations)";
        license = "unknown";
@@ -6891,6 +6946,7 @@ self: {
        version = "0.1.0.1";
        sha256 = "ab70cbd8a73d45b6ed8c4d692e39e54180def339f29ff1ba9671f24d07e7bab0";
        libraryHaskellDepends = [ aeson base bytestring HTTP text ];
+       jailbreak = true;
        homepage = "https://github.com/juergenhah/Haskell-Geocoder-OpenCage.git";
        description = "Geocoder and Reverse Geocoding Service Wrapper";
        license = "GPL";
@@ -6948,8 +7004,8 @@ self: {
     ({ mkDerivation, base, gtk3, process, temporary }:
      mkDerivation {
        pname = "Gifcurry";
-       version = "0.1.0.0";
-       sha256 = "b2b6eadd35889f996931887b21c85a9dbd397f988567981479266752e21537bf";
+       version = "0.1.0.1";
+       sha256 = "cfa0729e5cab21a4d4ff969b86af20a6e5244059a030695879e56e4705a5e56f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base gtk3 process temporary ];
@@ -7208,7 +7264,8 @@ self: {
 
   "Graphalyze" = callPackage
     ({ mkDerivation, array, base, bktrees, containers, directory, fgl
-     , filepath, graphviz, pandoc, process, random, text, time
+     , filepath, graphviz, old-locale, pandoc, process, random, text
+     , time
      }:
      mkDerivation {
        pname = "Graphalyze";
@@ -7216,8 +7273,9 @@ self: {
        sha256 = "9792207d74f5aff52b3e5b83378db480702b8b5e1b13e65113e2f32e7687ce9f";
        libraryHaskellDepends = [
          array base bktrees containers directory fgl filepath graphviz
-         pandoc process random text time
+         old-locale pandoc process random text time
        ];
+       jailbreak = true;
        description = "Graph-Theoretic Analysis library";
        license = "unknown";
      }) {};
@@ -7378,22 +7436,23 @@ self: {
   "H" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, directory, file-embed
      , inline-r, pretty, process, singletons, tasty, tasty-golden
-     , tasty-hunit, temporary-rc, text, vector
+     , tasty-hunit, temporary, text, vector
      }:
      mkDerivation {
        pname = "H";
-       version = "0.7.0.0";
-       sha256 = "52ee637c754b8629f209e5b15c7b19437cd7039f660f7bc32e5a83c548b8100e";
+       version = "0.8.0.0";
+       sha256 = "b679dc140f783afa598da1bc2d111d603ad94b5f04d7db912452194635d47484";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base bytestring cmdargs file-embed inline-r pretty process
-         temporary-rc vector
+         temporary vector
        ];
        testHaskellDepends = [
          base bytestring directory inline-r process singletons tasty
          tasty-golden tasty-hunit text vector
        ];
+       doCheck = false;
        description = "The Haskell/R mixed programming environment";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -8389,6 +8448,7 @@ self: {
        homepage = "https://github.com/atzeus/HMap";
        description = "Fast heterogeneous maps and unconstrained typeable like functionality";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HNM" = callPackage
@@ -9115,7 +9175,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "HTTP" = callPackage
+  "HTTP_4000_2_23" = callPackage
     ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
      , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
      , network, network-uri, old-time, parsec, pureMD5, split
@@ -9137,9 +9197,10 @@ self: {
        homepage = "https://github.com/haskell/HTTP";
        description = "A library for client-side HTTP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "HTTP_4000_3_2" = callPackage
+  "HTTP" = callPackage
     ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
      , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
      , network, network-uri, parsec, pureMD5, split, test-framework
@@ -9157,10 +9218,10 @@ self: {
          http-types httpd-shed HUnit mtl network network-uri pureMD5 split
          test-framework test-framework-hunit wai warp
        ];
+       doCheck = false;
        homepage = "https://github.com/haskell/HTTP";
        description = "A library for client-side HTTP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HTTP-Simple" = callPackage
@@ -11657,7 +11718,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "JuicyPixels" = callPackage
+  "JuicyPixels_3_2_6_4" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
      , primitive, transformers, vector, zlib
      }:
@@ -11674,6 +11735,24 @@ self: {
        homepage = "https://github.com/Twinside/Juicy.Pixels";
        description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "JuicyPixels" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq, mtl
+     , primitive, transformers, vector, zlib
+     }:
+     mkDerivation {
+       pname = "JuicyPixels";
+       version = "3.2.7";
+       sha256 = "0126ff02d78045a299e76a35e2a3d3d188e7512f08d57e89bf1e0a94eb6ff14b";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq mtl primitive
+         transformers vector zlib
+       ];
+       homepage = "https://github.com/Twinside/Juicy.Pixels";
+       description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "JuicyPixels-canvas" = callPackage
@@ -12349,6 +12428,7 @@ self: {
        homepage = "http://bitbucket.org/astanin/hs-libzip/";
        description = "Bindings to libzip, a library for manipulating zip archives";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LibZip_0_11_1" = callPackage
@@ -15085,6 +15165,7 @@ self: {
        ];
        description = "This is a package which includes Assignments, Email, User and Reviews modules for Programming in Haskell course";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PageIO" = callPackage
@@ -15953,6 +16034,7 @@ self: {
          base directory filepath pandoc-types process split
        ];
        executableHaskellDepends = [ base pandoc-types ];
+       jailbreak = true;
        description = "A pandoc filter to express R plots inside markdown";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -22321,8 +22403,8 @@ self: {
     ({ mkDerivation, base, bytestring, hspec, zlib }:
      mkDerivation {
        pname = "adler32";
-       version = "0.1.0.0";
-       sha256 = "c2bdbdd971e28ed4abb321280c3d77965ed425a848b3ef08ac66a6233c5d5328";
+       version = "0.1.1.0";
+       sha256 = "578cb9ea7451dc905a22de15e46f8d6fc27f76e4c6f75352a70ebfe53a6928ec";
        libraryHaskellDepends = [ base bytestring ];
        librarySystemDepends = [ zlib ];
        testHaskellDepends = [ base bytestring hspec ];
@@ -22644,8 +22726,8 @@ self: {
        pname = "aeson-extra";
        version = "0.2.1.0";
        sha256 = "d46ac20994321ee480ec9ec4b4714943af9121b55d5ef45f25a51932eec63f91";
-       revision = "1";
-       editedCabalFile = "c80517bdbd55afcbb06a535060f6be97e5619314ed1545181136f140544d4120";
+       revision = "2";
+       editedCabalFile = "e4bc838bebc2442c95e2d5987b1f71d38323686ab15a87d15f79431dfcd9ac7f";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers exceptions hashable
          scientific tagged text unordered-containers vector
@@ -22671,6 +22753,8 @@ self: {
        pname = "aeson-extra";
        version = "0.2.2.0";
        sha256 = "368aa018e650f323a1d52cfd38596fe419667e1ef3f83faf0f7255518b18dc45";
+       revision = "1";
+       editedCabalFile = "dd886d138f237630ab72659d26ede725526dc02edce98b0371265ad1854cac74";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers exceptions hashable
          scientific text time unordered-containers vector
@@ -22696,6 +22780,8 @@ self: {
        pname = "aeson-extra";
        version = "0.2.3.0";
        sha256 = "43ace09b9c03c5c55216b2062228bda94e5fd23333a0cc1eca0e5478546f9e77";
+       revision = "1";
+       editedCabalFile = "bb41b2e6c386698b33d2d8d67571542392afd8984821897a4fbf318f3bb2e844";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers exceptions hashable
          scientific template-haskell text time unordered-containers vector
@@ -22722,8 +22808,8 @@ self: {
        pname = "aeson-extra";
        version = "0.3.0.0";
        sha256 = "b9e54cf293c25bbd5646a777cf71a23c4158b708dd358fe3e705add326d5870f";
-       revision = "1";
-       editedCabalFile = "a6142a2f67fa6c7363339934a13aa920c1b20c5fcd9312932617470fba9b0328";
+       revision = "2";
+       editedCabalFile = "7b0de3823d241afec75697e2f8e387f85e0bd6f4bcb50937658bb3ba7d115558";
        libraryHaskellDepends = [
          aeson aeson-compat base base-compat bytestring containers
          exceptions hashable parsec scientific template-haskell text time
@@ -22738,6 +22824,35 @@ self: {
        homepage = "https://github.com/phadej/aeson-extra#readme";
        description = "Extra goodies for aeson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "aeson-extra_0_3_0_1" = callPackage
+    ({ mkDerivation, aeson, aeson-compat, base, base-compat, bytestring
+     , containers, exceptions, hashable, parsec, quickcheck-instances
+     , scientific, tasty, tasty-hunit, tasty-quickcheck
+     , template-haskell, text, time, time-parsers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "aeson-extra";
+       version = "0.3.0.1";
+       sha256 = "5b1b75c8f10a470975c0f6170d5b786f594acef295c5e23150e81e855b70e6a7";
+       libraryHaskellDepends = [
+         aeson aeson-compat base base-compat bytestring containers
+         exceptions hashable parsec scientific template-haskell text time
+         time-parsers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson aeson-compat base base-compat bytestring containers
+         exceptions hashable parsec quickcheck-instances scientific tasty
+         tasty-hunit tasty-quickcheck template-haskell text time
+         time-parsers unordered-containers vector
+       ];
+       homepage = "https://github.com/phadej/aeson-extra#readme";
+       description = "Extra goodies for aeson";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-filthy" = callPackage
@@ -23231,18 +23346,19 @@ self: {
      }) {};
 
   "agda-snippets" = callPackage
-    ({ mkDerivation, Agda, base, containers, mtl, network-uri, xhtml }:
+    ({ mkDerivation, Agda, base, containers, mtl, network-uri
+     , transformers, xhtml
+     }:
      mkDerivation {
        pname = "agda-snippets";
-       version = "2.4.2.4";
-       sha256 = "c1bba563fe1c2ecceaa21545565ad2678675682ed97518c2c2bebde8692963c0";
+       version = "2.4.2.5";
+       sha256 = "f1e42f920bb4c4f43836d9844f13ac3942b1048c032b05b043716cd47d11ed22";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          Agda base containers mtl network-uri xhtml
        ];
-       executableHaskellDepends = [ Agda base network-uri ];
-       jailbreak = true;
+       executableHaskellDepends = [ Agda base network-uri transformers ];
        homepage = "http://github.com/liamoc/agda-snippets#readme";
        description = "Render just the Agda snippets of a literate Agda file to HTML";
        license = stdenv.lib.licenses.bsd3;
@@ -23260,6 +23376,7 @@ self: {
          agda-snippets base directory filepath hakyll network-uri pandoc
          pandoc-types
        ];
+       jailbreak = true;
        homepage = "https://github.com/liamoc/agda-snippets#readme";
        description = "Literate Agda support using agda-snippets, for Hakyll pages";
        license = stdenv.lib.licenses.bsd3;
@@ -30569,7 +30686,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "async" = callPackage
+  "async_2_0_2" = callPackage
     ({ mkDerivation, base, HUnit, stm, test-framework
      , test-framework-hunit
      }:
@@ -30584,9 +30701,10 @@ self: {
        homepage = "https://github.com/simonmar/async";
        description = "Run IO operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "async_2_1_0" = callPackage
+  "async" = callPackage
     ({ mkDerivation, base, HUnit, stm, test-framework
      , test-framework-hunit
      }:
@@ -30601,7 +30719,6 @@ self: {
        homepage = "https://github.com/simonmar/async";
        description = "Run IO operations asynchronously and wait for their results";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "async-dejafu" = callPackage
@@ -30861,6 +30978,7 @@ self: {
        ];
        description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287).";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atom-msp430" = callPackage
@@ -33375,12 +33493,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base_4_8_1_0" = callPackage
+  "base_4_8_2_0" = callPackage
     ({ mkDerivation, ghc-prim, rts }:
      mkDerivation {
        pname = "base";
-       version = "4.8.1.0";
-       sha256 = "52c9afdc4fe1f59e67bfbe266edad57ee4294eae59bfd287fcd66e5808519e67";
+       version = "4.8.2.0";
+       sha256 = "f2bc9eb2773f74c231a25f32dc3b47b704cccc6b9064b6e1140dded364fafe8c";
        libraryHaskellDepends = [ ghc-prim rts ];
        description = "Basic libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -34255,6 +34373,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "beam" = callPackage
+    ({ mkDerivation, base, conduit, containers, convertible, HDBC
+     , HDBC-sqlite3, microlens, mtl, pretty, semigroups, tagged, text
+     , time, uniplate
+     }:
+     mkDerivation {
+       pname = "beam";
+       version = "0.3.2.0";
+       sha256 = "1a6facf70119515b46b05e336bff59254d8e69f38cfeca6a65625e130fb26b5a";
+       libraryHaskellDepends = [
+         base conduit containers convertible HDBC HDBC-sqlite3 microlens mtl
+         pretty semigroups tagged text time uniplate
+       ];
+       homepage = "http://travis.athougies.net/projects/beam.html";
+       description = "A type-safe SQL mapper for Haskell that doesn't use Template Haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "beamable" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, ghc-prim
      , integer-gmp, murmur-hash, QuickCheck, test-framework
@@ -34741,6 +34877,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "bifunctors_5_2_1" = callPackage
+    ({ mkDerivation, base, comonad, containers, hspec, QuickCheck
+     , semigroups, tagged, template-haskell, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "bifunctors";
+       version = "5.2.1";
+       sha256 = "cbb459178a8c72cbb695361b518ae17ed3664e3ad207a34276f4d2990107e9cb";
+       libraryHaskellDepends = [
+         base comonad containers semigroups tagged template-haskell
+         transformers transformers-compat
+       ];
+       testHaskellDepends = [
+         base hspec QuickCheck transformers transformers-compat
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/ekmett/bifunctors/";
+       description = "Bifunctors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "bighugethesaurus" = callPackage
     ({ mkDerivation, base, HTTP, split }:
      mkDerivation {
@@ -34971,15 +35130,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "binary_0_8_0_0" = callPackage
+  "binary_0_8_0_1" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , directory, filepath, HUnit, QuickCheck, random, test-framework
      , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "binary";
-       version = "0.8.0.0";
-       sha256 = "a446ed06e0b3011716b09d129f25c8bab9bda60a5783bab1e778e7ffa30c7d8f";
+       version = "0.8.0.1";
+       sha256 = "85c6befa618ea1e181ab5e6ac66c07b63746b3cfcde7e69158857d7ade8ed755";
        libraryHaskellDepends = [ array base bytestring containers ];
        testHaskellDepends = [
          array base bytestring Cabal containers directory filepath HUnit
@@ -35224,7 +35383,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "binary-orphans" = callPackage
+  "binary-orphans_0_1_3_0" = callPackage
     ({ mkDerivation, aeson, base, binary, hashable
      , quickcheck-instances, scientific, semigroups, tagged, tasty
      , tasty-quickcheck, text, text-binary, time, unordered-containers
@@ -35247,6 +35406,32 @@ self: {
        homepage = "https://github.com/phadej/binary-orphans#readme";
        description = "Orphan instances for binary";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "binary-orphans" = callPackage
+    ({ mkDerivation, aeson, base, binary, hashable
+     , quickcheck-instances, scientific, semigroups, tagged, tasty
+     , tasty-quickcheck, text, text-binary, time, unordered-containers
+     , vector, vector-binary-instances
+     }:
+     mkDerivation {
+       pname = "binary-orphans";
+       version = "0.1.4.0";
+       sha256 = "0a952a7521747a7aacf4aa1638674130262f2efacb7121727c1932d49017f742";
+       libraryHaskellDepends = [
+         aeson base binary hashable scientific semigroups tagged text
+         text-binary time unordered-containers vector
+         vector-binary-instances
+       ];
+       testHaskellDepends = [
+         aeson base binary hashable quickcheck-instances scientific
+         semigroups tagged tasty tasty-quickcheck text time
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/phadej/binary-orphans#readme";
+       description = "Orphan instances for binary";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "binary-parser" = callPackage
@@ -35324,8 +35509,10 @@ self: {
        testHaskellDepends = [
          base directory doctest filepath hspec QuickCheck
        ];
+       doCheck = false;
        description = "Binary and exponential searches";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-shared" = callPackage
@@ -36093,6 +36280,7 @@ self: {
        homepage = "http://bitbucket.org/astanin/hs-libzip/";
        description = "Low level bindings to libzip";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libzip;};
 
   "bindings-libzip_0_11" = callPackage
@@ -36544,6 +36732,7 @@ self: {
        homepage = "http://github.com/udo-stenzel/biohazard";
        description = "bioinformatics support library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bioinformatics-toolkit" = callPackage
@@ -37929,6 +38118,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "blaze-svg_0_3_6" = callPackage
+    ({ mkDerivation, base, blaze-markup, mtl }:
+     mkDerivation {
+       pname = "blaze-svg";
+       version = "0.3.6";
+       sha256 = "90dff37d78bffe5ee2587bab4281c158d5d1bd3901fe359bfdcc1cb6fb387179";
+       libraryHaskellDepends = [ base blaze-markup mtl ];
+       homepage = "https://github.com/deepakjois/blaze-svg";
+       description = "SVG combinator library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "blaze-textual_0_2_0_9" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, double-conversion
      , ghc-prim, integer-gmp, old-locale, QuickCheck, test-framework
@@ -38202,6 +38404,7 @@ self: {
        homepage = "https://github.com/bitemyapp/bloodhound";
        description = "ElasticSearch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bloomfilter" = callPackage
@@ -40116,6 +40319,8 @@ self: {
        pname = "bytestring-from";
        version = "0.3";
        sha256 = "c4def9c8f930ed9c1717fd4547016062c3f7065df341853245bb6212f3cd120c";
+       revision = "1";
+       editedCabalFile = "b6efc5572f7f26aa1bcc4d930391cb9f0144f6e3df107838ee0adc28d73caa3a";
        libraryHaskellDepends = [ attoparsec base bytestring text ];
        testHaskellDepends = [
          base bytestring QuickCheck tasty tasty-quickcheck
@@ -41296,6 +41501,8 @@ self: {
        pname = "cabal-install";
        version = "1.22.7.0";
        sha256 = "b30fd14f20fdd11b028cba68fefeed7eeadcacf919e7c29bc4d7289a656d19f3";
+       revision = "1";
+       editedCabalFile = "9abc9a039f3abe8f7b3be29c11974d2371393df4069285caf7c4385956c30032";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -41612,7 +41819,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cabal-rpm" = callPackage
+  "cabal-rpm_0_9_8" = callPackage
     ({ mkDerivation, base, Cabal, directory, filepath, process, time
      , unix
      }:
@@ -41628,6 +41835,25 @@ self: {
        homepage = "https://github.com/juhp/cabal-rpm";
        description = "RPM packaging tool for Haskell Cabal-based packages";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "cabal-rpm" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath, process, time
+     , unix
+     }:
+     mkDerivation {
+       pname = "cabal-rpm";
+       version = "0.9.9";
+       sha256 = "2f5c487be9395fc34eba40efa73ee95d6419a84a62dc3dd02f4155778a953a6f";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base Cabal directory filepath process time unix
+       ];
+       homepage = "https://github.com/juhp/cabal-rpm";
+       description = "RPM packaging tool for Haskell Cabal-based packages";
+       license = stdenv.lib.licenses.gpl3;
      }) {};
 
   "cabal-scripts" = callPackage
@@ -43514,15 +43740,15 @@ self: {
 
   "cassava-conduit" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, cassava
-     , conduit, conduit-extra, containers, mtl, QuickCheck
+     , conduit, conduit-extra, containers, mtl, QuickCheck, text
      }:
      mkDerivation {
        pname = "cassava-conduit";
-       version = "0.2.1";
-       sha256 = "3b75c027d9be6637b5ce550960995eedb4b9e3f7c8acdecdae36c350ba600c55";
+       version = "0.3.0";
+       sha256 = "ff78cceac3c0f2af3b12c7931d65def5fcd6cb1e9f3507044bdc3cc9c36572a6";
        libraryHaskellDepends = [
          array base bifunctors bytestring cassava conduit conduit-extra
-         containers mtl
+         containers mtl text
        ];
        testHaskellDepends = [ base QuickCheck ];
        homepage = "https://github.com/domdere/cassava-conduit";
@@ -44365,8 +44591,8 @@ self: {
      }:
      mkDerivation {
        pname = "cgrep";
-       version = "6.5.13";
-       sha256 = "03bc20b6879b379b1e22f1e09214d1519b7c7f5b82d7c79de3fd52200ba5550a";
+       version = "6.5.15";
+       sha256 = "7132cba60d2352fecbc392380cfead394300819974b3d6843fba3ad49dbf64b5";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -45483,6 +45709,7 @@ self: {
          HTTP json mtl network network-uri old-locale pandoc-types parsec
          syb time utf8-string
        ];
+       jailbreak = true;
        homepage = "http://istitutocolli.org/repos/citeproc-hs/";
        description = "A Citation Style Language implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -47984,7 +48211,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cmark" = callPackage
+  "cmark_0_4_1" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, text }:
      mkDerivation {
        pname = "cmark";
@@ -47995,20 +48222,20 @@ self: {
        homepage = "https://github.com/jgm/commonmark-hs";
        description = "Fast, accurate CommonMark (Markdown) parser and renderer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cmark_0_5_0" = callPackage
+  "cmark" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, text }:
      mkDerivation {
        pname = "cmark";
-       version = "0.5.0";
-       sha256 = "a95dd6c5135159d0d1b797eb99bbad757a298f4a8fb580865323bff37cba2cb8";
+       version = "0.5.1";
+       sha256 = "e13a2889a74d6c9dd27bbd506b89f4ee8841c98aac36dd22f30a68863efa5446";
        libraryHaskellDepends = [ base bytestring text ];
        testHaskellDepends = [ base HUnit text ];
        homepage = "https://github.com/jgm/commonmark-hs";
        description = "Fast, accurate CommonMark (Markdown) parser and renderer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cmath" = callPackage
@@ -49762,17 +49989,16 @@ self: {
      }) {};
 
   "conceit" = callPackage
-    ({ mkDerivation, base, bifunctors, exceptions, mtl, semigroupoids
-     , transformers, void
+    ({ mkDerivation, base, bifunctors, semigroupoids, semigroups, void
      }:
      mkDerivation {
        pname = "conceit";
-       version = "0.3.2.0";
-       sha256 = "2f3753f391c011eb71f39cf89c212e8c265612eaf43d51bd09bb58691b48f29a";
+       version = "0.4.0.0";
+       sha256 = "8972aafc4143cf2f6039d99747a9f1d191762636fd4453e7fc5bdb7c604a980b";
        libraryHaskellDepends = [
-         base bifunctors exceptions mtl semigroupoids transformers void
+         base bifunctors semigroupoids semigroups void
        ];
-       description = "Concurrent actions that may fail";
+       description = "Concurrent actions that may fail with a value";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -49992,6 +50218,7 @@ self: {
          async base HUnit random stm test-framework test-framework-hunit
          unbounded-delays
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/basvandijk/concurrent-extra";
        description = "Extra concurrency primitives";
@@ -51117,8 +51344,8 @@ self: {
      }:
      mkDerivation {
        pname = "configifier";
-       version = "0.0.8";
-       sha256 = "7f56ae97d2d614c26b634ccbd1951b0c958eca20b20401d210027e2f1627cd9b";
+       version = "0.1.0";
+       sha256 = "bda7c1ae24e838204f972f64816e6e7ec5552b3ea03a2e17eb5c9e9ea9ad030e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -51407,8 +51634,8 @@ self: {
      }:
      mkDerivation {
        pname = "console-program";
-       version = "0.4.0.3";
-       sha256 = "89faaa72131c56397b3603ac67d577b4cf7fc5607fc4369f3e0255b403d1fe88";
+       version = "0.4.1.0";
+       sha256 = "688cbecb6288c5e12c48c2bafaf27f470fe1b9d61c293b529581799cf95c7146";
        libraryHaskellDepends = [
          ansi-terminal ansi-wl-pprint base containers directory haskeline
          parsec parsec-extra split transformers unix utility-ht
@@ -51562,7 +51789,7 @@ self: {
        homepage = "http://andersk.mit.edu/haskell/constructible/";
        description = "Exact computation with constructible real numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constructive-algebra" = callPackage
@@ -53471,6 +53698,7 @@ self: {
          mtl mwc-random network semigroups stm text time tinylog
          transformers transformers-base uuid vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/twittner/cql-io/";
        description = "Cassandra CQL client";
        license = stdenv.lib.licenses.mpl20;
@@ -53710,8 +53938,8 @@ self: {
     ({ mkDerivation, base, data-binary-ieee754, ieee754 }:
      mkDerivation {
        pname = "crackNum";
-       version = "1.4";
-       sha256 = "5d66f4f51b8600cdc48a3d4b999322ec8efa0f26fd8a41b4bb125412e3dea009";
+       version = "1.5";
+       sha256 = "ef41fe4afa6866a578b17f84ee231ed70493696fdca9fe54341e124215c1e205";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base data-binary-ieee754 ieee754 ];
@@ -60599,12 +60827,11 @@ self: {
     ({ mkDerivation, base, cairo, diagrams-cairo, diagrams-lib, gtk }:
      mkDerivation {
        pname = "diagrams-gtk";
-       version = "1.3";
-       sha256 = "baa2cb35066e37e8bb5ad831aa222b3b5fd8388a62cfc42903ebcb611a20c34d";
+       version = "1.3.0.1";
+       sha256 = "a328abe54875119b3cc0aaee3b0f913868cc9d24bdf46ac2ab7876b89fd8a309";
        libraryHaskellDepends = [
          base cairo diagrams-cairo diagrams-lib gtk
        ];
-       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams/";
        description = "Backend for rendering diagrams directly to GTK windows";
        license = stdenv.lib.licenses.bsd3;
@@ -61029,6 +61256,7 @@ self: {
          base diagrams-builder diagrams-cairo diagrams-lib directory
          filepath linear optparse-applicative pandoc-types
        ];
+       jailbreak = true;
        description = "A pandoc filter to express diagrams inline using the haskell EDSL _diagrams_";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -62489,6 +62717,7 @@ self: {
        testHaskellDepends = [
          base base16-bytestring bytestring directory HUnit text
        ];
+       doCheck = false;
        homepage = "https://github.com/IreneKnapp/direct-sqlite";
        description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
        license = stdenv.lib.licenses.bsd3;
@@ -62986,6 +63215,7 @@ self: {
          network-transport network-transport-tcp rematch stm test-framework
          test-framework-hunit transformers
        ];
+       doCheck = false;
        homepage = "http://github.com/haskell-distributed/distributed-process-client-server";
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
@@ -63057,6 +63287,7 @@ self: {
          QuickCheck rematch stm test-framework test-framework-hunit
          test-framework-quickcheck2 time transformers unordered-containers
        ];
+       doCheck = false;
        homepage = "http://github.com/haskell-distributed/distributed-process-execution";
        description = "Execution Framework for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
@@ -63121,6 +63352,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 time
          transformers unordered-containers
        ];
+       doCheck = false;
        homepage = "http://github.com/haskell-distributed/distributed-process-extras";
        description = "Cloud Haskell Extras";
        license = stdenv.lib.licenses.bsd3;
@@ -63384,6 +63616,7 @@ self: {
          rematch stm test-framework test-framework-hunit time transformers
          unordered-containers
        ];
+       doCheck = false;
        homepage = "http://github.com/haskell-distributed/distributed-process-supervisor";
        description = "Supervisors for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
@@ -63457,6 +63690,7 @@ self: {
          QuickCheck rematch stm test-framework test-framework-hunit
          test-framework-quickcheck2 time transformers unordered-containers
        ];
+       doCheck = false;
        homepage = "http://github.com/haskell-distributed/distributed-process-task";
        description = "Task Framework for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
@@ -63471,8 +63705,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-tests";
-       version = "0.4.3.2";
-       sha256 = "ee44041cdfca0712f45b279534ee646eb4a51a70f91a26484dd234d1b0ef4251";
+       version = "0.4.3.3";
+       sha256 = "fecfbae4d57eb8329486f4e1bfa01c5cbdaff7fed99a0533348f903830609678";
        libraryHaskellDepends = [
          ansi-terminal base binary bytestring distributed-process
          distributed-static HUnit network network-transport random rematch
@@ -63481,7 +63715,6 @@ self: {
        testHaskellDepends = [
          base network network-transport network-transport-tcp test-framework
        ];
-       jailbreak = true;
        homepage = "http://github.com/haskell-distributed/distributed-process-tests";
        description = "Tests and test support tools for distributed-process";
        license = stdenv.lib.licenses.bsd3;
@@ -63769,8 +64002,8 @@ self: {
      }:
      mkDerivation {
        pname = "dixi";
-       version = "0.6.0.4";
-       sha256 = "d4e99071e0c2f5b7922dad5a85c02abbbeed27f71e72d091f8a3a00ae8f97418";
+       version = "0.6.0.5";
+       sha256 = "2702e771c2c2af3157c5fc6b6ae8001a46ece8b2e23a2c6cd96fdfcc2f9f22c5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -65763,6 +65996,8 @@ self: {
        pname = "eager-sockets";
        version = "0.1";
        sha256 = "abbd5f7565685d756de895600b3f977863e56abd2a6dbda9b90a710841e1e881";
+       revision = "1";
+       editedCabalFile = "2bf99bcdc9b979fbe9394e8b77bd1fa9b713da8e04981939cb0ae41b0b2a1963";
        libraryHaskellDepends = [ base bytestring network ];
        jailbreak = true;
        description = "Socket operations with timeouts";
@@ -67050,7 +67285,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "elm-bridge" = callPackage
+  "elm-bridge_0_1_0_0" = callPackage
     ({ mkDerivation, base, hspec, template-haskell }:
      mkDerivation {
        pname = "elm-bridge";
@@ -67063,9 +67298,10 @@ self: {
        homepage = "http://github.com/agrafix/elm-bridge";
        description = "Derive Elm types from Haskell types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "elm-bridge_0_2_1_0" = callPackage
+  "elm-bridge" = callPackage
     ({ mkDerivation, aeson, base, containers, hspec, QuickCheck
      , template-haskell, text
      }:
@@ -67080,7 +67316,6 @@ self: {
        homepage = "http://github.com/agrafix/elm-bridge";
        description = "Derive Elm types from Haskell types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-build-lib" = callPackage
@@ -67821,6 +68056,28 @@ self: {
          free monad-loops mwc-random stm stm-delay text transformers
          unordered-containers vector websockets
        ];
+       jailbreak = true;
+       homepage = "http://github.com/ocharles/engine.io";
+       description = "A Haskell implementation of Engine.IO";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "engine-io_1_2_11" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring
+     , bytestring, either, free, monad-loops, mwc-random, stm, stm-delay
+     , text, transformers, unordered-containers, vector, websockets
+     }:
+     mkDerivation {
+       pname = "engine-io";
+       version = "1.2.11";
+       sha256 = "bd57162b4b2233ef3fbe4ce6cba7d562476da59257b1baaa801847d9809e601d";
+       libraryHaskellDepends = [
+         aeson async attoparsec base base64-bytestring bytestring either
+         free monad-loops mwc-random stm stm-delay text transformers
+         unordered-containers vector websockets
+       ];
+       jailbreak = true;
        homepage = "http://github.com/ocharles/engine.io";
        description = "A Haskell implementation of Engine.IO";
        license = stdenv.lib.licenses.bsd3;
@@ -67834,8 +68091,8 @@ self: {
      }:
      mkDerivation {
        pname = "engine-io";
-       version = "1.2.11";
-       sha256 = "bd57162b4b2233ef3fbe4ce6cba7d562476da59257b1baaa801847d9809e601d";
+       version = "1.2.12";
+       sha256 = "06361c560976201923c0db9d010a19d059b902859d88eda18865ebedd55fcc4c";
        libraryHaskellDepends = [
          aeson async attoparsec base base64-bytestring bytestring either
          free monad-loops mwc-random stm stm-delay text transformers
@@ -68272,8 +68529,10 @@ self: {
        pname = "epoll";
        version = "0.2.2";
        sha256 = "d7725bc62beaaf7d54d67928847621447ee4cab69aa9f83481e1acb2a8e9e147";
+       revision = "1";
+       editedCabalFile = "215673c26bb5d38b7655b5b52d6c21d65d228c4ac231606525991a60add70ab8";
        libraryHaskellDepends = [ base unix ];
-       homepage = "http://github.com/twittner/epoll/";
+       homepage = "https://gitlab.com/twittner/epoll";
        description = "epoll bindings";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -68839,6 +69098,8 @@ self: {
        pname = "ersatz-toysat";
        version = "0.2.1.0";
        sha256 = "b83980c6f537ab812ac8605a9fe8c3bb9764bb5ae098e20ef882fd5aa824f7b6";
+       revision = "1";
+       editedCabalFile = "146f86cb3df790cd26c0ec2f7061027257c7932a64ff8a6725eee5356a887776";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -69469,15 +69730,15 @@ self: {
 
   "eventloop" = callPackage
     ({ mkDerivation, aeson, base, bytestring, concurrent-utilities
-     , network, stm, suspend, text, timers, websockets
+     , deepseq, network, stm, suspend, text, timers, websockets
      }:
      mkDerivation {
        pname = "eventloop";
-       version = "0.6.0.0";
-       sha256 = "2ec1e143de18418e3c031df78965b27710fd6195c19d348f959393d0ea054d6c";
+       version = "0.7.0.1";
+       sha256 = "4798d3a5ce6c2daf8f11b3f6aa8eed1ae411894da12a278dd7686b4b4c487b1e";
        libraryHaskellDepends = [
-         aeson base bytestring concurrent-utilities network stm suspend text
-         timers websockets
+         aeson base bytestring concurrent-utilities deepseq network stm
+         suspend text timers websockets
        ];
        jailbreak = true;
        homepage = "-";
@@ -70441,8 +70702,8 @@ self: {
      }:
      mkDerivation {
        pname = "extensible-effects";
-       version = "1.11.0.0";
-       sha256 = "e9d240fb2401da90539d48cce0eb29925290845dc591ab2e1d1609ec9fe9c891";
+       version = "1.11.0.3";
+       sha256 = "ae44bc66608f000a9da20d8ae53c1e2a0ed4c46fa7b9bab2f5d44c0da1c1ebb3";
        libraryHaskellDepends = [
          base transformers transformers-base type-aligned void
        ];
@@ -70450,7 +70711,6 @@ self: {
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 test-framework-th void
        ];
-       jailbreak = true;
        homepage = "https://github.com/suhailshergill/extensible-effects";
        description = "An Alternative to Monad Transformers";
        license = stdenv.lib.licenses.mit;
@@ -71382,6 +71642,8 @@ self: {
        pname = "fay";
        version = "0.23.1.12";
        sha256 = "3d9c0a64f6d30923e2e45f27c043a7fa4f451c676466c8ca5b69a4121462f727";
+       revision = "1";
+       editedCabalFile = "4a5a1a7b9f3854292ddbc73ba9d6cdaf5ffbce062bdc015f3d4765b41ea6df1d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -72366,6 +72628,7 @@ self: {
        homepage = "http://rel4tion.org/projects/feed-collect/";
        description = "Watch RSS/Atom feeds (and do with them whatever you like)";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feed-crawl" = callPackage
@@ -74808,6 +75071,8 @@ self: {
        pname = "foldl";
        version = "1.0.8";
        sha256 = "77ff4cfbbbc53d628966a481214bce72548a09a9ea8f1c9ac85c727a820d0fed";
+       revision = "1";
+       editedCabalFile = "b624e24b4204e67106912efde9ce4d6219814f9bd88885b6e05a606c34e601c2";
        libraryHaskellDepends = [
          base bytestring containers primitive text transformers vector
        ];
@@ -74825,6 +75090,8 @@ self: {
        pname = "foldl";
        version = "1.0.9";
        sha256 = "66e4d4b3ddce7f10c4147271b375e49aa44946adc5ebe2ee03ca1a6520c9c983";
+       revision = "1";
+       editedCabalFile = "affa997426895b4ad248bbfdae6aa01d043bca1109f71508d491cec16f571bcb";
        libraryHaskellDepends = [
          base bytestring containers primitive text transformers vector
        ];
@@ -74842,6 +75109,8 @@ self: {
        pname = "foldl";
        version = "1.0.10";
        sha256 = "38591b038f94921d5c581c2409336fad66f97a5157d29aa648176b888e5df011";
+       revision = "1";
+       editedCabalFile = "4b17e66a5637a39627fa46cd3898f4225b188bd685491ac8f2a1e3d8510aca41";
        libraryHaskellDepends = [
          base bytestring containers mwc-random primitive text transformers
          vector
@@ -74860,6 +75129,8 @@ self: {
        pname = "foldl";
        version = "1.0.11";
        sha256 = "b9e731d12fad4a515c70202cb9e57d0da7a0c4dd4d1bfee3746a23b764dfea33";
+       revision = "1";
+       editedCabalFile = "527e91eb4be5fbe35ce0feedb8674cac9d71ae5981723a3515c8a4bff5586132";
        libraryHaskellDepends = [
          base bytestring containers mwc-random primitive profunctors text
          transformers vector
@@ -74878,6 +75149,8 @@ self: {
        pname = "foldl";
        version = "1.1.1";
        sha256 = "ef49feba75c927ab2a6b9afcdbe7730463ed379f1681ae12c15a1608c7a2f807";
+       revision = "1";
+       editedCabalFile = "641c802c7ad2ba09a68c6c39f7ba5ae2b8cabaa42b32ed8fa1d531981d28344c";
        libraryHaskellDepends = [
          base bytestring containers mwc-random primitive profunctors text
          transformers vector
@@ -74896,6 +75169,8 @@ self: {
        pname = "foldl";
        version = "1.1.2";
        sha256 = "723b62642b0dd95f0fb8e87102552c76755ad18f300c3429b43fa7b56213c17f";
+       revision = "1";
+       editedCabalFile = "56f70861e4a386e6677b096c8e6770714ffbef0458347dd2871b533855748522";
        libraryHaskellDepends = [
          base bytestring comonad containers mwc-random primitive profunctors
          text transformers vector
@@ -74914,6 +75189,8 @@ self: {
        pname = "foldl";
        version = "1.1.3";
        sha256 = "af81eb42e6530f6f0ba992965c337d89483d755b50c7c94b12325dd793435474";
+       revision = "1";
+       editedCabalFile = "e41df2422bd8adfd40d113d49bbb7cc00e7aa466ee145e11793af4bab944484f";
        libraryHaskellDepends = [
          base bytestring comonad containers mwc-random primitive profunctors
          text transformers vector
@@ -74924,22 +75201,6 @@ self: {
      }) {};
 
   "foldl" = callPackage
-    ({ mkDerivation, base, bytestring, comonad, containers, mwc-random
-     , primitive, profunctors, text, transformers, vector
-     }:
-     mkDerivation {
-       pname = "foldl";
-       version = "1.1.4";
-       sha256 = "6d6473970896924a7de1c4dd5777b9b094c28ac1a33f6c8b774c0bb82d936943";
-       libraryHaskellDepends = [
-         base bytestring comonad containers mwc-random primitive profunctors
-         text transformers vector
-       ];
-       description = "Composable, streaming, and efficient left folds";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "foldl_1_1_5" = callPackage
     ({ mkDerivation, base, bytestring, comonad, containers, mwc-random
      , primitive, profunctors, text, transformers, vector
      }:
@@ -74953,7 +75214,6 @@ self: {
        ];
        description = "Composable, streaming, and efficient left folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foldl-incremental" = callPackage
@@ -76769,6 +77029,7 @@ self: {
        homepage = "http://www.github.com/ehamberg/fswatcher/";
        description = "Watch a file/directory and run a command when it's modified";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ftdi" = callPackage
@@ -77295,6 +77556,7 @@ self: {
        homepage = "http://github.com/joom/fuzzy";
        description = "Filters a list based on a fuzzy string search";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fuzzy-timings" = callPackage
@@ -78091,6 +78353,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "generic-deriving_1_10_0" = callPackage
+    ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
+     mkDerivation {
+       pname = "generic-deriving";
+       version = "1.10.0";
+       sha256 = "8378c23213efdba77c3ebbe95e679f64a1e57c511475e69d9b31dda8420d7ae4";
+       libraryHaskellDepends = [
+         base containers ghc-prim template-haskell
+       ];
+       homepage = "https://github.com/dreixel/generic-deriving";
+       description = "Generic programming library for generalised deriving";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "generic-lucid-scaffold" = callPackage
     ({ mkDerivation, base, lucid, text }:
      mkDerivation {
@@ -78281,41 +78558,22 @@ self: {
 
   "generics-eot" = callPackage
     ({ mkDerivation, base, directory, doctest, filepath, hspec
-     , interpolate, mockery, QuickCheck, shake
+     , interpolate, markdown-unlit, mockery, QuickCheck, shake
      }:
      mkDerivation {
        pname = "generics-eot";
-       version = "0.1";
-       sha256 = "f293d60d5c2a4aa3065f23e022fd74cf27d8f255e6e9cd44d75d7a44f3f2ab1a";
-       libraryHaskellDepends = [ base ];
+       version = "0.2.1";
+       sha256 = "14281d07d0197d9b4b16a9db164e7158b0260b9c823421fa9adbce5fb44c3682";
+       libraryHaskellDepends = [ base markdown-unlit ];
        testHaskellDepends = [
-         base directory doctest filepath hspec interpolate mockery
-         QuickCheck shake
+         base directory doctest filepath hspec interpolate markdown-unlit
+         mockery QuickCheck shake
        ];
        homepage = "https://github.com/soenkehahn/generics-eot#readme";
        description = "A library for generic programming that aims to be easy to understand";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "generics-eot_0_2" = callPackage
-    ({ mkDerivation, base, directory, doctest, filepath, hspec
-     , interpolate, mockery, QuickCheck, shake
-     }:
-     mkDerivation {
-       pname = "generics-eot";
-       version = "0.2";
-       sha256 = "732db9692db812b178a7d0bf4b89321c4630722bfe719966023cc9d7fc00820f";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [
-         base directory doctest filepath hspec interpolate mockery
-         QuickCheck shake
-       ];
-       homepage = "https://github.com/soenkehahn/generics-eot#readme";
-       description = "A library for generic programming that aims to be easy to understand";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "generics-sop_0_1_0_3" = callPackage
     ({ mkDerivation, base, ghc-prim, template-haskell }:
      mkDerivation {
@@ -79127,29 +79385,29 @@ self: {
 
   "ghc-imported-from" = callPackage
     ({ mkDerivation, base, Cabal, containers, directory, filepath, ghc
-     , ghc-mod, ghc-paths, ghc-syb-utils, hspec, mtl
+     , ghc-mod, ghc-paths, ghc-syb-utils, hspec, monad-journal, mtl
      , optparse-applicative, parsec, process, safe, syb, transformers
      }:
      mkDerivation {
        pname = "ghc-imported-from";
-       version = "0.2.1.0";
-       sha256 = "2c0af9dbfd887e0f32abd2ffa99acf5ce1344da18402e337eb4a39b59488982c";
+       version = "0.2.1.1";
+       sha256 = "6ef8612bbcc230323fa844310b504a4174706b99ca769bdcb79168f8f69bc74f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base Cabal containers directory filepath ghc ghc-mod ghc-paths
-         ghc-syb-utils mtl optparse-applicative parsec process safe syb
-         transformers
+         ghc-syb-utils monad-journal mtl optparse-applicative parsec process
+         safe syb transformers
        ];
        executableHaskellDepends = [
          base Cabal containers directory filepath ghc ghc-mod ghc-paths
-         ghc-syb-utils hspec mtl optparse-applicative parsec process safe
-         syb transformers
+         ghc-syb-utils hspec monad-journal mtl optparse-applicative parsec
+         process safe syb transformers
        ];
        testHaskellDepends = [
          base Cabal containers directory filepath ghc ghc-mod ghc-paths
-         ghc-syb-utils hspec mtl optparse-applicative parsec process safe
-         syb transformers
+         ghc-syb-utils hspec monad-journal mtl optparse-applicative parsec
+         process safe syb transformers
        ];
        homepage = "https://github.com/carlohamalainen/ghc-imported-from";
        description = "Find the Haddock documentation for a symbol";
@@ -80802,6 +81060,72 @@ self: {
          inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
          inherit (pkgs) which;};
 
+  "git-annex_6_20160126" = callPackage
+    ({ mkDerivation, aeson, async, aws, base, blaze-builder
+     , bloomfilter, bup, byteable, bytestring, case-insensitive
+     , clientsession, concurrent-output, conduit, conduit-extra
+     , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus
+     , directory, dlist, dns, edit-distance, esqueleto, exceptions
+     , fdo-notify, feed, filepath, git, gnupg, gnutls, hinotify
+     , hslogger, http-client, http-conduit, http-types, IfElse, json
+     , lsof, MissingH, monad-control, monad-logger, mtl, network
+     , network-info, network-multicast, network-protocol-xmpp
+     , network-uri, old-locale, openssh, optparse-applicative
+     , path-pieces, perl, persistent, persistent-sqlite
+     , persistent-template, process, QuickCheck, random, regex-tdfa
+     , resourcet, rsync, SafeSemaphore, sandi, securemem, shakespeare
+     , stm, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun
+     , template-haskell, text, time, torrent, transformers, unix
+     , unix-compat, utf8-string, uuid, wai, wai-extra, warp, warp-tls
+     , wget, which, xml-types, yesod, yesod-core, yesod-default
+     , yesod-form, yesod-static
+     }:
+     mkDerivation {
+       pname = "git-annex";
+       version = "6.20160126";
+       sha256 = "dc59f670a3d0bdb90db8fc6cadba8003708219bb0dc3d56867a9246d825c0d11";
+       configureFlags = [
+         "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
+         "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
+         "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-fwebapp"
+         "-fwebapp-secure" "-fwebdav" "-fxmpp"
+       ];
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson async aws base blaze-builder bloomfilter byteable bytestring
+         case-insensitive clientsession concurrent-output conduit
+         conduit-extra containers crypto-api cryptonite data-default DAV
+         dbus directory dlist dns edit-distance esqueleto exceptions
+         fdo-notify feed filepath gnutls hinotify hslogger http-client
+         http-conduit http-types IfElse json MissingH monad-control
+         monad-logger mtl network network-info network-multicast
+         network-protocol-xmpp network-uri old-locale optparse-applicative
+         path-pieces persistent persistent-sqlite persistent-template
+         process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi
+         securemem shakespeare stm tasty tasty-hunit tasty-quickcheck
+         tasty-rerun template-haskell text time torrent transformers unix
+         unix-compat utf8-string uuid wai wai-extra warp warp-tls xml-types
+         yesod yesod-core yesod-default yesod-form yesod-static
+       ];
+       executableSystemDepends = [
+         bup curl git gnupg lsof openssh perl rsync wget which
+       ];
+       preConfigure = "export HOME=$TEMPDIR; patchShebangs .";
+       postBuild = "ln -sf dist/build/git-annex/git-annex git-annex";
+       installPhase = "make PREFIX=$out CABAL=./Setup BUILDER=./Setup install";
+       checkPhase = "./git-annex test";
+       enableSharedExecutables = false;
+       homepage = "http://git-annex.branchable.com/";
+       description = "manage files with git, without checking their contents into git";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
+     }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
+         inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
+         inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
+         inherit (pkgs) which;};
+
   "git-checklist" = callPackage
     ({ mkDerivation, base, directory, filepath, optparse-applicative
      , parsec, pretty, process
@@ -81057,8 +81381,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitHUD";
-       version = "1.3.0";
-       sha256 = "b186502251e38f439a907eb54284ebb453b63003d91ec83c0c3b455f0da48568";
+       version = "1.3.1";
+       sha256 = "d770a57be1e746ed39e1c34ae6464ac4fd66599503a8b4e92f1b8a69cf986ccb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base mtl parsec process unix ];
@@ -81112,30 +81436,32 @@ self: {
      }) {};
 
   "github" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
-     , byteable, bytestring, case-insensitive, conduit, containers
-     , cryptohash, data-default, failure, hashable, hspec, HTTP
-     , http-conduit, http-types, network, old-locale, text, time
-     , unordered-containers, vector
+    ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat
+     , base16-bytestring, binary, binary-orphans, byteable, bytestring
+     , containers, cryptohash, deepseq, deepseq-generics, exceptions
+     , file-embed, hashable, hspec, http-client, http-client-tls
+     , http-link-header, http-types, iso8601-time, mtl, network-uri
+     , semigroups, text, time, transformers, transformers-compat
+     , unordered-containers, vector, vector-instances
      }:
      mkDerivation {
        pname = "github";
-       version = "0.13.2";
-       sha256 = "ffa08979a92ad3065982ede7e461939540ebe1a856baa15052b1ab3f219707c4";
+       version = "0.14.0";
+       sha256 = "33309bc81e33238b0cff333098a754aca625458f69c88778d76e62e2287e3685";
        libraryHaskellDepends = [
-         aeson attoparsec base base16-bytestring byteable bytestring
-         case-insensitive conduit containers cryptohash data-default failure
-         hashable HTTP http-conduit http-types network old-locale text time
-         unordered-containers vector
+         aeson aeson-compat attoparsec base base-compat base16-bytestring
+         binary binary-orphans byteable bytestring containers cryptohash
+         deepseq deepseq-generics exceptions hashable http-client
+         http-client-tls http-link-header http-types iso8601-time mtl
+         network-uri semigroups text time transformers transformers-compat
+         unordered-containers vector vector-instances
        ];
        testHaskellDepends = [
-         aeson attoparsec base base16-bytestring byteable bytestring
-         case-insensitive conduit containers cryptohash data-default failure
-         hashable hspec HTTP http-conduit http-types network old-locale text
-         time unordered-containers vector
+         aeson-compat base base-compat file-embed hspec unordered-containers
+         vector
        ];
-       homepage = "https://github.com/jwiegley/github";
-       description = "Access to the Github API, v3";
+       homepage = "https://github.com/phadej/github";
+       description = "Access to the GitHub API, v3";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -84204,6 +84530,144 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "gore-and-ash" = callPackage
+    ({ mkDerivation, base, containers, deepseq, exceptions, hashable
+     , linear, mtl, parallel, profunctors, random, semigroups, time
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "gore-and-ash";
+       version = "1.1.0.1";
+       sha256 = "3fc41721e92097558f4247a5b195bac9d9d9bd9313b2d92f402d3535aa90d149";
+       libraryHaskellDepends = [
+         base containers deepseq exceptions hashable linear mtl parallel
+         profunctors random semigroups time transformers
+         unordered-containers
+       ];
+       homepage = "https://github.com/Teaspot-Studio/gore-and-ash";
+       description = "Core of FRP game engine called Gore&Ash";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "gore-and-ash-actor" = callPackage
+    ({ mkDerivation, base, containers, deepseq, exceptions
+     , gore-and-ash, hashable, mtl, unordered-containers
+     }:
+     mkDerivation {
+       pname = "gore-and-ash-actor";
+       version = "1.1.0.0";
+       sha256 = "d7d5d9799295f5811f01be4441da968e80ad1da3e00735726235fac8581729aa";
+       libraryHaskellDepends = [
+         base containers deepseq exceptions gore-and-ash hashable mtl
+         unordered-containers
+       ];
+       homepage = "https://github.com/Teaspot-Studio/gore-and-ash-actor";
+       description = "Gore&Ash engine extension that implements actor style of programming";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "gore-and-ash-demo" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, containers, deepseq
+     , exception-transformers, exceptions, GLFW-b, gore-and-ash
+     , gore-and-ash-actor, gore-and-ash-logging, gore-and-ash-network
+     , gore-and-ash-sdl, gore-and-ash-sync, hashable, lens, linear
+     , network, OpenGL, sdl2, text, text-show, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "gore-and-ash-demo";
+       version = "1.0.0.0";
+       sha256 = "a9199fc3ad293bff3269494b1a7b96a8f175dd8defd03797ee0b7746f97a595a";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring cereal containers deepseq exception-transformers
+         exceptions GLFW-b gore-and-ash gore-and-ash-actor
+         gore-and-ash-logging gore-and-ash-network gore-and-ash-sdl
+         gore-and-ash-sync hashable lens linear network OpenGL sdl2 text
+         text-show time transformers unordered-containers vector
+       ];
+       homepage = "https://github.com/Teaspot-Studio/gore-and-ash-demo";
+       description = "Demonstration game for Gore&Ash game engine";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "gore-and-ash-logging" = callPackage
+    ({ mkDerivation, base, containers, deepseq, exceptions
+     , gore-and-ash, mtl, text, text-show, transformers
+     }:
+     mkDerivation {
+       pname = "gore-and-ash-logging";
+       version = "1.1.0.0";
+       sha256 = "b23ca7f32dc44894519cf62c1107876da448db703c1254e573f394c31bc7d678";
+       libraryHaskellDepends = [
+         base containers deepseq exceptions gore-and-ash mtl text text-show
+         transformers
+       ];
+       homepage = "https://github.com/Teaspot-Studio/gore-and-ash-logging";
+       description = "Core module for gore-and-ash with logging utilities";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "gore-and-ash-network" = callPackage
+    ({ mkDerivation, base, bytestring, containers, deepseq, exceptions
+     , extra, ghc-prim, gmp, gore-and-ash, gore-and-ash-logging
+     , hashable, integer-gmp, mtl, network, text, text-show
+     , typesafe-endian, unordered-containers
+     }:
+     mkDerivation {
+       pname = "gore-and-ash-network";
+       version = "1.1.0.1";
+       sha256 = "ef61dd238dde6ba45fb437db60c3d93d5626351d27dbe299d712b9f241e80d69";
+       libraryHaskellDepends = [
+         base bytestring containers deepseq exceptions extra ghc-prim
+         gore-and-ash gore-and-ash-logging hashable integer-gmp mtl network
+         text text-show typesafe-endian unordered-containers
+       ];
+       librarySystemDepends = [ gmp ];
+       homepage = "https://github.com/Teaspot-Studio/gore-and-ash-network";
+       description = "Core module for Gore&Ash engine with low level network API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {inherit (pkgs) gmp;};
+
+  "gore-and-ash-sdl" = callPackage
+    ({ mkDerivation, base, containers, deepseq, exceptions
+     , gore-and-ash, lens, linear, mtl, sdl2, text, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "gore-and-ash-sdl";
+       version = "1.1.0.1";
+       sha256 = "44ab31fc793e2ca7416b920f94c54a08dcf9304e1cc84779c123b3a773674940";
+       libraryHaskellDepends = [
+         base containers deepseq exceptions gore-and-ash lens linear mtl
+         sdl2 text transformers unordered-containers
+       ];
+       homepage = "git@github.com:Teaspot-Studio/gore-and-ash-sdl.git";
+       description = "Gore&Ash core module for integration with SDL library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "gore-and-ash-sync" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, containers, deepseq
+     , exceptions, gore-and-ash, gore-and-ash-actor
+     , gore-and-ash-logging, gore-and-ash-network, hashable, mtl, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "gore-and-ash-sync";
+       version = "1.1.0.0";
+       sha256 = "41aea8a5d021c55c130364f0726be9e4fda7a99c5e777c8b2cdca33c1b901ea2";
+       libraryHaskellDepends = [
+         base bytestring cereal containers deepseq exceptions gore-and-ash
+         gore-and-ash-actor gore-and-ash-logging gore-and-ash-network
+         hashable mtl text unordered-containers
+       ];
+       homepage = "https://github.com/Teaspot-Studio/gore-and-ash-sync";
+       description = "Gore&Ash module for high level network synchronization";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gpah" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cmdargs, containers, csv
      , deepseq, directory, filepath, haskell-src-exts, hint, HTTP
@@ -87049,8 +87513,8 @@ self: {
      }:
      mkDerivation {
        pname = "hOpenPGP";
-       version = "2.4";
-       sha256 = "7c5ce3a314ac0172bc03e6ddca41a8508ab22e1c89ff1458642d56a942974386";
+       version = "2.4.1";
+       sha256 = "c4a8b3a42381372cb856e2aaf558af7dfefc905ccfc6ea2b06ded2688c2c5dce";
        libraryHaskellDepends = [
          aeson attoparsec base base64-bytestring bifunctors binary
          binary-conduit byteable bytestring bzlib conduit conduit-extra
@@ -87538,11 +88002,13 @@ self: {
        pname = "hack-handler-epoll";
        version = "0.1.3";
        sha256 = "02dd1477efcc58da6f790cccb4b0e928d209c13b19723a8a1f89a19ed0e18c60";
+       revision = "1";
+       editedCabalFile = "e237061a017229aaa9f0afcfed7c3d331b95a992ed71124a0a3131e96887f139";
        libraryHaskellDepends = [
          base containers data-default epoll failure hack HTTP network unix
          utf8-string
        ];
-       homepage = "http://github.com/twittner/hack-handler-epoll/";
+       homepage = "https://gitlab.com/twittner/hack-handler-epoll";
        description = "hack handler implementation using epoll";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -88059,6 +88525,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring hackage-security HTTP mtl network network-uri zlib
        ];
+       jailbreak = true;
        homepage = "https://github.com/well-typed/hackage-security";
        description = "Hackage security bindings against the HTTP library";
        license = stdenv.lib.licenses.bsd3;
@@ -89089,11 +89556,12 @@ self: {
   "hakyll_4_7_3_1" = callPackage
     ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
      , cmdargs, containers, cryptohash, data-default, deepseq, directory
-     , filepath, fsnotify, HUnit, lrucache, mtl, network, network-uri
-     , pandoc, pandoc-citeproc, parsec, process, QuickCheck, random
-     , regex-base, regex-tdfa, snap-core, snap-server, system-filepath
-     , tagsoup, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, time, time-locale-compat
+     , filepath, fsnotify, http-conduit, http-types, HUnit, lrucache
+     , mtl, network, network-uri, pandoc, pandoc-citeproc, parsec
+     , process, QuickCheck, random, regex-base, regex-tdfa, snap-core
+     , snap-server, system-filepath, tagsoup, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, time
+     , time-locale-compat
      }:
      mkDerivation {
        pname = "hakyll";
@@ -89104,20 +89572,22 @@ self: {
        libraryHaskellDepends = [
          base binary blaze-html blaze-markup bytestring cmdargs containers
          cryptohash data-default deepseq directory filepath fsnotify
-         lrucache mtl network network-uri pandoc pandoc-citeproc parsec
-         process random regex-base regex-tdfa snap-core snap-server
-         system-filepath tagsoup text time time-locale-compat
+         http-conduit http-types lrucache mtl network network-uri pandoc
+         pandoc-citeproc parsec process random regex-base regex-tdfa
+         snap-core snap-server system-filepath tagsoup text time
+         time-locale-compat
        ];
        executableHaskellDepends = [ base directory filepath ];
        testHaskellDepends = [
          base binary blaze-html blaze-markup bytestring cmdargs containers
-         cryptohash data-default deepseq directory filepath fsnotify HUnit
-         lrucache mtl network network-uri pandoc pandoc-citeproc parsec
-         process QuickCheck random regex-base regex-tdfa snap-core
-         snap-server system-filepath tagsoup test-framework
-         test-framework-hunit test-framework-quickcheck2 text time
-         time-locale-compat
+         cryptohash data-default deepseq directory filepath fsnotify
+         http-conduit http-types HUnit lrucache mtl network network-uri
+         pandoc pandoc-citeproc parsec process QuickCheck random regex-base
+         regex-tdfa snap-core snap-server system-filepath tagsoup
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+         time time-locale-compat
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
@@ -89128,11 +89598,12 @@ self: {
   "hakyll_4_7_4_0" = callPackage
     ({ mkDerivation, base, binary, blaze-html, blaze-markup, bytestring
      , cmdargs, containers, cryptohash, data-default, deepseq, directory
-     , filepath, fsnotify, HUnit, lrucache, mtl, network, network-uri
-     , pandoc, pandoc-citeproc, parsec, process, QuickCheck, random
-     , regex-base, regex-tdfa, snap-core, snap-server, system-filepath
-     , tagsoup, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, text, time, time-locale-compat
+     , filepath, fsnotify, http-conduit, http-types, HUnit, lrucache
+     , mtl, network, network-uri, pandoc, pandoc-citeproc, parsec
+     , process, QuickCheck, random, regex-base, regex-tdfa, snap-core
+     , snap-server, system-filepath, tagsoup, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, time
+     , time-locale-compat
      }:
      mkDerivation {
        pname = "hakyll";
@@ -89143,20 +89614,22 @@ self: {
        libraryHaskellDepends = [
          base binary blaze-html blaze-markup bytestring cmdargs containers
          cryptohash data-default deepseq directory filepath fsnotify
-         lrucache mtl network network-uri pandoc pandoc-citeproc parsec
-         process random regex-base regex-tdfa snap-core snap-server
-         system-filepath tagsoup text time time-locale-compat
+         http-conduit http-types lrucache mtl network network-uri pandoc
+         pandoc-citeproc parsec process random regex-base regex-tdfa
+         snap-core snap-server system-filepath tagsoup text time
+         time-locale-compat
        ];
        executableHaskellDepends = [ base directory filepath ];
        testHaskellDepends = [
          base binary blaze-html blaze-markup bytestring cmdargs containers
-         cryptohash data-default deepseq directory filepath fsnotify HUnit
-         lrucache mtl network network-uri pandoc pandoc-citeproc parsec
-         process QuickCheck random regex-base regex-tdfa snap-core
-         snap-server system-filepath tagsoup test-framework
-         test-framework-hunit test-framework-quickcheck2 text time
-         time-locale-compat
+         cryptohash data-default deepseq directory filepath fsnotify
+         http-conduit http-types HUnit lrucache mtl network network-uri
+         pandoc pandoc-citeproc parsec process QuickCheck random regex-base
+         regex-tdfa snap-core snap-server system-filepath tagsoup
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+         time time-locale-compat
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
@@ -89198,6 +89671,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2 text
          time time-locale-compat
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "http://jaspervdj.be/hakyll";
        description = "A static website compiler library";
@@ -90861,6 +91335,7 @@ self: {
        homepage = "https://github.com/markus-git/hardware-edsl";
        description = "Deep embedding of hardware descriptions with code generation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hark" = callPackage
@@ -94351,8 +94826,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql";
-       version = "0.19.3.1";
-       sha256 = "b31e66b2baecbc238e24e0914897bfbb6261124da17efe18e821eb52ec18d6e3";
+       version = "0.19.3.3";
+       sha256 = "cfface6cef70a7841c233d445610f1bb175de55ea63c25dee7de2942417cd87e";
        libraryHaskellDepends = [
          aeson attoparsec base base-prelude bytestring contravariant
          contravariant-extras data-default-class dlist either hashable
@@ -94372,38 +94847,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hasql_0_19_3_2" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
-     , contravariant, contravariant-extras, data-default-class, dlist
-     , either, hashable, hashtables, loch-th, mtl, placeholders
-     , postgresql-binary, postgresql-libpq, profunctors, QuickCheck
-     , quickcheck-instances, scientific, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, text, time, transformers
-     , uuid, vector
-     }:
-     mkDerivation {
-       pname = "hasql";
-       version = "0.19.3.2";
-       sha256 = "eabeb40cea7f430add6ed3b25bf3b079427b76e5f5f2a039c5709026ef253949";
-       libraryHaskellDepends = [
-         aeson attoparsec base base-prelude bytestring contravariant
-         contravariant-extras data-default-class dlist either hashable
-         hashtables loch-th mtl placeholders postgresql-binary
-         postgresql-libpq profunctors scientific text time transformers uuid
-         vector
-       ];
-       testHaskellDepends = [
-         base base-prelude bytestring contravariant contravariant-extras
-         data-default-class dlist either hashable profunctors QuickCheck
-         quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
-         tasty-smallcheck text time transformers uuid vector
-       ];
-       homepage = "https://github.com/nikita-volkov/hasql";
-       description = "A very efficient PostgreSQL driver and a flexible mapping API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "hasql-backend_0_2_1" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, list-t, text
      , vector
@@ -97283,8 +97726,8 @@ self: {
     ({ mkDerivation, base, doctest, time }:
      mkDerivation {
        pname = "herf-time";
-       version = "0.2.0";
-       sha256 = "7c1c4762af5bbd493841f291855e7de5ab4b12a5260e8fd95d1f6c9e5a012d7a";
+       version = "0.2.2";
+       sha256 = "9554f70b4399e11d8ea1a49c03ec80d27e471e1a94bbb1542ea5b85aa821d68e";
        libraryHaskellDepends = [ base time ];
        testHaskellDepends = [ base doctest ];
        description = "haskell time manipulation in a 'kerf like' style";
@@ -97337,14 +97780,14 @@ self: {
     ({ mkDerivation, base, random, text }:
      mkDerivation {
        pname = "hero-club-five-tenets";
-       version = "0.3.0.1";
-       sha256 = "4d89022b55d139afd274318238706ef4c12fbcd22f3191af9008da4b78eb11c6";
+       version = "0.3.0.3";
+       sha256 = "b706afb5213aa5be028e27193e2df10e8f5de7ad1952f41bb16796949fbada3b";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base random text ];
        executableHaskellDepends = [ base random text ];
-       homepage = "http://github.com/i-amd3/hero-club-five-tenets";
-       description = "Remember the five tenets of hero club";
+       homepage = "https://github.com/i-amd3/hero-club-five-tenets";
+       description = "Think back of the five tenets of hero club";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -98250,6 +98693,7 @@ self: {
          HUnit optparse-applicative parsec process silently split template
          temporary text time
        ];
+       jailbreak = true;
        homepage = "https://github.com/fujimura/hi";
        description = "Generate scaffold for cabal project";
        license = stdenv.lib.licenses.bsd3;
@@ -102968,7 +103412,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hopenpgp-tools" = callPackage
+  "hopenpgp-tools_0_16_3" = callPackage
     ({ mkDerivation, aeson, alex, ansi-wl-pprint, array, attoparsec
      , base, base16-bytestring, binary, binary-conduit, bytestring
      , conduit, conduit-extra, containers, crypto-pubkey, cryptohash
@@ -102998,6 +103442,37 @@ 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, 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.17";
+       sha256 = "051b0609099646057981eda5dc4cc8073fa9cf070ef814ca50b5a39fd09d2fe6";
+       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
+         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 {
@@ -105501,6 +105976,22 @@ self: {
        license = "GPL";
      }) {};
 
+  "hscolour_1_24" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "hscolour";
+       version = "1.24";
+       sha256 = "54bc45137ba06bd876cf98424f974e325e9b236bd5c18d1c5b2ea0351b1d9332";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers ];
+       executableHaskellDepends = [ base containers ];
+       homepage = "http://code.haskell.org/~malcolm/hscolour/";
+       description = "Colourise Haskell code";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hscope" = callPackage
     ({ mkDerivation, base, bytestring, cereal, cpphs, deepseq
      , directory, haskell-src-exts, mtl, process, pure-cdb, test-simple
@@ -105625,21 +106116,21 @@ self: {
      }) {};
 
   "hsdev" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, array, async, attoparsec
-     , base, bin-package-db, bytestring, Cabal, containers, cpphs
-     , data-default, deepseq, directory, exceptions, filepath, fsnotify
-     , ghc, ghc-mod, ghc-paths, ghc-syb-utils, haddock-api
-     , haskell-src-exts, hdocs, hformat, hlint, HTTP, lens, lifted-base
-     , monad-control, monad-loops, MonadCatchIO-transformers, mtl
-     , network, optparse-applicative, process, regex-pcre-builtin
-     , scientific, simple-log, syb, template-haskell, text, text-region
-     , time, transformers, transformers-base, uniplate, unix
-     , unordered-containers, vector
+    ({ mkDerivation, aeson, aeson-lens, aeson-pretty, array, async
+     , attoparsec, base, bin-package-db, bytestring, Cabal, containers
+     , cpphs, data-default, deepseq, directory, exceptions, filepath
+     , fsnotify, ghc, ghc-mod, ghc-paths, ghc-syb-utils, haddock-api
+     , haskell-src-exts, hdocs, hformat, hlint, hspec, HTTP, lens
+     , lifted-base, monad-control, monad-loops
+     , MonadCatchIO-transformers, mtl, network, optparse-applicative
+     , process, regex-pcre-builtin, scientific, simple-log, syb
+     , template-haskell, text, text-region, time, transformers
+     , transformers-base, uniplate, unix, unordered-containers, vector
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.1.5.2";
-       sha256 = "c60c0ff6283a3b3a043f63598440fe9a577409037bb252481171d1ce839df86f";
+       version = "0.1.5.4";
+       sha256 = "77f92b6fbcf70904e51c843262ab2b40d3cd2b463d57f8583463b4414e3c42b1";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -105659,7 +106150,8 @@ self: {
          unordered-containers vector
        ];
        testHaskellDepends = [
-         async base containers data-default deepseq hformat lens mtl text
+         aeson aeson-lens async base containers data-default deepseq hformat
+         hspec lens mtl text
        ];
        jailbreak = true;
        homepage = "https://github.com/mvoidex/hsdev";
@@ -107443,6 +107935,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hspec-megaparsec" = callPackage
+    ({ mkDerivation, base, hspec, hspec-expectations, megaparsec }:
+     mkDerivation {
+       pname = "hspec-megaparsec";
+       version = "0.1.0";
+       sha256 = "8fa6c28728fe8f9df354d81dccf3395160c74b28b0c9be9dcfc81f91fc331cfa";
+       libraryHaskellDepends = [ base hspec-expectations megaparsec ];
+       testHaskellDepends = [ base hspec hspec-expectations megaparsec ];
+       homepage = "https://github.com/mrkkrp/hspec-megaparsec";
+       description = "Utility functions for testing Megaparsec parsers with Hspec";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hspec-meta_2_0_0" = callPackage
     ({ mkDerivation, ansi-terminal, async, base, deepseq, directory
      , filepath, hspec-expectations, HUnit, QuickCheck, quickcheck-io
@@ -110153,6 +110658,8 @@ self: {
        pname = "http-conduit";
        version = "2.1.5";
        sha256 = "0300ec74e16799b2eec9d9a3402aaead9beaae1a2ef734e92ceac0018d55626e";
+       revision = "1";
+       editedCabalFile = "0f535cbb34d4a3614910c50c148e7ff93ebfa2b51976844e43e7c039b9cced65";
        libraryHaskellDepends = [
          base bytestring conduit http-client http-client-tls http-types
          lifted-base monad-control mtl resourcet transformers
@@ -110183,6 +110690,8 @@ self: {
        pname = "http-conduit";
        version = "2.1.5.1";
        sha256 = "821b4891d236c190ee8853f4aa273e46a521a04402bee0bec218a630c040f7e6";
+       revision = "1";
+       editedCabalFile = "cdb1774981302f416fe1c9fc31e1a66e0ee888bbd3ea714911380650e8820810";
        libraryHaskellDepends = [
          base bytestring conduit http-client http-client-tls http-types
          lifted-base monad-control mtl resourcet transformers
@@ -110213,6 +110722,8 @@ self: {
        pname = "http-conduit";
        version = "2.1.7.1";
        sha256 = "a674bcdede3336bf7cd85ba58763d9267d67adcfa3e95ef987288a131ad78a95";
+       revision = "1";
+       editedCabalFile = "ac4bbb931c8c5349bb56954062e4b12b51e769784deb49d91e75e8cda0b97d09";
        libraryHaskellDepends = [
          base bytestring conduit http-client http-client-tls http-types
          lifted-base monad-control mtl resourcet transformers
@@ -110243,6 +110754,8 @@ self: {
        pname = "http-conduit";
        version = "2.1.7.2";
        sha256 = "ccd5d034d9c1f185ccf600e7f6d6153df793218233683ba073bab62d5449dc46";
+       revision = "1";
+       editedCabalFile = "c8c8877562dbf78bd7329907b9e9bb594778ecf0bbd8eb50fda80d82205503ce";
        libraryHaskellDepends = [
          base bytestring conduit http-client http-client-tls http-types
          lifted-base monad-control mtl resourcet transformers
@@ -112926,6 +113439,24 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hzaif" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, http-conduit, text }:
+     mkDerivation {
+       pname = "hzaif";
+       version = "0.1.0.0";
+       sha256 = "1d600bf4940412059c0d3916573fd2042c3695d627993fb1277b38e241fa9a55";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring http-conduit text
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "http://github.com/i-amd3/hzaif";
+       description = "This package is Zaif Exchange Api wrapper";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hzk" = callPackage
     ({ mkDerivation, base, bytestring, resource-pool, tasty
      , tasty-hunit, time, zookeeper_mt
@@ -113597,6 +114128,7 @@ self: {
          mtl pretty-show pureMD5 tagged template-haskell temporary text
          transformers unix
        ];
+       jailbreak = true;
        description = "Shared library used be ide-backend and ide-backend-server";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113618,6 +114150,7 @@ self: {
          monad-logger mtl pretty-show pureMD5 tagged template-haskell
          temporary text transformers unix
        ];
+       jailbreak = true;
        description = "Shared library used be ide-backend and ide-backend-server";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113641,6 +114174,7 @@ self: {
          monad-logger mtl pretty-show pureMD5 tagged template-haskell
          temporary text transformers unix
        ];
+       jailbreak = true;
        description = "Shared library used be ide-backend and ide-backend-server";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113908,6 +114442,7 @@ self: {
        executableHaskellDepends = [
          base directory filepath haskeline transformers
        ];
+       jailbreak = true;
        homepage = "http://www.idris-lang.org/";
        description = "Functional Programming Language with Dependent Types";
        license = stdenv.lib.licenses.bsd3;
@@ -114398,8 +114933,8 @@ self: {
      }:
      mkDerivation {
        pname = "ihaskell-inline-r";
-       version = "0.1.0.0";
-       sha256 = "d2db68091c07fa021dc9bde2468c0cbff950198481476f8e269e34f6ccc000a5";
+       version = "0.1.1.0";
+       sha256 = "e6584ad3c1140ebbcf26c37ae668b00c8b033574f380b11f486c69f1eb58665a";
        libraryHaskellDepends = [
          base base64-bytestring blaze-html bytestring filepath ihaskell
          ihaskell-blaze inline-r template-haskell temporary
@@ -114582,8 +115117,8 @@ self: {
      }:
      mkDerivation {
        pname = "imagemagick";
-       version = "0.0.4";
-       sha256 = "0faa50be5db638cdcd51c0e35fd418041204eff0173547a2d076995fa163b82f";
+       version = "0.0.4.1";
+       sha256 = "a395fa54e4aa3edca9961f062345247e925e841206c1826e58b31e255062c6ea";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -115043,6 +115578,7 @@ self: {
        homepage = "https://github.com/blamario/incremental-parser";
        description = "Generic parser library capable of providing partial results from partial input";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "incremental-sat-solver" = callPackage
@@ -115655,31 +116191,32 @@ self: {
      }) {};
 
   "inline-r" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, c2hs, data-default-class
-     , deepseq, directory, exceptions, filepath, ieee754, mtl, pretty
-     , primitive, process, quickcheck-assertions, R, setenv, silently
-     , singletons, strict, tasty, tasty-golden, tasty-hunit
+    ({ mkDerivation, aeson, base, bytestring, c2hs, containers
+     , data-default-class, deepseq, directory, exceptions, filepath
+     , ieee754, mtl, pretty, primitive, process, quickcheck-assertions
+     , R, reflection, setenv, silently, singletons, strict, tasty
+     , tasty-expected-failure, tasty-golden, tasty-hunit
      , tasty-quickcheck, template-haskell, temporary, text, th-lift
      , th-orphans, transformers, unix, vector
      }:
      mkDerivation {
        pname = "inline-r";
-       version = "0.7.3.0";
-       sha256 = "4de9508426ad48159502d7e2b3c241367643c8a2645f62b61d896e7b7535e329";
+       version = "0.8.0.1";
+       sha256 = "4ce2363046cb3173e00e1f60fe666e539d88ab61a4a3d5eb06d550dba0f41e61";
        libraryHaskellDepends = [
-         aeson base bytestring data-default-class deepseq exceptions mtl
-         pretty primitive process setenv singletons template-haskell text
-         th-lift th-orphans transformers unix vector
+         aeson base bytestring containers data-default-class deepseq
+         exceptions mtl pretty primitive process reflection setenv
+         singletons template-haskell text th-lift th-orphans transformers
+         unix vector
        ];
        libraryPkgconfigDepends = [ R ];
        libraryToolDepends = [ c2hs ];
        testHaskellDepends = [
          base bytestring directory filepath ieee754 mtl process
-         quickcheck-assertions silently singletons strict tasty tasty-golden
-         tasty-hunit tasty-quickcheck template-haskell temporary text unix
-         vector
+         quickcheck-assertions silently singletons strict tasty
+         tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck
+         template-haskell temporary text unix vector
        ];
-       jailbreak = true;
        description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -117952,10 +118489,8 @@ self: {
     ({ mkDerivation, base, Cabal }:
      mkDerivation {
        pname = "jailbreak-cabal";
-       version = "1.3";
-       sha256 = "a2c36f5a4c69e8a1afdf92e0ebd4007f045f9509686d48d61d991cbcbe428ac4";
-       revision = "2";
-       editedCabalFile = "eb10d8166cc3a40e8d731ab1fba7d37ef57d155d6122c7234297ddbf776ec28a";
+       version = "1.3.1";
+       sha256 = "610d8dbd04281eee3d5da05c9eef45bfd1a1ddca20dfe54f283e15ddf6d5c235";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base Cabal ];
@@ -121209,8 +121744,8 @@ self: {
      }:
      mkDerivation {
        pname = "kicad-data";
-       version = "0.1.0.0";
-       sha256 = "0122f788610316c0dbb1be46796191c68ccf97b447897f8afdd31c2e83f86f09";
+       version = "0.2.0.0";
+       sha256 = "436e0187e8df0a0aae2ba5827c0b607334237f9719475ea1fad626f9aea55e06";
        libraryHaskellDepends = [
          base ieee754 lens-family parsec parsec-numbers pretty-compact
        ];
@@ -122431,6 +122966,7 @@ self: {
        testHaskellDepends = [
          base hspec QuickCheck quickcheck-text text
        ];
+       jailbreak = true;
        homepage = "http://github.com/NorfairKing/lambdatex";
        description = "Type-Safe LaTeX EDSL";
        license = "GPL";
@@ -123854,6 +124390,7 @@ self: {
          base hakyll latex-formulae-image latex-formulae-pandoc lrucache
          pandoc-types
        ];
+       jailbreak = true;
        homepage = "https://github.com/liamoc/latex-formulae#readme";
        description = "Use actual LaTeX to render formulae inside Hakyll pages";
        license = stdenv.lib.licenses.bsd3;
@@ -123930,6 +124467,7 @@ self: {
        executableHaskellDepends = [
          base latex-formulae-image pandoc-types
        ];
+       jailbreak = true;
        homepage = "http://github.com/liamoc/latex-formulae#readme";
        description = "Render LaTeX formulae in pandoc documents to images with an actual LaTeX installation";
        license = stdenv.lib.licenses.bsd3;
@@ -125120,8 +125658,8 @@ self: {
      }:
      mkDerivation {
        pname = "lentil";
-       version = "0.1.8.0";
-       sha256 = "2d7a645f25bd98f64e834fa0fe6b721730483efff395343ccd03814ad540435a";
+       version = "0.1.9.0";
+       sha256 = "661932f5ee624a25f2a343accc88be8442a584938be891b842c1c165b2afa80e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -125132,7 +125670,6 @@ self: {
          ansi-wl-pprint base csv directory filemanip filepath hspec
          natural-sort optparse-applicative parsec regex-tdfa
        ];
-       jailbreak = true;
        homepage = "http://www.ariis.it/static/articles/lentil/page.html";
        description = "frugal issue tracker";
        license = stdenv.lib.licenses.gpl3;
@@ -128857,6 +129394,7 @@ self: {
          async base exceptions free monad-control mtl stm stm-delay text
          time transformers transformers-base wl-pprint-text
        ];
+       jailbreak = true;
        homepage = "https://github.com/ocharles/logging-effect";
        description = "A mtl-style monad transformer for general purpose & compositional logging";
        license = stdenv.lib.licenses.bsd3;
@@ -128916,8 +129454,8 @@ self: {
      }:
      mkDerivation {
        pname = "logic-TPTP";
-       version = "0.4.3.0";
-       sha256 = "fb42d26b521ccbad897271061e3df5ae1977051740d259757efcde2892b55f42";
+       version = "0.4.4.0";
+       sha256 = "5aac97226f53f2be61c1aeb58e9fdd4b3f971aa74af10904944384fa849cbd27";
        libraryHaskellDepends = [
          ansi-wl-pprint array base containers mtl pointed QuickCheck syb
          transformers transformers-compat
@@ -129384,6 +129922,7 @@ self: {
        ];
        description = "SVG Backend for lp-diagrams";
        license = stdenv.lib.licenses.agpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lrucache" = callPackage
@@ -131642,6 +132181,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mappy" = callPackage
+    ({ mkDerivation, base, containers, hspec, parsec, QuickCheck }:
+     mkDerivation {
+       pname = "mappy";
+       version = "0.1.0.0";
+       sha256 = "5164ba7bc9e920252e00e0e01357b929f16795bf7f032e122c8ddaf85e1e038a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers parsec ];
+       executableHaskellDepends = [ base parsec ];
+       testHaskellDepends = [ base containers hspec parsec QuickCheck ];
+       homepage = "http://github.com/githubuser/mappy#readme";
+       description = "A functional programming language focused around maps";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "marionetta" = callPackage
     ({ mkDerivation, base, containers, gloss, mtl, splines, vector
      , vector-space
@@ -133270,6 +133825,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring HTTP http-conduit network
        ];
+       jailbreak = true;
        homepage = "http://github.com/kaiko/messente-haskell";
        description = "Messente SMS Gateway";
        license = stdenv.lib.licenses.mit;
@@ -133745,8 +134301,8 @@ self: {
      }:
      mkDerivation {
        pname = "microlens-mtl";
-       version = "0.1.6.1";
-       sha256 = "af2a9763a35ee85bb27a9ff14d7fe1f653407a96a35835f9d182cdfd532ef0c3";
+       version = "0.1.7.0";
+       sha256 = "521f641ad6f051b13cbb0ee7c418bcba8169f6714a270c28a08fbe1ef75ae34f";
        libraryHaskellDepends = [
          base microlens mtl transformers transformers-compat
        ];
@@ -133780,8 +134336,8 @@ self: {
      }:
      mkDerivation {
        pname = "microlens-platform";
-       version = "0.2.1.0";
-       sha256 = "2afd1e023a4bbbdd88e22d2cb706831af2809a099f183cbf04d24b19b6b32326";
+       version = "0.2.2.0";
+       sha256 = "35fcf4295733a3ca800dd1bd012c0835fa7b4698e5917e72e0cfbaa86f5b6ea9";
        libraryHaskellDepends = [
          base hashable microlens microlens-ghc microlens-mtl microlens-th
          text unordered-containers vector
@@ -135216,6 +135772,30 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "moesocks_1_0_0_41" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring
+     , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens
+     , lens-aeson, mtl, network, optparse-applicative, random, stm
+     , strict, text, time, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "moesocks";
+       version = "1.0.0.41";
+       sha256 = "85905960363cb617541b0f9ec3a93e73a9b9cd761acdf37174864da865c5cb95";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson async attoparsec base binary bytestring containers cryptohash
+         hslogger HsOpenSSL iproute lens lens-aeson mtl network
+         optparse-applicative random stm strict text time transformers
+         unordered-containers
+       ];
+       homepage = "https://github.com/nfjinjing/moesocks";
+       description = "A functional firewall killer";
+       license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mohws" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-accessor
      , directory, explicit-exception, filepath, html, HTTP, network
@@ -135397,6 +135977,8 @@ self: {
        pname = "monad-control";
        version = "1.0.0.4";
        sha256 = "e984b7346af6d31b7ce918e1a0263075af8cbcf5440bc3df698d0354c90df61e";
+       revision = "1";
+       editedCabalFile = "2df3fbea3354b0d5e0faefe0c441b7d5485a5669caec28a5d9643c15c47c7e76";
        libraryHaskellDepends = [
          base stm transformers transformers-base transformers-compat
        ];
@@ -137328,6 +137910,7 @@ self: {
        homepage = "https://github.com/blamario/monoid-subclasses/";
        description = "Subclasses of Monoid";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoid-transformer" = callPackage
@@ -139031,20 +139614,20 @@ self: {
 
   "mustache" = callPackage
     ({ mkDerivation, aeson, base, base-unicode-symbols, bytestring
-     , cmdargs, containers, directory, either, filepath, hspec
-     , ja-base-extra, mtl, parsec, process, scientific, temporary, text
+     , cmdargs, containers, directory, either, filepath, hspec, mtl
+     , parsec, process, scientific, temporary, text
      , unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "mustache";
-       version = "0.5.1.0";
-       sha256 = "c6df193215b024b79bb34ec01d1c8c8fa7084887db2def231b943d47b851d882";
+       version = "1.0";
+       sha256 = "a928ff0f3430af57c0ce22b45d85d85a64bca7f0ba48de93cfb3271a0a6042af";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base base-unicode-symbols bytestring containers directory
-         either filepath ja-base-extra mtl parsec scientific text
-         unordered-containers vector
+         either filepath mtl parsec scientific text unordered-containers
+         vector
        ];
        executableHaskellDepends = [
          aeson base base-unicode-symbols bytestring cmdargs filepath text
@@ -139054,6 +139637,7 @@ self: {
          aeson base base-unicode-symbols directory filepath hspec process
          temporary text unordered-containers yaml
        ];
+       doCheck = false;
        homepage = "https://github.com/JustusAdam/mustache";
        description = "A mustache template parser library";
        license = stdenv.lib.licenses.bsd3;
@@ -139747,6 +140331,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "nano-erl" = callPackage
+    ({ mkDerivation, base, stm }:
+     mkDerivation {
+       pname = "nano-erl";
+       version = "0.1.0.1";
+       sha256 = "370a60682b38ca77b793ee7326c54d5e74dd688f316f31fdd5cf999ad498ee12";
+       libraryHaskellDepends = [ base stm ];
+       description = "Small library for Erlang-style actor semantics";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "nano-hmac" = callPackage
     ({ mkDerivation, base, bytestring, openssl }:
      mkDerivation {
@@ -140106,13 +140701,12 @@ self: {
      }:
      mkDerivation {
        pname = "natural-transformation";
-       version = "0.2";
-       sha256 = "b771a07838f7932fc39cde8b2f7e8be00f637561f4320d0579aa4d729c5cafbb";
+       version = "0.3";
+       sha256 = "dce066be311d19aa14aab9431aacf99117df101db8d68f2d0dddb3ffe1796ed0";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base containers quickcheck-instances tasty tasty-quickcheck
        ];
-       jailbreak = true;
        homepage = "https://github.com/ku-fpg/natural-transformation";
        description = "A natural transformation package";
        license = stdenv.lib.licenses.bsd3;
@@ -142148,6 +142742,7 @@ self: {
          network-transport network-transport-tests stm stm-chans tasty
          tasty-hunit test-framework zeromq4-haskell
        ];
+       doCheck = false;
        homepage = "https://github.com/tweag/network-transport-zeromq";
        description = "ZeroMQ backend for network-transport";
        license = stdenv.lib.licenses.bsd3;
@@ -142475,6 +143070,7 @@ self: {
        homepage = "https://github.com/fhsjaagshs/niagra";
        description = "CSS EDSL for Haskell";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nibblestring" = callPackage
@@ -143297,6 +143893,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "number-length" = callPackage
+    ({ mkDerivation, base, HUnit, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "number-length";
+       version = "0.1.0.0";
+       sha256 = "96b5a43ab1832891bacaf81d5642f6e0686ccd93e79330b46ab0f802e68877c3";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base HUnit QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2
+       ];
+       homepage = "https://github.com/trskop/number-length";
+       description = "Number of digits in a number in decimal and hexadecimal representation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "numbering" = callPackage
     ({ mkDerivation, base, containers, vector }:
      mkDerivation {
@@ -145276,6 +145890,7 @@ self: {
        homepage = "https://github.com/k0ral/opml-conduit";
        description = "Streaming parser/renderer for the OPML 2.0 format.";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opn" = callPackage
@@ -145625,6 +146240,7 @@ self: {
        jailbreak = true;
        description = "An API client for http://orchestrate.io/.";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "orchid" = callPackage
@@ -146670,11 +147286,11 @@ self: {
      , directory, executable-path, extensible-exceptions, filemanip
      , filepath, ghc-prim, haddock-library, highlighting-kate, hslua
      , HTTP, http-client, http-client-tls, http-types, HUnit
-     , JuicyPixels, mtl, network, network-uri, old-time, pandoc-types
-     , parsec, process, QuickCheck, random, scientific, SHA, syb
-     , tagsoup, temporary, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, texmath, text, time
-     , unordered-containers, vector, xml, yaml, zip-archive, zlib
+     , JuicyPixels, mtl, network, network-uri, old-locale, old-time
+     , pandoc-types, parsec, process, QuickCheck, random, scientific
+     , SHA, syb, tagsoup, temporary, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, texmath, text
+     , time, unordered-containers, vector, xml, yaml, zip-archive, zlib
      }:
      mkDerivation {
        pname = "pandoc";
@@ -146688,9 +147304,10 @@ self: {
          bytestring cmark containers data-default deepseq-generics directory
          extensible-exceptions filemanip filepath ghc-prim haddock-library
          highlighting-kate hslua HTTP http-client http-client-tls http-types
-         JuicyPixels mtl network network-uri old-time pandoc-types parsec
-         process random scientific SHA syb tagsoup temporary texmath text
-         time unordered-containers vector xml yaml zip-archive zlib
+         JuicyPixels mtl network network-uri old-locale old-time
+         pandoc-types parsec process random scientific SHA syb tagsoup
+         temporary texmath text time unordered-containers vector xml yaml
+         zip-archive zlib
        ];
        executableHaskellDepends = [
          aeson base bytestring containers directory extensible-exceptions
@@ -146703,6 +147320,7 @@ self: {
          process QuickCheck syb test-framework test-framework-hunit
          test-framework-quickcheck2 text zip-archive
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "http://pandoc.org";
        description = "Conversion between markup formats";
@@ -146717,11 +147335,11 @@ self: {
      , directory, executable-path, extensible-exceptions, filemanip
      , filepath, ghc-prim, haddock-library, highlighting-kate, hslua
      , HTTP, http-client, http-client-tls, http-types, HUnit
-     , JuicyPixels, mtl, network, network-uri, old-time, pandoc-types
-     , parsec, process, QuickCheck, random, scientific, SHA, syb
-     , tagsoup, temporary, test-framework, test-framework-hunit
-     , test-framework-quickcheck2, texmath, text, time
-     , unordered-containers, vector, xml, yaml, zip-archive, zlib
+     , JuicyPixels, mtl, network, network-uri, old-locale, old-time
+     , pandoc-types, parsec, process, QuickCheck, random, scientific
+     , SHA, syb, tagsoup, temporary, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, texmath, text
+     , time, unordered-containers, vector, xml, yaml, zip-archive, zlib
      }:
      mkDerivation {
        pname = "pandoc";
@@ -146735,9 +147353,10 @@ self: {
          bytestring cmark containers data-default deepseq-generics directory
          extensible-exceptions filemanip filepath ghc-prim haddock-library
          highlighting-kate hslua HTTP http-client http-client-tls http-types
-         JuicyPixels mtl network network-uri old-time pandoc-types parsec
-         process random scientific SHA syb tagsoup temporary texmath text
-         time unordered-containers vector xml yaml zip-archive zlib
+         JuicyPixels mtl network network-uri old-locale old-time
+         pandoc-types parsec process random scientific SHA syb tagsoup
+         temporary texmath text time unordered-containers vector xml yaml
+         zip-archive zlib
        ];
        executableHaskellDepends = [
          aeson base bytestring containers directory extensible-exceptions
@@ -146750,6 +147369,7 @@ self: {
          process QuickCheck syb test-framework test-framework-hunit
          test-framework-quickcheck2 text zip-archive
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "http://pandoc.org";
        description = "Conversion between markup formats";
@@ -146797,6 +147417,7 @@ self: {
          process QuickCheck syb test-framework test-framework-hunit
          test-framework-quickcheck2 text zip-archive
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "http://pandoc.org";
        description = "Conversion between markup formats";
@@ -146804,7 +147425,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pandoc" = callPackage
+  "pandoc_1_15_2_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , cmark, containers, data-default, deepseq-generics, Diff
@@ -146844,13 +147465,15 @@ self: {
          process QuickCheck syb test-framework test-framework-hunit
          test-framework-quickcheck2 text zip-archive
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "http://pandoc.org";
        description = "Conversion between markup formats";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pandoc_1_16_0_2" = callPackage
+  "pandoc" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, array, base
      , base64-bytestring, binary, blaze-html, blaze-markup, bytestring
      , cmark, containers, data-default, deepseq, Diff, directory
@@ -146890,11 +147513,9 @@ self: {
          process QuickCheck syb test-framework test-framework-hunit
          test-framework-quickcheck2 text zip-archive
        ];
-       jailbreak = true;
        homepage = "http://pandoc.org";
        description = "Conversion between markup formats";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-citeproc_0_6" = callPackage
@@ -147058,7 +147679,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pandoc-citeproc" = callPackage
+  "pandoc-citeproc_0_8_1_3" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , containers, data-default, directory, filepath, hs-bibutils, mtl
      , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
@@ -147088,9 +147709,10 @@ self: {
        doCheck = false;
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pandoc-citeproc_0_9" = callPackage
+  "pandoc-citeproc" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring
      , containers, data-default, directory, filepath, hs-bibutils, mtl
      , old-locale, pandoc, pandoc-types, parsec, process, rfc5051
@@ -147117,12 +147739,10 @@ self: {
          aeson base bytestring directory filepath pandoc pandoc-types
          process temporary text yaml
        ];
-       jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/jgm/pandoc-citeproc";
        description = "Supports using pandoc with citeproc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-citeproc-preamble" = callPackage
@@ -147143,26 +147763,27 @@ self: {
      }) {};
 
   "pandoc-crossref" = callPackage
-    ({ mkDerivation, base, bytestring, containers, data-default, hspec
-     , mtl, pandoc, pandoc-types, process, yaml
+    ({ mkDerivation, base, bytestring, containers, data-accessor
+     , data-accessor-transformers, data-default, hspec, mtl, pandoc
+     , pandoc-types, process, yaml
      }:
      mkDerivation {
        pname = "pandoc-crossref";
-       version = "0.1.6.3";
-       sha256 = "7ec41e6fa2acf6826889670e7636b209a6833872de3b65034891a402b7bd356b";
+       version = "0.1.6.5";
+       sha256 = "6b92a2730ed28c0242b81e47c0e21902321f98eb2b580d2114d906ca89a451e2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers data-default mtl pandoc pandoc-types
-         yaml
+         base bytestring containers data-accessor data-accessor-transformers
+         data-default mtl pandoc pandoc-types yaml
        ];
        executableHaskellDepends = [
          base bytestring containers data-default mtl pandoc pandoc-types
          yaml
        ];
        testHaskellDepends = [
-         base bytestring containers data-default hspec mtl pandoc
-         pandoc-types process yaml
+         base bytestring containers data-accessor data-accessor-transformers
+         data-default hspec mtl pandoc pandoc-types process yaml
        ];
        description = "Pandoc filter for cross-references";
        license = stdenv.lib.licenses.gpl2;
@@ -147229,6 +147850,7 @@ self: {
        version = "0.4.1";
        sha256 = "bd319f64abf3ebaac915e20135aadb06ab1f77ab562f7bac87580ceda37fc12d";
        libraryHaskellDepends = [ base containers lens pandoc-types ];
+       jailbreak = true;
        homepage = "http://github.com/bgamari/pandoc-lens";
        description = "Lenses for Pandoc documents";
        license = stdenv.lib.licenses.bsd3;
@@ -147364,7 +147986,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pandoc-types" = callPackage
+  "pandoc-types_1_12_4_7" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
      , deepseq-generics, ghc-prim, syb
      }:
@@ -147378,9 +148000,10 @@ self: {
        homepage = "http://johnmacfarlane.net/pandoc";
        description = "Types for representing a structured document";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pandoc-types_1_16_0_1" = callPackage
+  "pandoc-types" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , ghc-prim, syb
      }:
@@ -147394,7 +148017,6 @@ self: {
        homepage = "http://johnmacfarlane.net/pandoc";
        description = "Types for representing a structured document";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc-unlit" = callPackage
@@ -148534,22 +149156,6 @@ self: {
      }) {};
 
   "path-io" = callPackage
-    ({ mkDerivation, base, directory, exceptions, filepath, path, time
-     , transformers
-     }:
-     mkDerivation {
-       pname = "path-io";
-       version = "0.1.1";
-       sha256 = "252633966f9a2c76297260c517b5a4d45597ffe4b3b8f53dbd44a363a4eb55cc";
-       libraryHaskellDepends = [
-         base directory exceptions filepath path time transformers
-       ];
-       homepage = "https://github.com/mrkkrp/path-io";
-       description = "Interface to ‘directory’ package for users of ‘path’";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "path-io_0_2_0" = callPackage
     ({ mkDerivation, base, directory, exceptions, filepath, path
      , temporary, time, transformers
      }:
@@ -148563,7 +149169,6 @@ self: {
        homepage = "https://github.com/mrkkrp/path-io";
        description = "Interface to ‘directory’ package for users of ‘path’";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "path-pieces_0_1_4" = callPackage
@@ -152076,6 +152681,7 @@ self: {
        homepage = "https://bitbucket.org/blamario/picoparsec";
        description = "Fast combinator parsing for bytestrings and text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "picosat" = callPackage
@@ -152179,6 +152785,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pinchot_0_8_0_0" = callPackage
+    ({ mkDerivation, base, containers, Earley, lens, template-haskell
+     , transformers
+     }:
+     mkDerivation {
+       pname = "pinchot";
+       version = "0.8.0.0";
+       sha256 = "f7567131c274815e8e0ecccff815a8ff94c0912a833055ddc55f46ea26831e3b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers Earley lens template-haskell transformers
+       ];
+       homepage = "http://www.github.com/massysett/pinchot";
+       description = "Build parsers and ASTs for context-free grammars";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipe-enumerator" = callPackage
     ({ mkDerivation, base, enumerator, pipes, transformers }:
      mkDerivation {
@@ -152641,6 +153266,7 @@ self: {
        sha256 = "a8423a1771769917d4989e3c137f6069f62c8ac456f90dd413f0a2d9105c8e3c";
        libraryHaskellDepends = [ base pipes stm ];
        testHaskellDepends = [ async base pipes stm ];
+       jailbreak = true;
        description = "Concurrency for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152654,6 +153280,7 @@ self: {
        sha256 = "e56a51f71f254dd71b11387c6d0514fb7a951a0d666c63df8c707b433fb54e4b";
        libraryHaskellDepends = [ base pipes stm ];
        testHaskellDepends = [ async base pipes stm ];
+       jailbreak = true;
        description = "Concurrency for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -152667,6 +153294,7 @@ self: {
        sha256 = "195ff8fe0551bc03cca2e150e1bf235276c8f5b3c286ff3fddefa5074d6a85d3";
        libraryHaskellDepends = [ base pipes stm ];
        testHaskellDepends = [ async base pipes stm ];
+       jailbreak = true;
        description = "Concurrency for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -153113,6 +153741,7 @@ self: {
          async base bytestring directory hspec pipes pipes-bytestring
          pipes-safe process stm stm-chans text
        ];
+       jailbreak = true;
        description = "Create proper Pipes from System.Process";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -153175,8 +153804,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-transduce";
-       version = "0.3.0.0";
-       sha256 = "073c2ac2534fa8a29d65fb42b49ae1cff752513c69b3752145681b7a8d27c62b";
+       version = "0.3.2.0";
+       sha256 = "3273d60971ea3995df2cd255061b9705fd7c4fcced2c8162e65a2fad88789e3a";
        libraryHaskellDepends = [
          base bifunctors bytestring conceit foldl free lens-family-core
          pipes pipes-bytestring pipes-concurrency pipes-group pipes-parse
@@ -153480,6 +154109,23 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "plan-b" = callPackage
+    ({ mkDerivation, base, exceptions, hspec, path, path-io
+     , transformers
+     }:
+     mkDerivation {
+       pname = "plan-b";
+       version = "0.1.0";
+       sha256 = "46aa687c41c5b61302f5b968b8f3f7e2fd488013d6a2c05daa93f422bd50b107";
+       libraryHaskellDepends = [
+         base exceptions path path-io transformers
+       ];
+       testHaskellDepends = [ base hspec path path-io ];
+       homepage = "https://github.com/mrkkrp/plan-b";
+       description = "Failure-tolerant file and directory editing";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "planar-graph" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
      , containers, data-clist, deepseq
@@ -154379,6 +155025,7 @@ self: {
        ];
        description = "Polynomial types and operations";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "polynomial" = callPackage
@@ -156762,12 +157409,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "process_1_4_1_0" = callPackage
+  "process_1_4_2_0" = callPackage
     ({ mkDerivation, base, deepseq, directory, filepath, unix }:
      mkDerivation {
        pname = "process";
-       version = "1.4.1.0";
-       sha256 = "26e6e28600b59e1553ad014d47aa0dff7749a5f146af7412c13f37f38e9c85ab";
+       version = "1.4.2.0";
+       sha256 = "1c2ba524a238e464ae9c22582bea92da2d4c5227e1704a984bb8631dcb562bec";
        libraryHaskellDepends = [ base deepseq directory filepath unix ];
        testHaskellDepends = [ base ];
        description = "Process libraries";
@@ -156880,6 +157527,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "process-extras_0_3_3_8" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, generic-deriving
+     , ListLike, process, text
+     }:
+     mkDerivation {
+       pname = "process-extras";
+       version = "0.3.3.8";
+       sha256 = "d9e26f829d5eab2e2df113383b814bf71c835ff874fdecdc5a125115da485ec3";
+       libraryHaskellDepends = [
+         base bytestring deepseq generic-deriving ListLike process text
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/seereason/process-extras";
+       description = "Process extras";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "process-iterio" = callPackage
     ({ mkDerivation, base, bytestring, cpphs, iterIO, process
      , transformers
@@ -156994,6 +157659,7 @@ self: {
          pipes-safe pipes-text process semigroups tasty tasty-hunit text
          transformers transformers-compat void
        ];
+       jailbreak = true;
        description = "Streaming interface to system processes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -158286,6 +158952,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "publicsuffix_0_20160126" = callPackage
+    ({ mkDerivation, base, filepath, hspec, template-haskell }:
+     mkDerivation {
+       pname = "publicsuffix";
+       version = "0.20160126";
+       sha256 = "7798d15bf7962f6dc4ba65faa28c9975d4691e7f764ff1ef4689fcb5f1cac090";
+       libraryHaskellDepends = [ base filepath template-haskell ];
+       testHaskellDepends = [ base hspec ];
+       homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
+       description = "The publicsuffix list exposed as proper Haskell types";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "publicsuffixlist" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, data-default
      , HUnit, idna, text, utf8-string
@@ -159704,7 +160384,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "quickcheck-instances_0_3_11" = callPackage
+  "quickcheck-instances" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, hashable
      , old-time, QuickCheck, text, time, unordered-containers
      }:
@@ -159721,10 +160401,9 @@ self: {
        homepage = "https://github.com/aslatter/qc-instances";
        description = "Common quickcheck instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "quickcheck-instances" = callPackage
+  "quickcheck-instances_0_3_12" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, hashable
      , old-time, QuickCheck, scientific, text, time
      , unordered-containers, vector
@@ -159740,6 +160419,7 @@ self: {
        homepage = "https://github.com/aslatter/qc-instances";
        description = "Common quickcheck instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-io_0_1_1" = callPackage
@@ -160905,7 +161585,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rank1dynamic" = callPackage
+  "rank1dynamic_0_3_1_0" = callPackage
     ({ mkDerivation, base, binary, ghc-prim, HUnit, test-framework
      , test-framework-hunit
      }:
@@ -160922,6 +161602,25 @@ self: {
        homepage = "http://haskell-distributed.github.com";
        description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "rank1dynamic" = callPackage
+    ({ mkDerivation, base, binary, ghc-prim, HUnit, test-framework
+     , test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "rank1dynamic";
+       version = "0.3.1.1";
+       sha256 = "2ef57df7694e3aebc066d7cce59231a9d581c6b447d48aac4fcaeda2406e4dd7";
+       libraryHaskellDepends = [ base binary ghc-prim ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
+       doCheck = false;
+       homepage = "http://haskell-distributed.github.com";
+       description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "rascal" = callPackage
@@ -161979,6 +162678,7 @@ self: {
          async base bytestring bytestring-conversion containers redis-resp
          tasty tasty-hunit tinylog transformers
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/twittner/redis-io/";
        description = "Yet another redis client";
@@ -163574,8 +164274,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.8.0.1";
-       sha256 = "6484cb21a69e27c01edb4ecfe1155ed5780a7b7d608d42c5570eea402755e015";
+       version = "0.8.0.2";
+       sha256 = "784433068c59871ccfcc50aaba93298a85e96a4ad0917f2fbc9b23290d34f63a";
        libraryHaskellDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text time time-locale-compat
@@ -164814,6 +165514,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "resourcet_1_1_7_1" = callPackage
+    ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
+     , mmorph, monad-control, mtl, transformers, transformers-base
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "resourcet";
+       version = "1.1.7.1";
+       sha256 = "25133c9dd1ccdab047ab23b11907184ff319e561794563978768a893b27908ce";
+       libraryHaskellDepends = [
+         base containers exceptions lifted-base mmorph monad-control mtl
+         transformers transformers-base transformers-compat
+       ];
+       testHaskellDepends = [ base hspec lifted-base transformers ];
+       homepage = "http://github.com/snoyberg/conduit";
+       description = "Deterministic allocation and freeing of scarce resources";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "respond" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring, containers
      , data-default-class, exceptions, fast-logger, formatting, HList
@@ -165013,6 +165733,8 @@ self: {
        pname = "rest-client";
        version = "0.5.1.0";
        sha256 = "9b75fb30f0f101945440c21b38d64b22a9aad81b81bce8e6a21e4675e6c8136e";
+       revision = "1";
+       editedCabalFile = "792e8084ca7b8c30c3c5870c03c0f2b0e401ea75a7edea9ec598fdbe5213f676";
        libraryHaskellDepends = [
          aeson-utils base bytestring case-insensitive data-default
          exceptions http-conduit http-types hxt hxt-pickle-utils
@@ -165154,8 +165876,8 @@ self: {
        pname = "rest-core";
        version = "0.37";
        sha256 = "6a7e13b5e1ae6aadf53cc0dcbeca99a01b68737833962b2abdd50f4e6e9d066c";
-       revision = "1";
-       editedCabalFile = "88d214458142c107f807581931c4d9e995b178d2d76801534f6b1239234aa3be";
+       revision = "2";
+       editedCabalFile = "b402497734ed072efe7f1f989b56082490b8782f53f718821e028e61a4b22fcb";
        libraryHaskellDepends = [
          aeson aeson-utils base bytestring case-insensitive errors fclabels
          hxt hxt-pickle-utils json-schema mtl mtl-compat multipart random
@@ -166462,6 +167184,7 @@ self: {
        doHaddock = false;
        description = "Parse and display time according to RFC3339 (deprecated)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rfc5051" = callPackage
@@ -168752,6 +169475,8 @@ self: {
        pname = "satchmo-toysat";
        version = "0.2.1.0";
        sha256 = "c1c0ee4e46975dfc874b43c3145110956bb1a920b123910e9afcb318dbfbd0bc";
+       revision = "1";
+       editedCabalFile = "c7d42104f5373844f95b97b8e4ed7482712f1ca054ca669a17ccfffaee8acab3";
        libraryHaskellDepends = [
          array base containers satchmo toysolver
        ];
@@ -169112,6 +169837,7 @@ self: {
        homepage = "http://trac.haskell.org/SCC/";
        description = "Streaming component combinators";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scenegraph" = callPackage
@@ -169765,6 +170491,33 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "scotty_0_11_0" = callPackage
+    ({ mkDerivation, aeson, async, base, blaze-builder, bytestring
+     , case-insensitive, data-default-class, directory, fail, hspec
+     , hspec-wai, http-types, lifted-base, monad-control, mtl, nats
+     , network, regex-compat, text, transformers, transformers-base
+     , transformers-compat, wai, wai-extra, warp
+     }:
+     mkDerivation {
+       pname = "scotty";
+       version = "0.11.0";
+       sha256 = "892203c937ccf1279f5005ddb78ebea84629b80687a1e38fc118b38011a386ed";
+       libraryHaskellDepends = [
+         aeson base blaze-builder bytestring case-insensitive
+         data-default-class fail http-types monad-control mtl nats network
+         regex-compat text transformers transformers-base
+         transformers-compat wai wai-extra warp
+       ];
+       testHaskellDepends = [
+         async base data-default-class directory hspec hspec-wai http-types
+         lifted-base network text wai
+       ];
+       homepage = "https://github.com/scotty-web/scotty";
+       description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "scotty-binding-play" = callPackage
     ({ mkDerivation, base, bytestring, hspec, http-client, HUnit, mtl
      , scotty, template-haskell, text, transformers
@@ -170959,6 +171712,8 @@ self: {
        pname = "semigroups";
        version = "0.16.0.1";
        sha256 = "46ef9e651bf69634f8e8f0dbe2330629153a7e0c4278af5edaa03f4d6b3113c8";
+       revision = "1";
+       editedCabalFile = "60b69c696b5a74aeada898545cbc55f5e4f6edbe6601fdaef787c8b88bd10c52";
        libraryHaskellDepends = [
          base bytestring containers deepseq hashable nats text
          unordered-containers
@@ -170977,6 +171732,8 @@ self: {
        pname = "semigroups";
        version = "0.16.1";
        sha256 = "4d0d0706eae1dce2c0abb878b12c8f2b267e00f700fb76339b8bf3f56b3fde39";
+       revision = "1";
+       editedCabalFile = "7f321fed6eaa98ed2c343173ed31f8535582a2cda92571a50fcc05b360b90daf";
        libraryHaskellDepends = [
          base bytestring containers deepseq hashable nats text
          unordered-containers
@@ -170995,6 +171752,8 @@ self: {
        pname = "semigroups";
        version = "0.16.2.2";
        sha256 = "d17e3e42c8e2457286d5c583dad5d0df57678ce4dcf12acc8a7667e80bd8ed57";
+       revision = "1";
+       editedCabalFile = "6d7c9c6f7ccb8754b270341b33f39e373906380da03bc198cd008270fb9bd4a0";
        libraryHaskellDepends = [
          base bytestring containers deepseq hashable nats text
          unordered-containers
@@ -171013,6 +171772,8 @@ self: {
        pname = "semigroups";
        version = "0.18.0.1";
        sha256 = "f6e787519acf261e823d529cc3e5d4fca019075f39f8986649f21891d06d3115";
+       revision = "1";
+       editedCabalFile = "4b2725ee1abfe9519881e4b4da90cd984eee5f7814217e283dd940ebef629003";
        libraryHaskellDepends = [
          base bytestring containers deepseq hashable tagged text
          unordered-containers
@@ -171022,6 +171783,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "semigroups_0_18_1" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq
+     , hashable, tagged, text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "semigroups";
+       version = "0.18.1";
+       sha256 = "ae7607fb2b497a53192c378dc84c00b45610fdc5de0ac8c1ac3234ec7acee807";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq hashable tagged text
+         transformers unordered-containers
+       ];
+       homepage = "http://github.com/ekmett/semigroups/";
+       description = "Anything that associates";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "semigroups-actions" = callPackage
     ({ mkDerivation, base, containers, semigroups }:
      mkDerivation {
@@ -172351,6 +173130,7 @@ self: {
          base bytestring http-media lens pandoc-types servant-docs text
          unordered-containers
        ];
+       jailbreak = true;
        description = "Use Pandoc to render servant API documentation";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -172368,6 +173148,7 @@ self: {
          base bytestring http-media lens pandoc-types servant-docs text
          unordered-containers
        ];
+       jailbreak = true;
        description = "Use Pandoc to render servant API documentation";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -172671,27 +173452,6 @@ self: {
      }) {};
 
   "servant-swagger" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec
-     , http-media, lens, servant, swagger2, text, time
-     , unordered-containers
-     }:
-     mkDerivation {
-       pname = "servant-swagger";
-       version = "0.1";
-       sha256 = "ee47a6f51afb029abe1add54a1f579340ec48e5b816b592d1b976d0bdfd8346e";
-       libraryHaskellDepends = [
-         aeson base bytestring http-media lens servant swagger2 text
-         unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-qq base hspec lens servant swagger2 text time
-       ];
-       homepage = "https://github.com/dmjio/servant-swagger";
-       description = "Generate Swagger specification for your servant API";
-       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
      , unordered-containers
@@ -172700,6 +173460,8 @@ self: {
        pname = "servant-swagger";
        version = "0.1.1";
        sha256 = "d89df7e8ee82978f6db32c2f278591df26bcdd6ef4282dff53933d3417d53a6c";
+       revision = "1";
+       editedCabalFile = "4982e79b812758d953cf852474e97882f826f194b09ba66eed74ec52fceb6f8e";
        libraryHaskellDepends = [
          aeson base bytestring http-media lens servant swagger2 text
          unordered-containers
@@ -172710,7 +173472,6 @@ self: {
        homepage = "https://github.com/dmjio/servant-swagger";
        description = "Generate Swagger specification for your servant API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-yaml" = callPackage
@@ -173069,6 +173830,7 @@ self: {
        homepage = "http://hub.darcs.net/thielema/set-cover/";
        description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "set-extra" = callPackage
@@ -174570,6 +175332,7 @@ self: {
          base bytestring directory feed filepath HTTP network-uri process
          tagsoup temporary transformers xml
        ];
+       jailbreak = true;
        homepage = "http://github.com/valderman/shellmate";
        description = "Simple interface for shell scripting in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -175489,16 +176252,16 @@ self: {
      }) {};
 
   "simple-log" = callPackage
-    ({ mkDerivation, base, containers, deepseq, directory, filepath
-     , MonadCatchIO-transformers, mtl, SafeSemaphore, text, time
-     , transformers
+    ({ mkDerivation, async, base, containers, deepseq, directory
+     , filepath, MonadCatchIO-transformers, mtl, SafeSemaphore, text
+     , time, transformers
      }:
      mkDerivation {
        pname = "simple-log";
-       version = "0.3.2";
-       sha256 = "20cf6031d89388b2181a4b8b173893a286c781fd0c20920c98d3992bb6ec96da";
+       version = "0.3.3";
+       sha256 = "2b4ccfc67b6b4b7dc2a27ebfd9166b911910750e28c86e2e5ca8a8c7cad51783";
        libraryHaskellDepends = [
-         base containers deepseq directory filepath
+         async base containers deepseq directory filepath
          MonadCatchIO-transformers mtl SafeSemaphore text time transformers
        ];
        homepage = "http://github.com/mvoidex/simple-log";
@@ -176426,6 +177189,7 @@ self: {
        testHaskellDepends = [
          base bytestring cereal crypto-api filepath hspec tagged
        ];
+       doCheck = false;
        homepage = "https://github.com/meteficha/skein";
        description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
        license = stdenv.lib.licenses.bsd3;
@@ -176794,7 +177558,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "slug" = callPackage
+  "slug_0_1_1" = callPackage
     ({ mkDerivation, aeson, base, exceptions, path-pieces, persistent
      , QuickCheck, test-framework, test-framework-quickcheck2, text
      }:
@@ -176812,9 +177576,10 @@ self: {
        homepage = "https://github.com/mrkkrp/slug";
        description = "Type-safe slugs for Yesod ecosystem";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "slug_0_1_2" = callPackage
+  "slug" = callPackage
     ({ mkDerivation, aeson, base, exceptions, path-pieces, persistent
      , QuickCheck, test-framework, test-framework-quickcheck2, text
      }:
@@ -176829,11 +177594,9 @@ self: {
          base exceptions path-pieces QuickCheck test-framework
          test-framework-quickcheck2 text
        ];
-       jailbreak = true;
        homepage = "https://github.com/mrkkrp/slug";
        description = "Type-safe slugs for Yesod ecosystem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smallarray" = callPackage
@@ -177766,6 +178529,7 @@ self: {
          async base containers monad-loops MonadCatchIO-transformers snap
          stm time transformers
        ];
+       jailbreak = true;
        homepage = "http://github.com/ocharles/snap-error-collector";
        description = "Collect errors in batches and dispatch them";
        license = stdenv.lib.licenses.bsd3;
@@ -177859,6 +178623,8 @@ self: {
        pname = "snap-predicates";
        version = "0.3.1";
        sha256 = "c5a3e0eabaacaa198c2e2973b27d26ae448a39357f846190a2f77174c5d2330b";
+       revision = "1";
+       editedCabalFile = "6fbedca064ea734b7fb4c14324a4b128a54a5bd4e3e18416b9d87087392a46ad";
        libraryHaskellDepends = [
          attoparsec base bytestring case-insensitive containers monads-tf
          snap-core text transformers
@@ -181873,7 +182639,6 @@ self: {
          async base extract-dependencies file-modules lens lens-aeson
          MissingH process stm-containers text time wreq
        ];
-       doCheck = false;
        homepage = "http://github.com/yamadapc/stack-run-auto#readme";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.mit;
@@ -186020,6 +186785,8 @@ self: {
        pname = "swagger2";
        version = "1.1.1";
        sha256 = "bb441e8c160db9fe91ff62cc14b36ecfce683cd033a61aef7700acf763a526aa";
+       revision = "1";
+       editedCabalFile = "ac0b019958af896baba1453da3cf22b5437c0bfc23052a4ed8834180f01afcc8";
        libraryHaskellDepends = [
          aeson base containers hashable http-media lens mtl network
          scientific text time unordered-containers
@@ -186043,6 +186810,8 @@ self: {
        pname = "swagger2";
        version = "1.2.1";
        sha256 = "4eba65057202562d1f57bb10dad930f4cf6e4521c414005afb83213b3901d6d9";
+       revision = "1";
+       editedCabalFile = "dbbae6a2ff27fd977d013d56cc36c4fef7f089cb8f88965b4c6c6ec22b50bebd";
        libraryHaskellDepends = [
          aeson base containers hashable http-media lens mtl network
          scientific text time unordered-containers
@@ -187668,6 +188437,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "tagged_0_8_3" = callPackage
+    ({ mkDerivation, base, deepseq, template-haskell }:
+     mkDerivation {
+       pname = "tagged";
+       version = "0.8.3";
+       sha256 = "27aa7d3f17a01891fcd03ab7cbedc1fdd568475563cda7927ac3a3c2d3526893";
+       libraryHaskellDepends = [ base deepseq template-haskell ];
+       homepage = "http://github.com/ekmett/tagged";
+       description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tagged-binary" = callPackage
     ({ mkDerivation, base, binary, bytestring, pureMD5 }:
      mkDerivation {
@@ -189491,7 +190273,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "temporary" = callPackage
+  "temporary_1_2_0_3" = callPackage
     ({ mkDerivation, base, directory, exceptions, filepath
      , transformers, unix
      }:
@@ -189505,6 +190287,23 @@ self: {
        homepage = "http://www.github.com/batterseapower/temporary";
        description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "temporary" = callPackage
+    ({ mkDerivation, base, directory, exceptions, filepath
+     , transformers, unix
+     }:
+     mkDerivation {
+       pname = "temporary";
+       version = "1.2.0.4";
+       sha256 = "51e713804246404df8a728919a2e7d1994f8cfda42cfa7a74ea65d8b7d206762";
+       libraryHaskellDepends = [
+         base directory exceptions filepath transformers unix
+       ];
+       homepage = "http://www.github.com/feuerbach/temporary";
+       description = "Portable temporary file and directory support for Windows and Unix, based on code from Cabal";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "temporary-rc" = callPackage
@@ -189781,6 +190580,7 @@ self: {
        ];
        description = "a ternary library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "terrahs" = callPackage
@@ -190472,6 +191272,7 @@ self: {
          base bytestring directory filepath process split temporary text
          utf8-string xml
        ];
+       jailbreak = true;
        homepage = "http://github.com/jgm/texmath";
        description = "Conversion between formats used to represent mathematics";
        license = "GPL";
@@ -190497,6 +191298,7 @@ self: {
          base bytestring directory filepath process split temporary text
          utf8-string xml
        ];
+       jailbreak = true;
        homepage = "http://github.com/jgm/texmath";
        description = "Conversion between formats used to represent mathematics";
        license = "GPL";
@@ -190522,6 +191324,7 @@ self: {
          base bytestring directory filepath process split temporary text
          utf8-string xml
        ];
+       jailbreak = true;
        homepage = "http://github.com/jgm/texmath";
        description = "Conversion between formats used to represent mathematics";
        license = "GPL";
@@ -190547,6 +191350,7 @@ self: {
          base bytestring directory filepath process split temporary text
          utf8-string xml
        ];
+       jailbreak = true;
        homepage = "http://github.com/jgm/texmath";
        description = "Conversion between formats used to represent mathematics";
        license = "GPL";
@@ -190572,6 +191376,7 @@ self: {
          base bytestring directory filepath process split temporary text
          utf8-string xml
        ];
+       jailbreak = true;
        homepage = "http://github.com/jgm/texmath";
        description = "Conversion between formats used to represent mathematics";
        license = "GPL";
@@ -192469,8 +193274,8 @@ self: {
      }:
      mkDerivation {
        pname = "threepenny-gui";
-       version = "0.6.0.4";
-       sha256 = "e334bcdb0a09c590b161df6cfe8e79bfd3b5f798711e83705e9d7c6e9dd1eaad";
+       version = "0.6.0.5";
+       sha256 = "d64c7cd00248efda561642cf8f815b486a9dcbabc6bc17d4108423eb8cb10aa0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -193346,6 +194151,7 @@ self: {
        homepage = "https://github.com/HugoDaniel/timerep";
        description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timers" = callPackage
@@ -194424,39 +195230,41 @@ self: {
     ({ mkDerivation, array, base, bytestring, bytestring-builder
      , containers, data-default-class, data-interval, deepseq
      , exceptions, extended-reals, filepath, finite-field, ghc-prim
-     , hashable, heaps, HUnit, intern, loop, mtl, multiset, OptDir
-     , parse-dimacs, parsec, prettyclass, primes, process
-     , pseudo-boolean, queue, QuickCheck, random, sign, stm, tasty
-     , tasty-hunit, tasty-quickcheck, tasty-th, temporary, time
-     , type-level-numbers, unbounded-delays, unordered-containers
-     , vector-space
+     , 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
      }:
      mkDerivation {
        pname = "toysolver";
-       version = "0.3.0";
-       sha256 = "28afe735180a12234c7e675f321fdf33dd7336f9c771be2ffe7201f1ebc13007";
+       version = "0.4.0";
+       sha256 = "e9633a7854e6b67d947da02128098f7a29100e9a185be1a5d267e1d4fbf8e3bf";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          array base bytestring bytestring-builder containers
          data-default-class data-interval deepseq exceptions extended-reals
          filepath finite-field ghc-prim hashable heaps intern loop mtl
-         multiset OptDir parse-dimacs parsec prettyclass primes process
-         pseudo-boolean queue random sign stm temporary time
-         type-level-numbers unbounded-delays unordered-containers
-         vector-space
+         multiset mwc-random OptDir parse-dimacs parsec prettyclass primes
+         process pseudo-boolean queue semigroups sign stm template-haskell
+         temporary time transformers transformers-compat type-level-numbers
+         unordered-containers vector vector-space
        ];
        executableHaskellDepends = [
-         array base bytestring containers data-default-class filepath OptDir
-         parse-dimacs parsec process pseudo-boolean random time
-         unbounded-delays vector-space
+         array base bytestring containers data-default-class filepath
+         haskeline mtl mwc-random OptDir parse-dimacs parsec process
+         pseudo-boolean split time transformers transformers-compat
+         unbounded-delays vector vector-space
        ];
        testHaskellDepends = [
-         array base containers data-interval finite-field HUnit mtl OptDir
-         prettyclass QuickCheck random stm tasty tasty-hunit
-         tasty-quickcheck tasty-th vector-space
+         array base containers data-default-class data-interval deepseq
+         finite-field mtl mwc-random OptDir parsec prettyclass QuickCheck
+         tasty tasty-hunit tasty-quickcheck tasty-th transformers
+         transformers-compat vector vector-space
        ];
-       jailbreak = true;
        description = "Assorted decision procedures for SAT, Max-SAT, PB, MIP, etc";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -195255,10 +196063,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "trivial-constraint";
-       version = "0.3.0.0";
-       sha256 = "7ef4f1f6892aacb43cb3539f20c661d9b11e47dc8b8d0ea9e3457a131517873a";
-       revision = "1";
-       editedCabalFile = "c2fb0af78c16b340f5dfeb5bf5935250a7f70b72b9b5c07416aee2c8b9138b4b";
+       version = "0.4.0.0";
+       sha256 = "17fc46892beaa08c5badd544e71f690784f683efcfc50f482f5f8bc19fdc86c1";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/leftaroundabout/trivial-constraint";
        description = "Constraints that any type, resp. no type fulfills";
@@ -195922,6 +196728,7 @@ self: {
          temporary text time transformers unix
        ];
        testHaskellDepends = [ base doctest ];
+       jailbreak = true;
        description = "Shell programming, Haskell-style";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -195994,8 +196801,8 @@ self: {
     ({ mkDerivation, base, eventloop }:
      mkDerivation {
        pname = "twentefp-eventloop-trees";
-       version = "0.1.2.1";
-       sha256 = "be748f0f9678027b28808461ed8b69d2dea6bee67354c5f696ed843c1eaf7b3b";
+       version = "0.1.2.2";
+       sha256 = "5fc63b1739a64e5316fa3c1d91f9d47a34d1f2e494e91658bd0b719c18a2257d";
        libraryHaskellDepends = [ base eventloop ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree";
        license = stdenv.lib.licenses.bsd3;
@@ -196582,8 +197389,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "type-combinators";
-       version = "0.2.2.0";
-       sha256 = "52688cdc72f387baa0a39ca4e8cb020ec3018fab03c9da25ae1fb9693d32a1d3";
+       version = "0.2.2.1";
+       sha256 = "96e3c4954236120f46fa515c75f33a8b641d5263bc3b4b7dd2055858dfeee966";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/kylcarte/type-combinators";
        description = "A collection of data types for type-level programming";
@@ -196596,8 +197403,8 @@ self: {
      }:
      mkDerivation {
        pname = "type-combinators-quote";
-       version = "0.1.0.0";
-       sha256 = "246e8b50dbcebb5bf2c71c8827c66dc740a2e717dac4210da86308c7946c620d";
+       version = "0.1.0.1";
+       sha256 = "808b305a08443e27e46bbf2c7604eb312d1a44df6bd140f917b485e6eb35f6a7";
        libraryHaskellDepends = [
          base haskell-src-meta template-haskell type-combinators
        ];
@@ -197547,6 +198354,7 @@ self: {
        homepage = "https://github.com/UU-ComputerScience/uhc";
        description = "Part of UHC packaged as cabal/hackage installable library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uhc-util" = callPackage
@@ -199647,7 +200455,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "users" = callPackage
+  "users_0_3_0_0" = callPackage
     ({ mkDerivation, aeson, base, bcrypt, path-pieces, text, time }:
      mkDerivation {
        pname = "users";
@@ -199659,9 +200467,24 @@ self: {
        homepage = "https://github.com/agrafix/users";
        description = "A library simplifying user management for web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "users-persistent" = callPackage
+  "users" = callPackage
+    ({ mkDerivation, aeson, base, bcrypt, path-pieces, text, time }:
+     mkDerivation {
+       pname = "users";
+       version = "0.4.0.0";
+       sha256 = "3e4e213090756e04667872fe41872d0af842949087240237298152d72c569f3f";
+       libraryHaskellDepends = [
+         aeson base bcrypt path-pieces text time
+       ];
+       homepage = "https://github.com/agrafix/users";
+       description = "A library simplifying user management for web applications";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "users-persistent_0_3_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, monad-logger, mtl
      , persistent, persistent-sqlite, persistent-template, temporary
      , text, time, users, users-test, uuid
@@ -199681,6 +200504,29 @@ self: {
        homepage = "https://github.com/agrafix/users";
        description = "A persistent backend for the users package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "users-persistent" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, hspec, monad-logger, mtl
+     , persistent, persistent-sqlite, persistent-template, temporary
+     , text, time, transformers, users, users-test, uuid
+     }:
+     mkDerivation {
+       pname = "users-persistent";
+       version = "0.4.0.0";
+       sha256 = "bbf67ade5bfffaa6490e3f221717e489caa684d506a81139a221ab1589cf6347";
+       libraryHaskellDepends = [
+         aeson base bytestring mtl persistent persistent-template text time
+         transformers users uuid
+       ];
+       testHaskellDepends = [
+         base hspec monad-logger persistent-sqlite temporary text users-test
+       ];
+       doCheck = false;
+       homepage = "https://github.com/agrafix/users";
+       description = "A persistent backend for the users package";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "users-postgresql-simple_0_1_0_1" = callPackage
@@ -199702,7 +200548,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "users-postgresql-simple" = callPackage
+  "users-postgresql-simple_0_3_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, mtl
      , postgresql-simple, text, time, users, users-test, uuid
      }:
@@ -199718,6 +200564,25 @@ self: {
        homepage = "https://github.com/agrafix/users";
        description = "A PostgreSQL backend for the users package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "users-postgresql-simple" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, hspec, mtl
+     , postgresql-simple, text, time, users, users-test, uuid
+     }:
+     mkDerivation {
+       pname = "users-postgresql-simple";
+       version = "0.4.0.0";
+       sha256 = "953b326d097edd95ddf5d47832dc392ee70631dfeab38a076556d66a20b26859";
+       libraryHaskellDepends = [
+         aeson base bytestring mtl postgresql-simple text time users uuid
+       ];
+       testHaskellDepends = [ base hspec postgresql-simple users-test ];
+       doCheck = false;
+       homepage = "https://github.com/agrafix/users";
+       description = "A PostgreSQL backend for the users package";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "users-test_0_1_0_0" = callPackage
@@ -199733,7 +200598,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "users-test" = callPackage
+  "users-test_0_3_0_0" = callPackage
     ({ mkDerivation, aeson, base, hspec, text, users }:
      mkDerivation {
        pname = "users-test";
@@ -199743,6 +200608,19 @@ self: {
        homepage = "https://github.com/agrafix/users";
        description = "Library to test backends for the users library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "users-test" = callPackage
+    ({ mkDerivation, aeson, base, hspec, text, users }:
+     mkDerivation {
+       pname = "users-test";
+       version = "0.4.0.0";
+       sha256 = "d1f122a3b7876c16fa0a72a644b0c3f016a25fbcd10e04efb2eedd04730c5136";
+       libraryHaskellDepends = [ aeson base hspec text users ];
+       homepage = "https://github.com/agrafix/users";
+       description = "Library to test backends for the users library";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "utc" = callPackage
@@ -207105,6 +207983,7 @@ self: {
        homepage = "https://github.com/fhsjaagshs/webapp";
        description = "Haskell web app framework based on WAI & Warp";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webcrank" = callPackage
@@ -208035,8 +208914,8 @@ self: {
      }:
      mkDerivation {
        pname = "werewolf";
-       version = "0.3.3.2";
-       sha256 = "828d060f58e92ce91f22e9b732abe5f8058a0592e701d4baf2abdd207b475440";
+       version = "0.3.4.0";
+       sha256 = "fadf96e8c8aa76a2c2d8d56eb8ac09a0babe2eba31b987d79e6f34d487f5b2e5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -209191,8 +210070,8 @@ self: {
      }:
      mkDerivation {
        pname = "wsdl";
-       version = "0.1.0.0";
-       sha256 = "bbf461d30db337ba3e8c7519aa752d470088932189342325ca877919cb94cba1";
+       version = "0.1.0.1";
+       sha256 = "2e4d565f9d45f420f07b34b6309a15a7f5cac96c657e4afdfa035cf46c135c06";
        libraryHaskellDepends = [
          base bytestring conduit exceptions mtl network-uri resourcet text
          xml-conduit xml-types
@@ -210554,6 +211433,7 @@ 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-templater" = callPackage
@@ -216185,8 +217065,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-core";
-       version = "1.4.18.2";
-       sha256 = "298088fbccd63a323a5bab689464848cacd014ea73ef845969c898a59c022d64";
+       version = "1.4.19";
+       sha256 = "8425c1df703521b020b476035f572e953ac356ce6f5e35c424b29f0d5ff76ded";
        libraryHaskellDepends = [
          aeson auto-update base blaze-builder blaze-html blaze-markup
          byteable bytestring case-insensitive cereal clientsession conduit
@@ -216864,6 +217744,7 @@ self: {
          shakespeare texmath text xss-sanitize yesod-core yesod-form
        ];
        testHaskellDepends = [ base blaze-html hspec text ];
+       jailbreak = true;
        homepage = "http://github.com/pbrisbin/yesod-markdown";
        description = "Tools for using markdown in a yesod application";
        license = stdenv.lib.licenses.gpl2;
@@ -219026,6 +219907,7 @@ self: {
        testHaskellDepends = [
          async base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck
        ];
+       jailbreak = true;
        homepage = "http://github.com/twittner/zeromq-haskell/";
        description = "Bindings to ZeroMQ 4.x";
        license = stdenv.lib.licenses.mit;

From b57e4fa8133dc0eaad3e55db9fe037f0a9bcd72e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Jan 2016 13:53:04 +0100
Subject: [PATCH 0617/2285] configuration-hackage2nix.yaml: update list of
 broken builds

---
 .../configuration-hackage2nix.yaml            | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 89cc68e584f2..eea3adad2f8e 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -192,6 +192,7 @@ dont-distribute-packages:
   AERN-RnToRm-Plot:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-bson:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   AesonBson:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
+  aeson-extra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-native:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   aeson-smart:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   afv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -288,6 +289,7 @@ dont-distribute-packages:
   aterm-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   atlassian-connect-core:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   atlassian-connect-descriptor:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  atom-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   atomic-primops-foreign:                       [ x86_64-darwin ]
   atomic-primops-vector:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   atom-msp430:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -372,6 +374,7 @@ dont-distribute-packages:
   binary-file:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-indexed-tree:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-protocol-zmq:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  binary-search:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-streams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   binary-strict:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   binding-gtk:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -399,6 +402,7 @@ dont-distribute-packages:
   bindings-librrd:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-libstemmer:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-libv4l2:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bindings-libzip:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-linux-videodev2:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   bindings-lxc:                                 [ x86_64-darwin ]
   bindings-mpdecimal:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -421,6 +425,7 @@ dont-distribute-packages:
   BiobaseTrainingData:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseTurner:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   BiobaseVienna:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  biohazard:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   bio:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   bioinformatics-toolkit:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   biosff:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -455,6 +460,7 @@ dont-distribute-packages:
   blip:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Blobs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   blogination:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  bloodhound:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   bloxorz:                                      [ x86_64-darwin ]
   blubber:                                      [ x86_64-darwin ]
   Blueprint:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -463,6 +469,7 @@ dont-distribute-packages:
   board-games:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   bogre-banana:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   bond:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  Bookshelf:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   boolean-normal-forms:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   boolsimplifier:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   boomslang:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -695,6 +702,7 @@ dont-distribute-packages:
   const-math-ghc-plugin:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   ConstraintKinds:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   constructible:                                [ i686-linux ]
+  constructible:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   constructive-algebra:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Consumer:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   consumers:                                    [ x86_64-darwin ]
@@ -1079,6 +1087,7 @@ dont-distribute-packages:
   feed2lj:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   feed2twitter:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   feed-cli:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  feed-collect:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   feed-translator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   feldspar-compiler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   feldspar-language:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1129,6 +1138,7 @@ dont-distribute-packages:
   flower:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   flowlocks-framework:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   flowsim:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fltkhs-hello-world:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   fluidsynth:                                   [ x86_64-darwin ]
   FModExRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   FM-SBLEX:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1183,6 +1193,7 @@ dont-distribute-packages:
   frpnow-gloss:                                 [ x86_64-darwin ]
   fs-events:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fsmActions:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fswatcher:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ftdi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   FTGL-bytestring:                              [ x86_64-darwin ]
   FTGL:                                         [ x86_64-darwin ]
@@ -1199,6 +1210,7 @@ dont-distribute-packages:
   funion:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   funsat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   future:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  fuzzy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   fuzzytime:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   fwgl-glfw:                                    [ x86_64-darwin ]
   gact:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1472,6 +1484,7 @@ dont-distribute-packages:
   happybara-webkit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   happybara-webkit-server:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   harchive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  hardware-edsl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   HaRe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hark:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   HARM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -1743,6 +1756,7 @@ dont-distribute-packages:
   hlogger:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   HLogger:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hly:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  HMap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmark:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmarkup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   hmatrix-banded:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2039,6 +2053,7 @@ dont-distribute-packages:
   INblobs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   inch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   incremental-computing:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
+  incremental-parser:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   incremental-sat-solver:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   increments:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   index-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2284,6 +2299,7 @@ dont-distribute-packages:
   libvirt-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   libxslt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  LibZip:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   life:                                         [ x86_64-darwin ]
   lifter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   lighttpd-conf:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2359,6 +2375,7 @@ dont-distribute-packages:
   lord:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   loris:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   lostcities:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
+  lp-diagrams-svg:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
   lscabal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   L-seed:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   LslPlus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2519,6 +2536,7 @@ dont-distribute-packages:
   monoid-owns:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoidplus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   monoids:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  monoid-subclasses:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   monte-carlo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   moo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   morfette:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2618,6 +2636,7 @@ dont-distribute-packages:
   newt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   newtype-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   NGrams:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  niagra:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   nibblestring:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   nikepub:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   nimber:                                       [ i686-linux ]
@@ -2704,9 +2723,11 @@ dont-distribute-packages:
   OpenVGRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   open-witness:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Operads:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
+  opml-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimal-blocks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   optimusprime:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   OrchestrateDB:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
+  orchestrate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   orchid-demo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   orchid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   order-maintenance:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2790,6 +2811,7 @@ dont-distribute-packages:
   phybin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   pianola:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   pi-calculus:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
+  picoparsec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   piet:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   piki:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pipe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2821,6 +2843,7 @@ dont-distribute-packages:
   polar-configfile:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   polh-lexicon:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pollutocracy:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
+  polynom:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   polyseq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   polysoup:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   polytypeable:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -2906,6 +2929,7 @@ dont-distribute-packages:
   pugs-hsregex:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   pugs-HsSyck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pugs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  PUH-Project:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   pulse-simple:                                 [ x86_64-darwin ]
   punkt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   Pup-Events-Demo:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3055,6 +3079,7 @@ dont-distribute-packages:
   rewrite:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rewriting:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   rezoom:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  rfc3339:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   rhythm-game-tutorial:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   riemann:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   riot:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3136,6 +3161,7 @@ dont-distribute-packages:
   scaleimage:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   scalp-webhooks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   scan-vector-machine:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
+  scc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
   scenegraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   schedevr:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   scholdoc-citeproc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3202,6 +3228,7 @@ dont-distribute-packages:
   ses-html-snaplet:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   SessionLogger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   sessions:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
+  set-cover:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   set-with:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   sexp-grammar:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   sexp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3480,6 +3507,7 @@ dont-distribute-packages:
   tensor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   termbox-bindings:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
   term-rewriting:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
+  terntup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   terrahs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-doctest:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   test-framework-quickcheck:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3528,6 +3556,7 @@ dont-distribute-packages:
   timeplot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-qq:                                      [ i686-linux ]
   time-recurrence:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
+  timerep:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-series:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   timestamp-subprocess-lines:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   time-w3c:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3625,6 +3654,7 @@ dont-distribute-packages:
   udbus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
   udbus-model:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   udev:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  uhc-light:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   ui-command:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   UISF:                                         [ x86_64-darwin ]
   UMM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3745,6 +3775,7 @@ dont-distribute-packages:
   wavesurfer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
   weather-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   webapi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
+  webapp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
   WebBits-Html:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
   WebBits-multiplate:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
   web-browser-in-haskell:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
@@ -3828,6 +3859,7 @@ dont-distribute-packages:
   xing-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   xkbcommon:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
   xkcd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
+  xlsx:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
   xlsx-templater:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
   xml2x:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]

From 64a872863dc98a1cc7c5febe5c4930b8e2742eba Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Jan 2016 13:45:19 +0100
Subject: [PATCH 0618/2285] haskell-binary: update pre-7.8.x compilers from
 0.8.0.0 to 0.8.0.1

---
 pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix  | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix  | 4 ++--
 pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
index 322d7ea30937..3324eb6e3217 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
@@ -41,7 +41,7 @@ self: super: {
   unix = null;
 
   # These packages are core libraries in GHC 7.10.x, but not here.
-  binary = self.binary_0_8_0_0;
+  binary = self.binary_0_8_0_1;
   deepseq = self.deepseq_1_3_0_1;
   haskeline = self.haskeline_0_7_2_1;
   hoopl = self.hoopl_3_10_2_0;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index 63aab9e45677..771e24b3fe28 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -42,7 +42,7 @@ self: super: {
   xhtml = self.xhtml_3000_2_1;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_0_0; process = self.process_1_2_3_0; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_0_1; process = self.process_1_2_3_0; };
 
   # Newer versions don't compile.
   Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index da7008b63f15..16d3a43f6680 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -41,10 +41,10 @@ self: super: {
   xhtml = self.xhtml_3000_2_1;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_0_0; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_0_1; };
 
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_0_0; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_0_1; });
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index 5c0d09127b9d..63ca4663caa4 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -40,10 +40,10 @@ self: super: {
   xhtml = self.xhtml_3000_2_1;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_0_0; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_0_1; };
 
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_0_0; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_0_1; });
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;

From 2e3c8d55f743aa8ac1400d33cbfd904b9fa318a2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 24 Jan 2016 19:14:22 +0100
Subject: [PATCH 0619/2285] haskell-async: remove obsolete override

---
 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index dd544a769724..cc5034008bb6 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -51,7 +51,4 @@ self: super: {
   # https://github.com/hspec/HUnit/issues/7
   HUnit = dontCheck super.HUnit;
 
-  # Older versions don't support our version of base.
-  async = self.async_2_1_0;
-
 }

From c68c8655f1420ed546f963123bf2efc934a88b5e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Jan 2016 11:15:11 +0100
Subject: [PATCH 0620/2285] haskell: update use of Cabal 1.20.0.3 to 1.20.0.4

This affects mostly jailbreak-cabal, which uses the old version on most
platforms due to bugs introduced to Cabal in later releases.
---
 pkgs/development/haskell-modules/configuration-common.nix    | 4 ++--
 pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1b5b3b74f184..28fec422cfa8 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -6,13 +6,13 @@ self: super: {
 
   # Some packages need a non-core version of Cabal.
   Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6;
-  Cabal_1_20_0_3 = dontCheck super.Cabal_1_20_0_3;
+  Cabal_1_20_0_4 = dontCheck super.Cabal_1_20_0_4;
   Cabal_1_22_4_0 = dontCheck super.Cabal_1_22_4_0;
   cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_4_0; });
   cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; });
 
   # Link statically to avoid runtime dependency on GHC.
-  jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = dontJailbreak self.Cabal_1_20_0_3; };
+  jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = dontJailbreak self.Cabal_1_20_0_4; };
 
   # Apply NixOS-specific patches.
   ghc-paths = appendPatch super.ghc-paths ./patches/ghc-paths-nix.patch;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
index 6147be8f0f4b..a4f2d9b7ea7e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -52,7 +52,7 @@ self: super: {
 
   # https://github.com/peti/jailbreak-cabal/issues/9
   jailbreak-cabal = super.jailbreak-cabal.override {
-    Cabal = dontJailbreak (self.Cabal_1_20_0_3.override { deepseq = dontJailbreak self.deepseq_1_3_0_1; });
+    Cabal = dontJailbreak (self.Cabal_1_20_0_4.override { deepseq = dontJailbreak self.deepseq_1_3_0_1; });
   };
 
   # Haddock chokes on the prologue from the cabal file.
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index 771e24b3fe28..b20572aa0b2b 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -53,7 +53,7 @@ self: super: {
 
   # https://github.com/peti/jailbreak-cabal/issues/9
   jailbreak-cabal = super.jailbreak-cabal.override {
-    Cabal = dontJailbreak (self.Cabal_1_20_0_3.override { deepseq = dontJailbreak self.deepseq_1_3_0_1; });
+    Cabal = dontJailbreak (self.Cabal_1_20_0_4.override { deepseq = dontJailbreak self.deepseq_1_3_0_1; });
   };
 
   # Haddock chokes on the prologue from the cabal file.
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index 16d3a43f6680..a1dad7f3cd9a 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -50,7 +50,7 @@ self: super: {
   hashable = dontCheck super.hashable;
 
   # https://github.com/peti/jailbreak-cabal/issues/9
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_3; };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_4; };
 
   # Haddock chokes on the prologue from the cabal file.
   ChasingBottoms = dontHaddock super.ChasingBottoms;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index 63ca4663caa4..c5e5802903db 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -49,7 +49,7 @@ self: super: {
   hashable = dontCheck super.hashable;
 
   # https://github.com/peti/jailbreak-cabal/issues/9
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_3; };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_4; };
 
   # Haddock chokes on the prologue from the cabal file.
   ChasingBottoms = dontHaddock super.ChasingBottoms;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
index 81379ce9c371..c7ef534d7855 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.8.x.nix
@@ -38,7 +38,7 @@ self: super: {
   xhtml = null;
 
   # https://github.com/peti/jailbreak-cabal/issues/9
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_3; };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = dontJailbreak self.Cabal_1_20_0_4; };
 
   # mtl 2.2.x needs the latest transformers.
   mtl_2_2_1 = super.mtl.override { transformers = self.transformers_0_4_3_0; };

From d487783174c4042e2d8bec8ca3dcbefe2adc6777 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Jan 2016 11:54:27 +0100
Subject: [PATCH 0621/2285] haskell: update use of Cabal 1.18.1.6 to 1.18.1.7

This affects GHC versions 7.2.x and earlier, which cannot compile more
recent versions of Cabal.
---
 .../haskell-modules/configuration-common.nix           |  4 ++--
 .../haskell-modules/configuration-ghc-6.12.x.nix       | 10 +++++-----
 .../haskell-modules/configuration-ghc-7.0.x.nix        |  2 +-
 .../haskell-modules/configuration-ghc-7.2.x.nix        |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 28fec422cfa8..1f746802c7b0 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -5,11 +5,11 @@ with import ./lib.nix { inherit pkgs; };
 self: super: {
 
   # Some packages need a non-core version of Cabal.
-  Cabal_1_18_1_6 = dontCheck super.Cabal_1_18_1_6;
+  Cabal_1_18_1_7 = dontCheck super.Cabal_1_18_1_7;
   Cabal_1_20_0_4 = dontCheck super.Cabal_1_20_0_4;
   Cabal_1_22_4_0 = dontCheck super.Cabal_1_22_4_0;
   cabal-install = (dontCheck super.cabal-install).overrideScope (self: super: { Cabal = self.Cabal_1_22_4_0; });
-  cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_6; });
+  cabal-install_1_18_1_0 = (dontCheck super.cabal-install_1_18_1_0).overrideScope (self: super: { Cabal = self.Cabal_1_18_1_7; });
 
   # Link statically to avoid runtime dependency on GHC.
   jailbreak-cabal = (disableSharedExecutables super.jailbreak-cabal).override { Cabal = dontJailbreak self.Cabal_1_20_0_4; };
diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
index 3324eb6e3217..c16c9d962e76 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
@@ -53,7 +53,7 @@ self: super: {
   deepseq_1_3_0_1 = dontJailbreak super.deepseq_1_3_0_1;
 
   # Newer versions don't compile.
-  Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
+  Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
 
   # We have no working cabal-install at the moment.
   cabal-install_1_18_1_0 = markBroken super.cabal-install_1_18_1_0;
@@ -63,7 +63,7 @@ self: super: {
   hashable = dontCheck super.hashable;
 
   # Needs Cabal >= 1.18.x.
-  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_6; };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_1_18_1_7; };
 
   # Haddock chokes on the prologue from the cabal file.
   ChasingBottoms = dontHaddock super.ChasingBottoms;
@@ -83,9 +83,9 @@ self: super: {
   vector = self.vector_0_10_9_3;
 
   # These packages need more recent versions of core libraries to compile.
-  happy = addBuildTools super.happy [self.Cabal_1_18_1_6 self.containers_0_4_2_1];
-  network-uri = addBuildTool super.network-uri self.Cabal_1_18_1_6;
-  stm = addBuildTool super.stm self.Cabal_1_18_1_6;
+  happy = addBuildTools super.happy [self.Cabal_1_18_1_7 self.containers_0_4_2_1];
+  network-uri = addBuildTool super.network-uri self.Cabal_1_18_1_7;
+  stm = addBuildTool super.stm self.Cabal_1_18_1_7;
   split = super.split_0_1_4_3;
 
   # Needs hashable on pre 7.10.x compilers.
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
index a4f2d9b7ea7e..77735182d0e7 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.0.x.nix
@@ -47,7 +47,7 @@ self: super: {
   hashable = dontCheck super.hashable;
 
   # Newer versions don't compile.
-  Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
+  Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
   cabal-install = self.cabal-install_1_18_1_0;
 
   # https://github.com/peti/jailbreak-cabal/issues/9
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index b20572aa0b2b..9ba96214d6f2 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -45,7 +45,7 @@ self: super: {
   Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_0_1; process = self.process_1_2_3_0; };
 
   # Newer versions don't compile.
-  Cabal_1_18_1_6 = dontJailbreak super.Cabal_1_18_1_6;
+  Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
   cabal-install = self.cabal-install_1_18_1_0;
 
   # https://github.com/tibbe/hashable/issues/85

From ffabca8f92207455a3cd6cfdb64314779253b0f6 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 25 Jan 2016 12:14:40 +0100
Subject: [PATCH 0622/2285] haskell-hspec-core: disable test suite when
 building with GHC 8.0.x.

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

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index cc5034008bb6..d6603ce9c23f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -51,4 +51,7 @@ self: super: {
   # https://github.com/hspec/HUnit/issues/7
   HUnit = dontCheck super.HUnit;
 
+  # https://github.com/hspec/hspec/issues/253
+  hspec-core = dontCheck super.hspec-core;
+
 }

From 40b0b45fceea4f84ed563053bd85ff2c314142a4 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 27 Jan 2016 00:17:48 +0100
Subject: [PATCH 0623/2285] jailbreak-cabal: use native Cabal library with GHC
 8.0.x or later

---
 .../configuration-ghc-8.0.x.nix               |  7 +------
 .../configuration-ghc-head.nix                | 19 ++-----------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index d6603ce9c23f..118d9966b68e 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -35,12 +35,7 @@ self: super: {
   xhtml = null;
 
   # jailbreak-cabal can use the native Cabal library.
-  jailbreak-cabal = super.jailbreak-cabal.override {
-    Cabal = null;
-    mkDerivation = drv: self.mkDerivation (drv // {
-      preConfigure = "sed -i -e 's/Cabal == 1.20\\.\\*/Cabal >= 1.23/' jailbreak-cabal.cabal";
-    });
-  };
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
 
   # Older versions of QuickCheck don't support our version of Template Haskell.
   QuickCheck = self.QuickCheck_2_8_2;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix
index 2f1d9b24580a..559096ebd28d 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-head.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix
@@ -33,23 +33,8 @@ self: super: {
   unix = null;
   xhtml = null;
 
-  # Don't use jailbreak built with Cabal 1.22.x because of https://github.com/peti/jailbreak-cabal/issues/9.
-  Cabal_1_23_0_0 = overrideCabal super.Cabal_1_22_4_0 (drv: {
-    version = "1.23.0.0";
-    src = pkgs.fetchFromGitHub {
-      owner = "haskell";
-      repo = "cabal";
-      rev = "fe7b8784ac0a5848974066bdab76ce376ba67277";
-      sha256 = "1d70ryz1l49pkr70g8r9ysqyg1rnx84wwzx8hsg6vwnmg0l5am7s";
-    };
-    jailbreak = false;
-    doHaddock = false;
-    postUnpack = "sourceRoot+=/Cabal";
-  });
-  jailbreak-cabal = overrideCabal super.jailbreak-cabal (drv: {
-    executableHaskellDepends = [ self.Cabal_1_23_0_0 ];
-    preConfigure = "sed -i -e 's/Cabal == 1.20\\.\\*/Cabal >= 1.23/' jailbreak-cabal.cabal";
-  });
+  # jailbreak-cabal can use the native Cabal library.
+  jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
 
   # haddock: No input file(s).
   nats = dontHaddock super.nats;

From 4a48931bb7a068f1a132f65411bbb5b0b1557fc0 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 27 Jan 2016 00:28:19 +0100
Subject: [PATCH 0624/2285] Add LTS Haskell 5.0.

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index e6986a5b5498..a802623df8e9 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -334,5 +334,9 @@ rec {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-4.2.nix { };
     };
 
+    lts-5_0 = packages.ghc7103.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.0.nix { };
+    };
+
   };
 }

From 32f4fb1ef533e387603a72ac5e5475add4ee7e1c Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 26 Jan 2016 18:46:45 +0100
Subject: [PATCH 0625/2285] nfs-utils: 1.3.2 -> 1.3.3

A very noisy change log is available for download at:
http://sourceforge.net/projects/nfs/files/nfs-utils/1.3.3/1.3.3-Changelog/download
---
 pkgs/os-specific/linux/nfs-utils/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix
index 75f25e268042..0dde3bca4e47 100644
--- a/pkgs/os-specific/linux/nfs-utils/default.nix
+++ b/pkgs/os-specific/linux/nfs-utils/default.nix
@@ -3,11 +3,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nfs-utils-1.3.2"; # NOTE: when updating, remove the HACK BUG FIX below
+  name = "nfs-utils-1.3.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/nfs/${name}.tar.bz2";
-    sha256 = "1xwilpdr1vizq2yhpzxpwqqr9f8kn0dy2wcpc626mf30ybp7572v";
+    sha256 = "1svn27j5c873nixm46l111g7cgyaj5zd51ahfq8mx5v9m3vh93py";
   };
 
   buildInputs =
@@ -31,10 +31,6 @@ stdenv.mkDerivation rec {
         chmod +x "$i"
       done
       sed -i s,/usr/sbin,$out/sbin, utils/statd/statd.c
-
-      # HACK BUG FIX: needed for 1.3.2
-      # http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=commit;h=17a3e5bffb7110d46de1bf42b64b90713ff5ea50
-      sed -e 's,daemon_init(!,daemon_init(,' -i utils/statd/statd.c
     '';
 
   preBuild =

From fa247fa213be33c2ffd31419bde909457b261ded Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 27 Jan 2016 02:45:20 +0100
Subject: [PATCH 0626/2285] zstd: init at 0.4.7

---
 pkgs/tools/compression/zstd/default.nix | 45 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/tools/compression/zstd/default.nix

diff --git a/pkgs/tools/compression/zstd/default.nix b/pkgs/tools/compression/zstd/default.nix
new file mode 100644
index 000000000000..d60b4b3614a0
--- /dev/null
+++ b/pkgs/tools/compression/zstd/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchFromGitHub
+, legacySupport ? false }:
+
+stdenv.mkDerivation rec {
+  name = "zstd-${version}";
+  version = "0.4.7";
+
+  src = fetchFromGitHub {
+    sha256 = "09l917979qfqk44dbgsa9vs37a2qj4ga43553zcgvnps02wlja8s";
+    rev = "v${version}";
+    repo = "zstd";
+    owner = "Cyan4973";
+  };
+
+  # The Makefiles don't properly use file targets, but blindly rebuild
+  # all dependencies on every make invocation. So no nice phases. :-(
+  phases = [ "unpackPhase" "installPhase" "fixupPhase" ];
+
+  makeFlags = [
+    "ZSTD_LEGACY_SUPPORT=${if legacySupport then "1" else "0"}"
+  ];
+
+  installFlags = [
+    "PREFIX=$(out)"
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Zstandard real-time compression algorithm";
+    longDescription = ''
+      Zstd, short for Zstandard, is a fast lossless compression algorithm,
+      targeting real-time compression scenarios at zlib-level compression
+      ratio. Zstd can also offer stronger compression ratio at the cost of
+      compression speed. Speed/ratio trade-off is configurable by small
+      increment, to fit different situations. Note however that decompression
+      speed is preserved and remain roughly the same at all settings, a
+      property shared by most LZ compression algorithms, such as zlib. 
+    '';
+    homepage = http://www.zstd.net/;
+    # The licence of the CLI programme is GPLv2+, that of the library BSD-2.
+    license = with licenses; [ gpl2Plus bsd2 ];
+
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96f91be75052..9d5f304d756b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3759,6 +3759,8 @@ let
 
   zsh-navigation-tools = callPackage ../tools/misc/zsh-navigation-tools { };
 
+  zstd = callPackage ../tools/compression/zstd { };
+
   zsync = callPackage ../tools/compression/zsync { };
 
   zxing = callPackage ../tools/graphics/zxing {};

From de43878f0900056930b464f374f2515a6a39a492 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 27 Jan 2016 04:42:12 +0100
Subject: [PATCH 0627/2285] pagemon: init at 0.01.06

---
 pkgs/os-specific/linux/pagemon/default.nix | 38 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/os-specific/linux/pagemon/default.nix

diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix
new file mode 100644
index 000000000000..3c94362b820c
--- /dev/null
+++ b/pkgs/os-specific/linux/pagemon/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, ncurses }:
+
+stdenv.mkDerivation rec {
+  name = "pagemon-${version}";
+  version = "0.01.06";
+
+  src = fetchFromGitHub {
+    sha256 = "0p6mzmyjn5dq1ma9ld47gnrszyf0yph76dd5k7hl60a5zq5741aa";
+    rev = "V${version}";
+    repo = "pagemon";
+    owner = "ColinIanKing";
+  };
+
+  buildInputs = [ ncurses ];
+
+  makeFlags = [
+    "BINDIR=$(out)/bin"
+    "MANDIR=$(out)/share/man/man8"
+  ];
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Interactive memory/page monitor for Linux";
+    longDescription = ''
+      pagemon is an ncurses based interactive memory/page monitoring tool
+      allowing one to browse the memory map of an active running process
+      on Linux.
+      pagemon reads the PTEs of a given process and display the soft/dirty
+      activity in real time. The tool identifies the type of memory mapping
+      a page belongs to, so one can easily scan through memory looking at
+      pages of memory belonging data, code, heap, stack, anonymous mappings
+      or even swapped-out pages.
+    '';
+    license = licenses.gpl2Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d5f304d756b..5c6e584ca260 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10467,6 +10467,8 @@ let
 
   nss_ldap = callPackage ../os-specific/linux/nss_ldap { };
 
+  pagemon = callPackage ../os-specific/linux/pagemon { };
+
   pam = callPackage ../os-specific/linux/pam { };
 
   # pam_bioapi ( see http://www.thinkwiki.org/wiki/How_to_enable_the_fingerprint_reader )

From 367144768506a783aedb501ac2ce1e29d7412cb1 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 27 Jan 2016 04:59:51 +0100
Subject: [PATCH 0628/2285] bruteforce-luks: init at 1.2.0

---
 .../security/bruteforce-luks/default.nix      | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/tools/security/bruteforce-luks/default.nix

diff --git a/pkgs/tools/security/bruteforce-luks/default.nix b/pkgs/tools/security/bruteforce-luks/default.nix
new file mode 100644
index 000000000000..a28f949c7fdd
--- /dev/null
+++ b/pkgs/tools/security/bruteforce-luks/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, autoreconfHook, cryptsetup }:
+
+stdenv.mkDerivation rec {
+  name = "bruteforce-luks-${version}";
+  version = "1.2.0";
+
+  src = fetchFromGitHub {
+    sha256 = "0d01rn45dg7ysa75r8z0b31hj1z7w47vv5vr359pl71zxgzngjd2";
+    rev = version;
+    repo = "bruteforce-luks";
+    owner = "glv2";
+  };
+
+  nativeBuildInputs = [ autoreconfHook ];
+  buildInputs = [ cryptsetup ];
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    inherit (src.meta) homepage;
+    description = "Cracks passwords of LUKS encrypted volumes";
+    longDescription = ''
+      The program tries to decrypt at least one of the key slots by trying
+      all the possible passwords. It is especially useful if you know
+      something about the password (i.e. you forgot a part of your password but
+      still remember most of it). Finding the password of a volume without
+      knowing anything about it would take way too much time (unless the
+      password is really short and/or weak). It can also use a dictionary.
+    '';
+    license = licenses.gpl3Plus;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c6e584ca260..1848c35737b5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -740,6 +740,8 @@ let
   };
   bro = callPackage ../applications/networking/ids/bro { };
 
+  bruteforce-luks = callPackage ../tools/security/bruteforce-luks { };
+
   bsod = callPackage ../misc/emulators/bsod { };
 
   btrfs-progs = callPackage ../tools/filesystems/btrfs-progs { };

From e1a734cee22049a911dae7f0cf54371b68745d5e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 27 Jan 2016 10:29:38 +0300
Subject: [PATCH 0629/2285] libva: fix likely problem on Darwin

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

diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index 42ce11c7b4d2..e8de6ac284eb 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -1,8 +1,10 @@
-{ stdenv, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi
+{ stdenv, lib, fetchurl, libX11, pkgconfig, libXext, libdrm, libXfixes, wayland, libffi
 , mesa_noglu ? null
 }:
 
-stdenv.mkDerivation rec {
+let
+  withMesa = mesa_noglu != null;
+in stdenv.mkDerivation rec {
   name = "libva-1.6.2";
 
   src = fetchurl {
@@ -12,14 +14,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libX11 libXext pkgconfig libdrm libXfixes wayland libffi mesa_noglu ];
 
-  configureFlags = stdenv.lib.optionals (mesa_noglu != null) [
+  configureFlags = lib.optionals withMesa [
     "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri"
     "--enable-glx"
   ];
 
-  installFlags = [ "DESTDIR=$(out)" ];
+  installFlags = lib.optional withMesa "DESTDIR=$(out)";
 
-  postInstall = ''
+  postInstall = lib.optionalString withMesa ''
     cp -r $out/${mesa_noglu.driverLink}/* $out
     cp -r $out/$out/* $out
     rm -rf $out/run $out/$(echo "$out" | cut -d "/" -f2)

From c24c15374357c256c8aa8a94c0418008b4e0950b Mon Sep 17 00:00:00 2001
From: Michael Fellinger <m.fellinger@gmail.com>
Date: Mon, 25 Jan 2016 17:51:15 +0100
Subject: [PATCH 0630/2285] Add Ruby 2.3.0 package

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

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index e5e17e142f41..4ffef385a0db 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -255,4 +255,16 @@ in {
       git = "1ssq3c23ay57ypfis47y2n817hfmb71w0xrdzp57j6bv12jqmgrx";
     };
   };
+
+  ruby_2_3_0 = generic {
+    majorVersion = "2";
+    minorVersion = "3";
+    teenyVersion = "0";
+    patchLevel = "0";
+    sha256 = {
+      # src = "1ssq3c23ay57ypfis47y2n817hfmb71w0xrdzp57j6bv12jqmgrx";
+      src = "01z5cya4a7y751d4pb3aak5qcwmmvnwkbgz9z171p8hsbw7acnxs";
+      git = "0nl0pp96m0jxi422mqx09jqn9bff90pzz0xxa0ikrx7by0g00npg";
+    };
+  };
 }
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index 286301dc0a5d..18e2ab9231ad 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -141,4 +141,9 @@ rec {
     "${patchSet}/patches/ruby/2.2.3/railsexpress/02-improve-gc-stats.patch"
     "${patchSet}/patches/ruby/2.2.3/railsexpress/03-display-more-detailed-stack-trace.patch"
   ];
+  "2.3.0" = ops useRailsExpress [
+    "${patchSet}/patches/ruby/2.3.0/railsexpress/01-skip-broken-tests.patch"
+    "${patchSet}/patches/ruby/2.3.0/railsexpress/02-improve-gc-stats.patch"
+    "${patchSet}/patches/ruby/2.3.0/railsexpress/03-display-more-detailed-stack-trace.patch"
+  ];
 }
diff --git a/pkgs/development/interpreters/ruby/rvm-patchsets.nix b/pkgs/development/interpreters/ruby/rvm-patchsets.nix
index f12402f0a0b7..238a70b5d807 100644
--- a/pkgs/development/interpreters/ruby/rvm-patchsets.nix
+++ b/pkgs/development/interpreters/ruby/rvm-patchsets.nix
@@ -3,6 +3,6 @@
 fetchFromGitHub {
   owner  = "skaes";
   repo   = "rvm-patchsets";
-  rev    = "8ccf24490fec2218374734520c27d925078096de";
-  sha256 = "88418484d2d3963975190836eafb2e28206e3e2bac9ee7c6208645bfe7428e2f";
+  rev    = "84d0634ce5639781c4d8e9396ec20341d6524901";
+  sha256 = "06x2r43i8kpcmk6s5idrc3z49p8vy18b2lsh1jdqla69i5z2vqlf";
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1848c35737b5..8bcfa213ab01 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5363,14 +5363,16 @@ let
     ruby_1_9_3
     ruby_2_0_0
     ruby_2_1_0 ruby_2_1_1 ruby_2_1_2 ruby_2_1_3 ruby_2_1_6 ruby_2_1_7
-    ruby_2_2_0 ruby_2_2_2 ruby_2_2_3;
+    ruby_2_2_0 ruby_2_2_2 ruby_2_2_3
+    ruby_2_3_0;
 
   # Ruby aliases
-  ruby = ruby_2_2;
+  ruby = ruby_2_3;
   ruby_1_9 = ruby_1_9_3;
   ruby_2_0 = ruby_2_0_0;
   ruby_2_1 = ruby_2_1_7;
   ruby_2_2 = ruby_2_2_3;
+  ruby_2_3 = ruby_2_3_0;
 
   rubygems = hiPrio (callPackage ../development/interpreters/ruby/rubygems.nix {});
 

From dbc58b6eef5a0e198ab31319554e76db55f9c7a0 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Wed, 27 Jan 2016 10:22:57 +0100
Subject: [PATCH 0631/2285] git-latexdiff: init at 1.1.2

---
 .../typesetting/git-latexdiff/default.nix     | 36 +++++++++++++++++++
 .../typesetting/git-latexdiff/shebang.patch   | 10 ++++++
 .../git-latexdiff/version-test.patch          | 17 +++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 4 files changed, 65 insertions(+)
 create mode 100644 pkgs/tools/typesetting/git-latexdiff/default.nix
 create mode 100644 pkgs/tools/typesetting/git-latexdiff/shebang.patch
 create mode 100644 pkgs/tools/typesetting/git-latexdiff/version-test.patch

diff --git a/pkgs/tools/typesetting/git-latexdiff/default.nix b/pkgs/tools/typesetting/git-latexdiff/default.nix
new file mode 100644
index 000000000000..76536190f345
--- /dev/null
+++ b/pkgs/tools/typesetting/git-latexdiff/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitLab, git, bash }:
+
+stdenv.mkDerivation rec {
+  version = "1.1.2";
+  name = "git-latexdiff-${version}";
+
+  src = fetchFromGitLab {
+    sha256 = "1alnrjcf3f1qv7fk8h9yachmdz7mjgcynlgsvchfgcb2cpdavxjg";
+    rev = "v${version}";
+    repo = "git-latexdiff";
+    owner = "git-latexdiff";
+  };
+
+  buildInputs = [ git bash ];
+
+  dontBuild = true;
+
+  patches = [ ./shebang.patch ./version-test.patch ];
+
+  postPatch = ''
+    substituteInPlace git-latexdiff \
+      --replace "@GIT_LATEXDIFF_VERSION@" "v${version}"
+  '';
+
+  installPhase = ''
+    mkdir -p $prefix/bin
+    mv git-latexdiff $prefix/bin
+    chmod +x $prefix/bin/git-latexdiff
+  '';
+
+  meta = with stdenv.lib; {
+    description = "View diff on LaTeX source files on the generated PDF files";
+    maintainers = [ maintainers.DamienCassou ];
+    license = licenses.free; # https://gitlab.com/git-latexdiff/git-latexdiff/issues/9
+  };
+}
diff --git a/pkgs/tools/typesetting/git-latexdiff/shebang.patch b/pkgs/tools/typesetting/git-latexdiff/shebang.patch
new file mode 100644
index 000000000000..1d6d27c6e310
--- /dev/null
+++ b/pkgs/tools/typesetting/git-latexdiff/shebang.patch
@@ -0,0 +1,10 @@
+Fix for https://gitlab.com/git-latexdiff/git-latexdiff/issues/8
+---
+--- src/git-latexdiff	2016-01-26 14:04:54.338568955 +0100
++++ src/git-latexdiff	2016-01-26 14:40:23.700381943 +0100
+@@ -1,4 +1,4 @@
+-#! /bin/bash
++#!/usr/bin/env bash
+ 
+ # Main author: Matthieu Moy <Matthieu.Moy@imag.fr> (2012 - 2015)
+ # (See the Git history for other contributors)
diff --git a/pkgs/tools/typesetting/git-latexdiff/version-test.patch b/pkgs/tools/typesetting/git-latexdiff/version-test.patch
new file mode 100644
index 000000000000..e116bbd2c24d
--- /dev/null
+++ b/pkgs/tools/typesetting/git-latexdiff/version-test.patch
@@ -0,0 +1,17 @@
+Fix for https://gitlab.com/git-latexdiff/git-latexdiff/issues/7
+---
+--- src/git-latexdiff	2016-01-26 14:04:54.338568955 +0100
++++ src/git-latexdiff	2016-01-26 14:40:23.700381943 +0100
+@@ -44,11 +44,7 @@
+ git_latexdiff_version='@GIT_LATEXDIFF_VERSION@'
+ 
+ git_latexdiff_compute_version () {
+-    if [ "$git_latexdiff_version" = '@GIT_LATEXDIFF_VERSION@' ]; then
+-	(cd "$(dirname "$0")" && git describe --tags HEAD 2>/dev/null || echo 'Unknown version')
+-    else
+-	echo "$git_latexdiff_version"
+-    fi
++    echo "$git_latexdiff_version"
+ }
+ 
+ usage () {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c283e4acb10..09b4b337703e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1640,6 +1640,8 @@ let
 
   gitlab-git-http-server = callPackage ../applications/version-management/gitlab-git-http-server { };
 
+  git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { };
+
   glusterfs = callPackage ../tools/filesystems/glusterfs { };
 
   glmark2 = callPackage ../tools/graphics/glmark2 { };

From b493be1bd45de270868b9ab877a841b352457710 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Wed, 27 Jan 2016 07:30:50 -0200
Subject: [PATCH 0632/2285] Mednafen: 0.9.38.6 -> 0.9.38.7

---
 pkgs/misc/emulators/mednafen/default.nix | 6 +++---
 pkgs/misc/emulators/mednafen/server.nix  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix
index ba26c44305bd..148c8380d8ca 100644
--- a/pkgs/misc/emulators/mednafen/default.nix
+++ b/pkgs/misc/emulators/mednafen/default.nix
@@ -6,12 +6,11 @@
 
 stdenv.mkDerivation rec {
 
-  name = "mednafen-${version}";
-  version = "0.9.38.6";
+  name = "mednafen-${meta.version}";
 
   src = fetchurl {
     url = "http://mednafen.fobby.net/releases/files/${name}.tar.bz2";
-    sha256 = "0ivy0vqy1cjd5namn4bdm9ambay6rdccjl9x5418mjyqdhydlq4l";
+    sha256 = "1n6y7b86sv11vd6rv8if3wr4qyihkjai9km1s4smqcisi3pvxcqv";
   };
 
   buildInputs = with stdenv.lib;
@@ -26,6 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    version = "0.9.38.7";
     description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator";
     homepage = http://mednafen.sourceforge.net/;
     license = licenses.gpl2;
diff --git a/pkgs/misc/emulators/mednafen/server.nix b/pkgs/misc/emulators/mednafen/server.nix
index 60e458222d3c..3854caf22423 100644
--- a/pkgs/misc/emulators/mednafen/server.nix
+++ b/pkgs/misc/emulators/mednafen/server.nix
@@ -2,11 +2,10 @@
 
 stdenv.mkDerivation rec {
 
-  name = "mednafen-server-${version}";
-  version = "0.5.2";
+  name = "mednafen-server-${meta.version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/mednafen/Mednafen-Server/${version}/${name}.tar.gz";
+    url = "http://mednafen.fobby.net/releases/files/${name}.tar.gz";
     sha256="06fal6hwrb8gw94yp7plhcz55109128cgp35m7zs5vvjf1zfhcs9";
   };
 
@@ -16,6 +15,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    version = "0.5.2";
     description = "Netplay server for Mednafen";
     homepage = http://mednafen.sourceforge.net/;
     license = licenses.gpl2;

From dc4a9dcfc577c6dc22fea253360058d7228a5988 Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Wed, 27 Jan 2016 22:48:50 +1300
Subject: [PATCH 0633/2285] deis: 1.10.0 -> 1.12.2

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index a519233e3af0..0493ae92c56f 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -610,10 +610,10 @@ let
   };
 
   deis = buildFromGitHub {
-    rev = "v1.10.0";
+    rev = "v1.12.2";
     owner = "deis";
     repo = "deis";
-    sha256 = "0qji0dcfqgvjrfn5fjagjib606n24iy9qank2ckh202s75rxx5w9";
+    sha256 = "03lznzcij3gn08kqj2p6skifcdv5aw09dm6zxgvqw7nxx2n1j2ib";
     subPackages = [ "client" ];
     buildInputs = [ docopt-go crypto yaml-v2 ];
     postInstall = ''

From 07049a7edf7dc5151cd5f1c7b82e2777bc47cb25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 25 Jan 2016 09:14:16 +0100
Subject: [PATCH 0634/2285] python generic builder: fix typos

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

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 902dd50fbbf8..dab20b2f7447 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -112,7 +112,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] //
   postFixup = attrs.postFixup or ''
     wrapPythonPrograms
 
-    # check if we have two packagegs with the same name in closure and fail
+    # 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}
   '';
@@ -135,7 +135,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] //
   } // meta // {
     # add extra maintainer(s) to every package
     maintainers = (meta.maintainers or []) ++ [ chaoflow iElectric ];
-    # a marker for release utilies to discover python packages
+    # a marker for release utilities to discover python packages
     isBuildPythonPackage = python.meta.platforms;
   };
 })

From 10478adc6beb2978d51ab860c1a2d2a3b7c84eee Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 25 Jan 2016 09:49:28 +0100
Subject: [PATCH 0635/2285] pythonPackages.aiodns: 1.0.0 -> 1.0.1, fix test
 runner

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8a4e29cd266c..4817666884b2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -377,18 +377,18 @@ in modules // {
 
   aiodns = buildPythonPackage rec {
     name = "aiodns-${version}";
-    version = "1.0.0";
+    version = "1.0.1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/a/aiodns/${name}.tar.gz";
-      sha256 = "95140e4d2b67ee16dfbf357d9b54d7453b58f1732e81f869a1803a3ba3773b0d";
+      sha256 = "595b78b8d54115d937cf60d778c02dad76b6f789fd527dab308f99e5601e7f3d";
     };
 
     propagatedBuildInputs = with self; [ pycares ] ++ optional isPy33 asyncio ++ optional (isPy26 || isPy27 || isPyPy) trollius;
 
-    # Tests are not distributed
-    # https://github.com/saghul/aiodns/issues/13
-    doCheck = false;
+    checkPhase = ''
+      ${python.interpreter} tests.py
+    '';
 
     meta = {
       homepage = http://github.com/saghul/aiodns;

From 38f83390b6303d78552e86e6778cb6cadaa4eaac Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 25 Jan 2016 14:39:36 +0100
Subject: [PATCH 0636/2285] pythonPackages.pycparser: disable tests 3.5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4817666884b2..0873134e966f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3843,8 +3843,8 @@ in modules // {
       sha256 = "7959b4a74abdc27b312fed1c21e6caf9309ce0b29ea86b591fd2e99ecdf27f73";
     };
 
-    # Unsupported
-    disabled = isPy35;
+    # 3.5 is not supported but has been working fine
+    doCheck = !isPy35;
 
     meta = {
       description = "C parser in Python";

From e78dcf77ef60070f7dd1ca6cb1d55b2f83116455 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 25 Jan 2016 14:40:35 +0100
Subject: [PATCH 0637/2285] pythonPackages.sounddevice: init at 0.3.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0873134e966f..72df33ab673c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18953,6 +18953,32 @@ in modules // {
     };
   };
 
+  sounddevice = buildPythonPackage rec {
+    name = "sounddevice-${version}";
+    version = "0.3.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/s/sounddevice/${name}.tar.gz";
+      sha256 = "8e5a6816b369c7aea77e06092b2fee99c8b6efbeef4851f53ea3cb208a7607f5";
+    };
+
+    propagatedBuildInputs = with self; [ cffi numpy pkgs.portaudio ];
+
+    # No tests included nor upstream available.
+    doCheck = false;
+
+    prePatch = ''
+      substituteInPlace sounddevice.py --replace "'portaudio'" "'${pkgs.portaudio}/lib/libportaudio.so.2'"
+    '';
+
+    meta = {
+      description = "Play and Record Sound with Python";
+      homepage = http://python-sounddevice.rtfd.org/;
+      license = with licenses; [ mit ];
+      maintainers = with maintainers; [ fridh ];
+    };
+  };
+
   stevedore = buildPythonPackage rec {
     name = "stevedore-1.7.0";
 

From 2ee23ca8f82f155d1a61dd2c5c4bfc4d6a756f0c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 25 Jan 2016 18:53:50 +0100
Subject: [PATCH 0638/2285] pythonPackages.bedup: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 72df33ab673c..6540f3167c4c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1633,6 +1633,9 @@ in modules // {
     propagatedBuildInputs = with self; [ contextlib2 pyxdg pycparser alembic ]
       ++ optionals (!isPyPy) [ cffi ];
 
+    # No proper test suite. Included tests cannot be run because of relative import
+    doCheck = false;
+
     meta = {
       description = "Deduplication for Btrfs";
       longDescription = ''

From 57a2defad2495c4fbbb2f99251eb3451bdec56c3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 25 Jan 2016 18:55:47 +0100
Subject: [PATCH 0639/2285] pythonPackages.aiodns: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6540f3167c4c..c3108365a612 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -390,6 +390,9 @@ in modules // {
       ${python.interpreter} tests.py
     '';
 
+    # 'Could not contact DNS servers'
+    doCheck = false;
+
     meta = {
       homepage = http://github.com/saghul/aiodns;
       license = licenses.mit;

From 93f62fcf0b02a547424c8d4ea2c5e0998dd68ecb Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 25 Jan 2016 19:04:18 +0100
Subject: [PATCH 0640/2285] pythonPackages.xkcdpass: disable tests

---
 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 c3108365a612..0a6255c024f5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24760,6 +24760,11 @@ in modules // {
       url = "https://pypi.python.org/packages/source/x/xkcdpass/xkcdpass-1.4.2.tar.gz";
       sha256 = "4c1f8bee886820c42ccc64c15c3a2275dc6d01028cf6af7c481ded87267d8269";
     };
+
+    # No tests included
+    # https://github.com/redacted/XKCD-password-generator/issues/32
+    doCheck = false;
+
     meta = {
       homepage = https://pypi.python.org/pypi/xkcdpass/;
       description = "Generate secure multiword passwords/passphrases, inspired by XKCD";

From ef4f65293bf859e1105699d204c49b0415a9c0d0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 25 Jan 2016 19:09:38 +0100
Subject: [PATCH 0641/2285] pythonPackages.youtube-dl: disable tests

---
 pkgs/tools/misc/youtube-dl/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 09328c8d8aba..8baa5cc91740 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -11,7 +11,8 @@
 
 buildPythonPackage rec {
 
-  name = "youtube-dl-2016.01.01";
+  name = "youtube-dl-${version}";
+  version = "2016.01.01";
 
   src = fetchurl {
     url = "http://yt-dl.org/downloads/${stdenv.lib.getVersion name}/${name}.tar.gz";
@@ -24,6 +25,9 @@ buildPythonPackage rec {
   postInstall = stdenv.lib.optionalString (ffmpeg != null)
     ''wrapProgram $out/bin/youtube-dl --prefix PATH : "${ffmpeg}/bin"'';
 
+  # Requires network
+  doCheck = false;
+
   meta = with stdenv.lib; {
     homepage = http://rg3.github.io/youtube-dl/;
     repositories.git = https://github.com/rg3/youtube-dl.git;

From 063f5e3d0bcaf19f1853ea72d44ce3ae83aa9612 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 27 Jan 2016 06:26:14 -0600
Subject: [PATCH 0642/2285] remove autonix

---
 pkgs/build-support/autonix/default.nix | 136 -------------------------
 pkgs/build-support/autonix/manifest.sh |  44 --------
 pkgs/top-level/all-packages.nix        |   2 -
 3 files changed, 182 deletions(-)
 delete mode 100644 pkgs/build-support/autonix/default.nix
 delete mode 100755 pkgs/build-support/autonix/manifest.sh

diff --git a/pkgs/build-support/autonix/default.nix b/pkgs/build-support/autonix/default.nix
deleted file mode 100644
index 1f71d2cbb3bb..000000000000
--- a/pkgs/build-support/autonix/default.nix
+++ /dev/null
@@ -1,136 +0,0 @@
-{ pkgs }:
-
-let inherit (pkgs) bash coreutils findutils nix wget;
-    inherit (pkgs) callPackage fetchurl runCommand stdenv substituteAll writeText;
-in
-
-/* autonix is a collection of tools to automate packaging large collections
- * of software, particularly KDE. It consists of three components:
- *   1. a script (manifest) to download and hash the packages
- *   2. a dependency scanner (autonix-deps) written in Haskell that examines
- *      the package sources and tries to guess their dependencies
- *   3. a library of Nix routines (generateCollection) to generate Nix
- *      expressions from the output of the previous steps.
- */
-
-let inherit (stdenv) lib; in
-
-let
-
-  resolveDeps = scope: deps:
-    let resolve = dep:
-          let res = scope."${dep}" or [];
-          in if lib.isList res then res else [res];
-    in lib.concatMap resolve deps;
-
-in rec {
-
-  /* Download the packages into the Nix store, compute their hashes,
-   * and generate a package manifest in ./manifest.nix.
-   */
-  manifest =
-    let
-      script =
-        substituteAll
-          {
-            src = ./manifest.sh;
-            inherit bash coreutils findutils nix wget;
-          };
-    in
-      runCommand "autonix-manifest" {}
-        ''
-          cp ${script} $out
-          chmod +x $out
-        '';
-
-  mkPackage = callPackage: defaultOverride: name: pkg: let drv =
-    { mkDerivation, fetchurl, scope }:
-
-    mkDerivation (defaultOverride {
-      inherit (pkg) name;
-
-      src = fetchurl pkg.src;
-
-      buildInputs = resolveDeps scope pkg.buildInputs;
-      nativeBuildInputs = resolveDeps scope pkg.nativeBuildInputs;
-      propagatedBuildInputs = resolveDeps scope pkg.propagatedBuildInputs;
-      propagatedNativeBuildInputs =
-        resolveDeps scope pkg.propagatedNativeBuildInputs;
-      propagatedUserEnvPkgs = resolveDeps scope pkg.propagatedUserEnvPkgs;
-
-      enableParallelBuilding = true;
-    });
-  in callPackage drv {};
-
-  renameDeps = renames: lib.mapAttrs (name: pkg:
-    let breakCycles = lib.filter (dep: dep != name);
-        rename = dep: renames."${dep}" or dep;
-    in pkg // {
-      buildInputs = breakCycles (map rename pkg.buildInputs);
-      nativeBuildInputs = breakCycles (map rename pkg.nativeBuildInputs);
-      propagatedBuildInputs = breakCycles (map rename pkg.propagatedBuildInputs);
-      propagatedNativeBuildInputs =
-        breakCycles (map rename pkg.propagatedNativeBuildInputs);
-      propagatedUserEnvPkgs = breakCycles (map rename pkg.propagatedUserEnvPkgs);
-    });
-
-  propagateDeps = propagated: lib.mapAttrs (name: pkg:
-    let isPropagated = dep: lib.elem dep propagated;
-        isNotPropagated = dep: !(isPropagated dep);
-    in pkg // {
-      buildInputs = lib.filter isNotPropagated pkg.buildInputs;
-      nativeBuildInputs = lib.filter isNotPropagated pkg.nativeBuildInputs;
-      propagatedBuildInputs =
-        pkg.propagatedBuildInputs
-        ++ lib.filter isPropagated pkg.buildInputs;
-      propagatedNativeBuildInputs =
-        pkg.propagatedNativeBuildInputs
-        ++ lib.filter isPropagated pkg.nativeBuildInputs;
-    });
-
-  nativeDeps = native: lib.mapAttrs (name: pkg:
-    let isNative = dep: lib.elem dep native;
-        isNotNative = dep: !(isNative dep);
-    in pkg // {
-      buildInputs = lib.filter isNotNative pkg.buildInputs;
-      nativeBuildInputs =
-        pkg.nativeBuildInputs
-        ++ lib.filter isNative pkg.buildInputs;
-      propagatedBuildInputs = lib.filter isNotNative pkg.propagatedBuildInputs;
-      propagatedNativeBuildInputs =
-        pkg.propagatedNativeBuildInputs
-        ++ lib.filter isNative pkg.propagatedBuildInputs;
-    });
-
-  userEnvDeps = user: lib.mapAttrs (name: pkg:
-    let allDeps = with pkg; lib.concatLists [
-          buildInputs
-          nativeBuildInputs
-          propagatedBuildInputs
-          propagatedNativeBuildInputs
-        ];
-    in assert (lib.isList allDeps); pkg // {
-      propagatedUserEnvPkgs = lib.filter (dep: lib.elem dep user) allDeps;
-    });
-
-  overrideDerivation = pkg: f: pkg.override (super: super // {
-    mkDerivation = drv: super.mkDerivation (drv // f drv);
-  });
-
-  extendDerivation = pkg: attrs:
-    let mergeAttrBy = lib.mergeAttrBy // {
-          propagatedNativeBuildInputs = a: b: a ++ b;
-          NIX_CFLAGS_COMPILE = a: b: "${a} ${b}";
-          cmakeFlags = a: b: a ++ b;
-        };
-        mergeAttrsByFunc = sets:
-          let merged = lib.foldl lib.mergeAttrByFunc { inherit mergeAttrBy; } sets;
-          in builtins.removeAttrs merged ["mergeAttrBy"];
-    in overrideDerivation pkg (drv: mergeAttrsByFunc [ drv attrs ]);
-
-  overrideScope = pkg: fnOrSet: pkg.override (super: super // {
-    scope = if builtins.isFunction fnOrSet
-              then super.scope // fnOrSet super.scope
-            else super.scope // fnOrSet;
-  });
-}
diff --git a/pkgs/build-support/autonix/manifest.sh b/pkgs/build-support/autonix/manifest.sh
deleted file mode 100755
index 5be69cc6175b..000000000000
--- a/pkgs/build-support/autonix/manifest.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!@bash@/bin/bash
-
-@coreutils@/bin/mkdir tmp; cd tmp
-
-@wget@/bin/wget -nH -r -c --no-parent $*
-
-cat >../manifest.json <<EOF
-[
-EOF
-
-workdir=$(pwd)
-sep=""
-
-@findutils@/bin/find . | while read path; do
-    if [[ -f "${path}" ]]; then
-        [[ -n "${sep}" ]] && echo "$sep" >>../manifest.json
-        url="${path:2}"
-        # Sanitize file name
-        filename=$(@coreutils@/bin/basename "${path}" | tr '@' '_')
-        nameversion="${filename%.tar.*}"
-        name="${nameversion%-*}"
-        dirname=$(@coreutils@/bin/dirname "${path}")
-        mv "${workdir}/${path}" "${workdir}/${dirname}/${filename}"
-        # Prefetch and hash source file
-        sha256=$(@nix@/bin/nix-prefetch-url "file://${workdir}/${dirname}/${filename}")
-        store=$(@nix@/bin/nix-store --print-fixed-path sha256 "$sha256" "$filename")
-        cat >>../manifest.json <<EOF
-  {
-    "name": "${nameversion}",
-    "store": "${store}",
-    "src": {
-      "url": "${url}",
-      "sha256": "${sha256}",
-      "name": "${filename}"
-    }
-  }
-EOF
-        sep=","
-    fi
-done
-
-echo "]" >>../manifest.json
-
-cd ..
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5582341a9b10..ccabbaa7bd9f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -255,8 +255,6 @@ let
     theAttrSet = arg;
   };
 
-  autonix = import ../build-support/autonix { inherit pkgs; };
-
   autoreconfHook = makeSetupHook
     { substitutions = { inherit autoconf automake gettext libtool; }; }
     ../build-support/setup-hooks/autoreconf.sh;

From c5c3082e4e149fa04db5f4f5027d9be1e626c9ee Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 27 Jan 2016 06:29:19 -0600
Subject: [PATCH 0643/2285] kde5.plasma: 5.5.3 -> 5.5.4

---
 pkgs/desktops/plasma-5.5/fetchsrcs.sh |   2 +-
 pkgs/desktops/plasma-5.5/srcs.nix     | 304 +++++++++++++-------------
 2 files changed, 153 insertions(+), 153 deletions(-)

diff --git a/pkgs/desktops/plasma-5.5/fetchsrcs.sh b/pkgs/desktops/plasma-5.5/fetchsrcs.sh
index 7d80ec7890d6..714e0fc75097 100755
--- a/pkgs/desktops/plasma-5.5/fetchsrcs.sh
+++ b/pkgs/desktops/plasma-5.5/fetchsrcs.sh
@@ -4,7 +4,7 @@
 set -x
 
 # The trailing slash at the end is necessary!
-RELEASE_URL="http://download.kde.org/stable/plasma/5.5.3/"
+RELEASE_URL="http://download.kde.org/stable/plasma/5.5.4/"
 EXTRA_WGET_ARGS='-A *.tar.xz'
 
 mkdir tmp; cd tmp
diff --git a/pkgs/desktops/plasma-5.5/srcs.nix b/pkgs/desktops/plasma-5.5/srcs.nix
index a96450b482db..3b63c864045d 100644
--- a/pkgs/desktops/plasma-5.5/srcs.nix
+++ b/pkgs/desktops/plasma-5.5/srcs.nix
@@ -3,307 +3,307 @@
 
 {
   bluedevil = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/bluedevil-5.5.3.tar.xz";
-      sha256 = "079bj1s86w9xycijs7imfwkhbg6k8sw22dh6p52q0kzsbz4sh7mk";
-      name = "bluedevil-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/bluedevil-5.5.4.tar.xz";
+      sha256 = "1r20dlsg83d3lrnbdb92cpd7h0s2fmh0vjv3xi5z6rf741463p14";
+      name = "bluedevil-5.5.4.tar.xz";
     };
   };
   breeze = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/breeze-5.5.3.tar.xz";
-      sha256 = "1kaw4mv86lw0igqhbl7v60k11s9az2cj14rs6yqrl96k2ki3931x";
-      name = "breeze-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/breeze-5.5.4.tar.xz";
+      sha256 = "0chlp5z5zz19rh9k4ffjr92hn07dmavfcwx0wwffy8qhiw6qw7w3";
+      name = "breeze-5.5.4.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/breeze-gtk-5.5.3.tar.xz";
-      sha256 = "0ph3n77s37rklcjmh5g9rj047hmiym6h4dn27zxmfnfybr52zfjv";
-      name = "breeze-gtk-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/breeze-gtk-5.5.4.tar.xz";
+      sha256 = "1r6ihmpgha1s4hvgr4jliqvbraw06fnaa4sjrhzqbx9dh00y5d8v";
+      name = "breeze-gtk-5.5.4.tar.xz";
     };
   };
   discover = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/discover-5.5.3.tar.xz";
-      sha256 = "0qhhgnjpwdir3y6i3z4cvfvgigbrmsblwkxhsafg015ralklgcnd";
-      name = "discover-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/discover-5.5.4.tar.xz";
+      sha256 = "0d5s8b9f5az40ajviijc67rz5l2345wlrqacjm4pdi8fqvxivb1v";
+      name = "discover-5.5.4.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kde-cli-tools-5.5.3.tar.xz";
-      sha256 = "0aw936amj3jigi3n8ldhlihmp4v9m7mbjbxlhp8s7643963f3n3w";
-      name = "kde-cli-tools-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kde-cli-tools-5.5.4.tar.xz";
+      sha256 = "1w9l8lh05k6xjdz0nccfygp76lp3wf3xa6pizmgv27wq21pw4wxy";
+      name = "kde-cli-tools-5.5.4.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kdecoration-5.5.3.tar.xz";
-      sha256 = "1lhzbk9bwn7biilqbk7n8dd453a7580n50571lyxxr6b7kfs6ikv";
-      name = "kdecoration-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kdecoration-5.5.4.tar.xz";
+      sha256 = "1ghgvg0lfjjlgl3a9ryw1y8aqihdwrkr7qjph4v3p9brlpqm5326";
+      name = "kdecoration-5.5.4.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kde-gtk-config-5.5.3.tar.xz";
-      sha256 = "0dk2gda8qc1mg8fra3lgb4mizl5q2bx8zx5j2w3r8gqrw2g6vk5v";
-      name = "kde-gtk-config-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kde-gtk-config-5.5.4.tar.xz";
+      sha256 = "062jgc2sqd93yz5n1z4n7h50k7zsiayi3z901y2rq0x62nndff1m";
+      name = "kde-gtk-config-5.5.4.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kdeplasma-addons-5.5.3.tar.xz";
-      sha256 = "0i2j5m51dlbrh54ndspk9zl4ggwpfampsbdjs6kzwisxa4ksyz1s";
-      name = "kdeplasma-addons-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kdeplasma-addons-5.5.4.tar.xz";
+      sha256 = "0yrrjkh632q3ns068j7avaf2rkn2n54sf594jyl30q5fxc22mhq1";
+      name = "kdeplasma-addons-5.5.4.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kgamma5-5.5.3.tar.xz";
-      sha256 = "0pm41wfihayp980z4zb5jdsh7qvyd93bql36jzicv8mmj2z7p3g4";
-      name = "kgamma5-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kgamma5-5.5.4.tar.xz";
+      sha256 = "0w63m1sxq2fa0wabyyry4prbzc2c54adc56hfhkh84rflccfbnc2";
+      name = "kgamma5-5.5.4.tar.xz";
     };
   };
   khelpcenter = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/khelpcenter-5.5.3.tar.xz";
-      sha256 = "0gazbv5z1145zv0d7zrm41byqs9blis2x6ij2yha7h8i0vf748rc";
-      name = "khelpcenter-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/khelpcenter-5.5.4.tar.xz";
+      sha256 = "01kw97p1xz2gghghykkv953bvypcyd080fxknjrzn4v9gl5mrjv0";
+      name = "khelpcenter-5.5.4.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/khotkeys-5.5.3.tar.xz";
-      sha256 = "0mmszjnwcza30b5npd6ddkj88g4zy3nhnpw7bdghz053cn1lb1m0";
-      name = "khotkeys-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/khotkeys-5.5.4.tar.xz";
+      sha256 = "1jlpzqrww2n9zf5cwlvpyvxcz0wv0cyln1xjhm49ayl5iin3m9yn";
+      name = "khotkeys-5.5.4.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kinfocenter-5.5.3.tar.xz";
-      sha256 = "1c5bbvkfmdizkmd4n0mqbg6mpixkxvmahprsrlczh4fyd12j1r00";
-      name = "kinfocenter-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kinfocenter-5.5.4.tar.xz";
+      sha256 = "10qhq76ha1mahpmgrj4kw660zf92k7ys3mz2dkiid7ib6gsimir4";
+      name = "kinfocenter-5.5.4.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kmenuedit-5.5.3.tar.xz";
-      sha256 = "1vihqqc431na4b29hliflcv61lhw1r43l0m4bficcy0l6xkmiyxz";
-      name = "kmenuedit-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kmenuedit-5.5.4.tar.xz";
+      sha256 = "0scsr3isf4d0hlk85pk0snn6j5cwm7qlqnl6iqs0df32g8ysirs6";
+      name = "kmenuedit-5.5.4.tar.xz";
     };
   };
   kscreen = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kscreen-5.5.3.tar.xz";
-      sha256 = "12r4k9ihlx62wgra7aw3pj5gjscg3jw1akkjrw9dkjy1vbpdxmpg";
-      name = "kscreen-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kscreen-5.5.4.tar.xz";
+      sha256 = "0ax67gqfjw59jk3wh3sflk3q10xqrjwf2qmvx6jky6q2x4kdixvv";
+      name = "kscreen-5.5.4.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kscreenlocker-5.5.3.tar.xz";
-      sha256 = "1crgnq6hwi7hy1yx2brs8hln57ib889ifz5ba72v9j4wk0439p49";
-      name = "kscreenlocker-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kscreenlocker-5.5.4.tar.xz";
+      sha256 = "18r53f5vri8xaj53zskadnxqxs60akxmwkq54xnb4lvg5cks9hrr";
+      name = "kscreenlocker-5.5.4.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/ksshaskpass-5.5.3.tar.xz";
-      sha256 = "14xlvbb411vc3rfkdfcyx7jdgdnaf9gwy6xd6bivvdlj9hq2nikb";
-      name = "ksshaskpass-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/ksshaskpass-5.5.4.tar.xz";
+      sha256 = "0hlgf7896qksivmf79ks0xcqndjvmmq13ywrkc0l43pcj50ydhj2";
+      name = "ksshaskpass-5.5.4.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/ksysguard-5.5.3.tar.xz";
-      sha256 = "1y5x3n1rqncnzvs7j1icb4k3i2254l5mvvw6rrr6ymd1mvl8h1hx";
-      name = "ksysguard-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/ksysguard-5.5.4.tar.xz";
+      sha256 = "1hbq8ppz9ijkk032aldrxyfwk1yrpjchfy6w6mg836bi8f69i1kc";
+      name = "ksysguard-5.5.4.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kwallet-pam-5.5.3.tar.xz";
-      sha256 = "0nlzrvdzf339pjcvm359brf0dmlx983gamjr75wm4277hhxwmphd";
-      name = "kwallet-pam-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kwallet-pam-5.5.4.tar.xz";
+      sha256 = "0cj9iq7ba24lccgj3h4fpa97bcm3lw3yz43hfhldiwdkzl1pydhl";
+      name = "kwallet-pam-5.5.4.tar.xz";
     };
   };
   kwayland = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kwayland-5.5.3.tar.xz";
-      sha256 = "0jmv4zphy2fb1pnkxcgsy1qcd926llqgqcdqn0kiwlxaznll0lnz";
-      name = "kwayland-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kwayland-5.5.4.tar.xz";
+      sha256 = "1cprg187h8pny86910m08pzyvknbcqa9x3xbqh7flrpw0rvrg5wp";
+      name = "kwayland-5.5.4.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kwayland-integration-5.5.3.tar.xz";
-      sha256 = "1yyp8vq6b544gbphpfcdayn1n0g4i3lyb5n1pnxb71nvv2j5ji95";
-      name = "kwayland-integration-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kwayland-integration-5.5.4.tar.xz";
+      sha256 = "07vv7gjqgmgn766p6nifn2i835rdhs6kvp24a5fqnh8ad24m8fjy";
+      name = "kwayland-integration-5.5.4.tar.xz";
     };
   };
   kwin = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kwin-5.5.3.tar.xz";
-      sha256 = "1hjgxm8l25vdc7zfv6kivgdwhbjvjfia7lqdsv8r4rf110f4an70";
-      name = "kwin-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kwin-5.5.4.tar.xz";
+      sha256 = "1015a0d3yi5b4isfkrl3w3mdslh0r1xyhvy9z8liz3wnxgrajwj8";
+      name = "kwin-5.5.4.tar.xz";
     };
   };
   kwrited = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/kwrited-5.5.3.tar.xz";
-      sha256 = "1bggps8icam3ngkzxz6hkf8r5slz4x25wd1c47651y8prvqdagx9";
-      name = "kwrited-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/kwrited-5.5.4.tar.xz";
+      sha256 = "01d8q3hj5frhmafsavgvyz2nlbd4ma4fsx12dhjyxqsgxdvvgffh";
+      name = "kwrited-5.5.4.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/libkscreen-5.5.3.tar.xz";
-      sha256 = "04gm7sqpij0mnivrhx7n2y0y1dpsffsvbn5l5l754q5bis6f182y";
-      name = "libkscreen-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/libkscreen-5.5.4.tar.xz";
+      sha256 = "15q7x844x8cz15b3mkh4lwygvrx66s0fl706b221p3my54n63ymf";
+      name = "libkscreen-5.5.4.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/libksysguard-5.5.3.tar.xz";
-      sha256 = "1p35agppwplfz396irdprsjgqjqpin4vbcigzylxflbvp7yp5sgl";
-      name = "libksysguard-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/libksysguard-5.5.4.tar.xz";
+      sha256 = "1irrb3im0gr8yhkp570bqipbqz8igpxr2k4kxb2c04111npkqmw1";
+      name = "libksysguard-5.5.4.tar.xz";
     };
   };
   milou = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/milou-5.5.3.tar.xz";
-      sha256 = "0sddp3x8hm5d300bxn2m6j0vvy49kw8hidqmc7yim5gvimipzn92";
-      name = "milou-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/milou-5.5.4.tar.xz";
+      sha256 = "0dc8jbk0yihqv5jxd4i12rmvfyyp63b6hx9q22qjrj5gkda1cddl";
+      name = "milou-5.5.4.tar.xz";
     };
   };
   oxygen = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/oxygen-5.5.3.tar.xz";
-      sha256 = "1rynv9scc4pm682imjc8w8czcf4yryzkwvsviyl86iqx1v14jydn";
-      name = "oxygen-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/oxygen-5.5.4.tar.xz";
+      sha256 = "10fjwk1aznpkrnal961kfwpjjil2iy2n0x96h26bh91l4insix1v";
+      name = "oxygen-5.5.4.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/plasma-desktop-5.5.3.tar.xz";
-      sha256 = "1w5bphy231722ly2f8ybpgdck0sbrlibjjxvkby2r2pynzsgbr0m";
-      name = "plasma-desktop-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/plasma-desktop-5.5.4.tar.xz";
+      sha256 = "0lkjgbqinxy40w6z01akpihljqpm7bachmxqmcp6fjnzawql2xqd";
+      name = "plasma-desktop-5.5.4.tar.xz";
     };
   };
   plasma-mediacenter = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/plasma-mediacenter-5.5.3.tar.xz";
-      sha256 = "15sisk0pyggrirfkvbq2qcy17m1jgxn43vznfnbzp8dp9yrz0wbv";
-      name = "plasma-mediacenter-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/plasma-mediacenter-5.5.4.tar.xz";
+      sha256 = "1rn7qffd11dljx1il7cw74wbqf4lwmmlcv19yxj08fdrp5ylqr8a";
+      name = "plasma-mediacenter-5.5.4.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/plasma-nm-5.5.3.tar.xz";
-      sha256 = "1ijqx0aphdhk5zffy4mnc1lbkkzdhj0qng0v4978kkxxjdq7g26q";
-      name = "plasma-nm-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/plasma-nm-5.5.4.tar.xz";
+      sha256 = "0bjfcsavrqx4i4c0ynfmdna7fnmabm8970h3dnx7ihwsqgjf5q31";
+      name = "plasma-nm-5.5.4.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/plasma-pa-5.5.3.tar.xz";
-      sha256 = "0hpdf9vhsys0jbv8fya2dqdnig8bvbnaxp01x0zwa59lxb6b3czf";
-      name = "plasma-pa-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/plasma-pa-5.5.4.tar.xz";
+      sha256 = "0d1cdixgxa2vsgv47hinh5nsbf2bln3ppdlrnzz9vglian0z7879";
+      name = "plasma-pa-5.5.4.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/plasma-sdk-5.5.3.tar.xz";
-      sha256 = "0cqg8a3gmmifgicca7fg559didqmr7hgpfybw7j8rlibsh8wdlk5";
-      name = "plasma-sdk-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/plasma-sdk-5.5.4.tar.xz";
+      sha256 = "0fdx4f8z00276s1p1v1bkbrhy59jswk2dj8kcj96r2rk3xzcg0ax";
+      name = "plasma-sdk-5.5.4.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/plasma-workspace-5.5.3.tar.xz";
-      sha256 = "0wpsmw1rbidr8fc4zcfp84h05gs6cfxcl6cn0azb8lc2zh3v4ja9";
-      name = "plasma-workspace-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/plasma-workspace-5.5.4.tar.xz";
+      sha256 = "0zh96qq0nl1c6bni7vnciba548f3cjacsi06n2rv05356j1fp87h";
+      name = "plasma-workspace-5.5.4.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/plasma-workspace-wallpapers-5.5.3.tar.xz";
-      sha256 = "1i1gysw489spvpbfr654yncf8yjpg29aggk21ykmmmyc2qpz1jxp";
-      name = "plasma-workspace-wallpapers-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/plasma-workspace-wallpapers-5.5.4.tar.xz";
+      sha256 = "0p111f95di11k4v19c1mg694c71825najmi8dzj2qrif5sb2vvsn";
+      name = "plasma-workspace-wallpapers-5.5.4.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.5.3";
+    version = "1-5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/polkit-kde-agent-1-5.5.3.tar.xz";
-      sha256 = "1hh3i0chc817bvxaydb2ak1wq65wzrqyj7dl3q1wl4l7a4yyh8ab";
-      name = "polkit-kde-agent-1-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/polkit-kde-agent-1-5.5.4.tar.xz";
+      sha256 = "116sj9s45n3qcgfsdz5hh6a73b0hldgcnxbpvi4320xpny316vh2";
+      name = "polkit-kde-agent-1-5.5.4.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/powerdevil-5.5.3.tar.xz";
-      sha256 = "0ilx44rhy0z8c0kv439nypr5rrs7wk30a1hnhdzssqbhc4d43kzy";
-      name = "powerdevil-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/powerdevil-5.5.4.tar.xz";
+      sha256 = "0i0i55g72yb9z8agv1yyrx98l3s0fs5wn51kz571vqqrw6m3wn7l";
+      name = "powerdevil-5.5.4.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/sddm-kcm-5.5.3.tar.xz";
-      sha256 = "0gijb75bzqih7h4m6r6kqg16p5l7rj4nb1cc959gqqkkqxghgfd0";
-      name = "sddm-kcm-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/sddm-kcm-5.5.4.tar.xz";
+      sha256 = "04vh4f2hg5584acb5ywf1i8z6lvz0fcs7zh085bm7pkx5l60l59b";
+      name = "sddm-kcm-5.5.4.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/systemsettings-5.5.3.tar.xz";
-      sha256 = "1wcbgs10shhgip1dxz80wxpgxifrcal863h6ygzpqwj9jb53dj7x";
-      name = "systemsettings-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/systemsettings-5.5.4.tar.xz";
+      sha256 = "1i7ljxsnwf2kwd05kzxirbyaxj3w5kyr0jq9j0iy3jlz97p4jkpv";
+      name = "systemsettings-5.5.4.tar.xz";
     };
   };
   user-manager = {
-    version = "5.5.3";
+    version = "5.5.4";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.3/user-manager-5.5.3.tar.xz";
-      sha256 = "1v421xfy089m6kj7x5175lvvsaqjk9y9zr7s33jsnhg8zd1hwwcm";
-      name = "user-manager-5.5.3.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.4/user-manager-5.5.4.tar.xz";
+      sha256 = "17lki4y77rq1n100p74q4n6sm3l5dxvv996wf4w1j2n2aiw89p4j";
+      name = "user-manager-5.5.4.tar.xz";
     };
   };
 }

From 7683f3e8eb46fd174f4949c4443a73b504e70068 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 27 Jan 2016 06:30:42 -0600
Subject: [PATCH 0644/2285] bluedevil: propagated bluez-qt

---
 pkgs/desktops/plasma-5.5/bluedevil.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/desktops/plasma-5.5/bluedevil.nix b/pkgs/desktops/plasma-5.5/bluedevil.nix
index d099e95a16b4..dc11ee170b35 100644
--- a/pkgs/desktops/plasma-5.5/bluedevil.nix
+++ b/pkgs/desktops/plasma-5.5/bluedevil.nix
@@ -16,6 +16,7 @@ plasmaPackage {
   propagatedBuildInputs = [
     bluez-qt ki18n kio kwindowsystem plasma-framework qtdeclarative
   ];
+  propagatedUserEnvPkgs = [ bluez-qt ];
   postInstall = ''
     wrapQtProgram "$out/bin/bluedevil-wizard"
     wrapQtProgram "$out/bin/bluedevil-sendfile"

From c53e932e5b77cea445cb4716768394ca5e04d4b7 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Sat, 5 Dec 2015 18:15:20 +0200
Subject: [PATCH 0645/2285] fvwm: Missing libXt build input

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

diff --git a/pkgs/applications/window-managers/fvwm/default.nix b/pkgs/applications/window-managers/fvwm/default.nix
index aded77a466da..77263293847c 100644
--- a/pkgs/applications/window-managers/fvwm/default.nix
+++ b/pkgs/applications/window-managers/fvwm/default.nix
@@ -1,7 +1,7 @@
 { gestures ? false
 , stdenv, fetchurl, pkgconfig
 , cairo, fontconfig, freetype, libXft, libXcursor, libXinerama
-, libXpm, librsvg, libpng, fribidi, perl
+, libXpm, libXt, librsvg, libpng, fribidi, perl
 , libstroke ? null
 }:
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     pkgconfig cairo fontconfig freetype
-    libXft libXcursor libXinerama libXpm
+    libXft libXcursor libXinerama libXpm libXt
     librsvg libpng fribidi perl
   ] ++ stdenv.lib.optional gestures libstroke;
 

From 61020943d1f8fcbffc39a5a9ee3b2357b1784e59 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Wed, 27 Jan 2016 15:33:50 +0200
Subject: [PATCH 0646/2285] syslog-ng: add explicit pcre build dependency

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

diff --git a/pkgs/tools/system/syslog-ng/default.nix b/pkgs/tools/system/syslog-ng/default.nix
index 4fcc0680ada6..d98f05c6aabb 100644
--- a/pkgs/tools/system/syslog-ng/default.nix
+++ b/pkgs/tools/system/syslog-ng/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, eventlog, pkgconfig, glib, python, systemd, perl
-, riemann_c_client, protobufc, yacc }:
+, riemann_c_client, protobufc, pcre, yacc }:
 
 stdenv.mkDerivation rec {
   name = "syslog-ng-${version}";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
     sha256 = "0qc21mwajk6xrra3gqy2nvaza5gq62psamq4ayphj7lqabdglizg";
   };
 
-  buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc ];
+  buildInputs = [ eventlog pkgconfig glib python systemd perl riemann_c_client protobufc yacc pcre ];
 
   configureFlags = [
     "--enable-dynamic-linking"

From 85f5394c5f822f03b61d5b9a0c62cd72b3e7fe93 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 27 Jan 2016 23:34:42 +0900
Subject: [PATCH 0647/2285] firefox-bin: 43.0.4 -> 44.0

---
 .../browsers/firefox-bin/sources.nix          | 358 +++++++++---------
 1 file changed, 179 insertions(+), 179 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index 14806cef25a1..bde8830145b7 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -4,185 +4,185 @@
 # ruby generate_sources.rb > sources.nix
 
 {
-  version = "43.0.4";
+  version = "44.0";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha256 = "88e62cbc7a46a4bdc9822a7155a7a92fd856472323fe93c2c6684262b8e71056"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha256 = "e0eb56995f078a72c0bcf8a38a68e3087ca6c229181d0ca75052d2b784acd6f3"; }
-    { locale = "af"; arch = "linux-i686"; sha256 = "826a7c46b08813698c6fc6cfa3faf8d8fb3c6bfa2d9126d2668f91f34fa5874a"; }
-    { locale = "af"; arch = "linux-x86_64"; sha256 = "74efde0018f1c0a0d8afab8a069c7dc2ace12a9c2e8ccc5021601aa472581ea1"; }
-    { locale = "an"; arch = "linux-i686"; sha256 = "bd7c8cd1473fa7b15905fc2a9aa5595a7ffe4e6a53a4c832dfbe3393236a2706"; }
-    { locale = "an"; arch = "linux-x86_64"; sha256 = "73e97be9965dea6416d88b7edb609ed1c7cecbb48c363370dec68854ebcc2b05"; }
-    { locale = "ar"; arch = "linux-i686"; sha256 = "30fbc1adfda1487093ed3ca3571bc4c02132b8fd65a67c937e10d5a53fffe2c5"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha256 = "5c7b899f37cd894b79c74e95c03e131e8809fd147316d21ac5d9e0165840bdbb"; }
-    { locale = "as"; arch = "linux-i686"; sha256 = "2dc43867cd934830c79050e2080570e86fe63ab9ce80252599a7ac29ef21408a"; }
-    { locale = "as"; arch = "linux-x86_64"; sha256 = "73c6712729087bbebc335e631505dca89fbfc9eedf6fcec220f66f50e013f938"; }
-    { locale = "ast"; arch = "linux-i686"; sha256 = "3b76e984e74737f0bd22e10c017bbfc3ff9346a9bf83ec09d959cdc0c5b4c36c"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha256 = "2b9b732d19498b78c72d8f0bcf0852c7d209c3a3e0c891fbef6be753e39bc9a3"; }
-    { locale = "az"; arch = "linux-i686"; sha256 = "8889cf66294a788b59754a4331c6fe4ceccf5d4efedb402d144f27384e491b46"; }
-    { locale = "az"; arch = "linux-x86_64"; sha256 = "cca620118720374edf45b8dba81ffa5086f640bb1c10b67cfe6286aa2afc3a6f"; }
-    { locale = "be"; arch = "linux-i686"; sha256 = "33543ed7c2f68457573729fa95fb306a3c509d8ecda937d5d638d6d158979ced"; }
-    { locale = "be"; arch = "linux-x86_64"; sha256 = "58c567f2b6657f533bcc20d39f29715a503a0a9d59e05ccf9b4f3f3ba64280ca"; }
-    { locale = "bg"; arch = "linux-i686"; sha256 = "5b87663b5887a8eeceee3c0e54c99c66ca673bbf78b434cdcac659891c1f3333"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha256 = "ebcf93c8b5ae952f244426988defbfe0638cf81a8dc4c372613be08f9e0d8f45"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "30af81108a6f9ea31a623666ebfb68d99ec256e27cc8d18921bfe2780753ba4c"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "082ddb0fce87e1399dc95cb94fcc71ebe334f7e611497c0b0bb8186edf46e8e5"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha256 = "3e8af6555a65ee403b8fdd3a78842ec4f7c16fb3c590f77d9ddd76e9631d564c"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "78bf008a03318c1d58788433a07b71b63bd52cd2befcc68f8c6320d5ff5dc387"; }
-    { locale = "br"; arch = "linux-i686"; sha256 = "77ff1b40b9cc81b1c6bc63d74e68687ad92f5eb0cee265cd5d9528c38a36bd12"; }
-    { locale = "br"; arch = "linux-x86_64"; sha256 = "a4784a6b2d356f633deefefbc237f5aa662334765a334f968d60afc0aa76ccab"; }
-    { locale = "bs"; arch = "linux-i686"; sha256 = "5fc7d9cbd892c83f40e0cda6b8e6b4e993948530bef355457015a6976ce097f6"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha256 = "4fc83306fca0a6458e66fa082eb8afe6d07ecbf5a3b309d3906ca16f00fc5d31"; }
-    { locale = "ca"; arch = "linux-i686"; sha256 = "c72b7f343e62f479dd2fc37f22af3c462890a886727a2b5a1f140992e3069c92"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha256 = "81d44ab8e493816180ce46d86a0b061ddada85b820c21b91d18f62b3fdfa455e"; }
-    { locale = "cs"; arch = "linux-i686"; sha256 = "c2fb062c3fce0c4c174bcf3987108176d9cbe8da19a06b5db46e0b6d65b244ec"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha256 = "81afcae57081c20a7a1e03c28a4d8dd26b3c89608591b7a7171be91bd24789d6"; }
-    { locale = "cy"; arch = "linux-i686"; sha256 = "bf5f4bdb6fbaea7d0de662921d5e6096d413f799fd3ca1876d42146f14667e5d"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha256 = "cc4057fb04da6db0d2ba315fe9ff015a0e0fc1542843adb4a65621936f849d98"; }
-    { locale = "da"; arch = "linux-i686"; sha256 = "10468470db91eccc1234b34fc4f933b909df68284f9cee8125fbdb5c5802a45a"; }
-    { locale = "da"; arch = "linux-x86_64"; sha256 = "34e29284e753686f00e4019902b75aa071d0eb87bafec8c31cc4029989ec210f"; }
-    { locale = "de"; arch = "linux-i686"; sha256 = "f5b2e2c7fdbd0f91e0ce581dfcbbb253d627a4aac45a914eab763de6b2fb6750"; }
-    { locale = "de"; arch = "linux-x86_64"; sha256 = "7366de80f3717f62768055613bb6767a39716808e394d623cff18e649b1a5a02"; }
-    { locale = "dsb"; arch = "linux-i686"; sha256 = "1a69cb59bd213323ddf5576f2f060def74735b50576c5048f030170a8e4a54d1"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "89c431dc58a91ff9c7b31b9a5f988aabd7265a23697e870cd746320c0dde9760"; }
-    { locale = "el"; arch = "linux-i686"; sha256 = "cb6c72d842895714a7ce5f0acc7e2de721befd8605ce567811f5e626f9349a50"; }
-    { locale = "el"; arch = "linux-x86_64"; sha256 = "8b33af54b8e00acba75446a5921ebf41e570f66cf86d38bf46b9238d2b2b57ef"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha256 = "17685f4d47efa9ca8a2ca220960d7819e11c728516d4c0f67f789f5dc29e9606"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "702f8da239eadcbf92cc8e286716836ec889a64276a92e51ee26cc5338e4398e"; }
-    { locale = "en-US"; arch = "linux-i686"; sha256 = "be03a282b7da67899c988f89423594b91e017ce5f4569d55ea23f6ba28f59414"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "0ba5a1868386c715ea1f48393b035305d4bef67ed1838b7bfacf5bff8b36716f"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha256 = "790462e745744b05a5fc27d9518f02e88f678bc1f95140dad970abdff0ec7aaf"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "ab1ff49b84beb7a5a02a70cbaba9d3110cdd76653486799038fd05936b9db499"; }
-    { locale = "eo"; arch = "linux-i686"; sha256 = "d6be5d333050ca0d1ecd78082b9daf7955a068915af6ef2694b3f6d60595cd94"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha256 = "6ea5dd2bd55bd0211ce67f398b24a37f26b012250b8e7b1b4a9d5ef619e19051"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha256 = "1b16ed83eed980b0ea8b99e989bab1882b6d2a497fd643f109f0610425c693d8"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "3aad55c9d10012c5b22154e8562a034e30ce6ef0b579047649a43afd0645d6e2"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha256 = "f22705f5dee51be7bdced48c6c8f48780529f22a566d9d8784a10c2fe8427b92"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "8dc4c8854169db3c22c09b723002852c452cdcf8d0bde94b089af9fcf0ae0f28"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha256 = "7bd24886bc72db5479c1aa2c8a48359858c1e87e8444a5cc8f0ef3e141744806"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "c69a6be864d1c865013b00a1b8fb748da96be2ddc65cb178eeca6e165aa1ccff"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha256 = "a52775fe1038fbef208d760c4069187943387b0717076b32a54647d9e319890b"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "56c2e14770c2c6d40213f159715a3c269bf3b6c5985ddb4851b6f50f2ca93a39"; }
-    { locale = "et"; arch = "linux-i686"; sha256 = "648fbeb1dc15d76685d80afdad2b6a797eb25f30b27bb405e11725ccc53ef164"; }
-    { locale = "et"; arch = "linux-x86_64"; sha256 = "400f9cd73854034edd7b392367a7961638c921e78885064bdbc567ed3c508d38"; }
-    { locale = "eu"; arch = "linux-i686"; sha256 = "727e0d1d692be4f472f1172d8901d94d58e201ab9c2e30b80684564b3ecaf325"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha256 = "476f207657fb9a5c3bc89493b06900b4fe46a06aca7854e4f37bbe8c8d98c064"; }
-    { locale = "fa"; arch = "linux-i686"; sha256 = "2de4b2b0f02918c8ff538db66272196479ad95cf8e239ccf9e1a244d5553456e"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha256 = "3c04ec5ebd27b815a215ff815dcc86ec05f81a5a0d606e60ed14135b76679fe2"; }
-    { locale = "ff"; arch = "linux-i686"; sha256 = "07b19ce6be53c16c6f299a2640a3a597475644fef63edf702242e245001b1eb0"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha256 = "d0a4e2d3b155c0fd5fa12162dd73d6077be30a9cdd3ccdf5566748a7af4fe2c6"; }
-    { locale = "fi"; arch = "linux-i686"; sha256 = "f5e9e4222bfc1c34d58befaccf501d741cdcf3ee9bfda034ea8600a906c9a912"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha256 = "d48f0673a768b6265119a3097061ae437711a81fbf7f665b8fec079f0516b1ca"; }
-    { locale = "fr"; arch = "linux-i686"; sha256 = "67eb797623354f037b49745c9ef7ddfa3a0cfce03f984add560a33ab2955fc97"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha256 = "6bcba534539f9b5f42397c82e2c1a6affa6eec473c09e6d71c5315f9acef35b0"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "fe4b44c9b50abc001bb4bcf6e046a9b18f30a42170b4662daf5d35c17089f4ad"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "8238342ac06af2d4e0b7ef8ea26d1960af996ac7d401f0e11b3b666ebafe0df8"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "9f59d32123141d624b9fa16f885ff9e1cc989628e33074bb2a546d9c54be07eb"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "29785a5a2cc09750c8ea391ca6b2d8812e5a68185807d76ec295c3ca86c21da9"; }
-    { locale = "gd"; arch = "linux-i686"; sha256 = "bd4dcb330e8733c3443e763a2fcd49085b5027ec032ee6f641ac1211534fdb6a"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha256 = "5508260caa85a450a2496a7e261aebff847301d4f981bd0caf0208aa65c0bc10"; }
-    { locale = "gl"; arch = "linux-i686"; sha256 = "7e6df6be5937c01d8bbf65cd6d107fba76f1c59794f7e2ed81ac9db1384abe34"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha256 = "b5370fd005569fa1544099fb4629ea344f81b43fc10188dbb3cbc5926b5df53a"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha256 = "5256e889efd097decc2b55f4d928c9847f6e9499b25947de068d357db4d70c59"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "2b51d50b49965c766081d35b1a426e1c3a858038bb88807522a7dcbc8c97b815"; }
-    { locale = "he"; arch = "linux-i686"; sha256 = "b71d83c274d82f63ab175978bd661e047ad73586249f6e24d33d17c1e9ba4ec6"; }
-    { locale = "he"; arch = "linux-x86_64"; sha256 = "4c3dd5066a9b5ca04ab222af8d7009419fe34d0bc41bf5f78e6370d6e975c4e5"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha256 = "33f3591e2d75bcc539cc57e68e865183b307a8eb8153c0b48bacc0bc62ea48f4"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "25eef40150db99b56dc46deaf78525951d8ae838886427838c9d78bab41c6b7e"; }
-    { locale = "hr"; arch = "linux-i686"; sha256 = "d83ab7b48cd7fc4637fbb4c19edd0974db121186289b04da01414fbdc78ad7e9"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha256 = "8a1d3055aedc504cf0f34e41931464752148dd1859c807f689978fb80504a5ab"; }
-    { locale = "hsb"; arch = "linux-i686"; sha256 = "d9dfc43216b0c6281a311edc6c0fed79344cbb4f4cfdcf153f3ba37a4221199b"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "2ec46b326249e0049de0a110896672191edf0837d4f224ff3b0f88a21edf1a22"; }
-    { locale = "hu"; arch = "linux-i686"; sha256 = "6c7cecaf0865bd80eceefe2541b5cbdbdc457a367b66a3cb7f8f3d73cf3118f4"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha256 = "d33903cda04f3be9e147dd69c55a58fa76f1bfc0abdb8346c641b76c5f20aacf"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "a7006e239fc119c1af332e1fdcd3ed42aed59deb6e22a092c9d3ed5c7eafa11e"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "89b0def0f9d9177fa0c0f1f7630d52bf3d6380ab27c475019fc6b1dddeca32b6"; }
-    { locale = "id"; arch = "linux-i686"; sha256 = "15fd16ebb3c82755a1ff70a172658c3928ad495194b975de8270b0dadf8fd10b"; }
-    { locale = "id"; arch = "linux-x86_64"; sha256 = "7cfe30a94db8722d0cf3c5f68f636c76e7e98c8f34f67f95724c80499c89ec64"; }
-    { locale = "is"; arch = "linux-i686"; sha256 = "0a066fed6ed9ca4a1514166c8b1ac5e097b5d32522dc39bee3a644f241f7448a"; }
-    { locale = "is"; arch = "linux-x86_64"; sha256 = "4fbef4c8c25690e3c23f3fcd27196714c691c9ea023d81b82763867a7547deab"; }
-    { locale = "it"; arch = "linux-i686"; sha256 = "451b17760fd2f3b99cda0f1711fc3e74320ef0e86b41ea89205c00395b1ac46a"; }
-    { locale = "it"; arch = "linux-x86_64"; sha256 = "e12206fd4993e75ecd3398130758cb1cc4f103c5792a9b59956766d975840653"; }
-    { locale = "ja"; arch = "linux-i686"; sha256 = "ef954070ef7f3eafb9727ee848627145dfc884fc46445374d5b618d344359432"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha256 = "6795c8d63e2cbad65d347bb07503725f85ef464767020df605bdc5dfbdd4cf60"; }
-    { locale = "kk"; arch = "linux-i686"; sha256 = "752594014a72770d33784a99782b24bebaadeb83bda57880f3d0bdb94c2ef56e"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha256 = "a5b26f9f5b9194592e4749770e85cfe35d308ce5cffceea00e9aea5a90a5ef95"; }
-    { locale = "km"; arch = "linux-i686"; sha256 = "57c6072b4dd026daa11b7877fc05ff8aea383eb1d0a8cd1798bd26246f013145"; }
-    { locale = "km"; arch = "linux-x86_64"; sha256 = "fe5a4aae238d74a26614014547294226b49155a7c7fe5fe8a4d2955ee9bfc457"; }
-    { locale = "kn"; arch = "linux-i686"; sha256 = "53b5a81b33115e6892dc6d98a275d675a576eb721290af271262314f33a8a5d3"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha256 = "7a73aea8c228b3491c12735240fbdb8715d8236e89b8634f8b8eae435a6b33f2"; }
-    { locale = "ko"; arch = "linux-i686"; sha256 = "7060ad8b0e78eaebcb6ef7b4976866ddbcca8123daca4ebd7e0ace9792c55a00"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha256 = "b3858ed759dc5c3bf383bff0620d28e939e2a906b266bf9ad28409c45835da82"; }
-    { locale = "lij"; arch = "linux-i686"; sha256 = "efda293d3583806b80695c0f102151574623180a192826e66e90c34599e13444"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha256 = "235138d5b83242a50e194c09d687edfad8a4f912d8434c749dec15a271a38d8e"; }
-    { locale = "lt"; arch = "linux-i686"; sha256 = "0fccd7402f84ef47bc14cd91da4c9aecfceda90588293e47c3473ba5849e8ba2"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha256 = "de27a346f47ad06ade89b4da1809b7ab8aff10e491352b88185d4fab1aaa5613"; }
-    { locale = "lv"; arch = "linux-i686"; sha256 = "e4daced301792d86a7d5bb194da1ff4b9fb1ab7e8583ff3810ed5dca2c57c2c2"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha256 = "e6f6b914d0b8e1a349087c893cd91807e6d8159f4f8db27c2c89b8304a21aca8"; }
-    { locale = "mai"; arch = "linux-i686"; sha256 = "f61a475f0646b6935abf6ca4b07d88a65e782ad6a5fbd17ab2c7cbc0e386f9b0"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha256 = "091597ef122a51e27e69aa02d84c0de37b3bcc4aab38326a160d8836f82d9235"; }
-    { locale = "mk"; arch = "linux-i686"; sha256 = "336f74b4f6f0fc0ca24af1b287bb049ba37aedd760c60b71560c32aa21d902a4"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha256 = "7026aaee3d615fd5401881728fce02d69a74dd08bcf4ad32cdbde6e48e9750fa"; }
-    { locale = "ml"; arch = "linux-i686"; sha256 = "412212198a4bfb35964baa84d55bdec89a30ad47be0e54c7be64e3bbaa8166f9"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha256 = "50c0c3f6931e6a1a498d075847dec4796db804d296b0bcb7254576d910c88f51"; }
-    { locale = "mr"; arch = "linux-i686"; sha256 = "f457de6b5e6692cdac57f9cc8b5bace0f3c678cb40848963f91dad36aa53e7cb"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha256 = "9a88a56a56d5448e6ffdcc2aa15b70bc6300750dae11c25047036873bd0f1bf7"; }
-    { locale = "ms"; arch = "linux-i686"; sha256 = "1254482bd8d0c2fef0a728415e0053b1e68951c1a4de32ea38e3a8435ef8be11"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha256 = "6daecbd8ab6eaeab01139037a950e5e48766f20290bd13daa9f2177a0bed7a37"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "ae92dcc94f43a80e335b9dcbc82a1831ede646e173eb1a6b76a3a5c076f70598"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "813d1965cd6b15e8bd1b40f77e787086ff38dfbafbfdb6ef3d958543ec566d9e"; }
-    { locale = "nl"; arch = "linux-i686"; sha256 = "bfe3bd48305674bc3e7f9edc318585e605e31e59bf55c1095ba08f82f1e92fe6"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha256 = "d9f6062d09d4c505656e4f1c3fe098b896beffb9ee299ba5d544a91d97288d8c"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "9c5b3343070f2f986aa13cd6f03a184643cfa5a0214fe2d3696cfd5f81efa4cb"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "bb128791f7f9dc18b282aec0892987b2d315103bd56d646b22113f74e379db0f"; }
-    { locale = "or"; arch = "linux-i686"; sha256 = "2a5e0a25d654015bec541cca26491312746552b052a6ff1e93daa7e83d5c5539"; }
-    { locale = "or"; arch = "linux-x86_64"; sha256 = "97f524aa830ebbbe80396db69b798463c1bb973a57edb3bf04350cf343b9f345"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "f4e38e9124fc916766c1b7d3b1eb5612e5358d5ff7cb60127f6c9ef00360ca2f"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "415b0f6e0c9ca0c9a415d96c821ab72c15b5d2863109c6411d1d35f3835fc92a"; }
-    { locale = "pl"; arch = "linux-i686"; sha256 = "d001a0047d2ef866ae2ad7675b3e45a7055ceaf84e031a24c72b239b42fdd98e"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha256 = "cbea32c4b8989fc5f0bf948ab5d80ab715fac7fcc179dee169ac9d725ab2b43a"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "ea9073faecd9cb850dae9c69a85368f9ad8ec9e00c9aba988205aedfc2e63bd3"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "c3c57dcc4a5790b36668b8e255674945e61ee9d6ef69704f39d499ad57510a79"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "854692a0be4be1b34e958c34a7318dd818e310439d01ee552910a067cf6f6624"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "0143d2dc4cf2979f8744dd282f937f9e8084393e4c7836219eb182618062d1cc"; }
-    { locale = "rm"; arch = "linux-i686"; sha256 = "81f96f818ce68ee25fe1ed7b1c831ed95d26a3fb034bac836707bf93ffaa140a"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha256 = "3824d40ecbebc2df46f865e0375119c9fe5dd1dd5a0f4c193de984134ee6e7c7"; }
-    { locale = "ro"; arch = "linux-i686"; sha256 = "218b36a99038e08dde7677bc8e89f1b74b5456da2f5e5e1a081eea7ab19bb7e5"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha256 = "2007623afeacb1b11ed4e93dafad6f47d1365ff8505282c858168ef95d31b724"; }
-    { locale = "ru"; arch = "linux-i686"; sha256 = "708780c7f96b0f48f177780fe48c4613b3548eb5b08ba37d1471781de2fe5653"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha256 = "589e950adc3258ad2064233ecfc5e385d301096e0fc08b3a5cc9eebc0454ac6e"; }
-    { locale = "si"; arch = "linux-i686"; sha256 = "eec26f6c23c5e58913387264ad9cd52d5571ad95b1047490530c2c7cecee4584"; }
-    { locale = "si"; arch = "linux-x86_64"; sha256 = "3c71e67434e42be6ef9970c948030c58198cb941ee39d50845afc2a96c85abe0"; }
-    { locale = "sk"; arch = "linux-i686"; sha256 = "558f5ab75ade19ac57fc939c4314233004fbafb2232e9d4bdc6ee938cf0d0e2c"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha256 = "d8a19e75930a0e902b261b6a4872f47daa16baa736fcf4b6e86ba3e947a05fb2"; }
-    { locale = "sl"; arch = "linux-i686"; sha256 = "c69f8782bdfddc06e4fcce994ce8bf79031c47fd60132fbdab42083d7645fbac"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha256 = "ed1da31169d61b4eb6f3f7858dfd5ab7bb436a9c3ae66882d00a19929d48ded0"; }
-    { locale = "son"; arch = "linux-i686"; sha256 = "e1e4b663f699ed623ccf4d91966d1d0b6f17aa831a14b86316898590b559790f"; }
-    { locale = "son"; arch = "linux-x86_64"; sha256 = "5c51bfb471b8870aa04d3e66bb1cc465a7e3d7f36badb91bb0cdd56789ba9657"; }
-    { locale = "sq"; arch = "linux-i686"; sha256 = "7523bdbc44826267f710d1758c3d64fc5b2711ea26559e8eee8d803174a5f801"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha256 = "929bca0a3d2eb67d02c1af5df073fca04db1e70ec95cae622f87c70c5138559c"; }
-    { locale = "sr"; arch = "linux-i686"; sha256 = "464da5be343009f180d829cc88e01cc7eaef953195f4b3396156a019fd17a36e"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha256 = "f84234ba1c6c0eaaf9b73d40546e482dd024bad6bc1aa9b0f19351af064abacf"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "c1c25d2226f47102969272777fa985694430e227a6e58c1a3fc3da479ed6a69f"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "10ae8036fc64d7bd0226ec9b8e9614b5bb24d995d0701d23b471f65767de81cf"; }
-    { locale = "ta"; arch = "linux-i686"; sha256 = "ca3fb46ad1d80fb9d37bc0b3844b8d3972640772edba1ab6485eaf10d257654f"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha256 = "f8d229cb8257262adac057831f7080f431e356eb4ffdd512e8ea8b6ba8e6d702"; }
-    { locale = "te"; arch = "linux-i686"; sha256 = "78d326fc7baed0aee612b542fda5333a83d2874c20a396a4cea0ae4d4c9b45e3"; }
-    { locale = "te"; arch = "linux-x86_64"; sha256 = "fc827807c3793c15fa7650614da558773fd884d5aabf8e181c8822e4109a6832"; }
-    { locale = "th"; arch = "linux-i686"; sha256 = "37681476c04f02dd5fe3e815da3c6569cfedf1d1627826122c934caab8bca74c"; }
-    { locale = "th"; arch = "linux-x86_64"; sha256 = "d63640093f26d53257b5f1b6ea3c8b620498a21cd7ad1144bb3b5d85d63967ac"; }
-    { locale = "tr"; arch = "linux-i686"; sha256 = "a37e2833f4ad4e9c13d4da88f22f8a9cf7ad77b238f2d00f914a27f276ba99da"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha256 = "869fc9c719a7a619e15b98007f60b3f92dd8f7c46fd27e4fc864a8b829e13da0"; }
-    { locale = "uk"; arch = "linux-i686"; sha256 = "c832506a00c22cbc2589814642340bbb1067fd31e414db4f426a8a451991083e"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha256 = "9597216b353369221867741de9f9fcd030adccf1d9ffe2b127c7b858b51e04f4"; }
-    { locale = "uz"; arch = "linux-i686"; sha256 = "d67274f1e39b479674b4909b0e072dff712db0146577f4ea36736ac0d94e3dae"; }
-    { locale = "uz"; arch = "linux-x86_64"; sha256 = "95477afad170df8efcedb493e5ffa9366f1abc8d451860b899457c8a296afbe0"; }
-    { locale = "vi"; arch = "linux-i686"; sha256 = "d453f7cb7f1fd662d1a1fecc701880a3d45c223d842d91061ab5f815333b8680"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha256 = "f19bf0b83a4389aa4bb1e1f7d434be12c266c0575b13cabed541a4ac38c2d810"; }
-    { locale = "xh"; arch = "linux-i686"; sha256 = "4d1c8c365511b195da7e18c10cda8f6599d840598e4623bffb445a67a42590cf"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha256 = "607a62d71718fb2ba89c2a3b75acc13fde048f5d05a692783da955af344a16d1"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "635a980f48bd8c0f93ff2666ad7f761e80a255fb54647704e2514c6ba7b9bf60"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "3eb083c8de026db0727b4fd206fc9045981c5672af7ebf6e0653ee28f5aa8bc0"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "515749c690b64a7d047df00291aed071dc90e5582e9ab0e4bc560635ef7d888a"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "256316348c9d5cf525f0b2f2c09db968714135e21677d122b6bca6e87471a9f3"; }
+    { locale = "ach"; arch = "linux-i686"; sha256 = "c0c65ced611dcc7b788aff7f0e32cd1823467c06dc99ced2e0aca0539ce545a2"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha256 = "87068d8072d0312af90524c7470c874d33e23c2b3e94be3fe9d934998330e898"; }
+    { locale = "af"; arch = "linux-i686"; sha256 = "7c8f08471fe561a345175c350c6414e72721baeb41a3ff47a429f5b79c33c82c"; }
+    { locale = "af"; arch = "linux-x86_64"; sha256 = "4768a53842d40e81a2e357ba58da56b0a81d2224878b6ab2ffad0bfc50c20ec1"; }
+    { locale = "an"; arch = "linux-i686"; sha256 = "cdb921661a6b20738f38ab2d0fb285aa81a323401f360f77b9ae6d9e8642210d"; }
+    { locale = "an"; arch = "linux-x86_64"; sha256 = "cff97655831940b84bfa5f73dfa3dc48de084ae6503e7a5824c3e57e373f0ff0"; }
+    { locale = "ar"; arch = "linux-i686"; sha256 = "9f6322577809b557f325168953170706af6d29a29b5347886f928b5f495799b8"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha256 = "d5a1a956d7f9afe5867e2dbeaea4ba2a94e743d291062d18232d20ace29d2c94"; }
+    { locale = "as"; arch = "linux-i686"; sha256 = "750c5cddd2d436993a4630f0ebf31e9d0ac679cc23a84298071a682e7a8a8de1"; }
+    { locale = "as"; arch = "linux-x86_64"; sha256 = "5b5a2376daef30eae3ff1a94213937381148ade79783546b1f38687c9fc4489e"; }
+    { locale = "ast"; arch = "linux-i686"; sha256 = "99b5bc2c709a923a43debfe746c70c3613c206424c88d553f7593c200053a8b6"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha256 = "2fd75ff22d3b75f03c6a9ab005e369373f999ef4c38ea49438ab2adaa8e9a2c2"; }
+    { locale = "az"; arch = "linux-i686"; sha256 = "0781239c9c8f237d66ce0c8d9f39136e0eb71365f6ca8b695014648060c18c38"; }
+    { locale = "az"; arch = "linux-x86_64"; sha256 = "9fd6f6047ec3c4103c4aa761882053d4e00e018a1509fa1fbede1757394aa3fe"; }
+    { locale = "be"; arch = "linux-i686"; sha256 = "098e932b708ebc71a2aa7fe86ced4835dbc6725f8714904b25e7ebd1ca7b7d69"; }
+    { locale = "be"; arch = "linux-x86_64"; sha256 = "d9284a84e7e55ad6d73e7d599c5b6824774d7a9e6f7484064fd2985e5634d102"; }
+    { locale = "bg"; arch = "linux-i686"; sha256 = "02879ea328d1536781f2f9765db51bcb9fa05d0a0b7ad426fd659156c293f347"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha256 = "70f55197d8ff67d52f090bd58dcc106fcc08492fe6989494eee3aa3cd1c3552a"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "227873ac53fdac5f27b569a5b6a1f3d45caa4e3c822610a5f294a3abdbc2c0fd"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "0a46de9bfc19fba878104ae2865a092fba7a9eea62a64a31c0decc9fc021b3af"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha256 = "2cc4d364852fc987e97f169de9039992d4ecb848125eae38c09bced34aae8653"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "6a722ed42f251e3433d46d9b56ca06f7bc1cf0854de782da10285db6ee4a1bfd"; }
+    { locale = "br"; arch = "linux-i686"; sha256 = "14b75dc8278a946d705210306b50a85795f70d83d0527d2c77a60b13662e89e3"; }
+    { locale = "br"; arch = "linux-x86_64"; sha256 = "73e62d2869fb450b4597ec3d65ae3c36ef78984462a158dbf565bbac539b1fa5"; }
+    { locale = "bs"; arch = "linux-i686"; sha256 = "01e02d4a0e140d962e27e4f1a4ec24837c0646e9373f3ce2eb8337437c274ecf"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha256 = "59fef5429b639a52ee113e855a18080870a2f905212dd0e4aefdd838d040133d"; }
+    { locale = "ca"; arch = "linux-i686"; sha256 = "62f96267e91fb9a8df1c436adb78945f32eb14bccc57e706104ae0547b723682"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha256 = "0be231034e076e162b5568a5247da47ca2038011928f89c729fe9a7e139dd922"; }
+    { locale = "cs"; arch = "linux-i686"; sha256 = "15c8a066fe101a5b9151c96611e2390008ac54a9a1909b9430ed6f440c856920"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha256 = "40400da9851782418a12b224b74c3b5c8c112912bb98dc8f368972cc898ea155"; }
+    { locale = "cy"; arch = "linux-i686"; sha256 = "b9b8d3d4c5160eb1676f6c4531123ec28dc0ca6b51e7dcf20716611f93f1c975"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha256 = "6e00d5e5c7e50aa24468b802bd53377d8962b146fed8a8588dd5c8db4162da93"; }
+    { locale = "da"; arch = "linux-i686"; sha256 = "760c9d95fe6941847dfd53b254cd662a83f4c9f2d66f84a96b4dd1d3127adbb8"; }
+    { locale = "da"; arch = "linux-x86_64"; sha256 = "e168e7e7e11aabe54f773c960d4c9b9920e15e4ccadef9f728e2016f0240555f"; }
+    { locale = "de"; arch = "linux-i686"; sha256 = "e5c6372f3fd732fddfaa31ed3ddc81cf803386d7842e103fddd0685739ea63c7"; }
+    { locale = "de"; arch = "linux-x86_64"; sha256 = "73da0a0c66c18dddf5de7b7dda677cb9cef1e0b3c8cff5e22f48bf743ece8116"; }
+    { locale = "dsb"; arch = "linux-i686"; sha256 = "509b8233c403b629803fb0d67a29f2d6f649627d4b91c592121acd3e2ff62282"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "6089971aa6e19e2cbcb49724e2eea7922d9408936aa8e2d396b8f1966ea81eec"; }
+    { locale = "el"; arch = "linux-i686"; sha256 = "451f1a7caea7553fc18e440c2716e1954e7d7ba66f5fbe15cc6954224a36444e"; }
+    { locale = "el"; arch = "linux-x86_64"; sha256 = "d02f4b813cc16b4293f9441bdbdef56acd0a7a510d9edcce223d04270e65f2e4"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha256 = "663b7a6300fa46c4e62e7542135ab2632117496a5b0365276ec5ac94183a1d55"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "d50895a71408e74d8b5b1965be279011214c50eba56e0046f360f216326f1135"; }
+    { locale = "en-US"; arch = "linux-i686"; sha256 = "84a5fa00271f90356bbfedb1fdbcc033489d1759fef53c4dda92bd285633ae3d"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "49e55275df9e902bc234fa59b4b614a084d76dc2c256ce6218fa96663cabe2dd"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha256 = "dfe926680b0bc5852db920ba8b3e4febecf1ead33d9865568ac69e9494337072"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "83c8480482dd154519d26e43a3f79d32c82f149d81a1c6e8ef98e9511ecbf35a"; }
+    { locale = "eo"; arch = "linux-i686"; sha256 = "a27703068ff3be53e8944c750bde0316414f51ee4c10569018d121db7ec1b705"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha256 = "981462cf59716c17fc0630d0cf12b03e7cc96d72c2d8d33109c1db633895f18a"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha256 = "16b2efda57842f29c6f4432cd51296d5e9a709d30f2310e885c786fc68a96e65"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "7b6c8a2bbae8e72ec820df741b8f4a2e162c4b628db8e669a5e85dc190db6c51"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha256 = "ad18bc224500c834a159d91fa568461cbf131edd1b044ae8c97e887b2151e112"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "84c414c64bff02d8e82a4ca4c01e1b4dfae21991ee9a6850203ccbe15469cfe8"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha256 = "142db7f0bb92976345aace30d9ba53ab4ba98a47332c3f7ae7372d9d80300781"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "337de34606e018ec5b600d559d928e35c79fb28800c9b5ad28e2defe259f9b58"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha256 = "51cecc939011135842bb51c41cfda0fb4ae53c5180e49bd66a810c243b1d68be"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "cfe309df7412f68abf487c1f9065e6b9d4b4f384254576c8d1098878012e5b53"; }
+    { locale = "et"; arch = "linux-i686"; sha256 = "1540b0f0c1d867c87d1e109b4e9ad417be51306c324a03e07706d7e215f7ae4f"; }
+    { locale = "et"; arch = "linux-x86_64"; sha256 = "e7c0e4e61d17164a648ae51bcff92d99f76055a1a6a29dfec6ea12a0359f1285"; }
+    { locale = "eu"; arch = "linux-i686"; sha256 = "c2c88bf65329b168fde8fe02613eb89069d85da8b2a3114ac647158b8a345055"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha256 = "9d10a2f8a0e889a6ebe99bc486cf56cc44535b6f67ce3667ac61e87430a24eea"; }
+    { locale = "fa"; arch = "linux-i686"; sha256 = "21ba5e79f5fbe3c3a8a8a71f8fe9a4280f8e47d4c58070443bbf53305c906175"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha256 = "99d8d2e81e2a8f495d5568d7a9cbbfbcdc8a0e1d67fa297adf8a021988948a80"; }
+    { locale = "ff"; arch = "linux-i686"; sha256 = "3e1812cd98e04fcf575783eafdef2c89739c51e6648f4cd7ba7bed44fbe5f960"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha256 = "cbe37600da8bfdabe683473dbb4f2ccc96beda89a9ca15810432a8fce65a591f"; }
+    { locale = "fi"; arch = "linux-i686"; sha256 = "ecf982266072b4a15a06b939d4f0cc22c3653982404974baa51871af0e411ab5"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha256 = "345b7f038e454e6efd513e923ad2aa0a45d76d846539563bbfc79293ec84a6ec"; }
+    { locale = "fr"; arch = "linux-i686"; sha256 = "e71b05083a122ef20b5d75481129fa2e3d1e2ac608cea2c5baf7b300a5fbe5df"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha256 = "1897112ce462b341abba4c2b1664fbf39b5072a11ea6fb61c66cbfb3336358f0"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "5557347f19ab6d7c90a34bf8a9729d39eb65a02a021040091cc1863e08fb72c9"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "c77b86d5512f8343674248b9b4d31165975f0eeea002313311339ae45d9effe3"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "7a68d7de10abf095fd9240807a6a553b60ba75f3d8edc56afcf5ad1832a05eaf"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "f935b317c5aadd60553f497ceae2cc663dec3729b2fc8e48e6a98d1eb91fe263"; }
+    { locale = "gd"; arch = "linux-i686"; sha256 = "21bbca4e12b3fa230b879f190d279ba9314090454e0263b65e77dbf8f99dcbf3"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha256 = "027630690ecff7ad56f6e992ef243d2a734dac1a3e6365bb22c56a571f938fcb"; }
+    { locale = "gl"; arch = "linux-i686"; sha256 = "6973787b5136491ef28bb2e10976d49c3717a866ec6fe357a995dbf3179a751c"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha256 = "0ca57d72bf11ddf74eb79904be607c479c01f31f11fc0ff567a9ad7beef8067d"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha256 = "6f422fdcf2fd514e132b33fa079631a6bd4b12deab17a3463b1f3f1ce3f2f535"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "19cc20d1bd838ebfb8518b8076800cc3255376e4928cf2f37be86258307f1104"; }
+    { locale = "he"; arch = "linux-i686"; sha256 = "f8eb56fea0e73c247fc767541bc97cc3556e4db75ad446e01b0978a5c0b11d3f"; }
+    { locale = "he"; arch = "linux-x86_64"; sha256 = "8ee0ae75d179bfec9e081777e9a34fdae72d8d55ade73983fdac433649b596ac"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha256 = "bb64fc5285bca12542669ef83bfc465bf593154f9bca2548510f525bde5a55f3"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "52bb0b68a5f282e65d077166a3a0716fe6c9368ab88f6d5e2a8669515bcc000a"; }
+    { locale = "hr"; arch = "linux-i686"; sha256 = "f36e7b656e5898191801d6e04f3ebef9f9f7080c011dd695ddccfe12c3cb2f6b"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha256 = "9c553d5312363980364c6a9a6591fe5e0229668ff1de3a78943af18235098eee"; }
+    { locale = "hsb"; arch = "linux-i686"; sha256 = "e58662111147e836ac404cf7fc9d9e52ac141b204004c813c6b8d180a378af57"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "5aa7dcce6e48dfcb7b8b4f9f48b4bdd496bd606d901896fd37f2a2cd6b4a06bf"; }
+    { locale = "hu"; arch = "linux-i686"; sha256 = "d352b7d67ebbd5e45f972a804cccbb769f6a79700506297c0808d2f9b0f5ca8d"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha256 = "0f7e5cf8306e1fa9b8ab56cdb39b5ca1fe2ff1a3f4ded38e5982bbd842438dde"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "bf057113e03190fbfc6947f24a0fb432f53991f02e56d2b5e8270002cd742d4d"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "aa0fdba0a703f06ab5a6b667448316f9de9729c20602fecaf872d14e43a0b822"; }
+    { locale = "id"; arch = "linux-i686"; sha256 = "eb8fc36302a63113e9891f8153aeffc1da4f990f1473d9d779f28df6658bada0"; }
+    { locale = "id"; arch = "linux-x86_64"; sha256 = "6f2262e13a649499a0783922a3f2d85a71727ef37629a529f084590828746bca"; }
+    { locale = "is"; arch = "linux-i686"; sha256 = "312f1af8601c24417672383063085f1c588d9301a09ddeef15b8c54e130547ff"; }
+    { locale = "is"; arch = "linux-x86_64"; sha256 = "ed3165767c2a14329869930d2b618a5a795d3c3d34e06cbae0d1694ccdfb0c97"; }
+    { locale = "it"; arch = "linux-i686"; sha256 = "7555b6f4aac9bcc270fcd5204d15a3cb7b84cdd845f66cea2fbb843315100107"; }
+    { locale = "it"; arch = "linux-x86_64"; sha256 = "b6c2799434bceda271a004769372dfe416584953be5950fe7125920e4e428737"; }
+    { locale = "ja"; arch = "linux-i686"; sha256 = "e8606fc60aaf6ba91a2616dc991d268e8099eb8d5d3eb3c19fdeace93c6453a7"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha256 = "5da4d4c307d661868ff7076e2fc1d929e9d3b9816be25adeba02bd4f9a56f15b"; }
+    { locale = "kk"; arch = "linux-i686"; sha256 = "f77db4c679c687bd33ed125419666226989ef5da88c2a4c8a81aea0ece602e25"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha256 = "3af207c5e2b6bf089739056f2be6e585529c87d5f142e7100fee55728faaf785"; }
+    { locale = "km"; arch = "linux-i686"; sha256 = "d48c3f0952d354b9c6539d9e333a8e9c359006a25f1ca6a0895f7e3344504f70"; }
+    { locale = "km"; arch = "linux-x86_64"; sha256 = "5bc3f65a205a78b110293df5a94a9bde27a491d61b1f9e340a7fe983c1ee1b3f"; }
+    { locale = "kn"; arch = "linux-i686"; sha256 = "50efbbad9ea231a9281a00dc702d9c6103bfd09b712b45b6809d78a176714897"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha256 = "001f41e86fcf93fd6a714e5ee0450fe8424bbb3ff40cebad29cb233cb0667bca"; }
+    { locale = "ko"; arch = "linux-i686"; sha256 = "11539b78bc650b19be2d25af10242a61ee043b47a15000f2e07e50df00875e2e"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha256 = "a4f0b466c5d544f0abecec8861e1d24132755fff54091a49370414ba27c9cc7f"; }
+    { locale = "lij"; arch = "linux-i686"; sha256 = "eede4d95ac6c7f55b312aaadce690016732bb143f3926c1d1533f64efd7306e8"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha256 = "6900bfd4af3146881cc045eed187b88a58ea0fe3e0ed6acbff034f68f43b5935"; }
+    { locale = "lt"; arch = "linux-i686"; sha256 = "4cdf1ced9a687daa34235ae82aa439d69e517d5c31b8f61e12615f361440a54a"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha256 = "873f75d77adc9c142f64523c199799f7e9b0460ae0252c514fc1caa5ac5dcdb0"; }
+    { locale = "lv"; arch = "linux-i686"; sha256 = "65af6b876aeda23827c57d5886cc67665fe2c3fe93cfc2cc5b614400828b6eb7"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha256 = "1b2f6ef94bb5a1ea999af797e2aa8ff267b4a9945fd0e8afc6c9df12273ce60d"; }
+    { locale = "mai"; arch = "linux-i686"; sha256 = "65fec172ddfce096f367338c8b95b32fb2415655e900f8dc628b8ac660270e48"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha256 = "238a78c2bb240609fd0c777399d3307ef659b95cf4e88ae85700321030000eb7"; }
+    { locale = "mk"; arch = "linux-i686"; sha256 = "e591486c66c9b7175b1ab180e9646976a413338dca225eb50d7db457f95afe98"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha256 = "f8d04696d02b0af221b8642d4780d79a76be68c07096c7f9c5915a9db6d5f768"; }
+    { locale = "ml"; arch = "linux-i686"; sha256 = "19dd334052bd9c98ec9afe7b8e5141728b25d2278b7b946921b031aaedd01b2d"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha256 = "a307739cb6de6f80258c28797125f78fe7746d0edd3182e3716f312f1b0915f8"; }
+    { locale = "mr"; arch = "linux-i686"; sha256 = "c86343db611dbca1b8fac25ea1e9364b30fcd6c31d5c856f699bacf6e4128c3c"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha256 = "b25fd422e6b3b1535fbb8839d04a77dec22dfcc0abf14062f5465c0a5aa5c99c"; }
+    { locale = "ms"; arch = "linux-i686"; sha256 = "e437939df4de54d415224db8fbf6ce9e8ae21fc0402052a72612085c73faa493"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha256 = "5d9051de7a1bdc68018511d38e29658f00c0db113438a3ec84e68fa99b89f760"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "04d0bdd6235a9321d1a5467c48240cbdb790485b580c1b818b048817fae22f49"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "30afe02bd7090929841edc88eadcd745435f64189782d95477568b3b41cb107c"; }
+    { locale = "nl"; arch = "linux-i686"; sha256 = "83b01feb621cb9c7c64edb125c19aa0765bc2d16b2c20551be12690f835539da"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha256 = "c5af070524b828313a5e819f4c446cdc7a72f6bffd62e734bb8752438e5d28ef"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "527c9c2dd61a318c5b6ca5e9b26ee9b81b71ae8d7c23cdab6efee1bb5caaa685"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "6f3d800c347a70c5ed7a8838365599c7401e4805037f5e980865794d395b416a"; }
+    { locale = "or"; arch = "linux-i686"; sha256 = "e5f9ba3ebe3d641b3dd948ec51dd25671327a35e5ee87b274079a8a3ce7a26b1"; }
+    { locale = "or"; arch = "linux-x86_64"; sha256 = "53fea5b84051fea6c247fe2baf9f9d3c87b3f78d4655fc8509068fd60ff3c942"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "dc8d60a3f94da475fea5c1c748c52072f69d4642ea2c3b305e92c56fb3b09324"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "c06eb60b39cef2564e248e3d9dd711b863e46cc6d45803002c641a1335927bdc"; }
+    { locale = "pl"; arch = "linux-i686"; sha256 = "95cbcf68c03ed83590b6e257003282d710c8dd366fd75bd218880735731ed7d2"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha256 = "9f59a86501cbb9d8813fbf5812646e87d400f136f2cca5d791dd5ac0bc4964c9"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "690772121588229f34e9a9d5e6042c56a3fdb9fdcafea53f45a12997cd1d1e53"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "fce60e0a3787a2362bdab4d566766c22a4b4f777d1dde7552e195eefc8fe98b1"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "35a4981bc819fa7cba9e2f73ebb28eafd68b464eacc9da4e3e651882ae8b84bd"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "eb4f25e99cc681a6113f9de016a6993e46575caba84f5cba6195c88379e4e661"; }
+    { locale = "rm"; arch = "linux-i686"; sha256 = "cef140f0b0c4da31235147871679d009f05aeec3e1b138e56bd6acabf79cb666"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha256 = "e6aba016e9909cc43a9ab285ed8cbfc15dadf2cf7bba9c78ba340512dd9bbcc5"; }
+    { locale = "ro"; arch = "linux-i686"; sha256 = "d159bd682f8db01fea12e25bc0d4c24ef2ffffca07b3c5d64223ae75d6f77d23"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha256 = "e82f1ad5461e25c25a8c6db480a733e95b81578ec280e93a52b00b650211a0ac"; }
+    { locale = "ru"; arch = "linux-i686"; sha256 = "fc2e1166c4d9614bcf9c8ccd01aa157bc229cccbdcd2854bbc52302465d24d75"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha256 = "c08fcc4457bad70ff5861168364306753df7f03d7817a52dda8c6aad74bde389"; }
+    { locale = "si"; arch = "linux-i686"; sha256 = "78f60d4ba047d323ec2a36e2f8a775d86bb2c00bb671009105f5fe368419366f"; }
+    { locale = "si"; arch = "linux-x86_64"; sha256 = "d9c84c673378721c0bc45e767176b879858ba0feacdeeca503e600567569ad33"; }
+    { locale = "sk"; arch = "linux-i686"; sha256 = "1bbddd4c07cffc083997d3b43034438eccf8647bd9b078cbca86f63c50c588ae"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha256 = "f8278a40b25bd24a951855b633218c8d0884fec7468291d947890f2e98310acb"; }
+    { locale = "sl"; arch = "linux-i686"; sha256 = "18e9f99de5847e996ab66202e8718d9844f26ffef771a236ae16ee68098853fa"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha256 = "bbc818432701696fd140e914943d076e4d11741180a04ea27f4be75ec3558d1c"; }
+    { locale = "son"; arch = "linux-i686"; sha256 = "e1d8c54d8b1149f98adb1b46c4973e01fa76bb132f0df9b0f090c4ead0ec4676"; }
+    { locale = "son"; arch = "linux-x86_64"; sha256 = "a57f3971825a40c8dfce2d987384292f1ad3ebe6a96ff762bc38e69c6ce2889f"; }
+    { locale = "sq"; arch = "linux-i686"; sha256 = "b452ab04c4bae6079bbdc293bc6c41882dac30ec1b1483340e49d072ecf2ced4"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha256 = "b8aaff5e70e7690481a5c22fb2da97ce63de67246217fb106441173573aeb4d9"; }
+    { locale = "sr"; arch = "linux-i686"; sha256 = "135f60c2012e63622d1a75cab6fd5f686fee71138b1f1f01e367fac0b3b583c8"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha256 = "ce464a8ec58fe19e037a26a1b94e346ad314eacbe94232f4b136e0fc7b3919ac"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "937bb415ca95996207c371d111a888f68a24d690db8c31b8c1df530b2b7b30a7"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "0ee83de9b3bb77a6e3d1120194700b720d441ee116f9728823c5a78f59d28a10"; }
+    { locale = "ta"; arch = "linux-i686"; sha256 = "fb908dcbc4fa42c6472e4cb5bd9d8ae7c845bbf9965498091b32f7d1669ede24"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha256 = "5c8f1c1c09ff2eccf6becf9136f9da3517fabbb0192f157676962fd3bfd31bb8"; }
+    { locale = "te"; arch = "linux-i686"; sha256 = "5478af8e757d8282993afacd10fc78bc7a207fbdc50705d2d8a665aa98e5f910"; }
+    { locale = "te"; arch = "linux-x86_64"; sha256 = "719945b8d7a945e556137cc3bdc4a8d7ddf5693e4ac49a3884f912ec471da1f5"; }
+    { locale = "th"; arch = "linux-i686"; sha256 = "4f0dfccef932beec90f7de951bb2d454bedc192b376caf25c3ba89ecdb5de9df"; }
+    { locale = "th"; arch = "linux-x86_64"; sha256 = "e14a4cdff4cc89f85043efbf56a82211f1040bc5b369c2113866efb639969017"; }
+    { locale = "tr"; arch = "linux-i686"; sha256 = "aa5bc43997a6669b1c8da7b04a12c7a16ce8b1fedae8b0bb1a317c83176e88c5"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha256 = "3a0a5883b4e4442985fa8e24a80d0849ac450a20d278858e1b3847974cc212f2"; }
+    { locale = "uk"; arch = "linux-i686"; sha256 = "3ea926ea98fd3506cdcccc32266fd8910f7c6b563818d58fa9708872712daad9"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha256 = "c1d596a00831ed30446f8a6f9e7b455329a402939d5c7318616ad182e9564aa5"; }
+    { locale = "uz"; arch = "linux-i686"; sha256 = "d17a26657562ee017388c878867ff43a1d1d86f80c86a18fcf63268b477bd889"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha256 = "7115c30ae7c0528f54aa8629402ddcfc54687e3a439d7a96c18f15e903e283c8"; }
+    { locale = "vi"; arch = "linux-i686"; sha256 = "37fe2af25d7068569770573e605f3d325e41169b3b0a82ca4ff007a0636b155b"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha256 = "5bb2b8a27065b9a71a06dbec136a1774e43fbe27a30a03092f718042d58ec26c"; }
+    { locale = "xh"; arch = "linux-i686"; sha256 = "fa44efebbc0f1174ad10f540668447ddf6bd26a2c918694dd11e63e4d6f36b9c"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha256 = "2c179d4613b0b7456d900f9b6c02a1041c39d4cf98a0ca0ea2ea97d1d7546199"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "e3c06fbffb4b2c135d31499d1a3490d23baedbed5125b46a4153ad9d60ea2fa8"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "3402f491b016e791c9f40f8ac5df5f7017dd6dd71d872020a27eae3634e4fb52"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "c77d79a6b1602c9f8c6538be18c974b8557af3ad3898910e1bccfe0a54993207"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "651e4a28750ea9376636293b934cf646b0e6981825a9801fe8bf47785114e34d"; }
   ];
 }

From 9afbbcb2a5f74369319c702d05d367dc44df5835 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Wed, 27 Jan 2016 16:58:51 +0100
Subject: [PATCH 0648/2285] gnome3.nautilus: 3.18.4 -> 3.18.5

---
 pkgs/desktops/gnome-3/3.18/core/nautilus/src.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.18/core/nautilus/src.nix b/pkgs/desktops/gnome-3/3.18/core/nautilus/src.nix
index 83809052efc3..9314e202a881 100644
--- a/pkgs/desktops/gnome-3/3.18/core/nautilus/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/nautilus/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "nautilus-3.18.4";
+  name = "nautilus-3.18.5";
 
   src = fetchurl {
-    url = mirror://gnome/sources/nautilus/3.18/nautilus-3.18.4.tar.xz;
-    sha256 = "4ff2c78dba352b4666bb30e0c80ed786eed09199fd624f00810fce4d987fcd26";
+    url = mirror://gnome/sources/nautilus/3.18/nautilus-3.18.5.tar.xz;
+    sha256 = "60a927c0522b4cced9d8f62baed2ee5e2fd4305be4523eb5bc44805971a6cc15";
   };
 }

From 286e9a00f80239e18eebb854ef2bfbfbd78bd1bd Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Wed, 27 Jan 2016 16:59:10 +0100
Subject: [PATCH 0649/2285] gnome3.gnome-calculator: 3.18.2 -> 3.18.3

---
 pkgs/desktops/gnome-3/3.18/core/gnome-calculator/src.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/src.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/src.nix
index 501e4ed0b1ee..41b03825303a 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-calculator/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "gnome-calculator-3.18.2";
+  name = "gnome-calculator-3.18.3";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-calculator/3.18/gnome-calculator-3.18.2.tar.xz;
-    sha256 = "c86c5857409ce1d01896904e97ccf0a1a880f3dcf428a524e5c0fec27b274d64";
+    url = mirror://gnome/sources/gnome-calculator/3.18/gnome-calculator-3.18.3.tar.xz;
+    sha256 = "c376a4a14a3f7946b799b8458ac4cf2694735fc7c20e90cfda29e209439e32ff";
   };
 }

From f7578a4d327560300965bd666932c11d9cdd74a8 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Wed, 27 Jan 2016 17:15:42 +0100
Subject: [PATCH 0650/2285] gitflow: 1.8.0 -> 1.9.1

---
 .../git-and-tools/gitflow/default.nix             | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
index 99c1db20fb2a..3fe7dec8f3bb 100644
--- a/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/gitflow/default.nix
@@ -1,12 +1,15 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "gitflow-${version}";
-  version = "1.8.0";
+  pname = "gitflow";
+  version = "1.9.1";
+  name = "${pname}-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/petervanderdoes/gitflow/archive/${version}.tar.gz";
-    sha256 = "1vxdawx4sinl19g59ifmrdalmr2dl5pkgawyj9z0s5mcildi6fc2";
+  src = fetchFromGitHub {
+    owner = "petervanderdoes";
+    repo = pname;
+    rev = version;
+    sha256 = "0ad2421r3iq4xrdy46f4rrqbm8r3xphqcsdj3gqy8fnlrmxw5dfw";
   };
 
   preBuild = ''

From 1bc91e43553d1c202f907f9b77682a5e35a54d28 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Wed, 27 Jan 2016 17:24:23 +0100
Subject: [PATCH 0651/2285] pithos: 1.1.1 -> 1.1.2

---
 pkgs/applications/audio/pithos/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix
index 955c776d9044..4095d672f828 100644
--- a/pkgs/applications/audio/pithos/default.nix
+++ b/pkgs/applications/audio/pithos/default.nix
@@ -2,16 +2,17 @@
 , gst_all_1, wrapGAppsHook }:
 
 pythonPackages.buildPythonPackage rec {
-  name = "pithos-${version}";
-  version = "1.1.1";
+  pname = "pithos";
+  version = "1.1.2";
+  name = "${pname}-${version}";
 
   namePrefix = "";
 
   src = fetchFromGitHub {
-    owner = "pithos";
-    repo  = "pithos";
+    owner = pname;
+    repo  = pname;
     rev = version;
-    sha256 = "0373z7g1wd3g1xl8m4ipx5n2ka67a2wcn387nyk8yvgdikm14jm3";
+    sha256 = "0zk9clfawsnwmgjbk7y5d526ksxd1pkh09ln6sb06v4ygaiifcxp";
   };
 
   postPatch = ''

From f8fae306a050af61ce26080ceac4e3c0af7ca2fe Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Wed, 27 Jan 2016 17:33:14 +0100
Subject: [PATCH 0652/2285] sshfs: Update homepage URL

---
 pkgs/tools/filesystems/sshfs-fuse/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix
index d1e33098a94f..a5b01db4cd2a 100644
--- a/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://fuse.sourceforge.net/sshfs.html;
+    homepage = https://github.com/libfuse/sshfs;
     description = "FUSE-based filesystem that allows remote filesystems to be mounted over SSH";
     platforms = platforms.linux;
     maintainers = with maintainers; [ jgeerds ];

From a4fb3c27ccdc42c4793a333a75c3d02c477401b8 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 27 Jan 2016 17:59:23 +0100
Subject: [PATCH 0653/2285] wcslib: 5.12 -> 5.13 + enableParallelBuilding

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

diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix
index ba2d1ab11fc0..12741379aaaa 100644
--- a/pkgs/development/libraries/wcslib/default.nix
+++ b/pkgs/development/libraries/wcslib/default.nix
@@ -1,16 +1,18 @@
 { fetchurl,  stdenv, flex }:
 
 stdenv.mkDerivation rec {
-  version = "5.12";
+  version = "5.13";
   name = "wcslib-${version}";
 
   buildInputs = [ flex ];
 
   src = fetchurl {
     url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2";
-    sha256 ="1r4dz5514pba2d5cc2ydpnqm85xsvy65hlvzdqayl6sl40liizsh";
+    sha256 ="1rxlp7p1b84r9fnk7m9p2ivg2cajfj88afyccrg64zlrqn5kx66n";
   };
 
+  enableParallelBuilding = true;
+
   meta = {
     description = "World Coordinate System Library for Astronomy";
     homepage = http://www.atnf.csiro.au/people/mcalabre/WCS/;

From 49f55ebf97cdfbacb13f5a3a71571cdeecb6efcf Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 27 Jan 2016 00:39:42 +0100
Subject: [PATCH 0654/2285] eclipse-plugin-scala: 4.1.1.20151201 ->
 4.3.0.201512011535

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

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 7a1643e6d2a8..627266b6af0b 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -317,11 +317,11 @@ rec {
 
   scala = buildEclipseUpdateSite rec {
     name = "scala-${version}";
-    version = "4.1.1.20151201";
+    version = "4.3.0.201512011535";
 
     src = fetchzip {
       url = "http://download.scala-ide.org/sdk/lithium/e44/scala211/stable/update-site.zip";
-      sha256 = "19iqaha9c5n5hkyn83xj8znkvshm4823d65zigbj97fz8gzrr0la";
+      sha256 = "1j0qw4frkvvmyl64wdbznglgjjr9sfg8wb9npar0x7qv1hj4hw3x";
     };
 
     meta = with stdenv.lib; {

From fdb5563bcc668b96591fa2649853c4dba771aa24 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Wed, 30 Dec 2015 01:49:56 +0800
Subject: [PATCH 0655/2285] facetimehd-firmware: init at 1.43

---
 .../firmware/facetimehd-firmware/default.nix  | 51 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix

diff --git a/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
new file mode 100644
index 000000000000..05a293083b7f
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/facetimehd-firmware/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, cpio, xz, pkgs }:
+
+let
+
+  version = "1.43";
+
+  dmgRange = "420107885-421933300"; # the whole download is 1.3GB, this cuts it down to 2MB
+
+  firmwareIn = "./System/Library/Extensions/AppleCameraInterface.kext/Contents/MacOS/AppleCameraInterface";
+  firmwareOut = "firmware.bin";
+  firmwareOffset = "81920";
+  firmwareSize = "603715";
+
+  # separated this here as the script will fail without the 'exit 0'
+  unpack = pkgs.writeScriptBin "unpack" ''
+    xzcat -Q $src | cpio --format odc -i -d ${firmwareIn}
+    exit 0
+  '';
+
+in
+
+stdenv.mkDerivation {
+
+  name = "facetimehd-firmware-${version}";
+
+  src = fetchurl {
+    url = "https://support.apple.com/downloads/DL1849/en_US/osxupd10.11.2.dmg";
+    sha256 = "1jw6sy9vj27amfak83cs2c7q856y4mk1wix3rl4q10yvd9bl4k9x";
+    curlOpts = "-r ${dmgRange}";
+  };
+
+  phases = [ "buildPhase" ];
+
+  buildInputs = [ cpio xz ];
+
+  buildPhase = ''
+    ${unpack}/bin/unpack
+    dd bs=1 skip=${firmwareOffset} count=${firmwareSize} if=${firmwareIn} of=${firmwareOut}.gz &> /dev/null
+    mkdir -p $out/lib/firmware/facetimehd
+    gunzip -c ${firmwareOut}.gz > $out/lib/firmware/facetimehd/${firmwareOut}
+  '';
+
+  meta = with stdenv.lib; {
+    description = "facetimehd firmware";
+    homepage = https://support.apple.com/downloads/DL1849;
+    license = licenses.unfree;
+    maintainers = [ maintainers.womfoo ];
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2028d2ff14c5..311cbd1f76a2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9938,6 +9938,8 @@ let
 
   eject = utillinux;
 
+  facetimehd-firmware = callPackage ../os-specific/linux/firmware/facetimehd-firmware { };
+
   fanctl = callPackage ../os-specific/linux/fanctl {
     iproute = iproute.override { enableFan = true; };
   };

From 9213916ca7a888f32d06c9220df66e789ecef8b3 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Wed, 30 Dec 2015 02:02:36 +0800
Subject: [PATCH 0656/2285] facetimehd: init at git-20160127

---
 .../hardware/video/webcam/facetimehd.nix      | 43 +++++++++++++++++++
 nixos/modules/module-list.nix                 |  1 +
 pkgs/os-specific/linux/facetimehd/default.nix | 34 +++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 4 files changed, 80 insertions(+)
 create mode 100644 nixos/modules/hardware/video/webcam/facetimehd.nix
 create mode 100644 pkgs/os-specific/linux/facetimehd/default.nix

diff --git a/nixos/modules/hardware/video/webcam/facetimehd.nix b/nixos/modules/hardware/video/webcam/facetimehd.nix
new file mode 100644
index 000000000000..83d954a0c03e
--- /dev/null
+++ b/nixos/modules/hardware/video/webcam/facetimehd.nix
@@ -0,0 +1,43 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.hardware.facetimehd;
+
+  kernelPackages = config.boot.kernelPackages;
+
+in
+
+{
+
+  options.hardware.facetimehd.enable = mkEnableOption "facetimehd kernel module";
+
+  config = mkIf cfg.enable {
+
+    assertions = singleton {
+      assertion = versionAtLeast kernelPackages.kernel.version "3.19";
+      message = "facetimehd is not supported for kernels older than 3.19";
+    };
+
+    boot.kernelModules = [ "facetimehd" ];
+
+    boot.extraModulePackages = [ kernelPackages.facetimehd ];
+
+    hardware.firmware = [ pkgs.facetimehd-firmware ];
+
+    # unload module during suspend/hibernate as it crashes the whole system
+    powerManagement.powerDownCommands = ''
+      ${pkgs.module_init_tools}/bin/rmmod -f facetimehd
+    '';
+
+    # and load it back on resume
+    powerManagement.resumeCommands = ''
+      export MODULE_DIR=/run/current-system/kernel-modules/lib/modules
+      ${pkgs.module_init_tools}/bin/modprobe -v facetimehd
+    '';
+
+  };
+
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 2ff61877c23d..48834128d9b2 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -42,6 +42,7 @@
   ./hardware/video/bumblebee.nix
   ./hardware/video/nvidia.nix
   ./hardware/video/ati.nix
+  ./hardware/video/webcam/facetimehd.nix
   ./installer/tools/auto-upgrade.nix
   ./installer/tools/nixos-checkout.nix
   ./installer/tools/tools.nix
diff --git a/pkgs/os-specific/linux/facetimehd/default.nix b/pkgs/os-specific/linux/facetimehd/default.nix
new file mode 100644
index 000000000000..06e6abfe4177
--- /dev/null
+++ b/pkgs/os-specific/linux/facetimehd/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, kernel }:
+
+# facetimehd is not supported for kernels older than 3.19";
+assert stdenv.lib.versionAtLeast kernel.version "3.19";
+
+stdenv.mkDerivation rec {
+
+  name = "facetimehd-${version}-${kernel.version}";
+  version = "git-20160127";
+
+  src = fetchFromGitHub {
+    owner = "patjak";
+    repo = "bcwc_pcie";
+    rev = "186e9f9101ed9bbd7cc8d470f840d4a74c585ca7";
+    sha256 = "1frsf6z6v94cz9fww9rbnk926jzl36fp3w2d1aw6djhzwm80a5gs";
+  };
+
+  preConfigure = ''
+    export INSTALL_MOD_PATH="$out"
+  '';
+
+  makeFlags = [
+    "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/patjak/bcwc_pcie;
+    description = "Linux driver for the Facetime HD (Broadcom 1570) PCIe webcam";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.womfoo ];
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 311cbd1f76a2..452d12e5a64f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10263,6 +10263,8 @@ let
 
     openafsClient = callPackage ../servers/openafs-client { };
 
+    facetimehd = callPackage ../os-specific/linux/facetimehd { };
+
     kernelHeaders = callPackage ../os-specific/linux/kernel-headers { };
 
     klibc = callPackage ../os-specific/linux/klibc { };

From 71a4d369832e54cb8bb732c97d1773eb14ed4bd6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Wed, 27 Jan 2016 14:00:46 -0500
Subject: [PATCH 0657/2285] zip: disable nls patch by default.

This patch breaks zip -y (symlinks are turned into regular files).

See https://bugs.gentoo.org/show_bug.cgi?id=571676#c4
---
 pkgs/tools/archivers/zip/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/archivers/zip/default.nix b/pkgs/tools/archivers/zip/default.nix
index 585bc72ad967..431ed354d21c 100644
--- a/pkgs/tools/archivers/zip/default.nix
+++ b/pkgs/tools/archivers/zip/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, enableNLS ? true, libnatspec ? null, libiconv }:
+{ stdenv, fetchurl, enableNLS ? false, libnatspec ? null, libiconv }:
 
 assert enableNLS -> libnatspec != null;
 

From a4d977e01fe50c804013cc29dbd18f5f2f4efcfc Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Tue, 15 Dec 2015 15:07:40 +0300
Subject: [PATCH 0658/2285] syncthing: support SOCKS5 proxying for relays

---
 .../modules/services/networking/syncthing.nix | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index f5d5e1d25561..67b90516b996 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -33,6 +33,17 @@ in
         '';
       };
 
+      all_proxy = mkOption {
+        type = types.string;
+        default = "";
+        example = "socks5://address.com:1234";
+        description = ''
+          Overwrites all_proxy environment variable for the syncthing process to
+          the given value. This is normaly used to let relay client connect
+          through SOCKS5 proxy server.
+        '';
+      };
+
       dataDir = mkOption {
         default = "/var/lib/syncthing";
         description = ''
@@ -51,7 +62,6 @@ in
       };
 
 
-
     };
 
   };
@@ -66,8 +76,13 @@ in
         description = "Syncthing service";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
-        environment.STNORESTART = "yes";  # do not self-restart
-        environment.STNOUPGRADE = "yes";
+        environment = {
+          STNORESTART = "yes";  # do not self-restart
+          STNOUPGRADE = "yes";
+        } //
+        (config.networking.proxy.envVars) //
+        (if cfg.all_proxy != "" then { all_proxy = cfg.all_proxy; } else {});
+
         serviceConfig = {
           User = "${cfg.user}";
           PermissionsStartOnly = true;

From f9ab62431c8dd955ac5f68c4187f08de586c7eed Mon Sep 17 00:00:00 2001
From: Sergey Mironov <grrwlf@gmail.com>
Date: Wed, 27 Jan 2016 23:12:28 +0300
Subject: [PATCH 0659/2285] urweb: version bump

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

diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix
index 3e4b0bcae5b9..f99571c6a10b 100644
--- a/pkgs/development/compilers/urweb/default.nix
+++ b/pkgs/development/compilers/urweb/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "urweb-${version}";
-  version = "20151018";
+  version = "20151220";
 
   src = fetchurl {
     url = "http://www.impredicative.com/ur/${name}.tgz";
-    sha256 = "08p52p5m1xl2gzdchnayky44mm2b0x8hv0f00iviyyv1gnx3lpy0";
+    sha256 = "155maalm4l1ni7az3yqs0lrgl5f2xr3pz4118ag1hnk82qldd4s5";
   };
 
   buildInputs = [ openssl mlton mysql postgresql sqlite ];

From 903129f770307954936c85fb5f8b0645540922b7 Mon Sep 17 00:00:00 2001
From: Arthur Noel <arthur@0compute.net>
Date: Wed, 27 Jan 2016 19:48:04 +0000
Subject: [PATCH 0660/2285] dockerTools: private registry support

* authorization token is optional
* registry url is taken from X-Docker-Endpoints header
* pull.sh correctly resumes partial layer downloads
* detjson.py does not fail on missing keys
---
 doc/functions.xml                    |  5 ++-
 pkgs/build-support/docker/detjson.py |  4 ++-
 pkgs/build-support/docker/pull.nix   |  9 ++---
 pkgs/build-support/docker/pull.sh    | 53 +++++++++++++++++-----------
 4 files changed, 40 insertions(+), 31 deletions(-)

diff --git a/doc/functions.xml b/doc/functions.xml
index 5a350a23e0ad..7d250824f785 100644
--- a/doc/functions.xml
+++ b/doc/functions.xml
@@ -489,7 +489,6 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting>
     sha256 = "1bhw5hkz6chrnrih0ymjbmn69hyfriza2lr550xyvpdrnbzr4gk2"; <co xml:id='ex-dockerTools-pullImage-4' />
 
     indexUrl = "https://index.docker.io"; <co xml:id='ex-dockerTools-pullImage-5' />
-    registryUrl = "https://registry-1.docker.io";
     registryVersion = "v1";
   }
   </programlisting>
@@ -534,8 +533,8 @@ c = lib.makeOverridable f { a = 1; b = 2; }</programlisting>
 
    <callout arearefs='ex-dockerTools-pullImage-5'>
     <para>
-     In the above example the default values are shown for the variables <varname>indexUrl</varname>,
-     <varname>registryUrl</varname> and <varname>registryVersion</varname>.
+     In the above example the default values are shown for the variables
+     <varname>indexUrl</varname> and <varname>registryVersion</varname>.
      Hence by default the Docker.io registry is used to pull the images.
     </para>
    </callout>
diff --git a/pkgs/build-support/docker/detjson.py b/pkgs/build-support/docker/detjson.py
index ba2c20a475a9..439c21313878 100644
--- a/pkgs/build-support/docker/detjson.py
+++ b/pkgs/build-support/docker/detjson.py
@@ -24,9 +24,11 @@ SAFEDELS["container_config"] = SAFEDELS["config"]
 
 def makedet(j, safedels):
     for k,v in safedels.items():
+        if k not in j:
+            continue
         if type(v) == dict:
             makedet(j[k], v)
-        elif k in j and j[k] == v:
+        elif j[k] == v:
             del j[k]
 
 def main():
diff --git a/pkgs/build-support/docker/pull.nix b/pkgs/build-support/docker/pull.nix
index 7115a83df426..a5e7acaf159f 100644
--- a/pkgs/build-support/docker/pull.nix
+++ b/pkgs/build-support/docker/pull.nix
@@ -8,13 +8,14 @@
 { imageName, imageTag ? "latest", imageId ? null
 , sha256, name ? "${imageName}-${imageTag}"
 , indexUrl ? "https://index.docker.io"
-, registryUrl ? "https://registry-1.docker.io"
 , registryVersion ? "v1"
 , curlOpts ? "" }:
 
+assert registryVersion == "v1";
+
 let layer = stdenv.mkDerivation {
   inherit name imageName imageTag imageId
-          indexUrl registryUrl registryVersion curlOpts;
+          indexUrl registryVersion curlOpts;
 
   builder = ./pull.sh;
   detjson = ./detjson.py;
@@ -34,10 +35,6 @@ let layer = stdenv.mkDerivation {
 
     # This variable allows the user to pass additional options to curl
     "NIX_CURL_FLAGS"
-
-    # This variable allows overriding the timeout for connecting to
-    # the hashed mirrors.
-    "NIX_CONNECT_TIMEOUT"
   ];
   
   # Doing the download on a remote machine just duplicates network
diff --git a/pkgs/build-support/docker/pull.sh b/pkgs/build-support/docker/pull.sh
index 8a0782780afc..7ba146e9de09 100644
--- a/pkgs/build-support/docker/pull.sh
+++ b/pkgs/build-support/docker/pull.sh
@@ -6,17 +6,20 @@ source $stdenv/setup
 # servers to need them during redirects, and work on SSL without a
 # certificate (this isn't a security problem because we check the
 # cryptographic hash of the output anyway).
-curl="curl \
- --location --max-redirs 20 \
- --retry 3 \
- --fail \
- --disable-epsv \
- --cookie-jar cookies \
- --insecure \
- $curlOpts \
- $NIX_CURL_FLAGS"
-
-baseUrl="$registryUrl/$registryVersion"
+curl=$(command -v curl)
+curl() {
+  [[ -n ${token:-} ]] && set -- -H "Authorization: Token $token" "$@"
+  $curl \
+    --location --max-redirs 20 \
+    --retry 3 \
+    --fail \
+    --disable-epsv \
+    --cookie-jar cookies \
+    --insecure \
+    $curlOpts \
+    $NIX_CURL_FLAGS \
+    "$@"
+}
 
 fetchLayer() {
     local url="$1"
@@ -26,7 +29,7 @@ fetchLayer() {
     # if we get error code 18, resume partial download
     while [ $curlexit -eq 18 ]; do
         # keep this inside an if statement, since on failure it doesn't abort the script
-        if $curl -H "Authorization: Token $token" "$url" --output "$dest"; then
+        if curl -C - "$url" --output "$dest"; then
             return 0
         else
             curlexit=$?;
@@ -36,17 +39,25 @@ fetchLayer() {
     return $curlexit
 }
 
-token="$($curl -o /dev/null -D- -H 'X-Docker-Token: true' "$indexUrl/$registryVersion/repositories/$imageName/images" | grep X-Docker-Token | tr -d '\r' | cut -d ' ' -f 2)"
+headers=$(curl -o /dev/null -D- -H 'X-Docker-Token: true' \
+          "$indexUrl/$registryVersion/repositories/$imageName/images")
 
-if [ -z "$token" ]; then
-    echo "error: registry returned no token"
-    exit 1
+header() {
+  grep $1 <<< "$headers" | tr -d '\r' | cut -d ' ' -f 2
+}
+
+# this only takes the first endpoint, more may be provided
+# https://docs.docker.com/v1.6/reference/api/docker-io_api/
+if ! registryUrl=$(header X-Docker-Endpoints); then
+  echo "error: index returned no endpoint"
+  exit 1
 fi
+baseUrl="https://$registryUrl/$registryVersion"
 
-# token="${token//\"/\\\"}"
+token="$(header X-Docker-Token || true)";
 
 if [ -z "$imageId" ]; then
-    imageId="$($curl -H "Authorization: Token $token" "$baseUrl/repositories/$imageName/tags/$imageTag")"
+    imageId="$(curl "$baseUrl/repositories/$imageName/tags/$imageTag")"
     imageId="${imageId//\"/}"
     if [ -z "$imageId" ]; then
         echo "error: no image ID found for ${imageName}:${imageTag}"
@@ -62,7 +73,7 @@ jshon -n object \
   -n object -s "$imageId" -i "$imageTag" \
   -i "$imageName" > $out/repositories
 
-$curl -H "Authorization: Token $token" "$baseUrl/images/$imageId/ancestry" -o ancestry.json
+curl "$baseUrl/images/$imageId/ancestry" -o ancestry.json
 
 layerIds=$(jshon -a -u < ancestry.json)
 for layerId in $layerIds; do
@@ -70,6 +81,6 @@ for layerId in $layerIds; do
     
     mkdir "$out/$layerId"
     echo '1.0' > "$out/$layerId/VERSION"
-    $curl -H "Authorization: Token $token" "$baseUrl/images/$layerId/json" | python $detjson > "$out/$layerId/json"
+    curl "$baseUrl/images/$layerId/json" | python $detjson > "$out/$layerId/json"
     fetchLayer "$baseUrl/images/$layerId/layer" "$out/$layerId/layer.tar"
-done
\ No newline at end of file
+done

From a6bda1a62a0555215a0fc35019154c7d922de27a Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Wed, 27 Jan 2016 22:32:34 +0000
Subject: [PATCH 0661/2285] disnix: bump to version 0.5

---
 .../disnix/DisnixWebService/default.nix                |  6 +++---
 pkgs/tools/package-management/disnix/default.nix       | 10 +++++-----
 .../package-management/disnix/disnixos/default.nix     |  6 +++---
 .../package-management/disnix/dysnomia/default.nix     |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/package-management/disnix/DisnixWebService/default.nix b/pkgs/tools/package-management/disnix/DisnixWebService/default.nix
index 65a90bfae96d..a4599cf049f9 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.4";
+  name = "DisnixWebService-0.5";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/23484798/download/4/DisnixWebService-0.4.tar.bz2;
-    sha256 = "1rfzmh4rxip8nq25fvi6vw51xb7h0nch4l06s0xgwwv4gw8p0lhm";
+    url = http://hydra.nixos.org/build/31143438/download/4/DisnixWebService-0.5.tar.bz2;
+    sha256 = "0wddrb9cf62hzfcrnyq5jn2pb8vc0bzfcl5z53aczkij0rbamw7k";
   };
   buildInputs = [ apacheAnt jdk ];
   PREFIX = ''''${env.out}'';
diff --git a/pkgs/tools/package-management/disnix/default.nix b/pkgs/tools/package-management/disnix/default.nix
index 39d8132ba097..bd215b769d41 100644
--- a/pkgs/tools/package-management/disnix/default.nix
+++ b/pkgs/tools/package-management/disnix/default.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }:
+{ stdenv, fetchurl, pkgconfig, glib, libxml2, libxslt, getopt, nixUnstable, dysnomia, libintlOrEmpty, libiconv }:
 
 stdenv.mkDerivation {
-  name = "disnix-0.4";
+  name = "disnix-0.5";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/23484781/download/4/disnix-0.4.tar.gz;
-    sha256 = "1hvjy19br4x7cvgn0rslysrp3w7jfh30s7piq6v9j2b6k6wmh2hk";
+    url = http://hydra.nixos.org/build/31143411/download/4/disnix-0.5.tar.gz;
+    sha256 = "0v0gbbcspaj67sn8ncrripa5af0m2xykyjjn2n55smz5fwx6d124";
   };
   
-  buildInputs = [ pkgconfig dbus_glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ];
+  buildInputs = [ pkgconfig glib libxml2 libxslt getopt nixUnstable libintlOrEmpty libiconv dysnomia ];
 
   dontStrip = true;
   
diff --git a/pkgs/tools/package-management/disnix/disnixos/default.nix b/pkgs/tools/package-management/disnix/disnixos/default.nix
index 4603f108d378..0dd6d5e09b6a 100644
--- a/pkgs/tools/package-management/disnix/disnixos/default.nix
+++ b/pkgs/tools/package-management/disnix/disnixos/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, disnix, socat, pkgconfig, getopt }:
 
 stdenv.mkDerivation {
-  name = "disnixos-0.3";
+  name = "disnixos-0.4";
   
   src = fetchurl {
-    url = http://hydra.nixos.org/build/23484787/download/3/disnixos-0.3.tar.gz;
-    sha256 = "08v9vbg3727mv4iyzwfnf5x3la2xjj1agbbzm8aaa09q7alqasvw";
+    url = http://hydra.nixos.org/build/31143419/download/3/disnixos-0.4.tar.gz;
+    sha256 = "0ff2k15j34b947b8pnw5xhsv9blk9kq350pcp3p3p2qclgf9ahfh";
   };
   
   buildInputs = [ socat pkgconfig disnix getopt ];
diff --git a/pkgs/tools/package-management/disnix/dysnomia/default.nix b/pkgs/tools/package-management/disnix/dysnomia/default.nix
index b5969aa327d0..720526d72a62 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.4.1";
+  name = "dysnomia-0.5";
   src = fetchurl {
-    url = http://hydra.nixos.org/build/26970202/download/1/dysnomia-0.4.1.tar.gz;
-    sha256 = "03ljlsmdpglimvql2qnr4wj8ci2hj7wcc8bqipndqcahcpcc8k0f";
+    url = http://hydra.nixos.org/build/31143399/download/1/dysnomia-0.5.tar.gz;
+    sha256 = "1dxilzcqnv60l418k1ihyh0gkai5xgzj13s9hcbbb0yp71mv7n9x";
   };
   
   preConfigure = if enableEjabberdDump then "export PATH=$PATH:${ejabberd}/sbin" else "";

From 8975148a16df483765aac2445d233b41187947b2 Mon Sep 17 00:00:00 2001
From: Christian Albrecht <christian.albrecht@mayflower.de>
Date: Wed, 27 Jan 2016 15:40:37 +0100
Subject: [PATCH 0662/2285] vagrant: 1.8.0 -> 1.8.1

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

diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix
index 36df8bba1b9f..c113dcbfb7b1 100644
--- a/pkgs/development/tools/vagrant/default.nix
+++ b/pkgs/development/tools/vagrant/default.nix
@@ -4,7 +4,7 @@
 assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
 
 let
-  version = "1.8.0";
+  version = "1.8.1";
   rake = buildRubyGem {
     inherit ruby;
     gemName = "rake";
@@ -20,12 +20,12 @@ stdenv.mkDerivation rec {
     if stdenv.system == "x86_64-linux" then
       fetchurl {
         url    = "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_x86_64.deb";
-        sha256 = "0hvi6db5lphgzsykm1wn76jj4wwmm6lshvvd0qz7ipyyyhnd7sjp";
+        sha256 = "0gb999ql4kfxd9473cx3xn6a11094dm4iyrx1dzd9v2sygh1l3pd";
       }
     else
       fetchurl {
         url    = "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_i686.deb";
-        sha256 = "1jvscbxqbhavw4q81y5718qbyj74b9lwfw3gb4c1f4jmgm08wxxk";
+        sha256 = "1nzg6i9i270xgaih381q096lb23rwxkif4ba9j62y3zjmj6az4xf";
       };
 
   meta = with stdenv.lib; {

From 06527f7783fd5a6db3b1f54430bb8d8fb282ba8c Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Wed, 20 Jan 2016 17:13:31 +0100
Subject: [PATCH 0663/2285] gpaste: 3.18.2 -> 3.18.3

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

diff --git a/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix
index 690d0ac20069..eeb2cee86cdd 100644
--- a/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/misc/gpaste/default.nix
@@ -2,12 +2,12 @@
 , pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  version = "${gnome3.version}.2";
+  version = "${gnome3.version}.3";
   name = "gpaste-${version}";
 
   src = fetchurl {
     url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
-    sha256 = "0w9d0vbqhvc78vqlsyaywmrpzibr7137398azpfh416bm6vh6d3h";
+    sha256 = "1fyrdgsn4m3fh8450qcic243sl7llfs44cdbspwpn5zb4h2hk8rj";
   };
 
   buildInputs = [ intltool autoreconfHook pkgconfig vala glib

From c67c27dc82ffc3da915d8c02cb6c41ac7011f33f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 28 Jan 2016 10:14:27 +0100
Subject: [PATCH 0664/2285] pycairo: add darwin to meta.platforms

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

diff --git a/pkgs/development/python-modules/pycairo/default.nix b/pkgs/development/python-modules/pycairo/default.nix
index 07a8e05730b7..84dfdd32a100 100644
--- a/pkgs/development/python-modules/pycairo/default.nix
+++ b/pkgs/development/python-modules/pycairo/default.nix
@@ -37,5 +37,5 @@ if (isPyPy || isPy35) then throw "pycairo not supported for interpreter ${python
   buildPhase = "${python.executable} waf";
   installPhase = "${python.executable} waf install";
 
-  meta.platforms = stdenv.lib.platforms.linux;
+  meta.platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
 }

From 2dbd7410092b5aaec6a3a100f58e4e525a35a939 Mon Sep 17 00:00:00 2001
From: Christian Albrecht <christian.albrecht@mayflower.de>
Date: Thu, 28 Jan 2016 13:27:40 +0100
Subject: [PATCH 0665/2285] nodejs-5_x: 5.4.1 -> 5.5.0

---
 pkgs/development/web/nodejs/v5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix
index 8068e0163cee..5c6fc9f644b7 100644
--- a/pkgs/development/web/nodejs/v5.nix
+++ b/pkgs/development/web/nodejs/v5.nix
@@ -7,7 +7,7 @@
 assert stdenv.system != "armv5tel-linux";
 
 let
-  version = "5.4.1";
+  version = "5.5.0";
 
   deps = {
     inherit openssl zlib libuv;
@@ -31,7 +31,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "032ylpjrnjpc4cjqkrax3slli40025kw74yk2dynp86ywgr5wibq";
+    sha256 = "0cmlk13skwag9gn1198h0ql64rv1jwwqbysq911kb6k94361i6yn";
   };
 
   configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];

From 363f667e8b9cb60ad3def1854d868d0ecfdbe7ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 28 Jan 2016 13:24:26 +0100
Subject: [PATCH 0666/2285] qt5*.qtbase: fixup output references

Hopefully I haven't missed any references in qt5*.
---
 .../libraries/qt-5/5.4/qtbase/default.nix     | 24 ++++++++++---------
 .../libraries/qt-5/5.4/qtbase/dlopen-gl.patch |  2 +-
 .../qt-5/5.4/qtbase/dlopen-resolv.patch       |  2 +-
 .../qt-5/5.4/qtbase/mkspecs-libgl.patch       |  4 ++--
 .../libraries/qt-5/5.5/qtbase/default.nix     | 22 +++++++++--------
 .../libraries/qt-5/5.5/qtbase/dlopen-gl.patch |  2 +-
 .../qt-5/5.5/qtbase/dlopen-resolv.patch       |  2 +-
 .../qt-5/5.5/qtbase/mkspecs-libgl.patch       |  4 ++--
 8 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index 5cee55398ccd..af9b3feb6df0 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -60,27 +60,27 @@ stdenv.mkDerivation {
       sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
 
       substituteInPlace qtbase/src/network/kernel/qdnslookup_unix.cpp \
-        --replace "@glibc@" "${stdenv.cc.libc}"
+        --replace "@glibc@" "${stdenv.cc.libc.out}"
       substituteInPlace qtbase/src/network/kernel/qhostinfo_unix.cpp \
-        --replace "@glibc@" "${stdenv.cc.libc}"
+        --replace "@glibc@" "${stdenv.cc.libc.out}"
 
       substituteInPlace qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp \
-        --replace "@libXcursor@" "${libXcursor}"
+        --replace "@libXcursor@" "${libXcursor.out}"
 
       substituteInPlace qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp \
-        --replace "@openssl@" "${openssl}"
+        --replace "@openssl@" "${openssl.out}"
 
       substituteInPlace qtbase/src/dbus/qdbus_symbols.cpp \
-        --replace "@dbus_libs@" "${dbus}"
+        --replace "@dbus_libs@" "${dbus.lib}"
 
       substituteInPlace \
         qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
-        --replace "@libX11@" "${libX11}"
+        --replace "@libX11@" "${libX11.out}"
     ''
     + lib.optionalString gtkStyle ''
-      substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk}"
+      substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk.out}"
       substituteInPlace qtbase/src/widgets/styles/qgtkstyle_p.cpp \
-        --replace "@gtk@" "${gtk}" \
+        --replace "@gtk@" "${gtk.out}" \
         --replace "@gnome_vfs@" "${gnome_vfs}" \
         --replace "@libgnomeui@" "${libgnomeui}" \
         --replace "@gconf@" "${GConf}"
@@ -88,8 +88,10 @@ stdenv.mkDerivation {
     + lib.optionalString mesaSupported ''
       substituteInPlace \
         qtbase/src/plugins/platforms/xcb/qglxintegration.cpp \
-        --replace "@mesa@" "${mesa}"
-      substituteInPlace qtbase/mkspecs/common/linux.conf --replace "@mesa@" "${mesa}"
+        --replace "@mesa_lib@" "${mesa.out}"
+      substituteInPlace qtbase/mkspecs/common/linux.conf \
+        --replace "@mesa_lib@" "${mesa.out}" \
+        --replace "@mesa_inc@" "${mesa.dev}"
     '';
 
   preConfigure = ''
@@ -172,7 +174,7 @@ stdenv.mkDerivation {
   # PostgreSQL autodetection fails sporadically because Qt omits the "-lpq" flag
   # if dependency paths contain the string "pq", which can occur in the hash.
   # To prevent these failures, we need to override PostgreSQL detection.
-  PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql}/lib -lpq";
+  PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";
 
   propagatedBuildInputs = [
     xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gl.patch
index d6e08cd24106..d5c4c2b97cb6 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gl.patch
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-gl.patch
@@ -10,7 +10,7 @@ Index: qt-everywhere-opensource-src-5.4.2/qtbase/src/plugins/platforms/xcb/qglxi
                  QLibrary lib(QLatin1String("GL"));
 +                if (!lib.load()) {
 +                    // Fallback to Mesa driver
-+                    lib.setFileName(QLatin1String("@mesa@/lib/libGL"));
++                    lib.setFileName(QLatin1String("@mesa_lib@/lib/libGL"));
 +                }
                  glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
              }
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-resolv.patch
index a79c806462f8..20e56bf3149e 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-resolv.patch
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-resolv.patch
@@ -7,7 +7,7 @@ Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_u
  #endif
      {
 -        lib.setFileName(QLatin1String("resolv"));
-+        lib.setFileName(QLatin1String("@glibc/lib/resolv"));
++        lib.setFileName(QLatin1String("@glibc@/lib/resolv"));
          if (!lib.load())
              return;
      }
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/mkspecs-libgl.patch
index 10115e8144ad..56ee0a411d4d 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/mkspecs-libgl.patch
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/mkspecs-libgl.patch
@@ -8,8 +8,8 @@ Index: qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf
  QMAKE_LIBDIR_X11        =
 -QMAKE_INCDIR_OPENGL     =
 -QMAKE_LIBDIR_OPENGL     =
-+QMAKE_INCDIR_OPENGL     = @mesa@/include
-+QMAKE_LIBDIR_OPENGL     = @mesa@/lib
++QMAKE_INCDIR_OPENGL     = @mesa_inc@/include
++QMAKE_LIBDIR_OPENGL     = @mesa_lib@/lib
  QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
  QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
  QMAKE_INCDIR_EGL        =
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index a4e9e57ca9e5..73fe320769cd 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -60,27 +60,27 @@ stdenv.mkDerivation {
       sed -i 's/PATHS.*NO_DEFAULT_PATH//' "qtbase/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in"
 
       substituteInPlace qtbase/src/network/kernel/qdnslookup_unix.cpp \
-        --replace "@glibc@" "${stdenv.cc.libc}"
+        --replace "@glibc@" "${stdenv.cc.libc.out}"
       substituteInPlace qtbase/src/network/kernel/qhostinfo_unix.cpp \
-        --replace "@glibc@" "${stdenv.cc.libc}"
+        --replace "@glibc@" "${stdenv.cc.libc.out}"
 
       substituteInPlace qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp \
-        --replace "@libXcursor@" "${libXcursor}"
+        --replace "@libXcursor@" "${libXcursor.out}"
 
       substituteInPlace qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp \
-        --replace "@openssl@" "${openssl}"
+        --replace "@openssl@" "${openssl.out}"
 
       substituteInPlace qtbase/src/dbus/qdbus_symbols.cpp \
-        --replace "@dbus_libs@" "${dbus}"
+        --replace "@dbus_libs@" "${dbus.lib}"
 
       substituteInPlace \
         qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \
-        --replace "@libX11@" "${libX11}"
+        --replace "@libX11@" "${libX11.out}"
     ''
     + lib.optionalString gtkStyle ''
-      substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk}"
+      substituteInPlace qtbase/src/widgets/styles/qgtk2painter.cpp --replace "@gtk@" "${gtk.out}"
       substituteInPlace qtbase/src/widgets/styles/qgtkstyle_p.cpp \
-        --replace "@gtk@" "${gtk}" \
+        --replace "@gtk@" "${gtk.out}" \
         --replace "@gnome_vfs@" "${gnome_vfs.out}" \
         --replace "@libgnomeui@" "${libgnomeui.out}" \
         --replace "@gconf@" "${GConf}"
@@ -88,8 +88,10 @@ stdenv.mkDerivation {
     + lib.optionalString mesaSupported ''
       substituteInPlace \
         qtbase/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp \
-        --replace "@mesa@" "${mesa}"
-      substituteInPlace qtbase/mkspecs/common/linux.conf --replace "@mesa@" "${mesa}"
+        --replace "@mesa_lib@" "${mesa.out}"
+      substituteInPlace qtbase/mkspecs/common/linux.conf \
+        --replace "@mesa_lib@" "${mesa.out}" \
+        --replace "@mesa_inc@" "${mesa.dev}"
     '';
 
   preConfigure = ''
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch
index 14411a95f3ac..59f510ac54da 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-gl.patch
@@ -10,7 +10,7 @@ Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/plugins/platforms/xcb/gl_in
                  QLibrary lib(QLatin1String("GL"));
 +                if (!lib.load()) {
 +                    // Fallback to Mesa driver
-+                    lib.setFileName(QLatin1String("@mesa@/lib/libGL"));
++                    lib.setFileName(QLatin1String("@mesa_lib@/lib/libGL"));
 +                }
                  glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB");
              }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch
index a79c806462f8..20e56bf3149e 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch
@@ -7,7 +7,7 @@ Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_u
  #endif
      {
 -        lib.setFileName(QLatin1String("resolv"));
-+        lib.setFileName(QLatin1String("@glibc/lib/resolv"));
++        lib.setFileName(QLatin1String("@glibc@/lib/resolv"));
          if (!lib.load())
              return;
      }
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch
index 10115e8144ad..56ee0a411d4d 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/mkspecs-libgl.patch
@@ -8,8 +8,8 @@ Index: qt-everywhere-opensource-src-5.5.1/qtbase/mkspecs/common/linux.conf
  QMAKE_LIBDIR_X11        =
 -QMAKE_INCDIR_OPENGL     =
 -QMAKE_LIBDIR_OPENGL     =
-+QMAKE_INCDIR_OPENGL     = @mesa@/include
-+QMAKE_LIBDIR_OPENGL     = @mesa@/lib
++QMAKE_INCDIR_OPENGL     = @mesa_inc@/include
++QMAKE_LIBDIR_OPENGL     = @mesa_lib@/lib
  QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL
  QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL
  QMAKE_INCDIR_EGL        =

From c9790126312119ce5a2a8ac946d9f086e7ea9f55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 28 Jan 2016 13:55:37 +0100
Subject: [PATCH 0667/2285] man-only packages: fixup after stdenv changes

Thanks to @avnik for notification.
The stdenv now auto-removes developer-only documentation
unless explicitly indicated, which wasn't a good fit for these packages.
---
 pkgs/data/documentation/man-pages/default.nix     | 3 +++
 pkgs/data/documentation/std-man-pages/default.nix | 4 +++-
 pkgs/data/documentation/stdman/default.nix        | 4 +++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix
index 5800b429ae4d..2635de05a26c 100644
--- a/pkgs/data/documentation/man-pages/default.nix
+++ b/pkgs/data/documentation/man-pages/default.nix
@@ -9,7 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "0v8zxq4scfixy3pjpw9ankvv5v8frv62khv4xm1jpkswyq6rbqcg";
   };
 
+  # keep developer docs separately (man2 and man3)
+  outputs = [ "out" "docdev" ];
   makeFlags = [ "MANDIR=$(out)/share/man" ];
+  postFixup = ''moveToOutput share/man/man2 "$docdev" '';
 
   meta = with stdenv.lib; {
     inherit version;
diff --git a/pkgs/data/documentation/std-man-pages/default.nix b/pkgs/data/documentation/std-man-pages/default.nix
index 3b45da914d25..c438f839dbda 100644
--- a/pkgs/data/documentation/std-man-pages/default.nix
+++ b/pkgs/data/documentation/std-man-pages/default.nix
@@ -2,12 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "std-man-pages-4.4.0";
-  
+
   src = fetchurl {
     url = mirror://gcc/libstdc++/doxygen/libstdc++-man.4.4.0.tar.bz2;
     sha256 = "0153py77ll759jacq41dp2z2ksr08pdcfic0rwjd6pr84dk89y9v";
   };
 
+  outputDocdev = "out";
+
   installPhase = ''
     mkdir -p $out/share/man
     cp -R * $out/share/man
diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix
index 33c002e98013..249e5b6841bf 100644
--- a/pkgs/data/documentation/stdman/default.nix
+++ b/pkgs/data/documentation/stdman/default.nix
@@ -11,13 +11,15 @@ stdenv.mkDerivation rec {
     sha256 = "09c5gjhcz97ghfrv9zkgfb1wckvmqnhbzga0xidbm1ir7640di8l";
   };
 
+  outputDocdev = "out";
+
   preConfigure = "
     patchShebangs ./configure
     patchShebangs ./do_install
   ";
 
   buildInputs = [ curl ];
-  
+
   meta = with stdenv.lib; {
     description = "Formatted C++11/14 stdlib man pages (cppreference)";
     longDescription = "stdman is a tool that parses archived HTML

From b205b587e7ab22e5e5763646369ce63ffd2ee150 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 28 Jan 2016 13:32:21 +0000
Subject: [PATCH 0668/2285] titaniumenv: remove obsolete iosWwdrCertificate
 parameter

---
 pkgs/development/mobile/titaniumenv/examples/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix
index be2ee419ff4c..02e493a83c55 100644
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@@ -4,7 +4,7 @@
 , xcodeBaseDir ? "/Applications/Xcode.app"
 , tiVersion ? "5.1.1.GA"
 , rename ? false
-, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "9.2", iosWwdrCertificate ? null
+, newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "9.2"
 , allowUnfree ? false
 , enableWirelessDistribution ? false, installURL ? null
 }:
@@ -84,7 +84,7 @@ rec {
       inherit tiVersion;
       release = true;
       rename = true;
-      inherit newBundleId iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword iosVersion iosWwdrCertificate;
+      inherit newBundleId iosMobileProvisioningProfile iosCertificate iosCertificateName iosCertificatePassword iosVersion;
       inherit enableWirelessDistribution installURL;
     };
   }

From ab84149c9986af066bd518e0970be0a344f6a5fa Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 27 Jan 2016 12:44:56 +0100
Subject: [PATCH 0669/2285] buildEnv: Pass the right number of args to addPkg

Regression introduced by 4529ed12590d7f814e40223437c7df4fea492e2d.

I've missed this in #5096, not because of a messed up rebase as I have
guessed from a comment on #12635 but missed this in the first place.

The testing I did while working on the pull request weren't exhaustive
enough to cover this, because I haven't tested with packages that use
the propagatedUserEnvPkgs attribute.

In order to make the test a bit more exhaustive this time, let's test it
using:

nix-build -E 'with import ./. {}; buildEnv {
  name = "testenv";
  paths = [
    pkgs.hello pkgs.binutils pkgs.libsoup pkgs.gnome3.yelp
    pkgs.gnome3.totem
  ];
}'

And with this commit the errors no longer show up and the environment is
built correctly.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes: #12635
---
 pkgs/build-support/buildenv/builder.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/buildenv/builder.pl b/pkgs/build-support/buildenv/builder.pl
index c505473ee722..f6cfe52dc318 100755
--- a/pkgs/build-support/buildenv/builder.pl
+++ b/pkgs/build-support/buildenv/builder.pl
@@ -169,7 +169,7 @@ while (scalar(keys %postponed) > 0) {
     my @pkgDirs = keys %postponed;
     %postponed = ();
     foreach my $pkgDir (sort @pkgDirs) {
-        addPkg($pkgDir, 2, $priorityCounter++);
+        addPkg($pkgDir, 2, $ENV{"checkCollisionContents"} eq "1", $priorityCounter++);
     }
 }
 

From 4dc36b12270cffc040fc2d862cf1ee15e3f1fa26 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 28 Jan 2016 14:35:54 +0000
Subject: [PATCH 0670/2285] titaniumenv: use version 5.1.2 by default in the
 example

---
 pkgs/development/mobile/titaniumenv/examples/default.nix        | 2 +-
 .../mobile/titaniumenv/examples/kitchensink/default.nix         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix
index 02e493a83c55..6dd80a216ded 100644
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@@ -2,7 +2,7 @@
 , systems ? [ "x86_64-linux" "x86_64-darwin" ]
 , xcodeVersion ? "7.2"
 , xcodeBaseDir ? "/Applications/Xcode.app"
-, tiVersion ? "5.1.1.GA"
+, tiVersion ? "5.1.2.GA"
 , rename ? false
 , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "9.2"
 , allowUnfree ? false
diff --git a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
index b6c012a77ef0..c2c12438b610 100644
--- a/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/kitchensink/default.nix
@@ -1,4 +1,4 @@
-{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "23" ], tiVersion ? "5.1.1.GA", release ? false
+{ titaniumenv, fetchgit, target, androidPlatformVersions ? [ "23" ], tiVersion ? "5.1.2.GA", release ? false
 , rename ? false, stdenv ? null, newBundleId ? null, iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? null, iosCertificatePassword ? null, iosVersion ? "8.1"
 , enableWirelessDistribution ? false, installURL ? null
 }:

From b4e47d1ab8dc887ec57ae42a04822eb45e43bc52 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 28 Jan 2016 14:39:21 +0000
Subject: [PATCH 0671/2285] titaniumenv: change identifier to 5.1.2.GA

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

diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
index f1ea4dc2342b..f9bb61ef43a9 100644
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@@ -9,7 +9,7 @@ rec {
   } else null;
   
   titaniumsdk = let
-    titaniumSdkFile = if tiVersion == "5.1.1.GA" then ./titaniumsdk-5.1.nix
+    titaniumSdkFile = if tiVersion == "5.1.2.GA" then ./titaniumsdk-5.1.nix
       else throw "Titanium version not supported: "+tiVersion;
     in
     import titaniumSdkFile {

From 81c8babb388a71468fea992be34e31aede01cce2 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 27 Jan 2016 01:31:23 +0100
Subject: [PATCH 0672/2285] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20151217-9-geddefc2 using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/34e1e2890fe8124c7b262c0f514e160f14676684
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/152c587fd11879bf3e53adc3d8d0e1463f71f7ba
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/9b9c0dc0e337ee769438a8da43f3a7af0279b809
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/486fdffc718b1599b6007f40530e31ea44c39f5d
---
 .../haskell-modules/configuration-lts-0.0.nix |   4 +
 .../haskell-modules/configuration-lts-0.1.nix |   4 +
 .../haskell-modules/configuration-lts-0.2.nix |   4 +
 .../haskell-modules/configuration-lts-0.3.nix |   4 +
 .../haskell-modules/configuration-lts-0.4.nix |   4 +
 .../haskell-modules/configuration-lts-0.5.nix |   4 +
 .../haskell-modules/configuration-lts-0.6.nix |   4 +
 .../haskell-modules/configuration-lts-0.7.nix |   4 +
 .../haskell-modules/configuration-lts-1.0.nix |   4 +
 .../haskell-modules/configuration-lts-1.1.nix |   4 +
 .../configuration-lts-1.10.nix                |   4 +
 .../configuration-lts-1.11.nix                |   4 +
 .../configuration-lts-1.12.nix                |   4 +
 .../configuration-lts-1.13.nix                |   4 +
 .../configuration-lts-1.14.nix                |   4 +
 .../configuration-lts-1.15.nix                |   4 +
 .../haskell-modules/configuration-lts-1.2.nix |   4 +
 .../haskell-modules/configuration-lts-1.4.nix |   4 +
 .../haskell-modules/configuration-lts-1.5.nix |   4 +
 .../haskell-modules/configuration-lts-1.7.nix |   4 +
 .../haskell-modules/configuration-lts-1.8.nix |   4 +
 .../haskell-modules/configuration-lts-1.9.nix |   4 +
 .../haskell-modules/configuration-lts-2.0.nix |   4 +
 .../haskell-modules/configuration-lts-2.1.nix |   4 +
 .../configuration-lts-2.10.nix                |   4 +
 .../configuration-lts-2.11.nix                |   4 +
 .../configuration-lts-2.12.nix                |   4 +
 .../configuration-lts-2.13.nix                |   4 +
 .../configuration-lts-2.14.nix                |   4 +
 .../configuration-lts-2.15.nix                |   4 +
 .../configuration-lts-2.16.nix                |   4 +
 .../configuration-lts-2.17.nix                |   4 +
 .../configuration-lts-2.18.nix                |   4 +
 .../configuration-lts-2.19.nix                |   4 +
 .../haskell-modules/configuration-lts-2.2.nix |   4 +
 .../configuration-lts-2.20.nix                |   4 +
 .../configuration-lts-2.21.nix                |   4 +
 .../configuration-lts-2.22.nix                |   4 +
 .../haskell-modules/configuration-lts-2.3.nix |   4 +
 .../haskell-modules/configuration-lts-2.4.nix |   4 +
 .../haskell-modules/configuration-lts-2.5.nix |   4 +
 .../haskell-modules/configuration-lts-2.6.nix |   4 +
 .../haskell-modules/configuration-lts-2.7.nix |   4 +
 .../haskell-modules/configuration-lts-2.8.nix |   4 +
 .../haskell-modules/configuration-lts-2.9.nix |   4 +
 .../haskell-modules/configuration-lts-3.0.nix |   5 +
 .../haskell-modules/configuration-lts-3.1.nix |   5 +
 .../configuration-lts-3.10.nix                |   5 +
 .../configuration-lts-3.11.nix                |   5 +
 .../configuration-lts-3.12.nix                |   5 +
 .../configuration-lts-3.13.nix                |   5 +
 .../configuration-lts-3.14.nix                |   5 +
 .../configuration-lts-3.15.nix                |   5 +
 .../configuration-lts-3.16.nix                |   5 +
 .../configuration-lts-3.17.nix                |   6 +
 .../configuration-lts-3.18.nix                |   6 +
 .../configuration-lts-3.19.nix                |   6 +
 .../haskell-modules/configuration-lts-3.2.nix |   5 +
 .../configuration-lts-3.20.nix                |   6 +
 .../configuration-lts-3.21.nix                |   7 +
 .../configuration-lts-3.22.nix                |   7 +
 .../haskell-modules/configuration-lts-3.3.nix |   5 +
 .../haskell-modules/configuration-lts-3.4.nix |   5 +
 .../haskell-modules/configuration-lts-3.5.nix |   5 +
 .../haskell-modules/configuration-lts-3.6.nix |   5 +
 .../haskell-modules/configuration-lts-3.7.nix |   5 +
 .../haskell-modules/configuration-lts-3.8.nix |   5 +
 .../haskell-modules/configuration-lts-3.9.nix |   5 +
 .../haskell-modules/configuration-lts-4.0.nix |  11 +
 .../haskell-modules/configuration-lts-4.1.nix |  11 +
 .../haskell-modules/configuration-lts-4.2.nix |  11 +
 .../haskell-modules/configuration-lts-5.0.nix |  14 +
 .../haskell-modules/hackage-packages.nix      | 687 ++++++++++++++----
 73 files changed, 888 insertions(+), 149 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index 9cda25a90573..e9ab7886bf2c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_2";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -4976,6 +4977,7 @@ self: super: {
   "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";
@@ -5060,6 +5062,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7776,6 +7779,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index 300a95e2c17c..f5ffa31c0b90 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_2";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -4976,6 +4977,7 @@ self: super: {
   "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";
@@ -5060,6 +5062,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7776,6 +7779,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 12c95ce49f95..7bfff6317298 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_2";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -4976,6 +4977,7 @@ self: super: {
   "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";
@@ -5060,6 +5062,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7776,6 +7779,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index 6e5603e3a840..0041c132ac49 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_2";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -4976,6 +4977,7 @@ self: super: {
   "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";
@@ -5060,6 +5062,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7776,6 +7779,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index a69e82064c4e..f4c19fe75705 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_2";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -4973,6 +4974,7 @@ self: super: {
   "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";
@@ -5057,6 +5059,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7772,6 +7775,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index be91dee6bc66..fdcd0e2bab6f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_2";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -4973,6 +4974,7 @@ self: super: {
   "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";
@@ -5057,6 +5059,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7772,6 +7775,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index d62988266a98..70339bd0bb73 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_2";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -4971,6 +4972,7 @@ self: super: {
   "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";
@@ -5055,6 +5057,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7768,6 +7771,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index 5e546e41bc22..38156ce2ed5f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_2";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -4971,6 +4972,7 @@ self: super: {
   "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";
@@ -5055,6 +5057,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7768,6 +7771,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index 977351aaf2a0..f6622404e5f8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_2";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -4959,6 +4960,7 @@ self: super: {
   "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";
@@ -5043,6 +5045,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7754,6 +7757,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index 865b55aa960a..dcab2aa28320 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_2";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -4953,6 +4954,7 @@ self: super: {
   "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";
@@ -5037,6 +5039,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7745,6 +7748,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index a420ff8f774f..6b041938ec1a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4937,6 +4938,7 @@ self: super: {
   "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";
@@ -5021,6 +5023,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7722,6 +7725,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index 28c5d043681b..6851fcfd4cbf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4934,6 +4935,7 @@ self: super: {
   "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";
@@ -5018,6 +5020,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7718,6 +7721,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 2f285e680dd2..50ee12bb52dc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4933,6 +4934,7 @@ self: super: {
   "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";
@@ -5017,6 +5019,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_8";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7717,6 +7720,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 01a2bf5d0821..318f7595f64b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4932,6 +4933,7 @@ self: super: {
   "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";
@@ -5016,6 +5018,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_8";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7716,6 +7719,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 6a6e7ca80973..3a378f0f3c99 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4928,6 +4929,7 @@ self: super: {
   "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";
@@ -5012,6 +5014,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_9";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7709,6 +7712,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index 76f95bd450e1..2fa448b07e10 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4924,6 +4925,7 @@ self: super: {
   "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";
@@ -5008,6 +5010,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_9";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7700,6 +7703,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index 8ab51220e9a7..b84ea04fd9ac 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_2";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_2";
@@ -4950,6 +4951,7 @@ self: super: {
   "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";
@@ -5034,6 +5036,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7739,6 +7742,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index e4dbbab73874..2bbcedea2ebf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4947,6 +4948,7 @@ self: super: {
   "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";
@@ -5031,6 +5033,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7735,6 +7738,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index be2d731b3f3a..952676714551 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4946,6 +4947,7 @@ self: super: {
   "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";
@@ -5030,6 +5032,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7734,6 +7737,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index 6617b79bd822..adcdd01ed261 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4941,6 +4942,7 @@ self: super: {
   "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";
@@ -5025,6 +5027,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7729,6 +7732,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index a9a8963aa99b..553dd0774d21 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4938,6 +4939,7 @@ self: super: {
   "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";
@@ -5022,6 +5024,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7725,6 +7728,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index f14ff6234093..eb92109fd38c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -172,6 +172,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4937,6 +4938,7 @@ self: super: {
   "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";
@@ -5021,6 +5023,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7724,6 +7727,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringsearch" = doDistribute super."stringsearch_0_3_6_5";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 94b073c821dd..8e1c69f9d0a7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4894,6 +4895,7 @@ self: super: {
   "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";
@@ -4976,6 +4978,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_11";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7641,6 +7644,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index ddcf5efcae64..18261e8ccb9d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4893,6 +4894,7 @@ self: super: {
   "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";
@@ -4975,6 +4977,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7640,6 +7643,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index c98889fa2aa9..95b74fb6ccaa 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4867,6 +4868,7 @@ self: super: {
   "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";
@@ -4947,6 +4949,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7592,6 +7595,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 472a9215257d..9a47f9dda6f4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4864,6 +4865,7 @@ self: super: {
   "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";
@@ -4943,6 +4945,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7584,6 +7587,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 0a81ae1cdf52..eddd47d1c874 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4864,6 +4865,7 @@ self: super: {
   "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";
@@ -4943,6 +4945,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7583,6 +7586,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index 7c33ed9182ec..b4614ffe878d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4862,6 +4863,7 @@ self: super: {
   "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";
@@ -4941,6 +4943,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7581,6 +7584,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 16a9b422305c..4d8ef2724d6f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4859,6 +4860,7 @@ self: super: {
   "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";
@@ -4938,6 +4940,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7577,6 +7580,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index 140483b7aded..94e9eb0184e4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4858,6 +4859,7 @@ self: super: {
   "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";
@@ -4937,6 +4939,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7572,6 +7575,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index 0fcd9376f8e5..8fc73ea3a05a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4853,6 +4854,7 @@ self: super: {
   "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";
@@ -4932,6 +4934,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7566,6 +7569,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index 94cf59753ec8..4b57e8e021f9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4848,6 +4849,7 @@ self: super: {
   "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";
@@ -4927,6 +4929,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7560,6 +7563,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index 1426832df281..c299d34ec022 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4845,6 +4846,7 @@ self: super: {
   "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";
@@ -4924,6 +4926,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7554,6 +7557,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index 9a009d2ceeba..ad3e0bad7db5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4844,6 +4845,7 @@ self: super: {
   "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";
@@ -4923,6 +4925,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7549,6 +7552,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index 534c29e83259..69e76d6b5696 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4890,6 +4891,7 @@ self: super: {
   "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";
@@ -4972,6 +4974,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7637,6 +7640,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index 5016b16e2faa..c107ba1cc83b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4843,6 +4844,7 @@ self: super: {
   "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";
@@ -4922,6 +4924,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7546,6 +7549,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index 0fbfc8cd3a32..414d0d4a4d2f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4843,6 +4844,7 @@ self: super: {
   "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";
@@ -4922,6 +4924,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7544,6 +7547,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 75fc329a187a..3915f14e98db 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4842,6 +4843,7 @@ self: super: {
   "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";
@@ -4921,6 +4923,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7542,6 +7545,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index e5d4da7183fc..a6e8bdea0bf5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4888,6 +4889,7 @@ self: super: {
   "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";
@@ -4970,6 +4972,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7635,6 +7638,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 711211614556..fbf589da2a48 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4887,6 +4888,7 @@ self: super: {
   "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";
@@ -4969,6 +4971,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7630,6 +7633,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 535b00d98b8c..950c96577cbb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4886,6 +4887,7 @@ self: super: {
   "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";
@@ -4968,6 +4970,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7628,6 +7631,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index b395091088a0..38c75d61d58f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4881,6 +4882,7 @@ self: super: {
   "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";
@@ -4963,6 +4965,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7622,6 +7625,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index d6d8ea553055..997a567ddd36 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4880,6 +4881,7 @@ self: super: {
   "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";
@@ -4962,6 +4964,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7621,6 +7624,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index 1186a62ceec3..ad0e17a2b4a3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4877,6 +4878,7 @@ self: super: {
   "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";
@@ -4959,6 +4961,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7614,6 +7617,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index cbc857982ef9..70df2406a7e9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -171,6 +171,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_3_3";
   "Chart-cairo" = dontDistribute super."Chart-cairo";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
@@ -4870,6 +4871,7 @@ self: super: {
   "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";
@@ -4952,6 +4954,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -7602,6 +7605,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "string-quote" = dontDistribute super."string-quote";
   "string-similarity" = dontDistribute super."string-similarity";
+  "string-typelits" = dontDistribute super."string-typelits";
   "stringlike" = dontDistribute super."stringlike";
   "strings" = dontDistribute super."strings";
   "stringtable-atom" = dontDistribute super."stringtable-atom";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index afbede23b991..cd610a659c45 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_5_1";
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
@@ -4316,6 +4317,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4716,6 +4718,7 @@ self: super: {
   "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";
@@ -4792,6 +4795,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -7333,6 +7337,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index b6ef780dd644..54efeb53169b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_5_1";
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
@@ -4313,6 +4314,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4713,6 +4715,7 @@ self: super: {
   "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";
@@ -4789,6 +4792,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -7326,6 +7330,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index 02f10dd48581..31a89af13be8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
@@ -4269,6 +4270,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4666,6 +4668,7 @@ self: super: {
   "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";
@@ -4742,6 +4745,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -7241,6 +7245,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index bbd0f94695ac..2a0ccf1d8545 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
@@ -4266,6 +4267,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4663,6 +4665,7 @@ self: super: {
   "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";
@@ -4739,6 +4742,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -7236,6 +7240,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index a6de95aeb09c..bae9a9efad81 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
   "CheatSheet" = dontDistribute super."CheatSheet";
@@ -4260,6 +4261,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4657,6 +4659,7 @@ self: super: {
   "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";
@@ -4733,6 +4736,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -7229,6 +7233,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index b556af7d18d0..1c0bfd5e48e3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
   "CheatSheet" = dontDistribute super."CheatSheet";
@@ -4259,6 +4260,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4656,6 +4658,7 @@ self: super: {
   "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";
@@ -4732,6 +4735,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -7226,6 +7230,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index c1d6d27fe835..46b637d6e69e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
   "CheatSheet" = dontDistribute super."CheatSheet";
@@ -4252,6 +4253,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4648,6 +4650,7 @@ self: super: {
   "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";
@@ -4724,6 +4727,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -7216,6 +7220,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 3fc3ebf81657..99fd4d5a0a8f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
   "CheatSheet" = dontDistribute super."CheatSheet";
@@ -4249,6 +4250,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4644,6 +4646,7 @@ self: super: {
   "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";
@@ -4720,6 +4723,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -7210,6 +7214,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index 7b3293b28954..d8fd3a98d386 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
   "CheatSheet" = dontDistribute super."CheatSheet";
@@ -4245,6 +4246,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4640,6 +4642,7 @@ self: super: {
   "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";
@@ -4716,6 +4719,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -7199,6 +7203,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index 186a88404c2f..bdc78a327698 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
   "CheatSheet" = dontDistribute super."CheatSheet";
@@ -4241,6 +4242,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4635,6 +4637,7 @@ self: super: {
   "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";
@@ -4711,6 +4714,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -6496,6 +6500,7 @@ self: super: {
   "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
+  "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
   "rest-client" = doDistribute super."rest-client_0_5_0_4";
   "rest-core" = doDistribute super."rest-core_0_36_0_6";
@@ -7191,6 +7196,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index beb24114b595..367f95328dc4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
   "CheatSheet" = dontDistribute super."CheatSheet";
@@ -4234,6 +4235,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4626,6 +4628,7 @@ self: super: {
   "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";
@@ -4702,6 +4705,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -6484,6 +6488,7 @@ self: super: {
   "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
+  "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
   "rest-client" = doDistribute super."rest-client_0_5_0_4";
   "rest-core" = doDistribute super."rest-core_0_36_0_6";
@@ -7178,6 +7183,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index b755da4a37f4..a14789bb313e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -162,6 +162,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
   "CheatSheet" = dontDistribute super."CheatSheet";
@@ -4226,6 +4227,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4617,6 +4619,7 @@ self: super: {
   "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";
@@ -4693,6 +4696,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -6470,6 +6474,7 @@ self: super: {
   "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
+  "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
   "rest-client" = doDistribute super."rest-client_0_5_0_4";
   "rest-core" = doDistribute super."rest-core_0_36_0_6";
@@ -7162,6 +7167,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index 7e32f849b6d2..f5f538b76fc8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_5_3";
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
@@ -4308,6 +4309,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4708,6 +4710,7 @@ self: super: {
   "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";
@@ -4784,6 +4787,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -7315,6 +7319,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index cc1db2819f23..6ebc3598ad03 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -162,6 +162,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
   "CheatSheet" = dontDistribute super."CheatSheet";
@@ -4223,6 +4224,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4614,6 +4616,7 @@ self: super: {
   "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";
@@ -4690,6 +4693,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -6464,6 +6468,7 @@ self: super: {
   "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
+  "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
   "rest-client" = doDistribute super."rest-client_0_5_0_4";
   "rest-core" = doDistribute super."rest-core_0_36_0_6";
@@ -7155,6 +7160,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index f47982478568..40d9bdc82a17 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -162,6 +162,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
   "CheatSheet" = dontDistribute super."CheatSheet";
@@ -1637,6 +1638,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_5";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -4216,6 +4218,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4605,6 +4608,7 @@ self: super: {
   "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";
@@ -4681,6 +4685,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -6451,6 +6456,7 @@ self: super: {
   "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
+  "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
   "rest-core" = doDistribute super."rest-core_0_36_0_6";
   "rest-example" = dontDistribute super."rest-example";
@@ -7131,6 +7137,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
index 5b6cb97c1408..a4f288d71cf7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -162,6 +162,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
   "CheatSheet" = dontDistribute super."CheatSheet";
@@ -1637,6 +1638,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_5";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -4213,6 +4215,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4599,6 +4602,7 @@ self: super: {
   "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";
@@ -4675,6 +4679,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -6445,6 +6450,7 @@ self: super: {
   "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
+  "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
   "rest-core" = doDistribute super."rest-core_0_36_0_6";
   "rest-example" = dontDistribute super."rest-example";
@@ -7125,6 +7131,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index fe69a6af07da..7637c65cdad4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_5_3";
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
@@ -4302,6 +4303,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4702,6 +4704,7 @@ self: super: {
   "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";
@@ -4778,6 +4781,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -7307,6 +7311,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index e204b4662741..970d4c2622a8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_5_3";
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
@@ -4302,6 +4303,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4702,6 +4704,7 @@ self: super: {
   "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";
@@ -4778,6 +4781,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -7305,6 +7309,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index c8a7531a27df..3c37a041e323 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_5_3";
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
@@ -4297,6 +4298,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4694,6 +4696,7 @@ self: super: {
   "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";
@@ -4770,6 +4773,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -7293,6 +7297,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index 5094fac64711..67e398551d15 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_5_3";
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
@@ -4294,6 +4295,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4691,6 +4693,7 @@ self: super: {
   "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";
@@ -4767,6 +4770,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -7285,6 +7289,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 89ac31497cc5..128ce65ac51f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_5_3";
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
@@ -4288,6 +4289,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4685,6 +4687,7 @@ self: super: {
   "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";
@@ -4761,6 +4764,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -7272,6 +7276,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 1a980f587413..40455e3d2f8d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_5_3";
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
@@ -4280,6 +4281,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4677,6 +4679,7 @@ self: super: {
   "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";
@@ -4753,6 +4756,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -7259,6 +7263,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 4f5197bb6c69..142bdfbec043 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -163,6 +163,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart" = doDistribute super."Chart_1_5_3";
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
@@ -4275,6 +4276,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4672,6 +4674,7 @@ self: super: {
   "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";
@@ -4748,6 +4751,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -7253,6 +7257,7 @@ self: super: {
   "string-qq" = dontDistribute super."string-qq";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index 41d40d31cee5..6076099d2699 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -162,6 +162,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-diagrams" = dontDistribute super."Chart-diagrams";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
@@ -1083,6 +1084,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_3_0_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
@@ -1527,6 +1529,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_5";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -4003,6 +4006,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4356,6 +4360,7 @@ self: super: {
   "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";
@@ -4427,6 +4432,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -5033,6 +5039,7 @@ self: super: {
   "modulespection" = dontDistribute super."modulespection";
   "modulo" = dontDistribute super."modulo";
   "moe" = dontDistribute super."moe";
+  "moesocks" = doDistribute super."moesocks_1_0_0_40";
   "mohws" = dontDistribute super."mohws";
   "monad-abort-fd" = dontDistribute super."monad-abort-fd";
   "monad-atom" = dontDistribute super."monad-atom";
@@ -5620,6 +5627,7 @@ self: super: {
   "piet" = dontDistribute super."piet";
   "piki" = dontDistribute super."piki";
   "pinboard" = dontDistribute super."pinboard";
+  "pinchot" = doDistribute super."pinchot_0_6_0_0";
   "pipe-enumerator" = dontDistribute super."pipe-enumerator";
   "pipeclip" = dontDistribute super."pipeclip";
   "pipes" = doDistribute super."pipes_4_1_7";
@@ -5844,6 +5852,7 @@ self: super: {
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
   "pub" = dontDistribute super."pub";
+  "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
   "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate";
   "pubnub" = dontDistribute super."pubnub";
@@ -6115,6 +6124,7 @@ self: super: {
   "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
+  "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
   "rest-example" = dontDistribute super."rest-example";
   "restful-snap" = dontDistribute super."restful-snap";
@@ -6757,6 +6767,7 @@ self: super: {
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index ec7cbbf490f2..516164aa9eee 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -162,6 +162,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-diagrams" = dontDistribute super."Chart-diagrams";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
@@ -1082,6 +1083,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_3_0_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
@@ -1525,6 +1527,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_5";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -3996,6 +3999,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4344,6 +4348,7 @@ self: super: {
   "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";
@@ -4415,6 +4420,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -5018,6 +5024,7 @@ self: super: {
   "modulespection" = dontDistribute super."modulespection";
   "modulo" = dontDistribute super."modulo";
   "moe" = dontDistribute super."moe";
+  "moesocks" = doDistribute super."moesocks_1_0_0_40";
   "mohws" = dontDistribute super."mohws";
   "monad-abort-fd" = dontDistribute super."monad-abort-fd";
   "monad-atom" = dontDistribute super."monad-atom";
@@ -5604,6 +5611,7 @@ self: super: {
   "piet" = dontDistribute super."piet";
   "piki" = dontDistribute super."piki";
   "pinboard" = dontDistribute super."pinboard";
+  "pinchot" = doDistribute super."pinchot_0_6_0_0";
   "pipe-enumerator" = dontDistribute super."pipe-enumerator";
   "pipeclip" = dontDistribute super."pipeclip";
   "pipes" = doDistribute super."pipes_4_1_7";
@@ -5827,6 +5835,7 @@ self: super: {
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
   "pub" = dontDistribute super."pub";
+  "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
   "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate";
   "pubnub" = dontDistribute super."pubnub";
@@ -6097,6 +6106,7 @@ self: super: {
   "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
+  "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
   "rest-example" = dontDistribute super."rest-example";
   "restful-snap" = dontDistribute super."restful-snap";
@@ -6739,6 +6749,7 @@ self: super: {
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
index 9ca6a8a3c8fb..fb60f2f5ac57 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
@@ -162,6 +162,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-diagrams" = dontDistribute super."Chart-diagrams";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
@@ -1078,6 +1079,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_3_0_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
@@ -1520,6 +1522,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_5";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -3957,6 +3960,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4297,6 +4301,7 @@ self: super: {
   "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";
@@ -4368,6 +4373,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -4967,6 +4973,7 @@ self: super: {
   "modulespection" = dontDistribute super."modulespection";
   "modulo" = dontDistribute super."modulo";
   "moe" = dontDistribute super."moe";
+  "moesocks" = doDistribute super."moesocks_1_0_0_40";
   "mohws" = dontDistribute super."mohws";
   "monad-abort-fd" = dontDistribute super."monad-abort-fd";
   "monad-atom" = dontDistribute super."monad-atom";
@@ -5549,6 +5556,7 @@ self: super: {
   "piet" = dontDistribute super."piet";
   "piki" = dontDistribute super."piki";
   "pinboard" = dontDistribute super."pinboard";
+  "pinchot" = doDistribute super."pinchot_0_6_0_0";
   "pipe-enumerator" = dontDistribute super."pipe-enumerator";
   "pipeclip" = dontDistribute super."pipeclip";
   "pipes" = doDistribute super."pipes_4_1_7";
@@ -5769,6 +5777,7 @@ self: super: {
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
   "pub" = dontDistribute super."pub";
+  "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
   "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate";
   "pubnub" = dontDistribute super."pubnub";
@@ -6037,6 +6046,7 @@ self: super: {
   "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
+  "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
   "rest-example" = dontDistribute super."rest-example";
   "restful-snap" = dontDistribute super."restful-snap";
@@ -6670,6 +6680,7 @@ self: super: {
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
index 5a4647fc77f5..7941c97d177a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
@@ -122,6 +122,7 @@ self: super: {
   "BitSyntax" = dontDistribute super."BitSyntax";
   "Bitly" = dontDistribute super."Bitly";
   "Blobs" = dontDistribute super."Blobs";
+  "BlogLiterately" = doDistribute super."BlogLiterately_0_8_1_4";
   "BluePrintCSS" = dontDistribute super."BluePrintCSS";
   "Blueprint" = dontDistribute super."Blueprint";
   "Bookshelf" = dontDistribute super."Bookshelf";
@@ -160,6 +161,7 @@ self: super: {
   "Cartesian" = dontDistribute super."Cartesian";
   "Cascade" = dontDistribute super."Cascade";
   "Catana" = dontDistribute super."Catana";
+  "ChannelT" = dontDistribute super."ChannelT";
   "Chart-diagrams" = dontDistribute super."Chart-diagrams";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
@@ -1060,6 +1062,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_3_0_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
@@ -1489,6 +1492,7 @@ self: super: {
   "blaze-html-truncate" = dontDistribute super."blaze-html-truncate";
   "blaze-json" = dontDistribute super."blaze-json";
   "blaze-shields" = dontDistribute super."blaze-shields";
+  "blaze-svg" = doDistribute super."blaze-svg_0_3_5";
   "blaze-textual-native" = dontDistribute super."blaze-textual-native";
   "blazeMarker" = dontDistribute super."blazeMarker";
   "blink1" = dontDistribute super."blink1";
@@ -2939,6 +2943,7 @@ self: super: {
   "ginsu" = dontDistribute super."ginsu";
   "gist" = dontDistribute super."gist";
   "git-all" = dontDistribute super."git-all";
+  "git-annex" = doDistribute super."git-annex_6_20160114";
   "git-checklist" = dontDistribute super."git-checklist";
   "git-date" = dontDistribute super."git-date";
   "git-embed" = dontDistribute super."git-embed";
@@ -3871,6 +3876,7 @@ self: super: {
   "hscassandra" = dontDistribute super."hscassandra";
   "hscd" = dontDistribute super."hscd";
   "hsclock" = dontDistribute super."hsclock";
+  "hscolour" = doDistribute super."hscolour_1_23";
   "hscope" = dontDistribute super."hscope";
   "hscrtmpl" = dontDistribute super."hscrtmpl";
   "hscuid" = dontDistribute super."hscuid";
@@ -4204,6 +4210,7 @@ self: super: {
   "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";
@@ -4274,6 +4281,7 @@ self: super: {
   "jsc" = dontDistribute super."jsc";
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
+  "json-ast" = dontDistribute super."json-ast";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
   "json-enumerator" = dontDistribute super."json-enumerator";
@@ -4440,6 +4448,7 @@ self: super: {
   "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_7_0_0";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
   "lat" = dontDistribute super."lat";
@@ -4856,6 +4865,7 @@ self: super: {
   "modulespection" = dontDistribute super."modulespection";
   "modulo" = dontDistribute super."modulo";
   "moe" = dontDistribute super."moe";
+  "moesocks" = doDistribute super."moesocks_1_0_0_40";
   "mohws" = dontDistribute super."mohws";
   "monad-abort-fd" = dontDistribute super."monad-abort-fd";
   "monad-atom" = dontDistribute super."monad-atom";
@@ -5426,6 +5436,7 @@ self: super: {
   "piet" = dontDistribute super."piet";
   "piki" = dontDistribute super."piki";
   "pinboard" = dontDistribute super."pinboard";
+  "pinchot" = doDistribute super."pinchot_0_6_0_0";
   "pipe-enumerator" = dontDistribute super."pipe-enumerator";
   "pipeclip" = dontDistribute super."pipeclip";
   "pipes-async" = dontDistribute super."pipes-async";
@@ -5638,6 +5649,7 @@ self: super: {
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
   "pub" = dontDistribute super."pub";
+  "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
   "publicsuffixlistcreate" = dontDistribute super."publicsuffixlistcreate";
   "pubnub" = dontDistribute super."pubnub";
@@ -5900,6 +5912,7 @@ self: super: {
   "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
+  "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
   "rest-example" = dontDistribute super."rest-example";
   "restful-snap" = dontDistribute super."restful-snap";
@@ -6520,6 +6533,7 @@ self: super: {
   "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";
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 8d1090965f8e..6112997fc01b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1829,7 +1829,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "BlogLiterately" = callPackage
+  "BlogLiterately_0_8_1_4" = callPackage
     ({ mkDerivation, base, blaze-html, bool-extras, bytestring, cmdargs
      , containers, data-default, directory, filepath, HaXml, haxr
      , highlighting-kate, hscolour, lens, mtl, pandoc, pandoc-citeproc
@@ -1849,12 +1849,14 @@ self: {
          process split strict temporary transformers
        ];
        executableHaskellDepends = [ base cmdargs ];
+       jailbreak = true;
        homepage = "http://byorgey.wordpress.com/blogliterately/";
        description = "A tool for posting Haskelly articles to blogs";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "BlogLiterately_0_8_1_5" = callPackage
+  "BlogLiterately" = callPackage
     ({ mkDerivation, base, blaze-html, bool-extras, bytestring, cmdargs
      , containers, data-default, directory, filepath, HaXml, haxr
      , highlighting-kate, hscolour, lens, mtl, pandoc, pandoc-citeproc
@@ -1877,7 +1879,6 @@ self: {
        homepage = "http://byorgey.wordpress.com/blogliterately/";
        description = "A tool for posting Haskelly articles to blogs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BlogLiterately-diagrams_0_1_4_3" = callPackage
@@ -2772,6 +2773,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ChannelT" = callPackage
+    ({ mkDerivation, base, free, mmorph, mtl, transformers-base }:
+     mkDerivation {
+       pname = "ChannelT";
+       version = "0.0.0.2";
+       sha256 = "1ca364133211d323a743424a45677e2f61051f704e80223247b8fdc86f8aa7a0";
+       libraryHaskellDepends = [ base free mmorph mtl transformers-base ];
+       homepage = "https://github.com/pthariensflame/ChannelT";
+       description = "Generalized stream processors";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "Chart_1_3_2" = callPackage
     ({ mkDerivation, array, base, colour, data-default-class, lens, mtl
      , old-locale, operational, time
@@ -5035,8 +5048,8 @@ self: {
      }:
      mkDerivation {
        pname = "EdisonCore";
-       version = "1.3.1";
-       sha256 = "9d460a8e51e5b6d36e106a49c07a40f49d7ddcd46d1b32978bccd0c8ae9a4ad8";
+       version = "1.3.1.1";
+       sha256 = "3e0720ee3b179304f563b99dd446c1d6911e31ddc4d0f78d6550b18e59ed501b";
        libraryHaskellDepends = [
          array base containers EdisonAPI mtl QuickCheck
        ];
@@ -13217,6 +13230,8 @@ self: {
        pname = "MissingH";
        version = "1.3.0.1";
        sha256 = "ba0d60673e70c64c6eebe785fb4da729bcfd3dae37fba721c7318b8df1838db3";
+       revision = "1";
+       editedCabalFile = "5d7bf9ce1efa6e8c4a9dc43ea0dc03e66aca4c5950a420d811d2701510a038a0";
        libraryHaskellDepends = [
          array base containers directory filepath hslogger HUnit mtl network
          old-locale old-time parsec process random regex-compat time unix
@@ -13404,8 +13419,8 @@ self: {
      }:
      mkDerivation {
        pname = "MonadCompose";
-       version = "0.8.3.1";
-       sha256 = "aa5bc8d00caea4fb9bce70e3a98bb7618bf567a1b0f383601a6330cec45f5b5a";
+       version = "0.8.4.1";
+       sha256 = "16efab2564b74f253d3a6e034adb2afff12e0b8dff45ac0883fff30895815186";
        libraryHaskellDepends = [
          base data-default ghc-prim mmorph monad-loops monad-products mtl
          parallel random transformers transformers-compat
@@ -22797,7 +22812,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "aeson-extra" = callPackage
+  "aeson-extra_0_3_0_0" = callPackage
     ({ mkDerivation, aeson, aeson-compat, base, base-compat, bytestring
      , containers, exceptions, hashable, parsec, quickcheck-instances
      , scientific, tasty, tasty-hunit, tasty-quickcheck
@@ -22827,7 +22842,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "aeson-extra_0_3_0_1" = callPackage
+  "aeson-extra" = callPackage
     ({ mkDerivation, aeson, aeson-compat, base, base-compat, bytestring
      , containers, exceptions, hashable, parsec, quickcheck-instances
      , scientific, tasty, tasty-hunit, tasty-quickcheck
@@ -22855,6 +22870,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson-extra_0_3_1_0" = callPackage
+    ({ mkDerivation, aeson, aeson-compat, base, base-compat, bytestring
+     , containers, exceptions, hashable, parsec, quickcheck-instances
+     , recursion-schemes, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, these, time
+     , time-parsers, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-extra";
+       version = "0.3.1.0";
+       sha256 = "d82c92ea155ee103d8feaaf772c813b4d73182a3e10f8f0739ab845cdfbb8831";
+       libraryHaskellDepends = [
+         aeson aeson-compat base base-compat bytestring containers
+         exceptions hashable parsec recursion-schemes scientific
+         template-haskell text time time-parsers transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson aeson-compat base base-compat bytestring containers
+         exceptions hashable parsec quickcheck-instances scientific tasty
+         tasty-hunit tasty-quickcheck template-haskell text these time
+         time-parsers unordered-containers vector
+       ];
+       homepage = "https://github.com/phadej/aeson-extra#readme";
+       description = "Extra goodies for aeson";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-filthy" = callPackage
     ({ mkDerivation, aeson, base, bytestring, doctest, text
      , unordered-containers
@@ -27889,6 +27933,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "amqp_0_13_1" = callPackage
+    ({ mkDerivation, base, binary, bytestring, clock, connection
+     , containers, data-binary-ieee754, hspec, hspec-expectations
+     , monad-control, network, network-uri, split, stm, text, vector
+     , xml
+     }:
+     mkDerivation {
+       pname = "amqp";
+       version = "0.13.1";
+       sha256 = "3ea6523228f1c2bf0622d52ebf73c9e3c2e2af637a7ea29908c07ff9fa0dd4ae";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring clock connection containers
+         data-binary-ieee754 monad-control network network-uri split stm
+         text vector
+       ];
+       executableHaskellDepends = [ base containers xml ];
+       testHaskellDepends = [
+         base binary bytestring clock connection containers
+         data-binary-ieee754 hspec hspec-expectations network network-uri
+         split stm text vector
+       ];
+       homepage = "https://github.com/hreinhardt/amqp";
+       description = "Client library for AMQP servers (currently only RabbitMQ)";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "amqp-conduit" = callPackage
     ({ mkDerivation, amqp, base, bytestring, conduit, exceptions, hspec
      , HUnit, lifted-base, monad-control, mtl, resourcet, text
@@ -31935,6 +32008,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "avers_0_0_14" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
+     , bytestring, clock, containers, cryptohash, filepath, hspec
+     , inflections, MonadRandom, mtl, network, network-uri
+     , resource-pool, rethinkdb-client-driver, safe, scrypt, stm
+     , template-haskell, text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "avers";
+       version = "0.0.14";
+       sha256 = "44eb3978af5da284cc152237ea5217d5706815bd1c46be1fb63251fb99e58aa1";
+       libraryHaskellDepends = [
+         aeson attoparsec base base16-bytestring bytestring clock containers
+         cryptohash filepath inflections MonadRandom mtl network network-uri
+         resource-pool rethinkdb-client-driver safe scrypt stm
+         template-haskell text time unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base base16-bytestring bytestring containers
+         cryptohash hspec inflections MonadRandom mtl resource-pool
+         rethinkdb-client-driver scrypt stm text time unordered-containers
+         vector
+       ];
+       description = "empty";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "avers-api" = callPackage
     ({ mkDerivation, aeson, avers, base, bytestring, cookie, servant
      , text, time
@@ -31952,6 +32053,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "avers-api_0_0_2" = callPackage
+    ({ mkDerivation, aeson, avers, base, bytestring, cookie, servant
+     , text, time
+     }:
+     mkDerivation {
+       pname = "avers-api";
+       version = "0.0.2";
+       sha256 = "c2f61dc6c15dc4976584ab68c086488b8d7a0ab21ff4b50c0236e3ef0f8fe4f8";
+       libraryHaskellDepends = [
+         aeson avers base bytestring cookie servant text time
+       ];
+       homepage = "http://github.com/wereHamster/avers-api";
+       description = "Types describing the core and extended Avers APIs";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "avers-server" = callPackage
     ({ mkDerivation, aeson, avers, avers-api, base, bytestring
      , bytestring-conversion, cookie, either, http-types, mtl
@@ -31972,6 +32090,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "avers-server_0_0_2" = callPackage
+    ({ mkDerivation, aeson, avers, avers-api, base, base64-bytestring
+     , bytestring, bytestring-conversion, cookie, cryptohash, either
+     , http-types, mtl, resource-pool, rethinkdb-client-driver, servant
+     , servant-server, text, time, transformers, wai, wai-websockets
+     , websockets
+     }:
+     mkDerivation {
+       pname = "avers-server";
+       version = "0.0.2";
+       sha256 = "0f02f100dd5ebaf8e3a538ef3075ecb61dbe38c1d9fad9f3e7735708ca96a55f";
+       libraryHaskellDepends = [
+         aeson avers avers-api base base64-bytestring bytestring
+         bytestring-conversion cookie cryptohash either http-types mtl
+         resource-pool rethinkdb-client-driver servant servant-server text
+         time transformers wai wai-websockets websockets
+       ];
+       homepage = "http://github.com/wereHamster/avers-server";
+       description = "Server implementation of the Avers API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "avl-static" = callPackage
     ({ mkDerivation, base, QuickCheck, test-framework
      , test-framework-quickcheck2
@@ -35419,6 +35560,8 @@ self: {
        pname = "binary-orphans";
        version = "0.1.4.0";
        sha256 = "0a952a7521747a7aacf4aa1638674130262f2efacb7121727c1932d49017f742";
+       revision = "1";
+       editedCabalFile = "be6bd79c7ab5ca7f7f4f92479064945b4242dc092f512e10497a3aafd9b625fb";
        libraryHaskellDepends = [
          aeson base binary hashable scientific semigroups tagged text
          text-binary time unordered-containers vector
@@ -38106,7 +38249,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "blaze-svg" = callPackage
+  "blaze-svg_0_3_5" = callPackage
     ({ mkDerivation, base, blaze-markup, mtl }:
      mkDerivation {
        pname = "blaze-svg";
@@ -38116,9 +38259,10 @@ self: {
        homepage = "https://github.com/deepakjois/blaze-svg";
        description = "SVG combinator library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "blaze-svg_0_3_6" = callPackage
+  "blaze-svg" = callPackage
     ({ mkDerivation, base, blaze-markup, mtl }:
      mkDerivation {
        pname = "blaze-svg";
@@ -38128,7 +38272,6 @@ self: {
        homepage = "https://github.com/deepakjois/blaze-svg";
        description = "SVG combinator library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blaze-textual_0_2_0_9" = callPackage
@@ -39870,6 +40013,34 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {system-glib = pkgs.glib;};
 
+  "bustle_0_5_4" = callPackage
+    ({ mkDerivation, base, bytestring, cairo, containers, dbus
+     , directory, filepath, gio, glib, gtk3, hgettext, HUnit, mtl, pango
+     , parsec, pcap, process, QuickCheck, setlocale, system-glib
+     , test-framework, test-framework-hunit, text, time
+     }:
+     mkDerivation {
+       pname = "bustle";
+       version = "0.5.4";
+       sha256 = "921c2cbbb957dcb02c3aa8fd1eeff3534cb437fa9eeca1c25206ad1e741a3f14";
+       isLibrary = false;
+       isExecutable = true;
+       libraryPkgconfigDepends = [ system-glib ];
+       executableHaskellDepends = [
+         base bytestring cairo containers dbus directory filepath gio glib
+         gtk3 hgettext mtl pango parsec pcap process setlocale text time
+       ];
+       testHaskellDepends = [
+         base bytestring cairo containers dbus directory filepath gtk3
+         hgettext HUnit mtl pango pcap QuickCheck setlocale test-framework
+         test-framework-hunit text
+       ];
+       homepage = "http://www.freedesktop.org/wiki/Software/Bustle/";
+       description = "Draw sequence diagrams of D-Bus traffic";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {system-glib = pkgs.glib;};
+
   "butterflies" = callPackage
     ({ mkDerivation, base, bytestring, gl-capture, GLUT, OpenGLRaw
      , OpenGLRaw21, repa, repa-devil
@@ -43178,15 +43349,15 @@ self: {
   "casadi-bindings" = callPackage
     ({ mkDerivation, base, binary, casadi, casadi-bindings-core
      , casadi-bindings-internal, cereal, containers, doctest, linear
-     , vector, vector-binary-instances
+     , spatial-math, vector, vector-binary-instances
      }:
      mkDerivation {
        pname = "casadi-bindings";
-       version = "2.4.1.6";
-       sha256 = "cc4e7f894581bf7847733dbffc0c2692c41235822e91459052ffd3b483319a48";
+       version = "2.4.1.7";
+       sha256 = "beb816ed9978392c3523aca99bf6f3a615e9a39bd67f090455505b21b430dba6";
        libraryHaskellDepends = [
          base binary casadi-bindings-core casadi-bindings-internal cereal
-         containers linear vector vector-binary-instances
+         containers linear spatial-math vector vector-binary-instances
        ];
        libraryPkgconfigDepends = [ casadi ];
        testHaskellDepends = [ base doctest ];
@@ -43744,8 +43915,8 @@ self: {
      }:
      mkDerivation {
        pname = "cassava-conduit";
-       version = "0.3.0";
-       sha256 = "ff78cceac3c0f2af3b12c7931d65def5fcd6cb1e9f3507044bdc3cc9c36572a6";
+       version = "0.3.1";
+       sha256 = "3f712d0128a0fa02ad66378f6eddb6be3c846ba666cfbb3fff138c516e6cede6";
        libraryHaskellDepends = [
          array base bifunctors bytestring cassava conduit conduit-extra
          containers mtl text
@@ -67506,8 +67677,8 @@ self: {
      }:
      mkDerivation {
        pname = "elm-init";
-       version = "1.0.1.1";
-       sha256 = "6e5d8b45552e4629040efa8026d8c756db4e105a25a2f71e6d61a484b4f6e2aa";
+       version = "1.0.2";
+       sha256 = "a0a3559b0e3abcc2cf11deaf97144fa5fc6b19dda84896cb0fdc90d90c061079";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -77187,27 +77358,28 @@ self: {
      }) {};
 
   "funbot" = callPackage
-    ({ mkDerivation, aeson, auto-update, base, bytestring, clock
-     , containers, data-default-class, feed, feed-collect
-     , funbot-ext-events, HTTP, http-client, http-client-tls
-     , http-listen, irc-fun-bot, irc-fun-color, json-state, network-uri
-     , settings, tagsoup, text, time, time-interval, time-units
-     , transformers, unordered-containers, utf8-string
+    ({ mkDerivation, aeson, auto-update, base, bytestring
+     , case-insensitive, clock, containers, data-default-class, feed
+     , feed-collect, formatting, funbot-ext-events, hashable, HTTP
+     , http-client, http-client-tls, http-listen, irc-fun-bot
+     , irc-fun-client, irc-fun-color, irc-fun-types, json-state
+     , network-uri, settings, tagsoup, text, time, time-interval
+     , time-units, transformers, unordered-containers, utf8-string
      , vcs-web-hook-parse
      }:
      mkDerivation {
        pname = "funbot";
-       version = "0.4.0.1";
-       sha256 = "444da7bc772b17de0aa329292dbe1a3ad3134990f824d6f88d6355ff28c3537e";
+       version = "0.5";
+       sha256 = "7efaf158080ee56dec38b141a7856e872eb58703c2f5d5fa501804bdabb053aa";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         aeson auto-update base bytestring clock containers
-         data-default-class feed feed-collect funbot-ext-events HTTP
-         http-client http-client-tls http-listen irc-fun-bot irc-fun-color
-         json-state network-uri settings tagsoup text time time-interval
-         time-units transformers unordered-containers utf8-string
-         vcs-web-hook-parse
+         aeson auto-update base bytestring case-insensitive clock containers
+         data-default-class feed feed-collect formatting funbot-ext-events
+         hashable HTTP http-client http-client-tls http-listen irc-fun-bot
+         irc-fun-client irc-fun-color irc-fun-types json-state network-uri
+         settings tagsoup text time time-interval time-units transformers
+         unordered-containers utf8-string vcs-web-hook-parse
        ];
        homepage = "https://notabug.org/fr33domlover/funbot";
        description = "IRC bot for fun, learning, creativity and collaboration";
@@ -77238,10 +77410,10 @@ self: {
     ({ mkDerivation, aeson, base, text }:
      mkDerivation {
        pname = "funbot-ext-events";
-       version = "0.2.0.0";
-       sha256 = "5224fee263e625708cc937356cdb5dfcf55f0cfd26bf61a8fcb9b2392aa37e26";
+       version = "0.3.0.0";
+       sha256 = "088850454d4b5e0cedd7dd80aab4d5dbfda08b251b9f3d99a0506ea27814b01c";
        libraryHaskellDepends = [ aeson base text ];
-       homepage = "https://notabug.org/fr33domlover/funbot-ext-events/";
+       homepage = "https://notabug.org/fr33domlover/funbot-ext-events";
        description = "Interact with FunBot's external events";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -78262,8 +78434,8 @@ self: {
        pname = "generic-aeson";
        version = "0.2.0.7";
        sha256 = "1ff3c270634ba8393ff019d2b2dd47a86d98cc2ec83495324fed6fe3b2fa0c1b";
-       revision = "3";
-       editedCabalFile = "c360aa4138bfd4325a48f77b2bbebf11117bb8325b76e03d194c971d4f3446d4";
+       revision = "4";
+       editedCabalFile = "3d30e4aa0f8c020eb282ff899dee145caa151bebac2894a376cd9bc577dd211a";
        libraryHaskellDepends = [
          aeson attoparsec base generic-deriving mtl tagged text
          unordered-containers vector
@@ -78547,6 +78719,8 @@ self: {
        pname = "generic-xmlpickler";
        version = "0.1.0.4";
        sha256 = "3bc18f38bdbd0071f424763172ca1117fac10309546e8eac2a29208ded593404";
+       revision = "1";
+       editedCabalFile = "89fde0e961736eea86ecca91f2c66e2e315523b48e313a6f2f3bc4ec1fc52144";
        libraryHaskellDepends = [ base generic-deriving hxt text ];
        testHaskellDepends = [
          base hxt hxt-pickle-utils tasty tasty-hunit tasty-th
@@ -79412,7 +79586,6 @@ self: {
        homepage = "https://github.com/carlohamalainen/ghc-imported-from";
        description = "Find the Haddock documentation for a symbol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-make" = callPackage
@@ -80995,7 +81168,7 @@ self: {
          inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
          inherit (pkgs) which;};
 
-  "git-annex" = callPackage
+  "git-annex_6_20160114" = callPackage
     ({ mkDerivation, aeson, async, aws, base, blaze-builder
      , bloomfilter, bup, byteable, bytestring, case-insensitive
      , clientsession, concurrent-output, conduit, conduit-extra
@@ -81054,13 +81227,14 @@ self: {
        homepage = "http://git-annex.branchable.com/";
        description = "manage files with git, without checking their contents into git";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
          inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
          inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
          inherit (pkgs) which;};
 
-  "git-annex_6_20160126" = callPackage
+  "git-annex" = callPackage
     ({ mkDerivation, aeson, async, aws, base, blaze-builder
      , bloomfilter, bup, byteable, bytestring, case-insensitive
      , clientsession, concurrent-output, conduit, conduit-extra
@@ -81119,7 +81293,6 @@ self: {
        homepage = "http://git-annex.branchable.com/";
        description = "manage files with git, without checking their contents into git";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
          inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
@@ -84979,8 +85152,8 @@ self: {
     ({ mkDerivation, base, base-unicode-symbols, containers, mtl }:
      mkDerivation {
        pname = "graph-rewriting";
-       version = "0.7.7";
-       sha256 = "2e0be0ffd95d245caa506f73553cf5d3d501b06e27de7188a1f281178ded2eef";
+       version = "0.7.8";
+       sha256 = "cece8e180698771b872f2ab18cf73eafa4704fcd0e1b0e94a1924d6f9cc2b688";
        libraryHaskellDepends = [
          base base-unicode-symbols containers mtl
        ];
@@ -91325,13 +91498,12 @@ self: {
      }:
      mkDerivation {
        pname = "hardware-edsl";
-       version = "0.1.0.0";
-       sha256 = "13fe072ff4fbad2d16c4e80749db3cfe56a90df8499e86e615c4afda38589143";
+       version = "0.1.0.1";
+       sha256 = "cb208be2c2db96264ff37bfcc81810e127d9e6faf15ab48cebe7251bd55fc38c";
        libraryHaskellDepends = [
          array base bytestring constraints containers language-vhdl mtl
          operational-alacarte pretty syntactic
        ];
-       jailbreak = true;
        homepage = "https://github.com/markus-git/hardware-edsl";
        description = "Deep embedding of hardware descriptions with code generation";
        license = stdenv.lib.licenses.bsd3;
@@ -94847,6 +95019,38 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hasql_0_19_4" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
+     , contravariant, contravariant-extras, data-default-class, dlist
+     , either, hashable, hashtables, loch-th, mtl, placeholders
+     , postgresql-binary, postgresql-libpq, profunctors, QuickCheck
+     , quickcheck-instances, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text, time, transformers
+     , uuid, vector
+     }:
+     mkDerivation {
+       pname = "hasql";
+       version = "0.19.4";
+       sha256 = "392d4fd66779940d072356621037bb75be2383ec2d1e781cf18e9dafa06764ae";
+       libraryHaskellDepends = [
+         aeson attoparsec base base-prelude bytestring contravariant
+         contravariant-extras data-default-class dlist either hashable
+         hashtables loch-th mtl placeholders postgresql-binary
+         postgresql-libpq profunctors scientific text time transformers uuid
+         vector
+       ];
+       testHaskellDepends = [
+         base base-prelude bytestring contravariant contravariant-extras
+         data-default-class dlist either hashable profunctors QuickCheck
+         quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck text time transformers uuid vector
+       ];
+       homepage = "https://github.com/nikita-volkov/hasql";
+       description = "A very efficient PostgreSQL driver and a flexible mapping API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hasql-backend_0_2_1" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, list-t, text
      , vector
@@ -95383,8 +95587,8 @@ self: {
        pname = "hastache";
        version = "0.6.1";
        sha256 = "8c8f89669d6125201d7163385ea9055ab8027a69d1513259f8fbdd53c244b464";
-       revision = "3";
-       editedCabalFile = "29ee2fa8aa0d428e48e444a4bc6f287ca4e8db25ae04db0a18d72af06129dd51";
+       revision = "4";
+       editedCabalFile = "10661eb3aea897aae7d81242de0dbba4eb412ee282d3a7343ed88ce626fd6bd8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -103722,18 +103926,18 @@ self: {
      }) {};
 
   "hothasktags" = callPackage
-    ({ mkDerivation, array, base, containers, cpphs, filepath
-     , haskell-src-exts, optparse-applicative, split
+    ({ mkDerivation, array, base, containers, cpphs, filemanip
+     , filepath, Glob, haskell-src-exts, optparse-applicative, split
      }:
      mkDerivation {
        pname = "hothasktags";
-       version = "0.3.4";
-       sha256 = "be41b5109ba887eeea36c3a2141a0e0f2d7868af728e3ccb4d828a896707d75e";
+       version = "0.3.5";
+       sha256 = "6f0ed1707e5470aacef8e8ab959f430e356a05a0ed40b4b0a37c176cc3a89426";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         array base containers cpphs filepath haskell-src-exts
-         optparse-applicative split
+         array base containers cpphs filemanip filepath Glob
+         haskell-src-exts optparse-applicative split
        ];
        homepage = "http://github.com/luqui/hothasktags";
        description = "Generates ctags for Haskell, incorporating import lists and qualified imports";
@@ -105961,7 +106165,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hscolour" = callPackage
+  "hscolour_1_23" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "hscolour";
@@ -105974,9 +106178,10 @@ self: {
        homepage = "http://code.haskell.org/~malcolm/hscolour/";
        description = "Colourise Haskell code";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hscolour_1_24" = callPackage
+  "hscolour" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
        pname = "hscolour";
@@ -105989,7 +106194,6 @@ self: {
        homepage = "http://code.haskell.org/~malcolm/hscolour/";
        description = "Colourise Haskell code";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hscope" = callPackage
@@ -108827,7 +109031,10 @@ self: {
        pname = "hstats";
        version = "0.3";
        sha256 = "12266f4e5212f72826281346058c1667f28af8fdb5292aab4f115ca2e01b6013";
+       revision = "1";
+       editedCabalFile = "0dcd5745170aeea7a6970ad9042c1043cc073f4fe40403af5795af09f9a062bf";
        libraryHaskellDepends = [ base haskell98 ];
+       jailbreak = true;
        homepage = "http://github.com/unmarshal/hstats/";
        description = "Statistical Computing in Haskell";
        license = stdenv.lib.licenses.bsd3;
@@ -113501,6 +113708,32 @@ self: {
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
+  "hzulip_1_1_1_3" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, conduit
+     , exceptions, hspec, http-client, http-client-tls, http-types, lens
+     , lens-aeson, mtl, raw-strings-qq, scotty, stm, stm-conduit, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "hzulip";
+       version = "1.1.1.3";
+       sha256 = "a49c129e665984ebfc013bffdf7f997b76e7362fb66d622e5f43a35ba1468661";
+       libraryHaskellDepends = [
+         aeson base bytestring conduit exceptions http-client
+         http-client-tls http-types lens lens-aeson mtl stm stm-conduit text
+         transformers
+       ];
+       testHaskellDepends = [
+         aeson async base bytestring conduit exceptions hspec http-client
+         http-client-tls http-types lens lens-aeson mtl raw-strings-qq
+         scotty stm stm-conduit text transformers
+       ];
+       homepage = "https://github.com/yamadapc/hzulip";
+       description = "A haskell wrapper for the Zulip API";
+       license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "i18n" = callPackage
     ({ mkDerivation, array, base, containers, directory, filepath, mtl
      , old-locale, old-time, parsec, utf8-string
@@ -117591,35 +117824,38 @@ self: {
      }) {};
 
   "irc-fun-bot" = callPackage
-    ({ mkDerivation, aeson, auto-update, base, clock, containers
-     , fast-logger, irc-fun-client, irc-fun-messages, json-state, time
+    ({ mkDerivation, aeson, auto-update, base, case-insensitive, clock
+     , containers, data-default-class, fast-logger, formatting
+     , irc-fun-client, irc-fun-types, json-state, text, time
      , time-interval, time-units, transformers, unordered-containers
      }:
      mkDerivation {
        pname = "irc-fun-bot";
-       version = "0.5.0.0";
-       sha256 = "1104c508068dcfba3f8c60c39d5cc8ccb9b264af57097e8fa2b61e68e3754b51";
+       version = "0.6.0.0";
+       sha256 = "1284142d5957d8b30975fb9178908cec8414d60cebd5b5e6d04af6c41809cd82";
        libraryHaskellDepends = [
-         aeson auto-update base clock containers fast-logger irc-fun-client
-         irc-fun-messages json-state time time-interval time-units
+         aeson auto-update base case-insensitive clock containers
+         data-default-class fast-logger formatting irc-fun-client
+         irc-fun-types json-state text time time-interval time-units
          transformers unordered-containers
        ];
-       jailbreak = true;
        homepage = "http://rel4tion.org/projects/irc-fun-bot/";
        description = "Library for writing fun IRC bots";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
   "irc-fun-client" = callPackage
-    ({ mkDerivation, auto-update, base, fast-logger, irc-fun-messages
-     , network, time, time-units, unordered-containers
+    ({ mkDerivation, auto-update, base, bytestring, connection
+     , data-default-class, fast-logger, hashable, irc-fun-messages
+     , irc-fun-types, text, time, time-units, unordered-containers
      }:
      mkDerivation {
        pname = "irc-fun-client";
-       version = "0.4.0.0";
-       sha256 = "2567be16b259a37a4234a1716bef694d6f1ce6c3b7c9f553d9d0a12a0be65c33";
+       version = "0.5.0.0";
+       sha256 = "a8a6bb0835fd2ff4b0697306d76d639802ced44dba23b8e661ed8e4aea31525a";
        libraryHaskellDepends = [
-         auto-update base fast-logger irc-fun-messages network time
+         auto-update base bytestring connection data-default-class
+         fast-logger hashable irc-fun-messages irc-fun-types text time
          time-units unordered-containers
        ];
        homepage = "http://rel4tion.org/projects/irc-fun-client/";
@@ -117628,32 +117864,48 @@ self: {
      }) {};
 
   "irc-fun-color" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, dlist, formatting, irc-fun-types, text
+     , text-show
+     }:
      mkDerivation {
        pname = "irc-fun-color";
-       version = "0.1.0.1";
-       sha256 = "8b87a8c9e6325f6185b42c213bc56aa8bee080f20ef1fdf53c1c8b26031bf088";
-       revision = "1";
-       editedCabalFile = "91737e98e11349079179790b93588c5c52a6ef31eb96bf4dfc99eb7672b96696";
-       libraryHaskellDepends = [ base ];
-       testHaskellDepends = [ base ];
+       version = "0.2.0.0";
+       sha256 = "d08930a2d5b39411515cd1477804416a0d1882cb4af716cfdddffc0bf3e20780";
+       libraryHaskellDepends = [
+         base dlist formatting irc-fun-types text text-show
+       ];
+       testHaskellDepends = [ base text ];
        homepage = "http://rel4tion.org/projects/irc-fun-color/";
        description = "Add color and style decorations to IRC messages";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
   "irc-fun-messages" = callPackage
-    ({ mkDerivation, base, regex-applicative }:
+    ({ mkDerivation, base, irc-fun-types, regex-applicative, text }:
      mkDerivation {
        pname = "irc-fun-messages";
-       version = "0.2.0.1";
-       sha256 = "b54ab9b8a259c49a495f111bc7a56c5cd50334c4708dea6e3f06b66534325198";
-       libraryHaskellDepends = [ base regex-applicative ];
+       version = "0.3.0.0";
+       sha256 = "bfabe5cd9eff9d2e41c7adf0b7729fee4713a133a1f9da6b2b410753c0ecd04f";
+       libraryHaskellDepends = [
+         base irc-fun-types regex-applicative text
+       ];
        homepage = "http://rel4tion.org/projects/irc-fun-messages/";
        description = "Types and functions for working with the IRC protocol";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "irc-fun-types" = callPackage
+    ({ mkDerivation, base, text }:
+     mkDerivation {
+       pname = "irc-fun-types";
+       version = "0.1.0.0";
+       sha256 = "818255949173d1c4fb982f8bef99d9261b1b7ee77ad3183872d4a0fcbfe5341f";
+       libraryHaskellDepends = [ base text ];
+       homepage = "http://hub.darcs.net/fr33domlover/irc-fun-types";
+       description = "Common types for IRC related packages";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "ircbot" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , irc, mtl, network, parsec, random, SafeSemaphore, stm, time, unix
@@ -119330,6 +119582,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "json-ast" = callPackage
+    ({ mkDerivation, base, scientific, text, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "json-ast";
+       version = "0.1";
+       sha256 = "8f66d6a977794f21cc5a9af8551ed237ff57677b5777f269a1cebd8e05a3141f";
+       libraryHaskellDepends = [
+         base scientific text unordered-containers vector
+       ];
+       homepage = "https://github.com/nikita-volkov/json-ast";
+       description = "Universal JSON AST datastructure";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "json-autotype_0_2_5_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, filepath
      , GenericPretty, hashable, hflags, lens, mtl, pretty, process
@@ -120021,6 +120289,8 @@ self: {
        pname = "json-schema";
        version = "0.7.4.1";
        sha256 = "560d6a17d6eab734f43d329e51967e3ed62f8df2a6fea4a92d06359fe77d7c96";
+       revision = "1";
+       editedCabalFile = "4d1dfd0f92e4a804930e202d9e8078d63dcfec2b002d1e863cbc95f648e004e0";
        libraryHaskellDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -124227,7 +124497,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "language-thrift" = callPackage
+  "language-thrift_0_7_0_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-discover, lens
      , parsers, QuickCheck, template-haskell, text, transformers
      , trifecta, wl-pprint
@@ -124250,6 +124520,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "language-thrift" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-discover, lens
+     , parsers, QuickCheck, text, transformers, trifecta, wl-pprint
+     }:
+     mkDerivation {
+       pname = "language-thrift";
+       version = "0.7.0.1";
+       sha256 = "67d26a72529fe49bb3e9a9cc087dc5ee302ba3cf19b62cda601e9a68adfbbdc5";
+       libraryHaskellDepends = [
+         ansi-wl-pprint base lens parsers text transformers trifecta
+         wl-pprint
+       ];
+       testHaskellDepends = [
+         ansi-wl-pprint base hspec hspec-discover parsers QuickCheck text
+         trifecta wl-pprint
+       ];
+       homepage = "https://github.com/abhinav/language-thrift";
+       description = "Parser and pretty printer for the Thrift IDL format";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-typescript" = callPackage
     ({ mkDerivation, base, containers, parsec, pretty }:
      mkDerivation {
@@ -124266,8 +124558,8 @@ self: {
     ({ mkDerivation, base, pretty }:
      mkDerivation {
        pname = "language-vhdl";
-       version = "0.1.2.4";
-       sha256 = "f3a19de12610c6273138467bfc89795e98d7dddc1064f8e1a947b0d8c16fe93b";
+       version = "0.1.2.6";
+       sha256 = "87d000bdf5872b26329980825c0dd668ae6070f48e32836d13e3817ad10f7ddc";
        libraryHaskellDepends = [ base pretty ];
        homepage = "https://github.com/markus-git/language-vhdl";
        description = "VHDL AST and pretty printer in Haskell";
@@ -127478,8 +127770,8 @@ self: {
      }:
      mkDerivation {
        pname = "link-relations";
-       version = "0.1.0.0";
-       sha256 = "4944ffa47d4758135c40f776634e1f7b542c8886ef62b61f224a973c143173cb";
+       version = "0.1.1.0";
+       sha256 = "3d6805c4e0f78239d3aedfa0baf9b488da9163058e5d4c58e4b7440b508cbb2a";
        libraryHaskellDepends = [
          base bytestring hashable unordered-containers uri-bytestring
        ];
@@ -132185,14 +132477,14 @@ self: {
     ({ mkDerivation, base, containers, hspec, parsec, QuickCheck }:
      mkDerivation {
        pname = "mappy";
-       version = "0.1.0.0";
-       sha256 = "5164ba7bc9e920252e00e0e01357b929f16795bf7f032e122c8ddaf85e1e038a";
+       version = "0.1.0.2";
+       sha256 = "138923424b51cfa0008fa9224af8327f1455c097421c7ec4969a4689790230af";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base containers parsec ];
        executableHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base containers hspec parsec QuickCheck ];
-       homepage = "http://github.com/githubuser/mappy#readme";
+       homepage = "https://github.com/PolyglotSymposium/mappy";
        description = "A functional programming language focused around maps";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -135749,7 +136041,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "moesocks" = callPackage
+  "moesocks_1_0_0_40" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring
      , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens
      , lens-aeson, mtl, network, optparse-applicative, random, stm
@@ -135770,9 +136062,10 @@ self: {
        homepage = "https://github.com/nfjinjing/moesocks";
        description = "A functional firewall killer";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "moesocks_1_0_0_41" = callPackage
+  "moesocks" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, binary, bytestring
      , containers, cryptohash, hslogger, HsOpenSSL, iproute, lens
      , lens-aeson, mtl, network, optparse-applicative, random, stm
@@ -135793,7 +136086,6 @@ self: {
        homepage = "https://github.com/nfjinjing/moesocks";
        description = "A functional firewall killer";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mohws" = callPackage
@@ -135987,6 +136279,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monad-control_1_0_0_5" = callPackage
+    ({ mkDerivation, base, stm, transformers, transformers-base
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "monad-control";
+       version = "1.0.0.5";
+       sha256 = "055f715701c82e2c238282e363807d5bd6300e82cb38eaf37283987bfa8943f9";
+       libraryHaskellDepends = [
+         base stm transformers transformers-base transformers-compat
+       ];
+       homepage = "https://github.com/basvandijk/monad-control";
+       description = "Lift control operations, like exception catching, through monad transformers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-coroutine_0_8" = callPackage
     ({ mkDerivation, base, monad-parallel, transformers }:
      mkDerivation {
@@ -141124,38 +141433,37 @@ self: {
      }) {};
 
   "nested-routes" = callPackage
-    ({ mkDerivation, attoparsec, base, base64-bytestring, blaze-builder
-     , bytestring, composition-extra, containers, cookie, cryptonite
-     , data-default, errors, hspec, hspec-wai, http-types, iso8601-time
-     , lucid, memory, mtl, poly-arity, pred-trie, regex-compat
-     , semigroups, stm, text, time, transformers, tries, utf8-string
-     , wai-extra, wai-middleware-content-type, wai-middleware-verbs
-     , wai-session, wai-transformers, warp
+    ({ mkDerivation, attoparsec, base, bytestring, composition-extra
+     , errors, exceptions, hashable, hspec, hspec-wai, 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
      }:
      mkDerivation {
        pname = "nested-routes";
-       version = "6.1.0";
-       sha256 = "9eddbc6ce2fa029a54f27c753bc28c7093f8a351a5ae6d4fec11b6ec6d4fd8b1";
+       version = "7.0.0";
+       sha256 = "eac01cd730d3cbcafab4a0ac2b6b8c3ca8cdcd31f996379092f2f60bc31c21a2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         attoparsec base bytestring composition-extra containers mtl
-         poly-arity pred-trie regex-compat semigroups text transformers
-         tries wai-middleware-content-type wai-middleware-verbs
-         wai-transformers
+         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 base64-bytestring blaze-builder bytestring
-         composition-extra containers cookie cryptonite data-default errors
-         http-types iso8601-time lucid memory mtl poly-arity pred-trie
-         regex-compat semigroups stm text time transformers tries
-         utf8-string wai-extra wai-middleware-content-type
-         wai-middleware-verbs wai-session wai-transformers warp
+         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 containers hspec
-         hspec-wai http-types mtl poly-arity pred-trie regex-compat
-         semigroups text transformers tries wai-middleware-content-type
+         attoparsec base bytestring composition-extra errors exceptions
+         hashable hspec hspec-wai http-types mtl poly-arity pred-trie
+         regex-compat semigroups text transformers tries
+         unordered-containers wai-middleware-content-type
          wai-middleware-verbs wai-transformers
        ];
        description = "Declarative, compositional Wai responses";
@@ -152767,7 +153075,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pinchot" = callPackage
+  "pinchot_0_6_0_0" = callPackage
     ({ mkDerivation, base, containers, Earley, lens, template-haskell
      , transformers
      }:
@@ -152783,9 +153091,10 @@ self: {
        homepage = "http://www.github.com/massysett/pinchot";
        description = "Build parsers and ASTs for context-free grammars";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pinchot_0_8_0_0" = callPackage
+  "pinchot" = callPackage
     ({ mkDerivation, base, containers, Earley, lens, template-haskell
      , transformers
      }:
@@ -152801,6 +153110,24 @@ self: {
        homepage = "http://www.github.com/massysett/pinchot";
        description = "Build parsers and ASTs for context-free grammars";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "pinchot_0_10_0_0" = callPackage
+    ({ mkDerivation, base, containers, Earley, lens, template-haskell
+     , transformers
+     }:
+     mkDerivation {
+       pname = "pinchot";
+       version = "0.10.0.0";
+       sha256 = "59a9e3b5e5eb323b11fba24d90d7f371e22653d46bf7a31b9676220a0e78a797";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers Earley lens template-haskell transformers
+       ];
+       homepage = "http://www.github.com/massysett/pinchot";
+       description = "Build parsers and ASTs for context-free grammars";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -155796,6 +156123,35 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "postgresql-binary_0_7_6" = callPackage
+    ({ mkDerivation, aeson, base, base-prelude, binary-parser
+     , bytestring, conversion, conversion-bytestring, conversion-text
+     , either, foldl, loch-th, placeholders, postgresql-libpq
+     , QuickCheck, quickcheck-instances, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text, time, transformers
+     , uuid, vector
+     }:
+     mkDerivation {
+       pname = "postgresql-binary";
+       version = "0.7.6";
+       sha256 = "19a2ed82a6f924194b79d6a0759299495f802c00d5b563841decacb8adb30a42";
+       libraryHaskellDepends = [
+         aeson base base-prelude binary-parser bytestring foldl loch-th
+         placeholders scientific text time transformers uuid vector
+       ];
+       testHaskellDepends = [
+         base base-prelude bytestring conversion conversion-bytestring
+         conversion-text either loch-th placeholders postgresql-libpq
+         QuickCheck quickcheck-instances scientific tasty tasty-hunit
+         tasty-quickcheck tasty-smallcheck text time transformers uuid
+         vector
+       ];
+       homepage = "https://github.com/nikita-volkov/postgresql-binary";
+       description = "Encoders and decoders for the PostgreSQL's binary format";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "postgresql-config" = callPackage
     ({ mkDerivation, aeson, base, bytestring, monad-control, mtl
      , postgresql-simple, resource-pool, time
@@ -158939,7 +159295,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "publicsuffix" = callPackage
+  "publicsuffix_0_20151212" = callPackage
     ({ mkDerivation, base, filepath, hspec, template-haskell }:
      mkDerivation {
        pname = "publicsuffix";
@@ -158950,9 +159306,10 @@ self: {
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
        description = "The publicsuffix list exposed as proper Haskell types";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "publicsuffix_0_20160126" = callPackage
+  "publicsuffix" = callPackage
     ({ mkDerivation, base, filepath, hspec, template-haskell }:
      mkDerivation {
        pname = "publicsuffix";
@@ -158963,7 +159320,6 @@ self: {
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
        description = "The publicsuffix list exposed as proper Haskell types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "publicsuffixlist" = callPackage
@@ -165495,7 +165851,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "resourcet" = callPackage
+  "resourcet_1_1_7" = callPackage
     ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
      , mmorph, monad-control, mtl, transformers, transformers-base
      , transformers-compat
@@ -165512,9 +165868,10 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Deterministic allocation and freeing of scarce resources";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "resourcet_1_1_7_1" = callPackage
+  "resourcet" = callPackage
     ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
      , mmorph, monad-control, mtl, transformers, transformers-base
      , transformers-compat
@@ -165531,7 +165888,6 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Deterministic allocation and freeing of scarce resources";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "respond" = callPackage
@@ -173474,6 +173830,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-swagger_0_1_2" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec
+     , http-media, lens, servant, swagger2, text, time
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "servant-swagger";
+       version = "0.1.2";
+       sha256 = "44b189a3dabe0b2f6dd5fe8366b81df5622bd9435674670a8fe3e67ecf1e9c1b";
+       libraryHaskellDepends = [
+         aeson base bytestring http-media lens servant swagger2 text
+         unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base hspec lens servant swagger2 text time
+       ];
+       homepage = "https://github.com/dmjio/servant-swagger";
+       description = "Generate Swagger specification for your servant API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "servant-yaml" = callPackage
     ({ mkDerivation, aeson, base, base-compat, bytestring, http-media
      , servant, servant-server, wai, warp, yaml
@@ -174003,16 +174381,12 @@ self: {
      }) {};
 
   "settings" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, time-units
-     , unordered-containers
-     }:
+    ({ mkDerivation, base, text, unordered-containers }:
      mkDerivation {
        pname = "settings";
-       version = "0.2.2.0";
-       sha256 = "8ca39518d7ed4d0575dbb3bce2064aca006c449765c842906d07484fecf0b831";
-       libraryHaskellDepends = [
-         aeson aeson-pretty base bytestring time-units unordered-containers
-       ];
+       version = "0.3.0.0";
+       sha256 = "48e36d5337bcfe077acd4db4d1a2c03b15f0423cf02731a87c4cc494b2c8cbc2";
+       libraryHaskellDepends = [ base text unordered-containers ];
        homepage = "http://rel4tion.org/projects/settings/";
        description = "Runtime-editable program settings";
        license = stdenv.lib.licenses.publicDomain;
@@ -180635,8 +181009,8 @@ self: {
      }:
      mkDerivation {
        pname = "spatial-math";
-       version = "0.2.5.0";
-       sha256 = "3fbdac29649d0bba318766e271eab808732acd529667c4a9f064aab2858d3ef8";
+       version = "0.2.7.0";
+       sha256 = "a40636d9639ebd4f81b6b10a25ffd3f03af7e3a904d80ac00d2c6892d9ad2859";
        libraryHaskellDepends = [
          base binary cereal ghc-prim lens linear
        ];
@@ -185484,6 +185858,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "string-typelits" = callPackage
+    ({ mkDerivation, base, template-haskell, type-combinators
+     , type-combinators-quote
+     }:
+     mkDerivation {
+       pname = "string-typelits";
+       version = "0.1.0.0";
+       sha256 = "ff35b6eb25b8e7a18f3fd495c8c911acf3e866876cb521c44bae31ef2934abbb";
+       libraryHaskellDepends = [
+         base template-haskell type-combinators type-combinators-quote
+       ];
+       homepage = "https://github.com/kylcarte/string-typelits";
+       description = "Type-level Chars and Strings, with decidable equality";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "stringable" = callPackage
     ({ mkDerivation, base, bytestring, system-filepath, text }:
      mkDerivation {
@@ -198400,6 +198790,8 @@ self: {
        pname = "uhttpc";
        version = "0.1.1.0";
        sha256 = "cbfa7b8d008c766be1055dca52f467cfded9e5577405b96a8bd622fc5146cece";
+       revision = "1";
+       editedCabalFile = "ff2f7c17cf679f095238229bd36f5438c5f2a6ed2279eee34daf1a3ceef9ba48";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -198409,7 +198801,6 @@ self: {
          async base bytestring bytestring-lexing deepseq network
          optparse-applicative
        ];
-       jailbreak = true;
        homepage = "https://github.com/hvr/uhttpc";
        description = "Minimal HTTP client library optimized for benchmarking";
        license = stdenv.lib.licenses.gpl3;
@@ -201803,10 +202194,8 @@ self: {
     ({ mkDerivation, aeson, base, bytestring, text }:
      mkDerivation {
        pname = "vcs-web-hook-parse";
-       version = "0.1.0.0";
-       sha256 = "578cceeed56d13410a33663987268c85f3c54693759cb6dc4e008b3953217961";
-       revision = "1";
-       editedCabalFile = "c43fff776c16fd1de7f9a9c1464de4ed773634ff0ca48a6eb5e008d07f292357";
+       version = "0.2.0.0";
+       sha256 = "db8293f8edabf50787d0290c15fe1971abdc9104c8e2e561757671993f23950a";
        libraryHaskellDepends = [ aeson base bytestring text ];
        homepage = "http://rel4tion.org/projects/vcs-web-hook-parse/";
        description = "Parse development platform web hook messages";
@@ -205132,8 +205521,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-middleware-content-type";
-       version = "0.3.0";
-       sha256 = "2fadb84ee1f8a25d3e3d4f07bb8c92056eccf8bd3c0dabadb0a860653407f7c4";
+       version = "0.4.0";
+       sha256 = "bccf5fb49c39cde628d8e73b4afff934186cba6824a8b04501bb3fbada4229eb";
        libraryHaskellDepends = [
          aeson base blaze-builder blaze-html bytestring clay exceptions
          hashable http-media http-types lucid mmorph monad-control
@@ -205147,7 +205536,7 @@ self: {
          shakespeare tasty tasty-hspec text transformers transformers-base
          unordered-containers urlpath wai wai-transformers warp
        ];
-       description = "Route to different middlewares based on the incoming Accept header";
+       description = "A simple WAI library for responding with content";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -208350,16 +208739,17 @@ self: {
 
   "webfinger-client" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default-class
-     , hashable, http-client, http-client-tls, http-types, text
-     , unordered-containers, uri-bytestring
+     , hashable, http-client, http-client-tls, http-types
+     , link-relations, text, unordered-containers, uri-bytestring
      }:
      mkDerivation {
        pname = "webfinger-client";
-       version = "0.1.0.0";
-       sha256 = "e3b1a231ebe4bc957eddcf24a19ee5d90134b9a95984a75a945c8dc4b17a56e0";
+       version = "0.2.0.0";
+       sha256 = "1311f198704ba1dc9439a20427e1d909ceab86dbd196d31ded52835291b85a2a";
        libraryHaskellDepends = [
          aeson base bytestring data-default-class hashable http-client
-         http-client-tls http-types text unordered-containers uri-bytestring
+         http-client-tls http-types link-relations text unordered-containers
+         uri-bytestring
        ];
        homepage = "http://hub.darcs.net/fr33domlover/webfinger-client";
        description = "WebFinger client library";
@@ -217737,14 +218127,13 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-markdown";
-       version = "0.10.0";
-       sha256 = "f1039ae939be04bdb9480206e5029f73c95f686bdda07f81e43a218ddc653959";
+       version = "0.11.0";
+       sha256 = "80465e11fc54ee786109f8e2d2d6c4560ee44e5a1de46618c95c56eeb29ea433";
        libraryHaskellDepends = [
          base blaze-html blaze-markup bytestring directory pandoc persistent
          shakespeare texmath text xss-sanitize yesod-core yesod-form
        ];
        testHaskellDepends = [ base blaze-html hspec text ];
-       jailbreak = true;
        homepage = "http://github.com/pbrisbin/yesod-markdown";
        description = "Tools for using markdown in a yesod application";
        license = stdenv.lib.licenses.gpl2;

From a9b0bfe3bbf184feac007786119ef4d8b33bcc91 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 28 Jan 2016 08:09:01 -0500
Subject: [PATCH 0673/2285] ghc-imported-from: builds again

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index eea3adad2f8e..6fd1a0471c2f 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -1259,7 +1259,6 @@ dont-distribute-packages:
   ghc-exactprint:                               [ x86_64-darwin ]
   ghci-diagrams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghci-haskeline:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghc-imported-from:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghclive:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-parmake:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
   ghc-pkg-autofix:                              [ i686-linux, x86_64-linux, x86_64-darwin ]

From a1cd11aff45bc66d2fecb46b9cf0023822bc4062 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Thu, 28 Jan 2016 16:19:18 +0000
Subject: [PATCH 0674/2285] titaniumenv: remove obsolete android configuration
 steps

---
 pkgs/development/mobile/titaniumenv/build-app.nix | 5 -----
 pkgs/development/mobile/titaniumenv/default.nix   | 2 +-
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index 0de6c58e7267..a99ab8d2d795 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -51,11 +51,6 @@ stdenv.mkDerivation {
         ''
           titanium config --config-file $TMPDIR/config.json --no-colors android.sdk ${androidsdkComposition}/libexec/android-sdk-*
           titanium config --config-file $TMPDIR/config.json --no-colors android.buildTools.selectedVersion 23.0.1
-          titanium config --config-file $TMPDIR/config.json --no-colors android.buildTools.path ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*
-          titanium config --config-file $TMPDIR/config.json android.executables.zipalign ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*/zipalign
-          titanium config --config-file $TMPDIR/config.json android.executables.aapt ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*/aapt
-          titanium config --config-file $TMPDIR/config.json android.executables.aidl ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*/aidl
-          titanium config --config-file $TMPDIR/config.json android.executables.dx ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*/dx
           
           export PATH=$(echo ${androidsdkComposition}/libexec/android-sdk-*/tools):$(echo ${androidsdkComposition}/libexec/android-sdk-*/build-tools/android-*):$PATH
           
diff --git a/pkgs/development/mobile/titaniumenv/default.nix b/pkgs/development/mobile/titaniumenv/default.nix
index f9bb61ef43a9..579456188d00 100644
--- a/pkgs/development/mobile/titaniumenv/default.nix
+++ b/pkgs/development/mobile/titaniumenv/default.nix
@@ -1,4 +1,4 @@
-{pkgs, pkgs_i686, xcodeVersion ? "7.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "5.1.1.GA"}:
+{pkgs, pkgs_i686, xcodeVersion ? "7.2", xcodeBaseDir ? "/Applications/Xcode.app", tiVersion ? "5.1.2.GA"}:
 
 rec {
   androidenv = pkgs.androidenv;

From 7b8cd1dce93ba87aa1a93db1b5bf45eae4704fd4 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Thu, 28 Jan 2016 11:58:33 -0500
Subject: [PATCH 0675/2285] watchman: 4.1.0 -> 4.3.0

* improved handling of case insensitive filenames
* improved reliability of symlink change detection on osx
---
 pkgs/development/tools/watchman/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix
index b2029391b745..2f02a7a4a1f8 100644
--- a/pkgs/development/tools/watchman/default.nix
+++ b/pkgs/development/tools/watchman/default.nix
@@ -5,13 +5,13 @@
 stdenv.mkDerivation rec {
   name = "watchman-${version}";
 
-  version = "4.1.0";
+  version = "4.3.0";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "watchman";
     rev = "v${version}";
-    sha256 = "01ak2gsmc76baswpivzz00g22r547mpp8l7xfziwl5804nzszrcg";
+    sha256 = "0dcaklw4d42z8hndy9zsdqqv1q8r18wnwldgdgjvp5c9vijvgyrd";
   };
 
   buildInputs = [ autoconf automake pcre ];
@@ -20,6 +20,9 @@ stdenv.mkDerivation rec {
       "--enable-lenient"
       "--enable-conffile=${if confFile == null then "no" else confFile}"
       "--with-pcre=yes"
+
+      # For security considerations re: --disable-statedir, see:
+      # https://github.com/facebook/watchman/issues/178
       "--disable-statedir"
   ];
 

From 9695e139ecc5a767da0345a3cf18f74640d3e7fd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Jan 2016 11:15:14 -0600
Subject: [PATCH 0676/2285] qt55.qtbase: fix path typo in resolv patch

---
 pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch
index a79c806462f8..20e56bf3149e 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/dlopen-resolv.patch
@@ -7,7 +7,7 @@ Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_u
  #endif
      {
 -        lib.setFileName(QLatin1String("resolv"));
-+        lib.setFileName(QLatin1String("@glibc/lib/resolv"));
++        lib.setFileName(QLatin1String("@glibc@/lib/resolv"));
          if (!lib.load())
              return;
      }

From 9e743fd1519ceb447baa715edea558db1c4d160c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Jan 2016 11:15:58 -0600
Subject: [PATCH 0677/2285] qt54.qtbase: fix path typo in resolv patch

---
 pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-resolv.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-resolv.patch b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-resolv.patch
index a79c806462f8..20e56bf3149e 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-resolv.patch
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/dlopen-resolv.patch
@@ -7,7 +7,7 @@ Index: qt-everywhere-opensource-src-5.5.1/qtbase/src/network/kernel/qdnslookup_u
  #endif
      {
 -        lib.setFileName(QLatin1String("resolv"));
-+        lib.setFileName(QLatin1String("@glibc/lib/resolv"));
++        lib.setFileName(QLatin1String("@glibc@/lib/resolv"));
          if (!lib.load())
              return;
      }

From 2ecb6b4574399cf710f09061357ae59526743a05 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 28 Jan 2016 18:56:04 +0100
Subject: [PATCH 0678/2285] openssl: 1.0.1q -> 1.0.1r

CVE-2015-3197 (low severity)
---
 pkgs/development/libraries/openssl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 21e7706be8cb..4e009e5306d6 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -8,14 +8,14 @@ let
     stdenv.cross;
 in
 stdenv.mkDerivation rec {
-  name = "openssl-1.0.1q";
+  name = "openssl-1.0.1r";
 
   src = fetchurl {
     urls = [
       "http://www.openssl.org/source/${name}.tar.gz"
       "http://openssl.linux-mirror.org/source/${name}.tar.gz"
     ];
-    sha256 = "1dvz0hx7fjxag06b51pawy154y6d2xajm5rwxmfnlq7ax628nrdk";
+    sha256 = "0iik7a3b0mrfrxzngdf7ywfscg9inbw77y0jp2ccw0gdap9xhjvq";
   };
 
   outputs = [ "out" "man" ];

From 5583ecf361c839bbe2d0bd9e9ad89f796d596cf1 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Tue, 26 Jan 2016 21:48:57 -0500
Subject: [PATCH 0679/2285] mongodb: 3.0.7 -> 3.2.1

Fixes #12639
---
 pkgs/servers/nosql/mongodb/default.nix        | 34 ++++++++++++-------
 .../nosql/mongodb/valgrind-include.patch      | 25 ++++++++++++++
 2 files changed, 46 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/servers/nosql/mongodb/valgrind-include.patch

diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 60a37456b4bb..2ea255e4432d 100644
--- a/pkgs/servers/nosql/mongodb/default.nix
+++ b/pkgs/servers/nosql/mongodb/default.nix
@@ -2,17 +2,21 @@
 , zlib, libyamlcpp, sasl, openssl, libpcap, wiredtiger
 }:
 
+# Note:
+# The command line tools are written in Go as part of a different package (mongodb-tools)
+
 with stdenv.lib;
 
-let version = "3.0.7";
+let version = "3.2.1";
     system-libraries = [
       "pcre"
+      #"asio" -- XXX use package?
       #"wiredtiger"
       "boost"
       "snappy"
       "zlib"
-      # "v8"
-      # "stemmer" -- not nice to package yet (no versioning, no makefile, no shared libs)
+      #"valgrind" -- mongodb only requires valgrind.h, which is vendored in the source.
+      #"stemmer"  -- not nice to package yet (no versioning, no makefile, no shared libs).
       "yaml"
     ] ++ optionals stdenv.isLinux [ "tcmalloc" ];
     buildInputs = [
@@ -21,19 +25,17 @@ let version = "3.0.7";
     ]; # ++ optional stdenv.is64bit wiredtiger;
 
     other-args = concatStringsSep " " ([
-      # these are opt-in, lol
-      "--cc-use-shell-environment"
-      "--cxx-use-shell-environment"
-
-      "--c++11=on"
       "--ssl"
       #"--rocksdb" # Don't have this packaged yet
       "--wiredtiger=${if stdenv.is64bit then "on" else "off"}"
-      "--js-engine=v8-3.25"
+      "--js-engine=mozjs"
       "--use-sasl-client"
       "--disable-warnings-as-errors"
-      "--variant-dir=nixos" # Needed so we don't produce argument lists that are too long for gcc / ld
-      "--extrapath=${concatStringsSep "," buildInputs}"
+      "VARIANT_DIR=nixos" # Needed so we don't produce argument lists that are too long for gcc / ld
+      "CC=$CC"
+      "CXX=$CXX"
+      "CCFLAGS=\"${concatStringsSep " " (map (input: "-I${input}/include") buildInputs)}\""
+      "LINKFLAGS=\"${concatStringsSep " " (map (input: "-L${input}/lib") buildInputs)}\""
     ] ++ map (lib: "--use-system-${lib}") system-libraries);
 
 in stdenv.mkDerivation rec {
@@ -41,12 +43,18 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz";
-    sha256 = "1rx7faqsq733vdriavdfmvx75nhjq9nm5bgwd3hw1cxzqgkvl99d";
+    sha256 = "059gskly8maj2c9iy46gccx7a9ya522pl5aaxl5vss5bllxilhsh";
   };
 
   nativeBuildInputs = [ scons ];
   inherit buildInputs;
 
+  # When not building with the system valgrind, the build should use the
+  # vendored header file - regardless of whether or not we're using the system
+  # tcmalloc - so we need to lift the include path manipulation out of the
+  # conditional.
+  patches = [ ./valgrind-include.patch ];
+
   postPatch = ''
     # fix environment variable reading
     substituteInPlace SConstruct \
@@ -76,7 +84,7 @@ in stdenv.mkDerivation rec {
     homepage = http://www.mongodb.org;
     license = licenses.agpl3;
 
-    maintainers = with maintainers; [ bluescreen303 offline wkennington ];
+    maintainers = with maintainers; [ bluescreen303 offline wkennington cstrahan ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/servers/nosql/mongodb/valgrind-include.patch b/pkgs/servers/nosql/mongodb/valgrind-include.patch
new file mode 100644
index 000000000000..6b401525c080
--- /dev/null
+++ b/pkgs/servers/nosql/mongodb/valgrind-include.patch
@@ -0,0 +1,25 @@
+diff --git a/src/mongo/util/SConscript b/src/mongo/util/SConscript
+index 6add602..6e232d8 100644
+--- a/src/mongo/util/SConscript
++++ b/src/mongo/util/SConscript
+@@ -241,9 +241,6 @@ if get_option('allocator') == 'tcmalloc':
+         # Add in the include path for our vendored tcmalloc.
+         tcmspEnv.InjectThirdPartyIncludePaths('gperftools')
+ 
+-        # Include valgrind since tcmalloc disables itself while running under valgrind
+-        tcmspEnv.InjectThirdPartyIncludePaths('valgrind')
+-
+         # If our changes to tcmalloc are ever upstreamed, this should become set based on a top
+         # level configure check, though its effects should still be scoped just to these files.
+         tcmspEnv.Append(
+@@ -252,6 +249,10 @@ if get_option('allocator') == 'tcmalloc':
+             ]
+         )
+ 
++    # Include valgrind since tcmalloc disables itself while running under valgrind
++    if not use_system_version_of_library('valgrind'):
++        tcmspEnv.InjectThirdPartyIncludePaths('valgrind')
++
+     tcmspEnv.Library(
+         target='tcmalloc_set_parameter',
+         source=[

From a654e783c65bcdfcfb701ddf168949bc29e884e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 28 Jan 2016 17:21:29 -0200
Subject: [PATCH 0680/2285] eclipse-plugin-cup: init at 1.0.0.201412081321

---
 pkgs/applications/editors/eclipse/plugins.nix | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 7a1643e6d2a8..ce078d17edd2 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -212,6 +212,45 @@ rec {
     };
   };
 
+  cup = buildEclipsePluginBase rec {
+    name = "cup-${version}";
+    version = "1.0.0.201412081321";
+
+    srcFeature = fetchurl {
+      url = "http://www2.in.tum.de/projects/cup/eclipse/features/CupEclipsePluginFeature_${version}.jar";
+      sha256 = "353513445f77ed144687bafc20ab85dc31f2f95ffdc47f102ab773ab0b7afb8b";
+    };
+
+    srcPlugin1 = fetchurl {
+      url = "http://www2.in.tum.de/projects/cup/eclipse/plugins/CupReferencedLibraries_${version}.jar";
+      sha256 = "082b5ed8730ad065efaac6ea2812dae15669ae74a49778911125b171bea41187";
+    };
+
+    srcPlugin2 = fetchurl {
+      url = "http://www2.in.tum.de/projects/cup/eclipse/plugins/de.tum.in.www2.CupPlugin_${version}.jar";
+      sha256 = "6b67937fa11944b0330173a9d8564a19eccd705e76b96291d80077a1d7344939";
+    };
+
+    srcs = [ srcFeature srcPlugin1 srcPlugin2 ];
+
+    phases = [ "installPhase" ];
+
+    installPhase = ''
+      dropinDir="$out/eclipse/dropins/${name}"
+      mkdir -p $dropinDir/features
+      unzip ${srcFeature} -d $dropinDir/features/
+      mkdir -p $dropinDir/plugins
+      cp -v ${srcPlugin1} ${srcPlugin2} $dropinDir/plugins/
+    '';
+
+    meta = with stdenv.lib; {
+      homepage = http://www2.cs.tum.edu/projects/cup/eclipse.php;
+      description = "IDE for developing CUP based parsers";
+      platforms = platforms.all;
+      maintainers = [ maintainers.romildo ];
+    };
+  };
+
   eclemma = buildEclipseUpdateSite rec {
     name = "eclemma-${version}";
     version = "2.3.2.201409141915";

From a92c2cb994788ff362fdf27f72beea32d773affc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 28 Jan 2016 20:35:00 +0100
Subject: [PATCH 0681/2285] openssl_1_0_2: high-severity security update e -> f

Fixes CVE-2016-0701 and CVE-2015-3197.
---
 pkgs/development/libraries/openssl/1.0.2.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openssl/1.0.2.x.nix b/pkgs/development/libraries/openssl/1.0.2.x.nix
index 0c9c62dfb92b..c94033d0fefd 100644
--- a/pkgs/development/libraries/openssl/1.0.2.x.nix
+++ b/pkgs/development/libraries/openssl/1.0.2.x.nix
@@ -8,14 +8,14 @@ let
     stdenv.cross;
 in
 stdenv.mkDerivation rec {
-  name = "openssl-1.0.2e";
+  name = "openssl-1.0.2f";
 
   src = fetchurl {
     urls = [
       "http://www.openssl.org/source/${name}.tar.gz"
       "http://openssl.linux-mirror.org/source/${name}.tar.gz"
     ];
-    sha256 = "1zqb1rff1wikc62a7vj5qxd1k191m8qif5d05mwdxz2wnzywlg72";
+    sha256 = "932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c";
   };
 
   patches = optional stdenv.isCygwin ./1.0.1-cygwin64.patch;

From bfebc7342e42ebe7a57c9e21b11ab19579189bfd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 29 Jan 2016 02:32:05 +0100
Subject: [PATCH 0682/2285] Fix some references to deprecated
 /etc/ssl/certs/ca-bundle.crt

---
 nixos/modules/programs/venus.nix               |  2 +-
 nixos/modules/security/ca.nix                  | 10 +++++-----
 nixos/modules/services/misc/nix-daemon.nix     |  2 +-
 nixos/modules/services/monitoring/dd-agent.nix |  2 +-
 nixos/modules/services/networking/ddclient.nix |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/programs/venus.nix b/nixos/modules/programs/venus.nix
index 8f85b602fe2c..c3756b4838c7 100644
--- a/nixos/modules/programs/venus.nix
+++ b/nixos/modules/programs/venus.nix
@@ -165,7 +165,7 @@ in
         script = "exec venus-planet ${configFile}";
         serviceConfig.User = "${cfg.user}";
         serviceConfig.Group = "${cfg.group}";
-        environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
+        environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt";
         startAt = cfg.dates;
       };
 
diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix
index ddfad52d42ed..98d73ed25426 100644
--- a/nixos/modules/security/ca.nix
+++ b/nixos/modules/security/ca.nix
@@ -4,7 +4,7 @@ with lib;
 
 let
 
-  caBundle = pkgs.runCommand "ca-bundle.crt"
+  caCertificates = pkgs.runCommand "ca-certificates.crt"
     { files =
         config.security.pki.certificateFiles ++
         [ (builtins.toFile "extra.crt" (concatStringsSep "\n" config.security.pki.certificates)) ];
@@ -26,7 +26,7 @@ in
       description = ''
         A list of files containing trusted root certificates in PEM
         format. These are concatenated to form
-        <filename>/etc/ssl/certs/ca-bundle.crt</filename>, which is
+        <filename>/etc/ssl/certs/ca-certificates.crt</filename>, which is
         used by many programs that use OpenSSL, such as
         <command>curl</command> and <command>git</command>.
       '';
@@ -56,13 +56,13 @@ in
     security.pki.certificateFiles = [ "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt" ];
 
     # NixOS canonical location + Debian/Ubuntu/Arch/Gentoo compatibility.
-    environment.etc."ssl/certs/ca-certificates.crt".source = caBundle;
+    environment.etc."ssl/certs/ca-certificates.crt".source = caCertificates;
 
     # Old NixOS compatibility.
-    environment.etc."ssl/certs/ca-bundle.crt".source = caBundle;
+    environment.etc."ssl/certs/ca-bundle.crt".source = caCertificates;
 
     # CentOS/Fedora compatibility.
-    environment.etc."pki/tls/certs/ca-bundle.crt".source = caBundle;
+    environment.etc."pki/tls/certs/ca-bundle.crt".source = caCertificates;
 
     environment.sessionVariables =
       { SSL_CERT_FILE          = "/etc/ssl/certs/ca-certificates.crt";
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index da03eb17e302..8e984727a80e 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -364,7 +364,7 @@ in
           ++ optionals cfg.distributedBuilds [ pkgs.gzip ];
 
         environment = cfg.envVars
-          // { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-bundle.crt"; }
+          // { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt"; }
           // config.networking.proxy.envVars;
 
         serviceConfig =
diff --git a/nixos/modules/services/monitoring/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent.nix
index 8c847af3bfc0..ed9be73ba65b 100644
--- a/nixos/modules/services/monitoring/dd-agent.nix
+++ b/nixos/modules/services/monitoring/dd-agent.nix
@@ -183,7 +183,7 @@ in {
         Restart = "always";
         RestartSec = 2;
       };
-      environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
+      environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt";
       restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig ];
     };
 
diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix
index ee06dfbbca3a..e60520c742bd 100644
--- a/nixos/modules/services/networking/ddclient.nix
+++ b/nixos/modules/services/networking/ddclient.nix
@@ -127,7 +127,7 @@ in
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
 
-      environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-bundle.crt";
+      environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt";
       serviceConfig = {
         # Uncomment this if too many problems occur:
         # Type = "forking";

From 5da15c6b766eaebf62d75d83dcd0e387c0df1705 Mon Sep 17 00:00:00 2001
From: Dan Peebles <dev.peebles.dan@dev.bwater.com>
Date: Thu, 28 Jan 2016 21:26:32 -0500
Subject: [PATCH 0683/2285] botocore/awscli: upgrade to 1.3.23/1.10.1

I'm upgrading both at once because they need to be upgraded in tandem
---
 pkgs/top-level/python-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2584604282c2..e6b0d1b061f2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1121,11 +1121,11 @@ in modules // {
 
   awscli = buildPythonPackage rec {
     name = "awscli-${version}";
-    version = "1.9.12";
+    version = "1.10.1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/a/awscli/${name}.tar.gz";
-      sha256 = "0b50de084c8de70adf45c0e938b6350344d9b6acde8b7cdee02cb32964bc58fd";
+      sha256 = "159c8nfcighlkcbdzck102cp06g7rpgbbvxpb73vjymgqrzqywvb";
     };
 
     # No tests included
@@ -2303,12 +2303,12 @@ in modules // {
   };
 
   botocore = buildPythonPackage rec {
-    version = "1.3.12"; # This version is required by awscli
+    version = "1.3.23"; # This version is required by awscli
     name = "botocore-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz";
-      sha256 = "6f4f09234aca23db2e66c548b98a4fb14516241b31fb473c9c6f5b21270900c6";
+      sha256 = "00iaapmy07zdhm2y23fk9igrskzdkix53j7g45lc5dg9nfyngq6j";
     };
 
     propagatedBuildInputs =

From 46c31fa675fe0bf22ff313cefa1902afdc14ee2c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 29 Jan 2016 03:38:12 +0000
Subject: [PATCH 0684/2285] libressl: 2.2.5 -> 2.2.6

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

diff --git a/pkgs/development/libraries/libressl/2.2.nix b/pkgs/development/libraries/libressl/2.2.nix
index 89e7e6507e49..a3389a49fbc8 100644
--- a/pkgs/development/libraries/libressl/2.2.nix
+++ b/pkgs/development/libraries/libressl/2.2.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libressl-${version}";
-  version = "2.2.5";
+  version = "2.2.6";
 
   src = fetchurl {
     url    = "mirror://openbsd/LibreSSL/${name}.tar.gz";
-    sha256 = "0jwidi7fafcdh5qml72dx0ad0kfsk94qxzm29i7wd3cx8v8dxjp3";
+    sha256 = "0kynb15l5gq1qgp3p4ncn20sc65sbl8lk89vyr07s17xrya9kq8y";
   };
 
   enableParallelBuilding = true;

From edad608f56ab8cb2d74f2d34e7c0f625e706a5b1 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 29 Jan 2016 03:41:14 +0000
Subject: [PATCH 0685/2285] libressl_2_3: 2.3.1 -> 2.3.2

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

diff --git a/pkgs/development/libraries/libressl/2.3.nix b/pkgs/development/libraries/libressl/2.3.nix
index d9981f9b0c52..a87e599cbc07 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.1";
+  version = "2.3.2";
 
   src = fetchurl {
     url    = "mirror://openbsd/LibreSSL/${name}.tar.gz";
-    sha256 = "410b58db4ebbcab43c3357612e591094f64fb9339269caa2e68728e36f8d589e";
+    sha256 = "0sm9cjjqvj581sfd4sh0i467sh8p89nq9b8ck2qn3war92p5zx40";
   };
 
   enableParallelBuilding = true;
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
     description = "Free TLS/SSL implementation";
     homepage    = "http://www.libressl.org";
     platforms   = platforms.all;
-    maintainers = with maintainers; [ thoughtpolice wkennington fpletz ];
+    maintainers = with maintainers; [ thoughtpolice wkennington fpletz globin ];
   };
 }

From 462958b3b73468febd1a9c0a7be97976c0854401 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 29 Jan 2016 09:36:50 +0100
Subject: [PATCH 0686/2285] tptp: 6.1.0 -> 6.3.0

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

diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix
index d4c628587535..636efa635958 100644
--- a/pkgs/applications/science/logic/tptp/default.nix
+++ b/pkgs/applications/science/logic/tptp/default.nix
@@ -11,14 +11,14 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="TPTP";
-    version="6.1.0";
+    version="6.3.0";
     name="${baseName}-${version}";
     urls=
     [
     "http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz"
     "http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}/TPTP-v${version}.tgz"
     ];
-    hash="054p0kx9qh619ixslxpb4qcwvcqr4kan154b3a87b546b78k7kv4";
+    hash="17wl80mnm91jp3npdjzfbb8ds45f2gni250jlfw0d91i1476wcl3";
   };
 in
 rec {

From ef8f074604eb696fcc52b2763f8503d2edb75dc2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 28 Jan 2016 23:37:42 +0100
Subject: [PATCH 0687/2285] smplayer: 15.11.0 -> 16.1.0

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

diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix
index 13c654222275..0aa92c9af717 100644
--- a/pkgs/applications/video/smplayer/default.nix
+++ b/pkgs/applications/video/smplayer/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, qtscript }:
 
 stdenv.mkDerivation rec {
-  name = "smplayer-15.11.0";
+  name = "smplayer-16.1.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/smplayer/${name}.tar.bz2";
-    sha256 = "1h8r5xjaq7p78raw1v29gsrcv221lzl8m2i2qls3khc65kx032cn";
+    sha256 = "1jfqpmbbjrs9lna44dp10zblj7b0cras9sb0nczycpkcsdi9np6j";
   };
 
   patches = [ ./basegui.cpp.patch ];

From 4f8f5732fc1a24329cbe5f7eb9dcb7599e282a0c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 29 Jan 2016 07:59:54 +0100
Subject: [PATCH 0688/2285] smtube: 15.11.0 -> 16.1.0

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

diff --git a/pkgs/applications/video/smtube/default.nix b/pkgs/applications/video/smtube/default.nix
index dd988f79cab0..68c0d7f58120 100644
--- a/pkgs/applications/video/smtube/default.nix
+++ b/pkgs/applications/video/smtube/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, qtscript, qtwebkit }:
 
 stdenv.mkDerivation rec {
-  version = "15.11.0";
+  version = "16.1.0";
   name = "smtube-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/smtube/SMTube/${version}/${name}.tar.bz2";
-    sha256 = "13pkd0462ygsdlmym6y2cfivihmi175y41jq5hjyh926cgfg7pny";
+    sha256 = "1yjn7gj5pfw8835gfazk29mhcvfh1dhfjqmbqln1ajxr89imjj4r";
   };
 
   makeFlags = [

From 73468cf4d49cd188506a4aec1a7d9fc20765c2b0 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Fri, 29 Jan 2016 10:11:38 +0100
Subject: [PATCH 0689/2285] tptp: replace use of builderDefsPackage

---
 .../science/logic/tptp/default.nix            | 108 ++++++------------
 1 file changed, 33 insertions(+), 75 deletions(-)

diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix
index 636efa635958..f3cd8ab69271 100644
--- a/pkgs/applications/science/logic/tptp/default.nix
+++ b/pkgs/applications/science/logic/tptp/default.nix
@@ -1,90 +1,48 @@
-x@{builderDefsPackage
-  , yap, tcsh, perl, patchelf, pkgsi686Linux
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    ["pkgsi686Linux"];
+{ stdenv, fetchurl, yap, tcsh, perl, patchelf }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="TPTP";
-    version="6.3.0";
-    name="${baseName}-${version}";
-    urls=
-    [
-    "http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz"
-    "http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}/TPTP-v${version}.tgz"
+stdenv.mkDerivation rec {
+  name = "TPTP-${version}";
+  version = "6.3.0";
+
+  src = fetchurl {
+    url = [
+      "http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz"
+      "http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}/TPTP-v${version}.tgz"
     ];
-    hash="17wl80mnm91jp3npdjzfbb8ds45f2gni250jlfw0d91i1476wcl3";
-  };
-in
-rec {
-  src = a.fetchurl {
-    urls = sourceInfo.urls;
-    sha256 = sourceInfo.hash;
+    sha256 = "17wl80mnm91jp3npdjzfbb8ds45f2gni250jlfw0d91i1476wcl3";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  buildInputs = [ tcsh yap perl patchelf ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["goTarget" "doUnpack" "fixPlace" "setVars" "installScripts" 
-    "patchBinaries" "makeLinks"];
+  installPhase = ''
+    sharedir=$out/share/tptp
 
-  goTarget = a.fullDepEntry ''
-    mkdir -p "$out"/share/
-    cd "$out"/share/
-  '' ["defEnsureDir" "minInit"];
+    mkdir -p $sharedir
+    cp -r ./ $sharedir
 
-  fixPlace = a.fullDepEntry ''
-    cd ..
-    mv TPTP-* tptp
-    cd tptp
-  '' ["minInit" "doUnpack"];
+    export TPTP=$sharedir
 
-  setVars = a.noDepEntry ''
-    export TPTP="$PWD"
+    tcsh $sharedir/Scripts/tptp2T_install -default
+
+    substituteInPlace $sharedir/TPTP2X/tptp2X_install --replace /bin/mv mv
+    tcsh $sharedir/TPTP2X/tptp2X_install -default
+
+    patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $sharedir/Scripts/tptp4X
+
+    mkdir -p $out/bin
+    ln -s $sharedir/TPTP2X/tptp2X $out/bin
+    ln -s $sharedir/Scripts/tptp2T $out/bin
+    ln -s $sharedir/Scripts/tptp4X $out/bin
   '';
 
-  installScripts = a.fullDepEntry ''
-    tcsh "$out/share/tptp/Scripts/tptp2T_install" -default
-
-    sed -e 's@^ */bin/@@' -i TPTP2X/*
-
-    tcsh "$out/share/tptp/TPTP2X/tptp2X_install" -default
-  '' ["addInputs"];
-
-  makeLinks = a.fullDepEntry ''
-    mkdir -p "$out/bin"
-    ln -s "../share/tptp/TPTP2X/tptp2X" "$out/bin"
-    ln -s "../share/tptp/Scripts/tptp2T" "$out/bin"
-    ln -s "../share/tptp/Scripts/tptp4X" "$out/bin"
-  '' ["defEnsureDir" "minInit"];
-
-  patchBinaries = a.fullDepEntry ''
-    patchelf --set-interpreter "${pkgsi686Linux.glibc}"/lib/ld-linux.so.* \
-      "Scripts/tptp4X"
-  '' ["addInputs"];
-      
-  meta = {
+  meta = with stdenv.lib; {
     description = "Thousands of problems for theorem provers and tools";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    # A GiB of data. Installation is unpacking and editing a few files.
+    maintainers = with maintainers; [ raskin gebner ];
+    # 6.3 GiB of data. Installation is unpacking and editing a few files.
     # No sense in letting Hydra build it.
     # Also, it is unclear what is covered by "verbatim" - we will edit configs
     hydraPlatforms = [];
-    license = "verbatim-redistribution";
+    platforms = platforms.all;
+    license = licenses.unfreeRedistributable;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://tptp.org/";
-    };
-  };
-}) x
-
+}

From 41204b1dd183b0edbaa2f1045469ce5bd34f753d Mon Sep 17 00:00:00 2001
From: "Mayeu (Cast)" <Mayeu@users.noreply.github.com>
Date: Fri, 29 Jan 2016 11:14:44 +0100
Subject: [PATCH 0690/2285]  torbrowser: 5.0.7 -> 5.5

Hash found with nix-prefetch-url
---
 pkgs/tools/security/tor/torbrowser.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index ca3e3aa10566..ced4d868ee03 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -16,13 +16,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "tor-browser-${version}";
-  version = "5.0.7";
+  version = "5.5";
 
   src = fetchurl {
     url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz";
     sha256 = if stdenv.is64bit then
-      "0igqh02bcdr0b4m6df46l1l1z38d4nh4pyfn6jqsvahacdl2qbsg" else
-      "1401j340348rqwd5c1m8hnxw7qkwpzqfa64q01cp08lz9cxxml4r";
+      "0glv2zffls1as71idbfg3l34kmsv48f3sk59swl6k8l75nvxlzjk" else
+      "0xbsixxs1hj0ydmazgi796xgvlsvbrkh8vfgaiyqcvgx4vf4ggwf";
   };
 
   desktopItem = makeDesktopItem {

From 7884c3b95dff0a9175e595bf2fe6eb22a8994fa7 Mon Sep 17 00:00:00 2001
From: Christian Albrecht <christian.albrecht@mayflower.de>
Date: Fri, 29 Jan 2016 11:51:29 +0100
Subject: [PATCH 0691/2285] android-studio: 1.5.0.4 -> 1.5.1.0

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

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index acc3a75cca10..7d02bd480ddc 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -148,14 +148,14 @@ in
 
   android-studio = buildAndroidStudio rec {
     name = "android-studio-${version}";
-    version = "1.5.0.4";
-    build = "141.2422023";
+    version = "1.5.1.0";
+    build = "141.2456560";
     description = "Android development environment based on IntelliJ IDEA";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" +
             "/android-studio-ide-${build}-linux.zip";
-      sha256 = "1sjxs9cq7mdalxmzp6v2gwbg1w8p43c2cp5j4v212w66h5rqv11z";
+      sha256 = "0p6h21jd0xx3xzdrfv9530n1ssyc3xigr3fg33r8ain4k6n02vj6";
     };
   };
 

From 48a5bb703d5eace1a30ee4d8daca999389d0ddb9 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 24 Jan 2016 22:51:30 +0000
Subject: [PATCH 0692/2285] stdenv: fix set-source-date-epoch-to-latest (close
 #12602)

In some cases the $sourceRoot is missing. Skip the hook instead
of showing the following cryptic error:

    find: cannot search `': No such file or directory
    /nix/store/0p1afvl8jcpi6dvsq2n58i90w9c59vz1-set-source-date-epoch-to-latest.sh: line 12: [: : integer expression expected

vcunat removed the warning; the hook will just skip silently in these cases.
Perhaps someone can improve on it some time.
---
 .../setup-hooks/set-source-date-epoch-to-latest.sh            | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh b/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh
index 9e325106f821..fe3458cd21e8 100644
--- a/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh
+++ b/pkgs/build-support/setup-hooks/set-source-date-epoch-to-latest.sh
@@ -27,5 +27,7 @@ updateSourceDateEpoch() {
 postUnpackHooks+=(_updateSourceDateEpochFromSourceRoot)
 
 _updateSourceDateEpochFromSourceRoot() {
-    updateSourceDateEpoch "$sourceRoot"
+    if [ -n "$sourceRoot" ]; then
+        updateSourceDateEpoch "$sourceRoot"
+    fi
 }

From a1566be54cd059b7d53f9789ae792163d8036551 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Tue, 26 Jan 2016 23:14:23 +0000
Subject: [PATCH 0693/2285] amqp 1.4.7 -> 1.4.9

---
 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 e6b0d1b061f2..f340d50e2ec9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -607,12 +607,12 @@ in modules // {
 
   amqp = buildPythonPackage rec {
     name = "amqp-${version}";
-    version = "1.4.7";
+    version = "1.4.9";
     disabled = pythonOlder "2.6";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/a/amqp/${name}.tar.gz";
-      sha256 = "1nids25n6a17nrpxnklpi1h059zi87cs2g6irvp0j4p0ad5qi08p";
+      sha256 = "06n6q0kxhjnbfz3vn8x9yz09lwmn1xi9d6wxp31h5jbks0b4vsid";
     };
 
     buildInputs = with self; [ mock coverage nose-cover3 unittest2 ];

From 0e61e2a35fd1714b3f8c572f47c2e010c38897e5 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Tue, 26 Jan 2016 23:16:41 +0000
Subject: [PATCH 0694/2285] kombu 3.0.30 -> 3.0.33

---
 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 f340d50e2ec9..5e320e3f32b1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10420,13 +10420,13 @@ in modules // {
 
   kombu = buildPythonPackage rec {
     name = "kombu-${version}";
-    version = "3.0.30";
+    version = "3.0.33";
 
     disabled = pythonOlder "2.6";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/k/kombu/${name}.tar.gz";
-      sha256 = "0npq81ajiqmp8gjm7mq05n18y98xqpv7n4bbqb3p74d4irvgw0mr";
+      sha256 = "16brjx2lgwbj2a37d0pjbfb84nvld6irghmqrs3qfncajp51hgc5";
     };
 
     buildInputs = with self; optionals (!isPy3k) [ anyjson mock unittest2 nose ];

From 4ee173e0114b13371d3def8dee2293e75c5c0499 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Fri, 29 Jan 2016 12:28:08 +0100
Subject: [PATCH 0695/2285] rr: 4.0.0 -> 4.0.3

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

diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix
index 70d61bc4deb4..039cb7424633 100644
--- a/pkgs/development/tools/analysis/rr/default.nix
+++ b/pkgs/development/tools/analysis/rr/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, libpfm, zlib, python, pkgconfig, pythonPackages, which, procps }:
 
 stdenv.mkDerivation rec {
-  version = "4.0.0";
+  version = "4.0.3";
   name = "rr-${version}";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "rr";
     rev = version;
-    sha256 = "02njg9riziyvgp0q39lhpyf32p1hjjk1wih5dvl74wrzy5anhbwk";
+    sha256 = "0k12r1hzkn5286kz5cg4mvii92m0prs58przchr495r9hfjcy276";
   };
 
   patchPhase = ''

From 5d3b1b84f5dfc56d7bb8fd3b3fa448465b5824df Mon Sep 17 00:00:00 2001
From: Roger Qiu <roger.qiu@polycademy.com>
Date: Tue, 15 Dec 2015 23:07:08 +1100
Subject: [PATCH 0696/2285] zram: simplified totalmem calculation for zram.nix

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

diff --git a/nixos/modules/config/zram.nix b/nixos/modules/config/zram.nix
index 22b74847f871..019932b04e8d 100644
--- a/nixos/modules/config/zram.nix
+++ b/nixos/modules/config/zram.nix
@@ -98,11 +98,9 @@ in
             script = ''
               set -u
               set -o pipefail
-
-              PATH=${pkgs.procps}/bin:${pkgs.gnugrep}/bin:${pkgs.gnused}/bin
-
+              
               # Calculate memory to use for zram
-              totalmem=$(free | grep -e "^Mem:" | sed -e 's/^Mem: *//' -e 's/  *.*//')
+              totalmem=$(${pkgs.gnugrep}/bin/grep 'MemTotal: ' /proc/meminfo | ${pkgs.gawk}/bin/awk '{print $2}')
               mem=$(((totalmem * ${toString cfg.memoryPercent} / 100 / ${toString cfg.numDevices}) * 1024))
 
               echo $mem > /sys/class/block/${dev}/disksize

From 893af77556897ac81066ffa378aed854daf3b258 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 29 Jan 2016 14:40:27 +0300
Subject: [PATCH 0697/2285] makeFontsCache: init

---
 .../libraries/fontconfig/make-fonts-cache.nix | 27 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 ++++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/libraries/fontconfig/make-fonts-cache.nix

diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
new file mode 100644
index 000000000000..1321948c3c81
--- /dev/null
+++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
@@ -0,0 +1,27 @@
+{ runCommand, lib, writeText, fontconfig, fontbhttf, fontDirectories }:
+
+runCommand "fc-cache"
+  rec {
+    buildInputs = [ fontconfig ];
+    passAsFile = [ "fontDirs" ];
+    fontDirs = ''
+      <!-- Font directories -->
+      ${lib.concatStringsSep "\n" (map (font: "<dir>${font}</dir>") fontDirectories)}
+    '';
+  }
+  ''
+    export FONTCONFIG_FILE=$(pwd)/fonts.conf
+
+    cat > fonts.conf << EOF
+    <?xml version='1.0'?>
+    <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
+    <fontconfig>
+      <include>${fontconfig}/etc/fonts/fonts.conf</include>
+      <cachedir>$out</cachedir>
+    EOF
+    cat "$fontDirsPath" >> fonts.conf
+    echo "</fontconfig>" >> fonts.conf
+
+    mkdir -p $out
+    fc-cache -sv
+  ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d909f127b3ff..d3ead0848da7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6503,6 +6503,11 @@ let
       inherit fontconfig fontDirectories;
     };
 
+  makeFontsCache = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}:
+    callPackage ../development/libraries/fontconfig/make-fonts-cache.nix {
+      inherit fontconfig fontDirectories;
+    };
+
   freealut = callPackage ../development/libraries/freealut { };
 
   freeglut = callPackage ../development/libraries/freeglut { };

From 39b5bc3b2f6b214e65c39ab74baa10eba0c7d7a3 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 29 Jan 2016 14:40:51 +0300
Subject: [PATCH 0698/2285] fontconfig service: add pre-generated fonts caches

---
 nixos/modules/config/fonts/fontconfig.nix | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix
index be6662decea6..e078a75b295c 100644
--- a/nixos/modules/config/fonts/fontconfig.nix
+++ b/nixos/modules/config/fonts/fontconfig.nix
@@ -129,6 +129,14 @@ with lib;
 
         };
 
+        cache32Bit = mkOption {
+          default = false;
+          type = types.bool;
+          description = ''
+            Generate system fonts cache for 32-bit applications.
+          '';
+        };
+
       };
 
     };
@@ -231,12 +239,19 @@ with lib;
         "${pkgs.fontconfig}/etc/fonts/fonts.conf";
 
       environment.etc."fonts/${pkgs.fontconfig.configVersion}/conf.d/00-nixos.conf".text =
-        ''
+        let
+          cache = fontconfig: pkgs.makeFontsCache { inherit fontconfig; fontDirectories = config.fonts.fonts; };
+        in ''
           <?xml version='1.0'?>
           <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
           <fontconfig>
             <!-- Font directories -->
             ${concatStringsSep "\n" (map (font: "<dir>${font}</dir>") config.fonts.fonts)}
+            <!-- Pre-generated font caches -->
+            <cachedir>${cache pkgs.fontconfig}</cachedir>
+            ${optionalString (pkgs.stdenv.isx86_64 && config.fonts.fontconfig.cache32Bit) ''
+              <cachedir>${cache pkgs.pkgsi686Linux.fontconfig}</cachedir>
+            ''}
           </fontconfig>
         '';
 

From 7bd9a5b10486643df024786c1297ec2e3a9c6b57 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 29 Jan 2016 16:35:02 +0300
Subject: [PATCH 0699/2285] fontconfig: reorder cache dirs

---
 .../libraries/fontconfig/make-fonts-conf.xsl           | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
index 1b79834c894e..b59fcd0187b8 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
+++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl
@@ -23,16 +23,16 @@
     <fontconfig>
       <xsl:apply-templates select="child::node()[name() != 'dir' and name() != 'cachedir' and name() != 'include']" />
 
-      <!-- fontconfig distribution conf.d -->
-      <include><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include>
-      <!-- versioned system-wide config -->
-      <include ignore_missing="yes">/etc/fonts/<xsl:value-of select="$fontconfigConfigVersion" />/conf.d</include>
-
       <!-- the first cachedir will be used to store the cache -->
       <cachedir prefix="xdg">fontconfig</cachedir>
       <!-- /var/cache/fontconfig is useful for non-nixos systems -->
       <cachedir>/var/cache/fontconfig</cachedir>
 
+      <!-- fontconfig distribution conf.d -->
+      <include><xsl:value-of select="$fontconfig" />/etc/fonts/conf.d</include>
+      <!-- versioned system-wide config -->
+      <include ignore_missing="yes">/etc/fonts/<xsl:value-of select="$fontconfigConfigVersion" />/conf.d</include>
+
       <dir prefix="xdg">fonts</dir>
       <xsl:for-each select="str:tokenize($fontDirectories)">
         <dir><xsl:value-of select="." /></dir>

From e2cefce69a15ec0066ec61b5b3eabbdf444fc8d2 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Fri, 29 Jan 2016 14:08:03 +0000
Subject: [PATCH 0700/2285] titaniumenv: fix path to the IPA file in the
 hydra-build-products

---
 pkgs/development/mobile/titaniumenv/build-app.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index a99ab8d2d795..53fce61a999e 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -155,10 +155,10 @@ stdenv.mkDerivation {
            ''
              cp -av build/iphone/build/* $out
              mkdir -p $out/nix-support
-             echo "file binary-dist \"$(echo $out/Release-iphoneos/*.ipa)\"" > $out/nix-support/hydra-build-products
+             echo "file binary-dist \"$(echo $out/Products/Release-iphoneos/*.ipa)\"" > $out/nix-support/hydra-build-products
              
              ${stdenv.lib.optionalString enableWirelessDistribution ''
-               appname=$(basename $out/Release-iphoneos/*.ipa .ipa)
+               appname=$(basename $out/Products/Release-iphoneos/*.ipa .ipa)
                bundleId=$(grep '<id>[a-zA-Z0-9.]*</id>' tiapp.xml | sed -e 's|<id>||' -e 's|</id>||' -e 's/ //g')
                version=$(grep '<version>[a-zA-Z0-9.]*</version>' tiapp.xml | sed -e 's|<version>||' -e 's|</version>||' -e 's/ //g')
                

From afb8b091a2041e6e49141b8e7d81bc249c9c6c7d Mon Sep 17 00:00:00 2001
From: Matthew O'Gorman <mog@rldn.net>
Date: Fri, 29 Jan 2016 09:35:55 -0500
Subject: [PATCH 0701/2285] platformio: 2.7.1 -> 2.8.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 e6b0d1b061f2..ea24f04d1ef6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14781,13 +14781,13 @@ in modules // {
 
   platformio =  buildPythonPackage rec {
     name = "platformio-${version}";
-    version="2.7.1";
+    version="2.8.1";
 
     disabled = isPy3k || isPyPy;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/platformio/platformio-${version}.tar.gz";
-      sha256 = "1xrjzgwdw7526vfimqjyr9115qzcs17dbyf7023x13anc8b2s9pq";
+      sha256 = "0lx0cg2jyvikpcp9jjzrzgb89hvnn4ri84708d37xvzqsr0ml1fa";
      };
 
      propagatedBuildInputs = with self; [ click_5 requests2 bottle pyserial lockfile colorama];

From a581f72f222043936e78d1fe8ad09380c46bfa53 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 29 Jan 2016 15:58:03 +0100
Subject: [PATCH 0702/2285] nixos-manual: Fix stripping declaration prefixes

Regression introduced by e6cd147ae7ae05900ec2ab8ad933bfac7428feac.

This broke all of the installer tests, because they needed to rebuild
the manual within the test machine, while it only has a closure of the
already pre-built system in place.

The problem here was just that the order of the arguments got mixed up
in stripAnyPrefixes, so it was actually trying to strip the path off the
prefix, not the other way around.

So in the end no prefix was stripped at all, so we ended up having full
store paths in the manual, which in turn caused the build within the VM
to fail, because the prefixes differed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/doc/manual/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index eb2ceb7fd021..5a4d36d9dcc0 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -33,7 +33,7 @@ let
   prefixesToStrip = [ herePrefix ] ++ extraSources;
 
   stripAnyPrefixes = fn:
-    flip (flip fold fn) prefixesToStrip (fn: prefix:
+    flip (flip fold fn) prefixesToStrip (prefix: fn:
       if substring 0 (stringLength prefix) fn == prefix then
         substring (stringLength prefix + 1) 1000 fn
       else

From ae466ba15c2f74cdd621a4fb548813b30cc524e4 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 29 Jan 2016 16:20:22 +0100
Subject: [PATCH 0703/2285] nixos-manual: Simplify stripping prefixes

Let's use a simple (unflipped) fold and break out the actual core
stripPrefix function from stripAnyPrefixes (I personally love
point-less^H^H^H^Hfree style but if I'd be anal I'd even go further and
factor away the "fn:").

Also, let's use path as a better name for "fn" (filename), because
that's what it is and also cannot be confused with "fn" meaning
"function".

We now toString all of the prefixes, so there shouldn't be any need to
implicily toString the extraSources anymore.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/doc/manual/default.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 5a4d36d9dcc0..de3f9a95d95a 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -17,7 +17,7 @@ let
 
   # Clean up declaration sites to not refer to the NixOS source tree.
   optionsList' = flip map optionsList (opt: opt // {
-    declarations = map (fn: stripAnyPrefixes fn) opt.declarations;
+    declarations = map stripAnyPrefixes opt.declarations;
   }
   // optionalAttrs (opt ? example) { example = substFunction opt.example; }
   // optionalAttrs (opt ? default) { default = substFunction opt.default; }
@@ -28,16 +28,16 @@ let
   # or else the build will fail.
   #
   # E.g. if some `options` came from modules in ${pkgs.customModules}/nix,
-  # you'd need to include `extraSources = [ "#{pkgs.customModules}" ]`
-  herePrefix = toString ../../..;
-  prefixesToStrip = [ herePrefix ] ++ extraSources;
+  # you'd need to include `extraSources = [ pkgs.customModules ]`
+  prefixesToStrip = map toString ([ ../../.. ] ++ extraSources);
 
-  stripAnyPrefixes = fn:
-    flip (flip fold fn) prefixesToStrip (prefix: fn:
-      if substring 0 (stringLength prefix) fn == prefix then
-        substring (stringLength prefix + 1) 1000 fn
-      else
-        fn);
+  stripPrefix = prefix: fullPath:
+    if substring 0 (stringLength prefix) fullPath == prefix then
+      substring (stringLength prefix + 1) 1000 fullPath
+    else
+      fileName;
+
+  stripAnyPrefixes = fullPath: fold stripPrefix fullPath prefixesToStrip;
 
   # Convert the list of options into an XML file.
   optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList');

From 313b88621be7c30596302db888487f8356123874 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Tue, 26 Jan 2016 22:10:12 +0100
Subject: [PATCH 0704/2285] synfigstudio: 1.0.1 -> 1.0.2 (close #12308)

vcunat cleaned autoreconf-related stuff and indentation.
---
 .../graphics/synfigstudio/default.nix         | 48 ++++++++++++-------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix
index 372c11b5bda5..0dd4eab35f1e 100644
--- a/pkgs/applications/graphics/synfigstudio/default.nix
+++ b/pkgs/applications/graphics/synfigstudio/default.nix
@@ -1,51 +1,67 @@
-{ stdenv, fetchurl, boost, cairo, fontsConf, gettext, glibmm, gtk3, gtkmm3
+{ stdenv, fetchFromGitHub, boost, cairo, fontsConf, gettext, glibmm, gtk3, gtkmm3
 , libjack2, libsigcxx, libtool, libxmlxx, makeWrapper, mlt-qt5, pango, pkgconfig
-, imagemagick, intltool
+, imagemagick, intltool, autoreconfHook, which
 }:
 
 let
-  version = "1.0.1";
+  version = "1.0.2";
 
   ETL = stdenv.mkDerivation rec {
     name = "ETL-0.04.19";
 
-    src = fetchurl {
-       url = "http://download.tuxfamily.org/synfig/releases/${version}/${name}.tar.gz";
-       sha256 = "1zmqv2fa5zxprza3wbhk5mxjk7491jqshxxai92s7fdiza0nhs91";
+    src = fetchFromGitHub {
+       repo   = "synfig";
+       owner  = "synfig";
+       rev    = version;
+       sha256 = "09ldkvzczqvb1yvlibd62y56dkyprxlr0w3rk38rcs7jnrhj2cqc";
     };
+
+    postUnpack = "sourceRoot=\${sourceRoot}/ETL/";
+
+    buildInputs = [ autoreconfHook ];
   };
 
   synfig = stdenv.mkDerivation rec {
     name = "synfig-${version}";
 
-    src = fetchurl {
-       url = "http://download.tuxfamily.org/synfig/releases/${version}/${name}.tar.gz";
-       sha256 = "0l1f2xwmzds32g46fqwsq7j5qlnfps6944chbv14d3ynzgyyp1i3";
+    src = fetchFromGitHub {
+       repo   = "synfig";
+       owner  = "synfig";
+       rev    = version;
+       sha256 = "09ldkvzczqvb1yvlibd62y56dkyprxlr0w3rk38rcs7jnrhj2cqc";
     };
 
+    postUnpack = "sourceRoot=\${sourceRoot}/synfig-core/";
+
     configureFlags = [
       "--with-boost=${boost.dev}"
       "--with-boost-libdir=${boost.lib}/lib"
     ];
 
     buildInputs = [
-      ETL boost cairo gettext glibmm mlt-qt5 libsigcxx libtool libxmlxx pango
-      pkgconfig
+      ETL boost cairo gettext glibmm mlt-qt5 libsigcxx libxmlxx pango
+      pkgconfig autoreconfHook
     ];
   };
 in
 stdenv.mkDerivation rec {
   name = "synfigstudio-${version}";
 
-  src = fetchurl {
-    url = "http://download.tuxfamily.org/synfig/releases/${version}/${name}.tar.gz";
-    sha256 = "0jfa946rfh0dbagp18zknlj9ffrd4h45xcy2dh2vlhn6jdm08yfi";
+  src = fetchFromGitHub {
+     repo   = "synfig";
+     owner  = "synfig";
+     rev    = version;
+     sha256 = "09ldkvzczqvb1yvlibd62y56dkyprxlr0w3rk38rcs7jnrhj2cqc";
   };
 
+  postUnpack = "sourceRoot=\${sourceRoot}/synfig-studio/";
+
+  preConfigure = "./bootstrap.sh";
+
   buildInputs = [
     ETL boost cairo gettext glibmm gtk3 gtkmm3 imagemagick intltool
-    libjack2 libsigcxx libtool libxmlxx makeWrapper mlt-qt5 pkgconfig
-    synfig
+    libjack2 libsigcxx libxmlxx makeWrapper mlt-qt5 pkgconfig
+    synfig autoreconfHook which
   ];
 
   postInstall = ''

From 2a12e9dacc87bfbd3c997462945a2f7aa967763b Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 29 Jan 2016 17:20:25 +0100
Subject: [PATCH 0705/2285] python-packages/poezio: Fix tests

Poezio doesn't install the files required for running the tests, but
also while building with Nix we don't end up getting valid shared
objects within the temporary build directory.

So we now running "make test" (which does "py.test -v test/") with a
PYTHONPATH that adds the /poezio directory of the path in site-packages
to make sure that the test runner is able to import the shared objects.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @lancelotsix
---
 pkgs/top-level/python-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5e320e3f32b1..50f5288155d5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24472,6 +24472,10 @@ in modules // {
     buildInputs = with self; [ pytest ];
     propagatedBuildInputs = with self ; [ aiodns slixmpp pyinotify potr ];
 
+    checkPhase = ''
+      PYTHONPATH="$PYTHONPATH:$out/${python.sitePackages}/poezio" make test
+    '';
+
     patches =
       let patch_base = ../development/python-modules/poezio;
       in [ "${patch_base}/make_default_config_writable.patch" ];

From 40eaffdc1bf9947d9ed0adaa5b5801d98c79c367 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Fri, 29 Jan 2016 17:52:56 +0100
Subject: [PATCH 0706/2285] marathon: 0.8.1 -> 0.14.1

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

diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix
index 4311b352ab96..8f3437644457 100644
--- a/pkgs/applications/networking/cluster/marathon/default.nix
+++ b/pkgs/applications/networking/cluster/marathon/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "marathon-${version}";
-  version = "0.8.1";
+  version = "0.14.1";
 
   src = fetchurl {
     url = "https://downloads.mesosphere.io/marathon/v${version}/marathon-${version}.tgz";
-    sha256 = "1g2z2c8p47rryyappwv0k3najb6bypvwgg7z9z8prvph2x6rafp6";
+    sha256 = "0vdl7jf7yhb985dj3v46qnqjv1zwfkyizlsyf9c5dq7khvxrp1l4";
   };
 
   buildInputs = [ makeWrapper jdk mesos ];
@@ -17,14 +17,14 @@ stdenv.mkDerivation rec {
 
     makeWrapper ${jdk.jre}/bin/java $out/bin/marathon \
       --add-flags "-Xmx512m -jar $out/libexec/marathon/${name}.jar" \
-      --prefix "MESOS_NATIVE_JAVA_LIBRARY" : "$MESOS_NATIVE_JAVA_LIBRARY"
+      --set "MESOS_NATIVE_JAVA_LIBRARY" "$MESOS_NATIVE_JAVA_LIBRARY"
     '';
 
   meta = with stdenv.lib; {
     homepage = https://mesosphere.github.io/marathon;
     description = "Cluster-wide init and control system for services in cgroups or Docker containers";
     license = licenses.asl20;
-    maintainers = with maintainers; [ rushmorem ];
+    maintainers = with maintainers; [ rushmorem kamilchm ];
     platforms = platforms.linux;
   };
 }

From 8c6675167214c7df9efa6f41631f0ebc46fc9449 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 29 Jan 2016 18:33:19 +0100
Subject: [PATCH 0707/2285] pythonPackages.py3status: 2.7 -> 2.9

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 607d702ce061..cace35cb1acb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7142,12 +7142,15 @@ in modules // {
   };
 
   py3status = buildPythonPackage rec {
-    name = "py3status-2.7";
+    name = "py3status-2.8";
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/py3status/${name}.tar.gz";
-      sha256 = "09r70zbq5xxhzbgd54dcx8p9z0631a454j2ird1lawkms22fc7wv";
+      sha256 = "1aq4l1lj6j54a8mh9y3yscbxv41bbhz89fiwnydj2gx0md5sq5v5";
     };
     propagatedBuildInputs = with self; [ requests2 ];
+    prePatch = ''
+      sed -i -e "s|\[\"acpi\"|\[\"${pkgs.acpi}/bin/acpi\"|" py3status/modules/battery_level.py
+    '';
     meta = {
       maintainers = with maintainers; [ garbas ];
     };

From 3c67935ec43274c152aa770386d63f122f7e55ac Mon Sep 17 00:00:00 2001
From: Joachim Schiele <js@lastlog.de>
Date: Fri, 29 Jan 2016 18:33:01 +0100
Subject: [PATCH 0708/2285] kgocode: added automoc4 to buildInputs

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

diff --git a/pkgs/applications/misc/kgocode/default.nix b/pkgs/applications/misc/kgocode/default.nix
index aa184cbe1a48..963be70c0c26 100644
--- a/pkgs/applications/misc/kgocode/default.nix
+++ b/pkgs/applications/misc/kgocode/default.nix
@@ -1,9 +1,9 @@
-{ fetchgit, stdenv, cmake, kdelibs } :
+{ fetchgit, stdenv, cmake, kdelibs, automoc4 } :
 
 stdenv.mkDerivation rec {
   name = "kgocode-0.0.1";
 
-  buildInputs = [ cmake kdelibs ];
+  buildInputs = [ cmake kdelibs automoc4 ];
 
   src = fetchgit {
     url = https://bitbucket.org/lucashnegri/kgocode.git;

From 42f1f442e2a4397a1bf7f4a41736892d8aeddafa Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Fri, 29 Jan 2016 18:46:00 +0100
Subject: [PATCH 0709/2285] dmenu: adding patches to expression

is extended using patches http://tools.suckless.org/dmenu/patches/ this
argument makes it easier to extend dmenu by doing:

    dmenu.overwritte {
      patches = [
        ./dmenu-4.4-follow-focus.diff";
      ];
    };
---
 pkgs/applications/misc/dmenu/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/dmenu/default.nix b/pkgs/applications/misc/dmenu/default.nix
index ac1852cd893a..b0879599833b 100644
--- a/pkgs/applications/misc/dmenu/default.nix
+++ b/pkgs/applications/misc/dmenu/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, libX11, libXinerama, libXft, zlib}:
+{ stdenv, fetchurl, libX11, libXinerama, libXft, zlib, patches ? null }:
 
 stdenv.mkDerivation rec {
   name = "dmenu-4.6";
@@ -10,6 +10,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ libX11 libXinerama zlib libXft ];
 
+  inherit patches;
+
   postPatch = ''
     sed -ri -e 's!\<(dmenu|stest)\>!'"$out/bin"'/&!g' dmenu_run
   '';

From 22506c7bf32419e78edec647b1be80826f80ea08 Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Fri, 29 Jan 2016 17:46:56 +0100
Subject: [PATCH 0710/2285] uhc: Use Stackage LTS 4.1 to build UHC

---
 pkgs/development/compilers/uhc/default.nix | 11 +++++++++--
 pkgs/top-level/haskell-packages.nix        |  5 ++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix
index 0d91ca2ff3b2..93aa7811449a 100644
--- a/pkgs/development/compilers/uhc/default.nix
+++ b/pkgs/development/compilers/uhc/default.nix
@@ -1,3 +1,8 @@
+# Note: The Haskell package set used for building UHC is
+# determined in the file top-level/haskell-packages.nix.
+# We are using Stackage LTS to avoid constant breakage.
+# Bump the Stackage LTS release to the last release if possible
+# when a new UHC version is released.
 { stdenv, coreutils, fetchgit, m4, libtool, clang, ghcWithPackages }:
 
 let wrappedGhc = ghcWithPackages (hpkgs: with hpkgs; [fgl vector syb uulib network binary hashable uhc-util mtl transformers directory containers array process filepath shuffle uuagc] );
@@ -50,8 +55,10 @@ in stdenv.mkDerivation rec {
     # On Darwin, the GNU libtool is used, which does not
     # support the -static flag and thus breaks the build.
     platforms = ["x86_64-linux"];
-
-    broken = true;  # https://github.com/UU-ComputerScience/uhc/issues/69
+    # Hydra currently doesn't build the Stackage LTS package set,
+    # and we don't want to build all our haskell dependencies
+    # from scratch just to build UHC.
+    hydraPlatforms = stdenv.lib.platforms.none;
 
   };
 }
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index a802623df8e9..14bb80ebf04d 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -60,7 +60,10 @@ rec {
 
     uhc = callPackage ../development/compilers/uhc/default.nix ({
       stdenv = pkgs.clangStdenv;
-      inherit (pkgs.haskellPackages) ghcWithPackages;
+      # UHC 1.1.9.2 is incompatible with hashable 1.2.4.0,
+      # latest LTS with a compatible hashable is LTS 4.1
+      # See also https://github.com/UU-ComputerScience/uhc/issues/69
+      inherit (pkgs.haskell.packages.lts-4_1) ghcWithPackages;
     });
 
   };

From da79b5305e163905bb32b4a9d77596a99d00de19 Mon Sep 17 00:00:00 2001
From: Asko Soukka <asko.soukka@iki.fi>
Date: Fri, 29 Jan 2016 20:45:23 +0200
Subject: [PATCH 0711/2285] pam_u2f: 1.0.1 -> 1.0.4

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

diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix
index ecffa7bec59a..f58dadfd10ce 100644
--- a/pkgs/os-specific/linux/pam_u2f/default.nix
+++ b/pkgs/os-specific/linux/pam_u2f/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "pam_u2f-${version}";
-  version = "1.0.1";
+  version = "1.0.4";
 
   src     = fetchurl {
     url = "https://developers.yubico.com/pam-u2f/Releases/${name}.tar.gz";
-    sha256 = "08lmc2il877k7djkjmza3k0n6ij8b4hx4x9dl6wwfdjqsr8d2zfp";
+    sha256 = "189j0wgx6fs146vfp88djqpl1flpfb3962l1a2marlp6d12jwm3i";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 6fec28e04313161b0d330fc3a4d3dfa9f85e53f9 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 29 Jan 2016 19:34:00 +0100
Subject: [PATCH 0712/2285] nixos-manual: Further simplify stripAnyPrefixes

First of all this fixes an evaluation error I introduced in ae466ba,
which wasn't triggered by any of my own tests against the change because
there are usually no NixOS options that are declared outside of the
<nixpkgs> tree. I renamed the attribute name from "fn" to "fileName"
first and later to "fullPath" but forgot one still occuring "filename".

Thanks to @vcunat for noticing this.

Another thing that he pointed out was that the "stripPrefix" function
can be factored away entirely, because it's very similar to
"removePrefix" in <nixpkgs/lib>.

Unfortunately we can't use "removePrefix" as is, because we need to
account for the final shlash.

So instead of removing it twice and/or retaining "stripPrefix", let's
append a shlash on every "prefixesToStrip" and we can use "removePrefix"
as is.

Tested with:

taalo-build nixos/release.nix -A tests.installer.simple.x86_64-linux

And:

w3m -dump "$(
  nix-build nixos/release.nix -A manual.x86_64-linux
)/share/doc/nixos/options.html"

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @vcunat
---
 nixos/doc/manual/default.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index de3f9a95d95a..b4eb3cde81bf 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -29,15 +29,8 @@ let
   #
   # E.g. if some `options` came from modules in ${pkgs.customModules}/nix,
   # you'd need to include `extraSources = [ pkgs.customModules ]`
-  prefixesToStrip = map toString ([ ../../.. ] ++ extraSources);
-
-  stripPrefix = prefix: fullPath:
-    if substring 0 (stringLength prefix) fullPath == prefix then
-      substring (stringLength prefix + 1) 1000 fullPath
-    else
-      fileName;
-
-  stripAnyPrefixes = fullPath: fold stripPrefix fullPath prefixesToStrip;
+  prefixesToStrip = map (p: "${toString p}/") ([ ../../.. ] ++ extraSources);
+  stripAnyPrefixes = flip (fold removePrefix) prefixesToStrip;
 
   # Convert the list of options into an XML file.
   optionsXML = builtins.toFile "options.xml" (builtins.toXML optionsList');

From 0a8d768b11980b05f49767aad7756bdda17e5816 Mon Sep 17 00:00:00 2001
From: Maciek Starzyk <mstarzyk@gmail.com>
Date: Fri, 29 Jan 2016 17:45:46 +0100
Subject: [PATCH 0713/2285] ranger: 1.7.1 -> 1.7.2

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

diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index 3c13623af948..19a0582a79ca 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, buildPythonPackage, python, w3m, file }:
 
 buildPythonPackage rec {
-  name = "ranger-1.7.1";
+  name = "ranger-1.7.2";
 
   meta = {
     description = "File manager with minimalistic curses interface";
@@ -13,7 +13,7 @@ buildPythonPackage rec {
 
   src = fetchurl {
     url = "http://ranger.nongnu.org/${name}.tar.gz";
-    sha256 = "11nznx2lqv884q9d2if63101prgnjlnan8pcwy550hji2qsn3c7q";
+    sha256 = "0yaviybviwdvfg2a0pf2kk28g10k245499xmbpqlai7fv91f7xll";
   };
 
   propagatedBuildInputs = [ python.modules.curses file ];

From 16d9d3841fe5e76a17c1c8c076a6cd590dbb9653 Mon Sep 17 00:00:00 2001
From: Tomasz Kontusz <tomasz.kontusz@gmail.com>
Date: Fri, 29 Jan 2016 21:10:26 +0100
Subject: [PATCH 0714/2285] keepass: 2.30 -> 2.31

Also replaces the keepass.patch with sed,
as the patch was having problems with newlines.
---
 pkgs/applications/misc/keepass/default.nix   | 21 +++--
 pkgs/applications/misc/keepass/keepass.patch | 89 --------------------
 2 files changed, 15 insertions(+), 95 deletions(-)
 delete mode 100644 pkgs/applications/misc/keepass/keepass.patch

diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix
index 6914120f2967..8f16283d3911 100644
--- a/pkgs/applications/misc/keepass/default.nix
+++ b/pkgs/applications/misc/keepass/default.nix
@@ -8,19 +8,17 @@
 # plugin derivations in the Nix store and nowhere else.
 with builtins; buildDotnetPackage rec {
   baseName = "keepass";
-  version = "2.30";
+  version = "2.31";
 
   src = fetchurl {
     url = "mirror://sourceforge/keepass/KeePass-${version}-Source.zip";
-    sha256 = "1r792cikgvzj4hrxiv7xd3gx2zmn16dbh4inj2zi6ny0gchkqg2a";
+    sha256 = "10bqxpq30gzfq2ip6dkmqlzzsh3bnfdb01jry5xhgxvlycq1lnsm";
   };
 
   sourceRoot = ".";
 
   buildInputs = [ unzip makeWrapper ];
 
-  patches = [ ./keepass.patch ];
-
   pluginLoadPathsPatch =
     let outputLc = toString (add 8 (length plugins));
         patchTemplate = readFile ./keepass-plugins.patch;
@@ -34,10 +32,21 @@ with builtins; buildDotnetPackage rec {
 
   passAsFile = [ "pluginLoadPathsPatch" ];
   postPatch = ''
-    patch --binary -p1 <$pluginLoadPathsPatchPath
+    sed -i 's/\r*$//' KeePass/Forms/MainForm.cs
+    patch -p1 <$pluginLoadPathsPatchPath
   '';
 
-  preConfigure = "rm -rvf Build/*";
+  preConfigure = ''
+    rm -rvf Build/*
+    find . -name "*.sln" -print -exec sed -i 's/Format Version 10.00/Format Version 11.00/g' {} \;
+    find . -name "*.csproj" -print -exec sed -i '
+      s#ToolsVersion="3.5"#ToolsVersion="4.0"#g
+      s#<TargetFrameworkVersion>.*</TargetFrameworkVersion>##g
+      s#<PropertyGroup>#<PropertyGroup><TargetFrameworkVersion>v4.5</TargetFrameworkVersion>#g
+      s#<SignAssembly>.*$#<SignAssembly>false</SignAssembly>#g
+      s#<PostBuildEvent>.*sgen.exe.*$##
+    ' {} \;
+  '';
 
   desktopItem = makeDesktopItem {
     name = "keepass";
diff --git a/pkgs/applications/misc/keepass/keepass.patch b/pkgs/applications/misc/keepass/keepass.patch
deleted file mode 100644
index 6ecf0bb074de..000000000000
--- a/pkgs/applications/misc/keepass/keepass.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -Naur old/KeePass/KeePass.csproj new/KeePass/KeePass.csproj
---- old/KeePass/KeePass.csproj	2015-04-10 11:00:46.000000000 +0100
-+++ new/KeePass/KeePass.csproj	2015-05-27 16:35:52.196177593 +0100
-@@ -1,4 +1,4 @@
--<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-   <PropertyGroup>
-     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-@@ -10,7 +10,7 @@
-     <RootNamespace>KeePass</RootNamespace>
-     <AssemblyName>KeePass</AssemblyName>
-     <ApplicationIcon>KeePass.ico</ApplicationIcon>
--    <SignAssembly>true</SignAssembly>
-+    <SignAssembly>false</SignAssembly>
-     <AssemblyOriginatorKeyFile>KeePass.pfx</AssemblyOriginatorKeyFile>
-     <FileUpgradeFlags>
-     </FileUpgradeFlags>
-@@ -1316,6 +1316,5 @@
-   </Target>
-   -->
-   <PropertyGroup>
--    <PostBuildEvent>"$(FrameworkSDKDir)bin\sgen.exe" /assembly:"$(TargetPath)" /force /nologo /compiler:/keycontainer:VS_KEY_33430356D8D7D1B8 /compiler:/delaysign-</PostBuildEvent>
-   </PropertyGroup>
--</Project>
-\ No newline at end of file
-+</Project>
-diff -Naur old/KeePassLib/KeePassLib.csproj new/KeePassLib/KeePassLib.csproj
---- old/KeePassLib/KeePassLib.csproj	2014-05-08 15:00:24.000000000 +0100
-+++ new/KeePassLib/KeePassLib.csproj	2015-05-27 16:35:52.197177562 +0100
-@@ -1,4 +1,4 @@
--<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-   <PropertyGroup>
-     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-@@ -9,7 +9,7 @@
-     <AppDesignerFolder>Properties</AppDesignerFolder>
-     <RootNamespace>KeePassLib</RootNamespace>
-     <AssemblyName>KeePassLib</AssemblyName>
--    <SignAssembly>true</SignAssembly>
-+    <SignAssembly>false</SignAssembly>
-     <AssemblyOriginatorKeyFile>KeePassLib.pfx</AssemblyOriginatorKeyFile>
-     <FileUpgradeFlags>
-     </FileUpgradeFlags>
-diff -Naur old/KeePass.sln new/KeePass.sln
---- old/KeePass.sln	2009-08-31 19:47:28.000000000 +0100
-+++ new/KeePass.sln	2015-05-27 16:35:59.568953518 +0100
-@@ -1,11 +1,9 @@
--Microsoft Visual Studio Solution File, Format Version 10.00
-+Microsoft Visual Studio Solution File, Format Version 12.00
- # Visual Studio 2008
- Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLib", "KeePassLib\KeePassLib.csproj", "{53573E4E-33CB-4FDB-8698-C95F5E40E7F3}"
- EndProject
- Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePass", "KeePass\KeePass.csproj", "{10938016-DEE2-4A25-9A5A-8FD3444379CA}"
- EndProject
--Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "KeePassLibSD", "KeePassLibSD\KeePassLibSD.csproj", "{DC15F71A-2117-4DEF-8C10-AA355B5E5979}"
--EndProject
- Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TrlUtil", "Translation\TrlUtil\TrlUtil.csproj", "{B7E890E7-BF50-4450-9A52-C105BD98651C}"
- EndProject
- Global
-@@ -44,18 +42,6 @@
- 		{10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- 		{10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|Win32.ActiveCfg = Release|Any CPU
- 		{10938016-DEE2-4A25-9A5A-8FD3444379CA}.Release|x64.ActiveCfg = Release|Any CPU
--		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
--		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Any CPU.Build.0 = Debug|Any CPU
--		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
--		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
--		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|Win32.ActiveCfg = Debug|Any CPU
--		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Debug|x64.ActiveCfg = Debug|Any CPU
--		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Any CPU.ActiveCfg = Release|Any CPU
--		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Any CPU.Build.0 = Release|Any CPU
--		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
--		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Mixed Platforms.Build.0 = Release|Any CPU
--		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|Win32.ActiveCfg = Release|Any CPU
--		{DC15F71A-2117-4DEF-8C10-AA355B5E5979}.Release|x64.ActiveCfg = Release|Any CPU
- 		{B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- 		{B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- 		{B7E890E7-BF50-4450-9A52-C105BD98651C}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
-diff -Naur old/Translation/TrlUtil/TrlUtil.csproj new/Translation/TrlUtil/TrlUtil.csproj
---- old/Translation/TrlUtil/TrlUtil.csproj	2013-07-21 10:06:38.000000000 +0100
-+++ new/Translation/TrlUtil/TrlUtil.csproj	2015-05-27 16:35:52.197177562 +0100
-@@ -1,4 +1,4 @@
--<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
-   <PropertyGroup>
-     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>

From 13e13c38cd65b01e0762e3f5cc8b04dd57d5d7ed Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 29 Jan 2016 22:33:00 +0100
Subject: [PATCH 0715/2285] mcabber: 1.0.0 -> 1.0.1

---
 .../networking/instant-messengers/mcabber/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
index ef6ce6076d94..abe9b78904f0 100644
--- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "mcabber-${version}";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchurl {
     url = "http://mcabber.com/files/mcabber-${version}.tar.bz2";
-    sha256 = "0ckh2l5fbnykzbvdrqjwd1ppalaifb79nnizh8kra2sy76xbqxjl";
+    sha256 = "14rd17rs26knmwinfv63w2xzlkj5ygvhicx95h0mai4lpji4b6jp";
   };
 
   buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ];

From 4c8aab914091217962b28617ec172e7ae29705c8 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 29 Jan 2016 23:02:09 +0100
Subject: [PATCH 0716/2285] parallel: 20151222 -> 20160122

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

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 7e8a8312f509..c45c62cb3ada 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl, makeWrapper, procps }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20151222";
+  name = "parallel-20160122";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "03czpnsj77xxzqxzzr1b39ym9acn94hknzbilbh28v5q1wk7r4mf";
+    sha256 = "1xs8y8jh7wyjs27079xz0ja7xfi4dywz8d6hbkl44mafdnnfjfiy";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From ddfb660f7bb2dfc203f9d25be381211271f33238 Mon Sep 17 00:00:00 2001
From: Tony White <white.tw.tw@gmail.com>
Date: Fri, 29 Jan 2016 22:08:42 +0000
Subject: [PATCH 0717/2285] kde5 bluedevil plasmoid : enable bluez5 bluetooth
 functionality

    - Fixed a bug in bluedevil (link to a .js file)
    - Made bluez5 the default bluetooth service except for kde4
    - created org.bluez.obex systemd dbus service
    - Patched bluez5 using bluez-5.37-obexd_without_systemd-1.patch
    in order to enable obex when using either the bluedevil plasmoid
    or dolpin file manager within plasma workspaces 5.

    The functionality was tested using a Sony Xperia Z, the machine
    and the handset paired  and two different files were sent in both
    directions successfully.
---
 nixos/modules/services/hardware/bluetooth.nix | 60 ++++++++++++------
 pkgs/desktops/plasma-5.5/bluedevil.nix        |  2 +
 .../bluez-5.37-obexd_without_systemd-1.patch  | 61 +++++++++++++++++++
 pkgs/os-specific/linux/bluez/bluez5.nix       |  3 +
 pkgs/os-specific/linux/bluez/bluez5_28.nix    |  1 +
 5 files changed, 110 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/os-specific/linux/bluez/bluez-5.37-obexd_without_systemd-1.patch

diff --git a/nixos/modules/services/hardware/bluetooth.nix b/nixos/modules/services/hardware/bluetooth.nix
index 68d0406e63bd..fc95c4910bf7 100644
--- a/nixos/modules/services/hardware/bluetooth.nix
+++ b/nixos/modules/services/hardware/bluetooth.nix
@@ -1,6 +1,43 @@
 { config, lib, pkgs, ... }:
 
 with lib;
+let
+    bluez-bluetooth = if config.services.xserver.desktopManager.kde4.enable then pkgs.bluez else pkgs.bluez5;
+
+    configBluez = {
+        description = "Bluetooth Service";
+        serviceConfig = {
+          Type = "dbus";
+          BusName = "org.bluez";
+          ExecStart = "${bluez-bluetooth}/sbin/bluetoothd -n";
+        };
+        wantedBy = [ "bluetooth.target" ];
+    };
+
+    configBluez5 =  {
+        description = "Bluetooth Service";
+        serviceConfig = {
+          Type = "dbus";
+          BusName = "org.bluez";
+          ExecStart = "${bluez-bluetooth}/sbin/bluetoothd -n";
+          NotifyAccess="main";
+          CapabilityBoundingSet="CAP_NET_ADMIN CAP_NET_BIND_SERVICE";
+          LimitNPROC=1;
+        };
+        wantedBy = [ "bluetooth.target" ];
+    };
+
+    obexConfig = {
+        description = "Bluetooth OBEX service";
+        serviceConfig = {
+          Type = "dbus";
+          BusName = "org.bluez.obex";
+          ExecStart = "${bluez-bluetooth}/sbin/obexd";
+        };
+    };
+
+    bluezConfig = if config.services.xserver.desktopManager.kde4.enable then configBluez else configBluez5;
+in
 
 {
 
@@ -16,26 +53,15 @@ with lib;
 
   };
 
-
   ###### implementation
-
+  
   config = mkIf config.hardware.bluetooth.enable {
 
-    environment.systemPackages = [ pkgs.bluez pkgs.openobex pkgs.obexftp ];
-
-    services.udev.packages = [ pkgs.bluez ];
-
-    services.dbus.packages = [ pkgs.bluez ];
-
-    systemd.services."dbus-org.bluez" = {
-      description = "Bluetooth Service";
-      serviceConfig = {
-        Type = "dbus";
-        BusName = "org.bluez";
-        ExecStart = "${pkgs.bluez}/sbin/bluetoothd -n";
-      };
-      wantedBy = [ "bluetooth.target" ];
-    };
+    environment.systemPackages = [ bluez-bluetooth pkgs.openobex pkgs.obexftp ];
+    services.udev.packages = [ bluez-bluetooth ];
+    services.dbus.packages = [ bluez-bluetooth ];
+    systemd.services."dbus-org.bluez" = bluezConfig;
+    systemd.services."dbus-org.bluez.obex" = obexConfig;
 
   };
 
diff --git a/pkgs/desktops/plasma-5.5/bluedevil.nix b/pkgs/desktops/plasma-5.5/bluedevil.nix
index dc11ee170b35..6596c246202f 100644
--- a/pkgs/desktops/plasma-5.5/bluedevil.nix
+++ b/pkgs/desktops/plasma-5.5/bluedevil.nix
@@ -20,5 +20,7 @@ plasmaPackage {
   postInstall = ''
     wrapQtProgram "$out/bin/bluedevil-wizard"
     wrapQtProgram "$out/bin/bluedevil-sendfile"
+    # Fix the location of logic.js for the plasmoid
+    ln -s $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/code/logic.js $out/share/plasma/plasmoids/org.kde.plasma.bluetooth/contents/ui/logic.js
   '';
 }
diff --git a/pkgs/os-specific/linux/bluez/bluez-5.37-obexd_without_systemd-1.patch b/pkgs/os-specific/linux/bluez/bluez-5.37-obexd_without_systemd-1.patch
new file mode 100644
index 000000000000..749787c5b3a7
--- /dev/null
+++ b/pkgs/os-specific/linux/bluez/bluez-5.37-obexd_without_systemd-1.patch
@@ -0,0 +1,61 @@
+Submitted By:            Armin K. <krejzi at email dot com>
+Date:                    2013-04-29
+Initial Package Version: 5.17
+Upstream Status:         unknown
+Origin:                  Arch Linux (Giovanni Campagna)
+Description:             Allow using obexd without systemd in the user session
+
+Not all sessions run systemd --user (actually, the majority
+doesn't), so the dbus daemon must be able to spawn obexd
+directly, and to do so it needs the full path of the daemon.
+---
+ Makefile.obexd                      | 4 ++--
+ obexd/src/org.bluez.obex.service    | 4 ----
+ obexd/src/org.bluez.obex.service.in | 4 ++++
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+ delete mode 100644 obexd/src/org.bluez.obex.service
+ create mode 100644 obexd/src/org.bluez.obex.service.in
+
+diff --git a/Makefile.obexd b/Makefile.obexd
+index 3760867..142e7c3 100644
+--- a/Makefile.obexd
++++ b/Makefile.obexd
+@@ -2,12 +2,12 @@
+ if SYSTEMD
+ systemduserunitdir = @SYSTEMD_USERUNITDIR@
+ systemduserunit_DATA = obexd/src/obex.service
++endif
+ 
+ dbussessionbusdir = @DBUS_SESSIONBUSDIR@
+ dbussessionbus_DATA = obexd/src/org.bluez.obex.service
+-endif
+ 
+-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
++EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
+ 
+ obex_plugindir = $(libdir)/obex/plugins
+ 
+diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
+deleted file mode 100644
+index a538088..0000000
+--- a/obexd/src/org.bluez.obex.service
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[D-BUS Service]
+-Name=org.bluez.obex
+-Exec=/bin/false
+-SystemdService=dbus-org.bluez.obex.service
+diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
+new file mode 100644
+index 0000000..9c815f2
+--- /dev/null
++++ b/obexd/src/org.bluez.obex.service.in
+@@ -0,0 +1,4 @@
++[D-BUS Service]
++Name=org.bluez.obex
++Exec=@libexecdir@/obexd
++SystemdService=dbus-org.bluez.obex.service
+-- 
+1.8.3.1
+
+
diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix
index cc132ddc397e..21925a5e1dde 100644
--- a/pkgs/os-specific/linux/bluez/bluez5.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation rec {
       # gstreamer gst_plugins_base 
     ];
 
+  patches = [ ./bluez-5.37-obexd_without_systemd-1.patch ];
+    
   preConfigure = ''
       substituteInPlace tools/hid2hci.rules --replace /sbin/udevadm ${systemd}/bin/udevadm
       substituteInPlace tools/hid2hci.rules --replace "hid2hci " "$out/lib/udev/hid2hci "
@@ -68,6 +70,7 @@ stdenv.mkDerivation rec {
     # for bluez4 compatibility for NixOS
     mkdir $out/sbin
     ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd
+    ln -s ../libexec/bluetooth/obexd $out/sbin/obexd
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/os-specific/linux/bluez/bluez5_28.nix b/pkgs/os-specific/linux/bluez/bluez5_28.nix
index 7f5a30144c8b..80adc0fd56b8 100644
--- a/pkgs/os-specific/linux/bluez/bluez5_28.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5_28.nix
@@ -68,6 +68,7 @@ stdenv.mkDerivation rec {
     # for bluez4 compatibility for NixOS
     mkdir $out/sbin
     ln -s ../libexec/bluetooth/bluetoothd $out/sbin/bluetoothd
+    ln -s ../libexec/bluetooth/obexd $out/sbin/obexd
   '';
 
   meta = with stdenv.lib; {

From 6c60a24d38ea7a358707f23e137ee710c9aa1379 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Fri, 29 Jan 2016 16:56:04 +0100
Subject: [PATCH 0718/2285] abcde: add flac and which as runtime deps

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

diff --git a/pkgs/applications/audio/abcde/default.nix b/pkgs/applications/audio/abcde/default.nix
index 2c02baf99184..cfce61c8752e 100644
--- a/pkgs/applications/audio/abcde/default.nix
+++ b/pkgs/applications/audio/abcde/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, vorbis-tools, id3v2, eyeD3
+{ stdenv, fetchurl, libcdio, cddiscid, wget, bash, which, vorbis-tools, id3v2, eyeD3
 , lame, flac, eject, mkcue
 , perl, DigestSHA, MusicBrainz, MusicBrainzDiscID
 , makeWrapper }:
@@ -50,7 +50,7 @@ in
          --replace '#!/usr/bin/perl' '#!${perl}/bin/perl'
 
       wrapProgram "$out/bin/abcde" --prefix PATH ":" \
-        "$out/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbis-tools}/bin:${id3v2}/bin:${eyeD3}/bin:${lame}/bin"
+        "$out/bin:${which}/bin:${libcdio}/bin:${cddiscid}/bin:${wget}/bin:${vorbis-tools}/bin:${id3v2}/bin:${eyeD3}/bin:${lame}/bin:${flac}/bin"
 
       wrapProgram "$out/bin/cddb-tool" --prefix PATH ":" \
         "${wget}/bin"

From 53f7baa6b8cfcf4812fb2182fa7864c780d10dcf Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 29 Jan 2016 17:50:18 +0000
Subject: [PATCH 0719/2285] pass: fixes .wrapped-pass in usage

When using `pass --help` for example the PROGRAM name is ".wrapped-pass"
instead of "pass".
---
 pkgs/tools/security/pass/default.nix        |  4 +++-
 pkgs/tools/security/pass/program-name.patch | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/tools/security/pass/program-name.patch

diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index 03720d6abe1a..56e20726793d 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -19,7 +19,9 @@ stdenv.mkDerivation rec {
     sha256 = "05bk3lrp5jwg0v338lvylp7glpliydzz4jf5pjr6k3kagrv3jyik";
   };
 
-  patches = if stdenv.isDarwin then [ ./no-darwin-getopt.patch ] else null;
+  patches =
+    [ ./program-name.patch ] ++
+    stdenv.lib.optional stdenv.isDarwin ./no-darwin-getopt.patch;
 
   buildInputs = [ makeWrapper ];
 
diff --git a/pkgs/tools/security/pass/program-name.patch b/pkgs/tools/security/pass/program-name.patch
new file mode 100644
index 000000000000..db01942f638d
--- /dev/null
+++ b/pkgs/tools/security/pass/program-name.patch
@@ -0,0 +1,13 @@
+diff --git a/src/password-store.sh b/src/password-store.sh
+index 6313384..6607a98 100755
+--- a/src/password-store.sh
++++ b/src/password-store.sh
+@@ -573,7 +573,7 @@ cmd_git() {
+ # END subcommand functions
+ #
+ 
+-PROGRAM="${0##*/}"
++PROGRAM="pass"
+ COMMAND="$1"
+ 
+ case "$1" in

From 4356d0ccce176b8e13f4dd0a1a6a31cd88486b8f Mon Sep 17 00:00:00 2001
From: Stacey Touset <capicue@gmail.com>
Date: Fri, 29 Jan 2016 17:51:21 -0800
Subject: [PATCH 0720/2285] nodejs: fix Darwin build

- Add no-xcode patch back into node v5. Reverts some of
  5cb1e43fd6eb7f87c9b17e9dc6d1a92ae7c360a4
- Fix patch to apply correctly
- Remove pkg-libpath patch from v4
---
 pkgs/development/web/nodejs/no-xcode.patch    | 14 +-------------
 pkgs/development/web/nodejs/pkg-libpath.patch | 13 -------------
 pkgs/development/web/nodejs/v4.nix            |  2 +-
 pkgs/development/web/nodejs/v5.nix            |  3 +++
 4 files changed, 5 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/development/web/nodejs/pkg-libpath.patch

diff --git a/pkgs/development/web/nodejs/no-xcode.patch b/pkgs/development/web/nodejs/no-xcode.patch
index 4754432ba4ab..27c9774ee6b1 100644
--- a/pkgs/development/web/nodejs/no-xcode.patch
+++ b/pkgs/development/web/nodejs/no-xcode.patch
@@ -1,5 +1,5 @@
 diff --git a/tools/gyp/pylib/gyp/xcode_emulation.py b/tools/gyp/pylib/gyp/xcode_emulation.py
-index c002b11..eeb0400 100644
+index 407ead0..8bf64e7 100644
 --- a/tools/gyp/pylib/gyp/xcode_emulation.py
 +++ b/tools/gyp/pylib/gyp/xcode_emulation.py
 @@ -446,10 +446,16 @@ class XcodeSettings(object):
@@ -55,15 +55,3 @@ index c002b11..eeb0400 100644
  
      is_extension = self._IsIosAppExtension() or self._IsIosWatchKitExtension()
      if sdk_root and is_extension:
-@@ -1032,7 +1040,10 @@ class XcodeSettings(object):
-     sdk_root = self._SdkPath(config_name)
-     if not sdk_root:
-       sdk_root = ''
--    return l.replace('$(SDKROOT)', sdk_root)
-+    if self._SdkPath():
-+      return l.replace('$(SDKROOT)', sdk_root)
-+    else:
-+      return l
- 
-   def AdjustLibraries(self, libraries, config_name=None):
-     """Transforms entries like 'Cocoa.framework' in libraries into entries like
diff --git a/pkgs/development/web/nodejs/pkg-libpath.patch b/pkgs/development/web/nodejs/pkg-libpath.patch
deleted file mode 100644
index 8ad94c0e3e2f..000000000000
--- a/pkgs/development/web/nodejs/pkg-libpath.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/configure b/configure
-index d199975..66d903b 100755
---- a/configure
-+++ b/configure
-@@ -734,7 +734,7 @@ def configure_library(lib, output):
-     # libpath needs to be provided ahead libraries
-     if pkg_libpath:
-       output['libraries'] += (
--          filter(None, map(str.strip, pkg_cflags.split('-L'))))
-+          pkg_libpath.split())
- 
-     default_libs = getattr(options, shared_lib + '_libname')
-     default_libs = map('-l{0}'.format, default_libs.split(','))
diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix
index ad13d108803f..4d2db8c666cd 100644
--- a/pkgs/development/web/nodejs/v4.nix
+++ b/pkgs/development/web/nodejs/v4.nix
@@ -41,7 +41,7 @@ in stdenv.mkDerivation {
     sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py
   '';
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ./pkg-libpath.patch ];
+  patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];
 
   postFixup = ''
     sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' $out/lib/node_modules/npm/node_modules/node-gyp/gyp/pylib/gyp/xcode_emulation.py
diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix
index 5c6fc9f644b7..ef91e95a630f 100644
--- a/pkgs/development/web/nodejs/v5.nix
+++ b/pkgs/development/web/nodejs/v5.nix
@@ -38,8 +38,11 @@ in stdenv.mkDerivation {
   dontDisableStatic = true;
   prePatch = ''
     patchShebangs .
+    sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' tools/gyp/pylib/gyp/xcode_emulation.py
   '';
 
+  patches = stdenv.lib.optionals stdenv.isDarwin [ ./no-xcode.patch ];
+
   buildInputs = [ python which zlib libuv openssl python ]
     ++ optionals stdenv.isLinux [ utillinux http-parser ]
     ++ optionals stdenv.isDarwin [ pkgconfig openssl libtool ];

From eeb9231009f9e121fc59c7f4ff8aa474fcda5079 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 30 Jan 2016 10:37:39 +0100
Subject: [PATCH 0721/2285] slim: Sort sessions

This ensures that xfce and most others DMs are preferred over
xterm. Previously slim used directory order, which is undefined.

Of course, it's just lucky that xfce < xterm lexicographically, but
that also applies to the other display managers, AFAIK. We should have
a way to specify a DM order, but that can be accomodated by generating
desktop entries like "<NN>-session.desktop".

Fixes #4300. Parenthetical to #12516.
---
 .../display-managers/slim/default.nix         |  6 ++-
 .../display-managers/slim/sort-sessions.patch | 40 +++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/display-managers/slim/sort-sessions.patch

diff --git a/pkgs/applications/display-managers/slim/default.nix b/pkgs/applications/display-managers/slim/default.nix
index 42d2c777aea2..8020ecb12a55 100644
--- a/pkgs/applications/display-managers/slim/default.nix
+++ b/pkgs/applications/display-managers/slim/default.nix
@@ -18,13 +18,17 @@ stdenv.mkDerivation rec {
       # slim's broken PAM session handling (see
       # http://developer.berlios.de/bugs/?func=detailbug&bug_id=19102&group_id=2663).
       ./run-once.patch
+
+      # Ensure that sessions appear in sort order, rather than in
+      # directory order.
+      ./sort-sessions.patch
     ];
 
   preConfigure = "substituteInPlace CMakeLists.txt --replace /lib $out/lib";
 
   cmakeFlags = [ "-DUSE_PAM=1" ];
 
-  NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype";
+  NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype -std=c++11";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/display-managers/slim/sort-sessions.patch b/pkgs/applications/display-managers/slim/sort-sessions.patch
new file mode 100644
index 000000000000..cab5610f44fb
--- /dev/null
+++ b/pkgs/applications/display-managers/slim/sort-sessions.patch
@@ -0,0 +1,40 @@
+diff -ru -x '*~' slim-1.3.6-orig/cfg.cpp slim-1.3.6/cfg.cpp
+--- slim-1.3.6-orig/cfg.cpp	2013-10-02 00:38:05.000000000 +0200
++++ slim-1.3.6/cfg.cpp	2016-01-30 10:35:51.108766802 +0100
+@@ -14,6 +14,7 @@
+ #include <iostream>
+ #include <unistd.h>
+ #include <stdlib.h>
++#include <algorithm>
+ 
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -293,6 +294,8 @@
+ 
+ 	sessions.clear();
+ 
++        typedef pair<string,string> session_t;
++
+ 	if( !strSessionDir.empty() ) {
+ 		DIR *pDir = opendir(strSessionDir.c_str());
+ 
+@@ -325,7 +328,7 @@
+                                      }
+                              }
+                              desktop_file.close();
+-                             pair<string,string> session(session_name,session_exec);
++                             session_t session(session_name,session_exec);
+                              sessions.push_back(session);
+                              cout << session_exec << " - " << session_name << endl;
+                         }
+@@ -341,6 +344,10 @@
+         pair<string,string> session("","");
+         sessions.push_back(session);
+ 	}
++
++        std::sort(sessions.begin(), sessions.end(), [](session_t& a, session_t& b) -> bool{
++                return a.first < b.first;
++        });
+ }
+ 
+ pair<string,string> Cfg::nextSession() {

From 9855cbcbf890e3a3a37eae7a200a43264cbe923e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 30 Jan 2016 11:07:54 +0100
Subject: [PATCH 0722/2285] debian: 8.2 -> 8.3

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

diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index ebcbf8c87b5e..96611b725bec 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -1770,22 +1770,22 @@ rec {
     };
 
     debian8i386 = {
-      name = "debian-8.2-jessie-i386";
-      fullName = "Debian 8.2 Jessie (i386)";
+      name = "debian-8.3-jessie-i386";
+      fullName = "Debian 8.3 Jessie (i386)";
       packagesList = fetchurl {
         url = mirror://debian/dists/jessie/main/binary-i386/Packages.xz;
-        sha256 = "f7eda33a296d792d467b84ba608a33f00ff249cb9a385c005586925645d83778";
+        sha256 = "1240d404bd99afbeec042c08fdab049f0b5a984a393cac7c221553ab08f637f5";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;
     };
 
     debian8x86_64 = {
-      name = "debian-8.2-jessie-amd64";
-      fullName = "Debian 8.2 Jessie (amd64)";
+      name = "debian-8.3-jessie-amd64";
+      fullName = "Debian 8.3 Jessie (amd64)";
       packagesList = fetchurl {
         url = mirror://debian/dists/jessie/main/binary-amd64/Packages.xz;
-        sha256 = "ff1b82b4c767769e594fd482de4ef8f70bce8e9f01fa8ef2d6952def0b071ba0";
+        sha256 = "ec937c1b3bbfe4803f0fa43681b19d089eb6b355455ac7caa17ec8e9ff604e56";
       };
       urlPrefix = mirror://debian;
       packages = commonDebianPackages;

From bdc9bfc3fae515f695e1962e787725eb9fa44f06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 30 Jan 2016 12:33:12 +0100
Subject: [PATCH 0723/2285] eclipse-plugin-gnuarmeclipse: 2.8.1-201504061754 ->
 2.11.1-201512141335

Upstream switched from sourceforge to github.
---
 pkgs/applications/editors/eclipse/plugins.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index c8da869f0f32..211dba85c430 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -318,12 +318,12 @@ rec {
 
   gnuarmeclipse = buildEclipseUpdateSite rec {
     name = "gnuarmeclipse-${version}";
-    version = "2.8.1-201504061754";
+    version = "2.11.1-201512141335";
 
     src = fetchzip {
       stripRoot = false;
-      url = "mirror://sourceforge/project/gnuarmeclipse/Current%20Releases/2.x/ilg.gnuarmeclipse.repository-${version}.zip";
-      sha256 = "08jsnyis1ry62cidr9sl11ylyxbkwh834nlhx6qp31gh1l439px9";
+      url = "https://github.com/gnuarmeclipse/plug-ins/releases/download/v${version}/ilg.gnuarmeclipse.repository-${version}.zip";
+      sha256 = "1ijvnahfw2wc860la7kj8b52z2sfm8k1yk62bl0d4lq60y3aycg9";
     };
 
     meta = with stdenv.lib; {

From 3339ab31e5d5810d93a1530e4540adfce0d20b65 Mon Sep 17 00:00:00 2001
From: Nicolas Pouillard <nicolas.pouillard@gmail.com>
Date: Thu, 21 Jan 2016 22:54:47 +0100
Subject: [PATCH 0724/2285] pythonPackages.hidapi: init at 0.7.99.post12

---
 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 cace35cb1acb..60e9056448a5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24939,4 +24939,31 @@ in modules // {
     };
   };
 
+  hidapi = buildPythonPackage rec{
+    version = "0.7.99.post12";
+    name = "hidapi-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/h/hidapi/${name}.tar.gz";
+      sha256 = "1jaj0y5vn5yk033q01wacsz379mf3sy66d6gz072ycfr5rahcp59";
+    };
+
+    propagatedBuildInputs = with self; [ pkgs.libusb1 pkgs.udev cython ];
+
+    # Fix the USB backend library lookup
+    postPatch = ''
+      libusb=${pkgs.libusb1}/include/libusb-1.0
+      test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }
+      sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py
+    '';
+
+    meta = {
+      description = "A Cython interface to the hidapi from https://github.com/signal11/hidapi";
+      homepage = https://github.com/trezor/cython-hidapi;
+      # license can actually be either bsd3 or gpl3
+      # see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt
+      license = licenses.bsd3;
+      maintainer = with maintainers; [ np ];
+    };
+  };
 }

From a9f45a9cae3b46683f46393913c2fa076cf34614 Mon Sep 17 00:00:00 2001
From: Nicolas Pouillard <nicolas.pouillard@gmail.com>
Date: Thu, 21 Jan 2016 22:55:32 +0100
Subject: [PATCH 0725/2285] pythonPackages.mnemonic: init at 0.12

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 60e9056448a5..4408d6022418 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24966,4 +24966,23 @@ in modules // {
       maintainer = with maintainers; [ np ];
     };
   };
+
+  mnemonic = buildPythonPackage rec{
+    version = "0.12";
+    name = "mnemonic-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/m/mnemonic/${name}.tar.gz";
+      sha256 = "0j5jm4v54135qqw455fw4ix2mhxhzjqvxji9gqkpxagk31cvbnj4";
+    };
+
+    propagatedBuildInputs = with self; [ pbkdf2 ];
+
+    meta = {
+      description = "Implementation of Bitcoin BIP-0039";
+      homepage = https://github.com/trezor/python-mnemonic;
+      license = licenses.mit;
+      maintainer = with maintainers; [ np ];
+    };
+  };
 }

From ac69de8537a08d5583e432c6ae87653c19a4491a Mon Sep 17 00:00:00 2001
From: Nicolas Pouillard <nicolas.pouillard@gmail.com>
Date: Thu, 21 Jan 2016 22:56:33 +0100
Subject: [PATCH 0726/2285] pythonPackages.ecdsa: 0.11 -> 0.13

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4408d6022418..b32afc415de5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8248,11 +8248,11 @@ in modules // {
 
   ecdsa = buildPythonPackage rec {
     name = "ecdsa-${version}";
-    version = "0.11";
+    version = "0.13";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/e/ecdsa/${name}.tar.gz";
-      md5 = "8ef586fe4dbb156697d756900cb41d7c";
+      sha256 = "1yj31j0asmrx4an9xvsaj2icdmzy6pw0glfpqrrkrphwdpi1xkv4";
     };
 
     # Only needed for tests

From 4429139c727655b9abe7c26ce09f4dd59b634984 Mon Sep 17 00:00:00 2001
From: Nicolas Pouillard <nicolas.pouillard@gmail.com>
Date: Thu, 21 Jan 2016 22:58:27 +0100
Subject: [PATCH 0727/2285] pythonPackages.trezor: init at 0.6.11

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b32afc415de5..b8a17176a3e0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24985,4 +24985,28 @@ in modules // {
       maintainer = with maintainers; [ np ];
     };
   };
+
+  trezor = buildPythonPackage rec{
+    version = "0.6.11";
+    name = "trezor-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/t/trezor/${name}.tar.gz";
+      sha256 = "0nqbjj0mvkp314hpq36px12hxbyidmhsdflq3121l4g9y3scfbnx";
+    };
+
+    propagatedBuildInputs = with self; [ protobuf2_6 hidapi ];
+
+    buildInputs = with self; [ ecdsa mnemonic ];
+
+    # There are no actual tests: "ImportError: No module named tests"
+    doCheck = false;
+
+    meta = {
+      description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet";
+      homepage = https://github.com/trezor/python-trezor;
+      license = licenses.gpl3;
+      maintainer = with maintainers; [ np ];
+    };
+  };
 }

From 50cc9421a2d251a2997930177762e8000d1cec68 Mon Sep 17 00:00:00 2001
From: Nicolas Pouillard <nicolas.pouillard@gmail.com>
Date: Thu, 21 Jan 2016 22:59:47 +0100
Subject: [PATCH 0728/2285] pythonPackages.ed25519: init at 1.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b8a17176a3e0..954753e874bc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25009,4 +25009,21 @@ in modules // {
       maintainer = with maintainers; [ np ];
     };
   };
+
+  ed25519 = buildPythonPackage rec {
+    name = "ed25519-${version}";
+    version = "1.4";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/e/ed25519/${name}.tar.gz";
+      sha256 = "0ahx1nkxa0xis3cw0h5c4fpgv8mq4znkq7kajly33lc3317bk499";
+    };
+
+    meta = {
+      description = "Ed25519 public-key signatures";
+      homepage = "https://github.com/warner/python-ed25519";
+      license = licenses.mit;
+      maintainers = with maintainers; [ np ];
+    };
+  };
 }

From aa1094481310bfbb4cf698692c95bf36d4c30b2d Mon Sep 17 00:00:00 2001
From: Nicolas Pouillard <nicolas.pouillard@gmail.com>
Date: Thu, 21 Jan 2016 23:24:57 +0100
Subject: [PATCH 0729/2285] pythonPackages.keepkey: init at 0.7.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 954753e874bc..9741b7813a57 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25010,6 +25010,30 @@ in modules // {
     };
   };
 
+  keepkey = buildPythonPackage rec{
+    version = "0.7.0";
+    name = "keepkey-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/k/keepkey/${name}.tar.gz";
+      sha256 = "1ikyp4jpydskznsrlwmxh9sn7b64aldwj2lf0phmb19r5kk06qmp";
+    };
+
+    propagatedBuildInputs = with self; [ protobuf2_6 hidapi ];
+
+    buildInputs = with self; [ ecdsa mnemonic ];
+
+    # There are no actual tests: "ImportError: No module named tests"
+    doCheck = false;
+
+    meta = {
+      description = "KeepKey Python client";
+      homepage = https://github.com/keepkey/python-keepkey;
+      license = licenses.gpl3;
+      maintainer = with maintainers; [ np ];
+    };
+  };
+
   ed25519 = buildPythonPackage rec {
     name = "ed25519-${version}";
     version = "1.4";

From 9a547777e9078ab6128c0a4629bc8146cc9f0d25 Mon Sep 17 00:00:00 2001
From: Nicolas Pouillard <nicolas.pouillard@gmail.com>
Date: Thu, 21 Jan 2016 23:31:39 +0100
Subject: [PATCH 0730/2285] pythonPackages.semver: init at 2.2.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9741b7813a57..76da4896e07d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25034,6 +25034,23 @@ in modules // {
     };
   };
 
+  semver = buildPythonPackage rec {
+    name = "semver-${version}";
+    version = "2.2.1";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/s/semver/${name}.tar.gz";
+      sha256 = "161gvsfpw0l8lnf1v19rvqc8b9f8n70cc8ppya4l0n6rwc1c1n4m";
+    };
+
+    meta = {
+      description = "Python package to work with Semantic Versioning (http://semver.org/)";
+      homepage = "https://github.com/k-bx/python-semver";
+      license = licenses.bsd3;
+      maintainers = with maintainers; [ np ];
+    };
+  };
+
   ed25519 = buildPythonPackage rec {
     name = "ed25519-${version}";
     version = "1.4";

From c8cf9455b77f772fd631ae236ff7436d421632f0 Mon Sep 17 00:00:00 2001
From: Nicolas Pouillard <nicolas.pouillard@gmail.com>
Date: Thu, 21 Jan 2016 23:32:19 +0100
Subject: [PATCH 0731/2285] pythonPackages.trezor_agent: init at 0.6.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 76da4896e07d..f6ffd73ae6a3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25067,4 +25067,24 @@ in modules // {
       maintainers = with maintainers; [ np ];
     };
   };
+
+  trezor_agent = buildPythonPackage rec{
+    version = "0.6.1";
+    name = "trezor_agent-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/t/trezor_agent/${name}.tar.gz";
+      sha256 = "0wpppxzld7kqqxdvy80qc8629n047vm3m3nk171i7hijfw285p0b";
+    };
+
+    propagatedBuildInputs = with self; [ trezor ecdsa ed25519 mnemonic keepkey semver ];
+
+    meta = {
+      description = "Using Trezor as hardware SSH agent";
+      homepage = https://github.com/romanz/trezor-agent;
+      license = licenses.gpl3;
+      maintainer = with maintainers; [ np ];
+    };
+  };
+
 }

From c0fcb321e2cd3158f4254d44e1e62bb7b9fe1889 Mon Sep 17 00:00:00 2001
From: Nicolas Pouillard <nicolas.pouillard@gmail.com>
Date: Thu, 21 Jan 2016 23:32:57 +0100
Subject: [PATCH 0732/2285] pythonPackages.x11_hash: init at 1.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f6ffd73ae6a3..65fadfba92e9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -25087,4 +25087,21 @@ in modules // {
     };
   };
 
+  x11_hash = buildPythonPackage rec{
+    version = "1.4";
+    name = "x11_hash-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/x/x11_hash/${name}.tar.gz";
+      sha256 = "172skm9xbbrivy1p4xabxihx9lsnzi53hvzryfw64m799k2fmp22";
+    };
+
+    meta = {
+      description = "Binding for X11 proof of work hashing";
+      homepage = https://github.com/mazaclub/x11_hash;
+      license = licenses.mit;
+      maintainer = with maintainers; [ np ];
+    };
+  };
+
 }

From 65836c898fb9282c724ac297e7e61eb8deebc1ff Mon Sep 17 00:00:00 2001
From: Nicolas Pouillard <nicolas.pouillard@gmail.com>
Date: Thu, 21 Jan 2016 23:58:28 +0100
Subject: [PATCH 0733/2285] electrum: add plugin dependencies (trezor, keepkey)

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

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index df997ad6e0b5..632ae689f31f 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -22,6 +22,14 @@ buildPythonPackage rec {
     requests
     slowaes
     tlslite
+
+    # plugins
+    trezor
+    keepkey
+    # TODO plugins
+    # matplotlib
+    # btchip
+    # amodem
   ];
 
   preInstall = ''
@@ -40,6 +48,6 @@ buildPythonPackage rec {
     '';
     homepage = https://electrum.org;
     license = licenses.gpl3;
-    maintainers = with maintainers; [ ehmry joachifm ];
+    maintainers = with maintainers; [ ehmry joachifm np ];
   };
 }

From 2238ca0a5b63406689251fcfd56933177f1e43ae Mon Sep 17 00:00:00 2001
From: Nicolas Pouillard <nicolas.pouillard@gmail.com>
Date: Thu, 21 Jan 2016 23:59:30 +0100
Subject: [PATCH 0734/2285] electrum-dash: init at 2.4.1

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

diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum-dash/default.nix
new file mode 100644
index 000000000000..f046ecc9bf2d
--- /dev/null
+++ b/pkgs/applications/misc/electrum-dash/default.nix
@@ -0,0 +1,44 @@
+{ stdenv, fetchurl, buildPythonPackage, pythonPackages, slowaes }:
+
+buildPythonPackage rec {
+  name = "electrum-dash-${version}";
+  version = "2.4.1";
+
+  src = fetchurl {
+    url = "https://github.com/dashpay/electrum-dash/releases/download/v${version}/Electrum-DASH-${version}.tar.gz";
+    sha256 = "02k7m7fyn0cvlgmwxr2gag7rf2knllkch1ma58shysp7zx9jb000";
+  };
+
+  propagatedBuildInputs = with pythonPackages; [
+    dns
+    ecdsa
+    pbkdf2
+    protobuf
+    pyasn1
+    pyasn1-modules
+    pycrypto
+    pyqt4
+    qrcode
+    requests
+    slowaes
+    tlslite
+    x11_hash
+    mnemonic
+
+    # plugins
+    trezor
+  ];
+
+  preInstall = ''
+    mkdir -p $out/share
+    sed -i 's@usr_share = .*@usr_share = os.getenv("out")+"/share"@' setup.py
+    pyrcc4 icons.qrc -o gui/qt/icons_rc.py
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Electrum DASH";
+    homepage = https://github.com/dashpay/electrum-dash;
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ np ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c294f8be31c8..23132f96cc6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11574,6 +11574,8 @@ let
 
   electrum = callPackage ../applications/misc/electrum { };
 
+  electrum-dash = callPackage ../applications/misc/electrum-dash { };
+
   elinks = callPackage ../applications/networking/browsers/elinks { };
 
   elvis = callPackage ../applications/editors/elvis { };

From 11f948a89b7b731f9b2e2e7051a84dd5b6bd21bb Mon Sep 17 00:00:00 2001
From: Nicolas Pouillard <nicolas.pouillard@gmail.com>
Date: Sun, 24 Jan 2016 19:58:39 +0100
Subject: [PATCH 0735/2285] pythonPackages.pyjwt: 0.3.2 -> 1.4.0

---
 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 65fadfba92e9..14ab624a5618 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16323,7 +16323,7 @@ in modules // {
   };
 
   pyjwt = buildPythonPackage rec {
-    version = "0.3.2";
+    version = "1.4.0";
     name = "pyjwt-${version}";
 
     src = pkgs.fetchurl {

From 627f7bf6a562934a16f010b2a43c45f6e95d8208 Mon Sep 17 00:00:00 2001
From: Tony White <white.tw.tw@gmail.com>
Date: Sat, 30 Jan 2016 14:21:20 +0000
Subject: [PATCH 0736/2285] privoxy: 3.0.22 - > 3.0.24

- Security fixes
- Bug fixes
- General improvements
- Action file improvements
- Documentation improvements

Please see http://www.privoxy.org/announce.txt
for more detail.
---
 pkgs/tools/networking/privoxy/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix
index 2d2136907299..a6dcd1fc0c3e 100644
--- a/pkgs/tools/networking/privoxy/default.nix
+++ b/pkgs/tools/networking/privoxy/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, autoreconfHook, zlib, pcre, w3m, man }:
 
-stdenv.mkDerivation {
-  name = "privoxy-3.0.22";
+stdenv.mkDerivation rec{
+
+  name = "privoxy-3.0.24";
 
   src = fetchurl {
-    url = mirror://sourceforge/ijbswa/Sources/3.0.22%20%28stable%29/privoxy-3.0.22-stable-src.tar.gz;
-    sha256 = "0hfcxyb0i7dr6jfxw0y4kqcr09p8gjvcs7igyizyl5in3zn4y88s";
+    url = "mirror://sourceforge/ijbswa/Sources/3.0.22%20%28stable%29/${name}-stable-src.tar.gz";
+    sha256 = "a381f6dc78f08de0d4a2342d47a5949a6608073ada34b933137184f3ca9fb012";
   };
 
   buildInputs = [ autoreconfHook zlib pcre w3m man ];
@@ -17,4 +18,5 @@ stdenv.mkDerivation {
     platforms = platforms.all;
     maintainers = [ maintainers.phreedom ];
   };
+
 }

From 7dcb901badbce5fe9655957b4a73073f42596fc1 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Sat, 23 Jan 2016 12:47:41 +0000
Subject: [PATCH 0737/2285] pulseaudio: 7.1 -> 8.0

closes #12569

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

diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 392d16c6e548..896b41f6780d 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -34,11 +34,11 @@
 
 stdenv.mkDerivation rec {
   name = "${if libOnly then "lib" else ""}pulseaudio-${version}";
-  version = "7.1";
+  version = "8.0";
 
   src = fetchurl {
     url = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${version}.tar.xz";
-    sha256 = "1ndrac0j528lsg3b8wcsgvzds38ml0ja4m57xsn953rj51552rz6";
+    sha256 = "128rrlvrgb4ia3pbzipf5mi6nvrpm6zmxn5r3bynqiikhvify3k9";
   };
 
   patches = [ ./caps-fix.patch ];
@@ -110,7 +110,7 @@ stdenv.mkDerivation rec {
 
   postInstall = lib.optionalString libOnly ''
     rm -rf $out/{bin,share,etc,lib/{pulse-*,systemd}}
-    sed 's|-lltdl|-L${libtool}/lib -lltdl|' -i $out/lib/libpulsecore-${version}.la
+    sed 's|-lltdl|-L${libtool}/lib -lltdl|' -i $out/lib/pulseaudio/libpulsecore-${version}.la
   '';
 
   meta = {

From ee9d7f09eac612a3cb9ef28fc2cc483431f833e9 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 26 Jan 2016 23:05:39 +0100
Subject: [PATCH 0738/2285] ladspa-sdk: change source url to mirror

ladspa.org has been down for a feew weeks, and I couldn't find info on a
cause or a solution.

Closes #12640.

Signed-off-by: Franz Pletz <fpletz@fnordicwalking.de>
---
 pkgs/applications/audio/ladspa-sdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/applications/audio/ladspa-sdk/default.nix
index c333492fd13e..2038f898e3ec 100644
--- a/pkgs/applications/audio/ladspa-sdk/default.nix
+++ b/pkgs/applications/audio/ladspa-sdk/default.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation rec {
   name = "ladspa-sdk-${version}";
   version = "1.13";
   src = fetchurl {
-    url = "http://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
+    url = "http://http.debian.net/debian/pool/main/l/ladspa-sdk/ladspa-sdk_${version}.orig.tar.gz";
     sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm";
   };
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
     description = "The SDK for the LADSPA audio plugin standard";
     longDescription = ''
       The LADSPA SDK, including the ladspa.h API header file,
-      ten example LADSPA plugins and 
+      ten example LADSPA plugins and
       three example programs (applyplugin, analyseplugin and listplugins).
     '';
     homepage = http://www.ladspa.org/ladspa_sdk/overview.html;

From d5c9db8dd3cc77eb8ea91d98ea050fe89c3f8e85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 30 Jan 2016 13:32:51 +0100
Subject: [PATCH 0739/2285] eclipse: align attrnames with pkgnames (underscore
 => hyphen)

Keep old attrnames too, for backward compatibility.

`nix-env -f . -qaP -A eclipses` only prints the new attributes (yay!).
---
 pkgs/applications/editors/eclipse/default.nix | 54 ++++++++++++-------
 1 file changed, 36 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 75736356fb27..12cfbb9c8023 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -12,7 +12,7 @@ rec {
 
   buildEclipse = import ./build-eclipse.nix args;
 
-  eclipse_sdk_35 = buildEclipse {
+  eclipse-sdk-35 = buildEclipse {
     name = "eclipse-sdk-3.5.2";
     description = "Eclipse Classic";
     src =
@@ -27,10 +27,11 @@ rec {
           md5 = "bde55a2354dc224cf5f26e5320e72dac";
         };
   };
+  eclipse_sdk_35 = eclipse-sdk-35; # backward compatibility, added 2016-01-30
 
   # !!! Use mirror://eclipse/.
 
-  eclipse_sdk_36 = buildEclipse {
+  eclipse-sdk-36 = buildEclipse {
     name = "eclipse-sdk-3.6.2";
     description = "Eclipse Classic";
     src =
@@ -45,8 +46,9 @@ rec {
           sha256 = "1bh8ykliqr8wbciv13vpiy50rvm7yszk7y8dslr796dbwhi5b1cj";
         };
   };
+  eclipse_sdk_36 = eclipse-sdk-36; # backward compatibility, added 2016-01-30
 
-  eclipse_scala_sdk_40 = buildEclipse {
+  eclipse-scala-sdk-40 = buildEclipse {
     name = "eclipse-scala_sdk-4.0.0";
     description = "Eclipse IDE for Scala Developers";
     src =
@@ -61,8 +63,9 @@ rec {
           sha256 = "f422aea5903c97d212264a5a43c6ebc638aecbd4ce5e6078d92618725bc5d31e";
         };
   };
+  eclipse_scala_sdk_40 = eclipse-scala-sdk-40; # backward compatibility, added 2016-01-30
 
-  eclipse_cpp_36 = buildEclipse {
+  eclipse-cpp-36 = buildEclipse {
     name = "eclipse-cpp-3.6.2";
     description = "Eclipse IDE for C/C++ Developers";
     src =
@@ -77,8 +80,9 @@ rec {
           sha1 = "1156e4bc0253ae3a3a4e54839e4944dc64d3108f";
         };
   };
+  eclipse_cpp_36 = eclipse-cpp-36; # backward compatibility, added 2016-01-30
 
-  eclipse_modeling_36 = buildEclipse {
+  eclipse-modeling-36 = buildEclipse {
     name = "eclipse-modeling-3.6.2";
     description = "Eclipse Modeling Tools (includes Incubating components)";
     src =
@@ -93,8 +97,9 @@ rec {
           sha1 = "696377895bb26445de39d82a916b7e69edb1d939";
         };
   };
+  eclipse_modeling_36 = eclipse-modeling-36; # backward compatibility, added 2016-01-30
 
-  eclipse_sdk_37 = buildEclipse {
+  eclipse-sdk-37 = buildEclipse {
     name = "eclipse-sdk-3.7";
     description = "Eclipse Classic";
     sources = {
@@ -108,8 +113,9 @@ rec {
         };
     };
   };
+  eclipse_sdk_37 = eclipse-sdk-37; # backward compatibility, added 2016-01-30
 
-  eclipse_cpp_37 = buildEclipse {
+  eclipse-cpp-37 = buildEclipse {
     name = "eclipse-cpp-3.7";
     description = "Eclipse IDE for C/C++ Developers";
     src =
@@ -124,8 +130,9 @@ rec {
           sha256 = "1cvg1vgyazrkinwzlvlf0dpl197p4784752srqybqylyj5psdi3b";
         };
   };
+  eclipse_cpp_37 = eclipse-cpp-37; # backward compatibility, added 2016-01-30
 
-  eclipse_cpp_42 = buildEclipse {
+  eclipse-cpp-42 = buildEclipse {
     name = "eclipse-cpp-4.2";
     description = "Eclipse IDE for C/C++ Developers";
     src =
@@ -140,8 +147,9 @@ rec {
           sha256 = "1a4s9qlhfpfpdhvffyglnfdr3dq5r2ywcxqywhqi95yhq5nmsgyk";
         };
   };
+  eclipse_cpp_42 = eclipse-cpp-42; # backward compatibility, added 2016-01-30
 
-  eclipse_cpp_43 = buildEclipse {
+  eclipse-cpp-43 = buildEclipse {
     name = "eclipse-cpp-4.3.2";
     description = "Eclipse IDE for C/C++ Developers";
     src =
@@ -156,8 +164,9 @@ rec {
           sha256 = "0d6jlj7hwz8blx6csrlyi2h2prql0wckbh7ihwjmgclwpcpj84g6";
         };
   };
+  eclipse_cpp_43 = eclipse-cpp-43; # backward compatibility, added 2016-01-30
   
-   eclipse_cpp_44 = buildEclipse {
+  eclipse-cpp-44 = buildEclipse {
     name = "eclipse-cpp-4.4";
     description = "Eclipse IDE for C/C++ Developers";
     src =
@@ -172,8 +181,9 @@ rec {
           md5 = "5000f93cecf6ef9af112f0df6e8c87f3";
         };
   };
+  eclipse_cpp_44 = eclipse-cpp-44; # backward compatibility, added 2016-01-30
 
-  eclipse_cpp_45 = buildEclipse {
+  eclipse-cpp-45 = buildEclipse {
     name = "eclipse-cpp-4.5";
     description = "Eclipse IDE for C/C++ Developers, Mars release";
     src =
@@ -189,8 +199,9 @@ rec {
         }
       else throw "Unsupported system: ${stdenv.system}";
   };
+  eclipse_cpp_45 = eclipse-cpp-45; # backward compatibility, added 2016-01-30
 
-  eclipse_sdk_421 = buildEclipse {
+  eclipse-sdk-421 = buildEclipse {
     name = "eclipse-sdk-4.2.1";
     description = "Eclipse Classic";
     src =
@@ -205,8 +216,9 @@ rec {
           sha256 = "1av6qm9wkbyk123qqf38f0jq4jv2bj9wp6fmpnl55zg6qr463c1w";
         };
     };
+  eclipse_sdk_421 = eclipse-sdk-421; # backward compatibility, added 2016-01-30
 
-  eclipse_sdk_422 = buildEclipse {
+  eclipse-sdk-422 = buildEclipse {
     name = "eclipse-sdk-4.2.2";
     description = "Eclipse Classic";
     sources = {
@@ -220,8 +232,9 @@ rec {
         };
     };
   };
+  eclipse_sdk_422 = eclipse-sdk-422; # backward compatibility, added 2016-01-30
 
-  eclipse_sdk_431 = buildEclipse {
+  eclipse-sdk-431 = buildEclipse {
     name = "eclipse-sdk-4.3.1";
     description = "Eclipse Classic";
     sources = {
@@ -235,8 +248,9 @@ rec {
         };
     };
   };
+  eclipse_sdk_431 = eclipse-sdk-431; # backward compatibility, added 2016-01-30
 
-  eclipse_sdk_44 = buildEclipse {
+  eclipse-sdk-44 = buildEclipse {
     name = "eclipse-sdk-4.4";
     description = "Eclipse Classic";
     sources = {
@@ -250,8 +264,9 @@ rec {
         };
     };
   };
+  eclipse_sdk_44 = eclipse-sdk-44; # backward compatibility, added 2016-01-30
 
-  eclipse_sdk_442 = buildEclipse {
+  eclipse-sdk-442 = buildEclipse {
     name = "eclipse-sdk-4.4.2";
     description = "Eclipse Classic";
     sources = {
@@ -265,8 +280,9 @@ rec {
         };
     };
   };
+  eclipse_sdk_442 = eclipse-sdk-442; # backward compatibility, added 2016-01-30
 
-  eclipse_sdk_45 = buildEclipse {
+  eclipse-sdk-45 = buildEclipse {
     name = "eclipse-sdk-4.5";
     description = "Eclipse Mars Classic";
     sources = {
@@ -280,8 +296,9 @@ rec {
         };
     };
   };
+  eclipse_sdk_45 = eclipse-sdk-45; # backward compatibility, added 2016-01-30
 
-  eclipse_sdk_451 = buildEclipse {
+  eclipse-sdk-451 = buildEclipse {
     name = "eclipse-sdk-4.5.1";
     description = "Eclipse Mars Classic";
     sources = {
@@ -295,6 +312,7 @@ rec {
         };
     };
   };
+  eclipse_sdk_451 = eclipse-sdk-451; # backward compatibility, added 2016-01-30
 
   eclipse-platform = eclipse-platform-451;
 

From bf2dfb9d9914d6015a7168786ad1416e97b27056 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 30 Jan 2016 13:39:10 +0100
Subject: [PATCH 0740/2285] eclipse: remove old to-do comment about
 "mirror://eclipse/"

The comment is from 2011, before we started using officially mirrored
URLs[1] like

  http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=THE_FILE

I think using upstream mirrored URLs is better than mirror://eclipse:

  - upstream mirror list is always up to date
  - the closest / fastest mirror will be selected automatically

[1]: http://wiki.eclipse.org/IT_Infrastructure_Doc#Use_mirror_sites.2Fsee_which_mirrors_are_mirroring_my_files.3F
---
 pkgs/applications/editors/eclipse/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 12cfbb9c8023..9e1b41157cd0 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -29,8 +29,6 @@ rec {
   };
   eclipse_sdk_35 = eclipse-sdk-35; # backward compatibility, added 2016-01-30
 
-  # !!! Use mirror://eclipse/.
-
   eclipse-sdk-36 = buildEclipse {
     name = "eclipse-sdk-3.6.2";
     description = "Eclipse Classic";

From 75d3b418a550a76bba76a155295c24af3822b318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 30 Jan 2016 14:06:41 +0100
Subject: [PATCH 0741/2285] eclipse-cpp: 4.4 -> 4.4.2

---
 pkgs/applications/editors/eclipse/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 9e1b41157cd0..70bae3c0bb7e 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -165,18 +165,18 @@ rec {
   eclipse_cpp_43 = eclipse-cpp-43; # backward compatibility, added 2016-01-30
   
   eclipse-cpp-44 = buildEclipse {
-    name = "eclipse-cpp-4.4";
+    name = "eclipse-cpp-4.4.2";
     description = "Eclipse IDE for C/C++ Developers";
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/luna/R/eclipse-cpp-luna-R-linux-gtk-x86_64.tar.gz;
-          md5 = "b0a6ee33e8108a7ff4682ab911271b04";
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/luna/SR2/eclipse-cpp-luna-SR2-linux-gtk-x86_64.tar.gz;
+          sha256 = "1vxwj7yihgipvrb3gksmddqkarzazpwk3mh1mjnw0i5xz2y32ba4";
         }
       else
         fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/luna/R/eclipse-cpp-luna-R-linux-gtk.tar.gz;
-          md5 = "5000f93cecf6ef9af112f0df6e8c87f3";
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/luna/SR2/eclipse-cpp-luna-SR2-linux-gtk.tar.gz;
+          sha256 = "1yn7yzzx8izc199c8w4f7vrc0b08idyq0dn113i8123b0mxw5lkp";
         };
   };
   eclipse_cpp_44 = eclipse-cpp-44; # backward compatibility, added 2016-01-30

From b0b7fe2cce91be1441cfd987d5c6738359fde765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 30 Jan 2016 14:00:17 +0100
Subject: [PATCH 0742/2285] eclipse-cpp: 4.5 -> 4.5.1

---
 pkgs/applications/editors/eclipse/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 70bae3c0bb7e..e9ffe8babad1 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -182,18 +182,18 @@ rec {
   eclipse_cpp_44 = eclipse-cpp-44; # backward compatibility, added 2016-01-30
 
   eclipse-cpp-45 = buildEclipse {
-    name = "eclipse-cpp-4.5";
+    name = "eclipse-cpp-4.5.1";
     description = "Eclipse IDE for C/C++ Developers, Mars release";
     src =
       if stdenv.system == "x86_64-linux" then
         fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/mars/R/eclipse-cpp-mars-R-linux-gtk-x86_64.tar.gz;
-          sha1 = "11f9583e23ae68eb675107e6c9acc48e0a2520ae";
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/mars/1/eclipse-cpp-mars-1-linux-gtk-x86_64.tar.gz;
+          sha256 = "1j6rsgr44kya2v7y34ifscajqk7lnq1w9m9fx4i0qgby84sy4xj7";
         }
       else if stdenv.system == "i686-linux" then
         fetchurl {
-          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/mars/R/eclipse-cpp-mars-R-linux-gtk.tar.gz;
-          sha1 = "45dddb8c8f2ec79b7e25cc13d93785863ffe4791";
+          url = http://www.eclipse.org/downloads/download.php?r=1&nf=1&file=/technology/epp/downloads/release/mars/1/eclipse-cpp-mars-1-linux-gtk.tar.gz;
+          sha256 = "0qsbvjkq0ssxbnafh4gs8pfclynqis3nf7xlxx4w3k20jcjx7sr2";
         }
       else throw "Unsupported system: ${stdenv.system}";
   };

From ee0dc911579bdebb9c75a58727ba52c896ae8e79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sat, 30 Jan 2016 15:32:10 +0100
Subject: [PATCH 0743/2285] eclipse-scala-sdk: fix typo in package name

Change underscore to hyphen.
---
 pkgs/applications/editors/eclipse/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index e9ffe8babad1..815e092c9d5b 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -47,7 +47,7 @@ rec {
   eclipse_sdk_36 = eclipse-sdk-36; # backward compatibility, added 2016-01-30
 
   eclipse-scala-sdk-40 = buildEclipse {
-    name = "eclipse-scala_sdk-4.0.0";
+    name = "eclipse-scala-sdk-4.0.0";
     description = "Eclipse IDE for Scala Developers";
     src =
       if stdenv.system == "x86_64-linux" then

From 72c7b1af7f3b87dd8185ab9fef244a3f9b6bcf4d Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sat, 30 Jan 2016 16:09:31 +0100
Subject: [PATCH 0744/2285] scim: 0.1.9 -> 0.2.1 (sc-im)

Move derivation definition to "sc-im", as project was renamed.
Also change the license to BSD, which is what what-license.com
detechted.
---
 .../applications/misc/{scim => sc-im}/default.nix | 15 ++++++---------
 pkgs/top-level/all-packages.nix                   |  2 +-
 2 files changed, 7 insertions(+), 10 deletions(-)
 rename pkgs/applications/misc/{scim => sc-im}/default.nix (61%)

diff --git a/pkgs/applications/misc/scim/default.nix b/pkgs/applications/misc/sc-im/default.nix
similarity index 61%
rename from pkgs/applications/misc/scim/default.nix
rename to pkgs/applications/misc/sc-im/default.nix
index 0014784abd12..29f347522fa4 100644
--- a/pkgs/applications/misc/scim/default.nix
+++ b/pkgs/applications/misc/sc-im/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, yacc, ncurses, libxml2 }:
 
 let
-  version = "0.1.9";
+  version = "0.2.1";
 in
 stdenv.mkDerivation rec {
 
-  name = "scim-${version}";
+  name = "sc-im-${version}";
 
   src = fetchurl {
     url = "https://github.com/andmarti1424/sc-im/archive/v${version}.tar.gz";
-    sha256 = "00rjz344acw0bxv78x1w9jz8snl9lb9qhr9z22phxinidnd3vaaz";
+    sha256 = "08yks8grj5w434r81dy2knzbdhdnkc23r0d9v848mcl706xnjl6j";
   };
 
   buildInputs = [ yacc ncurses libxml2 ];
@@ -29,12 +29,9 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "https://github.com/andmarti1424/scim";
-    description = "SCIM - Spreadsheet Calculator Improvised - SC fork";
-    license = {
-      fullName = "SCIM License";
-      url = "https://github.com/andmarti1424/scim/raw/master/LICENSE";
-    };
+    homepage = "https://github.com/andmarti1424/sc-im";
+    description = "SC-IM - Spreadsheet Calculator Improvised - SC fork";
+    license = stdenv.lib.licenses.bsdOriginal;
     maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
     platforms = with stdenv.lib.platforms; linux; # Cannot test others
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 905b4c18e8a4..fb376112959c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13150,7 +13150,7 @@ let
     boost = boost155;
   };
 
-  sc-im = callPackage ../applications/misc/scim { };
+  sc-im = callPackage ../applications/misc/sc-im { };
 
   scite = callPackage ../applications/editors/scite { };
 

From 9d46f027cbb9af225311a0ee15d94bc5d18e0b82 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sun, 24 Jan 2016 14:49:54 +0000
Subject: [PATCH 0745/2285] hg-crecord: switch to same revision, but fetched
 properly using fetchFromBitbucket

I was previously just fetching the bitbucket-generated tarball of this revision, but
this was vulnerable to breakage when bitbucket made micro-changes to the tarball
generation, causing the file hash to change. This should make mercurial-full buildable
again.
---
 pkgs/top-level/python-packages.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3e9fe466fdd3..ef6747d122a4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7942,9 +7942,10 @@ in modules // {
     name = "hg-crecord-${rev}";
     disabled = isPy3k;
 
-    src = pkgs.fetchurl {
-      url = "https://bitbucket.org/edgimar/crecord/get/${builtins.substring 0 12 rev}.tar.gz";
-      sha256 = "02003fa5620ec40a5ad0d7cede2e65c2cb398a7fe4e1ee26bd3396a87d63ad35";
+    src = pkgs.fetchhg {
+      inherit rev;
+      url = "https://bitbucket.org/edgimar/crecord";
+      sha256 = "14x1k5k0jv3fiynpdfyp5zh4qvs4nr6qwy09chv3js3dhs5887ic";
     };
 
     # crecord comes as just a bare directory

From d68b516341c27b0bc0357645448967da52444df4 Mon Sep 17 00:00:00 2001
From: Jim Garrison <jim@garrison.cc>
Date: Thu, 28 Jan 2016 18:16:01 -0800
Subject: [PATCH 0746/2285] bibutils: init at 5.6

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

diff --git a/pkgs/tools/misc/bibutils/default.nix b/pkgs/tools/misc/bibutils/default.nix
new file mode 100644
index 000000000000..fb83e6996e33
--- /dev/null
+++ b/pkgs/tools/misc/bibutils/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, perl }:
+
+stdenv.mkDerivation rec {
+  name = "bibutils-${version}";
+  version = "5.6";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/bibutils/bibutils_${version}_src.tgz";
+    sha256 = "08vlaf1rs881v61hb0dnab5brbpbwbv2hqlxmw0yaycknqwbmiwz";
+  };
+
+  configureFlags = [ "--dynamic" "--install-dir" "$(out)/bin" "--install-lib" "$(out)/lib" ];
+  dontAddPrefix = true;
+
+  doCheck = true;
+  checkTarget = "test";
+
+  meta = with stdenv.lib; {
+    description = "Bibliography format interconversion";
+    longDescription = "The bibutils program set interconverts between various bibliography formats using a common MODS-format XML intermediate. For example, one can convert RIS-format files to Bibtex by doing two transformations: RIS->MODS->Bibtex. By using a common intermediate for N formats, only 2N programs are required and not N²-N. These programs operate on the command line and are styled after standard UNIX-like filters.";
+    homepage = "http://sourceforge.net/p/bibutils/home/Bibutils/";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.garrison ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c294f8be31c8..c797e4853abe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -689,6 +689,8 @@ let
 
   bibtool = callPackage ../tools/misc/bibtool { };
 
+  bibutils = callPackage ../tools/misc/bibutils { };
+
   bindfs = callPackage ../tools/filesystems/bindfs { };
 
   binwalk = callPackage ../tools/misc/binwalk {

From 81e99998f79f908f80865a65f008f831e01308e4 Mon Sep 17 00:00:00 2001
From: Simon Vandel Sillesen <simon.vandel@gmail.com>
Date: Sat, 30 Jan 2016 20:08:52 +0100
Subject: [PATCH 0747/2285] sundtek: 2015-12-12 -> 2016-01-26 + service change

* There is no need for hydra to build this, hence preferLocal
* service change: do not hardcode a wait time of 5 seconds
---
 nixos/modules/services/misc/sundtek.nix | 2 +-
 pkgs/misc/drivers/sundtek/default.nix   | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/misc/sundtek.nix b/nixos/modules/services/misc/sundtek.nix
index 8438ef79904f..e3234518c940 100644
--- a/nixos/modules/services/misc/sundtek.nix
+++ b/nixos/modules/services/misc/sundtek.nix
@@ -23,7 +23,7 @@ in
         Type = "oneshot";
         ExecStart = ''
           ${pkgs.sundtek}/bin/mediasrv -d -v -p ${pkgs.sundtek}/bin ;\
-          ${pkgs.sundtek}/bin/mediaclient --start=5 --wait-for-devices
+          ${pkgs.sundtek}/bin/mediaclient --start --wait-for-devices
           '';
         ExecStop = "${pkgs.sundtek}/bin/mediaclient --shutdown";
         RemainAfterExit = true;
diff --git a/pkgs/misc/drivers/sundtek/default.nix b/pkgs/misc/drivers/sundtek/default.nix
index 2587765da688..6c1ee05b7657 100644
--- a/pkgs/misc/drivers/sundtek/default.nix
+++ b/pkgs/misc/drivers/sundtek/default.nix
@@ -3,7 +3,7 @@
 with stdenv.lib;
 
 let
-  version = "2015-12-12";
+  version = "2016-01-26";
   rpath = makeLibraryPath [ "$out/lib" "$out/bin" ];
   platform = with stdenv;
     if isx86_64 then "64bit"
@@ -15,7 +15,7 @@ in
   stdenv.mkDerivation {
     src = fetchurl {
       url = "http://www.sundtek.de/media/netinst/${platform}/installer.tar.gz";
-      sha256 = "0pjg4xww25z36dp64az4gdc0fxhz51f5kb8zvj03hqc774fxzpbq";
+      sha256 = "15y6r5w306pcq4g1rn9f7vf70f3a7qhq237ngaf0wxh2nr0aamxp";
     };
     name = "sundtek-${version}";
 
@@ -38,6 +38,8 @@ in
         patchelf --set-rpath ${rpath} {} \;
     '';
 
+    preferLocalBuild = true;
+
     meta = {
       description = "Sundtek MediaTV driver";
       maintainers = [ maintainers.simonvandel ];

From 057e54f2ad6d99f792c6a69e739b40efa04b6836 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 30 Jan 2016 17:53:05 +0100
Subject: [PATCH 0748/2285] eclipse-plugin-checkstyle: 6.11.1 -> 6.14.0

---
 pkgs/applications/editors/eclipse/plugins.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 211dba85c430..40aa6b8385ec 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -171,12 +171,12 @@ rec {
 
   checkstyle = buildEclipseUpdateSite rec {
     name = "checkstyle-${version}";
-    version = "6.11.1.201510102004";
+    version = "6.14.0.201601142217";
 
     src = fetchzip {
       stripRoot = false;
-      url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/6.11.1/net.sf.eclipsecs-updatesite_${version}-bin.zip";
-      sha256 = "0l9nfx7a3qdx1pvjgc6ck4rxh7yrvqsskr190yrxxwmpnyj9cjs4";
+      url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/6.14.0/net.sf.eclipsecs-updatesite_${version}-bin.zip";
+      sha256 = "0ysxir1fv0mb9xnidc9hv6llnk48lkav0sryjbx7pw7vy1f8nd4c";
     };
 
     meta = with stdenv.lib; {

From ead58a86ba8f7bc1aac95171fb0505c439351281 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 30 Jan 2016 21:08:09 +0100
Subject: [PATCH 0749/2285] clawsMail: 3.13.1 -> 3.13.2 (security fix)

---
 .../networking/mailreaders/claws-mail/default.nix          | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
index 5b3eb2326c5a..86bf0b2e14b8 100644
--- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix
+++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix
@@ -30,10 +30,9 @@
 
 with stdenv.lib;
 
-let version = "3.13.1"; in
-
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "claws-mail-${version}";
+  version = "3.13.2";
 
   meta = {
     description = "The user-friendly, lightweight, and fast email client";
@@ -45,7 +44,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.claws-mail.org/download.php?file=releases/claws-mail-${version}.tar.xz";
-    sha256 = "049av7r0xhjjjm1p93l2ns3xisvn125v3ncqar23cqjzgcichg5d";
+    sha256 = "1l8ankx0qpq1ix1an8viphcf11ksh53jsrm1xjmq8cjbh5910wva";
   };
 
   patches = [ ./mime.patch ];

From 6d92029239d94898c3c09da99b341155f670e492 Mon Sep 17 00:00:00 2001
From: Joel Moberg <joel.moberg@gmail.com>
Date: Wed, 27 Jan 2016 17:01:57 +0100
Subject: [PATCH 0750/2285] graph-tool: 2.2.42 -> 2.12

Closes #12647

Signed-off-by: Robin Gloster <mail@glob.in>
---
 pkgs/development/python-modules/graph-tool/2.x.x.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix
index 46571978a6d3..445a4313990c 100644
--- a/pkgs/development/python-modules/graph-tool/2.x.x.nix
+++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix
@@ -1,9 +1,9 @@
 { stdenv, fetchurl, python, cairomm, sparsehash, pycairo, automake, m4,
 pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, makeWrapper,
-gobjectIntrospection, pygobject3, gtk3, matplotlib }:
+gobjectIntrospection, pygobject3, gtk3, matplotlib, autoconf, libtool }:
 
 stdenv.mkDerivation rec {
-  version = "2.2.42";
+  version = "2.12";
   name = "${python.libPrefix}-graph-tool-${version}";
 
   meta = with stdenv.lib; {
@@ -15,15 +15,17 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "http://downloads.skewed.de/graph-tool/graph-tool-${version}.tar.bz2";
-    sha256 = "124qmd0mgam7hm87gscp3836ymhhwwnlfm2c5pzpml06da1w0xg9";
+    url = "https://github.com/count0/graph-tool/archive/release-${version}.tar.gz";
+    sha256 = "12w58djyx6nn00wixqnxnxby9ksabhzdkkvynl8b89parfvfbpwl";
   };
 
   preConfigure = ''
+    patchShebangs autogen.sh
+    ./autogen.sh
     configureFlags="--with-python-module-path=$out/${python.sitePackages} --enable-openmp"
   '';
 
-  buildInputs = [ automake m4 pkgconfig makeWrapper ];
+  buildInputs = [ automake m4 pkgconfig makeWrapper autoconf libtool ];
 
   propagatedBuildInputs = [
     boost

From ef4ff7a799ea98b46ce72edee9606f0966e3399f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 30 Jan 2016 20:27:16 +0000
Subject: [PATCH 0751/2285] graph-tool: cleanup

fucked up adding the changes

see #12647
---
 .../python-modules/graph-tool/2.x.x.nix         | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/graph-tool/2.x.x.nix b/pkgs/development/python-modules/graph-tool/2.x.x.nix
index 445a4313990c..be1592f864fa 100644
--- a/pkgs/development/python-modules/graph-tool/2.x.x.nix
+++ b/pkgs/development/python-modules/graph-tool/2.x.x.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, automake, m4,
-pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir, makeWrapper,
-gobjectIntrospection, pygobject3, gtk3, matplotlib, autoconf, libtool }:
+{ stdenv, fetchurl, python, cairomm, sparsehash, pycairo, autoreconfHook,
+pkgconfig, boost, expat, scipy, numpy, cgal, gmp, mpfr, lndir,
+gobjectIntrospection, pygobject3, gtk3, matplotlib }:
 
 stdenv.mkDerivation rec {
   version = "2.12";
@@ -19,13 +19,12 @@ stdenv.mkDerivation rec {
     sha256 = "12w58djyx6nn00wixqnxnxby9ksabhzdkkvynl8b89parfvfbpwl";
   };
 
-  preConfigure = ''
-    patchShebangs autogen.sh
-    ./autogen.sh
-    configureFlags="--with-python-module-path=$out/${python.sitePackages} --enable-openmp"
-  '';
+  configureFlags = [
+    "--with-python-module-path=$(out)/${python.sitePackages}"
+    "--enable-openmp"
+  ];
 
-  buildInputs = [ automake m4 pkgconfig makeWrapper autoconf libtool ];
+  buildInputs = [ pkgconfig autoreconfHook ];
 
   propagatedBuildInputs = [
     boost

From d89e84f859226db6d18f25c3542bb4430e121158 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 23 Jan 2016 23:31:05 +0000
Subject: [PATCH 0752/2285] gnokii: use mkDerivation

---
 pkgs/tools/misc/gnokii/default.nix            | 34 ++++++++-----------
 pkgs/tools/misc/gnokii/src-for-default.nix    |  9 -----
 .../misc/gnokii/src-info-for-default.nix      |  4 ---
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 15 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/tools/misc/gnokii/src-for-default.nix
 delete mode 100644 pkgs/tools/misc/gnokii/src-info-for-default.nix

diff --git a/pkgs/tools/misc/gnokii/default.nix b/pkgs/tools/misc/gnokii/default.nix
index c0593e5c0177..d1551eb4ccd6 100644
--- a/pkgs/tools/misc/gnokii/default.nix
+++ b/pkgs/tools/misc/gnokii/default.nix
@@ -1,31 +1,25 @@
-a @ { intltool, perl, gettext, libusb, pkgconfig, bluez, readline, pcsclite, libical, gtk, glib, libXpm, ... } :
-let
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl, intltool, perl, gettext, libusb, pkgconfig, bluez
+, readline, pcsclite, libical, gtk, glib, libXpm }:
 
-  s = import ./src-for-default.nix;
-  buildInputs = with a; [
+stdenv.mkDerivation rec {
+  name = "gnokii-${version}";
+  version = "0.6.31";
+
+  src = fetchurl {
+    sha256 = "0sjjhm40662bj6j0jh3sd25b8nww54nirpwamz618rg6pb5hjwm8";
+    url = "http://www.gnokii.org/download/gnokii/${name}.tar.gz";
+  };
+
+  buildInputs = [
     perl intltool gettext libusb
     glib gtk pkgconfig bluez readline
     libXpm pcsclite libical
   ];
-in
 
-assert a.stdenv ? glibc;
-
-rec {
-  src = a.fetchUrlFromSrcInfo s;
-
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = [ "doConfigure" "doMakeInstall"];
-
-  inherit(s) name;
   meta = {
     description = "Cellphone tool";
     homepage = http://www.gnokii.org;
-    maintainers = [a.lib.maintainers.raskin];
-    platforms = with a.lib.platforms; linux;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/misc/gnokii/src-for-default.nix b/pkgs/tools/misc/gnokii/src-for-default.nix
deleted file mode 100644
index af2768ddfa3b..000000000000
--- a/pkgs/tools/misc/gnokii/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
-   version="0.6.31";
-   name="gnokii-0.6.31";
-   hash="0sjjhm40662bj6j0jh3sd25b8nww54nirpwamz618rg6pb5hjwm8";
-   url="http://www.gnokii.org/download/gnokii/gnokii-${version}.tar.gz";
-   advertisedUrl="http://www.gnokii.org/download/gnokii/gnokii-0.6.31.tar.gz";
-  
-  
-}
diff --git a/pkgs/tools/misc/gnokii/src-info-for-default.nix b/pkgs/tools/misc/gnokii/src-info-for-default.nix
deleted file mode 100644
index 6d68b555b181..000000000000
--- a/pkgs/tools/misc/gnokii/src-info-for-default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  downloadPage = "http://www.gnokii.org/download/gnokii/?C=M;O=D";
-  baseName = "gnokii";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c26313c417a5..12b0346013b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1662,7 +1662,7 @@ let
 
   gnaural = callPackage ../applications/audio/gnaural { };
 
-  gnokii = builderDefsPackage (callPackage ../tools/misc/gnokii) { };
+  gnokii = callPackage ../tools/misc/gnokii { };
 
   gnuapl = callPackage ../development/interpreters/gnu-apl { };
 

From 2c3013f55bbc09d523e1863893c5fc170a7074a3 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 23 Jan 2016 23:33:06 +0000
Subject: [PATCH 0753/2285] cvs: Remove unneeded configureFlags

---
 pkgs/applications/version-management/cvs/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/applications/version-management/cvs/default.nix b/pkgs/applications/version-management/cvs/default.nix
index 0e43972fab6a..e9de202a8092 100644
--- a/pkgs/applications/version-management/cvs/default.nix
+++ b/pkgs/applications/version-management/cvs/default.nix
@@ -11,9 +11,6 @@ stdenv.mkDerivation {
   patches = [ ./getcwd-chroot.patch ];
 
   preConfigure = ''
-    # Fix location of info and man directories.
-    configureFlags="--infodir=$out/share/info --mandir=$out/share/man"
-
     # Apply the Debian patches.
     for p in "debian/patches/"*; do
       echo "applying \`$p' ..."

From 629b5a88cdeef9748e62c15f5c4b592b92532182 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 24 Jan 2016 00:23:29 +0000
Subject: [PATCH 0754/2285] pythonSexy: use mkDerivation

---
 .../python-modules/libsexy/default.nix        | 33 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/libsexy/default.nix b/pkgs/development/python-modules/libsexy/default.nix
index 5e0d391a3380..b0fa789d157b 100644
--- a/pkgs/development/python-modules/libsexy/default.nix
+++ b/pkgs/development/python-modules/libsexy/default.nix
@@ -1,31 +1,26 @@
-a @ { python, libsexy, pkgconfig, libxml2, pygtk, pango, gtk, glib, ... } :
-let
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl, buildPythonPackage, libsexy, pkgconfig, libxml2, pygtk, pango, gtk, glib, }:
+
+stdenv.mkDerivation rec {
+  name = "python-libsexy-${version}";
+  version = "0.1.9";
 
-  version = a.lib.attrByPath ["version"] "0.1.9" a;
-  buildInputs = with a; [
-    pkgconfig pygtk
-  ];
-  propagatedBuildInputs = with a; [
-    libsexy python gtk glib pango libxml2
-  ];
-in
-rec {
   src = fetchurl {
     url = "http://releases.chipx86.com/libsexy/sexy-python/sexy-python-${version}.tar.gz";
     sha256 = "05bgcsxwkp63rlr8wg6znd46cfbhrzc5wh70jabsi654pxxjb39d";
   };
 
-  inherit buildInputs propagatedBuildInputs;
-  configureFlags = [];
+  buildInputs = [
+    pkgconfig pygtk
+  ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall" "postInstall"];
-  postInstall = a.fullDepEntry (''
+  propagatedBuildInputs = [
+    libsexy gtk glib pango libxml2
+  ];
+
+  postInstall = ''
     ln -s $out/lib/python*/site-packages/gtk-2.0/* $out/lib/python*/site-packages/
-  '') ["minInit"];
+  '';
 
-  name = "python-libsexy-" + version;
   meta = {
     description = "Python libsexy bindings";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 12b0346013b6..44167470a99d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2870,7 +2870,7 @@ let
 
   pythonIRClib = pythonPackages.pythonIRClib;
 
-  pythonSexy = builderDefsPackage (callPackage ../development/python-modules/libsexy) { };
+  pythonSexy = callPackage ../development/python-modules/libsexy { };
 
   pytrainer = callPackage ../applications/misc/pytrainer { };
 

From 2b430c9aa6caf18812fb41cd02b1e8b15a0c0471 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 24 Jan 2016 12:49:33 +0000
Subject: [PATCH 0755/2285] acl2: use mkDerivation

---
 .../development/interpreters/acl2/default.nix | 50 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix
index e723133e256d..f1e2315d7941 100644
--- a/pkgs/development/interpreters/acl2/default.nix
+++ b/pkgs/development/interpreters/acl2/default.nix
@@ -1,45 +1,35 @@
-a :  
-let 
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl, sbcl }:
+
+stdenv.mkDerivation rec {
+  name = "acl2-${version}";
+  version = "v6-5";
 
-  version = a.lib.attrByPath ["version"] "v6-5" a; 
-  buildInputs = with a; [
-    sbcl
-  ];
-in
-rec {
   src = fetchurl {
     url = "http://www.cs.utexas.edu/users/moore/acl2/${version}/distrib/acl2.tar.gz";
     sha256 = "19kfclgpdyms016s06pjf3icj3mx9jlcj8vfgpbx2ac4ls0ir36g";
     name = "acl2-${version}.tar.gz";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
+  buildInputs = [ sbcl ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doDeploy" "doBuild"];
-  
-  makeFlags = ["LISP='${a.sbcl}/bin/sbcl'"];
+  phases = "unpackPhase installPhase";
 
   installSuffix = "acl2";
-  doDeploy = (a.simplyShare installSuffix);
-  doBuild = a.fullDepEntry (''
+
+  installPhase = ''
+    mkdir -p $out/share/${installSuffix}
+    cp -R . $out/share/${installSuffix}
     cd $out/share/${installSuffix}
-    make LISP='${a.sbcl}/bin/sbcl --dynamic-space-size 2000'
-    make LISP='${a.sbcl}/bin/sbcl --dynamic-space-size 2000' regression
-    mkdir -p "$out/bin"
-    cp saved_acl2 "$out/bin/acl2"
-  '') ["doDeploy" "addInputs" "defEnsureDir"];
-      
-  name = "acl2-" + version;
+    make 'LISP=${sbcl}/bin/sbcl --dynamic-space-size 2000'
+    make 'LISP=${sbcl}/bin/sbcl --dynamic-space-size 2000' regression
+    make LISP=${sbcl}/bin/sbcl TAGS
+    mkdir -p $out/bin
+    cp saved_acl2 $out/bin/acl2
+  '';
+
   meta = {
     description = "An interpreter and a prover for a Lisp dialect";
-    maintainers = with a.lib.maintainers; 
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    maintainers = with 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 44167470a99d..a184326c0001 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5083,7 +5083,7 @@ let
 
   ### DEVELOPMENT / INTERPRETERS
 
-  acl2 = builderDefsPackage (callPackage ../development/interpreters/acl2) {
+  acl2 = callPackage ../development/interpreters/acl2 {
     sbcl = sbcl_1_2_0;
   };
 

From d43078b15b3cf2a81daa1575d22ecfa3398665cc Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 24 Jan 2016 15:15:11 +0000
Subject: [PATCH 0756/2285] webdruid: remove

It used the old builderDefsPackage and segfaulted on startup. Could not
fix it and has not been touched for 6 years.
---
 pkgs/tools/admin/webdruid/default.nix         | 30 -------------------
 pkgs/tools/admin/webdruid/src-for-default.nix |  8 -----
 .../admin/webdruid/src-info-for-default.nix   |  7 -----
 pkgs/top-level/all-packages.nix               |  2 --
 4 files changed, 47 deletions(-)
 delete mode 100644 pkgs/tools/admin/webdruid/default.nix
 delete mode 100644 pkgs/tools/admin/webdruid/src-for-default.nix
 delete mode 100644 pkgs/tools/admin/webdruid/src-info-for-default.nix

diff --git a/pkgs/tools/admin/webdruid/default.nix b/pkgs/tools/admin/webdruid/default.nix
deleted file mode 100644
index ee4dabf78e78..000000000000
--- a/pkgs/tools/admin/webdruid/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-a @ { zlib, libpng, freetype, gd, which, libxml2, geoip, ... } :
-let
-  s = import ./src-for-default.nix;
-  buildInputs = with a; [
-    zlib libpng freetype gd which libxml2
-    geoip
-  ];
-in
-rec {
-  src = a.fetchUrlFromSrcInfo s;
-
-  inherit (s) name;
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doConfigure" "doMakeInstall" "doLinks"];
-
-  doLinks = a.fullDepEntry (''
-    ln -s shared_en.xsl $out/share/webdruid/classic/shared.xsl
-  '') ["minInit"];
-
-  meta = {
-    description = "A web log analyzer";
-    maintainers = [
-      a.lib.maintainers.raskin
-    ];
-    platforms = a.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/tools/admin/webdruid/src-for-default.nix b/pkgs/tools/admin/webdruid/src-for-default.nix
deleted file mode 100644
index 73102be6afe5..000000000000
--- a/pkgs/tools/admin/webdruid/src-for-default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-rec {
-  advertisedUrl="http://downloads.sourceforge.net/webdruid/files/webdruid/0.6.0-alpha5/webdruid-0.6.0-alpha5.tar.gz";
-  version = "0.6.0-alpha5";
-  url="mirror://sourceforge/webdruid/webdruid-${version}.tar.gz";
-  hash = "1aiqffccayvf02snl9la62zqb1674cp4rv19af6xyxgvw4334hw0";
-  name = "webdruid-0.6.0-alpha5";
-  
-}
diff --git a/pkgs/tools/admin/webdruid/src-info-for-default.nix b/pkgs/tools/admin/webdruid/src-info-for-default.nix
deleted file mode 100644
index 9a4eff296828..000000000000
--- a/pkgs/tools/admin/webdruid/src-info-for-default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  downloadPage = "http://sourceforge.net/projects/webdruid/files/";
-  choiceCommand = ''head -1 | sed -re "$skipRedirectSF"'';
-  versionExtractorSedScript = ''$extractReleaseSF'';
-  versionReferenceCreator = ''s@$version@\''${version}@g'';
-  baseName = "webdruid";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a184326c0001..5ea255a3debd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3615,8 +3615,6 @@ let
 
   webalizer = callPackage ../tools/networking/webalizer { };
 
-  webdruid = builderDefsPackage (callPackage ../tools/admin/webdruid) {};
-
   weighttp = callPackage ../tools/networking/weighttp { };
 
   wget = callPackage ../tools/networking/wget {

From cf33734351269e96c5fee969203b95e68022b05e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 24 Jan 2016 15:28:29 +0000
Subject: [PATCH 0757/2285] gcl: use mkDerivation

---
 pkgs/development/compilers/gcl/default.nix | 70 ++++++++++------------
 pkgs/top-level/all-packages.nix            |  2 +-
 2 files changed, 34 insertions(+), 38 deletions(-)

diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix
index 1ea2894d88d7..25b1599fbea0 100644
--- a/pkgs/development/compilers/gcl/default.nix
+++ b/pkgs/development/compilers/gcl/default.nix
@@ -1,56 +1,52 @@
-a @ { mpfr, m4, binutils, fetchcvs, emacs, zlib, which
-, texinfo, libX11, xproto, inputproto, libXi
-, libXext, xextproto, libXt, libXaw, libXmu, stdenv, ... } :
-let
-  buildInputs = with a; [
+{ stdenv, fetchurl, mpfr, m4, binutils, fetchcvs, emacs, zlib, which
+, texinfo, libX11, xproto, inputproto, libXi, gmp
+, libXext, xextproto, libXt, libXaw, libXmu } :
+
+assert stdenv ? cc ;
+assert stdenv.cc.isGNU ;
+assert stdenv.cc ? libc ;
+assert stdenv.cc.libc != null ;
+
+stdenv.mkDerivation rec {
+  name = "gcl-${version}";
+  version = "2.6.12";
+
+  src = fetchurl {
+    sha256 = "1s4hs2qbjqmn9h88l4xvsifq5c3dlc5s74lyb61rdi5grhdlkf4f";
+    url = "http://gnu.spinellicreations.com/gcl/${name}.tar.gz";
+  };
+
+  buildInputs = [
     mpfr m4 binutils emacs gmp
     libX11 xproto inputproto libXi
     libXext xextproto libXt libXaw libXmu
     zlib which texinfo
   ];
-in
 
-(
-assert a.stdenv ? cc ;
-assert a.stdenv.cc.isGNU ;
-assert a.stdenv.cc ? libc ;
-assert a.stdenv.cc.libc != null ;
-
-rec {
-  src = a.fetchurl {
-    sha256 = "1s4hs2qbjqmn9h88l4xvsifq5c3dlc5s74lyb61rdi5grhdlkf4f";
-    url="http://gnu.spinellicreations.com/gcl/${name}.tar.gz";
-  };
-
-  name = "gcl-2.6.12";
-  inherit buildInputs;
   configureFlags = [
     "--enable-ansi"
   ];
 
   # Upstream bug submitted - http://savannah.gnu.org/bugs/index.php?30371
   # $TMPDIR must have no extension
-  setVars = a.noDepEntry ''
-    export TMPDIR="''${TMPDIR:-''${TMP:-''${TEMP}}}/tmp-for-gcl"
-    mkdir -p "$TMPDIR"
+  # setVars = a.noDepEntry ''
+  #   export TMPDIR="''${TMPDIR:-''${TMP:-''${TEMP}}}/tmp-for-gcl"
+  #   mkdir -p "$TMPDIR"
+  # '';
+
+  preBuild = ''
+    # sed -re "s@/bin/cat@$(which cat)@g" -i configure */configure
+    # sed -re "s@if test -d /proc/self @if false @" -i configure
+    # sed -re 's^([ \t])cpp ^\1cpp -I${stdenv.cc.cc}/include -I${stdenv.cc.libc}/include ^g' -i makefile
   '';
 
-  preBuild = a.fullDepEntry (''
-    sed -re "s@/bin/cat@$(which cat)@g" -i configure */configure
-    sed -re "s@if test -d /proc/self @if false @" -i configure
-    sed -re 's^([ \t])cpp ^\1cpp -I${a.stdenv.cc.cc}/include -I${a.stdenv.cc.libc}/include ^g' -i makefile
-  '') ["minInit" "doUnpack" "addInputs"];
-
   /* doConfigure should be removed if not needed */
-  phaseNames = ["setVars" "doUnpack" "preBuild"
-    "doConfigure" "doMakeInstall"];
-}) // {
+  # phaseNames = ["setVars" "doUnpack" "preBuild"
+  #   "doConfigure" "doMakeInstall"];
+
   meta = {
     description = "GNU Common Lisp compiler working via GCC";
-    maintainers = [
-      a.lib.maintainers.raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    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 5ea255a3debd..85e483deca9b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4156,7 +4156,7 @@ let
 
   ghdl_mcode = callPackage ../development/compilers/ghdl { };
 
-  gcl = builderDefsPackage (callPackage ../development/compilers/gcl) {
+  gcl = callPackage ../development/compilers/gcl {
     gmp = gmp4;
   };
 

From 63e6cca2a9982218179eeda0047362931b75f34a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 24 Jan 2016 15:50:54 +0000
Subject: [PATCH 0758/2285] pyIRCt: use mkDerivation

---
 pkgs/servers/xmpp/pyIRCt/default.nix | 42 +++++++++++++++-------------
 pkgs/top-level/all-packages.nix      |  2 +-
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/pkgs/servers/xmpp/pyIRCt/default.nix b/pkgs/servers/xmpp/pyIRCt/default.nix
index 4481ad4a14a6..f732e29acc95 100644
--- a/pkgs/servers/xmpp/pyIRCt/default.nix
+++ b/pkgs/servers/xmpp/pyIRCt/default.nix
@@ -1,37 +1,39 @@
-a @ { xmpppy, pythonIRClib, python, makeWrapper, ... } :
-let
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl, xmpppy, pythonIRClib, python, pythonPackages } :
+
+stdenv.mkDerivation rec {
+  name = "pyIRCt-${version}";
+  version = "0.4";
 
-  version = a.lib.attrByPath ["version"] "0.4" a;
-  buildInputs = with a; [
-    xmpppy pythonIRClib python makeWrapper
-  ];
-in
-rec {
   src = fetchurl {
     url = "mirror://sourceforge/xmpppy/irc-transport-${version}.tar.gz";
     sha256 = "0gbc0dvj1p3088b6x315yjrlwnc5vvzp0var36wlf9z60ghvk8yb";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
+  buildInputs = [ pythonPackages.wrapPython ];
+
+  pythonPath = [
+    xmpppy pythonIRClib
+  ];
 
   /* doConfigure should be removed if not needed */
-  phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)];
-  deploy = a.fullDepEntry (''
+  # phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/irc.py" a.pythonWrapperArguments)];
+
+  installPhase = ''
     mkdir -p $out/bin $out/share/${name}
-    sed -e 's@/usr/bin/@${a.python}/bin/@' -i irc.py
+    sed -e 's@/usr/bin/@${python}/bin/@' -i irc.py
     sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyIRCt.xml"]' -i config.py
     sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-irc-transport.xml"]' -i config.py
     sed -e '/configFiles/iimport os' -i config.py
-    cp * $out/share/$name
-    echo "#! /bin/sh" > $out/bin/pyIRCt
-    echo "cd $out/share/${name}" >> $out/bin/pyIRCt
-    echo "./irc.py \"$@\"" >> $out/bin/pyIRCt
+    cp * $out/share/${name}
+    cat > $out/bin/pyIRCt <<EOF
+      #! /bin/sh
+      cd $out/share/${name}
+      ./irc.py \"$@\"
+    EOF
     chmod a+rx  $out/bin/pyIRCt $out/share/${name}/irc.py
-  '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
+    wrapPythonPrograms
+  '';
 
-  name = "pyIRCt-" + version;
   meta = {
     description = "IRC transport module for XMPP";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85e483deca9b..ca43d9502aa2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9571,7 +9571,7 @@ let
 
   pumpio = callPackage ../servers/web-apps/pump.io { };
 
-  pyIRCt = builderDefsPackage (callPackage ../servers/xmpp/pyIRCt) {};
+  pyIRCt = callPackage ../servers/xmpp/pyIRCt {};
 
   pyMAILt = builderDefsPackage (callPackage ../servers/xmpp/pyMAILt) {};
 

From 96350a9ec943640c8567224d5aa000d1affe7a59 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 24 Jan 2016 15:50:54 +0000
Subject: [PATCH 0759/2285] pyMAILt: use mkDerivation

---
 pkgs/servers/xmpp/pyMAILt/default.nix | 36 +++++++++++++--------------
 pkgs/top-level/all-packages.nix       |  2 +-
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix
index eb4f55f7aebd..f5a91b28633f 100644
--- a/pkgs/servers/xmpp/pyMAILt/default.nix
+++ b/pkgs/servers/xmpp/pyMAILt/default.nix
@@ -1,39 +1,37 @@
-a @ { xmpppy, python, makeWrapper, fetchcvs, ... } :
-let
-  fetchurl = a.fetchurl;
+{ stdenv, python, xmpppy, pythonPackages, fetchcvs } :
 
-  buildInputs = with a; [
-    xmpppy python makeWrapper
-  ];
-in
-rec {
-  src = a.fetchcvs {
+stdenv.mkDerivation rec {
+  name = "pyMAILt-${version}";
+  version = "20090101";
+
+  src = fetchcvs {
 		cvsRoot = ":pserver:anonymous@xmpppy.cvs.sourceforge.net:/cvsroot/xmpppy";
 		module = "xmpppy/mail-transport";
 		date = "2009-01-01";
 		sha256 = "15301252e52b4ccb2156baefed8982a2a0cce3ae8eae3caf3cc28dfa615c8d6e";
 	};
 
-  inherit buildInputs;
-  configureFlags = [];
+  pythonPath = [ xmpppy ];
+  buildInputs = [ pythonPackages.wrapPython ];
 
   /* doConfigure should be removed if not needed */
-  phaseNames = ["deploy" (a.makeManyWrappers "$out/share/${name}/mail.py" a.pythonWrapperArguments)];
-  deploy = a.fullDepEntry (''
+  installPhase = ''
     cd mail-transport
     mkdir -p $out/bin $out/share/${name}
-    sed -e 's@/usr/bin/@${a.python}/bin/@' -i mail.py
+    sed -e 's@/usr/bin/@${python}/bin/@' -i mail.py
     sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.pyMAILt.xml"]' -i config.py
     sed -e '/configFiles/aconfigFiles += [os.getenv("HOME")+"/.python-mail-transport.xml"]' -i config.py
     sed -e '/configFiles/iimport os' -i config.py
     cp * $out/share/$name
-    echo "#! /bin/sh" > $out/bin/pyMAILt
-    echo "cd $out/share/${name}" >> $out/bin/pyMAILt
-    echo "./mail.py \"$@\"" >> $out/bin/pyMAILt
+    cat > $out/bin/pyMAILt <<EOF
+      #! /bin/sh
+      cd $out/share/${name}
+      ./mail.py \"$@\"
+    EOF
     chmod a+rx  $out/bin/pyMAILt $out/share/${name}/mail.py
-  '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
+    wrapPythonPrograms
+  '';
 
-  name = "pyMAILt-20090101";
   meta = {
     description = "Email transport module for XMPP";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ca43d9502aa2..26d8f61e4fdc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9573,7 +9573,7 @@ let
 
   pyIRCt = callPackage ../servers/xmpp/pyIRCt {};
 
-  pyMAILt = builderDefsPackage (callPackage ../servers/xmpp/pyMAILt) {};
+  pyMAILt = callPackage ../servers/xmpp/pyMAILt {};
 
   qpid-cpp = callPackage ../servers/amqp/qpid-cpp {
     boost = boost155;

From 1af99b8dad40ab1a33a75f0a3d83584408a57561 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 24 Jan 2016 15:50:54 +0000
Subject: [PATCH 0760/2285] arkpandora_ttf: use mkDerivation

---
 pkgs/data/fonts/arkpandora/default.nix | 18 +++++++++---------
 pkgs/top-level/all-packages.nix        |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/data/fonts/arkpandora/default.nix b/pkgs/data/fonts/arkpandora/default.nix
index 189c066b13eb..55420e2d344e 100644
--- a/pkgs/data/fonts/arkpandora/default.nix
+++ b/pkgs/data/fonts/arkpandora/default.nix
@@ -1,6 +1,8 @@
-args : with args; 
-let version = lib.attrByPath ["version"] "2.04" args; in
-rec {
+{ stdenv, fetchurl }:
+stdenv.mkDerivation rec {
+  name = "arkpandora-${version}";
+  version = "2.04";
+
   src = fetchurl {
     urls = [
       "ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/distfiles/ttf-arkpandora-${version}.tgz"
@@ -10,13 +12,11 @@ rec {
     sha256 = "16mfxwlgn6vs3xn00hha5dnmz6bhjiflq138y4zcq3yhk0y9bz51";
   };
 
-  buildInputs = [];
-  configureFlags = [];
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    cp *.ttf $out/share/fonts/truetype
+  '';
 
-  /* doConfigure should be specified separately */
-  phaseNames = ["doUnpack" "installFonts"];
-      
-  name = "arkpandora-" + version;
   meta = {
     description = "Font, metrically identical to Arial and Times New Roman";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26d8f61e4fdc..472b325055ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10820,7 +10820,7 @@ let
 
   anonymousPro = callPackage ../data/fonts/anonymous-pro { };
 
-  arkpandora_ttf = builderDefsPackage (callPackage ../data/fonts/arkpandora) { };
+  arkpandora_ttf = callPackage ../data/fonts/arkpandora { };
 
   aurulent-sans = callPackage ../data/fonts/aurulent-sans { };
 

From 1c6db216533758701d1e841de0f16fb957f49f6b Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 24 Jan 2016 15:50:54 +0000
Subject: [PATCH 0761/2285] libertine: use mkDerivation

---
 pkgs/data/fonts/libertine/default.nix | 39 ++++++++++++++++++++-------
 pkgs/top-level/all-packages.nix       |  2 +-
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/pkgs/data/fonts/libertine/default.nix b/pkgs/data/fonts/libertine/default.nix
index eb28521a2b8a..b95b0f0beddf 100644
--- a/pkgs/data/fonts/libertine/default.nix
+++ b/pkgs/data/fonts/libertine/default.nix
@@ -1,4 +1,6 @@
-args @ { fetchurl, fontforge, lib, ... }: with args; rec {
+{ stdenv, fetchurl, fontforge }:
+
+stdenv.mkDerivation rec {
   name = "linux-libertine-5.3.0";
 
   src = fetchurl {
@@ -6,18 +8,37 @@ args @ { fetchurl, fontforge, lib, ... }: with args; rec {
     sha256 = "0x7cz6hvhpil1rh03rax9zsfzm54bh7r4bbrq8rz673gl9h47v0v";
   };
 
+  setSourceRoot = "sourceRoot=`pwd`";
+
   buildInputs = [ fontforge ];
 
-  /* doConfigure should be specified separately */
-  phaseNames = ["doUnpack" "generateFontsFromSFD" "installFonts"];
-
-  extraFontForgeCommands = ''
-    ScaleToEm(1000);
+  buildPhase = ''
+    for i in *.sfd; do
+      fontforge -c \
+        'Open($1);
+        ScaleToEm(1000);
+        Reencode("unicode");
+        Generate($1:r + ".ttf");
+        Generate($1:r + ".otf");
+        Reencode("TeX-Base-Encoding");
+        Generate($1:r + ".afm");
+        Generate($1:r + ".pfm");
+        Generate($1:r + ".pfb");
+        Generate($1:r + ".map");
+        Generate($1:r + ".enc");
+        ' $i;
+    done
   '';
 
-  doUnpack = lib.fullDepEntry ''
-      tar xf ${src}
-    '' ["minInit"];
+  installPhase = ''
+    mkdir -p $out/share/fonts/{opentype,truetype,type1}/public
+    mkdir -p $out/share/texmf/fonts/{enc,map}
+    cp *.otf $out/share/fonts/opentype/public
+    cp *.ttf $out/share/fonts/truetype/public
+    cp *.pfb $out/share/fonts/type1/public
+    cp *.enc $out/share/texmf/fonts/enc
+    cp *.map $out/share/texmf/fonts/map
+  '';
 
   meta = {
     description = "Linux Libertine Fonts";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 472b325055ca..2eeedef4d127 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10950,7 +10950,7 @@ let
   liberation_ttf_binary = callPackage ../data/fonts/redhat-liberation-fonts/binary.nix { };
   liberation_ttf = liberation_ttf_binary;
 
-  libertine = builderDefsPackage (callPackage ../data/fonts/libertine) { };
+  libertine = callPackage ../data/fonts/libertine { };
 
   lmmath = callPackage ../data/fonts/lmodern/lmmath.nix {};
 

From ecc580f379b41fa69f0d67770824be3d69a7efe2 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 24 Jan 2016 15:50:54 +0000
Subject: [PATCH 0762/2285] carrier: deleted pidgin fork

not updated in >5 years and broken build
---
 .../instant-messengers/carrier/2.5.0.nix      | 58 -------------------
 pkgs/top-level/all-packages.nix               |  5 --
 2 files changed, 63 deletions(-)
 delete mode 100644 pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix

diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
deleted file mode 100644
index 7368a8842147..000000000000
--- a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-args @ { fetchurl, stdenv, pkgconfig, perl, perlXMLParser, libxml2, openssl, nss
-, gtkspell, aspell, gettext, ncurses, avahi, dbus, dbus_glib, python
-, libtool, automake, autoconf, gstreamer
-, gtk, glib
-, libXScrnSaver, scrnsaverproto, libX11, xproto, kbproto, ... }: with args;
-/*
-  arguments: all buildInputs
-  optional: purple2Source: purple-2 source - place to copy libpurple from
-    (to use a fresher pidgin build)
-*/
-let
-  externalPurple2 = (lib.attrByPath ["purple2Source"] null args) != null;
-in
-rec {
-  src = fetchurl {
-    url = mirror://sourceforge/funpidgin/carrier-2.5.0.tar.bz2;
-    sha256 = "0m80s7hnvz5vc2dy3xiy1zfb6incmb7p28zahzxdif2vz44riz28";
-  };
-
-  buildInputs = [gtkspell aspell
-    gstreamer startupnotification
-    libxml2 openssl nss
-    libXScrnSaver ncurses scrnsaverproto
-    libX11 xproto kbproto GConf avahi
-    dbus dbus_glib glib python
-    autoconf libtool automake];
-
-  propagatedBuildInputs = [
-    pkgconfig gtk perl perlXMLParser gettext
-  ];
-
-  configureFlags="--with-nspr-includes=${nss}/include/nspr"
-    + " --with-nspr-libs=${nss}/lib --with-nss-includes=${nss}/include/nss"
-    + " --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include"
-    + " --enable-screensaver --disable-meanwhile --disable-nm --disable-tcl";
-
-  preBuild = fullDepEntry (''
-    export echo=echo
-  '') [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doConfigure" "preBuild" "doMakeInstall"]
-    ++ (lib.optional externalPurple2 "postInstall")
-  ;
-
-  name = "carrier-2.5.0";
-  meta = {
-    description = "PidginIM GUI fork with user-friendly development model";
-    homepage = http://funpidgin.sf.net;
-  };
-} // (if externalPurple2 then {
-  postInstall = fullDepEntry (''
-      mkdir -p $out/lib/purple-2
-      cp ${args.purple2Source}/lib/purple-2/* $out/lib/purple-2/
-    '') ["minInit" "defEnsureDir"]; }
-  else {})
-
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2eeedef4d127..e3e64c3237f7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11341,11 +11341,6 @@ let
 
   carddav-util = callPackage ../tools/networking/carddav-util { };
 
-  carrier = builderDefsPackage (callPackage ../applications/networking/instant-messengers/carrier/2.5.0.nix) {
-    inherit (gnome) startupnotification GConf ;
-  };
-  funpidgin = carrier;
-
   cava = callPackage ../applications/audio/cava { };
 
   cbatticon = callPackage ../applications/misc/cbatticon { };

From c48824ba385c1b480d41bdd9f9e8b5b72a4fba74 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 24 Jan 2016 15:50:54 +0000
Subject: [PATCH 0763/2285] cuneiform: use mkDerivation

---
 pkgs/tools/graphics/cuneiform/default.nix | 37 +++++------------------
 pkgs/top-level/all-packages.nix           |  2 +-
 2 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix
index 138ae58da064..c357c96fac8d 100644
--- a/pkgs/tools/graphics/cuneiform/default.nix
+++ b/pkgs/tools/graphics/cuneiform/default.nix
@@ -1,42 +1,19 @@
-a @ { cmake, patchelf, imagemagick, ... } :
-let
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl, cmake, patchelf, imagemagick }:
 
+stdenv.mkDerivation rec {
+  name = "cuneiform-${version}";
   version = "1.1.0";
-  buildInputs = with a; [
-    cmake imagemagick patchelf
-  ];
-in
-rec {
+
   src = fetchurl {
     url = "https://launchpad.net/cuneiform-linux/1.1/1.1/+download/cuneiform-linux-1.1.0.tar.bz2";
     sha256 = "1bdvppyfx2184zmzcylskd87cxv56d8f32jf7g1qc8779l2hszjp";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
+  buildInputs = [
+    cmake imagemagick
+  ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doCmake" "doMakeInstall" "postInstall"];
-
-  libc = if a.stdenv ? glibc then a.stdenv.glibc else "";
-
-  doCmake = a.fullDepEntry(''
-    mkdir -p $PWD/builddir
-    cd builddir
-    export NIX_LDFLAGS="$NIX_LDFLAGS -ldl -L$out/lib"
-    cmake .. -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=$out -DDL_LIB=${libc}/lib
-  '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
-
-  needLib64 = a.stdenv.system == "x86_64-linux";
-
-  postInstall = a.fullDepEntry(''
-    patchelf --set-rpath $out/lib${if needLib64 then "64" else ""}${if a.stdenv.cc.cc != null then ":${a.stdenv.cc.cc}/lib" else ""}${if a.stdenv.cc.cc != null && needLib64 then ":${a.stdenv.cc.cc}/lib64" else ""}:${a.imagemagick}/lib $out/bin/cuneiform
-  '') ["minInit" "addInputs" "doMakeInstall"];
-
-  name = "cuneiform-" + version;
   meta = {
-    inherit version;
     description = "Multi-language OCR system";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e3e64c3237f7..928b8a1461ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11450,7 +11450,7 @@ let
     liblapack = liblapackWithoutAtlas;
   };
 
-  cuneiform = builderDefsPackage (callPackage ../tools/graphics/cuneiform) {};
+  cuneiform = callPackage ../tools/graphics/cuneiform {};
 
   cutecom = callPackage ../tools/misc/cutecom { };
 

From 6950c4346796036e882f651402dacdcdf6cd32aa Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 24 Jan 2016 15:50:54 +0000
Subject: [PATCH 0764/2285] monotoneViz: delete

not updated in 5 years and broken build
---
 .../monotone-viz/mtn-head.nix                 | 33 -------------------
 pkgs/top-level/all-packages.nix               |  5 ---
 2 files changed, 38 deletions(-)
 delete mode 100644 pkgs/applications/version-management/monotone-viz/mtn-head.nix

diff --git a/pkgs/applications/version-management/monotone-viz/mtn-head.nix b/pkgs/applications/version-management/monotone-viz/mtn-head.nix
deleted file mode 100644
index eb75b45128e3..000000000000
--- a/pkgs/applications/version-management/monotone-viz/mtn-head.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-args @ { graphviz, pkgconfig, autoconf, automake, libtool, glib, gtk, ... }: with args;
-rec {
-  srcDrv = fetchmtn {
-    name = "monotone-viz-mtn-checkout";
-    dbs = ["monotone.mtn-host.prjek.net"];
-    selector = "c3fdb3af1c7c89989c7da8062bb62203f2aaccf0";
-    branch = "net.venge.monotone-viz.new-stdio";
-    sha256 = "661c6a49d442b7e5a7ba455bb9a892e7e12b3968c2ddd69375e7bd0cd0b3ecb9";
-  };
-  src = srcDrv + "/";
-
-  buildInputs = [ocaml lablgtk libgnomecanvas gtk graphviz glib
-    pkgconfig autoconf automake libtool];
-  configureFlags = ["--with-lablgtk-dir=$(echo ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2)"];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doAutoconf" "doPatch" "doConfigure" "doMakeInstall"];
-
-  doAutoconf = fullDepEntry(''
-    aclocal -I .
-    autoconf -I .
-  '') ["minInit" "addInputs" "doUnpack"];
-
-  name = "monotone-viz-mtn-head";
-  meta = {
-    description = "Monotone commit tree visualizer";
-    maintainers = [args.lib.maintainers.raskin];
-  };
-  passthru = {
-    inherit srcDrv;
-  };
-}
-
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 928b8a1461ae..dc0bce7825a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12633,11 +12633,6 @@ let
     lua = lua5;
   };
 
-  monotoneViz = builderDefsPackage (callPackage ../applications/version-management/monotone-viz/mtn-head.nix) {
-    inherit (ocamlPackages_4_01_0) lablgtk ocaml;
-    inherit (gnome) libgnomecanvas;
-  };
-
   mopidy = callPackage ../applications/audio/mopidy { };
 
   mopidy-gmusic = callPackage ../applications/audio/mopidy-gmusic { };

From f295fef41151c2320f81b635f8f277e4254055a6 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 25 Jan 2016 21:14:17 +0000
Subject: [PATCH 0765/2285] tailor: refactor from builderDefsPackage

---
 .../version-management/tailor/default.nix        | 16 ++++++----------
 pkgs/top-level/all-packages.nix                  |  2 +-
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix
index 5164ed6a9b44..ebc0906fc6bb 100644
--- a/pkgs/applications/version-management/tailor/default.nix
+++ b/pkgs/applications/version-management/tailor/default.nix
@@ -1,6 +1,9 @@
-args @ { makeWrapper, python, ... }: with args;
-let version = if args ? version then args.version else "0.9.35"; in
-rec {
+{ stdenv, fetchurl, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "tailor-${version}";
+  version = "0.9.35";
+
   src = fetchurl {
     urls = [
       "http://darcs.arstecnica.it/tailor/tailor-${version}.tar.gz"
@@ -9,13 +12,6 @@ rec {
     sha256 = "061acapxxn5ab3ipb5nd3nm8pk2xj67bi83jrfd6lqq3273fmdjh";
   };
 
-  buildInputs = [python makeWrapper];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["installPythonPackage" "wrapBinContentsPython"];
-
-  name = "tailor-" + version;
   meta = {
     description = "Version control tools integration tool";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc0bce7825a1..83c138fd7c0d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13401,7 +13401,7 @@ let
       numpy pyasn1 mock zope_interface;
   };
 
-  tailor = builderDefsPackage (callPackage ../applications/version-management/tailor) {};
+  tailor = callPackage ../applications/version-management/tailor {};
 
   tangogps = callPackage ../applications/misc/tangogps {
     gconf = gnome.GConf;

From 9d7e2baf3b96192c05cb1d34c7c8b7ce42d03a0c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 25 Jan 2016 21:26:34 +0000
Subject: [PATCH 0766/2285] viewmtn: remove, source is offline and pkg dead

---
 .../version-management/viewmtn/0.10.nix       | 44 -------------------
 pkgs/top-level/all-packages.nix               |  5 ---
 2 files changed, 49 deletions(-)
 delete mode 100644 pkgs/applications/version-management/viewmtn/0.10.nix

diff --git a/pkgs/applications/version-management/viewmtn/0.10.nix b/pkgs/applications/version-management/viewmtn/0.10.nix
deleted file mode 100644
index be8cc83c3008..000000000000
--- a/pkgs/applications/version-management/viewmtn/0.10.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-args @ { monotone, cheetahTemplate, highlight, ctags, makeWrapper, graphviz, which, python, ... }: with args;
-rec {
-  src = fetchurl {
-    url = http://viewmtn.1erlei.de/downloads/viewmtn-0.10.tgz;
-    sha256 = "1c6y708xaf6pds1r6l00q7vpgfagfbnf95kqj168vw3xr3l8a4yx";
-  };
-
-  buildInputs = [python flup highlight monotone 
-    cheetahTemplate makeWrapper graphviz which];
-  configureFlags = [];
-  makeFlags = ["PREFIX=$out"];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doInstall" 
-    (doPatchShebangs "$out/bin")
-    (makeManyWrappers "$out/bin/*" 
-      (pythonWrapperArguments + preservePathWrapperArguments)) 
-  ];
-      
-  doInstall = fullDepEntry (''
-    for i in dot mtn highlight; do 
-        sed -e "s@/usr/bin/$i@$(which $i)@" -i config.py.example
-    done
-    sed -e "s@'templates/'@'$out/share/viewmtn/templates/'@" -i config.py.example
-
-    fullOut=$(toPythonPath $out)
-    
-    mkdir -p $fullOut
-    mkdir -p $out/bin
-    mkdir -p $out/share/viewmtn
-    
-    cp -r * $fullOut
-    cp $fullOut/viewmtn.py $out/bin
-    
-    ln -s $fullOut/{AUTHORS,ChangeLog,INSTALL,LICENSE,README,TODO,config.py.example} $out/share/viewmtn
-    ln -s $fullOut/templates $out/share/viewmtn/
-    ln -s $fullOut/static $out/share/viewmtn/
-  '') ["minInit" "defEnsureDir" "addInputs" "doUnpack"];
-
-  name = "viewmtn-0.10";
-  meta = {
-    description = "Monotone web interface";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 83c138fd7c0d..13e42df9a359 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13564,11 +13564,6 @@ let
 
   vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
 
-  viewMtn = builderDefsPackage (callPackage ../applications/version-management/viewmtn/0.10.nix)
-  {
-    flup = pythonPackages.flup;
-  };
-
   vim = callPackage ../applications/editors/vim {
     inherit (darwin.apple_sdk.frameworks) Carbon Cocoa;
   };

From e8f260e40afa220d4f6be66570ddd934e8dec208 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 25 Jan 2016 21:43:09 +0000
Subject: [PATCH 0767/2285] jamp: remove, source is offline and pkg dead

---
 pkgs/games/jamp/default.nix              | 30 ------------------------
 pkgs/games/jamp/src-for-default.nix      |  9 -------
 pkgs/games/jamp/src-info-for-default.nix |  4 ----
 pkgs/top-level/all-packages.nix          |  2 --
 4 files changed, 45 deletions(-)
 delete mode 100644 pkgs/games/jamp/default.nix
 delete mode 100644 pkgs/games/jamp/src-for-default.nix
 delete mode 100644 pkgs/games/jamp/src-info-for-default.nix

diff --git a/pkgs/games/jamp/default.nix b/pkgs/games/jamp/default.nix
deleted file mode 100644
index be7abc75915d..000000000000
--- a/pkgs/games/jamp/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-a @ { mesa, SDL, SDL_image, SDL_mixer, ... } :
-let
-  s = import ./src-for-default.nix;
-  buildInputs = with a; [
-    mesa SDL SDL_mixer SDL_image
-
-  ];
-in
-rec {
-  src = a.fetchUrlFromSrcInfo s;
-
-  inherit (s) name;
-  inherit buildInputs;
-  configureFlags = [];
-
-  preBuild = a.fullDepEntry (''
-    sed -e "s@/usr/games@$out/bin@g" -i Makefile
-    sed -e "s@/usr/@$out/@g" -i Makefile
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.SDL}/include/SDL"
-  '') ["minInit" "addInputs" "doUnpack"];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["preBuild" "doMakeInstall"];
-
-  meta = {
-    description = "A physics-based game";
-    maintainers = [ a.lib.maintainers.raskin ];
-    platforms = a.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/games/jamp/src-for-default.nix b/pkgs/games/jamp/src-for-default.nix
deleted file mode 100644
index c5980b251c0a..000000000000
--- a/pkgs/games/jamp/src-for-default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-rec {
-   version="1.0.2";
-   name="jamp-1.0.2";
-   hash="13cjggyx63wmlcvpyllmd7aknfd4vzhxnwm030mas7z3h6wcsmk7";
-   url="http://perre.noud.ch/jamp/download.php?file=jamp-${version}.tar.gz";
-   advertisedUrl="http://perre.noud.ch/jamp/download.php?file=jamp-1.0.2.tar.gz";
-  
-  
-}
diff --git a/pkgs/games/jamp/src-info-for-default.nix b/pkgs/games/jamp/src-info-for-default.nix
deleted file mode 100644
index 9fb4ab9dbcc2..000000000000
--- a/pkgs/games/jamp/src-info-for-default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  downloadPage = "http://perre.noud.ch/jamp/";
-  baseName = "jamp";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 13e42df9a359..2010e5b5695d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14235,8 +14235,6 @@ let
     lua = lua5;
   };
 
-  jamp = builderDefsPackage (callPackage ../games/jamp) {};
-
   klavaro = callPackage ../games/klavaro {};
 
   kobodeluxe = callPackage ../games/kobodeluxe { };

From a44d003502e62d30f4924153c027b6bc62852bb6 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 25 Jan 2016 21:48:34 +0000
Subject: [PATCH 0768/2285] lincity: use mkDerivation

---
 pkgs/games/lincity/default.nix  | 29 ++++++++++++-----------------
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/pkgs/games/lincity/default.nix b/pkgs/games/lincity/default.nix
index 6cd5155e3af1..dba488016b99 100644
--- a/pkgs/games/lincity/default.nix
+++ b/pkgs/games/lincity/default.nix
@@ -1,24 +1,19 @@
-args @ { libX11, libXext, xextproto, libICE, libSM, xproto, libpng, zlib, ... }: with args;
-let
-  version = lib.attrByPath ["version"] "1.12.1" args;
-  sha256 = lib.attrByPath ["sha256"]
-    "0xmrp7vkkp1hfblb6nl3rh2651qsbcm21bnncpnma1sf40jaf8wj" args;
-  pkgName = "lincity";
-in
-rec {
+{ stdenv, fetchurl, libX11, libXext, xextproto, libICE, libSM, xproto, libpng, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "lincity-${version}";
+  version = "1.12.1";
+
   src = fetchurl {
-    url = "mirror://sourceforge/lincity/${pkgName}-${version}.tar.gz";
-    inherit sha256;
+    url = "mirror://sourceforge/lincity/${name}.tar.gz";
+    sha256 = "0xmrp7vkkp1hfblb6nl3rh2651qsbcm21bnncpnma1sf40jaf8wj";
   };
 
-  buildInputs = [libICE libpng libSM libX11 libXext
-    xextproto zlib xproto];
-  configureFlags = [];
+  buildInputs = [
+    libICE libpng libSM libX11 libXext
+    xextproto zlib xproto
+  ];
 
-  /* doConfigure should be specified separately */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-
-  name = "${pkgName}-" + version;
   meta = {
     description = "City simulation game";
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2010e5b5695d..e4b5d390c22b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14241,7 +14241,7 @@ let
 
   lgogdownloader = callPackage ../games/lgogdownloader { };
 
-  lincity = builderDefsPackage (callPackage ../games/lincity) {};
+  lincity = callPackage ../games/lincity {};
 
   lincity_ng = callPackage ../games/lincity/ng.nix {};
 

From 2ac5b56135f92932ef15153afed826de59f33f0a Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 25 Jan 2016 23:31:20 +0000
Subject: [PATCH 0769/2285] zagband: use mkDerivation

---
 pkgs/games/zangband/default.nix | 43 +++++++++++++++++----------------
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/pkgs/games/zangband/default.nix b/pkgs/games/zangband/default.nix
index 110eff9397ce..ab7a6d7cb432 100644
--- a/pkgs/games/zangband/default.nix
+++ b/pkgs/games/zangband/default.nix
@@ -1,35 +1,40 @@
-a @ { ncurses, flex, bison, autoconf, automake, m4, coreutils, ... } :
-let
-  fetchurl = a.fetchurl;
+{ stdenv, fetchurl, ncurses, flex, bison, autoconf, automake, m4, coreutils }:
+
+stdenv.mkDerivation rec {
+  name = "zangband-${version}";
+  version = "2.7.3";
 
-  version = a.lib.attrByPath ["version"] "2.7.3" a;
-  buildInputs = with a; [
-    ncurses flex bison autoconf automake m4
-  ];
-in
-rec {
   src = fetchurl {
     url = "ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/zangband-${version}.tar.gz";
     sha256 = "0654m8fzklsc8565sqdad76mxjsm1z9c280srq8863sd10af0bdq";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
+  buildInputs = [
+    ncurses flex bison autoconf automake m4
+  ];
 
-  preConfigure = a.fullDepEntry (''
+  # fails during chmod due to broken permissions
+  dontMakeSourcesWritable = true;
+  postUnpack = ''
     chmod a+rwX -R .
+  '';
+
+  preConfigure = ''
     sed -re 's/ch(own|grp|mod)/true/' -i lib/*/makefile.zb makefile.in
     sed -e '/FIXED_PATHS/d' -i src/z-config.h
     ./bootstrap
+  '';
+
+  preInstall = ''
     mkdir -p $out/share/games/zangband
     mkdir -p $out/share/man
     mkdir -p $out/bin
-  '') ["minInit" "doUnpack" "addInputs" "defEnsureDir"];
+  '';
 
-  postInstall = a.fullDepEntry (''
+  postInstall = ''
     mv $out/bin/zangband $out/bin/.zangband.real
     echo '#! /bin/sh
-      PATH="$PATH:${a.coreutils}/bin"
+      PATH="$PATH:${coreutils}/bin"
 
       ZANGBAND_PATH="$HOME/.zangband"
       ORIG_PATH="'$out'"/share/games/zangband
@@ -49,14 +54,10 @@ rec {
       "'$out'/bin/.zangband.real" "$@"
     ' > $out/bin/zangband
     chmod +x $out/bin/zangband
-  '') ["minInit" "doUnpack"];
+  '';
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["preConfigure" "doConfigure" "doMakeInstall" "postInstall"];
-
-  name = "zangband-" + version;
   meta = {
     description = "rogue-like game";
-    license = a.lib.licenses.unfree;
+    license = stdenv.lib.licenses.unfree;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e4b5d390c22b..1114e32a22dd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14554,7 +14554,7 @@ let
 
   zandronum-bin = callPackage ../games/zandronum/bin.nix { };
 
-  zangband = builderDefsPackage (callPackage ../games/zangband) {};
+  zangband = callPackage ../games/zangband { };
 
   zdoom = callPackage ../games/zdoom { };
 

From eff97ce7fd5d8e94c86b2e5dced0e5059f77d1d2 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 26 Jan 2016 00:29:12 +0000
Subject: [PATCH 0770/2285] ncbiCToolsc: remove

Don't build and have been abandoned for years
---
 pkgs/development/libraries/ncbi/default.nix | 54 ---------------------
 pkgs/top-level/all-packages.nix             |  2 -
 2 files changed, 56 deletions(-)
 delete mode 100644 pkgs/development/libraries/ncbi/default.nix

diff --git a/pkgs/development/libraries/ncbi/default.nix b/pkgs/development/libraries/ncbi/default.nix
deleted file mode 100644
index 88f6740f7334..000000000000
--- a/pkgs/development/libraries/ncbi/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-a @ { tcsh, mesa, lesstif, libX11, libXaw, xproto, libXt, libSM, libICE, libXmu, libXext, ... }:
-let
-  fetchurl = a.fetchurl;
-
-  version = "20090809";
-  buildInputs = with a; [
-    tcsh libX11 libXaw lesstif xproto mesa libXt
-    libSM libICE libXmu libXext
-  ];
-in
-rec {
-  src = fetchurl {
-    url = "ftp://ftp.ncbi.nih.gov/toolbox/ncbi_tools/old/${version}/ncbi.tar.gz";
-    sha256 = "05bbnqk6ffvhi556fsabcippzq2zrkynbk09qblzvfzip9hlk1qc";
-  };
-
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["preBuild" "build" "deploy"];
-
-  preBuild = a.fullDepEntry (''
-    sed -e 's@#!/bin/csh@#! ${a.tcsh}/bin/csh@' -i $(fgrep '#!/bin/csh' -rl build make)
-    sed -e '/set path/d' -i make/ln-if-absent
-    sed -e 's@/usr/include @${a.lesstif}/include ${a.mesa}/include @' -i make/makedis.csh
-    sed -e 's@/usr/[a-zA-Z0-9]*/include @@g; s@/usr/include/[a-zA-Z0-9/] @@g' -i make/makedis.csh 
-    cd ..
-  '') ["doUnpack" "minInit"];
-
-  build = a.fullDepEntry (''
-    ./ncbi/make/makedis.csh
-  '') ["preBuild" "addInputs"];
-
-  deploy = a.fullDepEntry (''
-    mkdir -p $out/bin $out/lib $out/include $out/source $out/share/${name}/build-snapshot
-    cd ncbi/build
-    cp *.o *.so $out/lib
-    cp -r . $out/share/${name}/build-snapshot
-    cp ../make/makedis.csh $out/share/${name}/build-snapshot
-    cp *.h $out/include 
-    cp *.c *.h $out/source
-    find . -perm -0100 -a '(' '(' ! -name '*.*' ')' -o '(' -name '*.REAL' ')' ')' -exec cp '{}' $out/bin ';'
-  '') ["defEnsureDir" "build" "minInit"];
-      
-  name = "NCBI-Toolbox-" + version;
-  meta = {
-    description = "NCBI general-purpose portable toolkit";
-    maintainers = [
-      a.lib.maintainers.raskin
-    ];
-    #platforms = a.lib.platforms.linux ;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1114e32a22dd..aa4d519c4397 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14929,8 +14929,6 @@ let
 
   mrbayes = callPackage ../applications/science/biology/mrbayes { };
 
-  ncbiCTools = builderDefsPackage (callPackage ../development/libraries/ncbi) {};
-
   ncbi_tools = callPackage ../applications/science/biology/ncbi-tools { };
 
   paml = callPackage ../applications/science/biology/paml { };

From 8c91610cb2abba775238c83b4cccd7815a068d70 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 26 Jan 2016 00:34:30 +0000
Subject: [PATCH 0771/2285] content: remove

Doesn't build and have been abandoned for years
---
 .../science/math/content/default.nix          | 98 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 100 deletions(-)
 delete mode 100644 pkgs/applications/science/math/content/default.nix

diff --git a/pkgs/applications/science/math/content/default.nix b/pkgs/applications/science/math/content/default.nix
deleted file mode 100644
index 48e20d427d15..000000000000
--- a/pkgs/applications/science/math/content/default.nix
+++ /dev/null
@@ -1,98 +0,0 @@
-a @ { mesa, lesstif, libX11, libXaw, xproto, libXt, libSM, libICE, libXmu, libXext, libXcursor, ... } :
-let
-  fetchurl = a.fetchurl;
-
-  version = "1.5";
-  buildInputs = with a; [
-    mesa lesstif libX11 libXaw xproto libXt libSM libICE
-      libXmu libXext libXcursor
-  ];
-in
-rec {
-  srcNcbiStdH = fetchurl {
-    url = "http://www.math.uu.nl/people/kuznet/CONTENT/src/unix/ncbistd.h";
-    sha256 = "1zi3l53b0a7d3620rhxvh1jn7pz3ihl1mxl9qqw86xkmhm4q7xf3";
-  };
-
-  srcVibrant = fetchurl {
-    url = "http://www.math.uu.nl/people/kuznet/CONTENT/src/unix/vibrant.tar.gz";
-    sha256 = "1s0vsa0np3sm7jh3ps3f1sf4j64v0kw4hqasllpxx5hdgxwd8y25";
-  };
-
-  srcContent = fetchurl {
-    url = "http://www.math.uu.nl/people/kuznet/CONTENT/src/unix/content_${version}.tar.gz";
-    sha256 = "0y0dzr1d3jgbd53729jk6s2wpb5hv54xwbdird4r0s15bznpm6fs";
-  };
-
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["unpackTarballs"
-    "setPlatform" "extraVars"
-    "buildVibrant" "buildContent"
-    "install"];
-
-  unpackTarballs = a.fullDepEntry (''
-    mkdir content
-    cd content
-    mkdir vibrant
-    tar -xvf ${srcVibrant} -C vibrant
-    tar -xvf ${srcContent} -C .
-    sed -e s/SGI=/SGI=no/ -i content/makefile_v
-  '') ["minInit"];
-
-  platformTLAContent = if a.stdenv.isLinux then "LIN" else
-    throw "Three-letter code for the platform is not known";
-
-  platformTLAVibrant = if a.stdenv.isLinux then "lnx" else
-    throw "Three-letter code for the platform is not known";
-
-  setPlatform = a.fullDepEntry (''
-    sed -e 's/${platformTLAContent}=no/${platformTLAContent}=/' -i content/makefile_v
-  '') ["minInit" "unpackTarballs"];
-
-  extraVars = a.noDepEntry ''
-    export NIX_LDFLAGS="$NIX_LDFLAGS -lXcursor"
-  '';
-
-  buildVibrant = a.fullDepEntry (''
-    cd vibrant/build
-    
-    export LCL=${platformTLAVibrant}
-    make copy
-    for i in *.c; do gcc $i -c -DWIN_MOTIF -I. -I../include; done
-    sh ../make/viball.${platformTLAVibrant}
-
-    cd ../..
-  '') ["addInputs" "unpackTarballs"];
-
-  buildContent = a.fullDepEntry (''
-    cd content 
-
-    export PATH=$PATH:$PWD/victor:$PWD/yuri
-    make -f makefile_v unix
-    
-    cd ..
-  '') ["addInputs" "buildVibrant" "setPlatform"];
-
-  install = a.fullDepEntry (''
-    mkdir -p $out/share/${name}/build-snapshot $out/bin $out/lib $out/share/${name}/doc
-    find . -name '*.o' -exec cp '{}' $out/lib ';'
-    find . -name '*.so' -exec cp '{}' $out/lib ';'
-    find . -name '*.txt' -exec cp '{}' $out/share/${name}/doc ';'
-    find . -name '*.hlp' -exec cp '{}' $out/share/${name}/doc ';'
-    find . -perm -0100 -a ! -name '*.*' -exec cp '{}' $out/bin ';'
-    cp -r . $out/share/${name}/build-snapshot
-  '') ["buildContent" "defEnsureDir" "minInit"];
-      
-  name = "content-" + version;
-  meta = {
-    description = "A tool for analysis of dynamical systems";
-    maintainers = [
-      a.lib.maintainers.raskin
-    ];
-    platforms = a.lib.platforms.linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aa4d519c4397..12cbf401466a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14956,8 +14956,6 @@ let
 
   blas = callPackage ../development/libraries/science/math/blas { };
 
-  content = builderDefsPackage (callPackage ../applications/science/math/content) {};
-
   jags = callPackage ../applications/science/math/jags { };
 
 

From ea9c2fad54805b35441fa7b8cafe7643bfa5031e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 26 Jan 2016 02:47:06 +0000
Subject: [PATCH 0772/2285] altermime: use mkDerivation

---
 pkgs/tools/networking/altermime/default.nix | 54 ++++++---------------
 1 file changed, 16 insertions(+), 38 deletions(-)

diff --git a/pkgs/tools/networking/altermime/default.nix b/pkgs/tools/networking/altermime/default.nix
index 1c9dbfe62354..e532739ecd4f 100644
--- a/pkgs/tools/networking/altermime/default.nix
+++ b/pkgs/tools/networking/altermime/default.nix
@@ -1,50 +1,28 @@
-x@{builderDefsPackage
-  
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    [];
+{ stdenv, fetchurl }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="altermime";
-    version="0.3.10";
-    name="${baseName}-${version}";
-    url="http://www.pldaniels.com/${baseName}/${name}.tar.gz";
-    hash="0vn3vmbcimv0n14khxr1782m76983zz9sf4j2kz5v86lammxld43";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  baseName = "altermime";
+  name = "${baseName}-${version}";
+  version = "0.3.10";
+
+  src = fetchurl {
+    url = "http://www.pldaniels.com/${baseName}/${name}.tar.gz";
+    sha256 = "0vn3vmbcimv0n14khxr1782m76983zz9sf4j2kz5v86lammxld43";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  patches = map fetchurl (import ./debian-patches.nix);
 
-  patches = map a.fetchurl (import ./debian-patches.nix);
-
-  phaseNames = ["doPatch" "fixTarget" "doMakeInstall"];
-  fixTarget = a.fullDepEntry (''
+  postPatch = ''
     sed -i Makefile -e "s@/usr/local@$out@"
     mkdir -p "$out/bin"
-  '') ["doUnpack" "minInit" "defEnsureDir"];
-      
+  '';
+
   meta = {
     description = "MIME alteration tool";
-    maintainers = with a.lib.maintainers;
-    [
+    maintainers = with stdenv.lib.maintainers; [
       raskin
     ];
-    platforms = with a.lib.platforms;
-      linux;
+    platforms = with stdenv.lib.platforms; linux;
     downloadPage = "http://www.pldaniels.com/altermime/";
-    inherit version;
-    updateWalker = true;
   };
-}) x
-
+}

From 5e189bd207c78b5d3dd7161640bdca756dff04cb Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 26 Jan 2016 16:34:33 +0000
Subject: [PATCH 0773/2285] welkin: use mkDerivation and fix build

---
 pkgs/tools/graphics/welkin/default.nix | 68 +++++++++-----------------
 1 file changed, 23 insertions(+), 45 deletions(-)

diff --git a/pkgs/tools/graphics/welkin/default.nix b/pkgs/tools/graphics/welkin/default.nix
index 3d1a2aa5bdc0..6e268ef5941d 100644
--- a/pkgs/tools/graphics/welkin/default.nix
+++ b/pkgs/tools/graphics/welkin/default.nix
@@ -1,57 +1,35 @@
-x@{builderDefsPackage
-  , jre
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    ["jre"];
+{ stdenv, fetchsvn, jre, makeWrapper }:
 
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="welkin";
-    version="1.1";
-    name="${baseName}-${version}";
-    url="http://simile.mit.edu/dist/welkin/${name}.tar.gz";
-    hash="0hr2xvfz887fdf2ysiqydv6m13gbdl5x0fh4960i655d5imvd5x0";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
+stdenv.mkDerivation rec {
+  name = "welkin-${version}";
+  version = "1.1";
+
+  src = fetchsvn {
+    url = "http://simile.mit.edu/repository/welkin";
+    rev = "9638";
+    sha256 = "1bqh3vam7y805xrmdw7k0ckcfwjg88wypxgv3njkkwyn7kxnfnqp";
   };
 
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
+  sourceRoot = "welkin-r9638/tags/${version}";
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doDeploy" "createBin"];
+  buildInputs = [ jre makeWrapper ];
 
-  doDeploy = a.simplyShare "welkin";
-
-  createBin = a.fullDepEntry ''
-    mkdir -p "$out/bin"
-    echo "#! ${a.stdenv.shell}" > "$out/bin/welkin"
-    echo "export JAVA_HOME=${jre}" >> "$out/bin/welkin"
-    echo "\"$out/share/welkin/welkin.sh\" \"\$@\"" >> "$out/bin/welkin"
-    sed -e 's@[.]/lib/welkin[.]jar@"'"$out"'/share/welkin/lib/welkin.jar"@' -i "$out/share/welkin/welkin.sh"
-    chmod a+x "$out/bin/welkin"
-  '' ["minInit" "defEnsureDir"];
+  installPhase = ''
+    mkdir -p $out/{bin,share}
+    cp -R . $out/share
+    cp $out/share/welkin.sh $out/bin/welkin
+    sed -e 's@\./lib/welkin\.jar@'"$out"'/share/lib/welkin.jar@' -i $out/bin/welkin
+    wrapProgram $out/bin/welkin \
+      --set JAVA_HOME ${jre}
+    chmod a+x $out/bin/welkin
+  '';
 
   meta = {
     description = "An RDF visualizer";
-    maintainers = with a.lib.maintainers;
-    [
+    maintainers = with stdenv.lib.maintainers; [
       raskin
     ];
     hydraPlatforms = [];
-    license = a.lib.licenses.free;
+    license = stdenv.lib.licenses.free;
   };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://simile.mit.edu/dist/welkin/";
-    };
-  };
-}) x
+}

From ddda098446e06fef5f8e1e01322b1428530e304e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 23 Jan 2016 19:08:03 +0100
Subject: [PATCH 0774/2285] perl-TestWarnings: 0.021 -> 0.026

Also add myself as maintainer.
---
 pkgs/top-level/perl-packages.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 71d8bd41e422..e9e3a9f777d4 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -11969,17 +11969,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  TestWarnings = buildPerlPackage rec {
-    name = "Test-Warnings-0.021";
+  "TestWarnings" = buildPerlPackage rec {
+    name = "Test-Warnings-0.026";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
-      sha256 = "0i1crkhqfl5gs55i5nrvsw3xy946ajgnvp4gqrzvsn1x6cp1i2nr";
+      sha256 = "ae2b68b1b5616704598ce07f5118efe42dc4605834453b7b2be14e26f9cc9a08";
     };
-    buildInputs = [ TestTester if_ CPANMetaCheck ModuleMetadata ];
+    buildInputs = [ TestTester CPANMetaCheck ModuleMetadata self."if" ];
     meta = {
       homepage = https://github.com/karenetheridge/Test-Warnings;
       description = "Test for warnings and the lack of them";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
   };
 

From 54174a3553425d196b52a4a5c9059414c4142ac9 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 23 Jan 2016 20:32:30 +0100
Subject: [PATCH 0775/2285] perl-DevelDeclare: 0.006011 -> 0.006018

---
 pkgs/top-level/perl-packages.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e9e3a9f777d4..8b9f4d339eea 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3513,19 +3513,18 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  DevelDeclare = buildPerlPackage {
-    name = "Devel-Declare-0.006011";
+  "DevelDeclare" = buildPerlPackage rec {
+    name = "Devel-Declare-0.006018";
     src = fetchurl {
-      url = mirror://cpan/authors/id/Z/ZE/ZEFRAM/Devel-Declare-0.006011.tar.gz;
-      sha256 = "0wqa9n4mdlsld4cmhy2mg8ncqr5gsra1913x0kypisgdqvviin2k";
+      url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
+      sha256 = "bb3607bc7546bcf8d9ac57acd8de4e4ca5567ace836ab823d5f5b450216f466a";
     };
-    buildInputs = [ BHooksOPCheck ExtUtilsDepends ];
+    buildInputs = [ BHooksOPCheck ExtUtilsDepends TestRequires ];
     propagatedBuildInputs = [ BHooksEndOfScope BHooksOPCheck SubName ];
     meta = {
       description = "Adding keywords to perl, in perl";
       license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
-      maintainers = with maintainers; [ ocharles ];
-      platforms   = stdenv.lib.platforms.unix;
+      maintainers = with maintainers; [ ocharles rycee ];
     };
   };
 

From de68a492597c301fa668d25bbb4a5485200b5721 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 29 Jan 2016 18:16:59 +0000
Subject: [PATCH 0776/2285] firmware-linux-nonfree: update to master

---
 .../linux/firmware/firmware-linux-nonfree/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index 455088d8f5e9..61ea6c0c18cd 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "firmware-linux-nonfree-${version}";
-  version = "2015-10-18";
+  version = "2015-12-04";
 
   # This repo is built by merging the latest versions of
   # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wkennington";
     repo = "linux-firmware";
-    rev = "f7694d34655a7f688033d0582f306b3f287b785d";
-    sha256 = "0pb6pq48hfcny34l3anln9g4dy1f4n8gzmfib9pk4l64648sylnl";
+    rev = "bbe4917c054eb0a73e250c6363341e3bf6725839";
+    sha256 = "1p9c74p8j8zmddljaan5i29h8wsbz8911dv2sykpnahg9r939ykd";
   };
 
   preInstall = ''

From d28a06553eaf2d065c6f867d6a90d8ba51c90121 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 30 Jan 2016 22:04:50 +0100
Subject: [PATCH 0777/2285] pagemon: 1.01.06 -> 1.01.07

Changes:
  * Mix checksum up a bit more and return OK if nothing has changed
  * Optimize page reading, reduced by ~2% CPU
  * Add perf page statistics 'p' option
  * Add OOM score to VM stats
  * Optimize read_maps: don't re-scan page mapping if nothing changed
  * Reduce amount of seeks and reads on pagemap data

More: https://github.com/ColinIanKing/pagemon/blob/master/debian/changelog
---
 pkgs/os-specific/linux/pagemon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix
index 3c94362b820c..dee92419cd1e 100644
--- a/pkgs/os-specific/linux/pagemon/default.nix
+++ b/pkgs/os-specific/linux/pagemon/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "pagemon-${version}";
-  version = "0.01.06";
+  version = "0.01.07";
 
   src = fetchFromGitHub {
-    sha256 = "0p6mzmyjn5dq1ma9ld47gnrszyf0yph76dd5k7hl60a5zq5741aa";
+    sha256 = "041jqk11sq1qn3avsx4jbfqzvg6rfa5kmgn16q8jnwm5fqfaj037";
     rev = "V${version}";
     repo = "pagemon";
     owner = "ColinIanKing";

From 8b44922a4cae05cb351f49758dfb38bcfbf4319b Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Fri, 25 Dec 2015 22:58:09 -0500
Subject: [PATCH 0778/2285] libsrs2: init at 1.0.18

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

diff --git a/pkgs/development/libraries/libsrs2/default.nix b/pkgs/development/libraries/libsrs2/default.nix
new file mode 100644
index 000000000000..19b490a0f186
--- /dev/null
+++ b/pkgs/development/libraries/libsrs2/default.nix
@@ -0,0 +1,17 @@
+{ stdenv, lib, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libsrs2-${version}";
+  version = "1.0.18";
+
+  src = fetchurl {
+    url = "http://www.libsrs2.org/srs/libsrs2-${version}.tar.gz";
+    sha256 = "9d1191b705d7587a5886736899001d04168392bbb6ed6345a057ade50943a492";
+  };
+
+  meta = {
+    description = "The next generation SRS library from the original designer of SRS";
+    license = with lib.licenses; [ gpl2 bsd3 ];
+    homepage = http://www.libsrs2.org/;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c26313c417a5..bd13779d0fbe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2172,6 +2172,8 @@ let
 
   liboauth = callPackage ../development/libraries/liboauth { };
 
+  libsrs2 = callPackage ../development/libraries/libsrs2 { };
+
   libtermkey = callPackage ../development/libraries/libtermkey { };
 
   libtirpc = callPackage ../development/libraries/ti-rpc { };

From f7af2272a2ea8f12eecd337aee046345172bebec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 31 Jan 2016 10:03:57 +0100
Subject: [PATCH 0779/2285] Revert "chromium: Do not rely on
 import-from-derivation"

This reverts commit 38c77bb72c9aec6f9e8ecb06a56032692de42e0c.
In this form it causes problems #12710.
---
 .../networking/browsers/chromium/default.nix  | 11 +--
 .../networking/browsers/chromium/plugins.nix  | 71 +++++++------------
 2 files changed, 34 insertions(+), 48 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index c0c5e485e59c..bf870e144e56 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -64,17 +64,20 @@ let
 in stdenv.mkDerivation {
   name = "chromium${suffix}-${chromium.browser.version}";
 
-  buildInputs = [ makeWrapper ];
+  buildInputs = [ makeWrapper ] ++ chromium.plugins.enabledPlugins;
 
   buildCommand = let
     browserBinary = "${chromium.browser}/libexec/chromium/chromium";
-    getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")";
+    mkEnvVar = key: val: "--set '${key}' '${val}'";
+    envVars = chromium.plugins.settings.envVars or {};
+    flags = chromium.plugins.settings.flags or [];
   in with stdenv.lib; ''
     mkdir -p "$out/bin" "$out/share/applications"
 
     ln -s "${chromium.browser}/share" "$out/share"
-    eval makeWrapper "${browserBinary}" "$out/bin/chromium" \
-      ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled}
+    makeWrapper "${browserBinary}" "$out/bin/chromium" \
+      ${concatStrings (mapAttrsToList mkEnvVar envVars)} \
+      --add-flags "${concatStringsSep " " flags}"
 
     ln -s "$out/bin/chromium" "$out/bin/chromium-browser"
     ln -s "${chromium.browser}/share/icons" "$out/share/icons"
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index dda976905610..0b0e5bd08382 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -8,34 +8,6 @@
 with stdenv.lib;
 
 let
-  # Generate a shell fragment that emits flags appended to the
-  # final makeWrapper call for wrapping the browser's main binary.
-  #
-  # Note that this is shell-escaped so that only the variable specified
-  # by the "output" attribute is substituted.
-  mkPluginInfo = { output ? "out", allowedVars ? [ output ]
-                 , flags ? [], envVars ? {}
-                 }: let
-    shSearch = ["'"] ++ map (var: "\$${var}") allowedVars;
-    shReplace = ["'\\''"] ++ map (var: "'\"\${${var}}\"'") allowedVars;
-    # We need to triple-escape "val":
-    #  * First because makeWrapper doesn't do any quoting of its arguments by
-    #    itself.
-    #  * Second because it's passed to the makeWrapper call separated by IFS but
-    #    not by the _real_ arguments, for example the Widevine plugin flags
-    #    contain spaces, so they would end up as separate arguments.
-    #  * Third in order to be correctly quoted for the "echo" call below.
-    shEsc = val: "'${replaceStrings ["'"] ["'\\''"] val}'";
-    mkSh = val: "'${replaceStrings shSearch shReplace (shEsc val)}'";
-    mkFlag = flag: ["--add-flags" (shEsc flag)];
-    mkEnvVar = key: val: ["--set" (shEsc key) (shEsc val)];
-    envList = mapAttrsToList mkEnvVar envVars;
-    quoted = map mkSh (flatten ((map mkFlag flags) ++ envList));
-  in ''
-    mkdir -p "''$${output}/nix-support"
-    echo ${toString quoted} > "''$${output}/nix-support/wrapper-flags"
-  '';
-
   plugins = stdenv.mkDerivation {
     name = "chromium-binary-plugins";
 
@@ -89,29 +61,40 @@ let
 
       install -vD PepperFlash/libpepflashplayer.so \
         "$flash/lib/libpepflashplayer.so"
-
-      ${mkPluginInfo {
-        output = "flash";
-        allowedVars = [ "flash" "flashVersion" ];
-        flags = [
-          "--ppapi-flash-path=$flash/lib/libpepflashplayer.so"
-          "--ppapi-flash-version=$flashVersion"
-        ];
-      }}
+      mkdir -p "$flash/nix-support"
+      cat > "$flash/nix-support/chromium-plugin.nix" <<NIXOUT
+        { flags = [
+            "--ppapi-flash-path='$flash/lib/libpepflashplayer.so'"
+            "--ppapi-flash-version=$flashVersion"
+          ];
+        }
+      NIXOUT
 
       install -vD libwidevinecdm.so \
         "$widevine/lib/libwidevinecdm.so"
       install -vD libwidevinecdmadapter.so \
         "$widevine/lib/libwidevinecdmadapter.so"
-
-      ${mkPluginInfo {
-        output = "widevine";
-        flags = [ "--register-pepper-plugins=${wvModule}${wvInfo}" ];
-        envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "$widevine/lib";
-      }}
+      mkdir -p "$widevine/nix-support"
+      cat > "$widevine/nix-support/chromium-plugin.nix" <<NIXOUT
+        { flags = [ "--register-pepper-plugins='${wvModule}${wvInfo}'" ];
+          envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "$widevine/lib";
+        }
+      NIXOUT
     '';
 
-    passthru.enabled = optional enablePepperFlash plugins.flash
+    passthru = let
+      enabledPlugins = optional enablePepperFlash plugins.flash
                     ++ optional enableWideVine    plugins.widevine;
+      getNix = plugin: import "${plugin}/nix-support/chromium-plugin.nix";
+      mergeAttrsets = let
+        f = v: if all isAttrs v then mergeAttrsets v
+          else if all isList  v then concatLists   v
+          else if tail v == []  then head          v
+          else head (tail v);
+      in fold (l: r: zipAttrsWith (_: f) [ l r ]) {};
+    in {
+      inherit enabledPlugins;
+      settings = mergeAttrsets (map getNix enabledPlugins);
+    };
   };
 in plugins

From f650fed9e543f794de68579093c1ef8283ba91a8 Mon Sep 17 00:00:00 2001
From: Artjom Vejsel <akawolf0@gmail.com>
Date: Sun, 31 Jan 2016 12:12:16 +0300
Subject: [PATCH 0780/2285] deadbeef: ape plugin fix

---
 pkgs/applications/audio/deadbeef/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index 2663f5592f78..1a2b4b7cc879 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -12,6 +12,7 @@
 , midiSupport ? false, wildmidi ? null
 , wavpackSupport ? false, wavpack ? null
 , ffmpegSupport ? false, ffmpeg ? null
+, apeSupport ? true, yasm ? null
 # misc plugins
 , zipSupport ? true, libzip ? null
 , artworkSupport ? true, imlib2 ? null
@@ -38,6 +39,7 @@ assert cdaSupport -> (libcdio != null && libcddb != null);
 assert aacSupport -> faad2 != null;
 assert zipSupport -> libzip != null;
 assert ffmpegSupport -> ffmpeg != null;
+assert apeSupport -> yasm != null;
 assert artworkSupport -> imlib2 != null;
 assert hotkeysSupport -> libX11 != null;
 assert osdSupport -> dbus != null;
@@ -68,6 +70,7 @@ stdenv.mkDerivation rec {
     ++ optional aacSupport faad2
     ++ optional zipSupport libzip
     ++ optional ffmpegSupport ffmpeg
+    ++ optional apeSupport yasm
     ++ optional artworkSupport imlib2
     ++ optional hotkeysSupport libX11
     ++ optional osdSupport dbus

From 279ad0f350a0d2ca65055669c4fa5aa31f803a82 Mon Sep 17 00:00:00 2001
From: Mate Kovacs <mkovaxx@gmail.com>
Date: Sun, 31 Jan 2016 01:51:37 -0800
Subject: [PATCH 0781/2285] pythonPackages.svgwrite: init at 1.1.6

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b5a3dfd485be..b300b64436d1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19949,6 +19949,25 @@ in modules // {
     };
   };
 
+  svgwrite = buildPythonPackage rec {
+    name = "svgwrite-${version}";
+    version = "1.1.6";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/s/svgwrite/${name}.tar.gz";
+      sha256 = "1f018813072aa4d7e95e58f133acb3f68fa7de0a0d89ec9402cc38406a0ec5b8";
+    };
+
+    buildInputs = with self; [ setuptools ];
+    propagatedBuildInputs = with self; [ pyparsing ];
+
+    meta = {
+      description = "A Python library to create SVG drawings.";
+      homepage = http://bitbucket.org/mozman/svgwrite;
+      license = licenses.mit;
+    };
+  };
+
   freezegun = buildPythonPackage rec {
     name = "freezegun-${version}";
     version = "0.3.5";

From ab2db6239d47a174fb3e84065c30bcb6a19cc4fc Mon Sep 17 00:00:00 2001
From: Oliver Charles <ollie@ocharles.org.uk>
Date: Sun, 31 Jan 2016 09:52:28 +0000
Subject: [PATCH 0782/2285] lightdm: Allow background colors and images. Fixes
 #12684

---
 nixos/modules/services/x11/display-managers/lightdm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 9460395f86d6..3949bf01a316 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -86,7 +86,7 @@ in
       };
 
       background = mkOption {
-        type = types.path;
+        type = types.str;
         description = ''
           The background image or color to use.
         '';

From bca90426632f7b751802348f3065cc031823b32e Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Sun, 31 Jan 2016 11:19:35 +0100
Subject: [PATCH 0783/2285] mu: 0.9.13 -> 0.9.16

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

diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 77ef86baec36..5829dc9d5509 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -3,12 +3,12 @@
 , gtk3, webkit, libsoup, icu, withMug ? false /* doesn't build with current gtk3 */ }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.13";
+  version = "0.9.16";
   name = "mu-${version}";
 
   src = fetchurl {
     url = "https://github.com/djcb/mu/archive/v${version}.tar.gz";
-    sha256 = "0wj33pma8xgjvn2akk7khzbycwn4c9sshxvzdph9dnpy7gyqxj51";
+    sha256 = "0p7hqri1r1x6750x138cc29mh81kdav2dcim26y58s8an206h25g";
   };
 
   buildInputs = [

From 8ec3bce8f8cff686a1d3da6406557553b99bc40f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 31 Jan 2016 11:43:02 +0100
Subject: [PATCH 0784/2285] links: Remove package & deprecate for links2

This package is deprecated and superseeded by links2 which also provides the
links binary this maintaining backwards-compatibility.

Debian removed links back in 2008:

  https://packages.qa.debian.org/l/links.html

Fixes #12623.
---
 pkgs/applications/networking/browsers/links/default.nix  | 9 ---------
 pkgs/applications/networking/browsers/links2/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix                          | 3 +--
 3 files changed, 3 insertions(+), 13 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/links/default.nix

diff --git a/pkgs/applications/networking/browsers/links/default.nix b/pkgs/applications/networking/browsers/links/default.nix
deleted file mode 100644
index 8e78a0bd89cb..000000000000
--- a/pkgs/applications/networking/browsers/links/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation {
-  name = "links-1.00pre15";
-  src = fetchurl {
-    url = http://artax.karlin.mff.cuni.cz/~mikulas/links/download/links-1.00pre15.tar.gz;
-    sha256 = "0yzgzc6jm9vhv7rgbj5s9zwxn9fnf4nyap9l6dzgpwsn7m18vprv";
-  };
-}
diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix
index 518a4d667dda..4ea6e619b175 100644
--- a/pkgs/applications/networking/browsers/links2/default.nix
+++ b/pkgs/applications/networking/browsers/links2/default.nix
@@ -8,12 +8,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.11";
+  version = "2.12";
   name = "links2-${version}";
 
   src = fetchurl {
     url = "${meta.homepage}/download/links-${version}.tar.bz2";
-    sha256 = "0gqjdz1brdcx02mcwchi6bxy1i1ljbw5zpc6b321skrrsqkzkxw7";
+    sha256 = "0knq15yrp60s4jh92aacw8yfc2pcv3bqsw7dba7h5s6ivq8ihhcq";
   };
 
   buildInputs =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 308badd7d9f4..18ad8ffc8362 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12498,8 +12498,6 @@ let
     inherit (gnome) libglade;
   };
 
-  links = callPackage ../applications/networking/browsers/links { };
-
   ledger2 = callPackage ../applications/office/ledger/2.6.3.nix { };
   ledger3 = callPackage ../applications/office/ledger {
     boost = boost155;
@@ -15951,6 +15949,7 @@ aliases = with self; rec {
   jquery_ui = jquery-ui;  # added 2014-09-07
   libdbusmenu_qt5 = qt5.libdbusmenu;  # added 2015-12-19
   libtidy = html-tidy;  # added 2014-12-21
+  links = links2; # added 2016-01-31
   lttngTools = lttng-tools;  # added 2014-07-31
   lttngUst = lttng-ust;  # added 2014-07-31
   midoriWrapper = midori; # added 2015-01

From 932ee094e18501413d9a15f8e9424dd4f125abe9 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Sun, 31 Jan 2016 13:59:48 +0100
Subject: [PATCH 0785/2285] gnome3: drop GNOME 3.16

---
 .../services/x11/desktop-managers/gnome3.nix  |   2 +-
 .../gnome-3/3.16/apps/accerciser/default.nix  |  28 --
 .../gnome-3/3.16/apps/bijiben/default.nix     |  41 --
 .../gnome-3/3.16/apps/cheese/default.nix      |  30 --
 .../gnome-3/3.16/apps/evolution/default.nix   |  54 ---
 .../gnome-3/3.16/apps/file-roller/default.nix |  33 --
 .../gnome-3/3.16/apps/gedit/default.nix       |  38 --
 .../gnome-3/3.16/apps/glade/default.nix       |  35 --
 .../gnome-3/3.16/apps/gnome-boxes/default.nix |  47 ---
 .../3.16/apps/gnome-calendar/default.nix      |  27 --
 .../3.16/apps/gnome-characters/default.nix    |  24 --
 .../3.16/apps/gnome-clocks/default.nix        |  32 --
 .../3.16/apps/gnome-documents/default.nix     |  44 --
 .../gnome-getting-started-docs/default.nix    |  20 -
 .../gnome-3/3.16/apps/gnome-logs/default.nix  |  24 --
 .../gnome-3/3.16/apps/gnome-maps/default.nix  |  29 --
 .../gnome-3/3.16/apps/gnome-music/default.nix |  35 --
 .../3.16/apps/gnome-nettool/default.nix       |  26 --
 .../3.16/apps/gnome-photos/default.nix        |  36 --
 .../3.16/apps/gnome-weather/default.nix       |  24 --
 .../3.16/apps/nautilus-sendto/default.nix     |  22 -
 .../gnome-3/3.16/apps/polari/default.nix      |  27 --
 .../gnome-3/3.16/apps/seahorse/default.nix    |  42 --
 .../gnome-3/3.16/apps/vinagre/default.nix     |  29 --
 .../3.16/core/adwaita-icon-theme/default.nix  |  26 --
 .../gnome-3/3.16/core/baobab/default.nix      |  37 --
 .../gnome-3/3.16/core/caribou/default.nix     |  31 --
 .../3.16/core/dconf-editor/default.nix        |  28 --
 .../gnome-3/3.16/core/dconf/default.nix       |  23 -
 .../gnome-3/3.16/core/empathy/default.nix     |  57 ---
 .../gnome-3/3.16/core/eog/default.nix         |  31 --
 .../gnome-3/3.16/core/epiphany/default.nix    |  54 ---
 .../3.16/core/epiphany/libxml_depend.patch    |  10 -
 .../gnome-3/3.16/core/evince/default.nix      |  69 ---
 .../core/evolution-data-server/default.nix    |  36 --
 .../gnome-3/3.16/core/folks/default.nix       |  43 --
 .../gnome-3/3.16/core/gconf/default.nix       |  32 --
 .../gnome-3/3.16/core/gcr/default.nix         |  33 --
 .../3.16/core/gdm/3.16-wip/default.nix        |  41 --
 .../3.16-wip/disable_x_access_control.patch   |  15 -
 .../3.16/core/gdm/3.16-wip/sessions_dir.patch |  17 -
 .../3.16/core/gdm/3.16-wip/xserver_path.patch |  83 ----
 .../gnome-3/3.16/core/gdm/default.nix         |  46 --
 .../core/gdm/disable_x_access_control.patch   |  13 -
 .../3.16/core/gdm/no-dbus-launch.patch        |  20 -
 .../gnome-3/3.16/core/gdm/sessions_dir.patch  |  17 -
 .../gnome-3/3.16/core/gdm/xserver_path.patch  |  15 -
 .../3.16/core/geocode-glib/default.nix        |  21 -
 .../gnome-3/3.16/core/gjs/default.nix         |  28 --
 .../3.16/core/gnome-backgrounds/default.nix   |  17 -
 .../3.16/core/gnome-bluetooth/default.nix     |  27 --
 .../3.16/core/gnome-calculator/default.nix    |  35 --
 .../3.16/core/gnome-common/default.nix        |  24 --
 .../3.16/core/gnome-contacts/default.nix      |  52 ---
 .../3.16/core/gnome-contacts/gio_unix.patch   |  10 -
 .../core/gnome-control-center/default.nix     |  64 ---
 .../vpn_plugins_path.patch                    |  19 -
 .../3.16/core/gnome-desktop/default.nix       |  32 --
 .../3.16/core/gnome-dictionary/default.nix    |  37 --
 .../3.16/core/gnome-disk-utility/default.nix  |  40 --
 .../3.16/core/gnome-font-viewer/default.nix   |  36 --
 .../3.16/core/gnome-keyring/default.nix       |  41 --
 .../gnome-3/3.16/core/gnome-menus/default.nix |  22 -
 .../core/gnome-online-accounts/default.nix    |  38 --
 .../3.16/core/gnome-online-miners/default.nix |  37 --
 .../3.16/core/gnome-screenshot/default.nix    |  36 --
 .../3.16/core/gnome-session/default.nix       |  31 --
 .../core/gnome-settings-daemon/default.nix    |  36 --
 .../core/gnome-shell-extensions/default.nix   |  24 --
 .../gnome-3/3.16/core/gnome-shell/default.nix |  57 ---
 .../gnome-3/3.16/core/gnome-shell/src.nix     |  10 -
 .../3.16/core/gnome-system-log/default.nix    |  36 --
 .../core/gnome-system-monitor/default.nix     |  37 --
 .../3.16/core/gnome-terminal/default.nix      |  44 --
 .../core/gnome-themes-standard/default.nix    |  18 -
 .../3.16/core/gnome-user-docs/default.nix     |  20 -
 .../3.16/core/gnome-user-share/default.nix    |  52 ---
 .../3.16/core/grilo-plugins/default.nix       |  27 --
 .../gnome-3/3.16/core/grilo/default.nix       |  33 --
 .../gnome-3/3.16/core/grilo/setup-hook.sh     |   7 -
 .../gsettings-desktop-schemas/default.nix     |  32 --
 .../gnome-3/3.16/core/gsound/default.nix      |  22 -
 .../3.16/core/gtksourceview/default.nix       |  27 --
 .../core/gtksourceview/nix_share_path.patch   |  11 -
 .../gnome-3/3.16/core/gucharmap/default.nix   |  38 --
 .../gnome-3/3.16/core/libcroco/default.nix    |  20 -
 .../gnome-3/3.16/core/libgdata/default.nix    |  33 --
 .../gnome-3/3.16/core/libgee/default.nix      |  26 --
 .../core/libgee/fix_introspection_paths.patch |  13 -
 .../gnome-3/3.16/core/libgee/libgee-1.nix     |  26 --
 .../3.16/core/libgnome-keyring/default.nix    |  26 --
 .../gnome-3/3.16/core/libgnomekbd/default.nix |  24 --
 .../gnome-3/3.16/core/libgweather/default.nix |  22 -
 .../gnome-3/3.16/core/libgxps/default.nix     |  20 -
 .../gnome-3/3.16/core/libpeas/default.nix     |  32 --
 .../gnome-3/3.16/core/libzapojit/default.nix  |  16 -
 .../gnome-3/3.16/core/mutter/default.nix      |  37 --
 .../gnome-3/3.16/core/mutter/x86.patch        |  20 -
 .../gnome-3/3.16/core/nautilus/default.nix    |  30 --
 .../3.16/core/nautilus/extension_dir.patch    |  24 --
 .../gnome-3/3.16/core/rest/default.nix        |  19 -
 .../gnome-3/3.16/core/sushi/default.nix       |  38 --
 .../3.16/core/totem-pl-parser/default.nix     |  20 -
 .../gnome-3/3.16/core/totem/default.nix       |  47 ---
 .../gnome-3/3.16/core/tracker/default.nix     |  55 ---
 .../gnome-3/3.16/core/vino/default.nix        |  32 --
 pkgs/desktops/gnome-3/3.16/core/vte/2.90.nix  |  40 --
 .../gnome-3/3.16/core/vte/default.nix         |  48 ---
 .../core/vte/expose_select_text.0.40.0.patch  | 226 ----------
 .../gnome-3/3.16/core/yelp-tools/default.nix  |  24 --
 .../gnome-3/3.16/core/yelp-xsl/default.nix    |  23 -
 .../gnome-3/3.16/core/yelp/default.nix        |  31 --
 .../gnome-3/3.16/core/zenity/default.nix      |  28 --
 pkgs/desktops/gnome-3/3.16/default.nix        | 399 ------------------
 .../gnome-3/3.16/desktop/rarian/default.nix   |  16 -
 .../gnome-3/3.16/devtools/anjuta/default.nix  |  34 --
 .../gnome-3/3.16/devtools/devhelp/default.nix |  23 -
 .../gnome-3/3.16/devtools/gdl/default.nix     |  25 --
 .../devtools/gnome-devel-docs/default.nix     |  20 -
 .../gnome-3/3.16/games/aisleriot/default.nix  |  25 --
 .../3.16/games/five-or-more/default.nix       |  24 --
 .../3.16/games/four-in-a-row/default.nix      |  24 --
 .../3.16/games/gnome-chess/default.nix        |  24 --
 .../3.16/games/gnome-klotski/default.nix      |  24 --
 .../3.16/games/gnome-mahjongg/default.nix     |  24 --
 .../3.16/games/gnome-mines/default.nix        |  24 --
 .../3.16/games/gnome-nibbles/default.nix      |  25 --
 .../3.16/games/gnome-robots/default.nix       |  24 --
 .../3.16/games/gnome-sudoku/default.nix       |  22 -
 .../3.16/games/gnome-taquin/default.nix       |  24 --
 .../3.16/games/gnome-tetravex/default.nix     |  23 -
 .../gnome-3/3.16/games/hitori/default.nix     |  24 --
 .../gnome-3/3.16/games/iagno/default.nix      |  24 --
 .../gnome-3/3.16/games/lightsoff/default.nix  |  24 --
 .../3.16/games/quadrapassel/default.nix       |  26 --
 .../gnome-3/3.16/games/swell-foop/default.nix |  24 --
 .../gnome-3/3.16/games/tali/default.nix       |  24 --
 ...d-with-evolution-data-server-3.13.90.patch |  39 --
 .../gnome-3/3.16/misc/california/default.nix  |  39 --
 .../gnome-3/3.16/misc/geary/default.nix       |  53 ---
 .../3.16/misc/geary/disable_valadoc.patch     |  24 --
 .../gnome-3/3.16/misc/gexiv2/default.nix      |  28 --
 .../gnome-3/3.16/misc/gfbgraph/default.nix    |  23 -
 .../gnome-3/3.16/misc/gitg/default.nix        |  47 ---
 ...themes-and-icons-in-system-data-dirs.patch | 123 ------
 ...-multiple-entries-for-a-single-theme.patch | 103 -----
 ...reate-config-dir-if-it-doesn-t-exist.patch |  29 --
 .../3.16/misc/gnome-tweak-tool/default.nix    |  49 ---
 .../gnome-tweak-tool/find_gsettings.patch     |  22 -
 .../3.16/misc/gnome-video-effects/default.nix |  20 -
 .../gnome-3/3.16/misc/gpaste/default.nix      |  44 --
 .../gnome-3/3.16/misc/gtkhtml/default.nix     |  24 --
 .../gnome-3/3.16/misc/libgda/default.nix      |  30 --
 .../3.16/misc/libgit2-glib/default.nix        |  21 -
 .../gnome-3/3.16/misc/libmediaart/default.nix |  22 -
 .../gnome-3/3.16/misc/pomodoro/default.nix    |  50 ---
 pkgs/top-level/all-packages.nix               |   2 -
 157 files changed, 1 insertion(+), 5445 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/apps/glade/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-characters/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-getting-started-docs/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-maps/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/apps/polari/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/baobab/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/caribou/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/dconf/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/eog/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/epiphany/libxml_depend.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/evince/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/folks/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gconf/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/disable_x_access_control.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/sessions_dir.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/xserver_path.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gdm/disable_x_access_control.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gdm/no-dbus-launch.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gdm/sessions_dir.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gdm/xserver_path.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-contacts/gio_unix.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-control-center/vpn_plugins_path.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-menus/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/grilo/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/grilo/setup-hook.sh
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gsound/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gtksourceview/nix_share_path.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/libgdata/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/libgee/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/libgee/fix_introspection_paths.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/libgee/libgee-1.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/libgnome-keyring/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/libgxps/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/libzapojit/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/mutter/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/nautilus/extension_dir.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/rest/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/sushi/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/totem/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/tracker/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/vino/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/vte/2.90.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/vte/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.40.0.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/yelp-tools/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/core/zenity/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/desktop/rarian/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/devtools/gnome-devel-docs/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/games/aisleriot/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/games/gnome-sudoku/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/games/hitori/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/games/iagno/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/games/quadrapassel/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/games/tali/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.16/misc/california/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/misc/geary/disable_valadoc.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/find_gsettings.patch
 delete mode 100644 pkgs/desktops/gnome-3/3.16/misc/gnome-video-effects/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/misc/libgda/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix
 delete mode 100644 pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix

diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index be2411b3c7ff..4dd631d87511 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -64,7 +64,7 @@ in {
     environment.gnome3.packageSet = mkOption {
       type = types.nullOr types.package;
       default = null;
-      example = literalExample "pkgs.gnome3_16";
+      example = literalExample "pkgs.gnome3_18";
       description = "Which GNOME 3 package set to use.";
       apply = p: if p == null then pkgs.gnome3 else p;
     };
diff --git a/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
deleted file mode 100644
index a2813e0581b3..000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, itstool, libxml2, python3, python3Packages, pyatspi, at_spi2_core
-, dbus, intltool, libwnck3 }:
-
-stdenv.mkDerivation rec {
-  name = "accerciser-3.14.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/accerciser/3.14/${name}.tar.xz";
-    sha256 = "0x05gpajpcs01g7m34g6fxz8122cf9kx3k0lchwl34jy8xfr39gm";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook itstool libxml2 python3 pyatspi
-    python3Packages.pygobject3 python3Packages.ipython
-    at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme
-  ];
-
-  wrapPrefixVariables = [ "PYTHONPATH" ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Accerciser;
-    description = "Interactive Python accessibility explorer";
-    maintainers = gnome3.maintainers;
-    license = licenses.bsd3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix b/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix
deleted file mode 100644
index 99ea481307e7..000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/bijiben/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, glib
-, evolution_data_server, evolution, sqlite
-, makeWrapper, itstool, desktop_file_utils
-, clutter_gtk, libuuid, webkitgtk, zeitgeist
-, gnome3, librsvg, gdk_pixbuf, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "bijiben-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/bijiben/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0ndb7bv03rqxh4an44xd4cwxxp5z1wywk9xazmab01jsa0a0zx7r";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig glib intltool itstool libxml2
-                  clutter_gtk libuuid webkitgtk gnome3.tracker
-                  gnome3.gnome_online_accounts zeitgeist desktop_file_utils
-                  gnome3.gsettings_desktop_schemas makeWrapper
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  evolution_data_server evolution sqlite ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    wrapProgram "$out/bin/bijiben" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Bijiben;
-    description = "Note editor designed to remain simple to use";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix b/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix
deleted file mode 100644
index de61b73cf622..000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/cheese/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, intltool, fetchurl, wrapGAppsHook, gnome-video-effects, libcanberra_gtk3
-, pkgconfig, gtk3, glib, clutter_gtk, clutter-gst_2, udev, gst_all_1, itstool
-, adwaita-icon-theme, librsvg, gdk_pixbuf, gnome3, gnome_desktop, libxml2, libgudev }:
-
-stdenv.mkDerivation rec {
-  name = "cheese-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/cheese/${gnome3.version}/${name}.tar.xz";
-    sha256 = "184hzwrjjn94ndivb54rrif4jnbr66p1j0nlqqi3nw6qsrm2yqj4";
-  };
-
-  buildInputs = [ pkgconfig gtk3 glib intltool wrapGAppsHook gnome-video-effects itstool
-                  gdk_pixbuf adwaita-icon-theme librsvg udev gst_all_1.gstreamer libxml2
-                  gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gnome_desktop
-                  gst_all_1.gst-plugins-bad clutter_gtk clutter-gst_2
-                  libcanberra_gtk3 libgudev ];
-
-  enableParallelBuilding = true;
-
-  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Cheese;
-    description = "Take photos and videos with your webcam, with fun graphical effects";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
deleted file mode 100644
index d77740d35075..000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/evolution/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ stdenv, intltool, fetchurl, libxml2, webkitgtk, highlight
-, pkgconfig, gtk3, glib, libnotify, gtkspell3
-, makeWrapper, itstool, shared_mime_info, libical, db, gcr, sqlite
-, gnome3, librsvg, gdk_pixbuf, libsecret, nss, nspr, icu, libtool
-, libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit }:
-
-let
-  majVer = gnome3.version;
-in stdenv.mkDerivation rec {
-  name = "evolution-${majVer}.3";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/evolution/${majVer}/${name}.tar.xz";
-    sha256 = "1mh769adz40r22x0jw5z4carkcbhx36qy2j8kl2djjbp1jf5vhnd";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  propagatedBuildInputs = [ gnome3.gtkhtml ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg db icu
-                  gnome3.evolution_data_server libsecret libical gcr
-                  webkitgtk shared_mime_info gnome3.gnome_desktop gtkspell3
-                  libcanberra_gtk3 bogofilter gnome3.libgdata sqlite
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base p11_kit
-                  nss nspr libnotify procps highlight gnome3.libgweather
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  configureFlags = [ "--disable-spamassassin" "--disable-pst-import" "--disable-autoar"
-                     "--disable-libcryptui" ];
-
-  NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram "$f" \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Evolution;
-    description = "Personal information management application that provides integrated mail, calendaring and address book functionality";
-    maintainers = gnome3.maintainers;
-    license = licenses.lgpl2Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix b/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix
deleted file mode 100644
index 88ced2b2b065..000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/file-roller/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool, itstool, libxml2, libarchive
-, attr, bzip2, acl, makeWrapper, librsvg, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
-  name = "file-roller-${version}";
-
-  majVersion = gnome3.version;
-  version = "${majVersion}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/file-roller/${majVersion}/${name}.tar.xz";
-    sha256 = "12c6lpvc3mi1q10nas64kfcjw2arv3z4955zdfgf4c5wy4dczqyh";
-  };
-
-  # TODO: support nautilus
-  # it tries to create {nautilus}/lib/nautilus/extensions-3.0/libnautilus-fileroller.so
-
-  buildInputs = [ glib pkgconfig gnome3.gtk intltool itstool libxml2 libarchive
-                  gnome3.defaultIconTheme attr bzip2 acl gdk_pixbuf librsvg
-                  makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/file-roller" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/FileRoller;
-    description = "Archive manager for the GNOME desktop environment";
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix
deleted file mode 100644
index c046dd7dc9bf..000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gedit/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, intltool, fetchurl, enchant, isocodes
-, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, libsoup, libxml2
-, gnome3, librsvg, gdk_pixbuf, file }:
-
-stdenv.mkDerivation rec {
-  name = "gedit-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gedit/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0bs0vf773l0k7f4zxqlyb8z772s5dcn7ww0073hs7z3hj0l3lzrc";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool enchant isocodes
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg libsoup
-                  gnome3.libpeas gnome3.gtksourceview libxml2
-                  gnome3.gsettings_desktop_schemas makeWrapper file ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    wrapProgram "$out/bin/gedit" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix LD_LIBRARY_PATH : "${gnome3.libpeas}/lib:${gnome3.gtksourceview}/lib" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Gedit;
-    description = "Official text editor of the GNOME desktop environment";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix b/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix
deleted file mode 100644
index 3ead4de8bc48..000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/glade/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, intltool, fetchurl, python
-, pkgconfig, gtk3, glib
-, makeWrapper, itstool, libxml2, docbook_xsl
-, gnome3, librsvg, gdk_pixbuf, libxslt }:
-
-stdenv.mkDerivation rec {
-  name = "glade-3.16.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/glade/3.16/${name}.tar.xz";
-    sha256 = "994ac258bc100d3907ed40a2880c3144f13997b324477253e812d59f2716523f";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 python
-                  gnome3.gsettings_desktop_schemas makeWrapper docbook_xsl
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg libxslt ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    wrapProgram "$out/bin/glade" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Glade;
-    description = "User interface designer for GTK+ applications";
-    maintainers = gnome3.maintainers;
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
deleted file mode 100644
index 2c670b00f8ab..000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-boxes/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, fetchurl, makeWrapper, pkgconfig, intltool, itstool, libvirt-glib
-, glib, gobjectIntrospection, libxml2, gtk3, gtkvnc, libvirt, spice_gtk
-, spice_protocol, libuuid, libsoup, libosinfo, systemd, tracker, vala
-, libcap_ng, libcap, yajl, gmp, gdbm, cyrus_sasl, gnome3, librsvg
-, desktop_file_utils, mtools, cdrkit, libcdio, libgudev
-, libusb, libarchive, acl, xen, numactl
-}:
-
-# TODO: ovirt (optional)
-
-stdenv.mkDerivation rec {
-  name = "gnome-boxes-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-boxes/${gnome3.version}/${name}.tar.xz";
-    sha256 = "03a8x1bnbchsh2bs86gnwvddnwbf643wp5nrhyvg9j86d57axvs1";
-  };
-
-  enableParallelBuilding = true;
-
-  doCheck = true;
-
-  buildInputs = [
-    makeWrapper pkgconfig intltool itstool libvirt-glib glib
-    gobjectIntrospection libxml2 gtk3 gtkvnc libvirt spice_gtk spice_protocol
-    libuuid libsoup libosinfo systemd tracker vala libcap_ng libcap yajl gmp
-    gdbm cyrus_sasl gnome3.defaultIconTheme libusb libarchive
-    librsvg desktop_file_utils acl libgudev xen numactl
-  ];
-
-  preFixup = ''
-    for prog in "$out/bin/"*; do
-        wrapProgram "$prog" \
-            --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-            --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-            --prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Simple GNOME 3 application to access remote or virtual systems";
-    homepage = https://wiki.gnome.org/action/show/Apps/Boxes;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ bjornfor ];
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix
deleted file mode 100644
index 805c2482e9b5..000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-calendar/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, evolution_data_server, sqlite, libxml2, libsoup
-, glib }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-calendar-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-calendar/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0vqwps86whf8jgq7q4hdrbnmlaxppgrfa3j7n6ddpqzkb3gf2c5m";
-  };
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool evolution_data_server
-    sqlite libxml2 libsoup glib gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Calendar;
-    description = "Simple and beautiful calendar application for GNOME";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-characters/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-characters/default.nix
deleted file mode 100644
index 0c18f926e6d1..000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-characters/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, gjs, gdk_pixbuf, librsvg }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-characters-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-characters/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1gs5k32lmjpi4scb2i7pfnbsy8pl0gb9w1aypyy83hy6ydinaqc4";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool gjs gdk_pixbuf
-    librsvg gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Design/Apps/CharacterMap;
-    description = "Simple utility application to find and insert unusual characters";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix
deleted file mode 100644
index 2308dd90434f..000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-clocks/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, intltool, fetchurl, libgweather, libnotify
-, pkgconfig, gtk3, glib, gsound
-, makeWrapper, itstool, libcanberra_gtk3, libtool
-, gnome3, librsvg, gdk_pixbuf, geoclue2, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-clocks-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-clocks/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1k7khghaq7y3j0r3kn9q7dwgi1875bfn4iy0sr1ls14m1p2bl10q";
-  };
-
-  doCheck = true;
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
-                  gnome3.gsettings_desktop_schemas makeWrapper
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  gnome3.gnome_desktop gnome3.geocode_glib geoclue2
-                  libgweather libnotify libtool gsound
-                  wrapGAppsHook ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Clocks;
-    description = "Clock application designed for GNOME 3";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix
deleted file mode 100644
index fe6be2e8d4ec..000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-documents/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, intltool, fetchurl, evince, gjs
-, pkgconfig, gtk3, glib
-, makeWrapper, itstool, libxslt, webkitgtk
-, gnome3, librsvg, gdk_pixbuf, libsoup, docbook_xsl
-, gobjectIntrospection, json_glib, inkscape, poppler_utils
-, gmp, desktop_file_utils, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-documents-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-documents/${gnome3.version}/${name}.tar.xz";
-    sha256 = "154ssnyq4lwq2rsy3l5kqk8x1qjvn2j5gqm23i0aiw7qsbx5phrs";
-  };
-
-  doCheck = true;
-
-  configureFlags = [ "--enable-getting-started" ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxslt
-                  docbook_xsl desktop_file_utils inkscape poppler_utils
-                  gnome3.gsettings_desktop_schemas makeWrapper gmp
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg evince
-                  libsoup webkitgtk gjs gobjectIntrospection gnome3.rest
-                  gnome3.tracker gnome3.libgdata gnome3.gnome_online_accounts
-                  gnome3.gnome_desktop gnome3.libzapojit json_glib
-                  wrapGAppsHook ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    substituteInPlace $out/bin/gnome-documents --replace gapplication "${glib}/bin/gapplication"
-
-    gappsWrapperArgs+=(--run 'if [ -z "$XDG_CACHE_DIR" ]; then XDG_CACHE_DIR=$HOME/.cache; fi; if [ -w "$XDG_CACHE_DIR/.." ]; then mkdir -p "$XDG_CACHE_DIR/gnome-documents"; fi')
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Documents;
-    description = "Document manager application designed to work with GNOME 3";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-getting-started-docs/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-getting-started-docs/default.nix
deleted file mode 100644
index 7ab2ca89bc02..000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-getting-started-docs/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-getting-started-docs-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-getting-started-docs/${gnome3.version}/${name}.tar.xz";
-    sha256 = "07wz35r6p9nvlshwcyjvhjnzbaw3bzadlhwz51c8nky7m7pdgmyy";
-  };
-
-  buildInputs = [ intltool itstool libxml2 ];
-
-  meta = with stdenv.lib; {
-    homepage = https://live.gnome.org/DocumentationProject;
-    description = "Help a new user get started in GNOME";
-    maintainers = gnome3.maintainers;
-    license = licenses.cc-by-sa-30;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix
deleted file mode 100644
index dbef0526b806..000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-logs/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, itstool, libxml2, systemd }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-logs-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-logs/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0732jbvih5d678idvhlgqik9j9y594agwdx6gwap80459k1a6fg1";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
-    systemd gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Logs;
-    description = "A log viewer for the systemd journal";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-maps/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-maps/default.nix
deleted file mode 100644
index e7f6606b71e2..000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-maps/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gnome3, gtk3
-, gobjectIntrospection, gdk_pixbuf, librsvg
-, geoclue2, wrapGAppsHook, folks, libchamplain, gfbgraph, file, libsoup }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-maps-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-maps/${gnome3.version}/${name}.tar.xz";
-    sha256 = "15kwy2fy9v4zzjaqcifv4jaqcx1227bcdxgd6916ghrdzgj93mx7";
-  };
-
-  doCheck = true;
-
-  buildInputs = [ pkgconfig intltool gobjectIntrospection wrapGAppsHook
-                  gtk3 geoclue2 gnome3.gjs gnome3.libgee folks gfbgraph
-                  gnome3.geocode_glib libchamplain file libsoup
-                  gdk_pixbuf librsvg
-                  gnome3.gnome_online_accounts gnome3.defaultIconTheme ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Maps;
-    description = "A map application for GNOME 3";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-    broken = true;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix
deleted file mode 100644
index 3a6de4bcf6f4..000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-music/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, intltool, fetchurl, gdk_pixbuf, tracker
-, python3, libxml2, python3Packages, libnotify, wrapGAppsHook
-, pkgconfig, gtk3, glib, cairo
-, makeWrapper, itstool, gnome3, librsvg, gst_all_1 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-music-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-music/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1pyj192kva0swad6w2kaj5shcwpgiflyda6zmsiaximsgzc4as8i";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg python3
-                  gnome3.grilo gnome3.grilo-plugins libxml2 python3Packages.pygobject3 libnotify
-                  python3Packages.pycairo python3Packages.dbus gnome3.totem-pl-parser
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base wrapGAppsHook
-                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
-                  gnome3.gsettings_desktop_schemas makeWrapper tracker ];
-
-  wrapPrefixVariables = [ "PYTHONPATH" ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Music;
-    description = "Music player and management application for the GNOME desktop environment";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix
deleted file mode 100644
index 4c152777f2cb..000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-nettool/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, libgtop, intltool, itstool, libxml2, nmap, inetutils }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-nettool-3.8.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-nettool/3.8/${name}.tar.xz";
-    sha256 = "1c9cvzvyqgfwa5zzyvp7118pkclji62fkbb33g4y9sp5kw6m397h";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook libgtop intltool itstool libxml2
-    gnome3.defaultIconTheme
-  ];
-
-  propagatedUserEnvPkgs = [ nmap inetutils ];
-
-  meta = with stdenv.lib; {
-    homepage = http://projects.gnome.org/gnome-network;
-    description = "A collection of networking tools";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix
deleted file mode 100644
index a89cde7a111a..000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-photos/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, intltool, fetchurl, exempi, libxml2
-, pkgconfig, gtk3, glib
-, makeWrapper, itstool, gegl, babl, lcms2
-, desktop_file_utils, gmp, libmediaart, wrapGAppsHook
-, gnome3, librsvg, gdk_pixbuf, libexif }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-photos-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-photos/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0jv3b5nd4sazyq2k132rdjizfg24sj6i63ls1m6x2qqqf8grxznj";
-  };
-
-  # doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool gegl babl gnome3.libgdata
-                  gnome3.gsettings_desktop_schemas makeWrapper gmp libmediaart
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg exempi
-                  gnome3.gfbgraph gnome3.grilo-plugins gnome3.grilo
-                  gnome3.gnome_online_accounts gnome3.gnome_desktop
-                  lcms2 libexif gnome3.tracker libxml2 desktop_file_utils
-                  wrapGAppsHook ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Photos;
-    description = "Photos is an application to access, organize and share your photos with GNOME 3";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix b/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix
deleted file mode 100644
index 5fff782a2e8c..000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/gnome-weather/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook, gjs
-, libgweather, intltool, itstool }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-weather-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-weather/${gnome3.version}/${name}.tar.xz";
-    sha256 = "14dx5zj9200qpsb7byfrjkw3144s0q0nmaw5c6ni7vpa8kmvbrac";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook gjs intltool itstool
-    libgweather gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Weather;
-    description = "Access current weather conditions and forecasts";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix b/pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix
deleted file mode 100644
index 093900dcb7ab..000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/nautilus-sendto/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, glib, pkgconfig, gnome3, intltool
-, gobjectIntrospection, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  name = "nautilus-sendto-${version}";
-
-  version = "3.8.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/nautilus-sendto/3.8/${name}.tar.xz";
-    sha256 = "03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab";
-  };
-
-  buildInputs = [ glib pkgconfig gobjectIntrospection intltool makeWrapper ];
-
-  meta = with stdenv.lib; {
-    description = "Integrates Evolution and Pidgin into the Nautilus file manager";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.16/apps/polari/default.nix
deleted file mode 100644
index 21ba8db37d41..000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/polari/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, intltool, fetchurl, gdk_pixbuf, adwaita-icon-theme
-, telepathy_glib, gjs, itstool, telepathy_idle
-, pkgconfig, gtk3, glib, librsvg, gnome3, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  name = "polari-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/polari/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0w7hc5i78kq4dkyzpdb9byk4rhqa569cmbg09nh3qxn8ninscdqx";
-  };
-
-  propagatedUserEnvPkgs = [ telepathy_idle ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool adwaita-icon-theme wrapGAppsHook
-                  telepathy_glib gjs gdk_pixbuf librsvg ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Polari;
-    description = "IRC chat client designed to integrate with the GNOME desktop";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix
deleted file mode 100644
index 3a28507fac17..000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/seahorse/default.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{ stdenv, intltool, fetchurl, vala
-, pkgconfig, gtk3, glib
-, makeWrapper, itstool, gnupg, libsoup
-, gnome3, librsvg, gdk_pixbuf, gpgme
-, libsecret, avahi, p11_kit, openssh }:
-
-let
-  majVer = gnome3.version;
-in stdenv.mkDerivation rec {
-  name = "seahorse-${majVer}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/seahorse/${majVer}/${name}.tar.xz";
-    sha256 = "0cg1grgpwbfkiny5148n17rzpc8kswyr5yff0kpm8l3lp01my2kp";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gcr
-                  gnome3.gsettings_desktop_schemas makeWrapper gnupg
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg gpgme
-                  libsecret avahi libsoup p11_kit vala gnome3.gcr
-                  openssh ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/seahorse" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Seahorse;
-    description = "Application for managing encryption keys and passwords in the GnomeKeyring";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix b/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix
deleted file mode 100644
index 1debc3646bc8..000000000000
--- a/pkgs/desktops/gnome-3/3.16/apps/vinagre/default.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, vte, libxml2, gtkvnc, intltool
-, libsecret, itstool, makeWrapper, librsvg }:
-
-stdenv.mkDerivation rec {
-  name = "vinagre-${version}";
-
-  majVersion = gnome3.version;
-  version = "${majVersion}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/vinagre/${majVersion}/${name}.tar.xz";
-    sha256 = "0gs8sqd4r6jlgxn1b7ggyfcisig50z79p0rmigpzwpjjx1bh0z6p";
-  };
-
-  buildInputs = [ pkgconfig gtk3 vte libxml2 gtkvnc intltool libsecret
-                  itstool makeWrapper gnome3.defaultIconTheme librsvg ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/vinagre" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Vinagre;
-    description = "Remote desktop viewer for GNOME";
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix
deleted file mode 100644
index 6a594aa6a1ee..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/adwaita-icon-theme/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnome3
-, iconnamingutils, gtk, gdk_pixbuf, librsvg, hicolor_icon_theme }:
-
-stdenv.mkDerivation rec {
-  name = "adwaita-icon-theme-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/adwaita-icon-theme/${gnome3.version}/${name}.tar.xz";
-    sha256 = "a3c8ad3b099ca571b423811a20ee9a7a43498cfa04d299719ee43cd7af6f6eb1";
-  };
-
-  # For convenience, we can specify adwaita-icon-theme only in packages
-  propagatedBuildInputs = [ hicolor_icon_theme ];
-
-  buildInputs = [ gdk_pixbuf librsvg ];
-
-  nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ];
-
-  # remove a tree of dirs with no files within
-  postInstall = '' rm -r "$out/locale" '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix b/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix
deleted file mode 100644
index 54d2c065d94e..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/baobab/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, intltool, fetchurl, vala, libgtop
-, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, libxml2
-, gnome3, librsvg, gdk_pixbuf, file }:
-
-stdenv.mkDerivation rec {
-  name = "baobab-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/baobab/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1wnf3yd3qi0xsmm37s6pk23qh095pk1fv9nhqjya1p9svwrh9r0z";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ vala pkgconfig gtk3 glib libgtop intltool itstool libxml2
-                  gnome3.gsettings_desktop_schemas makeWrapper file
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/baobab" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Baobab;
-    description = "Graphical application to analyse disk usage in any Gnome environment";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/caribou/default.nix b/pkgs/desktops/gnome-3/3.16/core/caribou/default.nix
deleted file mode 100644
index c2cb6a661abe..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/caribou/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, clutter, dbus, pythonPackages, libxml2, autoconf
-, libxklavier, libXtst, gtk2, intltool, libxslt, at_spi2_core, automake114x }:
-
-let
-  majorVersion = "0.4";
-in
-stdenv.mkDerivation rec {
-  name = "caribou-${majorVersion}.18.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/caribou/${majorVersion}/${name}.tar.xz";
-    sha256 = "0l1ikx56ddgayvny3s2xv8hs3p23xsclw4zljs3cczv4b89dzymf";
-  };
-
-  buildInputs = with gnome3;
-    [ glib pkgconfig gtk clutter at_spi2_core dbus pythonPackages.python automake114x
-      pythonPackages.pygobject3 libxml2 libXtst gtk2 intltool libxslt autoconf ];
-
-  propagatedBuildInputs = [ gnome3.libgee libxklavier ];
-
-  preBuild = ''
-    patchShebangs .
-    substituteInPlace libcaribou/Makefile.am --replace "--shared-library=libcaribou.so.0" "--shared-library=$out/lib/libcaribou.so.0"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix b/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix
deleted file mode 100644
index 94be115e95ce..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/dconf-editor/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3
-, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:
-
-let
-  majorVersion = "3.16";
-in
-stdenv.mkDerivation rec {
-  name = "dconf-editor-${version}";
-  version = "${majorVersion}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/dconf-editor/${majorVersion}/${name}.tar.xz";
-    sha256 = "0vl5ygbh8blbk3710w34lmhxxl4g275vzpyhjsq0016c597isp88";
-  };
-
-  buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2 gnome3.defaultIconTheme
-                  intltool docbook_xsl docbook_xsl_ns makeWrapper gnome3.dconf ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/dconf-editor" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix b/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix
deleted file mode 100644
index 990e2007a23f..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/dconf/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, vala, libxslt, pkgconfig, glib, dbus_glib, gnome3
-, libxml2, intltool, docbook_xsl_ns, docbook_xsl, makeWrapper }:
-
-let
-  majorVersion = "0.24";
-in
-stdenv.mkDerivation rec {
-  name = "dconf-${version}";
-  version = "${majorVersion}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/dconf/${majorVersion}/${name}.tar.xz";
-    sha256 = "4373e0ced1f4d7d68d518038796c073696280e22957babb29feb0267c630fec2";
-  };
-
-  buildInputs = [ vala libxslt pkgconfig glib dbus_glib gnome3.gtk libxml2
-                  intltool docbook_xsl docbook_xsl_ns makeWrapper ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
deleted file mode 100644
index 4c42c6c026d3..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/empathy/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
-, file, librsvg, gnome3, gdk_pixbuf
-, dbus_glib, dbus_libs, telepathy_glib, telepathy_farstream
-, clutter_gtk, clutter-gst, gst_all_1, cogl, gnome_online_accounts
-, gcr, libsecret, folks, libpulseaudio, telepathy_mission_control
-, telepathy_logger, libnotify, clutter, libsoup, gnutls
-, evolution_data_server
-, libcanberra_gtk3, p11_kit, farstream, libtool, shared_mime_info
-, bash, makeWrapper, itstool, libxml2, libxslt, icu, libgee  }:
-
-# TODO: enable more features
-
-let
-  majorVersion = "3.12";
-in
-stdenv.mkDerivation rec {
-  name = "empathy-${majorVersion}.8";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/empathy/${majorVersion}/${name}.tar.xz";
-    sha256 = "10z6ksia6yx7vg0wsdbk4w6vjgfg3cg3n04jf9bj2vr7kr5zvs7w";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard
-                            gnome_online_accounts shared_mime_info ];
-  propagatedBuildInputs = [ folks telepathy_logger evolution_data_server
-                            telepathy_mission_control ];
-  buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool
-                  libxml2 libxslt icu file makeWrapper
-                  telepathy_glib clutter_gtk clutter-gst cogl
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
-                  gcr libsecret libpulseaudio gnome3.yelp_xsl gdk_pixbuf
-                  libnotify clutter libsoup gnutls libgee p11_kit
-                  libcanberra_gtk3 telepathy_farstream farstream
-                  gnome3.defaultIconTheme gnome3.gsettings_desktop_schemas
-                  file libtool librsvg ];
-
-  NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0"
-                         "-I${dbus_libs}/include/dbus-1.0"
-                         "-I${dbus_libs}/lib/dbus-1.0/include" ];
-
-  preFixup = ''
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram $f \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Empathy;
-    description = "Messaging program which supports text, voice, video chat, and file transfers over many different protocols";
-    maintainers = gnome3.maintainers;
-    # TODO: license = [ licenses.gpl2 licenses.lgpl2 ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/eog/default.nix b/pkgs/desktops/gnome-3/3.16/core/eog/default.nix
deleted file mode 100644
index fa1d41ef153e..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/eog/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ fetchurl, stdenv, intltool, pkgconfig, itstool, libxml2, libjpeg, gnome3
-, shared_mime_info, makeWrapper, librsvg, libexif }:
-
-
-stdenv.mkDerivation rec {
-  name = "eog-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/eog/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1ry10wvd2zq7vv4rf1qz0x1b77sdzaqlxyjbw3a0lccp4f2x2y99";
-  };
-
-  buildInputs = with gnome3;
-    [ intltool pkgconfig itstool libxml2 libjpeg gtk glib libpeas makeWrapper librsvg
-      gsettings_desktop_schemas shared_mime_info adwaita-icon-theme gnome_desktop libexif ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/eog" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${shared_mime_info}/share:${gnome3.adwaita-icon-theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/EyeOfGnome; 
-    platforms = platforms.linux;
-    description = "GNOME image viewer";
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix b/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
deleted file mode 100644
index 7dcba4173644..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/epiphany/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, gtk3, glib, nspr, icu
-, bash, makeWrapper, gnome3, libwnck3, libxml2, libxslt, libtool
-, webkitgtk, libsoup, glib_networking, libsecret, gnome_desktop, libnotify, p11_kit
-, sqlite, gcr, avahi, nss, isocodes, itstool, file, which
-, gdk_pixbuf, librsvg, gnome_common }:
-
-stdenv.mkDerivation rec {
-  name = "epiphany-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/epiphany/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1bicv1rfi697hk12p5n3jmcgjc81bwicjsmppdfjmvj94r4iniz8";
-  };
-
-  # Tests need an X display
-  configureFlags = [ "--disable-static --disable-tests" ];
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  nativeBuildInputs = [ pkgconfig file ];
-
-  configureScript = "./autogen.sh";
-
-  buildInputs = [ gtk3 glib intltool libwnck3 libxml2 libxslt pkgconfig file 
-                  webkitgtk libsoup libsecret gnome_desktop libnotify libtool
-                  sqlite isocodes nss itstool p11_kit nspr icu gnome3.yelp_tools
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg which gnome_common
-                  gcr avahi gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  NIX_CFLAGS_COMPILE = "-I${nspr}/include/nspr -I${nss}/include/nss -I${glib}/include/gio-unix-2.0";
-
-  enableParallelBuilding = true;
-
-  patches = [ ./libxml_depend.patch ];
-
-  patchFlags = [ "-p0" ];
-
-  preFixup = ''
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram "$f" \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix GIO_EXTRA_MODULES : "${glib_networking}/lib/gio/modules" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Epiphany;
-    description = "WebKit based web browser for GNOME";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/epiphany/libxml_depend.patch b/pkgs/desktops/gnome-3/3.16/core/epiphany/libxml_depend.patch
deleted file mode 100644
index 89e3694a02d9..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/epiphany/libxml_depend.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac.orig	2015-04-08 18:53:52.284580835 +0200
-+++ configure.ac	2015-04-08 18:55:55.697225280 +0200
-@@ -113,6 +113,7 @@
- PKG_CHECK_MODULES(WEB_EXTENSION, [
-                   webkit2gtk-web-extension-4.0 >= $WEBKIT_GTK_REQUIRED
-                   libsecret-1 >= $LIBSECRET_REQUIRED
-+                  libxml-2.0 >= $LIBXML_REQUIRED
-                   ])
- AC_SUBST(WEB_EXTENSION_CFLAGS)
- AC_SUBST(WEB_EXTENSION_LIBS)
diff --git a/pkgs/desktops/gnome-3/3.16/core/evince/default.nix b/pkgs/desktops/gnome-3/3.16/core/evince/default.nix
deleted file mode 100644
index aa75b55358b5..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/evince/default.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2
-, glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3
-, poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper
-, librsvg, recentListSize ? null # 5 is not enough, allow passing a different number
-, gobjectIntrospection
-}:
-
-stdenv.mkDerivation rec {
-  name = "evince-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/evince/${gnome3.version}/${name}.tar.xz";
-    sha256 = "016d9i83srv49saslmjl7v02n7sc6d7v6h68y06y9rfgbk8f4f2i";
-  };
-
-  buildInputs = [
-    pkgconfig intltool perl perlXMLParser libxml2
-    glib gtk3 pango atk gdk_pixbuf gobjectIntrospection
-    itstool gnome3.adwaita-icon-theme
-    gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas
-    poppler ghostscriptX djvulibre libspectre
-    makeWrapper libsecret librsvg gnome3.adwaita-icon-theme
-  ];
-
-  configureFlags = [
-    "--disable-nautilus" # Do not use nautilus
-    "--enable-introspection"
-  ];
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  preConfigure = with stdenv.lib;
-    optionalString doCheck ''
-      for file in test/*.py; do
-        echo "patching $file"
-        sed '1s,/usr,${python},' -i "$file"
-      done
-    '' + optionalString (recentListSize != null) ''
-      sed -i 's/\(gtk_recent_chooser_set_limit .*\)5)/\1${builtins.toString recentListSize})/' shell/ev-open-recent-action.c
-      sed -i 's/\(if (++n_items == \)5\(.*\)/\1${builtins.toString recentListSize}\2/' shell/ev-window.c
-    '';
-
-  preFixup = ''
-    # Tell Glib/GIO about the MIME info directory, which is used
-    # by `g_file_info_get_content_type ()'.
-    wrapProgram "$out/bin/evince" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-
-  '';
-
-  doCheck = false; # would need pythonPackages.dogTail, which is missing
-
-  meta = with stdenv.lib; {
-    homepage = http://www.gnome.org/projects/evince/;
-    description = "GNOME's document viewer";
-
-    longDescription = ''
-      Evince is a document viewer for multiple document formats.  It
-      currently supports PDF, PostScript, DjVu, TIFF and DVI.  The goal
-      of Evince is to replace the multiple document viewers that exist
-      on the GNOME Desktop with a single simple application.
-    '';
-
-    license = stdenv.lib.licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.vcunat ];
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix b/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix
deleted file mode 100644
index 81a64e9e1757..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/evolution-data-server/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, python
-, intltool, libsoup, libxml2, libsecret, icu, sqlite
-, p11_kit, db, nspr, nss, libical, gperf, makeWrapper, valaSupport ? true, vala }:
-
-
-stdenv.mkDerivation rec {
-  name = "evolution-data-server-${gnome3.version}.3";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/evolution-data-server/${gnome3.version}/${name}.tar.xz";
-    sha256 = "19dcvhlqh25pkkd29hhm9yik8xxfy01hcakikrai0x1a04aa2s7f";
-  };
-
-  buildInputs = with gnome3;
-    [ pkgconfig glib python intltool libsoup libxml2 gtk gnome_online_accounts
-      gcr p11_kit libgweather libgdata gperf makeWrapper icu sqlite gsettings_desktop_schemas ]
-    ++ stdenv.lib.optional valaSupport vala;
-
-  propagatedBuildInputs = [ libsecret nss nspr libical db ];
-
-  # uoa irrelevant for now
-  configureFlags = [ "--disable-uoa" ]
-                   ++ stdenv.lib.optional valaSupport "--enable-vala-bindings";
-
-  preFixup = ''
-    for f in "$out/libexec/"*; do
-      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/folks/default.nix b/pkgs/desktops/gnome-3/3.16/core/folks/default.nix
deleted file mode 100644
index 6e200bdb3188..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/folks/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, glib, gnome3, nspr, intltool
-, vala, sqlite, libxml2, dbus_glib, libsoup, nss, dbus_libs
-, telepathy_glib, evolution_data_server, libsecret, db }:
-
-# TODO: enable more folks backends
-
-let
-  majorVersion = "0.11";
-in
-stdenv.mkDerivation rec {
-  name = "folks-${majorVersion}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/folks/${majorVersion}/${name}.tar.xz";
-    sha256 = "0q9hny6a38zn0gamv0ji0pn3jw6bpn2i0fr6vbzkhm9h9ws0cqvz";
-  };
-
-  propagatedBuildInputs = [ glib gnome3.libgee sqlite ];
-  # dbus_daemon needed for tests
-  buildInputs = [ dbus_glib telepathy_glib evolution_data_server dbus_libs
-                  vala libsecret libxml2 libsoup nspr nss intltool db ];
-  nativeBuildInputs = [ pkgconfig ];
-
-  configureFlags = "--disable-fatal-warnings";
-
-  NIX_CFLAGS_COMPILE = ["-I${nspr}/include/nspr" "-I${nss}/include/nss"
-                        "-I${dbus_glib}/include/dbus-1.0" "-I${dbus_libs}/include/dbus-1.0"];
-
-  enableParallelBuilding = true;
-
-  postBuild = "rm -rf $out/share/gtk-doc";
-
-  meta = {
-    description = "Folks";
-
-    homepage = https://wiki.gnome.org/Projects/Folks;
-
-    license = stdenv.lib.licenses.lgpl2Plus;
-
-    maintainers = gnome3.maintainers;
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gconf/default.nix b/pkgs/desktops/gnome-3/3.16/core/gconf/default.nix
deleted file mode 100644
index a4cb3e8c1464..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gconf/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, dbus_glib, gnome3 ? null, glib, libxml2
-, intltool, polkit, orbit, withGtk ? false }:
-
-assert withGtk -> (gnome3 != null);
-
-stdenv.mkDerivation rec {
-
-  versionMajor = "3.2";
-  versionMinor = "6";
-  moduleName   = "GConf";
-
-  origName = "${moduleName}-${versionMajor}.${versionMinor}";
-
-  name = "gconf-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${origName}.tar.xz";
-    sha256 = "0k3q9nh53yhc9qxf1zaicz4sk8p3kzq4ndjdsgpaa2db0ccbj4hr";
-  };
-
-  buildInputs = [ libxml2 polkit orbit ] ++ stdenv.lib.optional withGtk gnome3.gtk;
-  propagatedBuildInputs = [ glib dbus_glib  ];
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  # ToDo: ldap reported as not found but afterwards reported as supported
-
-  meta = with stdenv.lib; {
-    homepage = http://projects.gnome.org/gconf/;
-    description = "A system for storing application preferences";
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix b/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
deleted file mode 100644
index c7b4cdd0ab2f..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gcr/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnupg, p11_kit, glib
-, libgcrypt, libtasn1, dbus_glib, gtk, pango, gdk_pixbuf, atk
-, gobjectIntrospection, makeWrapper, libxslt, vala, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name = "gcr-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gcr/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0xfhi0w358lvca1jjx24x2gm67mif33dsnmi9cv5i0f83ks8vzpc";
-  };
-
-  buildInputs = [
-    pkgconfig intltool gnupg glib gobjectIntrospection libxslt
-    libgcrypt libtasn1 dbus_glib gtk pango gdk_pixbuf atk makeWrapper vala
-  ];
-
-  propagatedBuildInputs = [ p11_kit ];
-
-  #doCheck = true;
-
-  #enableParallelBuilding = true; issues on hydra
-
-  preFixup = ''
-    wrapProgram "$out/bin/gcr-viewer" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix
deleted file mode 100644
index 51b67afb01fd..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
-, intltool, accountsservice, libX11, gnome3, systemd, gnome_session
-, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  name = "gdm-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gdm/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0mhv3q8z208qvhz00zrxlqn7w9gi5vy6w8dpjh5s2ka28l3yhbn3";
-  };
-
-  preConfigure = ''
-    substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
-    substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
-    substituteInPlace daemon/gdm-launch-environment.c --replace 'BINDIR "/dbus-launch' '"${dbus.tools}/bin/dbus-launch'
-    substituteInPlace data/gdm.conf-custom.in --replace '#WaylandEnable=false' 'WaylandEnable=false'
-    sed 's/#Enable=true/Enable=true/' -i data/gdm.conf-custom.in
- '';
-
-  configureFlags = [ "--localstatedir=/var" "--with-systemd=yes" "--without-plymouth"
-                     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
-                     "--with-initial-vt=10" ];
-
-  buildInputs = [ pkgconfig glib itstool libxml2 intltool
-                  accountsservice gnome3.dconf systemd
-                  gobjectIntrospection libX11 gtk
-                  libcanberra_gtk3 pam libtool ];
-
-  #enableParallelBuilding = true; # problems compiling
-
-  # Disable Access Control because our X does not support FamilyServerInterpreted yet
-  patches = [ ./xserver_path.patch ./sessions_dir.patch ./disable_x_access_control.patch ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GDM;
-    description = "A program that manages graphical display servers and handles graphical user logins";
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/disable_x_access_control.patch
deleted file mode 100644
index 7691a9e86f0f..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/disable_x_access_control.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- gdm-3.16.0/daemon/gdm-display.c.orig	2015-04-08 13:53:14.370274369 +0200
-+++ gdm-3.16.0/daemon/gdm-display.c	2015-04-08 13:53:36.287520435 +0200
-@@ -1706,9 +1706,10 @@
- 
-                 gdm_error_trap_push ();
- 
--                for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
-+                /*for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
-                         XAddHost (self->priv->x11_display, &host_entries[i]);
--                }
-+                }*/
-+                XDisableAccessControl(self->priv->x11_display);
- 
-                 XSync (self->priv->x11_display, False);
-                 if (gdm_error_trap_pop ()) {
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/sessions_dir.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/sessions_dir.patch
deleted file mode 100644
index b8fbad4d731d..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/sessions_dir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
-index f759d2d..d154716 100644
---- a/daemon/gdm-session.c
-+++ b/daemon/gdm-session.c
-@@ -373,9 +373,12 @@ get_system_session_dirs (void)
- #ifdef ENABLE_WAYLAND_SUPPORT
-                 DATADIR "/wayland-sessions/",
- #endif
-+                NULL,
-                 NULL
-         };
- 
-+        search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL;
-+
-         return search_dirs;
- }
- 
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/xserver_path.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/xserver_path.patch
deleted file mode 100644
index b451d129391a..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/3.16-wip/xserver_path.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- a/daemon/gdm-server.c	2014-07-30 23:00:17.786841724 +0200
-+++ b/daemon/gdm-server.c	2014-07-30 23:02:10.491239180 +0200
-@@ -322,7 +322,11 @@
- fallback:
- #endif
- 
--        server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        if (g_getenv("GDM_X_SERVER") != NULL) {
-+            server->priv->command = g_strdup (g_getenv("GDM_X_SERVER"));
-+        } else {
-+            server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        }
- }
- 
- static gboolean
---- gdm-3.16.0/daemon/gdm-x-session.c.orig	2015-04-15 18:44:16.875743928 +0200
-+++ gdm-3.16.0/daemon/gdm-x-session.c	2015-04-16 13:34:02.335708638 +0200
-@@ -207,6 +207,8 @@
-         char     *display_fd_string = NULL;
-         char     *vt_string = NULL;
-         char     *display_number;
-+        int nixos_argc = 0;
-+        char **nixos_argv = NULL;
-         gsize     display_number_size;
- 
-         auth_file = prepare_auth_file ();
-@@ -236,7 +238,15 @@
- 
-         display_fd_string = g_strdup_printf ("%d", DISPLAY_FILENO);
- 
--        g_ptr_array_add (arguments, X_SERVER);
-+        if (g_getenv("GDM_X_SERVER") != NULL) {
-+                int i = 0;
-+                g_shell_parse_argv(g_getenv("GDM_X_SERVER"), &nixos_argc, &nixos_argv, NULL);
-+                for (i = 0; i < nixos_argc; i++) {
-+                        g_ptr_array_add (arguments, nixos_argv[i]);
-+                }
-+        } else {
-+                g_ptr_array_add (arguments, X_SERVER);
-+        }
- 
-         if (vt_string != NULL) {
-                 g_ptr_array_add (arguments, vt_string);
-@@ -259,12 +269,12 @@
-         g_ptr_array_add (arguments, "-noreset");
-         g_ptr_array_add (arguments, "-keeptty");
- 
--        g_ptr_array_add (arguments, "-verbose");
-+        /*g_ptr_array_add (arguments, "-verbose");
-         if (state->debug_enabled) {
-                 g_ptr_array_add (arguments, "7");
-         } else {
-                 g_ptr_array_add (arguments, "3");
--        }
-+        }*/
- 
-         if (state->debug_enabled) {
-                 g_ptr_array_add (arguments, "-core");
-@@ -275,6 +285,9 @@
-                                                    (const char * const *) arguments->pdata,
-                                                    &error);
-         g_free (display_fd_string);
-+        if (nixos_argv) {
-+                 g_strfreev (nixos_argv);
-+        }
-         g_clear_object (&launcher);
-         g_ptr_array_free (arguments, TRUE);
- 
---- gdm-3.16.0/daemon/gdm-session.c.orig	2015-04-16 14:19:01.392802683 +0200
-+++ gdm-3.16.0/daemon/gdm-session.c	2015-04-16 14:20:36.012296764 +0200
-@@ -2359,6 +2359,12 @@
-         gchar *desktop_names;
-         const char *locale;
- 
-+        if (g_getenv ("GDM_X_SERVER") != NULL) {
-+                gdm_session_set_environment_variable (self,
-+                                                      "GDM_X_SERVER",
-+                                                      g_getenv ("GDM_X_SERVER"));
-+        }
-+
-         gdm_session_set_environment_variable (self,
-                                               "GDMSESSION",
-                                               get_session_name (self));
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix b/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
deleted file mode 100644
index d3d6f4e471c4..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, itstool, libxml2, xorg, dbus
-, intltool, accountsservice, libX11, gnome3, systemd, gnome_session
-, gtk, libcanberra_gtk3, pam, libtool, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  name = "gdm-3.14.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gdm/3.14/${name}.tar.xz";
-    sha256 = "0c2rvgcrf4s0nkxb19hf9pgh9c5pm6pginsq21dxj6hnjqabc3p2";
-  };
-
-  # Only needed to make it build
-  preConfigure = ''
-    substituteInPlace ./configure --replace "/usr/bin/X" "${xorg.xorgserver}/bin/X"
-  '';
-
-  configureFlags = [ "--sysconfdir=/etc"
-                     "--localstatedir=/var"
-                     "--with-systemd=yes"
-                     "--with-systemdsystemunitdir=$(out)/etc/systemd/system" ];
-
-  buildInputs = [ pkgconfig glib itstool libxml2 intltool
-                  accountsservice gnome3.dconf systemd
-                  gobjectIntrospection libX11 gtk
-                  libcanberra_gtk3 pam libtool ];
-
-  #enableParallelBuilding = true; # problems compiling
-
-  preBuild = ''
-    substituteInPlace daemon/gdm-simple-slave.c --replace 'BINDIR "/gnome-session' '"${gnome_session}/bin/gnome-session'
-  '';
-
-  # Disable Access Control because our X does not support FamilyServerInterpreted yet
-  patches = [ ./xserver_path.patch ./sessions_dir.patch
-              ./disable_x_access_control.patch ./no-dbus-launch.patch ];
-
-  installFlags = [ "sysconfdir=$(out)/etc" "dbusconfdir=$(out)/etc/dbus-1/system.d" ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GDM;
-    description = "A program that manages graphical display servers and handles graphical user logins";
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/disable_x_access_control.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/disable_x_access_control.patch
deleted file mode 100644
index e100e013b786..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/disable_x_access_control.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- gdm-3.14.2/daemon/gdm-slave.c.orig	2015-04-16 15:05:27.844353079 +0200
-+++ gdm-3.14.2/daemon/gdm-slave.c	2015-04-16 15:05:40.240417915 +0200
-@@ -369,8 +369,9 @@
-                 gdm_error_trap_push ();
- 
-                 for (i = 0; i < G_N_ELEMENTS (host_entries); i++) {
--                        XAddHost (slave->priv->server_display, &host_entries[i]);
-+                        //XAddHost (slave->priv->server_display, &host_entries[i]);
-                 }
-+                XDisableAccessControl(slave->priv->server_display);
- 
-                 XSync (slave->priv->server_display, False);
-                 if (gdm_error_trap_pop ()) {
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/no-dbus-launch.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/no-dbus-launch.patch
deleted file mode 100644
index c87554078c7c..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/no-dbus-launch.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/daemon/gdm-launch-environment.c	2015-06-22 15:11:07.277474398 +0000
-+++ b/daemon/gdm-launch-environment.c	2015-06-22 15:12:31.301157665 +0000
-@@ -48,8 +48,6 @@
- #include "gdm-session-enum-types.h"
- #include "gdm-launch-environment.h"
- 
--#define DBUS_LAUNCH_COMMAND BINDIR "/dbus-launch --exit-with-session"
--
- extern char **environ;
- 
- #define GDM_LAUNCH_ENVIRONMENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), GDM_TYPE_LAUNCH_ENVIRONMENT, GdmLaunchEnvironmentPrivate))
-@@ -512,7 +510,7 @@
-                 gdm_session_select_program (launch_environment->priv->session, launch_environment->priv->command);
-         } else {
-                 /* wrap it in dbus-launch */
--                char *command = g_strdup_printf ("%s %s", DBUS_LAUNCH_COMMAND, launch_environment->priv->command);
-+                char *command = g_strdup (launch_environment->priv->command);
- 
-                 gdm_session_select_program (launch_environment->priv->session, command);
-                 g_free (command);
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/sessions_dir.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/sessions_dir.patch
deleted file mode 100644
index b8fbad4d731d..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/sessions_dir.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
-index f759d2d..d154716 100644
---- a/daemon/gdm-session.c
-+++ b/daemon/gdm-session.c
-@@ -373,9 +373,12 @@ get_system_session_dirs (void)
- #ifdef ENABLE_WAYLAND_SUPPORT
-                 DATADIR "/wayland-sessions/",
- #endif
-+                NULL,
-                 NULL
-         };
- 
-+        search_dirs[4] = getenv("GDM_SESSIONS_DIR") != NULL ? getenv("GDM_SESSIONS_DIR") : NULL;
-+
-         return search_dirs;
- }
- 
diff --git a/pkgs/desktops/gnome-3/3.16/core/gdm/xserver_path.patch b/pkgs/desktops/gnome-3/3.16/core/gdm/xserver_path.patch
deleted file mode 100644
index 412daee9f270..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gdm/xserver_path.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/daemon/gdm-server.c	2014-07-30 23:00:17.786841724 +0200
-+++ b/daemon/gdm-server.c	2014-07-30 23:02:10.491239180 +0200
-@@ -322,7 +322,11 @@
- fallback:
- #endif
- 
--        server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        if (g_getenv("GDM_X_SERVER") != NULL) {
-+            server->priv->command = g_strdup (g_getenv("GDM_X_SERVER"));
-+        } else {
-+            server->priv->command = g_strdup_printf (X_SERVER X_SERVER_ARG_FORMAT, verbosity, debug_options);
-+        }
- }
- 
- static gboolean
diff --git a/pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix b/pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix
deleted file mode 100644
index 97c5ce2a71ff..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/geocode-glib/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, libsoup, json_glib }:
-
-
-stdenv.mkDerivation rec {
-  name = "geocode-glib-${gnome3.version}.0";
-
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/geocode-glib/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1cbfv0kds6b6k0cl7q47xpj3x1scwcd7m68zl1rf7i4hmhw4hpqj";
-  };
-
-  buildInputs = with gnome3;
-    [ intltool pkgconfig glib libsoup json_glib ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix b/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
deleted file mode 100644
index 792e34c7b148..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gjs/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, gtk3, gobjectIntrospection
-, spidermonkey_24, pango, readline, glib, libxml2 }:
-
-let
-  majorVersion = "1.43";
-in
-stdenv.mkDerivation rec {
-  name = "gjs-${majorVersion}.3";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gjs/${majorVersion}/${name}.tar.xz";
-    sha256 = "0khwm8l6m6x71rwf3q92d6scbhmrpiw7kqmj34nn588fb7a4vdc2";
-  };
-
-  buildInputs = [ libxml2 gobjectIntrospection pkgconfig gtk3 glib pango readline ];
-
-  propagatedBuildInputs = [ spidermonkey_24 ];
-
-  postInstall = ''
-    sed 's|-lreadline|-L${readline}/lib -lreadline|g' -i $out/lib/libgjs.la
-  '';
-
-  meta = with stdenv.lib; {
-    maintainers = gnome3.maintainers;
-    platforms = platforms.linux;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix
deleted file mode 100644
index 12b4561e6315..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-backgrounds/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, intltool }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-backgrounds-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-backgrounds/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0fx0pjz356v4w462i9a3z9r26khxqmj0zhp7wfl5scyq07fzkqvn";
-  };
-
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix
deleted file mode 100644
index e511cea941c8..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-bluetooth/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, gnome3, pkgconfig, intltool, glib
-, udev, itstool, libxml2, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-bluetooth-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-bluetooth/${gnome3.version}/${name}.tar.xz";
-    sha256 = "12z0792j5ln238ajhgqx5jrm34wz2yqbbskhlp23p9c0cwnj1srz";
-  };
-
-  buildInputs = with gnome3; [ pkgconfig intltool glib gtk3 udev libxml2 gnome3.defaultIconTheme
-                               makeWrapper gsettings_desktop_schemas itstool ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/bluetooth-sendto" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-bluetooth/stable/index.html.en;
-    description = "Application that let you manage Bluetooth in the GNOME destkop";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix
deleted file mode 100644
index a13ca33fc81a..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-calculator/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, libxml2
-, bash, gtk3, glib, makeWrapper
-, itstool, gnome3, librsvg, gdk_pixbuf, mpfr, gmp }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-calculator-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-calculator/${gnome3.version}/${name}.tar.xz";
-    sha256 = "068mnwkxliwafcfk70cz85fqna76vjj7kgsm4yqs4c1fd72gphmv";
-  };
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
-                  libxml2 gnome3.gtksourceview mpfr gmp
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-calculator" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Apps/Calculator;
-    description = "Application that solves mathematical equations and is suitable as a default application in a Desktop environment";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix
deleted file mode 100644
index 2762b3fa33bf..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-common/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, which, gnome3, autoconf, automake }:
-
-let
-  majVer = "3.14";
-in stdenv.mkDerivation rec {
-  name = "gnome-common-${majVer}.0";
-
-  src = fetchurl {
-    url = "https://download.gnome.org/sources/gnome-common/${majVer}/${name}.tar.xz";
-    sha256 = "0b1676g4q44ah73c5gwl1kg88pc93pnq1pa9kwl43d0vg0pj802c";
-  };
-
-  patches = [(fetchurl {
-    name = "gnome-common-3-patch";
-    url = "https://bug697543.bugzilla-attachments.gnome.org/attachment.cgi?id=240935";
-    sha256 = "17abp7czfzirjm7qsn2czd03hdv9kbyhk3lkjxg2xsf5fky7z7jl";
-  })];
-
-  propagatedBuildInputs = [ which autoconf automake ]; # autogen.sh which is using gnome_common tends to require which
-
-  meta = with stdenv.lib; {
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix
deleted file mode 100644
index 2e89210413f3..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ stdenv, intltool, fetchurl, evolution_data_server, db
-, pkgconfig, gtk3, glib, libsecret
-, libchamplain, clutter_gtk, geocode_glib
-, bash, makeWrapper, itstool, folks, libnotify, libxml2
-, gnome3, librsvg, gdk_pixbuf, file, telepathy_glib, nspr, nss
-, libsoup, vala, dbus_glib, automake115x, autoconf }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-contacts-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-contacts/${gnome3.version}/${name}.tar.xz";
-    sha256 = "09syi67ijdx9dhsx9c740mf3fhs6z3kaijdr3fyj8gd80h7a3hym";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard evolution_data_server ];
-
-  # force build from vala
-  preBuild = ''
-   touch src/*.vala
-  '';
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool evolution_data_server
-                  gnome3.gsettings_desktop_schemas makeWrapper file libnotify
-                  folks gnome3.gnome_desktop telepathy_glib libsecret dbus_glib
-                  libxml2 libsoup gnome3.gnome_online_accounts nspr nss
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  libchamplain clutter_gtk geocode_glib
-                  vala automake115x autoconf db ];
-
-  preFixup = ''
-    for f in "$out/bin/gnome-contacts" "$out/libexec/gnome-contacts-search-provider"; do
-      wrapProgram $f \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  patches = [ ./gio_unix.patch ];
-
-  patchFlags = "-p0";
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Contacts;
-    description = "Contacts is GNOME's integrated address book";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/gio_unix.patch b/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/gio_unix.patch
deleted file mode 100644
index f1b3d3c94ac2..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-contacts/gio_unix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.ac.orig	2015-04-09 18:45:50.581232289 +0200
-+++ configure.ac	2015-04-09 18:45:59.744280137 +0200
-@@ -54,6 +54,7 @@
- 	     champlain-0.12
- 	     clutter-gtk-1.0
- 	     geocode-glib-1.0 >= 3.15.3
-+	     gio-unix-2.0
- 	     "
- PKG_CHECK_MODULES(CONTACTS, [$pkg_modules])
- 
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
deleted file mode 100644
index 0ca81f542993..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/default.nix
+++ /dev/null
@@ -1,64 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, ibus, intltool, upower, makeWrapper
-, libcanberra, libcanberra_gtk3, accountsservice, libpwquality, libpulseaudio
-, gdk_pixbuf, librsvg, libxkbfile, libnotify
-, libxml2, polkit, libxslt, libgtop, libsoup, colord, colord-gtk
-, cracklib, python, libkrb5, networkmanagerapplet, networkmanager
-, libwacom, samba, shared_mime_info, tzdata, icu, libtool, udev, libgudev
-, docbook_xsl, docbook_xsl_ns, modemmanager, clutter, clutter_gtk
-, fontconfig, sound-theme-freedesktop }:
-
-# http://ftp.gnome.org/pub/GNOME/teams/releng/3.10.2/gnome-suites-core-3.10.2.modules
-# TODO: bluetooth, wacom, printers
-
-stdenv.mkDerivation rec {
-  name = "gnome-control-center-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-control-center/${gnome3.version}/${name}.tar.xz";
-    sha256 = "07vvmnqjjcc0cblpr6cdmg3693hihpjrq3q30mm3q68pdyfzbjgf";
-  };
-
-  propagatedUserEnvPkgs =
-    [ gnome3.gnome_themes_standard gnome3.libgnomekbd ];
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=752596
-  enableParallelBuilding = false;
-
-  buildInputs = with gnome3;
-    [ pkgconfig intltool ibus gtk glib upower libcanberra gsettings_desktop_schemas
-      libxml2 gnome_desktop gnome_settings_daemon polkit libxslt libgtop gnome-menus
-      gnome_online_accounts libsoup colord libpulseaudio fontconfig colord-gtk libpwquality
-      accountsservice libkrb5 networkmanagerapplet libwacom samba libnotify libxkbfile
-      shared_mime_info icu libtool docbook_xsl docbook_xsl_ns gnome3.grilo
-      gdk_pixbuf gnome3.defaultIconTheme librsvg clutter clutter_gtk
-      gnome3.vino udev libgudev libcanberra_gtk3
-      networkmanager modemmanager makeWrapper gnome3.gnome-bluetooth ];
-
-  preBuild = ''
-    substituteInPlace tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"
-    substituteInPlace panels/datetime/tz.h --replace "/usr/share/zoneinfo/zone.tab" "${tzdata}/share/zoneinfo/zone.tab"
-
-    # hack to make test-endianess happy
-    mkdir -p $out/share/locale
-    substituteInPlace panels/datetime/test-endianess.c --replace "/usr/share/locale/" "$out/share/locale/"
-  '';
-
-  patches = [ ./vpn_plugins_path.patch ];
-
-  preFixup = with gnome3; ''
-    wrapProgram $out/bin/gnome-control-center \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:${sound-theme-freedesktop}/share:$out/share:$out/share/gnome-control-center:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    for i in $out/share/applications/*; do
-      substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Utilities to configure the GNOME desktop";
-    license = licenses.gpl2Plus;
-    maintainers = gnome3.maintainers;
-    platforms = platforms.linux;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/vpn_plugins_path.patch b/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/vpn_plugins_path.patch
deleted file mode 100644
index e25105a303f4..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-control-center/vpn_plugins_path.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/panels/network/connection-editor/vpn-helpers.c b/panels/network/connection-editor/vpn-helpers.c
-index 7dc23c2..fcb1384 100644
---- a/panels/network/connection-editor/vpn-helpers.c
-+++ b/panels/network/connection-editor/vpn-helpers.c
-@@ -95,14 +95,6 @@ vpn_get_plugins (GError **error)
- 		if (!so_path)
- 			goto next;
- 
--		/* Remove any path and extension components, then reconstruct path
--		 * to the SO in LIBDIR
--		 */
--		so_name = g_path_get_basename (so_path);
--		g_free (so_path);
--		so_path = g_build_filename (NM_VPN_MODULE_DIR, so_name, NULL);
--		g_free (so_name);
--
- 		module = g_module_open (so_path, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
- 		if (!module) {
- 			g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, "Cannot load the VPN plugin which provides the "
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix
deleted file mode 100644
index e9a853c56a1e..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-desktop/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, python, libxml2Python, libxslt, which, libX11, gnome3, gtk3, glib
-, intltool, gnome_doc_utils, libxkbfile, xkeyboard_config, isocodes, itstool, wayland
-, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-
-  majorVersion = gnome3.version;
-  minorVersion = "1";
-  name = "gnome-desktop-${majorVersion}.${minorVersion}";
-
-  # this should probably be setuphook for glib
-  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
-
-  enableParallelBuilding = true;
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-desktop/${majorVersion}/${name}.tar.xz";
-    sha256 = "0v7md6csbnv55j4kns2q0zjl4040zwf3ld6lc3qvik40fkzzbrjb";
-  };
-
-  buildInputs = [ pkgconfig python libxml2Python libxslt which libX11
-                  xkeyboard_config isocodes itstool wayland
-                  gtk3 glib intltool gnome_doc_utils libxkbfile
-                  gobjectIntrospection ];
-
-  propagatedBuildInputs = [ gnome3.gsettings_desktop_schemas ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix
deleted file mode 100644
index 9e3906dbed13..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-dictionary/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, intltool, fetchurl
-, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, libxml2
-, gnome3, librsvg, gdk_pixbuf, file }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-dictionary-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-dictionary/${gnome3.version}/${name}.tar.xz";
-    sha256 = "17ha4pmnh9v98hxqy4pr3ri9wsck9njfjwd8qa0gycksmbyd1cag";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 file
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-dictionary" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Dictionary;
-    description = "Dictionary is the GNOME application to look up definitions";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix
deleted file mode 100644
index ea29cda29612..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-disk-utility/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, udisks2, libsecret, libdvdread
-, bash, gtk3, glib, makeWrapper, cracklib, libnotify
-, itstool, gnome3, librsvg, gdk_pixbuf, libxml2, python
-, libcanberra_gtk3, libxslt, libtool, docbook_xsl, libpwquality }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-disk-utility-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-disk-utility/${gnome3.version}/${name}.tar.xz";
-    sha256 = "14h92bznizq0k4qz7hn41axhhfjyw2ncnmbkf8kldi9x909fvpml";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
-                  libxslt libtool libsecret libpwquality cracklib
-                  libnotify libdvdread libcanberra_gtk3 docbook_xsl
-                  gdk_pixbuf gnome3.defaultIconTheme
-                  librsvg udisks2 gnome3.gnome_settings_daemon
-                  gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-disks" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://en.wikipedia.org/wiki/GNOME_Disks;
-    description = "A udisks graphical front-end";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix
deleted file mode 100644
index 39d5e71a5a3e..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-font-viewer/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, intltool, fetchurl
-, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool
-, gnome3, librsvg, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-font-viewer-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-font-viewer/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0dnkpg1d71dbzazi5chg3vj8bbia2w6k0ji4vh2f4s0b9rvybgzc";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.gnome_desktop
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-font-viewer" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Program that can preview fonts and create thumbnails for fonts";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix
deleted file mode 100644
index c3f16db359e5..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-keyring/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, dbus, libgcrypt, libtasn1, pam, python, glib, libxslt
-, intltool, pango, gcr, gdk_pixbuf, atk, p11_kit, makeWrapper
-, docbook_xsl_ns, docbook_xsl, gnome3 }:
-
-let
-  majVer = gnome3.version;
-in stdenv.mkDerivation rec {
-  name = "gnome-keyring-${majVer}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-keyring/${majVer}/${name}.tar.xz";
-    sha256 = "1xg1xha3x3hzlmvdq2zm90hc61pj7pnf9yxxvgq4ynl5af6bp8qm";
-  };
-
-  buildInputs = with gnome3; [
-    dbus libgcrypt pam python gtk3 gconf libgnome_keyring
-    pango gcr gdk_pixbuf atk p11_kit makeWrapper
-  ];
-
-  propagatedBuildInputs = [ glib libtasn1 libxslt ];
-
-  nativeBuildInputs = [ pkgconfig intltool docbook_xsl_ns docbook_xsl ];
-
-  configureFlags = [
-    "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt" # NixOS hardcoded path
-    "--with-pkcs11-config=$$out/etc/pkcs11/" # installation directories
-    "--with-pkcs11-modules=$$out/lib/pkcs11/"
-  ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-keyring" \
-      --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-    wrapProgram "$out/bin/gnome-keyring-daemon" \
-      --prefix XDG_DATA_DIRS : "${glib}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-menus/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-menus/default.nix
deleted file mode 100644
index 90209634fbf1..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-menus/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, glib, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-menus-${version}";
-  version = "3.10.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-menus/3.10/${name}.tar.xz";
-    sha256 = "0wcacs1vk3pld8wvrwq7fdrm11i56nrajkrp6j1da6jc4yx0m5a6";
-  };
-
-  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
-
-  buildInputs = [ intltool pkgconfig glib gobjectIntrospection ];
-
-  meta = {
-    homepage = "http://www.gnome.org";
-    description = "Gnome menu specification";
-
-    platforms = stdenv.lib.platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
deleted file mode 100644
index ac285819e8f4..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-online-accounts/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, libxslt, gtk, makeWrapper
-, webkitgtk, json_glib, rest, libsecret, dbus_glib, gnome_common
-, telepathy_glib, intltool, dbus_libs, icu, autoreconfHook
-, libsoup, docbook_xsl_ns, docbook_xsl, gnome3
-}:
-
-stdenv.mkDerivation rec {
-  name = "gnome-online-accounts-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-online-accounts/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1mpzj6fc42hhx77lki8cdycgfj9gjrm611rh0wsaqam4qq2c9a9c";
-  };
-
-  NIX_CFLAGS_COMPILE = "-I${dbus_glib}/include/dbus-1.0 -I${dbus_libs}/include/dbus-1.0";
-
-  enableParallelBuilding = true;
-
-  preAutoreconf = ''
-    sed '/disable-settings/d' -i configure.ac
-    sed "/if HAVE_INTROSPECTION/a INTROSPECTION_COMPILER_ARGS = --shared-library=$out/lib/libgoa-1.0.so" -i src/goa/Makefile.am
-  '';
-
-  buildInputs = [ pkgconfig glib libxslt gtk webkitgtk json_glib rest gnome_common makeWrapper
-                  libsecret dbus_glib telepathy_glib intltool icu libsoup autoreconfHook
-                  docbook_xsl_ns docbook_xsl gnome3.defaultIconTheme ];
-
-  preFixup = ''
-    for f in "$out/libexec/"*; do
-      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix
deleted file mode 100644
index 4c879b750980..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-online-miners/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, gnome3, libxml2
-, libsoup, json_glib, gmp, openssl, makeWrapper }:
-
-let
-  majVer = "3.14";
-in stdenv.mkDerivation rec {
-  name = "gnome-online-miners-${majVer}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-online-miners/${majVer}/${name}.tar.xz";
-    sha256 = "0bbak8srcrvnw18s4ls5mqaamx9nqdi93lij6yjs0a3q320k22xl";
-  };
-
-  doCheck = true;
-
-  buildInputs = [ pkgconfig glib gnome3.libgdata libxml2 libsoup gmp openssl
-                  gnome3.grilo gnome3.libzapojit gnome3.grilo-plugins
-                  gnome3.gnome_online_accounts makeWrapper gnome3.libmediaart
-                  gnome3.tracker gnome3.gfbgraph json_glib gnome3.rest ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    for f in $out/libexec/*; do
-      wrapProgram "$f" \
-        --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GnomeOnlineMiners;
-    description = "A set of crawlers that go through your online content and index them locally in Tracker";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix
deleted file mode 100644
index 8b4e7be9c411..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-screenshot/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, libcanberra_gtk3
-, bash, gtk3, glib, makeWrapper
-, itstool, gnome3, librsvg, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-screenshot-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-screenshot/${gnome3.version}/${name}.tar.xz";
-    sha256 = "5dd4bafb3deb0967866726ba89dab62bbd6dc3bda3b190474281142aa3dee948";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
-
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libcanberra_gtk3
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-screenshot" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://en.wikipedia.org/wiki/GNOME_Screenshot;
-    description = "Utility used in the GNOME desktop environment for taking screenshots";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix
deleted file mode 100644
index bce31242dac0..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-session/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, glib, dbus_glib, json_glib, upower
-, libxslt, intltool, makeWrapper, systemd, xorg }:
-
-
-stdenv.mkDerivation rec {
-  name = "gnome-session-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-session/${gnome3.version}/${name}.tar.xz";
-    sha256 = "17d9zryq13ajmai6fqynpfgghms52sj9h756f086i7fxbr2nsm4v";
-  };
-
-  configureFlags = "--enable-systemd";
-
-  buildInputs = with gnome3;
-    [ pkgconfig glib gnome_desktop gtk dbus_glib json_glib libxslt 
-      gnome3.gnome_settings_daemon xorg.xtrans gnome3.defaultIconTheme
-      gsettings_desktop_schemas upower intltool gconf makeWrapper systemd ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-session" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --suffix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix
deleted file mode 100644
index c80d1101ac9f..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-settings-daemon/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, glib, libnotify, lcms2, libXtst
-, libxkbfile, libpulseaudio, libcanberra_gtk3, upower, colord, libgweather, polkit
-, geoclue2, librsvg, xf86_input_wacom, udev, libgudev, libwacom, libxslt, libtool, networkmanager
-, docbook_xsl, docbook_xsl_ns, makeWrapper, ibus, xkeyboard_config }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-settings-daemon-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-settings-daemon/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1l61h497v57g3iqfmyzjh15z4c4akky3xziymphswzigb1ssv3da";
-  };
-
-  # fatal error: gio/gunixfdlist.h: No such file or directory
-  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
-
-  buildInputs = with gnome3;
-    [ intltool pkgconfig ibus gtk glib gsettings_desktop_schemas networkmanager
-      libnotify gnome_desktop lcms2 libXtst libxkbfile libpulseaudio
-      libcanberra_gtk3 upower colord libgweather xkeyboard_config
-      polkit geocode_glib geoclue2 librsvg xf86_input_wacom udev libgudev libwacom libxslt
-      libtool docbook_xsl docbook_xsl_ns makeWrapper gnome_themes_standard ];
-
-  preFixup = ''
-    wrapProgram "$out/libexec/gnome-settings-daemon-localeexec" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix PATH : "${glib}/bin" \
-      --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix
deleted file mode 100644
index d4e5d807e483..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell-extensions/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, intltool, fetchurl, libgtop, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, gnome3, file }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-shell-extensions-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-shell-extensions/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0hd7jskwhrki0s9lmx6vc6rw9y689zp2h7zhlxk90hghy4nkvkc8";
-  };
-
-  doCheck = true;
-
-  buildInputs = [ pkgconfig gtk3 glib libgtop intltool itstool
-                  makeWrapper file ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GnomeShell/Extensions;
-    description = "Modify and extend GNOME Shell functionality and behavior";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
deleted file mode 100644
index 899efc5443bb..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, json_glib, libcroco, intltool, libsecret
-, python3, libsoup, polkit, clutter, networkmanager, docbook_xsl, docbook_xsl_ns, at_spi2_core
-, libstartup_notification, telepathy_glib, telepathy_logger, libXtst, p11_kit, unzip
-, sqlite, libgweather, libcanberra_gtk3
-, libpulseaudio, libical, libtool, nss, gobjectIntrospection, gstreamer, makeWrapper
-, accountsservice, gdk_pixbuf, gdm, upower, ibus, networkmanagerapplet, librsvg }:
-
-# http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup
-
-stdenv.mkDerivation rec {
-  inherit (import ./src.nix fetchurl) name src;
-
-  # Needed to find /etc/NetworkManager/VPN
-  configureFlags = [ "--sysconfdir=/etc" ];
-
-  buildInputs = with gnome3;
-    [ gsettings_desktop_schemas gnome_keyring gnome-menus glib gcr json_glib accountsservice
-      libcroco intltool libsecret pkgconfig python3 libsoup polkit libcanberra gdk_pixbuf librsvg
-      clutter networkmanager libstartup_notification telepathy_glib docbook_xsl docbook_xsl_ns
-      libXtst p11_kit networkmanagerapplet gjs mutter libpulseaudio caribou evolution_data_server
-      libical libtool nss gobjectIntrospection gtk gstreamer makeWrapper gdm
-      libcanberra_gtk3 gnome_control_center
-      defaultIconTheme sqlite gnome3.gnome-bluetooth
-      libgweather # not declared at build time, but typelib is needed at runtime
-      gnome3.gnome-clocks # schemas needed
-      at_spi2_core upower ibus gnome_session gnome_desktop telepathy_logger gnome3.gnome_settings_daemon ];
-
-  installFlags = [ "keysdir=$(out)/share/gnome-control-center/keybindings" ];
-
-  preBuild = ''
-    patchShebangs src/data-to-c.pl
-    substituteInPlace data/Makefile --replace " install-keysDATA" ""
-  '';
-
-  preFixup = with gnome3; ''
-    wrapProgram "$out/bin/gnome-shell" \
-      --prefix PATH : "${unzip}/bin" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --suffix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-
-    wrapProgram "$out/libexec/gnome-shell-calendar-server" \
-      --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-
-    echo "${unzip}/bin" > $out/${passthru.mozillaPlugin}/extra-bin-path
-  '';
-
-  passthru = {
-    mozillaPlugin = "/lib/mozilla/plugins";
-  };
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix
deleted file mode 100644
index 782e18e4a9dd..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-# Autogenerated by maintainers/scripts/gnome.sh update
-
-fetchurl: {
-  name = "gnome-shell-3.16.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/gnome-shell/3.16/gnome-shell-3.16.1.tar.xz;
-    sha256 = "9bd9fbb40fb003ae09bebfe29d5b6a569b1fbb4a81c92ac9bada5efb956bf201";
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix
deleted file mode 100644
index 716f92a072d4..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-system-log/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig
-, bash, gtk3, glib, makeWrapper
-, itstool, gnome3, librsvg, gdk_pixbuf, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-system-log-3.9.90";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-system-log/3.9/${name}.tar.xz";
-    sha256 = "9eeb51982d347aa7b33703031e2c1d8084201374665425cd62199649b29a5411";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-  propagatedBuildInputs = [ gdk_pixbuf gnome3.defaultIconTheme librsvg ];
-
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool
-                  gnome3.gsettings_desktop_schemas makeWrapper libxml2 ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-system-log" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-system-log/3.9/;
-    description = "Graphical, menu-driven viewer that you can use to view and monitor your system logs";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix
deleted file mode 100644
index 353c8fcf4dbe..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-system-monitor/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, gtkmm3, libxml2
-, bash, gtk3, glib, makeWrapper
-, itstool, gnome3, librsvg, gdk_pixbuf, libgtop }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-system-monitor-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-system-monitor/${gnome3.version}/${name}.tar.xz";
-    sha256 = "14akcz4dwjnfx47gncyavjr82zc78a912v5gdp6h3z19bn5nx4q0";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ bash pkgconfig gtk3 glib intltool itstool libxml2
-                  gtkmm3 libgtop makeWrapper
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  gnome3.gsettings_desktop_schemas ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-system-monitor" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-system-monitor/3.12/;
-    description = "System Monitor shows you what programs are running and how much processor time, memory, and disk space are being used";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix
deleted file mode 100644
index 8be614f7397c..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-terminal/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, cairo, libxml2, gnome3, pango
-, gnome_doc_utils, intltool, libX11, which, libuuid, vala
-, desktop_file_utils, itstool, makeWrapper, appdata-tools }:
-
-stdenv.mkDerivation rec {
-
-  versionMajor = gnome3.version;
-  versionMinor = "1";
-
-  name = "gnome-terminal-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-terminal/${versionMajor}/${name}.tar.xz";
-    sha256 = "0nxlsz9hwajqfrblvqzc09599dra3van2znmcknnhjcfv3slvkkx";
-  };
-
-  buildInputs = [ gnome3.gtk gnome3.gsettings_desktop_schemas gnome3.vte appdata-tools
-                  gnome3.dconf itstool makeWrapper gnome3.nautilus vala ];
-
-  nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which libuuid libxml2 desktop_file_utils ];
-
-  # Silly ./configure, it looks for dbus file from gnome-shell in the
-  # installation tree of the package it is configuring.
-  preConfigure = ''
-    mkdir -p "$out/share/dbus-1/interfaces"
-    cp "${gnome3.gnome_shell}/share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml" "$out/share/dbus-1/interfaces"
-  '';
-
-  # FIXME: enable for gnome3
-  configureFlags = [ "--disable-migration" ];
-
-  preFixup = ''
-    for f in "$out/libexec/gnome-terminal-server"; do
-      wrapProgram "$f" \
-        --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
-        --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix
deleted file mode 100644
index 7bd689511d53..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-themes-standard/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2
-, gdk_pixbuf }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-themes-standard-${gnome3.version}.0";
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-themes-standard/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0kyrbfrgl6g6wm6zpllldz36fclvl8vwmn1snwk18kf7f6ncpsac";
-  };
-  
-  buildInputs = [ intltool gtk3 librsvg pkgconfig pango atk gtk2 gdk_pixbuf
-                  gnome3.defaultIconTheme ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix
deleted file mode 100644
index 17ebc84ced8c..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-user-docs/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-user-docs-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-user-docs/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0cck9hnp9az6qan97cv2d5lxlnzfss38h73g1a6dbspl4bnghy4n";
-  };
-
-  buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ];
-
-  meta = with stdenv.lib; {
-    homepage = "https://help.gnome.org/users/gnome-help/${gnome3.version}";
-    description = "User and system administration help for the GNOME desktop";
-    maintainers = gnome3.maintainers;
-    license = licenses.cc-by-30;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
deleted file mode 100644
index 381f7d7c4168..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gnome-user-share/default.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{ stdenv, intltool, fetchurl, apacheHttpd_2_2, nautilus
-, pkgconfig, gtk3, glib, libxml2, gnused
-, bash, makeWrapper, itstool, libnotify, libtool, mod_dnssd
-, gnome3, librsvg, gdk_pixbuf, file, libcanberra_gtk3 }:
-
-let
-  majVer = "3.14";
-in stdenv.mkDerivation rec {
-  name = "gnome-user-share-${majVer}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-user-share/${majVer}/${name}.tar.xz";
-    sha256 = "1s9fjzr161hy53i9ibk6aamc9af0cg8s151zj2fb6fxg67pv61bb";
-  };
-
-  doCheck = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  preConfigure = ''
-    sed -e 's,^LoadModule dnssd_module.\+,LoadModule dnssd_module ${mod_dnssd}/modules/mod_dnssd.so,' -i data/dav_user_2.2.conf 
-  '';
-
-  configureFlags = [ "--with-httpd=${apacheHttpd_2_2}/bin/httpd"
-                     "--with-modules-path=${apacheHttpd_2_2}/modules"
-                     "--disable-bluetooth"
-                     "--with-nautilusdir=$(out)/lib/nautilus/extensions-3.0" ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 libtool
-                  makeWrapper file gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  nautilus libnotify libcanberra_gtk3 ];
-
-  postInstall = ''
-    mkdir -p $out/share/gsettings-schemas/$name
-    mv $out/share/glib-2.0 $out/share/gsettings-schemas/$name
-    ${glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/$name/glib-2.0/schemas
-  '';
-
-  preFixup = ''
-    wrapProgram "$out/libexec/gnome-user-share-webdav" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://help.gnome.org/users/gnome-user-share/3.8;
-    description = "Service that exports the contents of the Public folder in your home directory on the local network";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix
deleted file mode 100644
index a236238c257f..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/grilo-plugins/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib, sqlite
-, gnome3, libxml2, gupnp, gssdp, lua5, liboauth, gupnp_av
-, gmime, json_glib, avahi, tracker, itstool }:
-
-stdenv.mkDerivation rec {
-  name = "grilo-plugins-0.2.13";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/grilo-plugins/0.2/${name}.tar.xz";
-    sha256 = "008jwm5ydl0k25p3d2fkcail40fj9y3qknihxb5fg941p8qlhm55";
-  };
-
-  installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-0.2" ];
-
-  buildInputs = [ pkgconfig gnome3.grilo libxml2 gupnp gssdp gnome3.libgdata
-                  lua5 liboauth gupnp_av sqlite gnome3.gnome_online_accounts
-                  gnome3.totem-pl-parser gnome3.rest gmime json_glib
-                  avahi gnome3.libmediaart tracker intltool itstool ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
-    description = "A collection of plugins for the Grilo framework";
-    maintainers = gnome3.maintainers;
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix
deleted file mode 100644
index 16dfb638a249..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/grilo/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib
-, libxml2, gnome3, gobjectIntrospection, libsoup }:
-
-stdenv.mkDerivation rec {
-  name = "grilo-0.2.12";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/grilo/0.2/${name}.tar.xz";
-    sha256 = "11bvc7rsrjjwz8hp67p3fn8zmywrpawrcbi3vgw8b0dwa0sndd2m";
-  };
-
-  setupHook = ./setup-hook.sh;
-
-  configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ];
-
-  preConfigure = ''
-    for f in src/Makefile.in libs/pls/Makefile.in libs/net/Makefile.in; do
-       substituteInPlace $f --replace @INTROSPECTION_GIRDIR@ "$out/share/gir-1.0/"
-       substituteInPlace $f --replace @INTROSPECTION_TYPELIBDIR@ "$out/lib/girepository-1.0"
-    done
-  '';
-
-  buildInputs = [ pkgconfig file intltool glib libxml2 libsoup
-                  gnome3.totem-pl-parser gobjectIntrospection ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Projects/Grilo;
-    description = "Framework that provides access to various sources of multimedia content, using a pluggable system";
-    maintainers = gnome3.maintainers;
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/grilo/setup-hook.sh b/pkgs/desktops/gnome-3/3.16/core/grilo/setup-hook.sh
deleted file mode 100644
index bc93dddec386..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/grilo/setup-hook.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-make_grilo_find_plugins() {
-    if [ -d "$1"/lib/grilo-0.2 ]; then
-        addToSearchPath GRL_PLUGIN_PATH "$1/lib/grilo-0.2"
-    fi
-}
-
-envHooks+=(make_grilo_find_plugins)
diff --git a/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix b/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix
deleted file mode 100644
index 53522c130733..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gsettings-desktop-schemas/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, glib, gobjectIntrospection
-  # just for passthru
-, gnome3, gtk3, gsettings_desktop_schemas }:
-
-stdenv.mkDerivation rec {
-
-  versionMajor = gnome3.version;
-  versionMinor = "1";
-  moduleName   = "gsettings-desktop-schemas";
-
-  name = "${moduleName}-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "0q9l9fr90pcb3s6crbxkj3wiwn7wp9zfpv7bdxkadj0hspd9zzkl";
-  };
-
-  postPatch = ''
-    for file in "background" "screensaver"; do
-      substituteInPlace "schemas/org.gnome.desktop.$file.gschema.xml.in" \
-        --replace "@datadir@" "${gnome3.gnome-backgrounds}/share/"
-    done
-  '';
-
-  buildInputs = [ glib gobjectIntrospection ];
-
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  meta = with stdenv.lib; {
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix b/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix
deleted file mode 100644
index 5f255743313e..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gsound/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, libcanberra, gobjectIntrospection, libtool, gnome3 }:
-
-let
-  majVer = "1.0";
-in stdenv.mkDerivation rec {
-  name = "gsound-${majVer}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gsound/${majVer}/${name}.tar.xz";
-    sha256 = "ea0dd94429c0645f2f98824274ef04543fe459dd83a5449a68910acc3ba67f29";
-  };
-
-  buildInputs = [ pkgconfig glib libcanberra gobjectIntrospection libtool ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GSound;
-    description = "Small library for playing system sounds";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix
deleted file mode 100644
index 3aacdef9455e..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gtksourceview/default.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, atk, cairo, glib, gtk3, pango
-, libxml2Python, perl, intltool, gettext, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name = "gtksourceview-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gtksourceview/${gnome3.version}/${name}.tar.xz";
-    sha256 = "030v7x1dmx5blqi9jcknsjd91jppbpl7f4z69k8c8kklr939i7k6";
-  };
-
-  propagatedBuildInputs = [ gtk3 ];
-
-  buildInputs = [ pkgconfig atk cairo glib pango
-                  libxml2Python perl intltool gettext ];
-
-  preBuild = ''
-    substituteInPlace gtksourceview/gtksourceview-utils.c --replace "@NIX_SHARE_PATH@" "$out/share"
-  ''; 
-
-  patches = [ ./nix_share_path.patch ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/gtksourceview/nix_share_path.patch b/pkgs/desktops/gnome-3/3.16/core/gtksourceview/nix_share_path.patch
deleted file mode 100644
index c87350167c25..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gtksourceview/nix_share_path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/gtksourceview/gtksourceview-utils.c	2014-07-13 16:13:57.418687726 +0200
-+++ b/gtksourceview/gtksourceview-utils.c	2014-07-13 16:14:20.550847767 +0200
-@@ -68,6 +68,8 @@
- 							 basename,
- 							 NULL));
- 
-+        g_ptr_array_add (dirs, g_build_filename ("@NIX_SHARE_PATH@", SOURCEVIEW_DIR, basename, NULL));
-+
- 	g_ptr_array_add (dirs, NULL);
- 
- 	return (gchar**) g_ptr_array_free (dirs, FALSE);
diff --git a/pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix b/pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix
deleted file mode 100644
index 71a8dbf0ff84..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/gucharmap/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, gtk3
-, glib, desktop_file_utils, bash, appdata-tools
-, makeWrapper, gnome3, file, itstool, libxml2 }:
-
-# TODO: icons and theme still does not work
-# use packaged gnome3.adwaita-icon-theme 
-
-stdenv.mkDerivation rec {
-  name = "gucharmap-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gucharmap/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1l26prbi5dmzxs62fz3vrhsif9jwqw4065qxp8hnc8bv34h59phw";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
-
-  buildInputs = [ pkgconfig gtk3 intltool itstool glib appdata-tools
-                  gnome3.yelp_tools libxml2 file desktop_file_utils
-                  gnome3.gsettings_desktop_schemas makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gucharmap" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Gucharmap;
-    description = "GNOME Character Map, based on the Unicode Character Database";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix b/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix
deleted file mode 100644
index e8ddf7096e62..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/libcroco/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, glib }:
-
-stdenv.mkDerivation rec {
-  name = "libcroco-0.6.8";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libcroco/0.6/${name}.tar.xz";
-    sha256 = "0w453f3nnkbkrly7spx5lx5pf6mwynzmd5qhszprq8amij2invpa";
-  };
-
-  outputs = [ "out" "doc" ];
-
-  configureFlags = stdenv.lib.optional stdenv.isDarwin "--disable-Bsymbolic";
-
-  buildInputs = [ pkgconfig libxml2 glib ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgdata/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgdata/default.nix
deleted file mode 100644
index bedbbee2dfe5..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/libgdata/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, libxml2, glib, json_glib
-, gobjectIntrospection, liboauth, gnome3, p11_kit, openssl }:
-
-let
-  majorVersion = "0.16";
-in
-stdenv.mkDerivation rec {
-  name = "libgdata-${majorVersion}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgdata/${majorVersion}/${name}.tar.xz";
-    sha256 = "8740e071ecb2ae0d2a4b9f180d2ae5fdf9dc4c41e7ff9dc7e057f62442800827";
-  };
-
-  # TODO: need libuhttpmock
-  configureFlags = "--disable-tests";
-  
-  NIX_CFLAGS_COMPILE = "-I${gnome3.libsoup}/include/libsoup-gnome-2.4/ -I${gnome3.gcr}/include/gcr-3 -I${gnome3.gcr}/include/gck-1";
-
-  buildInputs = with gnome3;
-    [ pkgconfig libsoup intltool libxml2 glib gobjectIntrospection 
-      liboauth gcr gnome_online_accounts p11_kit openssl ];
-
-  propagatedBuildInputs = [ json_glib ];
-      
-  meta = with stdenv.lib; {
-    description = "GData API library";
-    maintainers = with maintainers; [ raskin lethalman ];
-    platforms = platforms.linux;
-    license = licenses.lgpl21Plus;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgee/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgee/default.nix
deleted file mode 100644
index 4ff132950319..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/libgee/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection, gnome3 }:
-let
-  ver_maj = "0.16";
-  ver_min = "1";
-in
-stdenv.mkDerivation rec {
-  name = "libgee-${ver_maj}.${ver_min}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz";
-    sha256 = "d95f8ea8e78f843c71b1958fa2fb445e4a325e4821ec23d0d5108d8170e564a5";
-  };
-
-  doCheck = true;
-
-  patches = [ ./fix_introspection_paths.patch ];
-
-  buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ];
-
-  meta = with stdenv.lib; {
-    description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgee/fix_introspection_paths.patch b/pkgs/desktops/gnome-3/3.16/core/libgee/fix_introspection_paths.patch
deleted file mode 100644
index 67003f451645..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/libgee/fix_introspection_paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- fix_introspection_paths.patch/configure	2014-01-07 17:43:53.521339338 +0000
-+++ fix_introspection_paths.patch/configure-fix	2014-01-07 17:45:11.068635069 +0000
-@@ -12085,8 +12085,8 @@
-        INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
-        INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
-        INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
--       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
--       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
-+       INTROSPECTION_GIRDIR="${datadir}/gir-1.0"
-+       INTROSPECTION_TYPELIBDIR="${libdir}/girepository-1.0"
-        INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
-        INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
-        INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgee/libgee-1.nix b/pkgs/desktops/gnome-3/3.16/core/libgee/libgee-1.nix
deleted file mode 100644
index 1715e7eeb856..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/libgee/libgee-1.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, autoconf, vala, pkgconfig, glib, gobjectIntrospection, gnome3 }:
-let
-  ver_maj = "0.6";
-  ver_min = "8";
-in
-stdenv.mkDerivation rec {
-  name = "libgee-${ver_maj}.${ver_min}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgee/${ver_maj}/${name}.tar.xz";
-    sha256 = "1lzmxgz1bcs14ghfp8qqzarhn7s64ayx8c508ihizm3kc5wqs7x6";
-  };
-
-  doCheck = true;
-
-  patches = [ ./fix_introspection_paths.patch ];
-
-  buildInputs = [ autoconf vala pkgconfig glib gobjectIntrospection ];
-
-  meta = with stdenv.lib; {
-    description = "Utility library providing GObject-based interfaces and classes for commonly used data structures";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.spacefrogg ] ++ gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgnome-keyring/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgnome-keyring/default.nix
deleted file mode 100644
index c6c9323c010a..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/libgnome-keyring/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, glib, dbus_libs, libgcrypt, pkgconfig, intltool, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  name = "libgnome-keyring-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgnome-keyring/3.12/${name}.tar.xz";
-    sha256 = "c4c178fbb05f72acc484d22ddb0568f7532c409b0a13e06513ff54b91e947783";
-  };
-
-  propagatedBuildInputs = [ glib gobjectIntrospection dbus_libs libgcrypt ];
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  meta = {
-    description = "Framework for managing passwords and other secrets";
-    homepage = http://live.gnome.org/GnomeKeyring;
-    license = with stdenv.lib.licenses; [ gpl2Plus lgpl2Plus ];
-    inherit (glib.meta) platforms maintainers;
-
-    longDescription = ''
-      gnome-keyring is a program that keeps password and other secrets for
-      users. The library libgnome-keyring is used by applications to integrate
-      with the gnome-keyring system.
-    '';
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix
deleted file mode 100644
index 4939a4ff7281..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/libgnomekbd/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, glib, gtk3, libxklavier, makeWrapper, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name = "libgnomekbd-3.6.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgnomekbd/3.6/${name}.tar.xz";
-    sha256 = "c41ea5b0f64da470925ba09f9f1b46b26b82d4e433e594b2c71eab3da8856a09";
-  };
-
-  buildInputs = [ pkgconfig file intltool glib gtk3 libxklavier makeWrapper ];
-
-  preFixup = ''
-    wrapProgram $out/bin/gkbd-keyboard-display \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Keyboard management library";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix
deleted file mode 100644
index 8ba578bad2b8..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/libgweather/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, gtk, intltool, libsoup, gconf
-, pango, gdk_pixbuf, atk, tzdata, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name = "libgweather-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgweather/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1zadscn3i86fy7xpqiyw14pvz4f5cdw50ir77wd0zfr72hk5a2fv";
-  };
-
-  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
-
-  configureFlags = [ "--with-zoneinfo-dir=${tzdata}/share/zoneinfo" ];
-  propagatedBuildInputs = [ libxml2 gtk libsoup gconf pango gdk_pixbuf atk gnome3.geocode_glib ];
-  nativeBuildInputs = [ pkgconfig intltool ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.16/core/libgxps/default.nix
deleted file mode 100644
index 72d307f4f1a7..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/libgxps/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, cairo, libarchive, freetype, libjpeg, libtiff
-, openssl, bzip2, acl, attr
-}:
-
-stdenv.mkDerivation rec {
-  name = "libgxps-0.2.2";
-
-  src = fetchurl {
-    url = "http://ftp.acc.umu.se/pub/GNOME/core/3.10/3.10.2/sources/${name}.tar.xz";
-    sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r";
-  };
-
-  buildInputs = [ pkgconfig glib cairo libarchive freetype libjpeg libtiff acl openssl bzip2 attr];
-
-  configureFlags = "--without-liblcms2";
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix b/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix
deleted file mode 100644
index cf3f06fef58a..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/libpeas/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnome3
-, glib, gtk3, gobjectIntrospection, python, pygobject3
-}:
-
-let
-  majorVersion = "1.12";
-in
-stdenv.mkDerivation rec {
-  name = "libpeas-${version}";
-  version = "${majorVersion}.1";
-
-  buildInputs =  [
-   intltool pkgconfig glib gtk3 gobjectIntrospection python pygobject3
-   gnome3.defaultIconTheme
-  ];
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libpeas/${majorVersion}/${name}.tar.xz";
-    sha256 = "e610be31c9d382580fb5d8686f8311149f27413f55af6abf5c033178b99452d6";
-  };
-
-  preFixup = ''
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A GObject-based plugins engine";
-    homepage = "http://ftp.acc.umu.se/pub/GNOME/sources/libpeas/";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/libzapojit/default.nix b/pkgs/desktops/gnome-3/3.16/core/libzapojit/default.nix
deleted file mode 100644
index 5a8117528b68..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/libzapojit/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, intltool, json_glib, rest, libsoup, gtk, gnome_online_accounts }:
-
-stdenv.mkDerivation rec {
-  name = "libzapojit-0.0.3";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libzapojit/0.0/${name}.tar.xz";
-    sha256 = "0zn3s7ryjc3k1abj4k55dr2na844l451nrg9s6cvnnhh569zj99x";
-  };
-
-  buildInputs = [ pkgconfig glib intltool json_glib rest libsoup gtk gnome_online_accounts ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix b/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix
deleted file mode 100644
index a60db8f93f24..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/mutter/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ fetchurl, stdenv, pkgconfig, gnome3, intltool, gobjectIntrospection, upower, cairo
-, pango, cogl, clutter, libstartup_notification, libcanberra, zenity, libcanberra_gtk3
-, libtool, makeWrapper, xkeyboard_config, libxkbfile, libxkbcommon }:
-
-
-stdenv.mkDerivation rec {
-  name = "mutter-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/mutter/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0qq7gpkljn1z45sg2sxvmia52krj4ck2541iar89z99s1cppaasa";
-  };
-
-  # fatal error: gio/gunixfdlist.h: No such file or directory
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  configureFlags = "--with-x --disable-static --enable-shape --enable-sm --enable-startup-notification --enable-xsync --enable-verbose-mode --with-libcanberra"; 
-
-  buildInputs = with gnome3;
-    [ pkgconfig intltool glib gobjectIntrospection gtk gsettings_desktop_schemas upower
-      gnome_desktop cairo pango cogl clutter zenity libstartup_notification libcanberra
-      gnome3.geocode_glib
-      libcanberra_gtk3 zenity libtool makeWrapper xkeyboard_config libxkbfile libxkbcommon ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/mutter" \
-      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  patches = [ ./x86.patch ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch b/pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch
deleted file mode 100644
index bc8829de42f1..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/mutter/x86.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- mutter-3.16.2/src/core/window.c.orig	2015-05-26 10:52:41.382834963 +0200
-+++ mutter-3.16.2/src/core/window.c	2015-05-26 10:53:03.039948034 +0200
-@@ -3499,7 +3499,7 @@
- 
- static MetaMonitorInfo *
- find_monitor_by_winsys_id (MetaWindow *window,
--                           guint       winsys_id)
-+                           gint       winsys_id)
- {
-   int i;
- 
-@@ -3618,7 +3618,7 @@
-    */
- 
-   gboolean did_placement;
--  guint old_output_winsys_id;
-+  gint old_output_winsys_id;
-   MetaRectangle unconstrained_rect;
-   MetaRectangle constrained_rect;
-   MetaMoveResizeResultFlags result = 0;
diff --git a/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix
deleted file mode 100644
index 0e732b607484..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/nautilus/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, dbus_glib, shared_mime_info, libexif
-, gtk, gnome3, libunique, intltool, gobjectIntrospection
-, libnotify, makeWrapper, exempi, librsvg, tracker }:
-
-stdenv.mkDerivation rec {
-  name = "nautilus-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/nautilus/${gnome3.version}/${name}.tar.xz";
-    sha256 = "13s785kzk68xf4gdj0inz9k2hy06ll598w42141svdj77bdcsziy";
-  };
-
-  buildInputs = [ pkgconfig libxml2 dbus_glib shared_mime_info libexif gtk libunique intltool exempi librsvg
-                  gnome3.gnome_desktop gnome3.adwaita-icon-theme
-                  gnome3.gsettings_desktop_schemas libnotify makeWrapper tracker ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/nautilus" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  patches = [ ./extension_dir.patch ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/nautilus/extension_dir.patch b/pkgs/desktops/gnome-3/3.16/core/nautilus/extension_dir.patch
deleted file mode 100644
index 317b82579924..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/nautilus/extension_dir.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/libnautilus-private/nautilus-module.c b/libnautilus-private/nautilus-module.c
-index 6273a76..4adcc8a 100644
---- a/libnautilus-private/nautilus-module.c
-+++ b/libnautilus-private/nautilus-module.c
-@@ -242,11 +242,17 @@ void
- nautilus_module_setup (void)
- {
- 	static gboolean initialized = FALSE;
-+	const gchar* extensiondir = NULL;
- 
- 	if (!initialized) {
- 		initialized = TRUE;
--		
--		load_module_dir (NAUTILUS_EXTENSIONDIR);
-+	
-+		extensiondir = g_getenv ("NAUTILUS_EXTENSION_DIR");
-+		if (extensiondir == NULL) {
-+			extensiondir = NAUTILUS_EXTENSIONDIR;
-+		}
-+	
-+		load_module_dir (extensiondir);
- 
- 		eel_debug_call_at_shutdown (free_module_objects);
- 	}
diff --git a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix b/pkgs/desktops/gnome-3/3.16/core/rest/default.nix
deleted file mode 100644
index eada9ab19934..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/rest/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, libsoup, gobjectIntrospection, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name = "rest-0.7.92";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/rest/0.7/${name}.tar.xz";
-    sha256 = "07548c8785a3e743daf54a82b952ff5f32af94fee68997df4c83b00d52f9c0ec";
-  };
-
-  buildInputs = [ pkgconfig glib libsoup gobjectIntrospection];
-
-  configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt";
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix b/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix
deleted file mode 100644
index 8e5a1e21f52b..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/sushi/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, gobjectIntrospection, glib
-, clutter_gtk, clutter-gst, gnome3, gtksourceview, libmusicbrainz
-, webkitgtk, libmusicbrainz5, icu, makeWrapper, gst_all_1
-, gdk_pixbuf, librsvg, gtk3 }:
-
-stdenv.mkDerivation rec {
-  name = "sushi-3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/sushi/3.12/${name}.tar.xz";
-    sha256 = "78594a858371b671671205e7b2518e7eb82ed8c2540b62f45a657aaabdf1a9ff";
-  };
-
-  propagatedUserEnvPkgs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
-
-  buildInputs = [ pkgconfig file intltool gobjectIntrospection glib gtk3
-                  clutter_gtk clutter-gst gnome3.gjs gtksourceview gdk_pixbuf
-                  librsvg gnome3.defaultIconTheme libmusicbrainz5 webkitgtk
-                  gnome3.evince icu makeWrapper ];
-
-  enableParallelBuilding = true;
-
-  preFixup = ''
-    wrapProgram $out/libexec/sushi-start \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = "http://en.wikipedia.org/wiki/Sushi_(software)";
-    description = "A quick previewer for Nautilus";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix b/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix
deleted file mode 100644
index 63f36004bcd6..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/totem-pl-parser/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, file, intltool, gmime, libxml2, libsoup, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name = "totem-pl-parser-3.10.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/totem-pl-parser/3.10/${name}.tar.xz";
-    sha256 = "38be09bddc46ddecd2b5ed7c82144ef52aafe879a5ec3d8b192b4b64ba995469";
-  };
-
-  buildInputs = [ pkgconfig file intltool gmime libxml2 libsoup ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Videos;
-    description = "Simple GObject-based library to parse and save a host of playlist formats";
-    maintainers = gnome3.maintainers;
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/totem/default.nix b/pkgs/desktops/gnome-3/3.16/core/totem/default.nix
deleted file mode 100644
index 41f220ec38b8..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/totem/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, intltool, fetchurl, gst_all_1
-, clutter_gtk, clutter-gst, pygobject3, shared_mime_info
-, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, libxml2, dbus_glib
-, gnome3, librsvg, gdk_pixbuf, file }:
-
-stdenv.mkDerivation rec {
-  name = "totem-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/totem/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1qv6s7c06r6kdrd3jjqk8h79y8a7h8pjcx02rzp869jr7d9hkcb9";
-  };
-
-  doCheck = true;
-
-  enableParallelBuilding = true;
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2 gnome3.grilo
-                  clutter_gtk clutter-gst gnome3.totem-pl-parser gnome3.grilo-plugins
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base
-                  gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad
-                  gnome3.libpeas pygobject3 shared_mime_info dbus_glib
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg gnome3.gnome_desktop
-                  gnome3.gsettings_desktop_schemas makeWrapper file ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/totem" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
-      --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Videos;
-    description = "Movie player for the GNOME desktop based on GStreamer";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix
deleted file mode 100644
index 88e6da2ad2d0..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/tracker/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{ stdenv, intltool, fetchurl, libxml2, upower
-, pkgconfig, gtk3, glib
-, bash, makeWrapper, itstool, vala, sqlite, libxslt
-, gnome3, librsvg, gdk_pixbuf, file, libnotify
-, evolution_data_server, gst_all_1, poppler
-, icu, taglib, libjpeg, libtiff, giflib, libcue
-, libvorbis, flac, exempi, networkmanager
-, libpng, libexif, libgsf, libuuid, bzip2 }:
-
-let
-  majorVersion = "1.4";
-in
-stdenv.mkDerivation rec {
-  name = "tracker-${majorVersion}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/tracker/${majorVersion}/${name}.tar.xz";
-    sha256 = "1ssisbix7ib3d6bgx9s675gx6ayy68jq2srhpzv038mkbaskaz68";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0 -I${poppler}/include/poppler";
-
-  enableParallelBuilding = true;
-
-  buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2
-                  bzip2 gnome3.totem-pl-parser libxslt
-                  gnome3.gsettings_desktop_schemas makeWrapper file
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg sqlite
-                  upower libnotify evolution_data_server gnome3.libgee
-                  gst_all_1.gstreamer gst_all_1.gst-plugins-base flac
-                  poppler icu taglib libjpeg libtiff giflib libvorbis
-                  exempi networkmanager libpng libexif libgsf libuuid ];
-
-  preConfigure = ''
-    substituteInPlace src/libtracker-sparql/Makefile.in --replace "--shared-library=libtracker-sparql" "--shared-library=$out/lib/libtracker-sparql"
-  '';
-
-  preFixup = ''
-    for f in $out/bin/* $out/libexec/*; do
-      wrapProgram $f \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-        --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-    done
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/Tracker;
-    description = "Desktop-neutral user information store, search tool and indexer";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/vino/default.nix b/pkgs/desktops/gnome-3/3.16/core/vino/default.nix
deleted file mode 100644
index dcfd7b08b08e..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/vino/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ stdenv, intltool, fetchurl, gtk3, glib, libsoup, pkgconfig, makeWrapper
-, gnome3, libnotify, file, telepathy_glib, dbus_glib }:
-
-stdenv.mkDerivation rec {
-  name = "vino-${versionMajor}.${versionMinor}";
-  versionMajor = gnome3.version;
-  versionMinor = "0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/vino/${versionMajor}/${name}.tar.xz";
-    sha256 = "1icdc2y78xfg7czfiz05y9vsxkzzgrc0dpsrcxb41bg0sh9kd3b0";
-  };
-
-  doCheck = true;
-
-  buildInputs = [ gtk3 intltool glib libsoup pkgconfig libnotify
-                  gnome3.defaultIconTheme dbus_glib telepathy_glib file
-                  makeWrapper ];
-
-  preFixup = ''
-    wrapProgram "$out/libexec/vino-server" \
-      --prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Projects/Vino;
-    description = "GNOME desktop sharing server";
-    maintainers = with maintainers; [ lethalman iElectric ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/vte/2.90.nix b/pkgs/desktops/gnome-3/3.16/core/vte/2.90.nix
deleted file mode 100644
index 5ccca36bcaad..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/vte/2.90.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection }:
-
-stdenv.mkDerivation rec {
-  versionMajor = "0.36";
-  versionMinor = "3";
-  moduleName   = "vte";
-
-  name = "${moduleName}-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c";
-  };
-
-  buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ];
-
-  configureFlags = [ "--enable-introspection" ];
-
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses}/lib -lncurses"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://www.gnome.org/;
-    description = "A library implementing a terminal emulator widget for GTK+";
-    longDescription = ''
-      VTE is a library (libvte) implementing a terminal emulator widget for
-      GTK+, and a minimal sample application (vte) using that.  Vte is
-      mainly used in gnome-terminal, but can also be used to embed a
-      console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
-      character set conversion, as well as emulating any terminal known to
-      the system's terminfo database.
-    '';
-    license = licenses.lgpl2;
-    maintainers = with maintainers; [ astsmtl antono lethalman ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/vte/default.nix b/pkgs/desktops/gnome-3/3.16/core/vte/default.nix
deleted file mode 100644
index 89a1405f62b7..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/vte/default.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gnome3, ncurses, gobjectIntrospection, vala, libxml2
-, gnutls, selectTextPatch ? false }:
-
-stdenv.mkDerivation rec {
-  versionMajor = "0.40";
-  versionMinor = "0";
-  moduleName   = "vte";
-
-  name = "${moduleName}-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
-    sha256 = "0lnq0bgkmsixjwmfacb2ch9qfjqjxa8zkk1hiv3l29kgca0n3nal";
-  };
-
-  patches = with stdenv.lib; optional selectTextPatch ./expose_select_text.0.40.0.patch;
-
-  buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib 
-                  gnome3.gtk3 ncurses vala libxml2 ];
-
-  propagatedBuildInputs = [ gnutls ];
-
-  preConfigure = "patchShebangs .";
-
-  configureFlags = [ "--enable-introspection" ];
-
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses}/lib -lncurses"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = http://www.gnome.org/;
-    description = "A library implementing a terminal emulator widget for GTK+";
-    longDescription = ''
-      VTE is a library (libvte) implementing a terminal emulator widget for
-      GTK+, and a minimal sample application (vte) using that.  Vte is
-      mainly used in gnome-terminal, but can also be used to embed a
-      console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
-      character set conversion, as well as emulating any terminal known to
-      the system's terminfo database.
-    '';
-    license = licenses.lgpl2;
-    maintainers = with maintainers; [ astsmtl antono lethalman ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.40.0.patch b/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.40.0.patch
deleted file mode 100644
index c18f1b76b410..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/vte/expose_select_text.0.40.0.patch
+++ /dev/null
@@ -1,226 +0,0 @@
-Only in vte-0.40.0.new: .git
-diff --unified -aur vte-0.40.0/src/vteaccess.c vte-0.40.0.new/src/vteaccess.c
---- vte-0.40.0/src/vteaccess.c	2015-03-16 06:34:37.000000000 -0400
-+++ vte-0.40.0.new/src/vteaccess.c	2015-04-10 00:08:53.146853382 -0400
-@@ -1444,7 +1444,7 @@
- 	*start_offset = offset_from_xy (priv, start_x, start_y);
- 	_vte_terminal_get_end_selection (terminal, &end_x, &end_y);
- 	*end_offset = offset_from_xy (priv, end_x, end_y);
--	return _vte_terminal_get_selection (terminal);
-+	return vte_terminal_get_selection (terminal);
- }
- 
- static gboolean
-diff --unified -aur vte-0.40.0/src/vte.c vte-0.40.0.new/src/vte.c
---- vte-0.40.0/src/vte.c	2015-03-18 12:38:09.000000000 -0400
-+++ vte-0.40.0.new/src/vte.c	2015-04-10 00:08:53.150186722 -0400
-@@ -123,7 +123,6 @@
- 						 gpointer data,
- 						 GArray *attributes,
- 						 gboolean include_trailing_spaces);
--static void _vte_terminal_disconnect_pty_read(VteTerminal *terminal);
- static void _vte_terminal_disconnect_pty_write(VteTerminal *terminal);
- static void vte_terminal_stop_processing (VteTerminal *terminal);
- 
-@@ -3344,9 +3343,10 @@
- 	_vte_debug_print (VTE_DEBUG_IO, "removed poll of vte_terminal_io_read\n");
- 	terminal->pvt->pty_input_source = 0;
- }
--static void
--_vte_terminal_connect_pty_read(VteTerminal *terminal)
-+void
-+vte_terminal_connect_pty_read(VteTerminal *terminal)
- {
-+	g_return_if_fail(VTE_IS_TERMINAL(terminal));
- 	if (terminal->pvt->pty_channel == NULL) {
- 		return;
- 	}
-@@ -3398,9 +3398,10 @@
- 	}
- }
- 
--static void
--_vte_terminal_disconnect_pty_read(VteTerminal *terminal)
-+void
-+vte_terminal_disconnect_pty_read(VteTerminal *terminal)
- {
-+	g_return_if_fail(VTE_IS_TERMINAL(terminal));
- 	if (terminal->pvt->pty_input_source != 0) {
- 		_vte_debug_print (VTE_DEBUG_IO, "disconnecting poll of vte_terminal_io_read\n");
- 		g_source_remove(terminal->pvt->pty_input_source);
-@@ -6302,6 +6303,28 @@
- 	}
- }
- 
-+/**
-+ * vte_terminal_set_cursor_position:
-+ * @terminal: a #VteTerminal
-+ * @column: the new cursor column
-+ * @row: the new cursor row
-+ *
-+ * Set the location of the cursor.
-+ */
-+void
-+vte_terminal_set_cursor_position(VteTerminal *terminal,
-+				 long column, long row)
-+{
-+	g_return_if_fail(VTE_IS_TERMINAL(terminal));
-+
-+	_vte_invalidate_cursor_once(terminal, FALSE);
-+	terminal->pvt->cursor.col = column;
-+	terminal->pvt->cursor.row = row;
-+	_vte_invalidate_cursor_once(terminal, FALSE);
-+	_vte_check_cursor_blink(terminal);
-+	vte_terminal_queue_cursor_moved(terminal);
-+}
-+
- static GtkClipboard *
- vte_terminal_clipboard_get(VteTerminal *terminal, GdkAtom board)
- {
-@@ -6465,7 +6488,7 @@
-         vte_terminal_extend_selection(terminal, x, y, FALSE, TRUE);
- 
- 	/* Temporarily stop caring about input from the child. */
--	_vte_terminal_disconnect_pty_read(terminal);
-+	vte_terminal_disconnect_pty_read(terminal);
- }
- 
- static gboolean
-@@ -6482,7 +6505,7 @@
- 		terminal->pvt->selecting = FALSE;
- 
- 		/* Reconnect to input from the child if we paused it. */
--		_vte_terminal_connect_pty_read(terminal);
-+		vte_terminal_connect_pty_read(terminal);
- 
- 		return TRUE;
- 	}
-@@ -6982,6 +7005,50 @@
- 	vte_terminal_deselect_all (terminal);
- }
- 
-+/**
-+ * vte_terminal_get_selection_block_mode:
-+ * @terminal: a #VteTerminal
-+ *
-+ * Checks whether or not block selection is enabled.
-+ *
-+ * Returns: %TRUE if block selection is enabled, %FALSE if not
-+ */
-+gboolean
-+vte_terminal_get_selection_block_mode(VteTerminal *terminal) {
-+	g_return_val_if_fail(VTE_IS_TERMINAL(terminal), FALSE);
-+	return terminal->pvt->selection_block_mode;
-+}
-+
-+/**
-+ * vte_terminal_set_selection_block_mode:
-+ * @terminal: a #VteTerminal
-+ * @block_mode: whether block selection is enabled
-+ *
-+ * Sets whether or not block selection is enabled.
-+ */
-+void
-+vte_terminal_set_selection_block_mode(VteTerminal *terminal, gboolean block_mode) {
-+	g_return_if_fail(VTE_IS_TERMINAL(terminal));
-+	terminal->pvt->selection_block_mode = block_mode;
-+}
-+
-+/**
-+ * vte_terminal_select_text:
-+ * @terminal: a #VteTerminal
-+ * @start_col: the starting column for the selection
-+ * @start_row: the starting row for the selection
-+ * @end_col: the end column for the selection
-+ * @end_row: the end row for the selection
-+ *
-+ * Sets the current selection region.
-+ */
-+void
-+vte_terminal_select_text(VteTerminal *terminal,
-+			 long start_col, long start_row,
-+			 long end_col, long end_row) {
-+	_vte_terminal_select_text(terminal, start_col, start_row, end_col, end_row, 0, 0);
-+}
-+
- /* Autoscroll a bit. */
- static gboolean
- vte_terminal_autoscroll(VteTerminal *terminal)
-@@ -8631,7 +8698,7 @@
- #endif
- 		kill(terminal->pvt->pty_pid, SIGHUP);
- 	}
--	_vte_terminal_disconnect_pty_read(terminal);
-+	vte_terminal_disconnect_pty_read(terminal);
- 	_vte_terminal_disconnect_pty_write(terminal);
- 	if (terminal->pvt->pty_channel != NULL) {
- 		g_io_channel_unref (terminal->pvt->pty_channel);
-@@ -12188,7 +12255,7 @@
-         g_object_freeze_notify(object);
- 
-         if (pvt->pty != NULL) {
--                _vte_terminal_disconnect_pty_read(terminal);
-+                vte_terminal_disconnect_pty_read(terminal);
-                 _vte_terminal_disconnect_pty_write(terminal);
- 
-                 if (terminal->pvt->pty_channel != NULL) {
-@@ -12243,7 +12310,7 @@
-         _vte_terminal_setup_utf8 (terminal);
- 
-         /* Open channels to listen for input on. */
--        _vte_terminal_connect_pty_read (terminal);
-+        vte_terminal_connect_pty_read (terminal);
- 
-         g_object_notify(object, "pty");
- 
-@@ -12276,7 +12343,7 @@
- }
- 
- char *
--_vte_terminal_get_selection(VteTerminal *terminal)
-+vte_terminal_get_selection(VteTerminal *terminal)
- {
- 	g_return_val_if_fail(VTE_IS_TERMINAL(terminal), NULL);
- 
-diff --unified -aur vte-0.40.0/src/vteint.h vte-0.40.0.new/src/vteint.h
---- vte-0.40.0/src/vteint.h	2014-05-28 08:22:48.000000000 -0400
-+++ vte-0.40.0.new/src/vteint.h	2015-04-10 00:08:53.153520062 -0400
-@@ -25,7 +25,6 @@
- G_BEGIN_DECLS
- 
- void _vte_terminal_accessible_ref(VteTerminal *terminal);
--char* _vte_terminal_get_selection(VteTerminal *terminal);
- void _vte_terminal_get_start_selection(VteTerminal *terminal, long *x, long *y);
- void _vte_terminal_get_end_selection(VteTerminal *terminal, long *x, long *y);
- void _vte_terminal_select_text(VteTerminal *terminal, long start_x, long start_y, long end_x, long end_y, int start_offset, int end_offset);
-diff --unified -aur vte-0.40.0/src/vteterminal.h vte-0.40.0.new/src/vteterminal.h
---- vte-0.40.0/src/vteterminal.h	2015-03-18 12:38:09.000000000 -0400
-+++ vte-0.40.0.new/src/vteterminal.h	2015-04-10 00:08:53.150186722 -0400
-@@ -169,6 +169,18 @@
- 
- void vte_terminal_select_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
- void vte_terminal_unselect_all(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
-+gboolean vte_terminal_get_selection_block_mode(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
-+void vte_terminal_set_selection_block_mode(VteTerminal *terminal,
-+                                           gboolean block_mode) _VTE_GNUC_NONNULL(1);
-+void vte_terminal_select_text(VteTerminal *terminal,
-+                              long start_col, long start_row,
-+                              long end_col, long end_row) _VTE_GNUC_NONNULL(1);
-+char *
-+vte_terminal_get_selection(VteTerminal *terminal) _VTE_GNUC_NONNULL(1);
-+
-+/* pause and unpause output */
-+void vte_terminal_disconnect_pty_read(VteTerminal *vte);
-+void vte_terminal_connect_pty_read(VteTerminal *vte);
- 
- /* By-word selection */
- void vte_terminal_set_word_char_exceptions(VteTerminal *terminal,
-@@ -280,6 +292,8 @@
- void vte_terminal_get_cursor_position(VteTerminal *terminal,
- 				      glong *column,
-                                       glong *row) _VTE_GNUC_NONNULL(1);
-+void vte_terminal_set_cursor_position(VteTerminal *terminal,
-+				      long column, long row) _VTE_GNUC_NONNULL(1);
- 
- /* Add a matching expression, returning the tag the widget assigns to that
-  * expression. */
diff --git a/pkgs/desktops/gnome-3/3.16/core/yelp-tools/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp-tools/default.nix
deleted file mode 100644
index adf01c6df845..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/yelp-tools/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, libxml2, libxslt, itstool, gnome3, pkgconfig }:
-
-let
-  majVer = gnome3.version;
-in stdenv.mkDerivation rec {
-  name = "yelp-tools-${majVer}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/yelp-tools/${majVer}/${name}.tar.xz";
-    sha256 = "177qzvj5w019isdp41qxqcys2kc4sq2x6dqhqn6l9ipib8a6rxml";
-  };
-
-  buildInputs = [ libxml2 libxslt itstool gnome3.yelp_xsl pkgconfig ];
-
-  doCheck = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Yelp/Tools;
-    description = "Small programs that help you create, edit, manage, and publish your Mallard or DocBook documentation";
-    maintainers = with maintainers; [ iElectric ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix
deleted file mode 100644
index a76a2e3073ff..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/yelp-xsl/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, bash
-, itstool, libxml2, libxslt, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name = "yelp-xsl-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/yelp-xsl/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0jhpni4mmfvj3xf57rjm61nc8d0x66hz9gd1ywws5lh39g6fx59j";
-  };
-
-  doCheck = true;
-
-  buildInputs = [ pkgconfig intltool itstool libxml2 libxslt ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Yelp;
-    description = "Yelp's universal stylesheets for Mallard and DocBook";
-    maintainers = gnome3.maintainers;
-    license = [licenses.gpl2 licenses.lgpl2];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
deleted file mode 100644
index e48dcafb3cf8..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/yelp/default.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ stdenv, intltool, fetchurl, webkitgtk, pkgconfig, gtk3, glib
-, file, librsvg, gnome3, gdk_pixbuf, sqlite
-, bash, makeWrapper, itstool, libxml2, libxslt, icu, gst_all_1
-, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  name = "yelp-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/yelp/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1jk7aad1srykhgc3x0hd3q3dnlshmy1ak00alwjzaasxvy6hp0b0";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file";
-
-  buildInputs = [ pkgconfig gtk3 glib webkitgtk intltool itstool sqlite
-                  libxml2 libxslt icu file makeWrapper gnome3.yelp_xsl
-                  librsvg gdk_pixbuf gnome3.defaultIconTheme
-                  gnome3.gsettings_desktop_schemas wrapGAppsHook
-                  gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Yelp;
-    description = "The help viewer in Gnome";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix b/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix
deleted file mode 100644
index 9ce2726e7042..000000000000
--- a/pkgs/desktops/gnome-3/3.16/core/zenity/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, cairo, libxml2, libxslt, gnome3, pango
-, gnome_doc_utils, intltool, libX11, which, itstool }:
-
-stdenv.mkDerivation rec {
-
-  versionMajor = "3.16";
-  versionMinor = "3";
-
-  name = "zenity-${versionMajor}.${versionMinor}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/zenity/${versionMajor}/${name}.tar.xz";
-    sha256 = "1fhyzcmhrzqi10ks1gy8cxyqnbdfsnmqw3bkixnzrcf5zcb81qkz";
-  };
-
-  preBuild = ''
-    mkdir -p $out/include
-  '';
-
-  buildInputs = [ gnome3.gtk libxml2 libxslt libX11 itstool ];
-
-  nativeBuildInputs = [ pkgconfig intltool gnome_doc_utils which ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/default.nix b/pkgs/desktops/gnome-3/3.16/default.nix
deleted file mode 100644
index 6899ed855c7d..000000000000
--- a/pkgs/desktops/gnome-3/3.16/default.nix
+++ /dev/null
@@ -1,399 +0,0 @@
-{ pkgs }:
-
-let
-
-  pkgsFun = overrides:
-    let 
-      self = self_ // overrides;
-      self_ = with self; {
-
-  overridePackages = f:
-    let newself = pkgsFun (f newself self);
-    in newself;
-
-  callPackage = pkgs.newScope self;
-
-  corePackages = with gnome3; [
-    pkgs.desktop_file_utils pkgs.ibus
-    pkgs.shared_mime_info # for update-mime-database
-    glib # for gsettings
-    gtk3 # for gtk-update-icon-cache
-    glib_networking gvfs dconf gnome-backgrounds gnome_control_center
-    gnome-menus gnome_settings_daemon gnome_shell
-    gnome_themes_standard defaultIconTheme gnome-shell-extensions
-    pkgs.hicolor_icon_theme
-  ];
-
-  optionalPackages = with gnome3; [ baobab empathy eog epiphany evince
-    gucharmap nautilus totem vino yelp gnome-bluetooth
-    gnome-calculator gnome-contacts gnome-font-viewer gnome-screenshot
-    gnome-system-log gnome-system-monitor
-    gnome_terminal gnome-user-docs bijiben evolution file-roller gedit
-    gnome-clocks gnome-music gnome-tweak-tool gnome-photos
-    nautilus-sendto dconf-editor vinagre gnome-weather gnome-logs
-    gnome-characters gnome-calendar accerciser gnome-nettool
-    gnome-getting-started-docs
-  ];
-
-  gamesPackages = with gnome3; [ swell-foop lightsoff iagno
-    tali quadrapassel gnome-sudoku aisleriot five-or-more
-    four-in-a-row gnome-chess gnome-klotski gnome-mahjongg
-    gnome-mines gnome-nibbles gnome-robots gnome-tetravex
-    hitori gnome-taquin
-  ];
-
-  inherit (pkgs) glib gtk2 webkitgtk24x gtk3 gtkmm3 libcanberra;
-  inherit (pkgs.gnome2) ORBit2;
-  libsoup = pkgs.libsoup.override { gnomeSupport = true; };
-  libchamplain = pkgs.libchamplain.override { libsoup = libsoup; };
-  orbit = ORBit2;
-  gnome3 = self // { recurseForDerivations = false; };
-  clutter = pkgs.clutter_1_22;
-  clutter_gtk = pkgs.clutter_gtk_1_6.override { inherit clutter gtk3; };
-  clutter-gst_2 = pkgs.clutter-gst;
-  clutter-gst = pkgs.clutter-gst_3_0.override { inherit clutter; };
-  cogl = pkgs.cogl_1_20;
-  gtk = gtk3;
-  gtkmm = gtkmm3;
-  gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; };
-  vala = pkgs.vala_0_26;
-  gegl_0_3 = pkgs.gegl_0_3.override { inherit gtk; };
-
-  version = "3.16";
-  maintainers = with pkgs.lib.maintainers; [ lethalman jgeerds ];
-
-# Simplify the nixos module and gnome packages
-  defaultIconTheme = adwaita-icon-theme;
-
-#### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
-
-  adwaita-icon-theme = callPackage ./core/adwaita-icon-theme { };
-
-  baobab = callPackage ./core/baobab { };
-
-  caribou = callPackage ./core/caribou { };
-
-  dconf = callPackage ./core/dconf { };
-  dconf-editor = callPackage ./core/dconf-editor { };
-
-  empathy = callPackage ./core/empathy { 
-    webkitgtk = webkitgtk24x;
-    clutter-gst = pkgs.clutter-gst;
-  };
-
-  epiphany = callPackage ./core/epiphany { };
-
-  evince = callPackage ./core/evince { }; # ToDo: dbus would prevent compilation, enable tests
-
-  evolution_data_server = callPackage ./core/evolution-data-server { };
-
-  gconf = callPackage ./core/gconf { };
-
-  geocode_glib = callPackage ./core/geocode-glib { };
-
-  gcr = callPackage ./core/gcr { }; # ToDo: tests fail
-
-  gdm = callPackage ./core/gdm { };
-
-  gjs = callPackage ./core/gjs { };
-
-  glib_networking = pkgs.glib_networking.override {
-    inherit gsettings_desktop_schemas;
-  };
-
-  gnome-backgrounds = callPackage ./core/gnome-backgrounds { };
-
-  gnome-bluetooth = callPackage ./core/gnome-bluetooth { };
-
-  gnome-contacts = callPackage ./core/gnome-contacts { };
-
-  gnome_control_center = callPackage ./core/gnome-control-center { };
-
-  gnome-calculator = callPackage ./core/gnome-calculator { };
-
-  gnome_common = callPackage ./core/gnome-common { };
-
-  gnome_desktop = callPackage ./core/gnome-desktop { };
-
-  gnome-dictionary = callPackage ./core/gnome-dictionary { };
-
-  gnome-disk-utility = callPackage ./core/gnome-disk-utility { };
-
-  gnome-font-viewer = callPackage ./core/gnome-font-viewer { };
-
-  gnome-menus = callPackage ./core/gnome-menus { };
-
-  gnome_keyring = callPackage ./core/gnome-keyring { };
-
-  libgnome_keyring = callPackage ./core/libgnome-keyring { };
-
-  libgnomekbd = callPackage ./core/libgnomekbd { };
-
-  folks = callPackage ./core/folks { };
-
-  gnome_online_accounts = callPackage ./core/gnome-online-accounts { };
-
-  gnome-online-miners = callPackage ./core/gnome-online-miners { };
-
-  gnome_session = callPackage ./core/gnome-session { };
-
-  gnome_shell = callPackage ./core/gnome-shell { };
-
-  gnome-shell-extensions = callPackage ./core/gnome-shell-extensions { };
-
-  gnome-screenshot = callPackage ./core/gnome-screenshot { };
-
-  gnome_settings_daemon = callPackage ./core/gnome-settings-daemon { };
-
-  gnome-system-log = callPackage ./core/gnome-system-log { };
-
-  gnome-system-monitor = callPackage ./core/gnome-system-monitor { };
-
-  gnome_terminal = callPackage ./core/gnome-terminal { };
-
-  gnome_themes_standard = callPackage ./core/gnome-themes-standard { };
-
-  gnome-user-docs = callPackage ./core/gnome-user-docs { };
-
-  gnome-user-share = callPackage ./core/gnome-user-share { };
-
-  grilo = callPackage ./core/grilo { };
-
-  grilo-plugins = callPackage ./core/grilo-plugins { };
-
-  gsettings_desktop_schemas = callPackage ./core/gsettings-desktop-schemas { };
-
-  gsound = callPackage ./core/gsound { };
-
-  gtksourceview = callPackage ./core/gtksourceview { };
-
-  gucharmap = callPackage ./core/gucharmap { };
-
-  gvfs = pkgs.gvfs.override { gnome = gnome3; gnomeSupport = true; };
-
-  eog = callPackage ./core/eog { };
-
-  libcroco = callPackage ./core/libcroco {};
-
-  libgee = callPackage ./core/libgee { };
-  libgee_1 = callPackage ./core/libgee/libgee-1.nix { };
-
-  libgdata = callPackage ./core/libgdata { };
-
-  libgxps = callPackage ./core/libgxps { };
-
-  libpeas = callPackage ./core/libpeas {};
-
-  libgweather = callPackage ./core/libgweather { };
-
-  libzapojit = callPackage ./core/libzapojit { };
-
-  mutter = callPackage ./core/mutter { };
-
-  nautilus = callPackage ./core/nautilus { };
-
-  networkmanager_openvpn = pkgs.networkmanager_openvpn.override {
-    inherit gnome3;
-  };
-
-  networkmanager_pptp = pkgs.networkmanager_pptp.override {
-    inherit gnome3;
-  };
-
-  networkmanager_vpnc = pkgs.networkmanager_vpnc.override {
-    inherit gnome3;
-  };
-
-  networkmanager_openconnect = pkgs.networkmanager_openconnect.override {
-    inherit gnome3;
-  };
-
-  networkmanager_l2tp = pkgs.networkmanager_l2tp.override {
-    inherit gnome3;
-  };
-
-  networkmanagerapplet = pkgs.networkmanagerapplet.override {
-    inherit gnome3 gsettings_desktop_schemas glib_networking;
-  };
-
-  rest = callPackage ./core/rest { };
-
-  sushi = callPackage ./core/sushi {
-    webkitgtk = webkitgtk24x;
-    clutter-gst = pkgs.clutter-gst;
-  };
-
-  totem = callPackage ./core/totem { };
-
-  totem-pl-parser = callPackage ./core/totem-pl-parser { };
-
-  tracker = callPackage ./core/tracker { giflib = pkgs.giflib_5_0; };
-
-  vte = callPackage ./core/vte { };
-
-  vte_290 = callPackage ./core/vte/2.90.nix { };
-
-  vte-select-text = vte.override { selectTextPatch = true; };
-
-  vino = callPackage ./core/vino { };
-
-  yelp = callPackage ./core/yelp { 
-    webkitgtk = webkitgtk24x;
-  };
-
-  yelp_xsl = callPackage ./core/yelp-xsl { };
-
-  yelp_tools = callPackage ./core/yelp-tools { };
-
-  zenity = callPackage ./core/zenity { };
-
-
-#### Apps (http://ftp.acc.umu.se/pub/GNOME/apps/)
-
-  accerciser = callPackage ./apps/accerciser { };
-
-  bijiben = callPackage ./apps/bijiben {
-    webkitgtk = webkitgtk24x;
-  };
-
-  cheese = callPackage ./apps/cheese { };
-
-  evolution = callPackage ./apps/evolution {
-    webkitgtk = webkitgtk24x;
-  };
-
-  file-roller = callPackage ./apps/file-roller { };
-
-  gedit = callPackage ./apps/gedit { };
-
-  glade = callPackage ./apps/glade { };
-
-  gnome-boxes = callPackage ./apps/gnome-boxes {
-    gtkvnc = pkgs.gtkvnc.override { enableGTK3 = true; };
-    spice_gtk = pkgs.spice_gtk.override { enableGTK3 = true; };
-  };
-
-  gnome-calendar = callPackage ./apps/gnome-calendar { };
-
-  gnome-characters = callPackage ./apps/gnome-characters { };
-
-  gnome-clocks = callPackage ./apps/gnome-clocks { };
-
-  gnome-documents = callPackage ./apps/gnome-documents { };
-
-  gnome-getting-started-docs = callPackage ./apps/gnome-getting-started-docs { };
-
-  gnome-logs = callPackage ./apps/gnome-logs { };
-
-  gnome-maps = callPackage ./apps/gnome-maps { };
-
-  gnome-music = callPackage ./apps/gnome-music { };
-
-  gnome-nettool = callPackage ./apps/gnome-nettool { };
-
-  gnome-photos = callPackage ./apps/gnome-photos {
-    gegl = gegl_0_3;
-  };
-
-  gnome-weather = callPackage ./apps/gnome-weather { };
-
-  nautilus-sendto = callPackage ./apps/nautilus-sendto { };
-
-  polari = callPackage ./apps/polari { };
-
-  # scrollkeeper replacement
-  rarian = callPackage ./desktop/rarian { };
-
-  seahorse = callPackage ./apps/seahorse { };
-
-  vinagre = callPackage ./apps/vinagre { };
-
-#### Dev http://ftp.gnome.org/pub/GNOME/devtools/
-
-  anjuta = callPackage ./devtools/anjuta { };
-
-  devhelp = callPackage ./devtools/devhelp {
-    webkitgtk = webkitgtk24x;
-  };
-
-  gdl = callPackage ./devtools/gdl { };
-
-  gnome-devel-docs = callPackage ./devtools/gnome-devel-docs { };
-
-#### Games
-
-  aisleriot = callPackage ./games/aisleriot { };
-
-  five-or-more = callPackage ./games/five-or-more { };
-
-  four-in-a-row = callPackage ./games/four-in-a-row { };
-
-  gnome-chess = callPackage ./games/gnome-chess { };
-
-  gnome-klotski = callPackage ./games/gnome-klotski { };
-
-  gnome-mahjongg = callPackage ./games/gnome-mahjongg { };
-
-  gnome-mines = callPackage ./games/gnome-mines { };
-
-  gnome-nibbles = callPackage ./games/gnome-nibbles { };
-
-  gnome-robots = callPackage ./games/gnome-robots { };
-
-  gnome-sudoku = callPackage ./games/gnome-sudoku { };
-
-  gnome-taquin = callPackage ./games/gnome-taquin { };
-
-  gnome-tetravex = callPackage ./games/gnome-tetravex { };
-
-  hitori = callPackage ./games/hitori { };
-
-  iagno = callPackage ./games/iagno { };
-
-  lightsoff = callPackage ./games/lightsoff { };
-
-  swell-foop = callPackage ./games/swell-foop { };
-
-  tali = callPackage ./games/tali { };
-
-  quadrapassel = callPackage ./games/quadrapassel { };
-
-#### Misc -- other packages on http://ftp.gnome.org/pub/GNOME/sources/
-
-  california = callPackage ./misc/california { };
-
-  geary = callPackage ./misc/geary { 
-    webkitgtk = webkitgtk24x;
-  };
-
-  gfbgraph = callPackage ./misc/gfbgraph { };
-
-  gitg = callPackage ./misc/gitg { 
-    webkitgtk = webkitgtk24x;
-    libgit2 = pkgs.libgit2_0_21;
-  };
-
-  libgda = callPackage ./misc/libgda { };
-
-  libgit2-glib = callPackage ./misc/libgit2-glib {
-    libgit2 = pkgs.libgit2_0_21.override { libssh2 = null; };
-  };
-
-  libmediaart = callPackage ./misc/libmediaart { };
-
-  gexiv2 = callPackage ./misc/gexiv2 { };
-
-  gnome-tweak-tool = callPackage ./misc/gnome-tweak-tool { };
-
-  gpaste = callPackage ./misc/gpaste { };
-
-  gtkhtml = callPackage ./misc/gtkhtml { };
-
-  pomodoro = callPackage ./misc/pomodoro { };
-
-  gnome-video-effects = callPackage ./misc/gnome-video-effects { };
-
-    };
-  in self; # pkgsFun
-
-in pkgsFun {}
diff --git a/pkgs/desktops/gnome-3/3.16/desktop/rarian/default.nix b/pkgs/desktops/gnome-3/3.16/desktop/rarian/default.nix
deleted file mode 100644
index a1b38b21869a..000000000000
--- a/pkgs/desktops/gnome-3/3.16/desktop/rarian/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{stdenv, fetchurl, pkgconfig, perl, perlXMLParser, libxml2, libxslt, docbook_xml_dtd_42}:
-
-stdenv.mkDerivation rec {
-  name = "rarian-0.8.1";
-  src = fetchurl {
-    url = "mirror://gnome/sources/rarian/0.8/${name}.tar.bz2";
-    sha256 = "aafe886d46e467eb3414e91fa9e42955bd4b618c3e19c42c773026b205a84577";
-  };
-
-  buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
-  configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix
deleted file mode 100644
index e488ab640472..000000000000
--- a/pkgs/desktops/gnome-3/3.16/devtools/anjuta/default.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, flex, bison, libxml2, intltool,
-  itstool, python, makeWrapper }:
-
-let
-  major = gnome3.version;
-  minor = "0";
-
-in stdenv.mkDerivation rec {
-  version = "${major}.${minor}";
-  name = "anjuta-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/anjuta/${major}/${name}.tar.xz";
-    sha256 = "0g4lv6rzkwfz2wp4fg97qlbvyfh2k9gl7k7lidazaikvnc0jlhvp";
-  };
-
-  enableParallelBuilding = true;
-
-  buildInputs = [ pkgconfig flex bison gtk3 libxml2 gnome3.gjs gnome3.gdl
-    gnome3.libgda gnome3.gtksourceview intltool itstool python makeWrapper ];
-
-  preFixup = ''
-    wrapProgram $out/bin/anjuta \
-      --prefix XDG_DATA_DIRS : \
-        "$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Software development studio";
-    homepage = http://anjuta.org/;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix
deleted file mode 100644
index d4dfb7f0a8c1..000000000000
--- a/pkgs/desktops/gnome-3/3.16/devtools/devhelp/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, webkitgtk, intltool }:
-
-stdenv.mkDerivation rec {
-  name = "devhelp-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/devhelp/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0i8kyh86hzwxs8dm047ivghl2b92vigdxa3x4pk4ha0whpk38g37";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook webkitgtk intltool gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://live.gnome.org/devhelp;
-    description = "API documentation browser for GNOME";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix
deleted file mode 100644
index aa7aa8b469d0..000000000000
--- a/pkgs/desktops/gnome-3/3.16/devtools/gdl/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, gnome3, intltool }:
-
-let
-  major = gnome3.version;
-  minor = "0";
-
-in stdenv.mkDerivation rec {
-  version = "${major}.${minor}";
-  name = "gdl-${version}";
-
-  src = fetchurl {
-    url = "https://download.gnome.org/sources/gdl/${major}/${name}.tar.xz";
-    sha256 = "107zwvs913jr5hb59a4a8hsk19yinsicr2ma4vm216nzyl2f3jrl";
-  };
-
-  buildInputs = [ pkgconfig libxml2 gtk3 intltool ];
-
-  meta = with stdenv.lib; {
-    description = "Gnome docking library";
-    homepage = https://developer.gnome.org/gdl/;
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/devtools/gnome-devel-docs/default.nix b/pkgs/desktops/gnome-3/3.16/devtools/gnome-devel-docs/default.nix
deleted file mode 100644
index 0daa0405b699..000000000000
--- a/pkgs/desktops/gnome-3/3.16/devtools/gnome-devel-docs/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, gnome3, intltool, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-devel-docs-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-devel-docs/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1jkh40ya5mqss57p27b1hv77x5qis4zc377pyvzqa5wkzrvd0nls";
-  };
-
-  buildInputs = [ intltool itstool libxml2 ];
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/GNOME/gnome-devel-docs;
-    description = "Developer documentation for GNOME";
-    maintainers = gnome3.maintainers;
-    license = licenses.fdl12;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/aisleriot/default.nix b/pkgs/desktops/gnome-3/3.16/games/aisleriot/default.nix
deleted file mode 100644
index 94f4e5e4d04b..000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/aisleriot/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, intltool, itstool, gtk3
-, wrapGAppsHook, gconf, librsvg, libxml2, desktop_file_utils
-, guile, libcanberra_gtk3 }:
-
-stdenv.mkDerivation rec {
-  name = "aisleriot-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/aisleriot/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0rncdg21ys7ik971yw75qbawq89mikbh4dq5mg2msmrl6xsgv0zl";
-  };
-
-  configureFlags = [ "--with-card-theme-formats=svg" ];
-
-  buildInputs = [ pkgconfig intltool itstool gtk3 wrapGAppsHook gconf
-                  librsvg libxml2 desktop_file_utils guile libcanberra_gtk3 ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Aisleriot;
-    description = "A collection of patience games written in guile scheme";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix b/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix
deleted file mode 100644
index 70e7184b3387..000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/five-or-more/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, intltool, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "five-or-more-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/five-or-more/${gnome3.version}/${name}.tar.xz";
-    sha256 = "018723w2q0fijvxs1kafrxg39f6ank6x51nfbf3mhn9q7jz9k2g3";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
-    gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Five_or_more;
-    description = "Remove colored balls from the board by forming lines";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix b/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix
deleted file mode 100644
index 292a54bf1938..000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/four-in-a-row/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, itstool, libcanberra_gtk3, librsvg, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "four-in-a-row-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/four-in-a-row/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1bm5chsvpw0jg1xh9g2n1w5i0fvxs50aqkgmrla9cpawsvzfshmz";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool libcanberra_gtk3 librsvg
-    libxml2 gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Four-in-a-row;
-    description = "Make lines of the same color to win";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix
deleted file mode 100644
index e80c6691e202..000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-chess/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, intltool, itstool, librsvg, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-chess-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-chess/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0j1vvf1myki3bafsqv52q59qk1nhf1636nrb15fpfvm88p3b8wwg";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2
-    gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Chess;
-    description = "Play the classic two-player boardgame of chess";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix
deleted file mode 100644
index cab2f194d495..000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-klotski/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libxml2, intltool, itstool }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-klotski-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-klotski/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0a64935c7pp51jhaf29q9zlx3lamj7zrhyff7clvv0w8v1w6gpax";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libxml2
-    gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Klotski;
-    description = "Slide blocks to solve the puzzle";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix
deleted file mode 100644
index 73cb0cf6cebe..000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-mahjongg/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, intltool, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-mahjongg-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-mahjongg/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1jbd3gbmxqf36as9xsiarad575l4rpcfv6w1pn192r02aj3hgipj";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
-    gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Mahjongg;
-    description = "Disassemble a pile of tiles by removing matching pairs";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix
deleted file mode 100644
index 92aa5bd72196..000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-mines/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, intltool, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-mines-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-mines/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0f0496nhirvpw4zk8bcl24rb2v20cm3gw8d5ybmch42mscmjrb0p";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook librsvg intltool itstool libxml2
-    gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Mines;
-    description = "Clear hidden mines from a minefield";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix
deleted file mode 100644
index 673edff645dc..000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-nibbles/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libcanberra_gtk3, clutter_gtk, intltool, itstool
-, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-nibbles-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-nibbles/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1384hc7vx3i1jkmc1pw1cjh61jymq9441ci1k06vjz62r9as1nmx";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
-    librsvg libcanberra_gtk3 clutter_gtk gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Nibbles;
-    description = "Guide a worm around a maze";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix
deleted file mode 100644
index 306a9e40852a..000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-robots/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-robots-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-robots/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0dhzl1rhn4ysp3s3j0lxsiw64acz0w1n1bljrfln9s07x8nj17nx";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool librsvg libcanberra_gtk3
-    libxml2 gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Robots;
-    description = "Avoid the robots and make them crash into each other";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-sudoku/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-sudoku/default.nix
deleted file mode 100644
index eda3cf1f84e3..000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-sudoku/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gtk3, gnome3, wrapGAppsHook
-, json_glib, qqwing, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-sudoku-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-sudoku/${gnome3.version}/${name}.tar.xz";
-    sha256 = "1b9xwldzjjpkwb2na9cbs8z4gv8dlj9dm574gybdz466190lrsxv";
-  };
-
-  buildInputs = [ pkgconfig intltool wrapGAppsHook gtk3 gnome3.libgee
-                  json_glib qqwing itstool libxml2 ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Sudoku;
-    description = "Test your logic skills in this number grid puzzle";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix
deleted file mode 100644
index 2a2f97d1e49d..000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-taquin/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, librsvg, libcanberra_gtk3, intltool, itstool, libxml2 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-taquin-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-taquin/${gnome3.version}/${name}.tar.xz";
-    sha256 = "024a1ing1iclmyhi5vlps6xna84vgy7s098h9yvzq43fsahmx8pi";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook librsvg libcanberra_gtk3
-    intltool itstool libxml2 gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Taquin;
-    description = "Move tiles so that they reach their places";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix b/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix
deleted file mode 100644
index 2b577799307c..000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/gnome-tetravex/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, libxml2, intltool, itstool }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-tetravex-${gnome3.version}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-tetravex/${gnome3.version}/${name}.tar.xz";
-    sha256 = "07cmcmrd5fj8vm682894gra2vj8jwx01n3ggjinl93yv4gwpplz9";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2 gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Tetravex;
-    description = "Complete the puzzle by matching numbered tiles";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix b/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix
deleted file mode 100644
index bd6be7d43c58..000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/hitori/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gnome3, gtk3, wrapGAppsHook
-, libxml2, intltool, itstool }:
-
-stdenv.mkDerivation rec {
-  name = "hitori-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/hitori/${gnome3.version}/${name}.tar.xz";
-    sha256 = "07pm3xl05jgb8x151k1j2ap57dmfvk2nkz9dmqnn5iywfigsysd1";
-  };
-
-  buildInputs = [
-    pkgconfig gtk3 wrapGAppsHook intltool itstool libxml2
-    gnome3.defaultIconTheme
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Hitori;
-    description = "GTK+ application to generate and let you play games of Hitori";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix b/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix
deleted file mode 100644
index b5fab4a0e6f7..000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/iagno/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook
-, intltool, itstool, libcanberra_gtk3, libxml2, dconf }:
-
-stdenv.mkDerivation rec {
-  name = "iagno-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/iagno/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0pg4sx277idfab3qxxn8c7r6gpdsdw5br0x7fxhxqascvvx8my1k";
-  };
-
-  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
-                  dconf libxml2 libcanberra_gtk3 wrapGAppsHook itstool intltool ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Iagno;
-    description = "Computer version of the game Reversi, more popularly called Othello";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix b/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix
deleted file mode 100644
index 313614f1744d..000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/lightsoff/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, wrapGAppsHook
-, intltool, itstool, clutter, clutter_gtk, libxml2, dconf }:
-
-stdenv.mkDerivation rec {
-  name = "lightsoff-${gnome3.version}.1.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/lightsoff/${gnome3.version}/${name}.tar.xz";
-    sha256 = "00a2jv7wr6fxrzk7avwa0wspz429ad7ri7v95jv31nqn5q73y4c0";
-  };
-
-  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg dconf
-                  libxml2 clutter clutter_gtk wrapGAppsHook itstool intltool ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Lightsoff;
-    description = "Puzzle game, where the objective is to turn off all of the tiles on the board";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/quadrapassel/default.nix b/pkgs/desktops/gnome-3/3.16/games/quadrapassel/default.nix
deleted file mode 100644
index 98cfd55a31eb..000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/quadrapassel/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf
-, librsvg, libcanberra_gtk3
-, intltool, itstool, libxml2, clutter, clutter_gtk, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  name = "quadrapassel-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/quadrapassel/${gnome3.version}/${name}.tar.xz";
-    sha256 = "17c6ddjgmakj615ahnrmrzayjxc2ylr8dddfzi9py875q5vk7grx";
-  };
-
-  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
-                  libcanberra_gtk3 itstool intltool clutter
-                  libxml2 clutter_gtk wrapGAppsHook ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Quadrapassel;
-    description = "Classic falling-block game, Tetris";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix b/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix
deleted file mode 100644
index 510e6d6d1a89..000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/swell-foop/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf, librsvg, dconf
-, clutter, clutter_gtk, intltool, itstool, libxml2, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  name = "swell-foop-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/swell-foop/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0bhjmjcjsqdb89shs0ygi6ps5hb3lk8nhrbjnsjk4clfqbw0jzwf";
-  };
-
-  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
-                  dconf wrapGAppsHook itstool intltool clutter clutter_gtk libxml2 ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = "https://wiki.gnome.org/Apps/Swell%20Foop";
-    description = "Puzzle game, previously known as Same GNOME";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/games/tali/default.nix b/pkgs/desktops/gnome-3/3.16/games/tali/default.nix
deleted file mode 100644
index a38d8845bef0..000000000000
--- a/pkgs/desktops/gnome-3/3.16/games/tali/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, gnome3, gdk_pixbuf
-, librsvg, intltool, itstool, libxml2, wrapGAppsHook }:
-
-stdenv.mkDerivation rec {
-  name = "tali-${gnome3.version}.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/tali/${gnome3.version}/${name}.tar.xz";
-    sha256 = "10cfgxiqg38z5ngkiznglxjgm1552mjvfw4bjhjic0yi5cvdr6dg";
-  };
-
-  buildInputs = [ pkgconfig gtk3 gnome3.defaultIconTheme gdk_pixbuf librsvg
-                  libxml2 itstool intltool wrapGAppsHook ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Tali;
-    description = "Sort of poker with dice and less money";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch b/pkgs/desktops/gnome-3/3.16/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
deleted file mode 100644
index c229cc96094f..000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/california/0002-Build-with-evolution-data-server-3.13.90.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 8a94642..1ca6426 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -27,7 +27,7 @@ AC_SUBST(LDFLAGS)
- GLIB_REQUIRED=2.38.0
- GTK_REQUIRED=3.12.2
- GEE_REQUIRED=0.10.5
--ECAL_REQUIRED=3.8.5
-+ECAL_REQUIRED=3.13.90
- LIBSOUP_REQUIRED=2.44
- GDATA_REQUIRED=0.14.0
- GOA_REQUIRED=3.8.3
-diff --git a/src/backing/eds/backing-eds-calendar-source.vala b/src/backing/eds/backing-eds-calendar-source.vala
-index ee6a572..5009b5d 100644
---- a/src/backing/eds/backing-eds-calendar-source.vala
-+++ b/src/backing/eds/backing-eds-calendar-source.vala
-@@ -256,7 +256,7 @@ internal class EdsCalendarSource : CalendarSource {
-
-     // Invoked by EdsStore prior to making it available outside of unit
-     internal async void open_async(Cancellable? cancellable) throws Error {
--        client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS,
-+        client = (E.CalClient) yield E.CalClient.connect(eds_source, E.CalClientSourceType.EVENTS, 1,
-             cancellable);
-
-         client.bind_property("readonly", this, PROP_READONLY, BindingFlags.SYNC_CREATE);
-diff --git a/vapi/libecal-1.2.vapi b/vapi/libecal-1.2.vapi
-index 6ead3ec..46fd711 100644
---- a/vapi/libecal-1.2.vapi
-+++ b/vapi/libecal-1.2.vapi
-@@ -23,7 +23,7 @@ namespace E {
-		public bool check_save_schedules ();
-		public static bool check_timezones (iCal.icalcomponent comp, GLib.List comps, GLib.Callback tzlookup, void* ecalclient, GLib.Cancellable cancellable) throws GLib.Error;
-		[CCode (finish_name = "e_cal_client_connect_finish")]
--		public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error;
-+		public static async unowned E.Client connect (E.Source source, E.CalClientSourceType source_type, uint32 wait_for_connected_seconds, GLib.Cancellable cancellable) throws GLib.Error;
-		public static unowned E.Client connect_sync (E.Source source, E.CalClientSourceType source_type, GLib.Cancellable cancellable) throws GLib.Error;
-		[CCode (finish_name = "e_cal_client_create_object_finish")]
-		public async void create_object (iCal.icalcomponent icalcomp, GLib.Cancellable? cancellable, out string out_uid) throws GLib.Error;
diff --git a/pkgs/desktops/gnome-3/3.16/misc/california/default.nix b/pkgs/desktops/gnome-3/3.16/misc/california/default.nix
deleted file mode 100644
index 4bdeeb23a91e..000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/california/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala, makeWrapper
-, gnome3, glib, libsoup, libgdata, sqlite, itstool, xdg_utils }:
-
-let
-  majorVersion = "0.4";
-in
-stdenv.mkDerivation rec {
-  name = "california-${majorVersion}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/california/${majorVersion}/${name}.tar.xz";
-    sha256 = "1dky2kllv469k8966ilnf4xrr7z35pq8mdvs7kwziy59cdikapxj";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ makeWrapper intltool pkgconfig vala glib gtk3 gnome3.libgee
-    libsoup libgdata gnome3.gnome_online_accounts gnome3.evolution_data_server
-    sqlite itstool xdg_utils gnome3.gsettings_desktop_schemas ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/california" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.defaultIconTheme}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH:${gnome3.gsettings_desktop_schemas}/share"
-  '';
-
-  enableParallelBuilding = true;
-
-  # Apply fedoras patch to build with evolution-data-server >3.13
-  patches = [ ./0002-Build-with-evolution-data-server-3.13.90.patch ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/California;
-    description = "Calendar application for GNOME 3";
-    maintainers = with maintainers; [ pSub ];
-    license = licenses.lgpl21;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
deleted file mode 100644
index 9ed8494098d1..000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/geary/default.nix
+++ /dev/null
@@ -1,53 +0,0 @@
-{ stdenv, fetchurl, intltool, pkgconfig, gtk3, vala
-, makeWrapper, gdk_pixbuf, cmake, desktop_file_utils
-, libnotify, libcanberra, libsecret, gmime
-, libpthreadstubs, sqlite
-, gnome3, librsvg, gnome_doc_utils, webkitgtk }:
-
-let
-  majorVersion = "0.10";
-  minorVersion = "0";
-in
-stdenv.mkDerivation rec {
-  name = "geary-${majorVersion}.${minorVersion}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/geary/${majorVersion}/${name}.tar.xz";
-    sha256 = "46197a5a1b8b040adcee99082dbfd9fff9ca804e3bf0055a2e90b13214bdbca5";
-  };
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  buildInputs = [ intltool pkgconfig gtk3 makeWrapper cmake desktop_file_utils gnome_doc_utils
-                  vala webkitgtk libnotify libcanberra gnome3.libgee libsecret gmime sqlite
-                  libpthreadstubs gnome3.gsettings_desktop_schemas gnome3.gcr
-                  gdk_pixbuf librsvg gnome3.defaultIconTheme ];
-
-  preConfigure = ''
-    substituteInPlace src/CMakeLists.txt --replace '`pkg-config --variable=girdir gobject-introspection-1.0`' '${webkitgtk}/share/gir-1.0'
-  '';
-
-  postInstall = ''
-    mkdir -p $out/share/gsettings-schemas/${name}/
-    mv $out/share/glib-2.0 $out/share/gsettings-schemas/${name}
-  '';
-
-  preFixup = ''
-    wrapProgram "$out/bin/geary" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  enableParallelBuilding = true;
-
-  # patches = [ ./disable_valadoc.patch ];
-  patchFlags = "-p0";
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Apps/Geary;
-    description = "Mail client for GNOME 3";
-    maintainers = gnome3.maintainers;
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/geary/disable_valadoc.patch b/pkgs/desktops/gnome-3/3.16/misc/geary/disable_valadoc.patch
deleted file mode 100644
index e65c0dea7472..000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/geary/disable_valadoc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/CMakeLists.txt.orig	2014-05-23 14:41:20.809160364 +0200
-+++ src/CMakeLists.txt	2014-05-23 14:41:29.240261581 +0200
-@@ -696,21 +696,6 @@
-         ${CMAKE_COMMAND} -E copy geary-mailer ${CMAKE_BINARY_DIR}/
- )
- 
--# Valadoc
--#################################################
--foreach(pkg ${ENGINE_PACKAGES})
--    list(APPEND valadoc_pkg_opts "--pkg=${pkg}")
--endforeach(pkg ${ENGINE_PACKAGES})
--
--include(FindValadoc)
--add_custom_target(
--    valadoc
--    WORKING_DIRECTORY
--        ${CMAKE_SOURCE_DIR}/src
--    COMMAND
--        ${VALADOC_EXECUTABLE} --force --no-protected -b ${CMAKE_CURRENT_SOURCE_DIR} -o ${CMAKE_SOURCE_DIR}/valadoc --package-name=geary --package-version=${VERSION} ${ENGINE_SRC} ${valadoc_pkg_opts} --vapidir=${CMAKE_SOURCE_DIR}/bindings/vapi
--)
--
- ## Make clean: remove copied files
- ##################################################
- set_property(
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix
deleted file mode 100644
index 7cea9cd8d150..000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/gexiv2/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, exiv2, glib, libtool, m4, gnome3 }:
-
-let
-  majorVersion = "0.10";
-in
-stdenv.mkDerivation rec {
-  name = "gexiv2-${version}";
-  version = "${majorVersion}.3";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gexiv2/${majorVersion}/${name}.tar.xz";
-    sha256 = "390cfb966197fa9f3f32200bc578d7c7f3560358c235e6419657206a362d3988";
-  };
-
-  preConfigure = ''
-    patchShebangs .
-  '';
-
-  buildInputs = [ pkgconfig glib libtool m4 ];
-  propagatedBuildInputs = [ exiv2 ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/gexiv2;
-    description = "GObject wrapper around the Exiv2 photo metadata library";
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix
deleted file mode 100644
index e85b087fa41f..000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/gfbgraph/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, intltool, fetchurl, pkgconfig, glib
-, gnome3, libsoup, json_glib }:
-
-stdenv.mkDerivation rec {
-  name = "gfbgraph-0.2.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gfbgraph/0.2/${name}.tar.xz";
-    sha256 = "66c7b1c951863565c179d0b4b5207f27b3b36f80afed9f6a9acfc5fc3ae775d4";
-  };
-
-  buildInputs = [ pkgconfig glib gnome3.gnome_online_accounts ];
-  propagatedBuildInputs = [ libsoup json_glib gnome3.rest ];
-
-  enableParallelBuilding = true;
-
-  meta = with stdenv.lib; {
-    description = "GLib/GObject wrapper for the Facebook Graph API";
-    maintainers = gnome3.maintainers;
-    license = licenses.lgpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix
deleted file mode 100644
index 998f1f5f735f..000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/gitg/default.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{ stdenv, fetchurl, fetchgit, vala, intltool, libgit2, pkgconfig, gtk3, glib
-, json_glib, webkitgtk,  makeWrapper, libpeas, bash, gobjectIntrospection
-, gnome3, gtkspell3, shared_mime_info, libgee, libgit2-glib, librsvg }:
-
-# TODO: icons and theme still does not work
-# use packaged gnome3.adwaita-icon-theme 
-
-let
-  majorVersion = "3.14";
-in
-stdenv.mkDerivation rec {
-  name = "gitg-${majorVersion}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gitg/${majorVersion}/${name}.tar.xz";
-    sha256 = "8e45a7198896eedd829a20ff8de437a08869d30005638114ca87abd42ffea11b";
-  };
-
-  preCheck = ''
-    substituteInPlace tests/libgitg/test-commit.c --replace "/bin/bash" "${bash}/bin/bash"
-  '';
-  doCheck = true;
-
-  makeFlags = "INTROSPECTION_GIRDIR=$(out)/share/gir-1.0/ INTROSPECTION_TYPELIBDIR=$(out)/lib/girepository-1.0";
-
-  propagatedUserEnvPkgs = [ shared_mime_info
-                            gnome3.gnome_themes_standard ];
-
-  buildInputs = [ vala intltool libgit2 pkgconfig gtk3 glib json_glib webkitgtk libgee libpeas
-                  libgit2-glib gtkspell3 gnome3.gsettings_desktop_schemas gnome3.gtksourceview librsvg
-                  gobjectIntrospection makeWrapper gnome3.adwaita-icon-theme ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gitg" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Apps/Gitg;
-    description = "GNOME GUI client to view git repositories";
-    maintainers = with maintainers; [ iElectric ];
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
deleted file mode 100644
index d5a6f90e33db..000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0001-Search-for-themes-and-icons-in-system-data-dirs.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From 175218579aa2b4f4974ff1cf4fd1ac93082a4714 Mon Sep 17 00:00:00 2001
-From: Jascha Geerds <jg@ekby.de>
-Date: Sat, 1 Aug 2015 21:01:11 +0200
-Subject: [PATCH 1/1] Search for themes and icons in system data dirs
-
----
- gtweak/tweaks/tweak_group_interface.py | 17 ++++-------------
- gtweak/tweaks/tweak_group_keymouse.py  |  7 ++-----
- gtweak/utils.py                        | 17 +++++++++++++++++
- 3 files changed, 23 insertions(+), 18 deletions(-)
-
-diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py
-index ed2ad5f..a319907 100644
---- a/gtweak/tweaks/tweak_group_interface.py
-+++ b/gtweak/tweaks/tweak_group_interface.py
-@@ -26,7 +26,7 @@ from gi.repository import Gtk
- from gi.repository import GLib
- 
- import gtweak
--from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file
-+from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs
- from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE
- from gtweak.gshellwrapper import GnomeShellFactory
- from gtweak.gsettings import GSettingsSetting
-@@ -46,10 +46,7 @@ class GtkThemeSwitcher(GSettingsComboTweak):
- 
-     def _get_valid_themes(self):
-         """ Only shows themes that have variations for gtk+-3 and gtk+-2 """
--        dirs = ( os.path.join(gtweak.DATA_DIR, "themes"),
--                 os.path.join(GLib.get_user_data_dir(), "themes"),
--                 os.path.join(os.path.expanduser("~"), ".themes"))
--        valid = walk_directories(dirs, lambda d:
-+        valid = walk_directories(get_resource_dirs('themes'), lambda d:
-                     os.path.exists(os.path.join(d, "gtk-2.0")) and \
-                         os.path.exists(os.path.join(d, "gtk-3.0")))
-         return valid
-@@ -64,10 +61,7 @@ class IconThemeSwitcher(GSettingsComboTweak):
-             **options)
- 
-     def _get_valid_icon_themes(self):
--        dirs = ( os.path.join(gtweak.DATA_DIR, "icons"),
--                 os.path.join(GLib.get_user_data_dir(), "icons"),
--                 os.path.join(os.path.expanduser("~"), ".icons"))
--        valid = walk_directories(dirs, lambda d:
-+        valid = walk_directories(get_resource_dirs("icons"), lambda d:
-                     os.path.isdir(d) and \
- 			os.path.exists(os.path.join(d, "index.theme")))
-         return valid
-@@ -82,10 +76,7 @@ class CursorThemeSwitcher(GSettingsComboTweak):
-             **options)
- 
-     def _get_valid_cursor_themes(self):
--        dirs = ( os.path.join(gtweak.DATA_DIR, "icons"),
--                 os.path.join(GLib.get_user_data_dir(), "icons"),
--                 os.path.join(os.path.expanduser("~"), ".icons"))
--        valid = walk_directories(dirs, lambda d:
-+        valid = walk_directories(get_resource_dirs("icons"), lambda d:
-                     os.path.isdir(d) and \
-                         os.path.exists(os.path.join(d, "cursors")))
-         return valid
-diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py
-index b56a4f4..3486098 100644
---- a/gtweak/tweaks/tweak_group_keymouse.py
-+++ b/gtweak/tweaks/tweak_group_keymouse.py
-@@ -20,7 +20,7 @@ import os.path
- from gi.repository import GLib
- 
- import gtweak
--from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default
-+from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs
- from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title
- 
- class PrimaryPasteTweak(GetterSetterSwitchTweak):
-@@ -47,10 +47,7 @@ class KeyThemeSwitcher(GSettingsComboTweak):
-             **options)
- 
-     def _get_valid_key_themes(self):
--        dirs = ( os.path.join(gtweak.DATA_DIR, "themes"),
--                 os.path.join(GLib.get_user_data_dir(), "themes"),
--                 os.path.join(os.path.expanduser("~"), ".themes"))
--        valid = walk_directories(dirs, lambda d:
-+        valid = walk_directories(get_resource_dirs("themes"), lambda d:
-                     os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \
-                     os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc")))
-         return valid
-diff --git a/gtweak/utils.py b/gtweak/utils.py
-index 3d20425..0fcb51d 100644
---- a/gtweak/utils.py
-+++ b/gtweak/utils.py
-@@ -21,6 +21,7 @@ import tempfile
- import shutil
- import subprocess
- import glob
-+import itertools
- 
- import gtweak
- from gtweak.gsettings import GSettingsSetting
-@@ -114,6 +115,22 @@ def execute_subprocess(cmd_then_args, block=True):
-         stdout, stderr = p.communicate()
-         return stdout, stderr, p.returncode
- 
-+def get_resource_dirs(resource):
-+    """Returns a list of all known resource dirs for a given resource.
-+
-+    :param str resource:
-+        Name of the resource (e.g. "themes")
-+    :return:
-+        A list of resource dirs
-+    """
-+    dirs = [os.path.join(dir, resource)
-+            for dir in itertools.chain(GLib.get_system_data_dirs(),
-+                                       (gtweak.DATA_DIR,
-+                                        GLib.get_user_data_dir()))]
-+    dirs += [os.path.join(os.path.expanduser("~"), ".{}".format(resource))]
-+
-+    return [dir for dir in dirs if os.path.isdir(dir)]
-+
- @singleton
- class AutostartManager:
- 
--- 
-2.4.5
-
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
deleted file mode 100644
index 61ae27349795..000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0002-Don-t-show-multiple-entries-for-a-single-theme.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From edd3203c7b7d5ba596df9f148c443cdfc8a58d88 Mon Sep 17 00:00:00 2001
-From: Jascha Geerds <jg@ekby.de>
-Date: Sat, 1 Aug 2015 21:26:57 +0200
-Subject: [PATCH 1/1] Don't show multiple entries for a single theme
-
----
- gtweak/tweaks/tweak_group_interface.py |  8 ++++----
- gtweak/tweaks/tweak_group_keymouse.py  |  4 ++--
- gtweak/utils.py                        | 16 ++++++++++++++++
- 3 files changed, 22 insertions(+), 6 deletions(-)
-
-diff --git a/gtweak/tweaks/tweak_group_interface.py b/gtweak/tweaks/tweak_group_interface.py
-index a319907..82c0286 100644
---- a/gtweak/tweaks/tweak_group_interface.py
-+++ b/gtweak/tweaks/tweak_group_interface.py
-@@ -26,7 +26,7 @@ from gi.repository import Gtk
- from gi.repository import GLib
- 
- import gtweak
--from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs
-+from gtweak.utils import walk_directories, make_combo_list_with_default, extract_zip_file, get_resource_dirs, get_unique_resources
- from gtweak.tweakmodel import Tweak, TWEAK_GROUP_APPEARANCE
- from gtweak.gshellwrapper import GnomeShellFactory
- from gtweak.gsettings import GSettingsSetting
-@@ -49,7 +49,7 @@ class GtkThemeSwitcher(GSettingsComboTweak):
-         valid = walk_directories(get_resource_dirs('themes'), lambda d:
-                     os.path.exists(os.path.join(d, "gtk-2.0")) and \
-                         os.path.exists(os.path.join(d, "gtk-3.0")))
--        return valid
-+        return get_unique_resources(valid)
- 
- class IconThemeSwitcher(GSettingsComboTweak):
-     def __init__(self, **options):
-@@ -64,7 +64,7 @@ class IconThemeSwitcher(GSettingsComboTweak):
-         valid = walk_directories(get_resource_dirs("icons"), lambda d:
-                     os.path.isdir(d) and \
- 			os.path.exists(os.path.join(d, "index.theme")))
--        return valid
-+        return get_unique_resources(valid)
- 
- class CursorThemeSwitcher(GSettingsComboTweak):
-     def __init__(self, **options):
-@@ -79,7 +79,7 @@ class CursorThemeSwitcher(GSettingsComboTweak):
-         valid = walk_directories(get_resource_dirs("icons"), lambda d:
-                     os.path.isdir(d) and \
-                         os.path.exists(os.path.join(d, "cursors")))
--        return valid
-+        return get_unique_resources(valid)
- 
- class ShellThemeTweak(Gtk.Box, Tweak):
- 
-diff --git a/gtweak/tweaks/tweak_group_keymouse.py b/gtweak/tweaks/tweak_group_keymouse.py
-index 3486098..9f53425 100644
---- a/gtweak/tweaks/tweak_group_keymouse.py
-+++ b/gtweak/tweaks/tweak_group_keymouse.py
-@@ -20,7 +20,7 @@ import os.path
- from gi.repository import GLib
- 
- import gtweak
--from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs
-+from gtweak.utils import XSettingsOverrides, walk_directories, make_combo_list_with_default, get_resource_dirs, get_unique_resources
- from gtweak.widgets import ListBoxTweakGroup, GSettingsComboTweak, GSettingsSwitchTweak, GetterSetterSwitchTweak, Title
- 
- class PrimaryPasteTweak(GetterSetterSwitchTweak):
-@@ -50,7 +50,7 @@ class KeyThemeSwitcher(GSettingsComboTweak):
-         valid = walk_directories(get_resource_dirs("themes"), lambda d:
-                     os.path.isfile(os.path.join(d, "gtk-3.0", "gtk-keys.css")) and \
-                     os.path.isfile(os.path.join(d, "gtk-2.0-key", "gtkrc")))
--        return valid
-+        return get_unique_resources(valid)
- 
- TWEAK_GROUPS = [
-     ListBoxTweakGroup(_("Keyboard and Mouse"),
-diff --git a/gtweak/utils.py b/gtweak/utils.py
-index 0fcb51d..ce8e12e 100644
---- a/gtweak/utils.py
-+++ b/gtweak/utils.py
-@@ -131,6 +131,22 @@ def get_resource_dirs(resource):
- 
-     return [dir for dir in dirs if os.path.isdir(dir)]
- 
-+def get_unique_resources(dirs):
-+    """Filter out duplicated resources.
-+
-+    :param list dirs:
-+        List of resource dirs (e.g. /usr/share/themes/Adwaita)
-+    :return:
-+        List of dirs without duplicated resources
-+    """
-+    unique_dirs = {}
-+    for dir in dirs:
-+        basename = os.path.basename(dir)
-+        if basename not in unique_dirs:
-+            unique_dirs[basename] = dir
-+
-+    return unique_dirs
-+
- @singleton
- class AutostartManager:
- 
--- 
-2.4.5
-
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
deleted file mode 100644
index 840ebb82ec75..000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/0003-Create-config-dir-if-it-doesn-t-exist.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From dea8fc3c37c43f4fbbcc658ee995a95b93452b3c Mon Sep 17 00:00:00 2001
-From: Jascha Geerds <jg@ekby.de>
-Date: Sun, 2 Aug 2015 12:01:20 +0200
-Subject: [PATCH 1/1] Create config dir if it doesn't exist
-
-Otherwise gnome-tweak-tool can't enable the dark theme and fails
-without a clear error message.
----
- gtweak/gtksettings.py | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/gtweak/gtksettings.py b/gtweak/gtksettings.py
-index bcec9f1..f39991b 100644
---- a/gtweak/gtksettings.py
-+++ b/gtweak/gtksettings.py
-@@ -35,6 +35,10 @@ class GtkSettingsManager:
-     def _get_keyfile(self):
-         keyfile = None
-         try:
-+            config_dir = os.path.dirname(self._path)
-+            if not os.path.isdir(config_dir):
-+                os.makedirs(config_dir)
-+
-             keyfile = GLib.KeyFile()
-             keyfile.load_from_file(self._path, 0)
-         except MemoryError:
--- 
-2.4.5
-
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
deleted file mode 100644
index 6600345060f9..000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/default.nix
+++ /dev/null
@@ -1,49 +0,0 @@
-{ stdenv, intltool, fetchurl, python, pygobject3, atk
-, pkgconfig, gtk3, glib, libsoup
-, bash, makeWrapper, itstool, libxml2, python3Packages
-, gnome3, librsvg, gdk_pixbuf, file, libnotify }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-tweak-tool-${gnome3.version}.2";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-tweak-tool/${gnome3.version}/${name}.tar.xz";
-    sha256 = "0r5x67aj79dsw2xl98q4harxv3hjs52g0m6pw43vx29lbir07r5i";
-  };
-
-  doCheck = true;
-
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
-
-  makeFlags = [ "DESTDIR=/" ];
-
-  buildInputs = [ pkgconfig gtk3 glib intltool itstool libxml2
-                  gnome3.gsettings_desktop_schemas makeWrapper file
-                  gdk_pixbuf gnome3.defaultIconTheme librsvg
-                  python pygobject3 libnotify gnome3.gnome_shell
-                  libsoup gnome3.gnome_settings_daemon gnome3.nautilus
-                  gnome3.gnome_desktop ];
-
-  preFixup = ''
-    wrapProgram "$out/bin/gnome-tweak-tool" \
-      --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --suffix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix PYTHONPATH : "$PYTHONPATH:$(toPythonPath $out)"
-  '';
-
-  patches = [
-    ./find_gsettings.patch
-    ./0001-Search-for-themes-and-icons-in-system-data-dirs.patch
-    ./0002-Don-t-show-multiple-entries-for-a-single-theme.patch
-    ./0003-Create-config-dir-if-it-doesn-t-exist.patch
-  ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/action/show/Apps/GnomeTweakTool;
-    description = "A tool to customize advanced GNOME 3 options";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/find_gsettings.patch b/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/find_gsettings.patch
deleted file mode 100644
index 3e68c04cb3ab..000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/gnome-tweak-tool/find_gsettings.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/gtweak/gsettings.py b/gtweak/gsettings.py
-index a00fe19..dce74b2 100644
---- a/gtweak/gsettings.py
-+++ b/gtweak/gsettings.py
-@@ -33,10 +33,15 @@ class GSettingsMissingError(Exception):
- 
- class _GSettingsSchema:
-     def __init__(self, schema_name, schema_dir=None, schema_filename=None, **options):
--        if not schema_dir:
--            schema_dir = gtweak.GSETTINGS_SCHEMA_DIR
-         if not schema_filename:
-             schema_filename = schema_name + ".gschema.xml"
-+        if not schema_dir:
-+            schema_dir = gtweak.GSETTINGS_SCHEMA_DIR
-+            for xdg_dir in GLib.get_system_data_dirs():
-+                dir = os.path.join(xdg_dir, "glib-2.0", "schemas")
-+                if os.path.exists(os.path.join(dir, schema_filename)):
-+                    schema_dir = dir
-+                    break
- 
-         schema_path = os.path.join(schema_dir, schema_filename)
-         if not os.path.exists(schema_path):
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gnome-video-effects/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gnome-video-effects/default.nix
deleted file mode 100644
index c0bd2fed3f2d..000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/gnome-video-effects/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, gnome3 }:
-
-stdenv.mkDerivation rec {
-  name = "gnome-video-effects-${version}";
-  version = "0.4.1";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-video-effects/0.4/${name}.tar.xz";
-    sha256 = "0jl4iny2dqpcgi3sgxzpgnbw0752i8ay3rscp2cgdjlp79ql5gil";
-  };
-
-  buildInputs = [ pkgconfig intltool ];
-
-  meta = with stdenv.lib; {
-    homepage = https://wiki.gnome.org/Projects/GnomeVideoEffects;
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix
deleted file mode 100644
index 6563f7979700..000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/gpaste/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ stdenv, fetchurl, intltool, autoreconfHook, pkgconfig, vala, glib
-, pango, gtk3, gnome3, dbus, clutter, appstream-glib, makeWrapper }:
-
-stdenv.mkDerivation rec {
-  version = "${gnome3.version}.3.1";
-  name = "gpaste-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/Keruspe/GPaste/archive/v${version}.tar.gz";
-    sha256 = "1m171r1d1jrv9d7ssj25ikrw7lc96gr41rgkxnsa2lsqrvv8i16l";
-  };
-
-  buildInputs = [ intltool autoreconfHook pkgconfig vala glib
-                  gtk3 gnome3.gnome_control_center dbus.libs
-                  clutter pango appstream-glib makeWrapper ];
-
-  preConfigure = "intltoolize -f";
-
-  configureFlags = [ "--with-controlcenterdir=$(out)/gnome-control-center/keybindings"
-                     "--with-dbusservicesdir=$(out)/share/dbus-1/services" ];
-
-  enableParallelBuilding = true;
-
-  preFixup = 
-    let
-      libPath = stdenv.lib.makeLibraryPath
-        [ glib gtk3 clutter pango ];
-    in
-    ''
-      for i in $out/libexec/gpaste/*; do
-        wrapProgram $i \
-          --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
-          --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
-      done
-    '';
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/Keruspe/GPaste;
-    description = "Clipboard management system with GNOME3 integration";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix b/pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix
deleted file mode 100644
index d86e234e80f5..000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/gtkhtml/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, gtk3, intltool
-, gnome3, enchant, isocodes }:
-
-let
-  majorVersion = "4.8";
-in
-stdenv.mkDerivation rec {
-  name = "gtkhtml-${majorVersion}.5";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gtkhtml/${majorVersion}/${name}.tar.xz";
-    sha256 = "2ff5bbec4d8e7eca66a36f7e3863a104e098ce9b58e6d0374de7cb80c3d93e8d";
-  };
-
-  buildInputs = [ pkgconfig gtk3 intltool gnome3.adwaita-icon-theme
-                  gnome3.gsettings_desktop_schemas ];
-
-  propagatedBuildInputs = [ enchant isocodes ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-    maintainers = gnome3.maintainers;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/libgda/default.nix b/pkgs/desktops/gnome-3/3.16/misc/libgda/default.nix
deleted file mode 100644
index 1fcb411d120d..000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/libgda/default.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gtk3, openssl }:
-
-let
-  major = "5.2";
-  minor = "2";
-
-in stdenv.mkDerivation rec {
-  version = "${major}.${minor}";
-  name = "libgda-${version}";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgda/${major}/${name}.tar.xz";
-    sha256 = "c9b8b1c32f1011e47b73c5dcf36649aaef2f1edaa5f5d75be20d9caadc2bc3e4";
-  };
-
-  configureFlags = [
-    "--enable-gi-system-install=no"
-  ];
-
-  enableParallelBuilding = true;
-
-  buildInputs = [ pkgconfig intltool itstool libxml2 gtk3 openssl ];
-
-  meta = with stdenv.lib; {
-    description = "Database access library";
-    homepage = http://www.gnome-db.org/;
-    license = [ licenses.lgpl2 licenses.gpl2 ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix
deleted file mode 100644
index dbdd2cc7fd13..000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/libgit2-glib/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala
-, gtk_doc, gobjectIntrospection, libgit2, glib }:
-
-let
-  majorVersion = "0.0";
-in
-stdenv.mkDerivation rec {
-  name = "libgit2-glib-${majorVersion}.24";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libgit2-glib/0.0/${name}.tar.xz";
-    sha256 = "8a0a6f65d86f2c8cb9bcb20c5e0ea6fd02271399292a71fc7e6852f13adbbdb8";
-  };
-
-  buildInputs = [ gnome3.gnome_common libtool pkgconfig vala
-                  gtk_doc gobjectIntrospection libgit2 glib ];
-
-  meta = with stdenv.lib; {
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix b/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix
deleted file mode 100644
index b86480125730..000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/libmediaart/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, gdk_pixbuf, gobjectIntrospection, gnome3 }:
-
-let
-  majorVersion = "1.9";
-in
-stdenv.mkDerivation rec {
-  name = "libmediaart-${majorVersion}.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/libmediaart/${majorVersion}/${name}.tar.xz";
-    sha256 = "0vshvm3sfwqs365glamvkmgnzjnmxd15j47xn0ak3p6l57dqlrll";
-  };
-
-  buildInputs = [ pkgconfig glib gdk_pixbuf gobjectIntrospection ];
-
-  meta = with stdenv.lib; {
-    description = "Library tasked with managing, extracting and handling media art caches";
-    maintainers = gnome3.maintainers;
-    license = licenses.gpl2;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix b/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix
deleted file mode 100644
index 0440af440fec..000000000000
--- a/pkgs/desktops/gnome-3/3.16/misc/pomodoro/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{ stdenv, fetchFromGitHub, which, automake113x, intltool, pkgconfig, libtool, makeWrapper,
-  dbus_glib, libcanberra, gst_all_1, vala, gnome3, gtk3, gst_plugins_base,
-  glib, gobjectIntrospection, telepathy_glib
-}:
-
-stdenv.mkDerivation rec {
-  rev = "624945d";
-  name = "gnome-shell-pomodoro-${gnome3.version}-${rev}";
-
-  src = fetchFromGitHub {
-      owner = "codito";
-      repo = "gnome-pomodoro";
-      rev = "${rev}";
-      sha256 = "0vjy95zvd309n8g13fa80qhqlv7k6wswhrjw7gddxrnmr662xdqq";
-  };
-
-  configureScript = ''./autogen.sh'';
-
-  buildInputs = [
-    which automake113x intltool glib gobjectIntrospection pkgconfig libtool
-    makeWrapper dbus_glib libcanberra vala gst_all_1.gstreamer
-    gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
-    gnome3.gsettings_desktop_schemas gnome3.gnome_desktop
-    gnome3.gnome_common gnome3.gnome_shell gtk3 telepathy_glib
-    gnome3.defaultIconTheme
-  ];
-
-  preBuild = ''
-    sed -i 's|\$(INTROSPECTION_GIRDIR)|${gnome3.gnome_desktop}/share/gir-1.0|' \
-      vapi/Makefile
-  '';
-
-  preFixup = ''
-    wrapProgram $out/bin/gnome-pomodoro \
-        --prefix XDG_DATA_DIRS : \
-        "$out/share:$GSETTINGS_SCHEMAS_PATH:$XDG_DATA_DIRS"
-  '';
-
-  meta = with stdenv.lib; {
-    homepage = https://github.com/codito/gnome-shell-pomodoro;
-    description = "A time management utility for GNOME based on the pomodoro technique";
-    longDescription = ''
-      This GNOME utility helps to manage time according to Pomodoro Technique.
-      It intends to improve productivity and focus by taking short breaks.
-    '';
-    maintainers = with maintainers; [ DamienCassou jgeerds ];
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 18ad8ffc8362..e425bdab1387 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14603,8 +14603,6 @@ let
     inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils;
   };
 
-  gnome3_16 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.16 { });
-
   gnome3_18 = recurseIntoAttrs (callPackage ../desktops/gnome-3/3.18 { });
 
   gnome3 = gnome3_18;

From 28704a7363d6cd26cd6a7feecd1dc99b66b956bd Mon Sep 17 00:00:00 2001
From: Asko Soukka <asko.soukka@iki.fi>
Date: Fri, 29 Jan 2016 20:47:37 +0200
Subject: [PATCH 0786/2285] afew: 3f1e5e9 -> git-2016-01-04

---
 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 94d19e7b028d..0e3ac14831a8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -343,13 +343,13 @@ in modules // {
   };
 
   afew = buildPythonPackage rec {
-    rev = "9744c18c4d6b0a3e7f57b01e5fe145a60fc82a47";
-    name = "afew-1.0_${rev}";
+    rev = "3f1e5e93119788984c2193292c988ac81ecb0a45";
+    name = "afew-git-2016-01-04";
 
     src = pkgs.fetchurl {
       url = "https://github.com/teythoon/afew/tarball/${rev}";
       name = "${name}.tar.bz";
-      sha256 = "1qyban022aji2hl91dh0j3xa6ikkxl5argc6w71yp2x8b02kp3mf";
+      sha256 = "1fi19g2j1qilh7ikp7pzn6sagkn76g740zdxgnsqmmvl2zk2yhrw";
     };
 
     buildInputs = with self; [ pkgs.dbacl ];

From 866937a9f84c51663189af95e64a8eae1f9a9f2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 31 Jan 2016 11:34:10 -0200
Subject: [PATCH 0787/2285] awesome: 3.5.7 -> 3.5.8

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

diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix
index 2b0d44e61c8a..29b215d06428 100644
--- a/pkgs/applications/window-managers/awesome/default.nix
+++ b/pkgs/applications/window-managers/awesome/default.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "3.5.7";
+  version = "3.5.8";
 in with luaPackages;
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url    = "http://awesome.naquadah.org/download/awesome-${version}.tar.xz";
-    sha256 = "ba7f92b0ab8b729c569b19b098b0a08339d8654e3c040d07ad02cf99641ceecf";
+    sha256 = "1iifcyphgibmh3cvsy8agjrl9zjl80scrg0bcgnwywmxaxncjc3w";
   };
 
   meta = with stdenv.lib; {

From 3101275527e55bfbdc74e7093be95a41384b6ab4 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Sun, 31 Jan 2016 17:44:35 +0100
Subject: [PATCH 0788/2285] vips: 8.1.1 -> 8.2.2

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

diff --git a/pkgs/tools/graphics/vips/default.nix b/pkgs/tools/graphics/vips/default.nix
index 153611e05874..7b0cbc16e11a 100644
--- a/pkgs/tools/graphics/vips/default.nix
+++ b/pkgs/tools/graphics/vips/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "vips-8.1.1";
+  name = "vips-8.2.2";
 
   src = fetchurl {
     url = "http://www.vips.ecs.soton.ac.uk/supported/current/${name}.tar.gz";
-    sha256 = "014sgpqj832vl5k212jv25sjakrsifnspjfclywpmn7cwaqwjlvx";
+    sha256 = "12b319aicr129cpi5sixwd3q91y97vwwva6b044zy54px4s8ls0g";
   };
 
   buildInputs =

From 268d4699ece342da82ec9d4e716f21655a69d665 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 31 Jan 2016 18:06:31 +0100
Subject: [PATCH 0789/2285] calibre: 2.49.0 -> 2.50.1

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 28e97a930674..010deb0b17e4 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.49.0";
+  version = "2.50.1";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "0jc476pg07c0nwccprhwgjdlvvb2fdzza9xrjqzc0c42c5v7qzxa";
+    sha256 = "0fy5fwj53hl8bcl412d2y61xm1nmkry24dlanj07nn6dhmrs0cm9";
   };
 
   inherit python;

From e048b4883638efb4dbcd2495cca109651f44bf91 Mon Sep 17 00:00:00 2001
From: Matej Cotman <cotman.matej@gmail.com>
Date: Fri, 15 Jan 2016 09:51:46 +0100
Subject: [PATCH 0790/2285] lighttable: update from 0.7.2 to 0.8.1

---
 .../editors/lighttable/default.nix            | 57 +++++++++++--------
 1 file changed, 32 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix
index 6dbeff55063c..6bf5a1a9e6da 100644
--- a/pkgs/applications/editors/lighttable/default.nix
+++ b/pkgs/applications/editors/lighttable/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, buildEnv, makeDesktopItem, makeWrapper, zlib, glib, alsaLib
+{ stdenv, fetchurl, buildEnv, zlib, glib, alsaLib, makeDesktopItem
 , dbus, gtk, atk, pango, freetype, fontconfig, libgnome_keyring3, gdk_pixbuf
-, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, udev
+, cairo, cups, expat, libgpgerror, nspr, gnome3, nss, xorg, udev, libnotify
 }:
 
 let
@@ -8,51 +8,58 @@ let
       stdenv.cc.cc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss
       fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf
       xorg.libXrender xorg.libX11 xorg.libXext xorg.libXdamage xorg.libXtst
-      xorg.libXcomposite xorg.libXi xorg.libXfixes
-];
+      xorg.libXcomposite xorg.libXi xorg.libXfixes libnotify xorg.libXrandr
+      xorg.libXcursor
+  ];
+  desktopItem = makeDesktopItem {
+    name = "LightTable";
+    exec = "light";
+    comment = "LightTable";
+    desktopName = "LightTable";
+    genericName = "the next generation code editor";
+  };
 in
-assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 
 stdenv.mkDerivation rec {
   name = "lighttable-${version}";
-  version = "0.7.2";
+  version = "0.8.1";
 
-  src = 
-    if stdenv.system == "i686-linux" then
-      fetchurl {
-        name = "LightTableLinux.tar.gz";
-        url = "https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/${version}/LightTableLinux.tar.gz";
-        sha256 = "1q5m50r319xn9drfv3cyfja87b7dfhni9d9gmz9733idq3l5fl9i";
-      }
-    else
+  src =
       fetchurl {
         name = "LightTableLinux64.tar.gz";
-        url = "https://d35ac8ww5dfjyg.cloudfront.net/playground/bins/${version}/LightTableLinux64.tar.gz";
-        sha256 = "1jnn103v5qrplkb5ik9p8whfqclcq2r1qv666hp3jaiwb46vhf3c";
+        url = "https://github.com/LightTable/LightTable/releases/download/${version}/${name}-linux.tar.gz";
+        sha256 = "06fj725xfhf3fwrf7dya7ijmxq3v76kfmd4lr2067a92zhlwr5pv";
       };
 
-  buildInputs = [ makeWrapper ];
   phases = [ "installPhase" ];
 
   installPhase = ''
-    tar xvf ${src}
-    mkdir -p $out/bin
-    mv LightTable $out/
+    tar xf ${src}
+    mkdir -p $out/{bin,share/LightTable}
+    mv ./${name}-linux/* $out/share/LightTable
 
     patchelf \
       --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      --set-rpath ${libPath}:${stdenv.cc.cc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \
-      $out/LightTable/ltbin
+      --set-rpath ${libPath}:${libPath}/lib64:$out/share/LightTable \
+      $out/share/LightTable/LightTable
 
-    ln -sf ${udev}/lib/libudev.so.1 $out/LightTable/libudev.so.0
+    mv $out/share/LightTable/light $out/bin/light
 
-    makeWrapper $out/LightTable/ltbin $out/bin/lighttable \
-      --prefix "LD_LIBRARY_PATH" : $out/LightTable
+    ln -s ${udev}/lib/libudev.so.1 $out/share/LightTable/libudev.so.0
+    substituteInPlace $out/bin/light \
+        --replace "/usr/lib/x86_64-linux-gnu" "${udev}/lib" \
+        --replace "/lib/x86_64-linux-gnu" "$out/share/LightTable" \
+        --replace 'HERE=`dirname $(readlink -f $0)`' "HERE=$out/share/LightTable"
+
+    mkdir -p "$out"/share/applications
+    cp "${desktopItem}/share/applications/LightTable.desktop" "$out"/share/applications/
   '';
 
   meta = with stdenv.lib; {
     description = "the next generation code editor";
     homepage = http://www.lighttable.com/;
     license = licenses.gpl3;
+    maintainers = [ maintainers.matejc ];
+    platforms = [ "x86_64-linux" ];
   };
 }

From 2924099daef38ddb569a5cea26628c22f739c51e Mon Sep 17 00:00:00 2001
From: Anne Jan Brouwer <brouwer@annejan.com>
Date: Tue, 26 Jan 2016 12:36:00 +0100
Subject: [PATCH 0791/2285] qtpass: 1.0.6 -> 1.1.0

---
 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 940aa8eb4bf4..c3080975f0b2 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.0.6";
+  version = "1.1.0";
 
   src = fetchurl {
     url = "https://github.com/IJHack/qtpass/archive/v${version}.tar.gz";
-    sha256 = "ccad9a06e3efa23278fa3e958185bf24fb3800874d8165be4ae6649706a2ab1c";
+    sha256 = "60b458062f54184057e55dbd9c93958a8bf845244ffd70b9cb31bf58697f0dc6";
   };
 
   buildInputs = [ git gnupg makeWrapper pass qtbase qttools ];

From 12ecc1ceb3202c64d706a2cde950ced592fa552b Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Sun, 31 Jan 2016 21:35:15 +0100
Subject: [PATCH 0792/2285] qtpass: use wrapQtProgramm instead of standard
 wrapper

---
 pkgs/applications/misc/qtpass/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix
index c3080975f0b2..08e7f834d6bb 100644
--- a/pkgs/applications/misc/qtpass/default.nix
+++ b/pkgs/applications/misc/qtpass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, git, gnupg, makeWrapper, pass, qtbase, qttools }:
+{ stdenv, fetchurl, git, gnupg, makeQtWrapper, pass, qtbase, qtsvg, qttools }:
 
 stdenv.mkDerivation rec {
   name = "qtpass-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
     sha256 = "60b458062f54184057e55dbd9c93958a8bf845244ffd70b9cb31bf58697f0dc6";
   };
 
-  buildInputs = [ git gnupg makeWrapper pass qtbase qttools ];
+  buildInputs = [ git gnupg makeQtWrapper pass qtbase qtsvg qttools ];
 
   configurePhase = "qmake CONFIG+=release PREFIX=$out DESTDIR=$out";
 
@@ -18,11 +18,11 @@ stdenv.mkDerivation rec {
     mv $out/qtpass $out/bin
   '';
 
-  postInstall = ''
-    wrapProgram $out/bin/qtpass \
-        --suffix PATH : ${git}/bin \
-        --suffix PATH : ${gnupg}/bin \
-        --suffix PATH : ${pass}/bin
+  postFixup = ''
+    wrapQtProgram $out/bin/qtpass \
+      --suffix PATH : ${git}/bin \
+      --suffix PATH : ${gnupg}/bin \
+      --suffix PATH : ${pass}/bin
   '';
 
   meta = with stdenv.lib; {

From b7badc6be04b7faacddc9f5864d3f3b2d37e310a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Jan 2016 21:40:05 +0100
Subject: [PATCH 0793/2285] powertop: call "xset" from $PATH

Patch the source code to find "xset" in $PATH rather than expecting the
hard-coded path "/usr/bin/xset" to work. I've decided *not* to hard-code
a proper path like "${xset}/bin/xset", because that reference greatly
increases the size of the powertop closure. Since "xset" is required
only for --calibrate (and that even seems to work fine without it), it
felt like an optional dependency is more appropriate in this case.

Thanks to @heydojo locating the source code file that needs patching.

Fixes https://github.com/NixOS/nixpkgs/issues/12662.
---
 pkgs/os-specific/linux/powertop/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix
index ef1dbf00b52c..59083a8b040e 100644
--- a/pkgs/os-specific/linux/powertop/default.nix
+++ b/pkgs/os-specific/linux/powertop/default.nix
@@ -12,6 +12,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace src/main.cpp --replace "/sbin/modprobe" "modprobe"
+    substituteInPlace src/calibrate/calibrate.cpp --replace "/usr/bin/xset" "xset"
   '';
 
   meta = {

From 8fee229261b16d3e937e091308d07bcea751bd34 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 31 Jan 2016 12:57:47 -0800
Subject: [PATCH 0794/2285] desktop manager service: fix and improve default
 error

Before the error if the wrong default desktop was chosen would be:

/nixpkgs-channels/lib/modules.nix:282:11:
Default desktop manager ($(defaultDM)) not found.

which has the string interpolation done incorreclty. Now that is fixed
and it is more user-friendly as:

/nixpkgs-channels/lib/modules.nix:282:11:

Default desktop manager (gnome) not found.
Probably you want to change
  services.xserver.desktopManager.default = "gnome";
to one of
  services.xserver.desktopManager.default = "gnome3";
  services.xserver.desktopManager.default = "none";
---
 nixos/modules/services/x11/desktop-managers/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix
index 998bcd354c53..3e91450a39d2 100644
--- a/nixos/modules/services/x11/desktop-managers/default.nix
+++ b/nixos/modules/services/x11/desktop-managers/default.nix
@@ -64,7 +64,13 @@ in
           else if any (w: w.name == defaultDM) cfg.session.list then
             defaultDM
           else
-            throw "Default desktop manager ($(defaultDM)) not found.";
+            throw ''
+              Default desktop manager (${defaultDM}) not found.
+              Probably you want to change
+                services.xserver.desktopManager.default = "${defaultDM}";
+              to one of
+                ${concatMapStringsSep "\n  " (w: "services.xserver.desktopManager.default = \"${w.name}\";") cfg.session.list}
+            '';
       };
 
     };

From 23d1aa85163cadf83eb0e43000e6a108f4d3a5a3 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Sun, 3 Jan 2016 22:30:07 -0500
Subject: [PATCH 0795/2285] email: init at d9fd259f

---
 pkgs/tools/networking/email/default.nix | 40 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/tools/networking/email/default.nix

diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/tools/networking/email/default.nix
new file mode 100644
index 000000000000..2ff22c061811
--- /dev/null
+++ b/pkgs/tools/networking/email/default.nix
@@ -0,0 +1,40 @@
+{ stdenv, lib, fetchFromGitHub, openssl }:
+
+let
+  eMailSrc = fetchFromGitHub {
+    #awaiting acceptance of https://github.com/deanproxy/eMail/pull/29
+    owner = "jerith666";
+    repo = "eMail";
+    rev = "d9fd259f952b573d320916ee34e807dd3dd24b1f";
+    sha256 = "0q4ly4bhlv6lrlj5kmjs491aah1afmkjyw63i9yqnz4d2k6npvl9";
+  };
+
+  srcRoot = "eMail-${eMailSrc.rev}-src";
+
+  dlibSrc = fetchFromGitHub {
+    owner = "deanproxy";
+    repo = "dlib";
+    rev = "f62f29e918748b7cea476220f7492672be81c9de";
+    sha256 = "0h34cikch98sb7nsqjnb9wl384c8ndln3m6yb1172l4y89qjg9rr";
+  };
+
+in
+
+stdenv.mkDerivation {
+  name = "email-git-2016-01-31";
+  src = eMailSrc;
+
+  buildInputs = [ openssl ];
+
+  unpackPhase = ''
+    unpackPhase;
+    cp -Rp ${dlibSrc}/* ${srcRoot}/dlib;
+    chmod -R +w ${srcRoot}/dlib;
+  '';
+
+  meta = {
+    description = "Command line SMTP client";
+    license = with lib.licenses; [ gpl2 ];
+    homepage = http://deanproxy.com/code;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c26313c417a5..b56254cbd88a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2253,6 +2253,8 @@ let
     guile = guile_1_8;
   };
 
+  email = callPackage ../tools/networking/email { };
+
   maim = callPackage ../tools/graphics/maim {};
 
   mairix = callPackage ../tools/text/mairix { };

From 08c29dc3aa6f8a32b4bab7c0f9789c2a1938cc70 Mon Sep 17 00:00:00 2001
From: Alexander Tsamutali <atsamutali@mirantis.com>
Date: Mon, 1 Feb 2016 03:27:33 +0300
Subject: [PATCH 0796/2285] pkgs/tools/inputmethods/m17n-db: New derivation.

---
 pkgs/tools/inputmethods/m17n-db/default.nix | 23 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/m17n-db/default.nix

diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/tools/inputmethods/m17n-db/default.nix
new file mode 100644
index 000000000000..fa1b78acd1bb
--- /dev/null
+++ b/pkgs/tools/inputmethods/m17n-db/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, gettext}:
+stdenv.mkDerivation rec {
+  name = "m17n-db-1.7.0";
+
+  src = fetchurl {
+    url = "http://download.savannah.gnu.org/releases/m17n/${name}.tar.gz";
+    sha256 = "1w08hnsbknrcjlzp42c99bgwc9hzsnf5m4apdv0dacql2s09zfm2";
+  };
+
+  buildInputs = [ gettext ];
+
+  configureFlags = [
+    "--with-charmaps=${stdenv.glibc}/share/i18n/charmaps"
+  ];
+
+  meta = {
+    homepage = http://www.nongnu.org/m17n/;
+    description = "Multilingual text processing library (database)";
+    license = stdenv.lib.licenses.lgpl21Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 13a47c481e67..f7e5b07a69a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1136,6 +1136,8 @@ let
 
   anthy = callPackage ../tools/inputmethods/anthy { };
 
+  m17n_db = callPackage ../tools/inputmethods/m17n-db { };
+
   mozc = callPackage ../tools/inputmethods/mozc {
     inherit (pythonPackages) gyp;
   };

From 2671639ac775d86d5ff46d4231b092ac3f5fa579 Mon Sep 17 00:00:00 2001
From: Alexander Tsamutali <atsamutali@mirantis.com>
Date: Mon, 1 Feb 2016 03:28:47 +0300
Subject: [PATCH 0797/2285] pkgs/tools/inputmethods/m17n-lib: New derivation.

---
 pkgs/tools/inputmethods/m17n-lib/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/m17n-lib/default.nix

diff --git a/pkgs/tools/inputmethods/m17n-lib/default.nix b/pkgs/tools/inputmethods/m17n-lib/default.nix
new file mode 100644
index 000000000000..982f35a9fe68
--- /dev/null
+++ b/pkgs/tools/inputmethods/m17n-lib/default.nix
@@ -0,0 +1,19 @@
+{stdenv, fetchurl, m17n_db}:
+stdenv.mkDerivation rec {
+  name = "m17n-lib-1.7.0";
+
+  src = fetchurl {
+    url = "http://download.savannah.gnu.org/releases/m17n/${name}.tar.gz";
+    sha256 = "10yv730i25g1rpzv6q49m6xn4p8fjm7jdwvik2h70sn8w3hm7f4f";
+  };
+
+  buildInputs = [ m17n_db ];
+
+  meta = {
+    homepage = http://www.nongnu.org/m17n/;
+    description = "Multilingual text processing library (runtime)";
+    license = stdenv.lib.licenses.lgpl21Plus;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f7e5b07a69a5..195b42f2d440 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1138,6 +1138,8 @@ let
 
   m17n_db = callPackage ../tools/inputmethods/m17n-db { };
 
+  m17n_lib = callPackage ../tools/inputmethods/m17n-lib { };
+
   mozc = callPackage ../tools/inputmethods/mozc {
     inherit (pythonPackages) gyp;
   };

From c7bbe151024bf04596d2edf4b06a0397c945e6a7 Mon Sep 17 00:00:00 2001
From: Alexander Tsamutali <atsamutali@mirantis.com>
Date: Mon, 1 Feb 2016 03:31:57 +0300
Subject: [PATCH 0798/2285] pkgs/tools/inputmethods/uim: Now depends on m17n-db
 and m17n-lib.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This adds support for some simple input methods like russian ЙЦУКЕН keyboard.
---
 pkgs/tools/inputmethods/uim/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix
index 160efe2ded8f..19de302e7b1f 100644
--- a/pkgs/tools/inputmethods/uim/default.nix
+++ b/pkgs/tools/inputmethods/uim/default.nix
@@ -1,4 +1,5 @@
-{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, cmake, anthy}:
+{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs,
+ cmake, anthy, automoc4, m17n_lib, m17n_db}:
 
 stdenv.mkDerivation rec {
   version = "1.8.6";
@@ -13,6 +14,9 @@ stdenv.mkDerivation rec {
     kdelibs
     cmake
     anthy
+    automoc4
+    m17n_lib
+    m17n_db
   ];
 
   patches = [ ./immodules_cache.patch ];

From ec1e4d54958463f3893b356420e847cff7948af8 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sat, 30 Jan 2016 13:23:37 -0500
Subject: [PATCH 0799/2285] ghcjs-boot: 3529c6ab61d5f786b -> 97dea5c4145bf80a1

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

diff --git a/pkgs/development/compilers/ghcjs/ghcjs-boot.nix b/pkgs/development/compilers/ghcjs/ghcjs-boot.nix
index 516ef9ab92db..cbf21cb8f5bc 100644
--- a/pkgs/development/compilers/ghcjs/ghcjs-boot.nix
+++ b/pkgs/development/compilers/ghcjs/ghcjs-boot.nix
@@ -1,7 +1,7 @@
 { fetchgit }:
 fetchgit {
   url = git://github.com/ghcjs/ghcjs-boot.git;
-  rev = "3529c6ab61d5f786bdde449fd069520664330b30";
-  sha256 = "0d33nmbwrdn7ai4lsrn3qzcfy71hbini0jl437387cxdh3z6sjqa";
+  rev = "97dea5c4145bf80a1e7cffeb1ecd4d0ecacd5a2f";
+  sha256 = "1cgjzm595l2dx6fibzbkyv23bp1857qia0hb9d8aghf006al558j";
   fetchSubmodules = true;
 }

From c01eb0695424135f6669da5982f68ead5ef7316d Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sun, 31 Jan 2016 20:06:56 -0500
Subject: [PATCH 0800/2285] ghcjs: build with GHC 7.10.3

---
 pkgs/development/haskell-modules/configuration-ghcjs.nix | 2 +-
 pkgs/top-level/haskell-packages.nix                      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 6e8c0be7d0d9..b59c3447a2b0 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -12,7 +12,7 @@ self: super: {
   # LLVM is not supported on this GHC; use the latest one.
   inherit (pkgs) llvmPackages;
 
-  inherit (pkgs.haskell.packages.ghc7102) jailbreak-cabal alex happy gtk2hs-buildtools;
+  inherit (pkgs.haskell.packages.ghc7103) jailbreak-cabal alex happy gtk2hs-buildtools rehoo hoogle;
 
   # This is the list of packages that are built into a booted ghcjs installation
   # It can be generated with the command:
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 14bb80ebf04d..00b8f9ba9285 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -50,8 +50,8 @@ rec {
       inherit (packages.ghc784) ghc alex happy;
     };
 
-    ghcjs = packages.ghc7102.callPackage ../development/compilers/ghcjs {
-      ghc = compiler.ghc7102;
+    ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs {
+      ghc = compiler.ghc7103;
     };
 
     jhc = callPackage ../development/compilers/jhc {

From 05b2afed331dc8f8d7a2c21a31b34bbd6c7c8807 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sun, 31 Jan 2016 20:40:50 -0500
Subject: [PATCH 0801/2285] ghcjs: build hoogle docs for base libraries

---
 pkgs/development/compilers/ghcjs/ghcjs.patch | 22 +++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs/ghcjs.patch b/pkgs/development/compilers/ghcjs/ghcjs.patch
index 751f114ba43a..61bbb95b0a58 100644
--- a/pkgs/development/compilers/ghcjs/ghcjs.patch
+++ b/pkgs/development/compilers/ghcjs/ghcjs.patch
@@ -1,8 +1,8 @@
 diff --git a/src-bin/Boot.hs b/src-bin/Boot.hs
-index 3c68dcf..64f3cf7 100644
+index db8b12e..7b815c5 100644
 --- a/src-bin/Boot.hs
 +++ b/src-bin/Boot.hs
-@@ -512,9 +512,7 @@ initPackageDB :: B ()
+@@ -526,9 +526,7 @@ initPackageDB :: B ()
  initPackageDB = do
    msg info "creating package databases"
    initDB "--global" <^> beLocations . blGlobalDB
@@ -12,7 +12,7 @@ index 3c68dcf..64f3cf7 100644
      initDB dbName db = do
        rm_rf db >> mkdir_p db
        ghcjs_pkg_ ["init", toTextI db] `catchAny_` return ()
-@@ -538,29 +536,22 @@ installDevelopmentTree = subTop $ do
+@@ -552,29 +550,22 @@ installDevelopmentTree = subTop $ do
    msgD info $ "preparing development boot tree"
    checkpoint' "ghcjs-boot-git" "ghcjs-boot repository already cloned and prepared" $ do
      testGit "ghcjs-boot" >>= \case
@@ -46,7 +46,7 @@ index 3c68dcf..64f3cf7 100644
        mapM_ patchPackage =<< allPackages
        preparePrimops
        buildGenPrim
-@@ -1085,8 +1076,11 @@ cabalInstallFlags parmakeGhcjs = do
+@@ -1110,14 +1101,14 @@ cabalInstallFlags parmakeGhcjs = do
             , "--avoid-reinstalls"
             , "--builddir",      "dist"
             , "--with-compiler", ghcjs ^. pgmLocText
@@ -58,13 +58,19 @@ index 3c68dcf..64f3cf7 100644
 +           , "--libsubdir",     "$pkgid"
             , bool haddock "--enable-documentation" "--disable-documentation"
             , "--haddock-html"
- -- workaround for hoogle support being broken in haddock for GHC 7.10RC1
+--- workaround for hoogle support being broken in haddock for GHC 7.10RC1
+-#if !(__GLASGOW_HASKELL__ >= 709)
+            , "--haddock-hoogle"
+-#endif
+            , "--haddock-hyperlink-source"
+ -- don't slow down Windows builds too much, on other platforms we get this more
+ -- or less for free, thanks to dynamic-too
 diff --git a/src/Compiler/Info.hs b/src/Compiler/Info.hs
-index 33a401f..79833c5 100644
+index 33a401f..e2405a7 100644
 --- a/src/Compiler/Info.hs
 +++ b/src/Compiler/Info.hs
 @@ -48,13 +48,7 @@ compilerInfo nativeToo dflags = do
-
+ 
  -- | the directory to use if started without -B flag
  getDefaultTopDir :: IO FilePath
 -getDefaultTopDir = do
@@ -75,6 +81,6 @@ index 33a401f..79833c5 100644
 -        targetOS   = os
 -        subdir     = targetARCH ++ '-':targetOS ++ '-':getFullCompilerVersion
 +getDefaultTopDir = return "@PREFIX@/lib/ghcjs-@VERSION@"
-
+ 
  getDefaultLibDir :: IO FilePath
  getDefaultLibDir = getDefaultTopDir

From db5fe1f8f4b14baa01fcc780ad7dfea2c0c4fe2f Mon Sep 17 00:00:00 2001
From: Edgar Aroutiounian <edgar.factorial@gmail.com>
Date: Tue, 8 Dec 2015 15:02:59 -0800
Subject: [PATCH 0802/2285] darling: init at Dec 8, 2015

---
 .../tools/filesystems/darling-dmg/default.nix | 20 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/tools/filesystems/darling-dmg/default.nix

diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix
new file mode 100644
index 000000000000..a8c9c03fc729
--- /dev/null
+++ b/pkgs/tools/filesystems/darling-dmg/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, fetchFromGitHub, lib, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } :
+
+stdenv.mkDerivation rec {
+  name = "darling-dmg-${version}";
+  version = "1.0";
+  src = fetchFromGitHub {
+    owner = "darlinghq";
+    repo = "darling-dmg";
+    rev = "9522e3907b82f6cde141b3e0e0063f09c8710cbf";
+    sha256 = "5d968b0609f9bfbecc26753d21b5182e15183b672967f7dec6038404cd6a6d7f";
+  };
+  buildInputs = [ cmake fuse openssl zlib bzip2 libxml2 icu ];
+  cmakeConfigureFlagFlags = ["-DCMAKE_BUILD_TYPE=RELEASE"];
+  meta = {
+    homepage = http://www.darlinghq.org/;
+    description = "Darling lets you open OS X dmgs on Linux";
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl3;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 195b42f2d440..8d3dd0511d65 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15415,6 +15415,8 @@ let
 
   darcnes = callPackage ../misc/emulators/darcnes { };
 
+  darling-dmg = callPackage ../tools/filesystems/darling-dmg { };
+
   desmume = callPackage ../misc/emulators/desmume { inherit (pkgs.gnome) gtkglext libglade; };
 
   dbacl = callPackage ../tools/misc/dbacl { };

From 66d76f8b5b9a071bd29fc907a799568cfe3424fc Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 09:23:56 -0600
Subject: [PATCH 0803/2285] qt54.qtbase: don't rever to .dev outputs at runtime

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

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index af9b3feb6df0..b22f90d5daf7 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -98,8 +98,11 @@ stdenv.mkDerivation {
     export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH"
     export MAKEFLAGS=-j$NIX_BUILD_CORES
 
-    export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml"
-    export configureFlags+=" -docdir $out/share/doc/qt5"
+    configureFlags+=" -plugindir $out/lib/qt5/plugins"
+    configureFlags+=" -importdir $out/lib/qt5/imports"
+    configureFlags+=" -qmldir $out/lib/qt5/qml"
+    configureFlags+=" -docdir $out/share/doc/qt5"
+    export configureFlags
   '';
 
   prefixKey = "-prefix ";

From c1f0f62a9cf916b579fa7d8be1a98ffd5b266d44 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 09:30:57 -0600
Subject: [PATCH 0804/2285] qt54.qtbase: don't propagate cups dependency

It is not necessary to propagate the cups buildInput if Qt is configured
with cups enabled.
---
 pkgs/development/libraries/qt-5/5.4/qtbase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index b22f90d5daf7..088cf8fd48fe 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -188,14 +188,14 @@ stdenv.mkDerivation {
   # Qt doesn't directly need GLU (just GL), but many apps use, it's small and
   # doesn't remain a runtime-dep if not used
   ++ lib.optionals mesaSupported [ mesa mesa_glu ]
-  ++ lib.optional (cups != null) cups
   ++ lib.optional (mysql != null) mysql.lib
   ++ lib.optional (postgresql != null) postgresql
   ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
 
   buildInputs =
     [ bison flex gperf ruby ]
-    ++ lib.optional developerBuild gdb;
+    ++ lib.optional developerBuild gdb
+    ++ lib.optional (cups != null) cups;
 
   nativeBuildInputs = [ python perl pkgconfig ];
 

From 5fb4e3b3388d124a561ae4943433a691ba198809 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 09:32:11 -0600
Subject: [PATCH 0805/2285] qt54.qtbase: don't propagate mysql dependency

It is not necessary to propagate the mysql buildInput if Qt is configure
with MySQL enabled.
---
 pkgs/development/libraries/qt-5/5.4/qtbase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index 088cf8fd48fe..ab86f95ece91 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -188,14 +188,14 @@ stdenv.mkDerivation {
   # Qt doesn't directly need GLU (just GL), but many apps use, it's small and
   # doesn't remain a runtime-dep if not used
   ++ lib.optionals mesaSupported [ mesa mesa_glu ]
-  ++ lib.optional (mysql != null) mysql.lib
   ++ lib.optional (postgresql != null) postgresql
   ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
 
   buildInputs =
     [ bison flex gperf ruby ]
     ++ lib.optional developerBuild gdb
-    ++ lib.optional (cups != null) cups;
+    ++ lib.optional (cups != null) cups
+    ++ lib.optional (mysql != null) mysql.lib;
 
   nativeBuildInputs = [ python perl pkgconfig ];
 

From b0753cec2a56e04a5bc834c1b10c41b0ccbc1cd7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 09:32:55 -0600
Subject: [PATCH 0806/2285] qt54.qtbase: don't propagate postgresql dependency

It is not necessary to propagate the postgresql buildInput if Qt is
configured with PostgreSQL enabled.
---
 pkgs/development/libraries/qt-5/5.4/qtbase/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index ab86f95ece91..4ec93242e1f3 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -188,14 +188,14 @@ stdenv.mkDerivation {
   # Qt doesn't directly need GLU (just GL), but many apps use, it's small and
   # doesn't remain a runtime-dep if not used
   ++ lib.optionals mesaSupported [ mesa mesa_glu ]
-  ++ lib.optional (postgresql != null) postgresql
   ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
 
   buildInputs =
     [ bison flex gperf ruby ]
     ++ lib.optional developerBuild gdb
     ++ lib.optional (cups != null) cups
-    ++ lib.optional (mysql != null) mysql.lib;
+    ++ lib.optional (mysql != null) mysql.lib
+    ++ lib.optional (postgresql != null) postgresql;
 
   nativeBuildInputs = [ python perl pkgconfig ];
 

From a6fd9e9be6754180abc9ec1854b80586e7d66d05 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 09:33:45 -0600
Subject: [PATCH 0807/2285] qt54.qtbase: don't propagate gtk dependencies

It is not necessary to propagate the GTK dependencies if Qt is
configured with the GTK Style enabled.
---
 pkgs/development/libraries/qt-5/5.4/qtbase/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index 4ec93242e1f3..e7a1fba90623 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -187,15 +187,15 @@ stdenv.mkDerivation {
   ]
   # Qt doesn't directly need GLU (just GL), but many apps use, it's small and
   # doesn't remain a runtime-dep if not used
-  ++ lib.optionals mesaSupported [ mesa mesa_glu ]
-  ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
+  ++ lib.optionals mesaSupported [ mesa mesa_glu ];
 
   buildInputs =
     [ bison flex gperf ruby ]
     ++ lib.optional developerBuild gdb
     ++ lib.optional (cups != null) cups
     ++ lib.optional (mysql != null) mysql.lib
-    ++ lib.optional (postgresql != null) postgresql;
+    ++ lib.optional (postgresql != null) postgresql
+    ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
 
   nativeBuildInputs = [ python perl pkgconfig ];
 

From 4ed8d5d1251e63abc44dcfb540a4594268c499f3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 10:51:22 -0600
Subject: [PATCH 0808/2285] qt54.qtbase: don't propagate extra Mesa dependency

The note accompanying this dependency says "it's small and doesn't
remain a runtime-dep if not used," but *neither* of those statements is
true.
---
 pkgs/development/libraries/qt-5/5.4/qtbase/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index e7a1fba90623..eabc03b2b327 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -14,7 +14,7 @@
 , mysql ? null, postgresql ? null
 
 # options
-, mesaSupported, mesa, mesa_glu
+, mesaSupported, mesa
 , buildDocs ? false
 , buildExamples ? false
 , buildTests ? false
@@ -185,9 +185,7 @@ stdenv.mkDerivation {
     zlib libjpeg libpng libtiff sqlite icu
     xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
   ]
-  # Qt doesn't directly need GLU (just GL), but many apps use, it's small and
-  # doesn't remain a runtime-dep if not used
-  ++ lib.optionals mesaSupported [ mesa mesa_glu ];
+  ++ lib.optional mesaSupported mesa;
 
   buildInputs =
     [ bison flex gperf ruby ]

From 67d5a026caa2c9153304ba757c0743604fc61450 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 10:53:41 -0600
Subject: [PATCH 0809/2285] qt54.qtbase: don't propagate makeWrapper dependency

I have no idea how it even got here; it's certainly not necessary!
---
 pkgs/development/libraries/qt-5/5.4/qtbase/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index eabc03b2b327..689ae1737940 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -197,8 +197,6 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ python perl pkgconfig ];
 
-  propagatedNativeBuildInputs = [ makeWrapper ];
-
   # freetype-2.5.4 changed signedness of some struct fields
   NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
 

From d8a08fff90890838e5cb07ce97070ecf98560e87 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 12:28:36 -0600
Subject: [PATCH 0810/2285] qt54: disable documentation

The documentation cannot be built as part of the split-module build
anyway. After all the modules are built, we could build the
documentation as a separate package.
---
 pkgs/development/libraries/qt-5/5.4/qtbase/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index 689ae1737940..5a5cbe8875d4 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -15,7 +15,6 @@
 
 # options
 , mesaSupported, mesa
-, buildDocs ? false
 , buildExamples ? false
 , buildTests ? false
 , developerBuild ? false
@@ -204,9 +203,6 @@ stdenv.mkDerivation {
     ''
       # Don't retain build-time dependencies like gdb and ruby.
       sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri
-    ''
-    + lib.optionalString buildDocs ''
-      make docs && make install_docs
     '';
 
   inherit lndir;

From 0055c6aa94484ef30d9541c3b21bc2b653561c84 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 15:55:21 -0600
Subject: [PATCH 0811/2285] qt54: use multiple outputs

---
 .../libraries/qt-5/5.4/default.nix            |   3 +
 .../libraries/qt-5/5.4/qtbase/default.nix     |  37 +++++--
 .../libraries/qt-5/5.4/qtbase/setup-hook.sh   | 103 ++++++++++++------
 3 files changed, 101 insertions(+), 42 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix
index 9b1324d11373..d0e09c6b10f7 100644
--- a/pkgs/development/libraries/qt-5/5.4/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/default.nix
@@ -43,6 +43,9 @@ let
       dontFixLibtool = args.dontFixLibtool or true;
       configureScript = args.configureScript or "qmake";
 
+      outputs = args.outputs or [ "dev" "out" ];
+      setOutputFlags = false;
+
       enableParallelBuilding = args.enableParallelBuilding or true;
 
       meta = {
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index 5a5cbe8875d4..e08640ae8695 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -36,6 +36,8 @@ stdenv.mkDerivation {
 
   sourceRoot = "qt-everywhere-opensource-src-${version}";
 
+  outputs = [ "dev" "out" ];
+
   postUnpack = ''
     mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase
   '';
@@ -93,15 +95,34 @@ stdenv.mkDerivation {
         --replace "@mesa_inc@" "${mesa.dev}"
     '';
 
+  setOutputFlags = false;
   preConfigure = ''
     export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH"
     export MAKEFLAGS=-j$NIX_BUILD_CORES
 
-    configureFlags+=" -plugindir $out/lib/qt5/plugins"
-    configureFlags+=" -importdir $out/lib/qt5/imports"
-    configureFlags+=" -qmldir $out/lib/qt5/qml"
-    configureFlags+=" -docdir $out/share/doc/qt5"
-    export configureFlags
+    _multioutQtDevs() {
+        # We cannot simply set these paths in configureFlags because libQtCore retains
+        # references to the paths it was built with.
+        moveToOutput "bin" "$dev"
+        moveToOutput "include" "$dev"
+        moveToOutput "mkspecs" "$dev"
+
+        # The destination directory must exist or moveToOutput will do nothing
+        mkdir -p "$dev/share"
+        moveToOutput "share/doc" "$dev"
+
+        mkdir -p "$dev/lib"
+        lndir -silent "$out/lib" "$dev/lib"
+        if [[ -h "$dev/lib/cmake" ]]; then rm "$dev/lib/cmake"; fi
+        if [[ -h "$dev/lib/pkgconfig" ]]; then rm "$dev/lib/pkgconfig"; fi
+    }
+    preFixupHooks+=(_multioutQtDevs)
+
+    configureFlags+="\
+        -plugindir $out/lib/qt5/plugins \
+        -importdir $out/lib/qt5/imports \
+        -qmldir $out/lib/qt5/qml \
+        -docdir $out/share/doc/qt5"
   '';
 
   prefixKey = "-prefix ";
@@ -194,15 +215,15 @@ stdenv.mkDerivation {
     ++ lib.optional (postgresql != null) postgresql
     ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
 
-  nativeBuildInputs = [ python perl pkgconfig ];
+  nativeBuildInputs = [ lndir python perl pkgconfig ];
 
   # freetype-2.5.4 changed signedness of some struct fields
   NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
 
-  postInstall =
+  postFixup =
     ''
       # Don't retain build-time dependencies like gdb and ruby.
-      sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri
+      sed '/QMAKE_DEFAULT_.*DIRS/ d' -i "$dev/mkspecs/qconfig.pri"
     '';
 
   inherit lndir;
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.4/qtbase/setup-hook.sh
index b86b6df28ac8..c44cd2234d76 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/setup-hook.sh
@@ -1,45 +1,26 @@
 if [[ -z "$QMAKE" ]]; then
 
-linkDependencyDir() {
+_qtLinkDependencyDir() {
     @lndir@/bin/lndir -silent "$1/$2" "$qtOut/$2"
     if [[ -n "$NIX_QT_SUBMODULE" ]]; then
         find "$1/$2" -printf "$2/%P\n" >> "$out/nix-support/qt-inputs"
     fi
 }
 
-addQtModule() {
-    if [[ -d "$1/mkspecs" ]]; then
+_qtLinkModule() {
+    if [ -d "$1/mkspecs" ]; then
         # $1 is a Qt module
-        linkDependencyDir "$1" mkspecs
+        _qtLinkDependencyDir "$1" mkspecs
 
         for dir in bin include lib share; do
-            if [[ -d "$1/$dir" ]]; then
-                linkDependencyDir "$1" "$dir"
+            if [ -d "$1/$dir" ]; then
+                _qtLinkDependencyDir "$1" "$dir"
             fi
         done
     fi
 }
 
-propagateRuntimeDeps() {
-    local propagated
-    for dir in "etc/xdg" "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports" "share"; do
-        if [[ -d "$1/$dir" ]]; then
-            propagated=
-            for pkg in $propagatedBuildInputs; do
-                if [[ "z$pkg" == "z$1" ]]; then
-                    propagated=1
-                    break
-                fi
-            done
-            if [[ -z $propagated ]]; then
-                propagatedBuildInputs="$propagatedBuildInputs $1"
-            fi
-            break
-        fi
-    done
-}
-
-rmQtModules() {
+_qtRmModules() {
     cat "$out/nix-support/qt-inputs" | while read file; do
       if [[ -h "$out/$file" ]]; then
         rm "$out/$file"
@@ -55,14 +36,65 @@ rmQtModules() {
     rm "$out/nix-support/qt-inputs"
 }
 
-rmQMake() {
+addToSearchPathOnceWithCustomDelimiter() {
+    local delim="$1"
+    local search="$2"
+    local target="$3"
+    local dirs
+    local exported
+    IFS="$delim" read -a dirs <<< "${!search}"
+    for dir in ${dirs[@]}; do
+        if [ "z$dir" == "z$target" ]; then exported=1; fi
+    done
+    if [ -z $exported ]; then
+        eval "export ${search}=\"${!search}${!search:+$delim}$target\""
+    fi
+}
+
+addToSearchPathOnce() {
+    addToSearchPathOnceWithCustomDelimiter ':' "$@"
+}
+
+propagateOnce() {
+    addToSearchPathOnceWithCustomDelimiter ' ' "$@"
+}
+
+_qtPropagateRuntimeDependencies() {
+    for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do
+        if [ -d "$1/$dir" ]; then
+            propagateOnce propagatedBuildInputs "$1"
+            break
+        fi
+    done
+    addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins"
+    addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports"
+    addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml"
+}
+
+_qtRmQmake() {
     rm "$qtOut/bin/qmake" "$qtOut/bin/qt.conf"
 }
 
-setQMakePath() {
+_qtSetQmakePath() {
     export PATH="$qtOut/bin${PATH:+:}$PATH"
 }
 
+_qtMultioutModuleDevs() {
+    # We cannot simply set these paths in configureFlags because libQtCore retains
+    # references to the paths it was built with.
+    moveToOutput "bin" "${!outputDev}"
+    moveToOutput "include" "${!outputDev}"
+
+    # The destination directory must exist or moveToOutput will do nothing
+    mkdir -p "${!outputDev}/share"
+    moveToOutput "share/doc" "${!outputDev}"
+}
+
+_qtMultioutDevs() {
+    # This is necessary whether the package is a Qt module or not
+    moveToOutput "mkspecs" "${!outputDev}"
+}
+
 qtOut=""
 if [[ -z "$NIX_QT_SUBMODULE" ]]; then
     qtOut=`mktemp -d`
@@ -72,7 +104,7 @@ fi
 
 mkdir -p "$qtOut/bin" "$qtOut/mkspecs" "$qtOut/include" "$qtOut/nix-support" "$qtOut/lib" "$qtOut/share"
 
-cp "@out@/bin/qmake" "$qtOut/bin"
+cp "@dev@/bin/qmake" "$qtOut/bin"
 cat >"$qtOut/bin/qt.conf" <<EOF
 [Paths]
 Prefix = $qtOut
@@ -84,17 +116,20 @@ EOF
 
 export QMAKE="$qtOut/bin/qmake"
 
-envHooks+=(addQtModule propagateRuntimeDeps)
-preConfigurePhases+=(setQMakePath)
+envHooks+=(_qtLinkModule _qtPropagateRuntimeDependencies)
+# Set PATH to find qmake first in a preConfigure hook
+# It must run after all the envHooks!
+preConfigureHooks+=(_qtSetQmakePath)
 
+preFixupHooks+=(_qtMultioutDevs)
 if [[ -n "$NIX_QT_SUBMODULE" ]]; then
-    preFixupPhases+=(rmQtModules)
-    postPhases+=(rmQMake)
+    postInstallHooks+=(_qtRmQmake _qtRmModules)
+    preFixupHooks+=(_qtMultioutModuleDevs)
 fi
 
 fi
 
 if [[ -z "$NIX_QT_PIC" ]]; then
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE${NIX_CFLAGS_COMPILE:+ }-fPIC"
     export NIX_QT_PIC=1
 fi

From fcf290cd1d184f34d4d2fba517b385611e191c63 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 15:56:46 -0600
Subject: [PATCH 0812/2285] qt55.qtbase: don't refer to .dev outputs at runtime

---
 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 73fe320769cd..65afcb4119e3 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -83,7 +83,7 @@ stdenv.mkDerivation {
         --replace "@gtk@" "${gtk.out}" \
         --replace "@gnome_vfs@" "${gnome_vfs.out}" \
         --replace "@libgnomeui@" "${libgnomeui.out}" \
-        --replace "@gconf@" "${GConf}"
+        --replace "@gconf@" "${GConf.out}"
     ''
     + lib.optionalString mesaSupported ''
       substituteInPlace \

From 5337a2a4b33027e157e6d5d575e614038554bdf0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 15:57:28 -0600
Subject: [PATCH 0813/2285] qt55.qtbase: don't propagate cups dependency

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

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 65afcb4119e3..212db01ea01d 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -185,14 +185,14 @@ stdenv.mkDerivation {
   # Qt doesn't directly need GLU (just GL), but many apps use, it's small and
   # doesn't remain a runtime-dep if not used
   ++ lib.optionals mesaSupported [ mesa mesa_glu ]
-  ++ lib.optional (cups != null) cups
   ++ lib.optional (mysql != null) mysql.lib
   ++ lib.optional (postgresql != null) postgresql
   ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf];
 
   buildInputs =
     [ bison flex gperf ruby ]
-    ++ lib.optional developerBuild gdb;
+    ++ lib.optional developerBuild gdb
+    ++ lib.optional (cups != null) cups;
 
   nativeBuildInputs = [ python perl pkgconfig ];
 

From d5d75546397c03959cf5231786f16bb81a64cf39 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 15:58:00 -0600
Subject: [PATCH 0814/2285] qt55.qtbase: don't propagate mysql dependency

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

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 212db01ea01d..b7a6203aeb94 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -185,14 +185,14 @@ stdenv.mkDerivation {
   # Qt doesn't directly need GLU (just GL), but many apps use, it's small and
   # doesn't remain a runtime-dep if not used
   ++ lib.optionals mesaSupported [ mesa mesa_glu ]
-  ++ lib.optional (mysql != null) mysql.lib
   ++ lib.optional (postgresql != null) postgresql
   ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf];
 
   buildInputs =
     [ bison flex gperf ruby ]
     ++ lib.optional developerBuild gdb
-    ++ lib.optional (cups != null) cups;
+    ++ lib.optional (cups != null) cups
+    ++ lib.optional (mysql != null) mysql.lib;
 
   nativeBuildInputs = [ python perl pkgconfig ];
 

From 4b844747a27bc0522a19f91b10a0c0326eaeaaca Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 15:58:25 -0600
Subject: [PATCH 0815/2285] qt55.qtbase: don't propagate postgresql dependency

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

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index b7a6203aeb94..91de7b769292 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -185,14 +185,14 @@ stdenv.mkDerivation {
   # Qt doesn't directly need GLU (just GL), but many apps use, it's small and
   # doesn't remain a runtime-dep if not used
   ++ lib.optionals mesaSupported [ mesa mesa_glu ]
-  ++ lib.optional (postgresql != null) postgresql
   ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf];
 
   buildInputs =
     [ bison flex gperf ruby ]
     ++ lib.optional developerBuild gdb
     ++ lib.optional (cups != null) cups
-    ++ lib.optional (mysql != null) mysql.lib;
+    ++ lib.optional (mysql != null) mysql.lib
+    ++ lib.optional (postgresql != null) postgresql;
 
   nativeBuildInputs = [ python perl pkgconfig ];
 

From e64822b87dac14fdab96b31d110127d7270b5adf Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 15:59:03 -0600
Subject: [PATCH 0816/2285] qt55.qtbase: don't propagate gtk dependencies

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

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 91de7b769292..18f04d4199db 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -184,15 +184,15 @@ stdenv.mkDerivation {
   ]
   # Qt doesn't directly need GLU (just GL), but many apps use, it's small and
   # doesn't remain a runtime-dep if not used
-  ++ lib.optionals mesaSupported [ mesa mesa_glu ]
-  ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf];
+  ++ lib.optionals mesaSupported [ mesa mesa_glu ];
 
   buildInputs =
     [ bison flex gperf ruby ]
     ++ lib.optional developerBuild gdb
     ++ lib.optional (cups != null) cups
     ++ lib.optional (mysql != null) mysql.lib
-    ++ lib.optional (postgresql != null) postgresql;
+    ++ lib.optional (postgresql != null) postgresql
+    ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf];
 
   nativeBuildInputs = [ python perl pkgconfig ];
 

From 302450dbfe810cc00f55b447621a0f0ce8d90043 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 15:59:32 -0600
Subject: [PATCH 0817/2285] qt55.qtbase: don't propagate extra Mesa dependency

---
 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 18f04d4199db..755c9d92fb5c 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -14,7 +14,7 @@
 , mysql ? null, postgresql ? null
 
 # options
-, mesaSupported, mesa, mesa_glu
+, mesaSupported, mesa
 , buildDocs ? false
 , buildExamples ? false
 , buildTests ? false
@@ -182,9 +182,7 @@ stdenv.mkDerivation {
     zlib libjpeg libpng libtiff sqlite icu
     xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
   ]
-  # Qt doesn't directly need GLU (just GL), but many apps use, it's small and
-  # doesn't remain a runtime-dep if not used
-  ++ lib.optionals mesaSupported [ mesa mesa_glu ];
+  ++ lib.optional mesaSupported mesa;
 
   buildInputs =
     [ bison flex gperf ruby ]

From 3cfb552bbce40a275348d3ba70d0f08b21b0c71f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 15:59:52 -0600
Subject: [PATCH 0818/2285] qt55.qtbase: don't depend on makeWrapper

---
 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 755c9d92fb5c..f039973a9b94 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -194,8 +194,6 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ python perl pkgconfig ];
 
-  propagatedNativeBuildInputs = [ makeWrapper ];
-
   # freetype-2.5.4 changed signedness of some struct fields
   NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
 

From db69888a02a85f98aafad2654c1c21072a4d3a4e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 16:00:20 -0600
Subject: [PATCH 0819/2285] qt55.qtbase: disable documentation

The documentation cannot be built as part of the split-module build
anyway. After all the modules are built, we could build the
documentation as a separate package.
---
 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index f039973a9b94..ef6e0620bca9 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -15,7 +15,6 @@
 
 # options
 , mesaSupported, mesa
-, buildDocs ? false
 , buildExamples ? false
 , buildTests ? false
 , developerBuild ? false
@@ -201,9 +200,6 @@ stdenv.mkDerivation {
     ''
       # Don't retain build-time dependencies like gdb and ruby.
       sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri
-    ''
-    + lib.optionalString buildDocs ''
-      make docs && make install_docs
     '';
 
   inherit lndir;

From 74121e07a74857667b58c6db5af99ef613679fb2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 23 Jan 2016 16:02:20 -0600
Subject: [PATCH 0820/2285] qt55: use multiple outputs

---
 .../libraries/qt-5/5.5/default.nix            |  3 ++
 .../libraries/qt-5/5.5/qtbase/default.nix     | 34 ++++++++++++++++---
 .../libraries/qt-5/5.5/qtbase/setup-hook.sh   | 27 ++++++++++++---
 3 files changed, 55 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
index 9b1324d11373..d0e09c6b10f7 100644
--- a/pkgs/development/libraries/qt-5/5.5/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/default.nix
@@ -43,6 +43,9 @@ let
       dontFixLibtool = args.dontFixLibtool or true;
       configureScript = args.configureScript or "qmake";
 
+      outputs = args.outputs or [ "dev" "out" ];
+      setOutputFlags = false;
+
       enableParallelBuilding = args.enableParallelBuilding or true;
 
       meta = {
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index ef6e0620bca9..820648316532 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -36,6 +36,8 @@ stdenv.mkDerivation {
 
   sourceRoot = "qt-everywhere-opensource-src-${version}";
 
+  outputs = [ "dev" "out" ];
+
   postUnpack = ''
     mv qtbase-opensource-src-${version} ./qt-everywhere-opensource-src-${version}/qtbase
   '';
@@ -93,12 +95,34 @@ stdenv.mkDerivation {
         --replace "@mesa_inc@" "${mesa.dev}"
     '';
 
+  setOutputFlags = false;
   preConfigure = ''
     export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$LD_LIBRARY_PATH"
     export MAKEFLAGS=-j$NIX_BUILD_CORES
 
-    export configureFlags+="-plugindir $out/lib/qt5/plugins -importdir $out/lib/qt5/imports -qmldir $out/lib/qt5/qml"
-    export configureFlags+=" -docdir $out/share/doc/qt5"
+    _multioutQtDevs() {
+        # We cannot simply set these paths in configureFlags because libQtCore retains
+        # references to the paths it was built with.
+        moveToOutput "bin" "$dev"
+        moveToOutput "include" "$dev"
+        moveToOutput "mkspecs" "$dev"
+
+        # The destination directory must exist or moveToOutput will do nothing
+        mkdir -p "$dev/share"
+        moveToOutput "share/doc" "$dev"
+
+        mkdir -p "$dev/lib"
+        lndir -silent "$out/lib" "$dev/lib"
+        if [[ -h "$dev/lib/cmake" ]]; then rm "$dev/lib/cmake"; fi
+        if [[ -h "$dev/lib/pkgconfig" ]]; then rm "$dev/lib/pkgconfig"; fi
+    }
+    preFixupHooks+=(_multioutQtDevs)
+
+    configureFlags+="\
+        -plugindir $out/lib/qt5/plugins \
+        -importdir $out/lib/qt5/imports \
+        -qmldir $out/lib/qt5/qml \
+        -docdir $out/share/doc/qt5"
   '';
 
   prefixKey = "-prefix ";
@@ -191,15 +215,15 @@ stdenv.mkDerivation {
     ++ lib.optional (postgresql != null) postgresql
     ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf];
 
-  nativeBuildInputs = [ python perl pkgconfig ];
+  nativeBuildInputs = [ lndir python perl pkgconfig ];
 
   # freetype-2.5.4 changed signedness of some struct fields
   NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
 
-  postInstall =
+  postFixup =
     ''
       # Don't retain build-time dependencies like gdb and ruby.
-      sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri
+      sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri
     '';
 
   inherit lndir;
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh
index b86b6df28ac8..59e04a3561e0 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh
@@ -63,6 +63,22 @@ setQMakePath() {
     export PATH="$qtOut/bin${PATH:+:}$PATH"
 }
 
+_multioutQtModuleDevs() {
+    # We cannot simply set these paths in configureFlags because libQtCore retains
+    # references to the paths it was built with.
+    moveToOutput "bin" "${!outputDev}"
+    moveToOutput "include" "${!outputDev}"
+
+    # The destination directory must exist or moveToOutput will do nothing
+    mkdir -p "${!outputDev}/share"
+    moveToOutput "share/doc" "${!outputDev}"
+}
+
+_multioutQtDevs() {
+    # This is necessary whether the package is a Qt module or not
+    moveToOutput "mkspecs" "${!outputDev}"
+}
+
 qtOut=""
 if [[ -z "$NIX_QT_SUBMODULE" ]]; then
     qtOut=`mktemp -d`
@@ -72,7 +88,7 @@ fi
 
 mkdir -p "$qtOut/bin" "$qtOut/mkspecs" "$qtOut/include" "$qtOut/nix-support" "$qtOut/lib" "$qtOut/share"
 
-cp "@out@/bin/qmake" "$qtOut/bin"
+cp "@dev@/bin/qmake" "$qtOut/bin"
 cat >"$qtOut/bin/qt.conf" <<EOF
 [Paths]
 Prefix = $qtOut
@@ -85,11 +101,14 @@ EOF
 export QMAKE="$qtOut/bin/qmake"
 
 envHooks+=(addQtModule propagateRuntimeDeps)
-preConfigurePhases+=(setQMakePath)
+# Set PATH to find qmake first in a preConfigure hook
+# It must run after all the envHooks!
+preConfigureHooks+=(setQMakePath)
 
+preFixupHooks+=(_multioutQtDevs)
 if [[ -n "$NIX_QT_SUBMODULE" ]]; then
-    preFixupPhases+=(rmQtModules)
-    postPhases+=(rmQMake)
+    postInstallHooks+=(rmQMake rmQtModules)
+    preFixupHooks+=(_multioutQtModuleDevs)
 fi
 
 fi

From 6dda0824ba8eb8c1a4ac3d6190224491030c4064 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 11:06:40 -0600
Subject: [PATCH 0821/2285] qt55.qtbase: use -system-harfbuzz

---
 pkgs/development/libraries/qt-5/5.5/default.nix   |  1 +
 .../libraries/qt-5/5.5/qtbase/default.nix         | 15 ++++++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
index d0e09c6b10f7..4ace24956594 100644
--- a/pkgs/development/libraries/qt-5/5.5/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/default.nix
@@ -64,6 +64,7 @@ let
 
       qtbase = callPackage ./qtbase {
         mesa = pkgs.mesa_noglu;
+        harfbuzz = pkgs.harfbuzz-icu;
         cups = if stdenv.isLinux then pkgs.cups else null;
         # GNOME dependencies are not used unless gtkStyle == true
         inherit (pkgs.gnome) libgnomeui GConf gnome_vfs;
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 820648316532..c9d5d1a170e8 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -3,7 +3,8 @@
 
 , xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi
 , xcbutil, xcbutilimage, xcbutilkeysyms, xcbutilwm, libxkbcommon
-, fontconfig, freetype, openssl, dbus, glib, udev, libxml2, libxslt, pcre
+, fontconfig, freetype, harfbuzz
+, openssl, dbus, glib, udev, libxml2, libxslt, pcre
 , zlib, libjpeg, libpng, libtiff, sqlite, icu
 
 , coreutils, bison, flex, gdb, gperf, lndir, ruby
@@ -177,6 +178,7 @@ stdenv.mkDerivation {
     -no-mips_dspr2
 
     -system-zlib
+    -system-harfbuzz
     -system-libpng
     -system-libjpeg
     -system-xcb
@@ -200,9 +202,16 @@ stdenv.mkDerivation {
   PSQL_LIBS = lib.optionalString (postgresql != null) "-L${postgresql.lib}/lib -lpq";
 
   propagatedBuildInputs = [
+    dbus glib libxml2 libxslt openssl pcre sqlite udev zlib
+
+    # Image formats
+    libjpeg libpng libtiff
+
+    # Text rendering
+    fontconfig freetype harfbuzz icu
+
+    # X11 libs
     xlibs.libXcomposite libX11 libxcb libXext libXrender libXi
-    fontconfig freetype openssl dbus glib udev libxml2 libxslt pcre
-    zlib libjpeg libpng libtiff sqlite icu
     xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon
   ]
   ++ lib.optional mesaSupported mesa;

From 9adcd6f78c36163731b480b1be368defccc3e47a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 11:08:00 -0600
Subject: [PATCH 0822/2285] qt55: update homepage

---
 pkgs/development/libraries/qt-5/5.5/default.nix        | 2 +-
 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
index 4ace24956594..5f631357b5bb 100644
--- a/pkgs/development/libraries/qt-5/5.5/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/default.nix
@@ -49,7 +49,7 @@ let
       enableParallelBuilding = args.enableParallelBuilding or true;
 
       meta = {
-        homepage = http://qt-project.org;
+        homepage = http://www.qt.io;
         description = "A cross-platform application framework for C++";
         license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
         maintainers = with maintainers; [ bbenoist qknight ttuegel ];
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index c9d5d1a170e8..092f72264c33 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -241,7 +241,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   meta = with lib; {
-    homepage = http://qt-project.org;
+    homepage = http://www.qt.io;
     description = "A cross-platform application framework for C++";
     license = "GPL/LGPL";
     maintainers = with maintainers; [ bbenoist qknight ttuegel ];

From a6c9a6f5bff3835ceb1d201e7904c83c9736f15d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 11:08:43 -0600
Subject: [PATCH 0823/2285] qt55.qtbase: set licenses correctly

---
 pkgs/development/libraries/qt-5/5.5/default.nix      | 12 ++++--------
 .../libraries/qt-5/5.5/qtbase/default.nix            |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
index 5f631357b5bb..ae98c2c4b1f7 100644
--- a/pkgs/development/libraries/qt-5/5.5/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/default.nix
@@ -48,13 +48,7 @@ let
 
       enableParallelBuilding = args.enableParallelBuilding or true;
 
-      meta = {
-        homepage = http://www.qt.io;
-        description = "A cross-platform application framework for C++";
-        license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
-        maintainers = with maintainers; [ bbenoist qknight ttuegel ];
-        platforms = platforms.linux;
-      } // (args.meta or {});
+      meta = self.qtbase.meta // (args.meta or {});
     });
 
   addPackages = self: with self;
@@ -117,4 +111,6 @@ let
 
     };
 
-in makeScope pkgs.newScope addPackages
+   self = makeScope pkgs.newScope addPackages;
+
+in self
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 092f72264c33..5b0ced230280 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -243,7 +243,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     homepage = http://www.qt.io;
     description = "A cross-platform application framework for C++";
-    license = "GPL/LGPL";
+    license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
     maintainers = with maintainers; [ bbenoist qknight ttuegel ];
     platforms = platforms.linux;
   };

From 4465f438dee7bb766f97a9eb0f328fff87a2365b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 11:15:20 -0600
Subject: [PATCH 0824/2285] qt55: improve update documentation

---
 .../libraries/qt-5/5.5/default.nix            | 29 +++++++++++--------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
index ae98c2c4b1f7..9863683840cb 100644
--- a/pkgs/development/libraries/qt-5/5.5/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/default.nix
@@ -1,15 +1,20 @@
-# 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.
+/*
+
+# Minor Updates
+
+1. Edit ./fetchsrcs.sh to point to the updated URL.
+2. Run ./fetchsrcs.sh.
+3. Build and enjoy.
+
+# 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.
+
+*/
 
 { pkgs
 

From 1087020a468f441bcc99b0e608cb642e58e5903b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 12:18:56 -0600
Subject: [PATCH 0825/2285] cmake: invoke configure hooks correctly

Otherwise, the multiple-outputs hooks will not fire correctly.
---
 pkgs/development/tools/build-managers/cmake/setup-hook.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
index 670376efdcab..c4684e0376ce 100755
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@@ -13,7 +13,7 @@ fixCmakeFiles() {
 }
 
 cmakeConfigurePhase() {
-    eval "$preConfigure"
+    runHook preConfigure
 
     if [ -z "$dontFixCmake" ]; then
         fixCmakeFiles .
@@ -53,7 +53,7 @@ cmakeConfigurePhase() {
 
     cmake ${cmakeDir:-.} $cmakeFlags "${cmakeFlagsArray[@]}"
 
-    eval "$postConfigure"
+    runHook postConfigure
 }
 
 if [ -z "$dontUseCmakeConfigure" -a -z "$configurePhase" ]; then

From a714284d8b7d2dac3ed2c76670f290fe332da00c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 12:20:39 -0600
Subject: [PATCH 0826/2285] cmake: don't set incompatible flags for multiple
 outputs

---
 pkgs/development/tools/build-managers/cmake/setup-hook.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/tools/build-managers/cmake/setup-hook.sh b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
index c4684e0376ce..b14e9984bc3c 100755
--- a/pkgs/development/tools/build-managers/cmake/setup-hook.sh
+++ b/pkgs/development/tools/build-managers/cmake/setup-hook.sh
@@ -57,6 +57,7 @@ cmakeConfigurePhase() {
 }
 
 if [ -z "$dontUseCmakeConfigure" -a -z "$configurePhase" ]; then
+    setOutputFlags=
     configurePhase=cmakeConfigurePhase
 fi
 

From a27a4c29ad87fc0a8745fc89927d0d98a9055a08 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 12:38:16 -0600
Subject: [PATCH 0827/2285] extra-cmake-modules: use multiple outputs

---
 .../0001-extra-cmake-modules-paths.patch      | 74 -------------------
 .../extra-cmake-modules/default.nix           | 12 +--
 .../extra-cmake-modules/nix-lib-path.patch    | 37 ++++++++++
 .../extra-cmake-modules/series                |  1 +
 .../extra-cmake-modules/setup-hook.sh         | 44 +++++++++++
 5 files changed, 89 insertions(+), 79 deletions(-)
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/nix-lib-path.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/series

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
deleted file mode 100644
index 9717716faf5b..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Fri, 20 Feb 2015 23:17:39 -0600
-Subject: [PATCH] extra-cmake-modules paths
-
----
- kde-modules/KDEInstallDirs.cmake | 37 ++++---------------------------------
- 1 file changed, 4 insertions(+), 33 deletions(-)
-
-diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
-index b7cd34d..2f868ac 100644
---- a/kde-modules/KDEInstallDirs.cmake
-+++ b/kde-modules/KDEInstallDirs.cmake
-@@ -193,37 +193,8 @@
- # (To distribute this file outside of extra-cmake-modules, substitute the full
- #  License text for the above reference.)
- 
--# Figure out what the default install directory for libraries should be.
--# This is based on the logic in GNUInstallDirs, but simplified (the
--# GNUInstallDirs code deals with re-configuring, but that is dealt with
--# by the _define_* macros in this module).
-+# The default library directory on NixOS is *always* /lib.
- set(_LIBDIR_DEFAULT "lib")
--# Override this default 'lib' with 'lib64' iff:
--#  - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
--#  - we are NOT on debian
--#  - we are on a 64 bits system
--# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
--# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
--# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
--# See http://wiki.debian.org/Multiarch
--if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
--   AND NOT CMAKE_CROSSCOMPILING)
--  if (EXISTS "/etc/debian_version") # is this a debian system ?
--    if(CMAKE_LIBRARY_ARCHITECTURE)
--      set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
--    endif()
--  else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
--    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
--      message(AUTHOR_WARNING
--        "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
--        "Please enable at least one language before including KDEInstallDirs.")
--    else()
--      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
--        set(_LIBDIR_DEFAULT "lib64")
--      endif()
--    endif()
--  endif()
--endif()
- 
- set(_gnu_install_dirs_vars
-     BINDIR
-@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
-         "QtQuick2 imports"
-         QML_INSTALL_DIR)
- else()
--    _define_relative(QTPLUGINDIR LIBDIR "plugins"
-+    _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
-         "Qt plugins"
-         QT_PLUGIN_INSTALL_DIR)
- 
--    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports"
-+    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports"
-         "QtQuick1 imports"
-         IMPORTS_INSTALL_DIR)
- 
--    _define_relative(QMLDIR LIBDIR "qml"
-+    _define_relative(QMLDIR LIBDIR "qt5/qml"
-         "QtQuick2 imports"
-         QML_INSTALL_DIR)
- endif()
--- 
-2.3.0
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/default.nix
index 4e1b1aff3bd1..1c2ea70442d3 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/default.nix
@@ -1,9 +1,11 @@
-{ kdeFramework, lib, stdenv, cmake, pkgconfig, qttools }:
+{ kdeFramework, lib, copyPathsToStore, cmake, pkgconfig, qttools }:
 
 kdeFramework {
   name = "extra-cmake-modules";
-  patches = [ ./0001-extra-cmake-modules-paths.patch ];
 
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+
+  outputs = [ "out" ];  # this package has no runtime components
   setupHook = ./setup-hook.sh;
 
   # It is OK to propagate these inputs as long as
@@ -11,8 +13,8 @@ kdeFramework {
   # of some other derivation.
   propagatedNativeBuildInputs = [ cmake pkgconfig qttools ];
 
-  meta = {
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = [ lib.maintainers.ttuegel ];
+  meta = with lib; {
+    license = licenses.bsd2;
+    maintainers = [ maintainers.ttuegel ];
   };
 }
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/nix-lib-path.patch b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/nix-lib-path.patch
new file mode 100644
index 000000000000..a74340a6dc96
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/nix-lib-path.patch
@@ -0,0 +1,37 @@
+Index: extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake
+===================================================================
+--- extra-cmake-modules-5.18.0.orig/kde-modules/KDEInstallDirs.cmake
++++ extra-cmake-modules-5.18.0/kde-modules/KDEInstallDirs.cmake
+@@ -200,32 +200,6 @@
+ # GNUInstallDirs code deals with re-configuring, but that is dealt with
+ # by the _define_* macros in this module).
+ set(_LIBDIR_DEFAULT "lib")
+-# Override this default 'lib' with 'lib64' iff:
+-#  - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
+-#  - we are NOT on debian
+-#  - we are on a 64 bits system
+-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
+-# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
+-# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
+-# See http://wiki.debian.org/Multiarch
+-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
+-   AND NOT CMAKE_CROSSCOMPILING)
+-  if (EXISTS "/etc/debian_version") # is this a debian system ?
+-    if(CMAKE_LIBRARY_ARCHITECTURE)
+-      set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+-    endif()
+-  else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
+-    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
+-      message(AUTHOR_WARNING
+-        "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
+-        "Please enable at least one language before including KDEInstallDirs.")
+-    else()
+-      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+-        set(_LIBDIR_DEFAULT "lib64")
+-      endif()
+-    endif()
+-  endif()
+-endif()
+ 
+ set(_gnu_install_dirs_vars
+     BINDIR
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/series b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/series
new file mode 100644
index 000000000000..b4569e50a5f7
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/series
@@ -0,0 +1 @@
+nix-lib-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
index a6fa6189240b..ee26f75cf5f0 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
@@ -24,4 +24,48 @@ addMimePkg() {
     fi
 }
 
+_ecmConfig() {
+    # Because we need to use absolute paths here, we must set *all* the paths.
+    cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}"
+    cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin"
+    cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin"
+    cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib"
+    cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/lib/libexec"
+    cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake"
+    cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputLib}/lib/qt5/plugins"
+    cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputLib}/lib/qt5/plugins"
+    cmakeFlags+=" -DKDE_INSTALL_QTQUICKIMPORTSDIR=${!outputLib}/lib/qt5/imports"
+    cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputLib}/lib/qt5/qml"
+    cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include"
+    cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var"
+    cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputLib}/share"
+    cmakeFlags+=" -DKDE_INSTALL_DATADIR=${!outputLib}/share"
+    cmakeFlags+=" -DKDE_INSTALL_DOCBUNDLEDIR=${!outputLib}/share/doc/HTML"
+    cmakeFlags+=" -DKDE_INSTALL_KCFGDIR=${!outputLib}/share/config.kcfg"
+    cmakeFlags+=" -DKDE_INSTALL_KCONFUPDATEDIR=${!outputLib}/share/kconf_update"
+    cmakeFlags+=" -DKDE_INSTALL_KSERVICES5DIR=${!outputLib}/share/kservices5"
+    cmakeFlags+=" -DKDE_INSTALL_KSERVICETYPES5DIR=${!outputLib}/share/kservicetypes5"
+    cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputLib}/share/kxmlgui5"
+    cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputLib}/share/knotifications5"
+    cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputLib}/share/icons"
+    cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale"
+    cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputLib}/share/sounds"
+    cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputLib}/share/templates"
+    cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputLib}/share/wallpapers"
+    cmakeFlags+=" -DKDE_INSTALL_APPDIR=${!outputLib}/share/applications"
+    cmakeFlags+=" -DKDE_INSTALL_DESKTOPDIR=${!outputLib}/share/desktop-directories"
+    cmakeFlags+=" -DKDE_INSTALL_MIMEDIR=${!outputLib}/share/mime/packages"
+    cmakeFlags+=" -DKDE_INSTALL_METAINFODIR=${!outputLib}/share/appdata"
+    cmakeFlags+=" -DKDE_INSTALL_MANDIR=${!outputLib}/share/man"
+    cmakeFlags+=" -DKDE_INSTALL_INFODIR=${!outputLib}/share/info"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSDIR=${!outputLib}/share/dbus-1"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputLib}/share/interfaces"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputLib}/share/services"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputLib}/share/system-services"
+    cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputLib}/etc"
+    cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputLib}/etc/xdg"
+    cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputLib}/etc/xdg/autostart"
+}
+
 envHooks+=(addMimePkg)
+preConfigureHooks+=(_ecmConfig)

From ac5a585ed8ef6cbc6fd32127165b52022ba4c1b8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 16:43:16 -0600
Subject: [PATCH 0828/2285] qt55: add fixQtModuleCMakeConfig setup hook

---
 pkgs/development/libraries/qt-5/5.5/default.nix              | 2 ++
 .../libraries/qt-5/5.5/fix-qt-module-cmake-config.sh         | 5 +++++
 2 files changed, 7 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-5/5.5/fix-qt-module-cmake-config.sh

diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
index 9863683840cb..88f064edc7d3 100644
--- a/pkgs/development/libraries/qt-5/5.5/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/default.nix
@@ -42,6 +42,7 @@ let
       inherit src;
 
       propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
+      nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ self.fixQtModuleCMakeConfig ];
 
       NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
       dontAddPrefix = args.dontAddPrefix or true;
@@ -113,6 +114,7 @@ let
       ];
 
       makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh;
+      fixQtModuleCMakeConfig = makeSetupHook { } ./fix-qt-module-cmake-config.sh;
 
     };
 
diff --git a/pkgs/development/libraries/qt-5/5.5/fix-qt-module-cmake-config.sh b/pkgs/development/libraries/qt-5/5.5/fix-qt-module-cmake-config.sh
new file mode 100644
index 000000000000..7ca3e33b613c
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.5/fix-qt-module-cmake-config.sh
@@ -0,0 +1,5 @@
+fixQtModuleCMakeConfig() {
+    local module="$1"
+    sed -e "/set(imported_location/ s@\\\${_qt5${module}_install_prefix}@${!outputLib}@" \
+        -i "${!outputDev}/lib/cmake/Qt5${module}/Qt5${module}Config.cmake"
+}

From 8bfae5c46d9f7c6109dae24d7328051011bf371a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 16:43:49 -0600
Subject: [PATCH 0829/2285] qt55.qtbase: fix Qt module CMake config files

---
 .../libraries/qt-5/5.5/qtbase/default.nix       | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 5b0ced230280..0dd17ed699bb 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, copyPathsToStore, makeWrapper
+{ stdenv, lib, fetchurl, copyPathsToStore, fixQtModuleCMakeConfig
 , srcs
 
 , xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi
@@ -224,7 +224,7 @@ stdenv.mkDerivation {
     ++ lib.optional (postgresql != null) postgresql
     ++ lib.optionals gtkStyle [gnome_vfs.out libgnomeui.out gtk GConf];
 
-  nativeBuildInputs = [ lndir python perl pkgconfig ];
+  nativeBuildInputs = [ fixQtModuleCMakeConfig lndir python perl pkgconfig ];
 
   # freetype-2.5.4 changed signedness of some struct fields
   NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
@@ -233,6 +233,19 @@ stdenv.mkDerivation {
     ''
       # Don't retain build-time dependencies like gdb and ruby.
       sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $dev/mkspecs/qconfig.pri
+
+      fixQtModuleCMakeConfig "Concurrent"
+      fixQtModuleCMakeConfig "Core"
+      fixQtModuleCMakeConfig "DBus"
+      fixQtModuleCMakeConfig "Gui"
+      fixQtModuleCMakeConfig "Network"
+      fixQtModuleCMakeConfig "OpenGL"
+      fixQtModuleCMakeConfig "OpenGLExtensions"
+      fixQtModuleCMakeConfig "PrintSupport"
+      fixQtModuleCMakeConfig "Sql"
+      fixQtModuleCMakeConfig "Test"
+      fixQtModuleCMakeConfig "Widgets"
+      fixQtModuleCMakeConfig "Xml"
     '';
 
   inherit lndir;

From 6dfabcb47b0d84c9650d4c2960877fbf3b5489c7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 16:44:33 -0600
Subject: [PATCH 0830/2285] qt55.qtscript: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qtscript/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix
index 127766e2ebd6..b81a43aeadb0 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtscript/default.nix
@@ -4,4 +4,7 @@ qtSubmodule {
   name = "qtscript";
   qtInputs = [ qtbase qttools ];
   patches = [ ./0001-glib-2.32.patch ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Script"
+  '';
 }

From 6c37bebabdf53b6d1195bfce5fc0acc60849c22d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 16:44:48 -0600
Subject: [PATCH 0831/2285] qt55.qtdeclarative: fix Qt module CMake config
 files

---
 .../libraries/qt-5/5.5/qtdeclarative/default.nix            | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix
index 9181c37b2258..e2219642a122 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtdeclarative/default.nix
@@ -5,4 +5,10 @@ qtSubmodule {
   patches = [ ./0001-nix-profiles-import-paths.patch ];
   qtInputs = [ qtbase qtsvg qtxmlpatterns ];
   nativeBuildInputs = [ python ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Qml"
+    fixQtModuleCMakeConfig "Quick"
+    fixQtModuleCMakeConfig "QuickTest"
+    fixQtModuleCMakeConfig "QuickWidgets"
+  '';
 }

From 24d0cfbb3a54b78e3f11bcba69ad61d1e0c3b336 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 16:45:36 -0600
Subject: [PATCH 0832/2285] kde5.frameworks: use multiple outputs

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

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/default.nix
index f41aebcb59d3..2ecde7e834fb 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/default.nix
@@ -23,6 +23,8 @@ let
         name = "${name}-${version}";
         inherit src;
 
+        outputs = [ "dev" "out" ];
+
         cmakeFlags =
           (args.cmakeFlags or [])
           ++ [ "-DBUILD_TESTING=OFF" ]

From 27824e3332f7e77e876adc9b31b4fd80d9e0d2a1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:25:18 -0600
Subject: [PATCH 0833/2285] qt55.qtxmlpatterns: fix Qt module CMake config
 files

---
 pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix
index 9a8ddbba2bd2..3b22132e4c38 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtxmlpatterns.nix
@@ -3,4 +3,7 @@
 qtSubmodule {
   name = "qtxmlpatterns";
   qtInputs = [ qtbase ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "XmlPatterns"
+  '';
 }

From 055b1b86c5341cf8c6bb03ec61577332c59e00c1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:25:38 -0600
Subject: [PATCH 0834/2285] qt55.qtx11extras: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qtx11extras.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix
index a765161e2d7e..db92f1353627 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtx11extras.nix
@@ -3,4 +3,7 @@
 qtSubmodule {
   name = "qtx11extras";
   qtInputs = [ qtbase ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "X11Extras"
+  '';
 }

From da454bc547ae4f7fd3c26ee717f7b62606ec6c34 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:26:15 -0600
Subject: [PATCH 0835/2285] qt55.qtwebsockets: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix
index fbdfbbcf0dbe..c0d0f9e7d714 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtwebsockets.nix
@@ -3,4 +3,7 @@
 qtSubmodule {
   name = "qtwebsockets";
   qtInputs = [ qtbase qtdeclarative ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "WebSockets"
+  '';
 }

From db7cabe0987f0a792b904b608801e95d2df8c813 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:26:31 -0600
Subject: [PATCH 0836/2285] qt55.qtwebkit: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
index 2e92391f4c08..b441a2448d76 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtwebkit/default.nix
@@ -31,4 +31,8 @@ qtSubmodule {
         };
     in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ]
     ++ [ dlopen-webkit-udev ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "WebKit"
+    fixQtModuleCMakeConfig "WebKitWidgets"
+  '';
 }

From ed20a6a97cd9f674ca9f20668d9d2580f1a94913 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:27:08 -0600
Subject: [PATCH 0837/2285] qt55.qttools: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qttools.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qttools.nix b/pkgs/development/libraries/qt-5/5.5/qttools.nix
index 65edc4508128..a6b29c07cac9 100644
--- a/pkgs/development/libraries/qt-5/5.5/qttools.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qttools.nix
@@ -3,4 +3,11 @@
 qtSubmodule {
   name = "qttools";
   qtInputs = [ qtbase ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Designer"
+    fixQtModuleCMakeConfig "Help"
+    fixQtModuleCMakeConfig "LinguistTools"
+    fixQtModuleCMakeConfig "UiPlugin"
+    fixQtModuleCMakeConfig "UiTools"
+  '';
 }

From 02f276123319d977764e39e3a167c45cc89eac31 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:27:23 -0600
Subject: [PATCH 0838/2285] qt55.qtsvg: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qtsvg.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtsvg.nix b/pkgs/development/libraries/qt-5/5.5/qtsvg.nix
index b9ccac7cf933..a460d6da4c2a 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtsvg.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtsvg.nix
@@ -3,4 +3,7 @@
 qtSubmodule {
   name = "qtsvg";
   qtInputs = [ qtbase ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Svg"
+  '';
 }

From 50de9a3f09b23205199ba5a8bc2dcfea76839ddb Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:27:37 -0600
Subject: [PATCH 0839/2285] qt55.qtserialport: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix
index 32549c95344a..3f409f9c0e08 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtserialport/default.nix
@@ -9,4 +9,7 @@ qtSubmodule {
       libudev = libudev.out;
     })
   ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "SerialPort"
+  '';
 }

From abcb26c2bb2ea1b710eafeddcece76725391db89 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:27:58 -0600
Subject: [PATCH 0840/2285] qt55.qtsensors: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qtsensors.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtsensors.nix b/pkgs/development/libraries/qt-5/5.5/qtsensors.nix
index 61e64dc47e4d..5776f45a7068 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtsensors.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtsensors.nix
@@ -3,4 +3,7 @@
 qtSubmodule {
   name = "qtsensors";
   qtInputs = [ qtbase qtdeclarative ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Sensors"
+  '';
 }

From 89dc8118b4eb3f208ca076ba3e82c4891b696620 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:28:13 -0600
Subject: [PATCH 0841/2285] qt55.qtquick1: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix b/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix
index d1c7bb389a49..d81abbcd6140 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtquick1/default.nix
@@ -4,4 +4,7 @@ qtSubmodule {
   name = "qtquick1";
   patches = [ ./0001-nix-profiles-import-paths.patch ];
   qtInputs = [ qtscript qtsvg qtwebkit qtxmlpatterns ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Declarative"
+  '';
 }

From ea0794696fab69120bbfa4200a9dd3b34dd8910b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:28:29 -0600
Subject: [PATCH 0842/2285] qt55.qtmultimedia: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix
index b6b4d8ea0cf4..8db8fa5f4b96 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtmultimedia.nix
@@ -9,4 +9,8 @@ qtSubmodule {
     pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio
   ];
   configureFlags = "GST_VERSION=1.0";
+  postFixup = ''
+    fixQtModuleCMakeConfig "Multimedia"
+    fixQtModuleCMakeConfig "MultimediaWidgets"
+  '';
 }

From 35c7cdac5fe2e195d8e0ee1918450fef7e843131 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:29:11 -0600
Subject: [PATCH 0843/2285] qt55.qtlocation: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qtlocation.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtlocation.nix b/pkgs/development/libraries/qt-5/5.5/qtlocation.nix
index 1e134057c4b4..0e2ad8bafb30 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtlocation.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtlocation.nix
@@ -3,4 +3,8 @@
 qtSubmodule {
   name = "qtlocation";
   qtInputs = [ qtbase qtmultimedia ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Location"
+    fixQtModuleCMakeConfig "Positioning"
+  '';
 }

From aea5ee64db08fdefca02d0e57a33ffad4a76bede Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:29:23 -0600
Subject: [PATCH 0844/2285] qt55.qtenginio: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.5/qtenginio.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtenginio.nix b/pkgs/development/libraries/qt-5/5.5/qtenginio.nix
index b860a73ef890..503a0f7ce4f5 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtenginio.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtenginio.nix
@@ -3,4 +3,7 @@
 qtSubmodule {
   name = "qtenginio";
   qtInputs = [ qtdeclarative ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Enginio"
+  '';
 }

From 776de6d955997fbd571891ccdd79a66862550d6a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:29:39 -0600
Subject: [PATCH 0845/2285] qt55.qtconnectivity: fix Qt module CMake config
 files

---
 pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix
index 95cd6fea79b4..35538c7261f1 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtconnectivity.nix
@@ -3,4 +3,8 @@
 qtSubmodule {
   name = "qtconnectivity";
   qtInputs = [ qtbase qtdeclarative ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Bluetooth"
+    fixQtModuleCMakeConfig "Nfc"
+  '';
 }

From c5083f8cbd701a09f669dbc021834e980bcd5dbd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 24 Jan 2016 18:43:43 -0600
Subject: [PATCH 0846/2285] kde5.kfilemetadata: fix CMake install paths

---
 .../libraries/kde-frameworks-5.18/default.nix       |  2 +-
 .../kfilemetadata/cmake-install-paths.patch         | 13 +++++++++++++
 .../default.nix}                                    |  5 +++--
 .../kde-frameworks-5.18/kfilemetadata/series        |  1 +
 4 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/cmake-install-paths.patch
 rename pkgs/development/libraries/kde-frameworks-5.18/{kfilemetadata.nix => kfilemetadata/default.nix} (57%)
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/series

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/default.nix
index 2ecde7e834fb..5d2cceff78d3 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/default.nix
@@ -67,7 +67,7 @@ let
     kdnssd = callPackage ./kdnssd.nix {};
     kdoctools = callPackage ./kdoctools {};
     kemoticons = callPackage ./kemoticons.nix {};
-    kfilemetadata = callPackage ./kfilemetadata.nix {};
+    kfilemetadata = callPackage ./kfilemetadata {};
     kglobalaccel = callPackage ./kglobalaccel.nix {};
     kguiaddons = callPackage ./kguiaddons.nix {};
     khtml = callPackage ./khtml.nix {};
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/cmake-install-paths.patch
new file mode 100644
index 000000000000..732f7b69c828
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/cmake-install-paths.patch
@@ -0,0 +1,13 @@
+Index: kfilemetadata-5.18.0/src/CMakeLists.txt
+===================================================================
+--- kfilemetadata-5.18.0.orig/src/CMakeLists.txt
++++ kfilemetadata-5.18.0/src/CMakeLists.txt
+@@ -49,7 +49,7 @@ install(TARGETS KF5FileMetaData EXPORT K
+ 
+ install(EXPORT KF5FileMetaDataTargets
+         NAMESPACE KF5::
+-        DESTINATION ${LIB_INSTALL_DIR}/cmake/KF5FileMetaData
++        DESTINATION ${KDE_INSTALL_FULL_CMAKEPACKAGEDIR}/KF5FileMetaData
+         FILE KF5FileMetaDataTargets.cmake)
+ 
+ install(FILES
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/default.nix
similarity index 57%
rename from pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata.nix
rename to pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/default.nix
index be99c58d5504..9bb4831cf8da 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/default.nix
@@ -1,9 +1,10 @@
-{ kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2
-, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
+{ kdeFramework, lib, copyPathsToStore, extra-cmake-modules
+, attr, ebook_tools, exiv2, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
 }:
 
 kdeFramework {
   name = "kfilemetadata";
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ];
   propagatedBuildInputs = [ qtbase ki18n ];
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/series b/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/series
new file mode 100644
index 000000000000..d2689425c387
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/series
@@ -0,0 +1 @@
+cmake-install-paths.patch

From 7fae06718e5ef7f80cf82aca107c1455b2dab3d8 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 25 Jan 2016 06:24:35 -0600
Subject: [PATCH 0847/2285] qt55.makeQtWrapper: don't set XDG_DATA_DIRS

---
 .../development/libraries/qt-5/5.5/make-qt-wrapper.sh | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh
index d61665455bf4..63525ba365bc 100644
--- a/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh
+++ b/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh
@@ -3,7 +3,6 @@ addQtDependency() {
     addToSearchPath QML_IMPORT_PATH "$1/lib/qt5/imports"
     addToSearchPath QML2_IMPORT_PATH "$1/lib/qt5/qml"
     addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg"
-    addToSearchPath XDG_DATA_DIRS "$1/share"
 }
 
 wrapQtProgram() {
@@ -33,10 +32,10 @@ makeQtWrapper() {
 }
 
 # cannot use addToSearchPath because these directories may not exist yet
-export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}$out/lib/qt5/plugins"
-export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}$out/lib/qt5/imports"
-export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}$out/lib/qt5/qml"
-export XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}$out/etc/xdg"
-export XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}$out/share"
+export QT_PLUGIN_PATH="$QT_PLUGIN_PATH${QT_PLUGIN_PATH:+:}${!outputLib}/lib/qt5/plugins"
+export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}${!outputLib}/lib/qt5/imports"
+export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/lib/qt5/qml"
+export XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}${!outputLib}/etc/xdg"
+export XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}${!outputLib}/share"
 
 envHooks+=(addQtDependency)

From b63c007412f5d81aaa62b51fb600839d42061cab Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 25 Jan 2016 06:25:05 -0600
Subject: [PATCH 0848/2285] kde5.kdelibs4support: don't use multiple outputs

---
 pkgs/development/libraries/kde-frameworks-5.18/default.nix      | 2 +-
 .../libraries/kde-frameworks-5.18/kdelibs4support.nix           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/default.nix
index 5d2cceff78d3..080854380dc5 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/default.nix
@@ -23,7 +23,7 @@ let
         name = "${name}-${version}";
         inherit src;
 
-        outputs = [ "dev" "out" ];
+        outputs = args.outputs or [ "dev" "out" ];
 
         cmakeFlags =
           (args.cmakeFlags or [])
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix
index e61c4bb86e7c..214b756d5cbd 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix
@@ -11,6 +11,7 @@
 
 kdeFramework {
   name = "kdelibs4support";
+  outputs = [ "out" ];
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     kcompletion kconfig kded kservice kwidgetsaddons

From ae75c888085d45c571c7fe0e021611f4cc3b7f03 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 25 Jan 2016 06:31:06 -0600
Subject: [PATCH 0849/2285] qt55.qtbase: upstream patch for backing store issue

The included patch from upstream fixes the issue described here:
https://bugreports.qt.io/browse/QTBUG-48321
The backing store of certain widgets was being improperly invalidated,
leading to display bugs in, e.g. VLC.

This patch is included in Qt 5.6, so we should remove it when we
upgrade.
---
 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 0dd17ed699bb..68c209e60090 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -26,6 +26,12 @@
 let
   inherit (srcs.qt5) version;
   system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
+
+  dontInvalidateBacking = fetchurl {
+    url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=0f68f8920573cdce1729a285a92ac8582df32841;hp=24c50f8dcf7fa61ac3c3d4d6295c259a104a2b8c";
+    name = "qtbug-48321-dont-invalidate-backing-store.patch";
+    sha256 = "07vnndmvri73psz0nrs2hg0zw2i4b1k1igy2al6kwjbp7d5xpglr";
+  };
 in
 
 stdenv.mkDerivation {
@@ -51,6 +57,10 @@ stdenv.mkDerivation {
 
   postPatch =
     ''
+      cd qtbase
+      patch -p1 <${dontInvalidateBacking}
+      cd ..
+
       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

From 7f43f089304042923901f45763b51b429d2f11b9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 25 Jan 2016 09:37:16 -0600
Subject: [PATCH 0850/2285] extra-cmake-modules: add addToSearchPathOnce

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

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
index ee26f75cf5f0..0dfc34ef4080 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
@@ -1,26 +1,36 @@
-addMimePkg() {
-    local propagated
+_propagateMimeTypes() {
+    if [ -d "$1/share/mime" ]; then
+        propagateOnce propagatedUserEnvPkgs "$1"
+        addToSearchPathOnce XDG_DATA_DIRS "$1/share"
+    fi
+}
 
-    if [[ -d "$1/share/mime" ]]; then
-        propagated=
-        for pkg in $propagatedBuildInputs; do
-            if [[ "z$pkg" == "z$1" ]]; then
-                propagated=1
-            fi
-        done
-        if [[ -z $propagated ]]; then
-            propagatedBuildInputs="$propagatedBuildInputs $1"
-        fi
+addToSearchPathOnceWithCustomDelimiter() {
+    local delim="$1"
+    local search="$2"
+    local target="$3"
+    local dirs
+    local exported
+    IFS="$delim" read -a dirs <<< "${!search}"
+    for dir in ${dirs[@]}; do
+        if [ "z$dir" == "z$target" ]; then exported=1; fi
+    done
+    if [ -z $exported ]; then
+        eval "export ${search}=\"${!search}${!search:+$delim}$target\""
+    fi
+}
 
-        propagated=
-        for pkg in $propagatedUserEnvPkgs; do
-            if [[ "z$pkg" == "z$1" ]]; then
-                propagated=1
-            fi
-        done
-        if [[ -z $propagated ]]; then
-            propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1"
-        fi
+addToSearchPathOnce() {
+    addToSearchPathOnceWithCustomDelimiter ':' "$@"
+}
+
+propagateOnce() {
+    addToSearchPathOnceWithCustomDelimiter ' ' "$@"
+}
+
+_exportLocales() {
+    if [[ -d "$1/share/locale" ]]; then
+        addToSearchPathOnce XDG_DATA_DIRS "$1/share"
     fi
 }
 
@@ -67,5 +77,5 @@ _ecmConfig() {
     cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputLib}/etc/xdg/autostart"
 }
 
-envHooks+=(addMimePkg)
+envHooks+=(_propagateMimeTypes _exportLocales)
 preConfigureHooks+=(_ecmConfig)

From 02c3ae154d8fcb4c43b69adabce7acb47338f88e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 25 Jan 2016 09:37:35 -0600
Subject: [PATCH 0851/2285] kde5.kservice: propagate extra-cmake-modules input

---
 .../libraries/kde-frameworks-5.18/kservice/default.nix         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
index 03b7c7c2f51d..b502a18e0e5e 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
@@ -5,7 +5,8 @@
 kdeFramework {
   name = "kservice";
   setupHook = ./setup-hook.sh;
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  propagatedNativeBuildInputs = [ extra-cmake-modules ];
+  nativeBuildInputs = [ kdoctools ];
   buildInputs = [ kcrash kdbusaddons ];
   propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ];
   propagatedUserEnvPkgs = [ kcoreaddons ];

From cfd70eac9dc38779ca04df9dbc184db574439fa6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 25 Jan 2016 09:37:55 -0600
Subject: [PATCH 0852/2285] kde5.kservice: propagate service and service type
 inputs

---
 .../kservice/setup-hook.sh                    | 54 +++++--------------
 1 file changed, 14 insertions(+), 40 deletions(-)

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh
index c28e862ff8ae..e1210515fcf1 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh
@@ -1,43 +1,17 @@
-addServicePkg() {
-    local propagated
-    for dir in "share/kservices5" "share/kservicetypes5"; do
-        if [[ -d "$1/$dir" ]]; then
-            propagated=
-            for pkg in $propagatedBuildInputs; do
-                if [[ "z$pkg" == "z$1" ]]; then
-                    propagated=1
-                    break
-                fi
-            done
-            if [[ -z $propagated ]]; then
-                propagatedBuildInputs="$propagatedBuildInputs $1"
-            fi
-
-            propagated=
-            for pkg in $propagatedUserEnvPkgs; do
-                if [[ "z$pkg" == "z$1" ]]; then
-                    propagated=1
-                    break
-                fi
-            done
-            if [[ -z $propagated ]]; then
-                propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1"
-            fi
-
-            break
-        fi
-    done
+_propagateServices() {
+    if [ -d "$1/share/kservices5" ]; then
+        propagateOnce propagatedUserEnvPkgs "$1"
+        addToSearchPathOnce XDG_DATA_DIRS "$1/share"
+    fi
 }
 
-envHooks+=(addServicePkg)
-
-local propagated
-for pkg in $propagatedBuildInputs; do
-    if [[ "z$pkg" == "z@out@" ]]; then
-        propagated=1
-        break
+_propagateServiceTypes() {
+    if [ -d "$1/share/kservicetypes5" ]; then
+        propagateOnce propagatedUserEnvPkgs "$1"
+        addToSearchPathOnce XDG_DATA_DIRS "$1/share"
     fi
-done
-if [[ -z $propagated ]]; then
-    propagatedBuildInputs="$propagatedBuildInputs @out@"
-fi
+}
+
+envHooks+=(_propagateServices _propagateServiceTypes)
+
+propagateOnce propagatedBuildInputs "@out@"

From 7049bde4d5ffc9475eab99c490e6c35d71eb1534 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 25 Jan 2016 20:02:14 -0600
Subject: [PATCH 0853/2285] kde5.kdelibs4support: use multiple outputs

---
 .../libraries/kde-frameworks-5.18/default.nix       |  2 +-
 .../default.nix}                                    |  7 +++++--
 .../kdelibs4support/nix-kde-include-dir.patch       | 13 +++++++++++++
 .../kde-frameworks-5.18/kdelibs4support/series      |  1 +
 .../kdelibs4support/setup-hook.sh                   |  1 +
 5 files changed, 21 insertions(+), 3 deletions(-)
 rename pkgs/development/libraries/kde-frameworks-5.18/{kdelibs4support.nix => kdelibs4support/default.nix} (83%)
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/nix-kde-include-dir.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/series
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/setup-hook.sh

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/default.nix
index 080854380dc5..bb96048d6ff5 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/default.nix
@@ -60,7 +60,7 @@ let
     kdbusaddons = callPackage ./kdbusaddons.nix {};
     kdeclarative = callPackage ./kdeclarative.nix {};
     kded = callPackage ./kded.nix {};
-    kdelibs4support = callPackage ./kdelibs4support.nix {};
+    kdelibs4support = callPackage ./kdelibs4support {};
     kdesignerplugin = callPackage ./kdesignerplugin.nix {};
     kdewebkit = callPackage ./kdewebkit.nix {};
     kdesu = callPackage ./kdesu.nix {};
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/default.nix
similarity index 83%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix
rename to pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/default.nix
index 214b756d5cbd..843db83a99b2 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/default.nix
@@ -1,4 +1,5 @@
-{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth
+{ kdeFramework, lib, copyPathsToStore
+, extra-cmake-modules, docbook_xml_dtd_45, kauth
 , karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
 , kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons
 , kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
@@ -11,7 +12,9 @@
 
 kdeFramework {
   name = "kdelibs4support";
-  outputs = [ "out" ];
+  outputs = [ "dev" "out" ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  setupHook = ./setup-hook.sh;
   nativeBuildInputs = [ extra-cmake-modules kdoctools ];
   buildInputs = [
     kcompletion kconfig kded kservice kwidgetsaddons
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/nix-kde-include-dir.patch b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/nix-kde-include-dir.patch
new file mode 100644
index 000000000000..eabb70254483
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/nix-kde-include-dir.patch
@@ -0,0 +1,13 @@
+Index: kdelibs4support-5.18.0/src/kdecore/kstandarddirs.cpp
+===================================================================
+--- kdelibs4support-5.18.0.orig/src/kdecore/kstandarddirs.cpp
++++ kdelibs4support-5.18.0/src/kdecore/kstandarddirs.cpp
+@@ -292,7 +292,7 @@ static QString relativeInstallPath(const
+             return QFile::decodeName(ICON_INSTALL_DIR "/");
+         }
+         if (strcmp("include", type) == 0) {
+-            return QFile::decodeName(INCLUDE_INSTALL_DIR "/");
++            return QFile::decodeName(qgetenv("NIX_KDE_INCLUDE_DIR"));
+         }
+         break;
+     case 'l':
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/series b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/series
new file mode 100644
index 000000000000..9b08ab208774
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/series
@@ -0,0 +1 @@
+nix-kde-include-dir.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/setup-hook.sh
new file mode 100644
index 000000000000..21ac2e83b5da
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/setup-hook.sh
@@ -0,0 +1 @@
+export NIX_KDE_INCLUDE_DIR="@dev@/include/"  # trailing slash is required!

From 4f7297f1e32f4d42544d6b5f9b332e1bd1f176ea Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 27 Jan 2016 06:23:03 -0600
Subject: [PATCH 0854/2285] kde5.apps: use multiple outputs

---
 pkgs/applications/kde-apps-15.12/kde-app.nix         | 2 ++
 pkgs/applications/kde-apps-15.12/kde-locale-4.nix    | 7 +++++++
 pkgs/applications/kde-apps-15.12/kde-locale-5.nix    | 7 +++++++
 pkgs/applications/kde-apps-15.12/kdelibs/default.nix | 2 ++
 4 files changed, 18 insertions(+)

diff --git a/pkgs/applications/kde-apps-15.12/kde-app.nix b/pkgs/applications/kde-apps-15.12/kde-app.nix
index 242f3d9c793d..2f1fdc1d643c 100644
--- a/pkgs/applications/kde-apps-15.12/kde-app.nix
+++ b/pkgs/applications/kde-apps-15.12/kde-app.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation (args // {
   name = "${name}-${version}";
   inherit src;
 
+  outputs = args.outputs or [ "dev" "out" ];
+
   cmakeFlags =
     (args.cmakeFlags or [])
     ++ [ "-DBUILD_TESTING=OFF" ]
diff --git a/pkgs/applications/kde-apps-15.12/kde-locale-4.nix b/pkgs/applications/kde-apps-15.12/kde-locale-4.nix
index 4b612ee3e3c2..e83794c60d81 100644
--- a/pkgs/applications/kde-apps-15.12/kde-locale-4.nix
+++ b/pkgs/applications/kde-apps-15.12/kde-locale-4.nix
@@ -6,6 +6,8 @@ kdeApp (args // {
   sname = "kde-l10n-${name}";
   name = "kde-l10n-${name}-qt4";
 
+  outputs = [ "out" ];
+
   nativeBuildInputs =
     [ automoc4 cmake gettext perl ]
     ++ (args.nativeBuildInputs or []);
@@ -17,4 +19,9 @@ kdeApp (args // {
     sed -e 's/add_subdirectory(5)//' -i CMakeLists.txt
     ${args.preConfigure or ""}
   '';
+
+  preFixup = ''
+    propagatedBuildInputs=
+    propagatedNativeBuildInputs=
+  '';
 })
diff --git a/pkgs/applications/kde-apps-15.12/kde-locale-5.nix b/pkgs/applications/kde-apps-15.12/kde-locale-5.nix
index 522fc542aeb2..772ebe37e44f 100644
--- a/pkgs/applications/kde-apps-15.12/kde-locale-5.nix
+++ b/pkgs/applications/kde-apps-15.12/kde-locale-5.nix
@@ -6,6 +6,8 @@ kdeApp (args // {
   sname = "kde-l10n-${name}";
   name = "kde-l10n-${name}-qt5";
 
+  outputs = [ "out" ];
+
   nativeBuildInputs =
     [ cmake extra-cmake-modules gettext kdoctools ]
     ++ (args.nativeBuildInputs or []);
@@ -14,4 +16,9 @@ kdeApp (args // {
     sed -e 's/add_subdirectory(4)//' -i CMakeLists.txt
     ${args.preConfigure or ""}
   '';
+
+  preFixup = ''
+    propagatedBuildInputs=
+    propagatedNativeBuildInputs=
+  '';
 })
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/default.nix b/pkgs/applications/kde-apps-15.12/kdelibs/default.nix
index 91c1f3af448a..389362deecc6 100644
--- a/pkgs/applications/kde-apps-15.12/kdelibs/default.nix
+++ b/pkgs/applications/kde-apps-15.12/kdelibs/default.nix
@@ -9,6 +9,8 @@
 kdeApp {
   name = "kdelibs";
 
+  outputs = [ "out" ];
+
   buildInputs = [
     attica attr avahi giflib libdbusmenu_qt libjpeg libxml2
     polkit_qt4 qca2 shared_desktop_ontologies udev xz pcre

From ec9073dd2ebe04188a3aa25c386ba7688ff9646f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 27 Jan 2016 11:03:49 -0600
Subject: [PATCH 0855/2285] kde5.plasma: remove misguided setupHook

---
 pkgs/desktops/plasma-5.5/default.nix   | 2 --
 pkgs/desktops/plasma-5.5/setup-hook.sh | 1 -
 2 files changed, 3 deletions(-)
 delete mode 100644 pkgs/desktops/plasma-5.5/setup-hook.sh

diff --git a/pkgs/desktops/plasma-5.5/default.nix b/pkgs/desktops/plasma-5.5/default.nix
index c9fcbdd8e6a0..bbac6ab35247 100644
--- a/pkgs/desktops/plasma-5.5/default.nix
+++ b/pkgs/desktops/plasma-5.5/default.nix
@@ -26,8 +26,6 @@ let
         name = "${name}-${version}";
         inherit src;
 
-        setupHook = args.setupHook or ./setup-hook.sh;
-
         cmakeFlags =
           (args.cmakeFlags or [])
           ++ [ "-DBUILD_TESTING=OFF" ]
diff --git a/pkgs/desktops/plasma-5.5/setup-hook.sh b/pkgs/desktops/plasma-5.5/setup-hook.sh
deleted file mode 100644
index a8d9b7e0e36f..000000000000
--- a/pkgs/desktops/plasma-5.5/setup-hook.sh
+++ /dev/null
@@ -1 +0,0 @@
-addToSearchPath XDG_DATA_DIRS @out@/share

From bda1938d3a278416d18aa3dc65bc40dce91467a4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 27 Jan 2016 11:13:00 -0600
Subject: [PATCH 0856/2285] kde5.plasma: use multiple outputs

---
 pkgs/desktops/plasma-5.5/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/desktops/plasma-5.5/default.nix b/pkgs/desktops/plasma-5.5/default.nix
index bbac6ab35247..ea1533af7571 100644
--- a/pkgs/desktops/plasma-5.5/default.nix
+++ b/pkgs/desktops/plasma-5.5/default.nix
@@ -26,6 +26,8 @@ let
         name = "${name}-${version}";
         inherit src;
 
+        outputs = args.outputs or [ "dev" "out" ];
+
         cmakeFlags =
           (args.cmakeFlags or [])
           ++ [ "-DBUILD_TESTING=OFF" ]

From f6e87370fbe56848d30a0631ee019a9b3a97b7ea Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 27 Jan 2016 11:25:35 -0600
Subject: [PATCH 0857/2285] kde5.kauth: fix helper install paths

---
 .../kauth/cmake-install-paths.patch             | 17 +++++++++++++++++
 .../kde-frameworks-5.18/kauth/default.nix       |  4 ++--
 .../kauth/kauth-policy-install.patch            | 13 -------------
 .../libraries/kde-frameworks-5.18/kauth/series  |  1 +
 4 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kauth/cmake-install-paths.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kauth/kauth-policy-install.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kauth/series

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kauth/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks-5.18/kauth/cmake-install-paths.patch
new file mode 100644
index 000000000000..c66f5ecd008f
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kauth/cmake-install-paths.patch
@@ -0,0 +1,17 @@
+Index: kauth-5.18.0/KF5AuthConfig.cmake.in
+===================================================================
+--- kauth-5.18.0.orig/KF5AuthConfig.cmake.in
++++ kauth-5.18.0/KF5AuthConfig.cmake.in
+@@ -4,9 +4,9 @@ set(KAUTH_STUB_FILES_DIR "@PACKAGE_KDE_I
+ 
+ set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
+ set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
+-set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
+-set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
+-set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR "@KAUTH_HELPER_INSTALL_ABSOLUTE_DIR@")
++set(KAUTH_POLICY_FILES_INSTALL_DIR "${KDE_INSTALL_DATADIR}/polkit-1/actions")
++set(KAUTH_HELPER_INSTALL_DIR "${KDE_INSTALL_LIBEXECDIR}")
++set(KAUTH_HELPER_INSTALL_ABSOLUTE_DIR "${KDE_INSTALL_LIBEXECDIR}")
+ 
+ find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
+ 
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kauth/default.nix
index 2b000ff3c041..1352d8c5821f 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/kauth/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kauth/default.nix
@@ -1,4 +1,4 @@
-{ kdeFramework, lib
+{ kdeFramework, lib, copyPathsToStore
 , extra-cmake-modules
 , kcoreaddons
 , polkit-qt
@@ -9,7 +9,7 @@ kdeFramework {
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ polkit-qt ];
   propagatedBuildInputs = [ kcoreaddons ];
-  patches = [ ./kauth-policy-install.patch ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
   meta = {
     maintainers = [ lib.maintainers.ttuegel ];
   };
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.18/kauth/kauth-policy-install.patch
deleted file mode 100644
index 340155256f28..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kauth/kauth-policy-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in
-index e859ec7..9a8ab18 100644
---- a/KF5AuthConfig.cmake.in
-+++ b/KF5AuthConfig.cmake.in
-@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/")
- 
- set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
- set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
--set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
-+set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")
- set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
- 
- find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kauth/series b/pkgs/development/libraries/kde-frameworks-5.18/kauth/series
new file mode 100644
index 000000000000..d2689425c387
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kauth/series
@@ -0,0 +1 @@
+cmake-install-paths.patch

From 9065ab0c8ac68887f4007ded5ac30de8555bfc44 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 27 Jan 2016 20:05:40 -0600
Subject: [PATCH 0858/2285] kde5.extra-cmake-modules: rewrite setupHook

The rewrite achieves three goals. First, all the installation paths are
set correctly for multiple outputs. Second, the correct search paths are
set for all types of shared data. Third, packages are installed through
propagatedUserEnvPkgs as required.
---
 .../extra-cmake-modules/setup-hook.sh         | 70 +++++++--------
 .../kde-frameworks-5.18/kdoctools/default.nix |  1 -
 .../kdoctools/setup-hook.sh                   |  5 --
 .../kde-frameworks-5.18/kservice/default.nix  |  1 -
 .../kservice/setup-hook.sh                    | 17 ----
 .../libraries/qt-5/5.5/make-qt-wrapper.sh     | 19 ++--
 .../libraries/qt-5/5.5/qtbase/setup-hook.sh   | 89 +++++++++++--------
 7 files changed, 94 insertions(+), 108 deletions(-)
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdoctools/setup-hook.sh
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
index 0dfc34ef4080..56ed09f4ea59 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
+++ b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
@@ -1,37 +1,37 @@
-_propagateMimeTypes() {
-    if [ -d "$1/share/mime" ]; then
-        propagateOnce propagatedUserEnvPkgs "$1"
-        addToSearchPathOnce XDG_DATA_DIRS "$1/share"
-    fi
+_ecmSetXdgDirs() {
+    addToSearchPathOnce XDG_DATA_DIRS "$1/share"
+    addToSearchPathOnce XDG_CONFIG_DIRS "$1/etc/xdg"
+    addToSearchPathOnce NIX_WRAP_XDG_CONFIG_DIRS "$1/etc/xdg"
 }
 
-addToSearchPathOnceWithCustomDelimiter() {
-    local delim="$1"
-    local search="$2"
-    local target="$3"
-    local dirs
-    local exported
-    IFS="$delim" read -a dirs <<< "${!search}"
-    for dir in ${dirs[@]}; do
-        if [ "z$dir" == "z$target" ]; then exported=1; fi
+_ecmPropagateSharedData() {
+    local sharedPaths=( \
+        "config.cfg" \
+        "doc" \
+        "kconf_update" \
+        "kservices5" \
+        "kservicetypes5" \
+        "kxmlgui5" \
+        "knotifications5" \
+        "icons" \
+        "sounds" \
+        "templates" \
+        "wallpapers" \
+        "applications" \
+        "desktop-directories" \
+        "mime" \
+        "info" \
+        "dbus-1" \
+        "interfaces" \
+        "services" \
+        "system-services" )
+    for dir in ${sharedPaths[@]}; do
+        if [ -d "$1/share/$dir" ]; then
+            addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share"
+            propagateOnce propagatedUserEnvPkgs "$1"
+            break
+        fi
     done
-    if [ -z $exported ]; then
-        eval "export ${search}=\"${!search}${!search:+$delim}$target\""
-    fi
-}
-
-addToSearchPathOnce() {
-    addToSearchPathOnceWithCustomDelimiter ':' "$@"
-}
-
-propagateOnce() {
-    addToSearchPathOnceWithCustomDelimiter ' ' "$@"
-}
-
-_exportLocales() {
-    if [[ -d "$1/share/locale" ]]; then
-        addToSearchPathOnce XDG_DATA_DIRS "$1/share"
-    fi
 }
 
 _ecmConfig() {
@@ -69,13 +69,13 @@ _ecmConfig() {
     cmakeFlags+=" -DKDE_INSTALL_MANDIR=${!outputLib}/share/man"
     cmakeFlags+=" -DKDE_INSTALL_INFODIR=${!outputLib}/share/info"
     cmakeFlags+=" -DKDE_INSTALL_DBUSDIR=${!outputLib}/share/dbus-1"
-    cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputLib}/share/interfaces"
-    cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputLib}/share/services"
-    cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputLib}/share/system-services"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputLib}/share/dbus-1/interfaces"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputLib}/share/dbus-1/services"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputLib}/share/dbus-1/system-services"
     cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputLib}/etc"
     cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputLib}/etc/xdg"
     cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputLib}/etc/xdg/autostart"
 }
 
-envHooks+=(_propagateMimeTypes _exportLocales)
+envHooks+=(_ecmSetXdgDirs _ecmPropagateSharedData)
 preConfigureHooks+=(_ecmConfig)
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/default.nix
index 138c3fc33b94..f67c19f42395 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/default.nix
@@ -4,7 +4,6 @@
 
 kdeFramework {
   name = "kdoctools";
-  setupHook = ./setup-hook.sh;
   nativeBuildInputs = [ extra-cmake-modules ];
   buildInputs = [ karchive ];
   propagatedBuildInputs = [ ki18n ];
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/setup-hook.sh
deleted file mode 100644
index 5cfffbd622d1..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/setup-hook.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-addXdgData() {
-    addToSearchPath XDG_DATA_DIRS "$1/share"
-}
-
-envHooks+=(addXdgData)
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
index b502a18e0e5e..24c5e681ca8d 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
@@ -4,7 +4,6 @@
 
 kdeFramework {
   name = "kservice";
-  setupHook = ./setup-hook.sh;
   propagatedNativeBuildInputs = [ extra-cmake-modules ];
   nativeBuildInputs = [ kdoctools ];
   buildInputs = [ kcrash kdbusaddons ];
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh
deleted file mode 100644
index e1210515fcf1..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-_propagateServices() {
-    if [ -d "$1/share/kservices5" ]; then
-        propagateOnce propagatedUserEnvPkgs "$1"
-        addToSearchPathOnce XDG_DATA_DIRS "$1/share"
-    fi
-}
-
-_propagateServiceTypes() {
-    if [ -d "$1/share/kservicetypes5" ]; then
-        propagateOnce propagatedUserEnvPkgs "$1"
-        addToSearchPathOnce XDG_DATA_DIRS "$1/share"
-    fi
-}
-
-envHooks+=(_propagateServices _propagateServiceTypes)
-
-propagateOnce propagatedBuildInputs "@out@"
diff --git a/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh b/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh
index 63525ba365bc..f29bbb73639b 100644
--- a/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh
+++ b/pkgs/development/libraries/qt-5/5.5/make-qt-wrapper.sh
@@ -1,10 +1,3 @@
-addQtDependency() {
-    addToSearchPath QT_PLUGIN_PATH "$1/lib/qt5/plugins"
-    addToSearchPath QML_IMPORT_PATH "$1/lib/qt5/imports"
-    addToSearchPath QML2_IMPORT_PATH "$1/lib/qt5/qml"
-    addToSearchPath XDG_CONFIG_DIRS "$1/etc/xdg"
-}
-
 wrapQtProgram() {
     local prog="$1"
     shift
@@ -12,8 +5,8 @@ wrapQtProgram() {
         --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
         --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \
         --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \
-        --prefix XDG_CONFIG_DIRS : "$XDG_CONFIG_DIRS" \
-        --prefix XDG_DATA_DIRS : "$XDG_DATA_DIRS" \
+        --prefix XDG_CONFIG_DIRS : "$NIX_WRAP_XDG_CONFIG_DIRS" \
+        --prefix XDG_DATA_DIRS : "$NIX_WRAP_XDG_DATA_DIRS" \
         "$@"
 }
 
@@ -26,8 +19,8 @@ makeQtWrapper() {
         --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \
         --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \
         --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" \
-        --prefix XDG_CONFIG_DIRS : "$XDG_CONFIG_DIRS" \
-        --prefix XDG_DATA_DIRS : "$XDG_DATA_DIRS" \
+        --prefix XDG_CONFIG_DIRS : "$NIX_WRAP_XDG_CONFIG_DIRS" \
+        --prefix XDG_DATA_DIRS : "$NIX_WRAP_XDG_DATA_DIRS" \
         "$@"
 }
 
@@ -37,5 +30,5 @@ export QML_IMPORT_PATH="$QML_IMPORT_PATH${QML_IMPORT_PATH:+:}${!outputLib}/lib/q
 export QML2_IMPORT_PATH="$QML2_IMPORT_PATH${QML2_IMPORT_PATH:+:}${!outputLib}/lib/qt5/qml"
 export XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS${XDG_CONFIG_DIRS:+:}${!outputLib}/etc/xdg"
 export XDG_DATA_DIRS="$XDG_DATA_DIRS${XDG_DATA_DIRS:+:}${!outputLib}/share"
-
-envHooks+=(addQtDependency)
+export NIX_WRAP_XDG_CONFIG_DIRS="$NIX_WRAP_XDG_CONFIG_DIRS${NIX_WRAP_XDG_CONFIG_DIRS:+:}${!outputLib}/etc/xdg"
+export NIX_WRAP_XDG_DATA_DIRS="$NIX_WRAP_XDG_DATA_DIRS${NIX_WRAP_XDG_DATA_DIRS:+:}${!outputLib}/share"
diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh
index 59e04a3561e0..9cf1ef9ccb61 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/setup-hook.sh
@@ -1,45 +1,26 @@
 if [[ -z "$QMAKE" ]]; then
 
-linkDependencyDir() {
+_qtLinkDependencyDir() {
     @lndir@/bin/lndir -silent "$1/$2" "$qtOut/$2"
     if [[ -n "$NIX_QT_SUBMODULE" ]]; then
         find "$1/$2" -printf "$2/%P\n" >> "$out/nix-support/qt-inputs"
     fi
 }
 
-addQtModule() {
-    if [[ -d "$1/mkspecs" ]]; then
+_qtLinkModule() {
+    if [ -d "$1/mkspecs" ]; then
         # $1 is a Qt module
-        linkDependencyDir "$1" mkspecs
+        _qtLinkDependencyDir "$1" mkspecs
 
         for dir in bin include lib share; do
-            if [[ -d "$1/$dir" ]]; then
-                linkDependencyDir "$1" "$dir"
+            if [ -d "$1/$dir" ]; then
+                _qtLinkDependencyDir "$1" "$dir"
             fi
         done
     fi
 }
 
-propagateRuntimeDeps() {
-    local propagated
-    for dir in "etc/xdg" "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports" "share"; do
-        if [[ -d "$1/$dir" ]]; then
-            propagated=
-            for pkg in $propagatedBuildInputs; do
-                if [[ "z$pkg" == "z$1" ]]; then
-                    propagated=1
-                    break
-                fi
-            done
-            if [[ -z $propagated ]]; then
-                propagatedBuildInputs="$propagatedBuildInputs $1"
-            fi
-            break
-        fi
-    done
-}
-
-rmQtModules() {
+_qtRmModules() {
     cat "$out/nix-support/qt-inputs" | while read file; do
       if [[ -h "$out/$file" ]]; then
         rm "$out/$file"
@@ -55,15 +36,51 @@ rmQtModules() {
     rm "$out/nix-support/qt-inputs"
 }
 
-rmQMake() {
+addToSearchPathOnceWithCustomDelimiter() {
+    local delim="$1"
+    local search="$2"
+    local target="$3"
+    local dirs
+    local exported
+    IFS="$delim" read -a dirs <<< "${!search}"
+    for dir in ${dirs[@]}; do
+        if [ "z$dir" == "z$target" ]; then exported=1; fi
+    done
+    if [ -z $exported ]; then
+        eval "export ${search}=\"${!search}${!search:+$delim}$target\""
+    fi
+}
+
+addToSearchPathOnce() {
+    addToSearchPathOnceWithCustomDelimiter ':' "$@"
+}
+
+propagateOnce() {
+    addToSearchPathOnceWithCustomDelimiter ' ' "$@"
+}
+
+_qtPropagateRuntimeDependencies() {
+    for dir in "lib/qt5/plugins" "lib/qt5/qml" "lib/qt5/imports"; do
+        if [ -d "$1/$dir" ]; then
+            propagateOnce propagatedBuildInputs "$1"
+            propagateOnce propagatedUserEnvPkgs "$1"
+            break
+        fi
+    done
+    addToSearchPathOnce QT_PLUGIN_PATH "$1/lib/qt5/plugins"
+    addToSearchPathOnce QML_IMPORT_PATH "$1/lib/qt5/imports"
+    addToSearchPathOnce QML2_IMPORT_PATH "$1/lib/qt5/qml"
+}
+
+_qtRmQmake() {
     rm "$qtOut/bin/qmake" "$qtOut/bin/qt.conf"
 }
 
-setQMakePath() {
+_qtSetQmakePath() {
     export PATH="$qtOut/bin${PATH:+:}$PATH"
 }
 
-_multioutQtModuleDevs() {
+_qtMultioutModuleDevs() {
     # We cannot simply set these paths in configureFlags because libQtCore retains
     # references to the paths it was built with.
     moveToOutput "bin" "${!outputDev}"
@@ -74,7 +91,7 @@ _multioutQtModuleDevs() {
     moveToOutput "share/doc" "${!outputDev}"
 }
 
-_multioutQtDevs() {
+_qtMultioutDevs() {
     # This is necessary whether the package is a Qt module or not
     moveToOutput "mkspecs" "${!outputDev}"
 }
@@ -100,20 +117,20 @@ EOF
 
 export QMAKE="$qtOut/bin/qmake"
 
-envHooks+=(addQtModule propagateRuntimeDeps)
+envHooks+=(_qtLinkModule _qtPropagateRuntimeDependencies)
 # Set PATH to find qmake first in a preConfigure hook
 # It must run after all the envHooks!
-preConfigureHooks+=(setQMakePath)
+preConfigureHooks+=(_qtSetQmakePath)
 
-preFixupHooks+=(_multioutQtDevs)
+preFixupHooks+=(_qtMultioutDevs)
 if [[ -n "$NIX_QT_SUBMODULE" ]]; then
-    postInstallHooks+=(rmQMake rmQtModules)
-    preFixupHooks+=(_multioutQtModuleDevs)
+    postInstallHooks+=(_qtRmQmake _qtRmModules)
+    preFixupHooks+=(_qtMultioutModuleDevs)
 fi
 
 fi
 
 if [[ -z "$NIX_QT_PIC" ]]; then
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE${NIX_CFLAGS_COMPILE:+ }-fPIC"
     export NIX_QT_PIC=1
 fi

From 7840e5e9a1014b1aa06033f2dd0120f953db12be Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Jan 2016 18:01:35 -0600
Subject: [PATCH 0859/2285] kde5.kde-gtk-config: fix extra include paths

---
 pkgs/desktops/plasma-5.5/kde-gtk-config/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/plasma-5.5/kde-gtk-config/default.nix b/pkgs/desktops/plasma-5.5/kde-gtk-config/default.nix
index 6b41599994d5..ab8867520b38 100644
--- a/pkgs/desktops/plasma-5.5/kde-gtk-config/default.nix
+++ b/pkgs/desktops/plasma-5.5/kde-gtk-config/default.nix
@@ -22,7 +22,7 @@ plasmaPackage {
   ];
   propagatedBuildInputs = [ ki18n kio ];
   cmakeFlags = [
-    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
-    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include"
+    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
+    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
   ];
 }

From 150238dc9959c2836c06c69ed650496b7c2c36df Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Jan 2016 18:08:58 -0600
Subject: [PATCH 0860/2285] qt54: updated homepage

---
 pkgs/development/libraries/qt-5/5.4/default.nix        | 2 +-
 pkgs/development/libraries/qt-5/5.4/qtbase/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix
index d0e09c6b10f7..3262da124cd8 100644
--- a/pkgs/development/libraries/qt-5/5.4/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/default.nix
@@ -49,7 +49,7 @@ let
       enableParallelBuilding = args.enableParallelBuilding or true;
 
       meta = {
-        homepage = http://qt-project.org;
+        homepage = http://www.qt.io;
         description = "A cross-platform application framework for C++";
         license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
         maintainers = with maintainers; [ bbenoist qknight ttuegel ];
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index e08640ae8695..15f77c8fc87f 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -232,7 +232,7 @@ stdenv.mkDerivation {
   enableParallelBuilding = true;
 
   meta = with lib; {
-    homepage = http://qt-project.org;
+    homepage = http://www.qt.io;
     description = "A cross-platform application framework for C++";
     license = "GPL/LGPL";
     maintainers = with maintainers; [ bbenoist qknight ttuegel ];

From d282d0bfe7cbcc81bd45f40e3785e9d135e040ee Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Jan 2016 18:10:42 -0600
Subject: [PATCH 0861/2285] qt54.qtbase: set licenses correctly

---
 pkgs/development/libraries/qt-5/5.4/default.nix      | 12 ++++--------
 .../libraries/qt-5/5.4/qtbase/default.nix            |  2 +-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix
index 3262da124cd8..ab132ae21c84 100644
--- a/pkgs/development/libraries/qt-5/5.4/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/default.nix
@@ -48,13 +48,7 @@ let
 
       enableParallelBuilding = args.enableParallelBuilding or true;
 
-      meta = {
-        homepage = http://www.qt.io;
-        description = "A cross-platform application framework for C++";
-        license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
-        maintainers = with maintainers; [ bbenoist qknight ttuegel ];
-        platforms = platforms.linux;
-      } // (args.meta or {});
+      meta = self.qtbase.meta // (args.meta or {});
     });
 
   addPackages = self: with self;
@@ -116,4 +110,6 @@ let
 
     };
 
-in makeScope pkgs.newScope addPackages
+    self = makeScope pkgs.newScope addPackages;
+
+in self
diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index 15f77c8fc87f..9525678ca1ad 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -234,7 +234,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     homepage = http://www.qt.io;
     description = "A cross-platform application framework for C++";
-    license = "GPL/LGPL";
+    license = with licenses; [ fdl13 gpl2 lgpl21 lgpl3 ];
     maintainers = with maintainers; [ bbenoist qknight ttuegel ];
     platforms = platforms.linux;
   };

From f4e6b173bb770889541b59e77381e28cd5da99f0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Jan 2016 18:13:17 -0600
Subject: [PATCH 0862/2285] qt54: add fixQtModuleCMakeConfig setup hook

---
 pkgs/development/libraries/qt-5/5.4/default.nix              | 2 ++
 .../libraries/qt-5/5.4/fix-qt-module-cmake-config.sh         | 5 +++++
 2 files changed, 7 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-5/5.4/fix-qt-module-cmake-config.sh

diff --git a/pkgs/development/libraries/qt-5/5.4/default.nix b/pkgs/development/libraries/qt-5/5.4/default.nix
index ab132ae21c84..df2fb8ad1862 100644
--- a/pkgs/development/libraries/qt-5/5.4/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/default.nix
@@ -37,6 +37,7 @@ let
       inherit src;
 
       propagatedBuildInputs = args.qtInputs ++ (args.propagatedBuildInputs or []);
+      nativeBuildInputs = (args.nativeBuildInputs or []) ++ [ self.fixQtModuleCMakeConfig ];
 
       NIX_QT_SUBMODULE = args.NIX_QT_SUBMODULE or true;
       dontAddPrefix = args.dontAddPrefix or true;
@@ -107,6 +108,7 @@ let
       ];
 
       makeQtWrapper = makeSetupHook { deps = [ makeWrapper ]; } ./make-qt-wrapper.sh;
+      fixQtModuleCMakeConfig = makeSetupHook { } ./fix-qt-module-cmake-config.sh;
 
     };
 
diff --git a/pkgs/development/libraries/qt-5/5.4/fix-qt-module-cmake-config.sh b/pkgs/development/libraries/qt-5/5.4/fix-qt-module-cmake-config.sh
new file mode 100644
index 000000000000..7ca3e33b613c
--- /dev/null
+++ b/pkgs/development/libraries/qt-5/5.4/fix-qt-module-cmake-config.sh
@@ -0,0 +1,5 @@
+fixQtModuleCMakeConfig() {
+    local module="$1"
+    sed -e "/set(imported_location/ s@\\\${_qt5${module}_install_prefix}@${!outputLib}@" \
+        -i "${!outputDev}/lib/cmake/Qt5${module}/Qt5${module}Config.cmake"
+}

From 65ef8578c298390d37135fcef6b23e6094c67043 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Jan 2016 18:19:26 -0600
Subject: [PATCH 0863/2285] qt54.qtbase: fix Qt module CMake config files

---
 .../libraries/qt-5/5.4/qtbase/default.nix       | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
index 9525678ca1ad..0585601db765 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtbase/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, copyPathsToStore, makeWrapper
+{ stdenv, lib, fetchurl, copyPathsToStore, fixQtModuleCMakeConfig
 , srcs
 
 , xlibs, libX11, libxcb, libXcursor, libXext, libXrender, libXi
@@ -215,7 +215,7 @@ stdenv.mkDerivation {
     ++ lib.optional (postgresql != null) postgresql
     ++ lib.optionals gtkStyle [gnome_vfs libgnomeui gtk GConf];
 
-  nativeBuildInputs = [ lndir python perl pkgconfig ];
+  nativeBuildInputs = [ fixQtModuleCMakeConfig lndir python perl pkgconfig ];
 
   # freetype-2.5.4 changed signedness of some struct fields
   NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare";
@@ -224,6 +224,19 @@ stdenv.mkDerivation {
     ''
       # Don't retain build-time dependencies like gdb and ruby.
       sed '/QMAKE_DEFAULT_.*DIRS/ d' -i "$dev/mkspecs/qconfig.pri"
+
+      fixQtModuleCMakeConfig "Concurrent"
+      fixQtModuleCMakeConfig "Core"
+      fixQtModuleCMakeConfig "DBus"
+      fixQtModuleCMakeConfig "Gui"
+      fixQtModuleCMakeConfig "Network"
+      fixQtModuleCMakeConfig "OpenGL"
+      fixQtModuleCMakeConfig "OpenGLExtensions"
+      fixQtModuleCMakeConfig "PrintSupport"
+      fixQtModuleCMakeConfig "Sql"
+      fixQtModuleCMakeConfig "Test"
+      fixQtModuleCMakeConfig "Widgets"
+      fixQtModuleCMakeConfig "Xml"
     '';
 
   inherit lndir;

From fbcdf3ee629a113d61a4dd536de0c6adb612b904 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 28 Jan 2016 18:20:51 -0600
Subject: [PATCH 0864/2285] qt54.qtscript: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qtscript/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtscript/default.nix b/pkgs/development/libraries/qt-5/5.4/qtscript/default.nix
index 127766e2ebd6..b81a43aeadb0 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtscript/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtscript/default.nix
@@ -4,4 +4,7 @@ qtSubmodule {
   name = "qtscript";
   qtInputs = [ qtbase qttools ];
   patches = [ ./0001-glib-2.32.patch ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Script"
+  '';
 }

From b7db2185a058a5b23090992a34d32e45e957d7e9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:39:49 -0600
Subject: [PATCH 0865/2285] qt54.qtdeclarative: fix Qt module CMake config
 files

---
 .../libraries/qt-5/5.4/qtdeclarative/default.nix            | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtdeclarative/default.nix b/pkgs/development/libraries/qt-5/5.4/qtdeclarative/default.nix
index 9181c37b2258..e2219642a122 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtdeclarative/default.nix
@@ -5,4 +5,10 @@ qtSubmodule {
   patches = [ ./0001-nix-profiles-import-paths.patch ];
   qtInputs = [ qtbase qtsvg qtxmlpatterns ];
   nativeBuildInputs = [ python ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Qml"
+    fixQtModuleCMakeConfig "Quick"
+    fixQtModuleCMakeConfig "QuickTest"
+    fixQtModuleCMakeConfig "QuickWidgets"
+  '';
 }

From a67c2ded6b228685c72b5581e4351299c79c332a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:40:41 -0600
Subject: [PATCH 0866/2285] qt54.qtxmlpatterns: fix Qt module CMake config
 files

---
 pkgs/development/libraries/qt-5/5.4/qtxmlpatterns.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtxmlpatterns.nix b/pkgs/development/libraries/qt-5/5.4/qtxmlpatterns.nix
index 9a8ddbba2bd2..3b22132e4c38 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtxmlpatterns.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtxmlpatterns.nix
@@ -3,4 +3,7 @@
 qtSubmodule {
   name = "qtxmlpatterns";
   qtInputs = [ qtbase ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "XmlPatterns"
+  '';
 }

From 669dcb34859357a5947a63f12f339b7cf40999a6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:41:43 -0600
Subject: [PATCH 0867/2285] qt54.qtx11extras: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qtx11extras.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtx11extras.nix b/pkgs/development/libraries/qt-5/5.4/qtx11extras.nix
index a765161e2d7e..db92f1353627 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtx11extras.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtx11extras.nix
@@ -3,4 +3,7 @@
 qtSubmodule {
   name = "qtx11extras";
   qtInputs = [ qtbase ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "X11Extras"
+  '';
 }

From 4d25e971936d57b5737ad5705901196e19c3c88b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:42:35 -0600
Subject: [PATCH 0868/2285] qt54.qtwebsockets: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qtwebsockets.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtwebsockets.nix b/pkgs/development/libraries/qt-5/5.4/qtwebsockets.nix
index fbdfbbcf0dbe..c0d0f9e7d714 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtwebsockets.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtwebsockets.nix
@@ -3,4 +3,7 @@
 qtSubmodule {
   name = "qtwebsockets";
   qtInputs = [ qtbase qtdeclarative ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "WebSockets"
+  '';
 }

From 1a481e58ec23d6e2474d40a3a530910a7daa5ba5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:43:25 -0600
Subject: [PATCH 0869/2285] qt54.qtwebkit: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qtwebkit/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtwebkit/default.nix b/pkgs/development/libraries/qt-5/5.4/qtwebkit/default.nix
index 2620dcdf2d8a..7ed3017b95a3 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtwebkit/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtwebkit/default.nix
@@ -31,4 +31,8 @@ qtSubmodule {
         };
     in optionals flashplayerFix [ dlopen-webkit-nsplugin dlopen-webkit-gtk ]
     ++ [ dlopen-webkit-udev ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "WebKit"
+    fixQtModuleCMakeConfig "WebKitWidgets"
+  '';
 }

From 35f33b438caca6b1f0687b8a7ad68384edce0a49 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:43:47 -0600
Subject: [PATCH 0870/2285] qt54.qttools: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qttools.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qttools.nix b/pkgs/development/libraries/qt-5/5.4/qttools.nix
index 65edc4508128..a6b29c07cac9 100644
--- a/pkgs/development/libraries/qt-5/5.4/qttools.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qttools.nix
@@ -3,4 +3,11 @@
 qtSubmodule {
   name = "qttools";
   qtInputs = [ qtbase ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Designer"
+    fixQtModuleCMakeConfig "Help"
+    fixQtModuleCMakeConfig "LinguistTools"
+    fixQtModuleCMakeConfig "UiPlugin"
+    fixQtModuleCMakeConfig "UiTools"
+  '';
 }

From ece0396b5581a054ac770907aa0e70419e6820a2 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:44:20 -0600
Subject: [PATCH 0871/2285] qt54.qtsvg: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qtsvg.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtsvg.nix b/pkgs/development/libraries/qt-5/5.4/qtsvg.nix
index b9ccac7cf933..a460d6da4c2a 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtsvg.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtsvg.nix
@@ -3,4 +3,7 @@
 qtSubmodule {
   name = "qtsvg";
   qtInputs = [ qtbase ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Svg"
+  '';
 }

From 3bb5501a88f553f417c9bd6b23c68efba9c23152 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:44:48 -0600
Subject: [PATCH 0872/2285] qt54.qtserialport: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qtserialport/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtserialport/default.nix b/pkgs/development/libraries/qt-5/5.4/qtserialport/default.nix
index 072825dfe9ba..2c9575f122e7 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtserialport/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtserialport/default.nix
@@ -10,4 +10,7 @@ qtSubmodule {
       libudev = libudev.out;
     })
   ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "SerialPort"
+  '';
 }

From 2f0ec07921bc2e03e7c2a3202ebf818a47f1709a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:45:08 -0600
Subject: [PATCH 0873/2285] qt54.qtsensors: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qtsensors.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtsensors.nix b/pkgs/development/libraries/qt-5/5.4/qtsensors.nix
index 61e64dc47e4d..5776f45a7068 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtsensors.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtsensors.nix
@@ -3,4 +3,7 @@
 qtSubmodule {
   name = "qtsensors";
   qtInputs = [ qtbase qtdeclarative ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Sensors"
+  '';
 }

From d769d6c3bd719b335883e32ff0d0fe9fadc684ab Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:45:41 -0600
Subject: [PATCH 0874/2285] qt54.qtquick1: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qtquick1/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtquick1/default.nix b/pkgs/development/libraries/qt-5/5.4/qtquick1/default.nix
index d1c7bb389a49..d81abbcd6140 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtquick1/default.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtquick1/default.nix
@@ -4,4 +4,7 @@ qtSubmodule {
   name = "qtquick1";
   patches = [ ./0001-nix-profiles-import-paths.patch ];
   qtInputs = [ qtscript qtsvg qtwebkit qtxmlpatterns ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Declarative"
+  '';
 }

From a7cce8b329486b22eab45de7d31fe6f8fa9ef5a7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:46:26 -0600
Subject: [PATCH 0875/2285] qt54.qtmultimedia: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix b/pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix
index b6b4d8ea0cf4..8db8fa5f4b96 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtmultimedia.nix
@@ -9,4 +9,8 @@ qtSubmodule {
     pkgconfig alsaLib gstreamer gst-plugins-base libpulseaudio
   ];
   configureFlags = "GST_VERSION=1.0";
+  postFixup = ''
+    fixQtModuleCMakeConfig "Multimedia"
+    fixQtModuleCMakeConfig "MultimediaWidgets"
+  '';
 }

From b3c8878a6598b5c738925412f59d79becff9be67 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:46:45 -0600
Subject: [PATCH 0876/2285] qt54.qtlocation: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qtlocation.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtlocation.nix b/pkgs/development/libraries/qt-5/5.4/qtlocation.nix
index 1e134057c4b4..0e2ad8bafb30 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtlocation.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtlocation.nix
@@ -3,4 +3,8 @@
 qtSubmodule {
   name = "qtlocation";
   qtInputs = [ qtbase qtmultimedia ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Location"
+    fixQtModuleCMakeConfig "Positioning"
+  '';
 }

From 6e623f87845b1233bb759eb803ad33bcd1276077 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:47:27 -0600
Subject: [PATCH 0877/2285] qt54.qtenginio: fix Qt module CMake config files

---
 pkgs/development/libraries/qt-5/5.4/qtenginio.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtenginio.nix b/pkgs/development/libraries/qt-5/5.4/qtenginio.nix
index b860a73ef890..503a0f7ce4f5 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtenginio.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtenginio.nix
@@ -3,4 +3,7 @@
 qtSubmodule {
   name = "qtenginio";
   qtInputs = [ qtdeclarative ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Enginio"
+  '';
 }

From 0c79c7c3b2b0f81574dc50fb3c3e55a6f3ec5df6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 08:47:45 -0600
Subject: [PATCH 0878/2285] qt54.qtconnectivity: fix Qt module CMake config
 files

---
 pkgs/development/libraries/qt-5/5.4/qtconnectivity.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qtconnectivity.nix b/pkgs/development/libraries/qt-5/5.4/qtconnectivity.nix
index 95cd6fea79b4..35538c7261f1 100644
--- a/pkgs/development/libraries/qt-5/5.4/qtconnectivity.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qtconnectivity.nix
@@ -3,4 +3,8 @@
 qtSubmodule {
   name = "qtconnectivity";
   qtInputs = [ qtbase qtdeclarative ];
+  postFixup = ''
+    fixQtModuleCMakeConfig "Bluetooth"
+    fixQtModuleCMakeConfig "Nfc"
+  '';
 }

From 2f4087b13d71e648c774308ee64a2fa933d308a5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 09:04:46 -0600
Subject: [PATCH 0879/2285] google-talk-plugin: udev -> libudev

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

diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
index 6fd953636a83..f35e88ae89e6 100644
--- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
+++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, rpm, cpio, mesa, xorg, cairo
 , libpng, gtk, glib, gdk_pixbuf, fontconfig, freetype, curl
-, dbus_glib, alsaLib, libpulseaudio, udev, pango
+, dbus_glib, alsaLib, libpulseaudio, libudev, pango
 }:
 
 with stdenv.lib;
@@ -36,7 +36,7 @@ let
       alsaLib
       libpulseaudio
       dbus_glib
-      udev
+      libudev
       curl
       pango
       cairo

From fe1bae4e58c64a9f0be4beef1ec1cf7f1420b26a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jan 2016 09:04:57 -0600
Subject: [PATCH 0880/2285] spotify: udev -> libudev

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

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index 6e4bf1b73111..70dc832225be 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -1,6 +1,6 @@
 { fetchurl, stdenv, dpkg, xorg, alsaLib, makeWrapper, openssl_1_0_1, freetype
 , glib, pango, cairo, atk, gdk_pixbuf, gtk, cups, nspr, nss, libpng, GConf
-, libgcrypt, udev, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome }:
+, libgcrypt, libudev, fontconfig, dbus, expat, ffmpeg_0_10, curl, zlib, gnome }:
 
 assert stdenv.system == "x86_64-linux";
 
@@ -27,7 +27,7 @@ let
     nss
     pango
     stdenv.cc.cc
-    udev
+    libudev
     xorg.libX11
     xorg.libXcomposite
     xorg.libXcursor

From 2efbf665a381130c2dafee4736224c1b92c32854 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 09:52:07 -0600
Subject: [PATCH 0881/2285] qt55.qttools: move runtime executables to $out

---
 pkgs/development/libraries/qt-5/5.5/qttools.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qttools.nix b/pkgs/development/libraries/qt-5/5.5/qttools.nix
index a6b29c07cac9..1472691c5254 100644
--- a/pkgs/development/libraries/qt-5/5.5/qttools.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qttools.nix
@@ -4,6 +4,9 @@ qtSubmodule {
   name = "qttools";
   qtInputs = [ qtbase ];
   postFixup = ''
+    moveToOutput "bin/qdbus" "$out"
+    moveToOutput "bin/qtpaths" "$out"
+
     fixQtModuleCMakeConfig "Designer"
     fixQtModuleCMakeConfig "Help"
     fixQtModuleCMakeConfig "LinguistTools"

From 588c8499f75d1c1f1c5bd42ca509eee83a6cb15a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 16:58:40 -0600
Subject: [PATCH 0882/2285] qt55: don't set output flags by default

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

diff --git a/pkgs/development/libraries/qt-5/5.5/default.nix b/pkgs/development/libraries/qt-5/5.5/default.nix
index 88f064edc7d3..955d57350c29 100644
--- a/pkgs/development/libraries/qt-5/5.5/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/default.nix
@@ -50,7 +50,7 @@ let
       configureScript = args.configureScript or "qmake";
 
       outputs = args.outputs or [ "dev" "out" ];
-      setOutputFlags = false;
+      setOutputFlags = args.setOutputFlags or false;
 
       enableParallelBuilding = args.enableParallelBuilding or true;
 

From 7ea3225ea47e214e8ba412803f60b1806b673739 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 17:01:00 -0600
Subject: [PATCH 0883/2285] kde5.breeze: use runtime outputs

---
 pkgs/desktops/plasma-5.5/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/plasma-5.5/default.nix b/pkgs/desktops/plasma-5.5/default.nix
index ea1533af7571..384fa6f6d272 100644
--- a/pkgs/desktops/plasma-5.5/default.nix
+++ b/pkgs/desktops/plasma-5.5/default.nix
@@ -48,8 +48,11 @@ let
     breeze-qt4 = callPackage ./breeze-qt4.nix {};
     breeze-qt5 = callPackage ./breeze-qt5.nix {};
     breeze =
-      let version = (builtins.parseDrvName breeze-qt5.name).version;
-      in symlinkJoin "breeze-${version}" [ breeze-gtk breeze-qt4 breeze-qt5 ];
+      let
+        version = (builtins.parseDrvName breeze-qt5.name).version;
+      in
+        symlinkJoin "breeze-${version}"
+        (map (pkg: pkg.out or pkg) [ breeze-gtk breeze-qt4 breeze-qt5 ]);
     kde-cli-tools = callPackage ./kde-cli-tools.nix {};
     kde-gtk-config = callPackage ./kde-gtk-config {};
     kdecoration = callPackage ./kdecoration.nix {};

From a5b7cf093937c114e515d8d74be28888d55193fd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 17:01:14 -0600
Subject: [PATCH 0884/2285] kde5.kscreen: remove redundant
 propagatedUserEnvPkgs

---
 pkgs/desktops/plasma-5.5/kscreen.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/desktops/plasma-5.5/kscreen.nix b/pkgs/desktops/plasma-5.5/kscreen.nix
index 2cfd0df2e1d3..a521a7993628 100644
--- a/pkgs/desktops/plasma-5.5/kscreen.nix
+++ b/pkgs/desktops/plasma-5.5/kscreen.nix
@@ -23,11 +23,6 @@ plasmaPackage {
     qtdeclarative
     qtgraphicaleffects
   ];
-  propagatedUserEnvPkgs = [
-    libkscreen  # D-Bus service
-    qtdeclarative  # QML import
-    qtgraphicaleffects  # QML import
-  ];
   postInstall = ''
     wrapQtProgram "$out/bin/kscreen-console"
   '';

From 7b11d5066a7bd019466332e321e958ed03c53455 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 17:01:29 -0600
Subject: [PATCH 0885/2285] kde5.plasma-desktop: remove redundant
 propagatedUserEnvPkgs

---
 pkgs/desktops/plasma-5.5/plasma-desktop/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix b/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix
index a73060ad1af1..5f27efc7f24c 100644
--- a/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix
+++ b/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix
@@ -60,9 +60,6 @@ plasmaPackage rec {
     qtquickcontrols
     qtx11extras
   ];
-  # All propagatedBuildInputs should be present in the profile because
-  # wrappers cannot be used here.
-  propagatedUserEnvPkgs = propagatedBuildInputs;
   patches = [
     ./0001-qt-5.5-QML-import-paths.patch
     (substituteAll {

From 30d6a7199554578b89deeed610f84097c1f35ea4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 17:01:48 -0600
Subject: [PATCH 0886/2285] kde5.plasma-workspace: remove redundant
 propagatedUserEnvPkgs

---
 pkgs/desktops/plasma-5.5/plasma-mediacenter.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/desktops/plasma-5.5/plasma-mediacenter.nix b/pkgs/desktops/plasma-5.5/plasma-mediacenter.nix
index afd8a18bbbd6..7088f45d64e2 100644
--- a/pkgs/desktops/plasma-5.5/plasma-mediacenter.nix
+++ b/pkgs/desktops/plasma-5.5/plasma-mediacenter.nix
@@ -17,7 +17,4 @@ plasmaPackage rec {
     baloo kactivities kdeclarative kfilemetadata ki18n kio
     plasma-framework
   ];
-  # All propagatedBuildInputs should be present in the profile because
-  # wrappers cannot be used here.
-  propagatedUserEnvPkgs = propagatedBuildInputs;
 }

From a7ae370fa3d0c0851d5ee2ef3cb3a24a31e3ecb4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 17:02:17 -0600
Subject: [PATCH 0887/2285] kde5.plasma-workspace: propagate inputs
 automatically

---
 .../plasma-5.5/plasma-workspace/default.nix   | 39 +++++++---
 .../plasma-workspace/startkde.patch           | 72 +++++++++----------
 2 files changed, 65 insertions(+), 46 deletions(-)

diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix b/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix
index 2d9364d446eb..01c5c63ce0aa 100644
--- a/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix
+++ b/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix
@@ -11,7 +11,7 @@
 , xprop, xrdb, xset, xsetroot, solid, qtquickcontrols
 }:
 
-plasmaPackage rec {
+plasmaPackage {
   name = "plasma-workspace";
 
   nativeBuildInputs = [
@@ -20,10 +20,11 @@ plasmaPackage rec {
     makeQtWrapper
   ];
   buildInputs = [
-    kcmutils kcrash kdbusaddons kdesu kdewebkit kjsembed knewstuff
-    knotifyconfig kpackage ktextwidgets kwallet kwayland kxmlrpcclient
-    libdbusmenu libSM libXcursor networkmanager-qt pam phonon
-    qtscript wayland
+    dbus_tools kcmutils kconfig kcrash kdbusaddons kdesu kdewebkit
+    kinit kjsembed knewstuff knotifyconfig kpackage kservice
+    ktextwidgets kwallet kwayland kxmlrpcclient libdbusmenu libSM
+    libXcursor mkfontdir networkmanager-qt pam phonon qtscript qttools
+    socat wayland xmessage xprop xset xsetroot
   ];
   propagatedBuildInputs = [
     baloo kactivities kdeclarative kdelibs4support kglobalaccel
@@ -32,13 +33,31 @@ plasmaPackage rec {
   ];
 
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  inherit bash coreutils gnused gnugrep socat;
-  inherit kconfig kinit kservice qttools;
-  inherit dbus_tools mkfontdir xmessage xprop xrdb xset xsetroot;
+
   postPatch = ''
-    substituteAllInPlace startkde/startkde.cmake
+    substituteInPlace startkde/startkde.cmake \
+        --subst-var-by bash $(type -P bash) \
+        --subst-var-by sed $(type -P sed) \
+        --subst-var-by grep $(type -P grep) \
+        --subst-var-by socat $(type -P socat) \
+        --subst-var-by kcheckrunning $(type -P kcheckrunning) \
+        --subst-var-by xmessage $(type -P xmessage) \
+        --subst-var-by tr $(type -P tr) \
+        --subst-var-by qtpaths $(type -P qtpaths) \
+        --subst-var-by qdbus $(type -P qdbus) \
+        --subst-var-by dbus-launch $(type -P dbus-launch) \
+        --subst-var-by mkfontdir $(type -P mkfontdir) \
+        --subst-var-by xset $(type -P xset) \
+        --subst-var-by xsetroot $(type -P xsetroot) \
+        --subst-var-by xprop $(type -P xprop) \
+        --subst-var-by start_kdeinit_wrapper "${kinit.out}/lib/libexec/kf5/start_kdeinit_wrapper" \
+        --subst-var-by kwrapper5 $(type -P kwrapper5) \
+        --subst-var-by kdeinit5_shutdown $(type -P kdeinit5_shutdown) \
+        --subst-var-by kbuildsycoca5 $(type -P kbuildsycoca5) \
+        --subst-var-by kreadconfig5 $(type -P kreadconfig5) \
+        --subst-var out
     substituteInPlace startkde/kstartupconfig/kstartupconfig.cpp \
-      --replace kdostartupconfig5 $out/bin/kdostartupconfig5
+        --replace kdostartupconfig5 $out/bin/kdostartupconfig5
   '';
 
   postInstall = ''
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/startkde.patch b/pkgs/desktops/plasma-5.5/plasma-workspace/startkde.patch
index 802c92da64d0..17c0ccf0ca93 100644
--- a/pkgs/desktops/plasma-5.5/plasma-workspace/startkde.patch
+++ b/pkgs/desktops/plasma-5.5/plasma-workspace/startkde.patch
@@ -4,7 +4,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
 +++ plasma-workspace-5.5.1/startkde/startkde.cmake
 @@ -1,8 +1,31 @@
 -#!/bin/sh
-+#!@bash@/bin/bash
++#!@bash@
  #
  #  DEFAULT KDE STARTUP SCRIPT ( @PROJECT_VERSION@ )
  #
@@ -29,7 +29,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
 +# in Trolltech.conf.  A better solution would be to stop
 +# Qt from doing this wackiness in the first place.
 +if [ -e $HOME/.config/Trolltech.conf ]; then
-+    @gnused@/bin/sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
++    @sed@ -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
 +fi
 +
  if test "x$1" = x--failsafe; then
@@ -54,13 +54,13 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
 -
  # Check if a KDE session already is running and whether it's possible to connect to X
 -kcheckrunning
-+@out@/bin/kcheckrunning
++@kcheckrunning@
  kcheckrunning_result=$?
  if test $kcheckrunning_result -eq 0 ; then
 -	echo "KDE seems to be already running on this display."
 -	xmessage -geometry 500x100 "KDE seems to be already running on this display." > /dev/null 2>/dev/null
 +  echo "KDE seems to be already running on this display."
-+  @xmessage@/bin/xmessage -geometry 500x100 "KDE seems to be already running on this display."
++  @xmessage@ -geometry 500x100 "KDE seems to be already running on this display."
  	exit 1
  elif test $kcheckrunning_result -eq 2 ; then
  	echo "\$DISPLAY is not set or cannot connect to the X server."
@@ -80,7 +80,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
 -fi
 -
 -mkdir -p $configDir
-+configDir=$(@qttools@/bin/qtpaths --writable-path GenericConfigLocation)
++configDir=$(@qtpaths@ --writable-path GenericConfigLocation)
 +mkdir -p "$configDir"
  
  #This is basically setting defaults so we can use them with kstartupconfig5
@@ -126,7 +126,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  returncode=$?
  if test $returncode -ne 0; then
 -    xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
-+    @xmessage@/bin/xmessage -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
++    @xmessage@ -geometry 500x100 "kstartupconfig5 does not exist or fails. The error code is $returncode. Check your installation."
      exit 1
  fi
  [ -r $configDir/startupconfig ] && . $configDir/startupconfig
@@ -134,7 +134,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
      export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor
  fi
  
-+XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | @coreutils@/bin/tr ":" "\n" | @gnused@/bin/sed 's,$,/icons,g' | @coreutils@/bin/tr "\n" ":")
++XCURSOR_PATH=~/.icons:$(echo "$XDG_DATA_DIRS" | @tr@ ":" "\n" | @sed@ 's,$,/icons,g' | @tr@ "\n" ":")
 +export XCURSOR_PATH
 +
  # XCursor mouse theme needs to be applied here to work even for kded or ksmserver
@@ -160,7 +160,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
 +# If the user has overwritten fonts, the cursor font may be different now
 +# so don't move this up.
 +#
-+@xsetroot@/bin/xsetroot -cursor_name left_ptr
++@xsetroot@ -cursor_name left_ptr
  
  dl=$DESKTOP_LOCKED
  unset DESKTOP_LOCKED # Don't want it in the environment
@@ -168,14 +168,14 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
 +# Make sure that D-Bus is running
 +# D-Bus autolaunch is broken
 +if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
-+    eval `@dbus_tools@/bin/dbus-launch --sh-syntax --exit-with-session`
++    eval `@dbus-launch@ --sh-syntax --exit-with-session`
 +fi
-+if @qttools@/bin/qdbus >/dev/null 2>/dev/null; then
++if @qdbus@ >/dev/null 2>/dev/null; then
 +    : # ok
 +else
 +    echo 'startkde: Could not start D-Bus. Can you call qdbus?'  1>&2
 +    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
-+    @xmessage@/bin/xmessage -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
++    @xmessage@ -geometry 500x100 "Could not start D-Bus. Can you call qdbus?"
 +    exit 1
 +fi
 +
@@ -195,7 +195,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  
 -# TODO: Use GenericConfigLocation once we depend on Qt 5.4
 -scriptpath=`qtpaths --paths ConfigLocation | tr ':' '\n' | sed 's,$,/plasma-workspace,g'`
-+scriptpath=$(@qttools@/bin/qtpaths --paths GenericConfigLocation | tr ':' '\n' | @gnused@/bin/sed 's,$,/plasma-workspace,g')
++scriptpath=$(@qtpaths@ --paths GenericConfigLocation | tr ':' '\n' | @sed@ 's,$,/plasma-workspace,g')
  
  # Add /env/ to the directory to locate the scripts to be sourced
  for prefix in `echo $scriptpath`; do
@@ -204,7 +204,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  
  if test -n "$KDEDIRS"; then
 -  kdedirs_first=`echo "$KDEDIRS"|sed -e 's/:.*//'`
-+  kdedirs_first=`echo "$KDEDIRS" | @gnused@/bin/sed -e 's/:.*//'`
++  kdedirs_first=`echo "$KDEDIRS" | @sed@ -e 's/:.*//'`
    sys_odir=$kdedirs_first/share/fonts/override
    sys_fdir=$kdedirs_first/share/fonts
  else
@@ -216,10 +216,10 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
 -test -d "$usr_odir" && (mkfontdir "$usr_odir" ; xset +fp "$usr_odir")
 -test -d "$usr_fdir" && (mkfontdir "$usr_fdir" ; xset fp+ "$usr_fdir")
 -test -d "$sys_fdir" && xset fp+ "$sys_fdir"
-+test -d "$sys_odir" && @xset@/bin/xset +fp "$sys_odir"
-+test -d "$usr_odir" && ( @mkfontdir@/bin/mkfontdir "$usr_odir" ; @xset@/bin/xset +fp "$usr_odir" )
-+test -d "$usr_fdir" && ( @mkfontdir@/bin/mkfontdir "$usr_fdir" ; @xset@/bin/xset fp+ "$usr_fdir" )
-+test -d "$sys_fdir" && @xset@/bin/xset fp+ "$sys_fdir"
++test -d "$sys_odir" && @xset@ +fp "$sys_odir"
++test -d "$usr_odir" && ( @mkfontdir@ "$usr_odir" ; @xset@ +fp "$usr_odir" )
++test -d "$usr_fdir" && ( @mkfontdir@ "$usr_fdir" ; @xset@ fp+ "$usr_fdir" )
++test -d "$sys_fdir" && @xset@ fp+ "$sys_fdir"
  
  # Ask X11 to rebuild its font list.
 -xset fp rehash
@@ -233,7 +233,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
 -# so don't move this up.
 -#
 -xsetroot -cursor_name left_ptr
-+@xset@/bin/xset fp rehash
++@xset@ fp rehash
  
  # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
  if test -n "$GS_LIB" ; then
@@ -269,12 +269,12 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  KDE_FULL_SESSION=true
  export KDE_FULL_SESSION
 -xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
-+@xprop@/bin/xprop -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
++@xprop@ -root -f KDE_FULL_SESSION 8t -set KDE_FULL_SESSION true
  
  KDE_SESSION_VERSION=5
  export KDE_SESSION_VERSION
 -xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
-+@xprop@/bin/xprop -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
++@xprop@ -root -f KDE_SESSION_VERSION 32c -set KDE_SESSION_VERSION 5
  
  KDE_SESSION_UID=`id -ru`
  export KDE_SESSION_UID
@@ -283,12 +283,12 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  # At this point all the environment is ready, let's send it to kwalletd if running
  if test -n "$PAM_KWALLET_LOGIN" ; then
 -    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
-+    env | @socat@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
++    env | @socat@ STDIN UNIX-CONNECT:$PAM_KWALLET_LOGIN
  fi
  # ...and also to kwalletd5
  if test -n "$PAM_KWALLET5_LOGIN" ; then
 -    env | socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
-+    env | @socat@/bin/socat STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
++    env | @socat@ STDIN UNIX-CONNECT:$PAM_KWALLET5_LOGIN
  fi
  
  # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
@@ -297,27 +297,27 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
    echo 'startkde: Could not sync environment to dbus.'  1>&2
    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
 -  xmessage -geometry 500x100 "Could not sync environment to dbus."
-+  @xmessage@/bin/xmessage -geometry 500x100 "Could not sync environment to dbus."
++  @xmessage@ -geometry 500x100 "Could not sync environment to dbus."
    exit 1
  fi
  
  # We set LD_BIND_NOW to increase the efficiency of kdeinit.
  # kdeinit unsets this variable before loading applications.
 -LD_BIND_NOW=true @CMAKE_INSTALL_FULL_LIBEXECDIR_KF5@/start_kdeinit_wrapper --kded +kcminit_startup
-+LD_BIND_NOW=true @kinit@/lib/libexec/kf5/start_kdeinit_wrapper --kded +kcminit_startup
++LD_BIND_NOW=true @start_kdeinit_wrapper@ --kded +kcminit_startup
  if test $? -ne 0; then
    # Startup error
    echo 'startkde: Could not start kdeinit5. Check your installation.'  1>&2
    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
 -  xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
-+  @xmessage@/bin/xmessage -geometry 500x100 "Could not start kdeinit5. Check your installation."
++  @xmessage@ -geometry 500x100 "Could not start kdeinit5. Check your installation."
    exit 1
  fi
  
 +# (NixOS) We run kbuildsycoca5 before starting the user session because things
 +# may be missing or moved if they have run nixos-rebuild and it may not be
 +# possible for them to start Konsole to run it manually!
-+@kservice@/bin/kbuildsycoca5
++@kbuildsycoca5@
 +
  # finally, give the session control to the session manager
  # see kdebase/ksmserver for the description of the rest of the startup sequence
@@ -327,33 +327,33 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  KSMSERVEROPTIONS=""
  test -n "$dl" && KSMSERVEROPTIONS=" --lockscreen"
 -kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
-+@kinit@/bin/kwrapper5 @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
++@kwrapper5@ @CMAKE_INSTALL_FULL_BINDIR@/ksmserver $KDEWM $KSMSERVEROPTIONS
  if test $? -eq 255; then
    # Startup error
    echo 'startkde: Could not start ksmserver. Check your installation.'  1>&2
    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
 -  xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
-+  @xmessage@/bin/xmessage -geometry 500x100 "Could not start ksmserver. Check your installation."
++  @xmessage@ -geometry 500x100 "Could not start ksmserver. Check your installation."
  fi
  
 -wait_drkonqi=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
-+wait_drkonqi=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Enabled --default true`
++wait_drkonqi=`@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Enabled --default true`
  
  if test x"$wait_drkonqi"x = x"true"x ; then
      # wait for remaining drkonqi instances with timeout (in seconds)
 -    wait_drkonqi_timeout=`kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
-+    wait_drkonqi_timeout=`@kconfig@/bin/kreadconfig5 --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
++    wait_drkonqi_timeout=`@kreadconfig5@ --file startkderc --group WaitForDrKonqi --key Timeout --default 900`
      wait_drkonqi_counter=0
 -    while $qdbus | grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
-+    while @qttools@/bin/qdbus | @gnugrep@/bin/grep "^[^w]*org.kde.drkonqi" > /dev/null ; do
++    while @qdbus@ | @grep@ "^[^w]*org.kde.drkonqi" > /dev/null ; do
          sleep 5
          wait_drkonqi_counter=$((wait_drkonqi_counter+5))
          if test "$wait_drkonqi_counter" -ge "$wait_drkonqi_timeout" ; then
              # ask remaining drkonqis to die in a graceful way
 -            $qdbus | grep 'org.kde.drkonqi-' | while read address ; do
 -                $qdbus "$address" "/MainApplication" "quit"
-+            @qttools@/bin/qdbus | @gnugrep@/bin/grep 'org.kde.drkonqi-' | while read address ; do
-+                @qttools@/bin/qdbus "$address" "/MainApplication" "quit"
++            @qdbus@ | @grep@ 'org.kde.drkonqi-' | while read address ; do
++                @qdbus@ "$address" "/MainApplication" "quit"
              done
              break
          fi
@@ -362,14 +362,14 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  
  # Clean up
 -kdeinit5_shutdown
-+@kinit@/bin/kdeinit5_shutdown
++@kdeinit5_shutdown@
  
  unset KDE_FULL_SESSION
 -xprop -root -remove KDE_FULL_SESSION
-+@xprop@/bin/xprop -root -remove KDE_FULL_SESSION
++@xprop@ -root -remove KDE_FULL_SESSION
  unset KDE_SESSION_VERSION
 -xprop -root -remove KDE_SESSION_VERSION
-+@xprop@/bin/xprop -root -remove KDE_SESSION_VERSION
++@xprop@ -root -remove KDE_SESSION_VERSION
  unset KDE_SESSION_UID
  
  echo 'startkde: Done.'  1>&2

From 98aa0818124176bdbef278553bad18baaa1ca033 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 17:02:31 -0600
Subject: [PATCH 0888/2285] kde5.breeze-icons: remove redundant
 propagatedUserEnvPkgs

---
 pkgs/development/libraries/kde-frameworks-5.18/breeze-icons.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks-5.18/breeze-icons.nix
index 879262c56a41..44cc99daf261 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/breeze-icons.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/breeze-icons.nix
@@ -6,5 +6,5 @@
 kdeFramework {
   name = "breeze-icons";
   nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedUserEnvPkgs = [ qtsvg ];
+  buildInputs = [ qtsvg ];
 }

From 6c327da00791e5cf45c45984e16aabde6a24d5e4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 17:02:46 -0600
Subject: [PATCH 0889/2285] kde5.kservice: remove redundant
 propagatedUserEnvPkgs

---
 .../libraries/kde-frameworks-5.18/kservice/default.nix           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
index 24c5e681ca8d..3a27d85b9166 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
@@ -8,7 +8,6 @@ kdeFramework {
   nativeBuildInputs = [ kdoctools ];
   buildInputs = [ kcrash kdbusaddons ];
   propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ];
-  propagatedUserEnvPkgs = [ kcoreaddons ];
   patches = [
     ./0001-qdiriterator-follow-symlinks.patch
     ./0002-no-canonicalize-path.patch

From 29e2b511db3fd6df110ee01d1a12bd5d3540fd88 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 17:03:08 -0600
Subject: [PATCH 0890/2285] sddm: link theme runtime outputs

---
 pkgs/applications/display-managers/sddm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index e4f68d786f40..83e2e0018c16 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -72,7 +72,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ lndir makeQtWrapper ];
   buildInputs = [ unwrapped ] ++ themes;
-  inherit themes;
+  themes = map (pkg: pkg.out or pkg) themes;
   inherit unwrapped;
 
   installPhase = ''

From db419ce555c0ea9b4c4ef812239a392bf9f3130c Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 17:03:25 -0600
Subject: [PATCH 0891/2285] sddm: remove bash-ism

---
 pkgs/applications/display-managers/sddm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/display-managers/sddm/default.nix b/pkgs/applications/display-managers/sddm/default.nix
index 83e2e0018c16..8e1812ec013b 100644
--- a/pkgs/applications/display-managers/sddm/default.nix
+++ b/pkgs/applications/display-managers/sddm/default.nix
@@ -81,7 +81,7 @@ stdenv.mkDerivation {
     mkdir -p "$out/share/sddm"
     for pkg in $unwrapped $themes; do
         local sddmDir="$pkg/share/sddm"
-        if [[ -d "$sddmDir" ]]; then
+        if [ -d "$sddmDir" ]; then
             lndir -silent "$sddmDir" "$out/share/sddm"
         fi
     done

From 4768f41e36dca53ff1c79ea73f6d74e3ccab0234 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 17:03:42 -0600
Subject: [PATCH 0892/2285] nixos/kde5: use runtime outputs

---
 nixos/modules/services/x11/desktop-managers/kde5.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index e8c768e41fad..4b238938d927 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -55,12 +55,12 @@ in
     services.xserver.desktopManager.session = singleton {
       name = "kde5";
       bgSupport = true;
-      start = ''exec ${kde5.plasma-workspace}/bin/startkde;'';
+      start = ''exec startkde;'';
     };
 
     security.setuidOwners = singleton {
       program = "kcheckpass";
-      source = "${kde5.plasma-workspace}/lib/libexec/kcheckpass";
+      source = "${kde5.plasma-workspace.out}/lib/libexec/kcheckpass";
       owner = "root";
       group = "root";
       setuid = true;
@@ -168,12 +168,12 @@ in
 
     # Enable GTK applications to load SVG icons
     environment.variables = mkIf (lib.hasAttr "breeze-icons" kde5) {
-      GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
+      GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg.out}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
     };
 
     fonts.fonts = [ (kde5.oxygen-fonts or pkgs.noto-fonts) ];
 
-    programs.ssh.askPassword = "${kde5.ksshaskpass}/bin/ksshaskpass";
+    programs.ssh.askPassword = "${kde5.ksshaskpass.out}/bin/ksshaskpass";
 
     # Enable helpful DBus services.
     services.udisks2.enable = true;

From f43eb5ece02ef40ca17675cd3dc4dfe8a11fe5de Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 31 Jan 2016 21:11:30 -0600
Subject: [PATCH 0893/2285] qt54.qttools: move runtime executables to $out

---
 pkgs/development/libraries/qt-5/5.4/qttools.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.4/qttools.nix b/pkgs/development/libraries/qt-5/5.4/qttools.nix
index a6b29c07cac9..1472691c5254 100644
--- a/pkgs/development/libraries/qt-5/5.4/qttools.nix
+++ b/pkgs/development/libraries/qt-5/5.4/qttools.nix
@@ -4,6 +4,9 @@ qtSubmodule {
   name = "qttools";
   qtInputs = [ qtbase ];
   postFixup = ''
+    moveToOutput "bin/qdbus" "$out"
+    moveToOutput "bin/qtpaths" "$out"
+
     fixQtModuleCMakeConfig "Designer"
     fixQtModuleCMakeConfig "Help"
     fixQtModuleCMakeConfig "LinguistTools"

From 1a2d7c679a0db139e9a584acaa71e61fbad386e3 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Sun, 31 Jan 2016 23:00:43 -0500
Subject: [PATCH 0894/2285] ghcWithHoogle: add support for ghcjs

---
 pkgs/development/haskell-modules/hoogle.nix | 30 +++++++++++++++++----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index 14464ceca80d..b805195bc927 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -23,13 +23,33 @@
 # This will build mmorph and monadControl, and have the hoogle installation
 # refer to their documentation via symlink so they are not garbage collected.
 
-{ lib, stdenv, hoogle, rehoo
+{ lib, stdenv, hoogle, rehoo, writeText
 , ghc, packages ? [ ghc.ghc ]
 }:
 
 let
   inherit (stdenv.lib) optional;
   wrapper = ./hoogle-local-wrapper.sh;
+  isGhcjs = ghc.isGhcjs or false;
+  haddockExe =
+    if !isGhcjs
+    then "haddock"
+    else "haddock-ghcjs";
+  ghcName =
+    if !isGhcjs
+    then "ghc"
+    else "ghcjs";
+  docLibGlob =
+    if !isGhcjs
+    then ''share/doc/ghc*/html/libraries''
+    else ''doc/lib'';
+  # On GHCJS, use a stripped down version of GHC's prologue.txt
+  prologue =
+    if !isGhcjs
+    then "${ghc}/${docLibGlob}/prologue.txt"
+    else writeText "ghcjs-prologue.txt" ''
+      This index includes documentation for many Haskell modules.
+    '';
 in
 stdenv.mkDerivation {
   name = "hoogle-local-0.1";
@@ -58,7 +78,7 @@ stdenv.mkDerivation {
     }
 
     echo importing builtin packages
-    for docdir in ${ghc}/share/doc/ghc*/html/libraries/*; do
+    for docdir in ${ghc}/${docLibGlob}/*; do
       if [[ -d $docdir ]]; then
         import_dbs $docdir
         ln -sfn $docdir $out/share/doc/hoogle
@@ -68,7 +88,7 @@ stdenv.mkDerivation {
     echo importing other packages
     for i in $docPackages; do
       if [[ ! $i == $out ]]; then
-        for docdir in $i/share/doc/*-ghc-*/* $i/share/doc/*; do
+        for docdir in $i/share/doc/*-${ghcName}-*/* $i/share/doc/*; do
           name=`basename $docdir`
           docdir=$docdir/html
           if [[ -d $docdir ]]; then
@@ -99,9 +119,9 @@ stdenv.mkDerivation {
         args="$args --read-interface=$name_version,$hdfile"
     done
 
-    ${ghc}/bin/haddock --gen-index --gen-contents -o . \
+    ${ghc}/bin/${haddockExe} --gen-index --gen-contents -o . \
          -t "Haskell Hierarchical Libraries" \
-         -p ${ghc}/share/doc/ghc*/html/libraries/prologue.txt \
+         -p ${prologue} \
          $args
 
     echo finishing up

From 142b4172849cdca56f2d0fac70fe436b867b7752 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Mon, 1 Feb 2016 00:10:45 -0500
Subject: [PATCH 0895/2285] ghcWithHoogle: fix haddocks for GHCJS builtin libs

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

diff --git a/pkgs/development/haskell-modules/hoogle.nix b/pkgs/development/haskell-modules/hoogle.nix
index b805195bc927..58db9737d32c 100644
--- a/pkgs/development/haskell-modules/hoogle.nix
+++ b/pkgs/development/haskell-modules/hoogle.nix
@@ -31,6 +31,7 @@ let
   inherit (stdenv.lib) optional;
   wrapper = ./hoogle-local-wrapper.sh;
   isGhcjs = ghc.isGhcjs or false;
+  opts = lib.optionalString;
   haddockExe =
     if !isGhcjs
     then "haddock"
@@ -79,9 +80,11 @@ stdenv.mkDerivation {
 
     echo importing builtin packages
     for docdir in ${ghc}/${docLibGlob}/*; do
+      name="$(basename $docdir)"
+      ${opts isGhcjs ''docdir="$docdir/html"''}
       if [[ -d $docdir ]]; then
         import_dbs $docdir
-        ln -sfn $docdir $out/share/doc/hoogle
+        ln -sfn $docdir $out/share/doc/hoogle/$name
       fi
     done
 

From fdd54a943433eaf7446a12ad39a1a44251040b07 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Mon, 1 Feb 2016 02:13:45 -0500
Subject: [PATCH 0896/2285] ghcjs-ffiqq: init at rev da31b1858 (Oct 12, 2015)

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

diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index b59c3447a2b0..dd51b99bf930 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -85,6 +85,25 @@ self: super: {
     '';
   });
 
+  ghcjs-ffiqq = self.callPackage
+    ({ mkDerivation, base, template-haskell, ghcjs-base, split, containers, text, ghc-prim
+     }:
+     mkDerivation {
+       pname = "ghcjs-ffiqq";
+       version = "0.1.0.0";
+       src = pkgs.fetchFromGitHub {
+         owner = "ghcjs";
+         repo = "ghcjs-ffiqq";
+         rev = "da31b18582542fcfceade5ef6b2aca66662b9e20";
+         sha256 = "1mkp8p9hispyzvkb5v607ihjp912jfip61id8d42i19k554ssp8y";
+       };
+       libraryHaskellDepends = [
+         base template-haskell ghcjs-base split containers text ghc-prim
+       ];
+       description = "FFI QuasiQuoter for GHCJS";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   ghcjs-dom = overrideCabal super.ghcjs-dom (drv: {
     libraryHaskellDepends =
       removeLibraryHaskellDepends [

From 576746970e8fe9232bd34a446321ec7f42c3eb9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 1 Feb 2016 08:47:56 +0100
Subject: [PATCH 0897/2285] liberation-fonts: fix meta after 2012 changes

/cc maintainer @7c6f434c.
---
 .../fonts/redhat-liberation-fonts/binary.nix  | 29 ++-----------------
 .../fonts/redhat-liberation-fonts/default.nix | 14 +++------
 2 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/pkgs/data/fonts/redhat-liberation-fonts/binary.nix b/pkgs/data/fonts/redhat-liberation-fonts/binary.nix
index df206fe13b5a..9cbe951cf4ae 100644
--- a/pkgs/data/fonts/redhat-liberation-fonts/binary.nix
+++ b/pkgs/data/fonts/redhat-liberation-fonts/binary.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl}:
+{ stdenv, fetchurl, liberation_ttf_from_source }:
 
 stdenv.mkDerivation rec {
   version = "2.00.1";
@@ -16,30 +16,5 @@ stdenv.mkDerivation rec {
     cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true
   '';
 
-  meta = {
-    description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New";
-    longDescription = ''
-      The Liberation Fonts are intended to be replacements for the three most
-      commonly used fonts on Microsoft systems: Times New Roman, Arial, and
-      Courier New.
-
-      There are three sets: Sans (a substitute for Arial, Albany, Helvetica,
-      Nimbus Sans L, and Bitstream Vera Sans), Serif (a substitute for Times
-      New Roman, Thorndale, Nimbus Roman, and Bitstream Vera Serif) and Mono
-      (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L, and
-      Bitstream Vera Sans Mono).
-
-      You are free to use these fonts on any system you would like.  You are
-      free to redistribute them under the GPL+exception license found in the
-      download.  Using these fonts does not subject your documents to the
-      GPL---it liberates them from any proprietary claim.
-    '';
-
-    # See `License.txt' for details.
-    license = stdenv.lib.licenses.gpl2Oss;
-    homepage = https://fedorahosted.org/liberation-fonts/;
-    maintainers = [
-      stdenv.lib.maintainers.raskin
-    ];
-  };
+  inherit (liberation_ttf_from_source) meta;
 }
diff --git a/pkgs/data/fonts/redhat-liberation-fonts/default.nix b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
index cd5c50309412..80af5ab52d90 100644
--- a/pkgs/data/fonts/redhat-liberation-fonts/default.nix
+++ b/pkgs/data/fonts/redhat-liberation-fonts/default.nix
@@ -18,30 +18,24 @@ stdenv.mkDerivation rec {
     cp -v AUTHORS ChangeLog COPYING License.txt README "$out/doc/${name}" || true
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Liberation Fonts, replacements for Times New Roman, Arial, and Courier New";
     longDescription = ''
       The Liberation Fonts are intended to be replacements for the three most
       commonly used fonts on Microsoft systems: Times New Roman, Arial, and
-      Courier New.
+      Courier New. Since 2012 they are based on croscore fonts.
 
       There are three sets: Sans (a substitute for Arial, Albany, Helvetica,
       Nimbus Sans L, and Bitstream Vera Sans), Serif (a substitute for Times
       New Roman, Thorndale, Nimbus Roman, and Bitstream Vera Serif) and Mono
       (a substitute for Courier New, Cumberland, Courier, Nimbus Mono L, and
       Bitstream Vera Sans Mono).
-
-      You are free to use these fonts on any system you would like.  You are
-      free to redistribute them under the GPL+exception license found in the
-      download.  Using these fonts does not subject your documents to the
-      GPL---it liberates them from any proprietary claim.
     '';
 
-    # See `License.txt' for details.
-    license = stdenv.lib.licenses.gpl2Oss;
+    license = licenses.ofl;
     homepage = https://fedorahosted.org/liberation-fonts/;
     maintainers = [
-      stdenv.lib.maintainers.raskin
+      maintainers.raskin
     ];
   };
 }

From 5b28d3f1eb37cb64441b183802f031b020553ca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?=
 <theophane.hufschmitt@polytechnique.org>
Date: Mon, 1 Feb 2016 08:59:13 +0100
Subject: [PATCH 0898/2285] ocamlPackages.findlib: 1.5.3 -> 1.6.1

---
 pkgs/development/tools/ocaml/findlib/default.nix      | 11 +++++++----
 .../tools/ocaml/findlib/install_topfind.patch         |  9 +++++----
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/ocaml/findlib/default.nix b/pkgs/development/tools/ocaml/findlib/default.nix
index a9673be26ee3..746be6dd0812 100644
--- a/pkgs/development/tools/ocaml/findlib/default.nix
+++ b/pkgs/development/tools/ocaml/findlib/default.nix
@@ -4,12 +4,13 @@ let
   ocaml_version = (builtins.parseDrvName ocaml.name).version;
 in
 
-stdenv.mkDerivation {
-  name = "ocaml-findlib-1.5.3";
+stdenv.mkDerivation rec {
+  name = "ocaml-findlib-${version}";
+  version = "1.6.1";
 
   src = fetchurl {
-    url = http://download.camlcity.org/download/findlib-1.5.3.tar.gz;
-    sha256 = "1kw2siv4pc8q060m9xpgxvjs07ic1kiphyxmkwcz6nyb91p8286r";
+    url = "http://download.camlcity.org/download/findlib-${version}.tar.gz";
+    sha256 = "02abg1lsnwvjg3igdyb8qjgr5kv1nbwl4gaf8mdinzfii5p82721";
   };
 
   buildInputs = [m4 ncurses ocaml];
@@ -57,3 +58,5 @@ stdenv.mkDerivation {
     ];
   };
 }
+
+
diff --git a/pkgs/development/tools/ocaml/findlib/install_topfind.patch b/pkgs/development/tools/ocaml/findlib/install_topfind.patch
index f152feaaecfb..7c9f8e1a6cce 100644
--- a/pkgs/development/tools/ocaml/findlib/install_topfind.patch
+++ b/pkgs/development/tools/ocaml/findlib/install_topfind.patch
@@ -1,11 +1,12 @@
---- findlib-1.5.3/src/findlib/Makefile	2014-09-16 13:21:46.000000000 +0200
-+++ findlib-1.5.3/src/findlib/Makefile.new	2014-10-01 14:30:54.141082521 +0200
-@@ -89,7 +89,7 @@
+--- a/src/findlib/Makefile
++++ b/src/findlib/Makefile
+@@ -114,7 +114,7 @@ clean:
  install: all
  	mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"
  	mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
 -	test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
 +	test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_SITELIB)"
- 	files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a findlib.cmxs META` && \
+ 	files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a findlib.cmxs findlib_dynload.cma findlib_dynload.cmxa findlib_dynload.a findlib_dynload.cmxs fl_dynload.mli fl_dynload.cmi META` && \
  	cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
  	f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
+

From beabacf8c75289ec4a952aa53cbe186753515ff2 Mon Sep 17 00:00:00 2001
From: Tomas Vestelind <tomas.vestelind@stormshield.eu>
Date: Mon, 1 Feb 2016 09:40:50 +0100
Subject: [PATCH 0899/2285] tvestelind in maintainers

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 9a8e1d685ddb..d1c37e45da9e 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -312,6 +312,7 @@
   tstrobel = "Thomas Strobel <ts468@cam.ac.uk>";
   ttuegel = "Thomas Tuegel <ttuegel@gmail.com>";
   tv = "Tomislav Viljetić <tv@shackspace.de>";
+  tvestelind = "Tomas Vestelind <tomas.vestelind@fripost.org>";
   twey = "James ‘Twey’ Kay <twey@twey.co.uk>";
   urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
   vandenoever = "Jos van den Oever <jos@vandenoever.info>";

From 95ed5766d6da53d0786d0d84e7a694d9da4c8b24 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Tue, 3 Nov 2015 00:53:10 +0100
Subject: [PATCH 0900/2285] U-Boot: refactor to allow easier extendability

[dezgeg: minor stylistic tweaks, export buildUBoot for out-of-tree users]
---
 pkgs/misc/uboot/default.nix     | 129 +++++++++++++++++++-------------
 pkgs/top-level/all-packages.nix |  37 ++-------
 2 files changed, 85 insertions(+), 81 deletions(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 443841363bf3..981fbce0a3ab 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -1,62 +1,89 @@
-{ stdenv, fetchurl, bc, dtc
-, toolsOnly ? false
-, defconfig ? "allnoconfig"
-, targetPlatforms
-, filesToInstall
-}:
+{ stdenv, fetchurl, bc, dtc }:
 
 let
-  platform = stdenv.platform;
-  crossPlatform = stdenv.cross.platform;
-  makeTarget = if toolsOnly then "tools NO_SDL=1" else "all";
-  installDir = if toolsOnly then "$out/bin" else "$out";
-  buildFun = kernelArch:
-    ''
-      if test -z "$crossConfig"; then
-          make ${makeTarget}
-      else
-          make ${makeTarget} ARCH=${kernelArch} CROSS_COMPILE=$crossConfig-
-      fi
+  buildUBoot = { targetPlatforms
+            , filesToInstall
+            , installDir ? "$out"
+            , defconfig
+            , extraMeta ? {}
+            , ... } @ args:
+           stdenv.mkDerivation (rec {
+
+    name = "uboot-${defconfig}-${version}";
+    version = "2015.10";
+
+    nativeBuildInputs = [ bc dtc ];
+
+    src = fetchurl {
+      url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
+      sha256 = "0m8r08izci0lzzjn5c5g5manp2rc7yc5swww0lxr7bamjigqvimx";
+    };
+
+    configurePhase = ''
+      make ${defconfig}
     '';
-in
 
-stdenv.mkDerivation rec {
-  name = "uboot-${defconfig}-${version}";
-  version = "2015.10";
+    installPhase = ''
+      runHook preInstall
 
-  src = fetchurl {
-    url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
-    sha256 = "0m8r08izci0lzzjn5c5g5manp2rc7yc5swww0lxr7bamjigqvimx";
+      mkdir -p ${installDir}
+      cp ${stdenv.lib.concatStringsSep " " filesToInstall} ${installDir}
+
+      runHook postInstall
+    '';
+
+    dontStrip = true;
+
+    crossAttrs = {
+      makeFlags = [
+        "ARCH=${stdenv.cross.platform.kernelArch}"
+        "CROSS_COMPILE=${stdenv.cross.config}-"
+      ];
+    };
+
+    meta = with stdenv.lib; {
+      homepage = "http://www.denx.de/wiki/U-Boot/";
+      description = "Boot loader for embedded systems";
+      license = licenses.gpl2;
+      maintainers = [ maintainers.dezgeg ];
+      platforms = targetPlatforms;
+    } // extraMeta;
+  } // args);
+
+in rec {
+  inherit buildUBoot;
+
+  ubootTools = buildUBoot rec {
+    installDir = "$out/bin";
+    buildFlags = "tools NO_SDL=1";
+    dontStrip = false;
+    targetPlatforms = stdenv.lib.platforms.linux;
+    filesToInstall = ["tools/dumpimage" "tools/mkenvimage" "tools/mkimage"];
   };
 
-  patches = [ ./vexpress-Use-config_distro_bootcmd.patch ];
-
-  nativeBuildInputs = [ bc dtc ];
-
-  configurePhase = ''
-    make ${defconfig}
-  '';
-
-  buildPhase = assert (platform ? kernelArch);
-    buildFun platform.kernelArch;
-
-  installPhase = ''
-    mkdir -p ${installDir}
-    cp ${stdenv.lib.concatStringsSep " " filesToInstall} ${installDir}
-  '';
-
-  dontStrip = !toolsOnly;
-
-  crossAttrs = {
-    buildPhase = assert (crossPlatform ? kernelArch);
-      buildFun crossPlatform.kernelArch;
+  ubootJetsonTK1 = buildUBoot rec {
+    defconfig = "jetson-tk1_defconfig";
+    targetPlatforms = ["armv7l-linux"];
+    filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"];
   };
 
-  meta = with stdenv.lib; {
-    homepage = "http://www.denx.de/wiki/U-Boot/";
-    description = "Boot loader for embedded systems";
-    license = licenses.gpl2;
-    maintainers = [ maintainers.dezgeg ];
-    platforms = targetPlatforms;
+  ubootPcduino3Nano = buildUBoot rec {
+    defconfig = "Linksprite_pcDuino3_Nano_defconfig";
+    targetPlatforms = ["armv7l-linux"];
+    filesToInstall = ["u-boot-sunxi-with-spl.bin"];
+  };
+
+  ubootRaspberryPi = buildUBoot rec {
+    defconfig = "rpi_defconfig";
+    targetPlatforms = ["armv6l-linux"];
+    filesToInstall = ["u-boot.bin"];
+  };
+
+  # Intended only for QEMU's vexpress-a9 emulation target!
+  ubootVersatileExpressCA9 = buildUBoot rec {
+    defconfig = "vexpress_ca9x4_defconfig";
+    targetPlatforms = ["armv7l-linux"];
+    filesToInstall = ["u-boot"];
+    patches = [ ./vexpress-Use-config_distro_bootcmd.patch ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1c283e4acb10..bac0f0dd8b6f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10574,36 +10574,13 @@ let
   ubootChooser = name: ubootTools;
 
   # Upstream U-Boots:
-  ubootTools = callPackage ../misc/uboot {
-    toolsOnly = true;
-    targetPlatforms = lib.platforms.linux;
-    filesToInstall = ["tools/dumpimage" "tools/mkenvimage" "tools/mkimage"];
-  };
-
-  ubootJetsonTK1 = callPackage ../misc/uboot {
-    defconfig = "jetson-tk1_defconfig";
-    targetPlatforms = ["armv7l-linux"];
-    filesToInstall = ["u-boot" "u-boot.dtb" "u-boot-dtb-tegra.bin" "u-boot-nodtb-tegra.bin"];
-  };
-
-  ubootPcduino3Nano = callPackage ../misc/uboot {
-    defconfig = "Linksprite_pcDuino3_Nano_defconfig";
-    targetPlatforms = ["armv7l-linux"];
-    filesToInstall = ["u-boot-sunxi-with-spl.bin"];
-  };
-
-  ubootRaspberryPi = callPackage ../misc/uboot {
-    defconfig = "rpi_defconfig";
-    targetPlatforms = ["armv6l-linux"];
-    filesToInstall = ["u-boot.bin"];
-  };
-
-  # Intended only for QEMU's vexpress-a9 emulation target!
-  ubootVersatileExpressCA9 = callPackage ../misc/uboot {
-    defconfig = "vexpress_ca9x4_defconfig";
-    targetPlatforms = ["armv7l-linux"];
-    filesToInstall = ["u-boot"];
-  };
+  inherit (callPackage ../misc/uboot {})
+    buildUBoot
+    ubootJetsonTK1
+    ubootPcduino3Nano
+    ubootRaspberryPi
+    ubootVersatileExpressCA9
+    ;
 
   # Non-upstream U-Boots:
   ubootSheevaplug = callPackage ../misc/uboot/sheevaplug.nix { };

From f80a5634612807befc5c6ea012c7063bb7efed06 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 25 Dec 2015 20:31:43 +0200
Subject: [PATCH 0901/2285] U-Boot: Build for the Banana Pi board

I don't own this board, but someone on IRC reported this as working (and
anyway it's practically identical to ubootPcduino3Nano since they're both
Allwinner boards)
---
 pkgs/misc/uboot/default.nix     | 6 ++++++
 pkgs/top-level/all-packages.nix | 1 +
 2 files changed, 7 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 981fbce0a3ab..b592005e7948 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -61,6 +61,12 @@ in rec {
     filesToInstall = ["tools/dumpimage" "tools/mkenvimage" "tools/mkimage"];
   };
 
+  ubootBananaPi = buildUBoot rec {
+    defconfig = "Bananapi_defconfig";
+    targetPlatforms = ["armv7l-linux"];
+    filesToInstall = ["u-boot-sunxi-with-spl.bin"];
+  };
+
   ubootJetsonTK1 = buildUBoot rec {
     defconfig = "jetson-tk1_defconfig";
     targetPlatforms = ["armv7l-linux"];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bac0f0dd8b6f..2472e129a9a5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10576,6 +10576,7 @@ let
   # Upstream U-Boots:
   inherit (callPackage ../misc/uboot {})
     buildUBoot
+    ubootBananaPi
     ubootJetsonTK1
     ubootPcduino3Nano
     ubootRaspberryPi

From 5d3642eba9e8ea4bebf25aa19b2a7320a3666974 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 26 Dec 2015 07:24:17 +0200
Subject: [PATCH 0902/2285] U-Boot: 2015.10 -> 2016.01

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

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index b592005e7948..50b676aff1ea 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -10,13 +10,13 @@ let
            stdenv.mkDerivation (rec {
 
     name = "uboot-${defconfig}-${version}";
-    version = "2015.10";
+    version = "2016.01";
 
     nativeBuildInputs = [ bc dtc ];
 
     src = fetchurl {
       url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2";
-      sha256 = "0m8r08izci0lzzjn5c5g5manp2rc7yc5swww0lxr7bamjigqvimx";
+      sha256 = "1md5jpq5n9jh08s7sdkjrvg2q7kpzwa7yrpgl9581ncrjfx2yyg5";
     };
 
     configurePhase = ''

From e9b80f39721965ecbcd384ef6faeb3b661d3a3a7 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 25 Dec 2015 20:55:22 +0200
Subject: [PATCH 0903/2285] U-Boot: Build for the Wandboard board

From v2016.01 onwards, the Wandboards boot using the distro bootcmd
stuff as well.

Tested on a Wandboard Quad.
---
 pkgs/misc/uboot/default.nix     | 6 ++++++
 pkgs/top-level/all-packages.nix | 1 +
 2 files changed, 7 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 50b676aff1ea..4d1d3d73990e 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -92,4 +92,10 @@ in rec {
     filesToInstall = ["u-boot"];
     patches = [ ./vexpress-Use-config_distro_bootcmd.patch ];
   };
+
+  ubootWandboard = buildUBoot rec {
+    defconfig = "wandboard_defconfig";
+    targetPlatforms = ["armv7l-linux"];
+    filesToInstall = ["u-boot.img" "SPL"];
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2472e129a9a5..8fc516621d7a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10581,6 +10581,7 @@ let
     ubootPcduino3Nano
     ubootRaspberryPi
     ubootVersatileExpressCA9
+    ubootWandboard
     ;
 
   # Non-upstream U-Boots:

From b6621196e07429ed416ff426cc1e398cfc70a5d6 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Fri, 25 Dec 2015 20:35:59 +0200
Subject: [PATCH 0904/2285] sd-image-armv7l-multiplatform.nix: Add ttymxc0 to
 the list of consoles

Needed for the RS-232 port on Wandboard Quad (and presumably other boards
using the i.MX6 SoC).
---
 .../modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
index 15e22fb50d48..957a8ff9ce6d 100644
--- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix
@@ -23,7 +23,7 @@ in
   boot.loader.generic-extlinux-compatible.enable = true;
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
-  boot.kernelParams = ["console=ttyS0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"];
+  boot.kernelParams = ["console=ttyS0,115200n8" "console=ttymxc0,115200n8" "console=ttyAMA0,115200n8" "console=tty0"];
 
   # FIXME: this probably should be in installation-device.nix
   users.extraUsers.root.initialHashedPassword = "";

From 4cf9bf9eb00e85ab1b2d117b767aff81cb1c39b2 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 26 Dec 2015 07:28:19 +0200
Subject: [PATCH 0905/2285] sd-image.nix: Move the /boot partition up to 8M

Reportedly some ARM boards need some boot code at the start of a SD card
that could be larger than a megabyte. Change it to 8M, and while at it
reduce the /boot size such that the root partition should now start on a
128M boundary (the flash on SD cards really don't like non-aligned
writes these days).
---
 nixos/modules/installer/cd-dvd/sd-image.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix
index 12b4f3045614..9eba542d8c91 100644
--- a/nixos/modules/installer/cd-dvd/sd-image.nix
+++ b/nixos/modules/installer/cd-dvd/sd-image.nix
@@ -30,7 +30,7 @@ in
 
     bootSize = mkOption {
       type = types.int;
-      default = 128;
+      default = 120;
       description = ''
         Size of the /boot partition, in megabytes.
       '';
@@ -66,10 +66,10 @@ in
       buildInputs = with pkgs; [ dosfstools e2fsprogs mtools libfaketime utillinux ];
 
       buildCommand = ''
-        # Create the image file sized to fit /boot and /, plus 4M of slack
+        # Create the image file sized to fit /boot and /, plus 20M of slack
         rootSizeBlocks=$(du -B 512 --apparent-size ${rootfsImage} | awk '{ print $1 }')
         bootSizeBlocks=$((${toString config.sdImage.bootSize} * 1024 * 1024 / 512))
-        imageSize=$((rootSizeBlocks * 512 + bootSizeBlocks * 512 + 4096 * 1024))
+        imageSize=$((rootSizeBlocks * 512 + bootSizeBlocks * 512 + 20 * 1024 * 1024))
         truncate -s $imageSize $out
 
         # type=b is 'W95 FAT32', type=83 is 'Linux'.
@@ -77,8 +77,8 @@ in
             label: dos
             label-id: 0x2178694e
 
-            start=1M, size=$bootSizeBlocks, type=b, bootable
-            type=83
+            start=8M, size=$bootSizeBlocks, type=b, bootable
+            start=${toString (8 + config.sdImage.bootSize)}M, type=83
         EOF
 
         # Copy the rootfs into the SD image

From de2d609317b813096e00d00ab93da836f07947a5 Mon Sep 17 00:00:00 2001
From: Tomas Vestelind <tomas.vestelind@stormshield.eu>
Date: Mon, 1 Feb 2016 09:47:23 +0100
Subject: [PATCH 0906/2285] haka in unstable release notes

---
 nixos/doc/manual/release-notes/rl-unstable.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 6099b5218714..3d7819803697 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -42,6 +42,7 @@ nixos.path = ./nixpkgs-unstable-2015-12-06/nixos;
   <itemizedlist>
     <listitem><para><literal>services/monitoring/longview.nix</literal></para></listitem>
     <listitem><para><literal>services/web-apps/pump.io.nix</literal></para></listitem>
+    <listitem><para><literal>services/security/haka.nix</literal></para></listitem>
   </itemizedlist>
 </para>
 

From b5b78055431157456703742cfec770f2ff3e6675 Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 1 Feb 2016 10:37:41 +0100
Subject: [PATCH 0907/2285] nixos-rebuild: Do not create result symlinks for
 boot/switch actions (resolves #12665)

---
 nixos/modules/installer/tools/nixos-rebuild.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index 105d1cd16252..f758c08d3b75 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -329,7 +329,7 @@ fi
 if [ -z "$rollback" ]; then
     echo "building the system configuration..." >&2
     if [ "$action" = switch -o "$action" = boot ]; then
-        pathToConfig="$(nixBuild '<nixpkgs/nixos>' -A system "${extraBuildFlags[@]}")"
+        pathToConfig="$(nixBuild '<nixpkgs/nixos>' --no-out-link -A system "${extraBuildFlags[@]}")"
         copyToTarget "$pathToConfig"
         targetHostCmd nix-env -p "$profile" --set "$pathToConfig"
     elif [ "$action" = test -o "$action" = build -o "$action" = dry-build -o "$action" = dry-activate ]; then

From e430f14da39ab40bbd8f5c58d9fe7fb38fca88bb Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Mon, 1 Feb 2016 10:54:58 +0100
Subject: [PATCH 0908/2285] nixos-rebuild: Don't propagate --no-out-link arg to
 nix-store

---
 nixos/modules/installer/tools/nixos-rebuild.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh
index f758c08d3b75..e0e79f63fab7 100644
--- a/nixos/modules/installer/tools/nixos-rebuild.sh
+++ b/nixos/modules/installer/tools/nixos-rebuild.sh
@@ -149,10 +149,11 @@ nixBuild() {
                 local j="$1"; shift 1
                 instArgs+=("$i" "$j")
                 ;;
-              -I)
-                # We don't want this in buildArgs
+              -I) # We don't want this in buildArgs
                 shift 1
                 ;;
+              --no-out-link) # We don't want this in buildArgs
+                ;;
               "<"*) # nix paths
                 instArgs+=("$i")
                 ;;

From b2dc647c1e8d0bc56d990f2c14df9c85bb8b2c06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Mon, 1 Feb 2016 11:07:08 +0100
Subject: [PATCH 0909/2285] linux: adding PCI Expresscard Hotplug support

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

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 90b4a6a48244..bd4513ead9ee 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -355,6 +355,9 @@ with stdenv.lib;
   X86_CHECK_BIOS_CORRUPTION y
   X86_MCE y
 
+  # PCI-Expresscard hotplug support
+  HOTPLUG_PCI_PCIE y
+
   # Linux containers.
   NAMESPACES? y #  Required by 'unshare' used by 'nixos-install'
   RT_GROUP_SCHED? y

From 7330bfe4648f8255e9481058ec7f8ef3fcf24a7e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 31 Jan 2016 17:31:07 +0300
Subject: [PATCH 0910/2285] udev service: generate proper hwdb database

---
 nixos/modules/services/hardware/udev.nix | 54 ++++++++++++++++++++----
 1 file changed, 46 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index c747c24db67d..daa2fd89baca 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -16,6 +16,12 @@ let
     destination = "/etc/udev/rules.d/10-local.rules";
   };
 
+  extraHwdbFile = pkgs.writeTextFile {
+    name = "extra-hwdb-file";
+    text = cfg.extraHwdb;
+    destination = "/etc/udev/hwdb.d/10-local.hwdb";
+  };
+
   nixosRules = ''
     # Miscellaneous devices.
     KERNEL=="kvm",                  MODE="0666"
@@ -104,6 +110,27 @@ let
     ''; # */
   };
 
+  hwdbBin = stdenv.mkDerivation {
+    name = "hwdb.bin";
+
+    preferLocalBuild = true;
+    allowSubstitutes = false;
+
+    buildCommand = ''
+      mkdir -p etc/udev/hwdb.d
+      for i in ${toString ([udev] ++ cfg.packages)}; do
+        echo "Adding hwdb files for package $i"
+        for j in $i/{etc,lib}/udev/hwdb.d/*; do
+          ln -s $j etc/udev/hwdb.d/$(basename $j)
+        done
+      done
+
+      echo "Generating hwdb database..."
+      ${udev}/bin/udevadm hwdb --update --root=$(pwd)
+      mv etc/udev/hwdb.bin $out
+    '';
+  };
+
   # Udev has a 512-character limit for ENV{PATH}, so create a symlink
   # tree to work around this.
   udevPath = pkgs.buildEnv {
@@ -168,6 +195,21 @@ in
         '';
       };
 
+      extraHwdb = mkOption {
+        default = "";
+        example = ''
+          evdev:input:b0003v05AFp8277*
+            KEYBOARD_KEY_70039=leftalt
+            KEYBOARD_KEY_700e2=leftctrl
+        '';
+        type = types.lines;
+        description = ''
+          Additional <command>hwdb</command> files. They'll be written
+          into file <filename>10-local.hwdb</filename>. Thus they are
+          read before all other files.
+        '';
+      };
+
     };
 
     hardware.firmware = mkOption {
@@ -216,7 +258,7 @@ in
 
     services.udev.extraRules = nixosRules;
 
-    services.udev.packages = [ extraUdevRules ];
+    services.udev.packages = [ extraUdevRules extraHwdbFile ];
 
     services.udev.path = [ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.utillinux udev ];
 
@@ -224,6 +266,9 @@ in
       [ { source = udevRules;
           target = "udev/rules.d";
         }
+        { source = hwdbBin;
+          target = "udev/hwdb.bin";
+        }
       ];
 
     system.requiredKernelConfig = with config.lib.kernelConfig; [
@@ -241,13 +286,6 @@ in
           echo "" > /proc/sys/kernel/hotplug
         fi
 
-        # Regenerate the hardware database /var/lib/udev/hwdb.bin
-        # whenever systemd changes.
-        if [ ! -e /var/lib/udev/prev-systemd -o "$(readlink /var/lib/udev/prev-systemd)" != ${config.systemd.package} ]; then
-          echo "regenerating udev hardware database..."
-          ${config.systemd.package}/bin/udevadm hwdb --update && ln -sfn ${config.systemd.package} /var/lib/udev/prev-systemd
-        fi
-
         # Allow the kernel to find our firmware.
         if [ -e /sys/module/firmware_class/parameters/path ]; then
           echo -n "${config.hardware.firmware}/lib/firmware" > /sys/module/firmware_class/parameters/path

From 8491d0d1ca993a186d170ee8a8fffd5bc0d0521c Mon Sep 17 00:00:00 2001
From: Tony White <white.tw.tw@gmail.com>
Date: Sun, 31 Jan 2016 12:22:20 +0000
Subject: [PATCH 0911/2285] chromium: 47.0.2526.106 - > 48.0.2564.97

- Fixes CVE-2016-1612 CVE-2016-1613 CVE-2016-1614 CVE-2016-1615
  CVE-2016-1616 CVE-2016-1617 CVE-2016-1618 CVE-2016-1619 CVE-2016-1620.
- Moves chromium stable and beta channels up one version major.
  vcunat made dev channel stay for now, as it wouldn't download otherwise.
  This is most of PR #12717.
---
 .../browsers/chromium/source/sources.nix         | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index dc6f22434db9..1a19210fd3dc 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -7,15 +7,15 @@
     sha256bin64 = "1l5s504mmr4v5y67fsla9hyrk7dm155yc790ld87s1ya03h455gr";
   };
   beta = {
-    version = "48.0.2564.48";
-    sha256 = "1qasdz9rwdqa2if8y4kkk19fspgjpk3q782c8l1p5n2cm25lkfa9";
-    sha256bin32 = "0pgc3iy4s7whmckc14r0cvgmk7pqgidd2w0xv53bfq2k504b5ykw";
-    sha256bin64 = "1lx6l8s2wdgzldbm8licpf22l6z13mvq05xlbn8ybizhn159nykj";
+    version = "49.0.2623.28";
+    sha256 = "1cpgfcw6kgw70k14wa1m5qzj4rnvkzrw1am30d34516mbwlmmqc8";
+    sha256bin32 = "0nwhjav1x325h1drqknrjl5glivn4fdpahs1nlaqfk8kbjh1q113";
+    sha256bin64 = "0wj6j0v3rngsclzbb8rc8l90wdi98j2sb60r2ypfihaxq2gd138y";
   };
   stable = {
-    version = "47.0.2526.106";
-    sha256 = "1rjqkawj7l127cd9s1wxwn4v7dfbrlahml98sam3fg8a6drm0lv4";
-    sha256bin32 = "14svd5x8lzfyyigfirxx1q9pg2bsnnb0fdwa7vvh1awq3zzfd38n";
-    sha256bin64 = "121289vwaz391b32hp2lihlpaql76y44gdpqkl9a3md0j1zk1nd9";
+    version = "48.0.2564.97";
+    sha256 = "1nsjn8zlqljizy5dmg2rxwkw4k5j4yi15ywxi9ca3acv68dbhd3p";
+    sha256bin32 = "0gdd9krsfsixw5b03msm7nf7zl7xh4chzkh9srb19c1kzygl2j2l";
+    sha256bin64 = "1wmw17gdq1j6vxfdc8s94jc8z30pza8nipk4dh590xnb7faihr52";
   };
 }

From 88ae75017edcad44eaabb3132defefd9efd802d8 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Mon, 1 Feb 2016 00:07:34 +0000
Subject: [PATCH 0912/2285] Fix boto3 for python3.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cd372c9dfc4a..916ac7126487 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2282,10 +2282,15 @@ in modules // {
     };
 
     propagatedBuildInputs = [ self.botocore
-                              self.futures_2_2
                               self.jmespath
-                            ];
-    buildInputs = [ self.docutils ];
+                            ] ++ (if isPy3k then [] else [self.futures_2_2]);
+    buildInputs = [ self.docutils self.nose self.mock ];
+
+    # Tests are failing with `botocore.exceptions.NoCredentialsError:
+    # Unable to locate credentials`. There also seems to be some mock
+    # issues (`assert_called_once` doesn't exist in mock but boto
+    # seems to think it is?).
+    doCheck = false;
 
     meta = {
       homepage = https://github.com/boto3/boto;
@@ -12520,7 +12525,7 @@ in modules // {
     # Disable failing test_f2py test.
     # f2py couldn't be found by test,
     # even though it was used successfully to build numpy
-    
+
     # The large file support test is disabled because it takes forever
     # and can cause the machine to run out of disk space when run.
     prePatch = ''

From 0c5ad78c18526425d57f3052790a53f67a3e2749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Czy=C5=BC?= <tomasz.czyz@gmail.com>
Date: Sat, 30 Jan 2016 00:42:57 +0000
Subject: [PATCH 0913/2285] solaar: fix, partially (close #12685)

vcunat's comments:
Unused parameter got removed.
CLI looks good now but the GUI still won't work with:

bin/..solaar-wrapped-wrapped:45: PyGIWarning:
 Gtk was imported without specifying a version first.
 Use gi.require_version('Gtk', '3.0') before import to ensure that the right version gets loaded.
  solaar.gtk.main()
 solaar: error: Argument 0 does not allow None as a value
---
 pkgs/applications/misc/solaar/default.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix
index db0798f64cff..9a199c7ee499 100644
--- a/pkgs/applications/misc/solaar/default.nix
+++ b/pkgs/applications/misc/solaar/default.nix
@@ -1,19 +1,14 @@
-{fetchurl, stdenv, makeWrapper, gtk3, python3Packages}:
-let
-  version = "0.9.2";
-in
-stdenv.mkDerivation {
+{fetchurl, stdenv, gtk3, python34Packages, gobjectIntrospection}:
+python34Packages.buildPythonPackage rec {
   name = "solaar-${version}";
+  version = "0.9.2";
+  namePrefix = "";
   src = fetchurl {
     sha256 = "0954grz2adggfzcj4df4mpr4d7qyl7w8rb4j2s0f9ymawl92i05j";
     url = "https://github.com/pwr/Solaar/archive/${version}.tar.gz";
   };
 
-  buildInputs = [gtk3 python3Packages.pygobject3 python3Packages.pyudev];
-  enableParallelBuilding = true;
-  installPhase = ''
-    mkdir -p "$out";
-  '';
+  propagatedBuildInputs = [python34Packages.pygobject3 python34Packages.pyudev gobjectIntrospection gtk3];
   postInstall = ''
     wrapProgram "$out/bin/solaar" \
       --prefix PYTHONPATH : "$PYTHONPATH" \
@@ -22,6 +17,8 @@ stdenv.mkDerivation {
       --prefix PYTHONPATH : "$PYTHONPATH" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"
   '';
+
+  enableParallelBuilding = true;
   meta = with stdenv.lib; {
     description = "Linux devices manager for the Logitech Unifying Receiver";
     longDescription = ''

From 42627b7d5965d65fe0be0edfe841602ee492bc3d Mon Sep 17 00:00:00 2001
From: Tomas Vestelind <tomas.vestelind@stormshield.eu>
Date: Mon, 1 Feb 2016 14:00:45 +0100
Subject: [PATCH 0914/2285] remove period from description

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

diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix
index c39d06408ae5..319453c80194 100644
--- a/pkgs/games/vassal/default.nix
+++ b/pkgs/games/vassal/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   forceShare = [ "man" "info" ];
 
   meta = with stdenv.lib; {
-      description = "A free, open-source boardgame engine.";
+      description = "A free, open-source boardgame engine";
       homepage = http://www.vassalengine.org/;
       license = licenses.lgpl21;
       maintainers = with maintainers; [ tvestelind ];

From ea25afa2cb7032d6dec546b1f61d1272b5f9a2fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christopher=20L=C3=BCbbemeier?=
 <christopher.luebbemeier@gmail.com>
Date: Mon, 25 Jan 2016 14:13:06 +0100
Subject: [PATCH 0915/2285] spotify: fix icons

---
 pkgs/applications/audio/spotify/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index cdfbf2f2b4c7..f345e9710d2f 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -87,7 +87,14 @@ stdenv.mkDerivation {
       # Desktop file
       mkdir -p "$out/share/applications/"
       cp "$out/share/spotify/spotify.desktop" "$out/share/applications/"
-      sed -i "s|Icon=.*|Icon=$out/share/spotify/Icons/spotify-linux-512.png|" "$out/share/applications/spotify.desktop"
+
+      # Icons
+      for i in 16 22 24 32 48 64 128 256 512; do
+        ixi="$i"x"$i"
+        mkdir -p "$out/share/icons/hicolor/$ixi/apps"
+        ln -s "$out/share/spotify/icons/spotify-linux-$i.png" \
+          "$out/share/icons/hicolor/$ixi/apps/spotify-client.png"
+      done
     '';
 
   dontStrip = true;

From 4d0e732168d1747f2d01fac74d70b7f112a247f4 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Mon, 1 Feb 2016 15:11:28 +0000
Subject: [PATCH 0916/2285] titaniumenv: fix android builds on darwin and get
 rid of allowUnfree since the OpenJDK just works fine

---
 .../mobile/titaniumenv/build-app.nix          | 29 +++++++++++++++++++
 .../mobile/titaniumenv/examples/default.nix   | 13 ++++-----
 2 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index 53fce61a999e..934d032e4791 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -20,6 +20,28 @@ let
     security default-keychain -s login.keychain
     security delete-keychain $keychainName
   '';
+  
+  # On Mac OS X, the java executable shows an -unoffical postfix in the version
+  # number. This confuses the build script's version detector.
+  # We fix this by creating a wrapper that strips it out of the output.
+  
+  javaVersionFixWrapper = stdenv.mkDerivation {
+    name = "javaVersionFixWrapper";
+    buildCommand = ''
+      mkdir -p $out/bin
+      cat > $out/bin/javac <<EOF
+      #! ${stdenv.shell} -e
+      
+      if [ "\$1" = "-version" ]
+      then
+          ${jdk}/bin/javac "\$@" 2>&1 | sed "s|-unofficial||" | sed "s|-u60|_60|" >&2
+      else
+          exec ${jdk}/bin/javac "\$@"
+      fi
+      EOF
+      chmod +x $out/bin/javac
+    '';
+  };
 in
 stdenv.mkDerivation {
   name = stdenv.lib.replaceChars [" "] [""] name;
@@ -49,6 +71,13 @@ stdenv.mkDerivation {
     
     ${if target == "android" then
         ''
+          ${stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") ''
+            # Hack to make version detection work with OpenJDK on Mac OS X
+            export PATH=${javaVersionFixWrapper}/bin:$PATH
+            export JAVA_HOME=${javaVersionFixWrapper}
+            javac -version
+          ''}
+          
           titanium config --config-file $TMPDIR/config.json --no-colors android.sdk ${androidsdkComposition}/libexec/android-sdk-*
           titanium config --config-file $TMPDIR/config.json --no-colors android.buildTools.selectedVersion 23.0.1
           
diff --git a/pkgs/development/mobile/titaniumenv/examples/default.nix b/pkgs/development/mobile/titaniumenv/examples/default.nix
index 6dd80a216ded..ffeefdbbbcfa 100644
--- a/pkgs/development/mobile/titaniumenv/examples/default.nix
+++ b/pkgs/development/mobile/titaniumenv/examples/default.nix
@@ -5,17 +5,16 @@
 , tiVersion ? "5.1.2.GA"
 , rename ? false
 , newBundleId ? "com.example.kitchensink", iosMobileProvisioningProfile ? null, iosCertificate ? null, iosCertificateName ? "Example", iosCertificatePassword ? "", iosVersion ? "9.2"
-, allowUnfree ? false
 , enableWirelessDistribution ? false, installURL ? null
 }:
 
 let
-  pkgs = import nixpkgs { config.allowUnfree = allowUnfree; };
+  pkgs = import nixpkgs {};
 in
 rec {
   kitchensink_android_debug = pkgs.lib.genAttrs systems (system:
   let
-    pkgs = import nixpkgs { inherit system; config.allowUnfree = allowUnfree; };
+    pkgs = import nixpkgs { inherit system; };
   in
   import ./kitchensink {
     inherit (pkgs) fetchgit;
@@ -26,7 +25,7 @@ rec {
   
   kitchensink_android_release = pkgs.lib.genAttrs systems (system:
   let
-    pkgs = import nixpkgs { inherit system; config.allowUnfree = allowUnfree; };
+    pkgs = import nixpkgs { inherit system; };
   in
   import ./kitchensink {
     inherit (pkgs) fetchgit;
@@ -38,7 +37,7 @@ rec {
   
   emulate_kitchensink_debug = pkgs.lib.genAttrs systems (system:
   let
-    pkgs = import nixpkgs { inherit system; config.allowUnfree = allowUnfree; };
+    pkgs = import nixpkgs { inherit system; };
   in
   import ./emulate-kitchensink {
     inherit (pkgs) androidenv;
@@ -47,7 +46,7 @@ rec {
   
   emulate_kitchensink_release = pkgs.lib.genAttrs systems (system:
   let
-    pkgs = import nixpkgs { inherit system; config.allowUnfree = allowUnfree; };
+    pkgs = import nixpkgs { inherit system; };
   in
   import ./emulate-kitchensink {
     inherit (pkgs) androidenv;
@@ -74,7 +73,7 @@ rec {
   };
 } else {}) // (if rename then
   let
-    pkgs = import nixpkgs { system = "x86_64-darwin"; config.allowUnfree = allowUnfree; };
+    pkgs = import nixpkgs { system = "x86_64-darwin"; };
   in
   {
     kitchensink_ipa = import ./kitchensink {

From a7f09e97734792b7d3d68b13825ced07f737a006 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Fri, 15 Jan 2016 23:57:31 +0100
Subject: [PATCH 0917/2285] openssh: 6.9p1 -> 7.1p2

---
 pkgs/tools/networking/openssh/default.nix     |  6 +-
 .../networking/openssh/disable-roaming.patch  | 51 ---------------
 .../openssh/openssh-6.9p1-security-7.0.patch  | 65 -------------------
 3 files changed, 3 insertions(+), 119 deletions(-)
 delete mode 100644 pkgs/tools/networking/openssh/disable-roaming.patch
 delete mode 100644 pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index fecaabe95f94..bb27b0cc3fcb 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -23,11 +23,11 @@ let
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "openssh-6.9p1";
+  name = "openssh-7.1p2";
 
   src = fetchurl {
     url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
-    sha256 = "1zkci5nbpb4frmzj2vr3kv9j47x2h72kvybcpr0d8mzk73sls1vf";
+    sha256 = "1gbbvszz74lkc7b2mqr3ccgpm65zj0k5h7a2ssh0c7pjvhjg0xfx";
   };
 
   prePatch = optionalString hpnSupport
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
     '';
 
-  patches = [ ./locale_archive.patch ./openssh-6.9p1-security-7.0.patch ./disable-roaming.patch ]
+  patches = [ ./locale_archive.patch ]
     ++ optional withGssapiPatches gssapiSrc;
 
   buildInputs = [ zlib openssl libedit pkgconfig pam ]
diff --git a/pkgs/tools/networking/openssh/disable-roaming.patch b/pkgs/tools/networking/openssh/disable-roaming.patch
deleted file mode 100644
index cd81d52f6c18..000000000000
--- a/pkgs/tools/networking/openssh/disable-roaming.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From b842c1891b9979e30a6b53292a236ceb9231be79 Mon Sep 17 00:00:00 2001
-From: Franz Pletz <fpletz@fnordicwalking.de>
-Date: Thu, 14 Jan 2016 16:25:50 +0100
-Subject: [PATCH] Disable roaming, fixes CVE-2016-0777 and CVE-0216-0778
-
-Based on http://ftp.openbsd.org/pub/OpenBSD/patches/5.8/common/010_ssh.patch.sig
----
- readconf.c | 5 ++---
- ssh.c      | 3 ---
- 2 files changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/readconf.c b/readconf.c
-index db7d0bb..5b03f97 100644
---- a/readconf.c
-+++ b/readconf.c
-@@ -1660,7 +1660,7 @@ initialize_options(Options * options)
- 	options->tun_remote = -1;
- 	options->local_command = NULL;
- 	options->permit_local_command = -1;
--	options->use_roaming = -1;
-+	options->use_roaming = 0;
- 	options->visual_host_key = -1;
- 	options->ip_qos_interactive = -1;
- 	options->ip_qos_bulk = -1;
-@@ -1835,8 +1835,7 @@ fill_default_options(Options * options)
- 		options->tun_remote = SSH_TUNID_ANY;
- 	if (options->permit_local_command == -1)
- 		options->permit_local_command = 0;
--	if (options->use_roaming == -1)
--		options->use_roaming = 1;
-+	options->use_roaming = 0;
- 	if (options->visual_host_key == -1)
- 		options->visual_host_key = 0;
- 	if (options->ip_qos_interactive == -1)
-diff --git a/ssh.c b/ssh.c
-index 3fd5a94..e8428b5 100644
---- a/ssh.c
-+++ b/ssh.c
-@@ -1931,9 +1931,6 @@ ssh_session2(void)
- 			fork_postauth();
- 	}
- 
--	if (options.use_roaming)
--		request_roaming();
--
- 	return client_loop(tty_flag, tty_flag ?
- 	    options.escape_char : SSH_ESCAPECHAR_NONE, id);
- }
--- 
-2.7.0
-
diff --git a/pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch b/pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch
deleted file mode 100644
index 02e9eb3a9739..000000000000
--- a/pkgs/tools/networking/openssh/openssh-6.9p1-security-7.0.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-http://pkgs.fedoraproject.org/cgit/openssh.git/commit/openssh-6.9p1-security-7.0.patch?h=f22&id=4776fad91e7e1f626f33e8c240d0ccecd663554d
-
-diff --git a/sshpty.c b/sshpty.c
-index 7bb7641..15da8c6 100644
---- a/sshpty.c
-+++ b/sshpty.c
-@@ -1,4 +1,4 @@
--/* $OpenBSD: sshpty.c,v 1.29 2014/09/03 18:55:07 djm Exp $ */
-+/* $OpenBSD: sshpty.c,v 1.30 2015/07/30 23:09:15 djm Exp $ */
- /*
-  * Author: Tatu Ylonen <ylo@cs.hut.fi>
-  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
-@@ -197,7 +197,7 @@ pty_setowner(struct passwd *pw, const char *tty)
- 	/* Determine the group to make the owner of the tty. */
- 	grp = getgrnam("tty");
- 	gid = (grp != NULL) ? grp->gr_gid : pw->pw_gid;
--	mode = (grp != NULL) ? 0622 : 0600;
-+	mode = (grp != NULL) ? 0620 : 0600;
- 
- 	/*
- 	 * Change owner and mode of the tty as required.
-diff --git a/monitor.c b/monitor.c
-index b410965..f1b873d 100644
---- a/monitor.c
-+++ b/monitor.c
-@@ -1084,9 +1084,7 @@ extern KbdintDevice sshpam_device;
- int
- mm_answer_pam_init_ctx(int sock, Buffer *m)
- {
--
- 	debug3("%s", __func__);
--	authctxt->user = buffer_get_string(m, NULL);
- 	sshpam_ctxt = (sshpam_device.init_ctx)(authctxt);
- 	sshpam_authok = NULL;
- 	buffer_clear(m);
-@@ -1166,14 +1166,16 @@ mm_answer_pam_respond(int sock, Buffer *m)
- int
- mm_answer_pam_free_ctx(int sock, Buffer *m)
- {
-+	int r = sshpam_authok != NULL && sshpam_authok == sshpam_ctxt;
- 
- 	debug3("%s", __func__);
- 	(sshpam_device.free_ctx)(sshpam_ctxt);
-+	sshpam_ctxt = sshpam_authok = NULL;
- 	buffer_clear(m);
- 	mm_request_send(sock, MONITOR_ANS_PAM_FREE_CTX, m);
- 	auth_method = "keyboard-interactive";
- 	auth_submethod = "pam";
--	return (sshpam_authok == sshpam_ctxt);
-+	return r;
- }
- #endif
- 
-diff --git a/monitor_wrap.c b/monitor_wrap.c
-index e6217b3..eac421b 100644
---- a/monitor_wrap.c
-+++ b/monitor_wrap.c
-@@ -614,7 +614,6 @@ mm_sshpam_init_ctx(Authctxt *authctxt)
- 
- 	debug3("%s", __func__);
- 	buffer_init(&m);
--	buffer_put_cstring(&m, authctxt->user);
- 	mm_request_send(pmonitor->m_recvfd, MONITOR_REQ_PAM_INIT_CTX, &m);
- 	debug3("%s: waiting for MONITOR_ANS_PAM_INIT_CTX", __func__);
- 	mm_request_receive_expect(pmonitor->m_recvfd, MONITOR_ANS_PAM_INIT_CTX, &m);

From a7b7ac8bfb948f05c8956f8de23d806fb7686438 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Feb 2016 16:27:46 +0100
Subject: [PATCH 0918/2285] openssh: Enable DSA host/client keys

This applies a patch from Fedora to make HostKeyAlgorithms do the
right thing, fixing the issue described in
401782cb678d2e28c0f7f2d40c6421624f410148.
---
 nixos/modules/programs/ssh.nix                 |  3 +++
 nixos/modules/services/networking/ssh/sshd.nix | 13 ++++++++++++-
 pkgs/tools/networking/openssh/default.nix      | 11 ++++++++++-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 2da8ff738fbc..169c6a38e75b 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -186,6 +186,9 @@ in
 
         ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}
 
+        # Allow DSA keys for now. (These were deprecated in OpenSSH 7.0.)
+        PubkeyAcceptedKeyTypes +ssh-dss
+
         ${cfg.extraConfig}
       '';
 
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 5baea4bc6aea..ba3efc8c0c2a 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -52,6 +52,8 @@ let
     ));
   in listToAttrs (map mkAuthKeyFile usersWithKeys);
 
+  supportOldHostKeys = !versionAtLeast config.system.stateVersion "15.07";
+
 in
 
 {
@@ -177,7 +179,7 @@ in
         default =
           [ { type = "rsa"; bits = 4096; path = "/etc/ssh/ssh_host_rsa_key"; }
             { type = "ed25519"; path = "/etc/ssh/ssh_host_ed25519_key"; }
-          ] ++ optionals (!versionAtLeast config.system.stateVersion "15.07")
+          ] ++ optionals supportOldHostKeys
           [ { type = "dsa"; path = "/etc/ssh/ssh_host_dsa_key"; }
             { type = "ecdsa"; bits = 521; path = "/etc/ssh/ssh_host_ecdsa_key"; }
           ];
@@ -347,6 +349,15 @@ in
         ${flip concatMapStrings cfg.hostKeys (k: ''
           HostKey ${k.path}
         '')}
+
+        # Allow DSA client keys for now. (These were deprecated
+        # in OpenSSH 7.0.)
+        PubkeyAcceptedKeyTypes +ssh-dss
+
+        # Re-enable DSA host keys for now.
+        ${optionalString supportOldHostKeys ''
+          HostKeyAlgorithms +ssh-dss
+        ''}
       '';
 
     assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true;
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index bb27b0cc3fcb..73e92aa4b8e5 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -36,7 +36,16 @@ stdenv.mkDerivation rec {
       export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s"
     '';
 
-  patches = [ ./locale_archive.patch ]
+  patches =
+    [ ./locale_archive.patch
+
+      # Fix "HostKeyAlgoritms +...", which we need to enable DSA
+      # host key support.
+      (fetchurl {
+        url = "https://pkgs.fedoraproject.org/cgit/rpms/openssh.git/plain/openssh-7.1p1-hostkeyalgorithms.patch?id=c98f5597250d6f9a8e8d96960beb6306d150ef0f";
+        sha256 = "029lzp9qv1af8wdm0wwj7qwjj1nimgsjj214jqm3amwz0857qgvp";
+      })
+    ]
     ++ optional withGssapiPatches gssapiSrc;
 
   buildInputs = [ zlib openssl libedit pkgconfig pam ]

From 79b326e9e9d0f9b8b168e275362a2f41a8c3256e Mon Sep 17 00:00:00 2001
From: Henry Till <henrytill@gmail.com>
Date: Mon, 1 Feb 2016 11:23:28 -0500
Subject: [PATCH 0919/2285] mr: 1.20150503 -> 1.20160123

---
 pkgs/applications/version-management/mr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix
index 68bef621bc28..551a5795d11b 100644
--- a/pkgs/applications/version-management/mr/default.nix
+++ b/pkgs/applications/version-management/mr/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  version = "1.20150503";
+  version = "1.20160123";
   name = "mr-${version}";
 
   src = fetchurl {
     url = "https://github.com/joeyh/myrepos/archive/${version}.tar.gz";
-    sha256 = "12cf8kmn13446rszmah5wws5p2k2gjp6y4505sy1r14qnahf4qbf";
+    sha256 = "1723cg5haplz2w9dwdzp6ds1ip33cx3awmj4wnb0h4yq171v5lqk";
   };
 
   buildInputs = [ perl ];

From 5b8e6aaa219390c7e03d984150c7ac3874922fe7 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <michiel@staff.isoc.nl>
Date: Mon, 1 Feb 2016 17:47:09 +0100
Subject: [PATCH 0920/2285] libcutl: init -> 1.9.0

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

diff --git a/pkgs/development/libraries/libcutl/default.nix b/pkgs/development/libraries/libcutl/default.nix
new file mode 100644
index 000000000000..526890ed5637
--- /dev/null
+++ b/pkgs/development/libraries/libcutl/default.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchurl, xercesc }:
+with stdenv; with lib;
+mkDerivation rec {
+  name = "libcutl-${meta.major}.${meta.minor}";
+
+  meta = {
+    major = "1.9";
+    minor = "0";
+    description = "A collection of generic and independent components such as meta-programming tests, smart pointers, containers, compiler building blocks" ;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ ];
+    license = licenses.mit;
+  };
+
+  src = fetchurl {
+    url = "http://codesynthesis.com/download/libcutl/1.9/${name}.tar.bz2";
+    sha1 = "0e8d255145afbc339a3284ef85a43f4baf3fec43";
+  };
+
+  buildInputs = [ xercesc ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 208f610b85a0..b30146a66aec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7147,6 +7147,8 @@ let
 
   libcue = callPackage ../development/libraries/libcue { };
 
+  libcutl = callPackage ../development/libraries/libcutl { };
+
   libdaemon = callPackage ../development/libraries/libdaemon { };
 
   libdbi = callPackage ../development/libraries/libdbi { };

From 1026673f374848e0cbb0bd18ad383540971c09e6 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 30 Jan 2016 23:34:26 +0100
Subject: [PATCH 0921/2285] firefox: 43.0.4 -> 44.0

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

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 566247fc0d43..7451297f8d20 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -133,8 +133,8 @@ in {
 
   firefox-unwrapped = common {
     pname = "firefox";
-    version = "43.0.4";
-    sha256 = "0xjs4j26h8fyy8izrcc482vfvgg4gqzap5kh17jfv7flhn9akkvn";
+    version = "44.0";
+    sha256 = "07ac1h6ib36nm4a0aykh1z36vgw6wqlblil0zsj0lchdhksb10pa";
   };
 
   firefox-esr-unwrapped = common {

From 92c7ff216ed56d84fa9ba8e5a97b22c939fb7375 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 30 Jan 2016 14:58:01 +0100
Subject: [PATCH 0922/2285] libimobiledevice: Add patch to disable SSLv3

---
 .../libraries/libimobiledevice/default.nix    |  4 ++-
 .../libimobiledevice/disable_sslv3.patch      | 25 +++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/libimobiledevice/disable_sslv3.patch

diff --git a/pkgs/development/libraries/libimobiledevice/default.nix b/pkgs/development/libraries/libimobiledevice/default.nix
index c1519ca5b830..40bb9a5a140d 100644
--- a/pkgs/development/libraries/libimobiledevice/default.nix
+++ b/pkgs/development/libraries/libimobiledevice/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ readline ];
   propagatedBuildInputs = [ libusbmuxd glib libgcrypt libtasn1 libplist openssl ];
 
-  patchPhase = ''sed -e 's@1\.3\.21@@' -i configure'';
+  patches = [ ./disable_sslv3.patch ];
+
+  postPatch = ''sed -e 's@1\.3\.21@@' -i configure'';
   passthru.swig = libplist.swig;
 
   src = fetchurl {
diff --git a/pkgs/development/libraries/libimobiledevice/disable_sslv3.patch b/pkgs/development/libraries/libimobiledevice/disable_sslv3.patch
new file mode 100644
index 000000000000..646b829496fa
--- /dev/null
+++ b/pkgs/development/libraries/libimobiledevice/disable_sslv3.patch
@@ -0,0 +1,25 @@
+From e19de4f0d4cb70e30017edfc6b4ca1b89ffbd381 Mon Sep 17 00:00:00 2001
+From: Franz Pletz <fpletz@fnordicwalking.de>
+Date: Thu, 14 Jan 2016 14:58:23 +0100
+Subject: [PATCH] Disable SSLv3
+
+---
+ src/idevice.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/idevice.c b/src/idevice.c
+index ce27495..8f03094 100644
+--- a/src/idevice.c
++++ b/src/idevice.c
+@@ -678,7 +678,7 @@ LIBIMOBILEDEVICE_API idevice_error_t idevice_connection_enable_ssl(idevice_conne
+ 	}
+ 	BIO_set_fd(ssl_bio, (int)(long)connection->data, BIO_NOCLOSE);
+ 
+-	SSL_CTX *ssl_ctx = SSL_CTX_new(SSLv3_method());
++	SSL_CTX *ssl_ctx = SSL_CTX_new(SSLv23_method());
+ 	if (ssl_ctx == NULL) {
+ 		debug_info("ERROR: Could not create SSL context.");
+ 		BIO_free(ssl_bio);
+-- 
+2.7.0
+

From d2d9b7a7bccfcf428e133f83bc036d0d5ed2c866 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 29 Jan 2016 04:50:46 +0000
Subject: [PATCH 0923/2285] drbd: set DESTDIR

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

diff --git a/pkgs/os-specific/linux/drbd/default.nix b/pkgs/os-specific/linux/drbd/default.nix
index 4c945a7fbac7..d90d6faac396 100644
--- a/pkgs/os-specific/linux/drbd/default.nix
+++ b/pkgs/os-specific/linux/drbd/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = "SHELL=${stdenv.shell}";
 
-  installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc INITDIR=$(out)/etc/init.d";
+  installFlags = "localstatedir=$(TMPDIR)/var sysconfdir=$(out)/etc INITDIR=$(out)/etc/init.d DESTDIR=$(out)";
 
   meta = {
     homepage = http://www.drbd.org/;

From 54047149973c6698943081a83765c09b511dcc78 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 1 Feb 2016 20:15:29 +0300
Subject: [PATCH 0924/2285] systemd: add a notice to remove makeFlags on update

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

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 3cff6512fe46..b5d37cc9a313 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -8,6 +8,8 @@
 
 assert stdenv.isLinux;
 
+# FIXME: When updating, please remove makeFlags -- `hwdb_bin` flag is not supported anymore.
+
 stdenv.mkDerivation rec {
   version = "228";
   name = "systemd-${version}";

From 0a7cd3c110a45e1a96cb283767b7c61e6704a27b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Feb 2016 14:48:49 +0100
Subject: [PATCH 0925/2285] Remove unused file

---
 .../linux/kernel/linux.upstream.template            | 13 -------------
 1 file changed, 13 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux.upstream.template

diff --git a/pkgs/os-specific/linux/kernel/linux.upstream.template b/pkgs/os-specific/linux/kernel/linux.upstream.template
deleted file mode 100644
index 624b83d45b33..000000000000
--- a/pkgs/os-specific/linux/kernel/linux.upstream.template
+++ /dev/null
@@ -1,13 +0,0 @@
-url "http://www.kernel.org/pub/linux/kernel/v3.x/${LINUX_VERSION_RC:+testing/}"
-version_link "linux-${LINUX_VERSION}.*tar[.]xz\$"
-version '.*linux-([0-9.]+(-rc[0-9]+)?)[.]tar.*' '\1'
-target "linux-${LINUX_VERSION}.nix"
-name "linux_${LINUX_VERSION/./_}"
-
-do_overwrite() {
-  ensure_hash
-  set_var_value version "$CURRENT_VERSION"
-  set_var_value sha256 "$CURRENT_HASH"
-  [ -n "$LINUX_VERSION_RC" ] && set_var_value testing true '' '' 1
-  [ -z "$LINUX_VERSION_RC" ] && set_var_value testing false '' '' 1
-}

From 72a30ae66ff21a1cda46f6a0abf3d25094c99b9b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Feb 2016 15:36:05 +0100
Subject: [PATCH 0926/2285] linux: Use $SOURCE_DATE_EPOCH as the build
 timestamp

---
 pkgs/os-specific/linux/kernel/generic.nix       | 4 ----
 pkgs/os-specific/linux/kernel/manual-config.nix | 3 ++-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 59d3642e6227..af14434b08f2 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -57,10 +57,6 @@ let
     autoModules = stdenv.platform.kernelAutoModules;
     arch = stdenv.platform.kernelArch;
 
-    preConfigure = ''
-        buildFlagsArray+=("KBUILD_BUILD_TIMESTAMP=Thu Jan 1 00:00:01 UTC 1970")
-    '';
-
     crossAttrs = let
         cp = stdenv.cross.platform;
       in {
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 4a826ff7ae3d..2b1e55a880a0 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -102,7 +102,8 @@ let
         make $makeFlags "''${makeFlagsArray[@]}" oldconfig
         runHook postConfigure
 
-        buildFlagsArray+=("KBUILD_BUILD_TIMESTAMP=Thu Jan 1 00:00:01 UTC 1970")
+        # Note: we can get rid of this once http://permalink.gmane.org/gmane.linux.kbuild.devel/13800 is merged.
+        buildFlagsArray+=("KBUILD_BUILD_TIMESTAMP=$(date -u -d @$SOURCE_DATE_EPOCH)")
       '';
 
       buildFlags = [

From 030838ba25e8a7bcfdcbbcf572a549ae1a3a42c2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Feb 2016 17:39:24 +0100
Subject: [PATCH 0927/2285] makeModulesClosure: Small cleanup

---
 pkgs/build-support/kernel/modules-closure.nix | 4 ++--
 pkgs/build-support/kernel/modules-closure.sh  | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/kernel/modules-closure.nix b/pkgs/build-support/kernel/modules-closure.nix
index cad0c7a21f94..6ae844a62463 100644
--- a/pkgs/build-support/kernel/modules-closure.nix
+++ b/pkgs/build-support/kernel/modules-closure.nix
@@ -9,7 +9,7 @@
 stdenv.mkDerivation {
   name = kernel.name + "-shrunk";
   builder = ./modules-closure.sh;
-  buildInputs = [nukeReferences];
-  inherit kernel rootModules kmod allowMissing;
+  buildInputs = [ nukeReferences kmod ];
+  inherit kernel rootModules allowMissing;
   allowedReferences = ["out"];
 }
diff --git a/pkgs/build-support/kernel/modules-closure.sh b/pkgs/build-support/kernel/modules-closure.sh
index d0ac88f69247..71d507b1e2b1 100644
--- a/pkgs/build-support/kernel/modules-closure.sh
+++ b/pkgs/build-support/kernel/modules-closure.sh
@@ -2,8 +2,6 @@ source $stdenv/setup
 
 set -o pipefail
 
-PATH=$kmod/sbin:$PATH
-
 version=$(cd $kernel/lib/modules && ls -d *)
 
 echo "kernel version is $version"

From 5184aaa1ea93368cb993b1e8e5862adb6e305110 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Feb 2016 17:51:04 +0100
Subject: [PATCH 0928/2285] Use booleans properly

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

diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix
index deb1cbfc1858..8526d09f2353 100644
--- a/nixos/modules/services/networking/connman.nix
+++ b/nixos/modules/services/networking/connman.nix
@@ -53,13 +53,13 @@ in {
   config = mkIf cfg.enable {
 
     assertions = [{
-      assertion = config.networking.useDHCP == false;
+      assertion = !config.networking.useDHCP;
       message = "You can not use services.networking.connman with services.networking.useDHCP";
     }{
-      assertion = config.networking.wireless.enable == true;
+      assertion = config.networking.wireless.enable;
       message = "You must use services.networking.connman with services.networking.wireless";
     }{
-      assertion = config.networking.networkmanager.enable == false;
+      assertion = config.networking.networkmanager.enable;
       message = "You can not use services.networking.connman with services.networking.networkmanager";
     }];
 

From b21ef9c9e6ad9c754cd8dbf8bc58f4271fb80835 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Feb 2016 17:51:10 +0100
Subject: [PATCH 0929/2285] Don't include wireless-tools/iw/rfkill when
 wireless is disabled

This is mostly to get rid of some useless stuff in VMs/containers.
---
 nixos/modules/tasks/network-interfaces.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix
index e72c0f8956ed..503d3813611f 100644
--- a/nixos/modules/tasks/network-interfaces.nix
+++ b/nixos/modules/tasks/network-interfaces.nix
@@ -927,7 +927,7 @@ in
         pkgs.nettools
         pkgs.openresolv
       ]
-      ++ optionals (!config.boot.isContainer) [
+      ++ optionals config.networking.wireless.enable [
         pkgs.wirelesstools # FIXME: obsolete?
         pkgs.iw
         pkgs.rfkill

From 48f51f118506db271567cc19739bc6e66edb6483 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Feb 2016 17:54:35 +0100
Subject: [PATCH 0930/2285] linux: Compress kernel modules

This reduces the kernel package from 185 to 62 MiB, for a neglible
boot time cost.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 6 ++++++
 pkgs/os-specific/linux/kmod/default.nix         | 6 ++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index bd4513ead9ee..fc54715ea7b8 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -21,6 +21,12 @@
 with stdenv.lib;
 
 ''
+  # Compress kernel modules for a sizable disk space savings.
+  ${optionalString (versionAtLeast version "3.18") ''
+    MODULE_COMPRESS y
+    MODULE_COMPRESS_XZ y
+  ''}
+
   # Debugging.
   DEBUG_KERNEL y
   TIMER_STATS y
diff --git a/pkgs/os-specific/linux/kmod/default.nix b/pkgs/os-specific/linux/kmod/default.nix
index 1b12a0076b45..12449a0a7dda 100644
--- a/pkgs/os-specific/linux/kmod/default.nix
+++ b/pkgs/os-specific/linux/kmod/default.nix
@@ -8,11 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "10lzfkmnpq6a43a3gkx7x633njh216w0bjwz31rv8a1jlgg1sfxs";
   };
 
-  # Disable xz/zlib support to prevent needing them in the initrd.
-  
-  buildInputs = [ pkgconfig libxslt /* xz zlib */ ];
+  buildInputs = [ pkgconfig libxslt xz /* zlib */ ];
 
-  configureFlags = [ "--sysconfdir=/etc" /* "--with-xz" "--with-zlib" */ ];
+  configureFlags = [ "--sysconfdir=/etc" "--with-xz" /* "--with-zlib" */ ];
 
   patches = [ ./module-dir.patch ];
 

From 45c218f893d38f94cd62fc256117b9fb1a0d1749 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 1 Feb 2016 18:18:00 +0100
Subject: [PATCH 0931/2285] initrd: Use modprobe from busybox

---
 nixos/modules/system/boot/stage-1.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 694a5cfb6f85..baa5bf6c69fd 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -66,10 +66,6 @@ let
         copy_bin_and_libs $BIN
       done
 
-      # Copy modprobe.
-      copy_bin_and_libs ${pkgs.kmod}/bin/kmod
-      ln -sf kmod $out/bin/modprobe
-
       # Copy resize2fs if needed.
       ${optionalString (any (fs: fs.autoResize) (attrValues config.fileSystems)) ''
         # We need mke2fs in the initrd.

From b34b05b3b8ca274da28184371382d683100a806c Mon Sep 17 00:00:00 2001
From: Simon Vandel Sillesen <simon.vandel@gmail.com>
Date: Mon, 1 Feb 2016 18:44:20 +0100
Subject: [PATCH 0932/2285] Hunspell: add wrapper to include dictionaries

use like this:
(hunspellWithDicts (with hunspellDicts; [en-us en-gb-ise]))
---
 pkgs/development/libraries/hunspell/wrapper.nix | 13 +++++++++++++
 pkgs/top-level/all-packages.nix                 |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/hunspell/wrapper.nix

diff --git a/pkgs/development/libraries/hunspell/wrapper.nix b/pkgs/development/libraries/hunspell/wrapper.nix
new file mode 100644
index 000000000000..88f18e6283de
--- /dev/null
+++ b/pkgs/development/libraries/hunspell/wrapper.nix
@@ -0,0 +1,13 @@
+{ stdenv, lib, hunspell, makeWrapper, dicts ? [] }:
+with lib;
+let
+  searchPath = makeSearchPath "share/hunspell" dicts;
+in
+stdenv.mkDerivation {
+  name = (appendToName "with-dicts" hunspell).name;
+  buildInputs = [ makeWrapper ];
+  buildCommand = ''
+    makeWrapper ${hunspell}/bin/hunspell $out/bin/hunspell --prefix DICPATH : ${searchPath}
+  '';
+  inherit (hunspell) meta;
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 92fd1d49a661..962283f71321 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6856,6 +6856,8 @@ let
 
   hunspellDicts = recurseIntoAttrs (callPackages ../development/libraries/hunspell/dictionaries.nix {});
 
+  hunspellWithDicts = dicts: callPackage ../development/libraries/hunspell/wrapper.nix { inherit dicts; };
+
   hwloc = callPackage ../development/libraries/hwloc {};
 
   hydraAntLogger = callPackage ../development/libraries/java/hydra-ant-logger { };

From 7443f9d00ad2347b4d8f31661225a70be33dce1e Mon Sep 17 00:00:00 2001
From: Al Zohali <zohl@fmap.me>
Date: Fri, 22 Jan 2016 17:52:21 +0300
Subject: [PATCH 0933/2285] mono: add gmcs symlink

---
 pkgs/development/compilers/mono/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/compilers/mono/default.nix b/pkgs/development/compilers/mono/default.nix
index a7a4d8da4edc..4de1bd1e301b 100644
--- a/pkgs/development/compilers/mono/default.nix
+++ b/pkgs/development/compilers/mono/default.nix
@@ -63,6 +63,11 @@ stdenv.mkDerivation rec {
   postInstall = ''
     echo "Updating Mono key store"
     $out/bin/cert-sync ${cacert}/etc/ssl/certs/ca-bundle.crt
+  ''
+  # According to [1], gmcs is just mcs
+  # [1] https://github.com/mono/mono/blob/master/scripts/gmcs.in
+  + ''
+    ln -s $out/bin/mcs $out/bin/gmcs
   '';
 
   meta = {

From ecefd2167af6368a0ad26815080e368da246b213 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 1 Feb 2016 19:33:50 +0100
Subject: [PATCH 0934/2285] nixos/connman: Fix assertion for networkmanager

Regression introduced by 5184aaa1ea93368cb993b1e8e5862adb6e305110.

The fix was intended to remove the "x == true/false" assertions, but by
accident a "x == false" was made "x == true" instead of "(!x)".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: devhell <"^"@regexmail.net>
---
 nixos/modules/services/networking/connman.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/connman.nix b/nixos/modules/services/networking/connman.nix
index 8526d09f2353..3fecfbb13a04 100644
--- a/nixos/modules/services/networking/connman.nix
+++ b/nixos/modules/services/networking/connman.nix
@@ -59,7 +59,7 @@ in {
       assertion = config.networking.wireless.enable;
       message = "You must use services.networking.connman with services.networking.wireless";
     }{
-      assertion = config.networking.networkmanager.enable;
+      assertion = !config.networking.networkmanager.enable;
       message = "You can not use services.networking.connman with services.networking.networkmanager";
     }];
 

From c55c909e567efe9f57bf3dd4dbea7fc804af86f3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 1 Feb 2016 03:29:13 +0100
Subject: [PATCH 0935/2285] liferea: 1.10.17 -> 1.10.18

This is a maintenance release that brings the following changes:
- Fixes #287: media:content support broken
- Fixes #279: Rules not visible in searchdialog
- Fixes #83: Segfault when sorting feeds in folder
- Fixes #302: Broken compilation with --disable-notify
---
 .../networking/newsreaders/liferea/default.nix       |  6 ++++--
 .../liferea-fix-notification-header-location.patch   | 12 ++++++++++++
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch

diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index 952c763c5f4a..442240c2718f 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -6,14 +6,14 @@
 }:
 
 let pname = "liferea";
-    version = "1.10.17";
+    version = "1.10.18";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
-    sha256 = "0svgl50w3hai31n5sm42sl0cd86c32cka0xzfy4r8gi0lyjdjxyx";
+    sha256 = "0wpinar2cxyzq2j7ff7lznc08f0n6qjdm9aavsarbgdpaf2s1xvq";
   };
 
   buildInputs = with gst_all_1; [
@@ -27,6 +27,8 @@ stdenv.mkDerivation rec {
     makeWrapper
   ];
 
+  patches = [ ./liferea-fix-notification-header-location.patch ];
+
   preFixup = ''
     for f in "$out"/bin/*; do
       wrapProgram "$f" \
diff --git a/pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch b/pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch
new file mode 100644
index 000000000000..3cd322460b08
--- /dev/null
+++ b/pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch
@@ -0,0 +1,12 @@
+diff -Naur a/src/notification/libnotify.c b/src/notification/libnotify.c
+--- a/src/notification/libnotify.c	2016-01-28 19:33:19.000000000 +0100
++++ b/src/notification/libnotify.c	2016-02-01 19:20:39.167580131 +0100
+@@ -40,7 +40,7 @@
+ #include "ui/feed_list_view.h"
+ #include "ui/ui_tray.h"
+ 
+-#include "notification/notification.h"
++#include "../notification.h"
+ 
+ static gboolean supports_actions = FALSE;
+ static gboolean supports_append  = FALSE;

From 8ba0fe28666aee8f45545d95294c34c6a872918a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 1 Feb 2016 16:59:35 +0100
Subject: [PATCH 0936/2285] geolite-legacy 2016-01-25 -> 2016-02-01

---
 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 eab577888d11..f0bf2834bed8 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-01-25";
+  version = "2016-02-01";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
     "1fksbnmda2a05cpax41h9r7jhi8102q41kl5nij4ai42d6yqy73x";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "1n7zlmnaxvjljyih9yi9hns530by21h42j2kcszbcyvn7rd9rnyw";
+    "1h47n8fn9dfjw672jbw67mn03bidaahwnkra464ggy1q4pwkvncs";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "1id60almra7mq4v86p37sfph8jrbdnc5pzxvy55wiyrvf6ydvk56";
+    "0nnfp8xzrlcdvy8lvsw2mvfmxavj2gmm7bvr0l2pv07n863b873y";
 
   meta = with stdenv.lib; {
     description = "GeoLite Legacy IP geolocation databases";

From 9782c593edcfd4f7f41689f4ecb2390dbf1bc003 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 1 Feb 2016 20:45:55 +0200
Subject: [PATCH 0937/2285] treewide: Mass replace 'acl}/bin' to refer the
 'bin' output

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

diff --git a/pkgs/applications/misc/udevil/default.nix b/pkgs/applications/misc/udevil/default.nix
index 75c02d3ba6dd..8ce683ec9088 100644
--- a/pkgs/applications/misc/udevil/default.nix
+++ b/pkgs/applications/misc/udevil/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation {
       --with-mount-prog=${utillinux}/bin/mount \
       --with-umount-prog=${utillinux}/bin/umount \
       --with-losetup-prog=${utillinux}/bin/losetup \
-      --with-setfacl-prog=${acl}/bin/setfacl \
+      --with-setfacl-prog=${acl.bin}/bin/setfacl \
       --sysconfdir=$prefix/etc
   '';
   preConfigure = ''

From 5f4a8de7541c5ce6e62a1e53a51d58f543dbdf70 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 1 Feb 2016 20:45:57 +0200
Subject: [PATCH 0938/2285] treewide: Mass replace 'bzip2}/bin' to refer the
 'bin' output

---
 .../version-management/git-and-tools/cgit/default.nix         | 2 +-
 pkgs/os-specific/linux/sysstat/default.nix                    | 2 +-
 pkgs/servers/http/nix-binary-cache/default.nix                | 4 ++--
 pkgs/stdenv/linux/make-bootstrap-tools-cross.nix              | 2 +-
 pkgs/stdenv/linux/make-bootstrap-tools.nix                    | 2 +-
 pkgs/tools/backup/store-backup/default.nix                    | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index 6cde64b30900..ec92470468eb 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \
-        -e 's|"bzip2"|"${bzip2}/bin/bzip2"|' \
+        -e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \
         -e 's|"xz"|"${xz}/bin/xz"|' \
         -i ui-snapshot.c
   '';
diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix
index 6544210b2067..16431c465c16 100644
--- a/pkgs/os-specific/linux/sysstat/default.nix
+++ b/pkgs/os-specific/linux/sysstat/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     export PATH_CP=$(type -tp cp)
     export PATH_CHKCONFIG=/no-such-program
-    export BZIP=${bzip2}/bin/bzip2
+    export BZIP=${bzip2.bin}/bin/bzip2
     export SYSTEMCTL=systemctl
   '';
 
diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix
index b007c09b0560..857d4bb4d490 100644
--- a/pkgs/servers/http/nix-binary-cache/default.nix
+++ b/pkgs/servers/http/nix-binary-cache/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
       --replace @findutils@ "${findutils}/bin" \
       --replace @nix@ "${nix}/bin" \
       --replace @xz@ "${xz}/bin" \
-      --replace @bzip2@ "${bzip2}/bin" \
+      --replace @bzip2@ "${bzip2.bin}/bin" \
       --replace @gnused@ "${gnused}/bin" \
       --replace @gnugrep@ "${gnugrep}/bin" \
       --replace @openssl@ "${openssl}/bin" \
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
       --replace @findutils@ "${findutils}/bin" \
       --replace @nix@ "${nix}/bin" \
       --replace @xz@ "${xz}/bin" \
-      --replace @bzip2@ "${bzip2}/bin" \
+      --replace @bzip2@ "${bzip2.bin}/bin" \
       --replace @gnused@ "${gnused}/bin" \
       --replace @gnugrep@ "${gnugrep}/bin" \
       --replace @openssl@ "${openssl}/bin" \
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
index 6b562eef53c2..dd35e03478ab 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix
@@ -166,7 +166,7 @@ rec {
         cp -d ${gawk}/bin/awk $out/bin
         cp ${gnutar}/bin/tar $out/bin
         cp ${gzip}/bin/gzip $out/bin
-        cp ${bzip2}/bin/bzip2 $out/bin
+        cp ${bzip2.bin}/bin/bzip2 $out/bin
         cp -d ${gnumake}/bin/* $out/bin
         cp -d ${patch}/bin/* $out/bin
         cp ${patchelf}/bin/* $out/bin
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index d33d8f9fb663..5732437970d5 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -79,7 +79,7 @@ rec {
         cp -d ${gawk}/bin/awk $out/bin
         cp ${gnutar}/bin/tar $out/bin
         cp ${gzip}/bin/gzip $out/bin
-        cp ${bzip2}/bin/bzip2 $out/bin
+        cp ${bzip2.bin}/bin/bzip2 $out/bin
         cp -d ${gnumake}/bin/* $out/bin
         cp -d ${patch}/bin/* $out/bin
         cp ${patchelf}/bin/* $out/bin
diff --git a/pkgs/tools/backup/store-backup/default.nix b/pkgs/tools/backup/store-backup/default.nix
index 93a7f9e1e39f..9329cd23e83f 100644
--- a/pkgs/tools/backup/store-backup/default.nix
+++ b/pkgs/tools/backup/store-backup/default.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
     for p in $out/bin/*
       do wrapProgram "$p" \
       --prefix PERL5LIB ":" "${perlPackages.DBFile}/lib/perl5/site_perl" \
-      --prefix PATH ":" "${which}/bin:${bzip2}/bin"
+      --prefix PATH ":" "${which}/bin:${bzip2.bin}/bin"
     done
 
     patchShebangs $out

From a4dff4bf1bb9e66ad553e5b43b244b77060d98ae Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 1 Feb 2016 20:45:59 +0200
Subject: [PATCH 0939/2285] treewide: Mass replace 'dbus_daemon}/bin' to refer
 the 'out' output

---
 pkgs/applications/misc/dunst/default.nix    | 2 +-
 pkgs/development/libraries/glib/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/dunst/default.nix b/pkgs/applications/misc/dunst/default.nix
index c398c3c43d00..651c74b2d217 100644
--- a/pkgs/applications/misc/dunst/default.nix
+++ b/pkgs/applications/misc/dunst/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   postFixup = ''
     wrapProgram "$out/bin/dunst" \
-      --prefix PATH : '${dbus_daemon}/bin'
+      --prefix PATH : '${dbus_daemon.out}/bin'
   '';
 
   meta = {
diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix
index 7feccdef9aaa..894dee3990c5 100644
--- a/pkgs/development/libraries/glib/default.nix
+++ b/pkgs/development/libraries/glib/default.nix
@@ -100,7 +100,7 @@ stdenv.mkDerivation rec {
        export XDG_RUNTIME_HOME="$TMP"
        export HOME="$TMP"
        export XDG_DATA_DIRS="${desktop_file_utils}/share:${shared_mime_info}/share"
-       export G_TEST_DBUS_DAEMON="${dbus_daemon}/bin/dbus-daemon"
+       export G_TEST_DBUS_DAEMON="${dbus_daemon.out}/bin/dbus-daemon"
 
        substituteInPlace gio/tests/desktop-files/home/applications/epiphany-weather-for-toronto-island-9c6a4e022b17686306243dada811d550d25eb1fb.desktop --replace "Exec=/bin/true" "Exec=${coreutils}/bin/true"
        # Needs machine-id, comment the test

From 9700be43813a5ce707fd7e126c64fd8d1cca0205 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 1 Feb 2016 20:46:00 +0200
Subject: [PATCH 0940/2285] treewide: Mass replace 'djvulibre}/bin' to refer
 the 'bin' output

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

diff --git a/pkgs/tools/typesetting/djvu2pdf/default.nix b/pkgs/tools/typesetting/djvu2pdf/default.nix
index 512efe497fa0..a426356a09f5 100644
--- a/pkgs/tools/typesetting/djvu2pdf/default.nix
+++ b/pkgs/tools/typesetting/djvu2pdf/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     cp -p djvu2pdf $out/bin
-    wrapProgram $out/bin/djvu2pdf --prefix PATH : ${ghostscript}/bin:${djvulibre}/bin:${which}/bin
+    wrapProgram $out/bin/djvu2pdf --prefix PATH : ${ghostscript}/bin:${djvulibre.bin}/bin:${which}/bin
 
     mkdir -p $out/man/man1
     cp -p djvu2pdf.1.gz $out/man/man1

From 76cfa449dc81cbc6d178ff4564cbc3211f0945aa Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 1 Feb 2016 20:46:02 +0200
Subject: [PATCH 0941/2285] treewide: Mass replace 'flac}/bin' to refer the
 'bin' output

---
 pkgs/applications/audio/caudec/default.nix | 2 +-
 pkgs/tools/audio/beets/default.nix         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/caudec/default.nix b/pkgs/applications/audio/caudec/default.nix
index 978dd27facdb..d84ff702ce87 100644
--- a/pkgs/applications/audio/caudec/default.nix
+++ b/pkgs/applications/audio/caudec/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   postFixup = ''
     for executable in $(cd $out/bin && ls); do
 	wrapProgram $out/bin/$executable \
-	  --prefix PATH : "${bc}/bin:${findutils}/bin:${sox}/bin:${procps}/bin:${opusTools}/bin:${lame}/bin:${flac}/bin"
+	  --prefix PATH : "${bc}/bin:${findutils}/bin:${sox}/bin:${procps}/bin:${opusTools}/bin:${lame}/bin:${flac.bin}/bin"
     done
   '';
 
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 35a69262acde..3cdd4b4f0a2e 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -121,7 +121,7 @@ in buildPythonPackage rec {
     }' beets/ui/commands.py
   '' + optionalString enableBadfiles ''
     sed -i -e '/self\.run_command(\[/ {
-      s,"flac","${flac}/bin/flac",
+      s,"flac","${flac.bin}/bin/flac",
       s,"mp3val","${mp3val}/bin/mp3val",
     }' beetsplug/badfiles.py
   '' + optionalString enableReplaygain ''

From 0eb84e882bde4c539dc7c0e3f192cc5742f6a570 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 1 Feb 2016 20:46:10 +0200
Subject: [PATCH 0942/2285] treewide: Mass replace 'libjpeg}/bin' to refer the
 'bin' output

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

diff --git a/pkgs/tools/graphics/jhead/default.nix b/pkgs/tools/graphics/jhead/default.nix
index dfbd7c4e5e06..2fb1c9325c03 100644
--- a/pkgs/tools/graphics/jhead/default.nix
+++ b/pkgs/tools/graphics/jhead/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
     substituteInPlace jhead.c \
       --replace "\"   Compiled: \"__DATE__" "" \
-      --replace "jpegtran -trim" "${libjpeg}/bin/jpegtran -trim"
+      --replace "jpegtran -trim" "${libjpeg.bin}/bin/jpegtran -trim"
   '';
 
   installPhase = ''

From 3cc7fa0be91ba9ac4dd9b96c551de79220b27704 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 1 Feb 2016 20:46:15 +0200
Subject: [PATCH 0943/2285] treewide: Mass replace 'lzma}/bin' to refer the
 'bin' output

---
 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 2311b0d2fec8..fffdc85d2bce 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -574,7 +574,7 @@ rec {
       buildCommand = ''
         ${createRootFS}
 
-        PATH=$PATH:${dpkg}/bin:${dpkg}/bin:${glibc.bin}/bin:${lzma}/bin
+        PATH=$PATH:${dpkg}/bin:${dpkg}/bin:${glibc.bin}/bin:${lzma.bin}/bin
 
         # Unpack the .debs.  We do this to prevent pre-install scripts
         # (which have lots of circular dependencies) from barfing.

From 13b3f3f246fdb8dfc854c5283aa1dc88d1e774d1 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 1 Feb 2016 20:46:16 +0200
Subject: [PATCH 0944/2285] treewide: Mass replace 'openssl}/bin' to refer the
 'bin' output

---
 nixos/modules/services/web-servers/apache-httpd/owncloud.nix  | 2 +-
 nixos/modules/system/boot/luksroot.nix                        | 2 +-
 pkgs/applications/networking/mailreaders/mailpile/default.nix | 2 +-
 pkgs/applications/virtualization/openstack/keystone.nix       | 2 +-
 pkgs/development/libraries/opendkim/default.nix               | 2 +-
 pkgs/development/tools/sslmate/default.nix                    | 2 +-
 pkgs/servers/http/nix-binary-cache/default.nix                | 4 ++--
 pkgs/servers/shellinabox/default.nix                          | 2 +-
 pkgs/tools/networking/easyrsa/default.nix                     | 2 +-
 pkgs/tools/virtualization/ec2-ami-tools/default.nix           | 2 +-
 pkgs/top-level/python-packages.nix                            | 2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
index 9994de0f9b40..5633f30e4a85 100644
--- a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
@@ -333,7 +333,7 @@ let
 
       'version' => '${config.package.version}',
 
-      'openssl' => '${pkgs.openssl}/bin/openssl'
+      'openssl' => '${pkgs.openssl.bin}/bin/openssl'
 
       );
 
diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix
index 6ea11e60b263..77a82547031a 100644
--- a/nixos/modules/system/boot/luksroot.nix
+++ b/nixos/modules/system/boot/luksroot.nix
@@ -436,7 +436,7 @@ in
       ${optionalString luks.yubikeySupport ''
         copy_bin_and_libs ${pkgs.ykpers}/bin/ykchalresp
         copy_bin_and_libs ${pkgs.ykpers}/bin/ykinfo
-        copy_bin_and_libs ${pkgs.openssl}/bin/openssl
+        copy_bin_and_libs ${pkgs.openssl.bin}/bin/openssl
 
         cc -O3 -I${pkgs.openssl}/include -L${pkgs.openssl.out}/lib ${./pbkdf2-sha512.c} -o pbkdf2-sha512 -lcrypto
         strip -s pbkdf2-sha512
diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
index c43944dc5979..b3ca52999efb 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -21,7 +21,7 @@ pythonPackages.buildPythonPackage rec {
 
   postInstall = ''
     wrapProgram $out/bin/mailpile \
-      --prefix PATH ":" "${gnupg1orig}/bin:${openssl}/bin"
+      --prefix PATH ":" "${gnupg1orig}/bin:${openssl.bin}/bin"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/virtualization/openstack/keystone.nix b/pkgs/applications/virtualization/openstack/keystone.nix
index 3060dcb04cb3..ff60dc364051 100644
--- a/pkgs/applications/virtualization/openstack/keystone.nix
+++ b/pkgs/applications/virtualization/openstack/keystone.nix
@@ -33,7 +33,7 @@ pythonPackages.buildPythonPackage rec {
     ldap ldappool webtest requests2 oslotest pep8 pymongo which
   ];
 
-  makeWrapperArgs = ["--prefix PATH : '${openssl}/bin:$PATH'"];
+  makeWrapperArgs = ["--prefix PATH : '${openssl.bin}/bin:$PATH'"];
 
   postInstall = ''
     # install .ini files
diff --git a/pkgs/development/libraries/opendkim/default.nix b/pkgs/development/libraries/opendkim/default.nix
index e89cd880df13..7f4b5ba2e328 100644
--- a/pkgs/development/libraries/opendkim/default.nix
+++ b/pkgs/development/libraries/opendkim/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     wrapProgram $out/sbin/opendkim-genkey \
-      --prefix PATH : ${openssl}/bin
+      --prefix PATH : ${openssl.bin}/bin
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/development/tools/sslmate/default.nix b/pkgs/development/tools/sslmate/default.nix
index 72af18984514..8def4b6a6657 100644
--- a/pkgs/development/tools/sslmate/default.nix
+++ b/pkgs/development/tools/sslmate/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
         JSONPP
         TermReadKey
       ]}" \
-      --prefix PATH : "${openssl}/bin"
+      --prefix PATH : "${openssl.bin}/bin"
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix
index 857d4bb4d490..be7cadac44da 100644
--- a/pkgs/servers/http/nix-binary-cache/default.nix
+++ b/pkgs/servers/http/nix-binary-cache/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
       --replace @bzip2@ "${bzip2.bin}/bin" \
       --replace @gnused@ "${gnused}/bin" \
       --replace @gnugrep@ "${gnugrep}/bin" \
-      --replace @openssl@ "${openssl}/bin" \
+      --replace @openssl@ "${openssl.bin}/bin" \
       --replace @lighttpd@ "${lighttpd}/sbin" \
       --replace @iproute@ "${iproute}/sbin" \
       --replace "xXxXx" "xXxXx"
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
       --replace @bzip2@ "${bzip2.bin}/bin" \
       --replace @gnused@ "${gnused}/bin" \
       --replace @gnugrep@ "${gnugrep}/bin" \
-      --replace @openssl@ "${openssl}/bin" \
+      --replace @openssl@ "${openssl.bin}/bin" \
       --replace @lighttpd@ "${lighttpd}/sbin" \
       --replace @iproute@ "${iproute}/sbin" \
       --replace "xXxXx" "xXxXx"
diff --git a/pkgs/servers/shellinabox/default.nix b/pkgs/servers/shellinabox/default.nix
index 6df4905af2cd..c9f4e2d253f9 100644
--- a/pkgs/servers/shellinabox/default.nix
+++ b/pkgs/servers/shellinabox/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     substituteInPlace ./shellinabox/launcher.c --replace "/usr/games" "${openssh}/bin"
     substituteInPlace ./shellinabox/service.c --replace "/bin/login" "${shadow}/bin/login"
     substituteInPlace ./shellinabox/launcher.c --replace "/bin/login" "${shadow}/bin/login"
-    substituteInPlace ./libhttp/ssl.c --replace "/usr/bin" "${openssl}/bin"
+    substituteInPlace ./libhttp/ssl.c --replace "/usr/bin" "${openssl.bin}/bin"
   '';
 
   postInstall = ''
diff --git a/pkgs/tools/networking/easyrsa/default.nix b/pkgs/tools/networking/easyrsa/default.nix
index 2b41f8ca1d3c..59d97a4a18b6 100644
--- a/pkgs/tools/networking/easyrsa/default.nix
+++ b/pkgs/tools/networking/easyrsa/default.nix
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
     install -D -m755 easyrsa3/easyrsa $out/bin/easyrsa
     substituteInPlace $out/bin/easyrsa \
       --subst-var out \
-      --subst-var-by openssl ${openssl}/bin/openssl
+      --subst-var-by openssl ${openssl.bin}/bin/openssl
 
     # Helper utility
     cat > $out/bin/easyrsa-init <<EOF
diff --git a/pkgs/tools/virtualization/ec2-ami-tools/default.nix b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
index dee14db46bcf..6ccce4684ad5 100644
--- a/pkgs/tools/virtualization/ec2-ami-tools/default.nix
+++ b/pkgs/tools/virtualization/ec2-ami-tools/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
       for i in $out/bin/*; do
           wrapProgram $i \
             --set EC2_HOME $out \
-            --prefix PATH : ${ruby}/bin:${openssl}/bin
+            --prefix PATH : ${ruby}/bin:${openssl.bin}/bin
       done
 
       sed -i 's|/bin/bash|${stdenv.shell}|' $out/lib/ec2/platform/base/pipeline.rb
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 581e2834d8fd..7e97a4bd3598 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -279,7 +279,7 @@ in modules // {
     doCheck = false;
 
     patchPhase = ''
-      substituteInPlace acme_tiny.py --replace "openssl" "${pkgs.openssl}/bin/openssl"
+      substituteInPlace acme_tiny.py --replace "openssl" "${pkgs.openssl.bin}/bin/openssl"
     '';
 
     installPhase = ''

From 7b0c4d452a3517b0f715d2847a42f7420bbf434e Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 1 Feb 2016 20:46:18 +0200
Subject: [PATCH 0945/2285] treewide: Mass replace 'poppler_utils}/bin' to
 refer the 'out' output

---
 pkgs/applications/misc/calibre/default.nix  | 2 +-
 pkgs/applications/search/recoll/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index f464c3ccd027..916173fa73bc 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
 
     for a in $out/bin/*; do
       wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH \
-                     --prefix PATH : ${poppler_utils}/bin
+                     --prefix PATH : ${poppler_utils.out}/bin
     done
   '';
 
diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 631555234cee..a9599614c3e3 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       substituteInPlace  $f --replace gunzip        ${gzip}/bin/gunzip
       substituteInPlace  $f --replace iconv         ${libiconv.bin}/bin/iconv
       substituteInPlace  $f --replace lyx           ${lyx}/bin/lyx
-      substituteInPlace  $f --replace pdftotext     ${poppler_utils}/bin/pdftotext
+      substituteInPlace  $f --replace pdftotext     ${poppler_utils.out}/bin/pdftotext
       substituteInPlace  $f --replace pstotext      ${ghostscript}/bin/ps2ascii 
       substituteInPlace  $f --replace sed           ${gnused}/bin/sed
       substituteInPlace  $f --replace tar           ${gnutar}/bin/tar

From 33e7a2549afd53851c3ca1bd89395c90442a2530 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 1 Feb 2016 20:46:23 +0200
Subject: [PATCH 0946/2285] treewide: Mass replace 'xfsprogs}/bin' to refer the
 'bin' output

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

diff --git a/nixos/modules/programs/xfs_quota.nix b/nixos/modules/programs/xfs_quota.nix
index 90b6304fa999..648fd9a8a94f 100644
--- a/nixos/modules/programs/xfs_quota.nix
+++ b/nixos/modules/programs/xfs_quota.nix
@@ -89,8 +89,8 @@ in
       nameValuePair "xfs_quota-${name}" {
         description = "Setup xfs_quota for project ${name}";
         script = ''
-          ${pkgs.xfsprogs}/bin/xfs_quota -x -c 'project -s ${name}' ${opts.fileSystem}
-          ${pkgs.xfsprogs}/bin/xfs_quota -x -c 'limit -p ${limitOptions opts} ${name}' ${opts.fileSystem}
+          ${pkgs.xfsprogs.bin}/bin/xfs_quota -x -c 'project -s ${name}' ${opts.fileSystem}
+          ${pkgs.xfsprogs.bin}/bin/xfs_quota -x -c 'limit -p ${limitOptions opts} ${name}' ${opts.fileSystem}
         '';
 
         wantedBy = [ "multi-user.target" ];

From 5dfcafb20552f89a569e605e1007b3000b8ac3b3 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 1 Feb 2016 20:46:27 +0200
Subject: [PATCH 0947/2285] treewide: Mass replace 'xwayland}/bin' to refer the
 'out' output

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

diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix
index 0720368222dc..f154d3c28c7e 100644
--- a/pkgs/applications/window-managers/weston/default.nix
+++ b/pkgs/applications/window-managers/weston/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     ++ stdenv.lib.optional (vaapi != null) "--enabe-vaapi-recorder"
     ++ stdenv.lib.optionals (xwayland != null) [
         "--enable-xwayland"
-        "--with-xserver-path=${xwayland}/bin/Xwayland"
+        "--with-xserver-path=${xwayland.out}/bin/Xwayland"
       ];
 
   meta = with stdenv.lib; {

From e97e6902440b17cc1c9b05d41fd38f7c0b291139 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Mon, 1 Feb 2016 20:46:28 +0200
Subject: [PATCH 0948/2285] treewide: Mass replace 'xz}/bin' to refer the 'bin'
 output

---
 .../version-management/git-and-tools/cgit/default.nix         | 2 +-
 pkgs/applications/virtualization/docker/default.nix           | 2 +-
 pkgs/servers/http/nix-binary-cache/default.nix                | 4 ++--
 pkgs/tools/compression/pxz/default.nix                        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index ec92470468eb..3c8712cc2f91 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   postPatch = ''
     sed -e 's|"gzip"|"${gzip}/bin/gzip"|' \
         -e 's|"bzip2"|"${bzip2.bin}/bin/bzip2"|' \
-        -e 's|"xz"|"${xz}/bin/xz"|' \
+        -e 's|"xz"|"${xz.bin}/bin/xz"|' \
         -i ui-snapshot.c
   '';
 
diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 2af39cd33deb..54c9ed7b1ab2 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
     install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/libexec/docker/docker
     install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit
     makeWrapper $out/libexec/docker/docker $out/bin/docker \
-      --prefix PATH : "${iproute}/sbin:sbin:${iptables}/sbin:${e2fsprogs}/sbin:${xz}/bin:${utillinux}/bin:${optionalString enableLxc "${lxc}/bin"}"
+      --prefix PATH : "${iproute}/sbin:sbin:${iptables}/sbin:${e2fsprogs}/sbin:${xz.bin}/bin:${utillinux}/bin:${optionalString enableLxc "${lxc}/bin"}"
 
     # systemd
     install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service
diff --git a/pkgs/servers/http/nix-binary-cache/default.nix b/pkgs/servers/http/nix-binary-cache/default.nix
index be7cadac44da..674557d74fc2 100644
--- a/pkgs/servers/http/nix-binary-cache/default.nix
+++ b/pkgs/servers/http/nix-binary-cache/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
       --replace @coreutils@ "${coreutils}/bin" \
       --replace @findutils@ "${findutils}/bin" \
       --replace @nix@ "${nix}/bin" \
-      --replace @xz@ "${xz}/bin" \
+      --replace @xz@ "${xz.bin}/bin" \
       --replace @bzip2@ "${bzip2.bin}/bin" \
       --replace @gnused@ "${gnused}/bin" \
       --replace @gnugrep@ "${gnugrep}/bin" \
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
       --replace @coreutils@ "${coreutils}/bin" \
       --replace @findutils@ "${findutils}/bin" \
       --replace @nix@ "${nix}/bin" \
-      --replace @xz@ "${xz}/bin" \
+      --replace @xz@ "${xz.bin}/bin" \
       --replace @bzip2@ "${bzip2.bin}/bin" \
       --replace @gnused@ "${gnused}/bin" \
       --replace @gnugrep@ "${gnugrep}/bin" \
diff --git a/pkgs/tools/compression/pxz/default.nix b/pkgs/tools/compression/pxz/default.nix
index 07c3e205a982..f6424b5e8803 100644
--- a/pkgs/tools/compression/pxz/default.nix
+++ b/pkgs/tools/compression/pxz/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
     gcc -o pxz pxz.c -llzma \
         -fopenmp -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -O2 \
         -DPXZ_BUILD_DATE=\"nixpkgs\" \
-        -DXZ_BINARY=\"${xz}/bin/xz\" \
+        -DXZ_BINARY=\"${xz.bin}/bin/xz\" \
         -DPXZ_VERSION=\"${version}\"
   '';
 

From 9fbba0ac2bdbd24817382e8163dfc36e59a68932 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 1 Feb 2016 19:54:07 +0100
Subject: [PATCH 0949/2285] perl-Text-CSV-Encoded: 0.24 -> 0.25

---
 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 2c187e965d8b..b58a6b834e05 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12179,10 +12179,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   TextCSVEncoded = buildPerlPackage rec {
-    name = "Text-CSV-Encoded-0.24";
+    name = "Text-CSV-Encoded-0.25";
     src = fetchurl {
       url = "mirror://cpan/authors/id/Z/ZA/ZARQUON/${name}.tar.gz";
-      sha256 = "ce8f307dabdcb623cfc385c175152b0f465096d449b9c828efbe6611efcab0d5";
+      sha256 = "1l5rwlmnpnhjszb200a94lwvkwslsvyxm24ycf37gm8dla1mk2i4";
     };
     propagatedBuildInputs = [ TextCSV ];
     meta = {

From f62b04954f5c1a9fb976f86d5003127bd32ddfd3 Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Mon, 1 Feb 2016 10:56:12 -0800
Subject: [PATCH 0950/2285] fetchgitlocal: be less chatty

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

diff --git a/pkgs/build-support/fetchgitlocal/default.nix b/pkgs/build-support/fetchgitlocal/default.nix
index 60803ddcb1f8..7a25966e9fb5 100644
--- a/pkgs/build-support/fetchgitlocal/default.nix
+++ b/pkgs/build-support/fetchgitlocal/default.nix
@@ -34,7 +34,7 @@ let
 
       # dump tar of *current directory* at given revision
       git -C ${srcStr} archive --format=tar ${gitHash} \
-        | tar xvf - -C $out
+        | tar xf - -C $out
     '';
 
 in nixPath

From d43c0804571d7d7bb837e6a9a4f915a5629c76de Mon Sep 17 00:00:00 2001
From: Eric Seidel <gridaphobe@gmail.com>
Date: Mon, 1 Feb 2016 10:56:44 -0800
Subject: [PATCH 0951/2285] emacs-packages: remove hardcoded flycheck and pin
 hindent to cabal version

---
 pkgs/top-level/all-packages.nix   |  2 +-
 pkgs/top-level/emacs-packages.nix | 61 +++++++------------------------
 2 files changed, 14 insertions(+), 49 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 208f610b85a0..04868df3bcb5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11811,7 +11811,7 @@ let
     };
 
     external = {
-      inherit (haskellPackages) ghc-mod structured-haskell-mode Agda;
+      inherit (haskellPackages) ghc-mod structured-haskell-mode Agda hindent;
       inherit (pythonPackages) elpy;
       inherit rtags libffi autoconf automake libpng zlib poppler pkgconfig;
     };
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index 896e324c51bf..ea4a2d4a4291 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -711,54 +711,6 @@ let
     };
   };
 
-  flycheck = melpaBuild rec {
-    pname   = "flycheck";
-    version = "0.25.1";
-    src = fetchFromGitHub {
-      owner  = pname;
-      repo   = pname;
-      rev    = version;
-      sha256 = "19mnx2zm71qrf7qf3mk5kriv5vgq0nl67lj029n63wqd8jcjb5fi";
-    };
-    packageRequires = [ dash let-alist pkg-info seq ];
-    meta = {
-      description = "On-the-fly syntax checking, intended as replacement for the older Flymake which is part of Emacs";
-      license = gpl3Plus;
-    };
-  };
-
-  flycheck-haskell = melpaBuild rec {
-    pname   = "flycheck-haskell";
-    version = "0.7.2";
-    src = fetchFromGitHub {
-      owner  = "flycheck";
-      repo   = pname;
-      rev    = version;
-      sha256 = "0143lcn6g46g7skm4r6lqq09s8mr3268rikbzlh65qg80rpg9frj";
-    };
-    packageRequires = [ dash flycheck haskell-mode let-alist pkg-info ];
-    meta = {
-      description = "Improved Haskell support for Flycheck";
-      license = gpl3Plus;
-    };
-  };
-
-  flycheck-pos-tip = melpaBuild rec {
-    pname   = "flycheck-pos-tip";
-    version = "20140813";
-    src = fetchFromGitHub {
-      owner  = "flycheck";
-      repo   = pname;
-      rev    = "5b3a203bbdb03e4f48d1654efecd71f44376e199";
-      sha256 = "0b4x24aq0jh4j4bjv0fqyaz6hzh3gqf57k9763jj9rl32cc3dpnp";
-    };
-    packageRequires = [ flycheck popup ];
-    meta = {
-      description = "Flycheck errors display in tooltip";
-      license = gpl3Plus;
-    };
-  };
-
   ghc-mod = melpaBuild rec {
     pname = "ghc";
     version = external.ghc-mod.version;
@@ -772,6 +724,19 @@ let
     };
   };
 
+  hindent = melpaBuild rec {
+    pname = "hindent";
+    version = external.hindent.version;
+    src = external.hindent.src;
+    packageRequires = [ haskell-mode ];
+    propagatedUserEnvPkgs = [ external.hindent ];
+    fileSpecs = [ "elisp/*.el" ];
+    meta = {
+      description = "Indent haskell code using the \"hindent\" program";
+      license = bsd3;
+    };
+  };
+
   rtags = melpaBuild rec {
     pname = "rtags";
     version = "2.0"; # really, it's some arbitrary git hash

From dc649ab69854323bec43e78c0472be4779795edb Mon Sep 17 00:00:00 2001
From: Maciek Starzyk <mstarzyk@gmail.com>
Date: Mon, 1 Feb 2016 21:28:57 +0100
Subject: [PATCH 0952/2285] obnam: 1.19 -> 1.19.1

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

diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix
index 1854071d6cc2..c287efe8e112 100644
--- a/pkgs/tools/backup/obnam/default.nix
+++ b/pkgs/tools/backup/obnam/default.nix
@@ -2,13 +2,13 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "obnam-${version}";
-  version = "1.19";
+  version = "1.19.1";
 
   namePrefix = "";
 
   src = fetchurl rec {
     url = "http://code.liw.fi/debian/pool/main/o/obnam/obnam_${version}.orig.tar.xz";
-    sha256 = "1591f3mqhgda486wkpb8q4mq685sy6yn3ypbpzx77wii51licxar";
+    sha256 = "096abbvz2c9vm8r7zm82yqrd7zj04pb1xzlv6z0dspkngd0cfdqc";
   };
 
   buildInputs = [ pythonPackages.sphinx attr ];

From 2c2b9fea667f397189c41d6cf9bdd8f54f43e5fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Fri, 29 Jan 2016 16:53:41 +0100
Subject: [PATCH 0953/2285] remove texDisser, it's now part of texlive-new

---
 pkgs/tools/typesetting/tex/disser/default.nix | 55 -------------------
 1 file changed, 55 deletions(-)
 delete mode 100644 pkgs/tools/typesetting/tex/disser/default.nix

diff --git a/pkgs/tools/typesetting/tex/disser/default.nix b/pkgs/tools/typesetting/tex/disser/default.nix
deleted file mode 100644
index cbbc3844fefb..000000000000
--- a/pkgs/tools/typesetting/tex/disser/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-x@{builderDefsPackage
-  , unzip, texLive, texLiveCMSuper, texLiveAggregationFun
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    ["texLive" "texLiveCMSuper" "texLiveAggregationFun"];
-
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames))
-    ++ [(a.texLiveAggregationFun {paths=[a.texLive a.texLiveCMSuper];})];
-  sourceInfo = rec {
-    baseName="disser";
-    version="1.3.0";
-    name="${baseName}-${version}";
-    project="${baseName}";
-    url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.zip";
-    hash="1iab3va6xw53l8xzmd83kbnzqah9f6imzzfd3c2054q53p0ndlim";
-  };
-in
-rec {
-  src = a.fetchurl {
-    url = sourceInfo.url;
-    sha256 = sourceInfo.hash;
-  };
-
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["setVars" "doMakeInstall"];
-
-  setVars = a.noDepEntry ''
-    export HOME="$TMPDIR"
-  '';
-
-  makeFlags = ["DESTDIR=$out/share/texmf-dist"];
-
-  meta = {
-    description = "Russian PhD thesis LaTeX package";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux; # platform-independent
-    license = a.lib.licenses.free; # LaTeX Project Public License
-  };
-  passthru = {
-    updateInfo = {
-      downloadPage = "http://sourceforge.net/projects/disser/files/disser/";
-    };
-  };
-}) x

From 58046b7f03194140e5dee11338416d3f9c25bcd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 1 Feb 2016 22:32:00 +0100
Subject: [PATCH 0954/2285] fix eval

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d8acd2a44c3b..1ef50ea3b62d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15714,8 +15714,6 @@ let
   texLiveAggregationFun = params:
     builderDefsPackage (callPackage ../tools/typesetting/tex/texlive/aggregate.nix) params;
 
-  texDisser = callPackage ../tools/typesetting/tex/disser {};
-
   texLiveContext = builderDefsPackage (callPackage ../tools/typesetting/tex/texlive/context.nix) {};
 
   texLiveExtra = builderDefsPackage (callPackage ../tools/typesetting/tex/texlive/extra.nix) {};

From 1cf106dd06d9be7df330013d5d4835317e61630a Mon Sep 17 00:00:00 2001
From: Badi' Abdul-Wahid <abdulwahidc@gmail.com>
Date: Sat, 16 Jan 2016 00:16:56 -0500
Subject: [PATCH 0955/2285] popfile: init at 1.1.3

Popfile by default assumes that it is run directly from the install
directory, in which it has full write access. This assumption is invalid
on Nix, and so Popfile is pachted to accomodate this:

- define `POPFILE_ROOT` in wrapper

  Default POPFile configuration assumes it is running in the
  installation directory. This patch wraps `popfile.pl` so that
  `POPFILE_ROOT` points to the installation directory

- define and create if missing `POPFILE_USER` in wrapper

  POPFile stores stores state in the `POPFILE_USER` directory, which by
  default is the installation directory. This change sets `POPFILE_USER`
  to `$HOME/.popfile` by default, creating it with 0700 mode if
  necessary.
---
 pkgs/tools/text/popfile/default.nix | 71 +++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix     |  2 +
 2 files changed, 73 insertions(+)
 create mode 100644 pkgs/tools/text/popfile/default.nix

diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix
new file mode 100644
index 000000000000..3310c1a2fe4a
--- /dev/null
+++ b/pkgs/tools/text/popfile/default.nix
@@ -0,0 +1,71 @@
+{ stdenv, fetchzip, makeWrapper, perlPackages,
+... }:
+
+stdenv.mkDerivation rec {
+  appname = "popfile";
+  version = "1.1.3";
+  name = "${appname}-${version}";
+
+  src = fetchzip {
+    url = "http://getpopfile.org/downloads/${appname}-${version}.zip";
+    sha256 = "0gcib9j7zxk8r2vb5dbdz836djnyfza36vi8215nxcdfx1xc7l63";
+    stripRoot = false;
+  };
+
+  buildInputs = [ makeWrapper ] ++ (with perlPackages; [
+    ## These are all taken from the popfile documentation as applicable to Linux
+    ## http://getpopfile.org/docs/howtos:allplatformsrequireperl
+    perl
+    DBI
+    DBDSQLite
+    Digest
+    DigestMD5
+    HTMLTagset
+    MIMEBase64 # == MIMEQuotedPrint
+    TimeDate # == DateParse
+    HTMLTemplate
+    # IO::Socket::Socks is not in nixpkgs
+    # IOSocketSocks 
+    IOSocketSSL
+    NetSSLeay
+    SOAPLite
+  ]);
+
+
+  phases = [ "unpackPhase" "installPhase" "patchPhase" "postInstall" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    # I user `cd` rather than `cp $out/* ...` b/c the * breaks syntax
+    # highlighting in emacs for me.
+    cd $src
+    cp -r * $out/bin
+    cd $out/bin
+    chmod +x *.pl
+  '';
+
+  patchPhase = "patchShebangs $out";
+
+  postInstall = ''
+    find $out -name '*.pl' -executable | while read path; do
+      wrapProgram "$path" \
+        --prefix PERL5LIB : $PERL5LIB:$out/bin \
+        --set POPFILE_ROOT $out/bin \
+        --set POPFILE_USER \$\{POPFILE_USER:-\$HOME/.popfile\} \
+        --run "test -d \$POPFILE_USER || mkdir -m 0700 -p \$POPFILE_USER"
+    done
+  '';
+
+  meta = {
+    description = "An email classification system that automatically sorts messages and fights spam.";
+    homepage = http://getpopfile.org;
+    license = stdenv.lib.licenses.gpl2;
+
+    # Should work on OS X, but havent tested it.
+    # Windows support is more complicated.
+    # http://getpopfile.org/docs/faq:systemrequirements
+    platforms = stdenv.lib.platforms.linux;
+  };
+
+}
+  
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f9d214bf1b7..a2b6add86257 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2824,6 +2824,8 @@ let
 
   ponysay = callPackage ../tools/misc/ponysay { };
 
+  popfile = callPackage ../tools/text/popfile { };
+
   povray = callPackage ../tools/graphics/povray {
     automake = automake113x; # fails with 14
   };

From f10bead8fd068f2cb82cbdc1a938a67bd967974c Mon Sep 17 00:00:00 2001
From: cransom user <cransom@deployer1.dev.lkt.is>
Date: Tue, 2 Feb 2016 01:40:41 +0000
Subject: [PATCH 0956/2285] Do not relocate /nix and /tmp to small disks on AWS

The default behavior with an m3.medium instance is to relocate
/nix and /tmp to /disk0 because an assumption is made that any
ephemeral disk is larger than the root volume.  Rather than make
that assumption, add a check to see if the disk is larger, and
only then relocate /nix and /tmp.

This addresses https://github.com/NixOS/nixpkgs/issues/12613
---
 nixos/modules/virtualisation/amazon-image.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 7ccc9df740e5..7cb37bbc4a76 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -68,7 +68,11 @@ let cfg = config.ec2; in
                 diskNr=$((diskNr + 1))
                 echo "mounting $device on $mp..."
                 if mountFS "$device" "$mp" "" ext3; then
-                    if [ -z "$diskForUnionfs" ]; then diskForUnionfs="$mp"; fi
+                    if [ -z "$diskForUnionfs" -a \
+                         $(lsblk -bno size $device) -gt $(lsblk -bno size /dev/xvda1)
+                       ]; then
+                       diskForUnionfs="$mp";
+                    fi
                 fi
             else
                 echo "skipping unknown device type $device"

From 9468f2c92518002346f5af8c735458688fad3b4e Mon Sep 17 00:00:00 2001
From: Adam Russell <adamlr6+pub@gmail.com>
Date: Sun, 31 Jan 2016 13:13:58 -0600
Subject: [PATCH 0957/2285] wine unstable: 1.9.1 -> 1.9.2 (close #12730)

---
 pkgs/misc/emulators/wine/versions.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix
index 56a20a971ef9..d2c4cc6e43e6 100644
--- a/pkgs/misc/emulators/wine/versions.nix
+++ b/pkgs/misc/emulators/wine/versions.nix
@@ -12,8 +12,8 @@ rec {
     monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c";
   };
   unstable = {
-    wineVersion = "1.9.1";
-    wineSha256 = "1dhbp2jy9s3rqsbgc43jz967n2rls8dwdfi96qdxybg8kbxnachb";
+    wineVersion = "1.9.2";
+    wineSha256 = "0yjf0i2yc0yj366kg6b2ci9bwz3jq5k5vl01bqw4lbpgf5m4sk9k";
     inherit (stable)
       geckoVersion geckoSha256
       gecko64Version gecko64Sha256
@@ -21,7 +21,7 @@ rec {
   };
   staging = {
     version = unstable.wineVersion;
-    sha256 = "05072wgxy8n6i71bb6649sm0ggh5c4g97clryrr8vkmgsklfkadi";
+    sha256 = "05lxhl9rv936xh8v640l36xswszwc41iwpbjq7n5cwk361mdh1lp";
   };
   winetricks = {
     version = "20160109";

From 1072e2bf4df3b34fc50d75c0a1d76bd1fecb180b Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Tue, 2 Feb 2016 02:47:02 +0100
Subject: [PATCH 0958/2285] fish: don't use manpath(1) from PATH in
 functions/man.fish

Close #12762.
---
 pkgs/shells/fish/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 1419b180d728..11eeb18661c0 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
   '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
     sed -i "s|(hostname\||(${nettools}/bin/hostname\||" "$out/share/fish/functions/fish_prompt.fish"
     sed -i "s|Popen(\['manpath'|Popen(\['${man_db}/bin/manpath'|" "$out/share/fish/tools/create_manpage_completions.py"
+    sed -i "s|command manpath|command ${man_db}/bin/manpath|" "$out/share/fish/functions/man.fish"
   '' + ''
     sed -i "s|/sbin /usr/sbin||" \
            "$out/share/fish/functions/__fish_complete_subcommand_root.fish"

From d6a30fccbfc5f236f5dcb29fe91632bad2dc8be9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 2 Feb 2016 04:59:22 +0100
Subject: [PATCH 0959/2285] xorg xf86-input-evdev: bugfix update 2.10.0 ->
 2.10.1

---
 pkgs/servers/x11/xorg/default.nix       | 6 +++---
 pkgs/servers/x11/xorg/tarballs-7.7.list | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index b9ea5d7c5828..bb9e73d31cd3 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1568,11 +1568,11 @@ let
   }) // {inherit ;};
 
   xf86inputevdev = (mkDerivation "xf86inputevdev" {
-    name = "xf86-input-evdev-2.10.0";
+    name = "xf86-input-evdev-2.10.1";
     builder = ./builder.sh;
     src = fetchurl {
-      url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.0.tar.bz2;
-      sha256 = "05yihr84rf209yyjvin8ab55h504b30c7dck8kgrwykvn272k5yh";
+      url = mirror://xorg/individual/driver/xf86-input-evdev-2.10.1.tar.bz2;
+      sha256 = "05z05n39v8s2b0hwhcjb1bca7j8gc62bv9jxnibawwmjym3jp75g";
     };
     buildInputs = [pkgconfig inputproto udev xorgserver xproto ];
     meta.platforms = stdenv.lib.platforms.unix;
diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list
index ddda39c76f7f..d0a812e45d6a 100644
--- a/pkgs/servers/x11/xorg/tarballs-7.7.list
+++ b/pkgs/servers/x11/xorg/tarballs-7.7.list
@@ -119,7 +119,7 @@ mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2
 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2
-mirror://xorg/individual/driver/xf86-input-evdev-2.10.0.tar.bz2
+mirror://xorg/individual/driver/xf86-input-evdev-2.10.1.tar.bz2
 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2
 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.1.tar.bz2
 mirror://xorg/individual/driver/xf86-input-libinput-0.16.0.tar.bz2

From 23b32df470a86f5f98d9cafbebb0bfea2f571ab0 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Tue, 2 Feb 2016 10:27:26 +0100
Subject: [PATCH 0960/2285] gnome3.geocode-glib: 3.18.0 -> 3.18.1

---
 pkgs/desktops/gnome-3/3.18/core/geocode-glib/src.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.18/core/geocode-glib/src.nix b/pkgs/desktops/gnome-3/3.18/core/geocode-glib/src.nix
index faaadf5bb91f..b541834a1c2a 100644
--- a/pkgs/desktops/gnome-3/3.18/core/geocode-glib/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/geocode-glib/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "geocode-glib-3.18.0";
+  name = "geocode-glib-3.18.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/geocode-glib/3.18/geocode-glib-3.18.0.tar.xz;
-    sha256 = "8fb7f0d569e3e6696aaa1fdf275cb3094527ec5e9fa36fd88dd633dfec63495d";
+    url = mirror://gnome/sources/geocode-glib/3.18/geocode-glib-3.18.1.tar.xz;
+    sha256 = "75d12bf82575449b8290b7463e8b6cf1b99f2c9942db6391a3d5b0bbb600c365";
   };
 }

From c2fee6405fd9abfaae2b91f98cb32d44c9b6d2b5 Mon Sep 17 00:00:00 2001
From: michael bishop <cleverca22@gmail.com>
Date: Mon, 1 Feb 2016 11:39:11 -0400
Subject: [PATCH 0961/2285] ftputil init at 3.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cd372c9dfc4a..37f01d4ef433 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5241,6 +5241,25 @@ in modules // {
     };
   };
 
+  ftputil = buildPythonPackage rec {
+    version = "3.3";
+    name = "ftputil-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/f/ftputil/${name}.tar.gz";
+      sha256 = "1714w0v6icw2xjx5m54yv2qgkq49qwxwllq4gdb7wkz25iiapr8b";
+    };
+
+    disabled = isPy3k;
+
+    meta = {
+      description = "High-level FTP client library (virtual file system and more)";
+      homepage    = https://pypi.python.org/pypi/ftputil;
+      platforms   = platforms.linux;
+      license     = licenses.bsd2; # "Modified BSD licence, says pypi"
+    };
+  };
+
   fudge = buildPythonPackage rec {
     name = "fudge-1.1.0";
     src = pkgs.fetchurl {

From 3c011d0f1cfcd79a566eabc23ef11e77f9a8c57d Mon Sep 17 00:00:00 2001
From: Octavian Cerna <octavian.cerna@gmail.com>
Date: Tue, 26 Jan 2016 23:34:08 +0200
Subject: [PATCH 0962/2285] quagga: init at 0.99.24.1

---
 lib/maintainers.nix             |  1 +
 pkgs/servers/quagga/default.nix | 72 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 +
 3 files changed, 75 insertions(+)
 create mode 100644 pkgs/servers/quagga/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 4841f1e34fe6..046624f10f4b 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -300,6 +300,7 @@
   taeer = "Taeer Bar-Yam <taeer@necsi.edu>";
   tailhook = "Paul Colomiets <paul@colomiets.name>";
   taktoa = "Remy Goldschmidt <taktoa@gmail.com>";
+  tavyc = "Octavian Cerna <octavian.cerna@gmail.com>";
   telotortium = "Robert Irelan <rirelan@gmail.com>";
   thall = "Niclas Thall <niclas.thall@gmail.com>";
   thammers = "Tobias Hammerschmidt <jawr@gmx.de>";
diff --git a/pkgs/servers/quagga/default.nix b/pkgs/servers/quagga/default.nix
new file mode 100644
index 000000000000..cdc2905d62db
--- /dev/null
+++ b/pkgs/servers/quagga/default.nix
@@ -0,0 +1,72 @@
+{ stdenv, fetchurl, libcap, libnl, readline, net_snmp, less, perl, texinfo }:
+
+stdenv.mkDerivation rec {
+  name = "quagga-${version}";
+  version = "0.99.24.1";
+
+  src = fetchurl {
+    url = "mirror://savannah/quagga/${name}.tar.gz";
+    sha256 = "0kvmc810m7ssrvgb3213271rpywyxb646v5bzjl1jl88vx3imbl4";
+  };
+
+  buildInputs =
+    [ readline net_snmp ]
+    ++ stdenv.lib.optionals stdenv.isLinux [ libcap libnl ];
+
+  nativeBuildInputs = [ perl texinfo ];
+
+  configureFlags = [
+    "--sysconfdir=/etc/quagga"
+    "--localstatedir=/run/quagga"
+    "--sbindir=$(out)/libexec/quagga"
+    "--disable-exampledir"
+    "--enable-user=quagga"
+    "--enable-group=quagga"
+    "--enable-configfile-mask=0640"
+    "--enable-logfile-mask=0640"
+    "--enable-vtysh"
+    "--enable-vty-group=quaggavty"
+    "--enable-snmp"
+    "--enable-multipath=64"
+    "--enable-rtadv"
+    "--enable-irdp"
+    "--enable-opaque-lsa"
+    "--enable-ospf-te"
+    "--enable-pimd"
+    "--enable-isis-topology"
+  ];
+
+  preConfigure = ''
+    substituteInPlace vtysh/vtysh.c --replace \"more\" \"${less}/bin/less\"
+  '';
+
+  postInstall = ''
+    rm -f $out/bin/test_igmpv3_join
+    mv -f $out/libexec/quagga/ospfclient $out/bin/
+  '';
+
+  enableParallelBuilding = true;
+
+  meta = with stdenv.lib; {
+    description = "Quagga BGP/OSPF/ISIS/RIP/RIPNG routing daemon suite";
+    longDescription = ''
+      GNU Quagga is free software which manages TCP/IP based routing protocols.
+      It supports BGP4, BGP4+, OSPFv2, OSPFv3, IS-IS, RIPv1, RIPv2, and RIPng as
+      well as the IPv6 versions of these.
+
+      As the predecessor Zebra has been considered orphaned, the Quagga project
+      has been formed by members of the zebra mailing list and the former
+      zebra-pj project to continue developing.
+
+      Quagga uses threading if the kernel supports it, but can also run on
+      kernels that do not support threading. Each protocol has its own daemon.
+
+      It is more than a routed replacement, it can be used as a Route Server and
+      a Route Reflector.
+    '';
+    homepage = http://www.quagga.net/;
+    license = licenses.gpl2;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ tavyc ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2b6add86257..235b8becebab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9593,6 +9593,8 @@ let
     boost = boost155;
   };
 
+  quagga = callPackage ../servers/quagga { };
+
   rabbitmq_server = callPackage ../servers/amqp/rabbitmq-server {
     inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;
   };

From b90f0116cd9581ba713cb58a5d51e5cc537795b3 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 2 Feb 2016 13:42:15 +0000
Subject: [PATCH 0963/2285] titaniumenv: allow distributions of app with spaces
 in their name

---
 pkgs/development/mobile/titaniumenv/build-app.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/mobile/titaniumenv/build-app.nix b/pkgs/development/mobile/titaniumenv/build-app.nix
index 934d032e4791..fb25037e167d 100644
--- a/pkgs/development/mobile/titaniumenv/build-app.nix
+++ b/pkgs/development/mobile/titaniumenv/build-app.nix
@@ -191,7 +191,7 @@ stdenv.mkDerivation {
                bundleId=$(grep '<id>[a-zA-Z0-9.]*</id>' tiapp.xml | sed -e 's|<id>||' -e 's|</id>||' -e 's/ //g')
                version=$(grep '<version>[a-zA-Z0-9.]*</version>' tiapp.xml | sed -e 's|<version>||' -e 's|</version>||' -e 's/ //g')
                
-               sed -e "s|@INSTALL_URL@|${installURL}?bundleId=$bundleId\&amp;version=$version\&amp;title=$appname|" ${../xcodeenv/install.html.template} > $out/$appname.html
+               sed -e "s|@INSTALL_URL@|${installURL}?bundleId=$bundleId\&amp;version=$version\&amp;title=$appname|" ${../xcodeenv/install.html.template} > "$out/$appname.html"
                echo "doc install \"$out/$appname.html\"" >> $out/nix-support/hydra-build-products
              ''}
            ''

From 70efc87a06c3cfbbd9f559e5442318f6c978edcb Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 2 Feb 2016 16:52:03 +0300
Subject: [PATCH 0964/2285] ghostscript: copy resources, cleanup

---
 pkgs/misc/ghostscript/default.nix | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix
index 658fa346f1ea..06ffc45cecf3 100644
--- a/pkgs/misc/ghostscript/default.nix
+++ b/pkgs/misc/ghostscript/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, fetchpatch, pkgconfig, zlib, expat, openssl, autoconf
+{ stdenv, lib, fetchurl, fetchpatch, pkgconfig, zlib, expat, openssl, autoconf
 , libjpeg, libpng, libtiff, freetype, fontconfig, lcms2, libpaper, jbig2dec
 , libiconv, ijs
 , x11Support ? false, xlibsWrapper ? null
@@ -51,8 +51,8 @@ stdenv.mkDerivation rec {
       libjpeg libpng libtiff freetype fontconfig lcms2 libpaper jbig2dec
       libiconv ijs
     ]
-    ++ stdenv.lib.optional x11Support xlibsWrapper
-    ++ stdenv.lib.optional cupsSupport cups
+    ++ lib.optional x11Support xlibsWrapper
+    ++ lib.optional cupsSupport cups
     ;
 
   patches = [
@@ -87,8 +87,6 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  makeFlags = [ "cups_serverroot=$(out)" "cups_serverbin=$(out)/lib/cups" ];
-
   preConfigure = ''
     # requires in-tree (heavily patched) openjpeg
     rm -rf jpeg libpng zlib jasper expat tiff lcms{,2} jbig2dec freetype cups/libs ijs
@@ -97,33 +95,34 @@ stdenv.mkDerivation rec {
     sed "s@^ZLIBDIR=.*@ZLIBDIR=${zlib}/include@" -i configure.ac
 
     autoconf
+  '' + lib.optionalString cupsSupport ''
+    configureFlags="$configureFlags --with-cups-serverbin=$out/lib/cups --with-cups-serverroot=$out/etc/cups --with-cups-datadir=$out/share/cups"
   '';
 
   configureFlags =
     [ "--with-system-libtiff"
       "--enable-dynamic"
-      (if x11Support then "--with-x" else "--without-x")
-      (if cupsSupport then "--enable-cups" else "--disable-cups")
-    ];
+    ] ++ lib.optional x11Support "--with-x"
+      ++ lib.optional cupsSupport "--enable-cups";
 
   doCheck = true;
-  preCheck = "mkdir ./obj";
-  # parallel check sometimes gave: Fatal error: can't create ./obj/whitelst.o
 
   # don't build/install statically linked bin/gs
-  buildFlags = "so";
-  installTargets="soinstall";
+  buildFlags = [ "so" ];
+  installTargets = [ "soinstall" ];
 
   postInstall = ''
     ln -s gsc "$out"/bin/gs
 
+    cp -r Resource "$out/share/ghostscript/${version}"
+
     mkdir -p "$doc/share/ghostscript/${version}"
     mv "$out/share/ghostscript/${version}"/{doc,examples} "$doc/share/ghostscript/${version}/"
 
     ln -s "${fonts}" "$out/share/ghostscript/fonts"
   '';
 
-  preFixup = stdenv.lib.strings.optionalString stdenv.isDarwin ''
+  preFixup = lib.optionalString stdenv.isDarwin ''
     install_name_tool -change libgs.dylib.${version} $out/lib/libgs.dylib.${version} $out/bin/gs
   '';
 

From 4222b8c20c7b012c1a341e7ffdeb142d1bb92385 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 2 Feb 2016 16:53:49 +0300
Subject: [PATCH 0965/2285] asymptote: enable parallel building

---
 pkgs/tools/graphics/asymptote/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index 7a15b00b365f..e4242f8efabe 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -22,9 +22,11 @@ in
 stdenv.mkDerivation {
   inherit (s) name version;
   inherit buildInputs;
+
   src = fetchurl {
     inherit (s) url sha256;
   };
+
   preConfigure = ''
     export HOME="$PWD"
     patchShebangs . 
@@ -33,12 +35,16 @@ stdenv.mkDerivation {
     cp texinfo-*/doc/texinfo.tex doc/
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${boehmgc}/include/gc"
   '';
+
   postInstall = ''
     mv -v "$out/share/info/asymptote/"*.info $out/share/info/
     sed -i -e 's|(asymptote/asymptote)|(asymptote)|' $out/share/info/asymptote.info
     rmdir $out/share/info/asymptote
     rm $out/share/info/dir
   '';
+
+  enableParallelBuilding = true;
+
   meta = {
     inherit (s) version;
     description =  "A tool for programming graphics intended to replace Metapost";

From 3ab8f9720124b4b305f6552d3c746a80c58d0dec Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 2 Feb 2016 17:18:41 +0300
Subject: [PATCH 0966/2285] asymptote: enforce no bundled libraries, install
 tex files, offscreen rendering support

---
 pkgs/tools/graphics/asymptote/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index e4242f8efabe..9199d6a038f0 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl
   , freeglut, ghostscriptX, imagemagick, fftw 
-  , boehmgc, mesa, ncurses, readline, gsl, libsigsegv
+  , boehmgc, mesa_glu, mesa_noglu, ncurses, readline, gsl, libsigsegv
   , python, zlib, perl, texLive, texinfo, xz
 }:
 let
@@ -15,7 +15,7 @@ let
   };
   buildInputs = [
    freeglut ghostscriptX imagemagick fftw 
-   boehmgc mesa ncurses readline gsl libsigsegv
+   boehmgc mesa_glu mesa_noglu mesa_noglu.osmesa ncurses readline gsl libsigsegv
    python zlib perl texLive texinfo xz
   ];
 in
@@ -33,9 +33,12 @@ stdenv.mkDerivation {
     sed -e 's@epswrite@eps2write@g' -i runlabel.in
     xz -d < ${texinfo.src} | tar --wildcards -x texinfo-'*'/doc/texinfo.tex
     cp texinfo-*/doc/texinfo.tex doc/
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${boehmgc}/include/gc"
+    rm *.tar.gz
+    configureFlags="$configureFlags --with-latex=$out/share/texmf/tex/latex --with-context=$out/share/texmf/tex/context/third"
   '';
 
+  NIX_CFLAGS_COMPILE = [ "-I${boehmgc}/include/gc" ];
+
   postInstall = ''
     mv -v "$out/share/info/asymptote/"*.info $out/share/info/
     sed -i -e 's|(asymptote/asymptote)|(asymptote)|' $out/share/info/asymptote.info

From b2a91caea06ef77bc8bcfd7c77f095984edaefe6 Mon Sep 17 00:00:00 2001
From: Ali Abrar <aliabrar@gmail.com>
Date: Tue, 2 Feb 2016 10:14:26 -0500
Subject: [PATCH 0967/2285] vim_configurable: add configuration option for XIM
 support

---
 pkgs/applications/editors/vim/configurable.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index e2715b1499a5..2a80f5d42ad7 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -154,6 +154,7 @@ composableDerivation {
     multibyteSupport = config.vim.multibyte or false;
     cscopeSupport    = config.vim.cscope or true;
     netbeansSupport  = config.netbeans or true; # eg envim is using it
+    ximSupport       = config.vim.xim or false;
 
     # by default, compile with darwin support if we're compiling on darwin, but
     # allow this to be disabled by setting config.vim.darwin to false

From a7662bdc91e88c7e6bc94dab9067978ba4f3c9d1 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Tue, 2 Feb 2016 15:36:47 +0000
Subject: [PATCH 0968/2285] libgpg-error: 1.20 -> 1.21

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

diff --git a/pkgs/development/libraries/libgpg-error/default.nix b/pkgs/development/libraries/libgpg-error/default.nix
index 19a6a8531bee..26214bd8801b 100644
--- a/pkgs/development/libraries/libgpg-error/default.nix
+++ b/pkgs/development/libraries/libgpg-error/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "libgpg-error-1.20";
+  name = "libgpg-error-1.21";
 
   src = fetchurl {
     url = "mirror://gnupg/libgpg-error/${name}.tar.bz2";
-    sha256 = "08i5wxs6zlngjkv6s3dwm60w8mihxvi9agp6jfq7z6j1wdf8jrij";
+    sha256 = "0kdq2cbnk84fr4jqcv689rlxpbyl6bda2cn6y3ll19v3mlydpnxp";
   };
 
   postPatch = "sed '/BUILD_TIMESTAMP=/s/=.*/=1970-01-01T00:01+0000/' -i ./configure";

From b2609751e4eb190a56244a7b828f957ca95eb517 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Tue, 2 Feb 2016 15:29:34 +0000
Subject: [PATCH 0969/2285] gnupg: 2.1.10 -> 2.1.11

Release notes can be found here:

    https://lists.gnupg.org/pipermail/gnupg-announce/2016q1/000383.html
---
 pkgs/tools/security/gnupg/21.nix              |  6 ++----
 pkgs/tools/security/gnupg/gpgkey2ssh-21.patch | 13 -------------
 2 files changed, 2 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/tools/security/gnupg/gpgkey2ssh-21.patch

diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix
index bafcd88f1b90..dc86c6e420ef 100644
--- a/pkgs/tools/security/gnupg/21.nix
+++ b/pkgs/tools/security/gnupg/21.nix
@@ -13,15 +13,13 @@ with stdenv.lib;
 assert x11Support -> pinentry != null;
 
 stdenv.mkDerivation rec {
-  name = "gnupg-2.1.10";
+  name = "gnupg-2.1.11";
 
   src = fetchurl {
     url = "mirror://gnupg/gnupg/${name}.tar.bz2";
-    sha256 = "1ybcsazjm21i2ys1wh49cz4azmqz7ghx5rb6hm4gm93i2zc5igck";
+    sha256 = "06mn2viiwsyq991arh5i5fhr9jyxq2bi0jkdj7ndfisxihngpc5p";
   };
 
-  patches = [ ./gpgkey2ssh-21.patch ];
-
   postPatch = stdenv.lib.optionalString stdenv.isLinux ''
     sed -i 's,"libpcsclite\.so[^"]*","${pcsclite}/lib/libpcsclite.so",g' scd/scdaemon.c
   ''; #" fix Emacs syntax highlighting :-(
diff --git a/pkgs/tools/security/gnupg/gpgkey2ssh-21.patch b/pkgs/tools/security/gnupg/gpgkey2ssh-21.patch
deleted file mode 100644
index 198869423e5c..000000000000
--- a/pkgs/tools/security/gnupg/gpgkey2ssh-21.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/tools/gpgkey2ssh.c b/tools/gpgkey2ssh.c
-index f12c5f4..2e3f2ac 100644
---- a/tools/gpgkey2ssh.c
-+++ b/tools/gpgkey2ssh.c
-@@ -281,7 +281,7 @@ main (int argc, char **argv)
-   keyid = argv[1];
- 
-   asprintf (&command,
--            "gpg2 --list-keys --with-colons --with-key-data '%s'",
-+            "@out@/bin/gpg2 --list-keys --with-colons --with-key-data '%s'",
-             keyid);
-   if (! command)
-     {

From 7b772ae3987d461318e76472756658a6160dac27 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Feb 2016 16:38:42 +0100
Subject: [PATCH 0970/2285] linux: Update to 3.10.96, 3.12.53, 3.14.60,
 3.18.26, 4.1.17, 4.4.1

---
 .../linux/kernel/cve-2016-0728.patch          | 78 -------------------
 pkgs/os-specific/linux/kernel/linux-3.10.nix  |  6 +-
 pkgs/os-specific/linux/kernel/linux-3.12.nix  |  6 +-
 pkgs/os-specific/linux/kernel/linux-3.14.nix  |  7 +-
 pkgs/os-specific/linux/kernel/linux-3.18.nix  |  6 +-
 pkgs/os-specific/linux/kernel/linux-4.1.nix   |  6 +-
 pkgs/os-specific/linux/kernel/linux-4.4.nix   |  7 +-
 7 files changed, 18 insertions(+), 98 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/cve-2016-0728.patch

diff --git a/pkgs/os-specific/linux/kernel/cve-2016-0728.patch b/pkgs/os-specific/linux/kernel/cve-2016-0728.patch
deleted file mode 100644
index 5eec95c62930..000000000000
--- a/pkgs/os-specific/linux/kernel/cve-2016-0728.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 05fd13592b60c3e9873f56705f80ff934e98b046 Mon Sep 17 00:00:00 2001
-From: David Howells <dhowells@redhat.com>
-Date: Mon, 18 Jan 2016 10:53:31 +0000
-Subject: [PATCH] KEYS: Fix keyring ref leak in join_session_keyring()
-
-This fixes CVE-2016-0728.
-
-If a thread is asked to join as a session keyring the keyring that's already
-set as its session, we leak a keyring reference.
-
-This can be tested with the following program:
-
-	#include <stddef.h>
-	#include <stdio.h>
-	#include <sys/types.h>
-	#include <keyutils.h>
-
-	int main(int argc, const char *argv[])
-	{
-		int i = 0;
-		key_serial_t serial;
-
-		serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING,
-				"leaked-keyring");
-		if (serial < 0) {
-			perror("keyctl");
-			return -1;
-		}
-
-		if (keyctl(KEYCTL_SETPERM, serial,
-			   KEY_POS_ALL | KEY_USR_ALL) < 0) {
-			perror("keyctl");
-			return -1;
-		}
-
-		for (i = 0; i < 100; i++) {
-			serial = keyctl(KEYCTL_JOIN_SESSION_KEYRING,
-					"leaked-keyring");
-			if (serial < 0) {
-				perror("keyctl");
-				return -1;
-			}
-		}
-
-		return 0;
-	}
-
-If, after the program has run, there something like the following line in
-/proc/keys:
-
-3f3d898f I--Q---   100 perm 3f3f0000     0     0 keyring   leaked-keyring: empty
-
-with a usage count of 100 * the number of times the program has been run,
-then the kernel is malfunctioning.  If leaked-keyring has zero usages or
-has been garbage collected, then the problem is fixed.
-
-Reported-by: Yevgeny Pats <yevgeny@perception-point.io>
-Signed-off-by: David Howells <dhowells@redhat.com>
-RH-bugzilla: 1298036
----
- security/keys/process_keys.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/security/keys/process_keys.c b/security/keys/process_keys.c
-index 43b4cddbf2b3..7877e5cd4e23 100644
---- a/security/keys/process_keys.c
-+++ b/security/keys/process_keys.c
-@@ -794,6 +794,7 @@ long join_session_keyring(const char *name)
- 		ret = PTR_ERR(keyring);
- 		goto error2;
- 	} else if (keyring == new->session_keyring) {
-+		key_put(keyring);
- 		ret = 0;
- 		goto error2;
- 	}
--- 
-2.5.0
-
diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index 6a4531d9deb4..afca9b9c35e4 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.92";
+  version = "3.10.96";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0z0jdix1mfpnnc8cxw7rzpnhxdayckpnrasvxi1qf0dwhcqgk92d";
+    sha256 = "0wnlvbyg92q48kz5cn3bznjkkzpsik8z51dqhcxdpddy1k6iqb3k";
   };
 
-  kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ];
+  kernelPatches = args.kernelPatches;
 
   features.iwlwifi = true;
   features.efiBootStub = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 1e58d4e50291..378a2b854f9e 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.50";
+  version = "3.12.53";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1bn07wsrcbg4qgqd4v2810c3qc0ifbcza0fyj8s54yd78g9qj4lj";
+    sha256 = "1f2h4z8lk1s0h5lw7n3yb47dhpbr7gzma7ifsslwhyjg7s44cb27";
   };
 
-  kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ];
+  kernelPatches = args.kernelPatches;
 
   features.iwlwifi = true;
   features.efiBootStub = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index 62f1be8b92b1..9ad5a336de3b 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,16 +1,15 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.14.58";
-  # Remember to update grsecurity!
+  version = "3.14.60";
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0jw1023cpn4bjmi0db86lrxri9xj75cj8p2iqs44jabvh35idl7l";
+    sha256 = "1zwq0j4slqg33z4yyk5s35hdzrq0g7jk1bd2kvgvkyqn1dkkvh0j";
   };
 
-  kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ];
+  kernelPatches = args.kernelPatches;
 
   features.iwlwifi = true;
   features.efiBootStub = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix
index 86258308c1e0..9b90ea3556b1 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.18.25";
+  version = "3.18.26";
   extraMeta.branch = "3.18";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "14pz8mvk48i2y1ffkhczjcm2icpb2g9xlpzyrvvis42n5178fjf6";
+    sha256 = "0bhf8x1h5crc9kimprjs7q74p86gsqsdr8nz54nv33c6zmryqsic";
   };
 
-  kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ];
+  kernelPatches = args.kernelPatches;
 
   features.iwlwifi = true;
   features.efiBootStub = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.1.nix b/pkgs/os-specific/linux/kernel/linux-4.1.nix
index 29d4870597a3..fbcfa17a8bc7 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.1.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.1.15";
+  version = "4.1.17";
   extraMeta.branch = "4.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "18sr0dl5ax6pcx6nqp9drb4l6a38g07vxihiqpbwb231jv68h8j7";
+    sha256 = "084ij19vgm27ljrjabqqmlqn27p168nsm9grhr6rajid4n79h6ab";
   };
 
-  kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ];
+  kernelPatches = args.kernelPatches;
 
   features.iwlwifi = true;
   features.efiBootStub = true;
diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix
index cf17e915f8bf..18bc11926214 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.4.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix
@@ -1,16 +1,15 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4";
-  modDirVersion = "4.4.0";
+  version = "4.4.1";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "401d7c8fef594999a460d10c72c5a94e9c2e1022f16795ec51746b0d165418b2";
+    sha256 = "0mwaqvl7dkasidciah1al57a1djnsk46ha5mjy4psq2inj71klky";
   };
 
-  kernelPatches = args.kernelPatches ++ [ { name = "cve-2016-0728"; patch = ./cve-2016-0728.patch; } ];
+  kernelPatches = args.kernelPatches;
 
   features.iwlwifi = true;
   features.efiBootStub = true;

From 74657bae856939dde6545c36324a400ceda8cab5 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 2 Feb 2016 13:28:31 +0100
Subject: [PATCH 0971/2285] rustcMaster: 2016-01-10 -> 2016-02-01

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

diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index 2cefc4cfc137..4ef521218e68 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -2,11 +2,11 @@
 { stdenv, callPackage }:
 
 callPackage ./generic.nix {
-  shortVersion = "2016-01-10";
+  shortVersion = "2016-02-01";
   isRelease = false;
   forceBundledLLVM = false;
-  srcRev = "d70ab2bdf16c22b9f3ff0230089b44855e3f1593";
-  srcSha = "13ssis1bdgg8sdkgrvxcbd1qcfmf7q6bv4akfxrjgdm44l1n1l97";
+  srcRev = "094c5b0d6";
+  srcSha = "0908xzxb4q8vqwmzi5c2vzrhfsrw7d18r4n7mq3ir5671y9cqpvz";
 
   /* Rust is bootstrapped from an earlier built version. We need
   to fetch these earlier versions, which vary per platform.

From 473fd7746ef9cd006bb1cfb25803eb11b12bee8c Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 2 Feb 2016 13:30:23 +0100
Subject: [PATCH 0972/2285] rustc: 1.5.0 -> 1.6.0

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

diff --git a/pkgs/development/compilers/rustc/default.nix b/pkgs/development/compilers/rustc/default.nix
index ce1e4cf1f5ce..e7d440396821 100644
--- a/pkgs/development/compilers/rustc/default.nix
+++ b/pkgs/development/compilers/rustc/default.nix
@@ -1,11 +1,11 @@
 { stdenv, callPackage }:
 
 callPackage ./generic.nix {
-  shortVersion = "1.5.0";
+  shortVersion = "1.6.0";
   isRelease = true;
   forceBundledLLVM = false;
   configureFlags = [ "--release-channel=stable" ];
-  srcSha = "1vfpwx6a2f2rn528774cz9r7r82ppycn8z8ybll6bphdw7cyar1g";
+  srcSha = "1dvpiswl0apknizsz9bcrjnc4c43ys191a1b9gm3569xdlmxr36w";
 
   /* Rust is bootstrapped from an earlier built version. We need
   to fetch these earlier versions, which vary per platform.

From 7b82a2d5f4afd69dbfa2296ff95e293eb12844a3 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 2 Feb 2016 14:56:15 +0100
Subject: [PATCH 0973/2285] rustRegistry: 2016-01-17 -> 2016-02-02

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

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index 1cc2692b9d50..cc16f4502273 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,15 +7,15 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2016-01-17";
-  rev = "4d434405cd956c3c5476171bdc7e6dbe5c8ff209";
+  version = "2016-02-02";
+  rev = "9312acc30def6bb16739ab6c4560fb9880b25c5a";
 
   src = fetchFromGitHub {
       inherit rev;
 
       owner = "rust-lang";
       repo = "crates.io-index";
-      sha256 = "12y6kbgx1kh04lhwxvxqs2jkhnfa9hkgdjxhzlqs3gjcybsdkdhj";
+      sha256 = "0mrfcipc7sv0kzryjs649x3j4djr8jgbl58jd21hrcihc61qa38n";
   };
 
 in

From 52475afe77ef82416fed29f4d9dfc31b21f3617f Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 2 Feb 2016 14:56:37 +0100
Subject: [PATCH 0974/2285] cargo: 0.7.0 -> 0.8.0

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

diff --git a/pkgs/development/tools/build-managers/cargo/default.nix b/pkgs/development/tools/build-managers/cargo/default.nix
index aa3df6fb1ce5..e0094b4350a7 100644
--- a/pkgs/development/tools/build-managers/cargo/default.nix
+++ b/pkgs/development/tools/build-managers/cargo/default.nix
@@ -5,7 +5,7 @@ with rustPlatform;
 
 with ((import ./common.nix) {
   inherit stdenv rustc;
-  version = "0.7.0";
+  version = "0.8.0";
 });
 
 buildRustPackage rec {
@@ -15,10 +15,10 @@ buildRustPackage rec {
   src = fetchgit {
     url = "git://github.com/rust-lang/cargo";
     rev = "refs/tags/${version}";
-    sha256 = "139rv7d6mk31klbnccmn573i05ygjrnflag6c3qwc075i62yfmx6";
+    sha256 = "02z0b6hpygjjfbskg22ggrhdv2nasrgf8x1fd8y0qzg4krx2czlh";
   };
 
-  depsSha256 = "07p244bcw3aa1hfbsz6q89pyl8ypkw9zp1r8cvd131w890w9ab4b";
+  depsSha256 = "1gwc5ygs3h8jxs506xmbj1xzaqpb3kmg3pkxg9j9yqy616jw6rcn";
 
   buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ];
 

From ff90f52375ef9c2ffb1f98099ec7456829f58047 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 2 Feb 2016 05:04:41 +0100
Subject: [PATCH 0975/2285] chromium: Remove import-from-derivation again

This reverts commit f7af2272a2ea8f12eecd337aee046345172bebec.

We're going to fix #12710 properly by reintroducing 38c77bb and fixing
the shell variable substitution.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/default.nix  | 11 ++-
 .../networking/browsers/chromium/plugins.nix  | 71 ++++++++++++-------
 2 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index bf870e144e56..c0c5e485e59c 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -64,20 +64,17 @@ let
 in stdenv.mkDerivation {
   name = "chromium${suffix}-${chromium.browser.version}";
 
-  buildInputs = [ makeWrapper ] ++ chromium.plugins.enabledPlugins;
+  buildInputs = [ makeWrapper ];
 
   buildCommand = let
     browserBinary = "${chromium.browser}/libexec/chromium/chromium";
-    mkEnvVar = key: val: "--set '${key}' '${val}'";
-    envVars = chromium.plugins.settings.envVars or {};
-    flags = chromium.plugins.settings.flags or [];
+    getWrapperFlags = plugin: "$(< \"${plugin}/nix-support/wrapper-flags\")";
   in with stdenv.lib; ''
     mkdir -p "$out/bin" "$out/share/applications"
 
     ln -s "${chromium.browser}/share" "$out/share"
-    makeWrapper "${browserBinary}" "$out/bin/chromium" \
-      ${concatStrings (mapAttrsToList mkEnvVar envVars)} \
-      --add-flags "${concatStringsSep " " flags}"
+    eval makeWrapper "${browserBinary}" "$out/bin/chromium" \
+      ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled}
 
     ln -s "$out/bin/chromium" "$out/bin/chromium-browser"
     ln -s "${chromium.browser}/share/icons" "$out/share/icons"
diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 0b0e5bd08382..dda976905610 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -8,6 +8,34 @@
 with stdenv.lib;
 
 let
+  # Generate a shell fragment that emits flags appended to the
+  # final makeWrapper call for wrapping the browser's main binary.
+  #
+  # Note that this is shell-escaped so that only the variable specified
+  # by the "output" attribute is substituted.
+  mkPluginInfo = { output ? "out", allowedVars ? [ output ]
+                 , flags ? [], envVars ? {}
+                 }: let
+    shSearch = ["'"] ++ map (var: "\$${var}") allowedVars;
+    shReplace = ["'\\''"] ++ map (var: "'\"\${${var}}\"'") allowedVars;
+    # We need to triple-escape "val":
+    #  * First because makeWrapper doesn't do any quoting of its arguments by
+    #    itself.
+    #  * Second because it's passed to the makeWrapper call separated by IFS but
+    #    not by the _real_ arguments, for example the Widevine plugin flags
+    #    contain spaces, so they would end up as separate arguments.
+    #  * Third in order to be correctly quoted for the "echo" call below.
+    shEsc = val: "'${replaceStrings ["'"] ["'\\''"] val}'";
+    mkSh = val: "'${replaceStrings shSearch shReplace (shEsc val)}'";
+    mkFlag = flag: ["--add-flags" (shEsc flag)];
+    mkEnvVar = key: val: ["--set" (shEsc key) (shEsc val)];
+    envList = mapAttrsToList mkEnvVar envVars;
+    quoted = map mkSh (flatten ((map mkFlag flags) ++ envList));
+  in ''
+    mkdir -p "''$${output}/nix-support"
+    echo ${toString quoted} > "''$${output}/nix-support/wrapper-flags"
+  '';
+
   plugins = stdenv.mkDerivation {
     name = "chromium-binary-plugins";
 
@@ -61,40 +89,29 @@ let
 
       install -vD PepperFlash/libpepflashplayer.so \
         "$flash/lib/libpepflashplayer.so"
-      mkdir -p "$flash/nix-support"
-      cat > "$flash/nix-support/chromium-plugin.nix" <<NIXOUT
-        { flags = [
-            "--ppapi-flash-path='$flash/lib/libpepflashplayer.so'"
-            "--ppapi-flash-version=$flashVersion"
-          ];
-        }
-      NIXOUT
+
+      ${mkPluginInfo {
+        output = "flash";
+        allowedVars = [ "flash" "flashVersion" ];
+        flags = [
+          "--ppapi-flash-path=$flash/lib/libpepflashplayer.so"
+          "--ppapi-flash-version=$flashVersion"
+        ];
+      }}
 
       install -vD libwidevinecdm.so \
         "$widevine/lib/libwidevinecdm.so"
       install -vD libwidevinecdmadapter.so \
         "$widevine/lib/libwidevinecdmadapter.so"
-      mkdir -p "$widevine/nix-support"
-      cat > "$widevine/nix-support/chromium-plugin.nix" <<NIXOUT
-        { flags = [ "--register-pepper-plugins='${wvModule}${wvInfo}'" ];
-          envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "$widevine/lib";
-        }
-      NIXOUT
+
+      ${mkPluginInfo {
+        output = "widevine";
+        flags = [ "--register-pepper-plugins=${wvModule}${wvInfo}" ];
+        envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "$widevine/lib";
+      }}
     '';
 
-    passthru = let
-      enabledPlugins = optional enablePepperFlash plugins.flash
+    passthru.enabled = optional enablePepperFlash plugins.flash
                     ++ optional enableWideVine    plugins.widevine;
-      getNix = plugin: import "${plugin}/nix-support/chromium-plugin.nix";
-      mergeAttrsets = let
-        f = v: if all isAttrs v then mergeAttrsets v
-          else if all isList  v then concatLists   v
-          else if tail v == []  then head          v
-          else head (tail v);
-      in fold (l: r: zipAttrsWith (_: f) [ l r ]) {};
-    in {
-      inherit enabledPlugins;
-      settings = mergeAttrsets (map getNix enabledPlugins);
-    };
   };
 in plugins

From 61042a5b6ac89166180b9257fa72c478439d3753 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 2 Feb 2016 05:19:51 +0100
Subject: [PATCH 0976/2285] chromium/plugins: Use @var@ for passing variables

There is already a pull request from @colemickens, who has just reversed
the variable references $flash and $flashVersion but the fix is kinda
fragile as he points out himself in #12713.

The reason the wrong substition was made is that both variables begin
with the same name and we do a simple replace instead of a more
complicated one using builtins.match.

So staying simple but to still not raising issues with other variables
that begin with the same name I'm now using @var@ instead, like we use
in substituteAll and other substituters (like the ones in CMake or
autotools) deal with it.

Note that I'm not using $var$ here to make sure it doesn't get confused
with real shell variables.

So with this fix in place, the wrapper now has the following flags:

  --ppapi-flash-path=/nix/store/.../lib/libpepflashplayer.so
  --ppapi-flash-version=20.0.0.294

Previously we had (#12710):

  --ppapi-flash-path=/nix/store/.../lib/libpepflashplayer.so
  --ppapi-flash-version=/nix/store/...-binary-plugins-flashVersion

Thanks to @colemickens for reporting and putting up a pull request.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes: #12710
Fixes: #12713
---
 .../applications/networking/browsers/chromium/plugins.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index dda976905610..78d9086dd961 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -16,7 +16,7 @@ let
   mkPluginInfo = { output ? "out", allowedVars ? [ output ]
                  , flags ? [], envVars ? {}
                  }: let
-    shSearch = ["'"] ++ map (var: "\$${var}") allowedVars;
+    shSearch = ["'"] ++ map (var: "@${var}@") allowedVars;
     shReplace = ["'\\''"] ++ map (var: "'\"\${${var}}\"'") allowedVars;
     # We need to triple-escape "val":
     #  * First because makeWrapper doesn't do any quoting of its arguments by
@@ -94,8 +94,8 @@ let
         output = "flash";
         allowedVars = [ "flash" "flashVersion" ];
         flags = [
-          "--ppapi-flash-path=$flash/lib/libpepflashplayer.so"
-          "--ppapi-flash-version=$flashVersion"
+          "--ppapi-flash-path=@flash@/lib/libpepflashplayer.so"
+          "--ppapi-flash-version=@flashVersion@"
         ];
       }}
 
@@ -107,7 +107,7 @@ let
       ${mkPluginInfo {
         output = "widevine";
         flags = [ "--register-pepper-plugins=${wvModule}${wvInfo}" ];
-        envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "$widevine/lib";
+        envVars.NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE = "@widevine@/lib";
       }}
     '';
 

From 1a6c03c2346f19fa0d654c65a4b2715bd36beb13 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 2 Feb 2016 16:07:25 +0100
Subject: [PATCH 0977/2285] beets: 1.3.15 -> 1.3.16

Add plugins embyupdate, edit, mbsubmit as plugins.
---
 pkgs/tools/audio/beets/default.nix | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 35a69262acde..c1945ca5de0a 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -5,6 +5,7 @@
 , enableBadfiles   ? true, flac ? null, mp3val ? null
 , enableDiscogs    ? true
 , enableEchonest   ? true
+, enableEmbyupdate ? true
 , enableFetchart   ? true
 , enableLastfm     ? true
 , enableMpd        ? true
@@ -37,6 +38,7 @@ let
     chroma = enableAcoustid;
     discogs = enableDiscogs;
     echonest = enableEchonest;
+    embyupdate = enableEmbyupdate;
     fetchart = enableFetchart;
     lastgenre = enableLastfm;
     lastimport = enableLastfm;
@@ -48,10 +50,10 @@ let
   };
 
   pluginsWithoutDeps = [
-    "bench" "bpd" "bpm" "bucket" "convert" "cue" "duplicates" "embedart"
+    "bench" "bpd" "bpm" "bucket" "convert" "cue" "duplicates" "edit" "embedart"
     "filefilter" "freedesktop" "fromfilename" "ftintitle" "fuzzy" "ihate"
     "importadded" "importfeeds" "info" "inline" "ipfs" "keyfinder" "lyrics"
-    "mbcollection" "mbsync" "metasync" "missing" "permissions" "play"
+    "mbcollection" "mbsubmit" "mbsync" "metasync" "missing" "permissions" "play"
     "plexupdate" "random" "rewrite" "scrub" "smartplaylist" "spotify" "the"
     "types" "zero"
   ];
@@ -66,14 +68,14 @@ let
 
 in buildPythonPackage rec {
   name = "beets-${version}";
-  version = "1.3.15";
+  version = "1.3.16";
   namePrefix = "";
 
   src = fetchFromGitHub {
     owner = "sampsyo";
     repo = "beets";
     rev = "v${version}";
-    sha256 = "17mbkilqqkxxa8ra8b4zlsax712jb0nfkvcx9iyq9303rqwv5sx2";
+    sha256 = "1grjcgr419yq756wwxjpzyfjdf8n51bg6i0agm465lb7l3jgqy6k";
   };
 
   propagatedBuildInputs = [
@@ -87,14 +89,15 @@ in buildPythonPackage rec {
     pythonPackages.unidecode
     python.modules.sqlite3
     python.modules.readline
-  ] ++ optional enableAcoustid   pythonPackages.pyacoustid
-    ++ optional enableFetchart   pythonPackages.requests2
-    ++ optional enableDiscogs    pythonPackages.discogs_client
-    ++ optional enableEchonest   pythonPackages.pyechonest
-    ++ optional enableLastfm     pythonPackages.pylast
-    ++ optional enableMpd        pythonPackages.mpd
-    ++ optional enableThumbnails pythonPackages.pyxdg
-    ++ optional enableWeb        pythonPackages.flask
+  ] ++ optional enableAcoustid     pythonPackages.pyacoustid
+    ++ optional (enableFetchart
+              || enableEmbyupdate) pythonPackages.requests2
+    ++ optional enableDiscogs      pythonPackages.discogs_client
+    ++ optional enableEchonest     pythonPackages.pyechonest
+    ++ optional enableLastfm       pythonPackages.pylast
+    ++ optional enableMpd          pythonPackages.mpd
+    ++ optional enableThumbnails   pythonPackages.pyxdg
+    ++ optional enableWeb          pythonPackages.flask
     ++ optional enableAlternatives (import ./alternatives-plugin.nix {
       inherit stdenv buildPythonPackage pythonPackages fetchFromGitHub;
     });
@@ -186,7 +189,7 @@ in buildPythonPackage rec {
     description = "Music tagger and library organizer";
     homepage = http://beets.radbox.org;
     license = licenses.mit;
-    maintainers = with maintainers; [ aszlig iElectric pjones ];
+    maintainers = with maintainers; [ aszlig iElectric pjones profpatsch ];
     platforms = platforms.linux;
   };
 }

From ba8b7fff6a73806c6e86573827609f80c1af0bbd Mon Sep 17 00:00:00 2001
From: Jos van den Oever <jos@vandenoever.info>
Date: Mon, 1 Feb 2016 21:11:59 +0100
Subject: [PATCH 0978/2285] davmail: 4.7.0 -> 4.7.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Bugfix release, mainly for Carddav regression over EWS, also includes an NTLM support enhancement.

Enhancement:
- Improve NTLM support try to send hostname as workstation name instead of UNKNOWN
- Fix notification dialog message
- Prepare ExchangeSessionFactory refactoring
- Fix typo in french translation
- Fix broken Sourceforge link in About dialog

Carddav:
- Carddav: fix regression on contact update with empty field triggering DeleteItemField

(cherry picked from commit cf327c3dcfd442cea4368d76c59f72dcd5da6768)

[Bjørn: Cherry-picked from release-15.09 to master. (I guess merging
first to release-15.09 was a mistake.)]
---
 pkgs/applications/networking/davmail/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/davmail/default.nix b/pkgs/applications/networking/davmail/default.nix
index 7773fcaf0c47..5fc770624c21 100644
--- a/pkgs/applications/networking/davmail/default.nix
+++ b/pkgs/applications/networking/davmail/default.nix
@@ -1,10 +1,10 @@
 { fetchurl, stdenv, jre, glib, libXtst, gtk, makeWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "davmail-4.7.0";
+  name = "davmail-4.7.1";
   src = fetchurl {
-    url = "mirror://sourceforge/davmail/4.7.0/davmail-linux-x86_64-4.7.0-2408.tgz";
-    sha256 = "1kasnqnvw8icm32m5vbvkpx5im1w4sifiaafb08rw4a1zn8asxv1";
+    url = "mirror://sourceforge/davmail/4.7.1/davmail-linux-x86_64-4.7.1-2416.tgz";
+    sha256 = "c3bf1a3a94f35586a3a8d2d28cdaf8c9514a8cf904a51fd74961e93909c9d2a4";
   };
 
   buildInputs = [ makeWrapper ];

From 9725e067ffff0e738e72dde462a7435591698ff8 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 2 Feb 2016 18:33:09 +0100
Subject: [PATCH 0979/2285] rustcMaster: build against bundled LLVM

This is a workaround for what appears to be issue rust-lang/rust#30970.

Without this change, rustcMaster will fail to build the clippy library
due to linking errors against LLVM (and ncurses, for some reason).

I expect this commit to be reverted once that issue is fixed upstream.
---
 pkgs/development/compilers/rustc/head.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index 4ef521218e68..4d2039669598 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -4,7 +4,7 @@
 callPackage ./generic.nix {
   shortVersion = "2016-02-01";
   isRelease = false;
-  forceBundledLLVM = false;
+  forceBundledLLVM = true;
   srcRev = "094c5b0d6";
   srcSha = "0908xzxb4q8vqwmzi5c2vzrhfsrw7d18r4n7mq3ir5671y9cqpvz";
 

From 06731dfcae15287aa42a06fc5fdd0224c01ca08d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Feb 2016 16:17:20 +0100
Subject: [PATCH 0980/2285] ec2: Don't use ephemeral disks for /nix unionfs

This is a regression introduced by merging the EBS and S3 images. The
EBS images had a special marker /.ebs to prevent the initrd from using
ephemeral storage for the unionfs, but this marker was missing in the
consolidated image.

The fix is to check the file ami-manifest-path on the metadata server
to see if we're an S3-based instance. This does require networking in
the initrd.

Issue #12613.
---
 nixos/modules/virtualisation/amazon-image.nix | 43 +++++++++++++++++--
 1 file changed, 39 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 7cb37bbc4a76..dd2cdd43f31c 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -8,7 +8,28 @@
 
 with lib;
 
-let cfg = config.ec2; in
+let
+
+  cfg = config.ec2;
+
+  udhcpcScript = pkgs.writeScript "udhcp-script"
+    ''
+      #! /bin/sh
+      if [ "$1" = bound ]; then
+        ip address add "$ip/$mask" dev "$interface"
+        if [ -n "$router" ]; then
+          ip route add default via "$router" dev "$interface"
+        fi
+        if [ -n "$dns" ]; then
+          rm -f /etc/resolv.conf
+          for i in $dns; do
+            echo "nameserver $dns" >> /etc/resolv.conf
+          done
+        fi
+      fi
+    '';
+
+in
 
 {
   imports = [ ../profiles/headless.nix ./ec2-data.nix ./amazon-grow-partition.nix ./amazon-init.nix ];
@@ -20,8 +41,10 @@ let cfg = config.ec2; in
       autoResize = true;
     };
 
-    boot.initrd.kernelModules = [ "xen-blkfront" ];
-    boot.kernelModules = [ "xen-netfront" ];
+    boot.initrd.kernelModules =
+      [ "xen-blkfront" "xen-netfront"
+        "af_packet" # <- required by udhcpc
+      ];
     boot.kernelParams = mkIf cfg.hvm [ "console=ttyS0" ];
 
     # Prevent the nouveau kernel module from being loaded, as it
@@ -55,6 +78,18 @@ let cfg = config.ec2; in
     # Nix operations.
     boot.initrd.postMountCommands =
       ''
+        metaDir=$targetRoot/etc/ec2-metadata
+        mkdir -m 0755 $targetRoot/etc
+        mkdir -m 0700 -p "$metaDir"
+
+        echo "getting EC2 instance metadata..."
+        ip link set eth0 up
+        udhcpc --interface eth0 --quit --now --script ${udhcpcScript}
+
+        if ! [ -e "$metaDir/ami-manifest-path" ]; then
+          wget -q -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path
+        fi
+
         diskNr=0
         diskForUnionfs=
         for device in /dev/xvd[abcde]*; do
@@ -85,7 +120,7 @@ let cfg = config.ec2; in
             mkdir -m 1777 -p $targetRoot/$diskForUnionfs/root/tmp $targetRoot/tmp
             mount --bind $targetRoot/$diskForUnionfs/root/tmp $targetRoot/tmp
 
-            if [ ! -e $targetRoot/.ebs ]; then
+            if [ "$(cat "$metaDir/ami-manifest-path")" != "(unknown)" ]; then
                 mkdir -m 755 -p $targetRoot/$diskForUnionfs/root/var $targetRoot/var
                 mount --bind $targetRoot/$diskForUnionfs/root/var $targetRoot/var
 

From a5d5736692a742a066f06902d55286a40e392543 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Feb 2016 17:19:58 +0100
Subject: [PATCH 0981/2285] Typo

---
 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 0ec0f35f1bd4..c76c6d0dd7f4 100644
--- a/pkgs/tools/networking/dropbear/default.nix
+++ b/pkgs/tools/networking/dropbear/default.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://matt.ucc.asn.au/dropbear/dropbear.html;
-    description = "An small footprint implementation of the SSH 2 protocol";
+    description = "A small footprint implementation of the SSH 2 protocol";
     license = licenses.mit;
     maintainers = with maintainers; [ abbradar ];
     platforms = platforms.unix;

From 901163c0c707d36323400394bf6e75adc4621e2f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Feb 2016 17:25:18 +0100
Subject: [PATCH 0982/2285] Split the initrd sshd support into a separate
 module

Also, drop boot.initrd.postEarlyDeviceCommands since preLVMCommands
should work fine.
---
 nixos/modules/module-list.nix                |   7 +-
 nixos/modules/system/boot/initrd-network.nix | 108 ++--------------
 nixos/modules/system/boot/initrd-ssh.nix     | 124 +++++++++++++++++++
 nixos/modules/system/boot/stage-1-init.sh    |   9 +-
 nixos/modules/system/boot/stage-1.nix        |  10 +-
 5 files changed, 144 insertions(+), 114 deletions(-)
 create mode 100644 nixos/modules/system/boot/initrd-ssh.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 2ff61877c23d..0780c1f4e423 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -460,10 +460,10 @@
   ./system/boot/coredump.nix
   ./system/boot/emergency-mode.nix
   ./system/boot/initrd-network.nix
+  ./system/boot/initrd-ssh.nix
   ./system/boot/kernel.nix
   ./system/boot/kexec.nix
   ./system/boot/loader/efi.nix
-  ./system/boot/loader/loader.nix
   ./system/boot/loader/generations-dir/generations-dir.nix
   ./system/boot/loader/generic-extlinux-compatible
   ./system/boot/loader/grub/grub.nix
@@ -471,15 +471,16 @@
   ./system/boot/loader/grub/memtest.nix
   ./system/boot/loader/gummiboot/gummiboot.nix
   ./system/boot/loader/init-script/init-script.nix
+  ./system/boot/loader/loader.nix
   ./system/boot/loader/raspberrypi/raspberrypi.nix
   ./system/boot/luksroot.nix
   ./system/boot/modprobe.nix
+  ./system/boot/networkd.nix
+  ./system/boot/resolved.nix
   ./system/boot/shutdown.nix
   ./system/boot/stage-1.nix
   ./system/boot/stage-2.nix
   ./system/boot/systemd.nix
-  ./system/boot/networkd.nix
-  ./system/boot/resolved.nix
   ./system/boot/timesyncd.nix
   ./system/boot/tmp.nix
   ./system/etc/etc.nix
diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix
index 6c6e2fafad43..e1e49bce6938 100644
--- a/nixos/modules/system/boot/initrd-network.nix
+++ b/nixos/modules/system/boot/initrd-network.nix
@@ -3,9 +3,11 @@
 with lib;
 
 let
+
   cfg = config.boot.initrd.network;
 
 in
+
 {
 
   options = {
@@ -21,75 +23,15 @@ in
       '';
     };
 
-    boot.initrd.network.ssh.enable = mkOption {
-      type = types.bool;
-      default = false;
+    boot.initrd.network.postCommands = mkOption {
+      default = "";
+      type = types.lines;
       description = ''
-        Start SSH service during initrd boot. It can be used to debug failing
-        boot on a remote server, enter pasphrase for an encrypted partition etc.
-        Service is killed when stage-1 boot is finished.
+        Shell commands to be executed after stage 1 of the
+        boot has initialised the network.
       '';
     };
 
-    boot.initrd.network.ssh.port = mkOption {
-      type = types.int;
-      default = 22;
-      description = ''
-        Port on which SSH initrd service should listen.
-      '';
-    };
-
-    boot.initrd.network.ssh.shell = mkOption {
-      type = types.str;
-      default = "/bin/ash";
-      description = ''
-        Login shell of the remote user. Can be used to limit actions user can do.
-      '';
-    };
-
-    boot.initrd.network.ssh.hostRSAKey = mkOption {
-      type = types.nullOr types.path;
-      default = null;
-      description = ''
-        RSA SSH private key file in the Dropbear format.
-
-        WARNING: This key is contained insecurely in the global Nix store. Do NOT
-        use your regular SSH host private keys for this purpose or you'll expose
-        them to regular users!
-      '';
-    };
-
-    boot.initrd.network.ssh.hostDSSKey = mkOption {
-      type = types.nullOr types.path;
-      default = null;
-      description = ''
-        DSS SSH private key file in the Dropbear format.
-
-        WARNING: This key is contained insecurely in the global Nix store. Do NOT
-        use your regular SSH host private keys for this purpose or you'll expose
-        them to regular users!
-      '';
-    };
-
-    boot.initrd.network.ssh.hostECDSAKey = mkOption {
-      type = types.nullOr types.path;
-      default = null;
-      description = ''
-        ECDSA SSH private key file in the Dropbear format.
-
-        WARNING: This key is contained insecurely in the global Nix store. Do NOT
-        use your regular SSH host private keys for this purpose or you'll expose
-        them to regular users!
-      '';
-    };
-
-    boot.initrd.network.ssh.authorizedKeys = mkOption {
-      type = types.listOf types.str;
-      default = config.users.extraUsers.root.openssh.authorizedKeys.keys;
-      description = ''
-        Authorized keys for the root user on initrd.
-      '';
-    };
 
   };
 
@@ -99,17 +41,9 @@ in
 
     boot.initrd.extraUtilsCommands = ''
       copy_bin_and_libs ${pkgs.mkinitcpio-nfs-utils}/bin/ipconfig
-    '' + optionalString cfg.ssh.enable ''
-      copy_bin_and_libs ${pkgs.dropbear}/bin/dropbear
-
-      cp -pv ${pkgs.glibc}/lib/libnss_files.so.* $out/lib
     '';
 
-    boot.initrd.extraUtilsCommandsTest = optionalString cfg.ssh.enable ''
-      $out/bin/dropbear -V
-    '';
-
-    boot.initrd.postEarlyDeviceCommands = ''
+    boot.initrd.preLVMCommands = ''
       # Search for interface definitions in command line
       for o in $(cat /proc/cmdline); do
         case $o in
@@ -118,32 +52,10 @@ in
             ;;
         esac
       done
-    '' + optionalString cfg.ssh.enable ''
-      if [ -n "$hasNetwork" ]; then
-        mkdir /dev/pts
-        mount -t devpts devpts /dev/pts
 
-        mkdir -p /etc
-        echo 'root:x:0:0:root:/root:${cfg.ssh.shell}' > /etc/passwd
-        echo '${cfg.ssh.shell}' > /etc/shells
-        echo 'passwd: files' > /etc/nsswitch.conf
-
-        mkdir -p /var/log
-        touch /var/log/lastlog
-
-        mkdir -p /etc/dropbear
-        ${optionalString (cfg.ssh.hostRSAKey != null) "ln -s ${cfg.ssh.hostRSAKey} /etc/dropbear/dropbear_rsa_host_key"}
-        ${optionalString (cfg.ssh.hostDSSKey != null) "ln -s ${cfg.ssh.hostDSSKey} /etc/dropbear/dropbear_dss_host_key"}
-        ${optionalString (cfg.ssh.hostECDSAKey != null) "ln -s ${cfg.ssh.hostECDSAKey} /etc/dropbear/dropbear_ecdsa_host_key"}
-
-        mkdir -p /root/.ssh
-        ${concatStrings (map (key: ''
-          echo -n ${escapeShellArg key} >> /root/.ssh/authorized_keys
-        '') cfg.ssh.authorizedKeys)}
-
-        dropbear -s -j -k -E -m -p ${toString cfg.ssh.port}
-      fi
+      ${cfg.postCommands}
     '';
 
   };
+
 }
diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix
new file mode 100644
index 000000000000..9f2fd4da9c4c
--- /dev/null
+++ b/nixos/modules/system/boot/initrd-ssh.nix
@@ -0,0 +1,124 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.boot.initrd.network.ssh;
+
+in
+
+{
+
+  options = {
+
+    boot.initrd.network.ssh.enable = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Start SSH service during initrd boot. It can be used to debug failing
+        boot on a remote server, enter pasphrase for an encrypted partition etc.
+        Service is killed when stage-1 boot is finished.
+      '';
+    };
+
+    boot.initrd.network.ssh.port = mkOption {
+      type = types.int;
+      default = 22;
+      description = ''
+        Port on which SSH initrd service should listen.
+      '';
+    };
+
+    boot.initrd.network.ssh.shell = mkOption {
+      type = types.str;
+      default = "/bin/ash";
+      description = ''
+        Login shell of the remote user. Can be used to limit actions user can do.
+      '';
+    };
+
+    boot.initrd.network.ssh.hostRSAKey = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      description = ''
+        RSA SSH private key file in the Dropbear format.
+
+        WARNING: This key is contained insecurely in the global Nix store. Do NOT
+        use your regular SSH host private keys for this purpose or you'll expose
+        them to regular users!
+      '';
+    };
+
+    boot.initrd.network.ssh.hostDSSKey = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      description = ''
+        DSS SSH private key file in the Dropbear format.
+
+        WARNING: This key is contained insecurely in the global Nix store. Do NOT
+        use your regular SSH host private keys for this purpose or you'll expose
+        them to regular users!
+      '';
+    };
+
+    boot.initrd.network.ssh.hostECDSAKey = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      description = ''
+        ECDSA SSH private key file in the Dropbear format.
+
+        WARNING: This key is contained insecurely in the global Nix store. Do NOT
+        use your regular SSH host private keys for this purpose or you'll expose
+        them to regular users!
+      '';
+    };
+
+    boot.initrd.network.ssh.authorizedKeys = mkOption {
+      type = types.listOf types.str;
+      default = config.users.extraUsers.root.openssh.authorizedKeys.keys;
+      description = ''
+        Authorized keys for the root user on initrd.
+      '';
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+
+    boot.initrd.extraUtilsCommands = ''
+      copy_bin_and_libs ${pkgs.dropbear}/bin/dropbear
+      cp -pv ${pkgs.glibc}/lib/libnss_files.so.* $out/lib
+    '';
+
+    boot.initrd.extraUtilsCommandsTest = ''
+      $out/bin/dropbear -V
+    '';
+
+    boot.initrd.network.postCommands = ''
+      if [ -n "$hasNetwork" ]; then
+        mkdir /dev/pts
+        mount -t devpts devpts /dev/pts
+
+        echo '${cfg.shell}' > /etc/shells
+
+        mkdir -p /var/log
+        touch /var/log/lastlog
+
+        mkdir -p /etc/dropbear
+        ${optionalString (cfg.hostRSAKey != null) "ln -s ${cfg.hostRSAKey} /etc/dropbear/dropbear_rsa_host_key"}
+        ${optionalString (cfg.hostDSSKey != null) "ln -s ${cfg.hostDSSKey} /etc/dropbear/dropbear_dss_host_key"}
+        ${optionalString (cfg.hostECDSAKey != null) "ln -s ${cfg.hostECDSAKey} /etc/dropbear/dropbear_ecdsa_host_key"}
+
+        mkdir -p /root/.ssh
+        ${concatStrings (map (key: ''
+          echo -n ${escapeShellArg key} >> /root/.ssh/authorized_keys
+        '') cfg.authorizedKeys)}
+
+        dropbear -s -j -k -E -m -p ${toString cfg.port}
+      fi
+    '';
+
+  };
+
+}
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 7fb368e8c44f..c3d402eca042 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -72,6 +72,11 @@ mkdir -p /run
 mount -t tmpfs -o "mode=0755,size=@runSize@" tmpfs /run
 
 
+# Initialise /etc.
+echo 'root:x:0:0:root:/root:${cfg.shell}' > /etc/passwd
+echo 'passwd: files' > /etc/nsswitch.conf
+
+
 # Process the kernel command line.
 export stage2Init=/init
 for o in $(cat /proc/cmdline); do
@@ -150,10 +155,6 @@ udevadm trigger --action=add
 udevadm settle
 
 
-# Additional devices initialization.
-@postEarlyDeviceCommands@
-
-
 # Load boot-time keymap before any LVM/LUKS initialization
 @extraUtils@/bin/busybox loadkmap < "@busyboxKeymap@"
 
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index baa5bf6c69fd..98ef7ba024b4 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -199,7 +199,7 @@ let
     inherit (config.boot) resumeDevice devSize runSize;
 
     inherit (config.boot.initrd) checkJournalingFS
-      preLVMCommands preDeviceCommands postEarlyDeviceCommands postDeviceCommands postMountCommands kernelModules;
+      preLVMCommands preDeviceCommands postDeviceCommands postMountCommands kernelModules;
 
     resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}")
                     (filter (sd: (sd ? label || hasPrefix "/dev/" sd.device) && !sd.randomEncryption) config.swapDevices);
@@ -318,14 +318,6 @@ in
       '';
     };
 
-    boot.initrd.postEarlyDeviceCommands = mkOption {
-      default = "";
-      type = types.lines;
-      description = ''
-        Shell commands to be executed early after creation of device nodes.
-      '';
-    };
-
     boot.initrd.postMountCommands = mkOption {
       default = "";
       type = types.lines;

From cc925d0506ab2a049d5ee55c1173950073ed307f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Feb 2016 19:03:13 +0100
Subject: [PATCH 0983/2285] boot.initrd.network: Support DHCP

This allows us to use it for EC2 instances.
---
 nixos/modules/system/boot/initrd-network.nix  | 67 ++++++++++++++-----
 nixos/modules/virtualisation/amazon-image.nix | 34 ++--------
 nixos/release.nix                             |  1 +
 nixos/tests/ec2.nix                           | 12 ++--
 nixos/tests/initrd-network.nix                | 22 ++++++
 5 files changed, 88 insertions(+), 48 deletions(-)
 create mode 100644 nixos/tests/initrd-network.nix

diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix
index e1e49bce6938..abf88734a558 100644
--- a/nixos/modules/system/boot/initrd-network.nix
+++ b/nixos/modules/system/boot/initrd-network.nix
@@ -6,6 +6,23 @@ let
 
   cfg = config.boot.initrd.network;
 
+  udhcpcScript = pkgs.writeScript "udhcp-script"
+    ''
+      #! /bin/sh
+      if [ "$1" = bound ]; then
+        ip address add "$ip/$mask" dev "$interface"
+        if [ -n "$router" ]; then
+          ip route add default via "$router" dev "$interface"
+        fi
+        if [ -n "$dns" ]; then
+          rm -f /etc/resolv.conf
+          for i in $dns; do
+            echo "nameserver $dns" >> /etc/resolv.conf
+          done
+        fi
+      fi
+    '';
+
 in
 
 {
@@ -16,10 +33,13 @@ in
       type = types.bool;
       default = false;
       description = ''
-        Add network connectivity support to initrd.
-
-        Network options are configured via <literal>ip</literal> kernel
-        option, according to the kernel documentation.
+        Add network connectivity support to initrd. The network may be
+        configured using the <literal>ip</literal> kernel parameter,
+        as described in <link
+        xlink:href="https://www.kernel.org/doc/Documentation/filesystems/nfs/nfsroot.txt">the
+        kernel documentation</link>.  Otherwise, if
+        <option>networking.useDHCP</option> is enabled, an IP address
+        is acquired using DHCP.
       '';
     };
 
@@ -43,18 +63,35 @@ in
       copy_bin_and_libs ${pkgs.mkinitcpio-nfs-utils}/bin/ipconfig
     '';
 
-    boot.initrd.preLVMCommands = ''
-      # Search for interface definitions in command line
-      for o in $(cat /proc/cmdline); do
-        case $o in
-          ip=*)
-            ipconfig $o && hasNetwork=1
-            ;;
-        esac
-      done
+    boot.initrd.preLVMCommands =
+      # Search for interface definitions in command line.
+      ''
+        for o in $(cat /proc/cmdline); do
+          case $o in
+            ip=*)
+              ipconfig $o && hasNetwork=1
+              ;;
+          esac
+        done
+      ''
 
-      ${cfg.postCommands}
-    '';
+      # Otherwise, use DHCP.
+      + optionalString config.networking.useDHCP ''
+        if [ -z "$hasNetwork" ]; then
+
+          # Bring up all interfaces.
+          for iface in $(cd /sys/class/net && ls); do
+            echo "bringing up network interface $iface..."
+            ip link set "$iface" up
+          done
+
+          # Acquire a DHCP lease.
+          echo "acquiring IP address via DHCP..."
+          udhcpc --quit --now --script ${udhcpcScript}
+        fi
+      ''
+
+      + cfg.postCommands;
 
   };
 
diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index dd2cdd43f31c..7d16206517d4 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -8,28 +8,7 @@
 
 with lib;
 
-let
-
-  cfg = config.ec2;
-
-  udhcpcScript = pkgs.writeScript "udhcp-script"
-    ''
-      #! /bin/sh
-      if [ "$1" = bound ]; then
-        ip address add "$ip/$mask" dev "$interface"
-        if [ -n "$router" ]; then
-          ip route add default via "$router" dev "$interface"
-        fi
-        if [ -n "$dns" ]; then
-          rm -f /etc/resolv.conf
-          for i in $dns; do
-            echo "nameserver $dns" >> /etc/resolv.conf
-          done
-        fi
-      fi
-    '';
-
-in
+let cfg = config.ec2; in
 
 {
   imports = [ ../profiles/headless.nix ./ec2-data.nix ./amazon-grow-partition.nix ./amazon-init.nix ];
@@ -41,10 +20,7 @@ in
       autoResize = true;
     };
 
-    boot.initrd.kernelModules =
-      [ "xen-blkfront" "xen-netfront"
-        "af_packet" # <- required by udhcpc
-      ];
+    boot.initrd.kernelModules = [ "xen-blkfront" "xen-netfront" ];
     boot.kernelParams = mkIf cfg.hvm [ "console=ttyS0" ];
 
     # Prevent the nouveau kernel module from being loaded, as it
@@ -67,6 +43,8 @@ in
         kill -9 -1
       '';
 
+    boot.initrd.network.enable = true;
+
     # Mount all formatted ephemeral disks and activate all swap devices.
     # We cannot do this with the ‘fileSystems’ and ‘swapDevices’ options
     # because the set of devices is dependent on the instance type
@@ -79,12 +57,10 @@ in
     boot.initrd.postMountCommands =
       ''
         metaDir=$targetRoot/etc/ec2-metadata
-        mkdir -m 0755 $targetRoot/etc
+        mkdir -m 0755 -p $targetRoot/etc
         mkdir -m 0700 -p "$metaDir"
 
         echo "getting EC2 instance metadata..."
-        ip link set eth0 up
-        udhcpc --interface eth0 --quit --now --script ${udhcpcScript}
 
         if ! [ -e "$metaDir/ami-manifest-path" ]; then
           wget -q -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path
diff --git a/nixos/release.nix b/nixos/release.nix
index 9c15b1ea0746..d9f3e46b27c0 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -248,6 +248,7 @@ in rec {
   tests.ipv6 = callTest tests/ipv6.nix {};
   tests.jenkins = callTest tests/jenkins.nix {};
   tests.kde4 = callTest tests/kde4.nix {};
+  tests.initrdNetwork = callTest tests/initrd-network.nix {};
   tests.kubernetes = hydraJob (import tests/kubernetes.nix { system = "x86_64-linux"; });
   tests.latestKernel.login = callTest tests/login.nix { latestKernel = true; };
   #tests.lightdm = callTest tests/lightdm.nix {};
diff --git a/nixos/tests/ec2.nix b/nixos/tests/ec2.nix
index 1925ab37419a..0a95d6cfeff4 100644
--- a/nixos/tests/ec2.nix
+++ b/nixos/tests/ec2.nix
@@ -10,9 +10,10 @@ let
       inherit system;
       modules = [
         ../maintainers/scripts/ec2/amazon-image.nix
-        ../../nixos/modules/testing/test-instrumentation.nix
-        { boot.initrd.kernelModules = [ "virtio" "virtio_blk" "virtio_pci" "virtio_ring" ];
-          ec2.hvm = true;
+        ../modules/testing/test-instrumentation.nix
+        ../modules/profiles/minimal.nix
+        ../modules/profiles/qemu-guest.nix
+        { ec2.hvm = true;
 
           # Hack to make the partition resizing work in QEMU.
           boot.initrd.postDeviceCommands = mkBefore
@@ -33,6 +34,7 @@ let
           ln -s ${pkgs.writeText "userData" userData} $out/2011-01-01/user-data
           mkdir -p $out/1.0/meta-data
           echo "${hostname}" > $out/1.0/meta-data/hostname
+          echo "(unknown)" > $out/1.0/meta-data/ami-manifest-path
         '' + optionalString (sshPublicKey != null) ''
           mkdir -p $out/1.0/meta-data/public-keys/0
           ln -s ${pkgs.writeText "sshPublicKey" sshPublicKey} $out/1.0/meta-data/public-keys/0/openssh-key
@@ -56,7 +58,7 @@ let
           # again when it deletes link-local addresses.) Ideally we'd
           # turn off the DHCP server, but qemu does not have an option
           # to do that.
-          my $startCommand = "qemu-kvm -m 768 -net nic -net 'user,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'";
+          my $startCommand = "qemu-kvm -m 768 -net nic,vlan=0,model=virtio -net 'user,vlan=0,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${pkgs.micro-httpd}/bin/micro_httpd ${metaData}'";
           $startCommand .= " -drive file=$diskImage,if=virtio,werror=report";
           $startCommand .= " \$QEMU_OPTS";
 
@@ -92,6 +94,8 @@ in {
       $machine->waitForFile("/root/user-data");
       $machine->waitForUnit("sshd.service");
 
+      $machine->succeed("grep unknown /etc/ec2-metadata/ami-manifest-path");
+
       # We have no keys configured on the client side yet, so this should fail
       $machine->fail("ssh -o BatchMode=yes localhost exit");
 
diff --git a/nixos/tests/initrd-network.nix b/nixos/tests/initrd-network.nix
new file mode 100644
index 000000000000..db9f572d3c2f
--- /dev/null
+++ b/nixos/tests/initrd-network.nix
@@ -0,0 +1,22 @@
+import ./make-test.nix ({ pkgs, ...} : {
+  name = "initrd-network";
+
+  meta.maintainers = [ pkgs.stdenv.lib.maintainers.eelco ];
+
+  machine = { config, pkgs, ... }: {
+    imports = [ ../modules/profiles/minimal.nix ];
+    boot.initrd.network.enable = true;
+    boot.initrd.network.postCommands =
+      ''
+        ip addr | grep 10.0.2.15 || exit 1
+        ping -c1 10.0.2.2 || exit 1
+      '';
+  };
+
+  testScript =
+    ''
+      startAll;
+      $machine->waitForUnit("multi-user.target");
+      $machine->succeed("ip link >&2");
+    '';
+})

From e618492168657c8617e5b3bec05d6bc14233ef14 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 2 Feb 2016 19:10:00 +0100
Subject: [PATCH 0984/2285] Revert "Do not relocate /nix and /tmp to small
 disks on AWS"

This reverts commit f10bead8fd068f2cb82cbdc1a938a67bd967974c because
it doesn't work - there is no lsblk in the initrd, and there is a
missing backslash.
---
 nixos/modules/virtualisation/amazon-image.nix | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 7d16206517d4..2f6a95786a2c 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -79,11 +79,7 @@ let cfg = config.ec2; in
                 diskNr=$((diskNr + 1))
                 echo "mounting $device on $mp..."
                 if mountFS "$device" "$mp" "" ext3; then
-                    if [ -z "$diskForUnionfs" -a \
-                         $(lsblk -bno size $device) -gt $(lsblk -bno size /dev/xvda1)
-                       ]; then
-                       diskForUnionfs="$mp";
-                    fi
+                    if [ -z "$diskForUnionfs" ]; then diskForUnionfs="$mp"; fi
                 fi
             else
                 echo "skipping unknown device type $device"

From 7e4f0b046ed848860b81e8236753bf146e70e488 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 2 Feb 2016 21:05:44 +0100
Subject: [PATCH 0985/2285] darling-dmg: cleanup

Version was wrong. Bumped to current version 1.0.4.

See #11561 for details.
---
 pkgs/tools/filesystems/darling-dmg/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/filesystems/darling-dmg/default.nix b/pkgs/tools/filesystems/darling-dmg/default.nix
index a8c9c03fc729..74e7686a3d17 100644
--- a/pkgs/tools/filesystems/darling-dmg/default.nix
+++ b/pkgs/tools/filesystems/darling-dmg/default.nix
@@ -1,16 +1,20 @@
-{ stdenv, fetchFromGitHub, lib, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } :
+{ stdenv, fetchFromGitHub, cmake, fuse, zlib, bzip2, openssl, libxml2, icu } :
 
 stdenv.mkDerivation rec {
   name = "darling-dmg-${version}";
-  version = "1.0";
+  version = "1.0.4";
+
   src = fetchFromGitHub {
     owner = "darlinghq";
     repo = "darling-dmg";
-    rev = "9522e3907b82f6cde141b3e0e0063f09c8710cbf";
-    sha256 = "5d968b0609f9bfbecc26753d21b5182e15183b672967f7dec6038404cd6a6d7f";
+    rev = "v${version}";
+    sha256 = "0x285p16zfnp0p6injw1frc8krif748sfgxhdd7gb75kz0dfbkrk";
   };
+
   buildInputs = [ cmake fuse openssl zlib bzip2 libxml2 icu ];
+
   cmakeConfigureFlagFlags = ["-DCMAKE_BUILD_TYPE=RELEASE"];
+
   meta = {
     homepage = http://www.darlinghq.org/;
     description = "Darling lets you open OS X dmgs on Linux";

From f5c82a0c28c89d3e6ce6163298ead3d4990c6174 Mon Sep 17 00:00:00 2001
From: Matthew O'Gorman <mog@rldn.net>
Date: Tue, 2 Feb 2016 15:13:07 -0500
Subject: [PATCH 0986/2285] sopel: 6.2.1 -> 6.3.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 916ac7126487..d49ef6c1c50f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18955,11 +18955,11 @@ in modules // {
   };
 
   sopel = buildPythonPackage rec {
-    name = "sopel-6.2.1";
+    name = "sopel-6.3.0";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/s/sopel/${name}.tar.gz";
-      sha256 = "06m5clmg9x0bsnhvl5d75mskwqnxvkdd00p0dqnpwip9vmq6n8cz";
+      sha256 = "10g3p603qiz4whacknnslmkza5y1f7a8blq1q07dfrny4442c6nb";
     };
 
     buildInputs = with self; [ pytest ];

From bb64f135b12a7d795754245ee61927262d8768e0 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 2 Feb 2016 21:13:49 +0100
Subject: [PATCH 0987/2285] pythonPackages.requests_toolbelt: 0.4.0 -> 0.6.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b373c72b3a15..d0b6f82788f3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17042,12 +17042,12 @@ in modules // {
   };
 
   requests_toolbelt = buildPythonPackage rec {
-    version = "0.4.0";
+    version = "0.6.0";
     name = "requests-toolbelt-${version}";
 
     src = pkgs.fetchurl {
       url = "https://github.com/sigmavirus24/requests-toolbelt/archive/${version}.tar.gz";
-      sha256 = "0zvfz4c9lqiwh2qh51rba6ckpjl3pbp9fcm0ri58qhcjd8mh8k34";
+      sha256 = "192pz6i1fp8vc1qasg6ccxpdsmpbqi3fqf5bgx3vpadp5x0rrz4f";
     };
 
     propagatedBuildInputs = with self; [ requests2 ];

From aa6deb40e8516246a9aa300a2a680b1f62d9cd6e Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 2 Feb 2016 21:14:02 +0100
Subject: [PATCH 0988/2285] vdirsyncer: 0.7.3 -> 0.8.1

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

diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index 04e88fd98d5f..890186992637 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "0.7.3";
+  version = "0.8.1";
   name = "vdirsyncer-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://pypi.python.org/packages/source/v/vdirsyncer/${name}.tar.gz";
-    sha256 = "0ahi5ngqwsrv30bgziz35dx4gif7rbn9vqv340pigbzmywjxz1ry";
+    sha256 = "1abflqw6x30xd2dlj58cr5n62x98kc0ia9f9vr8l64k2z1fjlq78";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From 51e0077e79975649df8c0127a39065cf001c599e Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 2 Feb 2016 21:19:35 +0100
Subject: [PATCH 0989/2285] khard: 0.6.3 -> 0.8.1

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

diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index ac566c9609be..0c88314ed02e 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pkgs, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "0.6.3";
+  version = "0.8.1";
   name = "khard-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://github.com/scheibler/khard/archive/v${version}.tar.gz";
-    sha256 = "1dn1v4ycgqbq8vknz1dy710asq8cizxmzaynn69xknwkpgda7fm9";
+    sha256 = "13axfrs96isirx0c483545xdmjwwfq1k7yy92xpk7l184v71rgi1";
   };
 
   propagatedBuildInputs = with pythonPackages; [
@@ -18,6 +18,7 @@ pythonPackages.buildPythonPackage rec {
 
   buildInputs = with pythonPackages; [
     pkgs.vdirsyncer
+    pyyaml
   ];
 
   meta = {

From 0c2ac149a3936987f3f5c253847fe052ee3afd00 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 2 Feb 2016 21:21:38 +0100
Subject: [PATCH 0990/2285] hstr: 1.17 -> 1.19

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

diff --git a/pkgs/applications/misc/hstr/default.nix b/pkgs/applications/misc/hstr/default.nix
index bf2fd97f26ee..e2290ac01e85 100644
--- a/pkgs/applications/misc/hstr/default.nix
+++ b/pkgs/applications/misc/hstr/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, readline, ncurses }:
 
 let
-  version = "1.17";
+  version = "1.19";
 in
 stdenv.mkDerivation rec {
 
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/dvorka/hstr/releases/download/${version}/hh-${version}-src.tgz";
-    sha256 = "0vjc4d8cl3sfbv9lywdpd2slffqyp3cpj52yp29g9lr2n3nfksk8";
+    sha256 = "0ix6550l9si29j8vz375vzjmp22i19ik5dq2nh7zsj2ra7ibaz5n";
   };
 
   buildInputs = [ readline ncurses ];

From 133ad6d7221b1f0ba8dd994eb2c2b9724f9e7d05 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 2 Feb 2016 21:22:42 +0100
Subject: [PATCH 0991/2285] geolite-legacy 2016-02-01 -> 2016-02-02

---
 pkgs/data/misc/geolite-legacy/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/data/misc/geolite-legacy/default.nix b/pkgs/data/misc/geolite-legacy/default.nix
index f0bf2834bed8..b8d07106565b 100644
--- a/pkgs/data/misc/geolite-legacy/default.nix
+++ b/pkgs/data/misc/geolite-legacy/default.nix
@@ -8,20 +8,20 @@ let
 in
 stdenv.mkDerivation rec {
   name = "geolite-legacy-${version}";
-  version = "2016-02-01";
+  version = "2016-02-02";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
-    "07h1ha7z9i877ph41fw4blcfb11ynv8k9snrrsgsjrvv2yqvsc37";
+    "00y8j0jxk60wscm6wiz3mmmj5xfvwqnmxjm2ar8ngkl8mxzl12gm";
   srcGeoIPv6 = fetchDB
     "GeoIPv6.dat.gz" "GeoIPv6.dat.gz"
-    "14wsc0w8ir5q1lq6d9bpr03qvrbi2i0g04gkfcwbnh63yqxc31m9";
+    "0l6wv246kzm63qqmqr9lzpbvbanfwfkvn9bj34jn2djp4rfrkjrf";
   srcGeoLiteCity = fetchDB
     "GeoLiteCity.dat.xz" "GeoIPCity.dat.xz"
-    "1nra64shc3bp1d6vk9rdv7wyd8jmkgsybqgr3imdg7fv837kwvnh";
+    "1095jar3vyax0gmj7wc0w28rpjmq2j1b6wk5yfaghyl87mad5q0f";
   srcGeoLiteCityv6 = fetchDB
     "GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz" "GeoIPCityv6.dat.gz"
-    "1fksbnmda2a05cpax41h9r7jhi8102q41kl5nij4ai42d6yqy73x";
+    "0fnlznn04lpkkd7sy9r9kdl3fcp8ix7msdrncwgz26dh537ml32z";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
     "1h47n8fn9dfjw672jbw67mn03bidaahwnkra464ggy1q4pwkvncs";

From 61bef57edbbbab67ba02d378d9cc93afcac14702 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 2 Feb 2016 21:23:07 +0100
Subject: [PATCH 0992/2285] ctodo: 1.1 -> 1.2

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

diff --git a/pkgs/applications/misc/ctodo/default.nix b/pkgs/applications/misc/ctodo/default.nix
index 7301ea704e85..6b22f3b27ee8 100644
--- a/pkgs/applications/misc/ctodo/default.nix
+++ b/pkgs/applications/misc/ctodo/default.nix
@@ -1,14 +1,14 @@
 { stdenv, cmake, fetchurl, ncurses }:
 
 let
-  version = "1.1";
+  version = "1.2";
 in
 stdenv.mkDerivation {
   name = "ctodo-${version}";
 
   src = fetchurl {
-    url = "https://github.com/Acolarh/ctodo/archive/v1.1.tar.gz";
-    sha256 = "1sv5p1b08pp73qshakz4qy4pjglxz2pvx2cjfx52i3532hd3xcaf";
+    url = "https://github.com/Acolarh/ctodo/archive/v${version}.tar.gz";
+    sha256 = "0kjd84q8aw238z09yz9n1p732fh08vijaf8bk1xqlx544cgyfcjm";
   };
 
   buildInputs = [ stdenv cmake ncurses ];

From 593f8dba06b422c3d6f6798fa2c72fa578f7fbf7 Mon Sep 17 00:00:00 2001
From: Matthew O'Gorman <mog@rldn.net>
Date: Tue, 2 Feb 2016 15:31:43 -0500
Subject: [PATCH 0993/2285] platformio: 2.8.1 -> 2.8.3

---
 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 916ac7126487..e3d7bee328da 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14790,13 +14790,13 @@ in modules // {
 
   platformio =  buildPythonPackage rec {
     name = "platformio-${version}";
-    version="2.8.1";
+    version="2.8.3";
 
     disabled = isPy3k || isPyPy;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/platformio/platformio-${version}.tar.gz";
-      sha256 = "0lx0cg2jyvikpcp9jjzrzgb89hvnn4ri84708d37xvzqsr0ml1fa";
+      sha256 = "1lz5f7xc53bk8ri4806xfpisvhyqdxdniwk0ywifinnhzx47jgp7";
      };
 
      propagatedBuildInputs = with self; [ click_5 requests2 bottle pyserial lockfile colorama];

From 11f95e1681d457ab474235eaef9fa8e52af1d86e Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 2 Feb 2016 21:33:09 +0100
Subject: [PATCH 0994/2285] mdp: 1.0.1 -> 1.0.4

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

diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix
index a7617ec83587..1a89bda888ee 100644
--- a/pkgs/applications/misc/mdp/default.nix
+++ b/pkgs/applications/misc/mdp/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.1";
+  version = "1.0.4";
   name = "mdp-${version}";
 
   src = fetchurl {
     url = "https://github.com/visit1985/mdp/archive/${version}.tar.gz";
-    sha256 = "0vmr0ymq06r50yags9nv6fk4f890b82a7bvxg697vrgs04i2x4dy";
+    sha256 = "1wvys3sb0ki7zz5b0y4bl9x6jdj7h88lxsf8vap95k1sj2ymanlm";
   };
 
   makeFlags = "PREFIX=$(out)";

From 7db1cba057d0184c2195f69b98b7fe124e409f98 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 26 Jul 2015 02:36:19 +0300
Subject: [PATCH 0995/2285] kernel: Let the kernel build system strip modules

Since commit 48f51f118506 we let the kernel build system compress the
modules, which makes the original strip expression not work. Let the
kernel build system strip them as well so they get stripped.
---
 pkgs/os-specific/linux/kernel/manual-config.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 2b1e55a880a0..238b7ecd242c 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -129,6 +129,9 @@ let
         mkdir -p $out/dtbs
         cp $buildRoot/arch/$karch/boot/dts/*.dtb $out/dtbs
       '' else "") + (if isModular then ''
+        if [ -z "$dontStrip" ]; then
+          installFlagsArray+=("INSTALL_MOD_STRIP=1")
+        fi
         make modules_install $makeFlags "''${makeFlagsArray[@]}" \
           $installFlags "''${installFlagsArray[@]}"
         unlink $out/lib/modules/${modDirVersion}/build
@@ -190,9 +193,6 @@ let
       # !!! This leaves references to gcc in $dev
       # that we might be able to avoid
       postFixup = if isModular then ''
-        if [ -z "$dontStrip" ]; then
-            find $out -name "*.ko" -print0 | xargs -0 -r ''${crossConfig+$crossConfig-}strip -S
-        fi
         # !!! Should this be part of stdenv? Also patchELF should take an argument...
         prefix=$dev
         patchELF

From 40879a95ee017d45eb49d54ef9ca89651ea4ac39 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 3 Feb 2016 03:57:06 +0200
Subject: [PATCH 0996/2285] acl: Add platforms

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

diff --git a/pkgs/development/libraries/acl/default.nix b/pkgs/development/libraries/acl/default.nix
index d37d8926fbdc..f6445874913a 100644
--- a/pkgs/development/libraries/acl/default.nix
+++ b/pkgs/development/libraries/acl/default.nix
@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://savannah.nongnu.org/projects/acl;
     description = "Library and tools for manipulating access control lists";
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From 3a98ff3c21cd6935ee8463c45de188af3b15a30b Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 3 Feb 2016 03:57:52 +0200
Subject: [PATCH 0997/2285] attr: Add platforms

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

diff --git a/pkgs/development/libraries/attr/default.nix b/pkgs/development/libraries/attr/default.nix
index 8d87e2ee50dd..3c69a7328b23 100644
--- a/pkgs/development/libraries/attr/default.nix
+++ b/pkgs/development/libraries/attr/default.nix
@@ -17,5 +17,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://savannah.nongnu.org/projects/attr/;
     description = "Library and tools for manipulating extended attributes";
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From 37fbf0e24fd015d81316bebc0355c41c3ecf4329 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 3 Feb 2016 04:25:54 +0200
Subject: [PATCH 0998/2285] dtc: Builds on Darwin

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

diff --git a/pkgs/development/compilers/dtc/default.nix b/pkgs/development/compilers/dtc/default.nix
index 59c85d03d4ba..6daf7a6115a3 100644
--- a/pkgs/development/compilers/dtc/default.nix
+++ b/pkgs/development/compilers/dtc/default.nix
@@ -19,6 +19,6 @@ stdenv.mkDerivation rec {
     homepage = https://git.kernel.org/cgit/utils/dtc/dtc.git;
     license = licenses.gpl2; # dtc itself is GPLv2, libfdt is dual GPL/BSD
     maintainers = [ maintainers.dezgeg ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From 0b971a813462caedd0a1fd50b1f825d8d34217f4 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Wed, 3 Feb 2016 04:26:05 +0200
Subject: [PATCH 0999/2285] ckbcomp: Builds on Darwin

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

diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix
index 474486b6d6ce..87161a6442a4 100644
--- a/pkgs/tools/X11/ckbcomp/default.nix
+++ b/pkgs/tools/X11/ckbcomp/default.nix
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
     homepage = http://anonscm.debian.org/cgit/d-i/console-setup.git;
     license = licenses.gpl2Plus;
     maintainers = with stdenv.lib.maintainers; [ dezgeg ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From 00a94745948159700516e559cc0cf5e6c69429a3 Mon Sep 17 00:00:00 2001
From: Jason Ziglar <jpz@vt.edu>
Date: Tue, 2 Feb 2016 22:43:26 -0500
Subject: [PATCH 1000/2285] Modifying nanomsg to build under unix, to support
 Mac OS X.

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

diff --git a/pkgs/development/libraries/nanomsg/default.nix b/pkgs/development/libraries/nanomsg/default.nix
index 4d9e49a54d92..89fdd334f954 100644
--- a/pkgs/development/libraries/nanomsg/default.nix
+++ b/pkgs/development/libraries/nanomsg/default.nix
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
     description= "Socket library that provides several common communication patterns";
     homepage = http://nanomsg.org/;
     license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
   };
 }

From cb7b811c438dbebad0cbf65b8d2f7c27a5b330a7 Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Wed, 3 Feb 2016 11:25:07 +0700
Subject: [PATCH 1001/2285] remove unused file bundler-head.nix (bundler_HEAD
 is now just an alias for bundler)

---
 .../interpreters/ruby/bundler-head.nix         | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 pkgs/development/interpreters/ruby/bundler-head.nix

diff --git a/pkgs/development/interpreters/ruby/bundler-head.nix b/pkgs/development/interpreters/ruby/bundler-head.nix
deleted file mode 100644
index e31f63dccf06..000000000000
--- a/pkgs/development/interpreters/ruby/bundler-head.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ buildRubyGem, coreutils, fetchgit }:
-
-buildRubyGem {
-  name = "bundler-2015-01-11";
-  src = fetchgit {
-    url = "https://github.com/bundler/bundler.git";
-    rev = "a2343c9eabf5403d8ffcbca4dea33d18a60fc157";
-    sha256 = "06qsai4ac3i2xlr7nbc4anh4cy6jd9jjf3rpj254g9gwshqv0qgr";
-    leaveDotGit = true;
-  };
-  dontPatchShebangs = true;
-  postInstall = ''
-    find $out -type f -perm -0100 | while read f; do
-      substituteInPlace $f \
-         --replace "/usr/bin/env" "${coreutils}/bin/env"
-    done
-  '';
-}

From 55c4bf166ae61bcf3904e8b3d2b5691dac6b5724 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Wed, 3 Feb 2016 04:34:50 +0000
Subject: [PATCH 1002/2285] cmocka: init at 1.0.1

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

diff --git a/pkgs/development/libraries/cmocka/default.nix b/pkgs/development/libraries/cmocka/default.nix
new file mode 100644
index 000000000000..4e3f5b219e92
--- /dev/null
+++ b/pkgs/development/libraries/cmocka/default.nix
@@ -0,0 +1,48 @@
+{ fetchurl, stdenv, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "cmocka-${version}";
+  version = "1.0.1";
+
+  src = fetchurl {
+    url = "https://cmocka.org/files/1.0/cmocka-${version}.tar.xz";
+    sha256 = "0fvm6rdalqcxckbddch8ycdw6n2ckldblv117n09chi2l7bm0q5k";
+  };
+
+  buildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "Lightweight library to simplify and generalize unit tests for C";
+
+    longDescription =
+      ''There are a variety of C unit testing frameworks available however
+        many of them are fairly complex and require the latest compiler
+        technology.  Some development requires the use of old compilers which
+        makes it difficult to use some unit testing frameworks. In addition
+        many unit testing frameworks assume the code being tested is an
+        application or module that is targeted to the same platform that will
+        ultimately execute the test.  Because of this assumption many
+        frameworks require the inclusion of standard C library headers in the
+        code module being tested which may collide with the custom or
+        incomplete implementation of the C library utilized by the code under
+        test.
+
+        Cmocka only requires a test application is linked with the standard C
+        library which minimizes conflicts with standard C library headers.
+        Also, CMocka tries to avoid the use of some of the newer features of
+        C compilers.
+
+        This results in CMocka being a relatively small library that can be
+        used to test a variety of exotic code. If a developer wishes to
+        simply test an application with the latest compiler then other unit
+        testing frameworks may be preferable.
+
+        This is the successor of Google's Cmockery.'';
+
+    homepage = https://cmocka.org/;
+
+    license = licenses.asl20;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ kragniz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a14986b6b311..7df8d8a0a364 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6290,6 +6290,8 @@ let
 
   cminpack = callPackage ../development/libraries/cminpack { };
 
+  cmocka = callPackage ../development/libraries/cmocka { };
+
   cogl = callPackage ../development/libraries/cogl { };
 
   cogl_1_20 = callPackage ../development/libraries/cogl/1.20.nix { };

From 78eb1a076d18e79fefbc82c5d3e1bb90b02a9d8c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 2 Feb 2016 23:05:30 +0100
Subject: [PATCH 1003/2285] cln: 1.3.3 -> 1.3.4

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

diff --git a/pkgs/development/libraries/cln/default.nix b/pkgs/development/libraries/cln/default.nix
index 982deb29ea8c..c6523921fb56 100644
--- a/pkgs/development/libraries/cln/default.nix
+++ b/pkgs/development/libraries/cln/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, gmp }:
 
 stdenv.mkDerivation rec {
-  name = "cln-1.3.3";
+  name = "cln-${version}";
+  version = "1.3.4";
 
   src = fetchurl {
     url = "${meta.homepage}${name}.tar.bz2";
-    sha256 = "04i6kdjwm4cr5pa70pilifnpvsh430rrlapkgw1x8c5vxkijxz2p";
+    sha256 = "0j5p18hwbbrchsdbnc8d2bf9ncslhflri4i950gdnq7v6g2dg69d";
   };
 
   buildInputs = [ gmp ];

From e4ab8aee62fe65252b40861900decc7e880517a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 1 Feb 2016 12:31:17 +0100
Subject: [PATCH 1004/2285] add ensureNewerSourcesHook and apply to all python

Fixes #12663: problems in python stuff due to old timestamps in sources.
- Files in sources older than a certain year are set to that year.
- Applied with 1980 for all python packages due to the way it often uses zip.
---
 pkgs/development/python-modules/generic/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix                     | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index dab20b2f7447..15f369a44f2d 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -3,7 +3,8 @@
    (http://pypi.python.org/pypi/setuptools/), which represents a large
    number of Python packages nowadays.  */
 
-{ python, setuptools, unzip, wrapPython, lib, bootstrapped-pip }:
+{ python, setuptools, unzip, wrapPython, lib, bootstrapped-pip
+, ensureNewerSourcesHook }:
 
 { name
 
@@ -60,6 +61,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] //
   name = namePrefix + name;
 
   buildInputs = [ wrapPython bootstrapped-pip ] ++ buildInputs ++ pythonPath
+    ++ [ (ensureNewerSourcesHook { year = "1980"; }) ]
     ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip);
 
   # propagate python/setuptools to active setup-hook in nix-shell
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6e743e2d7138..1d25ccc49973 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -259,6 +259,14 @@ let
     { substitutions = { inherit autoconf automake gettext libtool; }; }
     ../build-support/setup-hooks/autoreconf.sh;
 
+  ensureNewerSourcesHook = { year }: makeSetupHook {}
+    (writeScript "ensure-newer-sources-hook.sh" ''
+      postUnpackHooks+=(_ensureNewerSources)
+      _ensureNewerSources() {
+        find "$sourceRoot" '!' -newermt '${year}-01-01' -exec touch -d '${year}-01-02' '{}' '+'
+      }
+    '');
+
   buildEnv = callPackage ../build-support/buildenv { }; # not actually a package
 
   buildFHSEnv = callPackage ../build-support/build-fhs-chrootenv/env.nix {

From 0876a44169b64d4108fc5b5bd3c96843f94a4990 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 31 Jan 2016 14:30:40 +0000
Subject: [PATCH 1005/2285] curl: 7.45 -> 7.47 and enable HTTP/2 (close #12723)

This fixes CVE-2016-0755:
https://curl.haxx.se/docs/adv_20160127A.html

vcunat removed *propagation* of pkgconfig and perl.
---
 pkgs/tools/networking/curl/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 3c77d2a6c8d6..d5421f0a500e 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl
+{ stdenv, fetchurl, libnghttp2, pkgconfig, perl
 , idnSupport ? false, libidn ? null
 , ldapSupport ? false, openldap ? null
 , zlibSupport ? false, zlib ? null
@@ -16,17 +16,20 @@ assert scpSupport -> libssh2 != null;
 assert c-aresSupport -> c-ares != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.45.0";
+  name = "curl-7.47.0";
 
   src = fetchurl {
     url = "http://curl.haxx.se/download/${name}.tar.bz2";
-    sha256 = "1slq5c0v9wa8hajgimhkxhvsrd07jmih8sa3gjsl597qp5k4w5b5";
+    sha256 = "0riz70pjg82gbcfi2ndvsksb2dv55g31ir8piph2p6zvhy9ny29b";
   };
 
+  nativeBuildInputs = [ pkgconfig perl ];
+
   # Zlib and OpenSSL must be propagated because `libcurl.la' contains
   # "-lz -lssl", which aren't necessary direct build inputs of
   # applications that use Curl.
   propagatedBuildInputs = with stdenv.lib;
+    [ libnghttp2 ] ++
     optional idnSupport libidn ++
     optional ldapSupport openldap ++
     optional zlibSupport zlib ++
@@ -48,6 +51,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [
       "--disable-manual"
+      "--with-nghttp2=${libnghttp2}"
       ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" )
       ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" )
       ( if ldapSupport then "--enable-ldap" else "--disable-ldap" )

From ace76b5bdb9390ecded4d784225a03b916a589f9 Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Wed, 3 Feb 2016 11:36:53 +0100
Subject: [PATCH 1006/2285] keepassx2: 2.0 -> 2.0.2

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

diff --git a/pkgs/applications/misc/keepassx/2.0.nix b/pkgs/applications/misc/keepassx/2.0.nix
index aeccb874cb68..b76d59c30e14 100644
--- a/pkgs/applications/misc/keepassx/2.0.nix
+++ b/pkgs/applications/misc/keepassx/2.0.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "keepassx2-${version}";
-  version = "2.0";
+  version = "2.0.2";
 
   src = fetchurl {
     url = "https://www.keepassx.org/releases/${version}/keepassx-${version}.tar.gz";
-    sha256 = "1ri2r1sldc62hbg74m4pmci0nrjwvv38rqhyzhyjin247an0zd0f";
+    sha256 = "1f1nlbd669rmpzr52d9dgfgclg4jcaq2jkrby3b8q1vjkksdqjr0";
   };
 
   buildInputs = [ cmake libgcrypt qt4 xorg.libXtst ];

From 69ec09f38aa1f1d37baec73ebdf9cf5f21050f94 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Feb 2016 11:49:50 +0100
Subject: [PATCH 1007/2285] Don't make chromium-beta/dev release blockers

Generally we shouldn't ship pre-release versions anyway, and we
certainly don't want them to be release blockers. Also, chromium
builds are just too slow to have them blocking the channel (see
https://github.com/NixOS/nixpkgs/issues/12794).
---
 nixos/tests/chromium.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index 1d1e12d0ee39..6c61087760dd 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -2,8 +2,8 @@ import ./make-test.nix (
 { pkgs
 , channelMap ? {
     stable = pkgs.chromium;
-    beta   = pkgs.chromiumBeta;
-    dev    = pkgs.chromiumDev;
+    #beta   = pkgs.chromiumBeta;
+    #dev    = pkgs.chromiumDev;
   }
 , ...
 }: rec {

From 889351af8b8a9e8bb39dbd09dc56691a28b9d823 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 3 Feb 2016 12:16:33 +0100
Subject: [PATCH 1008/2285] Revert "Merge #12357: nixos docs: show references
 to packages"

The PR wasn't good enough yet.
This reverts commit b2a37ceeea8c38ec71447f8dae1e6890a8cf982d, reversing
changes made to 7fa9a1abce623aaf18b22f5dca3fc8a44a494e8d.
---
 lib/attrsets.nix                              |  2 +-
 nixos/modules/programs/ssh.nix                |  3 +-
 nixos/modules/programs/venus.nix              |  3 +-
 .../services/amqp/activemq/default.nix        |  3 +-
 nixos/modules/services/misc/nixos-manual.nix  |  3 +-
 nixos/modules/services/misc/subsonic.nix      |  4 ++-
 nixos/modules/services/monitoring/grafana.nix |  4 ++-
 .../services/networking/dnscrypt-proxy.nix    |  5 +---
 nixos/modules/services/web-servers/phpfpm.nix |  5 ++--
 .../services/x11/display-managers/lightdm.nix |  4 ++-
 nixos/release.nix                             | 28 ++++---------------
 11 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/lib/attrsets.nix b/lib/attrsets.nix
index e3721bd1e94c..84f6cb3658b9 100644
--- a/lib/attrsets.nix
+++ b/lib/attrsets.nix
@@ -207,7 +207,7 @@ rec {
 
 
   /* Like `mapAttrsRecursive', but it takes an additional predicate
-     function that tells it whether to recurse into an attribute
+     function that tells it whether to recursive into an attribute
      set.  If it returns false, `mapAttrsRecursiveCond' does not
      recurse, but does apply the map function.  It is returns true, it
      does recurse, and does not apply the map function.
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 1ad45f468030..169c6a38e75b 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -36,7 +36,6 @@ in
 
       askPassword = mkOption {
         type = types.str;
-        default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
         description = ''Program used by SSH to ask for passwords.'';
       };
 
@@ -227,5 +226,7 @@ in
 
     environment.variables.SSH_ASKPASS = optionalString config.services.xserver.enable askPassword;
 
+    programs.ssh.askPassword = mkDefault "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
+
   };
 }
diff --git a/nixos/modules/programs/venus.nix b/nixos/modules/programs/venus.nix
index 5c322c5589fc..c3756b4838c7 100644
--- a/nixos/modules/programs/venus.nix
+++ b/nixos/modules/programs/venus.nix
@@ -99,7 +99,6 @@ in
       };
 
       outputTheme = mkOption {
-        default = "${pkgs.venus}/themes/classic_fancy";
         type = types.path;
         description = ''
           Directory containing a config.ini file which is merged with this one.
@@ -170,5 +169,7 @@ in
         startAt = cfg.dates;
       };
 
+    services.venus.outputTheme = mkDefault "${pkgs.venus}/themes/classic_fancy";
+
   };
 }
diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix
index 261f97617664..56ff388f8a9e 100644
--- a/nixos/modules/services/amqp/activemq/default.nix
+++ b/nixos/modules/services/amqp/activemq/default.nix
@@ -32,7 +32,6 @@ in {
         '';
       };
       configurationDir = mkOption {
-        default = "${activemq}/conf";
         description = ''
           The base directory for ActiveMQ's configuration.
           By default, this directory is searched for a file named activemq.xml,
@@ -126,6 +125,8 @@ in {
       '';
     };
 
+    services.activemq.configurationDir = mkDefault "${activemq}/conf";
+
   };
 
 }
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 2aa8f4a06cc9..3e1f53e79f3e 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -80,7 +80,6 @@ in
 
     services.nixosManual.browser = mkOption {
       type = types.path;
-      default = "${pkgs.w3m-nox}/bin/w3m";
       description = ''
         Browser used to show the manual.
       '';
@@ -118,6 +117,8 @@ in
     services.mingetty.helpLine = mkIf cfg.showManual
       "\nPress <Alt-F${toString cfg.ttyNumber}> for the NixOS manual.";
 
+    services.nixosManual.browser = mkDefault "${pkgs.w3m-nox}/bin/w3m";
+
   };
 
 }
diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix
index 020d53a481de..2831e95b9480 100644
--- a/nixos/modules/services/misc/subsonic.nix
+++ b/nixos/modules/services/misc/subsonic.nix
@@ -97,7 +97,6 @@ in
 
       transcoders = mkOption {
         type = types.listOf types.path;
-        default = [ "${pkgs.ffmpeg}/bin/ffmpeg" ];
         description = ''
           List of paths to transcoder executables that should be accessible
           from Subsonic. Symlinks will be created to each executable inside
@@ -153,5 +152,8 @@ in
     };
 
     users.extraGroups.subsonic.gid = config.ids.gids.subsonic;
+
+    services.subsonic.transcoders = mkDefault [ "${pkgs.ffmpeg}/bin/ffmpeg" ];
+
   };
 }
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index 1dec528b5a2c..0b49038dd273 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -87,7 +87,6 @@ in {
 
     staticRootPath = mkOption {
       description = "Root path for static assets.";
-      default = "${cfg.package.out}/share/grafana/public";
       type = types.str;
     };
 
@@ -233,5 +232,8 @@ in {
       home = cfg.dataDir;
       createHome = true;
     };
+
+    services.grafana.staticRootPath = mkDefault "${cfg.package}/share/grafana/public";
+
   };
 }
diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index c724ee979c2d..218bce2dbb31 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -52,10 +52,7 @@ in
         default = "opendns";
         type = types.nullOr types.string;
         description = ''
-          The name of the upstream DNSCrypt resolver to use. See
-          <literal>${resolverListFile}</literal> for alternative resolvers
-          (e.g., if you are concerned about logging and/or server
-          location).
+          The name of the upstream DNSCrypt resolver to use.
         '';
       };
       customResolver = mkOption {
diff --git a/nixos/modules/services/web-servers/phpfpm.nix b/nixos/modules/services/web-servers/phpfpm.nix
index 277180fe139d..bdd41ed702b5 100644
--- a/nixos/modules/services/web-servers/phpfpm.nix
+++ b/nixos/modules/services/web-servers/phpfpm.nix
@@ -46,8 +46,7 @@ in {
 
       phpIni = mkOption {
         type = types.path;
-        default = "${cfg.phpPackage}/etc/php-recommended.ini";
-        description = "php.ini file to use.";
+        description = "PHP configuration file to use.";
       };
 
       poolConfigs = mkOption {
@@ -88,5 +87,7 @@ in {
       };
     };
 
+    services.phpfpm.phpIni = mkDefault "${cfg.phpPackage}/etc/php-recommended.ini";
+
   };
 }
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index ac7db3d9adc4..3949bf01a316 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -87,7 +87,6 @@ in
 
       background = mkOption {
         type = types.str;
-        default = "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png";
         description = ''
           The background image or color to use.
         '';
@@ -153,6 +152,9 @@ in
     };
 
     users.extraGroups.lightdm.gid = config.ids.gids.lightdm;
+
+    services.xserver.displayManager.lightdm.background = mkDefault "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png";
+
     services.xserver.tty     = null; # We might start multiple X servers so let the tty increment themselves..
     services.xserver.display = null; # We specify our own display (and logfile) in xserver-wrapper up there
   };
diff --git a/nixos/release.nix b/nixos/release.nix
index 71317c32b98d..d9f3e46b27c0 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -92,33 +92,15 @@ let
   }).config));
 
 
-  cleanConfig = import ./lib/eval-config.nix {
-    system = "x86_64-linux";
-    modules = [ ];
-    pkgs = with pkgs.lib;
-      let
-        scrubDerivations = namePrefix: pkgSet: mapAttrs
-          (name: value:
-            let wholeName = "${namePrefix}.${name}"; in
-            if isAttrs value then
-              scrubDerivations wholeName value
-              // (optionalAttrs (isDerivation value) { outPath = "\${${wholeName}}"; })
-            else value
-          )
-          pkgSet;
-      in scrubDerivations "pkgs" pkgs;
-  };
-  docs = (import ./doc/manual) {
-    inherit pkgs version;
-    revision = versionModule.system.nixosRevision;
-    inherit (cleanConfig) options;
-  };
-
 in rec {
 
   channel = import lib/make-channel.nix { inherit pkgs nixpkgs version versionSuffix; };
 
-  inherit (docs) manual manualPDF manpages optionsJSON;
+  manual = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manual);
+  manualPDF = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manualPDF)).x86_64-linux;
+  manpages = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manpages);
+  options = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux;
+
 
   # Build the initial ramdisk so Hydra can keep track of its size over time.
   initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk);

From 9f358f809d1db46f3206d4a09a5366f13c93e777 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Mon, 1 Feb 2016 10:18:31 +0100
Subject: [PATCH 1009/2285] Configure a default trust store for openssl

---
 nixos/modules/installer/tools/auto-upgrade.nix  |  2 +-
 nixos/modules/programs/venus.nix                |  1 -
 nixos/modules/security/ca.nix                   |  6 ------
 .../continuous-integration/jenkins/default.nix  | 17 +++++++----------
 nixos/modules/services/monitoring/dd-agent.nix  |  1 -
 nixos/modules/services/networking/ddclient.nix  |  1 -
 nixos/modules/virtualisation/azure-agent.nix    |  6 ------
 .../networking/cluster/panamax/api/default.nix  |  1 -
 .../instant-messengers/tkabber/default.nix      |  6 +-----
 .../git-and-tools/git/cert-path.patch           | 12 ------------
 .../git-and-tools/git/default.nix               |  2 --
 .../git-and-tools/git/ssl-cert-file.patch       | 13 -------------
 pkgs/build-support/rust/fetchcargo.nix          |  2 --
 pkgs/development/libraries/gnutls/generic.nix   |  1 -
 pkgs/development/libraries/openssl/default.nix  |  6 +++++-
 .../lwp-protocol-https-cert-file.patch          | 17 -----------------
 pkgs/tools/networking/curl/7.15.nix             |  6 +-----
 pkgs/tools/networking/curl/default.nix          |  6 +-----
 pkgs/top-level/perl-packages.nix                |  1 -
 19 files changed, 16 insertions(+), 91 deletions(-)
 delete mode 100644 pkgs/applications/version-management/git-and-tools/git/cert-path.patch
 delete mode 100644 pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch
 delete mode 100644 pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch

diff --git a/nixos/modules/installer/tools/auto-upgrade.nix b/nixos/modules/installer/tools/auto-upgrade.nix
index 4ef5fa8bc1d4..2da330f9b571 100644
--- a/nixos/modules/installer/tools/auto-upgrade.nix
+++ b/nixos/modules/installer/tools/auto-upgrade.nix
@@ -74,7 +74,7 @@ let cfg = config.system.autoUpgrade; in
       serviceConfig.Type = "oneshot";
 
       environment = config.nix.envVars //
-        { inherit (config.environment.sessionVariables) NIX_PATH SSL_CERT_FILE;
+        { inherit (config.environment.sessionVariables) NIX_PATH;
           HOME = "/root";
         };
 
diff --git a/nixos/modules/programs/venus.nix b/nixos/modules/programs/venus.nix
index c3756b4838c7..76827eeced6f 100644
--- a/nixos/modules/programs/venus.nix
+++ b/nixos/modules/programs/venus.nix
@@ -165,7 +165,6 @@ in
         script = "exec venus-planet ${configFile}";
         serviceConfig.User = "${cfg.user}";
         serviceConfig.Group = "${cfg.group}";
-        environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt";
         startAt = cfg.dates;
       };
 
diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix
index 98d73ed25426..8bd634b10a51 100644
--- a/nixos/modules/security/ca.nix
+++ b/nixos/modules/security/ca.nix
@@ -64,12 +64,6 @@ in
     # CentOS/Fedora compatibility.
     environment.etc."pki/tls/certs/ca-bundle.crt".source = caCertificates;
 
-    environment.sessionVariables =
-      { SSL_CERT_FILE          = "/etc/ssl/certs/ca-certificates.crt";
-        # FIXME: unneeded - remove eventually.
-        GIT_SSL_CAINFO         = "/etc/ssl/certs/ca-certificates.crt";
-      };
-
   };
 
 }
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix
index d6ae4b45ceef..cfb1cd773c7f 100644
--- a/nixos/modules/services/continuous-integration/jenkins/default.nix
+++ b/nixos/modules/services/continuous-integration/jenkins/default.nix
@@ -92,11 +92,12 @@ in {
         type = with types; attrsOf str;
         description = ''
           Additional environment variables to be passed to the jenkins process.
-          As a base environment, jenkins receives NIX_PATH, SSL_CERT_FILE and
-          GIT_SSL_CAINFO from <option>environment.sessionVariables</option>,
-          NIX_REMOTE is set to "daemon" and JENKINS_HOME is set to
-          the value of <option>services.jenkins.home</option>. This option has
-          precedence and can be used to override those mentioned variables.
+          As a base environment, jenkins receives NIX_PATH from
+          <option>environment.sessionVariables</option>, NIX_REMOTE is set to
+          "daemon" and JENKINS_HOME is set to the value of
+          <option>services.jenkins.home</option>.
+          This option has precedence and can be used to override those
+          mentioned variables.
         '';
       };
 
@@ -136,11 +137,7 @@ in {
       environment =
         let
           selectedSessionVars =
-            lib.filterAttrs (n: v: builtins.elem n
-                [ "NIX_PATH"
-                  "SSL_CERT_FILE"
-                  "GIT_SSL_CAINFO"
-                ])
+            lib.filterAttrs (n: v: builtins.elem n [ "NIX_PATH" ])
               config.environment.sessionVariables;
         in
           selectedSessionVars //
diff --git a/nixos/modules/services/monitoring/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent.nix
index ed9be73ba65b..bd8d9950f77c 100644
--- a/nixos/modules/services/monitoring/dd-agent.nix
+++ b/nixos/modules/services/monitoring/dd-agent.nix
@@ -183,7 +183,6 @@ in {
         Restart = "always";
         RestartSec = 2;
       };
-      environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt";
       restartTriggers = [ pkgs.dd-agent ddConf diskConfig networkConfig postgresqlConfig nginxConfig mongoConfig ];
     };
 
diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix
index e60520c742bd..c5dd1e71c189 100644
--- a/nixos/modules/services/networking/ddclient.nix
+++ b/nixos/modules/services/networking/ddclient.nix
@@ -127,7 +127,6 @@ in
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
 
-      environment.SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt";
       serviceConfig = {
         # Uncomment this if too many problems occur:
         # Type = "forking";
diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix
index ef4e3e1e48d4..e657cc519396 100644
--- a/nixos/modules/virtualisation/azure-agent.nix
+++ b/nixos/modules/virtualisation/azure-agent.nix
@@ -156,12 +156,6 @@ in
       after = [ "ip-up.target" ];
       wants = [ "ip-up.target" ];
 
-      environment = {
-        GIT_SSL_CAINFO = "/etc/ssl/certs/ca-certificates.crt";
-        OPENSSL_X509_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt";
-        SSL_CERT_FILE = "/etc/ssl/certs/ca-certificates.crt";
-      };
-
       path = [ pkgs.e2fsprogs ];
       description = "Windows Azure Agent Service";
       unitConfig.ConditionPathExists = "/etc/waagent.conf";
diff --git a/pkgs/applications/networking/cluster/panamax/api/default.nix b/pkgs/applications/networking/cluster/panamax/api/default.nix
index 6e20f7c23038..ee74e665b0c7 100644
--- a/pkgs/applications/networking/cluster/panamax/api/default.nix
+++ b/pkgs/applications/networking/cluster/panamax/api/default.nix
@@ -62,7 +62,6 @@ stdenv.mkDerivation rec {
       --prefix "PATH" : "$out/share/panamax-api/bin:${env.ruby}/bin:$PATH" \
       --prefix "HOME" : "$out/share/panamax-api" \
       --prefix "GEM_HOME" : "${env}/${env.ruby.gemPath}" \
-      --prefix "SSL_CERT_FILE" : /etc/ssl/certs/ca-certificates.crt \
       --prefix "GEM_PATH" : "$out/share/panamax-api:${bundler}/${env.ruby.gemPath}"
   '';
 
diff --git a/pkgs/applications/networking/instant-messengers/tkabber/default.nix b/pkgs/applications/networking/instant-messengers/tkabber/default.nix
index f9209f28cf20..9c84e60601bb 100644
--- a/pkgs/applications/networking/instant-messengers/tkabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/tkabber/default.nix
@@ -40,11 +40,7 @@ let
   } // removeAttrs attrs [ "name" "sha256" ]);
 
 in mkTkabber (main // {
-  postPatch = ''
-    substituteInPlace login.tcl --replace \
-      "custom::defvar loginconf(sslcacertstore) \"\"" \
-      "custom::defvar loginconf(sslcacertstore) \$env(SSL_CERT_FILE)"
-  '' + optionalString (theme != null) ''
+  postPatch = optionalString (theme != null) ''
     themePath="$out/share/doc/tkabber/examples/xrdb/${theme}.xrdb"
     sed -i '/^if.*load_default_xrdb/,/^}$/ {
       s@option readfile \(\[fullpath [^]]*\]\)@option readfile "'"$themePath"'"@
diff --git a/pkgs/applications/version-management/git-and-tools/git/cert-path.patch b/pkgs/applications/version-management/git-and-tools/git/cert-path.patch
deleted file mode 100644
index 7d5dca9abfeb..000000000000
--- a/pkgs/applications/version-management/git-and-tools/git/cert-path.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru -x '*~' git-1.9.2-orig/git-send-email.perl git-1.9.2/git-send-email.perl
---- git-1.9.2-orig/git-send-email.perl	2014-04-09 21:09:34.000000000 +0200
-+++ git-1.9.2/git-send-email.perl	2014-04-16 18:35:05.861132282 +0200
-@@ -1094,6 +1094,8 @@
- 		return;
- 	}
- 
-+	$smtp_ssl_cert_path //= $ENV{'SSL_CERT_FILE'};
-+
- 	if (!defined $smtp_ssl_cert_path) {
- 		# use the OpenSSL defaults
- 		return (SSL_verify_mode => SSL_VERIFY_PEER());
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 49ecce0456b2..f8223a7de396 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -24,8 +24,6 @@ stdenv.mkDerivation {
   patches = [
     ./docbook2texi.patch
     ./symlinks-in-bin.patch
-    ./cert-path.patch
-    ./ssl-cert-file.patch
   ];
 
   buildInputs = [curl openssl zlib expat gettext cpio makeWrapper libiconv]
diff --git a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch b/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch
deleted file mode 100644
index dd216b7bf6f8..000000000000
--- a/pkgs/applications/version-management/git-and-tools/git/ssl-cert-file.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-This patch adds support for the OpenSSL SSL_CERT_FILE environment variable.
-GIT_SSL_CAINFO still takes precedence.
-
---- git-orig/http.c.orig	2014-11-25 23:27:56.000000000 +0100
-+++ git-orig/http.c	2014-11-25 23:28:48.000000000 +0100
-@@ -433,6 +433,7 @@
- #if LIBCURL_VERSION_NUM >= 0x070908
- 	set_from_env(&ssl_capath, "GIT_SSL_CAPATH");
- #endif
-+	set_from_env(&ssl_cainfo, "SSL_CERT_FILE");
- 	set_from_env(&ssl_cainfo, "GIT_SSL_CAINFO");
- 
- 	set_from_env(&user_agent, "GIT_HTTP_USER_AGENT");
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index 95eefbedc327..7910887ba640 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -16,8 +16,6 @@ stdenv.mkDerivation {
   outputHashMode = "recursive";
   outputHash = sha256;
 
-  SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-
   impureEnvVars = [ "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy" ];
   preferLocalBuild = true;
 }
diff --git a/pkgs/development/libraries/gnutls/generic.nix b/pkgs/development/libraries/gnutls/generic.nix
index ebaef47ca140..e51b77eb5b07 100644
--- a/pkgs/development/libraries/gnutls/generic.nix
+++ b/pkgs/development/libraries/gnutls/generic.nix
@@ -16,7 +16,6 @@ stdenv.mkDerivation {
   outputs = [ "out" "man" ];
 
   configureFlags =
-    # FIXME: perhaps use $SSL_CERT_FILE instead
     lib.optional stdenv.isLinux "--with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt"
   ++ [
     "--disable-dependency-tracking"
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 4e009e5306d6..be224fd54eb5 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, perl
-, withCryptodev ? false, cryptodevHeaders }:
+, withCryptodev ? false, cryptodevHeaders
+, defaultCertificate ? "/etc/ssl/certs/ca-certificates.crt" }:
 
 with stdenv.lib;
 let
@@ -58,6 +59,9 @@ stdenv.mkDerivation rec {
 
     # remove dependency on Perl at runtime
     rm -r $out/etc/ssl/misc $out/bin/c_rehash
+
+    # configure the default trust store
+    ${optionalString (defaultCertificate != null) "ln -s ${defaultCertificate} $out/etc/ssl/cert.pem"}
   '';
 
   postFixup = ''
diff --git a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch
deleted file mode 100644
index 4a4b49a829d2..000000000000
--- a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Use $SSL_CERT_FILE to get the CA certificates.
-
-diff -ru -x '*~' LWP-Protocol-https-6.02-orig/lib/LWP/Protocol/https.pm LWP-Protocol-https-6.02/lib/LWP/Protocol/https.pm
---- LWP-Protocol-https-6.02-orig/lib/LWP/Protocol/https.pm	2011-03-27 13:54:01.000000000 +0200
-+++ LWP-Protocol-https-6.02/lib/LWP/Protocol/https.pm	2011-10-07 13:23:41.398628375 +0200
-@@ -21,6 +21,11 @@
-     }
-     if ($ssl_opts{SSL_verify_mode}) {
- 	unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
-+            if (defined $ENV{'SSL_CERT_FILE'}) {
-+                $ssl_opts{SSL_ca_file} = $ENV{'SSL_CERT_FILE'};
-+            }
-+        }
-+	unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
- 	    eval {
- 		require Mozilla::CA;
- 	    };
diff --git a/pkgs/tools/networking/curl/7.15.nix b/pkgs/tools/networking/curl/7.15.nix
index 4e533878ec18..1e91d6bd0883 100644
--- a/pkgs/tools/networking/curl/7.15.nix
+++ b/pkgs/tools/networking/curl/7.15.nix
@@ -33,12 +33,8 @@ stdenv.mkDerivation rec {
     sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure
   '';
 
-  # make curl honor CURL_CA_BUNDLE & SSL_CERT_FILE
-  postConfigure = ''
-    echo  '#define CURL_CA_BUNDLE (getenv("CURL_CA_BUNDLE") || getenv("SSL_CERT_FILE"))' >> lib/curl_config.h
-  '';
-
   configureFlags = [
+      "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
       ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" )
       ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" )
     ]
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index d5421f0a500e..bb08966ed49e 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -44,12 +44,8 @@ stdenv.mkDerivation rec {
     rm src/tool_hugehelp.c
   '';
 
-  # make curl honor CURL_CA_BUNDLE & SSL_CERT_FILE
-  postConfigure = ''
-    echo  '#define CURL_CA_BUNDLE (getenv("CURL_CA_BUNDLE") ? getenv("CURL_CA_BUNDLE") : getenv("SSL_CERT_FILE"))' >> lib/curl_config.h
-  '';
-
   configureFlags = [
+      "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
       "--disable-manual"
       "--with-nghttp2=${libnghttp2}"
       ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" )
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 1e8dfa91d2d2..1cc4e7a7b920 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6934,7 +6934,6 @@ let self = _self // overrides; _self = with self; {
       url = mirror://cpan/authors/id/G/GA/GAAS/LWP-Protocol-https-6.04.tar.gz;
       sha256 = "0agnga5dg94222h6rlzqxa0dri2sh3gayncvfb7jad9nxr87gxhy";
     };
-    patches = [ ../development/perl-modules/lwp-protocol-https-cert-file.patch ];
     propagatedBuildInputs = [ LWP IOSocketSSL ];
     doCheck = false; # tries to connect to https://www.apache.org/.
     meta = {

From cc70183ceef7abc08a98453b33f9a8b24c3a123e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 3 Feb 2016 13:29:08 +0300
Subject: [PATCH 1010/2285] initrd-network module: initialize network before
 other pre-LVM commands

This is needed to ensure that network will be initialized before LUKS
passphrase is asked.
---
 nixos/modules/system/boot/initrd-network.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix
index abf88734a558..8ccf56ff6e0d 100644
--- a/nixos/modules/system/boot/initrd-network.nix
+++ b/nixos/modules/system/boot/initrd-network.nix
@@ -65,7 +65,7 @@ in
 
     boot.initrd.preLVMCommands =
       # Search for interface definitions in command line.
-      ''
+      mkBefore ''
         for o in $(cat /proc/cmdline); do
           case $o in
             ip=*)

From 815ff00ee0bf2ccbacaafbb601937686edb2c0a7 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 3 Feb 2016 13:37:19 +0300
Subject: [PATCH 1011/2285] initrd-ssh module: enable only if initrd network is
 enabled

---
 nixos/modules/system/boot/initrd-ssh.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix
index 9f2fd4da9c4c..6809aefb7112 100644
--- a/nixos/modules/system/boot/initrd-ssh.nix
+++ b/nixos/modules/system/boot/initrd-ssh.nix
@@ -84,7 +84,7 @@ in
 
   };
 
-  config = mkIf cfg.enable {
+  config = mkIf (config.boot.initrd.network.enable && cfg.enable) {
 
     boot.initrd.extraUtilsCommands = ''
       copy_bin_and_libs ${pkgs.dropbear}/bin/dropbear

From 1d70e2fb7533ffa87120323257f9c6ea0c4c8c9c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 3 Feb 2016 14:43:36 +0300
Subject: [PATCH 1012/2285] initrd modules: move passwd and nsswitch back to
 initrd-ssh

Partially reverts commit 901163c0c707d36323400394bf6e75adc4621e2f.
This has broken remote SSH into initrd because ${cfg.shell} is not
expanded. Also, nsswitch is useless without libnss_files.so which
are installed by initrd-ssh.
---
 nixos/modules/system/boot/initrd-ssh.nix  | 2 ++
 nixos/modules/system/boot/stage-1-init.sh | 5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix
index 6809aefb7112..506e42bc024d 100644
--- a/nixos/modules/system/boot/initrd-ssh.nix
+++ b/nixos/modules/system/boot/initrd-ssh.nix
@@ -101,6 +101,8 @@ in
         mount -t devpts devpts /dev/pts
 
         echo '${cfg.shell}' > /etc/shells
+        echo 'root:x:0:0:root:/root:${cfg.shell}' > /etc/passwd
+        echo 'passwd: files' > /etc/nsswitch.conf
 
         mkdir -p /var/log
         touch /var/log/lastlog
diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index c3d402eca042..95df0ace1ca4 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -72,11 +72,6 @@ mkdir -p /run
 mount -t tmpfs -o "mode=0755,size=@runSize@" tmpfs /run
 
 
-# Initialise /etc.
-echo 'root:x:0:0:root:/root:${cfg.shell}' > /etc/passwd
-echo 'passwd: files' > /etc/nsswitch.conf
-
-
 # Process the kernel command line.
 export stage2Init=/init
 for o in $(cat /proc/cmdline); do

From 6b5f90a1a1022a7a134a2335a65951d750189a6c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 3 Feb 2016 15:38:01 +0300
Subject: [PATCH 1013/2285] udev service: restart on rules change

---
 nixos/modules/services/hardware/udev.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index c747c24db67d..37fda9bc685b 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -256,6 +256,7 @@ in
 
     systemd.services.systemd-udevd =
       { environment.MODULE_DIR = "/run/booted-system/kernel-modules/lib/modules";
+        restartTriggers = cfg.packages;
       };
 
   };

From 788da6894fac5b20d183ce5afbab3bacd7ddeaca Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Feb 2016 13:45:05 +0100
Subject: [PATCH 1014/2285] openssl: Compile in
 /etc/ssl/certs/ca-certificates.crt

---
 pkgs/development/libraries/openssl/default.nix     | 14 ++++++++++----
 .../libraries/openssl/use-etc-ssl-certs.patch      | 13 +++++++++++++
 2 files changed, 23 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/libraries/openssl/use-etc-ssl-certs.patch

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index be224fd54eb5..e37bdf855dc5 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, perl
 , withCryptodev ? false, cryptodevHeaders
-, defaultCertificate ? "/etc/ssl/certs/ca-certificates.crt" }:
+}:
 
 with stdenv.lib;
 let
@@ -21,7 +21,9 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "man" ];
 
-  patches = optional stdenv.isCygwin ./1.0.1-cygwin64.patch
+  patches =
+    [ ./use-etc-ssl-certs.patch ]
+    ++ optional stdenv.isCygwin ./1.0.1-cygwin64.patch
     ++ optional (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem")) ./darwin-arch.patch;
 
   nativeBuildInputs = [ perl ];
@@ -60,8 +62,7 @@ stdenv.mkDerivation rec {
     # remove dependency on Perl at runtime
     rm -r $out/etc/ssl/misc $out/bin/c_rehash
 
-    # configure the default trust store
-    ${optionalString (defaultCertificate != null) "ln -s ${defaultCertificate} $out/etc/ssl/cert.pem"}
+    rmdir $out/etc/ssl/certs
   '';
 
   postFixup = ''
@@ -72,6 +73,11 @@ stdenv.mkDerivation rec {
     fi
   '';
 
+  setupHook = builtins.toFile "openssl-setup-hook"
+    ''
+      export SSL_CERT_FILE=/no-cert-file.crt
+    '';
+
   crossAttrs = {
     # upstream patch: https://rt.openssl.org/Ticket/Display.html?id=2558
     postPatch = ''
diff --git a/pkgs/development/libraries/openssl/use-etc-ssl-certs.patch b/pkgs/development/libraries/openssl/use-etc-ssl-certs.patch
new file mode 100644
index 000000000000..813c6bdf44ab
--- /dev/null
+++ b/pkgs/development/libraries/openssl/use-etc-ssl-certs.patch
@@ -0,0 +1,13 @@
+diff -ru -x '*~' openssl-1.0.1r-orig/crypto/cryptlib.h openssl-1.0.1r/crypto/cryptlib.h
+--- openssl-1.0.1r-orig/crypto/cryptlib.h	2016-01-28 14:38:30.000000000 +0100
++++ openssl-1.0.1r/crypto/cryptlib.h	2016-02-03 12:54:29.193165176 +0100
+@@ -81,8 +81,8 @@
+ 
+ # ifndef OPENSSL_SYS_VMS
+ #  define X509_CERT_AREA          OPENSSLDIR
+ #  define X509_CERT_DIR           OPENSSLDIR "/certs"
+-#  define X509_CERT_FILE          OPENSSLDIR "/cert.pem"
++#  define X509_CERT_FILE          "/etc/ssl/certs/ca-certificates.crt"
+ #  define X509_PRIVATE_DIR        OPENSSLDIR "/private"
+ # else
+ #  define X509_CERT_AREA          "SSLROOT:[000000]"

From ca21ae0eda4cf0713d92b0f70f9f43cb1a28be7f Mon Sep 17 00:00:00 2001
From: Sven Keidel <svenkeidel@googlemail.com>
Date: Thu, 25 Jun 2015 23:37:00 +0200
Subject: [PATCH 1015/2285] isabelle: 2014 -> 2015

Picked from #8510. /cc maintainer @jwiegley.
---
 .../science/logic/isabelle/default.nix            | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix
index 97534b0ddd36..98b71b7f5007 100644
--- a/pkgs/applications/science/logic/isabelle/default.nix
+++ b/pkgs/applications/science/logic/isabelle/default.nix
@@ -2,22 +2,22 @@
 # nettools needed for hostname
 
 let
-  dirname = "Isabelle2014";
+  dirname = "Isabelle2015";
   theories = ["HOL" "FOL" "ZF"];
 in
 
 stdenv.mkDerivation {
-  name = "isabelle-2014";
+  name = "isabelle-2015";
   inherit dirname theories;
 
   src = if stdenv.isDarwin
     then fetchurl {
-      url = http://isabelle.in.tum.de/website-Isabelle2014/dist/Isabelle2014_macos.tar.gz;
-      sha256 = "1aa3vz2nnkkyd4mlsqbs69jqfxlll5h0k5fj9m1j9wqiddqwvwcf";
+      url = http://isabelle.in.tum.de/dist/Isabelle2015.dmg;
+      sha256 = "1vhm10qc1rn3wy9r12clrl33p64h3q1aj41mcnxkbnsyg2bx03im";
     }
     else fetchurl {
-      url = http://isabelle.in.tum.de/website-Isabelle2014/dist/Isabelle2014_linux.tar.gz;
-      sha256 = "0z81pwwllavka4r57fx6yi9kbpbb9xbanp8dsjix49qpyj2a72jy";
+      url = http://isabelle.in.tum.de/dist/Isabelle2015_linux.tar.gz;
+      sha256 = "13kqm458d8mw7il1zg5bdb1nfbb869p331d75xzlm2v9xgjxx862";
     };
 
   buildInputs = [ perl polyml ]
@@ -32,12 +32,13 @@ stdenv.mkDerivation {
       --replace /usr/bin/env $ENV
     substituteInPlace lib/Tools/install \
       --replace /usr/bin/env $ENV
+    sed -i 's|isabelle_java java|${java}/bin/java|g' lib/Tools/java
     substituteInPlace etc/settings \
       --subst-var-by ML_HOME "${polyml}/bin" \
       --subst-var-by PROOFGENERAL_HOME "${proofgeneral}/share/emacs/site-lisp/ProofGeneral"
     substituteInPlace contrib/jdk/etc/settings \
       --replace ISABELLE_JDK_HOME= '#ISABELLE_JDK_HOME='
-    substituteInPlace contrib/polyml-5.5.2-1/etc/settings \
+    substituteInPlace contrib/polyml-*/etc/settings \
       --replace 'ML_HOME="$POLYML_HOME/$ML_PLATFORM"' \
                 "ML_HOME=\"${polyml}/bin\""
   '';

From cc2cec63007f6974130a7ba8a491761be5887528 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Feb 2016 13:54:22 +0100
Subject: [PATCH 1016/2285] openssl: Unify 1.0.1 and 1.0.2 expressions

---
 .../development/libraries/openssl/1.0.2.x.nix |  91 --------
 .../development/libraries/openssl/default.nix | 197 +++++++++---------
 pkgs/top-level/all-packages.nix               |  21 +-
 3 files changed, 112 insertions(+), 197 deletions(-)
 delete mode 100644 pkgs/development/libraries/openssl/1.0.2.x.nix

diff --git a/pkgs/development/libraries/openssl/1.0.2.x.nix b/pkgs/development/libraries/openssl/1.0.2.x.nix
deleted file mode 100644
index c94033d0fefd..000000000000
--- a/pkgs/development/libraries/openssl/1.0.2.x.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{ stdenv, fetchurl, perl
-, withCryptodev ? false, cryptodevHeaders }:
-
-with stdenv.lib;
-let
-  opensslCrossSystem = attrByPath [ "openssl" "system" ]
-    (throw "openssl needs its platform name cross building" null)
-    stdenv.cross;
-in
-stdenv.mkDerivation rec {
-  name = "openssl-1.0.2f";
-
-  src = fetchurl {
-    urls = [
-      "http://www.openssl.org/source/${name}.tar.gz"
-      "http://openssl.linux-mirror.org/source/${name}.tar.gz"
-    ];
-    sha256 = "932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c";
-  };
-
-  patches = optional stdenv.isCygwin ./1.0.1-cygwin64.patch;
-
-  nativeBuildInputs = [ perl ];
-  buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
-
-  # On x86_64-darwin, "./config" misdetects the system as
-  # "darwin-i386-cc".  So specify the system type explicitly.
-  configureScript =
-    if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc"
-    else if stdenv.system == "x86_64-solaris" then "./Configure solaris64-x86_64-gcc"
-    else "./config";
-
-  configureFlags = [
-    "shared"
-    "--libdir=lib"
-    "--openssldir=etc/ssl"
-  ] ++ stdenv.lib.optionals withCryptodev [
-    "-DHAVE_CRYPTODEV"
-    "-DUSE_CRYPTODEV_DIGESTS"
-  ];
-
-  makeFlags = [
-    "MANDIR=$(out)/share/man"
-  ];
-
-  # Parallel building is broken in OpenSSL.
-  enableParallelBuilding = false;
-
-  postInstall = ''
-    # If we're building dynamic libraries, then don't install static
-    # libraries.
-    if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
-        rm "$out/lib/"*.a
-    fi
-
-    # remove dependency on Perl at runtime
-    rm -r $out/etc/ssl/misc $out/bin/c_rehash
-  '';
-
-  postFixup = ''
-    # Check to make sure we don't depend on perl
-    if grep -r '${perl}' $out; then
-      echo "Found an erroneous dependency on perl ^^^" >&2
-      exit 1
-    fi
-  '';
-
-  crossAttrs = {
-    # upstream patch: https://rt.openssl.org/Ticket/Display.html?id=2558
-    postPatch = ''
-       sed -i -e 's/[$][(]CROSS_COMPILE[)]windres/$(WINDRES)/' Makefile.shared
-    '';
-    preConfigure=''
-      # It's configure does not like --build or --host
-      export configureFlags="${concatStringsSep " " (configureFlags ++ [ opensslCrossSystem ])}"
-      # WINDRES and RANLIB need to be prefixed when cross compiling;
-      # the openssl configure script doesn't do that for us
-      export WINDRES=${stdenv.cross.config}-windres
-      export RANLIB=${stdenv.cross.config}-ranlib
-    '';
-    configureScript = "./Configure";
-  };
-
-  meta = {
-    homepage = http://www.openssl.org/;
-    description = "A cryptographic library that implements the SSL and TLS protocols";
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
-    priority = 10; # resolves collision with ‘man-pages’
-  };
-}
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index e37bdf855dc5..669b4810f85f 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -1,104 +1,115 @@
 { stdenv, fetchurl, perl
-, withCryptodev ? false, cryptodevHeaders
-}:
+, withCryptodev ? false, cryptodevHeaders }:
 
 with stdenv.lib;
-let
-  opensslCrossSystem = attrByPath [ "openssl" "system" ]
-    (throw "openssl needs its platform name cross building" null)
-    stdenv.cross;
-in
-stdenv.mkDerivation rec {
-  name = "openssl-1.0.1r";
 
-  src = fetchurl {
-    urls = [
-      "http://www.openssl.org/source/${name}.tar.gz"
-      "http://openssl.linux-mirror.org/source/${name}.tar.gz"
+let
+
+  opensslCrossSystem = stdenv.cross.openssl.system or 
+    (throw "openssl needs its platform name cross building");
+
+  common = { version, sha256 }: stdenv.mkDerivation rec {
+    name = "openssl-${version}";
+
+    src = fetchurl {
+      url = "http://www.openssl.org/source/${name}.tar.gz";
+      inherit sha256;
+    };
+
+    outputs = [ "out" "man" ];
+
+    patches =
+      [ ./use-etc-ssl-certs.patch ]
+      ++ optional stdenv.isCygwin ./1.0.1-cygwin64.patch
+      ++ optional (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem")) ./darwin-arch.patch;
+
+    nativeBuildInputs = [ perl ];
+    buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
+
+    # On x86_64-darwin, "./config" misdetects the system as
+    # "darwin-i386-cc".  So specify the system type explicitly.
+    configureScript =
+      if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc"
+      else if stdenv.system == "x86_64-solaris" then "./Configure solaris64-x86_64-gcc"
+      else "./config";
+
+    configureFlags = [
+      "shared"
+      "--libdir=lib"
+      "--openssldir=etc/ssl"
+    ] ++ stdenv.lib.optionals withCryptodev [
+      "-DHAVE_CRYPTODEV"
+      "-DUSE_CRYPTODEV_DIGESTS"
     ];
+
+    makeFlags = [
+      "MANDIR=$(out)/share/man"
+    ];
+
+    # Parallel building is broken in OpenSSL.
+    enableParallelBuilding = false;
+
+    postInstall = ''
+      # If we're building dynamic libraries, then don't install static
+      # libraries.
+      if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
+          rm "$out/lib/"*.a
+      fi
+
+      # remove dependency on Perl at runtime
+      rm -r $out/etc/ssl/misc $out/bin/c_rehash
+
+      rmdir $out/etc/ssl/{certs,private}
+    '';
+
+    postFixup = ''
+      # Check to make sure we don't depend on perl
+      if grep -r '${perl}' $out; then
+        echo "Found an erroneous dependency on perl ^^^" >&2
+        exit 1
+      fi
+    '';
+
+    setupHook = builtins.toFile "openssl-setup-hook"
+      ''
+        export SSL_CERT_FILE=/no-cert-file.crt
+      '';
+
+    crossAttrs = {
+      # upstream patch: https://rt.openssl.org/Ticket/Display.html?id=2558
+      postPatch = ''
+         sed -i -e 's/[$][(]CROSS_COMPILE[)]windres/$(WINDRES)/' Makefile.shared
+      '';
+      preConfigure=''
+        # It's configure does not like --build or --host
+        export configureFlags="${concatStringsSep " " (configureFlags ++ [ opensslCrossSystem ])}"
+        # WINDRES and RANLIB need to be prefixed when cross compiling;
+        # the openssl configure script doesn't do that for us
+        export WINDRES=${stdenv.cross.config}-windres
+        export RANLIB=${stdenv.cross.config}-ranlib
+      '';
+      configureScript = "./Configure";
+    };
+
+    meta = {
+      homepage = http://www.openssl.org/;
+      description = "A cryptographic library that implements the SSL and TLS protocols";
+      platforms = stdenv.lib.platforms.all;
+      maintainers = [ stdenv.lib.maintainers.simons ];
+      priority = 10; # resolves collision with ‘man-pages’
+    };
+  };
+
+in {
+
+  openssl_1_0_1 = common {
+    version = "1.0.1r";
     sha256 = "0iik7a3b0mrfrxzngdf7ywfscg9inbw77y0jp2ccw0gdap9xhjvq";
   };
 
-  outputs = [ "out" "man" ];
-
-  patches =
-    [ ./use-etc-ssl-certs.patch ]
-    ++ optional stdenv.isCygwin ./1.0.1-cygwin64.patch
-    ++ optional (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem")) ./darwin-arch.patch;
-
-  nativeBuildInputs = [ perl ];
-  buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
-
-  # On x86_64-darwin, "./config" misdetects the system as
-  # "darwin-i386-cc".  So specify the system type explicitly.
-  configureScript =
-    if stdenv.system == "x86_64-darwin" then "./Configure darwin64-x86_64-cc"
-    else if stdenv.system == "x86_64-solaris" then "./Configure solaris64-x86_64-gcc"
-    else "./config";
-
-  configureFlags = [
-    "shared"
-    "--libdir=lib"
-    "--openssldir=etc/ssl"
-  ] ++ stdenv.lib.optionals withCryptodev [
-    "-DHAVE_CRYPTODEV"
-    "-DUSE_CRYPTODEV_DIGESTS"
-  ];
-
-  makeFlags = [
-    "MANDIR=$(out)/share/man"
-  ];
-
-  # Parallel building is broken in OpenSSL.
-  enableParallelBuilding = false;
-
-  postInstall = ''
-    # If we're building dynamic libraries, then don't install static
-    # libraries.
-    if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
-        rm "$out/lib/"*.a
-    fi
-
-    # remove dependency on Perl at runtime
-    rm -r $out/etc/ssl/misc $out/bin/c_rehash
-
-    rmdir $out/etc/ssl/certs
-  '';
-
-  postFixup = ''
-    # Check to make sure we don't depend on perl
-    if grep -r '${perl}' $out; then
-      echo "Found an erroneous dependency on perl ^^^" >&2
-      exit 1
-    fi
-  '';
-
-  setupHook = builtins.toFile "openssl-setup-hook"
-    ''
-      export SSL_CERT_FILE=/no-cert-file.crt
-    '';
-
-  crossAttrs = {
-    # upstream patch: https://rt.openssl.org/Ticket/Display.html?id=2558
-    postPatch = ''
-       sed -i -e 's/[$][(]CROSS_COMPILE[)]windres/$(WINDRES)/' Makefile.shared
-    '';
-    preConfigure=''
-      # It's configure does not like --build or --host
-      export configureFlags="${concatStringsSep " " (configureFlags ++ [ opensslCrossSystem ])}"
-      # WINDRES and RANLIB need to be prefixed when cross compiling;
-      # the openssl configure script doesn't do that for us
-      export WINDRES=${stdenv.cross.config}-windres
-      export RANLIB=${stdenv.cross.config}-ranlib
-    '';
-    configureScript = "./Configure";
+  openssl_1_0_2 = common {
+    version = "1.0.2f";
+    sha256 = "932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c";
   };
 
-  meta = {
-    homepage = http://www.openssl.org/;
-    description = "A cryptographic library that implements the SSL and TLS protocols";
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.simons ];
-    priority = 10; # resolves collision with ‘man-pages’
-  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d25ccc49973..5440d3e04388 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8109,21 +8109,16 @@ let
   wolfssl = callPackage ../development/libraries/wolfssl { };
 
   openssl = openssl_1_0_1;
-  openssl_1_0_1 = callPackage ../development/libraries/openssl {
-    fetchurl = fetchurlBoot;
-    cryptodevHeaders = linuxPackages.cryptodev.override {
-      fetchurl = fetchurlBoot;
-      onlyHeaders = true;
-    };
-  };
 
-  openssl_1_0_2 = callPackage ../development/libraries/openssl/1.0.2.x.nix {
-    fetchurl = fetchurlBoot;
-    cryptodevHeaders = linuxPackages.cryptodev.override {
+  inherit (callPackages ../development/libraries/openssl {
       fetchurl = fetchurlBoot;
-      onlyHeaders = true;
-    };
-  };
+      cryptodevHeaders = linuxPackages.cryptodev.override {
+        fetchurl = fetchurlBoot;
+        onlyHeaders = true;
+      };
+    })
+    openssl_1_0_1
+    openssl_1_0_2;
 
   opensubdiv = callPackage ../development/libraries/opensubdiv { };
 

From 917ca8920da46b94867a01590423f66390a152c0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Feb 2016 13:59:10 +0100
Subject: [PATCH 1017/2285] Move setting $SSL_CERT_FILE to stdenv

Doing it in an openssl setup hook only works if packages have openssl
as a build input - it doesn't work if they're using a program linked
against openssl.
---
 pkgs/development/libraries/openssl/default.nix | 5 -----
 pkgs/stdenv/generic/setup.sh                   | 5 +++++
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 669b4810f85f..6300068f09fe 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -70,11 +70,6 @@ let
       fi
     '';
 
-    setupHook = builtins.toFile "openssl-setup-hook"
-      ''
-        export SSL_CERT_FILE=/no-cert-file.crt
-      '';
-
     crossAttrs = {
       # upstream patch: https://rt.openssl.org/Ticket/Display.html?id=2558
       postPatch = ''
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 102a8f2f71c5..dc6c765353f7 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -371,6 +371,11 @@ export NIX_BUILD_CORES
 paxmark() { true; }
 
 
+# Prevent OpenSSL-based applications from using certificates in
+# /etc/ssl.
+export SSL_CERT_FILE=/no-cert-file.crt
+
+
 ######################################################################
 # Textual substitution functions.
 

From 8ecd3a5e1db40d308d60b5ccfa40eabccb419be9 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 3 Feb 2016 13:51:16 +0100
Subject: [PATCH 1018/2285] nixos/stage-1: Fix references to readlink/basename

Fixes references coming from the mdadm udev rules.

This addresses #12722 (mdadm udev rules have references to /usr/bin) but
still won't fix the warning, though (if we want to fix the warnings, we
will have to patch the udev rules generater in services/hardware/udev).

For common mdraid functionality, this shouldn't fix anything, because
the wrong references seem to only apply to containers, see these
(wrapped) lines from ${mdadm}/lib/udev/rules.d/63-md-raid-arrays.rules:

  # Tell systemd to run mdmon for our container, if we need it.
  ENV{MD_LEVEL}=="raid[1-9]*",
    ENV{MD_CONTAINER}=="?*",
  PROGRAM="/usr/bin/readlink $env{MD_CONTAINER}",
    ENV{MD_MON_THIS}="%c"
    ENV{MD_MON_THIS}=="?*",
    PROGRAM="/usr/bin/basename $env{MD_MON_THIS}",
    ENV{SYSTEMD_WANTS}+="mdmon@%c.service"

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/system/boot/stage-1.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 98ef7ba024b4..1d9a67abcf9e 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -157,7 +157,9 @@ let
             --replace /sbin/blkid ${extraUtils}/bin/blkid \
             --replace ${pkgs.lvm2}/sbin ${extraUtils}/bin \
             --replace /sbin/mdadm ${extraUtils}/bin/mdadm \
-            --replace /bin/sh ${extraUtils}/bin/sh
+            --replace /bin/sh ${extraUtils}/bin/sh \
+            --replace /usr/bin/readlink ${extraUtils}/bin/readlink \
+            --replace /usr/bin/basename ${extraUtils}/bin/basename
       done
 
       # Work around a bug in QEMU, which doesn't implement the "READ

From b4528a696a6ea50b98ac1919fc2da85e325cab41 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 3 Feb 2016 15:51:28 +0300
Subject: [PATCH 1019/2285] initrd-network: call postCommands only if network
 is up

---
 nixos/modules/system/boot/initrd-network.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/system/boot/initrd-network.nix b/nixos/modules/system/boot/initrd-network.nix
index 8ccf56ff6e0d..6e226c190609 100644
--- a/nixos/modules/system/boot/initrd-network.nix
+++ b/nixos/modules/system/boot/initrd-network.nix
@@ -63,9 +63,9 @@ in
       copy_bin_and_libs ${pkgs.mkinitcpio-nfs-utils}/bin/ipconfig
     '';
 
-    boot.initrd.preLVMCommands =
+    boot.initrd.preLVMCommands = mkBefore (
       # Search for interface definitions in command line.
-      mkBefore ''
+      ''
         for o in $(cat /proc/cmdline); do
           case $o in
             ip=*)
@@ -87,11 +87,16 @@ in
 
           # Acquire a DHCP lease.
           echo "acquiring IP address via DHCP..."
-          udhcpc --quit --now --script ${udhcpcScript}
+          udhcpc --quit --now --script ${udhcpcScript} && hasNetwork=1
         fi
       ''
 
-      + cfg.postCommands;
+      + ''
+        if [ -n "$hasNetwork" ]; then
+          echo "networking is up!"
+          ${cfg.postCommands}
+        fi
+      '');
 
   };
 

From 1dce7c0b82ff3d02ab2bdfef917d1dc47bb63399 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 3 Feb 2016 16:37:10 +0300
Subject: [PATCH 1020/2285] initrd-ssh module: don't check if network is up

We already do this in initrd-network.
---
 nixos/modules/system/boot/initrd-ssh.nix | 34 +++++++++++-------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix
index 506e42bc024d..4cdc81541955 100644
--- a/nixos/modules/system/boot/initrd-ssh.nix
+++ b/nixos/modules/system/boot/initrd-ssh.nix
@@ -96,29 +96,27 @@ in
     '';
 
     boot.initrd.network.postCommands = ''
-      if [ -n "$hasNetwork" ]; then
-        mkdir /dev/pts
-        mount -t devpts devpts /dev/pts
+      mkdir /dev/pts
+      mount -t devpts devpts /dev/pts
 
-        echo '${cfg.shell}' > /etc/shells
-        echo 'root:x:0:0:root:/root:${cfg.shell}' > /etc/passwd
-        echo 'passwd: files' > /etc/nsswitch.conf
+      echo '${cfg.shell}' > /etc/shells
+      echo 'root:x:0:0:root:/root:${cfg.shell}' > /etc/passwd
+      echo 'passwd: files' > /etc/nsswitch.conf
 
-        mkdir -p /var/log
-        touch /var/log/lastlog
+      mkdir -p /var/log
+      touch /var/log/lastlog
 
-        mkdir -p /etc/dropbear
-        ${optionalString (cfg.hostRSAKey != null) "ln -s ${cfg.hostRSAKey} /etc/dropbear/dropbear_rsa_host_key"}
-        ${optionalString (cfg.hostDSSKey != null) "ln -s ${cfg.hostDSSKey} /etc/dropbear/dropbear_dss_host_key"}
-        ${optionalString (cfg.hostECDSAKey != null) "ln -s ${cfg.hostECDSAKey} /etc/dropbear/dropbear_ecdsa_host_key"}
+      mkdir -p /etc/dropbear
+      ${optionalString (cfg.hostRSAKey != null) "ln -s ${cfg.hostRSAKey} /etc/dropbear/dropbear_rsa_host_key"}
+      ${optionalString (cfg.hostDSSKey != null) "ln -s ${cfg.hostDSSKey} /etc/dropbear/dropbear_dss_host_key"}
+      ${optionalString (cfg.hostECDSAKey != null) "ln -s ${cfg.hostECDSAKey} /etc/dropbear/dropbear_ecdsa_host_key"}
 
-        mkdir -p /root/.ssh
-        ${concatStrings (map (key: ''
-          echo -n ${escapeShellArg key} >> /root/.ssh/authorized_keys
-        '') cfg.authorizedKeys)}
+      mkdir -p /root/.ssh
+      ${concatStrings (map (key: ''
+        echo -n ${escapeShellArg key} >> /root/.ssh/authorized_keys
+      '') cfg.authorizedKeys)}
 
-        dropbear -s -j -k -E -m -p ${toString cfg.port}
-      fi
+      dropbear -s -j -k -E -m -p ${toString cfg.port}
     '';
 
   };

From e0feace5cde328a8f7478b2cf762991316d4c07c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 3 Feb 2016 13:19:48 +0100
Subject: [PATCH 1021/2285] nixos docs: allow displaying package references

This is an improved version of original #12357.
For the purpose of generating docs, evaluate options with each derivation
in `pkgs` (recursively) replaced by a fake with path "\${pkgs.attribute.path}".
It isn't perfect, but it seems to cover a vast majority of use cases.
Caveat: even if the package is reached by a different means,
the path above will be shown and not e.g. `${config.services.foo.package}`.

As before, defaults created by `mkDefault` aren't displayed,
but documentation shouldn't (mostly) be a reason to use that anymore.

Note: t wouldn't be enough to just use `lib.mapAttrsRecursive`,
because derivations are also (special) attribute sets.
---
 nixos/modules/services/misc/nixos-manual.nix | 28 +++++++++++++++-----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 3e1f53e79f3e..8ef1b035ca6f 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -17,16 +17,32 @@ let
       nixpkgs.system = config.nixpkgs.system;
     };
 
-  eval = evalModules {
-    modules = [ versionModule ] ++ baseModules;
-    args = (config._module.args) // { modules = [ ]; };
-  };
-
+  /* For the purpose of generating docs, evaluate options with each derivation
+    in `pkgs` (recursively) replaced by a fake with path "\${pkgs.attribute.path}".
+    It isn't perfect, but it seems to cover a vast majority of use cases.
+    Caveat: even if the package is reached by a different means,
+    the path above will be shown and not e.g. `${config.services.foo.package}`. */
   manual = import ../../../doc/manual {
     inherit pkgs;
     version = config.system.nixosVersion;
     revision = config.system.nixosRevision;
-    options = eval.options;
+    options =
+      let
+        scrubbedEval = evalModules {
+          modules = [ versionModule ] ++ baseModules;
+          args = (config._module.args) // { modules = [ ]; };
+          specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; };
+        };
+        scrubDerivations = namePrefix: pkgSet: mapAttrs
+          (name: value:
+            let wholeName = "${namePrefix}.${name}"; in
+            if isAttrs value then
+              scrubDerivations wholeName value
+              // (optionalAttrs (isDerivation value) { outPath = "\${${wholeName}}"; })
+            else value
+          )
+          pkgSet;
+      in scrubbedEval.options;
   };
 
   entry = "${manual.manual}/share/doc/nixos/index.html";

From 4fede53c0996938979d2966a69f108782a8c1c12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 13 Jan 2016 11:48:11 +0100
Subject: [PATCH 1022/2285] nixos manuals: bring back package references

This reverts most of 89e983786a, as those references are sanitized now.
Fixes #10039, at least most of it.

The `sane` case wasn't fixed, as it calls a *function* in pkgs to get
the default value.
---
 nixos/modules/programs/ssh.nix                          | 3 +--
 nixos/modules/programs/venus.nix                        | 3 +--
 nixos/modules/services/amqp/activemq/default.nix        | 3 +--
 nixos/modules/services/misc/nixos-manual.nix            | 3 +--
 nixos/modules/services/misc/subsonic.nix                | 4 +---
 nixos/modules/services/monitoring/grafana.nix           | 4 +---
 nixos/modules/services/networking/dnscrypt-proxy.nix    | 5 ++++-
 nixos/modules/services/web-servers/phpfpm.nix           | 5 ++---
 nixos/modules/services/x11/display-managers/lightdm.nix | 4 +---
 9 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 169c6a38e75b..1ad45f468030 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -36,6 +36,7 @@ in
 
       askPassword = mkOption {
         type = types.str;
+        default = "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
         description = ''Program used by SSH to ask for passwords.'';
       };
 
@@ -226,7 +227,5 @@ in
 
     environment.variables.SSH_ASKPASS = optionalString config.services.xserver.enable askPassword;
 
-    programs.ssh.askPassword = mkDefault "${pkgs.x11_ssh_askpass}/libexec/x11-ssh-askpass";
-
   };
 }
diff --git a/nixos/modules/programs/venus.nix b/nixos/modules/programs/venus.nix
index c3756b4838c7..5c322c5589fc 100644
--- a/nixos/modules/programs/venus.nix
+++ b/nixos/modules/programs/venus.nix
@@ -99,6 +99,7 @@ in
       };
 
       outputTheme = mkOption {
+        default = "${pkgs.venus}/themes/classic_fancy";
         type = types.path;
         description = ''
           Directory containing a config.ini file which is merged with this one.
@@ -169,7 +170,5 @@ in
         startAt = cfg.dates;
       };
 
-    services.venus.outputTheme = mkDefault "${pkgs.venus}/themes/classic_fancy";
-
   };
 }
diff --git a/nixos/modules/services/amqp/activemq/default.nix b/nixos/modules/services/amqp/activemq/default.nix
index 56ff388f8a9e..261f97617664 100644
--- a/nixos/modules/services/amqp/activemq/default.nix
+++ b/nixos/modules/services/amqp/activemq/default.nix
@@ -32,6 +32,7 @@ in {
         '';
       };
       configurationDir = mkOption {
+        default = "${activemq}/conf";
         description = ''
           The base directory for ActiveMQ's configuration.
           By default, this directory is searched for a file named activemq.xml,
@@ -125,8 +126,6 @@ in {
       '';
     };
 
-    services.activemq.configurationDir = mkDefault "${activemq}/conf";
-
   };
 
 }
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 8ef1b035ca6f..b586bc84579b 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -96,6 +96,7 @@ in
 
     services.nixosManual.browser = mkOption {
       type = types.path;
+      default = "${pkgs.w3m-nox}/bin/w3m";
       description = ''
         Browser used to show the manual.
       '';
@@ -133,8 +134,6 @@ in
     services.mingetty.helpLine = mkIf cfg.showManual
       "\nPress <Alt-F${toString cfg.ttyNumber}> for the NixOS manual.";
 
-    services.nixosManual.browser = mkDefault "${pkgs.w3m-nox}/bin/w3m";
-
   };
 
 }
diff --git a/nixos/modules/services/misc/subsonic.nix b/nixos/modules/services/misc/subsonic.nix
index 2831e95b9480..020d53a481de 100644
--- a/nixos/modules/services/misc/subsonic.nix
+++ b/nixos/modules/services/misc/subsonic.nix
@@ -97,6 +97,7 @@ in
 
       transcoders = mkOption {
         type = types.listOf types.path;
+        default = [ "${pkgs.ffmpeg}/bin/ffmpeg" ];
         description = ''
           List of paths to transcoder executables that should be accessible
           from Subsonic. Symlinks will be created to each executable inside
@@ -152,8 +153,5 @@ in
     };
 
     users.extraGroups.subsonic.gid = config.ids.gids.subsonic;
-
-    services.subsonic.transcoders = mkDefault [ "${pkgs.ffmpeg}/bin/ffmpeg" ];
-
   };
 }
diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index 0b49038dd273..1dec528b5a2c 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -87,6 +87,7 @@ in {
 
     staticRootPath = mkOption {
       description = "Root path for static assets.";
+      default = "${cfg.package.out}/share/grafana/public";
       type = types.str;
     };
 
@@ -232,8 +233,5 @@ in {
       home = cfg.dataDir;
       createHome = true;
     };
-
-    services.grafana.staticRootPath = mkDefault "${cfg.package}/share/grafana/public";
-
   };
 }
diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix
index 218bce2dbb31..c724ee979c2d 100644
--- a/nixos/modules/services/networking/dnscrypt-proxy.nix
+++ b/nixos/modules/services/networking/dnscrypt-proxy.nix
@@ -52,7 +52,10 @@ in
         default = "opendns";
         type = types.nullOr types.string;
         description = ''
-          The name of the upstream DNSCrypt resolver to use.
+          The name of the upstream DNSCrypt resolver to use. See
+          <literal>${resolverListFile}</literal> for alternative resolvers
+          (e.g., if you are concerned about logging and/or server
+          location).
         '';
       };
       customResolver = mkOption {
diff --git a/nixos/modules/services/web-servers/phpfpm.nix b/nixos/modules/services/web-servers/phpfpm.nix
index bdd41ed702b5..277180fe139d 100644
--- a/nixos/modules/services/web-servers/phpfpm.nix
+++ b/nixos/modules/services/web-servers/phpfpm.nix
@@ -46,7 +46,8 @@ in {
 
       phpIni = mkOption {
         type = types.path;
-        description = "PHP configuration file to use.";
+        default = "${cfg.phpPackage}/etc/php-recommended.ini";
+        description = "php.ini file to use.";
       };
 
       poolConfigs = mkOption {
@@ -87,7 +88,5 @@ in {
       };
     };
 
-    services.phpfpm.phpIni = mkDefault "${cfg.phpPackage}/etc/php-recommended.ini";
-
   };
 }
diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix
index 3949bf01a316..ac7db3d9adc4 100644
--- a/nixos/modules/services/x11/display-managers/lightdm.nix
+++ b/nixos/modules/services/x11/display-managers/lightdm.nix
@@ -87,6 +87,7 @@ in
 
       background = mkOption {
         type = types.str;
+        default = "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png";
         description = ''
           The background image or color to use.
         '';
@@ -152,9 +153,6 @@ in
     };
 
     users.extraGroups.lightdm.gid = config.ids.gids.lightdm;
-
-    services.xserver.displayManager.lightdm.background = mkDefault "${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png";
-
     services.xserver.tty     = null; # We might start multiple X servers so let the tty increment themselves..
     services.xserver.display = null; # We specify our own display (and logfile) in xserver-wrapper up there
   };

From 42709fb4e994df64bce606afe46d38c3d93142b4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 3 Feb 2016 14:58:18 +0100
Subject: [PATCH 1023/2285] switch-to-configuration: Handle failure to read
 /proc/1/exe

It's not entirely clear why this happens, but sometimes /proc/1/exe
returns a bogus value, like
/ar3a3j6b9livhy5fcfv69izslhgk4gcz-systemd-217/lib/systemd/systemd. In
any case, we can just conservatively assume that we need to restart
systemd when this happens.

Fixes #10261.
---
 nixos/modules/system/activation/switch-to-configuration.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl
index 655fbab2a843..d9048427801f 100644
--- a/nixos/modules/system/activation/switch-to-configuration.pl
+++ b/nixos/modules/system/activation/switch-to-configuration.pl
@@ -323,7 +323,7 @@ foreach my $device (keys %$prevSwaps) {
 
 
 # Should we have systemd re-exec itself?
-my $prevSystemd = abs_path("/proc/1/exe") or die;
+my $prevSystemd = abs_path("/proc/1/exe") // "/unknown";
 my $newSystemd = abs_path("@systemd@/lib/systemd/systemd") or die;
 my $restartSystemd = $prevSystemd ne $newSystemd;
 

From 43a726cd201a9c2b732832cd0740b5e047fa99df Mon Sep 17 00:00:00 2001
From: lukasepple <git@lukasepple.de>
Date: Sun, 10 Jan 2016 12:31:01 +0100
Subject: [PATCH 1024/2285] ocaml-x509: 0.4.0 -> 0.5.0

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

diff --git a/pkgs/development/ocaml-modules/x509/default.nix b/pkgs/development/ocaml-modules/x509/default.nix
index 6fdbbc346d92..0d9b657969d1 100644
--- a/pkgs/development/ocaml-modules/x509/default.nix
+++ b/pkgs/development/ocaml-modules/x509/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchzip, ocaml, findlib, asn1-combinators, nocrypto, ounit }:
 
-let version = "0.4.0"; in
+let version = "0.5.0"; in
 
 stdenv.mkDerivation {
   name = "ocaml-x509-${version}";
 
   src = fetchzip {
     url = "https://github.com/mirleft/ocaml-x509/archive/${version}.tar.gz";
-    sha256 = "0z4c19y625ipx2anpq25pzly1fdi3cklhk130kriybrczvmd2b29";
+    sha256 = "0i9618ph4i2yk5dvvhiqhm7wf3qmd6b795mxwff8jf856gb2gdyn";
   };
 
   buildInputs = [ ocaml findlib ounit ];

From ee68bdc42e2d1f3826d69ca2a2ecca3db108b7b5 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 3 Feb 2016 15:12:57 +0100
Subject: [PATCH 1025/2285] nixos/udev: Fix up readlink and basename as well

In 8ecd3a5, we fixed up the FHS paths for stage 1, but unfortunately we
have a similar udev rules generator twice one for the initrd and one
without. So we might need to refactor this in the future.

For now, let's just fix the references to readlink and basename in the
udev module as well until we have properly addressed this.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes: #12722
---
 nixos/modules/services/hardware/udev.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index daa2fd89baca..1821fe8c0b8a 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -61,7 +61,9 @@ let
           --replace \"/sbin/modprobe \"${config.system.sbin.modprobe}/sbin/modprobe \
           --replace \"/sbin/mdadm \"${pkgs.mdadm}/sbin/mdadm \
           --replace \"/sbin/blkid \"${pkgs.utillinux}/sbin/blkid \
-          --replace \"/bin/mount \"${pkgs.utillinux}/bin/mount
+          --replace \"/bin/mount \"${pkgs.utillinux}/bin/mount \
+          --replace /usr/bin/readlink ${pkgs.coreutils}/bin/readlink \
+          --replace /usr/bin/basename ${pkgs.coreutils}/bin/basename
       done
 
       echo -n "Checking that all programs called by relative paths in udev rules exist in ${udev}/lib/udev... "

From 80983bbe54cfb69f361e64b8b8cdb5ab79720ec7 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 3 Feb 2016 14:21:45 +0100
Subject: [PATCH 1026/2285] nixos/udev: Provide a better warning for FHS paths

We were trying to find FHS references in all of the rules found in
services.udev.packages. Unfortunately we're still fixing up paths in the
same derivation where we are checking those references, so for example
references to /sbin/modprobe were still printed to be needed to fixup
even though they were already fixed at the time.

So now we're printing a more helpful warning message which is also
conditional (before the warning message was printed regardless of
whether there are any rules that need fixup) and is based off the rules
that were already fixed up.

The new warning message not only contains the build-local rule files but
also the original files from other store paths and the FHS path
references that were still found.

With 8ecd3a5e1db40d308d60b5ccfa40eabccb419be9 reverted, we now get this:

/nix/store/...-udev-rules/63-md-raid-arrays.rules (originally from
 /nix/store/...-mdadm-3.3.4/lib/udev/rules.d/63-md-raid-arrays.rules)
 contains references to /usr/bin/readlink and /usr/bin/basename.

Which is now more accurate to what is not yet fixed and where it's
coming from.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/services/hardware/udev.nix | 27 ++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 1821fe8c0b8a..dc87c9215e65 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -94,10 +94,29 @@ let
       done
       echo "OK"
 
-      echo "Consider fixing the following udev rules:"
-      for i in ${toString cfg.packages}; do
-        grep -l '\(RUN+\|IMPORT{program}\)="\(/usr\)\?/s\?bin' $i/*/udev/rules.d/* || true
-      done
+      filesToFixup="$(for i in "$out"/*; do
+        grep -l '\B\(/usr\)\?/s\?bin' "$i" || :
+      done)"
+
+      if [ -n "$filesToFixup" ]; then
+        echo "Consider fixing the following udev rules:"
+        echo "$filesToFixup" | while read localFile; do
+          remoteFile="origin unknown"
+          for i in ${toString cfg.packages}; do
+            for j in "$i"/*/udev/rules.d/*; do
+              if [ -e "$out/$(basename "$j")" ]; then
+                remoteFile="originally from $j"
+                break 2
+              fi
+            done
+          done
+          refs="$(
+            grep -o '\B\(/usr\)\?/s\?bin/[^ "]\+' "$localFile" \
+              | sed -e ':r;N;''${s/\n/ and /;br};s/\n/, /g;br'
+          )"
+          echo "$localFile ($remoteFile) contains references to $refs."
+        done
+      fi
 
       ${optionalString config.networking.usePredictableInterfaceNames ''
         cp ${./80-net-setup-link.rules} $out/80-net-setup-link.rules

From 9f2a61c59cc4e4ce278e6582cb4bdca9c2088755 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 3 Feb 2016 14:45:19 +0100
Subject: [PATCH 1027/2285] nixos/udev: Add an option to fail on FHS paths

So far we were merely printing a warning if there are still references
to (/usr)/s?bin, but we actually want to make sure that we fix those
paths, especially on updates of packages that come with udev rules.

This adds a new option allowImpurePaths, which when set to false will
cause the "udev-rules" derivation to fail.

I've set this to true by default, to not break existing systems too much
and the intention is to set it to false for a few NixOS VM tests.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/services/hardware/udev.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index dc87c9215e65..74ec335c7509 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -116,6 +116,7 @@ let
           )"
           echo "$localFile ($remoteFile) contains references to $refs."
         done
+        ${optionalString (!cfg.allowImpurePaths) "exit 1"}
       fi
 
       ${optionalString config.networking.usePredictableInterfaceNames ''
@@ -231,6 +232,20 @@ in
         '';
       };
 
+      allowImpurePaths = mkOption {
+        default = true;
+        example = false;
+        type = types.bool;
+        description = ''
+          If this is disabled, the build will fail whenever one of the
+          <command>udev</command> rules contains a reference to
+          <filename>/usr/bin</filename>, <filename>/usr/sbin</filename>,
+          <filename>/bin</filename> or <filename>/sbin</filename>.
+
+          By default only a warning is printed during build.
+        '';
+      };
+
     };
 
     hardware.firmware = mkOption {

From 9c13fe6604358e5255457422acbe8e03734f1e44 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 3 Feb 2016 14:49:56 +0100
Subject: [PATCH 1028/2285] nixos/tests/installer: Fail on impure udev rules

With 9f2a61c in place, let's actually use this in the installer tests to
make sure we won't shovel FHS paths down the throad of unstable channel
users.

I've tested this by running all of the installer tests for x86_64-linux
and they all succeeded.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/tests/installer.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 84fdb027ed85..cbfdad8d76bb 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -30,6 +30,8 @@ let
 
         hardware.enableAllFirmware = lib.mkForce false;
 
+        services.udev.allowImpurePaths = false;
+
         ${replaceChars ["\n"] ["\n  "] extraConfig}
       }
     '';
@@ -185,6 +187,8 @@ let
 
             hardware.enableAllFirmware = mkForce false;
 
+            services.udev.allowImpurePaths = false;
+
             # The test cannot access the network, so any packages we
             # need must be included in the VM.
             system.extraDependencies =

From 2c4f6af55d17c7b2b70e8bc684a8cdcbdf563f2b Mon Sep 17 00:00:00 2001
From: lukasepple <git@lukasepple.de>
Date: Wed, 3 Feb 2016 15:55:58 +0100
Subject: [PATCH 1029/2285] rakudo-star: 2015.03 -> 2015.11

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

diff --git a/pkgs/development/interpreters/rakudo/default.nix b/pkgs/development/interpreters/rakudo/default.nix
index dc9323f40efd..cd1631e23a16 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 = "2015.03";
+  version = "2015.11";
 
   src = fetchurl {
     url    = "http://rakudo.org/downloads/star/${name}.tar.gz";
-    sha256 = "1fwvmjyc1bv3kq7p25xyl4sqinp19mbrspmf0h7rvxlwnfcrr5mv";
+    sha256 = "1rzabg8daxf2g4l1njhdv3gfav91mp3y9my0mpz2xw06cxqfsjki";
   };
 
   buildInputs = [ icu zlib gmp readline jdk perl ];

From 3701e7b74ed511e03afd01d290b70861a439edad Mon Sep 17 00:00:00 2001
From: Tom von Schwerdtner <tomvons@gmail.com>
Date: Tue, 2 Feb 2016 21:04:52 -0500
Subject: [PATCH 1030/2285] plex: 0.9.14.6.1620-e0b7243 ->
 0.9.15.2.1663-7efd046

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

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 2aeb9379e10f..29cd45714d7f 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -4,12 +4,12 @@
 
 stdenv.mkDerivation rec {
   name = "plex-${version}";
-  version = "0.9.14.6.1620";
-  vsnHash = "e0b7243";
+  version = "0.9.15.2.1663";
+  vsnHash = "7efd046";
 
   src = fetchurl {
     url    = "https://downloads.plex.tv/plex-media-server/${version}-${vsnHash}/plexmediaserver-${version}-${vsnHash}.x86_64.rpm";
-    sha256 = "0br82yxnvjapvsrb0mbfd12mx7qqi9zh623jnivsjk2gxbfd3ki1";
+    sha256 = "f06225807c6284914bca1cfaec4490d594c53a2c794d916b321658388d40f9cf";
   };
 
   buildInputs = [ rpmextract glibc ];

From fd9fb59790a352def5832e134f6bfe32a2f9ada8 Mon Sep 17 00:00:00 2001
From: Tom von Schwerdtner <tomvons@gmail.com>
Date: Tue, 2 Feb 2016 21:46:40 -0500
Subject: [PATCH 1031/2285] elixir: 1.2.0 -> 1.2.2

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

diff --git a/pkgs/development/interpreters/elixir/default.nix b/pkgs/development/interpreters/elixir/default.nix
index 642bde39e7e9..25b0b02a33bc 100644
--- a/pkgs/development/interpreters/elixir/default.nix
+++ b/pkgs/development/interpreters/elixir/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "elixir-${version}";
-  version = "1.2.0";
+  version = "1.2.2";
 
   src = fetchurl {
     url = "https://github.com/elixir-lang/elixir/archive/v${version}.tar.gz";
-    sha256 = "0s3j7ra9gb2p3dwgfxghvc9mkv6ffgvz27aj5wgwk0xq2d9fws4z";
+    sha256 = "0ml0sl1l5ibb8qh505fsd7y87wq9qjvaxw9y1dyfcw00d3i1z989";
   };
 
   buildInputs = [ erlang rebar makeWrapper ];

From c10a17a3ebfe460e713ba6b766fbdabd8c8f716c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 3 Feb 2016 16:40:41 +0100
Subject: [PATCH 1032/2285] nixos/udev: Always fail if rules contain FHS paths

Partially reverts the following commits:

  9f2a61c59cc4e4ce278e6582cb4bdca9c2088755
  9c13fe6604358e5255457422acbe8e03734f1e44

As @edolstra pointed out, it would make more sense to do this by default
instead of having that allowImpurePaths option. This of course might
break systems which add extra packages to udev, but on the upside it's
hard to miss one of these paths now because it won't get buried in the
ocean of build output lines.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/services/hardware/udev.nix | 16 +---------------
 nixos/tests/installer.nix                |  4 ----
 2 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 74ec335c7509..74200eec4c04 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -116,7 +116,7 @@ let
           )"
           echo "$localFile ($remoteFile) contains references to $refs."
         done
-        ${optionalString (!cfg.allowImpurePaths) "exit 1"}
+        exit 1
       fi
 
       ${optionalString config.networking.usePredictableInterfaceNames ''
@@ -232,20 +232,6 @@ in
         '';
       };
 
-      allowImpurePaths = mkOption {
-        default = true;
-        example = false;
-        type = types.bool;
-        description = ''
-          If this is disabled, the build will fail whenever one of the
-          <command>udev</command> rules contains a reference to
-          <filename>/usr/bin</filename>, <filename>/usr/sbin</filename>,
-          <filename>/bin</filename> or <filename>/sbin</filename>.
-
-          By default only a warning is printed during build.
-        '';
-      };
-
     };
 
     hardware.firmware = mkOption {
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index cbfdad8d76bb..84fdb027ed85 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -30,8 +30,6 @@ let
 
         hardware.enableAllFirmware = lib.mkForce false;
 
-        services.udev.allowImpurePaths = false;
-
         ${replaceChars ["\n"] ["\n  "] extraConfig}
       }
     '';
@@ -187,8 +185,6 @@ let
 
             hardware.enableAllFirmware = mkForce false;
 
-            services.udev.allowImpurePaths = false;
-
             # The test cannot access the network, so any packages we
             # need must be included in the VM.
             system.extraDependencies =

From f89a136fd508c88a4f5aa7332e380603a802eb5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 1 Feb 2016 14:42:33 +0100
Subject: [PATCH 1033/2285] cc-wrapper: fixup branch interactions

c0599fdd61c and changes on closure-size didn't go well together.
---
 pkgs/build-support/cc-wrapper/cc-wrapper.sh   | 4 ++--
 pkgs/build-support/cc-wrapper/default.nix     | 2 +-
 pkgs/build-support/cc-wrapper/gnat-wrapper.sh | 4 ++--
 pkgs/build-support/cc-wrapper/ld-wrapper.sh   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
index 6e12a0d8bc8f..99cee577cd33 100644
--- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh
@@ -1,7 +1,7 @@
 #! @shell@ -e
 path_backup="$PATH"
-if [ -n "@coreutils@" ]; then
-  PATH="@coreutils@/bin:@gnugrep@/bin"
+if [ -n "@coreutils_bin@" ]; then
+  PATH="@coreutils_bin@/bin:@gnugrep_bin@/bin"
 fi
 
 if [ -n "$NIX_CC_WRAPPER_START_HOOK" ]; then
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index 0458eedc62bc..6cdd04772445 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation {
   preferLocalBuild = true;
 
   inherit cc shell libc_bin libc_dev libc_lib binutils_bin coreutils_bin;
-  gnugrep = if nativeTools then "" else gnugrep;
+  gnugrep_bin = if nativeTools then "" else gnugrep;
 
   passthru = { inherit libc nativeTools nativeLibc nativePrefix isGNU isClang; };
 
diff --git a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
index ae46b40ac631..06858da512a7 100644
--- a/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/gnat-wrapper.sh
@@ -1,7 +1,7 @@
 #! @shell@ -e
 path_backup="$PATH"
-if [ -n "@coreutils@" ]; then
-  PATH="@coreutils@/bin"
+if [ -n "@coreutils_bin@" ]; then
+  PATH="@coreutils_bin@/bin"
 fi
 
 if [ -n "$NIX_GNAT_WRAPPER_START_HOOK" ]; then
diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
index 6ef06eb70348..955b3767a62f 100644
--- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh
+++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh
@@ -1,7 +1,7 @@
 #! @shell@ -e
 path_backup="$PATH"
-if [ -n "@coreutils@" ]; then
-  PATH="@coreutils@/bin"
+if [ -n "@coreutils_bin@" ]; then
+  PATH="@coreutils_bin@/bin"
 fi
 
 if [ -n "$NIX_LD_WRAPPER_START_HOOK" ]; then

From bd2ca1e539c71e83445bb04ccc0e15cb4c80861f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 2 Feb 2016 04:56:56 +0100
Subject: [PATCH 1034/2285] libvdpau: fixup branch interactions

This solution is cleaner anyway.
---
 pkgs/development/libraries/libvdpau/default.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix
index c2ec587a52e3..da0773335a4d 100644
--- a/pkgs/development/libraries/libvdpau/default.nix
+++ b/pkgs/development/libraries/libvdpau/default.nix
@@ -16,13 +16,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-module-dir=${mesa_noglu.driverLink}/lib/vdpau" ];
 
-  installFlags = [ "DESTDIR=$(out)" ];
-
-  postInstall = ''
-    cp -r $out/${mesa_noglu.driverLink}/* $out
-    cp -r $out/$out/* $out
-    rm -rf $out/run $out/$(echo "$out" | cut -d "/" -f2)
-  '';
+  installFlags = [ "moduledir=$(out)/lib/vdpau" ];
 
   meta = with stdenv.lib; {
     homepage = http://people.freedesktop.org/~aplattner/vdpau/;

From 2c51a075ab12c2ec06ced04bd9bcc0d809a804ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 2 Feb 2016 04:58:34 +0100
Subject: [PATCH 1035/2285] makeFontsConf: fix with multiple outputs

---
 pkgs/development/libraries/fontconfig/make-fonts-cache.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
index 1321948c3c81..b996cd228c77 100644
--- a/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
+++ b/pkgs/development/libraries/fontconfig/make-fonts-cache.nix
@@ -16,7 +16,7 @@ runCommand "fc-cache"
     <?xml version='1.0'?>
     <!DOCTYPE fontconfig SYSTEM 'fonts.dtd'>
     <fontconfig>
-      <include>${fontconfig}/etc/fonts/fonts.conf</include>
+      <include>${fontconfig.out}/etc/fonts/fonts.conf</include>
       <cachedir>$out</cachedir>
     EOF
     cat "$fontDirsPath" >> fonts.conf

From 80270e201981bd8fedc51935dfe46e8885e72b31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 31 Jan 2016 19:33:27 +0100
Subject: [PATCH 1036/2285] cmake: maintenance updates 3.4.0 -> 3.4.3

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

diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 09e54d3dfa63..c8ed91b96fb0 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -11,7 +11,7 @@ assert wantPS -> (ps != null);
 let
   os = stdenv.lib.optionalString;
   majorVersion = "3.4";
-  minorVersion = "0";
+  minorVersion = "3";
   version = "${majorVersion}.${minorVersion}";
 in
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}files/v${majorVersion}/cmake-${version}.tar.gz";
-    sha256 = "1shwim3gfdybjx9f11ykxz5l09rh58vmvz8ip76q3i76mkv2pf55";
+    sha256 = "1yl0z422gr7zfc638chifv343vx0ig5gasvrh7nzf7b15488qgxp";
   };
 
   enableParallelBuilding = true;

From 824c8dfa9573d1913fd3f21b586f0188de042c91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 1 Feb 2016 12:31:17 +0100
Subject: [PATCH 1037/2285] add ensureNewerSourcesHook and apply to all python

Fixes #12663: problems in python stuff due to old timestamps in sources.
- Files in sources older than a certain year are set to that year.
- Applied with 1980 for all python packages due to the way it often uses zip.

(cherry picked from staging commit e4ab8aee62fe65252b40861900decc7e880517a7)
---
 pkgs/development/python-modules/generic/default.nix | 4 +++-
 pkgs/top-level/all-packages.nix                     | 8 ++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index dab20b2f7447..15f369a44f2d 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -3,7 +3,8 @@
    (http://pypi.python.org/pypi/setuptools/), which represents a large
    number of Python packages nowadays.  */
 
-{ python, setuptools, unzip, wrapPython, lib, bootstrapped-pip }:
+{ python, setuptools, unzip, wrapPython, lib, bootstrapped-pip
+, ensureNewerSourcesHook }:
 
 { name
 
@@ -60,6 +61,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] //
   name = namePrefix + name;
 
   buildInputs = [ wrapPython bootstrapped-pip ] ++ buildInputs ++ pythonPath
+    ++ [ (ensureNewerSourcesHook { year = "1980"; }) ]
     ++ (lib.optional (lib.hasSuffix "zip" attrs.src.name or "") unzip);
 
   # propagate python/setuptools to active setup-hook in nix-shell
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0eda14f2f4cb..393eb4b37c88 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -259,6 +259,14 @@ let
     { substitutions = { inherit autoconf automake gettext libtool; }; }
     ../build-support/setup-hooks/autoreconf.sh;
 
+  ensureNewerSourcesHook = { year }: makeSetupHook {}
+    (writeScript "ensure-newer-sources-hook.sh" ''
+      postUnpackHooks+=(_ensureNewerSources)
+      _ensureNewerSources() {
+        find "$sourceRoot" '!' -newermt '${year}-01-01' -exec touch -d '${year}-01-02' '{}' '+'
+      }
+    '');
+
   buildEnv = callPackage ../build-support/buildenv { }; # not actually a package
 
   buildFHSEnv = callPackage ../build-support/build-fhs-chrootenv/env.nix {

From 89036ef76ab09af6ba324c896f0db00ae1ebaab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 29 Jan 2016 11:53:50 +0100
Subject: [PATCH 1038/2285] stdenv: accept wider range of $configureScript
 options

Fixes #12632.

I think it's better to quote this variable in general, because it is
common and even documented to pass space-separated commands in there.
The greps should just fail in that case and `if` won't proceed
which seems fine for such cases, and it's certainly better than
passing additional unintended parameters to grep
(which was happening all the time before).
---
 pkgs/stdenv/generic/setup.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index dc6c765353f7..7d25472993c5 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -644,14 +644,14 @@ configurePhase() {
 
     # Add --disable-dependency-tracking to speed up some builds.
     if [ -z "$dontAddDisableDepTrack" ]; then
-        if grep -q dependency-tracking $configureScript; then
+        if grep -q dependency-tracking "$configureScript"; then
             configureFlags="--disable-dependency-tracking $configureFlags"
         fi
     fi
 
     # By default, disable static builds.
     if [ -z "$dontDisableStatic" ]; then
-        if grep -q enable-static $configureScript; then
+        if grep -q enable-static "$configureScript"; then
             configureFlags="--disable-static $configureFlags"
         fi
     fi

From 108570129324b72a486cdd1af38e6aaf5a0499de Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 3 Feb 2016 11:34:35 +0200
Subject: [PATCH 1039/2285] gnutar: Depend on 'acl' only on Linux

I'm not sure why but the 'acl' dependency only exists in the
multiple-outputs branch...
---
 pkgs/tools/archivers/gnutar/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/archivers/gnutar/default.nix b/pkgs/tools/archivers/gnutar/default.nix
index 6b5717ab2970..36d3ebd9816f 100644
--- a/pkgs/tools/archivers/gnutar/default.nix
+++ b/pkgs/tools/archivers/gnutar/default.nix
@@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
 
   outputs = [ "out" "info" ];
 
-  buildInputs = [ acl ]
+  buildInputs = [ ]
+    ++ stdenv.lib.optional stdenv.isLinux acl
     ++ stdenv.lib.optional stdenv.isDarwin autoreconfHook;
 
   # May have some issues with root compilation because the bootstrap tool

From 4c57b932ab42be3f36663ceeb54df08dadc46f67 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Tue, 2 Feb 2016 18:02:31 -0500
Subject: [PATCH 1040/2285] cipherscan: init at rev 18b0d1b (Dec 17, 2015)

CipherScan is a simple way to find out which SSL ciphersuites are
supported by a target.

It can take advantage of the extra features in Peter Mosmans' openssl
fork (which is also included in this commit).
---
 pkgs/development/libraries/openssl/chacha.nix | 70 ++++++++++++++
 pkgs/tools/security/cipherscan/default.nix    | 43 +++++++++
 pkgs/tools/security/cipherscan/path.patch     | 93 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               | 13 +++
 4 files changed, 219 insertions(+)
 create mode 100644 pkgs/development/libraries/openssl/chacha.nix
 create mode 100644 pkgs/tools/security/cipherscan/default.nix
 create mode 100644 pkgs/tools/security/cipherscan/path.patch

diff --git a/pkgs/development/libraries/openssl/chacha.nix b/pkgs/development/libraries/openssl/chacha.nix
new file mode 100644
index 000000000000..b610f27d17cf
--- /dev/null
+++ b/pkgs/development/libraries/openssl/chacha.nix
@@ -0,0 +1,70 @@
+{ stdenv, fetchFromGitHub, perl, zlib
+, withCryptodev ? false, cryptodevHeaders
+}:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+  name = "openssl-chacha-${version}";
+  version = "2016-01-27";
+
+  src = fetchFromGitHub {
+    owner = "PeterMosmans";
+    repo = "openssl";
+    rev = "4576ede5b08242bcd6749fc284c691ed177842b7";
+    sha256 = "1030rs4bdaysxbq0mmck1dn6g5adspzkwsrnhvv16b4ig0r4ncgj";
+  };
+
+  nativeBuildInputs = [ perl zlib ];
+  buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
+
+  configureScript = "./config";
+
+  configureFlags = [
+    "zlib"
+    "shared"
+    "experimental-jpake"
+    "enable-md2"
+    "enable-rc5"
+    "enable-rfc3779"
+    "enable-gost"
+    "--libdir=lib"
+    "--openssldir=etc/ssl"
+  ] ++ stdenv.lib.optionals withCryptodev [
+    "-DHAVE_CRYPTODEV"
+    "-DUSE_CRYPTODEV_DIGESTS"
+  ];
+
+  makeFlags = [
+    "MANDIR=$(out)/share/man"
+  ];
+
+  # Parallel building is broken in OpenSSL.
+  enableParallelBuilding = false;
+
+  postInstall = ''
+    # If we're building dynamic libraries, then don't install static
+    # libraries.
+    if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then
+        rm "$out/lib/"*.a
+    fi
+
+    # remove dependency on Perl at runtime
+    rm -r $out/etc/ssl/misc $out/bin/c_rehash
+  '';
+
+  postFixup = ''
+    # Check to make sure we don't depend on perl
+    if grep -r '${perl}' $out; then
+      echo "Found an erroneous dependency on perl ^^^" >&2
+      exit 1
+    fi
+  '';
+
+  meta = {
+    homepage = http://www.openssl.org/;
+    description = "A cryptographic library that implements the SSL and TLS protocols";
+    platforms = [ "x86_64-linux" ];
+    maintainers = [ stdenv.lib.maintainers.cstrahan ];
+    priority = 10; # resolves collision with ‘man-pages’
+  };
+}
diff --git a/pkgs/tools/security/cipherscan/default.nix b/pkgs/tools/security/cipherscan/default.nix
new file mode 100644
index 000000000000..e75b53b257d1
--- /dev/null
+++ b/pkgs/tools/security/cipherscan/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, lib, fetchFromGitHub, pkgconfig, openssl, makeWrapper, python, coreutils }:
+
+stdenv.mkDerivation rec {
+  name = "cipherscan-${version}";
+  version = "2015-12-17";
+  src = fetchFromGitHub {
+    owner = "jvehent";
+    repo = "cipherscan";
+    rev = "18b0d1b952d027d20e38f07329817873ec077d26";
+    sha256 = "0b6fkfm2y8w04am4krspmapcc5ngn603n5rlwyjly92z2dawc7h8";
+  };
+  buildInputs = [ makeWrapper python ];
+  patches = [ ./path.patch ];
+  buildPhase = ''
+    substituteInPlace cipherscan \
+      --replace "@OPENSSLBIN@" \
+                "${openssl}/bin/openssl" \
+      --replace "@TIMEOUTBIN@" \
+                "${coreutils}/bin/timeout" \
+      --replace "@READLINKBIN@" \
+                "${coreutils}/bin/readlink"
+
+    substituteInPlace analyze.py \
+      --replace "@OPENSSLBIN@" \
+                "${openssl}/bin/openssl"
+  '';
+  installPhase = ''
+    mkdir -p $out/bin
+
+    cp cipherscan $out/bin
+    cp openssl.cnf $out/bin
+    cp analyze.py $out/bin
+
+    wrapProgram $out/bin/analyze.py --set PYTHONPATH "$PYTHONPATH"
+  '';
+  meta = with lib; {
+    description = "Very simple way to find out which SSL ciphersuites are supported by a target";
+    homepage = "https://github.com/jvehent/cipherscan";
+    license = licenses.mpl;
+    platforms = platforms.all;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/tools/security/cipherscan/path.patch b/pkgs/tools/security/cipherscan/path.patch
new file mode 100644
index 000000000000..3b6d8ef80509
--- /dev/null
+++ b/pkgs/tools/security/cipherscan/path.patch
@@ -0,0 +1,93 @@
+diff --git a/analyze.py b/analyze.py
+index bb62af8..e929253 100755
+--- a/analyze.py
++++ b/analyze.py
+@@ -418,13 +418,7 @@ def build_ciphers_lists(opensslbin):
+ 
+     # use system openssl if not on linux 64
+     if not opensslbin:
+-        if platform.system() == 'Linux' and platform.architecture()[0] == '64bit':
+-            opensslbin = mypath + '/openssl'
+-        elif platform.system() == 'Darwin' and platform.architecture()[0] == '64bit':
+-            opensslbin = mypath + '/openssl-darwin64'
+-        else:
+-            opensslbin='openssl'
+-            print("warning: analyze.py is using system's openssl, which may limit the tested ciphers and recommendations")
++        opensslbin = "@OPENSSLBIN@"
+ 
+     logging.debug('Loading all ciphers: ' + allC)
+     all_ciphers = subprocess.Popen([opensslbin, 'ciphers', allC],
+diff --git a/cipherscan b/cipherscan
+index 236b34f..a240d13 100755
+--- a/cipherscan
++++ b/cipherscan
+@@ -30,43 +30,12 @@ if [[ -n $NOAUTODETECT ]]; then
+ else
+     case "$(uname -s)" in
+         Darwin)
+-            opensslbin_name="openssl-darwin64"
+-
+-            READLINKBIN=$(which greadlink 2>/dev/null)
+-            if [[ -z $READLINKBIN ]]; then
+-                echo "greadlink not found. (try: brew install coreutils)" 1>&2
+-                exit 1
+-            fi
+-            TIMEOUTBIN=$(which gtimeout 2>/dev/null)
+-            if [[ -z $TIMEOUTBIN ]]; then
+-                echo "gtimeout not found. (try: brew install coreutils)" 1>&2
+-                exit 1
+-            fi
++            READLINKBIN="@READLINKBIN@"
++            TIMEOUTBIN="@TIMEOUTBIN@"
+             ;;
+         *)
+-            opensslbin_name="openssl"
+-
+-            # test that readlink or greadlink (darwin) are present
+-            READLINKBIN="$(which readlink)"
+-
+-            if [[ -z $READLINKBIN ]]; then
+-                READLINKBIN="$(which greadlink)"
+-                if [[ -z $READLINKBIN ]]; then
+-                    echo "neither readlink nor greadlink are present. install coreutils with {apt-get,yum,brew} install coreutils" 1>&2
+-                    exit 1
+-                fi
+-            fi
+-
+-            # test that timeout or gtimeout (darwin) are present
+-            TIMEOUTBIN="$(which timeout)"
+-
+-            if [[ -z $TIMEOUTBIN ]]; then
+-                TIMEOUTBIN="$(which gtimeout)"
+-                if [[ -z $TIMEOUTBIN ]]; then
+-                    echo "neither timeout nor gtimeout are present. install coreutils with {apt-get,yum,brew} install coreutils" 1>&2
+-                    exit 1
+-                fi
+-            fi
++            READLINKBIN="@READLINKBIN@"
++            TIMEOUTBIN="@TIMEOUTBIN@"
+ 
+             # Check for busybox, which has different arguments
+             TIMEOUTOUTPUT="$($TIMEOUTBIN --help 2>&1)"
+@@ -1944,20 +1913,7 @@ do
+ done
+ 
+ if [[ -z $OPENSSLBIN ]]; then
+-    readlink_result=$("$READLINKBIN" -f "$0")
+-    if [[ -z $readlink_result ]]; then
+-        echo "$READLINKBIN -f $0 failed, aborting." 1>&2
+-        exit 1
+-    fi
+-    REALPATH=$(dirname "$readlink_result")
+-    if [[ -z $REALPATH ]]; then
+-        echo "dirname $REALPATH failed, aborting." 1>&2
+-        exit 1
+-    fi
+-    OPENSSLBIN="${REALPATH}/${opensslbin_name}"
+-    if ! [[ -x "${OPENSSLBIN}" ]]; then
+-        OPENSSLBIN="$(which openssl)"  # fallback to generic openssl
+-    fi
++    OPENSSLBIN="@OPENSSLBIN@"
+ fi
+ # use custom config file to enable GOST ciphers
+ if [[ -e $DIRNAMEPATH/openssl.cnf ]]; then
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99a17e9b3451..ecdd3346629f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1079,6 +1079,12 @@ let
 
   chunksync = callPackage ../tools/backup/chunksync { };
 
+  cipherscan = callPackage ../tools/security/cipherscan {
+    openssl = if stdenv.system == "x86_64-linux"
+      then openssl-chacha
+      else openssl;
+  };
+
   cjdns = callPackage ../tools/networking/cjdns { };
 
   cksfv = callPackage ../tools/networking/cksfv { };
@@ -8130,6 +8136,13 @@ let
     };
   };
 
+  openssl-chacha = callPackage ../development/libraries/openssl/chacha.nix {
+    cryptodevHeaders = linuxPackages.cryptodev.override {
+      fetchurl = fetchurlBoot;
+      onlyHeaders = true;
+    };
+  };
+
   opensubdiv = callPackage ../development/libraries/opensubdiv { };
 
   openwsman = callPackage ../development/libraries/openwsman {};

From 170715254bbb419496670b560957ba5f5ad7354e Mon Sep 17 00:00:00 2001
From: Erik Rybakken <erik.rybakken@math.ntnu.no>
Date: Wed, 3 Feb 2016 18:18:31 +0100
Subject: [PATCH 1041/2285] miniball: init at 3.0

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

diff --git a/pkgs/development/libraries/miniball/default.nix b/pkgs/development/libraries/miniball/default.nix
new file mode 100644
index 000000000000..57fb2cef35ea
--- /dev/null
+++ b/pkgs/development/libraries/miniball/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "miniball-${version}";
+  version = "3.0";
+
+  src = fetchurl {
+    url = "https://www.inf.ethz.ch/personal/gaertner/miniball/Miniball.hpp";
+    sha256 = "1piap5v8wqq0aachrq6j50qkr01gzpyndl6vf661vyykrfq0nnd2";
+  };
+
+  phases = [ "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/include
+    cp $src $out/include/miniball.hpp
+  '';
+
+  meta = {
+    description = "Smallest Enclosing Balls of Points";
+    homepage = https://www.inf.ethz.ch/personal/gaertner/miniball.html;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.erikryb ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 99a17e9b3451..b42442d42b85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2321,6 +2321,8 @@ let
 
   miniupnpd = callPackage ../tools/networking/miniupnpd { };
 
+  miniball = callPackage ../development/libraries/miniball { }; 
+ 
   minixml = callPackage ../development/libraries/minixml { };
 
   mjpegtools = callPackage ../tools/video/mjpegtools { };

From b7a1564a5f6e1871be4d53d6b440c8cbccb6abae Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Wed, 3 Feb 2016 18:21:14 +0100
Subject: [PATCH 1042/2285] Fixup toolbelt: Provide betamax

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d0b6f82788f3..9570ca916cf7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17052,6 +17052,8 @@ in modules // {
 
     propagatedBuildInputs = with self; [ requests2 ];
 
+    buildInputs = with self; [ betamax ];
+
     meta = {
       description = "A toolbelt of useful classes and functions to be used with python-requests";
       homepage = http://toolbelt.rtfd.org;

From 3333a9edab990e13ec38c3b17e305ce53787e6eb Mon Sep 17 00:00:00 2001
From: Erik Rybakken <erik.rybakken@math.ntnu.no>
Date: Wed, 3 Feb 2016 18:28:49 +0100
Subject: [PATCH 1043/2285] haskell-miniball: fix package by adding the missing
 pkgs.miniball dependency

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1f746802c7b0..bbf98df8079f 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -840,6 +840,9 @@ self: super: {
   configurator = dontCheck super.configurator;
 
   # The cabal files for these libraries do not list the required system dependencies.
+  miniball = overrideCabal super.miniball (drv: {
+    librarySystemDepends = [ pkgs.miniball ];
+  });
   SDL-image = overrideCabal super.SDL-image (drv: {
     librarySystemDepends = [ pkgs.SDL pkgs.SDL_image ] ++ drv.librarySystemDepends or [];
   });

From 0b2fded69c619ddd7c1e0d09577dcce9a14370bd Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sat, 30 Jan 2016 19:00:57 +0100
Subject: [PATCH 1044/2285] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20151217-10-ga610b1b using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/e9a140b725c33c2de64026044544b2f1d479cd7f
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/346d9f8466727dd495535d31f12b385f19b52cc2
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/666104569234eea5aee0233b4c94450f1b8c303a
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/0ad9eda835c17a297978b940a95a92d81ecb2b85
---
 .../haskell-modules/configuration-lts-0.0.nix |   30 +
 .../haskell-modules/configuration-lts-0.1.nix |   30 +
 .../haskell-modules/configuration-lts-0.2.nix |   30 +
 .../haskell-modules/configuration-lts-0.3.nix |   30 +
 .../haskell-modules/configuration-lts-0.4.nix |   30 +
 .../haskell-modules/configuration-lts-0.5.nix |   30 +
 .../haskell-modules/configuration-lts-0.6.nix |   30 +
 .../haskell-modules/configuration-lts-0.7.nix |   30 +
 .../haskell-modules/configuration-lts-1.0.nix |   31 +
 .../haskell-modules/configuration-lts-1.1.nix |   31 +
 .../configuration-lts-1.10.nix                |   31 +
 .../configuration-lts-1.11.nix                |   31 +
 .../configuration-lts-1.12.nix                |   31 +
 .../configuration-lts-1.13.nix                |   31 +
 .../configuration-lts-1.14.nix                |   31 +
 .../configuration-lts-1.15.nix                |   32 +
 .../haskell-modules/configuration-lts-1.2.nix |   31 +
 .../haskell-modules/configuration-lts-1.4.nix |   31 +
 .../haskell-modules/configuration-lts-1.5.nix |   31 +
 .../haskell-modules/configuration-lts-1.7.nix |   31 +
 .../haskell-modules/configuration-lts-1.8.nix |   31 +
 .../haskell-modules/configuration-lts-1.9.nix |   31 +
 .../haskell-modules/configuration-lts-2.0.nix |   33 +
 .../haskell-modules/configuration-lts-2.1.nix |   33 +
 .../configuration-lts-2.10.nix                |   34 +
 .../configuration-lts-2.11.nix                |   34 +
 .../configuration-lts-2.12.nix                |   34 +
 .../configuration-lts-2.13.nix                |   34 +
 .../configuration-lts-2.14.nix                |   34 +
 .../configuration-lts-2.15.nix                |   34 +
 .../configuration-lts-2.16.nix                |   34 +
 .../configuration-lts-2.17.nix                |   34 +
 .../configuration-lts-2.18.nix                |   34 +
 .../configuration-lts-2.19.nix                |   35 +
 .../haskell-modules/configuration-lts-2.2.nix |   33 +
 .../configuration-lts-2.20.nix                |   35 +
 .../configuration-lts-2.21.nix                |   35 +
 .../configuration-lts-2.22.nix                |   35 +
 .../haskell-modules/configuration-lts-2.3.nix |   33 +
 .../haskell-modules/configuration-lts-2.4.nix |   33 +
 .../haskell-modules/configuration-lts-2.5.nix |   33 +
 .../haskell-modules/configuration-lts-2.6.nix |   33 +
 .../haskell-modules/configuration-lts-2.7.nix |   33 +
 .../haskell-modules/configuration-lts-2.8.nix |   34 +
 .../haskell-modules/configuration-lts-2.9.nix |   34 +
 .../haskell-modules/configuration-lts-3.0.nix |   39 +
 .../haskell-modules/configuration-lts-3.1.nix |   39 +
 .../configuration-lts-3.10.nix                |   44 +
 .../configuration-lts-3.11.nix                |   44 +
 .../configuration-lts-3.12.nix                |   44 +
 .../configuration-lts-3.13.nix                |   45 +
 .../configuration-lts-3.14.nix                |   45 +
 .../configuration-lts-3.15.nix                |   46 +
 .../configuration-lts-3.16.nix                |   46 +
 .../configuration-lts-3.17.nix                |   46 +
 .../configuration-lts-3.18.nix                |   46 +
 .../configuration-lts-3.19.nix                |   47 +
 .../haskell-modules/configuration-lts-3.2.nix |   39 +
 .../configuration-lts-3.20.nix                |   49 +
 .../configuration-lts-3.21.nix                |   49 +
 .../configuration-lts-3.22.nix                |   49 +
 .../haskell-modules/configuration-lts-3.3.nix |   39 +
 .../haskell-modules/configuration-lts-3.4.nix |   40 +
 .../haskell-modules/configuration-lts-3.5.nix |   41 +
 .../haskell-modules/configuration-lts-3.6.nix |   41 +
 .../haskell-modules/configuration-lts-3.7.nix |   42 +
 .../haskell-modules/configuration-lts-3.8.nix |   42 +
 .../haskell-modules/configuration-lts-3.9.nix |   42 +
 .../haskell-modules/configuration-lts-4.0.nix |   61 +
 .../haskell-modules/configuration-lts-4.1.nix |   61 +
 .../haskell-modules/configuration-lts-4.2.nix |   67 +
 .../haskell-modules/configuration-lts-5.0.nix |   80 +
 .../haskell-modules/configuration-lts-5.1.nix | 7619 +++++++++++++++++
 .../haskell-modules/hackage-packages.nix      | 2270 ++++-
 74 files changed, 12238 insertions(+), 377 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/configuration-lts-5.1.nix

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index e9ab7886bf2c..5901106668cd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -1189,6 +1189,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1202,6 +1203,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2244,6 +2246,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2465,6 +2468,7 @@ self: super: {
   "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";
@@ -2493,6 +2497,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2517,6 +2522,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2614,6 +2620,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2799,6 +2806,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2904,6 +2912,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -3029,6 +3038,7 @@ self: super: {
   "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";
@@ -3216,6 +3226,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3301,6 +3312,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3475,16 +3487,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3684,6 +3699,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -4017,6 +4033,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4324,6 +4341,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_23_3";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4876,6 +4894,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -5063,6 +5082,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5071,6 +5091,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5110,6 +5131,7 @@ self: super: {
   "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";
@@ -5877,6 +5899,7 @@ self: super: {
   "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";
   "multiarg" = dontDistribute super."multiarg";
@@ -6146,6 +6169,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6546,6 +6570,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6645,6 +6670,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6878,6 +6904,7 @@ self: super: {
   "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";
@@ -6979,6 +7006,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8048,6 +8076,7 @@ self: super: {
   "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";
@@ -8291,6 +8320,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index f5ffa31c0b90..d28644edfbc0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -1189,6 +1189,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1202,6 +1203,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2244,6 +2246,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2465,6 +2468,7 @@ self: super: {
   "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";
@@ -2493,6 +2497,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2517,6 +2522,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2614,6 +2620,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2799,6 +2806,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2904,6 +2912,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -3029,6 +3038,7 @@ self: super: {
   "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";
@@ -3216,6 +3226,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3301,6 +3312,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3475,16 +3487,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3684,6 +3699,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -4017,6 +4033,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4324,6 +4341,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_23_3";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4876,6 +4894,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -5063,6 +5082,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5071,6 +5091,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5110,6 +5131,7 @@ self: super: {
   "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";
@@ -5877,6 +5899,7 @@ self: super: {
   "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";
   "multiarg" = dontDistribute super."multiarg";
@@ -6146,6 +6169,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6546,6 +6570,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6645,6 +6670,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6878,6 +6904,7 @@ self: super: {
   "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";
@@ -6979,6 +7006,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8048,6 +8076,7 @@ self: super: {
   "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";
@@ -8291,6 +8320,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 7bfff6317298..b67eba2b841c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -1189,6 +1189,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1202,6 +1203,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2244,6 +2246,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2465,6 +2468,7 @@ self: super: {
   "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";
@@ -2493,6 +2497,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2517,6 +2522,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2614,6 +2620,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2799,6 +2806,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2904,6 +2912,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -3029,6 +3038,7 @@ self: super: {
   "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";
@@ -3216,6 +3226,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3301,6 +3312,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3475,16 +3487,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3684,6 +3699,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -4017,6 +4033,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4324,6 +4341,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_23_3";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4876,6 +4894,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -5063,6 +5082,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5071,6 +5091,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5110,6 +5131,7 @@ self: super: {
   "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";
@@ -5877,6 +5899,7 @@ self: super: {
   "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";
   "multiarg" = dontDistribute super."multiarg";
@@ -6146,6 +6169,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6546,6 +6570,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6645,6 +6670,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6878,6 +6904,7 @@ self: super: {
   "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";
@@ -6979,6 +7006,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8048,6 +8076,7 @@ self: super: {
   "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";
@@ -8291,6 +8320,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index 0041c132ac49..959df8523b86 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -1189,6 +1189,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1202,6 +1203,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2244,6 +2246,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2465,6 +2468,7 @@ self: super: {
   "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";
@@ -2493,6 +2497,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2517,6 +2522,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2614,6 +2620,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2799,6 +2806,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2904,6 +2912,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -3029,6 +3038,7 @@ self: super: {
   "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";
@@ -3216,6 +3226,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3301,6 +3312,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3475,16 +3487,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3684,6 +3699,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -4017,6 +4033,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4324,6 +4341,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_23_3";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4876,6 +4894,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -5063,6 +5082,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5071,6 +5091,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5110,6 +5131,7 @@ self: super: {
   "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";
@@ -5877,6 +5899,7 @@ self: super: {
   "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";
   "multiarg" = dontDistribute super."multiarg";
@@ -6146,6 +6169,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6546,6 +6570,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6645,6 +6670,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6878,6 +6904,7 @@ self: super: {
   "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";
@@ -6979,6 +7006,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8048,6 +8076,7 @@ self: super: {
   "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";
@@ -8291,6 +8320,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index f4c19fe75705..2a92a40d2e3d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -1189,6 +1189,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1202,6 +1203,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2244,6 +2246,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2465,6 +2468,7 @@ self: super: {
   "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";
@@ -2493,6 +2497,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2517,6 +2522,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2613,6 +2619,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2798,6 +2805,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2903,6 +2911,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -3028,6 +3037,7 @@ self: super: {
   "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";
@@ -3215,6 +3225,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3300,6 +3311,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3474,16 +3486,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3683,6 +3698,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -4014,6 +4030,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4321,6 +4338,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_23_3";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4873,6 +4891,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -5060,6 +5079,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5068,6 +5088,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5107,6 +5128,7 @@ self: super: {
   "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";
@@ -5874,6 +5896,7 @@ self: super: {
   "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";
   "multiarg" = dontDistribute super."multiarg";
@@ -6143,6 +6166,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6543,6 +6567,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6642,6 +6667,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6875,6 +6901,7 @@ self: super: {
   "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";
@@ -6976,6 +7003,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8044,6 +8072,7 @@ self: super: {
   "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";
@@ -8287,6 +8316,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index fdcd0e2bab6f..c079cffeaa41 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -1189,6 +1189,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1202,6 +1203,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2244,6 +2246,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2465,6 +2468,7 @@ self: super: {
   "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";
@@ -2493,6 +2497,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2517,6 +2522,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2613,6 +2619,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2798,6 +2805,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2903,6 +2911,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -3028,6 +3037,7 @@ self: super: {
   "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";
@@ -3215,6 +3225,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3300,6 +3311,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3474,16 +3486,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3683,6 +3698,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -4014,6 +4030,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4321,6 +4338,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_23_3";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4873,6 +4891,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -5060,6 +5079,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5068,6 +5088,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5107,6 +5128,7 @@ self: super: {
   "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";
@@ -5874,6 +5896,7 @@ self: super: {
   "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";
   "multiarg" = dontDistribute super."multiarg";
@@ -6143,6 +6166,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6543,6 +6567,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6642,6 +6667,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6875,6 +6901,7 @@ self: super: {
   "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";
@@ -6976,6 +7003,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8044,6 +8072,7 @@ self: super: {
   "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";
@@ -8287,6 +8316,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index 70339bd0bb73..db707caa1e89 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -1188,6 +1188,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1201,6 +1202,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2243,6 +2245,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2464,6 +2467,7 @@ self: super: {
   "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";
@@ -2492,6 +2496,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2516,6 +2521,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2612,6 +2618,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2797,6 +2804,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2902,6 +2910,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -3027,6 +3036,7 @@ self: super: {
   "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";
@@ -3214,6 +3224,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3299,6 +3310,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3473,16 +3485,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3682,6 +3697,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -4013,6 +4029,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4319,6 +4336,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_23_3";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4871,6 +4889,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -5058,6 +5077,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5066,6 +5086,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5105,6 +5126,7 @@ self: super: {
   "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";
@@ -5872,6 +5894,7 @@ self: super: {
   "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";
   "multiarg" = dontDistribute super."multiarg";
@@ -6140,6 +6163,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6540,6 +6564,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6639,6 +6664,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6872,6 +6898,7 @@ self: super: {
   "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";
@@ -6972,6 +6999,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8040,6 +8068,7 @@ self: super: {
   "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";
@@ -8283,6 +8312,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index 38156ce2ed5f..329df2fafed3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -1188,6 +1188,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1201,6 +1202,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2243,6 +2245,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2464,6 +2467,7 @@ self: super: {
   "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";
@@ -2492,6 +2496,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2516,6 +2521,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2612,6 +2618,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2797,6 +2804,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2902,6 +2910,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -3027,6 +3036,7 @@ self: super: {
   "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";
@@ -3214,6 +3224,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3299,6 +3310,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3473,16 +3485,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3682,6 +3697,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -4013,6 +4029,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4319,6 +4336,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_23_3";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4871,6 +4889,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -5058,6 +5077,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = dontDistribute super."json-autotype";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5066,6 +5086,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5105,6 +5126,7 @@ self: super: {
   "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";
@@ -5872,6 +5894,7 @@ self: super: {
   "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";
   "multiarg" = dontDistribute super."multiarg";
@@ -6140,6 +6163,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6540,6 +6564,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6639,6 +6664,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6872,6 +6898,7 @@ self: super: {
   "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";
@@ -6972,6 +6999,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8040,6 +8068,7 @@ self: super: {
   "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";
@@ -8283,6 +8312,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index f6622404e5f8..76d3d874634a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -1184,6 +1184,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1197,6 +1198,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2055,6 +2057,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2235,6 +2238,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2455,6 +2459,7 @@ self: super: {
   "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";
@@ -2483,6 +2488,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2507,6 +2513,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2603,6 +2610,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2788,6 +2796,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2893,6 +2902,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14";
   "elm-get" = dontDistribute super."elm-get";
@@ -3017,6 +3027,7 @@ self: super: {
   "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";
@@ -3204,6 +3215,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3289,6 +3301,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3463,16 +3476,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3671,6 +3687,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -4003,6 +4020,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4308,6 +4326,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4859,6 +4878,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -5046,6 +5066,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5054,6 +5075,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5093,6 +5115,7 @@ self: super: {
   "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";
@@ -5860,6 +5883,7 @@ self: super: {
   "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";
   "multiarg" = dontDistribute super."multiarg";
@@ -6128,6 +6152,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6528,6 +6553,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6627,6 +6653,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6860,6 +6887,7 @@ self: super: {
   "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";
@@ -6959,6 +6987,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8026,6 +8055,7 @@ self: super: {
   "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";
@@ -8269,6 +8299,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index dcab2aa28320..6c71b070a0f7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -1184,6 +1184,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1197,6 +1198,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2054,6 +2056,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2234,6 +2237,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2453,6 +2457,7 @@ self: super: {
   "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";
@@ -2481,6 +2486,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2505,6 +2511,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2601,6 +2608,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2785,6 +2793,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2890,6 +2899,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3014,6 +3024,7 @@ self: super: {
   "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";
@@ -3201,6 +3212,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3286,6 +3298,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3460,16 +3473,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3668,6 +3684,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3999,6 +4016,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4302,6 +4320,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4853,6 +4872,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -5040,6 +5060,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5048,6 +5069,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5087,6 +5109,7 @@ self: super: {
   "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";
@@ -5853,6 +5876,7 @@ self: super: {
   "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";
   "multiarg" = dontDistribute super."multiarg";
@@ -6121,6 +6145,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6521,6 +6546,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6620,6 +6646,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6853,6 +6880,7 @@ self: super: {
   "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";
@@ -6952,6 +6980,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8015,6 +8044,7 @@ self: super: {
   "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";
@@ -8257,6 +8287,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index 6b041938ec1a..bd2523938684 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -1183,6 +1183,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1196,6 +1197,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2051,6 +2053,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2231,6 +2234,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2449,6 +2453,7 @@ self: super: {
   "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";
@@ -2477,6 +2482,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2501,6 +2507,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2597,6 +2604,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2781,6 +2789,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2886,6 +2895,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3010,6 +3020,7 @@ self: super: {
   "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";
@@ -3194,6 +3205,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3278,6 +3290,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3451,16 +3464,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3659,6 +3675,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3989,6 +4006,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4291,6 +4309,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4837,6 +4856,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -5024,6 +5044,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5032,6 +5053,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5071,6 +5093,7 @@ self: super: {
   "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";
@@ -5835,6 +5858,7 @@ self: super: {
   "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";
   "multiarg" = dontDistribute super."multiarg";
@@ -6102,6 +6126,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6501,6 +6526,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6600,6 +6626,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6832,6 +6859,7 @@ self: super: {
   "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";
@@ -6931,6 +6959,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7990,6 +8019,7 @@ self: super: {
   "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";
@@ -8230,6 +8260,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index 6851fcfd4cbf..3ece9fed9a06 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -1183,6 +1183,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1196,6 +1197,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2051,6 +2053,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2231,6 +2234,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2449,6 +2453,7 @@ self: super: {
   "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";
@@ -2477,6 +2482,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2501,6 +2507,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2597,6 +2604,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2781,6 +2789,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2886,6 +2895,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3010,6 +3020,7 @@ self: super: {
   "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";
@@ -3193,6 +3204,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3277,6 +3289,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3450,16 +3463,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3658,6 +3674,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3988,6 +4005,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4290,6 +4308,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4835,6 +4854,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -5021,6 +5041,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5029,6 +5050,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5068,6 +5090,7 @@ self: super: {
   "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";
@@ -5831,6 +5854,7 @@ self: super: {
   "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";
   "multiarg" = dontDistribute super."multiarg";
@@ -6098,6 +6122,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6497,6 +6522,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6596,6 +6622,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6828,6 +6855,7 @@ self: super: {
   "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";
@@ -6927,6 +6955,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7986,6 +8015,7 @@ self: super: {
   "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";
@@ -8226,6 +8256,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 50ee12bb52dc..5ba87607ad21 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -1183,6 +1183,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1196,6 +1197,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2051,6 +2053,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2231,6 +2234,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2449,6 +2453,7 @@ self: super: {
   "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";
@@ -2477,6 +2482,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2501,6 +2507,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2597,6 +2604,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2781,6 +2789,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2886,6 +2895,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3010,6 +3020,7 @@ self: super: {
   "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";
@@ -3193,6 +3204,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3277,6 +3289,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3450,16 +3463,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3658,6 +3674,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3988,6 +4005,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4289,6 +4307,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4834,6 +4853,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -5020,6 +5040,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_8";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5028,6 +5049,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5067,6 +5089,7 @@ self: super: {
   "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";
@@ -5830,6 +5853,7 @@ self: super: {
   "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";
   "multiarg" = dontDistribute super."multiarg";
@@ -6097,6 +6121,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6496,6 +6521,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6595,6 +6621,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6827,6 +6854,7 @@ self: super: {
   "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";
@@ -6926,6 +6954,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7985,6 +8014,7 @@ self: super: {
   "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";
@@ -8224,6 +8254,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 318f7595f64b..dbaccd55b175 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -1183,6 +1183,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1196,6 +1197,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2051,6 +2053,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2231,6 +2234,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2449,6 +2453,7 @@ self: super: {
   "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";
@@ -2477,6 +2482,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2501,6 +2507,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2597,6 +2604,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2781,6 +2789,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2886,6 +2895,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3010,6 +3020,7 @@ self: super: {
   "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";
@@ -3193,6 +3204,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3277,6 +3289,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3450,16 +3463,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3658,6 +3674,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3987,6 +4004,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4288,6 +4306,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4833,6 +4852,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -5019,6 +5039,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_8";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5027,6 +5048,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5066,6 +5088,7 @@ self: super: {
   "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";
@@ -5829,6 +5852,7 @@ self: super: {
   "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";
   "multiarg" = dontDistribute super."multiarg";
@@ -6096,6 +6120,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6495,6 +6520,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6594,6 +6620,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6826,6 +6853,7 @@ self: super: {
   "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";
@@ -6925,6 +6953,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7983,6 +8012,7 @@ self: super: {
   "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";
@@ -8222,6 +8252,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 3a378f0f3c99..beeae2259aab 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -1182,6 +1182,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1195,6 +1196,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2049,6 +2051,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2229,6 +2232,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2446,6 +2450,7 @@ self: super: {
   "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";
@@ -2474,6 +2479,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2498,6 +2504,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2594,6 +2601,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2778,6 +2786,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2883,6 +2892,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3007,6 +3017,7 @@ self: super: {
   "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";
@@ -3190,6 +3201,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3274,6 +3286,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3447,16 +3460,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3655,6 +3671,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3984,6 +4001,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4284,6 +4302,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4829,6 +4848,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -5015,6 +5035,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_9";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5023,6 +5044,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5062,6 +5084,7 @@ self: super: {
   "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";
@@ -5823,6 +5846,7 @@ self: super: {
   "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";
   "multiarg" = dontDistribute super."multiarg";
@@ -6090,6 +6114,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6489,6 +6514,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6588,6 +6614,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6819,6 +6846,7 @@ self: super: {
   "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";
@@ -6918,6 +6946,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7976,6 +8005,7 @@ self: super: {
   "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";
@@ -8215,6 +8245,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index 2fa448b07e10..6bad1e1a7c20 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -1181,6 +1181,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1194,6 +1195,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2047,6 +2049,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2227,6 +2230,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2443,6 +2447,7 @@ self: super: {
   "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";
@@ -2471,6 +2476,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2495,6 +2501,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2591,6 +2598,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2775,6 +2783,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2880,6 +2889,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3003,6 +3013,7 @@ self: super: {
   "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";
@@ -3186,6 +3197,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3270,6 +3282,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3443,16 +3456,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3651,6 +3667,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3980,6 +3997,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4280,6 +4298,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4825,6 +4844,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -5011,6 +5031,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_9";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5019,6 +5040,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5058,6 +5080,7 @@ self: super: {
   "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";
@@ -5819,6 +5842,7 @@ self: super: {
   "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";
   "multiarg" = dontDistribute super."multiarg";
@@ -6084,6 +6108,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6483,6 +6508,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6582,6 +6608,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6709,6 +6736,7 @@ self: super: {
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
   "quickcheck-assertions" = doDistribute super."quickcheck-assertions_0_1_1";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6811,6 +6839,7 @@ self: super: {
   "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";
@@ -6910,6 +6939,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7966,6 +7996,7 @@ self: super: {
   "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";
@@ -8205,6 +8236,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index b84ea04fd9ac..b1bc7909b296 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -1184,6 +1184,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1197,6 +1198,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2053,6 +2055,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2233,6 +2236,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2451,6 +2455,7 @@ self: super: {
   "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";
@@ -2479,6 +2484,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2503,6 +2509,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2599,6 +2606,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2783,6 +2791,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2888,6 +2897,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3012,6 +3022,7 @@ self: super: {
   "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";
@@ -3199,6 +3210,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3284,6 +3296,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3457,16 +3470,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3665,6 +3681,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3996,6 +4013,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4299,6 +4317,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4850,6 +4869,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -5037,6 +5057,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5045,6 +5066,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5084,6 +5106,7 @@ self: super: {
   "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";
@@ -5850,6 +5873,7 @@ self: super: {
   "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";
   "multiarg" = dontDistribute super."multiarg";
@@ -6118,6 +6142,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6517,6 +6542,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6616,6 +6642,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6848,6 +6875,7 @@ self: super: {
   "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";
@@ -6947,6 +6975,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8009,6 +8038,7 @@ self: super: {
   "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";
@@ -8251,6 +8281,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index 2bbcedea2ebf..3a5e684b9965 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -1183,6 +1183,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1196,6 +1197,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2052,6 +2054,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2232,6 +2235,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2450,6 +2454,7 @@ self: super: {
   "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";
@@ -2478,6 +2483,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2502,6 +2508,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2598,6 +2605,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2782,6 +2790,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2887,6 +2896,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3011,6 +3021,7 @@ self: super: {
   "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";
@@ -3197,6 +3208,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3282,6 +3294,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3455,16 +3468,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3663,6 +3679,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3994,6 +4011,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4296,6 +4314,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4847,6 +4866,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -5034,6 +5054,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5042,6 +5063,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5081,6 +5103,7 @@ self: super: {
   "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";
@@ -5846,6 +5869,7 @@ self: super: {
   "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";
   "multiarg" = dontDistribute super."multiarg";
@@ -6114,6 +6138,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6513,6 +6538,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6612,6 +6638,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6844,6 +6871,7 @@ self: super: {
   "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";
@@ -6943,6 +6971,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8004,6 +8033,7 @@ self: super: {
   "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";
@@ -8246,6 +8276,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index 952676714551..e76d058500ef 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -1183,6 +1183,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1196,6 +1197,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2051,6 +2053,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2231,6 +2234,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2449,6 +2453,7 @@ self: super: {
   "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";
@@ -2477,6 +2482,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2501,6 +2507,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2597,6 +2604,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2781,6 +2789,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2886,6 +2895,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3010,6 +3020,7 @@ self: super: {
   "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";
@@ -3196,6 +3207,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3281,6 +3293,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3454,16 +3467,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3662,6 +3678,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3993,6 +4010,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4295,6 +4313,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4846,6 +4865,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -5033,6 +5053,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5041,6 +5062,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5080,6 +5102,7 @@ self: super: {
   "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";
@@ -5845,6 +5868,7 @@ self: super: {
   "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";
   "multiarg" = dontDistribute super."multiarg";
@@ -6113,6 +6137,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6512,6 +6537,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6611,6 +6637,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6843,6 +6870,7 @@ self: super: {
   "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";
@@ -6942,6 +6970,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -8003,6 +8032,7 @@ self: super: {
   "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";
@@ -8244,6 +8274,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index adcdd01ed261..067ffa3fad54 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -1183,6 +1183,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1196,6 +1197,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2051,6 +2053,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2231,6 +2234,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2449,6 +2453,7 @@ self: super: {
   "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";
@@ -2477,6 +2482,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2501,6 +2507,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2597,6 +2604,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2781,6 +2789,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2886,6 +2895,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3010,6 +3020,7 @@ self: super: {
   "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";
@@ -3196,6 +3207,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3281,6 +3293,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3454,16 +3467,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3662,6 +3678,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3993,6 +4010,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4295,6 +4313,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4841,6 +4860,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -5028,6 +5048,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5036,6 +5057,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5075,6 +5097,7 @@ self: super: {
   "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";
@@ -5840,6 +5863,7 @@ self: super: {
   "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";
   "multiarg" = dontDistribute super."multiarg";
@@ -6108,6 +6132,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6507,6 +6532,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6606,6 +6632,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6838,6 +6865,7 @@ self: super: {
   "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";
@@ -6937,6 +6965,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7998,6 +8027,7 @@ self: super: {
   "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";
@@ -8239,6 +8269,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index 553dd0774d21..a4128abdf384 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -1183,6 +1183,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1196,6 +1197,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2051,6 +2053,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2231,6 +2234,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2449,6 +2453,7 @@ self: super: {
   "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";
@@ -2477,6 +2482,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2501,6 +2507,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2597,6 +2604,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2781,6 +2789,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2886,6 +2895,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3010,6 +3020,7 @@ self: super: {
   "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";
@@ -3194,6 +3205,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3279,6 +3291,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3452,16 +3465,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3660,6 +3676,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3990,6 +4007,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4292,6 +4310,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4838,6 +4857,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -5025,6 +5045,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5033,6 +5054,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5072,6 +5094,7 @@ self: super: {
   "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";
@@ -5836,6 +5859,7 @@ self: super: {
   "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";
   "multiarg" = dontDistribute super."multiarg";
@@ -6104,6 +6128,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6503,6 +6528,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6602,6 +6628,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6834,6 +6861,7 @@ self: super: {
   "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";
@@ -6933,6 +6961,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7994,6 +8023,7 @@ self: super: {
   "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";
@@ -8234,6 +8264,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index eb92109fd38c..c44591b3c019 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -1183,6 +1183,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1196,6 +1197,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2051,6 +2053,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2231,6 +2234,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2449,6 +2453,7 @@ self: super: {
   "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";
@@ -2477,6 +2482,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2501,6 +2507,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2597,6 +2604,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2781,6 +2789,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2886,6 +2895,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-compiler" = doDistribute super."elm-compiler_0_14_1";
   "elm-get" = dontDistribute super."elm-get";
@@ -3010,6 +3020,7 @@ self: super: {
   "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";
@@ -3194,6 +3205,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3278,6 +3290,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3451,16 +3464,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3659,6 +3675,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3989,6 +4006,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_4_1";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4291,6 +4309,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4837,6 +4856,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -5024,6 +5044,7 @@ self: super: {
   "json" = dontDistribute super."json";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_4";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -5032,6 +5053,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5071,6 +5093,7 @@ self: super: {
   "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";
@@ -5835,6 +5858,7 @@ self: super: {
   "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";
   "multiarg" = dontDistribute super."multiarg";
@@ -6103,6 +6127,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6502,6 +6527,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6601,6 +6627,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_5_4_0";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6833,6 +6860,7 @@ self: super: {
   "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";
@@ -6932,6 +6960,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7993,6 +8022,7 @@ self: super: {
   "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";
@@ -8233,6 +8263,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 8e1c69f9d0a7..40414cce15bb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -1174,6 +1174,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1187,6 +1188,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2036,6 +2038,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2215,6 +2218,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2428,6 +2432,7 @@ self: super: {
   "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";
@@ -2456,6 +2461,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2480,6 +2486,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2576,6 +2583,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2760,6 +2768,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2865,6 +2874,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2988,6 +2998,7 @@ self: super: {
   "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";
@@ -3171,6 +3182,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3253,6 +3265,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3426,16 +3439,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3633,6 +3649,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3960,6 +3977,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4259,6 +4277,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4796,6 +4815,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4979,6 +4999,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_11";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4987,6 +5008,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5026,6 +5048,7 @@ self: super: {
   "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";
@@ -5661,6 +5684,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5773,6 +5797,7 @@ self: super: {
   "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";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -6034,6 +6059,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6430,6 +6456,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6528,6 +6555,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6655,6 +6683,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6758,6 +6787,7 @@ self: super: {
   "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";
@@ -6857,6 +6887,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7905,6 +7936,7 @@ self: super: {
   "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";
@@ -8144,6 +8176,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 18261e8ccb9d..874eb71abfdb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -1174,6 +1174,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1187,6 +1188,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2035,6 +2037,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2214,6 +2217,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2427,6 +2431,7 @@ self: super: {
   "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";
@@ -2455,6 +2460,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2479,6 +2485,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2575,6 +2582,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2759,6 +2767,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2864,6 +2873,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2987,6 +2997,7 @@ self: super: {
   "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";
@@ -3170,6 +3181,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3252,6 +3264,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3425,16 +3438,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3632,6 +3648,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3959,6 +3976,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4258,6 +4276,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4795,6 +4814,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4978,6 +4998,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4986,6 +5007,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5025,6 +5047,7 @@ self: super: {
   "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";
@@ -5660,6 +5683,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5772,6 +5796,7 @@ self: super: {
   "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";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -6033,6 +6058,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6429,6 +6455,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6527,6 +6554,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6654,6 +6682,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6757,6 +6786,7 @@ self: super: {
   "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";
@@ -6856,6 +6886,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7904,6 +7935,7 @@ self: super: {
   "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";
@@ -8143,6 +8175,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index 95b74fb6ccaa..d803e816665d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -1169,6 +1169,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1182,6 +1183,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2023,6 +2025,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2201,6 +2204,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2413,6 +2417,7 @@ self: super: {
   "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";
@@ -2441,6 +2446,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2464,6 +2470,7 @@ self: super: {
   "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";
@@ -2560,6 +2567,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2744,6 +2752,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2848,6 +2857,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2970,6 +2980,7 @@ self: super: {
   "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";
@@ -3151,6 +3162,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3233,6 +3245,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3406,16 +3419,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3613,6 +3629,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3938,6 +3955,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4236,6 +4254,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4613,6 +4632,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4769,6 +4789,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4950,6 +4971,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4958,6 +4980,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4997,6 +5020,7 @@ self: super: {
   "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";
@@ -5626,6 +5650,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5739,6 +5764,7 @@ self: super: {
   "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";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5998,6 +6024,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6390,6 +6417,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6488,6 +6516,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6614,6 +6643,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6717,6 +6747,7 @@ self: super: {
   "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";
@@ -6816,6 +6847,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7854,6 +7886,7 @@ self: super: {
   "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";
@@ -8091,6 +8124,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 9a47f9dda6f4..5f9110846dee 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -1168,6 +1168,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1181,6 +1182,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2022,6 +2024,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2200,6 +2203,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2412,6 +2416,7 @@ self: super: {
   "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";
@@ -2440,6 +2445,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2463,6 +2469,7 @@ self: super: {
   "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";
@@ -2559,6 +2566,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2743,6 +2751,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2847,6 +2856,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2969,6 +2979,7 @@ self: super: {
   "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";
@@ -3150,6 +3161,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3232,6 +3244,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3404,16 +3417,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3611,6 +3627,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3936,6 +3953,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4233,6 +4251,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4610,6 +4629,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4766,6 +4786,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4946,6 +4967,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4954,6 +4976,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4993,6 +5016,7 @@ self: super: {
   "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";
@@ -5622,6 +5646,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5734,6 +5759,7 @@ self: super: {
   "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";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5993,6 +6019,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6384,6 +6411,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6482,6 +6510,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6608,6 +6637,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6711,6 +6741,7 @@ self: super: {
   "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";
@@ -6810,6 +6841,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7845,6 +7877,7 @@ self: super: {
   "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";
@@ -8082,6 +8115,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index eddd47d1c874..17c44fb89359 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -1168,6 +1168,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1181,6 +1182,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2022,6 +2024,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2200,6 +2203,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2412,6 +2416,7 @@ self: super: {
   "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";
@@ -2440,6 +2445,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2463,6 +2469,7 @@ self: super: {
   "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";
@@ -2559,6 +2566,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2743,6 +2751,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2847,6 +2856,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2969,6 +2979,7 @@ self: super: {
   "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";
@@ -3150,6 +3161,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3232,6 +3244,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3404,16 +3417,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3611,6 +3627,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3936,6 +3953,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4233,6 +4251,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4610,6 +4629,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4766,6 +4786,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4946,6 +4967,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4954,6 +4976,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4993,6 +5016,7 @@ self: super: {
   "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";
@@ -5622,6 +5646,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5734,6 +5759,7 @@ self: super: {
   "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";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5993,6 +6019,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6384,6 +6411,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6482,6 +6510,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6608,6 +6637,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6711,6 +6741,7 @@ self: super: {
   "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";
@@ -6810,6 +6841,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7844,6 +7876,7 @@ self: super: {
   "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";
@@ -8081,6 +8114,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index b4614ffe878d..0cd601e7da67 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -1168,6 +1168,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1181,6 +1182,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2022,6 +2024,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2200,6 +2203,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2412,6 +2416,7 @@ self: super: {
   "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";
@@ -2440,6 +2445,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2463,6 +2469,7 @@ self: super: {
   "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";
@@ -2559,6 +2566,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2743,6 +2751,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2847,6 +2856,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2969,6 +2979,7 @@ self: super: {
   "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";
@@ -3150,6 +3161,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3232,6 +3244,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3404,16 +3417,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3611,6 +3627,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3935,6 +3952,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4232,6 +4250,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4609,6 +4628,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4764,6 +4784,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4944,6 +4965,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4952,6 +4974,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4991,6 +5014,7 @@ self: super: {
   "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";
@@ -5620,6 +5644,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5732,6 +5757,7 @@ self: super: {
   "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";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5991,6 +6017,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6382,6 +6409,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6480,6 +6508,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6606,6 +6635,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6709,6 +6739,7 @@ self: super: {
   "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";
@@ -6808,6 +6839,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7842,6 +7874,7 @@ self: super: {
   "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";
@@ -8079,6 +8112,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 4d8ef2724d6f..20e2c95adc3e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -1168,6 +1168,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1181,6 +1182,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2021,6 +2023,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2199,6 +2202,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2411,6 +2415,7 @@ self: super: {
   "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";
@@ -2439,6 +2444,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2462,6 +2468,7 @@ self: super: {
   "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";
@@ -2558,6 +2565,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2742,6 +2750,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2846,6 +2855,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2968,6 +2978,7 @@ self: super: {
   "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";
@@ -3148,6 +3159,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3230,6 +3242,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3402,16 +3415,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3609,6 +3625,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3933,6 +3950,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4230,6 +4248,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4606,6 +4625,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4761,6 +4781,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4941,6 +4962,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4949,6 +4971,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4988,6 +5011,7 @@ self: super: {
   "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";
@@ -5617,6 +5641,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5729,6 +5754,7 @@ self: super: {
   "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";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5988,6 +6014,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6379,6 +6406,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6477,6 +6505,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6603,6 +6632,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6706,6 +6736,7 @@ self: super: {
   "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";
@@ -6805,6 +6836,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7838,6 +7870,7 @@ self: super: {
   "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";
@@ -8075,6 +8108,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index 94e9eb0184e4..f218d7a8e6ef 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -1168,6 +1168,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1181,6 +1182,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2021,6 +2023,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2199,6 +2202,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2411,6 +2415,7 @@ self: super: {
   "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";
@@ -2439,6 +2444,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2462,6 +2468,7 @@ self: super: {
   "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";
@@ -2558,6 +2565,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2742,6 +2750,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2846,6 +2855,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2967,6 +2977,7 @@ self: super: {
   "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";
@@ -3147,6 +3158,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3229,6 +3241,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3401,16 +3414,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3608,6 +3624,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3932,6 +3949,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4229,6 +4247,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4605,6 +4624,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4760,6 +4780,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4940,6 +4961,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4948,6 +4970,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4987,6 +5010,7 @@ self: super: {
   "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";
@@ -5616,6 +5640,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5727,6 +5752,7 @@ self: super: {
   "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";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5984,6 +6010,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6375,6 +6402,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6473,6 +6501,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6599,6 +6628,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6702,6 +6732,7 @@ self: super: {
   "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";
@@ -6801,6 +6832,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7833,6 +7865,7 @@ self: super: {
   "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";
@@ -8070,6 +8103,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index 8fc73ea3a05a..8dd4c6d76b2a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -1167,6 +1167,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1180,6 +1181,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2019,6 +2021,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2197,6 +2200,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2408,6 +2412,7 @@ self: super: {
   "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";
@@ -2436,6 +2441,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2459,6 +2465,7 @@ self: super: {
   "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";
@@ -2555,6 +2562,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2738,6 +2746,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2842,6 +2851,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2963,6 +2973,7 @@ self: super: {
   "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";
@@ -3142,6 +3153,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3224,6 +3236,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3396,16 +3409,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3603,6 +3619,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3927,6 +3944,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4224,6 +4242,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4600,6 +4619,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4755,6 +4775,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4935,6 +4956,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4943,6 +4965,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4982,6 +5005,7 @@ self: super: {
   "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";
@@ -5610,6 +5634,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5721,6 +5746,7 @@ self: super: {
   "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";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5978,6 +6004,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6369,6 +6396,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6467,6 +6495,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6593,6 +6622,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6696,6 +6726,7 @@ self: super: {
   "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";
@@ -6795,6 +6826,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7827,6 +7859,7 @@ self: super: {
   "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";
@@ -8064,6 +8097,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index 4b57e8e021f9..682e54704f87 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -1167,6 +1167,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1180,6 +1181,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2017,6 +2019,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2195,6 +2198,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2406,6 +2410,7 @@ self: super: {
   "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";
@@ -2434,6 +2439,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2457,6 +2463,7 @@ self: super: {
   "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";
@@ -2553,6 +2560,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2736,6 +2744,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2840,6 +2849,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2960,6 +2970,7 @@ self: super: {
   "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";
@@ -3138,6 +3149,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3220,6 +3232,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3391,16 +3404,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3598,6 +3614,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3922,6 +3939,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4219,6 +4237,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4595,6 +4614,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4750,6 +4770,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4930,6 +4951,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4938,6 +4960,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4977,6 +5000,7 @@ self: super: {
   "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";
@@ -5605,6 +5629,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5716,6 +5741,7 @@ self: super: {
   "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";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5972,6 +5998,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6363,6 +6390,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6461,6 +6489,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6587,6 +6616,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6690,6 +6720,7 @@ self: super: {
   "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";
@@ -6789,6 +6820,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7821,6 +7853,7 @@ self: super: {
   "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";
@@ -8058,6 +8091,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index c299d34ec022..c3e55226d4c6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -1167,6 +1167,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1180,6 +1181,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2016,6 +2018,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2194,6 +2197,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2405,6 +2409,7 @@ self: super: {
   "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";
@@ -2433,6 +2438,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2456,6 +2462,7 @@ self: super: {
   "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";
@@ -2552,6 +2559,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2735,6 +2743,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2838,6 +2847,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2958,6 +2968,7 @@ self: super: {
   "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";
@@ -3136,6 +3147,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3218,6 +3230,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3389,16 +3402,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3596,6 +3612,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3920,6 +3937,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4216,6 +4234,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4592,6 +4611,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4747,6 +4767,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4927,6 +4948,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4935,6 +4957,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4974,6 +4997,7 @@ self: super: {
   "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";
@@ -5602,6 +5626,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5713,6 +5738,7 @@ self: super: {
   "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";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5968,6 +5994,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6358,6 +6385,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6456,6 +6484,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6582,6 +6611,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6685,6 +6715,7 @@ self: super: {
   "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";
@@ -6784,6 +6815,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7815,6 +7847,7 @@ self: super: {
   "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";
@@ -8052,6 +8085,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index ad3e0bad7db5..5dac9460466f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -1167,6 +1167,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1180,6 +1181,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2016,6 +2018,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2194,6 +2197,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2405,6 +2409,7 @@ self: super: {
   "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";
@@ -2433,6 +2438,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2456,6 +2462,7 @@ self: super: {
   "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";
@@ -2552,6 +2559,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2735,6 +2743,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2838,6 +2847,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2958,6 +2968,7 @@ self: super: {
   "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";
@@ -3136,6 +3147,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3217,6 +3229,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3388,16 +3401,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3595,6 +3611,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3919,6 +3936,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4215,6 +4233,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4591,6 +4610,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4746,6 +4766,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4926,6 +4947,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4934,6 +4956,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4973,6 +4996,7 @@ self: super: {
   "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";
@@ -5600,6 +5624,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5661,6 +5686,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidal-containers" = dontDistribute super."monoidal-containers";
   "monoidplus" = dontDistribute super."monoidplus";
@@ -5710,6 +5736,7 @@ self: super: {
   "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";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5965,6 +5992,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6355,6 +6383,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6453,6 +6482,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6579,6 +6609,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6682,6 +6713,7 @@ self: super: {
   "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";
@@ -6781,6 +6813,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7810,6 +7843,7 @@ self: super: {
   "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";
@@ -8047,6 +8081,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index 69e76d6b5696..66263036f4e5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -1173,6 +1173,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1186,6 +1187,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2032,6 +2034,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2211,6 +2214,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2424,6 +2428,7 @@ self: super: {
   "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";
@@ -2452,6 +2457,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2476,6 +2482,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2572,6 +2579,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2756,6 +2764,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2861,6 +2870,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2984,6 +2994,7 @@ self: super: {
   "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";
@@ -3167,6 +3178,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3249,6 +3261,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3422,16 +3435,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3629,6 +3645,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3956,6 +3973,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4255,6 +4273,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4792,6 +4811,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4975,6 +4995,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4983,6 +5004,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5022,6 +5044,7 @@ self: super: {
   "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";
@@ -5657,6 +5680,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5769,6 +5793,7 @@ self: super: {
   "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";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -6030,6 +6055,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6426,6 +6452,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6524,6 +6551,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6651,6 +6679,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6754,6 +6783,7 @@ self: super: {
   "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";
@@ -6853,6 +6883,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7901,6 +7932,7 @@ self: super: {
   "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";
@@ -8140,6 +8172,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index c107ba1cc83b..fd2da300482e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -1167,6 +1167,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1180,6 +1181,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2016,6 +2018,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2193,6 +2196,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2404,6 +2408,7 @@ self: super: {
   "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";
@@ -2432,6 +2437,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2455,6 +2461,7 @@ self: super: {
   "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";
@@ -2551,6 +2558,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2734,6 +2742,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2837,6 +2846,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2957,6 +2967,7 @@ self: super: {
   "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";
@@ -3135,6 +3146,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3216,6 +3228,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3387,16 +3400,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3594,6 +3610,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3918,6 +3935,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4214,6 +4232,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4590,6 +4609,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4745,6 +4765,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4925,6 +4946,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4933,6 +4955,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4972,6 +4995,7 @@ self: super: {
   "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";
@@ -5599,6 +5623,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5660,6 +5685,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidal-containers" = dontDistribute super."monoidal-containers";
   "monoidplus" = dontDistribute super."monoidplus";
@@ -5709,6 +5735,7 @@ self: super: {
   "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";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5964,6 +5991,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6353,6 +6381,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6451,6 +6480,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6577,6 +6607,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6680,6 +6711,7 @@ self: super: {
   "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";
@@ -6779,6 +6811,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7807,6 +7840,7 @@ self: super: {
   "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";
@@ -8044,6 +8078,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index 414d0d4a4d2f..51edfea016d2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -1167,6 +1167,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1180,6 +1181,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2016,6 +2018,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2193,6 +2196,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2404,6 +2408,7 @@ self: super: {
   "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";
@@ -2432,6 +2437,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2455,6 +2461,7 @@ self: super: {
   "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";
@@ -2551,6 +2558,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2734,6 +2742,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2837,6 +2846,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2957,6 +2967,7 @@ self: super: {
   "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";
@@ -3135,6 +3146,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3216,6 +3228,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3387,16 +3400,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3594,6 +3610,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3918,6 +3935,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4214,6 +4232,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4590,6 +4609,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4745,6 +4765,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4925,6 +4946,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4933,6 +4955,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4972,6 +4995,7 @@ self: super: {
   "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";
@@ -5598,6 +5622,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5659,6 +5684,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidal-containers" = dontDistribute super."monoidal-containers";
   "monoidplus" = dontDistribute super."monoidplus";
@@ -5708,6 +5734,7 @@ self: super: {
   "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";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5963,6 +5990,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6352,6 +6380,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6449,6 +6478,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6575,6 +6605,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6678,6 +6709,7 @@ self: super: {
   "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";
@@ -6777,6 +6809,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7805,6 +7838,7 @@ self: super: {
   "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";
@@ -8042,6 +8076,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 3915f14e98db..9177bc699499 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -1167,6 +1167,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1180,6 +1181,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2016,6 +2018,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2193,6 +2196,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2404,6 +2408,7 @@ self: super: {
   "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";
@@ -2432,6 +2437,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2455,6 +2461,7 @@ self: super: {
   "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";
@@ -2551,6 +2558,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2734,6 +2742,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2837,6 +2846,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2957,6 +2967,7 @@ self: super: {
   "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";
@@ -3135,6 +3146,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3216,6 +3228,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3387,16 +3400,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3594,6 +3610,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3918,6 +3935,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4213,6 +4231,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4589,6 +4608,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4744,6 +4764,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4924,6 +4945,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4932,6 +4954,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4971,6 +4994,7 @@ self: super: {
   "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";
@@ -5596,6 +5620,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5657,6 +5682,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidal-containers" = dontDistribute super."monoidal-containers";
   "monoidplus" = dontDistribute super."monoidplus";
@@ -5706,6 +5732,7 @@ self: super: {
   "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";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5961,6 +5988,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6350,6 +6378,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6447,6 +6476,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6573,6 +6603,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6676,6 +6707,7 @@ self: super: {
   "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";
@@ -6775,6 +6807,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7803,6 +7836,7 @@ self: super: {
   "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";
@@ -8040,6 +8074,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index a6e8bdea0bf5..2aac605c9a40 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -1173,6 +1173,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1186,6 +1187,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2032,6 +2034,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2211,6 +2214,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2424,6 +2428,7 @@ self: super: {
   "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";
@@ -2452,6 +2457,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2476,6 +2482,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2572,6 +2579,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2756,6 +2764,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2861,6 +2870,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2984,6 +2994,7 @@ self: super: {
   "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";
@@ -3166,6 +3177,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3248,6 +3260,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3421,16 +3434,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3628,6 +3644,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3955,6 +3972,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4254,6 +4272,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4790,6 +4809,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4973,6 +4993,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4981,6 +5002,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5020,6 +5042,7 @@ self: super: {
   "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";
@@ -5655,6 +5678,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5767,6 +5791,7 @@ self: super: {
   "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";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -6028,6 +6053,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6424,6 +6450,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6522,6 +6549,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6649,6 +6677,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6752,6 +6781,7 @@ self: super: {
   "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";
@@ -6851,6 +6881,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7899,6 +7930,7 @@ self: super: {
   "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";
@@ -8138,6 +8170,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index fbf589da2a48..530e2fe37051 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -1173,6 +1173,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1186,6 +1187,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2031,6 +2033,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2210,6 +2213,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2423,6 +2427,7 @@ self: super: {
   "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";
@@ -2451,6 +2456,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2475,6 +2481,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2571,6 +2578,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2755,6 +2763,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2860,6 +2869,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2983,6 +2993,7 @@ self: super: {
   "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";
@@ -3165,6 +3176,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3247,6 +3259,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3420,16 +3433,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3627,6 +3643,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3954,6 +3971,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4253,6 +4271,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4789,6 +4808,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4972,6 +4992,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4980,6 +5001,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5019,6 +5041,7 @@ self: super: {
   "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";
@@ -5653,6 +5676,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5765,6 +5789,7 @@ self: super: {
   "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";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -6026,6 +6051,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6420,6 +6446,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6518,6 +6545,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6645,6 +6673,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6748,6 +6777,7 @@ self: super: {
   "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";
@@ -6847,6 +6877,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7894,6 +7925,7 @@ self: super: {
   "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";
@@ -8133,6 +8165,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 950c96577cbb..bba0619c2a89 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -1173,6 +1173,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1186,6 +1187,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2031,6 +2033,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2210,6 +2213,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2422,6 +2426,7 @@ self: super: {
   "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";
@@ -2450,6 +2455,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2474,6 +2480,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2570,6 +2577,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2754,6 +2762,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2859,6 +2868,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2982,6 +2992,7 @@ self: super: {
   "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";
@@ -3164,6 +3175,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3246,6 +3258,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3419,16 +3432,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3626,6 +3642,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3953,6 +3970,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4252,6 +4270,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4788,6 +4807,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4971,6 +4991,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4979,6 +5000,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5018,6 +5040,7 @@ self: super: {
   "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";
@@ -5651,6 +5674,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5763,6 +5787,7 @@ self: super: {
   "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";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -6024,6 +6049,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6418,6 +6444,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6516,6 +6543,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6643,6 +6671,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6746,6 +6775,7 @@ self: super: {
   "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";
@@ -6845,6 +6875,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7892,6 +7923,7 @@ self: super: {
   "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";
@@ -8131,6 +8163,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index 38c75d61d58f..4a87fe9fbcda 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -1171,6 +1171,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1184,6 +1185,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2028,6 +2030,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2207,6 +2210,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2419,6 +2423,7 @@ self: super: {
   "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";
@@ -2447,6 +2452,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2471,6 +2477,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2567,6 +2574,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2751,6 +2759,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2856,6 +2865,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2979,6 +2989,7 @@ self: super: {
   "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";
@@ -3161,6 +3172,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3243,6 +3255,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3416,16 +3429,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3623,6 +3639,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3948,6 +3965,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4247,6 +4265,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4783,6 +4802,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4966,6 +4986,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4974,6 +4995,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5013,6 +5035,7 @@ self: super: {
   "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";
@@ -5646,6 +5669,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5758,6 +5782,7 @@ self: super: {
   "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";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -6018,6 +6043,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6412,6 +6438,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6510,6 +6537,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6637,6 +6665,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6740,6 +6769,7 @@ self: super: {
   "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";
@@ -6839,6 +6869,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7886,6 +7917,7 @@ self: super: {
   "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";
@@ -8123,6 +8155,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 997a567ddd36..edf12e275824 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -1170,6 +1170,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1183,6 +1184,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2027,6 +2029,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2206,6 +2209,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2418,6 +2422,7 @@ self: super: {
   "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";
@@ -2446,6 +2451,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2470,6 +2476,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2566,6 +2573,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2750,6 +2758,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2855,6 +2864,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2978,6 +2988,7 @@ self: super: {
   "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";
@@ -3160,6 +3171,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3242,6 +3254,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3415,16 +3428,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3622,6 +3638,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3947,6 +3964,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4246,6 +4264,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4782,6 +4801,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4965,6 +4985,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4973,6 +4994,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5012,6 +5034,7 @@ self: super: {
   "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";
@@ -5645,6 +5668,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5758,6 +5782,7 @@ self: super: {
   "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";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -6017,6 +6042,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6411,6 +6437,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6509,6 +6536,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6636,6 +6664,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6739,6 +6768,7 @@ self: super: {
   "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";
@@ -6838,6 +6868,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7885,6 +7916,7 @@ self: super: {
   "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";
@@ -8122,6 +8154,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index ad0e17a2b4a3..d7c2beee04de 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -1169,6 +1169,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1182,6 +1183,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2026,6 +2028,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2205,6 +2208,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2417,6 +2421,7 @@ self: super: {
   "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";
@@ -2445,6 +2450,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2469,6 +2475,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2565,6 +2572,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2749,6 +2757,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2854,6 +2863,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2977,6 +2987,7 @@ self: super: {
   "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";
@@ -3158,6 +3169,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3240,6 +3252,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3413,16 +3426,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3620,6 +3636,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3945,6 +3962,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4244,6 +4262,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4623,6 +4642,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4779,6 +4799,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4962,6 +4983,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4970,6 +4992,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5009,6 +5032,7 @@ self: super: {
   "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";
@@ -5642,6 +5666,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5755,6 +5780,7 @@ self: super: {
   "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";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -6014,6 +6040,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6408,6 +6435,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6506,6 +6534,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6633,6 +6662,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6736,6 +6766,7 @@ self: super: {
   "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";
@@ -6835,6 +6866,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7878,6 +7910,7 @@ self: super: {
   "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";
@@ -8115,6 +8148,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index 70df2406a7e9..b724cc74d06b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -1169,6 +1169,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1182,6 +1183,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -2023,6 +2025,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2202,6 +2205,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2414,6 +2418,7 @@ self: super: {
   "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";
@@ -2442,6 +2447,7 @@ self: super: {
   "data-hash" = dontDistribute super."data-hash";
   "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";
@@ -2466,6 +2472,7 @@ self: super: {
   "data-reify" = doDistribute super."data-reify_0_6";
   "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";
@@ -2562,6 +2569,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = dontDistribute super."dependent-map";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = dontDistribute super."dependent-sum";
   "dependent-sum-template" = dontDistribute super."dependent-sum-template";
   "depends" = dontDistribute super."depends";
@@ -2746,6 +2754,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2850,6 +2859,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2972,6 +2982,7 @@ self: super: {
   "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";
@@ -3153,6 +3164,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3235,6 +3247,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3408,16 +3421,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3615,6 +3631,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3940,6 +3957,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_2";
   "haskell-neo4j-client" = dontDistribute super."haskell-neo4j-client";
@@ -4239,6 +4257,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_24_1";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4616,6 +4635,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4772,6 +4792,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4955,6 +4976,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_0_2_5_13";
   "json-b" = dontDistribute super."json-b";
   "json-builder" = dontDistribute super."json-builder";
@@ -4963,6 +4985,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -5002,6 +5025,7 @@ self: super: {
   "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";
@@ -5633,6 +5657,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5746,6 +5771,7 @@ self: super: {
   "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";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -6005,6 +6031,7 @@ self: super: {
   "objectid" = dontDistribute super."objectid";
   "objective" = dontDistribute super."objective";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6398,6 +6425,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = dontDistribute super."poly-arity";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6496,6 +6524,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6623,6 +6652,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6726,6 +6756,7 @@ self: super: {
   "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";
@@ -6825,6 +6856,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -7864,6 +7896,7 @@ self: super: {
   "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";
@@ -8101,6 +8134,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index cd610a659c45..266b64b08f24 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -1143,6 +1143,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1155,6 +1156,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1262,6 +1264,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1954,6 +1957,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2128,6 +2132,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2337,6 +2342,7 @@ self: super: {
   "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";
@@ -2364,6 +2370,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2386,6 +2393,7 @@ self: super: {
   "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";
@@ -2481,6 +2489,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2654,6 +2663,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2754,6 +2764,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2871,6 +2882,7 @@ self: super: {
   "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";
@@ -3041,6 +3053,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3122,6 +3135,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3291,16 +3305,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3497,6 +3514,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3816,6 +3834,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_1_4";
@@ -4105,6 +4124,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4476,6 +4496,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4622,6 +4643,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4796,6 +4818,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -4803,6 +4826,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4841,6 +4865,7 @@ self: super: {
   "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";
@@ -4938,6 +4963,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5438,6 +5464,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5496,6 +5523,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_2";
   "monoidplus" = dontDistribute super."monoidplus";
@@ -5540,6 +5568,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5791,6 +5820,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6165,6 +6195,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = doDistribute super."poly-arity_0_0_4_1";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6262,6 +6293,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6387,6 +6419,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6488,6 +6521,7 @@ self: super: {
   "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";
@@ -6588,6 +6622,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6810,6 +6845,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7594,6 +7630,7 @@ self: super: {
   "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";
@@ -7821,6 +7858,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -8057,6 +8095,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index 54efeb53169b..9a89efadc04b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -1142,6 +1142,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1154,6 +1155,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1261,6 +1263,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1953,6 +1956,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2127,6 +2131,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2336,6 +2341,7 @@ self: super: {
   "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";
@@ -2363,6 +2369,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2385,6 +2392,7 @@ self: super: {
   "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";
@@ -2480,6 +2488,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2653,6 +2662,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2753,6 +2763,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2870,6 +2881,7 @@ self: super: {
   "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";
@@ -3038,6 +3050,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3119,6 +3132,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3288,16 +3302,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3494,6 +3511,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3813,6 +3831,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_1_4";
@@ -4102,6 +4121,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4473,6 +4493,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4619,6 +4640,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4793,6 +4815,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -4800,6 +4823,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4838,6 +4862,7 @@ self: super: {
   "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";
@@ -4935,6 +4960,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5434,6 +5460,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5492,6 +5519,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_2";
   "monoidplus" = dontDistribute super."monoidplus";
@@ -5536,6 +5564,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5786,6 +5815,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6159,6 +6189,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = doDistribute super."poly-arity_0_0_4_1";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6256,6 +6287,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6381,6 +6413,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-io" = doDistribute super."quickcheck-io_0_1_1";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
@@ -6482,6 +6515,7 @@ self: super: {
   "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";
@@ -6582,6 +6616,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6803,6 +6838,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7587,6 +7623,7 @@ self: super: {
   "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";
@@ -7814,6 +7851,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -8049,6 +8087,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index 31a89af13be8..b319d87396de 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -1136,6 +1136,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1148,6 +1149,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1255,6 +1257,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1840,6 +1843,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1935,6 +1939,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2109,6 +2114,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2315,6 +2321,7 @@ self: super: {
   "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";
@@ -2342,6 +2349,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2364,6 +2372,7 @@ self: super: {
   "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";
@@ -2459,6 +2468,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2542,6 +2552,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2624,6 +2635,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2723,6 +2735,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2805,6 +2818,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2839,6 +2853,7 @@ self: super: {
   "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";
@@ -3004,6 +3019,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3084,6 +3100,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3252,16 +3269,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3456,6 +3476,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3706,6 +3727,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3774,6 +3796,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -4059,6 +4082,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4428,6 +4452,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4572,6 +4597,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4746,12 +4772,14 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4789,6 +4817,7 @@ self: super: {
   "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";
@@ -4884,6 +4913,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5379,6 +5409,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5436,6 +5467,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5479,6 +5511,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5726,6 +5759,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6093,6 +6127,7 @@ self: super: {
   "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";
@@ -6186,6 +6221,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6309,6 +6345,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6407,6 +6444,7 @@ self: super: {
   "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";
@@ -6506,6 +6544,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6702,6 +6741,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6726,6 +6766,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7496,6 +7537,7 @@ self: super: {
   "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";
@@ -7721,6 +7763,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -7954,6 +7997,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index 2a0ccf1d8545..efa75da0139d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -1136,6 +1136,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1148,6 +1149,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1255,6 +1257,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1838,6 +1841,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1933,6 +1937,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2107,6 +2112,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2313,6 +2319,7 @@ self: super: {
   "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";
@@ -2340,6 +2347,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2362,6 +2370,7 @@ self: super: {
   "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";
@@ -2457,6 +2466,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2540,6 +2550,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2622,6 +2633,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2721,6 +2733,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2803,6 +2816,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2836,6 +2850,7 @@ self: super: {
   "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";
@@ -3001,6 +3016,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3081,6 +3097,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3249,16 +3266,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3453,6 +3473,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3703,6 +3724,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3771,6 +3793,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -4056,6 +4079,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4425,6 +4449,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4569,6 +4594,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4743,12 +4769,14 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4786,6 +4814,7 @@ self: super: {
   "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";
@@ -4881,6 +4910,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5376,6 +5406,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5433,6 +5464,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5476,6 +5508,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5723,6 +5756,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6089,6 +6123,7 @@ self: super: {
   "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";
@@ -6182,6 +6217,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6305,6 +6341,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6403,6 +6440,7 @@ self: super: {
   "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";
@@ -6502,6 +6540,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6698,6 +6737,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6722,6 +6762,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7491,6 +7532,7 @@ self: super: {
   "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";
@@ -7716,6 +7758,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -7949,6 +7992,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index bae9a9efad81..2baf81224cd7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -1135,6 +1135,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1147,6 +1148,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1254,6 +1256,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1837,6 +1840,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1931,6 +1935,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2102,6 +2107,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2308,6 +2314,7 @@ self: super: {
   "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";
@@ -2335,6 +2342,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2357,6 +2365,7 @@ self: super: {
   "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";
@@ -2452,6 +2461,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2535,6 +2545,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2617,6 +2628,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2716,6 +2728,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2798,6 +2811,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2831,6 +2845,7 @@ self: super: {
   "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";
@@ -2996,6 +3011,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3076,6 +3092,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3244,16 +3261,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3447,6 +3467,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3697,6 +3718,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3765,6 +3787,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -4050,6 +4073,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4419,6 +4443,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4563,6 +4588,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4737,12 +4763,14 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4780,6 +4808,7 @@ self: super: {
   "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";
@@ -4875,6 +4904,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5370,6 +5400,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5427,6 +5458,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5470,6 +5502,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5717,6 +5750,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6082,6 +6116,7 @@ self: super: {
   "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";
@@ -6175,6 +6210,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6298,6 +6334,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6396,6 +6433,7 @@ self: super: {
   "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";
@@ -6495,6 +6533,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6691,6 +6730,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6715,6 +6755,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7483,6 +7524,7 @@ self: super: {
   "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";
@@ -7707,6 +7749,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -7940,6 +7983,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index 1c0bfd5e48e3..77646f89eff0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -1135,6 +1135,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1147,6 +1148,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1254,6 +1256,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1837,6 +1840,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1931,6 +1935,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2102,6 +2107,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2308,6 +2314,7 @@ self: super: {
   "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";
@@ -2335,6 +2342,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2357,6 +2365,7 @@ self: super: {
   "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";
@@ -2452,6 +2461,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2535,6 +2545,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2617,6 +2628,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2716,6 +2728,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2798,6 +2811,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2831,6 +2845,7 @@ self: super: {
   "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";
@@ -2996,6 +3011,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3076,6 +3092,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3244,16 +3261,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3447,6 +3467,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3697,6 +3718,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3765,6 +3787,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -4049,6 +4072,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4418,6 +4442,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4562,6 +4587,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4736,12 +4762,14 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4779,6 +4807,7 @@ self: super: {
   "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";
@@ -4874,6 +4903,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5368,6 +5398,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5425,6 +5456,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5468,6 +5500,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5715,6 +5748,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6079,6 +6113,7 @@ self: super: {
   "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";
@@ -6172,6 +6207,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6295,6 +6331,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6393,6 +6430,7 @@ self: super: {
   "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";
@@ -6492,6 +6530,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6688,6 +6727,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6712,6 +6752,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7344,6 +7385,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7479,6 +7521,7 @@ self: super: {
   "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";
@@ -7703,6 +7746,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -7936,6 +7980,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index 46b637d6e69e..a797ab5ea2af 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -1133,6 +1133,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1145,6 +1146,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1252,6 +1254,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1834,6 +1837,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1928,6 +1932,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2099,6 +2104,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2304,6 +2310,7 @@ self: super: {
   "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";
@@ -2331,6 +2338,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2353,6 +2361,7 @@ self: super: {
   "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";
@@ -2448,6 +2457,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2529,6 +2539,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2611,6 +2622,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2709,6 +2721,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2791,6 +2804,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2824,6 +2838,7 @@ self: super: {
   "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";
@@ -2989,6 +3004,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3069,6 +3085,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3237,16 +3254,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3440,6 +3460,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3690,6 +3711,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3758,6 +3780,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -4042,6 +4065,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4410,6 +4434,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4554,6 +4579,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4728,12 +4754,14 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4771,6 +4799,7 @@ self: super: {
   "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";
@@ -4866,6 +4895,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5359,6 +5389,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5415,6 +5446,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5458,6 +5490,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5705,6 +5738,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6069,6 +6103,7 @@ self: super: {
   "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";
@@ -6162,6 +6197,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6285,6 +6321,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6383,6 +6420,7 @@ self: super: {
   "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";
@@ -6482,6 +6520,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6678,6 +6717,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6702,6 +6742,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7334,6 +7375,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7469,6 +7511,7 @@ self: super: {
   "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";
@@ -7693,6 +7736,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -7926,6 +7970,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 99fd4d5a0a8f..d9c13c28eb0f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -1133,6 +1133,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1145,6 +1146,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1252,6 +1254,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1834,6 +1837,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1928,6 +1932,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2099,6 +2104,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2304,6 +2310,7 @@ self: super: {
   "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";
@@ -2331,6 +2338,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2353,6 +2361,7 @@ self: super: {
   "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";
@@ -2448,6 +2457,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2529,6 +2539,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2611,6 +2622,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2709,6 +2721,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2791,6 +2804,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2824,6 +2838,7 @@ self: super: {
   "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";
@@ -2989,6 +3004,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3069,6 +3085,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3236,16 +3253,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3439,6 +3459,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3689,6 +3710,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3756,6 +3778,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -4040,6 +4063,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4407,6 +4431,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4550,6 +4575,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4724,12 +4750,14 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4767,6 +4795,7 @@ self: super: {
   "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";
@@ -4862,6 +4891,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5355,6 +5385,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5411,6 +5442,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5454,6 +5486,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5701,6 +5734,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6065,6 +6099,7 @@ self: super: {
   "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";
@@ -6158,6 +6193,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6244,6 +6280,7 @@ self: super: {
   "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_7_6_1";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
@@ -6280,6 +6317,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6378,6 +6416,7 @@ self: super: {
   "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";
@@ -6477,6 +6516,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6673,6 +6713,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6697,6 +6738,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7328,6 +7370,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7463,6 +7506,7 @@ self: super: {
   "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";
@@ -7687,6 +7731,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -7920,6 +7965,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index d8fd3a98d386..027669a0662a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -1132,6 +1132,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1144,6 +1145,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1251,6 +1253,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1832,6 +1835,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1926,6 +1930,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2097,6 +2102,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2302,6 +2308,7 @@ self: super: {
   "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";
@@ -2329,6 +2336,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2351,6 +2359,7 @@ self: super: {
   "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";
@@ -2446,6 +2455,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2527,6 +2537,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2609,6 +2620,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2707,6 +2719,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2789,6 +2802,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2821,6 +2835,7 @@ self: super: {
   "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";
@@ -2986,6 +3001,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3066,6 +3082,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3233,16 +3250,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3436,6 +3456,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3685,6 +3706,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3752,6 +3774,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -4036,6 +4059,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4403,6 +4427,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4546,6 +4571,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4720,12 +4746,14 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4763,6 +4791,7 @@ self: super: {
   "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";
@@ -4858,6 +4887,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5349,6 +5379,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5405,6 +5436,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5448,6 +5480,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5695,6 +5728,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6058,6 +6092,7 @@ self: super: {
   "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";
@@ -6150,6 +6185,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6236,6 +6272,7 @@ self: super: {
   "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_7_6_1";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
@@ -6272,6 +6309,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6370,6 +6408,7 @@ self: super: {
   "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";
@@ -6468,6 +6507,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6664,6 +6704,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6687,6 +6728,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7317,6 +7359,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7450,6 +7493,7 @@ self: super: {
   "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";
@@ -7673,6 +7717,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -7906,6 +7951,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index bdc78a327698..39ffaa069b0b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -1132,6 +1132,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1144,6 +1145,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1251,6 +1253,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1831,6 +1834,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1924,6 +1928,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2094,6 +2099,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2299,6 +2305,7 @@ self: super: {
   "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";
@@ -2326,6 +2333,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2348,6 +2356,7 @@ self: super: {
   "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";
@@ -2443,6 +2452,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2524,6 +2534,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2606,6 +2617,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2704,6 +2716,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2786,6 +2799,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2818,6 +2832,7 @@ self: super: {
   "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";
@@ -2983,6 +2998,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3063,6 +3079,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3230,16 +3247,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3433,6 +3453,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3681,6 +3702,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3748,6 +3770,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -4032,6 +4055,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4399,6 +4423,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4542,6 +4567,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4715,12 +4741,14 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4758,6 +4786,7 @@ self: super: {
   "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";
@@ -4853,6 +4882,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5343,6 +5373,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5398,6 +5429,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5441,6 +5473,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5688,6 +5721,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6051,6 +6085,7 @@ self: super: {
   "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";
@@ -6143,6 +6178,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6229,6 +6265,7 @@ self: super: {
   "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_7_6_1";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
@@ -6265,6 +6302,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6363,6 +6401,7 @@ self: super: {
   "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";
@@ -6461,6 +6500,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6657,6 +6697,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6680,6 +6721,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7310,6 +7352,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7443,6 +7486,7 @@ self: super: {
   "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";
@@ -7666,6 +7710,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -7898,6 +7943,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index 367f95328dc4..c3e02f0b9a22 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -1132,6 +1132,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1144,6 +1145,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1251,6 +1253,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1830,6 +1833,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1923,6 +1927,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2093,6 +2098,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2298,6 +2304,7 @@ self: super: {
   "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";
@@ -2325,6 +2332,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2347,6 +2355,7 @@ self: super: {
   "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";
@@ -2442,6 +2451,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2523,6 +2533,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2605,6 +2616,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2703,6 +2715,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2785,6 +2798,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2817,6 +2831,7 @@ self: super: {
   "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";
@@ -2982,6 +2997,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3062,6 +3078,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3229,16 +3246,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3430,6 +3450,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3677,6 +3698,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3744,6 +3766,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -4026,6 +4049,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4390,6 +4414,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4533,6 +4558,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4706,12 +4732,14 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4749,6 +4777,7 @@ self: super: {
   "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";
@@ -4844,6 +4873,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5334,6 +5364,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5389,6 +5420,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5432,6 +5464,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5679,6 +5712,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6041,6 +6075,7 @@ self: super: {
   "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";
@@ -6133,6 +6168,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6217,6 +6253,7 @@ self: super: {
   "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_7_6_1";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
@@ -6253,6 +6290,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6351,6 +6389,7 @@ self: super: {
   "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";
@@ -6449,6 +6488,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6645,6 +6685,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6668,6 +6709,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7297,6 +7339,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7429,6 +7472,7 @@ self: super: {
   "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";
@@ -7652,6 +7696,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -7883,6 +7928,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index a14789bb313e..2b667569026f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -1131,6 +1131,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1143,6 +1144,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1250,6 +1252,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1825,6 +1828,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1918,6 +1922,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2087,6 +2092,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2292,6 +2298,7 @@ self: super: {
   "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";
@@ -2319,6 +2326,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2341,6 +2349,7 @@ self: super: {
   "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";
@@ -2436,6 +2445,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2517,6 +2527,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2599,6 +2610,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2697,6 +2709,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2779,6 +2792,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2811,6 +2825,7 @@ self: super: {
   "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";
@@ -2976,6 +2991,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3056,6 +3072,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3223,16 +3240,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3424,6 +3444,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3671,6 +3692,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3738,6 +3760,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -4020,6 +4043,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4381,6 +4405,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4524,6 +4549,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4697,12 +4723,14 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4739,6 +4767,7 @@ self: super: {
   "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";
@@ -4834,6 +4863,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5323,6 +5353,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5378,6 +5409,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5421,6 +5453,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5667,6 +5700,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6027,6 +6061,7 @@ self: super: {
   "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";
@@ -6119,6 +6154,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6203,6 +6239,7 @@ self: super: {
   "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_7_6_1";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
@@ -6239,6 +6276,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6337,6 +6375,7 @@ self: super: {
   "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";
@@ -6435,6 +6474,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6493,6 +6533,7 @@ self: super: {
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
   "retryer" = dontDistribute super."retryer";
+  "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
@@ -6630,6 +6671,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6653,6 +6695,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7281,6 +7324,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7413,6 +7457,7 @@ self: super: {
   "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";
@@ -7636,6 +7681,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -7867,6 +7913,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index f5f538b76fc8..42808be6db23 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -1140,6 +1140,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1152,6 +1153,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1259,6 +1261,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1950,6 +1953,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2124,6 +2128,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2333,6 +2338,7 @@ self: super: {
   "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";
@@ -2360,6 +2366,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2382,6 +2389,7 @@ self: super: {
   "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";
@@ -2477,6 +2485,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2649,6 +2658,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2749,6 +2759,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2866,6 +2877,7 @@ self: super: {
   "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";
@@ -3034,6 +3046,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3115,6 +3128,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3283,16 +3297,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3489,6 +3506,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3808,6 +3826,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_1_4";
@@ -4097,6 +4116,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4468,6 +4488,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4614,6 +4635,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4788,6 +4810,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -4795,6 +4818,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4833,6 +4857,7 @@ self: super: {
   "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";
@@ -4929,6 +4954,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5427,6 +5453,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5485,6 +5512,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_2";
   "monoidplus" = dontDistribute super."monoidplus";
@@ -5529,6 +5557,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5779,6 +5808,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6151,6 +6181,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = doDistribute super."poly-arity_0_0_5";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6248,6 +6279,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6373,6 +6405,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6473,6 +6506,7 @@ self: super: {
   "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";
@@ -6573,6 +6607,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6794,6 +6829,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7575,6 +7611,7 @@ self: super: {
   "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";
@@ -7802,6 +7839,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -8037,6 +8075,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index 6ebc3598ad03..a442cad84614 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -1129,6 +1129,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1141,6 +1142,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1248,6 +1250,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1750,6 +1753,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-install" = doDistribute super."cabal-install_1_22_7_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";
@@ -1822,6 +1826,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1915,6 +1920,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2084,6 +2090,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2289,6 +2296,7 @@ self: super: {
   "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";
@@ -2316,6 +2324,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2338,6 +2347,7 @@ self: super: {
   "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";
@@ -2433,6 +2443,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2514,6 +2525,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2596,6 +2608,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2694,6 +2707,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2776,6 +2790,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2808,6 +2823,7 @@ self: super: {
   "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";
@@ -2973,6 +2989,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3053,6 +3070,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3220,16 +3238,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3421,6 +3442,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3668,6 +3690,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3735,6 +3758,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -4017,6 +4041,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4378,6 +4403,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4521,6 +4547,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4694,12 +4721,14 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4736,6 +4765,7 @@ self: super: {
   "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";
@@ -4830,6 +4860,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5319,6 +5350,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5374,6 +5406,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5417,6 +5450,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5663,6 +5697,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6022,6 +6057,7 @@ self: super: {
   "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";
@@ -6114,6 +6150,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6198,6 +6235,7 @@ self: super: {
   "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_7_6_1";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
@@ -6234,6 +6272,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6332,6 +6371,7 @@ self: super: {
   "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";
@@ -6429,6 +6469,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6487,6 +6528,7 @@ self: super: {
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
   "retryer" = dontDistribute super."retryer";
+  "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
@@ -6624,6 +6666,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6647,6 +6690,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7274,6 +7318,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7405,6 +7450,7 @@ self: super: {
   "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";
@@ -7628,6 +7674,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -7859,6 +7906,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8108,6 +8156,7 @@ self: super: {
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-conduit" = doDistribute super."xml-conduit_1_3_3";
   "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 40d9bdc82a17..c5bb78d3e59b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -1129,6 +1129,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1141,6 +1142,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1248,6 +1250,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1749,6 +1752,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-install" = doDistribute super."cabal-install_1_22_7_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";
@@ -1821,6 +1825,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1914,6 +1919,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2081,6 +2087,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2286,6 +2293,7 @@ self: super: {
   "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";
@@ -2313,6 +2321,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2335,6 +2344,7 @@ self: super: {
   "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";
@@ -2430,6 +2440,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2511,6 +2522,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2593,6 +2605,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2691,6 +2704,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2773,6 +2787,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2805,6 +2820,7 @@ self: super: {
   "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";
@@ -2968,6 +2984,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3048,6 +3065,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3215,16 +3233,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3416,6 +3437,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3662,6 +3684,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3729,6 +3752,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -4011,6 +4035,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4372,6 +4397,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4513,6 +4539,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4686,12 +4713,14 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4728,6 +4757,7 @@ self: super: {
   "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";
@@ -4822,6 +4852,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5311,6 +5342,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5365,6 +5397,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5408,6 +5441,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5654,6 +5688,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6011,6 +6046,7 @@ self: super: {
   "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";
@@ -6103,6 +6139,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6187,6 +6224,7 @@ self: super: {
   "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_7_6_1";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
@@ -6223,6 +6261,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6321,6 +6360,7 @@ self: super: {
   "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";
@@ -6417,6 +6457,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6474,6 +6515,7 @@ self: super: {
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
   "retryer" = dontDistribute super."retryer";
+  "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
@@ -6610,6 +6652,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6633,6 +6676,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7251,6 +7295,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7382,6 +7427,7 @@ self: super: {
   "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";
@@ -7604,6 +7650,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -7835,6 +7882,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8079,6 +8127,7 @@ self: super: {
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-conduit" = doDistribute super."xml-conduit_1_3_3";
   "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 a4f288d71cf7..3d3eff509fa2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -1129,6 +1129,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1141,6 +1142,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1248,6 +1250,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1749,6 +1752,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-install" = doDistribute super."cabal-install_1_22_7_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";
@@ -1821,6 +1825,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1914,6 +1919,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2081,6 +2087,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2286,6 +2293,7 @@ self: super: {
   "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";
@@ -2313,6 +2321,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2335,6 +2344,7 @@ self: super: {
   "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";
@@ -2430,6 +2440,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2511,6 +2522,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2593,6 +2605,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2691,6 +2704,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2773,6 +2787,7 @@ self: super: {
   "estreps" = dontDistribute super."estreps";
   "etcd" = dontDistribute super."etcd";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2805,6 +2820,7 @@ self: super: {
   "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";
@@ -2966,6 +2982,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3046,6 +3063,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3213,16 +3231,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3414,6 +3435,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3660,6 +3682,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls" = dontDistribute super."happstack-server-tls";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
@@ -3727,6 +3750,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -4008,6 +4032,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4369,6 +4394,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4509,6 +4535,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4680,12 +4707,14 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4722,6 +4751,7 @@ self: super: {
   "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";
@@ -4816,6 +4846,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5305,6 +5336,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5359,6 +5391,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5402,6 +5435,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5648,6 +5682,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6005,6 +6040,7 @@ self: super: {
   "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";
@@ -6097,6 +6133,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6181,6 +6218,7 @@ self: super: {
   "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_7_6_1";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
@@ -6217,6 +6255,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6315,6 +6354,7 @@ self: super: {
   "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";
@@ -6411,6 +6451,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6468,6 +6509,7 @@ self: super: {
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_6";
   "retryer" = dontDistribute super."retryer";
+  "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
@@ -6604,6 +6646,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6627,6 +6670,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7245,6 +7289,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -7376,6 +7421,7 @@ self: super: {
   "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";
@@ -7598,6 +7644,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -7829,6 +7876,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -8073,6 +8121,7 @@ self: super: {
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-conduit" = doDistribute super."xml-conduit_1_3_3";
   "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 7637c65cdad4..bcaea931ffcb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -1140,6 +1140,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1152,6 +1153,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1259,6 +1261,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1949,6 +1952,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2123,6 +2127,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2330,6 +2335,7 @@ self: super: {
   "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";
@@ -2357,6 +2363,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2379,6 +2386,7 @@ self: super: {
   "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";
@@ -2474,6 +2482,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2646,6 +2655,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2746,6 +2756,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2863,6 +2874,7 @@ self: super: {
   "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";
@@ -3030,6 +3042,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3111,6 +3124,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3279,16 +3293,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3485,6 +3502,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3804,6 +3822,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_1_4";
@@ -4092,6 +4111,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4462,6 +4482,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4608,6 +4629,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4782,6 +4804,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -4789,6 +4812,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4827,6 +4851,7 @@ self: super: {
   "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";
@@ -4923,6 +4948,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5421,6 +5447,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5479,6 +5506,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_2";
   "monoidplus" = dontDistribute super."monoidplus";
@@ -5523,6 +5551,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5773,6 +5802,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6145,6 +6175,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = doDistribute super."poly-arity_0_0_5";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6242,6 +6273,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6367,6 +6399,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6467,6 +6500,7 @@ self: super: {
   "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";
@@ -6566,6 +6600,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6787,6 +6822,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7566,6 +7602,7 @@ self: super: {
   "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";
@@ -7793,6 +7830,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -8027,6 +8065,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index 970d4c2622a8..e5d13079ed74 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -1140,6 +1140,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1152,6 +1153,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1259,6 +1261,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1949,6 +1952,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2123,6 +2127,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2330,6 +2335,7 @@ self: super: {
   "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";
@@ -2357,6 +2363,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2379,6 +2386,7 @@ self: super: {
   "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";
@@ -2474,6 +2482,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2646,6 +2655,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2746,6 +2756,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2863,6 +2874,7 @@ self: super: {
   "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";
@@ -3030,6 +3042,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3111,6 +3124,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3279,16 +3293,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3485,6 +3502,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3804,6 +3822,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_1_4";
@@ -4092,6 +4111,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4462,6 +4482,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4608,6 +4629,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4782,6 +4804,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -4789,6 +4812,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4827,6 +4851,7 @@ self: super: {
   "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";
@@ -4923,6 +4948,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5421,6 +5447,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5479,6 +5506,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_2";
   "monoidplus" = dontDistribute super."monoidplus";
@@ -5523,6 +5551,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
@@ -5773,6 +5802,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6145,6 +6175,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = doDistribute super."poly-arity_0_0_5";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6242,6 +6273,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6367,6 +6399,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6467,6 +6500,7 @@ self: super: {
   "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";
@@ -6566,6 +6600,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6762,6 +6797,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6786,6 +6822,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7564,6 +7601,7 @@ self: super: {
   "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";
@@ -7791,6 +7829,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -8025,6 +8064,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index 3c37a041e323..6ae70cf43415 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -1140,6 +1140,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1152,6 +1153,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1259,6 +1261,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1851,6 +1854,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1947,6 +1951,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2121,6 +2126,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2328,6 +2334,7 @@ self: super: {
   "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";
@@ -2355,6 +2362,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2377,6 +2385,7 @@ self: super: {
   "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";
@@ -2472,6 +2481,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2644,6 +2654,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2744,6 +2755,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2861,6 +2873,7 @@ self: super: {
   "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";
@@ -3027,6 +3040,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3108,6 +3122,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3276,16 +3291,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3482,6 +3500,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3801,6 +3820,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -4087,6 +4107,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4456,6 +4477,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4600,6 +4622,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4774,6 +4797,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -4781,6 +4805,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4819,6 +4844,7 @@ self: super: {
   "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";
@@ -4915,6 +4941,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5413,6 +5440,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5471,6 +5499,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidal-containers" = doDistribute super."monoidal-containers_0_1_2_2";
   "monoidplus" = dontDistribute super."monoidplus";
@@ -5515,6 +5544,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5764,6 +5794,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6134,6 +6165,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = doDistribute super."poly-arity_0_0_6";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6230,6 +6262,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6355,6 +6388,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6455,6 +6489,7 @@ self: super: {
   "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";
@@ -6554,6 +6589,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6750,6 +6786,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6774,6 +6811,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7549,6 +7587,7 @@ self: super: {
   "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";
@@ -7776,6 +7815,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -8010,6 +8050,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index 67e398551d15..6d6ef3dccd01 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -1140,6 +1140,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1152,6 +1153,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1259,6 +1261,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1851,6 +1854,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1947,6 +1951,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2121,6 +2126,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2328,6 +2334,7 @@ self: super: {
   "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";
@@ -2355,6 +2362,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2377,6 +2385,7 @@ self: super: {
   "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";
@@ -2472,6 +2481,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2644,6 +2654,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2744,6 +2755,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2861,6 +2873,7 @@ self: super: {
   "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";
@@ -3027,6 +3040,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3107,6 +3121,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3275,16 +3290,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3479,6 +3497,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3798,6 +3817,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -4084,6 +4104,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4453,6 +4474,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4597,6 +4619,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4771,6 +4794,7 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "json-ast-quickcheck" = dontDistribute super."json-ast-quickcheck";
   "json-autotype" = doDistribute super."json-autotype_1_0_7";
   "json-b" = dontDistribute super."json-b";
   "json-encoder" = dontDistribute super."json-encoder";
@@ -4778,6 +4802,7 @@ self: super: {
   "json-extra" = dontDistribute super."json-extra";
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4815,6 +4840,7 @@ self: super: {
   "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";
@@ -4910,6 +4936,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5407,6 +5434,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5465,6 +5493,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5508,6 +5537,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5757,6 +5787,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6126,6 +6157,7 @@ self: super: {
   "polimorf" = dontDistribute super."polimorf";
   "poll" = dontDistribute super."poll";
   "poly-arity" = doDistribute super."poly-arity_0_0_6";
+  "poly-control" = dontDistribute super."poly-control";
   "polyToMonoid" = dontDistribute super."polyToMonoid";
   "polymap" = dontDistribute super."polymap";
   "polynom" = dontDistribute super."polynom";
@@ -6222,6 +6254,7 @@ self: super: {
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
   "primitive" = doDistribute super."primitive_0_6";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6347,6 +6380,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6447,6 +6481,7 @@ self: super: {
   "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";
@@ -6546,6 +6581,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6742,6 +6778,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6766,6 +6803,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7541,6 +7579,7 @@ self: super: {
   "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";
@@ -7767,6 +7806,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -8001,6 +8041,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 128ce65ac51f..497d6a82c12c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -1140,6 +1140,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1152,6 +1153,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1259,6 +1261,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1848,6 +1851,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1944,6 +1948,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2118,6 +2123,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2324,6 +2330,7 @@ self: super: {
   "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";
@@ -2351,6 +2358,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2373,6 +2381,7 @@ self: super: {
   "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";
@@ -2468,6 +2477,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2556,6 +2566,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2639,6 +2650,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2739,6 +2751,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2856,6 +2869,7 @@ self: super: {
   "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";
@@ -3022,6 +3036,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3102,6 +3117,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3270,16 +3286,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3474,6 +3493,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3793,6 +3813,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -4078,6 +4099,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4447,6 +4469,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4591,6 +4614,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4765,12 +4789,14 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4808,6 +4834,7 @@ self: super: {
   "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";
@@ -4903,6 +4930,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5400,6 +5428,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5458,6 +5487,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5501,6 +5531,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5750,6 +5781,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6118,6 +6150,7 @@ self: super: {
   "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";
@@ -6213,6 +6246,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6337,6 +6371,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6436,6 +6471,7 @@ self: super: {
   "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";
@@ -6535,6 +6571,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6731,6 +6768,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6755,6 +6793,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7528,6 +7567,7 @@ self: super: {
   "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";
@@ -7753,6 +7793,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -7987,6 +8028,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 40455e3d2f8d..0141eb95d7ac 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -1140,6 +1140,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1152,6 +1153,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1259,6 +1261,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1846,6 +1849,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1941,6 +1945,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2115,6 +2120,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2321,6 +2327,7 @@ self: super: {
   "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";
@@ -2348,6 +2355,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2370,6 +2378,7 @@ self: super: {
   "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";
@@ -2465,6 +2474,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2548,6 +2558,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2631,6 +2642,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2731,6 +2743,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2848,6 +2861,7 @@ self: super: {
   "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";
@@ -3014,6 +3028,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3094,6 +3109,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3262,16 +3278,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3466,6 +3485,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3785,6 +3805,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -4070,6 +4091,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4439,6 +4461,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4583,6 +4606,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4757,12 +4781,14 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4800,6 +4826,7 @@ self: super: {
   "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";
@@ -4895,6 +4922,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5390,6 +5418,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5448,6 +5477,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5491,6 +5521,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5740,6 +5771,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6108,6 +6140,7 @@ self: super: {
   "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";
@@ -6202,6 +6235,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6325,6 +6359,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6423,6 +6458,7 @@ self: super: {
   "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";
@@ -6522,6 +6558,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6718,6 +6755,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6742,6 +6780,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7514,6 +7553,7 @@ self: super: {
   "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";
@@ -7739,6 +7779,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -7973,6 +8014,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 142bdfbec043..8dd1186fcc5f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -1138,6 +1138,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1150,6 +1151,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = dontDistribute super."airship";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1257,6 +1259,7 @@ self: super: {
   "amazonka-waf" = dontDistribute super."amazonka-waf";
   "amazonka-workspaces" = doDistribute super."amazonka-workspaces_0_3_6";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1843,6 +1846,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = dontDistribute super."carray";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1938,6 +1942,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -2112,6 +2117,7 @@ self: super: {
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
+  "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
   "conf" = dontDistribute super."conf";
   "config-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2318,6 +2324,7 @@ self: super: {
   "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";
@@ -2345,6 +2352,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2367,6 +2375,7 @@ self: super: {
   "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";
@@ -2462,6 +2471,7 @@ self: super: {
   "demarcate" = dontDistribute super."demarcate";
   "denominate" = dontDistribute super."denominate";
   "dependent-map" = doDistribute super."dependent-map_0_1_1_3";
+  "dependent-state" = dontDistribute super."dependent-state";
   "dependent-sum" = doDistribute super."dependent-sum_0_2_1_0";
   "depends" = dontDistribute super."depends";
   "dephd" = dontDistribute super."dephd";
@@ -2545,6 +2555,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2628,6 +2639,7 @@ self: super: {
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
   "drawille" = dontDistribute super."drawille";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2727,6 +2739,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = dontDistribute super."elm-bridge";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2844,6 +2857,7 @@ self: super: {
   "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";
@@ -3009,6 +3023,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -3089,6 +3104,7 @@ self: super: {
   "friday-scale-dct" = dontDistribute super."friday-scale-dct";
   "friendly-time" = dontDistribute super."friendly-time";
   "frontmatter" = dontDistribute super."frontmatter";
+  "frown" = dontDistribute super."frown";
   "frp-arduino" = dontDistribute super."frp-arduino";
   "frpnow" = dontDistribute super."frpnow";
   "frpnow-gloss" = dontDistribute super."frpnow-gloss";
@@ -3257,16 +3273,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3461,6 +3480,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3780,6 +3800,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "haskell-modbus" = dontDistribute super."haskell-modbus";
+  "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
@@ -4065,6 +4086,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger" = doDistribute super."hledger_0_26";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
@@ -4434,6 +4456,7 @@ self: super: {
   "http-kit" = dontDistribute super."http-kit";
   "http-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4578,6 +4601,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4752,12 +4776,14 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4795,6 +4821,7 @@ self: super: {
   "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";
@@ -4890,6 +4917,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5385,6 +5413,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5443,6 +5472,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5486,6 +5516,7 @@ self: super: {
   "mucipher" = dontDistribute super."mucipher";
   "mudbath" = dontDistribute super."mudbath";
   "muesli" = dontDistribute super."muesli";
+  "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
   "multifocal" = dontDistribute super."multifocal";
@@ -5735,6 +5766,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -6102,6 +6134,7 @@ self: super: {
   "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";
@@ -6196,6 +6229,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -6319,6 +6353,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6417,6 +6452,7 @@ self: super: {
   "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";
@@ -6516,6 +6552,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6712,6 +6749,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6736,6 +6774,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -7508,6 +7547,7 @@ self: super: {
   "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";
@@ -7733,6 +7773,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -7967,6 +8008,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index 6076099d2699..f13fd1766e98 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -1101,6 +1101,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1113,6 +1114,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = doDistribute super."airship_0_4_1_0";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1157,6 +1159,7 @@ self: super: {
   "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap";
   "amazon-products" = dontDistribute super."amazon-products";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1418,6 +1421,7 @@ self: super: {
   "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
   "binary-literal-qq" = dontDistribute super."binary-literal-qq";
   "binary-orphans" = doDistribute super."binary-orphans_0_1_3_0";
+  "binary-parser" = doDistribute super."binary-parser_0_5_0_1";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
   "binary-search" = doDistribute super."binary-search_0_1";
@@ -1636,6 +1640,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = doDistribute super."cabal-helper_0_6_2_0";
+  "cabal-install" = doDistribute super."cabal-install_1_22_7_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";
@@ -1705,6 +1710,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = doDistribute super."carray_0_1_6_2";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1795,6 +1801,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -1950,6 +1957,7 @@ self: super: {
   "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-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2147,6 +2155,7 @@ self: super: {
   "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";
@@ -2174,6 +2183,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2196,6 +2206,7 @@ self: super: {
   "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";
@@ -2287,6 +2298,7 @@ self: super: {
   "delta-h" = dontDistribute super."delta-h";
   "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";
@@ -2361,6 +2373,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2439,6 +2452,7 @@ self: super: {
   "dpkg" = dontDistribute super."dpkg";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2532,6 +2546,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = doDistribute super."elm-bridge_0_1_0_0";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2613,6 +2628,7 @@ self: super: {
   "estimators" = dontDistribute super."estimators";
   "estreps" = dontDistribute super."estreps";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2643,6 +2659,7 @@ self: super: {
   "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";
@@ -2689,6 +2706,7 @@ self: super: {
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
   "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only";
+  "fasta" = doDistribute super."fasta_0_10_1_0";
   "fastbayes" = dontDistribute super."fastbayes";
   "fastcgi" = dontDistribute super."fastcgi";
   "fastedit" = dontDistribute super."fastedit";
@@ -2800,6 +2818,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -2877,6 +2896,7 @@ self: super: {
   "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";
@@ -2958,6 +2978,7 @@ self: super: {
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
+  "generic-deriving" = doDistribute super."generic-deriving_1_9_0";
   "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
   "generic-maybe" = dontDistribute super."generic-maybe";
   "generic-pretty" = dontDistribute super."generic-pretty";
@@ -3037,16 +3058,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3232,6 +3256,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3470,6 +3495,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
   "happstack-static-routing" = dontDistribute super."happstack-static-routing";
@@ -3534,6 +3560,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "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";
@@ -3809,6 +3836,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
   "hledger-irr" = dontDistribute super."hledger-irr";
@@ -3817,6 +3845,7 @@ self: super: {
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_26";
   "hlogger" = dontDistribute super."hlogger";
   "hlongurl" = dontDistribute super."hlongurl";
   "hls" = dontDistribute super."hls";
@@ -4142,6 +4171,7 @@ self: super: {
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kit" = dontDistribute super."http-kit";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4223,6 +4253,7 @@ self: super: {
   "hypher" = dontDistribute super."hypher";
   "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
+  "hzulip" = doDistribute super."hzulip_1_1_1_2";
   "i18n" = dontDistribute super."i18n";
   "iCalendar" = dontDistribute super."iCalendar";
   "iException" = dontDistribute super."iException";
@@ -4273,6 +4304,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4433,12 +4465,14 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4475,6 +4509,7 @@ self: super: {
   "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";
@@ -4578,6 +4613,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5047,6 +5083,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5097,6 +5134,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5140,6 +5178,7 @@ self: super: {
   "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";
   "multifocal" = dontDistribute super."multifocal";
@@ -5372,6 +5411,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -5702,6 +5742,7 @@ self: super: {
   "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";
@@ -5791,6 +5832,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -5848,6 +5890,7 @@ self: super: {
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
+  "psc-ide" = doDistribute super."psc-ide_0_5_0";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
@@ -5872,6 +5915,7 @@ self: super: {
   "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_7_6_1";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
@@ -5906,6 +5950,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -6001,6 +6046,7 @@ self: super: {
   "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";
@@ -6088,6 +6134,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6136,6 +6183,7 @@ self: super: {
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_7_0_1";
   "retryer" = dontDistribute super."retryer";
+  "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
@@ -6267,6 +6315,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6290,6 +6339,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -6336,6 +6386,7 @@ self: super: {
   "semi-iso" = dontDistribute super."semi-iso";
   "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
+  "semigroups" = doDistribute super."semigroups_0_18_0_1";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
   "semiring" = dontDistribute super."semiring";
   "semiring-simple" = dontDistribute super."semiring-simple";
@@ -6756,6 +6807,7 @@ self: super: {
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
+  "strict-base-types" = doDistribute super."strict-base-types_0_4_0";
   "strict-concurrency" = dontDistribute super."strict-concurrency";
   "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin";
   "strict-identity" = dontDistribute super."strict-identity";
@@ -6786,6 +6838,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_4";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -6793,6 +6846,7 @@ self: super: {
   "subnet" = dontDistribute super."subnet";
   "subtitleParser" = dontDistribute super."subtitleParser";
   "subtitles" = dontDistribute super."subtitles";
+  "success" = doDistribute super."success_0_2_4";
   "suffixarray" = dontDistribute super."suffixarray";
   "suffixtree" = dontDistribute super."suffixtree";
   "sugarhaskell" = dontDistribute super."sugarhaskell";
@@ -6876,6 +6930,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -6998,6 +7053,7 @@ self: super: {
   "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";
@@ -7165,6 +7221,7 @@ self: super: {
   "tsparse" = dontDistribute super."tsparse";
   "tst" = dontDistribute super."tst";
   "tsvsql" = dontDistribute super."tsvsql";
+  "tttool" = doDistribute super."tttool_1_5_1";
   "tubes" = dontDistribute super."tubes";
   "tuntap" = dontDistribute super."tuntap";
   "tup-functor" = dontDistribute super."tup-functor";
@@ -7211,6 +7268,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -7423,6 +7481,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -7646,6 +7705,7 @@ self: super: {
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-conduit" = doDistribute super."xml-conduit_1_3_3";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
@@ -7776,6 +7836,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-table" = doDistribute super."yesod-table_2_0_1";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test-json" = dontDistribute super."yesod-test-json";
   "yesod-tls" = dontDistribute super."yesod-tls";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index 516164aa9eee..4e06107d7a98 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -1100,6 +1100,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1112,6 +1113,7 @@ self: super: {
   "airbrake" = dontDistribute super."airbrake";
   "airship" = doDistribute super."airship_0_4_2_0";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1155,6 +1157,7 @@ self: super: {
   "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap";
   "amazon-products" = dontDistribute super."amazon-products";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1416,6 +1419,7 @@ self: super: {
   "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
   "binary-literal-qq" = dontDistribute super."binary-literal-qq";
   "binary-orphans" = doDistribute super."binary-orphans_0_1_3_0";
+  "binary-parser" = doDistribute super."binary-parser_0_5_0_1";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
   "binary-search" = doDistribute super."binary-search_0_1";
@@ -1634,6 +1638,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = doDistribute super."cabal-helper_0_6_2_0";
+  "cabal-install" = doDistribute super."cabal-install_1_22_7_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";
@@ -1703,6 +1708,7 @@ self: super: {
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
   "carray" = doDistribute super."carray_0_1_6_2";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1793,6 +1799,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -1948,6 +1955,7 @@ self: super: {
   "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-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2145,6 +2153,7 @@ self: super: {
   "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";
@@ -2172,6 +2181,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2194,6 +2204,7 @@ self: super: {
   "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";
@@ -2285,6 +2296,7 @@ self: super: {
   "delta-h" = dontDistribute super."delta-h";
   "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";
@@ -2359,6 +2371,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2437,6 +2450,7 @@ self: super: {
   "dpkg" = dontDistribute super."dpkg";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2529,6 +2543,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = doDistribute super."elm-bridge_0_1_0_0";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2609,6 +2624,7 @@ self: super: {
   "estimators" = dontDistribute super."estimators";
   "estreps" = dontDistribute super."estreps";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2639,6 +2655,7 @@ self: super: {
   "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";
@@ -2684,6 +2701,7 @@ self: super: {
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
   "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only";
+  "fasta" = doDistribute super."fasta_0_10_1_0";
   "fastbayes" = dontDistribute super."fastbayes";
   "fastcgi" = dontDistribute super."fastcgi";
   "fastedit" = dontDistribute super."fastedit";
@@ -2794,6 +2812,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -2871,6 +2890,7 @@ self: super: {
   "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";
@@ -2952,6 +2972,7 @@ self: super: {
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
+  "generic-deriving" = doDistribute super."generic-deriving_1_9_0";
   "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
   "generic-maybe" = dontDistribute super."generic-maybe";
   "generic-pretty" = dontDistribute super."generic-pretty";
@@ -3031,16 +3052,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3226,6 +3250,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3464,6 +3489,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
   "happstack-static-routing" = dontDistribute super."happstack-static-routing";
@@ -3528,6 +3554,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "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";
@@ -3802,6 +3829,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
   "hledger-irr" = dontDistribute super."hledger-irr";
@@ -3810,6 +3838,7 @@ self: super: {
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_26";
   "hlogger" = dontDistribute super."hlogger";
   "hlongurl" = dontDistribute super."hlongurl";
   "hls" = dontDistribute super."hls";
@@ -4135,6 +4164,7 @@ self: super: {
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kit" = dontDistribute super."http-kit";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4216,6 +4246,7 @@ self: super: {
   "hypher" = dontDistribute super."hypher";
   "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
+  "hzulip" = doDistribute super."hzulip_1_1_1_2";
   "i18n" = dontDistribute super."i18n";
   "iCalendar" = dontDistribute super."iCalendar";
   "iException" = dontDistribute super."iException";
@@ -4263,6 +4294,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4421,12 +4453,14 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4463,6 +4497,7 @@ self: super: {
   "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";
@@ -4566,6 +4601,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -5032,6 +5068,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5082,6 +5119,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5125,6 +5163,7 @@ self: super: {
   "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";
   "multifocal" = dontDistribute super."multifocal";
@@ -5357,6 +5396,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -5685,6 +5725,7 @@ self: super: {
   "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";
@@ -5774,6 +5815,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -5831,6 +5873,7 @@ self: super: {
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
+  "psc-ide" = doDistribute super."psc-ide_0_5_0";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
@@ -5855,6 +5898,7 @@ self: super: {
   "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_7_6_1";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
@@ -5889,6 +5933,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -5984,6 +6029,7 @@ self: super: {
   "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";
@@ -6070,6 +6116,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6118,6 +6165,7 @@ self: super: {
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retry" = doDistribute super."retry_0_7_0_1";
   "retryer" = dontDistribute super."retryer";
+  "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
@@ -6249,6 +6297,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6272,6 +6321,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -6318,6 +6368,7 @@ self: super: {
   "semi-iso" = dontDistribute super."semi-iso";
   "semigroupoids" = doDistribute super."semigroupoids_5_0_0_4";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
+  "semigroups" = doDistribute super."semigroups_0_18_0_1";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
   "semiring" = dontDistribute super."semiring";
   "semiring-simple" = dontDistribute super."semiring-simple";
@@ -6738,6 +6789,7 @@ self: super: {
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
+  "strict-base-types" = doDistribute super."strict-base-types_0_4_0";
   "strict-concurrency" = dontDistribute super."strict-concurrency";
   "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin";
   "strict-identity" = dontDistribute super."strict-identity";
@@ -6768,6 +6820,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_4";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -6775,6 +6828,7 @@ self: super: {
   "subnet" = dontDistribute super."subnet";
   "subtitleParser" = dontDistribute super."subtitleParser";
   "subtitles" = dontDistribute super."subtitles";
+  "success" = doDistribute super."success_0_2_4";
   "suffixarray" = dontDistribute super."suffixarray";
   "suffixtree" = dontDistribute super."suffixtree";
   "sugarhaskell" = dontDistribute super."sugarhaskell";
@@ -6858,6 +6912,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -6980,6 +7035,7 @@ self: super: {
   "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";
@@ -7147,6 +7203,7 @@ self: super: {
   "tsparse" = dontDistribute super."tsparse";
   "tst" = dontDistribute super."tst";
   "tsvsql" = dontDistribute super."tsvsql";
+  "tttool" = doDistribute super."tttool_1_5_1";
   "tubes" = dontDistribute super."tubes";
   "tuntap" = dontDistribute super."tuntap";
   "tup-functor" = dontDistribute super."tup-functor";
@@ -7192,6 +7249,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -7404,6 +7462,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -7626,6 +7685,7 @@ self: super: {
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-conduit" = doDistribute super."xml-conduit_1_3_3";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
@@ -7756,6 +7816,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-table" = doDistribute super."yesod-table_2_0_1";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test-json" = dontDistribute super."yesod-test-json";
   "yesod-tls" = dontDistribute super."yesod-tls";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
index fb60f2f5ac57..12a566d954c7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
@@ -1096,6 +1096,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1107,6 +1108,7 @@ self: super: {
   "air-th" = dontDistribute super."air-th";
   "airbrake" = dontDistribute super."airbrake";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1150,6 +1152,7 @@ self: super: {
   "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap";
   "amazon-products" = dontDistribute super."amazon-products";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1411,6 +1414,7 @@ self: super: {
   "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
   "binary-literal-qq" = dontDistribute super."binary-literal-qq";
   "binary-orphans" = doDistribute super."binary-orphans_0_1_3_0";
+  "binary-parser" = doDistribute super."binary-parser_0_5_0_1";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
   "binary-search" = doDistribute super."binary-search_0_1";
@@ -1587,6 +1591,7 @@ self: super: {
   "buster" = dontDistribute super."buster";
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
+  "bustle" = doDistribute super."bustle_0_5_3";
   "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
@@ -1627,6 +1632,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = doDistribute super."cabal-helper_0_6_3_0";
+  "cabal-install" = doDistribute super."cabal-install_1_22_7_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";
@@ -1694,6 +1700,7 @@ self: super: {
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1783,6 +1790,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -1797,7 +1805,12 @@ self: super: {
   "clanki" = dontDistribute super."clanki";
   "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
+  "clash-ghc" = doDistribute super."clash-ghc_0_6_8";
+  "clash-lib" = doDistribute super."clash-lib_0_6_8";
   "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_4";
+  "clash-verilog" = doDistribute super."clash-verilog_0_6_4";
+  "clash-vhdl" = doDistribute super."clash-vhdl_0_6_5";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
@@ -1930,6 +1943,7 @@ self: super: {
   "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-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2127,6 +2141,7 @@ self: super: {
   "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";
@@ -2154,6 +2169,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2176,6 +2192,7 @@ self: super: {
   "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";
@@ -2266,6 +2283,7 @@ self: super: {
   "delta-h" = dontDistribute super."delta-h";
   "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";
@@ -2337,6 +2355,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2415,6 +2434,7 @@ self: super: {
   "dpkg" = dontDistribute super."dpkg";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "drifter" = dontDistribute super."drifter";
   "drifter-postgresql" = dontDistribute super."drifter-postgresql";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
@@ -2506,6 +2526,7 @@ self: super: {
   "elerea-sdl" = dontDistribute super."elerea-sdl";
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
+  "elision" = dontDistribute super."elision";
   "elm-bridge" = doDistribute super."elm-bridge_0_1_0_0";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
@@ -2585,6 +2606,7 @@ self: super: {
   "estimators" = dontDistribute super."estimators";
   "estreps" = dontDistribute super."estreps";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2614,6 +2636,7 @@ self: super: {
   "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";
@@ -2658,6 +2681,7 @@ self: super: {
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
   "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only";
+  "fasta" = doDistribute super."fasta_0_10_1_0";
   "fastbayes" = dontDistribute super."fastbayes";
   "fastcgi" = dontDistribute super."fastcgi";
   "fastedit" = dontDistribute super."fastedit";
@@ -2767,6 +2791,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -2843,6 +2868,7 @@ self: super: {
   "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";
@@ -2924,6 +2950,7 @@ self: super: {
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
+  "generic-deriving" = doDistribute super."generic-deriving_1_9_0";
   "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
   "generic-maybe" = dontDistribute super."generic-maybe";
   "generic-pretty" = dontDistribute super."generic-pretty";
@@ -3002,16 +3029,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3196,6 +3226,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3431,6 +3462,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
   "happstack-static-routing" = dontDistribute super."happstack-static-routing";
@@ -3493,6 +3525,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "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";
@@ -3764,6 +3797,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
   "hledger-irr" = dontDistribute super."hledger-irr";
@@ -3771,6 +3805,7 @@ self: super: {
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_26";
   "hlogger" = dontDistribute super."hlogger";
   "hlongurl" = dontDistribute super."hlongurl";
   "hls" = dontDistribute super."hls";
@@ -4092,6 +4127,7 @@ self: super: {
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kit" = dontDistribute super."http-kit";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4173,6 +4209,7 @@ self: super: {
   "hypher" = dontDistribute super."hypher";
   "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
+  "hzulip" = doDistribute super."hzulip_1_1_1_2";
   "i18n" = dontDistribute super."i18n";
   "iCalendar" = dontDistribute super."iCalendar";
   "iException" = dontDistribute super."iException";
@@ -4219,6 +4256,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4374,12 +4412,14 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4416,6 +4456,7 @@ self: super: {
   "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";
@@ -4519,6 +4560,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -4981,6 +5023,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5028,6 +5071,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -5071,6 +5115,7 @@ self: super: {
   "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";
   "multifocal" = dontDistribute super."multifocal";
@@ -5302,6 +5347,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -5630,6 +5676,7 @@ self: super: {
   "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";
@@ -5716,6 +5763,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -5773,6 +5821,7 @@ self: super: {
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
+  "psc-ide" = doDistribute super."psc-ide_0_5_0";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
@@ -5797,6 +5846,7 @@ self: super: {
   "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_7_6_1";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
@@ -5831,6 +5881,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -5925,6 +5976,7 @@ self: super: {
   "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";
@@ -6011,6 +6063,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -6056,6 +6109,7 @@ self: super: {
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retryer" = dontDistribute super."retryer";
+  "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
@@ -6187,6 +6241,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6210,6 +6265,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -6255,6 +6311,7 @@ self: super: {
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
+  "semigroups" = doDistribute super."semigroups_0_18_0_1";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
   "semiring" = dontDistribute super."semiring";
   "semiring-simple" = dontDistribute super."semiring-simple";
@@ -6669,6 +6726,7 @@ self: super: {
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
+  "strict-base-types" = doDistribute super."strict-base-types_0_4_0";
   "strict-concurrency" = dontDistribute super."strict-concurrency";
   "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin";
   "strict-identity" = dontDistribute super."strict-identity";
@@ -6699,6 +6757,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_4";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -6706,6 +6765,7 @@ self: super: {
   "subnet" = dontDistribute super."subnet";
   "subtitleParser" = dontDistribute super."subtitleParser";
   "subtitles" = dontDistribute super."subtitles";
+  "success" = doDistribute super."success_0_2_4";
   "suffixarray" = dontDistribute super."suffixarray";
   "suffixtree" = dontDistribute super."suffixtree";
   "sugarhaskell" = dontDistribute super."sugarhaskell";
@@ -6789,6 +6849,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -6909,6 +6970,7 @@ self: super: {
   "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";
@@ -7076,6 +7138,7 @@ self: super: {
   "tsparse" = dontDistribute super."tsparse";
   "tst" = dontDistribute super."tst";
   "tsvsql" = dontDistribute super."tsvsql";
+  "tttool" = doDistribute super."tttool_1_5_1";
   "tubes" = dontDistribute super."tubes";
   "tuntap" = dontDistribute super."tuntap";
   "tup-functor" = dontDistribute super."tup-functor";
@@ -7121,6 +7184,7 @@ self: super: {
   "typalyze" = dontDistribute super."typalyze";
   "type-aligned" = dontDistribute super."type-aligned";
   "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";
@@ -7333,6 +7397,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
@@ -7551,6 +7616,7 @@ self: super: {
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-conduit" = doDistribute super."xml-conduit_1_3_3";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
@@ -7680,6 +7746,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-table" = doDistribute super."yesod-table_2_0_1";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test-json" = dontDistribute super."yesod-test-json";
   "yesod-tls" = dontDistribute super."yesod-tls";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
index 7941c97d177a..25e558c5e99a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
@@ -329,6 +329,7 @@ self: super: {
   "GLMatrix" = dontDistribute super."GLMatrix";
   "GLUtil" = dontDistribute super."GLUtil";
   "GPX" = dontDistribute super."GPX";
+  "GPipe" = doDistribute super."GPipe_2_1_6";
   "GPipe-Collada" = dontDistribute super."GPipe-Collada";
   "GPipe-Examples" = dontDistribute super."GPipe-Examples";
   "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
@@ -530,6 +531,7 @@ self: super: {
   "InfixApplicative" = dontDistribute super."InfixApplicative";
   "Interpolation" = dontDistribute super."Interpolation";
   "Interpolation-maxs" = dontDistribute super."Interpolation-maxs";
+  "IntervalMap" = doDistribute super."IntervalMap_0_5_0_0";
   "Irc" = dontDistribute super."Irc";
   "IrrHaskell" = dontDistribute super."IrrHaskell";
   "IsNull" = dontDistribute super."IsNull";
@@ -1079,6 +1081,7 @@ self: super: {
   "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";
   "agda-snippets" = dontDistribute super."agda-snippets";
   "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
@@ -1090,6 +1093,7 @@ self: super: {
   "air-th" = dontDistribute super."air-th";
   "airbrake" = dontDistribute super."airbrake";
   "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
   "aivika-experiment" = dontDistribute super."aivika-experiment";
   "aivika-experiment-cairo" = dontDistribute super."aivika-experiment-cairo";
   "aivika-experiment-chart" = dontDistribute super."aivika-experiment-chart";
@@ -1133,6 +1137,7 @@ self: super: {
   "amazon-emailer-client-snap" = dontDistribute super."amazon-emailer-client-snap";
   "amazon-products" = dontDistribute super."amazon-products";
   "ampersand" = dontDistribute super."ampersand";
+  "amqp" = doDistribute super."amqp_0_13_0";
   "amqp-conduit" = dontDistribute super."amqp-conduit";
   "amrun" = dontDistribute super."amrun";
   "analyze-client" = dontDistribute super."analyze-client";
@@ -1274,6 +1279,9 @@ self: super: {
   "avahi" = dontDistribute super."avahi";
   "avatar-generator" = dontDistribute super."avatar-generator";
   "average" = dontDistribute super."average";
+  "avers" = doDistribute super."avers_0_0_13";
+  "avers-api" = doDistribute super."avers-api_0_0_1";
+  "avers-server" = doDistribute super."avers-server_0_0_1";
   "avl-static" = dontDistribute super."avl-static";
   "avr-shake" = dontDistribute super."avr-shake";
   "awesomium" = dontDistribute super."awesomium";
@@ -1326,6 +1334,7 @@ self: super: {
   "barrier-monad" = dontDistribute super."barrier-monad";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
+  "base-orphans" = doDistribute super."base-orphans_0_5_0";
   "base32-bytestring" = dontDistribute super."base32-bytestring";
   "base58-bytestring" = dontDistribute super."base58-bytestring";
   "base58address" = dontDistribute super."base58address";
@@ -1384,6 +1393,7 @@ self: super: {
   "binary-generic" = dontDistribute super."binary-generic";
   "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
   "binary-literal-qq" = dontDistribute super."binary-literal-qq";
+  "binary-parser" = doDistribute super."binary-parser_0_5_0_1";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
   "binary-shared" = dontDistribute super."binary-shared";
@@ -1557,6 +1567,7 @@ self: super: {
   "buster" = dontDistribute super."buster";
   "buster-gtk" = dontDistribute super."buster-gtk";
   "buster-network" = dontDistribute super."buster-network";
+  "bustle" = doDistribute super."bustle_0_5_3";
   "butterflies" = dontDistribute super."butterflies";
   "bv" = dontDistribute super."bv";
   "byline" = dontDistribute super."byline";
@@ -1594,6 +1605,7 @@ self: super: {
   "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags";
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
+  "cabal-install" = doDistribute super."cabal-install_1_22_7_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";
@@ -1660,6 +1672,7 @@ self: super: {
   "caramia" = dontDistribute super."caramia";
   "carboncopy" = dontDistribute super."carboncopy";
   "carettah" = dontDistribute super."carettah";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
   "casadi-bindings" = dontDistribute super."casadi-bindings";
   "casadi-bindings-control" = dontDistribute super."casadi-bindings-control";
   "casadi-bindings-core" = dontDistribute super."casadi-bindings-core";
@@ -1746,6 +1759,7 @@ self: super: {
   "cipher-rc5" = dontDistribute super."cipher-rc5";
   "ciphersaber2" = dontDistribute super."ciphersaber2";
   "circ" = dontDistribute super."circ";
+  "circle-packing" = doDistribute super."circle-packing_0_1_0_4";
   "cirru-parser" = dontDistribute super."cirru-parser";
   "citation-resolve" = dontDistribute super."citation-resolve";
   "citeproc-hs" = dontDistribute super."citeproc-hs";
@@ -1760,7 +1774,12 @@ self: super: {
   "clanki" = dontDistribute super."clanki";
   "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
+  "clash-ghc" = doDistribute super."clash-ghc_0_6_8";
+  "clash-lib" = doDistribute super."clash-lib_0_6_8";
   "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_4";
+  "clash-verilog" = doDistribute super."clash-verilog_0_6_4";
+  "clash-vhdl" = doDistribute super."clash-vhdl_0_6_5";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
@@ -1892,6 +1911,7 @@ self: super: {
   "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-select" = dontDistribute super."config-select";
   "config-value" = dontDistribute super."config-value";
@@ -2060,6 +2080,7 @@ self: super: {
   "damnpacket" = dontDistribute super."damnpacket";
   "dao" = dontDistribute super."dao";
   "dapi" = dontDistribute super."dapi";
+  "darcs" = doDistribute super."darcs_2_10_2";
   "darcs-benchmark" = dontDistribute super."darcs-benchmark";
   "darcs-beta" = dontDistribute super."darcs-beta";
   "darcs-buildpackage" = dontDistribute super."darcs-buildpackage";
@@ -2082,6 +2103,7 @@ self: super: {
   "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";
@@ -2109,6 +2131,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "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";
@@ -2131,6 +2154,7 @@ self: super: {
   "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";
@@ -2219,6 +2243,7 @@ self: super: {
   "delta-h" = dontDistribute super."delta-h";
   "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";
@@ -2288,6 +2313,7 @@ self: super: {
   "direct-http" = dontDistribute super."direct-http";
   "direct-murmur-hash" = dontDistribute super."direct-murmur-hash";
   "direct-plugins" = dontDistribute super."direct-plugins";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "directed-cubical" = dontDistribute super."directed-cubical";
   "directory-layout" = dontDistribute super."directory-layout";
   "dirfiles" = dontDistribute super."dirfiles";
@@ -2362,6 +2388,7 @@ self: super: {
   "dpkg" = dontDistribute super."dpkg";
   "drClickOn" = dontDistribute super."drClickOn";
   "draw-poker" = dontDistribute super."draw-poker";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
   "dropbox-sdk" = dontDistribute super."dropbox-sdk";
   "dropsolve" = dontDistribute super."dropsolve";
   "ds-kanren" = dontDistribute super."ds-kanren";
@@ -2451,6 +2478,7 @@ self: super: {
   "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-get" = dontDistribute super."elm-get";
@@ -2525,6 +2553,7 @@ self: super: {
   "estimators" = dontDistribute super."estimators";
   "estreps" = dontDistribute super."estreps";
   "eternal" = dontDistribute super."eternal";
+  "ether" = doDistribute super."ether_0_3_1_1";
   "ethereum-client-haskell" = dontDistribute super."ethereum-client-haskell";
   "ethereum-merkle-patricia-db" = dontDistribute super."ethereum-merkle-patricia-db";
   "ethereum-rlp" = dontDistribute super."ethereum-rlp";
@@ -2553,6 +2582,7 @@ self: super: {
   "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";
@@ -2596,6 +2626,7 @@ self: super: {
   "fast-tags" = dontDistribute super."fast-tags";
   "fast-tagsoup" = dontDistribute super."fast-tagsoup";
   "fast-tagsoup-utf8-only" = dontDistribute super."fast-tagsoup-utf8-only";
+  "fasta" = doDistribute super."fasta_0_10_1_0";
   "fastbayes" = dontDistribute super."fastbayes";
   "fastcgi" = dontDistribute super."fastcgi";
   "fastedit" = dontDistribute super."fastedit";
@@ -2702,6 +2733,7 @@ self: super: {
   "flowlocks-framework" = dontDistribute super."flowlocks-framework";
   "flowsim" = dontDistribute super."flowsim";
   "fltkhs" = dontDistribute super."fltkhs";
+  "fltkhs-demos" = dontDistribute super."fltkhs-demos";
   "fltkhs-fluid-examples" = dontDistribute super."fltkhs-fluid-examples";
   "fltkhs-hello-world" = dontDistribute super."fltkhs-hello-world";
   "fluent-logger" = dontDistribute super."fluent-logger";
@@ -2775,6 +2807,7 @@ self: super: {
   "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";
@@ -2856,6 +2889,7 @@ self: super: {
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
+  "generic-deriving" = doDistribute super."generic-deriving_1_9_0";
   "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
   "generic-maybe" = dontDistribute super."generic-maybe";
   "generic-pretty" = dontDistribute super."generic-pretty";
@@ -2928,16 +2962,19 @@ self: super: {
   "gi-gdk" = dontDistribute super."gi-gdk";
   "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
   "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
   "gi-glib" = dontDistribute super."gi-glib";
   "gi-gobject" = dontDistribute super."gi-gobject";
   "gi-gtk" = dontDistribute super."gi-gtk";
   "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
   "gi-notify" = dontDistribute super."gi-notify";
   "gi-pango" = dontDistribute super."gi-pango";
+  "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";
@@ -3119,6 +3156,7 @@ self: super: {
   "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-logging" = dontDistribute super."gore-and-ash-logging";
   "gore-and-ash-network" = dontDistribute super."gore-and-ash-network";
@@ -3224,6 +3262,7 @@ self: super: {
   "hGelf" = dontDistribute super."hGelf";
   "hLLVM" = dontDistribute super."hLLVM";
   "hMollom" = dontDistribute super."hMollom";
+  "hOpenPGP" = doDistribute super."hOpenPGP_2_4_1";
   "hPDB-examples" = dontDistribute super."hPDB-examples";
   "hPushover" = dontDistribute super."hPushover";
   "hR" = dontDistribute super."hR";
@@ -3350,6 +3389,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_5";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
   "happstack-static-routing" = dontDistribute super."happstack-static-routing";
@@ -3412,6 +3452,7 @@ self: super: {
   "haskell-import-graph" = dontDistribute super."haskell-import-graph";
   "haskell-in-space" = dontDistribute super."haskell-in-space";
   "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";
@@ -3484,6 +3525,7 @@ self: super: {
   "hasloGUI" = dontDistribute super."hasloGUI";
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
+  "hasql" = doDistribute super."hasql_0_19_3_3";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = dontDistribute super."hasql-postgres";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -3682,6 +3724,7 @@ self: super: {
   "hlatex" = dontDistribute super."hlatex";
   "hlbfgsb" = dontDistribute super."hlbfgsb";
   "hlcm" = dontDistribute super."hlcm";
+  "hleap" = dontDistribute super."hleap";
   "hledger-chart" = dontDistribute super."hledger-chart";
   "hledger-diff" = dontDistribute super."hledger-diff";
   "hledger-irr" = dontDistribute super."hledger-irr";
@@ -3689,6 +3732,7 @@ self: super: {
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_26";
   "hlogger" = dontDistribute super."hlogger";
   "hlongurl" = dontDistribute super."hlongurl";
   "hls" = dontDistribute super."hls";
@@ -4006,6 +4050,7 @@ self: super: {
   "http-enumerator" = dontDistribute super."http-enumerator";
   "http-kit" = dontDistribute super."http-kit";
   "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
   "http-monad" = dontDistribute super."http-monad";
   "http-proxy" = dontDistribute super."http-proxy";
   "http-querystring" = dontDistribute super."http-querystring";
@@ -4084,6 +4129,7 @@ self: super: {
   "hypher" = dontDistribute super."hypher";
   "hzaif" = dontDistribute super."hzaif";
   "hzk" = dontDistribute super."hzk";
+  "hzulip" = doDistribute super."hzulip_1_1_1_2";
   "i18n" = dontDistribute super."i18n";
   "iCalendar" = dontDistribute super."iCalendar";
   "iException" = dontDistribute super."iException";
@@ -4130,6 +4176,7 @@ self: super: {
   "implicit" = dontDistribute super."implicit";
   "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";
@@ -4282,12 +4329,14 @@ self: super: {
   "jsmw" = dontDistribute super."jsmw";
   "json-assertions" = dontDistribute super."json-assertions";
   "json-ast" = dontDistribute super."json-ast";
+  "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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
   "json-python" = dontDistribute super."json-python";
   "json-qq" = dontDistribute super."json-qq";
   "json-rpc" = dontDistribute super."json-rpc";
@@ -4323,6 +4372,7 @@ self: super: {
   "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";
@@ -4425,6 +4475,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_1";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -4873,6 +4924,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-control" = doDistribute super."monad-control_1_0_0_4";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -4919,6 +4971,7 @@ self: super: {
   "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_1_2";
   "monoid-transformer" = dontDistribute super."monoid-transformer";
   "monoidplus" = dontDistribute super."monoidplus";
   "monoids" = dontDistribute super."monoids";
@@ -4962,6 +5015,7 @@ self: super: {
   "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";
   "multifocal" = dontDistribute super."multifocal";
@@ -5190,6 +5244,7 @@ self: super: {
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
   "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
@@ -5349,6 +5404,7 @@ self: super: {
   "pasty" = dontDistribute super."pasty";
   "patch-combinators" = dontDistribute super."patch-combinators";
   "patch-image" = dontDistribute super."patch-image";
+  "path-io" = doDistribute super."path-io_0_2_0";
   "pathfinding" = dontDistribute super."pathfinding";
   "pathfindingcore" = dontDistribute super."pathfindingcore";
   "pathtype" = dontDistribute super."pathtype";
@@ -5507,6 +5563,7 @@ self: super: {
   "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";
@@ -5544,6 +5601,7 @@ self: super: {
   "posix-waitpid" = dontDistribute super."posix-waitpid";
   "possible" = dontDistribute super."possible";
   "postcodes" = dontDistribute super."postcodes";
+  "postgresql-binary" = doDistribute super."postgresql-binary_0_7_5_1";
   "postgresql-config" = dontDistribute super."postgresql-config";
   "postgresql-connector" = dontDistribute super."postgresql-connector";
   "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape";
@@ -5591,6 +5649,7 @@ self: super: {
   "pretty-tree" = dontDistribute super."pretty-tree";
   "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
   "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
   "printf-mauke" = dontDistribute super."printf-mauke";
@@ -5603,6 +5662,7 @@ self: super: {
   "probable" = dontDistribute super."probable";
   "proc" = dontDistribute super."proc";
   "process-conduit" = dontDistribute super."process-conduit";
+  "process-extras" = doDistribute super."process-extras_0_3_3_7";
   "process-iterio" = dontDistribute super."process-iterio";
   "process-leksah" = dontDistribute super."process-leksah";
   "process-listlike" = dontDistribute super."process-listlike";
@@ -5645,6 +5705,7 @@ self: super: {
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
+  "psc-ide" = doDistribute super."psc-ide_0_5_0";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
@@ -5668,6 +5729,7 @@ self: super: {
   "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_7_6_1";
   "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
   "push-notify" = dontDistribute super."push-notify";
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
@@ -5701,6 +5763,7 @@ self: super: {
   "queuelike" = dontDistribute super."queuelike";
   "quick-generator" = dontDistribute super."quick-generator";
   "quick-schema" = dontDistribute super."quick-schema";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
   "quickcheck-poly" = dontDistribute super."quickcheck-poly";
   "quickcheck-properties" = dontDistribute super."quickcheck-properties";
   "quickcheck-property-comb" = dontDistribute super."quickcheck-property-comb";
@@ -5792,6 +5855,7 @@ self: super: {
   "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";
@@ -5877,6 +5941,7 @@ self: super: {
   "rematch-text" = dontDistribute super."rematch-text";
   "remote" = dontDistribute super."remote";
   "remote-debugger" = dontDistribute super."remote-debugger";
+  "remote-monad" = dontDistribute super."remote-monad";
   "remotion" = dontDistribute super."remotion";
   "renderable" = dontDistribute super."renderable";
   "reord" = dontDistribute super."reord";
@@ -5922,6 +5987,7 @@ self: super: {
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retryer" = dontDistribute super."retryer";
+  "rev-state" = doDistribute super."rev-state_0_1_1";
   "revdectime" = dontDistribute super."revdectime";
   "reverse-apply" = dontDistribute super."reverse-apply";
   "reverse-geocoding" = dontDistribute super."reverse-geocoding";
@@ -6050,6 +6116,7 @@ self: super: {
   "scalable-server" = dontDistribute super."scalable-server";
   "scaleimage" = dontDistribute super."scaleimage";
   "scalp-webhooks" = dontDistribute super."scalp-webhooks";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
   "scan" = dontDistribute super."scan";
   "scan-vector-machine" = dontDistribute super."scan-vector-machine";
   "scat" = dontDistribute super."scat";
@@ -6073,6 +6140,7 @@ self: super: {
   "scope" = dontDistribute super."scope";
   "scope-cairo" = dontDistribute super."scope-cairo";
   "scottish" = dontDistribute super."scottish";
+  "scotty" = doDistribute super."scotty_0_10_2";
   "scotty-binding-play" = dontDistribute super."scotty-binding-play";
   "scotty-blaze" = dontDistribute super."scotty-blaze";
   "scotty-cookie" = dontDistribute super."scotty-cookie";
@@ -6117,6 +6185,7 @@ self: super: {
   "semaphore-plus" = dontDistribute super."semaphore-plus";
   "semi-iso" = dontDistribute super."semi-iso";
   "semigroupoids-syntax" = dontDistribute super."semigroupoids-syntax";
+  "semigroups" = doDistribute super."semigroups_0_18_0_1";
   "semigroups-actions" = dontDistribute super."semigroups-actions";
   "semiring" = dontDistribute super."semiring";
   "semiring-simple" = dontDistribute super."semiring-simple";
@@ -6149,6 +6218,7 @@ self: super: {
   "servant-postgresql" = dontDistribute super."servant-postgresql";
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-swagger" = doDistribute super."servant-swagger_0_1_1";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
@@ -6522,6 +6592,7 @@ self: super: {
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
+  "strict-base-types" = doDistribute super."strict-base-types_0_4_0";
   "strict-concurrency" = dontDistribute super."strict-concurrency";
   "strict-ghc-plugin" = dontDistribute super."strict-ghc-plugin";
   "strict-identity" = dontDistribute super."strict-identity";
@@ -6549,6 +6620,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_4";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -6556,6 +6628,7 @@ self: super: {
   "subnet" = dontDistribute super."subnet";
   "subtitleParser" = dontDistribute super."subtitleParser";
   "subtitles" = dontDistribute super."subtitles";
+  "success" = doDistribute super."success_0_2_4";
   "suffixarray" = dontDistribute super."suffixarray";
   "suffixtree" = dontDistribute super."suffixtree";
   "sugarhaskell" = dontDistribute super."sugarhaskell";
@@ -6638,6 +6711,7 @@ self: super: {
   "tag-bits" = dontDistribute super."tag-bits";
   "tag-stream" = dontDistribute super."tag-stream";
   "tagchup" = dontDistribute super."tagchup";
+  "tagged" = doDistribute super."tagged_0_8_2";
   "tagged-exception-core" = dontDistribute super."tagged-exception-core";
   "tagged-list" = dontDistribute super."tagged-list";
   "tagged-th" = dontDistribute super."tagged-th";
@@ -6753,6 +6827,7 @@ self: super: {
   "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";
@@ -6916,6 +6991,7 @@ self: super: {
   "tsparse" = dontDistribute super."tsparse";
   "tst" = dontDistribute super."tst";
   "tsvsql" = dontDistribute super."tsvsql";
+  "tttool" = doDistribute super."tttool_1_5_1";
   "tubes" = dontDistribute super."tubes";
   "tuntap" = dontDistribute super."tuntap";
   "tup-functor" = dontDistribute super."tup-functor";
@@ -6957,6 +7033,7 @@ self: super: {
   "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";
@@ -7162,6 +7239,7 @@ self: super: {
   "vector-mmap" = dontDistribute super."vector-mmap";
   "vector-random" = dontDistribute super."vector-random";
   "vector-read-instances" = dontDistribute super."vector-read-instances";
+  "vector-space" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-space-points" = dontDistribute super."vector-space-points";
@@ -7376,6 +7454,7 @@ self: super: {
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
+  "xml-conduit" = doDistribute super."xml-conduit_1_3_3";
   "xml-enumerator" = dontDistribute super."xml-enumerator";
   "xml-enumerator-combinators" = dontDistribute super."xml-enumerator-combinators";
   "xml-extractors" = dontDistribute super."xml-extractors";
@@ -7501,6 +7580,7 @@ self: super: {
   "yesod-s3" = dontDistribute super."yesod-s3";
   "yesod-sass" = dontDistribute super."yesod-sass";
   "yesod-session-redis" = dontDistribute super."yesod-session-redis";
+  "yesod-table" = doDistribute super."yesod-table_2_0_1";
   "yesod-tableview" = dontDistribute super."yesod-tableview";
   "yesod-test-json" = dontDistribute super."yesod-test-json";
   "yesod-tls" = dontDistribute super."yesod-tls";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
new file mode 100644
index 000000000000..9bd1579f1020
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
@@ -0,0 +1,7619 @@
+{ 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-5.1 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";
+  "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";
+  "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";
+  "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";
+  "ChannelT" = dontDistribute super."ChannelT";
+  "Chart-diagrams" = dontDistribute super."Chart-diagrams";
+  "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";
+  "DescriptiveKeys" = dontDistribute super."DescriptiveKeys";
+  "Dflow" = dontDistribute super."Dflow";
+  "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" = dontDistribute super."EdisonAPI";
+  "EdisonCore" = dontDistribute super."EdisonCore";
+  "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";
+  "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";
+  "HDBC-session" = dontDistribute super."HDBC-session";
+  "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";
+  "Hclip" = dontDistribute super."Hclip";
+  "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";
+  "IntervalMap" = doDistribute super."IntervalMap_0_5_0_0";
+  "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";
+  "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";
+  "LDAP" = dontDistribute super."LDAP";
+  "LRU" = dontDistribute super."LRU";
+  "LTree" = dontDistribute super."LTree";
+  "LambdaCalculator" = dontDistribute super."LambdaCalculator";
+  "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";
+  "LazyVault" = dontDistribute super."LazyVault";
+  "Level0" = dontDistribute super."Level0";
+  "LibClang" = dontDistribute super."LibClang";
+  "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";
+  "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";
+  "NoTrace" = dontDistribute super."NoTrace";
+  "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";
+  "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";
+  "OneTuple" = dontDistribute super."OneTuple";
+  "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";
+  "PortMidi" = dontDistribute super."PortMidi";
+  "PostgreSQL" = dontDistribute super."PostgreSQL";
+  "PrimitiveArray" = dontDistribute super."PrimitiveArray";
+  "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";
+  "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";
+  "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";
+  "SVGFonts" = dontDistribute super."SVGFonts";
+  "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";
+  "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";
+  "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-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";
+  "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-utility" = dontDistribute super."accelerate-utility";
+  "accentuateus" = dontDistribute super."accentuateus";
+  "access-time" = dontDistribute super."access-time";
+  "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-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-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-lens" = dontDistribute super."aeson-lens";
+  "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
+  "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";
+  "agda-snippets" = dontDistribute super."agda-snippets";
+  "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
+  "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";
+  "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
+  "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-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";
+  "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";
+  "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-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";
+  "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";
+  "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "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";
+  "arithmoi" = dontDistribute super."arithmoi";
+  "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-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-conduit" = dontDistribute super."atom-conduit";
+  "atom-msp430" = dontDistribute super."atom-msp430";
+  "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign";
+  "atomic-primops-vector" = dontDistribute super."atomic-primops-vector";
+  "atomic-write" = dontDistribute super."atomic-write";
+  "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";
+  "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";
+  "awesomium" = dontDistribute super."awesomium";
+  "awesomium-glut" = dontDistribute super."awesomium-glut";
+  "awesomium-raw" = dontDistribute super."awesomium-raw";
+  "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-orphans" = doDistribute super."base-orphans_0_5_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";
+  "bdd" = dontDistribute super."bdd";
+  "bdelta" = dontDistribute super."bdelta";
+  "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
+  "beamable" = dontDistribute super."beamable";
+  "beautifHOL" = dontDistribute super."beautifHOL";
+  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
+  "bein" = dontDistribute super."bein";
+  "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";
+  "bibtex" = dontDistribute super."bibtex";
+  "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
+  "bidispec" = dontDistribute super."bidispec";
+  "bidispec-extras" = dontDistribute super."bidispec-extras";
+  "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-bits" = dontDistribute super."binary-bits";
+  "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-shared" = dontDistribute super."binary-shared";
+  "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-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-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";
+  "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-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-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" = dontDistribute super."bloodhound";
+  "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";
+  "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";
+  "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";
+  "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-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";
+  "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder";
+  "bytestringparser" = dontDistribute super."bytestringparser";
+  "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
+  "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "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-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
+  "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-install" = doDistribute super."cabal-install_1_22_7_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";
+  "cached-io" = dontDistribute super."cached-io";
+  "cached-traversable" = dontDistribute super."cached-traversable";
+  "caf" = dontDistribute super."caf";
+  "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
+  "caffegraph" = dontDistribute super."caffegraph";
+  "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";
+  "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";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "codo-notation" = dontDistribute super."codo-notation";
+  "cofunctor" = dontDistribute super."cofunctor";
+  "cognimeta-utils" = dontDistribute super."cognimeta-utils";
+  "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";
+  "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";
+  "commodities" = dontDistribute super."commodities";
+  "commsec" = dontDistribute super."commsec";
+  "commsec-keyexchange" = dontDistribute super."commsec-keyexchange";
+  "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";
+  "conceit" = dontDistribute super."conceit";
+  "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-extra" = dontDistribute super."concurrent-extra";
+  "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "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-select" = dontDistribute super."config-select";
+  "config-value" = dontDistribute super."config-value";
+  "configifier" = dontDistribute super."configifier";
+  "configuration" = dontDistribute super."configuration";
+  "configuration-tools" = dontDistribute super."configuration-tools";
+  "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";
+  "constructible" = dontDistribute super."constructible";
+  "constructive-algebra" = dontDistribute super."constructive-algebra";
+  "consumers" = dontDistribute super."consumers";
+  "container" = dontDistribute super."container";
+  "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";
+  "continued-fractions" = dontDistribute super."continued-fractions";
+  "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-omega" = dontDistribute super."control-monad-omega";
+  "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";
+  "converge" = dontDistribute super."converge";
+  "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";
+  "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";
+  "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";
+  "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-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";
+  "d3js" = dontDistribute super."d3js";
+  "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
+  "daemons" = dontDistribute super."daemons";
+  "dag" = dontDistribute super."dag";
+  "damnpacket" = dontDistribute super."damnpacket";
+  "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-generics" = dontDistribute super."data-default-generics";
+  "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-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-or" = dontDistribute super."data-or";
+  "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";
+  "dataenc" = dontDistribute super."dataenc";
+  "dataflow" = dontDistribute super."dataflow";
+  "datalog" = dontDistribute super."datalog";
+  "datapacker" = dontDistribute super."datapacker";
+  "dataurl" = dontDistribute super."dataurl";
+  "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";
+  "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-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";
+  "debian-build" = dontDistribute super."debian-build";
+  "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
+  "decepticons" = dontDistribute super."decepticons";
+  "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-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";
+  "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";
+  "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";
+  "deriving-compat" = dontDistribute super."deriving-compat";
+  "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-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-tikz" = dontDistribute super."diagrams-tikz";
+  "dialog" = dontDistribute super."dialog";
+  "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
+  "dicom" = dontDistribute super."dicom";
+  "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";
+  "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
+  "directed-cubical" = dontDistribute super."directed-cubical";
+  "directory-layout" = dontDistribute super."directory-layout";
+  "dirfiles" = dontDistribute super."dirfiles";
+  "dirstream" = dontDistribute super."dirstream";
+  "disassembler" = dontDistribute super."disassembler";
+  "discordian-calendar" = dontDistribute super."discordian-calendar";
+  "discount" = dontDistribute super."discount";
+  "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-closure" = dontDistribute super."distributed-closure";
+  "distributed-process-async" = dontDistribute super."distributed-process-async";
+  "distributed-process-azure" = dontDistribute super."distributed-process-azure";
+  "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-execution" = dontDistribute super."distributed-process-execution";
+  "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "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-registry" = dontDistribute super."distributed-process-registry";
+  "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet";
+  "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor";
+  "distributed-process-task" = dontDistribute super."distributed-process-task";
+  "distributed-process-tests" = dontDistribute super."distributed-process-tests";
+  "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" = dontDistribute super."doctest-discover";
+  "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
+  "doctest-prop" = dontDistribute super."doctest-prop";
+  "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" = dontDistribute super."download";
+  "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";
+  "drClickOn" = dontDistribute super."drClickOn";
+  "draw-poker" = dontDistribute super."draw-poker";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "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";
+  "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";
+  "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";
+  "ekg-statsd" = dontDistribute super."ekg-statsd";
+  "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-get" = dontDistribute super."elm-get";
+  "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-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";
+  "ether" = doDistribute super."ether_0_3_1_1";
+  "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";
+  "every-bit-counts" = dontDistribute super."every-bit-counts";
+  "ewe" = dontDistribute super."ewe";
+  "ex-pool" = dontDistribute super."ex-pool";
+  "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "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";
+  "exception-mtl" = dontDistribute super."exception-mtl";
+  "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";
+  "fail" = dontDistribute super."fail";
+  "failable-list" = dontDistribute super."failable-list";
+  "failure" = dontDistribute super."failure";
+  "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";
+  "fasta" = doDistribute super."fasta_0_10_1_0";
+  "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";
+  "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-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";
+  "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-mcmc" = dontDistribute super."flat-mcmc";
+  "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";
+  "flow2dot" = dontDistribute super."flow2dot";
+  "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-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";
+  "fold-debounce" = dontDistribute super."fold-debounce";
+  "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "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";
+  "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";
+  "free-vl" = dontDistribute super."free-vl";
+  "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";
+  "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";
+  "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";
+  "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";
+  "gamma" = dontDistribute super."gamma";
+  "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-deriving" = doDistribute super."generic-deriving_1_9_0";
+  "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
+  "generic-maybe" = dontDistribute super."generic-maybe";
+  "generic-pretty" = dontDistribute super."generic-pretty";
+  "generic-server" = dontDistribute super."generic-server";
+  "generic-storable" = dontDistribute super."generic-storable";
+  "generic-tree" = dontDistribute super."generic-tree";
+  "generic-xml" = dontDistribute super."generic-xml";
+  "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";
+  "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-imported-from" = dontDistribute super."ghc-imported-from";
+  "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-codemirror" = dontDistribute super."ghcjs-codemirror";
+  "ghcjs-dom" = dontDistribute super."ghcjs-dom";
+  "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
+  "ghcjs-websockets" = dontDistribute super."ghcjs-websockets";
+  "ghclive" = dontDistribute super."ghclive";
+  "ghczdecode" = dontDistribute super."ghczdecode";
+  "ght" = dontDistribute super."ght";
+  "gi-atk" = dontDistribute super."gi-atk";
+  "gi-cairo" = dontDistribute super."gi-cairo";
+  "gi-gdk" = dontDistribute super."gi-gdk";
+  "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
+  "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
+  "gi-glib" = dontDistribute super."gi-glib";
+  "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gtk" = dontDistribute super."gi-gtk";
+  "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
+  "gi-notify" = dontDistribute super."gi-notify";
+  "gi-pango" = dontDistribute super."gi-pango";
+  "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";
+  "gist" = dontDistribute super."gist";
+  "git-all" = dontDistribute super."git-all";
+  "git-annex" = doDistribute super."git-annex_6_20160114";
+  "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-backup" = dontDistribute super."github-backup";
+  "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";
+  "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";
+  "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";
+  "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-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";
+  "gpolyline" = dontDistribute super."gpolyline";
+  "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";
+  "grid" = dontDistribute super."grid";
+  "gridland" = dontDistribute super."gridland";
+  "grm" = dontDistribute super."grm";
+  "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-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-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-mac-integration" = dontDistribute super."gtk3-mac-integration";
+  "gtkglext" = dontDistribute super."gtkglext";
+  "gtkimageview" = dontDistribute super."gtkimageview";
+  "gtkrsync" = dontDistribute super."gtkrsync";
+  "gtksourceview2" = dontDistribute super."gtksourceview2";
+  "gtksourceview3" = dontDistribute super."gtksourceview3";
+  "guarded-rewriting" = dontDistribute super."guarded-rewriting";
+  "guess-combinator" = dontDistribute super."guess-combinator";
+  "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_1";
+  "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";
+  "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-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-leksah" = dontDistribute super."haddock-leksah";
+  "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";
+  "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-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-sass" = dontDistribute super."hakyll-sass";
+  "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";
+  "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";
+  "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";
+  "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_2";
+  "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-formatter" = dontDistribute super."haskell-formatter";
+  "haskell-ftp" = dontDistribute super."haskell-ftp";
+  "haskell-generate" = dontDistribute super."haskell-generate";
+  "haskell-gi" = dontDistribute super."haskell-gi";
+  "haskell-gi-base" = dontDistribute super."haskell-gi-base";
+  "haskell-import-graph" = dontDistribute super."haskell-import-graph";
+  "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "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-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
+  "haskell-platform-test" = dontDistribute super."haskell-platform-test";
+  "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-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-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-amazonka" = dontDistribute super."haxl-amazonka";
+  "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";
+  "hbayes" = dontDistribute super."hbayes";
+  "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";
+  "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";
+  "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-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";
+  "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";
+  "hesql" = dontDistribute super."hesql";
+  "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";
+  "hformat" = dontDistribute super."hformat";
+  "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";
+  "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";
+  "hinquire" = dontDistribute super."hinquire";
+  "hinstaller" = dontDistribute super."hinstaller";
+  "hint-server" = dontDistribute super."hint-server";
+  "hinvaders" = dontDistribute super."hinvaders";
+  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hipbot" = dontDistribute super."hipbot";
+  "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";
+  "hjcase" = dontDistribute super."hjcase";
+  "hjpath" = dontDistribute super."hjpath";
+  "hjs" = dontDistribute super."hjs";
+  "hjson" = dontDistribute super."hjson";
+  "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-chart" = dontDistribute super."hledger-chart";
+  "hledger-diff" = dontDistribute super."hledger-diff";
+  "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-vty" = dontDistribute super."hledger-vty";
+  "hlibBladeRF" = dontDistribute super."hlibBladeRF";
+  "hlibev" = dontDistribute super."hlibev";
+  "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_26";
+  "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" = dontDistribute super."hmt";
+  "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";
+  "hopfield" = dontDistribute super."hopfield";
+  "hopfield-networks" = dontDistribute super."hopfield-networks";
+  "hopfli" = dontDistribute super."hopfli";
+  "hops" = dontDistribute super."hops";
+  "hoq" = dontDistribute super."hoq";
+  "horizon" = dontDistribute super."horizon";
+  "hosc" = dontDistribute super."hosc";
+  "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";
+  "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";
+  "hpack" = dontDistribute super."hpack";
+  "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";
+  "hpc-strobe" = dontDistribute super."hpc-strobe";
+  "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hplayground" = dontDistribute super."hplayground";
+  "hplaylist" = dontDistribute super."hplaylist";
+  "hpodder" = dontDistribute super."hpodder";
+  "hpp" = dontDistribute super."hpp";
+  "hpqtypes" = dontDistribute super."hpqtypes";
+  "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-GeoIP" = dontDistribute super."hs-GeoIP";
+  "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";
+  "hsb2hs" = dontDistribute super."hsb2hs";
+  "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";
+  "hscolour" = doDistribute super."hscolour_1_23";
+  "hscope" = dontDistribute super."hscope";
+  "hscrtmpl" = dontDistribute super."hscrtmpl";
+  "hscuid" = dontDistribute super."hscuid";
+  "hscurses" = dontDistribute super."hscurses";
+  "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex";
+  "hsdev" = dontDistribute super."hsdev";
+  "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-monad-control" = dontDistribute super."hspec-monad-control";
+  "hspec-server" = dontDistribute super."hspec-server";
+  "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "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";
+  "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-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";
+  "htoml" = dontDistribute super."htoml";
+  "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-streams" = dontDistribute super."http-client-streams";
+  "http-conduit-browser" = dontDistribute super."http-conduit-browser";
+  "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-encodings" = dontDistribute super."http-encodings";
+  "http-enumerator" = dontDistribute super."http-enumerator";
+  "http-kit" = dontDistribute super."http-kit";
+  "http-listen" = dontDistribute super."http-listen";
+  "http-media" = doDistribute super."http-media_0_6_2";
+  "http-monad" = dontDistribute super."http-monad";
+  "http-proxy" = dontDistribute super."http-proxy";
+  "http-querystring" = dontDistribute super."http-querystring";
+  "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";
+  "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";
+  "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";
+  "identifiers" = dontDistribute super."identifiers";
+  "idiii" = dontDistribute super."idiii";
+  "idna" = dontDistribute super."idna";
+  "idna2008" = dontDistribute super."idna2008";
+  "idris" = dontDistribute super."idris";
+  "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-inline-r" = dontDistribute super."ihaskell-inline-r";
+  "ihaskell-parsec" = dontDistribute super."ihaskell-parsec";
+  "ihaskell-plot" = dontDistribute super."ihaskell-plot";
+  "ihaskell-widgets" = dontDistribute super."ihaskell-widgets";
+  "ihttp" = dontDistribute super."ihttp";
+  "illuminate" = dontDistribute super."illuminate";
+  "image-type" = dontDistribute super."image-type";
+  "imagefilters" = dontDistribute super."imagefilters";
+  "imagemagick" = dontDistribute super."imagemagick";
+  "imagepaste" = dontDistribute super."imagepaste";
+  "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-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-sat-solver" = dontDistribute super."incremental-sat-solver";
+  "increments" = dontDistribute super."increments";
+  "indentation" = dontDistribute super."indentation";
+  "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";
+  "inquire" = dontDistribute super."inquire";
+  "inserts" = dontDistribute super."inserts";
+  "inspection-proxy" = dontDistribute super."inspection-proxy";
+  "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";
+  "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";
+  "intern" = dontDistribute super."intern";
+  "internetmarke" = dontDistribute super."internetmarke";
+  "interpol" = dontDistribute super."interpol";
+  "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
+  "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
+  "interpolation" = dontDistribute super."interpolation";
+  "intricacy" = dontDistribute super."intricacy";
+  "intset" = dontDistribute super."intset";
+  "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-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-colors" = dontDistribute super."irc-colors";
+  "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";
+  "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";
+  "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-backend-c" = dontDistribute super."ivory-backend-c";
+  "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "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-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";
+  "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";
+  "jose" = dontDistribute super."jose";
+  "jpeg" = dontDistribute super."jpeg";
+  "js-good-parts" = dontDistribute super."js-good-parts";
+  "jsaddle" = dontDistribute super."jsaddle";
+  "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-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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "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";
+  "judy" = dontDistribute super."judy";
+  "jukebox" = dontDistribute super."jukebox";
+  "jumpthefive" = dontDistribute super."jumpthefive";
+  "jvm-parser" = dontDistribute super."jvm-parser";
+  "kademlia" = dontDistribute super."kademlia";
+  "kafka-client" = dontDistribute super."kafka-client";
+  "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";
+  "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";
+  "lackey" = dontDistribute super."lackey";
+  "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-samples" = dontDistribute super."lambdacube-samples";
+  "lambdatex" = dontDistribute super."lambdatex";
+  "lambdatwit" = dontDistribute super."lambdatwit";
+  "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-c-quote" = dontDistribute super."language-c-quote";
+  "language-cil" = dontDistribute super."language-cil";
+  "language-css" = dontDistribute super."language-css";
+  "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-typescript" = dontDistribute super."language-typescript";
+  "language-vhdl" = dontDistribute super."language-vhdl";
+  "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";
+  "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";
+  "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";
+  "leksah-server" = dontDistribute super."leksah-server";
+  "lendingclub" = dontDistribute super."lendingclub";
+  "lens-datetime" = dontDistribute super."lens-datetime";
+  "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";
+  "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";
+  "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";
+  "libxml" = dontDistribute super."libxml";
+  "libxml-enumerator" = dontDistribute super."libxml-enumerator";
+  "libxslt" = dontDistribute super."libxslt";
+  "life" = dontDistribute super."life";
+  "lift-generics" = dontDistribute super."lift-generics";
+  "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";
+  "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";
+  "load-env" = dontDistribute super."load-env";
+  "loadavg" = dontDistribute super."loadavg";
+  "local-address" = dontDistribute super."local-address";
+  "local-search" = dontDistribute super."local-search";
+  "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";
+  "logfloat" = dontDistribute super."logfloat";
+  "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";
+  "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";
+  "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";
+  "ltk" = dontDistribute super."ltk";
+  "ltl" = dontDistribute super."ltl";
+  "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";
+  "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";
+  "maccatcher" = dontDistribute super."maccatcher";
+  "machinecell" = dontDistribute super."machinecell";
+  "machines-binary" = dontDistribute super."machines-binary";
+  "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";
+  "mainland-pretty" = dontDistribute super."mainland-pretty";
+  "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";
+  "manifold-random" = dontDistribute super."manifold-random";
+  "manifolds" = dontDistribute super."manifolds";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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-exception" = dontDistribute super."monad-exception";
+  "monad-fork" = dontDistribute super."monad-fork";
+  "monad-gen" = dontDistribute super."monad-gen";
+  "monad-interleave" = dontDistribute super."monad-interleave";
+  "monad-levels" = dontDistribute super."monad-levels";
+  "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-stlike-io" = dontDistribute super."monad-stlike-io";
+  "monad-stlike-stm" = dontDistribute super."monad-stlike-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";
+  "monadplus" = dontDistribute super."monadplus";
+  "monads-fd" = dontDistribute super."monads-fd";
+  "monadtransform" = dontDistribute super."monadtransform";
+  "monarch" = dontDistribute super."monarch";
+  "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_1_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";
+  "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";
+  "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";
+  "multiset-comb" = dontDistribute super."multiset-comb";
+  "multisetrewrite" = dontDistribute super."multisetrewrite";
+  "multistate" = dontDistribute super."multistate";
+  "muon" = dontDistribute super."muon";
+  "murder" = dontDistribute super."murder";
+  "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";
+  "names-th" = dontDistribute super."names-th";
+  "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
+  "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";
+  "nanq" = dontDistribute super."nanq";
+  "narc" = dontDistribute super."narc";
+  "nat" = dontDistribute super."nat";
+  "nats-queue" = dontDistribute super."nats-queue";
+  "natural-number" = dontDistribute super."natural-number";
+  "natural-numbers" = dontDistribute super."natural-numbers";
+  "natural-transformation" = dontDistribute super."natural-transformation";
+  "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" = dontDistribute super."nested-routes";
+  "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-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-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "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";
+  "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";
+  "niagra" = dontDistribute super."niagra";
+  "nibblestring" = dontDistribute super."nibblestring";
+  "nicify" = dontDistribute super."nicify";
+  "nicify-lib" = dontDistribute super."nicify-lib";
+  "nicovideo-translator" = dontDistribute super."nicovideo-translator";
+  "nikepub" = dontDistribute super."nikepub";
+  "nimber" = dontDistribute super."nimber";
+  "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";
+  "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";
+  "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";
+  "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" = dontDistribute super."octane";
+  "octohat" = dontDistribute super."octohat";
+  "octopus" = dontDistribute super."octopus";
+  "oculus" = dontDistribute super."oculus";
+  "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-classy" = dontDistribute super."opaleye-classy";
+  "opaleye-sqlite" = dontDistribute super."opaleye-sqlite";
+  "opaleye-trans" = dontDistribute super."opaleye-trans";
+  "open-haddock" = dontDistribute super."open-haddock";
+  "open-pandoc" = dontDistribute super."open-pandoc";
+  "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";
+  "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-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";
+  "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";
+  "overture" = dontDistribute super."overture";
+  "pack" = dontDistribute super."pack";
+  "package-o-tron" = dontDistribute super."package-o-tron";
+  "package-vt" = dontDistribute super."package-vt";
+  "packdeps" = dontDistribute super."packdeps";
+  "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-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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "path-io" = doDistribute super."path-io_0_2_0";
+  "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";
+  "period" = dontDistribute super."period";
+  "perm" = dontDistribute super."perm";
+  "permutation" = dontDistribute super."permutation";
+  "permute" = dontDistribute super."permute";
+  "persist2er" = dontDistribute super."persist2er";
+  "persistable-record" = dontDistribute super."persistable-record";
+  "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-cereal" = dontDistribute super."persistent-cereal";
+  "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-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-protobuf" = dontDistribute super."persistent-protobuf";
+  "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
+  "persistent-redis" = dontDistribute super."persistent-redis";
+  "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";
+  "pgdl" = dontDistribute super."pgdl";
+  "pgm" = dontDistribute super."pgm";
+  "pgsql-simple" = dontDistribute super."pgsql-simple";
+  "pgstream" = dontDistribute super."pgstream";
+  "phasechange" = dontDistribute super."phasechange";
+  "phizzle" = dontDistribute super."phizzle";
+  "phoityne" = dontDistribute super."phoityne";
+  "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";
+  "pinchot" = doDistribute super."pinchot_0_6_0_0";
+  "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-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-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-shell" = dontDistribute super."pipes-shell";
+  "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-transduce" = dontDistribute super."pipes-transduce";
+  "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";
+  "plan-b" = dontDistribute super."plan-b";
+  "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";
+  "pointfree" = dontDistribute super."pointfree";
+  "pointful" = dontDistribute super."pointful";
+  "pointless-fun" = dontDistribute super."pointless-fun";
+  "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";
+  "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
+  "polyseq" = dontDistribute super."polyseq";
+  "polysoup" = dontDistribute super."polysoup";
+  "polytypeable" = dontDistribute super."polytypeable";
+  "polytypeable-utils" = dontDistribute super."polytypeable-utils";
+  "ponder" = dontDistribute super."ponder";
+  "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-binary" = doDistribute super."postgresql-binary_0_7_8";
+  "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-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-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-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-generalize" = dontDistribute super."prelude-generalize";
+  "prelude-plus" = dontDistribute super."prelude-plus";
+  "prelude-prime" = dontDistribute super."prelude-prime";
+  "prelude-safeenum" = dontDistribute super."prelude-safeenum";
+  "preprocess-haskell" = dontDistribute super."preprocess-haskell";
+  "preprocessor-tools" = dontDistribute super."preprocessor-tools";
+  "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-hex" = dontDistribute super."pretty-hex";
+  "pretty-ncols" = dontDistribute super."pretty-ncols";
+  "pretty-sop" = dontDistribute super."pretty-sop";
+  "pretty-tree" = dontDistribute super."pretty-tree";
+  "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
+  "primula-board" = dontDistribute super."primula-board";
+  "primula-bot" = dontDistribute super."primula-bot";
+  "printf-mauke" = dontDistribute super."printf-mauke";
+  "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_7";
+  "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";
+  "process-streaming" = dontDistribute super."process-streaming";
+  "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";
+  "profiteur" = dontDistribute super."profiteur";
+  "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";
+  "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-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" = doDistribute super."psc-ide_0_5_0";
+  "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_20151212";
+  "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-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_7_6_1";
+  "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "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";
+  "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";
+  "quickcheck-instances" = doDistribute super."quickcheck-instances_0_3_11";
+  "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-simple" = dontDistribute super."quickcheck-simple";
+  "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver";
+  "quicklz" = dontDistribute super."quicklz";
+  "quickpull" = dontDistribute super."quickpull";
+  "quickset" = dontDistribute super."quickset";
+  "quickspec" = dontDistribute super."quickspec";
+  "quicktest" = dontDistribute super."quicktest";
+  "quickwebapp" = dontDistribute super."quickwebapp";
+  "quiver" = dontDistribute super."quiver";
+  "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-http" = dontDistribute super."quiver-http";
+  "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";
+  "rascal" = dontDistribute super."rascal";
+  "rate-limit" = dontDistribute super."rate-limit";
+  "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";
+  "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-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";
+  "reactor" = dontDistribute super."reactor";
+  "read-bounded" = dontDistribute super."read-bounded";
+  "readline-statevar" = dontDistribute super."readline-statevar";
+  "readpyc" = dontDistribute super."readpyc";
+  "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";
+  "reedsolomon" = dontDistribute super."reedsolomon";
+  "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-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
+  "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-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";
+  "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-query" = dontDistribute super."relational-query";
+  "relational-query-HDBC" = dontDistribute super."relational-query-HDBC";
+  "relational-record" = dontDistribute super."relational-record";
+  "relational-record-examples" = dontDistribute super."relational-record-examples";
+  "relational-schemas" = dontDistribute super."relational-schemas";
+  "relative-date" = dontDistribute super."relative-date";
+  "relit" = dontDistribute super."relit";
+  "rematch" = dontDistribute super."rematch";
+  "rematch-text" = dontDistribute super."rematch-text";
+  "remote" = dontDistribute super."remote";
+  "remote-debugger" = dontDistribute super."remote-debugger";
+  "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";
+  "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-model" = dontDistribute super."rethinkdb-model";
+  "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
+  "retryer" = dontDistribute super."retryer";
+  "rev-state" = doDistribute super."rev-state_0_1_1";
+  "revdectime" = dontDistribute super."revdectime";
+  "reverse-apply" = dontDistribute super."reverse-apply";
+  "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";
+  "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";
+  "rmonad" = dontDistribute super."rmonad";
+  "rncryptor" = dontDistribute super."rncryptor";
+  "rng-utils" = dontDistribute super."rng-utils";
+  "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";
+  "rotating-log" = dontDistribute super."rotating-log";
+  "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";
+  "sandlib" = dontDistribute super."sandlib";
+  "sarasvati" = dontDistribute super."sarasvati";
+  "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";
+  "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";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
+  "scan" = dontDistribute super."scan";
+  "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "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" = doDistribute super."scotty_0_10_2";
+  "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-rest" = dontDistribute super."scotty-rest";
+  "scotty-session" = dontDistribute super."scotty-session";
+  "scotty-tls" = dontDistribute super."scotty-tls";
+  "scp-streams" = dontDistribute super."scp-streams";
+  "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "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";
+  "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";
+  "semiring-simple" = dontDistribute super."semiring-simple";
+  "semver-range" = dontDistribute super."semver-range";
+  "sendgrid-haskell" = dontDistribute super."sendgrid-haskell";
+  "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";
+  "serialport" = dontDistribute super."serialport";
+  "serv" = dontDistribute super."serv";
+  "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-ede" = dontDistribute super."servant-ede";
+  "servant-examples" = dontDistribute super."servant-examples";
+  "servant-github" = dontDistribute super."servant-github";
+  "servant-lucid" = dontDistribute super."servant-lucid";
+  "servant-mock" = dontDistribute super."servant-mock";
+  "servant-pandoc" = dontDistribute super."servant-pandoc";
+  "servant-pool" = dontDistribute super."servant-pool";
+  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-response" = dontDistribute super."servant-response";
+  "servant-scotty" = dontDistribute super."servant-scotty";
+  "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-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";
+  "shelly-extra" = dontDistribute super."shelly-extra";
+  "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" = dontDistribute super."simple-log";
+  "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" = dontDistribute super."simpleirc";
+  "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";
+  "sink" = dontDistribute super."sink";
+  "sirkel" = dontDistribute super."sirkel";
+  "sitemap" = dontDistribute super."sitemap";
+  "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";
+  "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";
+  "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";
+  "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-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-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";
+  "soegtk" = dontDistribute super."soegtk";
+  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
+  "sophia" = dontDistribute super."sophia";
+  "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
+  "sorted" = dontDistribute super."sorted";
+  "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";
+  "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";
+  "spool" = dontDistribute super."spool";
+  "spoonutil" = dontDistribute super."spoonutil";
+  "spoty" = dontDistribute super."spoty";
+  "spreadsheet" = dontDistribute super."spreadsheet";
+  "spritz" = dontDistribute super."spritz";
+  "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";
+  "sql-words" = dontDistribute super."sql-words";
+  "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";
+  "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-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";
+  "stopwatch" = dontDistribute super."stopwatch";
+  "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";
+  "str" = dontDistribute super."str";
+  "stratum-tool" = dontDistribute super."stratum-tool";
+  "stream-fusion" = dontDistribute super."stream-fusion";
+  "stream-monad" = dontDistribute super."stream-monad";
+  "streamed" = dontDistribute super."streamed";
+  "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-utils" = dontDistribute super."streaming-utils";
+  "streaming-wai" = dontDistribute super."streaming-wai";
+  "strict-base-types" = doDistribute super."strict-base-types_0_4_0";
+  "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-conv" = dontDistribute super."string-conv";
+  "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";
+  "strive" = dontDistribute super."strive";
+  "strptime" = dontDistribute super."strptime";
+  "structs" = dontDistribute super."structs";
+  "structural-induction" = dontDistribute super."structural-induction";
+  "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";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_14_4";
+  "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";
+  "suffixarray" = dontDistribute super."suffixarray";
+  "suffixtree" = dontDistribute super."suffixtree";
+  "sugarhaskell" = dontDistribute super."sugarhaskell";
+  "suitable" = dontDistribute super."suitable";
+  "sump" = dontDistribute super."sump";
+  "sundown" = dontDistribute super."sundown";
+  "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";
+  "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";
+  "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";
+  "symbol" = dontDistribute super."symbol";
+  "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-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";
+  "ta" = dontDistribute super."ta";
+  "table" = dontDistribute super."table";
+  "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-transformer" = dontDistribute super."tagged-transformer";
+  "tagging" = dontDistribute super."tagging";
+  "taggy" = dontDistribute super."taggy";
+  "taggy-lens" = dontDistribute super."taggy-lens";
+  "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";
+  "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";
+  "taskpool" = dontDistribute super."taskpool";
+  "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";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "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";
+  "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-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-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";
+  "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-and-plots" = dontDistribute super."text-and-plots";
+  "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-ldap" = dontDistribute super."text-ldap";
+  "text-locale-encoding" = dontDistribute super."text-locale-encoding";
+  "text-normal" = dontDistribute super."text-normal";
+  "text-position" = dontDistribute super."text-position";
+  "text-postgresql" = dontDistribute super."text-postgresql";
+  "text-printer" = dontDistribute super."text-printer";
+  "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
+  "text-register-machine" = dontDistribute super."text-register-machine";
+  "text-render" = dontDistribute super."text-render";
+  "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-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-lift-instances" = dontDistribute super."th-lift-instances";
+  "th-printf" = dontDistribute super."th-printf";
+  "th-sccs" = dontDistribute super."th-sccs";
+  "th-traced" = dontDistribute super."th-traced";
+  "th-typegraph" = dontDistribute super."th-typegraph";
+  "themoviedb" = dontDistribute super."themoviedb";
+  "themplate" = dontDistribute super."themplate";
+  "theoremquest" = dontDistribute super."theoremquest";
+  "theoremquest-client" = dontDistribute super."theoremquest-client";
+  "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";
+  "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" = dontDistribute super."tidal";
+  "tidal-midi" = dontDistribute super."tidal-midi";
+  "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-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-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-time" = dontDistribute super."timelike-time";
+  "timemap" = dontDistribute super."timemap";
+  "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";
+  "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-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";
+  "tracker" = dontDistribute super."tracker";
+  "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-compose" = dontDistribute super."transformers-compose";
+  "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-runnable" = dontDistribute super."transformers-runnable";
+  "transformers-supply" = dontDistribute super."transformers-supply";
+  "transient" = dontDistribute super."transient";
+  "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";
+  "tslogger" = dontDistribute super."tslogger";
+  "tsp-viz" = dontDistribute super."tsp-viz";
+  "tsparse" = dontDistribute super."tsparse";
+  "tst" = dontDistribute super."tst";
+  "tsvsql" = dontDistribute super."tsvsql";
+  "tttool" = doDistribute super."tttool_1_5_1";
+  "tubes" = dontDistribute super."tubes";
+  "tuntap" = dontDistribute super."tuntap";
+  "tup-functor" = dontDistribute super."tup-functor";
+  "tuple" = dontDistribute super."tuple";
+  "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";
+  "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
+  "turni" = dontDistribute super."turni";
+  "tweak" = dontDistribute super."tweak";
+  "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";
+  "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-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";
+  "typography-geometry" = dontDistribute super."typography-geometry";
+  "uAgda" = dontDistribute super."uAgda";
+  "ua-parser" = dontDistribute super."ua-parser";
+  "uacpid" = dontDistribute super."uacpid";
+  "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";
+  "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-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";
+  "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-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";
+  "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";
+  "vado" = dontDistribute super."vado";
+  "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";
+  "vcd" = dontDistribute super."vcd";
+  "vcs-revision" = dontDistribute super."vcs-revision";
+  "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
+  "vcsgui" = dontDistribute super."vcsgui";
+  "vcswrapper" = dontDistribute super."vcswrapper";
+  "vect" = dontDistribute super."vect";
+  "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-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" = dontDistribute super."versions";
+  "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-utils" = dontDistribute super."vinyl-utils";
+  "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";
+  "vivid" = dontDistribute super."vivid";
+  "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";
+  "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-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-content-type" = dontDistribute super."wai-middleware-content-type";
+  "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" = dontDistribute super."wai-middleware-verbs";
+  "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-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";
+  "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" = dontDistribute super."webkitgtk3";
+  "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "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" = dontDistribute super."werewolf";
+  "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";
+  "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";
+  "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";
+  "wuss" = dontDistribute super."wuss";
+  "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" = doDistribute super."xml-conduit_1_3_3";
+  "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";
+  "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";
+  "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-json" = dontDistribute super."yesod-json";
+  "yesod-links" = dontDistribute super."yesod-links";
+  "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "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";
+  "yjtools" = dontDistribute super."yjtools";
+  "yocto" = dontDistribute super."yocto";
+  "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-conduit" = dontDistribute super."zip-conduit";
+  "zipedit" = dontDistribute super."zipedit";
+  "zipkin" = dontDistribute super."zipkin";
+  "zipper" = dontDistribute super."zipper";
+  "zippers" = dontDistribute super."zippers";
+  "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";
+  "zot" = dontDistribute super."zot";
+  "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 6112997fc01b..1a9a2ac97296 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -616,9 +616,12 @@ self: {
        pname = "Adaptive";
        version = "0.23";
        sha256 = "0c5d3e880bbcd6245ccefa16d1d2cc15f7e48bd4ab50723f321883b91b6a4758";
+       revision = "1";
+       editedCabalFile = "36c76cf96db195ede96306358e65aec311211569c236983efb473c3e97b864b5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
+       jailbreak = true;
        description = "Library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -6409,8 +6412,11 @@ self: {
        pname = "GLURaw";
        version = "1.4.0.1";
        sha256 = "9655644beb54ff8fac68f2e0fd8a8e9a1e8409272e2e4c963ccce9bcd60e0ecc";
+       revision = "1";
+       editedCabalFile = "d83125fb416c0619106ec557733e75e8093f4ad923a8dfd969199297bb1c8619";
        libraryHaskellDepends = [ base OpenGLRaw ];
        librarySystemDepends = [ freeglut mesa ];
+       jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
@@ -6423,8 +6429,11 @@ self: {
        pname = "GLURaw";
        version = "1.4.0.2";
        sha256 = "0f4ae663840ba350e0ef04dd65d60f423ff6551ffbab3302ced9f1f0d4075e83";
+       revision = "1";
+       editedCabalFile = "6800f1d309c8bdea4cd3a054fa69c8fdc39d8f63193136e2638a93c8a8f31308";
        libraryHaskellDepends = [ base OpenGLRaw ];
        librarySystemDepends = [ freeglut mesa ];
+       jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
@@ -6649,7 +6658,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "GPipe" = callPackage
+  "GPipe_2_1_6" = callPackage
     ({ mkDerivation, base, Boolean, containers, exception-transformers
      , gl, hashtables, linear, transformers
      }:
@@ -6664,6 +6673,24 @@ self: {
        homepage = "http://tobbebex.blogspot.se/";
        description = "Typesafe functional GPU graphics programming";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "GPipe" = callPackage
+    ({ mkDerivation, base, Boolean, containers, exception-transformers
+     , gl, hashtables, linear, transformers
+     }:
+     mkDerivation {
+       pname = "GPipe";
+       version = "2.1.7";
+       sha256 = "ebb54d9994bcb9c14064af5468c3c0f34f02db07d6033f562dd09b4718538814";
+       libraryHaskellDepends = [
+         base Boolean containers exception-transformers gl hashtables linear
+         transformers
+       ];
+       homepage = "http://tobbebex.blogspot.se/";
+       description = "Typesafe functional GPU graphics programming";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "GPipe-Collada" = callPackage
@@ -7014,14 +7041,16 @@ self: {
      }) {};
 
   "Gifcurry" = callPackage
-    ({ mkDerivation, base, gtk3, process, temporary }:
+    ({ mkDerivation, base, directory, gtk3, process, temporary }:
      mkDerivation {
        pname = "Gifcurry";
-       version = "0.1.0.1";
-       sha256 = "cfa0729e5cab21a4d4ff969b86af20a6e5244059a030695879e56e4705a5e56f";
+       version = "0.1.0.3";
+       sha256 = "a54e2bde1b6521997af0bb4983094169eb492e65a8b5d8bc596d57d06b59e399";
        isLibrary = false;
        isExecutable = true;
-       executableHaskellDepends = [ base gtk3 process temporary ];
+       executableHaskellDepends = [
+         base directory gtk3 process temporary
+       ];
        homepage = "https://github.com/lettier/gifcurry";
        description = "Create animated GIFs, overlaid with optional text, from movies";
        license = stdenv.lib.licenses.asl20;
@@ -8877,6 +8906,8 @@ self: {
        pname = "HStringTemplate";
        version = "0.8.3";
        sha256 = "63d6b1c993f5612ef370b92bb8fab05323657ec34a0f35110b967eb853239d18";
+       revision = "1";
+       editedCabalFile = "e333f201de7b501fda8bf4868be8aa4565a6c57abd0517844dffb0df37d18308";
        libraryHaskellDepends = [
          array base blaze-builder bytestring containers deepseq directory
          filepath mtl old-locale parsec pretty syb template-haskell text
@@ -10839,6 +10870,8 @@ self: {
        pname = "HsOpenSSL";
        version = "0.11.1.1";
        sha256 = "4a61e074e968a9863e0f3440b3be8ac131457b3d34eb983ca8102122d8ebc4c1";
+       revision = "1";
+       editedCabalFile = "be351c277db7ddbc2ece8fb2d10b8f1f686b91000a552dd9d8155b79f8db9a5f";
        libraryHaskellDepends = [
          base bytestring integer-gmp network old-locale time
        ];
@@ -11256,7 +11289,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "IntervalMap" = callPackage
+  "IntervalMap_0_5_0_0" = callPackage
     ({ mkDerivation, base, Cabal, containers, deepseq, QuickCheck }:
      mkDerivation {
        pname = "IntervalMap";
@@ -11267,6 +11300,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.0.1";
+       sha256 = "5c4a44fc5091f1e7a879cdd937a3fc3de28696e21d247250a4b2c0cf12e160bc";
+       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
@@ -13413,16 +13460,16 @@ self: {
      }) {};
 
   "MonadCompose" = callPackage
-    ({ mkDerivation, base, data-default, ghc-prim, mmorph, monad-loops
-     , monad-products, mtl, parallel, random, transformers
+    ({ mkDerivation, base, data-default, ghc-prim, kan-extensions
+     , mmorph, monad-products, mtl, parallel, random, transformers
      , transformers-compat
      }:
      mkDerivation {
        pname = "MonadCompose";
-       version = "0.8.4.1";
-       sha256 = "16efab2564b74f253d3a6e034adb2afff12e0b8dff45ac0883fff30895815186";
+       version = "0.8.4.2";
+       sha256 = "71c3a63f4e3592a2f918e1433fecf1f8e75293ded6369c82b12a76e3d88bac78";
        libraryHaskellDepends = [
-         base data-default ghc-prim mmorph monad-loops monad-products mtl
+         base data-default ghc-prim kan-extensions mmorph monad-products mtl
          parallel random transformers transformers-compat
        ];
        homepage = "http://alkalisoftware.net";
@@ -14168,11 +14215,10 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "NoTrace";
-       version = "0.2.0.1";
-       sha256 = "2d0160f8f5cb58c93df9fcb93130fdfb946c7c978f527c935f26380d92047c14";
+       version = "0.3.0.0";
+       sha256 = "6ffdd65376971c4fa4faea10dacaeaf1b6ada23870c8dc9cb278dc3250e40e81";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base ];
-       jailbreak = true;
        homepage = "https://github.com/CindyLinz/Haskell-NoTrace";
        description = "Remove all the functions come from Debug.Trace after debugging";
        license = stdenv.lib.licenses.mit;
@@ -15513,18 +15559,18 @@ self: {
 
   "Plot-ho-matic" = callPackage
     ({ mkDerivation, base, cairo, Chart, Chart-cairo, containers
-     , data-default-class, generic-accessors, glib, gtk, lens, text
-     , time, vector
+     , data-default-class, generic-accessors, glib, gtk3, lens, text
+     , time, transformers, vector
      }:
      mkDerivation {
        pname = "Plot-ho-matic";
-       version = "0.8.0.0";
-       sha256 = "2c2e2d1f793140df25afdd73965b42f3010b5060030c564cc7afcff9f3c711a2";
+       version = "0.9.0.0";
+       sha256 = "564428ef3f2575cfd89d0a961c4a58997063d5177376212a04e3baf19139a1c3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base cairo Chart Chart-cairo containers data-default-class
-         generic-accessors glib gtk lens text time vector
+         generic-accessors glib gtk3 lens text time transformers vector
        ];
        executableHaskellDepends = [ base containers generic-accessors ];
        description = "Real-time line plotter for generic data";
@@ -22752,6 +22798,7 @@ self: {
          quickcheck-instances scientific tagged tasty tasty-hunit
          tasty-quickcheck text unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/phadej/aeson-extra#readme";
        description = "Extra goodies for aeson";
        license = stdenv.lib.licenses.bsd3;
@@ -22779,6 +22826,7 @@ self: {
          quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
          text time unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/phadej/aeson-extra#readme";
        description = "Extra goodies for aeson";
        license = stdenv.lib.licenses.bsd3;
@@ -22806,6 +22854,7 @@ self: {
          quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
          template-haskell text time unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/phadej/aeson-extra#readme";
        description = "Extra goodies for aeson";
        license = stdenv.lib.licenses.bsd3;
@@ -22836,6 +22885,7 @@ self: {
          tasty-hunit tasty-quickcheck template-haskell text time
          time-parsers unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/phadej/aeson-extra#readme";
        description = "Extra goodies for aeson";
        license = stdenv.lib.licenses.bsd3;
@@ -22843,34 +22893,6 @@ self: {
      }) {};
 
   "aeson-extra" = callPackage
-    ({ mkDerivation, aeson, aeson-compat, base, base-compat, bytestring
-     , containers, exceptions, hashable, parsec, quickcheck-instances
-     , scientific, tasty, tasty-hunit, tasty-quickcheck
-     , template-haskell, text, time, time-parsers, unordered-containers
-     , vector
-     }:
-     mkDerivation {
-       pname = "aeson-extra";
-       version = "0.3.0.1";
-       sha256 = "5b1b75c8f10a470975c0f6170d5b786f594acef295c5e23150e81e855b70e6a7";
-       libraryHaskellDepends = [
-         aeson aeson-compat base base-compat bytestring containers
-         exceptions hashable parsec scientific template-haskell text time
-         time-parsers unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson aeson-compat base base-compat bytestring containers
-         exceptions hashable parsec quickcheck-instances scientific tasty
-         tasty-hunit tasty-quickcheck template-haskell text time
-         time-parsers unordered-containers vector
-       ];
-       homepage = "https://github.com/phadej/aeson-extra#readme";
-       description = "Extra goodies for aeson";
-       license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
-  "aeson-extra_0_3_1_0" = callPackage
     ({ mkDerivation, aeson, aeson-compat, base, base-compat, bytestring
      , containers, exceptions, hashable, parsec, quickcheck-instances
      , recursion-schemes, scientific, tasty, tasty-hunit
@@ -23369,6 +23391,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "ag-pictgen" = callPackage
+    ({ mkDerivation, base, containers, uuagc, uulib }:
+     mkDerivation {
+       pname = "ag-pictgen";
+       version = "1.0.0.0";
+       sha256 = "3afe523fe3beae494e274e21258f8d69abb1d228f207fd1e286b8d23180bb97c";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base containers uuagc uulib ];
+       homepage = "https://github.com/UU-ComputerScience/ag-pictgen";
+       description = "Attribute Grammar picture generation";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "agda-server" = callPackage
     ({ mkDerivation, Agda, base, cmdargs, containers, directory
      , filepath, HJavaScript, mtl, pandoc, snap-core, snap-server
@@ -23653,8 +23689,8 @@ self: {
     ({ mkDerivation, array, base, containers, mtl, random, vector }:
      mkDerivation {
        pname = "aivika";
-       version = "4.3.1";
-       sha256 = "bff0ea9f344eef7f90e54613e261c8b45e39b428e580eb56d3eab6f0c20b2584";
+       version = "4.3.2";
+       sha256 = "a4209fea2b6d66bfd5d5d9a6477f95ce04c2c5fac06bfbde3c51941d84fba063";
        libraryHaskellDepends = [
          array base containers mtl random vector
        ];
@@ -23663,6 +23699,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "aivika-branches" = callPackage
+    ({ mkDerivation, aivika, aivika-transformers, base, containers, mtl
+     , random
+     }:
+     mkDerivation {
+       pname = "aivika-branches";
+       version = "0.1";
+       sha256 = "b792804e0bb8484e2397078751f76b9f2ac042047222446e42d03ab3a1150b11";
+       libraryHaskellDepends = [
+         aivika aivika-transformers base containers mtl random
+       ];
+       homepage = "http://www.aivikasoft.com/en/products/aivika.html";
+       description = "Branching discrete event simulation library";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "aivika-experiment" = callPackage
     ({ mkDerivation, aivika, base, containers, directory, filepath, mtl
      , network-uri, parallel-io, split
@@ -23737,12 +23789,12 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-transformers";
-       version = "3.0";
-       sha256 = "3f34e384aacd8f463f2721209910bcde25e111f96e1c3a727fe19571d49f30ad";
+       version = "4.3.1";
+       sha256 = "4acb26db40ab81c6436d1a3407315eddba1d677967a3210674a1783424ab0055";
        libraryHaskellDepends = [
          aivika array base containers mtl random vector
        ];
-       homepage = "http://github.com/dsorokin/aivika-transformers";
+       homepage = "http://www.aivikasoft.com/en/products/aivika.html";
        description = "Transformers for the Aivika simulation library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -24364,8 +24416,8 @@ self: {
      }:
      mkDerivation {
        pname = "alsa-pcm";
-       version = "0.6.0.3";
-       sha256 = "da7dc11ff1b703d1334d13705097ceddd7dd5c88c335486d3b1d34d84f880067";
+       version = "0.6.0.4";
+       sha256 = "9aae1379903b8445073f8a2b6ccf86b904b4045247747516530a165a3f76ca2a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -24400,8 +24452,8 @@ self: {
      }:
      mkDerivation {
        pname = "alsa-seq";
-       version = "0.6.0.5";
-       sha256 = "1238b1788228af07a15a76ab3768202d491aa1f7feef009355ff7109a91584d2";
+       version = "0.6.0.6";
+       sha256 = "f5e58660f07943f0cc33eb2e1ada5e111c43d4114eeb4e0ac0251d72c43b7144";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -27904,7 +27956,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amqp" = callPackage
+  "amqp_0_13_0" = callPackage
     ({ mkDerivation, base, binary, bytestring, clock, connection
      , containers, data-binary-ieee754, hspec, hspec-expectations
      , monad-control, network, network-uri, split, stm, text, vector
@@ -27931,9 +27983,10 @@ self: {
        homepage = "https://github.com/hreinhardt/amqp";
        description = "Client library for AMQP servers (currently only RabbitMQ)";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "amqp_0_13_1" = callPackage
+  "amqp" = callPackage
     ({ mkDerivation, base, binary, bytestring, clock, connection
      , containers, data-binary-ieee754, hspec, hspec-expectations
      , monad-control, network, network-uri, split, stm, text, vector
@@ -27956,10 +28009,10 @@ self: {
          data-binary-ieee754 hspec hspec-expectations network network-uri
          split stm text vector
        ];
+       doCheck = false;
        homepage = "https://github.com/hreinhardt/amqp";
        description = "Client library for AMQP servers (currently only RabbitMQ)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amqp-conduit" = callPackage
@@ -29213,6 +29266,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "apply-refact_0_2_0_0" = callPackage
+    ({ mkDerivation, base, containers, directory, filemanip, filepath
+     , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact
+     , silently, syb, tasty, tasty-expected-failure, tasty-golden
+     , temporary, transformers, unix-compat
+     }:
+     mkDerivation {
+       pname = "apply-refact";
+       version = "0.2.0.0";
+       sha256 = "f74abeae9f6ad6e3ab5b00b108e99c4351ff26f691f5a0c1d3662b2b18648d5c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers directory filemanip ghc ghc-exactprint mtl process
+         refact syb temporary transformers unix-compat
+       ];
+       executableHaskellDepends = [
+         base containers directory filemanip filepath ghc ghc-exactprint mtl
+         optparse-applicative process refact syb temporary transformers
+         unix-compat
+       ];
+       testHaskellDepends = [
+         base containers directory filemanip filepath ghc ghc-exactprint mtl
+         optparse-applicative process refact silently syb tasty
+         tasty-expected-failure tasty-golden temporary transformers
+         unix-compat
+       ];
+       description = "Perform refactorings specified by the refact library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "apportionment" = callPackage
     ({ mkDerivation, base, containers, utility-ht }:
      mkDerivation {
@@ -31980,7 +32065,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "avers" = callPackage
+  "avers_0_0_13" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , bytestring, clock, containers, cryptohash, filepath, hspec
      , inflections, MonadRandom, mtl, network, network-uri
@@ -32008,7 +32093,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "avers_0_0_14" = callPackage
+  "avers" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base16-bytestring
      , bytestring, clock, containers, cryptohash, filepath, hspec
      , inflections, MonadRandom, mtl, network, network-uri
@@ -32036,7 +32121,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "avers-api" = callPackage
+  "avers-api_0_0_1" = callPackage
     ({ mkDerivation, aeson, avers, base, bytestring, cookie, servant
      , text, time
      }:
@@ -32051,9 +32136,10 @@ self: {
        homepage = "http://github.com/wereHamster/avers-api";
        description = "Types describing the core and extended Avers APIs";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "avers-api_0_0_2" = callPackage
+  "avers-api" = callPackage
     ({ mkDerivation, aeson, avers, base, bytestring, cookie, servant
      , text, time
      }:
@@ -32064,13 +32150,13 @@ self: {
        libraryHaskellDepends = [
          aeson avers base bytestring cookie servant text time
        ];
+       doHaddock = false;
        homepage = "http://github.com/wereHamster/avers-api";
        description = "Types describing the core and extended Avers APIs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "avers-server" = callPackage
+  "avers-server_0_0_1" = callPackage
     ({ mkDerivation, aeson, avers, avers-api, base, bytestring
      , bytestring-conversion, cookie, either, http-types, mtl
      , resource-pool, rethinkdb-client-driver, servant, servant-server
@@ -32088,9 +32174,10 @@ self: {
        homepage = "http://github.com/wereHamster/avers-server";
        description = "Server implementation of the Avers API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "avers-server_0_0_2" = callPackage
+  "avers-server" = callPackage
     ({ mkDerivation, aeson, avers, avers-api, base, base64-bytestring
      , bytestring, bytestring-conversion, cookie, cryptohash, either
      , http-types, mtl, resource-pool, rethinkdb-client-driver, servant
@@ -32110,7 +32197,6 @@ self: {
        homepage = "http://github.com/wereHamster/avers-server";
        description = "Server implementation of the Avers API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "avl-static" = callPackage
@@ -33143,6 +33229,40 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "b9_0_5_17" = callPackage
+    ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes
+     , bytestring, conduit, conduit-extra, ConfigFile, directory
+     , filepath, free, hashable, hspec, hspec-expectations, mtl
+     , optparse-applicative, parallel, parsec, pretty, pretty-show
+     , process, QuickCheck, random, semigroups, syb, template, text
+     , time, transformers, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "b9";
+       version = "0.5.17";
+       sha256 = "5f28b7f1043cfb405c8e6b4247b9c3ef434816069ec8cf30b1a74dc530a368df";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bifunctors binary boxes bytestring conduit
+         conduit-extra ConfigFile directory filepath free hashable mtl
+         parallel parsec pretty pretty-show process QuickCheck random
+         semigroups syb template text time transformers unordered-containers
+         vector yaml
+       ];
+       executableHaskellDepends = [
+         base bytestring directory optparse-applicative
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec hspec-expectations QuickCheck
+         semigroups text unordered-containers vector yaml
+       ];
+       homepage = "https://github.com/sheyll/b9-vm-image-builder";
+       description = "A tool and library for building virtual machine images";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "babylon" = callPackage
     ({ mkDerivation, array, base, containers, random, wx, wxcore }:
      mkDerivation {
@@ -33790,7 +33910,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base-orphans" = callPackage
+  "base-orphans_0_5_0" = callPackage
     ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
      mkDerivation {
        pname = "base-orphans";
@@ -33801,6 +33921,20 @@ self: {
        homepage = "https://github.com/haskell-compat/base-orphans#readme";
        description = "Backwards-compatible orphan instances for base";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "base-orphans" = callPackage
+    ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "base-orphans";
+       version = "0.5.1";
+       sha256 = "a571bf43f54d4d576b2c9b494a722f60c624896c2f6c38365af7b87d1b31facb";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/haskell-compat/base-orphans#readme";
+       description = "Backwards-compatible orphan instances for base";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "base-prelude_0_1_6" = callPackage
@@ -35271,15 +35405,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "binary_0_8_0_1" = callPackage
+  "binary_0_8_2_0" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , directory, filepath, HUnit, QuickCheck, random, test-framework
      , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "binary";
-       version = "0.8.0.1";
-       sha256 = "85c6befa618ea1e181ab5e6ac66c07b63746b3cfcde7e69158857d7ade8ed755";
+       version = "0.8.2.0";
+       sha256 = "f4e51c13800407b31ec11b3d30699c62a2f0480a765c56939fa644cd36a4725d";
        libraryHaskellDepends = [ array base bytestring containers ];
        testHaskellDepends = [
          array base bytestring Cabal containers directory filepath HUnit
@@ -35518,6 +35652,7 @@ self: {
          aeson base binary hashable quickcheck-instances scientific tagged
          tasty tasty-quickcheck text time unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/phadej/binary-orphans#readme";
        description = "Orphan instances for binary";
        license = stdenv.lib.licenses.bsd3;
@@ -35544,6 +35679,7 @@ self: {
          semigroups tagged tasty tasty-quickcheck text time
          unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/phadej/binary-orphans#readme";
        description = "Orphan instances for binary";
        license = stdenv.lib.licenses.bsd3;
@@ -35577,7 +35713,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "binary-parser" = callPackage
+  "binary-parser_0_5_0_1" = callPackage
     ({ mkDerivation, base-prelude, bytestring, success, text
      , transformers
      }:
@@ -35591,6 +35727,23 @@ self: {
        homepage = "https://github.com/nikita-volkov/binary-parser";
        description = "A highly-efficient but limited parser API specialised for bytestrings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "binary-parser" = callPackage
+    ({ mkDerivation, base-prelude, bytestring, success, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "binary-parser";
+       version = "0.5.1";
+       sha256 = "6e068b0c0d2cce0944ec79a8ddf9ff270834166a80a46db29d7bd61fb8f35e13";
+       libraryHaskellDepends = [
+         base-prelude bytestring success text transformers
+       ];
+       homepage = "https://github.com/nikita-volkov/binary-parser";
+       description = "A highly-efficient but limited parser API specialised for bytestrings";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "binary-protocol" = callPackage
@@ -37716,6 +37869,8 @@ self: {
        pname = "blank-canvas";
        version = "0.6";
        sha256 = "2a0e5c4fc50b1ce43e56b1a11056186c21d565e225da36f90c58f8c0a70f48b3";
+       revision = "1";
+       editedCabalFile = "898e9d275a0c51fe2e9de5f60d521a622186b87fd801c9336ccbaab2b4adf5fb";
        libraryHaskellDepends = [
          aeson base base-compat base64-bytestring bytestring colour
          containers data-default-class http-types kansas-comet mime-types
@@ -39985,7 +40140,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {system-glib = pkgs.glib;};
 
-  "bustle" = callPackage
+  "bustle_0_5_3" = callPackage
     ({ mkDerivation, base, bytestring, cairo, containers, dbus
      , directory, filepath, gio, glib, gtk3, hgettext, HUnit, mtl, pango
      , parsec, pcap, process, QuickCheck, setlocale, system-glib
@@ -40013,7 +40168,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {system-glib = pkgs.glib;};
 
-  "bustle_0_5_4" = callPackage
+  "bustle" = callPackage
     ({ mkDerivation, base, bytestring, cairo, containers, dbus
      , directory, filepath, gio, glib, gtk3, hgettext, HUnit, mtl, pango
      , parsec, pcap, process, QuickCheck, setlocale, system-glib
@@ -41661,7 +41816,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
-  "cabal-install" = callPackage
+  "cabal-install_1_22_7_0" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , directory, extensible-exceptions, filepath, HTTP, HUnit, mtl
      , network, network-uri, pretty, process, QuickCheck, random
@@ -41694,6 +41849,41 @@ self: {
        homepage = "http://www.haskell.org/cabal/";
        description = "The command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
+     }) {};
+
+  "cabal-install" = callPackage
+    ({ mkDerivation, array, base, bytestring, Cabal, containers
+     , directory, extensible-exceptions, filepath, HTTP, HUnit, mtl
+     , network, network-uri, pretty, process, QuickCheck, random
+     , regex-posix, stm, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, time, unix, zlib
+     }:
+     mkDerivation {
+       pname = "cabal-install";
+       version = "1.22.8.0";
+       sha256 = "58cf197ca0751eac1e242202edc4b4a1dfe89e3b191a0eb57cb62b95d27b3b21";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array base bytestring Cabal containers directory filepath HTTP mtl
+         network network-uri pretty process random stm time unix zlib
+       ];
+       testHaskellDepends = [
+         array base bytestring Cabal containers directory
+         extensible-exceptions filepath HTTP HUnit mtl network network-uri
+         pretty process QuickCheck regex-posix stm test-framework
+         test-framework-hunit test-framework-quickcheck2 time unix zlib
+       ];
+       doCheck = false;
+       postInstall = ''
+         mkdir $out/etc
+         mv bash-completion $out/etc/bash_completion.d
+       '';
+       homepage = "http://www.haskell.org/cabal/";
+       description = "The command-line interface for Cabal and Hackage";
+       license = stdenv.lib.licenses.bsd3;
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
@@ -42965,22 +43155,21 @@ self: {
      }) {};
 
   "call-haskell-from-anything" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, msgpack, mtl
-     , template-haskell
+    ({ mkDerivation, base, bytestring, msgpack, mtl, template-haskell
+     , vector
      }:
      mkDerivation {
        pname = "call-haskell-from-anything";
-       version = "0.1.0.2";
-       sha256 = "a14b0b6bb050f7119337fae4136bbe45f12c55ce94659e088d340d7ffd245b41";
+       version = "1.0.1.0";
+       sha256 = "1a33bc1a6f4f91f434a57bab242c9d46244bf73702432cbd8de6019595f7bffc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         attoparsec base bytestring msgpack mtl template-haskell
+         base bytestring msgpack mtl template-haskell vector
        ];
        executableHaskellDepends = [ base bytestring msgpack mtl ];
-       jailbreak = true;
        homepage = "https://github.com/nh2/call-haskell-from-anything";
-       description = "Python-to-Haskell function calls";
+       description = "Call Haskell functions from other languages via serialization and dynamic libraries";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -43324,7 +43513,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cartel" = callPackage
+  "cartel_0_14_2_8" = callPackage
     ({ mkDerivation, base, directory, filepath, multiarg, QuickCheck
      , random, tasty, tasty-quickcheck, tasty-th, time, transformers
      }:
@@ -43344,6 +43533,29 @@ self: {
        homepage = "http://www.github.com/massysett/cartel";
        description = "Specify Cabal files in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "cartel" = callPackage
+    ({ mkDerivation, base, directory, filepath, multiarg, QuickCheck
+     , random, tasty, tasty-quickcheck, tasty-th, time, transformers
+     }:
+     mkDerivation {
+       pname = "cartel";
+       version = "0.16.0.0";
+       sha256 = "67594fa408d74553038b677b650863f457309d69d968b01f4dda3bdf46a8b6b3";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base directory filepath time transformers
+       ];
+       testHaskellDepends = [
+         base directory filepath multiarg QuickCheck random tasty
+         tasty-quickcheck tasty-th time transformers
+       ];
+       homepage = "http://www.github.com/massysett/cartel";
+       description = "Specify Cabal files in Haskell";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "casadi-bindings" = callPackage
@@ -43353,8 +43565,8 @@ self: {
      }:
      mkDerivation {
        pname = "casadi-bindings";
-       version = "2.4.1.7";
-       sha256 = "beb816ed9978392c3523aca99bf6f3a615e9a39bd67f090455505b21b430dba6";
+       version = "2.4.1.8";
+       sha256 = "982f4bd1b6e8f4939795daaadf456faa6ea9ffa96723e5081fbbd13a0d28bd95";
        libraryHaskellDepends = [
          base binary casadi-bindings-core casadi-bindings-internal cereal
          containers linear spatial-math vector vector-binary-instances
@@ -44762,8 +44974,8 @@ self: {
      }:
      mkDerivation {
        pname = "cgrep";
-       version = "6.5.15";
-       sha256 = "7132cba60d2352fecbc392380cfead394300819974b3d6843fba3ad49dbf64b5";
+       version = "6.6.1";
+       sha256 = "49cfd5695a20c7cdad917704e81ae6cb50e77d7db6a18f7792237bb6c4dbfc38";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -45819,7 +46031,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "circle-packing" = callPackage
+  "circle-packing_0_1_0_4" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "circle-packing";
@@ -45828,6 +46040,18 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Simple heuristic for packing discs of varying radii in a circle";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "circle-packing" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "circle-packing";
+       version = "0.1.0.5";
+       sha256 = "041ad1ce696a66f747bb4c65102387cd15b7b026a4b1462d19b341733c2f5c9f";
+       libraryHaskellDepends = [ base ];
+       description = "Simple heuristic for packing discs of varying radii in a circle";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "cirru-parser" = callPackage
@@ -46266,7 +46490,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-ghc" = callPackage
+  "clash-ghc_0_6_8" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib
      , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl
      , containers, directory, filepath, ghc, ghc-typelits-extra
@@ -46290,6 +46514,33 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "clash-ghc" = callPackage
+    ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib
+     , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl
+     , containers, directory, filepath, ghc, ghc-typelits-extra
+     , ghc-typelits-natnormalise, hashable, haskeline, lens, mtl
+     , process, text, transformers, unbound-generics, unix
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "clash-ghc";
+       version = "0.6.9";
+       sha256 = "c6f87e8c87fa30cdf58320ea1950e24b7413115febfbf26c64912863df1ebbfb";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array base bifunctors bytestring clash-lib clash-prelude
+         clash-systemverilog clash-verilog clash-vhdl containers directory
+         filepath ghc ghc-typelits-extra ghc-typelits-natnormalise hashable
+         haskeline lens mtl process text transformers unbound-generics unix
+         unordered-containers
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "clash-lib_0_5_10" = callPackage
@@ -46411,7 +46662,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-lib" = callPackage
+  "clash-lib_0_6_8" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude
      , concurrent-supply, containers, deepseq, directory, errors, fgl
      , filepath, hashable, lens, mtl, pretty, process, template-haskell
@@ -46431,6 +46682,29 @@ 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" = 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.9";
+       sha256 = "b5de3d8e2b87d7b0b9e24721cadf4fff4c5de1bbc3338556269e0978d5cceded";
+       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-prelude_0_9_2" = callPackage
@@ -46621,7 +46895,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-systemverilog" = callPackage
+  "clash-systemverilog_0_6_4" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
      , text, unordered-containers, wl-pprint-text
      }:
@@ -46636,6 +46910,24 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - SystemVerilog backend";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "clash-systemverilog" = callPackage
+    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
+     , text, unordered-containers, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-systemverilog";
+       version = "0.6.5";
+       sha256 = "687ee5931b035fdd8e1cbd45b7c1f99a7020103834afcf4fa819b6d8026e0536";
+       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 - SystemVerilog backend";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "clash-verilog_0_5_7" = callPackage
@@ -46728,7 +47020,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-verilog" = callPackage
+  "clash-verilog_0_6_4" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
      , text, unordered-containers, wl-pprint-text
      }:
@@ -46743,6 +47035,24 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - Verilog backend";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "clash-verilog" = callPackage
+    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
+     , text, unordered-containers, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-verilog";
+       version = "0.6.5";
+       sha256 = "6ddf7f1a16a9308632a5e47d7f7cbf7164f1efee1733c0ca59e6edf175d7d840";
+       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 - Verilog backend";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "clash-vhdl_0_5_8" = callPackage
@@ -46835,7 +47145,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-vhdl" = callPackage
+  "clash-vhdl_0_6_5" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
      , text, unordered-containers, wl-pprint-text
      }:
@@ -46850,6 +47160,24 @@ 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" = callPackage
+    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
+     , text, unordered-containers, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-vhdl";
+       version = "0.6.6";
+       sha256 = "14023afa8445712f4bb40a3a5bf02b44c84bb87643366b50e615cea54baff293";
+       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;
      }) {};
 
   "classify" = callPackage
@@ -51458,6 +51786,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "conduit-tokenize-attoparsec" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, conduit, hspec
+     , resourcet, text
+     }:
+     mkDerivation {
+       pname = "conduit-tokenize-attoparsec";
+       version = "0.1.0.0";
+       sha256 = "cbb8e1127c64338baba4dba836ffa1b034f4d85967fa983a334e84e56dad00af";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         attoparsec base bytestring conduit resourcet text
+       ];
+       executableHaskellDepends = [ attoparsec base conduit resourcet ];
+       testHaskellDepends = [ attoparsec base conduit hspec resourcet ];
+       homepage = "http://github.com/haskell-works/conduit-tokenize-attoparsec#readme";
+       description = "Conduits for tokenizing streams";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "conf" = callPackage
     ({ mkDerivation, base, haskell-src, HUnit, test-framework
      , test-framework-hunit, test-framework-th
@@ -52074,8 +52422,8 @@ self: {
      }:
      mkDerivation {
        pname = "container";
-       version = "1.0.1";
-       sha256 = "ba38eafffb5f9336e80d52435feb43cfa4186e6cc439e4c4499b7d5297a49432";
+       version = "1.0.2";
+       sha256 = "413ef2df4f8f99c8ba85547435d816eee87a72784e08aae49563bba112f41b79";
        libraryHaskellDepends = [
          base containers data-default data-layer functor-utils lens
          lens-utils mtl template-haskell text transformers transformers-base
@@ -52764,8 +53112,8 @@ self: {
      }:
      mkDerivation {
        pname = "convert";
-       version = "1.0";
-       sha256 = "40404a86c7dbe1766fe9fbbc0289b79c132aeff38946e177f49a0ffc7ff3c1f5";
+       version = "1.0.2";
+       sha256 = "388502eb341523d153276e510815c5b2d1fa83c125c5da6b19844bb084149e6f";
        libraryHaskellDepends = [
          base bytestring containers either lens mtl old-locale old-time
          template-haskell text time
@@ -56243,7 +56591,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "darcs" = callPackage
+  "darcs_2_10_2" = callPackage
     ({ mkDerivation, array, attoparsec, base, base16-bytestring, binary
      , bytestring, cmdargs, containers, cryptohash, curl, data-ordlist
      , directory, filepath, FindBin, hashable, haskeline, html, HTTP
@@ -56287,6 +56635,51 @@ self: {
        homepage = "http://darcs.net/";
        description = "a distributed, interactive, smart revision control system";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) curl;};
+
+  "darcs" = callPackage
+    ({ mkDerivation, array, attoparsec, base, base16-bytestring, binary
+     , bytestring, cmdargs, containers, cryptohash, curl, data-ordlist
+     , directory, filepath, FindBin, hashable, haskeline, html, HTTP
+     , HUnit, mmap, mtl, network, network-uri, old-time, parsec, process
+     , QuickCheck, random, regex-applicative, regex-compat-tdfa, sandi
+     , shelly, split, tar, terminfo, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, time
+     , transformers, transformers-compat, unix, unix-compat, utf8-string
+     , vector, zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "darcs";
+       version = "2.10.3";
+       sha256 = "ca00c40d08276f94868c7c1bbc6dbd9b6b41a15c1907c34947aaa51d4dbbf642";
+       configureFlags = [ "-fforce-char8-encoding" "-flibrary" ];
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array attoparsec base base16-bytestring binary bytestring
+         containers cryptohash data-ordlist directory filepath hashable
+         haskeline html HTTP mmap mtl network network-uri old-time parsec
+         process random regex-applicative regex-compat-tdfa sandi tar
+         terminfo text time transformers transformers-compat unix
+         unix-compat utf8-string vector zip-archive zlib
+       ];
+       librarySystemDepends = [ curl ];
+       executableHaskellDepends = [ base filepath regex-compat-tdfa ];
+       testHaskellDepends = [
+         array base binary bytestring cmdargs containers cryptohash
+         directory filepath FindBin html HUnit mmap mtl parsec process
+         QuickCheck regex-compat-tdfa sandi shelly split test-framework
+         test-framework-hunit test-framework-quickcheck2 text unix-compat
+         zip-archive zlib
+       ];
+       postInstall = ''
+         mkdir -p $out/etc/bash_completion.d
+         mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
+       '';
+       homepage = "http://darcs.net/";
+       description = "a distributed, interactive, smart revision control system";
+       license = "GPL";
      }) {inherit (pkgs) curl;};
 
   "darcs-benchmark" = callPackage
@@ -56767,6 +57160,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-base" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "data-base";
+       version = "1.1";
+       sha256 = "1d85ee03627495104cd73e8f4fc2459f3ff2e873a46cbd0db9708c6168ae25d1";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/wdanilo/data-base";
+       description = "Utilities for accessing and comparing types based on so called bases - representations with limited polymorphism";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "data-binary-ieee754" = callPackage
     ({ mkDerivation, base, binary }:
      mkDerivation {
@@ -56868,8 +57273,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "data-construction";
-       version = "1.0";
-       sha256 = "8a0e678fabcadbe0aaec1058e4cc7d4632633646c30bc6851c6835db37d19169";
+       version = "1.1";
+       sha256 = "e8e55864def9f07c65137535d4494b694203e724e450494f89b502751d92b341";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/wdanilo/data-construction";
        description = "Data construction abstractions including Constructor, Destructor, Maker, Destroyer, Producer and Consumer";
@@ -57274,6 +57679,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "data-json-token" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "data-json-token";
+       version = "0.1.0.0";
+       sha256 = "c58910c76fe08d082f174e7a6e8f04388e9e1bf9326ec4f4dd69908ce6ecfe2d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [ base ];
+       homepage = "http://github.com/haskell-works/data-json-token#readme";
+       description = "Json Token datatype";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "data-kiln" = callPackage
     ({ mkDerivation, base, containers, data-fix, IfElse, mtl
      , transformers
@@ -57292,12 +57713,12 @@ self: {
      }) {};
 
   "data-layer" = callPackage
-    ({ mkDerivation, base, data-construction, lens }:
+    ({ mkDerivation, base, convert, data-construction, lens }:
      mkDerivation {
        pname = "data-layer";
-       version = "1.0.3";
-       sha256 = "c8a19fd9c87b755957dfa092620e9c26395da12a1dfb2b06ba2fcc8df5438327";
-       libraryHaskellDepends = [ base data-construction lens ];
+       version = "1.0.4";
+       sha256 = "3c11be8dc0da7f4cb080023e2d0ae9f58ad202e193c6f1aea015b7b7873a936d";
+       libraryHaskellDepends = [ base convert data-construction lens ];
        homepage = "https://github.com/wdanilo/layer";
        description = "Data layering utilities. Layer is a data-type which wrapps other one, but keeping additional information. If you want to access content of simple newtype object, use Lens.Wrapper instead.";
        license = stdenv.lib.licenses.asl20;
@@ -57648,6 +58069,18 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "data-result" = callPackage
+    ({ mkDerivation, base, poly-control, prologue }:
+     mkDerivation {
+       pname = "data-result";
+       version = "1.0";
+       sha256 = "b266c0184e55ed2fe7af03cf837a2666c6c3265b5de9d5f7416926f981bf0605";
+       libraryHaskellDepends = [ base poly-control prologue ];
+       homepage = "https://github.com/wdanilo/data-result";
+       description = "Data types for returning results distinguishable by types";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "data-rev" = callPackage
     ({ mkDerivation, base, bytestring, containers, text, vector }:
      mkDerivation {
@@ -59529,6 +59962,18 @@ self: {
        license = "unknown";
      }) {};
 
+  "dependent-state" = callPackage
+    ({ mkDerivation, base, lens, mtl, prologue }:
+     mkDerivation {
+       pname = "dependent-state";
+       version = "1.0.1";
+       sha256 = "093aa20845a345c1d44e3d0258eadd6f8c38e3596cd6486be64879d0b60e7467";
+       libraryHaskellDepends = [ base lens mtl prologue ];
+       homepage = "https://github.com/wdanilo/dependent-state";
+       description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types.";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "dependent-sum_0_2_1_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -62876,7 +63321,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "direct-sqlite" = callPackage
+  "direct-sqlite_2_3_16" = callPackage
     ({ mkDerivation, base, base16-bytestring, bytestring, directory
      , HUnit, text
      }:
@@ -62892,6 +63337,24 @@ self: {
        homepage = "https://github.com/IreneKnapp/direct-sqlite";
        description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "direct-sqlite" = callPackage
+    ({ mkDerivation, base, base16-bytestring, bytestring, directory
+     , HUnit, temporary, text
+     }:
+     mkDerivation {
+       pname = "direct-sqlite";
+       version = "2.3.17";
+       sha256 = "fade7c52d157cf145380a4818fa2e03163fa104fadf43d580c1d475b6b6fffc4";
+       libraryHaskellDepends = [ base bytestring text ];
+       testHaskellDepends = [
+         base base16-bytestring bytestring directory HUnit temporary text
+       ];
+       homepage = "https://github.com/IreneKnapp/direct-sqlite";
+       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "directed-cubical" = callPackage
@@ -65344,6 +65807,29 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "dresdner-verkehrsbetriebe" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, HTTP, old-locale
+     , optparse-applicative, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "dresdner-verkehrsbetriebe";
+       version = "0.1.1";
+       sha256 = "380af7c7a9181b3d8b3a9e1bce271a71071781d3055a669b31492217f6c8babf";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring HTTP old-locale time unordered-containers
+         vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring HTTP old-locale optparse-applicative time
+         unordered-containers vector
+       ];
+       jailbreak = true;
+       description = "Library and program for querying DVB (Dresdner Verkehrsbetriebe AG)";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "drifter" = callPackage
     ({ mkDerivation, base, containers, fgl, tasty, tasty-hunit
      , tasty-quickcheck, text
@@ -67456,6 +67942,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "elision" = callPackage
+    ({ mkDerivation, base, profunctors }:
+     mkDerivation {
+       pname = "elision";
+       version = "0.1.2.0";
+       sha256 = "2730a52a00c063e3386b0cca50905f3676a740c97aec8149d56e0def29d583e0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base profunctors ];
+       executableHaskellDepends = [ base ];
+       homepage = "http://github.com/crough/elision#readme";
+       description = "Arrows with holes";
+       license = stdenv.lib.licenses.bsd2;
+     }) {};
+
   "elm-bridge_0_1_0_0" = callPackage
     ({ mkDerivation, base, hspec, template-haskell }:
      mkDerivation {
@@ -69607,7 +70108,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ether" = callPackage
+  "ether_0_3_1_1" = callPackage
     ({ mkDerivation, base, mmorph, monad-control, mtl, newtype-generics
      , QuickCheck, tasty, tasty-quickcheck, template-haskell
      , transformers, transformers-base, transformers-lift
@@ -69626,6 +70127,28 @@ self: {
        homepage = "https://int-index.github.io/ether/";
        description = "Monad transformers and classes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "ether" = callPackage
+    ({ mkDerivation, base, exceptions, mmorph, monad-control, mtl
+     , QuickCheck, tasty, tasty-quickcheck, template-haskell
+     , transformers, transformers-base, transformers-lift
+     }:
+     mkDerivation {
+       pname = "ether";
+       version = "0.4.0.0";
+       sha256 = "19470d47313c0fe2984010871c8d13398b9c13d4cdc799b9bd0e431bc9714d6e";
+       libraryHaskellDepends = [
+         base exceptions mmorph monad-control mtl template-haskell
+         transformers transformers-base transformers-lift
+       ];
+       testHaskellDepends = [
+         base mtl QuickCheck tasty tasty-quickcheck transformers
+       ];
+       homepage = "https://int-index.github.io/ether/";
+       description = "Monad transformers and classes";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "ethereum-client-haskell" = callPackage
@@ -69868,8 +70391,8 @@ self: {
      }:
      mkDerivation {
        pname = "event-list";
-       version = "0.1.1.2";
-       sha256 = "eb630b4a2cd295863a8d9f3f21904e012504cd4ebdb44453dea6a69dc7216cdb";
+       version = "0.1.1.3";
+       sha256 = "f58250c839eab441221fdfcc82795f4a4bddd397cd08dc02729ebe3bb05e8416";
        libraryHaskellDepends = [
          base non-negative QuickCheck transformers utility-ht
        ];
@@ -70471,6 +70994,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "existential" = callPackage
+    ({ mkDerivation, base, lens, QuickCheck, template-haskell }:
+     mkDerivation {
+       pname = "existential";
+       version = "0.1.0.0";
+       sha256 = "1aea3b930ba0343fb9f3d8bef2d96dde79b9fb353ce80b6a93c9d99599c6b46a";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base lens QuickCheck template-haskell ];
+       executableHaskellDepends = [ base lens ];
+       homepage = "https://bitbucket.org/cipher2048/existential/wiki/Home";
+       description = "A library for existential types";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "exists" = callPackage
     ({ mkDerivation, base, contravariant }:
      mkDerivation {
@@ -71495,7 +72033,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "fasta" = callPackage
+  "fasta_0_10_1_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, foldl
      , lens, parsec, pipes, pipes-attoparsec, pipes-bytestring
      , pipes-group, pipes-text, split, text
@@ -71511,6 +72049,25 @@ self: {
        homepage = "https://github.com/GregorySchwartz/fasta";
        description = "A simple, mindless parser for fasta files";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "fasta" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, foldl
+     , lens, parsec, pipes, pipes-attoparsec, pipes-bytestring
+     , pipes-group, pipes-text, split, text
+     }:
+     mkDerivation {
+       pname = "fasta";
+       version = "0.10.2.0";
+       sha256 = "da98cdcb501840341b34d354dae5063f1574d60fb48469b9d070631970fe4f50";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers foldl lens parsec pipes
+         pipes-attoparsec pipes-bytestring pipes-group pipes-text split text
+       ];
+       homepage = "https://github.com/GregorySchwartz/fasta";
+       description = "A simple, mindless parser for fasta files";
+       license = stdenv.lib.licenses.gpl2;
      }) {};
 
   "fastbayes" = callPackage
@@ -74937,24 +75494,39 @@ self: {
 
   "fltkhs" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, directory, filepath, mtl
-     , parsec, process
+     , parsec
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.4.0.0";
-       sha256 = "7e975cca6e57dc947abdc776a90fb94cee9f30fc8a0f395570c9665d23e53644";
+       version = "0.4.0.2";
+       sha256 = "0ce62c0325a1ec7a9c782b0ead40cdfb3c60cc5f98c13f61f72e329214c06d17";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
        libraryToolDepends = [ c2hs ];
-       executableHaskellDepends = [
-         base bytestring directory filepath mtl parsec process
-       ];
+       executableHaskellDepends = [ base directory filepath mtl parsec ];
        homepage = "http://github.com/deech/fltkhs";
        description = "FLTK bindings";
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "fltkhs-demos" = callPackage
+    ({ mkDerivation, base, bytestring, directory, fltkhs, process, stm
+     }:
+     mkDerivation {
+       pname = "fltkhs-demos";
+       version = "0.0.0.3";
+       sha256 = "c39a9c8378857e4f4c7af7ab98516bb3deffce1e39742eb7f39ce4cf09c1f1b7";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bytestring directory fltkhs process stm
+       ];
+       homepage = "http://github.com/deech/fltkhs-demos";
+       description = "FLTKHS demos. Please scroll to the bottom for more information.";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "fltkhs-fluid-examples" = callPackage
     ({ mkDerivation, base, bytestring, fltkhs }:
      mkDerivation {
@@ -76991,6 +77563,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "frown" = callPackage
+    ({ mkDerivation, base, directory }:
+     mkDerivation {
+       pname = "frown";
+       version = "0.6.2";
+       sha256 = "549b372590e98b4d182310948db8053b32465ce96d78ea8d8953494252c242d7";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base directory ];
+       description = "LALR(k) parser generator";
+       license = "GPL";
+     }) {};
+
   "frp-arduino" = callPackage
     ({ mkDerivation, base, containers, mtl }:
      mkDerivation {
@@ -77554,12 +78139,12 @@ self: {
      }) {};
 
   "functor-utils" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "functor-utils";
-       version = "1.0";
-       sha256 = "b7c38d1051bfaaebc564df205757bbc8d418e8b350fee711c51c44e5c7ebd4f6";
-       libraryHaskellDepends = [ base ];
+       version = "1.1";
+       sha256 = "a054cbd84686777774b9e2c36c1b5ceaf8ca415a9755e922ff52137eb9ac36ba";
+       libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/wdanilo/functor-utils";
        description = "Collection of functor utilities, providing handy operators, like generalization of (.).";
        license = stdenv.lib.licenses.asl20;
@@ -78313,14 +78898,16 @@ self: {
      }) {};
 
   "generic-accessors" = callPackage
-    ({ mkDerivation, base, HUnit, lens, linear, QuickCheck
-     , spatial-math, test-framework, test-framework-hunit
+    ({ mkDerivation, base, binary, cereal, HUnit, lens, linear
+     , QuickCheck, spatial-math, test-framework, test-framework-hunit
      }:
      mkDerivation {
        pname = "generic-accessors";
-       version = "0.5.1.0";
-       sha256 = "547a5b0ba3fac1e2d5f7de7f7248aef2b128b24714f4c0908b5191ebe5d39442";
-       libraryHaskellDepends = [ base lens linear spatial-math ];
+       version = "0.6.0.0";
+       sha256 = "78f8b96b5633f6f2953e6cda0d236da987743d990d7d9facd254fe10d41fc504";
+       libraryHaskellDepends = [
+         base binary cereal lens linear spatial-math
+       ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
        ];
@@ -78509,7 +79096,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "generic-deriving" = callPackage
+  "generic-deriving_1_9_0" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "generic-deriving";
@@ -78523,9 +79110,10 @@ self: {
        homepage = "https://github.com/dreixel/generic-deriving";
        description = "Generic programming library for generalised deriving";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "generic-deriving_1_10_0" = callPackage
+  "generic-deriving" = callPackage
     ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "generic-deriving";
@@ -78537,7 +79125,6 @@ self: {
        homepage = "https://github.com/dreixel/generic-deriving";
        description = "Generic programming library for generalised deriving";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-lucid-scaffold" = callPackage
@@ -80491,8 +81078,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-atk";
-       version = "0.2.18.10";
-       sha256 = "e56f898c789959b310bd1fcdf9065155751c56ab5065fbf3adbac31ed542f14d";
+       version = "0.2.18.12";
+       sha256 = "00f4542fb4da78adbf0a84f5c81f386e645bc82a811d44b32e031df7721fae66";
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi-base text
          transformers
@@ -80509,8 +81096,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-cairo";
-       version = "0.1.14.11";
-       sha256 = "d5662b5f971eb756b57c6cf3699b40ee7489a91cf64ad73074514e2f7a1329b9";
+       version = "0.1.14.12";
+       sha256 = "8d023a70208100d4d8f634bbe408d2f956f3afe8f73dce3411747d753974b173";
        libraryHaskellDepends = [
          base bytestring containers haskell-gi-base text transformers
        ];
@@ -80528,8 +81115,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gdk";
-       version = "0.3.18.10";
-       sha256 = "54c7eeb7d06fe03079aade5c415bb64753269add6195348c35c7dcdcb6ef018e";
+       version = "0.3.18.12";
+       sha256 = "9cde9b8e62af1123c134d576c634846514b5e7f9561d5cc0692a68ad64306190";
        libraryHaskellDepends = [
          base bytestring containers gi-cairo gi-gdkpixbuf gi-gio gi-glib
          gi-gobject gi-pango haskell-gi-base text transformers
@@ -80547,8 +81134,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gdkpixbuf";
-       version = "0.2.32.10";
-       sha256 = "b174113ae61ede2035eaf67380edbd6a93270a6c5c9ac3dbc2633b102eca6d29";
+       version = "0.2.32.12";
+       sha256 = "0b3b3188250602969b06520b82ba3b1a4df52bc303c6a16ec22495b4f3b356e6";
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject
          haskell-gi-base text transformers
@@ -80565,8 +81152,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gio";
-       version = "0.2.46.10";
-       sha256 = "c37256afbbbf492c43ceef81c1fcb3be12ae165316a7576cb4054d10ccdeb6a0";
+       version = "0.2.46.12";
+       sha256 = "c200b349cb53e9d52f2592c714a39734f45129c0d94a5a21815630e66e993d1f";
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi-base text
          transformers
@@ -80577,14 +81164,33 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs) glib;};
 
+  "gi-girepository" = callPackage
+    ({ mkDerivation, base, bytestring, containers, gi-gobject
+     , gobjectIntrospection, haskell-gi-base, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-girepository";
+       version = "0.1.44.12";
+       sha256 = "c7f53dee512511df7a4c8f00d2e5ae37ae52f49859efd83afef77e9c3f71fd80";
+       libraryHaskellDepends = [
+         base bytestring containers gi-gobject haskell-gi-base text
+         transformers
+       ];
+       libraryPkgconfigDepends = [ gobjectIntrospection ];
+       jailbreak = true;
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "GIRepository bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {inherit (pkgs) gobjectIntrospection;};
+
   "gi-glib" = callPackage
     ({ mkDerivation, base, bytestring, containers, glib
      , haskell-gi-base, text, transformers
      }:
      mkDerivation {
        pname = "gi-glib";
-       version = "0.2.46.10";
-       sha256 = "4a36df320fce4e7543cb9bd8ffb50a94c3b0a1ef738c69a376080312612ed7f7";
+       version = "0.2.46.12";
+       sha256 = "5b0bff30b5a1a4cc3f5f55437d357917153e3e6f51f506593543e9e13a103d1b";
        libraryHaskellDepends = [
          base bytestring containers haskell-gi-base text transformers
        ];
@@ -80600,8 +81206,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gobject";
-       version = "0.2.46.10";
-       sha256 = "0378e905abf11d90d13eb3bb645a2877d8f0885e158bb98758ba5a77a041c2bc";
+       version = "0.2.46.12";
+       sha256 = "990287820c8e0855249d6e5a41ec0ae3d6beaa6594c44d156316670477b508dc";
        libraryHaskellDepends = [
          base bytestring containers gi-glib haskell-gi-base text
          transformers
@@ -80619,8 +81225,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-gtk";
-       version = "0.3.18.10";
-       sha256 = "ad4879b4a216722ac53dc7f71afa64e338e65440a9fecf3179f3f6d431b81458";
+       version = "0.3.18.12";
+       sha256 = "f1bdacb55a80b26ee36f5f1fea6cfdb9f7505429432797389b0bd1b4c22f40f3";
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
          gi-gio gi-glib gi-gobject gi-pango haskell-gi-base text
@@ -80639,8 +81245,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-javascriptcore";
-       version = "0.2.10.10";
-       sha256 = "9bea9cfb0554d92c4320e04be53100cea142baec034be29306a80ce7037e9cb7";
+       version = "0.2.10.12";
+       sha256 = "e078b90cf16904c7e93e9f6d4274ae2f847597f03137a4ecbb2808a33ec8ad18";
        libraryHaskellDepends = [
          base bytestring containers haskell-gi-base text transformers
        ];
@@ -80658,8 +81264,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-notify";
-       version = "0.2.32.10";
-       sha256 = "c338d32b953fdf73ffb41b959c7c7b2834c40b29f644da77c0c67f9c53aa8f50";
+       version = "0.2.32.12";
+       sha256 = "fff3910ced837a9bafbc39d3965a06c925976c9c7853286d1234a671e90f5a49";
        libraryHaskellDepends = [
          base bytestring containers gi-gdkpixbuf gi-glib gi-gobject
          haskell-gi-base text transformers
@@ -80676,8 +81282,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-pango";
-       version = "0.1.38.10";
-       sha256 = "05b759c4ecd61dfbd16d62e91541905aecd00b84761931911a88b484630cd6cd";
+       version = "0.1.38.12";
+       sha256 = "dd542ea85468b8c6188f02e4ec546dc18ad57f498ad0775714edd040cffbe016";
        libraryHaskellDepends = [
          base bytestring containers gi-glib gi-gobject haskell-gi-base text
          transformers
@@ -80688,14 +81294,32 @@ self: {
        license = stdenv.lib.licenses.lgpl21;
      }) {inherit (pkgs.gnome) pango;};
 
+  "gi-poppler" = callPackage
+    ({ mkDerivation, base, bytestring, containers, gi-cairo, gi-gio
+     , gi-glib, gi-gobject, haskell-gi-base, poppler, text, transformers
+     }:
+     mkDerivation {
+       pname = "gi-poppler";
+       version = "0.0.34.12";
+       sha256 = "b4f6222d6912232b172481c9cdff2bf94a3e8c88753b5a2549e59e18810aa670";
+       libraryHaskellDepends = [
+         base bytestring containers gi-cairo gi-gio gi-glib gi-gobject
+         haskell-gi-base text transformers
+       ];
+       libraryPkgconfigDepends = [ poppler ];
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "Poppler bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {inherit (pkgs) poppler;};
+
   "gi-soup" = callPackage
     ({ mkDerivation, base, bytestring, containers, gi-gio, gi-glib
      , gi-gobject, haskell-gi-base, libsoup, text, transformers
      }:
      mkDerivation {
        pname = "gi-soup";
-       version = "0.2.52.10";
-       sha256 = "7b680363b582d69a12d4c7da469530b821db2905bcad0c968f668b32edd663de";
+       version = "0.2.52.12";
+       sha256 = "ca5e1f931dba96aa9006cec559316b308f14d427afefbbb221e7a154df755a6d";
        libraryHaskellDepends = [
          base bytestring containers gi-gio gi-glib gi-gobject
          haskell-gi-base text transformers
@@ -80714,8 +81338,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-vte";
-       version = "0.0.42.10";
-       sha256 = "7ac367fb334d70eb852631ad12458682528c0080bd9592fd97377e8c865179ed";
+       version = "0.0.42.12";
+       sha256 = "15e2828c0fefd118e4fd4e3081a99af7b85f7615e5298db86b7f2a01bac2bc88";
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-gdk gi-gio gi-glib gi-gobject
          gi-gtk gi-pango haskell-gi-base text transformers
@@ -80735,8 +81359,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit";
-       version = "0.2.4.11";
-       sha256 = "021835a251b1e9ddd2bf2910e0d3c17b4d6b940e9376a7000429f86a925a4013";
+       version = "0.2.4.12";
+       sha256 = "3b0cddc3f28d6acd4583224b72c289d3f7239302f4b8d01d79b8e98f8786fc08";
        libraryHaskellDepends = [
          base bytestring containers gi-atk gi-cairo gi-gdk gi-gdkpixbuf
          gi-gio gi-glib gi-gobject gi-gtk gi-javascriptcore gi-soup
@@ -80757,8 +81381,8 @@ self: {
      }:
      mkDerivation {
        pname = "gi-webkit2";
-       version = "0.2.10.10";
-       sha256 = "03c8a0ba73dd1d1b942dd87d57560a8e7a50ec6684a32b07423aaf731feb9075";
+       version = "0.2.10.12";
+       sha256 = "71872b4690056320f20ddc4a468f04b525e29bef06137963ca8406da72e2056a";
        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
@@ -80771,6 +81395,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {webkit2gtk = null;};
 
+  "gi-webkit2webextension" = callPackage
+    ({ mkDerivation, base, bytestring, containers, gi-gobject, gi-gtk
+     , gi-javascriptcore, gi-soup, haskell-gi-base, text, transformers
+     , webkit2gtk-web-extension
+     }:
+     mkDerivation {
+       pname = "gi-webkit2webextension";
+       version = "0.2.10.12";
+       sha256 = "1ca70e16d94719c5a6fc97e198c50ee5d5bb0edb8e956b4f89387fd793530ff2";
+       libraryHaskellDepends = [
+         base bytestring containers gi-gobject gi-gtk gi-javascriptcore
+         gi-soup haskell-gi-base text transformers
+       ];
+       libraryPkgconfigDepends = [ webkit2gtk-web-extension ];
+       homepage = "https://github.com/haskell-gi/haskell-gi";
+       description = "WebKit2WebExtension bindings";
+       license = stdenv.lib.licenses.lgpl21;
+     }) {webkit2gtk-web-extension = null;};
+
   "gimlh" = callPackage
     ({ mkDerivation, base, split }:
      mkDerivation {
@@ -81638,6 +82281,37 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "github_0_14_1" = callPackage
+    ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat
+     , base16-bytestring, binary, binary-orphans, byteable, bytestring
+     , containers, cryptohash, deepseq, deepseq-generics, exceptions
+     , file-embed, hashable, hspec, http-client, http-client-tls
+     , http-link-header, http-types, iso8601-time, mtl, network-uri
+     , semigroups, text, time, transformers, transformers-compat
+     , unordered-containers, vector, vector-instances
+     }:
+     mkDerivation {
+       pname = "github";
+       version = "0.14.1";
+       sha256 = "fcd5f8957855e4a110db2dc411916309fd7afb7105534ebe378a5698f409fa7d";
+       libraryHaskellDepends = [
+         aeson aeson-compat attoparsec base base-compat base16-bytestring
+         binary binary-orphans byteable bytestring containers cryptohash
+         deepseq deepseq-generics exceptions hashable http-client
+         http-client-tls http-link-header http-types iso8601-time mtl
+         network-uri semigroups text time transformers transformers-compat
+         unordered-containers vector vector-instances
+       ];
+       testHaskellDepends = [
+         aeson-compat base base-compat file-embed hspec unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/phadej/github";
+       description = "Access to the GitHub API, v3";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "github-backup" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory
      , exceptions, filepath, git, github, hslogger, IfElse, MissingH
@@ -84739,6 +85413,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "gore-and-ash-async" = callPackage
+    ({ mkDerivation, async, base, containers, deepseq, exceptions
+     , gore-and-ash, hashable, HUnit, mtl, test-framework
+     , test-framework-hunit, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "gore-and-ash-async";
+       version = "1.0.0.0";
+       sha256 = "3e9ed4259af38831eebfd1f2084567c9bac9c9cb5b45636b82914faec0e1e1fc";
+       libraryHaskellDepends = [
+         async base containers deepseq exceptions gore-and-ash hashable mtl
+         transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base containers deepseq exceptions gore-and-ash HUnit mtl
+         test-framework test-framework-hunit transformers
+       ];
+       homepage = "https://github.com/TeaspotStudio/gore-and-ash-async#readme";
+       description = "Core module for Gore&Ash engine that embeds async IO actions into game loop";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gore-and-ash-demo" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, deepseq
      , exception-transformers, exceptions, GLFW-b, gore-and-ash
@@ -87672,7 +88368,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hOpenPGP" = callPackage
+  "hOpenPGP_2_4_1" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib
      , conduit, conduit-extra, containers, crypto-cipher-types
@@ -87713,6 +88409,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.4.2";
+       sha256 = "dc8472877d202c65f206f937801499cd904d65110414ba5522c5ac1a168aadb8";
+       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
@@ -90503,8 +91240,8 @@ self: {
      }:
      mkDerivation {
        pname = "haphviz";
-       version = "0.1.1.5";
-       sha256 = "f838c308bd3f82ba0766078e1aac0d6593e0eac63403beb6453c77fee36c7929";
+       version = "0.1.2.0";
+       sha256 = "d7dcb9cc3c345a3886206fc2c50ce375fbafea5c44124602a6124d144d172f8e";
        libraryHaskellDepends = [ base mtl text ];
        testHaskellDepends = [
          base checkers hspec QuickCheck quickcheck-text text
@@ -91197,7 +91934,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "happstack-server" = callPackage
+  "happstack-server_7_4_5" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring
      , containers, directory, exceptions, extensible-exceptions
      , filepath, hslogger, html, HUnit, monad-control, mtl, network
@@ -91224,6 +91961,36 @@ self: {
        homepage = "http://happstack.com";
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "happstack-server" = callPackage
+    ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring
+     , containers, directory, exceptions, extensible-exceptions
+     , filepath, hslogger, html, HUnit, monad-control, mtl, network
+     , network-uri, old-locale, parsec, process, sendfile, syb
+     , system-filepath, template-haskell, text, threads, time
+     , time-compat, transformers, transformers-base, transformers-compat
+     , unix, utf8-string, xhtml, zlib
+     }:
+     mkDerivation {
+       pname = "happstack-server";
+       version = "7.4.6";
+       sha256 = "8647b5f59de1b8c4d9788fff164ef6584e0f07b53bdcad06642e551eb357565c";
+       libraryHaskellDepends = [
+         base base64-bytestring blaze-html bytestring containers directory
+         exceptions extensible-exceptions filepath hslogger html
+         monad-control mtl network network-uri old-locale parsec process
+         sendfile syb system-filepath template-haskell text threads time
+         time-compat transformers transformers-base transformers-compat unix
+         utf8-string xhtml zlib
+       ];
+       testHaskellDepends = [
+         base bytestring containers HUnit parsec zlib
+       ];
+       homepage = "http://happstack.com";
+       description = "Web related tools and services";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "happstack-server-tls" = callPackage
@@ -92695,8 +93462,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-gi";
-       version = "0.11";
-       sha256 = "b3843bc0375160280a24bf4f55b9d2c5a581dd3639e7fe7fa6c846831c04ef2b";
+       version = "0.12";
+       sha256 = "6d9f041a551dec6d557fa51a59fb7cbb01abbda82f5768146a9fd9b1b954b154";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -92705,7 +93472,6 @@ self: {
          xdg-basedir xml-conduit
        ];
        executablePkgconfigDepends = [ glib gobjectIntrospection ];
-       jailbreak = true;
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Generate Haskell bindings for GObject Introspection capable libraries";
        license = stdenv.lib.licenses.lgpl21;
@@ -92717,8 +93483,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskell-gi-base";
-       version = "0.11";
-       sha256 = "b25c07cb1c4d40a4a2bedd38d0a91633f360dde4ab4b34c7011a281f79a7f880";
+       version = "0.12";
+       sha256 = "3f6fc64b2c878ebc1856f917fccb18dd6c990bd115019b851c96f121442ec8f7";
        libraryHaskellDepends = [
          base bytestring containers text transformers
        ];
@@ -92787,6 +93553,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "haskell-mpfr" = callPackage
+    ({ mkDerivation, base, ghc-prim, integer-gmp }:
+     mkDerivation {
+       pname = "haskell-mpfr";
+       version = "0.1";
+       sha256 = "9bd1ddbdff533479d69fb5a94a018aea93a5578c2be70446595f87f6b41172ad";
+       libraryHaskellDepends = [ base ghc-prim integer-gmp ];
+       jailbreak = true;
+       homepage = "http://github.com/comius/haskell-mpfr";
+       description = "Correctly-rounded arbitrary-precision floating-point arithmetic";
+       license = "LGPL";
+     }) {};
+
   "haskell-mpi" = callPackage
     ({ mkDerivation, array, base, bytestring, c2hs, cereal
      , extensible-exceptions, open-pal, open-rte, openmpi
@@ -94987,7 +95766,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hasql" = callPackage
+  "hasql_0_19_3_3" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
      , contravariant, contravariant-extras, data-default-class, dlist
      , either, hashable, hashtables, loch-th, mtl, placeholders
@@ -95017,9 +95796,10 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql";
        description = "A very efficient PostgreSQL driver and a flexible mapping API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hasql_0_19_4" = callPackage
+  "hasql" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
      , contravariant, contravariant-extras, data-default-class, dlist
      , either, hashable, hashtables, loch-th, mtl, placeholders
@@ -95030,8 +95810,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql";
-       version = "0.19.4";
-       sha256 = "392d4fd66779940d072356621037bb75be2383ec2d1e781cf18e9dafa06764ae";
+       version = "0.19.6";
+       sha256 = "88f1fe05e48640d133317513c270667c9e745eb9d71d94a9db582ee71b59934c";
        libraryHaskellDepends = [
          aeson attoparsec base base-prelude bytestring contravariant
          contravariant-extras data-default-class dlist either hashable
@@ -95045,10 +95825,10 @@ self: {
          quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
          tasty-smallcheck text time transformers uuid vector
        ];
+       doCheck = false;
        homepage = "https://github.com/nikita-volkov/hasql";
        description = "A very efficient PostgreSQL driver and a flexible mapping API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-backend_0_2_1" = callPackage
@@ -95649,8 +96429,8 @@ self: {
      }:
      mkDerivation {
        pname = "haste-compiler";
-       version = "0.5.3";
-       sha256 = "20e955b97d731aafc404bb1560d47050944530c655acd7eb80e1d4a8468dfcc7";
+       version = "0.5.4";
+       sha256 = "4018bf4abf3ece8ee577ae5983cac0b016ae96098c704aeecd9698365c3a021e";
        configureFlags = [ "-fportable" ];
        isLibrary = true;
        isExecutable = true;
@@ -96292,10 +97072,13 @@ self: {
        pname = "hblock";
        version = "0.1.0.2";
        sha256 = "7bf0dc5ef70b033464462e741d5cb8c5b1f6c91436dee178bd4c8e1c0591103d";
+       revision = "1";
+       editedCabalFile = "0182ceac5536afe15ee507e30953ff97f890facf3f15f2766f74f6312036eca6";
        libraryHaskellDepends = [
          aeson base blaze-markup bytestring cereal containers deepseq
          hashable path-pieces safecopy text unordered-containers uuid vector
        ];
+       jailbreak = true;
        description = "A mutable vector that provides indexation on the datatype fields it stores";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100523,6 +101306,30 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hleap" = callPackage
+    ({ mkDerivation, aeson, base, containers, data-default, mtl, text
+     , unordered-containers, websockets
+     }:
+     mkDerivation {
+       pname = "hleap";
+       version = "0.1.2.6";
+       sha256 = "5a0612ff7a1f111ced1cff7b039b33d74909acede53053d702c0311abfd4389b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base containers data-default mtl text unordered-containers
+         websockets
+       ];
+       executableHaskellDepends = [
+         aeson base containers data-default mtl text unordered-containers
+         websockets
+       ];
+       jailbreak = true;
+       homepage = "https://bitbucket.org/bwbush/hleap";
+       description = "Web Socket interface to Leap Motion controller";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hledger_0_23_3" = callPackage
     ({ mkDerivation, base, cmdargs, containers, csv, directory
      , filepath, haskeline, hledger-lib, HUnit, mtl, old-locale
@@ -101373,7 +102180,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hlint" = callPackage
+  "hlint_1_9_26" = callPackage
     ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
      , directory, extra, filepath, haskell-src-exts, hscolour, process
      , refact, transformers, uniplate
@@ -101393,6 +102200,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.27";
+       sha256 = "3e467fdd5ce0283f4513055230ef2ea3672a2b33469d8c73780ed240f23cdf6d";
+       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
@@ -104994,7 +105824,7 @@ self: {
        description = "A cryptohash-inspired library for blake2";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {b2 = null;};
+     }) {inherit (pkgs) b2;};
 
   "hs-captcha" = callPackage
     ({ mkDerivation, base, bytestring, gd, random }:
@@ -106333,8 +107163,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.1.5.4";
-       sha256 = "77f92b6fbcf70904e51c843262ab2b40d3cd2b463d57f8583463b4414e3c42b1";
+       version = "0.1.5.5";
+       sha256 = "48422c732a18cd212d12c269dce834d4c781886573c190100fe9682394305db2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -111253,7 +112083,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "http-media" = callPackage
+  "http-media_0_6_2" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , QuickCheck, test-framework, test-framework-quickcheck2
      }:
@@ -111272,6 +112102,28 @@ self: {
        homepage = "https://github.com/zmthy/http-media";
        description = "Processing HTTP Content-Type and Accept headers";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "http-media" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , QuickCheck, test-framework, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "http-media";
+       version = "0.6.3";
+       sha256 = "38ac24e33a2ef0fdeb9f1c3311aa1efb4902701888fd4a590c1912aaa9b1dad6";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers
+       ];
+       testHaskellDepends = [
+         base bytestring case-insensitive containers QuickCheck
+         test-framework test-framework-quickcheck2
+       ];
+       doCheck = false;
+       homepage = "https://github.com/zmthy/http-media";
+       description = "Processing HTTP Content-Type and Accept headers";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "http-monad" = callPackage
@@ -113683,7 +114535,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) zookeeper_mt;};
 
-  "hzulip" = callPackage
+  "hzulip_1_1_1_2" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, conduit
      , exceptions, hspec, http-client, http-client-tls, http-types, lens
      , lens-aeson, mtl, raw-strings-qq, scotty, stm, stm-conduit, text
@@ -113703,12 +114555,14 @@ self: {
          http-client-tls http-types lens lens-aeson mtl raw-strings-qq
          scotty stm stm-conduit text transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/yamadapc/hzulip";
        description = "A haskell wrapper for the Zulip API";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hzulip_1_1_1_3" = callPackage
+  "hzulip" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, conduit
      , exceptions, hspec, http-client, http-client-tls, http-types, lens
      , lens-aeson, mtl, raw-strings-qq, scotty, stm, stm-conduit, text
@@ -113731,7 +114585,6 @@ self: {
        homepage = "https://github.com/yamadapc/hzulip";
        description = "A haskell wrapper for the Zulip API";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "i18n" = callPackage
@@ -115655,6 +116508,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "impossible" = callPackage
+    ({ mkDerivation, base, lens }:
+     mkDerivation {
+       pname = "impossible";
+       version = "1.0.0";
+       sha256 = "7f4f8d20bea5ee0c125218276d6e252d85c748808fc7f8ec5d6990aa84e277e2";
+       libraryHaskellDepends = [ base lens ];
+       homepage = "https://github.com/wdanilo/impossible";
+       description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable.";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "improve" = callPackage
     ({ mkDerivation, base, mtl, yices }:
      mkDerivation {
@@ -119588,8 +120453,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-ast";
-       version = "0.1";
-       sha256 = "8f66d6a977794f21cc5a9af8551ed237ff57677b5777f269a1cebd8e05a3141f";
+       version = "0.2";
+       sha256 = "595ed692fa82dc6e178d368a6a247eb19f96f643ce030b8c178ec7d54b0a4b5c";
        libraryHaskellDepends = [
          base scientific text unordered-containers vector
        ];
@@ -119598,6 +120463,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "json-ast-quickcheck" = callPackage
+    ({ mkDerivation, base, json-ast, QuickCheck, quickcheck-instances
+     }:
+     mkDerivation {
+       pname = "json-ast-quickcheck";
+       version = "0.1";
+       sha256 = "68c77372e7d7f1c7340d6932d91bc72fa0f24501930e01fa77387ed0e8931f1b";
+       libraryHaskellDepends = [
+         base json-ast QuickCheck quickcheck-instances
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/nikita-volkov/json-ast-quickcheck";
+       description = "Compatibility layer for \"json-ast\" and \"QuickCheck\"";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "json-autotype_0_2_5_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, filepath
      , GenericPretty, hashable, hflags, lens, mtl, pretty, process
@@ -119939,6 +120820,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "json-pointer" = callPackage
+    ({ mkDerivation, attoparsec, base-prelude, text }:
+     mkDerivation {
+       pname = "json-pointer";
+       version = "0.1";
+       sha256 = "2ed39be2da3f9f552fd0897028230236ca82c302c23c087d528b52550bba23c4";
+       libraryHaskellDepends = [ attoparsec base-prelude text ];
+       homepage = "https://github.com/sannsyn/json-pointer";
+       description = "JSON Pointer parsing and interpretation utilities";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "json-python" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, pureMD5
      , python, template-haskell
@@ -120274,6 +121167,7 @@ self: {
          aeson aeson-utils attoparsec base bytestring generic-aeson tasty
          tasty-hunit tasty-th text vector
        ];
+       jailbreak = true;
        description = "Types and type classes for defining JSON schemas";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -120289,8 +121183,8 @@ self: {
        pname = "json-schema";
        version = "0.7.4.1";
        sha256 = "560d6a17d6eab734f43d329e51967e3ed62f8df2a6fea4a92d06359fe77d7c96";
-       revision = "1";
-       editedCabalFile = "4d1dfd0f92e4a804930e202d9e8078d63dcfec2b002d1e863cbc95f648e004e0";
+       revision = "2";
+       editedCabalFile = "34b4f2ea278bbcb6cd0e6ed8e6d5f0e97f71c6885bc72914d3f47a372cf07d3b";
        libraryHaskellDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -120325,10 +121219,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-state";
-       version = "0.1.0.0";
-       sha256 = "852fe9fd9fb43c281faff5a33854639bf34daee81cf9ce76bb14192bbefc29db";
-       revision = "1";
-       editedCabalFile = "8cc980c70a4afc20585413ec8894673f768b80911ec864386ef8c6c3c0d7505a";
+       version = "0.1.0.1";
+       sha256 = "f10aa7fcf498ed25d6b90a616f0749d8089169e678116a01c3052780579d64f7";
        libraryHaskellDepends = [
          aeson aeson-pretty base bytestring libgit time-units
        ];
@@ -120604,26 +121496,22 @@ self: {
      }) {Judy = null;};
 
   "jukebox" = callPackage
-    ({ mkDerivation, alex, array, base, binary, bytestring, containers
-     , directory, filepath, hashable, minisat, mtl, pretty, process
-     , unordered-containers
+    ({ mkDerivation, alex, array, base, containers, directory, dlist
+     , filepath, minisat, pretty, process, symbol, transformers
+     , uglymemo
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.1.6";
-       sha256 = "1bde5dd2fadd0b598c11657199ee90bfe8f822807a394857ef902d2d8fec366a";
+       version = "0.2.2";
+       sha256 = "efbaefbbe3a6b66aea18885faf8ddfc3c84ce58ebbd507aebefd36336f278a4f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         array base binary bytestring containers directory filepath hashable
-         minisat mtl pretty process unordered-containers
+         array base containers directory dlist filepath minisat pretty
+         process symbol transformers uglymemo
        ];
        libraryToolDepends = [ alex ];
-       executableHaskellDepends = [
-         array base binary bytestring containers directory filepath hashable
-         minisat mtl pretty process unordered-containers
-       ];
-       executableToolDepends = [ alex ];
+       executableHaskellDepends = [ base ];
        description = "A first-order reasoning toolbox";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
@@ -120893,8 +121781,8 @@ self: {
        pname = "kansas-comet";
        version = "0.4";
        sha256 = "1f1a4565f2e955b8947bafcb9611789b0ccdf9efdfed8aaa2a2aa162a07339e1";
-       revision = "1";
-       editedCabalFile = "6f3238173ad5a0fbdd82c2b73e96b4c43f17fa45f76f7249e6e925ed7eef9a97";
+       revision = "2";
+       editedCabalFile = "7130c2d96d36883b648d583fda40b74b7880f217213dd11827eef86caf7bc927";
        libraryHaskellDepends = [
          aeson base containers data-default-class scotty stm text time
          transformers unordered-containers
@@ -121042,6 +121930,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "kazura-queue" = callPackage
+    ({ mkDerivation, async, atomic-primops, base, containers, deepseq
+     , doctest, exceptions, free, hspec, hspec-expectations, HUnit, mtl
+     , primitive, QuickCheck, transformers
+     }:
+     mkDerivation {
+       pname = "kazura-queue";
+       version = "0.1.0.2";
+       sha256 = "0ed0544bdfea6364acabaebb8e07ba36ee98dcf9c6afca4241e8f87613dddc7b";
+       libraryHaskellDepends = [
+         async atomic-primops base containers primitive
+       ];
+       testHaskellDepends = [
+         async base containers deepseq doctest exceptions free hspec
+         hspec-expectations HUnit mtl QuickCheck transformers
+       ];
+       homepage = "http://github.com/asakamirai/kazura-queue";
+       description = "Fast concurrent queues much inspired by unagi-chan";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "kbq-gu" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -123781,7 +124690,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "language-ecmascript" = callPackage
+  "language-ecmascript_0_17_0_1" = callPackage
     ({ mkDerivation, base, containers, data-default-class, Diff
      , directory, filepath, HUnit, mtl, parsec, QuickCheck
      , template-haskell, test-framework, test-framework-hunit
@@ -123805,6 +124714,32 @@ self: {
        homepage = "http://github.com/jswebtools/language-ecmascript";
        description = "JavaScript parser and pretty-printer library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "language-ecmascript" = callPackage
+    ({ mkDerivation, base, containers, data-default-class, Diff
+     , directory, filepath, HUnit, mtl, parsec, QuickCheck
+     , template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, testing-feat, uniplate, wl-pprint
+     }:
+     mkDerivation {
+       pname = "language-ecmascript";
+       version = "0.17.0.2";
+       sha256 = "97412d2cf4b5a61de49548b22e4271fe20cba6746a2dc58dcc55c82c56591059";
+       libraryHaskellDepends = [
+         base containers data-default-class Diff mtl parsec QuickCheck
+         template-haskell testing-feat uniplate wl-pprint
+       ];
+       testHaskellDepends = [
+         base containers data-default-class Diff directory filepath HUnit
+         mtl parsec QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 uniplate wl-pprint
+       ];
+       doCheck = false;
+       homepage = "http://github.com/jswebtools/language-ecmascript";
+       description = "JavaScript parser and pretty-printer library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "language-ecmascript-analysis" = callPackage
@@ -123813,8 +124748,8 @@ self: {
      }:
      mkDerivation {
        pname = "language-ecmascript-analysis";
-       version = "0.9.1";
-       sha256 = "36f95a57347dfaa7d1b05a80469ba5be031870b1ea1c2694a61d124d791cec13";
+       version = "0.9.2";
+       sha256 = "afb477f63477edd7cd21c817dc2e7f7addede510eff60df07d76daeddf8ba691";
        libraryHaskellDepends = [
          base containers language-ecmascript parsec uniplate
        ];
@@ -124290,40 +125225,40 @@ self: {
 
   "language-puppet" = callPackage
     ({ mkDerivation, aeson, ansi-wl-pprint, attoparsec, base
-     , base16-bytestring, bifunctors, bytestring, case-insensitive
-     , containers, cryptonite, Diff, directory, either, exceptions
-     , filecache, formatting, Glob, hashable, hruby, hslogger, hslua
-     , hspec, HUnit, lens, lens-aeson, megaparsec, memory, mtl
-     , operational, optparse-applicative, parallel-io, parsec, parsers
-     , pcre-utils, process, random, regex-pcre-builtin, scientific
-     , semigroups, servant, servant-client, split, stm
-     , strict-base-types, temporary, text, time, transformers, unix
-     , unordered-containers, vector, yaml
+     , base16-bytestring, bytestring, case-insensitive, containers
+     , cryptonite, directory, either, exceptions, filecache, formatting
+     , Glob, hashable, hruby, hslogger, hslua, hspec, HUnit, lens
+     , lens-aeson, megaparsec, memory, mtl, operational
+     , optparse-applicative, parallel-io, parsec, pcre-utils, process
+     , random, regex-pcre-builtin, scientific, semigroups, servant
+     , servant-client, split, stm, strict-base-types, temporary, text
+     , time, transformers, unix, unordered-containers, vector, yaml
      }:
      mkDerivation {
        pname = "language-puppet";
-       version = "1.1.4.1";
-       sha256 = "9081e2da9a4d046d034d59cc277bfb1bbf16b1fd6f925aef6d44674228423c97";
+       version = "1.1.5";
+       sha256 = "1448e6a601ccf3468b856c6c53e0ba1e0b3d7df91da26e727e80ee203189fccc";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson ansi-wl-pprint attoparsec base base16-bytestring bifunctors
-         bytestring case-insensitive containers cryptonite directory either
-         exceptions filecache formatting hashable hruby hslogger hslua lens
-         lens-aeson megaparsec memory mtl operational parsec parsers
-         pcre-utils process random regex-pcre-builtin scientific semigroups
-         servant servant-client split stm strict-base-types text time
-         transformers unix unordered-containers vector yaml
+         aeson ansi-wl-pprint attoparsec base base16-bytestring bytestring
+         case-insensitive containers cryptonite directory either exceptions
+         filecache formatting hashable hruby hslogger hslua hspec lens
+         lens-aeson megaparsec memory mtl operational parsec pcre-utils
+         process random regex-pcre-builtin scientific semigroups servant
+         servant-client split stm strict-base-types text time transformers
+         unix unordered-containers vector yaml
        ];
        executableHaskellDepends = [
-         aeson ansi-wl-pprint base bytestring containers Diff either Glob
-         hslogger hspec lens megaparsec mtl optparse-applicative parallel-io
-         regex-pcre-builtin servant-client strict-base-types text
-         unordered-containers vector yaml
+         aeson base bytestring containers either Glob hslogger lens
+         megaparsec optparse-applicative parallel-io regex-pcre-builtin
+         servant-client strict-base-types text unordered-containers vector
+         yaml
        ];
        testHaskellDepends = [
          ansi-wl-pprint base either Glob hspec HUnit lens megaparsec
-         strict-base-types temporary text unix unordered-containers vector
+         scientific strict-base-types temporary text unix
+         unordered-containers vector
        ];
        jailbreak = true;
        homepage = "http://lpuppet.banquise.net/";
@@ -125527,6 +126462,7 @@ self: {
          test-framework-quickcheck2 test-framework-th text transformers
          unordered-containers vector
        ];
+       doCheck = false;
        homepage = "http://github.com/ekmett/lens/";
        description = "Lenses, Folds and Traversals";
        license = stdenv.lib.licenses.bsd3;
@@ -125909,8 +126845,8 @@ self: {
     ({ mkDerivation, base, lens }:
      mkDerivation {
        pname = "lens-utils";
-       version = "1.0";
-       sha256 = "478377492a910492589771f0fbcbff25a7890a24672f1134005ff3893ae56b6f";
+       version = "1.2";
+       sha256 = "2baa0afaf1cfd406335b940c9fc375ab5bbd0bb1f26fb8eca613b901e04d59fb";
        libraryHaskellDepends = [ base lens ];
        homepage = "https://github.com/wdanilo/lens-utils";
        description = "Collection of missing lens utilities";
@@ -132474,15 +133410,21 @@ self: {
      }) {};
 
   "mappy" = callPackage
-    ({ mkDerivation, base, containers, hspec, parsec, QuickCheck }:
+    ({ mkDerivation, ansi-terminal, base, containers, directory
+     , haskeline, hspec, parsec, QuickCheck
+     }:
      mkDerivation {
        pname = "mappy";
-       version = "0.1.0.2";
-       sha256 = "138923424b51cfa0008fa9224af8327f1455c097421c7ec4969a4689790230af";
+       version = "0.1.2.0";
+       sha256 = "22f99e145fd8e3208078ad67761bcdc718abd916d7c4a279aa0c09dfcb9de208";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base containers parsec ];
-       executableHaskellDepends = [ base parsec ];
+       libraryHaskellDepends = [
+         ansi-terminal base containers directory haskeline parsec
+       ];
+       executableHaskellDepends = [
+         ansi-terminal base directory haskeline parsec
+       ];
        testHaskellDepends = [ base containers hspec parsec QuickCheck ];
        homepage = "https://github.com/PolyglotSymposium/mappy";
        description = "A functional programming language focused around maps";
@@ -134175,11 +135117,10 @@ self: {
     ({ mkDerivation, base, text, time }:
      mkDerivation {
        pname = "metadata";
-       version = "0.2.0.0";
-       sha256 = "79d4b6be4c6b85c8e365565a1fda18a295fa2998d475b05cf1af7f04df3e0c91";
+       version = "0.4.2.0";
+       sha256 = "1b33c343e12766fb329345a2f687c4348bb8fc36792adc88e41b0510e6ed456a";
        libraryHaskellDepends = [ base text time ];
-       jailbreak = true;
-       homepage = "http://github.com/cutsea110/metadata";
+       homepage = "https://github.com/cutsea110/metadata";
        description = "metadata library for semantic web";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -135746,6 +136687,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mmorph_1_0_6" = callPackage
+    ({ mkDerivation, base, mtl, transformers, transformers-compat }:
+     mkDerivation {
+       pname = "mmorph";
+       version = "1.0.6";
+       sha256 = "14c391b111af4cc10917a9340897ae2a5718f5b0b7e6bc13f379445c58fe0dc5";
+       libraryHaskellDepends = [
+         base mtl transformers transformers-compat
+       ];
+       description = "Monad morphisms";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mmtl" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -136261,7 +137216,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monad-control" = callPackage
+  "monad-control_1_0_0_4" = callPackage
     ({ mkDerivation, base, stm, transformers, transformers-base
      , transformers-compat
      }:
@@ -136277,9 +137232,10 @@ self: {
        homepage = "https://github.com/basvandijk/monad-control";
        description = "Lift control operations, like exception catching, through monad transformers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monad-control_1_0_0_5" = callPackage
+  "monad-control" = callPackage
     ({ mkDerivation, base, stm, transformers, transformers-base
      , transformers-compat
      }:
@@ -136293,7 +137249,6 @@ self: {
        homepage = "https://github.com/basvandijk/monad-control";
        description = "Lift control operations, like exception catching, through monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-coroutine_0_8" = callPackage
@@ -136749,6 +137704,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "monad-logger_0_3_18" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, conduit
+     , conduit-extra, exceptions, fast-logger, lifted-base
+     , monad-control, monad-loops, mtl, resourcet, stm, stm-chans
+     , template-haskell, text, transformers, transformers-base
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "monad-logger";
+       version = "0.3.18";
+       sha256 = "81497c19d08df93e6de5914f3adf0feecf4fcd9412e3004d2b19b4bfba05497e";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring conduit conduit-extra exceptions
+         fast-logger lifted-base monad-control monad-loops mtl resourcet stm
+         stm-chans template-haskell text transformers transformers-base
+         transformers-compat
+       ];
+       homepage = "https://github.com/kazu-yamamoto/logger";
+       description = "A class of monads which can log messages";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-logger-json" = callPackage
     ({ mkDerivation, aeson, base, monad-logger, template-haskell, text
      }:
@@ -138201,7 +139179,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monoid-subclasses" = callPackage
+  "monoid-subclasses_0_4_1_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
      , quickcheck-instances, tasty, tasty-quickcheck, text, vector
      }:
@@ -138222,6 +139200,27 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "monoid-subclasses" = callPackage
+    ({ mkDerivation, base, bytestring, containers, primes, QuickCheck
+     , quickcheck-instances, tasty, tasty-quickcheck, text, vector
+     }:
+     mkDerivation {
+       pname = "monoid-subclasses";
+       version = "0.4.2";
+       sha256 = "38257132ebd3dca4d1d95252a928ca183171ae0ba3aefd133f3c564fa3bfee2b";
+       libraryHaskellDepends = [
+         base bytestring containers primes text vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers primes QuickCheck quickcheck-instances
+         tasty tasty-quickcheck text vector
+       ];
+       homepage = "https://github.com/blamario/monoid-subclasses/";
+       description = "Subclasses of Monoid";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monoid-transformer" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -139207,6 +140206,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mulang" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, haskell-src, hspec }:
+     mkDerivation {
+       pname = "mulang";
+       version = "0.1.0.0";
+       sha256 = "5df2829d85ceb46086011c96ecaf396aa78d92dda293ba728d0ad8e3efcaaddf";
+       libraryHaskellDepends = [ aeson base bytestring haskell-src ];
+       testHaskellDepends = [ aeson base bytestring haskell-src hspec ];
+       jailbreak = true;
+       description = "The Mu Language, a non-computable extended Lambda Calculus";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "multext-east-msd" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -140783,18 +141795,22 @@ self: {
      }) {};
 
   "nanq" = callPackage
-    ({ mkDerivation, base, bytestring, containers, microlens, text }:
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
+     , extensible-effects, microlens, microlens-aeson
+     , optparse-applicative, text
+     }:
      mkDerivation {
        pname = "nanq";
-       version = "1.1.1";
-       sha256 = "bdb90d5d32773f77401e89de6736ffb26d8c747a6eb3094c75629a9bc2386745";
+       version = "2.0.0";
+       sha256 = "6ff8ecc49b4d98c22fcde78f9895f60e2144efaf9c5323d4f2352fe94b43638c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base bytestring containers microlens text
        ];
        executableHaskellDepends = [
-         base bytestring containers microlens text
+         aeson aeson-pretty base bytestring containers extensible-effects
+         microlens microlens-aeson optparse-applicative text
        ];
        homepage = "https://github.com/fosskers/nanq";
        description = "Performs 漢字検定 (National Kanji Exam) level analysis on given Kanji";
@@ -141069,14 +142085,13 @@ self: {
      }:
      mkDerivation {
        pname = "nbt";
-       version = "0.5.1";
-       sha256 = "009bc5cd0834329c4944768b86d69ef4cf2b87507263eb4415adf34a6c262820";
+       version = "0.6";
+       sha256 = "4db207844f21a0073d6346613d61cf00b02a7da7c32ba501413c3b0624ed9651";
        libraryHaskellDepends = [ array base bytestring cereal text ];
        testHaskellDepends = [
          array base bytestring cereal HUnit QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2 text zlib
        ];
-       jailbreak = true;
        homepage = "https://github.com/acfoltzer/nbt";
        description = "A parser/serializer for Minecraft's Named Binary Tag (NBT) data format";
        license = stdenv.lib.licenses.bsd3;
@@ -143884,13 +144899,12 @@ self: {
      }:
      mkDerivation {
        pname = "not-gloss";
-       version = "0.7.6.2";
-       sha256 = "b9b467e85efe2c0a2270fb0ceb64debf88b7147e4b3b21dbc8332cb1cd2a496e";
+       version = "0.7.6.3";
+       sha256 = "8be10e835c2c6a3b55d52ae7f58ebb56eb2d71348c38f2a141eb61c21753108f";
        libraryHaskellDepends = [
          base binary bmp bytestring cereal 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;
@@ -144746,6 +145760,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "octane" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers
+     , data-binary-ieee754, deepseq, tasty, tasty-hspec, text
+     }:
+     mkDerivation {
+       pname = "octane";
+       version = "0.4.0";
+       sha256 = "577f5a867e6ae3eabf00a77661bba48f5386908734728fc91e24d01e9fdd83d0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring containers data-binary-ieee754 deepseq text
+       ];
+       executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base binary bytestring containers tasty tasty-hspec
+       ];
+       homepage = "https://github.com/tfausak/octane";
+       description = "A Rocket League replay parser";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "octohat" = callPackage
     ({ mkDerivation, aeson, base, base-compat, base16-bytestring
      , base64-bytestring, bytestring, containers, cryptohash, dotenv
@@ -149463,7 +150499,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "path-io" = callPackage
+  "path-io_0_2_0" = callPackage
     ({ mkDerivation, base, directory, exceptions, filepath, path
      , temporary, time, transformers
      }:
@@ -149477,6 +150513,23 @@ self: {
        homepage = "https://github.com/mrkkrp/path-io";
        description = "Interface to ‘directory’ package for users of ‘path’";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "path-io" = callPackage
+    ({ mkDerivation, base, directory, exceptions, filepath, path
+     , temporary, time, transformers
+     }:
+     mkDerivation {
+       pname = "path-io";
+       version = "0.3.1";
+       sha256 = "b96763bd3a123a50341e003b2176a2fc72e93f8c9e717279cffe56fd824f693f";
+       libraryHaskellDepends = [
+         base directory exceptions filepath path temporary time transformers
+       ];
+       homepage = "https://github.com/mrkkrp/path-io";
+       description = "Interface to ‘directory’ package for users of ‘path’";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "path-pieces_0_1_4" = callPackage
@@ -152677,8 +153730,8 @@ self: {
      }:
      mkDerivation {
        pname = "phoityne";
-       version = "0.0.2.0";
-       sha256 = "14f496b53ad8bf95d496e685e7d006f226b8cb579284ea2cd2d554590e6050d2";
+       version = "0.0.3.0";
+       sha256 = "97823be82846237159a13767ae9a9b29acf8dbc68a95ff099b942b3bcae0790f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -153095,24 +154148,6 @@ self: {
      }) {};
 
   "pinchot" = callPackage
-    ({ mkDerivation, base, containers, Earley, lens, template-haskell
-     , transformers
-     }:
-     mkDerivation {
-       pname = "pinchot";
-       version = "0.8.0.0";
-       sha256 = "f7567131c274815e8e0ecccff815a8ff94c0912a833055ddc55f46ea26831e3b";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         base containers Earley lens template-haskell transformers
-       ];
-       homepage = "http://www.github.com/massysett/pinchot";
-       description = "Build parsers and ASTs for context-free grammars";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "pinchot_0_10_0_0" = callPackage
     ({ mkDerivation, base, containers, Earley, lens, template-haskell
      , transformers
      }:
@@ -153128,7 +154163,6 @@ self: {
        homepage = "http://www.github.com/massysett/pinchot";
        description = "Build parsers and ASTs for context-free grammars";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipe-enumerator" = callPackage
@@ -154131,8 +155165,8 @@ self: {
      }:
      mkDerivation {
        pname = "pipes-transduce";
-       version = "0.3.2.0";
-       sha256 = "3273d60971ea3995df2cd255061b9705fd7c4fcced2c8162e65a2fad88789e3a";
+       version = "0.3.3.0";
+       sha256 = "af40b285eb0e55f8ba17223890b09b4b9cc9b9774d55c7539d878e1d3d68c49b";
        libraryHaskellDepends = [
          base bifunctors bytestring conceit foldl free lens-family-core
          pipes pipes-bytestring pipes-concurrency pipes-group pipes-parse
@@ -155192,8 +156226,8 @@ self: {
     ({ mkDerivation, base, containers, hspec, lens, mtl }:
      mkDerivation {
        pname = "polar-shader";
-       version = "0.1.0.3";
-       sha256 = "f995b27e6388e5f6f037c175802f0bd65809e151b7130372f6300b6412a6c99c";
+       version = "0.1.0.4";
+       sha256 = "7f19c299d8e8c1672f6d98a475bfe969feefc8f862c47c39c2088de6ebfe12d4";
        libraryHaskellDepends = [ base containers lens mtl ];
        testHaskellDepends = [ base containers hspec ];
        description = "High-level shader compiler for Polar Game Engine";
@@ -155311,6 +156345,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "poly-control" = callPackage
+    ({ mkDerivation, base, lens }:
+     mkDerivation {
+       pname = "poly-control";
+       version = "1.0.0";
+       sha256 = "268f2355f258e4659d940356aaed8cf1559c1268c21bd4f53e705cdeafd39d10";
+       libraryHaskellDepends = [ base lens ];
+       homepage = "https://github.com/wdanilo/poly-control";
+       description = "This package provides abstraction for polymorphic controls, like PolyMonads or PolyApplicatives";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "polyToMonoid" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -156094,7 +157140,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "postgresql-binary" = callPackage
+  "postgresql-binary_0_7_5_1" = callPackage
     ({ mkDerivation, aeson, base, base-prelude, binary-parser
      , bytestring, conversion, conversion-bytestring, conversion-text
      , either, foldl, loch-th, placeholders, postgresql-libpq
@@ -156121,37 +157167,69 @@ self: {
        homepage = "https://github.com/nikita-volkov/postgresql-binary";
        description = "Encoders and decoders for the PostgreSQL's binary format";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "postgresql-binary_0_7_6" = callPackage
+  "postgresql-binary_0_7_8" = callPackage
     ({ mkDerivation, aeson, base, base-prelude, binary-parser
      , bytestring, conversion, conversion-bytestring, conversion-text
-     , either, foldl, loch-th, placeholders, postgresql-libpq
-     , QuickCheck, quickcheck-instances, scientific, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, text, time, transformers
-     , uuid, vector
+     , either, foldl, json-ast, loch-th, placeholders, postgresql-libpq
+     , QuickCheck, quickcheck-instances, rebase, scientific, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time
+     , transformers, uuid, vector
      }:
      mkDerivation {
        pname = "postgresql-binary";
-       version = "0.7.6";
-       sha256 = "19a2ed82a6f924194b79d6a0759299495f802c00d5b563841decacb8adb30a42";
+       version = "0.7.8";
+       sha256 = "a05472d7b485c0e953b1136f74ff6fe35d663f265b4f08be8450a5a3a6b30534";
        libraryHaskellDepends = [
          aeson base base-prelude binary-parser bytestring foldl loch-th
          placeholders scientific text time transformers uuid vector
        ];
        testHaskellDepends = [
-         base base-prelude bytestring conversion conversion-bytestring
-         conversion-text either loch-th placeholders postgresql-libpq
-         QuickCheck quickcheck-instances scientific tasty tasty-hunit
-         tasty-quickcheck tasty-smallcheck text time transformers uuid
-         vector
+         aeson base bytestring conversion conversion-bytestring
+         conversion-text either json-ast loch-th placeholders
+         postgresql-libpq QuickCheck quickcheck-instances rebase scientific
+         tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time
+         transformers uuid vector
        ];
+       jailbreak = true;
+       doCheck = false;
        homepage = "https://github.com/nikita-volkov/postgresql-binary";
        description = "Encoders and decoders for the PostgreSQL's binary format";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "postgresql-binary" = callPackage
+    ({ mkDerivation, aeson, base, base-prelude, binary-parser
+     , bytestring, conversion, conversion-bytestring, conversion-text
+     , either, foldl, json-ast, loch-th, placeholders, postgresql-libpq
+     , QuickCheck, quickcheck-instances, rebase, scientific, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time
+     , transformers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "postgresql-binary";
+       version = "0.7.9";
+       sha256 = "72ff406d9be3afbf459879e8ab51701e9b41edb88a457d666b7eaf079dc824ad";
+       libraryHaskellDepends = [
+         aeson base base-prelude binary-parser bytestring foldl loch-th
+         placeholders scientific text time transformers uuid vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring conversion conversion-bytestring
+         conversion-text either json-ast loch-th placeholders
+         postgresql-libpq QuickCheck quickcheck-instances rebase scientific
+         tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time
+         transformers uuid vector
+       ];
+       doCheck = false;
+       homepage = "https://github.com/nikita-volkov/postgresql-binary";
+       description = "Encoders and decoders for the PostgreSQL's binary format";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "postgresql-config" = callPackage
     ({ mkDerivation, aeson, base, bytestring, monad-control, mtl
      , postgresql-simple, resource-pool, time
@@ -157260,9 +158338,12 @@ self: {
        pname = "present";
        version = "2.2";
        sha256 = "e48643a4eacee99f87b605613c752d40b4955e348b601b090cf0a8f675dd3ffd";
+       revision = "1";
+       editedCabalFile = "87a451bb6a37e2441a9cc49e4b1ebb18a8699bcd28da970f210eb1fcabd769c1";
        libraryHaskellDepends = [
          aeson atto-lisp base bytestring data-default mtl semigroups text
        ];
+       jailbreak = true;
        description = "Make presentations for data types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -157582,6 +158663,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "primitive-simd" = callPackage
+    ({ mkDerivation, base, ghc-prim, primitive, vector }:
+     mkDerivation {
+       pname = "primitive-simd";
+       version = "0.1.0.0";
+       sha256 = "d131c7a6aedc55c113e71fbc22cd79e2105186fb5e359236de04abe46433b58d";
+       libraryHaskellDepends = [ base ghc-prim primitive vector ];
+       description = "SIMD data types and functions";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "primula-board" = callPackage
     ({ mkDerivation, base, ConfigFile, containers, directory, happstack
      , happstack-helpers, happstack-server, happstack-state, hsp
@@ -157866,7 +158958,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "process-extras" = callPackage
+  "process-extras_0_3_3_7" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, ListLike, process, text
      }:
      mkDerivation {
@@ -157881,9 +158973,10 @@ self: {
        homepage = "https://github.com/seereason/process-extras";
        description = "Process extras";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "process-extras_0_3_3_8" = callPackage
+  "process-extras" = callPackage
     ({ mkDerivation, base, bytestring, deepseq, generic-deriving
      , ListLike, process, text
      }:
@@ -157894,11 +158987,9 @@ self: {
        libraryHaskellDepends = [
          base bytestring deepseq generic-deriving ListLike process text
        ];
-       jailbreak = true;
        homepage = "https://github.com/seereason/process-extras";
        description = "Process extras";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "process-iterio" = callPackage
@@ -157992,30 +159083,31 @@ self: {
 
   "process-streaming" = callPackage
     ({ mkDerivation, attoparsec, base, bifunctors, bytestring, conceit
-     , containers, contravariant, directory, doctest, exceptions
-     , filepath, foldl, free, lens, pipes, pipes-attoparsec
+     , containers, directory, doctest, exceptions, filepath, foldl, free
+     , kan-extensions, lens-family-core, pipes, pipes-attoparsec
      , pipes-bytestring, pipes-concurrency, pipes-group, pipes-parse
-     , pipes-safe, pipes-text, process, semigroups, tasty, tasty-hunit
-     , text, transformers, transformers-compat, void
+     , pipes-safe, pipes-text, pipes-transduce, process, profunctors
+     , semigroups, tasty, tasty-hunit, text, transformers
+     , transformers-compat, void
      }:
      mkDerivation {
        pname = "process-streaming";
-       version = "0.7.2.2";
-       sha256 = "634d16c4444840d7a5264936b5d3b20cc277154a905f967872cbfedce4a1b04a";
+       version = "0.9.0.1";
+       sha256 = "114bf31ba101447858cf6db6f127e6fcc09e154cc6f49fda27c60e6e0db2e1dc";
        libraryHaskellDepends = [
-         base bifunctors bytestring conceit containers contravariant foldl
-         free pipes pipes-bytestring pipes-concurrency pipes-parse
-         pipes-safe pipes-text process semigroups text transformers
+         base bifunctors bytestring conceit free kan-extensions pipes
+         pipes-bytestring pipes-concurrency pipes-parse pipes-safe
+         pipes-text pipes-transduce process profunctors text transformers
          transformers-compat void
        ];
        testHaskellDepends = [
          attoparsec base bifunctors bytestring containers directory doctest
-         exceptions filepath free lens pipes pipes-attoparsec
-         pipes-bytestring pipes-concurrency pipes-group pipes-parse
-         pipes-safe pipes-text process semigroups tasty tasty-hunit text
-         transformers transformers-compat void
+         exceptions filepath foldl free lens-family-core pipes
+         pipes-attoparsec pipes-bytestring pipes-concurrency pipes-group
+         pipes-parse pipes-safe pipes-text pipes-transduce process
+         semigroups tasty tasty-hunit text transformers transformers-compat
+         void
        ];
-       jailbreak = true;
        description = "Streaming interface to system processes";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -158231,8 +159323,8 @@ self: {
      }:
      mkDerivation {
        pname = "profiteur";
-       version = "0.2.0.2";
-       sha256 = "fe2d0a9a44785ee2fb7ea54ceb73088fab3f81179c1c1541cbb183ad188229e3";
+       version = "0.3.0.1";
+       sha256 = "a0e2ea372a6259dcd25b69160e9afef9039c25e0acbafd8824eb907117dd5b86";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -158553,19 +159645,20 @@ self: {
      }) {};
 
   "prologue" = callPackage
-    ({ mkDerivation, base, binary, cond, container, convert
-     , data-default, data-layer, errors, functor-utils, lens, lens-utils
-     , mtl, pretty-show, string-qq, text, transformers
-     , transformers-base, tuple, vector
+    ({ mkDerivation, base, bifunctors, binary, cond, container, convert
+     , data-default, data-layer, errors, functor-utils, impossible, lens
+     , lens-utils, mtl, pretty-show, string-qq, text, transformers
+     , transformers-base, tuple, typelevel, vector
      }:
      mkDerivation {
        pname = "prologue";
-       version = "1.0.6";
-       sha256 = "c14e942d1021bc060ca4c8df14c0f487a0f03607c3b5afa65b1dd3d75e0c277f";
+       version = "1.0.7";
+       sha256 = "37e8c186881e2cce7702812f64cc6fd27273cb9d3f34f59ffaaf0a365235935b";
        libraryHaskellDepends = [
-         base binary cond container convert data-default data-layer errors
-         functor-utils lens lens-utils mtl pretty-show string-qq text
-         transformers transformers-base tuple vector
+         base bifunctors binary cond container convert data-default
+         data-layer errors functor-utils impossible lens lens-utils mtl
+         pretty-show string-qq text transformers transformers-base tuple
+         typelevel vector
        ];
        homepage = "https://github.com/wdanilo/prologue";
        description = "Better, more general Prelude exporting common utilities";
@@ -159163,7 +160256,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "psc-ide" = callPackage
+  "psc-ide_0_5_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , either, filepath, hspec, http-client, lens, lens-aeson, mtl
      , network, optparse-applicative, parsec, purescript, regex-tdfa
@@ -159187,6 +160280,69 @@ self: {
        homepage = "http://github.com/kRITZCREEK/psc-ide";
        description = "Language support for the PureScript programming language";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "psc-ide" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , edit-distance, either, filepath, fsnotify, hspec, http-client
+     , lens, lens-aeson, monad-logger, mtl, network
+     , optparse-applicative, parsec, purescript, regex-tdfa, stm, text
+     , wreq
+     }:
+     mkDerivation {
+       pname = "psc-ide";
+       version = "0.6.0";
+       sha256 = "9ec4f96eabd70cd4ba84731a527bf86cd2bd0dc8891e8cde7b99705973e72deb";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory edit-distance either
+         filepath fsnotify http-client lens lens-aeson monad-logger mtl
+         parsec purescript regex-tdfa stm text wreq
+       ];
+       executableHaskellDepends = [
+         base directory filepath monad-logger mtl network
+         optparse-applicative stm text
+       ];
+       testHaskellDepends = [
+         base containers hspec monad-logger mtl stm
+       ];
+       doHaddock = false;
+       homepage = "http://github.com/kRITZCREEK/psc-ide";
+       description = "Language support for the PureScript programming language";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "psc-ide_0_6_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , edit-distance, either, filepath, fsnotify, hspec, http-client
+     , lens, lens-aeson, monad-logger, mtl, network
+     , optparse-applicative, parsec, purescript, regex-tdfa, stm, text
+     , wreq
+     }:
+     mkDerivation {
+       pname = "psc-ide";
+       version = "0.6.1";
+       sha256 = "d2dc589b62f279e97cbe8ad87db2c907c3f1c2bb8e9f0e60978d547cee4a06b5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory edit-distance either
+         filepath fsnotify http-client lens lens-aeson monad-logger mtl
+         parsec purescript regex-tdfa stm text wreq
+       ];
+       executableHaskellDepends = [
+         base directory filepath monad-logger mtl network
+         optparse-applicative stm text
+       ];
+       testHaskellDepends = [
+         base containers hspec monad-logger mtl stm
+       ];
+       homepage = "http://github.com/kRITZCREEK/psc-ide";
+       description = "Language support for the PureScript programming language";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pseudo-boolean" = callPackage
@@ -159273,6 +160429,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "psqueues_0_2_1_0" = callPackage
+    ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit
+     , QuickCheck, tagged, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "psqueues";
+       version = "0.2.1.0";
+       sha256 = "54999bb6f718533771a35e3e333b41ac1ab355eb034281c8607217b53fb6891d";
+       libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
+       testHaskellDepends = [
+         array base deepseq ghc-prim hashable HUnit QuickCheck tagged
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
+       description = "Pure priority search queues";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pub" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, ConfigFile, containers
      , groom, hedis, hslogger, mtl, network, pipes, pipes-bytestring
@@ -159313,8 +160488,8 @@ self: {
     ({ mkDerivation, base, filepath, hspec, template-haskell }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20160126";
-       sha256 = "7798d15bf7962f6dc4ba65faa28c9975d4691e7f764ff1ef4689fcb5f1cac090";
+       version = "0.20160201";
+       sha256 = "86aed1a05038b9f95038682bd8621d0bcad1cc745d0bb761636a9639ac6247e1";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
@@ -159914,7 +161089,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "purescript" = callPackage
+  "purescript_0_7_6_1" = callPackage
     ({ mkDerivation, aeson, aeson-better-errors, ansi-wl-pprint, base
      , base-compat, bower-json, boxes, bytestring, containers, directory
      , dlist, filepath, Glob, haskeline, HUnit, language-javascript
@@ -159951,6 +161126,47 @@ self: {
        homepage = "http://www.purescript.org/";
        description = "PureScript Programming Language Compiler";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "purescript" = callPackage
+    ({ mkDerivation, aeson, aeson-better-errors, ansi-wl-pprint, base
+     , base-compat, bower-json, boxes, bytestring, containers, directory
+     , dlist, filepath, Glob, haskeline, HUnit, language-javascript
+     , lifted-base, monad-control, mtl, optparse-applicative, parallel
+     , parsec, pattern-arrows, process, safe, semigroups, split, syb
+     , text, time, transformers, transformers-base, transformers-compat
+     , unordered-containers, utf8-string, vector
+     }:
+     mkDerivation {
+       pname = "purescript";
+       version = "0.8.0.0";
+       sha256 = "a263933c4ae407f2c97e230d08ab343f597e101a597f7fa01151b0b476ce43d0";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson aeson-better-errors base base-compat bower-json boxes
+         bytestring containers directory dlist filepath Glob
+         language-javascript lifted-base monad-control mtl parallel parsec
+         pattern-arrows process safe semigroups split syb text time
+         transformers transformers-base transformers-compat
+         unordered-containers utf8-string vector
+       ];
+       executableHaskellDepends = [
+         aeson ansi-wl-pprint base base-compat boxes bytestring containers
+         directory filepath Glob haskeline mtl optparse-applicative parsec
+         process split time transformers transformers-compat utf8-string
+       ];
+       testHaskellDepends = [
+         aeson aeson-better-errors base base-compat boxes bytestring
+         containers directory filepath Glob haskeline HUnit mtl
+         optparse-applicative parsec process time transformers
+         transformers-compat
+       ];
+       doCheck = false;
+       homepage = "http://www.purescript.org/";
+       description = "PureScript Programming Language Compiler";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "purescript-bundle-fast" = callPackage
@@ -160740,7 +161956,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "quickcheck-instances" = callPackage
+  "quickcheck-instances_0_3_11" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, hashable
      , old-time, QuickCheck, text, time, unordered-containers
      }:
@@ -160757,9 +161973,10 @@ self: {
        homepage = "https://github.com/aslatter/qc-instances";
        description = "Common quickcheck instances";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "quickcheck-instances_0_3_12" = callPackage
+  "quickcheck-instances" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, hashable
      , old-time, QuickCheck, scientific, text, time
      , unordered-containers, vector
@@ -160775,7 +161992,6 @@ self: {
        homepage = "https://github.com/aslatter/qc-instances";
        description = "Common quickcheck instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-io_0_1_1" = callPackage
@@ -162764,6 +163980,26 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "rebase" = callPackage
+    ({ mkDerivation, base, base-prelude, bifunctors, bytestring
+     , containers, contravariant, contravariant-extras, deepseq, dlist
+     , hashable, profunctors, scientific, semigroups, text, time
+     , unordered-containers, uuid, vector, void
+     }:
+     mkDerivation {
+       pname = "rebase";
+       version = "0.2.1";
+       sha256 = "1a6813a90e6ff5904bf3bbf1f96a25a636da1fd76b937ee34d5f7efeb34c8665";
+       libraryHaskellDepends = [
+         base base-prelude bifunctors bytestring containers contravariant
+         contravariant-extras deepseq dlist hashable profunctors scientific
+         semigroups text time unordered-containers uuid vector void
+       ];
+       homepage = "https://github.com/nikita-volkov/rebase";
+       description = "A more progressive alternative to the \"base\" package";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "recaptcha" = callPackage
     ({ mkDerivation, base, HTTP, network, network-uri, xhtml }:
      mkDerivation {
@@ -164799,6 +166035,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "remote-monad" = callPackage
+    ({ mkDerivation, base, containers, natural-transformation
+     , QuickCheck, quickcheck-instances, tasty, tasty-quickcheck
+     , transformers
+     }:
+     mkDerivation {
+       pname = "remote-monad";
+       version = "0.1.0.0";
+       sha256 = "c4a9aec18e78195f187b92480e2654c996cbb3e5686c5071314504f9a020035c";
+       libraryHaskellDepends = [
+         base natural-transformation transformers
+       ];
+       testHaskellDepends = [
+         base containers QuickCheck quickcheck-instances tasty
+         tasty-quickcheck
+       ];
+       description = "An parametrizable Remote Monad, and parametrizable Applicative Functor";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "remotion" = callPackage
     ({ mkDerivation, async, base, bytestring, concurrent-extra
      , containers, directory, errors, filelock, hashable, hashtables
@@ -166232,8 +167488,8 @@ self: {
        pname = "rest-core";
        version = "0.37";
        sha256 = "6a7e13b5e1ae6aadf53cc0dcbeca99a01b68737833962b2abdd50f4e6e9d066c";
-       revision = "2";
-       editedCabalFile = "b402497734ed072efe7f1f989b56082490b8782f53f718821e028e61a4b22fcb";
+       revision = "4";
+       editedCabalFile = "09d7a6cceaa574917ef0ced55b1424bc0367b240678c358c36a1e4efedc04771";
        libraryHaskellDepends = [
          aeson aeson-utils base bytestring case-insensitive errors fclabels
          hxt hxt-pickle-utils json-schema mtl mtl-compat multipart random
@@ -167395,7 +168651,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rev-state" = callPackage
+  "rev-state_0_1_1" = callPackage
     ({ mkDerivation, base, mtl }:
      mkDerivation {
        pname = "rev-state";
@@ -167406,6 +168662,22 @@ self: {
        homepage = "https://github.com/DanBurton/rev-state#readme";
        description = "Reverse State monad transformer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "rev-state" = callPackage
+    ({ mkDerivation, base, mtl }:
+     mkDerivation {
+       pname = "rev-state";
+       version = "0.1.2";
+       sha256 = "ee070e39d7f7d673593e2f356ab317bc2fdd0d8a283f8316c0e5b5adbdf0f919";
+       revision = "2";
+       editedCabalFile = "de8db922a675a68ac8ac03f80fabaed250fe332a20f7b3bd8272238088e3d135";
+       libraryHaskellDepends = [ base mtl ];
+       testHaskellDepends = [ base ];
+       homepage = "https://github.com/DanBurton/rev-state#readme";
+       description = "Reverse State monad transformer";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "revdectime" = callPackage
@@ -170094,7 +171366,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "scalpel" = callPackage
+  "scalpel_0_2_1_1" = callPackage
     ({ mkDerivation, base, bytestring, curl, HUnit, regex-base
      , regex-tdfa, tagsoup, text
      }:
@@ -170109,6 +171381,25 @@ self: {
        homepage = "https://github.com/fimad/scalpel";
        description = "A high level web scraping library for Haskell";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "scalpel" = callPackage
+    ({ mkDerivation, base, bytestring, containers, curl, data-default
+     , HUnit, regex-base, regex-tdfa, tagsoup, text
+     }:
+     mkDerivation {
+       pname = "scalpel";
+       version = "0.3.0.1";
+       sha256 = "ab1c9462b2bc7ef7d6ae028172eda278c3bf06adb3c877d6c5356491ab836471";
+       libraryHaskellDepends = [
+         base bytestring containers curl data-default regex-base regex-tdfa
+         tagsoup text
+       ];
+       testHaskellDepends = [ base HUnit regex-base regex-tdfa tagsoup ];
+       homepage = "https://github.com/fimad/scalpel";
+       description = "A high level web scraping library for Haskell";
+       license = stdenv.lib.licenses.asl20;
      }) {};
 
   "scan" = callPackage
@@ -170819,7 +172110,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "scotty" = callPackage
+  "scotty_0_10_2" = callPackage
     ({ mkDerivation, aeson, async, base, blaze-builder, bytestring
      , case-insensitive, data-default-class, directory, hspec, hspec-wai
      , http-types, lifted-base, monad-control, mtl, nats, network
@@ -170845,9 +172136,10 @@ self: {
        homepage = "https://github.com/scotty-web/scotty";
        description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "scotty_0_11_0" = callPackage
+  "scotty" = callPackage
     ({ mkDerivation, aeson, async, base, blaze-builder, bytestring
      , case-insensitive, data-default-class, directory, fail, hspec
      , hspec-wai, http-types, lifted-base, monad-control, mtl, nats
@@ -170871,7 +172163,6 @@ self: {
        homepage = "https://github.com/scotty-web/scotty";
        description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-binding-play" = callPackage
@@ -172120,7 +173411,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "semigroups" = callPackage
+  "semigroups_0_18_0_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, hashable
      , tagged, text, unordered-containers
      }:
@@ -172137,9 +173428,10 @@ self: {
        homepage = "http://github.com/ekmett/semigroups/";
        description = "Anything that associates";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "semigroups_0_18_1" = callPackage
+  "semigroups" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq
      , hashable, tagged, text, transformers, unordered-containers
      }:
@@ -172154,7 +173446,6 @@ self: {
        homepage = "http://github.com/ekmett/semigroups/";
        description = "Anything that associates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semigroups-actions" = callPackage
@@ -173807,7 +175098,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "servant-swagger" = callPackage
+  "servant-swagger_0_1_1" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec
      , http-media, lens, servant, swagger2, text, time
      , unordered-containers
@@ -173828,9 +175119,10 @@ self: {
        homepage = "https://github.com/dmjio/servant-swagger";
        description = "Generate Swagger specification for your servant API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "servant-swagger_0_1_2" = callPackage
+  "servant-swagger" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec
      , http-media, lens, servant, swagger2, text, time
      , unordered-containers
@@ -173849,7 +175141,6 @@ self: {
        homepage = "https://github.com/dmjio/servant-swagger";
        description = "Generate Swagger specification for your servant API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-yaml" = callPackage
@@ -175334,16 +176625,18 @@ self: {
      }) {};
 
   "shakespeare-babel" = callPackage
-    ({ mkDerivation, base, classy-prelude, shakespeare
-     , template-haskell
+    ({ mkDerivation, base, classy-prelude, data-default, directory
+     , process, shakespeare, template-haskell
      }:
      mkDerivation {
        pname = "shakespeare-babel";
-       version = "0.1.0.0";
-       sha256 = "a072ca9cf9397f23b74920d395d880108a7268d63a93da3086ed5a40ee0c2035";
+       version = "0.2.0.0";
+       sha256 = "cf3f66f382407464059f7091d3a3c83c61ab32e0fcee9c6dd70d38623bce6bdf";
        libraryHaskellDepends = [
-         base classy-prelude shakespeare template-haskell
+         base classy-prelude data-default directory process shakespeare
+         template-haskell
        ];
+       jailbreak = true;
        description = "compile es2015";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
@@ -185642,7 +186935,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "strict-base-types" = callPackage
+  "strict-base-types_0_4_0" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, binary, deepseq, ghc-prim
      , hashable, lens, QuickCheck, strict
      }:
@@ -185657,6 +186950,24 @@ self: {
        homepage = "https://github.com/meiersi/strict-base-types";
        description = "Strict variants of the types provided in base";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "strict-base-types" = callPackage
+    ({ mkDerivation, aeson, base, bifunctors, binary, deepseq, ghc-prim
+     , hashable, lens, QuickCheck, strict
+     }:
+     mkDerivation {
+       pname = "strict-base-types";
+       version = "0.5.0";
+       sha256 = "febcadf3d7f97f9c8c161a98e2537ba83a8adc4e4f6015e65430d7367104a1cb";
+       libraryHaskellDepends = [
+         aeson base bifunctors binary deepseq ghc-prim hashable lens
+         QuickCheck strict
+       ];
+       homepage = "https://github.com/meiersi/strict-base-types";
+       description = "Strict variants of the types provided in base";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "strict-concurrency" = callPackage
@@ -186494,7 +187805,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stylish-haskell" = callPackage
+  "stylish-haskell_0_5_14_4" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cmdargs, containers
      , directory, filepath, haskell-src-exts, HUnit, mtl, strict, syb
      , test-framework, test-framework-hunit, yaml
@@ -186521,6 +187832,67 @@ 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, cmdargs, containers
+     , directory, filepath, haskell-src-exts, HUnit, mtl, strict, syb
+     , test-framework, test-framework-hunit, yaml
+     }:
+     mkDerivation {
+       pname = "stylish-haskell";
+       version = "0.5.15.0";
+       sha256 = "58567478ec005164a3cb617b66676a1351c599e5bbf7bf81ef9c2fe4a199d9e5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory filepath
+         haskell-src-exts mtl syb yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring cmdargs containers directory filepath
+         haskell-src-exts mtl strict syb yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring cmdargs containers directory filepath
+         haskell-src-exts HUnit mtl syb test-framework test-framework-hunit
+         yaml
+       ];
+       doHaddock = false;
+       homepage = "https://github.com/jaspervdj/stylish-haskell";
+       description = "Haskell code prettifier";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "stylish-haskell_0_5_15_1" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cmdargs, containers
+     , directory, filepath, haskell-src-exts, HUnit, mtl, strict, syb
+     , test-framework, test-framework-hunit, yaml
+     }:
+     mkDerivation {
+       pname = "stylish-haskell";
+       version = "0.5.15.1";
+       sha256 = "c7ff0fdf7a2e23b3c23dfd7b925ec29117a7d6d93fe1445f88d28b589802fee5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory filepath
+         haskell-src-exts mtl syb yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring cmdargs containers directory filepath
+         haskell-src-exts mtl strict syb yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring cmdargs 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stylized" = callPackage
@@ -186641,7 +188013,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "success" = callPackage
+  "success_0_2_4" = callPackage
     ({ mkDerivation, base, monad-control, mtl, transformers
      , transformers-base
      }:
@@ -186655,6 +188027,23 @@ self: {
        homepage = "https://github.com/nikita-volkov/success";
        description = "A version of Either specialised for encoding of success or failure";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "success" = callPackage
+    ({ mkDerivation, base, monad-control, mtl, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "success";
+       version = "0.2.5";
+       sha256 = "d1548e0a685956ae0b568f89e9935af58ed6042fd5b850314b81e0a1efadabca";
+       libraryHaskellDepends = [
+         base monad-control mtl transformers transformers-base
+       ];
+       homepage = "https://github.com/nikita-volkov/success";
+       description = "A version of Either specialised for encoding of success or failure";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "suffixarray" = callPackage
@@ -188815,7 +190204,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tagged" = callPackage
+  "tagged_0_8_2" = callPackage
     ({ mkDerivation, base, deepseq, template-haskell }:
      mkDerivation {
        pname = "tagged";
@@ -188825,9 +190214,10 @@ self: {
        homepage = "http://github.com/ekmett/tagged";
        description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tagged_0_8_3" = callPackage
+  "tagged" = callPackage
     ({ mkDerivation, base, deepseq, template-haskell }:
      mkDerivation {
        pname = "tagged";
@@ -188837,7 +190227,6 @@ self: {
        homepage = "http://github.com/ekmett/tagged";
        description = "Haskell 98 phantom types to avoid unsafely passing dummy arguments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tagged-binary" = callPackage
@@ -188855,14 +190244,12 @@ self: {
     ({ mkDerivation, base, exceptions, mmorph, mtl, transformers }:
      mkDerivation {
        pname = "tagged-exception-core";
-       version = "2.1.0.0";
-       sha256 = "5d31398c2780363254d7593b3b3ece476e6114cc92a811aab7bb38b3301080f0";
-       revision = "2";
-       editedCabalFile = "da217c59c330c63984c85be6a669d1c5c990985fa8911ea537087823a45bb8cf";
+       version = "2.2.0.0";
+       sha256 = "b8e9ecabbf75c1733d0056a68349020d6104db6007cb466fa79e570464bd40c2";
        libraryHaskellDepends = [
          base exceptions mmorph mtl transformers
        ];
-       homepage = "https://github.com/trskop/tagged-exception";
+       homepage = "https://github.com/trskop/tagged-exception-core";
        description = "Reflect exceptions using phantom types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -192583,6 +193970,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "textual" = callPackage
+    ({ mkDerivation, base, bytestring, text, utf8-string }:
+     mkDerivation {
+       pname = "textual";
+       version = "0.2.0.0";
+       sha256 = "de00ec44e43d3ed188c13c186d0326cde86fac9b8d0f42e9f937a1038f6c4c39";
+       libraryHaskellDepends = [ base bytestring text utf8-string ];
+       jailbreak = true;
+       homepage = "https://sealgram.com/git/haskell/text-like/";
+       description = "Textual type class for data that represent text";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "tf-random" = callPackage
     ({ mkDerivation, base, primitive, random, time }:
      mkDerivation {
@@ -193603,8 +195003,8 @@ self: {
      }:
      mkDerivation {
        pname = "threads-supervisor";
-       version = "1.0.4.0";
-       sha256 = "6d48e9007275c6ff3ce01c35f89a106110878e65c67c654f3432c3c3d6b9e02f";
+       version = "1.0.4.1";
+       sha256 = "d58d14711cabfb9e594d5e930e09a831aeb5ef4a428b2ebf09edc24d88d46cda";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -196785,7 +198185,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "tttool" = callPackage
+  "tttool_1_5_1" = callPackage
     ({ mkDerivation, aeson, base, binary, bytestring, containers
      , directory, executable-path, filepath, hashable, haskeline
      , JuicyPixels, mtl, parsec, process, random, template-haskell, time
@@ -196805,6 +198205,30 @@ self: {
        homepage = "https://github.com/entropia/tip-toi-reveng";
        description = "Working with files for the Tiptoi® pen";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "tttool" = callPackage
+    ({ mkDerivation, aeson, base, binary, bytestring, containers
+     , directory, executable-path, filepath, hashable, haskeline, HPDF
+     , JuicyPixels, mtl, optparse-applicative, parsec, process, random
+     , split, spool, template-haskell, time, vector, yaml, zlib
+     }:
+     mkDerivation {
+       pname = "tttool";
+       version = "1.6";
+       sha256 = "a2e6a9ad43ec7a0b6758d9fcd639d9c2e57d39c6c25427a888876d850985efd0";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base binary bytestring containers directory executable-path
+         filepath hashable haskeline HPDF JuicyPixels mtl
+         optparse-applicative parsec process random split spool
+         template-haskell time vector yaml zlib
+       ];
+       homepage = "https://github.com/entropia/tip-toi-reveng";
+       description = "Working with files for the Tiptoi® pen";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "tubes" = callPackage
@@ -197758,6 +199182,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "type-cache" = callPackage
+    ({ mkDerivation, base, containers, lens, lens-utils
+     , template-haskell
+     }:
+     mkDerivation {
+       pname = "type-cache";
+       version = "1.0";
+       sha256 = "ce75db1e0a87af31a6e2589ca74d7c5987c1541c70579e186c377045e6e070df";
+       libraryHaskellDepends = [
+         base containers lens lens-utils template-haskell
+       ];
+       homepage = "https://github.com/wdanilo/type-cache";
+       description = "Utilities for caching type families results. Sometimes complex type families take long time to compile, so it is proficient to cache them and use the final result without the need of re-computation.";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "type-cereal" = callPackage
     ({ mkDerivation, base, bytestring, cereal, data-hash
      , template-haskell, type-digits, type-spine
@@ -198278,23 +199718,27 @@ self: {
      }) {};
 
   "typed-wire" = callPackage
-    ({ mkDerivation, base, containers, directory, file-embed, filepath
-     , gitrev, mtl, optparse-applicative, parsec, text
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, gitrev, HTF, http-types, mtl, optparse-applicative
+     , parsec, process, temporary, text
      }:
      mkDerivation {
        pname = "typed-wire";
-       version = "0.2.1.3";
-       sha256 = "733ca272fee3a4e36c35e92fd34628a0db6076ea371724ce8046f8389f2cdcdc";
+       version = "0.3.0.0";
+       sha256 = "3faec8db44caf3658116619d88f9fb00dbf1b4e9f4e8106e4c1aeff2e7ec220f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base containers directory file-embed filepath mtl parsec text
+         base containers directory filepath http-types mtl parsec text
        ];
        executableHaskellDepends = [
          base directory filepath gitrev optparse-applicative text
        ];
-       homepage = "http://github.com/agrafix/typed-wire#readme";
-       description = "WIP: Language idependent type-safe communication";
+       testHaskellDepends = [
+         aeson base bytestring directory filepath HTF process temporary text
+       ];
+       homepage = "http://github.com/typed-wire/typed-wire#readme";
+       description = "Language idependent type-safe communication";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -198347,12 +199791,12 @@ self: {
      }) {};
 
   "typelevel" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, pretty, pretty-show }:
      mkDerivation {
        pname = "typelevel";
-       version = "1.0.2";
-       sha256 = "f8d150bbf6f946dbf51e14817225b519d5c31d6bcc1a1f21d48a9418b9c2c4fa";
-       libraryHaskellDepends = [ base ];
+       version = "1.0.4";
+       sha256 = "1cc8131a6e2cf9c84968980d73a543c7dc73fd6d878973a9f0a5ddaedf471dc2";
+       libraryHaskellDepends = [ base pretty pretty-show ];
        homepage = "https://github.com/wdanilo/typelevel";
        description = "Useful type level operations (type families and related operators)";
        license = stdenv.lib.licenses.asl20;
@@ -202737,7 +204181,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "vector-space" = callPackage
+  "vector-space_0_10_2" = callPackage
     ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }:
      mkDerivation {
        pname = "vector-space";
@@ -202746,6 +204190,18 @@ self: {
        libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
        description = "Vector & affine spaces, linear maps, and derivatives";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "vector-space" = callPackage
+    ({ mkDerivation, base, Boolean, MemoTrie, NumInstances }:
+     mkDerivation {
+       pname = "vector-space";
+       version = "0.10.3";
+       sha256 = "efe39aa83d5ec5187c26f88496faf7411d3ee943cbc719797e58d115b004c885";
+       libraryHaskellDepends = [ base Boolean MemoTrie NumInstances ];
+       description = "Vector & affine spaces, linear maps, and derivatives";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "vector-space-map" = callPackage
@@ -209304,8 +210760,8 @@ self: {
      }:
      mkDerivation {
        pname = "werewolf";
-       version = "0.3.4.0";
-       sha256 = "fadf96e8c8aa76a2c2d8d56eb8ac09a0babe2eba31b987d79e6f34d487f5b2e5";
+       version = "0.4.2.0";
+       sha256 = "b3872595401edf28f7a1854756f661253d8e1353ded7b92e60cabf3f5e35c68c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -212110,7 +213566,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "xml-conduit" = callPackage
+  "xml-conduit_1_3_3" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
      , blaze-markup, bytestring, conduit, conduit-extra, containers
      , data-default, deepseq, hspec, HUnit, monad-control, resourcet
@@ -212132,6 +213588,31 @@ self: {
        homepage = "http://github.com/snoyberg/xml";
        description = "Pure-Haskell utilities for dealing with XML with the conduit package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "xml-conduit" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, bytestring, conduit, conduit-extra, containers
+     , data-default, deepseq, hspec, HUnit, monad-control, resourcet
+     , text, transformers, xml-types
+     }:
+     mkDerivation {
+       pname = "xml-conduit";
+       version = "1.3.3.1";
+       sha256 = "3d8ad32feade67f989150f253d3df99b3e3af6fab536c18f591d46707430feca";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder blaze-html blaze-markup bytestring
+         conduit conduit-extra containers data-default deepseq monad-control
+         resourcet text transformers xml-types
+       ];
+       testHaskellDepends = [
+         base blaze-markup bytestring conduit containers hspec HUnit
+         resourcet text transformers xml-types
+       ];
+       homepage = "http://github.com/snoyberg/xml";
+       description = "Pure-Haskell utilities for dealing with XML with the conduit package";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "xml-conduit-parse" = callPackage
@@ -218209,6 +219690,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yesod-newsfeed_1_6" = callPackage
+    ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
+     , containers, shakespeare, text, time, xml-conduit, yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-newsfeed";
+       version = "1.6";
+       sha256 = "4e6dbc06002fe7fd13701941c036c51cf9407c35b28473ed509424bfc0b67516";
+       libraryHaskellDepends = [
+         base blaze-html blaze-markup bytestring containers shakespeare text
+         time xml-conduit yesod-core
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "Helper functions and data types for producing News feeds";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "yesod-paginate" = callPackage
     ({ mkDerivation, base, template-haskell, yesod }:
      mkDerivation {
@@ -218991,7 +220490,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-table" = callPackage
+  "yesod-table_2_0_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, contravariant, text
      , yesod-core
      }:
@@ -219005,6 +220504,23 @@ self: {
        homepage = "https://github.com/andrewthad/yesod-table";
        description = "HTML tables for Yesod";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-table" = callPackage
+    ({ mkDerivation, base, bytestring, containers, contravariant, text
+     , yesod-core
+     }:
+     mkDerivation {
+       pname = "yesod-table";
+       version = "2.0.2";
+       sha256 = "78876b5fac3a0c9725b1dad6ba44923abcce8e86930ee4c4c3f818a7e11d8877";
+       libraryHaskellDepends = [
+         base bytestring containers contravariant text yesod-core
+       ];
+       homepage = "https://github.com/andrewthad/yesod-table";
+       description = "HTML tables for Yesod";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "yesod-tableview" = callPackage

From bb94b09f667ccf0cee0a4c2b0d7f6b8135bfc88e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Jan 2016 22:35:11 +0100
Subject: [PATCH 1045/2285] Add LTS Haskell 5.1.

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 00b8f9ba9285..9014280a9146 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -340,6 +340,9 @@ rec {
     lts-5_0 = packages.ghc7103.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.0.nix { };
     };
+    lts-5_1 = packages.ghc7103.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.1.nix { };
+    };
 
   };
 }

From 9e06f6880c5446bc9de4c40db830d63cc43eb295 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Sun, 31 Jan 2016 22:28:05 +0100
Subject: [PATCH 1046/2285] cabal-install: build with native Cabal library when
 compiling with GHC 8.0.x

Fixes https://github.com/NixOS/nixpkgs/issues/12726.
---
 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index 118d9966b68e..d9a5702a0949 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -34,6 +34,9 @@ self: super: {
   unix = null;
   xhtml = null;
 
+  # cabal-install can use the native Cabal library.
+  cabal-install = super.cabal-install.override { Cabal = null; };
+
   # jailbreak-cabal can use the native Cabal library.
   jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
 

From e38979485702fe21af60dc2b93ba8b39ace78b0e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 3 Feb 2016 15:12:50 +0100
Subject: [PATCH 1047/2285] haskell-binary: update use of 0.8.0.1 to 0.8.2.0

---
 pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix  | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix  | 4 ++--
 pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
index c16c9d962e76..2c495a80e2eb 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
@@ -41,7 +41,7 @@ self: super: {
   unix = null;
 
   # These packages are core libraries in GHC 7.10.x, but not here.
-  binary = self.binary_0_8_0_1;
+  binary = self.binary_0_8_2_0;
   deepseq = self.deepseq_1_3_0_1;
   haskeline = self.haskeline_0_7_2_1;
   hoopl = self.hoopl_3_10_2_0;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index 9ba96214d6f2..8b9d962e8322 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -42,7 +42,7 @@ self: super: {
   xhtml = self.xhtml_3000_2_1;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_0_1; process = self.process_1_2_3_0; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_2_0; process = self.process_1_2_3_0; };
 
   # Newer versions don't compile.
   Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index a1dad7f3cd9a..6d47ccc866c8 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -41,10 +41,10 @@ self: super: {
   xhtml = self.xhtml_3000_2_1;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_0_1; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_2_0; };
 
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_0_1; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_2_0; });
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index c5e5802903db..60be40a79af0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -40,10 +40,10 @@ self: super: {
   xhtml = self.xhtml_3000_2_1;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_0_1; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_2_0; };
 
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_0_1; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_2_0; });
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;

From 2f105acba25e5cd038752fa812b02b5bbc995821 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Wed, 3 Feb 2016 13:10:34 -0500
Subject: [PATCH 1048/2285] cipherscan: fix license

Fixes broken evaluation due to 4c57b932a.
---
 pkgs/tools/security/cipherscan/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/cipherscan/default.nix b/pkgs/tools/security/cipherscan/default.nix
index e75b53b257d1..bde9756ee1a0 100644
--- a/pkgs/tools/security/cipherscan/default.nix
+++ b/pkgs/tools/security/cipherscan/default.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   meta = with lib; {
     description = "Very simple way to find out which SSL ciphersuites are supported by a target";
     homepage = "https://github.com/jvehent/cipherscan";
-    license = licenses.mpl;
+    license = licenses.mpl20;
     platforms = platforms.all;
     maintainers = with maintainers; [ cstrahan ];
   };

From 9679042278d7353457cb590b02cf27fa3d919af4 Mon Sep 17 00:00:00 2001
From: Al Zohali <zohl@fmap.me>
Date: Fri, 29 Jan 2016 23:30:03 +0300
Subject: [PATCH 1049/2285] nant: init at 20151115

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

diff --git a/pkgs/development/tools/build-managers/nant/default.nix b/pkgs/development/tools/build-managers/nant/default.nix
new file mode 100644
index 000000000000..858fc5b48df3
--- /dev/null
+++ b/pkgs/development/tools/build-managers/nant/default.nix
@@ -0,0 +1,69 @@
+{ fetchurl, stdenv, fetchFromGitHub, pkgconfig, mono, makeWrapper
+, targetVersion ? "4.5" }:
+
+let
+   version = "2015-11-15";
+
+  src = fetchFromGitHub {
+    owner = "nant";
+    repo = "nant";
+    rev = "19bec6eca205af145e3c176669bbd57e1712be2a";
+    sha256 = "11l5y76csn686p8i3kww9s0sxy659ny9l64krlqg3y2nxaz0fk6l";
+  };
+
+  nant-bootstrapped = stdenv.mkDerivation {
+    name = "nant-bootstrapped-${version}";
+    inherit src;
+
+    buildInputs = [ pkgconfig mono makeWrapper ];
+
+    buildFlags = "bootstrap";
+
+    dontStrip = true;
+
+    installPhase = ''
+      mkdir -p $out/lib/nant-bootstrap
+      cp -r bootstrap/* $out/lib/nant-bootstrap
+
+      mkdir -p $out/bin
+      makeWrapper "${mono}/bin/mono" $out/bin/nant \
+        --add-flags "$out/lib/nant-bootstrap/NAnt.exe"
+    '';
+  };
+
+in stdenv.mkDerivation {
+  name = "nant-${version}";
+  inherit src;
+
+  buildInputs = [ pkgconfig mono makeWrapper nant-bootstrapped ];
+
+  dontStrip = true;
+
+  buildPhase = ''
+    nant -t:mono-${targetVersion}
+  '';
+
+  installPhase = ''
+    mkdir -p $out/lib/nant
+    cp -r build/mono-${targetVersion}.unix/nant-debug/bin/* $out/lib/nant/
+
+    mkdir -p $out/bin
+    makeWrapper "${mono}/bin/mono" $out/bin/nant \
+      --add-flags "$out/lib/nant/NAnt.exe"
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://nant.sourceforge.net;
+    description = "NAnt is a free .NET build tool";
+
+    longDescription = ''
+      NAnt is a free .NET build tool. In theory it is kind of like make without
+      make's wrinkles. In practice it's a lot like Ant.
+    '';
+
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ zohl ];
+    platforms = platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d8a56bcb1795..bf92f2a9bbd0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5858,6 +5858,8 @@ let
     };
   };
 
+  nant = callPackage ../development/tools/build-managers/nant { };
+
   ninja = callPackage ../development/tools/build-managers/ninja { };
 
   nixbang = callPackage ../development/tools/misc/nixbang {

From 47c863f9ef8918239c9b13986427069b434d92f7 Mon Sep 17 00:00:00 2001
From: Kevin Cox <kevincox@kevincox.ca>
Date: Wed, 3 Feb 2016 18:45:01 -0500
Subject: [PATCH 1050/2285] backblaze-b2: init at version 0.3.10

---
 lib/maintainers.nix                           |  1 +
 .../tools/backblaze-b2/default.nix            | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 ++--
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/tools/backblaze-b2/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 046624f10f4b..973745daf697 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -159,6 +159,7 @@
   jzellner = "Jeff Zellner <jeffz@eml.cc>";
   kamilchm = "Kamil Chmielewski <kamil.chm@gmail.com>";
   kampfschlaefer = "Arnold Krille <arnold@arnoldarts.de>";
+  kevincox = "Kevin Cox <kevincox@kevincox.ca>";
   khumba = "Bryan Gardiner <bog@khumba.net>";
   kkallio = "Karn Kallio <tierpluspluslists@gmail.com>";
   koral = "Koral <koral@mailoo.org>";
diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix
new file mode 100644
index 000000000000..433aadebb6ce
--- /dev/null
+++ b/pkgs/development/tools/backblaze-b2/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, lib, fetchFromGitHub, pkgs }:
+
+stdenv.mkDerivation rec {
+  name = "backblaze-b2-0.3.10";
+
+  src = fetchFromGitHub {
+    owner = "Backblaze";
+    repo = "B2_Command_Line_Tool";
+    rev = "b097f0f04d3f88d7a372b50ee6db1f89a5249028";
+    sha256 = "1rcy8180476cpmrbls4424qbq8nyq7mxkfikd52a8skz7rd5ljc6";
+  };
+  
+  buildInputs = with pkgs; [ python2 ];
+
+  doCheck = true;
+  checkPhase = ''
+    python test_b2_command_line.py test
+  '';
+
+  installPhase = ''
+    install -Dm755 b2 "$out/bin/backblaze-b2"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Command-line tool for accessing the Backblaze B2 storage service.";
+    homepage    = https://github.com/Backblaze/B2_Command_Line_Tool;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ kevincox ];
+    platforms   = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1a3c3d3baaa8..0c4d1ce46141 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -663,6 +663,8 @@ let
 
   azureus = callPackage ../tools/networking/p2p/azureus { };
 
+  backblaze-b2 = callPackage ../development/tools/backblaze-b2 { };
+
   backup = callPackage ../tools/backup/backup { };
 
   basex = callPackage ../tools/text/xml/basex { };
@@ -2327,8 +2329,8 @@ let
 
   miniupnpd = callPackage ../tools/networking/miniupnpd { };
 
-  miniball = callPackage ../development/libraries/miniball { }; 
- 
+  miniball = callPackage ../development/libraries/miniball { };
+
   minixml = callPackage ../development/libraries/minixml { };
 
   mjpegtools = callPackage ../tools/video/mjpegtools { };

From 8821ebe3adaff385d63d3d14674ecae67f988f7e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 4 Feb 2016 03:51:29 +0300
Subject: [PATCH 1051/2285] remove gmcs substitutes from mono packages

---
 pkgs/applications/misc/pdfmod/default.nix    | 1 -
 pkgs/development/libraries/hyena/default.nix | 4 ----
 pkgs/top-level/dotnet-packages.nix           | 4 ----
 3 files changed, 9 deletions(-)

diff --git a/pkgs/applications/misc/pdfmod/default.nix b/pkgs/applications/misc/pdfmod/default.nix
index f23238b2dc61..23781d63664c 100644
--- a/pkgs/applications/misc/pdfmod/default.nix
+++ b/pkgs/applications/misc/pdfmod/default.nix
@@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
   ];
 
   preConfigure = ''
-    substituteInPlace configure --replace gmcs mcs
     substituteInPlace lib/poppler-sharp/poppler-sharp/poppler-sharp.dll.config \
       --replace libpoppler-glib.so.4 libpoppler-glib.so
   '';
diff --git a/pkgs/development/libraries/hyena/default.nix b/pkgs/development/libraries/hyena/default.nix
index daa4f7fb9f21..00d3e45805cb 100644
--- a/pkgs/development/libraries/hyena/default.nix
+++ b/pkgs/development/libraries/hyena/default.nix
@@ -19,10 +19,6 @@ stdenv.mkDerivation rec {
     find -name Makefile.in | xargs -n 1 -d '\n' sed -e 's/^dnl/#/' -i
   '';
 
-  preConfigure = ''
-    substituteInPlace configure --replace gmcs mcs
-  '';
-
   dontStrip = true;
 
   inherit monoDLLFixer;
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index a1c54074622e..a775630410b8 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -532,10 +532,6 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
       pkgconfig
     ];
 
-    preConfigure = ''
-      substituteInPlace configure --replace gmcs mcs
-    '';
-
     postInstall = ''
       # Otherwise pkg-config won't find it and the DLL will get duplicated
       ln -sv $out/lib/pkgconfig/ndesk-options.pc $out/lib/pkgconfig/NDesk.Options.pc

From 46ecb25d68ba94248945ba9dfebe8fafcf70ed15 Mon Sep 17 00:00:00 2001
From: Kranium Gikos Mendoza <kranium@gikos.net>
Date: Thu, 4 Feb 2016 11:31:28 +0800
Subject: [PATCH 1052/2285] facetimehd: blacklist bdc_pci when enabled

---
 nixos/modules/hardware/video/webcam/facetimehd.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/hardware/video/webcam/facetimehd.nix b/nixos/modules/hardware/video/webcam/facetimehd.nix
index 83d954a0c03e..b35709763b90 100644
--- a/nixos/modules/hardware/video/webcam/facetimehd.nix
+++ b/nixos/modules/hardware/video/webcam/facetimehd.nix
@@ -23,6 +23,8 @@ in
 
     boot.kernelModules = [ "facetimehd" ];
 
+    boot.blacklistedKernelModules = [ "bdc_pci" ];
+
     boot.extraModulePackages = [ kernelPackages.facetimehd ];
 
     hardware.firmware = [ pkgs.facetimehd-firmware ];

From b4c449635a09f5e143a9887afbefa7a7223fc906 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Thu, 4 Feb 2016 01:37:28 -0500
Subject: [PATCH 1053/2285] as31: init at 2.3.1

---
 lib/maintainers.nix                         |  1 +
 pkgs/development/compilers/as31/default.nix | 23 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 26 insertions(+)
 create mode 100644 pkgs/development/compilers/as31/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index f73312db99e7..aa27c6454369 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -26,6 +26,7 @@
   anderspapitto = "Anders Papitto <anderspapitto@gmail.com>";
   andres = "Andres Loeh <ksnixos@andres-loeh.de>";
   andrewrk = "Andrew Kelley <superjoe30@gmail.com>";
+  aneeshusa = "Aneesh Agrawal <aneeshusa@gmail.com>";
   antono = "Antono Vasiljev <self@antono.info>";
   ardumont = "Antoine R. Dumont <eniotna.t@gmail.com>";
   aristid = "Aristid Breitkreuz <aristidb@gmail.com>";
diff --git a/pkgs/development/compilers/as31/default.nix b/pkgs/development/compilers/as31/default.nix
new file mode 100644
index 000000000000..24cba18254f2
--- /dev/null
+++ b/pkgs/development/compilers/as31/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl }:
+
+let
+
+  version = "2.3.1";
+
+in stdenv.mkDerivation {
+  name = "as31-${version}";
+  src = fetchurl {
+    name = "as31-${version}.tar.gz"; # Nix doesn't like the colons in the URL
+    url = "http://wiki.erazor-zone.de/_media/wiki:projects:linux:as31:as31-${version}.tar.gz";
+    sha256 = "0mbk6z7z03xb0r0ccyzlgkjdjmdzknck4yxxmgr9k7v8f5c348fd";
+  };
+  preConfigure = ''
+    chmod +x ./configure
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://wiki.erazor-zone.de/wiki:projects:linux:as31";
+    description = "An 8031/8051 assembler by Ken Stauffer and Theo Deraadt which produces a variety of object code output formats";
+    maintainers = with maintainers; [ aneeshusa ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 92fd1d49a661..7ceef7ecad0a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -565,6 +565,8 @@ let
 
   artyFX = callPackage ../applications/audio/artyFX {};
 
+  as31 = callPackage ../development/compilers/as31 {};
+
   ascii = callPackage ../tools/text/ascii { };
 
   asciinema = goPackages.asciinema.bin // { outputs = [ "bin" ]; };

From 23beba49945800f0042899bfbb97b5b2101a629f Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Thu, 4 Feb 2016 09:55:53 +0100
Subject: [PATCH 1054/2285] goPackages.oauth2_proxy: init at 20160120

Also add missing dependency:

goPackages.hmacauth: init at 20151013
---
 pkgs/top-level/all-packages.nix |  2 ++
 pkgs/top-level/go-packages.nix  | 26 ++++++++++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e5f61bfb62f4..51ecfcf73501 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9448,6 +9448,8 @@ let
 
   nsq = goPackages.nsq.bin // { outputs = [ "bin" ]; };
 
+  oauth2_proxy = goPackages.oauth2_proxy.bin // { outputs = [ "bin" ]; };
+
   openpts = callPackage ../servers/openpts { };
 
   openresty = callPackage ../servers/http/openresty { };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index ad02f75f47fb..4c10eec65af5 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1838,6 +1838,17 @@ let
     };
   };
 
+  hmacauth = buildGoPackage {
+    name = "hmacauth";
+    goPackagePath = "github.com/18F/hmacauth";
+    src = fetchFromGitHub {
+      rev = "9232a6386b737d7d1e5c1c6e817aa48d5d8ee7cd";
+      owner = "18F";
+      repo = "hmacauth";
+      sha256 = "056mcqrf2bv0g9gn2ixv19srk613h4sasl99w9375mpvmadb3pz1";
+    };
+  };
+
   hologram = buildGoPackage rec {
     rev  = "63014b81675e1228818bf36ef6ef0028bacad24b";
     name = "hologram-${stdenv.lib.strings.substring 0 7 rev}";
@@ -2362,6 +2373,21 @@ 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 ae662cdb11cb011aa5fbbf99771927988c379bd2 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 4 Feb 2016 13:14:14 +0300
Subject: [PATCH 1055/2285] display-manager module: load pulseaudio's
 module-device-manager only for KDE

---
 nixos/modules/services/x11/desktop-managers/kde4.nix   |  6 ++++++
 nixos/modules/services/x11/desktop-managers/kde5.nix   | 10 +++++++++-
 .../modules/services/x11/display-managers/default.nix  |  3 ---
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix
index 29cca248cde3..80e408be4923 100644
--- a/nixos/modules/services/x11/desktop-managers/kde4.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde4.nix
@@ -108,6 +108,12 @@ in
                 sed -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
             fi
 
+            # Load PulseAudio module for routing support.
+            # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/
+            ${optionalString config.hardware.pulseaudio.enable ''
+              ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
+            ''}
+
             # Start KDE.
             exec ${kde_workspace}/bin/startkde
           '';
diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index e8c768e41fad..713a156d35ab 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -55,7 +55,15 @@ in
     services.xserver.desktopManager.session = singleton {
       name = "kde5";
       bgSupport = true;
-      start = ''exec ${kde5.plasma-workspace}/bin/startkde;'';
+      start = ''
+        # Load PulseAudio module for routing support.
+        # See http://colin.guthr.ie/2009/10/so-how-does-the-kde-pulseaudio-support-work-anyway/
+        ${optionalString config.hardware.pulseaudio.enable ''
+          ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
+        ''}
+
+        exec ${kde5.plasma-workspace}/bin/startkde
+      '';
     };
 
     security.setuidOwners = singleton {
diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index bad99ccd8696..87f3a4837a69 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -90,9 +90,6 @@ let
 
         # Publish access credentials in the root window.
         ${config.hardware.pulseaudio.package}/bin/pactl load-module module-x11-publish "display=$DISPLAY"
-
-        # Keep track of devices.  Mostly useful for Phonon/KDE.
-        ${config.hardware.pulseaudio.package}/bin/pactl load-module module-device-manager "do_routing=1"
       ''}
 
       # Tell systemd about our $DISPLAY. This is needed by the

From 46700df1c17a22bc96f26adb085be8d10dbdc38f Mon Sep 17 00:00:00 2001
From: Kevin Marsh <kevinmarsh3@gmail.com>
Date: Thu, 4 Feb 2016 11:32:47 +0000
Subject: [PATCH 1056/2285] django: update minor version numbers (to 1.9.2,
 1.8.9, 1.7.11)

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 169a2e17514a..a2f15339e460 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7678,12 +7678,12 @@ in modules // {
 
   django_1_9 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.9";
+    version = "1.9.2";
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.9/${name}.tar.gz";
-      sha256 = "0rkwdxh63y7pwx9larl2g7m1z206675dzx7ipd44p3bpm0clpzh5";
+      sha256 = "0bwapyjdl1w62cdv3kx27kj1s5zj93fyby8mhgysapdkxqi368vs";
     };
 
     # patch only $out/bin to avoid problems with starter templates (see #3134)
@@ -7702,12 +7702,12 @@ in modules // {
 
   django_1_8 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.8.4";
+    version = "1.8.9";
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz";
-      sha256 = "1n3hb80v7wl5j2mry5pfald6i9z42a9c3m9405877iqw3v49csc2";
+      sha256 = "1qyjpdpsj1n5lx10vak9bwl554br01wbn0kjhy7646i00y2js0gw";
     };
 
     # too complicated to setup
@@ -7727,12 +7727,12 @@ in modules // {
 
   django_1_7 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.7.10";
+    version = "1.7.11";
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.7/${name}.tar.gz";
-      sha256 = "0xbwg6nyvwcbp2hvk0x3s5y823k5kizn0za1bl2rf6g6xcn7sddr";
+      sha256 = "18arf0zr98q2gxhimm2fgh0avwcdax1mcnps0cyn06wgrr7i8f90";
     };
 
     # too complicated to setup

From 4ce954d02e1c44cdf5ba6b8ddbd4b0cbd88fe947 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 2 Feb 2016 04:55:46 +0100
Subject: [PATCH 1057/2285] wine: consolidate source packages

In order to update wine packages more easily, the source derivations are
collected into a single sources.nix, so hashes can be updated like
`nix-prefetch-url pkgs/misc/emulators/wine/sources.nix -A stable`
---
 pkgs/misc/emulators/wine/packages.nix   | 51 ++++++-----------------
 pkgs/misc/emulators/wine/sources.nix    | 55 +++++++++++++++++++++++++
 pkgs/misc/emulators/wine/staging.nix    | 13 ++----
 pkgs/misc/emulators/wine/versions.nix   | 30 --------------
 pkgs/misc/emulators/wine/winetricks.nix | 14 ++-----
 5 files changed, 74 insertions(+), 89 deletions(-)
 create mode 100644 pkgs/misc/emulators/wine/sources.nix
 delete mode 100644 pkgs/misc/emulators/wine/versions.nix

diff --git a/pkgs/misc/emulators/wine/packages.nix b/pkgs/misc/emulators/wine/packages.nix
index 1a7e32efcbe1..69275a74b356 100644
--- a/pkgs/misc/emulators/wine/packages.nix
+++ b/pkgs/misc/emulators/wine/packages.nix
@@ -1,62 +1,35 @@
-{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, fetchurl,
+{ system, stdenv, stdenv_32bit, lib, pkgs, pkgsi686Linux, callPackage,
   pulseaudioSupport,
   wineRelease ? "stable"
 }:
 
-let sources = with lib.getAttr wineRelease (import ./versions.nix); {
-      version = wineVersion;
-      src = fetchurl {
-        url = "mirror://sourceforge/wine/wine-${wineVersion}.tar.bz2";
-        sha256 = wineSha256;
-      };
-
-      wineGecko32 = fetchurl {
-        url = "mirror://sourceforge/wine/wine_gecko-${geckoVersion}-x86.msi";
-        sha256 = geckoSha256;
-      };
-
-      wineGecko64 = fetchurl {
-        url = "mirror://sourceforge/wine/wine_gecko-${gecko64Version}-x86_64.msi";
-        sha256 = gecko64Sha256;
-      };
-
-      wineMono = fetchurl {
-        url = "mirror://sourceforge/wine/wine-mono-${monoVersion}.msi";
-        sha256 = monoSha256;
-      };
-    };
-    inherit (sources) version;
-in {
+let src = lib.getAttr wineRelease (callPackage ./sources.nix {});
+in with src; {
   wine32 = import ./base.nix {
     name = "wine-${version}";
-    inherit (sources) version src;
+    inherit src version pulseaudioSupport;
     inherit (pkgsi686Linux) lib stdenv;
-    inherit pulseaudioSupport;
     pkgArches = [ pkgsi686Linux ];
-    geckos = with sources; [ wineGecko32 ];
-    monos = with sources; [ wineMono ];
+    geckos = [ gecko32 ];
+    monos =  [ mono ];
     platforms = [ "i686-linux" "x86_64-linux" ];
   };
   wine64 = import ./base.nix {
     name = "wine64-${version}";
-    inherit (sources) version src;
-    inherit lib stdenv;
-    inherit pulseaudioSupport;
+    inherit src version pulseaudioSupport lib stdenv;
     pkgArches = [ pkgs ];
-    geckos = with sources; [ wineGecko64 ];
-    monos = with sources; [ wineMono ];
+    geckos = [ gecko64 ];
+    monos =  [ mono ];
     configureFlags = "--enable-win64";
     platforms = [ "x86_64-linux" ];
   };
   wineWow = import ./base.nix {
     name = "wine-wow-${version}";
-    inherit (sources) version src;
-    inherit lib;
+    inherit src version pulseaudioSupport lib;
     stdenv = stdenv_32bit;
-    inherit pulseaudioSupport;
     pkgArches = [ pkgs pkgsi686Linux ];
-    geckos = with sources; [ wineGecko32 wineGecko64 ];
-    monos = with sources; [ wineMono ];
+    geckos = [ gecko32 gecko64 ];
+    monos =  [ mono ];
     buildScript = ./builder-wow.sh;
     platforms = [ "x86_64-linux" ];
   };
diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
new file mode 100644
index 000000000000..8c2caf8ab6c8
--- /dev/null
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -0,0 +1,55 @@
+{ pkgs ? import <nixpkgs> {} }:
+let fetchurl = args@{url, sha256, ...}:
+  pkgs.fetchurl { inherit url sha256; } // args;
+    fetchFromGitHub = args@{owner, repo, rev, sha256, ...}:
+  pkgs.fetchFromGitHub { inherit owner repo rev sha256; } // args;
+in rec {
+
+  stable = fetchurl rec {
+    version = "1.8";
+    url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";
+    sha256 = "1x66lzpk7v8qx57clmcq5ag7yh3mqplf1plypwghgchjh70lafzk";
+
+    ## see http://wiki.winehq.org/Gecko
+    gecko32 = fetchurl rec {
+      version = "2.40";
+      url = "mirror://sourceforge/wine/wine_gecko-${version}-x86.msi";
+      sha256 = "00nkaxhb9dwvf53ij0q75fb9fh7pf43hmwx6rripcax56msd2a8s";
+    };
+    gecko64 = fetchurl rec {
+      version = "2.40";
+      url = "mirror://sourceforge/wine/wine_gecko-${version}-x86_64.msi";
+      sha256 = "0c4jikfzb4g7fyzp0jcz9fk2rpdl1v8nkif4dxcj28nrwy48kqn3";
+    };
+    ## see http://wiki.winehq.org/Mono
+    mono = fetchurl rec {
+      version = "4.5.6";
+      url = "mirror://sourceforge/wine/wine-mono-${version}.msi";
+      sha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c";
+    };
+  };
+
+  unstable = fetchurl rec {
+    version = "1.9.2";
+    url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";
+    sha256 = "0yjf0i2yc0yj366kg6b2ci9bwz3jq5k5vl01bqw4lbpgf5m4sk9k";
+    inherit (stable) gecko32 gecko64 mono;
+  };
+
+  staging = fetchFromGitHub rec {
+    inherit (unstable) version;
+    sha256 = "05lxhl9rv936xh8v640l36xswszwc41iwpbjq7n5cwk361mdh1lp";
+    owner = "wine-compholio";
+    repo = "wine-staging";
+    rev = "v${version}";
+  };
+
+  winetricks = fetchFromGitHub rec {
+    version = "20160109";
+    sha256 = "0pnl5362g5q7py368vj07swbdp1fqbpvpq4jv4l5ddyclps8ajg8";
+    owner = "Winetricks";
+    repo = "winetricks";
+    rev = version;
+  };
+
+}
diff --git a/pkgs/misc/emulators/wine/staging.nix b/pkgs/misc/emulators/wine/staging.nix
index da4456c0ef98..9419aff1a39c 100644
--- a/pkgs/misc/emulators/wine/staging.nix
+++ b/pkgs/misc/emulators/wine/staging.nix
@@ -1,18 +1,11 @@
-{ stdenv, callPackage, lib, fetchFromGitHub, wineUnstable, libtxc_dxtn_Name }:
+{ stdenv, callPackage, lib, wineUnstable, libtxc_dxtn_Name }:
 
 with callPackage ./util.nix {};
 
-let v = (import ./versions.nix).staging;
-    inherit (v) version;
-    patch = fetchFromGitHub {
-      inherit (v) sha256;
-      owner = "wine-compholio";
-      repo = "wine-staging";
-      rev = "v${version}";
-    };
+let patch = (callPackage ./sources.nix {}).staging;
     build-inputs = pkgNames: extra:
       (mkBuildInputs wineUnstable.pkgArches pkgNames) ++ extra;
-in assert (builtins.parseDrvName wineUnstable.name).version == version;
+in assert (builtins.parseDrvName wineUnstable.name).version == patch.version;
 
 stdenv.lib.overrideDerivation wineUnstable (self: {
   nativeBuildInputs = build-inputs [ libtxc_dxtn_Name ] self.nativeBuildInputs; 
diff --git a/pkgs/misc/emulators/wine/versions.nix b/pkgs/misc/emulators/wine/versions.nix
deleted file mode 100644
index d2c4cc6e43e6..000000000000
--- a/pkgs/misc/emulators/wine/versions.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-rec {
-  stable = {
-    wineVersion = "1.8";
-    wineSha256  = "1x66lzpk7v8qx57clmcq5ag7yh3mqplf1plypwghgchjh70lafzk";
-    ## see http://wiki.winehq.org/Gecko
-    geckoVersion = "2.40";
-    geckoSha256 = "00nkaxhb9dwvf53ij0q75fb9fh7pf43hmwx6rripcax56msd2a8s";
-    gecko64Version = "2.40";
-    gecko64Sha256 = "0c4jikfzb4g7fyzp0jcz9fk2rpdl1v8nkif4dxcj28nrwy48kqn3";
-    ## see http://wiki.winehq.org/Mono
-    monoVersion = "4.5.6";
-    monoSha256 = "09dwfccvfdp3walxzp6qvnyxdj2bbyw9wlh6cxw2sx43gxriys5c";
-  };
-  unstable = {
-    wineVersion = "1.9.2";
-    wineSha256 = "0yjf0i2yc0yj366kg6b2ci9bwz3jq5k5vl01bqw4lbpgf5m4sk9k";
-    inherit (stable)
-      geckoVersion geckoSha256
-      gecko64Version gecko64Sha256
-      monoVersion monoSha256;
-  };
-  staging = {
-    version = unstable.wineVersion;
-    sha256 = "05lxhl9rv936xh8v640l36xswszwc41iwpbjq7n5cwk361mdh1lp";
-  };
-  winetricks = {
-    version = "20160109";
-    sha256 = "0pnl5362g5q7py368vj07swbdp1fqbpvpq4jv4l5ddyclps8ajg8";
-  };
-}
diff --git a/pkgs/misc/emulators/wine/winetricks.nix b/pkgs/misc/emulators/wine/winetricks.nix
index 39aaa098cfef..2d729f7185fa 100644
--- a/pkgs/misc/emulators/wine/winetricks.nix
+++ b/pkgs/misc/emulators/wine/winetricks.nix
@@ -1,16 +1,10 @@
-{ stdenv, fetchFromGitHub, wine, perl, which, coreutils, zenity, curl
+{ stdenv, callPackage, wine, perl, which, coreutils, zenity, curl
 , cabextract, unzip, p7zip, gnused, gnugrep, bash } :
 
-let v = (import ./versions.nix).winetricks;
-in stdenv.mkDerivation rec {
-  name = "winetricks-${v.version}";
+stdenv.mkDerivation rec {
+  name = "winetricks-${src.version}";
 
-  src = fetchFromGitHub {
-    owner = "Winetricks";
-    repo = "winetricks";
-    rev = v.version;
-    sha256 = v.sha256;
-  };
+  src = (callPackage ./sources.nix {}).winetricks;
 
   buildInputs = [ perl which ];
 

From 6abe531aafd2878f031d838a1353fda6f4989a85 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 4 Feb 2016 14:22:44 +0100
Subject: [PATCH 1058/2285] wine stable: 1.8 -> 1.8.1

---
 pkgs/misc/emulators/wine/sources.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index 8c2caf8ab6c8..49c7e71af8a5 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";
+    version = "1.8.1";
     url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";
-    sha256 = "1x66lzpk7v8qx57clmcq5ag7yh3mqplf1plypwghgchjh70lafzk";
+    sha256 = "15ya496qq24ipqii7ij8x8h5x8n21vgqa4h6binb74w5mzdd76hl";
 
     ## see http://wiki.winehq.org/Gecko
     gecko32 = fetchurl rec {

From 95584666e9bbb98ae662b88f7fd2b40edc328624 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Feb 2016 15:15:19 +0100
Subject: [PATCH 1059/2285] amazon-init.nix: Don't run nixos-rebuild if we
 don't have to

---
 nixos/modules/virtualisation/amazon-init.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix
index 96cd57e6db5d..861838d1bde1 100644
--- a/nixos/modules/virtualisation/amazon-init.nix
+++ b/nixos/modules/virtualisation/amazon-init.nix
@@ -6,7 +6,7 @@ let
   bootScript = pkgs.writeScript "bootscript.sh" ''
     #!${pkgs.stdenv.shell} -eux
 
-    echo "attempting to fetch configuration from user-data..."
+    echo "attempting to fetch configuration from EC2 user data..."
 
     export PATH=${config.nix.package}/bin:${pkgs.wget}/bin:${pkgs.systemd}/bin:${pkgs.gnugrep}/bin:${pkgs.gnused}/bin:${config.system.build.nixos-rebuild}/bin:$PATH
     export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
@@ -15,7 +15,7 @@ let
     wget -q --wait=1 --tries=0 --retry-connrefused -O - http://169.254.169.254/2011-01-01/user-data > "$userData"
 
     if [[ $? -eq 0 ]]; then
-      echo "user-data fetched"
+
       # If the user-data looks like it could be a nix expression,
       # copy it over. Also, look for a magic three-hash comment and set
       # that as the channel.
@@ -30,17 +30,17 @@ let
           nix-channel --update
         fi
 
-        echo "setting configuration"
+        echo "setting configuration from EC2 user data"
         cp "$userData" /etc/nixos/configuration.nix
       else
-        echo "user-data does not appear to be a nix expression; ignoring"
+        echo "user data does not appear to be a Nix expression; ignoring"
+        exit
       fi
     else
-      echo "failed to fetch user-data"
+      echo "failed to fetch user data"
+      exit
     fi
 
-    type -f nixos-rebuild
-
     nixos-rebuild switch
   '';
 in {

From 5c72b20ddeaed9cf3698a35760ef0fa5d9ff9e97 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Feb 2016 15:16:09 +0100
Subject: [PATCH 1060/2285] amazon-init.nix: Be less spammy

---
 nixos/modules/virtualisation/amazon-init.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix
index 861838d1bde1..716ce89154b4 100644
--- a/nixos/modules/virtualisation/amazon-init.nix
+++ b/nixos/modules/virtualisation/amazon-init.nix
@@ -4,7 +4,7 @@
 
 let
   bootScript = pkgs.writeScript "bootscript.sh" ''
-    #!${pkgs.stdenv.shell} -eux
+    #!${pkgs.stdenv.shell} -eu
 
     echo "attempting to fetch configuration from EC2 user data..."
 

From 27016659046a8f8e7b4fd61ecbceaf9f5e306258 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 4 Feb 2016 15:42:49 +0100
Subject: [PATCH 1061/2285] Fetch all EC2 metadata / user data in the initrd

Since we're already fetching one datum, we may as well fetch the
others needed by fetch-ec2-data. This also eliminates the dependency
on wget.
---
 nixos/modules/virtualisation/amazon-image.nix | 16 +++++++-
 nixos/modules/virtualisation/amazon-init.nix  |  9 ++---
 nixos/modules/virtualisation/ec2-data.nix     | 38 ++++++++-----------
 3 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix
index 2f6a95786a2c..a895f66db8ef 100644
--- a/nixos/modules/virtualisation/amazon-image.nix
+++ b/nixos/modules/virtualisation/amazon-image.nix
@@ -57,8 +57,7 @@ let cfg = config.ec2; in
     boot.initrd.postMountCommands =
       ''
         metaDir=$targetRoot/etc/ec2-metadata
-        mkdir -m 0755 -p $targetRoot/etc
-        mkdir -m 0700 -p "$metaDir"
+        mkdir -m 0755 -p "$metaDir"
 
         echo "getting EC2 instance metadata..."
 
@@ -66,6 +65,19 @@ let cfg = config.ec2; in
           wget -q -O "$metaDir/ami-manifest-path" http://169.254.169.254/1.0/meta-data/ami-manifest-path
         fi
 
+        if ! [ -e "$metaDir/user-data" ]; then
+          wget -q -O "$metaDir/user-data" http://169.254.169.254/1.0/user-data
+          chmod 600 "$metaDir/user-data"
+        fi
+
+        if ! [ -e "$metaDir/hostname" ]; then
+          wget -q -O "$metaDir/hostname" http://169.254.169.254/1.0/meta-data/hostname
+        fi
+
+        if ! [ -e "$metaDir/public-keys-0-openssh-key" ]; then
+          wget -q -O "$metaDir/public-keys-0-openssh-key" http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key
+        fi
+
         diskNr=0
         diskForUnionfs=
         for device in /dev/xvd[abcde]*; do
diff --git a/nixos/modules/virtualisation/amazon-init.nix b/nixos/modules/virtualisation/amazon-init.nix
index 716ce89154b4..886552f33c2c 100644
--- a/nixos/modules/virtualisation/amazon-init.nix
+++ b/nixos/modules/virtualisation/amazon-init.nix
@@ -8,13 +8,12 @@ let
 
     echo "attempting to fetch configuration from EC2 user data..."
 
-    export PATH=${config.nix.package}/bin:${pkgs.wget}/bin:${pkgs.systemd}/bin:${pkgs.gnugrep}/bin:${pkgs.gnused}/bin:${config.system.build.nixos-rebuild}/bin:$PATH
+    export PATH=${config.nix.package}/bin:${pkgs.systemd}/bin:${pkgs.gnugrep}/bin:${pkgs.gnused}/bin:${config.system.build.nixos-rebuild}/bin:$PATH
     export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixos-config=/etc/nixos/configuration.nix:/nix/var/nix/profiles/per-user/root/channels
 
-    userData="$(mktemp)"
-    wget -q --wait=1 --tries=0 --retry-connrefused -O - http://169.254.169.254/2011-01-01/user-data > "$userData"
+    userData=/etc/ec2-metadata/user-data
 
-    if [[ $? -eq 0 ]]; then
+    if [ -s "$userData" ]; then
 
       # If the user-data looks like it could be a nix expression,
       # copy it over. Also, look for a magic three-hash comment and set
@@ -37,7 +36,7 @@ let
         exit
       fi
     else
-      echo "failed to fetch user data"
+      echo "no user data is available"
       exit
     fi
 
diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix
index 383750520ab7..bee262612680 100644
--- a/nixos/modules/virtualisation/ec2-data.nix
+++ b/nixos/modules/virtualisation/ec2-data.nix
@@ -1,6 +1,6 @@
-# This module defines a systemd service that obtains the SSH key and
-# host name of virtual machines running on Amazon EC2, Eucalyptus and
-# OpenStack Compute (Nova).
+# This module defines a systemd service that sets the SSH host key and
+# authorized client key and host name of virtual machines running on
+# Amazon EC2, Eucalyptus and OpenStack Compute (Nova).
 
 { config, lib, pkgs, ... }:
 
@@ -9,55 +9,49 @@ with lib;
 {
   config = {
 
-    systemd.services.fetch-ec2-data =
-      { description = "Fetch EC2 Data";
+    systemd.services.apply-ec2-data =
+      { description = "Apply EC2 Data";
 
         wantedBy = [ "multi-user.target" "sshd.service" ];
         before = [ "sshd.service" ];
-        wants = [ "ip-up.target" ];
-        after = [ "ip-up.target" ];
 
-        path = [ pkgs.wget pkgs.iproute ];
+        path = [ pkgs.iproute ];
 
         script =
           ''
-            wget="wget -q --retry-connrefused -O -"
-
             ${optionalString (config.networking.hostName == "") ''
               echo "setting host name..."
-              ${pkgs.nettools}/bin/hostname $($wget http://169.254.169.254/1.0/meta-data/hostname)
+              if [ -s /etc/ec2-metadata/hostname ]; then
+                  ${pkgs.nettools}/bin/hostname $(cat /etc/ec2-metadata/hostname)
+              fi
             ''}
 
-            # Don't download the SSH key if it has already been injected
-            # into the image (a Nova feature).
             if ! [ -e /root/.ssh/authorized_keys ]; then
                 echo "obtaining SSH key..."
                 mkdir -m 0700 -p /root/.ssh
-                $wget http://169.254.169.254/1.0/meta-data/public-keys/0/openssh-key > /root/key.pub
-                if [ $? -eq 0 -a -e /root/key.pub ]; then
-                    cat /root/key.pub >> /root/.ssh/authorized_keys
+                if [ -s /etc/ec2-metadata/public-keys-0-openssh-key ]; then
+                    cat /etc/ec2-metadata/public-keys-0-openssh-key >> /root/.ssh/authorized_keys
                     echo "new key added to authorized_keys"
                     chmod 600 /root/.ssh/authorized_keys
-                    rm -f /root/key.pub
                 fi
             fi
 
             # Extract the intended SSH host key for this machine from
             # the supplied user data, if available.  Otherwise sshd will
             # generate one normally.
-            $wget http://169.254.169.254/2011-01-01/user-data > /root/user-data || true
+            userData=/etc/ec2-metadata/user-data
 
             mkdir -m 0755 -p /etc/ssh
 
-            key="$(sed 's/|/\n/g; s/SSH_HOST_DSA_KEY://; t; d' /root/user-data)"
-            key_pub="$(sed 's/SSH_HOST_DSA_KEY_PUB://; t; d' /root/user-data)"
+            key="$(sed 's/|/\n/g; s/SSH_HOST_DSA_KEY://; t; d' $userData)"
+            key_pub="$(sed 's/SSH_HOST_DSA_KEY_PUB://; t; d' $userData)"
             if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_dsa_key ]; then
                 (umask 077; echo "$key" > /etc/ssh/ssh_host_dsa_key)
                 echo "$key_pub" > /etc/ssh/ssh_host_dsa_key.pub
             fi
 
-            key="$(sed 's/|/\n/g; s/SSH_HOST_ED25519_KEY://; t; d' /root/user-data)"
-            key_pub="$(sed 's/SSH_HOST_ED25519_KEY_PUB://; t; d' /root/user-data)"
+            key="$(sed 's/|/\n/g; s/SSH_HOST_ED25519_KEY://; t; d' $userData)"
+            key_pub="$(sed 's/SSH_HOST_ED25519_KEY_PUB://; t; d' $userData)"
             if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_ed25519_key ]; then
                 (umask 077; echo "$key" > /etc/ssh/ssh_host_ed25519_key)
                 echo "$key_pub" > /etc/ssh/ssh_host_ed25519_key.pub

From d192057519e7ba2cd998cccaa998c49c3aa70be5 Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Thu, 4 Feb 2016 15:13:24 +0000
Subject: [PATCH 1062/2285] hg_crecord: revert changes adding mercurial crecord

crecord is included in modern hg releases - I failed to realize this.
---
 .../version-management/mercurial/default.nix  |  9 +-----
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            | 29 -------------------
 3 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index 0557b8a2c55e..d69291293204 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, python, makeWrapper, docutils, unzip, hg-git, dulwich
-, guiSupport ? false, tk ? null, hg-crecord ? null, curses
+, guiSupport ? false, tk ? null, curses
 , ApplicationServices, cf-private }:
 
 let
@@ -37,13 +37,6 @@ stdenv.mkDerivation {
       WRAP_TK=" --set TK_LIBRARY \"${tk}/lib/${tk.libPrefix}\"
                 --set HG \"$out/bin/hg\"
                 --prefix PATH : \"${tk}/bin\" "
-    '') + (stdenv.lib.optionalString (hg-crecord != null)
-    ''
-      mkdir -p $out/etc/mercurial
-      cat >> $out/etc/mercurial/hgrc << EOF
-      [extensions]
-      crecord=${hg-crecord}/${python.sitePackages}/crecord
-      EOF
     '') +
     ''
       for i in $(cd $out/bin && ls); do
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b2276b176cad..70e104cc15f4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12615,7 +12615,7 @@ let
     guiSupport = false; # use mercurialFull to get hgk GUI
   };
 
-  mercurialFull = appendToName "full" (pkgs.mercurial.override { inherit (pythonPackages) hg-crecord; guiSupport = true; });
+  mercurialFull = appendToName "full" (pkgs.mercurial.override { guiSupport = true; });
 
   merkaartor = callPackage ../applications/misc/merkaartor { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b6757094e896..8248f71339aa 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8190,35 +8190,6 @@ in modules // {
   };
 
 
-  hg-crecord = buildPythonPackage rec {
-    rev = "5cfaabfe9cb9f0a0d6837956d73127f290a213be";
-    name = "hg-crecord-${rev}";
-    disabled = isPy3k;
-
-    src = pkgs.fetchhg {
-      inherit rev;
-      url = "https://bitbucket.org/edgimar/crecord";
-      sha256 = "14x1k5k0jv3fiynpdfyp5zh4qvs4nr6qwy09chv3js3dhs5887ic";
-    };
-
-    # crecord comes as just a bare directory
-    configurePhase = " ";
-    buildPhase = "${python.executable} -m compileall crecord";
-    installPhase = ''
-      mkdir -p $out/${python.sitePackages}
-      cp -Lr crecord $out/${python.sitePackages}/
-    '';
-
-    # there ain't none
-    doCheck = false;
-
-    meta = {
-      description = "Mercurial extension for selecting graphically which files/hunk/lines to commit";
-      homepage = https://bitbucket.org/edgimar/crecord;
-    };
-  };
-
-
   docutils = buildPythonPackage rec {
     name = "docutils-0.12";
 

From 4f3a6d8ee2d35941d8092ebce5a094fc5cdae0d4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 4 Feb 2016 19:24:27 +0300
Subject: [PATCH 1063/2285] zandronum-bin: fix argv0, add license

---
 pkgs/games/zandronum/bin.nix    | 10 ++++++++--
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/zandronum/bin.nix b/pkgs/games/zandronum/bin.nix
index cf46877ef713..92f93d8f7785 100644
--- a/pkgs/games/zandronum/bin.nix
+++ b/pkgs/games/zandronum/bin.nix
@@ -16,6 +16,7 @@
 , pango
 , SDL
 , zlib
+, makeWrapper
 }:
 
 stdenv.mkDerivation rec {
@@ -46,6 +47,8 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
+  nativeBuildInputs = [ makeWrapper ];
+
   phases = [ "unpackPhase" "installPhase" ];
 
   sourceRoot = ".";
@@ -64,14 +67,17 @@ stdenv.mkDerivation rec {
       --set-rpath $libPath \
       $out/share/zandronum/zandronum-server
 
-    ln -s $out/share/zandronum/zandronum $out/bin/zandronum
-    ln -s $out/share/zandronum/zandronum-server $out/bin/zandronum-server
+    # If we don't set absolute argv0, zandronum.wad file is not found.
+    makeWrapper $out/share/zandronum/zandronum $out/bin/zandronum
+    makeWrapper $out/share/zandronum/zandronum-server $out/bin/zandronum-server
   '';
 
   meta = {
     homepage = http://zandronum.com/;
     description = "multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software. Binary version for online play.";
     maintainer = [ stdenv.lib.maintainers.lassulus ];
+    # Binary version has different version string than source code version.
+    license = stdenv.lib.licenses.unfreeRedistributable;
     platforms = [ "x86_64-linux" ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b2276b176cad..17cd638ada6f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14596,7 +14596,7 @@ let
     serverOnly = true;
   };
 
-  zandronum-bin = callPackage ../games/zandronum/bin.nix { };
+  zandronum-bin = hiPrio (callPackage ../games/zandronum/bin.nix { });
 
   zangband = callPackage ../games/zangband { };
 

From 7cc2756f31481a81343eaa62ac39fb30eed67d38 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tsteinbach@trustwave.com>
Date: Thu, 4 Feb 2016 11:31:12 -0500
Subject: [PATCH 1064/2285] kotlin: 1.0.0-beta-4584 -> 1.0.0-rc-1036

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

diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index b17be1c534b0..a6f5dcc21592 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, fetchurl, makeWrapper, jre, unzip, which }:
+{ stdenv, fetchurl, makeWrapper, jre, unzip }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.0-beta-4584";
+  version = "1.0.0-rc-1036";
   name = "kotlin-${version}";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/build-${version}/kotlin-compiler-${version}.zip";
-    sha256 = "191698784f4a1f769df14757bad40243293aa6bc3d8e906bfa0c80c3db0a1d2c";
+    sha256 = "8d72ff925678a2172fbbefcb6f0c5a195a300dccf240e5add16c3e8d86e13d67";
   };
 
-  propagatedBuildInputs = [ jre which ] ;
+  propagatedBuildInputs = [ jre ] ;
   buildInputs = [ makeWrapper unzip ] ;
 
   installPhase = ''

From 624006fcf51168555b22c26e18dfdef488c49775 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 4 Feb 2016 19:31:53 +0100
Subject: [PATCH 1065/2285] ecl: 15.3.7 -> 16.0.0; homepage is at
 common-lisp.net now

---
 pkgs/development/compilers/ecl/default.nix      | 8 ++++----
 pkgs/development/compilers/ecl/default.upstream | 6 ++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix
index 851459ad7d96..f863565ab072 100644
--- a/pkgs/development/compilers/ecl/default.nix
+++ b/pkgs/development/compilers/ecl/default.nix
@@ -7,11 +7,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="ecl";
-    version="15.3.7";
+    version="16.0.0";
     name="${baseName}-${version}";
-    hash="13wlxkd5prm93gcm2dhm7v52fl803yx93aa97lrb39z0y6xzziid";
-    url="mirror://sourceforge/project/ecls/ecls/15.3/ecl-15.3.7.tgz";
-    sha256="13wlxkd5prm93gcm2dhm7v52fl803yx93aa97lrb39z0y6xzziid";
+    hash="0czh78z9i5b7jc241mq1h1gdscvdw5fbhfb0g9sn4rchwk1x8gil";
+    url="https://common-lisp.net/project/ecl/files/ecl-16.0.0.tgz";
+    sha256="0czh78z9i5b7jc241mq1h1gdscvdw5fbhfb0g9sn4rchwk1x8gil";
   };
   buildInputs = [
     libtool autoconf automake
diff --git a/pkgs/development/compilers/ecl/default.upstream b/pkgs/development/compilers/ecl/default.upstream
index 70dcb1b43442..eeb82cbfcab1 100644
--- a/pkgs/development/compilers/ecl/default.upstream
+++ b/pkgs/development/compilers/ecl/default.upstream
@@ -1,4 +1,2 @@
-url http://sourceforge.net/projects/ecls/files/ecls/
-SF_version_dir
-version_link '[.]tgz/download$'
-SF_redirect
+url https://common-lisp.net/project/ecl/
+version_link '[.]tgz$'

From 0d1a188c5d5846e215a097af5214812be472f838 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 4 Feb 2016 20:13:49 +0100
Subject: [PATCH 1066/2285] Re-add Monotone-Viz with Fedora as a source

---
 .../monotone-viz/default.nix                  | 44 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 +++
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/applications/version-management/monotone-viz/default.nix

diff --git a/pkgs/applications/version-management/monotone-viz/default.nix b/pkgs/applications/version-management/monotone-viz/default.nix
new file mode 100644
index 000000000000..154d6442a2f2
--- /dev/null
+++ b/pkgs/applications/version-management/monotone-viz/default.nix
@@ -0,0 +1,44 @@
+{stdenv, fetchurl, ocaml, lablgtk, libgnomecanvas, camlp4, glib, pkgconfig, graphviz_2_0, makeWrapper}:
+stdenv.mkDerivation rec {
+  version = "1.0.2";
+  name = "monotone-viz-${version}";
+
+  buildInputs = [ocaml lablgtk libgnomecanvas glib pkgconfig graphviz_2_0 makeWrapper];
+  src = fetchurl {
+    url = "http://oandrieu.nerim.net/monotone-viz/${name}-nolablgtk.tar.gz";
+    sha256 = "1l5x4xqz5g1aaqbc1x80mg0yzkiah9ma9k9mivmn08alkjlakkdk";
+  };
+
+  prePatch="ln -s . a; ln -s . b";
+  patchFlags = ["-p0"];
+  patches = [
+    (fetchurl {
+      url = "http://pkgs.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-dot.patch";
+      sha256 = "0risfy8iqmkr209hmnvpv57ywbd3rvchzzd0jy2lfyqrrrm6zknw";
+    })
+    (fetchurl {
+      url = "http://pkgs.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-new-stdio.patch";
+      sha256 = "16bj0ppzqd45an154dr7sifjra7lv4m9anxfw3c56y763jq7fafa";
+    })
+    (fetchurl {
+      url = "http://pkgs.fedoraproject.org/cgit/rpms/monotone-viz.git/plain/monotone-viz-1.0.2-typefix.patch";
+      sha256 = "1gfp82rc7pawb5x4hh2wf7xh1l1l54ib75930xgd1y437la4703r";
+    })
+  ];
+
+  preConfigure = ''
+    configureFlags="$configureFlags --with-lablgtk-dir=$(echo ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2)"
+  '';
+
+  postInstall = ''
+    wrapProgram "$out/bin/monotone-viz" --prefix PATH : "${graphviz_2_0}/bin/"
+  '';
+
+  meta = {
+    inherit version;
+    description = ''Monotone ancestry visualiser'';
+    license = stdenv.lib.licenses.gpl2Plus ;
+    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 17cd638ada6f..b944b9128b85 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12675,6 +12675,11 @@ let
     lua = lua5;
   };
 
+  monotoneViz = callPackage ../applications/version-management/monotone-viz {
+    inherit (ocamlPackages_4_01_0) lablgtk ocaml camlp4;
+    inherit (gnome) libgnomecanvas glib;
+  };
+
   mopidy = callPackage ../applications/audio/mopidy { };
 
   mopidy-gmusic = callPackage ../applications/audio/mopidy-gmusic { };

From 621a9ac46c0ac8a52f91ba052c9e0f05a81ac22d Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Thu, 4 Feb 2016 20:36:02 +0100
Subject: [PATCH 1067/2285] arx-libertatis: init at version 2016-02-02

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

diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix
new file mode 100644
index 000000000000..47c58cc13b30
--- /dev/null
+++ b/pkgs/games/arx-libertatis/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchgit, cmake, zlib, boost,
+  openal, glm, freetype, mesa, glew, SDL2 }:
+
+stdenv.mkDerivation rec {
+  name = "arx-libertatis-${version}";
+  version = "2016-02-02";
+
+  src = fetchgit {
+    url = "https://github.com/arx/ArxLibertatis";
+    rev = "205c6cda4d5ac10f3af4ea7bb89c2fc88dac7c9a";
+    sha256 = "0dy81pk4r94qq720kk6ynkjp2wr3z9hzm9h1x46nkkpn7fj8srrn";
+  };
+
+  buildInputs = [
+    cmake zlib boost openal glm
+    freetype mesa glew SDL2
+  ];
+  
+  meta = with stdenv.lib; {
+    description = ''
+      A cross-platform, open source port of Arx Fatalis, a 2002
+      first-person role-playing game / dungeon crawler
+      developed by Arkane Studios.
+    '';
+    homepage = "http://arx-libertatis.org/";
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ rnhmjoj ];
+    platform = platforms.all;
+  };
+
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 17cd638ada6f..0aaf7563e3ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14106,6 +14106,8 @@ let
   anki = callPackage ../games/anki { };
 
   armagetronad = callPackage ../games/armagetronad { };
+  
+  arx-libertatis = callPackage ../games/arx-libertatis { };
 
   asc = callPackage ../games/asc {
     lua = lua5_1;

From d5281958f075a808519095b0f4b368aff472837e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Feb 2016 15:11:00 -0600
Subject: [PATCH 1068/2285] elpaPackages 2016-02-04

---
 .../editors/emacs-modes/elpa-generated.nix    | 105 ++++++++++++------
 1 file changed, 73 insertions(+), 32 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index 409e05748fa3..a9737e744ed6 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -28,10 +28,10 @@
     ada-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib, wisi }:
     elpaBuild {
         pname = "ada-mode";
-        version = "5.1.8";
+        version = "5.1.9";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/ada-mode-5.1.8.tar";
-          sha256 = "015lmliwk4qa2sbs9spxik6dnwsf1a34py6anklf92qnmzhjicy6";
+          url = "http://elpa.gnu.org/packages/ada-mode-5.1.9.tar";
+          sha256 = "04hwy9py22c4vpbk24idbyavjdjpm1akvnfigdzx35zljdrvk3l7";
         };
         packageRequires = [ cl-lib emacs wisi ];
         meta = {
@@ -148,10 +148,10 @@
       }) {};
     auctex = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "auctex";
-        version = "11.89";
+        version = "11.89.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/auctex-11.89.tar";
-          sha256 = "0ggk2q17wq4y9yw5b9mykk153ihphazjdj1fl4lv0zblgnrxz5l5";
+          url = "http://elpa.gnu.org/packages/auctex-11.89.1.tar";
+          sha256 = "0nqp12l5x2h0hxl8p3l6aiz4mvdf79zz84z1wl3q2prliac3xz17";
         };
         packageRequires = [];
         meta = {
@@ -188,10 +188,10 @@
     avy = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "avy";
-        version = "0.3.0";
+        version = "0.4.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/avy-0.3.0.tar";
-          sha256 = "1ycfqabx949s7dgp9vhyb9phpxw83gjw4cc7914gr84bqlkj0458";
+          url = "http://elpa.gnu.org/packages/avy-0.4.0.tar";
+          sha256 = "1vbp37ndv5930x120n0isxxxfs8d5wqlrbnxvp6h3ahbbv0zdcsn";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -417,10 +417,10 @@
       }) {};
     debbugs = callPackage ({ async, elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "debbugs";
-        version = "0.8";
+        version = "0.9";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/debbugs-0.8.tar";
-          sha256 = "1wp5wa2a0rwvpfdzd2b78k6vd26qbyqwl4p2c2s5l7zkqy258in5";
+          url = "http://elpa.gnu.org/packages/debbugs-0.9.tar";
+          sha256 = "1wc6kw7hihqqdx8qyl01akygycnan44x400hwrcf54m3hb4isa0k";
         };
         packageRequires = [ async ];
         meta = {
@@ -445,10 +445,10 @@
     diff-hl = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "diff-hl";
-        version = "1.8.2";
+        version = "1.8.3";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/diff-hl-1.8.2.tar";
-          sha256 = "1y0v5fiizkmhzafiscrcqjzxpwjcag5rx79lq3iplh58vxlmb65w";
+          url = "http://elpa.gnu.org/packages/diff-hl-1.8.3.tar";
+          sha256 = "1i3ngx5gmjl1a15y6d0xmcgdimn7ghrqkbzqisz4ra3dgwbbb3f9";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -684,6 +684,19 @@
           license = lib.licenses.free;
         };
       }) {};
+    gnome-c-style = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "gnome-c-style";
+        version = "0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/gnome-c-style-0.1.tar";
+          sha256 = "09w68jbpzyyhcaqw335qpr840j7xx0j81zxxkxq4ahqv6ck27v4x";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/gnome-c-style.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     gnorb = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "gnorb";
@@ -923,6 +936,20 @@
           license = lib.licenses.free;
         };
       }) {};
+    loccur = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    elpaBuild {
+        pname = "loccur";
+        version = "1.2.2";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/loccur-1.2.2.el";
+          sha256 = "0ij5wzxysaikiccw7mjbw1sfylvih0n6b6yyp55vn8w1z2dba0xk";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/loccur.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     markchars = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "markchars";
         version = "0.2.0";
@@ -1017,10 +1044,10 @@
       }) {};
     multishell = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "multishell";
-        version = "1.0.4";
+        version = "1.1.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/multishell-1.0.4.el";
-          sha256 = "11nx9h1c039h7md7pr1xlc3kla8n0vq6pa54i25wakf5n30019f4";
+          url = "http://elpa.gnu.org/packages/multishell-1.1.2.tar";
+          sha256 = "1y0b6ri0kgxj0jw1cyb796lsy3ipzb7syvmj7pqpx9myzpvd3hz3";
         };
         packageRequires = [];
         meta = {
@@ -1175,10 +1202,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20160118";
+        version = "20160201";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/org-20160118.tar";
-          sha256 = "107jzpykg5fgd4wzppn2ayvrg2l6z7mnlq8v7r52x15400k9xnxr";
+          url = "http://elpa.gnu.org/packages/org-20160201.tar";
+          sha256 = "1lyvfpksl88c9d7k2w4k3iswgjah51k9f8fdi3jbfwivd814m9nb";
         };
         packageRequires = [];
         meta = {
@@ -1332,6 +1359,19 @@
           license = lib.licenses.free;
         };
       }) {};
+    rnc-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "rnc-mode";
+        version = "0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/rnc-mode-0.1.el";
+          sha256 = "18hm9g05ld8i1apr28dmd9ccq6dc0w6rdqhi0k7ka95jxxdr9m6d";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/rnc-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     rudel = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "rudel";
         version = "0.3";
@@ -1663,10 +1703,10 @@
       }) {};
     wcheck-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "wcheck-mode";
-        version = "2016.1.5";
+        version = "2016.1.30";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/wcheck-mode-2016.1.5.el";
-          sha256 = "0axd32sw1papxz4yscjg85a2li8a8m8z5fn2jzb3620700j86jb3";
+          url = "http://elpa.gnu.org/packages/wcheck-mode-2016.1.30.el";
+          sha256 = "0hzrxnslfl04h083njy7wp4hhgrqpyz0cnm73v348kr1i4wx9xjq";
         };
         packageRequires = [];
         meta = {
@@ -1729,10 +1769,10 @@
     wisi = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "wisi";
-        version = "1.1.1";
+        version = "1.1.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/wisi-1.1.1.tar";
-          sha256 = "14bpir7kng8b4m1yna4iahhp2z0saagc2i8z53apd39msbplay3r";
+          url = "http://elpa.gnu.org/packages/wisi-1.1.2.tar";
+          sha256 = "04gryfpgbviviwbnvv3sh280pzasr59cp5xz1s0yf0n4d3rv2df3";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -1806,14 +1846,15 @@
           license = lib.licenses.free;
         };
       }) {};
-    ztree = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+    ztree = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
+    elpaBuild {
         pname = "ztree";
-        version = "1.0.2";
+        version = "1.0.3";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/ztree-1.0.2.tar";
-          sha256 = "0rm9b7cw5md9zbgbq89kh8wb5jdjrqy9g43psdws19z6j532g665";
+          url = "http://elpa.gnu.org/packages/ztree-1.0.3.tar";
+          sha256 = "1mwzk48sah4w5jmlmzqxnwhnlnc2mf25ayhgymv24sv8c6hdllsw";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "http://elpa.gnu.org/packages/ztree.html";
           license = lib.licenses.free;

From 0ea48b1f9f4aeb0b141d67efdceca7f5b8fb04ee Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 5 Feb 2016 00:23:46 +0300
Subject: [PATCH 1069/2285] openalLegacy: remove package

It's the same as openalSoft (same package source and version). I suppose it
contained original Creative open-source OpenAL implementation some time ago, but
then it changed and nobody noticed. It's referenced nowhere, anyway.
---
 pkgs/development/libraries/openal/default.nix | 35 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 37 deletions(-)
 delete mode 100644 pkgs/development/libraries/openal/default.nix

diff --git a/pkgs/development/libraries/openal/default.nix b/pkgs/development/libraries/openal/default.nix
deleted file mode 100644
index ac39ef2e84c1..000000000000
--- a/pkgs/development/libraries/openal/default.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, alsaLib, cmake }:
-
-let version = "1.16.0"; in
-stdenv.mkDerivation rec {
-  name = "openal-${version}";
-
-  src = fetchurl {
-    url = "http://kcat.strangesoft.net/openal-releases/openal-soft-${version}.tar.bz2";
-    sha256 = "0pqdykdclycfnk66v166srjrry936y39d1dz9wl92qz27wqwsg9g";
-  };
-
-  buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib;
-
-  meta = {
-    description = "Cross-platform 3D audio API";
-
-    longDescription = ''
-      OpenAL is a cross-platform 3D audio API appropriate for use with
-      gaming applications and many other types of audio applications.
-
-      The library models a collection of audio sources moving in a 3D
-      space that are heard by a single listener somewhere in that
-      space.  The basic OpenAL objects are a Listener, a Source, and a
-      Buffer.  There can be a large number of Buffers, which contain
-      audio data.  Each buffer can be attached to one or more Sources,
-      which represent points in 3D space which are emitting audio.
-      There is always one Listener object (per audio context), which
-      represents the position where the sources are heard -- rendering
-      is done from the perspective of the Listener.
-    '';
-
-    homepage = http://kcat.strangesoft.net/openal.html;
-    license = stdenv.lib.licenses.lgpl2Plus;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b944b9128b85..ed5e5ab8374c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8058,9 +8058,7 @@ let
 
   oniguruma = callPackage ../development/libraries/oniguruma { };
 
-  # openalSoft is 100% ABI compatible to openalLegacy and should be a default
   openal = openalSoft;
-  openalLegacy = callPackage ../development/libraries/openal { };
   openalSoft = callPackage ../development/libraries/openal-soft { };
 
   openbabel = callPackage ../development/libraries/openbabel { };

From 20af4b828727110ddbf205beccc0baaf314f81c9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 5 Feb 2016 02:07:01 +0300
Subject: [PATCH 1070/2285] arx-libertatis: use our DevaVu fonts, set proper
 data directory, enable parallel building

---
 pkgs/games/arx-libertatis/default.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/arx-libertatis/default.nix b/pkgs/games/arx-libertatis/default.nix
index 47c58cc13b30..4cf33d2984f4 100644
--- a/pkgs/games/arx-libertatis/default.nix
+++ b/pkgs/games/arx-libertatis/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchgit, cmake, zlib, boost,
-  openal, glm, freetype, mesa, glew, SDL2 }:
+  openal, glm, freetype, mesa, glew, SDL2,
+  dejavu_fonts }:
 
 stdenv.mkDerivation rec {
   name = "arx-libertatis-${version}";
@@ -15,6 +16,18 @@ stdenv.mkDerivation rec {
     cmake zlib boost openal glm
     freetype mesa glew SDL2
   ];
+
+  preConfigure = ''
+    cmakeFlags="-DDATA_DIR_PREFIXES=$out/share"
+  '';
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    ln -sf \
+      ${dejavu_fonts}/share/fonts/truetype/DejaVuSansMono.ttf \
+      $out/share/games/arx/misc/dejavusansmono.ttf
+  '';
   
   meta = with stdenv.lib; {
     description = ''

From 73093823f41ceedec5b598c110b4d23df90568dd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Feb 2016 17:13:37 -0600
Subject: [PATCH 1071/2285] melpaPackages 2016-02-04

---
 .../editors/emacs-modes/melpa-generated.nix   | 8429 +++++++++--------
 1 file changed, 4529 insertions(+), 3900 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index e146b9cb4106..b8128ddfe8a6 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/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/0blayout";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/0blayout";
           sha256 = "027k85h34998i8vmbg2hi4q1m4f7jfva5jm38k0g9m1db700gk92";
           name = "_0blayout";
         };
@@ -30,7 +30,7 @@
           sha256 = "1p9qn9n8mfb4z62h1s94mlg0vshpzafbhsxgzvx78sqlf6bfc80l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/2048-game";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/2048-game";
           sha256 = "0z7x9bnyi3qlq7l0fskb61i6yr9gm7w7wplqd28wz8p1j5yw8aa0";
           name = "_2048-game";
         };
@@ -51,7 +51,7 @@
           sha256 = "1fybicg46fc5jjqv7g2d3dnj1x9n58m2fg9x6qxn9l8qlzk9yxkq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/4clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/4clojure";
           sha256 = "1w9zxy6jwiln28cmdgkbbdfk3pdscqlfahrqi6lbgpjvkw9z44mb";
           name = "_4clojure";
         };
@@ -72,7 +72,7 @@
           sha256 = "1h4gwp2gyd4jhbkb8ai1zbzhhmlhmihbwzr0wsxg5yq074n72ifs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/abc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/abc-mode";
           sha256 = "0qf5lbszyscmagiqhc0d05vzkhdky7ini4w33z1h3j5417sscrcx";
           name = "abc-mode";
         };
@@ -85,15 +85,15 @@
     abl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "abl-mode";
-        version = "20151125.335";
+        version = "20160129.431";
         src = fetchFromGitHub {
           owner = "afroisalreadyinu";
           repo = "abl-mode";
-          rev = "5a2a65cc5eb1dc2ee80c8b64a7ea352a444abfdb";
-          sha256 = "081rz6q46wdpnlzd3ddcw425434vz54q7xw29z2nnaxsqckmim8f";
+          rev = "e17fb93cf85423ca202b61ae226492da70a27f6c";
+          sha256 = "09hy7rj27h7xbvasd87146di4vhpg5cmqc9f39fy0ihmv9gy56za";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/abl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/abl-mode";
           sha256 = "0h25lc87pa8irgxflnmnmkr9dcv4kz841nfc45fcz4awrn75kkzb";
           name = "abl-mode";
         };
@@ -106,15 +106,15 @@
     abyss-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "abyss-theme";
-        version = "20151007.608";
+        version = "20160130.425";
         src = fetchFromGitHub {
           owner = "mgrbyte";
           repo = "emacs-abyss-theme";
-          rev = "7971da041f5fb608e32cdac9259b53c87013c04f";
-          sha256 = "12cgjc01k3ivy02381py2g87n2wzwnv153favw2raw4gwl2sfwhs";
+          rev = "953bab8dd567c9a49a74f7c9d6ac52504405d517";
+          sha256 = "1zifkqkxb0wzddfcapm71g3k52fn36ink779imyncg72plg216g0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/abyss-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/abyss-theme";
           sha256 = "0ckrgfd7fjls6g510v8fqpkd0fd18lr0spg3lf5s88gky8ihdg6c";
           name = "abyss-theme";
         };
@@ -135,7 +135,7 @@
           sha256 = "19msfx3f3px1maj41bzh139s6sv2pjk9vm3bphn7758fqhzyin0f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-alchemist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-alchemist";
           sha256 = "02ll3hcixgdb8zyszn78714gy1h2q0vkhpbnwap9302mr2racwl0";
           name = "ac-alchemist";
         };
@@ -156,7 +156,7 @@
           sha256 = "0vrd6g9cl02jjxrjxpshq4pd748b5xszhpmakywrw8s08nh8jf44";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-anaconda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-anaconda";
           sha256 = "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf";
           name = "ac-anaconda";
         };
@@ -177,7 +177,7 @@
           sha256 = "1z6rj15p5gjv0jwnnck8789n9csf1pwxfvsz37graihgfy2khj0y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-c-headers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-c-headers";
           sha256 = "1cq5rz2w79bj185va7y13x7bciihrpsvyxwk6msmcxb4g86s9phv";
           name = "ac-c-headers";
         };
@@ -198,7 +198,7 @@
           sha256 = "1llpnb9vy612sg214i76rxnzcl3qx8pqnixczc5pik9kd3fdaz5f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-cake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-cake";
           sha256 = "0s2pgf0m98ixgadsnn201vm5gnawanpvxv56sf599f33krqnxzkl";
           name = "ac-cake";
         };
@@ -219,7 +219,7 @@
           sha256 = "0mlmhdl9s28z981y8bnpj8jpfzm6bgfiyl0zmpgvhyqw1wzqywwv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-cake2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-cake2";
           sha256 = "0qxilldx23wqf8ilif2nin119bvd0l7b6f6wifixx28a6kl1vsgy";
           name = "ac-cake2";
         };
@@ -240,7 +240,7 @@
           sha256 = "0nyq34yq4jcp3p30ygma3iz1h0q551p33792byj76pa5ps09g1da";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-capf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-capf";
           sha256 = "1drgk5iz2wp3rxzd39pj0n4cfmm5z8zqlp50jw5z7ffbbg35qxbm";
           name = "ac-capf";
         };
@@ -261,7 +261,7 @@
           sha256 = "1k4zk27zvxmcffwwg0zx19rcy2ysd65nnrifwspdw699glpwx2l5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-cider";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-cider";
           sha256 = "1dszpb706h34miq2bxqyq1ycbran5ax36vcniwp8vvhgcjsw5sz6";
           name = "ac-cider";
         };
@@ -282,7 +282,7 @@
           sha256 = "0n9zagwh3rz7b76irj4ya8wskffns9v1c1pivsdqgpd76spvl7n5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-clang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-clang";
           sha256 = "070s06xhkzaqfc3j8c4i44rks6gn8z66lwd54j17p8d91x3qjpr4";
           name = "ac-clang";
         };
@@ -300,7 +300,7 @@
           sha256 = "0q0lbhdng5s5hqa342yyvg02hf2bfbwq513lj1rlaqz4ykvpd7fh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-dabbrev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-dabbrev";
           sha256 = "03lndw7y55bzz4rckl80j0kh66qa82xxxhfakzs1dh1h9f1f0azh";
           name = "ac-dabbrev";
         };
@@ -321,7 +321,7 @@
           sha256 = "1dydjkilvyzxl7wwy3afmn1cjf8jv0385im4nhn8c3xr8iiil7yv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-dcd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-dcd";
           sha256 = "086jp9c6bilc361n1hscza3pbhgvqlq944z7cil2jm1kicsf8s7r";
           name = "ac-dcd";
         };
@@ -342,7 +342,7 @@
           sha256 = "1lkhqmfkjga7qi4r1m7mjax3pyf9m6minsn57cbzm2z2kvkhq22g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-emmet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-emmet";
           sha256 = "09ycjllfpdgqaf5iis5bkkhal1vxvl3qkxrn2759p67s97c49f3x";
           name = "ac-emmet";
         };
@@ -363,7 +363,7 @@
           sha256 = "19981mzxnqqdb8dsdizy2i8byb8sx9138x3nrvi6ap2qbcsabjmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-emoji";
           sha256 = "0msh3dh89jzk6hxva34gp9d5pazchgdknxjbi72z26rss9bkp1mw";
           name = "ac-emoji";
         };
@@ -384,7 +384,7 @@
           sha256 = "140i02b2ipyfmki945l1xd1nsqdpganhmi3bmwj1h9w8cg078bd4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-etags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-etags";
           sha256 = "0ag49k9izrs4ikzac9lifvvwhcn5n89lr2vb20pngsvg1czdyhzb";
           name = "ac-etags";
         };
@@ -405,7 +405,7 @@
           sha256 = "02ifz25rq64z0ifxs52aqdz0iz4mi6xvj88hcn3aakkmsj749vvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-geiser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-geiser";
           sha256 = "0v558qz1mp8b1bgk8kgdk5sx5mpd353mw77n5b0pw4b2ikzpz2mx";
           name = "ac-geiser";
         };
@@ -426,7 +426,7 @@
           sha256 = "0m33v9iy3y37sicfmpx7kvmn8v1a8k6cs7d0v9v5k93p4d5ila41";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-haskell-process";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-haskell-process";
           sha256 = "0kv4z850kv03wiax1flnrp6sgqja25j23l719w7rkr7ck110q8rw";
           name = "ac-haskell-process";
         };
@@ -447,7 +447,7 @@
           sha256 = "1ycchpiiavxw8n08gra0bsp9pxp6ln8cgjrkz9jjq7i6ixi8f9d6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-helm";
           sha256 = "16ajxlhcah5zbvywpc6l4l1arr308gjpgvdx6l1nrv2zvpckhlwq";
           name = "ac-helm";
         };
@@ -468,7 +468,7 @@
           sha256 = "1sip87j4wvlf9pfnpr0zyyhys1dd9smh6hy3zs08ihbdh98krgs5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-html";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-html";
           sha256 = "0qf8f75b6dvy844dq8vh8d9c6k599rh1ynjcif9bwvdpf6pxwvqa";
           name = "ac-html";
         };
@@ -489,7 +489,7 @@
           sha256 = "1v3ia439h4n2i204n0sazzbwwm0l5k6j31gq58iv2rqrq2ysikny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-html-angular";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-html-angular";
           sha256 = "05rbxf5kbr4jlskrhvfvhf82qvb55zl5cb6z1ymfh9l3h9j9xk3s";
           name = "ac-html-angular";
         };
@@ -510,7 +510,7 @@
           sha256 = "0v33p6lnsq1nwyxfbgs6vg6fidfyqwxd5wls2yza95yxzl30m9r7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-html-bootstrap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-html-bootstrap";
           sha256 = "0z71m6xws0k9smhsswaivpikr64mv0wh6klnmi5cwhwcqas6kdi1";
           name = "ac-html-bootstrap";
         };
@@ -531,7 +531,7 @@
           sha256 = "0swbw62zh5rjjf73pvmp8brrrmk6bp061k793z4z83v7ic0cicrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-html-csswatcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-html-csswatcher";
           sha256 = "0jb9dnm2lxadrxssf0rjqw8yvvskcq4hys8c21shjyj3gkvwbfqn";
           name = "ac-html-csswatcher";
         };
@@ -552,7 +552,7 @@
           sha256 = "0xdqk0qr1mmm5q3049ldwlmrcfgz6rzk4yxc8qgz6kll27kciia0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-inf-ruby";
           sha256 = "04jclf0yxz78x1fsaf5sh1p466947nqrcx337kyhqn0nkj3hplqr";
           name = "ac-inf-ruby";
         };
@@ -573,7 +573,7 @@
           sha256 = "1cq73bdv3lkn8v3nx6aznygqaac9s5i7pvirl8wz9ib31hsgwpbk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-ispell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-ispell";
           sha256 = "1vsy2qjh60n5lavivpqhhcpg5pk8zz2r0wy1sb65capn841zdi67";
           name = "ac-ispell";
         };
@@ -594,7 +594,7 @@
           sha256 = "0yn9333rjs2pzb1wk1japclsqagdcl28j0yjl3q5b70g5gi5vx7k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-js2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-js2";
           sha256 = "0gcr0xdi89nj3854v2z3nndfgazmcdzmd6wdndl0i4s7pdfl96fa";
           name = "ac-js2";
         };
@@ -615,7 +615,7 @@
           sha256 = "0p5cdaw9v8jgnmjqpb95bxy4khwbdgg19wzg8jkr2j2p55dpfbd6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-math";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-math";
           sha256 = "1gx35m0wv60cfgm87y2c7vrpwdsqjzk9bz4pp9dbs8dhxvji0ay4";
           name = "ac-math";
         };
@@ -636,7 +636,7 @@
           sha256 = "19cb8kq8gmrplkxil22ahvbyq5cng1l2vh2lrfiyqpjsap7zfjz5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-mozc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-mozc";
           sha256 = "1v3iiid8cq50i076q98ycks9m827xzncgxqwqs2rqhab0ncy3h0f";
           name = "ac-mozc";
         };
@@ -657,7 +657,7 @@
           sha256 = "16bg2zg08223x7q54rmfjziaccgm64h9vc8z59sjljkw1bgx9m7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-octave";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-octave";
           sha256 = "1g5s4dk1rcgkjn17jfw6g201pw0vfhqcx1nhigmnizpnzy0man9z";
           name = "ac-octave";
         };
@@ -670,15 +670,15 @@
     ac-php = callPackage ({ auto-complete, company, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope, yasnippet }:
     melpaBuild {
         pname = "ac-php";
-        version = "20160117.48";
+        version = "20160203.2053";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "3147e2f10a3959c0f54fcc71f87a0a2ef64043d0";
-          sha256 = "11v45azd544fs4v5ndxxc2d6rbqh9r6mqx8gk1487jw7j290j6v8";
+          rev = "bf5e3b82ac81b420613edc9e67a35bd4650605f2";
+          sha256 = "013j8iv62jiq3pbammh3ia6dcf9dm28w938nkh7hljh1c26hg4hp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-php";
           sha256 = "0p9qq8nszp5jb71s35cxnmcxp50b62y2jv1ha7vvqfz5p8miallk";
           name = "ac-php";
         };
@@ -710,7 +710,7 @@
           sha256 = "0g7xbfsfqpmcay56y8xbmif52ccz430s3rjxf5bgl9ahkk7zgkzl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-racer";
           sha256 = "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp";
           name = "ac-racer";
         };
@@ -731,7 +731,7 @@
           sha256 = "1nvz0jfz4x99xc5ywspl8fdpyqns5zd0j7i4bwzlwplmy3qakjwm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-skk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-skk";
           sha256 = "0iycyfgv8v15ygngvyx66m3w3sv8p9h6q6j1hbpzwd8azl8fzj5z";
           name = "ac-skk";
         };
@@ -752,7 +752,7 @@
           sha256 = "13yghv7p6c91fn8mrxbwrb6ldk5n3b6nj6a7pwsvks1q73i1pl88";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-slime";
           sha256 = "0mk3k1lcbqa16xvsbgk28x09vzqyaidqaqpq934xdbrwhdgwgckg";
           name = "ac-slime";
         };
@@ -773,7 +773,7 @@
           sha256 = "0mif35chyj4ai1bj4gq8qi38dyfsp72yi1xchhzy9zi2plpvqa7a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-sly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-sly";
           sha256 = "1ng81b5f8w2s9mm9s7h5kwyx8fdwndnlsbzx50slmqyaz2ad15mx";
           name = "ac-sly";
         };
@@ -794,7 +794,7 @@
           sha256 = "1msj0dbzfan0jax5wh5rmv4l7cp5zhrp5wy5k1n9s7xdgz2dprzj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-flyspell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-flyspell";
           sha256 = "0f24qrpcvyg7h6ylyggn4zrbydci537iigshac1d8yywsr0j47gd";
           name = "ace-flyspell";
         };
@@ -815,7 +815,7 @@
           sha256 = "02i3gxk7kfv3a0pcc82z69hgvjw8bvn40y8h7d59chg8bixcwbyr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-isearch";
           sha256 = "0n8qf08z9n8c2sp5ks29nxcfks5mil1jj6wq348apda8safk36hm";
           name = "ace-isearch";
         };
@@ -836,7 +836,7 @@
           sha256 = "11c9jfrh9mzi0qwbvgcjia6s1gkwb76ssiraka3f4k7rc8dli11y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-jump-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-jump-buffer";
           sha256 = "0hkxa0ps0v1hwmjafqbnyr6rc4s0w95igk8y3w53asl7f5sj5mpi";
           name = "ace-jump-buffer";
         };
@@ -857,7 +857,7 @@
           sha256 = "0yfhny921krpl9j8x7xflj8jzbrj8fkabc8373b8q5hyz20d332k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-jump-helm-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-jump-helm-line";
           sha256 = "04q8wh6jskvbiq6y2xsp2ir23vgz5zw09rm127sgiqrmn0jc61b9";
           name = "ace-jump-helm-line";
         };
@@ -878,7 +878,7 @@
           sha256 = "17axrgd99glnl6ma4ls3k01ysdqmiqr581wnrbsn3s4gp53mm2x6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-jump-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-jump-mode";
           sha256 = "0yk0kppjyblr5wamncrjm3ym3n8jcl0r0g0cbnwni89smvpngij6";
           name = "ace-jump-mode";
         };
@@ -899,7 +899,7 @@
           sha256 = "0z0rblr41r94l4b2gh9fcw50nk82ifxrr3ilxqzbb8wmvil54gh4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-jump-zap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-jump-zap";
           sha256 = "07bkmly3lvlbby2m13nj3m1q0gcnwy5sas7d6ws6vr9jh0d36byb";
           name = "ace-jump-zap";
         };
@@ -920,7 +920,7 @@
           sha256 = "1vs5rwd3gwpydr2fyszjxdkvpzl0vrr48g8f0180fz5b3phh1h1i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-link";
           sha256 = "1jl805r2s3wa0xyhss1q28rcy6y2fngf0yfcrcd9wf8kamhpajk5";
           name = "ace-link";
         };
@@ -933,15 +933,15 @@
     ace-pinyin = callPackage ({ ace-jump-mode, avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-pinyin";
-        version = "20151126.1517";
+        version = "20160131.1556";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "ace-pinyin";
-          rev = "d7c8fed8ab6f6fbbbcb95bcd74516c30d05dcdfa";
-          sha256 = "00pcdf2nz27f7zbpyrgqr9nh8pd4nhxvsz885b6mq263s0qyykzx";
+          rev = "1e4d4be64fb3db294b498b8eec531e8fb1101b7f";
+          sha256 = "1zx94dysd817i4xgapzm6fb8fcqb90sqym212b57qlqimyi3f59m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-pinyin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-pinyin";
           sha256 = "18gmj71zd0i6yx8ifjxsqz2v81jx0j37f5kxllf31w7fj32ymbkc";
           name = "ace-pinyin";
         };
@@ -951,22 +951,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-popup-menu = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ace-popup-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-popup-menu";
-        version = "20150910.727";
+        version = "20160126.631";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "ace-popup-menu";
-          rev = "92cac2f656b5000d2f267ffaa92a275f40a2719d";
-          sha256 = "0ffkdq94slfy8w73bznc7bcy4amylhsh2nk2vvdwwqmxmviirlnq";
+          rev = "3e771b470b0c633d7633dceec054fc05beac81f0";
+          sha256 = "1qiiivkwa95bhyym8ly7fnwwglc9dcifkyr314bsq8m4rp1mgry4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-popup-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-popup-menu";
           sha256 = "1cq1mpv7v98bqrpsm598krq1741b6rwih71cx3yjifpbagrv4m5s";
           name = "ace-popup-menu";
         };
-        packageRequires = [ avy cl-lib emacs ];
+        packageRequires = [ avy-menu emacs ];
         meta = {
           homepage = "http://melpa.org/#/ace-popup-menu";
           license = lib.licenses.free;
@@ -983,7 +983,7 @@
           sha256 = "053074jyinr3a2zkr1jfgmizdbhk5s37vrvf490x2hwf19dzis4a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-window";
           sha256 = "1k0x8m1phmvgdxb5aj841iai9q96a5lfq8i4b5vnlbc3w888n3xa";
           name = "ace-window";
         };
@@ -1003,7 +1003,7 @@
           sha256 = "0zjncby2884cv8nz2ss7i0p17l15lsk88zwvb7b0gr3apbfpcpa3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/achievements";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/achievements";
           sha256 = "1pwlibq87ph20z2pssk5hbgs6v8kdym9193jjdx2rxp0nic4k0cr";
           name = "achievements";
         };
@@ -1024,7 +1024,7 @@
           sha256 = "02ba4d8qkvgy52g0zcbyfvsnhr9685gq569nkwa2as30xdcq3khm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ack-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ack-menu";
           sha256 = "1d2kw04ndxji2qjcm1b65qnxpp08zx8gbia8bl6x6mnjb2isc2d9";
           name = "ack-menu";
         };
@@ -1045,7 +1045,7 @@
           sha256 = "1rxx2j7kkzjdsk06zgisiydg8dc18vqll4wl6q9mfhrg2y12lq94";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/actionscript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/actionscript-mode";
           sha256 = "1dkiay9jmizvslji5kzab4dxm1dq0jm8ps7sjq6710g7a5aqdvwq";
           name = "actionscript-mode";
         };
@@ -1066,7 +1066,7 @@
           sha256 = "1ag8zs8bkazblvgxm0q4lnpvdlnzswx1jb4jjbrs2bmq7qmmwvns";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/addressbook-bookmark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/addressbook-bookmark";
           sha256 = "15p00v4ndrsbadal0ss176mks4ynj39786bmrnil29b6sqibd43r";
           name = "addressbook-bookmark";
         };
@@ -1087,7 +1087,7 @@
           sha256 = "01fn73vyhdcy84s60r2jjy9a0xm3zwagpzi6b4qlankbvswypask";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/adoc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/adoc-mode";
           sha256 = "0wgagcsh0fkb51fy17ilrs20z2vzdpmz97vpwijcfy2b9rypxq15";
           name = "adoc-mode";
         };
@@ -1100,15 +1100,15 @@
     aes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "aes";
-        version = "20151211.1603";
+        version = "20160121.1437";
         src = fetchFromGitHub {
           owner = "Sauermann";
           repo = "emacs-aes";
-          rev = "61d0da553ad980e5b9079444aed8214a28b409d9";
-          sha256 = "0jlqk3kn2920b0dfmwy511x83hkmclb646qws3im0p75qcnyr4s1";
+          rev = "1b9918036b16ee30ada71703a9283c67f2ad9999";
+          sha256 = "1p90yv2xl1hhpjm0mmhdjyf1jagf79610hkzhw8nycy2p1y4gvl6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aes";
           sha256 = "11vl9x3ldrv7q7rd29xk4xmlvfxs0m6iys84f6mlgf00190l5r5v";
           name = "aes";
         };
@@ -1129,7 +1129,7 @@
           sha256 = "19d5d6qs5nwmpf26rsb86ranb5p4236qp7p2b4i88cimcmzspylb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/afternoon-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/afternoon-theme";
           sha256 = "13xgdw8px58sxpl7nyhkcdxwqdpp13i8wghvlb3l4471plw3vqgj";
           name = "afternoon-theme";
         };
@@ -1142,15 +1142,15 @@
     ag = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ag";
-        version = "20151226.1805";
+        version = "20160126.1335";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "ag.el";
-          rev = "4894b38feffc4c044f8cbaabf3033f49084dba2c";
-          sha256 = "03157dyw4in7hazw2glc9dz9509097s76x8g79w9cr9cyjwax42p";
+          rev = "b4b0e39b7fb706fc3208e238c2a7e517ebdb999c";
+          sha256 = "1ra5nrc4nvp41rcdc4nkjs9lk7131zd54v63c6lyi3zkg3dyl7im";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ag";
           sha256 = "1r4ai09vdckkg4h4i7dp781qqmm4kky53p4q8azp3n2c78i1vz6g";
           name = "ag";
         };
@@ -1171,7 +1171,7 @@
           sha256 = "18zlxgwcvqhlw9y7zn6fywmy04f7rs71fd5ihcx28j4rx9ay929c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aggressive-fill-paragraph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aggressive-fill-paragraph";
           sha256 = "1df4bk3ks09805y67af6z1gpfln0lz773jzbbckfl0fy3yli0dja";
           name = "aggressive-fill-paragraph";
         };
@@ -1192,7 +1192,7 @@
           sha256 = "1mymlsm469nl4jaxkjgn26ij37mdf4rjv7kswjwf626bxq9s3136";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aggressive-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aggressive-indent";
           sha256 = "1qi8jbr28gax35siim3hnnkiy8pa2vcrzqzc6axr98wzny46x0i2";
           name = "aggressive-indent";
         };
@@ -1211,7 +1211,7 @@
           sha256 = "0fnn52b2prai8dlsj4759mbcgbbbvhr2lbqs3f0k5d2q8vvqrch1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ahg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ahg";
           sha256 = "0kw138lfzwp54fmly3jzzml11y7fhcjp3w0irmwdzr68lc206lr4";
           name = "ahg";
         };
@@ -1232,7 +1232,7 @@
           sha256 = "122as0ssc6xzmxb5hlvhx6dlx6gq2f70xisz0z8pxgm3bpf9h6mx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ahk-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ahk-mode";
           sha256 = "066l4hsb49wbyv381qgn9k4hn8gxlzi20h3qaim9grngjj5ljbni";
           name = "ahk-mode";
         };
@@ -1253,7 +1253,7 @@
           sha256 = "0dlk53zij907413fl6wh02i8nwzrbbrm22nn3i9h5sc8x9dhzazg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ahungry-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ahungry-theme";
           sha256 = "0fhim0qscpqx9siprp3ax1azxzmqkzvrjx517d9bnd68z7xxbpqy";
           name = "ahungry-theme";
         };
@@ -1266,15 +1266,15 @@
     airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
     melpaBuild {
         pname = "airline-themes";
-        version = "20160112.1415";
+        version = "20160203.1710";
         src = fetchFromGitHub {
           owner = "AnthonyDiGirolamo";
           repo = "airline-themes";
-          rev = "0bf80e3f5a6acee18455c8d3f3fe7072d13add70";
-          sha256 = "1wgqnafvb9h09lcqkj1kasps1ikngcfwfvlny1ipia0k2l2qivz9";
+          rev = "3c5f127daf1cf8a74e3c9956e11e56eedf5f3e76";
+          sha256 = "0blrpqn8wy9pwzikgzb0v6x4hk7axv93j4byfci62fh1905zfkkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/airline-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/airline-themes";
           sha256 = "0jkhb6nigyjmwqny7g59h4ssfy64vl3qnwcw46wnx5k9i73cjyih";
           name = "airline-themes";
         };
@@ -1295,7 +1295,7 @@
           sha256 = "1lxpfswp1bjrz192px79f155dycf2kazpr7dfrcr1gyshlgxkpf7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/airplay";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/airplay";
           sha256 = "095nibgs197iplphk6csvkgsrgh1fcfyy33py860v6qmihvk538f";
           name = "airplay";
         };
@@ -1308,15 +1308,15 @@
     alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "alchemist";
-        version = "20160112.140";
+        version = "20160125.107";
         src = fetchFromGitHub {
           owner = "tonini";
           repo = "alchemist.el";
-          rev = "5d579873da06a1a0fccde1decaf9f7d7e1d09d76";
-          sha256 = "1g5wdcmr6qpscnjk7fzzna4jplcyfl49fq20l7nmr6bq5phsilz6";
+          rev = "f7d442107910b16a7e5727c4435463be1307b6a4";
+          sha256 = "0z87n537g2l99s9sgqdaagappfr3fm9p7yyh0946cnh80m8c71la";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/alchemist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/alchemist";
           sha256 = "18jxw0zb7y34qbm4bcpfpb2656f0h9grmrbfskgp4ra4q5q3n369";
           name = "alchemist";
         };
@@ -1337,7 +1337,7 @@
           sha256 = "0hvf7ydd2p3dfk5hqjqcbaajhgihkyvlwvqcr97a8jknznk7hfzp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/alect-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/alect-themes";
           sha256 = "04fq65qnxlvl5nc2q037c6yb4nf422dfw2913gv6zfh9rdmxsks8";
           name = "alect-themes";
         };
@@ -1358,7 +1358,7 @@
           sha256 = "0z7yfjg14bzndpm9ski1a1mdixvrykg7d08cd86dc82bghb3px2z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/alert";
           sha256 = "0x3cvczq09jvshz435jw2fjm69457x2wxdvvbbjq46nfnybhi118";
           name = "alert";
         };
@@ -1379,7 +1379,7 @@
           sha256 = "0l2rgs0rd4nmv4v7m10zhf2znzfvdifv1vlhpa3zbppg0fj8zph1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/align-cljlet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/align-cljlet";
           sha256 = "0pnhhv33rvlmb3823xpy9v5h6q99fa7fn38djbwry4rymi4jmlih";
           name = "align-cljlet";
         };
@@ -1397,7 +1397,7 @@
           sha256 = "10j70bwa28xpmqwigvls76jg6vz0iky88lmkq4pk35bg3rz09r4m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/all-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/all-ext";
           sha256 = "1zi266cm5hpfhnnnzbsm4s1w0lsy4sj5z8d020y0cg57yn2v62dv";
           name = "all-ext";
         };
@@ -1410,15 +1410,15 @@
     amd-mode = callPackage ({ dash, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s }:
     melpaBuild {
         pname = "amd-mode";
-        version = "20151214.318";
+        version = "20160202.953";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "amd-mode.el";
-          rev = "17eefc009e26769fa0e81936bcbea9d9ea42954f";
-          sha256 = "12vjjdyxmm6ky8d7xbsg0pmfam12vzghzzr3j6klji01i8lxmh74";
+          rev = "e552bdd3a0d24e9c471fd21c4a2ae17cb20c7594";
+          sha256 = "1b7w8zrcliibwxlrrzmi2r684f59jzd892c556svh3qad048mriv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/amd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/amd-mode";
           sha256 = "17ry6vm5xlmdfs0mykdyn05cik38yswq5axdgn8hxrvvb6f58d06";
           name = "amd-mode";
         };
@@ -1439,7 +1439,7 @@
           sha256 = "18cicz11i19cpabrq6khnl9ks1khn6gw5a4ckaq4y65r40x0cr6g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ample-regexps";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ample-regexps";
           sha256 = "00y07pd438v7ldkn5f1w84cpxa1mvcnzjkj6sf5l5pm97xqiz7j2";
           name = "ample-regexps";
         };
@@ -1460,7 +1460,7 @@
           sha256 = "0x72czw5rmz89w5fa27z54bz8qirrr882g0r37pb8li04j1hk7kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ample-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ample-theme";
           sha256 = "055c6jy2q761za4cl1vlqdskcd3mc1j58k8b4418q7h2lv2zc0ry";
           name = "ample-theme";
         };
@@ -1481,7 +1481,7 @@
           sha256 = "18z9jl5d19a132k6g1dvwqfbbdh5cx66b2qxlcjsfiqxlxglc2sa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ample-zen-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ample-zen-theme";
           sha256 = "0xygk80mh05qssrbfj4h6k50pg557dyj6kzc2pdlmnr5r4gnzdn3";
           name = "ample-zen-theme";
         };
@@ -1502,7 +1502,7 @@
           sha256 = "01a9l785chmcf6d7fsyc72gapapb4gddgqmpps705zpkhjm8f6wj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anaconda-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anaconda-mode";
           sha256 = "0gz16aam4zrm3s9ms13h4qcdflf55506kgkpyncq3bi54cvv8n1r";
           name = "anaconda-mode";
         };
@@ -1523,7 +1523,7 @@
           sha256 = "1ym43y0wqifkzpkm7ayf8cq2wz8pc2wgg9zvdyi0cn9lr9mwpbav";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anaphora";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anaphora";
           sha256 = "1wb7fb3pc4gxvpjlm6gjbyx0rbhjiwd93qwc4vfw6p865ikl19y2";
           name = "anaphora";
         };
@@ -1542,7 +1542,7 @@
           sha256 = "1hklypbp79pgaf1yklbm3qx4skm3xlml0cm1r9b9js3dbqyha651";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anchored-transpose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anchored-transpose";
           sha256 = "19dgj1605qxc2znvzj0cj6x29zyrh00qnzk2rlwpn9hvzypg9v7w";
           name = "anchored-transpose";
         };
@@ -1563,7 +1563,7 @@
           sha256 = "1ms338qq17nwivpq8c1xsnld5k532rfhgvfxx1zg3l8wrjh235d2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/android-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/android-mode";
           sha256 = "1nqrvq411yg4b9xb5cvc7ai7lfalwc2rfhclzprvymc4vxh6k4cc";
           name = "android-mode";
         };
@@ -1584,7 +1584,7 @@
           sha256 = "1m0c7ns7aiycg86cgglir8bkw730fslyg1n15m9ki0da4cnmm97a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/angry-police-captain";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/angry-police-captain";
           sha256 = "1cshhd4bkgbkg0n6m8gz53z47z4nq0hcriz2qh3v7m4cqgkw1m9r";
           name = "angry-police-captain";
         };
@@ -1605,7 +1605,7 @@
           sha256 = "04kg2x0lif91knmkkh05mj42xw3dkzsnysjda6ian95v57wfg377";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/angular-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/angular-mode";
           sha256 = "1bwfmjldnxki0lqi3ys6r2a3nlhbwm1dibsg2dvzirq8qql02w1i";
           name = "angular-mode";
         };
@@ -1626,7 +1626,7 @@
           sha256 = "0hdm1a323mzxjfdply8ri3addk146f21d8cmpd18r7dw3j3cdfrn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/angular-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/angular-snippets";
           sha256 = "057phgizn1c6njvdfigb23ljs31knq247gr0rcpqfrdaxsnnzm5c";
           name = "angular-snippets";
         };
@@ -1647,7 +1647,7 @@
           sha256 = "08gs96r9mbdg0s5l504yp6i5nmi9qr4nwxq3xprsbx9bdzv5l2dx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/annotate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/annotate";
           sha256 = "1ajykgara2m713blj2kfmdz12fzm8jw7klyakkyi6i3c3a9m44jy";
           name = "annotate";
         };
@@ -1668,7 +1668,7 @@
           sha256 = "1ppq3kszzj2fgr7mwj565bjs8bs285ymy384cnnw7paddgcr9z02";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/annoying-arrows-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/annoying-arrows-mode";
           sha256 = "13bwqv3mv7kgi1gms58f5g03q5g7q98n4vv6n28zqmppxm5z33s7";
           name = "annoying-arrows-mode";
         };
@@ -1689,7 +1689,7 @@
           sha256 = "19k71dj83kvc8mks6zhl45vsrsb61via53dqxjv9bny1ybh2av85";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ansi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ansi";
           sha256 = "04n0kvaqq8214prdk20bplqyzlsnlzfzsg23ifkrzjgqjjpdcyi1";
           name = "ansi";
         };
@@ -1710,7 +1710,7 @@
           sha256 = "03d240jngxw51ybrsjw8kdxygrr0ymdckzwga2jr1bqf26v559j2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ansible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ansible";
           sha256 = "1xdc05fdglqfbizra6s1zl6knnvaq526dkxqnw9g7w269j8f4z8g";
           name = "ansible";
         };
@@ -1731,7 +1731,7 @@
           sha256 = "1h3rqrjrl8wx7xvvd631jkbbczq3srd4mgz7y9wh3cvz1njdpy62";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ansible-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ansible-doc";
           sha256 = "03idvnn79fr9id81aivkm7g7cmlsg0c520wcq4da8g013xvi342w";
           name = "ansible-doc";
         };
@@ -1752,7 +1752,7 @@
           sha256 = "1g4ah0iwqrvvzcxr0ss6il5kign73gzcz1dbc22wdgprlfa4hah7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ant";
           sha256 = "03rxn2dh0xj89kl24jd19q7kmrn1hnr2cdl3519bpng298kxwni6";
           name = "ant";
         };
@@ -1765,15 +1765,15 @@
     anti-zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anti-zenburn-theme";
-        version = "20160113.1944";
+        version = "20160119.1705";
         src = fetchFromGitHub {
           owner = "m00natic";
           repo = "anti-zenburn-theme";
-          rev = "dd495097cc06e27c30694c2eb4f1f406349b812b";
-          sha256 = "1qx4m12m0drdd553ma0hg6s5hw9njy9v94xav09lx578c7bdfmf8";
+          rev = "72906fbf1f47035ad97e39c0dea1a6b46b091a64";
+          sha256 = "0h3zl56n27r331xrbx4sa6vhqbhrhkji1idqlmba0z16dlzfp1pw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anti-zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anti-zenburn-theme";
           sha256 = "1sp9p6m2jy4m9fdn1hz25cmasy0mwwgn46qmvm92i56f5x6jlzzk";
           name = "anti-zenburn-theme";
         };
@@ -1794,7 +1794,7 @@
           sha256 = "0fzxzar8m9qznfxv3wr7vfj9y2110wf6mm5cj55k3sd5djdjhmf1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anx-api";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anx-api";
           sha256 = "1vzg3wsqyfb9rsfxrpz8k2gazjlz2nwnf4gnn1dypsjspjnzcb8r";
           name = "anx-api";
         };
@@ -1815,7 +1815,7 @@
           sha256 = "0qy5q4rq68nb21k7w3xpil8k8k5awcpjrjlxjwnhcklwb83w3dhf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anybar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anybar";
           sha256 = "0prnr8wjhishpf2zmn4b7054vfahk10w05nzsg2p6whaxywcachm";
           name = "anybar";
         };
@@ -1836,7 +1836,7 @@
           sha256 = "05lq0bllgn44zs85mgnfdcyjasm6j8m70jdcxksf798i0qdqnk7n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anyins";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anyins";
           sha256 = "0ncf3kn8rackcidkgda2zs60km3hx87rwr9daj7ksmbb6am09s7c";
           name = "anyins";
         };
@@ -1856,7 +1856,7 @@
           sha256 = "e90ded84609e59a4cef22bfd9d9a543ec6b677b78ab44fb4eb6cbae9eb248669";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything";
           sha256 = "13pmks0bsby57v3vp6jcvvzwb771d4qq62djgvrw4ykxqzkcb8fj";
           name = "anything";
         };
@@ -1877,7 +1877,7 @@
           sha256 = "0dbf510gcd0m191samih0r4lx6d7sgk0ls0sx2jrdkyacy82ridy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-exuberant-ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-exuberant-ctags";
           sha256 = "0p0jq2ggdgaxv2gd9m5iza0y3mjjc82xmgp899yr15pfffa4wihk";
           name = "anything-exuberant-ctags";
         };
@@ -1898,7 +1898,7 @@
           sha256 = "0gj0p7420wx5c186kdccjb9icn656sg5b0zwnwy3fjvhsbbvrb2r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-git-files";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-git-files";
           sha256 = "13giasg8lh5968plva449ki9nc3478a63700f8c0yghnwjb77asw";
           name = "anything-git-files";
         };
@@ -1919,7 +1919,7 @@
           sha256 = "06fyvk7cjz1aag6fj52qraqmr23b0fqwml41yyid8gjxl4ygmkpv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-git-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-git-grep";
           sha256 = "1kw88fvxil9l80w8zn16az7avqplyf2m0l7kp431wb5b1b1508jl";
           name = "anything-git-grep";
         };
@@ -1940,7 +1940,7 @@
           sha256 = "1jw6gqwcl3fx1m7w0a15w2pnzzlqyr1fbg0m81ay358s4w3jn6v7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-milkode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-milkode";
           sha256 = "1apc865a01jyx602ldzj32rrjk6xmgnxdccpjpcfgh24h2aqpdan";
           name = "anything-milkode";
         };
@@ -1961,7 +1961,7 @@
           sha256 = "16a7i01q8qqkgph1s3jnwdr2arjq3cm3jpv5bk5sqs29c003q0pp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-project";
           sha256 = "10crwm34igb4kjh97alni15xzhsb2s0d4ghva86f2gpjidka9fhr";
           name = "anything-project";
         };
@@ -1982,7 +1982,7 @@
           sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-prosjekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-prosjekt";
           sha256 = "15kgn0wrnbh666kchijdlssf2gp7spgbymr2nwgv6k730cb4mfa8";
           name = "anything-prosjekt";
         };
@@ -2003,7 +2003,7 @@
           sha256 = "1834yj2vgs4dasdfnppc8iw8ll3yif948biq9hj0sbpsa2d8y44k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-replace-string";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-replace-string";
           sha256 = "1fagi6cn88p6sf1yhx1qsi7nw9zpyx9hdfl66iyskqwddfvywp71";
           name = "anything-replace-string";
         };
@@ -2024,7 +2024,7 @@
           sha256 = "08xr6fkk1r4r5jqh349d4dfal9nbs2a8y2fp8zn3zlrj2cd0g80k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-sage";
           sha256 = "1878vj8hzrwfyd2yvxcm0f1vm9m0ndwnj0pcq7j8zm9lxj0w48p3";
           name = "anything-sage";
         };
@@ -2037,15 +2037,15 @@
     anzu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anzu";
-        version = "20160116.38";
+        version = "20160130.2055";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-anzu";
-          rev = "ff54963946b12b3fe94b0deed4c6e695ef9be4dd";
-          sha256 = "0qyycm8bp2yw0h6dr9jkfjxpkl7if8gy6c64km54hc9agg1pbfgp";
+          rev = "dde4d83cfa4887db7deaf74232c9e051afb33050";
+          sha256 = "1dxaf68przg0hh0p1zhxsq2dysp3ln178yxhbqalxw67bjy8ikny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anzu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anzu";
           sha256 = "0i2ia0jisj31vc2pjx9bhv8jccbp24q7c406x3nhh9hxjzs1f41i";
           name = "anzu";
         };
@@ -2063,7 +2063,7 @@
           sha256 = "10vdmxzifxx3fkpyg76ngnj79k3d2pq0f322rd8ssc66alxhkz3g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aok";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aok";
           sha256 = "1nkkbfwqp5r44wjwl902gm0xc8p3d2qj5mk1cchilr2rib52zd46";
           name = "aok";
         };
@@ -2084,7 +2084,7 @@
           sha256 = "0528z3axjmplg2fdbv4jxgy1p39vr4rnsm4a3ps2fanf8bwsyx3l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aozora-view";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aozora-view";
           sha256 = "0pd2574a6dkhrfr0jf5gvv34ganp6ddylyb6cfpg2d4znwbc2r2w";
           name = "aozora-view";
         };
@@ -2102,7 +2102,7 @@
           sha256 = "1jndhcjvj6s1clmyyphl5ss5267c7b5a58fz8gbp1ffk1d9ylfik";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/apache-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/apache-mode";
           sha256 = "1a1pj3bk0gplfx217yd6qdn7qrhfbkx2bhkk33k0gq5sia6rzs44";
           name = "apache-mode";
         };
@@ -2123,7 +2123,7 @@
           sha256 = "0sdxnf4b8rqs1cbjxh23wvxmj7ll3zddv8yfdgif6zmgyy8xhc9m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/apel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/apel";
           sha256 = "0zhlm8lfri3zkhj62cycvdhkkgrn72lqb0dalh8qgr049bdv816y";
           name = "apel";
         };
@@ -2144,7 +2144,7 @@
           sha256 = "0br0jl6xnajdx37s5cvs13srn9lldg58y9587a11s3s651xjdq0z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/apples-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/apples-mode";
           sha256 = "05ssnxs9ybc26jhr69xl9jpb41bz1688minmlc9msq2nvyfnj97s";
           name = "apples-mode";
         };
@@ -2164,7 +2164,7 @@
           sha256 = "0n3y0314ajqhn5hzih09gl72110ifw4vzcgdxm8n6npjbx7irbml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/applescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/applescript-mode";
           sha256 = "1ya0dh7gz7qfflhn6dq43rapb2zg7djvxwn7p4jajyjnwbxmk611";
           name = "applescript-mode";
         };
@@ -2185,7 +2185,7 @@
           sha256 = "1wyz8jvdy4m0cn75mm3zvxagm2gl10q51479f91gnqv14b4rndfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aproject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aproject";
           sha256 = "0v3gx2mff2s7knm69y253pm1yr4svy8w00pqbn1chrvymb62jhp2";
           name = "aproject";
         };
@@ -2204,7 +2204,7 @@
           sha256 = "0wc9zg30a48cj2ssfj9wc7ga0ip9igcxcdbn1wr0qmndzxxa7x5k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/apropos-fn+var";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/apropos-fn+var";
           sha256 = "1s5gnsipsj7dhc8ca806grg32i6vlwm78hcxhrbs830vx9k84g5x";
           name = "apropos-fn-plus-var";
         };
@@ -2217,15 +2217,15 @@
     apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apropospriate-theme";
-        version = "20151224.956";
+        version = "20160124.118";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "apropospriate-theme";
-          rev = "fdd70f890c2fd25882de011c1327ddab143937ce";
-          sha256 = "1jw6am5c8szrrlff1qfh0hpyi5p5nqnhs8kywl5s4bpj1gxgq8dh";
+          rev = "c35c9799556194298e67dd0f03a7dcfa72040a54";
+          sha256 = "0gipjdjg6ds04wlg6kf6qjanl24jfzzhkjw8ngjqwla98vly7qcr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/apropospriate-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/apropospriate-theme";
           sha256 = "10bj2bsi7b104m686z8mgvbh493liidsvivxfvfxzbndc8wyjsw9";
           name = "apropospriate-theme";
         };
@@ -2243,7 +2243,7 @@
           sha256 = "1xbvky0mspmbi8ghqhqhgbjn70acipwf0qwn6s5zdarwch10nljj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/apu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/apu";
           sha256 = "0399rmjwcs7fykj10s9m0lm2wb1cr2bzw2bkgm5rp4n3va0rzaa2";
           name = "apu";
         };
@@ -2261,7 +2261,7 @@
           sha256 = "1mhj6x0n2ya3xd7gykmkcf70ji5g8qd8xawz764ykdlcribpsq52";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/archive-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/archive-region";
           sha256 = "03x2fqhx4w0c7xd8x8zlnyzdwyay6r2yxf4jzgkcg87q7rqjk9nd";
           name = "archive-region";
         };
@@ -2282,7 +2282,7 @@
           sha256 = "1yvaqjc9hadbnnay5fprnh890xsp53kidad1zpb4a5z4a5z61n3c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/arduino-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/arduino-mode";
           sha256 = "1lpsjpc7par12zsmg9sf4r1h039kxa4n68anjr3mhpp3d6rapjcx";
           name = "arduino-mode";
         };
@@ -2302,7 +2302,7 @@
           sha256 = "2713755e56b03e28a5a6e10c85865c1ace0247e71caeb8b89ec65d5618addafc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aria2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aria2";
           sha256 = "10x2k99m3kl6y0k0mw590gq1ac162nmdwk58i8i7a4mb72zmsmhc";
           name = "aria2";
         };
@@ -2323,7 +2323,7 @@
           sha256 = "0vh9wfc3657sd12ybjcrxpg6f757x2ghkcl1lw01szmyy5vmj27h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ariadne";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ariadne";
           sha256 = "0lfhving19wcfr40gjb2gnginiz8cncixiyyxhwx08lm84qb3a7p";
           name = "ariadne";
         };
@@ -2344,7 +2344,7 @@
           sha256 = "1i6y3kv2vii6f8gpd845vv6h832hqx0vxb3fmb1x80kwx3gda682";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/arjen-grey-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/arjen-grey-theme";
           sha256 = "18q66f7hhys2ab9ljsdp9013mp7d6v6d1lrb0d1bb035r1b4pfj7";
           name = "arjen-grey-theme";
         };
@@ -2365,7 +2365,7 @@
           sha256 = "133c1n4ra7z3vb6y47400y71a6ac19pyji0bgd4kr9fcbx0flx91";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/artbollocks-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/artbollocks-mode";
           sha256 = "0dlnxicn6nzyiz44y92pbl4nzr9jxfb9a99wacjrwq2ahdrwhhjp";
           name = "artbollocks-mode";
         };
@@ -2383,7 +2383,7 @@
           sha256 = "05fjsj5nmc05cmsi0qj914dqdwk8rll1d4dwhn0crw36p2ivql75";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ascii";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ascii";
           sha256 = "0jb63f7qwhfbz0n4yrvnvx03cjqly3mqsc3rq9mgf4svy2zw702r";
           name = "ascii";
         };
@@ -2404,7 +2404,7 @@
           sha256 = "1s973vzivibaqjb8acn4ylrdasxh17jcfmmvqp4wm05nwhg75597";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/asilea";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/asilea";
           sha256 = "1lb8nr6r6yy06m4pxg8w9ja4zv8k5xwhl95v2wv95y1qwhgnwg3j";
           name = "asilea";
         };
@@ -2425,7 +2425,7 @@
           sha256 = "0h18x9nh152dnyqjv5b1zjksl8wb75s8zmx3v8vvmwqyy6ql8gcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/asn1-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/asn1-mode";
           sha256 = "0iswisb08dqz7jc5ra4wcdhbmglildgyrb547dm5362xmvm9ifmy";
           name = "asn1-mode";
         };
@@ -2446,7 +2446,7 @@
           sha256 = "074wdciq62jfc41f829590p4y52dnkn3nxicj9lcabgxwz7cahjp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/async";
           sha256 = "063ci4f35x1zm9ixy110i5ds0vsrcafpixrz3xkvpnfqdn29si3f";
           name = "async";
         };
@@ -2467,7 +2467,7 @@
           sha256 = "0rnnvr8x1czphbinby2z2dga7ikwgd13d7zhgmp3ggamzyaz6nf1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/@";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/@";
           sha256 = "0w91qx955z67w2yh8kf86b58bb3b6s6490mmbky8467knf2q83qz";
           name = "at";
         };
@@ -2488,7 +2488,7 @@
           sha256 = "0jfpzv8dmvl4nr6kvq5aii830s5h632bq2q3jbnfc4zdql7id464";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/atom-dark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/atom-dark-theme";
           sha256 = "1ci61blm7wc83wm2iyax017ai4jljyag5j1mvw86rimmmjzr0v8f";
           name = "atom-dark-theme";
         };
@@ -2509,7 +2509,7 @@
           sha256 = "027j027w2nbplg1gi28hg9iyiirigydj5n4npf7y9a6g626snxz0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/atom-one-dark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/atom-one-dark-theme";
           sha256 = "0wwnkhq7vyysqiqcxc1jsn98155ri4mf4w03k7inl1f8ffpwahvw";
           name = "atom-one-dark-theme";
         };
@@ -2530,7 +2530,7 @@
           sha256 = "1h0044zfzklc9sy0a02vcdr75ly6wlhjx3n5bvq7yiicqd012316";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auctex-latexmk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auctex-latexmk";
           sha256 = "1rdlgkiwlgm06i1gjxcfciz6wgdskfhln8qhixyfxk7pnz0ax327";
           name = "auctex-latexmk";
         };
@@ -2551,7 +2551,7 @@
           sha256 = "0lgfgvnaln5rhhwgcrzwrhbj0gz8sgaf6xxdl7njf3sa6bfgngsz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auctex-lua";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auctex-lua";
           sha256 = "0v999jvinljkvhbn205p36a6jfzppn0xvflvzr8mid1hnqlrpjhf";
           name = "auctex-lua";
         };
@@ -2572,7 +2572,7 @@
           sha256 = "0q79kblcbz5vlzj0f49vpc1902767ydmvkmwwjs60x3w2f3aq3cm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/audio-notes-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/audio-notes-mode";
           sha256 = "0q88xmi7jbrx47nvbbmwggbm6i7agzpnv5y7cpdh73lg165xsz2h";
           name = "audio-notes-mode";
         };
@@ -2593,7 +2593,7 @@
           sha256 = "0z0wq79ks8251fflk2iwrhd885h5qbki2m19f0jy4a8c00ydmxyz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aurel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aurel";
           sha256 = "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl";
           name = "aurel";
         };
@@ -2614,7 +2614,7 @@
           sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aurora-config-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aurora-config-mode";
           sha256 = "0yqmpwj1vp0d5w9zw1hbyxzsbvw165dsgk1v1dxizkqwn7b1v7jm";
           name = "aurora-config-mode";
         };
@@ -2635,7 +2635,7 @@
           sha256 = "1z2n6gd63mgj2wj45n6g1gmfrk0iwzlrzb6g1rdd9r9a03c03qi6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aurora-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aurora-theme";
           sha256 = "1fhlng30v25ycr502vfvajl70vimscqkipva6ghr670j35ac5vz5";
           name = "aurora-theme";
         };
@@ -2656,7 +2656,7 @@
           sha256 = "0gi65n1np63zi2ylc4y1licwvk97jl92s1v98fv5y61kppi1d8sq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auth-password-store";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auth-password-store";
           sha256 = "118ll12dhhxmlsp2mxmy5cd91166a1qsk406yhap5zw1qvyg58w5";
           name = "auth-password-store";
         };
@@ -2675,7 +2675,7 @@
           sha256 = "1c8nm4sz9a67q8w0b1jahg5ldy185zws7nilj9yv3miklg07zq17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-async-byte-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-async-byte-compile";
           sha256 = "108jhrdx67chbdd4h824072i2wrn90zdh2hw5vqd4a5svhhf28jj";
           name = "auto-async-byte-compile";
         };
@@ -2696,7 +2696,7 @@
           sha256 = "1whbvqylwnxg8d8gn55kcky39rgyc49rakyxlbkplh813lk6lxb7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-auto-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-auto-indent";
           sha256 = "08s73pnyrmklb660jl5rshncpq31z3m9fl55v7453ch8syp7gzh7";
           name = "auto-auto-indent";
         };
@@ -2714,7 +2714,7 @@
           sha256 = "1lk9zwng7wkjvb8hprlgyrab1s56n8a61xjva931h0bgypwl1dfi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-capitalize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-capitalize";
           sha256 = "18fygc71n9bc0vrpymz2f7sw9hzkpqxzfglh53shmbm1zns3wkw0";
           name = "auto-capitalize";
         };
@@ -2735,7 +2735,7 @@
           sha256 = "07vnk8az4lcxncqn01jvks38b4hpdmg43nbby2b39zy50agqnwsg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-compile";
           sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks";
           name = "auto-compile";
         };
@@ -2756,7 +2756,7 @@
           sha256 = "07ib2pd3apm97v7kalavpc6fyk00cjky8kfwahn37zmw2j2fdhpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete";
           sha256 = "1c4ij5bnclg94jdzhkqvq2vxwv6wvs051mbki1ibjm5f2hlacvh3";
           name = "auto-complete";
         };
@@ -2777,7 +2777,7 @@
           sha256 = "1wri8q5llpy1q1h4ac4kjnnkgj6fby8i9vrpr6mrb13d4gnk4gr2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-auctex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-auctex";
           sha256 = "00npvryds5wd3d5a13r9prlvw6vvjlag8d32x5xf9bfmmvs0fgqh";
           name = "auto-complete-auctex";
         };
@@ -2798,7 +2798,7 @@
           sha256 = "12mzi6bwg702sp0f0wd1ag555blbpk252rr9rqs03bn8pkw89h4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-c-headers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-c-headers";
           sha256 = "02pkrxvzrpyjrr2fkxnl1qw06aspzv8jlp2c1piln6zcjd92l3j7";
           name = "auto-complete-c-headers";
         };
@@ -2819,7 +2819,7 @@
           sha256 = "1zhbpxpl443ghpkl9i68jcjfcw1vnf8ky06pf5qjjmqbxlcyd9li";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-chunk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-chunk";
           sha256 = "1937j1xm20vfcqm9ig4nvciqfkz7rpw0nsfhlg69gkmv0nqszdr3";
           name = "auto-complete-chunk";
         };
@@ -2840,7 +2840,7 @@
           sha256 = "12y6f47xbjl4gy14j2f5wlisy5vl6rhx74n27w61pjv38m0a7mi1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-clang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-clang";
           sha256 = "1rnmphl7ml5ryjl5ka2l58hddir8b34iz1rm905wdwh164piljva";
           name = "auto-complete-clang";
         };
@@ -2861,7 +2861,7 @@
           sha256 = "1sw0wxrjcjqk0w1llfj376g6axa5bnk2lq2vv66746bkz14h0s8f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-clang-async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-clang-async";
           sha256 = "1jj0jn1v3070g7g0j5gvpybv145kki8nsjxqb8fjf9qag8ilfkjh";
           name = "auto-complete-clang-async";
         };
@@ -2882,7 +2882,7 @@
           sha256 = "1fqgyg986fg1dzac5wa97bx82mfddqb6qrfnpr3zksmw3vgykxr0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-exuberant-ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-exuberant-ctags";
           sha256 = "1i2s3ycc8jafkzdsz3kbvx1hh95ydi5s6rq6n0wzw1kyy3km35gd";
           name = "auto-complete-exuberant-ctags";
         };
@@ -2903,7 +2903,7 @@
           sha256 = "18bf1kw85mab0zp7rn85cm1nxjxg5c1dmiv0j0mjwzsv8an4px5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-nxml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-nxml";
           sha256 = "0viscr5k1carn9vhflry16kgihr6fvh6h36b049pgnk6ww085k6a";
           name = "auto-complete-nxml";
         };
@@ -2924,7 +2924,7 @@
           sha256 = "1hf2f903hy9afahrgy2fx9smgn631drs6733188zgqi3nkyizj26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-pcmp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-pcmp";
           sha256 = "1mpgkwj8jwpvxphlm6iaprwjrldmihbgg97jav0fbm1kjnm4azna";
           name = "auto-complete-pcmp";
         };
@@ -2945,7 +2945,7 @@
           sha256 = "107svb82cgfns9kcrmy3hh56cab81782jkbz5i9959ms81xizfb8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-rst";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-rst";
           sha256 = "0dazkpnzzr0imb2a01qq8l60jxhhlknzjx7wccnbm7d2rk3338m6";
           name = "auto-complete-rst";
         };
@@ -2966,7 +2966,7 @@
           sha256 = "0l49ciic7g30vklxq6l1ny3mz87l5p8qc30rmkjvkzvg8r52ksn3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-sage";
           sha256 = "02sxbir3arvmnkvxgndlkln9y05jnlv6i8czd6a0wcxk4nj43lq1";
           name = "auto-complete-sage";
         };
@@ -2987,7 +2987,7 @@
           sha256 = "0rfjx0x2an28821shgb4v5djza4kwn5nnrsl2cvh3px4wrvw3izp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-dictionary";
           sha256 = "1va485a8lxvb3507kr83cr6wpssxnf8y4l42mamn9daa8sjx3q16";
           name = "auto-dictionary";
         };
@@ -3000,15 +3000,15 @@
     auto-dim-other-buffers = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "auto-dim-other-buffers";
-        version = "20140619.1102";
+        version = "20160128.1146";
         src = fetchFromGitHub {
           owner = "mina86";
           repo = "auto-dim-other-buffers.el";
-          rev = "8b909cb210a9e4482bcc43858cf8d15da4ecd1d2";
-          sha256 = "1j3ygbask2vsrh6ia6y86348lg6vl68gsraryxn25mr0c2b41811";
+          rev = "e9c886fac5cf482029e3e8998e2f1ef881e9db09";
+          sha256 = "0lqfnv8wqnbb5ddwmh9svphc3bgmwdpwx40qw9sgqdzpj3xh7v8g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-dim-other-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-dim-other-buffers";
           sha256 = "0n9d23sfcmkjfqlm80vrgf856wy08ak4n4rk0z7vadq07yj46zxh";
           name = "auto-dim-other-buffers";
         };
@@ -3029,7 +3029,7 @@
           sha256 = "0jfiax1qqnyznhlnqkjsr9nnv7fpjywvfhj9jq59460j0nbrgs5c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-highlight-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-highlight-symbol";
           sha256 = "02mkji4sxym07jf5ww5kgv1c18x0xdfn8cmvgns5h4gij64lnr66";
           name = "auto-highlight-symbol";
         };
@@ -3050,7 +3050,7 @@
           sha256 = "1hlsgsdxpx42kmqkjgy9b9ldz5i4dbi879v87pjd2qbkj8iywb6y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-indent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-indent-mode";
           sha256 = "1nk78p8lqs8cx90asfs8iaqnwwyy8fi5bafaprm9c0nrxz299ibz";
           name = "auto-indent-mode";
         };
@@ -3068,7 +3068,7 @@
           sha256 = "043pb2wk7jh0jgxphdl4848rjyabna26gj0vlhpiyd8zc361pg9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-install";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-install";
           sha256 = "1gaxc2ya4r903k0jf3319wg7wg5kzq7k8rfy8ac9b0wfzv247ixk";
           name = "auto-install";
         };
@@ -3089,7 +3089,7 @@
           sha256 = "05llpa6g4nb4qswmcn7j3bs7hnmkrkax7hsk7wvklr0wrljyg9a2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-package-update";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-package-update";
           sha256 = "0fdcniq5mrwbc7yvma4088r0frdfvc2ydfil0s003faz0nrjcp8k";
           name = "auto-package-update";
         };
@@ -3110,7 +3110,7 @@
           sha256 = "10aw3bpvawkqj1l8brvzq057wx3mkzpxs4zc3yhppkhq2cpvx7i2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-save-buffers-enhanced";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-save-buffers-enhanced";
           sha256 = "123vf6nnvdhrrfjn8n8h8a11mkqmy2zm3w3yn99np0zj31x8z7bb";
           name = "auto-save-buffers-enhanced";
         };
@@ -3131,7 +3131,7 @@
           sha256 = "1h8zsgw30axprs7a5kkygbhvilillzazxgqz01ng36il65fi28s6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-shell-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-shell-command";
           sha256 = "1i78fh72i8yv91rnabf0vs78r43qrjkr36hndmn5ya2xs3b1g41j";
           name = "auto-shell-command";
         };
@@ -3152,7 +3152,7 @@
           sha256 = "14qr8c4i4644vwqvlh5d3xhw1dzmqz3v74hqlp7g8991yaka72va";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-yasnippet";
           sha256 = "02281gyy07cy72a29fjsixg9byqq3izb9m1jxv98ni8pcy3bpsqa";
           name = "auto-yasnippet";
         };
@@ -3173,7 +3173,7 @@
           sha256 = "01q3k8i8vrs7pcr507kh48np0bc6smanh0ald1hv9h4dylkq89k7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autobookmarks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autobookmarks";
           sha256 = "11zhg3y9fb5mq67fwsnjrql9mnwkp3hwib7fpllb3yyf2yywc8zp";
           name = "autobookmarks";
         };
@@ -3194,7 +3194,7 @@
           sha256 = "1pf2mwnicj5x2kksxwmrzz2vfxj9y9r6rzgc1fl8028mfrmrmg8s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autodisass-java-bytecode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autodisass-java-bytecode";
           sha256 = "1k19nkbxnysm3qkpdhz4gv2x9nnrp94xl40x84q8n84s6xaan4dc";
           name = "autodisass-java-bytecode";
         };
@@ -3215,7 +3215,7 @@
           sha256 = "1fq4h5fmamyh7z8nq6pigx74p5v8k3qfm64k66vwsm8bl5jdkw17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autodisass-llvm-bitcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autodisass-llvm-bitcode";
           sha256 = "0bh73nzll9jp7kiqfnb5dwkipw85p3c3cyq58s0nghig02z63j01";
           name = "autodisass-llvm-bitcode";
         };
@@ -3234,7 +3234,7 @@
           sha256 = "1af45z1w69dkdk4mzjphwn420m9rrkc3djv5kpp6lzbxxnmswbqw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autofit-frame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autofit-frame";
           sha256 = "0p24qqnfa1vfn5pgnpvbxwi11zjkd6f3cv5igwg6h0pr5s7spnvw";
           name = "autofit-frame";
         };
@@ -3255,7 +3255,7 @@
           sha256 = "02nnyncfh6g0xizy7wa8721ahpnwk451kngd6n0y0249f50p3962";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/automargin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/automargin";
           sha256 = "0llqz01wmacc0f8j3h7r0j57vkmzksl9vj1h0igfxzpm347mm9q8";
           name = "automargin";
         };
@@ -3276,7 +3276,7 @@
           sha256 = "1z3hd2jkibwz2ijvyh066ki5g30pdqgh2vj2r35prpp12bqabw4a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autopair";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autopair";
           sha256 = "161qhk8rc1ldj9hpg0k9phka0gflz9vny7gc8rnylk90p6asmr28";
           name = "autopair";
         };
@@ -3297,7 +3297,7 @@
           sha256 = "109il2s5ynfam510yli4xmi5zgw7xhr5gv096li24idqdp0gpf9n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autotest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autotest";
           sha256 = "0f46m5pc40i531dzfnhkcn192dcs1q20y083c1c0wg2zhjcdr5iy";
           name = "autotest";
         };
@@ -3318,7 +3318,7 @@
           sha256 = "162zay36mmkkpbfvp0lagv2js4cr1z75dc1z5l2505814m5sx3az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autotetris-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autotetris-mode";
           sha256 = "0k4yq4pvrs1zaf9aqxmlb6l2v4k774zbxj4zcx49w3l1h8gwxpbb";
           name = "autotetris-mode";
         };
@@ -3339,7 +3339,7 @@
           sha256 = "1lip7282g41ghn64dvx2ab437s83cj9l8ps1rd8rbhqyz4bx5wb9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autumn-light-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autumn-light-theme";
           sha256 = "0g3wqv1yw3jycq30mcj3w4sn9nj6i6gyd2ljzimf547ggcai536a";
           name = "autumn-light-theme";
         };
@@ -3352,15 +3352,15 @@
     avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "avy";
-        version = "20160106.923";
+        version = "20160203.157";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "avy";
-          rev = "15d0679385fdf3f1d20904ff68ebcb522c4a87d4";
-          sha256 = "171mjcv0hc7gybjsdfqayxid2dbxmd03zsp16i8fhq624277m9m8";
+          rev = "730581ae8720c255dd000ca6f0d44e1845de3f45";
+          sha256 = "0awxmd2lf5rzkw9zdlsxm614asqrl324x2qv9lgakc1f663q72sl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/avy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/avy";
           sha256 = "0gjq79f8jagbngp0shkcqmwhisc3hpgwfk34kq30nb929nbnlmag";
           name = "avy";
         };
@@ -3370,6 +3370,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    avy-menu = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "avy-menu";
+        version = "20160126.625";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "avy-menu";
+          rev = "ccc835abbb02b6846d9b01423190c6ea3b9bcba0";
+          sha256 = "1a6h44a6id4ash8kp0a59f34658p7czcl2d3i1880k8hckhy445j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/avy-menu";
+          sha256 = "1g2bsm0jpig51jwn9f9mx6z5glb0bn4s21194xam768qin0rf4iw";
+          name = "avy-menu";
+        };
+        packageRequires = [ avy emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/avy-menu";
+          license = lib.licenses.free;
+        };
+      }) {};
     avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
     melpaBuild {
         pname = "avy-migemo";
@@ -3381,7 +3402,7 @@
           sha256 = "0d8s16f8y9kypl083hgz5rbv47fkb3hvimgw57czf6hlcaaldy75";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/avy-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/avy-migemo";
           sha256 = "1zvgkhma445gj1zjl8j25prw95bdpjbvfy8yr0r5liay6g2hf296";
           name = "avy-migemo";
         };
@@ -3402,7 +3423,7 @@
           sha256 = "0s7lhls6gs055kw0893nkb9myv7m2q2p251lq9wh2r3bmia9d6pg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/avy-zap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/avy-zap";
           sha256 = "1zbkf21ggrmg1w0xaw40i3swgc1g4fz0j8p0r9djm9j120d94zkx";
           name = "avy-zap";
         };
@@ -3420,7 +3441,7 @@
           sha256 = "1r1vbi1r3rdbkyb2naciqwja7hxigjhqfxsfcinnygabsi7fw9aw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/awk-it";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/awk-it";
           sha256 = "1rnrm9jf9wvfrwyylhj0bfrz9140945lc87lrh21caf7q88fpvkw";
           name = "awk-it";
         };
@@ -3433,14 +3454,14 @@
     axiom-environment = callPackage ({ emacs, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "axiom-environment";
-        version = "20151126.1509";
+        version = "20160123.1226";
         src = fetchhg {
           url = "https://bitbucket.com/pdo/axiom-environment";
-          rev = "d7ea57a27527";
-          sha256 = "1vk7jjbf8wp183c4nagkgxvzcyrdlr53avzsxl111rm5rsxbvdli";
+          rev = "f7b3a13f54ea";
+          sha256 = "1qq0b92mf73fnx2viwzlsxr6672wkskf0vjimymyhv9aq3gw165w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/axiom-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/axiom-environment";
           sha256 = "1d3h1fn5zfbh7kpm2i02kza3bq9s6if4yd2vvfjdhgrykvl86h66";
           name = "axiom-environment";
         };
@@ -3461,7 +3482,7 @@
           sha256 = "140lbpqq4qz45ykycdn8nvcn8pv0xqfwpapgprvyg8z5fjkyc4sg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/babel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/babel";
           sha256 = "0sdpp4iym61ni32zv75n48ylj4jib8ca6n9hyqwj1b7nqg76mm1c";
           name = "babel";
         };
@@ -3482,7 +3503,7 @@
           sha256 = "1wfssdv6ag36ww6v7al2x04mbpaajlx92wfm8rbq8rp8887724s5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/babel-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/babel-repl";
           sha256 = "0h11i8w8s4ia1x0lm5n7bnc3db4bv0a7f7hzl27qrg38m3c7dl6x";
           name = "babel-repl";
         };
@@ -3503,7 +3524,7 @@
           sha256 = "0rj6a8rdwa0h2ckz7h4d91hnxqcin98l4ikbfyak2whfb47z909l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/back-button";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/back-button";
           sha256 = "0vyhvm445d0rs14j5xi419akk5nd88d4hvm4251z62fmnvs50j85";
           name = "back-button";
         };
@@ -3528,7 +3549,7 @@
           sha256 = "0b9vvi2m0fdv36wj8mvawl951gjmg3pypg08a8n6rzn3rwg0fwz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/backup-each-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/backup-each-save";
           sha256 = "1fv9sf6vkjyv93vil4l9hjm2fg73zlxbnif0xfm3kpmva9xin337";
           name = "backup-each-save";
         };
@@ -3549,7 +3570,7 @@
           sha256 = "0z4d8x9lkad50720lgvr8f85p1ligv07865i30lgr9ck0q04w68v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/backup-walker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/backup-walker";
           sha256 = "0hfr27yiiblrd0p3zhpapbj4vijfdk7wqh406xnlwf2yvnfsqycd";
           name = "backup-walker";
         };
@@ -3570,7 +3591,7 @@
           sha256 = "0g8smx6pi2wqv78mhxfgwg51mx5msqsgcc55xcz29aq0q3naw4z1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/badger-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/badger-theme";
           sha256 = "01h5bsqllgn6gs0wpl0y2h041007mn3ldjswkz6f3mayrgl4c6yf";
           name = "badger-theme";
         };
@@ -3583,15 +3604,15 @@
     badwolf-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "badwolf-theme";
-        version = "20160108.1629";
+        version = "20160120.1138";
         src = fetchFromGitHub {
           owner = "bkruczyk";
           repo = "badwolf-emacs";
-          rev = "a0b4e1bd6014800eacd2c90bdaa9478d955642f7";
-          sha256 = "0bwai3b5g3ksxg8i9fdby5zkca56qpsc7fyj2hl6arcfwnc68nhc";
+          rev = "c75fad427851c65c2a7f11aeb95401acb951038e";
+          sha256 = "1jknanz09li3shlkdc6afg9qajz79bkinp5va3mymrmilj82wp1v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/badwolf-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/badwolf-theme";
           sha256 = "03plkzpmlh0pgfp1c9padsh4w2g23clsznym8x4jabxnk0ynhq41";
           name = "badwolf-theme";
         };
@@ -3612,7 +3633,7 @@
           sha256 = "00skx1aywzvnqqsm41n2mwry5i6ifib8kzq5klymbrc7qfnbb55f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/baidu-life";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/baidu-life";
           sha256 = "0rib50hja33qk8dmw5i62gaxhx7mscj2y0n25jmnds7k88ms8z19";
           name = "baidu-life";
         };
@@ -3633,7 +3654,7 @@
           sha256 = "16240dj0hvxkljas9973wjdgkbx213sqws77j167yr5xf761dlsr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/base16-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/base16-theme";
           sha256 = "1zxbvfj6gvz1ynhj6i9q9y65hq7aq41qx4vnx738cjizcq0rc8bs";
           name = "base16-theme";
         };
@@ -3654,7 +3675,7 @@
           sha256 = "06c42531dy5ngscwfvg8rksg6jcsakfn7104hmlg1jp4kvfiy1kg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bash-completion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bash-completion";
           sha256 = "0l41yj0sb87i27hw6dh35l32hg4qkka6r3bpkckjnfm0xifrd9hj";
           name = "bash-completion";
         };
@@ -3675,7 +3696,7 @@
           sha256 = "1pbnw6ccphxynbhnc4g687jfcg33p1sa7a0mfxc2ai0i3z59gn78";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/basic-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/basic-theme";
           sha256 = "16rgff1d0s65alh328lr93zc06zmgbzgwx1rf3k3l4d10ki4cc27";
           name = "basic-theme";
         };
@@ -3693,7 +3714,7 @@
           sha256 = "1aa611jrzw4svmxvw1ghgh53x4nry0sl7mxmp4kxiaybqqvz6a1p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/batch-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/batch-mode";
           sha256 = "1p0rh5r8w00jag64sbjy8xb9g6lqhm2fz476v201kbrj9ggp643x";
           name = "batch-mode";
         };
@@ -3714,7 +3735,7 @@
           sha256 = "1fy9qnwsxvb8qnyk13bnjjbnlhdads5qf1byg5agg6lq5np3w5jf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bats-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bats-mode";
           sha256 = "1l5winy30w8fs3f5cylc3a3j3mfkvchwanlgsin7q76jivn87h7w";
           name = "bats-mode";
         };
@@ -3735,7 +3756,7 @@
           sha256 = "17ip24fk13aj9zldn2qsr4naa8anqhm484m1an5l5i9m9awfiyn7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbcode-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbcode-mode";
           sha256 = "0ixxavmilr6na56yc148prbh3nlhcwir6rxqvh332cr8vr9gmp89";
           name = "bbcode-mode";
         };
@@ -3754,7 +3775,7 @@
           sha256 = "e20dfe8085782948c1411685d45bad0cb7ff088bc2d1d2c1654c276356382b26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb";
           sha256 = "0zhs4psa9b9yf9hxm19q5znsny11cdp23pya3rrlmj39j4jfn73j";
           name = "bbdb";
         };
@@ -3775,7 +3796,7 @@
           sha256 = "17nbnkg0zn6p89r27mk9hl6qhv6xscwdsq8iyikdw03svpr16lnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-";
           sha256 = "1vzbalcchay4pxl9f1sxg0zclgc095f59dlj15pj0bqq61sbl9jf";
           name = "bbdb-";
         };
@@ -3796,7 +3817,7 @@
           sha256 = "0m80k87dahzdpfa4snbl4p9zm5d5anc8s91535mwzsnfbr98qmhm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-android";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-android";
           sha256 = "0v3njygqkcrwjkf7jrqmza6bwk2jp3956cx1qvf9ph7dfxsq7rn3";
           name = "bbdb-android";
         };
@@ -3817,7 +3838,7 @@
           sha256 = "07plwm5nh58qya03l8z0iaqh8bmyhywx7qiffkf803n8wwjb3kdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-china";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-china";
           sha256 = "111lf256zxlnylfmwis0pngbpj73p59s520v8abbm7pn82k2m72b";
           name = "bbdb-china";
         };
@@ -3838,7 +3859,7 @@
           sha256 = "1h9vi9wb3dzzjrw5zfypk60afzzshxa3qmnbc24ypby5dr7qy91l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-csv-import";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-csv-import";
           sha256 = "0r7pc2ypd1ydqrnvcqmsg69rm047by7k0zhm563538ra82597wnm";
           name = "bbdb-csv-import";
         };
@@ -3859,7 +3880,7 @@
           sha256 = "1ydf89mmp3zjfqdymnrwg18wclyf7psarz9f2k82pl58h0khh71g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-ext";
           sha256 = "0fnxcvzdyh0602rdfz3lz3vmvza4s0syz1vn2fgsn2lg3afqq7li";
           name = "bbdb-ext";
         };
@@ -3880,7 +3901,7 @@
           sha256 = "04yxky7qxh0s4y4addry85qd1074l97frhp0hw77xd1bc7n5zzg0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-handy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-handy";
           sha256 = "0qv1lw4fv9w9c1ypzpbnvkm6ypqrzqpwyw5gpi7n9almxpd8d68z";
           name = "bbdb-handy";
         };
@@ -3901,7 +3922,7 @@
           sha256 = "1zlf9xhpirln72xr7v6kgndkg5wyz5ipsl4gpq9lbmp92jlgbwlj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-vcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-vcard";
           sha256 = "1kn98b7mh9a28933r4yl8qfl9p92rpix4vkp71sar9cka0m71ilj";
           name = "bbdb-vcard";
         };
@@ -3922,7 +3943,7 @@
           sha256 = "1zkh7dcas80wwjvigl27wj8sp4b5z6lh3qj7zkziinwamwnxbdbs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb2erc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb2erc";
           sha256 = "0k1f6mq9xd3568vg01dqqvcdbdshbdsi4ivkjyxis6dqfnqhlfdd";
           name = "bbdb2erc";
         };
@@ -3943,7 +3964,7 @@
           sha256 = "1cdm4d6fjf3m495phynq0dzvv0wc0gfsw6fdq4d47iyxs0p4q2dl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbyac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbyac";
           sha256 = "19s9fqcdyqz22m981vr0p8jwghbs267yrlxsv9xkfzd7fccnx170";
           name = "bbyac";
         };
@@ -3964,7 +3985,7 @@
           sha256 = "0d5b7zyl2vg621w1ll2lw3kjz5hx6lqxc0jivh0i449gckk5pzkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bdo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bdo";
           sha256 = "0vp8am2x11abxganw90025w9qxnqjdkj015592glbbzpa6338nfl";
           name = "bdo";
         };
@@ -3977,15 +3998,15 @@
     beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "beacon";
-        version = "20160116.1019";
+        version = "20160125.547";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "beacon";
-          rev = "d4a9dad594473c511f975017d792efc8a8339671";
-          sha256 = "12nhpn79ahqm1pg2wxmv7y0d22yxb67apm1rlk0zm92nz0y2jip6";
+          rev = "7104ad532419689513d8f72dc61badd4e0272558";
+          sha256 = "016c8lmcwlivxr1snh9dk57ssl0vj8v4nazddxchqxc2bibd3csl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/beacon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/beacon";
           sha256 = "1pwxvdfzs9qjd44wvgimipi2hg4qw5sh5wlsl8h8mq2kyx09s7hq";
           name = "beacon";
         };
@@ -4006,7 +4027,7 @@
           sha256 = "1ckbl8z59p81jsq8xsgcwqqrpzv1apzjr594w3dyp9bzqb7h2acm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/beeminder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/beeminder";
           sha256 = "0aj7ix7nrsl89f9c449kik8fbzhfk9li50wrh50cdwgfh8gda0fx";
           name = "beeminder";
         };
@@ -4027,7 +4048,7 @@
           sha256 = "1hyiz7iwnzbg1616q0w7fndllbnx4m98kakgxn04bsqib5fqk78p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/beginend";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/beginend";
           sha256 = "1y81kr9q0zrsr3c3s14rm6l86y5wf1a0kia6d98112fy4fwdm7kq";
           name = "beginend";
         };
@@ -4048,7 +4069,7 @@
           sha256 = "058mic9jkwiqvmp3k9sfd6gb70ysdphnb1iynlszhixbrz5w7zs2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/benchmark-init";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/benchmark-init";
           sha256 = "0dknch4b1j7ff1079z2fhqng7kp4903b3v7mhj15b5vzspbp3wal";
           name = "benchmark-init";
         };
@@ -4069,7 +4090,7 @@
           sha256 = "06izbc0ksyhgh4gsjiifhj11v0gx9x5xjx9aqci5mc4kc6mg05sf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bert";
           sha256 = "1zhz1dcy1nf84p244x6lc4ajancv5fgmqmbrm080yhb2ral1z8x7";
           name = "bert";
         };
@@ -4082,15 +4103,15 @@
     better-defaults = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "better-defaults";
-        version = "20150404.423";
+        version = "20160128.118";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "better-defaults";
-          rev = "b7888289ed702aff1616cbff832c97d4e5fc2463";
-          sha256 = "0j3wpw43q262wnq5214r20r15sy2hihbiak5j7ag23lq9jx2jvva";
+          rev = "90df5752a0a0602feb47aadfd3542aa7fc841bd8";
+          sha256 = "1rxznx2l0cdpiz8mad8s6q17m1fngpgb1cki7ch6yh18r3qz8ysr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/better-defaults";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/better-defaults";
           sha256 = "13bqcmx2gagm2ykg921ik3awp8zvw5d4lb69rr6gkpjlqp7nq2cm";
           name = "better-defaults";
         };
@@ -4108,7 +4129,7 @@
           sha256 = "05dlhhvd1m9q642gqqj6klif13shbinqi6bi72fldidi1z6wcqlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/better-registers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/better-registers";
           sha256 = "01i0qjrwsc5way2h9z3pmsgccsbdifsq1dh6zhka4h6qfgrmn3bx";
           name = "better-registers";
         };
@@ -4129,7 +4150,7 @@
           sha256 = "02b2m0cq04ynjcmr4j8gpdzjv9mpf1fysn736xv724xgaymj396n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bf-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bf-mode";
           sha256 = "0b1yf9bx1ldkzry7v5qvcnl059rq62a50dvpa10i2f5v0y96n1q9";
           name = "bf-mode";
         };
@@ -4150,7 +4171,7 @@
           sha256 = "1y9fxs1nbf0xsn8mw45m9ghmji3h64wdbfnyr1npmf5fb27rmd17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bfbuilder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bfbuilder";
           sha256 = "16ckybqd0a8l75ascm3k4cdzp969lzq7m050aymdyjhwif6ld2r7";
           name = "bfbuilder";
         };
@@ -4171,7 +4192,7 @@
           sha256 = "0rwy4k06nd9a31hpyqs0fxp45dpddbvbhwcw1gzx4f73qmgawq9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bibretrieve";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bibretrieve";
           sha256 = "1mf884c6adx7rq5c2z5wrnjpb6znljy30mscxskwqiyfs8c62mii";
           name = "bibretrieve";
         };
@@ -4192,7 +4213,7 @@
           sha256 = "077shjz9sd0k0akvxzzgjd8a626ck650xxlhp2ws4gs7rjd7a823";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bibslurp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bibslurp";
           sha256 = "178nhng87bdi8s0r2bdh2gk31w9mmjkyi6ncnddk3v7p8fsh4jjp";
           name = "bibslurp";
         };
@@ -4213,7 +4234,7 @@
           sha256 = "1qf45s53vcbd90v2d2brynv3xmp8sy9w9jp611cf0dzfl1k7x8p8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bibtex-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bibtex-utils";
           sha256 = "13llsyyvy0xc9s51cqqc1rz13m3qdqh8jw07gwywfbixlma59z8l";
           name = "bibtex-utils";
         };
@@ -4234,7 +4255,7 @@
           sha256 = "05lhxbrgwbyz0nkb19yln9a46jh91ic685943hd58cn91lxsw3al";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bind-chord";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bind-chord";
           sha256 = "01a3c298kq8cfsxsscpic0shkjm77adiamgbgk8laqkbrlsrrcsb";
           name = "bind-chord";
         };
@@ -4251,11 +4272,11 @@
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "2a50241538b8ead3d620be33bd8e0087f98f42c5";
-          sha256 = "0wiv5xh2hik76x0i4a6amq5648akm5kvr4llnkh190riibnwkwx6";
+          rev = "a29e0328c0076cc927e5fd3d8db1878c0f978ace";
+          sha256 = "0s4qmqgym12gk8kiz90ck5yi7icz8dydyks0psfam1nza89cbfys";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bind-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bind-key";
           sha256 = "1qw2c27016d3yfg0w10is1v72y2jvzhq07ca4h6v17yi94ahj5xm";
           name = "bind-key";
         };
@@ -4268,15 +4289,15 @@
     bind-map = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bind-map";
-        version = "20160117.2028";
+        version = "20160201.656";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-bind-map";
-          rev = "cc1db8958c8fe913f562a59bd7a1a58dac33444b";
-          sha256 = "0ch7dpd96skbhnfm8an3gpqk2bccyrvl6plinfgrhp37jpkrsa5a";
+          rev = "00b7778826f683e56ccfa3044b6312a1fcfdeb13";
+          sha256 = "1kk2hig6ag07iihkhr880n332789r5p2zz26a25dwqkr27jgs7x8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bind-map";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bind-map";
           sha256 = "1jzkp010b4vs1bdhccf5igmymfxab4vxs1pccpk9n5n5a4xaa358";
           name = "bind-map";
         };
@@ -4297,7 +4318,7 @@
           sha256 = "0pmpg54faq0l886f2cmnmwm28d2yfg8adk7gp7623gx0ifggn332";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bing-dict";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bing-dict";
           sha256 = "0s5pd08rcnvmgi1hw17xbzvswlv0yni6h2h2gccrjmf6izi8whh1";
           name = "bing-dict";
         };
@@ -4318,7 +4339,7 @@
           sha256 = "1n5icy29ks5rxrxp7v4sf0523z7wxn0fh9lx4y6jb7ppdjnff12s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/birds-of-paradise-plus-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/birds-of-paradise-plus-theme";
           sha256 = "0vdv2siy30kf1qhzrc39sygjk17lwm3ix58pcs3shwkg1y5amj3m";
           name = "birds-of-paradise-plus-theme";
         };
@@ -4339,7 +4360,7 @@
           sha256 = "0iccafawm9ah62f7qq1k77kjpafhcpjcaiqh5xjig1wxnpc43ck7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bison-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bison-mode";
           sha256 = "097gimlzmyrsfnl76cbzyyi9dm0d2y3f9107672h56ncri35mh66";
           name = "bison-mode";
         };
@@ -4360,7 +4381,7 @@
           sha256 = "14dsjbw4ss3i6ydynm121v5j3idvy85sk1vqbr5r871d32179xan";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bitbake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bitbake";
           sha256 = "1k2n1i8g0jc78sp1icm64rlhi1q0vqar2a889nldp134a1l7bfah";
           name = "bitbake";
         };
@@ -4381,7 +4402,7 @@
           sha256 = "1cnx5kr0hah4h4b6arp7hb2i556vpx1dwmziny2csil39hkcjgbs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bitlbee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bitlbee";
           sha256 = "15xb0vjamnfwi25yqd37zwfm6xb6p71if88hk2ymxikza4i47x0f";
           name = "bitlbee";
         };
@@ -4402,7 +4423,7 @@
           sha256 = "09blh9cbcbqr3pdaiwm9fmh5kzqm1v9mffy623z3jn87g5wadrmb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bitly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bitly";
           sha256 = "032s7ax8qp3qzcj1njbyyxiyadjirphswqdlr45zj6hzajfsr247";
           name = "bitly";
         };
@@ -4420,7 +4441,7 @@
           sha256 = "1wdplnmdllbydwr9gyyq4fbkxl5xjh7220vd4iajyv74pg2jkkkv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/blank-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/blank-mode";
           sha256 = "1pyx5xwflnni9my5aqpgf8xz4q4rvmj67pwb4zxx1lghrca97z87";
           name = "blank-mode";
         };
@@ -4441,7 +4462,7 @@
           sha256 = "1pslwyaq18d1z7fay2ih3n27i6b49ss62drqqb095l1jxk42xxm0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/blgrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/blgrep";
           sha256 = "0w7453vh9c73hdfgr06693kwvhznn9xr1hqa65izlsx2fjhqc9gm";
           name = "blgrep";
         };
@@ -4462,7 +4483,7 @@
           sha256 = "0dn0i3nxrqd82b9d17p1v0ddlpxnlfclkc8sqzrwq6cf19wcrmdr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bliss-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bliss-theme";
           sha256 = "1kzvi6zymfgirr41l8r2kazfz1y4xkigbp5qa1fafcdmw81anmdh";
           name = "bliss-theme";
         };
@@ -4472,6 +4493,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    blog-admin = callPackage ({ ctable, f, fetchFromGitHub, fetchurl, lib, melpaBuild, names, org, s }:
+    melpaBuild {
+        pname = "blog-admin";
+        version = "20160202.803";
+        src = fetchFromGitHub {
+          owner = "codefalling";
+          repo = "blog-admin";
+          rev = "0935b0c5e7ed6c7a26a7ff16cd38a168a8fb93a3";
+          sha256 = "0zhcjg68nzqdrlnbm7akzgn4px3prrqjjym2qzfirmdbq6dxifgg";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/blog-admin";
+          sha256 = "0l2si3fyi7kz4px3m8m0i71xvlsrx0y81247j1kcl7iax53zkl8c";
+          name = "blog-admin";
+        };
+        packageRequires = [ ctable f names org s ];
+        meta = {
+          homepage = "http://melpa.org/#/blog-admin";
+          license = lib.licenses.free;
+        };
+      }) {};
     bm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bm";
@@ -4483,7 +4525,7 @@
           sha256 = "1ggqg0lgvxg2adq91damvh55m36qsa23n3z6zyf5z6855ilzaa4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bm";
           sha256 = "07459r7m12j2nsb7qrb26bx32alylhaaq3z448n42lz02a8dc63g";
           name = "bm";
         };
@@ -4496,15 +4538,15 @@
     bog = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bog";
-        version = "20160117.1615";
+        version = "20160124.1737";
         src = fetchFromGitHub {
           owner = "kyleam";
           repo = "bog";
-          rev = "a13b6305f0b6a73373809fb71595194aa284696c";
-          sha256 = "1j2ar9sinbrraqvymqmjray48xbr1arhpigzgkgnhkc2zzqv8dwb";
+          rev = "0ba8df3f2d31d24f86deadc4369b7330efbac8c3";
+          sha256 = "0fy2jwpgvqlff5bn0l971xxb76krm3idjqjl61qgim6a45kip057";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bog";
           sha256 = "1ci8xxca7dclmi5v37y5k45qlmzs6a9hi6m7czgiwxii902w5pkl";
           name = "bog";
         };
@@ -4525,7 +4567,7 @@
           sha256 = "0ghjfrwc2i04rxg3nqc5fg2kgfyjlhk8n2qcz53p9i7ncc3zgpha";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bongo";
           sha256 = "07i9gw067r2igp6s2g2iakm1ybvw04q6zznna2cfdf08nax64ghv";
           name = "bongo";
         };
@@ -4546,7 +4588,7 @@
           sha256 = "06cpbjbv8ysz81szwgglgy5r1aay8rrzw5k86wyqg9jdzwpmilpn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bonjourmadame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bonjourmadame";
           sha256 = "0d36yradh37359fjk59s54hxkbh4qcc17sblj2ylcdyw7181iwfn";
           name = "bonjourmadame";
         };
@@ -4567,7 +4609,7 @@
           sha256 = "11m0w8i2nq0nqrpg6m7vnn9sd3v1ln5b3rka7m9fnasadf77nmpv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/boogie-friends";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/boogie-friends";
           sha256 = "0cfs7gvjxsx2027dbzh4yypz500nmk503ikiiprbww8jyvc8grk7";
           name = "boogie-friends";
         };
@@ -4585,7 +4627,7 @@
           sha256 = "06621js3bvslfmzmkphzzcrd8hbixin2nx30ammcqaa6572y14ad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bookmark+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bookmark+";
           sha256 = "0121xx7dp2pakk9g7sg6par4mkxd9ky746yk4wh2wrhprc9dqzni";
           name = "bookmark-plus";
         };
@@ -4598,15 +4640,15 @@
     boon = callPackage ({ emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
     melpaBuild {
         pname = "boon";
-        version = "20151229.1340";
+        version = "20160202.1455";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "boon";
-          rev = "9604996c148f2bacf6e95502c33a3f154d6ab7f9";
-          sha256 = "1khl5798a9vp4f89x3f5mvh6m1yk3p07kqz7x8c2kvq58w32a6yj";
+          rev = "f6edf01a9f300d6e160f0c2c17619d3f6d1fa785";
+          sha256 = "149slx8cqh28hzb5cfa1ink99c18dh548jg2w54hvkzvqhhwhn7v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/boon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/boon";
           sha256 = "0gryw7x97jd46jgrm93cjagj4p7w93cjc36i2ps9ajf0d8m4gajb";
           name = "boon";
         };
@@ -4627,7 +4669,7 @@
           sha256 = "0yzfxxv2bw4x320268bixfc7yf97851804bz3829vbdhnr4kp6y5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/borland-blue-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/borland-blue-theme";
           sha256 = "1sc8qngm40bwdym8k1dgbahg48i73c00zxd99kqqwm9fnd6nm7qx";
           name = "borland-blue-theme";
         };
@@ -4648,7 +4690,7 @@
           sha256 = "1gys5ri56s2s525wdji3m72sxzswmb8cmhmw5iha84v7hlqkrahb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/boron-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/boron-theme";
           sha256 = "1rrqlq08jnh9ihb99ji1vvmamj742assnm4a7xqz6gp7f248nb81";
           name = "boron-theme";
         };
@@ -4669,7 +4711,7 @@
           sha256 = "0235l4f1cxj7nysfnay4fz52mg0c13pzqxbhw65vdpfzz1gl1p73";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/boxquote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/boxquote";
           sha256 = "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s";
           name = "boxquote";
         };
@@ -4690,7 +4732,7 @@
           sha256 = "0chmarbpqingdma54d6chbr6v6jg8lapbw56cpvcpbl04fz980r0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bpe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bpe";
           sha256 = "08zfqcgs7i2ram2qpy8vrzksx5722aahr66vdi4d9bcxm03s19fm";
           name = "bpe";
         };
@@ -4703,15 +4745,15 @@
     bpr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bpr";
-        version = "20151206.1415";
+        version = "20160127.1102";
         src = fetchFromGitHub {
           owner = "ilya-babanov";
           repo = "emacs-bpr";
-          rev = "1c8ffe083df2bb1e8a9aa44c9ed450f631081ae4";
-          sha256 = "01bh371c0ln0qw1wixw28gdyjk4v8griw464d671r26wsxjdiwqy";
+          rev = "b6241418747578539f9e19ff72fb228aa195315a";
+          sha256 = "05x9fmxlybas3gcv3qf1vcfh5k265hjwh73232fyg2v562if748z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bpr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bpr";
           sha256 = "0rjxn40n4s4xdq51bq0w3455g9pli2pvcf1gnbr96zawbngrw6x2";
           name = "bpr";
         };
@@ -4732,7 +4774,7 @@
           sha256 = "00463z740xrkr4yz46g9zxz23zy878jgvba81pnwvg4l6hd3kc8s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bracketed-paste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bracketed-paste";
           sha256 = "1v7zwi29as0218vy6ch21iqqcxfhyh373m3dbcdzm2pb8bpcg58j";
           name = "bracketed-paste";
         };
@@ -4753,7 +4795,7 @@
           sha256 = "1nzgjgzidyrplfs4jl8nikd5wwvb4rmrnm51qxmw9y2if0hpq0jd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/brainfuck-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/brainfuck-mode";
           sha256 = "08jzx329mrr3c2pifs3hb4i79dsw606b0iviagaaja8s808m40cd";
           name = "brainfuck-mode";
         };
@@ -4774,7 +4816,7 @@
           sha256 = "0w6b9rxdciy1365kgf6fh3vgrjr8xd5ar6xcn0g4h56f2zg9hdmj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/broadcast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/broadcast";
           sha256 = "1h2c3mb49q3vlpalrsrx8q3rmy1zg0y45ayvzbvzdkfgs8idgbib";
           name = "broadcast";
         };
@@ -4795,7 +4837,7 @@
           sha256 = "0q71ah62q6acivhxzsw9j1ky54i9hhlnj97sjn8bxrxx7nw01gf7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/browse-at-remote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/browse-at-remote";
           sha256 = "1d40b9j3pc6iy3l25062k7f52aq0vk9sizdwd7wii3v5nciczv6w";
           name = "browse-at-remote";
         };
@@ -4808,15 +4850,15 @@
     browse-kill-ring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "browse-kill-ring";
-        version = "20150829.832";
+        version = "20160125.209";
         src = fetchFromGitHub {
           owner = "browse-kill-ring";
           repo = "browse-kill-ring";
-          rev = "66b5a0872b4278b49a815fc759c3eb48aebe10bf";
-          sha256 = "06mdrjc4jq7pj8vmg91dair138kmhvaa9gi5icc56120jmfb6kn2";
+          rev = "c7df6c8f5fe1e82d17b23da6d43a038784721d10";
+          sha256 = "0sndzhza9k4vcf70fzxsyzrfryaz92lm1y7bbb0dx10m65qljpbi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/browse-kill-ring";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/browse-kill-ring";
           sha256 = "1d97ap0vrg5ymp96z7y6si98fspxzy02jh1i4clvw5lggjfibhq4";
           name = "browse-kill-ring";
         };
@@ -4835,7 +4877,7 @@
           sha256 = "1z6pix1ml3s97jh34fwjj008ihlrz4hkipdh5yzcvc6nhrimjw2f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/browse-kill-ring+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/browse-kill-ring+";
           sha256 = "1flw7vmqgsjjvr2zlgz2909gvpq9mhz8qkg6hvsrzwg95f4l548w";
           name = "browse-kill-ring-plus";
         };
@@ -4856,7 +4898,7 @@
           sha256 = "1rcihwdxrzhgcz573rh1yp3770ihkwqjqvd39yhic1d3sgwxz2hy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/browse-url-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/browse-url-dwim";
           sha256 = "13bv2ka5pp9k4kwrxfqfawwxzsqlakvpi9a32gxgx7qfi0dcb1rf";
           name = "browse-url-dwim";
         };
@@ -4874,7 +4916,7 @@
           sha256 = "1yslzlx54n17330sf6b2pynz01y6ifnkhipz4hggn1i55bz8hvrw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bs-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bs-ext";
           sha256 = "0dddligqr71qdakgfkx0r45k9py85qlym7y5f204bxppyw5jmwb6";
           name = "bs-ext";
         };
@@ -4895,7 +4937,7 @@
           sha256 = "022j0gw5qkxjz8f70vqjxysifv2mz6cigf9n5z03zmpvwwvxmx2z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/btc-ticker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/btc-ticker";
           sha256 = "1vfnx114bvnly1k3fmcpkqq4m9558wqr5c9k9yj8f046dgfh8dp1";
           name = "btc-ticker";
         };
@@ -4916,7 +4958,7 @@
           sha256 = "1qgasaqhqm0birjmb6k6isd2f5pn58hva8db8qfhva9g5kg1f38w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bts";
           sha256 = "1i1lbjracrgdxr52agxhxxgkra4w291dmz85s195lcx38rva7ib3";
           name = "bts";
         };
@@ -4937,7 +4979,7 @@
           sha256 = "1sfr3j11jz4k9jnfa9i05bp4v5vkil38iyrgsp3kxf15797b9dg9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bts-github";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bts-github";
           sha256 = "03lz12bbkjqbs82alc97k6s1pmk721qip3h9cifq8a5ww5cbq9ln";
           name = "bts-github";
         };
@@ -4958,7 +5000,7 @@
           sha256 = "1aha8rzilv4k300rr4l9qjfygydfwllkbw17lhm8jz0kh9w6bd28";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bubbleberry-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bubbleberry-theme";
           sha256 = "056pcr9ynsl34wqa2pw6sh4bdl5kpp1r0pl1vvw15p4866l9bdz3";
           name = "bubbleberry-theme";
         };
@@ -4979,7 +5021,7 @@
           sha256 = "1p5a29bpjqr1gs6sb6rr7y0j06nlva23wxkwfskap25zvjpgwbvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buffer-buttons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buffer-buttons";
           sha256 = "1p0ydbrff9197sann3s0d7hpav7r9g461w4llncafmy31w7m1dn6";
           name = "buffer-buttons";
         };
@@ -5000,7 +5042,7 @@
           sha256 = "0s43cvkr1za5sd2cvl55ig34wbp8xyjf85snmf67ps04swyyk92q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buffer-flip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buffer-flip";
           sha256 = "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098";
           name = "buffer-flip";
         };
@@ -5021,7 +5063,7 @@
           sha256 = "1yzga2zs9flbarsh704hh7k4l3w09g4li9a7r3fsvl4kll80x393";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buffer-move";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buffer-move";
           sha256 = "0wysywff2bggrha7lpl83c8x6ln7zgdj9gsqmjva6gramqb260fg";
           name = "buffer-move";
         };
@@ -5039,7 +5081,7 @@
           sha256 = "0d87cl7a4rcd6plbjyf26vaar7imwd18z24xdi4dz734m9zbkg6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buffer-stack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buffer-stack";
           sha256 = "00vxfd4ki5pqf9n9vbmn1441vn2y14bdr1v05h46hswf13b4hzrn";
           name = "buffer-stack";
         };
@@ -5060,7 +5102,7 @@
           sha256 = "1mnf0dgr6g58k0jyia7985jsinrla04vm5sjl2iajwphbhadjk8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buffer-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buffer-utils";
           sha256 = "0cfipdn4fc4fvz513mwiaihvbdi05mza3z5z1379wlljw6r539z2";
           name = "buffer-utils";
         };
@@ -5081,7 +5123,7 @@
           sha256 = "1plh77xzpbhgmjdagm5rhqx6nkhc0g39ir0b6s5yh003wmx6r1hh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bufshow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bufshow";
           sha256 = "027cd0jzb8yxm66q1bhyi75f2m9f2pq3aswgav1d18na3ybwg65h";
           name = "bufshow";
         };
@@ -5102,7 +5144,7 @@
           sha256 = "0zr1raf0q5wi3vr66kglxcfxswlm8g2l501adm8c27clvqizpnrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bug-reference-github";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bug-reference-github";
           sha256 = "18yzxwanbrxsab6ba75z1196x0m6dapdhbvy6df5b5x5viz99cf6";
           name = "bug-reference-github";
         };
@@ -5115,15 +5157,15 @@
     bundler = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
     melpaBuild {
         pname = "bundler";
-        version = "20151111.912";
+        version = "20160121.524";
         src = fetchFromGitHub {
           owner = "tobiassvn";
           repo = "bundler.el";
-          rev = "9be0c4601a4d1a35de22f818637ce029830272d3";
-          sha256 = "0cldbyc7qsyxszzfbdcw8n8a15hvj343acsjir29n6d9nnpmvjgp";
+          rev = "b9b1acd074263cb23d05a0718e02f164687f0625";
+          sha256 = "0gr4v6fmg0im17f6i3pw6h8l401n5l5lzxz0hgi8lrisvx73iqa5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bundler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bundler";
           sha256 = "0i5ybc6i8ackxpaa75kwrg44zdq3jkvy48c42vaaafpddjwjnsy4";
           name = "bundler";
         };
@@ -5144,7 +5186,7 @@
           sha256 = "1bzilpjibyyj97z5j7zz89jx0kfqr842lrjlnq1qki8r5kj18p4j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bury-successful-compilation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bury-successful-compilation";
           sha256 = "1gkq4r1573m6m57fp7x69k7kcpqchpcqfcz3792v0wxr22zhkwr3";
           name = "bury-successful-compilation";
         };
@@ -5165,7 +5207,7 @@
           sha256 = "1viq7cb41r8klr8i38c5zjrhdnww31gh4j51xdgy4v2lc3z321zi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buster-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buster-mode";
           sha256 = "1qndhchc8y27x49znhnc4rny1ynfcplr64rczrlbj53qmkxn5am7";
           name = "buster-mode";
         };
@@ -5186,7 +5228,7 @@
           sha256 = "11djqlw4qf3qs2rwiz7dn5q2zw5i8sykwdf4hg4awsgv8g0bbxn6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buster-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buster-snippets";
           sha256 = "0k36c2k7wwix10rgmjxipc77fkn9jahjyvl191af6w41wla47x4x";
           name = "buster-snippets";
         };
@@ -5207,7 +5249,7 @@
           sha256 = "11z987frzswnsym8g3l0s9wwdly1zn5inl2l558m6kcvfy7g59cx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/busybee-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/busybee-theme";
           sha256 = "0w0z5x2fbnalv404av3mapfkqbfgyk81a1mzvngll8x0pirbyi10";
           name = "busybee-theme";
         };
@@ -5228,7 +5270,7 @@
           sha256 = "0pp604r2gzzdpfajw920607pklwflk842difdyl4hy9w87fgc0jg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/butler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/butler";
           sha256 = "1jv74l9jy55qpwf5np9nlj6a1wqsm3xirm7wm89d1h2mbsfcr0mq";
           name = "butler";
         };
@@ -5241,15 +5283,15 @@
     buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buttercup";
-        version = "20160109.213";
+        version = "20160110.122";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "emacs-buttercup";
-          rev = "d00c1642a664f57d4a7d257a9f0edf6ba7e84b2c";
-          sha256 = "12ay9qimw569x9jcch4sirjyak90w6rf5hlsiadffw3bl445sqv7";
+          rev = "e1f71acdef3de3033d24be1cb41933eefc75029f";
+          sha256 = "0lpfx7q0qrclxii4ffrrjffb678bsx908za91nsy7mc2g0cxcapb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buttercup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buttercup";
           sha256 = "1grrrdk5pl9l1jvnwzl8g0102gipvxb5qn6k2nmv28jpl57v8dkb";
           name = "buttercup";
         };
@@ -5270,7 +5312,7 @@
           sha256 = "06qjvybf65ffrcnhhbqs333lg51fawaxnva3jvdg7zbrsv4m9acl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/button-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/button-lock";
           sha256 = "1arrdmb3nm570hgs18y9sz3z9v0wlkr3vwa2zgfnc15lmf0y34mp";
           name = "button-lock";
         };
@@ -5291,7 +5333,7 @@
           sha256 = "040mcq2cwzbrf96f9mghb4314cd8xwp7ki2ix9fxpmbwiy323ld5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/c-c-combo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/c-c-combo";
           sha256 = "09rvh6n2hqls7qki5dc34s2hmcmlvdsbgzcxgglhcmrhwx5w4vxn";
           name = "c-c-combo";
         };
@@ -5312,7 +5354,7 @@
           sha256 = "0mlm5f66541namqn04vx6csf14mxhsiknbm36yqdnp1lxb7knv7a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/c-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/c-eldoc";
           sha256 = "13grkww14w39y2x6mrbfa9nzljsnl5l7il8dnj6sjdyv0hz9x8vm";
           name = "c-eldoc";
         };
@@ -5333,7 +5375,7 @@
           sha256 = "10k90r4ckkkdjn9pqcbfyp6ynvrd5k0ngqcn5d0v1qvkn6jifxjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/c0-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/c0-mode";
           sha256 = "0s3h4b3lpz4jsk222yyfdxh780dvykhaqgyv6r3ambz95vrmmpl4";
           name = "c0-mode";
         };
@@ -5354,7 +5396,7 @@
           sha256 = "1hp6dk84vvgkmj5lzghvqlpq3axwzgx9c7gly2yx6497fgf9jlby";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cache";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cache";
           sha256 = "0lzj0h23g6alqcmd20ack53p72g9i09dp9x0bp3rdw5izcfkvhh3";
           name = "cache";
         };
@@ -5375,7 +5417,7 @@
           sha256 = "07kzhyqr8ycjvkknijqhsfr26zd5jc8wxm9sl8bp6pzn4jbs1dmx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cacoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cacoo";
           sha256 = "0kri4vi6dpsf0zk24psm16f3aa27cq5b54ga7zygmr02csq24a6z";
           name = "cacoo";
         };
@@ -5396,7 +5438,7 @@
           sha256 = "0bvrwzjx93qyx97qqw0imvnkkx4w91yk99rnhcmk029zj1fy0kzg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cake";
           sha256 = "06qlqrazz2jr08g44q73hx9vpp6xnjvkpd6ky108g0xc5p9q2hcr";
           name = "cake";
         };
@@ -5417,7 +5459,7 @@
           sha256 = "0xq10jkbk3crdhbh4lab39xhfw6vvcqz3if5q3yy4gzhx7zp94i4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cake-inflector";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cake-inflector";
           sha256 = "04mrqcm1igb638skaq2b3nr5yzxnck2vwhln61rnh7lkfxq7wbwf";
           name = "cake-inflector";
         };
@@ -5438,7 +5480,7 @@
           sha256 = "15w21r0gqblbn9wlvb4wlm3706wf01r38mp465snjzi839f6sazb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cake2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cake2";
           sha256 = "03q8vqqjlhahgnyy976c46x52splwdjpmb9ngrj5c2z7d8n9145x";
           name = "cake2";
         };
@@ -5459,7 +5501,7 @@
           sha256 = "03hi0ggq81nm1kd0mcf8fwnya4axzd80vfdjdbhgpxbkvnxldzpv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cal-china-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cal-china-x";
           sha256 = "06mh2p14m2axci8vy1hr7jpy53jj215z0djyn8h7zpr0k62ajhka";
           name = "cal-china-x";
         };
@@ -5480,7 +5522,7 @@
           sha256 = "1rv6slk3a7ca2q16isjlkmgxbxmbqx4lx2ip7z33fvnq10r5h60n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/calfw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/calfw";
           sha256 = "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8";
           name = "calfw";
         };
@@ -5501,7 +5543,7 @@
           sha256 = "14n5rci4bkbl7037xvkd69gfxnjlgvd2j1xzciqcgz92f06ir3xi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/calfw-gcal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/calfw-gcal";
           sha256 = "182p56wiycrm2cjzmlqabksyshpk7nga68jf80vjjmaavp5xqsq8";
           name = "calfw-gcal";
         };
@@ -5522,7 +5564,7 @@
           sha256 = "0n6y4z3qg04qnlsrjysf8ldxl2f2bk7n8crijydwabyy672qxd9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/calmer-forest-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/calmer-forest-theme";
           sha256 = "0riz5n8fzvxdnzgg650xqc2zwc4xvhwjlrrzls5h0pl5adaxz96p";
           name = "calmer-forest-theme";
         };
@@ -5543,7 +5585,7 @@
           sha256 = "1fxmk9ykvxkd0ldmldqnwdn5grzzzigla7zsw1yqqmlfwd48ggf8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/camcorder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/camcorder";
           sha256 = "1kbnpz3kn8ycpy8nlp8bsnnd1k1h7m02h7w5f7raw97sk4cnpvbi";
           name = "camcorder";
         };
@@ -5562,7 +5604,7 @@
           sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/caml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/caml";
           sha256 = "0kxrn9s1h2l05akcdcj6fd3g6x5wbi511mf14g9glcn8azyfs698";
           name = "caml";
         };
@@ -5583,7 +5625,7 @@
           sha256 = "08cp45snhyir5w8gyp6xws1q7c54pz06q099l0m3zmwn9277g68z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/capture";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/capture";
           sha256 = "1hxrvyq8my5886q7wj5w3mhyja7d6cf19gyclap492ci7kmrkdk2";
           name = "capture";
         };
@@ -5596,15 +5638,15 @@
     cargo = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode }:
     melpaBuild {
         pname = "cargo";
-        version = "20160109.627";
+        version = "20160126.1538";
         src = fetchFromGitHub {
           owner = "kwrooijen";
           repo = "cargo.el";
-          rev = "e6a02346fc033d6342183a76a49156d4091ef402";
-          sha256 = "152d5ym4bqnlnp6rafgy8fafx8246n78ymlcx9k2nyfar4c0lir2";
+          rev = "dafbecb43e540d6dcd5e410becaedcf6eaf61a5d";
+          sha256 = "07szswvfzvyd9sx1r4x8hyyc3984k4qqj8m24ybnjgmiax57hgkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cargo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cargo";
           sha256 = "06zq657cxfk5l4867qqsvhskcqc9wswyl030wj27a43idj8n41jx";
           name = "cargo";
         };
@@ -5625,7 +5667,7 @@
           sha256 = "14ijcb9qp1gv8ianqm7cdvwjkgpwdaw3lz34j29c3rmg5ir26bjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/caroline-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/caroline-theme";
           sha256 = "07flxggnf0lb1fnvprac1daplgx4bi5fnnkgfc58wnw805s12k32";
           name = "caroline-theme";
         };
@@ -5646,7 +5688,7 @@
           sha256 = "1nibzay3nb1n7z36w55m6kjqsj5yqj89way81f647jgbjggr6bih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/caseformat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/caseformat";
           sha256 = "1qwyr74jbx4jpfcw8sccg47q1vdg094rr06m111gsz2yaj9m0gfk";
           name = "caseformat";
         };
@@ -5667,7 +5709,7 @@
           sha256 = "0zky8d9kdrcfh4vh8v6wbzs80nixr1xnnyjgg1zdingyklrxl79y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cask";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cask";
           sha256 = "11nr6my3vlb1xiyai7qwii3nszda2mnkhkjlbh3d0699h0yw7dk5";
           name = "cask";
         };
@@ -5688,7 +5730,7 @@
           sha256 = "1m40s9q00l06fz525m3zrvwd6s60lggdqls5k5njkn671aa3h71s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cask-package-toolset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cask-package-toolset";
           sha256 = "13ix093c0a58rjqj7zfp3914xj3hvj276gb2d8zhvrx9vvs1345g";
           name = "cask-package-toolset";
         };
@@ -5709,7 +5751,7 @@
           sha256 = "15sq5vrkhb7c5j6ny6wy4bkyl5pggch4l7zw46an29rzni3pffr3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/caskxy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/caskxy";
           sha256 = "0x4s3c8m75zxsvqpgfc5xwll0489zzdnngmnq048z9gkgcd7pd2s";
           name = "caskxy";
         };
@@ -5719,22 +5761,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    cbm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    cbm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cbm";
-        version = "20150715.1404";
+        version = "20160131.1106";
         src = fetchFromGitHub {
           owner = "akermu";
           repo = "cbm.el";
-          rev = "40ae4f6ed075889346b4ba7cf991f5ad6dd6d1b7";
-          sha256 = "1b3cjb27z0nypn9nsmi93b61j7a252fb7sclh1mrsnanhvbwl0zx";
+          rev = "2f319b3ea6d434f9f9f9ace53a0ca968f3787a4c";
+          sha256 = "125d5i7ycdn2hgffc1l3jqcfzvk70m1ciywj4h53qakkl15r9m38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cbm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cbm";
           sha256 = "02ch0gdw610c8dfxxjxs7ijsc9lzbhklj7hqgwfwksnyc36zcjmn";
           name = "cbm";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "http://melpa.org/#/cbm";
           license = lib.licenses.free;
@@ -5747,11 +5789,11 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "337b29c3c2cac8920f7066ec457aeb5f62644297";
-          sha256 = "1a42bwarhciccl0yhh9i24bc9f3n5c0wlnwqfcwkb7wzqy9gd55q";
+          rev = "64ad0ea6d03c0d46030cc5aaa3715b5cf3a82d3c";
+          sha256 = "02bsiq0kxm9cbbr6hr20ac4888mcyk0i8p9hrrdvaijq4fhkk76b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ccc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ccc";
           sha256 = "0fckhmz4svcg059v4acbn13yf3ijs09fxmq1axc1b9bm3xxig2cq";
           name = "ccc";
         };
@@ -5772,7 +5814,7 @@
           sha256 = "1a93cim1w96aaj81clhjv25r7v9bwqm9a818mn8lk4aj1bmhgc4c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cd-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cd-compile";
           sha256 = "1a24rv1jbb883vwhjkw6qxv3h3qy039iqkhkx3jkq1ydidr9f0hv";
           name = "cd-compile";
         };
@@ -5789,11 +5831,11 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "337b29c3c2cac8920f7066ec457aeb5f62644297";
-          sha256 = "1a42bwarhciccl0yhh9i24bc9f3n5c0wlnwqfcwkb7wzqy9gd55q";
+          rev = "64ad0ea6d03c0d46030cc5aaa3715b5cf3a82d3c";
+          sha256 = "02bsiq0kxm9cbbr6hr20ac4888mcyk0i8p9hrrdvaijq4fhkk76b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cdb";
           sha256 = "1gx34062h25gqsl3j1fjlklha19snvmfaw068q6bv6x9r92niqnf";
           name = "cdb";
         };
@@ -5814,7 +5856,7 @@
           sha256 = "1jj9vmhc4s3ych08bjm1c2xwi81z1p20rj7bvxrgvb5aga2ghi9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cdlatex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cdlatex";
           sha256 = "1jsfmzl13fykbg7l4wv9si7z11ai5lzvkndzbxh9cyqlvznq0m64";
           name = "cdlatex";
         };
@@ -5835,7 +5877,7 @@
           sha256 = "0aspci0zg8waa3l234l0f8fjfzm67z2gydfdwwpxksz49sm2s1jk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cdnjs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cdnjs";
           sha256 = "1clm86n643z1prxrlxlg59jg43l9wwm34x5d88bj6yvix8g6wkb7";
           name = "cdnjs";
         };
@@ -5856,7 +5898,7 @@
           sha256 = "1f8gdj3p54q3410c66716y3l7i7nnkmq6hqz0dg1a1sc6jwdij3v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cedit";
           sha256 = "169sy7a1bgczwfxkkzjiggb7vdjxhrx7i3a39g6zv9f1zs6byk6m";
           name = "cedit";
         };
@@ -5877,7 +5919,7 @@
           sha256 = "0974bxy85rcxia6dkfryas2g46nanjdf8fv90adbc7kyj07xsf7c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/celery";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/celery";
           sha256 = "0m3hmvp6xz2m7z1kbb0ii0j3c95zi19652gfixq5a5x23kz8y59h";
           name = "celery";
         };
@@ -5896,7 +5938,7 @@
           sha256 = "15psyizjz8wf9wfxwwcdmg1bxf8jbv0qy40rskz7si7vxin8hhxl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/centered-cursor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/centered-cursor-mode";
           sha256 = "0a5mymnkwjvpra8iffxjwa5fq3kq4vc8fw7pr7gmrwq8ml7il5zl";
           name = "centered-cursor-mode";
         };
@@ -5909,15 +5951,15 @@
     centered-window-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "centered-window-mode";
-        version = "20140730.447";
+        version = "20160121.526";
         src = fetchFromGitHub {
           owner = "ikame";
           repo = "centered-window-mode";
-          rev = "3107c8942d06e9fea180d9340828ee58ad5cb2fd";
-          sha256 = "09jrcyc1dk2cdfi7ajk8xh2c9jw0f712j6gyvpaklvijakhvgsg7";
+          rev = "cfb1bdb851de13a588dc90cac864d38d10792763";
+          sha256 = "0dcfhx9rlcqglcyg78jkgdxm625q2czw849z0c03wb75nblkcsdp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/centered-window-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/centered-window-mode";
           sha256 = "0f5qwv4f8gn5nxsqn57bbb3y0w5whjvhv3pls88d5n68lkd1k4si";
           name = "centered-window-mode";
         };
@@ -5938,7 +5980,7 @@
           sha256 = "0zqrpaq9c3lm12jxnvysh8f3m3193k22zaj0ycscdqd1jpq4wcgh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/centimacro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/centimacro";
           sha256 = "1qbyfi6s4hdp5sv394w3sib8g2kx06i06q8gh6hdv5pis5kq9fx6";
           name = "centimacro";
         };
@@ -5959,7 +6001,7 @@
           sha256 = "17jg5d5afh9zpnjx8wkys8bjllxq99j0yhz8j3fvkskisvhkz1im";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cerbere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cerbere";
           sha256 = "1g3svmh5dlh5mvyag3hmiy90dfkk6f7ppd9qpwckxqyll9vl7r06";
           name = "cerbere";
         };
@@ -5976,11 +6018,11 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "f1e78372d5a513a8ef8730942db05873f7132ebc";
-          sha256 = "1pgq17zp0qar587nrxhybddbv33dw3a2x4agqxpgv4wmci4w50s6";
+          rev = "5bfd7f68f17f94452716659a04f534653aa42795";
+          sha256 = "1ycps7amnxgxr9y8hnhlrfj6phs9ky2nx7yszl2260q64g0jyhvm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cfengine-code-style";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cfengine-code-style";
           sha256 = "1ny8xvdnz740qmw9m81xnwd0gh0a516arpvl3nfimglaai5bfc9a";
           name = "cfengine-code-style";
         };
@@ -6001,7 +6043,7 @@
           sha256 = "019vqjmq6hb2f5lddqy0ya5q0fd47xix29cashlchz0r034rc32r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cff";
           sha256 = "04b2ck1jkhsrka6dbyn6rpsmmc2bn13kpyhzibd781hj73d93jgc";
           name = "cff";
         };
@@ -6016,11 +6058,11 @@
         version = "20150819.604";
         src = fetchsvn {
           url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "11220";
+          rev = "11323";
           sha256 = "1v8wgm3cvz4xx2jlx95ipd9340mxfxgk5hqialp76y74x03vfzq1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cg";
           sha256 = "0ra6mxf8l9fjn1vszjj71fs6f6l08hwypka8zsb3si96fzb6sgjh";
           name = "cg";
         };
@@ -6041,7 +6083,7 @@
           sha256 = "1m9sq93bwajbld3lnlzkjbsby5zlm9sxjzqynryyvsb9zr1d0a9z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/change-inner";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/change-inner";
           sha256 = "0r693056wykg4bs7inbfzfniyawmb91igk6kjjpq3njk0v84y1sj";
           name = "change-inner";
         };
@@ -6051,6 +6093,48 @@
           license = lib.licenses.free;
         };
       }) {};
+    chapel-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "chapel-mode";
+        version = "20160126.228";
+        src = fetchFromGitHub {
+          owner = "russel";
+          repo = "Emacs-Chapel-Mode";
+          rev = "e3c5fd718d00b7d33babec728990c802852b95ba";
+          sha256 = "0d2zac02zqf3al4x412cnz3hr57j3xpc34i30z1q6g429v4krkam";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chapel-mode";
+          sha256 = "0hmnsv8xf85fc4jqkaqz5j3sf56hgib4jp530vvyc2dl2sps6vzz";
+          name = "chapel-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/chapel-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
+    char-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "char-menu";
+        version = "20160204.15";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "char-menu";
+          rev = "e1b43238db53b5cb509175a8a9a5a5e3382f7bdc";
+          sha256 = "0jq5xicf0y7z1v68cgsg9vniw6pa793izz350a4wgdq8f5fcm24f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/char-menu";
+          sha256 = "11jkwghrmmvpv7piznkpa0wilwjdsps9rix3950pfabhlllw268l";
+          name = "char-menu";
+        };
+        packageRequires = [ avy-menu emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/char-menu";
+          license = lib.licenses.free;
+        };
+      }) {};
     character-fold-plus = callPackage ({ fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "character-fold-plus";
@@ -6060,7 +6144,7 @@
           sha256 = "00b0jv58wkvhahfnqwbfawz1z3nbm6d8s8cq0nn631w4m509kgq0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/character-fold+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/character-fold+";
           sha256 = "01ibdwd7vap9m64w0bhyknxa3iank3wfss49gsgg4xbbxibyrjh3";
           name = "character-fold-plus";
         };
@@ -6073,15 +6157,15 @@
     charmap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "charmap";
-        version = "20131019.2358";
+        version = "20160124.722";
         src = fetchFromGitHub {
           owner = "lateau";
           repo = "charmap";
-          rev = "165193d91ef96f563ae8366ed4c1a2df5a4eaed2";
-          sha256 = "0crnd64cnsnaj5mcy55q0sc1rnamxa1xbpwpmirhyhxz780klww6";
+          rev = "3302ee8a94a04fa9b14dbe7163b0d62f31de69a2";
+          sha256 = "0zf9i7ajjm639hw34iqwjvni6gn0smzi79582d5l36jvr0z4gnkq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/charmap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/charmap";
           sha256 = "1j7762d2i17ysn9ys8j7wfv989avmax8iylml2hc26mwbpyfpm84";
           name = "charmap";
         };
@@ -6102,7 +6186,7 @@
           sha256 = "1r2s3fszblk5wa6v3hnbzsri550gi5qsmp2w1spvmf1726n900cb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chatwork";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chatwork";
           sha256 = "0p71swcpfqbx2zmp5nh57f0m30cn68g3019005wa5x4fg7dx746p";
           name = "chatwork";
         };
@@ -6119,11 +6203,11 @@
         src = fetchFromGitHub {
           owner = "darksmile";
           repo = "cheatsheet";
-          rev = "80e58c1783571e2907dfe25a32ae46ad3da1bcf1";
-          sha256 = "1v2r7b6dbnxfhacg8cbb0wkymsnxnr2qgxsdbzqb4lh7r282vxxn";
+          rev = "c4d9af19bf563977dd74863bb70d1aa783952f1c";
+          sha256 = "15kam5hf2f4nwp29nvxqm5bs8nyhqf5m44fdb21qljgbmjdlh38y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cheatsheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cheatsheet";
           sha256 = "11z3svlzvmhdy0pkxbx9qz9bnq056cgkbfyw9z34aq1yxazi2cpq";
           name = "cheatsheet";
         };
@@ -6144,7 +6228,7 @@
           sha256 = "0660ix17ksxy5a5v8yqy7adr9d4bs6p1mnkc6lpyw96k4pn62h45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/checkbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/checkbox";
           sha256 = "17gw6w1m6bs3sfx8nqa8nzdq26m8w85a0fca5qw3bmd18bcmknqa";
           name = "checkbox";
         };
@@ -6165,7 +6249,7 @@
           sha256 = "1mnskri5r1lyzzcag60x7amn00613jyl7by7hd4sqm2a7zd4r5aa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chef-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chef-mode";
           sha256 = "1pz82s82d4z3vkm8mpmwdxb9pd11kq09g23mg461lzqxjjw734rr";
           name = "chef-mode";
         };
@@ -6186,7 +6270,7 @@
           sha256 = "0m97xr6lddy2jdmd4bl4kbp2568p4n110yfa9k7fqc20ihq8jkyd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cherry-blossom-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cherry-blossom-theme";
           sha256 = "1i3kafj3m7iij5mr0vhg45zdnkl9pg9ndrq0b0i3k3mw7d5siq7w";
           name = "cherry-blossom-theme";
         };
@@ -6207,7 +6291,7 @@
           sha256 = "0j61lvr99viaharg4553whcppp7lxhimkk5lps0izz9mnd8y2wm5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chicken-scheme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chicken-scheme";
           sha256 = "0ns49p7nsifpi7wrzr02ljrr0p6hxanrg54zaixakvjkxwcgfabr";
           name = "chicken-scheme";
         };
@@ -6228,7 +6312,7 @@
           sha256 = "08ln66kx73019klzw0rsvlz3cs4ch8wxjfljmkyswjjd179h882c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chinese-fonts-setup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chinese-fonts-setup";
           sha256 = "141ri6a6mnxf7fn17gw48kxk8pvl3khdxkb4pw8brxwrr9rx0xd5";
           name = "chinese-fonts-setup";
         };
@@ -6241,15 +6325,15 @@
     chinese-pyim = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
     melpaBuild {
         pname = "chinese-pyim";
-        version = "20160118.50";
+        version = "20160204.440";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim";
-          rev = "d6dad5aad01e2be007609a6b3aaa8b0a9e017a7a";
-          sha256 = "1did95bkrzq3dr4y8jxw1pc3cv9ryhpc1ch5wqymh88h9cazy6hc";
+          rev = "9e4479b602d20c31df41108e657ad1d7277eab5a";
+          sha256 = "0v3iq865hrcqzg6rm3jmrxb41zq9faj5jnjcmwi6kpxmj06brn1g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chinese-pyim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chinese-pyim";
           sha256 = "0zdx5zhgj1ly89pl48vigjzd8g74fxnxcd9bxrqykcn7y5qvim8l";
           name = "chinese-pyim";
         };
@@ -6270,7 +6354,7 @@
           sha256 = "06k13wk659qw40aczq3i9gj0nyz6vb9z1nwsz7c1bgjbl2lh6hcv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chinese-remote-input";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chinese-remote-input";
           sha256 = "0nnccm6w9i0qsgiif22hi1asr0xqdivk8fgg76mp26a2fv8d3dag";
           name = "chinese-remote-input";
         };
@@ -6291,7 +6375,7 @@
           sha256 = "0cx1g6drkr8gyqqdxjf7j4wprxcbq30gam2racgnvdicgij0apwg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chinese-wbim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chinese-wbim";
           sha256 = "1pax3kpmvg170mpvfrjbpj9czq0xykmfbany2f7vbn96jb5xfmsb";
           name = "chinese-wbim";
         };
@@ -6312,7 +6396,7 @@
           sha256 = "1jsy43avingxxccs0zw2qm5ysx8g76xhhh1mnyypxskl9m60qb4j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chinese-word-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chinese-word-at-point";
           sha256 = "0pjs4ckncv84qrdj0pyibrbiy86f1gmjla9n2cgh10xbc7j9y0c4";
           name = "chinese-word-at-point";
         };
@@ -6333,7 +6417,7 @@
           sha256 = "14yzmyzkf846yjrwnqrbzmvyhfav39qa5fr8jnb7lyz8rm7y9pnq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chinese-yasdcv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chinese-yasdcv";
           sha256 = "1y2qywldf8b8b0km1lcf74p0w6rd8gr86qcj7ikwhhbvd19dfglm";
           name = "chinese-yasdcv";
         };
@@ -6351,7 +6435,7 @@
           sha256 = "1r274pf0xrcdml4sy2nhhp3v5pr3y3s4lvk45hd3pmw1i4pw2fd8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chm-view";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chm-view";
           sha256 = "1acz0fvl3inn7g4himq680yf64bgm7n61hsv2zpm1k6smrdl78nz";
           name = "chm-view";
         };
@@ -6372,7 +6456,7 @@
           sha256 = "1mqdz3rvx0jm80fgzw3s3lqn448kqrlrifdwcg36cqq4qmkpalq4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chronos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chronos";
           sha256 = "1fwpll0mk6pc37qagbq3b3z32d2qwz993nxp9pjw4qbmlnq6sy9d";
           name = "chronos";
         };
@@ -6393,7 +6477,7 @@
           sha256 = "0gx0bd7j71rlniq64vw8k59yzl070mdia05ry18br8kpsbk3bhrl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chruby";
           sha256 = "0pk6vdvmifiq52n452lbrkklxa69c40bfyzra9qhrghxr2q5v3mk";
           name = "chruby";
         };
@@ -6406,15 +6490,15 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20160117.142";
+        version = "20160204.1208";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "5ad457b5acd7cce3f8b7d8242eab9bdbc17954a5";
-          sha256 = "1chj5j8p1shw1cqrcnf97m6d5zjixawg1pf9wi6lsl9v6i42nssd";
+          rev = "17b88cce0cdf856e1150973d271223b83b2cf165";
+          sha256 = "12rdrd8qfy2bgvhrx0m6yv6cd0k9s68rr7fxk96ac6lzyq5rh8aj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cider";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cider";
           sha256 = "1a6hb728a3ir18c2dn9zfd3jn79fi5xjn5gqr7ljy6qb063xd4qx";
           name = "cider";
         };
@@ -6435,7 +6519,7 @@
           sha256 = "1w4y65s3m2irga4iqfqqkcmvl6ss24zmaxqzbfib8jmi84r4lpac";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cider-decompile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cider-decompile";
           sha256 = "0jhsm31zcfwkbpsdh1lvmjm1fv2m7y849930sjvf5nxv3ffhx3b4";
           name = "cider-decompile";
         };
@@ -6456,7 +6540,7 @@
           sha256 = "1gpklkrw6iishfb3yilnqysh6zij67l1sl3ixq1bi3f6r237v1pg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cider-eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cider-eval-sexp-fu";
           sha256 = "1n4sgv042qd9560pllabysx0c5snly6i22bk126y8f8rn0zj58iq";
           name = "cider-eval-sexp-fu";
         };
@@ -6477,7 +6561,7 @@
           sha256 = "0lgq4p7rs4prqfqd83v1l36xxacrd65jsfzbp7q62b2pjqikpgk0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cider-profile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cider-profile";
           sha256 = "14jc98h4r9rb7pxfb60ps4ss8p0bm66wdl6n8z1357hk93h9kmfs";
           name = "cider-profile";
         };
@@ -6498,7 +6582,7 @@
           sha256 = "1hvvfp58x269yapnayxwyclgqy52azf76rb703mlfqivj1gzd7p3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cider-spy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cider-spy";
           sha256 = "0478jlg76h0mrjwk2b1kdj16s1q1b03b7ygacai45jh89bc025fh";
           name = "cider-spy";
         };
@@ -6519,7 +6603,7 @@
           sha256 = "1w0ya0446rqsg1j59fd1mp4wavv2f3h1k3mw9svm5glymdirw4d1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cil-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cil-mode";
           sha256 = "1h18r086bqspyn5n252yzw8x2zgyaqzdd8pbcf5gqlh1w8kapq4y";
           name = "cil-mode";
         };
@@ -6540,7 +6624,7 @@
           sha256 = "190n4kdcqdwglhnawnj9mqjarmcaqylxipc07whmrii0jv279kjw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cinspect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cinspect";
           sha256 = "0djh61mrfgcm3767ll1l5apw6646j4fdcaripksrmvn5aqfn8rjj";
           name = "cinspect";
         };
@@ -6553,15 +6637,15 @@
     circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "circe";
-        version = "20151207.344";
+        version = "20160201.641";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "c9862e432d2dad7cd568d79dbe49849245333fb1";
-          sha256 = "1l6lm3i02r0b8ng0n3rckgk0q38wjng41dqbx148bjxfq44cpghz";
+          rev = "35618a1e890dfff7bc3c879e4f0e23868d00bf85";
+          sha256 = "1qw8ax3a1v1053qh9i41ci93hc4034ghlcwq8hldr3amsz344fhj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/circe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/circe";
           sha256 = "1f54d8490gfx0r0cdvgmcjdxqpni43msy0k2mgqd1qz88a4b5l07";
           name = "circe";
         };
@@ -6582,7 +6666,7 @@
           sha256 = "1mc8kayw8fmvpl0z09v6i68s2lharlwpzff0cvcsfn0an2imj2d0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cl-lib-highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cl-lib-highlight";
           sha256 = "13qdrvpxq928p27b1xdcbsscyhqk042rwfa17037gp9h02fd42j8";
           name = "cl-lib-highlight";
         };
@@ -6598,11 +6682,11 @@
         version = "20151116.638";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "258069";
-          sha256 = "1rzax55darnj4h8i3qyrm2rqdwcvqggsz7kv6gi2i174fbdkbzfr";
+          rev = "259829";
+          sha256 = "180s33f8ngcc432x7639vxwchgvd5nwy4irby8ldzckdf5a4gd4h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clang-format";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clang-format";
           sha256 = "19qaihb0lqnym2in4465lv8scw6qba6fdn8rcbkpsq09hpzikbah";
           name = "clang-format";
         };
@@ -6623,7 +6707,7 @@
           sha256 = "1h6k6kzim1zb87y1kzpqjzk3ip9bmfxyg54kdh2sfp4xy0g5h3p0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clean-aindent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clean-aindent-mode";
           sha256 = "1whzbs2gg2ar24kw29ffv94dgvrlfy2v4zdn0g7ksjjmmdr8ahh4";
           name = "clean-aindent-mode";
         };
@@ -6644,7 +6728,7 @@
           sha256 = "03dbxg51zs4wbfwjv1qxlm5w06j89mvniisnyyahjkvpiqrp96yd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clean-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clean-buffers";
           sha256 = "025sxrqxm24yg1wpfncrjw1nm91h0h7jy2xd5g20xqlinqqvdihj";
           name = "clean-buffers";
         };
@@ -6665,7 +6749,7 @@
           sha256 = "19q6zbnl9fg4cwgi56d7p4qp6y3g0fdyihinpakby49xv2n2k8dx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clevercss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clevercss";
           sha256 = "189f2l4za1j9ds0bhxrzyp7da9p6svh5dx2vnzf4vql7qhjk3gf0";
           name = "clevercss";
         };
@@ -6686,7 +6770,7 @@
           sha256 = "11c0zpk8gg70d4xiiyjc7v13knwb2ihbrxnlaxzh3rdg2c12676q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cliphist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cliphist";
           sha256 = "0mg6pznijba3kvp3r57pi54v6mgih2vfwj2kg6qmcy1abrc0xq29";
           name = "cliphist";
         };
@@ -6699,15 +6783,15 @@
     clipmon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clipmon";
-        version = "20151224.1147";
+        version = "20160128.1204";
         src = fetchFromGitHub {
           owner = "bburns";
           repo = "clipmon";
-          rev = "a531c3e5d3cf760b00d3f00726a4e60e226aae99";
-          sha256 = "1xqszj16yim89pln9aw17lji5knxm3pklaihydagd7a1f99hr51w";
+          rev = "90e24ba9dd53cb7c6f147d2d716816410117cd8b";
+          sha256 = "07a55q97j2vsqpha0akri2kq90v1l97mc1mgr97pq39gc1bbc5d3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clipmon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clipmon";
           sha256 = "1gvy1722px4fh88jyb8xx7k1dgyjgq7zjadr5fghdir42l0byw7i";
           name = "clipmon";
         };
@@ -6728,7 +6812,7 @@
           sha256 = "0msmigzip7hpjxwkz0khhlc2lj9wgb2919i4k0kv8ppi9j2f9hjc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clippy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clippy";
           sha256 = "0nqmc8f2qrsp25vzc66xw6b232n7fyw6g06mwn2cdpm3d2pgb7rg";
           name = "clippy";
         };
@@ -6749,7 +6833,7 @@
           sha256 = "0i6sj5rs4b9v8aqq9l6wr15080qb101hdxspx6innhijhajgmssd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clips-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clips-mode";
           sha256 = "083wrhjn04rg8vr6j0ziffdbdhbfn63wzl4q7yzpkf8qckh6mxhf";
           name = "clips-mode";
         };
@@ -6762,15 +6846,15 @@
     clj-refactor = callPackage ({ cider, dash, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }:
     melpaBuild {
         pname = "clj-refactor";
-        version = "20160118.646";
+        version = "20160128.1121";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clj-refactor.el";
-          rev = "7cfef55fa0c0c9246ad437f30b1542e288176075";
-          sha256 = "1nplb95aiwxy9flqjyjqfdpr0vzykckr05n7zahv1ig2rnra2vcs";
+          rev = "85d29af959b8d2b581f68f06f6d220bd26e58690";
+          sha256 = "0h8x2ikggry16nd11l489523ldxg1cxbk10scpbxn9jhb11wgzd9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clj-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clj-refactor";
           sha256 = "1qvds6dylazvrzz1ji2z2ldw72pa2nxqacb9d04gasmkqc32ipvz";
           name = "clj-refactor";
         };
@@ -6802,7 +6886,7 @@
           sha256 = "0ydv2prnw1j3m5nk23fqn4iv202kjswr8z0ip4zacdm8bl0q25ln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cljr-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cljr-helm";
           sha256 = "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc";
           name = "cljr-helm";
         };
@@ -6823,7 +6907,7 @@
           sha256 = "1cdim8fancrsrm9avzv4m2v384i7n4632nibyfnxkhq03bj00j1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cljsbuild-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cljsbuild-mode";
           sha256 = "0qvb990dgq4v75lwnd661wxszbdbhlgxpsyv4zaj6h10gp1vi214";
           name = "cljsbuild-mode";
         };
@@ -6844,7 +6928,7 @@
           sha256 = "0za8j7pwcmvjm2ls62z9f8sjryzzsmms4slikzixc0rxyiqnqyd1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clmemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clmemo";
           sha256 = "03qa79ip0gqinj1kk898lcvixk98hf6gknz0yc2fnqcrm642k2vs";
           name = "clmemo";
         };
@@ -6865,7 +6949,7 @@
           sha256 = "1rflc00yrbb7xzfh8c54ajf4qnhsp3mq07gkr257gjyrwsdw762v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cloc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cloc";
           sha256 = "1ny5wixa9x4fq5jvhs01jmyvwkfvwwi9aamrcqsl42s9sx6ygz7a";
           name = "cloc";
         };
@@ -6878,15 +6962,15 @@
     clocker = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "clocker";
-        version = "20150505.1043";
+        version = "20160125.1705";
         src = fetchFromGitHub {
           owner = "roman";
           repo = "clocker.el";
-          rev = "9cb1440ca1fa4f82597f8b053c7f8e44f4682229";
-          sha256 = "0hw6i92k651p71am578p02lqp1dj9pic880n6x4z0ydz4xyjhmfw";
+          rev = "4a4831ed4e42e18976edd16b844cb16cb78f3c17";
+          sha256 = "0hz6a7gj0zfsdaifkhwf965c96rkjc3kivvqlf50zllsw0ysbnn0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clocker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clocker";
           sha256 = "0cckrk40k1labiqjh7ghzpx5zi136xz70j3ipp117x52qf24k10k";
           name = "clocker";
         };
@@ -6907,7 +6991,7 @@
           sha256 = "1r189c0xm6vh05k0y715i5ldj1pxzvwkxqbq0n85m489mjnf2wv6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojars";
           sha256 = "1skvd29347hwapgdqznbzwfcp2nf077qkdzknxc8ylmqa32yf5w1";
           name = "clojars";
         };
@@ -6928,7 +7012,7 @@
           sha256 = "1ljb0g4yvrqgjqgmz8qz0c0swbx1m6gldmcdqnmxd72bs3w9p0k8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-cheatsheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-cheatsheet";
           sha256 = "05sw3bkdcadslpsk64ds0ciavmdgqk7fr5q3z505vvafmszfnaqv";
           name = "clojure-cheatsheet";
         };
@@ -6941,15 +7025,15 @@
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "20160117.650";
+        version = "20160204.1143";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "1c5f3fb88ca216674eeeb9def773627deeea01df";
-          sha256 = "0xm2hplzid14ymrbgnypl1qsb22ird1bbilpq23nrgvwg0jyd9hj";
+          rev = "3a701b1f495d0eaa22387b45e6309c2d987c62fa";
+          sha256 = "1ka2km49ar08wp0m7czfap5dvh2ql1d3cv7lyfbxicylqw1354hn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-mode";
           sha256 = "11n0rjhs1mmlzdqy711g432an5ybdka5xj0ipsk8dx6xcyab70np";
           name = "clojure-mode";
         };
@@ -6966,11 +7050,11 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "1c5f3fb88ca216674eeeb9def773627deeea01df";
-          sha256 = "0xm2hplzid14ymrbgnypl1qsb22ird1bbilpq23nrgvwg0jyd9hj";
+          rev = "3a701b1f495d0eaa22387b45e6309c2d987c62fa";
+          sha256 = "1ka2km49ar08wp0m7czfap5dvh2ql1d3cv7lyfbxicylqw1354hn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-mode-extra-font-locking";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-mode-extra-font-locking";
           sha256 = "00nff9mkj61i76dj21x87vhz0bbkzgvkx1ypkxcv6yf3pfhq7r8n";
           name = "clojure-mode-extra-font-locking";
         };
@@ -6991,7 +7075,7 @@
           sha256 = "1vgahik2q2sn6vqm9wg5b9jc74mkbc1md8pl69apz4cg397kjkzr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-quick-repls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-quick-repls";
           sha256 = "10glzyd4y3918pwp048pc1y7y7fa34fkqckn1nbys841dbssmay0";
           name = "clojure-quick-repls";
         };
@@ -7012,7 +7096,7 @@
           sha256 = "1w8izhrj23b8kqcsqalgrzxqnq18nvdxl48305p8cnwll646xjl2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-snippets";
           sha256 = "15622mdd6b3fpwp22d32p78yap08pyscs2vc83sv1xz4338i0lij";
           name = "clojure-snippets";
         };
@@ -7033,7 +7117,7 @@
           sha256 = "0v0wdq0b5jz4x0d7dl3ilgf3aqp2hk375db366ij6gxwd0b9i3na";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/closure-lint-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/closure-lint-mode";
           sha256 = "1xmi1gjgayd5xbm3xx721xv57ns3x56r8ps94zpwyf2znpdchqfy";
           name = "closure-lint-mode";
         };
@@ -7054,7 +7138,7 @@
           sha256 = "07kvnb6p35swkyj92c4wymsqq4r2885wdpqhv7nhicvi6n658kpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cloud-to-butt-erc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cloud-to-butt-erc";
           sha256 = "061mmw39dq8sqzi2589lf7svy15n2iyiwbfiram48r2yhma5dd0f";
           name = "cloud-to-butt-erc";
         };
@@ -7075,7 +7159,7 @@
           sha256 = "0fnl3b62clg9llcs2l511sxp4yishan4pqk45sqp8ih4rdzvy7ar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clues-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clues-theme";
           sha256 = "12g7373js5a2fa0m396k9kjhxvx3qws7n1r435nr9zgwaw7xvciy";
           name = "clues-theme";
         };
@@ -7096,7 +7180,7 @@
           sha256 = "0m94692gkq299sf56m4c637j5xp78dvgv0ad1hv4ys1hzp1qw1l5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cm-mode";
           sha256 = "1rgfpxbnp8wiq9j8aywm2n07rxzkhqljigwynrkyvrnsgxlq2a9x";
           name = "cm-mode";
         };
@@ -7117,7 +7201,7 @@
           sha256 = "030kg3m546gcm6cf1k928ld51znsfrzhlpm005dvqap3gkcrg4sf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmake-font-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmake-font-lock";
           sha256 = "0ws4kd94m8fh55d7whsf3rj9qrxjp1wsgxh0valsjxyp2ck9zrz0";
           name = "cmake-font-lock";
         };
@@ -7130,15 +7214,15 @@
     cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "cmake-ide";
-        version = "20160114.1000";
+        version = "20160127.1859";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "cmake-ide";
-          rev = "6ce362f3fbea23e1c8e1831b73bc085ea2eabfd5";
-          sha256 = "0i4d99r3mwrfz1zjrh0wajgjyr5kskxn4s9k0rwk5l37an4130ml";
+          rev = "9107eecfc726f89b65f33dd103f06c07d3d5788c";
+          sha256 = "0kc85ripwjhjvjhwvx5cc2ks99xhaqmlb0inpd4d59f3x68pk69m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmake-ide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmake-ide";
           sha256 = "0xvy7l80zw67jgvk1rkhwzjvsqjqckmd8zj6s67rgbm56z6ypmcg";
           name = "cmake-ide";
         };
@@ -7155,11 +7239,11 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "03c0303d2e4bc07b9c5df1ecdbf89da6e36259d9";
-          sha256 = "198lvzy9zjdyrys5hcbhb1c5hnj01sh52xvjq0k6n8yvnnd3gmbr";
+          rev = "7b1fbcc4b035c591491c5033cbfbfc0aabd80fde";
+          sha256 = "0rb6wn635ylm58cpr7jq7821g0iw1mzb4b1h9mwrl57m6gcb5v98";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmake-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmake-mode";
           sha256 = "0zbn8syb5lw5xp1qcy3qcl75zfiyik30xvqyl38gdqddm9h7qmz7";
           name = "cmake-mode";
         };
@@ -7180,7 +7264,7 @@
           sha256 = "0fyzi8xac80wnhnwwm1j6yxpvpg1n4diq2lcl3qkj8klvk5gpxr6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmake-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmake-project";
           sha256 = "13n6j9ljvzjzkknbm9zkhxljcn12avl39gxqq95hah44dr11rns3";
           name = "cmake-project";
         };
@@ -7198,7 +7282,7 @@
           sha256 = "13r8pjxknsfd6ywzlgcy4bm7fvr768ba34k6b7y365y3c1asz6y3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmds-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmds-menu";
           sha256 = "12s75y9d75cxqgg3hj0s4w0d10zy8y230b5gy09685ab5lcajfks";
           name = "cmds-menu";
         };
@@ -7219,7 +7303,7 @@
           sha256 = "0xdcw329d2gssx86iajwrgpr7yv69b9nflmzjgb4jvg4pskj4pgx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmm-mode";
           sha256 = "184b8x19cnvx8z4dr9alv62wchzc7vr7crzz8jiyqw9d544zs50h";
           name = "cmm-mode";
         };
@@ -7240,7 +7324,7 @@
           sha256 = "1635k51ppivq6v2702fihq8dvi33445smds9zhqm0drnpv9rv5cr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cn-outline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cn-outline";
           sha256 = "0cw1rr56hdngvhmx59j76hvkfzgybasn0fwhd6vwm709jqiiiwiz";
           name = "cn-outline";
         };
@@ -7261,7 +7345,7 @@
           sha256 = "1sx8grp3j7zcma3nb7zj6kijkdqx166vw1qgmm29hvx48bys6vlp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cobra-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cobra-mode";
           sha256 = "11jscpbclxlq2xqy2nsfa4y575bp8h0kpkp8cfjqb05lm5ybcp89";
           name = "cobra-mode";
         };
@@ -7282,7 +7366,7 @@
           sha256 = "0mcf0xyh4p6pk2hf1f554vy4amd0qcimspgnncff2a0qc2bsg5sy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/code-library";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/code-library";
           sha256 = "0gi8lz2q0vis4nyziykq15jp3m3vykfwycbk6amhf1ybkn9k3ywj";
           name = "code-library";
         };
@@ -7303,7 +7387,7 @@
           sha256 = "11v671c4338bsizbmm7ypp4x9s5hiwyddsg2ig6h157gfv2597pp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/codebug";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/codebug";
           sha256 = "1cb2wvawp3wqslhgbmbw9xwcqgwfscqg0jfgqzi3nr42mjp9zgqj";
           name = "codebug";
         };
@@ -7324,7 +7408,7 @@
           sha256 = "0ch3naqp3ji0q4blpjfr1xbzgzxhw10h08y2akik96kk1pnkwism";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/codesearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/codesearch";
           sha256 = "0z7zvain9n0rm6bvrh3j7z275l32fmp46p4b33mizqd1y86w89nx";
           name = "codesearch";
         };
@@ -7345,7 +7429,7 @@
           sha256 = "14jcxrs3b02pbppvdsabr7c74i3c6d1lmd6l1p9dj8gv413pghsz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/codic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/codic";
           sha256 = "0fq2qfqhkd6injgl66vcpd61j67shl9xj260aj6cgb2nriq0jxgn";
           name = "codic";
         };
@@ -7366,7 +7450,7 @@
           sha256 = "010v886ak0rbbhqwxwj6m0mkgh19s232igy7wwbv07l2pdqszf3p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/coffee-fof";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/coffee-fof";
           sha256 = "02cqza46qp8y69jd33cg4nmcgvrpwz23vyxqnmzwwvlmnbky96yc";
           name = "coffee-fof";
         };
@@ -7387,7 +7471,7 @@
           sha256 = "0r0615q30awj77dwhvgz2cjmnfmvff9clg3krzr9zpskdkhdib8h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/coffee-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/coffee-mode";
           sha256 = "1px50hs0x30psa5ljndpcc22c0qwcaxslpjf28cfgxinawnp74g1";
           name = "coffee-mode";
         };
@@ -7406,7 +7490,7 @@
           sha256 = "1fpkymmgv58b734d2rr7cfj2j2if1qkwgrpk3yp2ibw2n2567y0s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/col-highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/col-highlight";
           sha256 = "1kycjdlrg7a5x37b0pzqhg56yn7kaisryrk303qx1084kwq9464i";
           name = "col-highlight";
         };
@@ -7427,7 +7511,7 @@
           sha256 = "0jjj1miwc7hw2fbb1fnmfnydim81djswla8iy4waam9014yraqci";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/colemak-evil";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/colemak-evil";
           sha256 = "1bfzs5px1k6g3cnwjdaq2m78bbnfy3lxhjzkcch7zdv3nyacwl5z";
           name = "colemak-evil";
         };
@@ -7448,7 +7532,7 @@
           sha256 = "1k3sd07ffgpfhzg7d9mb1gc3n02zsvilxc30bgiycbjrbjgqq0i6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/colonoscopy-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/colonoscopy-theme";
           sha256 = "0x9bfr4j0sp41jkgnyjlaxnnjjrc102x6sznn6cgcmqk5qhswl4q";
           name = "colonoscopy-theme";
         };
@@ -7469,7 +7553,7 @@
           sha256 = "0m98i8w513zdzkskw9a96dd73lnfbfwvr947b0djsrazn8grh6hv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-identifiers-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-identifiers-mode";
           sha256 = "1hxp8lzn7kfckn5ngxic6qiz3nbynilqlxhlq9k1n1llfg216gfq";
           name = "color-identifiers-mode";
         };
@@ -7490,7 +7574,7 @@
           sha256 = "1p1f30qz4nd5a8ym2iwrgp6vhws0dls2qlc0apblj9nj3b0ziv0x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-moccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-moccur";
           sha256 = "17b9walfc5c9qfdvl9pcwb2gjikc3wxk1d3v878ckypmxd38vciq";
           name = "color-moccur";
         };
@@ -7510,7 +7594,7 @@
           sha256 = "17bidzq9kiz250gal1fn9mg8gf8l749nz69z0awpc4x2222wxxiz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme";
           sha256 = "1p4bjh8a9f6ixmwwnyjb520myk3bww1v9w6427za07v68m9cdh79";
           name = "color-theme";
         };
@@ -7531,7 +7615,7 @@
           sha256 = "1b0ymwszqsjcihcbfp7s4fjam983ixh3yb7sdc0rmqlyric1zwxq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-approximate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-approximate";
           sha256 = "1wdnia9q42x7vky3ks555iic5s50g4mx7ss5ppaljvgxvbxyxqh1";
           name = "color-theme-approximate";
         };
@@ -7552,7 +7636,7 @@
           sha256 = "0gvc9jy34a8wvzwjpmqhshbx2kpk6ckmdrdj5v00iya7c4afnckx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-buffer-local";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-buffer-local";
           sha256 = "1448rffyzn5k5mr31hwd28wlj7if7rp5sjlqcsvbxd2mnbgkgjz0";
           name = "color-theme-buffer-local";
         };
@@ -7573,7 +7657,7 @@
           sha256 = "0q9ss11i31iiv0vn8238922fkic7j6d02f9ykbip04sm46p5k6kj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-modern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-modern";
           sha256 = "0f662ham430fgxpqw96zcl1whcm28cv710g6wvg4fma60sblaxcm";
           name = "color-theme-modern";
         };
@@ -7594,7 +7678,7 @@
           sha256 = "07703v8xyia1vx9s636aaql99i29a4r5v9z0lvaypixgsidshx10";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-sanityinc-solarized";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-sanityinc-solarized";
           sha256 = "0xg79hgb893f1nqx6q4q6hp4w6rvgp1aah1v2r3scg2jk057qxkf";
           name = "color-theme-sanityinc-solarized";
         };
@@ -7607,15 +7691,15 @@
     color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
-        version = "20151215.2305";
+        version = "20160202.135";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-tomorrow";
-          rev = "e309cb5a26228633797209276c5d48c070b90767";
-          sha256 = "1qs6n30amzv47d4d12z6jj506jsm5janp639jg9w65zibbp2dy7a";
+          rev = "22e40391f4a4be9455e4fa591c31a954a24dbeeb";
+          sha256 = "161xzd0jlwyafq2sck47z4igsrvrk2b1ibl206866hc56q9x1pmn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-sanityinc-tomorrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-sanityinc-tomorrow";
           sha256 = "1k8iwjc7iidq5sxybs47rnswa6c5dwqfdzfw7w0by2h1id2z6nqd";
           name = "color-theme-sanityinc-tomorrow";
         };
@@ -7636,7 +7720,7 @@
           sha256 = "1ddscmxn6k00ip3mb4bjy4zxfklxv3jjnlbgwwr793qzwsi64vi7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-solarized";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-solarized";
           sha256 = "011rzq38ffmq7f2nzwrq96wwz67p82p1f0p5nib4nwqa47xlx7kf";
           name = "color-theme-solarized";
         };
@@ -7657,7 +7741,7 @@
           sha256 = "18hzm7yzwlfjlbkx46rgdl31p9xyfqnxlvg8337h2bicpks7kjia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/colorsarenice-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/colorsarenice-theme";
           sha256 = "09zlglldjbjr97clwyzyz7c0k8hswclnk2zbkm03nnn9n9yyg2qi";
           name = "colorsarenice-theme";
         };
@@ -7678,7 +7762,7 @@
           sha256 = "0ay4wrnyrdp4v3vjxr99hy8fpq6zsyh246c0gbp7bh63l5fx8nwr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/column-enforce-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/column-enforce-mode";
           sha256 = "1qh7kwr65spbbnzvq744gkksx50x04zs0nwn5ly60swc05d05lcg";
           name = "column-enforce-mode";
         };
@@ -7696,7 +7780,7 @@
           sha256 = "05bv198zhqw5hqq6cr11mhz02dpca74hhp1ycwq369m0yb2naxy9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/column-marker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/column-marker";
           sha256 = "1xgfsiw46aib2vb9bbjlgnhcgfnlfhdcxd0cl0jqj4fjfxzbz0bq";
           name = "column-marker";
         };
@@ -7717,7 +7801,7 @@
           sha256 = "0fnyksbynlmmvl39f4is0xjp6b13yshfazigbksv012hxp0whslm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/command-log-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/command-log-mode";
           sha256 = "11jq6055bvpwvrm0b8cgab25wa2mcyylpz4j56h1nqj7cnhb6ppj";
           name = "command-log-mode";
         };
@@ -7738,7 +7822,7 @@
           sha256 = "06y7ika4781gkh94ygdaz7a760s7ahrma6af6n7cqhgjyikz7lg1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/commander";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/commander";
           sha256 = "17y0hg6a90hflgwn24ww23qmvc1alzivpipca8zvpf0nih4fl393";
           name = "commander";
         };
@@ -7759,7 +7843,7 @@
           sha256 = "0kzlv2my0cc7d3nki2rlm32nmb2nyjb38inmvlf13z0m2kybg2ps";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/comment-dwim-2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/comment-dwim-2";
           sha256 = "1w9w2a72ygsj5w47vjqcljajmmbz0mi8dhz5gjnpwxjwsr6fn6lj";
           name = "comment-dwim-2";
         };
@@ -7769,6 +7853,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
+    melpaBuild {
+        pname = "commenter";
+        version = "20160131.39";
+        src = fetchFromGitHub {
+          owner = "yuutayamada";
+          repo = "commenter";
+          rev = "eec3bf91a57ff3aa3b93c36611e136572f031571";
+          sha256 = "1jvjwk776p9qrbr3j0368nqv8ydp8k0s6c66nfpcqf33rz4w1h1g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/commenter";
+          sha256 = "01bm8jbj6xw23nls4fps6zwjkgvcsjhmn3l3ncqd764kwhxdx8q3";
+          name = "commenter";
+        };
+        packageRequires = [ emacs let-alist ];
+        meta = {
+          homepage = "http://melpa.org/#/commenter";
+          license = lib.licenses.free;
+        };
+      }) {};
     commify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "commify";
@@ -7780,7 +7885,7 @@
           sha256 = "04bma9sdn7h8fjz62wlcwayzhr7lvzhidh48wc5rk195zlbgagwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/commify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/commify";
           sha256 = "1jc6iqa4hna3277hx13scfcqzkr43yv6gndbxv7qf4ydi01ysd0m";
           name = "commify";
         };
@@ -7801,7 +7906,7 @@
           sha256 = "1cc9ak9193m92g6l4mrfxbkkmvljl3c51d0xzdidwww978q3x6ad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/common-lisp-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/common-lisp-snippets";
           sha256 = "0ig8cz00cbfx0jckqk1xhsvm18ivl2mjvcn65s941nblsywfvxjl";
           name = "common-lisp-snippets";
         };
@@ -7814,15 +7919,15 @@
     company = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company";
-        version = "20160117.521";
+        version = "20160201.1600";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "faa8f84f19e786230858a4325625c7bcb18804f3";
-          sha256 = "1zhhp2vps5l5vxcza45cjwka4khhx2ar49jzhylj8iqcrgyml5gv";
+          rev = "a619a93069dab79b12d695fd4e8b043aa82d96ca";
+          sha256 = "0hy59hf2lq3w6wn5vsz839nrkijc87lyb8xyw2sj9jifd5ikpqi8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company";
           sha256 = "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4";
           name = "company";
         };
@@ -7843,7 +7948,7 @@
           sha256 = "0r8ip22gr2ihicznyl2vbwgy3gsp5b5gy0m2i60001kyhssgmg6v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-anaconda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-anaconda";
           sha256 = "1s7y47ghy7q35qpfqavh4p9wr91i6r579mdbpvv6h5by856yn4gl";
           name = "company-anaconda";
         };
@@ -7864,7 +7969,7 @@
           sha256 = "06gh33qzglv40r62dsapzhxwparw8ciblv80g7h6y6ilyazwcidn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-ansible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-ansible";
           sha256 = "084l9dr2hvm00952y4m3jhchzxjhcd61sfn5ywj9b9a1d4sr110d";
           name = "company-ansible";
         };
@@ -7885,7 +7990,7 @@
           sha256 = "067xb4mwfnmbqjyfv4717417fg7ysvz9flnx1nrk6iv96gnf4vfx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-arduino";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-arduino";
           sha256 = "1bch447lllikip1xd90kdgssgc67sl04a70fxqkqlrc1bs6gkkws";
           name = "company-arduino";
         };
@@ -7914,7 +8019,7 @@
           sha256 = "0mkyg9y1rhl6hdzhr51psnvy2q0zw4y29m9p0ivb7s643k3fjjp5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-auctex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-auctex";
           sha256 = "1jia80sqmm83kzjcf1h1d9iz2k4k9albzvfka5hx6hpa4h8nm5q4";
           name = "company-auctex";
         };
@@ -7935,7 +8040,7 @@
           sha256 = "16cva7ccc0hrc6yf659kpsznlk1bkgv525lqr4nj8a12q0avjdxf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-c-headers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-c-headers";
           sha256 = "1715vnjr5cjiq8gjcd3idnpnijg5cg3sw3f8gr5x2ixcrip1hx3a";
           name = "company-c-headers";
         };
@@ -7956,7 +8061,7 @@
           sha256 = "0ll9dxzsgrpy4psz3dqhzny990lfccn63swcyfvl8mnqgwbrq8k0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-cabal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-cabal";
           sha256 = "0pbjidj88c9qri6xw8023yqwnczad5ig224cbsz6vsmdla2nlxra";
           name = "company-cabal";
         };
@@ -7969,15 +8074,15 @@
     company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "company-coq";
-        version = "20160118.1109";
+        version = "20160204.942";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "company-coq";
-          rev = "e8c1fe9ad3b1197077d33b25bbe7615f695a49b6";
-          sha256 = "1vq9n68ls4a4gmqk9fkysrnlxl2shpz5wjpjcphjs42h93vr7nqs";
+          rev = "484c5f058c8a6c30ac4b4dfdb23b362ddda80fed";
+          sha256 = "0wf7m6i6qrmcj469j9dnjl805b9x1a9hk5465av8dyv3zs5csj5k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-coq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-coq";
           sha256 = "1iagm07ckf60kg4i8m4n0gfmv0brqc4dcn7lkcz229r3f4kyqksa";
           name = "company-coq";
         };
@@ -7998,7 +8103,7 @@
           sha256 = "0qbis9jqcrgj71cf8i9yfxsm7yj6d546gxw6linqd7slqn97l8rl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-dcd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-dcd";
           sha256 = "03849k4jzs23iglk9ghcq6283c9asffcq4dznypcjax7y4x113vd";
           name = "company-dcd";
         };
@@ -8026,7 +8131,7 @@
           sha256 = "1fx9hch42kax95nd8zadsbnadq9cylrna0qf0q4bx5yj1afz91p1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-edbi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-edbi";
           sha256 = "067ff1xdyqy4qzgk5pmqf4kksfjk1glkrslcj3rk4zmhcalwrfrm";
           name = "company-edbi";
         };
@@ -8047,7 +8152,7 @@
           sha256 = "1lm26av6z18p70gxz23h87l25airawljr5lm7hw6krg706cp3aq6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-emoji";
           sha256 = "1mflqqw9gnfcqjb6g8ivdfl7s4mdyjg7j0457hamgyvgvpxsh8x3";
           name = "company-emoji";
         };
@@ -8068,7 +8173,7 @@
           sha256 = "1rg6jynzp37qnaq4lj48sfrhmv7mgcd2rzkixbpb3hgsy10dj9j0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-flx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-flx";
           sha256 = "1r4jcfzrhdpclblfrmi4qbl8dnhc2d7d4c1425xnslg7bhwd2vxn";
           name = "company-flx";
         };
@@ -8089,7 +8194,7 @@
           sha256 = "06ljm0ysz8czdr32gfq1y3nm3jcywihdszgnc2alx1hcgqiq0ds6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-ghc";
           sha256 = "07adykza4dqs64bk8vjmgryr54khxmcy28hms5z8i1qpsk9vmvnn";
           name = "company-ghc";
         };
@@ -8110,7 +8215,7 @@
           sha256 = "0jsnf60nz37s4csk8pnyr45fjdsac1ls64fvsh5gzi6hipxz5y6z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-ghci";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-ghci";
           sha256 = "0h9hqfb8fm90h87bi3myl84nppbbminhnvv6jqg62qi9k6snn1iq";
           name = "company-ghci";
         };
@@ -8127,11 +8232,11 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "9779bffba5e4e87b4750f718b6fa7f088c1fa6e3";
-          sha256 = "0b25iczbg72pg1525ql6hb6jyx5vck8bqn5z8f4dy9a94qpgxszl";
+          rev = "db85a48a7870f46784edc202c780b19e2f65053a";
+          sha256 = "15jjmhw3pd4hx1khbvrypd8s2kh3ymkf8p4qh1c9rbw9csypj3al";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-go";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-go";
           sha256 = "1ncy5wlg3ywr17zrxb1d1bap4gdvwr35w9a8b0crz5h3l3y4cp29";
           name = "company-go";
         };
@@ -8152,7 +8257,7 @@
           sha256 = "0fnv4rvvs9rqzrs86g23jcrpg0rcgk25299hm6jm08ia0kjjby1m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-inf-ruby";
           sha256 = "0cb1w0sxgb5jf0p2a5s2i4d511lsjjhyaqkqlwjz8nk4w14n0zxm";
           name = "company-inf-ruby";
         };
@@ -8173,7 +8278,7 @@
           sha256 = "0y1a9wxk9w2jk4177hkqzgqzknswikxc1dc60hzj4samyp2jhvfl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-irony";
           sha256 = "15adamk1b9y1i6k06i5ahf1wn70cgwlhgk0x6fk8pl5izg05z1km";
           name = "company-irony";
         };
@@ -8194,7 +8299,7 @@
           sha256 = "1x2dfjmy86icyv2g1y5bjlr87w8rixqdcndkwm1sba6ha277wp9i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-irony-c-headers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-irony-c-headers";
           sha256 = "0kiag5ggmc2f5c3gd8nn40x16i686jpdrfrflgrz2aih8p3g6af8";
           name = "company-irony-c-headers";
         };
@@ -8215,7 +8320,7 @@
           sha256 = "1ihqapp4dv92794rsgyq0rmhwika60cmradqd4bn9b72ss6plxs1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-jedi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-jedi";
           sha256 = "1krrgrjq967c3j02y0i345yx6w4crisnj1k3bhih6j849fvy3fvj";
           name = "company-jedi";
         };
@@ -8228,15 +8333,15 @@
     company-math = callPackage ({ company, fetchFromGitHub, fetchurl, lib, math-symbol-lists, melpaBuild }:
     melpaBuild {
         pname = "company-math";
-        version = "20150830.1837";
+        version = "20160119.748";
         src = fetchFromGitHub {
           owner = "vspinu";
           repo = "company-math";
-          rev = "f5cedcfa73e5ddd445167969e87ddf8e1bbd2bc1";
-          sha256 = "0pxg9851pl7ck58qiz4swj2c0by914d4bn14c5imfvdn5hxnq19i";
+          rev = "21ac1c7a4077a20746bff00a85150f82f6c3130a";
+          sha256 = "114z2p5ivdsfhkir9yzrm4zw34c8jlilwqyyd4y5ing8awc9jhv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-math";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-math";
           sha256 = "0chig8k8l65bnd0a6734fiy0ikl20k9v2wlndh3ckz5a8h963g87";
           name = "company-math";
         };
@@ -8257,7 +8362,7 @@
           sha256 = "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-nand2tetris";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-nand2tetris";
           sha256 = "1g2i33jjh7kbpzk835kbnqicf0w4cq5rqv934bqzz5kavj9cg886";
           name = "company-nand2tetris";
         };
@@ -8278,7 +8383,7 @@
           sha256 = "0ia9wgn33znaviy7ilfm83yfalc2dbpm1g7nvss5s4rznqkdfhn3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-nixos-options";
           sha256 = "1yrqqdadmf7qfxpqp8wwb325zjnwwjmn2hhnl7i3j0ckg6hqyqf0";
           name = "company-nixos-options";
         };
@@ -8299,7 +8404,7 @@
           sha256 = "07vcxwqynji7ggy9sb8lgpinkfjdiav0aybn5pnb0v8ck9v1w6k3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-qml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-qml";
           sha256 = "0sva7i93dam8mc2z3cp785vmgcg7cphrpkwyvqyqhq8w51qg8mxx";
           name = "company-qml";
         };
@@ -8312,15 +8417,15 @@
     company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }:
     melpaBuild {
         pname = "company-quickhelp";
-        version = "20150804.519";
+        version = "20160204.647";
         src = fetchFromGitHub {
           owner = "expez";
           repo = "company-quickhelp";
-          rev = "05e0ee9b854f90ff2b007b3e19446a02513f43dc";
-          sha256 = "0hg3wrfhz3qlfb6zv6j5a4xzmm4jk25pkv8h3ryg7sl7h602idgl";
+          rev = "24f89640729210f6c7056b66e30d72282a211b3a";
+          sha256 = "0qsz03ps9654wn965s31r85va3fwj3zvwn5naijj85nm8zwb9lb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-quickhelp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-quickhelp";
           sha256 = "042bwv0wd4hksbm528zb7pbllzk83p8qjq5f8z46p84c8mmxfp9g";
           name = "company-quickhelp";
         };
@@ -8341,7 +8446,7 @@
           sha256 = "1lk3fqsgbi6mg4hrpc9gy4hbfp9snyj4yvc0zh8iqqw5nx12dab4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-racer";
           sha256 = "0zc8dzvsjz5qsrwhv7x9f7djzvb9awacc3pgjirsv8f8sp7p3am4";
           name = "company-racer";
         };
@@ -8362,7 +8467,7 @@
           sha256 = "04829y7510zxjww9pq8afvnzwyyv30c0b3a71mxwf6ympfxb9rx5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-restclient";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-restclient";
           sha256 = "1md0n4k4wmbh9rmbwqh3kg2fj0c34rzqfd56jsq8lcdg14k0kdcb";
           name = "company-restclient";
         };
@@ -8389,7 +8494,7 @@
           sha256 = "1xzwalchl9lnq9848dlvhhbzyh1wkwbciz20d1iw0fsigj5g156c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-sourcekit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-sourcekit";
           sha256 = "0hr5j1ginf43h4qf3fvsh3z53z0c7w5a9lhrvdwmlzj396qhqmzs";
           name = "company-sourcekit";
         };
@@ -8410,7 +8515,7 @@
           sha256 = "1b7p6g478para62bnpz5aqijaim8j72c9b27c2qahjmy2zj2f460";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-tern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-tern";
           sha256 = "17pw4jx3f1hymj6sc0ri18jz9ngggj4a41kxx14fnmmm8adqn6wh";
           name = "company-tern";
         };
@@ -8431,7 +8536,7 @@
           sha256 = "18hy60fm3b3dmp29cmzbs6grlihkwifjbzv30gprwj5f6x7m8knf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-try-hard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-try-hard";
           sha256 = "1rwn521dc8kxh43vcd3rf0h8jc53d4gmid3szj2msi0da1sk0mmj";
           name = "company-try-hard";
         };
@@ -8452,7 +8557,7 @@
           sha256 = "1a9qx041w7i1ahg6rmi82hv161k57z4aljzm8wpa9wrfj8a6df2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-web";
           sha256 = "0dj0m6wcc8cyvblp9b5b3am95gc18j9y4va44hvljxv1h7l5hhvy";
           name = "company-web";
         };
@@ -8473,7 +8578,7 @@
           sha256 = "0znchya89zzk30mwl4qfm0q9sfa5m3jspapb892ydj0mck5n4nyj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-ycm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-ycm";
           sha256 = "1q4d63c7nr3g7q0smd55pp636vqa9lf1pkwjn9iq265369npvina";
           name = "company-ycm";
         };
@@ -8486,15 +8591,15 @@
     company-ycmd = callPackage ({ company, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, s, ycmd }:
     melpaBuild {
         pname = "company-ycmd";
-        version = "20160106.834";
+        version = "20160203.1121";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "80c6d7c663b6ccc32b851348f1099790ac4c9736";
-          sha256 = "1c3c3frd9fdb77wkhg8f8g29dvr86ryzf9prg4pm8wvhifa4yhvg";
+          rev = "c64684df763411249985159ee33b10d948b9fc91";
+          sha256 = "12jwqhzqskdp2l6h60rich19rddzjcl94zaf72ljnq8h0mqc3xy0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-ycmd";
           sha256 = "0fqmkb0q8ai605jzn2kwd585b2alwxbmnb3yqnn9fgkcvyc9f0pk";
           name = "company-ycmd";
         };
@@ -8515,7 +8620,7 @@
           sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/concurrent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/concurrent";
           sha256 = "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf";
           name = "concurrent";
         };
@@ -8536,7 +8641,7 @@
           sha256 = "0zz1k4h16pjdwiqavfbfbrbvi83ww93kgf838ap4f3n034hqfx20";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/config-parser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/config-parser";
           sha256 = "0wncg1v4wccb9j16rcmwz8fcmrscj7knfisq0r4qqx3skrmpccah";
           name = "config-parser";
         };
@@ -8556,7 +8661,7 @@
           sha256 = "1l6970ng046hw2izzb15cbbbf83l6m8c9mvic8fzjixfi3g1dl55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/confluence";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/confluence";
           sha256 = "003lykwd3ya0xwlahmm35nx9p6mk8vylq57yxrmgdcc64630bdpf";
           name = "confluence";
         };
@@ -8577,7 +8682,7 @@
           sha256 = "0sz3qx1bn0lwjhka2l6wfl4b5486ji9dklgjs7fdlkg3dgpp1ahx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/conkeror-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/conkeror-minor-mode";
           sha256 = "1ch108f20k7xbf79azsp31hh4wmw7iycsxddcszgxkbm7pj11933";
           name = "conkeror-minor-mode";
         };
@@ -8598,7 +8703,7 @@
           sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/connection";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/connection";
           sha256 = "1y68d2kay8p5vapailxhrc5dl7b8k8nkvp7pa54md3fsivwp1d0q";
           name = "connection";
         };
@@ -8608,6 +8713,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    contextual = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "contextual";
+        version = "20160131.1237";
+        src = fetchFromGitHub {
+          owner = "lshift-de";
+          repo = "contextual";
+          rev = "8134a2d8034c624f4fdbbb0b3893de12f4257909";
+          sha256 = "0s4b7dkndhnh8q3plvg2whjx8zd7ffz4hnbn3xh86xd3k7sch7av";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/contextual";
+          sha256 = "0vribs0fa1xf5kwkmvzjwhiawni0p3v56c5l4dkz8d7wn2g6wfdx";
+          name = "contextual";
+        };
+        packageRequires = [ cl-lib dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/contextual";
+          license = lib.licenses.free;
+        };
+      }) {};
     control-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "control-mode";
@@ -8619,7 +8745,7 @@
           sha256 = "1qsq543rb0z2fq716a2khs8zqyh13npzmbj58f00s8b3w3andpbh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/control-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/control-mode";
           sha256 = "1biq4p2w8rqcbvr09gxbchjqlaixjf1fzv7xv8lpv81dlhi7dgz6";
           name = "control-mode";
         };
@@ -8632,15 +8758,15 @@
     corral = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "corral";
-        version = "20151120.1809";
+        version = "20160129.1717";
         src = fetchFromGitHub {
           owner = "nivekuil";
           repo = "corral";
-          rev = "9a5ab7f293a23a4fec77ab4fb442d69ecfcc293f";
-          sha256 = "1q9jxg9khvjm7lqjhgfhdnb9j9620bq1k5b2cj74q8k4paa6kyyw";
+          rev = "d0b8cec7f2ff56a61775b14ba6969e97933517af";
+          sha256 = "1x87rra9pxvcs8jxnzhg2jr9wq0l3kp3qqqsw77bc4jsizdndss1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/corral";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/corral";
           sha256 = "1drccqk4qzkgvkgkzlrrfd1dcgj8ziqriijrjihrzjgjsbpzv6da";
           name = "corral";
         };
@@ -8653,15 +8779,15 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20160112.927";
+        version = "20160201.1343";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "bcb81dde6e1abba02256d716426797a3e1b306f1";
-          sha256 = "0r1i6ck37yq92h7hc9pm6kqlh0751j8jj7vqrligghxk9d42r479";
+          rev = "00f08f74f1568b6f835abadecff32cd7c9a7a556";
+          sha256 = "0hnqw1mhaa7ybldd6mvz9lyv32yspn3x2bgx3fsrh8rhsmns06qh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/counsel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/counsel";
           sha256 = "0y8cb2q4mqvzan5n8ws5pjpm7bkjcghg5q19mzc3gqrq9vrvyzi6";
           name = "counsel";
         };
@@ -8682,7 +8808,7 @@
           sha256 = "1z67x4a0aricd9q6i2w33k74alddl6w0rijjhzyxwml7ibhbvphz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cp5022x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cp5022x";
           sha256 = "0v1jhkix01l299m67jag43rnps68m19zy83vvdglxa8dj3naz5dl";
           name = "cp5022x";
         };
@@ -8703,7 +8829,7 @@
           sha256 = "0kjkqylg0fncizrgcr8xx2qgjr8id41904n2pip0gicbry1n8bqg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cpputils-cmake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cpputils-cmake";
           sha256 = "0fswmmmrjv897n51nidmn8gs8yp00595g35vwjafsq6rzfg58j60";
           name = "cpputils-cmake";
         };
@@ -8724,7 +8850,7 @@
           sha256 = "0y37fx4ghx8a74cp7ci6p5yfpji8g42hlah2xcwfnyw0qlpqfbnl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/crab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/crab";
           sha256 = "1jz26bw2h7ahcb7y2qhpqrlfald244c92m6pvfrb0jg0z384i6aj";
           name = "crab";
         };
@@ -8745,7 +8871,7 @@
           sha256 = "12g6l6xlbs9h24q5lk8yjgk91xqd7r3v7r6czy10r09cmfjmkxbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/crappy-jsp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/crappy-jsp-mode";
           sha256 = "00wj61maib77qldzq06l9v0pbvp9jih75w1xw0ry9mij0r6ca8ii";
           name = "crappy-jsp-mode";
         };
@@ -8766,7 +8892,7 @@
           sha256 = "0l4bvk3m355b25d7pdnhczn3fckbq0rg2l4r0a0d94004ksvylqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/creds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/creds";
           sha256 = "0n11xxaf93bbc9ih25wj09zzw4sj32wb99qig4zcy8bpkl5y3llk";
           name = "creds";
         };
@@ -8787,7 +8913,7 @@
           sha256 = "18c4jfjnhb7asdhwj41g06cp9rz5xd7bbx2s1xvk6gahay27rlrv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/creole";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/creole";
           sha256 = "1pqgm7m2gzkn65v3qic71c38qiira29cwx11l96qph8h8sf47zw5";
           name = "creole";
         };
@@ -8808,7 +8934,7 @@
           sha256 = "0japww5x89vd1ahjm2bc3biz6wxv94vvqq5fyyzkqsblgk5bys0h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/creole-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/creole-mode";
           sha256 = "1lj9a0bgn7lmc2wyjzzvmpaz1f1spj02l51ki2wydjbfhxq61k0s";
           name = "creole-mode";
         };
@@ -8829,7 +8955,7 @@
           sha256 = "1kl6blr4dlz40gfc845071nhfms4fm59284ja2177bhghy3wmw6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/crm-custom";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/crm-custom";
           sha256 = "14w15skxr44p9ilhpswlgdbqfw8jghxi69l37yk4m449m7g9694c";
           name = "crm-custom";
         };
@@ -8850,7 +8976,7 @@
           sha256 = "1r9dhk8h8lq18vi0hjai8y4z42yjxg18786mcr2qs5m3q1ampf9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/crontab-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/crontab-mode";
           sha256 = "16qc2isvf6cgl5ihdbwmvv0gbhns4mkhd5lxkl6f8f6h0za054ci";
           name = "crontab-mode";
         };
@@ -8869,7 +8995,7 @@
           sha256 = "120hxk82i0r4qan4hfk9ldmw5a8bzv7p683lrnlcx9gyxgkia3am";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/crosshairs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/crosshairs";
           sha256 = "1gf73li6q5rg1dimzihxq0rdxiqzbl2w78r1qzc9mxw3qj7azxqp";
           name = "crosshairs";
         };
@@ -8882,15 +9008,15 @@
     crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "crux";
-        version = "20160110.1501";
+        version = "20160130.1452";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "crux";
-          rev = "93304680ec4beea168651399b622e1ee4bff05aa";
-          sha256 = "1javwbj7kvwjff05m1w6v5nmbnk1p4x11c4k2ljx7349qjciw6af";
+          rev = "382834edb99de9b347d61beca8834838da199911";
+          sha256 = "0hrbh1vdr80l816zzzgd22vx77nl8ckc8b91z1gm675z6sqmipzf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/crux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/crux";
           sha256 = "10lim1sngqbdqqwyq6ksqjjqpkm97aj1jk550sgwj28338lnw73c";
           name = "crux";
         };
@@ -8911,7 +9037,7 @@
           sha256 = "00wgbcw09xn9xi52swi4wyi9dj9p9hyin7i431xi6zkhxysw4q7w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cryptol-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cryptol-mode";
           sha256 = "08iq69gqmps8cckybhj9065b8a2a49p0rpzgx883qxnypsmjfmf2";
           name = "cryptol-mode";
         };
@@ -8932,7 +9058,7 @@
           sha256 = "0ry0087g1br3397js7a9iy6k2x6p0dgqlggxx9gaqhms7pmpq14b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cryptsy-public-api";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cryptsy-public-api";
           sha256 = "1v78rm44af3vgsml5f6kpwvnb4ks6n49br2fhjgh6nc7g3jmz97n";
           name = "cryptsy-public-api";
         };
@@ -8953,7 +9079,7 @@
           sha256 = "09b5n36z99asa81k7h7xr7906g1vpr3sg3kdcq2fdbznbpjydnvl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/csharp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/csharp-mode";
           sha256 = "17j84qrprq492dsn103dji8mvh29mbdlqlpsszbgfdgnpvfr1rv0";
           name = "csharp-mode";
         };
@@ -8974,7 +9100,7 @@
           sha256 = "0ljhar80kk7k54jz1xiq4r0w6s1wkacl7qz9wkvvbzhjb0z049hq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/css-comb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/css-comb";
           sha256 = "1axwrvbc3xl1ixhh72bii3hhbi9d96y6i1my1rpvwqyd6f7wb2cf";
           name = "css-comb";
         };
@@ -8995,7 +9121,7 @@
           sha256 = "1mgc6bd0dzrp1dq1yj8m2qxjnpysd8ppdk2yp96d3zd07zllw4rx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/css-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/css-eldoc";
           sha256 = "1f079q3ccrr4drk2hvn4xs4vbrd3hg87xqbk3r9mmjvkagd1v7rf";
           name = "css-eldoc";
         };
@@ -9016,7 +9142,7 @@
           sha256 = "0hyf4im7b8zka065daw7yxrb3670dpp8q92vd2gcsva1jla92h9y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cssfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cssfmt";
           sha256 = "12yq4dhyv3p5gxnd2w193ilpj2d3gx5ns09w0z1zkg7ax3a4q4b8";
           name = "cssfmt";
         };
@@ -9037,7 +9163,7 @@
           sha256 = "1xf2hy077frfz8qf91c0l0qppcjxzr4bsbb622bx6fidqkpa3a1a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cssh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cssh";
           sha256 = "10yvvyzqr06jvijmzis9clb1slzp2mn80yclis8wvrmg4p8djljk";
           name = "cssh";
         };
@@ -9055,7 +9181,7 @@
           sha256 = "15rfg3326xcs3zj3siy9rn7yff101vfch1srskdi2650c3l3krva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/csv-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/csv-nav";
           sha256 = "0626vsm2f5zc2wi5pyx4xrwcr4ai8w9a3l7gi9883smvayr619sj";
           name = "csv-nav";
         };
@@ -9076,7 +9202,7 @@
           sha256 = "07vasdlai49qs0nsmq2cz1kcq1adqyarv8199imgwwcbh4vn7dqb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctable";
           sha256 = "040qmlgfvjc1f908n52m5ll2fizbrhjzbd0kgrsw37bvm3029rx1";
           name = "ctable";
         };
@@ -9095,7 +9221,7 @@
           sha256 = "1xgrb4ivgz7gmingfafmclqqflxdvkarmfkqqv1zjk6yrjhlcvwf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctags";
           sha256 = "11fp8l99rj4fmi0vd3hkffgpfhk1l82ggglzb74jr3qfzv3dcn6y";
           name = "ctags";
         };
@@ -9116,7 +9242,7 @@
           sha256 = "1va394nls4yi77rgm0kz5r00xiidj6lwcabhqxisz08m3h8gfkh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctags-update";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctags-update";
           sha256 = "1k43l667mvr2y33nblachdlvdqvn256gysc1iwv5zgv7gj9i65qf";
           name = "ctags-update";
         };
@@ -9137,7 +9263,7 @@
           sha256 = "1d89gxyzv0z0nk7v1aa4qa0xfms2g2dsrr07cw0d99xsnyxfky31";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctl-mode";
           sha256 = "0fydq779b0y6hmh8srfdimr5rl9mk3sj08rbvlljxv3kqv5ajczj";
           name = "ctl-mode";
         };
@@ -9158,7 +9284,7 @@
           sha256 = "1jlr2miwqsg06hk2clvsrw9fa98m2n76qfq8qv5svrb8dpil04wb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctxmenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctxmenu";
           sha256 = "03g9px858mg19wapqszwav3599slljdyam8bvn1ri85fpa5ydvdp";
           name = "ctxmenu";
         };
@@ -9179,7 +9305,7 @@
           sha256 = "184plai32sn0indvi1dma6ykz907zgnrdyxdw6f5mghwca96g5kx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cucumber-goto-step";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cucumber-goto-step";
           sha256 = "1ydsd455dvaw6a180b6570bfgg0kxn01sn6cb57smqj835am6gx8";
           name = "cucumber-goto-step";
         };
@@ -9200,7 +9326,7 @@
           sha256 = "1ms0z5zplcbdwwdbgsjsbm32i57z9i2i8j9y3wm0pwzyz4zr36zy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cuda-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cuda-mode";
           sha256 = "0ip4vax93x72bjrh6prik6ddmrvszpsmgm0fxfz772rp24smc300";
           name = "cuda-mode";
         };
@@ -9218,7 +9344,7 @@
           sha256 = "1w0msh4mfhwglkwgb8ksqfdzbd1bvspllydnjzhc0yl3s7qrifbd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cursor-chg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cursor-chg";
           sha256 = "0d1ilall8c1y4w014wks9yx4fz743hvx5lc8jqxxlrq7pmqyqdxk";
           name = "cursor-chg";
         };
@@ -9239,7 +9365,7 @@
           sha256 = "0wmnhizv4jfcl1w9za4ydxf6xwxgm5vwmn1zi5vn70zmv4d6r49l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cursor-test";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cursor-test";
           sha256 = "1c1d5xq4alamlwyqxjx557aykz5dw87acp0lyglsrzzkdynbwlb1";
           name = "cursor-test";
         };
@@ -9257,7 +9383,7 @@
           sha256 = "1p0kacbw5zfrd7zplhlh7j1890spvn8p0bryvqqmyf8w5873pcmh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cus-edit+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cus-edit+";
           sha256 = "1kazcdfajcnrzvhsgsmwwx96rkry0dglprrc02hbd7ky1fppp4sz";
           name = "cus-edit-plus";
         };
@@ -9270,15 +9396,15 @@
     cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cyberpunk-theme";
-        version = "20151215.1153";
+        version = "20160121.1912";
         src = fetchFromGitHub {
           owner = "n3mo";
           repo = "cyberpunk-theme.el";
-          rev = "5fee81bccb07d40ff1d41aa2342ca29639b057b0";
-          sha256 = "1zx93qb83ji2jf3dya9m7prii58aj4y94h10ynldls45cqk3chz4";
+          rev = "4ffdaee0a32b8e235bf44c0daedde66eaf7b1b33";
+          sha256 = "1yhizh8j745hv5ancpvijds9dasvsr2scwjscksp2x3krnd26ssp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cyberpunk-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cyberpunk-theme";
           sha256 = "0l2bwb5afkkhrbh99v2gns1vil9s5911hbnlq5w35nmg1wvbmbc9";
           name = "cyberpunk-theme";
         };
@@ -9299,7 +9425,7 @@
           sha256 = "1d5i8sm1xrsp4v4myidfyb40hm3wp7hgva7dizg9gbb7prmn1p5w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cycbuf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cycbuf";
           sha256 = "0gyj48h5wgjawqq3j4hgk5a8d23nffmhd1q53kg7b9vfsda51hbw";
           name = "cycbuf";
         };
@@ -9320,7 +9446,7 @@
           sha256 = "0hf3r89n9zn7wkay71drxadsnd9zm6p6kvg5mvwzdy3x3z4cfyi3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cycle-resize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cycle-resize";
           sha256 = "0vp57plwqx4nf3pbv5g4frjriq8niiia9xc3bv6c3gzd4a0zm7xi";
           name = "cycle-resize";
         };
@@ -9341,7 +9467,7 @@
           sha256 = "125s6vwbb9zpx6h3vrxnn7nr8pb45vhxd70ba2r3f87dlxah93am";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cycle-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cycle-themes";
           sha256 = "1whp9q26sgyf59wygbrvdf9gc94bn4dmhr2f2qivpajx550fjfbc";
           name = "cycle-themes";
         };
@@ -9359,7 +9485,7 @@
           sha256 = "09my4gj3qm9rdpk8lg6n6ki8ywj7kwzwd4hhgwascfnfi1hzwdvw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cygwin-mount";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cygwin-mount";
           sha256 = "0ik2c8ab9bsx58mgcv511p50h45cpv7455n4b0kri83sx9xf5abb";
           name = "cygwin-mount";
         };
@@ -9380,7 +9506,7 @@
           sha256 = "1xcd8j5chh5j3fibi8bg2il6r09vza5xlb5fqm9j8sg3vkab26z8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cyphejor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cyphejor";
           sha256 = "18l5km4xm5j3vv19k3fxs8i3rg4qnhrvx7b62vmyfcqmpiasrh6g";
           name = "cyphejor";
         };
@@ -9401,7 +9527,7 @@
           sha256 = "0vbcq807jpjssabmyjcdkpp6nnx1288is2c6x79dkrviw2xxw3qf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cypher-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cypher-mode";
           sha256 = "174rfbm7yzkznkfjmh9bdnm5fgqv9bjwm85h39317pv1g8c3mgv0";
           name = "cypher-mode";
         };
@@ -9418,11 +9544,11 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "dace1e6c1475fdd3e5ea9c66b91caf93a8cbd215";
-          sha256 = "0a1r73qf43n9h5r4ikc250588l64z1zvdb3kjmlwzyhlpzszmll5";
+          rev = "fa946e8435a4dcc3497fc7b0f4e87256d40844ba";
+          sha256 = "1w09wwp6gaa0c65mwa9jfcjksppxqv1xb7mlgsk1wxbyprcllaq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cython-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cython-mode";
           sha256 = "0asai1f1pncrfxx296fn6ky09hj1qam5j0dpxxkzhy0a34xz0k2i";
           name = "cython-mode";
         };
@@ -9443,7 +9569,7 @@
           sha256 = "1ck1a61m0kjynqwzbw9hnc7y2a6gd6l1430wm7mw3qqsq959qwm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/czech-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/czech-holidays";
           sha256 = "10c0zscbn7pr9xqdqksy4kh0cxjg9bhw8p4qzlk18fd4c8rhqn84";
           name = "czech-holidays";
         };
@@ -9464,7 +9590,7 @@
           sha256 = "0fqirypxhbvnhz86rznwdx553ppg0z0hxh1h04qg7y58g01vpsdq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/d-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/d-mode";
           sha256 = "060k9ndjx0n5vlpzfxlv5zxnizx72d7y9vk7gz7gdvpm6w2ha0a2";
           name = "d-mode";
         };
@@ -9485,7 +9611,7 @@
           sha256 = "0fp40cyamchc9qq5vbpxgq3yp6vs8p3ncg46mjzr54psy3fc86dm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dactyl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dactyl-mode";
           sha256 = "0ppcabddcpwshfd04x42nbrbkagbyi1bg4vslysnlxn4kaxjs7pm";
           name = "dactyl-mode";
         };
@@ -9506,7 +9632,7 @@
           sha256 = "0fd0h07m42q2h1ggsjra20kzv209rpb4apjv408h2dxqm8sy0jiy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dakrone-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dakrone-theme";
           sha256 = "0ma4rfmgwd6k24jzn6pgk46b88jfix7mz0ib7c7r90h5vmpiq814";
           name = "dakrone-theme";
         };
@@ -9519,15 +9645,15 @@
     darcula-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "darcula-theme";
-        version = "20160106.1552";
+        version = "20160123.1627";
         src = fetchFromGitHub {
           owner = "fommil";
           repo = "darcula-theme-emacs";
-          rev = "52ab72417b510778946d98d560213ecb5c9ec5cc";
-          sha256 = "1029m6iyg2j6rvjz7kq23zj7fws2j7ilqkicws5wyjcznz0ijan1";
+          rev = "05c98433e23f2018e2e065dcdc534d73dac8e88e";
+          sha256 = "1abwx7fqbr395z3l3dshh242lxqpwr1mszmj1pxj420qi1qria6n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/darcula-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/darcula-theme";
           sha256 = "13d21gwzv66ibn0gs56ff3sn76sa2mkjvjmpd2ncxq3mcgxajnjg";
           name = "darcula-theme";
         };
@@ -9548,7 +9674,7 @@
           sha256 = "07w5aycgaps904q8lk52d0g28wxq41c82xgl5mw2q56n3s5iixfx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dark-krystal-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dark-krystal-theme";
           sha256 = "056aql35502sgvdpbgphpqdxzbjf4ay01rra6pm11c1dya8avv0j";
           name = "dark-krystal-theme";
         };
@@ -9569,7 +9695,7 @@
           sha256 = "1w0y2j0j9n107dbk7ksr9bipshjfs9dk08qbs9m6h5aqh4hmwa4r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dark-souls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dark-souls";
           sha256 = "1ilsn657mpl7v8vkbzqf3gp0gmvy0dgynfsn8w4cb49qaiy337xc";
           name = "dark-souls";
         };
@@ -9590,7 +9716,7 @@
           sha256 = "19vrxfzhi0sqf7frzjx5z02d65r2jp1w2nhhf0527g7baid5hqvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/darkburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/darkburn-theme";
           sha256 = "18hwdnwmkf640vcyx8d66i424wwazbzjq3k0w0xjmwsn2mpyhm9w";
           name = "darkburn-theme";
         };
@@ -9611,7 +9737,7 @@
           sha256 = "0ajxlrnz1228w8ldgraw6a4s605isbr67p8s382jvia2zf821fmp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/darkmine-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/darkmine-theme";
           sha256 = "06vzldyqlmfd11g8dqrqh5x244ikfa20qwpsmbgsiry3041k8iw5";
           name = "darkmine-theme";
         };
@@ -9632,7 +9758,7 @@
           sha256 = "1p7ih9fmcxnnxkj2mz56xa403m828wyyqvliabf5amklzjlhb3z9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/darktooth-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/darktooth-theme";
           sha256 = "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs";
           name = "darktooth-theme";
         };
@@ -9653,7 +9779,7 @@
           sha256 = "1pd7a76znzypwi0khssdlas5kcma8r865d68jmr3n6xvwdmy8dlc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dart-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dart-mode";
           sha256 = "0wxfh8v716dhrmx1klhpnsrlsj66llk8brmwryjg2h7c391sb5ff";
           name = "dart-mode";
         };
@@ -9674,7 +9800,7 @@
           sha256 = "1g7vrfhafmkqwdpfllfiwirl4pi437pyaws38jsd8laxmsa4m4wb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dash";
           sha256 = "0azm47900bk2frpjsgy108fr3p1jk4h9kmp4b5j5pibgsm26azgz";
           name = "dash";
         };
@@ -9695,7 +9821,7 @@
           sha256 = "0zd50sr51mmvndjb9qfc3sn502nhc939rhd454jbkmlrzqsxvphj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dash-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dash-at-point";
           sha256 = "0x4nq42nbh2qgbg111lgbknc7w7m7lxd14mp9s8dcrpwsaxz960m";
           name = "dash-at-point";
         };
@@ -9716,7 +9842,7 @@
           sha256 = "1g7vrfhafmkqwdpfllfiwirl4pi437pyaws38jsd8laxmsa4m4wb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dash-functional";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dash-functional";
           sha256 = "0hx36hs12mf4nmskaaqrqpcgwrfjdqj6qcxn6bwb0s5m2jf9hs8p";
           name = "dash-functional";
         };
@@ -9737,7 +9863,7 @@
           sha256 = "0l4z9rjla4xvm2hmp07xil69q1cg0v8iff0ya41svaqr944qf7hf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/date-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/date-at-point";
           sha256 = "0r26df6px6q5jlxj29nhl3qbp6kzy9hs5vd72kpiirgn4wlmagp0";
           name = "date-at-point";
         };
@@ -9758,7 +9884,7 @@
           sha256 = "1lmwnj2fnvijj9qp4rjggl7c4x91vnpb47rqaam6m2wmr5wbrx3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/date-field";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/date-field";
           sha256 = "0fmw13sa4ajs1xkrkdpcjpbp0jl9d81cgvwh93myg8yjjn7wbmvk";
           name = "date-field";
         };
@@ -9779,7 +9905,7 @@
           sha256 = "0ry7magy9x63xv2apjbpgszp0slch92g23gqwl4rd564qafajmf0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/datomic-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/datomic-snippets";
           sha256 = "0lax0pj4k9c9n0gmrvil240pc9p25535q3n5m8nb2ar4sli8dn8r";
           name = "datomic-snippets";
         };
@@ -9800,7 +9926,7 @@
           sha256 = "1j0mk8vyr6sniliq0ix77jldx8vzl73nd5yhh82klzgyymal58ms";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dayone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dayone";
           sha256 = "0hi09dj00h6g5r84jxglwkgbijhfxknx4mq5gcl5jzjis5affk8l";
           name = "dayone";
         };
@@ -9821,7 +9947,7 @@
           sha256 = "0syv4kr319d34yqi4q61b8jh5yy22wvd148x1m3pc511znh2ry5k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/db";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/db";
           sha256 = "05jhga9n6gh1bmj8gda14sb703gn7jgjlvy55mlr5kdb2z3rqw1n";
           name = "db";
         };
@@ -9842,7 +9968,7 @@
           sha256 = "15r0qwjkl33p8kh2k5kxz9wnbkv1k470b1h0i6svvljkx9ynk68a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/db-pg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/db-pg";
           sha256 = "06nfibw01ijv7nr0m142y80jbbpg9kk1dh19s5wq7i6fqf7g08xg";
           name = "db-pg";
         };
@@ -9855,16 +9981,16 @@
     ddskk = callPackage ({ ccc, cdb, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ddskk";
-        version = "20160117.27";
+        version = "20160130.2300";
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "337b29c3c2cac8920f7066ec457aeb5f62644297";
-          sha256 = "1a42bwarhciccl0yhh9i24bc9f3n5c0wlnwqfcwkb7wzqy9gd55q";
+          rev = "64ad0ea6d03c0d46030cc5aaa3715b5cf3a82d3c";
+          sha256 = "02bsiq0kxm9cbbr6hr20ac4888mcyk0i8p9hrrdvaijq4fhkk76b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ddskk";
-          sha256 = "1wj3z6ldlkaj99xqh7a497in1syn7shf2w1ffcn6aiskxjrzmpiq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ddskk";
+          sha256 = "01pb00p126q7swsl12yjrhghln2wgaj65jhjr0k7dkk64x4psyc9";
           name = "ddskk";
         };
         packageRequires = [ ccc cdb ];
@@ -9884,7 +10010,7 @@
           sha256 = "1darxggvyv100cfb7imyzvgif8a09pnky62pf3bl2612hhvaijfb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/debpaste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/debpaste";
           sha256 = "1vgirfy4vdqkhllnnmcplhwmzqqwca3la5jfvvansykqriwbq9lw";
           name = "debpaste";
         };
@@ -9905,7 +10031,7 @@
           sha256 = "1n99nrp42slmyp5228d1nz174bysjn122jgs8fn1x0qxywg7jyxp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/debug-print";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/debug-print";
           sha256 = "01dsqq2qdsbxny6j9dhvg770493awxjhk1m85c14ysgh6sl199rm";
           name = "debug-print";
         };
@@ -9926,7 +10052,7 @@
           sha256 = "01bafkc99g9vi45y95mi3sqin2lsfw885z63f7llpqvnfav86n4y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/decl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/decl";
           sha256 = "0wdhmp226wmrjvjgpbz8ihvhxxv3rrxh97sdqm3mgsav3n071n6k";
           name = "decl";
         };
@@ -9947,7 +10073,7 @@
           sha256 = "0pba9s0h37sxyqh733vi6k5raa4cs7aradipf3826inw36jcw414";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dedicated";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dedicated";
           sha256 = "1ka8n02r3nd2ksbid23g2qd6707c7xsjx7lbbdi6pcmwam5mglw9";
           name = "dedicated";
         };
@@ -9968,7 +10094,7 @@
           sha256 = "1haixiy94r50rfza64dypb7fi256231pf06g6p2il9kyscqg0zz2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dedukti-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dedukti-mode";
           sha256 = "17adfmrhfks5f45ddr6ygjq870ac50vfzc5872ycv414zg0w4sa9";
           name = "dedukti-mode";
         };
@@ -9989,7 +10115,7 @@
           sha256 = "1ysv1q7n7k2l4x8x7hlzmxmawyxl5lx627sbdv3phkvjh5zccsm8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/default-text-scale";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/default-text-scale";
           sha256 = "18r90ic38fnlsbg4gi3r962vban398x2bf3rqhrc6z4jk4aiv3mi";
           name = "default-text-scale";
         };
@@ -10010,7 +10136,7 @@
           sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/deferred";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/deferred";
           sha256 = "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr";
           name = "deferred";
         };
@@ -10031,7 +10157,7 @@
           sha256 = "02i621yq2ih0zp7mna8iykj41prv77hvcadz7rx8c942zyvjzxqd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/define-word";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/define-word";
           sha256 = "035fdfwnxw0mir1dyvrimygx2gafcgnvlcsmwmry1rsfh39n5b9a";
           name = "define-word";
         };
@@ -10052,7 +10178,7 @@
           sha256 = "07jzr571q02l0lg5d40rnmzg16hmybi1nkjgslmvlx46z3c4xvyr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/defproject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/defproject";
           sha256 = "1gld2fkssrjh4smpp54017549d6aw3n1zisp5s4kkb6cmszwj5gm";
           name = "defproject";
         };
@@ -10071,7 +10197,7 @@
           sha256 = "15c3ec6fcfae63201652394205fee951f3c1db8d3c6fc5f48c306b9b775c8e63";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/deft";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/deft";
           sha256 = "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p";
           name = "deft";
         };
@@ -10089,7 +10215,7 @@
           sha256 = "1gap2icsqi7cryfvcffh41zqg2ghl4y7kg9pngzdfjrc3m7sf635";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/delight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/delight";
           sha256 = "1d9m5k18k73vhidwd50mcbq7mlvwdn4sb9ih8r5gri9a9whi2nkj";
           name = "delight";
         };
@@ -10110,7 +10236,7 @@
           sha256 = "06a20sd8nc273azrgha40l1fbqvv9qmxsmkjiqbf6dcf1blkwjyf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/delim-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/delim-kill";
           sha256 = "1pplc456771hi52ap1p87y7pabxlvm6raszcxjvnxff3xzw56pig";
           name = "delim-kill";
         };
@@ -10131,7 +10257,7 @@
           sha256 = "13jfhc9gavvb9dxmgi3k7ivp5iwh4yw4m11r2s8wpwn6p056bmfl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/demangle-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/demangle-mode";
           sha256 = "0ky0bb6rc99vrdli4lhs656qjndnla9b7inc2ji9l4n1zki5qxzk";
           name = "demangle-mode";
         };
@@ -10152,7 +10278,7 @@
           sha256 = "1hdnjwsmwbwn0ziyw805jjpaj3zpm374g9y4yn5ip4l9x4vq73xv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/demo-it";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/demo-it";
           sha256 = "063v115xy9mcga4qv16v538k12rn9maz92khzwa35wx56bwz4gg7";
           name = "demo-it";
         };
@@ -10173,7 +10299,7 @@
           sha256 = "13fasbhdjwc4jh3cy25gm5sbbg56hq8la271098qpx6dhqm2wycq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/describe-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/describe-number";
           sha256 = "0gvriailni2ppz69g0bwnb1ik1ghjkj341k45vllz30j0frp9iji";
           name = "describe-number";
         };
@@ -10194,7 +10320,7 @@
           sha256 = "18k5898r4n96h93xsvjrpm90hz3rd0ir6x3axjzqwwrgs2ik7pj2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/desktop+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/desktop+";
           sha256 = "0w7i6k4814hwb19l7ly9yq59674xiw57ylrwxq7yprwx52sgs2r8";
           name = "desktop-plus";
         };
@@ -10214,7 +10340,7 @@
           sha256 = "7c7727dd1d63be98e428700bfe340f2c4e7ff713fcc9b2b743a3366d786ae02d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/desktop-registry";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/desktop-registry";
           sha256 = "02mj0nlawx6vpksqsvp1q7l8rd6b1bs8f9c8c2rmda46jaf5npyr";
           name = "desktop-registry";
         };
@@ -10234,7 +10360,7 @@
           sha256 = "0lg6i9vw6xsnaamfjczz0cr41vlv1bs03h8c8y2jxpdkgaab31nc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dic-lookup-w3m";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dic-lookup-w3m";
           sha256 = "0myv7sns9ajyr7fzn6kd8a64pfapjdksgby5ilh9mr99imm8dcfv";
           name = "dic-lookup-w3m";
         };
@@ -10255,7 +10381,7 @@
           sha256 = "0b8yg03h5arfl5rlzlg2a6q7nhx452mdyngizjzxlvkmrqnlra4v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dictcc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dictcc";
           sha256 = "0x1y742hb3dm7xmh5810dlqki38kybw68rmg9adcchm2rn86jqlm";
           name = "dictcc";
         };
@@ -10276,7 +10402,7 @@
           sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dictionary";
           sha256 = "0zr9sm5rmr0frxdr0za72wiffip9391fn9dm5y5x0aj1z4c1n28w";
           name = "dictionary";
         };
@@ -10289,15 +10415,15 @@
     diff-hl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "diff-hl";
-        version = "20160114.1759";
+        version = "20160203.1701";
         src = fetchFromGitHub {
           owner = "dgutov";
           repo = "diff-hl";
-          rev = "167a2dd16bbf963773c9198b391921ce05324fc8";
-          sha256 = "020dhrdy375w4myinhm6hs391r9bsmxcndrlzj8hp8qqa2ilk5w7";
+          rev = "f4edea201bc4c38d082ec3143ceec87d2dcadb37";
+          sha256 = "0sjwpvzd4x9c1b9iv66b33llvp96ryyzyp8pn1rnhvxfvjv43cnz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/diff-hl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/diff-hl";
           sha256 = "0kw0v9xcqidhf26qzrqwdlav2zhq32xx91k7akd2536jpji5pbn6";
           name = "diff-hl";
         };
@@ -10318,7 +10444,7 @@
           sha256 = "14ccak3cmv36pd085188lypal9gd3flyikcrxn0wi6hn60w2dgvr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/diffscuss-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/diffscuss-mode";
           sha256 = "06jd7wh4yzryz0yjwa4a0xddz7srl5mif8ff1wvcpxsb66m2zbvh";
           name = "diffscuss-mode";
         };
@@ -10339,7 +10465,7 @@
           sha256 = "0diw887x4q7kbgdvxbbnxdw51z33kqwxw3v9m45fczxbywyi4cxf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/diffview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/diffview";
           sha256 = "0vlzmykvxjwjww313brl1nr13kz41jypsk0s3l8q3rbsnkpfic5k";
           name = "diffview";
         };
@@ -10360,7 +10486,7 @@
           sha256 = "0rjqfpya6wkf8nv00q2d40fcnssnsr3p07j9blbpcrqalkdm27ds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/digistar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/digistar-mode";
           sha256 = "0khzxlrm09h31i1nqz6rnzhrdssb3kppc4klpxza612l306fih0s";
           name = "digistar-mode";
         };
@@ -10381,7 +10507,7 @@
           sha256 = "17jfmgyras32w9xr8fldqj924bijgng4bjg9fy6ckwb3mgihyil8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dim";
           sha256 = "0gsyily47g3g55qmhp1wzfz319l1pkgjz4lbigafjzlzqxyclz52";
           name = "dim";
         };
@@ -10402,7 +10528,7 @@
           sha256 = "0bw1gkaycbbv2glnaa36gwzkl1l6lsq7i2i7jinka92b27zvrans";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dim-autoload";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dim-autoload";
           sha256 = "0lhzzjrgfvbqnzwhjywrk3skdb7x10xdq7d21q6kdk3h5r0np9f9";
           name = "dim-autoload";
         };
@@ -10423,7 +10549,7 @@
           sha256 = "04vfc5zgcjp0pax5zk1x98ivx5g349c5g3748lb9pgsijqaprgg4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/diminish";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/diminish";
           sha256 = "1h6a31jllypk47akjflz89xk6h47na96pim17d6g4rpqcafc2k43";
           name = "diminish";
         };
@@ -10444,7 +10570,7 @@
           sha256 = "1ldqxdwy6r0fd2vh0ckkhgpincvybghavi8c7vvyd24j91i57y2f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dionysos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dionysos";
           sha256 = "1wjgj74dnlwd79gc3l7ymbx75jka8rw9smzbb10dsfppw3rrzfmz";
           name = "dionysos";
         };
@@ -10465,7 +10591,7 @@
           sha256 = "0mcsfsybpsxhzkd2m9bzc0np49azm6qf5x4x9h9lbxc8vfgh4z8s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dircmp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dircmp";
           sha256 = "0cnj7b0s8vc83sh9sai1cldw54krk5qbz1qmlvvd1whryf2pc95c";
           name = "dircmp";
         };
@@ -10475,6 +10601,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    dired-atool = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-atool";
+        version = "20160203.458";
+        src = fetchFromGitHub {
+          owner = "HKey";
+          repo = "dired-atool";
+          rev = "8a1fb134875e83bf0ffeb693d02066c96c1c312f";
+          sha256 = "1i4q65y6r1npcxsp7fjk695my668jys46cq62syv2b8c4vbgapn3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-atool";
+          sha256 = "0qljx6fmz1hal9r2smjyc957wcvcpg16vp5mv65ip6d26k5qsj0w";
+          name = "dired-atool";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/dired-atool";
+          license = lib.licenses.free;
+        };
+      }) {};
     dired-avfs = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-avfs";
@@ -10482,11 +10629,11 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "1e174c9d53a8d65bd927334aaaf4d47e1bf34c72";
-          sha256 = "1n138flpqqgr64iyzdi8xhnz03kpczcprnmnir48jnpb90cir7bj";
+          rev = "bc5b52efbad15a95a898dfcf3e828bf852555135";
+          sha256 = "1r5pn8j1c6bs41pm7ix6bjn1qv29nk7qw6xhskzakg0y1z5zlyvd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-avfs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-avfs";
           sha256 = "1q42pvrpmd525887iicd3m5gw4w2a78xb72v7fjfl30ay1kir4bm";
           name = "dired-avfs";
         };
@@ -10504,7 +10651,7 @@
           sha256 = "1ddrhj1kw0wl7jbs9jn067vfffsvqhz4izfw9f7ihxz34fdl2iza";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-details";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-details";
           sha256 = "1390vl3i4qbnl7lbia98wznhf6x887d24f8p7146fpqjsiwbm5ck";
           name = "dired-details";
         };
@@ -10523,7 +10670,7 @@
           sha256 = "07z4h5l8763ks6b6m8dcmq78jiyq4xvan1mb0z8fbasmi1bsrya4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-details+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-details+";
           sha256 = "1gzr3z4nyzip299z08mignhigxr7drak7rv9z6gmdjrika9a29lx";
           name = "dired-details-plus";
         };
@@ -10544,7 +10691,7 @@
           sha256 = "1lcmpzwj43gix2q56bh2gw3gfqh8vl5j3mqr8s7v3k0aw816j0ni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-dups";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-dups";
           sha256 = "05s02gw8b339yvsr7vvka1r2140y7mbjzs8px4kn4acgb5y7rk71";
           name = "dired-dups";
         };
@@ -10565,7 +10712,7 @@
           sha256 = "0jj9da880b4zwxba140fldai1x9p2sxc6hdf3wz6lnbvz1pyn1mv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-efap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-efap";
           sha256 = "01j5v6584qi8ia7zmk03kx3i3kmm6hn6ycfgqlh5va6lp2h9sr00";
           name = "dired-efap";
         };
@@ -10586,7 +10733,7 @@
           sha256 = "1lnqjkbzryv655n16xj1c5bxck2jb5ccy8yckz1wp5yikkr06ba8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-fdclone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-fdclone";
           sha256 = "11aikq2q3m9h4zpgl24f8npvpwd98jgh8ygjwy2x5q8as8i89vf9";
           name = "dired-fdclone";
         };
@@ -10607,7 +10754,7 @@
           sha256 = "0v6n4ymlnphzmqaqlfbxvf24dh1pa0xy37xhz9xfjkk02l02wsgf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-filetype-face";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-filetype-face";
           sha256 = "1g9wzkkqmlkxlxwx43446q9mlam035zwq0wzpf7m6394rw2xlwx6";
           name = "dired-filetype-face";
         };
@@ -10620,15 +10767,15 @@
     dired-filter = callPackage ({ cl-lib ? null, dash, dired-hacks-utils, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-filter";
-        version = "20160117.930";
+        version = "20160201.1426";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "1e174c9d53a8d65bd927334aaaf4d47e1bf34c72";
-          sha256 = "1n138flpqqgr64iyzdi8xhnz03kpczcprnmnir48jnpb90cir7bj";
+          rev = "bc5b52efbad15a95a898dfcf3e828bf852555135";
+          sha256 = "1r5pn8j1c6bs41pm7ix6bjn1qv29nk7qw6xhskzakg0y1z5zlyvd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-filter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-filter";
           sha256 = "1mw94210i57wrqfyif6rh689xbwbpv1qp6bgc0j7z6g4xypvd52p";
           name = "dired-filter";
         };
@@ -10645,11 +10792,11 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "1e174c9d53a8d65bd927334aaaf4d47e1bf34c72";
-          sha256 = "1n138flpqqgr64iyzdi8xhnz03kpczcprnmnir48jnpb90cir7bj";
+          rev = "bc5b52efbad15a95a898dfcf3e828bf852555135";
+          sha256 = "1r5pn8j1c6bs41pm7ix6bjn1qv29nk7qw6xhskzakg0y1z5zlyvd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-hacks-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-hacks-utils";
           sha256 = "1vgl0wqf7gc2nbiqjn0rkrdlnxfm3wrgspx5b3cixv2n8rqx8kyi";
           name = "dired-hacks-utils";
         };
@@ -10670,7 +10817,7 @@
           sha256 = "088h9yn6wndq4pq6f7q4iz17f9f4ci29z9nh595idljp3vwr7qid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-imenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-imenu";
           sha256 = "09yix4fkr03jq6j2rmvyg6gkmcnraw49a8m9649r3m525qdnhxs1";
           name = "dired-imenu";
         };
@@ -10691,7 +10838,7 @@
           sha256 = "13xpbbdd190lklz8jmj8nw8qm414kpkij9wrd7a9ws9j1jzj8x6s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-k";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-k";
           sha256 = "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8";
           name = "dired-k";
         };
@@ -10704,15 +10851,15 @@
     dired-narrow = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-narrow";
-        version = "20160103.622";
+        version = "20160130.1045";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "1e174c9d53a8d65bd927334aaaf4d47e1bf34c72";
-          sha256 = "1n138flpqqgr64iyzdi8xhnz03kpczcprnmnir48jnpb90cir7bj";
+          rev = "bc5b52efbad15a95a898dfcf3e828bf852555135";
+          sha256 = "1r5pn8j1c6bs41pm7ix6bjn1qv29nk7qw6xhskzakg0y1z5zlyvd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-narrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-narrow";
           sha256 = "1rgqiscbizalh78jwc53zbj599dd13a6vzdgf75vzllc1w7jsg6d";
           name = "dired-narrow";
         };
@@ -10729,11 +10876,11 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "1e174c9d53a8d65bd927334aaaf4d47e1bf34c72";
-          sha256 = "1n138flpqqgr64iyzdi8xhnz03kpczcprnmnir48jnpb90cir7bj";
+          rev = "bc5b52efbad15a95a898dfcf3e828bf852555135";
+          sha256 = "1r5pn8j1c6bs41pm7ix6bjn1qv29nk7qw6xhskzakg0y1z5zlyvd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-open";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-open";
           sha256 = "0a4ksz2jkva4gvhprywjc1fzrbf95xdk8gn25nv1h1c1ckhr91qx";
           name = "dired-open";
         };
@@ -10745,13 +10892,13 @@
       }) {};
     dired-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "dired-plus";
-        version = "20151231.1449";
+        version = "20160124.2107";
         src = fetchurl {
           url = "http://www.emacswiki.org/emacs/download/dired+.el";
-          sha256 = "0d92kx5rr899cjpr280fwcisxlivq2jx1sm5w11mg82qmpsf31nx";
+          sha256 = "0fhag6jhb97jg50rb32s93mml0adncsd58z9grs7l95zva439pc2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired+";
           sha256 = "1dmp6wcynran03nsa0fd26b9q0zj9wp8ngaafx1i1ybwn2gx32g5";
           name = "dired-plus";
         };
@@ -10768,11 +10915,11 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "1e174c9d53a8d65bd927334aaaf4d47e1bf34c72";
-          sha256 = "1n138flpqqgr64iyzdi8xhnz03kpczcprnmnir48jnpb90cir7bj";
+          rev = "bc5b52efbad15a95a898dfcf3e828bf852555135";
+          sha256 = "1r5pn8j1c6bs41pm7ix6bjn1qv29nk7qw6xhskzakg0y1z5zlyvd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-rainbow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-rainbow";
           sha256 = "1b9yh8p2x1dg7dyqhjhnqqiiymyl6bwsam65j0lpvbdx8r4iw882";
           name = "dired-rainbow";
         };
@@ -10789,11 +10936,11 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "1e174c9d53a8d65bd927334aaaf4d47e1bf34c72";
-          sha256 = "1n138flpqqgr64iyzdi8xhnz03kpczcprnmnir48jnpb90cir7bj";
+          rev = "bc5b52efbad15a95a898dfcf3e828bf852555135";
+          sha256 = "1r5pn8j1c6bs41pm7ix6bjn1qv29nk7qw6xhskzakg0y1z5zlyvd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-ranger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-ranger";
           sha256 = "19lbbzqflqda5b0alqfzdhpbgqssghqb4n4viq8x4l1fac8mby6h";
           name = "dired-ranger";
         };
@@ -10814,7 +10961,7 @@
           sha256 = "01xvaqckyr31ywsn1fp9sz9wq4h4dd1hgghfqypc9s4akrxmgnf2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-single";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-single";
           sha256 = "13h8dsn7bkz8ji2rrb7vyrqb2znxarpiynqi65mfli7dn5k086vf";
           name = "dired-single";
         };
@@ -10832,7 +10979,7 @@
           sha256 = "1dpxkxxfs14sdm3hwxv0j26lq0qzx4gryw42vrcdi680aj24962z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-sort";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-sort";
           sha256 = "1dzy2601yikmmbfqivf9s5xi4vd1f5g3c53f8rc74kfnxr1qn59x";
           name = "dired-sort";
         };
@@ -10850,7 +10997,7 @@
           sha256 = "1i42r7j1c8677qf79ig33bia24d2yvcj26y92migfvrlbi03w4qi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-sort-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-sort-menu";
           sha256 = "0n7zh8s3vdw3pcax8wkas9rykf917wn2dzikdlyrl5bbil9ijblb";
           name = "dired-sort-menu";
         };
@@ -10869,7 +11016,7 @@
           sha256 = "1hjci4zfzig04ji1jravxg9n67rdr4wyhmxmahbrzq9kjnql510i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-sort-menu+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-sort-menu+";
           sha256 = "19ah8qgbfdvyhfszdr6hlw8l01lbdb84vf5snldw8qh3x6lw8cfq";
           name = "dired-sort-menu-plus";
         };
@@ -10886,11 +11033,11 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "1e174c9d53a8d65bd927334aaaf4d47e1bf34c72";
-          sha256 = "1n138flpqqgr64iyzdi8xhnz03kpczcprnmnir48jnpb90cir7bj";
+          rev = "bc5b52efbad15a95a898dfcf3e828bf852555135";
+          sha256 = "1r5pn8j1c6bs41pm7ix6bjn1qv29nk7qw6xhskzakg0y1z5zlyvd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-subtree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-subtree";
           sha256 = "1vqcnkh3g6dwi2hwfkb534q0j19pkqzqk3yb7ah8ck4z4ln4ppfk";
           name = "dired-subtree";
         };
@@ -10911,7 +11058,7 @@
           sha256 = "1yx20h16hc1b04knsqhrxni0j8qgwnq7i5b0dlggq3dakcvqfxma";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-toggle";
           sha256 = "18v571kp440n5g1d7pj86rr8dgbbm324f9vblkdbdvn13c5dczf5";
           name = "dired-toggle";
         };
@@ -10932,7 +11079,7 @@
           sha256 = "0ajj8d6k5in2hclcrqckinfh80ylddplva0ryfbkzsjkfq167cv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-toggle-sudo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-toggle-sudo";
           sha256 = "0fy05af9aq9791ij4j9pscdk5j44pbg0kmhpqli41qiazjw7v2va";
           name = "dired-toggle-sudo";
         };
@@ -10953,7 +11100,7 @@
           sha256 = "1rx7vq6yl83fbmb76sczbb1bv972s4cyg160sm2yap1i6nzhd10p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/diredful";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/diredful";
           sha256 = "0y8x6q1yfsk0srxsh4g5nbsms1g9pk9d103jx7cfdac79mcigw7x";
           name = "diredful";
         };
@@ -10974,7 +11121,7 @@
           sha256 = "0mis3m6lg3vlvp8qm8iajprgx3pm3gcbhdszsm9mvrcgkahdjqnr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/direx";
           sha256 = "1x3rnrhhyrrvgry9n7kc0734la1zp4gc4bpy50f2qpfd452jwqdm";
           name = "direx";
         };
@@ -10995,7 +11142,7 @@
           sha256 = "0swdh0qynpijsv6a2d308i42hfa0jwqsnmf4sm8vrhaf3vv25f5h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/direx-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/direx-grep";
           sha256 = "0y2wrzq06prm55akwgaqjg56znknyvbayav13asirqzg258skvm2";
           name = "direx-grep";
         };
@@ -11014,7 +11161,7 @@
           sha256 = "1q03q4j0wkbg9p2nzf1kb7l517b21mskp2v52i95jbxh09igbjjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dirtree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dirtree";
           sha256 = "0wfz9ks5iha2n0rya9yjmrb6f9lhp620iaqi92lw9smm7w83zj29";
           name = "dirtree";
         };
@@ -11035,7 +11182,7 @@
           sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dirtree-prosjekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dirtree-prosjekt";
           sha256 = "0pyb6c0gvc16z5rc5h0kpl8021hz2hzv86cmjsd20gbhz7imrqwk";
           name = "dirtree-prosjekt";
         };
@@ -11056,7 +11203,7 @@
           sha256 = "1srlz63pncxndh1kmb6dl5sxaanspxa444wg998dld3dkdflwavq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/disaster";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/disaster";
           sha256 = "1ad8q81n0s13cwmm216wqx3s92195pda1amc4wxvpb3lq7dbd3yn";
           name = "disaster";
         };
@@ -11077,7 +11224,7 @@
           sha256 = "0f7h2rhh37lrs6xclj182li6s1fawv5m8w3hgy6qgm06dam45lka";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/discover";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/discover";
           sha256 = "1hf57p90jn1zzhjl63zv9ascbgkcbr0p0zmd3fvzpjsw84235dga";
           name = "discover";
         };
@@ -11098,7 +11245,7 @@
           sha256 = "0l2g58f55p8zmzv2q2hf163ggm9p0wk8hg93wlkyldrgyb94dgf4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/discover-clj-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/discover-clj-refactor";
           sha256 = "08bz60fxcgzab77690mmv0f7wdxcpygmasazcss427k37z9ysm7r";
           name = "discover-clj-refactor";
         };
@@ -11119,7 +11266,7 @@
           sha256 = "1vnbn4asz3lifscvy4shzisl6r0gkgq0qsa3kpgif3853wcd2rvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/discover-js2-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/discover-js2-refactor";
           sha256 = "139zq66cpcn4dnidf22h7x88p812ywrrz4c3c62w3915b75f71ki";
           name = "discover-js2-refactor";
         };
@@ -11140,7 +11287,7 @@
           sha256 = "0b73nc4jkf9bggnlp0l34jfcgx91vxbpavz6bpnf5rjvm0v1bil9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/discover-my-major";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/discover-my-major";
           sha256 = "0ch2y4grdjp7pvw2kxqnqdl7jd3q609n3pm3r0gn6k0xmcw85fgg";
           name = "discover-my-major";
         };
@@ -11158,7 +11305,7 @@
           sha256 = "1c0pgqvl1z2f5hprszln53pn2v2pqy110r3wx3g84v71w6378bbv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/disk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/disk";
           sha256 = "0bij9gr4zv6jmc6dwsy3lb06vsxvmyzl8xrm8wzasxisk1qd2l6n";
           name = "disk";
         };
@@ -11179,7 +11326,7 @@
           sha256 = "075gj81rnhrvv061wnldixpfmlsyfbnvacnk107z6f9v3m2m3vl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dispass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dispass";
           sha256 = "08c1s4zgl4rha10mva48cfkxzrqnpdhy03pxq51ihw94v6vxzg3z";
           name = "dispass";
         };
@@ -11200,7 +11347,7 @@
           sha256 = "0r560bpgw5p2pfcgkgcrlpp1bprv1f23dl4y5fjk06dg93fgaysa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/display-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/display-theme";
           sha256 = "07nqscmfa6iykll1m6gyiqca1g5ncx3rx468iyf2ahygpvqvnbxa";
           name = "display-theme";
         };
@@ -11221,7 +11368,7 @@
           sha256 = "03d8zb2is7n2y2z0k6j37cijjc3ndgasxsm9gqyq7drlq9bqwzsm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/distinguished-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/distinguished-theme";
           sha256 = "0h03aqgijrmisbgqga42zlb5yz4x3jn9jgr29rq8canyhayr3rk4";
           name = "distinguished-theme";
         };
@@ -11242,7 +11389,7 @@
           sha256 = "120zgp38nz4ssid6bv0zy5rnf2claa5s880incgljqyl0vmj9nq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dizzee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dizzee";
           sha256 = "1axydags80jkyhpzp3m4gyplwr9k3a13w6vmrrzcv161nln7jhhs";
           name = "dizzee";
         };
@@ -11263,7 +11410,7 @@
           sha256 = "15i25zh54b2fqji0qmkg502051ymccih6pgqnzq02c43dpnsqhqv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/django-manage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/django-manage";
           sha256 = "0j95g7fps28xhlrikkg61xgpbpf52xb56swmns2qdib6x1xzd6rh";
           name = "django-manage";
         };
@@ -11284,7 +11431,7 @@
           sha256 = "0dw0m77w7kdwxxh53b4k15jjkpfl5vha17hw9dn29ap77pf820va";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/django-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/django-mode";
           sha256 = "1rdkzqvicjpfh9k66m31ky6jshx9fqw7pza7add36bk6xg8lbara";
           name = "django-mode";
         };
@@ -11305,7 +11452,7 @@
           sha256 = "0dw0m77w7kdwxxh53b4k15jjkpfl5vha17hw9dn29ap77pf820va";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/django-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/django-snippets";
           sha256 = "1qs9fw104kidbr5zbxc1q71yy033nq3wxh98vvzk4z4fppnd29sw";
           name = "django-snippets";
         };
@@ -11326,7 +11473,7 @@
           sha256 = "1azf4p6salga7269l0kf13bqlxf9idp0ys8mm20qpyjpj79p5g9w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/django-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/django-theme";
           sha256 = "1rydl857zfpbvd7aziz6h7n3rrh584z2cbfxlss3wgfclzmbyhgf";
           name = "django-theme";
         };
@@ -11347,7 +11494,7 @@
           sha256 = "1nbvdnw9g3zbbb0n2sn2kxfzs5wichhl9qid3qjp8dsiq1wpv459";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dkdo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dkdo";
           sha256 = "0p7ybgldjs046jrkkbpli1iicfmblpxfz9lql8m8sz7lpjn7h300";
           name = "dkdo";
         };
@@ -11368,7 +11515,7 @@
           sha256 = "063nnln5m42qf190vr2z0ibacyn7n0xkxm3v5vaa4gxdvdwzhshs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dklrt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dklrt";
           sha256 = "11ss5x9sxgxp1wx2r1m0vsp5z5qm8m4ww20ybr6bqjw0a1gax561";
           name = "dklrt";
         };
@@ -11389,7 +11536,7 @@
           sha256 = "1nz71g8pb19aqjcb4s94hhn6j30cc04q05kmwvcbxpjb11qqrv49";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dkmisc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dkmisc";
           sha256 = "0nnbl272hldcmhyj47r463yvj7b06rjdkpkl5xk0gw9ikyja7w0z";
           name = "dkmisc";
         };
@@ -11410,7 +11557,7 @@
           sha256 = "0spj80vq6m2kqbdy6y1vh9fzwqyqkij30457d2n39kjn2gzbyar8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dmenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dmenu";
           sha256 = "1w1pgaj2yasfhsd1ibvrwy11ykq8v17h913g298h3ycsvqv8gic0";
           name = "dmenu";
         };
@@ -11431,7 +11578,7 @@
           sha256 = "0z28j7x7wgkc1cg1q1kz1lhdx1v1n6s88ixgkm8hn458h9bfnr3n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dna-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dna-mode";
           sha256 = "0ak3g152q3xxkiz1a4pl5y2vgbigbbmbc95fggirbcrh52zkzgk9";
           name = "dna-mode";
         };
@@ -11452,7 +11599,7 @@
           sha256 = "1nbm3wzd12rsrhnwlcc6b72b1ala328mfpcp5bwlfcdshw6mfcrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/docbook-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/docbook-snippets";
           sha256 = "1ipqfylgiw9iyjc1nckbay890clfkhda81nr00cq06sjmm71iniq";
           name = "docbook-snippets";
         };
@@ -11473,7 +11620,7 @@
           sha256 = "055kr0qknjgnjs7dn6gdmahrdbs8piwldbz7vg1hgq3b046x8lky";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/docean";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/docean";
           sha256 = "1mqmn2i9axnv5vnkg9gwfdjpzr6gxx4ia9mcdpm200ix297dg7x9";
           name = "docean";
         };
@@ -11494,7 +11641,7 @@
           sha256 = "12n63z4kkgfzkc2xji1z0k924af0v633qhvrr0rm83db9hz9j318";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/docker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/docker";
           sha256 = "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk";
           name = "docker";
         };
@@ -11515,7 +11662,7 @@
           sha256 = "0bvnvs17cbisymiqp96q4y2w2jqy5hd0zyk6rv7mihr9p97ak9kv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/docker-tramp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/docker-tramp";
           sha256 = "19kky80qm68n2izpjfyiy4gjywav7ljcmp101kmziklpqdldgh1w";
           name = "docker-tramp";
         };
@@ -11528,15 +11675,15 @@
     dockerfile-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dockerfile-mode";
-        version = "20151123.1057";
+        version = "20160128.1151";
         src = fetchFromGitHub {
           owner = "spotify";
           repo = "dockerfile-mode";
-          rev = "40be396417535c6721c1b13ca9f99c46192f1d73";
-          sha256 = "08pd42vv2c3l19nfib1hd7i7sy9dqwar1wfrvsnm5dkxcwlsm99j";
+          rev = "53434afa3b56eb9284d5e2c21956e43046cae1fa";
+          sha256 = "0vx7lv54v4bznn4mik4i6idb9dl7fpp3gw7nyhymbkr6hx884haw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dockerfile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dockerfile-mode";
           sha256 = "1dxvzn35a9qd3x8pjvrvb2g71yf84404g6vz81y0p353rf2zknpa";
           name = "dockerfile-mode";
         };
@@ -11549,15 +11696,15 @@
     dokuwiki-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dokuwiki-mode";
-        version = "20140130.1136";
+        version = "20160129.207";
         src = fetchFromGitHub {
           owner = "kbkbkbkb1";
           repo = "emacs-dokuwiki-mode";
-          rev = "e0cecc9551f490318e7a23ed9e0a3082c7196bc7";
-          sha256 = "104nnvp2mhsm9iwnya6k9s6mlgcg47ndshppnz0hbh556pcdyagr";
+          rev = "0e8f11572b6842b5b9d6e1a5123d988b26af04bf";
+          sha256 = "1qfmq8l4jqyrhfplsr1zd8bg9qqqwbh3mhipqzja0px0knjpqj85";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dokuwiki-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dokuwiki-mode";
           sha256 = "0q5ybyj35dyh8k0nfvbglsq3ad2apc8cdijw4wqczc5180fckgy9";
           name = "dokuwiki-mode";
         };
@@ -11578,7 +11725,7 @@
           sha256 = "1xyqsnymgdd8ic3az2lgwv7s7vld6d4pcycb234bxm4in9fixgdj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dollaro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dollaro";
           sha256 = "06kaqzb0nh8sndhk7p5n4acn5nc27dyxw3ldgcbp81wj6ipii26h";
           name = "dollaro";
         };
@@ -11609,6 +11756,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    doom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "doom";
+        version = "20160121.922";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "doom";
+          rev = "5e2d3f54e5b84eaa533cbdb6cf17b1b6009f0730";
+          sha256 = "04h1hlsc83w4dppw9m44jq7mkcpy0bblvnzrhvsh06pibjywdd73";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/doom";
+          sha256 = "098q77lix7kwpmarv26yndyk1yy1h4k3l9kaf3g7sg6ji6k7d3wl";
+          name = "doom";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/doom";
+          license = lib.licenses.free;
+        };
+      }) {};
     doremi = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "doremi";
         version = "20151231.1455";
@@ -11617,7 +11785,7 @@
           sha256 = "0201clwq9nbl8336lddcbwah8d6xipr7q8135yq79szfxq2bdg6v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/doremi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/doremi";
           sha256 = "11i4cdxgrspx44p44zz5py89ypji5li6p5w77wy0b07i8a5gq2gb";
           name = "doremi";
         };
@@ -11636,7 +11804,7 @@
           sha256 = "1m7jn80apya6s9d8phd859rq1m13xf2wz9664pqpr1p65yz2pyvl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/doremi-cmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/doremi-cmd";
           sha256 = "1qzspirn1abqps0dn5z8w6ymffc6b02dyki5hr8v74wfs8fhzx05";
           name = "doremi-cmd";
         };
@@ -11655,7 +11823,7 @@
           sha256 = "0v7ycmddh1ds64m1y5yai5nh34bd32q3wcm5y2pdzhj6jk7nj5wz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/doremi-frm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/doremi-frm";
           sha256 = "1rj3p665q32acsxxwygv1j5nbmjqrhi0b4glzrk88xki4lyz0ihz";
           name = "doremi-frm";
         };
@@ -11673,7 +11841,7 @@
           sha256 = "157kvlb4dqiyk1h7b4p0dhrr6crdakwnrxydyl6yh51w2hdnnigw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/doremi-mac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/doremi-mac";
           sha256 = "0n9fffgxnpqc7cch7aci5kxbwzk36iljdz2r8gcp5y5n1p7aamls";
           name = "doremi-mac";
         };
@@ -11691,7 +11859,7 @@
           sha256 = "0sfmcd1rq6wih9q7d9vkcfrw6gf7309mm7491jx091ij8m4p8ypp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dos";
           sha256 = "0cpijbqpci96s0d6rwqz5bbi9b0zkan1bg8vdgib1f87r7g980nc";
           name = "dos";
         };
@@ -11709,7 +11877,7 @@
           sha256 = "0xhbzq3yvfvvvl6mfihrzkd3pn5p5yxvbcyf2jhsppk7lscifsgk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dot-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dot-mode";
           sha256 = "1fik32635caq3r5f9k62qbj2dkwczz2z1v28mc7bcj7jv2p93nvh";
           name = "dot-mode";
         };
@@ -11730,7 +11898,7 @@
           sha256 = "0gc7z5ribp5yvadclq07l731m65pja00wgch4bgxsihiy7wvwknr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/download-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/download-region";
           sha256 = "1mrl2x6j708nchyh9y5avbf2cq10kpnhfj553l6akarvl5n5pvkl";
           name = "download-region";
         };
@@ -11751,7 +11919,7 @@
           sha256 = "0s7swvfd7h8r0n3cjmkps6ary9vwg61jylfm4qrkp3idsz6is548";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/downplay-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/downplay-mode";
           sha256 = "1v6nga101ljzza8qj3lkmkzzl0vvzj4lsh1m69698s8prnczxr9b";
           name = "downplay-mode";
         };
@@ -11772,7 +11940,7 @@
           sha256 = "11s4vxr6waswyx4lz3q70s8xdz0v7354sn0pfwj42mmww4pzkizs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dpaste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dpaste";
           sha256 = "17mrdkldv4gfwm6ggc047l4a69xg2fy9f9mjbphkjl0p5nr6b4kz";
           name = "dpaste";
         };
@@ -11793,7 +11961,7 @@
           sha256 = "1avpg0cgzk8d6g1q0ryx41lkcdgkm0mkzr5xr32xm28dzrfmgd4z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dpaste_de";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dpaste_de";
           sha256 = "0dql9qsl5gj51i3l2grl7nhw0ign8h4xa4jnhwn196j71c0rdwwp";
           name = "dpaste_de";
         };
@@ -11810,11 +11978,11 @@
         src = fetchFromGitHub {
           owner = "zenorocha";
           repo = "dracula-theme";
-          rev = "ee065fed126eecdfe33a1a578d9f1e20687d2f3a";
-          sha256 = "1x7hyj5qi9f222zwhwjqr98zzcvqjqfwxlglph8nsbadkv4s8c3v";
+          rev = "c158eb289d48a1b4eef3be62157df798675b172c";
+          sha256 = "1gxamb8hdrpm52541z37r6yr36n3sbj35mcasfipnwa5qryc3gxa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dracula-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dracula-theme";
           sha256 = "0ayv00wvajia8kbfrqkrkpb3qp3k70qcnqkav7am16p5kbvzp10r";
           name = "dracula-theme";
         };
@@ -11835,7 +12003,7 @@
           sha256 = "0z3w58zplm5ks195zfsaq8kwbc944p3kbzs702jgz02wcrm4c28y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/draft-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/draft-mode";
           sha256 = "1wg9cx39f4dhrykb4zx4fh0x5cfrh5aicwwfh1h3yzpc4zlr7xfh";
           name = "draft-mode";
         };
@@ -11856,7 +12024,7 @@
           sha256 = "08kkiqhfy1i6j9156gbl85jvyj592vd08qy24ng2dj0prjvap8w1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/drag-stuff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/drag-stuff";
           sha256 = "0hzbh58ijv1akamav8r0zs76pwda2zd9mjaj31ffalzhhsm5jnyc";
           name = "drag-stuff";
         };
@@ -11877,7 +12045,7 @@
           sha256 = "1yvg3w9gm5vs26qhw3xb72v9fgdhqq9w5pksiz2gj5m19l81irar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/drawille";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/drawille";
           sha256 = "01rl21hbj3hwy072yr27jl6iql331v131d3mr9zifg9v6f3jqbil";
           name = "drawille";
         };
@@ -11898,7 +12066,7 @@
           sha256 = "0lzq0mkhhj3s5yrcbs576qxkd8h0m2ikc4iplk97ddpzh4nz4127";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/drill-instructor-AZIK-force";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/drill-instructor-AZIK-force";
           sha256 = "1bb698r11m58csd2rm17fmiw691p25npphzqgjiiqbn4vx35ja7f";
           name = "drill-instructor-AZIK-force";
         };
@@ -11919,7 +12087,7 @@
           sha256 = "1s4cz5s0mw733ak9ps62fs150y3psqmb6v5s6s88jjfsi0r03c0s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dropbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dropbox";
           sha256 = "0ak6g2d2sq026ml6cmn6v1qz7sczkplgv2j9zq9zgzafihyyzs5f";
           name = "dropbox";
         };
@@ -11937,7 +12105,7 @@
           sha256 = "1szy46sk3nvlbb3yzk1s983281kkf507xr3fkclkki3d3x31n08a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dropdown-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dropdown-list";
           sha256 = "14i9w897gnb3mvnkbzhzij04bgr551r8km310mbrmzzag54w077z";
           name = "dropdown-list";
         };
@@ -11958,7 +12126,7 @@
           sha256 = "0am3n25qcfjkqfp4wjj1d2zigrmi8hg7p5sy2h91zg3blypqmpsr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/drupal-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/drupal-mode";
           sha256 = "14jvk4phq3wcff3yvhygix0c9cpbphh0dvm961i93jpsx7g9awgn";
           name = "drupal-mode";
         };
@@ -11979,7 +12147,7 @@
           sha256 = "156cscpavrp695lp8pgjg5jnq3b8n9c2h8qg8w89dd4vfkc3iikd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/drupal-spell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/drupal-spell";
           sha256 = "117rr2bfnc99g3qsr127grxwaqp54cxjaj3nl2nr6z78nja0fij3";
           name = "drupal-spell";
         };
@@ -11994,11 +12162,11 @@
         version = "20130120.1457";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1725340";
+          rev = "1728559";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dsvn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dsvn";
           sha256 = "12cviq6v08anif762a5qav3l8ircp81kmnl9q4yl6bkh9zxv7vy6";
           name = "dsvn";
         };
@@ -12019,7 +12187,7 @@
           sha256 = "1blfx3r2xd3idbfjrx44ma3x1d83xp67il2s2bmdwa8qz92z99lf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dtrace-script-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dtrace-script-mode";
           sha256 = "0v29rzlyccrc37052w2qmvjaii84jihhp736l807b0hjjfryras4";
           name = "dtrace-script-mode";
         };
@@ -12040,7 +12208,7 @@
           sha256 = "0x8c3h3jvyn2462r0sagz63vv9pr5ivfzkshr69603ibyfgqxxkp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dtrt-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dtrt-indent";
           sha256 = "1npn2jngy1wq0jpwmg1hkn8lx6ncbqsi587jl38lyp2xwchshfk5";
           name = "dtrt-indent";
         };
@@ -12061,7 +12229,7 @@
           sha256 = "0cafvhbpfqd8ajqg2757fs64kryrl2ckvbp5abldb4y8fa14pb9l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dts-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dts-mode";
           sha256 = "1k8cbiayajbzwkm0s0kyin0qpq9yhymidz0srs4hbvsnb6hvp234";
           name = "dts-mode";
         };
@@ -12082,7 +12250,7 @@
           sha256 = "1ixb78dv66lmqlbv4zl5ysvv1xqafvqh1h5cfdv03jdkqlfk34jz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ducpel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ducpel";
           sha256 = "1cqrkgg7n9bhjswnpl7yc6w6yjs4gfbliaqsimmf9z43wk2ml4pc";
           name = "ducpel";
         };
@@ -12100,7 +12268,7 @@
           sha256 = "0zq94x4br3sk6n4chrfnw7hpnsicxa02fcpk8hw1hfsaq3327n6v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dummy-h-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dummy-h-mode";
           sha256 = "1h2pm37y9kz62id0rm0zzgh1hpkhd9gvq95kjd29w0awsp9b6ca4";
           name = "dummy-h-mode";
         };
@@ -12121,7 +12289,7 @@
           sha256 = "0g72nnz0j6dvllyxyrw20z1vg6p7sy46yy0fq017pa77sgqm0xzh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dummyparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dummyparens";
           sha256 = "1yah8kpqkk9ygm73iy51fzwc8q5nw0xlwqir2qld1fc5y1lkb7dk";
           name = "dummyparens";
         };
@@ -12142,7 +12310,7 @@
           sha256 = "1qaiwm8mf4656gc1pdj8ivgy4abkjsypr52pvf4nrdkkln9qzfli";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/duplicate-thing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/duplicate-thing";
           sha256 = "1jx2b6h23dj561xhizzbpxp3av69ic8zdw4kkf0py1jm3gnrmlm4";
           name = "duplicate-thing";
         };
@@ -12162,7 +12330,7 @@
           sha256 = "0ghxnzi2iy1g633fshl9wdpg2asrcl0v5rkk61gqd6axm7fjaxcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dyalog-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dyalog-mode";
           sha256 = "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq";
           name = "dyalog-mode";
         };
@@ -12183,7 +12351,7 @@
           sha256 = "011423kvbfcd7jifg9425j89hlzmnw4j751s4mdz9wyr979k19ny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dylan-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dylan-mode";
           sha256 = "0kimvz8vmcvgxi0wvf7dqv6plj31xlksmvgip8h3bhyy7slxj3yy";
           name = "dylan-mode";
         };
@@ -12204,7 +12372,7 @@
           sha256 = "150dj1g49q9x9zx9wkymq30l5gc8c4mhsq91fm6q0yj6ip7hlfxh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dynamic-fonts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dynamic-fonts";
           sha256 = "0a210ca41maa755lv1n7hhpxp0f7lfxrxbi0x34icbkfkmijhl6q";
           name = "dynamic-fonts";
         };
@@ -12225,7 +12393,7 @@
           sha256 = "1jsjk4fkisgprn2w1d1385kbc9w1bd707biapd1y453k20q5c4h5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dynamic-ruler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dynamic-ruler";
           sha256 = "13jc3xbsyc3apkdfy0iafmsfvgqs0zfa5w8jxp7zj4dhb7pxpnmc";
           name = "dynamic-ruler";
         };
@@ -12246,7 +12414,7 @@
           sha256 = "0d18kdpw4zfbq4bkqh19cf42xlinxqa71lr2d994phaxqxqq195w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2ansi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2ansi";
           sha256 = "0ns1sldipx5kyqpi0bw79kdmhi1ry5glwxfzfx8r01hbbkf0cc94";
           name = "e2ansi";
         };
@@ -12267,7 +12435,7 @@
           sha256 = "1lx0c7s810x6prf7x1lnx412gll8nn8gqpmi56n319n406cxhnhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm";
           sha256 = "0dp360jr3fgxqywkp7g88cp02g37kw2hdsc0f70hjak9n3sy03la";
           name = "e2wm";
         };
@@ -12288,7 +12456,7 @@
           sha256 = "1g77gf24abwcvf7z52vs762s6jp978pnvza8zmzwkwfvp1mkx233";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-R";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-R";
           sha256 = "09v4fz178lch4d6m801ipclfxm2qrap5601aysnzyvc2apvyr3sh";
           name = "e2wm-R";
         };
@@ -12309,7 +12477,7 @@
           sha256 = "121vd44f42bxqvdjswmjlghf1jalbs974b6cip2i049k1n08xgh0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-bookmark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-bookmark";
           sha256 = "1myaqxzrgff5gxcn3zn1bsmyf5122ql1mwr05wamd450lq8nmbw5";
           name = "e2wm-bookmark";
         };
@@ -12330,7 +12498,7 @@
           sha256 = "09i7d2rc9zd4s3nqrhd3ggs1ykdpxf0pyhxixxw2xy0q6nbswjia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-direx";
           sha256 = "0nv8aciq0swxi9ahwc2pvk9c7i3rmlp7vrzqcan58ml0i3nm17wg";
           name = "e2wm-direx";
         };
@@ -12351,7 +12519,7 @@
           sha256 = "1vrlfzy1wynm7x4m7pl8vim7ykqd6qkcilwz7sjc1lbckz11ig0d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-pkgex4pl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-pkgex4pl";
           sha256 = "0hgdbqfw3015fr929m36kfiqqzsid6afs3222iqq0apg7gfj7jil";
           name = "e2wm-pkgex4pl";
         };
@@ -12372,7 +12540,7 @@
           sha256 = "0h1fnlpvy2mqfxjv64znghmiadh9qimj9q9a60cxhyc0bq0prz6f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-svg-clock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-svg-clock";
           sha256 = "0q02lksrbn43s8d9rzpglqybalglpi6qi9lix0cllag6i7fzcbms";
           name = "e2wm-svg-clock";
         };
@@ -12393,7 +12561,7 @@
           sha256 = "0mz43mwcgyc1c9p9b7nflnjxdxjm2nxbhl0scj6llzphikicr35g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-sww";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-sww";
           sha256 = "0x45j62cjivf9v7jp1b41yya3f9akp92md6cbv0v7bwz98g2vsk8";
           name = "e2wm-sww";
         };
@@ -12414,7 +12582,7 @@
           sha256 = "0qv3kh6q3q7vgfsd8x25x8agi3fp96dkpjnxdidkwk6k8h9n0jzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-term";
           sha256 = "0wrq06yap80a96l9l0hs7x7rng7sx6vi1hz778kknb6il4f2f45g";
           name = "e2wm-term";
         };
@@ -12435,7 +12603,7 @@
           sha256 = "09ikwg5s42b50lfj0796pa2h32larkf5j6cy042dzh8c441vgih4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-after-load";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-after-load";
           sha256 = "1mn4hpx82nifphzx71yw3rbixbgis8bhvl3iyxcgcd88n5hqwvys";
           name = "easy-after-load";
         };
@@ -12456,7 +12624,7 @@
           sha256 = "1qn0givyh07w41sv5xayfzlwbpbq7p39wbhmwsgffgfqzzz5r2ys";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-escape";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-escape";
           sha256 = "1zspb79x6s151wwiian45j1nh0xps8y8yd98byyn5lbwbj2pp2gk";
           name = "easy-escape";
         };
@@ -12477,7 +12645,7 @@
           sha256 = "0i2plbvaalapx3svryn5lrc68m0qj1xm0z577xxzq7i9z91nanq7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-kill";
           sha256 = "10jcv7a4vcnaj3wkabip2xwzcwlmvdlqkl409a9lnzfasxcpf32i";
           name = "easy-kill";
         };
@@ -12498,7 +12666,7 @@
           sha256 = "18fn9qnm0cwdy47nv6wafiy6cf7rnv4av4w8zmjwjj0n8ql4jl08";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-kill-extras";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-kill-extras";
           sha256 = "0xzlzv57nvrc142saydwfib51fyqcdzjccc1hj6xvgcdbwadlnjy";
           name = "easy-kill-extras";
         };
@@ -12519,7 +12687,7 @@
           sha256 = "0qpabig0qrkyhhiifjpq9a7qv7h3nlqmpz79xy8lk58xy6rj0zk0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-lentic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-lentic";
           sha256 = "1j141lncgcgfpa42m505xndiy6lh848xymfvb3cz4d6h73421khg";
           name = "easy-lentic";
         };
@@ -12540,7 +12708,7 @@
           sha256 = "18bm5ns1qrxq0rrz9sylshr62wkymh1m6b7ch2y74f8rcwdwjgnq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-repeat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-repeat";
           sha256 = "1vx57gpw0nbxh976s18va4ali1nqxqffhaxv1c5rhf4pwlk2fa06";
           name = "easy-repeat";
         };
@@ -12553,15 +12721,15 @@
     ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "ebal";
-        version = "20151211.15";
+        version = "20160122.607";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "ebal";
-          rev = "ef0a288d9b6e557532d772c146ff02aa82771f13";
-          sha256 = "0l2nhf6m6m01y2gw1fkn3zsjvmm1w02qj9zp4nmhgdl0qkllhdz5";
+          rev = "4d2ffa7ffbdfd6ee8a39a268e7c7c0de0905df6b";
+          sha256 = "0ysym38xaqyx1wc7xd3fvjm62dmiq4727dnjvyxv7hs4czff1gcb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ebal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ebal";
           sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg";
           name = "ebal";
         };
@@ -12574,15 +12742,15 @@
     ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }:
     melpaBuild {
         pname = "ebib";
-        version = "20160115.1735";
+        version = "20160125.1621";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "b89f58493b6b544ddd80a6eea433987aa5c92b50";
-          sha256 = "03v17vbfdsv1rf3ja9k1d6mb338f8531w76f7rk5c7jyhlxi4ipl";
+          rev = "edb289c39e1ccc9f7277b852527bc665e4912cd5";
+          sha256 = "0grm2kskwms97w8jyp3ybfhrs2ynss0825knkw2x2wbdl8sg87lv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ebib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ebib";
           sha256 = "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid";
           name = "ebib";
         };
@@ -12603,7 +12771,7 @@
           sha256 = "1hs069m4m6vhb37ac2x6hzbp9mfmpd3zhp4m631lx8dlmx11rydz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ecb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ecb";
           sha256 = "097hdskhfh255znrqamcssx4ns1sgkxchlbc7pjqwzpflsi0fx89";
           name = "ecb";
         };
@@ -12621,7 +12789,7 @@
           sha256 = "0jk7pb2sr4qbxwcn4ipcjc9phl9zjmgg8sf91qj113112xx7vvxa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/echo-bell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/echo-bell";
           sha256 = "0adhdfbcpmdhd9252rh0jik2z3v9bzf0brpzfvcjn5py2x6724ws";
           name = "echo-bell";
         };
@@ -12642,7 +12810,7 @@
           sha256 = "1vxa6d8kp4h1havr9cq7zqgqm1xsjxhbgbi4hvi842ma6xwh4m5w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eclipse-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eclipse-theme";
           sha256 = "0mww0jysxqky1zkkhvhj7fn20w970n2w6501rdm5jwqfb58ivxfx";
           name = "eclipse-theme";
         };
@@ -12663,7 +12831,7 @@
           sha256 = "0h6vh719ai0cxyja6wpfi6m76d42vskj56wg666j0h6j0qw6h3i2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ecukes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ecukes";
           sha256 = "0ava8hrc7r1mzv6xgbrb84qak5xrf6fj8g9qr4i4g0cr7843nrw0";
           name = "ecukes";
         };
@@ -12684,7 +12852,7 @@
           sha256 = "1x5y1d5crc48iddlsf6irkr017p32a9xjcmlm9wf3zggmr95fr3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edbi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edbi";
           sha256 = "0qq0j16n8lyvkqqlcsrq1m7r7f0in6b92d74mpx5c6siv6z2vxlr";
           name = "edbi";
         };
@@ -12705,7 +12873,7 @@
           sha256 = "1l5lkdgcy1z6fkjh3zrhf0f4f26bzhpqy33ak1xacvm9fyf54s2x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edbi-database-url";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edbi-database-url";
           sha256 = "018rxijmy0lvisy281d501ra9lnh5xi0wmvz5avbjpb0fi4q1zdn";
           name = "edbi-database-url";
         };
@@ -12722,11 +12890,11 @@
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "edbi-django";
-          rev = "9cdf6d7a45402d41551c1e17edd7a29a8520f102";
-          sha256 = "0jlr1da26jkrgadaznxjynjqbg4cpnq7gda3qab2qqrjzzi8cfia";
+          rev = "e6c786aac7b3db9552d9e0d8f46413ffae8c34af";
+          sha256 = "0m08ijhlmsvxcf21jb7qmqq0bsgzv2jkm6b0x8s2mzmrzavfmggj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edbi-django";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edbi-django";
           sha256 = "1s59hab35hwnspyklxbhi0js0sgdn0rc7y33dqjk0psjcikqymg1";
           name = "edbi-django";
         };
@@ -12747,7 +12915,7 @@
           sha256 = "1lndz0qlmjvi9r2f1yzw217b971ym5jzfrddcd6rind1asrzl32a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edbi-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edbi-minor-mode";
           sha256 = "0p7vdf9cp6i7mhjxj82670pfflf1kacalmakb7ssgigs1nsf3spi";
           name = "edbi-minor-mode";
         };
@@ -12768,7 +12936,7 @@
           sha256 = "0xnaj2f9zvnc6abjkaa23j6ga4anmq676aplws0n01y7qz6w0xk8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edbi-sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edbi-sqlite";
           sha256 = "1w53ypz3pdqaml3vq9j3f1w443n8s9hb2ys090kxvjqnb8x8v44y";
           name = "edbi-sqlite";
         };
@@ -12789,7 +12957,7 @@
           sha256 = "1cfjw9b1lm29s5cbh0qqmkchbq2382s71w4rpb0gyf603s0yg13m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ede-compdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ede-compdb";
           sha256 = "1ypi7rxbgg2qck1b571hcw5m4ipllb48g6sindpdf180kbfbfpn7";
           name = "ede-compdb";
         };
@@ -12810,7 +12978,7 @@
           sha256 = "1zgiifi1k2d9g8sarfpjzamk8g1yx4ilgn60mqhy2pznp30b5qb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edebug-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edebug-x";
           sha256 = "0mzrip6y346mix4ny1xj8rkji1w531ix24k3cczmlmm4hm7l29ql";
           name = "edebug-x";
         };
@@ -12831,7 +12999,7 @@
           sha256 = "0crwdgng377sy1zbq7kqkz24v697mlzgdsvkdp1m8r7ympikkj6w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-at-point";
           sha256 = "0sn5a644zm165li44yffcpcai8bhl3yfvqcljghlwaa0w45sc9im";
           name = "edit-at-point";
         };
@@ -12852,7 +13020,7 @@
           sha256 = "0vk954f44m2bq7qb122pzlb8fibrisx47ihvn3h96m8nmx0fv32r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-color-stamp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-color-stamp";
           sha256 = "1f8v8w3w7vb8jv29w06mplah8yfcs5qfjz2w4irv0rg7dwzy3zk8";
           name = "edit-color-stamp";
         };
@@ -12873,7 +13041,7 @@
           sha256 = "10c84aad1lnr7z9f75k5ylgchykr3srcdmn88hlcx2n2c4jfbkds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-indirect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-indirect";
           sha256 = "0q5jjmrvx5kaajllmhaxihsab2kr1vmcsfqrhxdhw3x3nf41s439";
           name = "edit-indirect";
         };
@@ -12894,7 +13062,7 @@
           sha256 = "0981hy1n50yizc3k06vbxqrpfml817a67kab1hkgkw5v6ymm1hc9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-list";
           sha256 = "0mi12jfgx06i0yr8k5nk80xryqszjv0xykdnri505862rb90xakv";
           name = "edit-list";
         };
@@ -12915,7 +13083,7 @@
           sha256 = "0ssmhwg4wfh5cxgqv8bl55449204h4zi863m7jhvas4c9zq005kd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-server";
           sha256 = "0ffxcgmnz0f2c1i3vfwm8vlm6jyd7ibf4kq5z8c6n50zkwfdmns0";
           name = "edit-server";
         };
@@ -12936,7 +13104,7 @@
           sha256 = "174xq45xc632zrb916aw7q4bch96pbi6zgy3dk77qla3ky9cfpl3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-server-htmlize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-server-htmlize";
           sha256 = "007lv3698a88wxan7kplz2117azxxpzzgshin9c1aabg059hszlj";
           name = "edit-server-htmlize";
         };
@@ -12949,15 +13117,15 @@
     editorconfig = callPackage ({ editorconfig-core, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig";
-        version = "20160116.2341";
+        version = "20160204.12";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "765797d42784f15d207b5a4bfddce780eae2fbb3";
-          sha256 = "0002i69r4cpka73b8mvnkvh4lpyrrrnj07aq0zs0v62b3xlci22y";
+          rev = "6fcae90cbe88f98ccc6b152f04cc6d2ffaaab288";
+          sha256 = "17qvr9gqd4mkn0lzpxvijhwg1cbrqkqg4l9wnidbxa1wfzsr9mrd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/editorconfig";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/editorconfig";
           sha256 = "0na5lfi9bs4k1q73pph3ff0v8k8vzrfpzh47chyzk8nxsmvklw35";
           name = "editorconfig";
         };
@@ -12970,15 +13138,15 @@
     editorconfig-core = callPackage ({ cl-lib ? null, editorconfig-fnmatch, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig-core";
-        version = "20160116.2341";
+        version = "20160127.35";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "765797d42784f15d207b5a4bfddce780eae2fbb3";
-          sha256 = "0002i69r4cpka73b8mvnkvh4lpyrrrnj07aq0zs0v62b3xlci22y";
+          rev = "6fcae90cbe88f98ccc6b152f04cc6d2ffaaab288";
+          sha256 = "17qvr9gqd4mkn0lzpxvijhwg1cbrqkqg4l9wnidbxa1wfzsr9mrd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/editorconfig-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/editorconfig-core";
           sha256 = "18d7byqkxn6lyw3nqsvqs5vyj9alh9wjd2mim44a3zcc9r2j061r";
           name = "editorconfig-core";
         };
@@ -12991,15 +13159,15 @@
     editorconfig-fnmatch = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig-fnmatch";
-        version = "20160116.2341";
+        version = "20160127.35";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "765797d42784f15d207b5a4bfddce780eae2fbb3";
-          sha256 = "0002i69r4cpka73b8mvnkvh4lpyrrrnj07aq0zs0v62b3xlci22y";
+          rev = "6fcae90cbe88f98ccc6b152f04cc6d2ffaaab288";
+          sha256 = "17qvr9gqd4mkn0lzpxvijhwg1cbrqkqg4l9wnidbxa1wfzsr9mrd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/editorconfig-fnmatch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/editorconfig-fnmatch";
           sha256 = "0ji243vrw527jc3alsgmqi9rdnslxyq48zzx33rbpkqcjssm11iv";
           name = "editorconfig-fnmatch";
         };
@@ -13020,7 +13188,7 @@
           sha256 = "107ljwqibnd247h4iyav37y75zcgl0j2yav09s38kl3nbxmaad2y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edn";
           sha256 = "00cy8axhy2p3zalzl8k2083l5a7s3aswb9qfk9wsmf678m8pqwqg";
           name = "edn";
         };
@@ -13041,7 +13209,7 @@
           sha256 = "0vsrcvrd02nx647gxp65r548qlxg50w73dy0rs1lxwy6mdgp0npv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edts";
           sha256 = "0f0rbd0mqqwn743qmr1g5mmi1sbmlcglclww8jxvbvb61jq8vspr";
           name = "edts";
         };
@@ -13071,7 +13239,7 @@
           sha256 = "1c2iyv392ap35nss4j901h33d3lx9lmq5v43flf2rid1766pam6v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/efire";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/efire";
           sha256 = "1c8vdc58i0k7vvanwhckfc31226d3rb5xq77lh9ydgnd4i97gq2w";
           name = "efire";
         };
@@ -13092,7 +13260,7 @@
           sha256 = "1l9p8nairqr3ym5ydy0rwczcmkx2jq9b2g9r0r96n0vnjpybk6q2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/egg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/egg";
           sha256 = "144g1fvs2cmn3px0a98nvxl5cz70kx30v936k5ppyi8gvbj0md5i";
           name = "egg";
         };
@@ -13109,11 +13277,11 @@
         src = fetchFromGitHub {
           owner = "egisatoshi";
           repo = "egison3";
-          rev = "dbb8773f8a47655f3b5311e0a87f63c7b39f60db";
-          sha256 = "0sz506yx59gjkphyi3fp07i8h0mkm7gr73xfbjdhn29dss0xl7x0";
+          rev = "bea1bf82ae9c3c22e1303a34496ce8132f722b3e";
+          sha256 = "1s9anqlby0ikaal0i9vg8dkn4n0fhnqy1war4lx35qkmg3dg1m33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/egison-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/egison-mode";
           sha256 = "0x11fhv8kkx34h831k2q70y5qfz7wnfia4ka5mbmps7mpr68zcwi";
           name = "egison-mode";
         };
@@ -13132,7 +13300,7 @@
           sha256 = "3f41ade3332a3f1dc5cfb0b33077396feb7b683b2cf2c235b7a5f07f0b2e3271";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eide";
           sha256 = "16cf32n2l4wy1px7fm6x4vxx7pbqdp7zh2jn3bymg0b40i2321sz";
           name = "eide";
         };
@@ -13150,7 +13318,7 @@
           sha256 = "024qyipwlj3g0fff06cgq357blkh3hyr14vpmkqsv15x6gb9snir";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eimp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eimp";
           sha256 = "11z23kx89yy03hzs1xlbcih70lsp2lplxs8nkc8jvfcpsjwypsl0";
           name = "eimp";
         };
@@ -13160,22 +13328,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ein = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
+    ein = callPackage ({ cl-generic, fetchFromGitHub, fetchurl, lib, melpaBuild, request, websocket }:
     melpaBuild {
         pname = "ein";
-        version = "20160114.1641";
+        version = "20160203.2226";
         src = fetchFromGitHub {
           owner = "millejoh";
           repo = "emacs-ipython-notebook";
-          rev = "6d66cc5a2efedf614b62f012fad2023c8b95189c";
-          sha256 = "1003gavr7bbsff256k2wickbvlr6xflwl6msdipxjdww66wa3gsh";
+          rev = "261576f94bb6eddc566c9d7aa557bf7cd20a2c05";
+          sha256 = "05nvfjslfwzr54m1h2xjq3icd29khxpy0mka5r05gmlj3xzhkldv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ein";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ein";
           sha256 = "1nksj1cpf4d9brr3rb80bgp2x05qdq9xmlp8mwbic1s27mw80bpp";
           name = "ein";
         };
-        packageRequires = [ request websocket ];
+        packageRequires = [ cl-generic request websocket ];
         meta = {
           homepage = "http://melpa.org/#/ein";
           license = lib.licenses.free;
@@ -13192,7 +13360,7 @@
           sha256 = "1w0b3giy9ca35pp2ni4afnqas64a2vriilab7jiw9anp3ryh6570";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ein-mumamo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ein-mumamo";
           sha256 = "029sk90xz9fhv2s56f5hp0aks1d6ybz517009vv4892bbzkpjv1w";
           name = "ein-mumamo";
         };
@@ -13213,7 +13381,7 @@
           sha256 = "0dbp2zz993cm7mrd58c4iflbzqwg50wzgn2cpwfivk14w1mznh4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-autoyas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-autoyas";
           sha256 = "0hh5j79f3z82nmb3kqry8k8lgc1qswk6ni3g9jg60pasc3wkbh6c";
           name = "el-autoyas";
         };
@@ -13230,11 +13398,11 @@
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "6b10697216f2de7fc836452a29d13ef4182ae3e1";
-          sha256 = "06b3ma4chsjpzwwxfy9as7sanvlpp1j4fsmxpaphjv2d8gvw98zn";
+          rev = "415817cafc576c917b2459c2d29b6acf21d6ad53";
+          sha256 = "1fl3846f70v3niklz5qsi6w1fgp0ga9vq2b712k8gikdkk1rf1i9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-get";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-get";
           sha256 = "1438v2sw5n67q404c93y2py226v469nagqwp4w9l6yyy40h4myhz";
           name = "el-get";
         };
@@ -13255,7 +13423,7 @@
           sha256 = "140afbksvm1kvam7pyaibay8rqhfhmb22rrh39mvdnqskqfnlqgr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-init";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-init";
           sha256 = "121n6z8p9kzi7axp4i2kyi621gw20635w4j81i1bryblaqrv5kl5";
           name = "el-init";
         };
@@ -13276,7 +13444,7 @@
           sha256 = "13cc7nnslij28fa1469s9pfmnz8j0m6bayhrqxckd0xplvwwipnx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-init-viewer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-init-viewer";
           sha256 = "0kkmsml9xf2n8nlrcicfg2l78s3dlhd6ssx0s62v77v4wdpl297m";
           name = "el-init-viewer";
         };
@@ -13297,7 +13465,7 @@
           sha256 = "1jiq2hpym3wpk80zsl4lffpv4kgkykc2zp08sb01wa7pl8d1knmm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-mock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-mock";
           sha256 = "07m7w7n202nijnxidy0j0r4nbcvlnbkm9b0n8qb2bwi3d4cfp77l";
           name = "el-mock";
         };
@@ -13318,7 +13486,7 @@
           sha256 = "1iykhicc1ic1r6h4vj3701rm0vfy41b16w3d98amf8jjypv54wv7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-pocket";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-pocket";
           sha256 = "0fgylpfixsx5l1nrgz6n1c2ayf52p60f9q290hmkn36siyx5hixw";
           name = "el-pocket";
         };
@@ -13339,7 +13507,7 @@
           sha256 = "1lsq7980pwcwlg7z37hrig8ddm9nyvaqrlczv1w0vy631vc5z2az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-spec";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-spec";
           sha256 = "017syizs8qw5phwvpzzffzdnj6rh9q4n7s51qjvj8qfb3088igkh";
           name = "el-spec";
         };
@@ -13360,7 +13528,7 @@
           sha256 = "1sba405h1sy5vxg4ki631p4979gyaqv8wnwbgca5jp2pm8l3viri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-spice";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-spice";
           sha256 = "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg";
           name = "el-spice";
         };
@@ -13381,7 +13549,7 @@
           sha256 = "04k1fz0ypmfzgwamncp2vz0lq54bq6y7c8k9nm39csp2564vmbbc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-sprunge";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-sprunge";
           sha256 = "0rb1cr7zrfl1s5prxy3xwdqgnm8ddw33pcvk049km2qbccb08v6a";
           name = "el-sprunge";
         };
@@ -13402,7 +13570,7 @@
           sha256 = "016l3inzb7dby0w58najj2pvymwk6gllsxvqj2fkz3599i36p1pn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-spy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-spy";
           sha256 = "1bgv4mgsnkmjdyay7lhkqdszvnwpjy4dxxw11kq45w866ba8645n";
           name = "el-spy";
         };
@@ -13420,7 +13588,7 @@
           sha256 = "1g2jhm9m5qcj6a231n5ch6b8bqwzq3kj275nd4s89p89v1252qhn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-swank-fuzzy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-swank-fuzzy";
           sha256 = "1m7y4c0r1w8ndmr1wgc2llrbfawbbxnvcvgjpsckb3704s87yxr1";
           name = "el-swank-fuzzy";
         };
@@ -13441,7 +13609,7 @@
           sha256 = "1i6j44ssxm1xdg0mf91nh1lnprwsaxsx8vsrf720nan7mfr283h5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-x";
           sha256 = "1721d9mljlcbdwb5b9934q7a48y30x6706pp4bjvgys0r64dml5g";
           name = "el-x";
         };
@@ -13462,7 +13630,7 @@
           sha256 = "03xlxx57z1id9mr7afkvf77m2f9rrknrm1380p51vka84v2hl3mh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el2markdown";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el2markdown";
           sha256 = "1a52qm0jrcvvpb01blr5l7apaxqn4bvhkgha53cr48rdkmmq318g";
           name = "el2markdown";
         };
@@ -13483,7 +13651,7 @@
           sha256 = "1wikmzl9gi72h6fxawj0h20828n4vypw9rrv35kqnl4gfrdmxzkk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elang";
           sha256 = "0frhn3hm8351qzljicpzars28af1fghgv45717ml79rwb4vi6yiy";
           name = "elang";
         };
@@ -13504,7 +13672,7 @@
           sha256 = "0vppa9xihn8777rphiw1aqp96xn16vgjwff1dwvp8z861silp8ar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eldoc-eval";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eldoc-eval";
           sha256 = "0z4scgi2xgrgd47aqqmyv1ww8alh43s0qny5qmh3f1nnppz3nd7c";
           name = "eldoc-eval";
         };
@@ -13522,7 +13690,7 @@
           sha256 = "13ncpp3hrwk0h030c5nnm2zfiingilr5b876jsf2wxmylg57nbch";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eldoc-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eldoc-extension";
           sha256 = "0azkdx4ncjhb7qyhyg1a5pxgqqf2z1wq9iz802j0nxxnjzh9ny24";
           name = "eldoc-extension";
         };
@@ -13543,7 +13711,7 @@
           sha256 = "0s4y1319sr4xc0k6h2zhzzxsx2kc3pc2m6saah18y4kip0hjyhr8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/electric-case";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/electric-case";
           sha256 = "11mab7799kxs3w47srmds5prmwh6ldxzial9kqbqy33vybpkprmd";
           name = "electric-case";
         };
@@ -13556,15 +13724,15 @@
     electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
     melpaBuild {
         pname = "electric-operator";
-        version = "20160116.814";
+        version = "20160122.213";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "electric-operator";
-          rev = "6c2c8e3e1bb25e6b4f1cf78a2e4bc327b99a5579";
-          sha256 = "1kzg7axqdwi9s4gzcz7iyw8mw5jm9i4slijk1x398cskwrijfh9h";
+          rev = "4c2f271f89e59a8cc28b447daaf80f1b73db5bb9";
+          sha256 = "0qbljvc1y39h6571xqjg4xyah0xwkv0qxx619x9frxlvlh83y4xc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/electric-operator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/electric-operator";
           sha256 = "043bkpvvk42lmkll5jnz4q8i0m44y4wdxvkz6hiqhqcp1rv03nw2";
           name = "electric-operator";
         };
@@ -13585,7 +13753,7 @@
           sha256 = "0q1pb01h48wdbjgi04a6ck2jn7yfh92wpq1vka5pg54wv2k9b5fn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/electric-spacing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/electric-spacing";
           sha256 = "0fcsz9wmibqp6ci0pa5r4gzlrsyj5klajxpgfksa0nfj3dc94cvg";
           name = "electric-spacing";
         };
@@ -13606,7 +13774,7 @@
           sha256 = "1ijrhm9vrzh5wl1rr9ayl11dwm05bh1i43fnbz3ga58l6whgkfpw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elein";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elein";
           sha256 = "0af263zq4xxaxhpypn769q8h1dla0ygpnd6l8xc13zlni6jjwdsg";
           name = "elein";
         };
@@ -13619,15 +13787,15 @@
     elfeed = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elfeed";
-        version = "20151227.1117";
+        version = "20160127.1930";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "2f84bb271559e8363286c5fcfd70246940058709";
-          sha256 = "1a3mwn0k6ib4sg63nhl29vsh0ji30zcyfcji161zfan6v5asrg8v";
+          rev = "75deddd0de79c66b2f50aa3d32a7b7a3a352966d";
+          sha256 = "1c3xwjzln5grxp7cci2mmly73mzl02f8wjm4hbd9napx72wjcxiy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elfeed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elfeed";
           sha256 = "1psga7fcjk2b8xjg10fndp9l0ib72l5ggf43gxp62i4lxixzv8f9";
           name = "elfeed";
         };
@@ -13648,7 +13816,7 @@
           sha256 = "1r2liqjww0yscxjpg13dsfhhv3yjahlbas0dabqlh4f9q0jdrgj4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elfeed-goodies";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elfeed-goodies";
           sha256 = "0zpk6nx757hasgzcww90fzkcdn078my33p7yax7xslvi4msm37bi";
           name = "elfeed-goodies";
         };
@@ -13676,7 +13844,7 @@
           sha256 = "0cp8sbhym83db88ii7gyab6iqxppinjlrkzb9627gq7xgb5mqj5j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elfeed-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elfeed-org";
           sha256 = "0xf2r5ca3gnx2cv9f8rr4s1hds2ggqsbllvfr229gznkcqjnglik";
           name = "elfeed-org";
         };
@@ -13693,11 +13861,11 @@
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "elfeed";
-          rev = "2f84bb271559e8363286c5fcfd70246940058709";
-          sha256 = "1a3mwn0k6ib4sg63nhl29vsh0ji30zcyfcji161zfan6v5asrg8v";
+          rev = "75deddd0de79c66b2f50aa3d32a7b7a3a352966d";
+          sha256 = "1c3xwjzln5grxp7cci2mmly73mzl02f8wjm4hbd9napx72wjcxiy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elfeed-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elfeed-web";
           sha256 = "14ydwvjjc6wbhkj4g4xdh0c3nh4asqsz8ln7my5vjib881vmaq1n";
           name = "elfeed-web";
         };
@@ -13718,7 +13886,7 @@
           sha256 = "0rdhnnyn0xsmnshnf289kxk974r57i6nx0vii1w36j6p6q0b7f9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elhome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elhome";
           sha256 = "1k7936wxgslr29511dz9az38i9vi35rcxk68gzv35v9lpj89lalh";
           name = "elhome";
         };
@@ -13736,7 +13904,7 @@
           sha256 = "0khc3gacw27aw9pkfrnla9844lqbspgm0hrz7q0h5nr73d9pnc02";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elisp-depend";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elisp-depend";
           sha256 = "08zxzvj60v23b7d5q0hvgffm1jxq7lc5y9w22m6nv2fp29yadyiy";
           name = "elisp-depend";
         };
@@ -13757,7 +13925,7 @@
           sha256 = "1ci6nyk1vvb3wgxzarbf6448i9rjb74zzrhcmls634gfxbryxdyy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elisp-lint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elisp-lint";
           sha256 = "102hrxdw72bm11a29i15g09lv7jlnd7vkv7292fm3mcxf5f4hkw9";
           name = "elisp-lint";
         };
@@ -13778,7 +13946,7 @@
           sha256 = "168ljhscqyvp24lw70ylv4a3c0y51sx4f66lfahbs7zpjvwf25x0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elisp-sandbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elisp-sandbox";
           sha256 = "1bazm1cf9ghh9b7jzqqgyfcalnrfg7vmxqbn4fiy2c76gbzlr2bp";
           name = "elisp-sandbox";
         };
@@ -13788,22 +13956,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    elisp-slime-nav = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    elisp-slime-nav = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elisp-slime-nav";
-        version = "20150805.1448";
+        version = "20160128.1309";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "elisp-slime-nav";
-          rev = "f6d241b11abbc4064e17e02dbd0bc6c61db256cc";
-          sha256 = "184yxv2qhqc2g5v259kprihppvcwsd52idjay2c01lkmk1i3qnj5";
+          rev = "0e96d9f1f0d334f09414b509d44d5c000b51f432";
+          sha256 = "11vyy0bvzbs1h1kggikrvhd658j7c730w0pdp6qkm60rigvfi1ih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elisp-slime-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elisp-slime-nav";
           sha256 = "009zgp68i4naprpjr8lcp06lh3i5ickn0nh0lgvrqs0niprnzh8c";
           name = "elisp-slime-nav";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "http://melpa.org/#/elisp-slime-nav";
           license = lib.licenses.free;
@@ -13820,7 +13988,7 @@
           sha256 = "18dhijvgnx2hr9vnprcc1fl0k49bb3lpnghrqbkf7fj599kcjl7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elixir-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elixir-mode";
           sha256 = "1dba3jfg210i2rw8qy866396xn2xjgmbcyl006d6fibpr3j4lxaf";
           name = "elixir-mode";
         };
@@ -13841,7 +14009,7 @@
           sha256 = "1sdq4372i19wdxpdp3347a1rf5zf5w6sa0da6lr511m7ri0lj6hd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elixir-yasnippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elixir-yasnippets";
           sha256 = "0927znqd9j91wc51hdwcl2rxb66i1h549nyr1h39r13353gbwk3a";
           name = "elixir-yasnippets";
         };
@@ -13854,15 +14022,15 @@
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "20160117.458";
+        version = "20160204.128";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "6796f031bd1452a9a1c474152df7720f4e700f38";
-          sha256 = "035awxgwj8jy6c4ihfqwvjhqpg3i00qshrslhggyclab9i784axw";
+          rev = "61671af42d2162b06ee06b4857bc4a63bf82a57b";
+          sha256 = "0cjxvmsfjki8zal31zbf4ynf7i0gy5vykpq6858qpa68vkd1p0iz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elm-mode";
           sha256 = "1gw9szkyr1spcx7qijddhxlm36h0hmfd53b4yzp1336yx44mlnd1";
           name = "elm-mode";
         };
@@ -13883,7 +14051,7 @@
           sha256 = "181hcyg5v62nxrgmb7pl9672rm9fy8crc4lqhdwvdvd7ngki1fiz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elmacro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elmacro";
           sha256 = "0644rgwawivrq1shsjx1x2p53z7jgr6bxqgn2smzql8pp6azy7xz";
           name = "elmacro";
         };
@@ -13904,7 +14072,7 @@
           sha256 = "1463y4zc6yabd30k6806yw0am18fjv0bkxm56p2siqrwn9pbsh8k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elmine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elmine";
           sha256 = "1gi94dyz9x50swkvryd4vj36rqgz4s58nrb4h4vwwviiiqmc8fvz";
           name = "elmine";
         };
@@ -13925,7 +14093,7 @@
           sha256 = "0p3cj5vgka388i4dk9r7bx8pv8mywnfij9ahgqak5jlsddflh8hw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elnode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elnode";
           sha256 = "0piy5gy9a7c8s10b99fmdyh6glhvjvdyrz0x2bv30h7wplx5szi6";
           name = "elnode";
         };
@@ -13946,7 +14114,7 @@
           sha256 = "19yvhyg34w1idsh712cahmcy1pzbxcipw9j6xk567lvkqkinqg7s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elog";
           sha256 = "0hixsi60nf0khm9xmya3saf95ahn1gydp0l5wxawsc491qwg4vqd";
           name = "elog";
         };
@@ -13967,7 +14135,7 @@
           sha256 = "1jcr8bxffvnfs0ym6zkgs79hd6a0m81r4x4jr3v5l9zwxw04sy15";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elogcat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elogcat";
           sha256 = "0sqdqlpg4firswr742nrb6b8sz3bpijf6pbxvandq3ddpm0rx9ia";
           name = "elogcat";
         };
@@ -13988,7 +14156,7 @@
           sha256 = "1dadf24x6v1vk57bp6w0g2dysigy5cqjzwldc8dn129f4pfrhipy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elpa-audit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elpa-audit";
           sha256 = "0l8har14zrlh9kdkh9vlmkmzg49vb0r8j1wnznryaidalvk84a52";
           name = "elpa-audit";
         };
@@ -14009,7 +14177,7 @@
           sha256 = "1hjmvn3kls63alh0ihb5c8gf90lrfvq1hxrlf4162qiaa0s15f8a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elpa-mirror";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elpa-mirror";
           sha256 = "1jnviav2ybr13cgllg26kfjrwrl25adggnqiiwyjwgbbzxfycah8";
           name = "elpa-mirror";
         };
@@ -14022,15 +14190,15 @@
     elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "20151101.601";
+        version = "20160131.318";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "96fa05708629600fd79c4b0fcafe63ec97f5ce07";
-          sha256 = "0kzara7r6gvgf3p06xswxbhq01dbhmwx1pldx3mmv7knvm2mdxq8";
+          rev = "d4cd394236d1d148dcabd5048bd30961687627da";
+          sha256 = "1xjm9b32a9nfzvphj6vm0dqcr4i072zcx29kcgiyyni8zbgbwmwv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elpy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elpy";
           sha256 = "051irp7k0cp1hqp3hzrmapllf2iim7cq0iz38489g4fkh2ybk709";
           name = "elpy";
         };
@@ -14057,7 +14225,7 @@
           sha256 = "055kam18k4ni1zw3310cpsvdnrp62d579r30lq67ig2lq3yxzc1m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elscreen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elscreen";
           sha256 = "1mlqbw14ilk6d3ba38kfw50pnlhb9f6sm5hy9dw58gp59siark5s";
           name = "elscreen";
         };
@@ -14078,7 +14246,7 @@
           sha256 = "0bbashrqpyhs282w5i15rzravvj0fjnydbh9vfnfnfnk8a9sssxz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elscreen-buffer-group";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elscreen-buffer-group";
           sha256 = "1clmhpk9zp6hsgz6a4jpmbrr9fr6k8b324s0x61n5yi4yzgdmc0v";
           name = "elscreen-buffer-group";
         };
@@ -14099,7 +14267,7 @@
           sha256 = "091dxsb73bhqmrddwnmvblmfpwa7v7fa0ha18daxc8j0lrhzdhlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elscreen-mew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elscreen-mew";
           sha256 = "06g4wcfjs036nn64ac0zsvr08cfmak2hyj83y7a0r35yxr1853w4";
           name = "elscreen-mew";
         };
@@ -14120,7 +14288,7 @@
           sha256 = "1cninrbgxzg0gykkpjx0i8pk2yc7sgr2kliqd35lgcxz2q4jlr51";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elscreen-multi-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elscreen-multi-term";
           sha256 = "1zwrzblkag1d18xz450b7khsdssvsxyl1x6a682vy0dkn1y5qh1n";
           name = "elscreen-multi-term";
         };
@@ -14141,7 +14309,7 @@
           sha256 = "06g7fl2c7cvwsrgi462wf6j13ny56y6zvgkizz9f256xjjq77ymf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elscreen-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elscreen-persist";
           sha256 = "1rjfvpsx0y5l9b76wa1ilj5lx39jd0m78nb1a4bqn81z0rkfpl4k";
           name = "elscreen-persist";
         };
@@ -14162,7 +14330,7 @@
           sha256 = "1w34nnl4zalxzmyfbc81qd82m7qp3zvz608dx6hfi44pjz0dp36f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elscreen-separate-buffer-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elscreen-separate-buffer-list";
           sha256 = "1d8kc137cd8i3wglir1rlvk7w8mrdhd3xvcihi2f2f2g5nh2n5jk";
           name = "elscreen-separate-buffer-list";
         };
@@ -14183,7 +14351,7 @@
           sha256 = "1k7npf93xbmrsq607x8zlgrpzqvplgia3ixz5w1lr1jlv1m2m8x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elwm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elwm";
           sha256 = "0rf663ih3lfg4n4pj4dpp133967zha5m1wr46riaxpha7xr59al9";
           name = "elwm";
         };
@@ -14204,7 +14372,7 @@
           sha256 = "1mchc4d61li5gfsf05dwhgb694fjj9hljnbvwvc12c1iik0zavq0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elx";
           sha256 = "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x";
           name = "elx";
         };
@@ -14225,7 +14393,7 @@
           sha256 = "171xgznpgvwl03kzqa9nbpvj3mfznnf050pl2wih390nk5djpg12";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacs-eclim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacs-eclim";
           sha256 = "1l55jhz5mb3bqw90cbf4jhcqgwj962br706qhm2wn5i2a1mg8xlv";
           name = "emacs-eclim";
         };
@@ -14246,7 +14414,7 @@
           sha256 = "15l3ab11vcmzqibkd6h5zqw5a83k8dmgcp4n26px29c0gv6bkpy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacs-setup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacs-setup";
           sha256 = "1x4rh8vx6fsb2d6dz2g9j6jamin1vmpppwy3yzbl1dnf7w4hx4kh";
           name = "emacs-setup";
         };
@@ -14267,7 +14435,7 @@
           sha256 = "0ciqxyahlzaxq854jm25zbrbmrhcaj5csdhxa0az9crwha8wkmw2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsagist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsagist";
           sha256 = "1cyz7nf0zxa21979jf5kdmkgwiyd17vsmpcmrw1af37ly27l8l64";
           name = "emacsagist";
         };
@@ -14288,7 +14456,7 @@
           sha256 = "1rqr08gj07hw37mqd0flmq4a10wn16vy7wg0msqq0ab2smwjhns7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsc";
           sha256 = "1fbf9al3yds0il18jz6hbpj1fsjlpb1kgp450gb6r09lc46x77mk";
           name = "emacsc";
         };
@@ -14309,7 +14477,7 @@
           sha256 = "0ld5qpl7b3iksgxcfysznf88wj019l5271kdz4nalqi4kchf5xad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsql";
           sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax";
           name = "emacsql";
         };
@@ -14330,7 +14498,7 @@
           sha256 = "0ld5qpl7b3iksgxcfysznf88wj019l5271kdz4nalqi4kchf5xad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsql-mysql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsql-mysql";
           sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy";
           name = "emacsql-mysql";
         };
@@ -14351,7 +14519,7 @@
           sha256 = "0ld5qpl7b3iksgxcfysznf88wj019l5271kdz4nalqi4kchf5xad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsql-psql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsql-psql";
           sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3";
           name = "emacsql-psql";
         };
@@ -14372,7 +14540,7 @@
           sha256 = "0ld5qpl7b3iksgxcfysznf88wj019l5271kdz4nalqi4kchf5xad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsql-sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsql-sqlite";
           sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i";
           name = "emacsql-sqlite";
         };
@@ -14393,7 +14561,7 @@
           sha256 = "0jn4xj206idh5kgbklgcrngx6wvz9gwfm61wygar6pbfzqyx1y9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsshot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsshot";
           sha256 = "08xqx017yfizdj8wz7nbh9i7qpar6398sri78abzf78inv828s9j";
           name = "emacsshot";
         };
@@ -14414,7 +14582,7 @@
           sha256 = "00iklf97mszrsdv20q55qhml1dscvmmalpfnlkwi9mabklyq3i6z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emagician-fix-spell-memory";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emagician-fix-spell-memory";
           sha256 = "0ffjrpiph21dn8bplklsz3hrsai25l67yyr7n8qjxlwlibwqzv6j";
           name = "emagician-fix-spell-memory";
         };
@@ -14435,7 +14603,7 @@
           sha256 = "0j9vpiybpklf7kgmwpkdyywk29vpigzbn39d0m54z1kvy23xvx6x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emamux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emamux";
           sha256 = "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz";
           name = "emamux";
         };
@@ -14456,7 +14624,7 @@
           sha256 = "1idsvilsvlxh72waalhl8vrsmh0vfvz56qcv56fc2c0pb1i90icn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emamux-ruby-test";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emamux-ruby-test";
           sha256 = "1l1hp2dggjlc287qkfyj21w9lri4agh91g5x707qqq8nicdlv3xm";
           name = "emamux-ruby-test";
         };
@@ -14477,7 +14645,7 @@
           sha256 = "0cv8y6hr719648yxr2fbgb1hyg36m60bsbd57f2vvvqvg87si4jz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ember-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ember-mode";
           sha256 = "0fwd34cim29dg802ibsfd120px9sj54d4wzp3ggmjjzwkl9ky7dx";
           name = "ember-mode";
         };
@@ -14490,15 +14658,15 @@
     ember-yasnippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "ember-yasnippets";
-        version = "20160111.1107";
+        version = "20160201.1720";
         src = fetchFromGitHub {
           owner = "ronco";
           repo = "ember-yasnippets.el";
-          rev = "564130ddc4d4b93c281f2221c736c6d0f3066e2f";
-          sha256 = "1v4dac3v0hkq80fpkiih2pcji3j7fw634l3caalxv36dsixmz22y";
+          rev = "5d09e0d95218ce9a9abf9c908effd17f52cf5dbe";
+          sha256 = "1sj033acw1q80accdfkrxw4kzfl8p1ld16y188ikbizvq75lfkpp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ember-yasnippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ember-yasnippets";
           sha256 = "1alqrv9yhc1f8dhvh2kjcv8qbn1hdgza5iasmchr1wggxds3s50i";
           name = "ember-yasnippets";
         };
@@ -14519,7 +14687,7 @@
           sha256 = "0037nikvlcw6i228jym76pl1mgw4fn5dpz8hfr86b3m0zb012inj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emmet-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emmet-mode";
           sha256 = "0w5nnhha70mndpk2a58raaxqanv868z05mfy1a8prgapm56mm819";
           name = "emmet-mode";
         };
@@ -14538,7 +14706,7 @@
           sha256 = "6e653c3b44442e21ec6e4410d8b9c0e51b2f03ed1ae62c1bb1a2ffa6c8c144da";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms";
           sha256 = "0kzli8b0z5maizfwhlhph1f5w3v6pwxvs2dfs90l8c0h97m4yy2m";
           name = "emms";
         };
@@ -14559,7 +14727,7 @@
           sha256 = "07qbbs2i05bqndr4dxb84z50wav8ffbc56f6saw6pdx6n0sw6n6n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-info-mediainfo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-info-mediainfo";
           sha256 = "17x8vvfhx739hcj9j1nh6j4r6zqnwa5zq9zpi9b6lxc8979k3m4w";
           name = "emms-info-mediainfo";
         };
@@ -14580,7 +14748,7 @@
           sha256 = "03a7sn8pl0pnr05rmrrbw4hjyi8vpjqbvkvh0fqnij913a6qc64l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-mark-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-mark-ext";
           sha256 = "13h6hy8y0as0xfc1cg8balw63as81fzar32q9h4zhnndl3hc1081";
           name = "emms-mark-ext";
         };
@@ -14601,7 +14769,7 @@
           sha256 = "1pz2xvv5hzfg4a8s6xnbr14mpwnr94cwsa1bpk83i7x15hmxj938";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-mode-line-cycle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-mode-line-cycle";
           sha256 = "1jdmfh1i9v84iy7bj2dbc3s2wfzkrby3pabd99gnqzd9gn1cn8ca";
           name = "emms-mode-line-cycle";
         };
@@ -14622,7 +14790,7 @@
           sha256 = "1yy4dmjp53l2df5qix31g4vizhv80wm88vjqq6qqa9p822732n0m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-player-mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-player-mpv";
           sha256 = "175rmqx3bgys4chw8ylyf9rk07sg0llwbs9ivrv2d3ayhcz1lg9y";
           name = "emms-player-mpv";
         };
@@ -14635,15 +14803,15 @@
     emms-player-mpv-jp-radios = callPackage ({ cl-lib ? null, emacs, emms, emms-player-simple-mpv, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emms-player-mpv-jp-radios";
-        version = "20151228.912";
+        version = "20160130.940";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "emms-player-mpv-jp-radios";
-          rev = "d68017dfcfdd95a75cbda625628af02727cdd827";
-          sha256 = "0ckd440vbb2gh8cr144hq2f120fzwhfrby9hnd1qkl60pw98b0cb";
+          rev = "552779cd56d1aad54593dbf84db60ec50d3a42a1";
+          sha256 = "05n7jcd3nsnchv0swakf068klhlvckfcb3xjmxf5nnjibffjz77r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-player-mpv-jp-radios";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-player-mpv-jp-radios";
           sha256 = "0gdap5cv08pz370fl92v9lyvgkbbyjhp9wsc4kyjm4f4pwx9fybv";
           name = "emms-player-mpv-jp-radios";
         };
@@ -14664,7 +14832,7 @@
           sha256 = "0ajxyv7yx4ni8dizs7acpsxnmy3c9s0dx28vw9y1ym0bxkgfyzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-player-simple-mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-player-simple-mpv";
           sha256 = "15aljprjd74ha7wpzsmv3d873i6fy3x1jwhzm03hvw0sw18m25i1";
           name = "emms-player-simple-mpv";
         };
@@ -14685,7 +14853,7 @@
           sha256 = "0nx5bb5fjmaa1nhkbfnhd1aydqrq390x4rl1vfh11ilnf52wzzld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-soundcloud";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-soundcloud";
           sha256 = "0nf1f719m4pvxn0mf4qyx8mzwhrhv6kchnrpiy9clx520y8x3dqi";
           name = "emms-soundcloud";
         };
@@ -14706,7 +14874,7 @@
           sha256 = "1rk7am0xvpnv98yi7a62wlyh576md4n2ddj7nm201bjd4wdl2yxk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emoji-cheat-sheet-plus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emoji-cheat-sheet-plus";
           sha256 = "1ciwlbw0ihm0p5gnnl3safcj7dxwiy53bkj8cmw3i334al0gjnnv";
           name = "emoji-cheat-sheet-plus";
         };
@@ -14727,7 +14895,7 @@
           sha256 = "0sh4q4sb4j58ryvvmlsx7scry9inzgv2ssa87vbyzpxq0435l229";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emoji-display";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emoji-display";
           sha256 = "04cf18z26d64l0sv8qkbxjixi2wbw23awd5fznvg1cs8ixss01j9";
           name = "emoji-display";
         };
@@ -14748,7 +14916,7 @@
           sha256 = "0qi7p1grann3mhaq8kc0yc27cp9fm983g2gaqddljchn7lmgagrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emoji-fontset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emoji-fontset";
           sha256 = "19affsvlm1rzrzdh1k6xsv79icdkzx4izxivrd2ia6y2wcg9wc5d";
           name = "emoji-fontset";
         };
@@ -14769,7 +14937,7 @@
           sha256 = "1fqhydv9anhw0z8zjbz17kbl01bdzif9ncd25vdaa5dzddd16rb1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emojify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emojify";
           sha256 = "15v2h5jfksfc208qphiczplg56yka07qv4w4482c10yzwq76zp17";
           name = "emojify";
         };
@@ -14790,7 +14958,7 @@
           sha256 = "0bm0cxnv7g2dzfvfhkyy16kzn6shvy9gzypiqyjj42ng54xmhs0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/empos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/empos";
           sha256 = "0wbrszl9rq4is0ymxq9lxpqzlfg93gljh6almjy0hp3cs7pkzyl4";
           name = "empos";
         };
@@ -14803,15 +14971,15 @@
     emr = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, paredit, popup, projectile, redshank, s }:
     melpaBuild {
         pname = "emr";
-        version = "20140817.1804";
+        version = "20160202.1703";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "emacs-refactor";
-          rev = "fd20fc1887e2ebcf752f0170b1f3bf697043fd4b";
-          sha256 = "0pl7i2a0mf2s33qpsc14dcvqbl6jm5xrvcnrhfr7visvnih29cy4";
+          rev = "d545d9084a76f2043a7f3c9d21ef5692e6843e30";
+          sha256 = "0l0jw5rakb2bsj2n1dxlj02hxvvyrgc2dfh6kn29i145lxpa03bf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emr";
           sha256 = "05vpfxg6lviclnms2zyrza8dc87m60mimlwd11ihvsbngi9gcw8x";
           name = "emr";
         };
@@ -14842,7 +15010,7 @@
           sha256 = "0dz5xm05d7irh1j8iy08jk521p19cjai1kw68z2nngnyf1az7cim";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/enclose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/enclose";
           sha256 = "04gs468qqhdc9avx7lgibr0f1i444714i7rifad37dfmim8qk759";
           name = "enclose";
         };
@@ -14863,7 +15031,7 @@
           sha256 = "0k5ns40s5nskn0zialwq96qll1v5k50lfa5xh8hxbpcamsfym6h8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/encourage-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/encourage-mode";
           sha256 = "0fwn6w7s61c08z0d8z3awclqrhszia9is30gm2kx4hwr9dhhwh63";
           name = "encourage-mode";
         };
@@ -14884,7 +15052,7 @@
           sha256 = "1k17z1dy9m9lx2fy78ack8fyf5vqb79fwjn078f93bcjl5mc7d4k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/engine-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/engine-mode";
           sha256 = "1gg7i93163m7k7lr3pnal1svymnhzwrfpfcdc0798d7ybv26gg8c";
           name = "engine-mode";
         };
@@ -14905,7 +15073,7 @@
           sha256 = "008wggl6xxk339njrgpj2fndbil7k9f3i2hg1mjwqk033j87nbz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/enh-ruby-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/enh-ruby-mode";
           sha256 = "0r486yajjf7vsaz92ypxpfmz2nsvw9giffpxb9szj7fcry3nfdns";
           name = "enh-ruby-mode";
         };
@@ -14926,7 +15094,7 @@
           sha256 = "0vd7zy06nqb1ayjlnf2wl0bfv1cqv2qcb3cgy3zr9k9c4whcd8jh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/enlive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/enlive";
           sha256 = "1dyayk37zik12qfh8zbjmhsch64yqsx3acrlm7hcnavx465hmhnz";
           name = "enlive";
         };
@@ -14943,11 +15111,11 @@
         src = fetchFromGitHub {
           owner = "enoson";
           repo = "eno.el";
-          rev = "c07674329f66d6b4ea6c3a3944f801ab77ccb7e6";
-          sha256 = "0var9h1nslww3zlqbl9mvrkz7c9i2g8ka22mwqc1iv92ka3w0czv";
+          rev = "40075bb1ed9e62f42c5799f3d3721734742ed417";
+          sha256 = "1qimqrvk0myqfi2l3viigkx1ld90qpjgi1gs6xhw2g51r8x4i3in";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eno";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eno";
           sha256 = "0k4n4vw261v3bcxg7pqhxr99vh673l963yjridl0dp1663gcrfpk";
           name = "eno";
         };
@@ -14968,7 +15136,7 @@
           sha256 = "0v5p97dvzrk3j59yjc6iny71j3fdw9bb8737wnnzm098ff42dfmd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/enotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/enotify";
           sha256 = "0mii6m6zw9y8njgzi79rcf1n251iw7qz3yqjjij3c19rk3zpm5qi";
           name = "enotify";
         };
@@ -14981,15 +15149,15 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode2, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20160109.1359";
+        version = "20160201.837";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "14b0384ee5147ba9c22c33e21e56b9ef1de9b377";
-          sha256 = "0rki36vi3ndb295rxg5jr3fbd2lc0ns518s4hzm6p9gnjw83hvik";
+          rev = "52db33ae0304952d2deac6f4467fbeeee75bc62b";
+          sha256 = "1h7hgfzzhl7crwxkaskjhi9axb8aywb0z33a9d5z3c9safmq2r03";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ensime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ensime";
           sha256 = "1d8y72l7bh93x9zdj3d3qjhrrzr804rgi6kjifyrin772dffjwby";
           name = "ensime";
         };
@@ -15018,7 +15186,7 @@
           sha256 = "0jb8hf4v02b0zd02749533arrypjr3b3k88129grfks2kf29ybhb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/envdir";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/envdir";
           sha256 = "085bfm4w7flrv8jvzdnzbdg3j5n29xfzbs1wlrr29mg9dja6s8g8";
           name = "envdir";
         };
@@ -15039,7 +15207,7 @@
           sha256 = "1yn9jn6jl6rmknj50g18z5yvpa1d8mzzx3j1pfdwfn36ak4nc9ba";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eopengrok";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eopengrok";
           sha256 = "0756x78113286hwk1i1m5s8xq04gh7zxb4fkmw58lg2ssff8q6av";
           name = "eopengrok";
         };
@@ -15060,7 +15228,7 @@
           sha256 = "11z08y61xd00rlw5mcyrix8nx41mqs127wighhjsxsyzbfqydxdr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/epc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/epc";
           sha256 = "1l9rcx07pa4b9z5654gyw6b64c95lcigzg15amphwr56v2g3rbzx";
           name = "epc";
         };
@@ -15081,7 +15249,7 @@
           sha256 = "18gfi1287skv5xvh12arkvxy2c4fism8bdk42wc5q3y21h8nsiim";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/epic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/epic";
           sha256 = "0gfl8if83jbs0icz6gcjkwxvcz5v744k1kvqnbx3ga481kds9rqf";
           name = "epic";
         };
@@ -15102,7 +15270,7 @@
           sha256 = "0s4k2grikhibd075435giv3bmba1mx71ndxlr0k1i0q0xawpyyb4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/epl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/epl";
           sha256 = "0zr3r2hn9jaxscrl83hyixznb8l5dzfr6fsac76aa8x12xgsc5hn";
           name = "epl";
         };
@@ -15123,7 +15291,7 @@
           sha256 = "1a8gzf7abda0zgcllyl351m47avnf995i9lvwjf05nyx2jb31dnw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/epresent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/epresent";
           sha256 = "1x16wqfjfrh7kaqar5px61bf3lnlibvcbr5xaf3mcgph37sgi6la";
           name = "epresent";
         };
@@ -15144,7 +15312,7 @@
           sha256 = "1wwg46xdb488wxvglwvsy08vznrnmdmmbcvm9vb60dy3gqjmz7cw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eprime-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eprime-mode";
           sha256 = "0vswjcs24f3mdyw6ai7p21ab8pdn327lr2d6css0a5nrg539cn2g";
           name = "eprime-mode";
         };
@@ -15165,7 +15333,7 @@
           sha256 = "13ds5z2nvanx8cvxrzi0da6ixx7kw222z6mrlbs8cldqcmzm7xh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eproject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eproject";
           sha256 = "0kpg4r57khbyinc73v9kj32b9m3b4nb5014r5fkl5mzzpzmd85b4";
           name = "eproject";
         };
@@ -15186,7 +15354,7 @@
           sha256 = "18r66yl52xm1gjbn0dm8z80gv4p3794pi91qa8i2sri4grbsyi5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-colorize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-colorize";
           sha256 = "1m941q7ql3yb71s71783nvz822bwhn1krmin18fvh0fbsbbnck2a";
           name = "erc-colorize";
         };
@@ -15199,15 +15367,15 @@
     erc-crypt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erc-crypt";
-        version = "20151030.1257";
+        version = "20160203.1824";
         src = fetchFromGitHub {
           owner = "atomontage";
           repo = "erc-crypt";
-          rev = "5d548bab298a27ca5886392c129b14d0e93067be";
-          sha256 = "1hzp42x6f73wsjr5n01i3dzsfrl5pym2l53rzlca11prcccvklfr";
+          rev = "08ff044c1c9ef042913623295e57590e72bd1270";
+          sha256 = "0v2ly3q1r169lxwp6ml70plm6i0s96d0a1wy91ngvqgqpnpk4746";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-crypt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-crypt";
           sha256 = "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3";
           name = "erc-crypt";
         };
@@ -15220,15 +15388,15 @@
     erc-hl-nicks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erc-hl-nicks";
-        version = "20140619.722";
+        version = "20160202.1350";
         src = fetchFromGitHub {
           owner = "leathekd";
           repo = "erc-hl-nicks";
-          rev = "e536ea57f842f85ecda5a28ceed24cd506b7be2c";
-          sha256 = "0h2hfa5qpszg0pzi1gc7qfkn9kb37pfg0vlj30049xnryh80r9br";
+          rev = "be181920ce6af0ab5d00d1c638e4e598b3998643";
+          sha256 = "1k0g3bwp3w0dd6zwdv6k2wpqs2krjayilrzsr1hli649ljcx55d7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-hl-nicks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-hl-nicks";
           sha256 = "1lhw77n2nrjnb5yhnpm6yhbcp022xxjcmdgqf21z9rd0igss9mja";
           name = "erc-hl-nicks";
         };
@@ -15249,7 +15417,7 @@
           sha256 = "03r13x2hxy4hk0n0ri5wld8rp8frx4j3mig6mn2v25k0cr52689f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-image";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-image";
           sha256 = "1cgzygkysjyrsdr6jwqkxlnisxccsvh4kxgn19rk4n61ms7bafvf";
           name = "erc-image";
         };
@@ -15270,7 +15438,7 @@
           sha256 = "0k3gp4c74g5awk7v9lzb6py3dvf59nggh6dw7530cswxb6kg2psa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-social-graph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-social-graph";
           sha256 = "07arn3k89cqxab5x5lczv8bpgrbirmlw9p6c37fgrl3df6f46h4h";
           name = "erc-social-graph";
         };
@@ -15291,7 +15459,7 @@
           sha256 = "0cfqbqskh260zfq1lx1s8jz2351w2ij9m73rqim16fy7zr0s0670";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-terminal-notifier";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-terminal-notifier";
           sha256 = "0vrxkg62qr3ki8n9mdn02sdni5fkj79fpkn0drx0a4kqp0nrrj7c";
           name = "erc-terminal-notifier";
         };
@@ -15312,7 +15480,7 @@
           sha256 = "0n107d77z04ahypa7hn2165kkb6490v4vkzdm5zwm4lfhvlmp0x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-track-score";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-track-score";
           sha256 = "19wjwah2n8ri6gyrsbzxnrvxwr5cj48sxrar1226n9miqvgj5whx";
           name = "erc-track-score";
         };
@@ -15333,7 +15501,7 @@
           sha256 = "118q4zj9dh5xnimcsi229j5pflhcd8qz0p212kc4p9dmyrx2iw0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-tweet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-tweet";
           sha256 = "0bazwq21mah4qrzwaji6w13m91l6v9dqh9svxrd13ij8yycr184b";
           name = "erc-tweet";
         };
@@ -15354,7 +15522,7 @@
           sha256 = "0bzi2sh2fhrz49j5y53h6jgf41av6rx78smb3bbk6m74is8vim2y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-view-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-view-log";
           sha256 = "1k6fawblz0d7kz1y7sa3q43s7ci28jsmzkp9vnl1nf55p9xvv4cf";
           name = "erc-view-log";
         };
@@ -15375,7 +15543,7 @@
           sha256 = "0kh4amx3l3a14qaiyvjyak1jbybs6n49mdvzjrd1i2vd1y74zj5w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-youtube";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-youtube";
           sha256 = "12ylxkskkgfv5x7vlkib963ichb3rlmdzkf4zh8a39cgl8wsmacx";
           name = "erc-youtube";
         };
@@ -15396,7 +15564,7 @@
           sha256 = "1dlw34kaslyvnsrahf4rm76r2b7qqqn589i4mmhr23prl8xbz9z9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-yt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-yt";
           sha256 = "0yrwvahv4l2s1aavy6y6mjlrw8l11i00a249825ab5yaxrkzz7xc";
           name = "erc-yt";
         };
@@ -15417,7 +15585,7 @@
           sha256 = "0xw3d9fz4kmn1myrsy44ki4bgg0aclv41wldl6r9nhvkrnri41cv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ercn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ercn";
           sha256 = "0yvis02bypw6v1zv7i326y8s6j0id558n0bdri52hr5pw85imnlp";
           name = "ercn";
         };
@@ -15436,7 +15604,7 @@
           sha256 = "0cdyhklmsv0xfcq97c3wqh8scs6910jzvvp04w0jxlayd1dbzx49";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eredis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eredis";
           sha256 = "1j0y4h97pqsw6k18w6r3rza3ql04ag3cixyndji7i1smbfsh4v95";
           name = "eredis";
         };
@@ -15449,15 +15617,15 @@
     erefactor = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erefactor";
-        version = "20150620.1943";
+        version = "20160121.359";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-erefactor";
-          rev = "fde3fd42c815c76e8015f69518a92f6bfcfde990";
-          sha256 = "17i567nfm0rykimh6bpcc5f2l7wsf8zcdy2jzd7sgrl54dvb0g9i";
+          rev = "bf68085e5635eb94fd85709f8e1355c1f5534745";
+          sha256 = "1v8x6qmhywfxs7crzv7hfl5n4zq5y3ar40l873946l4wyk0wclng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erefactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erefactor";
           sha256 = "0ma9sbrq4n8y5w7vvbhhgmw25aiykbq5yhxzm0knj32bgpviprw7";
           name = "erefactor";
         };
@@ -15470,15 +15638,15 @@
     ergoemacs-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "ergoemacs-mode";
-        version = "20160114.1228";
+        version = "20160204.1341";
         src = fetchFromGitHub {
           owner = "ergoemacs";
           repo = "ergoemacs-mode";
-          rev = "cac19fd1e79f46549e9e6b0ecd2d7a6e3104dd28";
-          sha256 = "0ngbxdasf5sbr0rqki6vakx0p1bcik8bivcwwn7rg77j7v7kflhi";
+          rev = "fd672d7377e49df17816c5aba6e0fcd35b61efd3";
+          sha256 = "12s4rsnp59n8swwisi7jrf721dbz9dr7a9n5r6vnq38avsfa5zw4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ergoemacs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ergoemacs-mode";
           sha256 = "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62";
           name = "ergoemacs-mode";
         };
@@ -15495,11 +15663,11 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "427c9f4f7777dd00e0a03a42b9834a4d669305b6";
-          sha256 = "1695js0ws73d21my269hm1s59vgkyjn6w1rxsc45q40zpj88l83x";
+          rev = "a03b7add86b92d0d7d2d744e5555314bedbc2197";
+          sha256 = "06hx5cscqylha7lghlf05mgihiw7mwzg7jjzqx4ffwdkpg5zsnb9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erlang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erlang";
           sha256 = "1gmrdkfanivb9l5lmkl0853snlhl62w34537r82w11z2fbk9lxhc";
           name = "erlang";
         };
@@ -15520,7 +15688,7 @@
           sha256 = "0hn9i405nfhjd1h9vnwj43nxbbz00khrwkjq0acfyxjaz1shfac9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ert-async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ert-async";
           sha256 = "004798ckri5j72j0xvzkyciss1iz4lw9gya2749hkjxlamg14cn5";
           name = "ert-async";
         };
@@ -15538,7 +15706,7 @@
           sha256 = "0cwy3ilsid90abzzjb7ha2blq9kmv3gfp3icwwfcz6qczgirq6g7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ert-expectations";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ert-expectations";
           sha256 = "094lkf1h83rc0dkvdv8923xjrzj5pnpnsb4izk8n5n7g0rbz1l9w";
           name = "ert-expectations";
         };
@@ -15558,7 +15726,7 @@
           sha256 = "eedfdd6753c32d16baa341e6d20abee8713921d8eb850d16782cde55bdbeec46";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ert-junit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ert-junit";
           sha256 = "0bv22mhh1ahbjwi6s1csxkh11dmy0srabkddjd33l4havykxlg6g";
           name = "ert-junit";
         };
@@ -15579,7 +15747,7 @@
           sha256 = "08yfq3qzscxvzyxvyvdqpkrm787278yhkdd9prbvrgjj80p8n7vq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ert-modeline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ert-modeline";
           sha256 = "06pc50q9ggin20cbfafxd53x35ac3kh85dap0nbws7514f473m7b";
           name = "ert-modeline";
         };
@@ -15600,7 +15768,7 @@
           sha256 = "0ivnfc42pw9pc9glx2m4klzx4csy4m60hj1x12js7492bd0ri933";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ert-runner";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ert-runner";
           sha256 = "0fnb8rmjr5lvc3dq0fnyxhws8ync1lj5xp8ycs63z4ax6gmdqr48";
           name = "ert-runner";
         };
@@ -15621,7 +15789,7 @@
           sha256 = "0jq4yp80wiphlpsc0429rg8n50g8l4lf78q0l3nywz2p93smjy9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/es-lib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/es-lib";
           sha256 = "0mwvgf5385qsp91zsdw75ipif1h90xy277xdmrpwixsxd7abbn0n";
           name = "es-lib";
         };
@@ -15631,22 +15799,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    es-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "es-mode";
-        version = "20150916.2233";
+        version = "20160128.1119";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "es-mode";
-          rev = "c5dd41e453e83da2e841894d9a51598f03318f7c";
-          sha256 = "1cc2k52vq2m4hzmrpb51xd5pjnxzv3iy8rf2y02c6f3a5xpilj9k";
+          rev = "a0c142951e6fc932c691e344262aecd422538d17";
+          sha256 = "0hrhj08xnd4xavvx8hyaysnz52c1wd1fgfwgark4lcjlh6aiagdf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/es-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/es-mode";
           sha256 = "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp";
           name = "es-mode";
         };
-        packageRequires = [ dash ];
+        packageRequires = [ cl-lib dash ];
         meta = {
           homepage = "http://melpa.org/#/es-mode";
           license = lib.licenses.free;
@@ -15663,7 +15831,7 @@
           sha256 = "14rsifcx2kwdmwq9zh41fkb848l0f4igp5v9pk3x4jd2yw9gay7m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/es-windows";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/es-windows";
           sha256 = "112ngkan0hv3y7m71479f46x5gwdmf0vhbqrzs5kcjwlacqlrahx";
           name = "es-windows";
         };
@@ -15684,7 +15852,7 @@
           sha256 = "0id7820vjbprlpprj4fyhylkjvx00b87mw4n7jnxn1gczvjgafmc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/escreen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/escreen";
           sha256 = "0yis27362jc63jkzdndz1wpysmf1b51rrbv3swvi6b36da5i6b54";
           name = "escreen";
         };
@@ -15705,7 +15873,7 @@
           sha256 = "1k8k9hl9m4vjqdw3x9wg04cy2lb9x64mq0mm0i3i6w59zrsnkn4q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/esh-buf-stack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/esh-buf-stack";
           sha256 = "0zmwlsm98m9vbjk9mldfj2nf6cip7mlvb71j33ddix76yqggp4qg";
           name = "esh-buf-stack";
         };
@@ -15726,7 +15894,7 @@
           sha256 = "1yfvdx763xxhxf2r6kjjjyafaxrj1lpgrz1sgbhzkyj6nspmm9ms";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/esh-help";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/esh-help";
           sha256 = "1k925wmn8jy9rxxsxxawasxq6r4yzwl116digdx314gd3i04sh3w";
           name = "esh-help";
         };
@@ -15747,7 +15915,7 @@
           sha256 = "13crzgkx1lham1nfsg6hj2zg875majvnig0v4ydg691zk1qi4hc2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eshell-autojump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eshell-autojump";
           sha256 = "09l2680hknmdbwr4cncv1v4b0adik0c3sm5i9m3qbwyyxm8m41i5";
           name = "eshell-autojump";
         };
@@ -15768,7 +15936,7 @@
           sha256 = "0v0wshck5n4hspcv1zk1g2nm6xiigcjp16lx0dc8wzkl6ymljvbg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eshell-did-you-mean";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eshell-did-you-mean";
           sha256 = "1z1wpn3sj1gi5nn0a71wg0i3av0dijnk79dc32zh3qlh500kz8mz";
           name = "eshell-did-you-mean";
         };
@@ -15789,7 +15957,7 @@
           sha256 = "1b94pamb92a26lvlbwyr7kgaiwax4hkgmmalh8l5ldcwxkscq09c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eshell-git-prompt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eshell-git-prompt";
           sha256 = "0a8pyppqvnavvb8rwsjxagb76hra9zhs5gwa0ylyznmql83f8w8s";
           name = "eshell-git-prompt";
         };
@@ -15810,7 +15978,7 @@
           sha256 = "0r2fbz5z935vny9cbi857ryddhbg9v8i93jrzn2xvqs3h5wj9jn9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eshell-prompt-extras";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eshell-prompt-extras";
           sha256 = "1plvc8azpmb3phlrxhw3y18dv5y0xljsr5fqym4w84m66lq5csfj";
           name = "eshell-prompt-extras";
         };
@@ -15831,7 +15999,7 @@
           sha256 = "0znk2wmvk7b5mi727cawbddvzx74dlm1lwsxgkiylx2qp299ark0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eshell-z";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eshell-z";
           sha256 = "14ixazj0nscyqsdv7brqnfr0q8llir1pwb91yhl9jdqypmadpm6d";
           name = "eshell-z";
         };
@@ -15852,7 +16020,7 @@
           sha256 = "0ir7j4dgy0fq9ybixaqs52kiqk73p9v6prgqzjs8nyicjrpmnpyq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/espresso-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/espresso-theme";
           sha256 = "1bsff8fnq5z0f6cwg6wprz8qi3ivsqxpxx6v6fxfammn74qqyvb5";
           name = "espresso-theme";
         };
@@ -15873,7 +16041,7 @@
           sha256 = "16r4j27j9yfdiy841w9q5ykkc6n3wrm7hvfacagb32mydk821ijg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/espuds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/espuds";
           sha256 = "16yzw9l64ahf5v92jzb7vyb4zqxxplq6qh0y9rkfmvm59s4nhk6c";
           name = "espuds";
         };
@@ -15890,11 +16058,11 @@
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-esqlite";
-          rev = "fae9826cbc255b0f0686a801288f1441bda5f631";
-          sha256 = "0ag444hfrpdrf3lnaz7l2plj392xgh7a2080421z3g0alc74m8h3";
+          rev = "bc4047e09b8f6c34802db86095cd465935670dce";
+          sha256 = "05f8n24yvzm3zjvc1523ib44wv76ms5sn6mv8s1wrjsl190av0rn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/esqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/esqlite";
           sha256 = "1dny5qjzl9gaj90ihzbhliwk0n0x7jz333hzf6gaw7wsjmx91wlh";
           name = "esqlite";
         };
@@ -15911,11 +16079,11 @@
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-esqlite";
-          rev = "fae9826cbc255b0f0686a801288f1441bda5f631";
-          sha256 = "0ag444hfrpdrf3lnaz7l2plj392xgh7a2080421z3g0alc74m8h3";
+          rev = "bc4047e09b8f6c34802db86095cd465935670dce";
+          sha256 = "05f8n24yvzm3zjvc1523ib44wv76ms5sn6mv8s1wrjsl190av0rn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/esqlite-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/esqlite-helm";
           sha256 = "00y2nwyx13xlny40afczr31lvbpnw1cgmj5wc3iycyznizg5kvhq";
           name = "esqlite-helm";
         };
@@ -15928,15 +16096,15 @@
     ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ess";
-        version = "20160118.315";
+        version = "20160127.1710";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "6d05ba7c89371764c43e30a436d7166417cabd4d";
-          sha256 = "0sdg3ai9lw2cwf93qwb5pfwydrdlys0nfcx07mxn9h7k0vsxmjfx";
+          rev = "27d5150f9a9262b3fd861321561b18446d0fb479";
+          sha256 = "091ac8l6d1dvj4jvmpqx6cibydpc7safaamp7845qasm2j97zm4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess";
           sha256 = "02kz4fjxr0vrj5mg13cq758nzykizq4dmsijraxv46snvh337v5i";
           name = "ess";
         };
@@ -15957,7 +16125,7 @@
           sha256 = "1ya2ay52gkrd31pmw45ban8kkxgnzhhwkzkypwdhjfccq3ys835x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess-R-data-view";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess-R-data-view";
           sha256 = "0r2fzwayf3yb7fqk6f31x4xfqiiczwik8qw4rrvkqx2h3s1kz7i0";
           name = "ess-R-data-view";
         };
@@ -15978,7 +16146,7 @@
           sha256 = "0q8pbaa6wahli6fh0kng5zmnypsxi1fr2bzs2mfk3h8vf4nikpv0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess-R-object-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess-R-object-popup";
           sha256 = "1dxwgahfki6d6ywh85ifk3kq6f2a1114kkd8xcv4lcpzqykp93zj";
           name = "ess-R-object-popup";
         };
@@ -15999,7 +16167,7 @@
           sha256 = "0ici253mllqyzcbhxrazfj2kl50brr8qid99fk9nlyfgh516ms1x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess-smart-equals";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess-smart-equals";
           sha256 = "0mfmxmsqr2byj56psx4h08cjc2j3aac3xqr04yd47k2mlivnyrxp";
           name = "ess-smart-equals";
         };
@@ -16020,7 +16188,7 @@
           sha256 = "01xa98q0pqsf4gyl6ixlpjjdqazqsxg1sf7a3j2wbh7196ps61v5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess-smart-underscore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess-smart-underscore";
           sha256 = "01pki1xa8zpgvldcbjwg6vmslj7ddf44hsx976xipc95vrdk15r2";
           name = "ess-smart-underscore";
         };
@@ -16041,7 +16209,7 @@
           sha256 = "034rs6mmc5f6y8ply2a90b5s4pi4qx9m49wsxc9v0zwa9i5skmx1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/esup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/esup";
           sha256 = "0cv3zc2zzm38ki3kxq58g9sp4gsk3dffa398wky6z83a3zc02zs0";
           name = "esup";
         };
@@ -16062,7 +16230,7 @@
           sha256 = "0mrfkq3jcsjfccqir02yijl24hllc347b02y7gk3b2yn0b676dv3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/esxml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/esxml";
           sha256 = "0nn074abkxz7p4w59l1za586p5ya392xhl3sx92yys8a3194n6hz";
           name = "esxml";
         };
@@ -16083,7 +16251,7 @@
           sha256 = "1k361bbwd9z17qlycymb1x7scidvgvrh9bdp06rhwfh9j3slrbxy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/etable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/etable";
           sha256 = "0m4h24mmhp680wfhb90im228mrcyxapzyi4kla8xdmss83gc0c32";
           name = "etable";
         };
@@ -16101,7 +16269,7 @@
           sha256 = "0gmlmxlwfsfk5axn3x5cfvqy9bx26ynpbg50mdxiljk7wzqs5dyb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/etags-select";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/etags-select";
           sha256 = "0j6mxj10n7jf087l7j86s3a8si5hzpwmvrpqisfvlnvn6a0rdy7h";
           name = "etags-select";
         };
@@ -16119,7 +16287,7 @@
           sha256 = "0apm8as606bbkpa7i1hkwcbajzsmsyxn6cwfk9dkkll5bh4vglqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/etags-table";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/etags-table";
           sha256 = "1jzij9jknab42jmx358g7f1c0d8lsp9baxbk3xsy7w4nl0l53d84";
           name = "etags-table";
         };
@@ -16140,7 +16308,7 @@
           sha256 = "098mfyw63b23h7jajaik1rfj307sxs82nnwf6b81j550kl2n05y6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ethan-wspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ethan-wspace";
           sha256 = "0k4kqkf5c6ysyhh1vpi9v4220yxm5ir3ippq2gmvvhnk77pg6hws";
           name = "ethan-wspace";
         };
@@ -16161,7 +16329,7 @@
           sha256 = "0vd2crs261na9a682d74ycz1il661kavsz1bvs0bkak09lplc1qz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eval-in-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eval-in-repl";
           sha256 = "10h5vy9wdiqf9dgk1d1bsvp93y8sfcxghzg8zbhhn7m5cqg2wh63";
           name = "eval-in-repl";
         };
@@ -16182,7 +16350,7 @@
           sha256 = "1syqakdyg3ydnq9gvkjf2rw9rz3kyhzp7avhy6dvyy65pv2ndyc2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eval-sexp-fu";
           sha256 = "17cazf81z4cszflnfp66zyq2cclw5sp9539pxskdf267cf7r0ycs";
           name = "eval-sexp-fu";
         };
@@ -16192,17 +16360,38 @@
           license = lib.licenses.free;
         };
       }) {};
+    evalator = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evalator";
+        version = "20160130.1359";
+        src = fetchFromGitHub {
+          owner = "seanirby";
+          repo = "evalator";
+          rev = "edf3840f5aa025cf38d0c2677b2f88f59079409e";
+          sha256 = "1a3y69s7lb24zdivxcpsjh9l6adxyjqxbpgradnj0q1n6kdyq679";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evalator";
+          sha256 = "0k6alxwg89gc4v5m2bxmzmj7l6kywhbh4036xgz19q28xnlbr9xk";
+          name = "evalator";
+        };
+        packageRequires = [ helm-core ];
+        meta = {
+          homepage = "http://melpa.org/#/evalator";
+          license = lib.licenses.free;
+        };
+      }) {};
     evil = callPackage ({ fetchhg, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20160118.117";
+        version = "20160203.721";
         src = fetchhg {
           url = "https://bitbucket.com/lyro/evil";
-          rev = "e2c001ecfded";
-          sha256 = "1by2b0qa5hk2jvkxg8j4b0wpnw3mbg0vdggp4nh33m61290jsn5k";
+          rev = "5c0114702ea3";
+          sha256 = "1sysqcvzdnzg5qvawv3c0rwfyacjb80mvfdhdmc07vr4pyma6vcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil";
           sha256 = "09qrhy7l229w0qk3ba1i2xg4vqz8525v8scrbm031lqp30jp54hc";
           name = "evil";
         };
@@ -16223,7 +16412,7 @@
           sha256 = "05fba10yvxl82g2xl48mxwz7cwjp4pylb7n8a4b08i8f9xasny7f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-annoying-arrows";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-annoying-arrows";
           sha256 = "024zz9l43y1kk2hm8l96h1ahril23cj35f0x72jrcfjysid7wpry";
           name = "evil-annoying-arrows";
         };
@@ -16244,7 +16433,7 @@
           sha256 = "0cnj91lwpmk4c8nf3xi80yvv6anvkg8h1kbzbp16glkgmy6jpmy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-anzu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-anzu";
           sha256 = "19cmc61l370mm4h2m6jw5pdcsvj4wcv9zpa8z7k1fjg57mwmmn70";
           name = "evil-anzu";
         };
@@ -16265,7 +16454,7 @@
           sha256 = "1nh7wa4ynr7ln42x32znzqsmh7ijzy5ymd7rszf49l8677alvazq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-args";
           sha256 = "1bwdvf1i3jc77bw2as1wr1djm8z3a7wms60694xkyqh0m909hs2w";
           name = "evil-args";
         };
@@ -16286,7 +16475,7 @@
           sha256 = "1q6znbnshk45mdglx519qlbfhb7g47qsm245i93ka4djsjy55j9l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-avy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-avy";
           sha256 = "1hc96dd78yxgr8cs9sk9y1i5h1qnyk110vlb3wnlxv1hwn92qvrd";
           name = "evil-avy";
         };
@@ -16307,7 +16496,7 @@
           sha256 = "08cpgbwsrk8n88qiq2z90s6wx0ayvrrb38m8dks595x2qzzpa1gi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-cleverparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-cleverparens";
           sha256 = "10zkyaxy52ixh26hzm9v1y0gakcn5sdwz4ny8v1vcmjqjphnk799";
           name = "evil-cleverparens";
         };
@@ -16328,7 +16517,7 @@
           sha256 = "1qiym8f56a18j5swrxx5is48nz7z76531k8cw2c7czr6611l8l5a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-commentary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-commentary";
           sha256 = "151iiimmkpn58pl9zn40qssfahbrqy83axyl9dcd6kx2ywv5gcxz";
           name = "evil-commentary";
         };
@@ -16341,15 +16530,15 @@
     evil-dvorak = callPackage ({ ace-jump-mode, evil, evil-surround, fetchFromGitHub, fetchurl, helm, helm-swoop, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-dvorak";
-        version = "20151104.726";
+        version = "20160127.615";
         src = fetchFromGitHub {
           owner = "jbranso";
           repo = "evil-dvorak";
-          rev = "c193913839e153b0f2c973fae5e6b1fe51809d2b";
-          sha256 = "0jbb0ln54p43rqyw188ggrc848v24mhwdj9xna16y4g41g00i105";
+          rev = "86f7ebd4dc5db6cd126ef2e12a113c9af1354e53";
+          sha256 = "0fdlj2m8bzdwqh43qb34il3fmang0zpdgxfkrsmxy9kpc0bsx940";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-dvorak";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-dvorak";
           sha256 = "1iq9wzcb625vs942khja39db1js8r46vrdiqcm47yfji98g39gsn";
           name = "evil-dvorak";
         };
@@ -16370,7 +16559,7 @@
           sha256 = "17dng6iik4jzri6f435icrfb5g9zs2zqc6jgwkpphsgjcc12izrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-easymotion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-easymotion";
           sha256 = "0zixgdhc228y6yqr044cbyls0pihzacqsgvybhhar916p4h8izgv";
           name = "evil-easymotion";
         };
@@ -16383,15 +16572,15 @@
     evil-ediff = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-ediff";
-        version = "20160118.1118";
+        version = "20160202.1441";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "evil-ediff";
-          rev = "1df82b66e16794987d8cd3e5fa05ab1920ae48dd";
-          sha256 = "1qf94jfp6vgm3lg8wsmpk137rdv0q0n3d6xcc54afhm9qi84gzkn";
+          rev = "c852bf960db9a9f13089b29c1b68ab4fffe55171";
+          sha256 = "16pz48gdpl68azaqwyixh10y1x9xzi1lnhq2v0nrd0y6bfcqcvc7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-ediff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-ediff";
           sha256 = "1xwl2511byb00ybfnm6q6mbkgzarrq8bfv5rbip67zqbw2qgmb6i";
           name = "evil-ediff";
         };
@@ -16412,7 +16601,7 @@
           sha256 = "1dl201jx7kfmkhd7ism6wlmlnbgfg1qn17faryz7kc5v2mms69b4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-escape";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-escape";
           sha256 = "0rlwnnshcvsb5kn7db5qy39s89qmqlllvg2z8cnxyri8bsssks4k";
           name = "evil-escape";
         };
@@ -16433,7 +16622,7 @@
           sha256 = "0gbpd1wmlcvddiym0r410rch8bjg4gxslynwmfqywwgbva8zm46c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-exchange";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-exchange";
           sha256 = "1mvw7w23yfbfmhzj6wimslbryb0gppryw24ac0wh4fzl9rdcma4r";
           name = "evil-exchange";
         };
@@ -16454,7 +16643,7 @@
           sha256 = "1cv24qnxxf6n1grf4n5969v8y9xll5zb9mbfdnq9iavdvhnndk2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-god-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-god-state";
           sha256 = "1g547d58zf11qw0zz3fk5kmrzmfx1rhawyh5d2h8bll8hwygnrxf";
           name = "evil-god-state";
         };
@@ -16475,7 +16664,7 @@
           sha256 = "1kdigwpl9pp88l11bkpxkw91pvs8z3gachxccibivzgjxd2pnvfl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-iedit-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-iedit-state";
           sha256 = "1dihyh7vqcp7kvfic613k7v33czr93hz04d635awrsyzgy8savhl";
           name = "evil-iedit-state";
         };
@@ -16496,7 +16685,7 @@
           sha256 = "1g6r1ydscwjvmhh1zg4q3nap4avk8lb9msdqrh7dff6pla0r2qs6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-indent-plus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-indent-plus";
           sha256 = "15vnvch0qsaram22d44k617bqhr9rrf8qc86sf20yvdyy3gi5j12";
           name = "evil-indent-plus";
         };
@@ -16517,7 +16706,7 @@
           sha256 = "0nghisnc49ivh56mddfdlcbqv3y2vqzjvkpgwv3zp80ga6ghvdmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-indent-textobject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-indent-textobject";
           sha256 = "172a3krid5lrx1w9xcifkhjnvlxg1nbz4w102d99d0grr9465r09";
           name = "evil-indent-textobject";
         };
@@ -16530,15 +16719,15 @@
     evil-jumper = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-jumper";
-        version = "20160114.1429";
+        version = "20160119.1809";
         src = fetchFromGitHub {
           owner = "bling";
           repo = "evil-jumper";
-          rev = "b57b706a3a983462c9c764da1670f7bde5eb0471";
-          sha256 = "1h8v78wlr1v5k6fdk8v8nkx3xqp9yf5gpzyn1f3k9wn8rp7bbjhb";
+          rev = "f18fbae5c971211bec6bd56cccf7196ede798bf7";
+          sha256 = "1p9r7dqhp2bnsgj18fpmf7wamndgmgkw1c5lrnx3hngwnfkw2fgh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-jumper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-jumper";
           sha256 = "0zwsk7slzvcgvgh8fjrwangylishrwc1w0glxcr71sybxph2g46x";
           name = "evil-jumper";
         };
@@ -16559,7 +16748,7 @@
           sha256 = "10xrlimsxk09z9cw6rxdz8qvvn1i0vhc1gdicwxri0j10p0hacl3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-leader";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-leader";
           sha256 = "154s2nb170hzksmc87wnzlwg3ic3w3ravgsfvwkyfi2q285vmra6";
           name = "evil-leader";
         };
@@ -16580,7 +16769,7 @@
           sha256 = "0lvjqs40caxj3781cs41qavk10vlz2mjw0r6fmxa2z3c087cxnxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-lisp-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-lisp-state";
           sha256 = "117irac05fs73n7sgja3zd7yh4nz9h0gw5b1b57lfkav6y3ndgcy";
           name = "evil-lisp-state";
         };
@@ -16593,15 +16782,15 @@
     evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "evil-magit";
-        version = "20160117.2026";
+        version = "20160203.1803";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "evil-magit";
-          rev = "233d0bd6c87c8113e4ed4684b50c3eb5a5d91a67";
-          sha256 = "00ly0p93l9li2hydpkijyp7mi00kwjw4nyzw2ibxabqsv4071clz";
+          rev = "6bccbe90390436fd814d55e9ba4408e0454c99cd";
+          sha256 = "0mih5s2kk6pas1w1i62ghsi3jdx5qm0b7yqbc924rz2zp6za3p0m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-magit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-magit";
           sha256 = "10mhq6mzpklk5sj28lvd478dv9k84s81ax5jkwwxj26mqdw1ybg6";
           name = "evil-magit";
         };
@@ -16622,7 +16811,7 @@
           sha256 = "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-mark-replace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-mark-replace";
           sha256 = "03cq43vlv1b53w4kw7mjvk026i8rzhhryfb27ddn6ipgc6xh68a0";
           name = "evil-mark-replace";
         };
@@ -16643,7 +16832,7 @@
           sha256 = "0kf4m1ghpxfalqx2zwm1d8xav4d6l6bpk79g5cvssk5jz5913fbi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-matchit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-matchit";
           sha256 = "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq";
           name = "evil-matchit";
         };
@@ -16656,15 +16845,15 @@
     evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-mc";
-        version = "20151230.1042";
+        version = "20160202.1527";
         src = fetchFromGitHub {
           owner = "gabesoft";
           repo = "evil-mc";
-          rev = "6b2ec63d4824243e6eec75618365a45620af2957";
-          sha256 = "1idngl8b3k7mpyxkrg3hg87w7iz2p5smbcl9lsckm1c01z0siwjr";
+          rev = "d06bb3f47411e5f210ac986abc04a60d15808f68";
+          sha256 = "12af93aba20m9h8dgz6bxhm63khrlx0iclnwflkdy4s5w229938q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-mc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-mc";
           sha256 = "0cq4xg6svb5gz4ra607wy768as2igla4h1xcrfnxldknk476fqqs";
           name = "evil-mc";
         };
@@ -16685,7 +16874,7 @@
           sha256 = "16wn74690572n3xpxvnvka524fzswxxni3dy98bwpvsqj6yx2ds5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-nerd-commenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-nerd-commenter";
           sha256 = "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d";
           name = "evil-nerd-commenter";
         };
@@ -16706,7 +16895,7 @@
           sha256 = "1aq95hj8x13py0pwsnc6wvd8cc5yv5qin8ym9js42y5966vwj4np";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-numbers";
           sha256 = "1lpmkklwjdf7ayhv99g9zh3l9hzrwm0hr0ijvbc7yz3n398zn1b2";
           name = "evil-numbers";
         };
@@ -16727,7 +16916,7 @@
           sha256 = "0pir7a3xxbcp5f3q9pi36rpdpi8pbx18afmh0r3501ynssyjfq53";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-org";
           sha256 = "18w07fbafry3wb87f55kd8y0yra3s18a52f3m5kkdlcz5zwagi1c";
           name = "evil-org";
         };
@@ -16748,7 +16937,7 @@
           sha256 = "0b08y4spapl4g2292j3l4cr84gjlvm3rpma3gqld4yb1sxd7v78p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-paredit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-paredit";
           sha256 = "0xvxxa3gjgsrv10a61y0591bn3gj8v1ff2wck8s0svwfl076gyfy";
           name = "evil-paredit";
         };
@@ -16761,15 +16950,15 @@
     evil-quickscope = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-quickscope";
-        version = "20150929.1448";
+        version = "20160202.1324";
         src = fetchFromGitHub {
           owner = "blorbx";
           repo = "evil-quickscope";
-          rev = "d2f512fa4bd0b0603529a441e474ca551f621650";
-          sha256 = "0yx5ry102hzhqx1aql58fkd986xgj250bbcxabpnvy27gim2b977";
+          rev = "37a20e4c56c6058abf186ad4013c155e695e876f";
+          sha256 = "1ja9ggj70wf0nmma4xnc1zdzg2crq9h1cv3cj7cgwjmllflgkfq7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-quickscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-quickscope";
           sha256 = "0xym1mh4p68i00l1lshywf5fdg1vw3szxp3fk9fwfcg04z6vd489";
           name = "evil-quickscope";
         };
@@ -16790,7 +16979,7 @@
           sha256 = "12rdx5zjp5pck008cykpw200rr1y0b3lj2dpzf82llfyfaxzh7wi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-rails";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-rails";
           sha256 = "0ah0nvzl30z19566kacyrsznsdm3cpij8n3bw3dfng7263rh60gj";
           name = "evil-rails";
         };
@@ -16811,7 +17000,7 @@
           sha256 = "176rdp7mp9p0w5s7539jgldfn3r79q653g8yzcp99y59b8dycbh5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-rsi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-rsi";
           sha256 = "0mc39n72420n36kwyf9zpw1pgyih0aigfnmkbywb0yxgj7myc345";
           name = "evil-rsi";
         };
@@ -16832,7 +17021,7 @@
           sha256 = "1jfi2k9dm0cc9bx8klppm965ydhdw17a2n664199vhxrap6g27yk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-search-highlight-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-search-highlight-persist";
           sha256 = "0iia136js364iygi1mydyzwvizhic6w5z9pbwmhva4654pq8dzqy";
           name = "evil-search-highlight-persist";
         };
@@ -16853,7 +17042,7 @@
           sha256 = "0xwrg03w40pncdy5ppn7f77ravcbimj1ylc1r4clpqiha1d4xkhi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-smartparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-smartparens";
           sha256 = "1viwrd6gfqmwhlil80pk68dikn3cjf9ddsy0z781z3qfx0j35qza";
           name = "evil-smartparens";
         };
@@ -16874,7 +17063,7 @@
           sha256 = "0iyk8pn7pc3js3ppn46myzfr2i0b47wwrzv72939aydpw64rx76q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-snipe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-snipe";
           sha256 = "0gcmpjw3iw7rjk86b2k6clfigp48vakfjd1a9n8qramhnc85rgkn";
           name = "evil-snipe";
         };
@@ -16895,7 +17084,7 @@
           sha256 = "1x4nphjq8lvg8qsm1pj04mk9n59xc6jlxiv5s3bih1nl4xkssrxy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-space";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-space";
           sha256 = "1asvh873r1xgffvz3nr653yn8h5ifaphnafp6wf1b1mja6as7f23";
           name = "evil-space";
         };
@@ -16908,15 +17097,15 @@
     evil-surround = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-surround";
-        version = "20151210.1418";
+        version = "20160128.1228";
         src = fetchFromGitHub {
           owner = "timcharper";
           repo = "evil-surround";
-          rev = "9f1ab3c302d585c3489f0429b904e7e6e3204e94";
-          sha256 = "15vy2l6q0zm50wknw4fnz2v3j81p77y4ya7clk66lia3qdca4z9v";
+          rev = "bfa438cf62e29074b3fc68c582765a7e0f9907e4";
+          sha256 = "01p02h17ls0pmisnfbyna7xf6fz2c7fyyvdb1yq38dwv2j4zi1b4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-surround";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-surround";
           sha256 = "1bcjxw0yrk2bqj5ihl5r2c4id0m9wbnj7fpd0wwmw9444xvwp8ag";
           name = "evil-surround";
         };
@@ -16937,7 +17126,7 @@
           sha256 = "1rjpgcl9m23fzlw9gfp0yyf5k5dcgn88pjm8glmmdpx1b08ymk79";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-tabs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-tabs";
           sha256 = "0qgvpv5hcai8wmkv2fp6i2vdy7qp4gwidwpzz8j6vl9519x73s62";
           name = "evil-tabs";
         };
@@ -16958,7 +17147,7 @@
           sha256 = "10aic2r1akk38hh761hr5vp9fjlh1m5nimag0nzdq5x9g9467cc8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-terminal-cursor-changer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-terminal-cursor-changer";
           sha256 = "1300ch6f8mkz45na1hdffglhw0cdrrxmwnbd3g4m3sl5z4midian";
           name = "evil-terminal-cursor-changer";
         };
@@ -16979,7 +17168,7 @@
           sha256 = "1v4z2snllgg32cy8glv7xl0m9ib7rwi5ixgdydz1d0sx0z62jyhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-textobj-anyblock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-textobj-anyblock";
           sha256 = "03vk30s2wkcszcjxmh5ww39rihnag9cp678wdzq4bnqy0c6rnjwa";
           name = "evil-textobj-anyblock";
         };
@@ -17000,7 +17189,7 @@
           sha256 = "0nff90v6d97n2xizvfz126ksrf7ngd5rp0j7k7lhbv0v5zcqgxiv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-textobj-column";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-textobj-column";
           sha256 = "13q3nawx05rn3k6kzq1889vxjznr454cib96pc9lmrq7h65lym2h";
           name = "evil-textobj-column";
         };
@@ -17021,7 +17210,7 @@
           sha256 = "00yfq8aflxvp2nnz7smgq0c5wlb7cips5irj8qs6193ixlkpffvx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-tutor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-tutor";
           sha256 = "1hvc2w5ykrgh62n4sxqqqcdk5sd7nmh6xzv4mir5vf9y2dgqcvsn";
           name = "evil-tutor";
         };
@@ -17042,7 +17231,7 @@
           sha256 = "0m4ipz3x5k3gbyjgsnhl6rr4jvhqn61cyc1gmv0mkc2pbqqs1ijq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-vimish-fold";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-vimish-fold";
           sha256 = "01wp4h97hjyzbpd7iighjj26m79499wp5pn8m4pa7v59f6r3sdk6";
           name = "evil-vimish-fold";
         };
@@ -17063,7 +17252,7 @@
           sha256 = "07cmql8zsqz1qchq2mp3qybbay499dk1yglisig6jfddcmrbbggz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-visual-mark-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-visual-mark-mode";
           sha256 = "1qgr2dfhfz6imnlznicl7lplajd1s8wny7mlxs1bkms3xjcjfi48";
           name = "evil-visual-mark-mode";
         };
@@ -17084,7 +17273,7 @@
           sha256 = "11y2jrwbsw4fcx77zkhj1cn2hl1zcdqy00bv3mpbcrs03jywssrk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-visualstar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-visualstar";
           sha256 = "135l9hjfbpn0a6p53picnpydi9qs5vrk2rfn64gxa5ag2apcyycy";
           name = "evil-visualstar";
         };
@@ -17105,7 +17294,7 @@
           sha256 = "0739v0m9vj70a55z0canslyqgafzys815i7a0r6bxj2f9iwq6rhb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evm";
           sha256 = "19l6cs5schbnph0pwhhj66gkxsswd4bmjpy79l9kxzpjf107wc03";
           name = "evm";
         };
@@ -17126,7 +17315,7 @@
           sha256 = "1frhcgkiys0pqrlcsi5zcl3ngblr38wrwfi6wzqk75x21rnwnbqv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ewmctrl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ewmctrl";
           sha256 = "1w60pb7szai1kh06jd3qvgpzq3z1ci4a77ysnpqjfk326s6zv7hl";
           name = "ewmctrl";
         };
@@ -17147,7 +17336,7 @@
           sha256 = "1i6zf17rwa390c33cbspz81dz86vwlphyhjjsia4gp205nfk3s20";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eww-lnum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eww-lnum";
           sha256 = "1y745z4wa90snizq2g0amdwwgjafd6hkrayn93ca50f1wghdbk79";
           name = "eww-lnum";
         };
@@ -17164,11 +17353,11 @@
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "exec-path-from-shell";
-          rev = "4d6a6aa18031a4bbdd5b3bfad8686dc5ff942ab2";
-          sha256 = "0n86zj350jw1lxnaa450qmggza0za3a1zg9k9clwb9cjz4wwghsi";
+          rev = "c2ca275d3243e8253513ced73e3ac21dc352e303";
+          sha256 = "0xxk0cr28g7vw8cwsnwrdrc8xqr50g6m9h0v43mx2iws9pn9dd47";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/exec-path-from-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/exec-path-from-shell";
           sha256 = "1j6f52qs1m43878ikl6nplgb72pdbxfznkfn66wyzcfiz2hrvvm9";
           name = "exec-path-from-shell";
         };
@@ -17189,7 +17378,7 @@
           sha256 = "0wz4h5hrr5ci0w8pynd2nr1b2zl5hl4pa8gc16mcabik5927rf7z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/expand-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/expand-line";
           sha256 = "07nfgp6jlrb9wxqy835j79i4g88714zndidkda84z16qn2y901a9";
           name = "expand-line";
         };
@@ -17210,7 +17399,7 @@
           sha256 = "0qqqv0pp25xg1zh72i6fsb7l9vi14nd96rx0qdj1f3pdwfidqms1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/expand-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/expand-region";
           sha256 = "1c7f1nqsqdc75h22fxxnyg0m4yxj6l23sirk3c71fqj14paxqnwg";
           name = "expand-region";
         };
@@ -17231,7 +17420,7 @@
           sha256 = "0ah8zayipwp760909llb9whcdvmbsdgkg0x5y4qlcicm1r9kwcc7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/express";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/express";
           sha256 = "0lhisy4ds96bwpc7k8w9ws1zi1qh0d36nhxsp36bqzfi09ig0nb9";
           name = "express";
         };
@@ -17252,7 +17441,7 @@
           sha256 = "0nry653cd3qzsj6asrf9hh4zkzhz8nnwjrg1wp17f5ggzpjyybjw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/extempore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/extempore-mode";
           sha256 = "1z8nzpcj27s74kxfjz7wyr3848jpd6mbyjkssd06ri5p694j9php";
           name = "extempore-mode";
         };
@@ -17273,7 +17462,7 @@
           sha256 = "15dwl1rb3186k328a83dz9xmslc0px60ah16fifvmr3migis9hwz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/extend-dnd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/extend-dnd";
           sha256 = "0rknpvp8yw051pg3blvmjpp3c9a82jw7f10mq67ggbz98w227417";
           name = "extend-dnd";
         };
@@ -17294,7 +17483,7 @@
           sha256 = "0w2g7rpw26j65j4r23w6j8nw3arw73l601kyy6qv9p9bkk1yc072";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eyebrowse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eyebrowse";
           sha256 = "09fkzm8z8nkr4s9fbmfcjc80h50051f48v6n14l76xicglr5p861";
           name = "eyebrowse";
         };
@@ -17313,7 +17502,7 @@
           sha256 = "1fg3j0jlww2rqc6k2nq95hcg6i26nqdp043h7kyjcwrgqbjfsigl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eyedropper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eyedropper";
           sha256 = "07kdn90vm2nbdprw9hwdgi4py6gqzmrad09y1fwqdy49hrvbwdzk";
           name = "eyedropper";
         };
@@ -17334,7 +17523,7 @@
           sha256 = "1rgzydxv7c455vj1jm44vvs6xc4qgivqqb0g6zh5x4wdcpgdi2g9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eyuml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eyuml";
           sha256 = "0ada2gcl8bw9nn0fz8g9lbqy8a8w1554q03fzd7lv8qla33ri3wx";
           name = "eyuml";
         };
@@ -17355,7 +17544,7 @@
           sha256 = "15qa09x206s7rxmk35rslqniydh6hdb3n2kbspm5zrndcmsqz4zi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ez-query-replace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ez-query-replace";
           sha256 = "1h9ijr1qagwp9vvikh7ajby0dqgfypjgc45s7d93zb9jrg2n5cgx";
           name = "ez-query-replace";
         };
@@ -17376,7 +17565,7 @@
           sha256 = "0lzqfr5xgc3qvpbs6vf63yiw7pc2mybfvsrhczf9ghlmlawqa6k1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/f";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/f";
           sha256 = "0s7fqav0dc9g4y5kqjjyqjs90gi34cahaxyx2s0kf9fwcgn23ja2";
           name = "f";
         };
@@ -17397,7 +17586,7 @@
           sha256 = "0crhkdbxz1ldbrvppi95g005ni5zg99z1271rkrnk5i6cvc4hlq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fabric";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fabric";
           sha256 = "1mkblsakdhvi10b67bv3j0jsf7hr8lf9sibmprvx8smqsih7l88m";
           name = "fabric";
         };
@@ -17415,7 +17604,7 @@
           sha256 = "0yr3fqpn9pj6y8bsb6g7hkg75sl703pzngn8gp0sgs3v90c180l5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/face-remap+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/face-remap+";
           sha256 = "0vq6xjrv3qic89pxzi6mx1s08k4ba27g8wqm1ap4fxh3l14wkg0y";
           name = "face-remap-plus";
         };
@@ -17433,7 +17622,7 @@
           sha256 = "1kayc4hsalvqnn577y3f97w9kz94c53vcxwx01s0k34ffav919c2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/facemenu+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/facemenu+";
           sha256 = "0lbggalgkj59wj67z95949jmppmqrzrp63mdhw42r2x0fz1ir0iv";
           name = "facemenu-plus";
         };
@@ -17451,7 +17640,7 @@
           sha256 = "0sqrymmr583cgqmv4bs6rjms5ij5cm8vvxjrfc9alacwyz5f7w8m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/faces+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/faces+";
           sha256 = "0k3m434f3d3061pvir0dnykmv6r9jswl7pzybzja3afiy591hh92";
           name = "faces-plus";
         };
@@ -17472,7 +17661,7 @@
           sha256 = "0sjmjydapfnv979dx8dwiz67wffamiaf41s4skkwa0wn2h4p6wja";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/faceup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/faceup";
           sha256 = "0l41xp38iji55dv20lk7r187ywcz8s1g2jmwbjwkspzmcf763xvx";
           name = "faceup";
         };
@@ -17493,7 +17682,7 @@
           sha256 = "19zm9my7fl1r3q48axjv2f8x9hcjk6qah4y4r92b90bzfmcdc30y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/factlog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/factlog";
           sha256 = "163482vfpa52b5ya5xps4qnclbaql1x0q54gqdwwmm04as8qbfz7";
           name = "factlog";
         };
@@ -17514,7 +17703,7 @@
           sha256 = "1sc5f867h7i0n2gd9qcydqn1b2pk227l92ad4bf9nnpl3jmdr26v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/faff-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/faff-theme";
           sha256 = "1dmwbkp94zsddy0brs3mkdjr09n69maw2mrdfhriqcdk56qpwp4g";
           name = "faff-theme";
         };
@@ -17535,7 +17724,7 @@
           sha256 = "11fm0h9rily5731s137mgv8rdbfqi99s6f36bgr0arwbq3f2j3fs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fakespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fakespace";
           sha256 = "09dsmrqax4wfcw8fd5jf07bjxm5dizpc2qvjkqwg74j2n352wv27";
           name = "fakespace";
         };
@@ -17556,7 +17745,7 @@
           sha256 = "1w5apzbzr1jd983b0rzsy9ldb0z0zcq6mpyb5r8czl5wd4vvj69h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fakir";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fakir";
           sha256 = "07bicglgpm6qkcsxwj6rswhx4hgh27rfg8s1cki7g8qcvk2f7b25";
           name = "fakir";
         };
@@ -17577,7 +17766,7 @@
           sha256 = "0m7rjzl9js2gjfcaqp2n5pn5ykpqnv8qfv35l5m5kpfigsi9cbb0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fancy-battery";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fancy-battery";
           sha256 = "03rkfdkrzyal9abdiv8c73w10sm974hxf3xg5015hibfi6kzg8ii";
           name = "fancy-battery";
         };
@@ -17590,15 +17779,15 @@
     fancy-narrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fancy-narrow";
-        version = "20151021.533";
+        version = "20160124.603";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "fancy-narrow";
-          rev = "5196dc6066d354883fa21090266b6cebccc9f6fd";
-          sha256 = "1i6xq03fhkffahrlfjcds5mvk4rsipia9diaqv7qfbhzrfwvn665";
+          rev = "4737d706d1f3e90885e6642ba782f1fa605414c6";
+          sha256 = "0825hyz8b2biil0pd2bgjxqd2zm3gw9si7br5hnh51qasbaw9hid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fancy-narrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fancy-narrow";
           sha256 = "15i86jz6rdpva1az7gqp1wbm8kispcfc8h6v9fqsbag9sbzvgcyv";
           name = "fancy-narrow";
         };
@@ -17619,7 +17808,7 @@
           sha256 = "08lgfa2k42qpcs4999b77ycsg76zb56qbcxbsvmg0pcwjwa1ambz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/farmhouse-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/farmhouse-theme";
           sha256 = "0hbqdrw6x25b331qhbg3yaaa45c2b896wknsjm0a1kg142klq229";
           name = "farmhouse-theme";
         };
@@ -17640,7 +17829,7 @@
           sha256 = "0m2qn3rd16s7ahyw6f9a4jb73sdc8bqp6d03p450yzcn36lw78z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fasd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fasd";
           sha256 = "0i49z50bpi7fx0dm5jywlndnq9hb0dm5a906k4017w8y7sfpfl6c";
           name = "fasd";
         };
@@ -17661,7 +17850,7 @@
           sha256 = "0y95lrdqd9i2kbb266s1wdiim4m8vrn3br19d8s55ib6xlywf8cx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fastnav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fastnav";
           sha256 = "08hg256w8k9f5nzgpyl1jykbf28vmvv09kkhzs0s2zhwbl2158a5";
           name = "fastnav";
         };
@@ -17671,18 +17860,39 @@
           license = lib.licenses.free;
         };
       }) {};
+    faust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "faust-mode";
+        version = "20160119.1120";
+        src = fetchFromGitHub {
+          owner = "magnetophon";
+          repo = "emacs-faust-mode";
+          rev = "de3015c23aa26e8242e69293f0e2966b329b7dcf";
+          sha256 = "0m9nzl0z3gc6fjpfqklwrsxlcgbbyydls004a39wfppyz0wr94fy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/faust-mode";
+          sha256 = "1lfn4q1wcc3vzazv2yzcnpvnmq6bqcczq8lpkz7w8yj8i5kpjvsc";
+          name = "faust-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/faust-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fcitx";
-        version = "20160107.2318";
+        version = "20160202.1609";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "fcitx.el";
-          rev = "5e216df6df652599d921e00afb6e52a050f8cb50";
-          sha256 = "03w68zbgprly45i6ps7iviwvjf3acbc7f7acvjpzj2plf0g5i19z";
+          rev = "7a7a07c6cebb0f765a28d27de042c8088969a789";
+          sha256 = "0ybxm656j4p3j47cgh3xm4wln6rai16s8ag55dbsznxdn158c3ss";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fcitx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fcitx";
           sha256 = "0a8wd588c26p3czfp5hn2n46f2vwyg5v301sv0y07b55b1i3ynmx";
           name = "fcitx";
         };
@@ -17703,7 +17913,7 @@
           sha256 = "0c56j8ip2fyma9yvwaanz89jyzgi9k11xwwkflzlzc4smnvgfibr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fcopy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fcopy";
           sha256 = "13337ymf8vlbk8c4jpj6paqi06xdmk39yf72s40kmfrbvgmi8qy1";
           name = "fcopy";
         };
@@ -17720,11 +17930,11 @@
         src = fetchFromGitHub {
           owner = "michaelklishin";
           repo = "cucumber.el";
-          rev = "40886bc4cc5b1e855d6bb78505ebc651593d409d";
-          sha256 = "18b27xfajhd0vi7dcaky7pi7vmnlmdb88gkx3hwangj78d24as5d";
+          rev = "84562dd5cb2d86216cf548be47defb094de04960";
+          sha256 = "0ylm4zcf82f5rl4lps5p6p8dc3i5p2v7w93caadgzv5qbl400h5d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/feature-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/feature-mode";
           sha256 = "0ryinmpqb3c91qcna6gbijcmqv3skxdc947dlr5s1w623z9nxgqg";
           name = "feature-mode";
         };
@@ -17745,7 +17955,7 @@
           sha256 = "0pjw9fb3n08yd38680ifdn2wlnw2k6q97lzhqb2259mywsycyqy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fetch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fetch";
           sha256 = "1jqc6pspgcrdzm7ij46r1q6vpjq7il5dy2xyxwn2c1ky5a80paby";
           name = "fetch";
         };
@@ -17763,7 +17973,7 @@
           sha256 = "110h0ff7bkwx7icph0j997hq53zpyz426dji4vs89zf75cf1nl7s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fic-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fic-mode";
           sha256 = "037f2jr8bs2sfxw28cal2d49bsbrg0zkz2xdham627l04qnkgv8x";
           name = "fic-mode";
         };
@@ -17782,7 +17992,7 @@
           sha256 = "0xnr709vmwbryyfxngxs80gjfxv009ik6wcs4jd74ph5lm6gqh4f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/figlet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/figlet";
           sha256 = "1m7hw56awdbvgzdnjysb3wqkhkjqy68jxsxh9f7fx266wjqhp6yj";
           name = "figlet";
         };
@@ -17800,7 +18010,7 @@
           sha256 = "0s79b5jj3jfl3aih6r3fa0zix40arysk6mz4fijapd8ybaflz25n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/files+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/files+";
           sha256 = "1m1pxf6knrnyc9ygmyr27gm709ydxf0kkh1xrfcza6n476frmwr8";
           name = "files-plus";
         };
@@ -17818,7 +18028,7 @@
           sha256 = "020rpjrjp2gh4w6mrphrvk27kdizfqbjsw2sxraf8jz0dibg9gfg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/filesets+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/filesets+";
           sha256 = "06n8pw8c65bmrkxda2akvv57ndfijgbp95l40j7sjg8bjp385spn";
           name = "filesets-plus";
         };
@@ -17839,7 +18049,7 @@
           sha256 = "0gbqspqn4y7f2fwqq8210b6k5q22c0zr7b4ws8qgz9swav8g3vrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fill-column-indicator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fill-column-indicator";
           sha256 = "0w8cmijv7ihij9yyncz6lixb6awzzl7n9qpjj2bks1d5rx46blma";
           name = "fill-column-indicator";
         };
@@ -17860,7 +18070,7 @@
           sha256 = "1x9wmxbcmd6qgdyzrl978nczfqrgyk6xz3rnh5hffbapy1v1rw47";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fillcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fillcode";
           sha256 = "0bfsw55vjhx88jpy6npnzfwinvggivbvkk7fa3iwzq19005fkag2";
           name = "fillcode";
         };
@@ -17881,7 +18091,7 @@
           sha256 = "0f76cgh97z0rbbg2bp217nqmxfimzkvw85k9mx8bj78i9s2cdmwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/finalize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/finalize";
           sha256 = "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq";
           name = "finalize";
         };
@@ -17902,7 +18112,7 @@
           sha256 = "18a4ydp30ycx5w80j3xgghclzmzbvrkl2awxixy4aj68nmljk480";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-by-pinyin-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-by-pinyin-dired";
           sha256 = "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq";
           name = "find-by-pinyin-dired";
         };
@@ -17920,7 +18130,7 @@
           sha256 = "1pch1kjbgnbf8zmlxh6wg4ch9bpfg7hmwkw1mrr1hiym05xvza0m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-dired+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-dired+";
           sha256 = "06a6lwx61xindlchh3ps8khhxc6sr7i9d7i60rjw1h07nxmh0fli";
           name = "find-dired-plus";
         };
@@ -17941,7 +18151,7 @@
           sha256 = "0bf32nhpmjvvgnr6g9xqh8pqnhr3dl24y3g40lsv4pc8ffs70ydm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-file-in-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-file-in-project";
           sha256 = "0aznnv82xhnilc9j4cdmcgh6ksv7bhjjm3pa76hynnyrfn7kq7wy";
           name = "find-file-in-project";
         };
@@ -17962,7 +18172,7 @@
           sha256 = "090m5647dpc8r8fwi3mszvc8kp0420ma5sv0lmqr2fpxyn9ybkjh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-file-in-repository";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-file-in-repository";
           sha256 = "0q1ym06w2yn3nzpj018dj6h68f7rmkxczyl061mirjp8z9c6a9q6";
           name = "find-file-in-repository";
         };
@@ -17983,7 +18193,7 @@
           sha256 = "1d6zn3qsg4lpk13cvn5r1w88dnhfydnhwf59x6cb4sy5q1ihk0g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-temp-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-temp-file";
           sha256 = "0c98zm94958rb9kdvqr3pad744nh63y3vy3lshfm0lsg85k9j62p";
           name = "find-temp-file";
         };
@@ -18004,7 +18214,7 @@
           sha256 = "1r6cs7p43pi6n2inbrv9q924m679izxwxqgyr4sjjj3lg6an4cnx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-things-fast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-things-fast";
           sha256 = "1fs3wf61lzm1hxh5sx8pr74g7g9np3npdwg7xmk81b5f2jx2vy6m";
           name = "find-things-fast";
         };
@@ -18022,7 +18232,7 @@
           sha256 = "0x3f9qygp26c4yw32cgyy35bb4f1fq0fg7q8s9vs777skyl3rvp4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/finder+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/finder+";
           sha256 = "1ichxghp2vzx01n129fmjm6iwx4b98ay3xk1ja1i8vzyd2p0z8vh";
           name = "finder-plus";
         };
@@ -18040,7 +18250,7 @@
           sha256 = "0a04mgya59w468jv2bmkqlayzgh0r8sdz0qg3n70wn9rhdcwnl9q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/findr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/findr";
           sha256 = "0pxyfnn3f70gknxv09mfkjixqkzn77rdbql703wsslrj2v1l7bfq";
           name = "findr";
         };
@@ -18061,7 +18271,7 @@
           sha256 = "1vjgcxyzv2p74igr3y0z6hk7bj6yqwjawx90xvvmp9z7m91d4yrg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fingers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fingers";
           sha256 = "1r8fy6q6isjxz9mvaa8in4imdghzla3gg1l93dfm1v2rlr7bhzbg";
           name = "fingers";
         };
@@ -18082,7 +18292,7 @@
           sha256 = "14yy7kr2iv549xaf5gkav48lk2hzmvipwbs0rzljzw60il6k05hk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fiplr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fiplr";
           sha256 = "0l68rl5cy2maynny6iq6c4qr6c99y44i0i1z613k9rk08z7h0k5i";
           name = "fiplr";
         };
@@ -18103,7 +18313,7 @@
           sha256 = "02ajday0lnk37dnzf4747ha3w0azisq35fmdhq322hx0hfb1c66x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/firebelly-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/firebelly-theme";
           sha256 = "0lns846l70wcrzqb6p5cy5hpd0szh4gvjxd4xq4zsb0z5nfz97jr";
           name = "firebelly-theme";
         };
@@ -18124,7 +18334,7 @@
           sha256 = "0v8liv6aq10f8dxbl3d4rph1qk891dlxm9wqdc6w8aj318750hfm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/firecode-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/firecode-theme";
           sha256 = "10lxd93lkrvz8884dv4sh6fzzg355j7ab4p5dpvwry79rhs7f739";
           name = "firecode-theme";
         };
@@ -18137,15 +18347,15 @@
     firefox-controller = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, moz, popwin }:
     melpaBuild {
         pname = "firefox-controller";
-        version = "20160104.1725";
+        version = "20160125.1721";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "emacs-firefox-controller";
-          rev = "26a2e4b9246a7b5415032799b742b998529fce9e";
-          sha256 = "1rz56n2gmw11w2yxlhn0i8xmig9m8lxihgaikg65xmy9nqa5j7bj";
+          rev = "0282bccb8ef7edcacb54a4991cc2c51bfdbf04a7";
+          sha256 = "1hr4mfvaz8rc60fn5xi7sp1xn72rk2fg346di3mmcfnb9na9cbzq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/firefox-controller";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/firefox-controller";
           sha256 = "03y96b3l75w9al8ylijnlb8pcfkwddyfnh8xwig1b6k08zxfgal6";
           name = "firefox-controller";
         };
@@ -18166,7 +18376,7 @@
           sha256 = "1smg4mqc5qdwzk5mp2hfm6l4s7k408x46xfl7fl45csb18islmrp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fireplace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fireplace";
           sha256 = "1apcypznq23fc7xgy4xy1c5hvfvjx1xhyq3aaq1lf59v99zchciw";
           name = "fireplace";
         };
@@ -18187,7 +18397,7 @@
           sha256 = "0s8rml5xbskvnjpi8qp7vqflxhh5yis6zr6ay2bxmd2chjlhli55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/firestarter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/firestarter";
           sha256 = "1cpx664hyrdnpb1jps1x6lm7idwlfjblkfygj48cjz9pzd6ld5mp";
           name = "firestarter";
         };
@@ -18208,7 +18418,7 @@
           sha256 = "17djaz79spms9il71m4xdfjhm58dzswb6fpncngkgx8kxvcy9y24";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fish-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fish-mode";
           sha256 = "0l6k06bs0qdhj3h8vf5fv8c3rbhiqfwszrpb0v2cgnb6xhwzmq14";
           name = "fish-mode";
         };
@@ -18226,7 +18436,7 @@
           sha256 = "082c6yyb1269va6k602hxpdf7ylfxz8gq8swqzwf07qaas0b5qxd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fit-frame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fit-frame";
           sha256 = "1xcq4n9gj0npjjl98vqacms0a0wnzw62a9iplyf7bgj7n77pgkjb";
           name = "fit-frame";
         };
@@ -18236,6 +18446,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    fix-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fix-input";
+        version = "20160122.2319";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "fix-input";
+          rev = "728ae9258ebe790a69cf332407cba2f8c0be7d81";
+          sha256 = "16rd23ygh76fs4i7rni94k8gwa9n360h40qmhm65snp31kqnpr1p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fix-input";
+          sha256 = "03xpr7rlv0xq1d9126j1fk0c2j7ssf366n0yc8yzm9vq32n9pp4p";
+          name = "fix-input";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/fix-input";
+          license = lib.licenses.free;
+        };
+      }) {};
     fix-word = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fix-word";
@@ -18247,7 +18478,7 @@
           sha256 = "17f11v9sd5fay3i4k6lmpsjicdw9j3zvx3fvhx0a86mp7ay2ywwf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fix-word";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fix-word";
           sha256 = "0a8w09cx8p5pkkd4533nd199axkhdhs2a7blp7syfn40bkscx6xc";
           name = "fix-word";
         };
@@ -18268,7 +18499,7 @@
           sha256 = "1x4k8890pzdcizzl0p6v96ylrx5xid9ykgrmggx0b3y0gx0vhwic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fixmee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fixmee";
           sha256 = "0wnp6h8f547fsi1lkk4ajny7g21dnr76qfhxl82n0l5h1ps4w8mp";
           name = "fixmee";
         };
@@ -18296,7 +18527,7 @@
           sha256 = "07hv6l80ka10qszm16fpan8sas4b0qvl5s6qixxlz02fm7m0s7m5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flappymacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flappymacs";
           sha256 = "0dcpl5n7wwsk62ddgfrkq5dkm91569y4i4f0yqa61pdmzhgllx7d";
           name = "flappymacs";
         };
@@ -18317,7 +18548,7 @@
           sha256 = "0z77lm6jv2w5z551pwarcx6xg9kx8fgms9dlskngfvnzbqkldj1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flash-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flash-region";
           sha256 = "1rgg7j34ka0nj1yjl688asim07bbz4aavh67kly6dzzwndr0nw8c";
           name = "flash-region";
         };
@@ -18338,7 +18569,7 @@
           sha256 = "0ib6r6q4wbkkxdwgqsd25nx7ccxhk16lqkvwikign80j9n11g7s1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flatland-black-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flatland-black-theme";
           sha256 = "0cl2qbry56nb4prbsczffx8h35x91pgicw5pld0ndw3pxid9h2da";
           name = "flatland-black-theme";
         };
@@ -18359,7 +18590,7 @@
           sha256 = "0cl8m1i1aaw4zmkrkhfchhp0gxhpvhcmpjglsisjni47y5mydypf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flatland-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flatland-theme";
           sha256 = "14drqwcp9nv269aqm34d426a7gx1a7kr9ygnqa2c8ia1fsizybl3";
           name = "flatland-theme";
         };
@@ -18380,7 +18611,7 @@
           sha256 = "0j8pklgd2sk01glgkr24b5n5521425vws8zwdi4sxcv74922j5zr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flatui-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flatui-theme";
           sha256 = "0s88xihw44ks4b07wcb9swr52f3l1ls0jn629mxvfkv4a6hn7rmz";
           name = "flatui-theme";
         };
@@ -18401,7 +18632,7 @@
           sha256 = "187ah7yhmr3ckw23bf4fivx8v79yj0zmilrkjj7k6l198w8wmvql";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flex-autopair";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flex-autopair";
           sha256 = "0hphrqwryp3c0wwyf2f16hj8nc7jlg2dkvljgm2rdvmh2kgj3007";
           name = "flex-autopair";
         };
@@ -18421,7 +18652,7 @@
           sha256 = "02z1w8z9fqdshyyf03c26zjwhmmclb02caw3b6nhhk4w1rkbh6is";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flex-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flex-isearch";
           sha256 = "1msgrimi2a0xm5h23p78jflh00bl5bx44xpc3sc9pspznjv1d0k3";
           name = "flex-isearch";
         };
@@ -18442,7 +18673,7 @@
           sha256 = "1w913kw4b3dipawn567847jxl89j0prnf6656yqi2rp96axx3lhp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flim";
           sha256 = "1gkaq549svflx8qyqrk0ccb52b7wp17wmd5jgzkw1109bpc4k6jc";
           name = "flim";
         };
@@ -18460,7 +18691,7 @@
           sha256 = "1viigj04kla20dk46xm913jzqrmx05rpjrpghnc0ylbqppqdwzpw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fliptext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fliptext";
           sha256 = "0cmyan9hckjsv5wk1mvjzif9nrc07frhzkhhl6pkgm0j0f1q30ji";
           name = "fliptext";
         };
@@ -18481,7 +18712,7 @@
           sha256 = "12b1b7avjdbfm184mcg3bh3s6k0ygfz1sraz8q7qnrsyw4170893";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/floobits";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/floobits";
           sha256 = "1jpk0q4mkf9ag1rqyai993nz5ngzfvxq9n9avmaaq59gkk9cjraf";
           name = "floobits";
         };
@@ -18502,7 +18733,7 @@
           sha256 = "10f9135i9z2y4k0x6fbwm0g6vhsj6ag41xq504zpygqzp6y6ikmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flx";
           sha256 = "04plfhrnw7jx2jaxhbhw4ypydfcb8v0x2m5hyacvrli1mca2iyf9";
           name = "flx";
         };
@@ -18523,7 +18754,7 @@
           sha256 = "10f9135i9z2y4k0x6fbwm0g6vhsj6ag41xq504zpygqzp6y6ikmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flx-ido";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flx-ido";
           sha256 = "00wcwbvfjbcx8kyap7rl1b6nsgqdwjzlpv6al2cdpdd19rm1vgdc";
           name = "flx-ido";
         };
@@ -18544,7 +18775,7 @@
           sha256 = "1cmjw1zrb1nq9nx0d634ajli1di8x48k6s88zi2s2q0mbi28lzz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flx-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flx-isearch";
           sha256 = "14cshv5xb57ch5g3m3hfhawnnabdnbacp4kx40d0pw6jxw677gqd";
           name = "flx-isearch";
         };
@@ -18557,15 +18788,15 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20160117.1229";
+        version = "20160129.511";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "fe8b311cd90a7dc5cbfe1548104ca0b9f9212e9f";
-          sha256 = "0x5cw5qfchrj9bc5iaryrm2gnbm1liwjc7qdybgjhd1mbywpf4qh";
+          rev = "89d57c2771967b64351a1bc489a053912f06b48d";
+          sha256 = "1h172zkvlz1bx1s82vknm6wz2hhwk8253fdhd6bqaa2f5biivw71";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck";
           sha256 = "045k214dq8bmrai13da6gwdz97a2i998gggxqswqs4g52l1h6hvr";
           name = "flycheck";
         };
@@ -18586,7 +18817,7 @@
           sha256 = "0fh5z68gnggm0qjb8ncmfngv195lbp1dxz9jbmdi418d47mlba9c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-ats2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-ats2";
           sha256 = "0xm7zzz6hs5qnqkmv7hwxpvp3jjca57agx71sj0m12v0h53gbzhr";
           name = "flycheck-ats2";
         };
@@ -18607,7 +18838,7 @@
           sha256 = "0klnhq0zfn5zbkwl7y9kja7x49n1w6r1qbphk7a7v9svgm3h9s7n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-cask";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-cask";
           sha256 = "1lq559nyhkpnagncj68h84i3cq85vhdikr534kj018n2zcilsyw7";
           name = "flycheck-cask";
         };
@@ -18620,15 +18851,15 @@
     flycheck-checkbashisms = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-checkbashisms";
-        version = "20160103.2026";
+        version = "20160120.2007";
         src = fetchFromGitHub {
           owner = "Gnouc";
           repo = "flycheck-checkbashisms";
-          rev = "e7941394f016a1363698f129cad8340a396c9fb8";
-          sha256 = "159r4bdfwn6s88j2ky85x2m4hs7y55kfkr0jd1fvc60zpy8xcqqy";
+          rev = "6acb957a33a21e61764792b80ba4e33e88f2271f";
+          sha256 = "18nhfj0vx8rg2236nb9475s27rhyb34m81i7l6zkhifqba6rb0bb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-checkbashisms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-checkbashisms";
           sha256 = "1rq0ymlr1dl39v0sfyjmdv4pq3q9116cz9wvgpvfgalq8759q5sz";
           name = "flycheck-checkbashisms";
         };
@@ -18649,7 +18880,7 @@
           sha256 = "1ckzs32wzqpnw89rrw3l7i4gbyn25wagbadsc4mcrixml5nf0mck";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-clangcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-clangcheck";
           sha256 = "1316cj3ynl80j39ha0371ss7cqw5hcr3m8944pdacdzbmp2sak2m";
           name = "flycheck-clangcheck";
         };
@@ -18670,7 +18901,7 @@
           sha256 = "0ndhhcfgpd5yg95jg64785mc9g6cgm1k7dwakzb3qlqnynbrjrcp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-clojure";
           sha256 = "1b20gcs6fvq9pm4nl2qwsf34sg6wxngdql921q2pyh5n1xsxhm28";
           name = "flycheck-clojure";
         };
@@ -18691,7 +18922,7 @@
           sha256 = "11xc08xld758xx9myqjsiqz8vk3gh4d9c4yswswvky6mrx34c0y5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-color-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-color-mode-line";
           sha256 = "0hw19nsh5h2l8qbp7brqmml2fhs8a0x850vlvq3qfd7z248gvhrq";
           name = "flycheck-color-mode-line";
         };
@@ -18712,7 +18943,7 @@
           sha256 = "073vkjgcyqp8frsi05s6x8ml3ar6hwjmn2c7ryfab5b35kp9gmdi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-css-colorguard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-css-colorguard";
           sha256 = "1n56j5nicac94jl7kp8fbqxmd115vbhzklzgfz5jbib2ab8y60jc";
           name = "flycheck-css-colorguard";
         };
@@ -18722,18 +18953,39 @@
           license = lib.licenses.free;
         };
       }) {};
+    flycheck-cstyle = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
+    melpaBuild {
+        pname = "flycheck-cstyle";
+        version = "20160126.2116";
+        src = fetchFromGitHub {
+          owner = "alexmurray";
+          repo = "flycheck-cstyle";
+          rev = "50a8899c61083f6f5466a0b1b954fe3efdc2ecf2";
+          sha256 = "072868zy2624m8la0i291f8xmqlv4s1r683qw8l0s24vhi1d22fk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-cstyle";
+          sha256 = "0p3lzpcgwk4nkq1w0iq40njz8ll2h3vi9z5fbvv1ar4r80fqd909";
+          name = "flycheck-cstyle";
+        };
+        packageRequires = [ emacs flycheck ];
+        meta = {
+          homepage = "http://melpa.org/#/flycheck-cstyle";
+          license = lib.licenses.free;
+        };
+      }) {};
     flycheck-d-unittest = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-d-unittest";
-        version = "20150709.109";
+        version = "20160125.618";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-d-unittest";
-          rev = "f2255abf6a5cd9268b1576d9b46356f8151a7311";
-          sha256 = "1r71alxbxwcrdf3r5rg7f0bdwh0ylvayp5g97i9biyxdg59az4ad";
+          rev = "93de1f358ca4b2964c43a465031f3efa8561af06";
+          sha256 = "0b4yq39c8m03pv5cgvvqcippc3yfphpgjw3bh2bnxch1pwfik3xm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-d-unittest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-d-unittest";
           sha256 = "0n4m4f0zqcx966582af1nqff5sla7jcr0wrmgzzxnn97yjrlnzk2";
           name = "flycheck-d-unittest";
         };
@@ -18754,7 +19006,7 @@
           sha256 = "1hw875dirz041vzw1pxjpk5lr1zmrp2kp9m6pazs9j19d686hyn6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-dedukti";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-dedukti";
           sha256 = "00nc18w4nsi6vicpbqqpr4xcdh48g95vnay3kirb2xp5hc2rw3x8";
           name = "flycheck-dedukti";
         };
@@ -18775,7 +19027,7 @@
           sha256 = "15dc76r047pnxll229z0pmpn76zw3cc6qs81b7wg7yc5czsk8axh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-dialyzer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-dialyzer";
           sha256 = "0bn81yzijmnfg5xcnvcvxvqxz995iaafhgbfckgcal974s229kd2";
           name = "flycheck-dialyzer";
         };
@@ -18796,7 +19048,7 @@
           sha256 = "0dqkd9h54qmr9cv2gmic010j2h03i80psajrv4wq3c4pvxyqyn2j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-dmd-dub";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-dmd-dub";
           sha256 = "0pg3sf7h6xqv65yqclhlb7fx1mp2w0m3qk4vji6m438kxy6fhzqm";
           name = "flycheck-dmd-dub";
         };
@@ -18817,7 +19069,7 @@
           sha256 = "08dlm3g2d8rl53hq0b4z7gp8529almlkyf69d3c8f9didmlhizk7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-elm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-elm";
           sha256 = "06dpv19wgbw48gbf701c77vw1dkpddx8056wpim3zbvwwfwk8ra4";
           name = "flycheck-elm";
         };
@@ -18838,7 +19090,7 @@
           sha256 = "0lk7da7axn9fm0kzlzx10ir014rsdsycffi8jcy4biqllw6yi4dx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-flow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-flow";
           sha256 = "0p4vvk09vjgk98dwzr2qzldvij3v6af56pradssi6sm3shbqhkk3";
           name = "flycheck-flow";
         };
@@ -18859,7 +19111,7 @@
           sha256 = "0q1m1f3vhw1wy0pa3njy55z28psznbw2xwmwk2v1p5c86n74ns8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-ghcmod";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-ghcmod";
           sha256 = "0mqxg622lqnkb52a0wff7h8b0k6mm1k7fhkfi95fi5sahclja0rp";
           name = "flycheck-ghcmod";
         };
@@ -18880,7 +19132,7 @@
           sha256 = "0j2mvf3zjznwkm8dykcgs1v5sz0i882mrivghxqr3h6n3ni4wag4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-gometalinter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-gometalinter";
           sha256 = "1bnvj5kwgbh0dv989rsjcvmcij1ahwcz0vpr6a8f2p6wwvksw1h2";
           name = "flycheck-gometalinter";
         };
@@ -18901,7 +19153,7 @@
           sha256 = "0fykawnq9ch1vj76rsimwbmn2xxdamsnvbj4ahqaqhq7adb2wyrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-google-cpplint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-google-cpplint";
           sha256 = "0llrvg6mhcsj5aascsndhbv99122zj32agxk1w6s8xn8ksk2i90b";
           name = "flycheck-google-cpplint";
         };
@@ -18922,7 +19174,7 @@
           sha256 = "01y3nv4h5zz4w2bydw7f2w98rbyhbyq80w5w5y5nal5w4vd76qb7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-haskell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-haskell";
           sha256 = "12lgirz3j6n5ns2ikq4n41z0d33qp1lb5lfz1q11qvpbpn9d0jn7";
           name = "flycheck-haskell";
         };
@@ -18943,7 +19195,7 @@
           sha256 = "1x61q0fqr1jbqs9kk59f565a02qjxh1gnp1aigys0yz6qnshvzbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-hdevtools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-hdevtools";
           sha256 = "0ahvai1q4x59ryiyccvqvjisgqbaiahx4gk8ssaxhblhj0sqga93";
           name = "flycheck-hdevtools";
         };
@@ -18964,7 +19216,7 @@
           sha256 = "1ax55yhf9q8i8z1f97zp3r08dqv8npd2llllbwa67d1bj49bsf2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-irony";
           sha256 = "0qk814m5s7mjba659llml0gy1g3045w8l1g73w2pnm1pbpqdfn3z";
           name = "flycheck-irony";
         };
@@ -18985,7 +19237,7 @@
           sha256 = "15cgqbl6n3nyqiizgs2zvcvfs6bcnjk3bj81lhhwrzizbjvap3rv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-ledger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-ledger";
           sha256 = "0807pd2km4r60wgd6jakscbx63ab22d9kvf1cml0ad8wynsap7jl";
           name = "flycheck-ledger";
         };
@@ -19006,7 +19258,7 @@
           sha256 = "0isqa6ybdd4166h3rdcg0b8pcxn00v8dav58xwfcj92nhzvs0qca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-mercury";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-mercury";
           sha256 = "1z2y6933f05yv9y2aapmn876jnsydh642zqid3j88bb9kqi67x0h";
           name = "flycheck-mercury";
         };
@@ -19027,7 +19279,7 @@
           sha256 = "1vdnw6hnhg8aqcsdqcd2rqz4fsfgxn2xr3xixkvwmpplb4x40c8k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-mypy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-mypy";
           sha256 = "1w418jm6x3vcg2x31nzc8a3b8asx6gznl6m76ip8w98riz7vy02f";
           name = "flycheck-mypy";
         };
@@ -19048,7 +19300,7 @@
           sha256 = "06hs41l41hm08dv93wldd98hmnd3jqbg58pj5ymn15kgdsy1rirg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-nim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-nim";
           sha256 = "0w6f6998rqx8a3i4xhga7mrmvhxrm690wkqwfzspidid2z7v71az";
           name = "flycheck-nim";
         };
@@ -19069,7 +19321,7 @@
           sha256 = "0fm8w7126vf04n76qhh33rzybvl1n7va2whbqzafbvmv2nny3v94";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-ocaml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-ocaml";
           sha256 = "1cv2bb66aql2kj1y1gsl4xji8yrzrq6rd8hxxs5vpfsk47052lf7";
           name = "flycheck-ocaml";
         };
@@ -19090,7 +19342,7 @@
           sha256 = "0aa8cnh9f0f2zr2kkba2kf9djzjnsd51fzj8l578pbj016zdarwd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-package";
           sha256 = "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d";
           name = "flycheck-package";
         };
@@ -19111,7 +19363,7 @@
           sha256 = "0ffas4alqhijvm8wl1p5nqjhnxki8gs6b5bxb4nsqwnma8qmlcx3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-perl6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-perl6";
           sha256 = "0czc0fqx7g543afzkbjyz4bhxfl4s3v5swn9xrkayv8cgk8acvp4";
           name = "flycheck-perl6";
         };
@@ -19124,15 +19376,15 @@
     flycheck-pos-tip = callPackage ({ dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, pos-tip }:
     melpaBuild {
         pname = "flycheck-pos-tip";
-        version = "20160115.453";
+        version = "20160122.905";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck-pos-tip";
-          rev = "a42e15a2965bf086228375ab7a4db3603b862c5a";
-          sha256 = "1kcjw0s8lx4lbkfqksf92i0iz509l2vbrkknyd7xx0yqlkvxfkyf";
+          rev = "f0f8a4232b53494d6cf13934b53c61ed6c32273f";
+          sha256 = "11brmradnsz3qqj11rviwdh6hqhbicgycr2zs5wrfbq8rifx4cv1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-pos-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-pos-tip";
           sha256 = "09i2jmwj8b915fhyczwdb1j7c551ggbva33avis77ga1s9v3nsf9";
           name = "flycheck-pos-tip";
         };
@@ -19153,7 +19405,7 @@
           sha256 = "0dq4ikqskkpcl3z4s5vl6h4f4bx4dsgyn2knlr3x4wjcgzyrv0qn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-protobuf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-protobuf";
           sha256 = "0cn5b9pr9i9hrix7dbrylwb2812al8ipbpqvlb9bm2f8hc9kgsmc";
           name = "flycheck-protobuf";
         };
@@ -19166,15 +19418,15 @@
     flycheck-purescript = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "flycheck-purescript";
-        version = "20160117.1049";
+        version = "20160118.1745";
         src = fetchFromGitHub {
           owner = "emacs-pe";
           repo = "flycheck-purescript";
-          rev = "6716f7b193b18d92082edd8ebfbd137ed92aec93";
-          sha256 = "12bjlrzkfz2ixi0d7jzbasgaliswdpkqi5j32rg8mac8hncgq5jr";
+          rev = "586bf33da5c474a76428b97b83dea6c7b0e9e416";
+          sha256 = "1r8k38ldw7mldhl2hsqc8gvb99svc1vlhlqfnj8hqd3vvqxd5r1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-purescript";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-purescript";
           sha256 = "05j1iscyg9khw0zq63676zrisragklxp48hmbc7vrbmbiy964lwd";
           name = "flycheck-purescript";
         };
@@ -19195,7 +19447,7 @@
           sha256 = "16albss527dq4ncpiy8p326fib038qc6wjbh985lw2p1f9babswa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-pyflakes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-pyflakes";
           sha256 = "186h5ky48i1xmjbvvhn1i0rzhsy8bgdv1d8f7rlr2z4brb52f9c1";
           name = "flycheck-pyflakes";
         };
@@ -19216,7 +19468,7 @@
           sha256 = "08ar85p5llk0lxlm2rd7rfc8s449vrknsrzzxqg8kvakgpd0nx7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-rust";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-rust";
           sha256 = "1k0n0y6lbp71v4465dwq7864vp1qqyx7zjz0kssszcpx5gl1596w";
           name = "flycheck-rust";
         };
@@ -19237,7 +19489,7 @@
           sha256 = "17mhsxnixw37x9jpy59nn3npw93r1rza2zcw6jmqzandmj0jyvm4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-status-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-status-emoji";
           sha256 = "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p";
           name = "flycheck-status-emoji";
         };
@@ -19258,7 +19510,7 @@
           sha256 = "0hn3qjff1lcpd2ghjixkkq2bpmrmqab3860vy38yw201yy4xmn5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-tip";
           sha256 = "0zab1zknrnsw5xh5pwzzcpz7p40bbywkf9zx99sgsd6b5j1jz656";
           name = "flycheck-tip";
         };
@@ -19279,7 +19531,7 @@
           sha256 = "0m9fjfpand20qy9d196z5khiznn25n95zbmgs8q2s2wcn4f7022p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-typescript-tslint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-typescript-tslint";
           sha256 = "141x4scl13gqxyg0nlc8vig1iaybc3g95il5r51k4k83isi62iyq";
           name = "flycheck-typescript-tslint";
         };
@@ -19296,11 +19548,11 @@
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "80c6d7c663b6ccc32b851348f1099790ac4c9736";
-          sha256 = "1c3c3frd9fdb77wkhg8f8g29dvr86ryzf9prg4pm8wvhifa4yhvg";
+          rev = "c64684df763411249985159ee33b10d948b9fc91";
+          sha256 = "12jwqhzqskdp2l6h60rich19rddzjcl94zaf72ljnq8h0mqc3xy0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-ycmd";
           sha256 = "0m99ssynrqxgzf32d35n17iqyh1lyc6948inxpnwgcb98rfamchv";
           name = "flycheck-ycmd";
         };
@@ -19321,7 +19573,7 @@
           sha256 = "10i0rbvk6vyifgbgskdyspmw9q64x99fzi8i1h8bgv58xhfx6pm7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-coffee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-coffee";
           sha256 = "1aig1d4fgjdg31vrg8k43z5hbqiydgfvxi45p1695s3kbdm8pr2d";
           name = "flymake-coffee";
         };
@@ -19342,7 +19594,7 @@
           sha256 = "1dlxn8hhz3gfrhvkwhlxjmby6zc0g8yy9n9j9dn8c4cbi2fhyx5m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-cppcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-cppcheck";
           sha256 = "11brzgq2zl32a8a2dgj2imsldjqaqvxwk2jypf4bmfwa3mkcqh3d";
           name = "flymake-cppcheck";
         };
@@ -19363,7 +19615,7 @@
           sha256 = "00cnz3snhs44aknq6wmf19hq9bzb5pj0hvfzz93l6n7ngd8vvpzy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-css";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-css";
           sha256 = "0kqm3wn9symqc9ivnh11gqgq8ql2bhpqvxfm86d8vwm082hd92c5";
           name = "flymake-css";
         };
@@ -19381,7 +19633,7 @@
           sha256 = "10cpzrd588ya52blghxss5zkn6x8hc7bx1h0qbcdlybbmkjgpkxr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-cursor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-cursor";
           sha256 = "1s065w0z3sfv3d348w4zhlw96xf3j28bcz14sl46963mj2dm90lr";
           name = "flymake-cursor";
         };
@@ -19402,7 +19654,7 @@
           sha256 = "1mylcsklnv3q27q1gvf7wrila39rmxab1ypmvjh5p56d91y6pszc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-easy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-easy";
           sha256 = "19p6s9fllgvs35v167xf624k5dn16l9fnvaqcj9ks162gl9vymn7";
           name = "flymake-easy";
         };
@@ -19423,7 +19675,7 @@
           sha256 = "04w6g4wixrpfidxbk2bwazhvf0cx3c2v2mxnycqqlqkg0m0sb0fn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-elixir";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-elixir";
           sha256 = "15r3m58hnc75l3j02xdr8yg25fbn2sbz1295ac44widzis82m792";
           name = "flymake-elixir";
         };
@@ -19444,7 +19696,7 @@
           sha256 = "14kbqyw4v1c51dx7pfgqbn8x4j8j3rgyyq2fa9klqzxpldcskl24";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-gjshint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-gjshint";
           sha256 = "19jcd5z4883z3fzlrdn4fzmsvn16f4hfnhgw4vbs5b0ma6a8ka44";
           name = "flymake-gjshint";
         };
@@ -19465,7 +19717,7 @@
           sha256 = "03gh0y988pksghmmvb5av2vnlbcsncafvn4nwihsis0bhys8k28q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-go";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-go";
           sha256 = "030m67d8g60ljm7ny3jh4vwj3cshypsklgbjpcvh32y109ga1hy1";
           name = "flymake-go";
         };
@@ -19486,7 +19738,7 @@
           sha256 = "0zldhlvxmk0xcjmj4ns48pp4h3bvijrzs1md69ya7m3dmsbayfrc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-google-cpplint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-google-cpplint";
           sha256 = "0q7v70xbprh03f1yabq216q4q82a58s2c1ykr6ig49cg1jdgzkf3";
           name = "flymake-google-cpplint";
         };
@@ -19507,7 +19759,7 @@
           sha256 = "08rcsg76qdq2l6z8q339yw770kv1q657ywqvq6a20pxxz2158a8l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-haml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-haml";
           sha256 = "0dmdhh12h4xrx6mc0qrwavngk2sx0l4pfqkjjyavabsgcs9wlgp1";
           name = "flymake-haml";
         };
@@ -19528,7 +19780,7 @@
           sha256 = "0hwcgas83wwhk0szwgw7abf70400knb8dfabknwv0qrcsk4gqffd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-haskell-multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-haskell-multi";
           sha256 = "0cyzmmghwkkv6020s6n436lwymi6dr49i7gkci5n0hw5pdywcaij";
           name = "flymake-haskell-multi";
         };
@@ -19549,7 +19801,7 @@
           sha256 = "003fdrgxlyhs595ndcdzhmdkcpsf9bpw53hrlrrrh07qlnqxwrvp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-hlint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-hlint";
           sha256 = "0wq1ijhn3ypy31yk8jywl5hnz0r0vlhcxjyznzccwqbdc5vf7b2x";
           name = "flymake-hlint";
         };
@@ -19570,7 +19822,7 @@
           sha256 = "0ywm9fpb7d7ry2fly8719fa41q97yj9za3phqhv6j1chzaxvcv3a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-jshint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-jshint";
           sha256 = "0j4djylz6mrq14qmbm35k3gvvsw6i9qc4gd9ma4fykiqzkdjsg7j";
           name = "flymake-jshint";
         };
@@ -19591,7 +19843,7 @@
           sha256 = "0y01albwwcnhj4pnpvcry0zw7z2g9py9q2p3sw5zhgw3g0v5p9ls";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-jslint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-jslint";
           sha256 = "1cq8fni4p0qhigx0qh34ypmcsbnilra1ixgnrn9mgg8x3cvcm4cm";
           name = "flymake-jslint";
         };
@@ -19612,7 +19864,7 @@
           sha256 = "1qn15pr7c07fmki484z5xpqyn8546qb5dr9gcp5n1172wnh2a534";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-json";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-json";
           sha256 = "1p5kajiycpqy2id664bs0fb1mbf73a43qqfdi4c57n6j9x7fxp4d";
           name = "flymake-json";
         };
@@ -19633,7 +19885,7 @@
           sha256 = "0ggi8a4j4glpsar0sqg8q06rscajjaziis5ann31wphx88rc5wd7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-less";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-less";
           sha256 = "05k5daphxy94164c73ia7f4l1gv2cmlw8xzs8xnddg7ly22gjhi0";
           name = "flymake-less";
         };
@@ -19654,7 +19906,7 @@
           sha256 = "1fz7kywp1y2nhp50b2v961wz604sw1gzqcid4k8igz9aii3ygxcv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-lua";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-lua";
           sha256 = "0pa66ymhazcfgd9jmxizq5w2sgj008hph42wsa9ljr2rina1gai6";
           name = "flymake-lua";
         };
@@ -19675,7 +19927,7 @@
           sha256 = "1f4l2r4gp03s18255jawc7s5abpjjrw54937wzygmvzvqvmaiikj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-perlcritic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-perlcritic";
           sha256 = "0hibnh463wzhvpix7gygpgs04gi6salwjrsjc6d43lxlsn3y1im8";
           name = "flymake-perlcritic";
         };
@@ -19696,7 +19948,7 @@
           sha256 = "09mibjdji5mf3qvngspv1zmik1zd9jwp4mb4c1w4256202359sf4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-php";
           sha256 = "12ds2l5kvs7fz38syp4amasbjkpqd36rlpajnb3xxll0hbk6vffk";
           name = "flymake-php";
         };
@@ -19717,7 +19969,7 @@
           sha256 = "140rlp6m0aqibwa0bhv8w6l3giziybqdw7x271nq8f3r60ch13bi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-phpcs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-phpcs";
           sha256 = "0zzxi3c203fiw6jp1ar9bb9f28x2lg23bczgy8n5cicrq59jfsn9";
           name = "flymake-phpcs";
         };
@@ -19738,7 +19990,7 @@
           sha256 = "1r3yjqxig2j7l50l787qsi96mkvjcgqll9vb4ci51j7b43d53c5m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-puppet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-puppet";
           sha256 = "1izq6s33p74dy4wzfnjii8wjs723bm5ggl0w6hkvzgbmyjc01hxv";
           name = "flymake-puppet";
         };
@@ -19759,7 +20011,7 @@
           sha256 = "1aijapvpw4skfhfmz09v5kpaxay6b0bp77bbjkrvgyizsqdd39vp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-python-pyflakes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-python-pyflakes";
           sha256 = "0asbjxv03zkbcjayanv13qzbv4z7b6fi0z1j6yv7fl6q9mgvm497";
           name = "flymake-python-pyflakes";
         };
@@ -19780,7 +20032,7 @@
           sha256 = "13yk9cncp3zw6d7zkgdpgprpw6wrirk2gxgjvkr15dwcyx1g3109";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-ruby";
           sha256 = "1shr6d03vx85nmyxnysglzlc1pz0zy3n28nrcmxqgdm02g197bzr";
           name = "flymake-ruby";
         };
@@ -19801,7 +20053,7 @@
           sha256 = "1qxb3vhh83ikhmm89ms7irdip2l03hnjcq5ncmgywkaqkpslaacv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-rust";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-rust";
           sha256 = "080cvgl2cg08kyvmgg080zqb6k6bngga3m5lfwb2dpmi1bajywc1";
           name = "flymake-rust";
         };
@@ -19822,7 +20074,7 @@
           sha256 = "0rwjiplpqw3rrh76llnx2fn78f6avxsg0la5br46q1rgw4n8r1w1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-sass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-sass";
           sha256 = "0sz6n5r9pdphgvvaljg9zdwj3dqayaxzxmb4s8x4b05c8yx3ba0d";
           name = "flymake-sass";
         };
@@ -19843,7 +20095,7 @@
           sha256 = "0c2lz1p91yhprmlbmp0756d96yiy0w92zf0c9vlp0i9abvd0cvkc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-shell";
           sha256 = "13ff4r0k29yqgx8ybxz7hh50cjsadcjb7pd0075s9xcrzia5x63i";
           name = "flymake-shell";
         };
@@ -19864,7 +20116,7 @@
           sha256 = "0qpr0frcn3w0f6yz8vgavwbxvn6wb0qkfk653v4cfy57dvslr4wf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-vala";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-vala";
           sha256 = "0yp81phd96z594ckav796qrjm0wlkrfsl0rwpmgg840qn49w71vx";
           name = "flymake-vala";
         };
@@ -19885,7 +20137,7 @@
           sha256 = "0mdam39a85csi9b90wak9j3zkd25lj6x54affwkg3fym8yphmplm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-yaml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-yaml";
           sha256 = "17wghm797np4hlidf3wwb47w4klwc6qyk6ry1z05psl3nykws1g7";
           name = "flymake-yaml";
         };
@@ -19906,7 +20158,7 @@
           sha256 = "07hy1kyw4cbxydmhp4scsy3dcbk2s50rmdp8rch1vbcjk5lj4mvb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flyparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flyparens";
           sha256 = "1mvbfq062qj8vmgzk6rymg3idlfc1makfp1scmjvpw98h30j2a0a";
           name = "flyparens";
         };
@@ -19927,7 +20179,7 @@
           sha256 = "1g09s57b773nm9xqslzbin5i2h18k55nx00s5nnkvx1qg0n0mzkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flyspell-lazy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flyspell-lazy";
           sha256 = "0lzazrhsfh5m7n57dzx0v46d5mg87wpwwkjzf5j9gpv1mc1xfg1y";
           name = "flyspell-lazy";
         };
@@ -19948,7 +20200,7 @@
           sha256 = "1rdpggnw9mz3qr4kp5gh9nvwncivj446vdhpc04d4jgrl568bhqb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flyspell-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flyspell-popup";
           sha256 = "0wp15ra1ry6xpwal6mb53ixh3f0s4nps0rdyfli7hhaiwbr9bhql";
           name = "flyspell-popup";
         };
@@ -19969,7 +20221,7 @@
           sha256 = "1fk4zsb4jliwz10sqz5bpqgj1p479mc506dmvy4zq3vqnpbypqvs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fm";
           sha256 = "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f";
           name = "fm";
         };
@@ -19990,7 +20242,7 @@
           sha256 = "0984fhf1nlpdh9mh3gd2xak3v2rlv76qxppqvr6a4kl1dxwg37r3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fm-bookmarks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fm-bookmarks";
           sha256 = "12ami0k6rfwhrr6xgj0dls4mkk6dp0r9smwzhr4897dv0lw89bdj";
           name = "fm-bookmarks";
         };
@@ -20003,15 +20255,15 @@
     focus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "focus";
-        version = "20160111.722";
+        version = "20160131.1618";
         src = fetchFromGitHub {
           owner = "larstvei";
           repo = "Focus";
-          rev = "307df45c69d3a830b4caee8c418a3feff522f13a";
-          sha256 = "11ya3pfqfx8jpib1p6pys8vwn10q8ac5wla35d2nl6glnijx3cj5";
+          rev = "abad47f1c40e595779c376a1e936c1609be1cdf4";
+          sha256 = "0vqjyc00ba9wy2rn454hhy9rnnghljc1i8f3zrpkdmkqn5cg3336";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/focus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/focus";
           sha256 = "0jw26j8npyl3dgsrs7ap2djxmkafn2hl6gfqvi7v76bccs4jkyv8";
           name = "focus";
         };
@@ -20032,7 +20284,7 @@
           sha256 = "1k5xhnr1jkfw8896kf2nl4633r6ni5bnc53rs6lxn8y9lj0srafb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/focus-autosave-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/focus-autosave-mode";
           sha256 = "1zwp99mk360mqk4mjnnjr6islavginc9732p0jn9g5yz62xypxpc";
           name = "focus-autosave-mode";
         };
@@ -20053,7 +20305,7 @@
           sha256 = "1yz1wis31asw6xa5maliyd1ck2q02xnnh7dc6swgj9cb4wi7k6i1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fold-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fold-dwim";
           sha256 = "0c9yxx45zlhb1h4ldgkjv7bndwlagpyingaaqn9dcsxidrvp3p5x";
           name = "fold-dwim";
         };
@@ -20074,7 +20326,7 @@
           sha256 = "14jvbkahwvv4wb0s9vp8gqmlpv1d4269j5rsjxn79q5pawjzslxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fold-dwim-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fold-dwim-org";
           sha256 = "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn";
           name = "fold-dwim-org";
         };
@@ -20095,7 +20347,7 @@
           sha256 = "1cbabpyp66nl5j8yhyj2jih4mhaljxvjh9ij05clai71z4598ahn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fold-this";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fold-this";
           sha256 = "1iri4a6ixw3q7qr803cj2ik7rvmww1b6ybj5q2pvkf1v25r8655d";
           name = "fold-this";
         };
@@ -20116,7 +20368,7 @@
           sha256 = "1z2dkyzj1gq3gp9cc3lhi240f8f3yjpjnw520xszm0wvx1rp06ny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/folding";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/folding";
           sha256 = "0rb4f4llc4z502znmmc0hfi7n07lp01msx4y1iyqijvqzlq2i93y";
           name = "folding";
         };
@@ -20134,7 +20386,7 @@
           sha256 = "04j9xybn9an3bm2p2aqmqnswxxg3gwq2mc96brkgxkr88h316d4q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/font-lock+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/font-lock+";
           sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g";
           name = "font-lock-plus";
         };
@@ -20155,7 +20407,7 @@
           sha256 = "04n32rgdz7m24jji8p0j42zmf2r60sdbbr4mkr6435fqyvmdd20k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/font-lock-studio";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/font-lock-studio";
           sha256 = "0swwbfaypc78cg4ak24cc92kgxmr1x9vcpaw3jz4zgpm2wzbgmrq";
           name = "font-lock-studio";
         };
@@ -20176,7 +20428,7 @@
           sha256 = "1k90w8v5rpswqb8fn1cc8sq5w12gf4sn6say5dhvqd63512b0055";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/font-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/font-utils";
           sha256 = "0k33jdchjkj7j211a23kfp5axg74cfsrrq4axsb1pfp124swh2n5";
           name = "font-utils";
         };
@@ -20197,7 +20449,7 @@
           sha256 = "103xz042h8w6c85hn19cglfsa34syjh18asm41rjhr9krp15sdl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fontawesome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fontawesome";
           sha256 = "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3";
           name = "fontawesome";
         };
@@ -20218,7 +20470,7 @@
           sha256 = "1jw888nqmbi9kcd9ycl2fqrmrnqxnmkx72n0b3nf3hp7j956yb21";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/forecast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/forecast";
           sha256 = "0whag2n1120384w304g0w4bqr7svdxxncdhnz4rznfpxlgiw2rsc";
           name = "forecast";
         };
@@ -20239,7 +20491,7 @@
           sha256 = "1fczg710a0rjs932yv6vv9rwr9g5ii6cwva82nqfzyhlkf0b1sn5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/foreign-regexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/foreign-regexp";
           sha256 = "189cq8n759f28nx10fn3w4qbq7q49bb788kp9l70pj38jgnjn7n7";
           name = "foreign-regexp";
         };
@@ -20260,7 +20512,7 @@
           sha256 = "00wqn8h50xr90pyvwk4sv552yiajlzq56wh6f6lad5w90j47q1lx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/foreman-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/foreman-mode";
           sha256 = "0p3kwbld05wf3dwcv0k6ynz727fiy0ik2srx4js9wvagy57x98kv";
           name = "foreman-mode";
         };
@@ -20281,7 +20533,7 @@
           sha256 = "0nj056x87gcpdqkgx3li5syp6wbj58a1mw2aqa48zflbqwyvs03i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/form-feed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/form-feed";
           sha256 = "1abwjkzi3irw0jwpv3f584zc72my9n8iq8zp5s0354xk6iwrl1rh";
           name = "form-feed";
         };
@@ -20302,7 +20554,7 @@
           sha256 = "0mikksamljps1czacgqavlnzzhgs8s3f8q4jza6v3csf8kgp5zd0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/format-sql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/format-sql";
           sha256 = "0684xqzs933vj9d3n3lv7afk4gii41kaqykbb05cribaswapsanj";
           name = "format-sql";
         };
@@ -20323,7 +20575,7 @@
           sha256 = "1nqx2igxmwswjcrnzdjpx5qcjr60zjy3q9cadq5disms17wdcr6y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fortpy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fortpy";
           sha256 = "1nn5vx1rspfsijwhilnjhiy0mjw154ds3lwxvkpwxpchygirlyxj";
           name = "fortpy";
         };
@@ -20344,7 +20596,7 @@
           sha256 = "1kk04hl2y2svrs07w4pq9f4g7vs9qzy2qpw9prvi1gravmnfrzc4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fortune-cookie";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fortune-cookie";
           sha256 = "0xg0zk7hnyhnbhqpxnzrgqs5yz0sy6wb0n9982qc0pa6jqnl9z78";
           name = "fortune-cookie";
         };
@@ -20357,15 +20609,15 @@
     fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "fountain-mode";
-        version = "20160105.2011";
+        version = "20160118.2004";
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "fountain-mode";
-          rev = "8aab9a3020846f48baf1e22500d1cfde95bab353";
-          sha256 = "0mwsmqfm2y5158kkaf91m5c616fxx5467649wdi9zl21izmc04d4";
+          rev = "cca2529a2d97ab404f51edd82a73bfabf7656a2d";
+          sha256 = "0jrqkrjjqg471x9ymzf5faxnv9zc8lyy2lh2m4dys2l4wc704lhr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fountain-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fountain-mode";
           sha256 = "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840";
           name = "fountain-mode";
         };
@@ -20378,13 +20630,13 @@
     frame-cmds = callPackage ({ fetchurl, frame-fns, lib, melpaBuild }:
     melpaBuild {
         pname = "frame-cmds";
-        version = "20151231.1522";
+        version = "20160124.1026";
         src = fetchurl {
           url = "http://www.emacswiki.org/emacs/download/frame-cmds.el";
-          sha256 = "190qkf856b769qzkpbrjnfl8sw9x7nwzacf9mr6adxnav07v0fay";
+          sha256 = "1867zmm3pyqz8p9ig44jf598z9jkyvbp04mfg6j6ys3hyqfkw942";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/frame-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/frame-cmds";
           sha256 = "0xwzp6sgcb5ap76hpzm8g4kl08a8cgq7i2x9w64njyfink7frwc0";
           name = "frame-cmds";
         };
@@ -20402,7 +20654,7 @@
           sha256 = "0lvlyxb62sgrm37hc21dn7qzlrq2yagiwpspa926q6dpzcsbam15";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/frame-fns";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/frame-fns";
           sha256 = "1wq8wva9q1hdzkvjk582a3fgig0lpqz9ch1p2jd6p29kb1i15f5p";
           name = "frame-fns";
         };
@@ -20423,7 +20675,7 @@
           sha256 = "0n6jhm1198c8slvdymsfjif0dfx3wlf8q4mm0yvpiln46shhwldx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/frame-restore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/frame-restore";
           sha256 = "0b321iyf57nkrm6xv8d1aydivrdapdgng35zcnrg298ws2naysvm";
           name = "frame-restore";
         };
@@ -20444,7 +20696,7 @@
           sha256 = "1vvkdgj8warl40kqmd0408q46dxy9qp2sclq4q92b6falry9qy30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/frame-tag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/frame-tag";
           sha256 = "1n13xcc3ny9j9h1h4vslpjl6k9mqksr73kgmqrmkq301p8zps94q";
           name = "frame-tag";
         };
@@ -20462,7 +20714,7 @@
           sha256 = "03ll68d0j0b55rfxymzcirdigkmxcy8556d0i67ghdzmcqfwily7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/framemove";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/framemove";
           sha256 = "10qf017j0zfnzmcs1i56pznhbvgw7mv4232p8znqaaxphgh6r0ar";
           name = "framemove";
         };
@@ -20483,7 +20735,7 @@
           sha256 = "11h9xw6jnw7dacyv1jch2a77xp7hfb93690m7hhazy6l87xmm4dk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/framesize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/framesize";
           sha256 = "1rwiwx3n7gkpfihbf6ndl1lxza4zi2rlj5av6lfp5qypbw9wddkf";
           name = "framesize";
         };
@@ -20504,7 +20756,7 @@
           sha256 = "12rmwf7gm9ib2c99jangygh2yswy41vxlp90rg0hvlhdfmbqa8p0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/free-keys";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/free-keys";
           sha256 = "0j9cfgy2nkbska4lm5z32p804i9n8pdgn50bs5zzk1ilwd5vbalj";
           name = "free-keys";
         };
@@ -20525,7 +20777,7 @@
           sha256 = "0zwlnzbi91hkfz1jgj9s9pxwi21s21cwp6psdm687wj2a3wy4231";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fringe-current-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fringe-current-line";
           sha256 = "125yn0wbrrxrmdn7qfxj0f4538sb3xnqb3r2inz3gpblc1vxnqb8";
           name = "fringe-current-line";
         };
@@ -20546,7 +20798,7 @@
           sha256 = "0ra9rc53l1gvkqank8apasl3r7wz2yfjrcvmfk3wpxhh24ppxv9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fringe-helper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fringe-helper";
           sha256 = "1vki5jd8jfrlrjcfd12gisgk12y20q3943i2qjgg4qvcj9k28cbv";
           name = "fringe-helper";
         };
@@ -20559,15 +20811,15 @@
     fsharp-mode = callPackage ({ auto-complete, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, s }:
     melpaBuild {
         pname = "fsharp-mode";
-        version = "20160108.450";
+        version = "20160126.945";
         src = fetchFromGitHub {
           owner = "rneatherway";
           repo = "emacs-fsharp-mode-bin";
-          rev = "9169baa9290e92d2e0ccc3cfd9c2a423136eb251";
-          sha256 = "1ckq45szq8lfg4spmvrj53s3p1hfl7x8k86cgq254gbs7kq8w7p2";
+          rev = "b2a70da8ba3c573e02c6a9951ef5f0089cec6c78";
+          sha256 = "115xl18nsg2j9sbp3qqzrjfpnzczk1zmrwrfrpqjq3jmv21ilsv3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fsharp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fsharp-mode";
           sha256 = "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z";
           name = "fsharp-mode";
         };
@@ -20580,15 +20832,15 @@
     fstar-mode = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20151023.953";
+        version = "20160118.2138";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "5e7c3d5a4b5422284d8ef4b69023b1fd71952b81";
-          sha256 = "0qq2gradcibjhn477sljy4lnsmi3pzlac42hpa92c6ca1srh3lc4";
+          rev = "2d9874827702c919590a19540d6641a4ffa245fd";
+          sha256 = "19f3fzz0p99mc747m2qqii0idslac3q0fc1q39macd8kx715jkhl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fstar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fstar-mode";
           sha256 = "0kyzkghdkrnqqbd5b969pjyz9jxgq0j8hkmvlcwikl7ynnhm9lgy";
           name = "fstar-mode";
         };
@@ -20608,7 +20860,7 @@
           sha256 = "e2bddf41eacdf63ce42ff433b0a23da3a8de21a6e6b11ab8405ae5a17e09b493";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fuel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fuel";
           sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756";
           name = "fuel";
         };
@@ -20629,7 +20881,7 @@
           sha256 = "0bjny4ryrs788myhiaf3ir99vadf2v4swa5gkz9i36a7j6wzpgk5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/full-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/full-ack";
           sha256 = "09ikhyhpvkcl6yl6pa4abnw6i7yfsx5jkmzypib94w7khikvb309";
           name = "full-ack";
         };
@@ -20642,15 +20894,15 @@
     fullframe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fullframe";
-        version = "20160118.816";
+        version = "20160119.411";
         src = fetchFromGitHub {
           owner = "tomterl";
           repo = "fullframe";
-          rev = "73b945389e021aa43dbb4edde09a8ae404a6a79b";
-          sha256 = "0f0k37kl85j9373i2bdsy6g2lspar794x46di36sccr84719946r";
+          rev = "24a362bc6e2db08ada1a53292d526d472d41e7b2";
+          sha256 = "1gq67hx5m3ifzr49k110azcr5y68sdb3aljqx3yg71apfi5dg4w6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fullframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fullframe";
           sha256 = "08sh8lmb6g8asv28fcb36ilcn0ka4fc6ka0pnslid0h4c32fxp2a";
           name = "fullframe";
         };
@@ -20671,7 +20923,7 @@
           sha256 = "0m7fcw0cswypiwi5abg6vhw7a3agx9vhp10flbbbji6lblb0fya8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/function-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/function-args";
           sha256 = "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak";
           name = "function-args";
         };
@@ -20690,7 +20942,7 @@
           sha256 = "109z1d0zrya1s9wy28nz5ynpg4zl7i1p6q1n57m1b1kkhhckjcv5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/furl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/furl";
           sha256 = "15njmanpj3qb8ic3k4sbrngqnsg85lvlj32dmii3y9bpgvis3k6f";
           name = "furl";
         };
@@ -20711,7 +20963,7 @@
           sha256 = "0rzp8c2164w775ggm2fs4j5dz33vqcah84ysp81majirwfql1niv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fuzzy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fuzzy";
           sha256 = "1hwdh9bx4g4vzzyc20vdwxsii611za37kc9ik40kwjjk62qmll8h";
           name = "fuzzy";
         };
@@ -20729,7 +20981,7 @@
           sha256 = "1iv0x1cb12kknnxyq2gca7m3c3rg9s4cxz397sazkh1csrn0b2i7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fuzzy-format";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fuzzy-format";
           sha256 = "055b8710yxbi2sdqsqk6jqgnzky4nykv8jgqgwy8q2isgj6q98jb";
           name = "fuzzy-format";
         };
@@ -20747,7 +20999,7 @@
           sha256 = "1q3gbv9xp2jxrf9vfarjqk9k805xc9z72zbaw7aqdxrj1bafxwnz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fuzzy-match";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fuzzy-match";
           sha256 = "0mpy84f2zdyzmipzhs06b8rl2pxiypazf35ls1nc1yj8r16ijrds";
           name = "fuzzy-match";
         };
@@ -20768,7 +21020,7 @@
           sha256 = "0w2kqmx38ji5273mzhn9sp4r6vn7jfwb5qpsf2w8d46avpf8rj5i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fvwm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fvwm-mode";
           sha256 = "07y32cnp4qfhncp7s24gmlxljdrj5miicinfaf4gc7hihb4bkrkb";
           name = "fvwm-mode";
         };
@@ -20789,7 +21041,7 @@
           sha256 = "08qnyr945938hwjg1ypkf2x4mfxbh3bbf1xrgz1rk2ddrfv7hmkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fwb-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fwb-cmds";
           sha256 = "0wnjvi0v0l2h1mhwlsk2d8ggwh3nk7pks48l55gp18nmj00jxycx";
           name = "fwb-cmds";
         };
@@ -20802,15 +21054,15 @@
     fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "fxrd-mode";
-        version = "20151220.1444";
+        version = "20160121.1253";
         src = fetchFromGitHub {
           owner = "msherry";
           repo = "fxrd-mode";
-          rev = "e8c93535cc04083d3b63a1944770488984bc19ce";
-          sha256 = "1n2cvingj7li61k1ff4kmf2gf591fdkslvqsqk0lh71nz59c543j";
+          rev = "7b49c7bec2ed4a579fa0234555667377e8ba0f53";
+          sha256 = "1sk2z71xfi4wqb7ap8jvad8cbzdbilwzqx9vy45zmgx1jh7g4ba9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fxrd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fxrd-mode";
           sha256 = "17zimg64lqc1yh9gnp5izshkvviz996aym7q6n9p61a4kqq37z4r";
           name = "fxrd-mode";
         };
@@ -20831,7 +21083,7 @@
           sha256 = "08x5li0mshrlamr7vswy7xh358bqhh3pngjr4ckswfi0l2r5fjbd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fyure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fyure";
           sha256 = "0k5z2xqlrzp5lyvp2lr462x38kqdmqld845bvyvkfjd2k4yri71x";
           name = "fyure";
         };
@@ -20852,7 +21104,7 @@
           sha256 = "0rjn4z7ssl1jy0brvsci44mhpig3zkdbcj8gcylzznhz0qfk1ljj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fzf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fzf";
           sha256 = "0jjzm1gq85fx1gmj6nqaijnjws9bm8hmk40ws3x7fmsp41qq5py0";
           name = "fzf";
         };
@@ -20873,7 +21125,7 @@
           sha256 = "0sn3y1ilbg532mg941qmzipvzq86q31x86ypaf0h0m4015r7l59v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gandalf-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gandalf-theme";
           sha256 = "0wkmsg3pdw98gyp3q508wsqkzw821qsqi796ynm53zd7a4jfap4p";
           name = "gandalf-theme";
         };
@@ -20885,14 +21137,14 @@
       }) {};
     gap-mode = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "gap-mode";
-        version = "20160109.2332";
+        version = "20160204.936";
         src = fetchhg {
           url = "https://bitbucket.com/gvol/gap-mode";
-          rev = "605c441c15b6";
-          sha256 = "0ff0p86j59ki4dy2cd0iwy0lp577bfl2izh1xbnz623kn4nwzvid";
+          rev = "1de32f2ff384";
+          sha256 = "1jsw2mywc0y8sf7yl7y3i3l8vs3jv1srjf34lgb5xfz6p8wc5lc0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gap-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gap-mode";
           sha256 = "07whab3gi4b8gsvy5ijmjnj700lw0rm3bnr1769byhnpi7qpqin2";
           name = "gap-mode";
         };
@@ -20913,7 +21165,7 @@
           sha256 = "0j0dg7nl9kmanayvw0712x5c5x9h48qmqdsyi0pijvgmv8l5slg5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gather";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gather";
           sha256 = "1f0cqqp1a7w8g1pfvzxxb0hjrxq4m79a4n85dncqj2xhjxrkm0xk";
           name = "gather";
         };
@@ -20932,7 +21184,7 @@
           sha256 = "01kbvmylymm6qww45mbjjxmb8ccdl9c2pxdyqfq3g73vwzrvndk4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/geben";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/geben";
           sha256 = "1hvvy1kp8wrb1qasm42fslgdkg095g4jxgzbnwpa4vp5cq270qbm";
           name = "geben";
         };
@@ -20953,7 +21205,7 @@
           sha256 = "14v5gm931dcsfflhsvijr4ihx7cs6jymvnjzph3arvhvqwyqhwgq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/geeknote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/geeknote";
           sha256 = "1ci82fj3layd95lqj2w40y87xps6bs7x05z8ai9m59k244g26m8v";
           name = "geeknote";
         };
@@ -20966,15 +21218,15 @@
     geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "geiser";
-        version = "20160107.1832";
+        version = "20160119.2245";
         src = fetchFromGitHub {
           owner = "jaor";
           repo = "geiser";
-          rev = "296c3b687d8eeb520c7ccf52282e46dfe1ef3a4e";
-          sha256 = "0hkqv2cm0559aihy0kazra48jr4icy43vc46mmcs4gf99lpzdd4x";
+          rev = "04b0b3915741860a61532059b7e5291b7b98e031";
+          sha256 = "0mcn29ldm01vf7np73mn29j69n6nlc17vb789m65cl59gm4b7lb8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/geiser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/geiser";
           sha256 = "067rrjvyn5sz60w9h7qn542d9iycm2q4ryvx3n6xlard0dky5596";
           name = "geiser";
         };
@@ -20995,7 +21247,7 @@
           sha256 = "1l3ps28a1wdrg2fgvvkdxdadfgpplijs4ig1yqq8yi7k13k046p4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/general-close";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/general-close";
           sha256 = "17v0aprfvxbygx5517a8hrl88qm5lb9k7523yd0ps5p9l5x96964";
           name = "general-close";
         };
@@ -21016,7 +21268,7 @@
           sha256 = "08cw1fa25kbhbq2sp1cpn90bz38i9hjfdj93xf6wvki55b52s0nn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/genrnc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/genrnc";
           sha256 = "1nwbdscl0yh9j1n421can93m6s8j9dkyb3xmpampr6x528g6z0lm";
           name = "genrnc";
         };
@@ -21037,7 +21289,7 @@
           sha256 = "0344w4sbd6wlgl13j163v0hzjw9nwhvpr5s7658xsdd90wp4i701";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/german-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/german-holidays";
           sha256 = "0fgrxdgyl6va6axjc5l4sp90pyqaz5zha1g73xyhbxblshm5dwxn";
           name = "german-holidays";
         };
@@ -21058,7 +21310,7 @@
           sha256 = "1ch8yp0mgk57x0pny9bvkknsqj27fd1rcmpm9s7qpryrwqkp1ix4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gerrit-download";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gerrit-download";
           sha256 = "1rlz0iqgvr8yxnv5qmk29xs1jwf0g0ckzanlyldcxvs7n6mhkjjp";
           name = "gerrit-download";
         };
@@ -21079,7 +21331,7 @@
           sha256 = "0bwjiq4a4f5pg0ngvc3lmkk7aki8n9zqfa1dym0lk4vy6yfhcbhp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ggo-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ggo-mode";
           sha256 = "1403x530n90jlfz3lq2vfiqx84cxsrhgs6hhmniq960cjj31q35p";
           name = "ggo-mode";
         };
@@ -21100,7 +21352,7 @@
           sha256 = "1qjh7av046ax4240iw40hv5fc0k23c36my9hili7fp4y2ak99l8n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ggtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ggtags";
           sha256 = "1cmry4knxbx9257ivhfxsd09z07z3g3wjihi99nrwmhb9h4mpqyw";
           name = "ggtags";
         };
@@ -21121,7 +21373,7 @@
           sha256 = "0fkq3yl9jpakfnahymjv28fcal38c210garnq055rgmyhyhhpdwd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gh";
           sha256 = "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0";
           name = "gh";
         };
@@ -21142,7 +21394,7 @@
           sha256 = "0g3bjpnwgqczw6ddh4mv7pby0zyqzqgywjrjz2ib6hwmdqzyp1s0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gh-md";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gh-md";
           sha256 = "0b72fl1hj7gkqlqrr8hklq0w3ryqqqfn5qpb7a9i6q0vh98652xm";
           name = "gh-md";
         };
@@ -21159,11 +21411,11 @@
         src = fetchFromGitHub {
           owner = "kazu-yamamoto";
           repo = "ghc-mod";
-          rev = "566dbebe298f1e75254a4c3aa07d7410612659d4";
-          sha256 = "01qf3xjqybk9ligaqyarzhdgmwgfkgi19mw9aiggg15fgrix977k";
+          rev = "d77e262915d5726dc48549e3e7ea25c89e675475";
+          sha256 = "06p4hg8nkjphqkfim3ax1v82i29sfawfd8bdc4i3zrlbrvhdcnli";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ghc";
           sha256 = "0xqriwggd1ahla5aff7k0j4admx6q18rmqsx3ipn4nfk86wrhb8g";
           name = "ghc";
         };
@@ -21184,7 +21436,7 @@
           sha256 = "1ywwyc2kz1c1s26c412nmzh55cinh84cfiazyyi3jsy5zzwhrbhi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ghc-imported-from";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ghc-imported-from";
           sha256 = "10cxz4c341lknyz4ns63bri00mya39278xav12c73if03llsyzy5";
           name = "ghc-imported-from";
         };
@@ -21205,7 +21457,7 @@
           sha256 = "17fl3k2sqiavbv3bp6rnp3p89j6pnpkkp7wi26pzzk4675r5k45q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ghci-completion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ghci-completion";
           sha256 = "1a6k47z5kmacj1s5479393jyj27bjx0911yaqfmmwg2hr0yz7vll";
           name = "ghci-completion";
         };
@@ -21226,7 +21478,7 @@
           sha256 = "0lcbyw6yrl6c8py5v2hqghcbsf9cbiplzil90al4lwqps7rw09a8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gherkin-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gherkin-mode";
           sha256 = "0dhrsz24hn0sdf22wpmzbkn66g4540vdkl03pc27kv21gwa9ixxv";
           name = "gherkin-mode";
         };
@@ -21247,7 +21499,7 @@
           sha256 = "1aj5j0y244r1fbbbl0lzb53wnyhljw91kb4n3hi2gagm7zwp8jcf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ghq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ghq";
           sha256 = "0prvywcgwdhx5pw66rv5kkfriahal2mli2ibam5np3z6bwcq4ngh";
           name = "ghq";
         };
@@ -21268,7 +21520,7 @@
           sha256 = "1na8pp1g940zi22jgqi6drsm12db0hyw99v493i5j1p2y67c4hxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gildas-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gildas-mode";
           sha256 = "0bc3d8bnvg1w2chrr4rp9daq1x8p41qgklrniq0bbkr2h93cmkgv";
           name = "gildas-mode";
         };
@@ -21281,15 +21533,15 @@
     gist = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, melpaBuild }:
     melpaBuild {
         pname = "gist";
-        version = "20151228.2141";
+        version = "20160118.1856";
         src = fetchFromGitHub {
           owner = "defunkt";
           repo = "gist.el";
-          rev = "8219359f88644ebf3a00e7011a39426416336939";
-          sha256 = "1xiwb6m5ibz228aiizhavkd0w7vcxsx6nlk8kkhhdwffj8cglf2d";
+          rev = "88d0e5be77fefad9fe1413505a80bdac7a9e7361";
+          sha256 = "18433gjhra0gqrwnxssd3njpxbvqhh64bds9rym1vq9l7w09z024";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gist";
           sha256 = "053fl8aw0ram9wsabzvmlm5w2klwd2pgcn2w9r1yqfs4xqja5sd3";
           name = "gist";
         };
@@ -21310,7 +21562,7 @@
           sha256 = "0471xm0h6jkmxnrcqy5agq42i8immdb2qpnw7q7czrbsl521al8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git";
           sha256 = "1nd2yvfgin13m368gjn7xah99glspnam4g4fh348x4makxcaw8w5";
           name = "git";
         };
@@ -21331,7 +21583,7 @@
           sha256 = "0yxmrcrvl9pbwhd7w4vnrv2jqyskzvqp17sr3vzjlvv694jd4dms";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-annex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-annex";
           sha256 = "0194y24vq1w6m2cjgqgx9dqp99cq8y9licyry2zxa5brbrsxi94l";
           name = "git-annex";
         };
@@ -21352,7 +21604,7 @@
           sha256 = "0psmr7749nzxln4b500sl3vrf24x3qijp12ir0i5z4x25k72hrlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-auto-commit-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-auto-commit-mode";
           sha256 = "0nf4n63xnzcsizjk1yl8qvqj9wjdqy57kvn6r736xvsxwzd44xgl";
           name = "git-auto-commit-mode";
         };
@@ -21373,7 +21625,7 @@
           sha256 = "0g839pzmipjlv32r0gh166jn3na5d0wh2w1sia2k4yx1w0ch1bsx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-blame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-blame";
           sha256 = "0glmnj77vya8ivjin4qja7lis67wyibzy9k6z8b54z7mqf9ikx06";
           name = "git-blame";
         };
@@ -21394,7 +21646,7 @@
           sha256 = "1irqmypgc4l1jlzj4g65ihpic3ffnnkcg1hlysj7qpip5nbflqgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-command";
           sha256 = "1hsxak63y6648n0jkzl5ajxg45w84qq8vljvjh0bmwfrbb67kwbg";
           name = "git-command";
         };
@@ -21407,15 +21659,15 @@
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "20160118.58";
+        version = "20160130.849";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "45b06a7b8664046fd1aecb3f07db535edd80d013";
-          sha256 = "1c6x10nm5syahn85vrgg9i6i7kzy4h7l9alahaxb71w6jwf91rsg";
+          rev = "08d0d095c7c16fb8223d3beeea232412f88936f5";
+          sha256 = "08h1lypdvgv0rkq1sjkmw9zwvbjwvpklzjyawb5chgfa5grgfiii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-commit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-commit";
           sha256 = "1i7122fydqga68cilgzir80xfq77hnrw75zrvn52mjymfli6aza2";
           name = "git-commit";
         };
@@ -21428,15 +21680,15 @@
     git-commit-insert-issue = callPackage ({ fetchFromGitLab, fetchurl, github-issues, helm, lib, melpaBuild, projectile, s }:
     melpaBuild {
         pname = "git-commit-insert-issue";
-        version = "20151204.619";
+        version = "20160122.949";
         src = fetchFromGitLab {
           owner = "emacs-stuff";
           repo = "git-commit-insert-issue";
-          rev = "1bdfd1960bc279ca830e034a6708b25493b3f460";
-          sha256 = "0axy8r0cs8mdsxvs57p7gqyp4lpr5a2d49947j8ri7xmxp77jwp1";
+          rev = "df1c86ac1ec9f40b11fa5c7400966ef97f4c3c67";
+          sha256 = "1vdyrqg2w5q4xmazqqh2ymjnrp9p1x5172nllwryz43jvvxaw05s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-commit-insert-issue";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-commit-insert-issue";
           sha256 = "0mhpszm2y178dxgjv3kh2n744hg2kd60h16zbgmjf4f8228xw8j3";
           name = "git-commit-insert-issue";
         };
@@ -21454,7 +21706,7 @@
           sha256 = "074k1r8rkvyhhwnqy4gnyd7shidxgc25l1xq4hmnwjn13nsyqfnv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-dwim";
           sha256 = "0vdd2cksiqbnxplqbpb16bcmp137fj3p9a7pa0622wx8vd5p0rkr";
           name = "git-dwim";
         };
@@ -21467,15 +21719,15 @@
     git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-gutter";
-        version = "20160116.100";
+        version = "20160202.1027";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-git-gutter";
-          rev = "88b526b6611e9847ef0a55075930565c61e5a220";
-          sha256 = "0mim9gvyh7rfp4k4y1y10pwpdpiik2xnw5lkvsv6259cs1fqyv8s";
+          rev = "07410145fe492c9f36c8fa3e91c0e8210c73ba96";
+          sha256 = "0hgqimvh09nppm96x5mz4kzdqr9f8dja3si9xn1169xl1279kqvb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-gutter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-gutter";
           sha256 = "12yjl9hsd72dwzl42hdcmjfdbxyi356jcq0kz8k7jvcsn57z4p2k";
           name = "git-gutter";
         };
@@ -21496,7 +21748,7 @@
           sha256 = "0vc1da72vwlys723xi7xvv4ii43sjxgsywb2ss0l0kcm0rays6lv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-gutter-fringe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-gutter-fringe";
           sha256 = "14wyiyyi2rram2sz3habvmygy5a5m2jfi6x9fqcyfr3vpcjn1k4i";
           name = "git-gutter-fringe";
         };
@@ -21517,7 +21769,7 @@
           sha256 = "1rsj193zpblndki4khjjlwl2njxb329d42l75ki55msxifqrn4fi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-gutter-fringe+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-gutter-fringe+";
           sha256 = "1zkjb8p08cq2nqskn79rjszlhp9mrblplgamgi66yskz8qb1bgcc";
           name = "git-gutter-fringe-plus";
         };
@@ -21538,7 +21790,7 @@
           sha256 = "0bhrrgdzzj8gwxjx7b2kibp1b6s0vgvykfg0n47iq49m6rqkgi5q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-gutter+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-gutter+";
           sha256 = "1w78p5cz6kyl9kmndgvwnfrs80ha707s8952hycrihgfb6lixmp0";
           name = "git-gutter-plus";
         };
@@ -21551,15 +21803,15 @@
     git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-lens";
-        version = "20150817.214";
+        version = "20160204.37";
         src = fetchFromGitHub {
           owner = "pidu";
           repo = "git-lens";
-          rev = "1feacc217c58fd4a41f9378eb09658f664036509";
-          sha256 = "0s1adgsigaq47vx8bfbmr5z8jq9y230ykwbw0jqka61n4ibg9ish";
+          rev = "be62df785ae14fa8652fe2cdd342d3256f8c0933";
+          sha256 = "02p73q0kl9z44b9a2bhqg03mkqx6gf61n88qlwwg4420dxrf7sbc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-lens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-lens";
           sha256 = "1vv3s89vk5ncinqh2f724z0qbbzp8g4y5y670ryy56w1l6v2acfb";
           name = "git-lens";
         };
@@ -21580,7 +21832,7 @@
           sha256 = "1la3zzcjnmzgxkd4ljr9b5335ddbrvid47kfzp2s358xknzmbsdf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-link";
           sha256 = "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7";
           name = "git-link";
         };
@@ -21593,15 +21845,15 @@
     git-messenger = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "git-messenger";
-        version = "20150314.802";
+        version = "20160121.2042";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-git-messenger";
-          rev = "7b16fdc9f6fd1a3b9c9f212b1633291c4c18fc9b";
-          sha256 = "038m4fjva8ynlms6dbh55w8x8wsn9c3z02rh4782ck2zi51q0d8g";
+          rev = "ca6526119706623de1e573c48addc4cc60ba7860";
+          sha256 = "082g2gqbf8yjgvj2c32ix6j3wwba5fmgcyi75bf0q0bbg4ck5rab";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-messenger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-messenger";
           sha256 = "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn";
           name = "git-messenger";
         };
@@ -21622,7 +21874,7 @@
           sha256 = "1v0jk35ynfg9hivw9gdz2snk73pac67xlfx7av8argdcss1bmyb0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-ps1-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-ps1-mode";
           sha256 = "15gswi9s0m3hrsl1qqyjnjgbglsai95klbdp51h3pcq7zj22wkn6";
           name = "git-ps1-mode";
         };
@@ -21635,15 +21887,15 @@
     git-timemachine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-timemachine";
-        version = "20160105.506";
+        version = "20160120.616";
         src = fetchFromGitHub {
           owner = "pidu";
           repo = "git-timemachine";
-          rev = "87804bbf6e633f42a48567f21bca52019632f64f";
-          sha256 = "1fq9lzn8vvjh0ayl5h0lywxr6zfg3k41xa66vqrf1hdan3a7ax1j";
+          rev = "7c66a878ee89861dcd59b5dfc598520daa156052";
+          sha256 = "1brz9dc7ngywndlxbqbi3pbjbjydgqc9bjzf05lgx0pzr1ppc3w3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-timemachine";
           sha256 = "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq";
           name = "git-timemachine";
         };
@@ -21664,7 +21916,7 @@
           sha256 = "1ivnf4vsqk6c7iw1cid7q1hxp7047ajd1mpg0fl002d7m7ginhyl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-wip-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-wip-timemachine";
           sha256 = "02fi51k6l23cgnwjp507ylkiwb8azmnhc0fips68nwn9dghzp6dw";
           name = "git-wip-timemachine";
         };
@@ -21685,7 +21937,7 @@
           sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitattributes-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitattributes-mode";
           sha256 = "1gjs0pjh6ap0h54savamzx94lq6vqrg58jxqaq5n5qplrbg15a6x";
           name = "gitattributes-mode";
         };
@@ -21706,7 +21958,7 @@
           sha256 = "184q3vsxa9rvhc1n57ms47r73f3zap25wswzi66rm6rmfi2k7678";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitconfig";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitconfig";
           sha256 = "126znl1c4vwgskj7ka9id8v2bdrdn5nkyx3mmc6cz9ylc27ainm7";
           name = "gitconfig";
         };
@@ -21727,7 +21979,7 @@
           sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitconfig-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitconfig-mode";
           sha256 = "0hqky40kcgxdnghnf56gpi0xp7ik45ssia1x84v0mvfwqc50dgn1";
           name = "gitconfig-mode";
         };
@@ -21748,7 +22000,7 @@
           sha256 = "07vgnmfn0kbg3h3vhf3xk443yi1b55761x881xlmw9sr9nraa578";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/github-browse-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/github-browse-file";
           sha256 = "03xvgxlw7wmfby898din7dfcg87ihahkhlav1n7qklw6qi7skjcr";
           name = "github-browse-file";
         };
@@ -21769,7 +22021,7 @@
           sha256 = "000m6w2akx1z1lb32nvy6qzyggpcvlbdjh1i8419rzaidxf5gaxg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/github-clone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/github-clone";
           sha256 = "0ffrm4lmcj3d9kx3g2d5xbiih7hn4frs0prjrvcjq8acvsbc50q9";
           name = "github-clone";
         };
@@ -21790,7 +22042,7 @@
           sha256 = "065gpnllsk4x574fn9d6m4ajxl7mj5w2w5g9in421sp5r80fp9fv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/github-issues";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/github-issues";
           sha256 = "12c6yb3v7xwkzc51binfgl4jb3sm3al5nlrklbsxhn44alazsvb0";
           name = "github-issues";
         };
@@ -21811,7 +22063,7 @@
           sha256 = "11nfpy39xdkjxaxbfn8rppj4rcz57wl15gyibp01j9w7wmb5b4pr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/github-notifier";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/github-notifier";
           sha256 = "1jqc2wx1pvkca8syj97ds32404szm0wn12b7zpa98265sg3n64nw";
           name = "github-notifier";
         };
@@ -21832,7 +22084,7 @@
           sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitignore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitignore-mode";
           sha256 = "1i98ribmnxr4hwphd95f9hcfm5wfwgdbcxw3g0w17ws7z0ir61mn";
           name = "gitignore-mode";
         };
@@ -21849,11 +22101,11 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-gitlab";
-          rev = "78deece7f314f9652b50117605e93be9f8c860f4";
-          sha256 = "07i4j9yl1yag70sl89n7v4yg4jvh5mrifhrf1xswlb29by6najdx";
+          rev = "1615468bbbe2bf07914dd525067ac39db2bc19c0";
+          sha256 = "00mma30r7ixbrxjmmddz4klh517fcr3yn6ss4zw33fh2hzj3w6rl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitlab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitlab";
           sha256 = "0vxsqfnipgapnd2ijvdnkspk68dlnki3pkpkzg2h6hyazmzrsqnq";
           name = "gitlab";
         };
@@ -21874,7 +22126,7 @@
           sha256 = "1h66wywhl5ipryx0s0w1vxp3ydg57zpizjz61wvf6qd8zn07nhng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitolite-clone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitolite-clone";
           sha256 = "1la1nrfns9j6wii6lriwwsd44cx3ksyhh09h8lf9dai6wp67kjac";
           name = "gitolite-clone";
         };
@@ -21895,7 +22147,7 @@
           sha256 = "0y8msn22lzfwh7d417abay9by2zhs9zswhcj8a0l7ln2ksljl500";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitty";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitty";
           sha256 = "1z6w4vbn0aaajyqanc7h1m5ali7dbrnh4ngw87a2x2pkxarx6x16";
           name = "gitty";
         };
@@ -21916,7 +22168,7 @@
           sha256 = "0b6ldcfzbdn0mzrcl08zm9kx1hap3djsbzd1qvph1pa2gab25n8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/glsl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/glsl-mode";
           sha256 = "0d05qb60k5f7wwpsp3amzghayfbwcha6rh8nrslhnklpjbg87aw5";
           name = "glsl-mode";
         };
@@ -21937,7 +22189,7 @@
           sha256 = "0j3pay3gd1wdnpc853gy5j68hbavrwy6cc2bgmd12ag29xki3hcg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gmail-message-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gmail-message-mode";
           sha256 = "0py0i7b893ihb8l1hmk3jfl0xil450znadcd18q7svr3zl2m0gkk";
           name = "gmail-message-mode";
         };
@@ -21958,7 +22210,7 @@
           sha256 = "01hhanijqlh741f9wh6xn88qvghwqnfj5j0rvys5mghssfspqs3z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gmail2bbdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gmail2bbdb";
           sha256 = "03jhrk4vpjim3ybzjxy7s9r1cgjysj9vlc4criz5k0w7vqz3r28j";
           name = "gmail2bbdb";
         };
@@ -21979,7 +22231,7 @@
           sha256 = "08d6j5wws2ngngf3p31ic0lrsrp9i9lkpr3nxgmiiadm617x8hv4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gmpl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gmpl-mode";
           sha256 = "1f60xim8h85jmqpvgfg402ff8mjd66gla8fa0cwi7l18ijnjblpz";
           name = "gmpl-mode";
         };
@@ -22000,7 +22252,7 @@
           sha256 = "160qm8xf0yghygb52p8cykhb5vpg9ww3gjprcdkcxplr4b230nnc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnome-calendar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnome-calendar";
           sha256 = "00clamlm5b42zqggxywdqrf6s2dnsxir5rpd8mjpyc502kqmsfn6";
           name = "gnome-calendar";
         };
@@ -22021,7 +22273,7 @@
           sha256 = "1svnvm9fqqx4mrk9jjn11pzqwk71w8kyyd9wwxam8gz22ykw5jb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnomenm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnomenm";
           sha256 = "01vmr64j6hcvdbzg945c5a2g4fiidl18dsk4px7mdf85cv45kzqm";
           name = "gnomenm";
         };
@@ -22042,7 +22294,7 @@
           sha256 = "1nvyjjjydrimpxy4cpg90si7sr8lmldbhlcm2mx8npklp9pn5y3a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gntp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gntp";
           sha256 = "1ywj3p082g54dcpy8q4jnkqfr12npikx8yz14r0njxdlr0janh4f";
           name = "gntp";
         };
@@ -22063,7 +22315,7 @@
           sha256 = "1dfkjzx33wzafj9cfm1bpj99bmnq5a8qrvzmhjykr7mfkca79ymz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnu-apl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnu-apl-mode";
           sha256 = "0971pzc14gw8f0b4lzvicxww1k3wc58gbr3fd0qvdra2jifk2is6";
           name = "gnu-apl-mode";
         };
@@ -22084,7 +22336,7 @@
           sha256 = "1gm116479gdwc4hr3nyv1id692dcd1sx7w2a80pvmgr35ybccn7c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnuplot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnuplot";
           sha256 = "06c5gqf02fkra8c52xck1lqvf4yg45zfibyf9zqmnbwk7p2jxrds";
           name = "gnuplot";
         };
@@ -22105,7 +22357,7 @@
           sha256 = "1pss9a60dh6i277pkp8j5g1v5h7qlh11w2fki50qcp0zglyw1kaq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnuplot-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnuplot-mode";
           sha256 = "1avpik06cmi4h6v6039c64b4zw1r1nsg3nrryl254gl881pysfxg";
           name = "gnuplot-mode";
         };
@@ -22126,7 +22378,7 @@
           sha256 = "1i278npayv3kfxxd1ypi9n83q5l402sbc1zkm11pf8g006ifqsp4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnus-alias";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnus-alias";
           sha256 = "0mbq9v8fiqqyldpb66v9bc777mzxywaq2dabivabxjg6554s8chf";
           name = "gnus-alias";
         };
@@ -22147,7 +22399,7 @@
           sha256 = "0ylcphnf4lv78kiazdkl5izn7ql402fpvv82n7n1gpjiqq4ylalr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnus-desktop-notify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnus-desktop-notify";
           sha256 = "0hf2dszk5d7vn80bm0msaqv7iji384n85dxgw8ng64c0f9f6752b";
           name = "gnus-desktop-notify";
         };
@@ -22165,7 +22417,7 @@
           sha256 = "1r6bck1hsvk39ccri1h128jj8zd0fh9bsrlp8ijb0v9f6x3cysw4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnus-spotlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnus-spotlight";
           sha256 = "065jcix6a4mxwq8wc8gkr0x9lxmn6hlvf0rqmhi8hb840km1syjx";
           name = "gnus-spotlight";
         };
@@ -22186,7 +22438,7 @@
           sha256 = "1dzb3h5swvmwwy7x1lhz79cq2kpmamk35jb4dwmmxz6j248kmv6b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnus-summary-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnus-summary-ext";
           sha256 = "0svyz8fy4k9ba6gpdymf4cf8zjjpgm71y48vlybxbv507xjm17qf";
           name = "gnus-summary-ext";
         };
@@ -22207,7 +22459,7 @@
           sha256 = "1i3f67x2l9l5c5agspbkxr2mmh3rpq3009d8yzh6r1lih0b4hril";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnus-x-gm-raw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnus-x-gm-raw";
           sha256 = "1a5iccghzqmcndql2bppvr48535sf6jbvc83iypr1031z1b5k4wg";
           name = "gnus-x-gm-raw";
         };
@@ -22224,11 +22476,11 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "9779bffba5e4e87b4750f718b6fa7f088c1fa6e3";
-          sha256 = "0b25iczbg72pg1525ql6hb6jyx5vck8bqn5z8f4dy9a94qpgxszl";
+          rev = "db85a48a7870f46784edc202c780b19e2f65053a";
+          sha256 = "15jjmhw3pd4hx1khbvrypd8s2kh3ymkf8p4qh1c9rbw9csypj3al";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-autocomplete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-autocomplete";
           sha256 = "1ldsq81a167dk2r2mvzyp3v3j2mxc4l9p6b12i7pv8zrjlkhma5a";
           name = "go-autocomplete";
         };
@@ -22249,7 +22501,7 @@
           sha256 = "0phy24cra8cza89xrqsx9xrwg98v9qwqx0fzgm1gwlf333zb3hha";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-complete";
           sha256 = "0dl0ibw145f84kd709r5i2kaw07z1sjzn3dmsiqn8dncspcf2vb4";
           name = "go-complete";
         };
@@ -22270,7 +22522,7 @@
           sha256 = "09rxz40bkr0l75v3lmf8lcwqsgjiv5c8zjmwzy2d4syj4qv69c5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-direx";
           sha256 = "0dq5d7fsld4hww8fl68c18qp6fl3781dqqwd98cg68bihw2wwni7";
           name = "go-direx";
         };
@@ -22291,7 +22543,7 @@
           sha256 = "0wha1h5mnnh3nsiaf5q1drrvk1gj2cn18bapi8ysy5jdpzi4xqsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-dlv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-dlv";
           sha256 = "13mk7mg2xk7v65r1rs6rmvi4g5nvm8jqg3p9nhk62d46i7dzp61i";
           name = "go-dlv";
         };
@@ -22312,7 +22564,7 @@
           sha256 = "1jwh5rqk7vr6kna6i0p3fl3wjk3mhlr6gxklc3xij4r2zdyfj8na";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-eldoc";
           sha256 = "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk";
           name = "go-eldoc";
         };
@@ -22333,7 +22585,7 @@
           sha256 = "1fm6xd3vsi8mqh0idddjpfxlsmz1ljmjppw3qkxl1vr0qz3598k3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-errcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-errcheck";
           sha256 = "11a75h32cd5h5xjv30x83k60s49k9fhgis31358q46y2gbvqp5bs";
           name = "go-errcheck";
         };
@@ -22346,15 +22598,15 @@
     go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "go-mode";
-        version = "20151226.1424";
+        version = "20160127.204";
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "dccb56c1b1b85c3d7b3184a6606024077d4e1775";
-          sha256 = "0wsh3rgay1k6ncayhqnnsnl5v2xwl60k6qyanmps0jgyshdv67zj";
+          rev = "63e67b187e8fbe6153995a754c60f65217e53142";
+          sha256 = "10bmd6vx1pxaal61kx87xabw13cyvl7v8z7cfxbxhv5cx0l3qizq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-mode";
           sha256 = "1852zjxandmq0cpbf7m56ar3rbdi7bx613gdgsf1bg8hsdvkgzfx";
           name = "go-mode";
         };
@@ -22375,7 +22627,7 @@
           sha256 = "1hpxvp0slqafbxhkashnmfjssb0ccjq67x01b4p7gznf6rwji166";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-playground";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-playground";
           sha256 = "1rabwc80qwkafq833m6a199zfiwwmf0hha89721gc7i0myk9pac6";
           name = "go-playground";
         };
@@ -22396,7 +22648,7 @@
           sha256 = "0xm3v6snsxv1x8i4jdq3k2aax7v1xm4zvgc9khabwhc2y63xja46";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-playground-cli";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-playground-cli";
           sha256 = "00h89rh8d7lq1di77nv609xbzxmjmffq6mz3cmagylxncflg81jc";
           name = "go-playground-cli";
         };
@@ -22417,7 +22669,7 @@
           sha256 = "16n8655i7qidakxijymx1n84pnkn3hxpj7lsr901j03blxdrij5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-projectile";
           sha256 = "07diik27gr82n11a8k62v1jxq8rhi16f02ybk548f6cn7iqgp2ml";
           name = "go-projectile";
         };
@@ -22433,11 +22685,11 @@
         version = "20151027.838";
         src = fetchgit {
           url = "https://go.googlesource.com/tools";
-          rev = "3c782264fbde3108fd1eae9abcc4015edfd79e65";
-          sha256 = "10de1525f4d37081db8f8d9c70d7c9d8f918f1650c4218ccbdafa2d6d34305b1";
+          rev = "a6e3cc80e87d58d7fdb23da870845b456969b929";
+          sha256 = "ba6f77b796479d401f0037132a71493665c0af9830b6b26b1c9ed477247cde8e";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-rename";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-rename";
           sha256 = "1sc3iwxiydgs787a6pi778i0qzqv3bf498r47jwiw5b6mmib3fah";
           name = "go-rename";
         };
@@ -22458,7 +22710,7 @@
           sha256 = "1a6vg2vwgnafb61pwrd837fwlq5gs80wawbzjsnykawnmcaag8pm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-scratch";
           sha256 = "11ahvmxbh67wa39cymymxmcpkq0kcn5jz0rrvazjy2p1hx3x1ma5";
           name = "go-scratch";
         };
@@ -22479,7 +22731,7 @@
           sha256 = "0di6xwpl6pi0430q208gliz8dgrzwqnmp997q7xcczbkk8zfwn0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-snippets";
           sha256 = "1wcbnfzxailv18spxyv4a0nwlqh9l7yf5vxg0qcjcp5ajd2w12kn";
           name = "go-snippets";
         };
@@ -22500,7 +22752,7 @@
           sha256 = "0n5nsyfwx2pdlwx6bl35wrfyady5dwraimv92f58mhc344ajd70y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-stacktracer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-stacktracer";
           sha256 = "1laz2ggqydnyr7b36ggb7sphlib79dhp7nszw42wssmv212v94cy";
           name = "go-stacktracer";
         };
@@ -22521,7 +22773,7 @@
           sha256 = "1am415k4xxcva6y3vbvyvknzc6bma49pq3p85zmpjsdmsp18qdix";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/god-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/god-mode";
           sha256 = "01xx2byjh6vlckaxamm2x2qzicd9qc8h6amyjg0bxz3932a4llaa";
           name = "god-mode";
         };
@@ -22542,7 +22794,7 @@
           sha256 = "1k4i9z9h4m0h0y92mncr96jir63q5h1bix5bpnlfxhxl5w8pvk1q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gold-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gold-mode";
           sha256 = "1b67hd1fp6xcj65xxp5jcpdjspxsbzxy26v6lqg5kiy8knls57kf";
           name = "gold-mode";
         };
@@ -22563,7 +22815,7 @@
           sha256 = "0wdw89n7ngxpcdigv8c01h4i84hsdh0y7xq6jdj1i6mnajl8gk92";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/golden-ratio";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/golden-ratio";
           sha256 = "15fkrv0sgpzmnw2h4fp2gb83d8s42khkfq1h76l241njjayk1f81";
           name = "golden-ratio";
         };
@@ -22584,7 +22836,7 @@
           sha256 = "18a7dv8yshspyq4bi30j0l4ap9qp696syfc29mgvly4xyqh9x4qm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/golden-ratio-scroll-screen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/golden-ratio-scroll-screen";
           sha256 = "1ygh104vr65s7frlkzyhrfi6shrbvp2b2j3ynj5dip253v85xki5";
           name = "golden-ratio-scroll-screen";
         };
@@ -22605,7 +22857,7 @@
           sha256 = "16lghkdi0rd7l1fph0a254k6axxivmpmc6grx4ryvza3f4yf7483";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/golint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/golint";
           sha256 = "1q4y6mgll8wyp0c7zx810nzsm0k4wvz0wkly1fbja9z63sjzzxwb";
           name = "golint";
         };
@@ -22626,7 +22878,7 @@
           sha256 = "1anjzlg53kjdqfjcdahbxy8zk9hdha075c1f9nzrnnbbqvmirbbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gom-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gom-mode";
           sha256 = "07zr38gzqb3ds9mpf94c1vhl1rqd0cjh4g4j2bz86q16c0rnmp7m";
           name = "gom-mode";
         };
@@ -22647,7 +22899,7 @@
           sha256 = "06p1dpnmg7lhdff1g7c04qq8f9srgkmnm42jlqy85k87j3p5ys2i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/google";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/google";
           sha256 = "15z8l3adw8il0simk8phjgksh0v88cffb6gg3hv8a7nf5bla43my";
           name = "google";
         };
@@ -22668,7 +22920,7 @@
           sha256 = "12m3hxfwp9r86xdwbslvfxcanpxszcg6x0kcgv5i1k6aygrim9h2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/google-c-style";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/google-c-style";
           sha256 = "10gsbg880jbvxs4291vi2ww30ird2f313lbgcb11lswivmhrmd1r";
           name = "google-c-style";
         };
@@ -22689,7 +22941,7 @@
           sha256 = "1h7nj570drp2l9x6475gwzcjrp75ms8dkixa7qsgszjdk58qyhnb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/google-contacts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/google-contacts";
           sha256 = "0wgi244zy2am90alimgzazshk2z756bk1hchphssfa4j15n16jgn";
           name = "google-contacts";
         };
@@ -22710,7 +22962,7 @@
           sha256 = "183igr5lp20zcqi7rc01fk76sfxdhksd74i11v16gdsifdkjimd0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/google-maps";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/google-maps";
           sha256 = "0a0wqs3cnlpar2dzdi6h14isw78vgqr2r6psmrzbdl00s4fcyxwx";
           name = "google-maps";
         };
@@ -22731,7 +22983,7 @@
           sha256 = "0r6hngf3h5x55lk2qwfgd6bhjhkax5nz8ml43d1x23y5bjnrricq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/google-this";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/google-this";
           sha256 = "0hg9y1b03aiamyn3mam3hyxmxy21wygxrnrww91zcbwlzgp4dd2c";
           name = "google-this";
         };
@@ -22752,7 +23004,7 @@
           sha256 = "0hvxyqkxv5hfsa9sv71m7d98g25a1xc962r961nw6vmbvsf64z6b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/google-translate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/google-translate";
           sha256 = "1crgzdd32mk6hrawdypg496dwh51wzwfb5wqw4a2j5l8y958xf47";
           name = "google-translate";
         };
@@ -22773,7 +23025,7 @@
           sha256 = "0l022aqpnb38q6kgdqpbxrc1r7fljwl7xq14yi5jb7qgzw2v43cz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gore-mode";
           sha256 = "0nljybh2pw8pbbajfsz57r11rs4bvzfxmwpbm5qrdn6dzzv65nq3";
           name = "gore-mode";
         };
@@ -22794,7 +23046,7 @@
           sha256 = "1abb78xxsggawl43hspl0cr0f7i1b3jd9r6xl1nl5jg97i4byg0b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gorepl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gorepl-mode";
           sha256 = "12h9r4kf9y2v601myhzzdw2c4jc5cb7s94r5dkzriq578digxphl";
           name = "gorepl-mode";
         };
@@ -22807,15 +23059,15 @@
     gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
     melpaBuild {
         pname = "gotest";
-        version = "20151218.249";
+        version = "20160125.800";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "gotest.el";
-          rev = "ab0da939aad5cec301126c59b7718cd3158b3233";
-          sha256 = "1b6zn1fmqvfb7bcpmhzkgcy5003dl22w3f293arlsd1xkbjgkxa2";
+          rev = "57f894e68b47352aeacaf0d9c61039b24ba42918";
+          sha256 = "0vf42j9jpa75879pxb1h7qgflcrrg78dgq5lg8v0sbpy7z86zaxr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gotest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gotest";
           sha256 = "1kan3gykhci33jgg67jjiiz7rqlz5mpxp8sh6mb0n6kpfmgb4ly9";
           name = "gotest";
         };
@@ -22836,7 +23088,7 @@
           sha256 = "12lglll20w321vvl6zpqd8r9745y58g6zzfm83iifyzd9hzx7v30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gotham-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gotham-theme";
           sha256 = "0jars6rvf7hkyf71vq06mqki1r840i1dvv43dissqjg5i4lr79cl";
           name = "gotham-theme";
         };
@@ -22854,7 +23106,7 @@
           sha256 = "078d6p4br5vips7b9x4v6cy0wxf6m5ij9gpqd4g33bryn22gnpij";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/goto-chg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/goto-chg";
           sha256 = "0fs0fc1mksbb1266sywasl6pppdn1f9a4q9dwycl9zycr588yjyv";
           name = "goto-chg";
         };
@@ -22875,7 +23127,7 @@
           sha256 = "0j2hdxqfsifm0d8ilwcw7np6mvn4xm58xglzh42gigj2fxv87g99";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/goto-gem";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/goto-gem";
           sha256 = "06vy9m01qccvahxr5xn0plzw9knl5ig7gi5q5r1smfx92bmzkg3a";
           name = "goto-gem";
         };
@@ -22896,7 +23148,7 @@
           sha256 = "1f0zlvva7d7iza1v79yjp0bm7vd011q4cy14g1saryll32z115z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/goto-last-change";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/goto-last-change";
           sha256 = "1yl9p95ls04bkmf4d6az72pycp27bv7q7wxxzvj8sj97bgwvwajx";
           name = "goto-last-change";
         };
@@ -22906,6 +23158,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    govc = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, json-mode, lib, magit-popup, melpaBuild, s }:
+    melpaBuild {
+        pname = "govc";
+        version = "20160201.1146";
+        src = fetchFromGitHub {
+          owner = "vmware";
+          repo = "govmomi";
+          rev = "367391c0c3de585b791b72bdcd045810fb17d606";
+          sha256 = "1bqqdwwc63g05wwnk15745mmf4g7r23nzyq681im6icy13x6z07x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/govc";
+          sha256 = "1ivgaziv25wlzg6y4zh8x7mv97pnyhi7p8jpvgh5fg5lnqpzhl4v";
+          name = "govc";
+        };
+        packageRequires = [ dash emacs json-mode magit-popup s ];
+        meta = {
+          homepage = "http://melpa.org/#/govc";
+          license = lib.licenses.free;
+        };
+      }) {};
     govet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "govet";
@@ -22917,7 +23190,7 @@
           sha256 = "1fzf43my7qs4n37yh1jm6fyp76dfgknc5g4zin7x5b5lc63g0wxb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/govet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/govet";
           sha256 = "1rpgngixf1xnnqf0l2vvh6y9q3395qyj9ln1rh0xz5lm7d4pq4hy";
           name = "govet";
         };
@@ -22938,7 +23211,7 @@
           sha256 = "1l43h008l7n6waclb2km32dy8aj7m5yavm1pkq38p9ppzayfxqq1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gplusify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gplusify";
           sha256 = "0fgkcvppkq6pba1giddkfxp9z4c8v2cid9nb8a190b3g85wcwycr";
           name = "gplusify";
         };
@@ -22959,7 +23232,7 @@
           sha256 = "0xs2278gamzg0710bm1fkhjh1p75m2l1jcl98ldhyjhvaf9d0ysc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gradle-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gradle-mode";
           sha256 = "0lx9qi93wmiy9pxjxqp68scbcb4bx88b6jiqk3y8jg5cajizh24g";
           name = "gradle-mode";
         };
@@ -22980,7 +23253,7 @@
           sha256 = "03dranmbrq9gkvlcvzlrvv0nvpkgk02hcwfcjkdifql2j8h23jgy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grails-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grails-mode";
           sha256 = "1zdlmdkwyaj2zns3xwmqpil83j7857aj2070kvx8xza66dxcnlm4";
           name = "grails-mode";
         };
@@ -23001,7 +23274,7 @@
           sha256 = "11ry4p5r0hg3jlmfhp6hfkryzrp6snl38v8j7ds8limhbpdh5wr4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grails-projectile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grails-projectile-mode";
           sha256 = "0dy8v2mila7ccvb7j5jlfkhfjsjfk3bm3rcy84m0rgbqjai67amn";
           name = "grails-projectile-mode";
         };
@@ -23022,7 +23295,7 @@
           sha256 = "1202fwwwdr74q6s5jv1n0mvmq4n9mra85l14hdhwh2kks513s6vs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grandshell-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grandshell-theme";
           sha256 = "1mnnjsw1kx40b6ws8wmk25fz9rq8rd70xia9cjpwdfkg7kh8xvsa";
           name = "grandshell-theme";
         };
@@ -23043,7 +23316,7 @@
           sha256 = "1f34bhjxmbf2jjrkpdvqg2gwp83ka6d5vrxmsxdl3r57yc6rbrwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/graphene";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/graphene";
           sha256 = "1wz3rvd8b7gx5d0k7yi4dd69ax5bybcm10vdc7xp4yn296lmyl9k";
           name = "graphene";
         };
@@ -23076,7 +23349,7 @@
           sha256 = "1bidfn4x5lb6dylhadyf05g4l2k7jg83mi058cmv76av1glawk17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/graphene-meta-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/graphene-meta-theme";
           sha256 = "1cqdr93lccdpxkzgap3r3qc92dh8vqgdlnxvqkw7lrcbs31fvf3q";
           name = "graphene-meta-theme";
         };
@@ -23097,7 +23370,7 @@
           sha256 = "12r6a3hikzqcdbplmraa4p4w136c006yamylxfjf8580v15xngrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/graphviz-dot-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/graphviz-dot-mode";
           sha256 = "04rkynsrsk6w4sxn1pc0b9b6pij1p7yraywbrk7qvv05fv69kri2";
           name = "graphviz-dot-mode";
         };
@@ -23118,7 +23391,7 @@
           sha256 = "0nvl8mh7jxailisq31h5bi64s9b74ah1465wiwh18x502swr2s3c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grapnel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grapnel";
           sha256 = "019cdx1wdx8sc2ibqwgp1akgckzxxvrayyp2sv806gha0kn6yf6r";
           name = "grapnel";
         };
@@ -23138,7 +23411,7 @@
           sha256 = "0djv2ps2ahw9b1b5i45hgy7l7cch7cgh7rzq601c0r6vi7gm2ac5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grass-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grass-mode";
           sha256 = "1lq6bk4bwgcy4ra3d9rlca3fk87ydg7xnnqcqjg0pw4m9xnr3f7v";
           name = "grass-mode";
         };
@@ -23159,7 +23432,7 @@
           sha256 = "0rgv96caigcjffg1983274p4ff1icx1xh5bj7rcd53hai5ag16mp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/green-phosphor-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/green-phosphor-theme";
           sha256 = "1p4l75lahmbjcx74ca5jcyc04828vlcahk7gzv5lr7z9mhvq6fbh";
           name = "green-phosphor-theme";
         };
@@ -23180,7 +23453,7 @@
           sha256 = "1670pxgmqflzw5d02mzsmqjf3gp0c4wf25z0crmaamyfmwdz9pag";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gregorio-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gregorio-mode";
           sha256 = "0f226l67bqqc6m8wb97m7lkxvwrfbw74b1riasirca1anzjl8jfx";
           name = "gregorio-mode";
         };
@@ -23201,7 +23474,7 @@
           sha256 = "1f8262mrlinzgnn4m49hbj1hm3c1mvzza24py4b37sasn49546lw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grep-a-lot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grep-a-lot";
           sha256 = "1513vnm5b587r15hcbnplgsfv7kv8g5fd0w4nwb6pq7myzv53ra1";
           name = "grep-a-lot";
         };
@@ -23219,7 +23492,7 @@
           sha256 = "1pqx01c61i3rxvq2qf8l6gcla8jsmc1af5780s78clqfi51kbg2g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grep+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grep+";
           sha256 = "1qj4f6d3l88bdcnq825pylnc76m22x2i15yxdhc2b6rv80df7zsx";
           name = "grep-plus";
         };
@@ -23240,7 +23513,7 @@
           sha256 = "14c09m9p6556rrf0qfad4zsv7qxa5flamzg6fa83cxh0qfg7wjbp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/greymatters-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/greymatters-theme";
           sha256 = "10cxajyws5rwk62i4vk26c1ih0dq490kcfx7gijw38q3b5r1l8nr";
           name = "greymatters-theme";
         };
@@ -23259,7 +23532,7 @@
           sha256 = "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grin";
           sha256 = "0mvzwmws5pi6hpzgkc43fjxs98ngkr0jvqbclza2jbbqawifzzbk";
           name = "grin";
         };
@@ -23272,15 +23545,15 @@
     grizzl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "grizzl";
-        version = "20151223.1358";
+        version = "20160131.151";
         src = fetchFromGitHub {
           owner = "d11wtq";
           repo = "grizzl";
-          rev = "38b819b8f132962e24eb6a2cff33d571e848776d";
-          sha256 = "1v5xh0hana9wqc73g0yrzk5ip9zxbqg9xi8k7972nzj3fnma77bh";
+          rev = "b0996a9e2e5f6a9c4327ba7665ab29b633e404eb";
+          sha256 = "1d2kwiq3zy8wdg5zig0q9rrdcs4xdv6zsgvgc21b3kv83daq1dsq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grizzl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grizzl";
           sha256 = "1klds0w9qrsgfppq105qr69c26zi91y575db2hxr6h9vypf2rq24";
           name = "grizzl";
         };
@@ -23301,7 +23574,7 @@
           sha256 = "03dranmbrq9gkvlcvzlrvv0nvpkgk02hcwfcjkdifql2j8h23jgy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/groovy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/groovy-mode";
           sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal";
           name = "groovy-mode";
         };
@@ -23322,7 +23595,7 @@
           sha256 = "0l6gkhzg0dn4q223gljh1jh305aa9n8rbf9h5gg5d1aygs7cb3ha";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gruber-darker-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gruber-darker-theme";
           sha256 = "0vn4msixb77xj6p5mlfchjyyjhzah0lcmp0z82s8849zd194fxqi";
           name = "gruber-darker-theme";
         };
@@ -23343,7 +23616,7 @@
           sha256 = "1js849s8b9x0n6ak2qwv90lk6zr71mgkk9f0xccdhikz4c8vxk0r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grunt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grunt";
           sha256 = "1qdzqcrff9x97kyy0d4j636d5i751qja10liw8i0lf4lk6n0lywz";
           name = "grunt";
         };
@@ -23364,7 +23637,7 @@
           sha256 = "04jknwkax9gdmzz0yq0m21grl9c43vr3abdam3g8zjh5sjx5gs14";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gruvbox-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gruvbox-theme";
           sha256 = "042mnwlmixygk2mf24ygk7rkv1rfavc5a36hs9x8b68jnf3khj32";
           name = "gruvbox-theme";
         };
@@ -23385,7 +23658,7 @@
           sha256 = "1d89gxyzv0z0nk7v1aa4qa0xfms2g2dsrr07cw0d99xsnyxfky31";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gs-mode";
           sha256 = "02ldd92fv1k28nygl34i8gv0b0i1v5qd7nl1l17cf5f3akdwc6iq";
           name = "gs-mode";
         };
@@ -23406,7 +23679,7 @@
           sha256 = "1dfd22629gz0c8r4wplvbn0n7bm20549mg5chq289s826ca0kxqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gscholar-bibtex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gscholar-bibtex";
           sha256 = "0d41gr9amf9vdn9pl9lamhp2swqllxslv9r3wsgzqvjl7zayd1az";
           name = "gscholar-bibtex";
         };
@@ -23427,7 +23700,7 @@
           sha256 = "14sx5m6fpkm2q8ljkicl1yy1sw003k4rzz9hi7lm1nfqr2l4n6q0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/guide-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/guide-key";
           sha256 = "0zjrdvppcg8b2k6hfdj45rswc1ks9xgimcr2yvgpc8prrwk1yjsf";
           name = "guide-key";
         };
@@ -23448,7 +23721,7 @@
           sha256 = "1s6p4ysdbqx5fk68s317ckj5rjmpkwwb0324sbqqa6byhw3j0xyj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/guide-key-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/guide-key-tip";
           sha256 = "0h2vkkbxq361dkn6irm1v19qj7bkhxcjljiksd5wwlq5zsq6bd06";
           name = "guide-key-tip";
         };
@@ -23469,7 +23742,7 @@
           sha256 = "16h1g88y4q737sxcjkm1kxirv5m2x3l9wgmz0s4hlxjzli8fc7jr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/guru-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/guru-mode";
           sha256 = "0j25nxs3ndybq1ik36qyqdprmhav4ba8ny7v2z61s23id8hz3xjs";
           name = "guru-mode";
         };
@@ -23490,7 +23763,7 @@
           sha256 = "0060qw4gr9fv6db20xf3spgl2fwg2iid5ckfjm3vj3ydyv62q13s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gvpr-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gvpr-mode";
           sha256 = "19p6f06qdjvh2vmgbabajvkfxpn13j899jrivw9mqyssz0cyvzgw";
           name = "gvpr-mode";
         };
@@ -23511,7 +23784,7 @@
           sha256 = "15d7zjxjp9h8jmxq3dqakwzlymqk6hqsg7zklkjs0ih7fz0d25pl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hackernews";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hackernews";
           sha256 = "1x1jf5gkhmpiby5rmy0sziywh6c1f1n0p4f6dlz6ifbwns7har6a";
           name = "hackernews";
         };
@@ -23532,7 +23805,7 @@
           sha256 = "0d3xmagl18pas19zbpg27j0lmdiry23df48z4vkjsrcllqg25v5g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ham-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ham-mode";
           sha256 = "000qrdby7d6zmp5066vs4gjlc9ik0ybrgcwzcbfgxb16w1g9xpmz";
           name = "ham-mode";
         };
@@ -23542,6 +23815,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    hamburg-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "hamburg-theme";
+        version = "20160123.140";
+        src = fetchFromGitHub {
+          owner = "mswift42";
+          repo = "hamburg-theme";
+          rev = "aacefdf1501d97a5afc0e63c8ead4b2463323028";
+          sha256 = "1rnkzl51h263nck1bd0jyb7q58b54d764gcsh7wqxfgzs1jfr4am";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hamburg-theme";
+          sha256 = "149ln7670kjyhdfj5j9akxch47dlff2hd58amla7j3297z1nhg4k";
+          name = "hamburg-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/hamburg-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     haml-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
     melpaBuild {
         pname = "haml-mode";
@@ -23553,7 +23847,7 @@
           sha256 = "0fmcm4pcivigz9xhf7z9wsxz9pg1yfx9qv8na2dxj426bibk0a6w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haml-mode";
           sha256 = "0ih0m7zr6kgn6zd45zbp1jgs1ydc5i5gmq6l080wma83v5w1436f";
           name = "haml-mode";
         };
@@ -23574,7 +23868,7 @@
           sha256 = "1njrpb1s2v9skyfbgb28clrxyvyp8i4b8kwa68ynvq3vjb4fnws6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hamlet-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hamlet-mode";
           sha256 = "0ils4w8ry1inlfj4931ypibj3n60xq6ah74hig62y4vrs4d47gyx";
           name = "hamlet-mode";
         };
@@ -23595,7 +23889,7 @@
           sha256 = "0w443knp6kvjm2m79cni5d17plyhbsl0a4kip7yrpv5nmg370q3p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/handlebars-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/handlebars-mode";
           sha256 = "11ahrm4n588v7ir2r7sp4dkbypl5nhnr22px849hdxjcrwal24vj";
           name = "handlebars-mode";
         };
@@ -23616,7 +23910,7 @@
           sha256 = "1z37di9vk1l35my8kl8jnyqlkr1rnp0iz13hpc0r065mib67v58k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/handlebars-sgml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/handlebars-sgml-mode";
           sha256 = "10sxm7v94yxa92mqbwj3shqjs6f3zbxjvwgbvg9m2fh3b7xj617w";
           name = "handlebars-sgml-mode";
         };
@@ -23637,7 +23931,7 @@
           sha256 = "0whn8rc98dhncgizzrb22nx6b6cm655q1cf2fpn6g3knq1c2471r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/handoff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/handoff";
           sha256 = "0iqqvygx50wi2vcbs6bfgqzhcz9a89zrwb7sg0ang9qrkiz5k36w";
           name = "handoff";
         };
@@ -23658,7 +23952,7 @@
           sha256 = "124k803pgxc7fz325yy6jcyam69f5fk9kdwfgmnwwca9ablq4cfb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hardcore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hardcore-mode";
           sha256 = "1bgi1acpw4z7i03d0i8mrd2hpjn6hyvkdsk0ks9q380yp9mqmiwd";
           name = "hardcore-mode";
         };
@@ -23679,7 +23973,7 @@
           sha256 = "13pgxskddir74lqknkkflzkrv6q455cf5s7wjww1zgvw95j7q50v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hardhat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hardhat";
           sha256 = "16pdbpm647ag9cadmdm75nwwyzrqsd9y1b4zgkl3pg669mi5vl5z";
           name = "hardhat";
         };
@@ -23700,7 +23994,7 @@
           sha256 = "1l08d6qn7ixs3yg6svh8fd2x6zwjkbv0s34vm5aa7krx7yhydblx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-emacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-emacs";
           sha256 = "1wkh7qws35c32hha0p9rpjz5pls2844920nh919lvp2wmq9l6jd6";
           name = "haskell-emacs";
         };
@@ -23721,7 +24015,7 @@
           sha256 = "1l08d6qn7ixs3yg6svh8fd2x6zwjkbv0s34vm5aa7krx7yhydblx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-emacs-base";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-emacs-base";
           sha256 = "1fwkds6qyhbxxdgxfzmgd7dlcxr08ynrrg5jdp9r7f924pd536vb";
           name = "haskell-emacs-base";
         };
@@ -23742,7 +24036,7 @@
           sha256 = "1l08d6qn7ixs3yg6svh8fd2x6zwjkbv0s34vm5aa7krx7yhydblx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-emacs-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-emacs-text";
           sha256 = "1j18fhhra6lv32xrq8jc6l8i56fgn68da81wymcimpmpbp0hl5fy";
           name = "haskell-emacs-text";
         };
@@ -23752,22 +24046,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    haskell-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    haskell-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20160117.1545";
+        version = "20160202.1531";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "a5d18dacca2d2df14a2b786efab766f72ec8cfbf";
-          sha256 = "0a94zkns55jv0rqf1mf1x5ss0waw64yg4428838n4qiqlqrgdz44";
+          rev = "b562d054972c5d976f1c5d222bec9aa1189bd0dd";
+          sha256 = "0w5q3cff31qsyq9z4ci6x9pdacjmdlh5w6h0n485b92yb8ryxa5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-mode";
           sha256 = "0wijvcpfdbl17iwzy47vf8brkj2djarfr8y28rw0wqvbs381zzwp";
           name = "haskell-mode";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "http://melpa.org/#/haskell-mode";
           license = lib.licenses.free;
@@ -23776,15 +24070,15 @@
     haskell-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "haskell-snippets";
-        version = "20150612.1439";
+        version = "20160121.1658";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-snippets";
-          rev = "bcf12cf33a67ddc2f023a55072859e637fe4fa25";
-          sha256 = "0b3d7rvqvvcsp51aqfhl0zg9zg8j0p6vlfvga6jp9xc7626vh6f6";
+          rev = "c72e467d77c8c91439522599a741a8b2950fe1e9";
+          sha256 = "1wha5f2zx5hr6y0wvpmkg7jnxcgbzx99gd70h96c3dqqqhqz6d2a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-snippets";
           sha256 = "10bvv7q694fahcpm83v8lpqihg1gvfzrp1hdzwiffxydfvdbalh2";
           name = "haskell-snippets";
         };
@@ -23804,7 +24098,7 @@
           sha256 = "7e41c910d6901638b9dfb697206659f5441e26e0558f9227c4ba7c6f2f47d841";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-tab-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-tab-indent";
           sha256 = "0vdfmy56w5yi202nbd28v1bzj97v1wxnfnb5z3dh9687p2abgnr7";
           name = "haskell-tab-indent";
         };
@@ -23825,7 +24119,7 @@
           sha256 = "1gmh455ahd9if11f8mrqbfky24c784bb4fgdl3pj8i0n5sl51i88";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haste";
           sha256 = "0wz15p58g4mxvwbpy9k60gixs1g4jw7pay5pbxnlggc39x1py8nf";
           name = "haste";
         };
@@ -23845,7 +24139,7 @@
           sha256 = "106a7kpjj4laxl7x8aqpv75ih54569b3bs2a1b8z4rghmikqc4aw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haxe-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haxe-mode";
           sha256 = "032h0nxlsrk30bsqb02by842ycrw1qscpfprifjjkaiq08wigh1l";
           name = "haxe-mode";
         };
@@ -23866,7 +24160,7 @@
           sha256 = "1si5r86zvnp4wbzvvqyc4zhap14k8pcq5nqigx45mgvpdnwdvzln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haxor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haxor-mode";
           sha256 = "1y4m058whdqnkkf9s6hzi0h6w0fc8ajfawhpjj0wqjam4adnfkq5";
           name = "haxor-mode";
         };
@@ -23887,7 +24181,7 @@
           sha256 = "0pjxyhh8a02i54a9jsqr8p1mcqfl6k9b8gv9lnzb242gy4518y3l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hayoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hayoo";
           sha256 = "1rqvnv5nxlsyvsa5my1wpfm82sw21s7kfbg80vrjmxh0mwlyv4p9";
           name = "hayoo";
         };
@@ -23908,7 +24202,7 @@
           sha256 = "0rgcj47h7a67qkw6696pcm1a4g4ryx8nrz55s69fw86958fp08hk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hc-zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hc-zenburn-theme";
           sha256 = "0jcddk9ppgcizyyciabj3sgk1pmingl97knf9nmr0mi89h7n2g5y";
           name = "hc-zenburn-theme";
         };
@@ -23929,7 +24223,7 @@
           sha256 = "1vf5130bj1ii9j8qq9vdw0ga0qgfk8brjz34ysfmz9l2ihlcxvl0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hcl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hcl-mode";
           sha256 = "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin";
           name = "hcl-mode";
         };
@@ -23947,7 +24241,7 @@
           sha256 = "00j74cqdnaf5rl7w4wabm4z88cm20s152y0yxnv73z9pvqbknrmm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/header2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/header2";
           sha256 = "1dg25krx3wxma2l5vb2ji7rpfp17qbrl62jyjpa52cjfsvyp6v06";
           name = "header2";
         };
@@ -23968,7 +24262,7 @@
           sha256 = "06hq6p6a4fzprbj4r885vsvzddlvx0wxqk5kik06v5bm7hjmnyrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/headlong";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/headlong";
           sha256 = "042ybplkqjb30qf5cpbw5d91j1rdc71b789v277h036bri7hgxz6";
           name = "headlong";
         };
@@ -23978,22 +24272,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20160118.1311";
+        version = "20160204.1126";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "a046a6c645a04745fb352ce4b6a85ecb532b59f3";
-          sha256 = "16daffw6kk39d1d0vy9mc2n62wlq6b7qd6sbnq1l1a89q57lw646";
+          rev = "6085777884bf8cc63a6e15cbbb506d09d782f0cc";
+          sha256 = "1rwdh2mwn3ynw1c1b5fxdblnyfrqcnbs5045dfl4f8afwqqh92w8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm";
           sha256 = "0xsf4rg7kn0m5wjlbwhd1mc38lg2822037dyd0h66h6x2gbs3fd9";
           name = "helm";
         };
-        packageRequires = [ async cl-lib emacs helm-core ];
+        packageRequires = [ async emacs helm-core popup ];
         meta = {
           homepage = "http://melpa.org/#/helm";
           license = lib.licenses.free;
@@ -24010,7 +24304,7 @@
           sha256 = "0nip0zrmn944wy0x2dc5ryr0m7a948rn2a8cbaajghs7a7zai4cr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-R";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-R";
           sha256 = "0zq9f2xhgap3ihnrlsrsaxaz0nx014k0820bfsq7lckwcnm0mng1";
           name = "helm-R";
         };
@@ -24031,7 +24325,7 @@
           sha256 = "04rvbafa77blps7x7cmlsciys8fgmvhfhq4v51pk8z5q3j1lrgc5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ack";
           sha256 = "1a8sc5gd2g57dl9g18wyydfmihy74yniwhjr27h7vxylnf2g3pni";
           name = "helm-ack";
         };
@@ -24052,7 +24346,7 @@
           sha256 = "0hxfgdn56c7qr64r59g9hvxxwa4mw0ad9c9m0z5cj85bsdd7rlx4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ad";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ad";
           sha256 = "0h2zjfj9hy7bkpmmjjs0a4a06asbw0yww8mw9rk2xi1gc2aqq4hi";
           name = "helm-ad";
         };
@@ -24062,22 +24356,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ag = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ag";
-        version = "20160116.1851";
+        version = "20160126.2347";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-ag";
-          rev = "0c99d821e4feebfeb62dabea9cded72664c083af";
-          sha256 = "0qar85n14iifm5ijrqlg5r4x7aq5cng7s4nzw5dlzgcbvsrcizs0";
+          rev = "33a924553eb0cc8d80022bea491718aba48801d0";
+          sha256 = "1gbvhc8wpai3gvnzsmg1y7qffvimg77b36dcm7n82iy6pavdn9z3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ag";
           sha256 = "023zvgmi5b5b2qga3jqd7jrq9ap8n3rhvl6jrv9fsi565sg1fv43";
           name = "helm-ag";
         };
-        packageRequires = [ cl-lib helm ];
+        packageRequires = [ emacs helm ];
         meta = {
           homepage = "http://melpa.org/#/helm-ag";
           license = lib.licenses.free;
@@ -24094,7 +24388,7 @@
           sha256 = "1rifdkhzvf7xd2npban0i8v3rjcji69063dw9rs1d32w4n7fzlfa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ag-r";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ag-r";
           sha256 = "0ivh7f021lbmbaj6gs4y8m99s63js57w04q7cwx7v4i32cpas7r9";
           name = "helm-ag-r";
         };
@@ -24115,7 +24409,7 @@
           sha256 = "153zq1q3s3ihjh15wyci9qdic3pin8f1j1gq2qlzyhmy0njlvgjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-anything";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-anything";
           sha256 = "0yjlwsiahb7n4q3522d68xrdb8caad9gpnglz5php245yqy3n5vx";
           name = "helm-anything";
         };
@@ -24136,7 +24430,7 @@
           sha256 = "1bnypr906gfc1fbyrqfsfilsl6wiacrnhr8flpa0gmdjhvmrw7af";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-aws";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-aws";
           sha256 = "0sjgdjpznjxsf6nlv2ah45fw17j8j5apdphd1fp43rjv1lskkgc5";
           name = "helm-aws";
         };
@@ -24157,7 +24451,7 @@
           sha256 = "0d6h4gbb69abxxgm85pdi5rsaf9h72yryg72ykd5633i1g4s8a76";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-backup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-backup";
           sha256 = "182jbm36yzayxi9y3vhpyn25ivrgay37sncqvah35vbw52lnjcn3";
           name = "helm-backup";
         };
@@ -24170,15 +24464,15 @@
     helm-bibtex = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
     melpaBuild {
         pname = "helm-bibtex";
-        version = "20160108.1107";
+        version = "20160127.1352";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "55ac5ce0b49893c8c46ce6a5074ba2df9f60d0d3";
-          sha256 = "1fbsp7h35bwz802y0mksrlilm2da2l9hs72iimrdf886vh1wifxl";
+          rev = "be4c894463ee77ee719d0c5517cf414a8fcc6cce";
+          sha256 = "046gycmwrn0h1ld37b7pwylb9nkyzgpzlbf7p99fq8p2mnsz3rcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-bibtex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-bibtex";
           sha256 = "1rsplnh18w1fqr6da79vj8x9q2lyss9sssy8pfz3hfw7p6qi6zkg";
           name = "helm-bibtex";
         };
@@ -24199,7 +24493,7 @@
           sha256 = "10k7hjfz9jmfpbmsv20jy9vr6fqxx1yp8v115hprqvw057iifsl9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-bibtexkey";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-bibtexkey";
           sha256 = "00i7ni4r73mmxavhfcm0fd7jhx6gxvxx7prax1yxmhs46fpz8jwj";
           name = "helm-bibtexkey";
         };
@@ -24220,7 +24514,7 @@
           sha256 = "1wmcy7q4ys2sf8ya5l4n7a6bq5m9d6m19amjfwkmkh4ajkwl041y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-bind-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-bind-key";
           sha256 = "1yfj6mmxc165in1i85ccanssch6bg19ib1fcm7sa4i4hv0mgwaid";
           name = "helm-bind-key";
         };
@@ -24241,7 +24535,7 @@
           sha256 = "1gcx7imq9gxfgmh188a8xlpmmlrdif1vsnnff49qvk82082ghbfz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-bm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-bm";
           sha256 = "1dnlcvn0zv4qv4ii4j0h9r8w6vhi3l0c5aa768kblh5r2rf4bjjh";
           name = "helm-bm";
         };
@@ -24262,7 +24556,7 @@
           sha256 = "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-bundle-show";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-bundle-show";
           sha256 = "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7";
           name = "helm-bundle-show";
         };
@@ -24283,7 +24577,7 @@
           sha256 = "0w4svbg32y63v049plvk7djc1m2amjzrr1v979d9s6jbnnpzlb5c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-c-moccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-c-moccur";
           sha256 = "1i6a4jqjy9amlhdbj5d26wzagndfgszha09vs5qf4760vjl7kn4b";
           name = "helm-c-moccur";
         };
@@ -24304,7 +24598,7 @@
           sha256 = "03c4w34r0q7xpz1ny8dya8f96rhjpc9r2c24n7vg9x6x4i2wl204";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-c-yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-c-yasnippet";
           sha256 = "0jwj4giv6lxb3h7vqqb2alkwq5kp0shy2nraik33956p4l8dfs90";
           name = "helm-c-yasnippet";
         };
@@ -24325,7 +24619,7 @@
           sha256 = "0wkskm0d1mvh49l65xg6pgwd7yxy02llflkzx59ayqv4wjvsyayb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-chrome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-chrome";
           sha256 = "0p3n2pna83mp4ym8x69lk4r3q4apbj5v2blg2mwcsd9zij153nxz";
           name = "helm-chrome";
         };
@@ -24346,7 +24640,7 @@
           sha256 = "1dmj4f8pris1i7wvfplp4dbnyfm403l6rplxfrfi0cd9afg7m68i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-chronos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-chronos";
           sha256 = "1a65b680741cx4cyyizyl2c3bss36x3j2m9sh9hjc87xrzarg0s3";
           name = "helm-chronos";
         };
@@ -24367,7 +24661,7 @@
           sha256 = "18j4ikb3q8ygdq74zqzm83wgb39x7w209n3186mm051n8lfmkaif";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-cider-history";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-cider-history";
           sha256 = "12l8jyl743zqk8m2xzcz75y1ybdkbkvcbvfkn1k88k09s31kdq4h";
           name = "helm-cider-history";
         };
@@ -24388,7 +24682,7 @@
           sha256 = "1iqjc15pz5qr8zjxaxz1b2vys2689ri76jacmipxvgjk0y7vc5f0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-circe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-circe";
           sha256 = "12jfzg03573lih2aapvv5h2mi3pwqc9nrmv538ivjywix5117k3v";
           name = "helm-circe";
         };
@@ -24409,7 +24703,7 @@
           sha256 = "10cp21v8vwgp8hv2rkdn9x8v2n8wqbphgslb561rlwc2rfpvzqvs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-cmd-t";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-cmd-t";
           sha256 = "04fmhravd3ld4n1n820wlnr1jvmk7c7cdazd15gazixrlz6fm4fk";
           name = "helm-cmd-t";
         };
@@ -24422,15 +24716,15 @@
     helm-codesearch = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, s }:
     melpaBuild {
         pname = "helm-codesearch";
-        version = "20160105.727";
+        version = "20160123.513";
         src = fetchFromGitHub {
           owner = "youngker";
           repo = "helm-codesearch.el";
-          rev = "093ca750b77ca07ed64f89f8d9ba1d3fd9f61ea6";
-          sha256 = "1c2fn86sbdh91i95glfbazv0g11rg38xras8ddk8ijcxg2c4jl0v";
+          rev = "eb97593da777d34087350af3ddd6e9e34c6346bd";
+          sha256 = "05nvbwz3inbmfj88am69sz032wsj8jkfpjk5drgfijw98il9blk9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-codesearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-codesearch";
           sha256 = "1v21zwcyx73bc1lcfk60v8xim31bwdk4p06g9i4qag3cijdlli9q";
           name = "helm-codesearch";
         };
@@ -24451,7 +24745,7 @@
           sha256 = "0fxrmvb64lav4aqs61z3a4d2mcp9s2nw7fvysyjn0r1291pkzk9j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-commandlinefu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-commandlinefu";
           sha256 = "150nqib0sr4n35vdj1xrxcja8gkv3chzhdbgkjxqgkz2yq10xxnd";
           name = "helm-commandlinefu";
         };
@@ -24472,7 +24766,7 @@
           sha256 = "189qmc6fdj5a01a7w45r0qpn9qjf2q9g83qic9sgnrccc841zpyg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-company";
           sha256 = "1pbsg7zrz447siwd8pasw2hz5z21wa1xpqs5nrylhbghsk076ld3";
           name = "helm-company";
         };
@@ -24482,22 +24776,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-core = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20160118.1220";
+        version = "20160203.419";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "a046a6c645a04745fb352ce4b6a85ecb532b59f3";
-          sha256 = "16daffw6kk39d1d0vy9mc2n62wlq6b7qd6sbnq1l1a89q57lw646";
+          rev = "6085777884bf8cc63a6e15cbbb506d09d782f0cc";
+          sha256 = "1rwdh2mwn3ynw1c1b5fxdblnyfrqcnbs5045dfl4f8afwqqh92w8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-core";
           sha256 = "1dyv8rv1728vwsp6vfdq954sp878jbp3srbfxl9gsgjnv1l6vjda";
           name = "helm-core";
         };
-        packageRequires = [ async cl-lib emacs ];
+        packageRequires = [ async emacs ];
         meta = {
           homepage = "http://melpa.org/#/helm-core";
           license = lib.licenses.free;
@@ -24514,7 +24808,7 @@
           sha256 = "0nhi8xhcf7qpsibpyy5v364xx7lqkhskzai7awkg0xcdq8b5090x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-cscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-cscope";
           sha256 = "13a76wc1ia4c0v701dxqc9ycbb43d5k09m5pfsvs8mccisfzk9y4";
           name = "helm-cscope";
         };
@@ -24535,7 +24829,7 @@
           sha256 = "01a3pahpsxb7d15dkfgxypl7gzqb4dy4f36lmid1w77b9rhs6nph";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-css-scss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-css-scss";
           sha256 = "0iflwl0rijbkx1b7i1s7984dw7sz1wa1cb74fqij0kcn76kal7ak";
           name = "helm-css-scss";
         };
@@ -24556,7 +24850,7 @@
           sha256 = "18d96alik66nw3rkk7k8740b4rx2bnh3pwn27ahpgj5yf51wm0ry";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ctest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ctest";
           sha256 = "1mphc9fsclbw19p5i1xf52qg6ljljbajvbcsl95hisrnvhg89vpm";
           name = "helm-ctest";
         };
@@ -24577,7 +24871,7 @@
           sha256 = "1fbwxd6fm36ci85svl22h30bjqm8p5p8fxsnbmvkksln5psghn5d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-dash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-dash";
           sha256 = "1cnxssj2ilszq94v5cc4ixblar1nlilv9askqjp9gfnkj2z1n9cy";
           name = "helm-dash";
         };
@@ -24598,7 +24892,7 @@
           sha256 = "0y0xxs67bzh6j68j3f4zxzrl2ij5g1qvvxqklw7nz305xliis29g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-descbinds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-descbinds";
           sha256 = "1890ss4pimjxskzzllf57fg07xbs8zqcrp6r8r6x989llrfvd1h7";
           name = "helm-descbinds";
         };
@@ -24619,7 +24913,7 @@
           sha256 = "05mb7kb4x7kzh0w9r531ppd92hzsa2v3wqcmafkcn1z5wfp7zw68";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-dictionary";
           sha256 = "1pak8qn0qvbzyclhzvr5ka3pl370i4kiykypfkwbfgvqqwczhl3n";
           name = "helm-dictionary";
         };
@@ -24640,7 +24934,7 @@
           sha256 = "14sifdrfg8ydvi9mj8qm2bfphbffglxrkb5ky4q5b3j96bn8v110";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-dired-recent-dirs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-dired-recent-dirs";
           sha256 = "0kh0n5674ksswjzi9gji2qmx8v8g0axx8xbi0m3zby9nwcpv4qzs";
           name = "helm-dired-recent-dirs";
         };
@@ -24661,7 +24955,7 @@
           sha256 = "183vj5yi575aqkak19hl8k4mw38r0ki9p1fnpa8nny2srjyy34yb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-dirset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-dirset";
           sha256 = "0vng52axp7r01s00cqbbclbm5bx1qbhmlrx9h9kj7smx1al4daml";
           name = "helm-dirset";
         };
@@ -24682,7 +24976,7 @@
           sha256 = "0c3mn5w98phsv7gsljyp5vxxmr2w6n3nczh5zm4hcpwsra3wh1v9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-emmet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-emmet";
           sha256 = "1dkn9qa3dv2im11lm19wfh5jwwwp42sv7jc0p6qg35rhzwdpfg03";
           name = "helm-emmet";
         };
@@ -24703,7 +24997,7 @@
           sha256 = "0330s07b41nw9q32xhjdl7yw83p8ikj6b2qkir3y0jyx16gk10dl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-emms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-emms";
           sha256 = "1vq7cxnacmhyczsa4s5h1nnzc08m66harfnxsqxyrdsnggv9hbf5";
           name = "helm-emms";
         };
@@ -24724,7 +25018,7 @@
           sha256 = "00yhmpv5xjlw1gwbcrznz83gkaby8zlqv74d3p7plca2cwjll1g9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-filesets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-filesets";
           sha256 = "1yhhchksi0r4r5c5q1mggz2hykkvk93baq91b5hkaflqi30d1v8f";
           name = "helm-filesets";
         };
@@ -24745,7 +25039,7 @@
           sha256 = "0vmlpj6zfif5f3wzgq8lkfqprl3z5gjsqj86347krblgfzhqlz30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-firefox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-firefox";
           sha256 = "0677nj0zsk11vvp3q3xl9nk8dhz3ki9yl3kfb57wgnmprp109wgs";
           name = "helm-firefox";
         };
@@ -24758,15 +25052,15 @@
     helm-flx = callPackage ({ emacs, fetchFromGitHub, fetchurl, flx, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-flx";
-        version = "20160105.1418";
+        version = "20160129.1504";
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "helm-flx";
-          rev = "95b197ae8b20ac125a540abff7da6c6588250477";
-          sha256 = "1np2kwrwd82nq3bs1vsgyybx1j1wc639ndfzizhskglss4m1md2y";
+          rev = "0001a85e88164e8ba6a674a19c44772ce946c9d4";
+          sha256 = "1j2ziyzyhd177b3rhrdbkqjmqbr3a8aj670mayy6l2r4ydp5xmaq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-flx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-flx";
           sha256 = "03vxr5f5m4s6k6rm0976w8h3s4c3b5mrdqgmkd281hmyh9q3cslq";
           name = "helm-flx";
         };
@@ -24787,7 +25081,7 @@
           sha256 = "0k5703nj838qh0h6hzgffjrp0df9rs7psczg4r9mxpi19vqk8ff0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-flycheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-flycheck";
           sha256 = "038f9294qc0jnkzrrjxm97hyhwa4sca3wdsjbaya50cf0g4cmk7b";
           name = "helm-flycheck";
         };
@@ -24808,7 +25102,7 @@
           sha256 = "1liaid4l4x8sb133lj944gwwpqngsf8hzibdwyfdmsi4m4abh73h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-flymake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-flymake";
           sha256 = "0h87yd56nhxpahrcpk6hin142hzv3sdr5bvz0injbv8a2lwnny3b";
           name = "helm-flymake";
         };
@@ -24829,7 +25123,7 @@
           sha256 = "1k7invgzqrcm11plyvinqwf98yxibr8i4r9yw3csfsicc8b6if59";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-flyspell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-flyspell";
           sha256 = "1g6xry2y6396pg7rg8hc0l84z5r3j2df7dpd1jgffxa8xa3i661f";
           name = "helm-flyspell";
         };
@@ -24850,7 +25144,7 @@
           sha256 = "1jns0428jmxrm4w9yk67ffbzmgyjgp1v5ii152y0wsb105ary0xp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-fuzzier";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-fuzzier";
           sha256 = "0qdgf0phs3iz29zj3qjhdgb3i4xvf5r2vi0709pwxx2s6r13pvcc";
           name = "helm-fuzzier";
         };
@@ -24871,7 +25165,7 @@
           sha256 = "1yxnmxq6ppfgwxrk5ryc5xfn82kjf4j65j14hy077gphr0q61q6a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-fuzzy-find";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-fuzzy-find";
           sha256 = "0lczlrpd5jy2vhy9jl3rjcdyiwr136spqm8k2rj8m9s8wpn0v75i";
           name = "helm-fuzzy-find";
         };
@@ -24892,7 +25186,7 @@
           sha256 = "16p1gisbza48qircsvrwx020n96ss1c6s68d7cgqqfc0bf2467is";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ghc";
           sha256 = "1q5ia8sgpflv2hhvw7hjpkfb25vmrjwlrqz1f9qj2qgmki5mix2d";
           name = "helm-ghc";
         };
@@ -24905,15 +25199,15 @@
     helm-ghq = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ghq";
-        version = "20151221.623";
+        version = "20160203.927";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-ghq";
-          rev = "2997646b2fb5421ab435b772dd2dbaeb92d70166";
-          sha256 = "0rlk9016rxj292kpxrnqgrm4xsjs4m4gk2fwh8z3fcihi013lxaw";
+          rev = "db37bfe290b234ed3f39dcce24667072172ded41";
+          sha256 = "0y379qap3mssz9nslb08vfzq5ihqcm156fbx0dszgz9d6xgkpdhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ghq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ghq";
           sha256 = "14f3cbsj7jhlhrp561d8pasllnx1cmi7jk6v2fja7ghzj76dnvq6";
           name = "helm-ghq";
         };
@@ -24934,7 +25228,7 @@
           sha256 = "1yfy4a52hx44r32i0b75bka8gfcn5lp61jl86lzrsi2cr9wg10pn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-git";
           sha256 = "1ib73p7cmkw96csxxpkqwn6m60k1xrd46z6vyp29gj85cs4fpsb8";
           name = "helm-git";
         };
@@ -24955,7 +25249,7 @@
           sha256 = "157b525h0kiaknn12fsw67fg26lzb20apx8sssmvlcicqcd51iaw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-git-files";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-git-files";
           sha256 = "02109r956nc1dmqh4v082vkr9wdixh03xhl7icwkzl7ipr5453s6";
           name = "helm-git-files";
         };
@@ -24976,7 +25270,7 @@
           sha256 = "1mp5gbda81szbx19rvaa6ybb28v64q49hqic8d478ggnjjsqhfyr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-git-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-git-grep";
           sha256 = "1ww6a4q78w5hnwikq7y93ic2b7x070c27r946lh6p8cz1k4b8vqi";
           name = "helm-git-grep";
         };
@@ -24997,7 +25291,7 @@
           sha256 = "1sbhh3dmb47sy3r2iw6vmvbq5bpjac4xdg8i5a0m0c392a38nfqn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-github-stars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-github-stars";
           sha256 = "1r4mc4v71171sq9rbbhm346s92fb7jnvvl91y2q52jqmrnzzl9zy";
           name = "helm-github-stars";
         };
@@ -25018,7 +25312,7 @@
           sha256 = "0pd755s5zcg8y1svxj3g8m0znkp6cyx5y6lsj4lxczrk7lynzc3g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-gitignore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-gitignore";
           sha256 = "01l7mx8g1m5qnwz973hzrgds4gywm56jgl4hcdxqvpi1n56md3x6";
           name = "helm-gitignore";
         };
@@ -25035,11 +25329,11 @@
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "emacs-gitlab";
-          rev = "78deece7f314f9652b50117605e93be9f8c860f4";
-          sha256 = "07i4j9yl1yag70sl89n7v4yg4jvh5mrifhrf1xswlb29by6najdx";
+          rev = "1615468bbbe2bf07914dd525067ac39db2bc19c0";
+          sha256 = "00mma30r7ixbrxjmmddz4klh517fcr3yn6ss4zw33fh2hzj3w6rl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-gitlab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-gitlab";
           sha256 = "010ihx3yddhb8j3jqcssc49qnf3i7xlz0s380mpgrdxgz6yahsmd";
           name = "helm-gitlab";
         };
@@ -25060,7 +25354,7 @@
           sha256 = "1r01nl1k9jjb70214rkmbqaa4qrkyd3apiyq00w02wsymy12wwic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-go-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-go-package";
           sha256 = "102yhn1xg83l67yaq3brn35a03fkvqqhad10rq0h39n4i1slq3z6";
           name = "helm-go-package";
         };
@@ -25081,7 +25375,7 @@
           sha256 = "0ml5mv282dz73hmgjalcsypdvc30pwhsfbamyz46744j7wxn6ik2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-google";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-google";
           sha256 = "0d1y7232rm888car3h40fba1m1pna2nh1a3fcvpra74igwarfi32";
           name = "helm-google";
         };
@@ -25102,7 +25396,7 @@
           sha256 = "07bmk4wbn07rg8h8rdhah285hsaaqkx5n84g87lpb7y5ba3ivlk5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-grepint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-grepint";
           sha256 = "00wr3wk41sbpamxbjkqlby49g8y5z9n79p51sg7ginban4qy91gf";
           name = "helm-grepint";
         };
@@ -25123,7 +25417,7 @@
           sha256 = "0p0mk44y2z875ra8mzcb6vlf4rbkiq9yank5hdxvg2x2sxsaambk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-growthforecast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-growthforecast";
           sha256 = "0716rhs5dam6p8ym83vy19svl6jr49lcfgb29mm3cqi9jcch3ckh";
           name = "helm-growthforecast";
         };
@@ -25136,15 +25430,15 @@
     helm-gtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-gtags";
-        version = "20160117.2055";
+        version = "20160202.703";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-gtags";
-          rev = "7fb96b900fb8640993354a2f83732a50da529d03";
-          sha256 = "1gfshy0brlfa8z39savj2a0jlfpqffijshsyjpz28ig2ggv8amnh";
+          rev = "f14ff7140d0f070b089df7567f2cc6b437ab9924";
+          sha256 = "1hqmwbdcjssvvl7prdykhlgbfrf4qylkvqp0nnnxp8r1wy6h6aws";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-gtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-gtags";
           sha256 = "0snx0b8b4yc507q3i4fzvrd68xgzqxly8kn5cwp26ik6cv840y29";
           name = "helm-gtags";
         };
@@ -25165,7 +25459,7 @@
           sha256 = "189dv3qqqmfyhsqa1n52cgcn1xv7k49f92ndn43y2v20234nhl9f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-hatena-bookmark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-hatena-bookmark";
           sha256 = "14091zrp4vj7752rb5s3pkyvrrsdl7iaj3q9ys8rjmbsjwcv30id";
           name = "helm-hatena-bookmark";
         };
@@ -25186,7 +25480,7 @@
           sha256 = "08pfzs030d8g5s7vkpgicz4srp5cr3xpd84lhrr24ncrhbszxar9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-hayoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-hayoo";
           sha256 = "0xdvl6q2rpfsma4hx8m4snbd05s4z0bi8psdalixywlp5s4vzr32";
           name = "helm-hayoo";
         };
@@ -25207,7 +25501,7 @@
           sha256 = "05ksfx54ar2j4mypzwh0gfir8r26s4f1i4xw319q5pa1y2100cpn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-helm-commands";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-helm-commands";
           sha256 = "0dq9p37i5rrp2nb1vhqzzqfmdg11va2xr3yz8hdxpwykm1ldqdcf";
           name = "helm-helm-commands";
         };
@@ -25228,7 +25522,7 @@
           sha256 = "052hzybign54qawdm1fflsaz4bcwflycksv6wb1nw1jv79s2qbap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-hoogle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-hoogle";
           sha256 = "0672mqm0c261mknbgc3a4pahq27gw2pfklflxl1y4ykbs6q7vcyw";
           name = "helm-hoogle";
         };
@@ -25249,7 +25543,7 @@
           sha256 = "0128nrhwyzslzl0l7wcjxn3dlx3h1sjmwnbbnp2fj4bjk7chc59q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-idris";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-idris";
           sha256 = "1y52675j4kcq14jypxjw1rflxrxwaxyn1n3m613klad55wpfaamf";
           name = "helm-idris";
         };
@@ -25270,7 +25564,7 @@
           sha256 = "0py4xs27z2jvg99i6qaf2ccz0mvk6bb9cvdyz8v8ngmnj3rw2vla";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-img";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-img";
           sha256 = "0sq9l1wgm97ppfc45w3bdcv0qq5m85ygnanv1bdcp8bxbdl4vg0q";
           name = "helm-img";
         };
@@ -25291,7 +25585,7 @@
           sha256 = "04vdin0n3514c8bycdjrwk3l6pkarrwanlklnm75315b91nkkbcp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-img-tiqav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-img-tiqav";
           sha256 = "1m083hiih2rpyy8i439745mj4ldqy85fpnvms8qnv3042b8x35y0";
           name = "helm-img-tiqav";
         };
@@ -25312,7 +25606,7 @@
           sha256 = "04ddjdia09y14gq4h6m8g6aiwkqvdxp66yjx3j5dh2xrkyxhlxpz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ispell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ispell";
           sha256 = "0qyj6whgb2p0v231wn6pvx4awvl1wxppppqqbx5255j8r1f3l1b0";
           name = "helm-ispell";
         };
@@ -25333,7 +25627,7 @@
           sha256 = "1czgf5br89x192g3lh3x2n998f79hi1n2f309ll264qnl35kv14w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-itunes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-itunes";
           sha256 = "15z5lgh5x1ykz5p31i994fig8v05s7ckkgw6p9jifn11sn1a39nb";
           name = "helm-itunes";
         };
@@ -25354,7 +25648,7 @@
           sha256 = "0f2psp7p82sa2fip282w152zc1rjd3l0sna1g7rgwi9x29gcsh0v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-j-cheatsheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-j-cheatsheet";
           sha256 = "0lppzk60vl3ps9fqnrh020awiy5w46gwlb6d91pr889x24ryphmm";
           name = "helm-j-cheatsheet";
         };
@@ -25375,7 +25669,7 @@
           sha256 = "0vhqpcv8xi6a6q7n6xxahdzijr1x5s40fvk9nc44q55psbyv627g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-jstack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-jstack";
           sha256 = "0giix1rv2jrmdxyg990w90ivl8bvgbbvah6nkpj7gb6vbnm15ldz";
           name = "helm-jstack";
         };
@@ -25396,7 +25690,7 @@
           sha256 = "0nkmc17ggyfi7iz959mvzh6q7116j44zqwi7ydm9i8z49xfpzafy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-lobsters";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-lobsters";
           sha256 = "0dkb78n373kywxj8zba2s5a2g85vx19rdswv9i78xjwv1lqh8cpp";
           name = "helm-lobsters";
         };
@@ -25417,7 +25711,7 @@
           sha256 = "129mlpx5vqxyg2scrdiajxp71phxamrvijpc054k1q1an8vgn0kv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ls-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ls-git";
           sha256 = "08rsy9479nk03kinjfkxddrq6wi4sx2a0wrz37cl2q517qi7sibj";
           name = "helm-ls-git";
         };
@@ -25438,7 +25732,7 @@
           sha256 = "1msrsqiwk7bg5gry5cia8a6c7ifymfyn738hk8g2qwzzw4vkxxcs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ls-hg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ls-hg";
           sha256 = "0ca0xn7n8bagxb504xgkcv04rpm1vxhx2m77biqrx5886pwl25bh";
           name = "helm-ls-hg";
         };
@@ -25454,11 +25748,11 @@
         version = "20150717.239";
         src = fetchsvn {
           url = "https://svn.macports.org/repository/macports/users/chunyang/helm-ls-svn.el";
-          rev = "144800";
+          rev = "145428";
           sha256 = "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ls-svn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ls-svn";
           sha256 = "08mwzi340akw4ar20by0q981mzmzvf0wz3mn738q4inn2kqgs60d";
           name = "helm-ls-svn";
         };
@@ -25479,7 +25773,7 @@
           sha256 = "05z1s01wgdj2s7qln42cg7nnjq0hmq2ji4xjldzj6w770a5nvb7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-make";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-make";
           sha256 = "1r6jjy1rlsii6p6pinbz7h6gcw4vmcycd3vj338bfbnqp5rrf2mc";
           name = "helm-make";
         };
@@ -25500,7 +25794,7 @@
           sha256 = "0gzlprf5js4y3vzkf7si2xc7ai5j97b5cqrs002hyjj5ij4f2vix";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-migemo";
           sha256 = "1cjvb1lm1fsg5ky63fvrphwl5a7r7xf6qzb4mvl06ikj8hv2h33x";
           name = "helm-migemo";
         };
@@ -25521,7 +25815,7 @@
           sha256 = "1lbxb4vnnv6s46m90qihkj99qdbdylwncwaijjfd7i2kap2ayawh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-mode-manager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-mode-manager";
           sha256 = "1w9svq1kyyj8mmljardhbdvykb334nq1y18s956g4rvqyas2ciyd";
           name = "helm-mode-manager";
         };
@@ -25542,7 +25836,7 @@
           sha256 = "09rb8aq7fnf661w3liwbkkaczjph3dzvg26slm9cwcnl7pqnvagl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-mt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-mt";
           sha256 = "04hx8cg8wmm2w8g942nc9mvm12ammmjnx4k61ljrq76smd8s3x2a";
           name = "helm-mt";
         };
@@ -25555,15 +25849,15 @@
     helm-mu = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-mu";
-        version = "20160104.415";
+        version = "20160124.1957";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm-mu";
-          rev = "e9805abf7498d3f990da26dd3355e5af3112e29e";
-          sha256 = "0xqykxq8ys9gd269kjzhlwcd2lzsjj5j2ynijvpl2rji10w2xwkr";
+          rev = "20a2a8a43403f5ff9ee32510c78551f63d2e0e57";
+          sha256 = "0zcpdkh2ycmnv2nkv02khqp5r7za3x3vji2sj4nwz1wd86rrpbv5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-mu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-mu";
           sha256 = "0pydp6scj5icaqfp3dp5h0q1y2i7z9mfyw1ll6iphsz9qh3x2bj2";
           name = "helm-mu";
         };
@@ -25584,7 +25878,7 @@
           sha256 = "0ia9wgn33znaviy7ilfm83yfalc2dbpm1g7nvss5s4rznqkdfhn3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-nixos-options";
           sha256 = "1nsi4hfw53iwn29fp33dkri1c6w8kdyn4sa0yn2fi6144ilmq933";
           name = "helm-nixos-options";
         };
@@ -25605,7 +25899,7 @@
           sha256 = "1wkmbc7247f209krvw4dzja3z0wyny12x5yi1cn3fnfh5nx04851";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-open-github";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-open-github";
           sha256 = "121sszwvihbv688nq5lhdclvsjj8759glh42h82r4pcw30lxggxb";
           name = "helm-open-github";
         };
@@ -25626,7 +25920,7 @@
           sha256 = "1zyjxrrda7nxxjqczv2p3sfimxy2pq734kf51j6v2y0biclc4bk3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-orgcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-orgcard";
           sha256 = "1a56y8fny7qxxidc357n7l3yi7h66hidhvwhkam8y5wk6k61460p";
           name = "helm-orgcard";
         };
@@ -25647,7 +25941,7 @@
           sha256 = "14ad0b9d07chabjclffjyvnmrasar1di9wmpzf78bw5yg99cbisw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-package";
           sha256 = "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y";
           name = "helm-package";
         };
@@ -25668,7 +25962,7 @@
           sha256 = "0yngs3q6142g2nn1wwdaifylyfjjs3gmmy0jck5zh8mhmdgdqr06";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-pages";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-pages";
           sha256 = "1v3w8100invb5wsmm3dyl41pjs7s889s3b1rlr6vlcspa1ncv3wj";
           name = "helm-pages";
         };
@@ -25689,7 +25983,7 @@
           sha256 = "13wnagmgicl2mi4iksqckrjbaiz05j9ykbmvj26jy8zcbll5imfs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-perldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-perldoc";
           sha256 = "0b0cl2xj5w1r71zrjhnqhrzsnz1296jv21qx5adzslra6lk55q2r";
           name = "helm-perldoc";
         };
@@ -25710,7 +26004,7 @@
           sha256 = "076yhcf447fas14k8gg67rc743x049xf66627sd9lgjv7107r8vr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-proc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-proc";
           sha256 = "1bq60giy2bs9m3hlbc5nwvy51702a98s0vqass3b290hdgki4bnx";
           name = "helm-proc";
         };
@@ -25731,7 +26025,7 @@
           sha256 = "0j54c1kzsjgr05qx25rg3ylawvyw6n6liypiwaas47vpyfswbxhv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-project-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-project-persist";
           sha256 = "1n87kn1n3453mpdj6amyrgivslskmnzdafpspvkz7b0smf9mv2ld";
           name = "helm-project-persist";
         };
@@ -25752,7 +26046,7 @@
           sha256 = "1c6pfy3qghpqnng1jsnxnvqnd6sq41f2dm7kkwkgml405asqlcqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-projectile";
           sha256 = "18y7phrvbpdi3cnghwyhh0v1bwm95nwq1lymzf8lrcbmrwcvh36a";
           name = "helm-projectile";
         };
@@ -25773,7 +26067,7 @@
           sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-prosjekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-prosjekt";
           sha256 = "019rya3bf13cnval8iz680wby3sqlmqg4nbn0a13l1pkhlnv9fvm";
           name = "helm-prosjekt";
         };
@@ -25794,7 +26088,7 @@
           sha256 = "01wcybzb1jdyybr7scblzxp3c16zm01ms9ci1hcpfsv2y55gbg5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-pt";
           sha256 = "1imhy0bsm9aldv0pvf88280qdya01lznxpx5gi5wffhrz17yh4pi";
           name = "helm-pt";
         };
@@ -25815,7 +26109,7 @@
           sha256 = "1hlbyw6jvh6pm3ivmhd6qvs9j7km322fki9g4yd4qw7w15a3wkyy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-pydoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-pydoc";
           sha256 = "0cnbhjw951f8sci63cvzcc65d0ffdx3rb8l1g38qql5rzkam48fn";
           name = "helm-pydoc";
         };
@@ -25836,7 +26130,7 @@
           sha256 = "1a26r21jvgzk21vh3mf29s1dhvvv70jh860zaq9ihrpfrrl91158";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-rails";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-rails";
           sha256 = "1iihfsmnkpfp08pldghf3w5k8v5dlmy5ns0l4niwdwp5w8lyjcd6";
           name = "helm-rails";
         };
@@ -25857,7 +26151,7 @@
           sha256 = "1b74jsr28ldz80mrqz3d1bmykpcprdbhf3fzhc0awd5i5xdnfaid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-rb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-rb";
           sha256 = "14pkrj1rpi2ihpb7c1hx6xwzvc1x7l41lwr9znp5vn7z93i034fr";
           name = "helm-rb";
         };
@@ -25878,7 +26172,7 @@
           sha256 = "0nbny1a41sy4w3k2irp7rh6663jhbssqqshxd3y82iq0hs9h2wda";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-recoll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-recoll";
           sha256 = "0pr2pllplml55k1xx9inr3dm90ichg2wb62dvgvmbq2sqdf4606b";
           name = "helm-recoll";
         };
@@ -25899,7 +26193,7 @@
           sha256 = "05mf0021jhr4zmysy28cgilkfxyp08qmkc20v9wlykksg73l2crk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-rhythmbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-rhythmbox";
           sha256 = "0pnm7yvas0q3b38ch5idm7v4ih2fjyfai8217j74xhkpcc2w4g4a";
           name = "helm-rhythmbox";
         };
@@ -25920,7 +26214,7 @@
           sha256 = "163ljqar3vvbavzc8sk6rnf8awyc2rhh2g117fglswich3c8lnqg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-robe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-robe";
           sha256 = "1gi4nkm9xvnxv0frmhiiw8dkmnmhfpr9n0b6jpidlvr8xr4s5kyw";
           name = "helm-robe";
         };
@@ -25941,7 +26235,7 @@
           sha256 = "0s4hb1fvwr9za5gkz8s5w1kh9qjyygz6g59w7vmrg2d8ds2an03d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-rubygems-local";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-rubygems-local";
           sha256 = "18p18bly15a8xjc34k11jbvxlmr127sll0vh5ma2p787x6a3mc7c";
           name = "helm-rubygems-local";
         };
@@ -25962,7 +26256,7 @@
           sha256 = "1sff8kagyhmwcxf9062il1077d4slvr2kq76abj496610gpb75i0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-rubygems-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-rubygems-org";
           sha256 = "04ni03ak53z3rggdgf68qh7ksgcf3s0f2cv6skwjqw7v8qhph6qs";
           name = "helm-rubygems-org";
         };
@@ -25983,7 +26277,7 @@
           sha256 = "0qm5wlqklwf0y8grqhl2hfyfbkyj8200cdmbcf9cfr51lrh3cn8v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-safari";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-safari";
           sha256 = "0lvwghcl5w67g0lc97r7hfvca7ss0mysy2mxj9axxbpyiq6fmh0y";
           name = "helm-safari";
         };
@@ -26004,7 +26298,7 @@
           sha256 = "1s6aw1viyzhhrfiazzi82n7bkvshp7clwi6539660m72lfwc5zdl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-sage";
           sha256 = "1vnq15fjaap0ai7dadi64sm4415xssmahk2j7kx45sasy4qaxlbj";
           name = "helm-sage";
         };
@@ -26025,7 +26319,7 @@
           sha256 = "00wnqcgpf4hqdnqj5zrizr4s0pffb93xwya8k5c3rp4plncrcdzx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-sheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-sheet";
           sha256 = "0lx70l5gq43hckgdfna8s6wx287sw5ms9l1z3n6vg2x8nr9m61kc";
           name = "helm-sheet";
         };
@@ -26046,7 +26340,7 @@
           sha256 = "0sw7g1zcs1jfqcpprxwjq97lsk4qfngwamkj3q8jhm77zh7kfa3b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-spaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-spaces";
           sha256 = "0hdvkk173k98iycvii5xpbiblx044125pl7jyz4kb8r1vvwcv791";
           name = "helm-spaces";
         };
@@ -26067,7 +26361,7 @@
           sha256 = "133dcqk42nq5gh5qlcbcmx3lczisfgymcnypnld318jvjgd2ma8a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-spotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-spotify";
           sha256 = "1rzvxnaqh8bm78qp0rhpqs971pc855qrq589r3s8z3gpqzmwlnmf";
           name = "helm-spotify";
         };
@@ -26080,15 +26374,15 @@
     helm-swoop = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-swoop";
-        version = "20151022.1950";
+        version = "20160131.733";
         src = fetchFromGitHub {
           owner = "ShingoFukuyama";
           repo = "helm-swoop";
-          rev = "d953ad605c989c40da5bc0fcb2953104ea7210e6";
-          sha256 = "1dixg0yik08ad9qwcfis9vkg1h7zwqsisfr1zlgzabpzzm822mmd";
+          rev = "002338d9685d82ef10aaf97d2e8084e61dfc94b4";
+          sha256 = "0n7fma8zp6shyz814mxfljj8x23gcwnkrbghkmfjp87cr1zkmw41";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-swoop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-swoop";
           sha256 = "1fqbhj75hcmy7c2vdd0m7fk3m34njmv5s6k1i9y94djpbd13i3d8";
           name = "helm-swoop";
         };
@@ -26109,7 +26403,7 @@
           sha256 = "0a9h6rmjc6c6krkvxbgrzv35if260d9ma9a2k47jzm9psnyp9s2w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-themes";
           sha256 = "1j64w6dnxmq0rfycci9wfy2z5lbddsggf486pknxfgwwqgvns90l";
           name = "helm-themes";
         };
@@ -26130,7 +26424,7 @@
           sha256 = "1ypnsbx623gg3q07gxrbkn82jzy38sj4p52hj1wcb54qjqzyznkg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-unicode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-unicode";
           sha256 = "052xqzvcfzpsbl75ylqb1khqndvc2dqdymqlwivs0darlds0w8y4";
           name = "helm-unicode";
         };
@@ -26151,7 +26445,7 @@
           sha256 = "0xlz9rxx7y9pkrzvxmv42vgys5iwx75zv9g50k8ihwc08z80dhcq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-w32-launcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-w32-launcher";
           sha256 = "0bzn2vhspn6lla815qxwsl9gwfyiwgwmnysr6rjpyacmi17d73ri";
           name = "helm-w32-launcher";
         };
@@ -26172,7 +26466,7 @@
           sha256 = "0d47mqib4zkfadq26vpy0ih7j18d6n5v4c21wvr4hhg6hg205iiz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-w3m";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-w3m";
           sha256 = "1rr83ija93iqz74k236hk3v75jk0iwcccwqpqgys7spvrld0b9pz";
           name = "helm-w3m";
         };
@@ -26185,15 +26479,15 @@
     helm-wordnet = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-wordnet";
-        version = "20150921.1633";
+        version = "20160128.907";
         src = fetchFromGitHub {
           owner = "raghavgautam";
           repo = "helm-wordnet";
-          rev = "71fe718cccdb172614b5e2e55192301a44f6d7d4";
-          sha256 = "0jaj513nnmbmlj8if84k5k0k7a6b24hzpzi0kbzj5vbr010cwnjd";
+          rev = "a36dbc6fcb570b812870bc1e190f203e0a0042fc";
+          sha256 = "03a5hzgqak8wg6i2h2p3fr9ij55lqarcsblml8qrnrj27ghcvzzh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-wordnet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-wordnet";
           sha256 = "0di8gxsa9r8mzja4akhz0wpgrhlidqyn1s1ix5szplwxklwf2r2f";
           name = "helm-wordnet";
         };
@@ -26214,7 +26508,7 @@
           sha256 = "19l8vysjygscr1nsddjz2yv0fjhbsswfq40rdny8zsmaa6qhpj35";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-words";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-words";
           sha256 = "0l9mb7g3xzasna1bw2p7vh2wdg1hmjkff40p8kpqvwwzszdm9v76";
           name = "helm-words";
         };
@@ -26235,7 +26529,7 @@
           sha256 = "1yqr5z5sw7schvaq9pmwg79anp806gikm28s6xvrayzyn4idz2n6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-xcdoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-xcdoc";
           sha256 = "1ikphlnj053i4g1l8r2pqaljvdqglj1yk0xx4vygnw98qyzdsx4v";
           name = "helm-xcdoc";
         };
@@ -26256,7 +26550,7 @@
           sha256 = "11fznbfcv4rac4h50mkax1g66wd2f91f5dw2v4jxjq2f5y4h4w0g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-zhihu-daily";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-zhihu-daily";
           sha256 = "0hkgail60s9qhxl0pskqxjvfz93iq1qh1kcmcq0x5kq7d08b911r";
           name = "helm-zhihu-daily";
         };
@@ -26274,7 +26568,7 @@
           sha256 = "00x3ln7x4d6r422x845smf3h0x1z85l5jqyjkrllqcs7qijcrk5w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/help-fns+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/help-fns+";
           sha256 = "10vz7w79k3barlcs3ph3pc7914xdhcygagdk2wj3bq0wmwxa1lia";
           name = "help-fns-plus";
         };
@@ -26292,7 +26586,7 @@
           sha256 = "0qmf81maq6yvs68b8vlbxwkjk72qldamq75znrma9mhvlv8igrgx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/help-mode+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/help-mode+";
           sha256 = "1pmb845bxa5kazjpdxm12rm2wcshmv2cmisigs3kyva1pmi1shra";
           name = "help-mode-plus";
         };
@@ -26310,7 +26604,7 @@
           sha256 = "1r7kf9plnsjx87bhflsdh47wybvhis7gb10izqa1p6w0aqsg178s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/help+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/help+";
           sha256 = "1jx0wa4md1mvdsvjyx2yvi4hhm5w061qqcafsrw4axsz7gjpd4yi";
           name = "help-plus";
         };
@@ -26331,7 +26625,7 @@
           sha256 = "178dvigiw162m01x7dm8pf61w2n3bq51lvk5q7jzpb9s35pz1697";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hemisu-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hemisu-theme";
           sha256 = "0byzrz74yvk12m8dl47kkmkziwrrql193q72qx974zbqdj8h2sph";
           name = "hemisu-theme";
         };
@@ -26352,7 +26646,7 @@
           sha256 = "0c45pib8qpwgyr271g5ddnsn7hzq68mqflv0yyc8803ni06w9vhj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/heroku";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/heroku";
           sha256 = "1kadmxmqhc60cb5k14943rad1gbril2hlcnqxnsy4h3j2ykmcdyy";
           name = "heroku";
         };
@@ -26373,7 +26667,7 @@
           sha256 = "15hk0v6ck076mahsz4spq75jcnv587fx4d3w50c7bdh423fl0xvx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/heroku-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/heroku-theme";
           sha256 = "0mchh9y3pqwamry6105qrv1bp1qg1g0jmz7rzc5svz9giynypwf9";
           name = "heroku-theme";
         };
@@ -26391,7 +26685,7 @@
           sha256 = "0rqjidjxa5j6rjknklfks743lczbq3qsyiranrf2z3ghzi0gf7fd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hexrgb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hexrgb";
           sha256 = "0mzqslrrf7sc262syj3ja7b7rnbg80dwf2p9bzxdrzx6b8vvsx06";
           name = "hexrgb";
         };
@@ -26412,7 +26706,7 @@
           sha256 = "06hm98aq87l91fhb2bqz8jw427k8fb280ygz5g44fy6sqc6js7v0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hgignore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hgignore-mode";
           sha256 = "0ja71l3cghhn1c6w2pff80km8h8xgzf0j9gcldfyc72ar6ifhjkj";
           name = "hgignore-mode";
         };
@@ -26433,7 +26727,7 @@
           sha256 = "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hi2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hi2";
           sha256 = "1wxkjg1jnw05lqzggi20jy2jl20d8brvv76vmrf6lnz62g6jv9h2";
           name = "hi2";
         };
@@ -26451,7 +26745,7 @@
           sha256 = "1l5jvgjgd0kzv1sn6h467fbnl487hma4h4pkwq4x1dhbc26yvfpz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hide-comnt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hide-comnt";
           sha256 = "181kns2rg4rc0pyyxw305qc06d10v025ad7v2m037y72vfwb0igx";
           name = "hide-comnt";
         };
@@ -26469,7 +26763,7 @@
           sha256 = "1q87yp1pr62cza3pqimqd09a39yyij4c7pncdww84zz7cii9qrn2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hide-lines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hide-lines";
           sha256 = "146sgvd88w20rqvd8y8kc76cb1nqk6dvqsz9rgl4rcrf0xfqvp7q";
           name = "hide-lines";
         };
@@ -26487,7 +26781,7 @@
           sha256 = "1zxrygpf47bzj6p808r3qhj3dfr3m8brp1xgxs33c7f88rinfval";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hide-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hide-region";
           sha256 = "0nsc6m3yza658xsxvjz8766vkp71rcm6vwnvcv225r2pr94mq7vm";
           name = "hide-region";
         };
@@ -26508,7 +26802,7 @@
           sha256 = "1dr06b9njzih8z97k62l9w3x0a801x4bp043zvk7av9qkz8izl2r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hideshow-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hideshow-org";
           sha256 = "1bzx5ii06r64nra92zv1dvw5zv3im7la2dd3md801hxyfrpb74gc";
           name = "hideshow-org";
         };
@@ -26526,7 +26820,7 @@
           sha256 = "15ax1j3j7kylyc8a91ja825sp4mhbdgx0j4i5kqxwhvmwvpmyrv6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hideshowvis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hideshowvis";
           sha256 = "1ajr71fch3v5g8brb83kwmlakcam5w21i3yr8df00c5j2pnc6v1f";
           name = "hideshowvis";
         };
@@ -26544,7 +26838,7 @@
           sha256 = "15s4463damlszd5wqi22a6w25i8l0m5rvqdg73k3yp01i65jc29z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight";
           sha256 = "0clv4mzy9kllcvc0cgsbx3a9anw68dc2c7vzwbrv13sw5gh9skc0";
           name = "highlight";
         };
@@ -26565,7 +26859,7 @@
           sha256 = "0c65jk00j88qxfki2g88hy9g6n92rzskwcn1fbmwcw3qgaz4b6w5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-blocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-blocks";
           sha256 = "1a32iv5kgf6g6ygbs559w156dh578k45m860czazfx0d6ap3k5m1";
           name = "highlight-blocks";
         };
@@ -26583,7 +26877,7 @@
           sha256 = "18y6cw43mhizccvwfydv6g2kz8w7vff0n3k9sq5ghwq3rb3z14b2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-chars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-chars";
           sha256 = "19jawbjvqx1hsjbynx0jgpziap3r64k8s1xfckajrx8aq8m4c6i0";
           name = "highlight-chars";
         };
@@ -26601,7 +26895,7 @@
           sha256 = "0r3kzs2fsi3kl5gqmsv75dc7lgfl4imrrqhg09ij6kq1ri8gjxjw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-cl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-cl";
           sha256 = "164h3c3rzriahb7v5hk2pw4i0gk2vk5ak722bai6x4zx4l1xp20w";
           name = "highlight-cl";
         };
@@ -26620,7 +26914,7 @@
           sha256 = "1aki7a7nnj9n7vh19k4fr0v7cqbwkrpc6b3f3yv95vcqj8a4y34c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-current-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-current-line";
           sha256 = "01bga6is3frzlzfajpvpgz224vhl0jnc2bl2ipvlygdcmv4h8973";
           name = "highlight-current-line";
         };
@@ -26641,7 +26935,7 @@
           sha256 = "1l10xnjyvcbv1v8xlldaca7z3fk5qav7nsbhfnjxxd0bgh5v9by2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-defined";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-defined";
           sha256 = "1vjxm35wf4c2qphpkjh57hf03a5qdssdlmfj0n0gwxsdw1q5rpms";
           name = "highlight-defined";
         };
@@ -26662,7 +26956,7 @@
           sha256 = "0rs8zyjz5mh26n8bdxn6fmyw2809nihz1vp7ih59dq11lx3mf9az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-escape-sequences";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-escape-sequences";
           sha256 = "0938b29cqapid9v9q4w2jwh8kdb0p70qwzy9xm2nxaairm7436d6";
           name = "highlight-escape-sequences";
         };
@@ -26683,7 +26977,7 @@
           sha256 = "10m1cr5plzsxbq08lck4c2w0whcdrnl9h2qm4bbr9srhnpry7fxj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-indent-guides";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-indent-guides";
           sha256 = "00ghp677qgb5clxhdjarfl8ab3mbp6v7yfsldm9bn0s14lyaq5pm";
           name = "highlight-indent-guides";
         };
@@ -26704,7 +26998,7 @@
           sha256 = "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-indentation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-indentation";
           sha256 = "0iblrrbssjwfn71n8xxjcl98pjv1qw1igf3hlz6mh8740fsca3d6";
           name = "highlight-indentation";
         };
@@ -26725,7 +27019,7 @@
           sha256 = "1vy6j63jp83ljdqkrqglpys74yfh7p61sd0lqiwczgr5nqyc60rl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-leading-spaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-leading-spaces";
           sha256 = "0h2ww2vqmarghf4zg0wbwn0wgndmkcjy696mc885rwavck2dav4p";
           name = "highlight-leading-spaces";
         };
@@ -26746,7 +27040,7 @@
           sha256 = "0ffhc5s0h34064bix4qyiiyx30m4hpv0phmxwcrwiyvanj9ggfai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-numbers";
           sha256 = "1bywrjv9ybr65mwkrxggb52jdqn16z8acgs5vqm0faq43an8i5yv";
           name = "highlight-numbers";
         };
@@ -26767,7 +27061,7 @@
           sha256 = "0kzqx1y6rr4ryxi2md9087saad4g4bzysckmp8272k521d46xa1r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-parentheses";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-parentheses";
           sha256 = "1b0n9mz4a6baljvvgb881w53391smm35c9pwd45g861hk1qvrk5k";
           name = "highlight-parentheses";
         };
@@ -26784,11 +27078,11 @@
         src = fetchFromGitHub {
           owner = "Fanael";
           repo = "highlight-quoted";
-          rev = "ec9108486cf7f21f9a0b13f81369849b3b525f1f";
-          sha256 = "0vqkadhzszlxiqb4ysr7p86hhmi4z1j95llxa680xn6md8x2sj8a";
+          rev = "24103478158cd19fbcfb4339a3f1fa1f054f1469";
+          sha256 = "1gq8inxfni9zgz2brqm4nlswgr8b0spq15wr532xfrgr456g10ks";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-quoted";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-quoted";
           sha256 = "0x6gxi0jfxvpx7r1fm43ikxlxilnbk2xbhdy9xivhgmmdyqiqqkl";
           name = "highlight-quoted";
         };
@@ -26809,7 +27103,7 @@
           sha256 = "0gnr1dqkcmc9gfzqjaixh76g1kq7xp20mg1h6vl3c4na7nk6a3fg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-stages";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-stages";
           sha256 = "0r4kmjmrpi38q3y0q9h5xkxh7x728ha2nbnc152lzw6zfsxnm4x4";
           name = "highlight-stages";
         };
@@ -26830,7 +27124,7 @@
           sha256 = "19cgyk0sh8nsmf3jbi92i8qsdx4l4yilfq5jj9zfdbj9p5gvwx96";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-symbol";
           sha256 = "0gw8ffr64s58qdbvm034s1b9xz1hynzvbk8ld67j06fxpc98qaj4";
           name = "highlight-symbol";
         };
@@ -26848,7 +27142,7 @@
           sha256 = "1bbiyqddqkrp3c7xsg1m4143611bhg1kkakrwscqjb4cfmx29qqg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-tail";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-tail";
           sha256 = "187kv3n262l38jdapi9bwcafz8fh61pdq2zliwiz7m7xdspp2iws";
           name = "highlight-tail";
         };
@@ -26869,7 +27163,7 @@
           sha256 = "01cx05dkrshcpddciiqvbfcc0zg0awbvg3r2n1v44kiixyfdpdwr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-thing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-thing";
           sha256 = "0rvdb1lx9xn9drqw0sw9ih759n10g7k0af39w6n8g0wfr67p96w1";
           name = "highlight-thing";
         };
@@ -26890,7 +27184,7 @@
           sha256 = "0hhc2l4pz6q8injpplv6b5l08l8q2lnjdpwabp7gwmhraq54rhjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-unique-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-unique-symbol";
           sha256 = "0lwl8pkmq0q4dvyflarggnn8vzpvk5hhcnk508r6xml2if1sg9zx";
           name = "highlight-unique-symbol";
         };
@@ -26911,7 +27205,7 @@
           sha256 = "06nnqry36ncqacfzd8yvc4q59bwk3vgf9a14rkpph2hk2rfvq2m6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight2clipboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight2clipboard";
           sha256 = "19r7abbpm31b0azf2v3xn0rjagg9h01i8g72qapp8dhqb4d9n9r0";
           name = "highlight2clipboard";
         };
@@ -26932,7 +27226,7 @@
           sha256 = "1phyaf6fwaxi2plq38m09cfb5ls401ay8jw0yf5rix8nyvm8nrn9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hindent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hindent";
           sha256 = "1f3vzgnqigwbwvglxv0ziz3kyp5dxjraw3vlghkpw39f57mky4xz";
           name = "hindent";
         };
@@ -26950,7 +27244,7 @@
           sha256 = "1jkjg7zxpc06plzlyvj1a8dcvj8ijqzhkxwlsd12cgkymvp411yl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hippie-exp-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hippie-exp-ext";
           sha256 = "14py5hz523847f7bhw67v81x5cfhzz5la15mrqavc4z4yicy63iq";
           name = "hippie-exp-ext";
         };
@@ -26971,7 +27265,7 @@
           sha256 = "1l76r8hzhaapx76f6spm5jmjbrrm5zf79cpd5024xw3hpj1jbkjp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hippie-expand-slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hippie-expand-slime";
           sha256 = "0kxyv1lpkg33qgfv1jfqx03640py7525bcnc9dk98w6y6y92zf4m";
           name = "hippie-expand-slime";
         };
@@ -26992,7 +27286,7 @@
           sha256 = "0b5wrid428s11afc48d6mdifmd31gmzyrj9zcpd3jwk63ydiihdc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hippie-namespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hippie-namespace";
           sha256 = "1bzjhq116ci9c9f0aw121fn3drmg2pw5ny1w6wcasa4p30syxxf0";
           name = "hippie-namespace";
         };
@@ -27013,7 +27307,7 @@
           sha256 = "17dcpwx2y464g8qi3ixlsf3la8dn0bkxax296bhfg4vh73dxccl3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hipster-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hipster-theme";
           sha256 = "1xrgpqlzp4lhh5h3sv7pg1nqzc9wcv1hs6ybv2h4x6jangicwfl2";
           name = "hipster-theme";
         };
@@ -27034,7 +27328,7 @@
           sha256 = "1dmrg39g0faqqkgrpcbybjbb91vcpkwawxsplckkj92y59zanq3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/history";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/history";
           sha256 = "0s8pcz53bk1w4h5847204vb6j838vr8za66ni1b2y4pas76zjr5g";
           name = "history";
         };
@@ -27055,7 +27349,7 @@
           sha256 = "1y275fchhx0n6dv038hsr44a3bjghqdhc8j1dcpm2rvs8chgm8g0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/historyf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/historyf";
           sha256 = "15pcaqfjpkfwcy46yqqw10q8kpw7aamcg0gr4frbdgzbv0yld08s";
           name = "historyf";
         };
@@ -27076,7 +27370,7 @@
           sha256 = "097lrj9lgfa7szww324hlqywwkbi31n1pxfqyg0zbfj45djkp9bx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hive";
           sha256 = "1marz8gmk824hb0nkhaw48d4qw1xjk1aad27gviya7f5ilypxrya";
           name = "hive";
         };
@@ -27097,7 +27391,7 @@
           sha256 = "177blksgncxpxd1zi9kmbcfjnpd3ll1szjxiyc4am8a6hs1dyyqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hiwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hiwin";
           sha256 = "0klhxwxsz7xan2vsknw79r1dj4qhhjbfpddr67mk9qzccp8q0w8g";
           name = "hiwin";
         };
@@ -27118,7 +27412,7 @@
           sha256 = "0889dzrwizpkyh3wms13k8zx27ipsrsxfa4j4yzk4cwk3aicckcr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-anything";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-anything";
           sha256 = "15n998nhirvg3f719b7x9s7jpqv6gzkr22kp4zbbq99lbx2wfc1k";
           name = "hl-anything";
         };
@@ -27136,7 +27430,7 @@
           sha256 = "170sz6hjd85cw1x0y2g81ks3x3niib4f7y2xz6k8x0dpw357ggv3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-defined";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-defined";
           sha256 = "1y7vbhvpwxz70kja5hfm4i57mdd1cv43m4y9fr978y3nk265p8xx";
           name = "hl-defined";
         };
@@ -27157,7 +27451,7 @@
           sha256 = "17apqs7yqd89mv5283kmwp7byaaimj7j0vis0z1d89jlmp8i6zbc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-indent";
           sha256 = "1z42kcwcyinjay65mv042ijh4xfaaiyri368g0sjw0fflsg0ikcr";
           name = "hl-indent";
         };
@@ -27175,7 +27469,7 @@
           sha256 = "1kxq79pfs83gp12p2g093m6shsf25q88mi29bvhapxx77ahmxpkn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-line+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-line+";
           sha256 = "13yv2nmx1wb80z4yifnh6d67rag17wirmp7z8ssq3havjl8lbpix";
           name = "hl-line-plus";
         };
@@ -27196,7 +27490,7 @@
           sha256 = "0pjfbm8p077frk475bx8xkygn8r4vdsvnx4rcqbjlpjawj0ndgxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-sentence";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-sentence";
           sha256 = "16sjfs0nnpwzj1cqfna9vhmxgznwwhb2qdmjci25hlgrdxwwyahs";
           name = "hl-sentence";
         };
@@ -27217,7 +27511,7 @@
           sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-sexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-sexp";
           sha256 = "0kg0m20i9ylphf4w0qcvii8yp65abdl2q5flyphilk0jahwbj9jy";
           name = "hl-sexp";
         };
@@ -27235,7 +27529,7 @@
           sha256 = "0m84d1rdsp9r5ip79jlrp69pf1daw0ch8c378q3kc328606i3p2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-spotlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-spotlight";
           sha256 = "1166g27fp2pj4j3a8904pzvp5idlq4l22i0w6lbk5c9zh5pqyyf3";
           name = "hl-spotlight";
         };
@@ -27256,7 +27550,7 @@
           sha256 = "0lwcvwnkbfpjw92k4qfj57nlhv8xbl614p5dfi8qy76y8bs71cvd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-todo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-todo";
           sha256 = "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4";
           name = "hl-todo";
         };
@@ -27277,7 +27571,7 @@
           sha256 = "02mkfrs55d32948x739f94v35343gw6a0f7fknbcigbz56mzsvsp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hlint-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hlint-refactor";
           sha256 = "1311z6y7ycwx0mj67bya7a39j5hiypg72y6yg93dhgpk23wk7frq";
           name = "hlint-refactor";
         };
@@ -27298,7 +27592,7 @@
           sha256 = "0yw89kxvz53i9rbq3lsbp5xkgfl1986s23vyra5pipakfv85gmq4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hlinum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hlinum";
           sha256 = "04b6m0njr7yrbcbpkhqz4hmqpfacmyca3lw75dyw3vpjpsj2g0iv";
           name = "hlinum";
         };
@@ -27318,7 +27612,7 @@
           sha256 = "bf4056192044808554a5dfd537512ec939cbcf628a9becd61736d6409f7e7ce8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hoa-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hoa-mode";
           sha256 = "06rfqn7sqvmgpvwhfmk17qqs4q0frfzhm597z3p1q7kys2035kiv";
           name = "hoa-mode";
         };
@@ -27339,7 +27633,7 @@
           sha256 = "0g2r4d0ivbadqw1k8jsv0jwv8krpfahsg0qmzyi909p2yfddqk1l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hoa-pp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hoa-pp-mode";
           sha256 = "01ijfn0hd645j6j88rids5dsanmzwmky37slf50yqffnv69jwvla";
           name = "hoa-pp-mode";
         };
@@ -27360,7 +27654,7 @@
           sha256 = "1sj8pz48cilk8l6zn47fv1wkv833wrkvrf2mrmbdkvj3lqjrz0b3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/homebrew-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/homebrew-mode";
           sha256 = "088wc5fq4r5yj1nbh7mriyqf0xwqmbxvblj9d2wwrkkdm5flc8mj";
           name = "homebrew-mode";
         };
@@ -27381,7 +27675,7 @@
           sha256 = "1yvz9d5h7npxhsdf6s9fgxpmqk5ixx91iwivbhzcz935gs2886hc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hookify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hookify";
           sha256 = "0prls539ifk2fsqklcxmbrwmgbm9hya50z486d7sw426lh648qmy";
           name = "hookify";
         };
@@ -27402,7 +27696,7 @@
           sha256 = "1gm5nczq5lsxqkfb38ajffg65zwxkfqvqhk33bwnnd00rpa1ix6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hound";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hound";
           sha256 = "0qri6bddd3c4sqvaqvmqw6xg46vwlfi1by3gc9i3izpq4xl1cr1v";
           name = "hound";
         };
@@ -27423,7 +27717,7 @@
           sha256 = "0vygbdjy2dv7n50vrkcnqyswq48sgas0zzjfsac8x5g9vhxjkawj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/how-many-lines-in-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/how-many-lines-in-project";
           sha256 = "145zmfmsxcbmfh9s0mvxxgfh1d51q66396zc29k1c0hw94ffhkdd";
           name = "how-many-lines-in-project";
         };
@@ -27444,7 +27738,7 @@
           sha256 = "01sj9c8mxqaif8wh6zz9v2czjaq7vcdi66drldyjmifkln6rg2v8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/howdoi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/howdoi";
           sha256 = "12vgbypawxhhrnjp8dgh0wrcp7pvjccfaxw4yhq7msai7ik3h83b";
           name = "howdoi";
         };
@@ -27465,7 +27759,7 @@
           sha256 = "17x5w5kzam8cgaphyasnqzm2yhc0hwm38azvmin7ra4h912vlisd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ht";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ht";
           sha256 = "16vmxksannn2wyn8r44jbkdp19jvz1bg57ggbs1vn0yi7nkanwbd";
           name = "ht";
         };
@@ -27478,15 +27772,15 @@
     html-check-frag = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "html-check-frag";
-        version = "20160116.214";
+        version = "20160130.2335";
         src = fetchFromGitHub {
           owner = "TobiasZawada";
           repo = "html-check-frag";
-          rev = "cc8b099154d5bde23af88f61adb05a80c03d08a8";
-          sha256 = "1nvvd81xsadqfa60h86c61800cn7a1nhp6hw8cyc8dh0bsx1pxx5";
+          rev = "feb89765eafd69dfcf07afeebded8985dc456e7c";
+          sha256 = "10lbxf56gvy26grzrhhx2p710fzs0h866jd2zmmgkisvyb0vaiay";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/html-check-frag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/html-check-frag";
           sha256 = "0drancb9ryifiln44b40l6cal0c7nyp597a6q26288s3v909yk2a";
           name = "html-check-frag";
         };
@@ -27507,7 +27801,7 @@
           sha256 = "0k9ga0qi6h33akip2vrpclfp4zljnbw5ax40lxyxc1813hwkdrmh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/html-script-src";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/html-script-src";
           sha256 = "1pin1x6g68y75pa3vz2i9h5pmhjamh5rd5ladb1z3flcavsls64j";
           name = "html-script-src";
         };
@@ -27528,7 +27822,7 @@
           sha256 = "09n3zm9ivln8ng80fv5vwwzh9mj355ni685axda3m85xfxgai8gi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/html-to-markdown";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/html-to-markdown";
           sha256 = "1gjh9ndqsb3nfb7w5h7carjckkgy6qh63b4mg141j19dsyx9rrjv";
           name = "html-to-markdown";
         };
@@ -27547,7 +27841,7 @@
           sha256 = "8afaf87b30628afd8d376965247a6b2791129339ad7238c5529f4b173f908251";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/htmlize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/htmlize";
           sha256 = "15pym76iwqb1dqkbmkgc1yar450g2xinfl89fyss2ifyi4am1nxp";
           name = "htmlize";
         };
@@ -27557,22 +27851,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    http = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
+    http = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "http";
-        version = "20150716.959";
+        version = "20160126.2225";
         src = fetchFromGitHub {
           owner = "emacs-pe";
           repo = "http.el";
-          rev = "3984230ea8b413bc634fb72d097c7f3b8c92b988";
-          sha256 = "0k9ksbpcdx5asjcvnivm8hpkm55qjz348gb8ihx5q5448h89ksrz";
+          rev = "d563751d46e30ed5b5eda6d87ab2793b9b206c66";
+          sha256 = "1i0r677zwnl5xl64cqk47y0gfd87vw49nf6ry5v2imbc95ni56wc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/http";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/http";
           sha256 = "1176jhm8m7s1pzp0zv1sqawcgn4m5zvxghypmsrjyyb5p7m6dalm";
           name = "http";
         };
-        packageRequires = [ cl-lib emacs request ];
+        packageRequires = [ emacs request ];
         meta = {
           homepage = "http://melpa.org/#/http";
           license = lib.licenses.free;
@@ -27586,7 +27880,7 @@
           sha256 = "1wp2rwc1hgd5c3yr6b96yzzakd1qmy5d95mhc6q4f6lx279nx0my";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/http-post-simple";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/http-post-simple";
           sha256 = "1b2fh0hp5z3712ncgc5ns1f3sww84khkq7zb3k9xclsp1p12a4cf";
           name = "http-post-simple";
         };
@@ -27607,7 +27901,7 @@
           sha256 = "008iq5fhsw4qklw2l457a1cfqq8diadpnf1c1di5p07sc0za5562";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/http-twiddle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/http-twiddle";
           sha256 = "153qavpcwvk2g15w5a814xjsnsv54xksx4iz6yjffvvzq14a08ry";
           name = "http-twiddle";
         };
@@ -27628,7 +27922,7 @@
           sha256 = "02jz8qwxl69zhwvpmlqc15znr8x4f30paqszmm7xrrrz5x1c1rn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/httpcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/httpcode";
           sha256 = "05k1al1j119x6zf03p7jn2r9qql33859583nbf85k41bhicknpgh";
           name = "httpcode";
         };
@@ -27649,7 +27943,7 @@
           sha256 = "0wd4wmy99mx677x4sdbp57bxxll1fsnnf8hk97r85xdmmjsmrkld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/httprepl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/httprepl";
           sha256 = "0899qb1yfnsyf04hhvnk47qnq4d1f4vd5ghj43x4743wd2b9qawh";
           name = "httprepl";
         };
@@ -27670,7 +27964,7 @@
           sha256 = "1vy521ljn16a1lcmpj09mr9y0m15lfjhl6xk04sb7nisps3vljyl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hungry-delete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hungry-delete";
           sha256 = "0hcsm3yndkyfqzb77ibx7df6bjppc34x5yabi6nd389pdscp9rpz";
           name = "hungry-delete";
         };
@@ -27691,7 +27985,7 @@
           sha256 = "16z43mpj839bzafhyzpcbw6bmv4ckrf9ryslvg6z6q4g93k64q2m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hy-mode";
           sha256 = "1vxrqla3p82x7s3kn7x4h33vcdfms21srxgxzidr02k37f0vi82m";
           name = "hy-mode";
         };
@@ -27712,7 +28006,7 @@
           sha256 = "0d3kdpwzr1gs0q986pkj8b9av9knzbh1ax9ybhn0k66hi55hn7bc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hyai";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hyai";
           sha256 = "00ns7q5b11c5amwkq11fs4p5vrmdfmjljfrcxbwb39gc12yrhn7s";
           name = "hyai";
         };
@@ -27725,15 +28019,15 @@
     hydandata-light-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hydandata-light-theme";
-        version = "20160113.1617";
+        version = "20160122.1953";
         src = fetchFromGitHub {
           owner = "hydandata";
           repo = "hydandata-light-theme";
-          rev = "e78f4e106d22ac8ed269d3481eebdc1668ea492f";
-          sha256 = "1wd3fd9mqzg9420p2l7k2j433kb5yjin6hq0ajyy5q5w4a63s64l";
+          rev = "3b9bb5f213029a8331818b1d670194ef26d9505a";
+          sha256 = "11vgz64f8vs8vqp4scj9qvrfdshag7bs615ly9zvzzlk68jivdya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hydandata-light-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hydandata-light-theme";
           sha256 = "0jw43m91m10ifqg335y6d52r6ri77hcmxkird8wsyrpsnk3cfb60";
           name = "hydandata-light-theme";
         };
@@ -27754,7 +28048,7 @@
           sha256 = "14gxbza26ccah8jl0fm7ksvaag0mv3c348bgqjy88dqq2qlwcrav";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hyde";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hyde";
           sha256 = "18kjcxm7qmv9bfh4crw37zgax8khjqs9zkp4lrb490zlad2asbs3";
           name = "hyde";
         };
@@ -27767,15 +28061,15 @@
     hydra = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hydra";
-        version = "20151214.617";
+        version = "20160126.257";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "hydra";
-          rev = "7f022f7f1a7833618c1bf4d38a4854d2bae06199";
-          sha256 = "0dp1ablyih2m3q5224xnkwxqm8pgblkdfcwls81r0qsaav7ag3fj";
+          rev = "04cd3e4270ff5d0d51e783c86e87314054f1a018";
+          sha256 = "13ghz8mvnqn59m9alwcrxlml1k4cbw4a9wwwgf211ap4q618qjqs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hydra";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hydra";
           sha256 = "1c59l43p39ins3dn9690gm6llwm4b9p0pk78lip0dwlx736drdbw";
           name = "hydra";
         };
@@ -27796,7 +28090,7 @@
           sha256 = "17k41rah17l9kf7bvlm83x71nzz4aizgn7254cl5sb59mdhcm8pm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/i2b2-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/i2b2-mode";
           sha256 = "172qnprmfliic3rszzg3g7q015i3dchd23skrbdikg0kxj5c57lf";
           name = "i2b2-mode";
         };
@@ -27817,7 +28111,7 @@
           sha256 = "1gl21li9vqfjvls4ffjw8a4bicas2c7hmaa621k3hpllgpy6qdg5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iasm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iasm-mode";
           sha256 = "09xh41ayaha07fi5crk3c6pn17gwm3samsf6h71ldkywvz74kipv";
           name = "iasm-mode";
         };
@@ -27838,7 +28132,7 @@
           sha256 = "1s5qvlf310b0z7q9k1xhcf4qmyfqd37jpqd67ciahaxk7cp224rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ibuffer-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ibuffer-git";
           sha256 = "048888y07bzmi9x5i43fg6bgqbzdqi3nfjfnn6zr29jvlx366r5z";
           name = "ibuffer-git";
         };
@@ -27859,7 +28153,7 @@
           sha256 = "1zcnp61c9cp2kvns3v499hifk072rxm4rhw4pvdv2mm966vcxzvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ibuffer-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ibuffer-projectile";
           sha256 = "1qh4krggmsc6lx5mg60n8aakmi3f6ppl1gw094vfcsni96jl34fk";
           name = "ibuffer-projectile";
         };
@@ -27880,7 +28174,7 @@
           sha256 = "15lapyj7qkkw1i1g1aizappm7gxkfnxhvd4fq66lghkzb76clz2m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ibuffer-rcirc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ibuffer-rcirc";
           sha256 = "1y6pyc6g8j42hs103yynjsdkkxvcq0q4xsz4r93rqwsr3za3wcmc";
           name = "ibuffer-rcirc";
         };
@@ -27901,7 +28195,7 @@
           sha256 = "1mfrbr725p27p3s5nxh7xhm81pdr78ysz8l3kwrlp97bb6dmljmq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ibuffer-tramp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ibuffer-tramp";
           sha256 = "11a9b9g1jk2r3fldi012zka4jzy68kfn4991xp046qm2fbc7la32";
           name = "ibuffer-tramp";
         };
@@ -27922,7 +28216,7 @@
           sha256 = "0fwxhkx5rkyv3w5vs2swhmly9siahlww2ipsmk7v8xmvk4a63bhp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ibuffer-vc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ibuffer-vc";
           sha256 = "0bn5qyiq07cgzci10xl57ss5wsk7bfhi3hjq2v6yvpy9v704dvla";
           name = "ibuffer-vc";
         };
@@ -27934,13 +28228,13 @@
       }) {};
     icicles = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "icicles";
-        version = "20151231.1715";
+        version = "20160131.1203";
         src = fetchurl {
           url = "http://www.emacswiki.org/emacs/download/icicles.el";
           sha256 = "16fsxw7w0l4dxgdi71q2izcki9ykqbjxaffsjh4k0zl7nxyyvv6q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/icicles";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/icicles";
           sha256 = "15h2511gm38q14avsd86j5mnxhsjvcdmwbnhj66ashj5p5nxhr92";
           name = "icicles";
         };
@@ -27958,7 +28252,7 @@
           sha256 = "0z7v4pj0m6pwrjzyzz2xmwf6a53kmka9hxlzd1dxcpzx47pyvz3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/icomplete+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/icomplete+";
           sha256 = "0gxqkj4bjrxb046qisfz22wvanxx6bzl4hfv91rfwm78q3484slx";
           name = "icomplete-plus";
         };
@@ -27979,7 +28273,7 @@
           sha256 = "0bzbp0vgnzvd1m3lhbcrxmknpi0cjisff6jd49f1nvkdx3p2ks40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/id-manager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/id-manager";
           sha256 = "13g5fi06hvx0x2wn1d1d8rkfq5n6wbk9g5bhx2b5sar2yw0akmwm";
           name = "id-manager";
         };
@@ -27992,15 +28286,15 @@
     idea-darkula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "idea-darkula-theme";
-        version = "20160104.1557";
+        version = "20160121.1540";
         src = fetchFromGitHub {
           owner = "fourier";
           repo = "idea-darkula-theme";
-          rev = "37854cee8f8714d5d388681158df5771664e6043";
-          sha256 = "0yvrb5a0ajnbvdzzqhhmswm6irlr3xjimpddfyjgdkl5l7d7iln5";
+          rev = "45c077eaa32e5784cb15b66d3b40c76ef642b2d6";
+          sha256 = "08wr379dslh3sjg81p20vpqj218wgw0cf3lxn3n4cbzsy0hifh81";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/idea-darkula-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/idea-darkula-theme";
           sha256 = "0lanhwlhd7pbzjc047vd5sgsmi2bx66gr3inr8y57swgrfw3l8sk";
           name = "idea-darkula-theme";
         };
@@ -28021,7 +28315,7 @@
           sha256 = "047gzycr49cs8wlmm9j4ry7b7jxmfhmbayx6rbbxs49lba8dgwlk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/identica-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/identica-mode";
           sha256 = "1r69ylykjap305g23cry4wajiqhpgw08nw3b5d9i1y3mwx0j253q";
           name = "identica-mode";
         };
@@ -28042,7 +28336,7 @@
           sha256 = "0x4w1ksrw7dicl84zpf4d4scg672dyan9g95jkn6zvri0lr8xciv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/idle-highlight-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/idle-highlight-mode";
           sha256 = "1i5ky61bq0dpk71yasfpjhsrv29mmp9nly9f5xxin7gz3x0f36fc";
           name = "idle-highlight-mode";
         };
@@ -28063,7 +28357,7 @@
           sha256 = "0f8rxvc3dk2hi4x524l18fx73xrxy0qqwbybdma4ca67ck9n6xam";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/idle-require";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/idle-require";
           sha256 = "1lr330bqj4rfh2jgn3562sliani4yw5y4j2hr6cq9cfjjp18qgsj";
           name = "idle-require";
         };
@@ -28084,7 +28378,7 @@
           sha256 = "1bii7vj8pmmijcpvq3a1scky4ais7k6d7zympb3m9dmz355m9rpp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-at-point";
           sha256 = "0jpgq2iiwgqifwdhwhqv0cd3lp846pdqar6rxqgw9fvvb8bijqm0";
           name = "ido-at-point";
         };
@@ -28105,7 +28399,7 @@
           sha256 = "14nmldahr0pj2x4vkzpnpx0bsxafmiihgjylk5j5linqvy8q6wk6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-clever-match";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-clever-match";
           sha256 = "081i6cjvqyfpgj0nvzc94zrl2v3l6nv6mhfda4zf7c8qqbvx1m8m";
           name = "ido-clever-match";
         };
@@ -28126,7 +28420,7 @@
           sha256 = "1aih8n10lcrw0bdgvlrkxzhkpxpmphw07cvbp6zd27ia25037fzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-complete-space-or-hyphen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-complete-space-or-hyphen";
           sha256 = "1wk0cq5gjnprmpyvhh80ksz3fash42hckvmx8m95crbzjg9j0gbc";
           name = "ido-complete-space-or-hyphen";
         };
@@ -28147,7 +28441,7 @@
           sha256 = "0aqx69pvpz4bdhzg3awjpd7xn3h34pygip75dqjwpd6jp350g8r0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-completing-read+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-completing-read+";
           sha256 = "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh";
           name = "ido-completing-read-plus";
         };
@@ -28164,11 +28458,11 @@
         src = fetchFromGitHub {
           owner = "danil";
           repo = "ido-describe-bindings";
-          rev = "5b2e1c8d685b4d022c8f56f45053a9f2229960ef";
-          sha256 = "1pp8djlyvaly55jshwwzx06mgb78hhaqm0mxbjasc3bg2x3d4y9n";
+          rev = "1f5c78bf56f2cab137a323ec426e906f2215bf7f";
+          sha256 = "0055dda1la7yah33xsi19j4hcdmqp17ily2dvkipm4y6d3ww8yqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-describe-bindings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-describe-bindings";
           sha256 = "1lsa09h025vd908r9q571iq2ia0zdpnq04mlihb3crpp5v9n9ws2";
           name = "ido-describe-bindings";
         };
@@ -28189,7 +28483,7 @@
           sha256 = "1s93q47cadanynvm1y4y08s68yq0l8q8vfasdk7w39vrjsxxsj3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-exit-target";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-exit-target";
           sha256 = "17vmg47xwk6yjlbcsswirl8s2q565k291ajzjglnz7qg2fwx6spi";
           name = "ido-exit-target";
         };
@@ -28210,7 +28504,7 @@
           sha256 = "0ifdwd5vnjv2iyb5bnz8pij35lc0ymmyx8j8zhpkbgjigz8f05ip";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-gnus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-gnus";
           sha256 = "14ijb8q4s846984h102h72ij713v5bj3k2vfdvr94gw1f0iya2yg";
           name = "ido-gnus";
         };
@@ -28223,15 +28517,15 @@
     ido-grid-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-grid-mode";
-        version = "20151127.1135";
+        version = "20160122.539";
         src = fetchFromGitHub {
           owner = "larkery";
           repo = "ido-grid-mode.el";
-          rev = "34a7412c30840c1131464781dddfb1602355766b";
-          sha256 = "051rzjxk73h8apkmn4w39bl0pz1c9gna4w3lq7j3a6fiplb0jn23";
+          rev = "7cfca3988a6dc3ad18e28abe114218095ff2366f";
+          sha256 = "1ip8g0r0aimhc4a1f06m711zmbs0krxn8hmayk99gk5kkz12igkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-grid-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-grid-mode";
           sha256 = "1wl1yclcxmkbfnvp0il23csdf6gprzf7fkcknpivk784fhl19acr";
           name = "ido-grid-mode";
         };
@@ -28252,7 +28546,7 @@
           sha256 = "01p4az128k1jvd9i1gshgg87z6048cw9cnm57l8qdlw01c3h6dkx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-hacks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-hacks";
           sha256 = "05f9pdkqppnp7wafka2d2yj84gqchjd7vnrl5rcywy1l47gbxiw0";
           name = "ido-hacks";
         };
@@ -28273,7 +28567,7 @@
           sha256 = "0l69sr3g1n2x61j6sv6hnbiyk8a2qra6y2kh413qp0sfpx4fzchv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-load-library";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-load-library";
           sha256 = "13f83gqh39p3yjy7r7qc7kzgdcmqh4b5c07zl7rwzb8y9rz59lhj";
           name = "ido-load-library";
         };
@@ -28294,7 +28588,7 @@
           sha256 = "15iajhrgy989pn91ijcd1mq2015bkaacaplm79rmb0ggxhh8vq38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-migemo";
           sha256 = "02hbwchwx2bcwdxz7gz555699l7n9wisfikax1j6idn167n4wdpi";
           name = "ido-migemo";
         };
@@ -28315,7 +28609,7 @@
           sha256 = "0zlkq29wxd3a4vg0w6ds2jad5h1pja7ccd3l6ppl0kz1b1517qlr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-occasional";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-occasional";
           sha256 = "1vdh5i9qznzd9r148a6jw9v47swf7ykwyciqfzc3ismv5q909bl2";
           name = "ido-occasional";
         };
@@ -28332,11 +28626,11 @@
         src = fetchFromGitHub {
           owner = "danil";
           repo = "ido-occur";
-          rev = "247ee110dc085f9f5577aa02241c3ad66164b455";
-          sha256 = "1qvx1v5xrfv1id6lfn767b667m2hn4rsw2nmb61j1i81csdiqjds";
+          rev = "7d2e42bf239cacb90e6240b8014e6b20b24e89cf";
+          sha256 = "0j12li001yq08vzwh1b25qyq09llizrkgaay9k07g9pvfxlx6zb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-occur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-occur";
           sha256 = "058l2pklg12wkvyyshk8va6shphpbc508fv9a8x25pw857a28pji";
           name = "ido-occur";
         };
@@ -28357,7 +28651,7 @@
           sha256 = "0qvf3h2ljlbf3z36dhywzza62mfi6mqbrfc0sqfsbyia9bn1df4f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-select-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-select-window";
           sha256 = "03xqfpnagy2sk67yq7n7s6ma3im37d558zzx8sdzd9pbfxy9ij23";
           name = "ido-select-window";
         };
@@ -28378,7 +28672,7 @@
           sha256 = "149cznbybwj0gkjyvpnh4kn258kxw449m7cn95n9jbh1r45vljvy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-skk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-skk";
           sha256 = "1fyzjkw9xp126bzfv1254bvyakh323iw3wdzrkd9gb4ir39k5jzw";
           name = "ido-skk";
         };
@@ -28399,7 +28693,7 @@
           sha256 = "0w3cr2yf8644i0g8w6r147vi9wanibn41sg7dzws51yb9q0y92vd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-sort-mtime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-sort-mtime";
           sha256 = "1dkny9y3x49dv1vjwz78x2qhb6kdq3fa8qh1xkm30jyapvgiwdg2";
           name = "ido-sort-mtime";
         };
@@ -28420,7 +28714,7 @@
           sha256 = "14py5amh66jzhqyqjz5pxq0g19vzlmqnrr5wij1ix64xwfr3xdy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-springboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-springboard";
           sha256 = "04jqnag8jiyfbwvc3vd9ikrsmf6cajld7dz2gz9y0zkj1k4gs7zv";
           name = "ido-springboard";
         };
@@ -28441,7 +28735,7 @@
           sha256 = "0aqx69pvpz4bdhzg3awjpd7xn3h34pygip75dqjwpd6jp350g8r0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-ubiquitous";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-ubiquitous";
           sha256 = "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp";
           name = "ido-ubiquitous";
         };
@@ -28462,7 +28756,7 @@
           sha256 = "1vl87phswkciijq0j07lqlgmha5dmff8yd4j4jn7cfrkrdjp6jbx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-vertical-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-vertical-mode";
           sha256 = "1vg5s6nd6v2g8ychz1q9cdqvsdw6vag7d9w68sn7blpmlr0nqhfm";
           name = "ido-vertical-mode";
         };
@@ -28483,7 +28777,7 @@
           sha256 = "0zqjmi1pbvpby84g1nsrmwcv7w5k0nl3hmkqj0fvhdsmayxqc6j8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-yes-or-no";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-yes-or-no";
           sha256 = "0glag4yb9xyf1lxxbdhph2nq6s1vg44i6f2z1ii8bkxpambz2ana";
           name = "ido-yes-or-no";
         };
@@ -28504,7 +28798,7 @@
           sha256 = "1vx2g1xgxpcabr49mkl6ggzrpa3k2zhm479j6262vb64swzx33jw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/idomenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/idomenu";
           sha256 = "0mg601ak9mhp2fg5n13npcfzphgyms4vkqd18ldmv098z2z1412h";
           name = "idomenu";
         };
@@ -28525,7 +28819,7 @@
           sha256 = "16gk7ry4yiaxk9dp6s2m4g79klw344yvr86d7hr0qdjkkf229m56";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/idris-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/idris-mode";
           sha256 = "0hiiizz976hz3z3ciwg1gs9y10qhxbs8givhz89kvyn4s4861a1s";
           name = "idris-mode";
         };
@@ -28546,7 +28840,7 @@
           sha256 = "1k7h1795kaczmhd21hzqgns7blqc6zjh2xg4w3rj986ll8lb9fpr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ids-edit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ids-edit";
           sha256 = "0jzmcynr6lvsr36nblqzrjwxawyqcdz972zsv4rqkihdydpqfz7m";
           name = "ids-edit";
         };
@@ -28567,7 +28861,7 @@
           sha256 = "1n2yz6jzbminrviadhd3h42fwvfrdy0v2nw7sk5plkzc8zrs3x25";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iedit";
           sha256 = "02gjshvkcvyr58yf6vlg3s2pzls5sd54xpxggdmqajfg8xmpkq04";
           name = "iedit";
         };
@@ -28588,7 +28882,7 @@
           sha256 = "0b86x675g95yrlc0alffx0z9fmficlwv3gpy5cy86z1xvvyh3nzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ietf-docs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ietf-docs";
           sha256 = "0wnk36z9g7lksmynd04hb2m6rx45wpxnxj1lhrlpjnzsrknhf4k3";
           name = "ietf-docs";
         };
@@ -28609,7 +28903,7 @@
           sha256 = "18rlyjsn9w0zbs0c002s84qzark3rrcmjn9vq4nap7i6zpaq8hki";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iflipb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iflipb";
           sha256 = "1nfrrxgi9nlhn477z8ay7jxycpcghhhmmg9dagdhrlrr20fx697d";
           name = "iflipb";
         };
@@ -28630,7 +28924,7 @@
           sha256 = "161algqrrjbc1ja08416q5wzz34rrg6shr2sim7vba0j3svyggnf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ignoramus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ignoramus";
           sha256 = "1czqdmlrds1l5afi8ldg7nrxcwav86538z2w1npad3dz8xk67da9";
           name = "ignoramus";
         };
@@ -28648,7 +28942,7 @@
           sha256 = "0qiv69v7ig38iizif7zg8aljdmpa1jk8bsfa0iyhqqqrkvsmhc29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/igrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/igrep";
           sha256 = "1vyhrziy29q6w8w9vvanb7d29r1n7nfkznbcd62il991n48d08i3";
           name = "igrep";
         };
@@ -28667,7 +28961,7 @@
           sha256 = "cefc95ead9e5d425d3763f8d63afa10dea416493cafd7144f4d3cdeee0d0fa86";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/igv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/igv";
           sha256 = "01igm3cb0lncmcyy72mjf93byh42k2hvscqhg8r7iljbxm58460z";
           name = "igv";
         };
@@ -28680,15 +28974,15 @@
     image-archive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "image-archive";
-        version = "20150219.18";
+        version = "20150620.2032";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-image-archive";
-          rev = "ff33f64d09432a8f5bf1714d4cf750c01626fe98";
-          sha256 = "0hacg0549vpgx7yyyc748i44zw5y825w1v7nb440wx7sdxp855nb";
+          rev = "8d29535bd832329ffeeac780aae7aa8919af1175";
+          sha256 = "068z3ygq9p139ikm04xqhhqhc994an5isba5c7kpqs009y09xw3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/image-archive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/image-archive";
           sha256 = "0x0lv5dr1gc9bnr3dn26bc9s1ccq2rp8c4a1licbi929f0jyxxfp";
           name = "image-archive";
         };
@@ -28709,7 +29003,7 @@
           sha256 = "1n2ya9s0ld257a8iryjd0dz0z2zs1xhzfiwsdkq4l4azwxl54m29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/image-dired+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/image-dired+";
           sha256 = "0hhwqfn490n7p12n7ij4xbjh15gfvicmn21fvwbnrmfqc343pcdy";
           name = "image-dired-plus";
         };
@@ -28730,7 +29024,7 @@
           sha256 = "0v66wk9nh0raih4jhrzmmyi5lbysjnmbv791vm2230ffi2hmwxnd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/image+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/image+";
           sha256 = "1a9dxswnqn6cvx28180kclpjc0vc6fimzp7n91gpdwnmy123x6hg";
           name = "image-plus";
         };
@@ -28751,7 +29045,7 @@
           sha256 = "0f3xdqhq9nprvl8bnmgrx20h08ddkfak0is29bsqwckkfgn7pmqp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imakado";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imakado";
           sha256 = "18mj0vpv3dybfpa8hl9jwlagsivbhgqgz8lwb8cswsq9hwv3jgd3";
           name = "imakado";
         };
@@ -28764,15 +29058,15 @@
     imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "imenu-anywhere";
-        version = "20151030.1327";
+        version = "20160131.412";
         src = fetchFromGitHub {
           owner = "vitoshka";
           repo = "imenu-anywhere";
-          rev = "b486c1e80c667504b243a84351cc8751710248e9";
-          sha256 = "1mi45vb3f2ka9xgz5gbgq77nirl4dnrjxkar3d5m3xvax0bicv6i";
+          rev = "15e080254b4a55e5613493583c9624feb3ef9b5d";
+          sha256 = "15vh09d91l6r8zlyps1mg7i0pygdzqi8w01grk1ka25ak7378c2v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imenu-anywhere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imenu-anywhere";
           sha256 = "0p93g7ay9n4nhf1qk24mbax0w9sr06xd2kjmrz00gbg75sr9r2s8";
           name = "imenu-anywhere";
         };
@@ -28785,15 +29079,15 @@
     imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "imenu-list";
-        version = "20150911.446";
+        version = "20160203.807";
         src = fetchFromGitHub {
           owner = "bmag";
           repo = "imenu-list";
-          rev = "0c725825ad13fca6b1eea2d28c42ffb172fa6de9";
-          sha256 = "0hlrhnv0n9i1jl20k6hly4py9d98vpqdb9wgzx8573srxqpv541k";
+          rev = "ee4f38dc9d590808d627789102afe4b12c20f5e6";
+          sha256 = "0ay008mivxyn23bncnc8qbs91w26i0ym7c57nd5z16kwg1gnh4a7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imenu-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imenu-list";
           sha256 = "092fsn7hnbfabcyakbqyk20pk62sr8xrs45aimkv1l91681np98s";
           name = "imenu-list";
         };
@@ -28811,7 +29105,7 @@
           sha256 = "00w88d37mg2hdrzpw5cxrgqz5jbf7rylmir95hs8j1cm8fk787bb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imenu+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imenu+";
           sha256 = "1v2h3xs5pnv7z5qphkn2y5pa1p8pivrknkw7xihm5yr4a4dqjv5d";
           name = "imenu-plus";
         };
@@ -28832,7 +29126,7 @@
           sha256 = "0wi346m05b18i14xxih4qvwdrfcgv30gdvxjjcn6vd7gr0wdk2ns";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imenus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imenus";
           sha256 = "1q0j6r2n5vjlbgchkz9zdglmmbpd8agawzcg61knqrgzpc4lk82r";
           name = "imenus";
         };
@@ -28853,7 +29147,7 @@
           sha256 = "1q53r3f3x0hpzryxd1v1w3qgs54p384q0azi7xj2gppi1q49sa42";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imgix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imgix";
           sha256 = "0dh7qsz5c9mflldcw60vc8mrxrw76n2ydd7blv6jfmsnr19ila4q";
           name = "imgix";
         };
@@ -28874,7 +29168,7 @@
           sha256 = "0nzgfj083im8lc62ifgsh1pmbw0j9wivimjgih7k6ny3jgw834rs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imgur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imgur";
           sha256 = "0hr2zz7nq65jig2036g5sa8q2lhb42jv40ijikcz8s4f5v3y14i7";
           name = "imgur";
         };
@@ -28895,7 +29189,7 @@
           sha256 = "0rbamm9qvipgswxng8g1d7rbdbcj7sgwrccg7imcfapwwq7xhj4h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/immutant-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/immutant-server";
           sha256 = "15vcxag1ni41ja4b3q0444sq5ysrisis59la7li6h3617wy8r02i";
           name = "immutant-server";
         };
@@ -28916,7 +29210,7 @@
           sha256 = "0vr4i3ayp1n8zg3v9rfv81qnr0vrdbkzphwd5kyadjgy4sbfjykj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/impatient-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/impatient-mode";
           sha256 = "05vp04zh5w0ss959galdrnridv268dzqymqzqfpkfjbg8kryzfxg";
           name = "impatient-mode";
         };
@@ -28933,11 +29227,11 @@
         src = fetchFromGitHub {
           owner = "trotzig";
           repo = "import-js";
-          rev = "e56623506bde5767161d048b63b897a22fd12d41";
-          sha256 = "0psa9jg0m7dkq2v4ybsbqhpbzvq6zvyc59f3rhycqwfpw2an4n64";
+          rev = "00d5178c247fabe1574a5239f2b134942cfadbd6";
+          sha256 = "1d79vvrxi0mxgr6wm3cjbqkgryh74jcjc1fkxpln8wyhjcddphzf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/import-js";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/import-js";
           sha256 = "1grvzy378qj14wlbmhb3j7fx2zkl9wp65b5g0brjimav08nz7bls";
           name = "import-js";
         };
@@ -28958,7 +29252,7 @@
           sha256 = "0ycsdwwfb27g85aby4jix1aj41a4vq6bf541iwla0xh3wsyxb01w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/import-popwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/import-popwin";
           sha256 = "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy";
           name = "import-popwin";
         };
@@ -28979,7 +29273,7 @@
           sha256 = "1p54w9dwkc76nvc4m0q9a0lh4bdxp4ad1wzscadayqy8qbrylf97";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/indent-guide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/indent-guide";
           sha256 = "029fj9rr9vfmkysi6lzpwra92j6ppw675qpj3sinfq7fqqlicvp7";
           name = "indent-guide";
         };
@@ -29000,7 +29294,7 @@
           sha256 = "1zsw68zzvjjh93cldc0w83k67hzcgi226vz3d0nzqc9sczqk8civ";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/indicators";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/indicators";
           sha256 = "1rhmz8sfi2gnv72sbw6kgyzidk43mnp05wnscw9vjvz9v0vwirss";
           name = "indicators";
         };
@@ -29021,7 +29315,7 @@
           sha256 = "0kv0aj444i2rzksvcfz8sw0yyig3ca3m05agnhw9jzr01y05yl1n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/indy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/indy";
           sha256 = "118n3n07h1vx576fdv6v5a94aa004q0gmy9hlsnrswpxa30ahnw7";
           name = "indy";
         };
@@ -29034,15 +29328,15 @@
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "20160117.1257";
+        version = "20160201.1147";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "aa93684c0d88cb72b106ae1cea000f501044d564";
-          sha256 = "18fsd02fw74dgyc7dv6rn51nczwhpr3784hpqp64sz4w5fjvn8d6";
+          rev = "a246bf3f6d286f7bcbc6dbc091e7c67876a3e8e8";
+          sha256 = "18sg9lq6wxjk9jiyid9l67b5y4hwrljz1gh3w59rdy59f2fcmnav";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inf-clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inf-clojure";
           sha256 = "0n8w0vx1dnbfz88j45a57z9bsmkxr2zyh6ld72ady8asanf17zhl";
           name = "inf-clojure";
         };
@@ -29063,7 +29357,7 @@
           sha256 = "14kf3zvms1w8cbixhpgw3m2xxc2r87i57gmx00jwh89282i6kgsi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inf-mongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inf-mongo";
           sha256 = "09hf3jmacsk4hl0rxk35cza8vjl0xfmv19dagb8h8fli97fb65hh";
           name = "inf-mongo";
         };
@@ -29084,7 +29378,7 @@
           sha256 = "1z5ns94xgj2dkv2sc2ckax6bzwdxsm19pkvni24ys2w7d5nhajzr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inf-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inf-php";
           sha256 = "011sc6f0ka7mmik8z0df8qk24mf6ygq22jy781f2ikhjh94gy83d";
           name = "inf-php";
         };
@@ -29105,7 +29399,7 @@
           sha256 = "0rg7md4b8chqfh565l9dhsjyiiqrbhm2xcaf88h2zian2rp0p1wh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inf-ruby";
           sha256 = "02f01vwzr6j9iqcdns4l579bhia99sw8hwdqfwqjs9gk3xampfpp";
           name = "inf-ruby";
         };
@@ -29126,7 +29420,7 @@
           sha256 = "0061hcmj63g13bvacwkmcb5iggwnk27dvb04fz4hihqis6jg01c5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inflections";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inflections";
           sha256 = "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70";
           name = "inflections";
         };
@@ -29144,7 +29438,7 @@
           sha256 = "068y1p44ynimxfrqgrrhrj4gldf661dr0kbc9p7dqm1mw928hxmm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/info+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/info+";
           sha256 = "0flpmi8dsaalg14xd86xcr087j51899sm8ghsa150ag4g4acfggr";
           name = "info-plus";
         };
@@ -29164,7 +29458,7 @@
           sha256 = "3c00805529518edba788671fed0c3e56810d1dbec2a0dbd3cb42f42991326ca6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inform7-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inform7-mode";
           sha256 = "1kbyl69vwhp1wdivr3ijmj7mghdnjaw7adk8az7bwyzjvpq73171";
           name = "inform7-mode";
         };
@@ -29185,7 +29479,7 @@
           sha256 = "1zykh80k2sy0as1rn7qaa2hyvkagcvzzmxik4jpb0apw0ha1bf6s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/init-loader";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/init-loader";
           sha256 = "0rq7759abp0ml0l8dycvdl0j5wsxw9z5y9pyx68973a4ssbx2i0r";
           name = "init-loader";
         };
@@ -29206,7 +29500,7 @@
           sha256 = "0xk7lyhd9pgahbscqwa2qkh2vgnbs5yz78am3zh930k4ig9lbmjh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/init-open-recentf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/init-open-recentf";
           sha256 = "0xlmfxhxb2car8vfx7krxmxb3d56x0r3zzkj8ds7yqvr65z85x2r";
           name = "init-open-recentf";
         };
@@ -29227,7 +29521,7 @@
           sha256 = "1qvkxpxdv0n9qlzigvi25iw485824pgbpb10lwhh8bs2074dvrgq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/initsplit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/initsplit";
           sha256 = "0n9dk3x62vgxfn39jkmdg8wxsik0xqkprifgvqzyvn8xcx1blyyq";
           name = "initsplit";
         };
@@ -29248,7 +29542,7 @@
           sha256 = "063v3a783si5fi8jrnysss60qma1c3whvyb48i10qbrrrx750cmv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inkpot-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inkpot-theme";
           sha256 = "0w4q74w769n88zb2q7x326cxji42278lf95wnpslgjybnaxycgw7";
           name = "inkpot-theme";
         };
@@ -29269,7 +29563,7 @@
           sha256 = "0jipds844432a8m4d5gxbbkk2h1rsq9fg748g6bxy2q066kyzfz6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inline-crypt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inline-crypt";
           sha256 = "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n";
           name = "inline-crypt";
         };
@@ -29290,7 +29584,7 @@
           sha256 = "15nasjknmzy57ilj1gaz3w5sj8b3ijcpgwcd6w2r9xhgcl86m40q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inlineR";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inlineR";
           sha256 = "1fflq2gkpfn3jkv4a6yywzmxsq6qszfid1ri85ass1ppw6scdvzw";
           name = "inlineR";
         };
@@ -29311,7 +29605,7 @@
           sha256 = "1np3ih2bz9831p97rx5bssq78grjxj7f9241z372l6ggimrqhkbx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/insert-shebang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/insert-shebang";
           sha256 = "0z88l1q925v9lwzr6nas9qjy0f57qxilg6smgpx9wj6lll3f7p5v";
           name = "insert-shebang";
         };
@@ -29332,7 +29626,7 @@
           sha256 = "112s3c0ii8zjc6vlj2im2qd2pl3hb95pq4zibm86gjpw428wd8iy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/insfactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/insfactor";
           sha256 = "0c6q1d864qc78sqk9iadjpd01xc7myipgnf89pqa2z75yprndvyn";
           name = "insfactor";
         };
@@ -29352,7 +29646,7 @@
           sha256 = "0krscid3yz2b7kv75gd9fs92zgfl7pnl77dbp5gycv5rmw5mivp8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/instapaper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/instapaper";
           sha256 = "1yibdpj3lx6vr33s75s1y415lxqljrk7pqc901f8nfa01kca7axn";
           name = "instapaper";
         };
@@ -29373,7 +29667,7 @@
           sha256 = "0jdm4xjzpl5dr5s8n2hhd5md6hfl6m6v10nwd1n54pb7bv98aqsl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/interaction-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/interaction-log";
           sha256 = "1r9qbvgssc2zdwgwmmwv5kapvmg1y3px7268gkiakkfanw3kqk6j";
           name = "interaction-log";
         };
@@ -29394,7 +29688,7 @@
           sha256 = "13bsszx4rsq3awg6zgzfdwgflkldw38nihkc9nldfixzvw1gdqqv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/interleave";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/interleave";
           sha256 = "18b3fpxn07y5abkcnaw9is9ihdhik7xjdj6kzl1pz958lk9f4hfy";
           name = "interleave";
         };
@@ -29415,7 +29709,7 @@
           sha256 = "1zv6m24ryls9hvla3hf8wzp6r7fzbxa1lzr1mb0wz0s292l38wjz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/interval-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/interval-list";
           sha256 = "0926z3lxkmpxalpq7hj355cjzbgpdiw7z4s8xdrpa1pi818d35zf";
           name = "interval-list";
         };
@@ -29436,7 +29730,7 @@
           sha256 = "0fqnn9xhrc9hkaiziafjgg288l6m05416z9kz8l5845fnqsb7pb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/interval-tree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/interval-tree";
           sha256 = "13zynac3h50x68f1ja72kqdrapjks2zmgqd4g7qwscq92mmh60i9";
           name = "interval-tree";
         };
@@ -29457,7 +29751,7 @@
           sha256 = "10xpxmbzhmi0lmby2rpmxrbr3qf1vlbif2inmfsvkj85wyh8a7rp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/io-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/io-mode";
           sha256 = "1fpiml7lvbl4s2xw4wk2y10iifvfza24kd9j8qvi1bgd85qkx42q";
           name = "io-mode";
         };
@@ -29478,7 +29772,7 @@
           sha256 = "1ard88kc13c57y9zdkyr012w8rdrwahz8a3fb5v6hwqymg16m20s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/io-mode-inf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/io-mode-inf";
           sha256 = "0hwhvf1qwkmzzlzdda1flw6p1jjh9rzxsfwm2sc4795ac2xm6dhc";
           name = "io-mode-inf";
         };
@@ -29499,7 +29793,7 @@
           sha256 = "1rz5wf19lg1lnm0h73ynhb0vl3c99k7vpipay2f8jls24pv60bra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ioccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ioccur";
           sha256 = "1a9iy6x4lkm4wgkcb0pv86c2kvpq8ymrc4ssp109r67kwqw7lrr6";
           name = "ioccur";
         };
@@ -29520,7 +29814,7 @@
           sha256 = "14zfxa8fc7h4rkz1hyplwf4q2lga3l5dd7a2xq5kk0kvf2fs4mk3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iodine-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iodine-theme";
           sha256 = "05mnq0bgcla0pxsgywpvcdgd4sk2xr7bjlp87l0dx8j121vqripj";
           name = "iodine-theme";
         };
@@ -29541,7 +29835,7 @@
           sha256 = "043dnij48zdyg081sa7y64lm35z7zvrv8gcymv3l3a98r1yhy3v6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iplayer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iplayer";
           sha256 = "0wnxvdlnvlmspqsaqx0ldw8j03qjckkqzvx3cbpc2yfs55pm3p7r";
           name = "iplayer";
         };
@@ -29562,7 +29856,7 @@
           sha256 = "0skyd9c7pz68v17aj3h47ralszbmc4gqg552q8jpimcjd1lacc7l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ipretty";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ipretty";
           sha256 = "1zysip6cb8s4nzsxiwk052gq6higz2xnd376r9wxmgj7w8him2c4";
           name = "ipretty";
         };
@@ -29583,7 +29877,7 @@
           sha256 = "1cy9xwhswj9vahg8zr16r2crm2mm3vczqs73gc580iidasb1q1i2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ir-black-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ir-black-theme";
           sha256 = "1qpq9zbv63ywzk5mlr8x53g3rn37k0mdv6x1l1hcd90gka7vga9v";
           name = "ir-black-theme";
         };
@@ -29604,7 +29898,7 @@
           sha256 = "1ch610b3d0x3nxglp749305syliivamc108rgv9if4ihb67gp8b5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iregister";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iregister";
           sha256 = "0iq1nlj5czi4nblrszfv3grkl1fni7blh8bhcfccidms8v9r3mdm";
           name = "iregister";
         };
@@ -29622,7 +29916,7 @@
           sha256 = "197ybqwbj8qjh2p9pkf5mvqnrkpcgmv8c5s2gvl6msyrabk0mnca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/irfc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/irfc";
           sha256 = "0186l6zk5l427vjvmjvi0xhwk8a4fjhsvw9kd0yw88q3ggpdl25i";
           name = "irfc";
         };
@@ -29635,15 +29929,15 @@
     irony = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "irony";
-        version = "20160106.1423";
+        version = "20160203.1407";
         src = fetchFromGitHub {
           owner = "Sarcasm";
           repo = "irony-mode";
-          rev = "34a3f19c79c65ef52b14699faf9b00dac2d0d4e8";
-          sha256 = "1s6xvn5zmp26rmm57cpmhqrv331v2nrj8f60v065qabqpbsdpyl3";
+          rev = "7ff87b256650b553dcb0fdd3708d7e3b3531e3c1";
+          sha256 = "11mwl22i4r9an992xprzyi24rc3ci3l13s461yjavkgl3nbnlf7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/irony";
           sha256 = "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a";
           name = "irony";
         };
@@ -29664,7 +29958,7 @@
           sha256 = "01fjpfixfcca01a5fnnpd2wga4j30p0kwhbai25prvib4qcp1kqn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/irony-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/irony-eldoc";
           sha256 = "03m0h13jd37vfvn4mavaq3vbzx4x0lklbs0mbc29zaz8pwqlcwz6";
           name = "irony-eldoc";
         };
@@ -29685,7 +29979,7 @@
           sha256 = "17d0816awadvsw1qc7r0p6ira75jmgxaj9hsk9ypayxsaf6ynyrb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/isearch-dabbrev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/isearch-dabbrev";
           sha256 = "1hl7zl5vjcsk3z452874g4nfcnmna8m2242dc9cgpl5jddzwqa7x";
           name = "isearch-dabbrev";
         };
@@ -29697,13 +29991,13 @@
       }) {};
     isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "isearch-plus";
-        version = "20160118.1030";
+        version = "20160128.1005";
         src = fetchurl {
           url = "http://www.emacswiki.org/emacs/download/isearch+.el";
-          sha256 = "176krgrrjvj6r6iahr53ncxm2hrc4nmkyz43lc2rbnpivih4z9i6";
+          sha256 = "1l269vc92jxrw3snhjykxb28xdg672cj43q35lk61yg4fl2ny9bc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/isearch+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/isearch+";
           sha256 = "1rzlsf08nmc3p3vhpwbiy8cgnnl2c10xrnsr2rlpv0g2kxkrd69r";
           name = "isearch-plus";
         };
@@ -29721,7 +30015,7 @@
           sha256 = "1i1ypganr2ivwgi0vgjihgk1s4yglwj8nbqnqjiiwdywf8g5hcmr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/isearch-prop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/isearch-prop";
           sha256 = "1z9y88b23m4ffil8p3wcq61q1fiyqjxphyd3wacs5fnc53mdzad9";
           name = "isearch-prop";
         };
@@ -29742,7 +30036,7 @@
           sha256 = "09z49850c32x0rchxg203cxg504xi2b6cjgnd0i4axcs5fmq7gv9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/isearch-symbol-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/isearch-symbol-at-point";
           sha256 = "0j5fr7qdvpd5b096h5a83fz8sh9wybdnsgix6v94gv8lkzdsqkr8";
           name = "isearch-symbol-at-point";
         };
@@ -29763,7 +30057,7 @@
           sha256 = "022j39r2vvppnh3p5rp9i4cgc3lg24ksjcmcjmbmna1vf624izn0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/isend-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/isend-mode";
           sha256 = "0sk80a08ny9vqw94klqfgii297qm633000wlcldha76ip8viikdv";
           name = "isend-mode";
         };
@@ -29784,7 +30078,7 @@
           sha256 = "09hx28lmldm7z3x22a0qx34id09fdp3z61pdr61flgny213q1ach";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/isgd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/isgd";
           sha256 = "0yc9mkjzj3w64f48flnjvd193mk9gndrrqbxz3cvmvq3vgahhzyi";
           name = "isgd";
         };
@@ -29805,7 +30099,7 @@
           sha256 = "0992lzgar0kz9i1sk5vz17q9qzfgl8fkyxa1q0hmhgnpjf503cnj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iss-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iss-mode";
           sha256 = "1my4vi1x07hg0dva97i685lx6m6fcbfk16j1zy93zriyd7z5plkc";
           name = "iss-mode";
         };
@@ -29826,7 +30120,7 @@
           sha256 = "1az986mk8j8hyvr1mi9hirixwcd73jcqkjsw4xy34vjbwxi122r9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/itail";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/itail";
           sha256 = "0mcyly88a3c15hl3wll56agpdsyvd26r501h0v64lasfr4k634m7";
           name = "itail";
         };
@@ -29847,7 +30141,7 @@
           sha256 = "08gagq74702x65dy75n2f53fsh806nppnidim9z6ycp8qw1ibyfp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iterator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iterator";
           sha256 = "17q10fw6y0icsv6vv9n968bwmbjlihrpkkyw62d1kfxhs9yw659z";
           name = "iterator";
         };
@@ -29868,7 +30162,7 @@
           sha256 = "12nqpzcmz724wpk8p16lc3z26rxma3wp6pf6dvrsqagnlixrs9si";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ivariants";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ivariants";
           sha256 = "00fgcm62g4fw4306lw9ld2k7w0c358fcbkxn969k5p009g7pk5bw";
           name = "ivariants";
         };
@@ -29889,7 +30183,7 @@
           sha256 = "1926pyfsbr6j7cn3diq8ibs0db94rgsf0aifvbqrqp4grs85pkva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ivs-edit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ivs-edit";
           sha256 = "0gzhvzrfk17j2vwlg82f5ifk4dcfc1yv7barcij38ckran8cqmb2";
           name = "ivs-edit";
         };
@@ -29910,7 +30204,7 @@
           sha256 = "069alh9vs6is3hvbwxbwr9g8qq9md5c92wg5bfswi99yciqdvc4i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ix";
           sha256 = "1fl76dk8vgw3mrh5iz99lrsllwya6ij9d1lj3szcrs4qnj0b5ql3";
           name = "ix";
         };
@@ -29928,7 +30222,7 @@
           sha256 = "19l9d5gp1xj40iyy35r8hh7v6bjnzjx7pb8dvwrmndzg0rlsp7mi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iy-go-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iy-go-to-char";
           sha256 = "055qj2pc32l824vyjl2w2j8c3rpd9g4x0sazi8svqf923lgcs5s8";
           name = "iy-go-to-char";
         };
@@ -29949,7 +30243,7 @@
           sha256 = "07kbicf760nw4qlb2lkf1ns8yzqy0r5jqqwqjbsnqxx4sm52hml9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/j-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/j-mode";
           sha256 = "0f9lsr9hjhdvmzx565ivlncfzb4iq4rjjn6a41053cjy50bl066i";
           name = "j-mode";
         };
@@ -29962,14 +30256,14 @@
     jabber = callPackage ({ fetchgit, fetchurl, fsm, lib, melpaBuild }:
     melpaBuild {
         pname = "jabber";
-        version = "20151025.1804";
+        version = "20160124.752";
         src = fetchgit {
           url = "git://git.code.sf.net/p/emacs-jabber/git";
-          rev = "d5bfa1c62e6474a997e73a836524fdd322c0af44";
-          sha256 = "1a0f7c2154f863dbefc732a2057d0f7416cb4cd5764bdfa01cbf9e221a3abcb3";
+          rev = "98dc8e429ba6f79065f1c9fc3878d92314d4b510";
+          sha256 = "994d5c2d917a2874c660ec30827d041ee1f1be55b4d8130cb7a780d60c90158d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jabber";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jabber";
           sha256 = "1g5pc80n3cd5pzs3hmpbnmxbldwakd72pdn3vvb0h26j9v073pa8";
           name = "jabber";
         };
@@ -29990,7 +30284,7 @@
           sha256 = "0yv86nadp6dfzl05vhk8c1kahg2pcrhfmd3mnfjrngp7ksac5lyf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jabber-otr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jabber-otr";
           sha256 = "114z5bwhkza03yvfa4nmicaih2jdq83lh6micxjimpddsc8fjgi0";
           name = "jabber-otr";
         };
@@ -30010,7 +30304,7 @@
           sha256 = "7036a0eddf25a2274a6fd1584ff497d2b8078869fa6cc9d61504e6540ff863a8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jack-connect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jack-connect";
           sha256 = "1ssl126wihaf8m2f6ms0l5ai6pz5wn348a09k6l0h3jfww032g1q";
           name = "jack-connect";
         };
@@ -30031,7 +30325,7 @@
           sha256 = "1q6wpjb7vhsy92li6fag34pwyil4zvcchbvfjml612aaykiys506";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jade-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jade-mode";
           sha256 = "156j0d9wx6hrhph0nsjsi1jha4h65rcbrbff1j2yr8vdsszjrs94";
           name = "jade-mode";
         };
@@ -30052,7 +30346,7 @@
           sha256 = "0x0vz7m9kn7b2aiqvrdqx8qh84ynbpzy2asz2b18l47bcwa7r5bh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jammer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jammer";
           sha256 = "01c4bii7gswhp6z9dgx4bhvsywiwbbdv7mg1zj6vp1530l74zx6z";
           name = "jammer";
         };
@@ -30073,7 +30367,7 @@
           sha256 = "1mwm9wpnxqq3nw7fl0jf40a92ha51yd95vvr58zllhbxdpy3q9pv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/japanese-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/japanese-holidays";
           sha256 = "0pxpkikkn2ys0kgf3lbrdxv8iym50h5ik2xzza0qk7cw1v93jza9";
           name = "japanese-holidays";
         };
@@ -30083,22 +30377,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    japanlaw = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    japanlaw = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "japanlaw";
-        version = "20150621.2341";
+        version = "20160129.220";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "japanlaw.el";
-          rev = "d90b204b018893d5d75286c92948c0bddf94cce2";
-          sha256 = "08gkxxaw789g1r0dql11skz6i8bdrrz4wp87fzs9f5rgx99xxr6h";
+          rev = "c160e195cda0e02a709a2d39c62bc2a1ed39a09a";
+          sha256 = "1lrsm282lhp7pf0gwr3aad2228lvpqnqs1qdv2xk0zljqnqc0bhx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/japanlaw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/japanlaw";
           sha256 = "1pxss1mjk5660k80r1xqgslnbrsr6r4apgp9abjwjfxpg4f6d0sa";
           name = "japanlaw";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "http://melpa.org/#/japanlaw";
           license = lib.licenses.free;
@@ -30115,7 +30409,7 @@
           sha256 = "0xmv7gw5xms6nhjcl51cw33yvjgw0c6bpnlyca3195x7g34sg1zj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jape-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jape-mode";
           sha256 = "1gd685r86h0kr36msw81gfgwv7d35hihz6h0jkc6vd22wf6qc3ly";
           name = "jape-mode";
         };
@@ -30136,7 +30430,7 @@
           sha256 = "0nydj0y58yhfh16492q5gzkkz7qrxbdhp4gh2xbiykcbynygj2mq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jar-manifest-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jar-manifest-mode";
           sha256 = "0kx358m3p23r8m7z45454i62ijmdlf4mljlbqc20jkihfanr6wqd";
           name = "jar-manifest-mode";
         };
@@ -30157,7 +30451,7 @@
           sha256 = "1zcrxijcwqfs6r1cd6w4jq8g3ly0a69nf0cbx93w5v86x2kjpz0l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jasminejs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jasminejs-mode";
           sha256 = "1a70j3aglrwmaw9g8m99sxad2vs53y4swxh97gqjsgx1rrx03g52";
           name = "jasminejs-mode";
         };
@@ -30178,7 +30472,7 @@
           sha256 = "1bv0al89wlwdv3bhasxnwhsv84phgnixclgrh4l52385rjn8v53f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jaunte";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jaunte";
           sha256 = "0chqiai7fv1idga71gc5dw4rdv1rblg5rrbdijh3glyi8yfr4snf";
           name = "jaunte";
         };
@@ -30191,15 +30485,15 @@
     java-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }:
     melpaBuild {
         pname = "java-imports";
-        version = "20160105.1833";
+        version = "20160127.929";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "emacs-java-imports";
-          rev = "275f354c245df741b45e88d085660722e81a12be";
-          sha256 = "1bngn6v6w60qb3zz7s3px7v3wk99a3hfvzrg9l06dz1q7xgyvsi1";
+          rev = "42e1f92dd60d3adb69d6fac4c59af49d6ab2ccfe";
+          sha256 = "0d8r7pw6v2b3b6brspkpra7q7fmmjh6zm23gmnhdrk72f37fgzdz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/java-imports";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/java-imports";
           sha256 = "1waz6skyrm1n8wpc0pwa652l11wz8qz1m89mqxk27k3lwyd84n98";
           name = "java-imports";
         };
@@ -30220,7 +30514,7 @@
           sha256 = "09pa1hmk0dyh7vw0lb9awyrvdarakgaxn66gag5fzbg5vgdfz32i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/java-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/java-snippets";
           sha256 = "0bsmp6sc3khdadkmwqy8khz8kzqijcsv70gimm2cs1kwnbyj6pfp";
           name = "java-snippets";
         };
@@ -30241,7 +30535,7 @@
           sha256 = "0ljpqgp2w3lr61n2vr748n3wyshlqnnbin0643jffa319l99z35r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/javadoc-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/javadoc-lookup";
           sha256 = "1fffs0iqkk9rg5vbxifvn09j4i2751p81bzcvy5fslr3r1r2nv79";
           name = "javadoc-lookup";
         };
@@ -30262,7 +30556,7 @@
           sha256 = "070r4mg4v937n4h2bmzdbn3vsmmq7ijz69nankqs761jxv5gcwlg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/javap-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/javap-mode";
           sha256 = "19p39l4nwgxm52yimy4j6l43845cpk8g5qdrldlwfxd7dvay09ay";
           name = "javap-mode";
         };
@@ -30283,7 +30577,7 @@
           sha256 = "1430xwd86fdlv1gzkdlp9a0x3w4blbplw24z0m7y8b0j9rhl4fka";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jaword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jaword";
           sha256 = "05pzh99zfl8n3p6lxdd9abr52m24hqcb105458i1cy0ra840bf4d";
           name = "jaword";
         };
@@ -30304,7 +30598,7 @@
           sha256 = "00havgs6xc44plnr3vbs13xxiwygr93izm6nx4y98zhcv389ajb0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jazz-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jazz-theme";
           sha256 = "0ad8kvrmd3gyb8wfghcl4r3kwzplk5gxlw3p23wsbx6c2xq6xr7g";
           name = "jazz-theme";
         };
@@ -30325,7 +30619,7 @@
           sha256 = "0yx64jrq1br0aylfn4mm26f71gyyw6kad97kv40sb0ashm3di96h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jbeans-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jbeans-theme";
           sha256 = "0y7ccycfnpykgzr88968w7dl45qazf8b9zlf7ydw3ghkl4f6lbwl";
           name = "jbeans-theme";
         };
@@ -30338,15 +30632,15 @@
     jdee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jdee";
-        version = "20160116.1538";
+        version = "20160130.1630";
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "54222ea1bccf8bea9757858213fc13f81e3bfd40";
-          sha256 = "1hsx0xfadwwsacs3bad580mns01xyn62j5da0mcmswprxfhc8zx9";
+          rev = "d676043d9b25af39961ceec4428bbada52922b64";
+          sha256 = "0kxqdz8w7lyvl8nyba3c7m0l6nncraml3yyzn250mfbsvbijn1hd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jdee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jdee";
           sha256 = "1yn8vszj0hs2jwwd4x55f11hs2wrxjjvxpngsj7lkcwax04kkvq3";
           name = "jdee";
         };
@@ -30367,7 +30661,7 @@
           sha256 = "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jedi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jedi";
           sha256 = "1777060q25k9n2g6h1lm5lkki900pmjqkxq72mrk3j19jr4pk9m4";
           name = "jedi";
         };
@@ -30388,7 +30682,7 @@
           sha256 = "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jedi-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jedi-core";
           sha256 = "0pzi32zdb4g9n4kvpmkdflmqypa7nckmnjq60a3ngym4wlzbb32f";
           name = "jedi-core";
         };
@@ -30409,7 +30703,7 @@
           sha256 = "1pgi5vnwz5agrpvy7nwg3gv2nfbbmimhk8dxkg81k6yf1iiqxcap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jedi-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jedi-direx";
           sha256 = "1y4n4c2imnm3f1q129bvbi4gzk0iazd8qq959gvq9j9fl1aziiz1";
           name = "jedi-direx";
         };
@@ -30430,7 +30724,7 @@
           sha256 = "0rx72rid7922mhw21j85kxmx0fhpkmkv9jvxmj9izy01xnjbk00c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jekyll-modes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jekyll-modes";
           sha256 = "1305f1yg1mamyw3bkzrk5q3q58ihs8f5k9vjknsww5xvrzz3r1si";
           name = "jekyll-modes";
         };
@@ -30451,7 +30745,7 @@
           sha256 = "08ywfmsjv3vjqy95hx095kasy8knh3asl7mrlkgmv9wjwnxw45zs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jenkins";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jenkins";
           sha256 = "0ji42r7p3f3hh643839xf74gb231vr7anycr2xhkga8qy2vwa53s";
           name = "jenkins";
         };
@@ -30472,7 +30766,7 @@
           sha256 = "0jayhv8j7b527dimhvcs0d7ax25x7v50dk0k6apisqc23psvkq66";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jenkins-watch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jenkins-watch";
           sha256 = "0brgjgbw804x0gf2vq01yv6bd0ilp3x9kvr1nnsqxb9c03ffmb2m";
           name = "jenkins-watch";
         };
@@ -30492,7 +30786,7 @@
           sha256 = "a7aa00b03d474549a25faec9ae0394f9d1065c05049268dea507409f84c801a1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jg-quicknav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jg-quicknav";
           sha256 = "1v46ck9imffhrmx6s4c3kbi5g5spf2mn2axy5nfpn7q8sc8bf0s3";
           name = "jg-quicknav";
         };
@@ -30513,7 +30807,7 @@
           sha256 = "0l26wcy496k6xk7q5sf905xir0p73ziy6c44is77854lv3y0z381";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jinja2-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jinja2-mode";
           sha256 = "0480fh719r4v7xdwyf4jlg1k36y54i5zrv7gxlhfm66pil75zafx";
           name = "jinja2-mode";
         };
@@ -30531,7 +30825,7 @@
           sha256 = "18b6hdqk59gnqh4ibq8lj59kbsg5gbyfb7vfcvpgmxjikpl3cgkz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jira";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jira";
           sha256 = "0cf5zgkxagvka5v6scgyxqx4mz1n7lxbynn3gl2a4s9s64jycsy6";
           name = "jira";
         };
@@ -30552,7 +30846,7 @@
           sha256 = "1ack7dmapva3wc2gm22prd5wd3cmq19sl4xl9f04a3nk2msr6ksx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jira-markup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jira-markup-mode";
           sha256 = "0f3sw41b4wl0aajq0ap66942rb2015d9iks0ss016jgzashw7zsp";
           name = "jira-markup-mode";
         };
@@ -30573,7 +30867,7 @@
           sha256 = "0mh7990zqrprsa1g9jzpqm666pynlqd2nh9z236zyzykf8d8il8c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jist";
           sha256 = "11m9li1016cfkm4931h69d7g1dc59lwjl83wy3yipswdg3zlw0ar";
           name = "jist";
         };
@@ -30594,7 +30888,7 @@
           sha256 = "1idby2rjkslw85593qd4zy6an9zz71yzwqc6rck57r54xyfs8mij";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jknav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jknav";
           sha256 = "0c0a8plqrlsw8lhmyj9c1lfkj2b48cjkbw9pna8qcizvwgym9089";
           name = "jknav";
         };
@@ -30615,7 +30909,7 @@
           sha256 = "1a0091r1xs3fpvg1wynh53xibdsiaf2khz1gp6s8dc45z8r0bclx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jonprl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jonprl-mode";
           sha256 = "0763ad65dmpl2l5lw91mlppfdvrjg6ym45brhi8sdwwri1xnyv9z";
           name = "jonprl-mode";
         };
@@ -30636,7 +30930,7 @@
           sha256 = "014qfzl0qc23pa9w9f3v4yi80jr7nxpd0pz6d615x5mq3zi6l0gp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jq-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jq-mode";
           sha256 = "1xvh641pdkvbppb2nzwn1ljdk7sv6laq29kdv09kxaqd89vm0vin";
           name = "jq-mode";
         };
@@ -30657,7 +30951,7 @@
           sha256 = "0gh2bgmsbi9lby89ssvl49kpz07jqrfnyg47g6b9xmf5rw42s1z9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jquery-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jquery-doc";
           sha256 = "0pyg90izdrb9mvpbz9nx21mp8m3svqjnz1jr8i7wqgfjxsxdklxj";
           name = "jquery-doc";
         };
@@ -30678,7 +30972,7 @@
           sha256 = "0hh49j4ngnw7zkp31nm7bckkic3ya3xwzrsz4ksj2ws4fyjkqc9v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js-comint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js-comint";
           sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1";
           name = "js-comint";
         };
@@ -30699,7 +30993,7 @@
           sha256 = "1d2jy71iw1v7l0jrvszmr3qdls5mak6kjvyvk0n9895z87lhgm8g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js-doc";
           sha256 = "0nafqgb4kf8jgrb7ijfcvigq8kf043ki89h61izda4hccm3c42pk";
           name = "js-doc";
         };
@@ -30720,7 +31014,7 @@
           sha256 = "0105vx7bc681q9v2x6wj2r63pwp7g0cjjgpg7k4r852zmndfbzsc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js2-closure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js2-closure";
           sha256 = "19732bf98lk2ah2ssgkr1ngxx7rz3nhsiw84lsfmydb0vvm4fpk7";
           name = "js2-closure";
         };
@@ -30741,7 +31035,7 @@
           sha256 = "1gad5a18m3jfhnklsj0ka3p2wbihh1yvpcn7mwlmm7cjjxcaly9g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js2-highlight-vars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js2-highlight-vars";
           sha256 = "07bq393g2jy8ydvaqyqn6vdyfvyminvgi239yvwzg5g9a1xjc475";
           name = "js2-highlight-vars";
         };
@@ -30754,15 +31048,15 @@
     js2-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js2-mode";
-        version = "20160109.348";
+        version = "20160124.1332";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js2-mode";
-          rev = "b57d129c2f156eda96f7aea004472a7f6d70334a";
-          sha256 = "06lfpj4n5f1g657amyfd8ndr8w94a0bjlp9xic614w0z9a2l3ak6";
+          rev = "7b430a37d2a77c8bc0f384e11e061e914f2d31de";
+          sha256 = "09hwxh353w6wk47sqx871fn59la7kncqlskxdrz316jyps6kj890";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js2-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js2-mode";
           sha256 = "0f9cj3n55qnlifxwk1yp8n1kfd319jf7qysnkk28xpvglzw24yjv";
           name = "js2-mode";
         };
@@ -30783,7 +31077,7 @@
           sha256 = "08wxsz90x5zhma3q8kqfd01avhzxjmcrjc95s757l5xaynsc2bly";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js2-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js2-refactor";
           sha256 = "09dcfwpxxyw0ffgjjjaaxbsj0x2nwfrmxy1a05h8ba3r3jl4kl1r";
           name = "js2-refactor";
         };
@@ -30804,7 +31098,7 @@
           sha256 = "137lypg6jwsisn2g5h0wiqh57icj46zv3albxjf2q1k5isszhy1l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js3-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js3-mode";
           sha256 = "12s5qf6zfcv4m5kqxvh9b4zgwf433x39a210d957gjjp5mywbb1r";
           name = "js3-mode";
         };
@@ -30825,7 +31119,7 @@
           sha256 = "1bqsv2drhcs8ia7nxss33f80p2mhcl4mr1nalphzw6s1f4mq2sgy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jscs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jscs";
           sha256 = "1yw251f6vpj2bikjw79arywprk8qnmmfcki99mvwnqhsqlv1a8iv";
           name = "jscs";
         };
@@ -30846,7 +31140,7 @@
           sha256 = "0h9gx5cl3lashk0n8pv9yzb0mm8dyziddfbwfqfm70638p93ylhc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jsfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jsfmt";
           sha256 = "1syy32sv2d57b3gja0ly65h36mfnyq6hzf5lnnl3r58yvbdzngqd";
           name = "jsfmt";
         };
@@ -30867,7 +31161,7 @@
           sha256 = "0sxkp9m68rvff8dbr8jlsx85w5ngifn19lwhcydysm7grbwzrdi3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/json-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/json-mode";
           sha256 = "014j10wgxsqy6d6aksnkz2dr5cmpsi8c7v4a825si1vgb4622a70";
           name = "json-mode";
         };
@@ -30888,7 +31182,7 @@
           sha256 = "0qp4n2k6s69jj4gwwimkpadjv245y54wk3bxb1x96f034gkp81vs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/json-reformat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/json-reformat";
           sha256 = "1m5p895w9qdgb8f67xykhzriribgmp20a1lvj64iap4aam6wp8na";
           name = "json-reformat";
         };
@@ -30909,7 +31203,7 @@
           sha256 = "0xgrb0zfxyfmfnvx1l7ca99lzl6f2qyal798rcra45167c0j0vbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/json-rpc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/json-rpc";
           sha256 = "1v1pfmm9g18p6kgn27q1m1bjgwbzvwfm0jbsxp8gdsssaygky71k";
           name = "json-rpc";
         };
@@ -30930,7 +31224,7 @@
           sha256 = "05zsgnk7grgw9jzwl80h5sxfpifxlr37b4mkbvx7mjq4z14xc2jw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/json-snatcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/json-snatcher";
           sha256 = "0f6j9g3c5fz3wlqa88706cbzinrs3dnfpgsr2d3h3117gic4iwp4";
           name = "json-snatcher";
         };
@@ -30951,7 +31245,7 @@
           sha256 = "07yd7sxb5f2mbm2nva7b2nwyxxkmsi2rdd5qig0bq1b2mf3g5l83";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jss";
           sha256 = "050hskqcjz5kc8nni255vj3hc9m936w1rybvg5kqyz4p4lpzj00k";
           name = "jss";
         };
@@ -30972,7 +31266,7 @@
           sha256 = "16jgmabcqrjb3v9c6q711jqn9dna88bmzm4880mdry69ixwcydxy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jst";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jst";
           sha256 = "0hp1f7p6m1gfv1a3plavzkzn87dllb5g2xrgg3mch4qsgdbqx65i";
           name = "jst";
         };
@@ -30993,7 +31287,7 @@
           sha256 = "1g648r0wrd8m5ggl5jrplmj7jmr68bh2ykyii5wv30zfba97r1sh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jsx-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jsx-mode";
           sha256 = "1lnjnyn8qf3biqr92z443z6b58dly7glksp1g986vgqzdprq3n1b";
           name = "jsx-mode";
         };
@@ -31005,14 +31299,14 @@
       }) {};
     jtags = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "jtags";
-        version = "20160118.828";
+        version = "20160119.1503";
         src = fetchgit {
           url = "git://git.code.sf.net/p/jtags/code";
-          rev = "1a820caeb0d0b38280346ee75e4aae312bf54799";
-          sha256 = "e71284e30a2d69e5769c414d29870d0d5ef3696fba35944a6844ad157bd57288";
+          rev = "46ff683a3b452729364d9f2fcb86b3f020d9baac";
+          sha256 = "96d9335e9baa6d466447a79219c955b71a9eb1e800d1e1311d9bf72dafcc358d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jtags";
           sha256 = "0in5ybgwmghlpa5d7wz0477ba6n14f1mwp5dxcl4y11f1lsq041r";
           name = "jtags";
         };
@@ -31029,11 +31323,11 @@
         src = fetchFromGitHub {
           owner = "JuliaLang";
           repo = "julia";
-          rev = "57beb963d9ba34ef2c40f7caf52e659339e6f258";
-          sha256 = "1s2j7iq3xwvjnrsljryzccca7h5sd6swmzhy4bj7gisymdg0h7lg";
+          rev = "baf336ff1940c355a9b66805330b7623a6b910f0";
+          sha256 = "0z78bppjl3d0qcc1vxh66gi3if35n35bh61569hr1hhyc0x8pzpq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/julia-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/julia-mode";
           sha256 = "0c5bdgh98hw7484s2is84af7hznd8c4z5vlzfd98s8qxi7bldqjm";
           name = "julia-mode";
         };
@@ -31054,7 +31348,7 @@
           sha256 = "0r4ajn3f1c8n0r831ihvzwyzy94aiv0ijqrwhpq0s85cqvzr7pq8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/julia-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/julia-shell";
           sha256 = "0182irlvk6nn71zk4j8xjgcqp4bxi7a2dbj44frrssy6018cd410";
           name = "julia-shell";
         };
@@ -31075,7 +31369,7 @@
           sha256 = "1f0kai4cz3r25fqlnryyvnyf80cf57xa655dvv1rx8si3xd20x4j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jumblr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jumblr";
           sha256 = "1wnawz1m6x95iyzac453p55h7hlr5q0ry5437aqqx0bw7gdwg3dp";
           name = "jumblr";
         };
@@ -31096,7 +31390,7 @@
           sha256 = "0061hcmj63g13bvacwkmcb5iggwnk27dvb04fz4hihqis6jg01c5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jump";
           sha256 = "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364";
           name = "jump";
         };
@@ -31117,7 +31411,7 @@
           sha256 = "0vpla6lyr30fyq9gi7g9zmnhysbm077m0qgi7w3axppfbxdvg67q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jump-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jump-char";
           sha256 = "0l8zvfwpngkgcxl1a36jwwxdh23hi390mikz7xrq63w5zwm0007n";
           name = "jump-char";
         };
@@ -31138,7 +31432,7 @@
           sha256 = "1s9plmg323m1p625xqnks0yqz0zlsjacdj7pv8f783r0d9jmfq3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jump-to-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jump-to-line";
           sha256 = "09ifhsggl5mrb6l8nqnl38yph0v26v30y98ic8hl23i455hqkkdr";
           name = "jump-to-line";
         };
@@ -31159,7 +31453,7 @@
           sha256 = "0ykzvy8034mchq6ffyi7vqnwyrj6gnqqgn39ki81pv97qh8hh8yl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jumplist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jumplist";
           sha256 = "06xjg1q8b2fwfhfmdkb76bw2id8pgqc61fmwlgri5746jgdmd7nf";
           name = "jumplist";
         };
@@ -31180,7 +31474,7 @@
           sha256 = "0k91cdjlpil8npc4d3zsgx2gk41crl7qgm9r85khcgxs59kmkniw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jvm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jvm-mode";
           sha256 = "1r283b4s0pzq4hgwcz5cnhlvdvq4gy0x51g3vp0762s8qx969a5w";
           name = "jvm-mode";
         };
@@ -31193,15 +31487,15 @@
     kaesar = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kaesar";
-        version = "20150220.505";
+        version = "20160128.408";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-kaesar";
-          rev = "11ab63b8e6f1c4ebc5a2e54474095754a39104e5";
-          sha256 = "1maab8iaf2wcjj02ibl21jlfzmi9gmcl167cgdlwj50wkig74s23";
+          rev = "d087075cb1a46c2c85cd075220e09b2eaef9b86e";
+          sha256 = "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kaesar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kaesar";
           sha256 = "0zhi1dv1ay1azh7afq4x6bdg91clwpsr13nrzy7539yrn9sglj5l";
           name = "kaesar";
         };
@@ -31214,15 +31508,15 @@
     kaesar-file = callPackage ({ fetchFromGitHub, fetchurl, kaesar, lib, melpaBuild }:
     melpaBuild {
         pname = "kaesar-file";
-        version = "20150130.1004";
+        version = "20160128.408";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-kaesar";
-          rev = "11ab63b8e6f1c4ebc5a2e54474095754a39104e5";
-          sha256 = "1maab8iaf2wcjj02ibl21jlfzmi9gmcl167cgdlwj50wkig74s23";
+          rev = "d087075cb1a46c2c85cd075220e09b2eaef9b86e";
+          sha256 = "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kaesar-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kaesar-file";
           sha256 = "0dcizg82maad98mbqqw5lamwz7n2lpai09jsrc66x3wy8k784alc";
           name = "kaesar-file";
         };
@@ -31235,15 +31529,15 @@
     kaesar-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, kaesar, lib, melpaBuild }:
     melpaBuild {
         pname = "kaesar-mode";
-        version = "20150220.505";
+        version = "20160128.408";
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-kaesar";
-          rev = "11ab63b8e6f1c4ebc5a2e54474095754a39104e5";
-          sha256 = "1maab8iaf2wcjj02ibl21jlfzmi9gmcl167cgdlwj50wkig74s23";
+          rev = "d087075cb1a46c2c85cd075220e09b2eaef9b86e";
+          sha256 = "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kaesar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kaesar-mode";
           sha256 = "0yqnlchbpmhsqc8j531n08vybwa32cy0v9sy4f9fgxa90rfqczry";
           name = "kaesar-mode";
         };
@@ -31264,7 +31558,7 @@
           sha256 = "0b6af8hnrn0v4z1xpahjfpw5iga2bmgd3qwfn3is2rygsn5rkm40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kakapo-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kakapo-mode";
           sha256 = "0a99cqflpzasl4wcmmf99aj8xgywkym37j7mvnsajrsk5wawdlss";
           name = "kakapo-mode";
         };
@@ -31283,7 +31577,7 @@
           sha256 = "14g0f51jig8b1y6zfaw7b1cp692lddqzkc0ngf4y89sw9gbmsh3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kanban";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kanban";
           sha256 = "1sif2ayb8fq5vjz9lpkaq40aw9wiciz84yipab2qczszlgw1l1hb";
           name = "kanban";
         };
@@ -31304,7 +31598,7 @@
           sha256 = "0vfagfzhh4rkmvjzfhfcm7w3z1x31aqzxwigk5yw9scnfb77pinz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kanji-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kanji-mode";
           sha256 = "0nnkv7lp7ks9qhkbhz15ixm53grc2q0xfspzykxi9c4b59kypcq5";
           name = "kanji-mode";
         };
@@ -31314,6 +31608,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    kaomoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "kaomoji";
+        version = "20160119.943";
+        src = fetchFromGitHub {
+          owner = "kuanyui";
+          repo = "kaomoji.el";
+          rev = "ffe8890019bb22eac586f42c7c7a184a243c8ba0";
+          sha256 = "1z35gk58jwynygyq1n3c9cb7xgqp5bmbsgq2j3bb43cagc55xixh";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kaomoji";
+          sha256 = "1p61pbqf2lnwr6ryxxc4jkd5bmlgknrc27lg89h3b4pw7k39cqy1";
+          name = "kaomoji";
+        };
+        packageRequires = [ emacs helm-core ];
+        meta = {
+          homepage = "http://melpa.org/#/kaomoji";
+          license = lib.licenses.free;
+        };
+      }) {};
     karma = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "karma";
@@ -31321,11 +31636,11 @@
         src = fetchFromGitHub {
           owner = "tonini";
           repo = "karma.el";
-          rev = "07d5ba0fd669b909efdf02ffd0c1f45e6136edc4";
-          sha256 = "1xcs15j555cgp2k4k9vl5sy2lrffbk0ma2fv60hlxwirqyw4jcdy";
+          rev = "34952d4b5288d4b09a9f65b32ee8cb5f65926fe9";
+          sha256 = "03wdi0zwnsb42rbrlrck553mgn9vgnd896d5xpiqf1ik4z4cf10z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/karma";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/karma";
           sha256 = "19wl7js7wmw7jv2q3l4r5zl718lhy2a0jhl79k57ihwhxdc58fwc";
           name = "karma";
         };
@@ -31346,7 +31661,7 @@
           sha256 = "1kkzs7nrcr74qn1m456vaj52a9j3ah4biakimz06hls415l56yk9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kerl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kerl";
           sha256 = "0f8n7cm5c432pwj28bcpv2jj5z3br3k164xj6nwfis3dvijwsgss";
           name = "kerl";
         };
@@ -31364,7 +31679,7 @@
           sha256 = "03m44pqggfrd53nh9dvpdjgm0rvca34qxmd30hr33hzprzjambxg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/key-chord";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/key-chord";
           sha256 = "0cr9lx1pvr0qc762nn5pbh8w93dx1hh1zzf806cag2b9pgk6d4an";
           name = "key-chord";
         };
@@ -31385,7 +31700,7 @@
           sha256 = "1is7s50lgn77lxxwgakiaywx6jqdfg8045d18m4zn3ilxg6k8ljf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/key-combo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/key-combo";
           sha256 = "1v8saw92jphvjkyy7j9jx7cxzgisl4zpf4wjzdjfw3la5lz11waf";
           name = "key-combo";
         };
@@ -31406,7 +31721,7 @@
           sha256 = "143nfs8pgi5yy3mjq7nirffplk4vb8kik4q7zypynh2pddip30a4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/key-intercept";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/key-intercept";
           sha256 = "1z776jbpjks5bir6bd0748mlrmz05nf0jy9l4hlmwgyn72dcbx16";
           name = "key-intercept";
         };
@@ -31427,7 +31742,7 @@
           sha256 = "14xk0crl25alcckkcg0wx7gwb65hmicfn01db1zip8swk249g9w3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/key-leap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/key-leap";
           sha256 = "0z1fhpf8g0c4rh3bf8dfmdgyhj5w686kavjr214czaga0x7mwlwj";
           name = "key-leap";
         };
@@ -31448,7 +31763,7 @@
           sha256 = "05vpydcgiaya35b62cdjxna9y02vnwzzg6p8jh0dkr9k44h4iy3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/key-seq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/key-seq";
           sha256 = "166k6hl9vvsnnksvhrv5cbhv9bdiclnbfv7qf67q4c1an9xzqi74";
           name = "key-seq";
         };
@@ -31469,7 +31784,7 @@
           sha256 = "0xm7vybqgglacm0xz6fa7ipfvsx14qqws629gi9i16maxn3by9ci";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keychain-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keychain-environment";
           sha256 = "1w77cg00bwx68h0d6k6r1fzwdwz97q12ch2hmpzjnblqs0i4sv8v";
           name = "keychain-environment";
         };
@@ -31490,7 +31805,7 @@
           sha256 = "0dkc51bmix4b8czs2wg6vz8vk32qlll1b9fjmx6xshrxm85cyhvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keydef";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keydef";
           sha256 = "0yb2vgj7abyg8j7qmv74nsanv50lf350q1m58rjv8wm31yykg992";
           name = "keydef";
         };
@@ -31511,7 +31826,7 @@
           sha256 = "18qiw2324gx5w12pqka9njsysxym8dpglk7dzadg0k1wji73nn6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keyfreq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keyfreq";
           sha256 = "1rw6hzmw7h5ngvndy7aa41pq911y2hr9kqc9w4gdd5v2p4ln1qh7";
           name = "keyfreq";
         };
@@ -31532,7 +31847,7 @@
           sha256 = "18kc48glbwy9njw863fzlrgc4g0a65s5wf2iarfsjqcynad7r4c7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keymap-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keymap-utils";
           sha256 = "0nbcwz4nls0pva79lbx91bpzkl38g98yavwkvg2rxbhn9vjbhzs9";
           name = "keymap-utils";
         };
@@ -31553,7 +31868,7 @@
           sha256 = "1kkp3frsk644djmdwxq3l1m88690gch3g8pijlzv566xrwkd903j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keyset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keyset";
           sha256 = "1kfw0pfb6qm2ji1v0kb8xgz8q2yd2k9kxmaz5vxcdixdlax3xiqg";
           name = "keyset";
         };
@@ -31574,7 +31889,7 @@
           sha256 = "0zw4klp9ifb6yylr9yab3p3vjv18as6clpg2i3w4r2xah9chxgqq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keyword-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keyword-search";
           sha256 = "0wvci1v8pblfbdslfzpi46c149y8pi49kza9jf33jzhj357lp5qa";
           name = "keyword-search";
         };
@@ -31595,7 +31910,7 @@
           sha256 = "0xq835xzywks4b4kaz5i0pp759i23kibs5gkvvxasw0dncqh7j5c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kfg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kfg";
           sha256 = "0vvvxl6a4ac27igwmsgzpf0whf9h2pjl9d89fd9fizad6gi8x1fs";
           name = "kfg";
         };
@@ -31616,7 +31931,7 @@
           sha256 = "0s2hb2lvfmcvm3n1fg4biaafc1p7j7w990d7w15gicaw6rr2j4nr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kibit-helper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kibit-helper";
           sha256 = "15viybjqksylvm5ash2kzsil0cpdka56wj1rryixa8y1bwlj8y4s";
           name = "kibit-helper";
         };
@@ -31629,15 +31944,15 @@
     kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kill-or-bury-alive";
-        version = "20160114.345";
+        version = "20160128.309";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "kill-or-bury-alive";
-          rev = "dde977419d6d56f4be692e6d7fe1374a087e77c7";
-          sha256 = "15ang6bj34hiq605iaw97is85nn5vc6cyxiy0w4h921f7qmjqdd1";
+          rev = "63753e74a6136a1a196dc436adb8bef894489c58";
+          sha256 = "0a2jmk4wryngs56rqh6sxiyk5yh25l2qvping86yipic2wia17n8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kill-or-bury-alive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kill-or-bury-alive";
           sha256 = "0mm0m8hpy5v98cap4f0s38dcviirm7s6ra4l94mknyvnx0f73lz8";
           name = "kill-or-bury-alive";
         };
@@ -31658,7 +31973,7 @@
           sha256 = "0yrc09k64rv5is4wvss938mkj2pkvbr98lr3ahsi7p0aqn7s444v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kill-ring-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kill-ring-search";
           sha256 = "1pg4j1rrji64rrdv2xpwz33vlyk8r0hz4j4fikzwpbcbmni3skan";
           name = "kill-ring-search";
         };
@@ -31679,7 +31994,7 @@
           sha256 = "05rbh5hkj3jsn9pw0qa4d5a5pi6367vdqkijcn9k14fdfbmyd30x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/killer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/killer";
           sha256 = "10z4vqwrpss7mk0gq8xdsbsl0qibpp7s1g0l8wlmrsgn6kjkr2ma";
           name = "killer";
         };
@@ -31700,7 +32015,7 @@
           sha256 = "1cr4i66lws6yhyxmyx5jw6d5x7i75435mafkkych4nfa0mv4vicd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kite";
           sha256 = "04x92qcvx428l2cvm2nk9px7r8i159k0ra0haq2sjncjr1ajhg9m";
           name = "kite";
         };
@@ -31721,7 +32036,7 @@
           sha256 = "1m0f1hiczq88qjy573rhlkw2lmjy814cgdl42zxsjbf78wg4qx8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kite-mini";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kite-mini";
           sha256 = "1g644406zm3db0fjyv704aa8dbd20v1apmysb3mmh2vldbch4iyh";
           name = "kite-mini";
         };
@@ -31738,11 +32053,11 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "417fdc3dc5f0c695b016f9b853d8315de609592d";
-          sha256 = "00y1h3zm1rah86g5gl58qwmndmmcyvix2s6r1gmz7vc2rr06w4kj";
+          rev = "41cb82ab0dd480452139e20d61e264c40e37813f";
+          sha256 = "0vdl0bkgvb0fjja50yffv8izvh0fa2r7bdrcn9qzf5jild49n8m7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kivy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kivy-mode";
           sha256 = "02l230rwivr7rbiqm4vg70458z35f9v9w3mdapcrqd5d07y5mvi1";
           name = "kivy-mode";
         };
@@ -31763,7 +32078,7 @@
           sha256 = "1ld3ccg8q7hmjrj60rxvmmfy4dpm2lvlshjqdf9ifgjzp221g4vb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kixtart-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kixtart-mode";
           sha256 = "079bw4lgxbmk65rrfyy8givs8j5wsyhpcjjw915ifkg577gj87qp";
           name = "kixtart-mode";
         };
@@ -31780,11 +32095,11 @@
         src = fetchFromGitHub {
           owner = "for-GET";
           repo = "know-your-http-well";
-          rev = "e208d856ce1b036d2dc1454813c6fc81f0269def";
-          sha256 = "08q43k4450kgygyvqv18gwcmmb7y9x445401048lbixc4cp6p3cg";
+          rev = "d72da09014d44f67b1c6283e4391643b7f311e92";
+          sha256 = "19x08gjqzghxwdrvadjmb8kqm4cszla65nk3ihk2y60riksz9hbs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/know-your-http-well";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/know-your-http-well";
           sha256 = "0k2x0ajxkivim8nfpli716y7f4ssrmvwi56r94y34x4j3ib3px3q";
           name = "know-your-http-well";
         };
@@ -31805,7 +32120,7 @@
           sha256 = "0yr4yxwxgxp5pm9f8gaqlikxp26inv01inq0ya42dzam5yphkafw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kolon-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kolon-mode";
           sha256 = "0wcg8ph3mk4zcmzqpvl2w6rfgvrfvhmgwb14y8agh9b7v5d9xwj3";
           name = "kolon-mode";
         };
@@ -31826,7 +32141,7 @@
           sha256 = "1ly55ldf2maf8qfpnsqzn0rbz9cz1f08ak9rr3zijaip3zvlm9q9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kooten-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kooten-theme";
           sha256 = "1kkk8nl1xykc4c487icmjrc2xsv8i4s2r5h5gbcpyrk2myqi4179";
           name = "kooten-theme";
         };
@@ -31847,7 +32162,7 @@
           sha256 = "1m9hixlclynph2i5q18miq077dyvhx14pfzgawrwj82j1kslz50x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kpm-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kpm-list";
           sha256 = "0022bhy1mzngjmjydyqnmlgnhww05v4dxsfav034r8nyyc7677z0";
           name = "kpm-list";
         };
@@ -31868,7 +32183,7 @@
           sha256 = "11axxmhdpwgrcyjz200pf5bqzjw9wz4085r8p1n2vr5gx98374fr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kroman";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kroman";
           sha256 = "0y9ji3c8kndrz605n7b4w5xq0qp093d61hxwhblm3qrh3370mws7";
           name = "kroman";
         };
@@ -31889,7 +32204,7 @@
           sha256 = "0da4y9pf6vq0i6w7bmvrszg9bji3ylhr44hmyrmxvah28pigb2fz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kurecolor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kurecolor";
           sha256 = "0q0q0dfv376h7j3sgwxqwfpxy1qjbvb6i5clsxz9xp4ly89w4d4f";
           name = "kurecolor";
         };
@@ -31910,7 +32225,7 @@
           sha256 = "0r0lz2s6gvy04fwnafai668jsf4546h4k6zd6isx5wpk0n33pj5m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kv";
           sha256 = "1vzifi6zpkmsh1a3c2njrw7mpfdgyjvpbz3bj42j8cg3vwjnjznb";
           name = "kv";
         };
@@ -31931,7 +32246,7 @@
           sha256 = "0irbfgip493hyh45msnb7climgfwr8f05nvc97bzaqggnay88scy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kwin";
           sha256 = "1pxnyj81py3ygadmyfrqndb0jkk6xlbf0rg3857hsy3ccblzm7ki";
           name = "kwin";
         };
@@ -31949,7 +32264,7 @@
           sha256 = "01vs0v17l76zwyrblf9c6x0xg5fagd4qv8pr1fwfw7kl64hb9aa2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lacarte";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lacarte";
           sha256 = "0a0n1lqakgsbz0scn6617rkkkvzwranzlvkzw9q4zapiz1s9xqp9";
           name = "lacarte";
         };
@@ -31970,7 +32285,7 @@
           sha256 = "135k7inkvdz51j7al3nndaamrkyn989vlv1mxcp8lwx8cgq0rqfj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lang-refactor-perl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lang-refactor-perl";
           sha256 = "02fv25d76rvxqzxs48j4lkrifdhqayyb1in05ryyz2pk9x5hbax9";
           name = "lang-refactor-perl";
         };
@@ -31991,7 +32306,7 @@
           sha256 = "0svci7xs4iysv8ysf93g382arip0xpgi0fllw8xx2vrd70sz7lff";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/langdoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/langdoc";
           sha256 = "19i6ys58wswl5ckf33swl6lsfzg4znx850br4icik15yrry65yj7";
           name = "langdoc";
         };
@@ -32012,7 +32327,7 @@
           sha256 = "1rj0j4vxfwss0w6bwh591w5mbyzjg5rkbwyjaphyi6p7wq5w6np1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/langtool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/langtool";
           sha256 = "1xq70jyhzg0qmvialy015crbdk9rdibhwpl36khab9hi2999wxyw";
           name = "langtool";
         };
@@ -32033,7 +32348,7 @@
           sha256 = "1cqbdgk3sd0xbw76qrhlild9dvgds3vgldq0rcl200kh7y8l6g4k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/latest-clojure-libraries";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/latest-clojure-libraries";
           sha256 = "1vnm9piq71nx7q1843izm4vydfjq1564ax4ffwmqmlpisqzd6wq5";
           name = "latest-clojure-libraries";
         };
@@ -32054,7 +32369,7 @@
           sha256 = "17dp23ggd380fln3g5djs7gwx9z3ixbkn51zfccbh4s5549krl5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/latex-extra";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/latex-extra";
           sha256 = "1w98ngxymafigjpfalybhs12jcf4916wk4nlxflfjcx8ryd9wjcj";
           name = "latex-extra";
         };
@@ -32075,7 +32390,7 @@
           sha256 = "118xrgrnwsmsysmframf6bmb0gkrdrm3jbkgivzxs41cw92fhbzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/latex-math-preview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/latex-math-preview";
           sha256 = "14bn0q5czrrkb1vjdkwx6f2x4zwjkxgrc0bcncv23l13qls1gkmr";
           name = "latex-math-preview";
         };
@@ -32095,7 +32410,7 @@
           sha256 = "0h9hncf2ghfkd3i3342ajj1niykhfr0aais3j6sjg1vkm16xbr3b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/latex-pretty-symbols";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/latex-pretty-symbols";
           sha256 = "1f2s2f64bmsx89a3crm4skhdi4pq9w18z9skxw3i3ydaj15s8jgl";
           name = "latex-pretty-symbols";
         };
@@ -32116,7 +32431,7 @@
           sha256 = "1bvhrh9xfl7p474b8jcczw255d2pjmrz5b60wis0lmmxdljplrfa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/latex-preview-pane";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/latex-preview-pane";
           sha256 = "1id1l473azmc9hm5vq5wba8gad9np7sv38x94qd2zkf8b78pzkbw";
           name = "latex-preview-pane";
         };
@@ -32137,7 +32452,7 @@
           sha256 = "0ciycsqzyj6ld60c7sfqjq59ln3jvk3w9vy606kqzpcvj01ihmv1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/launch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/launch";
           sha256 = "043gwz583pa1wv84fl634p1v86lcsldsw7qkjbm6y678q5mms0m6";
           name = "launch";
         };
@@ -32158,7 +32473,7 @@
           sha256 = "154z7bhb7qagvl3dlgrlsxdg4chz2863ijglg47xs3yhjp5ypanj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/launchctl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/launchctl";
           sha256 = "07fq445cjpv4ndi7hnjmsrmskm2rlp6ghq0k3bcbjxl21smd9vs9";
           name = "launchctl";
         };
@@ -32179,7 +32494,7 @@
           sha256 = "1mg923rs2dk104bcr461dif3mg42r081ii8ipnnr588w7il0xh7k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lavender-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lavender-theme";
           sha256 = "1x7mk3dpk44fkzll6xmh2dw270cgb3a9qs3h8bmiq2dw0wrcwcd1";
           name = "lavender-theme";
         };
@@ -32200,7 +32515,7 @@
           sha256 = "03mv2r6k9syr7bk4vmdafmpa8kz19hv5h68ahj2bmdcmwlvwhkf3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ldap-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ldap-mode";
           sha256 = "0lkfpbzsry9jigrx5zp14bkrvqnavnk4y3s0whnbigc4fgpf94rq";
           name = "ldap-mode";
         };
@@ -32217,11 +32532,11 @@
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger";
-          rev = "f612ef0b25a6f679fae47f8371bcd4c25a380b02";
-          sha256 = "011a0l2jx4x687s3mqhhyrgpwxqcjv0cn4alhd55caql6z5cwh5h";
+          rev = "9b49ade03a3e5d9089ee031bdf733004cee8a36e";
+          sha256 = "0cp5ywmk48sd7c8s8d5a0sv0ng4fl0hybss2z8fwhw6z47iypzmi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ledger-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ledger-mode";
           sha256 = "0hi9waxmw1bbg88brlr3816vhdi0jj05wcwvrvfc1agvrvzyqq8s";
           name = "ledger-mode";
         };
@@ -32242,7 +32557,7 @@
           sha256 = "0yrrlwmxg1wy65bqyacjpzd5ksljgp41x4zyizl7h0zx9rmqcdvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/leerzeichen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/leerzeichen";
           sha256 = "0h7zpskcgkswr110vckfdbxggz5b3g9grk1j1cbd98pmrpgfqrvp";
           name = "leerzeichen";
         };
@@ -32260,7 +32575,7 @@
           sha256 = "0vjf2f5kpmgnw7904jsv2wnn6dcv654v7h1v917wmj72sy941xml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/legalese";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/legalese";
           sha256 = "0xsf3w5h4g7wigrv5kbys7lf9lfv2cab5ch320p74l3l3r2lj9wz";
           name = "legalese";
         };
@@ -32281,7 +32596,7 @@
           sha256 = "0n6jrm5ilm5wzfrh7yjxn3sr5m10hwdm55b179ild32lh4795zj7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lemon-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lemon-mode";
           sha256 = "0jdf3556kmv55jh85ljqh2gdx0jl2b8zgvpz9a4kf53xifk3lqz5";
           name = "lemon-mode";
         };
@@ -32302,7 +32617,7 @@
           sha256 = "0ab84qiqaz3swiraks8lx0y1kzwylpy9wz2104xgnpwnc5169z65";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lenlen-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lenlen-theme";
           sha256 = "1bddkcl9kzj3v071qpzmxzjwywqfj5j6cldz240qgp5mx685r0a9";
           name = "lenlen-theme";
         };
@@ -32323,7 +32638,7 @@
           sha256 = "04h6vk7w25yp4kzkwqnsmc59bm0182qqkyk5nxm3a1lv1v1590lf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lentic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lentic";
           sha256 = "0y94y1qwj23kqp491b1fzqsrjak96k1dmmzmakbl7q8vc9bncl5m";
           name = "lentic";
         };
@@ -32344,7 +32659,7 @@
           sha256 = "0c6wkfz6sdcs4aglvx6h3slhma2vbj7idckwzvp8ji6s7p1mavlv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lentic-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lentic-server";
           sha256 = "1y9idhf9qcsw3dbdj7rwa7bdrn1q0m3bg3r2jzwdnvkq8aas1w56";
           name = "lentic-server";
         };
@@ -32365,7 +32680,7 @@
           sha256 = "1w6mbk4gc63sh2p9rsy851x2kid0dp2ja4ai5badkr5prxkcpfdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/less-css-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/less-css-mode";
           sha256 = "188iplnwwhawq3dby3388kimy0jh1k9r8v9nxz52hy9rhh9hykf8";
           name = "less-css-mode";
         };
@@ -32378,15 +32693,15 @@
     letcheck = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "letcheck";
-        version = "20150726.1112";
+        version = "20160202.1348";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "letcheck";
-          rev = "e85b185993a2eaeec6490709f4c131fde2edd672";
-          sha256 = "1l9qjmyb4a3f6i2iimpmjczbx890cd1p24n941s13sg67xfbm7hn";
+          rev = "edf188ca2f85349e971b83f164c6484264e79426";
+          sha256 = "06hggcbz98qhfbvp0fxn89j98d0mmki4wc4k8kfzp5fhg071chbi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/letcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/letcheck";
           sha256 = "1sjwi1ldg6b1qvj9cvfwxq3qlkfas6pm8zasf43baljmnz38mxh2";
           name = "letcheck";
         };
@@ -32407,7 +32722,7 @@
           sha256 = "088ijndcyfi5jai8x2pd9cbh7x9r41nbimw20hz71n9izy2xnjl0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/leuven-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/leuven-theme";
           sha256 = "0pm5majr9cmj6g4zr7vb55ypk9fmfbvxx78mgmgignknbasq9g9a";
           name = "leuven-theme";
         };
@@ -32425,7 +32740,7 @@
           sha256 = "0m94z18i1428bispxi285flvjf22kjm33s4sm0ad11m0w0jizir6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/levenshtein";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/levenshtein";
           sha256 = "1iypnz0bw3baqxa9gldz8cikxvdhw60pvqp00kq5p3v4x3xcy4z2";
           name = "levenshtein";
         };
@@ -32446,7 +32761,7 @@
           sha256 = "167ayfl1k8dnajw173hh67nbwbk4frmjc4fzc515q67m9d7m5932";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lexbind-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lexbind-mode";
           sha256 = "1hs9wg45mwp3fwi827rc4g0gjx4fk87zlibq3id9fcqic8q7nrnl";
           name = "lexbind-mode";
         };
@@ -32467,7 +32782,7 @@
           sha256 = "1h0nzdnd698scn4hl6i3j5d0l51vgkf1y9q5prar0rj5n1sjd3vc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lfe-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lfe-mode";
           sha256 = "06b382ncgk4zz3q8akyzfy55j86a53r97gf0l92qvlca7fbs8jjx";
           name = "lfe-mode";
         };
@@ -32485,7 +32800,7 @@
           sha256 = "077cy2clllrvabw44wb1pzcqz97r3y92j7cb9lnhd9pix0wpcq6g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lib-requires";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lib-requires";
           sha256 = "1g22jh56z8rnq0h80wj10gs38yig1rk9xmk3kmhmm5mm6b14iwdx";
           name = "lib-requires";
         };
@@ -32506,7 +32821,7 @@
           sha256 = "039awlam3nrgkxrarcapfyc2myvc77aw7whrkcsjjybzylpzv0pr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/libmpdee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/libmpdee";
           sha256 = "0z4d8y8jlsjw20b31akkaikh5xl0c05lj77d2i1xbgzam4iixma0";
           name = "libmpdee";
         };
@@ -32527,7 +32842,7 @@
           sha256 = "11c3vmxyddx7zm8fpxmzhq2xygyijbszinfiwllgb4l738bxwljb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lice";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lice";
           sha256 = "1hv2hz3153x0gk7f2js18dbx5pyprfdf2pfxb658fj16vxpp7y6x";
           name = "lice";
         };
@@ -32548,7 +32863,7 @@
           sha256 = "04dik8z2mg6qr4d3fkd26kg29b4c5crvbnc1lfsrzyrik7ipvsi8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/light-soap-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/light-soap-theme";
           sha256 = "09p4w51d5szhi81a6a3l0r4zd4ixkrkzxldr938bcmj0qmj62iyk";
           name = "light-soap-theme";
         };
@@ -32569,7 +32884,7 @@
           sha256 = "0rkx0hk3y79rwhjqs3wvgxhg1rj83mxbqkhhm3jfawp8c1av4f40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lingr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lingr";
           sha256 = "1445bxiirsxl9kgm0j86xc9d0pbaa5f07c1i66pw2vl40bvhrjff";
           name = "lingr";
         };
@@ -32590,7 +32905,7 @@
           sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/link";
           sha256 = "17jpsg3f2954b740vyj37ikygrg5gmp0bjhbid8bh8vbz7xx9zy8";
           name = "link";
         };
@@ -32603,15 +32918,15 @@
     link-hint = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "link-hint";
-        version = "20160117.1918";
+        version = "20160128.1454";
         src = fetchFromGitHub {
           owner = "noctuid";
           repo = "link-hint.el";
-          rev = "254f0daf31026934a45c4cdbe3a8b7cb2f713e3f";
-          sha256 = "1sh1cp5q6lbmf16fvq2w0m9dhljvra6n0525jfh6kkma8hk8xdvj";
+          rev = "a34fcdfef646e3f9861fc5513e0d8ab46ef720e2";
+          sha256 = "1glwsc1a3nhw7xwqlf1pgswgnwkvfy2a6a0k0lxshdajxiayyh7d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/link-hint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/link-hint";
           sha256 = "12fb2zm9jnh92fc2nzmzmwjlhi64rhakwbh9lsydx9svsvkgcs89";
           name = "link-hint";
         };
@@ -32632,7 +32947,7 @@
           sha256 = "01yv6239z90hvncwmm9g5nh4xvyxv2ig3h4hsmxdn4kacfxvc84n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/linphone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/linphone";
           sha256 = "0q7mw1npxq24szhwswc93qz5h6magcxw63ymba7hwhif6my65zx7";
           name = "linphone";
         };
@@ -32653,7 +32968,7 @@
           sha256 = "0x0k4m7nan2klvrhyzqvgpqnw99fq805hvipnrp2j755x7sv92g5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/linum-off";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/linum-off";
           sha256 = "1yilsdsyxlzmh64dpzirzga9c7lhp1phps9cdgp2898zpnzaclay";
           name = "linum-off";
         };
@@ -32674,7 +32989,7 @@
           sha256 = "01r8vbblpqfyfafmgbcw02f371j6c2g940bwmvi54rmjf9kjd6h7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/linum-relative";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/linum-relative";
           sha256 = "0s1lc3lppazv0481dxknm6qrxhvkv0r9hw8xmdrpjc282l91whkj";
           name = "linum-relative";
         };
@@ -32695,7 +33010,7 @@
           sha256 = "1r2yhjfby4mibbr7d14m1rifchdy7bvwy50xz2wx4004zqhjmnjd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lisp-extra-font-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lisp-extra-font-lock";
           sha256 = "1xchqwhav9x7b02787ghka567fihdc14aamx92jg549c6d14qpwk";
           name = "lisp-extra-font-lock";
         };
@@ -32713,7 +33028,7 @@
           sha256 = "1m07gb3v1a7al0h4nj3914y8lqrwzi8fwb1ih66nxzn6kb0qj3mf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lispxmp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lispxmp";
           sha256 = "02gfbyng3dh2445jfkasxzjc9dlk02dafbfkjm40iwmb8h0fzji4";
           name = "lispxmp";
         };
@@ -32726,15 +33041,15 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "lispy";
-        version = "20160118.432";
+        version = "20160202.1340";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "d37884533a4ede108fcb840e7b53f9ca912b783a";
-          sha256 = "0a8jl83gc87fvq149834khqq3l6qcscv8n2np9xiqp16gpmw8q65";
+          rev = "37999ed32e2bd32f417cc84f9109795fcf1cb72a";
+          sha256 = "1ajymlhx3f2q132vzczgynwf2fyxbm8sbqcg62bpk9iii6ddxql3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lispy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lispy";
           sha256 = "12qk2gpwzz7chfz7x3wds39r4iiipvcw2rjqncir46b6zzlb1q0g";
           name = "lispy";
         };
@@ -32755,7 +33070,7 @@
           sha256 = "0n0mk01h9c3f24gzpws5xf6syrdwkq4kzs9mgwl74x9l0x904rgf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lispyscript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lispyscript-mode";
           sha256 = "02biai45l5xl2m9l1drphrlj6r01msmadhyg774ijdk1x4gm5nhr";
           name = "lispyscript-mode";
         };
@@ -32776,7 +33091,7 @@
           sha256 = "1szbs16jlxfj71986dbg0d3j5raaxcwz0xq5ar352731r5mdcqw4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-environment";
           sha256 = "1zdhrlp8vk8knjwh56pws6dyn003r6avjzvhghlkgnw9nfrdk57h";
           name = "list-environment";
         };
@@ -32797,7 +33112,7 @@
           sha256 = "02l7q5376ydz6a8i9x74bsx5bbxz8xkasmv1lzvf79d3jbg28l1s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-packages-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-packages-ext";
           sha256 = "15m4888fm5xv697y7jspghg1ra49fyrny4y2x7h8ivcbslvpglvk";
           name = "list-packages-ext";
         };
@@ -32816,7 +33131,7 @@
           sha256 = "1bssvyjgk1h1wiaxxdi2m5gjy6a790a9rwvi0r22hin7iskg300a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-processes+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-processes+";
           sha256 = "10x7hkba2bmryyl68w769fggw65dl4f3a9g0gqdzmkdj80rcipky";
           name = "list-processes-plus";
         };
@@ -32834,7 +33149,7 @@
           sha256 = "1sv1x2bc1xg7z3q4r9pbvjspj041q4zn883w9m071h7dgx8i9a6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-register";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-register";
           sha256 = "06q7q3j9qvqbp25cx9as2ckmgcz2myfvi2n34jp60v3ayhna79r4";
           name = "list-register";
         };
@@ -32855,7 +33170,7 @@
           sha256 = "05nn4db8s8h4mn3fxhwsa111ayvlq1raf6bifh7jciyw7a2c3aww";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-unicode-display";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-unicode-display";
           sha256 = "01x9i5k5vhjscmkx0l6r27w1cdp9n6xk1pdjf98z3y88dnsmyfha";
           name = "list-unicode-display";
         };
@@ -32876,7 +33191,7 @@
           sha256 = "0b6pnkhm5hnim2lpari93la08ic8qyh4nv0d7mw0cyfyk8phzzvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-utils";
           sha256 = "0bknprr4jb1d20i9lj2aa17vpg1kqwdyzzwmy1kfydnkpf5scnr3";
           name = "list-utils";
         };
@@ -32897,7 +33212,7 @@
           sha256 = "0mr0king5dj20vdycpszxnfs9ch808fhcz3q7svxfngj3d3671wd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lit-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lit-mode";
           sha256 = "05rf7ki060nqnvircn0dkpdrg7xbh7phb8bqgsab89ycc7l9vv59";
           name = "lit-mode";
         };
@@ -32918,7 +33233,7 @@
           sha256 = "1nbz119ldwjvkm3xd9m0dx820lc177frz5mn585fsd7kqdbkam99";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/litable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/litable";
           sha256 = "073yw3ivkl093xxppn5vqyh69jhfc97al505mnyn34fwdj5v8fji";
           name = "litable";
         };
@@ -32928,6 +33243,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    litecoin-ticker = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "litecoin-ticker";
+        version = "20160130.2107";
+        src = fetchFromGitHub {
+          owner = "llcc";
+          repo = "btcbox-ticker";
+          rev = "5262efce86c6e5c0822e6817d5a4d842f754ec73";
+          sha256 = "1pxcm4dxb0mggjzcv6r0a34qwq6jyih1afplysh01wk5p3nqlpyk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/litecoin-ticker";
+          sha256 = "14gak0av8wljmyq9lcf44dc2bvlfjb86filanqh0wkf2swpbdw85";
+          name = "litecoin-ticker";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/litecoin-ticker";
+          license = lib.licenses.free;
+        };
+      }) {};
     literate-coffee-mode = callPackage ({ coffee-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "literate-coffee-mode";
@@ -32939,7 +33275,7 @@
           sha256 = "1wxysnsigjw40ykdwngg0gqfaag0dx6zg029i2zx25kl3gr1lflc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/literate-coffee-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/literate-coffee-mode";
           sha256 = "1bll1y9q3kcg3v250asjvx2k9kb314qadaq1iwanwgdlp3qvvs40";
           name = "literate-coffee-mode";
         };
@@ -32960,7 +33296,7 @@
           sha256 = "1v37bii372w2g3pl09n5dcrk6y7glhpg8qiv17zsk9jy3ps2xm1b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/literate-starter-kit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/literate-starter-kit";
           sha256 = "1n2njf007fmrmsb8zrgxbz1cpxmr5nsp8w41yxa934iqc7qygkjy";
           name = "literate-starter-kit";
         };
@@ -32981,7 +33317,7 @@
           sha256 = "1j0qa96vlsqybhp0082a466qb1hd2b0621306brl9pfl5srf5jsj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/live-code-talks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/live-code-talks";
           sha256 = "173mjmxanva13vk2f3a06s4dy62x271kynsa7pbhdg4fd72hdjma";
           name = "live-code-talks";
         };
@@ -32994,15 +33330,15 @@
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "20151108.1107";
+        version = "20160204.1323";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "35dda7dadba37ffbcc14d3b0a2711ca4967f1db5";
-          sha256 = "02jvfn0g7r07kvb9m97kqa22j5nsgxbnp6r5vsq3d9qjsi459yd3";
+          rev = "5ebfc696dc4fa3812d934f8ce8f047717053feea";
+          sha256 = "1k7r1cc9hwjdid88hi4l325bwvfdclqxrkw2pm0605l3jpa9jqpy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/live-py-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/live-py-mode";
           sha256 = "0yn1a0gf9yn068xifpv8p77d917mnalc56pll800zlpsdk8ljicq";
           name = "live-py-mode";
         };
@@ -33020,7 +33356,7 @@
           sha256 = "1z9b0arn7vby4fkwzgj3ml537lh94gvf61vs03cqfkc95lv14r76";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lively";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lively";
           sha256 = "1wjd6kfnknhw9lc2p9iipaxfm9phpkqqmjw43bhc70ybsq1xaln7";
           name = "lively";
         };
@@ -33041,7 +33377,7 @@
           sha256 = "0kqjz0i0zapyhh8z57cvc8ifiizngix3ca01mjnvyq3zxg1bqrsg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/livescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/livescript-mode";
           sha256 = "1fdfhp39zr2mhy5rd6mwqv5fwd8xaypdqig7v3ksv77m5zq7cmmj";
           name = "livescript-mode";
         };
@@ -33062,7 +33398,7 @@
           sha256 = "178ldzpk8a9m9abn8xlplxn5jgcca71dpkp82bs5g7bsccp3rx6p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/livid-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/livid-mode";
           sha256 = "0jy16m6injqznx4gmxzvhys480pclw9g07z4qll2dna37177ww9d";
           name = "livid-mode";
         };
@@ -33103,7 +33439,7 @@
           sha256 = "0gvc9jy34a8wvzwjpmqhshbx2kpk6ckmdrdj5v00iya7c4afnckx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/load-theme-buffer-local";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/load-theme-buffer-local";
           sha256 = "13829yrh36qac7gpxanizlk4n7av99ngvv06y6mmi5rq06a4hjx4";
           name = "load-theme-buffer-local";
         };
@@ -33124,7 +33460,7 @@
           sha256 = "0i0ainawjvfl3qix329hx01x7rxyfin2xgpjk7y5dgmh4p3xhv94";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/loc-changes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/loc-changes";
           sha256 = "1akgij61b2ixpkchrriabwvx68cg4v5r5w9ncjrjh91hskjprfxh";
           name = "loc-changes";
         };
@@ -33134,22 +33470,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    loccur = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    loccur = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "loccur";
-        version = "20151231.646";
+        version = "20160129.1422";
         src = fetchFromGitHub {
           owner = "fourier";
           repo = "loccur";
-          rev = "61dcaaf53622ece672cc6114f3f75e5ce3544c09";
-          sha256 = "1hl9f3kb8v07ks0qx7361y306739r5gcadp8l3m72mnlfx4vlsz1";
+          rev = "fb1fbc0ff5da7a8b117542ab8083d29cd79e12b2";
+          sha256 = "1npz90zf91wqf35bqd3zmkh0b538i69w8ygc78x5w2x5005aqr0p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/loccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/loccur";
           sha256 = "06pv2i05yzjzal4q21krbnp9rp4bsainxcwvpc98020vsmms0z8h";
           name = "loccur";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "http://melpa.org/#/loccur";
           license = lib.licenses.free;
@@ -33166,7 +33502,7 @@
           sha256 = "1cdnm270kzixa0kpis0xw2ybkw8lqh7kykc7blxkxjrr9yjvbawl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lodgeit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lodgeit";
           sha256 = "1ax2w5yxscycjz90g4jdbhd64g9sipzxpfjs7gq3na77s5dcjzsq";
           name = "lodgeit";
         };
@@ -33187,7 +33523,7 @@
           sha256 = "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/log4e";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/log4e";
           sha256 = "1klj59dv8k4r0hily489dp12ra5hq1jnsdc0wcakh6zirmakhs34";
           name = "log4e";
         };
@@ -33197,19 +33533,18 @@
           license = lib.licenses.free;
         };
       }) {};
-    log4j-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    log4j-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "log4j-mode";
-        version = "20101016.1022";
-        src = fetchFromGitHub {
-          owner = "emacsorphanage";
-          repo = "log4j-mode";
-          rev = "ec3de92cfe60dd3d0de613e9062476196dea0faf";
-          sha256 = "14dmmjdmcc0zag8i947n59ihjc2df2l44f7issf66767ym3839kk";
+        version = "20160108.1318";
+        src = fetchgit {
+          url = "git://git.code.sf.net/p/log4j-mode/code";
+          rev = "26171b1e723502055e085393b0ecdcb6db406010";
+          sha256 = "c552abe449a7288210e8490070dc58e037d7d9571633d316dc6b91799119a697";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/log4j-mode";
-          sha256 = "0axr0x8mdxif0xbvs83mxc3gqgs84jb4b9la9n62i3lldckghwmg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/log4j-mode";
+          sha256 = "06lam4iqxlbl9ib2n2db2nj6jbjzrw2ak8r99n6w4s3fny1q3yxx";
           name = "log4j-mode";
         };
         packageRequires = [];
@@ -33229,7 +33564,7 @@
           sha256 = "0lj3i9i3mg17xws13gzx8myc6d7djgsj47yx4kaq5hycgkni1p7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/logalimacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/logalimacs";
           sha256 = "0ai7a01bdi3a0amgi63pwgdp8wgcgx10an4nhc627wgb1cqxb7p6";
           name = "logalimacs";
         };
@@ -33250,7 +33585,7 @@
           sha256 = "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/logito";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/logito";
           sha256 = "0bk4qnz66kvhzsk88lw45209778y53kg17iih70ix4ma1x6a3v5l";
           name = "logito";
         };
@@ -33271,7 +33606,7 @@
           sha256 = "05px3zc3is7k2jmh7mal0al5zx5cqvn1bzmhgqq02pp6lwsx5xqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/logstash-conf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/logstash-conf";
           sha256 = "03i2ilphf3fdjag7m9z5gi23n6ik36qn42mzc22432m4y3c7iksh";
           name = "logstash-conf";
         };
@@ -33292,7 +33627,7 @@
           sha256 = "1wglgjf45rl4rl5zp1p1z318p2d1hy1w77m65wwg35v6pkl1mikr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/logview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/logview";
           sha256 = "0gks3j5avx8k3427a36lv7gr95id3cylaamgn5qwbg14s54y0vsh";
           name = "logview";
         };
@@ -33313,7 +33648,7 @@
           sha256 = "0pyfgywmmnlz1arvdxwyw96gr6xcg2sp3bqjli8xfcl8i0nww4kb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lolcode-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lolcode-mode";
           sha256 = "0dxdqr3z5bw0vcfxhhhc1499vrfk1xqwxshr0kvlhdalpf59rqiw";
           name = "lolcode-mode";
         };
@@ -33334,7 +33669,7 @@
           sha256 = "0w9pbjcp4d2w3qb3nnyzq2d0d9f0pgz5lyzapidxa9z1xcj51ccj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/look-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/look-dired";
           sha256 = "0dddx5nxr519wqdgrbglh0pqjl3alg4ddmank42g4llzycy61wsd";
           name = "look-dired";
         };
@@ -33352,7 +33687,7 @@
           sha256 = "0sl6hqggi6qn2qp9khw11qp5hamngwxrrwx98k3pwpj9kgicdpgp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/look-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/look-mode";
           sha256 = "0y3wjfjx0g5jclmv9m3vimv7zd18pk5im7smr41qk09hswi63yqj";
           name = "look-mode";
         };
@@ -33373,7 +33708,7 @@
           sha256 = "1wmd7s3dk9krgmhs4f92mig18vx6y551n45ai7cvj92f4fbrsd08";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/loop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/loop";
           sha256 = "0pav16kinzljmzx84vfz63fvi39af4628vk1jw79jk0pyg9rjbar";
           name = "loop";
         };
@@ -33394,7 +33729,7 @@
           sha256 = "0grzl4kqpc1x6569yfh9xdzzbgmhcskxwk6f7scjpl32acr88cmx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lorem-ipsum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lorem-ipsum";
           sha256 = "0p62yifbrknjn8z0613wy2aaknj44liyrgbknhpa0qn0d4fcrp4h";
           name = "lorem-ipsum";
         };
@@ -33415,7 +33750,7 @@
           sha256 = "179r4pz3hlb5p6bjfhdikkx1zvh09ln5dbw3c3rmlyww1q7v26yl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/love-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/love-minor-mode";
           sha256 = "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m";
           name = "love-minor-mode";
         };
@@ -33436,7 +33771,7 @@
           sha256 = "1psk4202rmkkfy1ir1ax4x4djfngd5pfry7x30ybq2ifqzymb9qb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lua-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lua-mode";
           sha256 = "0gyi7w2h192h3pmrhq39lxwlwd9qyqs303lnp2655pikdzk9js94";
           name = "lua-mode";
         };
@@ -33457,7 +33792,7 @@
           sha256 = "0mv73s89n59m44szc37086wq55py5sx0lc0jxncfybawhsqyd0ar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lush-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lush-theme";
           sha256 = "03kqws8dzm0ay5k86f4v7g2g2ygwk4fzmz2vyzhzhbsj8hrniq9p";
           name = "lush-theme";
         };
@@ -33478,7 +33813,7 @@
           sha256 = "1r1xfn0dyc4m49064g9n6hpwn4r763kpbg3dgprsv30i5ska61qa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lusty-explorer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lusty-explorer";
           sha256 = "0xqanmmkyvzcg2g4zvascq5j004bqz7vmz1a19c25g9cs3rdh0ps";
           name = "lusty-explorer";
         };
@@ -33499,7 +33834,7 @@
           sha256 = "090gk0il4yyypzjbh2qrjdaldwf90fi30impmh4zcfl73bic5q9q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lxc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lxc";
           sha256 = "1rv1ybmbjx7n3cavx21nzmvckw63q3jmjsfdr2pcgavrr2ck6lka";
           name = "lxc";
         };
@@ -33512,15 +33847,15 @@
     m-buffer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "m-buffer";
-        version = "20160104.237";
+        version = "20160125.1503";
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "m-buffer-el";
-          rev = "1ff021c5f6c74b092dc1aad28d28af1b5e060f76";
-          sha256 = "01847f8xmjfxvvi7hf73l7ypkdazwg8ciinm117zp4jkgnv0apz0";
+          rev = "cf99d4209a3422cabe13420dd9b2cbfbb63f7bea";
+          sha256 = "1rrfvshl6zbsrswg5hrvq1p0rd9vacqwbr4s44kln7vg4ybcgr24";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/m-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/m-buffer";
           sha256 = "0l2rayglv48pcwnr1ggmn8c0az0mffgv02ivnzr9jcfs55ki07fc";
           name = "m-buffer";
         };
@@ -33541,7 +33876,7 @@
           sha256 = "119c77s3qp1vqc5m2yf7m4s81aphkhsvsnwqmpq6xl08r3592zxz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/macro-math";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/macro-math";
           sha256 = "1r7splwq5kdrdhbmw5zn81vxymsrllgil48g8dl0r60293384h00";
           name = "macro-math";
         };
@@ -33559,7 +33894,7 @@
           sha256 = "07iw9iarz6z9n6vnhqqljfjpvq6vb97ca2hwj9v0k5k8mafdqg7d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/macros+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/macros+";
           sha256 = "0aihszxsjnc93pbbkmkr1iwzvii3jw8yh1f6dpnjykgvb328pvqi";
           name = "macros-plus";
         };
@@ -33580,7 +33915,7 @@
           sha256 = "0j95lv4b01p8a5fpxnj5qs2ajg1yxnsg97vw3184dfy9r5hy7ryb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/macrostep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/macrostep";
           sha256 = "1wjibxbdsp5qfhq8xy0mcf3ms0q74qhdrhqndprn6jh3kcn5q63c";
           name = "macrostep";
         };
@@ -33601,7 +33936,7 @@
           sha256 = "1flamyk7z3r723cczqra0f4yabc6kmgwjaw2bvs3kisppqmmz72g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mag-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mag-menu";
           sha256 = "1r1yisjnqxl9llpf91rwqp4q47jc4qp32xnkl8wzsgr0r2qf5yk2";
           name = "mag-menu";
         };
@@ -33614,15 +33949,15 @@
     magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "magic-filetype";
-        version = "20151224.715";
+        version = "20160120.704";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "magic-filetype.el";
-          rev = "bffe69c70565c534bcc245cfdc2781d85e4edb68";
-          sha256 = "1ycqhmi18yjniw6w258rhxcc70ngq51vjlafx0bcs1aw1px97z5s";
+          rev = "db734bdd7aa429e188a628e772c40542b0216d5c";
+          sha256 = "0i38942lr4b7d624313hgydyy0ynmd6psjkz8xcvbb7gw0kcc436";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magic-filetype";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magic-filetype";
           sha256 = "0gcys45cqn5ghppkn0rmyvfybprlfz1x6hqr21yv93mf79h75zhg";
           name = "magic-filetype";
         };
@@ -33635,15 +33970,15 @@
     magic-latex-buffer = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magic-latex-buffer";
-        version = "20151230.116";
+        version = "20160121.952";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "magic-latex-buffer";
-          rev = "db01f00780cba71a18bd442332efc599450d5fec";
-          sha256 = "1nvfvyvangpyg5k56x4zrsnh43ffiqbbsibny33zy6idkc145fy0";
+          rev = "60e680c36fe8e1621a675f1407b901f617dc7cc8";
+          sha256 = "1vq709sw4lxydqxzf42yrw9alzr44hk18am4074znwb5vnnrg5sn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magic-latex-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magic-latex-buffer";
           sha256 = "0xm4vk4aggyfw96cgya5cp97jzx5ha0xwpf2yfh7c3m8d9cca4y8";
           name = "magic-latex-buffer";
         };
@@ -33656,16 +33991,16 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20160117.2329";
+        version = "20160202.2338";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "45b06a7b8664046fd1aecb3f07db535edd80d013";
-          sha256 = "1c6x10nm5syahn85vrgg9i6i7kzy4h7l9alahaxb71w6jwf91rsg";
+          rev = "08d0d095c7c16fb8223d3beeea232412f88936f5";
+          sha256 = "08h1lypdvgv0rkq1sjkmw9zwvbjwvpklzjyawb5chgfa5grgfiii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit";
-          sha256 = "099i9h375yfhcylz8mvsm45mkkiyyhx0s1q3icba5n875jvq7smz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit";
+          sha256 = "0518ax2y7y2ji4jp7yghy84yxm0zgb059aqfa4v17grm4kr8p16q";
           name = "magit";
         };
         packageRequires = [
@@ -33692,7 +34027,7 @@
           sha256 = "1h1i8712w0pn6bhc5lpps7ri7bf6f3vy23i6qld13hdgvimgisd9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-annex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-annex";
           sha256 = "1ri58s1ly416ksmb7mql6vnmx7hq59lmhi7qijknjarw7qs3bqys";
           name = "magit-annex";
         };
@@ -33713,7 +34048,7 @@
           sha256 = "0nkxxhxkhy314jv1l3hza84vigl8q7fc8hjjvrx58gfgsfgifx6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-filenotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-filenotify";
           sha256 = "00a77czdi24n3zkx6jwaj2asablzpxq16iqd8s84kkqxcfiiahn7";
           name = "magit-filenotify";
         };
@@ -33734,7 +34069,7 @@
           sha256 = "1j3jsrp0qpaa2xd98d1g9z0zc4b93knwajrlnlsc7l6g0vlfsddb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-find-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-find-file";
           sha256 = "1d5flydyhwhvhlhi541zcnz2b03bi07zrp21bfz5sm069bf2c96b";
           name = "magit-find-file";
         };
@@ -33747,15 +34082,15 @@
     magit-gerrit = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-gerrit";
-        version = "20160111.2048";
+        version = "20160128.2126";
         src = fetchFromGitHub {
           owner = "terranpro";
           repo = "magit-gerrit";
-          rev = "ce265149870d4e80fb2d9b80aa380a8c05686c65";
-          sha256 = "1qwcgd6lw0bfzyhzk7vkdrvnxshck0l7rp9lgg9g0jnhf0aqlfri";
+          rev = "04fc4b7ad7366db9559618ace1a61a4e571dde66";
+          sha256 = "0f8bcrvnffpcfxgxwp3rvrd4m0apdc7k93952l4v1mqc762lql1s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-gerrit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-gerrit";
           sha256 = "1iwvg10ly6dlf8llz9f8d4qfdbvd3s28wf48qgn1wjlxpka6zrd4";
           name = "magit-gerrit";
         };
@@ -33776,7 +34111,7 @@
           sha256 = "03m4gr86lm8rs3zn6hdirlgfixf1w033iyhsg9dwlhvmfpfghxb5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-gh-pulls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-gh-pulls";
           sha256 = "0qn9vjxi33pya9s8v3g95scmhwrn2yf5pjm7d24frq766wigjv8d";
           name = "magit-gh-pulls";
         };
@@ -33797,7 +34132,7 @@
           sha256 = "10c1qd1l92h0z7mz7j004bx3fc9p6ij3m732lwmni9vlfbishbb4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-gitflow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-gitflow";
           sha256 = "0wsqq3xpqqfak4aqwsh5sxjb1m62z3z0ysgdmnrch3qsh480r8vf";
           name = "magit-gitflow";
         };
@@ -33810,15 +34145,15 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "20160117.1713";
+        version = "20160130.849";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "45b06a7b8664046fd1aecb3f07db535edd80d013";
-          sha256 = "1c6x10nm5syahn85vrgg9i6i7kzy4h7l9alahaxb71w6jwf91rsg";
+          rev = "08d0d095c7c16fb8223d3beeea232412f88936f5";
+          sha256 = "08h1lypdvgv0rkq1sjkmw9zwvbjwvpklzjyawb5chgfa5grgfiii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-popup";
           sha256 = "0w6m384bbmp3bd4qbss5h1jvcfp4qnpqvzlfykhdgjwpv2b2a2fj";
           name = "magit-popup";
         };
@@ -33839,7 +34174,7 @@
           sha256 = "1pqbrrp4366kwfk1d32h2lb70id32ynfc03i7m2832w97f1xp16c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-rockstar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-rockstar";
           sha256 = "1i4fmraiypyd3q6vvibkg9xqfxiq83kcz64b1dr3wmwn30j7986n";
           name = "magit-rockstar";
         };
@@ -33860,7 +34195,7 @@
           sha256 = "0gb7wpwdhar2a81shd3c5s85ywv8vvjqykpc4py06ybjk8qpspcw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-stgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-stgit";
           sha256 = "12wg1ig2jzy2np76brpwxdix9pwv75chviq3c24qyv4y80pd11sv";
           name = "magit-stgit";
         };
@@ -33881,7 +34216,7 @@
           sha256 = "0r3nkrisyjawjwbm74yi6fqiwcqzlfkypsdscfhii0q50ky8plph";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-svn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-svn";
           sha256 = "02n732z06f0bhxqkxzlvm36bpqr40pas09zbzpfdk4pb6f9f80s0";
           name = "magit-svn";
         };
@@ -33902,7 +34237,7 @@
           sha256 = "0dj183vphnvz9k2amga0ydcb4gkjxr28qz67055mxrf89q1qjq33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-topgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-topgit";
           sha256 = "1ngrgf40n1g6ncd5nqgr0zgxwlkmv9k4fik96dgzysgwincx683i";
           name = "magit-topgit";
         };
@@ -33923,7 +34258,7 @@
           sha256 = "0alcdr84g2gvvshpa3cws87n47n5shcryzbj947nsbicmp7f9k8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magma-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magma-mode";
           sha256 = "1gq6yi51h1h7ivrm1xr6nfrpabx8ylbk0waaw04gnw3bb54dmmvc";
           name = "magma-mode";
         };
@@ -33944,7 +34279,7 @@
           sha256 = "1hqz26zm4bdz5wavna4j9yia3ns4z19dnszl7k0lcpgbgmb0wh8y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magnatune";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magnatune";
           sha256 = "0fmxlrq5ls6fpbk5fv67aan8gg1c61i1chfw5lhf496pwqzq901d";
           name = "magnatune";
         };
@@ -33965,7 +34300,7 @@
           sha256 = "06sjwl0bk648wnnrmyh6qgnlqmxypjmy0gkfl6kpv01r8vh7x2q5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/main-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/main-line";
           sha256 = "0c9c5kmixvhk9il8hsxzf2k14fggb9b9mw59g8q3hgpn5g7kgpkv";
           name = "main-line";
         };
@@ -33978,15 +34313,15 @@
     majapahit-theme = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "majapahit-theme";
-        version = "20160118.1010";
+        version = "20160203.829";
         src = fetchFromGitLab {
           owner = "franksn";
           repo = "majapahit-theme";
-          rev = "97b45223cf59b2ab56dcd06cea078b3ce2a0a328";
-          sha256 = "11dqlvazga7sisx4nbhwzz4525g43k1sbx5pcjwdamwy93bli0fz";
+          rev = "ccb069c3dc632e27e416716aaf705c1a215ead70";
+          sha256 = "1wwc9byjihpdm08a0c0mzbw2r55lhr7c4k0gbcl05hygphymwng7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/majapahit-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/majapahit-theme";
           sha256 = "04k2smrya27rrjlzvnl3a6llg8vj8x4mm9qyk4kwrmckhd6jd68s";
           name = "majapahit-theme";
         };
@@ -34007,7 +34342,7 @@
           sha256 = "1ky3scyjb69wi76xg6a8qx4ja6lr6mk530bv5gmhj7fxbq8b3x5c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/make-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/make-color";
           sha256 = "0mrv8b67lpid5m8rfbhcik76bvnjlw4xmcrd2c2iinyl02y07r5k";
           name = "make-color";
         };
@@ -34028,7 +34363,7 @@
           sha256 = "00j5n9pil1qik4mrzvam4rp6213w8jm4qw7c4z8sxpq57xa0b679";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/make-it-so";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/make-it-so";
           sha256 = "0a8abz54mb60mfr0bl9ry8yawq99vx9hjl4fm2sivns58qjgfy73";
           name = "make-it-so";
         };
@@ -34049,7 +34384,7 @@
           sha256 = "0w3kar52yf8clf9801c4jzfrixi10clc8fs8ni2d4pzhdwwca2zw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/maker-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/maker-mode";
           sha256 = "03q09jxmhwqy7g09navj08z9ir0rbh7w26c1av7hwhmq4i6xwg8a";
           name = "maker-mode";
         };
@@ -34070,7 +34405,7 @@
           sha256 = "1rr7vpm3xxzcaam3m8xni3ajy8ycyljix07n2jzczayri9sd8csy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/makey";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/makey";
           sha256 = "06xgrlkqvg288yd4lyhx4vi80jlfarhblxk5m5zzs5as7n08cvk4";
           name = "makey";
         };
@@ -34091,7 +34426,7 @@
           sha256 = "0hlxs9gi2vml2id9q0r1r0xdm0zshjzc1w3phjf2ab0aa3hl5k6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/malabar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/malabar-mode";
           sha256 = "026ing7v22rz1pfzs2j9z09pm6dajpys992n45gzhwirz5f0q1rk";
           name = "malabar-mode";
         };
@@ -34112,7 +34447,7 @@
           sha256 = "1a22xkhnmpfffllarsjdw10n5cd3nwifcl1iv98kb4j4x96kd4xg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/malinka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/malinka";
           sha256 = "1245mpxsxwnnpdsf0pd28mddgdfhh7x32a2l3sxfq0dyg2xlgvrp";
           name = "malinka";
         };
@@ -34133,7 +34468,7 @@
           sha256 = "18x3cssfn81k8hg4frj7dhzphg784321z51wbbvn3bjhq7s6j3a2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mallard-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mallard-mode";
           sha256 = "0y2ikjgy107kb85pz50vv7ywslqgbrrkcfsrd8gsk1jky4qn8izd";
           name = "mallard-mode";
         };
@@ -34154,7 +34489,7 @@
           sha256 = "0qk7i47nmyp4llwp6x0i1i5dk82ck26iyz1sjvvlihaw8a5akny2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mallard-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mallard-snippets";
           sha256 = "0437qd7q9i32pmhxaz3vi2dnfpj4nddmzgnqpwsgl28slhjw2hv8";
           name = "mallard-snippets";
         };
@@ -34175,7 +34510,7 @@
           sha256 = "1lfq4hsq2n33l58ja5kzy6bwk9jxbcdsg6y8gqlk71lcslzqldrk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/man-commands";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/man-commands";
           sha256 = "1yl7y0k24gydldfs406v1n523q46m9x6in6pgljgjnjravc67wnq";
           name = "man-commands";
         };
@@ -34196,7 +34531,7 @@
           sha256 = "10wl7kc76dyijrmdlcl5cx821jg7clsj35r22955mbbgh7zl1x07";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/manage-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/manage-minor-mode";
           sha256 = "11jdj8kd401q0y8bbyyn72f27f51bckqid10dnh64z8w7hv59cw6";
           name = "manage-minor-mode";
         };
@@ -34209,15 +34544,15 @@
     mandoku = callPackage ({ fetchFromGitHub, fetchurl, git, github-clone, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "mandoku";
-        version = "20160116.2051";
+        version = "20160126.2226";
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "04bc90d764be19f8f22507e0c2d64f7ad2f1d8db";
-          sha256 = "1yddr220y2digfsfz6d1sx5d1m5xwsipl3xpfy2hzxm8mldkaa6c";
+          rev = "1f31c150443e19d99c16f95e258536b1d0bc2fc1";
+          sha256 = "08c31h2nan5ikjh171j63xbbznfc1bg6qay1ijx26r5f0c3n6b9k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mandoku";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mandoku";
           sha256 = "1pg7ir3y6yk92kfs5agbxapcxf7gy60m353rjv8g3kfkx5zyh3mv";
           name = "mandoku";
         };
@@ -34238,7 +34573,7 @@
           sha256 = "0pd6bh7wrrh59blp86a2jl2vi4qkzx49z0hy7dkc71ccg0wjsgz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/map-progress";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/map-progress";
           sha256 = "0zc5vii72gbfwbb35w8m30c8r9zck971hwgcn1a4wjczgn4vkln7";
           name = "map-progress";
         };
@@ -34259,7 +34594,7 @@
           sha256 = "0kk1sk3cr4dbmgq4wzml8kdf14dn9jbyq4bwmvk0i7dic9vwn21c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/map-regexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/map-regexp";
           sha256 = "0yiif0033lhaqggywzfizfia3siggwcz7yv4z7przhnr04akdmbj";
           name = "map-regexp";
         };
@@ -34280,7 +34615,7 @@
           sha256 = "0y4b69r2l6kvh7g8f1y9v1pdall3n668ci24lp04lcms6rxcrsnh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/marcopolo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/marcopolo";
           sha256 = "1nbck1m7lhync7n474578d2g1zc72c841hi236xjbdd2lnxz3zz0";
           name = "marcopolo";
         };
@@ -34301,7 +34636,7 @@
           sha256 = "1x3anvy3hlmydxyfzr1rhaiy502yi1yz3v54sg8wc1w7jrvwaj29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mark-multiple";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mark-multiple";
           sha256 = "179wd9g0smm76k92n7j2vgg8gz5wn9lczrns5ggq2yhbc77j0gn4";
           name = "mark-multiple";
         };
@@ -34322,7 +34657,7 @@
           sha256 = "0k4zvbs09mkr8vdffv18s55rn9cyxldzav9vw04lm7v296k94ivz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mark-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mark-tools";
           sha256 = "1688y7lnzhwdva2ildjabzi10i87klfsgvs947i7gfgxl7jwhisq";
           name = "mark-tools";
         };
@@ -34335,14 +34670,14 @@
     markdown-mode = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
-        version = "20160118.700";
+        version = "20160121.728";
         src = fetchgit {
           url = "git://jblevins.org/git/markdown-mode.git";
-          rev = "7b68cd4e8cfbc86141763ee96a5c3e989afc1984";
-          sha256 = "e8abcd04d12977df22ba14fe38deca8c115c777d006fb5f9f37282f29c23ece0";
+          rev = "846a2d0db5f6ce71af9a67a793bfd89e751825fe";
+          sha256 = "9ebb4e9fde3364042a64842a62f7e9b7dc5bfefabc1387b2f6b9e9237596b104";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-mode";
           sha256 = "02lmhihv495drv9cb40h6l0xsbx7yglbvsdzc4r0vf78j87rs33f";
           name = "markdown-mode";
         };
@@ -34363,7 +34698,7 @@
           sha256 = "1adl36fj506kgfw40gpagzsd7aypfdvy60141raggd5844i6y96r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-mode+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-mode+";
           sha256 = "1535kcj9nmcgmk2448jxc0jmnqy7f50cw2ngffjq5w8bfhgf7q00";
           name = "markdown-mode-plus";
         };
@@ -34384,7 +34719,7 @@
           sha256 = "1i5gr3j9dq41p2zl4bfyvzv6i5z7hgrxzrycmbdc3s7nja36k9z4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-preview-eww";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-preview-eww";
           sha256 = "0j6924f84is41dspib68y5lnz1f8nm7pqyhv47alxra50cjrpxnx";
           name = "markdown-preview-eww";
         };
@@ -34405,7 +34740,7 @@
           sha256 = "10h5zh03c3v0c6pqcxvlns6l70k2l916nqvza53ikjpldmc4mln2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-preview-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-preview-mode";
           sha256 = "0i0mld45d8y96nkqn2r77nvbyw6wgsf8r54d3c2jrv04mnaxs7pg";
           name = "markdown-preview-mode";
         };
@@ -34426,7 +34761,7 @@
           sha256 = "1s5sasp8z9s1pfq7nww221lb427qblryilx0h5y7bg4z2ay9yr03";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-toc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-toc";
           sha256 = "0slky735yzmbfi4ld264vw64b4a4nllhywp19ya0sljbsfycbihv";
           name = "markdown-toc";
         };
@@ -34447,7 +34782,7 @@
           sha256 = "1i95b15mvkkki2iq8hysdr7jr1d5nix9jjkh7jz0alvaybqlsnqi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markup";
           sha256 = "0yw4b42nc2n7nanqvj596hwjf0p4qc7x6g2d9g5cwi7975iak8pf";
           name = "markup";
         };
@@ -34468,7 +34803,7 @@
           sha256 = "1w6i1m7xdr9cijnmdj35cl99r12vl83qws0qlfhrgvisilshnr27";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markup-faces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markup-faces";
           sha256 = "12z92j9f0mpn7w2qkiwg54wh743q3inx56q3f8qcpfzyks546grq";
           name = "markup-faces";
         };
@@ -34489,7 +34824,7 @@
           sha256 = "1ygznmqb3fqy94p8qi71i223m7cpw3f596pkls2ybjlbpb4psjcl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/marmalade";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/marmalade";
           sha256 = "0ppa2s1fma1lc01byanfxpxfrjqk2snxbsmdbkcipjdi5dpb0a9s";
           name = "marmalade";
         };
@@ -34510,7 +34845,7 @@
           sha256 = "017k109nfif5mzkj547py8pdnzlr4sxb74yqqsl944znflq67blr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/marmalade-client";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/marmalade-client";
           sha256 = "0llwqwwxrf7qdkpdb03ij0iinll0vc9qr557zyr3bn5zb4fad1sq";
           name = "marmalade-client";
         };
@@ -34531,7 +34866,7 @@
           sha256 = "0fwhhzfd6vgpaf5mrw90hvm35j2kzhk9h3gbrwd7y7q08nrmsx9p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/marshal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/marshal";
           sha256 = "17ikd8f1k42f28d4v5dn83zb44bsx7g336db60q068w6z8d4jbgl";
           name = "marshal";
         };
@@ -34544,15 +34879,15 @@
     material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "material-theme";
-        version = "20160118.1237";
+        version = "20160120.303";
         src = fetchFromGitHub {
           owner = "cpaulik";
           repo = "emacs-material-theme";
-          rev = "35ad0e9f2e8c52c738b1fc2bf3eb6910402c87e3";
-          sha256 = "0n3gc90cgqbdcfml5zhvlpkfxczb0xhgxqxgd1ghcyxgsfzafbqh";
+          rev = "204abe37742a52eaf2775279d56e38bf163b2327";
+          sha256 = "0627kpc03hwa489d6bsfls8jc67f31m4m167748g12w07rswb7ba";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/material-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/material-theme";
           sha256 = "1d259avldc5fq121xrqv53h8s4f4bp6b89nz2rvjhygz7f8hargq";
           name = "material-theme";
         };
@@ -34573,7 +34908,7 @@
           sha256 = "186gb83y3g1q7d0sdrxqz22nr62qq6fy7m74qwirlsf7vnnm4gpx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/math-symbol-lists";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/math-symbol-lists";
           sha256 = "01j11k29acj0b1pcapmgi2d2s3p50bkms21i2qcj0cbqgz8h6s27";
           name = "math-symbol-lists";
         };
@@ -34594,7 +34929,7 @@
           sha256 = "1chyxi096krjbi9zgbrnrkvwgmn4wygnia9m57m0jh4arlbm28la";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/math-symbols";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/math-symbols";
           sha256 = "0sx9cgyk56npjd6z78y9cldbvjl5ipl7k1nc1sylg1iggkbwxnqx";
           name = "math-symbols";
         };
@@ -34614,7 +34949,7 @@
           sha256 = "694652e361b9d15a3f1542d45b43c6516f20030dbaa8a058b5fdb4c833885465";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/matlab-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/matlab-mode";
           sha256 = "06s7mrbfbkk6baf8j1vc26nb2bg3ma1n7d297zqz8ay90cv81y76";
           name = "matlab-mode";
         };
@@ -34627,14 +34962,14 @@
     matrix-client = callPackage ({ fetchgit, fetchurl, json ? null, lib, melpaBuild, request }:
     melpaBuild {
         pname = "matrix-client";
-        version = "20160116.2145";
+        version = "20160118.1725";
         src = fetchgit {
           url = "git://fort.kickass.systems/personal/rrix/pub/matrix.el";
-          rev = "7ee66597688fb3b664d0544a6c53f91d5ca5303d";
-          sha256 = "08d15d06b7b18c7b00cb02dc4107b38a40898ea52b8353084d9e1ebc8c2da322";
+          rev = "421ad8ebf3858acc99634a4cca442c57ca2b3707";
+          sha256 = "34e1f7bd0c4ab21b2b0ca6d2a6ba83c9a1a5591e9de9ceb1c5f8fe06a4738acb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/matrix-client";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/matrix-client";
           sha256 = "09mgxk0xngw8j46vz6f5nwkb01iq96bf9m51w2q61wxivypnsyr6";
           name = "matrix-client";
         };
@@ -34654,7 +34989,7 @@
           sha256 = "06k07qvhm2mbqasn72649lx3pwzb0r466854a18g6lciwhiww7vy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/maude-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/maude-mode";
           sha256 = "04b6q328hj0w33z4c50nqyark0pn5sqi0s8096m9di4rjwxaw0ma";
           name = "maude-mode";
         };
@@ -34675,7 +35010,7 @@
           sha256 = "1xn2yyr8mr90cynbxgv0h5v180pzf0ydnjr9spg34mrdicqlki6c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/maven-test-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/maven-test-mode";
           sha256 = "1k9w51rh003p67yalzq1w8am40nnr2khyyb5y4bwxgpms8z391fm";
           name = "maven-test-mode";
         };
@@ -34696,7 +35031,7 @@
           sha256 = "0g9kpsg6623nmxnshj49q8k952xybrkmqqy6m892m8wnm22pjdz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/maxframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/maxframe";
           sha256 = "10cwy3gi3xb3pfdh6xiafxp3vvssawci3y26jda6550d0w5vardj";
           name = "maxframe";
         };
@@ -34714,7 +35049,7 @@
           sha256 = "0w8clp96jblsc9v87404zpc280ms0d644in34jdgjc5r33f4i0g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mb-depth+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mb-depth+";
           sha256 = "031hh227rh7l818p3di4h34i4698yynw5g9a5sl2hj47c0734q6w";
           name = "mb-depth-plus";
         };
@@ -34735,7 +35070,7 @@
           sha256 = "1qd4vya49sy7iwcpnyd91d0zx3niwsavhdcq6387rsb0j64hwybl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mb-url";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mb-url";
           sha256 = "1nf8ssan00qsn3d4dc6h6qzdwqzh977qb5d2m33kiwi6qb98988h";
           name = "mb-url";
         };
@@ -34756,7 +35091,7 @@
           sha256 = "1zywygdgnp2zr8fxqhl0cbrgbl43931k936b9imhqi96p6622pb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mbe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mbe";
           sha256 = "0h18mbcjy8nh4gl12kg2v8x6ps320yk7sbgq5alqnx2shp80kri3";
           name = "mbe";
         };
@@ -34777,7 +35112,7 @@
           sha256 = "1vr85fdlb4zwgid1v00ndppla9fqqk25g2x2f5alm69pfqssr75z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mbo70s-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mbo70s-theme";
           sha256 = "1abx2rw09xxp122ff7i9sry5djd4l6vn4lfzxs92rknjzkyc40pb";
           name = "mbo70s-theme";
         };
@@ -34798,7 +35133,7 @@
           sha256 = "0252wdq4sd6jhzfy0pn3gdm6aq2h13nnp8hvrn1mpml9x473a5n1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mc-extras";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mc-extras";
           sha256 = "0b110x6ygc95v5pb9lk1i731x5s6dagl5afzv37l1qchys36xrym";
           name = "mc-extras";
         };
@@ -34819,7 +35154,7 @@
           sha256 = "1j8gp3byanf1mq8sc4hv838rgcywlv35d8q1vjwzsjaznvz8hvc3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/md-readme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/md-readme";
           sha256 = "1krq0f79jjrlihr2aqq87pxdqixv2zdjw4hm732sz79g996yxyw3";
           name = "md-readme";
         };
@@ -34840,7 +35175,7 @@
           sha256 = "136lh39hakwx46rd1gsmsfhsj78mrpamid766v2vjx9rkkprk0zv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/meacupla-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/meacupla-theme";
           sha256 = "09q88q2xghj5vn5y3mjrcparfwdzavkgjyg2ay55h7wf5f2zpw2d";
           name = "meacupla-theme";
         };
@@ -34853,15 +35188,15 @@
     mediawiki = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mediawiki";
-        version = "20150711.1934";
+        version = "20160123.2037";
         src = fetchFromGitHub {
           owner = "hexmode";
           repo = "mediawiki-el";
-          rev = "47875f753599e309f1c3da5beb4805487ab75636";
-          sha256 = "1cdr5p9x9bxnfy9mgz7l70zfzfwcjdhydw0jhdvs6qlqaqmm4qqq";
+          rev = "e5e2905f1f81228c34f7ce531246bbdc07c5122c";
+          sha256 = "0f0p6ppgj1w0gfyja9hbah6wsw7glx9ybpbs6kn7lwm0ir9rd33s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mediawiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mediawiki";
           sha256 = "17cbrzfdp6jbbf74mn2fi1cwv7d1hvdbw9j84p43jzscnaa5ikx6";
           name = "mediawiki";
         };
@@ -34882,7 +35217,7 @@
           sha256 = "0bilwhvprzk634sk5hnxilrvrl0yv593swzznch0p38hqxl585ld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mellow-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mellow-theme";
           sha256 = "0kl1psykx7akxwabszk4amszh3zil8ia4bfbjjvr6h9phgx66pb0";
           name = "mellow-theme";
         };
@@ -34903,7 +35238,7 @@
           sha256 = "12cp56ppmwpdgf5afx7hd2qb8d1qq8z27191fbbf5zqw8cq5zkpd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/melpa-upstream-visit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/melpa-upstream-visit";
           sha256 = "0j4afy9ipzr7pwkij8ab207mabd7srganlyyif9h1hvclj9svdmf";
           name = "melpa-upstream-visit";
         };
@@ -34924,7 +35259,7 @@
           sha256 = "0pjqax3pi6pb650yb8iwa4brwwl6cdka7jym3cfkpppyy782dm0q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/memento";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/memento";
           sha256 = "0f8ajhj677r2kxszmad6h1j1b827ja0vaz2my1vx145y3gf160b8";
           name = "memento";
         };
@@ -34945,7 +35280,7 @@
           sha256 = "0fjwlrdm270qcrqffvarw5yhijk656q4lam79ybhaznzj0dq3xpw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/memoize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/memoize";
           sha256 = "0mzz3hghnbkmxf9wgjqv3sbyxyqqzvvscazq9ybb0b41qrzm73s6";
           name = "memoize";
         };
@@ -34966,7 +35301,7 @@
           sha256 = "1jd4rjv812iv7kp4wyxdz8sk7j0442m8x2ypk6hiqis0braxnspm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/memolist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/memolist";
           sha256 = "1whajbwmz1v01dirv795bhvs27vq9dh0qmj10dk2xia7vhn42mgh";
           name = "memolist";
         };
@@ -34987,7 +35322,7 @@
           sha256 = "11hyydc13jdai6lkxx8nqf8xljh0gx7fcmywhik4f1hf3pdv7i2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mentor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mentor";
           sha256 = "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s";
           name = "mentor";
         };
@@ -35005,7 +35340,7 @@
           sha256 = "1i96s0z0q9z2ws2b1lz1n50j6hih9y4rsy7mwx0k8a4ikll0gx82";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/menu-bar+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/menu-bar+";
           sha256 = "181jxjnzdckmvpsdknhm21xwimvsp0qxn8azfn58dz41gl4xcg90";
           name = "menu-bar-plus";
         };
@@ -35022,11 +35357,11 @@
         src = fetchFromGitHub {
           owner = "the-lambda-church";
           repo = "merlin";
-          rev = "969a01386f78b39432b1decacaac5ba0e48c85f2";
-          sha256 = "18gcqs9ds1afm11p78x5l9mqizlrq4cf4slapzwm2fmwbb1wf69x";
+          rev = "a532512e15b10d04ffd8281ac5406160f2764005";
+          sha256 = "1amb375dpy5al1ddh2ln9l1lw6xqfjigld6y5k7vvh730zild824";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/merlin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/merlin";
           sha256 = "0wnh7512sknagdk56j6gd8vamh9ns3vnggm56s73pik0m009w0xr";
           name = "merlin";
         };
@@ -35044,7 +35379,7 @@
           sha256 = "05ic97plsysh4nqwdrsl5m9f24m11w24bahj8bxzfdawfima2bkf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/message-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/message-x";
           sha256 = "0z12alizwrqp5f9wq3qllym9k5xljh904c9qhlfhp9biazj6yqwj";
           name = "message-x";
         };
@@ -35065,7 +35400,7 @@
           sha256 = "1x425ah3ymjyp3pxvyzyp4gd8zrjx8lgdzprml8qvf1yk82iv45l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/meta-presenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/meta-presenter";
           sha256 = "0f70cfa91wavchlx8d9hdlgq90cmnylhbg2dbw603rzjkyvslp5d";
           name = "meta-presenter";
         };
@@ -35075,6 +35410,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    metafmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "metafmt";
+        version = "20160127.359";
+        src = fetchFromGitHub {
+          owner = "lvillani";
+          repo = "metafmt";
+          rev = "19dc36b3d085bba6f8e59ddbb1cbb7e2c085c461";
+          sha256 = "0zxal6alf99a2zfzizckibp5iwdk9kklfhml2r0r3wfvswb0rb3z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/metafmt";
+          sha256 = "0vx1xrjr10nd90cr6ppgd3kc3c8bhkg3m4clnb50zagkpfqsy9ma";
+          name = "metafmt";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/metafmt";
+          license = lib.licenses.free;
+        };
+      }) {};
     metascript-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "metascript-mode";
@@ -35086,7 +35442,7 @@
           sha256 = "1rascpmv17dksyn9y0llmjb8r4484x5ax54w6r83k1x7ha1iacx5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/metascript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/metascript-mode";
           sha256 = "1kgs4ki0s6bxx2ri6zxmsy2b2w56gnr9hjkr6302wcmp3qy7clwn";
           name = "metascript-mode";
         };
@@ -35107,7 +35463,7 @@
           sha256 = "06mbdb4zb07skq1jpv05hr45k5x96d9hgkb358jiq0kfsqlrbbb4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/metaweblog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/metaweblog";
           sha256 = "11y5x3a8iv0hjj7ppi2sa7vawn7r475qfsh1jg415j4y4fzwpk6y";
           name = "metaweblog";
         };
@@ -35128,7 +35484,7 @@
           sha256 = "1rkipcv53p7zra3gbjc77ywyxn8d1kx2gniyfqq16d2p2jw0lbzb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mew";
           sha256 = "0423xxn3cw6jmsd7vrw30hx9phga5chxzi6x7cvpswg1mhcyn9fk";
           name = "mew";
         };
@@ -35149,7 +35505,7 @@
           sha256 = "0bhllmyk1r9y63jw5gx10v09791w33lc54qs31gcxbnss094l6py";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mexican-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mexican-holidays";
           sha256 = "0awf4vv6mbp1xr92nsgdn513g4adqhp21k12q4fbm85b2l3jlspb";
           name = "mexican-holidays";
         };
@@ -35162,15 +35518,15 @@
     mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mhc";
-        version = "20151210.238";
+        version = "20160129.141";
         src = fetchFromGitHub {
           owner = "yoshinari-nomura";
           repo = "mhc";
-          rev = "0204160474bdb01e62c89364b5f720b2c42afb0d";
-          sha256 = "0z34x254z79acslxzn35mg9nsxh0cpmb540k90vlp7am7g4d4sra";
+          rev = "79b0208995c37c5b81b40dc60630ebce63688ed2";
+          sha256 = "0dbchc5l6cv4hjrdshd68jhhwjzswwyhsl20q102kvj4l8n0sncz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mhc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mhc";
           sha256 = "02ikn9hx0kcfc2xrx4f38zpkfi6vgz7chcxk6q5d0vcsp93b4lql";
           name = "mhc";
         };
@@ -35188,7 +35544,7 @@
           sha256 = "1ibim60fx0srmvchwbb2s04dmcc7mv7zyg1vqavas24ya2gmixc5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mic-paren";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mic-paren";
           sha256 = "1kdmp0wd7838nk58lby8gx91pjan47lq3izk4vdb2vm0h0iq57sa";
           name = "mic-paren";
         };
@@ -35209,7 +35565,7 @@
           sha256 = "1cigsr0hkbi1860w38k2j8fw6j4w43pgv2bpkmdsifbqy6l8grpg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/midje-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/midje-mode";
           sha256 = "0069hwy5cyrsv5b1yvjhmjasywbmc8x3daq9hkzidy3a2fmqgqv3";
           name = "midje-mode";
         };
@@ -35230,7 +35586,7 @@
           sha256 = "0f3iq4ghi4ig2by1smfciavr2f0lx6vhvajykxdfs0afn006w4cs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/midje-test-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/midje-test-mode";
           sha256 = "0i5j9bnrncxar8hpy3d0566d0y5s4ywakskf27d3kxfyrwqi4l4f";
           name = "midje-test-mode";
         };
@@ -35251,7 +35607,7 @@
           sha256 = "1az4mnmanhz9ga0g46jf33w8axcw8lnrb9lmszajwv7y5j9nk7yr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/migemo";
           sha256 = "0y49imdwygv5zd7cyh9ngda4gyb2mld2a4s7zh4yzlh7z5ha9qkr";
           name = "migemo";
         };
@@ -35272,7 +35628,7 @@
           sha256 = "1qg64mxsm2cswk52mlj7sx7k6gfnrsdwnf68i7cachri0i8aq4ap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/milkode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/milkode";
           sha256 = "07v6xgalx7vcw5sghckwvz584746cba05ql8flv8n556glm7hibh";
           name = "milkode";
         };
@@ -35292,7 +35648,7 @@
           sha256 = "1b2kn4c90hl07lzdg10wamd4lq8f24wmaj4zvr728pwyga99b2av";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minesweeper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minesweeper";
           sha256 = "1n6r3a3rl09pv4jvb7ald1gaipqylfchggza973qv9rgh5g90nag";
           name = "minesweeper";
         };
@@ -35313,7 +35669,7 @@
           sha256 = "0r4jh58pls859fljb6qm49l4imfxxif9mxsmjgwan0czfhq33xqh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mingus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mingus";
           sha256 = "0vw09qk56l792706vvp465f40shf678mcmdh7iw8wsjix4401bzi";
           name = "mingus";
         };
@@ -35334,7 +35690,7 @@
           sha256 = "1n4b039448826w2jcsv4r2iw3v2vlrsxw8dbci8wcfigmkbfc879";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minibuf-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minibuf-isearch";
           sha256 = "0n36d152lc53zj9jy38b0c7hlww0z6hx94y3x2njy6cmh3p5g8nh";
           name = "minibuf-isearch";
         };
@@ -35355,7 +35711,7 @@
           sha256 = "1zyb6c3xwdzk7dpn7xi0mvbcjdfxvzz1a0zlbs053pfar8iim5fk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minibuffer-complete-cycle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minibuffer-complete-cycle";
           sha256 = "0y1mxs6q9a8lzprrlb22qff6x5mvkw4gp2l6p2js2r0j9jzyffq2";
           name = "minibuffer-complete-cycle";
         };
@@ -35376,7 +35732,7 @@
           sha256 = "011kg76zr4hfhi2gngnc7jlmp0l0nvhmlgyc0y9bir2jbjf4yyvz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minibuffer-cua";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minibuffer-cua";
           sha256 = "1ragvr73ykbvpgynnq3z0z4yzrlfhfqlwc1vbxclb8x2xmxq7pzw";
           name = "minibuffer-cua";
         };
@@ -35397,7 +35753,7 @@
           sha256 = "1850z96gly0jnr50472idqz1drzqarr0n23bbasslrc501xkg0bq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/miniedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/miniedit";
           sha256 = "10s407q7igdi2hsaaahbw8vckalrl7z3s6l9cflf51q16xh2ih87";
           name = "miniedit";
         };
@@ -35418,7 +35774,7 @@
           sha256 = "1sj5sq932w079y3vy55q5b6wybwrzz30y092iq1mpfg5xvl42sbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minimal-session-saver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minimal-session-saver";
           sha256 = "1ay7wvriga28bdmarpfwagqzmmk93ri9f3idhr6z6iivwggwyy2i";
           name = "minimal-session-saver";
         };
@@ -35439,7 +35795,7 @@
           sha256 = "1iy1z2kwnbzxhz5r4gsy4zm0l3xbwy314dqxliprbl8n2m9w0lmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minimal-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minimal-theme";
           sha256 = "0l4xj5q06h5fk634d6v3idm0zniq8grz4rjm6qzi7b4jr9sc60gm";
           name = "minimal-theme";
         };
@@ -35460,7 +35816,7 @@
           sha256 = "08sy08bzn2as4n6jydrzvn0h0xahyihr2snfr3ps25gkfwxsk4aq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minitest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minitest";
           sha256 = "0x6nd4kkhiw8hh79r69861pf41j8p1y39kzf2rl61zlmyjz9zpmw";
           name = "minitest";
         };
@@ -35481,7 +35837,7 @@
           sha256 = "0808cl5ixvmhd8pa6fc8rn7wbxzvqjgz43mz1pambj89vbkzmw1c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minizinc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minizinc-mode";
           sha256 = "1blb6mbyqvmdvwp477p1ggs3n6rzi9sdfvi0v1wfzmd7k749b10c";
           name = "minizinc-mode";
         };
@@ -35499,7 +35855,7 @@
           sha256 = "0vwvvhzqiad82qvfwygb2arq1mdvh1lj6q2as0a92fg1vc95qcb0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minor-mode-hack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minor-mode-hack";
           sha256 = "1f2wy25iphk3hzjy39ls5j04173g7gaq2rdp2grkawfhwx0ld4pj";
           name = "minor-mode-hack";
         };
@@ -35520,7 +35876,7 @@
           sha256 = "12k9ii4090dn03xvgqisl4zl4qi33054zxyfkqzzpa9wv72h4knc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mip-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mip-mode";
           sha256 = "1wx5zg4kimd29vqipbzm4vjphn0mldri12g6b18kc290nhgj22ar";
           name = "mip-mode";
         };
@@ -35538,7 +35894,7 @@
           sha256 = "0sc4l0prwmakxmdq22xd5mj8ddwhzrs034zmx2swi2k3s07x15id";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/misc-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/misc-cmds";
           sha256 = "0bylb84icddgznmim18fwq1mhh3qz8yh8ch6lpadf9p3h420qgcl";
           name = "misc-cmds";
         };
@@ -35556,7 +35912,7 @@
           sha256 = "1mksmxy741sv7d5lr9wlj4klb0sg06bg5z1zpd5hj0bd4b3mx7x0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/misc-fns";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/misc-fns";
           sha256 = "1spjbkcac33lyfsgkd6z186a3432x9nw3akmx194gaap2863xcam";
           name = "misc-fns";
         };
@@ -35577,7 +35933,7 @@
           sha256 = "1d08i2cfn1q446nyyji0hi9vlw7bzkpxhn6653jz2k77vd2y0wmk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mkdown";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mkdown";
           sha256 = "1b2vi8q6jhq1xv7yr5f3aiyp1w8j59w19vxys0pv6bqr2gra07i1";
           name = "mkdown";
         };
@@ -35598,7 +35954,7 @@
           sha256 = "1lcc2p9qz70kpykgx82isv0qiqlsajp4vvcj6bvag92d7h9yk9bv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mmm-jinja2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mmm-jinja2";
           sha256 = "0579sv77dyzishhcw4xxi444inwy4jgh9vmxwd856nd05j3cyc7z";
           name = "mmm-jinja2";
         };
@@ -35618,7 +35974,7 @@
           sha256 = "0rpp748ym79sxccp9pyrwri14m7624zzb80srfgjfdpysrrs0jrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mmm-mako";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mmm-mako";
           sha256 = "0a4af5q9wxafrid8visp30cz6073ig0c961b78vmmgqrwvvxd3kn";
           name = "mmm-mako";
         };
@@ -35639,7 +35995,7 @@
           sha256 = "04rapmqblfjvmdccm9kqi8gn0him1x2q7hjwsyb8mg4lwxcd7qp9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mmm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mmm-mode";
           sha256 = "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw";
           name = "mmm-mode";
         };
@@ -35660,7 +36016,7 @@
           sha256 = "05nmcx3f63ds31cj3qwwp03ksflkfwlcn3z2xyxbny83r0dxbgvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mmt";
           sha256 = "0hal3qcw6x9658xpdaw6q9l2rr2z107pvg5bdzshf67p1b3lf9dq";
           name = "mmt";
         };
@@ -35673,15 +36029,15 @@
     mo-git-blame = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mo-git-blame";
-        version = "20151127.215";
+        version = "20160129.1159";
         src = fetchFromGitHub {
           owner = "mbunkus";
           repo = "mo-git-blame";
-          rev = "a0b9ca186d96ef02a5c0ab5d1c29b7a71e78af68";
-          sha256 = "1ydv6z0nns3cc3bxb1r7052dck66y4v201ms2bzichmd351qhv6q";
+          rev = "254a675eb794cdbbdef9fa2b4b7bb510b70089c0";
+          sha256 = "1dh92hzpicfvrlg6swrw4igwb771xbsmsf7hxp1a4iry4w8dk398";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mo-git-blame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mo-git-blame";
           sha256 = "1dp9pxhggappb70m5hyp8sxlnh06y996adabq7x6qvm745mk6f0x";
           name = "mo-git-blame";
         };
@@ -35702,7 +36058,7 @@
           sha256 = "0k0scl9z35d8x4ikxm2db1frpbx151p2m181fa1armxbd9lbfvnn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mo-vi-ment-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mo-vi-ment-mode";
           sha256 = "1pg889mgpv0waccm135mlvag7q13gzfkzchv2532jngwrn6amqc7";
           name = "mo-vi-ment-mode";
         };
@@ -35723,7 +36079,7 @@
           sha256 = "04hbd7mv29v3fv4ld0b3skrir0wp9dix2n5nbqp63fj6n5i4cyyz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mobdebug-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mobdebug-mode";
           sha256 = "19k0c7igqsqvib6hx0nssig4l5f959dlr4wijd1hp5h1hmcb5vv8";
           name = "mobdebug-mode";
         };
@@ -35733,6 +36089,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mocha = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mocha";
+        version = "20160203.1808";
+        src = fetchFromGitHub {
+          owner = "scottaj";
+          repo = "mocha.el";
+          rev = "811772fd498c7cff4c25ba4a6977973d8187e23c";
+          sha256 = "1jyqj7qdpaf0p8d7csc24ch0kgg3vfigadn118gh84xvr1brvvwk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mocha";
+          sha256 = "0kjgrl5iy7cd3b9csgpjg3y0wp0q6c7c8cvf0mx8gdbsj7296kyx";
+          name = "mocha";
+        };
+        packageRequires = [ js2-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/mocha";
+          license = lib.licenses.free;
+        };
+      }) {};
     mocha-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "mocha-snippets";
@@ -35744,7 +36121,7 @@
           sha256 = "06c92q1wrj6b8d8k7i10d4gcy5liag3x4f4chh510c4d3wi0f6sp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mocha-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mocha-snippets";
           sha256 = "0dbsdk4jpzxv2sxx0nia9zhd0a0wmkz1qcqmbd15m1909ccdwxds";
           name = "mocha-snippets";
         };
@@ -35765,7 +36142,7 @@
           sha256 = "0dngznaraphpc5amn9n120la7ga3rj7h67pnnal6qwflh5rqcmss";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mocker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mocker";
           sha256 = "1g90jp1czrrzrmn7n4linby3q4fb4gcflzv2amjv0sdimw1ln1w3";
           name = "mocker";
         };
@@ -35778,15 +36155,15 @@
     modalka = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "modalka";
-        version = "20150924.1111";
+        version = "20160122.633";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "modalka";
-          rev = "67e08b9d315cfa6a2ca3b3dc3954214c68a90cf5";
-          sha256 = "04c7js9jfhzcak9rgzqh1lq56i2b1g4phwjncsxkirvx97rnz4ac";
+          rev = "5a1e914bb76dfde539df26f3108793bba98bd4f9";
+          sha256 = "0r24186d1q9436h3qhqz1z8q978d01an0dvpvzirf4x9ickrib3k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/modalka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/modalka";
           sha256 = "0bkjykvl6sw797h7j76dzn1viy598asly98gcl5wrq13n4w1md4c";
           name = "modalka";
         };
@@ -35799,14 +36176,14 @@
     mode-icons = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mode-icons";
-        version = "20130602.748";
+        version = "20160125.1221";
         src = fetchgit {
           url = "git://ryuslash.org/mode-icons.git";
-          rev = "cbf412d0c47dfdbeac7587a0c12c96f58f546467";
-          sha256 = "b7afff1d8fb0b3f044d266af479df51fbb6021ff433628a9dc669695c1ddae40";
+          rev = "1b8249cad9723c467ccc9e6c25fad4c260900d1f";
+          sha256 = "5d599c604623b33ac1d332c54c4eca5587c58528bd93d14bdd0c342ee306936b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mode-icons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mode-icons";
           sha256 = "18w221zjrrsfcymprv5x75i3qv04zy4bxl9mqjv0ys7qcc8xf1dp";
           name = "mode-icons";
         };
@@ -35827,7 +36204,7 @@
           sha256 = "1lkw9nnlns6v7r6nx915f85whq1ri4w8lccwyxrvam40hfvq60s1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mode-line-debug";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mode-line-debug";
           sha256 = "0ppj14bm3rx3xgg4mfxa5zcm2r129jgmsx817wq3h7akjngcbfkd";
           name = "mode-line-debug";
         };
@@ -35845,7 +36222,7 @@
           sha256 = "1dlprk1jlfw7b7vnxi0d0mf85737wkjc5fkvycx8nawngb2fqhbw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/modeline-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/modeline-char";
           sha256 = "1cb6pm69db0jbksmc4mkawf643i74is9v7ka34pv3mb21nj095qp";
           name = "modeline-char";
         };
@@ -35863,7 +36240,7 @@
           sha256 = "1r4zq355h570hk7qq0ik121bwsr4hjnhacal4d4h119d11gq2p8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/modeline-posn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/modeline-posn";
           sha256 = "0dngfcbcdh22fl6nd47dhg9z9iivj67six67zjr9j1cbngp10dwk";
           name = "modeline-posn";
         };
@@ -35884,7 +36261,7 @@
           sha256 = "0ri841cwx2mx8ri50lhvifmxnysdc022421mlmklql0252kn775l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/modtime-skip-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/modtime-skip-mode";
           sha256 = "1drafwf4kqp83jp47j2ddl2n4a92zf1589fnp6c72hmjqcxv3l28";
           name = "modtime-skip-mode";
         };
@@ -35905,7 +36282,7 @@
           sha256 = "0dyp8jpznb9ivzkka2cgydzcldc275238p0f1c9pcrxjf7mjglmx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/moe-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/moe-theme";
           sha256 = "1nqvj8spvffgjvqlf25rcm3dc6w1axb6qlwwsjhq401a6xhw67f6";
           name = "moe-theme";
         };
@@ -35926,7 +36303,7 @@
           sha256 = "1hqa59pdrnwfykyl58lr8pfbh2f13sygvmrh707hbwc2aii0jjv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/molokai-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/molokai-theme";
           sha256 = "0srdh3yx7j6xs7rgpzmsyzz6ds00kq887rs2sfa0nvk0j0ga6baf";
           name = "molokai-theme";
         };
@@ -35947,7 +36324,7 @@
           sha256 = "0z8mcfhj425hb91fkj1pyg3apw1kf4mgy8lx6n1sc8zmib38py0x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mongo";
           sha256 = "103zkslqdihjyl81688fvkq96rzk3an1vf3gz8rlmmz5anbql8ai";
           name = "mongo";
         };
@@ -35968,7 +36345,7 @@
           sha256 = "0ddkcb5rzpcqpsrwkhvm9kzpx2mlrrsp7psljkz5q5qfvy3wdagh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/monky";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/monky";
           sha256 = "1m7hy3ijwgxqjk3vjvqkxqj8b5bqnd201bmf302k45n0dpjmhshz";
           name = "monky";
         };
@@ -35989,7 +36366,7 @@
           sha256 = "1sxhpvxapzgrwvzibkg7zd3ppmfcz5rhrbvg73b8rggjg4m5snyf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/monochrome-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/monochrome-theme";
           sha256 = "191ikqns1sxcz6ca6xp6mb2vyfj19x19cmcf17snrf46kmx60qk9";
           name = "monochrome-theme";
         };
@@ -36010,7 +36387,7 @@
           sha256 = "0rszr7p5v47s66kj872mz68apkbykhl51lp4v1apwj1ay32lbx9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/monokai-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/monokai-theme";
           sha256 = "13mv4vgsmdbf3v748lqi7b42hvr3yp86n97rb6792bcgd3kbdx7a";
           name = "monokai-theme";
         };
@@ -36031,7 +36408,7 @@
           sha256 = "1z1gyknxscvk2qpfcrgzymf9w5m8jcnj525q852b8s6yf5fnffmh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/monroe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/monroe";
           sha256 = "04rhninxppvilk7s90g0wwa0g9vfcg7mk8mrb2m2c7cb9vj6wyig";
           name = "monroe";
         };
@@ -36052,7 +36429,7 @@
           sha256 = "1ndgw4799d816pkn2bwja5kmigydpmj9znn8cax4dxsd9fg2hzjy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/morlock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/morlock";
           sha256 = "0693jr1k8mzd7hwp52azkl62c1g1p5yinarjcmdksfyqblqq5jna";
           name = "morlock";
         };
@@ -36065,15 +36442,15 @@
     mote-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
     melpaBuild {
         pname = "mote-mode";
-        version = "20121014.2319";
+        version = "20160122.1829";
         src = fetchFromGitHub {
           owner = "inkel";
           repo = "mote-mode";
-          rev = "18dfc3af0cee7d6d522616f07134364c1c3e54ba";
-          sha256 = "1hz9vqvhyz2zw5sl4r62rjxiymqlp9y26j4kdd9qy1y67zx9rmi7";
+          rev = "666c6641addbd3b337a7aa01fd2742ded2f41b83";
+          sha256 = "10mf96r75558scn71pri71aa8nhp6hmnb5rwjxlh5dlf80r5dfd7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mote-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mote-mode";
           sha256 = "1lg5z5d0d35sh21maiwmgzvc31iki9yg6x0awy5xrfsains7ykn9";
           name = "mote-mode";
         };
@@ -36094,7 +36471,7 @@
           sha256 = "17570labnwdnwca2cg4ga0mrrm00n0h3wlxry823k5yn3k93rnj1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/motion-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/motion-mode";
           sha256 = "1lfsc8ayiz2v3dfn8c0mmfch8vpzqyddxw8kscan2lzl2lcj50h0";
           name = "motion-mode";
         };
@@ -36112,7 +36489,7 @@
           sha256 = "0rakxcpqdx175hic3ykwbd5if53dvvf0sxhq0gplpsybpqvkimyv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mouse+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mouse+";
           sha256 = "1fv7jnqzskx9iv92dm2pf0mqy2accl0svjl2kkb6v273n1day3f8";
           name = "mouse-plus";
         };
@@ -36133,7 +36510,7 @@
           sha256 = "05pzplb3gmlnlvn2azbxdlf4vrkvk8fc9dkgi2nq4shysnh4c9v7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mouse-slider-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mouse-slider-mode";
           sha256 = "0aqxjm78k7i8c59w6mw9wsfw3rail1pg40ac1dbcjkm62fjbh5hy";
           name = "mouse-slider-mode";
         };
@@ -36151,7 +36528,7 @@
           sha256 = "1831jpi06hi5v2jdjgs83jma7fp8xiqdmvvwxfyp2zpbfwi1lkb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mouse3";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mouse3";
           sha256 = "1rppn55axjpqwqm2lq4dvwi3z7xkd5jkyqi1x8jqgcsfc9w6m777";
           name = "mouse3";
         };
@@ -36172,7 +36549,7 @@
           sha256 = "0baynb6gq04rxh10l6rn0myrhg7c7fwqaryiiyddp4jy7llf83c8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/move-dup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/move-dup";
           sha256 = "0b0lmiisl9yckblwf7619if88qsmbka3bl4qiaqam7fka7psxs7f";
           name = "move-dup";
         };
@@ -36190,7 +36567,7 @@
           sha256 = "0azda60cbz3kpvy6zd7pvlj40iwvj1zjdxv1brzqa6yfa4kyixv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/move-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/move-text";
           sha256 = "1xgq7wsh08fb23zv71lfw5rska9wijsl64ijpi2m06zyw1m7mdqr";
           name = "move-text";
         };
@@ -36211,7 +36588,7 @@
           sha256 = "179mc70x3dvj0cz6yyhs00ndh0xvk71gmiscln9y0f1ngxr5h338";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mowedline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mowedline";
           sha256 = "0c2hvvwa7s5iyz517jaskshdcq9zs15zr6xsvrcb3biahrh4bmfb";
           name = "mowedline";
         };
@@ -36232,7 +36609,7 @@
           sha256 = "1g06i3d8xv8ja6nfww4k60l3467xr1s9xsk7i6dbicq0lf8559h9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/moz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/moz";
           sha256 = "0ar2xgsi7csjj6fgiamrjwjc58j942dm32j3f3lz21yn2c4pnyxi";
           name = "moz";
         };
@@ -36253,7 +36630,7 @@
           sha256 = "0fssn33ld6xhjlwg1dbrjg8sa0pjmglq0dw792yrmvm4fj0zjph8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/moz-controller";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/moz-controller";
           sha256 = "18gca1csl9dfi9995mky8cbgi3xzf1if8pzdjiz5404gzcqk0rfd";
           name = "moz-controller";
         };
@@ -36295,7 +36672,7 @@
           sha256 = "03j5fy2xw204807wi7ivwcqlgkh1f7msshh5yrk6c7qdpp08062r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mozc-im";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mozc-im";
           sha256 = "1gqzmm712npj36qfi506zgl0ycd6k7l5m46c7zz2z2lb6jpssw10";
           name = "mozc-im";
         };
@@ -36316,7 +36693,7 @@
           sha256 = "1mbpkjc6sk7qqmgsmr5a5l2ycwnqp8bkwgikdavgs6hnal10bkmn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mozc-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mozc-popup";
           sha256 = "1n43lwflxzzyskxgzg19rg3hiqqkf5l7vfgaydryf4sk8480x687";
           name = "mozc-popup";
         };
@@ -36337,7 +36714,7 @@
           sha256 = "11c8pr3s77aq34ic32lnsialwh8bw3m78kj838xl2aab2pgrlny2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mpages";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mpages";
           sha256 = "11scjjwwrpgaz6i4jq9y7m864nfak46vnbfb0w15625znz926jcs";
           name = "mpages";
         };
@@ -36358,7 +36735,7 @@
           sha256 = "09731mwm23b6ic53366lnxy2p7dfd245yh75gaf6ijfa22jks7gb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mpg123";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mpg123";
           sha256 = "184ip9pvv4zkfxnrzxbfajjadc9f4dz4psn33f9x3sfh7s1y4nw8";
           name = "mpg123";
         };
@@ -36379,7 +36756,7 @@
           sha256 = "193j90sgn1zgl00mji86wll4djj57vk5arhwbmhhf5b1qx3wpbhm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mpv";
           sha256 = "1vq308ac6jj1h8qa2b2sypisb38hbvwjimqndhpfir06fghkw94l";
           name = "mpv";
         };
@@ -36400,7 +36777,7 @@
           sha256 = "1draiwbwb8zfi6rdr5irv8091xv2pmnifq7pzi3rrvjb8swb28z3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/msvc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/msvc";
           sha256 = "04gq2klana557qvsi3bv6416l0319jsqb6bdfs7y6729qd94hlq3";
           name = "msvc";
         };
@@ -36410,6 +36787,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mu-cite = callPackage ({ fetchFromGitHub, fetchurl, flim, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mu-cite";
+        version = "20160130.500";
+        src = fetchFromGitHub {
+          owner = "ksato9700";
+          repo = "mu-cite";
+          rev = "aea3c2d01eb3284d5e0124059d368e8c6b6ffddc";
+          sha256 = "1gxspy50gh7j4sysvr17fvvp8p417ww39ii5dy0fxncfwczdsa19";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mu-cite";
+          sha256 = "0ap21sw4r2x774q2np6rhrxh2m2rf3f6ak3k71iar159chx32y6q";
+          name = "mu-cite";
+        };
+        packageRequires = [ flim ];
+        meta = {
+          homepage = "http://melpa.org/#/mu-cite";
+          license = lib.licenses.free;
+        };
+      }) {};
     mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
     melpaBuild {
         pname = "mu4e-alert";
@@ -36421,7 +36819,7 @@
           sha256 = "065pncwj0sgiacn24c4pimcw325xc7wncbq0s1rrgq0920dxc9rc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mu4e-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mu4e-alert";
           sha256 = "15nwj09iyrvjsc9lrxla6qa0s8izcllxghw5gx3ffncfcrx2l8qm";
           name = "mu4e-alert";
         };
@@ -36434,15 +36832,15 @@
     mu4e-maildirs-extension = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mu4e-maildirs-extension";
-        version = "20151126.1126";
+        version = "20160126.239";
         src = fetchFromGitHub {
           owner = "agpchil";
           repo = "mu4e-maildirs-extension";
-          rev = "17eacf2d0b3a57ebf26a6aaa9eeb51d579457d25";
-          sha256 = "0hbgzvybd04s9fz9myrs68ic2v0kks3wpv8qj14ihrnl7xh03rfh";
+          rev = "f759dff954e09ab2952decac4d39bb7e5b7e399d";
+          sha256 = "1cvpzs65fjmhdza1vi2lpk68vkvivb0igrpgm42andi42gc6k50b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mu4e-maildirs-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mu4e-maildirs-extension";
           sha256 = "1xz19dxrj1grnl7wy9qglh08xb3dr509232l3xizpkxgqqk8pwbi";
           name = "mu4e-maildirs-extension";
         };
@@ -36463,7 +36861,7 @@
           sha256 = "0f5hc6mgq0hg1wwnvqd4fp7ck58lcavvgqjggz9zlhrjgkmynjxx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi";
           sha256 = "1c240d1c1g8wb2ld944344zklnv86d9rycmya4z53b2ai10642ig";
           name = "multi";
         };
@@ -36476,15 +36874,15 @@
     multi-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "multi-compile";
-        version = "20151111.1640";
+        version = "20160204.1541";
         src = fetchFromGitHub {
           owner = "ReanGD";
           repo = "emacs-multi-compile";
-          rev = "61a4a7b35cd78773305150f533f51587367378db";
-          sha256 = "004c4fbf5rrxvs01imv43lwvw5k9ndk02mk29q0w45s230gfca8x";
+          rev = "7bbd1e84a4ed411fed77007ebae0fa7d870be75e";
+          sha256 = "0bayjp60lzv2ay34k9yvx46vyk5ffnivrlvb3hw1kfpwyw46fww6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi-compile";
           sha256 = "16fv0hpwcjw1771zlbgznph0fix9fbm6yqj2rcz1f9l26iih6apz";
           name = "multi-compile";
         };
@@ -36502,7 +36900,7 @@
           sha256 = "1w1jwfznpl214a1xx46zlgqbx9c5yjzpyqqrkn3xqjgnj485yhkl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi-eshell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi-eshell";
           sha256 = "1i0mvgqxsc99dwp9qcdrijqxsxflrbxw846rgw89p1jfs8mp4l7d";
           name = "multi-eshell";
         };
@@ -36523,7 +36921,7 @@
           sha256 = "13rp6kbabjy9dy0x4696065yyaxlgmfnwcqq9vcw2jhbb2gl9gs5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi-line";
           sha256 = "1aadmijnjr029s1qq4gk8xyl9m8xb5x5774b8i3jyfixyjqvhvwp";
           name = "multi-line";
         };
@@ -36543,7 +36941,7 @@
           sha256 = "0lcx73vzm7zwvzzc53pfb5y16bhvq9cm9fdy63d3242s8v834z3c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi-project";
           sha256 = "19dy2wl5ad1xldiznlw2vjvr9ja8h9wiv6igcggixq56fhngp40x";
           name = "multi-project";
         };
@@ -36561,7 +36959,7 @@
           sha256 = "062c52xd469jdmsq4fvdhsmgfjrlanv0bb1w5vglz7bsn68d2bim";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi-term";
           sha256 = "1va4ihngwv5qvwps3m9jj0150gbrmq3zllnyq1hbx5ap8hjrhvdx";
           name = "multi-term";
         };
@@ -36582,7 +36980,7 @@
           sha256 = "0mc4kkgwnwfk27wwc21nw5ly7qcsl7y5bd8wf2y8r6pxhvwran4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi-web-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi-web-mode";
           sha256 = "0vi4yvahr10aqpcz4127c8pcqpr5srwc1yhgipnbnm86qnh34ql5";
           name = "multi-web-mode";
         };
@@ -36603,7 +37001,7 @@
           sha256 = "1ispa0wxpkydm0cyj4scyyacfrbilrip5v8bsrcqfc6qs597z8rf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multicolumn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multicolumn";
           sha256 = "1ylnc3s4ixvnqn7g2p6nzz8x29ggqc703waci430f1rp1lsd3q09";
           name = "multicolumn";
         };
@@ -36624,7 +37022,7 @@
           sha256 = "065l04ylplng1vgykkbn2vnkcs3sn1k2cikx1ha2q8wmgx6bkvai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multifiles";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multifiles";
           sha256 = "0m0pi2qjis9p6z9cd8hlxm1r88ynwmd2ks8wg65sffffwsdbg4kz";
           name = "multifiles";
         };
@@ -36645,7 +37043,7 @@
           sha256 = "0hl9ll7pgqv74dnihyy0gz15wz0swj1cpa208484qd3g0dvin8j6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multiple-cursors";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multiple-cursors";
           sha256 = "0mky5p9wpd3270wr5vfna8rkk2ff81wk7vicyxli39195m0qgg0x";
           name = "multiple-cursors";
         };
@@ -36666,7 +37064,7 @@
           sha256 = "1n2ymd92qpvsby6ms0l3kjhdzzc47rri2aiscc6bs07hm4mjpr9q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mustache";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mustache";
           sha256 = "1pjr00xx77mlfw1myxaz6i3y2gbivhbiq5hyjxxbjlfrkm1vxc8g";
           name = "mustache";
         };
@@ -36687,7 +37085,7 @@
           sha256 = "15gw4d0hp15rglsj8hzd290li4p0kadj2dsz0dgfcxld7hnimihk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mustache-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mustache-mode";
           sha256 = "076ar57qhwcpl4n634ma827r2rh61670778wqr5za2444a6ax1gs";
           name = "mustache-mode";
         };
@@ -36708,7 +37106,7 @@
           sha256 = "19qd34dcfspv621p4y07zhq2pr8pwss3lcssm9sfhr6w2vmvgcr4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mustang-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mustang-theme";
           sha256 = "0771l3x6109ki914nwpfz3fj7pbvpcg9vf485mrccq2wlxymr5dr";
           name = "mustang-theme";
         };
@@ -36729,7 +37127,7 @@
           sha256 = "170qhbbvcv9dg6jzfd9r95in5m8z1k647mn0gaqflfj0hvq5hwgf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mustard-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mustard-theme";
           sha256 = "0izxhivhmv49dja4wy9n0ipd41xdzdza2ql7pfa7ny35ji5hskik";
           name = "mustard-theme";
         };
@@ -36739,6 +37137,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mutant = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mutant";
+        version = "20160124.753";
+        src = fetchFromGitHub {
+          owner = "p-lambert";
+          repo = "mutant.el";
+          rev = "aff50603a70a110f4ecd7142963ef719e8c11c06";
+          sha256 = "1faqbkff0v6pigsnnq2dxnzdra8q62cvlxigscwalwxd27bbz548";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mutant";
+          sha256 = "0m5l5r37zb0ig96757ldyl9hbb01lknzqf08ap6dsmdwr1zayvp1";
+          name = "mutant";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/mutant";
+          license = lib.licenses.free;
+        };
+      }) {};
     muttrc-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "muttrc-mode";
         version = "20090804.1752";
@@ -36747,7 +37166,7 @@
           sha256 = "1xihp3zdqs9054j3bfrd9wnahsvvxjk1ags1iy50ncv5850ppjis";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/muttrc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/muttrc-mode";
           sha256 = "0ym6rfrhrmpnlqhkxv9ck5893qm0yhswslvgc9vb4nl9hyc1b5jn";
           name = "muttrc-mode";
         };
@@ -36768,7 +37187,7 @@
           sha256 = "1gvn0a49lgbjnkl0j2sv4p9zdfqzj9s4jw0k2f4ypmsd1fc0q6d6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mvn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mvn";
           sha256 = "1ykiz5fviq2n2474izwp0vvqanpbmxg7lzh1xbpn281kwmp0mwin";
           name = "mvn";
         };
@@ -36789,7 +37208,7 @@
           sha256 = "0qdlbyq47gr65yq5ri8s9lxw4wp9fmyqc2prkh560d4hkvw60aw3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mwe-log-commands";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mwe-log-commands";
           sha256 = "05z2ax9mgyxldd3ds44xnh9f5w5q4ziy4rxmnfiqjykan2f5hnkn";
           name = "mwe-log-commands";
         };
@@ -36810,7 +37229,7 @@
           sha256 = "0hvq6z754niqjyv79jzb833wrwbspc7npfg85scwdv8vzwassjx4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mwim";
           sha256 = "0bsibwplvyv96y5i5svm2b0jwzs5a7jr2aara7v7xnpj0nqaxm8k";
           name = "mwim";
         };
@@ -36831,7 +37250,7 @@
           sha256 = "0cf0c9g9k2lk1ifi2dlw7c601sh1ycxf3fgl2hy5wliyd6l9rf86";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/myanmar-input-methods";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/myanmar-input-methods";
           sha256 = "1yg8zy2z18pbyr507ms2b162c0819rna1ilwyp6hb3iv2zjw45sd";
           name = "myanmar-input-methods";
         };
@@ -36852,7 +37271,7 @@
           sha256 = "0a9a6hmv8vjmp6h9mnzin9vc0sncg79v5z72pasvbrplfxijzan0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mykie";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mykie";
           sha256 = "12ram39fp3m9ar6q184rsnpkxb14y0ajibng7ia2ck54ck7n36cj";
           name = "mykie";
         };
@@ -36873,7 +37292,7 @@
           sha256 = "18ml0qz3iipm9w36zvwz77cbbrg885jgvzk6z4a33xcfp524xhma";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mynt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mynt-mode";
           sha256 = "17s0wdwgh2dcpww6h3qszc9dcs7ki00xkyisvsfn4xqajrmmp75b";
           name = "mynt-mode";
         };
@@ -36894,7 +37313,7 @@
           sha256 = "0q5809hq22hyzxx5xr2hwwf3jh3qlpf3mkbl3fxqq93gm16plh1i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mysql2sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mysql2sqlite";
           sha256 = "1jblrbw4rq2jwpb8d1dyna0fiv52b9va3sj881cb17rqx200y3nd";
           name = "mysql2sqlite";
         };
@@ -36907,15 +37326,15 @@
     myterminal-controls = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "myterminal-controls";
-        version = "20150427.547";
+        version = "20160119.2230";
         src = fetchFromGitHub {
           owner = "myTerminal";
           repo = "myterminal-controls";
-          rev = "6b40d5f606dd402b80b7c93775bece1063cbf826";
-          sha256 = "0mnkhp286nrifxbrzp7lbmr4bccm7byh1f2zid4l1hac4x5wcx86";
+          rev = "d772b847442570f5fbfac1bd53184b7778361813";
+          sha256 = "18wqgjn38jxzsbivmf2fkcq3r1y4lffh3dbpv1jj7s9qn91pyp6a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/myterminal-controls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/myterminal-controls";
           sha256 = "0ipk5s2whf3l68q0dydm1j6rcb6jhk61hgjwxygdphifvih7c5y2";
           name = "myterminal-controls";
         };
@@ -36936,7 +37355,7 @@
           sha256 = "1lp1bx9110vqzjww94va8pdks39qvqzl8rf0p8na1q0qn06rnk9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/n3-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/n3-mode";
           sha256 = "0hasxq39phgyc259dgxskhqxjsp0yi98vx1bs8ynvwa26la4ddzh";
           name = "n3-mode";
         };
@@ -36957,7 +37376,7 @@
           sha256 = "1pd6c0jc1zxx3i3nk4qdx7gdf1qn8sc9jgqd72pkkpzvdwv998cp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/n4js";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/n4js";
           sha256 = "0x7smxs91ffriyxx2df61fh1abpl39gqy4m62k77h7xb6fg7af6m";
           name = "n4js";
         };
@@ -36975,7 +37394,7 @@
           sha256 = "0zq13qjqfpxjba1bhdqqxkvgxq1dxyb7hd1bpnk6cbhsxr6mr50i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/naked";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/naked";
           sha256 = "06p6dzhn34dva3677mrvwq2a2x3bhw7f486y654hszla7i75pilq";
           name = "naked";
         };
@@ -36996,7 +37415,7 @@
           sha256 = "0amhw630hgc0j8wr8m6aav399ixi3vbwrck79hhlr3pmyh91vv7n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/name-this-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/name-this-color";
           sha256 = "12nrk1ww766jb4gb4iz6w485nimh2iv8wni2jq4l38v8ndh490zb";
           name = "name-this-color";
         };
@@ -37017,7 +37436,7 @@
           sha256 = "07zgwyrss23yb8plnhhwmh0khdvfp539891sj1z1vs50jcllcpw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nameframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nameframe";
           sha256 = "0iq8cfii39ha8sxn9w7kyfvys8kwyax8g4l0pkl05q0a0s95padp";
           name = "nameframe";
         };
@@ -37038,7 +37457,7 @@
           sha256 = "07zgwyrss23yb8plnhhwmh0khdvfp539891sj1z1vs50jcllcpw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nameframe-perspective";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nameframe-perspective";
           sha256 = "0wgr90m2pazc514slgdl1lin4mr3xxizasc82k7qinvdvdja515x";
           name = "nameframe-perspective";
         };
@@ -37059,7 +37478,7 @@
           sha256 = "07zgwyrss23yb8plnhhwmh0khdvfp539891sj1z1vs50jcllcpw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nameframe-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nameframe-projectile";
           sha256 = "11z64wy8mnnrjmgfs2sjbv3mh136aki8r5f89myx861nfx18hc3k";
           name = "nameframe-projectile";
         };
@@ -37080,7 +37499,7 @@
           sha256 = "13v0v90vrc2w0wi7wmzmpql6yjbr6lpzh29kxggq9fy38lahd3ks";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nameless";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nameless";
           sha256 = "14agx54h2vqfb0656n12z761ywyxsdskd6xa1ccar70l9vwj85vq";
           name = "nameless";
         };
@@ -37101,7 +37520,7 @@
           sha256 = "0m82g27gwf9mvicivmcilqghz5b24ijmnw0jf0wl2skfbbg0sydh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/names";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/names";
           sha256 = "1q784606jlakw1z6sx2g2x8hz8c8arywrm2r626wj0v105v510vg";
           name = "names";
         };
@@ -37122,7 +37541,7 @@
           sha256 = "157hhb253m6a9l5wy6x8w5ar3x0qz1326l7a0npxif6pma0dd140";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/namespaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/namespaces";
           sha256 = "02pb7762khxpah4q6xg8r7dmlv1kwyzinffi7pcaps6ycj29q2fr";
           name = "namespaces";
         };
@@ -37143,7 +37562,7 @@
           sha256 = "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nand2tetris";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nand2tetris";
           sha256 = "1zg9xx7mj8334m2v2zqqfkr5vkj4dzqbj8y13qk6xhzb7qkppyqd";
           name = "nand2tetris";
         };
@@ -37164,7 +37583,7 @@
           sha256 = "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nand2tetris-assembler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nand2tetris-assembler";
           sha256 = "1761kgrflipxba8894cnx90ks7f3ba4nj6ci515zzxcx9s45mfyy";
           name = "nand2tetris-assembler";
         };
@@ -37184,7 +37603,7 @@
           sha256 = "1nzkamy53kl1g4y1jm7j5zgpkdsyg5ykp8zp1f0bg5mhy8mmf75w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nanowrimo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nanowrimo";
           sha256 = "1nhyj38qyn1x6a5rbrwhcxwfwzyqqjm3dvksdnmam6vfwn3s2r31";
           name = "nanowrimo";
         };
@@ -37205,7 +37624,7 @@
           sha256 = "0mxf61ky1dd7r2qd4j7k6bdppmkilkq5l9gv257a12539wkw5yq2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/naquadah-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/naquadah-theme";
           sha256 = "1aml1f2lgn530i86218nrc1pk3zw5n3qd2gw4gylwi7g75i0cqn1";
           name = "naquadah-theme";
         };
@@ -37223,7 +37642,7 @@
           sha256 = "1lyszm94pd3jxs73v7k0aaazm0sd2rpz2pphcdag7lk7k6vppd9n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/narrow-indirect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/narrow-indirect";
           sha256 = "10aq4gssayh3adw8yz2lza1xbypyffi8r03lsc0kiis6gd9ibiyj";
           name = "narrow-indirect";
         };
@@ -37244,7 +37663,7 @@
           sha256 = "10yn215xb4s6kshk108y75im1xbdp0vwc9kah5bbaflp9234i0zh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/narrow-reindent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/narrow-reindent";
           sha256 = "0fybal70kk62zlra63x4jb72694m0mzv4cx746prx9anvq1ss2i0";
           name = "narrow-reindent";
         };
@@ -37265,7 +37684,7 @@
           sha256 = "0ydxj6dc10knambma2hpimqrhfz216nbj96w1dcwgjixs4cd4nax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/narrowed-page-navigation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/narrowed-page-navigation";
           sha256 = "1yrmih60dd69qnin505jlmfidm2svzpdrz46286r7nm6pk7s4pb7";
           name = "narrowed-page-navigation";
         };
@@ -37286,7 +37705,7 @@
           sha256 = "19v1qp4rzqvyzrk5zaxdjhki8cjl4fg6lr4ai3vi06yf62ds9mcs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nasm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nasm-mode";
           sha256 = "1626yf9mmqlsw8w01vzqsyb5ipa56259d4kl6w871k7rvhxwff17";
           name = "nasm-mode";
         };
@@ -37305,7 +37724,7 @@
           sha256 = "0kfqpji6z3ra8sc951vmm1bzyhkws7vb5q6djvl45wlf1wrgkc4p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nav";
           sha256 = "036lf6iirxamlqzq3w6m0hji36l480yx5c9wnwypms85hi8hq0vl";
           name = "nav";
         };
@@ -37326,7 +37745,7 @@
           sha256 = "07wjicbvzg7cz983hv0p2qw1qlln07djigkmbqfpwvg3fk50fdyg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nav-flash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nav-flash";
           sha256 = "0936kr0s6zxxmjwaqm7ywdw2im4dxai1xb7j6xa2gp7c70qvvsx3";
           name = "nav-flash";
         };
@@ -37347,7 +37766,7 @@
           sha256 = "1yywbfa0syhb8zmn2qjjw2hxy7vz9ky3xd7kv3nz3gd2x989nb9a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/navi-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/navi-mode";
           sha256 = "0f5db983w9kxq8mcjr22zfrm7cpxydml4viac62lvab2kwbpbrmi";
           name = "navi-mode";
         };
@@ -37368,7 +37787,7 @@
           sha256 = "15l2zmm8bp4ip8m1hfxkvswfwa29pg72kisfya2n5v900r184a4m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/navi2ch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/navi2ch";
           sha256 = "13xwvyy27dz1abjkkazm3s1p6cw32l2klr1bnln02w0azkbdy7x3";
           name = "navi2ch";
         };
@@ -37389,7 +37808,7 @@
           sha256 = "0g7rmvfm0ldv0d2x7f8k761mgmi47siyspfi1ns40ijhkpc15x8l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/navorski";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/navorski";
           sha256 = "0dnzpsm0ya8rbcik5wp378hc9k7gjb3gwmkqqj889c38q5cdwsx7";
           name = "navorski";
         };
@@ -37410,7 +37829,7 @@
           sha256 = "0gbv5fv401z58ycbqlivqamf5kp3x6krhi36q7q0m4gvy448xz0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ncl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ncl-mode";
           sha256 = "0hmd606xgapzbc79px9l1q6pphrhdzip495yprvg20xsdpmjlfw9";
           name = "ncl-mode";
         };
@@ -37431,7 +37850,7 @@
           sha256 = "178gjv7kq97p9i4naxql7xabvmchw5x8idkpyjqqky3b24v5wkis";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nclip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nclip";
           sha256 = "016jp1rqrf1baxlxbi3476m88a0l3r405dh6pmly519wm2k8pipw";
           name = "nclip";
         };
@@ -37448,11 +37867,11 @@
         src = fetchFromGitHub {
           owner = "rsdn";
           repo = "nemerle";
-          rev = "47840833c6a49d680127e6112848868879eeeb4d";
-          sha256 = "0nw13s51frvm5yhrbvhq0ns38cr9whqvacnn7xbbkm017rg4dhy7";
+          rev = "0be91a256921594bb81c76d813cd41a2a3a78ce7";
+          sha256 = "15akpl5b3k37hsiw364hn38901gplai6sjc1j563w8ygnfans6vn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nemerle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nemerle";
           sha256 = "0698hbgk80w7wp0ssx9pl13aapm7rc6l3y2zydfkyqdfwy5y71v6";
           name = "nemerle";
         };
@@ -37465,15 +37884,15 @@
     neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neotree";
-        version = "20160112.158";
+        version = "20160204.326";
         src = fetchFromGitHub {
           owner = "jaypei";
           repo = "emacs-neotree";
-          rev = "56ea48d0035daed7f6716dffcdfacbc9b9f13149";
-          sha256 = "0zr4lcbqd1fasx7h49klnbc1d8sv1nzhvv18jqqkkgkjq6q7bapf";
+          rev = "7ac86e96f1a0eb542ba38da741b4abd21312c7dd";
+          sha256 = "105a8qwhjaay2nfspp5zj227zkwl85ggymakgbqqf6gi0s789vyh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/neotree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/neotree";
           sha256 = "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06";
           name = "neotree";
         };
@@ -37494,7 +37913,7 @@
           sha256 = "1kkflj2qnrn6kzh1l6bjl5n5507qilb22pqj3h0f2m6hfyn0sw5z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/netherlands-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/netherlands-holidays";
           sha256 = "181linsbg5wrx1z7zbj3in2d3d4zd2v7drspkj0b6l0c5yfxwayf";
           name = "netherlands-holidays";
         };
@@ -37515,7 +37934,7 @@
           sha256 = "0p00mmid04pfsna4ify3cy0b9lx431q1r5h772hihsg4f1rs2ppy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/never-comment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/never-comment";
           sha256 = "0sn8y57895bfpgiynnj4m9b3x3dbb9v5fwkcwmf9jr39dbf98v6s";
           name = "never-comment";
         };
@@ -37536,7 +37955,7 @@
           sha256 = "05jwaj7wlrdpmylawv14ypwpg9qz9pqqqd1nvb94b9gbs79j86z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/newlisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/newlisp-mode";
           sha256 = "0i2d2gyzzvpr5qm2cqzbn9my21lfb66315hg9fj86ac5pkc25zrd";
           name = "newlisp-mode";
         };
@@ -37557,7 +37976,7 @@
           sha256 = "1xnx6v49i6abzbhq4fl4bp9d0pp9gby40splpcj211xsb8yiry27";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nexus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nexus";
           sha256 = "1mdphgsqg6n4hryr53rk42z58vfv0g5wkar5ipanr4h4iclkf5vd";
           name = "nexus";
         };
@@ -37578,7 +37997,7 @@
           sha256 = "08bpyk0brx0x2l0y8hn8zpkaxb2ndmxz22kzxxypj6hdz303wf38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nginx-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nginx-mode";
           sha256 = "07k17m64zhv6gik8v4n73d8l1k6fsp4qp8cl94r384ny0187y65c";
           name = "nginx-mode";
         };
@@ -37599,7 +38018,7 @@
           sha256 = "147vw3qlsply5h8cjmjzqr5dv9jzf9xlmhjnmcpyb1r7krh1l8xm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/niflheim-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/niflheim-theme";
           sha256 = "1dipxwaar7rghmz7s733v035vrbijcg1dla9f7cld1gkgiq9iq36";
           name = "niflheim-theme";
         };
@@ -37609,22 +38028,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    nim-mode = callPackage ({ emacs, epc, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
+    nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "nim-mode";
-        version = "20160118.1138";
+        version = "20160202.2209";
         src = fetchFromGitHub {
           owner = "nim-lang";
           repo = "nim-mode";
-          rev = "4aa694e25423fda22ebb21ae355ba2d4a7e08d07";
-          sha256 = "0l07wwzjj8479zyghh6dq454c62gxi0bxppwa43zmvfmk3zwcblx";
+          rev = "9e119eba89ad1574a129b7502d14237ec9f54825";
+          sha256 = "1wlfar160gs7ar6kl6and3jv8k75wj2f189ygbawyag4dyq5a9h2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nim-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nim-mode";
           sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6";
           name = "nim-mode";
         };
-        packageRequires = [ emacs epc let-alist ];
+        packageRequires = [ commenter emacs epc let-alist ];
         meta = {
           homepage = "http://melpa.org/#/nim-mode";
           license = lib.licenses.free;
@@ -37637,11 +38056,11 @@
         src = fetchFromGitHub {
           owner = "martine";
           repo = "ninja";
-          rev = "19a3066bf76bd121ca39ca138577f90bea5a10a2";
-          sha256 = "1kfmf4dprg2zkmfkpyn0w9d18xz8v3hmmdkajmv14a6py1sjh14c";
+          rev = "8028e91a9dc90b51b4da7ded70cc38234ed62451";
+          sha256 = "0zkm6ddsrwbp2fvw80y6mgvihr24nvf1d6pjb784qvmil716fm3j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ninja-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ninja-mode";
           sha256 = "1m7f25sbkz8k343giczrnw2ah5i3mk4c7csi8kk9x5y16030asik";
           name = "ninja-mode";
         };
@@ -37658,11 +38077,11 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "d704abc0f33718e339562eea4cce565f8467ada3";
-          sha256 = "0gd592xvh7mr6h4gcdyfi03lg6ciml1spjpvrcbbkvxz7sdk6p3i";
+          rev = "c780c1124ec6711f09b9855c3b574b6655af6625";
+          sha256 = "1nps30kq70zy81690wsr80khaqgds0awx8hd7wzl6xcs56zjq07x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nix-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nix-mode";
           sha256 = "00rqawi8zs2x79c91gmk0anfyqbwalvfwmpak20i11lfzmdsza1s";
           name = "nix-mode";
         };
@@ -37683,7 +38102,7 @@
           sha256 = "0ia9wgn33znaviy7ilfm83yfalc2dbpm1g7nvss5s4rznqkdfhn3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nixos-options";
           sha256 = "1m3jipidk10zj68rzjbacgjlal31jf80gqjxlgj4qs8lm671gxmm";
           name = "nixos-options";
         };
@@ -37704,7 +38123,7 @@
           sha256 = "1skbjmyikzyiic470sngskggs05r35m8vzm69wbmrjapczginnak";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nm";
           sha256 = "004rjbrkc7jalbd8ih170sy97w2g16k3whqrqwywh09pzrzb05kw";
           name = "nm";
         };
@@ -37725,7 +38144,7 @@
           sha256 = "0gzxcq0gki89dz9ad26683zhq1nif3wdz185cdplwy68z9szbdx1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nnir-est";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nnir-est";
           sha256 = "04ih47pipph8sl84nv6ka4xlpd8vhnpwhs5cchgk5k1zv3l5scxv";
           name = "nnir-est";
         };
@@ -37746,7 +38165,7 @@
           sha256 = "0wk86gm0by9c8mfbvydz5va07qd30n6wx067inqfa7wjffaq0xr7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/noccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/noccur";
           sha256 = "0a8l50v09bgap7rsls808k9wyjpjbcxaffsvz7hh9rw9s7m5fz5g";
           name = "noccur";
         };
@@ -37767,7 +38186,7 @@
           sha256 = "1a1pp3sd5g4wkhywb5jfchcdpjsjb0iyhk2sxvd0gpc4kk4zh6xs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/noctilux-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/noctilux-theme";
           sha256 = "15ymyv3rq0n31d8h0ry0l4w4r5a8as0q63ajm9wb6yrxxjl1imfp";
           name = "noctilux-theme";
         };
@@ -37788,7 +38207,7 @@
           sha256 = "1cgmq00ackabwcl4h0n2bb8y08wz0ir5rzca2q3sk4asly6d02m7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/node-resolver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/node-resolver";
           sha256 = "1ng4rgm8f745fajqnbjhi2rshvn6icwdpbh5dzpzhim1w9kb3bhh";
           name = "node-resolver";
         };
@@ -37809,7 +38228,7 @@
           sha256 = "03vcs458rcn1hgfvmgmijadjvri7zlh2z4lxgaplzfnga13mapym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nodejs-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nodejs-repl";
           sha256 = "0rvhhrsw87kfrwdhm8glq6b3nr0v90ivm7fcc0da4yc2jmcyk907";
           name = "nodejs-repl";
         };
@@ -37830,7 +38249,7 @@
           sha256 = "0g70gnmfi8n24jzfci9nrj0n9bn1qig7b8f9f325rin8h7x32ypf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/noflet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/noflet";
           sha256 = "0vzamqb52n330mi6rydrd4ls8nbwh5s42fc2gs5y15zakp6mvhr3";
           name = "noflet";
         };
@@ -37849,7 +38268,7 @@
           sha256 = "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nose";
           sha256 = "0l77hsmn3qk934ppdav1gy9sq48g0v1dzc5qy0rp9vv4yz2jx2jk";
           name = "nose";
         };
@@ -37864,11 +38283,11 @@
         version = "20160108.632";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "3959d98535b1a3fa61d45a457cce23aa7569b942";
-          sha256 = "163d6027ea220493a607e7a815de1c2580a9d01672bb4f3987256a92034c4f52";
+          rev = "1fcbf095828dc91423f61a290887fe244750bf8a";
+          sha256 = "b53261201a0541c81ec91f5289d194e04bc80e78c5583ab478c4c7bdd7f4d543";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/notmuch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/notmuch";
           sha256 = "1sy9k6xbfl035qhnp8sdq9cb3xvgw3lkmdczyd6fw6yrzm5n0g1r";
           name = "notmuch";
         };
@@ -37889,7 +38308,7 @@
           sha256 = "1ss87vlp7625lnn2iah3rc1xfxcbpx4kmiww9n16jx073fs2rj18";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/notmuch-labeler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/notmuch-labeler";
           sha256 = "1c0cbkk5k8ps01xl63a0xa2adkqaj0znw8qs8ca4ai8v1420bpl0";
           name = "notmuch-labeler";
         };
@@ -37907,7 +38326,7 @@
           sha256 = "0mmdf3z9299hbs3wr8hqgpmg74sb2xm0rxyh38sjcqmk8f310rqh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/novice+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/novice+";
           sha256 = "0r4w4c6y4fny8k0kipzqjsn7idwbi9jq6x9yw51d41ra3pkpvfzf";
           name = "novice-plus";
         };
@@ -37928,7 +38347,7 @@
           sha256 = "0jahr1380919p272srym1pp16ifdz69fn1m45ppglm54q4a741d8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/noxml-fold";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/noxml-fold";
           sha256 = "11dninxxwhflf2qrmvwmrryspd9j6m95kdlmyx59ykqvw8j0siqc";
           name = "noxml-fold";
         };
@@ -37949,7 +38368,7 @@
           sha256 = "1nwj1ax2qmmlab4lik0b7japhqd424d0rb995dfv89p99gp8vmvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nrepl-eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nrepl-eval-sexp-fu";
           sha256 = "17g4nih9kz2483ylp651lwfxkvmaj7wpinpgnifwbciyrplfvx2j";
           name = "nrepl-eval-sexp-fu";
         };
@@ -37970,7 +38389,7 @@
           sha256 = "1129r3rzmfbl8nxjz71xnlyaszhhldawj467zbl36brdadp014n1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nrepl-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nrepl-sync";
           sha256 = "01b504b4d8rrhlf3sfq3kk9i222fch6jd5jbm02kqw20fgv6q3jd";
           name = "nrepl-sync";
         };
@@ -37991,7 +38410,7 @@
           sha256 = "1w80mbwlvmpd5ff7vy84z61b27klzh9z4wa6m2g7cy674fw4r1xp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nsis-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nsis-mode";
           sha256 = "0pc047ryw906sz5mv0awvl67kh20prsgx6fbh0j1qm0cali2792l";
           name = "nsis-mode";
         };
@@ -38012,7 +38431,7 @@
           sha256 = "0nbmpnljl0wdkwmxzg6lqd3mand9w043qmwp727hb84gxy0j4dib";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nu-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nu-mode";
           sha256 = "0h5jaw577vgm3hfiwc2c0k1wn8zda8ps06vj6mqj952m8bqhf4i7";
           name = "nu-mode";
         };
@@ -38033,7 +38452,7 @@
           sha256 = "045m83rdqryjpqh6y9s6x0yf9fw9xrwmxbm4qgg8ka164x9szv0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/number";
           sha256 = "1nwcdv5ibirxx3sqadh6mnpj40ni3wna7wnjh343mx38dk2dzncf";
           name = "number";
         };
@@ -38054,7 +38473,7 @@
           sha256 = "1i0yymsx8kin28bkrgwkk9ngsmjh0gh5j4hb0k03bq4fy799f2xx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nummm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nummm-mode";
           sha256 = "10khhc6q0zjzrhsv4fgfdbs7qcwi1bgkwq4yqzidqcdndsailyh0";
           name = "nummm-mode";
         };
@@ -38075,7 +38494,7 @@
           sha256 = "0prag0ks511ifa5mdpqmizp5n8190dxp4vdr81ld9w9xv7migpd7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nvm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nvm";
           sha256 = "03gy7wavc2q02lnr9pmp3l1pn0lzbdq0kwnmg9fvklmq6r6n3x34";
           name = "nvm";
         };
@@ -38096,7 +38515,7 @@
           sha256 = "1v8ndr8hdbqhd7nca8882g05y36pigv6lj7hpxl50lr1lvp1kmmf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nyan-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nyan-mode";
           sha256 = "1z2wnsbjllqa533g1ab5cgbv3d9hjix7fsd7z9c45nqh5cmadmyv";
           name = "nyan-mode";
         };
@@ -38117,7 +38536,7 @@
           sha256 = "0bgspjy8h3d7v12sfjnd2ghj4183pdf0z48g5xs129jwd3nycykp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nyan-prompt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nyan-prompt";
           sha256 = "1s0qyhpfpncsv9qfxy07rbp4gv8pp5xzb48rbd3r14nkjlnylnfb";
           name = "nyan-prompt";
         };
@@ -38138,7 +38557,7 @@
           sha256 = "0xs6787a4v7djgd2zz2v1pk14x27mg2ganz30j9f0gdiai7da6ch";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/o-blog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/o-blog";
           sha256 = "08grkyvg27wd5232q3y8p0v7higfq7bmsdzmvhja96v6qy2xsbja";
           name = "o-blog";
         };
@@ -38159,7 +38578,7 @@
           sha256 = "058dyk1c3iw0ip8n8rfpskvqiriqilpclkzc18x73msp5svrh3lj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/oauth";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/oauth";
           sha256 = "18z3i5brxm60z373cwx2sa3hx7v38a5s62gbs9b0lxb20ah4p9rz";
           name = "oauth";
         };
@@ -38175,11 +38594,11 @@
         version = "20150804.1700";
         src = fetchhg {
           url = "https://bitbucket.com/pdo/axiom-environment";
-          rev = "d7ea57a27527";
-          sha256 = "1vk7jjbf8wp183c4nagkgxvzcyrdlr53avzsxl111rm5rsxbvdli";
+          rev = "f7b3a13f54ea";
+          sha256 = "1qq0b92mf73fnx2viwzlsxr6672wkskf0vjimymyhv9aq3gw165w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-axiom";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-axiom";
           sha256 = "12cmzhgzk8314y6nvzdjwidalccz6h440lil83c1h4lz4ddlwmf6";
           name = "ob-axiom";
         };
@@ -38200,7 +38619,7 @@
           sha256 = "1nzli8wk3nd05j2z2fw511857qbawirhg8mfw21wqclkz8zqn813";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-browser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-browser";
           sha256 = "1yqbzmmazamgf8fi8ipq14ffm8h1pp5d2lkflbxjsagdq61hirxm";
           name = "ob-browser";
         };
@@ -38221,7 +38640,7 @@
           sha256 = "1xbczyqfqdig5w6jvx2kg57mk16sbiz5ysv445v83wqk0sz6nc9n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-cypher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-cypher";
           sha256 = "1ygmx0rjvxjl8hifkkwrkk9gpsmdsk6ndb6pg7y78p8hfp5jpyq3";
           name = "ob-cypher";
         };
@@ -38242,7 +38661,7 @@
           sha256 = "0qknm1h2ijnzs1km51hqwpnv5083m9ngi3nbxd90r7d6vva5fhhk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-elixir";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-elixir";
           sha256 = "1l5b9hww2vmqnjlsd6lbjpz9walck82ngang1amfnk4xn6d0gdhi";
           name = "ob-elixir";
         };
@@ -38255,15 +38674,15 @@
     ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ob-http";
-        version = "20151128.430";
+        version = "20160128.423";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-http";
-          rev = "d9af67c6726c50447d8cf21b9c1c25a3a07dc0ce";
-          sha256 = "1yv1i646ll9wnmarcwcmx3nvscq3sv22rmnphvqcr0whrd9vb7rb";
+          rev = "149a921b0a18ae765afaaa8d3b792a0f25b94faf";
+          sha256 = "14jpr8igxgs8gwcr2w13hnis66qlyjgmcn7fibvyprrpg8z69xak";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-http";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-http";
           sha256 = "0b7ghz9pqbyn3b52cpmnwa2wnd4svj23p6gc48ybwzwiid42wiss";
           name = "ob-http";
         };
@@ -38284,7 +38703,7 @@
           sha256 = "0r5p2gr7ri4w79lmhil4fgh6g8cmxs1qp8glkbvycvlaxwrzszhs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-ipython";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-ipython";
           sha256 = "06llf365k8m81ljmlajqvxlh84qg6h0flp3m6gb0zx71xilvw186";
           name = "ob-ipython";
         };
@@ -38305,7 +38724,7 @@
           sha256 = "01cjwg27m0iqndkwwl0v5w8vvk270xvi81za3y5hyrmb7dq6bfy7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-kotlin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-kotlin";
           sha256 = "19g4s9dnipg9aa360mp0affmnslm6h7byg595rnaz6rz25a3qdpx";
           name = "ob-kotlin";
         };
@@ -38326,7 +38745,7 @@
           sha256 = "1mk7qcf4svf4yk4mimcyhbw5imq3zps2vh2zzq9gwjcn17jnplhn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-lfe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-lfe";
           sha256 = "11cpaxk9wb27b9zhyns75dqpds4gh3cbjcvia4p2bnvmbm8lz4y8";
           name = "ob-lfe";
         };
@@ -38347,7 +38766,7 @@
           sha256 = "0qibnn908a59jyfslsnpjanbm85f8xw9zywsqsh37nv27ncbx0hr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-mongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-mongo";
           sha256 = "1cgmqsl5dzi8xy3sh5xsfkczl555fpd4q6kgsh9xkn74sz227907";
           name = "ob-mongo";
         };
@@ -38368,7 +38787,7 @@
           sha256 = "14scbds1rlmii52i0zr3s0r1wmga7qysj63c2dpinhagxa36d51n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-prolog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-prolog";
           sha256 = "0ki8yd20yk5xwn0zpk06zjxzgrsf8paydif9n98svb9s2l9wrh1s";
           name = "ob-prolog";
         };
@@ -38378,22 +38797,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ob-restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ob-restclient = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, restclient }:
     melpaBuild {
         pname = "ob-restclient";
-        version = "20151207.1503";
+        version = "20160201.656";
         src = fetchFromGitHub {
           owner = "alf";
           repo = "ob-restclient.el";
-          rev = "fc5684186275146bba667325c8c33bf7d6011552";
-          sha256 = "0gd2n7dgaasl0clx71gsdm74xxm03qr5yrin8vz3q7wvkfn4bzdf";
+          rev = "c2686286b7d17fc8c059c7a5b301142718fdf2de";
+          sha256 = "18b5k02mnswsv6jijvh9kb5ps5r0imkvr9r3r3x8fkyjh3k4f5il";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-restclient";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-restclient";
           sha256 = "0nv2wsqmpschym6ch8fr4a79hlnpz31jc8y2flsygaqj0annjkfk";
           name = "ob-restclient";
         };
-        packageRequires = [];
+        packageRequires = [ restclient ];
         meta = {
           homepage = "http://melpa.org/#/ob-restclient";
           license = lib.licenses.free;
@@ -38410,7 +38829,7 @@
           sha256 = "0gymna48igcixrapjmg842pnlsshhw8zplxwyyn0x2yrma9fjyyg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-sml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-sml";
           sha256 = "04qvzhwjr8ipvq3znnhn0wbl4pbb1rwxi90iidavzk3phbkpaskn";
           name = "ob-sml";
         };
@@ -38431,7 +38850,7 @@
           sha256 = "1yaqs6zcx8228pwzsm19h6272bw9lhib6xz5xzzq8x8n54l81225";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-translate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-translate";
           sha256 = "1hi0rxbyxvk9sbk2fy3kqw7l4lgri921vya1mn4i1q2i1979r2gz";
           name = "ob-translate";
         };
@@ -38452,7 +38871,7 @@
           sha256 = "1ycqdjqn5361pcnc95hxhjqd3y96cjjnaylrnzwhmacl38jm3vai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-typescript";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-typescript";
           sha256 = "1wpy928ndvc076jzi14f6k5fsw8had0pz7f1yjdqql4icszhqa0p";
           name = "ob-typescript";
         };
@@ -38473,7 +38892,7 @@
           sha256 = "16462cgq91jg7i97h440zss5vw2qkxgdy7gm148ns4djr2fchnf6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/oberon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/oberon";
           sha256 = "1wna7ld670r6ljdg5yx0ga0grbq1ma8q92gkari0d5czr7s9lggv";
           name = "oberon";
         };
@@ -38494,7 +38913,7 @@
           sha256 = "138c1nm579vr37dqprqsakfkhs2awm3klzyyd6bv9rhkrysrpbqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/objc-font-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/objc-font-lock";
           sha256 = "0njslpgdcph3p3gamrbd6pc04szks07yv4ij3p1l7p5dc2p06rs6";
           name = "objc-font-lock";
         };
@@ -38515,7 +38934,7 @@
           sha256 = "00v21iw9wwxap8jhg9035cp47fm5v2djmldq6nprv860m01xlwh1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/obsidian-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/obsidian-theme";
           sha256 = "17ckshimdma6fqiis4kxczxkbrsfpm2a0b41m5f3qz3qlhcw2xgr";
           name = "obsidian-theme";
         };
@@ -38536,7 +38955,7 @@
           sha256 = "0pnliw02crqw8hbg088klz54z6s1ih8q2lcn9mq5f12xi752hxm8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/occidental-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/occidental-theme";
           sha256 = "1ra5p8k96wvb04v69xm87jl4jlgi57v4jw2xxzkwbwxbydncnv0b";
           name = "occidental-theme";
         };
@@ -38557,7 +38976,7 @@
           sha256 = "1v1c2481v2xgnw8kgbbqhqkdd41lzvki9hm3iypbf3n0jxz8nnzy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/occur-context-resize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/occur-context-resize";
           sha256 = "0sp5v4rwqgqdj26gdkrmjvkmbp4g6jq4lrn2c3zm8s2gq0s3l6ri";
           name = "occur-context-resize";
         };
@@ -38578,7 +38997,7 @@
           sha256 = "1zj0xhvl5qx42injv0av4lyzd3jsjls1m368dqd2qnswhfw8wfn6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/occur-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/occur-x";
           sha256 = "1xq1k9rq7k1zw90shbgiidwvcn0ys1d53q03b5mpvvfqhj4n0i1g";
           name = "occur-x";
         };
@@ -38599,7 +39018,7 @@
           sha256 = "155gmls6cz3zf4lcj89kzb96y7k0glx0f659jg5z0skgxq79hf48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ocodo-svg-modelines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ocodo-svg-modelines";
           sha256 = "0fa88ns70wsr9i9gf4zx3fvmn1a32mrjsda105n0cx6c965kfmay";
           name = "ocodo-svg-modelines";
         };
@@ -38620,7 +39039,7 @@
           sha256 = "0p3wsxkj9jpnxanl6r8glf9wvyjbf5z24idvaa1j07whlq68bcrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ocp-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ocp-indent";
           sha256 = "0wc4z9dsnnyr24n3vg1npvc3rm53av8bpbvrl8kldxxdiwgnbkjw";
           name = "ocp-indent";
         };
@@ -38641,7 +39060,7 @@
           sha256 = "0dp7dhmgrq078rjhpm1cr993qjqz7qgy2z4sn73qw6j55va7d9kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/octicons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/octicons";
           sha256 = "02f37bvnc5qvkvfbyx5wp54nz71bqm747mq1p5361sx091lllkxk";
           name = "octicons";
         };
@@ -38654,15 +39073,15 @@
     octopress = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "octopress";
-        version = "20151006.514";
+        version = "20160123.1606";
         src = fetchFromGitHub {
           owner = "aaronbieber";
           repo = "octopress.el";
-          rev = "2e068887b17b72a69e29349d477333d067867eec";
-          sha256 = "1fc9iabxfmyqb41j31rgbzxdmnjrzqh1pp9s15q6s7b2d7mc0a0y";
+          rev = "842907662c613710a87feeb1e4a29f4d32111683";
+          sha256 = "0p9ph62vnw1r9dbvrjyw356a9bjnzh0hglssi97dr0qd6cs8whf3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/octopress";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/octopress";
           sha256 = "0zsir6chjvn5i1irmf5aj6mmb401c553r5wykq796sz7jnjhrjg0";
           name = "octopress";
         };
@@ -38683,7 +39102,7 @@
           sha256 = "1bjrgj8klg7ly63vx90jpaih9virn02bhqi16p6z0mw36q1q7ysq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/offlineimap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/offlineimap";
           sha256 = "0nza7lrz7cn06njcblwh9hy3050j8ja4awbxx7jzv6nazjg7201b";
           name = "offlineimap";
         };
@@ -38704,7 +39123,7 @@
           sha256 = "0y9fxrsxp1158fyjp4f69r7g2s7b6nbxlsmsb8clwqc8pmmg2z82";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/oldlace-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/oldlace-theme";
           sha256 = "1pxiqqh5x4wsayqgwplzvsbalbj44zvby7x0pijdvwcnsh74znj8";
           name = "oldlace-theme";
         };
@@ -38725,7 +39144,7 @@
           sha256 = "1mh4dlx5j2zwv7zx8x52vl6h38jr41ly5bn6zqsncnafd1a8l7x7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/olivetti";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/olivetti";
           sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd";
           name = "olivetti";
         };
@@ -38746,7 +39165,7 @@
           sha256 = "03szb2i2xk3nq578cz1drsddsbld03ryvykdfzmfvwcmlpaknvzb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/om-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/om-mode";
           sha256 = "1q2h9wjnyg7wlk913px4vj1cxqynd6xfh9ind7kjyra436yw3l4j";
           name = "om-mode";
         };
@@ -38767,7 +39186,7 @@
           sha256 = "1925mh47n4x9v780qp5l6cksl64v9mpyb87znsg93x6sxr0cvv4c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-kill";
           sha256 = "03kydl16rd9mnc1rnan2byqa6f70891fhcj16wkavl2r68rfj75k";
           name = "omni-kill";
         };
@@ -38788,7 +39207,7 @@
           sha256 = "1nvgh9wvgswcs3r958b579rsx540xrhlnafc6cmcd63z6yck19w0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-log";
           sha256 = "0c29243zq8r89ax4rxlmb8imag12icnldcb0q0xsnhjccw8lyw1r";
           name = "omni-log";
         };
@@ -38809,7 +39228,7 @@
           sha256 = "1x8af8jv4n83sl4rgj0d2rpmw9g78rknm1h523f3b1a5x4kdvsz6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-quotes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-quotes";
           sha256 = "0dqki0ibabs9cpcjvnh8lc2114x46i1xmnyjc6qqblfxa3ggdygs";
           name = "omni-quotes";
         };
@@ -38830,7 +39249,7 @@
           sha256 = "1icdk19vwihc8mn04yxl2brql2gssn3gxd5bv7ljdd6mn5hkw500";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-scratch";
           sha256 = "190dkqcw8xywzrq8a99w4rqi0y1h2aj23s84g2ln1sf7jaf6d6n9";
           name = "omni-scratch";
         };
@@ -38851,7 +39270,7 @@
           sha256 = "1lvnkdrav7h15p8d5ayhfsjynllwp4br1vqxmw0ppxnlyq7337n5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-tags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-tags";
           sha256 = "133ww1jf14jbw02ssbx2a46mp52j18a2wwzb6x77azb0akmf1lzl";
           name = "omni-tags";
         };
@@ -38872,7 +39291,7 @@
           sha256 = "1hzvpajq58py6k7z2rwwax1c7pm65m534mq8mr9g9kxn9hqiz9n8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omniref";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omniref";
           sha256 = "0lgw1knqppdg046zqx4m7nbzvsasr89wa9i4594hf46w1094dabj";
           name = "omniref";
         };
@@ -38893,7 +39312,7 @@
           sha256 = "1iq8yzjv7wb0jfi3lqqyx4n7whvb7xf8ls0q0w7pgsrsslrxbwcm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omnisharp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omnisharp";
           sha256 = "0dwya22y92k7x2s223az1g8hmrpfmk1sgwbr9z47raaa8kd52iad";
           name = "omnisharp";
         };
@@ -38923,7 +39342,7 @@
           sha256 = "1616bdvrf1bawcqgj7balbxaw26waw81gxiw7yspnvpyb009j66y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/on-parens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/on-parens";
           sha256 = "19kyzpkgfl0ipbcgnl8fbfbapnfdxr8w9i7prfkm6rjp6amxyqab";
           name = "on-parens";
         };
@@ -38944,7 +39363,7 @@
           sha256 = "1rksk0j9b27w913bzbq7w2ws75yi66m24ic6ljdhhbrq3z2ic7dy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/on-screen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/on-screen";
           sha256 = "104jisc2bckzrajxlvj1cfx1drnjj7jhqjblvm89ry32xdnjxmqb";
           name = "on-screen";
         };
@@ -38962,7 +39381,7 @@
           sha256 = "05njigqi9061d34530d76kwsdzqgk9qxnwhn9xis64w59f5nzf1h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/oneonone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/oneonone";
           sha256 = "0v4nvhzgq97zbi18jd3ds57yh1fpv57b2a1cd7r8jbxwaaz3gpg9";
           name = "oneonone";
         };
@@ -38983,7 +39402,7 @@
           sha256 = "1yqrp9icci5snp1485wb6y8mr2hjp9006ahch58lvmnq98bn7j45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/opam";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/opam";
           sha256 = "004r93nn1ranvxkcc0y5m3p8gh4axgghgnsvim38nc1sqda5h6xa";
           name = "opam";
         };
@@ -39001,7 +39420,7 @@
           sha256 = "1vjmgayksdgg54b46aqmvhd7a9arjx9p3jyrjs2z9262f6r288lj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/open-junk-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/open-junk-file";
           sha256 = "0ybycprs5di9niai4hbmfq4xdacfgrzf1mwq1aj1hi53phl8l4di";
           name = "open-junk-file";
         };
@@ -39022,7 +39441,7 @@
           sha256 = "0086pfk4pq6xmknk7a42fihcjgzkcplqqc1rk9fhwmn9j7djbq70";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/openstack-cgit-browse-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/openstack-cgit-browse-file";
           sha256 = "05dl28a4npnnzzipypfcqb21sdww715lwji2xnsabx3fb1h1w5jl";
           name = "openstack-cgit-browse-file";
         };
@@ -39041,7 +39460,7 @@
           sha256 = "1wl6gnxsyhaad4cl9bxjc0qbc5jzvlwbwjbajs0n1s6qr07d6r01";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/openwith";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/openwith";
           sha256 = "05lkx3yfv2445fp07bhqv2aqz5hgf3dxp39lmz3nfxn4c9v8nkqi";
           name = "openwith";
         };
@@ -39062,7 +39481,7 @@
           sha256 = "0iw3c8sn702ziki59mvd5gxm484i7f0bwsy8fz95y08s9gknjjf9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/operate-on-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/operate-on-number";
           sha256 = "1rw3fqbzfizgcbz3yaf99rr2546msna4z7dyfa8dbi8h7yzl4fhk";
           name = "operate-on-number";
         };
@@ -39083,7 +39502,7 @@
           sha256 = "1xckin2d6s40kgr2293g72ipc57f8gp6y63303kmqcv3qm8q13ca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-ac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-ac";
           sha256 = "059jr3v3558cgw626zbqfwmwwv5f4637ai26h7b6psqh0x9sf3mr";
           name = "org-ac";
         };
@@ -39104,7 +39523,7 @@
           sha256 = "15xgkm5p30qfghyhkjivh5n4770794qf4pza462vb0xl5v6kffbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-agenda-property";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-agenda-property";
           sha256 = "0zsjzjw52asl609q7a2s4jcsm478p4cxzhnd3azyr9ypxydjf6qk";
           name = "org-agenda-property";
         };
@@ -39125,7 +39544,7 @@
           sha256 = "0yzvir2gmyv9k43q3sf37lc9xcmfyaj5wh825xax7305j3b2hhvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-alert";
           sha256 = "0n5a24iv8cj395xr0gfgi0hs237dd98zm2fws05k47vy3ygni152";
           name = "org-alert";
         };
@@ -39138,15 +39557,15 @@
     org-attach-screenshot = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-attach-screenshot";
-        version = "20160104.1446";
+        version = "20160125.1532";
         src = fetchFromGitHub {
           owner = "dfeich";
           repo = "org-screenshot";
-          rev = "5e80f275ee3fe540a72e5f5b11a0d8634e46cafb";
-          sha256 = "1b3n4cbpx7crvkc8kx651f8ap68xhpvq0kp4f6c9sqp4n6wg7g35";
+          rev = "628e82cc0e78ff2d3b08685d72aefe3568947b38";
+          sha256 = "0f4ja4m1r6bbgachipswb2001ryg8cqcxjvwmnab951mw0cbg7v4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-attach-screenshot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-attach-screenshot";
           sha256 = "0108kahyd499q87wzvirv5d6p7jrb7ckz8r96pwqzgflj3njbnmn";
           name = "org-attach-screenshot";
         };
@@ -39167,7 +39586,7 @@
           sha256 = "0j6fqgzvbmvvdh0dgwsxq004wxys2zwnq9wa3idm087ynp2a2ani";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-autolist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-autolist";
           sha256 = "1jvspxhxlvd7h1srk9dbk1v5dykmf8jsjaqicpll7ial6i0qgikj";
           name = "org-autolist";
         };
@@ -39188,7 +39607,7 @@
           sha256 = "00iklf97mszrsdv20q55qhml1dscvmmalpfnlkwi9mabklyq3i6z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-beautify-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-beautify-theme";
           sha256 = "1j2gi3f72kvavdcj6xs7zng0dcnivrhc7pjzm2g4mjm5ad5s1flq";
           name = "org-beautify-theme";
         };
@@ -39209,7 +39628,7 @@
           sha256 = "10nr4sjffnqbllv6gmak6pviyynrb7pi5nvrq331h5alm3xcpq0w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-bullets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-bullets";
           sha256 = "1kxhlabaqi1g6pz215afp65d9cp324s8mvabjh7q1h7ari32an75";
           name = "org-bullets";
         };
@@ -39230,7 +39649,7 @@
           sha256 = "0lq2rx6wgz0aymwhw597xs2pabinhk3jpnnhjwq0jk8ggp3afqaz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-caldav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-caldav";
           sha256 = "0166y04gxrwnynm4jshm2kqk5jbvl5g5078dxvw18nicrgq3y4r8";
           name = "org-caldav";
         };
@@ -39251,7 +39670,7 @@
           sha256 = "1g9fanikdcbkmvbh9bp5dg3s2maawkqinjavn5158p0gy68ab240";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-cliplink";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-cliplink";
           sha256 = "19l3k9w9csgvdr7n824bzg7jja0f28dmz6caldxh43vankpmlg3p";
           name = "org-cliplink";
         };
@@ -39272,7 +39691,7 @@
           sha256 = "0q4v216ihhwv8rlb9xc8xy7nj1p058xabfflglhgcd7mfjrsyayx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-context";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-context";
           sha256 = "19y8aln7wix9p506ajvfkl641147c5mdmjm98jnq68cx2r4wp6zz";
           name = "org-context";
         };
@@ -39293,7 +39712,7 @@
           sha256 = "0nrfvmqb70phnq0k4wbdj6z666wq6xvabg4pgv8qn62rbrw4yyhm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-cua-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-cua-dwim";
           sha256 = "0p7v564p8n1hm7rzlrbm2pnhyha8aif2r9g7g4kg0iqln89f5yhc";
           name = "org-cua-dwim";
         };
@@ -39314,7 +39733,7 @@
           sha256 = "1nqfi139cag3ll8wxk8rh59hay97vi8i0mlgnams4jla285zydj5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-dashboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-dashboard";
           sha256 = "1hvhhbmyx12wsf2n1hd0hg5cy05zyspd82xxcdh04g4s9r3ikqj5";
           name = "org-dashboard";
         };
@@ -39335,7 +39754,7 @@
           sha256 = "1wrgqdrfdxc1vrcr6dsa8dcxrwj6zgjr9h1fzilwnxlzfvdilnsm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-doing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-doing";
           sha256 = "17w49z78fvbz182sxv9mnryj124gm9jbdmbybppjqz4rk6wvnm2j";
           name = "org-doing";
         };
@@ -39356,7 +39775,7 @@
           sha256 = "15zrnd168n4pwa1bj5fz79hcrgw61braf0b095rsfhjh5w2sasy7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-dotemacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-dotemacs";
           sha256 = "1vc391fdkdqd4g0piq66zhrlgqx5s2ijv7qd1rc3a235sjb9i2n4";
           name = "org-dotemacs";
         };
@@ -39377,7 +39796,7 @@
           sha256 = "12k3iqzmj92cvi0d99mn3ylxj00p2f2f8049dd2nxnp1gxs2k4dq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-download";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-download";
           sha256 = "19yjx0qqpmrdwagp3d6lwwv7dcb745m9ccq3m29sin74f5p4svsi";
           name = "org-download";
         };
@@ -39398,7 +39817,7 @@
           sha256 = "0m5c9x0vazciq6czpg5y9nr5yzjf6nl0qp5cfajv49cw2h0cwqyy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-drill-table";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-drill-table";
           sha256 = "1gb5b4hj4xr8nv8bxfar145i38zcic6c34gk98wpshvwzvb43r69";
           name = "org-drill-table";
         };
@@ -39419,7 +39838,7 @@
           sha256 = "0jjdsng7fm4wbhvd9naqzdfsmkvj1sf1d9rikprg1pd58azv6idx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-dropbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-dropbox";
           sha256 = "0qfvdz13ncqn7qaz03lwabzsnk62z6wqzlxlvdqv5xyllcy9m6ln";
           name = "org-dropbox";
         };
@@ -39440,7 +39859,7 @@
           sha256 = "0kqvwqmwnwg2h7r38fpjg6qlkcj9v8011df8nmsgs1w1mfdvnjsq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-ehtml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-ehtml";
           sha256 = "0n82fbd7aircqg2c9m138qfv8csrv0amhya3xlwswdkqn51vn3gw";
           name = "org-ehtml";
         };
@@ -39461,7 +39880,7 @@
           sha256 = "0va8wm319vvw7w0j102mx656icy3fi4mz3b6bxira6z6xl9b92s0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-elisp-help";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-elisp-help";
           sha256 = "0a4wvz52hkcw5nrml3h1yp8w97vg5jw22wnpfbb827zh7iwb259h";
           name = "org-elisp-help";
         };
@@ -39482,7 +39901,7 @@
           sha256 = "1mpdk34l08m53r7dk8qaza7kvscy9jxv7bjwc232s1xhgy3mcin5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-eww";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-eww";
           sha256 = "132asshgfpphjckd5vz1vcs18lj55mrqs1l4ggfa89rc6aj8xrca";
           name = "org-eww";
         };
@@ -39502,7 +39921,7 @@
           sha256 = "35000fb42e317ec1a6e6c7b448bfdec7ecf65fd9f5ab4723062513c3a4acba79";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-fstree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-fstree";
           sha256 = "11ddkfddmsy26mmhgw24757f753ssh056v9vxn89pxp4qypxidfz";
           name = "org-fstree";
         };
@@ -39523,7 +39942,7 @@
           sha256 = "0r5w85bflmky3xzwqr7g7x7srdm43i93vg0gqnhh6k0ldy7ypc06";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-gcal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-gcal";
           sha256 = "1mp6cm0rhd4r9pfvsjjp86sdqxjbbg7gk41zx0zf0s772smddy3q";
           name = "org-gcal";
         };
@@ -39544,7 +39963,7 @@
           sha256 = "0b57ik05iax2h3nrj96kysbk4hxmxlaabd0n6lv1xsayrlli3sj1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-gnome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-gnome";
           sha256 = "0c37gfs6xs0jbvg6ypd4z5ip1khm26wr5lxgmv1dzcc383ynzg0v";
           name = "org-gnome";
         };
@@ -39565,7 +39984,7 @@
           sha256 = "10jwqzs431mnwz717qdmcn0v8raklw41sbxbnkb36yrgznk8c09c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-grep";
           sha256 = "0kpgizy0zxnlmyh0prwdll62ri2c1l4sb0yrkl7yw17cr4gxmkkz";
           name = "org-grep";
         };
@@ -39586,7 +40005,7 @@
           sha256 = "1iyqv34b7q2k73srshcnpvfzcadq47w4rzkqp6m1d3ajk8x2vypq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-if";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-if";
           sha256 = "0h0jdyawz2j4mp33w85z8q77l37qid8palvw5n4z379qa0wr5h96";
           name = "org-if";
         };
@@ -39607,7 +40026,7 @@
           sha256 = "1n7l70pl9x6mh7dyyiihg4zi1advzlaq2x7vivhas1i2120884i6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-iv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-iv";
           sha256 = "1akhabp6mdw1h7zms6ahlfvwizl07fwsizwxpdzi4viggfccsfwx";
           name = "org-iv";
         };
@@ -39628,7 +40047,7 @@
           sha256 = "0whv8nsla93194jjpxrhlr6g230spdxbac8ibmzmyad075vx97z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-jekyll";
           sha256 = "0jh3rla8s8prprvhnlg0psdrj7swz7v6vf2xy1m6ff66p9saiv8i";
           name = "org-jekyll";
         };
@@ -39649,7 +40068,7 @@
           sha256 = "0b5f8qkyzh4jwj3kvbaj3m4dpjbvh1fql7v1nb9bi5n7iwkv3lxp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-jira";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-jira";
           sha256 = "11h7kbkf38p2xycw8hvabpaacp72xdgy8c7kzcgjb2a8qlbs5ifm";
           name = "org-jira";
         };
@@ -39670,7 +40089,7 @@
           sha256 = "15swkzq5v9jnpmsziy8mj9rkriilxrm1c24lbfg0a4pwax5nkzp9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-journal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-journal";
           sha256 = "078z9b9hxbvmmxib6098f49rn7n3d0v4x37p7xxb0v8cv4izlb4s";
           name = "org-journal";
         };
@@ -39691,7 +40110,7 @@
           sha256 = "1797pd264zn19zk93nifyw6pwk2a7wrpfir373qclk601yv2g5h8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-link-travis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-link-travis";
           sha256 = "0hj4x7cw7a3ry8xislkz9bnavy77z4cpmnvns02yi3gnib53mlfs";
           name = "org-link-travis";
         };
@@ -39712,7 +40131,7 @@
           sha256 = "1bggz782ci0z6aw76v51ykbmfzh5g6cxh43w798as1152sn7im3p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-linkany";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-linkany";
           sha256 = "0arjj3c23yqm1ljvbnl7v9cqvd9lbz4381g8f3jyqbafs25bdc3c";
           name = "org-linkany";
         };
@@ -39728,11 +40147,11 @@
         version = "20140107.719";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "f3f4b21c57262c8e1527433634d54c1e496055f0";
-          sha256 = "fa1f174e35aad41ca090982ba645f7734201cf720336bce3ab3c07432d345170";
+          rev = "99697abdb98f67d8fad90a2fd39316ea3c0982dd";
+          sha256 = "9124972a0892d6782da739102e0648af184f24c6a5ca0e24b7571d6a018356b5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-mac-iCal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-mac-iCal";
           sha256 = "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw";
           name = "org-mac-iCal";
         };
@@ -39748,11 +40167,11 @@
         version = "20160109.1643";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "f3f4b21c57262c8e1527433634d54c1e496055f0";
-          sha256 = "fa1f174e35aad41ca090982ba645f7734201cf720336bce3ab3c07432d345170";
+          rev = "99697abdb98f67d8fad90a2fd39316ea3c0982dd";
+          sha256 = "9124972a0892d6782da739102e0648af184f24c6a5ca0e24b7571d6a018356b5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-mac-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-mac-link";
           sha256 = "02rmhrwikppppw8adnzvwj43kp9wsyk60csj5pygg7cd7wah7khw";
           name = "org-mac-link";
         };
@@ -39773,7 +40192,7 @@
           sha256 = "0d22q57mizw70qxbvwi4yz15jg86icqq1z963rliwss3wgpirndh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-mobile-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-mobile-sync";
           sha256 = "1cj0pxcjngiipmyl0w1p0g4wrxgm2y98a8862x1lcbali9lqbrwj";
           name = "org-mobile-sync";
         };
@@ -39794,7 +40213,7 @@
           sha256 = "0zbpzm9lni6z180s7n52x8s5by5zkq2nlhx82l2h9i7in9y4r6c3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-multiple-keymap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-multiple-keymap";
           sha256 = "16iv5575634asvn1b2k535ml8g4lqgy8z5w6ykma5f9phq5idb9f";
           name = "org-multiple-keymap";
         };
@@ -39815,7 +40234,7 @@
           sha256 = "132jv1zvp3yp4pa4ysl0n3a81d39cdi3nqfziz1ha1pl10qbn6wr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-octopress";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-octopress";
           sha256 = "0r6ms9j4xxsrik4206g7gz4wz41wr4ylpal6yfqs4hhz88yhxrhw";
           name = "org-octopress";
         };
@@ -39836,7 +40255,7 @@
           sha256 = "10dddbs9jppqqzwwv5y6pj2szdkw3223gvzzd4pzn9biv5d9kzsb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-outlook";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-outlook";
           sha256 = "0cn8h6yy67jr5h1yxsfqmr8q7ii4f99pgghfp821m01pj55qyjx9";
           name = "org-outlook";
         };
@@ -39846,22 +40265,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-page = callPackage ({ dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
+    org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
     melpaBuild {
         pname = "org-page";
-        version = "20160111.2331";
+        version = "20160201.353";
         src = fetchFromGitHub {
           owner = "kelvinh";
           repo = "org-page";
-          rev = "a69851476167395a387d561a6e526abf048295d0";
-          sha256 = "1k4yfrmv74mfyvbf5ddhx1mwzbnlrhc2qm30b9278hg6mqdd95sx";
+          rev = "83303ceaff69a08d9885471ca4b4b9a0f73584f2";
+          sha256 = "0lcbahpq90sv9a265r0ajm3zx3h1dmsz7fz2gw5ndjkz3c59qk93";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-page";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-page";
           sha256 = "1326m3w7vz22zk7rx40z28fddsccy5fl1qhbb7clci8l69blcc2v";
           name = "org-page";
         };
-        packageRequires = [ dash ht htmlize mustache org simple-httpd ];
+        packageRequires = [ cl-lib dash ht htmlize mustache org simple-httpd ];
         meta = {
           homepage = "http://melpa.org/#/org-page";
           license = lib.licenses.free;
@@ -39878,7 +40297,7 @@
           sha256 = "022qqas919aziq4scs5j1wdbvd0qyw8kkirn2vzfb5k2fjl8z7iq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-pandoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-pandoc";
           sha256 = "1r6j6rkwfv7fv7kp73gh1bdz3y5ffwk5f2wyv4mpxs885cfbsm8v";
           name = "org-pandoc";
         };
@@ -39895,11 +40314,11 @@
         src = fetchFromGitHub {
           owner = "leafac";
           repo = "org-password-manager";
-          rev = "b13f63aa4efca47e92cfe52865e99f230851fa03";
-          sha256 = "0v2b7byr56v4pffva93d80cppp3xk8nj3987vpwmczqiq5by1pc8";
+          rev = "85b61fb513cee8f4311998c4fc22f981c47ccefa";
+          sha256 = "0b02d6x8kmq5h3x2fk1cl59jq10c1wy6xmmcsrn37di8bpygdwhy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-password-manager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-password-manager";
           sha256 = "1l3h0qhv0ad9l933d47as8y3h9x94zw315ax4qsgiw3046nzkdwv";
           name = "org-password-manager";
         };
@@ -39912,15 +40331,15 @@
     org-pdfview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, pdf-tools }:
     melpaBuild {
         pname = "org-pdfview";
-        version = "20151125.1544";
+        version = "20160125.1454";
         src = fetchFromGitHub {
           owner = "markus1189";
           repo = "org-pdfview";
-          rev = "8f66629e883e0d490584bbf4610cc91938694889";
-          sha256 = "07xcibpqkr0kmwqvz9sfcd3bizscksvc7jw48zg6k79hb90vp1i0";
+          rev = "569b22197f2a5a08e7be7198c4d871f29559811f";
+          sha256 = "16z44kdsg8w1p27fsi72k8wqr35xbb0777rq7h7swv6j2jn1b6hc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-pdfview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-pdfview";
           sha256 = "1z4gb5lw7ngphixw06b5484kwlxbc098w2xshzml5sywr16a4iab";
           name = "org-pdfview";
         };
@@ -39941,7 +40360,7 @@
           sha256 = "015idpk66835jdg1sbvpksyr07xk4vn17z8cng2qw87fss688ihb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-pomodoro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-pomodoro";
           sha256 = "1vdi07hrhniyhhvg0hcr5mlixy6bjynvwm89z2lvfyvnnxpx0r27";
           name = "org-pomodoro";
         };
@@ -39962,7 +40381,7 @@
           sha256 = "1n9magg7r7xnw16d43fh6nzjf42s70l3mxq6ph727zi4lz5ngmfm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-present";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-present";
           sha256 = "09h0cjqjwhqychyrdv1hmiyak677vgf1b94392sdsq3ns70zyjk7";
           name = "org-present";
         };
@@ -39983,7 +40402,7 @@
           sha256 = "1jxw9r1mn9zf0vlvy89w9w6v6mhl8i210hkx86c9vcrkpcrpzmvi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-projectile";
           sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm";
           name = "org-projectile";
         };
@@ -40004,7 +40423,7 @@
           sha256 = "1jzp65sf1am6pz533kg1z666h4jlynvjyx1mf24gyksiiwdhypsy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-protocol-jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-protocol-jekyll";
           sha256 = "18wg489n2d1sx9jk00ki6p2rxkqz67kqwnmy2kb1ga1rmb6x9wfs";
           name = "org-protocol-jekyll";
         };
@@ -40025,7 +40444,7 @@
           sha256 = "1q3s12s0ll7jhrnd3adkaxv7ff69ppprv0pyl5f6gy8y51y63k8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-readme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-readme";
           sha256 = "1qqbsgspd006gy0kc614w7bg6na0ygmflvqkmw47899pbgj81hxh";
           name = "org-readme";
         };
@@ -40052,7 +40471,7 @@
           sha256 = "1q99b9l6y97iic46xqj7rqnkrzk8f0qq4qy81jv9wz54hq51w07v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-redmine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-redmine";
           sha256 = "0y2pm18nnyzm9wjc0j15v46nf3xi7a0wvspfzi360qv08i54skqv";
           name = "org-redmine";
         };
@@ -40065,15 +40484,15 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20160118.846";
+        version = "20160203.2047";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "aa8d51897553093e9f1f39817cb547d451635e03";
-          sha256 = "0z4qbfpw0w5kajc25s7wzk2gxfvb9dwjznhj103hp6pxdaw20gym";
+          rev = "4d0eaf48db5711d4a67bf5352ae9d79aa29dc5ec";
+          sha256 = "0bh5faz51hiy82j3355n78dqbcwwx5scizq6w5n1snpdxw6dxfjw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-ref";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-ref";
           sha256 = "087isxf3z8cgmmniaxr3lpq9jg3sriw88dwp4f0ky286hlvgzw08";
           name = "org-ref";
         };
@@ -40094,7 +40513,7 @@
           sha256 = "03c88jzwvl95dl39703mknkvnk3cmw4gss5c1y2k9py2rgh6bpr9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-repo-todo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-repo-todo";
           sha256 = "0l5ns1hs3i4dhrpmvzl34zc9zysgjkfa7j8apbda59n9jdvml5v1";
           name = "org-repo-todo";
         };
@@ -40107,15 +40526,15 @@
     org-rtm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, rtm }:
     melpaBuild {
         pname = "org-rtm";
-        version = "20160116.1025";
+        version = "20160119.824";
         src = fetchFromGitHub {
           owner = "pmiddend";
           repo = "org-rtm";
-          rev = "c01c45af2cbb4f15f0a8b92c600a5e11ff5cb8ec";
-          sha256 = "0j937x4qk2pb8vbq42qz5rsaf9x33rqfvay656naxzz0jvxj5nzl";
+          rev = "b40475213d32ea46d0bbb055c3d682242140794c";
+          sha256 = "1596npclhghlarb1cfg3q7ky43y8zm73npjv169acjb77yz29rix";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-rtm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-rtm";
           sha256 = "1paiy5zmdlxb3a1cjk9d30mqbl60bkairw6xkix2qw36p07jwlj5";
           name = "org-rtm";
         };
@@ -40136,7 +40555,7 @@
           sha256 = "14zn0b8qs740ls1069kg2lwm0b9yc4qv525fg8km0hgi0yp8qw7z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-sync";
           sha256 = "0n8fz2d1vg9r8dszgasbnb6pgaxr2i8mqrp953prf1nhmfpjpxad";
           name = "org-sync";
         };
@@ -40157,7 +40576,7 @@
           sha256 = "1qx3kd02sxs9k7adlvdlbmyhkc5kr7ni5lw4gxjw3nphnc536bkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-table-comment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-table-comment";
           sha256 = "1d40vl8aa1x27z4gwnkzxgrqp7vd3ln2pc445ijjxp1wr8bjxvdz";
           name = "org-table-comment";
         };
@@ -40167,6 +40586,48 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-tfl";
+        version = "20160131.1444";
+        src = fetchFromGitHub {
+          owner = "storax";
+          repo = "org-tfl";
+          rev = "c9e024ac55d9e0c61a273e75bd68981a623c9ab2";
+          sha256 = "1x241jaw726zjsplwf6svbvr8af09k6kqj7icpvcbyayivkbhxy2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-tfl";
+          sha256 = "1rqmmw0222vbxfn5wxq9ni2j813x92lpv99jjszqjvgnf2rkhjhf";
+          name = "org-tfl";
+        };
+        packageRequires = [ cl-lib emacs org ];
+        meta = {
+          homepage = "http://melpa.org/#/org-tfl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-themis = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-themis";
+        version = "20160121.2204";
+        src = fetchFromGitHub {
+          owner = "zellio";
+          repo = "org-themis";
+          rev = "78aadbbe22b1993be5c4accd0d3f91a4e85c9a3c";
+          sha256 = "1apd5yyr12skagma7xpzrh22rhplmhhv0pma4zf5b0i6nkxy06j2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-themis";
+          sha256 = "08rajz5y7h88fh94s2ad0f66va4vi31k9hwdv8p212bs276rp7ln";
+          name = "org-themis";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/org-themis";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-time-budgets = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-time-budgets";
@@ -40178,7 +40639,7 @@
           sha256 = "04adkz950vvwyzy3da468nnqsknpr5kw5369w2yqhnph16cwwfxb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-time-budgets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-time-budgets";
           sha256 = "0r8km586n6xdnjha7xnzlh03nw1dp066hydaz8kxfmhvygl9cpah";
           name = "org-time-budgets";
         };
@@ -40199,7 +40660,7 @@
           sha256 = "014337wimvzy0rxh2p2c647ly215zcyhgym2hcljkdriv15cafna";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-toodledo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-toodledo";
           sha256 = "0c7qr0jsc4iyrwkc22xp9nmk6984v7q1k0rvpd62m07lb5gvbiq3";
           name = "org-toodledo";
         };
@@ -40220,7 +40681,7 @@
           sha256 = "053wf36lq9piyzq7rv2lid34zanj6l9fvawp3r3nsniy5nlfckqx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-tracktable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-tracktable";
           sha256 = "0mngf9q2ffxq32cgng0xl30661mj15wmr9y4hr3xddj626kxrp00";
           name = "org-tracktable";
         };
@@ -40241,7 +40702,7 @@
           sha256 = "1h15fr16kgbyrxambmk4hsmha6hx4c4yqkccb82g3wlvzmnqj5x3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-transform-tree-table";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-transform-tree-table";
           sha256 = "0n68cw769nk90ms6w1w6cc1nxjwn1navkz56mf11bsiqvsk3km7r";
           name = "org-transform-tree-table";
         };
@@ -40262,7 +40723,7 @@
           sha256 = "19id53sjv0r0xnm3l8d694s27dxlmdfm9dal57zlf60s5lg8hykq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-tree-slide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-tree-slide";
           sha256 = "0v857zplv0wdbg4li667v2p5pn5zcf9fgbqcwa75x8babilkl6jn";
           name = "org-tree-slide";
         };
@@ -40283,7 +40744,7 @@
           sha256 = "0w0gw3varx8qrcfh3iwg6qqxavprm25bjv9ada34xqjdhsv537xc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-trello";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-trello";
           sha256 = "1rm91xccvdsqghdnrnjvyp8xfvrw5ac677vzzz24rz9dssh2mz9b";
           name = "org-trello";
         };
@@ -40311,7 +40772,7 @@
           sha256 = "1m2xdp6wfg11wi7s4i675c3m5qancm8bpizcf380r6vmkcdfkrdy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-vcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-vcard";
           sha256 = "0l6azshvzl1wws582njqr3qx4h73gwrdqwa3jcic1qbs9hg2l4yl";
           name = "org-vcard";
         };
@@ -40324,15 +40785,15 @@
     org-wc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-wc";
-        version = "20141101.120";
+        version = "20160204.1329";
         src = fetchFromGitHub {
           owner = "dato";
           repo = "org-wc";
-          rev = "f1765fc913f288432ee2cc330c8a7af3af7715c8";
-          sha256 = "0miahg10xx3sy85n22xqwjp1z7kcmcsb85dh0653sf7axp42kq98";
+          rev = "bfb9f2d670c9f700e86e1dd965be1cd6fdc86e32";
+          sha256 = "0xhfpv5g2smxywrnwzk2sgak99lv950imm03jdgldhrjz6z1g78y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-wc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-wc";
           sha256 = "1sa9fcy0bnn06swwq2gfrgmppd6dsbmw2mq0v73mizg3l6has1zb";
           name = "org-wc";
         };
@@ -40353,7 +40814,7 @@
           sha256 = "1izf0lxycg4wh3wfki1sfy283qwgfdf8rzb365z3sk1zzijjaw6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-webpage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-webpage";
           sha256 = "0vwv8cv38gx8rnfskbmnaf8y8sffjqy1408655bwhjz6dp69qmah";
           name = "org-webpage";
         };
@@ -40374,7 +40835,7 @@
           sha256 = "1cagmwl3acanwc2nky7m61cawi0i0x703sjc6zlw968lacyw86wa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-wunderlist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-wunderlist";
           sha256 = "08zg3wgr80rp89c53ffqzz22ws9bp62a1m74xvxa74x6nq9i4xl0";
           name = "org-wunderlist";
         };
@@ -40395,7 +40856,7 @@
           sha256 = "0q6dpih869rz94dqbi910vk5iwffbbl6hkraazc8rky7fnb4nh4s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org2blog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org2blog";
           sha256 = "0ancvn4ji4552k4nfd2ijclsd027am93ngg241ll8f6h6k0wpmzq";
           name = "org2blog";
         };
@@ -40416,7 +40877,7 @@
           sha256 = "064kw64w9snm0lbshxn8d6yd9xvyislhg37fmhq1w7vy8lm61xvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org2jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org2jekyll";
           sha256 = "1j9d6xf5nsakifxwd4zmjc29lbj46ffn3z109k2y2yhz7q3r9hzv";
           name = "org2jekyll";
         };
@@ -40429,15 +40890,15 @@
     organic-green-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "organic-green-theme";
-        version = "20151028.720";
+        version = "20160202.820";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "organic-green-theme";
-          rev = "c4d68c3329147aedd066a88b6d5e5266bcd59dcc";
-          sha256 = "0q90vm2z3vs9hg9zg5dl6c35f7ivzxj5df3y3h9xjif494ladbsg";
+          rev = "463c8216b33561263e0f605665ff3d705d39423a";
+          sha256 = "194mcm7xlzlwm4phy3b9pz7na3sdw6galnidf8aqjk97mgw9z74r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/organic-green-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/organic-green-theme";
           sha256 = "1fdj3dpcdqx0db5q8dlxag6pr2qn4yiz1hmg3c7dkmh51n85ssw2";
           name = "organic-green-theme";
         };
@@ -40458,7 +40919,7 @@
           sha256 = "0hwmr67nky9xp5xlrkp54nw6b72d29lmna28dnbgqs2i5rccbk55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orgbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orgbox";
           sha256 = "12wfqlpjh9nr7zgqs4h8kmfsk825n68qcbn8z2fw2mpshg3nj7l8";
           name = "orgbox";
         };
@@ -40471,15 +40932,15 @@
     orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "orgit";
-        version = "20151008.1614";
+        version = "20160119.1624";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "orgit";
-          rev = "731c5cb4f1c7e2ee5b819ca159c0c01e2b306c73";
-          sha256 = "0d7rh5bi5v04njj1nh8q8kdr6aw68lcw4ghx6kwq97aff4qmcrp1";
+          rev = "12bfadf603d8a1f616a1bdac5f909a0c20e6aba4";
+          sha256 = "1wxxdx3c5qacsii4kysk438cjr1hnmpir78kp6xgk9xw5g9snlnj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orgit";
           sha256 = "0askccb3h98v8gmylwxaph3gbyv5b1sp4slws76aqz1kq9x0jy7w";
           name = "orgit";
         };
@@ -40500,7 +40961,7 @@
           sha256 = "12y395ld36jnlbcrfycnvr4g723w6vahfv9iqf1wr6m94ka9pz3d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orglink";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orglink";
           sha256 = "0ldrvvqs3hlazj0dch162gsbnbxcg6fgrxid8p7w9gj19vbcl52b";
           name = "orglink";
         };
@@ -40521,7 +40982,7 @@
           sha256 = "1w0hadpslxcjn29yxl9i37sja4qf4kp7ffjpwij5hs73r518c2z6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orglue";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orglue";
           sha256 = "14g4q2k9zjzipzrp5mg72s40b0rwiaixgq3rvi15wh4vvcw5xajn";
           name = "orglue";
         };
@@ -40542,7 +41003,7 @@
           sha256 = "0am2yfnaxwc6f2wvrg4d508pdcs88cynr32k7bgyyadwq4xq3zsg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orgtbl-aggregate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orgtbl-aggregate";
           sha256 = "0gnyjwn6jshs8bzdssm2xppg2s9p2x3rrhp523q39aydskc6ggc9";
           name = "orgtbl-aggregate";
         };
@@ -40563,7 +41024,7 @@
           sha256 = "1vbnp37xz0nrpyi0hah345928zsb1xw915mdb0wybq1fzn93mp1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orgtbl-ascii-plot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orgtbl-ascii-plot";
           sha256 = "1ssjbdprbn34nsfx1xjc382l2195rbh8mybpn31d4kcjx6fqf78h";
           name = "orgtbl-ascii-plot";
         };
@@ -40584,7 +41045,7 @@
           sha256 = "06nc82wiha11i79izqil53dkd95fl55nb5m739gyyzvx3sksb0dg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orgtbl-join";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orgtbl-join";
           sha256 = "1kq2h0lb521z8q2xb9bsi37xzzdsa0hw4mm3qkzidi5j9fi3apf1";
           name = "orgtbl-join";
         };
@@ -40605,7 +41066,7 @@
           sha256 = "0zfiq9d5jqzpmscngb1s2jgfiqmbi4dyw0fqa59v2g84gxjg793x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orgtbl-show-header";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orgtbl-show-header";
           sha256 = "1xgqjg3lmcczdblxaka47cc1ad8p8jhyb2nqwq0qnbqw46fqjp3k";
           name = "orgtbl-show-header";
         };
@@ -40626,7 +41087,7 @@
           sha256 = "0p53l0s8rxr8v77kj83qjrbln7nck16q0zgdp4sqmqb1121ily48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/origami";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/origami";
           sha256 = "0rkb55zcvsgxzp190vrnbzdfbcjd8zi6vhbhwpqxi0qmyq6a08pr";
           name = "origami";
         };
@@ -40647,7 +41108,7 @@
           sha256 = "1iybrhp607a5rb3ynlaf8w2x9wdgdbril702z44dgcg3wxih2zy1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-browse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-browse";
           sha256 = "06rfzq2hxhzg6jh2zs28r7ffxwlq40nz954j13ly8403c7rmbrfm";
           name = "osx-browse";
         };
@@ -40668,7 +41129,7 @@
           sha256 = "1ykn48src7qhx9cmpjkaqsz7h36p75kkq1h9wlcpv5fhaky2d4n4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-clipboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-clipboard";
           sha256 = "0gjgr451v6rlyarz96v6h8kfbvkk7npvhgvkgwdi0bjighrhlv4f";
           name = "osx-clipboard";
         };
@@ -40689,7 +41150,7 @@
           sha256 = "0frv92i7rj9fbjzgwf80zngq77394wjgijggda6d8ai75n5f47g1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-dictionary";
           sha256 = "13033fxc5vjd1f7mm6znmprcp3mwxbvblb2d25shr8d4imqqhv82";
           name = "osx-dictionary";
         };
@@ -40702,15 +41163,15 @@
     osx-lib = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "osx-lib";
-        version = "20160106.1215";
+        version = "20160125.2328";
         src = fetchFromGitHub {
           owner = "raghavgautam";
           repo = "osx-lib";
-          rev = "3a5a4561c5a1d9f5b8078cd6cbb9cd1f70ad8fbf";
-          sha256 = "1b8ahmljk5whs29ss2wq3800qrb32hk1jlbs71rq8chvxxwlx8j7";
+          rev = "9334c0614be7dbcc3d763ff7061979643fa08b4a";
+          sha256 = "0kh7mrgwalys2vmf1dyrl2cc9v58zah2r8lr43nsky8dkszrz2al";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-lib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-lib";
           sha256 = "12wvki8jhzqsanxv5yqzjmfx6ifwz9ab9zh6r8nss86bk8864ix4";
           name = "osx-lib";
         };
@@ -40731,7 +41192,7 @@
           sha256 = "1csnxpsfnv9lv07kgvc60qx5c33sshmnz60p3qjz7ym7rnjy9b5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-location";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-location";
           sha256 = "1p12mmrw70p3b04zlprkdxdfnb7m3vkm6gci3fwhr5zyfvwxvn0c";
           name = "osx-location";
         };
@@ -40752,7 +41213,7 @@
           sha256 = "1rgykby1ysbapq53lnk9yy04r9q4qirnzs2abgvz7g2qjq5fyzag";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-org-clock-menubar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-org-clock-menubar";
           sha256 = "1y5qxslxl0d93f387nyj8zngz5nh1p4rzdfx0lnbvya6shfaxaf6";
           name = "osx-org-clock-menubar";
         };
@@ -40773,7 +41234,7 @@
           sha256 = "0830kkmvc3ss7ygqfwz3j75s7mhxfxyadaksrp0v2cc4y6wn6nfv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-plist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-plist";
           sha256 = "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8";
           name = "osx-plist";
         };
@@ -40794,7 +41255,7 @@
           sha256 = "1j601gzizxjsvkw6bvih4a49iq05yfkw0ni77xbc5klc7x7s80hk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-pseudo-daemon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-pseudo-daemon";
           sha256 = "150fxj2phj5axnh5i8ws5fv2qzzmpyisch452wgxb604p56j7vy8";
           name = "osx-pseudo-daemon";
         };
@@ -40815,7 +41276,7 @@
           sha256 = "1l231168bjqz6lwzs0r9vihxi53d46csrr2gq7g33lg1zm3696ah";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-trash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-trash";
           sha256 = "1f6pi53mhp2pvrfjm8544lqqj36gzpzxq245lzvv91lvqkxr9ysj";
           name = "osx-trash";
         };
@@ -40836,7 +41297,7 @@
           sha256 = "116cwlhn7s47rhivz6113lh8lvaz3bjb3ynjlbx9hyf7gq3nfnxn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/outline-magic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/outline-magic";
           sha256 = "085yayzph3y7fh6pd5sdjdkhdcvwfzcyqd6y3xlbz7wni5ac6b5f";
           name = "outline-magic";
         };
@@ -40857,7 +41318,7 @@
           sha256 = "0d9hfr4kb6rkhwacdn70bkfchgam26gj92zfyaqw77a2sgwcmwwv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/outlined-elisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/outlined-elisp-mode";
           sha256 = "165sivmv5h4nvh08ampq95x6b0bkzxgrdjbxjxlq6rv00vaidn7v";
           name = "outlined-elisp-mode";
         };
@@ -40878,7 +41339,7 @@
           sha256 = "0jhqpm31rsmc2r01ra48nbnd9rx9am90qk6i0qrhgfzx9q1svmj9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/outorg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/outorg";
           sha256 = "04swss84p33a9baa4swqc1a9lfp6wziqrwa7vcyi3y0yzllx36cx";
           name = "outorg";
         };
@@ -40891,15 +41352,15 @@
     outshine = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, outorg }:
     melpaBuild {
         pname = "outshine";
-        version = "20151203.1002";
+        version = "20160204.1546";
         src = fetchFromGitHub {
           owner = "tj64";
           repo = "outshine";
-          rev = "d1847614727a060e01d1d2f33b414a1b49d3e85b";
-          sha256 = "0g6h5ifmzxvwgyi7qrkkmr8s28kpq8xhmv7rkr3gphqrh5hyppl8";
+          rev = "14baed9f4673a52eb9f90c71ec0ae70b4d447fc5";
+          sha256 = "0y5r1wy9pjyygzkkjhm7ain2n5p875s2kivns3kmxyak3nl689sy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/outshine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/outshine";
           sha256 = "1i8c3q6n9hpfbpg2f8n8brwgaq36af1jn3g5js88yiyyb5dknxq4";
           name = "outshine";
         };
@@ -40920,7 +41381,7 @@
           sha256 = "1rk5pzm5wmdq68d99hhhbq8pq37bnph0dip5j2jnfj6zsw70whr2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ov";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ov";
           sha256 = "0d71mpv74cfxcnwixbrl90nr22cw4kv5sdgpny5wycvh6cgmd6qb";
           name = "ov";
         };
@@ -40941,7 +41402,7 @@
           sha256 = "1bfj56ackza8c1jja660v6ss9ii7prcaim5plnfqsv3k149r8qlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/overseer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/overseer";
           sha256 = "04wfwcal051jrnmm5dga6vl4c9j10pm416586yxb8smi6fxws2jg";
           name = "overseer";
         };
@@ -40962,7 +41423,7 @@
           sha256 = "0f2psx4lq98l3q3fnibsfqxp2hvvwk7b30zjvjlry3bffg3l7pfk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/owdriver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/owdriver";
           sha256 = "0j8z7ynan0zj581x50gsi9lljkbi6bwmzpfyha3i6q8ch5qkdxfd";
           name = "owdriver";
         };
@@ -40975,15 +41436,15 @@
     ox-asciidoc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "ox-asciidoc";
-        version = "20150919.1459";
+        version = "20160120.723";
         src = fetchFromGitHub {
           owner = "yashi";
           repo = "org-asciidoc";
-          rev = "e34b1df9fa061d395e600660620ab6c3b7e59ac1";
-          sha256 = "1q7jlz0f09mwymq8m6x9fiariww7rwiy4wkqkbbc296wm7impr75";
+          rev = "da5f66d881c79cc780290d80caa528c1dd219509";
+          sha256 = "03ivnvqxc5xdcik4skk32fhr686yv2y5mj8w7v27dhyc0vdpfhvy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-asciidoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-asciidoc";
           sha256 = "07b549dqyh1gk226d7zbls1mw6q4mas7kbfwkansmyykax0r2zyr";
           name = "ox-asciidoc";
         };
@@ -41004,7 +41465,7 @@
           sha256 = "0gfkb12rn40m71xv292dn3nj3h1bnn81698pinirp0nd8p4bvnin";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-gfm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-gfm";
           sha256 = "065ngmzfd3g2h8n903hc4d363hz4z5rrdgizh2xpz03kf3plca6q";
           name = "ox-gfm";
         };
@@ -41025,7 +41486,7 @@
           sha256 = "19h3w3fcas60jv02v7hxjmh05804sb7bif70jssq3qwisj0j09xm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-html5slide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-html5slide";
           sha256 = "0nqk6chg0ky98ap2higa74786prj7dbwx2a3l67m0llmdajw76qn";
           name = "ox-html5slide";
         };
@@ -41046,7 +41507,7 @@
           sha256 = "1kf2si2lyy0xc971bx5zd2j9mnz1smc9s8l0dwc6iksh2v9q8cy9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-impress-js";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-impress-js";
           sha256 = "0p0cc51lmxgl0xv951ybdg5n8gbzv8qf0chfgigijizzjypxc21l";
           name = "ox-impress-js";
         };
@@ -41059,15 +41520,15 @@
     ox-ioslide = callPackage ({ cl-lib ? null, emacs, f, fetchFromGitHub, fetchurl, lib, makey, melpaBuild, org }:
     melpaBuild {
         pname = "ox-ioslide";
-        version = "20160118.1034";
+        version = "20160120.1005";
         src = fetchFromGitHub {
           owner = "coldnew";
           repo = "org-ioslide";
-          rev = "8dcb0a4ea852d495d7d421d2141f993a250d4a23";
-          sha256 = "1s5byryi8g3vnqvzydzi4dycjpqphw1af5v9dm4rw1g9syaxm87p";
+          rev = "746bce18ec534a470ec265a14c1d982ffc3f5d3c";
+          sha256 = "0p03xzldz5v8lx3ip2pgll0da00ldfxmhr6r3jahwp6692kxpr6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-ioslide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-ioslide";
           sha256 = "0z0qnvpw64wxbgz8203rphswlh9hd2i11pz2mlay8l3bzz4gx4vc";
           name = "ox-ioslide";
         };
@@ -41088,7 +41549,7 @@
           sha256 = "0c2m02g6csg5fqizj3zqcm88q7w17kgvgi7swcx4fzz6rixnpsji";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-mediawiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-mediawiki";
           sha256 = "0lijj2n4saw0xd3jaghbvx9v6a4ldl5gd8wy7s7hfcm30wb75cdb";
           name = "ox-mediawiki";
         };
@@ -41109,7 +41570,7 @@
           sha256 = "0cc14p6c3d4djfmrkac0abb2jq128vlmayv2a8cyvnyjffyvjbk7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-nikola";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-nikola";
           sha256 = "1amplnazs9igfd382djq23d8j7r0knr0hwlpasd01aypc25c82a4";
           name = "ox-nikola";
         };
@@ -41130,7 +41591,7 @@
           sha256 = "0bawigwc6v5420642xlkyxdd0i82gicx69wqlnjf6lvhfvs990is";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-pandoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-pandoc";
           sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc";
           name = "ox-pandoc";
         };
@@ -41151,7 +41612,7 @@
           sha256 = "0adj6gm39qw4ivb7csfh21qqqipcnw1sgm1xdqvrk86kbs9k1b2g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-pukiwiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-pukiwiki";
           sha256 = "10sfbri5hv5hyx9jc1bzlk4qmzfmpfgfy8wkjkpv7lv2x0axqd8a";
           name = "ox-pukiwiki";
         };
@@ -41172,7 +41633,7 @@
           sha256 = "196bjiij0nj19qsz95y9l44sr63673mxxj0cv6aa3ijpm48vmj9p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-reveal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-reveal";
           sha256 = "092swxkkisvj2y18ynal8dn7wcfi7h4y6n0dlzqq28bfflarbwik";
           name = "ox-reveal";
         };
@@ -41193,7 +41654,7 @@
           sha256 = "1js4n8iwimc86fp2adzhbhy4ixss1yqngjd8gq7pxgpgmnhd66x3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-rst";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-rst";
           sha256 = "1vyj6frrl7328n2x7vc3qwv3ssdhi8bp6ja5h2q4bqalc6bl1pq0";
           name = "ox-rst";
         };
@@ -41214,7 +41675,7 @@
           sha256 = "1r9c4s9f7cvxxzf9h07rg75bil0295zq1inh5i4r6za5jabkr4dg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-textile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-textile";
           sha256 = "01kri7vh16xhy8x5qd6s5z08xr0q964rk6xrligdb3i6x78wfvi4";
           name = "ox-textile";
         };
@@ -41231,11 +41692,11 @@
         src = fetchFromGitHub {
           owner = "dfeich";
           repo = "org8-wikiexporters";
-          rev = "0cd92e84ad22c103b078f285ec66ff98f7ca98ca";
-          sha256 = "1rmlwx2svnsf0cg2xf0a09ncy4kx8jgn3rrnpa89z0brlafxx25s";
+          rev = "4a7028751aa6b6875466c0acee60cddee3dd2efc";
+          sha256 = "1wmjmkx2nz7alhdrbbm59dsrhrhn9fm3kjsvv3lmwgqg029vi3fp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-tiddly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-tiddly";
           sha256 = "196i8lzxv2smpj5yhmiqwazn4pvc14yqyzasrgimhv3vi2xnxlfb";
           name = "ox-tiddly";
         };
@@ -41256,7 +41717,7 @@
           sha256 = "0w6963jvz1sk732nh18735dxivd6nl59jd4m26ps6l4wqhqby0db";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-trac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-trac";
           sha256 = "0f8b3i83vzxzfa91p4ahlqz6njql18xy5nk265sjxpy9zr898rsa";
           name = "ox-trac";
         };
@@ -41273,11 +41734,11 @@
         src = fetchFromGitHub {
           owner = "marsmining";
           repo = "ox-twbs";
-          rev = "cfe67353d148e65a7676f1609d8cc22a4c8fbc78";
-          sha256 = "026g48sgqwnqs5zmrabhiv3l8052l4c1vsbsf6bdxv4a6yp0l654";
+          rev = "fb3bb0dc9c7ded39605fb6dd805b81b25e1c8f19";
+          sha256 = "0gjwpjr7gpqcnqxcgcfy2zgzh1i4z3dw9yryaqnqc8fbxrqqvk9p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-twbs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-twbs";
           sha256 = "15csgnph5wh2dvcc2dnvrlm7whh428rq8smqji1509ib7aw9y5mx";
           name = "ox-twbs";
         };
@@ -41294,11 +41755,11 @@
         src = fetchFromGitHub {
           owner = "dfeich";
           repo = "org8-wikiexporters";
-          rev = "0cd92e84ad22c103b078f285ec66ff98f7ca98ca";
-          sha256 = "1rmlwx2svnsf0cg2xf0a09ncy4kx8jgn3rrnpa89z0brlafxx25s";
+          rev = "4a7028751aa6b6875466c0acee60cddee3dd2efc";
+          sha256 = "1wmjmkx2nz7alhdrbbm59dsrhrhn9fm3kjsvv3lmwgqg029vi3fp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-twiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-twiki";
           sha256 = "1p1k0yg5fxcjgwpq2ix9ckh2kn69m7d5rnz76h14hw9p72cb54r0";
           name = "ox-twiki";
         };
@@ -41319,7 +41780,7 @@
           sha256 = "12jsnfppif4l548wymvakx0f2zlm63xs6kfrb49hicmk668cq4ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/p4";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/p4";
           sha256 = "0215li17gn35wmvd84gnp4hkwa2jd81wz4frb1cba2b5j33rlprc";
           name = "p4";
         };
@@ -41340,7 +41801,7 @@
           sha256 = "0cbsl184szbl486454jkn28zj4p7danp92h0zv8yscrlnyl68p0y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pabbrev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pabbrev";
           sha256 = "1mbfa40pbzbi00sp155zm43sj6nw221mcayc2rk3ppin9ps95hx3";
           name = "pabbrev";
         };
@@ -41353,15 +41814,15 @@
     package-build = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "package-build";
-        version = "20160112.322";
+        version = "20160129.1532";
         src = fetchFromGitHub {
           owner = "milkypostman";
           repo = "melpa";
-          rev = "553e27a3523ade9dc4951086d9340e8240d5d943";
-          sha256 = "00h1zbc4i8apvam38qah9nfs7g7fv2hnd35qhynx2c7ff0xkjq2c";
+          rev = "0fe7b0857828a041ee06b30edd2cd488cc3394c7";
+          sha256 = "15q2fwihg7pc3r3vcp3magyddzz9ylbrwyba1rf2yxh54i0mgrl5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/package-build";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/package-build";
           sha256 = "1m245q81c2jifgqxwd2fi35jrcbf6v9a1a5zy815861avq3fg9g0";
           name = "package-build";
         };
@@ -41382,7 +41843,7 @@
           sha256 = "0i7f8ambcrhyqq15xwlk31jjdcii2hr37y45va8m5w6n9mkpz8c6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/package-filter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/package-filter";
           sha256 = "0am73zch2fy1hfjwzk8kg0j3lgbcz3hzxjrdf0j0a9w0myp0mmjm";
           name = "package-filter";
         };
@@ -41403,7 +41864,7 @@
           sha256 = "1xv0ra130qg0ksgqi4npspnv0ckq77k7f5kcibavj030h578kj97";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/package+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/package+";
           sha256 = "1mbsxr4llz8ny7n7w3lykld9yvbaywlfqnvr9l0aiv9rvmdv03bn";
           name = "package-plus";
         };
@@ -41424,7 +41885,7 @@
           sha256 = "1pdv6d6bm5jmpgjqf9ycvzasxz1205zdi0zjrmkr33c03azwz7rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/package-safe-delete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/package-safe-delete";
           sha256 = "12ss5yjhnyxsif4vlbgxamn5jfa0wxkkphffxnv6drhvmpq226jw";
           name = "package-safe-delete";
         };
@@ -41445,7 +41906,7 @@
           sha256 = "138l07qmxj4fkvf43f1hdn4skadxb50c023bc5101l3njzmf74wa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/package-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/package-utils";
           sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r";
           name = "package-utils";
         };
@@ -41466,7 +41927,7 @@
           sha256 = "0743scd1g5xf3k9fbqv1qd9w421vfxwjlnb0vwix0ypahd83r3db";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/packed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/packed";
           sha256 = "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z";
           name = "packed";
         };
@@ -41479,15 +41940,15 @@
     pacmacs = callPackage ({ cl-lib ? null, dash, dash-functional, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pacmacs";
-        version = "20160116.1131";
+        version = "20160131.232";
         src = fetchFromGitHub {
           owner = "codingteam";
           repo = "pacmacs.el";
-          rev = "9fd3009e5a25dfdb3ff7d97b4ffb0fdde984a520";
-          sha256 = "19631m9xyrzbqv0whshxslhqylx5p77535nm49d4kyib2nb30i3m";
+          rev = "d813e9c62c2540fe619234824fc60e128c786442";
+          sha256 = "0zx72qbqy2n1r6mjylw67zb6nnchp2b49vsdyl0k5bdaq2xyqv6i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pacmacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pacmacs";
           sha256 = "0w0r6z365jrglpbifb94w6c22wqi9x93qgkss9pn820hrndqbqxy";
           name = "pacmacs";
         };
@@ -41508,7 +41969,7 @@
           sha256 = "0mqd18w98p6z0i08xx7jga10ljh9360x6sqfyvfq6bjfi2jvxdbk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/page-break-lines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/page-break-lines";
           sha256 = "0q1166z190dxznzgf2f29klj2jkaqlic483p4h3bylihkqp93ij7";
           name = "page-break-lines";
         };
@@ -41529,7 +41990,7 @@
           sha256 = "1dq5ibz7rx9a7gm9zq2pz4c1sxgrm59yibyq92bvmi68lvf2q851";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pager";
           sha256 = "0s5zwimkbsivbwlyd7g8dpnjyzqcfc5plg53ij4sljiipgjh5brl";
           name = "pager";
         };
@@ -41550,7 +42011,7 @@
           sha256 = "11msqs8v9wn8sj45dw1fl0ldi3sw33v0xclynbxgmawyabfq3bqm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pager-default-keybindings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pager-default-keybindings";
           sha256 = "0vqb3s1fxkl1fxxspq89344s55sfcplz26z0pbh347l1681h3pci";
           name = "pager-default-keybindings";
         };
@@ -41568,7 +42029,7 @@
           sha256 = "1qnv84y0s437xcsjxh0gs9rb36pydba3qfrihvz5pqs9g9w7m94k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/palette";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/palette";
           sha256 = "1v6dsph18rqfbvda2c25mqgdwap2a4zrg6qqq57n205zprpcwxc0";
           name = "palette";
         };
@@ -41589,7 +42050,7 @@
           sha256 = "1kbja107smdjqv82p84jx13jk1410c9vms89p1iy1jvn7s8g9fiq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/palimpsest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/palimpsest";
           sha256 = "18kklfdlcg982pdrslh0xqa42h28f91bdm7q2zn890d6dcivp6bk";
           name = "palimpsest";
         };
@@ -41610,7 +42071,7 @@
           sha256 = "03mlg6dmpjw8fq2s3c4gpqj20kjhzldz3m51bf6s0mxq9bclx2xw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pallet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pallet";
           sha256 = "0q50cdwnn2w1n5h4bappncjjyi5yaixxannwgy23fngdrz1mxwd7";
           name = "pallet";
         };
@@ -41623,15 +42084,15 @@
     pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "pandoc-mode";
-        version = "20151030.513";
+        version = "20160204.340";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "pandoc-mode";
-          rev = "23444375a60f44b3439994e969d8aa7acf220f8c";
-          sha256 = "0aj509yjqgq8bxrvdq5x3d1sfj0dgwwh6kg7f20vapz9qxjdjvdg";
+          rev = "db7d7a6e887ec3d50e1f94a5743b5ef4c3af2914";
+          sha256 = "1q3r0vhch3yb0kjnp7l3x5ma39w6ir9rini4i0c7jfh54abyf78r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pandoc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pandoc-mode";
           sha256 = "0qvc6cf87h1jqf590kd68jfg25snxaxayfds634wj4z6gp70l781";
           name = "pandoc-mode";
         };
@@ -41652,7 +42113,7 @@
           sha256 = "01zc2cvkyfx80snwrm3cs8cbwgxmd56rgvvbsyq53r4q3zhdk1li";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pangu-spacing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pangu-spacing";
           sha256 = "082qh26vlk7kifz1800lyai17yvngwjygrfrsh1dsd8dxhk6l9j8";
           name = "pangu-spacing";
         };
@@ -41673,7 +42134,7 @@
           sha256 = "1xh614czldjvfl66vhkyaai5k4qsg1l3mz6wd5b1w6kd45qrc54i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paper-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paper-theme";
           sha256 = "04diqm2c9fm29zyms3hplkzb4kb7b2kyrxdsy0jxyjj5kabypd50";
           name = "paper-theme";
         };
@@ -41683,22 +42144,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    paradox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, hydra, json ? null, let-alist, lib, melpaBuild, seq, spinner }:
+    paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }:
     melpaBuild {
         pname = "paradox";
-        version = "20151211.1517";
+        version = "20160119.2027";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "paradox";
-          rev = "68643e1f473ea204b7191dbcc8a53f95eeb4a117";
-          sha256 = "1gcbdk111m1filfjj0k98s6b65wzm7kj60nfzszf7shl60j5sng7";
+          rev = "8eca9880ed52d0d53d7d5e28858ec95987fa22e1";
+          sha256 = "1vc59n9jmsn5d15v2m9xl64564h3q0c78pv4a4n3dhd1iz797l3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paradox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paradox";
           sha256 = "1xq14nfvprsq18464qr4mhphq7cl1f570lji5n8z6j9vpfm9a4p2";
           name = "paradox";
         };
-        packageRequires = [ cl-lib emacs hydra json let-alist seq spinner ];
+        packageRequires = [ emacs hydra let-alist seq spinner ];
         meta = {
           homepage = "http://melpa.org/#/paradox";
           license = lib.licenses.free;
@@ -41713,7 +42174,7 @@
           sha256 = "34dd7d8c07c697b54ea943566e6967012f7366d6f5a21e31e3d768716bc4928f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paredit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paredit";
           sha256 = "1rp859y4qyqdfvp261l8mmbd62p1pw0dypm1mng6838b6q6ycakr";
           name = "paredit";
         };
@@ -41734,7 +42195,7 @@
           sha256 = "1jkpb67h96sm3fnga9hrg3kwhlp3czdv66v49a9szq174zpsnrgv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paredit-everywhere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paredit-everywhere";
           sha256 = "0gbkwk8mrbjr2l8pz3q4y6j8q4m12zmzl31c88ngs1k5d86wav36";
           name = "paredit-everywhere";
         };
@@ -41744,22 +42205,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    paredit-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    paredit-menu = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, paredit }:
     melpaBuild {
         pname = "paredit-menu";
-        version = "20130923.1454";
+        version = "20160128.1133";
         src = fetchFromGitHub {
           owner = "phillord";
-          repo = "phil-emacs-packages";
-          rev = "6e0142bae9cc3bfbea2fa134b6385af1c99ee782";
-          sha256 = "0ygckaj87swrnmsv5dhs55dngw1f22xm6238s9xb2axi3rr4w965";
+          repo = "paredit-menu";
+          rev = "cc0ae85bd819f9ebfa4f2a419ab3b2d70e39c9c8";
+          sha256 = "15xkanrwxh3qqay3vkfqvhzs88g7nnfv9bqk509qflyhqnvc9sxr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paredit-menu";
-          sha256 = "17l05m1lg0vmahh53b2lvw316y4z7jz3nmy0zyiyiygax313y42l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paredit-menu";
+          sha256 = "05jp4cc548x5f07k096dgizhivdpaajxq38hin831sm0p9cibm4p";
           name = "paredit-menu";
         };
-        packageRequires = [];
+        packageRequires = [ paredit ];
         meta = {
           homepage = "http://melpa.org/#/paredit-menu";
           license = lib.licenses.free;
@@ -41776,7 +42237,7 @@
           sha256 = "0fds9s16c0dgq6ah98x4pv5bgwbikqwiikcxjzmk9g1m3s232fl8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paren-completer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paren-completer";
           sha256 = "0xh17h8vmsgbrq6yf5sfy3kpia4za68f43gwgkvi2m430g15fr0x";
           name = "paren-completer";
         };
@@ -41797,7 +42258,7 @@
           sha256 = "0ggpb58dw4dv9i0czj064a8fdcalgjqgl4cm5zsk7hcvjcmal9af";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paren-face";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paren-face";
           sha256 = "0dmzk66m3rd8x0rb925pyrfpc2qsvayks4kmhpb2ccdrx68pg8gf";
           name = "paren-face";
         };
@@ -41818,7 +42279,7 @@
           sha256 = "0i5bc7lyyrx6swqlrp9l5x72yzwi53qn6ldrfs99gh08b3yvsnni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/parent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/parent-mode";
           sha256 = "1ndn6m6aasmk9yrml9xqj8141100nw7qi1bhnlsss3v8b6njwwig";
           name = "parent-mode";
         };
@@ -41839,7 +42300,7 @@
           sha256 = "1z8cp1cdkxmdqislixxvncj0s1jx42i6arx48kdl5paymnnp282s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/parse-csv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/parse-csv";
           sha256 = "0khpfxbarw0plx8kka357d8wl1vvdih5797xlld9adc0g3cng0zz";
           name = "parse-csv";
         };
@@ -41860,7 +42321,7 @@
           sha256 = "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/parsebib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/parsebib";
           sha256 = "07br2x68scsxykdk2ajc4mfqhdb7vjkcfgz3vnpy91sirxzgfjdd";
           name = "parsebib";
         };
@@ -41881,7 +42342,7 @@
           sha256 = "14zpkxnwvwdi7wnjw4827lzzn6kw8wmwr2whavpi4rlkq8ix6dv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pass";
           sha256 = "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr";
           name = "pass";
         };
@@ -41902,7 +42363,7 @@
           sha256 = "0yckh61v9a798gpyk8x2z9990h3b61lwsw0kish571pygfyqhjkq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/passthword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/passthword";
           sha256 = "076jayziipjx260yk3p37pf5k0qsagalidah3y6hiflrlq4sfgjn";
           name = "passthword";
         };
@@ -41923,7 +42384,7 @@
           sha256 = "1pw401ar114wpayibphv3n6m0gz68zjmiwz60r4lbar45bmxvihx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/password-generator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/password-generator";
           sha256 = "0aahpplmiwmp6a06y6hl4zvv8lvzkmakmaazlckl5r3rqbsf24cb";
           name = "password-generator";
         };
@@ -41943,7 +42404,7 @@
           sha256 = "9c3ee0155b9d6b96acacaab8e799b23e92550ef136ffa2c07880029af3061733";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/password-store";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/password-store";
           sha256 = "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss";
           name = "password-store";
         };
@@ -41956,15 +42417,15 @@
     password-vault = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "password-vault";
-        version = "20151121.2141";
+        version = "20160126.1220";
         src = fetchFromGitHub {
           owner = "PuercoPop";
           repo = "password-vault";
-          rev = "e47d99bb092e150472f1989ab3ac5a4752863515";
-          sha256 = "0984pzlfxsgi2060spjxw7livfh8013ffrk4x8m4sjifhniqgjqk";
+          rev = "dc56e6c2f5da66f1ab63736cecf08fb2c6c2b30f";
+          sha256 = "0921xwg3d3345hiqz4c1iyqwvfyg8rv0wggcnig7xh9qivspag4c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/password-vault";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/password-vault";
           sha256 = "17i556xwq6yaxv9v18l1abcpbaz6hygsa4vf4b68fc98vcy7396a";
           name = "password-vault";
         };
@@ -41982,7 +42443,7 @@
           sha256 = "17br64snqby465bjb0l1hzw0pcms5m2knrvb6y9gn3kir4sdi6kn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pastebin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pastebin";
           sha256 = "19fgjcbxgmnm59qjkxhvy2aib5qs5d5a43hwvjdhxq2k6rn3f2gj";
           name = "pastebin";
         };
@@ -42003,7 +42464,7 @@
           sha256 = "0m6qjsq6qfwwszm95lj8c58l75vbmx9r5hm9bfywyympfgy0fa1n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pastehub";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pastehub";
           sha256 = "1slvqn5ay6gkbi0ai1gy1wmc02h4g3n6srrh4fqn72y7b9nv5i0v";
           name = "pastehub";
         };
@@ -42024,7 +42485,7 @@
           sha256 = "1v5mpjb8kavbqhvg4rizwg8cypgmi6ngdiy8qp9pimmkb56y42ly";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pastelmac-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pastelmac-theme";
           sha256 = "168zzqhp2dbfcnknwfqxk68rgmibfw71ksghvi6h2j2c1m08l23f";
           name = "pastelmac-theme";
         };
@@ -42044,7 +42505,7 @@
           sha256 = "c53b4f2c7449bf74648c091f249c33da3ddd8f621474a8901745b4e985cb26ab";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pastels-on-dark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pastels-on-dark-theme";
           sha256 = "0zdr29793gg229r47yjb3plagxc9pszqyy4sx81ffp3rpdf0nlbh";
           name = "pastels-on-dark-theme";
         };
@@ -42065,7 +42526,7 @@
           sha256 = "1ffnkw8djs8kvfjd1crnaqram1vl4w3g1zhsqp74ds0mccsd6830";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/path-headerline-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/path-headerline-mode";
           sha256 = "0dwr8iyq62ad5xkh7r4kpywpypdq1wljsdzwqbq9zdr79yfqx337";
           name = "path-headerline-mode";
         };
@@ -42086,7 +42547,7 @@
           sha256 = "0kkgqaxyrv65rfg2ng1vmmmrc9bm98yqpsv2pcb760287dn0l27m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paxedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paxedit";
           sha256 = "06ymilr0zrwfpyzql7dcpg48lhkx73f2jlaw3caxgsjaz7x3n4ic";
           name = "paxedit";
         };
@@ -42107,7 +42568,7 @@
           sha256 = "138w0dlp3msjmr2x09kfcnxwhdldbz9xjfy7l6lig1x9ima0z5w6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pbcopy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pbcopy";
           sha256 = "1989pkhaha6s2rmgyswnzps92x9hhzymjz4ng4a5jda1b9snp60q";
           name = "pbcopy";
         };
@@ -42128,7 +42589,7 @@
           sha256 = "1jj5h92qakrn9d5d88dvl43b7ppw96rm11hqg3791i6k48nx1d1m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pc-bufsw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pc-bufsw";
           sha256 = "01d7735ininlsjkql7dy57irgwgk4k9br8bl18wq51vgkg90i5k5";
           name = "pc-bufsw";
         };
@@ -42149,7 +42610,7 @@
           sha256 = "0xbbq8ddlirhvv921nrf7bwazh0i98bk0a9xzyx8iqpyg66vbfa8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcache";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcache";
           sha256 = "1q2wlbc58lyf3dxfs9ppdxvdsp81jmkq874zbd7f39wvc5ckbz0l";
           name = "pcache";
         };
@@ -42170,7 +42631,7 @@
           sha256 = "0pwx1nbgciy28rivvrgka46zihmag9ljrs40bvscgd9rkragm4zy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcmpl-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcmpl-args";
           sha256 = "0sry4zvr8xmzyygf2m5dms52srkd1apj3i7a3aj23qa8jvndx8vr";
           name = "pcmpl-args";
         };
@@ -42191,7 +42652,7 @@
           sha256 = "0pspxgicc0mkypp94r0jydmkjr3ngv8y4w1xpj93kp79hnvyls0a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcmpl-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcmpl-git";
           sha256 = "12y9pg1g4i1ghnjvgfdpa6p84h4bcqrr23y9bazwl9n6aj20cmxk";
           name = "pcmpl-git";
         };
@@ -42212,7 +42673,7 @@
           sha256 = "17i5j5005dhzgwzds5jj1a7d31xvbshjc139vawwz2xip5aynji4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcmpl-homebrew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcmpl-homebrew";
           sha256 = "1gckzcwpg4am1ryjy08aic98mbafb64wkfmnm98d64kiwbpaacly";
           name = "pcmpl-homebrew";
         };
@@ -42233,7 +42694,7 @@
           sha256 = "14pz15by9gp0307bcdv9h90mcr35ya89wbn3y13n7k0z5r45gn58";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcmpl-pip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcmpl-pip";
           sha256 = "17nmgq4wgv4yl2rsdf32585hfa58j0825mzzajrlwgmjiqx9i778";
           name = "pcmpl-pip";
         };
@@ -42254,7 +42715,7 @@
           sha256 = "0h0p4c08z0dqxmg55fzch1d2f38rywfk1j0an2f4sc94lj7ckbm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcomplete-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcomplete-extension";
           sha256 = "0m0c9ir44p21rj93fkisvpvi08936717ljmzsr4qdf69b3i54cwc";
           name = "pcomplete-extension";
         };
@@ -42275,7 +42736,7 @@
           sha256 = "0ymbximchjfllrglkwv4lwb2sqprvva77vfbjb6n6kzni0ix70s3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcre2el";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcre2el";
           sha256 = "1l72hv9843qk5p8gi9ibr15wczm804j3ws2v1x7nx4dr7pc5c7l3";
           name = "pcre2el";
         };
@@ -42296,7 +42757,7 @@
           sha256 = "0aaprjczjf3al5vcypw1fsnz5a0xnnlhmvy0lc83i9aqbsa2y8af";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcsv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcsv";
           sha256 = "1zphndkbva59g1fd319a240yvq8fjk315b1fyrb8zvmqpgk9n0dl";
           name = "pcsv";
         };
@@ -42317,7 +42778,7 @@
           sha256 = "1xkkyz7y08jr71rzdacb9v7gk95qsxlsshkdsxq8jp70irq51099";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pdb-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pdb-mode";
           sha256 = "1ihkxd15kx5m5xb9yxwz8wqbmyk9iaskry9szzdz1j4gjlczb6hy";
           name = "pdb-mode";
         };
@@ -42330,15 +42791,15 @@
     pdf-tools = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, tablist }:
     melpaBuild {
         pname = "pdf-tools";
-        version = "20151224.1359";
+        version = "20160203.1257";
         src = fetchFromGitHub {
           owner = "politza";
           repo = "pdf-tools";
-          rev = "97b86cd09a411d00a7947da76b4c3f77995ccf44";
-          sha256 = "05b5fn3w2bika21a5sxyjs3yfrcdvn6qdrx9li1jda9jg623bpn3";
+          rev = "6b7b10a746695e22ef9aa7d29de20c05e71c7e75";
+          sha256 = "1cj489dv8dw7qkczwib47n7zsdw4k53jkxcqm57a2jpv42bhxz4i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pdf-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pdf-tools";
           sha256 = "1hnc8cci00mw78h7d7gs8smzrgihqz871sdc9hfvamb7iglmdlxw";
           name = "pdf-tools";
         };
@@ -42359,7 +42820,7 @@
           sha256 = "1clvrmvijwpffigh5f29vnwcvffqk0nrvlz26158hip1z9x7nah3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/peacock-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/peacock-theme";
           sha256 = "0jpdq090r37d07bm52yx3x9y3gsip6fyxxq1ax1k5k0r0js45kq9";
           name = "peacock-theme";
         };
@@ -42380,7 +42841,7 @@
           sha256 = "11nv6pll0zj9dkgzlzgav39a6x3sfi7kvfhwm96fa3iy4v8bixrb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/peek-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/peek-mode";
           sha256 = "07wcnh3jmp2gi9xhd3d8i2n0pr2g9kav497nnz94i85awhzf8fi4";
           name = "peek-mode";
         };
@@ -42401,7 +42862,7 @@
           sha256 = "1qi9qzcvclyw9wiamsw0z8q09hs0mfhaj2giny42nd6sqacvfr7m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/peep-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/peep-dired";
           sha256 = "16k5y3h2ip96k071vhx83avg4r4nplnd973b1271vvxbx2bly735";
           name = "peep-dired";
         };
@@ -42422,7 +42883,7 @@
           sha256 = "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/peg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/peg";
           sha256 = "0nxy9xn99myz0p36m4jflfj48qxhhn1sspbfx8d90030xg3cc2gm";
           name = "peg";
         };
@@ -42442,7 +42903,7 @@
           sha256 = "1rh87jf0a15q35a8h00bx6k5wa931rb6gh600zbs7j4r3y8qsylf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/per-buffer-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/per-buffer-theme";
           sha256 = "1czcaybpfmx4mwff7hs07iayyvgvlhifkickccap6kpd0cp4n6hn";
           name = "per-buffer-theme";
         };
@@ -42463,7 +42924,7 @@
           sha256 = "0fzypcxxd5zlkcybz0xppf09l0vf4vsfisr2y3ijsmxhg7yrwzj5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/perl-completion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/perl-completion";
           sha256 = "01p17mlkwjm60f14arda3ly8ng0r98nn3rly94ghn6jr7r7fv14b";
           name = "perl-completion";
         };
@@ -42484,7 +42945,7 @@
           sha256 = "11fs78b7ssz18wr35vxf6h4zpfj4l4vsikfzayq6hyqjnchv7b45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/perl6-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/perl6-mode";
           sha256 = "0af1djypd8n0n1fq10sl8mrdg27354kg9g87d6xz4q5phvi48cqv";
           name = "perl6-mode";
         };
@@ -42505,7 +42966,7 @@
           sha256 = "0wg0cpqxzfgln6xdngzspsbfirn9a5jxpgk66m0fpi33215z9q26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/perlbrew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/perlbrew";
           sha256 = "1qadwkcic2qckqy8hgrnj08ajhxayknhpyxkc6ir15vfqjk5crr8";
           name = "perlbrew";
         };
@@ -42526,7 +42987,7 @@
           sha256 = "0h05j55y3csq91a5m2fg99y4rzsh7zca7hnifb6kic5zb3nahi00";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/persistent-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/persistent-scratch";
           sha256 = "0iai65lsg3zxj07hdb9201w3rwrvdb3wffr6k2jdl8hzg5idghn1";
           name = "persistent-scratch";
         };
@@ -42547,7 +43008,7 @@
           sha256 = "14p20br8vzxs39d4hswzrrkgwql5nnmn5j17cpbabzjvck42rixc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/persistent-soft";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/persistent-soft";
           sha256 = "0a4xiwpgyyynjf69s8p183mqd3z53absv544ggvhb2gkpm6jravc";
           name = "persistent-soft";
         };
@@ -42560,15 +43021,15 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "20160115.533";
+        version = "20160129.655";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "56828b520e30662da7a20557971b47a99c56011a";
-          sha256 = "0fqmmv1y0vpgivad1nc8bq781wakfsp2azhxb20lpk7wqa0hp3kr";
+          rev = "fe239586593c9f7884d4a105ce21038ab464e251";
+          sha256 = "0ah2zimbs59ivg7mvnz5zv3q4lx3ms43ip49l2zyf8jf2dnmhpn0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/persp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/persp-mode";
           sha256 = "1bgni7y5xsn4a21494npr90w3320snfzw1hvql30xrr57pw3765w";
           name = "persp-mode";
         };
@@ -42589,7 +43050,7 @@
           sha256 = "0b9hz253m6d58dwsjsk9d1fw0ql33m9wfvyx10ncsqbr0j0s98k5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/persp-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/persp-projectile";
           sha256 = "10l2kqjyigg98qbbpf3qf4d5bm63kkk4vp7ip8fibgj1p9gqmnxm";
           name = "persp-projectile";
         };
@@ -42610,7 +43071,7 @@
           sha256 = "1ajmyl3bg01a3gkhay4qibgk9a0r6s8rhf1cc1678w3cm0w6yvmd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/perspective";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/perspective";
           sha256 = "150dxcsd0ylvfi9mmfpcki1wd3nl8q9mbszd3dgqfnm40yncklml";
           name = "perspective";
         };
@@ -42631,7 +43092,7 @@
           sha256 = "1zh7v4nnpzvbi8yj1ynlqlawk5bmlxi6s80b5f2y7hkdqb5q26k0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pg";
           sha256 = "0n0187ndvwza1nis9a12h584qdqkwqfzhdw21kz5d1i6c43g7gji";
           name = "pg";
         };
@@ -42652,7 +43113,7 @@
           sha256 = "0c9d4c24ic67y07y74bv5b7vc56b6l0lbh2fbzm870r1dl5zbzcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pgdevenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pgdevenv";
           sha256 = "0za35sdwwav81wpk4jjqh56icaswwxxyg3bqqp0qiz24llb5ln1w";
           name = "pgdevenv";
         };
@@ -42673,7 +43134,7 @@
           sha256 = "1qxsc5wyk8l9gkgmqy3mzwxdhji1ljqw9s1jfxkax7fyv4d1v31p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ph";
           sha256 = "0azx4cpfdn01yrqyn0q1gg9z7w0h0rn7zl39v3dx6yidd76ysh0l";
           name = "ph";
         };
@@ -42694,7 +43155,7 @@
           sha256 = "0y77ld1cmfpv9p7yx2mlbvjm5ivsrf2j0g0h4zabfrahz22v39d4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phabricator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phabricator";
           sha256 = "07988f2xyp76xjs25b3rdblhmijs2piriz4p0q92jw69bdvkl14c";
           name = "phabricator";
         };
@@ -42715,7 +43176,7 @@
           sha256 = "14g06ndxrqz80kdyhil6ajcqqxkfa77r1gr7vwqa9sq6jgm8dpx5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phi-autopair";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phi-autopair";
           sha256 = "1ya1bvh28qgz1zg9kdh2lzbsf0w0lx4xr42mdrjwaz3bbfa9asg4";
           name = "phi-autopair";
         };
@@ -42736,7 +43197,7 @@
           sha256 = "1rchxhp4kji5kbg8kzkzdbfy8sdbgbqd5g59cch7ia9agh5jvwyx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phi-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phi-grep";
           sha256 = "1y5lq6lq9qdydbypb1pjnxryh94a295nnqqh2x27whiwdiysirjj";
           name = "phi-grep";
         };
@@ -42757,7 +43218,7 @@
           sha256 = "0d2c579rg8wdfmn94nzaix9332jch4wlr939jszls330s38d0iv4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phi-rectangle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phi-rectangle";
           sha256 = "08yw04wmbgbbr60i638m0rspfwn3cp47ky5ssgjcgcmmdgg9yfvy";
           name = "phi-rectangle";
         };
@@ -42778,7 +43239,7 @@
           sha256 = "10kyq3lkhmbmj1hl9awzc0w8073dn9mbjd5skh660ljg5mmi6x62";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phi-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phi-search";
           sha256 = "0nj06ixl76dd80zg83q4bi8k224mcwb612mr4gd1xppj5k8xl03g";
           name = "phi-search";
         };
@@ -42799,7 +43260,7 @@
           sha256 = "1b44947hncw4q42fxxrz6fm21habzp4pyp0569xdwysrx2rca2fn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phi-search-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phi-search-dired";
           sha256 = "1gf3vs3vrp5kbq4ixnj7adazmnqixi63qswgc2512p10gf7inf8p";
           name = "phi-search-dired";
         };
@@ -42820,7 +43281,7 @@
           sha256 = "0r6cl1ng41s6wsy5syjlkaip0mp8h491diipdc1psbhnpk4vabsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phi-search-mc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phi-search-mc";
           sha256 = "07hd80rbyzr5n3yd7hv1j51nl6pvcxmln20g6xvw8gh5yfl9k0m8";
           name = "phi-search-mc";
         };
@@ -42841,7 +43302,7 @@
           sha256 = "1k8hjnkinzdxy9qxldsyvj6npa2sv48m905d1cvxr8lyzpc5hikh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phi-search-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phi-search-migemo";
           sha256 = "0qk73s09sasm438w29j5z2bmlb60p1mgbv2ch43rgq8c6kjzg6h6";
           name = "phi-search-migemo";
         };
@@ -42862,7 +43323,7 @@
           sha256 = "1fg63g1cm9mp50sf3ldcb0pr4bvlfxx010arisxdkj102pmib2ri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phoenix-dark-mono-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phoenix-dark-mono-theme";
           sha256 = "15in299j170n0wxmkg3cx1zzx1n7r1ifraqqzfqhcnk8i8lmc939";
           name = "phoenix-dark-mono-theme";
         };
@@ -42883,7 +43344,7 @@
           sha256 = "042yw44d5pwykl177sdh209drc5f17yzhq0mxrf7qhycbjs4h8cg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phoenix-dark-pink-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phoenix-dark-pink-theme";
           sha256 = "0bz6iw73d85bi12qqx6fdw3paqknrxvn0asbwjmgdcrlqrfczjlr";
           name = "phoenix-dark-pink-theme";
         };
@@ -42904,7 +43365,7 @@
           sha256 = "1l64rka9wrnwdgfgwv8xh7mq9f1937z2v3r82qcfi6il3anw4zm0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php-auto-yasnippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php-auto-yasnippets";
           sha256 = "1hhddvpc80b6wvjpbpibsf24rp5a5p45m0bg7m0c8mx181h9mqgn";
           name = "php-auto-yasnippets";
         };
@@ -42925,7 +43386,7 @@
           sha256 = "10lzbyr7z95mynz885k75n2ibsy92dh3mg3s5m69n03jnf9gv1jy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php-boris";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php-boris";
           sha256 = "19yfbrlfqikix2lnnlbpzm6yakjhl84ix0zra2ycpvgg2pl88r0g";
           name = "php-boris";
         };
@@ -42946,7 +43407,7 @@
           sha256 = "1wk7vq80v97psxfg0pwy4mc6kdc61gm6h1vgl9p71ii6g6zvzcqg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php-boris-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php-boris-minor-mode";
           sha256 = "1cmpd303chldss7kylpinv8qc3c78srz02a9cp9x79c8arq7apwl";
           name = "php-boris-minor-mode";
         };
@@ -42967,7 +43428,7 @@
           sha256 = "0hm6myvf91f4d2yfc7fs2xky9m8hfnimx1gkfzmn9f5pcc2l2p0i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php-eldoc";
           sha256 = "1q5fkl8crqrgxik2mxbkqv10qnqhqrazd66rgfw797s3jcchv58j";
           name = "php-eldoc";
         };
@@ -42988,7 +43449,7 @@
           sha256 = "0206jv7rz9gm016lpfdwh2l0z6da25szc6hfxgcz2qvkzjpvrlr6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php-mode";
           sha256 = "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y";
           name = "php-mode";
         };
@@ -43009,7 +43470,7 @@
           sha256 = "0f1n0jcla157ngqshq5n8iws216ar63ynjd6743cbdrzj0v030wg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php+-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php+-mode";
           sha256 = "1ibcsky6la3l7gawpgx814w1acjf73b68i6wbb4p6saxhwg6adik";
           name = "php-plus--mode";
         };
@@ -43030,7 +43491,7 @@
           sha256 = "163albjkq7ldc9fki368540m7nl58qa70wfpff08gx3gsvywfnyi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php-refactor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php-refactor-mode";
           sha256 = "0gj0nv6ii7pya0hcxs8haz5pahj0sa12c2ls53c3j85in645zb3s";
           name = "php-refactor-mode";
         };
@@ -43051,7 +43512,7 @@
           sha256 = "09rinyx0621d7613xmbyvrrlav6d4ia332wkgg0m9dn265g3h56z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phpcbf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phpcbf";
           sha256 = "1hf88ys4grffpqgavrbc72dn3m7crafgid2ygzx9c5j55syh8mfv";
           name = "phpcbf";
         };
@@ -43072,7 +43533,7 @@
           sha256 = "1zghw5nfm4a9j98vsaw4fc8r4f98s5fhgvgbnbyyxapl851fa9i6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phpunit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phpunit";
           sha256 = "0nj8ss1yjkcqnbnn4jgbp0403ljjk2xhipzikdrl3dbxlf14i4f8";
           name = "phpunit";
         };
@@ -43093,7 +43554,7 @@
           sha256 = "053jqzl0sp3dnl4919vi30xqrdcpi9jsqx5hndj1bprf7926w11d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pianobar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pianobar";
           sha256 = "16vsf2cig9qjbh9s58zb5byjmyghxbsxpzpm5hyyrv251jap1jjn";
           name = "pianobar";
         };
@@ -43114,7 +43575,7 @@
           sha256 = "0p91ysyjksbravnw3l78mshay6swgb5k1zi5bbppppk8zkmdp115";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/picolisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/picolisp-mode";
           sha256 = "1n56knbapyfs8n23arzlz27y0q4846r64krwlwh8agfqkcdw9dp5";
           name = "picolisp-mode";
         };
@@ -43135,7 +43596,7 @@
           sha256 = "1yg9n265ljdjlh6a3jrjwyvj3f76wp68x25bl0p8dxrrsyr9kvfx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pig-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pig-mode";
           sha256 = "0gmvc4rrqkn0cx8fk1sxk6phfbpf8dcba3k6i24k3idcx8rxsw3x";
           name = "pig-mode";
         };
@@ -43156,7 +43617,7 @@
           sha256 = "1yg9n265ljdjlh6a3jrjwyvj3f76wp68x25bl0p8dxrrsyr9kvfx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pig-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pig-snippets";
           sha256 = "1sqi0a2dsqgmabkrncxiyrhibyryyy25d11b15ybhlngd05wqbx2";
           name = "pig-snippets";
         };
@@ -43177,7 +43638,7 @@
           sha256 = "19i8hgzr7kdj4skf0cnv6vlsklq9qcyxcv3p33k9vgq7y4f9mah8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pillar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pillar";
           sha256 = "1lklky3shyvm1iygp621hbldpx37m0a9vd5l6mxs4y60ksj6z0js";
           name = "pillar";
         };
@@ -43198,7 +43659,7 @@
           sha256 = "0wy9c37g6m5khchlp8qvfnjgkwq4r38659adcm5prvzjgzqhlfja";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pinboard-api";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pinboard-api";
           sha256 = "0yzvgnpkj2fhl01id36nc5pj8vyb05bllraiz3lwwcc66y98h9n0";
           name = "pinboard-api";
         };
@@ -43219,7 +43680,7 @@
           sha256 = "1wc31r5fpcia4n4vbpg7vv3rzrnjzh18yygi3kp4wvl2wzx2azqh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pinot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pinot";
           sha256 = "1kjzq02pddnkia637xz2mnjjyglyh6qzragnf7nnxbw9ayiim58i";
           name = "pinot";
         };
@@ -43240,7 +43701,7 @@
           sha256 = "096izagfjw8cnxjq3v70x8a55npyxnr40mg1fc9b1jnqw6qwf491";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pinyin-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pinyin-search";
           sha256 = "1si693nmmxgg0kp5mxvj5nq946kfc5cv3wfsl4znbqzps8qb2b7z";
           name = "pinyin-search";
         };
@@ -43253,15 +43714,15 @@
     pip-requirements = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pip-requirements";
-        version = "20150423.1558";
+        version = "20160131.1126";
         src = fetchFromGitHub {
           owner = "Wilfred";
           repo = "pip-requirements.el";
-          rev = "f8d3ecaee9090cee267476d4551c905c412d6017";
-          sha256 = "05ix3xwqhnxjvc6cr006hhcgzhrp88jz9x4iswb0sidwysidpgnx";
+          rev = "a3656a8949c78f3d64b9a13ae3ed868005d82119";
+          sha256 = "0j4h6q1s2s9dw1pp22xsajchwg8nh3x4x5qxbzf19i1xbpcghw7h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pip-requirements";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pip-requirements";
           sha256 = "1wsjfyqga7pzp8gsm5x53qrkn40srairbjpifyrqbi2fpzmwhrnz";
           name = "pip-requirements";
         };
@@ -43282,7 +43743,7 @@
           sha256 = "1sbwqrk9nciqwm53sfbq3nr9f9zzpz79dmxs8yp005dk7accdlls";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pivotal-tracker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pivotal-tracker";
           sha256 = "195wcfn434yp0p93zqih1snkkg1v7nxgb4gn0klajahmyrrjq2a2";
           name = "pivotal-tracker";
         };
@@ -43303,7 +43764,7 @@
           sha256 = "0nnvf2p593gn8sbyrvczyll030xgnkxn900a2hy7ia7xh0wmvddp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pixie-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pixie-mode";
           sha256 = "16z15yh78837k548xk5widdmy6fv03vym6q54i40knmgf5cllsl8";
           name = "pixie-mode";
         };
@@ -43324,7 +43785,7 @@
           sha256 = "14gn2qd72x3zfqzh2cngxcjpdiibyki1g4d1vdav5v9vcbglgm5d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pixiv-novel-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pixiv-novel-mode";
           sha256 = "0f1rxvf9nrw984122i6dzsgik9axfjv6yscmg203s065n9lz17px";
           name = "pixiv-novel-mode";
         };
@@ -43345,7 +43806,7 @@
           sha256 = "1xkdbyhz9mgdz5zmjm4hh050klsl12w5lkckw2l77ihcxv0vjnf2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pkg-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pkg-info";
           sha256 = "0whcvralk76mfmvbvwn57va5dkb1irj7iwffgddi7r0ima49iszx";
           name = "pkg-info";
         };
@@ -43366,7 +43827,7 @@
           sha256 = "077vp3fxwxj7b98ydw6iyi391w3acp73qwk6615yqdylpp66m750";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pkgbuild-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pkgbuild-mode";
           sha256 = "1lp7frjahcpr4xnzxz77qj5hbpxbxm2g28apkixrnc1xjha66v3x";
           name = "pkgbuild-mode";
         };
@@ -43387,7 +43848,7 @@
           sha256 = "0rpiyp95k14fsc5hdbnj4hs3snh0vm8a2skcplsdwkmb5j9547w1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plan9-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plan9-theme";
           sha256 = "0bvr877mc79s1shr82b33ipspz09jzc3809c6pkbw0jqpfid44cc";
           name = "plan9-theme";
         };
@@ -43408,7 +43869,7 @@
           sha256 = "0q4zdw58yawqp9rhx04lhq0v7iaf61ydbw19gpw4an85j2hxrkzq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/planet-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/planet-theme";
           sha256 = "1mhbydvk7brmkgmij5gpp6l9ixcyh1g3r4fw3kpq8nvgbwknsqc9";
           name = "planet-theme";
         };
@@ -43429,7 +43890,7 @@
           sha256 = "0jvs051ncpv7pwx2kr14fm1wqakabwc031xcv7lba0mx7shxzqdg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plantuml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plantuml-mode";
           sha256 = "0fg313mx9jz92lf9lr5apvma9ixfz02dvyzw1phsgzawi7hai264";
           name = "plantuml-mode";
         };
@@ -43450,7 +43911,7 @@
           sha256 = "1k3bqv5y2xp1jl2hpf8qhs11yzhcl8k40fxqjzv7mvc0ysq9y6wb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/platformio-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/platformio-mode";
           sha256 = "022l20sfyfkvp6kmmqxr7gcmcdx6b1dgsakjjnx8fknrpxr5kyps";
           name = "platformio-mode";
         };
@@ -43471,7 +43932,7 @@
           sha256 = "11cbpgjsnw8fiqf1s12hbm9qxgjcw6y2zxx7wz4wg7idmi7m0b7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plenv";
           sha256 = "0dw9fy5wd9wm76ag6yyw3f9jnlj7rcdcxgdjm30h514qfi9hxbw4";
           name = "plenv";
         };
@@ -43492,7 +43953,7 @@
           sha256 = "07hspp4bkb3f5dm0l1arm0w1m04cq4glg81x4a9kf7bl601wzki2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plim-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plim-mode";
           sha256 = "0247fpvxki5jhxw6swv7pcw0qwxrqnp75acnfss2lf984vggzhxi";
           name = "plim-mode";
         };
@@ -43513,7 +43974,7 @@
           sha256 = "1r2yxa7gqr0z9fwhx38siwjpg73a93rdmnhr4h6nm6lr32vviyxm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plsense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plsense";
           sha256 = "1ka06r4ashhjkfyzql9mfvs3gj7n684h4gaycj29w4nfqrhcw9va";
           name = "plsense";
         };
@@ -43534,7 +43995,7 @@
           sha256 = "0s34nbqqy6aqi113xj452pbmqp43046wfbfbbfv1xwhybgq0c1j1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plsense-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plsense-direx";
           sha256 = "0qd4b7gkmn5ydadhp70995rap3643s1aa8gfi5izgllzhg0i864j";
           name = "plsense-direx";
         };
@@ -43552,7 +44013,7 @@
           sha256 = "1v0wvy9fd1qq3aq83x5jv3953n0n51x7y2r2ql11j0h8xasy42p1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plsql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plsql";
           sha256 = "1jvppmfdll34b8dav5dvbabfxiapv92p7lciblj59a707bbdb7l1";
           name = "plsql";
         };
@@ -43571,7 +44032,7 @@
           sha256 = "0x3s9fj41n6a21la762qm1si9ysv3zj5bbp6ykfskr73sxq6s9ff";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pmdm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pmdm";
           sha256 = "1zmy6cbnqhsbwc5vx30mx45xn88d2186hgrl75ws7vvbl197j03b";
           name = "pmdm";
         };
@@ -43592,7 +44053,7 @@
           sha256 = "1p1j2kfwj7gzir7q5ls34k8764kwbnb6d0dhlw4zb4kvwlidp6c1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/point-stack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/point-stack";
           sha256 = "17z9mc49x4092axs7lq6b6z7yrrhkl8bdx5f8gq6qy5lampgyzch";
           name = "point-stack";
         };
@@ -43610,7 +44071,7 @@
           sha256 = "13c1iw77ccvrfrv4lyljg8fpm7xqhnv29yzvig8wr8b5j2vsd8bz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/point-undo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/point-undo";
           sha256 = "0by7ifj1lf0w9pp7v1j9liqjs40k8kk9yjnznxchq172816zbg3k";
           name = "point-undo";
         };
@@ -43631,7 +44092,7 @@
           sha256 = "016cjy5pnnqccjqb0njqc9jq6kf6p165nlki83b8c0sj75yxghav";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pointback";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pointback";
           sha256 = "198q511hixvzc13b3ih89xs9g47rdvbiixn5baqakpmpx3a12hz4";
           name = "pointback";
         };
@@ -43652,7 +44113,7 @@
           sha256 = "0dlgmp1vmpvfjx19jz52xjmpg0fi1d0gy3zz7rsyjdkdw8dmr1v6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/polymode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/polymode";
           sha256 = "0ndavaan7k55l3ghm5h08i0slmmzc82c0gl4b8w91fa8bi2lq4h4";
           name = "polymode";
         };
@@ -43673,7 +44134,7 @@
           sha256 = "1dlk0ypw8316vgvb7z2p7fvaiz1wcy1l8crixypaya1zdsnh9v1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pomodoro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pomodoro";
           sha256 = "075sbypas8xlhsw8wg3mgi3fn5yf7xb3klyjgyy8wfkgdz0269f8";
           name = "pomodoro";
         };
@@ -43694,7 +44155,7 @@
           sha256 = "1g1yw0ykwswl9dnicyi7kxskqqry40wjykshgrqhs4k09j3jnacr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pony-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pony-mode";
           sha256 = "1hgiryhpxv30bjlgv9pywzqn2ypimwzdhx03znqvn56zrwn1frnl";
           name = "pony-mode";
         };
@@ -43704,19 +44165,40 @@
           license = lib.licenses.free;
         };
       }) {};
+    pony-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "pony-snippets";
+        version = "20160126.2307";
+        src = fetchFromGitHub {
+          owner = "seantallen";
+          repo = "pony-snippets";
+          rev = "91c17c8af222f8177df12122d36399ea1ec6e8b4";
+          sha256 = "139j696lvwpx5kwmk37xhaklid3zs431lyqyml2hy8wbz316jrra";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pony-snippets";
+          sha256 = "06rrzfg20kzpscnqr2lin9jvrcydq4wnrv7nj1d0lm6988qz88jx";
+          name = "pony-snippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/pony-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
     ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ponylang-mode";
-        version = "20160116.845";
+        version = "20160123.1637";
         src = fetchFromGitHub {
-          owner = "abingham";
+          owner = "SeanTAllen";
           repo = "ponylang-mode";
-          rev = "f7349f5d74cc3aa408f4cd826258653ef56701be";
-          sha256 = "1jza1gprf21kmy8ysfg8iqz450c0gp3lbnp27gszwv8cn279x3rp";
+          rev = "d05425eca7c924109263bdac72083137a7967454";
+          sha256 = "0jlycv0ck5kbszwc0v2gbka6k5h39nz8763ws0v8jada7zzmyvxm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ponylang-mode";
-          sha256 = "06fy4aiflsynnybbrahfcmg0swxrfnwn48gr8ly3sqfpc037h2f3";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ponylang-mode";
+          sha256 = "02fq0qp7f4bzmynzszrwskfs78nzsmf413qjxqndrh3hamixzpi1";
           name = "ponylang-mode";
         };
         packageRequires = [ dash ];
@@ -43736,7 +44218,7 @@
           sha256 = "0n1w1adglbavqgrv16rzhym72c3q083mh0c8yl5lj7adn4nr4gr3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pophint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pophint";
           sha256 = "1chq2j79hg095jxw5z3pz4qicqrccw0gj4sxrin0a55hnprzzp72";
           name = "pophint";
         };
@@ -43757,7 +44239,7 @@
           sha256 = "0ja1kq4pl62zxlzwv2m8zzb55lg2fl366bi9pzvxl38frvbqg8qx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/poporg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/poporg";
           sha256 = "08s42689kd78h2fmw230ja5dd3c3b4lx5mzadncwq0lj91y86kd8";
           name = "poporg";
         };
@@ -43778,7 +44260,7 @@
           sha256 = "19sbdxs6l66nflfb4kmx4lb6z0shwpfq79b5h9hhi0xr70xacd4b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popup";
           sha256 = "151g00h9rkid76qf6c53n8bncsfaikmhj8fqcb3r3a6mbngcd5k2";
           name = "popup";
         };
@@ -43799,7 +44281,7 @@
           sha256 = "1q9zajv6g7mi6k98kzq3498nhmdkp1z9d2b8vgzbk7745d39gm9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popup-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popup-complete";
           sha256 = "04bpm31zx87j390r2xi1yl4kyqgalmyqc48xarsm67zfww9fw9c1";
           name = "popup-complete";
         };
@@ -43820,7 +44302,7 @@
           sha256 = "0fvj61n0kriniz1v96lxbdb9x6gbx00xwkcg83ajqv7f18j3m6wh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popup-imenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popup-imenu";
           sha256 = "0lxwfaa9vhdn55dj3idp8c3fg1g26qsqq46y5bimfd0s89bjbaxn";
           name = "popup-imenu";
         };
@@ -43841,7 +44323,7 @@
           sha256 = "1zdwlmk3vr0mq0dxrnkqjncalnbmvpxc0lma2sv3a4czl8yv0inn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popup-kill-ring";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popup-kill-ring";
           sha256 = "1jfw669xi2983jj3hiw5lyhc0rc0318qrmqx03f7m4ylg70dgxip";
           name = "popup-kill-ring";
         };
@@ -43854,15 +44336,15 @@
     popup-switcher = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "popup-switcher";
-        version = "20160112.217";
+        version = "20160123.1600";
         src = fetchFromGitHub {
           owner = "kostafey";
           repo = "popup-switcher";
-          rev = "a5de386b6fa0b8bbc2a58b7af36be9d32abe7ca9";
-          sha256 = "00qyc5kixb2y1a5rrylq2ln470ny3mihx07ybdim8s8q29dzajy6";
+          rev = "df48ac506dbd5b1c611d6cd0066ebeb91b4d97d1";
+          sha256 = "19c916bz354di7p4md8456xhf3i72db86mwlk2wrq0d4kx16dh0c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popup-switcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popup-switcher";
           sha256 = "1888xiqhrn7fcpjnr3smchmmqwfayfbbyvdkdb79c6drzjcvidp1";
           name = "popup-switcher";
         };
@@ -43883,7 +44365,7 @@
           sha256 = "0nips9npm4zmz3f37vvb4s0g1ci0p9cl6w0z4sc6agg4rybjhpdp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popwin";
           sha256 = "1zp54nv8rh0b3g8y5aj4793miiw2r1ijwbzq31lkwmbdr09mixmf";
           name = "popwin";
         };
@@ -43904,7 +44386,7 @@
           sha256 = "1pm4x74pw67m2izr9dir201dn5g9icgk6h2j8rqvasgx8v8krv3i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/portage-navi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/portage-navi";
           sha256 = "1wjkh8xj5120v9fz1nrpkd6x4f22ni8h2lfkd82df7kjz6bzdfwg";
           name = "portage-navi";
         };
@@ -43925,7 +44407,7 @@
           sha256 = "168hl76rhj6f5ncmrij4rd3z55228h6kb23384h2phsjw0avgf23";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pos-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pos-tip";
           sha256 = "13qjz112qlrnq34lr70087gshzq8m44knfl6694hfprzjgix84vh";
           name = "pos-tip";
         };
@@ -43946,7 +44428,7 @@
           sha256 = "1jzqav2lchr0ggckjq9rwlxwryi7m7xnmn8471zgiamd1h04ddqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pow";
           sha256 = "05wc4ylp0xjqbzrm046lcsv4aw2a6s2rfv1ra38bfr0dai6qrsrn";
           name = "pow";
         };
@@ -43967,7 +44449,7 @@
           sha256 = "0dq7fqlv72p72hbshzbwz5k40mqfdw10v9hsd1m18s2rf7082570";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/powerline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/powerline";
           sha256 = "0gsffr6ilmckrzifsmhwd42vr85vs42pc26f1205pbxb7ma34dhx";
           name = "powerline";
         };
@@ -43988,7 +44470,7 @@
           sha256 = "1c8y4r7zdr6764kzs5bc64idv2pfjvi78lg2f1d2hp1595ia8y5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/powerline-evil";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/powerline-evil";
           sha256 = "0cdnmq9f06lzkj0hs948a7j5sgg6fl5f36bfnyaxgss23akbfjhr";
           name = "powerline-evil";
         };
@@ -44001,15 +44483,15 @@
     powershell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "powershell";
-        version = "20160101.2018";
+        version = "20160127.2323";
         src = fetchFromGitHub {
           owner = "jschaf";
           repo = "powershell.el";
-          rev = "348560747fb4e0f47475be0fb3a11ad576d364fe";
-          sha256 = "0fi8a3l64brljmlbk5j65vj3n5x1ygi07fxvxq5xllbzg0h8x4hc";
+          rev = "7feddfc9ea073b374575c67a10692b7bfc35907b";
+          sha256 = "096dks3wib5x29k722d7qkgr61n3qk29gw3rzkwsrid23zhvgnkn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/powershell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/powershell";
           sha256 = "162k8y9k2n48whaq93sqk86zy3p9qvsfxgyfv9n1nvk4l5wn70wk";
           name = "powershell";
         };
@@ -44027,7 +44509,7 @@
           sha256 = "10gsdjdr8qngimqh57qxcljjnypbf38asxqb3zlfwc2ls52fc19q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pp-c-l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pp-c-l";
           sha256 = "0gbqxlrsh9lcdkrj8bqh1mpxyhdlwbaxz4ndp5s90inmisaqb83v";
           name = "pp-c-l";
         };
@@ -44045,7 +44527,7 @@
           sha256 = "0zlmcrg8gx812gm04cil7p2z0g4814c158yv1ghmrbxshn8p45fg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pp+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pp+";
           sha256 = "1ng5x7dp85y6yqj6q43h08qdnapg2j1ab8rmc47w4w79d1pryniq";
           name = "pp-plus";
         };
@@ -44066,7 +44548,7 @@
           sha256 = "0pv671j8g09pn61kkfb3pa9axfa9zd2jdrkgr81rm2gqb2vh1hsq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ppd-sr-speedbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ppd-sr-speedbar";
           sha256 = "1m2918hqvb9c6rgb5szs95ds99gdjdxggcbdfqzmbb5sz2936av8";
           name = "ppd-sr-speedbar";
         };
@@ -44087,7 +44569,7 @@
           sha256 = "0yrfd9qaz16nqcvjyjm9qci526qgkv6k51q5752h3iyqkxnss1pd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/preproc-font-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/preproc-font-lock";
           sha256 = "1ra0lgjv6713zym2h8pblf2ryf0f658l1khbxbwnxl023gkyj9v4";
           name = "preproc-font-lock";
         };
@@ -44108,7 +44590,7 @@
           sha256 = "1dyi9nc2q43jf87xiz9xw42irrbla2vyixifdiibh6nm9misnfj0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/preseed-generic-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/preseed-generic-mode";
           sha256 = "0c0zs07lspwczbcba56fai0rshjzx9zd3jqxgj9nwjf9xlcr8m3j";
           name = "preseed-generic-mode";
         };
@@ -44126,7 +44608,7 @@
           sha256 = "1fn24399wsn12453py0hw2vbbkrkakiwi06cjvjzsdk7g3326ma4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pretty-lambdada";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pretty-lambdada";
           sha256 = "16v5fgifz672c37xyzv557mm6za4rldvdrb26vdymxqg4fy62fd6";
           name = "pretty-lambdada";
         };
@@ -44147,7 +44629,7 @@
           sha256 = "0ccqym98c6zdyrparj5n97bpp9rspxb3z5lqfcrjypp0kn04z1ss";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pretty-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pretty-mode";
           sha256 = "1zxi4nj7vnchiiz1ndx17b719a1wipiqniykzn4pa1w7dsnqg21f";
           name = "pretty-mode";
         };
@@ -44168,7 +44650,7 @@
           sha256 = "1n0594msgy53ia58gjfkm3z3cnmq52wrq5992fm28s4jgazbgdfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pretty-sha-path";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pretty-sha-path";
           sha256 = "0qqsg383391dnsk46xm8plq7xmdmnis3iv7h7dmchpzd99bkm9lq";
           name = "pretty-sha-path";
         };
@@ -44189,7 +44671,7 @@
           sha256 = "1f00l9f6an1mh8yhf629mw0p37m4jcpl8giz47xbdyw1k6bqn830";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pretty-symbols";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pretty-symbols";
           sha256 = "0d1ad2x4md0n3fad3s2355wm8hl311qdhih1gkdqwdaj4i1d6gvb";
           name = "pretty-symbols";
         };
@@ -44210,7 +44692,7 @@
           sha256 = "0zng64f5vwnpkf9fk59yv1ndc646q608a6awr1y9qk0mhzbfzhqm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/private";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/private";
           sha256 = "1glpcwcyndyn683q9mg99hr0h3l8pz7rrhbnfak01v826d5cnk9g";
           name = "private";
         };
@@ -44231,7 +44713,7 @@
           sha256 = "1pxr5a9ik09k0f58lawhxiv179n5j8q24zhrs9vjk93yskl1ydwn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/private-diary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/private-diary";
           sha256 = "0dgnf375c00nlkp66kbkzsf469063l03b9miiplbhd63zshlv1i1";
           name = "private-diary";
         };
@@ -44252,7 +44734,7 @@
           sha256 = "0nly5h0d6w8dc08ifb2fiqcn4cqcn9crkh2wn0jzlz4zd2x75qrb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/proc-net";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/proc-net";
           sha256 = "0562x2s3kk9vlaavak4lya1nlmn4mwlzlc7nw1l3687q023z4hmv";
           name = "proc-net";
         };
@@ -44273,7 +44755,7 @@
           sha256 = "1smw786dcjvdn2j6bwqn2rfzhw039rrhxiv7vlrgzm0fyy2v1q6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/processing-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/processing-mode";
           sha256 = "184yg9z14ighz9djg53ji5dgnb98dnxkkwx55m8f0f879x31i89m";
           name = "processing-mode";
         };
@@ -44294,7 +44776,7 @@
           sha256 = "1smw786dcjvdn2j6bwqn2rfzhw039rrhxiv7vlrgzm0fyy2v1q6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/processing-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/processing-snippets";
           sha256 = "09vkm9asmjz1in0f63s7bf4amifspsqf5w9pxiy5y0qvmn28fr2r";
           name = "processing-snippets";
         };
@@ -44315,7 +44797,7 @@
           sha256 = "18j0jwp8z4ff7xfiijyh09cvb14mbjfaygin2qjp6bxgx3c1mpin";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/prodigy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/prodigy";
           sha256 = "032868bgy2wmb2ws48lfibs4118inpna7mmml8m7i4m4y9ll6g85";
           name = "prodigy";
         };
@@ -44336,7 +44818,7 @@
           sha256 = "0hx7rxa3smdippcpj4j63k0r5l4wflllb0vpnwwknc9j93r7042b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/professional-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/professional-theme";
           sha256 = "1l8nisn2c124cpylyahr76hfpdim2125zrns2897p466l5wcxcx5";
           name = "professional-theme";
         };
@@ -44357,7 +44839,7 @@
           sha256 = "1szxsbk470fg3jp70r20va9hnnf4jj0mb7kxdkn6rd7ky6w34lwm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/prognth";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/prognth";
           sha256 = "0hr5a3s0ij4hvn424v885z7pcs62yqm9mamw5b096hgjxgjf6ylm";
           name = "prognth";
         };
@@ -44378,7 +44860,7 @@
           sha256 = "1yklm43d0ppyf4simhqab6m892z4mmxs2145lzw6kpizixavcv00";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/programmer-dvorak";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/programmer-dvorak";
           sha256 = "1w8r35hkl6qy9a89l0m74x9q2vcc4h2hvmi3r2hqcy2ypkn5l5bv";
           name = "programmer-dvorak";
         };
@@ -44399,7 +44881,7 @@
           sha256 = "04l4m3kxbwvyw9xy6cwakrdxxdswrrs7sya8zn6m738aawbr1mcd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-explorer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-explorer";
           sha256 = "076lzmyi1n7yrgdgyh9qinq271qk6k64x0msbzarihr3p4psrn8m";
           name = "project-explorer";
         };
@@ -44418,7 +44900,7 @@
           sha256 = "1bb5b6hxg3gvwf0sqwkd97nnipsmr60py0rnsfhgvizn4cj3khhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-local-variables";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-local-variables";
           sha256 = "0mrf7p420rmjm8ydwc5blpxr6299pdg3sy3jwz2zz0420gkp0ihl";
           name = "project-local-variables";
         };
@@ -44439,7 +44921,7 @@
           sha256 = "1fvjap0bsyw5q92q50wk8c81yv4g8nqb6jdlnarf80glwk50avrs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-persist";
           sha256 = "0csjwj0qaw0hz2qrj8kxgxlixh2hi3aqib98vm19sr3f1b8qab24";
           name = "project-persist";
         };
@@ -44460,7 +44942,7 @@
           sha256 = "1nq320ph8fs9a197ji4mnw2xa24dld0r1nka476yvkg4azmcc9x8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-persist-drawer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-persist-drawer";
           sha256 = "1jv2y2hcqakyvfibclzm7g4diw0bvsv3a8fa43yf19wb64jm8hdb";
           name = "project-persist-drawer";
         };
@@ -44480,7 +44962,7 @@
           sha256 = "08dd2y6hdsj1rxcqa2hnjypnn9c2z43y7z2hz0fi4vny547qybz8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-root";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-root";
           sha256 = "0xjir204zk254y2x70k9vqwirx2ljmrikpsgn5kn170d1bxvhwmb";
           name = "project-root";
         };
@@ -44493,15 +44975,15 @@
     projectile = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "projectile";
-        version = "20160115.223";
+        version = "20160130.657";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "68f8f0c4e330e3eb2c4c140c1fbdf66ca11e45df";
-          sha256 = "09p4cgg8129lxalj5nja39a6827q973z0zdgxzi0n53xhzlsznag";
+          rev = "543841e3f6dc4d46c75755cf227b22acc1bfad48";
+          sha256 = "17w0nlr7h8dga8fl48lfb22i898cbgnqmxrqa7cah212yqyn4fp0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projectile";
           sha256 = "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn";
           name = "projectile";
         };
@@ -44522,7 +45004,7 @@
           sha256 = "0ch3naqp3ji0q4blpjfr1xbzgzxhw10h08y2akik96kk1pnkwism";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projectile-codesearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projectile-codesearch";
           sha256 = "0jgvs9is59q45wh2a7k5sb6vj179ixqgj5dlndj9r6fh59qgrzdk";
           name = "projectile-codesearch";
         };
@@ -44535,15 +45017,15 @@
     projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
     melpaBuild {
         pname = "projectile-rails";
-        version = "20151126.1145";
+        version = "20160204.1003";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "cc1698f6ba4c54b1d19e73ea7fb3276234a285c5";
-          sha256 = "0hh2hwyhdb1k7ba8vy1ys2i8qvf7sxw8a3v24m3b2cmrg3hz3hcb";
+          rev = "21ce05e412b0efebfeab9f84d38c679758ddbf76";
+          sha256 = "0f0siz230xsv20h8wmwa1i8wdsp964y6qmb2i3l485yh03bz1x95";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projectile-rails";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projectile-rails";
           sha256 = "0fgvignqdqh0ma91z9385782l89mvwfn77rp1gmy8cbkwi3b7fkq";
           name = "projectile-rails";
         };
@@ -44564,7 +45046,7 @@
           sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projectile-sift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projectile-sift";
           sha256 = "1wbgpwq9yy3v7hqidaczrvvsw5ajj7m3n4gsy3b169xv5h673a0i";
           name = "projectile-sift";
         };
@@ -44585,7 +45067,7 @@
           sha256 = "0lr3vx1byf0i9jdzbyrvvzyzi1nfddvw5r9f9wm7gpfp5l8772la";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projectile-speedbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projectile-speedbar";
           sha256 = "0dli4gzsiycivh8dwa00lfpbimyg42qygfachzrhi8qy5413pwlp";
           name = "projectile-speedbar";
         };
@@ -44606,7 +45088,7 @@
           sha256 = "0y8zbywin99nhcrs5nzx4d179r84rdy39admajpi0j76v0b9pwl3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projector";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projector";
           sha256 = "0hrinplk607wcc2ibn05pl8ghikv9f3zvymncp6nz95jw9brdapf";
           name = "projector";
         };
@@ -44627,7 +45109,7 @@
           sha256 = "0hvvlh24157qjxz82sbg22d4cbrf95xyx202cybp0n1vyxsmjcmw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projekt";
           sha256 = "1bhb24701flihl54w8xrj6yxhynpq4dk0fp5ciac7k28n4930lw8";
           name = "projekt";
         };
@@ -44648,7 +45130,7 @@
           sha256 = "1sxxy0s96sgm6i743qwjs0qjpsdr03gqc1cddvvpxbryh42vw9jn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projmake-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projmake-mode";
           sha256 = "192gvmhcz1anl80hpmcjwwd08dljyrap9sk6qj0y85mcnaafm882";
           name = "projmake-mode";
         };
@@ -44669,7 +45151,7 @@
           sha256 = "1hq8426i8rpb3qzkd5akv3i08pa4jsp9lwsskn38bfgp71pwild2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/prompt-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/prompt-text";
           sha256 = "1b9sj9kzx5ydq2zsfmkwsx78pzg0vsvrn92397js6b2cm24vrwwc";
           name = "prompt-text";
         };
@@ -44690,7 +45172,7 @@
           sha256 = "18ap2liz5r5a8ja2zz9182fnfm47jnsbyblpq859zks356k37iwc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/prop-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/prop-menu";
           sha256 = "0dhy52fxxpa058mhhx0slw3sly3dlxm9vkax6fd1sap6f6v00p5i";
           name = "prop-menu";
         };
@@ -44711,7 +45193,7 @@
           sha256 = "0lch20njy248w7bnvgs7jz0zqasskf5dakmykxwpb48llm6kx95v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/propfont-mixed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/propfont-mixed";
           sha256 = "19k0ydpkiviznsngwcqwn4k30r6j8w34pchgpjlsfwq1bndaai9y";
           name = "propfont-mixed";
         };
@@ -44732,7 +45214,7 @@
           sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/prosjekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/prosjekt";
           sha256 = "1fn7ii1bq7bjkz27hihclpvx0aabgwy3kv47r9qibjl2jin97rck";
           name = "prosjekt";
         };
@@ -44749,11 +45231,11 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "bbe6e430f62fc89aac6712403a42121665f00a88";
-          sha256 = "0wiw59shlrg2wd2lmgwpjyqb4gazhljb3b43mn2rffx62s86hzij";
+          rev = "bd8a476510d17d3841ff2509fbd67b7f4b543c1c";
+          sha256 = "0x6419waryq14y1q8v53riwjnqfw6azf4sfpsik9qjsznzmlgxx9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/protobuf-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/protobuf-mode";
           sha256 = "1hh0w93fg6mfwsbb9wvp335ry8kflj50k8hybchpjcn6f4x39xsj";
           name = "protobuf-mode";
         };
@@ -44766,15 +45248,15 @@
     psc-ide = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "psc-ide";
-        version = "20160106.415";
+        version = "20160203.1732";
         src = fetchFromGitHub {
           owner = "epost";
           repo = "psc-ide-emacs";
-          rev = "d5de1f88860ce6d343d39dcec666db0ebdc0f513";
-          sha256 = "0i5qdx76r0zchhv115nx2gr4r7915df08b9kiaa0i7s3dxc6zmg3";
+          rev = "43552df23d65a6ef9bf410c0fa992c9d2342fc67";
+          sha256 = "0awlkvbll2cxc9rzzm1ln5qhp05jikihcay1wz74dkwzwlfjlp17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/psc-ide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/psc-ide";
           sha256 = "1f8bphrbksz7si9flyhz54brb7w1lcz19pmn92hjwx7kd4nl18i9";
           name = "psc-ide";
         };
@@ -44795,7 +45277,7 @@
           sha256 = "08j31bg5vwgirv5n5fsw7w6gncrkpwpjlj2m00dhj8wbvhp503sn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/psci";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/psci";
           sha256 = "0sgrz8byz2pcsad2pydinp4hh2xb48pdb03r93wg2vvyy8p15j9g";
           name = "psci";
         };
@@ -44816,7 +45298,7 @@
           sha256 = "1b8w9wnrwk4j2gn543phz9qp8813ksqakr5pi509m6ijwcv0cp7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/psession";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/psession";
           sha256 = "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a";
           name = "psession";
         };
@@ -44837,7 +45319,7 @@
           sha256 = "1jz1g0igpnsjn2r144205bffj10iyp8izm8678mzkhnricxkn0d6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/psvn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/psvn";
           sha256 = "1wdww25pjla7c8zf04mvgia1ws8cal9rb7z8g3vn2s3gp68py12n";
           name = "psvn";
         };
@@ -44847,18 +45329,39 @@
           license = lib.licenses.free;
         };
       }) {};
+    psysh = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "psysh";
+        version = "20160123.958";
+        src = fetchFromGitHub {
+          owner = "zonuexe";
+          repo = "psysh.el";
+          rev = "14fa252628009463f05fdf573c23e166536d3b76";
+          sha256 = "1q8fk25qwnnm9z1zcf9f1k3b060lk6g6f16c8db90psp6za0xdwz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/psysh";
+          sha256 = "0ygnfmfx1ifppg6j3vfz10srbcpr5ird2bhw6pvydijxkyd75vy5";
+          name = "psysh";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/psysh";
+          license = lib.licenses.free;
+        };
+      }) {};
     pt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pt";
-        version = "20151024.1051";
+        version = "20160119.1017";
         src = fetchFromGitHub {
           owner = "bling";
           repo = "pt.el";
-          rev = "17e8e743ac5fbbab14ad2635f0047c43c9d591b7";
-          sha256 = "1nn4m2z0wyp3ygx39c5racydixkis930ln8q5bdbhnjh4xgvgib1";
+          rev = "97e04eb77154234d946064a573762bcd72219f75";
+          sha256 = "0ca8j7xlqxbidqfz2iarwn7qq4v12pwvsq6vzj2473n2g1c09xzj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pt";
           sha256 = "0zmz1hcr4ajc2ydvpdxhy1dlhp7hvlkv6y6w1b79ffvq6acdd5mj";
           name = "pt";
         };
@@ -44879,7 +45382,7 @@
           sha256 = "024g793y6vqhk5h6vqjv5hljvfyb0j6b6j51fjhijgdxmqhlk9vm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/puml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/puml-mode";
           sha256 = "131ghjq6lsbhbx5hdg36swnkqijdb9bx6zg73hg0nw8qk0z742vn";
           name = "puml-mode";
         };
@@ -44900,7 +45403,7 @@
           sha256 = "1bkkgs2agy00wivilljkj3a9fsb2ba935icjmhbk46zjc6yf3y6q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/punctuality-logger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/punctuality-logger";
           sha256 = "0q9s74hkfqvcx67xpq9rlvh38nyjnz230bll6ks7y5yzxvl4qhcm";
           name = "punctuality-logger";
         };
@@ -44921,7 +45424,7 @@
           sha256 = "1viw95y6fha782n1jw7snr7xc00iyf94r4whsm1a2q11vm2d1h21";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pungi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pungi";
           sha256 = "1v9fsd764z5wdcips63z53rcipdz7bha4q6s4pnn114jn3a93ls1";
           name = "pungi";
         };
@@ -44942,7 +45445,7 @@
           sha256 = "11mkf9gvjz63szdvhwlqnd6j2r9ij2fh8l6zkf7hl2zlwyyivcmp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/puppet-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/puppet-mode";
           sha256 = "1s2hap6fs6rg5q80dmzhaf4qqaf5sglhs8p896i3i5hq51w0ciyc";
           name = "puppet-mode";
         };
@@ -44963,7 +45466,7 @@
           sha256 = "0k2plyvd6842yryzrfadbf4h7a9hrjvkcvixclbca2bkvfik3864";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/purescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/purescript-mode";
           sha256 = "00gz752mh7144nsaka5q3q4681jp845kc5vcy2nbfnqp9b24l55m";
           name = "purescript-mode";
         };
@@ -44984,7 +45487,7 @@
           sha256 = "15myw5rkbnnpgzpiipm5xl4cyzymv8hh66x9al4aalb5nf52dckc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/purple-haze-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/purple-haze-theme";
           sha256 = "0ld8k53823786y6f0dqcp0hlqlnmy323vdkanjfs5wg5ib60az1m";
           name = "purple-haze-theme";
         };
@@ -45005,7 +45508,7 @@
           sha256 = "0qm2xv762cz196aqs445crqrmsks8hpwzpaykzn0chlvdk0m5cv1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/purty-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/purty-mode";
           sha256 = "1ackqv95sdphbsjwydbc4dmdzwpaj74v329f55zcwa8hn3li9d5m";
           name = "purty-mode";
         };
@@ -45026,7 +45529,7 @@
           sha256 = "03ivg3ddhy5zh410wgwxa17m98wywqhk62jgijhjd00b6l8i4aym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pushbullet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pushbullet";
           sha256 = "1swzl25rcw7anl7q099qh14yhnwlbn3m20ib9kis0l1rv59kkarl";
           name = "pushbullet";
         };
@@ -45047,7 +45550,7 @@
           sha256 = "10g4imxgpv7a0j40qkx7xf2qnyz80ypd0mv0lf47n9dwln5byln3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/px";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/px";
           sha256 = "0xjmz18m2dslh6yq5z32r43zq3svfxn8mhrfbmihglyv2mkwxw44";
           name = "px";
         };
@@ -45068,7 +45571,7 @@
           sha256 = "1iw94m1bvsmadlj16f8ymwx0q6f9lqysy7by76hkpiwqqhd2i8rv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-autopep8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-autopep8";
           sha256 = "1argjdmh0x9c90zkb6cr4z3zkpgjp2mkpsw0dr4v6gg83jcggfpp";
           name = "py-autopep8";
         };
@@ -45089,7 +45592,7 @@
           sha256 = "05803wi7rj73sy9ihkilr6pcn72szfsvgf2dgbdpnqra508rxyb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-gnitset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-gnitset";
           sha256 = "0f6ivq4ignb4gfxw2q8qvigvv3fbvvyr87x25wcaz6yipg1lr18r";
           name = "py-gnitset";
         };
@@ -45110,7 +45613,7 @@
           sha256 = "1416hbc64gwn9c8g9lxfx58w60ysi0x8rbps6mfxalavdhbs20sv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-import-check";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-import-check";
           sha256 = "1261dki0q44sw9h0g1305i2fj1dg9xgwzry50jbn2idcrqg4xf7k";
           name = "py-import-check";
         };
@@ -45131,7 +45634,7 @@
           sha256 = "0150q6xcnzzrkn9fa9njm973l1d49c48ad8qia71k4jwrxjjj6zr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-isort";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-isort";
           sha256 = "0k5gn3bjn5pv6dn6p0m9xghn0sx3m29bj3pfrmyh6gd5ic0l00yb";
           name = "py-isort";
         };
@@ -45152,7 +45655,7 @@
           sha256 = "05gi17n488r2n6x33nj4a23ci89c9smsbanmap4i302dy0mnmwgd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-smart-operator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-smart-operator";
           sha256 = "1n0bdr9z2s1ikhmfz642k94gjzb88anwlb61mh27ay8wqdgm74c4";
           name = "py-smart-operator";
         };
@@ -45173,7 +45676,7 @@
           sha256 = "1s39407z3rxz10r5sshv2vj7s23ylkhg59ixasgnpjk82gl4igpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-test";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-test";
           sha256 = "1mbwbzg606winf5af7qkg6a1hg79lc7k2miq4d3mwih496l5sinb";
           name = "py-test";
         };
@@ -45194,7 +45697,7 @@
           sha256 = "09z739w4fjg9xnv3mbh7v8j59mnbsfq4ygq616pj4xcw3nsh0rbg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-yapf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-yapf";
           sha256 = "1381x0ffpllxwgkr2d8xxbv1nd4k475m1aff8l5qijw7d1fqga2f";
           name = "py-yapf";
         };
@@ -45215,7 +45718,7 @@
           sha256 = "09glwrb9q65qdm4yd0mbi5hwdy2434zm8699ywhs6hqpjacadlmi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pycarddavel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pycarddavel";
           sha256 = "12k2mnzkd8yv17csfhclsnd479vcabawmac23yw6dsw7ic53jf1a";
           name = "pycarddavel";
         };
@@ -45236,7 +45739,7 @@
           sha256 = "1q9fmdrnsqmisykndxzy9bvjl6n1rsmfgvh3h8fkg6b44ypcyyw7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pydoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pydoc";
           sha256 = "0sf52cb80yiridsl1pffdr3wpbgxrn2l8vnq03l70djckild477n";
           name = "pydoc";
         };
@@ -45256,7 +45759,7 @@
           sha256 = "1mzyr6yznkyv99x9q8zx2f270ngjh8s94zvnhcbhidi57inpd1nh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pydoc-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pydoc-info";
           sha256 = "0l80g0rzkk3a1wrw2riiywz9wdyxwr5i64jb2h5r8alp9qq1k7mf";
           name = "pydoc-info";
         };
@@ -45277,7 +45780,7 @@
           sha256 = "0017xk95293sc37127hg9bbbh5glq34sdc1b6bx6ykzny6g49fd3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pyenv-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pyenv-mode";
           sha256 = "00yqrk92knv9gq1m9xcg78gavv70jsjlwzkllzxl63iva9qrch59";
           name = "pyenv-mode";
         };
@@ -45287,6 +45790,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    pyenv-mode-auto = callPackage ({ f, fetchFromGitHub, fetchurl, lib, melpaBuild, pyenv-mode, s }:
+    melpaBuild {
+        pname = "pyenv-mode-auto";
+        version = "20160123.141";
+        src = fetchFromGitHub {
+          owner = "ssbb";
+          repo = "pyenv-mode-auto";
+          rev = "714e322319ad7a8f5f2a3691aa431537b8a1b26c";
+          sha256 = "1sclhzv3w9fg54dg4qhlfbc0p1z5clyr8phrckhypvlwfgbar4b4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pyenv-mode-auto";
+          sha256 = "1l7h4fas1vshkh4skxzpw7v2a11s1hwnb20n6a81yh701pbikqnd";
+          name = "pyenv-mode-auto";
+        };
+        packageRequires = [ f pyenv-mode s ];
+        meta = {
+          homepage = "http://melpa.org/#/pyenv-mode-auto";
+          license = lib.licenses.free;
+        };
+      }) {};
     pyfmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pyfmt";
@@ -45298,7 +45822,7 @@
           sha256 = "1rp8zchvclh29rl9a1i82pcqghnhpaqnppaydxc2qx23y9pdgz9i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pyfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pyfmt";
           sha256 = "112kjsp763c2plhqlhydpngrabhc58ya7cszvi4119xqw2s699g6";
           name = "pyfmt";
         };
@@ -45311,15 +45835,15 @@
     pyimpsort = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pyimpsort";
-        version = "20150927.1317";
+        version = "20160129.2253";
         src = fetchFromGitHub {
           owner = "emacs-pe";
           repo = "pyimpsort.el";
-          rev = "e90d1b09e35356e3eed890fe38875bc7216d0f4e";
-          sha256 = "003hd5igv152yr4fa47n2l5jhwvdlfhw7bap1dkm1i7i898i6yds";
+          rev = "d5c61d70896b642646dfd3c809c06174ae086c1a";
+          sha256 = "05qx1p19dw3nr264shihfn33k579hd0wf4cxki5cqrxi7xzpjgrc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pyimpsort";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pyimpsort";
           sha256 = "0kdk3bmryfzvwf8vshfszbih8mwncf4xlb0n0n0yjn0p1n98q99k";
           name = "pyimpsort";
         };
@@ -45336,11 +45860,11 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "319c79d9b4e15e6600dd055370b6ad6e6392592f";
-          sha256 = "1qqvhabw0hly8c1lsgvh205c50fy5bk3r3r4w01wnrwsa9m8q0zj";
+          rev = "41f335f5942ba28c7e006d20b62a7a5e68a55a50";
+          sha256 = "1biqzjyrqkb2whscqz1h4x82h6jhvafbzx174apirc6h1vd1jhhq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pylint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pylint";
           sha256 = "1138a8dn9y4ypbphs1zfvr8gr4vdjcy0adsl4xfbgsls4kcdwpxx";
           name = "pylint";
         };
@@ -45361,7 +45885,7 @@
           sha256 = "1nlybqvy64lc0c65j9wbk4lx932lz0b8hxw8zm1vgmqppqcyn0p5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pytest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pytest";
           sha256 = "0ssib65wa20h8r6156f392l481vns5fcax6w70hcawmn84nficdh";
           name = "pytest";
         };
@@ -45382,7 +45906,7 @@
           sha256 = "1cnjdgw3x6yb5k06z57xifywlg0kdx9ai4f1ajc0wx9aax8r5gav";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-cell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-cell";
           sha256 = "07i3vyci52jvslq28djwkgx1r157wvxd99rvqlxnmmsl5yj4k1jf";
           name = "python-cell";
         };
@@ -45403,7 +45927,7 @@
           sha256 = "1qckn5bi1ib54hgqbym5qqwzvbv70ria1w3c2x543xlr0l7zga6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-django";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-django";
           sha256 = "02whx8g8r02mzng7d7bnbkz5n7gyzp5hcnmvd6a3lq106c0h7w9k";
           name = "python-django";
         };
@@ -45424,7 +45948,7 @@
           sha256 = "1a2019172ycw7sdfjrxpyrg41ky9cp09mx30x6cr2qkc1w9pkyrv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-docstring";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-docstring";
           sha256 = "1vi30y71vflsbprp5j4phbp7x1j24vxn9d6sifaddari0g0zxpfw";
           name = "python-docstring";
         };
@@ -45445,7 +45969,7 @@
           sha256 = "0q6bib9nr6xiq6npzbngyfcjk87yyvwzq1zirr3z1h5wadm34lsk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-environment";
           sha256 = "1pq16rddw76ic5d02j5bswl9qcydi47hqmhs7r06jk46vsfzxpl7";
           name = "python-environment";
         };
@@ -45466,7 +45990,7 @@
           sha256 = "0zk6014dzfrb3y3nhs890x082xf044w0a8nmy6rlrj375lvhfn99";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-info";
           sha256 = "0kvpz1r2si94rs1iajn1ffmx7a5bgyjnzri36ajdgd5gcgh41dhy";
           name = "python-info";
         };
@@ -45479,15 +46003,15 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20160115.107";
+        version = "20160131.1407";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "546b676e6437532a0fa42933b076bd6bbd28201c";
-          sha256 = "1lgx0v67ha5nixz35gy80vdpizkfsxcn7gnr47svpnls5n4d6gq3";
+          rev = "ec3d421056af3fd88be31834e73b187c5a92422e";
+          sha256 = "00j0niji9764g933s484k7bz20kzkim3vafwb6cbadhiag74xicv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-mode";
           sha256 = "1m7c6c97xpr5mrbyzhcl2cy7ykdz5yjj90mrakd4lknnsbcq205k";
           name = "python-mode";
         };
@@ -45508,7 +46032,7 @@
           sha256 = "1254ng5fgmbfbn62wpjwmsx8y9j4vs3xcxpyqjb8s3npjjmv4kd8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-x";
           sha256 = "115mvhqfa0fa8kdk64biba7ri4xjk74qqi6vm1a5z3psam9mjcmn";
           name = "python-x";
         };
@@ -45529,7 +46053,7 @@
           sha256 = "1w29l4zyvcchjdywz2py95qq7bszhldpga2ng75g7p07pq7f2w1p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python3-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python3-info";
           sha256 = "1hma8sphxk95m25s56adgyk7d4blsc02gq5a7vw1pawwvxm2qlz3";
           name = "python3-info";
         };
@@ -45542,15 +46066,15 @@
     pythonic = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "pythonic";
-        version = "20150730.416";
+        version = "20160202.245";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "pythonic";
-          rev = "228db8970b4b6ed6992ac5490f859dc698c0afe9";
-          sha256 = "0ksccyh6da8v3f85zxjwa9rjrpqfr1qqqmm4d1y35nmw3pmlasmx";
+          rev = "9377f1c33d7ef21afb571211f60bf90ac7ffc2cd";
+          sha256 = "0p0pz88wf5vcva77vskz4picj8c3drbnz3jzi6yysgp7zw3friwm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pythonic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pythonic";
           sha256 = "1hq0r3vg8vmgw89wfjdqknwm76pimlk0dy56wmh9vffh06gqsb51";
           name = "pythonic";
         };
@@ -45571,7 +46095,7 @@
           sha256 = "1llm8vlmwkhdnr07xgcjx59d4na96kkhmfncww6rqkfc5i6zfarm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pyvenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pyvenv";
           sha256 = "0gai9idss1wvryxyqk3pv854mc2xg9hd0r55r2blql8n5rd2yv8v";
           name = "pyvenv";
         };
@@ -45592,7 +46116,7 @@
           sha256 = "0ggivlaj29rbbhkjpf3bf7vr96xjzffas0sf5m54qh6nyz6nnha5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/qiita";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/qiita";
           sha256 = "1kzk7pc68ks9gxm2l2d28al23gxh56z0cmkl80qwg7sh4gsmhyxl";
           name = "qiita";
         };
@@ -45613,7 +46137,7 @@
           sha256 = "1mlka59gyylj4cabi1b552h11qx54kjqwx3bkmsdngjrd4da222a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/qml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/qml-mode";
           sha256 = "123mlibviplzra558x87da4zx0kpbhsgfigjjgjgp3mdg897084n";
           name = "qml-mode";
         };
@@ -45634,7 +46158,7 @@
           sha256 = "0q7krn16dja0ifnc8h587lh5nilwbixxgsh5179clx5l57naix62";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quack";
           sha256 = "1l7jw8sx2llbzp3sg5755qdhhyq8jdaggxzzn7icjxxrmj1ji6ii";
           name = "quack";
         };
@@ -45655,7 +46179,7 @@
           sha256 = "09vw8nf9yj3v2ks25n39fbn2qk1fld0hmaq1dpzaqsavsbd4dwc1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quasi-monochrome-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quasi-monochrome-theme";
           sha256 = "0h5pqrklyga40jg8qc47lwmf8khn0vcs5jx2sdycl2ipy0ikmfs0";
           name = "quasi-monochrome-theme";
         };
@@ -45676,7 +46200,7 @@
           sha256 = "0v5fcbjf7ndmywjsq9di3cwxsh2csv5pj3mqgqb340i2yp77r9wy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quelpa";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quelpa";
           sha256 = "1g53fcy837hpyn9lnmmri0h4c5va61vszhblz4caadqq265hknvs";
           name = "quelpa";
         };
@@ -45697,7 +46221,7 @@
           sha256 = "00wnvyw2daiwwd1jyq1ag5jsws8k8jxs3lsj73dagbvqnlywmkm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quelpa-use-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quelpa-use-package";
           sha256 = "0p09w419kldgl913hgqfzyv2pck27vqq2i1xsx7g29biwgnp9hl9";
           name = "quelpa-use-package";
         };
@@ -45718,7 +46242,7 @@
           sha256 = "0kh63nzdzwxksn2ar2i1ds7n96jga2dhhc9gg27p1g2ca66fs6h5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quick-buffer-switch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quick-buffer-switch";
           sha256 = "1fsnha3x3pgq582libb3dmxb93aagv1avnc0rigpfd7hv6bagj40";
           name = "quick-buffer-switch";
         };
@@ -45739,7 +46263,7 @@
           sha256 = "1cp3z05qjy7qvjjv105ws1j9qykx8sl4s13xff0ijwvjza6ga44c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quick-preview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quick-preview";
           sha256 = "18janbmhbwb6a46fgc1sxl9ww591v60y3wgh2wqh62vdy4ix3bd9";
           name = "quick-preview";
         };
@@ -45760,7 +46284,7 @@
           sha256 = "1i7qqpqdwifd6vxpyyxyzq0b3wc82r7pqcw07bj0x2lhrjnqrxby";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quickref";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quickref";
           sha256 = "0jahi84ra9g7h0cvz3c02zkbkknrzgv48zq32n72lkxl958swqn1";
           name = "quickref";
         };
@@ -45773,15 +46297,15 @@
     quickrun = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "quickrun";
-        version = "20160109.1849";
+        version = "20160202.2041";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-quickrun";
-          rev = "6ec3766554b5cb51a493da176c02de27be954d21";
-          sha256 = "1cpv44bmqydwmiswk2743jmjldnjvjbd0qyvapxdkczj86z52l6i";
+          rev = "ffd92ae15d9a4ffd8d0a4379a166c8a8a867bb45";
+          sha256 = "1l0l9rsjw49s1qmw70fm9a66wd1mlhka5cfvggsqpp56if0j8yyc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quickrun";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quickrun";
           sha256 = "1szgirakfnkn9ksls16p233sr7x9ck5m1f1kbk6ancj36yja2nki";
           name = "quickrun";
         };
@@ -45802,7 +46326,7 @@
           sha256 = "0dhljmdlg4p832w9s7rp8vznkpjkwpg8k9hj95cn2h76c0afwz3j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/r-autoyas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/r-autoyas";
           sha256 = "18zifadsgbwnga205jvpx61wa2dvjxmxs5v7cjqhny45a524nbv4";
           name = "r-autoyas";
         };
@@ -45815,15 +46339,15 @@
     racer = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rust-mode, s }:
     melpaBuild {
         pname = "racer";
-        version = "20160109.1602";
+        version = "20160120.1429";
         src = fetchFromGitHub {
           owner = "racer-rust";
           repo = "emacs-racer";
-          rev = "b1c1aafd14b239e16c68e3a6f00093e3c8db36d0";
-          sha256 = "1niymgv517g5gpchz337a0aarj63dmmspxxqk7l0s3midid0yhfh";
+          rev = "0d605b943a71279396c5a6251fac63498a91363c";
+          sha256 = "197llsjhxjvk5wp6iz3siyv3911y82r08s9bavma3dgzj2s978s6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/racer";
           sha256 = "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi";
           name = "racer";
         };
@@ -45836,15 +46360,15 @@
     racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "racket-mode";
-        version = "20160102.1830";
+        version = "20160201.1957";
         src = fetchFromGitHub {
           owner = "greghendershott";
           repo = "racket-mode";
-          rev = "d70140d54f74aa230155a3dcc96f8637bcdfe001";
-          sha256 = "0w25jmcim7fjabg1pshqsjrw86gfnn61nxmccy6r53a58kkl3j1g";
+          rev = "77473387fb693ece0aebf83d4f8547aace87efd2";
+          sha256 = "1sywpgp6a1syp2rgba0969xj01f5988l7fgf8j07i06i3drydadj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/racket-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/racket-mode";
           sha256 = "04sr55zrgwyi48sj4ssm4rmm327yxs7hvjhxclnkhaaigrmrv7jb";
           name = "racket-mode";
         };
@@ -45865,7 +46389,7 @@
           sha256 = "00x09vjd3jz5f73qkf5v1y402zn8vl8dsyfwlq9z646p18ba7gyh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/railgun";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/railgun";
           sha256 = "1a3fplfipk1nv3py1sy0p2adf3w1h4api01h2j5rjlq2jw06kyr0";
           name = "railgun";
         };
@@ -45886,7 +46410,7 @@
           sha256 = "1fh8wsb0pa2isr1kgh3v9zmmxq1nlmqwqk4z34dw5wpaiyihmk84";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rails-log-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rails-log-mode";
           sha256 = "0h7gfg0c5pwfh18qzg1mx7an9p958ygdfqb54s85mbkv8x3rh1a0";
           name = "rails-log-mode";
         };
@@ -45907,7 +46431,7 @@
           sha256 = "0cqp2vns7gq377bm6q9n5q0ra1d5yy2x2aiw9q1hswk82xpibj9l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rails-new";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rails-new";
           sha256 = "0wgbm6qxqkpsbzj9wccicsphajaii07dl27b8x2vidsyw6ambj5h";
           name = "rails-new";
         };
@@ -45928,7 +46452,7 @@
           sha256 = "021x1l5kzsbm0qj5a3bngxa7ickm4lbwsdz81a2ks9pi1ivmw205";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/railscasts-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/railscasts-theme";
           sha256 = "1z5m8ccx2k18gbzqvg0051mp2myy2qncf4xvv47k80f83pk2hw6r";
           name = "railscasts-theme";
         };
@@ -45949,7 +46473,7 @@
           sha256 = "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rainbow-blocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rainbow-blocks";
           sha256 = "08p41wvrw1j3h7j7lyl8nxk1gcc2id9ikljmiklg0kc6s8ijhng8";
           name = "rainbow-blocks";
         };
@@ -45970,7 +46494,7 @@
           sha256 = "0gxc8j5a14bc9mp43cbcz41ipc0z1yvmypg52dnl8hadirry20gd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rainbow-delimiters";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rainbow-delimiters";
           sha256 = "132nslbnszvbgkl0819z811yar3lms1hp5na4ybi9gkmnb7bg4rg";
           name = "rainbow-delimiters";
         };
@@ -45991,7 +46515,7 @@
           sha256 = "05i0jpmxzsj2lsj48cafn3v93z37l7k5kaza2ik3yirdpjdibyrh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rainbow-identifiers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rainbow-identifiers";
           sha256 = "0lw790ymrgpyh0sxwmzinl2ik5vl5vggbg14cd0cx5yagkw5y3mp";
           name = "rainbow-identifiers";
         };
@@ -46012,7 +46536,7 @@
           sha256 = "1wcs8j8rdls0n3v8zdpk2n5riwzz2yvjf6b70a5bj7p20gyafhj2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rake";
           sha256 = "0cw47g6cjnkh3z4hbwwq1f8f5vrvs84spn06k53bx898brqdh8ns";
           name = "rake";
         };
@@ -46033,7 +46557,7 @@
           sha256 = "0fmajgqf9j21qn7h35sky5di8cnma432g0ki9d5m41byxp9y1bdl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rand-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rand-theme";
           sha256 = "0h0n1lsxnl12mjrjpra62vblrg8kbp1hk7w1v6makj074d037j2h";
           name = "rand-theme";
         };
@@ -46054,7 +46578,7 @@
           sha256 = "1z25xmz8pl3rsfahw6ay8wx5wbnlxabnzr2dq20m0i5jyci8lqll";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/random-splash-image";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/random-splash-image";
           sha256 = "1j454jy4ia2wrgi3fxzjfdqi3z8x13hq8kh62lnb84whs7a1nhik";
           name = "random-splash-image";
         };
@@ -46067,15 +46591,15 @@
     ranger = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ranger";
-        version = "20160115.39";
+        version = "20160203.701";
         src = fetchFromGitHub {
           owner = "ralesi";
           repo = "ranger.el";
-          rev = "057150f6710ab2180ac9efd7fa2c9ad53595f16c";
-          sha256 = "1r020msciip8wgy5xrl5dm9idm89iyy51jz1r9zaja840fck95wc";
+          rev = "aa9a72d013a3d095bf92e91244241fc0867c8355";
+          sha256 = "0dm5k0g39dlwag3rqyiq8vzsg2z6ypajicjs7g5lcd88nypjl461";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ranger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ranger";
           sha256 = "14g4r4iaz0nzfsklslrswsik670pvfd0605xfjghvpngn2a8ych4";
           name = "ranger";
         };
@@ -46096,7 +46620,7 @@
           sha256 = "1i16361klpdsxphcjdpxqswab3ing69j1wb9nygws7ghil85h0bx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rase";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rase";
           sha256 = "1g7v2z7l4csl5by64hc3zg4kgrkvv81iq30mfqq4nvy1jc0xa6j0";
           name = "rase";
         };
@@ -46117,7 +46641,7 @@
           sha256 = "0yd0rs6fnc6lsfi7pivw5sivh698055r8ifj9vrxb82dcx2y6v2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rbenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rbenv";
           sha256 = "09nw7sz6rdgs7hdw517qwgzgyrdmxb16sgldfkifk41rhiyqhr65";
           name = "rbenv";
         };
@@ -46127,22 +46651,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    rbt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    rbt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rbt";
-        version = "20151030.2255";
+        version = "20160129.1251";
         src = fetchFromGitHub {
           owner = "joeheyming";
           repo = "rbt.el";
-          rev = "47cf236c732e9c5f468fb24c6a1c2db69a133797";
-          sha256 = "0ij2gqhg714ah812rhf1yg2n7ah1v4d5yldn1rixrzfcdng10mpi";
+          rev = "865c619f200afe877c56a44046f706361b676d0e";
+          sha256 = "0q5giixk6pv82cf34a0mxmnzh2gdiyq6dzv4ypkkdpz6wsm2ffhx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rbt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rbt";
           sha256 = "1mrb6v8zybvhh242vvq0kdvg6cvws7gabfhcydrw5g2njhyqkygm";
           name = "rbt";
         };
-        packageRequires = [ popup ];
+        packageRequires = [];
         meta = {
           homepage = "http://melpa.org/#/rbt";
           license = lib.licenses.free;
@@ -46159,7 +46683,7 @@
           sha256 = "0xdyrp0zs2v2glpfwlajmj97wygwi0y492zbp6rp3caa5bj3j4z2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rcirc-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rcirc-alert";
           sha256 = "0lyd3gz1sflp93xb7xbvk1gh69w468ync1p144avyh2pybl40q4a";
           name = "rcirc-alert";
         };
@@ -46180,7 +46704,7 @@
           sha256 = "1mpk5rzsil298q3ppv5v9jrn274v71jffyz0jihrksh1wbjzwhlx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rcirc-alertify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rcirc-alertify";
           sha256 = "13448bykmy0jqcajhn2gjiar3m8cingyr8394vxybp2m1zvv0pws";
           name = "rcirc-alertify";
         };
@@ -46201,7 +46725,7 @@
           sha256 = "173lhi48dwfp9k7jmgivhcc9f38snz5xlciyjhrafpadq1pir497";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rcirc-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rcirc-color";
           sha256 = "1a8qqwdc0gw6m1xsnwrj3xldp05p7pabyj6l4bccpg3vf5wbgkn5";
           name = "rcirc-color";
         };
@@ -46222,7 +46746,7 @@
           sha256 = "0d99x7dfw5xrn62knvs65lvn6xyy7399xwqyy47bs4n81v25aqbh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rcirc-groups";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rcirc-groups";
           sha256 = "1iws3f8vkwrflcj6ni8nmf1wcw1jrlnssm76kzzhag77ry3iswgx";
           name = "rcirc-groups";
         };
@@ -46243,7 +46767,7 @@
           sha256 = "1k4knsrca626pikgaalqbqwy7im4wz1vrmzzhdrdb4lhdz6sq3q3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rcirc-notify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rcirc-notify";
           sha256 = "0mwhzkbzhpq4jws05p7qp0kbay8kcblb9xikznm0i8drpdyc617v";
           name = "rcirc-notify";
         };
@@ -46264,7 +46788,7 @@
           sha256 = "0yhmdkvswnn5rga5xzysfpivbz9wdkzbm49licilc2fp1dgcvd6i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rcirc-styles";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rcirc-styles";
           sha256 = "01dxhnzsnljig769dk9axdi970b3lw2s6p1z3ljf29qlb5j4548r";
           name = "rcirc-styles";
         };
@@ -46285,7 +46809,7 @@
           sha256 = "0r95fzi0x8r18x7r574mp503qaiqyicrq78zlggyz6qihi95pmqj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rdf-prefix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rdf-prefix";
           sha256 = "1vxgn5f2kws17ndfdv1vj5p9ks3rp6sikzpc258j07bhsfpjz5qm";
           name = "rdf-prefix";
         };
@@ -46306,7 +46830,7 @@
           sha256 = "08l96bhghmnckar4i6afj9csqglasmpmby1r7j38ic9bp37z2yqd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rdp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rdp";
           sha256 = "0lj3idwv4fxz8pi8mnxkbhwhzaa1gs6ib4nzly3fc6yiix9ampkz";
           name = "rdp";
         };
@@ -46327,7 +46851,7 @@
           sha256 = "00j0iqa37yzd7xrgd8xcgpgmjcarhn0yx4zpbnr7z7kzmg24ywa7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/react-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/react-snippets";
           sha256 = "0chs0h41nb2fdz02hdsaynz7ma8fg66a8m1q1np0464skrsdaj73";
           name = "react-snippets";
         };
@@ -46348,7 +46872,7 @@
           sha256 = "0kg18ybgwcxhv5fiya5d3wn5w9si4914q946gjannk67d6jcq08g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/readability";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/readability";
           sha256 = "0kg91ma9k3p5ps467jjz2lw13rv1l8ivwc3zpg6c1rl474ds0qqv";
           name = "readability";
         };
@@ -46369,7 +46893,7 @@
           sha256 = "1j5b5xapflwzh8a297gva0l12ralwa9vl5z3bb75c9ksjkhi4nm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/readline-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/readline-complete";
           sha256 = "1qymk5ypv6ljk8x49z4jcifz7c2dqcg5181f4hqh67g1byvj2277";
           name = "readline-complete";
         };
@@ -46390,7 +46914,7 @@
           sha256 = "1kghhps8mqys5l59qwzv3fgy1fvb15cnyaxmk29v818a6khjc5l2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/real-auto-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/real-auto-save";
           sha256 = "03dbbizpyg62v6zbq8hd16ikrifz8m2bdlbb3g67f2834xqmxha8";
           name = "real-auto-save";
         };
@@ -46411,7 +46935,7 @@
           sha256 = "0v02kf8dcxrl09g72d1s8akn8qifvdwgxgnwrbdc1z6n53pi07z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/realgud";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/realgud";
           sha256 = "15vlln4w4wlgrk5i5nhgvjcbardpahgs9kwwayb1vmj10c8a837s";
           name = "realgud";
         };
@@ -46432,7 +46956,7 @@
           sha256 = "1xh9nxqfg9abcl41ni69rnwjfgyfr0pbl55dzyxsbh6sb36r3h8z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rebox2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rebox2";
           sha256 = "06ra50afjqac9ck1s9gaxy0sqxcb612wzd28s4q4imicqpgfxzjw";
           name = "rebox2";
         };
@@ -46450,7 +46974,7 @@
           sha256 = "15kwkphrlxq6nbmqm95sxv4rykl1d35sjm59ncy07ncqm706h33l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/recentf-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/recentf-ext";
           sha256 = "1m54w1n3ci5j7i1jhw6cs7dgzmxrj1hsrrarqlrd1d4iqhixjzbq";
           name = "recentf-ext";
         };
@@ -46471,7 +46995,7 @@
           sha256 = "0wk28blnfks987iby0p3qpd4nxnz6sqn4fx8g59gyddjhav51lri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/recompile-on-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/recompile-on-save";
           sha256 = "0bg2p7pk4jlpqc7lg48mxd6zkwnx15r0r7lmsxgx9dv1ilfwrmgn";
           name = "recompile-on-save";
         };
@@ -46492,7 +47016,7 @@
           sha256 = "114ssmby614xjs7mrpbbsdd4gj5ra6klfh8h6z8iij8xn3kii83q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/recover-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/recover-buffers";
           sha256 = "0g40d7440hzlc9b45v63ng0anvmgip4dhbd9wcm2sn8qjfr4w11b";
           name = "recover-buffers";
         };
@@ -46513,7 +47037,7 @@
           sha256 = "1vpsihrl03hkd6n6b7mrjccm0a023qf3154a8rw4chihikxw27pj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rect+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rect+";
           sha256 = "0vk0jwpl6yp2md9nh0ghp2qn883a8lr3cq8c9mgq0g552dwdiv5m";
           name = "rect-plus";
         };
@@ -46534,7 +47058,7 @@
           sha256 = "14ysbjdndsmcc4j3zhc3nfjxhdm9310jx237mrp98ancxdhsh4q9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rectangle-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rectangle-utils";
           sha256 = "1w5z2gykydsfp30ahqjihpvq04c5v0cfslbrrg429hycys8apws7";
           name = "rectangle-utils";
         };
@@ -46555,7 +47079,7 @@
           sha256 = "1mj7lyadzn3bwig3f9zariq5z4fg6liqnjvfd34yx88xc52nwf33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/recursive-narrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/recursive-narrow";
           sha256 = "1bx8l8wjxrkv949c73dp93knbn1iwnblcm8iw822mq2mgbgwsa7f";
           name = "recursive-narrow";
         };
@@ -46576,7 +47100,7 @@
           sha256 = "1rjpf23a8rggjmmxvm1997d3xz03kz84xams486b9ky0n2v02d57";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/redis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/redis";
           sha256 = "1awnilb8bk0izp6yw0187ybh9slf1hc51014xvvmj90darxby79a";
           name = "redis";
         };
@@ -46594,7 +47118,7 @@
           sha256 = "1jc4n60spzssa57i3jwrqwy20f741hb271vmmx49riycx1ybx3d3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/redo+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/redo+";
           sha256 = "1alfs7k5mydgvzsjmdifcizqgrqjrk2kbh3mabai7nlrwi47w9n2";
           name = "redo-plus";
         };
@@ -46615,7 +47139,7 @@
           sha256 = "0s38mi9w1dm9fzhd3l8xvq9x33rkb5vvd66jibza50dhn9dmakax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/redpen-paragraph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/redpen-paragraph";
           sha256 = "0jr707ik6fhznq0q421l986w85ah0n9b4is91zrgbk1v6miqrhca";
           name = "redpen-paragraph";
         };
@@ -46635,7 +47159,7 @@
           sha256 = "5547c5db0caa147ae2fa0099b9c58a8629b47bf4facb6c5cc72cee45e84be392";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/redshank";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/redshank";
           sha256 = "07s4gja1w8piabkajbzrgq77mkdkxr0jy9bmy2qb9w2svfsyns9b";
           name = "redshank";
         };
@@ -46656,7 +47180,7 @@
           sha256 = "08kzi2jcfqnlanqzvbk5gq1if7k8qc9gmz5bmvd2mvmx6z436398";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/refheap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/refheap";
           sha256 = "0pzark1db9k2pavd5sn89a28gd9j5jlkx3wkhwfzln3y5c1wnvdk";
           name = "refheap";
         };
@@ -46677,7 +47201,7 @@
           sha256 = "1d34jd7is979vfgdy56zkd1m15ng3waiabfpak6dv6ak3cdh5fgx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/regex-dsl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/regex-dsl";
           sha256 = "129sapsmvcqqqgcr9xlmxwszsxvsb4nj9g2fxsl4y6r383840jbr";
           name = "regex-dsl";
         };
@@ -46698,7 +47222,7 @@
           sha256 = "1wr12j16hckvc8bxxgxw280frl12h23cp44sxg28lczl16d9693l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/regex-tool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/regex-tool";
           sha256 = "1nd23vjij5h5gk5l7hbd5ks9ljisn054wp138jx2v6i51izxvh2v";
           name = "regex-tool";
         };
@@ -46719,7 +47243,7 @@
           sha256 = "02kfi3c6ydnr7xw611ck66kfjyl5w86dr9vfjv3wjl6ad9jya4zy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/region-bindings-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/region-bindings-mode";
           sha256 = "141q4x6rilidpnsm9s78qks9i1v6ng0ydhbzqi39xcaccfyyjb69";
           name = "region-bindings-mode";
         };
@@ -46740,7 +47264,7 @@
           sha256 = "0gsh0x1rqxvzrszdyna9d8b8w22mqnd9yqcwzay2prc6rpl26g1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/region-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/region-state";
           sha256 = "1iq2x1w8lqjjiwjja7r3qki6drvydnk171k9fj9g6rk7wslknz8x";
           name = "region-state";
         };
@@ -46761,7 +47285,7 @@
           sha256 = "01k3v4yiilz1k6drv7b2x6zbjx6dlz7cch8rq63mwc7v8kvdnqmi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/register-channel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/register-channel";
           sha256 = "037i2fgxxsfb85vd6xk17wyh7ny6fqfixvb0a18lf8m1hib1gyhr";
           name = "register-channel";
         };
@@ -46782,7 +47306,7 @@
           sha256 = "023fwcqyy5gg234m772vpws751pharjwn3b0433i2sszna2z6xrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/relative-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/relative-buffers";
           sha256 = "131182yb0pr0d6jibqd8aag4w8hywdyi87ldp77b95gw4bqhr96i";
           name = "relative-buffers";
         };
@@ -46803,7 +47327,7 @@
           sha256 = "1r8fhs7d2vkrbv15ic2bm79i9a8swbc38vk566vnxkhl3rfd5a0a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/relative-line-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/relative-line-numbers";
           sha256 = "0mj1w5a4ax8hwz41vn02bacxlnifd14hvf3p288ljvwchvlf0hn3";
           name = "relative-line-numbers";
         };
@@ -46824,7 +47348,7 @@
           sha256 = "0lqbhwi1f8b4sv9p1rf0gyjllk0l7g6v6mlws496079wxx1n5j66";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/relax";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/relax";
           sha256 = "0gfr4ym6aakawhkfz40ar2n0rfz503hq428yj6rbf7jmq3ajaysk";
           name = "relax";
         };
@@ -46845,7 +47369,7 @@
           sha256 = "0w40cx58c0hmc0yzs8maq1389hwha0qwfbz76pc6kpcx14v1gkhh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/remark-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/remark-mode";
           sha256 = "1zl8k3h4acbgb3hmjs2b4a14g0s0vl3xamrqxrr742zmqpr1h0w0";
           name = "remark-mode";
         };
@@ -46866,7 +47390,7 @@
           sha256 = "007lqahjbig6yygqik6fgbq114784z6l40a3vrc4qs9361zqizck";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/repeatable-motion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/repeatable-motion";
           sha256 = "12z4z8apd8ksf6dfvqm54l71mx68j0yg4hrjypa9p77fpcd6p0zw";
           name = "repeatable-motion";
         };
@@ -46879,15 +47403,15 @@
     repl-toggle = callPackage ({ fetchFromGitHub, fetchurl, fullframe, lib, melpaBuild }:
     melpaBuild {
         pname = "repl-toggle";
-        version = "20160118.827";
+        version = "20160119.621";
         src = fetchFromGitHub {
           owner = "tomterl";
           repo = "repl-toggle";
-          rev = "22ac44d0251d4f65591e4e48a03f8ab188429656";
-          sha256 = "0lxadfwyflcp8bgz8xp19f150faby023icbljyk5q52s2fl9g79w";
+          rev = "0249c2a72e6bf782c2c15b0cb1d925410543184f";
+          sha256 = "12wylmyz54n1f3kaw9clhvs66dg43xvcvll4pl5ii0ibfv6pls1b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/repl-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/repl-toggle";
           sha256 = "1jyaksxgyygfv1wn9c6y8sykb4hicwgs9n5vrdikd2i0iix29zpb";
           name = "repl-toggle";
         };
@@ -46906,7 +47430,7 @@
           sha256 = "1clxkzxqsm91zbzv8nffav224ldr04ww5lppga2l41xjfl6z12qb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/replace-from-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/replace-from-region";
           sha256 = "19q8hz2xiyamhw8hzpahqwd4352k1m9r9wlh9kdh6hbb6sjgllnb";
           name = "replace-from-region";
         };
@@ -46924,7 +47448,7 @@
           sha256 = "1af4sdhkzxknqzdkzc5gpm5j3s5k776j293hqq7cqzk533fdh4iz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/replace+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/replace+";
           sha256 = "1imsgr3v8g2p2mnkzp92ga3nvckr758pblmlha8gh8mb80089krn";
           name = "replace-plus";
         };
@@ -46945,7 +47469,7 @@
           sha256 = "0ks884jhxqkr8j38r9m4s56krm2gpkm0v5d51zzivcfhs30s6nff";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/replace-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/replace-symbol";
           sha256 = "07ljmw6aw9hsqffhwmiq2pvhry27acg6f4vgxgi91vjr8jj3r4ng";
           name = "replace-symbol";
         };
@@ -46966,7 +47490,7 @@
           sha256 = "0hs80g3npgb6qfcaivdfkpsc9mss1kdmyp5j7s922qcy2k4yxmgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/repo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/repo";
           sha256 = "0z4lcswh0c6xnsxlv33bsxh0nh26ydzfl8sv8xabdp5a2gk6bhpb";
           name = "repo";
         };
@@ -46987,7 +47511,7 @@
           sha256 = "05a88r2jp169x99abz9wrr1i8ch0bg3dlmaalxwqfmlzci0lksx2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/req-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/req-package";
           sha256 = "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf";
           name = "req-package";
         };
@@ -47008,7 +47532,7 @@
           sha256 = "1fiyxbd87cdlsdhpm3b3z8ypkrkvya6lamn0qx9hsxl1yv27vx4m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/request";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/request";
           sha256 = "09gxfy34a13wr0agmhn0nldxaiyc72rx9xi56jirsvji4dg5j6mm";
           name = "request";
         };
@@ -47029,7 +47553,7 @@
           sha256 = "1fiyxbd87cdlsdhpm3b3z8ypkrkvya6lamn0qx9hsxl1yv27vx4m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/request-deferred";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/request-deferred";
           sha256 = "19s8q9a01v0g897s9ass1mr5wbzy82rrfcnqpvcvp05q4y787dn9";
           name = "request-deferred";
         };
@@ -47050,7 +47574,7 @@
           sha256 = "1bfj2zjn3x41jal6c136wnwkgmag27bmrwbfwdylafc7qqk6dflv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/requirejs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/requirejs";
           sha256 = "09z6r9wcag3gj075wq215zcslyknl1izap595rn48xvizxi06c6k";
           name = "requirejs";
         };
@@ -47071,7 +47595,7 @@
           sha256 = "02wva5q8mvc0a5kms2wm1gyaag2x3zd6fkkpl4218nrbb0mbficv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/requirejs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/requirejs-mode";
           sha256 = "1sq1kim17bcmh39106vfgm7gq9nj9943lw8by0bpi5qr8xdjsn5r";
           name = "requirejs-mode";
         };
@@ -47092,7 +47616,7 @@
           sha256 = "055km3g4bwl73kca6ky3qzzmy103w0mqcfscj33ppdhg2n7m94n0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/resize-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/resize-window";
           sha256 = "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l";
           name = "resize-window";
         };
@@ -47113,7 +47637,7 @@
           sha256 = "0gbm208hmmmpjyj0x3z0cszphawkgvjqzi5idbdca3gikyiqw80n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/restart-emacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/restart-emacs";
           sha256 = "03aabz7fmy99nwimvjn7qz6pvc94i470hfgiwmjz3348cw02k0n6";
           name = "restart-emacs";
         };
@@ -47134,7 +47658,7 @@
           sha256 = "08j4m70j9xdl731bwa4vh656lji0w0f9mm1aki0qqd5msglw6kvx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/restclient";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/restclient";
           sha256 = "14wxfhb17n2f9wil68lb05abj7m0whwkqvrm3y9dg9mh14lcpbvc";
           name = "restclient";
         };
@@ -47155,7 +47679,7 @@
           sha256 = "1q13cgpz4wzhnqv84ablawy3y2wgdwy46sp7454mmfx9m77jzb2v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/reveal-in-osx-finder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/reveal-in-osx-finder";
           sha256 = "00jgrmh5s3vlpj1jjf8l3c3h4hjk5x781m95sidw6chimizvfmfc";
           name = "reveal-in-osx-finder";
         };
@@ -47173,7 +47697,7 @@
           sha256 = "1h27kg2k8f6smbqxandmvg859qk66jydbbbiwwjmk7316k66w8qa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/reveal-next";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/reveal-next";
           sha256 = "0fp6ssd4fad0s2pbxbw75bnx7fcgasig8xvcx7nls8m9p6zbbmh2";
           name = "reveal-next";
         };
@@ -47194,7 +47718,7 @@
           sha256 = "002ywhjms8ybk7cma2p2i11z3fz6kb0w8mlafysm911rvcq2hg5f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/reverse-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/reverse-theme";
           sha256 = "1lq8nwhf8n5i280v0kqksndm4b3n6x34wnd5fa5i48ljwr5cinih";
           name = "reverse-theme";
         };
@@ -47215,7 +47739,7 @@
           sha256 = "0lzsy68k7sm9d3r8lzhzx9alc1f0cgfclry40pa4x0ilkcr7ysch";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/review-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/review-mode";
           sha256 = "0wapicggkngpdzi0yxc0b24s526fs819rc2d6miv6ix3gnw11n0n";
           name = "review-mode";
         };
@@ -47236,7 +47760,7 @@
           sha256 = "037sac5fvz6l2zgzlf8ykk4jf9zhj7ybzyz013jqzjj47a6sn1r1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/revive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/revive";
           sha256 = "1l7c6zq3ga2k1488qb0hgxlk08p3vrcf0sx116c1f8z8nf4c8ny5";
           name = "revive";
         };
@@ -47257,7 +47781,7 @@
           sha256 = "0zmby92mjszh77r5wh8sccqv3a5bb9sfhac8g55nasavw8hfplvj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/reykjavik-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/reykjavik-theme";
           sha256 = "1f0q2gfzkmpd374jryrd1lgg8xj6rwdq181jhppj3rfjizgw4l35";
           name = "reykjavik-theme";
         };
@@ -47275,7 +47799,7 @@
           sha256 = "02i5znln0aphvmvaia3sz75bvjhqwyjq1blf5qkcbprnn95lm3yh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rfringe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rfringe";
           sha256 = "171gzfciz78l6b653acgfailxpwmh8m1dm0dzpg0b1k0ny3aiwf6";
           name = "rfringe";
         };
@@ -47296,7 +47820,7 @@
           sha256 = "1qlpv5lzj4yfyjgdykhm6q9izg6g0z5pf5nmynj42vsx7v8bhy1x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rhtml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rhtml-mode";
           sha256 = "038j5jkcckmhlq3vz4h07s5y2scljh1fdn9r614hiyxwgk48lc35";
           name = "rhtml-mode";
         };
@@ -47317,7 +47841,7 @@
           sha256 = "11hwf9y5ax207w6rwrsmi3pmn7pn7ap6iys0z8hni2f5zzxjrmx3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rich-minority";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rich-minority";
           sha256 = "11xd76w5k3b3q5bxqjb55vi6dsal9drvyc1nh7z83awm59hvgczc";
           name = "rich-minority";
         };
@@ -47338,7 +47862,7 @@
           sha256 = "0p044wg9d4i6f5x7bdshmisgwvw424y16lixac93q6v5bh3xmab5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rigid-tabs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rigid-tabs";
           sha256 = "06n0bcvc3nnp84pcq3lywwga7l92jz8hnkilhbq59kydf5zbjldp";
           name = "rigid-tabs";
         };
@@ -47359,7 +47883,7 @@
           sha256 = "1kg83z10jw4ik0aapv9cjqlvqy31rln2am8vh3f77zh61qha37hx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rinari";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rinari";
           sha256 = "0qknicg3vzl7zbkwsdvp10hrvlng6mbi8hgslx4ir522dflrf9p0";
           name = "rinari";
         };
@@ -47380,7 +47904,7 @@
           sha256 = "0imsc44mcy5abmfin28d13l8mjjvyx6hxcsk81r0i8h12mxlmfkp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rings";
           sha256 = "1ncsb4jip07hbrf1l4j9yzn3l0kb63ylhzzsb4bb2yx6as4a66k7";
           name = "rings";
         };
@@ -47401,7 +47925,7 @@
           sha256 = "1drvyf5asjp3lgpss7llff35q8r89vmh73n1axaj2qp9jx5a5jih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rnc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rnc-mode";
           sha256 = "09ly7ln6qrcmmim9bl7kd50h4axrhy6ig406r352xm4a9zc8n22q";
           name = "rnc-mode";
         };
@@ -47414,15 +47938,15 @@
     robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
     melpaBuild {
         pname = "robe";
-        version = "20151230.649";
+        version = "20160121.1751";
         src = fetchFromGitHub {
           owner = "dgutov";
           repo = "robe";
-          rev = "af3d1a8deb7f1531b95112b955fce91d5f5d1ea6";
-          sha256 = "1blpkd9sb7wcn4mkjbn20ppva47v1rm0j43hm337cbcsw5f63x6s";
+          rev = "7c56895b6c2fd5d6c9572182f5de10ebe5bfc977";
+          sha256 = "01xd3nc7bmf4r4d37x08rw2dlsg6gns8mraahi4rwkg6a9lwl44n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/robe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/robe";
           sha256 = "19py2lwi7maya90kh1mgwqb16j72f7gm05dwla6xrzq1aks18wrk";
           name = "robe";
         };
@@ -47435,15 +47959,15 @@
     roguel-ike = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "roguel-ike";
-        version = "20140227.929";
+        version = "20160119.2102";
         src = fetchFromGitHub {
           owner = "stevenremot";
           repo = "roguel-ike";
-          rev = "6d9322ad9d43d0c7465f125c8e08b222866e6923";
-          sha256 = "108j3106n9anas07mj26xlrvscsl5irshd39czkippla84gwmgyc";
+          rev = "706dcb0687e8016d7d776f9d9e5ace9fdbbca43c";
+          sha256 = "0rgv4y9aa5cc2ddz3y5z8d22xmr8kf5c60h0r3g8h91jmcw3rb4z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/roguel-ike";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/roguel-ike";
           sha256 = "1a7sa6nhgi0s4gjh55bhk5cg6q6s7564fk008ibmrm05gfq9wlg8";
           name = "roguel-ike";
         };
@@ -47464,7 +47988,7 @@
           sha256 = "0k88zjz4v2qllz9bkrhza91ckw5xx4aimgmcqpzcq3zl5py36h4l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rope-read-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rope-read-mode";
           sha256 = "0grnn5k6rbck0hz4c6cadgj3a4dv62habyingznisg2kx9i3m0dw";
           name = "rope-read-mode";
         };
@@ -47485,7 +48009,7 @@
           sha256 = "0spgpq2cmckpl7j2193axy5yqws5dwrhik69d0bv0ylwzxp3npvg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rotate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rotate";
           sha256 = "0dygdd24flbgqp049sl4p8rymvv8h881hz9lvz8hnfwq687yyclx";
           name = "rotate";
         };
@@ -47506,7 +48030,7 @@
           sha256 = "04jbnm9is2cis75h40znqzjvyjq27ncr2vfank6zglzi4fhxsl0r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/roy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/roy-mode";
           sha256 = "0ch0hamvw4gsqs2pap0h6w4cj6n73jqa75if0ymh73hk5i3acm8g";
           name = "roy-mode";
         };
@@ -47527,7 +48051,7 @@
           sha256 = "01rb6qfsk4f33nkfdzvvjkw96ip1dv0py8i30l8ix9cqbk07svsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rpm-spec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rpm-spec-mode";
           sha256 = "01vggdv8sac4p0szwk7xgxcglmd5a1hv5q0ylf8zcp1lsyyh8ypd";
           name = "rpm-spec-mode";
         };
@@ -47548,7 +48072,7 @@
           sha256 = "0i5qwbhhdnspgs2y67kkgbk9zq6fx2j509q92mgfzbvjnf54h1r8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rpn-calc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rpn-calc";
           sha256 = "04dj2r4035k0c3x6iyjydshzmq381d60pmscp2hg5m7sp7bqn5xs";
           name = "rpn-calc";
         };
@@ -47569,7 +48093,7 @@
           sha256 = "0xkr1qn8fm3kv5c11janq5acp1q02abvxc463zijvm2qk735yl4d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rsense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rsense";
           sha256 = "1901xqlpc8fg4sl9j58jn40i2djs8s0cdcqcrzrq02lvk8ssfdf5";
           name = "rsense";
         };
@@ -47582,15 +48106,15 @@
     rspec-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
     melpaBuild {
         pname = "rspec-mode";
-        version = "20160113.1658";
+        version = "20160124.1607";
         src = fetchFromGitHub {
           owner = "pezra";
           repo = "rspec-mode";
-          rev = "5dbf9c33ca09510f66980fa948a42c692e60fedc";
-          sha256 = "11yb93sfp9ppbp7fsxr3z2pv37hcig1k6g096b3c438f01z51ha6";
+          rev = "c6eb793e46e6ce5a9be8871235f0911a412f68ad";
+          sha256 = "1zbpp9n35l589i7yla4l93nvp5ngwsj9p44glhz9jxzlkjwig9a1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rspec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rspec-mode";
           sha256 = "0nyib9rx9w9cbsgkcjx9n8fp77xkzxg923z0rdm3f9kc7njcn0zx";
           name = "rspec-mode";
         };
@@ -47603,16 +48127,16 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20160114.1314";
+        version = "20160204.136";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "76bfbf25d35dbef636398ce95afcaae0b0437347";
-          sha256 = "144drv24hpjvy2y8ds24nxf6cwmgmiq8z9ndvri4y69kdspqlv5z";
+          rev = "b40a299bbd0b96d25680fe1fe24e3d512afc2673";
+          sha256 = "1bs4ylnkzkj6ckhhhbna2ah3y570zm1wh5wy77m425gji8fgsph6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rtags";
-          sha256 = "16jvbr4nm48p3dj9wmysjaxyz4ajcay19risqrs9fzrifkr21c9p";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rtags";
+          sha256 = "08clwydx2b9cl4wv61b0p564jpvq7gzkrlcdkchpi4yz6djbp0lw";
           name = "rtags";
         };
         packageRequires = [];
@@ -47632,7 +48156,7 @@
           sha256 = "1gqvp0h5zy2023gdzf7pw28rl27lzml87vpbi1zaw4bmj82zgh3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rtm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rtm";
           sha256 = "1ni2610svxziq1gq6s6igkhqyafvgn02gnw7jbm3ir7ks4w2imzf";
           name = "rtm";
         };
@@ -47653,7 +48177,7 @@
           sha256 = "1y5z0kr4qwd4fyvhk0rhpbbp6dw2jpzrawx62jid5539wrdjcabk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rubocop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rubocop";
           sha256 = "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q";
           name = "rubocop";
         };
@@ -47669,11 +48193,11 @@
         version = "20091002.545";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "53578";
+          rev = "53740";
           sha256 = "0wrjx25qg1dpgw0gih7fd679fv3q78cwaqyrf5dh1kq8g8cr5xhs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-additional";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-additional";
           sha256 = "0h0cxik8lp8g81bvp06mddikkk5bjdlch2wffcvsvi01is408w4w";
           name = "ruby-additional";
         };
@@ -47691,7 +48215,7 @@
           sha256 = "0c4vy9xsw44g6q9nc8aaav5avgp34h24mvgcnww468afiimivdcq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-block";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-block";
           sha256 = "0jfimjq1xpwxkxya452kp27h0fdiy87aj713w3zsm04k7l6i12hm";
           name = "ruby-block";
         };
@@ -47712,7 +48236,7 @@
           sha256 = "1kg83z10jw4ik0aapv9cjqlvqy31rln2am8vh3f77zh61qha37hx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-compilation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-compilation";
           sha256 = "1x1vpkjpx95sfcjhkx4cafypj0nkbd1i0mzxx3lmcrsmg8iv0rjc";
           name = "ruby-compilation";
         };
@@ -47733,7 +48257,7 @@
           sha256 = "1cy5zmdfwsjw8jla8mxjm1cmvrv727fwq1kqhjr5nxj0flwsm4x1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-dev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-dev";
           sha256 = "0mf2ra3p5976qn4ryc2s20vi0nrzwcg3xvsgppsc0bsirjw2l0fh";
           name = "ruby-dev";
         };
@@ -47749,11 +48273,11 @@
         version = "20150424.952";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "53578";
+          rev = "53740";
           sha256 = "0wrjx25qg1dpgw0gih7fd679fv3q78cwaqyrf5dh1kq8g8cr5xhs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-electric";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-electric";
           sha256 = "04j04dsknzb7xc8v6alawgcbymdfmh27xnpr98yc8b05nzafw056";
           name = "ruby-electric";
         };
@@ -47774,7 +48298,7 @@
           sha256 = "1x4nvrq5nk50c1l3b5wcr4g1n5nmwafcz1zzc12qzsl5sya7si55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-end";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-end";
           sha256 = "0cx121hji8ws6s3p2xfdgidm363y05g2n880fqrmzyz27cqkljis";
           name = "ruby-end";
         };
@@ -47795,7 +48319,7 @@
           sha256 = "15b2rs6m4d511qqkc2gc8k15mbqzrgv6s3hpypajl8nvqa79xnyd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-factory";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-factory";
           sha256 = "0v8009pad0l41zh9r1wzcx1h6vpzhr5rgpq6rb002prxz2lcbd37";
           name = "ruby-factory";
         };
@@ -47808,15 +48332,15 @@
     ruby-guard = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ruby-guard";
-        version = "20141218.2114";
+        version = "20160131.1952";
         src = fetchFromGitHub {
           owner = "cheunghy";
           repo = "ruby-guard";
-          rev = "c0bc5c58ad32e1786001aa5cd84f490096a00a4b";
-          sha256 = "034dbz225xxqpi202h4z8zqz3cdfbd8m7vlnh30cb0p8lvgygmj1";
+          rev = "bc864cadb241be855ada148f07e5048cce0991a0";
+          sha256 = "080hmrh7pgpaj33w1rkhcqb1yp70w4cap0rq9hsxaaajj0sn47z3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-guard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-guard";
           sha256 = "0hwxhirdvaysw9hxcgfdf0l12wilr6b9f9w91pk1hfwfi1w0lfwr";
           name = "ruby-guard";
         };
@@ -47837,7 +48361,7 @@
           sha256 = "0knl8zrd4pplnzk5z19cf9rqdfr3ymzfssrwp6jhndjzjdwvc2bv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-hash-syntax";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-hash-syntax";
           sha256 = "0bvwyagfh7mn457iibrpv1ay75089gp8pg608gbm24m0ix82xvb5";
           name = "ruby-hash-syntax";
         };
@@ -47858,7 +48382,7 @@
           sha256 = "1r2f5jxi6wnkmr1ssvqgshi97gjvxvf3qqc0njg1s33cy39wpqq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-interpolation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-interpolation";
           sha256 = "07idndxw8vgfrk5zfmjjhmixza35mqxwjhsrbjrq5yy72i5ivznp";
           name = "ruby-interpolation";
         };
@@ -47879,7 +48403,7 @@
           sha256 = "0dk9vkrjncawf4j4y5dky215m0hgl266d9w6mr7g0rgy6m7wfcyq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-refactor";
           sha256 = "0nwinnnhy72h1ihjlnjl8k8z3yf4nl2z7hfv085gwiacr6nn2rby";
           name = "ruby-refactor";
         };
@@ -47900,7 +48424,7 @@
           sha256 = "06fhrn04whqb3n40wkzrwmzbzv7b1m48rd18rx8zpgxhbw8v7rdc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-test-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-test-mode";
           sha256 = "113ysf08bfh2ipk55f8h741j05999yrgx57mzh53rim5n63a312w";
           name = "ruby-test-mode";
         };
@@ -47921,7 +48445,7 @@
           sha256 = "0jd9acycpbdd90hallrl0k5055rypp502qv4c6i286p7f9is4kvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-tools";
           sha256 = "1zs2vzcrw11xyj2a7lgqzw4slcha20206jvjbxkm68d57rffpk8y";
           name = "ruby-tools";
         };
@@ -47942,7 +48466,7 @@
           sha256 = "17dzr5w12ai2q15yv81gchk360yjs71w74vsgs2fyy2yznvclpq9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/runner";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/runner";
           sha256 = "09apmk22swj05z77ziij31jj6b3g221qv3mw3mymffzxn5ap2rbx";
           name = "runner";
         };
@@ -47963,7 +48487,7 @@
           sha256 = "18w6gkpxp0g7rzvnrk8vvr267y768dfik447ssq8jpz3jlr5jnq6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/runtests";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/runtests";
           sha256 = "0m9rqjb5c0yqr2wv5dsdiba21knr63b5pxsqgbkbybi15zgxcicb";
           name = "runtests";
         };
@@ -47984,7 +48508,7 @@
           sha256 = "0m8ywaa9hccsss4gp1gr6v8faj503gr8l9a6gsdnvf3m5g9wxm6v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rust-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rust-mode";
           sha256 = "0h4gblg6ls8a2wa43r990lanl6ykx8j7c8yg5i3n151imzic2n33";
           name = "rust-mode";
         };
@@ -48005,7 +48529,7 @@
           sha256 = "0i2r14ifpqjcxcflhl38iayk53920vl616y770lwf77zvhnxrmm9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rustfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rustfmt";
           sha256 = "1znav2pbax0rsvdl85mmbgbmxy7gnrm4nx54ij1ff6yd831r5jyl";
           name = "rustfmt";
         };
@@ -48026,7 +48550,7 @@
           sha256 = "0iblk0vagjcg3c8q9hlpwk7426ms7aq0s80izgvascfmyqycv6qm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rvm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rvm";
           sha256 = "08i7cmav2cz73jp88ww0ay2yjhk9dj8146836q4sij1bl1slbaf8";
           name = "rvm";
         };
@@ -48047,7 +48571,7 @@
           sha256 = "08vf62fcrnbmf2ppb759kzznjdz8x72fqdwbc4n8nbswrwgm2ikl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/s";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/s";
           sha256 = "0b2lj6nj08pk5fnxvjkc1d9hvi29rnjjy4n5ns4pq6wxpfnlcw64";
           name = "s";
         };
@@ -48068,7 +48592,7 @@
           sha256 = "06ng960fj2ivnwb0hrn0qic5x8hb0sswjzph01zmwhbfnwykhr85";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/s-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/s-buffer";
           sha256 = "07kivgzv24psjq1240gwj9wkndq4bhvjh38x552k90m9v6jz8l6m";
           name = "s-buffer";
         };
@@ -48089,7 +48613,7 @@
           sha256 = "06gqqbkn85l2p05whmr4wkg9axqyzb7r7sgm3r8wfshm99kgpxvl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sackspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sackspace";
           sha256 = "1m10iw83k6m7v7sg2dxzdy83zxq6svk8h9fh4ankyn3baqrdxg5z";
           name = "sackspace";
         };
@@ -48110,7 +48634,7 @@
           sha256 = "060xvh5qwqbvvb5ykyflwps2p2by9p1mm5dz7gkxla5zq0a73vmx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sage-shell-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sage-shell-mode";
           sha256 = "18k7yh8rczng0kn2wsawjml70cb5bnc5jr2gj0hini5f7jq449wx";
           name = "sage-shell-mode";
         };
@@ -48131,7 +48655,7 @@
           sha256 = "1hl227bmjch0vq7n47mwydkyxnd6wkbz9klk3c4398qmc2qxm5kn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/salt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/salt-mode";
           sha256 = "1r5k7022vxgj3p5l16y839lff85z0m9hpifq59knij61g9hxadsp";
           name = "salt-mode";
         };
@@ -48152,7 +48676,7 @@
           sha256 = "1r6b6n2bzjznjfimgcm0vnmln4sbyasm4icmdgbpzahdmbkfzq3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sane-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sane-term";
           sha256 = "0iz63b62x5jrz7c23i850634k4bk73kg1h4wj1ravx3wlgvzs8y8";
           name = "sane-term";
         };
@@ -48173,7 +48697,7 @@
           sha256 = "0srz4j7484v5h7hmdlyrcl2k27jhy414689wphbbyj63rvg321cm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sass-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sass-mode";
           sha256 = "1byjk5zpzjlyiwkp780c4kh7s9l56y686sxji89wc59d19rp8800";
           name = "sass-mode";
         };
@@ -48194,7 +48718,7 @@
           sha256 = "0y6a0z2ydc5li3990mfhcgz5mrb89sj8s8dvdgmnv8pgdhn1xmb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sauron";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sauron";
           sha256 = "01fk1xfh7r16fb1xg5ibbs7gci9dja49msdlf7964hiq7pnnhxgb";
           name = "sauron";
         };
@@ -48212,7 +48736,7 @@
           sha256 = "1p8p5b85sdnq45rdjq5wcr3xz7c22mr5bz41a21mkabc4j4fvd3z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/save-load-path";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/save-load-path";
           sha256 = "01hm1rm9x3bqs6vf65l4xv2n4ramh3qwgmrp632fyfz5dlrvbssi";
           name = "save-load-path";
         };
@@ -48233,7 +48757,7 @@
           sha256 = "0jdsndq9nqqqfn821qy66y5x3yvmxca9zfk9j9q4a9sbbychqc9c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/save-sexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/save-sexp";
           sha256 = "12jx47picdpw668q75qsp9gncrnxnlk1slhzvxsk5pvkdwh26h66";
           name = "save-sexp";
         };
@@ -48254,7 +48778,7 @@
           sha256 = "00jvl1npc889f3isi7cbdzwvf9x4rq67zgl7br8npxf8jlc2mwhm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/save-visited-files";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/save-visited-files";
           sha256 = "1pmjz27dlp5yrihgsy8q1bwbhkkj3sn7d79ccvljvzxg5jn1grkd";
           name = "save-visited-files";
         };
@@ -48272,7 +48796,7 @@
           sha256 = "1qfq83cb4qixdl15j28rlslkq6g88ig55ydg747jqb3dqyp3qaah";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/savekill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/savekill";
           sha256 = "1l14p6wkzfhlqxnd9fpw123vg9q5k20ld7rciyzbfdb99pk9z02i";
           name = "savekill";
         };
@@ -48285,15 +48809,15 @@
     sbt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, scala-mode2 }:
     melpaBuild {
         pname = "sbt-mode";
-        version = "20151231.1322";
+        version = "20160201.1059";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-sbt-mode";
-          rev = "9d86487c77d652ca12e8084f0f64b840536a9e6e";
-          sha256 = "1m9lrcknhvxxxalhbnrx652p9zxsq249s39cv9cj5kx57x8fz4sm";
+          rev = "cc166f2407ea9dfde5d24273298a73cfdd35d579";
+          sha256 = "1dsdafb6mavdb14qjf8q0723gxdfxra823f0rn31vak2klwq8zdj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sbt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sbt-mode";
           sha256 = "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8";
           name = "sbt-mode";
         };
@@ -48310,11 +48834,11 @@
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "84c9f7699d5a49daa38e7260c877e9bb294a2a18";
-          sha256 = "0ykgbj059m1cxkdp29dd3sxp1cq68ma92dg9jp0qv7bp5x0r708l";
+          rev = "be4fd23dc6b9f4de44c5a4c5cee94894dc139393";
+          sha256 = "0v0gffwcn70kyhpvbgdzrsx7f97ksza1han794wx5v9plxj366ld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scad-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scad-mode";
           sha256 = "04b4y9jks8sslgmkx54fds8fba9xv54z0cfab52dy99v1301ms3k";
           name = "scad-mode";
         };
@@ -48335,7 +48859,7 @@
           sha256 = "1mx5bg4mbgj828mwjd9nlxli4ibcrgpzn9i6ns2g9zpgm932zlbc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scad-preview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scad-preview";
           sha256 = "0wcd2r60ibbc2mzpq8fvyfc1fy172rf9kzdj51p4jyl51r76i86z";
           name = "scad-preview";
         };
@@ -48356,7 +48880,7 @@
           sha256 = "0qd3yi2as30kacr74vbzvyq97684s8sz585z30d47shqcvp6l1a6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scala-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scala-mode";
           sha256 = "1vbgphmvvsj5jl8f78rpsidlmlgyp1kq3nkmziqhwkcq8hfywssm";
           name = "scala-mode";
         };
@@ -48377,7 +48901,7 @@
           sha256 = "07928cll5n3s7xx75nfbil73zilrhdfh19hp4s75c7hh8sdwmig6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scala-mode2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scala-mode2";
           sha256 = "0rnkln6jwwqc968w3qpc6zjjv8ylw0w6c2hsjpq2slja3jn5khch";
           name = "scala-mode2";
         };
@@ -48398,7 +48922,7 @@
           sha256 = "1wf3d5spvi9kr4q2w7f18g1bm10fh2zbh4sdbqkf78afv6sbqzrz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scala-outline-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scala-outline-popup";
           sha256 = "1fq0k6l57wkya1ycm4cc190kg90j2k9clnl0sc70achp4i47qbk7";
           name = "scala-outline-popup";
         };
@@ -48419,7 +48943,7 @@
           sha256 = "0m7hanpc2skmsz783m0212xd10y31gkj5n6w8gx9s989l1y4i1b8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scf-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scf-mode";
           sha256 = "0acbrw94q6cr9b29mz1wcbwi1g90pbm7ly2xbaqb2g8081r5rgg0";
           name = "scf-mode";
         };
@@ -48439,7 +48963,7 @@
           sha256 = "13pym1kwi8ah3h2l557pvbg4lgpp5lhldj3qxyg7gyvgkwr91a7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scheme-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scheme-complete";
           sha256 = "1nam7xzw8hrykz73q9x24szpjv2kpkp48lcmzf02kzj3cg6l76qm";
           name = "scheme-complete";
         };
@@ -48460,7 +48984,7 @@
           sha256 = "09cvrphrnbj8avnlqqv6scjz17cn6zm6mzghjn3vxfr4hql66rir";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scheme-here";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scheme-here";
           sha256 = "137qqfnla3hjm6qcnzpsgrw173px0k5dwq9apns5cdryxx3ahcvv";
           name = "scheme-here";
         };
@@ -48481,7 +49005,7 @@
           sha256 = "0ark720g0nrdqri5bjdpss6kn6k3hz3w3zdvy334wws05mkb17y4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scion";
           sha256 = "17qmc7fpvbamqkzyk8jspp2i0nw93iya4iwddvas7vdpjy7mk81d";
           name = "scion";
         };
@@ -48502,7 +49026,7 @@
           sha256 = "0v36zd8lnsbc7jvnhv5pidfxabq2qqmwg1nm2jdxfj6vvcg3vx0x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sclang-extensions";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sclang-extensions";
           sha256 = "00nirxawsngvlx7bmf5hqg2wk0l1v5pi09r6phzd0q8gyq3kmbbn";
           name = "sclang-extensions";
         };
@@ -48523,7 +49047,7 @@
           sha256 = "0vbcghgapwdf3jgjnjdla17dhf5mkmwapz4a8fmlr7sw1wqvj857";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sclang-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sclang-snippets";
           sha256 = "0q1bh316v737a0hm9afijk1spvg144cgrf45jm0bpd60zhiv7bb2";
           name = "sclang-snippets";
         };
@@ -48544,7 +49068,7 @@
           sha256 = "1jgg116rhhgs5qrngrmqi8ir7yj1h470f57dc7fyijw0ly5mp6ii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scpaste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scpaste";
           sha256 = "02dqmx6v3jxdn5yz1z74624sc6sz2bm4qjyi78w9akhp2jplwlk1";
           name = "scpaste";
         };
@@ -48565,7 +49089,7 @@
           sha256 = "0ykhr24vpx3byn2n346nqqvmwcg34hk22s3lpdx7lpnkrn5z41aq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scratch";
           sha256 = "1c6vxpd9c24d2flzwgvzqz0wr70xzqqs3f59pp897h0f7j91im5d";
           name = "scratch";
         };
@@ -48586,7 +49110,7 @@
           sha256 = "0ng0by647r49mia7vmjqc97gwlwgs8kmaz0lw2y54jdz8m0bbngp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scratch-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scratch-ext";
           sha256 = "031wxz10k1q4bi5hywhcw1vzi41d5pv5hc09x8jk9s5nzyssvc0y";
           name = "scratch-ext";
         };
@@ -48607,7 +49131,7 @@
           sha256 = "030mcq0cmamizvra8jh2x76f71g5apiavwb10c28j62rl0r5bisk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scratch-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scratch-log";
           sha256 = "1yp3p0dzhmqrd0krqii3x79k4zc3p59148cijhk6my4n1xqnhs69";
           name = "scratch-log";
         };
@@ -48628,7 +49152,7 @@
           sha256 = "00b4r8bqlxc29k18vig0164d5c9fp5bp5q26d28lwr4f0s4a71d2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scratch-palette";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scratch-palette";
           sha256 = "0m6hc2amwnnii4y189kkridhapl9jipkmadvrmwvspgy3lxhlafs";
           name = "scratch-palette";
         };
@@ -48649,7 +49173,7 @@
           sha256 = "1yvmfiv1s83r0jcxzbxyrx3b263d73lbap6agansmrhkxp914xr1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scratch-pop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scratch-pop";
           sha256 = "0s7g1fbnc5hgz8gqmp1lynj5g7vvxisj7scxx5wil9qpn2zyggq1";
           name = "scratch-pop";
         };
@@ -48670,7 +49194,7 @@
           sha256 = "10hmy0p4pkrzvvyisk4rjc6hqqyk2sir1rszqgmkhrdywl010vlc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scratches";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scratches";
           sha256 = "0409v1wi10q48rrh8iib6dw9icmswfrpjx9x7xcma994z080d2fy";
           name = "scratches";
         };
@@ -48688,7 +49212,7 @@
           sha256 = "0q7yxaaa0fic4d2xwr0qk28clkinwz4xvw3wf8dv1g322s0xx2cw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/screenshot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/screenshot";
           sha256 = "0aw2343as38y26r2g7wpn1rq1n6xpw4y5c7ir8qh1crkc1y513hs";
           name = "screenshot";
         };
@@ -48709,7 +49233,7 @@
           sha256 = "113pi7nsaksaacy74ngbvrvr6qcl7199xy662nj58bz5307yi9q0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scss-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scss-mode";
           sha256 = "1g27xnp6bjaicxjlb9m0njc6fg962j3hlvvzmxvmyk7gsdgcgpkv";
           name = "scss-mode";
         };
@@ -48730,7 +49254,7 @@
           sha256 = "08yc67a4ji7z8s0zh500wiscziqsxi92i1d33fjla2mcr8sxxn0i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/search-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/search-web";
           sha256 = "0qqx9l8dn1as4gqpq80jfacn6lz0132m91pjzxv0fx6al2iz0m36";
           name = "search-web";
         };
@@ -48751,7 +49275,7 @@
           sha256 = "0zs08vxmjb3y4dnfq6djnrhmkgyhhwd5zylrjisrd4y7f089fyh4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/searchq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/searchq";
           sha256 = "0flsc07v887pm62mslrv7zqnhl62l6348nkm77mizm1592q3kjgr";
           name = "searchq";
         };
@@ -48772,7 +49296,7 @@
           sha256 = "15cjhwjiwmrfzmr74hbw5s92si2qdb8i97nmkbsgkj3444rxg239";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/seclusion-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/seclusion-mode";
           sha256 = "0ff10x6yr37vpp6ffbk1nb027lgmrydwjrb332fskwlf3xmy6v0m";
           name = "seclusion-mode";
         };
@@ -48790,7 +49314,7 @@
           sha256 = "143vg6z3aa0znmsx88r675vv5g2c13giz25dcbzazsp4wcr46wvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/second-sel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/second-sel";
           sha256 = "1nzy5ms5qf5big507kg3z5m6d6zgnsv2fswn359r2j59cval3fvr";
           name = "second-sel";
         };
@@ -48811,7 +49335,7 @@
           sha256 = "19p3zp4cj7ik2gwzc5k6klqc4b8jc2hvm80yhczc5b7k223gp2bv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/seeing-is-believing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/seeing-is-believing";
           sha256 = "05aja5xycb3kpmxyi234l50h98f5m1fil6ll4f2xkpxwv31ba5rb";
           name = "seeing-is-believing";
         };
@@ -48832,7 +49356,7 @@
           sha256 = "0qd462qbqdx53xh3ddf76chiljxf6s43r28v2ix85gsig7nm5pgr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/seethru";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/seethru";
           sha256 = "1lcwslkki9s15xr2dmh2iic4ax8ia0j20hjnjmkv612wv04b806v";
           name = "seethru";
         };
@@ -48853,7 +49377,7 @@
           sha256 = "1as3llcs7jgcw9pafz4mbfml1cqd1fw8yl64bb4467nmhq2p18p7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sekka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sekka";
           sha256 = "1jj4ly9p7m3xvb31nfn171lbpm9y70y8cbf8p24w0fhv665dx0cp";
           name = "sekka";
         };
@@ -48874,7 +49398,7 @@
           sha256 = "18xdkisxvdizsk51pnyimp9mwc6k9cpcxqr5hgndkz9q97p5dp79";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/selectric-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/selectric-mode";
           sha256 = "1k4l0lr68rqyi37wvqp1cnfci6jfkz0gvrd1hwbgx04cjgmz56n4";
           name = "selectric-mode";
         };
@@ -48895,7 +49419,7 @@
           sha256 = "1s1wjk2ba5spqc0vhj8kmfsm8vzmza06pnjkwal084v8dnwz0zz3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/semi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/semi";
           sha256 = "01wk3lgln5lac65hp6v83d292bdk7544z23xa1v6a756nhybwv25";
           name = "semi";
         };
@@ -48916,7 +49440,7 @@
           sha256 = "0g4jfcc5k26yh192bmmxnim9mqv993v2jjd9g9ssvnd42ihpx1n3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sensitive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sensitive";
           sha256 = "0v988k0x3mdp7ank2ihghphh8sanvv96s4sg6pnszg5hczak1vr3";
           name = "sensitive";
         };
@@ -48935,7 +49459,7 @@
           sha256 = "01qj57zpqpr4rxk9bsx828c7baac1xaa58cz22fncirdx00svn2k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sentence-highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sentence-highlight";
           sha256 = "16kh6567hb9lczh8zpqwbzz5bikg2fsabifhhky8qwxp4dy07v9m";
           name = "sentence-highlight";
         };
@@ -48956,7 +49480,7 @@
           sha256 = "0ikiv12ahndvk5w9pdayqlmafwj8d1vkcshfnqmgy6ykqbcdpqk6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sentence-navigation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sentence-navigation";
           sha256 = "1p3ch1ab06v038h130fsxpbq45d1yadl67i2ih4l4fh3xah5997m";
           name = "sentence-navigation";
         };
@@ -48977,7 +49501,7 @@
           sha256 = "15vmd1qmj8a6a5mmvdcnbav6mi5rhrp39m85idzv02zm0x9x6lyc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/seoul256-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/seoul256-theme";
           sha256 = "0mgyq725x5hmhs3h8v5macv8bfkginjghhwr9kli60vdb4skgjvp";
           name = "seoul256-theme";
         };
@@ -48998,7 +49522,7 @@
           sha256 = "1np6ip28ksms6fig67scwvwj43zgblny50ccvz8aclbl0z8nxswl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sequences";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sequences";
           sha256 = "12wnkywkmxfk2sx40h90k53d5qmc8hiky5vhlyf0ws3n39zvhplh";
           name = "sequences";
         };
@@ -49017,7 +49541,7 @@
           sha256 = "0vg8rqzzi29swznhra2mnf45czr2vb77dpcxn3j0fi7gynx3wcwk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sequential-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sequential-command";
           sha256 = "03qybacgy5fs3lam73x0rds4f68s173mhbah6rr97272nikd50v1";
           name = "sequential-command";
         };
@@ -49038,7 +49562,7 @@
           sha256 = "15lx6qvmq3vp84ys8dzbx1nzxcnzlq41whawc2yhrnd1dbq4mv2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/servant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/servant";
           sha256 = "048xg0gcwnf4l2p56iw4iawi3ywjz7f6icnjfi8qzk1z912iyl9h";
           name = "servant";
         };
@@ -49059,7 +49583,7 @@
           sha256 = "1h58q41wixjlapia1ggf83jxcllq7492k55mc0fq7hbx3hw1q1y2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/serverspec";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/serverspec";
           sha256 = "001d57yd0wmz4d7qmhnanac8g29wls0sqw194003hrgirakg82id";
           name = "serverspec";
         };
@@ -49080,7 +49604,7 @@
           sha256 = "0sp952abz7dkq8b8kkzzmnwnkq5w15zsx5dr3h8lzxb92lnank9v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/session";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/session";
           sha256 = "0fghxbnf1d5iyrx1q8xd0lbw9nvkdgg2v2f89j6apnawisrsbhwx";
           name = "session";
         };
@@ -49101,7 +49625,7 @@
           sha256 = "18igxblmrbxwhd2d68cz1bpj4524djh2dw2rwhxlij76f9v805wn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/seti-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/seti-theme";
           sha256 = "1mwkx3hynabwr0a2rm1bh91h7xf38a11h1fb6ys8s3mnr68csd9z";
           name = "seti-theme";
         };
@@ -49122,7 +49646,7 @@
           sha256 = "11h5z2gmwq07c4gqzj2c9apksvqk3k8kpbb9kg78bbif2xfajr3m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sexp-move";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sexp-move";
           sha256 = "0lcxmr2xqh8z7xinxbv1wyrh786zlahhhj5nnbv83i8m23i3ymmd";
           name = "sexp-move";
         };
@@ -49143,7 +49667,7 @@
           sha256 = "1nfvb2vmbdqfyj25hvwrz7ajb4ilxgrvd3rbf3im3mb3skic1wn9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shackle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shackle";
           sha256 = "159z0cwg7afrmym0xk902d8z093sqv39jig25ds7z4a224yrv5w6";
           name = "shackle";
         };
@@ -49164,7 +49688,7 @@
           sha256 = "0phivbhjdw76gzrx35rp0zybqfb0fdy2hjllf72qf1r0r5gxahl8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shadchen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shadchen";
           sha256 = "1r1mfmv4cdlc8kzjiqz81kpqdrwbnyciwdgg6n5x0yi4apwpvnl4";
           name = "shadchen";
         };
@@ -49185,7 +49709,7 @@
           sha256 = "0l094nrrvan8v6j1xdgb51cbjvwicvxih29b7iyga13adb9dy9j4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shader-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shader-mode";
           sha256 = "12y84fa1wc82js53rpadaysmbshhqf6wb97889qkksx19n3xmb9g";
           name = "shader-mode";
         };
@@ -49227,7 +49751,7 @@
           sha256 = "0vkxl3w4y4yacs1s4v0gwggvzrss8g74d3dgk8h3gphl4dlgx496";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shakespeare-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shakespeare-mode";
           sha256 = "1i9fr9l3x7pwph654hqd8s74swy5gmn3wzs85a2ibmpcjq8mz9rd";
           name = "shakespeare-mode";
         };
@@ -49248,7 +49772,7 @@
           sha256 = "15a8gs4lrqxn0jyfw16rc6vm7z1i10pzzlnp30x6nly9a7xra47x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shampoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shampoo";
           sha256 = "01ssgw4cnnx8d86g3r1d5hqcib4qyhmpqvcvx47xs7zh0jscps61";
           name = "shampoo";
         };
@@ -49266,7 +49790,7 @@
           sha256 = "0jr5sbmg4zrx2dfdrajh2didm6dxx9ri5ib9qnwhc1jlppinyi7l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-command";
           sha256 = "1jxn721i4s1k5x1qldiynnl5khsl22x9k3whm698nzv8m786spxl";
           name = "shell-command";
         };
@@ -49287,7 +49811,7 @@
           sha256 = "1w42j5cdddr0riz1xjq3wiz5i9f71i9jdzd1l92ir0mlj05wjyic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-current-directory";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-current-directory";
           sha256 = "0bj2gs96ivm5x8l7gwvfckyalr1amh4cb1v2dbl323zmrqddhgkd";
           name = "shell-current-directory";
         };
@@ -49308,7 +49832,7 @@
           sha256 = "0z04z07r7p5p05zhaka37s48y82hg2dbk0ynap4inph3frn4yyfl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-here";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-here";
           sha256 = "0csi70v89bqdpbsizji6c5z0jmkx4x4vk1zfclkpap4dalmxxcsh";
           name = "shell-here";
         };
@@ -49326,7 +49850,7 @@
           sha256 = "0biqjm0fpd7c7jilgkcwp6c32car05r5akimbcdii3clllavma7r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-history";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-history";
           sha256 = "1blad7ggv27qzpai2ib1pmr23ljj8asq880g3d7w8fhqv0p1pjs7";
           name = "shell-history";
         };
@@ -49347,7 +49871,7 @@
           sha256 = "0fzywfdaisvvdbcl813n1shz0r8v1k9kcgxgynv5l0i4nkrgkww5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-pop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-pop";
           sha256 = "02s17ln0hbi9gy3di8fksp3mqc7d8ahhf5vwyz4vrc1bg77glxw8";
           name = "shell-pop";
         };
@@ -49368,7 +49892,7 @@
           sha256 = "16srngml5xmpaxb0wzhx91jil0r0dmn673bwai3lzxrkmjnl748l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-split-string";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-split-string";
           sha256 = "1yj1h7za4ylxh2nikj7s1qqlilpsk05x9571a2fymfyznm3iq77m";
           name = "shell-split-string";
         };
@@ -49389,7 +49913,7 @@
           sha256 = "1bcrxq43a45alv6x0wms4d4nykiqz2mzk04kwk5lmf5pw3dqm900";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-switcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-switcher";
           sha256 = "07g9naiv2jk9jxwjywrbb05dy0pbfdx6g8pkra38rn3vqrjzvhyx";
           name = "shell-switcher";
         };
@@ -49410,7 +49934,7 @@
           sha256 = "0ssaccdacabpja9nqzhr8x8ggfwmlian7y4p0fa6gvr7qsvjpgr9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-toggle";
           sha256 = "1ai0ks7smr8b221j9hmsikswpxqraa9b13fpwv4wwagavnlah446";
           name = "shell-toggle";
         };
@@ -49427,11 +49951,11 @@
         src = fetchFromGitHub {
           owner = "mhayashi1120";
           repo = "Emacs-shelldoc";
-          rev = "20eb889f3d3d9bd01aafdc699e712a75db42d8f3";
-          sha256 = "0i6xp6g3ggs4fkr410blxa4mkb1y05pcygkdbvb7y3gh878q5b5k";
+          rev = "5df2264eb60e45066f3633df4f34834751667346";
+          sha256 = "1mc7y79h5p9cxqwsl40b1j5la5bm8b70n6fn4rx9wr4bi7rwph5i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shelldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shelldoc";
           sha256 = "1xlp03aaidp7dp8349v8drzhl4lcngvxgdrwwn9cahfqlrvvbbbx";
           name = "shelldoc";
         };
@@ -49452,7 +49976,7 @@
           sha256 = "1ns2w7zhbi96a3gilmzs69187jngqhcvik17ylsjdfrk42hw5s6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shelltest-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shelltest-mode";
           sha256 = "1inb0vq34fbwkr0jg4dv2lljag8djggi8kyssrzhfawri50m81nh";
           name = "shelltest-mode";
         };
@@ -49473,7 +49997,7 @@
           sha256 = "13zsws8gq9a8nfk4yzlvfsvqjh9zbnanmw68rcna93yc5nc634nr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shift-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shift-text";
           sha256 = "1v9zk7ycc8k1qk1cfs2y1knygl686msmlilqy5a7mh0w0z9f3a2i";
           name = "shift-text";
         };
@@ -49494,7 +50018,7 @@
           sha256 = "1lgvdaghzj1fzh8p6ans0f62zg1bfp086icbsqmyvbgpgcxia9cs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shimbun";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shimbun";
           sha256 = "0k54886bh7zxsfnvga3wg3bsij4bixxrah2rrkq1lj0k8ay7nfxh";
           name = "shimbun";
         };
@@ -49507,15 +50031,15 @@
     shm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shm";
-        version = "20151127.133";
+        version = "20160204.414";
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "structured-haskell-mode";
-          rev = "a305ca94059d31c60d549494756d5b4eabec20b0";
-          sha256 = "1cr83az4xm20i2v8bd5dbqll3d8vhjb3m2ypzwbxlizjcxpa638c";
+          rev = "e34d4d9b1b6c4fd18e726da1dd5b73f64bb883e9";
+          sha256 = "1xjkcdxyz3q17jr036gc4zjryc497dbhi4g89y4zkfc68c4m89xy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shm";
           sha256 = "1qmp8cc83dcz25xbyqd4987i0d8ywvh16wq2wfs4km3ia8a2vi3c";
           name = "shm";
         };
@@ -49536,7 +50060,7 @@
           sha256 = "19p47a4hwl6h2w5ay09hjhl4kf7cydwqp8s2iyrx2i0k58az8i8i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shoulda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shoulda";
           sha256 = "0lmlhx34nwvn636y2wvw3sprhhh6q3mdg7dzgpjj7ybibvhp1lzk";
           name = "shoulda";
         };
@@ -49546,22 +50070,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    show-css = callPackage ({ dom, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    show-css = callPackage ({ doom, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "show-css";
-        version = "20140816.1208";
+        version = "20160121.1004";
         src = fetchFromGitHub {
           owner = "smmcg";
           repo = "showcss-mode";
-          rev = "1b8c330644c06e6d99ec5da8a9722c918b2ea039";
-          sha256 = "0n38dbyw039lpdxzbhngndqfhcfgsx570bpflrb5wdh2mq5w57md";
+          rev = "1c0fe0aa8ece480f63d0a516c9d6a35f0406c570";
+          sha256 = "15v2cr1dmk5iha3brikbhxnsfi84b9jdnrbnaqy9xyxbdw7cs0r5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/show-css";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/show-css";
           sha256 = "1b3n8h39m85inxsqvzwgb9fqnqn2sgib91hrisn1gpgfyjydzkr7";
           name = "show-css";
         };
-        packageRequires = [ dom ];
+        packageRequires = [ doom ];
         meta = {
           homepage = "http://melpa.org/#/show-css";
           license = lib.licenses.free;
@@ -49578,7 +50102,7 @@
           sha256 = "15vkk7lnnfwgzkiwpqz1l1qpnz2d10l82m10m0prbw03k1zx22c7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/show-marks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/show-marks";
           sha256 = "1jgxdclj88ca106vcvf1k8zbf7iwamy80c2ad8b3myz0f4zscjzb";
           name = "show-marks";
         };
@@ -49596,7 +50120,7 @@
           sha256 = "0pq88kz5h0hzgfk8fyf3lppxalmadg5czbik824bpykp9l9gnf1m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/showkey";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/showkey";
           sha256 = "1m280ll07i5c6s4w0s227jygdlpvd87dq45039v0sljyxm4bfrsv";
           name = "showkey";
         };
@@ -49614,7 +50138,7 @@
           sha256 = "01ibg36lvmdk7ac1k0f0r6wyds4rq0wb7gzw26nkiwykn14gxaql";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/showtip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/showtip";
           sha256 = "1fdhdmkvyz1dcy3x0im1iab6yhhh8gqvxmm6ccwr6rl1r1m5zwc8";
           name = "showtip";
         };
@@ -49635,7 +50159,7 @@
           sha256 = "1mizhbwvnsxxjz6m94qziibvhghhp8v8db3wxrq3z9gsaqqkcndn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shpec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shpec-mode";
           sha256 = "155hc1nym3fsvflps8d3ixaqw1cafqp97zcaywdppp47n7vj8zjl";
           name = "shpec-mode";
         };
@@ -49656,7 +50180,7 @@
           sha256 = "07zzyfibs2c7w4gpvdh9003frznbg7zdnrx0nv8bvn0b68d3yz0m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shrink-whitespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shrink-whitespace";
           sha256 = "12if0000i3rrxcm732layrv2h464wbb4xflbbfc844c83dbx1jmq";
           name = "shrink-whitespace";
         };
@@ -49677,7 +50201,7 @@
           sha256 = "00c11s664hwj1l1hw7qshygy3wb6wbd0hn6qqnyq1xr0r87nnhjs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shut-up";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shut-up";
           sha256 = "1bcqrnnafnimfcg1s7vrgq4cb4rxi5sgpd92jj7xywvkalr3kh26";
           name = "shut-up";
         };
@@ -49698,7 +50222,7 @@
           sha256 = "0cjqh6qbbmgxd6zgqnikw6bh8wpjydydkkqs5wcmblpi5awqmnb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sibilant-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sibilant-mode";
           sha256 = "0jd6dsk93nvwi5yia3623hfc4v6zz4s2n8m1wx9bw8x6kv3h3qbq";
           name = "sibilant-mode";
         };
@@ -49719,7 +50243,7 @@
           sha256 = "102ssiz4sp7y816s1iy8i98c314jbn3sy0v87b0qgpgjiq913ffq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sicp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sicp";
           sha256 = "1q7pbhjk8qgwvj27ianrdbmj98pwf3xv10gmpchh7bypmbyir4wz";
           name = "sicp";
         };
@@ -49740,7 +50264,7 @@
           sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sift";
           sha256 = "0mv5zk140kjilwvzccj75ym7wlkkqryb532mbsy7i9bs3q7m916d";
           name = "sift";
         };
@@ -49761,7 +50285,7 @@
           sha256 = "1g4rr7hpy9r3y4vdpv48xpmy8kqvs4j64kvnhnj2rw2wv1grw78j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/signature";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/signature";
           sha256 = "11n3id1iiip99lj8c0iffbrf59s2yvmwlhqbf8xzxkhws7vwdl5q";
           name = "signature";
         };
@@ -49782,7 +50306,7 @@
           sha256 = "1m8azyb4nxxdh6pwik9qb0zqp4z8z4vk3dlpfgklsq9rss8gwbaf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simp";
           sha256 = "0x4lssjkj3fk9fw603f0sggvcj25iw0zbzsm5c949lhl4a3wvc9c";
           name = "simp";
         };
@@ -49803,7 +50327,7 @@
           sha256 = "09blcc1aj1lbqr1jcjm8dlq13s3plrg1qbp9vr3sp4dxyhjpimjj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simple-call-tree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simple-call-tree";
           sha256 = "1cbv4frsrwd8d3rg8r4sylwnc1hl3hgh595qwbpx0zd3dp5na2yl";
           name = "simple-call-tree";
         };
@@ -49824,7 +50348,7 @@
           sha256 = "0jn46fk0ljqs40kz6ngp0sk6hg1334835r2rmagx4qm0mdaqy7p8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simple-httpd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simple-httpd";
           sha256 = "18dharsdiwfkmhd9ibz9f47yfq9c2d78i886pi6gsjh8iwcpzx59";
           name = "simple-httpd";
         };
@@ -49845,7 +50369,7 @@
           sha256 = "1bnc3ykgf727lc0ajxa8qsx616baljdgav78fkz57irm65dqr18q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simple-mpc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simple-mpc";
           sha256 = "05x2xyys5mf6k7ndh0l6ykyiygaznb4f8bx3npbhvihrsz9ilf8r";
           name = "simple-mpc";
         };
@@ -49864,7 +50388,7 @@
           sha256 = "01fdk790jlpxy95y67yv6944ws4zjh7gs6ymnj1yflf19ccsdsnn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simple+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simple+";
           sha256 = "12fsgjk53fq2316j8nm6wvdckpyg9hq3v65j5c52i0g0cwmx62ra";
           name = "simple-plus";
         };
@@ -49885,7 +50409,7 @@
           sha256 = "15y1kxck6gxqs6pv4qxz8rrc61bsk73pzbz6f30f5l0r0750i1rm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simple-rtm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simple-rtm";
           sha256 = "1aadzaf73clhyny2qiryg6z84k34yx3ghy6pyl0px9qhqc1ak271";
           name = "simple-rtm";
         };
@@ -49906,7 +50430,7 @@
           sha256 = "0zf9wgyp0n00i00zl1lxr0d60569zgcjdnmdvgpcibvny5s1fp2i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simple-screen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simple-screen";
           sha256 = "16zvsmqn882w320h26hjjz5lcyl9y0x4amkf2zfps77xxmkmi5n0";
           name = "simple-screen";
         };
@@ -49927,7 +50451,7 @@
           sha256 = "09286h2q9dqghgfj9a4cniz6djw7867vcy3ixs7cn4wghvhyxm8s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simpleclip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simpleclip";
           sha256 = "07qkfwlg8vw5kb097qbsv082hxir047q2bcvc8scbak2dr6pl12s";
           name = "simpleclip";
         };
@@ -49948,7 +50472,7 @@
           sha256 = "0xq4vy3ggdjiycd3aa62k94kd43zcpm8bfdgi8grwkb1lpvwq9i9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simplenote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simplenote";
           sha256 = "0rnvm3q2spfj15kx2c8ic1p8hxg7rwiqgf3x2zg34j1xxayn3h2j";
           name = "simplenote";
         };
@@ -49969,7 +50493,7 @@
           sha256 = "1a0l0f6by1nmnnq0n52la9g3d357bmwak4qgy6p8g66qb9rx6rzv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simplenote2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simplenote2";
           sha256 = "1qdzbwhzmsga65wmrd0mb3rbs71nlyqqb6f4v7kvfxzyis50cswm";
           name = "simplenote2";
         };
@@ -49990,7 +50514,7 @@
           sha256 = "0108q2b5h73rjxg9k2kmc8z6la9kgqdnz9z1x7rn61v3vbxlzqvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simplezen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simplezen";
           sha256 = "13f2anhfsxmx1vdd209gxkhpywsi3nn6pazhc6bkswmn27yiig7j";
           name = "simplezen";
         };
@@ -50003,15 +50527,15 @@
     sisyphus = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }:
     melpaBuild {
         pname = "sisyphus";
-        version = "20160111.308";
+        version = "20160126.1619";
         src = fetchFromGitHub {
           owner = "phillord";
           repo = "sisyphus";
-          rev = "83973f404749595d6921adde37e2d600931224de";
-          sha256 = "1wzzk1j2404cvwy9hwwwqa2njncy73py5m90w41v5kgjrrkiy84j";
+          rev = "f521db4101ac853da8d7a7ce4e83872b33038e20";
+          sha256 = "1v7xn0a1x4036spmzrfi6syhpbm6bg9a22h6ybzmvzmbp90cs25a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sisyphus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sisyphus";
           sha256 = "08400jazj7w63l8g9ypy6w9dj8r0xh4d2yg3nfwqqf5lhfnj9bnj";
           name = "sisyphus";
         };
@@ -50032,7 +50556,7 @@
           sha256 = "0kbgxjfdf88h7hfds1kbdxx84wvkvy773r98ym1fzfm54m2kddvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/skeletor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/skeletor";
           sha256 = "1vfvg5l12dzksr24dxwc6ngawsqzpxjs97drw48qav9dy1vyl10v";
           name = "skeletor";
         };
@@ -50053,7 +50577,7 @@
           sha256 = "16757xz5ank3jsh8xglyly7pwdn5xm0yngampy1n1vgcwsp5080a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/skewer-less";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/skewer-less";
           sha256 = "0fhv5cnp5bgw3krfmb0jl18kw2hzx2p81falj57lg3p8rn23dryl";
           name = "skewer-less";
         };
@@ -50074,7 +50598,7 @@
           sha256 = "0yj7r5f751lra9jj7lg90qp66sgnb7fcjw5v9hfna7r13qdn9f20";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/skewer-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/skewer-mode";
           sha256 = "1zp4myi9f7pw6zkgc0xg12585iihn7khcsf20pvqyc0vn4ajdwqm";
           name = "skewer-mode";
         };
@@ -50095,7 +50619,7 @@
           sha256 = "1q0qc4jc83k7dfhq2y06zy0fg38kvp219gb3icysdhs88zi2v9s3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/skewer-reload-stylesheets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/skewer-reload-stylesheets";
           sha256 = "1rxn0ha2yhvyc195alg31nk1sjghnbha33xrqwc9z3j71w211frm";
           name = "skewer-reload-stylesheets";
         };
@@ -50116,7 +50640,7 @@
           sha256 = "0gzj7cf42nhp3ac1a2gxcfbmn80z1z46zxsfr2f5xil2gjag39fx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/skype";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/skype";
           sha256 = "06p5s5agajbm9vg9xxpzv817xmjw2kmcahiw4iypn5yzwhv1aykl";
           name = "skype";
         };
@@ -50129,15 +50653,15 @@
     slack = callPackage ({ alert, circe, emojify, fetchFromGitHub, fetchurl, lib, melpaBuild, oauth2, request, websocket }:
     melpaBuild {
         pname = "slack";
-        version = "20160118.752";
+        version = "20160201.2108";
         src = fetchFromGitHub {
           owner = "yuya373";
           repo = "emacs-slack";
-          rev = "d0bce55f11dbf4497c02955f406d4a31dacb5add";
-          sha256 = "07hpalcn3fj09bd5fs7ddnai9n8x91mqrysdf1kvivxq695a5hsz";
+          rev = "455bff044ad3d2e789a605c5f1716f7a4fb24d01";
+          sha256 = "184hc4wvm3y33g6ka8m90ysh1s8cdynsnni5abf2lzmgl4jgpcpl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slack";
           sha256 = "0mybjx08yskk9vi06ayiknl5ddyd8h0mnr8c0a3zr61p1x4s6anp";
           name = "slack";
         };
@@ -50158,7 +50682,7 @@
           sha256 = "108zcb7hdaaq3sxjfr9nrwzqxx71q6aygzik7l3ab854xknkjfad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slamhound";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slamhound";
           sha256 = "14zlcw0zw86awd6g98l4h2whav9amz4m8ik877d1wsdjf69g7k9x";
           name = "slamhound";
         };
@@ -50179,7 +50703,7 @@
           sha256 = "11p1pghx55a4gcn45cadw7c594134b21cdim723k2h99z14f89az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slideview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slideview";
           sha256 = "0zr08yrnrz49zds1651ysmgjqgbnhfdcqbg90sbsb086iw89rxl1";
           name = "slideview";
         };
@@ -50200,7 +50724,7 @@
           sha256 = "0vgyc2ny9qmn8f5r149y4g398mh4gnwsp4yim85z4vmdikqg8vi1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slim-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slim-mode";
           sha256 = "1hip0r22irr9sah3b65ky71ic508bhqvj9hj95a81qvy1zi9rcac";
           name = "slim-mode";
         };
@@ -50210,22 +50734,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
     melpaBuild {
         pname = "slime";
-        version = "20160113.830";
+        version = "20160202.1146";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "7f950dac7b4fd5925509626b69a0ab2c6397ec93";
-          sha256 = "0awxgn4vpwkkf0m2gwy5ivqpin4szc2y1xrz5v75h4hpfr5pqz4x";
+          rev = "837ffe761f24ab612c0523ff3bb5b17efa2d3b1e";
+          sha256 = "0hik0idwn24mrfgp9ki3wp80w79bdklg5xz2gn08g4bqiavxbrld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime";
           sha256 = "04zcvjg0bbx5mdbsk9yn7rlprakl89dq6jmnq5v2g0n6q0mh6ign";
           name = "slime";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib macrostep ];
         meta = {
           homepage = "http://melpa.org/#/slime";
           license = lib.licenses.free;
@@ -50242,7 +50766,7 @@
           sha256 = "1wq1gs9jjd5m6iwrv06c2d7i5dvqsfjcljgbspfbc93cg5xahk4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime-annot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime-annot";
           sha256 = "14x9lzpkgkc96jsbfpahl027qh6y5azwdk0cmk9pbd1xm95kxj6n";
           name = "slime-annot";
         };
@@ -50263,7 +50787,7 @@
           sha256 = "1yi89hmnawf1pf9nv3f6i8a168wvri3zc40wgbbgnda8hxrcqkjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime-company";
           sha256 = "195s5fi2dl3h2jyy4d45q22jac35sciz81n13b4lgw94mkxx4rq2";
           name = "slime-company";
         };
@@ -50284,7 +50808,7 @@
           sha256 = "0rsh0bbhyx74yz1gjfqyi0bkqq5n3scpyh5mmc3d6dkpv8wa7bwz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime-ritz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime-ritz";
           sha256 = "1y1439y07l1a0sp9wn110hw4yyxj8n1cnd6h17rmsr549m2qbg1a";
           name = "slime-ritz";
         };
@@ -50305,7 +50829,7 @@
           sha256 = "13rm9pmshgssmydhpirri38s38z3kvkhqama40qdzqq96dsxlnjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime-theme";
           sha256 = "1b709cplxip48a6qjdnzcn5qcgsy0jq1m05d7vc8p5ywgr1f9a00";
           name = "slime-theme";
         };
@@ -50326,7 +50850,7 @@
           sha256 = "00v4mh04affd8kkw4rn51djpyga2rb8f63mgy86napglqnkz40r3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime-volleyball";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime-volleyball";
           sha256 = "1dzvj8z3l5l9ixjl3nc3c7zzi23zc2300r7jzw2l3bvg64cfbdg7";
           name = "slime-volleyball";
         };
@@ -50339,15 +50863,15 @@
     slirm = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "slirm";
-        version = "20160118.929";
+        version = "20160201.825";
         src = fetchFromGitHub {
           owner = "fbie";
           repo = "slirm";
-          rev = "bf66b9c512fc1955cadb4e573d07877dcda10df2";
-          sha256 = "186q8mcfk1p14nf97rqrqm6zgd6pzw7g96pj7kcazpndnl1my8zx";
+          rev = "9adfbe1fc67580e7d0d90f7e927a25d63a797464";
+          sha256 = "0srj0zcvzr0sjcs37zz11xz8w0yv94m69av9ny7mx8ssf4qp0pxa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slirm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slirm";
           sha256 = "061xjj3vjdkkvd979fhp7bc12g5zkxqxywvcz3z9dlkgdks41ld7";
           name = "slirm";
         };
@@ -50368,7 +50892,7 @@
           sha256 = "1y1gay1h91c0690gly4qibx1my0l1zpb6s3x58lks8m21jdwfw28";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slovak-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slovak-holidays";
           sha256 = "1dcw8pa3r9b7n7dc8fgzijz7ywwxb3nlfg7n0by8dnvpjq2c30bg";
           name = "slovak-holidays";
         };
@@ -50381,15 +50905,15 @@
     sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sly";
-        version = "20151228.955";
+        version = "20160122.424";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "sly";
-          rev = "8ac6fe5286eed3f778895581c5315a9c9dbd03a6";
-          sha256 = "1svawfb46066jnap7k188j5fwyqwkd5mql3x14zrm6gjl5mv2a5z";
+          rev = "adadc9ca765bf8804a8de93c444a1e83cd1b9212";
+          sha256 = "16h4xkaa1cdnal7ydsv0rdj1ldyb1ax0776x9a3abj5n9zf3pwxm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sly";
           sha256 = "1pmyqjk8fdlzwvrlx8h6fq0savksfny78fhmr8r7b07pi20y6n9l";
           name = "sly";
         };
@@ -50410,7 +50934,7 @@
           sha256 = "0qpw345ch5b9dbznk916f6h9f9dnf03wfyvpgnzdf30ffvf4q01w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sly-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sly-company";
           sha256 = "1n8bx0qis2bs49c589cbh59xcv06r8sx6y4lxprc9pfpycx7h6v2";
           name = "sly-company";
         };
@@ -50423,15 +50947,15 @@
     sly-hello-world = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
     melpaBuild {
         pname = "sly-hello-world";
-        version = "20160118.449";
+        version = "20160119.836";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "sly-hello-world";
-          rev = "4f5047a3b79e14d84ccf908cd29d5663815c05f6";
-          sha256 = "03pprkhsczfvlnpf15xx3dp5a1jvqskf2w14yz3xn9k9hgy5sa13";
+          rev = "1bfcca692b6ec0670ed309ffe29eb9384397c183";
+          sha256 = "1fxsv83fcv5l7cndsysd8salvfwsabvd84sm7zli2ksf678774gp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sly-hello-world";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sly-hello-world";
           sha256 = "03ybjgczp6ssk4hmwd486vshlk7ql27k1lyhmvk26gmrf554z90n";
           name = "sly-hello-world";
         };
@@ -50441,6 +50965,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    sly-macrostep = callPackage ({ fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild, sly }:
+    melpaBuild {
+        pname = "sly-macrostep";
+        version = "20160119.634";
+        src = fetchFromGitHub {
+          owner = "capitaomorte";
+          repo = "sly-macrostep";
+          rev = "eb16778d104413a3e2a8d5537437c4ad76c2954b";
+          sha256 = "00lw6hkxs71abjyi7nhzi8j6n55jyhzsp81ycn6f2liyp4rmqgi7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sly-macrostep";
+          sha256 = "1i004mb0bg13j3zhdsjz1795dh0ry8winzvdghr1wardc9np60h7";
+          name = "sly-macrostep";
+        };
+        packageRequires = [ macrostep sly ];
+        meta = {
+          homepage = "http://melpa.org/#/sly-macrostep";
+          license = lib.licenses.free;
+        };
+      }) {};
     sly-named-readtables = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
     melpaBuild {
         pname = "sly-named-readtables";
@@ -50452,7 +50997,7 @@
           sha256 = "1xi625pn3mg77mjvr94v6a5pjyvgjavpkdbbh1lqjx1halaa2qb7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sly-named-readtables";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sly-named-readtables";
           sha256 = "11ymzbj1ji7avfjqafj9p5zx0m4y1jfjcmyanpjq1frdcz639ir9";
           name = "sly-named-readtables";
         };
@@ -50470,7 +51015,7 @@
           sha256 = "0sm4nxynwhwypzw008fz56axai9lrphjczwzfdy7da3akan18rbd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-compile";
           sha256 = "0vgxqyzl7jw2j96rmjw75b5lmjwrvzajrdvfyabss4xmv96dy2r3";
           name = "smart-compile";
         };
@@ -50491,7 +51036,7 @@
           sha256 = "1xbd42q60pmg0hw4bn2fndjwgrfgj6ggm757fyp8m08jqh0zkarn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-cursor-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-cursor-color";
           sha256 = "11875pwlx2rm8d86541na9g3yiq0j472vg63mryqv6pzq3n8q6jx";
           name = "smart-cursor-color";
         };
@@ -50512,7 +51057,7 @@
           sha256 = "19l47xqzjhhm9j3izik0imssip5ygg3lnflb9ixsz1js571aaxha";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-forward";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-forward";
           sha256 = "032yc45c19fl886jmi5q04r6q47xz5rphb040wjvpd4fnb06hr8c";
           name = "smart-forward";
         };
@@ -50533,7 +51078,7 @@
           sha256 = "0q5hxg265ad9gpclv2kzikg6jvbf3zzb1mrykxn0n7mnvdfdlhsi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-indent-rigidly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-indent-rigidly";
           sha256 = "12qggg1m28mlvkdn52dig8bwv58pvipkvn1mlc4r7w569arar44x";
           name = "smart-indent-rigidly";
         };
@@ -50554,7 +51099,7 @@
           sha256 = "0sqvm7iwdjk057fwid4kz6wj71igiqhdarj59s17pzy6xz34afhg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-mark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-mark";
           sha256 = "1vv65sa0pwl407mbxcp653kycgx8jz87n6wshias1dp9lv21pj6v";
           name = "smart-mark";
         };
@@ -50567,15 +51112,15 @@
     smart-mode-line = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, rich-minority }:
     melpaBuild {
         pname = "smart-mode-line";
-        version = "20160111.1134";
+        version = "20160125.1100";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "smart-mode-line";
-          rev = "25db8758068bd7495b1f2fe25a221cdb9c4dde80";
-          sha256 = "10d6skkl9skq1y669sma2pyahri5lcn48fq0lvpmbh8397rb94pk";
+          rev = "76bc5cc9f6810b252c0e312a4f3ad5869e2b9504";
+          sha256 = "0jr0yvaih5d2a5fkwszhf25cyk3q0fqfbgybb3nbrbkcf0mja22q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-mode-line";
           sha256 = "0qmhzlkc6mfqyaw4jaw6195b8sw0wg9pfjcijb4p0mlywf5mh5q6";
           name = "smart-mode-line";
         };
@@ -50592,11 +51137,11 @@
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "smart-mode-line";
-          rev = "25db8758068bd7495b1f2fe25a221cdb9c4dde80";
-          sha256 = "10d6skkl9skq1y669sma2pyahri5lcn48fq0lvpmbh8397rb94pk";
+          rev = "76bc5cc9f6810b252c0e312a4f3ad5869e2b9504";
+          sha256 = "0jr0yvaih5d2a5fkwszhf25cyk3q0fqfbgybb3nbrbkcf0mja22q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-mode-line-powerline-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-mode-line-powerline-theme";
           sha256 = "0hv3mx39m3l35xhz351zp98321ilr6qq9wzwn1f0ziiv814khcn4";
           name = "smart-mode-line-powerline-theme";
         };
@@ -50617,7 +51162,7 @@
           sha256 = "1q74b0mbhly84g252a0arbyxc720rgs9a3yqf8b8s2fpfkzb95sg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-newline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-newline";
           sha256 = "1kyk865vkgh05vzlggs3ii81v86fcbcxybfkv5rkyl3fyqpkza1w";
           name = "smart-newline";
         };
@@ -50638,7 +51183,7 @@
           sha256 = "0h559cdyln5f4ignx1r86ryi7wizys0gj03dj7lfzaxr7wkd0jaf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-region";
           sha256 = "1bcvxf62bfi5lmhprma9rh670kka9p9ygbkgmv6dg6ajjfsplgwc";
           name = "smart-region";
         };
@@ -50659,7 +51204,7 @@
           sha256 = "0azhfffm1bkgjx4i3p9f6x2gmw8kc3fafzqj4vxxdibhn0nizqk8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-shift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-shift";
           sha256 = "0azahlflnh6sk081k5dcqal6nmwkjnj4dq8pv8ckwf8684zp23d3";
           name = "smart-shift";
         };
@@ -50680,7 +51225,7 @@
           sha256 = "0aighpby8khrljb67m533bwkzlsckyvv7d09cnzr1rfwxiil0ml4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-tab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-tab";
           sha256 = "0qi8jph2c9fdsv2mqgxd7wb3q4dax3g5x2hc53kbgkjxylagjvp5";
           name = "smart-tab";
         };
@@ -50701,7 +51246,7 @@
           sha256 = "1s65hr7b8aggvdd1i6gkkpz6j1kqilggfnf46xvjnvdw9awmwk6b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-tabs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-tabs-mode";
           sha256 = "1fmbi0ypzhsizzb1vm92hfaq23swiyiqvg0pmibavzqyc9lczhhl";
           name = "smart-tabs-mode";
         };
@@ -50722,7 +51267,7 @@
           sha256 = "15834lnh7dq9kz31k06ifpnc0vz86rycz0ryildi5qd2nb7s3lw9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-window";
           sha256 = "1x1ncldl9njil9hhvzj5ac1l5aiyfm0f7j0d7lw8ady7xx2cy26m";
           name = "smart-window";
         };
@@ -50739,11 +51284,11 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "8f94974ec25b82fbab49eeae2054db52a00e274d";
-          sha256 = "1kwn1k6yyi2s83qkhl30zc1c2l8xlwy6bs8mqffss9y3bknli6px";
+          rev = "444c89a555b0ca25ff8d06e74665fbbc3a45a8b7";
+          sha256 = "1h9z7b10ihva6sg0p40xs4kv4dh5apd72zzqayns8jd9zasw4grm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smartparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smartparens";
           sha256 = "025nfrfw0992024i219jzm4phwf29smc5hib45s6h1s67942mqh6";
           name = "smartparens";
         };
@@ -50764,7 +51309,7 @@
           sha256 = "1sjwqi8w83qxihqmcm7z0vwmrz1az0y266qgj2nwfv39bri6y4i6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smartrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smartrep";
           sha256 = "1ypls52d51lcqhz737rqg73c6jwl6q8b3bwb29z51swyamf37rbn";
           name = "smartrep";
         };
@@ -50785,7 +51330,7 @@
           sha256 = "193cxfnh263yw628ipf9gssvyq3j7mffrdmnjhvzzcsnhd1k145p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smartscan";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smartscan";
           sha256 = "0vghgmx8vnjbvsw7q5zs0qz2wm6dcng9m69b8dq81g2cq9dflbwb";
           name = "smartscan";
         };
@@ -50806,7 +51351,7 @@
           sha256 = "1qfa6i59zhi8d6175py8id8gq7b3hdaqq4naa86r1rb7x8ringff";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smartwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smartwin";
           sha256 = "0rg92j0aa8qxhr91hjj2f4w8vj5w9b4d2nmkggng44nxk8zafdif";
           name = "smartwin";
         };
@@ -50827,7 +51372,7 @@
           sha256 = "1vl3nx0y2skb8sibqxvmc3wrmmd6z88hknbry348d0ik3cbr0ijx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smarty-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smarty-mode";
           sha256 = "06cyr2330asy2dlx81g3h9gq0yhd4pbnmzfvmla7amh4pfnjg14v";
           name = "smarty-mode";
         };
@@ -50848,7 +51393,7 @@
           sha256 = "1smv91ggvaw37597ilvhra8cnj4p71n6v5pfazii8k85kvs6x460";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smeargle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smeargle";
           sha256 = "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd";
           name = "smeargle";
         };
@@ -50869,7 +51414,7 @@
           sha256 = "0xrbkpc3w7yadpjih169cpp75gilsnx4y9akgci5vfcggv4ffm26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smex";
           sha256 = "1rwyi7gdzswafkwpfqd6zkxka1mrf4xz17kld95d2ram6cxl6zda";
           name = "smex";
         };
@@ -50889,7 +51434,7 @@
           sha256 = "1p10q1b5bvc8fvgfxynrq2kf1ygr6gad92x40zhaa5r1ksf6ryk4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sml-modeline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sml-modeline";
           sha256 = "086hslzznv6fmlhkf28mcl8nh4xk802mv6w0a4zwd5px2wyyaysd";
           name = "sml-modeline";
         };
@@ -50910,7 +51455,7 @@
           sha256 = "1kkg7qhb2lmwr4siiazqny9w2z9nk799lzl5i159lfivlxcgixmk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smooth-scroll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smooth-scroll";
           sha256 = "1b0mjpd4dqgk7ij37145ry2jqbn1msf8rrvymn7zyckbccg83zsf";
           name = "smooth-scroll";
         };
@@ -50931,7 +51476,7 @@
           sha256 = "05kf3hb3nb32jzw50a2z9vlf3f0pj40klzxvqj4fxlci777imsvk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smooth-scrolling";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smooth-scrolling";
           sha256 = "0zy2xsmr05l2narslfgril36d7qfb55f52qm2ki6fy1r18lfiyc6";
           name = "smooth-scrolling";
         };
@@ -50952,7 +51497,7 @@
           sha256 = "1a097f1x9l0m4dizvnb742svlqsm6hlif73rk7qjar081sk1gjxx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smotitah";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smotitah";
           sha256 = "1m5qjl3r96riljp48il8k4rb6rwys1xf1pl93d4qjhprwvz57mv2";
           name = "smotitah";
         };
@@ -50973,7 +51518,7 @@
           sha256 = "0rhpnijp72jsl4gzhwz0z387f55vv3fp0zwki0fi5jlkzjamnnqg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smtpmail-multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smtpmail-multi";
           sha256 = "0nc3k8ly4nx7fm3b2apga3p4svz5c9sldnlk86pz2lzra5h3b4ss";
           name = "smtpmail-multi";
         };
@@ -50994,7 +51539,7 @@
           sha256 = "1z2sdnf11wh5hz1rkrbg7fs4ha3zrbj9qnvfzq9005y89d7cs95x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smyx-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smyx-theme";
           sha256 = "1r85yxr864df5akqknl3hsrmzikr4085bqr6ijrbdj27nz00vl61";
           name = "smyx-theme";
         };
@@ -51015,7 +51560,7 @@
           sha256 = "01kixhbl2q7qd173zv6prgr81gnmhf95bjyraysw45wza72amkqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/snakemake-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/snakemake-mode";
           sha256 = "1xxd3dms5vgvpn18a70wjprka5xvri2pj9cw8qz09s640f5jf3r4";
           name = "snakemake-mode";
         };
@@ -51036,7 +51581,7 @@
           sha256 = "17nbm8692ihrlcikihspdqg8wvp80ryq4h06da34d0awqm0w027m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/snapshot-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/snapshot-timemachine";
           sha256 = "0pvh1ilzv0ambc5cridyhjcxs58wq92bxjkisqv42yar3h3z6f8p";
           name = "snapshot-timemachine";
         };
@@ -51057,7 +51602,7 @@
           sha256 = "1nyrfbjrg74wrqlh8229rf7ym07k2a0wscjm0kbg3sam9ryc546y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/snippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/snippet";
           sha256 = "1lgpw69k5a82y70j7nximdj0bl5nzr4jhjr5fkx1cvz8hhvgdz6j";
           name = "snippet";
         };
@@ -51078,7 +51623,7 @@
           sha256 = "07056pnjgsgw06c67776qp7jci96iqbzlprbavzz2l1j8ywz8cwm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/soft-charcoal-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/soft-charcoal-theme";
           sha256 = "0i29ais1m2h9v4ghcg41zfbnaj8klgm4509nkyfkxm7wqnjd166a";
           name = "soft-charcoal-theme";
         };
@@ -51099,7 +51644,7 @@
           sha256 = "06q82v1hndvznsqg0r6jrxvgxhycg9m65kay4db4yy0gmc66v2xf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/soft-morning-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/soft-morning-theme";
           sha256 = "0lzg478ax6idzh6m5sf2ds4gbv096y0c0gn15dai19f58bs63xzr";
           name = "soft-morning-theme";
         };
@@ -51120,7 +51665,7 @@
           sha256 = "030mf8b0sf9mmzwhg85zh0ccvcg768kckwvbm0yzg7vmq1x46hjl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/soft-stone-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/soft-stone-theme";
           sha256 = "05jjw9z6hqln9yj8ya2xrmjnylp7psfdj9206n30m3lwnlwx399v";
           name = "soft-stone-theme";
         };
@@ -51141,7 +51686,7 @@
           sha256 = "1vkrl8xvr5la8rj5gmafamzlqr0q2l1immyfnmfzf3r4n14kdywk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/solarized-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/solarized-theme";
           sha256 = "15d8k32sj8i11806byvf7r57rivz391ljr0zb4dx8n8vjjkyja12";
           name = "solarized-theme";
         };
@@ -51162,7 +51707,7 @@
           sha256 = "0drb237750lry18arbfx37drf16znwz8fhx5fawxy1q4z7bl7z5n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/solidity-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/solidity-mode";
           sha256 = "1qdzdivrf5yaa80p61b9r1gryw112v5l2m2jkvkc7glhkhrcvwsx";
           name = "solidity-mode";
         };
@@ -51183,7 +51728,7 @@
           sha256 = "1ga35d3rhdf6ffd36q58ay6380gjvkmaiid4vscga3v7ca0dkhl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sonic-pi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sonic-pi";
           sha256 = "07qxm1rkw2cbxf4g2vqk3s7xnqldqkdm2zw1qh2kqjscg5gwpkqp";
           name = "sonic-pi";
         };
@@ -51204,7 +51749,7 @@
           sha256 = "10gh1hvxq9gm29r6qzlnva7vjidd7n4kih4z2ihyvbvy9za20xqw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/soothe-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/soothe-theme";
           sha256 = "000hikpsmqpbb6v13az2dv319d0f7jjpkkpgi4vzv59z6cdlrlp3";
           name = "soothe-theme";
         };
@@ -51225,7 +51770,7 @@
           sha256 = "16x039imyf4p5d4rn92nlqcsvb5vlvdgq1m5g856b9dzwa89x733";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sos";
           sha256 = "1gkd0plx7152s3dj8a9lwlwh8bgs1m006s80l10agclx6aay8rvb";
           name = "sos";
         };
@@ -51238,15 +51783,15 @@
     sotclojure = callPackage ({ cider, clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sotlisp }:
     melpaBuild {
         pname = "sotclojure";
-        version = "20151225.1913";
+        version = "20160121.1240";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "speed-of-thought-clojure";
-          rev = "f2f7ed52dba57752804810992c35f991c9f7dfc4";
-          sha256 = "0s6nfszyk0qprdpd55yfcn6xv1fym43yra0j4ys6wf65lai9kr2p";
+          rev = "6ffb9f002b9fe94cba397e4aa75f9233346c7a24";
+          sha256 = "0wl21pgjf9p6cf4d51cd2z974m6ph1cjspi3vdbf91pd13b72sdq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sotclojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sotclojure";
           sha256 = "12byqjzg0pffqyq958265qq8yxxmf3iyy4m7zib492qcj8ccy090";
           name = "sotclojure";
         };
@@ -51267,7 +51812,7 @@
           sha256 = "027jmqx4240hym2is9q1iyjdws9ijyyck8dnsbm9xc5lhpsdrl69";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sotlisp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sotlisp";
           sha256 = "0zjnn6hhwy6cjvc5rhvhxcq5pmrhcyil14a48fcgwvg4lv7fbljk";
           name = "sotlisp";
         };
@@ -51288,7 +51833,7 @@
           sha256 = "1h6h65gwxb07pscyhhhdn11h3lx3jgyfw8v1kw5m2qfrv5kh6ylq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sound-wav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sound-wav";
           sha256 = "1vrwzk6zqma7r0w5ivbx16shys6hsifj52fwlf5rxs6jg1gqdb4f";
           name = "sound-wav";
         };
@@ -51309,7 +51854,7 @@
           sha256 = "1m8wcm6y80gq5rrm4brd3f20kmk54s6ph26j4lz4cmilxk6gj56v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/soundcloud";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/soundcloud";
           sha256 = "1jl9sk372j4162av9kfcbqp0cc5wpm86nkqg8rskfgmsi4ncp4ph";
           name = "soundcloud";
         };
@@ -51337,7 +51882,7 @@
           sha256 = "1ipg4vvh6vgf0az8p31br1xkb8ndjmd6fybcx11r3c479sg0y6k7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/soundklaus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/soundklaus";
           sha256 = "0b63sbgwp99ff94dxrqqp2p99j268fjkkzx0g42g726hv80d4fxb";
           name = "soundklaus";
         };
@@ -51358,7 +51903,7 @@
           sha256 = "18iv7jhy08smpdksplngj1mxcm2mm9gvbylimgr3211l8jr9gq8r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sourcegraph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sourcegraph";
           sha256 = "0rl6s1d0y2pggbfiq4f4xg9qp7nhkd708himzilfqyfa4jwna8yz";
           name = "sourcegraph";
         };
@@ -51379,7 +51924,7 @@
           sha256 = "1xzwalchl9lnq9848dlvhhbzyh1wkwbciz20d1iw0fsigj5g156c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sourcekit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sourcekit";
           sha256 = "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks";
           name = "sourcekit";
         };
@@ -51400,7 +51945,7 @@
           sha256 = "085xd5fqxgv9bam9k4aa3w0sa9q41cg275i60c8njy3bkbqcalh5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sourcemap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sourcemap";
           sha256 = "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5";
           name = "sourcemap";
         };
@@ -51421,7 +51966,7 @@
           sha256 = "0j4qm1y7rhb95k1zbl3c60a46l9rchzslzq36mayyw61s6yysjnv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sourcetalk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sourcetalk";
           sha256 = "0qaf2q784xgl1s3m88jpwdzghpi4f3nybga3lnr1w7sb7b3yvj3z";
           name = "sourcetalk";
         };
@@ -51442,7 +51987,7 @@
           sha256 = "1a8jp7m9zarvljg5d9c8ydir3qcmwx05c3frs696p9nwvapf6lsb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spacegray-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spacegray-theme";
           sha256 = "0khiddpsywpv9qvynpfdmybd80lbrhm68j3py6ranxlv7p79j9dx";
           name = "spacegray-theme";
         };
@@ -51455,15 +52000,15 @@
     spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
     melpaBuild {
         pname = "spaceline";
-        version = "20160107.826";
+        version = "20160120.559";
         src = fetchFromGitHub {
           owner = "TheBB";
           repo = "spaceline";
-          rev = "e140876cf75d5dbbac3a45428640d9d573a8c4c5";
-          sha256 = "0l2qvh01m1r8gfi055slgz96k7mcl0pqw8bbfw1saq5wfr2s95zh";
+          rev = "88e22c1c9c69093efc7310ca996d2efb3cbbba1d";
+          sha256 = "1ncwv6sqm1ch396qi1c8276dc910rnm0f3m8xjkskplv3cjaq0ai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spaceline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spaceline";
           sha256 = "0jpcj0i8ckdylrisx9b4l9kam6kkjzhhv1s7mwwi4b744rx942iw";
           name = "spaceline";
         };
@@ -51476,15 +52021,15 @@
     spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spacemacs-theme";
-        version = "20160118.708";
+        version = "20160121.1443";
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "afbb2c89ab574e9851da2fff7aa7d992f59f5780";
-          sha256 = "10q9n4iygp7r7rnp15jh2rq4d38v38xsmmbg6isykampwcxpwfq4";
+          rev = "6b49a05e7aed1318f7680984a5d21827026013fa";
+          sha256 = "01ylny2kfdlc73qmyy3xp5pwir459jryg0ci9k1qbzb7vb38v8vj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spacemacs-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spacemacs-theme";
           sha256 = "0riiim6qb6x9g5hz0k3qgdymgikynlb9l07mrbfmybkv4919p992";
           name = "spacemacs-theme";
         };
@@ -51505,7 +52050,7 @@
           sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spaces";
           sha256 = "152x7fzjnjjdk9d9h0hbixdp3haqn5vdx3bq1nfqfrkvzychyr06";
           name = "spaces";
         };
@@ -51526,7 +52071,7 @@
           sha256 = "1fqd3ycywxxmln2kzqwflc69xmqlvi9gwvmf7frn0rfv73w09cvp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sparkline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sparkline";
           sha256 = "081jzaxjb32nydvr1kmyafxqxi610n0yf8lwz9vldm84famf3g7y";
           name = "sparkline";
         };
@@ -51547,7 +52092,7 @@
           sha256 = "1gk2ps7fn9z8n6r923qzn518gz9mrj7mb6j726cz8qb585ndjbij";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sparql-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sparql-mode";
           sha256 = "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d";
           name = "sparql-mode";
         };
@@ -51565,7 +52110,7 @@
           sha256 = "1i2z57aasljia6xd2xn1mryklc2gc9c2q1fad8wn7982sl277d10";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/speck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/speck";
           sha256 = "19h3syk4kjmcy7jy9nlsbq6gyxwl4xsi84dy66a3cpvmknm25kyg";
           name = "speck";
         };
@@ -51586,7 +52131,7 @@
           sha256 = "05qx3wqsqs9lxv5lgpaw1wsd6qb5hh599ggi3c17ig5663q7pjsd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/speech-tagger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/speech-tagger";
           sha256 = "0sqil949ny9qjxq7kpb4zmjd7770r0qvq4sz80agw6a27mqnaajc";
           name = "speech-tagger";
         };
@@ -51606,7 +52151,7 @@
           sha256 = "2c1bff3e5a182b8150c6ba6c3be7e70ab2b733cac0a758521c0b941dff215c32";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/speechd-el";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/speechd-el";
           sha256 = "07g6jwymmwkx26p3as3r370viz1cqq360cagw9ji6i0hvgrr66a0";
           name = "speechd-el";
         };
@@ -51627,7 +52172,7 @@
           sha256 = "102hjyr9ii2rmq8762irbwansbi023s7dg4a8n6lkadcvzfibmag";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/speed-type";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/speed-type";
           sha256 = "14q423an7v5hhfx1x039fizxcn5hcscqf2jfn9rqifg4jpq8bq5g";
           name = "speed-type";
         };
@@ -51648,7 +52193,7 @@
           sha256 = "1wif9wf8hwxk0q09cdnrmyas7zjg8l5b8jd6sjxd40ypn6dmz2ch";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sphinx-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sphinx-doc";
           sha256 = "00h3wx2p5hzbw6sggggdrzv4jrn1wc051iqql5y2m1hsh772ic5z";
           name = "sphinx-doc";
         };
@@ -51669,7 +52214,7 @@
           sha256 = "1mfp4777ppg7zg7zqj755zpfk9lmcq73hxv055ig66pz30m7x5rw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sphinx-frontend";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sphinx-frontend";
           sha256 = "0hdn6zjnhzyka0lzdxqfzbj3lrj767ij406zha9zw8ibbkk7cmag";
           name = "sphinx-frontend";
         };
@@ -51690,7 +52235,7 @@
           sha256 = "1qdy9nc2h7mwxh7zg2p1x7yg96hxkwxqimjp6zb1119jx0s8grjc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/splitjoin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/splitjoin";
           sha256 = "0l1x98fvvia8qx8g125h4d76slv0xnb3h1zxiq9xb5qh7a1h069l";
           name = "splitjoin";
         };
@@ -51711,7 +52256,7 @@
           sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/splitter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/splitter";
           sha256 = "02vdhvipzwnh6mlj25lirzxkc0shfzqfs1p4gn3smkxqx6g7mdb2";
           name = "splitter";
         };
@@ -51721,22 +52266,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    spotify = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    spotify = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spotify";
-        version = "20150108.1003";
+        version = "20160128.306";
         src = fetchFromGitHub {
           owner = "remvee";
           repo = "spotify-el";
-          rev = "07a44ecdbdaa93977e97f2a2e5d280ef0b2e8545";
-          sha256 = "05y8xv6zapspwr5bii41lgirslas22wsbm0kgb4dm79qbk9j1kzw";
+          rev = "08d341c981ee218c18f4806d83d803ceb4e46466";
+          sha256 = "1f0dl2zzxnqsyic87jl9wbg6lf42d8g61sj4d9fb3yhxy6jf07jv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spotify";
           sha256 = "0pmsvxi1dsi580wkhhx8iw329agkh5yzk61bqvxzign3cd6fbq6k";
           name = "spotify";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "http://melpa.org/#/spotify";
           license = lib.licenses.free;
@@ -51753,7 +52298,7 @@
           sha256 = "05knlca2dvpyqp9lw8dc47fl5kh2jb04q57cygkzfjjkzvywdwq8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spotlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spotlight";
           sha256 = "0mmr1spr21pi8sfy95dsgqcxn8qfsphdkfjm5w5q97lh7496z65p";
           name = "spotlight";
         };
@@ -51774,7 +52319,7 @@
           sha256 = "0fvywcwn0zd06yy4b6cxpasiwfbps17jz9dy3jr0y0mdx5lzfxa9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spray";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spray";
           sha256 = "11b3wn53309ws60w8sfpfxij7vnibj6kxxsx6w1agglqx9zqngz4";
           name = "spray";
         };
@@ -51795,7 +52340,7 @@
           sha256 = "14py5amh66jzhqyqjz5pxq0g19vzlmqnrr5wij1ix64xwfr3xdy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/springboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/springboard";
           sha256 = "17rmsidsbb4p08vr07mfn25m17wnpadcwr4nxvp79glp5a0wyyib";
           name = "springboard";
         };
@@ -51816,7 +52361,7 @@
           sha256 = "06rk07h92s5sljprs41y3q31q64cprx9kgs56c2j6v4c8cmsq5h6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sprintly-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sprintly-mode";
           sha256 = "15i3rrv27ccpn12wwj9raaxpj7nlnrrj3lsp8vdfwph6ydvnfza4";
           name = "sprintly-mode";
         };
@@ -51837,7 +52382,7 @@
           sha256 = "11igl9n2zwwar1xg651g5v0r0w6xl0grm8xns9wg80351ijrci7x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sproto-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sproto-mode";
           sha256 = "19l6si3sx2i542r5lyr9axby9hblx76m77f17vnsjf32n3r0qgma";
           name = "sproto-mode";
         };
@@ -51858,7 +52403,7 @@
           sha256 = "17nbcaqx58fq4rz501xcqqcjhmibdlkaavmmzwcfwra7jv8hqljy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sql-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sql-indent";
           sha256 = "13s38zdd9j127p6jxbcj4d4va8mkri5dx5zh39g465mnlzx7fp8g";
           name = "sql-indent";
         };
@@ -51879,7 +52424,7 @@
           sha256 = "0zlrx8sk7gwwr6a23mc22d7iinwf8p9ff16r9krqp86fyzbhnq1d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sqlite";
           sha256 = "1j23rqgq00as90nk6csi489ida6b83h1myl3icxivj2iw1iikgj1";
           name = "sqlite";
         };
@@ -51897,7 +52442,7 @@
           sha256 = "0xixdddcrzx6k0s8w9rp6q7b9qjpdb4l888gmcis42yvawb1i53d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sqlplus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sqlplus";
           sha256 = "1z9pf36b1581flykis9cjv7pynnp94fm4ijzjy6hvqyj81aikxpz";
           name = "sqlplus";
         };
@@ -51918,7 +52463,7 @@
           sha256 = "0p2g4ss3bf2asxcibrd8l70ll04nm47znr99l5xyzzwhyfzi61w4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sqlup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sqlup-mode";
           sha256 = "06a0v2qagpd9p2bh19bfw14a6if8kjjc4yyhm5nwp8a8d2vnl5l7";
           name = "sqlup-mode";
         };
@@ -51936,7 +52481,7 @@
           sha256 = "1ffnm2kfh8cg5rdhrkqmh4krggbxvqg3s6lc1nssv88av1c5cs3i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sr-speedbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sr-speedbar";
           sha256 = "1zq3ysz1vpc98sz2kpq307v1fp1l4ivwgrfh2kdqkkdjm4fkya23";
           name = "sr-speedbar";
         };
@@ -51957,7 +52502,7 @@
           sha256 = "1n5p51iy79z60fnhxklc03pp0jbs5rgyb02z3wndbyzy73bhfh7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/srefactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/srefactor";
           sha256 = "01cd40jm4h00c5q2ix7cskp7klbkcd3n5763y5lqfv59bjxwdqd2";
           name = "srefactor";
         };
@@ -51978,7 +52523,7 @@
           sha256 = "1rdhdkwdhb727rj53xyxk6i00sjr58a48hfig14m12niy1k739vd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ssh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ssh";
           sha256 = "1jywn8wlqzc2mfylp0kbpzxv3kwzak3vxdbjabiawqv1m4bfpk5g";
           name = "ssh";
         };
@@ -51999,7 +52544,7 @@
           sha256 = "0076g1yb8xvn6s8gz5jxiz8mn448fmab574yizgakbxaxd91s1dj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ssh-agency";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ssh-agency";
           sha256 = "0lci3fhl2p9mwilvq1njzy13dkq5cp5ighymf3zs4gzm3w0ih3h8";
           name = "ssh-agency";
         };
@@ -52020,7 +52565,7 @@
           sha256 = "1v6srqiqq5xsjiw4d3kfgp218dks8mm6f9i88ngjri6sb3slpfb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ssh-config-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ssh-config-mode";
           sha256 = "0aihyig6q3pmk9ld519f4n3kychrg3l7r29ijd2dpvs0530md4wb";
           name = "ssh-config-mode";
         };
@@ -52041,7 +52586,7 @@
           sha256 = "10a5havjg4yjshpfzkhgjdwbrvl44narg09ddzynczmyzm4f01wh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ssh-tunnels";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ssh-tunnels";
           sha256 = "0zlf22wg9adkhycsasv6bfim2h0cknsvihyi1q2l2l4pjdp9ypqj";
           name = "ssh-tunnels";
         };
@@ -52062,7 +52607,7 @@
           sha256 = "1f2dxlc3dsf9ay417h1l43fxjkrb0a4gg96zd3asx9v2alpzgcim";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stack-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stack-mode";
           sha256 = "0s0m2lj40php7bc2i3fy9ikd5rmx4v7zbxfkp9vadmlc5s7w25gf";
           name = "stack-mode";
         };
@@ -52083,7 +52628,7 @@
           sha256 = "0nkrpx1rmzg48mi5871mgdizasv80vpald513ycx4nshyln0ymv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stan-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stan-mode";
           sha256 = "17ph5khwwrcpyl96xnp3rsbmnk7mpwmgskxka3cfgkm190qihfqy";
           name = "stan-mode";
         };
@@ -52104,7 +52649,7 @@
           sha256 = "0nkrpx1rmzg48mi5871mgdizasv80vpald513ycx4nshyln0ymv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stan-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stan-snippets";
           sha256 = "021skkvak645483s7haz1hsz98q3zd8hqi9k5zdzaqlabwdjwh85";
           name = "stan-snippets";
         };
@@ -52121,11 +52666,11 @@
         src = fetchFromGitHub {
           owner = "lueck";
           repo = "standoff-mode";
-          rev = "09b4b2dfeadf0b9c2f3e2897be5e9b728c07b9b6";
-          sha256 = "1fn97aw91g02hgz5c9dvnxh4zdd9wrdhs44s0gnj570za1m4cbiv";
+          rev = "1f401b5faf953e68af92596bc247a432ebd1fe03";
+          sha256 = "09gjhg923jck35c1nvcdfk4dc0r559myzmfbcd9jvjamzh50ngcr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/standoff-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/standoff-mode";
           sha256 = "127bzpm1cz103f1pb860yqrh7mr0rdaivrm9p6ssd01kchl9nskp";
           name = "standoff-mode";
         };
@@ -52146,7 +52691,7 @@
           sha256 = "1v3rzy842mfzm850vs273ssr4hg00q1wz2rpky8lk3wbbw2qq3f0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/start-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/start-menu";
           sha256 = "1k1lc9i9vcl2am9afq0ksrxwsy6kppl4i0v10h0w2fq5z374rdkv";
           name = "start-menu";
         };
@@ -52167,7 +52712,7 @@
           sha256 = "0cl2y72iagmv87kg72a46a3kap2xigwnrbk2hjgvsbxv2ng5f9cr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stash";
           sha256 = "116k40ispv7sq3jskwc1lvmhmk3jjz4j967r732s07f5h11vk1z9";
           name = "stash";
         };
@@ -52188,7 +52733,7 @@
           sha256 = "1b17v4xghmki0g9yr5855891mlcrrbkr68xc3qyals5xw0dhb3xb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/state";
           sha256 = "19y3n8wnbpgbpz4jxy2p7hjqxykg09arjp7s5v22yz7il3gn48l2";
           name = "state";
         };
@@ -52209,7 +52754,7 @@
           sha256 = "0jpxmzfvg4k5q3h3gn6lrg891wjzlcps2kkij1jbdjk4jkgq386i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/status";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/status";
           sha256 = "0a9lqa7a5nki5711bjrmx214kah5ndqpwh3i240gdd08mcm07ps3";
           name = "status";
         };
@@ -52230,7 +52775,7 @@
           sha256 = "0w1qb8r6nrxi5hbf8l4247yqq754zfbxz64pqqcnw43cxk0qd4j3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stekene-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stekene-theme";
           sha256 = "0v1kwlnrqaygzaz376a5njg9kv4yf5l35k87xga4wdd2mxfwrmf1";
           name = "stekene-theme";
         };
@@ -52251,7 +52796,7 @@
           sha256 = "1xc4v8a35c2vpfhza15j4f89x7vyg9bbgm7xnprij7814k8iy7p0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stem";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stem";
           sha256 = "1625nbi2bmb7vzjz0s7y1cy7dp8lp83dayiib3nr2bfkv76fwkcq";
           name = "stem";
         };
@@ -52270,7 +52815,7 @@
           sha256 = "c5d424f34ca33d2c19e3888a9dc249d0398203e5199bf2b4bdd9e604390b500b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stgit";
           sha256 = "102s9lllrcxsqs0lgbrcljwq1l3s8ri4276wck6rcypck5zgzj89";
           name = "stgit";
         };
@@ -52288,7 +52833,7 @@
           sha256 = "18izyia1j3w2c07qhkp9h6rnvw35m5k1brrrjhm51fpdv2xj65fy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sticky";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sticky";
           sha256 = "1xjkdwphq3m4jrazsfnzrrcrqikfdxzph3jdzkpbzk3grd4af96w";
           name = "sticky";
         };
@@ -52309,7 +52854,7 @@
           sha256 = "16dxjsr5nj20blww4xpd4jzgjprzzh1nwvb810ggdmp9paf4iy0g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stickyfunc-enhance";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stickyfunc-enhance";
           sha256 = "13dh19c3bljs83l847syqlg07g33hz6sapg6j4s4xv4skix8zfks";
           name = "stickyfunc-enhance";
         };
@@ -52330,7 +52875,7 @@
           sha256 = "191sg32z1iagyxmbn49i1lpfihld9g9741cw2kj830s4vag4kinx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stock-ticker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stock-ticker";
           sha256 = "1slcjk2avybr4v9s7gglizmaxbb3yqg6s6gdbg12m3vvj3b72lfi";
           name = "stock-ticker";
         };
@@ -52351,7 +52896,7 @@
           sha256 = "1xgsdr75p52vg34s1gm16ffkr3s7gdsln56xjxpdirnwr78glbmw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/strie";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/strie";
           sha256 = "0i1bgjlwcc2ks8hzjkyrw924q4k8pcz8335z9935m73js0sq0lxl";
           name = "strie";
         };
@@ -52372,7 +52917,7 @@
           sha256 = "0nx303bdi8mq18isgf79y8f1cjhqnxv3g3ynm09llrg73qr7r4zw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/string-edit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/string-edit";
           sha256 = "1l1hqsfyi6pp4x4g1rk4s7x9zjc03wfmhy16izia8nkjhzz88fi8";
           name = "string-edit";
         };
@@ -52393,7 +52938,7 @@
           sha256 = "06qs8v2pai3pyg0spmarssmrq06xg9q60wjj46s5xxichlw9pgcf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/string-inflection";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/string-inflection";
           sha256 = "1vrjcg1fa5adw16s4v9dq0fid0gfazxk15z9cawz0kmnpyzz3fg2";
           name = "string-inflection";
         };
@@ -52414,7 +52959,7 @@
           sha256 = "1frdspm1qgksa8cpx5gkj50xk9mgz8202pgp11lqir6l3yjcj3wq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/string-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/string-utils";
           sha256 = "1vsvxc06fd3wardldb83i5hjfibvmiqnxvcgdns7i5i8qlsrsx4v";
           name = "string-utils";
         };
@@ -52432,7 +52977,7 @@
           sha256 = "1sa6wd2z2qkcnjprkkm9b945qz8d0l702sv9w15wl0lngbhw84na";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/strings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/strings";
           sha256 = "0n3239y7biq3rlg74m7nqimhf654w4snnw2zm7z84isgwzz2dphk";
           name = "strings";
         };
@@ -52453,7 +52998,7 @@
           sha256 = "0dxajh72wdcwdb9ydbcm19fmp0p1drmh1niq4r69jnbn8sah0zax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stripe-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stripe-buffer";
           sha256 = "02wkb9y6vykrn6a5nfnimaplj7ig8i8h6m2rvwv08f5ilbccj16a";
           name = "stripe-buffer";
         };
@@ -52473,7 +53018,7 @@
           sha256 = "3547616b9e5694fd09014bbbf29458ee0dea828428b6bf7a6231670aacfb8271";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stumpwm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stumpwm-mode";
           sha256 = "0a77mh7h7033adfbwg2fbx84789962par43q31s9msjlqw15gs86";
           name = "stumpwm-mode";
         };
@@ -52493,7 +53038,7 @@
           sha256 = "242b90e4c403fbcadd40777cd98899c96aab78b84dea88dfa97583b734c9876b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stupid-indent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stupid-indent-mode";
           sha256 = "12y8qxxs04qzy09m734qg0857g4612qdswx2bh9jk7dp886fpd7p";
           name = "stupid-indent-mode";
         };
@@ -52514,7 +53059,7 @@
           sha256 = "1q6wpjb7vhsy92li6fag34pwyil4zvcchbvfjml612aaykiys506";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stylus-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stylus-mode";
           sha256 = "152k74q6qn2xa38v2zyd5y7ya5n26nvai5v7z5fmq7jrcndp27r5";
           name = "stylus-mode";
         };
@@ -52527,15 +53072,15 @@
     subatomic-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "subatomic-theme";
-        version = "20150704.1009";
+        version = "20160126.938";
         src = fetchFromGitHub {
           owner = "cryon";
           repo = "subatomic";
-          rev = "2543881f9bbb8520f845b7fe8f370793c36f7df2";
-          sha256 = "1njfwjyrh9m00jyy65zl31gxa66941mvvrk7nn5yizsbdadrbq0z";
+          rev = "6a4086af748b1ecb27f6ba2aa2614988db16d594";
+          sha256 = "1j63rzxnrzzqizh7fpd99dcgsy5hd7w4d2lpwl5armmixlycl5m8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/subatomic-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/subatomic-theme";
           sha256 = "0mqas67qms492n3hn74c5nrkjpsgf9b42lp02s2dh366c075dpqc";
           name = "subatomic-theme";
         };
@@ -52556,7 +53101,7 @@
           sha256 = "1w7mimyqc25phlww20l49wlafnxp6c7dwibvphg3vwl61g0llpq8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/subatomic256-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/subatomic256-theme";
           sha256 = "1whjlkpkkirpnvvjryhlpzwphr1syz5zfyg4pb66i0db03hxwwcy";
           name = "subatomic256-theme";
         };
@@ -52577,7 +53122,7 @@
           sha256 = "10pirwc7g9vii5cyk4vg6m5g5hlap0yg9w4qy257744c67jmaxvg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/subemacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/subemacs";
           sha256 = "0sqh80jhh3v37l5af7w6k9lqvj39bd91pn6a9rwdlfk389hp90zm";
           name = "subemacs";
         };
@@ -52598,7 +53143,7 @@
           sha256 = "0lhbmcpzpxlqvw4mgh79v9y2f0xqjd1m36dbxcvhb67rwq6nrw3r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sublime-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sublime-themes";
           sha256 = "1nahcfcy831c7w3c69i2na0r8jsdgprffgfdvh4c41cnk4rkgdqj";
           name = "sublime-themes";
         };
@@ -52619,7 +53164,7 @@
           sha256 = "1kpq7kpmhgq3vjd62rr4qsc824qcyjxm50m49r7invgnmgd78h4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sublimity";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sublimity";
           sha256 = "1xwggaalad65cxcfvmy30f141bxhpzc3fgvwziwbzi8fygbdv4nw";
           name = "sublimity";
         };
@@ -52637,7 +53182,7 @@
           sha256 = "1xxf8kgxzcwwjm96isj4zg31vw63ahivr6xch5dw8wsvk0mjks9y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/subr+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/subr+";
           sha256 = "1vrv64768f7rk58mqr4pq1fjyi5n5kfqk90hzrwbvblkkrmilmfs";
           name = "subr-plus";
         };
@@ -52658,7 +53203,7 @@
           sha256 = "09izm28jrzfaj469v6yd1xgjgvy6pmxarcy0rzn2ihn3c0z7mdg4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/subshell-proc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/subshell-proc";
           sha256 = "1fnp49yhnhsj7paj0b25vr6r03hr5kpgcrci439ffpbd2c85fkw2";
           name = "subshell-proc";
         };
@@ -52679,7 +53224,7 @@
           sha256 = "1007xz4x1wgvxilv1qwf0a4y7hd7sqnnzwk2bdr12kfk7vq9cw2b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sudden-death";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sudden-death";
           sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh";
           name = "sudden-death";
         };
@@ -52697,7 +53242,7 @@
           sha256 = "0fpz73r52j7sk1w7my0002wg7isrp54w28nnrwk9xb9il4qpxag2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sudo-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sudo-ext";
           sha256 = "1iirrpa4rnz7rm85yjg60vdfca1ipxbk3qkld8lgwwm242pvvkw3";
           name = "sudo-ext";
         };
@@ -52715,7 +53260,7 @@
           sha256 = "0q5m8d6p9aqbfx17zgznkqw2jgh027xix4894wrdz91670zxd3py";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/summarye";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/summarye";
           sha256 = "1znd96ixg1n90yjiny84igb7m8qsbiibn7s6bky8g6n2k7zzmq65";
           name = "summarye";
         };
@@ -52736,7 +53281,7 @@
           sha256 = "0mhyhkjjwszwl5wzkys9pgvgx9sps9r46k1s1hpzzf4s3vi015mc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sunny-day-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sunny-day-theme";
           sha256 = "1wsfnmmbzzyggzip66vr38yyzy27blxp91wx97bafj7jpg5cyhzw";
           name = "sunny-day-theme";
         };
@@ -52757,7 +53302,7 @@
           sha256 = "1x3ivhwyapxw7v3ygam3bn2i9djrsp9mcd5zdn8q84c583ppanll";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sunshine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sunshine";
           sha256 = "1lxiqw7k8cpq0v6p5whgxgzqrbx3sd9174r0d4qlkrpn6rcp44vv";
           name = "sunshine";
         };
@@ -52778,7 +53323,7 @@
           sha256 = "1b637p2cyc8a83qv9vba4yamzhk08f62zykqh5p35jwvym8wkann";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/suomalainen-kalenteri";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/suomalainen-kalenteri";
           sha256 = "1wzijbgcr3jc47ccr7nrdkqha16s6gw0xiccnmdczi48cvnvvlkh";
           name = "suomalainen-kalenteri";
         };
@@ -52791,15 +53336,15 @@
     super-save = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "super-save";
-        version = "20160114.652";
+        version = "20160131.418";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "super-save";
-          rev = "f3a126a22e2e8c7bc33cd59326c61a172cfffe78";
-          sha256 = "02wgdhb3ap6zp7jw0nf5c0dy8f363r5w00nq4p3h8q40492khgyk";
+          rev = "cf7a60afc6173ba59627f920ecaf6e69942071b8";
+          sha256 = "0jbij0wnw6rylchnhihl82harg29275ljpdh3nmcjnjhk6za60vc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/super-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/super-save";
           sha256 = "0ikfw7n2rvm3xcgnj1si92ly8w75x26071ki551ims7a8sawh52p";
           name = "super-save";
         };
@@ -52820,7 +53365,7 @@
           sha256 = "0m02snzka243adhwwgriml133n4312lhdia3wdqjcq8y2mlp3331";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/supergenpass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/supergenpass";
           sha256 = "0ldy6j6l6rf72w0hl195rdnrabml2a5k91200s186k0r5aja4b95";
           name = "supergenpass";
         };
@@ -52830,6 +53375,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    suscolors-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "suscolors-theme";
+        version = "20160201.1004";
+        src = fetchFromGitHub {
+          owner = "TheSuspiciousWombat";
+          repo = "suscolors-emacs";
+          rev = "d6e7b1a7ac7ee98a9e958702f15bcfb96463aa51";
+          sha256 = "0bwmgmc12rlhcicdy6fhsq96wsvd3hdnz8w545ykiwb5wci52j0m";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/suscolors-theme";
+          sha256 = "08sh20lmhqzpxb55nmqwsfv4xd6sjirh592in7s6vl52r3hl0jkh";
+          name = "suscolors-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/suscolors-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     svg-mode-line-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xmlgen }:
     melpaBuild {
         pname = "svg-mode-line-themes";
@@ -52841,7 +53407,7 @@
           sha256 = "14h40s0arc2i898r9yysn256z6l8jkrnmqvrdg7p7658c0klz5ic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/svg-mode-line-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/svg-mode-line-themes";
           sha256 = "12lnszcb9bl32n9wir7vf8xiyyv7njw4xg21aj9x4dasmidyx506";
           name = "svg-mode-line-themes";
         };
@@ -52862,7 +53428,7 @@
           sha256 = "1kn70570r6x0h1xfs1vr8as27pjfanyhml140yms60gdjb4ssf9r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swap-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swap-buffers";
           sha256 = "0ih5dhnqy3c9nlfz9m2zwy4q4jaam09ykbdqhsxx2hnwjk7p35bw";
           name = "swap-buffers";
         };
@@ -52880,7 +53446,7 @@
           sha256 = "1fkicyjvanh8yk2y27sq075sarcyqhsdz0r4xhillpnv34ji98r5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swbuff-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swbuff-x";
           sha256 = "1wglcxgfr839lynwsl8i7fm70sxxjidy3ib6ibz0kgiwr41rh49y";
           name = "swbuff-x";
         };
@@ -52901,7 +53467,7 @@
           sha256 = "10blwlwg1ry9jznf1a6iss5s0z8sj9gc02ayf5qv92mgxvjhrhdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sweetgreen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sweetgreen";
           sha256 = "1v75wk0gq5fkz8i1r8pl4gqnxbv1d80isyn48w2hxj2fmdn2xhpy";
           name = "sweetgreen";
         };
@@ -52914,15 +53480,15 @@
     swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "swift-mode";
-        version = "20151018.120";
+        version = "20160124.436";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "swift-mode";
-          rev = "a5e1acf5826ccd489617f9255da0aab7e5e920ee";
-          sha256 = "03pxizbw02bp9mp0b0vwiys4vncna73ymmbbmxpw9m6mn1ql2fjv";
+          rev = "1563e8b248bc74613f381e7bd82a43df90064a68";
+          sha256 = "08397a8y8hgyzwny4z9f6kgwy8d37h0iypcjps3l6lhnk35mshv0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swift-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swift-mode";
           sha256 = "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d";
           name = "swift-mode";
         };
@@ -52935,15 +53501,15 @@
     swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "swiper";
-        version = "20160118.710";
+        version = "20160204.837";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "bcb81dde6e1abba02256d716426797a3e1b306f1";
-          sha256 = "0r1i6ck37yq92h7hc9pm6kqlh0751j8jj7vqrligghxk9d42r479";
+          rev = "00f08f74f1568b6f835abadecff32cd7c9a7a556";
+          sha256 = "0hnqw1mhaa7ybldd6mvz9lyv32yspn3x2bgx3fsrh8rhsmns06qh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swiper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swiper";
           sha256 = "13lld7kjz1n1ryxvrfsy0iym5l9m9ybrf7bpcmkzsalpp15j3mvm";
           name = "swiper";
         };
@@ -52964,7 +53530,7 @@
           sha256 = "1fr9vs0574g93mq88d25nmj93hrx4d4s2d0im6wk156k2yb8ha2b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swiper-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swiper-helm";
           sha256 = "011ln6vny7z5vw67cpzldxf5n6sk2hjdkllyf7v6sf4m62ws93ph";
           name = "swiper-helm";
         };
@@ -52985,7 +53551,7 @@
           sha256 = "1zpfilcaycj0l2q3zyvpjbwp5j3d9rrkacd5swzlr1n1klvbji48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/switch-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/switch-window";
           sha256 = "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2";
           name = "switch-window";
         };
@@ -52998,15 +53564,15 @@
     swoop = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, pcre2el }:
     melpaBuild {
         pname = "swoop";
-        version = "20140605.1610";
+        version = "20160120.1115";
         src = fetchFromGitHub {
           owner = "ShingoFukuyama";
           repo = "emacs-swoop";
-          rev = "80a5df8edb86efd9885073b3ec6f475d8b969adf";
-          sha256 = "0qp078q9jrfm0k8sjq6qglfilwgqy1n0bbhyjk3hrf7rjxlkfkx7";
+          rev = "a5e475db7a9f5db02ba3d08cd3c1c3594e2e01d7";
+          sha256 = "10ka6f86n07xlf0z7w35db0mzp2zk4xhr6jd19kjdrn2j0ynlcw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swoop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swoop";
           sha256 = "0r265rwfbl1iyclnspxpbzf2w1q0w8dnc0wv5mz5g6hhcrr0iv6g";
           name = "swoop";
         };
@@ -53027,7 +53593,7 @@
           sha256 = "1q6wpjb7vhsy92li6fag34pwyil4zvcchbvfjml612aaykiys506";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sws-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sws-mode";
           sha256 = "0b12dsad0piih1qygjj0n7rni0pl8cizbzwqm9h1dr8imy53ak4i";
           name = "sws-mode";
         };
@@ -53040,15 +53606,15 @@
     sx = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, json ? null, let-alist, lib, markdown-mode, melpaBuild }:
     melpaBuild {
         pname = "sx";
-        version = "20160106.1852";
+        version = "20160125.1801";
         src = fetchFromGitHub {
           owner = "vermiculus";
           repo = "sx.el";
-          rev = "e850df66ef6d98d6a8733a6e096a8c83c9ad0e3c";
-          sha256 = "1g94lh59sdhsa4xw2cjydzysa6crf81qs6mkdjqv9p9c1dlimya5";
+          rev = "4b8f0c335a6fb055284773dfd480106e8c82fd81";
+          sha256 = "0d0c2i8hh0wrz8vnhxpxzwj7vlrjx6lrb3cx56pn4ny9qyqfzmw3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sx";
           sha256 = "1ml1rkhhk3hkd16ij2zwng591rxs2yppsfq9gwd4ppk02if4v517";
           name = "sx";
         };
@@ -53069,7 +53635,7 @@
           sha256 = "1mb068vgf0bbj0bdxjhd6c794bwc3wp7r6q1s49w8b24g1pfrjkq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/symon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/symon";
           sha256 = "11llnvngyc3xz8nd6nj86ism0hhs8p54wkscvs4yycbakbyn61lz";
           name = "symon";
         };
@@ -53090,7 +53656,7 @@
           sha256 = "030bglxnvrkf1f9grbhd8n11j4c6sxpabpjdr1ryx522v01fvx8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/symon-lingr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/symon-lingr";
           sha256 = "0kyhmw25cn10b4jv2yx7bvp8zkwcswiidpk4amyaisw25820gkv1";
           name = "symon-lingr";
         };
@@ -53111,7 +53677,7 @@
           sha256 = "00lx6081h1nzwga5jg4cik4h667vfkn128yvnhkd0vw7b5g4ji5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sync-recentf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sync-recentf";
           sha256 = "17aji2vcw6zfd823anzwj8pcgyxamxr87bnni085jvlz0vx6gh9c";
           name = "sync-recentf";
         };
@@ -53132,7 +53698,7 @@
           sha256 = "02xnfkmpvjicckmp9is42fnavy9pd95s99zmf1wylxdji2hhpjxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/synonymous";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/synonymous";
           sha256 = "0vawa9qwvv6z1i7vzhkjdl1l9r1yham48yn5y8w8g1xyhxxp6rs5";
           name = "synonymous";
         };
@@ -53150,7 +53716,7 @@
           sha256 = "01l7z6l9pdxzvh851pbq2fn62r28gzwldibffb69jkdln47bph50";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/synonyms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/synonyms";
           sha256 = "0rnq97jpr047gpkxhw22jj3gw09r45vn6fwkzxnxjzcmsyk492d0";
           name = "synonyms";
         };
@@ -53171,7 +53737,7 @@
           sha256 = "1zz9rnwaclr95fpjyabv5rlhk36n2k8f1lzz6yqh964hv8i9562s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/synosaurus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/synosaurus";
           sha256 = "16i2ag4l824h1kq4cy01zf01zrms4v6ldwlsixwfyb1mh97lqljg";
           name = "synosaurus";
         };
@@ -53192,7 +53758,7 @@
           sha256 = "0zi11540wwcl93xcgd2yf6b72zv01zkaqbf1jfbksg82k9038m2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/syntactic-sugar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/syntactic-sugar";
           sha256 = "12b2vpvz5h4wzxrk8jrbgc8v0w6bzzvxcyfs083fi1791qq1rw7r";
           name = "syntactic-sugar";
         };
@@ -53212,7 +53778,7 @@
           sha256 = "1p9bp09nibw7rra3r6nj496zdx09db6k82dxnxs1lfgdiswfdq2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/syntax-subword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/syntax-subword";
           sha256 = "1as89ffqz2h69fdwybgs5wibnrvskm7hd58vagfjkla9pjlpffpm";
           name = "syntax-subword";
         };
@@ -53233,7 +53799,7 @@
           sha256 = "1sxpda380c9wnnf5d72lrcqm6dkihf48cgsjcckzf706cc00ksf4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/syslog-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/syslog-mode";
           sha256 = "15kh2v8jsw04vyh2lmh1ndpxli3cwp6yq66hl8mwb1i3g429az19";
           name = "syslog-mode";
         };
@@ -53254,7 +53820,7 @@
           sha256 = "1hixilnnybv2v3p1wpn7a0ybwah17grawszs3jycsjgzahpgckv7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/system-specific-settings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/system-specific-settings";
           sha256 = "1ydmxi8aw2lf78wv4m39yswbqkmcadqg0wmzg9s8b5h9bxxwvppp";
           name = "system-specific-settings";
         };
@@ -53275,7 +53841,7 @@
           sha256 = "1z7zi0wcms55x0ar9jv02g7gbzsn4k887aigpgv4xghbdiyp7lp0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/systemd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/systemd";
           sha256 = "1biais0cmidy3d0hf2ifdlr6qv1z8k8c8bczi07bsfk4md3idbir";
           name = "systemd";
         };
@@ -53296,7 +53862,7 @@
           sha256 = "0343ss3y9i40y3i9rr7p7bb4k9dj950zyvdv44q1abw2xrfd2xwd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/systemtap-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/systemtap-mode";
           sha256 = "1l2jx6mvph0q2pdlhq7p4vwfw72rfl8k1rwi504bbkr5n5xwhhhz";
           name = "systemtap-mode";
         };
@@ -53317,7 +53883,7 @@
           sha256 = "054l3imxk9ivq361cr15q1wym07mw3s8xzjkzqlihrfvadsq37ym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ta";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ta";
           sha256 = "0kn2k4n0xfwsrniaqb36v3rxj2pf2sai3bmjksbn1g2kf5g156ll";
           name = "ta";
         };
@@ -53338,7 +53904,7 @@
           sha256 = "0lfvgbgvsm61kv5mcjnhnfjcnr7fy1015y0hndkf9xvdlw4hahr4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tab-group";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tab-group";
           sha256 = "1i5lxpf3wmqnqj9mzgcn4gp1gjxp737awrzl1dml5wnarbbj4fs9";
           name = "tab-group";
         };
@@ -53359,7 +53925,7 @@
           sha256 = "0h7sfbca1nzcjylwl7zp25yj6wxnlx8g8a50zc6sg6jg4rggi2fm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tab-jump-out";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tab-jump-out";
           sha256 = "0nlbyzym8l8g9w2xvykpcl5r449v30gal2k1dnz74rq4y8w4rh7n";
           name = "tab-jump-out";
         };
@@ -53380,7 +53946,7 @@
           sha256 = "0n23nnig1lgjamrzsa91p2aplh7gpj2vkp951i9fpf49c6xpyj3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tabbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tabbar";
           sha256 = "1y376nz1xmchwns4fz8dixbb7hbqh4mln78zvsh7y32il98wzvx9";
           name = "tabbar";
         };
@@ -53390,22 +53956,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    tabbar-ruler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, tabbar }:
+    tabbar-ruler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mode-icons, powerline, tabbar }:
     melpaBuild {
         pname = "tabbar-ruler";
-        version = "20160115.1123";
+        version = "20160124.2028";
         src = fetchFromGitHub {
           owner = "mattfidler";
           repo = "tabbar-ruler.el";
-          rev = "dcb480c77632f28b0c6eabfe703911935c44a974";
-          sha256 = "06igfnwih98kp36whw1gb25grj5hkmh4h08dzxg1q1j9wjildb6d";
+          rev = "605bf3b755f228f7a22e440e54a2224ffc06e2e4";
+          sha256 = "1xb9g1qzpsliprcdazr4bk05kfk9dnjazx5hxiv74h33ph1xg4a6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tabbar-ruler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tabbar-ruler";
           sha256 = "10dwjj6r74g9rzdd650wa1wxhqc0q6dmff4j0qbbhmjsxvsr3y0d";
           name = "tabbar-ruler";
         };
-        packageRequires = [ powerline tabbar ];
+        packageRequires = [ mode-icons powerline tabbar ];
         meta = {
           homepage = "http://melpa.org/#/tabbar-ruler";
           license = lib.licenses.free;
@@ -53422,7 +53988,7 @@
           sha256 = "0gy9hxm7bca0l1hfy2pzn86avpifrz3bs8xzpicj4kxw5wi4ygns";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tablist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tablist";
           sha256 = "0c10g86xjhzpmc2sqjmzcmi393qskyw6d9bydqzjk3ffjzklm45p";
           name = "tablist";
         };
@@ -53443,7 +54009,7 @@
           sha256 = "1dbjfq9a7a5s9c18nrp4kcda64jkg5cp8na31kxw0hjcn98dgqa8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tabula-rasa";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tabula-rasa";
           sha256 = "186lph964swg7rs5gvby3p1d0znq9x3xzsmirfb3cdbazvz6hhxi";
           name = "tabula-rasa";
         };
@@ -53464,7 +54030,7 @@
           sha256 = "00hjc6ax4659ww6vygpzzsb3zzr2ddz2z33mkp5j6hmj2s4g2viy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tagedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tagedit";
           sha256 = "0vfkbrxmrw4fwdz324s734zxdxm2nj3df6i8m6lgb9pizqyp2g6z";
           name = "tagedit";
         };
@@ -53485,7 +54051,7 @@
           sha256 = "13zwlb5805cpv0pbr7fj5b4crlg7lb0ibslvcpszm0cz6rlifcvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/take-off";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/take-off";
           sha256 = "05vlajmirbp62rpbdwa2bimpzyl9xc331gg0lhn2rkivc0hma2ar";
           name = "take-off";
         };
@@ -53505,7 +54071,7 @@
           sha256 = "7342a670559cd296dba4b676607641a05d6203255951b17473ccdda4e35713d3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tango-2-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tango-2-theme";
           sha256 = "1a9qmz99h99gpd0sxqb71c08wr8pm3bzsg3p4cvf3vcirvav9lq6";
           name = "tango-2-theme";
         };
@@ -53526,7 +54092,7 @@
           sha256 = "1gfn1yyyb9p2fi17wra1yf2j96cfjw0sifgk3c0vl63h3vmiyvjf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tango-plus-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tango-plus-theme";
           sha256 = "1bx9qcwvybgd0rg8a9rag8xvb5ljrwfnm5nvq793ncvbdvq6vrh5";
           name = "tango-plus-theme";
         };
@@ -53547,7 +54113,7 @@
           sha256 = "00v2y2gfb44kmzfdbp6f4nmxlwn8gf6y3hvgqzggmlbqb5m8hg8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tangotango-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tangotango-theme";
           sha256 = "05cnvyqmh5h5mqys7qs7d9knzxzmi2x0j1avp77x5l5njzzv59s2";
           name = "tangotango-theme";
         };
@@ -53568,7 +54134,7 @@
           sha256 = "1zhr6vrzf511mxrj4fkc9k8wfr1hixn733f5g28j4qzykr4zl2mh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tao-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tao-theme";
           sha256 = "0gl6zzk5ha6vl2xxf5fcnv1k42cw4axdjdcirr1c4r8jwdq3nl3a";
           name = "tao-theme";
         };
@@ -53589,7 +54155,7 @@
           sha256 = "1jp80qywcphql1ngd4fr24lqdfwrw0bw6q9hgq5vmzgjwfxwxwd4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tbx2org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tbx2org";
           sha256 = "1yvkw65la4w12c4w6l9ai73lzng170wv4b8gry99m2bakw3wr8m8";
           name = "tbx2org";
         };
@@ -53610,7 +54176,7 @@
           sha256 = "1xpkrlfqb0np9zyxk41f3pxfkw98ii4q0xh8whq4llv5bmfxynzk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tc";
           sha256 = "13qdnfslnik4f97lz9bxayyhgcp1knh5gaqy00ps863j3vpzjb9s";
           name = "tc";
         };
@@ -53631,7 +54197,7 @@
           sha256 = "1krway6iw62dlr4ak3kj9llqh48xjf3d84nlincap7gkrw886l4q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tco";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tco";
           sha256 = "0hfrzwjlgynk3mydrpmic9mckak37r22fdglrfas6zdihgrg152f";
           name = "tco";
         };
@@ -53652,7 +54218,7 @@
           sha256 = "1jyz6z5bk1gvmknphcnvjvbl329zm8m40yl0a1hfaj8fvhwyzdw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tdd-status-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tdd-status-mode-line";
           sha256 = "0z1q1aw14xq72nfx7mmvz7pr2x4960l45z02jva35zxzvb1mvsgq";
           name = "tdd-status-mode-line";
         };
@@ -53673,7 +54239,7 @@
           sha256 = "0b4cwkwkc4i8lc4j30xc9d6xskm3gqrc2dij60ya75h92aj0lj40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tea-time";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tea-time";
           sha256 = "18fsbh78c5408zg5bk44gxdynp6kn8253xdg7ap2pr3mjknq9kld";
           name = "tea-time";
         };
@@ -53694,7 +54260,7 @@
           sha256 = "16kr1p4lzi1ysd5r2dh0mxk60zsm5fvwa9345nfyrgdic340yscc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/telepathy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/telepathy";
           sha256 = "0c3d6vk7d6vqzjndlym2kk7d2zm0b15ac4142ir03p6f19rqq9pr";
           name = "telepathy";
         };
@@ -53715,7 +54281,7 @@
           sha256 = "0mg870s60by22ripxhqrgxjx16506n4llj9nnxlqgr4mdsi77cf5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/telephone-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/telephone-line";
           sha256 = "0dyh9h1yk9y0217b6rxsm7m372n910vpfgw5w23lkkrwa8x8qpx3";
           name = "telephone-line";
         };
@@ -53736,7 +54302,7 @@
           sha256 = "0sa3chk16s830lqhcd8d3bwdfmjg239ywb7jm6lhwshydssh34nk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term-alert";
           sha256 = "0x4rc1y311ivaj6mlks1j8sgzrrwqn8vx171vw7s1kgf1qzk826n";
           name = "term-alert";
         };
@@ -53757,7 +54323,7 @@
           sha256 = "11xk11i99d17x5bl7glrwj2dhvl3f54slipj034dbf07dd5b2jih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term-cmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term-cmd";
           sha256 = "0fn4f32zpl0p2lid159q59lzjv4xqmc23a64kcclqp9db8b1m5fy";
           name = "term-cmd";
         };
@@ -53778,7 +54344,7 @@
           sha256 = "1ayr34smxf94c09ssdwl4hyhzgahsmbj7j4h25cdm6wcwii2br86";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term+";
           sha256 = "12lvfspqmyrapmbz3x997vf160927d325y50kxdx3s6p81r7n2n8";
           name = "term-plus";
         };
@@ -53799,7 +54365,7 @@
           sha256 = "1dql2w8xkdw52zlrc2p9x391zn8wv4dj8a6293p4s08if7gg260w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term+key-intercept";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term+key-intercept";
           sha256 = "1564a86950xdwsrwinrs118bjsfmbv8gicq0c2dfr827v5b6zrlb";
           name = "term-plus-key-intercept";
         };
@@ -53820,7 +54386,7 @@
           sha256 = "12gfvcf7hl29xhg231cx76q04ll7cvfpvhkb0qs3qn1sqb50fs2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term+mux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term+mux";
           sha256 = "129kzjpi5nzagqkjfikx9i7k6489dy7d3pd7ggn59p4cnh3r2rhh";
           name = "term-plus-mux";
         };
@@ -53841,7 +54407,7 @@
           sha256 = "149pl3zxg5kriydk5h6j95jyly6i23w4w4g4a99s4zi6ljiny6c6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term-run";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term-run";
           sha256 = "1bx3s68rgr9slsw9k01gfg7sxd4z7sarg4pi2ivril7108mhg2cs";
           name = "term-run";
         };
@@ -53862,7 +54428,7 @@
           sha256 = "0gfsqpza8phvma5y3ck0n6p197x1i33w39m3c7jmja4ml121n73d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/termbright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/termbright-theme";
           sha256 = "14q88qdbnyzxr8sr8i5glj674sb4150b9y6nag0dqrxs629is6xj";
           name = "termbright-theme";
         };
@@ -53879,11 +54445,11 @@
         src = fetchFromGitHub {
           owner = "marijnh";
           repo = "tern";
-          rev = "ddb2438867524e422a0baa807cb89cd7403b5622";
-          sha256 = "0w2hnb3yhrzywl9wjz228i4jwj1nn9xfa0b19sc79jwpz7m37rdv";
+          rev = "5d9d95f976402604db161a40103e34ea90665ef0";
+          sha256 = "1lnfibvs2v7byk6l1vpz7nr8jkg3fbs0ijviwxmfjqpjbaglnksv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tern";
           sha256 = "06bgwizn9dcd8hsvimjvb28j0mpxg7rrv9knhv5kkdapa6gggxif";
           name = "tern";
         };
@@ -53900,11 +54466,11 @@
         src = fetchFromGitHub {
           owner = "marijnh";
           repo = "tern";
-          rev = "ddb2438867524e422a0baa807cb89cd7403b5622";
-          sha256 = "0w2hnb3yhrzywl9wjz228i4jwj1nn9xfa0b19sc79jwpz7m37rdv";
+          rev = "5d9d95f976402604db161a40103e34ea90665ef0";
+          sha256 = "1lnfibvs2v7byk6l1vpz7nr8jkg3fbs0ijviwxmfjqpjbaglnksv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tern-auto-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tern-auto-complete";
           sha256 = "0lq924c5f6bhlgyqqzc346n381qf0fp66h50a0zqz2ch66kanni1";
           name = "tern-auto-complete";
         };
@@ -53921,11 +54487,11 @@
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "tern-django";
-          rev = "455326a1732daa58d4d963b0b11bb1a9fd2f2b86";
-          sha256 = "1yb416py93sxnkfnfnbwrlfg68gkp97wpfsrdpc83sai888p44wc";
+          rev = "18cbf415fba5109e311aadb4a6b9d8b12507daa3";
+          sha256 = "061mkj5vhyhl4fav7q0r2yxidh0jcyajznb76slkakk6n2wmv7q0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tern-django";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tern-django";
           sha256 = "1pjaaffadaw8h2n7yv01ks19gw59dmh8bp8vw51hx1082r3yfvv0";
           name = "tern-django";
         };
@@ -53946,7 +54512,7 @@
           sha256 = "0mz2yl9jaw7chzv9d9hhv7gcvdwwvi676y9wpn7vp85hxpda7xg7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/terraform-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/terraform-mode";
           sha256 = "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn";
           name = "terraform-mode";
         };
@@ -53967,7 +54533,7 @@
           sha256 = "1r3fmb8cshgh9pppdvydfcrzlmb9cgz4m04rgv69c5xv8clwcmbr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/test-case-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/test-case-mode";
           sha256 = "1iba97yvbi5vr7gvc58gq2ah6jg2s7apc9ssq7mdzki823n8z2qi";
           name = "test-case-mode";
         };
@@ -53988,7 +54554,7 @@
           sha256 = "125k13sqgxk963c04zn49jidvzx0hl0s4vvc9jpffgq8aq0mnnmr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/test-kitchen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/test-kitchen";
           sha256 = "1bl3yvj56dq147yplrcwphcxiwvmx5n97y4qpkm9imiv8cnjm1g0";
           name = "test-kitchen";
         };
@@ -54009,7 +54575,7 @@
           sha256 = "0h2g02r1spj8vbwgvjn3dddyj89j1qcqzdf2kdggvyyisssj81s3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/test-simple";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/test-simple";
           sha256 = "1l6y77fqd0l0mh2my23psi66v5ya6pbr2hgvcbsaqjnpmfm90w3g";
           name = "test-simple";
         };
@@ -54030,7 +54596,7 @@
           sha256 = "1qcd7vdg63q80zwz8ziaznllq1x7micmljm72s6sh3720rb5aiz2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/textile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/textile-mode";
           sha256 = "0c1l7ml9b1zipk5fhmhirrh070h0qwwiagdk84i04yvdmmcjw2nf";
           name = "textile-mode";
         };
@@ -54051,7 +54617,7 @@
           sha256 = "1b7xxz1i84azmbz8rqpxdn18avmnqlj87hfrpbngbf6pj5h9jqjh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/textmate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/textmate";
           sha256 = "119w944pwarpqzcr9vys17svy1rkfs9hiln8903q9ff4lnjkpf1v";
           name = "textmate";
         };
@@ -54072,7 +54638,7 @@
           sha256 = "1idhhfp0jhnykyms7dp3lfk6imddg6a315pfklbjpcys4y3fdz89";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/textmate-to-yas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/textmate-to-yas";
           sha256 = "04agz4a41h0givfdw88qjd3c7pd418qyigsij4la5f37j5rh338l";
           name = "textmate-to-yas";
         };
@@ -54090,7 +54656,7 @@
           sha256 = "16byw8ix7bjh5ldr8rymisq2bhc5sh7db6rhpf0x28yd6mmzn73v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tfs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tfs";
           sha256 = "10szb9mni37s2blvhl1spj96narmkrv8zhrryw9q1251z8laq5v0";
           name = "tfs";
         };
@@ -54111,7 +54677,7 @@
           sha256 = "0njmn5dy773v9kmwclw1m79rh52xnxl8mswcaagni2z3dvlvw4m8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/theme-changer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/theme-changer";
           sha256 = "1qbmsghkl5gs728q0gaalc7p8q7nzv3l045jc0jdxxnb7na3gc5w";
           name = "theme-changer";
         };
@@ -54132,7 +54698,7 @@
           sha256 = "1kd4mazrcy5xamkvvrwsmcx63g0gp5w4264kxbk3d25bjqcf8rmj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/theme-looper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/theme-looper";
           sha256 = "02hz9k4ybpp4i8ik2av9rg240sjgicbf6w24zn67dmw4nc4lp9c5";
           name = "theme-looper";
         };
@@ -54153,7 +54719,7 @@
           sha256 = "12kz4alyf3y2i7lkvi26hcxy55v0blsrxv5srx9fv5jhxkdz1vq1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/therapy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/therapy";
           sha256 = "0y040ghb0y6aq0nchqr09vapz6h6112rkwxkqsx0v7xmqrqfjvhh";
           name = "therapy";
         };
@@ -54171,7 +54737,7 @@
           sha256 = "0zcyasdzb7dvmld8418cy2mg8mpdx01bv44cm0sp5950scrypsaq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thesaurus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thesaurus";
           sha256 = "1nyjk9jr1xvdkil13ylfsgg7q2sx71za05gi8m2v5f45pbmbi50h";
           name = "thesaurus";
         };
@@ -54190,7 +54756,7 @@
           sha256 = "1nclwxb63ffbc4wsga9ngkfcxsw88za0c4663fh9x64rl4db4hn8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thing-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thing-cmds";
           sha256 = "133bm2cw9ar6m2amj0rrq4wbj9c3zl61gaprx0vlasxj2cyxs7yw";
           name = "thing-cmds";
         };
@@ -54208,7 +54774,7 @@
           sha256 = "0ijz0mj095wycpc3as5fiikrwazljk0c04rh089ch0mzc95g3vqq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thingatpt+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thingatpt+";
           sha256 = "0w031lzjl5phvzsmbbxn2fpziwkmdyxsn08h6b9lxbss1prhx7aa";
           name = "thingatpt-plus";
         };
@@ -54229,7 +54795,7 @@
           sha256 = "0imzrb3vqnm36illqnpfc6x7rbq9rrrlpcw9n2yzl4n309mqdwr6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thingopt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thingopt";
           sha256 = "0yvzq1z2nrldr8vhcvxqgzvh4gbrjjwfmprg59p4v5hlxvhxsb1y";
           name = "thingopt";
         };
@@ -54250,7 +54816,7 @@
           sha256 = "0rjcrvw9v2y10ahycra53bwbccpwqxxwn2c21wjj1kfs0kdwhs9p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thread-dump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thread-dump";
           sha256 = "0dzr86jyf2j49gq40q6qd6lppa57n65n94xzpdjjbs182hxzavp2";
           name = "thread-dump";
         };
@@ -54267,11 +54833,11 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "e917a278d836ad9cceba8ea5054346b22b3bbbb7";
-          sha256 = "0vp076m7lydl19rk7f7fa9lmlwn5dczc3g79y6pyxyhqsdr6sa3f";
+          rev = "c1a78ba6d5ff0c015768a5b0969112895b4e7723";
+          sha256 = "1dq9a26vvv3a9nkdf7yb42a4dklg91g2wpnh3yv1zdcxh8hk2nx5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thrift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thrift";
           sha256 = "0p1hxmm7gvhyigz8aylncgqbhk6cyf75rbcqis7x552g605mhiy9";
           name = "thrift";
         };
@@ -54290,7 +54856,7 @@
           sha256 = "0nyp1sp55l3mlhlxw8kyp6hxan3rbgwc4fmfs174n6hlj3zr5vg8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thumb-frm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thumb-frm";
           sha256 = "1fjjd80drm8banni909lww9zqazr1kk9m40xwwa1ln2zicaf091c";
           name = "thumb-frm";
         };
@@ -54311,7 +54877,7 @@
           sha256 = "0nypcryqwwsdawqxi7hgsv6fp28zqslj9phw7zscqqxzc3svaywn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thumb-through";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thumb-through";
           sha256 = "1krn7zn2y8p51m8dxai5nbrwbdviz6zrjzz0kykya9cqz4n9dhln";
           name = "thumb-through";
         };
@@ -54324,15 +54890,15 @@
     tide = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20151201.245";
+        version = "20160130.243";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "0c0f95b9e5abdbe60ccfcefc81f02178bfa940ab";
-          sha256 = "045c1fmmig88lc7c85vy8532mx0lhl666m5lrrv4i6r5n6sf68s3";
+          rev = "a68c70c3eebaa15394d96978019186b4d0a6aac2";
+          sha256 = "1qgnmsvslyqip0x8k6yd7cl47c9biyxwqk69hnsvpjjbsv2l3y8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tide";
           sha256 = "1z2xr25s23sz6nrzzw2xg1l2j8jvjhxi53qh7nvxmmq6n6jjpwg1";
           name = "tide";
         };
@@ -54350,7 +54916,7 @@
           sha256 = "0psci55a3angwv45z9i8wz8jw634rxg1xawkrb57m878zcxxddwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tidy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tidy";
           sha256 = "09xb2k3k99hp3m725f31s6hlaxgl4fsaa1dylahxvdfddhbh290m";
           name = "tidy";
         };
@@ -54368,7 +54934,7 @@
           sha256 = "0kxgzjwgd979aypjak07k8ss6hnm3x9f96z1rz2zsz2i3vvh6sqv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/time-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/time-ext";
           sha256 = "15b3m1jvr7kg5sc4c8cp0aaiiyivfx8ip1zf7w5m702krv4lfvpk";
           name = "time-ext";
         };
@@ -54389,7 +54955,7 @@
           sha256 = "1hidvbd1xzz9m0fc55wac1mpv4dpcf8qnw1myh3646bfvivj9c2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/timer-revert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/timer-revert";
           sha256 = "0lvm2irfx9rb5psm1lf53fv2jjx745n1c172xmyqip5xwgmf6msy";
           name = "timer-revert";
         };
@@ -54410,7 +54976,7 @@
           sha256 = "1ghvnmswq6rg17pjnys58mak6crfcvv1vb6q7spagq143y2ar24z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/timesheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/timesheet";
           sha256 = "1gy6bf4wqvp8cw2wjnrr9ijnzwav3p7j46m7qrn6l0517shwl506";
           name = "timesheet";
         };
@@ -54431,7 +54997,7 @@
           sha256 = "0rf177kr0qfhg8g5xrpi405dhp2va1yk170zm3f8hghi2575ciy2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tinkerer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tinkerer";
           sha256 = "0qh6pzjn98jlpxcm9zf25ga0y3d3v53275a9zgswyhz33mafd7pd";
           name = "tinkerer";
         };
@@ -54452,7 +55018,7 @@
           sha256 = "0mmz8b0fzffybc2jws9fif982zfx0l6kn1l4qxc67mf9nafbdca3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tiny";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tiny";
           sha256 = "183qczyb6c8zmdgmsjsj4hddmvnzzq4c7syslm861xcyxia94icy";
           name = "tiny";
         };
@@ -54473,7 +55039,7 @@
           sha256 = "1n8cn6mr26hgmsm2mkbj5gs6dv61d0pap8ija4g0n1vsibfhzd8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tinysegmenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tinysegmenter";
           sha256 = "005yy2f8vghvwdcwakz5sr9n1gzk6cfyglm6d8b74y90d8fng0r6";
           name = "tinysegmenter";
         };
@@ -54494,7 +55060,7 @@
           sha256 = "1wr8m7yivz4z8rsiiqdlvdv3s2i0japvbpsz3x7nxr1y75fax2mz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tj-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tj-mode";
           sha256 = "1i7dvxgj00p4n2fh8irgdfsjl2dpvfjjnkkv0cw71441f79p79mf";
           name = "tj-mode";
         };
@@ -54507,15 +55073,15 @@
     tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tldr";
-        version = "20160116.1131";
+        version = "20160203.1020";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "tldr.el";
-          rev = "138725e0849b698914502adb5240e700b7927cf2";
-          sha256 = "11316dz3f44qvla120hb7hwsj3968670ipf9y1k0wvc53vxc0aqq";
+          rev = "56b0cefcbc0e81f94652f8e17b34b0dfadc8e7c4";
+          sha256 = "1qwd84fmgifs12xw02mlrpkyvmxa58c0xfk0zjsnxb7nldfmbbj7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tldr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tldr";
           sha256 = "1f1xsmkbf4j1c876qqr9h8fgx3zxjgdfzvzf6capxlx2svhxzvc9";
           name = "tldr";
         };
@@ -54534,7 +55100,7 @@
           sha256 = "0pq9x73hrp7qwhms7x3dvjfh9imapglba9yd7nkyw68mc0b9wlnl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tmmofl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tmmofl";
           sha256 = "1hqv2xqnhwnbj4sqcbdial4987yj1y3ry7niaaz2hh0f5qzrzwa8";
           name = "tmmofl";
         };
@@ -54555,7 +55121,7 @@
           sha256 = "0gzv45yxjy0bkdnx9kki0svmc7gxrdaarblvi1pyvl7id31ssw70";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/toc-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/toc-org";
           sha256 = "06mx2b0zjck82vp3i4bwbqlrzn05i2rkf8080cn34nkizi59wlbs";
           name = "toc-org";
         };
@@ -54573,7 +55139,7 @@
           sha256 = "0fhlyjl0a3fd25as185j6dmch0wsrf1zc59q29lhjximg9lk3hr5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/todochiku";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/todochiku";
           sha256 = "1iq08s5ji6hd8as80qxqkbavnjbx0kcmmjjvhjchmvv93vsn1f96";
           name = "todochiku";
         };
@@ -54594,7 +55160,7 @@
           sha256 = "0ms4mapjg9mbpmcmpn68r0mhwaibwfr4v25sin74b2281h4q7gal";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/todotxt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/todotxt";
           sha256 = "13jcbkasvcczf7qnrh89ncqp6az6hm1s0ycrv7msva145n5bk1kr";
           name = "todotxt";
         };
@@ -54615,7 +55181,7 @@
           sha256 = "1k9ywi7cdgb6i600wr04r2l00423l6vr7k93qa7i7svv856nbbc7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/todotxt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/todotxt-mode";
           sha256 = "1bs4air13ifx3xkhcfi80z29alsd63r436gnyvjyxlph2ip37v7k";
           name = "todotxt-mode";
         };
@@ -54636,7 +55202,7 @@
           sha256 = "1falf86mm2206szkkwiwa5yk65y12asv84j1pdbcy6n8y6hha796";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/togetherly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/togetherly";
           sha256 = "01ks160dfmgh05lx0lmyg020hba8nw49mj51dp1afcsmx4dkis2f";
           name = "togetherly";
         };
@@ -54657,7 +55223,7 @@
           sha256 = "109il2s5ynfam510yli4xmi5zgw7xhr5gv096li24idqdp0gpf9n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/toggle";
           sha256 = "08lk8h2dk5s8k93j5vmxdlgg453pif8wbcx2w3xkjlh43dw1vdfq";
           name = "toggle";
         };
@@ -54678,7 +55244,7 @@
           sha256 = "1w1lmqgzn9bp59h9y9plv80y53k6qhjgfmnnlqyyqfl45z3si7kg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/toggle-quotes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/toggle-quotes";
           sha256 = "16w453v4g7ww93bydim62p785x7w4vssp9l5liy0h3ppfmgvmxhp";
           name = "toggle-quotes";
         };
@@ -54699,7 +55265,7 @@
           sha256 = "0sgaslqxj806byidh06h5pqmqz8jzjfz9ky8jvkif3cq3a479jby";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/toggle-test";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/toggle-test";
           sha256 = "0n8m325jcjhz8g75ysb9whsd12gpxw8598y5065j7c7gxjzv45l1";
           name = "toggle-test";
         };
@@ -54720,7 +55286,7 @@
           sha256 = "0f86aij1glmvgpbhmfpi441zy0r37zblb0q3ycgq0dp92x8yny5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/toggle-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/toggle-window";
           sha256 = "1z080jywqj99xiwbvfclr6gjkc6spr3dqjb9kq1g4971vx4w8n9g";
           name = "toggle-window";
         };
@@ -54741,7 +55307,7 @@
           sha256 = "0a3zvhy3jxs88zk4nhdc7lzybz4qji9baw5gm88sxlgcjgn7ip6n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tomatinho";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tomatinho";
           sha256 = "1ad3kr73v75vjrc09mdvb7a3ws834k5y5xha3v0ldah38cl1pmjz";
           name = "tomatinho";
         };
@@ -54762,7 +55328,7 @@
           sha256 = "1b3bkla6i5nvanifxchph6ab6ldrskdf240hy4d27dkmmnr3pban";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/toml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/toml";
           sha256 = "0kqv6zkywa7kqh8kg1dzcgkbi91lwx335przdakndm1lfai38i9b";
           name = "toml";
         };
@@ -54783,7 +55349,7 @@
           sha256 = "1w9vkh6c4g80zykcy77k3r0bdc99mq8yh58bqkyd6gsr7pnp16gj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/toml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/toml-mode";
           sha256 = "0yghf2ixl3dkcaxnkr4qzxfa9k1rrac7w5qpw1jx2bvic0cfs40l";
           name = "toml-mode";
         };
@@ -54804,7 +55370,7 @@
           sha256 = "0pwbd5gzmpr6js20438870w605671930291070nhmhswvxfcdvay";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tommyh-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tommyh-theme";
           sha256 = "0nb9r407h08yxxdihxqx0c645bcz6qywbh2l654s3zfzdsqi1aj4";
           name = "tommyh-theme";
         };
@@ -54822,7 +55388,7 @@
           sha256 = "1sqflxj3hzxdlwn5qmpqm4dwik5vsyp7lypkvshcghdplxymb38a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tool-bar+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tool-bar+";
           sha256 = "07nsas600w5kxx7yzg52ax9avry8kq429mqlrs38jg5ycf3b1l6d";
           name = "tool-bar-plus";
         };
@@ -54840,7 +55406,7 @@
           sha256 = "0a5rl1cgznycqwx4r48mh69lgm8ixbnlfzbqdyvclgm8fldbannn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/top-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/top-mode";
           sha256 = "0hrjlbiz827v9yf4086wlghw64rhvvlsbzv8lzs6pprdwbpr9pdx";
           name = "top-mode";
         };
@@ -54861,7 +55427,7 @@
           sha256 = "0wv49gn1daylnjmnallpqsqy7630ynrp45agpiwi6kwyyqk1kdvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tornado-template-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tornado-template-mode";
           sha256 = "1sdv9rlhnabydws2sppsjcgqr0lg6bjapv753ksq5aaq21qsps0h";
           name = "tornado-template-mode";
         };
@@ -54882,7 +55448,7 @@
           sha256 = "188cdgic25wrb4jdgdcj070a0pxsh3m0rd9d2r6i1s1n1nalrs6g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/totd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/totd";
           sha256 = "1bp07xl9yh9x6bi6cn8wz11x90jhv1rhxaig540iydjn5b0ny9m0";
           name = "totd";
         };
@@ -54903,7 +55469,7 @@
           sha256 = "16217i8rjhgaa5kv8iq0s14b42v5rs8m2qlr60a0x6qzy65chq39";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tox";
           sha256 = "1z81x8fs5q6r19hpqphsilk8wdwwnfr8w78x5x298x74s9mcsywl";
           name = "tox";
         };
@@ -54923,7 +55489,7 @@
           sha256 = "0hfzbrw9ik3yxdwmgsm80k0n045z6az6pgvxc1nqcjmiwh80h9mk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/toxi-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/toxi-theme";
           sha256 = "032m3qbxfd0qp81qwayd5g9k7vz55g4yhw0d35qkxzf4qf58x9sd";
           name = "toxi-theme";
         };
@@ -54944,7 +55510,7 @@
           sha256 = "1yh9dxf986dl74sgn71qxwxsg67lr0yg1z7b9h2254lmxq0mgni6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/traad";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/traad";
           sha256 = "08gxh5c01xfbbj9g4992jah494rw3d3bbs8j79r3mpqxllkp2znf";
           name = "traad";
         };
@@ -54967,11 +55533,11 @@
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "c9862e432d2dad7cd568d79dbe49849245333fb1";
-          sha256 = "1l6lm3i02r0b8ng0n3rckgk0q38wjng41dqbx148bjxfq44cpghz";
+          rev = "35618a1e890dfff7bc3c879e4f0e23868d00bf85";
+          sha256 = "1qw8ax3a1v1053qh9i41ci93hc4034ghlcwq8hldr3amsz344fhj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tracking";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tracking";
           sha256 = "096h5bl7jcwz5hpbm2139bf8a784hijfy40vzf42y1c9794al46z";
           name = "tracking";
         };
@@ -54992,7 +55558,7 @@
           sha256 = "1m25l1lyff4h0h4vjrcsziwbf8svqg2llvvgl8i2b4jbh7k7pk5f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tracwiki-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tracwiki-mode";
           sha256 = "1k983f0lj42rxr5szpq9l9harykfn8jr13y3y6fav86zzd1fb8j0";
           name = "tracwiki-mode";
         };
@@ -55013,7 +55579,7 @@
           sha256 = "057a3z42j4s0npl35p5rl6n767s2wq0a3c49wii3f1w8p40fh7qc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tramp-hdfs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tramp-hdfs";
           sha256 = "1l7s2z8yk3cbnffig9fds75jkjlkng76qglx5ankzva61dz1kf2b";
           name = "tramp-hdfs";
         };
@@ -55034,7 +55600,7 @@
           sha256 = "0cgx6h9a49qj7x6bgsnsa20hi1yj5k080x4x0jpn6l9bj5nqiaip";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tramp-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tramp-term";
           sha256 = "1vbdwj8q66j6h5ijqzxhyaqf8wf9rbs03x8ppfijxl5qd2bhc1dy";
           name = "tramp-term";
         };
@@ -55047,15 +55613,15 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "20160114.1501";
+        version = "20160202.1601";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "c09102856740d3a67abcbc456a3488d6d8899897";
-          sha256 = "0iirqfjai330jw71pd6pqyhzl78k2y5psxiaw2nbgiq32rhn7whg";
+          rev = "ee474457b249b0ec86cb3c222ae9368887bbf483";
+          sha256 = "1fqcqbs4pdbbn8ldn4rsc9akgd9sr8ckqkin2vr7dzhxm8ds5b9k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/transmission";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/transmission";
           sha256 = "0w0hlr4y4xpcrpvclqqqasggkgrwnzrdib51mhkh3f3mqyiw8gs9";
           name = "transmission";
         };
@@ -55073,7 +55639,7 @@
           sha256 = "1f67yksgw9s6j0033hmqzaxx2a93jm11sd5ys7cc3li5gfh680m4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/transpose-frame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/transpose-frame";
           sha256 = "0bqip7vckic3kfq3d31ifs1zics1djxwj2jadafj6f1agv02sdz5";
           name = "transpose-frame";
         };
@@ -55094,7 +55660,7 @@
           sha256 = "03wc50vn1kmrgnzzhs06pwpap2p2rx84wwzxw0hawsg1f1l35m2x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/transpose-mark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/transpose-mark";
           sha256 = "1q1icp1szm1bxz9ywwyrfbsm1wmx0h4cvzywrh9q0fj1fq387qvv";
           name = "transpose-mark";
         };
@@ -55115,7 +55681,7 @@
           sha256 = "1jd7xsvs4m55fscp62a9lk59ip4sgifv4kazl55b7543nz1i31bz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/travis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/travis";
           sha256 = "1km496cq1vni9gy2d3z4c9524q62750ywz745rjz4r7178ip9mix";
           name = "travis";
         };
@@ -55133,7 +55699,7 @@
           sha256 = "0hffnzvzbvmzf23z9z7n7y53l5i7kza9hgfl39qqcnw4njg48llx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tree-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tree-mode";
           sha256 = "0xwyhlc5lagj46nd70l81rvb43hs08pic96grk62zknig8354c24";
           name = "tree-mode";
         };
@@ -55154,7 +55720,7 @@
           sha256 = "08484fhc69rk16g52f9bzc1kzpif61ddfchxjbj1qqqammbx11ym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/trident-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/trident-mode";
           sha256 = "0l81hs7bp46jlk41b9fk1lkvlp17fqc5hcz8k8kkal7rh7ari1fd";
           name = "trident-mode";
         };
@@ -55175,7 +55741,7 @@
           sha256 = "06wm3qwxjhzwjn9nnrqm5wwj1z5gfghg9d2qbg8w3zyqzva5dmvm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tronesque-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tronesque-theme";
           sha256 = "1bk73zawl1922aq739r3rz30flxd6nq87k8ahzbix139g7gxf19j";
           name = "tronesque-theme";
         };
@@ -55196,7 +55762,7 @@
           sha256 = "1mm6rrprsmx4hc622qmllm7c81yhwbqmdr0n6020krq92zmilmlm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/truthy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/truthy";
           sha256 = "1a56zmqars9fd03bkqzwpvgblq5fvq19n4jw04c4hpga92sq8wqg";
           name = "truthy";
         };
@@ -55209,15 +55775,15 @@
     try = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "try";
-        version = "20150608.411";
+        version = "20160204.1255";
         src = fetchFromGitHub {
           owner = "larstvei";
           repo = "Try";
-          rev = "464cfb73599c88a4b57c83adfa93173c41d28a35";
-          sha256 = "05nzchk7jia9g7b3ww4m3rgg0aylrfkpiz13cylv2bk79rwhzifc";
+          rev = "d50b4b5550cae33910f9ff4ee6586599830d2fe2";
+          sha256 = "1i2bw3d834ibk3aj16rcs8g81r7n5qa37g8k7lgpl255mfpyfzlq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/try";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/try";
           sha256 = "0dv0i77agva215bf1gj1x1k7f7g3pvccyyd7vslapf9z8brccn7n";
           name = "try";
         };
@@ -55238,7 +55804,7 @@
           sha256 = "1bk5v9dffs65qsay0dp336s2ly065nd0cg572zz058ikwxd44zd3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tss";
           sha256 = "0d16x5r2xfy6mrwy0mqzpr9b3inqmyyxgawrxlfh83j1xb903dhm";
           name = "tss";
         };
@@ -55259,7 +55825,7 @@
           sha256 = "1gvqxk67cf779szyg907815i4m9jzrpmn5cnsmnwd62k3r3z4nxm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tt-mode";
           sha256 = "02dzyycn5znbibbz50b243bh1kcccp8xwknjqwljk00gpf196vzf";
           name = "tt-mode";
         };
@@ -55280,7 +55846,7 @@
           sha256 = "0a8f9p1im6k7mnp2bq733rfx2x246gfwpvi5ccym1y5lakx37fil";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ttrss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ttrss";
           sha256 = "08921cssvwpq33w87v08dafi2rz2rl1b3bhbhijn4bwjqgxi9w7z";
           name = "ttrss";
         };
@@ -55301,7 +55867,7 @@
           sha256 = "0knp7nbzhzahkn97zs2aw0ly7x40cbh8m5xb4rk1ynw0n09zq3d0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tuareg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tuareg";
           sha256 = "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q";
           name = "tuareg";
         };
@@ -55322,7 +55888,7 @@
           sha256 = "1xdkgvr1pnlg3nrjmma4ra80ysr8xbslvczg7cq1x1mqw6gn9xq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tumble";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tumble";
           sha256 = "1c9ybq0mb2a0pw15fmm13vfwcnr2h9fb1xsm5nrff1cg7913pgv9";
           name = "tumble";
         };
@@ -55343,7 +55909,7 @@
           sha256 = "1g7y7czan7mcs5lwc5r6cllgksrj3b9lpn1bj7khwkd1ll391jc2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tumblesocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tumblesocks";
           sha256 = "11ky69icsnxwsinv2j3f4c0764wm6i9g9mlvwsdrd6w1lchq1dg9";
           name = "tumblesocks";
         };
@@ -55364,7 +55930,7 @@
           sha256 = "0y1b9zvwbw3vp41siyzj04bis939fgz3j27hc5ljjzy92kd39nzm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tup-mode";
           sha256 = "0pzpn1ljfcc2dl9fg7jc8lmjwz2baays4axjqk1qsbj0kqbc8j0l";
           name = "tup-mode";
         };
@@ -55385,7 +55951,7 @@
           sha256 = "0khl4q22x6vdn87xdqqg5f535d4dqpnfbhk6qhlh187p1w7qaiq4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/turnip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/turnip";
           sha256 = "1vfqv71j47fn53klz3jl8r8hscywd01kkl4w96a308sac3lhbrps";
           name = "turnip";
         };
@@ -55406,7 +55972,7 @@
           sha256 = "0wvmih2y3hy7casxx2y1w8csmzfnfgbb5ivpggr94sc86p6bg8sa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/twig-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/twig-mode";
           sha256 = "1m3xjgmkqg8aj536wcg2f2hf4y6whscbsh7z7448hl4b5qjwii4n";
           name = "twig-mode";
         };
@@ -55427,7 +55993,7 @@
           sha256 = "1bj2mpiklqcangjzbnz5wz7klsfvp0x397lidvf42awn7s2aax0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/twilight-anti-bright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/twilight-anti-bright-theme";
           sha256 = "1qfybk5akaxdahmjffqaw712v8d7kk4jqkj3hzp96kys2zv1r6f9";
           name = "twilight-anti-bright-theme";
         };
@@ -55448,7 +56014,7 @@
           sha256 = "1awqc4rvg8693myynb1d4y4dfdaxkd5blnixxs3mdv81l07zyn8c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/twilight-bright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/twilight-bright-theme";
           sha256 = "074cqs55gwy5jlaay3m9bpdpdfb45nmlijvapz96nibl64pyk83d";
           name = "twilight-bright-theme";
         };
@@ -55469,7 +56035,7 @@
           sha256 = "0d7vd1h0rwwgrh7f9kmdgy2ni0p20da9c8ylwlg33nsb26345wfs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/twilight-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/twilight-theme";
           sha256 = "1wkca66q4k94h9njsy15n83wjzn90rcbmv44x0hdwqj92yxjf3y7";
           name = "twilight-theme";
         };
@@ -55490,7 +56056,7 @@
           sha256 = "02c9z229ayqnmlvja5a2fz3vk8914v9v8akin57q8a0gyzn2bli5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/twittering-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/twittering-mode";
           sha256 = "0v9ijxw5jazh2hc0qab48y71za2l9ryff0mpkxhr3f79irlqy0a1";
           name = "twittering-mode";
         };
@@ -55511,7 +56077,7 @@
           sha256 = "1i826xq77nh4s7qlj63r2iznbn319l1l3fzpbjb2nj0m00bwvxl6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/typed-clojure-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/typed-clojure-mode";
           sha256 = "1579zkhk2lwl5ij7dm9n2drggs5fmhpljrshc4ghhvig7nlyqjy3";
           name = "typed-clojure-mode";
         };
@@ -55524,15 +56090,15 @@
     typescript-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "typescript-mode";
-        version = "20150830.2028";
+        version = "20160126.608";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "typescript.el";
-          rev = "49241bcc1f60b3787ccd9448a559f792156907a9";
-          sha256 = "16y1r8080scjanbd95hpgk9lp8xqy8cxwkk9xij53jiqfglcwi5c";
+          rev = "d81cc7278276b8d3a163e14fe5396126eff0475d";
+          sha256 = "17q7f433x8i484scwdbfsd0vh8lshzkwjlarhqw6ic53mzakgjiq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/typescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/typescript-mode";
           sha256 = "01jyqy44ir59n9c2f6gh4xzwfmzdpnys1lw4lnsy6kirqgbsq9ha";
           name = "typescript-mode";
         };
@@ -55550,7 +56116,7 @@
           sha256 = "0mgvpdp3vlvjy32d163h2mzsf9j2ij2f542sdr3rsy8l80n6nx31";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/typing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/typing";
           sha256 = "0b72lbzji105wzvsi58l6pjc08qcwrm5ddf42irdxi956081pzp3";
           name = "typing";
         };
@@ -55571,7 +56137,7 @@
           sha256 = "0i5pipciwsl6cj3inxiz6ybkv5jglacjwhcyqdfzi4mrbic7g848";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/typing-game";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/typing-game";
           sha256 = "0k85j9bcqp0gbzdh44q5a9wlkv5mc0g0m42ziq1bzmp6993wkmy2";
           name = "typing-game";
         };
@@ -55584,15 +56150,15 @@
     typo = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "typo";
-        version = "20150910.843";
+        version = "20160121.530";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "typoel";
-          rev = "da7e6784a987fbff804f35e402df372ac4b013b2";
-          sha256 = "1q4yg0rmw39qykrg5cga5ab8gbnxzig4wczxqrap0470nhdbms3h";
+          rev = "f7d07cedf90ce65f226a66c428c0788d2bd7b912";
+          sha256 = "0bn1bvs334wb64bli9h613zf1vzjyi0pz8bgyq1wy12qmbwwmfwk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/typo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/typo";
           sha256 = "07hmqrnbxbrhcbxdls8i4786lkqmfr3hv6va41xih1lxj0mk60bx";
           name = "typo";
         };
@@ -55613,7 +56179,7 @@
           sha256 = "1v8d1pc0vjc7wz0prr5w5vp2qb19f3gcyl6jx5130plajbvv23rc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ubuntu-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ubuntu-theme";
           sha256 = "160z59aaxb2v6c24nki6bn7pjm9r4jl1mgxs4h4sivzxkaw811s2";
           name = "ubuntu-theme";
         };
@@ -55631,7 +56197,7 @@
           sha256 = "0qy211rxrmzhwl9qfrcmfnwayysvb5rghjginbvx3wf2s6hrbpya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ucs-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ucs-cmds";
           sha256 = "1n0f0qf8w8ark78fs67aaxnqpk0km97hy59pnxwfyahgjl2qz6d1";
           name = "ucs-cmds";
         };
@@ -55652,7 +56218,7 @@
           sha256 = "0qw9vwl1p0pjw1xmshxar1a8kn6gmin5rdvvnnly8b5z9hpkjf3m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ucs-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ucs-utils";
           sha256 = "111fwg2cqqzpa79rcqxidppb12c8g12zszppph2ydfvkgkryb6z2";
           name = "ucs-utils";
         };
@@ -55673,7 +56239,7 @@
           sha256 = "19qvn1vzal5k86pqn6a4ins869qmp2i586qqbl97z84szn8mn7j3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/uimage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/uimage";
           sha256 = "0i6qpk6v4pmpk3zswygdy0dd7rxy8kl7qn8a1xanpi4aqg7wlbmd";
           name = "uimage";
         };
@@ -55694,7 +56260,7 @@
           sha256 = "0cryprvns1qdnp2qif2g187lj15810w472m7nwrfiwgvqv4v3p1l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ujelly-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ujelly-theme";
           sha256 = "0b7zgmpsdn5p3jx4kif7phxz8pb85snmmfr3yz98xf6p7h6w60gw";
           name = "ujelly-theme";
         };
@@ -55715,7 +56281,7 @@
           sha256 = "033v4ck979lhkpwblci5clacfc1xnkq03p5d1m566wff8dp5flwz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ukrainian-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ukrainian-holidays";
           sha256 = "0kbfj2l1rcv74c88nabkwkcl7k9pkim835l24q61zv3i6wf9sykf";
           name = "ukrainian-holidays";
         };
@@ -55733,7 +56299,7 @@
           sha256 = "0i5km1naxprd4lj20097ph50mjs2364xwxcdw0j3g5569mk5nc06";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unbound";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unbound";
           sha256 = "1ys6pgb3lhx4ihhv8i28vrchp1ad37md7lnana40macf5n72d77x";
           name = "unbound";
         };
@@ -55754,7 +56320,7 @@
           sha256 = "0366h4jfi0c7yda9wcrz4zxgf2qqdd08b8z2dr8c1rkvkdd67iam";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/uncrustify-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/uncrustify-mode";
           sha256 = "0amdxdfc8i99zjrw4iqmxzb47h0airs60fwmc32bc8b0ds66c3kd";
           name = "uncrustify-mode";
         };
@@ -55775,7 +56341,7 @@
           sha256 = "1qm6fzgmrdzhkajd60l4l890dlbxll96x41kx36wm97h4gz7aiyw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/undercover";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/undercover";
           sha256 = "1s30c3i6y4r3mgrrs3lda3rrwmy9ff11ihdmshyziv9v5879sdjf";
           name = "undercover";
         };
@@ -55796,7 +56362,7 @@
           sha256 = "1ypxpv5vw2ls757iwrq3zld6k0s29q3kg3spcsl5ks4aqpnkxpva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/underwater-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/underwater-theme";
           sha256 = "0ab2bcqfdi9ml3z9d511pbfwcbp8hkkd36xxp61k36gkyi3acvlr";
           name = "underwater-theme";
         };
@@ -55816,7 +56382,7 @@
           sha256 = "1ef5db7cf476dd37348fd1f11dd199613a89a2351dc583a42afd9d35a53d8ae2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/undo-tree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/undo-tree";
           sha256 = "0vrjxprpk854989wcp4wjb07jhhxqi25p6c758gz264z3xa8g9cr";
           name = "undo-tree";
         };
@@ -55837,7 +56403,7 @@
           sha256 = "1c0daw246ky7b1x5b8h55x79pl1pjqk1k348l487bdd8zdj4w9wx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/undohist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/undohist";
           sha256 = "0zzfzh8sf2dkz8h3kidv7zmwz2c2qq9n9qz2mab2lk0y44njzwhn";
           name = "undohist";
         };
@@ -55858,7 +56424,7 @@
           sha256 = "0fd9k5m1yw2274m2w9rkrg7vqagzf0rjbybglqi7d200b3hmjin3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unfill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unfill";
           sha256 = "0b21dk45vbz4vqdbdx0n6wx30rm38w1jjqbsxfj7b96p3i5shwqv";
           name = "unfill";
         };
@@ -55879,7 +56445,7 @@
           sha256 = "015gjf8chd6h9azhyarmskk41cm0cmg981jif7q81hakl9av6rhh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-emoticons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-emoticons";
           sha256 = "15s6qjhrrqrhm87vmvd6akdclzba19613im85kfkhc24p6nxyhbn";
           name = "unicode-emoticons";
         };
@@ -55900,7 +56466,7 @@
           sha256 = "0936dqxyp72if9wvn2dcci670yp1gqrmpnll9xq00skp85yq9zs5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-enbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-enbox";
           sha256 = "1phb2qq3pg6z6bl96kl9yfq4jxhgardjpaa4lhgqbxymmqdm7gzv";
           name = "unicode-enbox";
         };
@@ -55927,7 +56493,7 @@
           sha256 = "0fbwncna6gxlynq9196djpkjhayzk8kxlsxg0gasdgqx1nyxl0mk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-fonts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-fonts";
           sha256 = "0plipwb30qqay8691qzqdyg6smpbs9dsxxi49psb8sq0xnxl84q3";
           name = "unicode-fonts";
         };
@@ -55953,7 +56519,7 @@
           sha256 = "0kzcg1wxi1z424jdn7pibk9zyfyi85kligav08sl1c2hdldzya4l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-input";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-input";
           sha256 = "17sf3xnl8yyx4ln4mrjlrvfinb8dvabh81l3qyr9pkn5skpgqgj8";
           name = "unicode-input";
         };
@@ -55974,7 +56540,7 @@
           sha256 = "16jgm70ldsngxldiagjkw3ragypalpiidnf82g5hss9ciybkd3j4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-progress-reporter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-progress-reporter";
           sha256 = "03z7p27470fqy3gd356l9cpp44a35sfrxz94dxmx388rzlygk7y7";
           name = "unicode-progress-reporter";
         };
@@ -55995,7 +56561,7 @@
           sha256 = "0ny260mr1h810fvqsfj2hpd3zql4g309m60qj4vk6kmd83p5b60f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-troll-stopper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-troll-stopper";
           sha256 = "0a10lq0xsfyp052iw4xjbhsdkbyg25x2gk68gys4k7p6l92la0k5";
           name = "unicode-troll-stopper";
         };
@@ -56016,7 +56582,7 @@
           sha256 = "1ayb15nd5vqr0xaghrnp55kqw7bblrjipmfrag6bqpn7jk9bvbdz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-whitespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-whitespace";
           sha256 = "1b3jgha8va42b89pdp41sab2w9wllp7dicqg4lxl67bg6wn147wy";
           name = "unicode-whitespace";
         };
@@ -56037,7 +56603,7 @@
           sha256 = "1jvr1k8zd40m1rvwmxzidz1dvr4j8cbh78nqgc3vfb410fj619gw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unidecode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unidecode";
           sha256 = "0h058mvb6x53zywpwg85dzhaynlgq577yyqhrn5qqyqjg1n8lhc1";
           name = "unidecode";
         };
@@ -56058,7 +56624,7 @@
           sha256 = "1vbx10s2zmhpxjg26ik947bcg9f7w3g2w45wmm0shjp743fsdq8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unify-opening";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unify-opening";
           sha256 = "1gpmklbdbmv8va8d3yr94r1ydkcyvdzcgxv56rp0bxwbcgmk0as8";
           name = "unify-opening";
         };
@@ -56079,7 +56645,7 @@
           sha256 = "1wl9rzys1zr2c41h5i57y6hxsavix1b26f453l2izmb6r0b1dvh0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unipoint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unipoint";
           sha256 = "1nym2wlr50wk62cbagq1qyjczzf56nb6i9dfzcwikdck8p4p2dr7";
           name = "unipoint";
         };
@@ -56100,7 +56666,7 @@
           sha256 = "0l8h084xkbjvx2vbg67hxmg4hb9175k858z3k3c93d2b6x2kh7ni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unison-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unison-mode";
           sha256 = "03kyr1h5pm51vn4bykj13rm4ybln266rpnxh65y2ygw8f8md88gl";
           name = "unison-mode";
         };
@@ -56121,7 +56687,7 @@
           sha256 = "0xpaifmrvq5bbzpjhbzbxaac8kymmvqgg7lb2q1s7b5qf47fhqac";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unkillable-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unkillable-scratch";
           sha256 = "0ghbpa9pf7k6vd2mjxkpqg2qfl4sd40ir6mrk1rxr1rv8s0afkf7";
           name = "unkillable-scratch";
         };
@@ -56142,7 +56708,7 @@
           sha256 = "118c23dsfgkhwhv65dx3wbg2dn7qyrd80d78cykl732c68d6wvi0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/url-shortener";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/url-shortener";
           sha256 = "12r01dyk55bs01jk0ab9f24lfvm63h8kvix223pii5y9890dr6ys";
           name = "url-shortener";
         };
@@ -56163,7 +56729,7 @@
           sha256 = "0xwr0v4f64d7hi5ldig4r5yjn8h3f8by49g5820187lsp7ng2nw4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/urlenc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/urlenc";
           sha256 = "0n6shh95m11162zsnf62zy1ljswdjznjilxx2dbqyqdrn7qr2dgh";
           name = "urlenc";
         };
@@ -56181,7 +56747,7 @@
           sha256 = "00g1zj5fjykdi6gh2wkswpwx132xa6jmwfnrgfg5r96zwb8pib4i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/usage-memo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/usage-memo";
           sha256 = "05n50adjnavl7ag24wfjwlnbv5x55qlhmplgsm8j57gjig01nd95";
           name = "usage-memo";
         };
@@ -56194,15 +56760,15 @@
     use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "use-package";
-        version = "20160112.1501";
+        version = "20160204.1300";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "2a50241538b8ead3d620be33bd8e0087f98f42c5";
-          sha256 = "0wiv5xh2hik76x0i4a6amq5648akm5kvr4llnkh190riibnwkwx6";
+          rev = "a29e0328c0076cc927e5fd3d8db1878c0f978ace";
+          sha256 = "0s4qmqgym12gk8kiz90ck5yi7icz8dydyks0psfam1nza89cbfys";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/use-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/use-package";
           sha256 = "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8";
           name = "use-package";
         };
@@ -56223,7 +56789,7 @@
           sha256 = "05lhxbrgwbyz0nkb19yln9a46jh91ic685943hd58cn91lxsw3al";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/use-package-chords";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/use-package-chords";
           sha256 = "18av8gkz3nzyqigyd88ajvylsz2nswsfywxrk2w8d0ykc3p37ass";
           name = "use-package-chords";
         };
@@ -56240,11 +56806,11 @@
         src = fetchFromGitHub {
           owner = "diml";
           repo = "utop";
-          rev = "9e41bf85da052bd1dc52701b3e83d5699d96701a";
-          sha256 = "0nvd9hc9dgiqd8xg1cbs7wmh0zpfpwx9i6q06p0xy8b2qd8xp58c";
+          rev = "fd7c663264c29438249d7f6cdad9494f57086e69";
+          sha256 = "1kf8aa4m8622nm52n6nrsa7zhlnfwi9ldvpj9fjvypbm07ai6i03";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/utop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/utop";
           sha256 = "0lv16kl29gc9hdcpn04l85pf7x93vkl41s4mgqp678cllzyr0cq7";
           name = "utop";
         };
@@ -56265,7 +56831,7 @@
           sha256 = "0r74gw8gcbrr62rvj4anz0c3n6kwi1xpb42d3pkzlh4igblhi5zj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/uuid";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/uuid";
           sha256 = "13xjnawir9i83j2abxxkl12gz3wapgbk56cps3qyfgql02bfk2rw";
           name = "uuid";
         };
@@ -56286,7 +56852,7 @@
           sha256 = "19bf6vpc2b9hfjkjanji96fflvk1lbillasnpwcb6zzyq0cs47bw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/uuidgen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/uuidgen";
           sha256 = "1qaz7hg0wsdkl0jb7v7vrkjs554i2zgpxl8xq2f8q7m4bs2m5k48";
           name = "uuidgen";
         };
@@ -56307,7 +56873,7 @@
           sha256 = "0fx18m688wfflbzwv8h3051439fwql69v1ip5q6xn958rdq4pi3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/uzumaki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/uzumaki";
           sha256 = "1fvhzz2qpyc819rjvzyf42jmb70hlg7a9ybqwi81w7rydpabg61q";
           name = "uzumaki";
         };
@@ -56328,7 +56894,7 @@
           sha256 = "04r73s3fhvdcryv0l57awkpg1hi3kg6zcqxbxb03jc89h0f9vdlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vagrant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vagrant";
           sha256 = "0g6sqzsx3lixcn09fkxhhcfp45qnqgf1ms0l7nkzyljavb7151cf";
           name = "vagrant";
         };
@@ -56341,15 +56907,15 @@
     vagrant-tramp = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vagrant-tramp";
-        version = "20151018.1723";
+        version = "20160120.1832";
         src = fetchFromGitHub {
           owner = "dougm";
           repo = "vagrant-tramp";
-          rev = "20413671c9db8fd5a4b02ea0ff495820f2480e5e";
-          sha256 = "0v1a1lsrs9zlg9y6mhdlrg3nrdaba54ndkfmvsn7nw46asinganv";
+          rev = "660b84f3dd3ac44b5e4d6e72446d557afac11dd9";
+          sha256 = "1xslw0whxmqsd79jwxgz1k7h55shffq3985im96pdzf4iivkr3ln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vagrant-tramp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vagrant-tramp";
           sha256 = "0ij7k27zj22sl7inx141l4dg0ymywnvyabjvaqzc0xjdj0cky5c5";
           name = "vagrant-tramp";
         };
@@ -56370,7 +56936,7 @@
           sha256 = "10vs4d8csww781j1ps3f6dczy5zzza36z7a8zqk40fg4x57ikw44";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vala-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vala-mode";
           sha256 = "164dhlsiflhpdymk3q5x0bv8gpbwfp34lnkhm2x90kdakfzqf91p";
           name = "vala-mode";
         };
@@ -56391,7 +56957,7 @@
           sha256 = "0iscaz8lm4fk6w13f68ysqk8ppng2wj9fkkkq1rfqz77ws66f8nq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vala-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vala-snippets";
           sha256 = "14hmmic0px3z38dm2dg0kis6cz1p3p1hj7xaqnqjmv02dkx2mmcy";
           name = "vala-snippets";
         };
@@ -56412,7 +56978,7 @@
           sha256 = "19j5q2f6pybvjq3ryjcyihzlw348hqyjhfcy3qflry6w786dqcgn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vbasense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vbasense";
           sha256 = "1440q2bi4arpl5lbqh7zscg7v3884clqx54p2fdfcfkz47ky4z9n";
           name = "vbasense";
         };
@@ -56433,7 +56999,7 @@
           sha256 = "09h7yg44hbxv3pyazfypkvk8j3drlwz0zn8x1wj0kbsviksl1wxk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vc-auto-commit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vc-auto-commit";
           sha256 = "1xpp7vbld3jgcr249m5h7il919kfg7d5ap3zs64i27axzdhv26zk";
           name = "vc-auto-commit";
         };
@@ -56454,7 +57020,7 @@
           sha256 = "0icc4kqfpimxlja4jgcy9gjj4myc8y84vbvacyf79lxixygpaxi1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vc-check-status";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vc-check-status";
           sha256 = "1kwnxa0ndfj8b211xy5d47sxkwmsay0kk8q7azfm5ag5dkg56zgi";
           name = "vc-check-status";
         };
@@ -56475,7 +57041,7 @@
           sha256 = "0whzfzg0m03wbmqsxml8hislnbfvawcniq83hj66lbrnbivxsqj4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vc-osc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vc-osc";
           sha256 = "0rp33945xk5d986brganqnn55psmlkj6glbimxakhgv9a1r85sxz";
           name = "vc-osc";
         };
@@ -56496,7 +57062,7 @@
           sha256 = "1jfis26lmghl30ydzq1xdkrrj3d85q7g44ns6kmfg119ccapllbj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vcl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vcl-mode";
           sha256 = "1h0a1briinp9ka7ga3ipdhyf7yfinwvf7babv36myi720900wcq5";
           name = "vcl-mode";
         };
@@ -56517,7 +57083,7 @@
           sha256 = "0fzz26c1pdaz3i58ndhzd2520mhny487daqs21yajxi9x2m00zrl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vcomp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vcomp";
           sha256 = "02cj2nlyxvgvl2rjfgacljvcsnfm9crmmkhcm2pznj9xw10y8pq0";
           name = "vcomp";
         };
@@ -56534,11 +57100,11 @@
         src = fetchFromGitHub {
           owner = "DamienCassou";
           repo = "vdirel";
-          rev = "aab19692e2c2084a0d5b554a96a64a2e3e2a3d09";
-          sha256 = "034475m2d2vlrlc2l88gdx0ga3krsdh08wkjxwnbb2dfyz3p8r9v";
+          rev = "6154343b8265d7e8cc6629f28aa4c3d28d3708cf";
+          sha256 = "1lh8nv0ayl9ipl2aqc8npzz84g5q7w6v60l14v61mmk34fc23lnc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vdirel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vdirel";
           sha256 = "11cc7bw7x5h3bwnlsjyhw6k5fh2fk7wffarrcny562v4cmr013cj";
           name = "vdirel";
         };
@@ -56559,7 +57125,7 @@
           sha256 = "1wa03gb98x650q798aqshm43kh6gfxaz1rlyrmvka5dxgf48whmf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vector-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vector-utils";
           sha256 = "07armr23pq5pd47lqhir6a59r86c84zikbc51d8vfcaw8y71yr5n";
           name = "vector-utils";
         };
@@ -56569,22 +57135,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    verify-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, url ? null }:
+    verify-url = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "verify-url";
-        version = "20151227.652";
+        version = "20160203.159";
         src = fetchFromGitHub {
           owner = "lujun9972";
           repo = "verify-url";
-          rev = "67a8c27ab331859ca5c1b4d757440a8d7a070696";
-          sha256 = "199pab06cwym59110z3kcgikmp8m3y81bd3slr0n3ky40mh5rbh3";
+          rev = "7961223979ad01723ada3c48b034e91592b3d1cc";
+          sha256 = "0vlkg77a0h5z36f370phl2xdzykz9h9in3vng68zn1pfhx2allyx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/verify-url";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/verify-url";
           sha256 = "1gd83rb1q0kywchd0345p5axqj1sv4f5kadympx5pbp4n5p1dqb2";
           name = "verify-url";
         };
-        packageRequires = [ cl-lib url ];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "http://melpa.org/#/verify-url";
           license = lib.licenses.free;
@@ -56601,7 +57167,7 @@
           sha256 = "1mp71axs3vdrdwlhgywfldvnr6a1g2qbxiywmpfmcv59n5n58p1j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vertica";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vertica";
           sha256 = "1ljjk6zrbr2k0s0iaqd9iq3j45cavijcx0rqdidliswnfllav4ng";
           name = "vertica";
         };
@@ -56622,7 +57188,7 @@
           sha256 = "0v884gbqq5vrx5gwg9dqn97kaqgnzhrqv8kam8dy9g7hx4fm6b2l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vertigo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vertigo";
           sha256 = "0x0wy1z601sk1x96bl2xx18qm4avd77iybq1a3ss8x8ykwqlgf83";
           name = "vertigo";
         };
@@ -56639,11 +57205,11 @@
         src = fetchFromGitHub {
           owner = "csantosb";
           repo = "vhdl-tools";
-          rev = "5df894e6032abd24743b7c3cd220f0869bb46c62";
-          sha256 = "0y1m903x864qv745b8slwkbqd63gb1nz36nglh8g16gcfccjgn6j";
+          rev = "6478a055e0e6bac56c65a5ecd45b82e0a074e9bb";
+          sha256 = "0ba22j368w6jac94hwmy27bhm3h1r7kpiwdzy8ggfxfzwn0sd4dy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vhdl-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vhdl-tools";
           sha256 = "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw";
           name = "vhdl-tools";
         };
@@ -56664,7 +57230,7 @@
           sha256 = "0wdm8k49zl6i6wnh7vjkswdh5m9lix56jv37xvc90inipwgs402z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vi-tilde-fringe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vi-tilde-fringe";
           sha256 = "0jhwv46gjwjbs1ai65nm6k15y0q4yl9m5mawgp3n4f45dh02cawp";
           name = "vi-tilde-fringe";
         };
@@ -56682,7 +57248,7 @@
           sha256 = "0lns0ic3zjz1km02674d9hxgnp6wlhk168wyr6h4vhpr8a71x9mb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/viewer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/viewer";
           sha256 = "0aqwkymq5f0qfgs1hmcg1jb1rd0vcnlqwiyjrjjkfff2xlbpagqf";
           name = "viewer";
         };
@@ -56703,7 +57269,7 @@
           sha256 = "09x857vbx35rpyc5x1322ajby613gva090x4vawaczk22idq65h4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vim-empty-lines-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vim-empty-lines-mode";
           sha256 = "17bl1g4ais73ws596mha0l8dgckfqhx9k2v9m9k0gw7kg7dcjhnb";
           name = "vim-empty-lines-mode";
         };
@@ -56724,7 +57290,7 @@
           sha256 = "13g2hin100c8h5bd7hzhyqzj02ab9c35giyv963l7y044v7sbwig";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vim-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vim-region";
           sha256 = "1dcnx799lpjsdnnjxqzgskkfj2nx7f4kwf0xjhbg35ny4nyn81dx";
           name = "vim-region";
         };
@@ -56745,7 +57311,7 @@
           sha256 = "1i407ilhmk2qrk66ygbvizq964bdk502x7lvrzs4wxwfr5y8ciyj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vimgolf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vimgolf";
           sha256 = "1hvw2pfa5a984hm6wd33bf6zz6hmlprc6qs3g789dfx91qm890vn";
           name = "vimgolf";
         };
@@ -56766,7 +57332,7 @@
           sha256 = "0rl9pcw1dcqpivmcrwpbsd11ym643zccp4sh5k11rmal77gb36sl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vimish-fold";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vimish-fold";
           sha256 = "017by9w53d8pqlsazfycmhdv16yylks308p5vxp1rcw2qacpc5m3";
           name = "vimish-fold";
         };
@@ -56787,7 +57353,7 @@
           sha256 = "000fs2h5zcv8aq8an16r6zwwf9x1qnfs7xxn39iahiwfzvnljqp0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vimrc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vimrc-mode";
           sha256 = "06hisgsn0czvzbq8m4dz86h4q75j54a0gxkg5shnr8s654d450bp";
           name = "vimrc-mode";
         };
@@ -56808,7 +57374,7 @@
           sha256 = "0rd7hyv66278dj32yva5q9z1749y84c6fwl2iqrns512j1l4kl8q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/virtualenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/virtualenv";
           sha256 = "1djqzzlbwsp9xyjqjbjwdck73wzikbpq19irzamybk90nc98wirl";
           name = "virtualenv";
         };
@@ -56829,7 +57395,7 @@
           sha256 = "1a0x4dsyavqcl7xibn3g90fxvh1fnb6k0mpjm5mjvzc168p939kc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/virtualenvwrapper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/virtualenvwrapper";
           sha256 = "0rn5vwncx8z69xp8hspr06nzkf28l9flchpb2936c2nalmhx6m8i";
           name = "virtualenvwrapper";
         };
@@ -56850,7 +57416,7 @@
           sha256 = "15zdbvv6c114mv6hdq375l7ax70sss06p9d7m86hgssc3kiv9vsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/visible-mark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/visible-mark";
           sha256 = "1rp0gnz28m1drwb1hhsf0mwxzdppdi88hscf788qw8cw65gckv80";
           name = "visible-mark";
         };
@@ -56871,7 +57437,7 @@
           sha256 = "1cv8mf3l92a9p8qmkfiphk3r81f2ihg2gyw2r4jbbd5ppwbxkl0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/visual-ascii-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/visual-ascii-mode";
           sha256 = "1h0143h39dq61afswlzlgpknk0gv574x91ar6klqmnaf1snab59g";
           name = "visual-ascii-mode";
         };
@@ -56892,7 +57458,7 @@
           sha256 = "126qm63ik1n1agvcp4mgk1gr7dnnyjif8zbw0l336q74d5cy6h6w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/visual-fill-column";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/visual-fill-column";
           sha256 = "19y0pwaybjal2rc7migdbnafpi4dfbxvrzgfqr8dlvd9q68v08y5";
           name = "visual-fill-column";
         };
@@ -56913,7 +57479,7 @@
           sha256 = "04wds01yzhia508852gm18rp7dkg0838j0w8cr1l1qmc8p0jjsz9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/visual-regexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/visual-regexp";
           sha256 = "16bdqq2j7pnjq3j6qa4rhxzidqdhyg80c7nazd93smis8rcv5d0z";
           name = "visual-regexp";
         };
@@ -56934,7 +57500,7 @@
           sha256 = "03jggsnz5j0c36inxqa16vrdwlzn3wrniyl2i9b8c5bx7az7210m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/visual-regexp-steroids";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/visual-regexp-steroids";
           sha256 = "1xkrzyyll8wmb67m75lfm9k8qcm068km8r1k8hcsadpkd01bx1lr";
           name = "visual-regexp-steroids";
         };
@@ -56955,7 +57521,7 @@
           sha256 = "0hb845pnh2yska6alca8hbbxh65x7g81pr7852h8fddm0qd1agkd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vkill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vkill";
           sha256 = "09siqsip6d2h3jrxbdbhylkqm42dx3d2dqlkkdw3a81c7ga9lpwm";
           name = "vkill";
         };
@@ -56976,7 +57542,7 @@
           sha256 = "0vl0hwxzzvgna8sysf517qq08fi1zsff3dmcgwvsgzhc47sq8mng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vlf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vlf";
           sha256 = "1ipkv5kmda0l39xwbf7ns9p0mx3kb781mxsm9vmbkhr5x577s2j8";
           name = "vlf";
         };
@@ -56994,7 +57560,7 @@
           sha256 = "1ys6928fgk8mswa4gv10cxggir8acck27g78cw1z3pdz5gakbgnj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vline";
           sha256 = "0p59xhyrv7fmcn3qi51sp8v9v2y71ray2s756zbhzgzg63h3nbjp";
           name = "vline";
         };
@@ -57015,7 +57581,7 @@
           sha256 = "183pvfp5nnqpgdmfxm84qrnid0lijgk79l5lhwzmnznzkrb7bgxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/voca-builder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/voca-builder";
           sha256 = "0mbw87mpbb8rw7xzhmg6yjla2c80x9820kw4q00x00ny5rbhm76y";
           name = "voca-builder";
         };
@@ -57036,7 +57602,7 @@
           sha256 = "1v0chqj5jir4685jd8ahw86g9zdmi6xd05wmzhyw20rbk924fcqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/volatile-highlights";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/volatile-highlights";
           sha256 = "1r6in919aqdziv6bgzp4k7jqa87bd287pacq615sd5m1nzva1a4d";
           name = "volatile-highlights";
         };
@@ -57057,7 +57623,7 @@
           sha256 = "0ymibjq6iwab5ia1fglhz4gm5cnbi792018fmrabcqkisj2zsjb7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/volume";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/volume";
           sha256 = "1r01v453bpyh561j8ja36609hy60gc30arvmz4z3c1cybhv8sk1i";
           name = "volume";
         };
@@ -57075,7 +57641,7 @@
           sha256 = "0vb5ss30mz0kqq8cscjckw647vqn6xprp2sfjcbpg2fx59z4agma";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/w32-browser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/w32-browser";
           sha256 = "14vc2cipwlwwc0b5ld4x0zvydkg8nbjmp0z2x6ca0nmxw8sfsnc6";
           name = "w32-browser";
         };
@@ -57094,7 +57660,7 @@
           sha256 = "0nyara81bnd0rvgyljqrrbvjvndkngdc7qzf6scl5iz3vlglfgy7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/w32browser-dlgopen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/w32browser-dlgopen";
           sha256 = "0dnvsnahnbnvjlhfmb0q6agzikv9d42fbnfrwsz6hni92937gz39";
           name = "w32browser-dlgopen";
         };
@@ -57115,7 +57681,7 @@
           sha256 = "1lgvdaghzj1fzh8p6ans0f62zg1bfp086icbsqmyvbgpgcxia9cs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/w3m";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/w3m";
           sha256 = "0vh882b44vxnij3l01sig87c1jmbymgirf6s98mvag1p9rm8agxw";
           name = "w3m";
         };
@@ -57136,7 +57702,7 @@
           sha256 = "0nvlni3iy2sq76z8d4kj5492m0w7qv96shjqkynvlj0avf528hv4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wacspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wacspace";
           sha256 = "1xy0mprvyi37zmgj1yrlh5ni08j47lpag1jm3a76cgghgmlfjxrl";
           name = "wacspace";
         };
@@ -57157,7 +57723,7 @@
           sha256 = "0w59ix8cbbcyhh882c8vkrbh84i8d03h9w7dchr3qy233b8wcxlc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/waher-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/waher-theme";
           sha256 = "091kipkb6z6x9ic4chprim9rvnmx4yj4419ijmvpn70w69aspnb5";
           name = "waher-theme";
         };
@@ -57178,7 +57744,7 @@
           sha256 = "1bcdvk5bg5yi0qq0wd3w9wl38s0brrafz52bzsracj3wffswjg1n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wakatime-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wakatime-mode";
           sha256 = "1rhy2bwkqlha4bj3zmb0iassiglch7yb2kbas0bbpl3d0hdki2i8";
           name = "wakatime-mode";
         };
@@ -57199,7 +57765,7 @@
           sha256 = "09gqsssc2sk0vwfg0h4zxq9a779sdjdgvxsw7p6n2k0g4wk0phri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wand";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wand";
           sha256 = "052zq5dp800hynd9fb6c645kjb9rp3bpkz41ifazjnx4h4864r0l";
           name = "wand";
         };
@@ -57209,22 +57775,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild, tabulated-list ? null }:
+    wandbox = callPackage ({ emacs, fetchFromGitHub, fetchurl, json ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "wandbox";
-        version = "20150905.1024";
+        version = "20160124.1040";
         src = fetchFromGitHub {
           owner = "kosh04";
           repo = "emacs-wandbox";
-          rev = "cea03dec67e90a4c87eb9b6d69d1b3c68af541d0";
-          sha256 = "00qzgabanmy4nkpnbc1m45j86k29plyyn408n1l0j8505fy9l7ca";
+          rev = "4522d488ecee418573ab2cdc55923f802b1dba31";
+          sha256 = "114f7sqwq6whbdsidg6wlzjayy6dla06h7fmg1gjkhkbdqq4h94d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wandbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wandbox";
           sha256 = "0myyln82nx462bj79acvqxwvmblxild4vbygcrzw5chcwy6crvlz";
           name = "wandbox";
         };
-        packageRequires = [ emacs json tabulated-list ];
+        packageRequires = [ emacs json ];
         meta = {
           homepage = "http://melpa.org/#/wandbox";
           license = lib.licenses.free;
@@ -57241,7 +57807,7 @@
           sha256 = "0q1a2ihrz7g08sqv55dx9ki3qb75rrg2dnzdy7kyv60cdz4gcz33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wanderlust";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wanderlust";
           sha256 = "0lq7fvqc0isv49lcm7ql6prc3hpcj5cx4kf8f4gcnfv5k8159cq9";
           name = "wanderlust";
         };
@@ -57262,7 +57828,7 @@
           sha256 = "1x472s5qr6wvla7nj5i9mas8z9qhkj4zj5qghfwn5chb9igvfkif";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/warm-night-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/warm-night-theme";
           sha256 = "1nrjkrr64rry6fjya22b0lcs0f8a2ijvr87192z311y9mw5rvb29";
           name = "warm-night-theme";
         };
@@ -57283,7 +57849,7 @@
           sha256 = "0i84ndnxma8s07kf5ixqyhv5f89mzc4iymgazj5inmxhvbc7s7r2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/watch-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/watch-buffer";
           sha256 = "18sxgihmqmkrbgs66qgnrsjqbp90l93531hns31fbnif10bkx2j5";
           name = "watch-buffer";
         };
@@ -57304,7 +57870,7 @@
           sha256 = "0zw8z2r82986likz0b0zy37bywicrvz9dizzw9p52gs1lx0is1fy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wavefront-obj-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wavefront-obj-mode";
           sha256 = "0qqismh6g2fvi45q2q52lq0n9nrh95wgamlsy5j4rx4syfgzxbrk";
           name = "wavefront-obj-mode";
         };
@@ -57325,7 +57891,7 @@
           sha256 = "0p7j4hvcxfyjf0na9s3xv29dvmwq82s56lincfasd0ydcpz4fbwc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wc-goal-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wc-goal-mode";
           sha256 = "0l3gh96njjldp7n13jn1zjrp17h7ivjak102j6wwspgg6v2h5419";
           name = "wc-goal-mode";
         };
@@ -57343,7 +57909,7 @@
           sha256 = "15wz0c0rsn02zl6yr8mpwzy2hvp2146krhdbjpq63l75w4i98w4d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wc-mode";
           sha256 = "0n9hc22rp18dxx33l2l1xla78m5zjybgh3mmsp91fbdiq92b446s";
           name = "wc-mode";
         };
@@ -57356,15 +57922,15 @@
     wcheck-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wcheck-mode";
-        version = "20160105.100";
+        version = "20160130.1221";
         src = fetchFromGitHub {
           owner = "tlikonen";
           repo = "wcheck-mode";
-          rev = "53555c6faf22c193eb61c3b56be613a906c8b56a";
-          sha256 = "0hsv391lvdb6hqjbvrsn5id6vgdhjsndsr3xnivykbi999ng9mrs";
+          rev = "adb9dd9f39cb0bd0000d140d6e778c4864dfde08";
+          sha256 = "113prlamr2j6y6n0w43asffawwa4qiq63mgwm85v04h6pr8bd90l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wcheck-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wcheck-mode";
           sha256 = "0cmdvhgax6r5svn3wkwll4j271qj70g8182c58riwnkhiajxmn3k";
           name = "wcheck-mode";
         };
@@ -57385,7 +57951,7 @@
           sha256 = "05gfc67724b0mwg8kvk3dsazx3dld50b9xjq8h1nc6jvdz3zxb9z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/weather-metno";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/weather-metno";
           sha256 = "0h7p4l8y75h27pgk45f0mk3gjd43jk8q97gjf85a9b0afd63d3f6";
           name = "weather-metno";
         };
@@ -57406,7 +57972,7 @@
           sha256 = "03xcadplw1hg5hxw6bfrhw5xkkxk3i4105f114c6m3d2525jq4y5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/web";
           sha256 = "0ynnmqw0vsf7wyhp9m5a05dfb19vkj8dnj5glhjdzjvg30dhjp3a";
           name = "web";
         };
@@ -57427,7 +57993,7 @@
           sha256 = "0ky2rg16xrbnsvqc6gcfhgi69fdzbx6jlsq73n8hr0n4562czhzl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/web-beautify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/web-beautify";
           sha256 = "06ky2svhca8hjgmvxrg3h6ya7prl72q1r88x967yc6b0qq3r7g0f";
           name = "web-beautify";
         };
@@ -57448,7 +58014,7 @@
           sha256 = "12j8ql9v9mrg8hlsminpm3ydcacc2fbdjsfw7l604sc3qvgza1lm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/web-completion-data";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/web-completion-data";
           sha256 = "1zzdmhyn6bjaidk808s4pdk25a5rn4287949ps5vbpyniaf6gny9";
           name = "web-completion-data";
         };
@@ -57461,15 +58027,15 @@
     web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20160114.1506";
+        version = "20160202.117";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "867ea7c5d7f3d9bb41127dac364c0fb009adc7bf";
-          sha256 = "0zpvhiazbsc87ai6gjlvbj6bd9hmvv4mf1q691jr4258mma1sssm";
+          rev = "594f00bf31815d39caefef75ae2ee11356afed58";
+          sha256 = "0psk1k1jryljkw4vj04d7ay424fwq212729fmqsziqzmjfjvsl0l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/web-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/web-mode";
           sha256 = "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i";
           name = "web-mode";
         };
@@ -57490,7 +58056,7 @@
           sha256 = "0mbhyk7sgisx0l0xiz2xgy4jfbgwazlnxjvajsh4nysyig5rys05";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/web-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/web-server";
           sha256 = "1f0iyvwq1kq3zfxx2v596cmah7jfk2a04g2rjllbgxxnzwms29z3";
           name = "web-server";
         };
@@ -57510,7 +58076,7 @@
           sha256 = "1z7ld9d0crwdh778fyaapx75vpnlnslsh9nf07ywkylhz4w68yyv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/weblogger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/weblogger";
           sha256 = "189zs1321rybgi4zihps7d2jll5z13726jsg5mi7iycg85nkv2fk";
           name = "weblogger";
         };
@@ -57523,15 +58089,15 @@
     websocket = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "websocket";
-        version = "20150719.1248";
+        version = "20160124.2220";
         src = fetchFromGitHub {
           owner = "ahyatt";
           repo = "emacs-websocket";
-          rev = "49a93b2218c6044377d81099ac916877f42b722e";
-          sha256 = "1ibzl8rp24py5mq42cxvy68pc7n18pfqpdfngxc8hxqdh5q3a5f1";
+          rev = "fca05614306c455af1cf783bc97021527050dcc6";
+          sha256 = "1vj10jcraxpwk896zyscpmgd55r1czzlqj1gz29skbq2zan1l042";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/websocket";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/websocket";
           sha256 = "1v8jlpahp30lihz7mdznwl6pyrbsdbqznli2wb5gfblnlxil04lg";
           name = "websocket";
         };
@@ -57552,7 +58118,7 @@
           sha256 = "19hgb5knqqc4rb8yl8s604xql8ar6m9r4d379cfakn15jvwqnl98";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wedge-ws";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wedge-ws";
           sha256 = "07i2dr807np4fwq3ryxlw11vbc1sik1iv7x5740q258jyc9zfgll";
           name = "wedge-ws";
         };
@@ -57573,7 +58139,7 @@
           sha256 = "03xsh3fc7if6rkdp2s8lmrzpqm3pjakgqi3faap44y9i84q6mc6k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/weechat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/weechat";
           sha256 = "0sxrms5024bi4irv8x8s8j1zcyd62cpqm0zv4dgpm65wnpc7xc46";
           name = "weechat";
         };
@@ -57594,7 +58160,7 @@
           sha256 = "0hc5iyjpcik996ns84akrl28scndmn0gd1zfdf1nnqq6n2m5zvgh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/weibo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/weibo";
           sha256 = "1ndgfqqb0gvy8p2fisi57s9bsa2nrnv80smg78m89i4cwagbz6yd";
           name = "weibo";
         };
@@ -57615,7 +58181,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wgrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wgrep";
           sha256 = "09xs420lvbsmz5z28rf6f1iwa0ixkk0w24qbj6zhl9hidh4mv9y4";
           name = "wgrep";
         };
@@ -57636,7 +58202,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wgrep-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wgrep-ack";
           sha256 = "03l1a681cwnn06m77xg0a547892gy8mh415v9rg3h6lkxwcld8wh";
           name = "wgrep-ack";
         };
@@ -57657,7 +58223,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wgrep-ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wgrep-ag";
           sha256 = "1b2mj06kws29ha7g16l5d1s3p3nwyw8rprbpaiijdk9nxqcm0a8a";
           name = "wgrep-ag";
         };
@@ -57678,7 +58244,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wgrep-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wgrep-helm";
           sha256 = "1hh7isc9xifkrdfw88jw0z0xmfazrbcis6d355bcaxlnjy6fzm8b";
           name = "wgrep-helm";
         };
@@ -57699,7 +58265,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wgrep-pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wgrep-pt";
           sha256 = "1gphdf85spsywj3s3ypb7dwrqh0zd70n2vrbgjqkbnfbwqjp9qbg";
           name = "wgrep-pt";
         };
@@ -57720,7 +58286,7 @@
           sha256 = "04w62davpqqqvympkr52bg54c2i45p09q9bs70p9ff5jvc6i3g76";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/what-the-commit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/what-the-commit";
           sha256 = "0nnyb6hq6r21wf1x3q41ab48b3dmcz5lyli771a59dk1gs8qpgak";
           name = "what-the-commit";
         };
@@ -57733,15 +58299,15 @@
     which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "which-key";
-        version = "20160117.1957";
+        version = "20160203.1414";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "f1d3d1b5e5351e5f878643496d8523fd54a96ca3";
-          sha256 = "1054q7k2v0zkxndn8f371x41dwg97fzmkvb5yc119gcc1ccdk1j1";
+          rev = "e7a9ebf15f30b2e8763152af4e939bfc87b9fc42";
+          sha256 = "1gf2gg1n6f3fqflpav8szfkrb3g1ivx4vlxlylkgr46km826aqin";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/which-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/which-key";
           sha256 = "0vqbhfzcv9m58w41zdhpiymhgl38n15c6d7ffd99narxlkckcj59";
           name = "which-key";
         };
@@ -57762,7 +58328,7 @@
           sha256 = "1y75cylvqgn54h8yqahz4wi1qj5yhbs66i7x23jmbmah3q0rycab";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/whitaker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/whitaker";
           sha256 = "17fnvb3jh6fi4wddn5qnp6i6ndidg8jf9ac69q9j032c2msr07nj";
           name = "whitaker";
         };
@@ -57783,7 +58349,7 @@
           sha256 = "0sh92g5vd518f80klvljqkjpw4ji909439dpc3sfaccf5jiwn9xn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/white-sand-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/white-sand-theme";
           sha256 = "19qsiic6yf7g60ygjmw7kg1i28nqpm3zja8cmdh33ny2bbkwxsz5";
           name = "white-sand-theme";
         };
@@ -57804,7 +58370,7 @@
           sha256 = "15yhbyyr0ksd9ziinlylyddny2szlj35x2548awj9ijnqqgjd23r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/whitespace-cleanup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/whitespace-cleanup-mode";
           sha256 = "1fhdjrxxyfx4xsgfjqq9p7vhj98wmqf2r00mv8k27vdaxwsnm5p3";
           name = "whitespace-cleanup-mode";
         };
@@ -57825,7 +58391,7 @@
           sha256 = "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/whole-line-or-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/whole-line-or-region";
           sha256 = "1vs2i4cy1zc6nj660i9h36jbfgc3kvqivjnzlq5zwlxk5hcibqa1";
           name = "whole-line-or-region";
         };
@@ -57843,7 +58409,7 @@
           sha256 = "18bnwwjk8jj4ns08sxhnznj0d8n1bxm2kj43r06nwyibh6ajpl7f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wid-edit+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wid-edit+";
           sha256 = "1wwrsk14hc0wrvy7hm94aw6zg50n2smlqwr6frwpi7yp8y394wiv";
           name = "wid-edit-plus";
         };
@@ -57863,7 +58429,7 @@
           sha256 = "0pq9x73hrp7qwhms7x3dvjfh9imapglba9yd7nkyw68mc0b9wlnl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wide-column";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wide-column";
           sha256 = "1r9mh7756jgf1hdnprci988z07xxh2jvh8d0c1h5rmxmldlbx8az";
           name = "wide-column";
         };
@@ -57884,7 +58450,7 @@
           sha256 = "0036alzp66k7w3z45lj8qzh3plxv9vwcw17wibkz90mlb27vy6yz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/widget-mvc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/widget-mvc";
           sha256 = "0njzvdlxb7z480r6dvmksgivhz7rvnil517aj86qx0jbc5mr3l2f";
           name = "widget-mvc";
         };
@@ -57905,7 +58471,7 @@
           sha256 = "06qjvybf65ffrcnhhbqs333lg51fawaxnva3jvdg7zbrsv4m9acl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wiki-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wiki-nav";
           sha256 = "19mabz0y3fcqsm68ijwwbbqylxgp71anc0a31zgc1blha9jivvwy";
           name = "wiki-nav";
         };
@@ -57926,7 +58492,7 @@
           sha256 = "02bczc1mb1cs1aryz5pw6cmpydjmxja2zj91893cz8rnfn1r031i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wiki-summary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wiki-summary";
           sha256 = "1hiyi3w6rvins8hfxd96bgpihxarmv192q96sadqcwshcqi14zmw";
           name = "wiki-summary";
         };
@@ -57947,7 +58513,7 @@
           sha256 = "1n45m8xn65a2lg8ff7m6hbqnp2j49n9sfyr924laljvhjbi37knd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wilt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wilt";
           sha256 = "0nw6zr06zq60j72qfjmbqrxyz022fnisb0bsh6xmlnd1k1kqlrz6";
           name = "wilt";
         };
@@ -57965,7 +58531,7 @@
           sha256 = "142ql6886h418f73h3wjblhnd16qvbap7mfr4g2yv4xybh88d4x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wimpy-del";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wimpy-del";
           sha256 = "10qw5lfq2392fr5sdz5a9bc6rvsg0j4dkrwvdhip1kqvajznw49x";
           name = "wimpy-del";
         };
@@ -57986,7 +58552,7 @@
           sha256 = "0ib20zl8l1fs69ca9rry27qz69sgf6ws1ca5nhm5llvpkjcgv53i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/win-switch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/win-switch";
           sha256 = "1s6inp5kf763rngn58r02fd7n7z3dd55j6hb7s9dgvc856d5z3my";
           name = "win-switch";
         };
@@ -58004,7 +58570,7 @@
           sha256 = "0dcbnqcqw7jzwwdn0rxxlixga1zw1x3a2zbpxvd90xp7zig4f0yz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/windata";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/windata";
           sha256 = "0xq51rdanq5as6kfyi97hsqmig5g35w7xv8c96bhzyflranw7jw5";
           name = "windata";
         };
@@ -58025,7 +58591,7 @@
           sha256 = "0g69r64gyz4p3k6n8l0i1837mszycbrp23acnp0iy0y3mg67x3pn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-end-visible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-end-visible";
           sha256 = "1p78n7yysj18404cdc6vahfrzwn5pixyfnja8ch48rj4fm4jbxwq";
           name = "window-end-visible";
         };
@@ -58046,7 +58612,7 @@
           sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-jump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-jump";
           sha256 = "1gmqb7j5fb3q3krgx7arrln5nvyg9vcpph6wlxj6py679wfa3lwr";
           name = "window-jump";
         };
@@ -58067,7 +58633,7 @@
           sha256 = "08chi9b4bap78n069aavvx3850kabk2jflrgymy4jxv08ybqikdg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-layout";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-layout";
           sha256 = "1n4a6z00lxsffirjrmbaaw432w798b9vv34qawgn1k17y9l7gb85";
           name = "window-layout";
         };
@@ -58085,7 +58651,7 @@
           sha256 = "1as3qbvj6d171qp2s8ycqqi16bgqm47vfk3fbxrl9szjzaxh9nw6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-number";
           sha256 = "1qhlsdhs40cyly87pj3f1n6ckr7z5pmhqndgay5jyxwxxdpknpap";
           name = "window-number";
         };
@@ -58106,7 +58672,7 @@
           sha256 = "1f4c6q4larifm745fr8f3w8sxs1sbs77vna29rw120jz8rnlz0jy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-numbering";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-numbering";
           sha256 = "0x3n0ni16q69lfpyjz61spqghmhvc3cwa4aj80ihii3pk80f769x";
           name = "window-numbering";
         };
@@ -58124,7 +58690,7 @@
           sha256 = "0mqdcgk6mdxgl9if7jzgg16zqdwnsp8icrdhnygphw5m9h2dqcnm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window+";
           sha256 = "0fhzb0ay9g9qgcaxpb2qaw15dh0lfmv3x4akyipi3zx11446d06j";
           name = "window-plus";
         };
@@ -58137,15 +58703,15 @@
     window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "window-purpose";
-        version = "20151114.440";
+        version = "20160203.1103";
         src = fetchFromGitHub {
           owner = "bmag";
           repo = "emacs-purpose";
-          rev = "d8b9399c8bbdb6e843cd62b7adb658fea6cf7e75";
-          sha256 = "1hfn3x08h426kw0m1qyrjy8kp6nm56d1h5zlfiwj22kfc560gb4v";
+          rev = "38fda8c9e4c0ad4fb0068b6b45ed0744f8d602a7";
+          sha256 = "0lm16hi6v4mg9jwqk3npzzpy2gaqz1kl47rdazlgdz4yl8x133c8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-purpose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-purpose";
           sha256 = "1ib5ia7armghvmcw8qywcil4nxzwwakmfsp7ybawb0xr53h1w96d";
           name = "window-purpose";
         };
@@ -58166,7 +58732,7 @@
           sha256 = "0hijf56ahbc5inn7n39nj96d948c4d05n9d5ci3g3vbl5hsyb121";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/windsize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/windsize";
           sha256 = "1xhfw77168942rcn246qndii0hv0q6vkgzj67jg4mxh8n46m50m9";
           name = "windsize";
         };
@@ -58187,7 +58753,7 @@
           sha256 = "1qrbvidnmgg7jyasb28bc0z1x4a4ayzq5jmv38dsx0qs080s85wy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/winpoint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/winpoint";
           sha256 = "10ji7xd9ipmy6c2qxljqdxgqf5sb8h7lwz43mr6ixbn7v1b7pp6w";
           name = "winpoint";
         };
@@ -58203,11 +58769,11 @@
         version = "20150623.1234";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "34fc6f12d740";
-          sha256 = "0ppj8mrlc20i2syyiwvj5rp53swrm929h0ksxxlqvn3nvl9gsajd";
+          rev = "f41388ee99f1";
+          sha256 = "16711d1ds508nmjw81jm2cfdpqzc55gc175fkhayk0f5swlvd11m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wisp-mode";
           sha256 = "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc";
           name = "wisp-mode";
         };
@@ -58228,7 +58794,7 @@
           sha256 = "188h1sy4mxzrkwi3zgiw108c5f71rkj5agdkf9yy9v8c1bkawm4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wispjs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wispjs-mode";
           sha256 = "0qzm0dcvjndasnbqpkdc56f1qv66gxv8dfgfcwq5l1bp5wyx813p";
           name = "wispjs-mode";
         };
@@ -58241,16 +58807,16 @@
     with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "with-editor";
-        version = "20160118.835";
+        version = "20160128.1401";
         src = fetchFromGitHub {
           owner = "magit";
-          repo = "magit";
-          rev = "45b06a7b8664046fd1aecb3f07db535edd80d013";
-          sha256 = "1c6x10nm5syahn85vrgg9i6i7kzy4h7l9alahaxb71w6jwf91rsg";
+          repo = "with-editor";
+          rev = "580f225a6c4476feb36b707c6c705b027339717b";
+          sha256 = "0dymhkbkzicjw0379bdzbb594x5xcjbgbn428a30i2i0jwv66pfz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/with-editor";
-          sha256 = "042fa55yakdn2di4l5dilnmqpslac46wpr1zpl4xk3v3i4nn9ndv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/with-editor";
+          sha256 = "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb";
           name = "with-editor";
         };
         packageRequires = [ async dash emacs ];
@@ -58270,7 +58836,7 @@
           sha256 = "1c7g8f3jr7bb0xxprammfg433gd63in5iiiaq8rjmc94h6hdcys3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/with-namespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/with-namespace";
           sha256 = "1199k1xvvv7ald6ywrh2sfpw2v42ckpcsw6mcj617bg3b5m7770i";
           name = "with-namespace";
         };
@@ -58291,7 +58857,7 @@
           sha256 = "12rfpkyjkhikjh0mihhp5h5pzbm4br68nwf8k1ja9djl77vfzv36";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wn-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wn-mode";
           sha256 = "1qy1pkfdnm4pska4cnff9cx2c812ilymajhpmsfc9jdbvhzwrwg3";
           name = "wn-mode";
         };
@@ -58312,7 +58878,7 @@
           sha256 = "1xna0cjgi9m87pws2h0cza67qbpdhjmdi5h4wv6v4g14nr26hi3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wolfram-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wolfram-mode";
           sha256 = "1bq95lamzz45macpklnq1kxw9ak4x4f41kx16f472dn650ff0zlf";
           name = "wolfram-mode";
         };
@@ -58333,7 +58899,7 @@
           sha256 = "0hacc8ha5w44cgwkipa3nwh1q5gdrcxhjkmw2gnvb1l01crgnack";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wonderland";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wonderland";
           sha256 = "1b4p49mbzqffm2b2y8sbbi56vnkxap2jscsmla9l6l8brybqjppi";
           name = "wonderland";
         };
@@ -58354,7 +58920,7 @@
           sha256 = "1b9pya342ikyxnlyxp86wx8xk6zcdws7jsqs7a9xk027prwkfngj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wordnut";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wordnut";
           sha256 = "1gqmjb2f9izra0x9ds1jyk7h204qsll6viwkvdnmxczyyc0wx44n";
           name = "wordnut";
         };
@@ -58375,7 +58941,7 @@
           sha256 = "0d2byl3si2r0zh5ih6xpsgcd9r114ry0lzg5vcf31rr2gqf0j06h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wordsmith-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wordsmith-mode";
           sha256 = "1570h1sjjaks6bnhd4xrbx6nna4v7hz6dmrzwjq37rwvallasg1n";
           name = "wordsmith-mode";
         };
@@ -58385,22 +58951,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, helm, hydra, lib, melpaBuild }:
+    worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "worf";
-        version = "20151231.1124";
+        version = "20160121.638";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "worf";
-          rev = "dc68fa582287861e778c463209f8311c8ac4d620";
-          sha256 = "102qgcsh905hvbygrj8ik47qy1q2qkh2h4sski1g40mp3z6pbza9";
+          rev = "51fa0f71e49ad8b8d9c87156c724007e58d87a02";
+          sha256 = "15nc9zw12jd9jb4s02sa8a3c0i2s91ijy0bn43d36qc5i48c01zs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/worf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/worf";
           sha256 = "1fkb2ddl684dijsb0cqgmfbg1nz4xv43rb7g5rah05rchy5sgkpi";
           name = "worf";
         };
-        packageRequires = [ ace-link helm hydra ];
+        packageRequires = [ ace-link hydra swiper ];
         meta = {
           homepage = "http://melpa.org/#/worf";
           license = lib.licenses.free;
@@ -58417,7 +58983,7 @@
           sha256 = "0q32z54qafj8ap3ybx82i3fm1msmzwvpxgmkaglzhi8nccgzbn2n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/workgroups";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/workgroups";
           sha256 = "1v01yr3lk6l0qn80i3r8fq3di0a8bmqjyhwx19hcgiap57xl80h8";
           name = "workgroups";
         };
@@ -58438,7 +59004,7 @@
           sha256 = "0prj2b33h6rya7y9ff91r72bva1y6hg0sv9l11bn1gikmc6lc18n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/workgroups2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/workgroups2";
           sha256 = "0vhj6mb3iflli0l3rjlvlbxz5yk6z3ii5r71gx0m4vp4lhxncy3v";
           name = "workgroups2";
         };
@@ -58459,7 +59025,7 @@
           sha256 = "0i00xm4rynbp2v3gm6h46ajgj8h8nxnsjh6db1659b0hbpnah0ji";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/world-time-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/world-time-mode";
           sha256 = "10gdlz4l9iqw1zdlk5i3knysn36iqxdh3xabjq8kq04jkl7i36dl";
           name = "world-time-mode";
         };
@@ -58480,7 +59046,7 @@
           sha256 = "09fzbbrdgq19c3gylj4i0c5g070k65w943wz28mzis8b403vzh3n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wrap-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wrap-region";
           sha256 = "0mby3m49vm2pw127divspgivqam27zd4r70wx5ra05xwfxywaibq";
           name = "wrap-region";
         };
@@ -58501,7 +59067,7 @@
           sha256 = "1nnjn1r669hvvzfycllwap4w04m8rfsk4nzcg8057m1f263kj31b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/writegood-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/writegood-mode";
           sha256 = "1lxammisaj04g5vr5lwms64ywf39w8knrq72x4i94wwzwx5ywi1d";
           name = "writegood-mode";
         };
@@ -58522,7 +59088,7 @@
           sha256 = "0an36zra25r0l482irxbwrq90fd3rik53yqw3gccjkgdf3lpkc4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/writeroom-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/writeroom-mode";
           sha256 = "1kpsrp3agw8bg3qbf5rf5k1a7ww30q5xsa8z5ywxajsaywjzx1bk";
           name = "writeroom-mode";
         };
@@ -58543,7 +59109,7 @@
           sha256 = "1x2ybnv0h52i24vd1n95s4vglc6p79cyxh91a20cwza34svhz152";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ws-butler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ws-butler";
           sha256 = "072k67z2lx0ampwzdiszi64xs0w6frp4nbmrd2r0wpx0pd211vbn";
           name = "ws-butler";
         };
@@ -58556,15 +59122,15 @@
     wsd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wsd-mode";
-        version = "20160117.1502";
+        version = "20160201.1551";
         src = fetchFromGitHub {
           owner = "josteink";
           repo = "wsd-mode";
-          rev = "b733fc4d1e88c33f23552fc88c8e4cb0135c6e15";
-          sha256 = "07mmnlfqm0jmkj43l33gd4wjj8kin3rnqzhsh9hsjxir851d0jf2";
+          rev = "d604ee487ad426b19287bcf802c85f9026276956";
+          sha256 = "09c3vhg62ppxfznpir3b33k5k9y1m8v2w41czi2f57987f64f5pz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wsd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wsd-mode";
           sha256 = "07vclmnj18wx9wlrcnsl99f9jlk3sb9g6pcdv8x1smk84gccpakc";
           name = "wsd-mode";
         };
@@ -58585,7 +59151,7 @@
           sha256 = "0ba193ilqmp7l35hhzfym4kvbnj9h57m8mwsxdj6rdj2cwrifx8r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wwtime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wwtime";
           sha256 = "0n37k23lkjgaj9wxnr41yk3mwvy62mc9im5l86czqmw5gy4l63ic";
           name = "wwtime";
         };
@@ -58606,7 +59172,7 @@
           sha256 = "0i7bgbhk4lvdkdjh6z4xs69mbdi49985j82cjikzyyskjcqd2klq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/x-dict";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/x-dict";
           sha256 = "1w51xhiaxk50wlch262dxs2ybjvjj8qzx01xlgiimvggb8h5arlc";
           name = "x-dict";
         };
@@ -58627,7 +59193,7 @@
           sha256 = "0lssri13f3c7drkirh3cyxzxm3lix5myfrqb9iy178nybrifgf8l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/x86-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/x86-lookup";
           sha256 = "1clv1npvdkzsy0a08xrb880yflwzl4d5cc2c5xrs7b837mqpj8hd";
           name = "x86-lookup";
         };
@@ -58648,7 +59214,7 @@
           sha256 = "1birxxr28iv70x2h9war7ibhgan6pmbghdj11jnndvxl140jclmq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xah-elisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xah-elisp-mode";
           sha256 = "0cl07hw1hd3hj7wrzkh20m8vcs7mqsajxjmnlbnk2yg927yyijij";
           name = "xah-elisp-mode";
         };
@@ -58669,7 +59235,7 @@
           sha256 = "05dvmvh81n30l56gvlgzj0bwqd2fv1d6xvhvj5ywax6kqr9piwqv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xah-find";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xah-find";
           sha256 = "1d3x9yhm7my3yhvgqnjxr2v28g5w1h4ri40sy6dqcx09bjf3jhyq";
           name = "xah-find";
         };
@@ -58682,15 +59248,15 @@
     xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20160115.115";
+        version = "20160130.126";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "c7e27935a325be5f00db455ad7c0d9c473feefaf";
-          sha256 = "1i3q1fl9ciw367l065lxsdz78fq9y91hbp1vfwaw480rf1vqfxf2";
+          rev = "9a000ae40235c960b29423bde0331df3d445a154";
+          sha256 = "1kdzs5dhlrp42sgpgmybfzydr3m792ws11kn06c1d3mdfvrlkm9v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xah-fly-keys";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xah-fly-keys";
           sha256 = "0bzfz8q7yd1jai0pgngxwjp82nsfx5ivn24cb20vc5r8hhzj17cs";
           name = "xah-fly-keys";
         };
@@ -58711,7 +59277,7 @@
           sha256 = "0abknznp2si80zq5pc0hqr3w3pca2vrv3msm6jz1s8l8zi2hwx72";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xah-get-thing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xah-get-thing";
           sha256 = "0m61bmfgqy19h4ivw655mqj547ga8hrpaswcp48hx00hx8mqzcvg";
           name = "xah-get-thing";
         };
@@ -58732,7 +59298,7 @@
           sha256 = "1adyww9jbjvcn9p3z9ggs3gijdmnab275a81ch8sir1xp59pfm3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xah-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xah-lookup";
           sha256 = "0z0h1myw6wmybyd0z2lw4l59vgm6q6kh492q77kf3s0fssc0facc";
           name = "xah-lookup";
         };
@@ -58745,15 +59311,15 @@
     xah-math-input = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-math-input";
-        version = "20151225.1358";
+        version = "20160127.1608";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-math-input";
-          rev = "f0c98d1271b20334c8af2593fd391af23a6e64b4";
-          sha256 = "1j2dca3j71g2g8phzfxjvcwymlr10dq8fbahwslwdhadffjv9m87";
+          rev = "299a9fc5c1f764ad558e412ca3bff8438f4fabd5";
+          sha256 = "1wsdnqpfgk7f1dbz90k6sf13hjh0x3xjjgappfkmhcy36g7sshl7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xah-math-input";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xah-math-input";
           sha256 = "1afikjk46sjf97fb5fc8h63h7b9af010wxhsbpnmabsb4j72rx5a";
           name = "xah-math-input";
         };
@@ -58774,7 +59340,7 @@
           sha256 = "18msj947w6msma6zm23slk2v0h92n5ych5j12zbzkzzir49sffql";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xah-replace-pairs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xah-replace-pairs";
           sha256 = "0r4aq9davh3ypzcjixr3aw9g659dhiblwbmcyhm8iqhkavcpqr1x";
           name = "xah-replace-pairs";
         };
@@ -58795,7 +59361,7 @@
           sha256 = "0dc74kqwi0hpihdbb9a9lrqb7823w6j96mah47zyd9d4rd3vx850";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xahk-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xahk-mode";
           sha256 = "1bs12z7lnqlhm44hq0l98d0ka1bjgvm2yv97yivaj9akd53znca9";
           name = "xahk-mode";
         };
@@ -58816,7 +59382,7 @@
           sha256 = "08hzsqf4gawcr9q2h3rxrf1igvdja84aaa821657k04kdq4dpcbj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xbm-life";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xbm-life";
           sha256 = "1pglxjd4cs630sayx17ai1xflpbyj3hry3156682bgwhqs1vw68q";
           name = "xbm-life";
         };
@@ -58829,15 +59395,15 @@
     xcscope = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xcscope";
-        version = "20140510.1637";
+        version = "20160201.2126";
         src = fetchFromGitHub {
           owner = "dkogan";
           repo = "xcscope.el";
-          rev = "d845a033058ccb83e32dd9648885e8f608bb6258";
-          sha256 = "1wf6yijafqwcksrqci3d8zy3zh5yzqpfbf0d3m7qyslbax2aw25a";
+          rev = "0fe485803531e6494f5bfe448766e49f77a15fb5";
+          sha256 = "0p8cs5mh6ab6m0ff6ljs2vd1g8xx0jgc9ybh0j4aj2zcp22avz2n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xcscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xcscope";
           sha256 = "06xh29cm5v3b5xwj32y0i0h0kvvy995840db4hvab2wn9jw68m8w";
           name = "xcscope";
         };
@@ -58858,7 +59424,7 @@
           sha256 = "0gd7ag7cqzkfk8y9rbkrjpnyjnwad5bx86a30vxamd1ql8xp57ap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xkcd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xkcd";
           sha256 = "1r88yhs8vnkak8xl16vw3xdpm7ncz4ydkml8932bqk8xix8l8f0w";
           name = "xkcd";
         };
@@ -58868,6 +59434,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    xml-plus = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "xml-plus";
+        version = "20160203.2325";
+        src = fetchFromGitHub {
+          owner = "bddean";
+          repo = "xml-plus";
+          rev = "ec9b2af03a195e3a96ffc173fb3aa48b89676b2e";
+          sha256 = "1m7hpjfvpzichml8iarsqf9dv34sx7jcyh9mhj7dlka3za91snpb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xml+";
+          sha256 = "0xgqyfdn6kkp89zj4h54r009a44sbff0nrhh582zw5rlklypwdz1";
+          name = "xml-plus";
+        };
+        packageRequires = [ dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/xml+";
+          license = lib.licenses.free;
+        };
+      }) {};
     xml-quotes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xml-quotes";
@@ -58879,7 +59466,7 @@
           sha256 = "0z3yd3dzcsd7584jchv9q55fx04ig4yjzp8ay2pa112lykv4jxxd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xml-quotes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xml-quotes";
           sha256 = "1lmafa695xkhd90k6yiv8a57ch1jx33l1zpm39z0kj546mn6y8aq";
           name = "xml-quotes";
         };
@@ -58900,7 +59487,7 @@
           sha256 = "0kkjfg1l2wg3d5wrgkwnww4d3fca0xpd3k5z9j9gwmjnkxqd95ca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xml-rpc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xml-rpc";
           sha256 = "14r6xgnpqsb2jlv52vgrhqf3qw8a6gmdyap3ylhilyxw71lxf1js";
           name = "xml-rpc";
         };
@@ -58921,7 +59508,7 @@
           sha256 = "1nk50iwb6az01r1s2l9wwdqrz3k4ywr00q0zmd9vvi3y9v4cjah0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xmlgen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xmlgen";
           sha256 = "1mvnjqb9zxf9ml605w10v4cbbajwv9if93apr4xrh79l00scj383";
           name = "xmlgen";
         };
@@ -58934,15 +59521,15 @@
     xmlunicode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xmlunicode";
-        version = "20160108.2311";
+        version = "20160130.1109";
         src = fetchFromGitHub {
           owner = "ndw";
           repo = "xmlunicode";
-          rev = "7da11de1a196f8fb202464320107774ed3c7ecc9";
-          sha256 = "16rj11rasifkfp7357i5s2kg36vqrnjl3zv6lgzmn365xxx6zrbz";
+          rev = "b3ccf49b9e344748d72cccb3134e7c49d250645f";
+          sha256 = "1k5zilvq64xjhy9lrwf9ss0y7j0v9ppg10xzcrj1hy6jbx54nn8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xmlunicode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xmlunicode";
           sha256 = "1ylpvx2p5l863r9qv9jdsm9rbv989c8xn0zpjl8zkcfxqxix4h4p";
           name = "xmlunicode";
         };
@@ -58963,7 +59550,7 @@
           sha256 = "09fpxr55b2adqmca8xhpy8z5cify5091fjdjyxjd1jh5wdp1658v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xquery-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xquery-mode";
           sha256 = "0b5k2ihbjm5drv4lf64ap31yj873x1fcq85y6yq1ayahn6s52rql";
           name = "xquery-mode";
         };
@@ -58976,15 +59563,15 @@
     xquery-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xquery-tool";
-        version = "20160112.406";
+        version = "20160203.1153";
         src = fetchFromGitHub {
           owner = "paddymcall";
           repo = "xquery-tool.el";
-          rev = "c7783a502b5a1f4a41cd87ed881a27aafa145a11";
-          sha256 = "1i2ah3wkjv6ya7zda53ivj5fchmg1kr2l01bhl0r183g3jws796p";
+          rev = "126164abeb77bd7932c73590939637895005c48b";
+          sha256 = "1yy759qc4njc8bqh8hmgc0mq5vk5spz5syxgflqhjijk8nrvyfgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xquery-tool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xquery-tool";
           sha256 = "069injmvv9zzcbqbms94qx5wjj740jnik6sf3b4xjhln7z1yskp0";
           name = "xquery-tool";
         };
@@ -59005,7 +59592,7 @@
           sha256 = "1n3biybylvq5c1lpf7zsjsgdrg7mzrhkaw251fp8qmsss0s3sv4g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xresources-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xresources-theme";
           sha256 = "0spqa3xn3p2lmvlc5hdn7prq4vb70nkyrryx1kavha9igzhlyaga";
           name = "xresources-theme";
         };
@@ -59026,7 +59613,7 @@
           sha256 = "064fpjcj1sp8m5x106dw6zgy0p0rfd5fxcx57h533q263l7z00ny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xterm-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xterm-color";
           sha256 = "0bvzi1mkxgm4vbq2va1sr0k9h3fdmppq79hkvbizc2xgk72sazpj";
           name = "xterm-color";
         };
@@ -59047,7 +59634,7 @@
           sha256 = "10dsf2lgjjqvjzzyc5kwggfk511v8ypmx173bixry3djcc15dsf3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xterm-frobs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xterm-frobs";
           sha256 = "02v8kh2g6a2fpxy911630zsg985hyakvqbd6v2xyfbz0vnd6i1lf";
           name = "xterm-frobs";
         };
@@ -59068,7 +59655,7 @@
           sha256 = "1jwimgglhqgp259wjqmpp1wi9j51qxcl1l356jlhjnfp1zh1ihmg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xterm-keybinder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xterm-keybinder";
           sha256 = "1n0zp1mc7x7z0671lf7p9r4qxic90bkf5q3zwz4vinpiw2qh88lz";
           name = "xterm-keybinder";
         };
@@ -59089,7 +59676,7 @@
           sha256 = "06cbr7y3wp7j8lnbys57g6md4fdx9xhlnxl73pj7xpfa5i2x9ifl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xterm-title";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xterm-title";
           sha256 = "08z8qg9x6vjpybbhxa8x46qnp3951miz1264fivg776y76cg3ck6";
           name = "xterm-title";
         };
@@ -59110,7 +59697,7 @@
           sha256 = "09mn8s7gzzxgs7kskld8l68zjrcgnvml3fqj69wrfq7b1g62hhxy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xtest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xtest";
           sha256 = "1vbs4sb4frzg8d3l96ip9cc6lc86nbj50vpdfqazvxmdfd1sg4i7";
           name = "xtest";
         };
@@ -59131,7 +59718,7 @@
           sha256 = "0f6pvwzhncycw8gnjy24h6q1qglfgvdjfs5dzqx9s43j3yg63lzm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yabin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yabin";
           sha256 = "1kmpm2rbb43c9cgp44qwd24d90mj48k3gyiir3vb6zf6k3syrc17";
           name = "yabin";
         };
@@ -59152,7 +59739,7 @@
           sha256 = "0b252m7vb5kg5bjhpgag6nhm32cac8dhlmy4pr0kpa860lh2xlz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yafolding";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yafolding";
           sha256 = "1z70ismfwmh9a83a7h5lbhw7iywfib5fis7y8gx8020wfjq9g2yq";
           name = "yafolding";
         };
@@ -59173,7 +59760,7 @@
           sha256 = "0sqwz37y6mpc378pp8p6bq9fmhgwfr6rlbngiwgvsp30iq6vjsn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yagist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yagist";
           sha256 = "1mz86fq0pb4w54c66vd19m2492mkrzq2qi6ssnn2xwmn8vv02wdd";
           name = "yagist";
         };
@@ -59194,7 +59781,7 @@
           sha256 = "030dcp5iq0jvr2m6lb5ar7bqzp1l7f835yl7d7fa8zp46fc3a6d5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yahoo-weather";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yahoo-weather";
           sha256 = "1kzi6yp186wfcqh5q1v9vw6b1h8x89sba6wlnacfpjbarwapfif0";
           name = "yahoo-weather";
         };
@@ -59215,7 +59802,7 @@
           sha256 = "12dd4ahg9f1493982d49g7sxx0n6ss4xcfhxwzyaqxckwzfranp0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yalinum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yalinum";
           sha256 = "0jzsvkcvy2mkfmri4bzgrlgw2y0z3hxz44md83s5zmw09mshkahf";
           name = "yalinum";
         };
@@ -59236,7 +59823,7 @@
           sha256 = "1cngxwn7m3qxn0dm7l9vd4lb5sw5i4aqn5rkr7pacskl0giikhfb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yaml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yaml-mode";
           sha256 = "0afp83xcr8h153cayyaszwkgpap0iyk351dlykmv6bv9d2m774mc";
           name = "yaml-mode";
         };
@@ -59257,7 +59844,7 @@
           sha256 = "1xgqqgg4q3hrhiap8gmr8iifdr1mg4dl0j236b6alhrgmykbhimy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yaml-tomato";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yaml-tomato";
           sha256 = "0bja213l6mvh8ap5d04x8dik1z9px5jr52zpw1py7shw5asvp5s2";
           name = "yaml-tomato";
         };
@@ -59278,7 +59865,7 @@
           sha256 = "17ymdqi19bs9xn0pxylzv7m99f7cn14hx73xljm6bg0qfb8m53f3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yandex-weather";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yandex-weather";
           sha256 = "11hspadm520cjlv1wk2bdpzg7hg2g0chbh26qijj9jgvca26x0md";
           name = "yandex-weather";
         };
@@ -59296,7 +59883,7 @@
           sha256 = "0svy6zp5f22z7mblap4psh7h4i52d1qasi9yk22l39przhsrjar4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yaoddmuse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yaoddmuse";
           sha256 = "07sqcsad3k23agwwws7hxnc46cp9mkc9qinzva7qvjgs8pa9dh54";
           name = "yaoddmuse";
         };
@@ -59317,7 +59904,7 @@
           sha256 = "06mjjxa0blgxd8dbahgyni3b1rscbwjpxby5abrgfbb0fvs2bnfa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yard-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yard-mode";
           sha256 = "0jmlcba8qapjwaaliz9gzs99if3wglkhmlpjzcdy3icx18sw8kzx";
           name = "yard-mode";
         };
@@ -59338,7 +59925,7 @@
           sha256 = "0w9a6j0ndpfwaz1g974vv5jqgbzxw26l19kq51j3ah73063cavpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yari";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yari";
           sha256 = "0sch9x899mzwdacg55w5j583k2r4vn71ish7gqpghd7cj13ii66h";
           name = "yari";
         };
@@ -59359,7 +59946,7 @@
           sha256 = "08wa97hsfy1rc8ify3rz2ncfij4z6l16p4s20naygqccjv3ir6z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yascroll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yascroll";
           sha256 = "11g7wn4hgdwnx3n7ra0sh8gk6rykwvrg9g2cihvcv7mjbqgcv53f";
           name = "yascroll";
         };
@@ -59372,15 +59959,15 @@
     yasnippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "20160104.329";
+        version = "20160131.1148";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "yasnippet";
-          rev = "100d8d19049f1ec97a0cd22400758d4afcde403c";
-          sha256 = "10a2rrwz88gzhq3qij2nabqd6b31n3cxnjshrzjn9iv0lcby31a5";
+          rev = "88b79505547be31f534a03a871ac98788e1455e3";
+          sha256 = "0vpsicap1sk2i78y4ysszhksinh6qvic709n3gbzaz2d4mm0bsya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yasnippet";
           sha256 = "1j6hcpzxljz1axh0xfbwr4ysbixkwgxawsvsgicls8r8kl2xvjvf";
           name = "yasnippet";
         };
@@ -59401,7 +59988,7 @@
           sha256 = "1gxn302kwjfq6s6rxxvy0jpp37r2vh4ry899giqbdfr0cc1qnw0c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yatemplate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yatemplate";
           sha256 = "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q";
           name = "yatemplate";
         };
@@ -59420,7 +60007,7 @@
           sha256 = "08iwfpsjs36pqr2l85avxhsjx8z0sdfw8cqwwf3brn7i4x67f7z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yatex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yatex";
           sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6";
           name = "yatex";
         };
@@ -59441,7 +60028,7 @@
           sha256 = "0nqyn1b01v1qxv7rcf46qypca61lmpm8d7kqv63jazw3n05qdnj8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yaxception";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yaxception";
           sha256 = "18n2kjbgfhkhcwigxmv8dk72jp57vsqqd20lc26v5amx6mrhgh58";
           name = "yaxception";
         };
@@ -59462,7 +60049,7 @@
           sha256 = "0znchya89zzk30mwl4qfm0q9sfa5m3jspapb892ydj0mck5n4nyj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ycm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ycm";
           sha256 = "16ahgvi85ddjlrjxld14zm2vvam0m89mwskizjd5clcz0snk51sc";
           name = "ycm";
         };
@@ -59475,15 +60062,15 @@
     ycmd = callPackage ({ dash, deferred, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "ycmd";
-        version = "20160115.1652";
+        version = "20160202.235";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "80c6d7c663b6ccc32b851348f1099790ac4c9736";
-          sha256 = "1c3c3frd9fdb77wkhg8f8g29dvr86ryzf9prg4pm8wvhifa4yhvg";
+          rev = "c64684df763411249985159ee33b10d948b9fc91";
+          sha256 = "12jwqhzqskdp2l6h60rich19rddzjcl94zaf72ljnq8h0mqc3xy0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ycmd";
           sha256 = "06psmcr5132vn72l0amzj14dy43aradnbmlvvms55srvici6r60q";
           name = "ycmd";
         };
@@ -59504,7 +60091,7 @@
           sha256 = "1fyvvkx6pa41bcr9cyh4yclwdzc5bs742s9fxr6wb4a5scq3hg9m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yesql-ghosts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yesql-ghosts";
           sha256 = "1hxzbnfd15f0ifdqjbw9nhxd0z46x705v2bc0xl71nav78fgpswf";
           name = "yesql-ghosts";
         };
@@ -59525,7 +60112,7 @@
           sha256 = "0016qff7hdnd0xkyhxakfzzscwlwkpzppvc4wxfw0iacpjkz1fnr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/youdao-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/youdao-dictionary";
           sha256 = "1qfk7s18br9jask1bpida0cjxks098qpz0ssmw8misi3bjax0fym";
           name = "youdao-dictionary";
         };
@@ -59546,7 +60133,7 @@
           sha256 = "1k7m3xk5ksbr2s3ypz5yqafz9sfav1m0qk2jz1xyi3fdaw2j0w2z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/z3-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/z3-mode";
           sha256 = "183lzhgjj480ca2939za3rlnsbfn24mgi501n66h5wim950v7vgd";
           name = "z3-mode";
         };
@@ -59567,7 +60154,7 @@
           sha256 = "16k8hha798hrs0qfdwqdr6n7y13ffgm6jj3msrk0zl8117jhaany";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zeal-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zeal-at-point";
           sha256 = "1cz53plk5bax5azm13y7xz530qcfh0scm0cgrkrgwja2wwlxirnw";
           name = "zeal-at-point";
         };
@@ -59587,7 +60174,7 @@
           sha256 = "0f80fxh0y9lfa08fnic7ln0jn8vngfbiygy6sizdmrcxz67559vc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zeitgeist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zeitgeist";
           sha256 = "0gzmiwxmzcrl5mf0s7vs09p2wl7slq8xbl6ynl76iwzwjxjizahk";
           name = "zeitgeist";
         };
@@ -59608,7 +60195,7 @@
           sha256 = "0dnaxhsw549k54j0mgydm7qbl4pizgipfyzc15f9afsxa107rpnl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zen-and-art-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zen-and-art-theme";
           sha256 = "0b2lflji955z90xl9iz2y1vm04yljghbw4948gh5vv5p7mwibgf2";
           name = "zen-and-art-theme";
         };
@@ -59621,15 +60208,15 @@
     zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zenburn-theme";
-        version = "20160117.1319";
+        version = "20160204.1416";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "zenburn-emacs";
-          rev = "041b800022f486cd328a8cd3eb729db93ddb710e";
-          sha256 = "13nmbjz4a7ibjcs4h6rbx5hkcdmbinsm8jzh049cb289y7m0lcpa";
+          rev = "3d7463ecac9c4668a4d2ceaddea2fd43e677bfba";
+          sha256 = "0xihq1bpgckv9jcs6xdnhn8l4hbxywh1krk8ydv099l56r4w1269";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zenburn-theme";
           sha256 = "1kb371j9aissj0vy07jw4ydfn554blc8b2rbi0x1dvfksr2rhsn9";
           name = "zenburn-theme";
         };
@@ -59650,7 +60237,7 @@
           sha256 = "1y3wj15kfbgskl29glmba6lzq43rcm141p4i5s180aqcw7ydp5vr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zencoding-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zencoding-mode";
           sha256 = "1fclad1dyngyg9ncfkcqfxybvy8482i2bd409cgxi9y4h1wc7ws7";
           name = "zencoding-mode";
         };
@@ -59671,7 +60258,7 @@
           sha256 = "1byzw9k8g7inwr5icci9i1iar0y6w9zgs91nj04431j003l10xfs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zerodark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zerodark-theme";
           sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9";
           name = "zerodark-theme";
         };
@@ -59692,7 +60279,7 @@
           sha256 = "1gb51bqdf87yibs1zngk6q090p05293cpwlwbwzhnih9sl6wkq8x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zlc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zlc";
           sha256 = "0qw0qf14l09mcnw7h0ccbw17psfpra76qfawkc10zpdb5a2167d0";
           name = "zlc";
         };
@@ -59713,7 +60300,7 @@
           sha256 = "1xsxmvbh3xm3zh9yc6q28h48nar6pwyd51xw04b1x7amwkp8qdnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/znc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/znc";
           sha256 = "1z2kzbapgh55wwr5jp7v1wz5kpz4l7n3k94mkh3s068xag9xs6zz";
           name = "znc";
         };
@@ -59734,7 +60321,7 @@
           sha256 = "1gm3ly6czbw4vrxcslm50jy6nxf2qsl656cjwbyhw251wppn75cg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zombie";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zombie";
           sha256 = "0ji3nsxwbxmmygd6plpbc1lkw6i5zw4y6x3r5n2ah3ds4vjr7cnv";
           name = "zombie";
         };
@@ -59755,7 +60342,7 @@
           sha256 = "04m53hzk5n9vxh0gxi8jzpdhsdjlxnvz7hmsisr3bs99v603ha01";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zombie-trellys-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zombie-trellys-mode";
           sha256 = "19xzvppw7f35s82hm0y7sga8dyjjyy0dxy6vji4hxdpjziz7lggv";
           name = "zombie-trellys-mode";
         };
@@ -59776,7 +60363,7 @@
           sha256 = "1zg8fiv62bz7zmalczmfkbgjc6km7n66pzvidivc0p9b9sfxslkp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zone-nyan";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zone-nyan";
           sha256 = "165sgjaahz038isii971m02hr2g5iqhbhiwf5kdn8c739cjaa17b";
           name = "zone-nyan";
         };
@@ -59786,6 +60373,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    zone-rainbow = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zone-rainbow";
+        version = "20160120.734";
+        src = fetchFromGitHub {
+          owner = "kawabata";
+          repo = "zone-rainbow";
+          rev = "2ba4f1a87c69c4712124ebf12c1f3ea171e1af36";
+          sha256 = "0w550l9im3mhxhja1b7cr9phdcbvx5lprw551lj0d1lv7qvjasz0";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zone-rainbow";
+          sha256 = "0l51fmhvx9vsxbs62cbjgqphb691397f651nqin7cj3dfvchzh4j";
+          name = "zone-rainbow";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/zone-rainbow";
+          license = lib.licenses.free;
+        };
+      }) {};
     zone-select = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zone-select";
@@ -59797,7 +60405,7 @@
           sha256 = "17mrzf85ym0x5ih4l6sjdjlcmviabf8c8rpvpkd90gp9qxd8pyx1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zone-select";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zone-select";
           sha256 = "05kc211invmy4ajwf71vgr2b7bdgn99c4a26m95gcjqgy3sh5xzz";
           name = "zone-select";
         };
@@ -59807,6 +60415,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    zone-sl = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "zone-sl";
+        version = "20160201.610";
+        src = fetchFromGitHub {
+          owner = "kawabata";
+          repo = "zone-sl";
+          rev = "7ec22e3661c6348382f9fc39a9d0063dbd2352ff";
+          sha256 = "0m1q45pza61j0fp8cxkgmds5fyjrk0nqpwhg8m91610m3pvyc3ap";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zone-sl";
+          sha256 = "04rwd6vj3abk3bzhq3swxwcq5da2n9cldrcmvnqgjr975np4cgs3";
+          name = "zone-sl";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/zone-sl";
+          license = lib.licenses.free;
+        };
+      }) {};
     zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "zones";
         version = "20151231.1825";
@@ -59815,7 +60444,7 @@
           sha256 = "1dgadarqz1fvijf9cch24ngkn223jjp08njsfa52qk16k8pdpc12";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zones";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zones";
           sha256 = "08sl7i7cy22nd1jijc5l7lp75k9z83gfr8q41n72l0vxrpdasc9w";
           name = "zones";
         };
@@ -59836,7 +60465,7 @@
           sha256 = "0ls9x2r12z9ki2fy3cbf05mp28x4ws2gk3knacvw7gvvg4sjdq5w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zonokai-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zonokai-theme";
           sha256 = "1hrpgh03mp7yynqamgzkw7fa70c5pmyjfmfblkfhspnsif8j4v29";
           name = "zonokai-theme";
         };
@@ -59855,7 +60484,7 @@
           sha256 = "1whpd97yjby5zbcr4fcn0nxhqvn6k3jn8k2d15i6ss579kziwdqn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zoom-frm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zoom-frm";
           sha256 = "111lr29zhj8w8j7dbzl58iisqxjhccxpw4spfxx08zxh4623g5mk";
           name = "zoom-frm";
         };
@@ -59876,7 +60505,7 @@
           sha256 = "1kl01dlggsrffvakmwixw9j8cncdmlsw805wvzls6l1711r1zjwj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zoom-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zoom-window";
           sha256 = "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3";
           name = "zoom-window";
         };
@@ -59897,7 +60526,7 @@
           sha256 = "0ybmvn5wriyhpgxqv8xarviyxgy255vbp3yz9d330y29jhdih6zd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zop-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zop-to-char";
           sha256 = "0jnspvqqvnaplld083j7cqqxw122qazh88ab7hymci36m3ka9hga";
           name = "zop-to-char";
         };
@@ -59918,7 +60547,7 @@
           sha256 = "0fgwxw7r3zfv0b7xi8bx7kxff2r5hdw9gxf16kwq04fnh18nhi39";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zossima";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zossima";
           sha256 = "11kmnbqv4s8arindg7cxcdhbvfxsckks332wn7aiyb3bjhcgzwjb";
           name = "zossima";
         };
@@ -59931,15 +60560,15 @@
     zotelo = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zotelo";
-        version = "20151105.541";
+        version = "20160118.2245";
         src = fetchFromGitHub {
           owner = "vitoshka";
           repo = "zotelo";
-          rev = "91c8309da1f293341ba86f29fa0a28dee5cabd93";
-          sha256 = "16fr5s8i9ykq5j7ikf6qfd2px2dxc1gcff5wipif8h758691rliv";
+          rev = "4cabb7342668e146c5565dc5454ece4b4040f1a9";
+          sha256 = "1335z1v4889njnm98pz2sjk6n7r3vncsz83bk3z6gj5i0ig7wjap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zotelo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zotelo";
           sha256 = "0ai516lqj9yw7ymvfm4n5inv53sp6mg90wy56lr1laflizwxzg8z";
           name = "zotelo";
         };
@@ -59960,7 +60589,7 @@
           sha256 = "015xgsisgsv4w5h6r68f7iw3vwrqvc0az1gcdkd5dfr3nl1h4yzl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zotxt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zotxt";
           sha256 = "18jla05g2k8zfrmp7q9kpr1mpw6smxzdyn8nfghm306wvv9ff8y5";
           name = "zotxt";
         };
@@ -59970,22 +60599,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ztree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ztree = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ztree";
-        version = "20160109.1737";
+        version = "20160127.1742";
         src = fetchFromGitHub {
           owner = "fourier";
           repo = "ztree";
-          rev = "b5b2d02af8a34c40d6c3936c24d1cfe3d7911659";
-          sha256 = "0bf10znzjim35qv2v64l9pz5f44rv2xaxvfrsl5n8nl9p0knwfmg";
+          rev = "a7c54891c5ed00a192c72f99ba5ba7d4df7a2a0b";
+          sha256 = "1sxjpbgi7ydmrlv34l16n40qpg969wfcb6kknndrh3fgjjc3p41b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ztree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ztree";
           sha256 = "1fk5xz8qq3azc66f954x5qvym94xnv4fg6wy83ihdfwycsas7j20";
           name = "ztree";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "http://melpa.org/#/ztree";
           license = lib.licenses.free;
@@ -60002,7 +60631,7 @@
           sha256 = "0v73fgb0gf81vlihiicy32v6x86rr2hv0bxlpw7d3pk4ng1a0l3z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zygospore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zygospore";
           sha256 = "03mmxqbliwd1g73cxd9kqkngdy4jdavcs6j12b4wp27xmhgaj40z";
           name = "zygospore";
         };
@@ -60015,15 +60644,15 @@
     zzz-to-char = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zzz-to-char";
-        version = "20151030.232";
+        version = "20160122.640";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "zzz-to-char";
-          rev = "5d3465122342265b6ff8495c60d9a7cb457be42a";
-          sha256 = "1ai0a9r1xdz1jcr071ivm49wl906a0jqnhfaznw37jw9j2db58zn";
+          rev = "efbe99c9163602f23408abaea70ffe292632bf26";
+          sha256 = "0y0hhar3krkvbpb5y9k197mb0wfpz8cl6fmxazq8msjml7hkk339";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zzz-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zzz-to-char";
           sha256 = "16vwp0krshmn5x3ry1j512g4kydx39znjqzri4j7wgg49bz1n7vh";
           name = "zzz-to-char";
         };

From 53aee90d5722ae63e25911effa296d1fe1d704a1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Thu, 4 Feb 2016 18:05:21 -0600
Subject: [PATCH 1072/2285] melpaStablePackages 2016-02-04

---
 .../emacs-modes/melpa-stable-generated.nix    | 3373 +++++++++--------
 1 file changed, 1886 insertions(+), 1487 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index ad91c6e251db..b682fdb830c9 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 = "13f4l9xzx4xm5m80kkb49zh31w0bn0kw9m5ca28rrx4aysqmwryv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/abc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/abc-mode";
           sha256 = "0qf5lbszyscmagiqhc0d05vzkhdky7ini4w33z1h3j5417sscrcx";
           name = "abc-mode";
         };
@@ -31,7 +31,7 @@
           sha256 = "0a8widshsm39cbala17pmnk1sazazhhyqppwalysli170whk49c5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-alchemist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-alchemist";
           sha256 = "02ll3hcixgdb8zyszn78714gy1h2q0vkhpbnwap9302mr2racwl0";
           name = "ac-alchemist";
         };
@@ -52,7 +52,7 @@
           sha256 = "0vrd6g9cl02jjxrjxpshq4pd748b5xszhpmakywrw8s08nh8jf44";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-anaconda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-anaconda";
           sha256 = "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf";
           name = "ac-anaconda";
         };
@@ -73,7 +73,7 @@
           sha256 = "12z8nq797hjy0bq5vzpcm7z7bdn0ixc3ma4cj3v51xnwmgknzk6c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-cake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-cake";
           sha256 = "0s2pgf0m98ixgadsnn201vm5gnawanpvxv56sf599f33krqnxzkl";
           name = "ac-cake";
         };
@@ -94,7 +94,7 @@
           sha256 = "0mlmhdl9s28z981y8bnpj8jpfzm6bgfiyl0zmpgvhyqw1wzqywwv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-cake2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-cake2";
           sha256 = "0qxilldx23wqf8ilif2nin119bvd0l7b6f6wifixx28a6kl1vsgy";
           name = "ac-cake2";
         };
@@ -115,7 +115,7 @@
           sha256 = "0nyq34yq4jcp3p30ygma3iz1h0q551p33792byj76pa5ps09g1da";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-capf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-capf";
           sha256 = "1drgk5iz2wp3rxzd39pj0n4cfmm5z8zqlp50jw5z7ffbbg35qxbm";
           name = "ac-capf";
         };
@@ -136,7 +136,7 @@
           sha256 = "1vpj0lxbvlxffj2z29l109w70hcphiavyvglsw524agxql3c8yf9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-cider";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-cider";
           sha256 = "1dszpb706h34miq2bxqyq1ycbran5ax36vcniwp8vvhgcjsw5sz6";
           name = "ac-cider";
         };
@@ -157,7 +157,7 @@
           sha256 = "1sdgpyq5p824dnxv6r7djwvhyhdmnis8k6992klr8iz7anhxzdam";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-clang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-clang";
           sha256 = "070s06xhkzaqfc3j8c4i44rks6gn8z66lwd54j17p8d91x3qjpr4";
           name = "ac-clang";
         };
@@ -178,7 +178,7 @@
           sha256 = "0a3s880nswc2s6yh2v5zsmws550q917i7av8nrxc5sp1d03xqwmn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-dcd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-dcd";
           sha256 = "086jp9c6bilc361n1hscza3pbhgvqlq944z7cil2jm1kicsf8s7r";
           name = "ac-dcd";
         };
@@ -199,7 +199,7 @@
           sha256 = "0cc3jpc4pihbyznyzvf6i3xwc2x78gb5m36ba9gkvxhabsljnlfg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-emoji";
           sha256 = "0msh3dh89jzk6hxva34gp9d5pazchgdknxjbi72z26rss9bkp1mw";
           name = "ac-emoji";
         };
@@ -220,7 +220,7 @@
           sha256 = "0ijni3qgd68jhznhirhgcl59cr7hwfvbwgf6z120x56jmp8h01d2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-etags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-etags";
           sha256 = "0ag49k9izrs4ikzac9lifvvwhcn5n89lr2vb20pngsvg1czdyhzb";
           name = "ac-etags";
         };
@@ -241,7 +241,7 @@
           sha256 = "02ifz25rq64z0ifxs52aqdz0iz4mi6xvj88hcn3aakkmsj749vvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-geiser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-geiser";
           sha256 = "0v558qz1mp8b1bgk8kgdk5sx5mpd353mw77n5b0pw4b2ikzpz2mx";
           name = "ac-geiser";
         };
@@ -262,7 +262,7 @@
           sha256 = "0m33v9iy3y37sicfmpx7kvmn8v1a8k6cs7d0v9v5k93p4d5ila41";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-haskell-process";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-haskell-process";
           sha256 = "0kv4z850kv03wiax1flnrp6sgqja25j23l719w7rkr7ck110q8rw";
           name = "ac-haskell-process";
         };
@@ -283,7 +283,7 @@
           sha256 = "1gw38phyaslpql7szvlpwgyfngdgd21f6lq406vq0gjwwmxgig34";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-helm";
           sha256 = "16ajxlhcah5zbvywpc6l4l1arr308gjpgvdx6l1nrv2zvpckhlwq";
           name = "ac-helm";
         };
@@ -304,7 +304,7 @@
           sha256 = "19v9515ixg22m7h7riix8w3vyhzax1m2pbwdirp59v532xn9b0cz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-html";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-html";
           sha256 = "0qf8f75b6dvy844dq8vh8d9c6k599rh1ynjcif9bwvdpf6pxwvqa";
           name = "ac-html";
         };
@@ -325,7 +325,7 @@
           sha256 = "1zmjqnlbfchnb7n2v7ms7q06xma1lmf9ry3v6f4pfnwlmz5lsf3a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-html-bootstrap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-html-bootstrap";
           sha256 = "0z71m6xws0k9smhsswaivpikr64mv0wh6klnmi5cwhwcqas6kdi1";
           name = "ac-html-bootstrap";
         };
@@ -346,7 +346,7 @@
           sha256 = "0p18wxyyc1jmcwx9y5i77s25v4jszv7cmm4bkwm4dzhkxd33kh1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-html-csswatcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-html-csswatcher";
           sha256 = "0jb9dnm2lxadrxssf0rjqw8yvvskcq4hys8c21shjyj3gkvwbfqn";
           name = "ac-html-csswatcher";
         };
@@ -367,7 +367,7 @@
           sha256 = "1acm13n59sdgvvzicscxzrr5j1x5sa5x4rc4cnkbwb28nw5a5ysm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-inf-ruby";
           sha256 = "04jclf0yxz78x1fsaf5sh1p466947nqrcx337kyhqn0nkj3hplqr";
           name = "ac-inf-ruby";
         };
@@ -388,7 +388,7 @@
           sha256 = "16qsj3wni4xhcrjx2rnxdzq6jb7jrl4bngi4an37vgdlrx3w8m6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-ispell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-ispell";
           sha256 = "1vsy2qjh60n5lavivpqhhcpg5pk8zz2r0wy1sb65capn841zdi67";
           name = "ac-ispell";
         };
@@ -409,7 +409,7 @@
           sha256 = "19cb8kq8gmrplkxil22ahvbyq5cng1l2vh2lrfiyqpjsap7zfjz5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-mozc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-mozc";
           sha256 = "1v3iiid8cq50i076q98ycks9m827xzncgxqwqs2rqhab0ncy3h0f";
           name = "ac-mozc";
         };
@@ -430,7 +430,7 @@
           sha256 = "16f8hvdz6y8nsfj7094yrvw194ag3w1jvz81h287vcgcvmyb7wdf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-octave";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-octave";
           sha256 = "1g5s4dk1rcgkjn17jfw6g201pw0vfhqcx1nhigmnizpnzy0man9z";
           name = "ac-octave";
         };
@@ -443,15 +443,15 @@
     ac-php = callPackage ({ auto-complete, company, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, php-mode, popup, s, xcscope, yasnippet }:
     melpaBuild {
         pname = "ac-php";
-        version = "1.7.1";
+        version = "1.7.2";
         src = fetchFromGitHub {
           owner = "xcwen";
           repo = "ac-php";
-          rev = "3147e2f10a3959c0f54fcc71f87a0a2ef64043d0";
-          sha256 = "11v45azd544fs4v5ndxxc2d6rbqh9r6mqx8gk1487jw7j290j6v8";
+          rev = "109c8fa6410e98bb4374c117590d2a58580571b6";
+          sha256 = "0qz8q9qzr7nqdhyjf01p50949bkps62nckampahv9bli4w92xckz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-php";
           sha256 = "0p9qq8nszp5jb71s35cxnmcxp50b62y2jv1ha7vvqfz5p8miallk";
           name = "ac-php";
         };
@@ -483,7 +483,7 @@
           sha256 = "0g7xbfsfqpmcay56y8xbmif52ccz430s3rjxf5bgl9ahkk7zgkzl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-racer";
           sha256 = "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp";
           name = "ac-racer";
         };
@@ -504,7 +504,7 @@
           sha256 = "13yghv7p6c91fn8mrxbwrb6ldk5n3b6nj6a7pwsvks1q73i1pl88";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ac-slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-slime";
           sha256 = "0mk3k1lcbqa16xvsbgk28x09vzqyaidqaqpq934xdbrwhdgwgckg";
           name = "ac-slime";
         };
@@ -525,7 +525,7 @@
           sha256 = "1pzh5l8dybrrmglj55nbff6065pxlbx14501p3a1qx1wvf24g1sv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-flyspell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-flyspell";
           sha256 = "0f24qrpcvyg7h6ylyggn4zrbydci537iigshac1d8yywsr0j47gd";
           name = "ace-flyspell";
         };
@@ -546,7 +546,7 @@
           sha256 = "0233ai62zhsy5yhv72016clygwp2pcg80y6kr4cjm2k1k2wwy7m9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-isearch";
           sha256 = "0n8qf08z9n8c2sp5ks29nxcfks5mil1jj6wq348apda8safk36hm";
           name = "ace-isearch";
         };
@@ -567,7 +567,7 @@
           sha256 = "1z82a0lrb61msamqpsy7rxcgs2nfhhckkk4zw0aw49l248p2nrgs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-jump-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-jump-buffer";
           sha256 = "0hkxa0ps0v1hwmjafqbnyr6rc4s0w95igk8y3w53asl7f5sj5mpi";
           name = "ace-jump-buffer";
         };
@@ -588,7 +588,7 @@
           sha256 = "0rrdh7jq23dyplq5rsf6f3a8v5f8smrzi85dgvqagasv74d19jbv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-jump-helm-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-jump-helm-line";
           sha256 = "04q8wh6jskvbiq6y2xsp2ir23vgz5zw09rm127sgiqrmn0jc61b9";
           name = "ace-jump-helm-line";
         };
@@ -609,7 +609,7 @@
           sha256 = "1bwvzh056ls2v7y26a0s4j5mj582dmds04lx4x6iqihs04ss74bb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-jump-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-jump-mode";
           sha256 = "0yk0kppjyblr5wamncrjm3ym3n8jcl0r0g0cbnwni89smvpngij6";
           name = "ace-jump-mode";
         };
@@ -630,7 +630,7 @@
           sha256 = "0yng6qayzqadk4cdviri84ghld4can35q134hm3n3j3vprhpbmca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-jump-zap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-jump-zap";
           sha256 = "07bkmly3lvlbby2m13nj3m1q0gcnwy5sas7d6ws6vr9jh0d36byb";
           name = "ace-jump-zap";
         };
@@ -651,7 +651,7 @@
           sha256 = "1v127ld04gn16bgismbcz91kfjk71f3g8yf10r4scfp603y41zgz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-link";
           sha256 = "1jl805r2s3wa0xyhss1q28rcy6y2fngf0yfcrcd9wf8kamhpajk5";
           name = "ace-link";
         };
@@ -664,15 +664,15 @@
     ace-pinyin = callPackage ({ ace-jump-mode, avy, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-pinyin";
-        version = "0.2.3";
+        version = "0.2.4";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "ace-pinyin";
-          rev = "10f66ba2355bed78ef0a1ad24edb00972a0dbe02";
-          sha256 = "10n01sgdi1zq1fyb5ani1fbvwfnqnj74rxzmw5v0y72cwq27r9kr";
+          rev = "2f6791b5f0ac1753ae0d0d7a486a385c17151b42";
+          sha256 = "1614xypwiv8xri7w921w7gj26zx7pvwk3212k71qn0capq7hs32g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-pinyin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-pinyin";
           sha256 = "18gmj71zd0i6yx8ifjxsqz2v81jx0j37f5kxllf31w7fj32ymbkc";
           name = "ace-pinyin";
         };
@@ -682,22 +682,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-popup-menu = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ace-popup-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-popup-menu";
-        version = "0.1.1";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "ace-popup-menu";
-          rev = "eb8d0d938debdf89575d2ed204aeb7c0b52060b0";
-          sha256 = "061gi4w43dvdys2i0ffc3bnzhrkc83h5x2c43yv4fwb3xz0zn9h0";
+          rev = "3e771b470b0c633d7633dceec054fc05beac81f0";
+          sha256 = "1qiiivkwa95bhyym8ly7fnwwglc9dcifkyr314bsq8m4rp1mgry4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-popup-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-popup-menu";
           sha256 = "1cq1mpv7v98bqrpsm598krq1741b6rwih71cx3yjifpbagrv4m5s";
           name = "ace-popup-menu";
         };
-        packageRequires = [ avy cl-lib emacs ];
+        packageRequires = [ avy-menu emacs ];
         meta = {
           homepage = "http://melpa.org/#/ace-popup-menu";
           license = lib.licenses.free;
@@ -714,7 +714,7 @@
           sha256 = "07mcdzjmgrqdvjs94f2n5bkrf5vrq2fwzz256wbm3wzqxqkfy1q6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ace-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-window";
           sha256 = "1k0x8m1phmvgdxb5aj841iai9q96a5lfq8i4b5vnlbc3w888n3xa";
           name = "ace-window";
         };
@@ -735,7 +735,7 @@
           sha256 = "0hib4a8385q2czi1yqs0hwnva2xi7kw0bdfnrgha1hrl30rilp2f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ack-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ack-menu";
           sha256 = "1d2kw04ndxji2qjcm1b65qnxpp08zx8gbia8bl6x6mnjb2isc2d9";
           name = "ack-menu";
         };
@@ -756,7 +756,7 @@
           sha256 = "0zybch8hz3mj63i0pxynb4d76ywqcy7b4fsa4hh71c2kb0bnczb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/actionscript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/actionscript-mode";
           sha256 = "1dkiay9jmizvslji5kzab4dxm1dq0jm8ps7sjq6710g7a5aqdvwq";
           name = "actionscript-mode";
         };
@@ -777,7 +777,7 @@
           sha256 = "1mb7dlyd5w161xagwn6w5h4q660dppkd50m71vz0w3zmxsc9a0vq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/adoc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/adoc-mode";
           sha256 = "0wgagcsh0fkb51fy17ilrs20z2vzdpmz97vpwijcfy2b9rypxq15";
           name = "adoc-mode";
         };
@@ -798,7 +798,7 @@
           sha256 = "1y9bw2vkl952pha2dsi18swyr94mihgwlcg5m8hg4d5bfg2fzcb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aes";
           sha256 = "11vl9x3ldrv7q7rd29xk4xmlvfxs0m6iys84f6mlgf00190l5r5v";
           name = "aes";
         };
@@ -819,7 +819,7 @@
           sha256 = "0hpsv2zyhhfm53hrd2lzvc9gpvfn6g5dpwmzxfl8l1sqjisips2a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ag";
           sha256 = "1r4ai09vdckkg4h4i7dp781qqmm4kky53p4q8azp3n2c78i1vz6g";
           name = "ag";
         };
@@ -840,7 +840,7 @@
           sha256 = "0nss26rz8qly0q00iq7i7q4ss3xvs4s5ndjjmfxhybmnb71a8y9k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aggressive-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aggressive-indent";
           sha256 = "1qi8jbr28gax35siim3hnnkiy8pa2vcrzqzc6axr98wzny46x0i2";
           name = "aggressive-indent";
         };
@@ -861,7 +861,7 @@
           sha256 = "1qqrf9ncc3blkv4p2bhh9q6y41pp9p4wr667mm80vb5j8rkpsaa8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ahk-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ahk-mode";
           sha256 = "066l4hsb49wbyv381qgn9k4hn8gxlzi20h3qaim9grngjj5ljbni";
           name = "ahk-mode";
         };
@@ -874,15 +874,15 @@
     airline-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, powerline }:
     melpaBuild {
         pname = "airline-themes";
-        version = "1.2";
+        version = "1.4";
         src = fetchFromGitHub {
           owner = "AnthonyDiGirolamo";
           repo = "airline-themes";
-          rev = "b7d06424ce7d596f5bff3105d3eaa416f173436a";
-          sha256 = "0q9m7lih760p7yrpqvpxdks5h6ac7dj4fi0qviyicbjlz9mqw7wp";
+          rev = "3c5f127daf1cf8a74e3c9956e11e56eedf5f3e76";
+          sha256 = "0blrpqn8wy9pwzikgzb0v6x4hk7axv93j4byfci62fh1905zfkkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/airline-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/airline-themes";
           sha256 = "0jkhb6nigyjmwqny7g59h4ssfy64vl3qnwcw46wnx5k9i73cjyih";
           name = "airline-themes";
         };
@@ -903,7 +903,7 @@
           sha256 = "0m05wxvvygc4rpkgnnmk6zrp3d8fylzzjz5ag7lh0jk5al4gfay5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/alchemist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/alchemist";
           sha256 = "18jxw0zb7y34qbm4bcpfpb2656f0h9grmrbfskgp4ra4q5q3n369";
           name = "alchemist";
         };
@@ -924,7 +924,7 @@
           sha256 = "1pk5dgjqrynap85700wdivq41bdqvwd5hkfimgmcd48l5lhj9pbj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/alect-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/alect-themes";
           sha256 = "04fq65qnxlvl5nc2q037c6yb4nf422dfw2913gv6zfh9rdmxsks8";
           name = "alect-themes";
         };
@@ -945,7 +945,7 @@
           sha256 = "1vpc3q40m6dcrslki4bg725j4kv6c6xfxwjjl1ilg7la49fwwf26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/alert";
           sha256 = "0x3cvczq09jvshz435jw2fjm69457x2wxdvvbbjq46nfnybhi118";
           name = "alert";
         };
@@ -966,7 +966,7 @@
           sha256 = "00kfnkr0rclzbir2xxzr9wf2g0hf1alc004v8i9mqf3ab6dgdqiy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/amd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/amd-mode";
           sha256 = "17ry6vm5xlmdfs0mykdyn05cik38yswq5axdgn8hxrvvb6f58d06";
           name = "amd-mode";
         };
@@ -987,7 +987,7 @@
           sha256 = "0sj6cr2bghy80dnwgl7rg61abdlvgfzi0jjc7jrxz7fdzwkcq714";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anaconda-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anaconda-mode";
           sha256 = "0gz16aam4zrm3s9ms13h4qcdflf55506kgkpyncq3bi54cvv8n1r";
           name = "anaconda-mode";
         };
@@ -1008,7 +1008,7 @@
           sha256 = "0fnxxvw81c34zhmiyr5awl92wr5941n4gklvzjc4jphaf2nhkg4w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anaphora";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anaphora";
           sha256 = "1wb7fb3pc4gxvpjlm6gjbyx0rbhjiwd93qwc4vfw6p865ikl19y2";
           name = "anaphora";
         };
@@ -1029,7 +1029,7 @@
           sha256 = "0gjynmzqlqz0d57fb4np6xrklqdn11y4vjbm18rlpvmk92bgw740";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/android-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/android-mode";
           sha256 = "1nqrvq411yg4b9xb5cvc7ai7lfalwc2rfhclzprvymc4vxh6k4cc";
           name = "android-mode";
         };
@@ -1050,7 +1050,7 @@
           sha256 = "1798nv4djhxzbin68zf6w7dbfm9sc39d0kygky52ii36arg5r1zp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/angular-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/angular-mode";
           sha256 = "1bwfmjldnxki0lqi3ys6r2a3nlhbwm1dibsg2dvzirq8qql02w1i";
           name = "angular-mode";
         };
@@ -1071,7 +1071,7 @@
           sha256 = "0h9i0iimanbvhbqy0cj9na335rs961pvhxjj4k8y53qc73xm102a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/angular-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/angular-snippets";
           sha256 = "057phgizn1c6njvdfigb23ljs31knq247gr0rcpqfrdaxsnnzm5c";
           name = "angular-snippets";
         };
@@ -1092,7 +1092,7 @@
           sha256 = "18ninv1z8zdqpqnablbds4zgxgk4c1nmznlfdicj6qs738c5c30s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/annotate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/annotate";
           sha256 = "1ajykgara2m713blj2kfmdz12fzm8jw7klyakkyi6i3c3a9m44jy";
           name = "annotate";
         };
@@ -1113,7 +1113,7 @@
           sha256 = "1ppq3kszzj2fgr7mwj565bjs8bs285ymy384cnnw7paddgcr9z02";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/annoying-arrows-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/annoying-arrows-mode";
           sha256 = "13bwqv3mv7kgi1gms58f5g03q5g7q98n4vv6n28zqmppxm5z33s7";
           name = "annoying-arrows-mode";
         };
@@ -1134,7 +1134,7 @@
           sha256 = "1hbddxarr40ygvaw4pwaivq2l4f0brszw73w1r50lkjlggb7bl3g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ansi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ansi";
           sha256 = "04n0kvaqq8214prdk20bplqyzlsnlzfzsg23ifkrzjgqjjpdcyi1";
           name = "ansi";
         };
@@ -1155,7 +1155,7 @@
           sha256 = "03d240jngxw51ybrsjw8kdxygrr0ymdckzwga2jr1bqf26v559j2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ansible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ansible";
           sha256 = "1xdc05fdglqfbizra6s1zl6knnvaq526dkxqnw9g7w269j8f4z8g";
           name = "ansible";
         };
@@ -1176,7 +1176,7 @@
           sha256 = "05z379k6a7xq9d2zapf687x3f37jpmh6kfghpgxdd18v0hzca8ds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ansible-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ansible-doc";
           sha256 = "03idvnn79fr9id81aivkm7g7cmlsg0c520wcq4da8g013xvi342w";
           name = "ansible-doc";
         };
@@ -1197,7 +1197,7 @@
           sha256 = "1i1xb04g17f6029w0n8fp55gklgr9kh6c24m9dfrkn5q3dlvd26p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anti-zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anti-zenburn-theme";
           sha256 = "1sp9p6m2jy4m9fdn1hz25cmasy0mwwgn46qmvm92i56f5x6jlzzk";
           name = "anti-zenburn-theme";
         };
@@ -1218,7 +1218,7 @@
           sha256 = "1z6l72dn98icqsmxb3rrj6l63ijc3xgfa3vdl19yqa2rfy6ya721";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anyins";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anyins";
           sha256 = "0ncf3kn8rackcidkgda2zs60km3hx87rwr9daj7ksmbb6am09s7c";
           name = "anyins";
         };
@@ -1238,7 +1238,7 @@
           sha256 = "86b90766ccb31a492998299092a3d0b892a8ac0bdb8e1833ef75fa6d79c7c721";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything";
           sha256 = "13pmks0bsby57v3vp6jcvvzwb771d4qq62djgvrw4ykxqzkcb8fj";
           name = "anything";
         };
@@ -1259,7 +1259,7 @@
           sha256 = "01lw9159axg5w9bpdy55m4zc902zmsqvk213ky1nmgnln0fvq3rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-exuberant-ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-exuberant-ctags";
           sha256 = "0p0jq2ggdgaxv2gd9m5iza0y3mjjc82xmgp899yr15pfffa4wihk";
           name = "anything-exuberant-ctags";
         };
@@ -1280,7 +1280,7 @@
           sha256 = "1834yj2vgs4dasdfnppc8iw8ll3yif948biq9hj0sbpsa2d8y44k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-replace-string";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-replace-string";
           sha256 = "1fagi6cn88p6sf1yhx1qsi7nw9zpyx9hdfl66iyskqwddfvywp71";
           name = "anything-replace-string";
         };
@@ -1301,7 +1301,7 @@
           sha256 = "1bcvin2694ypqgiw0mqk82riq7gw6ra10vbkzng1yp9jp2qr6wmm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anything-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-sage";
           sha256 = "1878vj8hzrwfyd2yvxcm0f1vm9m0ndwnj0pcq7j8zm9lxj0w48p3";
           name = "anything-sage";
         };
@@ -1314,15 +1314,15 @@
     anzu = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anzu";
-        version = "0.59";
+        version = "0.60";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-anzu";
-          rev = "6fded24b366efc4cf27166104c1928f7d1fedaa7";
-          sha256 = "1d2laybz1igrr9nnkmfsnrvsjw7qmrgby4wnrxprins9gq263lra";
+          rev = "dde4d83cfa4887db7deaf74232c9e051afb33050";
+          sha256 = "1dxaf68przg0hh0p1zhxsq2dysp3ln178yxhbqalxw67bjy8ikny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/anzu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anzu";
           sha256 = "0i2ia0jisj31vc2pjx9bhv8jccbp24q7c406x3nhh9hxjzs1f41i";
           name = "anzu";
         };
@@ -1343,7 +1343,7 @@
           sha256 = "13j2r4nx2x6j3qx50d5rdnqd8nl5idxdkhizsk7ccz3v2607fbyy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/apples-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/apples-mode";
           sha256 = "05ssnxs9ybc26jhr69xl9jpb41bz1688minmlc9msq2nvyfnj97s";
           name = "apples-mode";
         };
@@ -1364,7 +1364,7 @@
           sha256 = "1wyz8jvdy4m0cn75mm3zvxagm2gl10q51479f91gnqv14b4rndfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aproject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aproject";
           sha256 = "0v3gx2mff2s7knm69y253pm1yr4svy8w00pqbn1chrvymb62jhp2";
           name = "aproject";
         };
@@ -1385,7 +1385,7 @@
           sha256 = "133c1n4ra7z3vb6y47400y71a6ac19pyji0bgd4kr9fcbx0flx91";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/artbollocks-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/artbollocks-mode";
           sha256 = "0dlnxicn6nzyiz44y92pbl4nzr9jxfb9a99wacjrwq2ahdrwhhjp";
           name = "artbollocks-mode";
         };
@@ -1406,7 +1406,7 @@
           sha256 = "1s973vzivibaqjb8acn4ylrdasxh17jcfmmvqp4wm05nwhg75597";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/asilea";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/asilea";
           sha256 = "1lb8nr6r6yy06m4pxg8w9ja4zv8k5xwhl95v2wv95y1qwhgnwg3j";
           name = "asilea";
         };
@@ -1427,7 +1427,7 @@
           sha256 = "0z91alzf4ajj3r7pnwazynvp81cg67csy9kf87fk98024xldpkdp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/async";
           sha256 = "063ci4f35x1zm9ixy110i5ds0vsrcafpixrz3xkvpnfqdn29si3f";
           name = "async";
         };
@@ -1448,7 +1448,7 @@
           sha256 = "01ig5v5f2xya7hyq678nd8j8x972yfbni813c0imxkkba996a2k7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aurel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aurel";
           sha256 = "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl";
           name = "aurel";
         };
@@ -1469,7 +1469,7 @@
           sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/aurora-config-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aurora-config-mode";
           sha256 = "0yqmpwj1vp0d5w9zw1hbyxzsbvw165dsgk1v1dxizkqwn7b1v7jm";
           name = "aurora-config-mode";
         };
@@ -1490,7 +1490,7 @@
           sha256 = "0gi65n1np63zi2ylc4y1licwvk97jl92s1v98fv5y61kppi1d8sq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auth-password-store";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auth-password-store";
           sha256 = "118ll12dhhxmlsp2mxmy5cd91166a1qsk406yhap5zw1qvyg58w5";
           name = "auth-password-store";
         };
@@ -1511,7 +1511,7 @@
           sha256 = "07vnk8az4lcxncqn01jvks38b4hpdmg43nbby2b39zy50agqnwsg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-compile";
           sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks";
           name = "auto-compile";
         };
@@ -1532,7 +1532,7 @@
           sha256 = "0q880dksf3bj1hixa4zhj3ybvrqf1wcnjnmb37i49qwdy6p1ma06";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete";
           sha256 = "1c4ij5bnclg94jdzhkqvq2vxwv6wvs051mbki1ibjm5f2hlacvh3";
           name = "auto-complete";
         };
@@ -1553,7 +1553,7 @@
           sha256 = "1kp2l1cgzlg2g3wllz4gl1ssn4lnx2sn26xqigfrpr8y5rj2bsfj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-clang-async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-clang-async";
           sha256 = "1jj0jn1v3070g7g0j5gvpybv145kki8nsjxqb8fjf9qag8ilfkjh";
           name = "auto-complete-clang-async";
         };
@@ -1574,7 +1574,7 @@
           sha256 = "1fqgyg986fg1dzac5wa97bx82mfddqb6qrfnpr3zksmw3vgykxr0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-exuberant-ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-exuberant-ctags";
           sha256 = "1i2s3ycc8jafkzdsz3kbvx1hh95ydi5s6rq6n0wzw1kyy3km35gd";
           name = "auto-complete-exuberant-ctags";
         };
@@ -1595,7 +1595,7 @@
           sha256 = "18bf1kw85mab0zp7rn85cm1nxjxg5c1dmiv0j0mjwzsv8an4px5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-nxml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-nxml";
           sha256 = "0viscr5k1carn9vhflry16kgihr6fvh6h36b049pgnk6ww085k6a";
           name = "auto-complete-nxml";
         };
@@ -1616,7 +1616,7 @@
           sha256 = "1hf2f903hy9afahrgy2fx9smgn631drs6733188zgqi3nkyizj26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-pcmp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-pcmp";
           sha256 = "1mpgkwj8jwpvxphlm6iaprwjrldmihbgg97jav0fbm1kjnm4azna";
           name = "auto-complete-pcmp";
         };
@@ -1637,7 +1637,7 @@
           sha256 = "0l49ciic7g30vklxq6l1ny3mz87l5p8qc30rmkjvkzvg8r52ksn3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-complete-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-sage";
           sha256 = "02sxbir3arvmnkvxgndlkln9y05jnlv6i8czd6a0wcxk4nj43lq1";
           name = "auto-complete-sage";
         };
@@ -1658,7 +1658,7 @@
           sha256 = "191294k92qp8gmfypf0q8j8qrym96aqikzvyb9p03wqvbr3r1dsk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-dictionary";
           sha256 = "1va485a8lxvb3507kr83cr6wpssxnf8y4l42mamn9daa8sjx3q16";
           name = "auto-dictionary";
         };
@@ -1679,7 +1679,7 @@
           sha256 = "1hlsgsdxpx42kmqkjgy9b9ldz5i4dbi879v87pjd2qbkj8iywb6y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-indent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-indent-mode";
           sha256 = "1nk78p8lqs8cx90asfs8iaqnwwyy8fi5bafaprm9c0nrxz299ibz";
           name = "auto-indent-mode";
         };
@@ -1700,7 +1700,7 @@
           sha256 = "05llpa6g4nb4qswmcn7j3bs7hnmkrkax7hsk7wvklr0wrljyg9a2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-package-update";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-package-update";
           sha256 = "0fdcniq5mrwbc7yvma4088r0frdfvc2ydfil0s003faz0nrjcp8k";
           name = "auto-package-update";
         };
@@ -1721,7 +1721,7 @@
           sha256 = "1h8zsgw30axprs7a5kkygbhvilillzazxgqz01ng36il65fi28s6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-shell-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-shell-command";
           sha256 = "1i78fh72i8yv91rnabf0vs78r43qrjkr36hndmn5ya2xs3b1g41j";
           name = "auto-shell-command";
         };
@@ -1742,7 +1742,7 @@
           sha256 = "0n3r7j83csby2s7284hy5pycynazyrkljxkn6xqn08gvxbbbdpdq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/auto-yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-yasnippet";
           sha256 = "02281gyy07cy72a29fjsixg9byqq3izb9m1jxv98ni8pcy3bpsqa";
           name = "auto-yasnippet";
         };
@@ -1763,7 +1763,7 @@
           sha256 = "1pf2mwnicj5x2kksxwmrzz2vfxj9y9r6rzgc1fl8028mfrmrmg8s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autodisass-java-bytecode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autodisass-java-bytecode";
           sha256 = "1k19nkbxnysm3qkpdhz4gv2x9nnrp94xl40x84q8n84s6xaan4dc";
           name = "autodisass-java-bytecode";
         };
@@ -1784,7 +1784,7 @@
           sha256 = "1hyp49bidwc53cr25wwwyzcd0cbbqzxkfcpnccimphv24qfsai85";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autodisass-llvm-bitcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autodisass-llvm-bitcode";
           sha256 = "0bh73nzll9jp7kiqfnb5dwkipw85p3c3cyq58s0nghig02z63j01";
           name = "autodisass-llvm-bitcode";
         };
@@ -1805,7 +1805,7 @@
           sha256 = "0g6kd1r0wizamw26bhp5jkvpsd98rcybkfchc622b9v5b89a07nq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/autopair";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autopair";
           sha256 = "161qhk8rc1ldj9hpg0k9phka0gflz9vny7gc8rnylk90p6asmr28";
           name = "autopair";
         };
@@ -1818,15 +1818,15 @@
     avy = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "avy";
-        version = "0.3.0";
+        version = "0.4.0";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "avy";
-          rev = "44d76b9d2aad5477521675747a5c769f3f9a69a0";
-          sha256 = "15xfgmsy4sqs3cmk7dwmj21g3r9dqb3fra7n7ly306bwgzh4vm8k";
+          rev = "369af594e5ea28be1d91b22753aace16baadc046";
+          sha256 = "0rq9ab264565z83cly743nbhrd9m967apmnlhqr1gy8dm4hcy7nm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/avy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/avy";
           sha256 = "0gjq79f8jagbngp0shkcqmwhisc3hpgwfk34kq30nb929nbnlmag";
           name = "avy";
         };
@@ -1836,6 +1836,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    avy-menu = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "avy-menu";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "avy-menu";
+          rev = "9b8c6be09487dd3e804a10761266c4f22923eb9c";
+          sha256 = "1564yv9330vjymw3xnikc2lz20f65n40fbl8m1zs1gp4nlgzkk38";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/avy-menu";
+          sha256 = "1g2bsm0jpig51jwn9f9mx6z5glb0bn4s21194xam768qin0rf4iw";
+          name = "avy-menu";
+        };
+        packageRequires = [ avy emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/avy-menu";
+          license = lib.licenses.free;
+        };
+      }) {};
     avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
     melpaBuild {
         pname = "avy-migemo";
@@ -1847,7 +1868,7 @@
           sha256 = "098bkqb2cndjx93jacj6p54xfy14m1iknvpv1y5rffy9p4l2cbd3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/avy-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/avy-migemo";
           sha256 = "1zvgkhma445gj1zjl8j25prw95bdpjbvfy8yr0r5liay6g2hf296";
           name = "avy-migemo";
         };
@@ -1868,7 +1889,7 @@
           sha256 = "0lmv34pi9qdh76fi3w4lrfyfhzr824nsiif4nyjvpnmrabxgk309";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/avy-zap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/avy-zap";
           sha256 = "1zbkf21ggrmg1w0xaw40i3swgc1g4fz0j8p0r9djm9j120d94zkx";
           name = "avy-zap";
         };
@@ -1889,7 +1910,7 @@
           sha256 = "0px1xggk6qyrwkma1p3d7b4z2id2gbrsxkliw3nwc1q4zndg1zr7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/babel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/babel";
           sha256 = "0sdpp4iym61ni32zv75n48ylj4jib8ca6n9hyqwj1b7nqg76mm1c";
           name = "babel";
         };
@@ -1910,7 +1931,7 @@
           sha256 = "0hmn3jlsqgpc602lbcs9wzw0hgr5qpjdcxi2hjlc1cp27ilyscnf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/back-button";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/back-button";
           sha256 = "0vyhvm445d0rs14j5xi419akk5nd88d4hvm4251z62fmnvs50j85";
           name = "back-button";
         };
@@ -1937,7 +1958,7 @@
           sha256 = "1plh7i4zhs5p7qkv7p7lnfrmkszn8b3znwvbxgp7wpxay5safc5j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/badwolf-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/badwolf-theme";
           sha256 = "03plkzpmlh0pgfp1c9padsh4w2g23clsznym8x4jabxnk0ynhq41";
           name = "badwolf-theme";
         };
@@ -1958,7 +1979,7 @@
           sha256 = "11rlmrjdpa3vnf0h9vcd75946q9jyf1mpbm7h12hmpj6g2pavgdd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bash-completion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bash-completion";
           sha256 = "0l41yj0sb87i27hw6dh35l32hg4qkka6r3bpkckjnfm0xifrd9hj";
           name = "bash-completion";
         };
@@ -1979,7 +2000,7 @@
           sha256 = "1xvxz9sk9l57a4kiiavxxdp0v241mfgiy2lg5ilacq1cd6xrrhky";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbcode-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbcode-mode";
           sha256 = "0ixxavmilr6na56yc148prbh3nlhcwir6rxqvh332cr8vr9gmp89";
           name = "bbcode-mode";
         };
@@ -2000,7 +2021,7 @@
           sha256 = "17nbnkg0zn6p89r27mk9hl6qhv6xscwdsq8iyikdw03svpr16lnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-";
           sha256 = "1vzbalcchay4pxl9f1sxg0zclgc095f59dlj15pj0bqq61sbl9jf";
           name = "bbdb-";
         };
@@ -2021,7 +2042,7 @@
           sha256 = "0fg72qnb40djyciy4gzj359lqlcbbrq0indbkzd0dj09zipkx0df";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb-vcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-vcard";
           sha256 = "1kn98b7mh9a28933r4yl8qfl9p92rpix4vkp71sar9cka0m71ilj";
           name = "bbdb-vcard";
         };
@@ -2042,7 +2063,7 @@
           sha256 = "1zkh7dcas80wwjvigl27wj8sp4b5z6lh3qj7zkziinwamwnxbdbs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bbdb2erc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb2erc";
           sha256 = "0k1f6mq9xd3568vg01dqqvcdbdshbdsi4ivkjyxis6dqfnqhlfdd";
           name = "bbdb2erc";
         };
@@ -2063,7 +2084,7 @@
           sha256 = "01d10algmi9a4xd7mzf7n3zxfs2qf5as66wx17mff5cd8dahxj1q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/beeminder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/beeminder";
           sha256 = "0aj7ix7nrsl89f9c449kik8fbzhfk9li50wrh50cdwgfh8gda0fx";
           name = "beeminder";
         };
@@ -2084,7 +2105,7 @@
           sha256 = "1agrci37bni1vfkxg171l53fvsnjdryhf05v54wj07jngnwf3cw9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/beginend";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/beginend";
           sha256 = "1y81kr9q0zrsr3c3s14rm6l86y5wf1a0kia6d98112fy4fwdm7kq";
           name = "beginend";
         };
@@ -2097,15 +2118,15 @@
     better-defaults = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "better-defaults";
-        version = "0.1.2";
+        version = "0.1.3";
         src = fetchFromGitHub {
           owner = "technomancy";
           repo = "better-defaults";
-          rev = "c286d55528f148733c696fe07eb01073dc412fb8";
-          sha256 = "09cn3dnaq88jwmmxfg76168s8f4wbmp6y2dv13rhwagihx9mf20m";
+          rev = "90df5752a0a0602feb47aadfd3542aa7fc841bd8";
+          sha256 = "1rxznx2l0cdpiz8mad8s6q17m1fngpgb1cki7ch6yh18r3qz8ysr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/better-defaults";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/better-defaults";
           sha256 = "13bqcmx2gagm2ykg921ik3awp8zvw5d4lb69rr6gkpjlqp7nq2cm";
           name = "better-defaults";
         };
@@ -2126,7 +2147,7 @@
           sha256 = "07vwg0bg719gb8ln1n5a33103903vvrphnkbvvfn43904pkrf14w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bind-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bind-key";
           sha256 = "1qw2c27016d3yfg0w10is1v72y2jvzhq07ca4h6v17yi94ahj5xm";
           name = "bind-key";
         };
@@ -2147,7 +2168,7 @@
           sha256 = "0pmpg54faq0l886f2cmnmwm28d2yfg8adk7gp7623gx0ifggn332";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bing-dict";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bing-dict";
           sha256 = "0s5pd08rcnvmgi1hw17xbzvswlv0yni6h2h2gccrjmf6izi8whh1";
           name = "bing-dict";
         };
@@ -2168,7 +2189,7 @@
           sha256 = "1r3f5d67x257g8kvdbdsl4w3y1dvc1d6s9x8bygbkvyahfi5m5hn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/birds-of-paradise-plus-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/birds-of-paradise-plus-theme";
           sha256 = "0vdv2siy30kf1qhzrc39sygjk17lwm3ix58pcs3shwkg1y5amj3m";
           name = "birds-of-paradise-plus-theme";
         };
@@ -2189,7 +2210,7 @@
           sha256 = "1j2ar9sinbrraqvymqmjray48xbr1arhpigzgkgnhkc2zzqv8dwb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bog";
           sha256 = "1ci8xxca7dclmi5v37y5k45qlmzs6a9hi6m7czgiwxii902w5pkl";
           name = "bog";
         };
@@ -2210,7 +2231,7 @@
           sha256 = "1q3ws2vn062dh7ci6jn2k2bcn7szh3ap64sgwkzdd6f1pas37fnr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bongo";
           sha256 = "07i9gw067r2igp6s2g2iakm1ybvw04q6zznna2cfdf08nax64ghv";
           name = "bongo";
         };
@@ -2231,7 +2252,7 @@
           sha256 = "1apxgj14hgfpz6hjp3384yjf2zrkv4pcncf2zklijs668igvaskq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/boon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/boon";
           sha256 = "0gryw7x97jd46jgrm93cjagj4p7w93cjc36i2ps9ajf0d8m4gajb";
           name = "boon";
         };
@@ -2252,7 +2273,7 @@
           sha256 = "0235l4f1cxj7nysfnay4fz52mg0c13pzqxbhw65vdpfzz1gl1p73";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/boxquote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/boxquote";
           sha256 = "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s";
           name = "boxquote";
         };
@@ -2273,7 +2294,7 @@
           sha256 = "0y9m6cv70pzcm0v2v8nwmyh1xx40831chx72m85h5ic5db03gy7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/browse-kill-ring";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/browse-kill-ring";
           sha256 = "1d97ap0vrg5ymp96z7y6si98fspxzy02jh1i4clvw5lggjfibhq4";
           name = "browse-kill-ring";
         };
@@ -2294,7 +2315,7 @@
           sha256 = "08qz9l0gb7fvknzkp67srhldzkk8cylnbn0qwkflxgcs6ndfk95y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/browse-url-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/browse-url-dwim";
           sha256 = "13bv2ka5pp9k4kwrxfqfawwxzsqlakvpi9a32gxgx7qfi0dcb1rf";
           name = "browse-url-dwim";
         };
@@ -2315,7 +2336,7 @@
           sha256 = "0s43cvkr1za5sd2cvl55ig34wbp8xyjf85snmf67ps04swyyk92q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buffer-flip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buffer-flip";
           sha256 = "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098";
           name = "buffer-flip";
         };
@@ -2336,7 +2357,7 @@
           sha256 = "0xdks4jfqyhkh34y48iq3gz8swp0f526kwnaai5mhgvazvs4za8c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buffer-move";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buffer-move";
           sha256 = "0wysywff2bggrha7lpl83c8x6ln7zgdj9gsqmjva6gramqb260fg";
           name = "buffer-move";
         };
@@ -2357,7 +2378,7 @@
           sha256 = "0rp9hiysy13c4in7b420r7yjza2knlmvphj7l01xbxphbilplqk5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buffer-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buffer-utils";
           sha256 = "0cfipdn4fc4fvz513mwiaihvbdi05mza3z5z1379wlljw6r539z2";
           name = "buffer-utils";
         };
@@ -2378,7 +2399,7 @@
           sha256 = "0x9q4amsmawi8jqj9xxg81khvb3gyyf9hjvb0w6vhrgjwpxiq8sy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bufshow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bufshow";
           sha256 = "027cd0jzb8yxm66q1bhyi75f2m9f2pq3aswgav1d18na3ybwg65h";
           name = "bufshow";
         };
@@ -2399,7 +2420,7 @@
           sha256 = "07jzg58a3jxs4mmsgb35f5f8awazlvzak9wrhif6xb60jq1wrp0v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bug-reference-github";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bug-reference-github";
           sha256 = "18yzxwanbrxsab6ba75z1196x0m6dapdhbvy6df5b5x5viz99cf6";
           name = "bug-reference-github";
         };
@@ -2420,7 +2441,7 @@
           sha256 = "18d74nwcpk1i8adxzfwz1lgqqcxsc4wkrb490v64pph79dxsi80h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bundler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bundler";
           sha256 = "0i5ybc6i8ackxpaa75kwrg44zdq3jkvy48c42vaaafpddjwjnsy4";
           name = "bundler";
         };
@@ -2441,7 +2462,7 @@
           sha256 = "03hab3iw2jjckal20zwsw7cm38nf7pan0m96d8ab4i75phy6liyw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/bury-successful-compilation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bury-successful-compilation";
           sha256 = "1gkq4r1573m6m57fp7x69k7kcpqchpcqfcz3792v0wxr22zhkwr3";
           name = "bury-successful-compilation";
         };
@@ -2462,7 +2483,7 @@
           sha256 = "1pii9dw4skq7nr4na6qxqasl36av8cwjp71bf1fgppqpcd9z8skj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/butler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/butler";
           sha256 = "1jv74l9jy55qpwf5np9nlj6a1wqsm3xirm7wm89d1h2mbsfcr0mq";
           name = "butler";
         };
@@ -2483,7 +2504,7 @@
           sha256 = "0lpfx7q0qrclxii4ffrrjffb678bsx908za91nsy7mc2g0cxcapb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/buttercup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buttercup";
           sha256 = "1grrrdk5pl9l1jvnwzl8g0102gipvxb5qn6k2nmv28jpl57v8dkb";
           name = "buttercup";
         };
@@ -2504,7 +2525,7 @@
           sha256 = "1kqcc1d56jz107bswlzvdng6ny6qwp93yck2i2j921msn62qvbb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/button-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/button-lock";
           sha256 = "1arrdmb3nm570hgs18y9sz3z9v0wlkr3vwa2zgfnc15lmf0y34mp";
           name = "button-lock";
         };
@@ -2525,7 +2546,7 @@
           sha256 = "1k2hmc87ifww95k3m8ksiswkk2z0y8grssba7381g8dnlp6jgprx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cacoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cacoo";
           sha256 = "0kri4vi6dpsf0zk24psm16f3aa27cq5b54ga7zygmr02csq24a6z";
           name = "cacoo";
         };
@@ -2546,7 +2567,7 @@
           sha256 = "0bvrwzjx93qyx97qqw0imvnkkx4w91yk99rnhcmk029zj1fy0kzg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cake";
           sha256 = "06qlqrazz2jr08g44q73hx9vpp6xnjvkpd6ky108g0xc5p9q2hcr";
           name = "cake";
         };
@@ -2567,7 +2588,7 @@
           sha256 = "1w7yq35gzzwyf480d8gc5r6jbnawg09l6663q068ir6zr9pp4far";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cake-inflector";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cake-inflector";
           sha256 = "04mrqcm1igb638skaq2b3nr5yzxnck2vwhln61rnh7lkfxq7wbwf";
           name = "cake-inflector";
         };
@@ -2588,7 +2609,7 @@
           sha256 = "15w21r0gqblbn9wlvb4wlm3706wf01r38mp465snjzi839f6sazb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cake2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cake2";
           sha256 = "03q8vqqjlhahgnyy976c46x52splwdjpmb9ngrj5c2z7d8n9145x";
           name = "cake2";
         };
@@ -2609,7 +2630,7 @@
           sha256 = "1rv6slk3a7ca2q16isjlkmgxbxmbqx4lx2ip7z33fvnq10r5h60n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/calfw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/calfw";
           sha256 = "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8";
           name = "calfw";
         };
@@ -2630,7 +2651,7 @@
           sha256 = "0v927m3l5cf0j0rs0nfk5whwqmmxs941d8qalxi19j1ihspjz8d6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/camcorder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/camcorder";
           sha256 = "1kbnpz3kn8ycpy8nlp8bsnnd1k1h7m02h7w5f7raw97sk4cnpvbi";
           name = "camcorder";
         };
@@ -2651,7 +2672,7 @@
           sha256 = "152d5ym4bqnlnp6rafgy8fafx8246n78ymlcx9k2nyfar4c0lir2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cargo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cargo";
           sha256 = "06zq657cxfk5l4867qqsvhskcqc9wswyl030wj27a43idj8n41jx";
           name = "cargo";
         };
@@ -2672,7 +2693,7 @@
           sha256 = "0mg49rpz362ipn5qzqhyfs3d6fpb51rfa73kna3gxdw0wxq2sa7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/caseformat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/caseformat";
           sha256 = "1qwyr74jbx4jpfcw8sccg47q1vdg094rr06m111gsz2yaj9m0gfk";
           name = "caseformat";
         };
@@ -2693,7 +2714,7 @@
           sha256 = "1hvm6r6a8rgjwnn2mcamwqrmhz424vlr4mbvbri3wmn0ikbk510l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cask";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cask";
           sha256 = "11nr6my3vlb1xiyai7qwii3nszda2mnkhkjlbh3d0699h0yw7dk5";
           name = "cask";
         };
@@ -2714,7 +2735,7 @@
           sha256 = "0padb1zfjkmx9kbqnqh744qvpd3ln0khwxifxld9cpcpdp5k04vc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cask-package-toolset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cask-package-toolset";
           sha256 = "13ix093c0a58rjqj7zfp3914xj3hvj276gb2d8zhvrx9vvs1345g";
           name = "cask-package-toolset";
         };
@@ -2735,7 +2756,7 @@
           sha256 = "1j1lw5zifp7q1ykm6si0nzxfp7n3z2lzla2njkkxmc2s6m7w4x1a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/caskxy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/caskxy";
           sha256 = "0x4s3c8m75zxsvqpgfc5xwll0489zzdnngmnq048z9gkgcd7pd2s";
           name = "caskxy";
         };
@@ -2745,6 +2766,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    cbm = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "cbm";
+        version = "0.3";
+        src = fetchFromGitHub {
+          owner = "akermu";
+          repo = "cbm.el";
+          rev = "2f319b3ea6d434f9f9f9ace53a0ca968f3787a4c";
+          sha256 = "125d5i7ycdn2hgffc1l3jqcfzvk70m1ciywj4h53qakkl15r9m38";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cbm";
+          sha256 = "02ch0gdw610c8dfxxjxs7ijsc9lzbhklj7hqgwfwksnyc36zcjmn";
+          name = "cbm";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/cbm";
+          license = lib.licenses.free;
+        };
+      }) {};
     cdlatex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cdlatex";
@@ -2756,7 +2798,7 @@
           sha256 = "1jj9vmhc4s3ych08bjm1c2xwi81z1p20rj7bvxrgvb5aga2ghi9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cdlatex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cdlatex";
           sha256 = "1jsfmzl13fykbg7l4wv9si7z11ai5lzvkndzbxh9cyqlvznq0m64";
           name = "cdlatex";
         };
@@ -2777,7 +2819,7 @@
           sha256 = "07h5g905i1jglsryl0dnqxz8yya5kkyjjggzbk4nl3rcj41lyas7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/celery";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/celery";
           sha256 = "0m3hmvp6xz2m7z1kbb0ii0j3c95zi19652gfixq5a5x23kz8y59h";
           name = "celery";
         };
@@ -2798,7 +2840,7 @@
           sha256 = "08hqgsjvs62l1cfzshbpj80xd8365qmx2b5r5jq20d5cj68s36wl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cerbere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cerbere";
           sha256 = "1g3svmh5dlh5mvyag3hmiy90dfkk6f7ppd9qpwckxqyll9vl7r06";
           name = "cerbere";
         };
@@ -2811,15 +2853,15 @@
     cfengine-code-style = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cfengine-code-style";
-        version = "3.8.0.2.1";
+        version = "3.8.1";
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "afed90c14a2b30bc36595626b959522c34a6565f";
-          sha256 = "11a89pyz8zdjdkimpqaywp702xf9cmwz1djkjp5dghgpwi1aid72";
+          rev = "2df2383cc697250d996630d0a1f88e3a2f0e052b";
+          sha256 = "190gr30bscl80awilcjflwy9n7nvlz0hzmzmpx1wsa3wj3zf89yy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cfengine-code-style";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cfengine-code-style";
           sha256 = "1ny8xvdnz740qmw9m81xnwd0gh0a516arpvl3nfimglaai5bfc9a";
           name = "cfengine-code-style";
         };
@@ -2829,6 +2871,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    char-menu = callPackage ({ avy-menu, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "char-menu";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "char-menu";
+          rev = "5bdd7e880f89f27dbabe11def0fd31225b7f1c0a";
+          sha256 = "0vb03k10i8vwy5wv65xl15kcsh9zz4y2xhpgndih87ssckdnhhlw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/char-menu";
+          sha256 = "11jkwghrmmvpv7piznkpa0wilwjdsps9rix3950pfabhlllw268l";
+          name = "char-menu";
+        };
+        packageRequires = [ avy-menu emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/char-menu";
+          license = lib.licenses.free;
+        };
+      }) {};
     charmap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "charmap";
@@ -2840,7 +2903,7 @@
           sha256 = "0crnd64cnsnaj5mcy55q0sc1rnamxa1xbpwpmirhyhxz780klww6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/charmap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/charmap";
           sha256 = "1j7762d2i17ysn9ys8j7wfv989avmax8iylml2hc26mwbpyfpm84";
           name = "charmap";
         };
@@ -2861,7 +2924,7 @@
           sha256 = "09ypxhfad3v1pz0xhw4xgxvfj7ad2kb3ff9zy1mnw7fzsa7gw6nj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/checkbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/checkbox";
           sha256 = "17gw6w1m6bs3sfx8nqa8nzdq26m8w85a0fca5qw3bmd18bcmknqa";
           name = "checkbox";
         };
@@ -2882,7 +2945,7 @@
           sha256 = "1jsy43avingxxccs0zw2qm5ysx8g76xhhh1mnyypxskl9m60qb4j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/chinese-word-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chinese-word-at-point";
           sha256 = "0pjs4ckncv84qrdj0pyibrbiy86f1gmjla9n2cgh10xbc7j9y0c4";
           name = "chinese-word-at-point";
         };
@@ -2895,15 +2958,15 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "0.10.1";
+        version = "0.10.2";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "93e061b99c1e6f3098b098d884a37778dbca9825";
-          sha256 = "1amj1qad03b7hw6isxh1389mi4i9q0jym57csj95q4mgamgk9vhj";
+          rev = "336055e84b9685a7959fd05bc65a16febd8e83cc";
+          sha256 = "1bk7h7h6sqf1qb5lpmmigx7aviyw65dnj3724q55ld6pgpy5q6vz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cider";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cider";
           sha256 = "1a6hb728a3ir18c2dn9zfd3jn79fi5xjn5gqr7ljy6qb063xd4qx";
           name = "cider";
         };
@@ -2924,7 +2987,7 @@
           sha256 = "1rkd76561h93si4lpisz3qnaj48dx8x01nd59a3lgpqsbbibnccf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cider-eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cider-eval-sexp-fu";
           sha256 = "1n4sgv042qd9560pllabysx0c5snly6i22bk126y8f8rn0zj58iq";
           name = "cider-eval-sexp-fu";
         };
@@ -2945,7 +3008,7 @@
           sha256 = "1w0ya0446rqsg1j59fd1mp4wavv2f3h1k3mw9svm5glymdirw4d1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cil-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cil-mode";
           sha256 = "1h18r086bqspyn5n252yzw8x2zgyaqzdd8pbcf5gqlh1w8kapq4y";
           name = "cil-mode";
         };
@@ -2966,7 +3029,7 @@
           sha256 = "0q3rv6lk37yybkbswmn4pgzca0nfhvf4h3ac395fr16k5ixybc5q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/circe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/circe";
           sha256 = "1f54d8490gfx0r0cdvgmcjdxqpni43msy0k2mgqd1qz88a4b5l07";
           name = "circe";
         };
@@ -2987,7 +3050,7 @@
           sha256 = "12vgi5dicx3lxzngjcg9g3nflrhfy9wdw6ldm72zarp1h96jy5cw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cl-lib-highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cl-lib-highlight";
           sha256 = "13qdrvpxq928p27b1xdcbsscyhqk042rwfa17037gp9h02fd42j8";
           name = "cl-lib-highlight";
         };
@@ -3008,7 +3071,7 @@
           sha256 = "11c0zpk8gg70d4xiiyjc7v13knwb2ihbrxnlaxzh3rdg2c12676q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cliphist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cliphist";
           sha256 = "0mg6pznijba3kvp3r57pi54v6mgih2vfwj2kg6qmcy1abrc0xq29";
           name = "cliphist";
         };
@@ -3029,7 +3092,7 @@
           sha256 = "0i6sj5rs4b9v8aqq9l6wr15080qb101hdxspx6innhijhajgmssd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clips-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clips-mode";
           sha256 = "083wrhjn04rg8vr6j0ziffdbdhbfn63wzl4q7yzpkf8qckh6mxhf";
           name = "clips-mode";
         };
@@ -3050,7 +3113,7 @@
           sha256 = "1w0lv2d916wxfakcy11avmn9f6nsmxff02dpyih5kx6ncgqv1bnd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clj-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clj-refactor";
           sha256 = "1qvds6dylazvrzz1ji2z2ldw72pa2nxqacb9d04gasmkqc32ipvz";
           name = "clj-refactor";
         };
@@ -3080,7 +3143,7 @@
           sha256 = "18gv8vmmpiyq16cq4nr9nk2bmc5y2rsv21wjl4ji29rc7566shha";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cljr-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cljr-helm";
           sha256 = "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc";
           name = "cljr-helm";
         };
@@ -3093,15 +3156,15 @@
     clocker = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "clocker";
-        version = "0.0.10";
+        version = "0.0.11";
         src = fetchFromGitHub {
           owner = "roman";
           repo = "clocker.el";
-          rev = "6faf5a23dc9cbe506f21a11fae4f6c4bbb1d4b01";
-          sha256 = "1s05644m048clz0lxizzgarh1bkyjxr96b0mbpxi2p003322aw09";
+          rev = "4a4831ed4e42e18976edd16b844cb16cb78f3c17";
+          sha256 = "0hz6a7gj0zfsdaifkhwf965c96rkjc3kivvqlf50zllsw0ysbnn0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clocker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clocker";
           sha256 = "0cckrk40k1labiqjh7ghzpx5zi136xz70j3ipp117x52qf24k10k";
           name = "clocker";
         };
@@ -3122,7 +3185,7 @@
           sha256 = "1x1kfycf3023z0r3v7xqci59k8jv5wn2vqc9y0nx7k5qgifmswrx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-cheatsheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-cheatsheet";
           sha256 = "05sw3bkdcadslpsk64ds0ciavmdgqk7fr5q3z505vvafmszfnaqv";
           name = "clojure-cheatsheet";
         };
@@ -3135,15 +3198,15 @@
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "5.1.0";
+        version = "5.2.0";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "126c23a9d905da7afd82917494648b5068d47f54";
-          sha256 = "1dkzbvmdyc6gwm8c67blv4a67p7mji417r0pcwzl8brfqlis9gsw";
+          rev = "412bb7ae57c59eb7c99b8273e5c94b38105b18af";
+          sha256 = "1bhgvj4w8k4ycndnxgfnifc065jbxq8vsxfz3s6w64qx54biqxj3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-mode";
           sha256 = "11n0rjhs1mmlzdqy711g432an5ybdka5xj0ipsk8dx6xcyab70np";
           name = "clojure-mode";
         };
@@ -3156,15 +3219,15 @@
     clojure-mode-extra-font-locking = callPackage ({ clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode-extra-font-locking";
-        version = "5.1.0";
+        version = "5.2.0";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "126c23a9d905da7afd82917494648b5068d47f54";
-          sha256 = "1dkzbvmdyc6gwm8c67blv4a67p7mji417r0pcwzl8brfqlis9gsw";
+          rev = "412bb7ae57c59eb7c99b8273e5c94b38105b18af";
+          sha256 = "1bhgvj4w8k4ycndnxgfnifc065jbxq8vsxfz3s6w64qx54biqxj3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-mode-extra-font-locking";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-mode-extra-font-locking";
           sha256 = "00nff9mkj61i76dj21x87vhz0bbkzgvkx1ypkxcv6yf3pfhq7r8n";
           name = "clojure-mode-extra-font-locking";
         };
@@ -3185,7 +3248,7 @@
           sha256 = "0sw34yjp8934xd2n76lbwyvxkbyz5pxszj6gkflas8lfjvms9z7d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-quick-repls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-quick-repls";
           sha256 = "10glzyd4y3918pwp048pc1y7y7fa34fkqckn1nbys841dbssmay0";
           name = "clojure-quick-repls";
         };
@@ -3206,7 +3269,7 @@
           sha256 = "1p0w83m9j4a6va4g68a4gcfbdkp8nic0q8cm28l8nr7czd5s0yl6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/clojure-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-snippets";
           sha256 = "15622mdd6b3fpwp22d32p78yap08pyscs2vc83sv1xz4338i0lij";
           name = "clojure-snippets";
         };
@@ -3227,7 +3290,7 @@
           sha256 = "1bhnlcsvl1qsi36a5kz8i857spzybprsbsywpqrmjpndn74n8690";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cm-mode";
           sha256 = "1rgfpxbnp8wiq9j8aywm2n07rxzkhqljigwynrkyvrnsgxlq2a9x";
           name = "cm-mode";
         };
@@ -3248,7 +3311,7 @@
           sha256 = "14z5izpgby7lak6hzjwsph31awg5126hcjzld21ihknhlg09sw7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmake-ide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmake-ide";
           sha256 = "0xvy7l80zw67jgvk1rkhwzjvsqjqckmd8zj6s67rgbm56z6ypmcg";
           name = "cmake-ide";
         };
@@ -3261,15 +3324,15 @@
     cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-mode";
-        version = "3.4.1";
+        version = "3.5.0pre1";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "fd7180f0c0c2554c31afda235469df986a109fe4";
-          sha256 = "054i416l7kwdnwlb55ya89zpnsyxg9h4b2ll3d4dhx2qpph7w9s2";
+          rev = "8a8d22cf1e5d20b7c3b32c1ec9b5f06b339c2a50";
+          sha256 = "1yppsh0sh2m8m4x34abdiq1d2k7g4gjhf24m9av0h5kg8kd46f2b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmake-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmake-mode";
           sha256 = "0zbn8syb5lw5xp1qcy3qcl75zfiyik30xvqyl38gdqddm9h7qmz7";
           name = "cmake-mode";
         };
@@ -3290,7 +3353,7 @@
           sha256 = "10xlny2agxjknvnjdnw41cyb3d361yy0wvpc8l1d0xwnmmfh3bxk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cmake-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmake-project";
           sha256 = "13n6j9ljvzjzkknbm9zkhxljcn12avl39gxqq95hah44dr11rns3";
           name = "cmake-project";
         };
@@ -3311,7 +3374,7 @@
           sha256 = "14jcxrs3b02pbppvdsabr7c74i3c6d1lmd6l1p9dj8gv413pghsz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/codic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/codic";
           sha256 = "0fq2qfqhkd6injgl66vcpd61j67shl9xj260aj6cgb2nriq0jxgn";
           name = "codic";
         };
@@ -3332,7 +3395,7 @@
           sha256 = "1axp9hixp4vgaqjd3ii9xwb32jhb964zclmpg3zpsl4rp8b9bdz5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/coffee-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/coffee-mode";
           sha256 = "1px50hs0x30psa5ljndpcc22c0qwcaxslpjf28cfgxinawnp74g1";
           name = "coffee-mode";
         };
@@ -3353,7 +3416,7 @@
           sha256 = "0q9ss11i31iiv0vn8238922fkic7j6d02f9ykbip04sm46p5k6kj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-modern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-modern";
           sha256 = "0f662ham430fgxpqw96zcl1whcm28cv710g6wvg4fma60sblaxcm";
           name = "color-theme-modern";
         };
@@ -3374,7 +3437,7 @@
           sha256 = "13jmg05skv409z8pg5m9rzkajj9knyln0ff8a3i1pbpyrnpngmmc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-sanityinc-solarized";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-sanityinc-solarized";
           sha256 = "0xg79hgb893f1nqx6q4q6hp4w6rvgp1aah1v2r3scg2jk057qxkf";
           name = "color-theme-sanityinc-solarized";
         };
@@ -3395,7 +3458,7 @@
           sha256 = "0w99ypq048xldl1mrgc7qr4n2770dm48aknhp7q0176l43nvxnqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/color-theme-sanityinc-tomorrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-sanityinc-tomorrow";
           sha256 = "1k8iwjc7iidq5sxybs47rnswa6c5dwqfdzfw7w0by2h1id2z6nqd";
           name = "color-theme-sanityinc-tomorrow";
         };
@@ -3416,7 +3479,7 @@
           sha256 = "18hzm7yzwlfjlbkx46rgdl31p9xyfqnxlvg8337h2bicpks7kjia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/colorsarenice-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/colorsarenice-theme";
           sha256 = "09zlglldjbjr97clwyzyz7c0k8hswclnk2zbkm03nnn9n9yyg2qi";
           name = "colorsarenice-theme";
         };
@@ -3437,7 +3500,7 @@
           sha256 = "1j6hhyzww7wfwk6bllbb5mk4hw4qs8hsgfbfdifsam9c6i4spm45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/commander";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/commander";
           sha256 = "17y0hg6a90hflgwn24ww23qmvc1alzivpipca8zvpf0nih4fl393";
           name = "commander";
         };
@@ -3458,7 +3521,7 @@
           sha256 = "0kzlv2my0cc7d3nki2rlm32nmb2nyjb38inmvlf13z0m2kybg2ps";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/comment-dwim-2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/comment-dwim-2";
           sha256 = "1w9w2a72ygsj5w47vjqcljajmmbz0mi8dhz5gjnpwxjwsr6fn6lj";
           name = "comment-dwim-2";
         };
@@ -3468,6 +3531,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
+    melpaBuild {
+        pname = "commenter";
+        version = "0.5.1";
+        src = fetchFromGitHub {
+          owner = "yuutayamada";
+          repo = "commenter";
+          rev = "eec3bf91a57ff3aa3b93c36611e136572f031571";
+          sha256 = "1jvjwk776p9qrbr3j0368nqv8ydp8k0s6c66nfpcqf33rz4w1h1g";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/commenter";
+          sha256 = "01bm8jbj6xw23nls4fps6zwjkgvcsjhmn3l3ncqd764kwhxdx8q3";
+          name = "commenter";
+        };
+        packageRequires = [ emacs let-alist ];
+        meta = {
+          homepage = "http://melpa.org/#/commenter";
+          license = lib.licenses.free;
+        };
+      }) {};
     common-lisp-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "common-lisp-snippets";
@@ -3479,7 +3563,7 @@
           sha256 = "1cc9ak9193m92g6l4mrfxbkkmvljl3c51d0xzdidwww978q3x6ad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/common-lisp-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/common-lisp-snippets";
           sha256 = "0ig8cz00cbfx0jckqk1xhsvm18ivl2mjvcn65s941nblsywfvxjl";
           name = "common-lisp-snippets";
         };
@@ -3500,7 +3584,7 @@
           sha256 = "08rrjfp2amgya1hswjz3vd5ja6lg2nfmm7454p0h1naz00hlmmw0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company";
           sha256 = "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4";
           name = "company";
         };
@@ -3521,7 +3605,7 @@
           sha256 = "1i6788qfinh47c5crgr57ykgbp6bvk1afcl00c8gywxsf8srvnvy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-anaconda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-anaconda";
           sha256 = "1s7y47ghy7q35qpfqavh4p9wr91i6r579mdbpvv6h5by856yn4gl";
           name = "company-anaconda";
         };
@@ -3542,7 +3626,7 @@
           sha256 = "1dds3fynbd6yb0874aw6g4qk5zmq3pgl3jmcp38md027qalgqmym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-ansible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-ansible";
           sha256 = "084l9dr2hvm00952y4m3jhchzxjhcd61sfn5ywj9b9a1d4sr110d";
           name = "company-ansible";
         };
@@ -3563,7 +3647,7 @@
           sha256 = "1pja44g15d11kl47abzykrp28j782nkbmb0db0ilpc96xf1fjlsw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-cabal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-cabal";
           sha256 = "0pbjidj88c9qri6xw8023yqwnczad5ig224cbsz6vsmdla2nlxra";
           name = "company-cabal";
         };
@@ -3584,7 +3668,7 @@
           sha256 = "1f8sjjms9kxni153pia6b45p2ih2mhm2r07d0j3fmxmz3q2jdldd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-emoji";
           sha256 = "1mflqqw9gnfcqjb6g8ivdfl7s4mdyjg7j0457hamgyvgvpxsh8x3";
           name = "company-emoji";
         };
@@ -3605,7 +3689,7 @@
           sha256 = "0y9i0q37xjbnlnlxq7xjvnpn6ykzbd55g6nbw10z1wg0m2v7f96r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-ghc";
           sha256 = "07adykza4dqs64bk8vjmgryr54khxmcy28hms5z8i1qpsk9vmvnn";
           name = "company-ghc";
         };
@@ -3626,7 +3710,7 @@
           sha256 = "03snnra31b5j6iy94gql240vhkynbjql9b4b5j8bsqp9inmbsia3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-go";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-go";
           sha256 = "1ncy5wlg3ywr17zrxb1d1bap4gdvwr35w9a8b0crz5h3l3y4cp29";
           name = "company-go";
         };
@@ -3647,7 +3731,7 @@
           sha256 = "1gdsaa8zcs3layivn3ndbd5z1zflblmbxl251ld67bq763ga49cz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-irony";
           sha256 = "15adamk1b9y1i6k06i5ahf1wn70cgwlhgk0x6fk8pl5izg05z1km";
           name = "company-irony";
         };
@@ -3668,7 +3752,7 @@
           sha256 = "1ihqapp4dv92794rsgyq0rmhwika60cmradqd4bn9b72ss6plxs1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-jedi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-jedi";
           sha256 = "1krrgrjq967c3j02y0i345yx6w4crisnj1k3bhih6j849fvy3fvj";
           name = "company-jedi";
         };
@@ -3689,7 +3773,7 @@
           sha256 = "009f0p0sggfn0yz7sivkcv8zygvv4ssbwqykbxgdxh9n6zk4hjky";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-math";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-math";
           sha256 = "0chig8k8l65bnd0a6734fiy0ikl20k9v2wlndh3ckz5a8h963g87";
           name = "company-math";
         };
@@ -3710,7 +3794,7 @@
           sha256 = "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-nixos-options";
           sha256 = "1yrqqdadmf7qfxpqp8wwb325zjnwwjmn2hhnl7i3j0ckg6hqyqf0";
           name = "company-nixos-options";
         };
@@ -3731,7 +3815,7 @@
           sha256 = "0hg3wrfhz3qlfb6zv6j5a4xzmm4jk25pkv8h3ryg7sl7h602idgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-quickhelp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-quickhelp";
           sha256 = "042bwv0wd4hksbm528zb7pbllzk83p8qjq5f8z46p84c8mmxfp9g";
           name = "company-quickhelp";
         };
@@ -3752,7 +3836,7 @@
           sha256 = "0i1fh5lvqwlgn3g3fzh0xacxyljx6gkryipn133vfkv4jbns51n4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-restclient";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-restclient";
           sha256 = "1md0n4k4wmbh9rmbwqh3kg2fj0c34rzqfd56jsq8lcdg14k0kdcb";
           name = "company-restclient";
         };
@@ -3779,7 +3863,7 @@
           sha256 = "1l9xrw88wq32wm3qx922ihdb9mlv9rrdalwvz9i2790fmw7y84vz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-sourcekit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-sourcekit";
           sha256 = "0hr5j1ginf43h4qf3fvsh3z53z0c7w5a9lhrvdwmlzj396qhqmzs";
           name = "company-sourcekit";
         };
@@ -3800,7 +3884,7 @@
           sha256 = "11cinjsyf24d4a682ikniprxd1vkwn6mynsp5dzab6yzq09np78i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-tern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-tern";
           sha256 = "17pw4jx3f1hymj6sc0ri18jz9ngggj4a41kxx14fnmmm8adqn6wh";
           name = "company-tern";
         };
@@ -3821,7 +3905,7 @@
           sha256 = "0b0k75rg43h48dbcqiid947nspqiqxkiqcmvph9aqpxlfr67bz5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-web";
           sha256 = "0dj0m6wcc8cyvblp9b5b3am95gc18j9y4va44hvljxv1h7l5hhvy";
           name = "company-web";
         };
@@ -3842,7 +3926,7 @@
           sha256 = "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/company-ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-ycmd";
           sha256 = "0fqmkb0q8ai605jzn2kwd585b2alwxbmnb3yqnn9fgkcvyc9f0pk";
           name = "company-ycmd";
         };
@@ -3863,7 +3947,7 @@
           sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/concurrent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/concurrent";
           sha256 = "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf";
           name = "concurrent";
         };
@@ -3884,7 +3968,7 @@
           sha256 = "0sz3qx1bn0lwjhka2l6wfl4b5486ji9dklgjs7fdlkg3dgpp1ahx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/conkeror-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/conkeror-minor-mode";
           sha256 = "1ch108f20k7xbf79azsp31hh4wmw7iycsxddcszgxkbm7pj11933";
           name = "conkeror-minor-mode";
         };
@@ -3905,7 +3989,7 @@
           sha256 = "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/connection";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/connection";
           sha256 = "1y68d2kay8p5vapailxhrc5dl7b8k8nkvp7pa54md3fsivwp1d0q";
           name = "connection";
         };
@@ -3915,6 +3999,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    contextual = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "contextual";
+        version = "1.0.1";
+        src = fetchFromGitHub {
+          owner = "lshift-de";
+          repo = "contextual";
+          rev = "8134a2d8034c624f4fdbbb0b3893de12f4257909";
+          sha256 = "0s4b7dkndhnh8q3plvg2whjx8zd7ffz4hnbn3xh86xd3k7sch7av";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/contextual";
+          sha256 = "0vribs0fa1xf5kwkmvzjwhiawni0p3v56c5l4dkz8d7wn2g6wfdx";
+          name = "contextual";
+        };
+        packageRequires = [ cl-lib dash emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/contextual";
+          license = lib.licenses.free;
+        };
+      }) {};
     corral = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "corral";
@@ -3926,7 +4031,7 @@
           sha256 = "0gpckp12b0hllgn821q3rqfxh5h7ny5gfhhvfdbvszb7kwl1f6cx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/corral";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/corral";
           sha256 = "1drccqk4qzkgvkgkzlrrfd1dcgj8ziqriijrjihrzjgjsbpzv6da";
           name = "corral";
         };
@@ -3947,7 +4052,7 @@
           sha256 = "1kahl3h18vsjkbqvd84fb2w45s4srsiydn6jiv49vvg1yaxzxcbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/counsel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/counsel";
           sha256 = "0y8cb2q4mqvzan5n8ws5pjpm7bkjcghg5q19mzc3gqrq9vrvyzi6";
           name = "counsel";
         };
@@ -3968,7 +4073,7 @@
           sha256 = "03nzbrvvs31xgaqhxmrj9bypywsg42q06k4z4z1fpjssg9az0j4p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cpputils-cmake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cpputils-cmake";
           sha256 = "0fswmmmrjv897n51nidmn8gs8yp00595g35vwjafsq6rzfg58j60";
           name = "cpputils-cmake";
         };
@@ -3989,7 +4094,7 @@
           sha256 = "169ai0xkh3988racnhaapxw0v1pbxvcaq470x1qacdzdpka4a7bs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/creds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/creds";
           sha256 = "0n11xxaf93bbc9ih25wj09zzw4sj32wb99qig4zcy8bpkl5y3llk";
           name = "creds";
         };
@@ -4010,7 +4115,7 @@
           sha256 = "1kl6blr4dlz40gfc845071nhfms4fm59284ja2177bhghy3wmw6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/crm-custom";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/crm-custom";
           sha256 = "14w15skxr44p9ilhpswlgdbqfw8jghxi69l37yk4m449m7g9694c";
           name = "crm-custom";
         };
@@ -4031,7 +4136,7 @@
           sha256 = "1way14a4rhrqkby40wr21q6yxhl4qi0a0x89jzf21jdzsbykvaik";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/crux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/crux";
           sha256 = "10lim1sngqbdqqwyq6ksqjjqpkm97aj1jk550sgwj28338lnw73c";
           name = "crux";
         };
@@ -4052,7 +4157,7 @@
           sha256 = "00wgbcw09xn9xi52swi4wyi9dj9p9hyin7i431xi6zkhxysw4q7w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cryptol-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cryptol-mode";
           sha256 = "08iq69gqmps8cckybhj9065b8a2a49p0rpzgx883qxnypsmjfmf2";
           name = "cryptol-mode";
         };
@@ -4073,7 +4178,7 @@
           sha256 = "0dqih7cy57sciqn5vz5fiwynpld96qldyl7jcgn9qpwnzb401ayx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/csharp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/csharp-mode";
           sha256 = "17j84qrprq492dsn103dji8mvh29mbdlqlpsszbgfdgnpvfr1rv0";
           name = "csharp-mode";
         };
@@ -4094,7 +4199,7 @@
           sha256 = "13zq8kym1y6bzrpxbcdz32323a6azy5px4ridff6xh8bfprwlay3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctable";
           sha256 = "040qmlgfvjc1f908n52m5ll2fizbrhjzbd0kgrsw37bvm3029rx1";
           name = "ctable";
         };
@@ -4113,7 +4218,7 @@
           sha256 = "1xgrb4ivgz7gmingfafmclqqflxdvkarmfkqqv1zjk6yrjhlcvwf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctags";
           sha256 = "11fp8l99rj4fmi0vd3hkffgpfhk1l82ggglzb74jr3qfzv3dcn6y";
           name = "ctags";
         };
@@ -4134,7 +4239,7 @@
           sha256 = "05vhryqcydvcfm18fwby344931kzzh47x4l5ixy95xkcjkzrj8c7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctags-update";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctags-update";
           sha256 = "1k43l667mvr2y33nblachdlvdqvn256gysc1iwv5zgv7gj9i65qf";
           name = "ctags-update";
         };
@@ -4155,7 +4260,7 @@
           sha256 = "1jlr2miwqsg06hk2clvsrw9fa98m2n76qfq8qv5svrb8dpil04wb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ctxmenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctxmenu";
           sha256 = "03g9px858mg19wapqszwav3599slljdyam8bvn1ri85fpa5ydvdp";
           name = "ctxmenu";
         };
@@ -4176,7 +4281,7 @@
           sha256 = "1y685qfdkjyl7dwyvivlgc2lwp102vy6hvcb9zynw84c49f726sn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cuda-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cuda-mode";
           sha256 = "0ip4vax93x72bjrh6prik6ddmrvszpsmgm0fxfz772rp24smc300";
           name = "cuda-mode";
         };
@@ -4189,15 +4294,15 @@
     cyberpunk-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cyberpunk-theme";
-        version = "1.16";
+        version = "1.17";
         src = fetchFromGitHub {
           owner = "n3mo";
           repo = "cyberpunk-theme.el";
-          rev = "08ac966ce38be4a3de0a6f6051b8763b5c85e534";
-          sha256 = "12lkhlsi48wc5cy3zw57wihh9d4ixs2mcbvz9mdgjyhc2xhx3na8";
+          rev = "4ffdaee0a32b8e235bf44c0daedde66eaf7b1b33";
+          sha256 = "1yhizh8j745hv5ancpvijds9dasvsr2scwjscksp2x3krnd26ssp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cyberpunk-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cyberpunk-theme";
           sha256 = "0l2bwb5afkkhrbh99v2gns1vil9s5911hbnlq5w35nmg1wvbmbc9";
           name = "cyberpunk-theme";
         };
@@ -4218,7 +4323,7 @@
           sha256 = "1vkwm1n0amf0y0jdyvqskp00b6aijqhd7wclzkzrq7glrvj2z1xw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cyphejor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cyphejor";
           sha256 = "18l5km4xm5j3vv19k3fxs8i3rg4qnhrvx7b62vmyfcqmpiasrh6g";
           name = "cyphejor";
         };
@@ -4239,7 +4344,7 @@
           sha256 = "0kbk2gp2avp0da32mr003ziigmi98zi0fvwia4knylllmrkl3pvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/cython-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cython-mode";
           sha256 = "0asai1f1pncrfxx296fn6ky09hj1qam5j0dpxxkzhy0a34xz0k2i";
           name = "cython-mode";
         };
@@ -4260,7 +4365,7 @@
           sha256 = "0apg6cpwjhp8spqq8yyfp56y3pn991sfc85kfnifyhz6v3y6vwv6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/d-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/d-mode";
           sha256 = "060k9ndjx0n5vlpzfxlv5zxnizx72d7y9vk7gz7gdvpm6w2ha0a2";
           name = "d-mode";
         };
@@ -4281,7 +4386,7 @@
           sha256 = "1gdh4izwhyly6dyrmh7lfpd12gnb8hpnafj8br51ksijsssrf21f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/darcula-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/darcula-theme";
           sha256 = "13d21gwzv66ibn0gs56ff3sn76sa2mkjvjmpd2ncxq3mcgxajnjg";
           name = "darcula-theme";
         };
@@ -4302,7 +4407,7 @@
           sha256 = "1p7ih9fmcxnnxkj2mz56xa403m828wyyqvliabf5amklzjlhb3z9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/darktooth-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/darktooth-theme";
           sha256 = "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs";
           name = "darktooth-theme";
         };
@@ -4323,7 +4428,7 @@
           sha256 = "1vkn95dyc0pppnflyqlrlx32g9zc7wdcgc9fgf1hgvqp313ydfcs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dart-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dart-mode";
           sha256 = "0wxfh8v716dhrmx1klhpnsrlsj66llk8brmwryjg2h7c391sb5ff";
           name = "dart-mode";
         };
@@ -4344,7 +4449,7 @@
           sha256 = "1njv5adcm96kdch0jb941l8pm51yfdx7mlz83y0pq6jlzjs9mwaa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dash";
           sha256 = "0azm47900bk2frpjsgy108fr3p1jk4h9kmp4b5j5pibgsm26azgz";
           name = "dash";
         };
@@ -4365,7 +4470,7 @@
           sha256 = "1njv5adcm96kdch0jb941l8pm51yfdx7mlz83y0pq6jlzjs9mwaa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dash-functional";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dash-functional";
           sha256 = "0hx36hs12mf4nmskaaqrqpcgwrfjdqj6qcxn6bwb0s5m2jf9hs8p";
           name = "dash-functional";
         };
@@ -4386,7 +4491,7 @@
           sha256 = "06aprbhhxb6bbzmf0r5yq2ry6x7708vp4d94ja3ir6zcwc96wn0k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/date-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/date-at-point";
           sha256 = "0r26df6px6q5jlxj29nhl3qbp6kzy9hs5vd72kpiirgn4wlmagp0";
           name = "date-at-point";
         };
@@ -4407,7 +4512,7 @@
           sha256 = "1lmwnj2fnvijj9qp4rjggl7c4x91vnpb47rqaam6m2wmr5wbrx3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/date-field";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/date-field";
           sha256 = "0fmw13sa4ajs1xkrkdpcjpbp0jl9d81cgvwh93myg8yjjn7wbmvk";
           name = "date-field";
         };
@@ -4428,7 +4533,7 @@
           sha256 = "0pba9s0h37sxyqh733vi6k5raa4cs7aradipf3826inw36jcw414";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dedicated";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dedicated";
           sha256 = "1ka8n02r3nd2ksbid23g2qd6707c7xsjx7lbbdi6pcmwam5mglw9";
           name = "dedicated";
         };
@@ -4449,7 +4554,7 @@
           sha256 = "031f8ls1q80j717cg6b4pjd37wk7vrl5hcycsn8ca7yssmqa8q81";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/default-text-scale";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/default-text-scale";
           sha256 = "18r90ic38fnlsbg4gi3r962vban398x2bf3rqhrc6z4jk4aiv3mi";
           name = "default-text-scale";
         };
@@ -4470,7 +4575,7 @@
           sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/deferred";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/deferred";
           sha256 = "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr";
           name = "deferred";
         };
@@ -4491,7 +4596,7 @@
           sha256 = "1lyqd9cgj7cb2lasf6ycw5j8wnsx2nrfm8ra4sg3dgcspm01a89g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/define-word";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/define-word";
           sha256 = "035fdfwnxw0mir1dyvrimygx2gafcgnvlcsmwmry1rsfh39n5b9a";
           name = "define-word";
         };
@@ -4510,7 +4615,7 @@
           sha256 = "eb5c178337c0bd6a001114aac685bb0d23167050970274203d93c1c0caece1e8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/deft";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/deft";
           sha256 = "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p";
           name = "deft";
         };
@@ -4531,7 +4636,7 @@
           sha256 = "13jfhc9gavvb9dxmgi3k7ivp5iwh4yw4m11r2s8wpwn6p056bmfl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/demangle-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/demangle-mode";
           sha256 = "0ky0bb6rc99vrdli4lhs656qjndnla9b7inc2ji9l4n1zki5qxzk";
           name = "demangle-mode";
         };
@@ -4552,7 +4657,7 @@
           sha256 = "13fasbhdjwc4jh3cy25gm5sbbg56hq8la271098qpx6dhqm2wycq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/describe-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/describe-number";
           sha256 = "0gvriailni2ppz69g0bwnb1ik1ghjkj341k45vllz30j0frp9iji";
           name = "describe-number";
         };
@@ -4573,7 +4678,7 @@
           sha256 = "184zi5fv7ranghfx1hpx7j2wnk6kim8ysliyw2c5c1294sxxq3f3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/desktop+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/desktop+";
           sha256 = "0w7i6k4814hwb19l7ly9yq59674xiw57ylrwxq7yprwx52sgs2r8";
           name = "desktop-plus";
         };
@@ -4593,7 +4698,7 @@
           sha256 = "7c7727dd1d63be98e428700bfe340f2c4e7ff713fcc9b2b743a3366d786ae02d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/desktop-registry";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/desktop-registry";
           sha256 = "02mj0nlawx6vpksqsvp1q7l8rd6b1bs8f9c8c2rmda46jaf5npyr";
           name = "desktop-registry";
         };
@@ -4614,7 +4719,7 @@
           sha256 = "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dictionary";
           sha256 = "0zr9sm5rmr0frxdr0za72wiffip9391fn9dm5y5x0aj1z4c1n28w";
           name = "dictionary";
         };
@@ -4627,15 +4732,15 @@
     diff-hl = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "diff-hl";
-        version = "1.8.2";
+        version = "1.8.3";
         src = fetchFromGitHub {
           owner = "dgutov";
           repo = "diff-hl";
-          rev = "d0e6660ee501efea3e9b0936ed64fff09e66df02";
-          sha256 = "09fdhpi6qqq5s5mwqz56631jk8l1g0lh4zl62nq4982pl6sciqk9";
+          rev = "f4edea201bc4c38d082ec3143ceec87d2dcadb37";
+          sha256 = "0sjwpvzd4x9c1b9iv66b33llvp96ryyzyp8pn1rnhvxfvjv43cnz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/diff-hl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/diff-hl";
           sha256 = "0kw0v9xcqidhf26qzrqwdlav2zhq32xx91k7akd2536jpji5pbn6";
           name = "diff-hl";
         };
@@ -4656,7 +4761,7 @@
           sha256 = "1ci2gmyl0i736b2sxh77fyg4hs2pkn6rn9z7v2hzv6xlgqd6j3z6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/diffview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/diffview";
           sha256 = "0vlzmykvxjwjww313brl1nr13kz41jypsk0s3l8q3rbsnkpfic5k";
           name = "diffview";
         };
@@ -4677,7 +4782,7 @@
           sha256 = "0jzwaivsqh66py9hd3dg1ys5rc3p6pn8ndpwpvgyivk4pg6zhhj6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/digistar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/digistar-mode";
           sha256 = "0khzxlrm09h31i1nqz6rnzhrdssb3kppc4klpxza612l306fih0s";
           name = "digistar-mode";
         };
@@ -4698,7 +4803,7 @@
           sha256 = "1vrd74vmm60gb69a4in412mjncnhkjbfpakpaa6w9rj7w4kyfiz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dim";
           sha256 = "0gsyily47g3g55qmhp1wzfz319l1pkgjz4lbigafjzlzqxyclz52";
           name = "dim";
         };
@@ -4719,7 +4824,7 @@
           sha256 = "0bw1gkaycbbv2glnaa36gwzkl1l6lsq7i2i7jinka92b27zvrans";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dim-autoload";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dim-autoload";
           sha256 = "0lhzzjrgfvbqnzwhjywrk3skdb7x10xdq7d21q6kdk3h5r0np9f9";
           name = "dim-autoload";
         };
@@ -4740,7 +4845,7 @@
           sha256 = "0qpgfgp8hrzz4vdifxq8h25n0a0jlzgf7aa1fpy6r0080v5rqbb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/diminish";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/diminish";
           sha256 = "1h6a31jllypk47akjflz89xk6h47na96pim17d6g4rpqcafc2k43";
           name = "diminish";
         };
@@ -4761,7 +4866,7 @@
           sha256 = "1xg9cschjd2m0zal296q54ifk5i4s1s3azwfdkbgshxxgvxaky0w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dionysos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dionysos";
           sha256 = "1wjgj74dnlwd79gc3l7ymbx75jka8rw9smzbb10dsfppw3rrzfmz";
           name = "dionysos";
         };
@@ -4771,6 +4876,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    dired-atool = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dired-atool";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "HKey";
+          repo = "dired-atool";
+          rev = "608675ead3bd57c180e6ef493aef04d9ac4035a3";
+          sha256 = "0k4grfphl2ap8npnfrc8q3xv7nm3jc1lgblgxb1v8jm585ycb7fd";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-atool";
+          sha256 = "0qljx6fmz1hal9r2smjyc957wcvcpg16vp5mv65ip6d26k5qsj0w";
+          name = "dired-atool";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/dired-atool";
+          license = lib.licenses.free;
+        };
+      }) {};
     dired-efap = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-efap";
@@ -4782,7 +4908,7 @@
           sha256 = "1m0nx8wd6q56qbp5mbp9n466kyglrz34nflwvgd1qnmi08jwswgv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-efap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-efap";
           sha256 = "01j5v6584qi8ia7zmk03kx3i3kmm6hn6ycfgqlh5va6lp2h9sr00";
           name = "dired-efap";
         };
@@ -4803,7 +4929,7 @@
           sha256 = "0lrc4082ghg77x5jl26hj8c7cp48yjvqhv4g3j0pznpzb4qyfnq0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-fdclone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-fdclone";
           sha256 = "11aikq2q3m9h4zpgl24f8npvpwd98jgh8ygjwy2x5q8as8i89vf9";
           name = "dired-fdclone";
         };
@@ -4824,7 +4950,7 @@
           sha256 = "088h9yn6wndq4pq6f7q4iz17f9f4ci29z9nh595idljp3vwr7qid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-imenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-imenu";
           sha256 = "09yix4fkr03jq6j2rmvyg6gkmcnraw49a8m9649r3m525qdnhxs1";
           name = "dired-imenu";
         };
@@ -4845,7 +4971,7 @@
           sha256 = "0rpln6m3j4xbhrmmz18hby6xpzpzbf1c5hr7bxvna265cb0i5rn7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-k";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-k";
           sha256 = "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8";
           name = "dired-k";
         };
@@ -4866,7 +4992,7 @@
           sha256 = "0mfvyjbx7l7a1sfq47m6rb507xxw92nykkkpzmi2mpwv30f1c22j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dired-single";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-single";
           sha256 = "13h8dsn7bkz8ji2rrb7vyrqb2znxarpiynqi65mfli7dn5k086vf";
           name = "dired-single";
         };
@@ -4887,7 +5013,7 @@
           sha256 = "0p8c2hjgr81idm1psv3i3v5hr5rv0875ig8app2yqjwzvl0nn73f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/direx";
           sha256 = "1x3rnrhhyrrvgry9n7kc0734la1zp4gc4bpy50f2qpfd452jwqdm";
           name = "direx";
         };
@@ -4908,7 +5034,7 @@
           sha256 = "0swdh0qynpijsv6a2d308i42hfa0jwqsnmf4sm8vrhaf3vv25f5h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/direx-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/direx-grep";
           sha256 = "0y2wrzq06prm55akwgaqjg56znknyvbayav13asirqzg258skvm2";
           name = "direx-grep";
         };
@@ -4929,7 +5055,7 @@
           sha256 = "0qxw30zrlcxhxb0alrgyiclrk44dysal8xsbz2mvgrb6jli8wg18";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/discover";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/discover";
           sha256 = "1hf57p90jn1zzhjl63zv9ascbgkcbr0p0zmd3fvzpjsw84235dga";
           name = "discover";
         };
@@ -4950,7 +5076,7 @@
           sha256 = "1wlqyl03hhnflbyay3qlvdzqzvv5rbybcjpfddggda7ias9h0pr4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/discover-my-major";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/discover-my-major";
           sha256 = "0ch2y4grdjp7pvw2kxqnqdl7jd3q609n3pm3r0gn6k0xmcw85fgg";
           name = "discover-my-major";
         };
@@ -4971,7 +5097,7 @@
           sha256 = "1b1a1bwc6nv6wkd8jg1cqmjb9m9pxi5i2wbrz97fgii23dwfmlnl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dispass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dispass";
           sha256 = "08c1s4zgl4rha10mva48cfkxzrqnpdhy03pxq51ihw94v6vxzg3z";
           name = "dispass";
         };
@@ -4992,7 +5118,7 @@
           sha256 = "06vb6r1k9ml799h44fm9jhf3amldzhawxnm0lnr501hrmj4bz36x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/docker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/docker";
           sha256 = "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk";
           name = "docker";
         };
@@ -5013,7 +5139,7 @@
           sha256 = "1cmh8pwwa6dhl4w66wy8s5yqxs326mnaalg1ig2yhl4bjk8gi4m2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dockerfile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dockerfile-mode";
           sha256 = "1dxvzn35a9qd3x8pjvrvb2g71yf84404g6vz81y0p353rf2zknpa";
           name = "dockerfile-mode";
         };
@@ -5023,6 +5149,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    doom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "doom";
+        version = "1.3";
+        src = fetchFromGitHub {
+          owner = "emacsorphanage";
+          repo = "doom";
+          rev = "5e2d3f54e5b84eaa533cbdb6cf17b1b6009f0730";
+          sha256 = "04h1hlsc83w4dppw9m44jq7mkcpy0bblvnzrhvsh06pibjywdd73";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/doom";
+          sha256 = "098q77lix7kwpmarv26yndyk1yy1h4k3l9kaf3g7sg6ji6k7d3wl";
+          name = "doom";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/doom";
+          license = lib.licenses.free;
+        };
+      }) {};
     downplay-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "downplay-mode";
@@ -5034,7 +5181,7 @@
           sha256 = "13czcxmmvy4g9ysfjr6lb91c0fqv1xv8ppd27wbfsrgxm3aaqimb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/downplay-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/downplay-mode";
           sha256 = "1v6nga101ljzza8qj3lkmkzzl0vvzj4lsh1m69698s8prnczxr9b";
           name = "downplay-mode";
         };
@@ -5055,7 +5202,7 @@
           sha256 = "1x7hyj5qi9f222zwhwjqr98zzcvqjqfwxlglph8nsbadkv4s8c3v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dracula-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dracula-theme";
           sha256 = "0ayv00wvajia8kbfrqkrkpb3qp3k70qcnqkav7am16p5kbvzp10r";
           name = "dracula-theme";
         };
@@ -5076,7 +5223,7 @@
           sha256 = "0z3w58zplm5ks195zfsaq8kwbc944p3kbzs702jgz02wcrm4c28y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/draft-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/draft-mode";
           sha256 = "1wg9cx39f4dhrykb4zx4fh0x5cfrh5aicwwfh1h3yzpc4zlr7xfh";
           name = "draft-mode";
         };
@@ -5097,7 +5244,7 @@
           sha256 = "0wncdlc45flggn6sq5a95y7k6q11hy7zxp0ddhsjqccl30mdwax5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/drag-stuff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/drag-stuff";
           sha256 = "0hzbh58ijv1akamav8r0zs76pwda2zd9mjaj31ffalzhhsm5jnyc";
           name = "drag-stuff";
         };
@@ -5118,7 +5265,7 @@
           sha256 = "12lxqrcfv5salmcslw3kggymcwwc0lzq1b6iqd7x4zizp0sjf09s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/drupal-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/drupal-mode";
           sha256 = "14jvk4phq3wcff3yvhygix0c9cpbphh0dvm961i93jpsx7g9awgn";
           name = "drupal-mode";
         };
@@ -5139,7 +5286,7 @@
           sha256 = "156cscpavrp695lp8pgjg5jnq3b8n9c2h8qg8w89dd4vfkc3iikd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/drupal-spell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/drupal-spell";
           sha256 = "117rr2bfnc99g3qsr127grxwaqp54cxjaj3nl2nr6z78nja0fij3";
           name = "drupal-spell";
         };
@@ -5160,7 +5307,7 @@
           sha256 = "17yldk76mxakhb90bma7r4z9jgx02wankgk17r2di196mc04bj7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ducpel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ducpel";
           sha256 = "1cqrkgg7n9bhjswnpl7yc6w6yjs4gfbliaqsimmf9z43wk2ml4pc";
           name = "ducpel";
         };
@@ -5180,7 +5327,7 @@
           sha256 = "0ghxnzi2iy1g633fshl9wdpg2asrcl0v5rkk61gqd6axm7fjaxcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dyalog-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dyalog-mode";
           sha256 = "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq";
           name = "dyalog-mode";
         };
@@ -5201,7 +5348,7 @@
           sha256 = "1ppwlill1z4vqd566h9zi6zx5jb7hggmnmqrga84j5n7fwqvgz7f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dynamic-fonts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dynamic-fonts";
           sha256 = "0a210ca41maa755lv1n7hhpxp0f7lfxrxbi0x34icbkfkmijhl6q";
           name = "dynamic-fonts";
         };
@@ -5222,7 +5369,7 @@
           sha256 = "05z7gshrn7wp0qkb9ns6rgmcp375yllmkwhdsm4amg0dk3j2slbr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dynamic-ruler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dynamic-ruler";
           sha256 = "13jc3xbsyc3apkdfy0iafmsfvgqs0zfa5w8jxp7zj4dhb7pxpnmc";
           name = "dynamic-ruler";
         };
@@ -5243,7 +5390,7 @@
           sha256 = "0g0cz5a0vf31w27ljq5sn52mq15ynadl6cfbb97ja5zj1zxsxgjl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm";
           sha256 = "0dp360jr3fgxqywkp7g88cp02g37kw2hdsc0f70hjak9n3sy03la";
           name = "e2wm";
         };
@@ -5264,7 +5411,7 @@
           sha256 = "1yf081rac0chvkjha9z9xi1p983gmhjph0hai6ppsz5hzf2vikpp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-R";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-R";
           sha256 = "09v4fz178lch4d6m801ipclfxm2qrap5601aysnzyvc2apvyr3sh";
           name = "e2wm-R";
         };
@@ -5285,7 +5432,7 @@
           sha256 = "09i7d2rc9zd4s3nqrhd3ggs1ykdpxf0pyhxixxw2xy0q6nbswjia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-direx";
           sha256 = "0nv8aciq0swxi9ahwc2pvk9c7i3rmlp7vrzqcan58ml0i3nm17wg";
           name = "e2wm-direx";
         };
@@ -5306,7 +5453,7 @@
           sha256 = "1vrlfzy1wynm7x4m7pl8vim7ykqd6qkcilwz7sjc1lbckz11ig0d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-pkgex4pl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-pkgex4pl";
           sha256 = "0hgdbqfw3015fr929m36kfiqqzsid6afs3222iqq0apg7gfj7jil";
           name = "e2wm-pkgex4pl";
         };
@@ -5327,7 +5474,7 @@
           sha256 = "0mz43mwcgyc1c9p9b7nflnjxdxjm2nxbhl0scj6llzphikicr35g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-sww";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-sww";
           sha256 = "0x45j62cjivf9v7jp1b41yya3f9akp92md6cbv0v7bwz98g2vsk8";
           name = "e2wm-sww";
         };
@@ -5348,7 +5495,7 @@
           sha256 = "0qv3kh6q3q7vgfsd8x25x8agi3fp96dkpjnxdidkwk6k8h9n0jzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/e2wm-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-term";
           sha256 = "0wrq06yap80a96l9l0hs7x7rng7sx6vi1hz778kknb6il4f2f45g";
           name = "e2wm-term";
         };
@@ -5369,7 +5516,7 @@
           sha256 = "0r56nqrj6iaz57ys6hqdq5qkyliv7dj6dv274l228r7x0axrwd9m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-kill";
           sha256 = "10jcv7a4vcnaj3wkabip2xwzcwlmvdlqkl409a9lnzfasxcpf32i";
           name = "easy-kill";
         };
@@ -5390,7 +5537,7 @@
           sha256 = "18fdlxz9k961k8wafdw0gq0y514bvrfvx6qc1lmm4pk3gdcfbbi0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-kill-extras";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-kill-extras";
           sha256 = "0xzlzv57nvrc142saydwfib51fyqcdzjccc1hj6xvgcdbwadlnjy";
           name = "easy-kill-extras";
         };
@@ -5411,7 +5558,7 @@
           sha256 = "18bm5ns1qrxq0rrz9sylshr62wkymh1m6b7ch2y74f8rcwdwjgnq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/easy-repeat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-repeat";
           sha256 = "1vx57gpw0nbxh976s18va4ali1nqxqffhaxv1c5rhf4pwlk2fa06";
           name = "easy-repeat";
         };
@@ -5424,15 +5571,15 @@
     ebal = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "ebal";
-        version = "0.1.2";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "ebal";
-          rev = "bd8bca3a57d390c22862179db0afca7008831dd7";
-          sha256 = "0nb0p82fx1qp1q9id88wlfqfvfbqqr20541s59snln1pa25s2agm";
+          rev = "4d2ffa7ffbdfd6ee8a39a268e7c7c0de0905df6b";
+          sha256 = "0ysym38xaqyx1wc7xd3fvjm62dmiq4727dnjvyxv7hs4czff1gcb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ebal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ebal";
           sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg";
           name = "ebal";
         };
@@ -5453,7 +5600,7 @@
           sha256 = "159w19hx3gmhv8n2amkm6i999vdrz5132bjwk28qpiq37v1v7dd5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ebib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ebib";
           sha256 = "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid";
           name = "ebib";
         };
@@ -5474,7 +5621,7 @@
           sha256 = "1s9r1qj7cjsjvvphdpyjff6y598xpbrm9qjv5ncq15w6ac7yxzvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ecb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ecb";
           sha256 = "097hdskhfh255znrqamcssx4ns1sgkxchlbc7pjqwzpflsi0fx89";
           name = "ecb";
         };
@@ -5495,7 +5642,7 @@
           sha256 = "1r5hlcspznvfm111l1z0r4isd582qj64sa8cqk6hyi3y1hyp1xxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ecukes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ecukes";
           sha256 = "0ava8hrc7r1mzv6xgbrb84qak5xrf6fj8g9qr4i4g0cr7843nrw0";
           name = "ecukes";
         };
@@ -5516,7 +5663,7 @@
           sha256 = "0xy3q68i47a3s81jwr0rdvc1722bp78ng56xm53pri05g1z0db9s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edbi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edbi";
           sha256 = "0qq0j16n8lyvkqqlcsrq1m7r7f0in6b92d74mpx5c6siv6z2vxlr";
           name = "edbi";
         };
@@ -5537,7 +5684,7 @@
           sha256 = "10c84aad1lnr7z9f75k5ylgchykr3srcdmn88hlcx2n2c4jfbkds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-indirect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-indirect";
           sha256 = "0q5jjmrvx5kaajllmhaxihsab2kr1vmcsfqrhxdhw3x3nf41s439";
           name = "edit-indirect";
         };
@@ -5558,7 +5705,7 @@
           sha256 = "0981hy1n50yizc3k06vbxqrpfml817a67kab1hkgkw5v6ymm1hc9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-list";
           sha256 = "0mi12jfgx06i0yr8k5nk80xryqszjv0xykdnri505862rb90xakv";
           name = "edit-list";
         };
@@ -5579,7 +5726,7 @@
           sha256 = "12dp1xj09jrp0kxp9xb6cak9dn6zkyis1wfn4fnhzmxxnrd8c5rn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edit-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-server";
           sha256 = "0ffxcgmnz0f2c1i3vfwm8vlm6jyd7ibf4kq5z8c6n50zkwfdmns0";
           name = "edit-server";
         };
@@ -5592,15 +5739,15 @@
     editorconfig = callPackage ({ editorconfig-core, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig";
-        version = "0.7.0";
+        version = "0.7.2";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "765797d42784f15d207b5a4bfddce780eae2fbb3";
-          sha256 = "0002i69r4cpka73b8mvnkvh4lpyrrrnj07aq0zs0v62b3xlci22y";
+          rev = "460be7416529ceecd3647f7e15d1d20a202f12b7";
+          sha256 = "03vgcvxpp8inlhmxkd2cpp7ywjbl0ccz0lq7s46212dpk99fbd91";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/editorconfig";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/editorconfig";
           sha256 = "0na5lfi9bs4k1q73pph3ff0v8k8vzrfpzh47chyzk8nxsmvklw35";
           name = "editorconfig";
         };
@@ -5613,15 +5760,15 @@
     editorconfig-core = callPackage ({ cl-lib ? null, editorconfig-fnmatch, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig-core";
-        version = "0.7.0";
+        version = "0.7.2";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "765797d42784f15d207b5a4bfddce780eae2fbb3";
-          sha256 = "0002i69r4cpka73b8mvnkvh4lpyrrrnj07aq0zs0v62b3xlci22y";
+          rev = "460be7416529ceecd3647f7e15d1d20a202f12b7";
+          sha256 = "03vgcvxpp8inlhmxkd2cpp7ywjbl0ccz0lq7s46212dpk99fbd91";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/editorconfig-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/editorconfig-core";
           sha256 = "18d7byqkxn6lyw3nqsvqs5vyj9alh9wjd2mim44a3zcc9r2j061r";
           name = "editorconfig-core";
         };
@@ -5634,15 +5781,15 @@
     editorconfig-fnmatch = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig-fnmatch";
-        version = "0.7.0";
+        version = "0.7.2";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "765797d42784f15d207b5a4bfddce780eae2fbb3";
-          sha256 = "0002i69r4cpka73b8mvnkvh4lpyrrrnj07aq0zs0v62b3xlci22y";
+          rev = "460be7416529ceecd3647f7e15d1d20a202f12b7";
+          sha256 = "03vgcvxpp8inlhmxkd2cpp7ywjbl0ccz0lq7s46212dpk99fbd91";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/editorconfig-fnmatch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/editorconfig-fnmatch";
           sha256 = "0ji243vrw527jc3alsgmqi9rdnslxyq48zzx33rbpkqcjssm11iv";
           name = "editorconfig-fnmatch";
         };
@@ -5663,7 +5810,7 @@
           sha256 = "06v34l9dkykrrdfpnm3zi5wjm0fdvy76pbkfnk92wqkjp8fqimhd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edn";
           sha256 = "00cy8axhy2p3zalzl8k2083l5a7s3aswb9qfk9wsmf678m8pqwqg";
           name = "edn";
         };
@@ -5684,7 +5831,7 @@
           sha256 = "1a1apa48n24yisd2zw5k4lfkngx3016x6y11qi80hg75vrnmg7f1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/edts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edts";
           sha256 = "0f0rbd0mqqwn743qmr1g5mmi1sbmlcglclww8jxvbvb61jq8vspr";
           name = "edts";
         };
@@ -5705,7 +5852,7 @@
           sha256 = "1ryb7smvf66hk307yazkjn9bqzbwzbyyb5db200fq6j2zdjwsmaj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/egg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/egg";
           sha256 = "144g1fvs2cmn3px0a98nvxl5cz70kx30v936k5ppyi8gvbj0md5i";
           name = "egg";
         };
@@ -5726,7 +5873,7 @@
           sha256 = "16m7h477z10bmaymmgpj2id6l98iyrsp5wf69wd56534kh6qcajg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/egison-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/egison-mode";
           sha256 = "0x11fhv8kkx34h831k2q70y5qfz7wnfia4ka5mbmps7mpr68zcwi";
           name = "egison-mode";
         };
@@ -5745,7 +5892,7 @@
           sha256 = "3f41ade3332a3f1dc5cfb0b33077396feb7b683b2cf2c235b7a5f07f0b2e3271";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eide";
           sha256 = "16cf32n2l4wy1px7fm6x4vxx7pbqdp7zh2jn3bymg0b40i2321sz";
           name = "eide";
         };
@@ -5766,7 +5913,7 @@
           sha256 = "1si9zk4iwgkfn5p9x48hy1laz8r5m5vbyahy1andxrfxnb9fi0kj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ein";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ein";
           sha256 = "1nksj1cpf4d9brr3rb80bgp2x05qdq9xmlp8mwbic1s27mw80bpp";
           name = "ein";
         };
@@ -5787,7 +5934,7 @@
           sha256 = "0dbp2zz993cm7mrd58c4iflbzqwg50wzgn2cpwfivk14w1mznh4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-autoyas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-autoyas";
           sha256 = "0hh5j79f3z82nmb3kqry8k8lgc1qswk6ni3g9jg60pasc3wkbh6c";
           name = "el-autoyas";
         };
@@ -5808,7 +5955,7 @@
           sha256 = "1awyh9ffd6a4cia239s89asb88ddqlnrv757d76vcb701pq412bz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-get";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-get";
           sha256 = "1438v2sw5n67q404c93y2py226v469nagqwp4w9l6yyy40h4myhz";
           name = "el-get";
         };
@@ -5829,7 +5976,7 @@
           sha256 = "1mzla7ijmq1mgzr6bf16mjdycbf8ylsf4zdk4j6fh5kw5n4k6c5n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-init";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-init";
           sha256 = "121n6z8p9kzi7axp4i2kyi621gw20635w4j81i1bryblaqrv5kl5";
           name = "el-init";
         };
@@ -5850,7 +5997,7 @@
           sha256 = "1488wv0f9ihzzf9fl8cki044k61b0kva604hdwpb2qk9gnjr4g1l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-init-viewer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-init-viewer";
           sha256 = "0kkmsml9xf2n8nlrcicfg2l78s3dlhd6ssx0s62v77v4wdpl297m";
           name = "el-init-viewer";
         };
@@ -5871,7 +6018,7 @@
           sha256 = "13mv1rhgkwiww2wh5w926jz7idppp492wir1vdl245c5x50dh4f7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-mock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-mock";
           sha256 = "07m7w7n202nijnxidy0j0r4nbcvlnbkm9b0n8qb2bwi3d4cfp77l";
           name = "el-mock";
         };
@@ -5892,7 +6039,7 @@
           sha256 = "0390pfgfgj7hwfmkwikwhip0hmwkgx784l529cqvalc31jchi94i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-spice";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-spice";
           sha256 = "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg";
           name = "el-spice";
         };
@@ -5913,7 +6060,7 @@
           sha256 = "1i6j44ssxm1xdg0mf91nh1lnprwsaxsx8vsrf720nan7mfr283h5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/el-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-x";
           sha256 = "1721d9mljlcbdwb5b9934q7a48y30x6706pp4bjvgys0r64dml5g";
           name = "el-x";
         };
@@ -5934,7 +6081,7 @@
           sha256 = "0hlj6jn9gmi00sqghxswkxpgk65c4gy2k7010vpkr2257rd4f3gq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elang";
           sha256 = "0frhn3hm8351qzljicpzars28af1fghgv45717ml79rwb4vi6yiy";
           name = "elang";
         };
@@ -5955,7 +6102,7 @@
           sha256 = "1fh9dx669czkwy4msylcg64azz3az27akx55ipnazb5ghmsi7ivk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eldoc-eval";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eldoc-eval";
           sha256 = "0z4scgi2xgrgd47aqqmyv1ww8alh43s0qny5qmh3f1nnppz3nd7c";
           name = "eldoc-eval";
         };
@@ -5976,7 +6123,7 @@
           sha256 = "1bqdg5sr4hkiqndr4hcdjscfdyj56jb4wr1kqgwy1hy4ccr9mkrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/electric-operator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/electric-operator";
           sha256 = "043bkpvvk42lmkll5jnz4q8i0m44y4wdxvkz6hiqhqcp1rv03nw2";
           name = "electric-operator";
         };
@@ -5997,7 +6144,7 @@
           sha256 = "1ln0wprk8m2d33z804ld73jwv9x51xkwl9xfsywbh09w3x2zb51j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elfeed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elfeed";
           sha256 = "1psga7fcjk2b8xjg10fndp9l0ib72l5ggf43gxp62i4lxixzv8f9";
           name = "elfeed";
         };
@@ -6018,7 +6165,7 @@
           sha256 = "1ln0wprk8m2d33z804ld73jwv9x51xkwl9xfsywbh09w3x2zb51j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elfeed-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elfeed-web";
           sha256 = "14ydwvjjc6wbhkj4g4xdh0c3nh4asqsz8ln7my5vjib881vmaq1n";
           name = "elfeed-web";
         };
@@ -6039,7 +6186,7 @@
           sha256 = "1k7kprdknqm18dc0nwl7gachm0rivcpa8ng7p7ximalja3nsg2j1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elisp-slime-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elisp-slime-nav";
           sha256 = "009zgp68i4naprpjr8lcp06lh3i5ickn0nh0lgvrqs0niprnzh8c";
           name = "elisp-slime-nav";
         };
@@ -6060,7 +6207,7 @@
           sha256 = "07kgzdla31nc146xya21rn4hyr76h5lyabla8yh4qjsvnknb7cbj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elixir-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elixir-mode";
           sha256 = "1dba3jfg210i2rw8qy866396xn2xjgmbcyl006d6fibpr3j4lxaf";
           name = "elixir-mode";
         };
@@ -6081,7 +6228,7 @@
           sha256 = "0dx5h3sfccc2bp1jxnqqki95x5hp1skw8n5n4lnh703yjga5gkrz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elixir-yasnippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elixir-yasnippets";
           sha256 = "0927znqd9j91wc51hdwcl2rxb66i1h549nyr1h39r13353gbwk3a";
           name = "elixir-yasnippets";
         };
@@ -6094,15 +6241,15 @@
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "0.9.1";
+        version = "0.9.3";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "74fc1abaef7d3ead80d1bc032d3cd406b7260ed8";
-          sha256 = "1x92r1y9d7jssjnlcx1qbw1dqdghfmmmx603296401w1pdcrhl6r";
+          rev = "61671af42d2162b06ee06b4857bc4a63bf82a57b";
+          sha256 = "0cjxvmsfjki8zal31zbf4ynf7i0gy5vykpq6858qpa68vkd1p0iz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elm-mode";
           sha256 = "1gw9szkyr1spcx7qijddhxlm36h0hmfd53b4yzp1336yx44mlnd1";
           name = "elm-mode";
         };
@@ -6123,7 +6270,7 @@
           sha256 = "0l2iincskpks9yvj3y9zh1b48xli1q39wybr5n96rys5gv0drc9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elmacro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elmacro";
           sha256 = "0644rgwawivrq1shsjx1x2p53z7jgr6bxqgn2smzql8pp6azy7xz";
           name = "elmacro";
         };
@@ -6144,7 +6291,7 @@
           sha256 = "080nnw6ddsczbm7gk50x4dkahi77fsybfiki5iyp39fjpa7lfzq3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elmine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elmine";
           sha256 = "1gi94dyz9x50swkvryd4vj36rqgz4s58nrb4h4vwwviiiqmc8fvz";
           name = "elmine";
         };
@@ -6165,7 +6312,7 @@
           sha256 = "1q4krfrc2dy0vr7q148msfpkcwj55mlsrn4n5xjnya4xj0134ib7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elpa-audit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elpa-audit";
           sha256 = "0l8har14zrlh9kdkh9vlmkmzg49vb0r8j1wnznryaidalvk84a52";
           name = "elpa-audit";
         };
@@ -6186,7 +6333,7 @@
           sha256 = "1hjmvn3kls63alh0ihb5c8gf90lrfvq1hxrlf4162qiaa0s15f8a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elpa-mirror";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elpa-mirror";
           sha256 = "1jnviav2ybr13cgllg26kfjrwrl25adggnqiiwyjwgbbzxfycah8";
           name = "elpa-mirror";
         };
@@ -6199,15 +6346,15 @@
     elpy = callPackage ({ company, fetchFromGitHub, fetchurl, find-file-in-project, highlight-indentation, lib, melpaBuild, pyvenv, yasnippet }:
     melpaBuild {
         pname = "elpy";
-        version = "1.10.0";
+        version = "1.11.0";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "elpy";
-          rev = "96fa05708629600fd79c4b0fcafe63ec97f5ce07";
-          sha256 = "0kzara7r6gvgf3p06xswxbhq01dbhmwx1pldx3mmv7knvm2mdxq8";
+          rev = "d4cd394236d1d148dcabd5048bd30961687627da";
+          sha256 = "1xjm9b32a9nfzvphj6vm0dqcr4i072zcx29kcgiyyni8zbgbwmwv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elpy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elpy";
           sha256 = "051irp7k0cp1hqp3hzrmapllf2iim7cq0iz38489g4fkh2ybk709";
           name = "elpy";
         };
@@ -6234,7 +6381,7 @@
           sha256 = "091dxsb73bhqmrddwnmvblmfpwa7v7fa0ha18daxc8j0lrhzdhlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elscreen-mew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elscreen-mew";
           sha256 = "06g4wcfjs036nn64ac0zsvr08cfmak2hyj83y7a0r35yxr1853w4";
           name = "elscreen-mew";
         };
@@ -6255,7 +6402,7 @@
           sha256 = "06g7fl2c7cvwsrgi462wf6j13ny56y6zvgkizz9f256xjjq77ymf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elscreen-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elscreen-persist";
           sha256 = "1rjfvpsx0y5l9b76wa1ilj5lx39jd0m78nb1a4bqn81z0rkfpl4k";
           name = "elscreen-persist";
         };
@@ -6276,7 +6423,7 @@
           sha256 = "1k7npf93xbmrsq607x8zlgrpzqvplgia3ixz5w1lr1jlv1m2m8x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elwm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elwm";
           sha256 = "0rf663ih3lfg4n4pj4dpp133967zha5m1wr46riaxpha7xr59al9";
           name = "elwm";
         };
@@ -6297,7 +6444,7 @@
           sha256 = "12svv24qclkcdb5sniq0xbbsj34hq835s2v636xkb07dpmy644lg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/elx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elx";
           sha256 = "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x";
           name = "elx";
         };
@@ -6318,7 +6465,7 @@
           sha256 = "0b9hr3xg53nap6sik9d2cwqi8vfwzv8yqjcin4hab6rg2fkr5mra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacs-eclim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacs-eclim";
           sha256 = "1l55jhz5mb3bqw90cbf4jhcqgwj962br706qhm2wn5i2a1mg8xlv";
           name = "emacs-eclim";
         };
@@ -6339,7 +6486,7 @@
           sha256 = "15l3ab11vcmzqibkd6h5zqw5a83k8dmgcp4n26px29c0gv6bkpy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacs-setup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacs-setup";
           sha256 = "1x4rh8vx6fsb2d6dz2g9j6jamin1vmpppwy3yzbl1dnf7w4hx4kh";
           name = "emacs-setup";
         };
@@ -6360,7 +6507,7 @@
           sha256 = "0ciqxyahlzaxq854jm25zbrbmrhcaj5csdhxa0az9crwha8wkmw2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsagist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsagist";
           sha256 = "1cyz7nf0zxa21979jf5kdmkgwiyd17vsmpcmrw1af37ly27l8l64";
           name = "emacsagist";
         };
@@ -6381,7 +6528,7 @@
           sha256 = "1r6cpb7fck5znb7q7zrxcsjn7d3xiqhq8dp1ar1rsd6k4h05by4j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsc";
           sha256 = "1fbf9al3yds0il18jz6hbpj1fsjlpb1kgp450gb6r09lc46x77mk";
           name = "emacsc";
         };
@@ -6402,7 +6549,7 @@
           sha256 = "0ph0462shk00rhrkpvwgsr4biykimky2d89pvkbg377951jdga7i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsql";
           sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax";
           name = "emacsql";
         };
@@ -6423,7 +6570,7 @@
           sha256 = "0ph0462shk00rhrkpvwgsr4biykimky2d89pvkbg377951jdga7i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsql-mysql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsql-mysql";
           sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy";
           name = "emacsql-mysql";
         };
@@ -6444,7 +6591,7 @@
           sha256 = "0ph0462shk00rhrkpvwgsr4biykimky2d89pvkbg377951jdga7i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsql-psql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsql-psql";
           sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3";
           name = "emacsql-psql";
         };
@@ -6465,7 +6612,7 @@
           sha256 = "0ph0462shk00rhrkpvwgsr4biykimky2d89pvkbg377951jdga7i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emacsql-sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsql-sqlite";
           sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i";
           name = "emacsql-sqlite";
         };
@@ -6486,7 +6633,7 @@
           sha256 = "1a9925n0jcgxcgiz2kmh9zbb1rg9039rlrbr9fr80by9znfwmy67";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emamux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emamux";
           sha256 = "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz";
           name = "emamux";
         };
@@ -6507,7 +6654,7 @@
           sha256 = "1dsa85bk33j90h1ypaz1ylqh9yp2xvlga237h3kwa5y3sb0d5ydi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emmet-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emmet-mode";
           sha256 = "0w5nnhha70mndpk2a58raaxqanv868z05mfy1a8prgapm56mm819";
           name = "emmet-mode";
         };
@@ -6528,7 +6675,7 @@
           sha256 = "1pz2xvv5hzfg4a8s6xnbr14mpwnr94cwsa1bpk83i7x15hmxj938";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-mode-line-cycle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-mode-line-cycle";
           sha256 = "1jdmfh1i9v84iy7bj2dbc3s2wfzkrby3pabd99gnqzd9gn1cn8ca";
           name = "emms-mode-line-cycle";
         };
@@ -6549,7 +6696,7 @@
           sha256 = "1yy4dmjp53l2df5qix31g4vizhv80wm88vjqq6qqa9p822732n0m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-player-mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-player-mpv";
           sha256 = "175rmqx3bgys4chw8ylyf9rk07sg0llwbs9ivrv2d3ayhcz1lg9y";
           name = "emms-player-mpv";
         };
@@ -6570,7 +6717,7 @@
           sha256 = "15bb8fp2lwr5brfrsjwa47yvja5g2wyaac5a4sh5rn734s64x2sq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emms-player-simple-mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-player-simple-mpv";
           sha256 = "15aljprjd74ha7wpzsmv3d873i6fy3x1jwhzm03hvw0sw18m25i1";
           name = "emms-player-simple-mpv";
         };
@@ -6591,7 +6738,7 @@
           sha256 = "1rk7am0xvpnv98yi7a62wlyh576md4n2ddj7nm201bjd4wdl2yxk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emoji-cheat-sheet-plus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emoji-cheat-sheet-plus";
           sha256 = "1ciwlbw0ihm0p5gnnl3safcj7dxwiy53bkj8cmw3i334al0gjnnv";
           name = "emoji-cheat-sheet-plus";
         };
@@ -6612,7 +6759,7 @@
           sha256 = "0qi7p1grann3mhaq8kc0yc27cp9fm983g2gaqddljchn7lmgagrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emoji-fontset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emoji-fontset";
           sha256 = "19affsvlm1rzrzdh1k6xsv79icdkzx4izxivrd2ia6y2wcg9wc5d";
           name = "emoji-fontset";
         };
@@ -6633,7 +6780,7 @@
           sha256 = "0nrf6p4h66i17nz850kpdrnk5h5ra4l3icjjrq34sxvmsssp6zhp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emojify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emojify";
           sha256 = "15v2h5jfksfc208qphiczplg56yka07qv4w4482c10yzwq76zp17";
           name = "emojify";
         };
@@ -6654,7 +6801,7 @@
           sha256 = "0pl7i2a0mf2s33qpsc14dcvqbl6jm5xrvcnrhfr7visvnih29cy4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/emr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emr";
           sha256 = "05vpfxg6lviclnms2zyrza8dc87m60mimlwd11ihvsbngi9gcw8x";
           name = "emr";
         };
@@ -6685,7 +6832,7 @@
           sha256 = "1dsa3r39ip20ddbw0m9vq8z3r4ahrxvb37adyqi4mbdgyr6fq6sw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/engine-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/engine-mode";
           sha256 = "1gg7i93163m7k7lr3pnal1svymnhzwrfpfcdc0798d7ybv26gg8c";
           name = "engine-mode";
         };
@@ -6706,7 +6853,7 @@
           sha256 = "08j6b79vy8ry4ad1abk3hvxjbb4ylrhkvrbrnq1gcikl4h1p2v63";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/enlive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/enlive";
           sha256 = "1dyayk37zik12qfh8zbjmhsch64yqsx3acrlm7hcnavx465hmhnz";
           name = "enlive";
         };
@@ -6727,7 +6874,7 @@
           sha256 = "1in4wbwkxn8qfcsfjbczzk73z74w4ixlml61wk666dw0kpscgbs5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/enotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/enotify";
           sha256 = "0mii6m6zw9y8njgzi79rcf1n251iw7qz3yqjjij3c19rk3zpm5qi";
           name = "enotify";
         };
@@ -6748,7 +6895,7 @@
           sha256 = "05r2m7zghbdrgscg0x78jnhk1g6fq8iylar4cx699zm6pzvlq98z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/epc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/epc";
           sha256 = "1l9rcx07pa4b9z5654gyw6b64c95lcigzg15amphwr56v2g3rbzx";
           name = "epc";
         };
@@ -6769,7 +6916,7 @@
           sha256 = "0sjxd5y5hxhrbgfkpwx6m724r3841b53hgc61a0g5zwispw5pmrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/epl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/epl";
           sha256 = "0zr3r2hn9jaxscrl83hyixznb8l5dzfr6fsac76aa8x12xgsc5hn";
           name = "epl";
         };
@@ -6790,7 +6937,7 @@
           sha256 = "1xw56sir6gkr0p9g4s6p4qc0rajnl6ifbzrky07j28y9vsa59nsz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-crypt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-crypt";
           sha256 = "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3";
           name = "erc-crypt";
         };
@@ -6803,15 +6950,15 @@
     erc-hl-nicks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erc-hl-nicks";
-        version = "1.3.0";
+        version = "1.3.2";
         src = fetchFromGitHub {
           owner = "leathekd";
           repo = "erc-hl-nicks";
-          rev = "f7e9c378072ecc689f2a0ef66d73db8bbcc07d87";
-          sha256 = "0bc71s1cx4z6a9cpfygmzv1xzzx9s74366kzqnlg22sxxpb9ajhq";
+          rev = "be181920ce6af0ab5d00d1c638e4e598b3998643";
+          sha256 = "1k0g3bwp3w0dd6zwdv6k2wpqs2krjayilrzsr1hli649ljcx55d7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-hl-nicks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-hl-nicks";
           sha256 = "1lhw77n2nrjnb5yhnpm6yhbcp022xxjcmdgqf21z9rd0igss9mja";
           name = "erc-hl-nicks";
         };
@@ -6832,7 +6979,7 @@
           sha256 = "0p1j08rrdsqmkb8zz8h8ba24hr59nx3xh2m044ry468hfd2bp6vd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erc-youtube";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-youtube";
           sha256 = "12ylxkskkgfv5x7vlkib963ichb3rlmdzkf4zh8a39cgl8wsmacx";
           name = "erc-youtube";
         };
@@ -6853,7 +7000,7 @@
           sha256 = "19jninbf0dhdw3kn4d38bxmklg0v7sh3m9dwj6z69w99r5pcw480";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ercn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ercn";
           sha256 = "0yvis02bypw6v1zv7i326y8s6j0id558n0bdri52hr5pw85imnlp";
           name = "ercn";
         };
@@ -6874,7 +7021,7 @@
           sha256 = "17i567nfm0rykimh6bpcc5f2l7wsf8zcdy2jzd7sgrl54dvb0g9i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erefactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erefactor";
           sha256 = "0ma9sbrq4n8y5w7vvbhhgmw25aiykbq5yhxzm0knj32bgpviprw7";
           name = "erefactor";
         };
@@ -6895,7 +7042,7 @@
           sha256 = "19m6chwc2awbsk5z03q1yhq84m481pff2609a8bxymcvm6yaamvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ergoemacs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ergoemacs-mode";
           sha256 = "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62";
           name = "ergoemacs-mode";
         };
@@ -6908,15 +7055,15 @@
     erlang = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erlang";
-        version = "18.2.2";
+        version = "18.2.3";
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "7cf9a621c5280a3e97967c4c63ab6ca1adde69c3";
-          sha256 = "022yvfh6h6kbxl04jk3r4kzryc7k8hjpizc1ixrsmvh4gpnv3abi";
+          rev = "d96471b3f404f7341279d8598dd74d92fb1a923c";
+          sha256 = "1g7grv3zs5lydkxhwzdc3caqym11m20mx43m3hd5jgc96smg0433";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/erlang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erlang";
           sha256 = "1gmrdkfanivb9l5lmkl0853snlhl62w34537r82w11z2fbk9lxhc";
           name = "erlang";
         };
@@ -6937,7 +7084,7 @@
           sha256 = "0hn9i405nfhjd1h9vnwj43nxbbz00khrwkjq0acfyxjaz1shfac9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ert-async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ert-async";
           sha256 = "004798ckri5j72j0xvzkyciss1iz4lw9gya2749hkjxlamg14cn5";
           name = "ert-async";
         };
@@ -6957,7 +7104,7 @@
           sha256 = "63a8fb532260f56569ce20f911788054624a7a29f149ed6036d9f997ae0457c3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ert-junit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ert-junit";
           sha256 = "0bv22mhh1ahbjwi6s1csxkh11dmy0srabkddjd33l4havykxlg6g";
           name = "ert-junit";
         };
@@ -6978,7 +7125,7 @@
           sha256 = "0rdgdslspzb4s0n4a68hnwfm8vm8baasa8nzrdinf0nryn7rrhbf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ert-runner";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ert-runner";
           sha256 = "0fnb8rmjr5lvc3dq0fnyxhws8ync1lj5xp8ycs63z4ax6gmdqr48";
           name = "ert-runner";
         };
@@ -6999,7 +7146,7 @@
           sha256 = "0jq4yp80wiphlpsc0429rg8n50g8l4lf78q0l3nywz2p93smjy9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/es-lib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/es-lib";
           sha256 = "0mwvgf5385qsp91zsdw75ipif1h90xy277xdmrpwixsxd7abbn0n";
           name = "es-lib";
         };
@@ -7009,22 +7156,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    es-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    es-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "es-mode";
-        version = "4.0.0";
+        version = "4.1.0";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "es-mode";
-          rev = "bee766109b8da1bba925d6998ef288b8a55f3c8f";
-          sha256 = "105ydizdlak951kfr5mjmk7vkqfkj6r1z0gs5ldz1g19wwc7rhjk";
+          rev = "c8674924e566416ead90d837d3f3b00127d4a0e1";
+          sha256 = "1vd5kry46bi3rg4l4330bdkh5slk821a6w4vzzphdqwk61fir81b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/es-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/es-mode";
           sha256 = "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp";
           name = "es-mode";
         };
-        packageRequires = [];
+        packageRequires = [ dash ];
         meta = {
           homepage = "http://melpa.org/#/es-mode";
           license = lib.licenses.free;
@@ -7041,7 +7188,7 @@
           sha256 = "0cjchwrhk7bw87bg10zgcwkga50rvs0jn5v2jf6bbsxbcqx2nfc9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/es-windows";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/es-windows";
           sha256 = "112ngkan0hv3y7m71479f46x5gwdmf0vhbqrzs5kcjwlacqlrahx";
           name = "es-windows";
         };
@@ -7062,7 +7209,7 @@
           sha256 = "0nkmwwx224r50y2xnrz3v26l3ngqshvy5hs861gy4zagwllqfmvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eshell-autojump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eshell-autojump";
           sha256 = "09l2680hknmdbwr4cncv1v4b0adik0c3sm5i9m3qbwyyxm8m41i5";
           name = "eshell-autojump";
         };
@@ -7083,7 +7230,7 @@
           sha256 = "179xqh0rs8w3d03gygg9sy4qp5xqgfgl4c0ycrknip9zrnbmph4i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eshell-z";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eshell-z";
           sha256 = "14ixazj0nscyqsdv7brqnfr0q8llir1pwb91yhl9jdqypmadpm6d";
           name = "eshell-z";
         };
@@ -7104,7 +7251,7 @@
           sha256 = "16r4j27j9yfdiy841w9q5ykkc6n3wrm7hvfacagb32mydk821ijg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/espuds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/espuds";
           sha256 = "16yzw9l64ahf5v92jzb7vyb4zqxxplq6qh0y9rkfmvm59s4nhk6c";
           name = "espuds";
         };
@@ -7125,7 +7272,7 @@
           sha256 = "0lvr14xlxsdad4ihywkpbwwj9lyal0w4p616ska5rk7gg5i8v74p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess";
           sha256 = "02kz4fjxr0vrj5mg13cq758nzykizq4dmsijraxv46snvh337v5i";
           name = "ess";
         };
@@ -7146,7 +7293,7 @@
           sha256 = "1ya2ay52gkrd31pmw45ban8kkxgnzhhwkzkypwdhjfccq3ys835x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess-R-data-view";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess-R-data-view";
           sha256 = "0r2fzwayf3yb7fqk6f31x4xfqiiczwik8qw4rrvkqx2h3s1kz7i0";
           name = "ess-R-data-view";
         };
@@ -7167,7 +7314,7 @@
           sha256 = "0q8pbaa6wahli6fh0kng5zmnypsxi1fr2bzs2mfk3h8vf4nikpv0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess-R-object-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess-R-object-popup";
           sha256 = "1dxwgahfki6d6ywh85ifk3kq6f2a1114kkd8xcv4lcpzqykp93zj";
           name = "ess-R-object-popup";
         };
@@ -7188,7 +7335,7 @@
           sha256 = "1avb6dng4xgw3bp7bw0j60wl6s4y26alfys9vwwj29rlzvjrlh74";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ess-smart-underscore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess-smart-underscore";
           sha256 = "01pki1xa8zpgvldcbjwg6vmslj7ddf44hsx976xipc95vrdk15r2";
           name = "ess-smart-underscore";
         };
@@ -7209,7 +7356,7 @@
           sha256 = "1pzbd2ka6h5ipiivfwfgq1hq80ww59xvyldmx406mdd5vn7yqk5z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/esup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/esup";
           sha256 = "0cv3zc2zzm38ki3kxq58g9sp4gsk3dffa398wky6z83a3zc02zs0";
           name = "esup";
         };
@@ -7230,7 +7377,7 @@
           sha256 = "0k4vqlbk3h2snfiriraxhnjpdxgs49vcaazl191p9s2f799msd8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/esxml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/esxml";
           sha256 = "0nn074abkxz7p4w59l1za586p5ya392xhl3sx92yys8a3194n6hz";
           name = "esxml";
         };
@@ -7251,7 +7398,7 @@
           sha256 = "1a33yy455yx2188vxnhylgzg4zc0hhrw52dmpc4svxs7h1229pwg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eval-in-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eval-in-repl";
           sha256 = "10h5vy9wdiqf9dgk1d1bsvp93y8sfcxghzg8zbhhn7m5cqg2wh63";
           name = "eval-in-repl";
         };
@@ -7272,7 +7419,7 @@
           sha256 = "0lwpl9akdxml9f51pgsv0g7k7mr8dvqm94l01i7vq8jl6vd6v6i5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eval-sexp-fu";
           sha256 = "17cazf81z4cszflnfp66zyq2cclw5sp9539pxskdf267cf7r0ycs";
           name = "eval-sexp-fu";
         };
@@ -7282,17 +7429,38 @@
           license = lib.licenses.free;
         };
       }) {};
+    evalator = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evalator";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "seanirby";
+          repo = "evalator";
+          rev = "edf3840f5aa025cf38d0c2677b2f88f59079409e";
+          sha256 = "1a3y69s7lb24zdivxcpsjh9l6adxyjqxbpgradnj0q1n6kdyq679";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evalator";
+          sha256 = "0k6alxwg89gc4v5m2bxmzmj7l6kywhbh4036xgz19q28xnlbr9xk";
+          name = "evalator";
+        };
+        packageRequires = [ helm-core ];
+        meta = {
+          homepage = "http://melpa.org/#/evalator";
+          license = lib.licenses.free;
+        };
+      }) {};
     evil = callPackage ({ fetchhg, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
         version = "1.2.10";
         src = fetchhg {
           url = "https://bitbucket.com/lyro/evil";
-          rev = "e2c001ecfded";
-          sha256 = "1by2b0qa5hk2jvkxg8j4b0wpnw3mbg0vdggp4nh33m61290jsn5k";
+          rev = "5c0114702ea3";
+          sha256 = "1sysqcvzdnzg5qvawv3c0rwfyacjb80mvfdhdmc07vr4pyma6vcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil";
           sha256 = "09qrhy7l229w0qk3ba1i2xg4vqz8525v8scrbm031lqp30jp54hc";
           name = "evil";
         };
@@ -7313,7 +7481,7 @@
           sha256 = "0lw7fg4gqwj30r0l6k2ni36sxqkf65zf0d0z3rxnpwbxlf8dlkrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-anzu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-anzu";
           sha256 = "19cmc61l370mm4h2m6jw5pdcsvj4wcv9zpa8z7k1fjg57mwmmn70";
           name = "evil-anzu";
         };
@@ -7334,7 +7502,7 @@
           sha256 = "1nh7wa4ynr7ln42x32znzqsmh7ijzy5ymd7rszf49l8677alvazq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-args";
           sha256 = "1bwdvf1i3jc77bw2as1wr1djm8z3a7wms60694xkyqh0m909hs2w";
           name = "evil-args";
         };
@@ -7355,7 +7523,7 @@
           sha256 = "1qiym8f56a18j5swrxx5is48nz7z76531k8cw2c7czr6611l8l5a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-commentary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-commentary";
           sha256 = "151iiimmkpn58pl9zn40qssfahbrqy83axyl9dcd6kx2ywv5gcxz";
           name = "evil-commentary";
         };
@@ -7376,7 +7544,7 @@
           sha256 = "0cj17gk7cxia2p9xzqnlnmqqbw2afd3x61gfw9fpf65j9wik5hbz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-escape";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-escape";
           sha256 = "0rlwnnshcvsb5kn7db5qy39s89qmqlllvg2z8cnxyri8bsssks4k";
           name = "evil-escape";
         };
@@ -7397,7 +7565,7 @@
           sha256 = "0r2367lbzcdhglvjjcamrzn5fmqy0jalcws8r0yc2al1vbsrn0fr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-iedit-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-iedit-state";
           sha256 = "1dihyh7vqcp7kvfic613k7v33czr93hz04d635awrsyzgy8savhl";
           name = "evil-iedit-state";
         };
@@ -7418,7 +7586,7 @@
           sha256 = "1yrd9zvp23xwmxvw9hrhfwhwfczh4lxxk65mcvy69q6wwd03z5vn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-jumper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-jumper";
           sha256 = "0zwsk7slzvcgvgh8fjrwangylishrwc1w0glxcr71sybxph2g46x";
           name = "evil-jumper";
         };
@@ -7439,7 +7607,7 @@
           sha256 = "1k2zinchs0jjllp8zkpggckyy63dkyi5yig3p46vh4w45jdzysk5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-leader";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-leader";
           sha256 = "154s2nb170hzksmc87wnzlwg3ic3w3ravgsfvwkyfi2q285vmra6";
           name = "evil-leader";
         };
@@ -7460,7 +7628,7 @@
           sha256 = "12l3gnhirq8jz0dqyj9m02l1fg5rh78fdyskslprxp5vfa4ngzkh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-lisp-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-lisp-state";
           sha256 = "117irac05fs73n7sgja3zd7yh4nz9h0gw5b1b57lfkav6y3ndgcy";
           name = "evil-lisp-state";
         };
@@ -7481,7 +7649,7 @@
           sha256 = "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-mark-replace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-mark-replace";
           sha256 = "03cq43vlv1b53w4kw7mjvk026i8rzhhryfb27ddn6ipgc6xh68a0";
           name = "evil-mark-replace";
         };
@@ -7502,7 +7670,7 @@
           sha256 = "0kf4m1ghpxfalqx2zwm1d8xav4d6l6bpk79g5cvssk5jz5913fbi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-matchit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-matchit";
           sha256 = "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq";
           name = "evil-matchit";
         };
@@ -7523,7 +7691,7 @@
           sha256 = "16wn74690572n3xpxvnvka524fzswxxni3dy98bwpvsqj6yx2ds5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-nerd-commenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-nerd-commenter";
           sha256 = "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d";
           name = "evil-nerd-commenter";
         };
@@ -7544,7 +7712,7 @@
           sha256 = "13jg2xbh4p02x1nj77b6csb93hh56c1nv8kslcq2hjj3caipk4m8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-numbers";
           sha256 = "1lpmkklwjdf7ayhv99g9zh3l9hzrwm0hr0ijvbc7yz3n398zn1b2";
           name = "evil-numbers";
         };
@@ -7565,7 +7733,7 @@
           sha256 = "09l0ph9rc941kr718zq0dw27fq6l7rb0h2003ihw7q0a5yr8fpk7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-org";
           sha256 = "18w07fbafry3wb87f55kd8y0yra3s18a52f3m5kkdlcz5zwagi1c";
           name = "evil-org";
         };
@@ -7578,15 +7746,15 @@
     evil-quickscope = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-quickscope";
-        version = "0.1.3";
+        version = "0.1.4";
         src = fetchFromGitHub {
           owner = "blorbx";
           repo = "evil-quickscope";
-          rev = "d2f512fa4bd0b0603529a441e474ca551f621650";
-          sha256 = "0yx5ry102hzhqx1aql58fkd986xgj250bbcxabpnvy27gim2b977";
+          rev = "37a20e4c56c6058abf186ad4013c155e695e876f";
+          sha256 = "1ja9ggj70wf0nmma4xnc1zdzg2crq9h1cv3cj7cgwjmllflgkfq7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-quickscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-quickscope";
           sha256 = "0xym1mh4p68i00l1lshywf5fdg1vw3szxp3fk9fwfcg04z6vd489";
           name = "evil-quickscope";
         };
@@ -7607,7 +7775,7 @@
           sha256 = "1ygrpffa847144i74z2yy5r5vcvd334gad5mg18ffydacddcyqmq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-rsi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-rsi";
           sha256 = "0mc39n72420n36kwyf9zpw1pgyih0aigfnmkbywb0yxgj7myc345";
           name = "evil-rsi";
         };
@@ -7628,7 +7796,7 @@
           sha256 = "1jfi2k9dm0cc9bx8klppm965ydhdw17a2n664199vhxrap6g27yk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-search-highlight-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-search-highlight-persist";
           sha256 = "0iia136js364iygi1mydyzwvizhic6w5z9pbwmhva4654pq8dzqy";
           name = "evil-search-highlight-persist";
         };
@@ -7649,7 +7817,7 @@
           sha256 = "0j2m3rsszivyjhv8bjid5fdqaf1vwp8rf55b27y4vc2489wrw415";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-smartparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-smartparens";
           sha256 = "1viwrd6gfqmwhlil80pk68dikn3cjf9ddsy0z781z3qfx0j35qza";
           name = "evil-smartparens";
         };
@@ -7670,7 +7838,7 @@
           sha256 = "143lgpvbjrddbgnyh9dfdhjj0gp69slv4fkiq53czz85ffwli5ig";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-snipe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-snipe";
           sha256 = "0gcmpjw3iw7rjk86b2k6clfigp48vakfjd1a9n8qramhnc85rgkn";
           name = "evil-snipe";
         };
@@ -7691,7 +7859,7 @@
           sha256 = "1rchanv0vq9rx6x69608dlpdybvkn8a9ymx8wzm7gqpz9qh6xqrk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-space";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-space";
           sha256 = "1asvh873r1xgffvz3nr653yn8h5ifaphnafp6wf1b1mja6as7f23";
           name = "evil-space";
         };
@@ -7712,7 +7880,7 @@
           sha256 = "0vsf7yzlb2j7c5c7cnk81y1979psy6a9v7klg6c2j9lkcn3cqpvj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-textobj-anyblock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-textobj-anyblock";
           sha256 = "03vk30s2wkcszcjxmh5ww39rihnag9cp678wdzq4bnqy0c6rnjwa";
           name = "evil-textobj-anyblock";
         };
@@ -7733,7 +7901,7 @@
           sha256 = "1rskvkmz30xyy8xfjf2i35f3dxh663gb3plfy3f0j6z17i086jl2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-tutor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-tutor";
           sha256 = "1hvc2w5ykrgh62n4sxqqqcdk5sd7nmh6xzv4mir5vf9y2dgqcvsn";
           name = "evil-tutor";
         };
@@ -7754,7 +7922,7 @@
           sha256 = "07cmql8zsqz1qchq2mp3qybbay499dk1yglisig6jfddcmrbbggz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-visual-mark-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-visual-mark-mode";
           sha256 = "1qgr2dfhfz6imnlznicl7lplajd1s8wny7mlxs1bkms3xjcjfi48";
           name = "evil-visual-mark-mode";
         };
@@ -7775,7 +7943,7 @@
           sha256 = "11y2jrwbsw4fcx77zkhj1cn2hl1zcdqy00bv3mpbcrs03jywssrk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evil-visualstar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-visualstar";
           sha256 = "135l9hjfbpn0a6p53picnpydi9qs5vrk2rfn64gxa5ag2apcyycy";
           name = "evil-visualstar";
         };
@@ -7796,7 +7964,7 @@
           sha256 = "0739v0m9vj70a55z0canslyqgafzys815i7a0r6bxj2f9iwq6rhb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/evm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evm";
           sha256 = "19l6cs5schbnph0pwhhj66gkxsswd4bmjpy79l9kxzpjf107wc03";
           name = "evm";
         };
@@ -7817,7 +7985,7 @@
           sha256 = "0gs6bi3s2sszc6v2b26929azmn5513kvyin99n4d0ark1jdbjmv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eww-lnum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eww-lnum";
           sha256 = "1y745z4wa90snizq2g0amdwwgjafd6hkrayn93ca50f1wghdbk79";
           name = "eww-lnum";
         };
@@ -7838,7 +8006,7 @@
           sha256 = "0nhc3m88i6rl2y426ksmjbbaqwfrjnwbzqq1bvd6r0bkcwgfwfml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/exec-path-from-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/exec-path-from-shell";
           sha256 = "1j6f52qs1m43878ikl6nplgb72pdbxfznkfn66wyzcfiz2hrvvm9";
           name = "exec-path-from-shell";
         };
@@ -7859,7 +8027,7 @@
           sha256 = "0rvkhjfkhamr3ys9iarblfwvwq7n4wishdjgnwj1lx7m80h1hzbg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/expand-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/expand-region";
           sha256 = "1c7f1nqsqdc75h22fxxnyg0m4yxj6l23sirk3c71fqj14paxqnwg";
           name = "expand-region";
         };
@@ -7880,7 +8048,7 @@
           sha256 = "106yh793scbyharsk1dvrirkj3c6666w8jqilpkaz78vwyw3zs5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/express";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/express";
           sha256 = "0lhisy4ds96bwpc7k8w9ws1zi1qh0d36nhxsp36bqzfi09ig0nb9";
           name = "express";
         };
@@ -7901,7 +8069,7 @@
           sha256 = "1k2j8szavyq2wy5c0skvs03a88cr9njy7y63b7knh2m92nw4830d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/extend-dnd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/extend-dnd";
           sha256 = "0rknpvp8yw051pg3blvmjpp3c9a82jw7f10mq67ggbz98w227417";
           name = "extend-dnd";
         };
@@ -7922,7 +8090,7 @@
           sha256 = "0jc5wv2hkc89yh5ypa324xlfqdna20msr63g30njxq4g2vd0iqa7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/eyebrowse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eyebrowse";
           sha256 = "09fkzm8z8nkr4s9fbmfcjc80h50051f48v6n14l76xicglr5p861";
           name = "eyebrowse";
         };
@@ -7943,7 +8111,7 @@
           sha256 = "0lzqfr5xgc3qvpbs6vf63yiw7pc2mybfvsrhczf9ghlmlawqa6k1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/f";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/f";
           sha256 = "0s7fqav0dc9g4y5kqjjyqjs90gi34cahaxyx2s0kf9fwcgn23ja2";
           name = "f";
         };
@@ -7964,7 +8132,7 @@
           sha256 = "0crhkdbxz1ldbrvppi95g005ni5zg99z1271rkrnk5i6cvc4hlq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fabric";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fabric";
           sha256 = "1mkblsakdhvi10b67bv3j0jsf7hr8lf9sibmprvx8smqsih7l88m";
           name = "fabric";
         };
@@ -7985,7 +8153,7 @@
           sha256 = "01l8dlfpyy97b17djbza46rq11xlbkhd5kn2r26r2xac8klj4pka";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/factlog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/factlog";
           sha256 = "163482vfpa52b5ya5xps4qnclbaql1x0q54gqdwwmm04as8qbfz7";
           name = "factlog";
         };
@@ -8006,7 +8174,7 @@
           sha256 = "05lwcwf412m717yhwpjrswqkm8c3i7391rmiwv2k8xc1vk6dpp4g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fancy-battery";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fancy-battery";
           sha256 = "03rkfdkrzyal9abdiv8c73w10sm974hxf3xg5015hibfi6kzg8ii";
           name = "fancy-battery";
         };
@@ -8027,7 +8195,7 @@
           sha256 = "10ds6nlzm1s5xsp53a52qlzrnph7in6gib67qhgnwpj33wp8gs91";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fancy-narrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fancy-narrow";
           sha256 = "15i86jz6rdpva1az7gqp1wbm8kispcfc8h6v9fqsbag9sbzvgcyv";
           name = "fancy-narrow";
         };
@@ -8048,7 +8216,7 @@
           sha256 = "0h32w63vv451797zi6206j529fd4j8l3fp7rqip3s8xn8d4728x1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fastnav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fastnav";
           sha256 = "08hg256w8k9f5nzgpyl1jykbf28vmvv09kkhzs0s2zhwbl2158a5";
           name = "fastnav";
         };
@@ -8069,7 +8237,7 @@
           sha256 = "03w68zbgprly45i6ps7iviwvjf3acbc7f7acvjpzj2plf0g5i19z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fcitx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fcitx";
           sha256 = "0a8wd588c26p3czfp5hn2n46f2vwyg5v301sv0y07b55b1i3ynmx";
           name = "fcitx";
         };
@@ -8090,7 +8258,7 @@
           sha256 = "1cxjygg05v8s96c8z6plk3hl34jaiwg7s7dl7dsk20rj5f54kgw7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/feature-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/feature-mode";
           sha256 = "0ryinmpqb3c91qcna6gbijcmqv3skxdc947dlr5s1w623z9nxgqg";
           name = "feature-mode";
         };
@@ -8111,7 +8279,7 @@
           sha256 = "0fghhy5xqsdwal4fwlr6hxr5kpnfw71q79mxpp9db59ldnj9f5y9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fill-column-indicator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fill-column-indicator";
           sha256 = "0w8cmijv7ihij9yyncz6lixb6awzzl7n9qpjj2bks1d5rx46blma";
           name = "fill-column-indicator";
         };
@@ -8132,7 +8300,7 @@
           sha256 = "1r9y9zschavi28c5ysrlh56vxszjfyhh5r36fhn74i0b5iiy15rx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/finalize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/finalize";
           sha256 = "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq";
           name = "finalize";
         };
@@ -8153,7 +8321,7 @@
           sha256 = "1xjb66pydm3yf0jxnm2mri98pxq3b26xvwjkaj1488qgj27i05jr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-by-pinyin-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-by-pinyin-dired";
           sha256 = "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq";
           name = "find-by-pinyin-dired";
         };
@@ -8174,7 +8342,7 @@
           sha256 = "0bf32nhpmjvvgnr6g9xqh8pqnhr3dl24y3g40lsv4pc8ffs70ydm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-file-in-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-file-in-project";
           sha256 = "0aznnv82xhnilc9j4cdmcgh6ksv7bhjjm3pa76hynnyrfn7kq7wy";
           name = "find-file-in-project";
         };
@@ -8195,7 +8363,7 @@
           sha256 = "0wbmmrd7brf4498pdyilz17rzv7221cj8sd4h11gac2r72f1q2md";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/find-file-in-repository";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-file-in-repository";
           sha256 = "0q1ym06w2yn3nzpj018dj6h68f7rmkxczyl061mirjp8z9c6a9q6";
           name = "find-file-in-repository";
         };
@@ -8216,7 +8384,7 @@
           sha256 = "0lwgbd9zwdv7qs39c3fp4hrc17d9wrwwjgba7a14zwrhb27m7j07";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fiplr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fiplr";
           sha256 = "0l68rl5cy2maynny6iq6c4qr6c99y44i0i1z613k9rk08z7h0k5i";
           name = "fiplr";
         };
@@ -8226,6 +8394,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    firefox-controller = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, moz, popwin }:
+    melpaBuild {
+        pname = "firefox-controller";
+        version = "2.0";
+        src = fetchFromGitHub {
+          owner = "cute-jumper";
+          repo = "emacs-firefox-controller";
+          rev = "26a2e4b9246a7b5415032799b742b998529fce9e";
+          sha256 = "1rz56n2gmw11w2yxlhn0i8xmig9m8lxihgaikg65xmy9nqa5j7bj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/firefox-controller";
+          sha256 = "03y96b3l75w9al8ylijnlb8pcfkwddyfnh8xwig1b6k08zxfgal6";
+          name = "firefox-controller";
+        };
+        packageRequires = [ cl-lib moz popwin ];
+        meta = {
+          homepage = "http://melpa.org/#/firefox-controller";
+          license = lib.licenses.free;
+        };
+      }) {};
     fireplace = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fireplace";
@@ -8237,7 +8426,7 @@
           sha256 = "174x0qyrwswppc9p1q1nn4424r3zg7g49zk329k5aq18vyjz52d7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fireplace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fireplace";
           sha256 = "1apcypznq23fc7xgy4xy1c5hvfvjx1xhyq3aaq1lf59v99zchciw";
           name = "fireplace";
         };
@@ -8258,7 +8447,7 @@
           sha256 = "0s8rml5xbskvnjpi8qp7vqflxhh5yis6zr6ay2bxmd2chjlhli55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/firestarter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/firestarter";
           sha256 = "1cpx664hyrdnpb1jps1x6lm7idwlfjblkfygj48cjz9pzd6ld5mp";
           name = "firestarter";
         };
@@ -8271,15 +8460,15 @@
     fish-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fish-mode";
-        version = "0.1.1";
+        version = "0.1.2";
         src = fetchFromGitHub {
           owner = "wwwjfy";
           repo = "emacs-fish";
-          rev = "ac38e249dc260790ae32a24e101311990d9a84df";
-          sha256 = "1vwq0h88yassa0m0cizfvj5b9rrx5cb7w1n5mbczv54q97lq530n";
+          rev = "22aabbccd564883684f6d224b8e0a512f334be41";
+          sha256 = "17djaz79spms9il71m4xdfjhm58dzswb6fpncngkgx8kxvcy9y24";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fish-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fish-mode";
           sha256 = "0l6k06bs0qdhj3h8vf5fv8c3rbhiqfwszrpb0v2cgnb6xhwzmq14";
           name = "fish-mode";
         };
@@ -8289,6 +8478,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    fix-input = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "fix-input";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "mrkkrp";
+          repo = "fix-input";
+          rev = "728ae9258ebe790a69cf332407cba2f8c0be7d81";
+          sha256 = "16rd23ygh76fs4i7rni94k8gwa9n360h40qmhm65snp31kqnpr1p";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fix-input";
+          sha256 = "03xpr7rlv0xq1d9126j1fk0c2j7ssf366n0yc8yzm9vq32n9pp4p";
+          name = "fix-input";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/fix-input";
+          license = lib.licenses.free;
+        };
+      }) {};
     fix-word = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fix-word";
@@ -8300,7 +8510,7 @@
           sha256 = "1hj5jp4vbkcmnc8l2hqsvjc76f7c9zcsq8znwcwv2nv9xj9hlbkr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fix-word";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fix-word";
           sha256 = "0a8w09cx8p5pkkd4533nd199axkhdhs2a7blp7syfn40bkscx6xc";
           name = "fix-word";
         };
@@ -8321,7 +8531,7 @@
           sha256 = "1hnxdmzqmnp3dr7mpr58pjmigykb3cxwphxzia013kfi37ipf5a0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fixmee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fixmee";
           sha256 = "0wnp6h8f547fsi1lkk4ajny7g21dnr76qfhxl82n0l5h1ps4w8mp";
           name = "fixmee";
         };
@@ -8349,7 +8559,7 @@
           sha256 = "12b1b7avjdbfm184mcg3bh3s6k0ygfz1sraz8q7qnrsyw4170893";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/floobits";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/floobits";
           sha256 = "1jpk0q4mkf9ag1rqyai993nz5ngzfvxq9n9avmaaq59gkk9cjraf";
           name = "floobits";
         };
@@ -8370,7 +8580,7 @@
           sha256 = "0sjybrcnb2sl33swy3q664vqrparajcl0m455gciiih2j87hwadc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flx";
           sha256 = "04plfhrnw7jx2jaxhbhw4ypydfcb8v0x2m5hyacvrli1mca2iyf9";
           name = "flx";
         };
@@ -8391,7 +8601,7 @@
           sha256 = "0sjybrcnb2sl33swy3q664vqrparajcl0m455gciiih2j87hwadc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flx-ido";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flx-ido";
           sha256 = "00wcwbvfjbcx8kyap7rl1b6nsgqdwjzlpv6al2cdpdd19rm1vgdc";
           name = "flx-ido";
         };
@@ -8412,7 +8622,7 @@
           sha256 = "19mnx2zm71qrf7qf3mk5kriv5vgq0nl67lj029n63wqd8jcjb5fi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck";
           sha256 = "045k214dq8bmrai13da6gwdz97a2i998gggxqswqs4g52l1h6hvr";
           name = "flycheck";
         };
@@ -8433,7 +8643,7 @@
           sha256 = "1c3igqfd42dm42kfjm2q2xgr673vws10n9jn2jjlsk4g33brc7h4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-cask";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-cask";
           sha256 = "1lq559nyhkpnagncj68h84i3cq85vhdikr534kj018n2zcilsyw7";
           name = "flycheck-cask";
         };
@@ -8446,15 +8656,15 @@
     flycheck-checkbashisms = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-checkbashisms";
-        version = "1.3";
+        version = "1.4";
         src = fetchFromGitHub {
           owner = "Gnouc";
           repo = "flycheck-checkbashisms";
-          rev = "652c977de277519b07de70d6570082687e39367c";
-          sha256 = "0rvnc574r3fhm85g4n1fn1c4avg0w1x32a4k6fv5v94m5c4331nn";
+          rev = "6acb957a33a21e61764792b80ba4e33e88f2271f";
+          sha256 = "18nhfj0vx8rg2236nb9475s27rhyb34m81i7l6zkhifqba6rb0bb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-checkbashisms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-checkbashisms";
           sha256 = "1rq0ymlr1dl39v0sfyjmdv4pq3q9116cz9wvgpvfgalq8759q5sz";
           name = "flycheck-checkbashisms";
         };
@@ -8475,7 +8685,7 @@
           sha256 = "1i824iyjsg4d786kx5chsb64wlqd8vn2vsrhq6rmdx2x3gzdfcsx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-clojure";
           sha256 = "1b20gcs6fvq9pm4nl2qwsf34sg6wxngdql921q2pyh5n1xsxhm28";
           name = "flycheck-clojure";
         };
@@ -8496,7 +8706,7 @@
           sha256 = "11xc08xld758xx9myqjsiqz8vk3gh4d9c4yswswvky6mrx34c0y5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-color-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-color-mode-line";
           sha256 = "0hw19nsh5h2l8qbp7brqmml2fhs8a0x850vlvq3qfd7z248gvhrq";
           name = "flycheck-color-mode-line";
         };
@@ -8517,7 +8727,7 @@
           sha256 = "1ap5hgvaccmf2xkfvyp7rqcfjwmiy6mhr6ccgahxm2z0vm51kpyh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-dmd-dub";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-dmd-dub";
           sha256 = "0pg3sf7h6xqv65yqclhlb7fx1mp2w0m3qk4vji6m438kxy6fhzqm";
           name = "flycheck-dmd-dub";
         };
@@ -8538,7 +8748,7 @@
           sha256 = "0j2mvf3zjznwkm8dykcgs1v5sz0i882mrivghxqr3h6n3ni4wag4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-gometalinter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-gometalinter";
           sha256 = "1bnvj5kwgbh0dv989rsjcvmcij1ahwcz0vpr6a8f2p6wwvksw1h2";
           name = "flycheck-gometalinter";
         };
@@ -8559,7 +8769,7 @@
           sha256 = "0143lcn6g46g7skm4r6lqq09s8mr3268rikbzlh65qg80rpg9frj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-haskell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-haskell";
           sha256 = "12lgirz3j6n5ns2ikq4n41z0d33qp1lb5lfz1q11qvpbpn9d0jn7";
           name = "flycheck-haskell";
         };
@@ -8580,7 +8790,7 @@
           sha256 = "136mdg21a8sqxhijsjsvpli7r7sb40nmf80p6gmgb1ghwmhlm8k3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-hdevtools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-hdevtools";
           sha256 = "0ahvai1q4x59ryiyccvqvjisgqbaiahx4gk8ssaxhblhj0sqga93";
           name = "flycheck-hdevtools";
         };
@@ -8601,7 +8811,7 @@
           sha256 = "1pdssw5k88ym5fczllfjv26sp4brlyrywnlzq5baha5pq91h9cb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-ledger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-ledger";
           sha256 = "0807pd2km4r60wgd6jakscbx63ab22d9kvf1cml0ad8wynsap7jl";
           name = "flycheck-ledger";
         };
@@ -8622,7 +8832,7 @@
           sha256 = "1phfarws2aajkgcl96hqa4ydmb1yncg10q2ldzf8ff6yd6mvk51l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-ocaml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-ocaml";
           sha256 = "1cv2bb66aql2kj1y1gsl4xji8yrzrq6rd8hxxs5vpfsk47052lf7";
           name = "flycheck-ocaml";
         };
@@ -8643,7 +8853,7 @@
           sha256 = "0aa8cnh9f0f2zr2kkba2kf9djzjnsd51fzj8l578pbj016zdarwd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-package";
           sha256 = "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d";
           name = "flycheck-package";
         };
@@ -8664,7 +8874,7 @@
           sha256 = "0v23yc8znzjp44lrpfzqb4hc3psad14hsnvqcp8f1yyhgvdx35n8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-pos-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-pos-tip";
           sha256 = "09i2jmwj8b915fhyczwdb1j7c551ggbva33avis77ga1s9v3nsf9";
           name = "flycheck-pos-tip";
         };
@@ -8685,7 +8895,7 @@
           sha256 = "0yi2xmk0bxzqmjf9sy3r3gacqw7z1jrf6hwn05zaqqgn7y78z37i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-status-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-status-emoji";
           sha256 = "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p";
           name = "flycheck-status-emoji";
         };
@@ -8706,7 +8916,7 @@
           sha256 = "0azjr5mfb3hnb66m1b2319i035mn5i9qz24y7fj5crhnc9vp8w3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-tip";
           sha256 = "0zab1zknrnsw5xh5pwzzcpz7p40bbywkf9zx99sgsd6b5j1jz656";
           name = "flycheck-tip";
         };
@@ -8727,7 +8937,7 @@
           sha256 = "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flycheck-ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-ycmd";
           sha256 = "0m99ssynrqxgzf32d35n17iqyh1lyc6948inxpnwgcb98rfamchv";
           name = "flycheck-ycmd";
         };
@@ -8748,7 +8958,7 @@
           sha256 = "1svj5n7mmzhq03azlv4n33rz0nyqb00qr8ihdbc8hh2xnp63j5rc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-coffee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-coffee";
           sha256 = "1aig1d4fgjdg31vrg8k43z5hbqiydgfvxi45p1695s3kbdm8pr2d";
           name = "flymake-coffee";
         };
@@ -8769,7 +8979,7 @@
           sha256 = "054ws88fcfz3hf3cha7dvndm52v5n4jc4vzif1lif44xq0iggwqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-css";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-css";
           sha256 = "0kqm3wn9symqc9ivnh11gqgq8ql2bhpqvxfm86d8vwm082hd92c5";
           name = "flymake-css";
         };
@@ -8790,7 +9000,7 @@
           sha256 = "1j35k52na02b59yglfb48w6m5qzydvzqfsylb8ax5ks0f287yf0c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-easy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-easy";
           sha256 = "19p6s9fllgvs35v167xf624k5dn16l9fnvaqcj9ks162gl9vymn7";
           name = "flymake-easy";
         };
@@ -8811,7 +9021,7 @@
           sha256 = "002s01cymgx4z4l3j2pqirg7899pljdx2hmbz8k6cksdxlymzmkd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-gjshint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-gjshint";
           sha256 = "19jcd5z4883z3fzlrdn4fzmsvn16f4hfnhgw4vbs5b0ma6a8ka44";
           name = "flymake-gjshint";
         };
@@ -8832,7 +9042,7 @@
           sha256 = "1b3lf5jwan03k7rb97g4bb982dacdwsfdddnwc0inx9gs3qq1zni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-haml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-haml";
           sha256 = "0dmdhh12h4xrx6mc0qrwavngk2sx0l4pfqkjjyavabsgcs9wlgp1";
           name = "flymake-haml";
         };
@@ -8853,7 +9063,7 @@
           sha256 = "0k1qc0r0gr7f9l5if2a67cv4k73z5yxd6vxd6l1bqw500y0aajxz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-haskell-multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-haskell-multi";
           sha256 = "0cyzmmghwkkv6020s6n436lwymi6dr49i7gkci5n0hw5pdywcaij";
           name = "flymake-haskell-multi";
         };
@@ -8874,7 +9084,7 @@
           sha256 = "1ygg51r4ym4x7h4svizwllsvr72x9np6jvjqpk8ayv3w2fpb9l31";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-hlint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-hlint";
           sha256 = "0wq1ijhn3ypy31yk8jywl5hnz0r0vlhcxjyznzccwqbdc5vf7b2x";
           name = "flymake-hlint";
         };
@@ -8895,7 +9105,7 @@
           sha256 = "00zkm3wqlss386qd6jiq0siga7c48n5ykh0vf9q5v83rmpd79yri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-jslint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-jslint";
           sha256 = "1cq8fni4p0qhigx0qh34ypmcsbnilra1ixgnrn9mgg8x3cvcm4cm";
           name = "flymake-jslint";
         };
@@ -8916,7 +9126,7 @@
           sha256 = "0rzlw80mi39147yqnpzcvw9wvr5svksd3kn6s3w8191f2kc6xzzv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-json";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-json";
           sha256 = "1p5kajiycpqy2id664bs0fb1mbf73a43qqfdi4c57n6j9x7fxp4d";
           name = "flymake-json";
         };
@@ -8937,7 +9147,7 @@
           sha256 = "0ggvmsjj6p6a7cwr2bzhlcf8ab4v6a2bz5djsscd2ryy570p367z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-less";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-less";
           sha256 = "05k5daphxy94164c73ia7f4l1gv2cmlw8xzs8xnddg7ly22gjhi0";
           name = "flymake-less";
         };
@@ -8958,7 +9168,7 @@
           sha256 = "11r982h5fhjkmm9ld8wfdip0ghinw523nm1w4fmy830g0bbkgkrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-perlcritic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-perlcritic";
           sha256 = "0hibnh463wzhvpix7gygpgs04gi6salwjrsjc6d43lxlsn3y1im8";
           name = "flymake-perlcritic";
         };
@@ -8979,7 +9189,7 @@
           sha256 = "0dzyid0av9icp77wv0zcsygpw46z24qibq1ra0iwnkzl3kqvkyzh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-php";
           sha256 = "12ds2l5kvs7fz38syp4amasbjkpqd36rlpajnb3xxll0hbk6vffk";
           name = "flymake-php";
         };
@@ -9000,7 +9210,7 @@
           sha256 = "0l8qpcbzfi32h3vy7iwydx3hg2w60x9l3v3rabzjx412m5d00gsh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-python-pyflakes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-python-pyflakes";
           sha256 = "0asbjxv03zkbcjayanv13qzbv4z7b6fi0z1j6yv7fl6q9mgvm497";
           name = "flymake-python-pyflakes";
         };
@@ -9021,7 +9231,7 @@
           sha256 = "0d2vmpgr5c2cbpxcqm5x1ckfysbpwcbaa9frcnp2yfp8scvkvqj0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-ruby";
           sha256 = "1shr6d03vx85nmyxnysglzlc1pz0zy3n28nrcmxqgdm02g197bzr";
           name = "flymake-ruby";
         };
@@ -9042,7 +9252,7 @@
           sha256 = "0c74qdgy9c4hv3nyjnbqdzypbg9399vq3p5ngp5lasc7iz6vi0h8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-sass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-sass";
           sha256 = "0sz6n5r9pdphgvvaljg9zdwj3dqayaxzxmb4s8x4b05c8yx3ba0d";
           name = "flymake-sass";
         };
@@ -9063,7 +9273,7 @@
           sha256 = "0c2lz1p91yhprmlbmp0756d96yiy0w92zf0c9vlp0i9abvd0cvkc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flymake-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-shell";
           sha256 = "13ff4r0k29yqgx8ybxz7hh50cjsadcjb7pd0075s9xcrzia5x63i";
           name = "flymake-shell";
         };
@@ -9084,7 +9294,7 @@
           sha256 = "1g09s57b773nm9xqslzbin5i2h18k55nx00s5nnkvx1qg0n0mzkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flyspell-lazy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flyspell-lazy";
           sha256 = "0lzazrhsfh5m7n57dzx0v46d5mg87wpwwkjzf5j9gpv1mc1xfg1y";
           name = "flyspell-lazy";
         };
@@ -9105,7 +9315,7 @@
           sha256 = "1rk7fsill0salrhb4anbf698nd21nxj8pni35brbmv64nj9fhfic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/flyspell-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flyspell-popup";
           sha256 = "0wp15ra1ry6xpwal6mb53ixh3f0s4nps0rdyfli7hhaiwbr9bhql";
           name = "flyspell-popup";
         };
@@ -9126,7 +9336,7 @@
           sha256 = "0r2j238iyxnww60xpbxggjmz6y2waayw4m51f0l39hszbhags2cv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fm";
           sha256 = "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f";
           name = "fm";
         };
@@ -9147,7 +9357,7 @@
           sha256 = "0aj5qxzlfxxp7z27fiw9bvir5yi2zj0xzj5kbh17ix4wnhi03bhc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/focus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/focus";
           sha256 = "0jw26j8npyl3dgsrs7ap2djxmkafn2hl6gfqvi7v76bccs4jkyv8";
           name = "focus";
         };
@@ -9168,7 +9378,7 @@
           sha256 = "1k8z30imlxvqm7lv12kgqdfgc5znxyvl9jxi8j2ymmwlgy11f726";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fold-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fold-dwim";
           sha256 = "0c9yxx45zlhb1h4ldgkjv7bndwlagpyingaaqn9dcsxidrvp3p5x";
           name = "fold-dwim";
         };
@@ -9189,7 +9399,7 @@
           sha256 = "14jvbkahwvv4wb0s9vp8gqmlpv1d4269j5rsjxn79q5pawjzslxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fold-dwim-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fold-dwim-org";
           sha256 = "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn";
           name = "fold-dwim-org";
         };
@@ -9210,7 +9420,7 @@
           sha256 = "1cbabpyp66nl5j8yhyj2jih4mhaljxvjh9ij05clai71z4598ahn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fold-this";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fold-this";
           sha256 = "1iri4a6ixw3q7qr803cj2ik7rvmww1b6ybj5q2pvkf1v25r8655d";
           name = "fold-this";
         };
@@ -9231,7 +9441,7 @@
           sha256 = "1k90w8v5rpswqb8fn1cc8sq5w12gf4sn6say5dhvqd63512b0055";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/font-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/font-utils";
           sha256 = "0k33jdchjkj7j211a23kfp5axg74cfsrrq4axsb1pfp124swh2n5";
           name = "font-utils";
         };
@@ -9252,7 +9462,7 @@
           sha256 = "0qq13jhn9i2ls6n3fbay4i2r0hfs426pkmmif43b87gjxb510irc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fontawesome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fontawesome";
           sha256 = "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3";
           name = "fontawesome";
         };
@@ -9273,7 +9483,7 @@
           sha256 = "1jw888nqmbi9kcd9ycl2fqrmrnqxnmkx72n0b3nf3hp7j956yb21";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/forecast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/forecast";
           sha256 = "0whag2n1120384w304g0w4bqr7svdxxncdhnz4rznfpxlgiw2rsc";
           name = "forecast";
         };
@@ -9294,7 +9504,7 @@
           sha256 = "199kybf2bvywqfnwr5w893km82829k1j7sp079y6s2601hq8ylw9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/foreman-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/foreman-mode";
           sha256 = "0p3kwbld05wf3dwcv0k6ynz727fiy0ik2srx4js9wvagy57x98kv";
           name = "foreman-mode";
         };
@@ -9315,7 +9525,7 @@
           sha256 = "171jna631b2iqcimfsik9c66gii8nc0zdb58m077w00rn7rcxbh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/form-feed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/form-feed";
           sha256 = "1abwjkzi3irw0jwpv3f584zc72my9n8iq8zp5s0354xk6iwrl1rh";
           name = "form-feed";
         };
@@ -9336,7 +9546,7 @@
           sha256 = "0mikksamljps1czacgqavlnzzhgs8s3f8q4jza6v3csf8kgp5zd0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/format-sql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/format-sql";
           sha256 = "0684xqzs933vj9d3n3lv7afk4gii41kaqykbb05cribaswapsanj";
           name = "format-sql";
         };
@@ -9346,22 +9556,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    fountain-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "fountain-mode";
-        version = "1.5.0";
+        version = "1.5.1";
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "fountain-mode";
-          rev = "167238b3cdd5e510300abe3afd02b820f026b501";
-          sha256 = "0yycn339vqglny1bs4c8jsaf85cyj0rzzn8wzsf5k5srh9yivzdq";
+          rev = "a7ba3d78dcffe92105701efbf2630089a068b3da";
+          sha256 = "1187kbw06sv6yirrldbqwi44nfsg4a0rxa8c79p6ld82kcp16kns";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fountain-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fountain-mode";
           sha256 = "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840";
           name = "fountain-mode";
         };
-        packageRequires = [ s ];
+        packageRequires = [ emacs s ];
         meta = {
           homepage = "http://melpa.org/#/fountain-mode";
           license = lib.licenses.free;
@@ -9378,7 +9588,7 @@
           sha256 = "1vznkbly0lyh5kri9lcgy309ws96q3d5m1lghck9l8ain8hphhqz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/frame-restore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/frame-restore";
           sha256 = "0b321iyf57nkrm6xv8d1aydivrdapdgng35zcnrg298ws2naysvm";
           name = "frame-restore";
         };
@@ -9399,7 +9609,7 @@
           sha256 = "1c3yx9j3q8fkfiay4nzcabsq9i4ydqf6vxk8vv80h78gg9afrzrj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fringe-helper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fringe-helper";
           sha256 = "1vki5jd8jfrlrjcfd12gisgk12y20q3943i2qjgg4qvcj9k28cbv";
           name = "fringe-helper";
         };
@@ -9412,15 +9622,15 @@
     fsharp-mode = callPackage ({ auto-complete, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, s }:
     melpaBuild {
         pname = "fsharp-mode";
-        version = "1.7.2";
+        version = "1.7.3";
         src = fetchFromGitHub {
           owner = "rneatherway";
           repo = "emacs-fsharp-mode-bin";
-          rev = "9169baa9290e92d2e0ccc3cfd9c2a423136eb251";
-          sha256 = "1ckq45szq8lfg4spmvrj53s3p1hfl7x8k86cgq254gbs7kq8w7p2";
+          rev = "b2a70da8ba3c573e02c6a9951ef5f0089cec6c78";
+          sha256 = "115xl18nsg2j9sbp3qqzrjfpnzczk1zmrwrfrpqjq3jmv21ilsv3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fsharp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fsharp-mode";
           sha256 = "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z";
           name = "fsharp-mode";
         };
@@ -9439,7 +9649,7 @@
           sha256 = "b348e285923e480fe696f888783c95becb392a6e05abc553d8be649987c7d190";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fuel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fuel";
           sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756";
           name = "fuel";
         };
@@ -9460,7 +9670,7 @@
           sha256 = "0c3w3xs2jbdqgsqw0qmdbwii6p395qfznird4gg0hfr7lby2kmjq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/full-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/full-ack";
           sha256 = "09ikhyhpvkcl6yl6pa4abnw6i7yfsx5jkmzypib94w7khikvb309";
           name = "full-ack";
         };
@@ -9473,15 +9683,15 @@
     fullframe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fullframe";
-        version = "0.2.1";
+        version = "0.3.0";
         src = fetchFromGitHub {
           owner = "tomterl";
           repo = "fullframe";
-          rev = "6ce5342191a6837500bcb6d6026103eb53bb6752";
-          sha256 = "0y11yxlfbfb6f20rljpz54crwrmi9yljavfwmh33bq54fck296k7";
+          rev = "684f28fcb306d0232c2a7840f3fe4c933382729c";
+          sha256 = "1cjplkcsq4wlw1ixsfxih2xcx43wgzvmznxmkynqsgvn2f4w4g1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fullframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fullframe";
           sha256 = "08sh8lmb6g8asv28fcb36ilcn0ka4fc6ka0pnslid0h4c32fxp2a";
           name = "fullframe";
         };
@@ -9502,7 +9712,7 @@
           sha256 = "0m7fcw0cswypiwi5abg6vhw7a3agx9vhp10flbbbji6lblb0fya8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/function-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/function-args";
           sha256 = "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak";
           name = "function-args";
         };
@@ -9523,7 +9733,7 @@
           sha256 = "1g7my9ha5cnwg3pjwa86wncg5gphv18xpnpmj3xc3vg7z5m45rss";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fuzzy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fuzzy";
           sha256 = "1hwdh9bx4g4vzzyc20vdwxsii611za37kc9ik40kwjjk62qmll8h";
           name = "fuzzy";
         };
@@ -9544,7 +9754,7 @@
           sha256 = "0c3g0yfclczdh6nxmg9lljjf288zibqy51bhh1b1cgdmxcbpg8bv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fvwm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fvwm-mode";
           sha256 = "07y32cnp4qfhncp7s24gmlxljdrj5miicinfaf4gc7hihb4bkrkb";
           name = "fvwm-mode";
         };
@@ -9565,7 +9775,7 @@
           sha256 = "08qnyr945938hwjg1ypkf2x4mfxbh3bbf1xrgz1rk2ddrfv7hmkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fwb-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fwb-cmds";
           sha256 = "0wnjvi0v0l2h1mhwlsk2d8ggwh3nk7pks48l55gp18nmj00jxycx";
           name = "fwb-cmds";
         };
@@ -9578,15 +9788,15 @@
     fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "fxrd-mode";
-        version = "0.3";
+        version = "0.4";
         src = fetchFromGitHub {
           owner = "msherry";
           repo = "fxrd-mode";
-          rev = "122afe6b7edeff117edf92dab1ba011ae71a5910";
-          sha256 = "003iqzwzf950dvn6q901y0jjadz7hqaafa9wrhzplay3kjnkjj9b";
+          rev = "7b49c7bec2ed4a579fa0234555667377e8ba0f53";
+          sha256 = "1sk2z71xfi4wqb7ap8jvad8cbzdbilwzqx9vy45zmgx1jh7g4ba9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fxrd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fxrd-mode";
           sha256 = "17zimg64lqc1yh9gnp5izshkvviz996aym7q6n9p61a4kqq37z4r";
           name = "fxrd-mode";
         };
@@ -9607,7 +9817,7 @@
           sha256 = "0rjn4z7ssl1jy0brvsci44mhpig3zkdbcj8gcylzznhz0qfk1ljj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/fzf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fzf";
           sha256 = "0jjzm1gq85fx1gmj6nqaijnjws9bm8hmk40ws3x7fmsp41qq5py0";
           name = "fzf";
         };
@@ -9628,7 +9838,7 @@
           sha256 = "1q9bz294bc6bplwfrfzsczh444v9152wv7zm2l1pcpwv8n8581p6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gather";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gather";
           sha256 = "1f0cqqp1a7w8g1pfvzxxb0hjrxq4m79a4n85dncqj2xhjxrkm0xk";
           name = "gather";
         };
@@ -9649,7 +9859,7 @@
           sha256 = "1667zln7bav0bdhrc4b5z36n8rn36xvwh4y9ffgns67zfgwi64kk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/geiser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/geiser";
           sha256 = "067rrjvyn5sz60w9h7qn542d9iycm2q4ryvx3n6xlard0dky5596";
           name = "geiser";
         };
@@ -9670,7 +9880,7 @@
           sha256 = "08cw1fa25kbhbq2sp1cpn90bz38i9hjfdj93xf6wvki55b52s0nn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/genrnc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/genrnc";
           sha256 = "1nwbdscl0yh9j1n421can93m6s8j9dkyb3xmpampr6x528g6z0lm";
           name = "genrnc";
         };
@@ -9691,7 +9901,7 @@
           sha256 = "0344w4sbd6wlgl13j163v0hzjw9nwhvpr5s7658xsdd90wp4i701";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/german-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/german-holidays";
           sha256 = "0fgrxdgyl6va6axjc5l4sp90pyqaz5zha1g73xyhbxblshm5dwxn";
           name = "german-holidays";
         };
@@ -9712,7 +9922,7 @@
           sha256 = "1m9ra9qp7bgf6anfqyn56n3xa9a25ran10k9wd355qknd5skq1zz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ggo-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ggo-mode";
           sha256 = "1403x530n90jlfz3lq2vfiqx84cxsrhgs6hhmniq960cjj31q35p";
           name = "ggo-mode";
         };
@@ -9733,7 +9943,7 @@
           sha256 = "1qjh7av046ax4240iw40hv5fc0k23c36my9hili7fp4y2ak99l8n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ggtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ggtags";
           sha256 = "1cmry4knxbx9257ivhfxsd09z07z3g3wjihi99nrwmhb9h4mpqyw";
           name = "ggtags";
         };
@@ -9754,7 +9964,7 @@
           sha256 = "0a5v91k9gm9vv15d3m8czicv8n39f0hvqhcr6lfw0w82n26xwsms";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gh";
           sha256 = "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0";
           name = "gh";
         };
@@ -9767,15 +9977,15 @@
     ghc = callPackage ({ fetchFromGitHub, fetchurl, haskell-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ghc";
-        version = "5.4.0.0";
+        version = "5.5.0.0";
         src = fetchFromGitHub {
           owner = "kazu-yamamoto";
           repo = "ghc-mod";
-          rev = "edfce196107dbd43958d72c174ad66e4a7d30643";
-          sha256 = "1wiwkp4qcgdwnr4h1bn27hh1kyl2wjlrz2bbfv638y9gzc06rgch";
+          rev = "bd021e42b36e6cf3bc2ca3ef908299ba97ceeee5";
+          sha256 = "1m5q2s9nxm0m18njaxzryjly8rl3m598r94nn53xpazd4i5ln8cg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ghc";
           sha256 = "0xqriwggd1ahla5aff7k0j4admx6q18rmqsx3ipn4nfk86wrhb8g";
           name = "ghc";
         };
@@ -9796,7 +10006,7 @@
           sha256 = "1ywwyc2kz1c1s26c412nmzh55cinh84cfiazyyi3jsy5zzwhrbhi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ghc-imported-from";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ghc-imported-from";
           sha256 = "10cxz4c341lknyz4ns63bri00mya39278xav12c73if03llsyzy5";
           name = "ghc-imported-from";
         };
@@ -9817,7 +10027,7 @@
           sha256 = "0q3ps5f6mr9hyf6nq1wshcm1z6a5yhskqd7dbbwq5dm78552z6z8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gist";
           sha256 = "053fl8aw0ram9wsabzvmlm5w2klwd2pgcn2w9r1yqfs4xqja5sd3";
           name = "gist";
         };
@@ -9838,7 +10048,7 @@
           sha256 = "06ws3x5qa92drmn6rcp502jk2yil6q9gkzdmb2gww9gb2g695wl5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git";
           sha256 = "1nd2yvfgin13m368gjn7xah99glspnam4g4fh348x4makxcaw8w5";
           name = "git";
         };
@@ -9859,7 +10069,7 @@
           sha256 = "0psmr7749nzxln4b500sl3vrf24x3qijp12ir0i5z4x25k72hrlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-auto-commit-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-auto-commit-mode";
           sha256 = "0nf4n63xnzcsizjk1yl8qvqj9wjdqy57kvn6r736xvsxwzd44xgl";
           name = "git-auto-commit-mode";
         };
@@ -9880,7 +10090,7 @@
           sha256 = "0a3ws852ypi34ash39srkwzkfish4n3c5lma10d9xzddjrwapgj9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-command";
           sha256 = "1hsxak63y6648n0jkzl5ajxg45w84qq8vljvjh0bmwfrbb67kwbg";
           name = "git-command";
         };
@@ -9893,15 +10103,15 @@
     git-commit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, with-editor }:
     melpaBuild {
         pname = "git-commit";
-        version = "2.4.0";
+        version = "2.5.0";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "2e757a8c919b53edddb186e36e055e011e3b0ab3";
-          sha256 = "0hklwwzi2gqywysxn16ps1fvn48max52cpk2nx7r4df4h52yk6wn";
+          rev = "a3747edc8a4cddc408f7718a3371b46a4b610744";
+          sha256 = "0dydm0gj6jbybi5nkqrpi5bic5yxhz0p5k5gayqzqzmnb1fhl247";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-commit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-commit";
           sha256 = "1i7122fydqga68cilgzir80xfq77hnrw75zrvn52mjymfli6aza2";
           name = "git-commit";
         };
@@ -9914,15 +10124,15 @@
     git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-gutter";
-        version = "0.85";
+        version = "0.87";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-git-gutter";
-          rev = "febe69d909beb407d07dfc1b273ae7b7719fdd7c";
-          sha256 = "1721h4i185wj9nxkb19cnbwk5fwsajaqr54qq9xb669mm4pjn3ra";
+          rev = "c08ec4fc7fedf4e04e278c5d8984b0ecdf87fe2b";
+          sha256 = "0n02nss7gp0m898g7zw4rkj2kzrdiwp6mli0753p1fqph28j0gvm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-gutter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-gutter";
           sha256 = "12yjl9hsd72dwzl42hdcmjfdbxyi356jcq0kz8k7jvcsn57z4p2k";
           name = "git-gutter";
         };
@@ -9943,7 +10153,7 @@
           sha256 = "1cw5x1w14lxy8mqpxdrd9brgps0nig2prjjjda4a19wfsvy3clmv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-gutter-fringe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-gutter-fringe";
           sha256 = "14wyiyyi2rram2sz3habvmygy5a5m2jfi6x9fqcyfr3vpcjn1k4i";
           name = "git-gutter-fringe";
         };
@@ -9964,7 +10174,7 @@
           sha256 = "1c7ijbpa7xw831k55cdm2gl8r597rxnp22jcmqnfpwqkqmk48ln9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-gutter-fringe+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-gutter-fringe+";
           sha256 = "1zkjb8p08cq2nqskn79rjszlhp9mrblplgamgi66yskz8qb1bgcc";
           name = "git-gutter-fringe-plus";
         };
@@ -9985,7 +10195,7 @@
           sha256 = "101hracd77mici778x3ixwrcicd6fqkcr9z76kapkr0dq5z42yjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-gutter+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-gutter+";
           sha256 = "1w78p5cz6kyl9kmndgvwnfrs80ha707s8952hycrihgfb6lixmp0";
           name = "git-gutter-plus";
         };
@@ -9998,15 +10208,15 @@
     git-lens = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-lens";
-        version = "0.4";
+        version = "0.4.1";
         src = fetchFromGitHub {
           owner = "pidu";
           repo = "git-lens";
-          rev = "1feacc217c58fd4a41f9378eb09658f664036509";
-          sha256 = "0s1adgsigaq47vx8bfbmr5z8jq9y230ykwbw0jqka61n4ibg9ish";
+          rev = "be62df785ae14fa8652fe2cdd342d3256f8c0933";
+          sha256 = "02p73q0kl9z44b9a2bhqg03mkqx6gf61n88qlwwg4420dxrf7sbc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-lens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-lens";
           sha256 = "1vv3s89vk5ncinqh2f724z0qbbzp8g4y5y670ryy56w1l6v2acfb";
           name = "git-lens";
         };
@@ -10027,7 +10237,7 @@
           sha256 = "171w8vx1r2v9yclnlk3mwbfaxhg0kbvk575jvi6vr9shpjqnrb0z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-link";
           sha256 = "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7";
           name = "git-link";
         };
@@ -10048,7 +10258,7 @@
           sha256 = "139yivbxdpmv8j6qz406769b040nbmj3j8r28n9gqy54zlwblgv8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-messenger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-messenger";
           sha256 = "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn";
           name = "git-messenger";
         };
@@ -10069,7 +10279,7 @@
           sha256 = "1hyq3il03cm6apfawps60r4km8r6pw0vphzba30smsqfk50z3ya3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-ps1-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-ps1-mode";
           sha256 = "15gswi9s0m3hrsl1qqyjnjgbglsai95klbdp51h3pcq7zj22wkn6";
           name = "git-ps1-mode";
         };
@@ -10082,15 +10292,15 @@
     git-timemachine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-timemachine";
-        version = "2.8";
+        version = "3.0";
         src = fetchFromGitHub {
           owner = "pidu";
           repo = "git-timemachine";
-          rev = "87804bbf6e633f42a48567f21bca52019632f64f";
-          sha256 = "1fq9lzn8vvjh0ayl5h0lywxr6zfg3k41xa66vqrf1hdan3a7ax1j";
+          rev = "7c66a878ee89861dcd59b5dfc598520daa156052";
+          sha256 = "1brz9dc7ngywndlxbqbi3pbjbjydgqc9bjzf05lgx0pzr1ppc3w3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-timemachine";
           sha256 = "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq";
           name = "git-timemachine";
         };
@@ -10111,7 +10321,7 @@
           sha256 = "0igawn43i81icshimj5agv33ab120hd6182knlrn3i46p7lcs3lx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/git-wip-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-wip-timemachine";
           sha256 = "02fi51k6l23cgnwjp507ylkiwb8azmnhc0fips68nwn9dghzp6dw";
           name = "git-wip-timemachine";
         };
@@ -10132,7 +10342,7 @@
           sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitattributes-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitattributes-mode";
           sha256 = "1gjs0pjh6ap0h54savamzx94lq6vqrg58jxqaq5n5qplrbg15a6x";
           name = "gitattributes-mode";
         };
@@ -10153,7 +10363,7 @@
           sha256 = "0j0w6ywhiapmx7dk20yw3zgf8803kmccnjsr664am3g85kbb644v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitconfig";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitconfig";
           sha256 = "126znl1c4vwgskj7ka9id8v2bdrdn5nkyx3mmc6cz9ylc27ainm7";
           name = "gitconfig";
         };
@@ -10174,7 +10384,7 @@
           sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitconfig-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitconfig-mode";
           sha256 = "0hqky40kcgxdnghnf56gpi0xp7ik45ssia1x84v0mvfwqc50dgn1";
           name = "gitconfig-mode";
         };
@@ -10195,7 +10405,7 @@
           sha256 = "07vgnmfn0kbg3h3vhf3xk443yi1b55761x881xlmw9sr9nraa578";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/github-browse-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/github-browse-file";
           sha256 = "03xvgxlw7wmfby898din7dfcg87ihahkhlav1n7qklw6qi7skjcr";
           name = "github-browse-file";
         };
@@ -10216,7 +10426,7 @@
           sha256 = "18c169nxvdl7iv18pyqx690ldg6pkc8njaxdg1cww6ykqzqnfxh7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/github-clone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/github-clone";
           sha256 = "0ffrm4lmcj3d9kx3g2d5xbiih7hn4frs0prjrvcjq8acvsbc50q9";
           name = "github-clone";
         };
@@ -10237,7 +10447,7 @@
           sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitignore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitignore-mode";
           sha256 = "1i98ribmnxr4hwphd95f9hcfm5wfwgdbcxw3g0w17ws7z0ir61mn";
           name = "gitignore-mode";
         };
@@ -10258,7 +10468,7 @@
           sha256 = "1hc7j3gwljb1wk2727f66m3f7ga4icbklp54vlm0vf2bmii1ynil";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gitlab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitlab";
           sha256 = "0vxsqfnipgapnd2ijvdnkspk68dlnki3pkpkzg2h6hyazmzrsqnq";
           name = "gitlab";
         };
@@ -10279,7 +10489,7 @@
           sha256 = "0j3pay3gd1wdnpc853gy5j68hbavrwy6cc2bgmd12ag29xki3hcg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gmail-message-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gmail-message-mode";
           sha256 = "0py0i7b893ihb8l1hmk3jfl0xil450znadcd18q7svr3zl2m0gkk";
           name = "gmail-message-mode";
         };
@@ -10300,7 +10510,7 @@
           sha256 = "0p6n52m3y56nx7chwvmnslrnwc0xmh4fmmlkbkfz9n58hlmw8x1x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gmail2bbdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gmail2bbdb";
           sha256 = "03jhrk4vpjim3ybzjxy7s9r1cgjysj9vlc4criz5k0w7vqz3r28j";
           name = "gmail2bbdb";
         };
@@ -10321,7 +10531,7 @@
           sha256 = "0x0a94bfkk72kqyr5m6arx450qsg1axmp5r0c4r9m84z8j08r4v1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gmpl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gmpl-mode";
           sha256 = "1f60xim8h85jmqpvgfg402ff8mjd66gla8fa0cwi7l18ijnjblpz";
           name = "gmpl-mode";
         };
@@ -10342,7 +10552,7 @@
           sha256 = "160qm8xf0yghygb52p8cykhb5vpg9ww3gjprcdkcxplr4b230nnc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnome-calendar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnome-calendar";
           sha256 = "00clamlm5b42zqggxywdqrf6s2dnsxir5rpd8mjpyc502kqmsfn6";
           name = "gnome-calendar";
         };
@@ -10363,7 +10573,7 @@
           sha256 = "1nvyjjjydrimpxy4cpg90si7sr8lmldbhlcm2mx8npklp9pn5y3a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gntp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gntp";
           sha256 = "1ywj3p082g54dcpy8q4jnkqfr12npikx8yz14r0njxdlr0janh4f";
           name = "gntp";
         };
@@ -10384,7 +10594,7 @@
           sha256 = "0bwri3cvm2vr27kyqkrddm28fs08axnd4nm9amfgp54xp20bn4yn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnuplot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnuplot";
           sha256 = "06c5gqf02fkra8c52xck1lqvf4yg45zfibyf9zqmnbwk7p2jxrds";
           name = "gnuplot";
         };
@@ -10405,7 +10615,7 @@
           sha256 = "08j8x0iaz5s9q0b68d8h3153w0z6vak5l8qgw3dd1drz5p9xnvyw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnus-desktop-notify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnus-desktop-notify";
           sha256 = "0hf2dszk5d7vn80bm0msaqv7iji384n85dxgw8ng64c0f9f6752b";
           name = "gnus-desktop-notify";
         };
@@ -10426,7 +10636,7 @@
           sha256 = "1i3f67x2l9l5c5agspbkxr2mmh3rpq3009d8yzh6r1lih0b4hril";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gnus-x-gm-raw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnus-x-gm-raw";
           sha256 = "1a5iccghzqmcndql2bppvr48535sf6jbvc83iypr1031z1b5k4wg";
           name = "gnus-x-gm-raw";
         };
@@ -10447,7 +10657,7 @@
           sha256 = "03snnra31b5j6iy94gql240vhkynbjql9b4b5j8bsqp9inmbsia3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-autocomplete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-autocomplete";
           sha256 = "1ldsq81a167dk2r2mvzyp3v3j2mxc4l9p6b12i7pv8zrjlkhma5a";
           name = "go-autocomplete";
         };
@@ -10468,7 +10678,7 @@
           sha256 = "05yc0nylg3457an5j7yp3x23157j0hbi21qhcpgsa01144mwnwln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-direx";
           sha256 = "0dq5d7fsld4hww8fl68c18qp6fl3781dqqwd98cg68bihw2wwni7";
           name = "go-direx";
         };
@@ -10489,7 +10699,7 @@
           sha256 = "0ha07nhd2g43l84r1r5dz6c8m3fmmn4bx5mhvi6as33achhip7bn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-eldoc";
           sha256 = "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk";
           name = "go-eldoc";
         };
@@ -10510,7 +10720,7 @@
           sha256 = "1fm6xd3vsi8mqh0idddjpfxlsmz1ljmjppw3qkxl1vr0qz3598k3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-errcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-errcheck";
           sha256 = "11a75h32cd5h5xjv30x83k60s49k9fhgis31358q46y2gbvqp5bs";
           name = "go-errcheck";
         };
@@ -10531,7 +10741,7 @@
           sha256 = "1qqsck11v3ki18qld7hrb7dis60c2ylmq15s7srsppzwil8wm3fx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-mode";
           sha256 = "1852zjxandmq0cpbf7m56ar3rbdi7bx613gdgsf1bg8hsdvkgzfx";
           name = "go-mode";
         };
@@ -10552,7 +10762,7 @@
           sha256 = "1a6vg2vwgnafb61pwrd837fwlq5gs80wawbzjsnykawnmcaag8pm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/go-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-scratch";
           sha256 = "11ahvmxbh67wa39cymymxmcpkq0kcn5jz0rrvazjy2p1hx3x1ma5";
           name = "go-scratch";
         };
@@ -10573,7 +10783,7 @@
           sha256 = "00igv83hiyx7x3pf2grmjpd379brn33fm85f05k104mkkrhg99nm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/golden-ratio";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/golden-ratio";
           sha256 = "15fkrv0sgpzmnw2h4fp2gb83d8s42khkfq1h76l241njjayk1f81";
           name = "golden-ratio";
         };
@@ -10594,7 +10804,7 @@
           sha256 = "0j31062zfqmcd0zsbp19f3h7gq7dn78sg4xf2x838sr9421x6w8x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/google-this";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/google-this";
           sha256 = "0hg9y1b03aiamyn3mam3hyxmxy21wygxrnrww91zcbwlzgp4dd2c";
           name = "google-this";
         };
@@ -10615,7 +10825,7 @@
           sha256 = "0hvxyqkxv5hfsa9sv71m7d98g25a1xc962r961nw6vmbvsf64z6b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/google-translate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/google-translate";
           sha256 = "1crgzdd32mk6hrawdypg496dwh51wzwfb5wqw4a2j5l8y958xf47";
           name = "google-translate";
         };
@@ -10628,15 +10838,15 @@
     gotest = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild, s }:
     melpaBuild {
         pname = "gotest";
-        version = "0.9.0";
+        version = "0.10.0";
         src = fetchFromGitHub {
           owner = "nlamirault";
           repo = "gotest.el";
-          rev = "ab0da939aad5cec301126c59b7718cd3158b3233";
-          sha256 = "1b6zn1fmqvfb7bcpmhzkgcy5003dl22w3f293arlsd1xkbjgkxa2";
+          rev = "57f894e68b47352aeacaf0d9c61039b24ba42918";
+          sha256 = "0vf42j9jpa75879pxb1h7qgflcrrg78dgq5lg8v0sbpy7z86zaxr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gotest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gotest";
           sha256 = "1kan3gykhci33jgg67jjiiz7rqlz5mpxp8sh6mb0n6kpfmgb4ly9";
           name = "gotest";
         };
@@ -10657,7 +10867,7 @@
           sha256 = "0pxzi56lw9ry91f70hjnvrsbyhcaqknlwicjjbhf6rhv57fplw8h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gotham-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gotham-theme";
           sha256 = "0jars6rvf7hkyf71vq06mqki1r840i1dvv43dissqjg5i4lr79cl";
           name = "gotham-theme";
         };
@@ -10678,7 +10888,7 @@
           sha256 = "188q7jr1y872as3w32m8lf6vwl2by1ibgdk6zk7dhpcjwd0ik7x7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/goto-gem";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/goto-gem";
           sha256 = "06vy9m01qccvahxr5xn0plzw9knl5ig7gi5q5r1smfx92bmzkg3a";
           name = "goto-gem";
         };
@@ -10699,7 +10909,7 @@
           sha256 = "1f0zlvva7d7iza1v79yjp0bm7vd011q4cy14g1saryll32z115z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/goto-last-change";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/goto-last-change";
           sha256 = "1yl9p95ls04bkmf4d6az72pycp27bv7q7wxxzvj8sj97bgwvwajx";
           name = "goto-last-change";
         };
@@ -10720,7 +10930,7 @@
           sha256 = "0k86lrb55d701nj6pvlw3kjp1dcd3lzfya0hv6q56c529y69d782";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gradle-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gradle-mode";
           sha256 = "0lx9qi93wmiy9pxjxqp68scbcb4bx88b6jiqk3y8jg5cajizh24g";
           name = "gradle-mode";
         };
@@ -10741,7 +10951,7 @@
           sha256 = "1rv6klh59y70shc7kwdzlksdzmy0881ss49c0h5m93cn5pd6aj1l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grails-projectile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grails-projectile-mode";
           sha256 = "0dy8v2mila7ccvb7j5jlfkhfjsjfk3bm3rcy84m0rgbqjai67amn";
           name = "grails-projectile-mode";
         };
@@ -10762,7 +10972,7 @@
           sha256 = "1202fwwwdr74q6s5jv1n0mvmq4n9mra85l14hdhwh2kks513s6vs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grandshell-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grandshell-theme";
           sha256 = "1mnnjsw1kx40b6ws8wmk25fz9rq8rd70xia9cjpwdfkg7kh8xvsa";
           name = "grandshell-theme";
         };
@@ -10783,7 +10993,7 @@
           sha256 = "1f34bhjxmbf2jjrkpdvqg2gwp83ka6d5vrxmsxdl3r57yc6rbrwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/graphene";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/graphene";
           sha256 = "1wz3rvd8b7gx5d0k7yi4dd69ax5bybcm10vdc7xp4yn296lmyl9k";
           name = "graphene";
         };
@@ -10816,7 +11026,7 @@
           sha256 = "1bidfn4x5lb6dylhadyf05g4l2k7jg83mi058cmv76av1glawk17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/graphene-meta-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/graphene-meta-theme";
           sha256 = "1cqdr93lccdpxkzgap3r3qc92dh8vqgdlnxvqkw7lrcbs31fvf3q";
           name = "graphene-meta-theme";
         };
@@ -10837,7 +11047,7 @@
           sha256 = "1zk664ilyz14p11csmqgzs73gx08hy32h3pnyymzqkavmgb6h3s0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/graphviz-dot-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/graphviz-dot-mode";
           sha256 = "04rkynsrsk6w4sxn1pc0b9b6pij1p7yraywbrk7qvv05fv69kri2";
           name = "graphviz-dot-mode";
         };
@@ -10858,7 +11068,7 @@
           sha256 = "0xcj1kqzgxifhrhpl9j2nfpnkd6213ix5z7f97269v3inpzaiyf5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grapnel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grapnel";
           sha256 = "019cdx1wdx8sc2ibqwgp1akgckzxxvrayyp2sv806gha0kn6yf6r";
           name = "grapnel";
         };
@@ -10878,7 +11088,7 @@
           sha256 = "0djv2ps2ahw9b1b5i45hgy7l7cch7cgh7rzq601c0r6vi7gm2ac5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grass-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grass-mode";
           sha256 = "1lq6bk4bwgcy4ra3d9rlca3fk87ydg7xnnqcqjg0pw4m9xnr3f7v";
           name = "grass-mode";
         };
@@ -10897,7 +11107,7 @@
           sha256 = "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grin";
           sha256 = "0mvzwmws5pi6hpzgkc43fjxs98ngkr0jvqbclza2jbbqawifzzbk";
           name = "grin";
         };
@@ -10918,7 +11128,7 @@
           sha256 = "1bq73kcx744xnlm2yvccrzlbyx91c492sg7blx2a9z643v3gg1zs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grizzl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grizzl";
           sha256 = "1klds0w9qrsgfppq105qr69c26zi91y575db2hxr6h9vypf2rq24";
           name = "grizzl";
         };
@@ -10939,7 +11149,7 @@
           sha256 = "14h0rcd3nkw3pmx8jwip20p6rzl9qdkip5g52gfjjbqfvaffsrkd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gruber-darker-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gruber-darker-theme";
           sha256 = "0vn4msixb77xj6p5mlfchjyyjhzah0lcmp0z82s8849zd194fxqi";
           name = "gruber-darker-theme";
         };
@@ -10960,7 +11170,7 @@
           sha256 = "0zpmhjwj64s72iv3dgsy07pfh20f25ngsy3pszmlrfkxk0926d8k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/grunt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grunt";
           sha256 = "1qdzqcrff9x97kyy0d4j636d5i751qja10liw8i0lf4lk6n0lywz";
           name = "grunt";
         };
@@ -10981,7 +11191,7 @@
           sha256 = "1dfd22629gz0c8r4wplvbn0n7bm20549mg5chq289s826ca0kxqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/gscholar-bibtex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gscholar-bibtex";
           sha256 = "0d41gr9amf9vdn9pl9lamhp2swqllxslv9r3wsgzqvjl7zayd1az";
           name = "gscholar-bibtex";
         };
@@ -11002,7 +11212,7 @@
           sha256 = "1bmcvn8a7g9ahpv2fww673hx9pa7nnrj9kpljq65azf61vq2an2g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/guide-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/guide-key";
           sha256 = "0zjrdvppcg8b2k6hfdj45rswc1ks9xgimcr2yvgpc8prrwk1yjsf";
           name = "guide-key";
         };
@@ -11023,7 +11233,7 @@
           sha256 = "040mcfhj2gggp8w1pgip7rxb1bnb23rxlm02wl6x1qv5i0q7g5x3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/guide-key-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/guide-key-tip";
           sha256 = "0h2vkkbxq361dkn6irm1v19qj7bkhxcjljiksd5wwlq5zsq6bd06";
           name = "guide-key-tip";
         };
@@ -11044,7 +11254,7 @@
           sha256 = "1y46qd9cgkfb0wp2cvksjncyp77hd2jnr4bm4zafqirc3qhbysx0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/guru-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/guru-mode";
           sha256 = "0j25nxs3ndybq1ik36qyqdprmhav4ba8ny7v2z61s23id8hz3xjs";
           name = "guru-mode";
         };
@@ -11065,7 +11275,7 @@
           sha256 = "1ffk39lnmg9gfffkaj595p768d1p99q6sqym5g5ch6fmi6cx3a84";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hackernews";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hackernews";
           sha256 = "1x1jf5gkhmpiby5rmy0sziywh6c1f1n0p4f6dlz6ifbwns7har6a";
           name = "hackernews";
         };
@@ -11086,7 +11296,7 @@
           sha256 = "0d3xmagl18pas19zbpg27j0lmdiry23df48z4vkjsrcllqg25v5g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ham-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ham-mode";
           sha256 = "000qrdby7d6zmp5066vs4gjlc9ik0ybrgcwzcbfgxb16w1g9xpmz";
           name = "ham-mode";
         };
@@ -11107,7 +11317,7 @@
           sha256 = "0fmr7ji8x5ki9fzybpbg3xbhzws6n7ffk7d0zf9jl1x3jd8d6988";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haml-mode";
           sha256 = "0ih0m7zr6kgn6zd45zbp1jgs1ydc5i5gmq6l080wma83v5w1436f";
           name = "haml-mode";
         };
@@ -11128,7 +11338,7 @@
           sha256 = "08l6p9n2ggg4filad1k663qc2gjgfbia4knnnif4sw7h92yb31jl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hardcore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hardcore-mode";
           sha256 = "1bgi1acpw4z7i03d0i8mrd2hpjn6hyvkdsk0ks9q380yp9mqmiwd";
           name = "hardcore-mode";
         };
@@ -11149,7 +11359,7 @@
           sha256 = "0mbdnsm903s380ajjgjjqa0m4mxsddzqfjdafrngy0pxgs16iv1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hardhat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hardhat";
           sha256 = "16pdbpm647ag9cadmdm75nwwyzrqsd9y1b4zgkl3pg669mi5vl5z";
           name = "hardhat";
         };
@@ -11170,7 +11380,7 @@
           sha256 = "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-emacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-emacs";
           sha256 = "1wkh7qws35c32hha0p9rpjz5pls2844920nh919lvp2wmq9l6jd6";
           name = "haskell-emacs";
         };
@@ -11191,7 +11401,7 @@
           sha256 = "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-emacs-base";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-emacs-base";
           sha256 = "1fwkds6qyhbxxdgxfzmgd7dlcxr08ynrrg5jdp9r7f924pd536vb";
           name = "haskell-emacs-base";
         };
@@ -11212,7 +11422,7 @@
           sha256 = "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-emacs-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-emacs-text";
           sha256 = "1j18fhhra6lv32xrq8jc6l8i56fgn68da81wymcimpmpbp0hl5fy";
           name = "haskell-emacs-text";
         };
@@ -11225,15 +11435,15 @@
     haskell-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "13.16";
+        version = "13.18";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "ea81bbb966a839527a786739b7628fd9cd777456";
-          sha256 = "1gmpmfkr54sfzrif87zf92a1i13wx75bhp66h1rxhflg216m62yv";
+          rev = "e37c4e53775067ecc0dad67976bb10971b2b118f";
+          sha256 = "0433ay8azn1q9fk7rc5aw4klc9r2p7s44xzd87i0pgpdp154h52g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-mode";
           sha256 = "0wijvcpfdbl17iwzy47vf8brkj2djarfr8y28rw0wqvbs381zzwp";
           name = "haskell-mode";
         };
@@ -11254,7 +11464,7 @@
           sha256 = "0b3d7rvqvvcsp51aqfhl0zg9zg8j0p6vlfvga6jp9xc7626vh6f6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-snippets";
           sha256 = "10bvv7q694fahcpm83v8lpqihg1gvfzrp1hdzwiffxydfvdbalh2";
           name = "haskell-snippets";
         };
@@ -11274,7 +11484,7 @@
           sha256 = "02786f437bbbbb221c9c810a8d110bb4af172b986733ac35c932b18b38af7201";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haskell-tab-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-tab-indent";
           sha256 = "0vdfmy56w5yi202nbd28v1bzj97v1wxnfnb5z3dh9687p2abgnr7";
           name = "haskell-tab-indent";
         };
@@ -11295,7 +11505,7 @@
           sha256 = "14m8z13nvfqqgx40vzzbn0z9crwi3hhacmk1zfbv9cmhs95dwy6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/haxor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haxor-mode";
           sha256 = "1y4m058whdqnkkf9s6hzi0h6w0fc8ajfawhpjj0wqjam4adnfkq5";
           name = "haxor-mode";
         };
@@ -11316,7 +11526,7 @@
           sha256 = "15h1wkl1d9f2xfhm0nffqicg31rw7z2q0sizjphys9ljgxm43is4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hcl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hcl-mode";
           sha256 = "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin";
           name = "hcl-mode";
         };
@@ -11326,22 +11536,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
+    helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "1.9.1";
+        version = "1.9.2";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "fe96a398aa09ed0d25f6782efa5833085aa63791";
-          sha256 = "0awr4nvzgp1kckxqli1xw4pk16gc22i8hchin63fqvk0gllcy454";
+          rev = "a80e0b48e2ee22a022a76a5f483d1b68efe8a9e3";
+          sha256 = "0cylf0mnfj0m1wm9mxpxrkiinrlvpax99mdnsc6zfj3zrn1qghnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm";
           sha256 = "0xsf4rg7kn0m5wjlbwhd1mc38lg2822037dyd0h66h6x2gbs3fd9";
           name = "helm";
         };
-        packageRequires = [ async cl-lib emacs helm-core ];
+        packageRequires = [ async emacs helm-core popup ];
         meta = {
           homepage = "http://melpa.org/#/helm";
           license = lib.licenses.free;
@@ -11358,7 +11568,7 @@
           sha256 = "0ps86zpyywibjwcm9drmamla979ad61fyqr8d6bv71fr56k9ak21";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ack";
           sha256 = "1a8sc5gd2g57dl9g18wyydfmihy74yniwhjr27h7vxylnf2g3pni";
           name = "helm-ack";
         };
@@ -11368,22 +11578,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-ag = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    helm-ag = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ag";
-        version = "0.50";
+        version = "0.51";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-ag";
-          rev = "e0a4620fcc82d03bec7366542557539e7ecb653a";
-          sha256 = "03vv8arsvpshcfhmi2a3ams3q9q3p67avbbxyd3amyi3j336s2i7";
+          rev = "8f45c7e3294bea1bc583b2b46a02870cc7073311";
+          sha256 = "0ksx48n3g5n7ny2ny65bp3xx3p5g464dwxq30aji2b40yivaj0sz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ag";
           sha256 = "023zvgmi5b5b2qga3jqd7jrq9ap8n3rhvl6jrv9fsi565sg1fv43";
           name = "helm-ag";
         };
-        packageRequires = [ cl-lib helm ];
+        packageRequires = [ emacs helm ];
         meta = {
           homepage = "http://melpa.org/#/helm-ag";
           license = lib.licenses.free;
@@ -11400,7 +11610,7 @@
           sha256 = "015p5sszd54x81qm96gx6xwjkvbi4f3j9i2nhcvlkk75s95w1ijv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-aws";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-aws";
           sha256 = "0sjgdjpznjxsf6nlv2ah45fw17j8j5apdphd1fp43rjv1lskkgc5";
           name = "helm-aws";
         };
@@ -11421,7 +11631,7 @@
           sha256 = "0d6h4gbb69abxxgm85pdi5rsaf9h72yryg72ykd5633i1g4s8a76";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-backup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-backup";
           sha256 = "182jbm36yzayxi9y3vhpyn25ivrgay37sncqvah35vbw52lnjcn3";
           name = "helm-backup";
         };
@@ -11442,7 +11652,7 @@
           sha256 = "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-bundle-show";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-bundle-show";
           sha256 = "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7";
           name = "helm-bundle-show";
         };
@@ -11463,7 +11673,7 @@
           sha256 = "108584bmadgidqkdfvf333zkyb5v9f84pasz5h01fkh57ks8by9f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-c-yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-c-yasnippet";
           sha256 = "0jwj4giv6lxb3h7vqqb2alkwq5kp0shy2nraik33956p4l8dfs90";
           name = "helm-c-yasnippet";
         };
@@ -11484,7 +11694,7 @@
           sha256 = "1iqjc15pz5qr8zjxaxz1b2vys2689ri76jacmipxvgjk0y7vc5f0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-circe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-circe";
           sha256 = "12jfzg03573lih2aapvv5h2mi3pwqc9nrmv538ivjywix5117k3v";
           name = "helm-circe";
         };
@@ -11505,7 +11715,7 @@
           sha256 = "1l61csd1gqz7kg5zjx60cfy824g42p682z7pk0rqzlrz8498wvkh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-commandlinefu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-commandlinefu";
           sha256 = "150nqib0sr4n35vdj1xrxcja8gkv3chzhdbgkjxqgkz2yq10xxnd";
           name = "helm-commandlinefu";
         };
@@ -11515,22 +11725,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    helm-core = callPackage ({ async, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "1.9.1";
+        version = "1.9.2";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "fe96a398aa09ed0d25f6782efa5833085aa63791";
-          sha256 = "0awr4nvzgp1kckxqli1xw4pk16gc22i8hchin63fqvk0gllcy454";
+          rev = "a80e0b48e2ee22a022a76a5f483d1b68efe8a9e3";
+          sha256 = "0cylf0mnfj0m1wm9mxpxrkiinrlvpax99mdnsc6zfj3zrn1qghnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-core";
           sha256 = "1dyv8rv1728vwsp6vfdq954sp878jbp3srbfxl9gsgjnv1l6vjda";
           name = "helm-core";
         };
-        packageRequires = [ async cl-lib emacs ];
+        packageRequires = [ async emacs ];
         meta = {
           homepage = "http://melpa.org/#/helm-core";
           license = lib.licenses.free;
@@ -11547,7 +11757,7 @@
           sha256 = "0xnqkc4z22m41v5lgf87dd8xc4gmf932zbnbdhf9xic1gal1779c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-cscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-cscope";
           sha256 = "13a76wc1ia4c0v701dxqc9ycbb43d5k09m5pfsvs8mccisfzk9y4";
           name = "helm-cscope";
         };
@@ -11568,7 +11778,7 @@
           sha256 = "0s503q56acv70i5qahrdgk3nhvdpb3wa22a8jh1kvb7lykaw74ai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-dash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-dash";
           sha256 = "1cnxssj2ilszq94v5cc4ixblar1nlilv9askqjp9gfnkj2z1n9cy";
           name = "helm-dash";
         };
@@ -11589,7 +11799,7 @@
           sha256 = "1cm2vaw0j1x2w2m45k6iqbzm7nydfdx1x89673vsvb90whdgvjbp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-descbinds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-descbinds";
           sha256 = "1890ss4pimjxskzzllf57fg07xbs8zqcrp6r8r6x989llrfvd1h7";
           name = "helm-descbinds";
         };
@@ -11610,7 +11820,7 @@
           sha256 = "0vmlpj6zfif5f3wzgq8lkfqprl3z5gjsqj86347krblgfzhqlz30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-firefox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-firefox";
           sha256 = "0677nj0zsk11vvp3q3xl9nk8dhz3ki9yl3kfb57wgnmprp109wgs";
           name = "helm-firefox";
         };
@@ -11631,7 +11841,7 @@
           sha256 = "00ls9v3jdpz3wka90crd193z3ipwnf1b0slmldn4vb9ivrndh6wn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ghc";
           sha256 = "1q5ia8sgpflv2hhvw7hjpkfb25vmrjwlrqz1f9qj2qgmki5mix2d";
           name = "helm-ghc";
         };
@@ -11644,15 +11854,15 @@
     helm-ghq = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-ghq";
-        version = "1.5.1";
+        version = "1.6.0";
         src = fetchFromGitHub {
           owner = "masutaka";
           repo = "emacs-helm-ghq";
-          rev = "2997646b2fb5421ab435b772dd2dbaeb92d70166";
-          sha256 = "0rlk9016rxj292kpxrnqgrm4xsjs4m4gk2fwh8z3fcihi013lxaw";
+          rev = "db37bfe290b234ed3f39dcce24667072172ded41";
+          sha256 = "0y379qap3mssz9nslb08vfzq5ihqcm156fbx0dszgz9d6xgkpdhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ghq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ghq";
           sha256 = "14f3cbsj7jhlhrp561d8pasllnx1cmi7jk6v2fja7ghzj76dnvq6";
           name = "helm-ghq";
         };
@@ -11673,7 +11883,7 @@
           sha256 = "1sbhh3dmb47sy3r2iw6vmvbq5bpjac4xdg8i5a0m0c392a38nfqn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-github-stars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-github-stars";
           sha256 = "1r4mc4v71171sq9rbbhm346s92fb7jnvvl91y2q52jqmrnzzl9zy";
           name = "helm-github-stars";
         };
@@ -11694,7 +11904,7 @@
           sha256 = "1hc7j3gwljb1wk2727f66m3f7ga4icbklp54vlm0vf2bmii1ynil";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-gitlab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-gitlab";
           sha256 = "010ihx3yddhb8j3jqcssc49qnf3i7xlz0s380mpgrdxgz6yahsmd";
           name = "helm-gitlab";
         };
@@ -11707,15 +11917,15 @@
     helm-gtags = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-gtags";
-        version = "1.5.2";
+        version = "1.5.4";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-gtags";
-          rev = "7fb96b900fb8640993354a2f83732a50da529d03";
-          sha256 = "1gfshy0brlfa8z39savj2a0jlfpqffijshsyjpz28ig2ggv8amnh";
+          rev = "f14ff7140d0f070b089df7567f2cc6b437ab9924";
+          sha256 = "1hqmwbdcjssvvl7prdykhlgbfrf4qylkvqp0nnnxp8r1wy6h6aws";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-gtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-gtags";
           sha256 = "0snx0b8b4yc507q3i4fzvrd68xgzqxly8kn5cwp26ik6cv840y29";
           name = "helm-gtags";
         };
@@ -11736,7 +11946,7 @@
           sha256 = "189dv3qqqmfyhsqa1n52cgcn1xv7k49f92ndn43y2v20234nhl9f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-hatena-bookmark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-hatena-bookmark";
           sha256 = "14091zrp4vj7752rb5s3pkyvrrsdl7iaj3q9ys8rjmbsjwcv30id";
           name = "helm-hatena-bookmark";
         };
@@ -11757,7 +11967,7 @@
           sha256 = "1imfzz6cfdq7fgrcgrafy2nln929mgh31vybk9frm7a9jpamqdxp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-hayoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-hayoo";
           sha256 = "0xdvl6q2rpfsma4hx8m4snbd05s4z0bi8psdalixywlp5s4vzr32";
           name = "helm-hayoo";
         };
@@ -11778,7 +11988,7 @@
           sha256 = "0bz2ngw816jvpw1a10j31y5hf1knz0mzz60l073h33qci11jbwid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ispell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ispell";
           sha256 = "0qyj6whgb2p0v231wn6pvx4awvl1wxppppqqbx5255j8r1f3l1b0";
           name = "helm-ispell";
         };
@@ -11799,7 +12009,7 @@
           sha256 = "1nd562lffc41r3y5x7y46f37ra97avllk2m95w23f9g42h47f1ar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-lobsters";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-lobsters";
           sha256 = "0dkb78n373kywxj8zba2s5a2g85vx19rdswv9i78xjwv1lqh8cpp";
           name = "helm-lobsters";
         };
@@ -11820,7 +12030,7 @@
           sha256 = "0azs971d7pqd4ddxzy7bfs52cmrjbafwrcnf57afw39d772rzpdf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ls-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ls-git";
           sha256 = "08rsy9479nk03kinjfkxddrq6wi4sx2a0wrz37cl2q517qi7sibj";
           name = "helm-ls-git";
         };
@@ -11841,7 +12051,7 @@
           sha256 = "1hma79i69l8ilkr3l4b8zqk3ny62vqr1ym2blymia4ibwk4zqbda";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-ls-hg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ls-hg";
           sha256 = "0ca0xn7n8bagxb504xgkcv04rpm1vxhx2m77biqrx5886pwl25bh";
           name = "helm-ls-hg";
         };
@@ -11862,7 +12072,7 @@
           sha256 = "17ls0bplnja2qvg3129x2irgsgs7l4bjj0qi7b9z16i6knjkwfya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-make";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-make";
           sha256 = "1r6jjy1rlsii6p6pinbz7h6gcw4vmcycd3vj338bfbnqp5rrf2mc";
           name = "helm-make";
         };
@@ -11883,7 +12093,7 @@
           sha256 = "03588hanfa20pjp9w1bqy8wsf5x6az0vfq0bmcnr4xvlf6fhkyxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-migemo";
           sha256 = "1cjvb1lm1fsg5ky63fvrphwl5a7r7xf6qzb4mvl06ikj8hv2h33x";
           name = "helm-migemo";
         };
@@ -11904,7 +12114,7 @@
           sha256 = "1srx5f0s9x7zan7ayqd6scxfhcvr3nkd4yzs96hphd87rb18apzk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-mode-manager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-mode-manager";
           sha256 = "1w9svq1kyyj8mmljardhbdvykb334nq1y18s956g4rvqyas2ciyd";
           name = "helm-mode-manager";
         };
@@ -11925,7 +12135,7 @@
           sha256 = "0gknncyhr2392xkvghgy5mh6gdv6qzvswidx2wy04ypb4s0vxgq2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-mt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-mt";
           sha256 = "04hx8cg8wmm2w8g942nc9mvm12ammmjnx4k61ljrq76smd8s3x2a";
           name = "helm-mt";
         };
@@ -11946,7 +12156,7 @@
           sha256 = "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-nixos-options";
           sha256 = "1nsi4hfw53iwn29fp33dkri1c6w8kdyn4sa0yn2fi6144ilmq933";
           name = "helm-nixos-options";
         };
@@ -11967,7 +12177,7 @@
           sha256 = "1hq1nnmgkx0a8sv6g8k4v9f0102qg7jga0hcjnr8lcji51nqrcya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-open-github";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-open-github";
           sha256 = "121sszwvihbv688nq5lhdclvsjj8759glh42h82r4pcw30lxggxb";
           name = "helm-open-github";
         };
@@ -11988,7 +12198,7 @@
           sha256 = "1zyjxrrda7nxxjqczv2p3sfimxy2pq734kf51j6v2y0biclc4bk3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-orgcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-orgcard";
           sha256 = "1a56y8fny7qxxidc357n7l3yi7h66hidhvwhkam8y5wk6k61460p";
           name = "helm-orgcard";
         };
@@ -12009,7 +12219,7 @@
           sha256 = "14ad0b9d07chabjclffjyvnmrasar1di9wmpzf78bw5yg99cbisw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-package";
           sha256 = "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y";
           name = "helm-package";
         };
@@ -12030,7 +12240,7 @@
           sha256 = "1r2ndmrw5ivawb940j8jnmqzxv46qrzd3cqh9fvxx5yicf020fjf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-pages";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-pages";
           sha256 = "1v3w8100invb5wsmm3dyl41pjs7s889s3b1rlr6vlcspa1ncv3wj";
           name = "helm-pages";
         };
@@ -12051,7 +12261,7 @@
           sha256 = "01cj2897hqz02mfz32nxlyyp59iwm0gz1zj11s8ll7pwy9q3r90g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-perldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-perldoc";
           sha256 = "0b0cl2xj5w1r71zrjhnqhrzsnz1296jv21qx5adzslra6lk55q2r";
           name = "helm-perldoc";
         };
@@ -12072,7 +12282,7 @@
           sha256 = "0y0a18bj2k459fk51z7svnnasqkl78bx61y5ha1yv3sqnppgdw2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-proc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-proc";
           sha256 = "1bq60giy2bs9m3hlbc5nwvy51702a98s0vqass3b290hdgki4bnx";
           name = "helm-proc";
         };
@@ -12093,7 +12303,7 @@
           sha256 = "1q7hfj8ldwivhjp9ns5pvsn0ds6pyvl2zhl366c22s6q8jmbr8ik";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-project-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-project-persist";
           sha256 = "1n87kn1n3453mpdj6amyrgivslskmnzdafpspvkz7b0smf9mv2ld";
           name = "helm-project-persist";
         };
@@ -12114,7 +12324,7 @@
           sha256 = "0jm6nnnjyd4kmm1knh0mq3xhnw2hvs3linwlynj8yaliqvlv6brv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-pt";
           sha256 = "1imhy0bsm9aldv0pvf88280qdya01lznxpx5gi5wffhrz17yh4pi";
           name = "helm-pt";
         };
@@ -12135,7 +12345,7 @@
           sha256 = "1ik0vllakh73kc2zbgii4sm33n9pj388gaz69j4drz2mik307zvs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-pydoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-pydoc";
           sha256 = "0cnbhjw951f8sci63cvzcc65d0ffdx3rb8l1g38qql5rzkam48fn";
           name = "helm-pydoc";
         };
@@ -12156,7 +12366,7 @@
           sha256 = "1f1ijna97dn190if3nwk5s5rldlpryfb7wvgg0imwqyp25h4all7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-recoll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-recoll";
           sha256 = "0pr2pllplml55k1xx9inr3dm90ichg2wb62dvgvmbq2sqdf4606b";
           name = "helm-recoll";
         };
@@ -12177,7 +12387,7 @@
           sha256 = "163ljqar3vvbavzc8sk6rnf8awyc2rhh2g117fglswich3c8lnqg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-robe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-robe";
           sha256 = "1gi4nkm9xvnxv0frmhiiw8dkmnmhfpr9n0b6jpidlvr8xr4s5kyw";
           name = "helm-robe";
         };
@@ -12198,7 +12408,7 @@
           sha256 = "1sff8kagyhmwcxf9062il1077d4slvr2kq76abj496610gpb75i0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-rubygems-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-rubygems-org";
           sha256 = "04ni03ak53z3rggdgf68qh7ksgcf3s0f2cv6skwjqw7v8qhph6qs";
           name = "helm-rubygems-org";
         };
@@ -12219,7 +12429,7 @@
           sha256 = "1s6aw1viyzhhrfiazzi82n7bkvshp7clwi6539660m72lfwc5zdl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-sage";
           sha256 = "1vnq15fjaap0ai7dadi64sm4415xssmahk2j7kx45sasy4qaxlbj";
           name = "helm-sage";
         };
@@ -12240,7 +12450,7 @@
           sha256 = "0kz0vfp43n7f9l53rji2pb8v6ylg63i37q0bmidmjjvsinimwj44";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-spaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-spaces";
           sha256 = "0hdvkk173k98iycvii5xpbiblx044125pl7jyz4kb8r1vvwcv791";
           name = "helm-spaces";
         };
@@ -12261,7 +12471,7 @@
           sha256 = "1lkjrz9ma2bxr8vskdm3sgrmsyiic798q3271dw38d453bhv4bl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-swoop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-swoop";
           sha256 = "1fqbhj75hcmy7c2vdd0m7fk3m34njmv5s6k1i9y94djpbd13i3d8";
           name = "helm-swoop";
         };
@@ -12282,7 +12492,7 @@
           sha256 = "0rzbdrs5d5a0icpxrqik2iaz8i5bacw6nm2caf75s9w9j0j6s9li";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-themes";
           sha256 = "1j64w6dnxmq0rfycci9wfy2z5lbddsggf486pknxfgwwqgvns90l";
           name = "helm-themes";
         };
@@ -12303,7 +12513,7 @@
           sha256 = "14lbdvs9xdnipsn3lywbvgsqwqnbm8fxm6d1ilq0cj5z6zkxkya0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-unicode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-unicode";
           sha256 = "052xqzvcfzpsbl75ylqb1khqndvc2dqdymqlwivs0darlds0w8y4";
           name = "helm-unicode";
         };
@@ -12324,7 +12534,7 @@
           sha256 = "0s8zp3kx2kxlfyd26yr3lphwcybhbm8qa9vzmxr3kaylwy6jpz5q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-w32-launcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-w32-launcher";
           sha256 = "0bzn2vhspn6lla815qxwsl9gwfyiwgwmnysr6rjpyacmi17d73ri";
           name = "helm-w32-launcher";
         };
@@ -12345,7 +12555,7 @@
           sha256 = "1j6ssbjbm5ym3pg0icpfp735y4dfhlky9qhl9hwp2n3wmba5g9h1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/helm-zhihu-daily";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-zhihu-daily";
           sha256 = "0hkgail60s9qhxl0pskqxjvfz93iq1qh1kcmcq0x5kq7d08b911r";
           name = "helm-zhihu-daily";
         };
@@ -12366,7 +12576,7 @@
           sha256 = "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hi2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hi2";
           sha256 = "1wxkjg1jnw05lqzggi20jy2jl20d8brvv76vmrf6lnz62g6jv9h2";
           name = "hi2";
         };
@@ -12387,7 +12597,7 @@
           sha256 = "0c65jk00j88qxfki2g88hy9g6n92rzskwcn1fbmwcw3qgaz4b6w5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-blocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-blocks";
           sha256 = "1a32iv5kgf6g6ygbs559w156dh578k45m860czazfx0d6ap3k5m1";
           name = "highlight-blocks";
         };
@@ -12408,7 +12618,7 @@
           sha256 = "08czwa165rnd5z0dwwdddn7zi5w63sdk31l47bj0598kbly01n7r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-defined";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-defined";
           sha256 = "1vjxm35wf4c2qphpkjh57hf03a5qdssdlmfj0n0gwxsdw1q5rpms";
           name = "highlight-defined";
         };
@@ -12429,7 +12639,7 @@
           sha256 = "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-indentation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-indentation";
           sha256 = "0iblrrbssjwfn71n8xxjcl98pjv1qw1igf3hlz6mh8740fsca3d6";
           name = "highlight-indentation";
         };
@@ -12450,7 +12660,7 @@
           sha256 = "0ffhc5s0h34064bix4qyiiyx30m4hpv0phmxwcrwiyvanj9ggfai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-numbers";
           sha256 = "1bywrjv9ybr65mwkrxggb52jdqn16z8acgs5vqm0faq43an8i5yv";
           name = "highlight-numbers";
         };
@@ -12471,7 +12681,7 @@
           sha256 = "08ld4wjrkd77cghmrf1n2hn2yzid7bdqwz6b1rzzqaiwxl138iy9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-parentheses";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-parentheses";
           sha256 = "1b0n9mz4a6baljvvgb881w53391smm35c9pwd45g861hk1qvrk5k";
           name = "highlight-parentheses";
         };
@@ -12492,7 +12702,7 @@
           sha256 = "1ahg9qzss67jpw0wp2izys6lyss4nqjy9320fpa4vdx39msdmjjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-quoted";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-quoted";
           sha256 = "0x6gxi0jfxvpx7r1fm43ikxlxilnbk2xbhdy9xivhgmmdyqiqqkl";
           name = "highlight-quoted";
         };
@@ -12513,7 +12723,7 @@
           sha256 = "09z13kv2g21kjjkkm3iyaz93sdjmdy2d563r8n7r7ng94acrn7f6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/highlight-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-symbol";
           sha256 = "0gw8ffr64s58qdbvm034s1b9xz1hynzvbk8ld67j06fxpc98qaj4";
           name = "highlight-symbol";
         };
@@ -12534,7 +12744,7 @@
           sha256 = "0hb74j5137yj3rm2si16xzwmcvkiwx8ywh1qrlnrzv5gl4viyjzb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hindent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hindent";
           sha256 = "1f3vzgnqigwbwvglxv0ziz3kyp5dxjraw3vlghkpw39f57mky4xz";
           name = "hindent";
         };
@@ -12555,7 +12765,7 @@
           sha256 = "0mzk4agkcaaw7gryi0wrxv0blqndqsjf1ivdvr2nrnqi798sdhbr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hippie-expand-slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hippie-expand-slime";
           sha256 = "0kxyv1lpkg33qgfv1jfqx03640py7525bcnc9dk98w6y6y92zf4m";
           name = "hippie-expand-slime";
         };
@@ -12576,7 +12786,7 @@
           sha256 = "0nfr8ad0klqwi97fjchvwx9mfc672lhv3ll166sr8vn6jlh7rkv0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hippie-namespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hippie-namespace";
           sha256 = "1bzjhq116ci9c9f0aw121fn3drmg2pw5ny1w6wcasa4p30syxxf0";
           name = "hippie-namespace";
         };
@@ -12597,7 +12807,7 @@
           sha256 = "0dy98sg92xvnr4algm2v2bnjcdwzv0b0vqk0312b0ziinkzisas1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/history";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/history";
           sha256 = "0s8pcz53bk1w4h5847204vb6j838vr8za66ni1b2y4pas76zjr5g";
           name = "history";
         };
@@ -12618,7 +12828,7 @@
           sha256 = "1mxicha6m61qxz1mv9z76x4g9fpqk4ch9i6jf7nnpxd6x4xz3f7z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/historyf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/historyf";
           sha256 = "15pcaqfjpkfwcy46yqqw10q8kpw7aamcg0gr4frbdgzbv0yld08s";
           name = "historyf";
         };
@@ -12639,7 +12849,7 @@
           sha256 = "12ab825dldiqymy4md8ssfnbbhrgczkwdiwd3llsdq6sayar16as";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-anything";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-anything";
           sha256 = "15n998nhirvg3f719b7x9s7jpqv6gzkr22kp4zbbq99lbx2wfc1k";
           name = "hl-anything";
         };
@@ -12660,7 +12870,7 @@
           sha256 = "1hgigbgppdhmr7rc901r95kyydjk05dck8mwbryh7kpglns365fa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-sentence";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-sentence";
           sha256 = "16sjfs0nnpwzj1cqfna9vhmxgznwwhb2qdmjci25hlgrdxwwyahs";
           name = "hl-sentence";
         };
@@ -12681,7 +12891,7 @@
           sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-sexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-sexp";
           sha256 = "0kg0m20i9ylphf4w0qcvii8yp65abdl2q5flyphilk0jahwbj9jy";
           name = "hl-sexp";
         };
@@ -12702,7 +12912,7 @@
           sha256 = "07irwpg794fdzsixmcbi1lnafj5gynhrdam7frcpmvb26a0l8fxq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hl-todo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-todo";
           sha256 = "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4";
           name = "hl-todo";
         };
@@ -12723,7 +12933,7 @@
           sha256 = "1wg6vc9swwspi6s6jpig3my83i2pq8vkq2cy1q3an87rczacmfzp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hoa-pp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hoa-pp-mode";
           sha256 = "01ijfn0hd645j6j88rids5dsanmzwmky37slf50yqffnv69jwvla";
           name = "hoa-pp-mode";
         };
@@ -12744,7 +12954,7 @@
           sha256 = "1n8r4jrk71dg25ca6bsw11ky0dszdj4pvqwsmy3msqlji1ckvqyn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/homebrew-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/homebrew-mode";
           sha256 = "088wc5fq4r5yj1nbh7mriyqf0xwqmbxvblj9d2wwrkkdm5flc8mj";
           name = "homebrew-mode";
         };
@@ -12765,7 +12975,7 @@
           sha256 = "1yvz9d5h7npxhsdf6s9fgxpmqk5ixx91iwivbhzcz935gs2886hc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hookify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hookify";
           sha256 = "0prls539ifk2fsqklcxmbrwmgbm9hya50z486d7sw426lh648qmy";
           name = "hookify";
         };
@@ -12786,7 +12996,7 @@
           sha256 = "0k09n66jar0prq9aal2h3izp1y67jibdx0gjr0g4jx1p1yxig1dg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ht";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ht";
           sha256 = "16vmxksannn2wyn8r44jbkdp19jvz1bg57ggbs1vn0yi7nkanwbd";
           name = "ht";
         };
@@ -12807,7 +13017,7 @@
           sha256 = "0c648dl5zwjrqx9n6zr6nyzx2zcnv05d5i4hvhjpl9q3y011ncns";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/html-to-markdown";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/html-to-markdown";
           sha256 = "1gjh9ndqsb3nfb7w5h7carjckkgy6qh63b4mg141j19dsyx9rrjv";
           name = "html-to-markdown";
         };
@@ -12828,7 +13038,7 @@
           sha256 = "1h9n388fi17nbyfciqywgrq3n165kpiildbimx59qyk2ac3v7rqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/httpcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/httpcode";
           sha256 = "05k1al1j119x6zf03p7jn2r9qql33859583nbf85k41bhicknpgh";
           name = "httpcode";
         };
@@ -12849,7 +13059,7 @@
           sha256 = "0dd257988bdar9hl2711ch5qshx9jc11fqxcvbrd7rc1va5cshs9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/httprepl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/httprepl";
           sha256 = "0899qb1yfnsyf04hhvnk47qnq4d1f4vd5ghj43x4743wd2b9qawh";
           name = "httprepl";
         };
@@ -12870,7 +13080,7 @@
           sha256 = "1b8992vzq5bh01pjlj181nzqjrqs4fbjpwvv8h7gjq42sf8w59sm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hyai";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hyai";
           sha256 = "00ns7q5b11c5amwkq11fs4p5vrmdfmjljfrcxbwb39gc12yrhn7s";
           name = "hyai";
         };
@@ -12891,7 +13101,7 @@
           sha256 = "0nwsmc4c3v0wbfy917ik9k7yz8yclfac695p7p9sh9y354k3maw4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hyde";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hyde";
           sha256 = "18kjcxm7qmv9bfh4crw37zgax8khjqs9zkp4lrb490zlad2asbs3";
           name = "hyde";
         };
@@ -12912,7 +13122,7 @@
           sha256 = "08iw95lyizcyf6cjl37fm8wvay0vsk9758pk9gq9f2xiafcchl7f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/hydra";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hydra";
           sha256 = "1c59l43p39ins3dn9690gm6llwm4b9p0pk78lip0dwlx736drdbw";
           name = "hydra";
         };
@@ -12933,7 +13143,7 @@
           sha256 = "1zcnp61c9cp2kvns3v499hifk072rxm4rhw4pvdv2mm966vcxzvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ibuffer-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ibuffer-projectile";
           sha256 = "1qh4krggmsc6lx5mg60n8aakmi3f6ppl1gw094vfcsni96jl34fk";
           name = "ibuffer-projectile";
         };
@@ -12954,7 +13164,7 @@
           sha256 = "0bqdi5w120256g74k0j4jj81x804x1gcg4dxa74w3mb6fl5xlvs8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ibuffer-vc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ibuffer-vc";
           sha256 = "0bn5qyiq07cgzci10xl57ss5wsk7bfhi3hjq2v6yvpy9v704dvla";
           name = "ibuffer-vc";
         };
@@ -12975,7 +13185,7 @@
           sha256 = "047gzycr49cs8wlmm9j4ry7b7jxmfhmbayx6rbbxs49lba8dgwlk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/identica-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/identica-mode";
           sha256 = "1r69ylykjap305g23cry4wajiqhpgw08nw3b5d9i1y3mwx0j253q";
           name = "identica-mode";
         };
@@ -12996,7 +13206,7 @@
           sha256 = "0x4w1ksrw7dicl84zpf4d4scg672dyan9g95jkn6zvri0lr8xciv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/idle-highlight-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/idle-highlight-mode";
           sha256 = "1i5ky61bq0dpk71yasfpjhsrv29mmp9nly9f5xxin7gz3x0f36fc";
           name = "idle-highlight-mode";
         };
@@ -13017,7 +13227,7 @@
           sha256 = "1ffmsmi31jc0gqnbdxrd8ipsy790bn6hgq3rmayylavmdpg3qfd5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-complete-space-or-hyphen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-complete-space-or-hyphen";
           sha256 = "1wk0cq5gjnprmpyvhh80ksz3fash42hckvmx8m95crbzjg9j0gbc";
           name = "ido-complete-space-or-hyphen";
         };
@@ -13038,7 +13248,7 @@
           sha256 = "0byairx5nxbzgdyiw658p7yiysfr7r1bd3b2prawq72bslb1c5cn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-completing-read+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-completing-read+";
           sha256 = "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh";
           name = "ido-completing-read-plus";
         };
@@ -13051,15 +13261,15 @@
     ido-describe-bindings = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-describe-bindings";
-        version = "0.0.8";
+        version = "0.0.9";
         src = fetchFromGitHub {
           owner = "danil";
           repo = "ido-describe-bindings";
-          rev = "c84054942d03a19ee65716db89771c4a157ff696";
-          sha256 = "1q8vqmdfhbmciwn1i1ln7xx2i41kknv030hf6a88grl4rzqffm70";
+          rev = "1f5c78bf56f2cab137a323ec426e906f2215bf7f";
+          sha256 = "0055dda1la7yah33xsi19j4hcdmqp17ily2dvkipm4y6d3ww8yqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-describe-bindings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-describe-bindings";
           sha256 = "1lsa09h025vd908r9q571iq2ia0zdpnq04mlihb3crpp5v9n9ws2";
           name = "ido-describe-bindings";
         };
@@ -13080,7 +13290,7 @@
           sha256 = "0f1p6cnl0arcc2y1h99nqcflp7byvyf6hj6fmv5xqggs66qc72lb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-grid-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-grid-mode";
           sha256 = "1wl1yclcxmkbfnvp0il23csdf6gprzf7fkcknpivk784fhl19acr";
           name = "ido-grid-mode";
         };
@@ -13101,7 +13311,7 @@
           sha256 = "1z7az7h90v72llxvdclcywvf1qd0nhkfa45bp99xi7cy7sqsqssf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-load-library";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-load-library";
           sha256 = "13f83gqh39p3yjy7r7qc7kzgdcmqh4b5c07zl7rwzb8y9rz59lhj";
           name = "ido-load-library";
         };
@@ -13114,15 +13324,15 @@
     ido-occur = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-occur";
-        version = "0.1.3";
+        version = "0.1.4";
         src = fetchFromGitHub {
           owner = "danil";
           repo = "ido-occur";
-          rev = "247ee110dc085f9f5577aa02241c3ad66164b455";
-          sha256 = "1qvx1v5xrfv1id6lfn767b667m2hn4rsw2nmb61j1i81csdiqjds";
+          rev = "7d2e42bf239cacb90e6240b8014e6b20b24e89cf";
+          sha256 = "0j12li001yq08vzwh1b25qyq09llizrkgaay9k07g9pvfxlx6zb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-occur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-occur";
           sha256 = "058l2pklg12wkvyyshk8va6shphpbc508fv9a8x25pw857a28pji";
           name = "ido-occur";
         };
@@ -13143,7 +13353,7 @@
           sha256 = "0byairx5nxbzgdyiw658p7yiysfr7r1bd3b2prawq72bslb1c5cn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-ubiquitous";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-ubiquitous";
           sha256 = "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp";
           name = "ido-ubiquitous";
         };
@@ -13164,7 +13374,7 @@
           sha256 = "1lv82q639xjnmvby56nwqn23ijh6f163bk675s33dkingm8csj8k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-vertical-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-vertical-mode";
           sha256 = "1vg5s6nd6v2g8ychz1q9cdqvsdw6vag7d9w68sn7blpmlr0nqhfm";
           name = "ido-vertical-mode";
         };
@@ -13185,7 +13395,7 @@
           sha256 = "0i3s80ws3qbhb3vsvf09mbq661c5140v4phgbl4cz6z545ha2bj7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ido-yes-or-no";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-yes-or-no";
           sha256 = "0glag4yb9xyf1lxxbdhph2nq6s1vg44i6f2z1ii8bkxpambz2ana";
           name = "ido-yes-or-no";
         };
@@ -13206,7 +13416,7 @@
           sha256 = "0bq0kx0889rdy8aasxbpmb0a4awpk2b24zv6x1dmhacmc5rj11i0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/idomenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/idomenu";
           sha256 = "0mg601ak9mhp2fg5n13npcfzphgyms4vkqd18ldmv098z2z1412h";
           name = "idomenu";
         };
@@ -13227,7 +13437,7 @@
           sha256 = "0iwgbaq2797k1f7ql86i2pjfa67cha4s2v0mgmrd0qcgqkxsdq92";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/idris-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/idris-mode";
           sha256 = "0hiiizz976hz3z3ciwg1gs9y10qhxbs8givhz89kvyn4s4861a1s";
           name = "idris-mode";
         };
@@ -13248,7 +13458,7 @@
           sha256 = "06qv95bgcb6n3zcjs2i1q80v9040z7m9pb9xbhxmqzcx68vpbpdm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iedit";
           sha256 = "02gjshvkcvyr58yf6vlg3s2pzls5sd54xpxggdmqajfg8xmpkq04";
           name = "iedit";
         };
@@ -13269,7 +13479,7 @@
           sha256 = "18rlyjsn9w0zbs0c002s84qzark3rrcmjn9vq4nap7i6zpaq8hki";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iflipb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iflipb";
           sha256 = "1nfrrxgi9nlhn477z8ay7jxycpcghhhmmg9dagdhrlrr20fx697d";
           name = "iflipb";
         };
@@ -13290,7 +13500,7 @@
           sha256 = "1j40ldvgd7nr7pabi8mhzdvi0ml9n62m8mfjlh9nrbnkcsifs9rk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ignoramus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ignoramus";
           sha256 = "1czqdmlrds1l5afi8ldg7nrxcwav86538z2w1npad3dz8xk67da9";
           name = "ignoramus";
         };
@@ -13311,7 +13521,7 @@
           sha256 = "0imvxzcja91cd19zm2frqfpxm8j0bc89w9s7q0pkpvyjz44kjbq8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/image-archive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/image-archive";
           sha256 = "0x0lv5dr1gc9bnr3dn26bc9s1ccq2rp8c4a1licbi929f0jyxxfp";
           name = "image-archive";
         };
@@ -13332,7 +13542,7 @@
           sha256 = "1n2ya9s0ld257a8iryjd0dz0z2zs1xhzfiwsdkq4l4azwxl54m29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/image-dired+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/image-dired+";
           sha256 = "0hhwqfn490n7p12n7ij4xbjh15gfvicmn21fvwbnrmfqc343pcdy";
           name = "image-dired-plus";
         };
@@ -13353,7 +13563,7 @@
           sha256 = "0k69xbih0273xvmj035vcmm67l6hgjb99pb1jbva5x0pnszb1vdv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/image+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/image+";
           sha256 = "1a9dxswnqn6cvx28180kclpjc0vc6fimzp7n91gpdwnmy123x6hg";
           name = "image-plus";
         };
@@ -13374,7 +13584,7 @@
           sha256 = "0qc96p5f7paxaxzv73w072cba8jb6ibdbhml7n7cm85b0rz1wf16";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imenu-anywhere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imenu-anywhere";
           sha256 = "0p93g7ay9n4nhf1qk24mbax0w9sr06xd2kjmrz00gbg75sr9r2s8";
           name = "imenu-anywhere";
         };
@@ -13395,7 +13605,7 @@
           sha256 = "192i3iaykw5a9fb9xaivfjj2pbziqdnadlrvqbxbl9h5wi52qq9c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imenu-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imenu-list";
           sha256 = "092fsn7hnbfabcyakbqyk20pk62sr8xrs45aimkv1l91681np98s";
           name = "imenu-list";
         };
@@ -13416,7 +13626,7 @@
           sha256 = "18nx5z2vn0ikv4gxjprsqr63pcgf9s02gc3f769h8dji560kqxd4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imenus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imenus";
           sha256 = "1q0j6r2n5vjlbgchkz9zdglmmbpd8agawzcg61knqrgzpc4lk82r";
           name = "imenus";
         };
@@ -13437,7 +13647,7 @@
           sha256 = "19jqcbiwqknlpij9q63m1p69k4zb3v1qdx0858drprc2rl1p55cd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/imgix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imgix";
           sha256 = "0dh7qsz5c9mflldcw60vc8mrxrw76n2ydd7blv6jfmsnr19ila4q";
           name = "imgix";
         };
@@ -13458,7 +13668,7 @@
           sha256 = "1pf7pqh8yzyvh4gzvp5npfq8kcfjcbzra0kkw7zmz769xxc8v84x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/immutant-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/immutant-server";
           sha256 = "15vcxag1ni41ja4b3q0444sq5ysrisis59la7li6h3617wy8r02i";
           name = "immutant-server";
         };
@@ -13471,15 +13681,15 @@
     import-js = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "import-js";
-        version = "0.3.1";
+        version = "0.4.1";
         src = fetchFromGitHub {
           owner = "trotzig";
           repo = "import-js";
-          rev = "e16a73f16d38d3c30bb2303b176568de6f30f533";
-          sha256 = "1511zk9nm48wr5mhm6xs86n3w7iij6zs20yqza6w3yn460h0kxmb";
+          rev = "732cd36da156398c1ee3b5f08e5c3c3d020f24f8";
+          sha256 = "00gpyz63lqb2ydvjxjagf2cpja8gw6xbyw82cdj64k53mn86cyvl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/import-js";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/import-js";
           sha256 = "1grvzy378qj14wlbmhb3j7fx2zkl9wp65b5g0brjimav08nz7bls";
           name = "import-js";
         };
@@ -13500,7 +13710,7 @@
           sha256 = "0ycsdwwfb27g85aby4jix1aj41a4vq6bf541iwla0xh3wsyxb01w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/import-popwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/import-popwin";
           sha256 = "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy";
           name = "import-popwin";
         };
@@ -13521,7 +13731,7 @@
           sha256 = "1dmr1arqy2vs9jdjha513mvw3yfwgkn4zs728q83asjy91sfcz7k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inf-clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inf-clojure";
           sha256 = "0n8w0vx1dnbfz88j45a57z9bsmkxr2zyh6ld72ady8asanf17zhl";
           name = "inf-clojure";
         };
@@ -13542,7 +13752,7 @@
           sha256 = "11zsprv5ycnfqi358dd4cx70dbn6a8hccd4prf28lln7vhldbmjz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inf-ruby";
           sha256 = "02f01vwzr6j9iqcdns4l579bhia99sw8hwdqfwqjs9gk3xampfpp";
           name = "inf-ruby";
         };
@@ -13563,7 +13773,7 @@
           sha256 = "1fm69g4mrmdchvxr062bk7n1jvs2rrscddb02cldb5bgdrcw8g6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inflections";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inflections";
           sha256 = "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70";
           name = "inflections";
         };
@@ -13584,7 +13794,7 @@
           sha256 = "031vb7ndz68x0119v4pyizz0ykd341ywcp5s7i4z35zx1vcqj8az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/init-loader";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/init-loader";
           sha256 = "0rq7759abp0ml0l8dycvdl0j5wsxw9z5y9pyx68973a4ssbx2i0r";
           name = "init-loader";
         };
@@ -13605,7 +13815,7 @@
           sha256 = "06w1vnfhjy8g62z6xajin5akgh30pa0kk56am61kv6mi5ia8fc96";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/init-open-recentf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/init-open-recentf";
           sha256 = "0xlmfxhxb2car8vfx7krxmxb3d56x0r3zzkj8ds7yqvr65z85x2r";
           name = "init-open-recentf";
         };
@@ -13626,7 +13836,7 @@
           sha256 = "1rfw38a63bvzglqx7mb8wlnzjvlmkhkn35hn66snqqgvnmnvi54g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/initsplit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/initsplit";
           sha256 = "0n9dk3x62vgxfn39jkmdg8wxsik0xqkprifgvqzyvn8xcx1blyyq";
           name = "initsplit";
         };
@@ -13647,7 +13857,7 @@
           sha256 = "0jipds844432a8m4d5gxbbkk2h1rsq9fg748g6bxy2q066kyzfz6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inline-crypt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inline-crypt";
           sha256 = "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n";
           name = "inline-crypt";
         };
@@ -13668,7 +13878,7 @@
           sha256 = "15nasjknmzy57ilj1gaz3w5sj8b3ijcpgwcd6w2r9xhgcl86m40q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/inlineR";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inlineR";
           sha256 = "1fflq2gkpfn3jkv4a6yywzmxsq6qszfid1ri85ass1ppw6scdvzw";
           name = "inlineR";
         };
@@ -13689,7 +13899,7 @@
           sha256 = "1mqnz40zirnyn3wa71wzzjph3a0sbgvzcywcr7xnzqpl6sp7g93f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/insert-shebang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/insert-shebang";
           sha256 = "0z88l1q925v9lwzr6nas9qjy0f57qxilg6smgpx9wj6lll3f7p5v";
           name = "insert-shebang";
         };
@@ -13709,7 +13919,7 @@
           sha256 = "0krscid3yz2b7kv75gd9fs92zgfl7pnl77dbp5gycv5rmw5mivp8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/instapaper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/instapaper";
           sha256 = "1yibdpj3lx6vr33s75s1y415lxqljrk7pqc901f8nfa01kca7axn";
           name = "instapaper";
         };
@@ -13730,7 +13940,7 @@
           sha256 = "1bidhc4pgszx2gqsm125nw7i5ysy0mzc1ifcfkfgns1cpjr74rpn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/interleave";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/interleave";
           sha256 = "18b3fpxn07y5abkcnaw9is9ihdhik7xjdj6kzl1pz958lk9f4hfy";
           name = "interleave";
         };
@@ -13751,7 +13961,7 @@
           sha256 = "043dnij48zdyg081sa7y64lm35z7zvrv8gcymv3l3a98r1yhy3v6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/iplayer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iplayer";
           sha256 = "0wnxvdlnvlmspqsaqx0ldw8j03qjckkqzvx3cbpc2yfs55pm3p7r";
           name = "iplayer";
         };
@@ -13772,7 +13982,7 @@
           sha256 = "036q933yw7pimnnq43ydaqqfccgf4iwvjhjmsavp7l6y1w16rvmy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ir-black-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ir-black-theme";
           sha256 = "1qpq9zbv63ywzk5mlr8x53g3rn37k0mdv6x1l1hcd90gka7vga9v";
           name = "ir-black-theme";
         };
@@ -13793,7 +14003,7 @@
           sha256 = "1wsh72dzm54srxdnlhnmbi8llc30syhbckycj5wmsamw8b89p7c2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/irony";
           sha256 = "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a";
           name = "irony";
         };
@@ -13814,7 +14024,7 @@
           sha256 = "09hx28lmldm7z3x22a0qx34id09fdp3z61pdr61flgny213q1ach";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/isgd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/isgd";
           sha256 = "0yc9mkjzj3w64f48flnjvd193mk9gndrrqbxz3cvmvq3vgahhzyi";
           name = "isgd";
         };
@@ -13835,7 +14045,7 @@
           sha256 = "0rpxh1jv98dl9b5ldjkljk70z4hkl61kcmvy1lhpj3lxn8ysv87a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ix";
           sha256 = "1fl76dk8vgw3mrh5iz99lrsllwya6ij9d1lj3szcrs4qnj0b5ql3";
           name = "ix";
         };
@@ -13856,7 +14066,7 @@
           sha256 = "07kbicf760nw4qlb2lkf1ns8yzqy0r5jqqwqjbsnqxx4sm52hml9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/j-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/j-mode";
           sha256 = "0f9lsr9hjhdvmzx565ivlncfzb4iq4rjjn6a41053cjy50bl066i";
           name = "j-mode";
         };
@@ -13875,7 +14085,7 @@
           sha256 = "af89d7052e555c7b5efb0c21387a50699056659fb83698691b70e75c88e4cd34";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jabber";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jabber";
           sha256 = "1g5pc80n3cd5pzs3hmpbnmxbldwakd72pdn3vvb0h26j9v073pa8";
           name = "jabber";
         };
@@ -13896,7 +14106,7 @@
           sha256 = "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jade-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jade-mode";
           sha256 = "156j0d9wx6hrhph0nsjsi1jha4h65rcbrbff1j2yr8vdsszjrs94";
           name = "jade-mode";
         };
@@ -13917,7 +14127,7 @@
           sha256 = "0x0vz7m9kn7b2aiqvrdqx8qh84ynbpzy2asz2b18l47bcwa7r5bh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jammer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jammer";
           sha256 = "01c4bii7gswhp6z9dgx4bhvsywiwbbdv7mg1zj6vp1530l74zx6z";
           name = "jammer";
         };
@@ -13938,7 +14148,7 @@
           sha256 = "08gkxxaw789g1r0dql11skz6i8bdrrz4wp87fzs9f5rgx99xxr6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/japanlaw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/japanlaw";
           sha256 = "1pxss1mjk5660k80r1xqgslnbrsr6r4apgp9abjwjfxpg4f6d0sa";
           name = "japanlaw";
         };
@@ -13948,6 +14158,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    java-imports = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pcache, s }:
+    melpaBuild {
+        pname = "java-imports";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "dakrone";
+          repo = "emacs-java-imports";
+          rev = "275f354c245df741b45e88d085660722e81a12be";
+          sha256 = "1bngn6v6w60qb3zz7s3px7v3wk99a3hfvzrg9l06dz1q7xgyvsi1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/java-imports";
+          sha256 = "1waz6skyrm1n8wpc0pwa652l11wz8qz1m89mqxk27k3lwyd84n98";
+          name = "java-imports";
+        };
+        packageRequires = [ emacs pcache s ];
+        meta = {
+          homepage = "http://melpa.org/#/java-imports";
+          license = lib.licenses.free;
+        };
+      }) {};
     javadoc-lookup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "javadoc-lookup";
@@ -13959,7 +14190,7 @@
           sha256 = "0ljpqgp2w3lr61n2vr748n3wyshlqnnbin0643jffa319l99z35r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/javadoc-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/javadoc-lookup";
           sha256 = "1fffs0iqkk9rg5vbxifvn09j4i2751p81bzcvy5fslr3r1r2nv79";
           name = "javadoc-lookup";
         };
@@ -13980,7 +14211,7 @@
           sha256 = "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jedi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jedi";
           sha256 = "1777060q25k9n2g6h1lm5lkki900pmjqkxq72mrk3j19jr4pk9m4";
           name = "jedi";
         };
@@ -14001,7 +14232,7 @@
           sha256 = "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jedi-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jedi-core";
           sha256 = "0pzi32zdb4g9n4kvpmkdflmqypa7nckmnjq60a3ngym4wlzbb32f";
           name = "jedi-core";
         };
@@ -14022,7 +14253,7 @@
           sha256 = "1gf6ir4viy8zr9fwmjz4s7zkr3m7947sa8mai56bnv83r2k3s9ir";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js-comint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js-comint";
           sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1";
           name = "js-comint";
         };
@@ -14043,7 +14274,7 @@
           sha256 = "0d2hqlgm09rw0azha5dxmq63b56sa8b9qj7gd7invibl6nnyjh4a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js2-closure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js2-closure";
           sha256 = "19732bf98lk2ah2ssgkr1ngxx7rz3nhsiw84lsfmydb0vvm4fpk7";
           name = "js2-closure";
         };
@@ -14064,7 +14295,7 @@
           sha256 = "0r2szaxr3q0gvxqd9asn03q8jf3nclxv4mqdsjn96s98n45x388l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js2-highlight-vars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js2-highlight-vars";
           sha256 = "07bq393g2jy8ydvaqyqn6vdyfvyminvgi239yvwzg5g9a1xjc475";
           name = "js2-highlight-vars";
         };
@@ -14085,7 +14316,7 @@
           sha256 = "0xj87grvg7pbhh4d239gaqai5gl72klhpp9yksaqn77qnm98q4fn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js2-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js2-mode";
           sha256 = "0f9cj3n55qnlifxwk1yp8n1kfd319jf7qysnkk28xpvglzw24yjv";
           name = "js2-mode";
         };
@@ -14106,7 +14337,7 @@
           sha256 = "08wxsz90x5zhma3q8kqfd01avhzxjmcrjc95s757l5xaynsc2bly";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js2-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js2-refactor";
           sha256 = "09dcfwpxxyw0ffgjjjaaxbsj0x2nwfrmxy1a05h8ba3r3jl4kl1r";
           name = "js2-refactor";
         };
@@ -14127,7 +14358,7 @@
           sha256 = "17d0nf1kz7mgv5qz57q6khy4w5vrmsliqirggahk9s6nnsx1j56n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/js3-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js3-mode";
           sha256 = "12s5qf6zfcv4m5kqxvh9b4zgwf433x39a210d957gjjp5mywbb1r";
           name = "js3-mode";
         };
@@ -14148,7 +14379,7 @@
           sha256 = "0pjmslxwmlb9cb3j5qfsyxq1lg1ywzw1p9dvj330c2m7nla1j70x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jsfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jsfmt";
           sha256 = "1syy32sv2d57b3gja0ly65h36mfnyq6hzf5lnnl3r58yvbdzngqd";
           name = "jsfmt";
         };
@@ -14169,7 +14400,7 @@
           sha256 = "0sxkp9m68rvff8dbr8jlsx85w5ngifn19lwhcydysm7grbwzrdi3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/json-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/json-mode";
           sha256 = "014j10wgxsqy6d6aksnkz2dr5cmpsi8c7v4a825si1vgb4622a70";
           name = "json-mode";
         };
@@ -14190,7 +14421,7 @@
           sha256 = "0qp4n2k6s69jj4gwwimkpadjv245y54wk3bxb1x96f034gkp81vs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/json-reformat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/json-reformat";
           sha256 = "1m5p895w9qdgb8f67xykhzriribgmp20a1lvj64iap4aam6wp8na";
           name = "json-reformat";
         };
@@ -14211,7 +14442,7 @@
           sha256 = "05zsgnk7grgw9jzwl80h5sxfpifxlr37b4mkbvx7mjq4z14xc2jw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/json-snatcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/json-snatcher";
           sha256 = "0f6j9g3c5fz3wlqa88706cbzinrs3dnfpgsr2d3h3117gic4iwp4";
           name = "json-snatcher";
         };
@@ -14232,7 +14463,7 @@
           sha256 = "1wx28rr5dk238yz07xn95v88qmv10c1gz9pcxard2kszpnmrn6dx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jsx-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jsx-mode";
           sha256 = "1lnjnyn8qf3biqr92z443z6b58dly7glksp1g986vgqzdprq3n1b";
           name = "jsx-mode";
         };
@@ -14253,7 +14484,7 @@
           sha256 = "0kvk1qiy2cj0iw2c0mx0dyr3jjvhyj1gwym6l43n7clp5kqcij1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/julia-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/julia-mode";
           sha256 = "0c5bdgh98hw7484s2is84af7hznd8c4z5vlzfd98s8qxi7bldqjm";
           name = "julia-mode";
         };
@@ -14274,7 +14505,7 @@
           sha256 = "1fm69g4mrmdchvxr062bk7n1jvs2rrscddb02cldb5bgdrcw8g6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jump";
           sha256 = "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364";
           name = "jump";
         };
@@ -14295,7 +14526,7 @@
           sha256 = "1s9plmg323m1p625xqnks0yqz0zlsjacdj7pv8f783r0d9jmfq3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jump-to-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jump-to-line";
           sha256 = "09ifhsggl5mrb6l8nqnl38yph0v26v30y98ic8hl23i455hqkkdr";
           name = "jump-to-line";
         };
@@ -14316,7 +14547,7 @@
           sha256 = "1785nsv61m51lpykai2wxrv6zmwbm5654v937fgw177p37054s83";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/jvm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jvm-mode";
           sha256 = "1r283b4s0pzq4hgwcz5cnhlvdvq4gy0x51g3vp0762s8qx969a5w";
           name = "jvm-mode";
         };
@@ -14337,7 +14568,7 @@
           sha256 = "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kaesar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kaesar";
           sha256 = "0zhi1dv1ay1azh7afq4x6bdg91clwpsr13nrzy7539yrn9sglj5l";
           name = "kaesar";
         };
@@ -14358,7 +14589,7 @@
           sha256 = "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kaesar-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kaesar-file";
           sha256 = "0dcizg82maad98mbqqw5lamwz7n2lpai09jsrc66x3wy8k784alc";
           name = "kaesar-file";
         };
@@ -14379,7 +14610,7 @@
           sha256 = "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kaesar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kaesar-mode";
           sha256 = "0yqnlchbpmhsqc8j531n08vybwa32cy0v9sy4f9fgxa90rfqczry";
           name = "kaesar-mode";
         };
@@ -14400,7 +14631,7 @@
           sha256 = "0b6af8hnrn0v4z1xpahjfpw5iga2bmgd3qwfn3is2rygsn5rkm40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kakapo-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kakapo-mode";
           sha256 = "0a99cqflpzasl4wcmmf99aj8xgywkym37j7mvnsajrsk5wawdlss";
           name = "kakapo-mode";
         };
@@ -14421,7 +14652,7 @@
           sha256 = "0avcg307r4navvgj3hjkggk4gr7mzs4mljhxh223r8g69l9bm6m8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/karma";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/karma";
           sha256 = "19wl7js7wmw7jv2q3l4r5zl718lhy2a0jhl79k57ihwhxdc58fwc";
           name = "karma";
         };
@@ -14442,7 +14673,7 @@
           sha256 = "14ijniyvcfmj4y77yhiplsclincng2r3jbdnmmdnwzliv65f7l6q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/key-combo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/key-combo";
           sha256 = "1v8saw92jphvjkyy7j9jx7cxzgisl4zpf4wjzdjfw3la5lz11waf";
           name = "key-combo";
         };
@@ -14463,7 +14694,7 @@
           sha256 = "05vpydcgiaya35b62cdjxna9y02vnwzzg6p8jh0dkr9k44h4iy3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/key-seq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/key-seq";
           sha256 = "166k6hl9vvsnnksvhrv5cbhv9bdiclnbfv7qf67q4c1an9xzqi74";
           name = "key-seq";
         };
@@ -14484,7 +14715,7 @@
           sha256 = "07h6s1wdc83cqf08vqm4gh2r7bihbar4a31wr0140fn4rbhicwdw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keychain-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keychain-environment";
           sha256 = "1w77cg00bwx68h0d6k6r1fzwdwz97q12ch2hmpzjnblqs0i4sv8v";
           name = "keychain-environment";
         };
@@ -14505,7 +14736,7 @@
           sha256 = "0dkc51bmix4b8czs2wg6vz8vk32qlll1b9fjmx6xshrxm85cyhvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keydef";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keydef";
           sha256 = "0yb2vgj7abyg8j7qmv74nsanv50lf350q1m58rjv8wm31yykg992";
           name = "keydef";
         };
@@ -14526,7 +14757,7 @@
           sha256 = "0ways4ksb9pk2kkpgclsxgc0ycfwcr8vghlbv5ic4y0c4ycmlb2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keyfreq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keyfreq";
           sha256 = "1rw6hzmw7h5ngvndy7aa41pq911y2hr9kqc9w4gdd5v2p4ln1qh7";
           name = "keyfreq";
         };
@@ -14547,7 +14778,7 @@
           sha256 = "06ajkqxv71hcrwc707ybzwfw4yzbsp6basnbs493ryr41gnvmnzs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keymap-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keymap-utils";
           sha256 = "0nbcwz4nls0pva79lbx91bpzkl38g98yavwkvg2rxbhn9vjbhzs9";
           name = "keymap-utils";
         };
@@ -14568,7 +14799,7 @@
           sha256 = "0z6sgz8nywsd00zaayafwy5hfi7kzxfifjkfr5cn1l7wlypyksfv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/keyset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keyset";
           sha256 = "1kfw0pfb6qm2ji1v0kb8xgz8q2yd2k9kxmaz5vxcdixdlax3xiqg";
           name = "keyset";
         };
@@ -14589,7 +14820,7 @@
           sha256 = "0ky167xh1hrmqsldybzjhyqjizgjzs1grn5mf8sm2j9qwcvjw2zv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kibit-helper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kibit-helper";
           sha256 = "15viybjqksylvm5ash2kzsil0cpdka56wj1rryixa8y1bwlj8y4s";
           name = "kibit-helper";
         };
@@ -14602,15 +14833,15 @@
     kill-or-bury-alive = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kill-or-bury-alive";
-        version = "0.1.1";
+        version = "0.1.2";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "kill-or-bury-alive";
-          rev = "6e0d1ff08889d9cf3f89e366e327d9de930cf67c";
-          sha256 = "11cqrjxfiflz89gkl9g5m0wx041s28xz879cvhl3i1yjnwyhzqay";
+          rev = "b488c3dbba657bbd524402f48fde16ab6b1211db";
+          sha256 = "1c5al7cyfnb0p5ya2aa5afadzbrrc079jx3r6zpkr64psskrhdv5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kill-or-bury-alive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kill-or-bury-alive";
           sha256 = "0mm0m8hpy5v98cap4f0s38dcviirm7s6ra4l94mknyvnx0f73lz8";
           name = "kill-or-bury-alive";
         };
@@ -14631,7 +14862,7 @@
           sha256 = "0axvhikhg4fikiz4ifg0p4a5ygphbpjs0wd0gcbx29n0y54d1i93";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kill-ring-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kill-ring-search";
           sha256 = "1pg4j1rrji64rrdv2xpwz33vlyk8r0hz4j4fikzwpbcbmni3skan";
           name = "kill-ring-search";
         };
@@ -14652,7 +14883,7 @@
           sha256 = "0imylcaiwpzvvb3g8kpsna1vk7v7bwdjfcsa98i41m1rv9yla86l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/killer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/killer";
           sha256 = "10z4vqwrpss7mk0gq8xdsbsl0qibpp7s1g0l8wlmrsgn6kjkr2ma";
           name = "killer";
         };
@@ -14673,7 +14904,7 @@
           sha256 = "0rzzjzkzgpiadm9awkj7wrh2hg97lhgwxg74gvdis3fc1xg2hyri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kivy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kivy-mode";
           sha256 = "02l230rwivr7rbiqm4vg70458z35f9v9w3mdapcrqd5d07y5mvi1";
           name = "kivy-mode";
         };
@@ -14694,7 +14925,7 @@
           sha256 = "08q43k4450kgygyvqv18gwcmmb7y9x445401048lbixc4cp6p3cg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/know-your-http-well";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/know-your-http-well";
           sha256 = "0k2x0ajxkivim8nfpli716y7f4ssrmvwi56r94y34x4j3ib3px3q";
           name = "know-your-http-well";
         };
@@ -14715,7 +14946,7 @@
           sha256 = "0da4y9pf6vq0i6w7bmvrszg9bji3ylhr44hmyrmxvah28pigb2fz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/kurecolor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kurecolor";
           sha256 = "0q0q0dfv376h7j3sgwxqwfpxy1qjbvb6i5clsxz9xp4ly89w4d4f";
           name = "kurecolor";
         };
@@ -14736,7 +14967,7 @@
           sha256 = "1i8wbhc6i88plpq48ccka0avdj2x5rcxm81j93dmwp70ld0zws8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/langtool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/langtool";
           sha256 = "1xq70jyhzg0qmvialy015crbdk9rdibhwpl36khab9hi2999wxyw";
           name = "langtool";
         };
@@ -14757,7 +14988,7 @@
           sha256 = "1rr6cgx70avqf1b19la7g8cav926676a76cflkkw18c1bsw83ss3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/latex-extra";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/latex-extra";
           sha256 = "1w98ngxymafigjpfalybhs12jcf4916wk4nlxflfjcx8ryd9wjcj";
           name = "latex-extra";
         };
@@ -14778,7 +15009,7 @@
           sha256 = "118xrgrnwsmsysmframf6bmb0gkrdrm3jbkgivzxs41cw92fhbzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/latex-math-preview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/latex-math-preview";
           sha256 = "14bn0q5czrrkb1vjdkwx6f2x4zwjkxgrc0bcncv23l13qls1gkmr";
           name = "latex-math-preview";
         };
@@ -14795,11 +15026,11 @@
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger";
-          rev = "f612ef0b25a6f679fae47f8371bcd4c25a380b02";
-          sha256 = "011a0l2jx4x687s3mqhhyrgpwxqcjv0cn4alhd55caql6z5cwh5h";
+          rev = "9b49ade03a3e5d9089ee031bdf733004cee8a36e";
+          sha256 = "0cp5ywmk48sd7c8s8d5a0sv0ng4fl0hybss2z8fwhw6z47iypzmi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ledger-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ledger-mode";
           sha256 = "0hi9waxmw1bbg88brlr3816vhdi0jj05wcwvrvfc1agvrvzyqq8s";
           name = "ledger-mode";
         };
@@ -14820,7 +15051,7 @@
           sha256 = "04h6vk7w25yp4kzkwqnsmc59bm0182qqkyk5nxm3a1lv1v1590lf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lentic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lentic";
           sha256 = "0y94y1qwj23kqp491b1fzqsrjak96k1dmmzmakbl7q8vc9bncl5m";
           name = "lentic";
         };
@@ -14841,7 +15072,7 @@
           sha256 = "1w6mbk4gc63sh2p9rsy851x2kid0dp2ja4ai5badkr5prxkcpfdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/less-css-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/less-css-mode";
           sha256 = "188iplnwwhawq3dby3388kimy0jh1k9r8v9nxz52hy9rhh9hykf8";
           name = "less-css-mode";
         };
@@ -14862,7 +15093,7 @@
           sha256 = "1l9qjmyb4a3f6i2iimpmjczbx890cd1p24n941s13sg67xfbm7hn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/letcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/letcheck";
           sha256 = "1sjwi1ldg6b1qvj9cvfwxq3qlkfas6pm8zasf43baljmnz38mxh2";
           name = "letcheck";
         };
@@ -14883,7 +15114,7 @@
           sha256 = "1w9n5v4g4w34gii6nk2aan4w230dmm0dhml4s9q1fzmvk1ngld6k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lfe-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lfe-mode";
           sha256 = "06b382ncgk4zz3q8akyzfy55j86a53r97gf0l92qvlca7fbs8jjx";
           name = "lfe-mode";
         };
@@ -14904,7 +15135,7 @@
           sha256 = "0hi8s20vw4a5i5n5jlm5dzgsl1qpfyqbpskqszjls1xrrf3dd4zl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lice";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lice";
           sha256 = "1hv2hz3153x0gk7f2js18dbx5pyprfdf2pfxb658fj16vxpp7y6x";
           name = "lice";
         };
@@ -14925,7 +15156,7 @@
           sha256 = "11sw43z5b0vypmhi0yysf2bxjy8fqpzl61y503jb7nhcfywmfkys";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lingr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lingr";
           sha256 = "1445bxiirsxl9kgm0j86xc9d0pbaa5f07c1i66pw2vl40bvhrjff";
           name = "lingr";
         };
@@ -14946,7 +15177,7 @@
           sha256 = "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/link";
           sha256 = "17jpsg3f2954b740vyj37ikygrg5gmp0bjhbid8bh8vbz7xx9zy8";
           name = "link";
         };
@@ -14967,7 +15198,7 @@
           sha256 = "1v4fadxv7ym6lc09nd2xpz2k5vrikjv7annw99ii5cqrwhqa5838";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/link-hint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/link-hint";
           sha256 = "12fb2zm9jnh92fc2nzmzmwjlhi64rhakwbh9lsydx9svsvkgcs89";
           name = "link-hint";
         };
@@ -14988,7 +15219,7 @@
           sha256 = "1m4g4b96cxs05pfln7kdi6gvrdbv76f8dk806py5lq0gq7da2csc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/linum-relative";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/linum-relative";
           sha256 = "0s1lc3lppazv0481dxknm6qrxhvkv0r9hw8xmdrpjc282l91whkj";
           name = "linum-relative";
         };
@@ -15009,7 +15240,7 @@
           sha256 = "05iqhnhj61f30yk4ih63rimmyp134gyq18frc8qgrnwym64dsm6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lispy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lispy";
           sha256 = "12qk2gpwzz7chfz7x3wds39r4iiipvcw2rjqncir46b6zzlb1q0g";
           name = "lispy";
         };
@@ -15037,7 +15268,7 @@
           sha256 = "0qyj04p63fdh3iasp5cna1z5fhibmfyl9lvwyh22ajzsfbr3nhnk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lispyscript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lispyscript-mode";
           sha256 = "02biai45l5xl2m9l1drphrlj6r01msmadhyg774ijdk1x4gm5nhr";
           name = "lispyscript-mode";
         };
@@ -15058,7 +15289,7 @@
           sha256 = "197cqkiwxgamhfwbc8h492cmjll3fypkwzcphj26dfnr22v63kwq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-packages-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-packages-ext";
           sha256 = "15m4888fm5xv697y7jspghg1ra49fyrny4y2x7h8ivcbslvpglvk";
           name = "list-packages-ext";
         };
@@ -15079,7 +15310,7 @@
           sha256 = "05nn4db8s8h4mn3fxhwsa111ayvlq1raf6bifh7jciyw7a2c3aww";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-unicode-display";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-unicode-display";
           sha256 = "01x9i5k5vhjscmkx0l6r27w1cdp9n6xk1pdjf98z3y88dnsmyfha";
           name = "list-unicode-display";
         };
@@ -15100,7 +15331,7 @@
           sha256 = "0dmcmvf3dxmp1f71nq5xwsdrnyb04qr14ay4ckpaca2bmi7q0x5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/list-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-utils";
           sha256 = "0bknprr4jb1d20i9lj2aa17vpg1kqwdyzzwmy1kfydnkpf5scnr3";
           name = "list-utils";
         };
@@ -15121,7 +15352,7 @@
           sha256 = "0mr0king5dj20vdycpszxnfs9ch808fhcz3q7svxfngj3d3671wd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lit-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lit-mode";
           sha256 = "05rf7ki060nqnvircn0dkpdrg7xbh7phb8bqgsab89ycc7l9vv59";
           name = "lit-mode";
         };
@@ -15142,7 +15373,7 @@
           sha256 = "1fh9wrw5irn0g3dy8gkk63csdcxgi3w2038mxx3sk6ki3r2bmhw8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/literate-coffee-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/literate-coffee-mode";
           sha256 = "1bll1y9q3kcg3v250asjvx2k9kb314qadaq1iwanwgdlp3qvvs40";
           name = "literate-coffee-mode";
         };
@@ -15163,7 +15394,7 @@
           sha256 = "1cwydbhhbs5v9y2s872zxc5lflqmfrdvnc8xz0qars52d7lg4br5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/live-code-talks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/live-code-talks";
           sha256 = "173mjmxanva13vk2f3a06s4dy62x271kynsa7pbhdg4fd72hdjma";
           name = "live-code-talks";
         };
@@ -15184,7 +15415,7 @@
           sha256 = "1y81qqsjj2sa319xkwhvq7bl3f5gma4cs7w8x2w510ms32fgqa8x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/live-py-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/live-py-mode";
           sha256 = "0yn1a0gf9yn068xifpv8p77d917mnalc56pll800zlpsdk8ljicq";
           name = "live-py-mode";
         };
@@ -15205,7 +15436,7 @@
           sha256 = "1089sbx20r30sis39vwy29fxhb2n3hh35rdv09lpzdxdq01s8wwp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/loc-changes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/loc-changes";
           sha256 = "1akgij61b2ixpkchrriabwvx68cg4v5r5w9ncjrjh91hskjprfxh";
           name = "loc-changes";
         };
@@ -15226,7 +15457,7 @@
           sha256 = "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/log4e";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/log4e";
           sha256 = "1klj59dv8k4r0hily489dp12ra5hq1jnsdc0wcakh6zirmakhs34";
           name = "log4e";
         };
@@ -15268,7 +15499,7 @@
           sha256 = "0g5vq9xy9lwczs77lr91c1srhhfmasnnnmjvgc55hbl6iwmbizbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/logalimacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/logalimacs";
           sha256 = "0ai7a01bdi3a0amgi63pwgdp8wgcgx10an4nhc627wgb1cqxb7p6";
           name = "logalimacs";
         };
@@ -15289,7 +15520,7 @@
           sha256 = "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/logito";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/logito";
           sha256 = "0bk4qnz66kvhzsk88lw45209778y53kg17iih70ix4ma1x6a3v5l";
           name = "logito";
         };
@@ -15310,7 +15541,7 @@
           sha256 = "1yacic778ranlqblrcdhyf5igbrcin8aj30vjdm4klpmqb73hf1s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/logview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/logview";
           sha256 = "0gks3j5avx8k3427a36lv7gr95id3cylaamgn5qwbg14s54y0vsh";
           name = "logview";
         };
@@ -15331,7 +15562,7 @@
           sha256 = "1rpvw0dvym559vb4nrfy74jq06nbsz2b0n60lcykagcir8mpcidk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/loop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/loop";
           sha256 = "0pav16kinzljmzx84vfz63fvi39af4628vk1jw79jk0pyg9rjbar";
           name = "loop";
         };
@@ -15352,7 +15583,7 @@
           sha256 = "11y5jyq4xg9zlm1qi2y97nh05vhva9pai9yyr4x2pr41xz3s8fpk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/love-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/love-minor-mode";
           sha256 = "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m";
           name = "love-minor-mode";
         };
@@ -15373,7 +15604,7 @@
           sha256 = "1psk4202rmkkfy1ir1ax4x4djfngd5pfry7x30ybq2ifqzymb9qb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/lua-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lua-mode";
           sha256 = "0gyi7w2h192h3pmrhq39lxwlwd9qyqs303lnp2655pikdzk9js94";
           name = "lua-mode";
         };
@@ -15394,7 +15625,7 @@
           sha256 = "01847f8xmjfxvvi7hf73l7ypkdazwg8ciinm117zp4jkgnv0apz0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/m-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/m-buffer";
           sha256 = "0l2rayglv48pcwnr1ggmn8c0az0mffgv02ivnzr9jcfs55ki07fc";
           name = "m-buffer";
         };
@@ -15415,7 +15646,7 @@
           sha256 = "0dgsl1x6r8m9vvff1ia0kmz21h0dji2jl5cqlpx1m947zh45dahj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/macro-math";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/macro-math";
           sha256 = "1r7splwq5kdrdhbmw5zn81vxymsrllgil48g8dl0r60293384h00";
           name = "macro-math";
         };
@@ -15436,7 +15667,7 @@
           sha256 = "0dkigxa39f3cmndxw79mgadwsj7w3bphns6l2hzhv6w0wdllpifp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/macrostep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/macrostep";
           sha256 = "1wjibxbdsp5qfhq8xy0mcf3ms0q74qhdrhqndprn6jh3kcn5q63c";
           name = "macrostep";
         };
@@ -15449,15 +15680,15 @@
     magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "magic-filetype";
-        version = "0.1.1";
+        version = "0.1.2";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "magic-filetype.el";
-          rev = "1a3e425ab5b7b6614b7ece5885d23f12f45572f0";
-          sha256 = "128dqgh7kvjywiq0wq6ipnr1l1v2dzrz5j0rd3n2783r9nz0i7r5";
+          rev = "db734bdd7aa429e188a628e772c40542b0216d5c";
+          sha256 = "0i38942lr4b7d624313hgydyy0ynmd6psjkz8xcvbb7gw0kcc436";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magic-filetype";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magic-filetype";
           sha256 = "0gcys45cqn5ghppkn0rmyvfybprlfz1x6hqr21yv93mf79h75zhg";
           name = "magic-filetype";
         };
@@ -15470,16 +15701,16 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "2.4.0";
+        version = "2.5.0";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "2e757a8c919b53edddb186e36e055e011e3b0ab3";
-          sha256 = "0hklwwzi2gqywysxn16ps1fvn48max52cpk2nx7r4df4h52yk6wn";
+          rev = "a3747edc8a4cddc408f7718a3371b46a4b610744";
+          sha256 = "0dydm0gj6jbybi5nkqrpi5bic5yxhz0p5k5gayqzqzmnb1fhl247";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit";
-          sha256 = "099i9h375yfhcylz8mvsm45mkkiyyhx0s1q3icba5n875jvq7smz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit";
+          sha256 = "0518ax2y7y2ji4jp7yghy84yxm0zgb059aqfa4v17grm4kr8p16q";
           name = "magit";
         };
         packageRequires = [
@@ -15506,7 +15737,7 @@
           sha256 = "0d7dick96g1vj6c9wh10rgwhwv5j3ixgw1m3z45szszswlrp1bih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-annex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-annex";
           sha256 = "1ri58s1ly416ksmb7mql6vnmx7hq59lmhi7qijknjarw7qs3bqys";
           name = "magit-annex";
         };
@@ -15527,7 +15758,7 @@
           sha256 = "1vn6x53kpwv3zf2b5xjswyz6v853r8b9dg88qhwd2h480hrx6kal";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-filenotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-filenotify";
           sha256 = "00a77czdi24n3zkx6jwaj2asablzpxq16iqd8s84kkqxcfiiahn7";
           name = "magit-filenotify";
         };
@@ -15548,7 +15779,7 @@
           sha256 = "1jlww053s580d7rlvmr1dl79wxasa0hhh2jnwb1ra353d6h3a73w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-find-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-find-file";
           sha256 = "1d5flydyhwhvhlhi541zcnz2b03bi07zrp21bfz5sm069bf2c96b";
           name = "magit-find-file";
         };
@@ -15569,7 +15800,7 @@
           sha256 = "0ym24gjd6c04zry08abcb09zvjbgj8nc1j12q0r51fhzzadxcxbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-gerrit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-gerrit";
           sha256 = "1iwvg10ly6dlf8llz9f8d4qfdbvd3s28wf48qgn1wjlxpka6zrd4";
           name = "magit-gerrit";
         };
@@ -15590,7 +15821,7 @@
           sha256 = "19iqa2kzarpa75xy34hqvpy1y7dzx84pj540wwkj04dnpb4fwj2z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-gh-pulls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-gh-pulls";
           sha256 = "0qn9vjxi33pya9s8v3g95scmhwrn2yf5pjm7d24frq766wigjv8d";
           name = "magit-gh-pulls";
         };
@@ -15611,7 +15842,7 @@
           sha256 = "00711dgbzmplqrfww8xf261ymz3jmhisnv9x1rhcw0ywmlfkbckz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-gitflow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-gitflow";
           sha256 = "0wsqq3xpqqfak4aqwsh5sxjb1m62z3z0ysgdmnrch3qsh480r8vf";
           name = "magit-gitflow";
         };
@@ -15624,15 +15855,15 @@
     magit-popup = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magit-popup";
-        version = "2.4.0";
+        version = "2.5.0";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "2e757a8c919b53edddb186e36e055e011e3b0ab3";
-          sha256 = "0hklwwzi2gqywysxn16ps1fvn48max52cpk2nx7r4df4h52yk6wn";
+          rev = "a3747edc8a4cddc408f7718a3371b46a4b610744";
+          sha256 = "0dydm0gj6jbybi5nkqrpi5bic5yxhz0p5k5gayqzqzmnb1fhl247";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-popup";
           sha256 = "0w6m384bbmp3bd4qbss5h1jvcfp4qnpqvzlfykhdgjwpv2b2a2fj";
           name = "magit-popup";
         };
@@ -15653,7 +15884,7 @@
           sha256 = "1pqbrrp4366kwfk1d32h2lb70id32ynfc03i7m2832w97f1xp16c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-rockstar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-rockstar";
           sha256 = "1i4fmraiypyd3q6vvibkg9xqfxiq83kcz64b1dr3wmwn30j7986n";
           name = "magit-rockstar";
         };
@@ -15674,7 +15905,7 @@
           sha256 = "1mk8g8rr9vf8jm0mmsj33p8gc71nhlv3847hvqywy6z40nhcjnyb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-stgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-stgit";
           sha256 = "12wg1ig2jzy2np76brpwxdix9pwv75chviq3c24qyv4y80pd11sv";
           name = "magit-stgit";
         };
@@ -15695,7 +15926,7 @@
           sha256 = "1g8zq0s38di96wlhljp370kyj4a0ir1z3vb94k66v2m5nj83ap68";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-svn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-svn";
           sha256 = "02n732z06f0bhxqkxzlvm36bpqr40pas09zbzpfdk4pb6f9f80s0";
           name = "magit-svn";
         };
@@ -15716,7 +15947,7 @@
           sha256 = "0dj183vphnvz9k2amga0ydcb4gkjxr28qz67055mxrf89q1qjq33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/magit-topgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-topgit";
           sha256 = "1ngrgf40n1g6ncd5nqgr0zgxwlkmv9k4fik96dgzysgwincx683i";
           name = "magit-topgit";
         };
@@ -15737,7 +15968,7 @@
           sha256 = "0fp5gbin1sgsdz39spk74vadkzig3ydwhpzx9vg7f231kk5f6wzx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/make-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/make-color";
           sha256 = "0mrv8b67lpid5m8rfbhcik76bvnjlw4xmcrd2c2iinyl02y07r5k";
           name = "make-color";
         };
@@ -15758,7 +15989,7 @@
           sha256 = "1rr7vpm3xxzcaam3m8xni3ajy8ycyljix07n2jzczayri9sd8csy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/makey";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/makey";
           sha256 = "06xgrlkqvg288yd4lyhx4vi80jlfarhblxk5m5zzs5as7n08cvk4";
           name = "makey";
         };
@@ -15779,7 +16010,7 @@
           sha256 = "0z0ml7l1a45ych61qfc5fvkybl9hh37pgl6lzkaz6mcif1sl8gn1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/malabar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/malabar-mode";
           sha256 = "026ing7v22rz1pfzs2j9z09pm6dajpys992n45gzhwirz5f0q1rk";
           name = "malabar-mode";
         };
@@ -15800,7 +16031,7 @@
           sha256 = "0hwxwwjzjxv2mmkxmalr2hp3x8apwcyvn2bz4d4yd4wrzcscay97";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/malinka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/malinka";
           sha256 = "1245mpxsxwnnpdsf0pd28mddgdfhh7x32a2l3sxfq0dyg2xlgvrp";
           name = "malinka";
         };
@@ -15821,7 +16052,7 @@
           sha256 = "1272fsjzsza9dxm8s64b7x2jzr3ks8wjpwvgcxha2dnsjzklcdcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mallard-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mallard-mode";
           sha256 = "0y2ikjgy107kb85pz50vv7ywslqgbrrkcfsrd8gsk1jky4qn8izd";
           name = "mallard-mode";
         };
@@ -15842,7 +16073,7 @@
           sha256 = "1fkijm0gikbwmxa9hf7s1rcwb0ipzjygd1mlicsm78rxvdd8k877";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/map-progress";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/map-progress";
           sha256 = "0zc5vii72gbfwbb35w8m30c8r9zck971hwgcn1a4wjczgn4vkln7";
           name = "map-progress";
         };
@@ -15863,7 +16094,7 @@
           sha256 = "0kk1sk3cr4dbmgq4wzml8kdf14dn9jbyq4bwmvk0i7dic9vwn21c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/map-regexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/map-regexp";
           sha256 = "0yiif0033lhaqggywzfizfia3siggwcz7yv4z7przhnr04akdmbj";
           name = "map-regexp";
         };
@@ -15884,7 +16115,7 @@
           sha256 = "0y4b69r2l6kvh7g8f1y9v1pdall3n668ci24lp04lcms6rxcrsnh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/marcopolo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/marcopolo";
           sha256 = "1nbck1m7lhync7n474578d2g1zc72c841hi236xjbdd2lnxz3zz0";
           name = "marcopolo";
         };
@@ -15905,7 +16136,7 @@
           sha256 = "0fcyspz7n97n84d9203mxgn8ar4rn52qa49s3vayfrbkn038j5qw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mark-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mark-tools";
           sha256 = "1688y7lnzhwdva2ildjabzi10i87klfsgvs947i7gfgxl7jwhisq";
           name = "mark-tools";
         };
@@ -15925,7 +16156,7 @@
           sha256 = "8091933b49e8dfe57aa10377bd434b7c9b5807e9b78aa7a301885a44db1f7481";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-mode";
           sha256 = "02lmhihv495drv9cb40h6l0xsbx7yglbvsdzc4r0vf78j87rs33f";
           name = "markdown-mode";
         };
@@ -15946,7 +16177,7 @@
           sha256 = "1adl36fj506kgfw40gpagzsd7aypfdvy60141raggd5844i6y96r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-mode+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-mode+";
           sha256 = "1535kcj9nmcgmk2448jxc0jmnqy7f50cw2ngffjq5w8bfhgf7q00";
           name = "markdown-mode-plus";
         };
@@ -15967,7 +16198,7 @@
           sha256 = "10h5zh03c3v0c6pqcxvlns6l70k2l916nqvza53ikjpldmc4mln2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-preview-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-preview-mode";
           sha256 = "0i0mld45d8y96nkqn2r77nvbyw6wgsf8r54d3c2jrv04mnaxs7pg";
           name = "markdown-preview-mode";
         };
@@ -15988,7 +16219,7 @@
           sha256 = "0jgr327qlh7acwi6sld27xdsvr89parspk6wmfklwszvy1v13633";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markdown-toc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-toc";
           sha256 = "0slky735yzmbfi4ld264vw64b4a4nllhywp19ya0sljbsfycbihv";
           name = "markdown-toc";
         };
@@ -16009,7 +16240,7 @@
           sha256 = "0nk2rm14ccwrh1aaxzm80rllsz8g38h9w52m0pf3nnwh6sa757nk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/markup-faces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markup-faces";
           sha256 = "12z92j9f0mpn7w2qkiwg54wh743q3inx56q3f8qcpfzyks546grq";
           name = "markup-faces";
         };
@@ -16030,7 +16261,7 @@
           sha256 = "0pbli67wia8pximvgd68x6i9acdgsk51g9hjpqfm49rqg5nqalh9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/marmalade";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/marmalade";
           sha256 = "0ppa2s1fma1lc01byanfxpxfrjqk2snxbsmdbkcipjdi5dpb0a9s";
           name = "marmalade";
         };
@@ -16051,7 +16282,7 @@
           sha256 = "0sriyjjhgis7fgq276j5mw6n84jdwxf8lq0iqqiaqwmc66l985mv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/marshal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/marshal";
           sha256 = "17ikd8f1k42f28d4v5dn83zb44bsx7g336db60q068w6z8d4jbgl";
           name = "marshal";
         };
@@ -16064,14 +16295,14 @@
     matrix-client = callPackage ({ fetchgit, fetchurl, json ? null, lib, melpaBuild, request }:
     melpaBuild {
         pname = "matrix-client";
-        version = "0.2.0";
+        version = "0.3.0";
         src = fetchgit {
           url = "git://fort.kickass.systems/personal/rrix/pub/matrix.el";
-          rev = "de09c69d2d5ca604839239fe49b10a2ed5ac2809";
-          sha256 = "0516772e4aae604359bee659d101fb62b73cc9016cbbe0b749c77402954ec341";
+          rev = "421ad8ebf3858acc99634a4cca442c57ca2b3707";
+          sha256 = "34e1f7bd0c4ab21b2b0ca6d2a6ba83c9a1a5591e9de9ceb1c5f8fe06a4738acb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/matrix-client";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/matrix-client";
           sha256 = "09mgxk0xngw8j46vz6f5nwkb01iq96bf9m51w2q61wxivypnsyr6";
           name = "matrix-client";
         };
@@ -16092,7 +16323,7 @@
           sha256 = "0x92b1qrhyrdh0z0xriyjc12h0wpk16x4yawj5i828ca6mz0qh5g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/maven-test-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/maven-test-mode";
           sha256 = "1k9w51rh003p67yalzq1w8am40nnr2khyyb5y4bwxgpms8z391fm";
           name = "maven-test-mode";
         };
@@ -16113,7 +16344,7 @@
           sha256 = "08gbkd8wln89j9yxp0zzd539hbwy1db31gca3vxxrpszixx8280y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/maxframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/maxframe";
           sha256 = "10cwy3gi3xb3pfdh6xiafxp3vvssawci3y26jda6550d0w5vardj";
           name = "maxframe";
         };
@@ -16134,7 +16365,7 @@
           sha256 = "1si2givpzihjb1szbcdm3iy9kkm7bj0hq10s0h2dfm8axdnlirm5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mb-url";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mb-url";
           sha256 = "1nf8ssan00qsn3d4dc6h6qzdwqzh977qb5d2m33kiwi6qb98988h";
           name = "mb-url";
         };
@@ -16155,7 +16386,7 @@
           sha256 = "00gwd2jf5ncgyay5w2jc2mhv18jf4ydnzpfkxaxw9zjbdxg4ym2i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mbe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mbe";
           sha256 = "0h18mbcjy8nh4gl12kg2v8x6ps320yk7sbgq5alqnx2shp80kri3";
           name = "mbe";
         };
@@ -16176,7 +16407,7 @@
           sha256 = "0252wdq4sd6jhzfy0pn3gdm6aq2h13nnp8hvrn1mpml9x473a5n1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mc-extras";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mc-extras";
           sha256 = "0b110x6ygc95v5pb9lk1i731x5s6dagl5afzv37l1qchys36xrym";
           name = "mc-extras";
         };
@@ -16197,7 +16428,7 @@
           sha256 = "1vsla0a5x4kfyj3ca4r1v8cspp12dadi0frpailclaxfmpmpl5d3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mediawiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mediawiki";
           sha256 = "17cbrzfdp6jbbf74mn2fi1cwv7d1hvdbw9j84p43jzscnaa5ikx6";
           name = "mediawiki";
         };
@@ -16218,7 +16449,7 @@
           sha256 = "12cp56ppmwpdgf5afx7hd2qb8d1qq8z27191fbbf5zqw8cq5zkpd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/melpa-upstream-visit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/melpa-upstream-visit";
           sha256 = "0j4afy9ipzr7pwkij8ab207mabd7srganlyyif9h1hvclj9svdmf";
           name = "melpa-upstream-visit";
         };
@@ -16239,7 +16470,7 @@
           sha256 = "1y4ra5z3ayw3w7dszzlkk3qz3nv2jg1vvx8cf0y5j1pqpx8vy3jf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mentor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mentor";
           sha256 = "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s";
           name = "mentor";
         };
@@ -16260,7 +16491,7 @@
           sha256 = "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/merlin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/merlin";
           sha256 = "0wnh7512sknagdk56j6gd8vamh9ns3vnggm56s73pik0m009w0xr";
           name = "merlin";
         };
@@ -16270,6 +16501,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    metafmt = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "metafmt";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "lvillani";
+          repo = "metafmt";
+          rev = "19dc36b3d085bba6f8e59ddbb1cbb7e2c085c461";
+          sha256 = "0zxal6alf99a2zfzizckibp5iwdk9kklfhml2r0r3wfvswb0rb3z";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/metafmt";
+          sha256 = "0vx1xrjr10nd90cr6ppgd3kc3c8bhkg3m4clnb50zagkpfqsy9ma";
+          name = "metafmt";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/metafmt";
+          license = lib.licenses.free;
+        };
+      }) {};
     metaweblog = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xml-rpc }:
     melpaBuild {
         pname = "metaweblog";
@@ -16281,7 +16533,7 @@
           sha256 = "06mbdb4zb07skq1jpv05hr45k5x96d9hgkb358jiq0kfsqlrbbb4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/metaweblog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/metaweblog";
           sha256 = "11y5x3a8iv0hjj7ppi2sa7vawn7r475qfsh1jg415j4y4fzwpk6y";
           name = "metaweblog";
         };
@@ -16302,7 +16554,7 @@
           sha256 = "1dhws4a298zrm88cdn66sikdk06n0p60d32cxsgybakkhg5c5wgr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mew";
           sha256 = "0423xxn3cw6jmsd7vrw30hx9phga5chxzi6x7cvpswg1mhcyn9fk";
           name = "mew";
         };
@@ -16323,7 +16575,7 @@
           sha256 = "1bp4xqklf422n0zwwyj0ag3a4nndg8klazrga6rlvpy01hgg3drl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mhc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mhc";
           sha256 = "02ikn9hx0kcfc2xrx4f38zpkfi6vgz7chcxk6q5d0vcsp93b4lql";
           name = "mhc";
         };
@@ -16344,7 +16596,7 @@
           sha256 = "1ckb5hymwj4wmsxakalsky4mkzn9vxhxr6416b2cr6r5jxj4xgsl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/migemo";
           sha256 = "0y49imdwygv5zd7cyh9ngda4gyb2mld2a4s7zh4yzlh7z5ha9qkr";
           name = "migemo";
         };
@@ -16365,7 +16617,7 @@
           sha256 = "1qg64mxsm2cswk52mlj7sx7k6gfnrsdwnf68i7cachri0i8aq4ap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/milkode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/milkode";
           sha256 = "07v6xgalx7vcw5sghckwvz584746cba05ql8flv8n556glm7hibh";
           name = "milkode";
         };
@@ -16386,7 +16638,7 @@
           sha256 = "1zyb6c3xwdzk7dpn7xi0mvbcjdfxvzz1a0zlbs053pfar8iim5fk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minibuffer-complete-cycle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minibuffer-complete-cycle";
           sha256 = "0y1mxs6q9a8lzprrlb22qff6x5mvkw4gp2l6p2js2r0j9jzyffq2";
           name = "minibuffer-complete-cycle";
         };
@@ -16407,7 +16659,7 @@
           sha256 = "07nbn2pwlp33kr136xsm6lzddhjs538xkz0fbays89psblmy4kwj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minibuffer-cua";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minibuffer-cua";
           sha256 = "1ragvr73ykbvpgynnq3z0z4yzrlfhfqlwc1vbxclb8x2xmxq7pzw";
           name = "minibuffer-cua";
         };
@@ -16428,7 +16680,7 @@
           sha256 = "1850z96gly0jnr50472idqz1drzqarr0n23bbasslrc501xkg0bq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/miniedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/miniedit";
           sha256 = "10s407q7igdi2hsaaahbw8vckalrl7z3s6l9cflf51q16xh2ih87";
           name = "miniedit";
         };
@@ -16449,7 +16701,7 @@
           sha256 = "0kjhn48sf2ps3k5pv06gqmqc4hlk6di9ld3ssw6vwfh8313x1fc5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minimal-session-saver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minimal-session-saver";
           sha256 = "1ay7wvriga28bdmarpfwagqzmmk93ri9f3idhr6z6iivwggwyy2i";
           name = "minimal-session-saver";
         };
@@ -16470,7 +16722,7 @@
           sha256 = "0nd0jl5r5drnh98wdpqj2i7pgs7zvcizsh4qbvh8n0iw0c3f0pwh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/minitest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minitest";
           sha256 = "0x6nd4kkhiw8hh79r69861pf41j8p1y39kzf2rl61zlmyjz9zpmw";
           name = "minitest";
         };
@@ -16490,7 +16742,7 @@
           sha256 = "0rpp748ym79sxccp9pyrwri14m7624zzb80srfgjfdpysrrs0jrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mmm-mako";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mmm-mako";
           sha256 = "0a4af5q9wxafrid8visp30cz6073ig0c961b78vmmgqrwvvxd3kn";
           name = "mmm-mako";
         };
@@ -16511,7 +16763,7 @@
           sha256 = "097s4xnwfy8d1wzmz65g2f8bnjjjlj67w1yzwn4d3yasb171nbv8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mmm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mmm-mode";
           sha256 = "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw";
           name = "mmm-mode";
         };
@@ -16532,7 +16784,7 @@
           sha256 = "05nmcx3f63ds31cj3qwwp03ksflkfwlcn3z2xyxbny83r0dxbgvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mmt";
           sha256 = "0hal3qcw6x9658xpdaw6q9l2rr2z107pvg5bdzshf67p1b3lf9dq";
           name = "mmt";
         };
@@ -16542,6 +16794,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    mocha = callPackage ({ fetchFromGitHub, fetchurl, js2-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "mocha";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "scottaj";
+          repo = "mocha.el";
+          rev = "ea042751717b920a61770b6a945999431badbc39";
+          sha256 = "1v915yy920yrwrrnw9bxggm1zvlm9ndjwv9ydln3r07b0a1mkka2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mocha";
+          sha256 = "0kjgrl5iy7cd3b9csgpjg3y0wp0q6c7c8cvf0mx8gdbsj7296kyx";
+          name = "mocha";
+        };
+        packageRequires = [ js2-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/mocha";
+          license = lib.licenses.free;
+        };
+      }) {};
     mocker = callPackage ({ eieio ? null, el-x, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mocker";
@@ -16553,7 +16826,7 @@
           sha256 = "1lav7am41v63xgavq8pr88y828jmd1cxd4prjq7jlbxm6nvrwxh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mocker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mocker";
           sha256 = "1g90jp1czrrzrmn7n4linby3q4fb4gcflzv2amjv0sdimw1ln1w3";
           name = "mocker";
         };
@@ -16566,15 +16839,15 @@
     modalka = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "modalka";
-        version = "0.1.1";
+        version = "0.1.2";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "modalka";
-          rev = "f8ee86264a8e961b5821e11fdd490d5c4fc489c3";
-          sha256 = "1pgr1zlp26c7xy77qfvjfmv5i2j1c45xp59x83k8nllyhckxyqn6";
+          rev = "5a1e914bb76dfde539df26f3108793bba98bd4f9";
+          sha256 = "0r24186d1q9436h3qhqz1z8q978d01an0dvpvzirf4x9ickrib3k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/modalka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/modalka";
           sha256 = "0bkjykvl6sw797h7j76dzn1viy598asly98gcl5wrq13n4w1md4c";
           name = "modalka";
         };
@@ -16594,7 +16867,7 @@
           sha256 = "b7afff1d8fb0b3f044d266af479df51fbb6021ff433628a9dc669695c1ddae40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mode-icons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mode-icons";
           sha256 = "18w221zjrrsfcymprv5x75i3qv04zy4bxl9mqjv0ys7qcc8xf1dp";
           name = "mode-icons";
         };
@@ -16615,7 +16888,7 @@
           sha256 = "1lkw9nnlns6v7r6nx915f85whq1ri4w8lccwyxrvam40hfvq60s1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mode-line-debug";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mode-line-debug";
           sha256 = "0ppj14bm3rx3xgg4mfxa5zcm2r129jgmsx817wq3h7akjngcbfkd";
           name = "mode-line-debug";
         };
@@ -16636,7 +16909,7 @@
           sha256 = "02w7k4s4698p4adjy4a36na28sb1s2zw4xsjs7p2hv9iiw9kmyvz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/monokai-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/monokai-theme";
           sha256 = "13mv4vgsmdbf3v748lqi7b42hvr3yp86n97rb6792bcgd3kbdx7a";
           name = "monokai-theme";
         };
@@ -16657,7 +16930,7 @@
           sha256 = "1a0pv8fkv1cjdb0k5bmjd67a273bzcmxjwzgy4jpb3ng1qbb2xnm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/monroe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/monroe";
           sha256 = "04rhninxppvilk7s90g0wwa0g9vfcg7mk8mrb2m2c7cb9vj6wyig";
           name = "monroe";
         };
@@ -16678,7 +16951,7 @@
           sha256 = "1ndgw4799d816pkn2bwja5kmigydpmj9znn8cax4dxsd9fg2hzjy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/morlock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/morlock";
           sha256 = "0693jr1k8mzd7hwp52azkl62c1g1p5yinarjcmdksfyqblqq5jna";
           name = "morlock";
         };
@@ -16699,7 +16972,7 @@
           sha256 = "01mdy7sps0xryz5gfpl083rv7ixkxs2rkz5yaqjlam2rypdcsyy2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/move-dup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/move-dup";
           sha256 = "0b0lmiisl9yckblwf7619if88qsmbka3bl4qiaqam7fka7psxs7f";
           name = "move-dup";
         };
@@ -16720,7 +16993,7 @@
           sha256 = "1mg7arw4wbbm84frq3sws5937fh901qn0xnjk9jcp3pvc4d0sxwd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mowedline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mowedline";
           sha256 = "0c2hvvwa7s5iyz517jaskshdcq9zs15zr6xsvrcb3biahrh4bmfb";
           name = "mowedline";
         };
@@ -16741,7 +17014,7 @@
           sha256 = "13bf5jn1kgqg59j5czlzvajq2fw1rz4h5jqfc7x8w1a067nymf2c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/moz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/moz";
           sha256 = "0ar2xgsi7csjj6fgiamrjwjc58j942dm32j3f3lz21yn2c4pnyxi";
           name = "moz";
         };
@@ -16762,7 +17035,7 @@
           sha256 = "1w1i1clkjg9mj1g4i2y3xw3hyj8s7h9gr04qgyb9c1q8vh11z8d0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/moz-controller";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/moz-controller";
           sha256 = "18gca1csl9dfi9995mky8cbgi3xzf1if8pzdjiz5404gzcqk0rfd";
           name = "moz-controller";
         };
@@ -16783,7 +17056,7 @@
           sha256 = "1pjhch8vah0kf73fl2fk6khhrx1kflggd3zlxrf7w4fxr0qn8la3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mpv";
           sha256 = "1vq308ac6jj1h8qa2b2sypisb38hbvwjimqndhpfir06fghkw94l";
           name = "mpv";
         };
@@ -16804,7 +17077,7 @@
           sha256 = "1draiwbwb8zfi6rdr5irv8091xv2pmnifq7pzi3rrvjb8swb28z3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/msvc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/msvc";
           sha256 = "04gq2klana557qvsi3bv6416l0319jsqb6bdfs7y6729qd94hlq3";
           name = "msvc";
         };
@@ -16825,7 +17098,7 @@
           sha256 = "0wrg6f7czn61f9wmrk27dzcdskznm5i1pwwjck5h768j0y9dfv6a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mu4e-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mu4e-alert";
           sha256 = "15nwj09iyrvjsc9lrxla6qa0s8izcllxghw5gx3ffncfcrx2l8qm";
           name = "mu4e-alert";
         };
@@ -16846,7 +17119,7 @@
           sha256 = "1lyd8pcawn106zwlbq6gdq05i2zhry1qh9cdyjiw61nvgbbfi0yx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mu4e-maildirs-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mu4e-maildirs-extension";
           sha256 = "1xz19dxrj1grnl7wy9qglh08xb3dr509232l3xizpkxgqqk8pwbi";
           name = "mu4e-maildirs-extension";
         };
@@ -16867,7 +17140,7 @@
           sha256 = "11zabs7qpdhri6n90ck7pgwcbz46d813nyl73h5m1i8jvz1wzx7v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi";
           sha256 = "1c240d1c1g8wb2ld944344zklnv86d9rycmya4z53b2ai10642ig";
           name = "multi";
         };
@@ -16888,7 +17161,7 @@
           sha256 = "1d9y3dw27pgzgv6wk575d5ign55xdqgbl3ycyq1z7sji1477lz6b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multi-web-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi-web-mode";
           sha256 = "0vi4yvahr10aqpcz4127c8pcqpr5srwc1yhgipnbnm86qnh34ql5";
           name = "multi-web-mode";
         };
@@ -16909,7 +17182,7 @@
           sha256 = "10k4c9vl0bfidrry0msyqamijizjghg54g26yaqbr2vi0mbbz22k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/multiple-cursors";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multiple-cursors";
           sha256 = "0mky5p9wpd3270wr5vfna8rkk2ff81wk7vicyxli39195m0qgg0x";
           name = "multiple-cursors";
         };
@@ -16930,7 +17203,7 @@
           sha256 = "15gw4d0hp15rglsj8hzd290li4p0kadj2dsz0dgfcxld7hnimihk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mustache-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mustache-mode";
           sha256 = "076ar57qhwcpl4n634ma827r2rh61670778wqr5za2444a6ax1gs";
           name = "mustache-mode";
         };
@@ -16951,7 +17224,7 @@
           sha256 = "0hvq6z754niqjyv79jzb833wrwbspc7npfg85scwdv8vzwassjx4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mwim";
           sha256 = "0bsibwplvyv96y5i5svm2b0jwzs5a7jr2aara7v7xnpj0nqaxm8k";
           name = "mwim";
         };
@@ -16972,7 +17245,7 @@
           sha256 = "0550k0rfm0zai306642v689mcpsw9pbd5vs0il82cihwvrxjifc5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/mykie";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mykie";
           sha256 = "12ram39fp3m9ar6q184rsnpkxb14y0ajibng7ia2ck54ck7n36cj";
           name = "mykie";
         };
@@ -16993,7 +17266,7 @@
           sha256 = "0amhw630hgc0j8wr8m6aav399ixi3vbwrck79hhlr3pmyh91vv7n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/name-this-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/name-this-color";
           sha256 = "12nrk1ww766jb4gb4iz6w485nimh2iv8wni2jq4l38v8ndh490zb";
           name = "name-this-color";
         };
@@ -17014,7 +17287,7 @@
           sha256 = "0m82g27gwf9mvicivmcilqghz5b24ijmnw0jf0wl2skfbbg0sydh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/names";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/names";
           sha256 = "1q784606jlakw1z6sx2g2x8hz8c8arywrm2r626wj0v105v510vg";
           name = "names";
         };
@@ -17035,7 +17308,7 @@
           sha256 = "10yn215xb4s6kshk108y75im1xbdp0vwc9kah5bbaflp9234i0zh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/narrow-reindent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/narrow-reindent";
           sha256 = "0fybal70kk62zlra63x4jb72694m0mzv4cx746prx9anvq1ss2i0";
           name = "narrow-reindent";
         };
@@ -17056,7 +17329,7 @@
           sha256 = "0ydxj6dc10knambma2hpimqrhfz216nbj96w1dcwgjixs4cd4nax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/narrowed-page-navigation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/narrowed-page-navigation";
           sha256 = "1yrmih60dd69qnin505jlmfidm2svzpdrz46286r7nm6pk7s4pb7";
           name = "narrowed-page-navigation";
         };
@@ -17077,7 +17350,7 @@
           sha256 = "1l7asqwi5gcvb2mn8608025lwypf2vqzrkc3a9phdfjp0qn2apdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nasm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nasm-mode";
           sha256 = "1626yf9mmqlsw8w01vzqsyb5ipa56259d4kl6w871k7rvhxwff17";
           name = "nasm-mode";
         };
@@ -17098,7 +17371,7 @@
           sha256 = "119hy8rs83f17d6zizdaxn2ck3sylxbyz7adszbznjc8zrbaw0ic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nav-flash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nav-flash";
           sha256 = "0936kr0s6zxxmjwaqm7ywdw2im4dxai1xb7j6xa2gp7c70qvvsx3";
           name = "nav-flash";
         };
@@ -17119,7 +17392,7 @@
           sha256 = "15jh1lsgqfnpbmrikm8kdh5bj60yb96f2as2anppjjsgl6w96glh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/navi-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/navi-mode";
           sha256 = "0f5db983w9kxq8mcjr22zfrm7cpxydml4viac62lvab2kwbpbrmi";
           name = "navi-mode";
         };
@@ -17140,7 +17413,7 @@
           sha256 = "09cb07f98aclgq8jf5419305zydkk1hz4nvzrwqz7syrlpvx8xi5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/navorski";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/navorski";
           sha256 = "0dnzpsm0ya8rbcik5wp378hc9k7gjb3gwmkqqj889c38q5cdwsx7";
           name = "navorski";
         };
@@ -17161,7 +17434,7 @@
           sha256 = "16i1k1zr6ng1dlxb1b73mxjf25f4kvf3x5vfffsi3qnfm960bg3q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ncl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ncl-mode";
           sha256 = "0hmd606xgapzbc79px9l1q6pphrhdzip495yprvg20xsdpmjlfw9";
           name = "ncl-mode";
         };
@@ -17182,7 +17455,7 @@
           sha256 = "19xxg4ya6vndk2ljdnl284zs8qf9dkq4ghr7pmsclp9n7zh46v48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nemerle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nemerle";
           sha256 = "0698hbgk80w7wp0ssx9pl13aapm7rc6l3y2zydfkyqdfwy5y71v6";
           name = "nemerle";
         };
@@ -17203,7 +17476,7 @@
           sha256 = "1gmi0xxwkh33w5gxc8488m1vv6ycizqhlw1kpn81zhqdzzq3s06n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/neotree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/neotree";
           sha256 = "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06";
           name = "neotree";
         };
@@ -17224,7 +17497,7 @@
           sha256 = "08bpyk0brx0x2l0y8hn8zpkaxb2ndmxz22kzxxypj6hdz303wf38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nginx-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nginx-mode";
           sha256 = "07k17m64zhv6gik8v4n73d8l1k6fsp4qp8cl94r384ny0187y65c";
           name = "nginx-mode";
         };
@@ -17245,7 +17518,7 @@
           sha256 = "1wc0cvmfhpvfzdy127d1n812q93dd9sp3mmqnc8jzy8i3frqqqq6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ninja-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ninja-mode";
           sha256 = "1m7f25sbkz8k343giczrnw2ah5i3mk4c7csi8kk9x5y16030asik";
           name = "ninja-mode";
         };
@@ -17258,15 +17531,15 @@
     nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-mode";
-        version = "1.10";
+        version = "1.11.1";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "71a5161365f40699092e491bbff88473237fc432";
-          sha256 = "03kbdrar5w475qng4j7bbak5y6ipb7pgpxj3hblcn3pnvgh7whv6";
+          rev = "da4495eb1747a5ab8fe4a8e6ccd1c28fba684a0a";
+          sha256 = "1rxj9rg3rg7yx874nsj65kam26s1bn96cnmys60dp0zh20gc1r1s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nix-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nix-mode";
           sha256 = "00rqawi8zs2x79c91gmk0anfyqbwalvfwmpak20i11lfzmdsza1s";
           name = "nix-mode";
         };
@@ -17287,7 +17560,7 @@
           sha256 = "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nixos-options";
           sha256 = "1m3jipidk10zj68rzjbacgjlal31jf80gqjxlgj4qs8lm671gxmm";
           name = "nixos-options";
         };
@@ -17308,7 +17581,7 @@
           sha256 = "0wk86gm0by9c8mfbvydz5va07qd30n6wx067inqfa7wjffaq0xr7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/noccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/noccur";
           sha256 = "0a8l50v09bgap7rsls808k9wyjpjbcxaffsvz7hh9rw9s7m5fz5g";
           name = "noccur";
         };
@@ -17329,7 +17602,7 @@
           sha256 = "03vcs458rcn1hgfvmgmijadjvri7zlh2z4lxgaplzfnga13mapym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nodejs-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nodejs-repl";
           sha256 = "0rvhhrsw87kfrwdhm8glq6b3nr0v90ivm7fcc0da4yc2jmcyk907";
           name = "nodejs-repl";
         };
@@ -17348,7 +17621,7 @@
           sha256 = "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nose";
           sha256 = "0l77hsmn3qk934ppdav1gy9sq48g0v1dzc5qy0rp9vv4yz2jx2jk";
           name = "nose";
         };
@@ -17367,7 +17640,7 @@
           sha256 = "fd2669401c276af12b6c9b739e835ee76b7910bba34bf850e4909c00e79adbd4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/notmuch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/notmuch";
           sha256 = "1sy9k6xbfl035qhnp8sdq9cb3xvgw3lkmdczyd6fw6yrzm5n0g1r";
           name = "notmuch";
         };
@@ -17388,7 +17661,7 @@
           sha256 = "1ss87vlp7625lnn2iah3rc1xfxcbpx4kmiww9n16jx073fs2rj18";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/notmuch-labeler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/notmuch-labeler";
           sha256 = "1c0cbkk5k8ps01xl63a0xa2adkqaj0znw8qs8ca4ai8v1420bpl0";
           name = "notmuch-labeler";
         };
@@ -17409,7 +17682,7 @@
           sha256 = "1l07nrlfd5qj8jnqacjba7mb6prapg8d8h3881l3kb66sn02ahgy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nrepl-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nrepl-sync";
           sha256 = "01b504b4d8rrhlf3sfq3kk9i222fch6jd5jbm02kqw20fgv6q3jd";
           name = "nrepl-sync";
         };
@@ -17430,7 +17703,7 @@
           sha256 = "0c4qfbb345yna5c30czq8nhcx283z1fnpp6h16p7vjqs6y37czsl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nsis-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nsis-mode";
           sha256 = "0pc047ryw906sz5mv0awvl67kh20prsgx6fbh0j1qm0cali2792l";
           name = "nsis-mode";
         };
@@ -17451,7 +17724,7 @@
           sha256 = "1624jj922l0bbav1v8szdr0lpyx0ng959fg3sspg1j15kgkir8kf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nvm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nvm";
           sha256 = "03gy7wavc2q02lnr9pmp3l1pn0lzbdq0kwnmg9fvklmq6r6n3x34";
           name = "nvm";
         };
@@ -17472,7 +17745,7 @@
           sha256 = "14vd0f4y5l470hx7kg54sx3352459mhjnrh7jl822gkl8c904lmw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nyan-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nyan-mode";
           sha256 = "1z2wnsbjllqa533g1ab5cgbv3d9hjix7fsd7z9c45nqh5cmadmyv";
           name = "nyan-mode";
         };
@@ -17493,7 +17766,7 @@
           sha256 = "0bgspjy8h3d7v12sfjnd2ghj4183pdf0z48g5xs129jwd3nycykp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/nyan-prompt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nyan-prompt";
           sha256 = "1s0qyhpfpncsv9qfxy07rbp4gv8pp5xzb48rbd3r14nkjlnylnfb";
           name = "nyan-prompt";
         };
@@ -17514,7 +17787,7 @@
           sha256 = "0r12023yy8j96bp8z2ml6ffyr2c9rcd5abkh6vqnkwsdxkzx6wrs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/o-blog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/o-blog";
           sha256 = "08grkyvg27wd5232q3y8p0v7higfq7bmsdzmvhja96v6qy2xsbja";
           name = "o-blog";
         };
@@ -17535,7 +17808,7 @@
           sha256 = "1zbqiqilms8vxqlvzb3gjh8gh2cl7cpmh3yiqsj94jx69w8dy4xl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-http";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-http";
           sha256 = "0b7ghz9pqbyn3b52cpmnwa2wnd4svj23p6gc48ybwzwiid42wiss";
           name = "ob-http";
         };
@@ -17556,7 +17829,7 @@
           sha256 = "1xx6hyq3gk4bavcx6i9bhipbn4mn5rv2ga9lryq09qgq2l9znclk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-sml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-sml";
           sha256 = "04qvzhwjr8ipvq3znnhn0wbl4pbb1rwxi90iidavzk3phbkpaskn";
           name = "ob-sml";
         };
@@ -17577,7 +17850,7 @@
           sha256 = "10hm20dzhkxk61ass3bd5gdn1bs2l60y3zjnpkxinzn7m6aaniia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ob-translate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-translate";
           sha256 = "1hi0rxbyxvk9sbk2fy3kqw7l4lgri921vya1mn4i1q2i1979r2gz";
           name = "ob-translate";
         };
@@ -17598,7 +17871,7 @@
           sha256 = "05ay599nc6jdw2fjss4izz1ynv2wc4svff932n8j9hvrhygipb2w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ocodo-svg-modelines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ocodo-svg-modelines";
           sha256 = "0fa88ns70wsr9i9gf4zx3fvmn1a32mrjsda105n0cx6c965kfmay";
           name = "ocodo-svg-modelines";
         };
@@ -17619,7 +17892,7 @@
           sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ocp-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ocp-indent";
           sha256 = "0wc4z9dsnnyr24n3vg1npvc3rm53av8bpbvrl8kldxxdiwgnbkjw";
           name = "ocp-indent";
         };
@@ -17640,7 +17913,7 @@
           sha256 = "19fg6r7aiirfsbp2h1a824476sn1ln4nz8kvpdzkzvyf1hzx68gw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/octicons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/octicons";
           sha256 = "02f37bvnc5qvkvfbyx5wp54nz71bqm747mq1p5361sx091lllkxk";
           name = "octicons";
         };
@@ -17661,7 +17934,7 @@
           sha256 = "0az4llfgva4wvpljyc5s2m7ggfnj06ssp32x8bncr5fzksha3r7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/offlineimap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/offlineimap";
           sha256 = "0nza7lrz7cn06njcblwh9hy3050j8ja4awbxx7jzv6nazjg7201b";
           name = "offlineimap";
         };
@@ -17682,7 +17955,7 @@
           sha256 = "1rj97yg2n9fi80qlb4z6iahqid3yinlhx9mrbh6gi1niz58ws69h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/olivetti";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/olivetti";
           sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd";
           name = "olivetti";
         };
@@ -17703,7 +17976,7 @@
           sha256 = "07grj81alrr6qgs3jmqkjzphkvi26w6jm5hf1f5wyx7h6q293ady";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-kill";
           sha256 = "03kydl16rd9mnc1rnan2byqa6f70891fhcj16wkavl2r68rfj75k";
           name = "omni-kill";
         };
@@ -17724,7 +17997,7 @@
           sha256 = "030f983n19n64f8irif102nncvam04xpx020vfgja9886wlj40pk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-log";
           sha256 = "0c29243zq8r89ax4rxlmb8imag12icnldcb0q0xsnhjccw8lyw1r";
           name = "omni-log";
         };
@@ -17745,7 +18018,7 @@
           sha256 = "1rfs6z56pnacy6m7yvm2hrb0ykfvaiyichivcmb9ssdgqp92cbxx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-scratch";
           sha256 = "190dkqcw8xywzrq8a99w4rqi0y1h2aj23s84g2ln1sf7jaf6d6n9";
           name = "omni-scratch";
         };
@@ -17766,7 +18039,7 @@
           sha256 = "0c34rci5793hd674x2srhqvnj46llrbkrw1xpzf73s4ib5zhh7xi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omni-tags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-tags";
           sha256 = "133ww1jf14jbw02ssbx2a46mp52j18a2wwzb6x77azb0akmf1lzl";
           name = "omni-tags";
         };
@@ -17787,7 +18060,7 @@
           sha256 = "1iq8yzjv7wb0jfi3lqqyx4n7whvb7xf8ls0q0w7pgsrsslrxbwcm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/omnisharp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omnisharp";
           sha256 = "0dwya22y92k7x2s223az1g8hmrpfmk1sgwbr9z47raaa8kd52iad";
           name = "omnisharp";
         };
@@ -17817,7 +18090,7 @@
           sha256 = "119pk7gg4fw5bdvir8077ra603b5nbqvd7ph9cqrwxa056jzvry8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/opam";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/opam";
           sha256 = "004r93nn1ranvxkcc0y5m3p8gh4axgghgnsvim38nc1sqda5h6xa";
           name = "opam";
         };
@@ -17838,7 +18111,7 @@
           sha256 = "12q09kdcgv6hl1hmgarl73j4g9gi4h7sj865655mdja0ns9n1pdb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/operate-on-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/operate-on-number";
           sha256 = "1rw3fqbzfizgcbz3yaf99rr2546msna4z7dyfa8dbi8h7yzl4fhk";
           name = "operate-on-number";
         };
@@ -17859,7 +18132,7 @@
           sha256 = "1xckin2d6s40kgr2293g72ipc57f8gp6y63303kmqcv3qm8q13ca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-ac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-ac";
           sha256 = "059jr3v3558cgw626zbqfwmwwv5f4637ai26h7b6psqh0x9sf3mr";
           name = "org-ac";
         };
@@ -17880,7 +18153,7 @@
           sha256 = "0gkxxzdk8bd1yi5x9217pkq9d01ccq8znxc7h8qcw0p1336rigfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-agenda-property";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-agenda-property";
           sha256 = "0zsjzjw52asl609q7a2s4jcsm478p4cxzhnd3azyr9ypxydjf6qk";
           name = "org-agenda-property";
         };
@@ -17901,7 +18174,7 @@
           sha256 = "0j6fqgzvbmvvdh0dgwsxq004wxys2zwnq9wa3idm087ynp2a2ani";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-autolist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-autolist";
           sha256 = "1jvspxhxlvd7h1srk9dbk1v5dykmf8jsjaqicpll7ial6i0qgikj";
           name = "org-autolist";
         };
@@ -17922,7 +18195,7 @@
           sha256 = "10nr4sjffnqbllv6gmak6pviyynrb7pi5nvrq331h5alm3xcpq0w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-bullets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-bullets";
           sha256 = "1kxhlabaqi1g6pz215afp65d9cp324s8mvabjh7q1h7ari32an75";
           name = "org-bullets";
         };
@@ -17943,7 +18216,7 @@
           sha256 = "18x8c6jcqkfam79z4hskr8h1lvzvd5rlfgymmj1ps6p6hd3j4ihl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-elisp-help";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-elisp-help";
           sha256 = "0a4wvz52hkcw5nrml3h1yp8w97vg5jw22wnpfbb827zh7iwb259h";
           name = "org-elisp-help";
         };
@@ -17964,7 +18237,7 @@
           sha256 = "1pxfcyf447h18220izi8qlnwdr8rlwn5kds8gr5i1v90s6hpa498";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-gcal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-gcal";
           sha256 = "1mp6cm0rhd4r9pfvsjjp86sdqxjbbg7gk41zx0zf0s772smddy3q";
           name = "org-gcal";
         };
@@ -17985,7 +18258,7 @@
           sha256 = "0b57ik05iax2h3nrj96kysbk4hxmxlaabd0n6lv1xsayrlli3sj1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-gnome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-gnome";
           sha256 = "0c37gfs6xs0jbvg6ypd4z5ip1khm26wr5lxgmv1dzcc383ynzg0v";
           name = "org-gnome";
         };
@@ -18006,7 +18279,7 @@
           sha256 = "1iyqv34b7q2k73srshcnpvfzcadq47w4rzkqp6m1d3ajk8x2vypq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-if";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-if";
           sha256 = "0h0jdyawz2j4mp33w85z8q77l37qid8palvw5n4z379qa0wr5h96";
           name = "org-if";
         };
@@ -18027,7 +18300,7 @@
           sha256 = "0980scx1dzslbdzmhv720branc4jd4bdkyji34gahinx4w9brj79";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-journal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-journal";
           sha256 = "078z9b9hxbvmmxib6098f49rn7n3d0v4x37p7xxb0v8cv4izlb4s";
           name = "org-journal";
         };
@@ -18048,7 +18321,7 @@
           sha256 = "1797pd264zn19zk93nifyw6pwk2a7wrpfir373qclk601yv2g5h8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-link-travis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-link-travis";
           sha256 = "0hj4x7cw7a3ry8xislkz9bnavy77z4cpmnvns02yi3gnib53mlfs";
           name = "org-link-travis";
         };
@@ -18069,7 +18342,7 @@
           sha256 = "1bggz782ci0z6aw76v51ykbmfzh5g6cxh43w798as1152sn7im3p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-linkany";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-linkany";
           sha256 = "0arjj3c23yqm1ljvbnl7v9cqvd9lbz4381g8f3jyqbafs25bdc3c";
           name = "org-linkany";
         };
@@ -18089,7 +18362,7 @@
           sha256 = "5cb84c3c4bf3f7c3e0c9ab869dababb785d44198b1e1072dc9c0937fc483aa14";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-mac-iCal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-mac-iCal";
           sha256 = "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw";
           name = "org-mac-iCal";
         };
@@ -18110,7 +18383,7 @@
           sha256 = "0yxfhzygiki8sha1dddac4g72r51yi4jnga2scmk51f9jgwqbihp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-multiple-keymap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-multiple-keymap";
           sha256 = "16iv5575634asvn1b2k535ml8g4lqgy8z5w6ykma5f9phq5idb9f";
           name = "org-multiple-keymap";
         };
@@ -18131,7 +18404,7 @@
           sha256 = "15fy6xpz6mk4j3nkrhiqal2dp77rhxmk8a7xiw037xr1jgq9sd9a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-outlook";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-outlook";
           sha256 = "0cn8h6yy67jr5h1yxsfqmr8q7ii4f99pgghfp821m01pj55qyjx9";
           name = "org-outlook";
         };
@@ -18152,7 +18425,7 @@
           sha256 = "0zc20m63a1iz9aziid5jsvcbl86k9dg9js4k3almchh55az4a0i3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-page";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-page";
           sha256 = "1326m3w7vz22zk7rx40z28fddsccy5fl1qhbb7clci8l69blcc2v";
           name = "org-page";
         };
@@ -18173,7 +18446,7 @@
           sha256 = "14lshgyrlzjcrqdfsn17llm70ijbs86cv9mccy87vlr01rbsz6lj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-pdfview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-pdfview";
           sha256 = "1z4gb5lw7ngphixw06b5484kwlxbc098w2xshzml5sywr16a4iab";
           name = "org-pdfview";
         };
@@ -18194,7 +18467,7 @@
           sha256 = "1fjdza723615bhdm5x6gbd03vi7ywzpbjn8p59saimczqngfdpmw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-pomodoro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-pomodoro";
           sha256 = "1vdi07hrhniyhhvg0hcr5mlixy6bjynvwm89z2lvfyvnnxpx0r27";
           name = "org-pomodoro";
         };
@@ -18215,7 +18488,7 @@
           sha256 = "16aq5p65q5a0an14q9xzsnkaa5bzkrwhm9cv5ljajjfcjsjcvmb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-projectile";
           sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm";
           name = "org-projectile";
         };
@@ -18236,7 +18509,7 @@
           sha256 = "1cxjzj955rvp0ijbp7ifpmkxdhimz8hqjw5c9gv6zwjqb5iih9ry";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-protocol-jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-protocol-jekyll";
           sha256 = "18wg489n2d1sx9jk00ki6p2rxkqz67kqwnmy2kb1ga1rmb6x9wfs";
           name = "org-protocol-jekyll";
         };
@@ -18257,7 +18530,7 @@
           sha256 = "0hhgfw0sqvl9jmmslwxn6v3dii99v09yz2h0ia5np9lzyxsc207a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-readme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-readme";
           sha256 = "1qqbsgspd006gy0kc614w7bg6na0ygmflvqkmw47899pbgj81hxh";
           name = "org-readme";
         };
@@ -18278,7 +18551,7 @@
           sha256 = "03c88jzwvl95dl39703mknkvnk3cmw4gss5c1y2k9py2rgh6bpr9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-repo-todo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-repo-todo";
           sha256 = "0l5ns1hs3i4dhrpmvzl34zc9zysgjkfa7j8apbda59n9jdvml5v1";
           name = "org-repo-todo";
         };
@@ -18299,7 +18572,7 @@
           sha256 = "0zx9gpvm5gy9k45lbhaks9s935id727lszsh40gmpdp5zxf3rjk1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-sync";
           sha256 = "0n8fz2d1vg9r8dszgasbnb6pgaxr2i8mqrp953prf1nhmfpjpxad";
           name = "org-sync";
         };
@@ -18320,7 +18593,7 @@
           sha256 = "1qx3kd02sxs9k7adlvdlbmyhkc5kr7ni5lw4gxjw3nphnc536bkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-table-comment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-table-comment";
           sha256 = "1d40vl8aa1x27z4gwnkzxgrqp7vd3ln2pc445ijjxp1wr8bjxvdz";
           name = "org-table-comment";
         };
@@ -18330,6 +18603,48 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-tfl = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-tfl";
+        version = "0.3.1";
+        src = fetchFromGitHub {
+          owner = "storax";
+          repo = "org-tfl";
+          rev = "c9e024ac55d9e0c61a273e75bd68981a623c9ab2";
+          sha256 = "1x241jaw726zjsplwf6svbvr8af09k6kqj7icpvcbyayivkbhxy2";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-tfl";
+          sha256 = "1rqmmw0222vbxfn5wxq9ni2j813x92lpv99jjszqjvgnf2rkhjhf";
+          name = "org-tfl";
+        };
+        packageRequires = [ cl-lib emacs org ];
+        meta = {
+          homepage = "http://melpa.org/#/org-tfl";
+          license = lib.licenses.free;
+        };
+      }) {};
+    org-themis = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-themis";
+        version = "0.4.1";
+        src = fetchFromGitHub {
+          owner = "zellio";
+          repo = "org-themis";
+          rev = "4b4bf1fa1e853664bf006dda8afe2db00e522aaa";
+          sha256 = "12fksqi9flf84h1lbmbcjnqxa7dairp50wvlwfhbp1hbb8l9z63a";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-themis";
+          sha256 = "08rajz5y7h88fh94s2ad0f66va4vi31k9hwdv8p212bs276rp7ln";
+          name = "org-themis";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/org-themis";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-time-budgets = callPackage ({ alert, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-time-budgets";
@@ -18341,7 +18656,7 @@
           sha256 = "09iw2jffb2qrx5r07zd1j8sk5wafamjkc2khqyfwc5kx6xyp1f46";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-time-budgets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-time-budgets";
           sha256 = "0r8km586n6xdnjha7xnzlh03nw1dp066hydaz8kxfmhvygl9cpah";
           name = "org-time-budgets";
         };
@@ -18362,7 +18677,7 @@
           sha256 = "0qqa62fsmra6v4061kpki8wbhfcwkgnb2gzxwvnaqlcmhivksg6v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-toodledo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-toodledo";
           sha256 = "0c7qr0jsc4iyrwkc22xp9nmk6984v7q1k0rvpd62m07lb5gvbiq3";
           name = "org-toodledo";
         };
@@ -18383,7 +18698,7 @@
           sha256 = "053wf36lq9piyzq7rv2lid34zanj6l9fvawp3r3nsniy5nlfckqx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-tracktable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-tracktable";
           sha256 = "0mngf9q2ffxq32cgng0xl30661mj15wmr9y4hr3xddj626kxrp00";
           name = "org-tracktable";
         };
@@ -18404,7 +18719,7 @@
           sha256 = "1h15fr16kgbyrxambmk4hsmha6hx4c4yqkccb82g3wlvzmnqj5x3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-transform-tree-table";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-transform-tree-table";
           sha256 = "0n68cw769nk90ms6w1w6cc1nxjwn1navkz56mf11bsiqvsk3km7r";
           name = "org-transform-tree-table";
         };
@@ -18425,7 +18740,7 @@
           sha256 = "0aacxxwhwjzby0f9r4q0lra5lqcrw5snnm1yc63jrs6c0ifakk45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-tree-slide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-tree-slide";
           sha256 = "0v857zplv0wdbg4li667v2p5pn5zcf9fgbqcwa75x8babilkl6jn";
           name = "org-tree-slide";
         };
@@ -18446,7 +18761,7 @@
           sha256 = "1561nxjva8892via0l8315y3fih4r4q9gzycmvh33db8gqzq4l86";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-trello";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-trello";
           sha256 = "1rm91xccvdsqghdnrnjvyp8xfvrw5ac677vzzz24rz9dssh2mz9b";
           name = "org-trello";
         };
@@ -18474,7 +18789,7 @@
           sha256 = "1qf4pqsg12y1qx7di0y5dp0f4slyp69h2q6y21hldzknhwxx4yy4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org-vcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-vcard";
           sha256 = "0l6azshvzl1wws582njqr3qx4h73gwrdqwa3jcic1qbs9hg2l4yl";
           name = "org-vcard";
         };
@@ -18495,7 +18810,7 @@
           sha256 = "0av1477jn3s4s5kymd7sbb0av437vb5mnfc6rpfgzwji7b8mfr7l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org2blog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org2blog";
           sha256 = "0ancvn4ji4552k4nfd2ijclsd027am93ngg241ll8f6h6k0wpmzq";
           name = "org2blog";
         };
@@ -18516,7 +18831,7 @@
           sha256 = "064kw64w9snm0lbshxn8d6yd9xvyislhg37fmhq1w7vy8lm61xvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/org2jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org2jekyll";
           sha256 = "1j9d6xf5nsakifxwd4zmjc29lbj46ffn3z109k2y2yhz7q3r9hzv";
           name = "org2jekyll";
         };
@@ -18537,7 +18852,7 @@
           sha256 = "02mxp17p7bj4xamg0m6zk832hmpqcgzc7bjbjcnvbvrawhc255hy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orgbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orgbox";
           sha256 = "12wfqlpjh9nr7zgqs4h8kmfsk825n68qcbn8z2fw2mpshg3nj7l8";
           name = "orgbox";
         };
@@ -18550,15 +18865,15 @@
     orgit = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, org }:
     melpaBuild {
         pname = "orgit";
-        version = "1.0.0";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "orgit";
-          rev = "731c5cb4f1c7e2ee5b819ca159c0c01e2b306c73";
-          sha256 = "0d7rh5bi5v04njj1nh8q8kdr6aw68lcw4ghx6kwq97aff4qmcrp1";
+          rev = "12bfadf603d8a1f616a1bdac5f909a0c20e6aba4";
+          sha256 = "1wxxdx3c5qacsii4kysk438cjr1hnmpir78kp6xgk9xw5g9snlnj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orgit";
           sha256 = "0askccb3h98v8gmylwxaph3gbyv5b1sp4slws76aqz1kq9x0jy7w";
           name = "orgit";
         };
@@ -18579,7 +18894,7 @@
           sha256 = "00vhzblzscp3mkl6x1nz116i4isjwcc5gkpdksym3mr5nqvqhd97";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/orglink";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orglink";
           sha256 = "0ldrvvqs3hlazj0dch162gsbnbxcg6fgrxid8p7w9gj19vbcl52b";
           name = "orglink";
         };
@@ -18600,7 +18915,7 @@
           sha256 = "0g1xhh88a65vcq6rlh7ii16pra4pv519ajcws0h93ldbbjiy7p0m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-browse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-browse";
           sha256 = "06rfzq2hxhzg6jh2zs28r7ffxwlq40nz954j13ly8403c7rmbrfm";
           name = "osx-browse";
         };
@@ -18621,7 +18936,7 @@
           sha256 = "1vywqzw8hydi944q4ghgxbbvvmwfpa9wj5nmrnixfcw8h4mfcxvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-dictionary";
           sha256 = "13033fxc5vjd1f7mm6znmprcp3mwxbvblb2d25shr8d4imqqhv82";
           name = "osx-dictionary";
         };
@@ -18642,7 +18957,7 @@
           sha256 = "1csnxpsfnv9lv07kgvc60qx5c33sshmnz60p3qjz7ym7rnjy9b5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-location";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-location";
           sha256 = "1p12mmrw70p3b04zlprkdxdfnb7m3vkm6gci3fwhr5zyfvwxvn0c";
           name = "osx-location";
         };
@@ -18663,7 +18978,7 @@
           sha256 = "0830kkmvc3ss7ygqfwz3j75s7mhxfxyadaksrp0v2cc4y6wn6nfv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-plist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-plist";
           sha256 = "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8";
           name = "osx-plist";
         };
@@ -18684,7 +18999,7 @@
           sha256 = "1pn6xvq41di1jb5d3i8wgs54w0m2414cq3f1vk0xpibshkq7sr4a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/osx-trash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-trash";
           sha256 = "1f6pi53mhp2pvrfjm8544lqqj36gzpzxq245lzvv91lvqkxr9ysj";
           name = "osx-trash";
         };
@@ -18705,7 +19020,7 @@
           sha256 = "1v9kx5xr7xcr6i664h2g6j8824yjsjdn5pvgmawvxrrplbjmiqnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/outorg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/outorg";
           sha256 = "04swss84p33a9baa4swqc1a9lfp6wziqrwa7vcyi3y0yzllx36cx";
           name = "outorg";
         };
@@ -18726,7 +19041,7 @@
           sha256 = "1v04iyx57w8scw3iqrivii7q0sh8sa7xacswdhd18mw9kvjrbj98";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/outshine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/outshine";
           sha256 = "1i8c3q6n9hpfbpg2f8n8brwgaq36af1jn3g5js88yiyyb5dknxq4";
           name = "outshine";
         };
@@ -18747,7 +19062,7 @@
           sha256 = "0qxk2rf84j86syxi8xknsq252irwg7sz396v3bb4wqz4prpj0kzc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ov";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ov";
           sha256 = "0d71mpv74cfxcnwixbrl90nr22cw4kv5sdgpny5wycvh6cgmd6qb";
           name = "ov";
         };
@@ -18768,7 +19083,7 @@
           sha256 = "0jz8p6bwpfncxwi6ssmi6ngx8sjjica565i6ln0gsr5i11zfb7nx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/overseer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/overseer";
           sha256 = "04wfwcal051jrnmm5dga6vl4c9j10pm416586yxb8smi6fxws2jg";
           name = "overseer";
         };
@@ -18789,7 +19104,7 @@
           sha256 = "0f2psx4lq98l3q3fnibsfqxp2hvvwk7b30zjvjlry3bffg3l7pfk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/owdriver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/owdriver";
           sha256 = "0j8z7ynan0zj581x50gsi9lljkbi6bwmzpfyha3i6q8ch5qkdxfd";
           name = "owdriver";
         };
@@ -18810,7 +19125,7 @@
           sha256 = "047fcvpvwzaqisw4q3p6hxgjyqsi2n9nms1qx9w4znvxrnjq8jz3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-ioslide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-ioslide";
           sha256 = "0z0qnvpw64wxbgz8203rphswlh9hd2i11pz2mlay8l3bzz4gx4vc";
           name = "ox-ioslide";
         };
@@ -18831,7 +19146,7 @@
           sha256 = "0h49pfl97vl796sm7r62rpv3slj0z5krm4zrqkgz0q6zlyrjay29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-pandoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-pandoc";
           sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc";
           name = "ox-pandoc";
         };
@@ -18852,7 +19167,7 @@
           sha256 = "026g48sgqwnqs5zmrabhiv3l8052l4c1vsbsf6bdxv4a6yp0l654";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ox-twbs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-twbs";
           sha256 = "15csgnph5wh2dvcc2dnvrlm7whh428rq8smqji1509ib7aw9y5mx";
           name = "ox-twbs";
         };
@@ -18873,7 +19188,7 @@
           sha256 = "073qpa223ja673p63mhvy4l6yyv3k7z05ifwvn7bmq4b5fq42hw6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pabbrev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pabbrev";
           sha256 = "1mbfa40pbzbi00sp155zm43sj6nw221mcayc2rk3ppin9ps95hx3";
           name = "pabbrev";
         };
@@ -18894,7 +19209,7 @@
           sha256 = "1xv0ra130qg0ksgqi4npspnv0ckq77k7f5kcibavj030h578kj97";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/package+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/package+";
           sha256 = "1mbsxr4llz8ny7n7w3lykld9yvbaywlfqnvr9l0aiv9rvmdv03bn";
           name = "package-plus";
         };
@@ -18915,7 +19230,7 @@
           sha256 = "1pdv6d6bm5jmpgjqf9ycvzasxz1205zdi0zjrmkr33c03azwz7rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/package-safe-delete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/package-safe-delete";
           sha256 = "12ss5yjhnyxsif4vlbgxamn5jfa0wxkkphffxnv6drhvmpq226jw";
           name = "package-safe-delete";
         };
@@ -18936,7 +19251,7 @@
           sha256 = "138l07qmxj4fkvf43f1hdn4skadxb50c023bc5101l3njzmf74wa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/package-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/package-utils";
           sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r";
           name = "package-utils";
         };
@@ -18957,7 +19272,7 @@
           sha256 = "0k5l0l4vjw38r911zd9c9cv015vpw2y8abp82s2s9pm8nqc3bnci";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/packed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/packed";
           sha256 = "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z";
           name = "packed";
         };
@@ -18978,7 +19293,7 @@
           sha256 = "1acz3w2zdcds0h6p2k9h3lmjsk519asqrxjw7f3pyrcq7x2qbhc4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/page-break-lines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/page-break-lines";
           sha256 = "0q1166z190dxznzgf2f29klj2jkaqlic483p4h3bylihkqp93ij7";
           name = "page-break-lines";
         };
@@ -18999,7 +19314,7 @@
           sha256 = "03mlg6dmpjw8fq2s3c4gpqj20kjhzldz3m51bf6s0mxq9bclx2xw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pallet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pallet";
           sha256 = "0q50cdwnn2w1n5h4bappncjjyi5yaixxannwgy23fngdrz1mxwd7";
           name = "pallet";
         };
@@ -19012,15 +19327,15 @@
     pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "pandoc-mode";
-        version = "2.13.3";
+        version = "2.14";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "pandoc-mode";
-          rev = "067f9aa8ba27bd50b602dbfdaa155e2f381c7139";
-          sha256 = "14kxmcsgdrq9r8c17x8hz8vid0bn6rikvmddhc6wpbmp7shngvr1";
+          rev = "ebf43f8a62beea6b66c9999e660b0fc82854ac08";
+          sha256 = "1i5mh8bilg7vplb1ps81s5r6zjf2k6yjcmklrql4w7vw9jrvy566";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pandoc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pandoc-mode";
           sha256 = "0qvc6cf87h1jqf590kd68jfg25snxaxayfds634wj4z6gp70l781";
           name = "pandoc-mode";
         };
@@ -19041,7 +19356,7 @@
           sha256 = "0gmdzagyg0p7q1gyj2a3aqp2g4asljpib3n67nikr0v99c2mki5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pangu-spacing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pangu-spacing";
           sha256 = "082qh26vlk7kifz1800lyai17yvngwjygrfrsh1dsd8dxhk6l9j8";
           name = "pangu-spacing";
         };
@@ -19062,7 +19377,7 @@
           sha256 = "1xh614czldjvfl66vhkyaai5k4qsg1l3mz6wd5b1w6kd45qrc54i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paper-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paper-theme";
           sha256 = "04diqm2c9fm29zyms3hplkzb4kb7b2kyrxdsy0jxyjj5kabypd50";
           name = "paper-theme";
         };
@@ -19072,22 +19387,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    paradox = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, hydra, json ? null, let-alist, lib, melpaBuild, seq, spinner }:
+    paradox = callPackage ({ emacs, fetchFromGitHub, fetchurl, hydra, let-alist, lib, melpaBuild, seq, spinner }:
     melpaBuild {
         pname = "paradox";
-        version = "2.3.6";
+        version = "2.3.7";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "paradox";
-          rev = "d62d883b8c980d679970bed79c12091df9120a77";
-          sha256 = "06c2a55bmnhfvjpd43kq6d2l9yijgiq16yq19x6m8050f8hzxnyb";
+          rev = "8eca9880ed52d0d53d7d5e28858ec95987fa22e1";
+          sha256 = "1vc59n9jmsn5d15v2m9xl64564h3q0c78pv4a4n3dhd1iz797l3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paradox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paradox";
           sha256 = "1xq14nfvprsq18464qr4mhphq7cl1f570lji5n8z6j9vpfm9a4p2";
           name = "paradox";
         };
-        packageRequires = [ cl-lib emacs hydra json let-alist seq spinner ];
+        packageRequires = [ emacs hydra let-alist seq spinner ];
         meta = {
           homepage = "http://melpa.org/#/paradox";
           license = lib.licenses.free;
@@ -19102,7 +19417,7 @@
           sha256 = "7587cd2cf6e5b245678bbca8cbad07db8576ff976a504cd8d6e52fa85cf99f8f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paredit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paredit";
           sha256 = "1rp859y4qyqdfvp261l8mmbd62p1pw0dypm1mng6838b6q6ycakr";
           name = "paredit";
         };
@@ -19123,7 +19438,7 @@
           sha256 = "0jbjwjl92pf0kih3p2x20ms2kpyzzam8fir661nimpmk802ahgkj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paredit-everywhere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paredit-everywhere";
           sha256 = "0gbkwk8mrbjr2l8pz3q4y6j8q4m12zmzl31c88ngs1k5d86wav36";
           name = "paredit-everywhere";
         };
@@ -19144,7 +19459,7 @@
           sha256 = "033gdya7f6p4kkapnmnbxlm88g4rbsmym4cc4jkcmp91idh63syq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paren-face";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paren-face";
           sha256 = "0dmzk66m3rd8x0rb925pyrfpc2qsvayks4kmhpb2ccdrx68pg8gf";
           name = "paren-face";
         };
@@ -19165,7 +19480,7 @@
           sha256 = "0i5bc7lyyrx6swqlrp9l5x72yzwi53qn6ldrfs99gh08b3yvsnni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/parent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/parent-mode";
           sha256 = "1ndn6m6aasmk9yrml9xqj8141100nw7qi1bhnlsss3v8b6njwwig";
           name = "parent-mode";
         };
@@ -19186,7 +19501,7 @@
           sha256 = "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/parsebib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/parsebib";
           sha256 = "07br2x68scsxykdk2ajc4mfqhdb7vjkcfgz3vnpy91sirxzgfjdd";
           name = "parsebib";
         };
@@ -19207,7 +19522,7 @@
           sha256 = "18m0973l670cjbzpa1vfv06gymhsa2f1pjcp329s0npb735x5whj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pass";
           sha256 = "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr";
           name = "pass";
         };
@@ -19228,7 +19543,7 @@
           sha256 = "1g0mvg9i8f2qccb4b0m4d74zkjx9gjfv47x57by6cdaf9yywqryi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/passthword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/passthword";
           sha256 = "076jayziipjx260yk3p37pf5k0qsagalidah3y6hiflrlq4sfgjn";
           name = "passthword";
         };
@@ -19248,7 +19563,7 @@
           sha256 = "f71d0b36570983c35e08b6672c186b5c308b57536a96a747f09665bab794be30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/password-store";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/password-store";
           sha256 = "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss";
           name = "password-store";
         };
@@ -19269,7 +19584,7 @@
           sha256 = "0m6qjsq6qfwwszm95lj8c58l75vbmx9r5hm9bfywyympfgy0fa1n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pastehub";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pastehub";
           sha256 = "1slvqn5ay6gkbi0ai1gy1wmc02h4g3n6srrh4fqn72y7b9nv5i0v";
           name = "pastehub";
         };
@@ -19290,7 +19605,7 @@
           sha256 = "1v5mpjb8kavbqhvg4rizwg8cypgmi6ngdiy8qp9pimmkb56y42ly";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pastelmac-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pastelmac-theme";
           sha256 = "168zzqhp2dbfcnknwfqxk68rgmibfw71ksghvi6h2j2c1m08l23f";
           name = "pastelmac-theme";
         };
@@ -19311,7 +19626,7 @@
           sha256 = "0kkgqaxyrv65rfg2ng1vmmmrc9bm98yqpsv2pcb760287dn0l27m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/paxedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paxedit";
           sha256 = "06ymilr0zrwfpyzql7dcpg48lhkx73f2jlaw3caxgsjaz7x3n4ic";
           name = "paxedit";
         };
@@ -19332,7 +19647,7 @@
           sha256 = "0xbbq8ddlirhvv921nrf7bwazh0i98bk0a9xzyx8iqpyg66vbfa8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcache";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcache";
           sha256 = "1q2wlbc58lyf3dxfs9ppdxvdsp81jmkq874zbd7f39wvc5ckbz0l";
           name = "pcache";
         };
@@ -19353,7 +19668,7 @@
           sha256 = "0h0p4c08z0dqxmg55fzch1d2f38rywfk1j0an2f4sc94lj7ckbm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcomplete-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcomplete-extension";
           sha256 = "0m0c9ir44p21rj93fkisvpvi08936717ljmzsr4qdf69b3i54cwc";
           name = "pcomplete-extension";
         };
@@ -19374,7 +19689,7 @@
           sha256 = "03k3xhrim4s3yvbnl8g8ci5g7chlffycdw7d6a1pz3077mxf1f1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pcsv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcsv";
           sha256 = "1zphndkbva59g1fd319a240yvq8fjk315b1fyrb8zvmqpgk9n0dl";
           name = "pcsv";
         };
@@ -19395,7 +19710,7 @@
           sha256 = "19sy49r3ijh36m7hl4vspw5c4i8pnfqdn4ldm2sqchxigkw56ayl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pdf-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pdf-tools";
           sha256 = "1hnc8cci00mw78h7d7gs8smzrgihqz871sdc9hfvamb7iglmdlxw";
           name = "pdf-tools";
         };
@@ -19416,7 +19731,7 @@
           sha256 = "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/peg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/peg";
           sha256 = "0nxy9xn99myz0p36m4jflfj48qxhhn1sspbfx8d90030xg3cc2gm";
           name = "peg";
         };
@@ -19436,7 +19751,7 @@
           sha256 = "1rh87jf0a15q35a8h00bx6k5wa931rb6gh600zbs7j4r3y8qsylf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/per-buffer-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/per-buffer-theme";
           sha256 = "1czcaybpfmx4mwff7hs07iayyvgvlhifkickccap6kpd0cp4n6hn";
           name = "per-buffer-theme";
         };
@@ -19457,7 +19772,7 @@
           sha256 = "0h05j55y3csq91a5m2fg99y4rzsh7zca7hnifb6kic5zb3nahi00";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/persistent-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/persistent-scratch";
           sha256 = "0iai65lsg3zxj07hdb9201w3rwrvdb3wffr6k2jdl8hzg5idghn1";
           name = "persistent-scratch";
         };
@@ -19478,7 +19793,7 @@
           sha256 = "14p20br8vzxs39d4hswzrrkgwql5nnmn5j17cpbabzjvck42rixc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/persistent-soft";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/persistent-soft";
           sha256 = "0a4xiwpgyyynjf69s8p183mqd3z53absv544ggvhb2gkpm6jravc";
           name = "persistent-soft";
         };
@@ -19499,7 +19814,7 @@
           sha256 = "129cl5az4rr5j7krpyyi5khhbl8klw7ji9ysarz0s7ivy096jq7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/persp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/persp-mode";
           sha256 = "1bgni7y5xsn4a21494npr90w3320snfzw1hvql30xrr57pw3765w";
           name = "persp-mode";
         };
@@ -19520,7 +19835,7 @@
           sha256 = "12c2rrhysrcl2arc6hpzv6lxbb1r3bzlvdp23hnp9sci6yc10k3q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/perspective";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/perspective";
           sha256 = "150dxcsd0ylvfi9mmfpcki1wd3nl8q9mbszd3dgqfnm40yncklml";
           name = "perspective";
         };
@@ -19541,7 +19856,7 @@
           sha256 = "1qxsc5wyk8l9gkgmqy3mzwxdhji1ljqw9s1jfxkax7fyv4d1v31p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ph";
           sha256 = "0azx4cpfdn01yrqyn0q1gg9z7w0h0rn7zl39v3dx6yidd76ysh0l";
           name = "ph";
         };
@@ -19562,7 +19877,7 @@
           sha256 = "0r6cl1ng41s6wsy5syjlkaip0mp8h491diipdc1psbhnpk4vabsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phi-search-mc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phi-search-mc";
           sha256 = "07hd80rbyzr5n3yd7hv1j51nl6pvcxmln20g6xvw8gh5yfl9k0m8";
           name = "phi-search-mc";
         };
@@ -19583,7 +19898,7 @@
           sha256 = "0zs11811kx6x1zgc1icd8gw420saa7z6zshpzmrddnbznya4qql6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php-auto-yasnippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php-auto-yasnippets";
           sha256 = "1hhddvpc80b6wvjpbpibsf24rp5a5p45m0bg7m0c8mx181h9mqgn";
           name = "php-auto-yasnippets";
         };
@@ -19604,7 +19919,7 @@
           sha256 = "0pwhw59ki19f9rkgvvnjzhby67s0y9hpsrg6cwqxakjlm66w96q3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/php-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php-mode";
           sha256 = "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y";
           name = "php-mode";
         };
@@ -19625,7 +19940,7 @@
           sha256 = "09rinyx0621d7613xmbyvrrlav6d4ia332wkgg0m9dn265g3h56z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phpcbf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phpcbf";
           sha256 = "1hf88ys4grffpqgavrbc72dn3m7crafgid2ygzx9c5j55syh8mfv";
           name = "phpcbf";
         };
@@ -19646,7 +19961,7 @@
           sha256 = "1s4a0ygm79shv6f0rghrkq9jb7jc7sh9cjxzlzj0c8zpvsxl0hlz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/phpunit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phpunit";
           sha256 = "0nj8ss1yjkcqnbnn4jgbp0403ljjk2xhipzikdrl3dbxlf14i4f8";
           name = "phpunit";
         };
@@ -19667,7 +19982,7 @@
           sha256 = "12jhdkgfck2a6d5jj65l9d98dm34gsyi0ya4h21dbbvz35zivz70";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pinyin-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pinyin-search";
           sha256 = "1si693nmmxgg0kp5mxvj5nq946kfc5cv3wfsl4znbqzps8qb2b7z";
           name = "pinyin-search";
         };
@@ -19688,7 +20003,7 @@
           sha256 = "1dsg49156mfhkd8ip4ny03sc06zchxr1qpbcx48f5sn4m9j5d3vs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pip-requirements";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pip-requirements";
           sha256 = "1wsjfyqga7pzp8gsm5x53qrkn40srairbjpifyrqbi2fpzmwhrnz";
           name = "pip-requirements";
         };
@@ -19709,7 +20024,7 @@
           sha256 = "1wg8pcwd70ixn2bxh01934zl12ry4pgx3l9dccpbjdi40gira00d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pixiv-novel-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pixiv-novel-mode";
           sha256 = "0f1rxvf9nrw984122i6dzsgik9axfjv6yscmg203s065n9lz17px";
           name = "pixiv-novel-mode";
         };
@@ -19730,7 +20045,7 @@
           sha256 = "0nk12dcppdyhav6m6yf7abpywyd7amxd4237zsfd32w4zxsx39k1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pkg-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pkg-info";
           sha256 = "0whcvralk76mfmvbvwn57va5dkb1irj7iwffgddi7r0ima49iszx";
           name = "pkg-info";
         };
@@ -19751,7 +20066,7 @@
           sha256 = "0a8qb1ldk6bjs7fpxgxrf90md7q46fhl71gmay8yafdkh6hn0kqr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pkgbuild-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pkgbuild-mode";
           sha256 = "1lp7frjahcpr4xnzxz77qj5hbpxbxm2g28apkixrnc1xjha66v3x";
           name = "pkgbuild-mode";
         };
@@ -19772,7 +20087,7 @@
           sha256 = "1k3bqv5y2xp1jl2hpf8qhs11yzhcl8k40fxqjzv7mvc0ysq9y6wb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/platformio-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/platformio-mode";
           sha256 = "022l20sfyfkvp6kmmqxr7gcmcdx6b1dgsakjjnx8fknrpxr5kyps";
           name = "platformio-mode";
         };
@@ -19793,7 +20108,7 @@
           sha256 = "11cbpgjsnw8fiqf1s12hbm9qxgjcw6y2zxx7wz4wg7idmi7m0b7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plenv";
           sha256 = "0dw9fy5wd9wm76ag6yyw3f9jnlj7rcdcxgdjm30h514qfi9hxbw4";
           name = "plenv";
         };
@@ -19814,7 +20129,7 @@
           sha256 = "0f00dv5jwbhs99j4jc6lvr5n0mv1y80yg7zpp6yrmhww6829l5rg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plsense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plsense";
           sha256 = "1ka06r4ashhjkfyzql9mfvs3gj7n684h4gaycj29w4nfqrhcw9va";
           name = "plsense";
         };
@@ -19835,7 +20150,7 @@
           sha256 = "0s34nbqqy6aqi113xj452pbmqp43046wfbfbbfv1xwhybgq0c1j1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/plsense-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plsense-direx";
           sha256 = "0qd4b7gkmn5ydadhp70995rap3643s1aa8gfi5izgllzhg0i864j";
           name = "plsense-direx";
         };
@@ -19845,6 +20160,48 @@
           license = lib.licenses.free;
         };
       }) {};
+    pony-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
+    melpaBuild {
+        pname = "pony-snippets";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "seantallen";
+          repo = "pony-snippets";
+          rev = "56018b23a11563c6766ed706024b22aa5a4556b4";
+          sha256 = "0xjvxfkrl6wl31s7rvbv9zczn6d6i9vf20waqlr3c2ff3zy55ygy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pony-snippets";
+          sha256 = "06rrzfg20kzpscnqr2lin9jvrcydq4wnrv7nj1d0lm6988qz88jx";
+          name = "pony-snippets";
+        };
+        packageRequires = [ yasnippet ];
+        meta = {
+          homepage = "http://melpa.org/#/pony-snippets";
+          license = lib.licenses.free;
+        };
+      }) {};
+    ponylang-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ponylang-mode";
+        version = "0.0.1";
+        src = fetchFromGitHub {
+          owner = "SeanTAllen";
+          repo = "ponylang-mode";
+          rev = "d05425eca7c924109263bdac72083137a7967454";
+          sha256 = "0jlycv0ck5kbszwc0v2gbka6k5h39nz8763ws0v8jada7zzmyvxm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ponylang-mode";
+          sha256 = "02fq0qp7f4bzmynzszrwskfs78nzsmf413qjxqndrh3hamixzpi1";
+          name = "ponylang-mode";
+        };
+        packageRequires = [ dash ];
+        meta = {
+          homepage = "http://melpa.org/#/ponylang-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     pophint = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, popup, yaxception }:
     melpaBuild {
         pname = "pophint";
@@ -19856,7 +20213,7 @@
           sha256 = "18i0kivn6prh5pwdr7b4pxfxqsc8l4mks1h6cfs7iwnfn15g5k19";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pophint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pophint";
           sha256 = "1chq2j79hg095jxw5z3pz4qicqrccw0gj4sxrin0a55hnprzzp72";
           name = "pophint";
         };
@@ -19877,7 +20234,7 @@
           sha256 = "1y538siabcf1n00wr4iz5gbxfndw661kx2mn9w1g4lg7yi4n0h0h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popup";
           sha256 = "151g00h9rkid76qf6c53n8bncsfaikmhj8fqcb3r3a6mbngcd5k2";
           name = "popup";
         };
@@ -19898,7 +20255,7 @@
           sha256 = "084hb3zn1aiabbyxgaalszb2qjf9z64z960ks5fvz8nh7n6y7ny4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popup-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popup-complete";
           sha256 = "04bpm31zx87j390r2xi1yl4kyqgalmyqc48xarsm67zfww9fw9c1";
           name = "popup-complete";
         };
@@ -19919,7 +20276,7 @@
           sha256 = "083q5q53j1dcv4m2jdamh28bdk6ajzcypmyb3xr52dnqdm3bw6im";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popup-imenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popup-imenu";
           sha256 = "0lxwfaa9vhdn55dj3idp8c3fg1g26qsqq46y5bimfd0s89bjbaxn";
           name = "popup-imenu";
         };
@@ -19940,7 +20297,7 @@
           sha256 = "0nips9npm4zmz3f37vvb4s0g1ci0p9cl6w0z4sc6agg4rybjhpdp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/popwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popwin";
           sha256 = "1zp54nv8rh0b3g8y5aj4793miiw2r1ijwbzq31lkwmbdr09mixmf";
           name = "popwin";
         };
@@ -19961,7 +20318,7 @@
           sha256 = "0w8bnspnk871qndp18hs0wk4x9x31xr9rwbvf5dc8mcbnj29ch33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pos-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pos-tip";
           sha256 = "13qjz112qlrnq34lr70087gshzq8m44knfl6694hfprzjgix84vh";
           name = "pos-tip";
         };
@@ -19982,7 +20339,7 @@
           sha256 = "1nx3b24i26kgm52xw21x4m15qjkxw3sg5r6qyvck0fyhj0gw69gr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/powerline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/powerline";
           sha256 = "0gsffr6ilmckrzifsmhwd42vr85vs42pc26f1205pbxb7ma34dhx";
           name = "powerline";
         };
@@ -20003,7 +20360,7 @@
           sha256 = "010b151wblgxlfpy590yanbl2r8qhpbqgi02v0pyir340frm9ngn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/powershell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/powershell";
           sha256 = "162k8y9k2n48whaq93sqk86zy3p9qvsfxgyfv9n1nvk4l5wn70wk";
           name = "powershell";
         };
@@ -20024,7 +20381,7 @@
           sha256 = "0pv671j8g09pn61kkfb3pa9axfa9zd2jdrkgr81rm2gqb2vh1hsq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ppd-sr-speedbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ppd-sr-speedbar";
           sha256 = "1m2918hqvb9c6rgb5szs95ds99gdjdxggcbdfqzmbb5sz2936av8";
           name = "ppd-sr-speedbar";
         };
@@ -20045,7 +20402,7 @@
           sha256 = "013fig9i4fyx16krp2vfv953p3rwdzr38zs6i50af4pqz4vrcfvh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pretty-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pretty-mode";
           sha256 = "1zxi4nj7vnchiiz1ndx17b719a1wipiqniykzn4pa1w7dsnqg21f";
           name = "pretty-mode";
         };
@@ -20066,7 +20423,7 @@
           sha256 = "08ljf39jfmfpdk36nws2dnwpm7y8252zsdprsc85hr1h1ig5xy15";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/processing-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/processing-mode";
           sha256 = "184yg9z14ighz9djg53ji5dgnb98dnxkkwx55m8f0f879x31i89m";
           name = "processing-mode";
         };
@@ -20087,7 +20444,7 @@
           sha256 = "08ljf39jfmfpdk36nws2dnwpm7y8252zsdprsc85hr1h1ig5xy15";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/processing-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/processing-snippets";
           sha256 = "09vkm9asmjz1in0f63s7bf4amifspsqf5w9pxiy5y0qvmn28fr2r";
           name = "processing-snippets";
         };
@@ -20108,7 +20465,7 @@
           sha256 = "0r32rjfsbna0g2376gdv0c0im1lzw1cwbp9690rgqjj95ls4saa3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/prodigy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/prodigy";
           sha256 = "032868bgy2wmb2ws48lfibs4118inpna7mmml8m7i4m4y9ll6g85";
           name = "prodigy";
         };
@@ -20129,7 +20486,7 @@
           sha256 = "1hv8ifrpwn434sm41vkgbwni21ma5kfybkwasi6zp0f2b5i9ziw7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-explorer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-explorer";
           sha256 = "076lzmyi1n7yrgdgyh9qinq271qk6k64x0msbzarihr3p4psrn8m";
           name = "project-explorer";
         };
@@ -20150,7 +20507,7 @@
           sha256 = "1x7hwda1w59b8hvzxyk996wdz6phs6rchh3f1ydf0ab6x7m7xvjr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-persist";
           sha256 = "0csjwj0qaw0hz2qrj8kxgxlixh2hi3aqib98vm19sr3f1b8qab24";
           name = "project-persist";
         };
@@ -20171,7 +20528,7 @@
           sha256 = "1nq320ph8fs9a197ji4mnw2xa24dld0r1nka476yvkg4azmcc9x8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-persist-drawer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-persist-drawer";
           sha256 = "1jv2y2hcqakyvfibclzm7g4diw0bvsv3a8fa43yf19wb64jm8hdb";
           name = "project-persist-drawer";
         };
@@ -20191,7 +20548,7 @@
           sha256 = "08dd2y6hdsj1rxcqa2hnjypnn9c2z43y7z2hz0fi4vny547qybz8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/project-root";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-root";
           sha256 = "0xjir204zk254y2x70k9vqwirx2ljmrikpsgn5kn170d1bxvhwmb";
           name = "project-root";
         };
@@ -20212,7 +20569,7 @@
           sha256 = "1rl6n6v9f4m7m969frx8b51a4lzfix2bxx6rfcfbh6kzhc00qnxf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projectile";
           sha256 = "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn";
           name = "projectile";
         };
@@ -20225,15 +20582,15 @@
     projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
     melpaBuild {
         pname = "projectile-rails";
-        version = "0.6.7";
+        version = "0.7.0";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "dee51e39003489ece8077750d3cf93dee6b373fa";
-          sha256 = "03z9zsldzj0nwksw3bj4j58p7n14n6cqv917pwn1sb67l0wziqg2";
+          rev = "21ce05e412b0efebfeab9f84d38c679758ddbf76";
+          sha256 = "0f0siz230xsv20h8wmwa1i8wdsp964y6qmb2i3l485yh03bz1x95";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projectile-rails";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projectile-rails";
           sha256 = "0fgvignqdqh0ma91z9385782l89mvwfn77rp1gmy8cbkwi3b7fkq";
           name = "projectile-rails";
         };
@@ -20254,7 +20611,7 @@
           sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projectile-sift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projectile-sift";
           sha256 = "1wbgpwq9yy3v7hqidaczrvvsw5ajj7m3n4gsy3b169xv5h673a0i";
           name = "projectile-sift";
         };
@@ -20275,7 +20632,7 @@
           sha256 = "1rw55w2fpb3rw7j136kclkhppz21f7d7di4cvlv7zj5zpdl5zz88";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/projekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projekt";
           sha256 = "1bhb24701flihl54w8xrj6yxhynpq4dk0fp5ciac7k28n4930lw8";
           name = "projekt";
         };
@@ -20296,7 +20653,7 @@
           sha256 = "1hq8426i8rpb3qzkd5akv3i08pa4jsp9lwsskn38bfgp71pwild2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/prompt-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/prompt-text";
           sha256 = "1b9sj9kzx5ydq2zsfmkwsx78pzg0vsvrn92397js6b2cm24vrwwc";
           name = "prompt-text";
         };
@@ -20317,7 +20674,7 @@
           sha256 = "18ap2liz5r5a8ja2zz9182fnfm47jnsbyblpq859zks356k37iwc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/prop-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/prop-menu";
           sha256 = "0dhy52fxxpa058mhhx0slw3sly3dlxm9vkax6fd1sap6f6v00p5i";
           name = "prop-menu";
         };
@@ -20338,7 +20695,7 @@
           sha256 = "03df8zvx2sry3jz2x4pi3l32qyfqa7w8kj8jdbz30nzy0h7aa070";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/protobuf-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/protobuf-mode";
           sha256 = "1hh0w93fg6mfwsbb9wvp335ry8kflj50k8hybchpjcn6f4x39xsj";
           name = "protobuf-mode";
         };
@@ -20359,7 +20716,7 @@
           sha256 = "0wgxrwl7dpy084sc76wiwpixycb171g7xwc66m5gnlrv79qyac73";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/psci";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/psci";
           sha256 = "0sgrz8byz2pcsad2pydinp4hh2xb48pdb03r93wg2vvyy8p15j9g";
           name = "psci";
         };
@@ -20380,7 +20737,7 @@
           sha256 = "0msa8c29djhy5h3zpdvx25f4y1c50rgsk8iz6r127psrxdlfrvg8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/psession";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/psession";
           sha256 = "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a";
           name = "psession";
         };
@@ -20401,7 +20758,7 @@
           sha256 = "1p0k770h96iw8bxm8ssi0a91m050s615q036870lrlsz35mzc5kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pt";
           sha256 = "0zmz1hcr4ajc2ydvpdxhy1dlhp7hvlkv6y6w1b79ffvq6acdd5mj";
           name = "pt";
         };
@@ -20422,7 +20779,7 @@
           sha256 = "15c2p5ffvkp80v6fvxa3bgrk8mj18famngqkz2dammxnbppvnvvz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/puml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/puml-mode";
           sha256 = "131ghjq6lsbhbx5hdg36swnkqijdb9bx6zg73hg0nw8qk0z742vn";
           name = "puml-mode";
         };
@@ -20443,7 +20800,7 @@
           sha256 = "1v48i37iqrrwbyy3bscicfq66vbbml4sg0f0n950bnk0qagjx8py";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/punctuality-logger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/punctuality-logger";
           sha256 = "0q9s74hkfqvcx67xpq9rlvh38nyjnz230bll6ks7y5yzxvl4qhcm";
           name = "punctuality-logger";
         };
@@ -20464,7 +20821,7 @@
           sha256 = "012lv7hrwlhvins81vw3yjkhdwbpi6g1dx55i101qyrpzv5ifngm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pungi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pungi";
           sha256 = "1v9fsd764z5wdcips63z53rcipdz7bha4q6s4pnn114jn3a93ls1";
           name = "pungi";
         };
@@ -20485,7 +20842,7 @@
           sha256 = "0xr3s56p6fbm6wgw17galsl3kqvv8c7l1l1qvbhbay39yzs4ff14";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/puppet-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/puppet-mode";
           sha256 = "1s2hap6fs6rg5q80dmzhaf4qqaf5sglhs8p896i3i5hq51w0ciyc";
           name = "puppet-mode";
         };
@@ -20506,7 +20863,7 @@
           sha256 = "1wk319akv0scvyyjsd48pisi2i1gkahhsan9hfszrs6xx3anvfd9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/purescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/purescript-mode";
           sha256 = "00gz752mh7144nsaka5q3q4681jp845kc5vcy2nbfnqp9b24l55m";
           name = "purescript-mode";
         };
@@ -20527,7 +20884,7 @@
           sha256 = "03ivg3ddhy5zh410wgwxa17m98wywqhk62jgijhjd00b6l8i4aym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pushbullet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pushbullet";
           sha256 = "1swzl25rcw7anl7q099qh14yhnwlbn3m20ib9kis0l1rv59kkarl";
           name = "pushbullet";
         };
@@ -20548,7 +20905,7 @@
           sha256 = "06xdq2slwhkcqlbv7x86zmv55drzif9cwjlj543cwhncphl2x9rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-autopep8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-autopep8";
           sha256 = "1argjdmh0x9c90zkb6cr4z3zkpgjp2mkpsw0dr4v6gg83jcggfpp";
           name = "py-autopep8";
         };
@@ -20569,7 +20926,7 @@
           sha256 = "0150q6xcnzzrkn9fa9njm973l1d49c48ad8qia71k4jwrxjjj6zr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-isort";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-isort";
           sha256 = "0k5gn3bjn5pv6dn6p0m9xghn0sx3m29bj3pfrmyh6gd5ic0l00yb";
           name = "py-isort";
         };
@@ -20590,7 +20947,7 @@
           sha256 = "09z739w4fjg9xnv3mbh7v8j59mnbsfq4ygq616pj4xcw3nsh0rbg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/py-yapf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-yapf";
           sha256 = "1381x0ffpllxwgkr2d8xxbv1nd4k475m1aff8l5qijw7d1fqga2f";
           name = "py-yapf";
         };
@@ -20611,7 +20968,7 @@
           sha256 = "0qg1kjzsv2mcvlsivqy8ys3djbs5yala37r9h2zcxdicl88q0l11";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pycarddavel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pycarddavel";
           sha256 = "12k2mnzkd8yv17csfhclsnd479vcabawmac23yw6dsw7ic53jf1a";
           name = "pycarddavel";
         };
@@ -20632,7 +20989,7 @@
           sha256 = "1y3q1k195wp2kgp00a1y34i20zm80wdv2kxigh6gbn2r6qzkqrar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pyenv-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pyenv-mode";
           sha256 = "00yqrk92knv9gq1m9xcg78gavv70jsjlwzkllzxl63iva9qrch59";
           name = "pyenv-mode";
         };
@@ -20653,7 +21010,7 @@
           sha256 = "0q6bib9nr6xiq6npzbngyfcjk87yyvwzq1zirr3z1h5wadm34lsk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-environment";
           sha256 = "1pq16rddw76ic5d02j5bswl9qcydi47hqmhs7r06jk46vsfzxpl7";
           name = "python-environment";
         };
@@ -20674,7 +21031,7 @@
           sha256 = "00i7cc4r7275l22k3708xi4hqw2j44yivdb1madzrpf314v3kabr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/python-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-x";
           sha256 = "115mvhqfa0fa8kdk64biba7ri4xjk74qqi6vm1a5z3psam9mjcmn";
           name = "python-x";
         };
@@ -20695,7 +21052,7 @@
           sha256 = "1af9cd8l5ac58mj92xc7a3diy995cv29abnbb3fl6x4208l4xs3c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pythonic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pythonic";
           sha256 = "1hq0r3vg8vmgw89wfjdqknwm76pimlk0dy56wmh9vffh06gqsb51";
           name = "pythonic";
         };
@@ -20716,7 +21073,7 @@
           sha256 = "0jidmc608amd0chs4598zkj0nvyll0al093121hkczsbpgbllq9z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/pyvenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pyvenv";
           sha256 = "0gai9idss1wvryxyqk3pv854mc2xg9hd0r55r2blql8n5rd2yv8v";
           name = "pyvenv";
         };
@@ -20737,7 +21094,7 @@
           sha256 = "110z27n3h7p2yalicfhnv832ikfcf7p0hrf5qkryz1sdmz79wb3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/qiita";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/qiita";
           sha256 = "1kzk7pc68ks9gxm2l2d28al23gxh56z0cmkl80qwg7sh4gsmhyxl";
           name = "qiita";
         };
@@ -20758,7 +21115,7 @@
           sha256 = "1mlka59gyylj4cabi1b552h11qx54kjqwx3bkmsdngjrd4da222a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/qml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/qml-mode";
           sha256 = "123mlibviplzra558x87da4zx0kpbhsgfigjjgjgp3mdg897084n";
           name = "qml-mode";
         };
@@ -20779,7 +21136,7 @@
           sha256 = "0lfmdlb626b3gbmlvacwn84vpqam6gk9lp29wk0hcraw69vaw1v8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quasi-monochrome-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quasi-monochrome-theme";
           sha256 = "0h5pqrklyga40jg8qc47lwmf8khn0vcs5jx2sdycl2ipy0ikmfs0";
           name = "quasi-monochrome-theme";
         };
@@ -20800,7 +21157,7 @@
           sha256 = "09sdv5lf5k347415r9fzljm374rb29gq6kldx2awd164fkdnm8ds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/quickrun";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quickrun";
           sha256 = "1szgirakfnkn9ksls16p233sr7x9ck5m1f1kbk6ancj36yja2nki";
           name = "quickrun";
         };
@@ -20821,7 +21178,7 @@
           sha256 = "02bddznlqys37fnhdpp2g9xa9m7kfgrj1vl0hc5kr42hggk9wwmg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/r-autoyas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/r-autoyas";
           sha256 = "18zifadsgbwnga205jvpx61wa2dvjxmxs5v7cjqhny45a524nbv4";
           name = "r-autoyas";
         };
@@ -20842,7 +21199,7 @@
           sha256 = "0pbswxzgfqcp6vjlwhvnablj91kxq588j2fmcjzhf0aigkj7dxfb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/racer";
           sha256 = "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi";
           name = "racer";
         };
@@ -20863,7 +21220,7 @@
           sha256 = "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rainbow-blocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rainbow-blocks";
           sha256 = "08p41wvrw1j3h7j7lyl8nxk1gcc2id9ikljmiklg0kc6s8ijhng8";
           name = "rainbow-blocks";
         };
@@ -20884,7 +21241,7 @@
           sha256 = "0gxc8j5a14bc9mp43cbcz41ipc0z1yvmypg52dnl8hadirry20gd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rainbow-delimiters";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rainbow-delimiters";
           sha256 = "132nslbnszvbgkl0819z811yar3lms1hp5na4ybi9gkmnb7bg4rg";
           name = "rainbow-delimiters";
         };
@@ -20905,7 +21262,7 @@
           sha256 = "05i0jpmxzsj2lsj48cafn3v93z37l7k5kaza2ik3yirdpjdibyrh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rainbow-identifiers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rainbow-identifiers";
           sha256 = "0lw790ymrgpyh0sxwmzinl2ik5vl5vggbg14cd0cx5yagkw5y3mp";
           name = "rainbow-identifiers";
         };
@@ -20926,7 +21283,7 @@
           sha256 = "1q65jj6bghvzhlqmpg61a7vn8izc01wp2fjiqx013zxpg9awvzmq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rake";
           sha256 = "0cw47g6cjnkh3z4hbwwq1f8f5vrvs84spn06k53bx898brqdh8ns";
           name = "rake";
         };
@@ -20947,7 +21304,7 @@
           sha256 = "0fkj89p0rb0r472p1rk8xpx8c74pg968pc2mmw3838y4fpc8i198";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ranger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ranger";
           sha256 = "14g4r4iaz0nzfsklslrswsik670pvfd0605xfjghvpngn2a8ych4";
           name = "ranger";
         };
@@ -20968,7 +21325,7 @@
           sha256 = "1i16361klpdsxphcjdpxqswab3ing69j1wb9nygws7ghil85h0bx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rase";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rase";
           sha256 = "1g7v2z7l4csl5by64hc3zg4kgrkvv81iq30mfqq4nvy1jc0xa6j0";
           name = "rase";
         };
@@ -20989,7 +21346,7 @@
           sha256 = "09c6v4lnv6vm2cckbdpx2fdi9xkz9l68qvhx35vaawxhrkgvypzp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rbenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rbenv";
           sha256 = "09nw7sz6rdgs7hdw517qwgzgyrdmxb16sgldfkifk41rhiyqhr65";
           name = "rbenv";
         };
@@ -21010,7 +21367,7 @@
           sha256 = "0yhmdkvswnn5rga5xzysfpivbz9wdkzbm49licilc2fp1dgcvd6i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rcirc-styles";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rcirc-styles";
           sha256 = "01dxhnzsnljig769dk9axdi970b3lw2s6p1z3ljf29qlb5j4548r";
           name = "rcirc-styles";
         };
@@ -21031,7 +21388,7 @@
           sha256 = "0r95fzi0x8r18x7r574mp503qaiqyicrq78zlggyz6qihi95pmqj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rdf-prefix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rdf-prefix";
           sha256 = "1vxgn5f2kws17ndfdv1vj5p9ks3rp6sikzpc258j07bhsfpjz5qm";
           name = "rdf-prefix";
         };
@@ -21052,7 +21409,7 @@
           sha256 = "1ka5q2q18hgh7wl5yn04489121bq4nx369rz8nb7dr5l14cas0xm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/real-auto-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/real-auto-save";
           sha256 = "03dbbizpyg62v6zbq8hd16ikrifz8m2bdlbb3g67f2834xqmxha8";
           name = "real-auto-save";
         };
@@ -21073,7 +21430,7 @@
           sha256 = "07j1grdbqv3iv5ghmgsjw678bxjajcxi27clz4krcz3ys5b1h70v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/realgud";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/realgud";
           sha256 = "15vlln4w4wlgrk5i5nhgvjcbardpahgs9kwwayb1vmj10c8a837s";
           name = "realgud";
         };
@@ -21094,7 +21451,7 @@
           sha256 = "114ssmby614xjs7mrpbbsdd4gj5ra6klfh8h6z8iij8xn3kii83q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/recover-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/recover-buffers";
           sha256 = "0g40d7440hzlc9b45v63ng0anvmgip4dhbd9wcm2sn8qjfr4w11b";
           name = "recover-buffers";
         };
@@ -21115,7 +21472,7 @@
           sha256 = "1vpsihrl03hkd6n6b7mrjccm0a023qf3154a8rw4chihikxw27pj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rect+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rect+";
           sha256 = "0vk0jwpl6yp2md9nh0ghp2qn883a8lr3cq8c9mgq0g552dwdiv5m";
           name = "rect-plus";
         };
@@ -21136,7 +21493,7 @@
           sha256 = "048pjrd04w6w4v6r56yblbqgkjh01xib7k1i6rjc6288jh5vr1vm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rectangle-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rectangle-utils";
           sha256 = "1w5z2gykydsfp30ahqjihpvq04c5v0cfslbrrg429hycys8apws7";
           name = "rectangle-utils";
         };
@@ -21157,7 +21514,7 @@
           sha256 = "19c5rkb4nn6fs85lixrgrv8gagr69h430inig31dvm4fip9xdjp9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/redpen-paragraph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/redpen-paragraph";
           sha256 = "0jr707ik6fhznq0q421l986w85ah0n9b4is91zrgbk1v6miqrhca";
           name = "redpen-paragraph";
         };
@@ -21178,7 +21535,7 @@
           sha256 = "1r8fhs7d2vkrbv15ic2bm79i9a8swbc38vk566vnxkhl3rfd5a0a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/relative-line-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/relative-line-numbers";
           sha256 = "0mj1w5a4ax8hwz41vn02bacxlnifd14hvf3p288ljvwchvlf0hn3";
           name = "relative-line-numbers";
         };
@@ -21199,7 +21556,7 @@
           sha256 = "0lqbhwi1f8b4sv9p1rf0gyjllk0l7g6v6mlws496079wxx1n5j66";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/relax";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/relax";
           sha256 = "0gfr4ym6aakawhkfz40ar2n0rfz503hq428yj6rbf7jmq3ajaysk";
           name = "relax";
         };
@@ -21220,7 +21577,7 @@
           sha256 = "007lqahjbig6yygqik6fgbq114784z6l40a3vrc4qs9361zqizck";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/repeatable-motion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/repeatable-motion";
           sha256 = "12z4z8apd8ksf6dfvqm54l71mx68j0yg4hrjypa9p77fpcd6p0zw";
           name = "repeatable-motion";
         };
@@ -21233,15 +21590,15 @@
     repl-toggle = callPackage ({ fetchFromGitHub, fetchurl, fullframe, lib, melpaBuild }:
     melpaBuild {
         pname = "repl-toggle";
-        version = "0.3.0";
+        version = "0.3.3";
         src = fetchFromGitHub {
           owner = "tomterl";
           repo = "repl-toggle";
-          rev = "84541e0d734d6608bc8bff87c997aaefe5e1f092";
-          sha256 = "14ij4daddbkpay28g15zfafslh7fd5265j7az0gagvx4qymgficn";
+          rev = "0249c2a72e6bf782c2c15b0cb1d925410543184f";
+          sha256 = "12wylmyz54n1f3kaw9clhvs66dg43xvcvll4pl5ii0ibfv6pls1b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/repl-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/repl-toggle";
           sha256 = "1jyaksxgyygfv1wn9c6y8sykb4hicwgs9n5vrdikd2i0iix29zpb";
           name = "repl-toggle";
         };
@@ -21262,7 +21619,7 @@
           sha256 = "1pxvwiqhv2nmsxkdwn9jx7na1vgk9dg9yxidglxpmvpid6fy4qdk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/replace-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/replace-symbol";
           sha256 = "07ljmw6aw9hsqffhwmiq2pvhry27acg6f4vgxgi91vjr8jj3r4ng";
           name = "replace-symbol";
         };
@@ -21283,7 +21640,7 @@
           sha256 = "0hs80g3npgb6qfcaivdfkpsc9mss1kdmyp5j7s922qcy2k4yxmgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/repo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/repo";
           sha256 = "0z4lcswh0c6xnsxlv33bsxh0nh26ydzfl8sv8xabdp5a2gk6bhpb";
           name = "repo";
         };
@@ -21304,7 +21661,7 @@
           sha256 = "1xzp2hnkr9lsjx50cxlpki9mvyhjsv0vyc77480jrlnpspakj7qs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/req-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/req-package";
           sha256 = "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf";
           name = "req-package";
         };
@@ -21325,7 +21682,7 @@
           sha256 = "0j7nakxj750rhdnm0nk075s7rx38rc9npbb55kg7r9vb2qilnvmr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/request";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/request";
           sha256 = "09gxfy34a13wr0agmhn0nldxaiyc72rx9xi56jirsvji4dg5j6mm";
           name = "request";
         };
@@ -21346,7 +21703,7 @@
           sha256 = "0j7nakxj750rhdnm0nk075s7rx38rc9npbb55kg7r9vb2qilnvmr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/request-deferred";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/request-deferred";
           sha256 = "19s8q9a01v0g897s9ass1mr5wbzy82rrfcnqpvcvp05q4y787dn9";
           name = "request-deferred";
         };
@@ -21367,7 +21724,7 @@
           sha256 = "1b832r7779rmr6rhzj7klc0l5xzwc4rids87g2hczpb5dhqnchca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/requirejs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/requirejs";
           sha256 = "09z6r9wcag3gj075wq215zcslyknl1izap595rn48xvizxi06c6k";
           name = "requirejs";
         };
@@ -21388,7 +21745,7 @@
           sha256 = "1ywcnrrr4wp6c951mqfscvdgcmwyvxy80p40vi27nzbl977lb1xv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/resize-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/resize-window";
           sha256 = "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l";
           name = "resize-window";
         };
@@ -21409,7 +21766,7 @@
           sha256 = "0y4ga1lj2x2f0r535ivs09m2l0q76iz72w42wknhsw9lmdsyl5nz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/restart-emacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/restart-emacs";
           sha256 = "03aabz7fmy99nwimvjn7qz6pvc94i470hfgiwmjz3348cw02k0n6";
           name = "restart-emacs";
         };
@@ -21430,7 +21787,7 @@
           sha256 = "1q13cgpz4wzhnqv84ablawy3y2wgdwy46sp7454mmfx9m77jzb2v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/reveal-in-osx-finder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/reveal-in-osx-finder";
           sha256 = "00jgrmh5s3vlpj1jjf8l3c3h4hjk5x781m95sidw6chimizvfmfc";
           name = "reveal-in-osx-finder";
         };
@@ -21451,7 +21808,7 @@
           sha256 = "15xnz4fi22wsximimwmirlz11v4ksfj8nilyjfw6acd92yrhzg6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/reverse-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/reverse-theme";
           sha256 = "1lq8nwhf8n5i280v0kqksndm4b3n6x34wnd5fa5i48ljwr5cinih";
           name = "reverse-theme";
         };
@@ -21472,7 +21829,7 @@
           sha256 = "11hwf9y5ax207w6rwrsmi3pmn7pn7ap6iys0z8hni2f5zzxjrmx3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rich-minority";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rich-minority";
           sha256 = "11xd76w5k3b3q5bxqjb55vi6dsal9drvyc1nh7z83awm59hvgczc";
           name = "rich-minority";
         };
@@ -21493,7 +21850,7 @@
           sha256 = "0p044wg9d4i6f5x7bdshmisgwvw424y16lixac93q6v5bh3xmab5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rigid-tabs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rigid-tabs";
           sha256 = "06n0bcvc3nnp84pcq3lywwga7l92jz8hnkilhbq59kydf5zbjldp";
           name = "rigid-tabs";
         };
@@ -21514,7 +21871,7 @@
           sha256 = "1wqhqv2fc5h10igv1php51bayx0s7qw4m9gzx9by80dab8lwa0vk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rinari";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rinari";
           sha256 = "0qknicg3vzl7zbkwsdvp10hrvlng6mbi8hgslx4ir522dflrf9p0";
           name = "rinari";
         };
@@ -21535,7 +21892,7 @@
           sha256 = "1drvyf5asjp3lgpss7llff35q8r89vmh73n1axaj2qp9jx5a5jih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rnc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rnc-mode";
           sha256 = "09ly7ln6qrcmmim9bl7kd50h4axrhy6ig406r352xm4a9zc8n22q";
           name = "rnc-mode";
         };
@@ -21548,15 +21905,15 @@
     robe = callPackage ({ fetchFromGitHub, fetchurl, inf-ruby, lib, melpaBuild }:
     melpaBuild {
         pname = "robe";
-        version = "0.7.8";
+        version = "0.7.9";
         src = fetchFromGitHub {
           owner = "dgutov";
           repo = "robe";
-          rev = "c5a0ae6f68c699ec3cdbb73a3e01e76f62d75f48";
-          sha256 = "1fckb18x9ikm6dlwwdfg9q4wyjjwdqy3r1w2ic01xb0dbyls41gw";
+          rev = "7c56895b6c2fd5d6c9572182f5de10ebe5bfc977";
+          sha256 = "01xd3nc7bmf4r4d37x08rw2dlsg6gns8mraahi4rwkg6a9lwl44n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/robe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/robe";
           sha256 = "19py2lwi7maya90kh1mgwqb16j72f7gm05dwla6xrzq1aks18wrk";
           name = "robe";
         };
@@ -21569,15 +21926,15 @@
     roguel-ike = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "roguel-ike";
-        version = "0.1";
+        version = "0.1.1";
         src = fetchFromGitHub {
           owner = "stevenremot";
           repo = "roguel-ike";
-          rev = "6d9322ad9d43d0c7465f125c8e08b222866e6923";
-          sha256 = "108j3106n9anas07mj26xlrvscsl5irshd39czkippla84gwmgyc";
+          rev = "706dcb0687e8016d7d776f9d9e5ace9fdbbca43c";
+          sha256 = "0rgv4y9aa5cc2ddz3y5z8d22xmr8kf5c60h0r3g8h91jmcw3rb4z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/roguel-ike";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/roguel-ike";
           sha256 = "1a7sa6nhgi0s4gjh55bhk5cg6q6s7564fk008ibmrm05gfq9wlg8";
           name = "roguel-ike";
         };
@@ -21598,7 +21955,7 @@
           sha256 = "133ficdghshlmwq5dn42cg3h51jdg4lcwqr4cd2s2s52rz8plw9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rope-read-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rope-read-mode";
           sha256 = "0grnn5k6rbck0hz4c6cadgj3a4dv62habyingznisg2kx9i3m0dw";
           name = "rope-read-mode";
         };
@@ -21619,7 +21976,7 @@
           sha256 = "0mfkq8n28lal4lqwp6v0ilz8wrwgg61sbm0jggznwisjqqy3lzrh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rsense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rsense";
           sha256 = "1901xqlpc8fg4sl9j58jn40i2djs8s0cdcqcrzrq02lvk8ssfdf5";
           name = "rsense";
         };
@@ -21640,7 +21997,7 @@
           sha256 = "0hrn5n7aaymwimk511kjij44vqaxbmhly1gwmlmsrnbvvma7f2mp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rspec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rspec-mode";
           sha256 = "0nyib9rx9w9cbsgkcjx9n8fp77xkzxg923z0rdm3f9kc7njcn0zx";
           name = "rspec-mode";
         };
@@ -21653,16 +22010,16 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "2.0";
+        version = "2.1";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "ba85598841648490e64246be802fc2dcdd45bc3c";
-          sha256 = "0ndyvpgbvfcnxf74ffaby36rqsnwj10j1s9vr3gan9mqi6spcggf";
+          rev = "ad85fda48b8c1038bc90c9fb0e8e79f2c5e30bca";
+          sha256 = "0shzxxx7qajmfrxqipmlak899hgmxkqf9zkbmr0g04wamxmyfs65";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rtags";
-          sha256 = "16jvbr4nm48p3dj9wmysjaxyz4ajcay19risqrs9fzrifkr21c9p";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rtags";
+          sha256 = "08clwydx2b9cl4wv61b0p564jpvq7gzkrlcdkchpi4yz6djbp0lw";
           name = "rtags";
         };
         packageRequires = [];
@@ -21682,7 +22039,7 @@
           sha256 = "10djjp1520xc05qkciaiaiiciscaln6c74h7ymba40mvzlf67y9q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rubocop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rubocop";
           sha256 = "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q";
           name = "rubocop";
         };
@@ -21703,7 +22060,7 @@
           sha256 = "1wqhqv2fc5h10igv1php51bayx0s7qw4m9gzx9by80dab8lwa0vk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-compilation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-compilation";
           sha256 = "1x1vpkjpx95sfcjhkx4cafypj0nkbd1i0mzxx3lmcrsmg8iv0rjc";
           name = "ruby-compilation";
         };
@@ -21724,7 +22081,7 @@
           sha256 = "1cpz9vkp57nk682c5xm20g7bfj5g2aq5ahpk4nhgx7pvd3xvr1ds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-end";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-end";
           sha256 = "0cx121hji8ws6s3p2xfdgidm363y05g2n880fqrmzyz27cqkljis";
           name = "ruby-end";
         };
@@ -21745,7 +22102,7 @@
           sha256 = "01n9j7sag49m4bdl6065jklnxnc5kck51izg884s1is459qgy86k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-hash-syntax";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-hash-syntax";
           sha256 = "0bvwyagfh7mn457iibrpv1ay75089gp8pg608gbm24m0ix82xvb5";
           name = "ruby-hash-syntax";
         };
@@ -21766,7 +22123,7 @@
           sha256 = "008zj9rg2cmh0xd7g6kgx6snm5sspxs4jmfa8hd43wx5y9pmlb8f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-test-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-test-mode";
           sha256 = "113ysf08bfh2ipk55f8h741j05999yrgx57mzh53rim5n63a312w";
           name = "ruby-test-mode";
         };
@@ -21787,7 +22144,7 @@
           sha256 = "1zvhq9l717rjgkm7bxz5gqkmh5i49cshwzlimb3h78kpjw3hxl2k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ruby-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-tools";
           sha256 = "1zs2vzcrw11xyj2a7lgqzw4slcha20206jvjbxkm68d57rffpk8y";
           name = "ruby-tools";
         };
@@ -21808,7 +22165,7 @@
           sha256 = "0iblk0vagjcg3c8q9hlpwk7426ms7aq0s80izgvascfmyqycv6qm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/rvm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rvm";
           sha256 = "08i7cmav2cz73jp88ww0ay2yjhk9dj8146836q4sij1bl1slbaf8";
           name = "rvm";
         };
@@ -21829,7 +22186,7 @@
           sha256 = "08vf62fcrnbmf2ppb759kzznjdz8x72fqdwbc4n8nbswrwgm2ikl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/s";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/s";
           sha256 = "0b2lj6nj08pk5fnxvjkc1d9hvi29rnjjy4n5ns4pq6wxpfnlcw64";
           name = "s";
         };
@@ -21850,7 +22207,7 @@
           sha256 = "06gqqbkn85l2p05whmr4wkg9axqyzb7r7sgm3r8wfshm99kgpxvl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sackspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sackspace";
           sha256 = "1m10iw83k6m7v7sg2dxzdy83zxq6svk8h9fh4ankyn3baqrdxg5z";
           name = "sackspace";
         };
@@ -21871,7 +22228,7 @@
           sha256 = "0aw95qkql6apyn79la0jbpr0nlixhl9zvi9miry2h5y5pawb3yvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sage-shell-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sage-shell-mode";
           sha256 = "18k7yh8rczng0kn2wsawjml70cb5bnc5jr2gj0hini5f7jq449wx";
           name = "sage-shell-mode";
         };
@@ -21892,7 +22249,7 @@
           sha256 = "0lxrq3mzabkwj5bv0mgd7fnx3dsx8vxd5kjgb79rjfra0m7pfgln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sass-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sass-mode";
           sha256 = "1byjk5zpzjlyiwkp780c4kh7s9l56y686sxji89wc59d19rp8800";
           name = "sass-mode";
         };
@@ -21913,7 +22270,7 @@
           sha256 = "1mcag7qad1npjn096byakb8pmmi2g64nlf2vcc12irzmwia85fml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sauron";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sauron";
           sha256 = "01fk1xfh7r16fb1xg5ibbs7gci9dja49msdlf7964hiq7pnnhxgb";
           name = "sauron";
         };
@@ -21934,7 +22291,7 @@
           sha256 = "1gh97rc528cpam3jsncc03cyf4pps71b8blmdikml71lks07lgwb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/save-sexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/save-sexp";
           sha256 = "12jx47picdpw668q75qsp9gncrnxnlk1slhzvxsk5pvkdwh26h66";
           name = "save-sexp";
         };
@@ -21955,7 +22312,7 @@
           sha256 = "0y846zmcz5x2jn5bndm0mfi18jc5cd1fkidgc4wvqmm0w30gyx4q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sbt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sbt-mode";
           sha256 = "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8";
           name = "sbt-mode";
         };
@@ -21976,7 +22333,7 @@
           sha256 = "1gfhk595vnf6565nv6m1v8dc4a3a9z34jj1qdh02lk8azg5ylk89";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scala-mode2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scala-mode2";
           sha256 = "0rnkln6jwwqc968w3qpc6zjjv8ylw0w6c2hsjpq2slja3jn5khch";
           name = "scala-mode2";
         };
@@ -21997,7 +22354,7 @@
           sha256 = "0hhsgyil8aqdkkip5325yrdq89gnijglcbf1dsvl4wvnmq7a1rik";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scala-outline-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scala-outline-popup";
           sha256 = "1fq0k6l57wkya1ycm4cc190kg90j2k9clnl0sc70achp4i47qbk7";
           name = "scala-outline-popup";
         };
@@ -22018,7 +22375,7 @@
           sha256 = "13s8hp16wxd9fb8gf05dn0xr692kkgiqg7v49fgr00gas4xgpfpm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scpaste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scpaste";
           sha256 = "02dqmx6v3jxdn5yz1z74624sc6sz2bm4qjyi78w9akhp2jplwlk1";
           name = "scpaste";
         };
@@ -22039,7 +22396,7 @@
           sha256 = "0zpjf9cp8g4rgnwgmhlpwnanf9lzqm3rm1mkihf0gk5qzxvwsdh9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/scss-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scss-mode";
           sha256 = "1g27xnp6bjaicxjlb9m0njc6fg962j3hlvvzmxvmyk7gsdgcgpkv";
           name = "scss-mode";
         };
@@ -22060,7 +22417,7 @@
           sha256 = "08yc67a4ji7z8s0zh500wiscziqsxi92i1d33fjla2mcr8sxxn0i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/search-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/search-web";
           sha256 = "0qqx9l8dn1as4gqpq80jfacn6lz0132m91pjzxv0fx6al2iz0m36";
           name = "search-web";
         };
@@ -22081,7 +22438,7 @@
           sha256 = "0nsm7z056rh32sq7abgdwyaz4dbz8v9pgbha5jvpk7y0zmnabrgs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sekka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sekka";
           sha256 = "1jj4ly9p7m3xvb31nfn171lbpm9y70y8cbf8p24w0fhv665dx0cp";
           name = "sekka";
         };
@@ -22102,7 +22459,7 @@
           sha256 = "18xdkisxvdizsk51pnyimp9mwc6k9cpcxqr5hgndkz9q97p5dp79";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/selectric-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/selectric-mode";
           sha256 = "1k4l0lr68rqyi37wvqp1cnfci6jfkz0gvrd1hwbgx04cjgmz56n4";
           name = "selectric-mode";
         };
@@ -22123,7 +22480,7 @@
           sha256 = "15lx6qvmq3vp84ys8dzbx1nzxcnzlq41whawc2yhrnd1dbq4mv2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/servant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/servant";
           sha256 = "048xg0gcwnf4l2p56iw4iawi3ywjz7f6icnjfi8qzk1z912iyl9h";
           name = "servant";
         };
@@ -22144,7 +22501,7 @@
           sha256 = "1h58q41wixjlapia1ggf83jxcllq7492k55mc0fq7hbx3hw1q1y2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/serverspec";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/serverspec";
           sha256 = "001d57yd0wmz4d7qmhnanac8g29wls0sqw194003hrgirakg82id";
           name = "serverspec";
         };
@@ -22165,7 +22522,7 @@
           sha256 = "0sp952abz7dkq8b8kkzzmnwnkq5w15zsx5dr3h8lzxb92lnank9v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/session";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/session";
           sha256 = "0fghxbnf1d5iyrx1q8xd0lbw9nvkdgg2v2f89j6apnawisrsbhwx";
           name = "session";
         };
@@ -22186,7 +22543,7 @@
           sha256 = "11h5z2gmwq07c4gqzj2c9apksvqk3k8kpbb9kg78bbif2xfajr3m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sexp-move";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sexp-move";
           sha256 = "0lcxmr2xqh8z7xinxbv1wyrh786zlahhhj5nnbv83i8m23i3ymmd";
           name = "sexp-move";
         };
@@ -22207,7 +22564,7 @@
           sha256 = "0yy162sz7vwj0i9w687a5x1c2fq31vc3i6gqhbywspviczdp4q1y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shackle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shackle";
           sha256 = "159z0cwg7afrmym0xk902d8z093sqv39jig25ds7z4a224yrv5w6";
           name = "shackle";
         };
@@ -22228,7 +22585,7 @@
           sha256 = "11g9lsgakq8nf689k49p9l536ffi62g3bh11mh9ix1l058xamqw2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shampoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shampoo";
           sha256 = "01ssgw4cnnx8d86g3r1d5hqcib4qyhmpqvcvx47xs7zh0jscps61";
           name = "shampoo";
         };
@@ -22249,7 +22606,7 @@
           sha256 = "0fzywfdaisvvdbcl813n1shz0r8v1k9kcgxgynv5l0i4nkrgkww5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-pop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-pop";
           sha256 = "02s17ln0hbi9gy3di8fksp3mqc7d8ahhf5vwyz4vrc1bg77glxw8";
           name = "shell-pop";
         };
@@ -22270,7 +22627,7 @@
           sha256 = "0mcxp74sk9bn36gbhhimgns07iqa4dgbq2pvpqy41igqwb84w306";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-split-string";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-split-string";
           sha256 = "1yj1h7za4ylxh2nikj7s1qqlilpsk05x9571a2fymfyznm3iq77m";
           name = "shell-split-string";
         };
@@ -22291,7 +22648,7 @@
           sha256 = "0ia7sdip4hl27avckv3qpqgm3k4ynvp3xxq1cy53bqfzzx0gcria";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-switcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-switcher";
           sha256 = "07g9naiv2jk9jxwjywrbb05dy0pbfdx6g8pkra38rn3vqrjzvhyx";
           name = "shell-switcher";
         };
@@ -22312,7 +22669,7 @@
           sha256 = "0wvaa5nrbblayjvzjyj6cd942ywg7xz5d8fqaffxcvwlcdihvm7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shell-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-toggle";
           sha256 = "1ai0ks7smr8b221j9hmsikswpxqraa9b13fpwv4wwagavnlah446";
           name = "shell-toggle";
         };
@@ -22333,7 +22690,7 @@
           sha256 = "1nli26llyfkj1cz2dwn18c5pz1pnpz3866hapfibvdmwrg4z6cax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shelldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shelldoc";
           sha256 = "1xlp03aaidp7dp8349v8drzhl4lcngvxgdrwwn9cahfqlrvvbbbx";
           name = "shelldoc";
         };
@@ -22354,7 +22711,7 @@
           sha256 = "0mn7bwvj1yv75a2531jp929j6ypckdfqdg6b5ig0kkbcrrwb7kxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shelltest-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shelltest-mode";
           sha256 = "1inb0vq34fbwkr0jg4dv2lljag8djggi8kyssrzhfawri50m81nh";
           name = "shelltest-mode";
         };
@@ -22375,7 +22732,7 @@
           sha256 = "1vf766ja8f4xp1f5pmwgz6a85km0nxvc5dn571lwidfrrdbr9rkk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shm";
           sha256 = "1qmp8cc83dcz25xbyqd4987i0d8ywvh16wq2wfs4km3ia8a2vi3c";
           name = "shm";
         };
@@ -22396,7 +22753,7 @@
           sha256 = "09454mcjd8n1090pjc5mk1dc6bn3bgh60ddpnv9hkajkzpcjxx4h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shpec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shpec-mode";
           sha256 = "155hc1nym3fsvflps8d3ixaqw1cafqp97zcaywdppp47n7vj8zjl";
           name = "shpec-mode";
         };
@@ -22417,7 +22774,7 @@
           sha256 = "050gmxdk88zlfjwi07jsj2mvsfcv5imhzcpa6ip3cqkzpmw3pl32";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shrink-whitespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shrink-whitespace";
           sha256 = "12if0000i3rrxcm732layrv2h464wbb4xflbbfc844c83dbx1jmq";
           name = "shrink-whitespace";
         };
@@ -22438,7 +22795,7 @@
           sha256 = "103yvfgkj78i4bnv1fwk76izsa8h4wyj3vwj1vq7xggj607hkxzq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shut-up";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shut-up";
           sha256 = "1bcqrnnafnimfcg1s7vrgq4cb4rxi5sgpd92jj7xywvkalr3kh26";
           name = "shut-up";
         };
@@ -22459,7 +22816,7 @@
           sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sift";
           sha256 = "0mv5zk140kjilwvzccj75ym7wlkkqryb532mbsy7i9bs3q7m916d";
           name = "sift";
         };
@@ -22480,7 +22837,7 @@
           sha256 = "1qmkc0w28l53zzf5yd2grrk1sq222g5qnsm35ph25s1cfvc1qb2g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simple-httpd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simple-httpd";
           sha256 = "18dharsdiwfkmhd9ibz9f47yfq9c2d78i886pi6gsjh8iwcpzx59";
           name = "simple-httpd";
         };
@@ -22501,7 +22858,7 @@
           sha256 = "0v0vmkix9f0hb2183irr6xra8mwi47g6rn843sas7jy2ycaqd91v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simpleclip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simpleclip";
           sha256 = "07qkfwlg8vw5kb097qbsv082hxir047q2bcvc8scbak2dr6pl12s";
           name = "simpleclip";
         };
@@ -22522,7 +22879,7 @@
           sha256 = "04giklbd1fsw2zysr7aqg17h6cpyn4i9jbknm4d4v6581f2pcl93";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simplenote2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simplenote2";
           sha256 = "1qdzbwhzmsga65wmrd0mb3rbs71nlyqqb6f4v7kvfxzyis50cswm";
           name = "simplenote2";
         };
@@ -22543,7 +22900,7 @@
           sha256 = "1p1771qm3jndnf4rdhb1bri5cjiksvxizagi7vfb7mjmsmx18w61";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/simplezen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simplezen";
           sha256 = "13f2anhfsxmx1vdd209gxkhpywsi3nn6pazhc6bkswmn27yiig7j";
           name = "simplezen";
         };
@@ -22553,6 +22910,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    sisyphus = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, m-buffer, melpaBuild }:
+    melpaBuild {
+        pname = "sisyphus";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "phillord";
+          repo = "sisyphus";
+          rev = "880d519d6b1e7202a72b1632733690310efb197f";
+          sha256 = "0jy08kj7cy744lbdyil0j50b08vm76bzxwmzd99v4sz12s3qcd2s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sisyphus";
+          sha256 = "08400jazj7w63l8g9ypy6w9dj8r0xh4d2yg3nfwqqf5lhfnj9bnj";
+          name = "sisyphus";
+        };
+        packageRequires = [ dash emacs m-buffer ];
+        meta = {
+          homepage = "http://melpa.org/#/sisyphus";
+          license = lib.licenses.free;
+        };
+      }) {};
     skeletor = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "skeletor";
@@ -22564,7 +22942,7 @@
           sha256 = "101xn4glqi7b5vhdqqahj2ib4pm30pzq8sad7zagxw9csihcri3q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/skeletor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/skeletor";
           sha256 = "1vfvg5l12dzksr24dxwc6ngawsqzpxjs97drw48qav9dy1vyl10v";
           name = "skeletor";
         };
@@ -22585,7 +22963,7 @@
           sha256 = "0g5sapd76pjnfhxlw149zj0fpn6l3pz3l8qlcn2c237vm8vn6qv3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/skewer-less";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/skewer-less";
           sha256 = "0fhv5cnp5bgw3krfmb0jl18kw2hzx2p81falj57lg3p8rn23dryl";
           name = "skewer-less";
         };
@@ -22606,7 +22984,7 @@
           sha256 = "05jndz0c26q60s416vqgvr66axdmxb7qsr2g70fvl5iqavnayhpv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/skewer-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/skewer-mode";
           sha256 = "1zp4myi9f7pw6zkgc0xg12585iihn7khcsf20pvqyc0vn4ajdwqm";
           name = "skewer-mode";
         };
@@ -22627,7 +23005,7 @@
           sha256 = "09ccdgg2wgw3xmlkpjsaqmnmf7f8rhjy4g6ypsn1sk5rgbgk8aj8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slamhound";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slamhound";
           sha256 = "14zlcw0zw86awd6g98l4h2whav9amz4m8ik877d1wsdjf69g7k9x";
           name = "slamhound";
         };
@@ -22648,7 +23026,7 @@
           sha256 = "0rk12am1dq52khwkwrmg70zarhni2avj4sy44jqckb4x7sv7djfk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slideview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slideview";
           sha256 = "0zr08yrnrz49zds1651ysmgjqgbnhfdcqbg90sbsb086iw89rxl1";
           name = "slideview";
         };
@@ -22669,7 +23047,7 @@
           sha256 = "1cl8amk1kc7a953l1khjms04j40mfkpnbsjz3qa123msgachrsg7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slim-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slim-mode";
           sha256 = "1hip0r22irr9sah3b65ky71ic508bhqvj9hj95a81qvy1zi9rcac";
           name = "slim-mode";
         };
@@ -22682,15 +23060,15 @@
     slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "slime";
-        version = "2.15";
+        version = "2.16";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "da7c32d0c54a6f2d9a4be0662c7b2d576b11eda1";
-          sha256 = "10ydinwsm7m5jlggynhsihxl18zl8cph4rliic8i72hjc3nhqfmy";
+          rev = "0d8c192c12a0a3d055f9bf4cc554083fc931995c";
+          sha256 = "1sx7g0g2j3pz9gqj76773asv1912c0p4zmh3jbssnyy2vp942h27";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime";
           sha256 = "04zcvjg0bbx5mdbsk9yn7rlprakl89dq6jmnq5v2g0n6q0mh6ign";
           name = "slime";
         };
@@ -22711,7 +23089,7 @@
           sha256 = "0rdhd6kymbzhkc96dxy3nr21ajrkc7iy6zvq1va22r90f96jj9x4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime-company";
           sha256 = "195s5fi2dl3h2jyy4d45q22jac35sciz81n13b4lgw94mkxx4rq2";
           name = "slime-company";
         };
@@ -22732,7 +23110,7 @@
           sha256 = "0lp584k35asqlvbhglv124jazdgp3h7pzl0akfwbdmby9zayqk96";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime-ritz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime-ritz";
           sha256 = "1y1439y07l1a0sp9wn110hw4yyxj8n1cnd6h17rmsr549m2qbg1a";
           name = "slime-ritz";
         };
@@ -22753,7 +23131,7 @@
           sha256 = "00v4mh04affd8kkw4rn51djpyga2rb8f63mgy86napglqnkz40r3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/slime-volleyball";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime-volleyball";
           sha256 = "1dzvj8z3l5l9ixjl3nc3c7zzi23zc2300r7jzw2l3bvg64cfbdg7";
           name = "slime-volleyball";
         };
@@ -22774,7 +23152,7 @@
           sha256 = "1aihr5pbdqjb5j6xsghi7qbrmp46kddv76xmyx5z98m93n70wzqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sly";
           sha256 = "1pmyqjk8fdlzwvrlx8h6fq0savksfny78fhmr8r7b07pi20y6n9l";
           name = "sly";
         };
@@ -22795,7 +23173,7 @@
           sha256 = "11p89pz6zmnjng5177w31ilcmifvnhv9mfjy79ic7amg01h09hsr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sly-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sly-company";
           sha256 = "1n8bx0qis2bs49c589cbh59xcv06r8sx6y4lxprc9pfpycx7h6v2";
           name = "sly-company";
         };
@@ -22816,7 +23194,7 @@
           sha256 = "0yvlmwnhdph5qj1998jz0idcl7901j6fxa9hivr7kic57j8kbq71";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-mode-line";
           sha256 = "0qmhzlkc6mfqyaw4jaw6195b8sw0wg9pfjcijb4p0mlywf5mh5q6";
           name = "smart-mode-line";
         };
@@ -22837,7 +23215,7 @@
           sha256 = "0yvlmwnhdph5qj1998jz0idcl7901j6fxa9hivr7kic57j8kbq71";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-mode-line-powerline-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-mode-line-powerline-theme";
           sha256 = "0hv3mx39m3l35xhz351zp98321ilr6qq9wzwn1f0ziiv814khcn4";
           name = "smart-mode-line-powerline-theme";
         };
@@ -22858,7 +23236,7 @@
           sha256 = "1kfihh4s8578cwqyzn5kp3iib7f9vvg6rfc3klqzgads187ryd4z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smart-tabs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-tabs-mode";
           sha256 = "1fmbi0ypzhsizzb1vm92hfaq23swiyiqvg0pmibavzqyc9lczhhl";
           name = "smart-tabs-mode";
         };
@@ -22879,7 +23257,7 @@
           sha256 = "1mx4hdbrk6v52y5r47fbd6kgqyk3lvqgq8lw3hkww0pqfwwp4x6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smartparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smartparens";
           sha256 = "025nfrfw0992024i219jzm4phwf29smc5hib45s6h1s67942mqh6";
           name = "smartparens";
         };
@@ -22900,7 +23278,7 @@
           sha256 = "0j5lg9gryl8vbzw8d3r2fl0c9wxa0c193mcvdfidd25b98wccc3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smartrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smartrep";
           sha256 = "1ypls52d51lcqhz737rqg73c6jwl6q8b3bwb29z51swyamf37rbn";
           name = "smartrep";
         };
@@ -22921,7 +23299,7 @@
           sha256 = "1sd7dh9114mvr4xnp43xx4b7qmwkaj1a1fv7pwc28fhiy89d2md4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smartscan";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smartscan";
           sha256 = "0vghgmx8vnjbvsw7q5zs0qz2wm6dcng9m69b8dq81g2cq9dflbwb";
           name = "smartscan";
         };
@@ -22942,7 +23320,7 @@
           sha256 = "1pcpg3lalbrc24z3vwcaysps8dbdzmncdgqdd5ig6yk2a9wyj9ng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smeargle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smeargle";
           sha256 = "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd";
           name = "smeargle";
         };
@@ -22963,7 +23341,7 @@
           sha256 = "1hcjh577xz3inx28r8wb4g2b1424ccw8pffvgdmpf80xp1llldj5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smex";
           sha256 = "1rwyi7gdzswafkwpfqd6zkxka1mrf4xz17kld95d2ram6cxl6zda";
           name = "smex";
         };
@@ -22984,7 +23362,7 @@
           sha256 = "05kf3hb3nb32jzw50a2z9vlf3f0pj40klzxvqj4fxlci777imsvk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/smooth-scrolling";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smooth-scrolling";
           sha256 = "0zy2xsmr05l2narslfgril36d7qfb55f52qm2ki6fy1r18lfiyc6";
           name = "smooth-scrolling";
         };
@@ -23005,7 +23383,7 @@
           sha256 = "0zcj9jf8nlsj9vms888z2vs76q54n8g8r9sh381xad3x8d6lrlb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/solarized-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/solarized-theme";
           sha256 = "15d8k32sj8i11806byvf7r57rivz391ljr0zb4dx8n8vjjkyja12";
           name = "solarized-theme";
         };
@@ -23026,7 +23404,7 @@
           sha256 = "0b5w3vdr8llg3hqd22gnc6b6y089lq6vfk0ajkws6gfldz2gg2v1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sos";
           sha256 = "1gkd0plx7152s3dj8a9lwlwh8bgs1m006s80l10agclx6aay8rvb";
           name = "sos";
         };
@@ -23047,7 +23425,7 @@
           sha256 = "1wbd7v5bnd4qgqk8rrgllal0i949n8xzvb3yhf0vnxr06wdzy0a4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sotlisp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sotlisp";
           sha256 = "0zjnn6hhwy6cjvc5rhvhxcq5pmrhcyil14a48fcgwvg4lv7fbljk";
           name = "sotlisp";
         };
@@ -23068,7 +23446,7 @@
           sha256 = "0q2ragq4hw89d3w48ykwljb19n2nhz8z6bsmb10shimaf203652g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sound-wav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sound-wav";
           sha256 = "1vrwzk6zqma7r0w5ivbx16shys6hsifj52fwlf5rxs6jg1gqdb4f";
           name = "sound-wav";
         };
@@ -23089,7 +23467,7 @@
           sha256 = "1l9xrw88wq32wm3qx922ihdb9mlv9rrdalwvz9i2790fmw7y84vz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sourcekit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sourcekit";
           sha256 = "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks";
           name = "sourcekit";
         };
@@ -23110,7 +23488,7 @@
           sha256 = "1k2gfw4dydzqxbfdmcghajbb2lyg1j4wgdhp8chlql3dax1f503d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sourcemap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sourcemap";
           sha256 = "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5";
           name = "sourcemap";
         };
@@ -23131,7 +23509,7 @@
           sha256 = "0j4qm1y7rhb95k1zbl3c60a46l9rchzslzq36mayyw61s6yysjnv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sourcetalk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sourcetalk";
           sha256 = "0qaf2q784xgl1s3m88jpwdzghpi4f3nybga3lnr1w7sb7b3yvj3z";
           name = "sourcetalk";
         };
@@ -23144,15 +23522,15 @@
     spaceline = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, powerline, s }:
     melpaBuild {
         pname = "spaceline";
-        version = "1.1.0";
+        version = "1.1.2";
         src = fetchFromGitHub {
           owner = "TheBB";
           repo = "spaceline";
-          rev = "3ad012e9a86a40c86460408dcdde704b125a1888";
-          sha256 = "13sqigkw41jmh0f7c1lmx4ipvcrlsp7k8h7vs2drpacf84yl6dn9";
+          rev = "88e22c1c9c69093efc7310ca996d2efb3cbbba1d";
+          sha256 = "1ncwv6sqm1ch396qi1c8276dc910rnm0f3m8xjkskplv3cjaq0ai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spaceline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spaceline";
           sha256 = "0jpcj0i8ckdylrisx9b4l9kam6kkjzhhv1s7mwwi4b744rx942iw";
           name = "spaceline";
         };
@@ -23173,7 +23551,7 @@
           sha256 = "1gmmmkzxxlpz2ml6qk24vndlrbyl55r5cba76jn342zrxvb357ny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sparkline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sparkline";
           sha256 = "081jzaxjb32nydvr1kmyafxqxi610n0yf8lwz9vldm84famf3g7y";
           name = "sparkline";
         };
@@ -23194,7 +23572,7 @@
           sha256 = "1gk2ps7fn9z8n6r923qzn518gz9mrj7mb6j726cz8qb585ndjbij";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sparql-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sparql-mode";
           sha256 = "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d";
           name = "sparql-mode";
         };
@@ -23215,7 +23593,7 @@
           sha256 = "1k6c7450v0ln6l9b8z1hib2s2b4rmjbskynvwwyilgdnvginfhi3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/speech-tagger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/speech-tagger";
           sha256 = "0sqil949ny9qjxq7kpb4zmjd7770r0qvq4sz80agw6a27mqnaajc";
           name = "speech-tagger";
         };
@@ -23236,7 +23614,7 @@
           sha256 = "1q6v0xfdxm57lyj4zxyqv6n5ik5w9drk7yf9w8spb5r22jg0dg8c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sphinx-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sphinx-doc";
           sha256 = "00h3wx2p5hzbw6sggggdrzv4jrn1wc051iqql5y2m1hsh772ic5z";
           name = "sphinx-doc";
         };
@@ -23257,7 +23635,7 @@
           sha256 = "17qsmjsbk8aq3azjxid6h9fzz77bils74scp21sqn8vdnijx8991";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/splitjoin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/splitjoin";
           sha256 = "0l1x98fvvia8qx8g125h4d76slv0xnb3h1zxiq9xb5qh7a1h069l";
           name = "splitjoin";
         };
@@ -23278,7 +23656,7 @@
           sha256 = "05y8xv6zapspwr5bii41lgirslas22wsbm0kgb4dm79qbk9j1kzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/spotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spotify";
           sha256 = "0pmsvxi1dsi580wkhhx8iw329agkh5yzk61bqvxzign3cd6fbq6k";
           name = "spotify";
         };
@@ -23299,7 +23677,7 @@
           sha256 = "06rk07h92s5sljprs41y3q31q64cprx9kgs56c2j6v4c8cmsq5h6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sprintly-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sprintly-mode";
           sha256 = "15i3rrv27ccpn12wwj9raaxpj7nlnrrj3lsp8vdfwph6ydvnfza4";
           name = "sprintly-mode";
         };
@@ -23320,7 +23698,7 @@
           sha256 = "1dcb18fq84vlfgb038i2x6vy7mhin2q6jn4jl9fh256n12cx4nrn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sqlup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sqlup-mode";
           sha256 = "06a0v2qagpd9p2bh19bfw14a6if8kjjc4yyhm5nwp8a8d2vnl5l7";
           name = "sqlup-mode";
         };
@@ -23341,7 +23719,7 @@
           sha256 = "0wx8l8gkh8rbf2g149f35gpnmkk45s9x4r844aqw5by4zkvix4rc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/srefactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/srefactor";
           sha256 = "01cd40jm4h00c5q2ix7cskp7klbkcd3n5763y5lqfv59bjxwdqd2";
           name = "srefactor";
         };
@@ -23362,7 +23740,7 @@
           sha256 = "0igqifws73cayvjnhhrsqpy14sr27avymfhaqzrpj76m2fsh6fj4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stash";
           sha256 = "116k40ispv7sq3jskwc1lvmhmk3jjz4j967r732s07f5h11vk1z9";
           name = "stash";
         };
@@ -23383,7 +23761,7 @@
           sha256 = "0jpxmzfvg4k5q3h3gn6lrg891wjzlcps2kkij1jbdjk4jkgq386i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/status";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/status";
           sha256 = "0a9lqa7a5nki5711bjrmx214kah5ndqpwh3i240gdd08mcm07ps3";
           name = "status";
         };
@@ -23404,7 +23782,7 @@
           sha256 = "0pik6mq8syhxk9l9ns8wgvg5312qkckm3cilb3irwdm1dvnl5hpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stekene-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stekene-theme";
           sha256 = "0v1kwlnrqaygzaz376a5njg9kv4yf5l35k87xga4wdd2mxfwrmf1";
           name = "stekene-theme";
         };
@@ -23423,7 +23801,7 @@
           sha256 = "12c5df549d653c8ec3476ed271a4e9a4065a61a467229c070bb2e6295e285e16";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stgit";
           sha256 = "102s9lllrcxsqs0lgbrcljwq1l3s8ri4276wck6rcypck5zgzj89";
           name = "stgit";
         };
@@ -23444,7 +23822,7 @@
           sha256 = "15gdcpbba3h84s7xnpk69nav6bixdixnirdh5n1rly010q0m5s5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/string-edit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/string-edit";
           sha256 = "1l1hqsfyi6pp4x4g1rk4s7x9zjc03wfmhy16izia8nkjhzz88fi8";
           name = "string-edit";
         };
@@ -23465,7 +23843,7 @@
           sha256 = "03azfs6z0jg66ppalijcxl973vdbhj4c3g84sm5dm8xv6rnxrv2s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/string-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/string-utils";
           sha256 = "1vsvxc06fd3wardldb83i5hjfibvmiqnxvcgdns7i5i8qlsrsx4v";
           name = "string-utils";
         };
@@ -23486,7 +23864,7 @@
           sha256 = "035ym1c1vzg6hjsnd258z4dkrfc11lj4c0y4gpgybhk54dq3w9dk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stripe-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stripe-buffer";
           sha256 = "02wkb9y6vykrn6a5nfnimaplj7ig8i8h6m2rvwv08f5ilbccj16a";
           name = "stripe-buffer";
         };
@@ -23506,7 +23884,7 @@
           sha256 = "f5e3b0fdbdb1c747c40f7b6746de195e37bd4caccdcc05c6aa14124f29e71428";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stumpwm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stumpwm-mode";
           sha256 = "0a77mh7h7033adfbwg2fbx84789962par43q31s9msjlqw15gs86";
           name = "stumpwm-mode";
         };
@@ -23527,7 +23905,7 @@
           sha256 = "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/stylus-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stylus-mode";
           sha256 = "152k74q6qn2xa38v2zyd5y7ya5n26nvai5v7z5fmq7jrcndp27r5";
           name = "stylus-mode";
         };
@@ -23537,6 +23915,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    subatomic-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "subatomic-theme";
+        version = "1.8.1";
+        src = fetchFromGitHub {
+          owner = "cryon";
+          repo = "subatomic";
+          rev = "6a4086af748b1ecb27f6ba2aa2614988db16d594";
+          sha256 = "1j63rzxnrzzqizh7fpd99dcgsy5hd7w4d2lpwl5armmixlycl5m8";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/subatomic-theme";
+          sha256 = "0mqas67qms492n3hn74c5nrkjpsgf9b42lp02s2dh366c075dpqc";
+          name = "subatomic-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/subatomic-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     subemacs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "subemacs";
@@ -23548,7 +23947,7 @@
           sha256 = "189547d0g9ax0nr221bkdchlfcj60dsy8lgbbrvq3n3xrmlvl362";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/subemacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/subemacs";
           sha256 = "0sqh80jhh3v37l5af7w6k9lqvj39bd91pn6a9rwdlfk389hp90zm";
           name = "subemacs";
         };
@@ -23569,7 +23968,7 @@
           sha256 = "0mx892vn4a32df30iqmf2vsz1gdl3i557fw0194g6a66n9w2q7xf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/subshell-proc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/subshell-proc";
           sha256 = "1fnp49yhnhsj7paj0b25vr6r03hr5kpgcrci439ffpbd2c85fkw2";
           name = "subshell-proc";
         };
@@ -23590,7 +23989,7 @@
           sha256 = "1kmyivsyxr6gb2k36ssyr779rpk8qsrb27q5rjsir9fgc95qhvjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sudden-death";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sudden-death";
           sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh";
           name = "sudden-death";
         };
@@ -23611,7 +24010,7 @@
           sha256 = "1b637p2cyc8a83qv9vba4yamzhk08f62zykqh5p35jwvym8wkann";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/suomalainen-kalenteri";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/suomalainen-kalenteri";
           sha256 = "1wzijbgcr3jc47ccr7nrdkqha16s6gw0xiccnmdczi48cvnvvlkh";
           name = "suomalainen-kalenteri";
         };
@@ -23632,7 +24031,7 @@
           sha256 = "1pq71simdb4pcbzzavlxdfbgh548m15f493h821k04n67ydzlmj3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/super-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/super-save";
           sha256 = "0ikfw7n2rvm3xcgnj1si92ly8w75x26071ki551ims7a8sawh52p";
           name = "super-save";
         };
@@ -23653,7 +24052,7 @@
           sha256 = "14h40s0arc2i898r9yysn256z6l8jkrnmqvrdg7p7658c0klz5ic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/svg-mode-line-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/svg-mode-line-themes";
           sha256 = "12lnszcb9bl32n9wir7vf8xiyyv7njw4xg21aj9x4dasmidyx506";
           name = "svg-mode-line-themes";
         };
@@ -23674,7 +24073,7 @@
           sha256 = "1h56qkbx5abz1l94wrdpbzspiz24mfgkppzfalvbvx5qwl079cvs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sweetgreen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sweetgreen";
           sha256 = "1v75wk0gq5fkz8i1r8pl4gqnxbv1d80isyn48w2hxj2fmdn2xhpy";
           name = "sweetgreen";
         };
@@ -23687,15 +24086,15 @@
     swift-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "swift-mode";
-        version = "0.3.0";
+        version = "0.4.0";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "swift-mode";
-          rev = "e09694f0f95a64b2c96487cbdcb66636a77ea22a";
-          sha256 = "1fi5zdvplw7h5hnyi37k92c8s8qnjgizbnv1mah18y8d30n1r77n";
+          rev = "4e9da69ba776ec2a4a97c75534e6274bffc4fc8a";
+          sha256 = "07xrcg33vsw19kz692hm7blzvnf7b6isllsz79fvs8q3l5c9mfjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swift-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swift-mode";
           sha256 = "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d";
           name = "swift-mode";
         };
@@ -23716,7 +24115,7 @@
           sha256 = "1kahl3h18vsjkbqvd84fb2w45s4srsiydn6jiv49vvg1yaxzxcbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swiper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swiper";
           sha256 = "13lld7kjz1n1ryxvrfsy0iym5l9m9ybrf7bpcmkzsalpp15j3mvm";
           name = "swiper";
         };
@@ -23737,7 +24136,7 @@
           sha256 = "1y2dbd3ikdpjvi8xz10jkrx2773h7cgr6jxm5b2bldm81lvi8x64";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/swiper-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swiper-helm";
           sha256 = "011ln6vny7z5vw67cpzldxf5n6sk2hjdkllyf7v6sf4m62ws93ph";
           name = "swiper-helm";
         };
@@ -23758,7 +24157,7 @@
           sha256 = "1zpfilcaycj0l2q3zyvpjbwp5j3d9rrkacd5swzlr1n1klvbji48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/switch-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/switch-window";
           sha256 = "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2";
           name = "switch-window";
         };
@@ -23779,7 +24178,7 @@
           sha256 = "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sws-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sws-mode";
           sha256 = "0b12dsad0piih1qygjj0n7rni0pl8cizbzwqm9h1dr8imy53ak4i";
           name = "sws-mode";
         };
@@ -23800,7 +24199,7 @@
           sha256 = "02f63k8rzb3bcch6vj6w5c5ncccqg83siqnc8hyi0lhy1bfx240p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/sx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sx";
           sha256 = "1ml1rkhhk3hkd16ij2zwng591rxs2yppsfq9gwd4ppk02if4v517";
           name = "sx";
         };
@@ -23821,7 +24220,7 @@
           sha256 = "0hi2jflrlpp7xkbj852vp9hcl8bfmf04jqw1hawxrw4bxdp95jh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/synosaurus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/synosaurus";
           sha256 = "16i2ag4l824h1kq4cy01zf01zrms4v6ldwlsixwfyb1mh97lqljg";
           name = "synosaurus";
         };
@@ -23842,7 +24241,7 @@
           sha256 = "1pn69f4w48jdj3wd1myj6qq2mhvygmlzbq2dws2qkjlp3kbwa6da";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/syntactic-sugar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/syntactic-sugar";
           sha256 = "12b2vpvz5h4wzxrk8jrbgc8v0w6bzzvxcyfs083fi1791qq1rw7r";
           name = "syntactic-sugar";
         };
@@ -23862,7 +24261,7 @@
           sha256 = "1p9bp09nibw7rra3r6nj496zdx09db6k82dxnxs1lfgdiswfdq2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/syntax-subword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/syntax-subword";
           sha256 = "1as89ffqz2h69fdwybgs5wibnrvskm7hd58vagfjkla9pjlpffpm";
           name = "syntax-subword";
         };
@@ -23883,7 +24282,7 @@
           sha256 = "1hixilnnybv2v3p1wpn7a0ybwah17grawszs3jycsjgzahpgckv7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/system-specific-settings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/system-specific-settings";
           sha256 = "1ydmxi8aw2lf78wv4m39yswbqkmcadqg0wmzg9s8b5h9bxxwvppp";
           name = "system-specific-settings";
         };
@@ -23904,7 +24303,7 @@
           sha256 = "0axskr4q0kw8pmnl1pv2z3n6x3pn6v28qcgz3qf745lqgmsgbng9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/systemd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/systemd";
           sha256 = "1biais0cmidy3d0hf2ifdlr6qv1z8k8c8bczi07bsfk4md3idbir";
           name = "systemd";
         };
@@ -23925,7 +24324,7 @@
           sha256 = "09nndx83ws5v2i9x0dzk6l1a0lq29ffzh3y05n0n64nf5j0a7zvk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ta";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ta";
           sha256 = "0kn2k4n0xfwsrniaqb36v3rxj2pf2sai3bmjksbn1g2kf5g156ll";
           name = "ta";
         };
@@ -23946,7 +24345,7 @@
           sha256 = "1xd67s92gyr49v73j7r7cbhsc40bkw8aqh21whgbypdgzpyc7azc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tabbar-ruler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tabbar-ruler";
           sha256 = "10dwjj6r74g9rzdd650wa1wxhqc0q6dmff4j0qbbhmjsxvsr3y0d";
           name = "tabbar-ruler";
         };
@@ -23967,7 +24366,7 @@
           sha256 = "0gy9hxm7bca0l1hfy2pzn86avpifrz3bs8xzpicj4kxw5wi4ygns";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tablist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tablist";
           sha256 = "0c10g86xjhzpmc2sqjmzcmi393qskyw6d9bydqzjk3ffjzklm45p";
           name = "tablist";
         };
@@ -23988,7 +24387,7 @@
           sha256 = "0kq40g46s8kgiafrhdq99h79rz9h5fvgz59k7ralmf86bl4sdmdb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tagedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tagedit";
           sha256 = "0vfkbrxmrw4fwdz324s734zxdxm2nj3df6i8m6lgb9pizqyp2g6z";
           name = "tagedit";
         };
@@ -24009,7 +24408,7 @@
           sha256 = "16kr1p4lzi1ysd5r2dh0mxk60zsm5fvwa9345nfyrgdic340yscc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/telepathy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/telepathy";
           sha256 = "0c3d6vk7d6vqzjndlym2kk7d2zm0b15ac4142ir03p6f19rqq9pr";
           name = "telepathy";
         };
@@ -24030,7 +24429,7 @@
           sha256 = "0smdlzrcbmip6c6c3rd0871wv5xyagavwsxhhgvki6ybyzdj9a19";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/telephone-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/telephone-line";
           sha256 = "0dyh9h1yk9y0217b6rxsm7m372n910vpfgw5w23lkkrwa8x8qpx3";
           name = "telephone-line";
         };
@@ -24051,7 +24450,7 @@
           sha256 = "1d1hrnxhi7h5d5i4198hx5lj7fbc280lpkxmk2nb8z6j7z0aki7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term-alert";
           sha256 = "0x4rc1y311ivaj6mlks1j8sgzrrwqn8vx171vw7s1kgf1qzk826n";
           name = "term-alert";
         };
@@ -24072,7 +24471,7 @@
           sha256 = "1idz9c38q47lll55w1znya00hlkwa42029ys70sb14inc51cml51";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term-cmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term-cmd";
           sha256 = "0fn4f32zpl0p2lid159q59lzjv4xqmc23a64kcclqp9db8b1m5fy";
           name = "term-cmd";
         };
@@ -24093,7 +24492,7 @@
           sha256 = "149pl3zxg5kriydk5h6j95jyly6i23w4w4g4a99s4zi6ljiny6c6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/term-run";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term-run";
           sha256 = "1bx3s68rgr9slsw9k01gfg7sxd4z7sarg4pi2ivril7108mhg2cs";
           name = "term-run";
         };
@@ -24114,7 +24513,7 @@
           sha256 = "0gfsqpza8phvma5y3ck0n6p197x1i33w39m3c7jmja4ml121n73d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/termbright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/termbright-theme";
           sha256 = "14q88qdbnyzxr8sr8i5glj674sb4150b9y6nag0dqrxs629is6xj";
           name = "termbright-theme";
         };
@@ -24135,7 +24534,7 @@
           sha256 = "1n4z5hgpv1f0360zgdxz1q4gmhjjrxm7ygxh1g4zjy6kbhgylmxb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tern";
           sha256 = "06bgwizn9dcd8hsvimjvb28j0mpxg7rrv9knhv5kkdapa6gggxif";
           name = "tern";
         };
@@ -24156,7 +24555,7 @@
           sha256 = "1n4z5hgpv1f0360zgdxz1q4gmhjjrxm7ygxh1g4zjy6kbhgylmxb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tern-auto-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tern-auto-complete";
           sha256 = "0lq924c5f6bhlgyqqzc346n381qf0fp66h50a0zqz2ch66kanni1";
           name = "tern-auto-complete";
         };
@@ -24177,7 +24576,7 @@
           sha256 = "0l63lzm96gg3ihgc4l671i342qxigwdbn4xfkbxnarb0206gnb5p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tern-django";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tern-django";
           sha256 = "1pjaaffadaw8h2n7yv01ks19gw59dmh8bp8vw51hx1082r3yfvv0";
           name = "tern-django";
         };
@@ -24198,7 +24597,7 @@
           sha256 = "0mz2yl9jaw7chzv9d9hhv7gcvdwwvi676y9wpn7vp85hxpda7xg7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/terraform-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/terraform-mode";
           sha256 = "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn";
           name = "terraform-mode";
         };
@@ -24219,7 +24618,7 @@
           sha256 = "108csr1d7w0105rb6brzgbksb9wmq1p573vxbq0miv5k894j447f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/test-case-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/test-case-mode";
           sha256 = "1iba97yvbi5vr7gvc58gq2ah6jg2s7apc9ssq7mdzki823n8z2qi";
           name = "test-case-mode";
         };
@@ -24240,7 +24639,7 @@
           sha256 = "02vp4m3aw7rs4gxn91v6j3y8pr04hpydrg05ck3ivv46snkfagdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/test-kitchen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/test-kitchen";
           sha256 = "1bl3yvj56dq147yplrcwphcxiwvmx5n97y4qpkm9imiv8cnjm1g0";
           name = "test-kitchen";
         };
@@ -24261,7 +24660,7 @@
           sha256 = "08g7fan1y3wi4w7cdij14awadqss6prqg3k7qzf0wrnbm13dzhmk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/test-simple";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/test-simple";
           sha256 = "1l6y77fqd0l0mh2my23psi66v5ya6pbr2hgvcbsaqjnpmfm90w3g";
           name = "test-simple";
         };
@@ -24282,7 +24681,7 @@
           sha256 = "1a0fzn66gv421by0x6wj3z6bvzv274a9p8c2aaax0dskncl5lgk1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/textmate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/textmate";
           sha256 = "119w944pwarpqzcr9vys17svy1rkfs9hiln8903q9ff4lnjkpf1v";
           name = "textmate";
         };
@@ -24303,7 +24702,7 @@
           sha256 = "0fjapb7naysf34g4ac5gsa90b2s2ss7qgpyd9mfv3mdqrsp2dyw7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/textmate-to-yas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/textmate-to-yas";
           sha256 = "04agz4a41h0givfdw88qjd3c7pd418qyigsij4la5f37j5rh338l";
           name = "textmate-to-yas";
         };
@@ -24324,7 +24723,7 @@
           sha256 = "09vf3qs949n4iqzd14iq2kgvypwdwdv8ii8l5jcqfppgspd8m8yd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/theme-changer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/theme-changer";
           sha256 = "1qbmsghkl5gs728q0gaalc7p8q7nzv3l045jc0jdxxnb7na3gc5w";
           name = "theme-changer";
         };
@@ -24345,7 +24744,7 @@
           sha256 = "1srylw9wwkyq92f9v6ds9zp9z8sl800wbxjbir80g1lwv4hghaii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/thrift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thrift";
           sha256 = "0p1hxmm7gvhyigz8aylncgqbhk6cyf75rbcqis7x552g605mhiy9";
           name = "thrift";
         };
@@ -24366,7 +24765,7 @@
           sha256 = "1vq5yp6pyjam2csz22mcp353a4d5r7f9m6bsjizfmgr2ld7bwhx7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/timer-revert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/timer-revert";
           sha256 = "0lvm2irfx9rb5psm1lf53fv2jjx745n1c172xmyqip5xwgmf6msy";
           name = "timer-revert";
         };
@@ -24387,7 +24786,7 @@
           sha256 = "0p7piqbhwxp2idslqnzl5x4y9aqgba9ryxrjy3d0avky5z9kappl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/timesheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/timesheet";
           sha256 = "1gy6bf4wqvp8cw2wjnrr9ijnzwav3p7j46m7qrn6l0517shwl506";
           name = "timesheet";
         };
@@ -24408,7 +24807,7 @@
           sha256 = "16217i8rjhgaa5kv8iq0s14b42v5rs8m2qlr60a0x6qzy65chq39";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tox";
           sha256 = "1z81x8fs5q6r19hpqphsilk8wdwwnfr8w78x5x298x74s9mcsywl";
           name = "tox";
         };
@@ -24429,7 +24828,7 @@
           sha256 = "0q3rv6lk37yybkbswmn4pgzca0nfhvf4h3ac395fr16k5ixybc5q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tracking";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tracking";
           sha256 = "096h5bl7jcwz5hpbm2139bf8a784hijfy40vzf42y1c9794al46z";
           name = "tracking";
         };
@@ -24450,7 +24849,7 @@
           sha256 = "14fzgpafry3v072f22krap81jfpdc17bpimp16hv7f20sny29a5v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/transmission";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/transmission";
           sha256 = "0w0hlr4y4xpcrpvclqqqasggkgrwnzrdib51mhkh3f3mqyiw8gs9";
           name = "transmission";
         };
@@ -24471,7 +24870,7 @@
           sha256 = "1jd7xsvs4m55fscp62a9lk59ip4sgifv4kazl55b7543nz1i31bz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/travis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/travis";
           sha256 = "1km496cq1vni9gy2d3z4c9524q62750ywz745rjz4r7178ip9mix";
           name = "travis";
         };
@@ -24492,7 +24891,7 @@
           sha256 = "18na22fhwqz80qinmnpsvp6ghc9irva1scixi6s4q6plmgr4m397";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/truthy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/truthy";
           sha256 = "1a56zmqars9fd03bkqzwpvgblq5fvq19n4jw04c4hpga92sq8wqg";
           name = "truthy";
         };
@@ -24513,7 +24912,7 @@
           sha256 = "1ma3k9bbw427cj1n2gjajbqii482jhs2lgjggz9clpc21bn5wqfb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tss";
           sha256 = "0d16x5r2xfy6mrwy0mqzpr9b3inqmyyxgawrxlfh83j1xb903dhm";
           name = "tss";
         };
@@ -24534,7 +24933,7 @@
           sha256 = "060jksd9aamqx1n4l0bb9v4icsf7cr8jkyw0mbhgyz32nmxh3v6g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ttrss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ttrss";
           sha256 = "08921cssvwpq33w87v08dafi2rz2rl1b3bhbhijn4bwjqgxi9w7z";
           name = "ttrss";
         };
@@ -24555,7 +24954,7 @@
           sha256 = "0jpcjy2a77mywba2vm61knj26pgylsmv5a21cdp80q40bac4i6bb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tuareg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tuareg";
           sha256 = "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q";
           name = "tuareg";
         };
@@ -24576,7 +24975,7 @@
           sha256 = "0ihjjw5wxz5ybl3600k937pszw3442cijs4gbqqip9vhd5y9m8gy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tumble";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tumble";
           sha256 = "1c9ybq0mb2a0pw15fmm13vfwcnr2h9fb1xsm5nrff1cg7913pgv9";
           name = "tumble";
         };
@@ -24597,7 +24996,7 @@
           sha256 = "0asd024n5v23wdsg1959sszq568wg3a1bp4jrk0cllfji1z0n78y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/tup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tup-mode";
           sha256 = "0pzpn1ljfcc2dl9fg7jc8lmjwz2baays4axjqk1qsbj0kqbc8j0l";
           name = "tup-mode";
         };
@@ -24618,7 +25017,7 @@
           sha256 = "0glw5lns7hwp8jznnfm6dyjw454sv2n84gy07ma7s1q3yczhq5bc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/twilight-anti-bright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/twilight-anti-bright-theme";
           sha256 = "1qfybk5akaxdahmjffqaw712v8d7kk4jqkj3hzp96kys2zv1r6f9";
           name = "twilight-anti-bright-theme";
         };
@@ -24639,7 +25038,7 @@
           sha256 = "193v98i84xybm3n0f30jin5q10i87vbcnbdhl4zqi7jij9p5v98z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/twittering-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/twittering-mode";
           sha256 = "0v9ijxw5jazh2hc0qab48y71za2l9ryff0mpkxhr3f79irlqy0a1";
           name = "twittering-mode";
         };
@@ -24660,7 +25059,7 @@
           sha256 = "1risfbsaafh760vnl4ryys91g4k78g0fxj2zlcndpxxv34gwkhy7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/typed-clojure-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/typed-clojure-mode";
           sha256 = "1579zkhk2lwl5ij7dm9n2drggs5fmhpljrshc4ghhvig7nlyqjy3";
           name = "typed-clojure-mode";
         };
@@ -24681,7 +25080,7 @@
           sha256 = "1jhd4grch5iz12gyxwfbsgh4dmz5hj4bg4gnvphccg8dsnni05k2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/typo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/typo";
           sha256 = "07hmqrnbxbrhcbxdls8i4786lkqmfr3hv6va41xih1lxj0mk60bx";
           name = "typo";
         };
@@ -24702,7 +25101,7 @@
           sha256 = "0k41hwb6jgv3hngfrphlyhmfhvy4k05mvn0brm64xk7lj56y8q2c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ubuntu-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ubuntu-theme";
           sha256 = "160z59aaxb2v6c24nki6bn7pjm9r4jl1mgxs4h4sivzxkaw811s2";
           name = "ubuntu-theme";
         };
@@ -24723,7 +25122,7 @@
           sha256 = "0qw9vwl1p0pjw1xmshxar1a8kn6gmin5rdvvnnly8b5z9hpkjf3m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ucs-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ucs-utils";
           sha256 = "111fwg2cqqzpa79rcqxidppb12c8g12zszppph2ydfvkgkryb6z2";
           name = "ucs-utils";
         };
@@ -24744,7 +25143,7 @@
           sha256 = "0dmkn8qlnyvgaj7dqh82mqj1fik59zfi2yxcic9i6q9walxc3cas";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/undercover";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/undercover";
           sha256 = "1s30c3i6y4r3mgrrs3lda3rrwmy9ff11ihdmshyziv9v5879sdjf";
           name = "undercover";
         };
@@ -24765,7 +25164,7 @@
           sha256 = "1g1ldyz42q3i2xlgvhd4s93cvkh0fm8m3l344zjcw8rvqaisyphj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/underwater-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/underwater-theme";
           sha256 = "0ab2bcqfdi9ml3z9d511pbfwcbp8hkkd36xxp61k36gkyi3acvlr";
           name = "underwater-theme";
         };
@@ -24786,7 +25185,7 @@
           sha256 = "1qy0q1fp7cmvmxynqrb086dkb727lmk5h1k98y14j75b94ilpy0w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unfill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unfill";
           sha256 = "0b21dk45vbz4vqdbdx0n6wx30rm38w1jjqbsxfj7b96p3i5shwqv";
           name = "unfill";
         };
@@ -24807,7 +25206,7 @@
           sha256 = "0n06dvf6r7qblz8vz38qc37xrn29wa1c0jyzis1qw9zzf6hmmzj7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-enbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-enbox";
           sha256 = "1phb2qq3pg6z6bl96kl9yfq4jxhgardjpaa4lhgqbxymmqdm7gzv";
           name = "unicode-enbox";
         };
@@ -24828,7 +25227,7 @@
           sha256 = "0fbwncna6gxlynq9196djpkjhayzk8kxlsxg0gasdgqx1nyxl0mk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-fonts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-fonts";
           sha256 = "0plipwb30qqay8691qzqdyg6smpbs9dsxxi49psb8sq0xnxl84q3";
           name = "unicode-fonts";
         };
@@ -24855,7 +25254,7 @@
           sha256 = "0qy1hla7vf674ynqdzsaw2cnk92nhpcimww5q94rc0a95pzw64wd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-progress-reporter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-progress-reporter";
           sha256 = "03z7p27470fqy3gd356l9cpp44a35sfrxz94dxmx388rzlygk7y7";
           name = "unicode-progress-reporter";
         };
@@ -24876,7 +25275,7 @@
           sha256 = "0q7cbl89yg3fjxaxsqsksxhw7ibdslbb004z5y1m579n7zgcrljy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unicode-whitespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-whitespace";
           sha256 = "1b3jgha8va42b89pdp41sab2w9wllp7dicqg4lxl67bg6wn147wy";
           name = "unicode-whitespace";
         };
@@ -24897,7 +25296,7 @@
           sha256 = "1vbx10s2zmhpxjg26ik947bcg9f7w3g2w45wmm0shjp743fsdq8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unify-opening";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unify-opening";
           sha256 = "1gpmklbdbmv8va8d3yr94r1ydkcyvdzcgxv56rp0bxwbcgmk0as8";
           name = "unify-opening";
         };
@@ -24918,7 +25317,7 @@
           sha256 = "1w2w0gmyr0nbq8kv3ldj30h9xma76gi1khbdia1y30kss677rr8m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/unkillable-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unkillable-scratch";
           sha256 = "0ghbpa9pf7k6vd2mjxkpqg2qfl4sd40ir6mrk1rxr1rv8s0afkf7";
           name = "unkillable-scratch";
         };
@@ -24939,7 +25338,7 @@
           sha256 = "07vwg0bg719gb8ln1n5a33103903vvrphnkbvvfn43904pkrf14w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/use-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/use-package";
           sha256 = "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8";
           name = "use-package";
         };
@@ -24960,7 +25359,7 @@
           sha256 = "1azv6grd5h2r1spy996nv6q1c5l6qawv6k0dc2i5k96szl0r668r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/utop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/utop";
           sha256 = "0lv16kl29gc9hdcpn04l85pf7x93vkl41s4mgqp678cllzyr0cq7";
           name = "utop";
         };
@@ -24981,7 +25380,7 @@
           sha256 = "0z53n9qsglp87f6q1pa3sixrjni9k46j31zg15gcwrmflmfrw8ds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/uzumaki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/uzumaki";
           sha256 = "1fvhzz2qpyc819rjvzyf42jmb70hlg7a9ybqwi81w7rydpabg61q";
           name = "uzumaki";
         };
@@ -25002,7 +25401,7 @@
           sha256 = "04r73s3fhvdcryv0l57awkpg1hi3kg6zcqxbxb03jc89h0f9vdlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vagrant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vagrant";
           sha256 = "0g6sqzsx3lixcn09fkxhhcfp45qnqgf1ms0l7nkzyljavb7151cf";
           name = "vagrant";
         };
@@ -25023,7 +25422,7 @@
           sha256 = "19j5q2f6pybvjq3ryjcyihzlw348hqyjhfcy3qflry6w786dqcgn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vbasense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vbasense";
           sha256 = "1440q2bi4arpl5lbqh7zscg7v3884clqx54p2fdfcfkz47ky4z9n";
           name = "vbasense";
         };
@@ -25044,7 +25443,7 @@
           sha256 = "07dx3dyvkwcin0gb6j4jx0ldfxs4rqhygl56a8i81yy05adkaq2x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vcomp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vcomp";
           sha256 = "02cj2nlyxvgvl2rjfgacljvcsnfm9crmmkhcm2pznj9xw10y8pq0";
           name = "vcomp";
         };
@@ -25065,7 +25464,7 @@
           sha256 = "034475m2d2vlrlc2l88gdx0ga3krsdh08wkjxwnbb2dfyz3p8r9v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vdirel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vdirel";
           sha256 = "11cc7bw7x5h3bwnlsjyhw6k5fh2fk7wffarrcny562v4cmr013cj";
           name = "vdirel";
         };
@@ -25086,7 +25485,7 @@
           sha256 = "0lzq31zqnk32vfp3kicnvgfr3nkv8amjzxmk9nrz1kwgmq7gvkjk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vector-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vector-utils";
           sha256 = "07armr23pq5pd47lqhir6a59r86c84zikbc51d8vfcaw8y71yr5n";
           name = "vector-utils";
         };
@@ -25107,7 +25506,7 @@
           sha256 = "0k8wbylvws4yxh2jzxkz0fw5kwgblxvmagz54igbjj5mfm45pgsp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vhdl-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vhdl-tools";
           sha256 = "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw";
           name = "vhdl-tools";
         };
@@ -25128,7 +25527,7 @@
           sha256 = "1750gx65ymibam8ahx5blfv5jc26f3mzbklk1jrmfwpsalyghdd9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vim-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vim-region";
           sha256 = "1dcnx799lpjsdnnjxqzgskkfj2nx7f4kwf0xjhbg35ny4nyn81dx";
           name = "vim-region";
         };
@@ -25149,7 +25548,7 @@
           sha256 = "1f94qx8rbnn21cl0grxqa9gzkbrz68vmqsihv8vvi8qf1c1dmd0i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vimgolf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vimgolf";
           sha256 = "1hvw2pfa5a984hm6wd33bf6zz6hmlprc6qs3g789dfx91qm890vn";
           name = "vimgolf";
         };
@@ -25170,7 +25569,7 @@
           sha256 = "082qrbljlahkq1fz2dfl434f1xv47jc1v9k0srh7lrm14616dzq3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vimish-fold";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vimish-fold";
           sha256 = "017by9w53d8pqlsazfycmhdv16yylks308p5vxp1rcw2qacpc5m3";
           name = "vimish-fold";
         };
@@ -25191,7 +25590,7 @@
           sha256 = "100w8rxdqln4xiwi0df15pvyaiyhjlwcjdh8nb0j95qpwji41vmf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/visual-fill-column";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/visual-fill-column";
           sha256 = "19y0pwaybjal2rc7migdbnafpi4dfbxvrzgfqr8dlvd9q68v08y5";
           name = "visual-fill-column";
         };
@@ -25212,7 +25611,7 @@
           sha256 = "0vl0hwxzzvgna8sysf517qq08fi1zsff3dmcgwvsgzhc47sq8mng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/vlf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vlf";
           sha256 = "1ipkv5kmda0l39xwbf7ns9p0mx3kb781mxsm9vmbkhr5x577s2j8";
           name = "vlf";
         };
@@ -25233,7 +25632,7 @@
           sha256 = "0q1rwqjwqcnsr57s531pwlm464q8wx5vvdm5rj2xy9b3yi6phis1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/voca-builder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/voca-builder";
           sha256 = "0mbw87mpbb8rw7xzhmg6yjla2c80x9820kw4q00x00ny5rbhm76y";
           name = "voca-builder";
         };
@@ -25254,7 +25653,7 @@
           sha256 = "0jl3n79wmbxnrbf83qjq0v5pzhvv67i9r5sp2zj8nc86hh7dvjsd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wacspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wacspace";
           sha256 = "1xy0mprvyi37zmgj1yrlh5ni08j47lpag1jm3a76cgghgmlfjxrl";
           name = "wacspace";
         };
@@ -25275,7 +25674,7 @@
           sha256 = "0mnfk2ys8axjh696cq5msr5cdr91icl1i3mi0dd2y00lvh6sbm7w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wc-goal-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wc-goal-mode";
           sha256 = "0l3gh96njjldp7n13jn1zjrp17h7ivjak102j6wwspgg6v2h5419";
           name = "wc-goal-mode";
         };
@@ -25288,15 +25687,15 @@
     wcheck-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wcheck-mode";
-        version = "2015.11.29";
+        version = "2016.1.30";
         src = fetchFromGitHub {
           owner = "tlikonen";
           repo = "wcheck-mode";
-          rev = "866954f040217059607633cf4c0f5e8a1ff5fd9a";
-          sha256 = "1l92k59yvdfhmj4yghcl5bqprynavr3s28v7h8y98v82laxp2q9m";
+          rev = "adb9dd9f39cb0bd0000d140d6e778c4864dfde08";
+          sha256 = "113prlamr2j6y6n0w43asffawwa4qiq63mgwm85v04h6pr8bd90l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wcheck-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wcheck-mode";
           sha256 = "0cmdvhgax6r5svn3wkwll4j271qj70g8182c58riwnkhiajxmn3k";
           name = "wcheck-mode";
         };
@@ -25317,7 +25716,7 @@
           sha256 = "0qx92jqzsimjk92pql2h8pzhq66mqijwqgjqwp7rmq5b6k0nvx1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/weather-metno";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/weather-metno";
           sha256 = "0h7p4l8y75h27pgk45f0mk3gjd43jk8q97gjf85a9b0afd63d3f6";
           name = "weather-metno";
         };
@@ -25338,7 +25737,7 @@
           sha256 = "1w7jnsc6lzlrlkj0nrlfnyca78lw53144hrf9k43b0g0zl8n9zqj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/web-completion-data";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/web-completion-data";
           sha256 = "1zzdmhyn6bjaidk808s4pdk25a5rn4287949ps5vbpyniaf6gny9";
           name = "web-completion-data";
         };
@@ -25359,7 +25758,7 @@
           sha256 = "00fzzjqa1v2dzlpgjxb2qj3nn6iizg177mk7vjvcv4814g4dhcal";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/web-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/web-mode";
           sha256 = "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i";
           name = "web-mode";
         };
@@ -25379,7 +25778,7 @@
           sha256 = "1z7ld9d0crwdh778fyaapx75vpnlnslsh9nf07ywkylhz4w68yyv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/weblogger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/weblogger";
           sha256 = "189zs1321rybgi4zihps7d2jll5z13726jsg5mi7iycg85nkv2fk";
           name = "weblogger";
         };
@@ -25400,7 +25799,7 @@
           sha256 = "0f90m2s40jish4wjwfpmbgw024r7n2l5b9q9wr6rd3vdcwks3mcl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/weechat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/weechat";
           sha256 = "0sxrms5024bi4irv8x8s8j1zcyd62cpqm0zv4dgpm65wnpc7xc46";
           name = "weechat";
         };
@@ -25421,7 +25820,7 @@
           sha256 = "14vmgfz45wmpjfhfx3pfjn3bak8qvj1zk1w4xc5w1cfl6vnij6hv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/weibo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/weibo";
           sha256 = "1ndgfqqb0gvy8p2fisi57s9bsa2nrnv80smg78m89i4cwagbz6yd";
           name = "weibo";
         };
@@ -25442,7 +25841,7 @@
           sha256 = "11mi23djk690n4984hk3pv61rrkdnxpkmywsqibi3xki27v2al36";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/which-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/which-key";
           sha256 = "0vqbhfzcv9m58w41zdhpiymhgl38n15c6d7ffd99narxlkckcj59";
           name = "which-key";
         };
@@ -25463,7 +25862,7 @@
           sha256 = "01fwhrfi92pcrwc4yn03pflc9wj07mhzj0a0i5amar4f9bj6m5b4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/whitaker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/whitaker";
           sha256 = "17fnvb3jh6fi4wddn5qnp6i6ndidg8jf9ac69q9j032c2msr07nj";
           name = "whitaker";
         };
@@ -25484,7 +25883,7 @@
           sha256 = "0xmwhybb8x6wwfr55ym5xg4dhy1aqx1abxy9qskn7h3zf1z4pgg2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/whitespace-cleanup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/whitespace-cleanup-mode";
           sha256 = "1fhdjrxxyfx4xsgfjqq9p7vhj98wmqf2r00mv8k27vdaxwsnm5p3";
           name = "whitespace-cleanup-mode";
         };
@@ -25505,7 +25904,7 @@
           sha256 = "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/whole-line-or-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/whole-line-or-region";
           sha256 = "1vs2i4cy1zc6nj660i9h36jbfgc3kvqivjnzlq5zwlxk5hcibqa1";
           name = "whole-line-or-region";
         };
@@ -25526,7 +25925,7 @@
           sha256 = "0fqv63m8z5m5ghh4j8ccdnmgcdkvi4jqpg9z7lp17g4p9pq3xfjf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/widget-mvc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/widget-mvc";
           sha256 = "0njzvdlxb7z480r6dvmksgivhz7rvnil517aj86qx0jbc5mr3l2f";
           name = "widget-mvc";
         };
@@ -25547,7 +25946,7 @@
           sha256 = "1kqcc1d56jz107bswlzvdng6ny6qwp93yck2i2j921msn62qvbb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wiki-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wiki-nav";
           sha256 = "19mabz0y3fcqsm68ijwwbbqylxgp71anc0a31zgc1blha9jivvwy";
           name = "wiki-nav";
         };
@@ -25568,7 +25967,7 @@
           sha256 = "0ib20zl8l1fs69ca9rry27qz69sgf6ws1ca5nhm5llvpkjcgv53i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/win-switch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/win-switch";
           sha256 = "1s6inp5kf763rngn58r02fd7n7z3dd55j6hb7s9dgvc856d5z3my";
           name = "win-switch";
         };
@@ -25589,7 +25988,7 @@
           sha256 = "049bwa5g0z1b9nrsc1vc4511aqcq9fvl16xg493wj651g6q9qigb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-end-visible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-end-visible";
           sha256 = "1p78n7yysj18404cdc6vahfrzwn5pixyfnja8ch48rj4fm4jbxwq";
           name = "window-end-visible";
         };
@@ -25610,7 +26009,7 @@
           sha256 = "0jyymmbz03zj2ydca1rv6ra0b2brjl7pyl4897zd00j5kvqjdyif";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-layout";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-layout";
           sha256 = "1n4a6z00lxsffirjrmbaaw432w798b9vv34qawgn1k17y9l7gb85";
           name = "window-layout";
         };
@@ -25631,7 +26030,7 @@
           sha256 = "1rz2a1l3apavsknlfy0faaivqgpj4x9jz3hbysbg9pydpcwqgf64";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-numbering";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-numbering";
           sha256 = "0x3n0ni16q69lfpyjz61spqghmhvc3cwa4aj80ihii3pk80f769x";
           name = "window-numbering";
         };
@@ -25652,7 +26051,7 @@
           sha256 = "08j0akwjp4arkw3zm0lazb13f6dq0m8y9k9nmypd7xk0m77byymd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/window-purpose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-purpose";
           sha256 = "1ib5ia7armghvmcw8qywcil4nxzwwakmfsp7ybawb0xr53h1w96d";
           name = "window-purpose";
         };
@@ -25673,7 +26072,7 @@
           sha256 = "1f4v0xd341qs4kfnjqhgf8j26valvg6pz4rwcz0zj0s23niy2yil";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/windsize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/windsize";
           sha256 = "1xhfw77168942rcn246qndii0hv0q6vkgzj67jg4mxh8n46m50m9";
           name = "windsize";
         };
@@ -25689,11 +26088,11 @@
         version = "0.9.0";
         src = fetchhg {
           url = "https://bitbucket.com/ArneBab/wisp";
-          rev = "34fc6f12d740";
-          sha256 = "0ppj8mrlc20i2syyiwvj5rp53swrm929h0ksxxlqvn3nvl9gsajd";
+          rev = "f41388ee99f1";
+          sha256 = "16711d1ds508nmjw81jm2cfdpqzc55gc175fkhayk0f5swlvd11m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wisp-mode";
           sha256 = "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc";
           name = "wisp-mode";
         };
@@ -25714,7 +26113,7 @@
           sha256 = "188h1sy4mxzrkwi3zgiw108c5f71rkj5agdkf9yy9v8c1bkawm4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wispjs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wispjs-mode";
           sha256 = "0qzm0dcvjndasnbqpkdc56f1qv66gxv8dfgfcwq5l1bp5wyx813p";
           name = "wispjs-mode";
         };
@@ -25727,16 +26126,16 @@
     with-editor = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "with-editor";
-        version = "2.4.0";
+        version = "2.5.0";
         src = fetchFromGitHub {
           owner = "magit";
-          repo = "magit";
-          rev = "2e757a8c919b53edddb186e36e055e011e3b0ab3";
-          sha256 = "0hklwwzi2gqywysxn16ps1fvn48max52cpk2nx7r4df4h52yk6wn";
+          repo = "with-editor";
+          rev = "580f225a6c4476feb36b707c6c705b027339717b";
+          sha256 = "0dymhkbkzicjw0379bdzbb594x5xcjbgbn428a30i2i0jwv66pfz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/with-editor";
-          sha256 = "042fa55yakdn2di4l5dilnmqpslac46wpr1zpl4xk3v3i4nn9ndv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/with-editor";
+          sha256 = "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb";
           name = "with-editor";
         };
         packageRequires = [ async dash emacs ];
@@ -25756,7 +26155,7 @@
           sha256 = "0nmzh6dynbm8vglp4pqz81s2z68jbnasvamvi1x1iawf8g9zfyix";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wn-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wn-mode";
           sha256 = "1qy1pkfdnm4pska4cnff9cx2c812ilymajhpmsfc9jdbvhzwrwg3";
           name = "wn-mode";
         };
@@ -25777,7 +26176,7 @@
           sha256 = "018r35dz8z03wcrx9s28pjisayy21549i232mp6wy9mxkrkxbzpc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wonderland";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wonderland";
           sha256 = "1b4p49mbzqffm2b2y8sbbi56vnkxap2jscsmla9l6l8brybqjppi";
           name = "wonderland";
         };
@@ -25798,7 +26197,7 @@
           sha256 = "0s3mjmfjiidn3spklndw0dvcwbb9x034xyphp60aad8vjaflbchs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wordsmith-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wordsmith-mode";
           sha256 = "1570h1sjjaks6bnhd4xrbx6nna4v7hz6dmrzwjq37rwvallasg1n";
           name = "wordsmith-mode";
         };
@@ -25819,7 +26218,7 @@
           sha256 = "03hjwm51sngkh7jjiwnqhflllqq6i99ib47rm2ja9ii0qyhj1qa0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wrap-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wrap-region";
           sha256 = "0mby3m49vm2pw127divspgivqam27zd4r70wx5ra05xwfxywaibq";
           name = "wrap-region";
         };
@@ -25840,7 +26239,7 @@
           sha256 = "1nnjn1r669hvvzfycllwap4w04m8rfsk4nzcg8057m1f263kj31b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/writegood-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/writegood-mode";
           sha256 = "1lxammisaj04g5vr5lwms64ywf39w8knrq72x4i94wwzwx5ywi1d";
           name = "writegood-mode";
         };
@@ -25861,7 +26260,7 @@
           sha256 = "0f554h834p12255mhwjnxbh1ls65476k60cwddqyl844ph75w8jv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/writeroom-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/writeroom-mode";
           sha256 = "1kpsrp3agw8bg3qbf5rf5k1a7ww30q5xsa8z5ywxajsaywjzx1bk";
           name = "writeroom-mode";
         };
@@ -25882,7 +26281,7 @@
           sha256 = "1lv0l27lrp6xyl0c5yhlnyjwx872izq02z8x34da9jv3walxpk8f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ws-butler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ws-butler";
           sha256 = "072k67z2lx0ampwzdiszi64xs0w6frp4nbmrd2r0wpx0pd211vbn";
           name = "ws-butler";
         };
@@ -25903,7 +26302,7 @@
           sha256 = "0qfbf9xmln60yd0na1508xmxkvnx0pis4dvbf16cjv0i41dq6i87";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/wsd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wsd-mode";
           sha256 = "07vclmnj18wx9wlrcnsl99f9jlk3sb9g6pcdv8x1smk84gccpakc";
           name = "wsd-mode";
         };
@@ -25924,7 +26323,7 @@
           sha256 = "13id1vf590gc0kwkhh6mgq2gj2bra2kycxjlvql7v0s7cdvamjhq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/x86-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/x86-lookup";
           sha256 = "1clv1npvdkzsy0a08xrb880yflwzl4d5cc2c5xrs7b837mqpj8hd";
           name = "x86-lookup";
         };
@@ -25945,7 +26344,7 @@
           sha256 = "154xnfcmil9xjjmq4cyrfpir4ga4mgcmmbd7dja1m7rpk1734xk6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xbm-life";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xbm-life";
           sha256 = "1pglxjd4cs630sayx17ai1xflpbyj3hry3156682bgwhqs1vw68q";
           name = "xbm-life";
         };
@@ -25966,7 +26365,7 @@
           sha256 = "1n1msmqap4a2qnjwrchf9cjkzcl20hbrx0vsc4lkbvq3p5riv5p7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xcscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xcscope";
           sha256 = "06xh29cm5v3b5xwj32y0i0h0kvvy995840db4hvab2wn9jw68m8w";
           name = "xcscope";
         };
@@ -25979,15 +26378,15 @@
     xquery-tool = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xquery-tool";
-        version = "0.1.3";
+        version = "0.1.8";
         src = fetchFromGitHub {
           owner = "paddymcall";
           repo = "xquery-tool.el";
-          rev = "248db2c5bace1232508ad69a5616205dda92d5cf";
-          sha256 = "1yxf0byq6d4cl3g25q4f2fqp4x9zpz1hm74yg9v1nr0lk5sgas95";
+          rev = "126164abeb77bd7932c73590939637895005c48b";
+          sha256 = "1yy759qc4njc8bqh8hmgc0mq5vk5spz5syxgflqhjijk8nrvyfgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xquery-tool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xquery-tool";
           sha256 = "069injmvv9zzcbqbms94qx5wjj740jnik6sf3b4xjhln7z1yskp0";
           name = "xquery-tool";
         };
@@ -26008,7 +26407,7 @@
           sha256 = "1zdj4664gvwc4kyx7fx5232l3c5anm0xyrrnrw596q604q6xxj2x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xterm-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xterm-color";
           sha256 = "0bvzi1mkxgm4vbq2va1sr0k9h3fdmppq79hkvbizc2xgk72sazpj";
           name = "xterm-color";
         };
@@ -26029,7 +26428,7 @@
           sha256 = "1wqx6hlqcmqiljydih5fx89dw06g8w728pyn4iqsap8jwgjngb09";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/xtest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xtest";
           sha256 = "1vbs4sb4frzg8d3l96ip9cc6lc86nbj50vpdfqazvxmdfd1sg4i7";
           name = "xtest";
         };
@@ -26050,7 +26449,7 @@
           sha256 = "1rplafm6mldsirj7xg66vsx03n263yii3il3fkws69xmv7sx1a6i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yafolding";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yafolding";
           sha256 = "1z70ismfwmh9a83a7h5lbhw7iywfib5fis7y8gx8020wfjq9g2yq";
           name = "yafolding";
         };
@@ -26071,7 +26470,7 @@
           sha256 = "0l9b888wv72j4hhkcfzsh09iqjxp2qjbjcjcfmvfhxf7il11pv8h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yagist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yagist";
           sha256 = "1mz86fq0pb4w54c66vd19m2492mkrzq2qi6ssnn2xwmn8vv02wdd";
           name = "yagist";
         };
@@ -26092,7 +26491,7 @@
           sha256 = "1mj1gwrflpdlmc7wl1axygn1jqlrjys1dh3cpdh27zrgsjvhd6c1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yaml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yaml-mode";
           sha256 = "0afp83xcr8h153cayyaszwkgpap0iyk351dlykmv6bv9d2m774mc";
           name = "yaml-mode";
         };
@@ -26113,7 +26512,7 @@
           sha256 = "007837w6gd7k253h7g2in6l3ihcbwv733yiffs26pnymgk21xdqz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yascroll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yascroll";
           sha256 = "11g7wn4hgdwnx3n7ra0sh8gk6rykwvrg9g2cihvcv7mjbqgcv53f";
           name = "yascroll";
         };
@@ -26126,15 +26525,15 @@
     yasnippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yasnippet";
-        version = "0.9.0.1";
+        version = "0.9.1snapshot";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "yasnippet";
-          rev = "be2f815c43deb74e0f809ed47debc4aa2e67ea1e";
-          sha256 = "04cqcv10i6mym8j9fhd4fklmwa1q4nfg99kpp0bwx7issqhziqv5";
+          rev = "80941c077f8248ee1e8dcc64b3b57e741b9e5755";
+          sha256 = "0m6y2m2nsg6camwh0hjv9jcw6p5a0b4dwig1d58s2g15n3hca3dy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yasnippet";
           sha256 = "1j6hcpzxljz1axh0xfbwr4ysbixkwgxawsvsgicls8r8kl2xvjvf";
           name = "yasnippet";
         };
@@ -26155,7 +26554,7 @@
           sha256 = "1yplaj7pry43qps8hvqxj9983ah4jvaiq94l171a7f8qi28386s8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yatemplate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yatemplate";
           sha256 = "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q";
           name = "yatemplate";
         };
@@ -26174,7 +26573,7 @@
           sha256 = "08iwfpsjs36pqr2l85avxhsjx8z0sdfw8cqwwf3brn7i4x67f7z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yatex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yatex";
           sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6";
           name = "yatex";
         };
@@ -26195,7 +26594,7 @@
           sha256 = "0nqyn1b01v1qxv7rcf46qypca61lmpm8d7kqv63jazw3n05qdnj8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yaxception";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yaxception";
           sha256 = "18n2kjbgfhkhcwigxmv8dk72jp57vsqqd20lc26v5amx6mrhgh58";
           name = "yaxception";
         };
@@ -26216,7 +26615,7 @@
           sha256 = "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ycmd";
           sha256 = "06psmcr5132vn72l0amzj14dy43aradnbmlvvms55srvici6r60q";
           name = "ycmd";
         };
@@ -26237,7 +26636,7 @@
           sha256 = "0yvz7lmid4jcikb9jmc7h2lcry3fdyy809k25nyasj2bk41xqqsd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/yesql-ghosts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yesql-ghosts";
           sha256 = "1hxzbnfd15f0ifdqjbw9nhxd0z46x705v2bc0xl71nav78fgpswf";
           name = "yesql-ghosts";
         };
@@ -26258,7 +26657,7 @@
           sha256 = "0016qff7hdnd0xkyhxakfzzscwlwkpzppvc4wxfw0iacpjkz1fnr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/youdao-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/youdao-dictionary";
           sha256 = "1qfk7s18br9jask1bpida0cjxks098qpz0ssmw8misi3bjax0fym";
           name = "youdao-dictionary";
         };
@@ -26279,7 +26678,7 @@
           sha256 = "0bgq34k7p9qkxhrg7dvmkfpi1r47czyw12l0cm93z3m817z5hjrk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zenburn-theme";
           sha256 = "1kb371j9aissj0vy07jw4ydfn554blc8b2rbi0x1dvfksr2rhsn9";
           name = "zenburn-theme";
         };
@@ -26300,7 +26699,7 @@
           sha256 = "1pxy6ia7di3i5kigybkz78f7fgbsyr1js9asrfbbx3kkpxpm2vfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zerodark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zerodark-theme";
           sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9";
           name = "zerodark-theme";
         };
@@ -26321,7 +26720,7 @@
           sha256 = "1ksjd3askc3k1l0b3nia5mzkxa74bidh2x0xlrj4qs4im5445vnz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zombie-trellys-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zombie-trellys-mode";
           sha256 = "19xzvppw7f35s82hm0y7sga8dyjjyy0dxy6vji4hxdpjziz7lggv";
           name = "zombie-trellys-mode";
         };
@@ -26342,7 +26741,7 @@
           sha256 = "1lrgirfvcvbir7csshkhhwj99jj1x5aprhw7xfiicv7nan9m6gjy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zone-nyan";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zone-nyan";
           sha256 = "165sgjaahz038isii971m02hr2g5iqhbhiwf5kdn8c739cjaa17b";
           name = "zone-nyan";
         };
@@ -26363,7 +26762,7 @@
           sha256 = "1dwf3980rnwc85s73j8accwgpcdhsa6fqdrppbrqb8f7c05q8303";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zoom-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zoom-window";
           sha256 = "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3";
           name = "zoom-window";
         };
@@ -26384,7 +26783,7 @@
           sha256 = "0j6x3az8vpq2ggafjxdl8x3ln7lhh58c27z72mwywp4a2ca1g496";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zop-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zop-to-char";
           sha256 = "0jnspvqqvnaplld083j7cqqxw122qazh88ab7hymci36m3ka9hga";
           name = "zop-to-char";
         };
@@ -26405,7 +26804,7 @@
           sha256 = "0qwdbzfi8mddmchdd9ab9ms1ynlc8dx08i6g2mf3za1sbcivdqsr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zotelo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zotelo";
           sha256 = "0ai516lqj9yw7ymvfm4n5inv53sp6mg90wy56lr1laflizwxzg8z";
           name = "zotelo";
         };
@@ -26426,7 +26825,7 @@
           sha256 = "0v73fgb0gf81vlihiicy32v6x86rr2hv0bxlpw7d3pk4ng1a0l3z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zygospore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zygospore";
           sha256 = "03mmxqbliwd1g73cxd9kqkngdy4jdavcs6j12b4wp27xmhgaj40z";
           name = "zygospore";
         };
@@ -26439,15 +26838,15 @@
     zzz-to-char = callPackage ({ avy, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zzz-to-char";
-        version = "0.1.0";
+        version = "0.1.1";
         src = fetchFromGitHub {
           owner = "mrkkrp";
           repo = "zzz-to-char";
-          rev = "82dc3382e58091ae32160a91e8c781b813faf856";
-          sha256 = "1hif9jrp4w7xvca0a4qm29scpkwhf5n61c4i5x8n5p7gbwjhh98q";
+          rev = "efbe99c9163602f23408abaea70ffe292632bf26";
+          sha256 = "0y0hhar3krkvbpb5y9k197mb0wfpz8cl6fmxazq8msjml7hkk339";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/zzz-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zzz-to-char";
           sha256 = "16vwp0krshmn5x3ry1j512g4kydx39znjqzri4j7wgg49bz1n7vh";
           name = "zzz-to-char";
         };

From 712eb6b7e044284bf5043e8c2c539ecf8621096e Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Thu, 4 Feb 2016 22:41:07 -0800
Subject: [PATCH 1073/2285] docker 1.9.1 -> 1.10.0

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

diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix
index 31daedd6d1eb..c8a40277f7a9 100644
--- a/pkgs/applications/virtualization/docker/default.nix
+++ b/pkgs/applications/virtualization/docker/default.nix
@@ -11,13 +11,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "docker-${version}";
-  version = "1.9.1";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "docker";
     rev = "v${version}";
-    sha256 = "1mhi4y820h2wxz6hqmr95c7yvklyw578dd9c83jr463w7rq0rgr6";
+    sha256 = "0c3a504gjdh4mxvifi0wcppqhd786d1gxncf04dqlq3l5wisfbbw";
   };
 
   buildInputs = [

From 34f59ae3906fb2ee403624e7ea9407028f846cf6 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Thu, 4 Feb 2016 22:41:35 -0800
Subject: [PATCH 1074/2285] rkt 0.15.0 -> 1.0.0 + trousers

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

diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 43228b255a24..034f81556f1d 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -1,15 +1,15 @@
-{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg1, squashfsTools,
+{ stdenv, lib, autoreconfHook, acl, go, file, git, wget, gnupg1, trousers, squashfsTools,
   cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper }:
 
 let
-  coreosImageRelease = "794.1.0";
-  coreosImageSystemdVersion = "222";
+  coreosImageRelease = "835.12.0";
+  coreosImageSystemdVersion = "225";
 
   # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor.
   stage1Flavours = [ "coreos" "fly" "host" ];
 
 in stdenv.mkDerivation rec {
-  version = "0.15.0";
+  version = "1.0.0";
   name = "rkt-${version}";
   BUILDDIR="build-${name}";
 
@@ -17,16 +17,16 @@ in stdenv.mkDerivation rec {
       rev = "v${version}";
       owner = "coreos";
       repo = "rkt";
-      sha256 = "1pw14r38p8sdkma37xx0yy3zx5yxqc12zj35anmlbmrgw4vdgavf";
+      sha256 = "1m76hzx550dh35jpb8m46ks04ac3dfy4rg054v035rpwgh50ac6h";
   };
 
   stage1BaseImage = fetchurl {
-    url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
-    sha256 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym";
+    url = "http://stable.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
+    sha256 = "0djzgfcqr9yy13i415204ji82lrk8mvdhl9rxjr123j1glf5sdh3";
   };
 
   buildInputs = [
-    autoreconfHook go file git wget gnupg1 squashfsTools cpio acl systemd
+    autoreconfHook go file git wget gnupg1 trousers squashfsTools cpio acl systemd
     makeWrapper
   ];
 

From f3cce60346426c494d3a28ababd58b45fa92cb3c Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Thu, 4 Feb 2016 17:54:50 -0800
Subject: [PATCH 1075/2285] azure-cli 0.9.13 -> 0.9.15

---
 .../azure-cli/node-packages.nix               | 719 +++++++++---------
 1 file changed, 363 insertions(+), 356 deletions(-)

diff --git a/pkgs/tools/virtualization/azure-cli/node-packages.nix b/pkgs/tools/virtualization/azure-cli/node-packages.nix
index 9601e4215abe..2cf7380caee7 100644
--- a/pkgs/tools/virtualization/azure-cli/node-packages.nix
+++ b/pkgs/tools/virtualization/azure-cli/node-packages.nix
@@ -13,12 +13,12 @@
       sha1 = "ed205574c05ae93c68f0b59909588242f2c9ccf8";
     };
     deps = {
-      "date-utils-1.2.17" = self.by-version."date-utils"."1.2.17";
-      "jws-3.1.0" = self.by-version."jws"."3.1.0";
+      "date-utils-1.2.18" = self.by-version."date-utils"."1.2.18";
+      "jws-3.1.1" = self.by-version."jws"."3.1.1";
       "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1";
-      "request-2.67.0" = self.by-version."request"."2.67.0";
+      "request-2.69.0" = self.by-version."request"."2.69.0";
       "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
-      "xmldom-0.1.20" = self.by-version."xmldom"."0.1.20";
+      "xmldom-0.1.22" = self.by-version."xmldom"."0.1.22";
       "xpath.js-1.0.6" = self.by-version."xpath.js"."1.0.6";
       "async-1.5.2" = self.by-version."async"."1.5.2";
     };
@@ -40,12 +40,12 @@
       sha1 = "7946eb374c837730bd3cc49b0894928154e505d0";
     };
     deps = {
-      "date-utils-1.2.17" = self.by-version."date-utils"."1.2.17";
-      "jws-3.1.0" = self.by-version."jws"."3.1.0";
+      "date-utils-1.2.18" = self.by-version."date-utils"."1.2.18";
+      "jws-3.1.1" = self.by-version."jws"."3.1.1";
       "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1";
-      "request-2.67.0" = self.by-version."request"."2.67.0";
+      "request-2.69.0" = self.by-version."request"."2.69.0";
       "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
-      "xmldom-0.1.20" = self.by-version."xmldom"."0.1.20";
+      "xmldom-0.1.22" = self.by-version."xmldom"."0.1.22";
       "xpath.js-1.0.6" = self.by-version."xpath.js"."1.0.6";
       "async-1.5.2" = self.by-version."async"."1.5.2";
     };
@@ -150,47 +150,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."asn1.js"."^2.0.3" =
-    self.by-version."asn1.js"."2.2.1";
-  by-version."asn1.js"."2.2.1" = self.buildNodePackage {
-    name = "asn1.js-2.2.1";
-    version = "2.2.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/asn1.js/-/asn1.js-2.2.1.tgz";
-      name = "asn1.js-2.2.1.tgz";
-      sha1 = "c8ba4dd68e84431288126230cb2045bdfa9fbfe1";
-    };
-    deps = {
-      "bn.js-2.2.0" = self.by-version."bn.js"."2.2.0";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimalistic-assert-1.0.0" = self.by-version."minimalistic-assert"."1.0.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."assert-plus"."0.1.x" =
-    self.by-version."assert-plus"."0.1.5";
-  by-version."assert-plus"."0.1.5" = self.buildNodePackage {
-    name = "assert-plus-0.1.5";
-    version = "0.1.5";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
-      name = "assert-plus-0.1.5.tgz";
-      sha1 = "ee74009413002d84cec7219c6ac811812e723160";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."assert-plus".">=0.2.0 <0.3.0" =
     self.by-version."assert-plus"."0.2.0";
   by-version."assert-plus"."0.2.0" = self.buildNodePackage {
@@ -212,6 +171,25 @@
   };
   by-spec."assert-plus"."^0.1.5" =
     self.by-version."assert-plus"."0.1.5";
+  by-version."assert-plus"."0.1.5" = self.buildNodePackage {
+    name = "assert-plus-0.1.5";
+    version = "0.1.5";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
+      name = "assert-plus-0.1.5.tgz";
+      sha1 = "ee74009413002d84cec7219c6ac811812e723160";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."assert-plus"."^0.2.0" =
+    self.by-version."assert-plus"."0.2.0";
   by-spec."async"."0.1.x" =
     self.by-version."async"."0.1.22";
   by-version."async"."0.1.22" = self.buildNodePackage {
@@ -347,6 +325,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."aws4"."^1.2.1" =
+    self.by-version."aws4"."1.2.1";
+  by-version."aws4"."1.2.1" = self.buildNodePackage {
+    name = "aws4-1.2.1";
+    version = "1.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/aws4/-/aws4-1.2.1.tgz";
+      name = "aws4-1.2.1.tgz";
+      sha1 = "52b5659a4d32583d405f65e1124ac436d07fe5ac";
+    };
+    deps = {
+      "lru-cache-2.7.3" = self.by-version."lru-cache"."2.7.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."azure-arm-apiapp"."0.1.3" =
     self.by-version."azure-arm-apiapp"."0.1.3";
   by-version."azure-arm-apiapp"."0.1.3" = self.buildNodePackage {
@@ -410,20 +408,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."azure-arm-compute"."0.13.0" =
-    self.by-version."azure-arm-compute"."0.13.0";
-  by-version."azure-arm-compute"."0.13.0" = self.buildNodePackage {
-    name = "azure-arm-compute-0.13.0";
-    version = "0.13.0";
+  by-spec."azure-arm-compute"."0.14.0" =
+    self.by-version."azure-arm-compute"."0.14.0";
+  by-version."azure-arm-compute"."0.14.0" = self.buildNodePackage {
+    name = "azure-arm-compute-0.14.0";
+    version = "0.14.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.13.0.tgz";
-      name = "azure-arm-compute-0.13.0.tgz";
-      sha1 = "0442a5f9d49d9dea8fc7391a100c916e19e0b1d9";
+      url = "http://registry.npmjs.org/azure-arm-compute/-/azure-arm-compute-0.14.0.tgz";
+      name = "azure-arm-compute-0.14.0.tgz";
+      sha1 = "5c2d2b981541b703335294a60718bd96a19cd285";
     };
     deps = {
-      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
-      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
+      "ms-rest-1.9.0" = self.by-version."ms-rest"."1.9.0";
+      "ms-rest-azure-1.9.0" = self.by-version."ms-rest-azure"."1.9.0";
     };
     optionalDependencies = {
     };
@@ -444,7 +442,7 @@
     };
     deps = {
       "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
-      "moment-2.11.1" = self.by-version."moment"."2.11.1";
+      "moment-2.11.2" = self.by-version."moment"."2.11.2";
       "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
       "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
     };
@@ -559,19 +557,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."azure-arm-network"."0.10.6" =
-    self.by-version."azure-arm-network"."0.10.6";
-  by-version."azure-arm-network"."0.10.6" = self.buildNodePackage {
-    name = "azure-arm-network-0.10.6";
-    version = "0.10.6";
+  by-spec."azure-arm-network"."0.12.0" =
+    self.by-version."azure-arm-network"."0.12.0";
+  by-version."azure-arm-network"."0.12.0" = self.buildNodePackage {
+    name = "azure-arm-network-0.12.0";
+    version = "0.12.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.10.6.tgz";
-      name = "azure-arm-network-0.10.6.tgz";
-      sha1 = "d7e77e34fe41007a54154475185ac405e59073b3";
+      url = "http://registry.npmjs.org/azure-arm-network/-/azure-arm-network-0.12.0.tgz";
+      name = "azure-arm-network-0.12.0.tgz";
+      sha1 = "676f042f643c49d2af0071dd809789b53a70162b";
     };
     deps = {
-      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+      "ms-rest-1.9.0" = self.by-version."ms-rest"."1.9.0";
+      "ms-rest-azure-1.9.0" = self.by-version."ms-rest-azure"."1.9.0";
     };
     optionalDependencies = {
     };
@@ -579,20 +578,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."azure-arm-rediscache"."0.1.0" =
-    self.by-version."azure-arm-rediscache"."0.1.0";
-  by-version."azure-arm-rediscache"."0.1.0" = self.buildNodePackage {
-    name = "azure-arm-rediscache-0.1.0";
-    version = "0.1.0";
+  by-spec."azure-arm-rediscache"."0.2.0" =
+    self.by-version."azure-arm-rediscache"."0.2.0";
+  by-version."azure-arm-rediscache"."0.2.0" = self.buildNodePackage {
+    name = "azure-arm-rediscache-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.1.0.tgz";
-      name = "azure-arm-rediscache-0.1.0.tgz";
-      sha1 = "2527ce57541fc5264627f93f62e4ffcfd01df498";
+      url = "http://registry.npmjs.org/azure-arm-rediscache/-/azure-arm-rediscache-0.2.0.tgz";
+      name = "azure-arm-rediscache-0.2.0.tgz";
+      sha1 = "cd9a25e4a2e0e58accdba5064811ddaa62eafeef";
     };
     deps = {
-      "ms-rest-1.2.0" = self.by-version."ms-rest"."1.2.0";
-      "ms-rest-azure-1.2.0" = self.by-version."ms-rest-azure"."1.2.0";
+      "ms-rest-1.9.0" = self.by-version."ms-rest"."1.9.0";
+      "ms-rest-azure-1.9.0" = self.by-version."ms-rest-azure"."1.9.0";
     };
     optionalDependencies = {
     };
@@ -621,19 +620,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."azure-arm-storage"."0.11.0" =
-    self.by-version."azure-arm-storage"."0.11.0";
-  by-version."azure-arm-storage"."0.11.0" = self.buildNodePackage {
-    name = "azure-arm-storage-0.11.0";
-    version = "0.11.0";
+  by-spec."azure-arm-storage"."0.12.1-preview" =
+    self.by-version."azure-arm-storage"."0.12.1-preview";
+  by-version."azure-arm-storage"."0.12.1-preview" = self.buildNodePackage {
+    name = "azure-arm-storage-0.12.1-preview";
+    version = "0.12.1-preview";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.11.0.tgz";
-      name = "azure-arm-storage-0.11.0.tgz";
-      sha1 = "ba5bc8d616b835ddb6149d462a424d534ac87c95";
+      url = "http://registry.npmjs.org/azure-arm-storage/-/azure-arm-storage-0.12.1-preview.tgz";
+      name = "azure-arm-storage-0.12.1-preview.tgz";
+      sha1 = "e793fe390348d809763623bbdc7ab5a7d1dd0d27";
     };
     deps = {
-      "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
+      "ms-rest-1.9.0" = self.by-version."ms-rest"."1.9.0";
+      "ms-rest-azure-1.9.0" = self.by-version."ms-rest-azure"."1.9.0";
     };
     optionalDependencies = {
     };
@@ -641,16 +641,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."azure-arm-trafficmanager"."0.10.4" =
-    self.by-version."azure-arm-trafficmanager"."0.10.4";
-  by-version."azure-arm-trafficmanager"."0.10.4" = self.buildNodePackage {
-    name = "azure-arm-trafficmanager-0.10.4";
-    version = "0.10.4";
+  by-spec."azure-arm-trafficmanager"."0.10.5" =
+    self.by-version."azure-arm-trafficmanager"."0.10.5";
+  by-version."azure-arm-trafficmanager"."0.10.5" = self.buildNodePackage {
+    name = "azure-arm-trafficmanager-0.10.5";
+    version = "0.10.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-0.10.4.tgz";
-      name = "azure-arm-trafficmanager-0.10.4.tgz";
-      sha1 = "f1a788c3c97c7c6f8d82cef6034bbdbe68bb29e3";
+      url = "http://registry.npmjs.org/azure-arm-trafficmanager/-/azure-arm-trafficmanager-0.10.5.tgz";
+      name = "azure-arm-trafficmanager-0.10.5.tgz";
+      sha1 = "b42683cb6dfdfed0f93875d72a0b8a53b3204d01";
     };
     deps = {
       "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
@@ -891,15 +891,15 @@
     cpu = [ ];
   };
   by-spec."azure-cli"."*" =
-    self.by-version."azure-cli"."0.9.13";
-  by-version."azure-cli"."0.9.13" = self.buildNodePackage {
-    name = "azure-cli-0.9.13";
-    version = "0.9.13";
+    self.by-version."azure-cli"."0.9.15";
+  by-version."azure-cli"."0.9.15" = self.buildNodePackage {
+    name = "azure-cli-0.9.15";
+    version = "0.9.15";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/azure-cli/-/azure-cli-0.9.13.tgz";
-      name = "azure-cli-0.9.13.tgz";
-      sha1 = "6792c21c0b826d07759e0c7e9b718c291be1381f";
+      url = "http://registry.npmjs.org/azure-cli/-/azure-cli-0.9.15.tgz";
+      name = "azure-cli-0.9.15.tgz";
+      sha1 = "c629199efd96c217c8b4341c5b8489c119fdbe4a";
     };
     deps = {
       "adal-node-0.1.17" = self.by-version."adal-node"."0.1.17";
@@ -908,18 +908,18 @@
       "azure-arm-apiapp-0.1.3" = self.by-version."azure-arm-apiapp"."0.1.3";
       "azure-arm-authorization-2.0.0" = self.by-version."azure-arm-authorization"."2.0.0";
       "azure-arm-commerce-0.1.1" = self.by-version."azure-arm-commerce"."0.1.1";
-      "azure-arm-compute-0.13.0" = self.by-version."azure-arm-compute"."0.13.0";
+      "azure-arm-compute-0.14.0" = self.by-version."azure-arm-compute"."0.14.0";
       "azure-arm-hdinsight-0.1.0" = self.by-version."azure-arm-hdinsight"."0.1.0";
       "azure-arm-hdinsight-jobs-0.1.0" = self.by-version."azure-arm-hdinsight-jobs"."0.1.0";
       "azure-arm-insights-0.10.2" = self.by-version."azure-arm-insights"."0.10.2";
-      "azure-arm-network-0.10.6" = self.by-version."azure-arm-network"."0.10.6";
-      "azure-arm-trafficmanager-0.10.4" = self.by-version."azure-arm-trafficmanager"."0.10.4";
+      "azure-arm-network-0.12.0" = self.by-version."azure-arm-network"."0.12.0";
+      "azure-arm-trafficmanager-0.10.5" = self.by-version."azure-arm-trafficmanager"."0.10.5";
       "azure-arm-dns-0.10.1" = self.by-version."azure-arm-dns"."0.10.1";
       "azure-arm-website-0.10.0" = self.by-version."azure-arm-website"."0.10.0";
-      "azure-arm-rediscache-0.1.0" = self.by-version."azure-arm-rediscache"."0.1.0";
+      "azure-arm-rediscache-0.2.0" = self.by-version."azure-arm-rediscache"."0.2.0";
       "azure-arm-datalake-analytics-0.1.2" = self.by-version."azure-arm-datalake-analytics"."0.1.2";
       "azure-arm-datalake-store-0.1.2" = self.by-version."azure-arm-datalake-store"."0.1.2";
-      "azure-extra-0.1.12" = self.by-version."azure-extra"."0.1.12";
+      "azure-extra-0.2.12" = self.by-version."azure-extra"."0.2.12";
       "azure-gallery-2.0.0-pre.18" = self.by-version."azure-gallery"."2.0.0-pre.18";
       "azure-keyvault-0.10.1" = self.by-version."azure-keyvault"."0.10.1";
       "azure-asm-compute-0.11.0" = self.by-version."azure-asm-compute"."0.11.0";
@@ -929,13 +929,13 @@
       "azure-monitoring-0.10.2" = self.by-version."azure-monitoring"."0.10.2";
       "azure-asm-network-0.10.2" = self.by-version."azure-asm-network"."0.10.2";
       "azure-arm-resource-0.10.7" = self.by-version."azure-arm-resource"."0.10.7";
-      "azure-arm-storage-0.11.0" = self.by-version."azure-arm-storage"."0.11.0";
+      "azure-arm-storage-0.12.1-preview" = self.by-version."azure-arm-storage"."0.12.1-preview";
       "azure-asm-sb-0.10.1" = self.by-version."azure-asm-sb"."0.10.1";
       "azure-asm-sql-0.10.1" = self.by-version."azure-asm-sql"."0.10.1";
       "azure-asm-storage-0.10.1" = self.by-version."azure-asm-storage"."0.10.1";
       "azure-asm-subscription-0.10.1" = self.by-version."azure-asm-subscription"."0.10.1";
       "azure-asm-website-0.10.1" = self.by-version."azure-asm-website"."0.10.1";
-      "azure-storage-0.6.0" = self.by-version."azure-storage"."0.6.0";
+      "azure-storage-0.7.0" = self.by-version."azure-storage"."0.7.0";
       "caller-id-0.1.0" = self.by-version."caller-id"."0.1.0";
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
       "commander-1.0.4" = self.by-version."commander"."1.0.4";
@@ -950,7 +950,7 @@
       "kuduscript-1.0.6" = self.by-version."kuduscript"."1.0.6";
       "mime-1.2.11" = self.by-version."mime"."1.2.11";
       "moment-2.6.0" = self.by-version."moment"."2.6.0";
-      "ms-rest-azure-1.2.0" = self.by-version."ms-rest-azure"."1.2.0";
+      "ms-rest-azure-1.9.0" = self.by-version."ms-rest-azure"."1.9.0";
       "node-forge-0.6.23" = self.by-version."node-forge"."0.6.23";
       "node-uuid-1.2.0" = self.by-version."node-uuid"."1.2.0";
       "number-is-nan-1.0.0" = self.by-version."number-is-nan"."1.0.0";
@@ -980,7 +980,7 @@
     os = [ ];
     cpu = [ ];
   };
-  "azure-cli" = self.by-version."azure-cli"."0.9.13";
+  "azure-cli" = self.by-version."azure-cli"."0.9.15";
   by-spec."azure-common"."0.9.12" =
     self.by-version."azure-common"."0.9.12";
   by-version."azure-common"."0.9.12" = self.buildNodePackage {
@@ -997,7 +997,7 @@
       "xmlbuilder-0.4.3" = self.by-version."xmlbuilder"."0.4.3";
       "dateformat-1.0.2-1.2.3" = self.by-version."dateformat"."1.0.2-1.2.3";
       "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
-      "tunnel-0.0.3" = self.by-version."tunnel"."0.0.3";
+      "tunnel-0.0.4" = self.by-version."tunnel"."0.0.4";
       "request-2.45.0" = self.by-version."request"."2.45.0";
       "validator-3.1.0" = self.by-version."validator"."3.1.0";
       "envconf-0.0.4" = self.by-version."envconf"."0.0.4";
@@ -1026,7 +1026,7 @@
       "xmlbuilder-0.4.3" = self.by-version."xmlbuilder"."0.4.3";
       "dateformat-1.0.2-1.2.3" = self.by-version."dateformat"."1.0.2-1.2.3";
       "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
-      "tunnel-0.0.3" = self.by-version."tunnel"."0.0.3";
+      "tunnel-0.0.4" = self.by-version."tunnel"."0.0.4";
       "request-2.45.0" = self.by-version."request"."2.45.0";
       "validator-3.22.2" = self.by-version."validator"."3.22.2";
       "envconf-0.0.4" = self.by-version."envconf"."0.0.4";
@@ -1043,16 +1043,16 @@
     self.by-version."azure-common"."0.9.16";
   by-spec."azure-common"."^0.9.13" =
     self.by-version."azure-common"."0.9.16";
-  by-spec."azure-extra"."0.1.12" =
-    self.by-version."azure-extra"."0.1.12";
-  by-version."azure-extra"."0.1.12" = self.buildNodePackage {
-    name = "azure-extra-0.1.12";
-    version = "0.1.12";
+  by-spec."azure-extra"."0.2.12" =
+    self.by-version."azure-extra"."0.2.12";
+  by-version."azure-extra"."0.2.12" = self.buildNodePackage {
+    name = "azure-extra-0.2.12";
+    version = "0.2.12";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/azure-extra/-/azure-extra-0.1.12.tgz";
-      name = "azure-extra-0.1.12.tgz";
-      sha1 = "78a0c3b65e981df59e23428b56172f6337a8920a";
+      url = "http://registry.npmjs.org/azure-extra/-/azure-extra-0.2.12.tgz";
+      name = "azure-extra-0.2.12.tgz";
+      sha1 = "9fa99fb577f678eadcc4d292a9c1aed8aed9d088";
     };
     deps = {
       "azure-common-0.9.16" = self.by-version."azure-common"."0.9.16";
@@ -1129,22 +1129,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."azure-storage"."0.6.0" =
-    self.by-version."azure-storage"."0.6.0";
-  by-version."azure-storage"."0.6.0" = self.buildNodePackage {
-    name = "azure-storage-0.6.0";
-    version = "0.6.0";
+  by-spec."azure-storage"."0.7.0" =
+    self.by-version."azure-storage"."0.7.0";
+  by-version."azure-storage"."0.7.0" = self.buildNodePackage {
+    name = "azure-storage-0.7.0";
+    version = "0.7.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/azure-storage/-/azure-storage-0.6.0.tgz";
-      name = "azure-storage-0.6.0.tgz";
-      sha1 = "e856c2069d1a9a6926936d70d6854d69230e7b4a";
+      url = "http://registry.npmjs.org/azure-storage/-/azure-storage-0.7.0.tgz";
+      name = "azure-storage-0.7.0.tgz";
+      sha1 = "246fc65adf96b3332043ecbc2b0176506b8a7359";
     };
     deps = {
       "extend-1.2.1" = self.by-version."extend"."1.2.1";
-      "mime-1.2.11" = self.by-version."mime"."1.2.11";
+      "browserify-mime-1.2.9" = self.by-version."browserify-mime"."1.2.9";
       "node-uuid-1.4.7" = self.by-version."node-uuid"."1.4.7";
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
+      "readable-stream-2.0.5" = self.by-version."readable-stream"."2.0.5";
       "request-2.57.0" = self.by-version."request"."2.57.0";
       "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
       "validator-3.22.2" = self.by-version."validator"."3.22.2";
@@ -1217,15 +1217,15 @@
     cpu = [ ];
   };
   by-spec."bl"."~0.9.0" =
-    self.by-version."bl"."0.9.4";
-  by-version."bl"."0.9.4" = self.buildNodePackage {
-    name = "bl-0.9.4";
-    version = "0.9.4";
+    self.by-version."bl"."0.9.5";
+  by-version."bl"."0.9.5" = self.buildNodePackage {
+    name = "bl-0.9.5";
+    version = "0.9.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bl/-/bl-0.9.4.tgz";
-      name = "bl-0.9.4.tgz";
-      sha1 = "4702ddf72fbe0ecd82787c00c113aea1935ad0e7";
+      url = "http://registry.npmjs.org/bl/-/bl-0.9.5.tgz";
+      name = "bl-0.9.5.tgz";
+      sha1 = "c06b797af085ea00bc527afc8efcf11de2232054";
     };
     deps = {
       "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
@@ -1237,15 +1237,15 @@
     cpu = [ ];
   };
   by-spec."bl"."~1.0.0" =
-    self.by-version."bl"."1.0.0";
-  by-version."bl"."1.0.0" = self.buildNodePackage {
-    name = "bl-1.0.0";
-    version = "1.0.0";
+    self.by-version."bl"."1.0.2";
+  by-version."bl"."1.0.2" = self.buildNodePackage {
+    name = "bl-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bl/-/bl-1.0.0.tgz";
-      name = "bl-1.0.0.tgz";
-      sha1 = "ada9a8a89a6d7ac60862f7dec7db207873e0c3f5";
+      url = "http://registry.npmjs.org/bl/-/bl-1.0.2.tgz";
+      name = "bl-1.0.2.tgz";
+      sha1 = "8c66490d825ba84d560de1f62196a29555b3a0c4";
     };
     deps = {
       "readable-stream-2.0.5" = self.by-version."readable-stream"."2.0.5";
@@ -1275,25 +1275,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."bn.js"."^2.0.0" =
-    self.by-version."bn.js"."2.2.0";
-  by-version."bn.js"."2.2.0" = self.buildNodePackage {
-    name = "bn.js-2.2.0";
-    version = "2.2.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/bn.js/-/bn.js-2.2.0.tgz";
-      name = "bn.js-2.2.0.tgz";
-      sha1 = "12162bc2ae71fc40a5626c33438f3a875cd37625";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."boom"."0.4.x" =
     self.by-version."boom"."0.4.2";
   by-version."boom"."0.4.2" = self.buildNodePackage {
@@ -1334,6 +1315,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."browserify-mime"."~1.2.9" =
+    self.by-version."browserify-mime"."1.2.9";
+  by-version."browserify-mime"."1.2.9" = self.buildNodePackage {
+    name = "browserify-mime-1.2.9";
+    version = "1.2.9";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/browserify-mime/-/browserify-mime-1.2.9.tgz";
+      name = "browserify-mime-1.2.9.tgz";
+      sha1 = "aeb1af28de6c0d7a6a2ce40adb68ff18422af31f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."buffer-equal-constant-time"."^1.0.1" =
     self.by-version."buffer-equal-constant-time"."1.0.1";
   by-version."buffer-equal-constant-time"."1.0.1" = self.buildNodePackage {
@@ -1781,18 +1781,18 @@
     cpu = [ ];
   };
   by-spec."dashdash".">=1.10.1 <2.0.0" =
-    self.by-version."dashdash"."1.12.1";
-  by-version."dashdash"."1.12.1" = self.buildNodePackage {
-    name = "dashdash-1.12.1";
-    version = "1.12.1";
+    self.by-version."dashdash"."1.12.2";
+  by-version."dashdash"."1.12.2" = self.buildNodePackage {
+    name = "dashdash-1.12.2";
+    version = "1.12.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/dashdash/-/dashdash-1.12.1.tgz";
-      name = "dashdash-1.12.1.tgz";
-      sha1 = "ed5fd0f9d2dc189e1fbf11e40f6a412167203b6a";
+      url = "http://registry.npmjs.org/dashdash/-/dashdash-1.12.2.tgz";
+      name = "dashdash-1.12.2.tgz";
+      sha1 = "1c6f70588498d047b8cd5777b32ba85a5e25be36";
     };
     deps = {
-      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
+      "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0";
     };
     optionalDependencies = {
     };
@@ -1801,15 +1801,15 @@
     cpu = [ ];
   };
   by-spec."date-utils"."*" =
-    self.by-version."date-utils"."1.2.17";
-  by-version."date-utils"."1.2.17" = self.buildNodePackage {
-    name = "date-utils-1.2.17";
-    version = "1.2.17";
+    self.by-version."date-utils"."1.2.18";
+  by-version."date-utils"."1.2.18" = self.buildNodePackage {
+    name = "date-utils-1.2.18";
+    version = "1.2.18";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/date-utils/-/date-utils-1.2.17.tgz";
-      name = "date-utils-1.2.17.tgz";
-      sha1 = "b469652478afc2647917ec1c7c00d9c371f2ad53";
+      url = "http://registry.npmjs.org/date-utils/-/date-utils-1.2.18.tgz";
+      name = "date-utils-1.2.18.tgz";
+      sha1 = "6a55e61b20250e9c24d836b1eaac9b32ee255d51";
     };
     deps = {
     };
@@ -1954,18 +1954,17 @@
     cpu = [ ];
   };
   by-spec."ecdsa-sig-formatter"."^1.0.0" =
-    self.by-version."ecdsa-sig-formatter"."1.0.2";
-  by-version."ecdsa-sig-formatter"."1.0.2" = self.buildNodePackage {
-    name = "ecdsa-sig-formatter-1.0.2";
-    version = "1.0.2";
+    self.by-version."ecdsa-sig-formatter"."1.0.5";
+  by-version."ecdsa-sig-formatter"."1.0.5" = self.buildNodePackage {
+    name = "ecdsa-sig-formatter-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.2.tgz";
-      name = "ecdsa-sig-formatter-1.0.2.tgz";
-      sha1 = "2074b4bd06be5e7479c9f71e73358bc3deea4a9b";
+      url = "http://registry.npmjs.org/ecdsa-sig-formatter/-/ecdsa-sig-formatter-1.0.5.tgz";
+      name = "ecdsa-sig-formatter-1.0.5.tgz";
+      sha1 = "0d0f32b638611f6b8f36ffd305a3e512ea5444e6";
     };
     deps = {
-      "asn1.js-2.2.1" = self.by-version."asn1.js"."2.2.1";
       "base64-url-1.2.1" = self.by-version."base64-url"."1.2.1";
     };
     optionalDependencies = {
@@ -2409,7 +2408,7 @@
       "bluebird-2.10.2" = self.by-version."bluebird"."2.10.2";
       "chalk-1.1.1" = self.by-version."chalk"."1.1.1";
       "commander-2.9.0" = self.by-version."commander"."2.9.0";
-      "is-my-json-valid-2.12.3" = self.by-version."is-my-json-valid"."2.12.3";
+      "is-my-json-valid-2.12.4" = self.by-version."is-my-json-valid"."2.12.4";
     };
     optionalDependencies = {
     };
@@ -2417,21 +2416,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."har-validator"."~2.0.2" =
-    self.by-version."har-validator"."2.0.3";
-  by-version."har-validator"."2.0.3" = self.buildNodePackage {
-    name = "har-validator-2.0.3";
-    version = "2.0.3";
+  by-spec."har-validator"."~2.0.6" =
+    self.by-version."har-validator"."2.0.6";
+  by-version."har-validator"."2.0.6" = self.buildNodePackage {
+    name = "har-validator-2.0.6";
+    version = "2.0.6";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/har-validator/-/har-validator-2.0.3.tgz";
-      name = "har-validator-2.0.3.tgz";
-      sha1 = "5a9e12564a571cf0b81ef93c2157bd1617168883";
+      url = "http://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz";
+      name = "har-validator-2.0.6.tgz";
+      sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d";
     };
     deps = {
       "chalk-1.1.1" = self.by-version."chalk"."1.1.1";
       "commander-2.9.0" = self.by-version."commander"."2.9.0";
-      "is-my-json-valid-2.12.3" = self.by-version."is-my-json-valid"."2.12.3";
+      "is-my-json-valid-2.12.4" = self.by-version."is-my-json-valid"."2.12.4";
       "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
     };
     optionalDependencies = {
@@ -2507,15 +2506,15 @@
     cpu = [ ];
   };
   by-spec."hawk"."~3.1.0" =
-    self.by-version."hawk"."3.1.2";
-  by-version."hawk"."3.1.2" = self.buildNodePackage {
-    name = "hawk-3.1.2";
-    version = "3.1.2";
+    self.by-version."hawk"."3.1.3";
+  by-version."hawk"."3.1.3" = self.buildNodePackage {
+    name = "hawk-3.1.3";
+    version = "3.1.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hawk/-/hawk-3.1.2.tgz";
-      name = "hawk-3.1.2.tgz";
-      sha1 = "90c90118886e21975d1ad4ae9b3e284ed19a2de8";
+      url = "http://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz";
+      name = "hawk-3.1.3.tgz";
+      sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4";
     };
     deps = {
       "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
@@ -2612,20 +2611,20 @@
     cpu = [ ];
   };
   by-spec."http-signature"."~1.1.0" =
-    self.by-version."http-signature"."1.1.0";
-  by-version."http-signature"."1.1.0" = self.buildNodePackage {
-    name = "http-signature-1.1.0";
-    version = "1.1.0";
+    self.by-version."http-signature"."1.1.1";
+  by-version."http-signature"."1.1.1" = self.buildNodePackage {
+    name = "http-signature-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/http-signature/-/http-signature-1.1.0.tgz";
-      name = "http-signature-1.1.0.tgz";
-      sha1 = "5d2d7e9b6ef49980ad5b128d8e4ef09a31c90d95";
+      url = "http://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz";
+      name = "http-signature-1.1.1.tgz";
+      sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf";
     };
     deps = {
-      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
+      "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.2" = self.by-version."sshpk"."1.7.2";
+      "sshpk-1.7.3" = self.by-version."sshpk"."1.7.3";
     };
     optionalDependencies = {
     };
@@ -2674,7 +2673,7 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."inherits"."^2.0.1" =
+  by-spec."inherits"."~2.0.1" =
     self.by-version."inherits"."2.0.1";
   by-version."inherits"."2.0.1" = self.buildNodePackage {
     name = "inherits-2.0.1";
@@ -2693,8 +2692,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."inherits"."~2.0.1" =
-    self.by-version."inherits"."2.0.1";
   by-spec."is-finite"."^1.0.0" =
     self.by-version."is-finite"."1.0.1";
   by-version."is-finite"."1.0.1" = self.buildNodePackage {
@@ -2716,15 +2713,15 @@
     cpu = [ ];
   };
   by-spec."is-my-json-valid"."^2.12.0" =
-    self.by-version."is-my-json-valid"."2.12.3";
-  by-version."is-my-json-valid"."2.12.3" = self.buildNodePackage {
-    name = "is-my-json-valid-2.12.3";
-    version = "2.12.3";
+    self.by-version."is-my-json-valid"."2.12.4";
+  by-version."is-my-json-valid"."2.12.4" = self.buildNodePackage {
+    name = "is-my-json-valid-2.12.4";
+    version = "2.12.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.3.tgz";
-      name = "is-my-json-valid-2.12.3.tgz";
-      sha1 = "5a39d1d76b2dbb83140bbd157b1d5ee4bdc85ad6";
+      url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.4.tgz";
+      name = "is-my-json-valid-2.12.4.tgz";
+      sha1 = "d4ed2bc1d7f88daf8d0f763b3e3e39a69bd37880";
     };
     deps = {
       "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0";
@@ -2738,8 +2735,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."is-my-json-valid"."^2.12.3" =
-    self.by-version."is-my-json-valid"."2.12.3";
+  by-spec."is-my-json-valid"."^2.12.4" =
+    self.by-version."is-my-json-valid"."2.12.4";
   by-spec."is-property"."^1.0.0" =
     self.by-version."is-property"."1.0.2";
   by-version."is-property"."1.0.2" = self.buildNodePackage {
@@ -3012,7 +3009,7 @@
     deps = {
       "base64url-0.0.6" = self.by-version."base64url"."0.0.6";
       "buffer-equal-constant-time-1.0.1" = self.by-version."buffer-equal-constant-time"."1.0.1";
-      "ecdsa-sig-formatter-1.0.2" = self.by-version."ecdsa-sig-formatter"."1.0.2";
+      "ecdsa-sig-formatter-1.0.5" = self.by-version."ecdsa-sig-formatter"."1.0.5";
     };
     optionalDependencies = {
     };
@@ -3021,15 +3018,15 @@
     cpu = [ ];
   };
   by-spec."jws"."3.x.x" =
-    self.by-version."jws"."3.1.0";
-  by-version."jws"."3.1.0" = self.buildNodePackage {
-    name = "jws-3.1.0";
-    version = "3.1.0";
+    self.by-version."jws"."3.1.1";
+  by-version."jws"."3.1.1" = self.buildNodePackage {
+    name = "jws-3.1.1";
+    version = "3.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jws/-/jws-3.1.0.tgz";
-      name = "jws-3.1.0.tgz";
-      sha1 = "885a89127d24119a2a93f234ddd492337a7c85a0";
+      url = "http://registry.npmjs.org/jws/-/jws-3.1.1.tgz";
+      name = "jws-3.1.1.tgz";
+      sha1 = "34f5a424e628af4551121e860ba279f55cfa6629";
     };
     deps = {
       "base64url-1.0.5" = self.by-version."base64url"."1.0.5";
@@ -3081,6 +3078,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."lru-cache"."^2.6.5" =
+    self.by-version."lru-cache"."2.7.3";
+  by-version."lru-cache"."2.7.3" = self.buildNodePackage {
+    name = "lru-cache-2.7.3";
+    version = "2.7.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz";
+      name = "lru-cache-2.7.3.tgz";
+      sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952";
+    };
+    deps = {
+    };
+    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 {
@@ -3264,25 +3280,6 @@
     self.by-version."mime-types"."2.0.14";
   by-spec."mime-types"."~2.1.7" =
     self.by-version."mime-types"."2.1.9";
-  by-spec."minimalistic-assert"."^1.0.0" =
-    self.by-version."minimalistic-assert"."1.0.0";
-  by-version."minimalistic-assert"."1.0.0" = self.buildNodePackage {
-    name = "minimalistic-assert-1.0.0";
-    version = "1.0.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz";
-      name = "minimalistic-assert-1.0.0.tgz";
-      sha1 = "702be2dda6b37f4836bcb3f5db56641b64a1d3d3";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."minimist"."^1.1.0" =
     self.by-version."minimist"."1.2.0";
   by-version."minimist"."1.2.0" = self.buildNodePackage {
@@ -3322,15 +3319,15 @@
     cpu = [ ];
   };
   by-spec."moment"."^2.6.0" =
-    self.by-version."moment"."2.11.1";
-  by-version."moment"."2.11.1" = self.buildNodePackage {
-    name = "moment-2.11.1";
-    version = "2.11.1";
+    self.by-version."moment"."2.11.2";
+  by-version."moment"."2.11.2" = self.buildNodePackage {
+    name = "moment-2.11.2";
+    version = "2.11.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/moment/-/moment-2.11.1.tgz";
-      name = "moment-2.11.1.tgz";
-      sha1 = "bf4026413640d1b802467cf353607f8464d6af47";
+      url = "http://registry.npmjs.org/moment/-/moment-2.11.2.tgz";
+      name = "moment-2.11.2.tgz";
+      sha1 = "87968e5f95ac038c2e42ac959c75819cd3f52901";
     };
     deps = {
     };
@@ -3340,25 +3337,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ms-rest"."1.2.0" =
-    self.by-version."ms-rest"."1.2.0";
-  by-version."ms-rest"."1.2.0" = self.buildNodePackage {
-    name = "ms-rest-1.2.0";
-    version = "1.2.0";
+  by-spec."ms-rest"."^1.8.0" =
+    self.by-version."ms-rest"."1.9.0";
+  by-version."ms-rest"."1.9.0" = self.buildNodePackage {
+    name = "ms-rest-1.9.0";
+    version = "1.9.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ms-rest/-/ms-rest-1.2.0.tgz";
-      name = "ms-rest-1.2.0.tgz";
-      sha1 = "269ad1efe28c3ab92bd3db46c6eefd8740946380";
+      url = "http://registry.npmjs.org/ms-rest/-/ms-rest-1.9.0.tgz";
+      name = "ms-rest-1.9.0.tgz";
+      sha1 = "12b20c5477874c1ec09133b5fa77ea4bb67824ce";
     };
     deps = {
-      "underscore-1.4.4" = self.by-version."underscore"."1.4.4";
-      "tunnel-0.0.3" = self.by-version."tunnel"."0.0.3";
+      "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
+      "tunnel-0.0.4" = self.by-version."tunnel"."0.0.4";
       "request-2.52.0" = self.by-version."request"."2.52.0";
       "validator-3.1.0" = self.by-version."validator"."3.1.0";
       "duplexer-0.1.1" = self.by-version."duplexer"."0.1.1";
       "through-2.3.8" = self.by-version."through"."2.3.8";
       "tough-cookie-2.2.1" = self.by-version."tough-cookie"."2.2.1";
+      "moment-2.11.2" = self.by-version."moment"."2.11.2";
     };
     optionalDependencies = {
     };
@@ -3366,22 +3364,26 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ms-rest-azure"."1.2.0" =
-    self.by-version."ms-rest-azure"."1.2.0";
-  by-version."ms-rest-azure"."1.2.0" = self.buildNodePackage {
-    name = "ms-rest-azure-1.2.0";
-    version = "1.2.0";
+  by-spec."ms-rest"."^1.9.0" =
+    self.by-version."ms-rest"."1.9.0";
+  by-spec."ms-rest-azure"."^1.8.0" =
+    self.by-version."ms-rest-azure"."1.9.0";
+  by-version."ms-rest-azure"."1.9.0" = self.buildNodePackage {
+    name = "ms-rest-azure-1.9.0";
+    version = "1.9.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.2.0.tgz";
-      name = "ms-rest-azure-1.2.0.tgz";
-      sha1 = "5a9e137963d5c7d28f188aa93e5df2e8bc44ca9b";
+      url = "http://registry.npmjs.org/ms-rest-azure/-/ms-rest-azure-1.9.0.tgz";
+      name = "ms-rest-azure-1.9.0.tgz";
+      sha1 = "b172ac72f890ac31511e9c68899f4aa4d50c5bd1";
     };
     deps = {
       "async-0.2.7" = self.by-version."async"."0.2.7";
       "uuid-2.0.1" = self.by-version."uuid"."2.0.1";
       "adal-node-0.1.16" = self.by-version."adal-node"."0.1.16";
-      "ms-rest-1.2.0" = self.by-version."ms-rest"."1.2.0";
+      "ms-rest-1.9.0" = self.by-version."ms-rest"."1.9.0";
+      "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
+      "moment-2.11.2" = self.by-version."moment"."2.11.2";
     };
     optionalDependencies = {
     };
@@ -3531,15 +3533,15 @@
     cpu = [ ];
   };
   by-spec."oauth-sign"."~0.8.0" =
-    self.by-version."oauth-sign"."0.8.0";
-  by-version."oauth-sign"."0.8.0" = self.buildNodePackage {
-    name = "oauth-sign-0.8.0";
-    version = "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";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.0.tgz";
-      name = "oauth-sign-0.8.0.tgz";
-      sha1 = "938fdc875765ba527137d8aec9d178e24debc553";
+      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz";
+      name = "oauth-sign-0.8.1.tgz";
+      sha1 = "182439bdb91378bf7460e75c64ea43e6448def06";
     };
     deps = {
     };
@@ -3648,15 +3650,15 @@
     cpu = [ ];
   };
   by-spec."pinkie"."^2.0.0" =
-    self.by-version."pinkie"."2.0.1";
-  by-version."pinkie"."2.0.1" = self.buildNodePackage {
-    name = "pinkie-2.0.1";
-    version = "2.0.1";
+    self.by-version."pinkie"."2.0.4";
+  by-version."pinkie"."2.0.4" = self.buildNodePackage {
+    name = "pinkie-2.0.4";
+    version = "2.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pinkie/-/pinkie-2.0.1.tgz";
-      name = "pinkie-2.0.1.tgz";
-      sha1 = "4236c86fc29f261c2045bbe81f78cbb2a5e8306c";
+      url = "http://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz";
+      name = "pinkie-2.0.4.tgz";
+      sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
     };
     deps = {
     };
@@ -3678,7 +3680,7 @@
       sha1 = "4c83538de1f6e660c29e0a13446844f7a7e88259";
     };
     deps = {
-      "pinkie-2.0.1" = self.by-version."pinkie"."2.0.1";
+      "pinkie-2.0.4" = self.by-version."pinkie"."2.0.4";
     };
     optionalDependencies = {
     };
@@ -3800,16 +3802,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."qs"."~5.2.0" =
-    self.by-version."qs"."5.2.0";
-  by-version."qs"."5.2.0" = self.buildNodePackage {
-    name = "qs-5.2.0";
-    version = "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 = "http://registry.npmjs.org/qs/-/qs-5.2.0.tgz";
-      name = "qs-5.2.0.tgz";
-      sha1 = "a9f31142af468cb72b25b30136ba2456834916be";
+      url = "http://registry.npmjs.org/qs/-/qs-6.0.2.tgz";
+      name = "qs-6.0.2.tgz";
+      sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd";
     };
     deps = {
     };
@@ -3892,6 +3894,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."readable-stream"."~2.0.5" =
+    self.by-version."readable-stream"."2.0.5";
   by-spec."repeating"."^1.1.0" =
     self.by-version."repeating"."1.1.3";
   by-version."repeating"."1.1.3" = self.buildNodePackage {
@@ -3924,7 +3928,7 @@
       sha1 = "29d713a0a07f17fb2e7b61815d2010681718e93c";
     };
     deps = {
-      "bl-0.9.4" = self.by-version."bl"."0.9.4";
+      "bl-0.9.5" = self.by-version."bl"."0.9.5";
       "caseless-0.6.0" = self.by-version."caseless"."0.6.0";
       "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
       "qs-1.2.2" = self.by-version."qs"."1.2.2";
@@ -3958,7 +3962,7 @@
       sha1 = "02d82a8adc04dc94a3a79f09fc850ade9aa21e74";
     };
     deps = {
-      "bl-0.9.4" = self.by-version."bl"."0.9.4";
+      "bl-0.9.5" = self.by-version."bl"."0.9.5";
       "caseless-0.9.0" = self.by-version."caseless"."0.9.0";
       "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2";
       "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
@@ -4002,37 +4006,38 @@
     cpu = [ ];
   };
   by-spec."request".">= 2.52.0" =
-    self.by-version."request"."2.67.0";
-  by-version."request"."2.67.0" = self.buildNodePackage {
-    name = "request-2.67.0";
-    version = "2.67.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 = "http://registry.npmjs.org/request/-/request-2.67.0.tgz";
-      name = "request-2.67.0.tgz";
-      sha1 = "8af74780e2bf11ea0ae9aa965c11f11afd272742";
+      url = "http://registry.npmjs.org/request/-/request-2.69.0.tgz";
+      name = "request-2.69.0.tgz";
+      sha1 = "cf91d2e000752b1217155c005241911991a2346a";
     };
     deps = {
-      "bl-1.0.0" = self.by-version."bl"."1.0.0";
+      "aws-sign2-0.6.0" = self.by-version."aws-sign2"."0.6.0";
+      "aws4-1.2.1" = self.by-version."aws4"."1.2.1";
+      "bl-1.0.2" = self.by-version."bl"."1.0.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";
       "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-rc3" = self.by-version."form-data"."1.0.0-rc3";
+      "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.9" = self.by-version."mime-types"."2.1.9";
       "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";
-      "tough-cookie-2.2.1" = self.by-version."tough-cookie"."2.2.1";
-      "http-signature-1.1.0" = self.by-version."http-signature"."1.1.0";
-      "oauth-sign-0.8.0" = self.by-version."oauth-sign"."0.8.0";
-      "hawk-3.1.2" = self.by-version."hawk"."3.1.2";
-      "aws-sign2-0.6.0" = self.by-version."aws-sign2"."0.6.0";
+      "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";
-      "combined-stream-1.0.5" = self.by-version."combined-stream"."1.0.5";
-      "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
-      "is-typedarray-1.0.0" = self.by-version."is-typedarray"."1.0.0";
-      "har-validator-2.0.3" = self.by-version."har-validator"."2.0.3";
+      "tough-cookie-2.2.1" = self.by-version."tough-cookie"."2.2.1";
+      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
     };
     optionalDependencies = {
     };
@@ -4041,7 +4046,7 @@
     cpu = [ ];
   };
   by-spec."request".">= 2.9.203" =
-    self.by-version."request"."2.67.0";
+    self.by-version."request"."2.69.0";
   by-spec."request"."~2.57.0" =
     self.by-version."request"."2.57.0";
   by-version."request"."2.57.0" = self.buildNodePackage {
@@ -4054,7 +4059,7 @@
       sha1 = "d445105a42d009b9d724289633b449a6d723d989";
     };
     deps = {
-      "bl-0.9.4" = self.by-version."bl"."0.9.4";
+      "bl-0.9.5" = self.by-version."bl"."0.9.5";
       "caseless-0.10.0" = self.by-version."caseless"."0.10.0";
       "forever-agent-0.6.1" = self.by-version."forever-agent"."0.6.1";
       "form-data-0.2.0" = self.by-version."form-data"."0.2.0";
@@ -4065,7 +4070,7 @@
       "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
       "tough-cookie-2.2.1" = self.by-version."tough-cookie"."2.2.1";
       "http-signature-0.11.0" = self.by-version."http-signature"."0.11.0";
-      "oauth-sign-0.8.0" = self.by-version."oauth-sign"."0.8.0";
+      "oauth-sign-0.8.1" = self.by-version."oauth-sign"."0.8.1";
       "hawk-2.3.1" = self.by-version."hawk"."2.3.1";
       "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
       "stringstream-0.0.5" = self.by-version."stringstream"."0.0.5";
@@ -4099,15 +4104,15 @@
     cpu = [ ];
   };
   by-spec."sax".">=0.1.1" =
-    self.by-version."sax"."1.1.4";
-  by-version."sax"."1.1.4" = self.buildNodePackage {
-    name = "sax-1.1.4";
-    version = "1.1.4";
+    self.by-version."sax"."1.1.5";
+  by-version."sax"."1.1.5" = self.buildNodePackage {
+    name = "sax-1.1.5";
+    version = "1.1.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sax/-/sax-1.1.4.tgz";
-      name = "sax-1.1.4.tgz";
-      sha1 = "74b6d33c9ae1e001510f179a91168588f1aedaa9";
+      url = "http://registry.npmjs.org/sax/-/sax-1.1.5.tgz";
+      name = "sax-1.1.5.tgz";
+      sha1 = "1da50a8d00cdecd59405659f5ff85349fe773743";
     };
     deps = {
     };
@@ -4219,20 +4224,20 @@
     cpu = [ ];
   };
   by-spec."sshpk"."^1.7.0" =
-    self.by-version."sshpk"."1.7.2";
-  by-version."sshpk"."1.7.2" = self.buildNodePackage {
-    name = "sshpk-1.7.2";
-    version = "1.7.2";
+    self.by-version."sshpk"."1.7.3";
+  by-version."sshpk"."1.7.3" = self.buildNodePackage {
+    name = "sshpk-1.7.3";
+    version = "1.7.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/sshpk/-/sshpk-1.7.2.tgz";
-      name = "sshpk-1.7.2.tgz";
-      sha1 = "e5eb43d0662bd201037327edb8b8f64656aca842";
+      url = "http://registry.npmjs.org/sshpk/-/sshpk-1.7.3.tgz";
+      name = "sshpk-1.7.3.tgz";
+      sha1 = "caa8ef95e30765d856698b7025f9f211ab65962f";
     };
     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.12.1" = self.by-version."dashdash"."1.12.1";
+      "dashdash-1.12.2" = self.by-version."dashdash"."1.12.2";
     };
     optionalDependencies = {
       "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0";
@@ -4547,15 +4552,15 @@
     cpu = [ ];
   };
   by-spec."tunnel"."~0.0.2" =
-    self.by-version."tunnel"."0.0.3";
-  by-version."tunnel"."0.0.3" = self.buildNodePackage {
-    name = "tunnel-0.0.3";
-    version = "0.0.3";
+    self.by-version."tunnel"."0.0.4";
+  by-version."tunnel"."0.0.4" = self.buildNodePackage {
+    name = "tunnel-0.0.4";
+    version = "0.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tunnel/-/tunnel-0.0.3.tgz";
-      name = "tunnel-0.0.3.tgz";
-      sha1 = "e8f988115ca7be9d076c7a1fae4788be708f0cf1";
+      url = "http://registry.npmjs.org/tunnel/-/tunnel-0.0.4.tgz";
+      name = "tunnel-0.0.4.tgz";
+      sha1 = "2d3785a158c174c9a16dc2c046ec5fc5f1742213";
     };
     deps = {
     };
@@ -4681,6 +4686,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."underscore"."^1.4.0" =
+    self.by-version."underscore"."1.8.3";
   by-spec."underscore"."~1.4.4" =
     self.by-version."underscore"."1.4.4";
   by-spec."util-deprecate"."~1.0.1" =
@@ -4856,7 +4863,7 @@
       sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c";
     };
     deps = {
-      "sax-1.1.4" = self.by-version."sax"."1.1.4";
+      "sax-1.1.5" = self.by-version."sax"."1.1.5";
     };
     optionalDependencies = {
     };
@@ -4906,15 +4913,15 @@
   by-spec."xmlbuilder"."0.4.x" =
     self.by-version."xmlbuilder"."0.4.3";
   by-spec."xmldom".">= 0.1.x" =
-    self.by-version."xmldom"."0.1.20";
-  by-version."xmldom"."0.1.20" = self.buildNodePackage {
-    name = "xmldom-0.1.20";
-    version = "0.1.20";
+    self.by-version."xmldom"."0.1.22";
+  by-version."xmldom"."0.1.22" = self.buildNodePackage {
+    name = "xmldom-0.1.22";
+    version = "0.1.22";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xmldom/-/xmldom-0.1.20.tgz";
-      name = "xmldom-0.1.20.tgz";
-      sha1 = "a70b6d9035a8b16f89727d4f0dddeba0f4077892";
+      url = "http://registry.npmjs.org/xmldom/-/xmldom-0.1.22.tgz";
+      name = "xmldom-0.1.22.tgz";
+      sha1 = "10de4e5e964981f03c8cc72fadc08d14b6c3aa26";
     };
     deps = {
     };

From 96cbdc70f239a25ea22d49f205c6168b526079df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 5 Feb 2016 11:59:18 +0100
Subject: [PATCH 1076/2285] cc-wrapper: fix #10574: old gcc -> cc fallout

The part with gcc-wrapper-old changes is rather unimportant,
as it's almost unused but I still tested that the sole user `gnat` builds.
---
 pkgs/build-support/cc-wrapper/add-flags       |  6 +++---
 pkgs/build-support/gcc-wrapper-old/add-flags  | 10 +++++-----
 pkgs/build-support/gcc-wrapper-old/builder.sh |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/build-support/cc-wrapper/add-flags b/pkgs/build-support/cc-wrapper/add-flags
index d48361539047..5634c82aa285 100644
--- a/pkgs/build-support/cc-wrapper/add-flags
+++ b/pkgs/build-support/cc-wrapper/add-flags
@@ -1,11 +1,11 @@
-# `-B@out@/bin' forces gcc to use ld-wrapper.sh when calling ld.
+# `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld.
 export NIX_CFLAGS_COMPILE="-B@out@/bin/ $NIX_CFLAGS_COMPILE"
 
 if [ -e @out@/nix-support/libc-cflags ]; then
     export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE"
 fi
 
-if [ -e @out@/nix-support/gcc-cflags ]; then
+if [ -e @out@/nix-support/cc-cflags ]; then
     export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE"
 fi
 
@@ -17,7 +17,7 @@ if [ -e @out@/nix-support/libc-ldflags ]; then
     export NIX_LDFLAGS+=" $(cat @out@/nix-support/libc-ldflags)"
 fi
 
-if [ -e @out@/nix-support/gcc-ldflags ]; then
+if [ -e @out@/nix-support/cc-ldflags ]; then
     export NIX_LDFLAGS+=" $(cat @out@/nix-support/cc-ldflags)"
 fi
 
diff --git a/pkgs/build-support/gcc-wrapper-old/add-flags b/pkgs/build-support/gcc-wrapper-old/add-flags
index 7714a6305739..93da917a5415 100644
--- a/pkgs/build-support/gcc-wrapper-old/add-flags
+++ b/pkgs/build-support/gcc-wrapper-old/add-flags
@@ -1,12 +1,12 @@
-# `-B@out@/bin' forces gcc to use ld-wrapper.sh when calling ld.
+# `-B@out@/bin' forces cc to use ld-wrapper.sh when calling ld.
 export NIX_CFLAGS_COMPILE="-B@out@/bin/ $NIX_CFLAGS_COMPILE"
 
 if test -e @out@/nix-support/libc-cflags; then
     export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE"
 fi
 
-if test -e @out@/nix-support/gcc-cflags; then
-    export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/gcc-cflags) $NIX_CFLAGS_COMPILE"
+if test -e @out@/nix-support/cc-cflags; then
+    export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/cc-cflags) $NIX_CFLAGS_COMPILE"
 fi
 
 if test -e @out@/nix-support/gnat-cflags; then
@@ -17,8 +17,8 @@ if test -e @out@/nix-support/libc-ldflags; then
     export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/libc-ldflags)"
 fi
 
-if test -e @out@/nix-support/gcc-ldflags; then
-    export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/gcc-ldflags)"
+if test -e @out@/nix-support/cc-ldflags; then
+    export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/cc-ldflags)"
 fi
 
 if test -e @out@/nix-support/libc-ldflags-before; then
diff --git a/pkgs/build-support/gcc-wrapper-old/builder.sh b/pkgs/build-support/gcc-wrapper-old/builder.sh
index 59cdd3f84ad2..7bb487096145 100644
--- a/pkgs/build-support/gcc-wrapper-old/builder.sh
+++ b/pkgs/build-support/gcc-wrapper-old/builder.sh
@@ -45,7 +45,7 @@ else
     if [ -n "$langVhdl" ]; then
         gccLDFlags="$gccLDFlags -L$zlib/lib"
     fi
-    echo "$gccLDFlags" > $out/nix-support/gcc-ldflags
+    echo "$gccLDFlags" > $out/nix-support/cc-ldflags
 
     # GCC shows $gcc/lib in `gcc -print-search-dirs', but not
     # $gcc/lib64 (even though it does actually search there...)..
@@ -63,7 +63,7 @@ else
         gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib"
         echo "$gnatCFlags" > $out/nix-support/gnat-cflags
     fi
-    echo "$gccCFlags" > $out/nix-support/gcc-cflags
+    echo "$gccCFlags" > $out/nix-support/cc-cflags
     
     gccPath="$gcc/bin"
     # On Illumos/Solaris we might prefer native ld

From b060d70d7f54dffbb7b9b31ae2d3635a6dc4c11d Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 5 Feb 2016 14:56:06 +0100
Subject: [PATCH 1077/2285] nixos/udev: Fix printing impure FHS paths

The test only checked for existence of the rule file in the output path
of the rulefile generator.

However, we also need to check whether the basename of the file is also
the one we're currently searching for.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/services/hardware/udev.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 74200eec4c04..1b3333a29736 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -104,10 +104,10 @@ let
           remoteFile="origin unknown"
           for i in ${toString cfg.packages}; do
             for j in "$i"/*/udev/rules.d/*; do
-              if [ -e "$out/$(basename "$j")" ]; then
-                remoteFile="originally from $j"
-                break 2
-              fi
+              [ -e "$out/$(basename "$j")" ] || continue
+              [ "$(basename "$j")" = "$(basename "$localFile")" ] || continue
+              remoteFile="originally from $j"
+              break 2
             done
           done
           refs="$(

From 943e049ff8b54575f4bb68c2b01bfb799f78ba06 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 5 Feb 2016 15:02:55 +0000
Subject: [PATCH 1078/2285] sublime3: 3083 -> 3101

---
 pkgs/applications/editors/sublime3/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix
index 49c30a1f6d60..6d0374d042fa 100644
--- a/pkgs/applications/editors/sublime3/default.nix
+++ b/pkgs/applications/editors/sublime3/default.nix
@@ -6,7 +6,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 assert gksuSupport -> gksu != null;
 
 let
-  build = "3083";
+  build = "3101";
   libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo pango];
   redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]
     ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo";
@@ -18,15 +18,15 @@ in let
     src =
       if stdenv.system == "i686-linux" then
         fetchurl {
-          name = "sublimetext-3.0.83.tar.bz2";
-          url = "http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_${build}_x32.tar.bz2";
-          sha256 = "0r9irk2gdwdx0dk7lgssr4krfvf3lf71pzaz5hyjc704zaxf5s49";
+          name = "sublimetext-${build}.tar.bz2";
+          url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x32.tar.bz2";
+          sha256 = "1klssh79mxm7i6r77p9a6a1rqzssnkv5y4k37bnxv8bilwqhfrcz";
         }
       else
         fetchurl {
-          name = "sublimetext-3.0.83.tar.bz2";
-          url = "http://c758482.r82.cf2.rackcdn.com/sublime_text_3_build_${build}_x64.tar.bz2";
-          sha256 = "1vhlrqz7xscmjnxpz60mdpvflanl26d7673ml7psd75n0zvcfra5";
+          name = "sublimetext-${build}.tar.bz2";
+          url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x64.tar.bz2";
+          sha256 = "0yrhn2mc5f2y4cy2ydya4h97bij0cm51yd4q06l6yjshl6qyc2db";
         };
 
     dontStrip = true;

From ca535e4c1fc3d19a62743028e1e8f0cc7d3f874b Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 5 Feb 2016 18:53:26 +0100
Subject: [PATCH 1079/2285] SDL: propagate Cocoa dependency on darwin

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

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 7006eb10f7ed..1c7d13471ff6 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -37,12 +37,13 @@ stdenv.mkDerivation rec {
     optional alsaSupport alsaLib ++
     optional stdenv.isLinux libcap ++
     optional openglSupport mesa ++
-    optional pulseaudioSupport libpulseaudio;
+    optional pulseaudioSupport libpulseaudio ++
+    optional stdenv.isDarwin Cocoa;
 
   buildInputs = let
     notMingw = !(stdenv ? cross) || stdenv.cross.libc != "msvcrt";
   in optional notMingw audiofile
-  ++ optionals stdenv.isDarwin [ OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa ];
+  ++ optionals stdenv.isDarwin [ OpenGL CoreAudio CoreServices AudioUnit Kernel ];
 
   # XXX: By default, SDL wants to dlopen() PulseAudio, in which case
   # we must arrange to add it to its RPATH; however, `patchelf' seems

From b8d488ab938ee7c2b32c84e72e46573e85c1223b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 5 Feb 2016 19:09:01 +0100
Subject: [PATCH 1080/2285] asymptote: fix tarball by asserting isLinux

We have no osmesa on darwin, which caused an evaluation error.
---
 pkgs/tools/graphics/asymptote/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index 9199d6a038f0..c28349a31ccf 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -3,6 +3,9 @@
   , boehmgc, mesa_glu, mesa_noglu, ncurses, readline, gsl, libsigsegv
   , python, zlib, perl, texLive, texinfo, xz
 }:
+
+assert stdenv.isLinux;
+
 let
   s = # Generated upstream information
   rec {

From 961b45a9c0496a0933205fc424c30aad68767a47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 5 Feb 2016 19:14:08 +0100
Subject: [PATCH 1081/2285] m17n-db: fix tarball

There's no glibc on darwin.
---
 pkgs/tools/inputmethods/m17n-db/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/tools/inputmethods/m17n-db/default.nix
index fa1b78acd1bb..fbe7188ef9ac 100644
--- a/pkgs/tools/inputmethods/m17n-db/default.nix
+++ b/pkgs/tools/inputmethods/m17n-db/default.nix
@@ -1,4 +1,5 @@
 {stdenv, fetchurl, gettext}:
+
 stdenv.mkDerivation rec {
   name = "m17n-db-1.7.0";
 
@@ -9,9 +10,9 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ gettext ];
 
-  configureFlags = [
+  configureFlags = stdenv.lib.optional (stdenv ? glibc)
     "--with-charmaps=${stdenv.glibc}/share/i18n/charmaps"
-  ];
+  ;
 
   meta = {
     homepage = http://www.nongnu.org/m17n/;

From 14dfebd364ea9dd10e76b5ea6a52218338f05150 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Fri, 5 Feb 2016 11:14:13 -0800
Subject: [PATCH 1082/2285] rkt: reset stage1 to rkt's recommended version

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

diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix
index 034f81556f1d..ca7400c9f4a4 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -2,8 +2,8 @@
   cpio, fetchurl, fetchFromGitHub, iptables, systemd, makeWrapper }:
 
 let
-  coreosImageRelease = "835.12.0";
-  coreosImageSystemdVersion = "225";
+  coreosImageRelease = "794.1.0";
+  coreosImageSystemdVersion = "222";
 
   # TODO: track https://github.com/coreos/rkt/issues/1758 to allow "host" flavor.
   stage1Flavours = [ "coreos" "fly" "host" ];
@@ -21,8 +21,8 @@ in stdenv.mkDerivation rec {
   };
 
   stage1BaseImage = fetchurl {
-    url = "http://stable.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
-    sha256 = "0djzgfcqr9yy13i415204ji82lrk8mvdhl9rxjr123j1glf5sdh3";
+    url = "http://alpha.release.core-os.net/amd64-usr/${coreosImageRelease}/coreos_production_pxe_image.cpio.gz";
+    sha256 = "05nzl3av6cawr8v203a8c95c443g6h1nfy2n4jmgvn0j4iyy44ym";
   };
 
   buildInputs = [

From c8577b9f30ec99bc430694a1a377cf91bbcdba98 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 5 Feb 2016 14:26:01 -0600
Subject: [PATCH 1083/2285] haskell-double-conversion: add libstdc++ to inputs

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1f746802c7b0..c233934a2151 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -226,8 +226,8 @@ self: super: {
     else super.x509-system;
 
   double-conversion = if !pkgs.stdenv.isDarwin
-    then super.double-conversion
-    else addBuildDepend (overrideCabal super.double-conversion (drv:
+    then addExtraLibrary super.double-conversion pkgs.stdenv.cc.cc.lib
+    else addExtraLibrary (overrideCabal super.double-conversion (drv:
       {
         postPatch = ''
           substituteInPlace double-conversion.cabal --replace stdc++ c++

From c5379e7da80bbc5cf003daf2672a27d2b170bbaf Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Sat, 9 Jan 2016 01:24:28 +0100
Subject: [PATCH 1084/2285] pkgs.darktable: 1.6.9 -> 2.0.0

See http://www.darktable.org/2015/12/darktable-2-0-released/

changes by @globin: added wrapGAppsHook and adwaita-icon-theme

Signed-off-by: Robin Gloster <mail@glob.in>
---
 .../graphics/darktable/default.nix            | 35 +++++++------------
 .../development/libraries/pugixml/default.nix |  4 ++-
 pkgs/top-level/all-packages.nix               |  1 +
 3 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix
index 77bddc89e2fc..ef222d2e816f 100644
--- a/pkgs/applications/graphics/darktable/default.nix
+++ b/pkgs/applications/graphics/darktable/default.nix
@@ -1,46 +1,35 @@
 { stdenv, fetchurl, libsoup, graphicsmagick, SDL, json_glib
 , GConf, atk, cairo, cmake, curl, dbus_glib, exiv2, glib
-, libgnome_keyring, gtk, ilmbase, intltool, lcms, lcms2
+, libgnome_keyring, gtk3, ilmbase, intltool, lcms, lcms2
 , lensfun, libXau, libXdmcp, libexif, libglade, libgphoto2, libjpeg
-, libpng, libpthreadstubs, libraw1394, librsvg, libtiff, libxcb
+, libpng, libpthreadstubs, librsvg, libtiff, libxcb
 , openexr, pixman, pkgconfig, sqlite, bash, libxslt, openjpeg
-, mesa }:
+, mesa, lua, pugixml, colord, colord-gtk, libxshmfence, libxkbcommon
+, epoxy, at_spi2_core, libwebp, libsecret, wrapGAppsHook, gnome3
+}:
 
 assert stdenv ? glibc;
 
 stdenv.mkDerivation rec {
-  version = "1.6.9";
+  version = "2.0.0";
   name = "darktable-${version}";
 
   src = fetchurl {
     url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz";
-    sha256 = "0wri89ygjpv7npiz58mnydhgldywp6arqp9jq3v0g54a56fiwwhg";
+    sha256 = "1cbwvzqn3158cy7r499rdwipx7fpb30lrrvh6jy5a4xvpcjzbwnl";
   };
 
   buildInputs =
-    [ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk
+    [ GConf atk cairo cmake curl dbus_glib exiv2 glib libgnome_keyring gtk3
       ilmbase intltool lcms lcms2 lensfun libXau libXdmcp libexif
-      libglade libgphoto2 libjpeg libpng libpthreadstubs libraw1394
+      libglade libgphoto2 libjpeg libpng libpthreadstubs
       librsvg libtiff libxcb openexr pixman pkgconfig sqlite libxslt
-      libsoup graphicsmagick SDL json_glib openjpeg mesa
+      libsoup graphicsmagick SDL json_glib openjpeg mesa lua pugixml
+      colord colord-gtk libxshmfence libxkbcommon epoxy at_spi2_core
+      libwebp libsecret wrapGAppsHook gnome3.adwaita-icon-theme
     ];
 
-  preConfigure = ''
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/include/gtk-2.0"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${gtk}/lib/gtk-2.0/include"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${cairo}/include/cairo"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${atk}/include/atk-1.0"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${ilmbase}/include/OpenEXR"
-    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${openexr}/include/OpenEXR"
-  '';
-
   cmakeFlags = [
-    "-DPTHREAD_INCLUDE_DIR=${stdenv.glibc}/include"
-    "-DPTHREAD_LIBRARY=${stdenv.glibc}/lib/libpthread.so"
-    "-DCMAKE_BUILD_TYPE=Release"
-    "-DBINARY_PACKAGE_BUILD=1"
-    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include"
-    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk}/lib/gtk-2.0/include"
     "-DBUILD_USERMANUAL=False"
   ];
 
diff --git a/pkgs/development/libraries/pugixml/default.nix b/pkgs/development/libraries/pugixml/default.nix
index b866a347d95e..6ce2d9e2ffe0 100644
--- a/pkgs/development/libraries/pugixml/default.nix
+++ b/pkgs/development/libraries/pugixml/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, cmake }:
+{ stdenv, fetchurl, cmake, shared ? false }:
 
 stdenv.mkDerivation rec {
   name = "pugixml-${version}";
@@ -13,6 +13,8 @@ stdenv.mkDerivation rec {
 
   sourceRoot = "${name}/scripts";
 
+  cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" ];
+
   preConfigure = ''
     # Enable long long support (required for filezilla)
     sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' ../src/pugiconfig.hpp
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28583006175c..16a90aab7c7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11525,6 +11525,7 @@ let
 
   darktable = callPackage ../applications/graphics/darktable {
     inherit (gnome) GConf libglade;
+    pugixml = pugixml.override { shared = true; };
   };
 
   das_watchdog = callPackage ../tools/system/das_watchdog { };

From b99e339419d92de701cac0e026a6309eccc5674c Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Sat, 6 Feb 2016 04:16:48 +0200
Subject: [PATCH 1085/2285] cairocffi: need some fonts at build time

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 169a2e17514a..5c00687ce89e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2609,6 +2609,13 @@ in modules // {
     };
 
     LC_ALL = "en_US.UTF-8";
+
+    # checkPhase require at least one 'normal' font and one 'monospace',
+    # otherwise glyph tests fails
+    FONTCONFIG_FILE = pkgs.makeFontsConf {
+      fontDirectories = [ pkgs.freefont_ttf ];
+    };
+
     buildInputs = with self; [ pytest pkgs.glibcLocales ];
     propagatedBuildInputs = with self; [ pkgs.cairo cffi ];
 

From ed9e286fa2e1850703e9095cdcc5545381a55ae4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 6 Feb 2016 05:12:00 +0300
Subject: [PATCH 1086/2285] SDL_ttf: adopt, add patch to fix onscripter-en

---
 .../development/libraries/SDL_ttf/default.nix | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix
index 696b6bd0ac8f..9dc6b9983e66 100644
--- a/pkgs/development/libraries/SDL_ttf/default.nix
+++ b/pkgs/development/libraries/SDL_ttf/default.nix
@@ -1,18 +1,33 @@
-{ stdenv, fetchurl, SDL, freetype }:
+{ stdenv, fetchurl, fetchpatch, SDL, freetype }:
 
-stdenv.mkDerivation {
-  name = "SDL_ttf-2.0.11";
+stdenv.mkDerivation rec {
+  name = "SDL_ttf-${version}";
+  version = "2.0.11";
 
   src = fetchurl {
-    url = http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.11.tar.gz;
+    url = "http://www.libsdl.org/projects/SDL_ttf/release/${name}.tar.gz";
     sha256 = "1dydxd4f5kb1288i5n5568kdk2q7f8mqjr7i7sd33nplxjaxhk3j";
   };
 
-  buildInputs = [SDL freetype];
+  patches = [
+    # Bug #830: TTF_RenderGlyph_Shaded is broken
+    (fetchpatch {
+      url = "https://bugzilla-attachments.libsdl.org/attachment.cgi?id=830";
+      sha256 = "0cfznfzg1hs10wl349z9n8chw80i5adl3iwhq4y102g0xrjyb72d";
+    })
+  ];
+
+  patchFlags = [ "-p0" ];
+
+  buildInputs = [ SDL freetype ];
 
   postInstall = "ln -s $out/include/SDL/SDL_ttf.h $out/include/";
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "SDL TrueType library";
+    license = licenses.zlib;
+    platforms = platforms.all;
+    homepage = https://www.libsdl.org/projects/SDL_ttf/release-1.2.html;
+    maintainers = with maintainers; [ abbradar ];
   };
 }

From 2b989f9d73187c0db9fefea0e2d70b9cb61409f4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 25 Jan 2016 15:53:21 +0300
Subject: [PATCH 1087/2285] gtkglext: propagate pangox-compat dependency

---
 pkgs/desktops/gnome-2/platform/gtkglext/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
index ff50bcd5e5cd..de06c671e725 100644
--- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
+++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix
@@ -9,7 +9,8 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = with xorg;
-    [ pkgconfig glib gtk mesa pango pangox_compat libX11 libXmu ];
+    [ pkgconfig glib gtk mesa pango libX11 libXmu ];
+  propagatedBuildInputs = [ pangox_compat ];
 
   # The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and
   # `GTK_WIDGET_NO_WINDOW', all of which appear to be deprecated nowadays.

From c77f1f6cc942409f73e3d29d5288c2104abb5702 Mon Sep 17 00:00:00 2001
From: William Casarin <bill@casarin.me>
Date: Fri, 5 Feb 2016 20:28:36 -0800
Subject: [PATCH 1088/2285] obs-studio: 0.12.1 -> 0.13.1

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

diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix
index 2c2a26cc972c..93a52578db3a 100644
--- a/pkgs/applications/video/obs-studio/default.nix
+++ b/pkgs/applications/video/obs-studio/default.nix
@@ -18,13 +18,13 @@ let
   optional = stdenv.lib.optional;
 in stdenv.mkDerivation rec {
   name = "obs-studio-${version}";
-  version = "0.12.1";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "jp9000";
     repo = "obs-studio";
     rev = "${version}";
-    sha256 = "0n5bpjgdk3gi0xghfhphiyh5r1q1yksaz34as306i051y01shzl6";
+    sha256 = "00dx8lksj10n0qhyar41y5q0bdrz7jdjwmhj8bdyz7jfkijjr44i";
   };
 
   nativeBuildInputs = [ cmake

From 5c20877d40726b6973d222f71fa6e306428c19cf Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Fri, 5 Feb 2016 16:33:57 +0100
Subject: [PATCH 1089/2285] opensmtpd: Add option that can disable adding
 sendmail to the system path

---
 nixos/modules/services/mail/opensmtpd.nix | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/mail/opensmtpd.nix b/nixos/modules/services/mail/opensmtpd.nix
index a1cfd84365a2..42a1244cde57 100644
--- a/nixos/modules/services/mail/opensmtpd.nix
+++ b/nixos/modules/services/mail/opensmtpd.nix
@@ -9,6 +9,11 @@ let
   conf = writeText "smtpd.conf" cfg.serverConfiguration;
   args = concatStringsSep " " cfg.extraServerArgs;
 
+  sendmail = pkgs.runCommand "opensmtpd-sendmail" {} ''
+    mkdir -p $out/bin
+    ln -s ${opensmtpd}/sbin/smtpctl $out/bin/sendmail
+  '';
+
 in {
 
   ###### interface
@@ -23,6 +28,15 @@ in {
         description = "Whether to enable the OpenSMTPD server.";
       };
 
+      addSendmailToSystemPath = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to add OpenSMTPD's sendmail binary to the
+          system path or not.
+        '';
+      };
+
       extraServerArgs = mkOption {
         type = types.listOf types.str;
         default = [];
@@ -64,7 +78,7 @@ in {
 
   ###### implementation
 
-  config = mkIf config.services.opensmtpd.enable {
+  config = mkIf cfg.enable {
     users.extraGroups = {
       smtpd.gid = config.ids.gids.smtpd;
       smtpq.gid = config.ids.gids.smtpq;
@@ -98,9 +112,6 @@ in {
       environment.OPENSMTPD_PROC_PATH = "${procEnv}/libexec/opensmtpd";
     };
 
-    environment.systemPackages = [ (pkgs.runCommand "opensmtpd-sendmail" {} ''
-      mkdir -p $out/bin
-      ln -s ${opensmtpd}/sbin/smtpctl $out/bin/sendmail
-    '') ];
+    environment.systemPackages = mkIf cfg.addSendmailToSystemPath [ sendmail ];
   };
 }

From 16ddf9ea87ea48c4ea9fb94e63c80a03dcaeedcb Mon Sep 17 00:00:00 2001
From: roblabla <robinlambertz+dev@gmail.com>
Date: Sat, 6 Feb 2016 12:51:26 +0100
Subject: [PATCH 1090/2285] keybase: 0.8.22 -> 0.8.25

---
 pkgs/applications/misc/keybase/default.nix |    4 +-
 pkgs/applications/misc/keybase/package.nix | 2034 ++++++++++++--------
 2 files changed, 1186 insertions(+), 852 deletions(-)

diff --git a/pkgs/applications/misc/keybase/default.nix b/pkgs/applications/misc/keybase/default.nix
index bead4e82571c..e8cbce4cf8ce 100644
--- a/pkgs/applications/misc/keybase/default.nix
+++ b/pkgs/applications/misc/keybase/default.nix
@@ -11,11 +11,11 @@ let
 
 in nodePackages.buildNodePackage rec {
   name = "keybase-${version}";
-  version = "0.8.22";
+  version = "0.8.25";
 
   src = [(fetchurl {
     url = "https://github.com/keybase/node-client/archive/v${version}.tar.gz";
-    sha256 = "1dvwz2iqcybd687hp6zbw6lkpx27vp8ah6kk251147vxvwfjb422";
+    sha256 = "1zc357hwh26lsg8ngj7iwjdmywyzk6fz3wxmcqq1qyp2927i4jz3";
   })];
 
   deps = (filter (v: nixType v == "derivation") (attrValues nodePackages));
diff --git a/pkgs/applications/misc/keybase/package.nix b/pkgs/applications/misc/keybase/package.nix
index ee004a0ac671..4a046ac06290 100644
--- a/pkgs/applications/misc/keybase/package.nix
+++ b/pkgs/applications/misc/keybase/package.nix
@@ -41,16 +41,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ansi-regex"."^1.0.0" =
-    self.by-version."ansi-regex"."1.1.1";
-  by-version."ansi-regex"."1.1.1" = self.buildNodePackage {
-    name = "ansi-regex-1.1.1";
-    version = "1.1.1";
+  by-spec."ansi-regex"."^2.0.0" =
+    self.by-version."ansi-regex"."2.0.0";
+  by-version."ansi-regex"."2.0.0" = self.buildNodePackage {
+    name = "ansi-regex-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz";
-      name = "ansi-regex-1.1.1.tgz";
-      sha1 = "41c847194646375e6a1a5d10c3ca054ef9fc980d";
+      url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-2.0.0.tgz";
+      name = "ansi-regex-2.0.0.tgz";
+      sha1 = "c5061b6e0ef8a81775e50f5d66151bf6bf371107";
     };
     deps = {
     };
@@ -60,18 +60,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."ansi-regex"."^1.1.0" =
-    self.by-version."ansi-regex"."1.1.1";
-  by-spec."ansi-styles"."^2.0.1" =
-    self.by-version."ansi-styles"."2.0.1";
-  by-version."ansi-styles"."2.0.1" = self.buildNodePackage {
-    name = "ansi-styles-2.0.1";
-    version = "2.0.1";
+  by-spec."ansi-styles"."^2.1.0" =
+    self.by-version."ansi-styles"."2.1.0";
+  by-version."ansi-styles"."2.1.0" = self.buildNodePackage {
+    name = "ansi-styles-2.1.0";
+    version = "2.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.0.1.tgz";
-      name = "ansi-styles-2.0.1.tgz";
-      sha1 = "b033f57f93e2d28adeb8bc11138fa13da0fd20a3";
+      url = "http://registry.npmjs.org/ansi-styles/-/ansi-styles-2.1.0.tgz";
+      name = "ansi-styles-2.1.0.tgz";
+      sha1 = "990f747146927b559a932bf92959163d60c0d0e2";
     };
     deps = {
     };
@@ -103,16 +101,16 @@
     cpu = [ ];
   };
   "argparse" = self.by-version."argparse"."0.1.15";
-  by-spec."asn1"."0.1.11" =
-    self.by-version."asn1"."0.1.11";
-  by-version."asn1"."0.1.11" = self.buildNodePackage {
-    name = "asn1-0.1.11";
-    version = "0.1.11";
+  by-spec."asn1".">=0.2.3 <0.3.0" =
+    self.by-version."asn1"."0.2.3";
+  by-version."asn1"."0.2.3" = self.buildNodePackage {
+    name = "asn1-0.2.3";
+    version = "0.2.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz";
-      name = "asn1-0.1.11.tgz";
-      sha1 = "559be18376d08a4ec4dbe80877d27818639b2df7";
+      url = "http://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz";
+      name = "asn1-0.2.3.tgz";
+      sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86";
     };
     deps = {
     };
@@ -122,16 +120,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."assert-plus"."^0.1.5" =
-    self.by-version."assert-plus"."0.1.5";
-  by-version."assert-plus"."0.1.5" = self.buildNodePackage {
-    name = "assert-plus-0.1.5";
-    version = "0.1.5";
+  by-spec."assert-plus".">=0.2.0 <0.3.0" =
+    self.by-version."assert-plus"."0.2.0";
+  by-version."assert-plus"."0.2.0" = self.buildNodePackage {
+    name = "assert-plus-0.2.0";
+    version = "0.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz";
-      name = "assert-plus-0.1.5.tgz";
-      sha1 = "ee74009413002d84cec7219c6ac811812e723160";
+      url = "http://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz";
+      name = "assert-plus-0.2.0.tgz";
+      sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234";
     };
     deps = {
     };
@@ -141,6 +139,8 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."assert-plus"."^0.2.0" =
+    self.by-version."assert-plus"."0.2.0";
   by-spec."async"."0.2.x" =
     self.by-version."async"."0.2.10";
   by-version."async"."0.2.10" = self.buildNodePackage {
@@ -160,16 +160,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."async"."~0.9.0" =
-    self.by-version."async"."0.9.0";
-  by-version."async"."0.9.0" = self.buildNodePackage {
-    name = "async-0.9.0";
-    version = "0.9.0";
+  by-spec."async"."^1.4.0" =
+    self.by-version."async"."1.5.2";
+  by-version."async"."1.5.2" = self.buildNodePackage {
+    name = "async-1.5.2";
+    version = "1.5.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/async/-/async-0.9.0.tgz";
-      name = "async-0.9.0.tgz";
-      sha1 = "ac3613b1da9bed1b47510bb4651b8931e47146c7";
+      url = "http://registry.npmjs.org/async/-/async-1.5.2.tgz";
+      name = "async-1.5.2.tgz";
+      sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a";
     };
     deps = {
     };
@@ -179,16 +179,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."aws-sign2"."~0.5.0" =
-    self.by-version."aws-sign2"."0.5.0";
-  by-version."aws-sign2"."0.5.0" = self.buildNodePackage {
-    name = "aws-sign2-0.5.0";
-    version = "0.5.0";
+  by-spec."aws-sign2"."~0.6.0" =
+    self.by-version."aws-sign2"."0.6.0";
+  by-version."aws-sign2"."0.6.0" = self.buildNodePackage {
+    name = "aws-sign2-0.6.0";
+    version = "0.6.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz";
-      name = "aws-sign2-0.5.0.tgz";
-      sha1 = "c57103f7a17fc037f02d7c2e64b602ea223f7d63";
+      url = "http://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz";
+      name = "aws-sign2-0.6.0.tgz";
+      sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f";
     };
     deps = {
     };
@@ -198,6 +198,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."aws4"."^1.2.1" =
+    self.by-version."aws4"."1.2.1";
+  by-version."aws4"."1.2.1" = self.buildNodePackage {
+    name = "aws4-1.2.1";
+    version = "1.2.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/aws4/-/aws4-1.2.1.tgz";
+      name = "aws4-1.2.1.tgz";
+      sha1 = "52b5659a4d32583d405f65e1124ac436d07fe5ac";
+    };
+    deps = {
+      "lru-cache-2.7.3" = self.by-version."lru-cache"."2.7.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."badnode"."^1.0.1" =
     self.by-version."badnode"."1.0.1";
   by-version."badnode"."1.0.1" = self.buildNodePackage {
@@ -210,7 +230,7 @@
       sha1 = "3f14123363badf4bed1acc8ed839ee99b27ad7e0";
     };
     deps = {
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+      "semver-4.3.6" = self.by-version."semver"."4.3.6";
     };
     optionalDependencies = {
     };
@@ -219,16 +239,16 @@
     cpu = [ ];
   };
   "badnode" = self.by-version."badnode"."1.0.1";
-  by-spec."balanced-match"."^0.2.0" =
-    self.by-version."balanced-match"."0.2.0";
-  by-version."balanced-match"."0.2.0" = self.buildNodePackage {
-    name = "balanced-match-0.2.0";
-    version = "0.2.0";
+  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";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz";
-      name = "balanced-match-0.2.0.tgz";
-      sha1 = "38f6730c03aab6d5edbb52bd934885e756d71674";
+      url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.3.0.tgz";
+      name = "balanced-match-0.3.0.tgz";
+      sha1 = "a91cdd1ebef1a86659e70ff4def01625fc2d6756";
     };
     deps = {
     };
@@ -251,8 +271,8 @@
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "kbpgp-2.0.9" = self.by-version."kbpgp"."2.0.9";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
+      "kbpgp-2.0.50" = self.by-version."kbpgp"."2.0.50";
       "pgp-utils-0.0.27" = self.by-version."pgp-utils"."0.0.27";
     };
     optionalDependencies = {
@@ -262,38 +282,19 @@
     cpu = [ ];
   };
   "bitcoyne" = self.by-version."bitcoyne"."1.0.1";
-  by-spec."bl"."~0.9.0" =
-    self.by-version."bl"."0.9.4";
-  by-version."bl"."0.9.4" = self.buildNodePackage {
-    name = "bl-0.9.4";
-    version = "0.9.4";
+  by-spec."bl"."~1.0.0" =
+    self.by-version."bl"."1.0.2";
+  by-version."bl"."1.0.2" = self.buildNodePackage {
+    name = "bl-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/bl/-/bl-0.9.4.tgz";
-      name = "bl-0.9.4.tgz";
-      sha1 = "4702ddf72fbe0ecd82787c00c113aea1935ad0e7";
-    };
-    deps = {
-      "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."bluebird"."^2.9.21" =
-    self.by-version."bluebird"."2.9.24";
-  by-version."bluebird"."2.9.24" = self.buildNodePackage {
-    name = "bluebird-2.9.24";
-    version = "2.9.24";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/bluebird/-/bluebird-2.9.24.tgz";
-      name = "bluebird-2.9.24.tgz";
-      sha1 = "14a2e75f0548323dc35aa440d92007ca154e967c";
+      url = "http://registry.npmjs.org/bl/-/bl-1.0.2.tgz";
+      name = "bl-1.0.2.tgz";
+      sha1 = "8c66490d825ba84d560de1f62196a29555b3a0c4";
     };
     deps = {
+      "readable-stream-2.0.5" = self.by-version."readable-stream"."2.0.5";
     };
     optionalDependencies = {
     };
@@ -324,18 +325,18 @@
     self.by-version."bn"."1.0.1";
   "bn" = self.by-version."bn"."1.0.1";
   by-spec."boom"."2.x.x" =
-    self.by-version."boom"."2.7.1";
-  by-version."boom"."2.7.1" = self.buildNodePackage {
-    name = "boom-2.7.1";
-    version = "2.7.1";
+    self.by-version."boom"."2.10.1";
+  by-version."boom"."2.10.1" = self.buildNodePackage {
+    name = "boom-2.10.1";
+    version = "2.10.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/boom/-/boom-2.7.1.tgz";
-      name = "boom-2.7.1.tgz";
-      sha1 = "fb165c348d337977c61d4363c21e9e1abf526705";
+      url = "http://registry.npmjs.org/boom/-/boom-2.10.1.tgz";
+      name = "boom-2.10.1.tgz";
+      sha1 = "39c8918ceff5799f83f9492a848f625add0c766f";
     };
     deps = {
-      "hoek-2.12.0" = self.by-version."hoek"."2.12.0";
+      "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
     };
     optionalDependencies = {
     };
@@ -344,18 +345,18 @@
     cpu = [ ];
   };
   by-spec."brace-expansion"."^1.0.0" =
-    self.by-version."brace-expansion"."1.1.0";
-  by-version."brace-expansion"."1.1.0" = self.buildNodePackage {
-    name = "brace-expansion-1.1.0";
-    version = "1.1.0";
+    self.by-version."brace-expansion"."1.1.2";
+  by-version."brace-expansion"."1.1.2" = self.buildNodePackage {
+    name = "brace-expansion-1.1.2";
+    version = "1.1.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz";
-      name = "brace-expansion-1.1.0.tgz";
-      sha1 = "c9b7d03c03f37bc704be100e522b40db8f6cfcd9";
+      url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.2.tgz";
+      name = "brace-expansion-1.1.2.tgz";
+      sha1 = "f21445d0488b658e2771efd870eff51df29f04ef";
     };
     deps = {
-      "balanced-match-0.2.0" = self.by-version."balanced-match"."0.2.0";
+      "balanced-match-0.3.0" = self.by-version."balanced-match"."0.3.0";
       "concat-map-0.0.1" = self.by-version."concat-map"."0.0.1";
     };
     optionalDependencies = {
@@ -364,16 +365,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."caseless"."~0.9.0" =
-    self.by-version."caseless"."0.9.0";
-  by-version."caseless"."0.9.0" = self.buildNodePackage {
-    name = "caseless-0.9.0";
-    version = "0.9.0";
+  by-spec."bzip-deflate"."^1.0.0" =
+    self.by-version."bzip-deflate"."1.0.0";
+  by-version."bzip-deflate"."1.0.0" = self.buildNodePackage {
+    name = "bzip-deflate-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/caseless/-/caseless-0.9.0.tgz";
-      name = "caseless-0.9.0.tgz";
-      sha1 = "b7b65ce6bf1413886539cfd533f0b30effa9cf88";
+      url = "http://registry.npmjs.org/bzip-deflate/-/bzip-deflate-1.0.0.tgz";
+      name = "bzip-deflate-1.0.0.tgz";
+      sha1 = "b02db007ef37bebcc29384a4b2c6f4f0f4c796c9";
     };
     deps = {
     };
@@ -383,23 +384,42 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."chalk"."^1.0.0" =
-    self.by-version."chalk"."1.0.0";
-  by-version."chalk"."1.0.0" = self.buildNodePackage {
-    name = "chalk-1.0.0";
-    version = "1.0.0";
+  by-spec."caseless"."~0.11.0" =
+    self.by-version."caseless"."0.11.0";
+  by-version."caseless"."0.11.0" = self.buildNodePackage {
+    name = "caseless-0.11.0";
+    version = "0.11.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/chalk/-/chalk-1.0.0.tgz";
-      name = "chalk-1.0.0.tgz";
-      sha1 = "b3cf4ed0ff5397c99c75b8f679db2f52831f96dc";
+      url = "http://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz";
+      name = "caseless-0.11.0.tgz";
+      sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7";
     };
     deps = {
-      "ansi-styles-2.0.1" = self.by-version."ansi-styles"."2.0.1";
-      "escape-string-regexp-1.0.3" = self.by-version."escape-string-regexp"."1.0.3";
-      "has-ansi-1.0.3" = self.by-version."has-ansi"."1.0.3";
-      "strip-ansi-2.0.1" = self.by-version."strip-ansi"."2.0.1";
-      "supports-color-1.3.1" = self.by-version."supports-color"."1.3.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."chalk"."^1.1.1" =
+    self.by-version."chalk"."1.1.1";
+  by-version."chalk"."1.1.1" = self.buildNodePackage {
+    name = "chalk-1.1.1";
+    version = "1.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/chalk/-/chalk-1.1.1.tgz";
+      name = "chalk-1.1.1.tgz";
+      sha1 = "509afb67066e7499f7eb3535c77445772ae2d019";
+    };
+    deps = {
+      "ansi-styles-2.1.0" = self.by-version."ansi-styles"."2.1.0";
+      "escape-string-regexp-1.0.4" = self.by-version."escape-string-regexp"."1.0.4";
+      "has-ansi-2.0.0" = self.by-version."has-ansi"."2.0.0";
+      "strip-ansi-3.0.0" = self.by-version."strip-ansi"."3.0.0";
+      "supports-color-2.0.0" = self.by-version."supports-color"."2.0.0";
     };
     optionalDependencies = {
     };
@@ -443,7 +463,7 @@
       sha1 = "78f9485cd161b566e9a6c72d7170c4270e81db61";
     };
     deps = {
-      "glob-5.0.5" = self.by-version."glob"."5.0.5";
+      "glob-6.0.4" = self.by-version."glob"."6.0.4";
     };
     optionalDependencies = {
     };
@@ -488,7 +508,7 @@
       "argparse-0.1.15" = self.by-version."argparse"."0.1.15";
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
       "iced-logger-0.0.6" = self.by-version."iced-logger"."0.0.6";
-      "glob-to-regexp-0.0.2" = self.by-version."glob-to-regexp"."0.0.2";
+      "glob-to-regexp-0.1.0" = self.by-version."glob-to-regexp"."0.1.0";
       "tablify-0.1.5" = self.by-version."tablify"."0.1.5";
     };
     optionalDependencies = {
@@ -521,6 +541,27 @@
   by-spec."colors"."0.6.x" =
     self.by-version."colors"."0.6.2";
   by-spec."colors".">=0.6.2" =
+    self.by-version."colors"."1.1.2";
+  by-version."colors"."1.1.2" = self.buildNodePackage {
+    name = "colors-1.1.2";
+    version = "1.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/colors/-/colors-1.1.2.tgz";
+      name = "colors-1.1.2.tgz";
+      sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."colors"."~0.6.2" =
+    self.by-version."colors"."0.6.2";
+  by-spec."colors"."~1.0.3" =
     self.by-version."colors"."1.0.3";
   by-version."colors"."1.0.3" = self.buildNodePackage {
     name = "colors-1.0.3";
@@ -539,23 +580,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."colors"."~0.6.2" =
-    self.by-version."colors"."0.6.2";
-  by-spec."colors"."~1.0.3" =
-    self.by-version."colors"."1.0.3";
-  by-spec."combined-stream"."~0.0.4" =
-    self.by-version."combined-stream"."0.0.7";
-  by-version."combined-stream"."0.0.7" = self.buildNodePackage {
-    name = "combined-stream-0.0.7";
-    version = "0.0.7";
+  by-spec."combined-stream"."^1.0.5" =
+    self.by-version."combined-stream"."1.0.5";
+  by-version."combined-stream"."1.0.5" = self.buildNodePackage {
+    name = "combined-stream-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz";
-      name = "combined-stream-0.0.7.tgz";
-      sha1 = "0137e657baa5a7541c57ac37ac5fc07d73b4dc1f";
+      url = "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz";
+      name = "combined-stream-1.0.5.tgz";
+      sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009";
     };
     deps = {
-      "delayed-stream-0.0.5" = self.by-version."delayed-stream"."0.0.5";
+      "delayed-stream-1.0.0" = self.by-version."delayed-stream"."1.0.0";
     };
     optionalDependencies = {
     };
@@ -563,18 +600,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."combined-stream"."~0.0.5" =
-    self.by-version."combined-stream"."0.0.7";
+  by-spec."combined-stream"."~1.0.5" =
+    self.by-version."combined-stream"."1.0.5";
   by-spec."commander".">= 0.5.2" =
-    self.by-version."commander"."2.8.1";
-  by-version."commander"."2.8.1" = self.buildNodePackage {
-    name = "commander-2.8.1";
-    version = "2.8.1";
+    self.by-version."commander"."2.9.0";
+  by-version."commander"."2.9.0" = self.buildNodePackage {
+    name = "commander-2.9.0";
+    version = "2.9.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/commander/-/commander-2.8.1.tgz";
-      name = "commander-2.8.1.tgz";
-      sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4";
+      url = "http://registry.npmjs.org/commander/-/commander-2.9.0.tgz";
+      name = "commander-2.9.0.tgz";
+      sha1 = "9c99094176e12240cb22d6c5146098400fe0f7d4";
     };
     deps = {
       "graceful-readlink-1.0.1" = self.by-version."graceful-readlink"."1.0.1";
@@ -585,27 +622,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."commander"."^2.7.1" =
-    self.by-version."commander"."2.8.1";
-  by-spec."commander"."~2.1.0" =
-    self.by-version."commander"."2.1.0";
-  by-version."commander"."2.1.0" = self.buildNodePackage {
-    name = "commander-2.1.0";
-    version = "2.1.0";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/commander/-/commander-2.1.0.tgz";
-      name = "commander-2.1.0.tgz";
-      sha1 = "d121bbae860d9992a3d517ba96f56588e47c6781";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+  by-spec."commander"."^2.9.0" =
+    self.by-version."commander"."2.9.0";
   by-spec."concat-map"."0.0.1" =
     self.by-version."concat-map"."0.0.1";
   by-version."concat-map"."0.0.1" = self.buildNodePackage {
@@ -626,15 +644,15 @@
     cpu = [ ];
   };
   by-spec."core-util-is"."~1.0.0" =
-    self.by-version."core-util-is"."1.0.1";
-  by-version."core-util-is"."1.0.1" = self.buildNodePackage {
-    name = "core-util-is-1.0.1";
-    version = "1.0.1";
+    self.by-version."core-util-is"."1.0.2";
+  by-version."core-util-is"."1.0.2" = self.buildNodePackage {
+    name = "core-util-is-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.1.tgz";
-      name = "core-util-is-1.0.1.tgz";
-      sha1 = "6b07085aef9a3ccac6ee53bf9d3df0c1521a5538";
+      url = "http://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz";
+      name = "core-util-is-1.0.2.tgz";
+      sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
     };
     deps = {
     };
@@ -645,37 +663,18 @@
     cpu = [ ];
   };
   by-spec."cryptiles"."2.x.x" =
-    self.by-version."cryptiles"."2.0.4";
-  by-version."cryptiles"."2.0.4" = self.buildNodePackage {
-    name = "cryptiles-2.0.4";
-    version = "2.0.4";
+    self.by-version."cryptiles"."2.0.5";
+  by-version."cryptiles"."2.0.5" = self.buildNodePackage {
+    name = "cryptiles-2.0.5";
+    version = "2.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.4.tgz";
-      name = "cryptiles-2.0.4.tgz";
-      sha1 = "09ea1775b9e1c7de7e60a99d42ab6f08ce1a1285";
-    };
-    deps = {
-      "boom-2.7.1" = self.by-version."boom"."2.7.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."ctype"."0.5.3" =
-    self.by-version."ctype"."0.5.3";
-  by-version."ctype"."0.5.3" = self.buildNodePackage {
-    name = "ctype-0.5.3";
-    version = "0.5.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz";
-      name = "ctype-0.5.3.tgz";
-      sha1 = "82c18c2461f74114ef16c135224ad0b9144ca12f";
+      url = "http://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz";
+      name = "cryptiles-2.0.5.tgz";
+      sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8";
     };
     deps = {
+      "boom-2.10.1" = self.by-version."boom"."2.10.1";
     };
     optionalDependencies = {
     };
@@ -702,6 +701,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."dashdash".">=1.10.1 <2.0.0" =
+    self.by-version."dashdash"."1.12.2";
+  by-version."dashdash"."1.12.2" = self.buildNodePackage {
+    name = "dashdash-1.12.2";
+    version = "1.12.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/dashdash/-/dashdash-1.12.2.tgz";
+      name = "dashdash-1.12.2.tgz";
+      sha1 = "1c6f70588498d047b8cd5777b32ba85a5e25be36";
+    };
+    deps = {
+      "assert-plus-0.2.0" = self.by-version."assert-plus"."0.2.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."deep-equal"."0.2.1" =
     self.by-version."deep-equal"."0.2.1";
   by-version."deep-equal"."0.2.1" = self.buildNodePackage {
@@ -723,15 +742,15 @@
   };
   "deep-equal" = self.by-version."deep-equal"."0.2.1";
   by-spec."deep-equal".">=0.2.1" =
-    self.by-version."deep-equal"."1.0.0";
-  by-version."deep-equal"."1.0.0" = self.buildNodePackage {
-    name = "deep-equal-1.0.0";
-    version = "1.0.0";
+    self.by-version."deep-equal"."1.0.1";
+  by-version."deep-equal"."1.0.1" = self.buildNodePackage {
+    name = "deep-equal-1.0.1";
+    version = "1.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/deep-equal/-/deep-equal-1.0.0.tgz";
-      name = "deep-equal-1.0.0.tgz";
-      sha1 = "d4564f07d2f0ab3e46110bec16592abd7dc2e326";
+      url = "http://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz";
+      name = "deep-equal-1.0.1.tgz";
+      sha1 = "f5d260292b660e084eff4cdbc9f08ad3247448b5";
     };
     deps = {
     };
@@ -760,16 +779,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."delayed-stream"."0.0.5" =
-    self.by-version."delayed-stream"."0.0.5";
-  by-version."delayed-stream"."0.0.5" = self.buildNodePackage {
-    name = "delayed-stream-0.0.5";
-    version = "0.0.5";
+  by-spec."delayed-stream"."~1.0.0" =
+    self.by-version."delayed-stream"."1.0.0";
+  by-version."delayed-stream"."1.0.0" = self.buildNodePackage {
+    name = "delayed-stream-1.0.0";
+    version = "1.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz";
-      name = "delayed-stream-0.0.5.tgz";
-      sha1 = "d4b1f43a93e8296dfe02694f4680bc37a313c73f";
+      url = "http://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz";
+      name = "delayed-stream-1.0.0.tgz";
+      sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619";
     };
     deps = {
     };
@@ -791,11 +810,11 @@
       sha1 = "c47b5823d79563d6fc3abd49f3de48986e5522ee";
     };
     deps = {
-      "commander-2.8.1" = self.by-version."commander"."2.8.1";
-      "marked-0.3.3" = self.by-version."marked"."0.3.3";
-      "fs-extra-0.18.2" = self.by-version."fs-extra"."0.18.2";
+      "commander-2.9.0" = self.by-version."commander"."2.9.0";
+      "marked-0.3.5" = self.by-version."marked"."0.3.5";
+      "fs-extra-0.26.5" = self.by-version."fs-extra"."0.26.5";
       "underscore-1.8.3" = self.by-version."underscore"."1.8.3";
-      "highlight.js-8.5.0" = self.by-version."highlight.js"."8.5.0";
+      "highlight.js-9.1.0" = self.by-version."highlight.js"."9.1.0";
     };
     optionalDependencies = {
     };
@@ -882,6 +901,26 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."ecc-jsbn".">=0.0.1 <1.0.0" =
+    self.by-version."ecc-jsbn"."0.1.1";
+  by-version."ecc-jsbn"."0.1.1" = self.buildNodePackage {
+    name = "ecc-jsbn-0.1.1";
+    version = "0.1.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz";
+      name = "ecc-jsbn-0.1.1.tgz";
+      sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505";
+    };
+    deps = {
+      "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."entities"."0.x" =
     self.by-version."entities"."0.5.0";
   by-version."entities"."0.5.0" = self.buildNodePackage {
@@ -902,15 +941,53 @@
     cpu = [ ];
   };
   by-spec."escape-string-regexp"."^1.0.2" =
-    self.by-version."escape-string-regexp"."1.0.3";
-  by-version."escape-string-regexp"."1.0.3" = self.buildNodePackage {
-    name = "escape-string-regexp-1.0.3";
-    version = "1.0.3";
+    self.by-version."escape-string-regexp"."1.0.4";
+  by-version."escape-string-regexp"."1.0.4" = self.buildNodePackage {
+    name = "escape-string-regexp-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.3.tgz";
-      name = "escape-string-regexp-1.0.3.tgz";
-      sha1 = "9e2d8b25bc2555c3336723750e03f099c2735bb5";
+      url = "http://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.4.tgz";
+      name = "escape-string-regexp-1.0.4.tgz";
+      sha1 = "b85e679b46f72d03fbbe8a3bf7259d535c21b62f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."extend"."~3.0.0" =
+    self.by-version."extend"."3.0.0";
+  by-version."extend"."3.0.0" = self.buildNodePackage {
+    name = "extend-3.0.0";
+    version = "3.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/extend/-/extend-3.0.0.tgz";
+      name = "extend-3.0.0.tgz";
+      sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."extsprintf"."1.0.2" =
+    self.by-version."extsprintf"."1.0.2";
+  by-version."extsprintf"."1.0.2" = self.buildNodePackage {
+    name = "extsprintf-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz";
+      name = "extsprintf-1.0.2.tgz";
+      sha1 = "e1080e0658e300b06294990cc70e1502235fd550";
     };
     deps = {
     };
@@ -941,7 +1018,7 @@
   };
   by-spec."eyes"."~0.1.8" =
     self.by-version."eyes"."0.1.8";
-  by-spec."forever-agent"."~0.6.0" =
+  by-spec."forever-agent"."~0.6.1" =
     self.by-version."forever-agent"."0.6.1";
   by-version."forever-agent"."0.6.1" = self.buildNodePackage {
     name = "forever-agent-0.6.1";
@@ -960,21 +1037,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."form-data"."~0.2.0" =
-    self.by-version."form-data"."0.2.0";
-  by-version."form-data"."0.2.0" = self.buildNodePackage {
-    name = "form-data-0.2.0";
-    version = "0.2.0";
+  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 = "http://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz";
-      name = "form-data-0.2.0.tgz";
-      sha1 = "26f8bc26da6440e299cbdcfb69035c4f77a6e466";
+      url = "http://registry.npmjs.org/form-data/-/form-data-1.0.0-rc3.tgz";
+      name = "form-data-1.0.0-rc3.tgz";
+      sha1 = "d35bc62e7fbc2937ae78f948aaa0d38d90607577";
     };
     deps = {
-      "async-0.9.0" = self.by-version."async"."0.9.0";
-      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
-      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
+      "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.9" = self.by-version."mime-types"."2.1.9";
     };
     optionalDependencies = {
     };
@@ -994,8 +1071,8 @@
       sha1 = "54bfc5fbdf0c7c1b7691f20ffb31ef955c185db2";
     };
     deps = {
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "purepack-1.0.1" = self.by-version."purepack"."1.0.1";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
+      "purepack-1.0.4" = self.by-version."purepack"."1.0.4";
     };
     optionalDependencies = {
     };
@@ -1005,20 +1082,22 @@
   };
   "framed-msgpack-rpc" = self.by-version."framed-msgpack-rpc"."1.1.4";
   by-spec."fs-extra".">= 0.6.0" =
-    self.by-version."fs-extra"."0.18.2";
-  by-version."fs-extra"."0.18.2" = self.buildNodePackage {
-    name = "fs-extra-0.18.2";
-    version = "0.18.2";
+    self.by-version."fs-extra"."0.26.5";
+  by-version."fs-extra"."0.26.5" = self.buildNodePackage {
+    name = "fs-extra-0.26.5";
+    version = "0.26.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.18.2.tgz";
-      name = "fs-extra-0.18.2.tgz";
-      sha1 = "af05ca702b0b6dfa7de803a1f7ab479ec5c21525";
+      url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.26.5.tgz";
+      name = "fs-extra-0.26.5.tgz";
+      sha1 = "53ac74667ca083fd2dc1712c813039ca32d69a7f";
     };
     deps = {
-      "graceful-fs-3.0.6" = self.by-version."graceful-fs"."3.0.6";
-      "jsonfile-2.0.0" = self.by-version."jsonfile"."2.0.0";
-      "rimraf-2.3.2" = self.by-version."rimraf"."2.3.2";
+      "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";
+      "path-is-absolute-1.0.0" = self.by-version."path-is-absolute"."1.0.0";
+      "rimraf-2.5.1" = self.by-version."rimraf"."2.5.1";
     };
     optionalDependencies = {
     };
@@ -1046,15 +1125,15 @@
     cpu = [ ];
   };
   by-spec."generate-object-property"."^1.1.0" =
-    self.by-version."generate-object-property"."1.1.1";
-  by-version."generate-object-property"."1.1.1" = self.buildNodePackage {
-    name = "generate-object-property-1.1.1";
-    version = "1.1.1";
+    self.by-version."generate-object-property"."1.2.0";
+  by-version."generate-object-property"."1.2.0" = self.buildNodePackage {
+    name = "generate-object-property-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.1.1.tgz";
-      name = "generate-object-property-1.1.1.tgz";
-      sha1 = "8fda6b4cb69b34a189a6cebee7c4c268af47cc93";
+      url = "http://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz";
+      name = "generate-object-property-1.2.0.tgz";
+      sha1 = "9c0e1c40308ce804f4783618b937fa88f99d50d0";
     };
     deps = {
       "is-property-1.0.2" = self.by-version."is-property"."1.0.2";
@@ -1065,41 +1144,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."get-stdin"."^4.0.1" =
-    self.by-version."get-stdin"."4.0.1";
-  by-version."get-stdin"."4.0.1" = self.buildNodePackage {
-    name = "get-stdin-4.0.1";
-    version = "4.0.1";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz";
-      name = "get-stdin-4.0.1.tgz";
-      sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."glob".">= 3.1.4" =
-    self.by-version."glob"."5.0.5";
-  by-version."glob"."5.0.5" = self.buildNodePackage {
-    name = "glob-5.0.5";
-    version = "5.0.5";
+    self.by-version."glob"."6.0.4";
+  by-version."glob"."6.0.4" = self.buildNodePackage {
+    name = "glob-6.0.4";
+    version = "6.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/glob/-/glob-5.0.5.tgz";
-      name = "glob-5.0.5.tgz";
-      sha1 = "784431e4e29a900ae0d47fba6aa1c7f16a8e7df7";
+      url = "http://registry.npmjs.org/glob/-/glob-6.0.4.tgz";
+      name = "glob-6.0.4.tgz";
+      sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22";
     };
     deps = {
       "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-2.0.4" = self.by-version."minimatch"."2.0.4";
-      "once-1.3.1" = self.by-version."once"."1.3.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 = {
@@ -1108,39 +1168,18 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."glob"."^4.4.2" =
-    self.by-version."glob"."4.5.3";
-  by-version."glob"."4.5.3" = self.buildNodePackage {
-    name = "glob-4.5.3";
-    version = "4.5.3";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/glob/-/glob-4.5.3.tgz";
-      name = "glob-4.5.3.tgz";
-      sha1 = "c6cb73d3226c1efef04de3c56d012f03377ee15f";
-    };
-    deps = {
-      "inflight-1.0.4" = self.by-version."inflight"."1.0.4";
-      "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
-      "minimatch-2.0.4" = self.by-version."minimatch"."2.0.4";
-      "once-1.3.1" = self.by-version."once"."1.3.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+  by-spec."glob"."^6.0.1" =
+    self.by-version."glob"."6.0.4";
   by-spec."glob-to-regexp".">=0.0.1" =
-    self.by-version."glob-to-regexp"."0.0.2";
-  by-version."glob-to-regexp"."0.0.2" = self.buildNodePackage {
-    name = "glob-to-regexp-0.0.2";
-    version = "0.0.2";
+    self.by-version."glob-to-regexp"."0.1.0";
+  by-version."glob-to-regexp"."0.1.0" = self.buildNodePackage {
+    name = "glob-to-regexp-0.1.0";
+    version = "0.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.0.2.tgz";
-      name = "glob-to-regexp-0.0.2.tgz";
-      sha1 = "82cb3c797594b47890f180f015c1773601374b91";
+      url = "http://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.1.0.tgz";
+      name = "glob-to-regexp-0.1.0.tgz";
+      sha1 = "e0369d426578fd456d47dc23b09de05c1da9ea5d";
     };
     deps = {
     };
@@ -1151,21 +1190,21 @@
     cpu = [ ];
   };
   by-spec."gpg-wrapper".">=1.0.0" =
-    self.by-version."gpg-wrapper"."1.0.4";
-  by-version."gpg-wrapper"."1.0.4" = self.buildNodePackage {
-    name = "gpg-wrapper-1.0.4";
-    version = "1.0.4";
+    self.by-version."gpg-wrapper"."1.0.5";
+  by-version."gpg-wrapper"."1.0.5" = self.buildNodePackage {
+    name = "gpg-wrapper-1.0.5";
+    version = "1.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/gpg-wrapper/-/gpg-wrapper-1.0.4.tgz";
-      name = "gpg-wrapper-1.0.4.tgz";
-      sha1 = "0f26586bb9408e5c47201a45661bac1093e0d0ff";
+      url = "http://registry.npmjs.org/gpg-wrapper/-/gpg-wrapper-1.0.5.tgz";
+      name = "gpg-wrapper-1.0.5.tgz";
+      sha1 = "e3b9197c5e2dc7b0273cf59601430c18f17b3e51";
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
       "iced-spawn-1.0.0" = self.by-version."iced-spawn"."1.0.0";
-      "iced-utils-0.1.22" = self.by-version."iced-utils"."0.1.22";
+      "iced-utils-0.1.23" = self.by-version."iced-utils"."0.1.23";
       "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28";
       "spotty-1.0.0" = self.by-version."spotty"."1.0.0";
     };
@@ -1175,19 +1214,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."gpg-wrapper".">=1.0.4" =
-    self.by-version."gpg-wrapper"."1.0.4";
-  "gpg-wrapper" = self.by-version."gpg-wrapper"."1.0.4";
-  by-spec."graceful-fs"."^3.0.5" =
-    self.by-version."graceful-fs"."3.0.6";
-  by-version."graceful-fs"."3.0.6" = self.buildNodePackage {
-    name = "graceful-fs-3.0.6";
-    version = "3.0.6";
+  by-spec."gpg-wrapper".">=1.0.5" =
+    self.by-version."gpg-wrapper"."1.0.5";
+  "gpg-wrapper" = self.by-version."gpg-wrapper"."1.0.5";
+  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";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.6.tgz";
-      name = "graceful-fs-3.0.6.tgz";
-      sha1 = "dce3a18351cb94cdc82e688b2e3dd2842d1b09bb";
+      url = "http://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.3.tgz";
+      name = "graceful-fs-4.1.3.tgz";
+      sha1 = "92033ce11113c41e2628d61fdfa40bc10dc0155c";
     };
     deps = {
     };
@@ -1216,22 +1255,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."har-validator"."^1.4.0" =
-    self.by-version."har-validator"."1.6.1";
-  by-version."har-validator"."1.6.1" = self.buildNodePackage {
-    name = "har-validator-1.6.1";
-    version = "1.6.1";
+  by-spec."har-validator"."~2.0.6" =
+    self.by-version."har-validator"."2.0.6";
+  by-version."har-validator"."2.0.6" = self.buildNodePackage {
+    name = "har-validator-2.0.6";
+    version = "2.0.6";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/har-validator/-/har-validator-1.6.1.tgz";
-      name = "har-validator-1.6.1.tgz";
-      sha1 = "baef452cde645eff7d26562e8e749d7fd000b7fd";
+      url = "http://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz";
+      name = "har-validator-2.0.6.tgz";
+      sha1 = "cdcbc08188265ad119b6a5a7c8ab70eecfb5d27d";
     };
     deps = {
-      "bluebird-2.9.24" = self.by-version."bluebird"."2.9.24";
-      "chalk-1.0.0" = self.by-version."chalk"."1.0.0";
-      "commander-2.8.1" = self.by-version."commander"."2.8.1";
-      "is-my-json-valid-2.10.1" = self.by-version."is-my-json-valid"."2.10.1";
+      "chalk-1.1.1" = self.by-version."chalk"."1.1.1";
+      "commander-2.9.0" = self.by-version."commander"."2.9.0";
+      "is-my-json-valid-2.12.4" = self.by-version."is-my-json-valid"."2.12.4";
+      "pinkie-promise-2.0.0" = self.by-version."pinkie-promise"."2.0.0";
     };
     optionalDependencies = {
     };
@@ -1239,42 +1278,41 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."has-ansi"."^1.0.3" =
-    self.by-version."has-ansi"."1.0.3";
-  by-version."has-ansi"."1.0.3" = self.buildNodePackage {
-    name = "has-ansi-1.0.3";
-    version = "1.0.3";
-    bin = true;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/has-ansi/-/has-ansi-1.0.3.tgz";
-      name = "has-ansi-1.0.3.tgz";
-      sha1 = "c0b5b1615d9e382b0ff67169d967b425e48ca538";
-    };
-    deps = {
-      "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
-      "get-stdin-4.0.1" = self.by-version."get-stdin"."4.0.1";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  by-spec."hawk"."~2.3.0" =
-    self.by-version."hawk"."2.3.1";
-  by-version."hawk"."2.3.1" = self.buildNodePackage {
-    name = "hawk-2.3.1";
-    version = "2.3.1";
+  by-spec."has-ansi"."^2.0.0" =
+    self.by-version."has-ansi"."2.0.0";
+  by-version."has-ansi"."2.0.0" = self.buildNodePackage {
+    name = "has-ansi-2.0.0";
+    version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hawk/-/hawk-2.3.1.tgz";
-      name = "hawk-2.3.1.tgz";
-      sha1 = "1e731ce39447fa1d0f6d707f7bceebec0fd1ec1f";
+      url = "http://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz";
+      name = "has-ansi-2.0.0.tgz";
+      sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91";
     };
     deps = {
-      "hoek-2.12.0" = self.by-version."hoek"."2.12.0";
-      "boom-2.7.1" = self.by-version."boom"."2.7.1";
-      "cryptiles-2.0.4" = self.by-version."cryptiles"."2.0.4";
+      "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."hawk"."~3.1.0" =
+    self.by-version."hawk"."3.1.3";
+  by-version."hawk"."3.1.3" = self.buildNodePackage {
+    name = "hawk-3.1.3";
+    version = "3.1.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz";
+      name = "hawk-3.1.3.tgz";
+      sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4";
+    };
+    deps = {
+      "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
+      "boom-2.10.1" = self.by-version."boom"."2.10.1";
+      "cryptiles-2.0.5" = self.by-version."cryptiles"."2.0.5";
       "sntp-1.0.9" = self.by-version."sntp"."1.0.9";
     };
     optionalDependencies = {
@@ -1284,15 +1322,15 @@
     cpu = [ ];
   };
   by-spec."highlight.js".">= 8.0.x" =
-    self.by-version."highlight.js"."8.5.0";
-  by-version."highlight.js"."8.5.0" = self.buildNodePackage {
-    name = "highlight.js-8.5.0";
-    version = "8.5.0";
+    self.by-version."highlight.js"."9.1.0";
+  by-version."highlight.js"."9.1.0" = self.buildNodePackage {
+    name = "highlight.js-9.1.0";
+    version = "9.1.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/highlight.js/-/highlight.js-8.5.0.tgz";
-      name = "highlight.js-8.5.0.tgz";
-      sha1 = "6473d5099edb9f82fa50286b9178c8583ad7d652";
+      url = "http://registry.npmjs.org/highlight.js/-/highlight.js-9.1.0.tgz";
+      name = "highlight.js-9.1.0.tgz";
+      sha1 = "eb94c125f52bbd25dc893551b45c37c5093f1c5c";
     };
     deps = {
     };
@@ -1303,15 +1341,15 @@
     cpu = [ ];
   };
   by-spec."hoek"."2.x.x" =
-    self.by-version."hoek"."2.12.0";
-  by-version."hoek"."2.12.0" = self.buildNodePackage {
-    name = "hoek-2.12.0";
-    version = "2.12.0";
+    self.by-version."hoek"."2.16.3";
+  by-version."hoek"."2.16.3" = self.buildNodePackage {
+    name = "hoek-2.16.3";
+    version = "2.16.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/hoek/-/hoek-2.12.0.tgz";
-      name = "hoek-2.12.0.tgz";
-      sha1 = "5d1196e0bf20c5cec957e8927101164effdaf1c9";
+      url = "http://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz";
+      name = "hoek-2.16.3.tgz";
+      sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed";
     };
     deps = {
     };
@@ -1344,21 +1382,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."http-signature"."~0.10.0" =
-    self.by-version."http-signature"."0.10.1";
-  by-version."http-signature"."0.10.1" = self.buildNodePackage {
-    name = "http-signature-0.10.1";
-    version = "0.10.1";
+  by-spec."http-signature"."~1.1.0" =
+    self.by-version."http-signature"."1.1.1";
+  by-version."http-signature"."1.1.1" = self.buildNodePackage {
+    name = "http-signature-1.1.1";
+    version = "1.1.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz";
-      name = "http-signature-0.10.1.tgz";
-      sha1 = "4fbdac132559aa8323121e540779c0a012b27e66";
+      url = "http://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz";
+      name = "http-signature-1.1.1.tgz";
+      sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf";
     };
     deps = {
-      "assert-plus-0.1.5" = self.by-version."assert-plus"."0.1.5";
-      "asn1-0.1.11" = self.by-version."asn1"."0.1.11";
-      "ctype-0.5.3" = self.by-version."ctype"."0.5.3";
+      "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.3" = self.by-version."sshpk"."1.7.3";
     };
     optionalDependencies = {
     };
@@ -1379,7 +1417,7 @@
     };
     deps = {
       "docco-0.6.3" = self.by-version."docco"."0.6.3";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
       "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5";
     };
     optionalDependencies = {
@@ -1424,8 +1462,8 @@
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "iced-utils-0.1.22" = self.by-version."iced-utils"."0.1.22";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
+      "iced-utils-0.1.23" = self.by-version."iced-utils"."0.1.23";
     };
     optionalDependencies = {
     };
@@ -1492,7 +1530,7 @@
       sha1 = "0914a61a4d3dec69db8f871ef40f95417fa38986";
     };
     deps = {
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -1545,15 +1583,15 @@
   by-spec."iced-logger"."~0.0.1" =
     self.by-version."iced-logger"."0.0.6";
   by-spec."iced-runtime".">=0.0.1" =
-    self.by-version."iced-runtime"."1.0.2";
-  by-version."iced-runtime"."1.0.2" = self.buildNodePackage {
-    name = "iced-runtime-1.0.2";
-    version = "1.0.2";
+    self.by-version."iced-runtime"."1.0.3";
+  by-version."iced-runtime"."1.0.3" = self.buildNodePackage {
+    name = "iced-runtime-1.0.3";
+    version = "1.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/iced-runtime/-/iced-runtime-1.0.2.tgz";
-      name = "iced-runtime-1.0.2.tgz";
-      sha1 = "a949a7cf49451175d3f6168d84997da27c4e6b70";
+      url = "http://registry.npmjs.org/iced-runtime/-/iced-runtime-1.0.3.tgz";
+      name = "iced-runtime-1.0.3.tgz";
+      sha1 = "2d4f4fb999ab7aa5430b193c77a7fce4118319ce";
     };
     deps = {
     };
@@ -1563,15 +1601,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "iced-runtime" = self.by-version."iced-runtime"."1.0.2";
   by-spec."iced-runtime".">=0.0.1 <2.0.0-0" =
-    self.by-version."iced-runtime"."1.0.2";
+    self.by-version."iced-runtime"."1.0.3";
+  by-spec."iced-runtime".">=1.0.3" =
+    self.by-version."iced-runtime"."1.0.3";
+  "iced-runtime" = self.by-version."iced-runtime"."1.0.3";
   by-spec."iced-runtime"."^1.0.0" =
-    self.by-version."iced-runtime"."1.0.2";
+    self.by-version."iced-runtime"."1.0.3";
   by-spec."iced-runtime"."^1.0.1" =
-    self.by-version."iced-runtime"."1.0.2";
+    self.by-version."iced-runtime"."1.0.3";
   by-spec."iced-runtime"."^1.0.2" =
-    self.by-version."iced-runtime"."1.0.2";
+    self.by-version."iced-runtime"."1.0.3";
   by-spec."iced-spawn".">=0.0.3" =
     self.by-version."iced-spawn"."1.0.0";
   by-version."iced-spawn"."1.0.0" = self.buildNodePackage {
@@ -1584,8 +1624,8 @@
       sha1 = "dab91968cb46f9c05baadd126a5abb53c5d7d1df";
     };
     deps = {
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
     };
     optionalDependencies = {
     };
@@ -1599,21 +1639,21 @@
     self.by-version."iced-spawn"."1.0.0";
   "iced-spawn" = self.by-version."iced-spawn"."1.0.0";
   by-spec."iced-test".">=0.0.16" =
-    self.by-version."iced-test"."0.0.21";
-  by-version."iced-test"."0.0.21" = self.buildNodePackage {
-    name = "iced-test-0.0.21";
-    version = "0.0.21";
+    self.by-version."iced-test"."0.0.22";
+  by-version."iced-test"."0.0.22" = self.buildNodePackage {
+    name = "iced-test-0.0.22";
+    version = "0.0.22";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/iced-test/-/iced-test-0.0.21.tgz";
-      name = "iced-test-0.0.21.tgz";
-      sha1 = "8e7c347aa744eb4dddd786fcd430913be8bd83c7";
+      url = "http://registry.npmjs.org/iced-test/-/iced-test-0.0.22.tgz";
+      name = "iced-test-0.0.22.tgz";
+      sha1 = "61e7149f443fe5c87ff402cbc2214a42d558af2b";
     };
     deps = {
-      "colors-1.0.3" = self.by-version."colors"."1.0.3";
-      "deep-equal-1.0.0" = self.by-version."deep-equal"."1.0.0";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "minimist-1.1.1" = self.by-version."minimist"."1.1.1";
+      "colors-1.1.2" = self.by-version."colors"."1.1.2";
+      "deep-equal-1.0.1" = self.by-version."deep-equal"."1.0.1";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
+      "minimist-1.2.0" = self.by-version."minimist"."1.2.0";
     };
     optionalDependencies = {
     };
@@ -1621,30 +1661,8 @@
     os = [ ];
     cpu = [ ];
   };
-  "iced-test" = self.by-version."iced-test"."0.0.21";
-  by-spec."iced-utils"."0.1.20" =
-    self.by-version."iced-utils"."0.1.20";
-  by-version."iced-utils"."0.1.20" = self.buildNodePackage {
-    name = "iced-utils-0.1.20";
-    version = "0.1.20";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/iced-utils/-/iced-utils-0.1.20.tgz";
-      name = "iced-utils-0.1.20.tgz";
-      sha1 = "923cbc3c080511cb6cc8e3ccde6609548d2db3e8";
-    };
-    deps = {
-      "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
-  "iced-utils" = self.by-version."iced-utils"."0.1.20";
-  by-spec."iced-utils".">=0.1.11" =
+  "iced-test" = self.by-version."iced-test"."0.0.22";
+  by-spec."iced-utils"."0.1.22" =
     self.by-version."iced-utils"."0.1.22";
   by-version."iced-utils"."0.1.22" = self.buildNodePackage {
     name = "iced-utils-0.1.22";
@@ -1657,7 +1675,29 @@
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "iced-utils" = self.by-version."iced-utils"."0.1.22";
+  by-spec."iced-utils".">=0.1.11" =
+    self.by-version."iced-utils"."0.1.23";
+  by-version."iced-utils"."0.1.23" = self.buildNodePackage {
+    name = "iced-utils-0.1.23";
+    version = "0.1.23";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/iced-utils/-/iced-utils-0.1.23.tgz";
+      name = "iced-utils-0.1.23.tgz";
+      sha1 = "2b999eb6e34d84e10f449bca1f47ca3b556ea197";
+    };
+    deps = {
+      "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -1666,11 +1706,13 @@
     cpu = [ ];
   };
   by-spec."iced-utils".">=0.1.16" =
-    self.by-version."iced-utils"."0.1.22";
+    self.by-version."iced-utils"."0.1.23";
   by-spec."iced-utils".">=0.1.18" =
-    self.by-version."iced-utils"."0.1.22";
+    self.by-version."iced-utils"."0.1.23";
   by-spec."iced-utils".">=0.1.22" =
-    self.by-version."iced-utils"."0.1.22";
+    self.by-version."iced-utils"."0.1.23";
+  by-spec."iced-utils"."^0.1.22" =
+    self.by-version."iced-utils"."0.1.23";
   by-spec."inflight"."^1.0.4" =
     self.by-version."inflight"."1.0.4";
   by-version."inflight"."1.0.4" = self.buildNodePackage {
@@ -1683,7 +1725,7 @@
       sha1 = "6cbb4521ebd51ce0ec0a936bfd7657ef7e9b172a";
     };
     deps = {
-      "once-1.3.1" = self.by-version."once"."1.3.1";
+      "once-1.3.3" = self.by-version."once"."1.3.3";
       "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
     };
     optionalDependencies = {
@@ -1714,15 +1756,15 @@
   by-spec."inherits"."~2.0.1" =
     self.by-version."inherits"."2.0.1";
   by-spec."ipv6"."~3.1.1" =
-    self.by-version."ipv6"."3.1.1";
-  by-version."ipv6"."3.1.1" = self.buildNodePackage {
-    name = "ipv6-3.1.1";
-    version = "3.1.1";
+    self.by-version."ipv6"."3.1.3";
+  by-version."ipv6"."3.1.3" = self.buildNodePackage {
+    name = "ipv6-3.1.3";
+    version = "3.1.3";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/ipv6/-/ipv6-3.1.1.tgz";
-      name = "ipv6-3.1.1.tgz";
-      sha1 = "46da0e260af36fd9beb41297c987b7c21a2d9e1c";
+      url = "http://registry.npmjs.org/ipv6/-/ipv6-3.1.3.tgz";
+      name = "ipv6-3.1.3.tgz";
+      sha1 = "4d9064f9c2dafa0dd10b8b7d76ffca4aad31b3b9";
     };
     deps = {
       "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5";
@@ -1735,22 +1777,22 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."is-my-json-valid"."^2.10.0" =
-    self.by-version."is-my-json-valid"."2.10.1";
-  by-version."is-my-json-valid"."2.10.1" = self.buildNodePackage {
-    name = "is-my-json-valid-2.10.1";
-    version = "2.10.1";
+  by-spec."is-my-json-valid"."^2.12.4" =
+    self.by-version."is-my-json-valid"."2.12.4";
+  by-version."is-my-json-valid"."2.12.4" = self.buildNodePackage {
+    name = "is-my-json-valid-2.12.4";
+    version = "2.12.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.10.1.tgz";
-      name = "is-my-json-valid-2.10.1.tgz";
-      sha1 = "bf20ca7e71116302f8660ac812659f71e22ea2d0";
+      url = "http://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.12.4.tgz";
+      name = "is-my-json-valid-2.12.4.tgz";
+      sha1 = "d4ed2bc1d7f88daf8d0f763b3e3e39a69bd37880";
     };
     deps = {
       "generate-function-2.0.0" = self.by-version."generate-function"."2.0.0";
-      "generate-object-property-1.1.1" = self.by-version."generate-object-property"."1.1.1";
-      "jsonpointer-1.1.0" = self.by-version."jsonpointer"."1.1.0";
-      "xtend-4.0.0" = self.by-version."xtend"."4.0.0";
+      "generate-object-property-1.2.0" = self.by-version."generate-object-property"."1.2.0";
+      "jsonpointer-2.0.0" = self.by-version."jsonpointer"."2.0.0";
+      "xtend-4.0.1" = self.by-version."xtend"."4.0.1";
     };
     optionalDependencies = {
     };
@@ -1777,6 +1819,25 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."is-typedarray"."~1.0.0" =
+    self.by-version."is-typedarray"."1.0.0";
+  by-version."is-typedarray"."1.0.0" = self.buildNodePackage {
+    name = "is-typedarray-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz";
+      name = "is-typedarray-1.0.0.tgz";
+      sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a";
+    };
+    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 {
@@ -1815,18 +1876,38 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."isstream"."~0.1.1" =
+  by-spec."isstream"."~0.1.2" =
     self.by-version."isstream"."0.1.2";
-  by-spec."json-stringify-safe"."~5.0.0" =
-    self.by-version."json-stringify-safe"."5.0.0";
-  by-version."json-stringify-safe"."5.0.0" = self.buildNodePackage {
-    name = "json-stringify-safe-5.0.0";
-    version = "5.0.0";
+  by-spec."jodid25519".">=1.0.0 <2.0.0" =
+    self.by-version."jodid25519"."1.0.2";
+  by-version."jodid25519"."1.0.2" = self.buildNodePackage {
+    name = "jodid25519-1.0.2";
+    version = "1.0.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.0.tgz";
-      name = "json-stringify-safe-5.0.0.tgz";
-      sha1 = "4c1f228b5050837eba9d21f50c2e6e320624566e";
+      url = "http://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz";
+      name = "jodid25519-1.0.2.tgz";
+      sha1 = "06d4912255093419477d425633606e0e90782967";
+    };
+    deps = {
+      "jsbn-0.1.0" = self.by-version."jsbn"."0.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jsbn".">=0.1.0 <0.2.0" =
+    self.by-version."jsbn"."0.1.0";
+  by-version."jsbn"."0.1.0" = self.buildNodePackage {
+    name = "jsbn-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsbn/-/jsbn-0.1.0.tgz";
+      name = "jsbn-0.1.0.tgz";
+      sha1 = "650987da0dd74f4ebf5a11377a2aa2d273e97dfd";
     };
     deps = {
     };
@@ -1836,16 +1917,75 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."jsonfile"."^2.0.0" =
-    self.by-version."jsonfile"."2.0.0";
-  by-version."jsonfile"."2.0.0" = self.buildNodePackage {
-    name = "jsonfile-2.0.0";
+  by-spec."jsbn"."~0.1.0" =
+    self.by-version."jsbn"."0.1.0";
+  by-spec."json-schema"."0.2.2" =
+    self.by-version."json-schema"."0.2.2";
+  by-version."json-schema"."0.2.2" = self.buildNodePackage {
+    name = "json-schema-0.2.2";
+    version = "0.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/json-schema/-/json-schema-0.2.2.tgz";
+      name = "json-schema-0.2.2.tgz";
+      sha1 = "50354f19f603917c695f70b85afa77c3b0f23506";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."json-stringify-safe"."~5.0.1" =
+    self.by-version."json-stringify-safe"."5.0.1";
+  by-version."json-stringify-safe"."5.0.1" = self.buildNodePackage {
+    name = "json-stringify-safe-5.0.1";
+    version = "5.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz";
+      name = "json-stringify-safe-5.0.1.tgz";
+      sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    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";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/jsonfile/-/jsonfile-2.2.3.tgz";
+      name = "jsonfile-2.2.3.tgz";
+      sha1 = "e252b99a6af901d3ec41f332589c90509a7bc605";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."jsonpointer"."2.0.0" =
+    self.by-version."jsonpointer"."2.0.0";
+  by-version."jsonpointer"."2.0.0" = self.buildNodePackage {
+    name = "jsonpointer-2.0.0";
     version = "2.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jsonfile/-/jsonfile-2.0.0.tgz";
-      name = "jsonfile-2.0.0.tgz";
-      sha1 = "c3944f350bd3c078b392e0aa1633b44662fcf06b";
+      url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-2.0.0.tgz";
+      name = "jsonpointer-2.0.0.tgz";
+      sha1 = "3af1dd20fe85463910d469a385e33017d2a030d9";
     };
     deps = {
     };
@@ -1855,18 +1995,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."jsonpointer"."^1.1.0" =
-    self.by-version."jsonpointer"."1.1.0";
-  by-version."jsonpointer"."1.1.0" = self.buildNodePackage {
-    name = "jsonpointer-1.1.0";
-    version = "1.1.0";
+  by-spec."jsprim"."^1.2.2" =
+    self.by-version."jsprim"."1.2.2";
+  by-version."jsprim"."1.2.2" = self.buildNodePackage {
+    name = "jsprim-1.2.2";
+    version = "1.2.2";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/jsonpointer/-/jsonpointer-1.1.0.tgz";
-      name = "jsonpointer-1.1.0.tgz";
-      sha1 = "c3c72efaed3b97154163dc01dd349e1cfe0f80fc";
+      url = "http://registry.npmjs.org/jsprim/-/jsprim-1.2.2.tgz";
+      name = "jsprim-1.2.2.tgz";
+      sha1 = "f20c906ac92abd58e3b79ac8bc70a48832512da1";
     };
     deps = {
+      "extsprintf-1.0.2" = self.by-version."extsprintf"."1.0.2";
+      "json-schema-0.2.2" = self.by-version."json-schema"."0.2.2";
+      "verror-1.3.6" = self.by-version."verror"."1.3.6";
     };
     optionalDependencies = {
     };
@@ -1874,28 +2017,29 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."kbpgp".">=2.0.9" =
-    self.by-version."kbpgp"."2.0.9";
-  by-version."kbpgp"."2.0.9" = self.buildNodePackage {
-    name = "kbpgp-2.0.9";
-    version = "2.0.9";
+  by-spec."kbpgp".">=2.0.41" =
+    self.by-version."kbpgp"."2.0.50";
+  by-version."kbpgp"."2.0.50" = self.buildNodePackage {
+    name = "kbpgp-2.0.50";
+    version = "2.0.50";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/kbpgp/-/kbpgp-2.0.9.tgz";
-      name = "kbpgp-2.0.9.tgz";
-      sha1 = "b4f8686abde8689a1d4abb36e070af78632ceb59";
+      url = "http://registry.npmjs.org/kbpgp/-/kbpgp-2.0.50.tgz";
+      name = "kbpgp-2.0.50.tgz";
+      sha1 = "b060d0e00f965001ea1dd59d64e597f8e060e10c";
     };
     deps = {
       "bn-1.0.1" = self.by-version."bn"."1.0.1";
-      "deep-equal-1.0.0" = self.by-version."deep-equal"."1.0.0";
+      "bzip-deflate-1.0.0" = self.by-version."bzip-deflate"."1.0.0";
+      "deep-equal-1.0.1" = self.by-version."deep-equal"."1.0.1";
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "keybase-compressjs-1.0.1-c" = self.by-version."keybase-compressjs"."1.0.1-c";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
       "keybase-ecurve-1.0.0" = self.by-version."keybase-ecurve"."1.0.0";
+      "keybase-nacl-1.0.1" = self.by-version."keybase-nacl"."1.0.1";
       "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28";
-      "purepack-1.0.1" = self.by-version."purepack"."1.0.1";
-      "triplesec-3.0.19" = self.by-version."triplesec"."3.0.19";
-      "tweetnacl-0.12.2" = self.by-version."tweetnacl"."0.12.2";
+      "purepack-1.0.4" = self.by-version."purepack"."1.0.4";
+      "triplesec-3.0.25" = self.by-version."triplesec"."3.0.25";
+      "tweetnacl-0.13.3" = self.by-version."tweetnacl"."0.13.3";
     };
     optionalDependencies = {
     };
@@ -1903,29 +2047,11 @@
     os = [ ];
     cpu = [ ];
   };
-  "kbpgp" = self.by-version."kbpgp"."2.0.9";
+  by-spec."kbpgp".">=2.0.46" =
+    self.by-version."kbpgp"."2.0.50";
+  "kbpgp" = self.by-version."kbpgp"."2.0.50";
   by-spec."kbpgp"."^2.0.0" =
-    self.by-version."kbpgp"."2.0.9";
-  by-spec."keybase-compressjs"."^1.0.1-c" =
-    self.by-version."keybase-compressjs"."1.0.1-c";
-  by-version."keybase-compressjs"."1.0.1-c" = self.buildNodePackage {
-    name = "keybase-compressjs-1.0.1-c";
-    version = "1.0.1-c";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/keybase-compressjs/-/keybase-compressjs-1.0.1-c.tgz";
-      name = "keybase-compressjs-1.0.1-c.tgz";
-      sha1 = "dc664a7f5d95584a534622a260297532f3ce9f9f";
-    };
-    deps = {
-      "commander-2.1.0" = self.by-version."commander"."2.1.0";
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
+    self.by-version."kbpgp"."2.0.50";
   by-spec."keybase-ecurve"."^1.0.0" =
     self.by-version."keybase-ecurve"."1.0.0";
   by-version."keybase-ecurve"."1.0.0" = self.buildNodePackage {
@@ -1946,32 +2072,54 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."keybase-installer"."1.0.1" =
-    self.by-version."keybase-installer"."1.0.1";
-  by-version."keybase-installer"."1.0.1" = self.buildNodePackage {
-    name = "keybase-installer-1.0.1";
-    version = "1.0.1";
+  by-spec."keybase-installer"."1.0.2" =
+    self.by-version."keybase-installer"."1.0.2";
+  by-version."keybase-installer"."1.0.2" = self.buildNodePackage {
+    name = "keybase-installer-1.0.2";
+    version = "1.0.2";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/keybase-installer/-/keybase-installer-1.0.1.tgz";
-      name = "keybase-installer-1.0.1.tgz";
-      sha1 = "31ca46388833665225e8113bdd79ded9b04e0862";
+      url = "http://registry.npmjs.org/keybase-installer/-/keybase-installer-1.0.2.tgz";
+      name = "keybase-installer-1.0.2.tgz";
+      sha1 = "19a68b29ef7981daf8531a8f6fcfaffc885f7e6b";
     };
     deps = {
       "badnode-1.0.1" = self.by-version."badnode"."1.0.1";
       "colors-0.6.2" = self.by-version."colors"."0.6.2";
-      "gpg-wrapper-1.0.4" = self.by-version."gpg-wrapper"."1.0.4";
+      "gpg-wrapper-1.0.5" = self.by-version."gpg-wrapper"."1.0.5";
       "iced-data-structures-0.0.5" = self.by-version."iced-data-structures"."0.0.5";
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
       "iced-logger-0.0.6" = self.by-version."iced-logger"."0.0.6";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
       "iced-spawn-1.0.0" = self.by-version."iced-spawn"."1.0.0";
-      "iced-utils-0.1.22" = self.by-version."iced-utils"."0.1.22";
+      "iced-utils-0.1.23" = self.by-version."iced-utils"."0.1.23";
       "keybase-path-0.0.15" = self.by-version."keybase-path"."0.0.15";
       "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28";
       "progress-1.1.3" = self.by-version."progress"."1.1.3";
-      "request-2.55.0" = self.by-version."request"."2.55.0";
-      "semver-4.3.3" = self.by-version."semver"."4.3.3";
+      "request-2.69.0" = self.by-version."request"."2.69.0";
+      "semver-5.1.0" = self.by-version."semver"."5.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "keybase-installer" = self.by-version."keybase-installer"."1.0.2";
+  by-spec."keybase-nacl"."^1.0.0" =
+    self.by-version."keybase-nacl"."1.0.1";
+  by-version."keybase-nacl"."1.0.1" = self.buildNodePackage {
+    name = "keybase-nacl-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/keybase-nacl/-/keybase-nacl-1.0.1.tgz";
+      name = "keybase-nacl-1.0.1.tgz";
+      sha1 = "6047edb7baf241ac5c60cfc32e86512d69d652d3";
+    };
+    deps = {
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
+      "tweetnacl-0.13.3" = self.by-version."tweetnacl"."0.13.3";
     };
     optionalDependencies = {
     };
@@ -1979,7 +2127,6 @@
     os = [ ];
     cpu = [ ];
   };
-  "keybase-installer" = self.by-version."keybase-installer"."1.0.1";
   by-spec."keybase-path"."0.0.16" =
     self.by-version."keybase-path"."0.0.16";
   by-version."keybase-path"."0.0.16" = self.buildNodePackage {
@@ -1992,7 +2139,7 @@
       sha1 = "3d60804aa48274b628d802a212f5e0dfcc13acaa";
     };
     deps = {
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -2013,7 +2160,7 @@
       sha1 = "94b95448fc4edf73e096366279bd28a469d5f72f";
     };
     deps = {
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -2021,23 +2168,24 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."keybase-proofs"."^2.0.13" =
-    self.by-version."keybase-proofs"."2.0.20";
-  by-version."keybase-proofs"."2.0.20" = self.buildNodePackage {
-    name = "keybase-proofs-2.0.20";
-    version = "2.0.20";
+  by-spec."keybase-proofs"."^2.0.23" =
+    self.by-version."keybase-proofs"."2.0.47";
+  by-version."keybase-proofs"."2.0.47" = self.buildNodePackage {
+    name = "keybase-proofs-2.0.47";
+    version = "2.0.47";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/keybase-proofs/-/keybase-proofs-2.0.20.tgz";
-      name = "keybase-proofs-2.0.20.tgz";
-      sha1 = "bb8f76f51cd04ee3a2de8b7e786c717e718ec2c7";
+      url = "http://registry.npmjs.org/keybase-proofs/-/keybase-proofs-2.0.47.tgz";
+      name = "keybase-proofs-2.0.47.tgz";
+      sha1 = "27c4d9936b8740bc782038f9087d462a1e89b6e4";
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
       "iced-lock-1.0.1" = self.by-version."iced-lock"."1.0.1";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
+      "kbpgp-2.0.50" = self.by-version."kbpgp"."2.0.50";
       "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28";
-      "triplesec-3.0.19" = self.by-version."triplesec"."3.0.19";
+      "triplesec-3.0.25" = self.by-version."triplesec"."3.0.25";
     };
     optionalDependencies = {
     };
@@ -2045,25 +2193,50 @@
     os = [ ];
     cpu = [ ];
   };
-  "keybase-proofs" = self.by-version."keybase-proofs"."2.0.20";
-  by-spec."libkeybase"."^1.0.2" =
-    self.by-version."libkeybase"."1.0.2";
-  by-version."libkeybase"."1.0.2" = self.buildNodePackage {
-    name = "libkeybase-1.0.2";
-    version = "1.0.2";
+  by-spec."keybase-proofs"."^2.0.46" =
+    self.by-version."keybase-proofs"."2.0.47";
+  "keybase-proofs" = self.by-version."keybase-proofs"."2.0.47";
+  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";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/libkeybase/-/libkeybase-1.0.2.tgz";
-      name = "libkeybase-1.0.2.tgz";
-      sha1 = "742e4f5138faa8f912a70e126f0eda414bf8fc51";
+      url = "http://registry.npmjs.org/klaw/-/klaw-1.1.3.tgz";
+      name = "klaw-1.1.3.tgz";
+      sha1 = "7da33c6b42f9b3dc9cec00d17f13af017fcc2721";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."libkeybase".">=1.2.19" =
+    self.by-version."libkeybase"."1.2.24";
+  by-version."libkeybase"."1.2.24" = self.buildNodePackage {
+    name = "libkeybase-1.2.24";
+    version = "1.2.24";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/libkeybase/-/libkeybase-1.2.24.tgz";
+      name = "libkeybase-1.2.24.tgz";
+      sha1 = "01bd5900eebad304c6ee906dad552ecc211ec989";
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
       "iced-lock-1.0.1" = self.by-version."iced-lock"."1.0.1";
       "iced-logger-0.0.5" = self.by-version."iced-logger"."0.0.5";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "kbpgp-2.0.9" = self.by-version."kbpgp"."2.0.9";
-      "tweetnacl-0.12.2" = self.by-version."tweetnacl"."0.12.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
+      "iced-utils-0.1.23" = self.by-version."iced-utils"."0.1.23";
+      "kbpgp-2.0.50" = self.by-version."kbpgp"."2.0.50";
+      "keybase-proofs-2.0.47" = self.by-version."keybase-proofs"."2.0.47";
+      "merkle-tree-0.0.14" = self.by-version."merkle-tree"."0.0.14";
+      "pgp-utils-0.0.28" = self.by-version."pgp-utils"."0.0.28";
+      "triplesec-3.0.25" = self.by-version."triplesec"."3.0.25";
     };
     optionalDependencies = {
     };
@@ -2071,17 +2244,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "libkeybase" = self.by-version."libkeybase"."1.0.2";
-  by-spec."marked".">= 0.2.7" =
-    self.by-version."marked"."0.3.3";
-  by-version."marked"."0.3.3" = self.buildNodePackage {
-    name = "marked-0.3.3";
-    version = "0.3.3";
-    bin = true;
+  "libkeybase" = self.by-version."libkeybase"."1.2.24";
+  by-spec."lru-cache"."^2.6.5" =
+    self.by-version."lru-cache"."2.7.3";
+  by-version."lru-cache"."2.7.3" = self.buildNodePackage {
+    name = "lru-cache-2.7.3";
+    version = "2.7.3";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/marked/-/marked-0.3.3.tgz";
-      name = "marked-0.3.3.tgz";
-      sha1 = "08bad9cac13736f6cceddc202344f1b0bf255390";
+      url = "http://registry.npmjs.org/lru-cache/-/lru-cache-2.7.3.tgz";
+      name = "lru-cache-2.7.3.tgz";
+      sha1 = "6d4524e8b955f95d4f5b58851ce21dd72fb4e952";
     };
     deps = {
     };
@@ -2091,22 +2264,41 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."merkle-tree"."0.0.12" =
-    self.by-version."merkle-tree"."0.0.12";
-  by-version."merkle-tree"."0.0.12" = self.buildNodePackage {
-    name = "merkle-tree-0.0.12";
-    version = "0.0.12";
+  by-spec."marked".">= 0.2.7" =
+    self.by-version."marked"."0.3.5";
+  by-version."marked"."0.3.5" = self.buildNodePackage {
+    name = "marked-0.3.5";
+    version = "0.3.5";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/marked/-/marked-0.3.5.tgz";
+      name = "marked-0.3.5.tgz";
+      sha1 = "4113a15ac5d7bca158a5aae07224587b9fa15b94";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."merkle-tree"."0.0.14" =
+    self.by-version."merkle-tree"."0.0.14";
+  by-version."merkle-tree"."0.0.14" = self.buildNodePackage {
+    name = "merkle-tree-0.0.14";
+    version = "0.0.14";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/merkle-tree/-/merkle-tree-0.0.12.tgz";
-      name = "merkle-tree-0.0.12.tgz";
-      sha1 = "c8d6f0e9489b828c1d02942b24514311bac5e30f";
+      url = "http://registry.npmjs.org/merkle-tree/-/merkle-tree-0.0.14.tgz";
+      name = "merkle-tree-0.0.14.tgz";
+      sha1 = "584c3b05beaf7d482fbd4c6a868e8c35a581a7ef";
     };
     deps = {
       "deep-equal-0.2.2" = self.by-version."deep-equal"."0.2.2";
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
-      "iced-utils-0.1.22" = self.by-version."iced-utils"."0.1.22";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
+      "iced-utils-0.1.23" = self.by-version."iced-utils"."0.1.23";
     };
     optionalDependencies = {
     };
@@ -2114,17 +2306,17 @@
     os = [ ];
     cpu = [ ];
   };
-  "merkle-tree" = self.by-version."merkle-tree"."0.0.12";
-  by-spec."mime-db"."~1.8.0" =
-    self.by-version."mime-db"."1.8.0";
-  by-version."mime-db"."1.8.0" = self.buildNodePackage {
-    name = "mime-db-1.8.0";
-    version = "1.8.0";
+  "merkle-tree" = self.by-version."merkle-tree"."0.0.14";
+  by-spec."mime-db"."~1.21.0" =
+    self.by-version."mime-db"."1.21.0";
+  by-version."mime-db"."1.21.0" = self.buildNodePackage {
+    name = "mime-db-1.21.0";
+    version = "1.21.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.8.0.tgz";
-      name = "mime-db-1.8.0.tgz";
-      sha1 = "82a9b385f22b0f5954dec4d445faba0722c4ad25";
+      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.21.0.tgz";
+      name = "mime-db-1.21.0.tgz";
+      sha1 = "9b5239e3353cf6eb015a00d890261027c36d4bac";
     };
     deps = {
     };
@@ -2134,19 +2326,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mime-types"."~2.0.1" =
-    self.by-version."mime-types"."2.0.10";
-  by-version."mime-types"."2.0.10" = self.buildNodePackage {
-    name = "mime-types-2.0.10";
-    version = "2.0.10";
+  by-spec."mime-types"."^2.1.3" =
+    self.by-version."mime-types"."2.1.9";
+  by-version."mime-types"."2.1.9" = self.buildNodePackage {
+    name = "mime-types-2.1.9";
+    version = "2.1.9";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.10.tgz";
-      name = "mime-types-2.0.10.tgz";
-      sha1 = "eacd81bb73cab2a77447549a078d4f2018c67b4d";
+      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.1.9.tgz";
+      name = "mime-types-2.1.9.tgz";
+      sha1 = "dfb396764b5fdf75be34b1f4104bc3687fb635f8";
     };
     deps = {
-      "mime-db-1.8.0" = self.by-version."mime-db"."1.8.0";
+      "mime-db-1.21.0" = self.by-version."mime-db"."1.21.0";
     };
     optionalDependencies = {
     };
@@ -2154,21 +2346,21 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."mime-types"."~2.0.3" =
-    self.by-version."mime-types"."2.0.10";
-  by-spec."minimatch"."^2.0.1" =
-    self.by-version."minimatch"."2.0.4";
-  by-version."minimatch"."2.0.4" = self.buildNodePackage {
-    name = "minimatch-2.0.4";
-    version = "2.0.4";
+  by-spec."mime-types"."~2.1.7" =
+    self.by-version."mime-types"."2.1.9";
+  by-spec."minimatch"."2 || 3" =
+    self.by-version."minimatch"."3.0.0";
+  by-version."minimatch"."3.0.0" = self.buildNodePackage {
+    name = "minimatch-3.0.0";
+    version = "3.0.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.4.tgz";
-      name = "minimatch-2.0.4.tgz";
-      sha1 = "83bea115803e7a097a78022427287edb762fafed";
+      url = "http://registry.npmjs.org/minimatch/-/minimatch-3.0.0.tgz";
+      name = "minimatch-3.0.0.tgz";
+      sha1 = "5236157a51e4f004c177fb3c527ff7dd78f0ef83";
     };
     deps = {
-      "brace-expansion-1.1.0" = self.by-version."brace-expansion"."1.1.0";
+      "brace-expansion-1.1.2" = self.by-version."brace-expansion"."1.1.2";
     };
     optionalDependencies = {
     };
@@ -2177,15 +2369,15 @@
     cpu = [ ];
   };
   by-spec."minimist".">=0.0.8" =
-    self.by-version."minimist"."1.1.1";
-  by-version."minimist"."1.1.1" = self.buildNodePackage {
-    name = "minimist-1.1.1";
-    version = "1.1.1";
+    self.by-version."minimist"."1.2.0";
+  by-version."minimist"."1.2.0" = self.buildNodePackage {
+    name = "minimist-1.2.0";
+    version = "1.2.0";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/minimist/-/minimist-1.1.1.tgz";
-      name = "minimist-1.1.1.tgz";
-      sha1 = "1bc2bc71658cdca5712475684363615b0b4f695b";
+      url = "http://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz";
+      name = "minimist-1.2.0.tgz";
+      sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284";
     };
     deps = {
     };
@@ -2248,7 +2440,7 @@
       sha1 = "67bfc6f7a86f26fbc37aac83fd46d88c61d109b5";
     };
     deps = {
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -2257,15 +2449,15 @@
     cpu = [ ];
   };
   by-spec."mute-stream"."~0.0.4" =
-    self.by-version."mute-stream"."0.0.4";
-  by-version."mute-stream"."0.0.4" = self.buildNodePackage {
-    name = "mute-stream-0.0.4";
-    version = "0.0.4";
+    self.by-version."mute-stream"."0.0.5";
+  by-version."mute-stream"."0.0.5" = self.buildNodePackage {
+    name = "mute-stream-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz";
-      name = "mute-stream-0.0.4.tgz";
-      sha1 = "a9219960a6d5d5d046597aee51252c6655f7177e";
+      url = "http://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz";
+      name = "mute-stream-0.0.5.tgz";
+      sha1 = "8fbfabb0a98a253d3184331f9e8deb7372fac6c0";
     };
     deps = {
     };
@@ -2294,16 +2486,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."node-uuid"."~1.4.0" =
-    self.by-version."node-uuid"."1.4.3";
-  by-version."node-uuid"."1.4.3" = self.buildNodePackage {
-    name = "node-uuid-1.4.3";
-    version = "1.4.3";
+  by-spec."node-uuid"."~1.4.7" =
+    self.by-version."node-uuid"."1.4.7";
+  by-version."node-uuid"."1.4.7" = self.buildNodePackage {
+    name = "node-uuid-1.4.7";
+    version = "1.4.7";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.3.tgz";
-      name = "node-uuid-1.4.3.tgz";
-      sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9";
+      url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.7.tgz";
+      name = "node-uuid-1.4.7.tgz";
+      sha1 = "6da5a17668c4b3dd59623bda11cf7fa4c1f60a6f";
     };
     deps = {
     };
@@ -2313,16 +2505,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."oauth-sign"."~0.6.0" =
-    self.by-version."oauth-sign"."0.6.0";
-  by-version."oauth-sign"."0.6.0" = self.buildNodePackage {
-    name = "oauth-sign-0.6.0";
-    version = "0.6.0";
+  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";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.6.0.tgz";
-      name = "oauth-sign-0.6.0.tgz";
-      sha1 = "7dbeae44f6ca454e1f168451d630746735813ce3";
+      url = "http://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.1.tgz";
+      name = "oauth-sign-0.8.1.tgz";
+      sha1 = "182439bdb91378bf7460e75c64ea43e6448def06";
     };
     deps = {
     };
@@ -2333,15 +2525,15 @@
     cpu = [ ];
   };
   by-spec."once"."^1.3.0" =
-    self.by-version."once"."1.3.1";
-  by-version."once"."1.3.1" = self.buildNodePackage {
-    name = "once-1.3.1";
-    version = "1.3.1";
+    self.by-version."once"."1.3.3";
+  by-version."once"."1.3.3" = self.buildNodePackage {
+    name = "once-1.3.3";
+    version = "1.3.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/once/-/once-1.3.1.tgz";
-      name = "once-1.3.1.tgz";
-      sha1 = "f3f3e4da5b7d27b5c732969ee3e67e729457b31f";
+      url = "http://registry.npmjs.org/once/-/once-1.3.3.tgz";
+      name = "once-1.3.3.tgz";
+      sha1 = "b2e261557ce4c314ec8304f3fa82663e4297ca20";
     };
     deps = {
       "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1";
@@ -2364,7 +2556,7 @@
       sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686";
     };
     deps = {
-      "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2";
+      "wordwrap-0.0.3" = self.by-version."wordwrap"."0.0.3";
       "minimist-0.0.10" = self.by-version."minimist"."0.0.10";
     };
     optionalDependencies = {
@@ -2406,7 +2598,7 @@
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -2427,7 +2619,7 @@
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -2442,16 +2634,74 @@
   "pgp-utils" = self.by-version."pgp-utils"."0.0.28";
   by-spec."pgp-utils".">=0.0.8" =
     self.by-version."pgp-utils"."0.0.28";
-  by-spec."pkginfo"."0.3.x" =
-    self.by-version."pkginfo"."0.3.0";
-  by-version."pkginfo"."0.3.0" = self.buildNodePackage {
-    name = "pkginfo-0.3.0";
-    version = "0.3.0";
+  by-spec."pinkie"."^2.0.0" =
+    self.by-version."pinkie"."2.0.4";
+  by-version."pinkie"."2.0.4" = self.buildNodePackage {
+    name = "pinkie-2.0.4";
+    version = "2.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.0.tgz";
-      name = "pkginfo-0.3.0.tgz";
-      sha1 = "726411401039fe9b009eea86614295d5f3a54276";
+      url = "http://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz";
+      name = "pinkie-2.0.4.tgz";
+      sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    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";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.0.tgz";
+      name = "pinkie-promise-2.0.0.tgz";
+      sha1 = "4c83538de1f6e660c29e0a13446844f7a7e88259";
+    };
+    deps = {
+      "pinkie-2.0.4" = self.by-version."pinkie"."2.0.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."pkginfo"."0.3.x" =
+    self.by-version."pkginfo"."0.3.1";
+  by-version."pkginfo"."0.3.1" = self.buildNodePackage {
+    name = "pkginfo-0.3.1";
+    version = "0.3.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz";
+      name = "pkginfo-0.3.1.tgz";
+      sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  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";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.6.tgz";
+      name = "process-nextick-args-1.0.6.tgz";
+      sha1 = "0f96b001cea90b12592ce566edb97ec11e69bd05";
     };
     deps = {
     };
@@ -2500,25 +2750,6 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."punycode".">=0.2.0" =
-    self.by-version."punycode"."1.3.2";
-  by-version."punycode"."1.3.2" = self.buildNodePackage {
-    name = "punycode-1.3.2";
-    version = "1.3.2";
-    bin = false;
-    src = fetchurl {
-      url = "http://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz";
-      name = "punycode-1.3.2.tgz";
-      sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d";
-    };
-    deps = {
-    };
-    optionalDependencies = {
-    };
-    peerDependencies = [];
-    os = [ ];
-    cpu = [ ];
-  };
   by-spec."purepack"."1.0.1" =
     self.by-version."purepack"."1.0.1";
   by-version."purepack"."1.0.1" = self.buildNodePackage {
@@ -2540,19 +2771,36 @@
   };
   "purepack" = self.by-version."purepack"."1.0.1";
   by-spec."purepack".">=1" =
-    self.by-version."purepack"."1.0.1";
-  by-spec."purepack".">=1.0.1" =
-    self.by-version."purepack"."1.0.1";
-  by-spec."qs"."~2.4.0" =
-    self.by-version."qs"."2.4.1";
-  by-version."qs"."2.4.1" = self.buildNodePackage {
-    name = "qs-2.4.1";
-    version = "2.4.1";
+    self.by-version."purepack"."1.0.4";
+  by-version."purepack"."1.0.4" = self.buildNodePackage {
+    name = "purepack-1.0.4";
+    version = "1.0.4";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/qs/-/qs-2.4.1.tgz";
-      name = "qs-2.4.1.tgz";
-      sha1 = "68cbaea971013426a80c1404fad6b1a6b1175245";
+      url = "http://registry.npmjs.org/purepack/-/purepack-1.0.4.tgz";
+      name = "purepack-1.0.4.tgz";
+      sha1 = "086282fd939285f58664ba9a9bba31cdb165ccd2";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."purepack".">=1.0.4" =
+    self.by-version."purepack"."1.0.4";
+  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 = "http://registry.npmjs.org/qs/-/qs-6.0.2.tgz";
+      name = "qs-6.0.2.tgz";
+      sha1 = "88c68d590e8ed56c76c79f352c17b982466abfcd";
     };
     deps = {
     };
@@ -2574,7 +2822,7 @@
       sha256 = "927ce6e6e88c80c54b434261afb5717630568b6979afffc6828c4fc0335e22ec";
     };
     deps = {
-      "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4";
+      "mute-stream-0.0.5" = self.by-version."mute-stream"."0.0.5";
     };
     optionalDependencies = {
     };
@@ -2595,7 +2843,7 @@
       sha1 = "f6eef764f514c89e2b9e23146a75ba106756d23e";
     };
     deps = {
-      "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
+      "core-util-is-1.0.2" = self.by-version."core-util-is"."1.0.2";
       "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
       "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
       "inherits-2.0.1" = self.by-version."inherits"."2.0.1";
@@ -2606,22 +2854,24 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."readable-stream"."~1.0.26" =
-    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";
+  by-spec."readable-stream"."~2.0.5" =
+    self.by-version."readable-stream"."2.0.5";
+  by-version."readable-stream"."2.0.5" = self.buildNodePackage {
+    name = "readable-stream-2.0.5";
+    version = "2.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz";
-      name = "readable-stream-1.0.33.tgz";
-      sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c";
+      url = "http://registry.npmjs.org/readable-stream/-/readable-stream-2.0.5.tgz";
+      name = "readable-stream-2.0.5.tgz";
+      sha1 = "a2426f8dcd4551c77a33f96edf2886a23c829669";
     };
     deps = {
-      "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1";
-      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
-      "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31";
+      "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-0.0.1" = self.by-version."isarray"."0.0.1";
+      "process-nextick-args-1.0.6" = self.by-version."process-nextick-args"."1.0.6";
+      "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 = {
     };
@@ -2629,36 +2879,39 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."request"."^2.34.0" =
-    self.by-version."request"."2.55.0";
-  by-version."request"."2.55.0" = self.buildNodePackage {
-    name = "request-2.55.0";
-    version = "2.55.0";
+  by-spec."request"."^2.58.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 = "http://registry.npmjs.org/request/-/request-2.55.0.tgz";
-      name = "request-2.55.0.tgz";
-      sha1 = "d75c1cdf679d76bb100f9bffe1fe551b5c24e93d";
+      url = "http://registry.npmjs.org/request/-/request-2.69.0.tgz";
+      name = "request-2.69.0.tgz";
+      sha1 = "cf91d2e000752b1217155c005241911991a2346a";
     };
     deps = {
-      "bl-0.9.4" = self.by-version."bl"."0.9.4";
-      "caseless-0.9.0" = self.by-version."caseless"."0.9.0";
+      "aws-sign2-0.6.0" = self.by-version."aws-sign2"."0.6.0";
+      "aws4-1.2.1" = self.by-version."aws4"."1.2.1";
+      "bl-1.0.2" = self.by-version."bl"."1.0.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";
+      "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-0.2.0" = self.by-version."form-data"."0.2.0";
-      "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0";
-      "mime-types-2.0.10" = self.by-version."mime-types"."2.0.10";
-      "node-uuid-1.4.3" = self.by-version."node-uuid"."1.4.3";
-      "qs-2.4.1" = self.by-version."qs"."2.4.1";
-      "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0";
-      "tough-cookie-0.13.0" = self.by-version."tough-cookie"."0.13.0";
-      "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";
-      "hawk-2.3.1" = self.by-version."hawk"."2.3.1";
-      "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0";
-      "stringstream-0.0.4" = self.by-version."stringstream"."0.0.4";
-      "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7";
+      "form-data-1.0.0-rc3" = self.by-version."form-data"."1.0.0-rc3";
+      "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";
-      "har-validator-1.6.1" = self.by-version."har-validator"."1.6.1";
+      "json-stringify-safe-5.0.1" = self.by-version."json-stringify-safe"."5.0.1";
+      "mime-types-2.1.9" = self.by-version."mime-types"."2.1.9";
+      "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.1" = self.by-version."tough-cookie"."2.2.1";
+      "tunnel-agent-0.4.2" = self.by-version."tunnel-agent"."0.4.2";
     };
     optionalDependencies = {
     };
@@ -2666,22 +2919,20 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."request"."^2.55.0" =
-    self.by-version."request"."2.55.0";
-  "request" = self.by-version."request"."2.55.0";
+  "request" = self.by-version."request"."2.69.0";
   by-spec."rimraf"."^2.2.8" =
-    self.by-version."rimraf"."2.3.2";
-  by-version."rimraf"."2.3.2" = self.buildNodePackage {
-    name = "rimraf-2.3.2";
-    version = "2.3.2";
+    self.by-version."rimraf"."2.5.1";
+  by-version."rimraf"."2.5.1" = self.buildNodePackage {
+    name = "rimraf-2.5.1";
+    version = "2.5.1";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/rimraf/-/rimraf-2.3.2.tgz";
-      name = "rimraf-2.3.2.tgz";
-      sha1 = "7304bd9275c401b89103b106b3531c1ef0c02fe9";
+      url = "http://registry.npmjs.org/rimraf/-/rimraf-2.5.1.tgz";
+      name = "rimraf-2.5.1.tgz";
+      sha1 = "52e1e946f3f9b9b0d5d8988ba3191aaf2a2dbd43";
     };
     deps = {
-      "glob-4.5.3" = self.by-version."glob"."4.5.3";
+      "glob-6.0.4" = self.by-version."glob"."6.0.4";
     };
     optionalDependencies = {
     };
@@ -2690,15 +2941,15 @@
     cpu = [ ];
   };
   by-spec."semver".">=1" =
-    self.by-version."semver"."4.3.3";
-  by-version."semver"."4.3.3" = self.buildNodePackage {
-    name = "semver-4.3.3";
-    version = "4.3.3";
+    self.by-version."semver"."5.1.0";
+  by-version."semver"."5.1.0" = self.buildNodePackage {
+    name = "semver-5.1.0";
+    version = "5.1.0";
     bin = true;
     src = fetchurl {
-      url = "http://registry.npmjs.org/semver/-/semver-4.3.3.tgz";
-      name = "semver-4.3.3.tgz";
-      sha1 = "15466b61220bc371cd8f0e666a9f785329ea8228";
+      url = "http://registry.npmjs.org/semver/-/semver-5.1.0.tgz";
+      name = "semver-5.1.0.tgz";
+      sha1 = "85f2cf8550465c4df000cf7d86f6b054106ab9e5";
     };
     deps = {
     };
@@ -2709,10 +2960,27 @@
     cpu = [ ];
   };
   by-spec."semver".">=2.2.1" =
-    self.by-version."semver"."4.3.3";
+    self.by-version."semver"."5.1.0";
   by-spec."semver"."^4.0.0" =
-    self.by-version."semver"."4.3.3";
-  "semver" = self.by-version."semver"."4.3.3";
+    self.by-version."semver"."4.3.6";
+  by-version."semver"."4.3.6" = self.buildNodePackage {
+    name = "semver-4.3.6";
+    version = "4.3.6";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/semver/-/semver-4.3.6.tgz";
+      name = "semver-4.3.6.tgz";
+      sha1 = "300bc6e0e86374f7ba61068b5b1ecd57fc6532da";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "semver" = self.by-version."semver"."4.3.6";
   by-spec."sntp"."1.x.x" =
     self.by-version."sntp"."1.0.9";
   by-version."sntp"."1.0.9" = self.buildNodePackage {
@@ -2725,7 +2993,7 @@
       sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198";
     };
     deps = {
-      "hoek-2.12.0" = self.by-version."hoek"."2.12.0";
+      "hoek-2.16.3" = self.by-version."hoek"."2.16.3";
     };
     optionalDependencies = {
     };
@@ -2745,7 +3013,7 @@
       sha1 = "4205b5791f2df77cf07527222558fe4e46aca2f1";
     };
     deps = {
-      "ipv6-3.1.1" = self.by-version."ipv6"."3.1.1";
+      "ipv6-3.1.3" = self.by-version."ipv6"."3.1.3";
       "network-byte-order-0.2.0" = self.by-version."network-byte-order"."0.2.0";
     };
     optionalDependencies = {
@@ -2815,7 +3083,7 @@
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
     };
     optionalDependencies = {
     };
@@ -2843,6 +3111,32 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."sshpk"."^1.7.0" =
+    self.by-version."sshpk"."1.7.3";
+  by-version."sshpk"."1.7.3" = self.buildNodePackage {
+    name = "sshpk-1.7.3";
+    version = "1.7.3";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/sshpk/-/sshpk-1.7.3.tgz";
+      name = "sshpk-1.7.3.tgz";
+      sha1 = "caa8ef95e30765d856698b7025f9f211ab65962f";
+    };
+    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.12.2" = self.by-version."dashdash"."1.12.2";
+    };
+    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."stack-trace"."0.0.x" =
     self.by-version."stack-trace"."0.0.9";
   by-version."stack-trace"."0.0.9" = self.buildNodePackage {
@@ -2901,15 +3195,15 @@
     cpu = [ ];
   };
   by-spec."stringstream"."~0.0.4" =
-    self.by-version."stringstream"."0.0.4";
-  by-version."stringstream"."0.0.4" = self.buildNodePackage {
-    name = "stringstream-0.0.4";
-    version = "0.0.4";
+    self.by-version."stringstream"."0.0.5";
+  by-version."stringstream"."0.0.5" = self.buildNodePackage {
+    name = "stringstream-0.0.5";
+    version = "0.0.5";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.4.tgz";
-      name = "stringstream-0.0.4.tgz";
-      sha1 = "0f0e3423f942960b5692ac324a57dd093bc41a92";
+      url = "http://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz";
+      name = "stringstream-0.0.5.tgz";
+      sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878";
     };
     deps = {
     };
@@ -2919,19 +3213,19 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."strip-ansi"."^2.0.1" =
-    self.by-version."strip-ansi"."2.0.1";
-  by-version."strip-ansi"."2.0.1" = self.buildNodePackage {
-    name = "strip-ansi-2.0.1";
-    version = "2.0.1";
-    bin = true;
+  by-spec."strip-ansi"."^3.0.0" =
+    self.by-version."strip-ansi"."3.0.0";
+  by-version."strip-ansi"."3.0.0" = self.buildNodePackage {
+    name = "strip-ansi-3.0.0";
+    version = "3.0.0";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz";
-      name = "strip-ansi-2.0.1.tgz";
-      sha1 = "df62c1aa94ed2f114e1d0f21fd1d50482b79a60e";
+      url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.0.tgz";
+      name = "strip-ansi-3.0.0.tgz";
+      sha1 = "7510b665567ca914ccb5d7e072763ac968be3724";
     };
     deps = {
-      "ansi-regex-1.1.1" = self.by-version."ansi-regex"."1.1.1";
+      "ansi-regex-2.0.0" = self.by-version."ansi-regex"."2.0.0";
     };
     optionalDependencies = {
     };
@@ -2939,16 +3233,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."supports-color"."^1.3.0" =
-    self.by-version."supports-color"."1.3.1";
-  by-version."supports-color"."1.3.1" = self.buildNodePackage {
-    name = "supports-color-1.3.1";
-    version = "1.3.1";
-    bin = true;
+  by-spec."supports-color"."^2.0.0" =
+    self.by-version."supports-color"."2.0.0";
+  by-version."supports-color"."2.0.0" = self.buildNodePackage {
+    name = "supports-color-2.0.0";
+    version = "2.0.0";
+    bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/supports-color/-/supports-color-1.3.1.tgz";
-      name = "supports-color-1.3.1.tgz";
-      sha1 = "15758df09d8ff3b4acc307539fabe27095e1042d";
+      url = "http://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz";
+      name = "supports-color-2.0.0.tgz";
+      sha1 = "535d045ce6b6363fa40117084629995e9df324c7";
     };
     deps = {
     };
@@ -3000,19 +3294,18 @@
     cpu = [ ];
   };
   "timeago" = self.by-version."timeago"."0.1.0";
-  by-spec."tough-cookie".">=0.12.0" =
-    self.by-version."tough-cookie"."0.13.0";
-  by-version."tough-cookie"."0.13.0" = self.buildNodePackage {
-    name = "tough-cookie-0.13.0";
-    version = "0.13.0";
+  by-spec."tough-cookie"."~2.2.0" =
+    self.by-version."tough-cookie"."2.2.1";
+  by-version."tough-cookie"."2.2.1" = self.buildNodePackage {
+    name = "tough-cookie-2.2.1";
+    version = "2.2.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.13.0.tgz";
-      name = "tough-cookie-0.13.0.tgz";
-      sha1 = "34531cfefeba2dc050fb8e9a3310f876cdcc24f4";
+      url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-2.2.1.tgz";
+      name = "tough-cookie-2.2.1.tgz";
+      sha1 = "3b0516b799e70e8164436a1446e7e5877fda118e";
     };
     deps = {
-      "punycode-1.3.2" = self.by-version."punycode"."1.3.2";
     };
     optionalDependencies = {
     };
@@ -3021,20 +3314,20 @@
     cpu = [ ];
   };
   by-spec."triplesec".">=3.0.16" =
-    self.by-version."triplesec"."3.0.19";
-  by-version."triplesec"."3.0.19" = self.buildNodePackage {
-    name = "triplesec-3.0.19";
-    version = "3.0.19";
+    self.by-version."triplesec"."3.0.25";
+  by-version."triplesec"."3.0.25" = self.buildNodePackage {
+    name = "triplesec-3.0.25";
+    version = "3.0.25";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/triplesec/-/triplesec-3.0.19.tgz";
-      name = "triplesec-3.0.19.tgz";
-      sha1 = "1cf858ccfcc133a3e884ff7d37aedf3b306c32f9";
+      url = "http://registry.npmjs.org/triplesec/-/triplesec-3.0.25.tgz";
+      name = "triplesec-3.0.25.tgz";
+      sha1 = "c66833548646effbd031de01dde4ed0721aaad58";
     };
     deps = {
       "iced-error-0.0.9" = self.by-version."iced-error"."0.0.9";
       "iced-lock-1.0.1" = self.by-version."iced-lock"."1.0.1";
-      "iced-runtime-1.0.2" = self.by-version."iced-runtime"."1.0.2";
+      "iced-runtime-1.0.3" = self.by-version."iced-runtime"."1.0.3";
       "more-entropy-0.0.7" = self.by-version."more-entropy"."0.0.7";
       "progress-1.1.8" = self.by-version."progress"."1.1.8";
     };
@@ -3044,19 +3337,21 @@
     os = [ ];
     cpu = [ ];
   };
-  "triplesec" = self.by-version."triplesec"."3.0.19";
+  "triplesec" = self.by-version."triplesec"."3.0.25";
   by-spec."triplesec".">=3.0.19" =
-    self.by-version."triplesec"."3.0.19";
-  by-spec."tunnel-agent"."~0.4.0" =
-    self.by-version."tunnel-agent"."0.4.0";
-  by-version."tunnel-agent"."0.4.0" = self.buildNodePackage {
-    name = "tunnel-agent-0.4.0";
-    version = "0.4.0";
+    self.by-version."triplesec"."3.0.25";
+  by-spec."triplesec"."^3.0.19" =
+    self.by-version."triplesec"."3.0.25";
+  by-spec."tunnel-agent"."~0.4.1" =
+    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";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.0.tgz";
-      name = "tunnel-agent-0.4.0.tgz";
-      sha1 = "b1184e312ffbcf70b3b4c78e8c219de7ebb1c550";
+      url = "http://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.2.tgz";
+      name = "tunnel-agent-0.4.2.tgz";
+      sha1 = "1104e3f36ac87125c287270067d582d18133bfee";
     };
     deps = {
     };
@@ -3066,16 +3361,16 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."tweetnacl"."^0.12.0" =
-    self.by-version."tweetnacl"."0.12.2";
-  by-version."tweetnacl"."0.12.2" = self.buildNodePackage {
-    name = "tweetnacl-0.12.2";
-    version = "0.12.2";
+  by-spec."tweetnacl".">=0.13.0 <1.0.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 = "http://registry.npmjs.org/tweetnacl/-/tweetnacl-0.12.2.tgz";
-      name = "tweetnacl-0.12.2.tgz";
-      sha1 = "bd59f890507856fb0a1136acc3a8b44547e29ddb";
+      url = "http://registry.npmjs.org/tweetnacl/-/tweetnacl-0.13.3.tgz";
+      name = "tweetnacl-0.13.3.tgz";
+      sha1 = "d628b56f3bcc3d5ae74ba9d4c1a704def5ab4b56";
     };
     deps = {
     };
@@ -3085,8 +3380,8 @@
     os = [ ];
     cpu = [ ];
   };
-  by-spec."tweetnacl"."^0.12.2" =
-    self.by-version."tweetnacl"."0.12.2";
+  by-spec."tweetnacl"."^0.13.1" =
+    self.by-version."tweetnacl"."0.13.3";
   by-spec."underscore".">= 1.0.0" =
     self.by-version."underscore"."1.8.3";
   by-version."underscore"."1.8.3" = self.buildNodePackage {
@@ -3146,6 +3441,45 @@
     os = [ ];
     cpu = [ ];
   };
+  by-spec."util-deprecate"."~1.0.1" =
+    self.by-version."util-deprecate"."1.0.2";
+  by-version."util-deprecate"."1.0.2" = self.buildNodePackage {
+    name = "util-deprecate-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz";
+      name = "util-deprecate-1.0.2.tgz";
+      sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."verror"."1.3.6" =
+    self.by-version."verror"."1.3.6";
+  by-version."verror"."1.3.6" = self.buildNodePackage {
+    name = "verror-1.3.6";
+    version = "1.3.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/verror/-/verror-1.3.6.tgz";
+      name = "verror-1.3.6.tgz";
+      sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c";
+    };
+    deps = {
+      "extsprintf-1.0.2" = self.by-version."extsprintf"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
   by-spec."winston"."0.8.x" =
     self.by-version."winston"."0.8.3";
   by-version."winston"."0.8.3" = self.buildNodePackage {
@@ -3163,7 +3497,7 @@
       "cycle-1.0.3" = self.by-version."cycle"."1.0.3";
       "eyes-0.1.8" = self.by-version."eyes"."0.1.8";
       "isstream-0.1.2" = self.by-version."isstream"."0.1.2";
-      "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0";
+      "pkginfo-0.3.1" = self.by-version."pkginfo"."0.3.1";
       "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9";
     };
     optionalDependencies = {
@@ -3173,15 +3507,15 @@
     cpu = [ ];
   };
   by-spec."wordwrap"."~0.0.2" =
-    self.by-version."wordwrap"."0.0.2";
-  by-version."wordwrap"."0.0.2" = self.buildNodePackage {
-    name = "wordwrap-0.0.2";
-    version = "0.0.2";
+    self.by-version."wordwrap"."0.0.3";
+  by-version."wordwrap"."0.0.3" = self.buildNodePackage {
+    name = "wordwrap-0.0.3";
+    version = "0.0.3";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz";
-      name = "wordwrap-0.0.2.tgz";
-      sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f";
+      url = "http://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz";
+      name = "wordwrap-0.0.3.tgz";
+      sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
     };
     deps = {
     };
@@ -3211,15 +3545,15 @@
     cpu = [ ];
   };
   by-spec."xtend"."^4.0.0" =
-    self.by-version."xtend"."4.0.0";
-  by-version."xtend"."4.0.0" = self.buildNodePackage {
-    name = "xtend-4.0.0";
-    version = "4.0.0";
+    self.by-version."xtend"."4.0.1";
+  by-version."xtend"."4.0.1" = self.buildNodePackage {
+    name = "xtend-4.0.1";
+    version = "4.0.1";
     bin = false;
     src = fetchurl {
-      url = "http://registry.npmjs.org/xtend/-/xtend-4.0.0.tgz";
-      name = "xtend-4.0.0.tgz";
-      sha1 = "8bc36ff87aedbe7ce9eaf0bca36b2354a743840f";
+      url = "http://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz";
+      name = "xtend-4.0.1.tgz";
+      sha1 = "a5c6d532be656e23db820efb943a1f04998d63af";
     };
     deps = {
     };

From e4728dd05f71a44c6864dae8a45c83fcefb59a37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 6 Feb 2016 13:21:18 +0100
Subject: [PATCH 1091/2285] libxslt: fix CVE-2015-7995 by upstream patch

---
 pkgs/development/libraries/libxslt/default.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 3579e99ec7a8..9aa70ea04716 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, libxml2, findXMLCatalogs }:
+{ stdenv, fetchurl, fetchpatch, libxml2, findXMLCatalogs }:
 
 stdenv.mkDerivation rec {
   name = "libxslt-1.1.28";
@@ -8,14 +8,21 @@ stdenv.mkDerivation rec {
     sha256 = "13029baw9kkyjgr7q3jccw2mz38amq7mmpr5p3bh775qawd1bisz";
   };
 
+  patches = stdenv.lib.optional stdenv.isSunOS ./patch-ah.patch
+    ++ [
+      (fetchpatch {
+        name = "CVE-2015-7995.patch";
+        url = "http://git.gnome.org/browse/libxslt/patch/?id=7ca19df892ca22";
+        sha256 = "1xzg0q94dzbih9nvqp7g9ihz0a3qb0w23l1158m360z9smbi8zbd";
+      })
+    ];
+
   outputs = [ "out" "doc" ];
 
   buildInputs = [ libxml2 ];
 
   propagatedBuildInputs = [ findXMLCatalogs ];
 
-  patches = stdenv.lib.optionals stdenv.isSunOS [ ./patch-ah.patch ];
-
   configureFlags = [
     "--with-libxml-prefix=${libxml2}"
     "--without-python"

From f357b6eb2b2c7cbc8bff909f2887d8fc71ff9dec Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sat, 6 Feb 2016 13:26:31 +0100
Subject: [PATCH 1092/2285] faust: update faust1, rename
 default.nix->faust2.nix

---
 pkgs/applications/audio/faust/faust1.nix              | 11 +++++------
 .../audio/faust/{default.nix => faust2.nix}           |  0
 pkgs/top-level/all-packages.nix                       |  4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)
 rename pkgs/applications/audio/faust/{default.nix => faust2.nix} (100%)

diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix
index 722c762b7b44..4e03b26c036c 100644
--- a/pkgs/applications/audio/faust/faust1.nix
+++ b/pkgs/applications/audio/faust/faust1.nix
@@ -1,6 +1,6 @@
 { stdenv
 , coreutils
-, fetchgit
+, fetchurl
 , makeWrapper
 , pkgconfig
 }:
@@ -9,12 +9,11 @@ with stdenv.lib.strings;
 
 let
 
-  version = "8-1-2015";
+  version = "0.9.73";
 
-  src = fetchgit {
-    url = git://git.code.sf.net/p/faudiostream/code;
-    rev = "4db76fdc02b6aec8d15a5af77fcd5283abe963ce";
-    sha256 = "f1ac92092ee173e4bcf6b2cb1ac385a7c390fb362a578a403b2b6edd5dc7d5d0";
+  src = fetchurl {
+    url = "http://downloads.sourceforge.net/project/faudiostream/faust-${version}.tgz";
+    sha256 = "0x2scxkwvvjx7b7smj5xb8kr269qakf49z3fxpasd9g7025q44k5";
   };
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/audio/faust/default.nix b/pkgs/applications/audio/faust/faust2.nix
similarity index 100%
rename from pkgs/applications/audio/faust/default.nix
rename to pkgs/applications/audio/faust/faust2.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16a90aab7c7b..07d486feb1d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14110,7 +14110,7 @@ let
   anki = callPackage ../games/anki { };
 
   armagetronad = callPackage ../games/armagetronad { };
-  
+
   arx-libertatis = callPackage ../games/arx-libertatis { };
 
   asc = callPackage ../games/asc {
@@ -15467,7 +15467,7 @@ let
 
   faust1 = callPackage ../applications/audio/faust/faust1.nix { };
 
-  faust2 = callPackage ../applications/audio/faust { };
+  faust2 = callPackage ../applications/audio/faust/faust2.nix { };
 
   faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { };
 

From 3b6b47976e87f3b93105fc296d8aeeb5b4420c26 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sat, 6 Feb 2016 13:39:30 +0100
Subject: [PATCH 1093/2285] ladspaH: move src to mirror, please also merge in
 15.09

---
 .../applications/audio/ladspa-sdk/ladspah.nix | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/pkgs/applications/audio/ladspa-sdk/ladspah.nix
index 8c4d8a8c1ed5..aa0a191bdd1a 100644
--- a/pkgs/applications/audio/ladspa-sdk/ladspah.nix
+++ b/pkgs/applications/audio/ladspa-sdk/ladspah.nix
@@ -1,17 +1,26 @@
-{ runCommand, fetchurl }:
-
-let
-
+{ stdenv, fetchurl }:
+stdenv.mkDerivation rec {
+  name = "ladspa.h-${version}";
+  version = "1.13";
   src = fetchurl {
-    url = http://www.ladspa.org/ladspa_sdk/ladspa.h.txt;
-    sha256 = "1b908csn85ng9sz5s5d1mqk711cmawain2z8px2ajngihdrynb67";
+    url = "http://http.debian.net/debian/pool/main/l/ladspa-sdk/ladspa-sdk_${version}.orig.tar.gz";
+    sha256 = "0srh5n2l63354bc0srcrv58rzjkn4gv8qjqzg8dnq3rs4m7kzvdm";
   };
 
-in
-
-runCommand "ladspa.h"
-  { meta.description = "LADSPA format audio plugins"; }
-  ''
+  installPhase = ''
     mkdir -p $out/include
-    cp ${src} $out/include/ladspa.h
-  ''
+    cp src/ladspa.h $out/include/ladspa.h
+  '';
+
+  meta = {
+    description = "LADSPA format audio plugins header file";
+    longDescription = ''
+      The ladspa.h API header file from the LADSPA SDK.
+      For the full SDK, use the ladspa-sdk package.
+    '';
+    homepage = http://www.ladspa.org/ladspa_sdk/overview.html;
+    license = stdenv.lib.licenses.lgpl2;
+    maintainers = [ stdenv.lib.maintainers.magnetophon ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}

From 86de7b1d2bc9514e79d89d943036ed07b1f78439 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Thu, 18 Jun 2015 21:46:36 +0200
Subject: [PATCH 1094/2285] hugin: update 2013.0.0 -> 2015.0.0

---
 pkgs/applications/graphics/hugin/default.nix | 31 ++++++++++----------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix
index b11ed1a99df7..97181cb0d1bf 100644
--- a/pkgs/applications/graphics/hugin/default.nix
+++ b/pkgs/applications/graphics/hugin/default.nix
@@ -1,23 +1,25 @@
-{ stdenv, cmake, fetchurl, gnumake, pkgconfig
+{ stdenv, cmake, fetchurl, gnumake, pkgconfig, makeWrapper
 , boost, gettext, tclap, wxGTK
 , freeglut, glew, libXi, libXmu, mesa
-, autopanosiftc, enblend-enfuse, exiv2, ilmbase, lensfun, libpng, libtiff
-, openexr, panotools, perlPackages
+, autopanosiftc, enblend-enfuse, exiv2, fftw, ilmbase, lensfun, libpng, libtiff
+, openexr, panotools, perlPackages, sqlite, vigra
 }:
 
 stdenv.mkDerivation rec {
-  name = "hugin-2013.0.0";
+  name = "hugin-2015.0.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/hugin/${name}.tar.bz2";
-    sha256 = "1mgbvg09xvf0zcm9jfv5lb65nd292l86ffa23yp4pzm6izaiwkj8";
+    sha256 = "1gfblax9rxay8xskz5r8bips4nfh70vkyrb8ksgl6pg91c8krn9c";
   };
 
   NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
 
   buildInputs = [ boost gettext tclap wxGTK
                   freeglut glew libXi libXmu mesa
-                  exiv2 ilmbase lensfun libtiff libpng openexr panotools
+                  exiv2 fftw ilmbase lensfun libtiff libpng openexr panotools
+                  sqlite vigra
+                  perlPackages.ImageExifTool makeWrapper
                 ];
 
   # disable installation of the python scripting interface
@@ -27,22 +29,21 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  # commandline tools needed by the hugin batch processor
-  # you may have to tell hugin (in the preferences) where these binaries reside
-  propagatedUserEnvPackages = [ autopanosiftc enblend-enfuse gnumake
-                                perlPackages.ImageExifTool
-                              ];
-
   postInstall = ''
-    mkdir -p "$out/nix-support"
-    echo $propagatedUserEnvPackages > $out/nix-support/propagated-user-env-packages
+    for p in $out/bin/*; do
+      wrapProgram "$p" \
+        --suffix PATH : ${autopanosiftc}/bin \
+        --suffix PATH : ${enblend-enfuse}/bin \
+        --suffix PATH : ${gnumake}/bin \
+        --suffix PATH : ${perlPackages.ImageExifTool}/bin
+    done
   '';
 
   meta = {
     homepage = http://hugin.sourceforge.net/;
     description = "Toolkit for stitching photographs and assembling panoramas, together with an easy to use graphical front end";
     license = stdenv.lib.licenses.gpl2Plus;
-    maintainers = with stdenv.lib.maintainers; [viric];
+    maintainers = with stdenv.lib.maintainers; [ viric hrdinka ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }

From ce4bd7bbc6d6abf9c7f536b68663c37e75bc963c Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 12 Jan 2016 23:11:10 +0100
Subject: [PATCH 1095/2285] znc-push: 1.0.0 -> git-2015-12-07

---
 pkgs/applications/networking/znc/modules.nix | 42 ++++++++++----------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index 9836d1fbb3b3..abaabd4f409a 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -1,7 +1,6 @@
-{ stdenv, fetchurl, fetchgit,  znc }:
+{ stdenv, fetchurl, fetchgit, znc }:
 
 let
-
   zncDerivation = a@{
     name, src, module_name,
     buildPhase ? "${znc}/bin/znc-buildmod ${module_name}.cpp",
@@ -16,25 +15,6 @@ let
 
 in rec {
 
-  push = zncDerivation rec {
-    name = "znc-push-${version}";
-    version = "1.0.0";
-    module_name = "push";
-
-    src = fetchurl {
-        url = "https://github.com/jreese/znc-push/archive/v${version}.tar.gz";
-        sha256 = "1v9a16b1d8mfzhddf4drh6rbxa0szr842g7614r8ninmc0gi7a2v";
-    };
-
-    meta = {
-      description = "Push notification service module for ZNC";
-      homepage = https://github.com/jreese/znc-push;
-      repositories.git = https://github.com/jreese/znc-push.git;
-      license = stdenv.lib.licenses.mit;
-      maintainers = [ stdenv.lib.maintainers.offline ];
-    };
-  };
-
   fish = zncDerivation rec {
     name = "znc-fish-8e1f150fda";
     module_name = "fish";
@@ -70,4 +50,24 @@ in rec {
     };
   };
 
+  push = zncDerivation rec {
+    name = "znc-push-${version}";
+    version = "git-2015-12-07";
+    module_name = "push";
+
+    src = fetchgit {
+      url = "https://github.com/jreese/znc-push.git";
+      rev = "717a2b1741eee75456b0862ef76dbb5af906e936";
+      sha256 = "1lr5bhcy8156f7sbah7kjgz4g4mhkkwgvwjd2rxpbwnpq3ssza9k";
+    };
+
+    meta = {
+      description = "Push notification service module for ZNC";
+      homepage = https://github.com/jreese/znc-push;
+      repositories.git = https://github.com/jreese/znc-push.git;
+      license = stdenv.lib.licenses.mit;
+      maintainers = [ stdenv.lib.maintainers.offline ];
+    };
+  };
+
 }

From 41480ae67bc7b645aa4efa7fecf86213c20ba49a Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 12 Jan 2016 23:12:34 +0100
Subject: [PATCH 1096/2285] znc-fish: 8e1f150fda -> git-2014-10-10

---
 pkgs/applications/networking/znc/modules.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index abaabd4f409a..80631dec1e08 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -16,19 +16,21 @@ let
 in rec {
 
   fish = zncDerivation rec {
-    name = "znc-fish-8e1f150fda";
+    name = "znc-fish-${version}";
+    version = "git-2014-10-10";
     module_name = "fish";
 
     src = fetchgit {
-        url = meta.repositories.git;
-        rev = "8e1f150fdaf18dc33e023795584dec8255e6614e";
-        sha256 = "0vpk4336c191irl3g7wibblnbqf3903hjrci4gs0qgg1wvj7fw66";
+      url = meta.repositories.git;
+      rev = "9c580e018a1a08374e814fc06f551281cff827de";
+      sha256 = "0yvs0jkwwp18qxqvw1dvir91ggczz56ka00k0zlsb81csdi8xfvl";
     };
 
     meta = {
       description = "ZNC FiSH module";
       homepage = https://github.com/dctrwatson/znc-fish;
-      repositories.git = https://github.com/dctrwatson/znc-fish.git;
+      # this fork works with ZNC 1.6
+      repositories.git = https://github.com/jarrydpage/znc-fish.git;
       maintainers = [ stdenv.lib.maintainers.offline ];
     };
   };

From 0765936b63adeba7deeafe68859eb9128a51e58d Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 12 Jan 2016 23:13:43 +0100
Subject: [PATCH 1097/2285] znc-privmsg: c9f98690be -> git-2015-02-22

---
 pkgs/applications/networking/znc/modules.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index 80631dec1e08..c36d867949e4 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -36,13 +36,14 @@ in rec {
   };
 
   privmsg = zncDerivation rec {
-    name        = "znc-privmsg-c9f98690be";
+    name = "znc-privmsg-${version}";
+    version = "git-2015-02-22";
     module_name = "privmsg";
 
     src = fetchgit {
-      url    = meta.repositories.git;
-      rev    = "c9f98690beb4e3a7681468d5421ff11dc8e1ee8b";
-      sha256 = "dfeb28878b12b98141ab204191288cb4c3f7df153a01391ebf6ed6a32007247f";
+      url = meta.repositories.git;
+      rev = "9f1f98db56cbbea96d83e6628f657e0d62cd9517";
+      sha256 = "0n82z87gdxxragcaixjc80z8bw4bmfwbk0jrf9zs8kk42phlkkc2";
     };
 
     meta = {

From bc63d669f597bed29842d5cf2725fd0a5e1c1f64 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 12 Jan 2016 23:14:23 +0100
Subject: [PATCH 1098/2285] znc-clientbuffer: init at git-2015-08-27

---
 pkgs/applications/networking/znc/modules.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index c36d867949e4..f82d758cb9b9 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -15,6 +15,26 @@ let
 
 in rec {
 
+  clientbuffer = zncDerivation rec {
+    name = "znc-clientbuffer-${version}";
+    version = "git-2015-08-27";
+    module_name = "clientbuffer";
+
+    src = fetchgit {
+      url = meta.repositories.git;
+      rev = "fe0f368e1fcab2b89d5c94209822d9b616cea840";
+      sha256 = "1knbkj1dm45s741qndsfclmk3pyxnihgwq2i1n75ip3wv8i1bf4b";
+    };
+
+    meta = with stdenv.lib; {
+      description = "ZNC module for client specific buffers";
+      homepage = https://github.com/jpnurmi/znc-clientbuffer;
+      repositories.git = https://github.com/jpnurmi/znc-clientbuffer.git;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ hrdinka ];
+    };
+  };
+
   fish = zncDerivation rec {
     name = "znc-fish-${version}";
     version = "git-2014-10-10";

From 94239516092d3fa8b34d2aa54f1a2b1110e078a7 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 12 Jan 2016 23:14:56 +0100
Subject: [PATCH 1099/2285] znc-playback: init at git-2015-08-04

---
 pkgs/applications/networking/znc/modules.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/applications/networking/znc/modules.nix b/pkgs/applications/networking/znc/modules.nix
index f82d758cb9b9..802c5f5ecb77 100644
--- a/pkgs/applications/networking/znc/modules.nix
+++ b/pkgs/applications/networking/znc/modules.nix
@@ -55,6 +55,26 @@ in rec {
     };
   };
 
+  playback = zncDerivation rec {
+    name = "znc-playback-${version}";
+    version = "git-2015-08-04";
+    module_name = "playback";
+
+    src = fetchgit {
+      url = meta.repositories.git;
+      rev = "8691abf75becc1f3d7b5bb5ad68dad17cd21863b";
+      sha256 = "0pd89p00yfir4lvw0107lc3qxzx8bgbm5lqq0lpwb6cahv3ipdra";
+    };
+
+    meta = with stdenv.lib; {
+      description = "An advanced playback module for ZNC";
+      homepage = https://github.com/jpnurmi/znc-playback;
+      repositories.git = https://github.com/jpnurmi/znc-playback.git;
+      license = licenses.asl20;
+      maintainers = with maintainers; [ hrdinka ];
+    };
+  };
+
   privmsg = zncDerivation rec {
     name = "znc-privmsg-${version}";
     version = "git-2015-02-22";

From c737ee5abaefefe388edaa005af295df9c418c17 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Wed, 13 Jan 2016 12:46:12 +0100
Subject: [PATCH 1100/2285] znc: delete 1.4

---
 pkgs/applications/networking/znc/1.4.nix | 35 ------------------------
 pkgs/top-level/all-packages.nix          |  2 --
 2 files changed, 37 deletions(-)
 delete mode 100644 pkgs/applications/networking/znc/1.4.nix

diff --git a/pkgs/applications/networking/znc/1.4.nix b/pkgs/applications/networking/znc/1.4.nix
deleted file mode 100644
index fdd02aac0b5e..000000000000
--- a/pkgs/applications/networking/znc/1.4.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ stdenv, fetchurl, openssl, pkgconfig
-, withPerl ? false, perl
-, withPython ? false, python3
-, withTcl ? false, tcl
-, withCyrus ? true, cyrus_sasl
-}:
-
-with stdenv.lib;
-stdenv.mkDerivation rec {
-  name = "znc-1.4";
-
-  src = fetchurl {
-    url = "http://znc.in/releases/${name}.tar.gz";
-    sha256 = "0lkv58pq4d5lzcyx8v8anzinx0sx0zw0js4jij13jb8qxp88zsc6";
-  };
-
-  buildInputs = [ openssl pkgconfig ]
-    ++ optional withPerl perl
-    ++ optional withPython python3
-    ++ optional withTcl tcl
-    ++ optional withCyrus cyrus_sasl;
-
-  configureFlags = optionalString withPerl "--enable-perl "
-    + optionalString withPython "--enable-python "
-    + optionalString withTcl "--enable-tcl --with-tcl=${tcl}/lib "
-    + optionalString withCyrus "--enable-cyrus ";
-
-  meta = with stdenv.lib; {
-    description = "Advanced IRC bouncer";
-    homepage = http://wiki.znc.in/ZNC;
-    maintainers = with maintainers; [ viric ];
-    license = licenses.asl20;
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 16a90aab7c7b..f0e5b734f368 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15914,8 +15914,6 @@ let
 
   znc = callPackage ../applications/networking/znc { };
 
-  znc_14 = callPackage ../applications/networking/znc/1.4.nix { };
-
   zncModules = recurseIntoAttrs (
     callPackage ../applications/networking/znc/modules.nix { }
   );

From 667ad7740f914263c042588730bbca246413cf52 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Sat, 6 Feb 2016 14:37:59 +0100
Subject: [PATCH 1101/2285] sbcl: 1.3.1 -> 1.3.2

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

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 87cb5e6fcfd2..3212601e7899 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "0ggdw2wfbl0gmfkcm3qbqvhalfb1r9wfxzmi8fd38s53f7j4grd2";
+    sha256 = "18mgj1h9wqi0zq4k7y5r5fk10mlbpgh3796d3dac75bpxabg30nk";
   };
 
   patchPhase = ''

From 9185fc7c6f7bbe4e225616d213cfa2a02fcee175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 2 Feb 2016 04:56:56 +0100
Subject: [PATCH 1102/2285] libvdpau: use a cleaner installation method

(cherry picked from commit bd2ca1e539c71e83445bb04ccc0e15cb4c80861f)
---
 pkgs/development/libraries/libvdpau/default.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix
index f38cc51f6c24..107c8448795c 100644
--- a/pkgs/development/libraries/libvdpau/default.nix
+++ b/pkgs/development/libraries/libvdpau/default.nix
@@ -14,13 +14,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = [ "--with-module-dir=${mesa_noglu.driverLink}/lib/vdpau" ];
 
-  installFlags = [ "DESTDIR=$(out)" ];
-
-  postInstall = ''
-    cp -r $out/${mesa_noglu.driverLink}/* $out
-    cp -r $out/$out/* $out
-    rm -rf $out/run $out/$(echo "$out" | cut -d "/" -f2)
-  '';
+  installFlags = [ "moduledir=$(out)/lib/vdpau" ];
 
   meta = with stdenv.lib; {
     homepage = http://people.freedesktop.org/~aplattner/vdpau/;

From 8ea5563011ee202eda146e2cc8f8754f239303cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 6 Feb 2016 16:45:21 +0100
Subject: [PATCH 1103/2285] libva: use a cleaner installation method

---
 pkgs/development/libraries/libva/default.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index e8de6ac284eb..557d0f591553 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -19,13 +19,7 @@ in stdenv.mkDerivation rec {
     "--enable-glx"
   ];
 
-  installFlags = lib.optional withMesa "DESTDIR=$(out)";
-
-  postInstall = lib.optionalString withMesa ''
-    cp -r $out/${mesa_noglu.driverLink}/* $out
-    cp -r $out/$out/* $out
-    rm -rf $out/run $out/$(echo "$out" | cut -d "/" -f2)
-  '';
+  installFlags = [ "dummy_drv_video_ladir=$(out)/lib/dri" ];
 
   meta = with stdenv.lib; {
     homepage = http://www.freedesktop.org/wiki/Software/vaapi;

From 92dc00d0fdbfafa58bb82e9ed8657de5dfed53a6 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Wed, 9 Dec 2015 22:07:23 -0500
Subject: [PATCH 1104/2285] pfixtools: init at 0.9

---
 pkgs/servers/mail/postfix/pfixtools.nix | 48 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/servers/mail/postfix/pfixtools.nix

diff --git a/pkgs/servers/mail/postfix/pfixtools.nix b/pkgs/servers/mail/postfix/pfixtools.nix
new file mode 100644
index 000000000000..f45dd3b7248a
--- /dev/null
+++ b/pkgs/servers/mail/postfix/pfixtools.nix
@@ -0,0 +1,48 @@
+{ stdenv, lib, fetchFromGitHub, git, gperf, pcre, unbound, libev, tokyocabinet, pkgconfig, bash, libsrs2 }:
+
+let
+  version = "0.9";
+
+  pfixtoolsSrc = fetchFromGitHub {
+    owner = "Fruneau";
+    repo = "pfixtools";
+    rev = "pfixtools-${version}";
+    sha256 = "1vmbrw686f41n6xfjphfshn96vl07ynvnsyjdw9yfn9bfnldcjcq";
+  };
+
+  srcRoot = "pfixtools-${pfixtoolsSrc.rev}-src";
+
+  libCommonSrc = fetchFromGitHub {
+    owner = "Fruneau";
+    repo = "libcommon";
+    rev = "b07e6bdea3d24748e0d39783d7d817096d10cc67";
+    sha256 = "14fxldp29j4vmfmhfgwwi37pj8cz0flm1aykkxlbgakz92d4pm35";
+  };
+
+in
+
+stdenv.mkDerivation {
+  name = "pfixtools-${version}";
+
+  src = pfixtoolsSrc;
+
+  buildInputs = [git gperf pcre unbound libev tokyocabinet pkgconfig bash libsrs2];
+
+  postUnpack = ''
+    cp -Rp ${libCommonSrc}/* ${srcRoot}/common;
+    chmod -R +w ${srcRoot}/common;
+  '';
+
+  postPatch = ''
+    substituteInPlace postlicyd/policy_tokens.sh \
+                      --replace /bin/bash ${bash}/bin/bash;
+  '';
+
+  makeFlags = "DESTDIR=$(out) prefix=";
+
+  meta = {
+    description = "a collection of postfix-related tools";
+    license = with lib.licenses; [ bsd3 ];
+    homepage = https://github.com/Fruneau/pfixtools;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f9d214bf1b7..3103c59b09ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9455,6 +9455,8 @@ let
 
   rspamd = callPackage ../servers/mail/rspamd { };
 
+  pfixtools = callPackage ../servers/mail/postfix/pfixtools.nix { };
+
   pshs = callPackage ../servers/http/pshs { };
 
   libpulseaudio = callPackage ../servers/pulseaudio { libOnly = true; };

From 3c5fca9618241334f40bfd2199cdfabb4fad55ec Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Wed, 21 Oct 2015 17:37:14 +0000
Subject: [PATCH 1105/2285] filesystems: use list of strings for fs options

Allow usage of list of strings instead of a comma-separated string
for filesystem options. Deprecate the comma-separated string style
with a warning message; convert this to a hard error after 16.09.
15.09 was just released, so this provides a deprecation period during
the 16.03 release.

closes #10518

Signed-off-by: Robin Gloster <mail@glob.in>
---
 nixos/doc/manual/configuration/config-file.xml |  2 +-
 nixos/doc/manual/man-nixos-generate-config.xml |  4 ++--
 nixos/doc/manual/release-notes/rl-unstable.xml | 17 +++++++++++++++++
 nixos/modules/installer/cd-dvd/iso-image.nix   |  8 ++++----
 .../installer/tools/nixos-generate-config.pl   |  4 ++--
 nixos/modules/system/boot/stage-1.nix          |  2 +-
 nixos/modules/tasks/filesystems.nix            | 18 +++++++++++-------
 nixos/modules/virtualisation/qemu-vm.nix       | 12 ++++++------
 nixos/tests/misc.nix                           |  2 +-
 nixos/tests/nfs.nix                            |  2 +-
 10 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml
index b613c7f06cc8..9b240979273d 100644
--- a/nixos/doc/manual/configuration/config-file.xml
+++ b/nixos/doc/manual/configuration/config-file.xml
@@ -157,7 +157,7 @@ boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60;
 fileSystems."/boot" =
   { device = "/dev/sda1";
     fsType = "ext4";
-    options = "rw,data=ordered,relatime";
+    options = [ "rw" "data=ordered" "relatime" ];
   };
 </programlisting>
       </para>
diff --git a/nixos/doc/manual/man-nixos-generate-config.xml b/nixos/doc/manual/man-nixos-generate-config.xml
index e4fba4a40a97..140642bc9c9c 100644
--- a/nixos/doc/manual/man-nixos-generate-config.xml
+++ b/nixos/doc/manual/man-nixos-generate-config.xml
@@ -165,13 +165,13 @@ look like this:
   fileSystems."/" =
     { device = "/dev/disk/by-label/nixos";
       fsType = "ext3";
-      options = "rw,data=ordered,relatime";
+      options = [ "rw" "data=ordered" "relatime" ];
     };
 
   fileSystems."/boot" =
     { device = "/dev/sda1";
       fsType = "ext3";
-      options = "rw,errors=continue,user_xattr,acl,barrier=1,data=writeback,relatime";
+      options = [ "rw" "errors=continue" "user_xattr" "acl" "barrier=1" "data=writeback" "relatime" ];
     };
 
   swapDevices =
diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 3d7819803697..c814d61bcf4c 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -155,6 +155,23 @@ nginx.override {
     rights, new <literal>aliasFiles</literal> and <literal>mapFiles</literal>
     options and more.</para>
   </listitem>
+
+  <listitem>
+    <para>Filesystem options should now be configured as a list of strings, not
+    a comma-separated string. The old style will continue to work, but print a
+    warning, until the 16.09 release. An example of the new style:
+
+<programlisting>
+fileSystems."/example" = {
+  device = "/dev/sdc";
+  fsType = "btrfs";
+  options = [ "noatime" "compress=lzo" "space_cache" "autodefrag" ];
+};
+</programlisting>
+
+    </para>
+  </listitem>
+
 </itemizedlist>
 
 
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 248b0f00283c..5702e2d9a1e5 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -249,7 +249,7 @@ in
 
     fileSystems."/" =
       { fsType = "tmpfs";
-        options = "mode=0755";
+        options = [ "mode=0755" ];
       };
 
     # Note that /dev/root is a symlink to the actual root device
@@ -266,20 +266,20 @@ in
     fileSystems."/nix/.ro-store" =
       { fsType = "squashfs";
         device = "/iso/nix-store.squashfs";
-        options = "loop";
+        options = [ "loop" ];
         neededForBoot = true;
       };
 
     fileSystems."/nix/.rw-store" =
       { fsType = "tmpfs";
-        options = "mode=0755";
+        options = [ "mode=0755" ];
         neededForBoot = true;
       };
 
     fileSystems."/nix/store" =
       { fsType = "unionfs-fuse";
         device = "unionfs";
-        options = "allow_other,cow,nonempty,chroot=/mnt-root,max_files=32768,hide_meta_files,dirs=/nix/.rw-store=rw:/nix/.ro-store=ro";
+        options = [ "allow_other" "cow" "nonempty" "chroot=/mnt-root" "max_files=32768" "hide_meta_files" "dirs=/nix/.rw-store=rw:/nix/.ro-store=ro" ];
       };
 
     boot.initrd.availableKernelModules = [ "squashfs" "iso9660" "usb-storage" ];
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 2284eba07a2d..ec880e084726 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -349,7 +349,7 @@ foreach my $fs (read_file("/proc/self/mountinfo")) {
   fileSystems.\"$mountPoint\" =
     { device = \"$base$path\";
       fsType = \"none\";
-      options = \"bind\";
+      options = \[ \"bind\" \];
     };
 
 EOF
@@ -409,7 +409,7 @@ EOF
 
     if (scalar @extraOptions > 0) {
       $fileSystems .= <<EOF;
-      options = \"${\join ",", uniq(@extraOptions)}\";
+      options = \[ ${\join " ", map { "\"" . $_ . "\"" } uniq(@extraOptions)} \];
 EOF
     }
 
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 1d9a67abcf9e..f31620df1d85 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -207,7 +207,7 @@ let
                     (filter (sd: (sd ? label || hasPrefix "/dev/" sd.device) && !sd.randomEncryption) config.swapDevices);
 
     fsInfo =
-      let f = fs: [ fs.mountPoint (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fs.fsType fs.options ];
+      let f = fs: [ fs.mountPoint (if fs.device != null then fs.device else "/dev/disk/by-label/${fs.label}") fs.fsType (builtins.concatStringsSep "," fs.options) ];
       in pkgs.writeText "initrd-fsinfo" (concatStringsSep "\n" (concatMap f fileSystems));
 
     setHostId = optionalString (config.networking.hostId != null) ''
diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix
index d0dd7670157e..4d1466db22d0 100644
--- a/nixos/modules/tasks/filesystems.nix
+++ b/nixos/modules/tasks/filesystems.nix
@@ -41,11 +41,15 @@ let
       };
 
       options = mkOption {
-        default = "defaults";
-        example = "data=journal";
-        type = types.commas; # FIXME: should be a list
+        default = [ "defaults" ];
+        example = [ "data=journal" ];
         description = "Options used to mount the file system.";
-      };
+      } // (if versionAtLeast lib.nixpkgsVersion "16.09" then {
+        type = types.listOf types.str;
+      } else {
+        type = types.either types.commas (types.listOf types.str);
+        apply = x: if isList x then x else lib.strings.splitString "," (builtins.trace "warning: passing a comma-separated string for filesystem options is deprecated; use a list of strings instead. This will become a hard error in 16.09." x);
+      });
 
       autoFormat = mkOption {
         default = false;
@@ -112,7 +116,7 @@ in
         "/data" = {
           device = "/dev/hda2";
           fsType = "ext3";
-          options = "data=journal";
+          options = [ "data=journal" ];
         };
         "/bigdisk".label = "bigdisk";
       };
@@ -127,7 +131,7 @@ in
         <command>mount</command>; defaults to
         <literal>"auto"</literal>), and <literal>options</literal>
         (the mount options passed to <command>mount</command> using the
-        <option>-o</option> flag; defaults to <literal>"defaults"</literal>).
+        <option>-o</option> flag; defaults to <literal>[ "defaults" ]</literal>).
 
         Instead of specifying <literal>device</literal>, you can also
         specify a volume label (<literal>label</literal>) for file
@@ -177,7 +181,7 @@ in
              else throw "No device specified for mount point ‘${fs.mountPoint}’.")
             + " " + fs.mountPoint
             + " " + fs.fsType
-            + " " + fs.options
+            + " " + builtins.concatStringsSep "," fs.options
             + " 0"
             + " " + (if skipCheck fs then "0" else
                      if fs.mountPoint == "/" then "1" else "2")
diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 82b58aa67a3d..6e0dc065387a 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -427,38 +427,38 @@ in
         ${if cfg.writableStore then "/nix/.ro-store" else "/nix/store"} =
           { device = "store";
             fsType = "9p";
-            options = "trans=virtio,version=9p2000.L,cache=loose";
+            options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ];
             neededForBoot = true;
           };
         "/tmp/xchg" =
           { device = "xchg";
             fsType = "9p";
-            options = "trans=virtio,version=9p2000.L,cache=loose";
+            options = [ "trans=virtio" "version=9p2000.L" "cache=loose" ];
             neededForBoot = true;
           };
         "/tmp/shared" =
           { device = "shared";
             fsType = "9p";
-            options = "trans=virtio,version=9p2000.L";
+            options = [ "trans=virtio" "version=9p2000.L" ];
             neededForBoot = true;
           };
       } // optionalAttrs cfg.writableStore
       { "/nix/store" =
           { fsType = "unionfs-fuse";
             device = "unionfs";
-            options = "allow_other,cow,nonempty,chroot=/mnt-root,max_files=32768,hide_meta_files,dirs=/nix/.rw-store=rw:/nix/.ro-store=ro";
+            options = [ "allow_other" "cow" "nonempty" "chroot=/mnt-root" "max_files=32768" "hide_meta_files" "dirs=/nix/.rw-store=rw:/nix/.ro-store=ro" ];
           };
       } // optionalAttrs (cfg.writableStore && cfg.writableStoreUseTmpfs)
       { "/nix/.rw-store" =
           { fsType = "tmpfs";
-            options = "mode=0755";
+            options = [ "mode=0755" ];
             neededForBoot = true;
           };
       } // optionalAttrs cfg.useBootLoader
       { "/boot" =
           { device = "/dev/vdb2";
             fsType = "vfat";
-            options = "ro";
+            options = [ "ro" ];
             noCheck = true; # fsck fails on a r/o filesystem
           };
       });
diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix
index 6297452df95e..73af0cfad21f 100644
--- a/nixos/tests/misc.nix
+++ b/nixos/tests/misc.nix
@@ -16,7 +16,7 @@ import ./make-test.nix ({ pkgs, ...} : {
       systemd.tmpfiles.rules = [ "d /tmp 1777 root root 10d" ];
       fileSystems = mkVMOverride { "/tmp2" =
         { fsType = "tmpfs";
-          options = "mode=1777,noauto";
+          options = [ "mode=1777" "noauto" ];
         };
       };
       systemd.automounts = singleton
diff --git a/nixos/tests/nfs.nix b/nixos/tests/nfs.nix
index 24f6e0f2ed95..36cd6a395779 100644
--- a/nixos/tests/nfs.nix
+++ b/nixos/tests/nfs.nix
@@ -8,7 +8,7 @@ let
         [ { mountPoint = "/data";
             device = "server:/data";
             fsType = "nfs";
-            options = "vers=${toString version}";
+            options = [ "vers=${toString version}" ];
           }
         ];
       networking.firewall.enable = false; # FIXME: only open statd

From 12ca23d6500cb787de795fce1f694ead359a01db Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Fri, 5 Feb 2016 18:03:20 +0000
Subject: [PATCH 1106/2285] linux-testing: 4.4-rc8 -> 4.5-rc2

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index c70d6f79f38b..4128edea7c26 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.4-rc8";
-  modDirVersion = "4.4.0-rc8";
-  extraMeta.branch = "4.4";
+  version = "4.5-rc2";
+  modDirVersion = "4.5.0-rc2";
+  extraMeta.branch = "4.5";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "0cwf80lryzhdajd3r97b33ym5njjpf5rbcbjzz7lja0w9xs1dvwj";
+    sha256 = "1nq61nimgvl7m7rrimr95ixwkc5sd473m5kvaf5qdyhfnh7m4br3";
   };
 
   features.iwlwifi = true;

From 5a2ca9e666064a56ff59d7afb7a05588d47bb953 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sat, 6 Feb 2016 22:25:22 +0100
Subject: [PATCH 1107/2285] cli-visualizer: init at 2016-02-06

changes by @globin:
 * added pulseaudio support
 * 06-02-2016 -> 2016-02-06 to ensure correct version sorting
 * cli_visualizer -> cli-visualizer

closes #12853

Signed-off-by: Robin Gloster <mail@glob.in>
---
 .../misc/cli-visualizer/default.nix           | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/applications/misc/cli-visualizer/default.nix

diff --git a/pkgs/applications/misc/cli-visualizer/default.nix b/pkgs/applications/misc/cli-visualizer/default.nix
new file mode 100644
index 000000000000..e24c99216ea2
--- /dev/null
+++ b/pkgs/applications/misc/cli-visualizer/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchgit, fftw, ncurses, libpulseaudio }:
+
+stdenv.mkDerivation rec {
+  version = "2016-06-02";
+  name = "cli-visualizer-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/dpayne/cli-visualizer.git";
+    rev = "bc0104eb57e7a0b3821510bc8f93cf5d1154fa8e";
+    sha256 = "7b0c69a16b4854149522e2d0ec544412fb368cecba771d1e9481330ed86c8cb7";
+  };
+
+  buildInputs = [ fftw ncurses libpulseaudio ];
+
+  buildFlags = [ "ENABLE_PULSE=1" ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp build/vis $out/bin/vis
+  '';
+
+  meta = {
+    homepage = "https://github.com/dpayne/cli-visualizer";
+    description = "CLI based audio visualizer";
+    license = stdenv.lib.licenses.mit;
+    maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b00936506435..fdc8acfd4947 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -790,6 +790,8 @@ let
 
   cli53 = callPackage ../tools/admin/cli53 { };
 
+  cli-visualizer = callPackage ../applications/misc/cli-visualizer { };
+
   cloud-init = callPackage ../tools/virtualization/cloud-init { };
 
   clib = callPackage ../tools/package-management/clib { };

From 234f4611393a6818b317f3ad93d2e276515bdc33 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 7 Feb 2016 05:03:16 +0300
Subject: [PATCH 1108/2285] SDL: add patches from Fedora

Fixes several bugs (some of which were fixed in the official repository but no
release made).
---
 pkgs/development/libraries/SDL/default.nix | 61 ++++++++++++++--------
 1 file changed, 38 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix
index 7006eb10f7ed..3b63e0bbb0a8 100644
--- a/pkgs/development/libraries/SDL/default.nix
+++ b/pkgs/development/libraries/SDL/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, audiofile, libcap
+{ stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap
 , openglSupport ? false, mesa ? null
 , alsaSupport ? true, alsaLib ? null
 , x11Support ? true, xlibsWrapper ? null, libXrandr ? null
@@ -59,34 +59,49 @@ stdenv.mkDerivation rec {
     "--without-x"
   ] ++ stdenv.lib.optional alsaSupport "--with-alsa-prefix=${alsaLib}/lib");
 
-  # Fix a build failure on OS X Mavericks
-  # Ticket: https://bugzilla.libsdl.org/show_bug.cgi?id=2085
-  patches = stdenv.lib.optional stdenv.isDarwin [ (fetchurl {
-    url = "http://bugzilla-attachments.libsdl.org/attachment.cgi?id=1320";
-    sha1 = "3137feb503a89a8d606405373905b92dcf7e293b";
-  }) ];
+  patches = [
+    # Fix window resizing issues, e.g. for xmonad
+    # Ticket: http://bugzilla.libsdl.org/show_bug.cgi?id=1430
+    (fetchpatch {
+      name = "fix_window_resizing.diff";
+      url = "https://bugs.debian.org/cgi-bin/bugreport.cgi?msg=10;filename=fix_window_resizing.diff;att=2;bug=665779";
+      sha256 = "1z35azc73vvi19pzi6byck31132a8w1vzrghp1x3hy4a4f9z4gc6";
+    })
+    # Fix drops of keyboard events for SDL_EnableUNICODE
+    (fetchpatch {
+      url = "http://hg.libsdl.org/SDL/raw-rev/0aade9c0203f";
+      sha256 = "1y9izncjlqvk1mkz1pkl9lrk9s452cmg2izjjlqqrhbn8279xy50";
+    })
+    # Ignore insane joystick axis events
+    (fetchpatch {
+      url = "http://hg.libsdl.org/SDL/raw-rev/95abff7adcc2";
+      sha256 = "0i8x0kx0pw12ld5bfxhyzs466y3c0n9dscw1ijhq1b96r72xyhqq";
+    })
+    # Workaround X11 bug to allow changing gamma
+    # Ticket: https://bugs.freedesktop.org/show_bug.cgi?id=27222
+    (fetchpatch {
+      url = "http://pkgs.fedoraproject.org/cgit/rpms/SDL.git/plain/SDL-1.2.15-x11-Bypass-SetGammaRamp-when-changing-gamma.patch?id=04a3a7b1bd88c2d5502292fad27e0e02d084698d";
+      sha256 = "0x52s4328kilyq43i7psqkqg7chsfwh0aawr50j566nzd7j51dlv";
+    })
+    # Fix a build failure on OS X Mavericks
+    # Ticket: https://bugzilla.libsdl.org/show_bug.cgi?id=2085
+    (fetchpatch {
+      url = "http://hg.libsdl.org/SDL/raw-rev/e9466ead70e5";
+      sha256 = "0mpwdi09h89df2wxqw87m1rdz7pr46k0w6alk691k8kwv970z6pl";
+    })
+    (fetchpatch {
+      url = "http://hg.libsdl.org/SDL/raw-rev/bbfb41c13a87";
+      sha256 = "1336g7waaf1c8yhkz11xbs500h8bmvabh4h437ax8l1xdwcppfxv";
+    })
+  ];
 
-  crossAttrs =stdenv.lib.optionalAttrs (stdenv.cross.libc == "libSystem") {
-    patches = let
-      f = rev: sha256: fetchurl {
-        url = "http://hg.libsdl.org/SDL/raw-rev/${rev}";
-        inherit sha256;
-      };
-    in [
-      (f "e9466ead70e5" "0ygir3k83d0vxp7s3k48jn3j8n2bnv9wm6613wpx3ybnjrxabrip")
-      (f "bbfb41c13a87" "17v29ybjifvka19m8qf14rjc43nfdwk9v9inaizznarhb17amlnv")
-    ];
-    postPatch = ''
-      sed -i -e 's/ *-fpascal-strings//' configure
-    '';
-  };
-
-  passthru = {inherit openglSupport;};
+  passthru = { inherit openglSupport; };
 
   meta = with stdenv.lib; {
     description = "A cross-platform multimedia library";
     homepage    = http://www.libsdl.org/;
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.unix;
+    license     = licenses.lgpl21;
   };
 }

From 6a94f7231ad35182f95eeabda3e27b047c5dbb36 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Sat, 6 Feb 2016 18:42:43 -0800
Subject: [PATCH 1109/2285] libinput: 1.1.1 -> 1.1.6

---
 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 430743af96ad..ce5614a46ff5 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.1.1";
+  name = "libinput-1.1.6";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "05yxz3cds65zmzj98yhsrwvnkv8c7n3zs2fksjzs2fy7vlrv9qid";
+    sha256 = "0qqw988ippn8mihw9hy2ifzc77zdyhn5chzilp7pa9wlqh15wvzj";
   };
 
   configureFlags = [

From 05b1b1408370a19293f5b145f6948be48a8082be Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Sun, 7 Feb 2016 10:22:08 +0200
Subject: [PATCH 1110/2285] wesnoth: 1.12.4 -> 1.12.5

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

diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 31220b4aa627..c7a81452f041 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";
-  version = "1.12.4";
+  version = "1.12.5";
 
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/sourceforge/${pname}/${name}.tar.bz2";
-    sha256 = "19qyylylaljhk45lk2ja0xp7cx9iy4hx07l65zkg20a2v9h50lmz";
+    sha256 = "07d8ms9ayswg2g530p0zwmz3d77zv68l6nmc718iq9sbv90av6jr";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 20bb296be60feda7741ed680e53761a954f21423 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Sun, 7 Feb 2016 18:51:28 +0900
Subject: [PATCH 1111/2285] cmst: 2014.12.05 -> 2016.01.28

---
 pkgs/tools/networking/cmst/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix
index 1b5767653fe2..24010e20f374 100644
--- a/pkgs/tools/networking/cmst/default.nix
+++ b/pkgs/tools/networking/cmst/default.nix
@@ -1,12 +1,13 @@
-{ stdenv, fetchgit, qtbase, makeWrapper, libX11 }:
+{ stdenv, fetchFromGitHub, qtbase, makeWrapper, libX11 }:
 
 stdenv.mkDerivation rec {
-  name = "cmst-2014.12.05";
-  rev = "refs/tags/${name}";
-  src = fetchgit {
-    url = "git://github.com/andrew-bibb/cmst.git";
-    inherit rev;
-    sha256 = "070rxv3kyn41ra7nnk1wbqvy6fjg38h7hrdv4dn71b201kmzd194";
+  name = "cmst-2016.01.28";
+
+  src = fetchFromGitHub {
+    sha256 = "1zf4jnrnbi05mrq1fnsji5zx60h1knrkr64pwcz2c7q8p59k4646";
+    rev    = name;
+    repo   = "cmst";
+    owner  = "andrew-bibb";
   };
 
   buildInputs = [ qtbase makeWrapper ];
@@ -27,7 +28,6 @@ stdenv.mkDerivation rec {
     substituteInPlace ./apps/rootapp/rootapp.pro \
       --replace "/etc" "$out/etc" \
       --replace "/usr/share" "$out/share"
-
   '';
 
   buildPhase = ''

From a538959ca07de128369fcde3e15fdafc9feba863 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 7 Feb 2016 11:31:19 +0000
Subject: [PATCH 1112/2285] lib.maintainers.globin: use my normal mail address

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 03b56bf15622..49304e27f5bb 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -125,7 +125,7 @@
   gfxmonk = "Tim Cuthbertson <tim@gfxmonk.net>";
   giogadi = "Luis G. Torres <lgtorres42@gmail.com>";
   gleber = "Gleb Peregud <gleber.p@gmail.com>";
-  globin = "Robin Gloster <robin@glob.in>";
+  globin = "Robin Gloster <mail@glob.in>";
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
   gridaphobe = "Eric Seidel <eric@seidel.io>";
   guibert = "David Guibert <david.guibert@gmail.com>";

From 1e04d875db7b16348318f53589e92b190e9322ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 7 Feb 2016 13:18:48 +0100
Subject: [PATCH 1113/2285] videolan.org sources: prefer
 http://get.videolan.org

Some of the original URLs were broken now.
It seems that set of mirrors is preferred and faster than the others.
In the x264 case the source isn't there so http://download.videolan.org
is used instead.
---
 pkgs/applications/video/vlc/default.nix           | 2 +-
 pkgs/development/libraries/libaacs/default.nix    | 2 +-
 pkgs/development/libraries/libbdplus/default.nix  | 2 +-
 pkgs/development/libraries/libbluray/default.nix  | 2 +-
 pkgs/development/libraries/libdvbpsi/default.nix  | 8 ++++----
 pkgs/development/libraries/libdvdcss/default.nix  | 9 +++++----
 pkgs/development/libraries/libdvdnav/default.nix  | 2 +-
 pkgs/development/libraries/libdvdread/default.nix | 2 +-
 pkgs/development/libraries/x264/default.nix       | 6 +++---
 pkgs/development/libraries/x265/default.nix       | 5 ++++-
 10 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 12df7e41dd88..ebfa2f0484d3 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   version = "2.2.1";
 
   src = fetchurl {
-    url = "http://download.videolan.org/vlc/${version}/${name}.tar.xz";
+    url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz";
     sha256 = "1jqzrzrpw6932lbkf863xk8cfmn4z2ngbxz7w8ggmh4f6xz9sgal";
   };
 
diff --git a/pkgs/development/libraries/libaacs/default.nix b/pkgs/development/libraries/libaacs/default.nix
index 119a46bfc31d..e12929e9f696 100644
--- a/pkgs/development/libraries/libaacs/default.nix
+++ b/pkgs/development/libraries/libaacs/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
   name = "${baseName}-${version}";
 
   src = fetchurl {
-    url = "http://download.videolan.org/pub/videolan/${baseName}/${version}/${baseName}-${version}.tar.bz2";
+    url = "http://get.videolan.org/${baseName}/${version}/${baseName}-${version}.tar.bz2";
     sha256 = "1s5v075hnbs57995r6lljm79wgrip3gnyf55a0y7bja75jh49hwm";
   };
 
diff --git a/pkgs/development/libraries/libbdplus/default.nix b/pkgs/development/libraries/libbdplus/default.nix
index 8cc2e8069320..67428f132495 100644
--- a/pkgs/development/libraries/libbdplus/default.nix
+++ b/pkgs/development/libraries/libbdplus/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
   name = "${baseName}-${version}";
 
   src = fetchurl {
-    url = "http://download.videolan.org/pub/videolan/${baseName}/${version}/${baseName}-${version}.tar.bz2";
+    url = "http://get.videolan.org/${baseName}/${version}/${baseName}-${version}.tar.bz2";
     sha256 = "02n87lysqn4kg2qk7d1ffrp96c44zkdlxdj0n16hbgrlrpiwlcd6";
   };
 
diff --git a/pkgs/development/libraries/libbluray/default.nix b/pkgs/development/libraries/libbluray/default.nix
index 7d7689bf23ed..08905455d353 100644
--- a/pkgs/development/libraries/libbluray/default.nix
+++ b/pkgs/development/libraries/libbluray/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   name = "${baseName}-${version}";
 
   src = fetchurl {
-    url = "ftp://ftp.videolan.org/pub/videolan/${baseName}/${version}/${name}.tar.bz2";
+    url = "http://get.videolan.org/${baseName}/${version}/${name}.tar.bz2";
     sha256 = "1sp71j4agcsg17g6b85cqz78pn5vknl5pl39rvr6mkib5ps99jgg";
   };
 
diff --git a/pkgs/development/libraries/libdvbpsi/default.nix b/pkgs/development/libraries/libdvbpsi/default.nix
index f8b9e9ecef90..ecfa14a43c9a 100644
--- a/pkgs/development/libraries/libdvbpsi/default.nix
+++ b/pkgs/development/libraries/libdvbpsi/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-
-  name = "libdvbpsi-0.2.2";
+stdenv.mkDerivation rec {
+  name = "libdvbpsi-${version}";
+  version = "0.2.2";
 
   src = fetchurl {
-    url = http://download.videolan.org/pub/libdvbpsi/0.2.2/libdvbpsi-0.2.2.tar.bz2;
+    url = "http://get.videolan.org/libdvbpsi/${version}/${name}.tar.bz2";
     sha256 = "1lry2swxqm8mhq0a4rjnc819ngsf2pxnfjajb57lml7yr12j79ls";
   };
 
diff --git a/pkgs/development/libraries/libdvdcss/default.nix b/pkgs/development/libraries/libdvdcss/default.nix
index 8632da12c735..d68b0a367517 100644
--- a/pkgs/development/libraries/libdvdcss/default.nix
+++ b/pkgs/development/libraries/libdvdcss/default.nix
@@ -1,10 +1,11 @@
 {stdenv, fetchurl}:
 
-stdenv.mkDerivation {
-  name = "libdvdcss-1.3.0";
-  
+stdenv.mkDerivation rec {
+  name = "libdvdcss-${version}";
+  version = "1.3.0";
+
   src = fetchurl {
-    url = http://download.videolan.org/pub/libdvdcss/1.3.0/libdvdcss-1.3.0.tar.bz2;
+    url = "http://get.videolan.org/libdvdcss/${version}/${name}.tar.bz2";
     sha256 = "158k9zagmbk5bkbz96l6lwhh7xcgfcnzflkr4vblskhcab6llhbw";
   };
 
diff --git a/pkgs/development/libraries/libdvdnav/default.nix b/pkgs/development/libraries/libdvdnav/default.nix
index fe625aa69e12..5c931f4d6f4c 100644
--- a/pkgs/development/libraries/libdvdnav/default.nix
+++ b/pkgs/development/libraries/libdvdnav/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "5.0.3";
 
   src = fetchurl {
-    url = "http://download.videolan.org/pub/videolan/libdvdnav/${version}/libdvdnav-${version}.tar.bz2";
+    url = "http://get.videolan.org/libdvdnav/${version}/${name}.tar.bz2";
     sha256 = "5097023e3d2b36944c763f1df707ee06b19dc639b2b68fb30113a5f2cbf60b6d";
   };
 
diff --git a/pkgs/development/libraries/libdvdread/default.nix b/pkgs/development/libraries/libdvdread/default.nix
index 311bc6dc4058..493be4c8f86b 100644
--- a/pkgs/development/libraries/libdvdread/default.nix
+++ b/pkgs/development/libraries/libdvdread/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "5.0.2";
 
   src = fetchurl {
-    url = "http://download.videolan.org/pub/videolan/libdvdread/${version}/libdvdread-${version}.tar.bz2";
+    url = "http://get.videolan.org/libdvdread/${version}/${name}.tar.bz2";
     sha256 = "82cbe693f2a3971671e7428790b5498392db32185b8dc8622f7b9cd307d3cfbf";
   };
 
diff --git a/pkgs/development/libraries/x264/default.nix b/pkgs/development/libraries/x264/default.nix
index 6c541f1aa682..3c2423434939 100644
--- a/pkgs/development/libraries/x264/default.nix
+++ b/pkgs/development/libraries/x264/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, yasm, enable10bit ? false}:
 
 stdenv.mkDerivation rec {
-  version = "snapshot-20141218-2245-stable";
-  name = "x264-20141218-2245";
+  version = "20141218-2245";
+  name = "x264-${version}";
 
   src = fetchurl {
-    url = "ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-${version}.tar.bz2";
+    url = "http://download.videolan.org/x264/snapshots/x264-snapshot-${version}-stable.tar.bz2";
     sha256 = "1gp1f0382vh2hmgc23ldqyywcfljg8lsgl2849ymr14r6gxfh69m";
   };
 
diff --git a/pkgs/development/libraries/x265/default.nix b/pkgs/development/libraries/x265/default.nix
index 1598fec61948..1473910e004f 100644
--- a/pkgs/development/libraries/x265/default.nix
+++ b/pkgs/development/libraries/x265/default.nix
@@ -19,7 +19,10 @@ stdenv.mkDerivation rec {
   version = "1.7";
 
   src = fetchurl {
-    url = "https://github.com/videolan/x265/archive/${version}.tar.gz";
+    urls = [
+      "http://get.videolan.org/x265/x265_${version}.tar.gz"
+      "https://github.com/videolan/x265/archive/${version}.tar.gz"
+    ];
     sha256 = "18w3whmbjlalvysny51kdq9b228iwg3rdav4kmifazksvrm4yacq";
   };
 

From 98ffc61e2f846c4818280a4cccce3fdad3eb9677 Mon Sep 17 00:00:00 2001
From: Tony White <white.tw.tw@gmail.com>
Date: Sat, 6 Feb 2016 20:41:40 +0000
Subject: [PATCH 1114/2285] curl: Change default src url (close #12851)

- Changes the default src url away from http://curl.haxx.se
to an official mirror because haxx.se resolves to https and
bootstrap curl doesn't have https support.
Please see https://github.com/NixOS/nixpkgs/issues/12816
for more info.
---
 pkgs/tools/networking/curl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 3c77d2a6c8d6..7101a9cbb1e0 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   name = "curl-7.45.0";
 
   src = fetchurl {
-    url = "http://curl.haxx.se/download/${name}.tar.bz2";
+    url = "http://ngcobalt13.uxnr.de/mirror/curl/${name}.tar.bz2";
     sha256 = "1slq5c0v9wa8hajgimhkxhvsrd07jmih8sa3gjsl597qp5k4w5b5";
   };
 

From f91f99aff827e43c10373e393636e9af12c28f66 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 7 Feb 2016 15:54:49 +0300
Subject: [PATCH 1115/2285] dwarf-fortress: fix help

---
 pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
index 1fd6178895db..c5157e82d8a5 100644
--- a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
+++ b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
@@ -39,3 +39,4 @@ done
 forcecopy_path data/index
 # For some reason, it's needed to be writable...
 forcecopy_path data/announcement
+forcecopy_path data/help

From 9cf445405bc1be72109946d231c09047c338d149 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 7 Feb 2016 14:23:24 +0100
Subject: [PATCH 1116/2285] libvdpau: break evaluation cycle on darwin

That path isn't meaningful on non-NixOS anyway.
---
 pkgs/development/libraries/libvdpau/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix
index 107c8448795c..446f2917fe71 100644
--- a/pkgs/development/libraries/libvdpau/default.nix
+++ b/pkgs/development/libraries/libvdpau/default.nix
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ xorg.libX11 ];
 
-  configureFlags = [ "--with-module-dir=${mesa_noglu.driverLink}/lib/vdpau" ];
+  configureFlags = stdenv.lib.optional stdenv.isLinux
+    "--with-module-dir=${mesa_noglu.driverLink}/lib/vdpau";
 
   installFlags = [ "moduledir=$(out)/lib/vdpau" ];
 

From 0d9f125925dca4988a1ed870ef12616e3fb55a4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 7 Feb 2016 14:31:10 +0100
Subject: [PATCH 1117/2285] ensureNewerSourcesHook: use absolute path for
 `find`

pythonPackages.psutil has busybox in build inputs and its `find`
apparently doesn't support the -newermt option.
---
 pkgs/top-level/all-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ef0536cf622..d2a97feae2f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -263,7 +263,8 @@ let
     (writeScript "ensure-newer-sources-hook.sh" ''
       postUnpackHooks+=(_ensureNewerSources)
       _ensureNewerSources() {
-        find "$sourceRoot" '!' -newermt '${year}-01-01' -exec touch -d '${year}-01-02' '{}' '+'
+        '${findutils}/bin/find' "$sourceRoot" \
+          '!' -newermt '${year}-01-01' -exec touch -d '${year}-01-02' '{}' '+'
       }
     '');
 

From c6e94f9fa0dd88ee4b8c0124b08ce787509c7301 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 7 Feb 2016 14:42:22 +0100
Subject: [PATCH 1118/2285] sc-im: fix download by using fetchFromGitHub

Otherwise the hashes would change periodically.
Also refactor meta. /cc maintainer @matthiasbeyer.
---
 pkgs/applications/misc/sc-im/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix
index 29f347522fa4..cb18278d1ed4 100644
--- a/pkgs/applications/misc/sc-im/default.nix
+++ b/pkgs/applications/misc/sc-im/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, yacc, ncurses, libxml2 }:
+{ stdenv, fetchFromGitHub, yacc, ncurses, libxml2 }:
 
 let
   version = "0.2.1";
@@ -7,9 +7,11 @@ stdenv.mkDerivation rec {
 
   name = "sc-im-${version}";
 
-  src = fetchurl {
-    url = "https://github.com/andmarti1424/sc-im/archive/v${version}.tar.gz";
-    sha256 = "08yks8grj5w434r81dy2knzbdhdnkc23r0d9v848mcl706xnjl6j";
+  src = fetchFromGitHub {
+    owner = "andmarti1424";
+    repo = "sc-im";
+    rev = "v${version}";
+    sha256 = "0v6b8xksvd12vmz198vik2ranyr5mhnp85hl9yxh9svibs7jxsbb";
   };
 
   buildInputs = [ yacc ncurses libxml2 ];
@@ -28,12 +30,12 @@ stdenv.mkDerivation rec {
     make install prefix=
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = "https://github.com/andmarti1424/sc-im";
     description = "SC-IM - Spreadsheet Calculator Improvised - SC fork";
-    license = stdenv.lib.licenses.bsdOriginal;
-    maintainers = [ stdenv.lib.maintainers.matthiasbeyer ];
-    platforms = with stdenv.lib.platforms; linux; # Cannot test others
+    license = licenses.bsdOriginal;
+    maintainers = [ maintainers.matthiasbeyer ];
+    platforms = platforms.linux; # Cannot test others
   };
 
 }

From 4b4d5c96c8ef976384fd00e67d1e21a1bb818fe7 Mon Sep 17 00:00:00 2001
From: Daiderd Jordan <daiderd@gmail.com>
Date: Sun, 7 Feb 2016 12:11:31 +0100
Subject: [PATCH 1119/2285] bats: init at 4.0.4

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

diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix
new file mode 100644
index 000000000000..4eb86460be9a
--- /dev/null
+++ b/pkgs/development/interpreters/bats/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+  name = "bats-${version}";
+  version = "0.4.0";
+
+  src = fetchzip {
+    url = "https://github.com/sstephenson/bats/archive/v${version}.tar.gz";
+    sha256 = "05xpvfm0xky1532i3hd2l3wznxzh99bv2hxgykwdpxh18h6jr6jm";
+  };
+
+  installPhase = "./install.sh $out";
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/sstephenson/bats;
+    description = "Bash Automated Testing System";
+    maintainers = [ maintainers.lnl7 ];
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fdc8acfd4947..be51cff6fe5b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -988,6 +988,8 @@ let
 
   bareos = callPackage ../tools/backup/bareos { };
 
+  bats = callPackage ../development/interpreters/bats { };
+
   beanstalkd = callPackage ../servers/beanstalkd { };
 
   beets = callPackage ../tools/audio/beets { };

From ea85ac9f15a129453b37bb9a6426887a5b767942 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Sat, 6 Feb 2016 18:04:11 -0800
Subject: [PATCH 1120/2285] powerline-fonts: 2015-06-29 -> 2015-12-11 (close
 #12856)

---
 pkgs/data/fonts/powerline-fonts/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix
index 63b4ad1ea04a..6d620c09f06d 100644
--- a/pkgs/data/fonts/powerline-fonts/default.nix
+++ b/pkgs/data/fonts/powerline-fonts/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation {
-  name = "powerline-fonts-2015-06-29";
+  name = "powerline-fonts-2015-12-11";
 
   src = fetchFromGitHub {
     owner = "powerline";
     repo = "fonts";
-    rev = "97dc451724fb24e1dd9892c988642b239b5dc67c";
-    sha256 = "1m0a8k916s74iv2k0kk36dz7d2hfb2zgf8m0b9hg71w4yd3bmj4w";
+    rev = "a44abd0e742ad6e7fd8d8bc4c3cad5155c9f3a92";
+    sha256 = "1pwz83yh28yd8aj6fbyfz8z3q3v67psszpd9mp4vv0ms9w8b5ajn";
   };
 
   buildPhase = "true";

From 75739fd05b5d646d007e4df3c94bdefb5c12845d Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 7 Feb 2016 14:43:10 +0000
Subject: [PATCH 1121/2285] python3Packages.samplerate: fix revision

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8ff7b67d6505..04312ca1f234 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7054,15 +7054,15 @@ in modules // {
     name = "scikits.samplerate-${version}";
     version = "0.3.3";
     src = pkgs.fetchgit {
-      url = https://github.com/ThomasLecocq/samplerate;
-      rev = "7edb22b23f5aa8e7342aea0b538bdd0434988510";
-      sha256 = "ec2a09819c38028283505090ee9839963d3557e73f6e8eb3348ff8884d0d67ed";
-      };
+      url = https://github.com/cournape/samplerate;
+      rev = "a536c97eb2d6195b5f266ea3cc3a35364c4c2210";
+      sha256 = "0mgic7bs5zv5ji05vr527jlxxlb70f9dg93hy1lzyz2plm1kf7gg";
+    };
+
     buildInputs = with self;  [ pkgs.libsamplerate ];
 
     propagatedBuildInputs = with self; [ numpy ];
 
-
     preConfigure = ''
        cat > site.cfg << END
        [samplerate]

From b4da3bb88b04329984cf56540f41956299c9cdc0 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Sun, 7 Feb 2016 16:39:39 +0100
Subject: [PATCH 1122/2285] buildRubyGem: ensure gem versions don't get
 misparsed

Without this, every nix-env --upgrade replaces ruby with an
arbitrary gem, which makes Ruby unusuable from user environments.
---
 pkgs/development/interpreters/ruby/build-ruby-gem/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix b/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix
index c5b9fba37aa0..fc9f0656cd98 100644
--- a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix
+++ b/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix
@@ -32,7 +32,9 @@ lib.makeOverridable (
 , platform ? "ruby"
 , ruby ? defs.ruby
 , stdenv ? ruby.stdenv
-, namePrefix ? "${ruby.name}" + "-"
+, namePrefix ? (let
+    rubyName = builtins.parseDrvName ruby.name;
+  in "${rubyName.name}${rubyName.version}-")
 , buildInputs ? []
 , doCheck ? false
 , meta ? {}

From c998447a13e8f97f2cfce648d019a26ee5c87bba Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Sun, 7 Feb 2016 16:40:43 +0100
Subject: [PATCH 1123/2285] buildRubyGem: pass the gem version through into the
 derivation name

---
 pkgs/development/interpreters/ruby/build-ruby-gem/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix b/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix
index fc9f0656cd98..cc1f85de19d3 100644
--- a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix
+++ b/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation (attrs // {
     ++ lib.optional stdenv.isDarwin darwin.libobjc
     ++ buildInputs;
 
-  name = attrs.name or (namePrefix + gemName);
+  name = attrs.name or "${namePrefix}${gemName}-${version}";
 
   inherit src;
 

From 66c3f7463b1c2c81ffdd7ebea6b786ea2882808e Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 7 Feb 2016 16:12:39 +0000
Subject: [PATCH 1124/2285] cdk: pin url to a version to prevent hash changes

---
 pkgs/development/libraries/cdk/default.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/cdk/default.nix b/pkgs/development/libraries/cdk/default.nix
index 94edc46fc4c5..614d57002cd2 100644
--- a/pkgs/development/libraries/cdk/default.nix
+++ b/pkgs/development/libraries/cdk/default.nix
@@ -1,18 +1,23 @@
-{stdenv, fetchurl, ncurses}:
+{ stdenv, fetchurl, ncurses }:
+
 let
+  version = "5.0-20160131";
+in
+stdenv.mkDerivation {
+  name = "cdk-${version}";
+  inherit version;
+
   buildInputs = [
     ncurses
   ];
-in
-stdenv.mkDerivation {
-  name = "cdk";
-  inherit buildInputs;
+
   src = fetchurl {
-    url = "http://invisible-island.net/datafiles/release/cdk.tar.gz";
-    sha256 = "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382";
+    url = "ftp://invisible-island.net/cdk/cdk-${version}.tgz";
+    sha256 = "08ic2f5rmi8niaxwxwr6l6lhpan7690x52vpldnbjcf20rc0fbf3";
   };
+
   meta = {
-    description = ''Curses development kit'';
+    description = "Curses development kit";
     license = stdenv.lib.licenses.bsdOriginal ;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.linux;

From b13e44e094989d3a902f8c73b22e8d3c0cc7acf4 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Sat, 6 Feb 2016 09:11:53 +0200
Subject: [PATCH 1125/2285] cairocffi: Add missing dependencies on gdk_pixbuf

Rewrite dlopening stuff in hacky way (due ctypes.util totally brokennes:
it attempt to use /sbin/ldconfig, gcc from PATH and other tricks to
detect sonames, I replaced it with simple table lookup)

Also I add patch to bypass another rounding regression in tests
(this patch submitted upstream as well)
---
 .../cairocffi/dlopen-paths.patch              | 47 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 20 ++++++--
 2 files changed, 63 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/development/python-modules/cairocffi/dlopen-paths.patch

diff --git a/pkgs/development/python-modules/cairocffi/dlopen-paths.patch b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
new file mode 100644
index 000000000000..bc5e939ceba9
--- /dev/null
+++ b/pkgs/development/python-modules/cairocffi/dlopen-paths.patch
@@ -0,0 +1,47 @@
+commit 705dc9a55bd160625d9996e63fc7dc532d0ad0ab
+Author: Alexander V. Nikolaev <avn@avnik.info>
+Date:   Sat Feb 6 08:09:06 2016 +0200
+
+    Patch dlopen() to allow direct paths to all required libs
+    
+    This patch is NixOS specific
+
+diff --git a/cairocffi/__init__.py b/cairocffi/__init__.py
+index 718aa7f..1a1dcff 100644
+--- a/cairocffi/__init__.py
++++ b/cairocffi/__init__.py
+@@ -27,20 +27,22 @@ VERSION = '0.7.2'
+ version = '1.10.0'
+ version_info = (1, 10, 0)
+ 
++# Use hardcoded soname, because ctypes.util use gcc/objdump which shouldn't be required for runtime
++_LIBS = {
++    'cairo': '@cairo@/lib/libcairo.so.2',
++    'glib-2.0': '@glib@/lib/libglib-2.0.so.0',
++    'gobject-2.0': '@glib@/lib/libgobject-2.0.so.0',
++    'gdk_pixbuf-2.0': '@gdk_pixbuf@/lib/libgdk_pixbuf-2.0.so.0',
++}
+ 
+-def dlopen(ffi, *names):
++def dlopen(ffi, name, *names):
+     """Try various names for the same library, for different platforms."""
+-    for name in names:
+-        for lib_name in [name, 'lib' + name]:
+-            try:
+-                path = ctypes.util.find_library(lib_name)
+-                if path:
+-                    lib = ffi.dlopen(path)
+-                    if lib:
+-                        return lib
+-            except OSError:
+-                pass
+-    raise OSError("dlopen() failed to load a library: %s" % ' / '.join(names))
++    path = _LIBS.get(name, None)
++    if path:
++        lib = ffi.dlopen(path)
++        if lib:
++            return lib
++    raise OSError("dlopen() failed to load a library: %s as %s" % (name, path))
+ 
+ 
+ cairo = dlopen(ffi, 'cairo', 'cairo-2')
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5c00687ce89e..19c65f5de4e8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2623,17 +2623,29 @@ in modules // {
       py.test $out/${python.sitePackages}
     '';
 
-    # Marked broken since according to test
+    # FIXME: make gdk_pixbuf dependency optional (as wel as xcfffi)
     # Happens with 0.7.1 and 0.7.2
     # OSError: dlopen() failed to load a library: gdk_pixbuf-2.0 / gdk_pixbuf-2.0-0
 
-    patchPhase = ''
+    patches = [
+      # This patch from PR substituted upstream
+      (pkgs.fetchpatch {
+          url = "https://github.com/avnik/cairocffi/commit/2266882e263c5efc87350cf016d117b2ec6a1d59.patch";
+          sha256 = "0gb570z3ivf1b0ixsk526n3h29m8c5rhjsiyam7rr3x80dp65cdl";
+      })
+
+      ../development/python-modules/cairocffi/dlopen-paths.patch
+    ];
+
+    postPatch = ''
       # Hardcode cairo library path
-      sed -e 's,ffi\.dlopen(,&"${pkgs.cairo}/lib/" + ,' -i cairocffi/__init__.py
+      # FIXME: for closure-size branch all pkgs.foo should be replaced with pkgs.foo.lib
+      substituteInPlace cairocffi/__init__.py --subst-var-by cairo ${pkgs.cairo}
+      substituteInPlace cairocffi/__init__.py --subst-var-by glib ${pkgs.glib}
+      substituteInPlace cairocffi/__init__.py --subst-var-by gdk_pixbuf ${pkgs.gdk_pixbuf}
     '';
 
     meta = {
-      broken = true;
       homepage = https://github.com/SimonSapin/cairocffi;
       license = "bsd";
       description = "cffi-based cairo bindings for Python";

From 23a9b9b88a06923f1afc0eede65f2c0b73125886 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 7 Feb 2016 17:16:30 +0100
Subject: [PATCH 1126/2285] rrdtool: move perl libraries to the expected place

closes #12801
---
 pkgs/tools/misc/rrdtool/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix
index 11f9d32b1545..524e61dfaf37 100644
--- a/pkgs/tools/misc/rrdtool/default.nix
+++ b/pkgs/tools/misc/rrdtool/default.nix
@@ -9,8 +9,9 @@ stdenv.mkDerivation rec {
   buildInputs = [ gettext perl pkgconfig libxml2 pango cairo groff ];
   
   postInstall = ''
-    # for munin support
-    mv $out/lib/perl/5*/*/*.pm $out/lib/perl/5*/
+    # for munin and rrdtool support
+    mkdir -p $out/lib/perl5/site_perl/
+    mv $out/lib/perl/5* $out/lib/perl5/site_perl/
   '';
 
   meta = with stdenv.lib; {

From 9a5a967d0d7bdaf729679d1e66717a56c106d12f Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 7 Feb 2016 16:41:16 +0000
Subject: [PATCH 1127/2285] nodePackages.oauth: pin url to version

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

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 6a3cdd9f7de2..1c68d1badc84 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -29315,7 +29315,7 @@
     version = "0.9.12";
     bin = false;
     src = fetchurl {
-      url = "https://github.com/ciaranj/node-oauth/tarball/master";
+      url = "https://github.com/ciaranj/node-oauth/tarball/0.9.12";
       name = "oauth-0.9.12.tgz";
       sha256 = "e06c3c3537e9c802c8ad00640b9f91bf2857cf8cc91209e355b5646f4da8b3e7";
     };

From 2bd28145876f28891805000ed9efc81bbf6482fc Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sun, 7 Feb 2016 22:39:11 +0000
Subject: [PATCH 1128/2285] nodePackages.oauth: use fetchFromGitHub

fixup to 9a5a967
---
 pkgs/top-level/node-packages-generated.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix
index 1c68d1badc84..12d0aff2616e 100644
--- a/pkgs/top-level/node-packages-generated.nix
+++ b/pkgs/top-level/node-packages-generated.nix
@@ -1,4 +1,4 @@
-{ self, fetchurl, fetchgit ? null, lib }:
+{ self, fetchurl, fetchgit ? null, fetchFromGitHub, lib }:
 
 {
   by-spec."Base64"."~0.2.0" =
@@ -29314,10 +29314,11 @@
     name = "oauth-0.9.12";
     version = "0.9.12";
     bin = false;
-    src = fetchurl {
-      url = "https://github.com/ciaranj/node-oauth/tarball/0.9.12";
-      name = "oauth-0.9.12.tgz";
-      sha256 = "e06c3c3537e9c802c8ad00640b9f91bf2857cf8cc91209e355b5646f4da8b3e7";
+    src = fetchFromGitHub {
+      owner = "ciaranj";
+      repo = "node-oauth";
+      rev = "0.9.12";
+      sha256 = "1c67nq1q5isfcvyp520q02w5c527s1wsfiyknzfvvp22sf2yn7k6";
     };
     deps = {
     };

From a708bce08b9ecdc25c53d1bde22be66aba80b772 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 7 Feb 2016 22:55:32 +0100
Subject: [PATCH 1129/2285] screen-message: add git mirror (darcs fails)

in response to #12868
---
 pkgs/tools/X11/screen-message/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/X11/screen-message/default.nix b/pkgs/tools/X11/screen-message/default.nix
index 977a82230a52..87487442ada9 100644
--- a/pkgs/tools/X11/screen-message/default.nix
+++ b/pkgs/tools/X11/screen-message/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, fetchdarcs, autoreconfHook, pkgconfig, gtk3 }:
+{ stdenv, fetchgit, autoreconfHook, pkgconfig, gtk3 }:
 
 stdenv.mkDerivation {
   name = "screen-message-0.23";
 
-  src = fetchdarcs {
-    url = "http://darcs.nomeata.de/screen-message.debian";
-    rev = "0.23-1";
+  srcs = fetchgit {
+    url = "git://git.nomeata.de/darcs-mirror-screen-message.debian.git";
+    rev = "refs/tags/0_23-1";
+    sha256 = "fddddd28703676b2908af71cca7225e6c7bdb15b2fdfd67679cac129028a431c";
   };
 
   buildInputs = [ autoreconfHook pkgconfig gtk3 ];

From ce99feec689b5c5832db1e344246110605e0e3b0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 8 Feb 2016 00:36:38 +0100
Subject: [PATCH 1130/2285] zstd: 0.4.7 -> 0.5.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

“New: dictionary builder tool
Changed: advanced API for streaming and dictionary compression
Improved: better compression of small data.”
---
 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 d60b4b3614a0..e095b2d4e073 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.4.7";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
-    sha256 = "09l917979qfqk44dbgsa9vs37a2qj4ga43553zcgvnps02wlja8s";
+    sha256 = "18jwhvzj3kv8lpr6fgild7a574lsak93fc1z8nvhcdbc1b1n2dsj";
     rev = "v${version}";
     repo = "zstd";
     owner = "Cyan4973";

From e4c9fa40a6712151e1ea65604a18d6e8f2c65c9f Mon Sep 17 00:00:00 2001
From: Ian Grant Jeffries <ian@housejeffries.com>
Date: Sun, 7 Feb 2016 01:38:24 -0500
Subject: [PATCH 1131/2285] vim-plugins: add vinegar

---
 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 59a46ea7bf8a..cf3eb8d09f37 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1586,6 +1586,17 @@ rec {
 
   };
 
+  vinegar = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vinegar-2016-01-30";
+    src = fetchgit {
+      url = "git://github.com/tpope/vim-vinegar";
+      rev = "75fc3824bc09053f22735d6726c5cfd614c15642";
+      sha256 = "19fc1487169f1d8941ffddda1ffadd842ef4a773de2d32536eae52cf494154a6";
+    };
+    dependencies = [];
+
+  };
+
   vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vundle-2015-11-04";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 207eed69160c..a4dca009cdd9 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -122,4 +122,5 @@
 "vim-webdevicons"
 "vim2hs"
 "vimwiki"
+"vinegar"
 "vundle"

From 5a13e9500c79ee38fd2bf99ae23d7d0276a858f6 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 7 Feb 2016 18:38:00 -0600
Subject: [PATCH 1132/2285] nixos/nix-serve: use bzip2.bin output

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

diff --git a/nixos/modules/services/networking/nix-serve.nix b/nixos/modules/services/networking/nix-serve.nix
index 880a1d361dfe..8f6881441cf7 100644
--- a/nixos/modules/services/networking/nix-serve.nix
+++ b/nixos/modules/services/networking/nix-serve.nix
@@ -50,7 +50,7 @@ in
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
 
-      path = [ config.nix.package pkgs.bzip2 ];
+      path = [ config.nix.package pkgs.bzip2.bin ];
       environment.NIX_REMOTE = "daemon";
       environment.NIX_SECRET_KEY_FILE = cfg.secretKeyFile;
 

From 9a72bf5c0fa8c6d265c3fe0df5f2842b21519cd7 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Fri, 5 Feb 2016 14:49:27 +0100
Subject: [PATCH 1133/2285] udev: sane: fix udev error

The new udev checks that no script references any absolute /bin/sh
paths, so this patches that out.
---
 pkgs/applications/graphics/sane/backends/generic.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index 8f46e647252e..2ee5e1ddcf51 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -50,6 +50,9 @@ stdenv.mkDerivation {
     mkdir -p $out/etc/udev/rules.d/
     ./tools/sane-desc -m udev > $out/etc/udev/rules.d/49-libsane.rules || \
     cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules
+    # the created 49-libsane references /bin/sh
+    substituteInPlace $out/etc/udev/rules.d/49-libsane.rules \
+      -- replace "RUN+=\"/bin/sh" "RUN+=\"${stdenv.shell}"
 
     substituteInPlace $out/lib/libsane.la \
       --replace "-ljpeg" "-L${libjpeg}/lib -ljpeg"

From ae6f06be03af07d216cf9e641a0a0890ef668222 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Mon, 8 Feb 2016 09:56:23 +0900
Subject: [PATCH 1134/2285] oraclejdk: 8u71, 8u72 -> 8u73, 8u74

---
 pkgs/development/compilers/oraclejdk/jdk8-linux.nix    | 6 +++---
 pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
index b71c97d56224..48a586ffb0f2 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "71";
+  patchVersion = "73";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "11wcizv4gvlffzn2wj34ffwrq21xwh4ikg2vjv63avdfp2hazjqv";
-  sha256_x86_64 = "18jqdrlbv4sdds2hlmp437waq7r9b33f7hdp8kb6l7pkrizr9nwv";
+  sha256_i686 = "1bi3yj2ds9w13p2lzvmxffk5gax8syi3bw52w8pam1jr3fmzgwgl";
+  sha256_x86_64 = "1rp3nbnhkncyr48m0nn3pf5fr4bp3lzm0ki4gca7mn7rzag19a26";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";
diff --git a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
index f4bb68500d23..0f6c4ad668a6 100644
--- a/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
+++ b/pkgs/development/compilers/oraclejdk/jdk8psu-linux.nix
@@ -1,9 +1,9 @@
 import ./jdk-linux-base.nix {
   productVersion = "8";
-  patchVersion = "72";
+  patchVersion = "74";
   downloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html;
-  sha256_i686 = "023rnlm5v7d9w4d7bgcac8j0r1vqkbv6fl20k8354pzpdjg6liaq";
-  sha256_x86_64 = "167ca39a6y0n8l87kdm5nv2hrp0wf6g4mw1rbychjc04f5igkrs6";
+  sha256_i686 = "1vc3g89fbrmznb10bhh5gs143hcjg4wsy4j4hwnr1djfj83y8188";
+  sha256_x86_64 = "1pfx7il1h42w3kigscdvm9vfy616lmsp1d2cqvplim3nyxwmvz8b";
   jceName = "jce_policy-8.zip";
   jceDownloadUrl = http://www.oracle.com/technetwork/java/javase/downloads/jce8-download-2133166.html;
   sha256JCE = "0n8b6b8qmwb14lllk2lk1q1ahd3za9fnjigz5xn65mpg48whl0pk";

From b2c658ca1176f8985ea75f10519a5630244b2d87 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Mon, 8 Feb 2016 13:29:42 +0900
Subject: [PATCH 1135/2285] i3: dmenu and i3status as runtime dependencies

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

diff --git a/pkgs/applications/window-managers/i3/default.nix b/pkgs/applications/window-managers/i3/default.nix
index 8cd7932a8d1b..0833fde8c9e2 100644
--- a/pkgs/applications/window-managers/i3/default.nix
+++ b/pkgs/applications/window-managers/i3/default.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, which, pkgconfig, makeWrapper, libxcb, xcbutilkeysyms
 , xcbutil, xcbutilwm, libstartup_notification, libX11, pcre, libev, yajl
 , xcb-util-cursor, coreutils, perl, pango, perlPackages, libxkbcommon
-, xorgserver, xvfb_run }:
+, xorgserver, xvfb_run, dmenu, i3status }:
 
 stdenv.mkDerivation rec {
   name = "i3-${version}";
@@ -24,6 +24,13 @@ stdenv.mkDerivation rec {
     patchShebangs .
   '';
 
+  postFixup = ''
+    substituteInPlace $out/etc/i3/config --replace dmenu_run ${dmenu}/bin/dmenu_run
+    substituteInPlace $out/etc/i3/config --replace "status_command i3status" "status_command ${i3status}/bin/i3status"
+    substituteInPlace $out/etc/i3/config.keycodes --replace dmenu_run ${dmenu}/bin/dmenu_run
+    substituteInPlace $out/etc/i3/config.keycodes --replace "status_command i3status" "status_command ${i3status}/bin/i3status"
+  '';
+
   # Tests have been failing (at least for some people in some cases)
   # and have been disabled until someone wants to fix them. Some
   # initial digging uncovers that the tests call out to `git`, which

From f03ce60bd228734ef64c1ae5eaee639332bb1dc2 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Mon, 8 Feb 2016 13:31:03 +0900
Subject: [PATCH 1136/2285] i3service: remove dmenu and i3 from env packages

---
 nixos/modules/services/x11/window-managers/i3.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/window-managers/i3.nix b/nixos/modules/services/x11/window-managers/i3.nix
index d43dacb1be6b..2e2e10cc33b0 100644
--- a/nixos/modules/services/x11/window-managers/i3.nix
+++ b/nixos/modules/services/x11/window-managers/i3.nix
@@ -34,6 +34,6 @@ in
         '';
       }];
     };
-    environment.systemPackages = with pkgs; [ i3 i3status dmenu ];
+    environment.systemPackages = with pkgs; [ i3 ];
   };
 }

From 65beea69d75f05aa0ac5f00baec2e2ead4345f15 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Mon, 8 Feb 2016 13:20:44 +0900
Subject: [PATCH 1137/2285] i3status: 2.9 -> 2.10, fixes #12872

---
 pkgs/applications/window-managers/i3/status.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/window-managers/i3/status.nix b/pkgs/applications/window-managers/i3/status.nix
index 97b200e340e2..1693e7ed0fd4 100644
--- a/pkgs/applications/window-managers/i3/status.nix
+++ b/pkgs/applications/window-managers/i3/status.nix
@@ -1,18 +1,17 @@
-{ fetchurl, stdenv, confuse, yajl, alsaLib, wirelesstools
+{ fetchurl, stdenv, confuse, yajl, alsaLib, libpulseaudio, libnl, pkgconfig
   }:
 
 stdenv.mkDerivation rec {
-  name = "i3status-2.9";
+  name = "i3status-2.10";
 
   src = fetchurl {
     url = "http://i3wm.org/i3status/${name}.tar.bz2";
-    sha256 = "1qwxbrga2fi5wf742hh9ajwa8b2kpzkjjnhjlz4wlpv21i80kss2";
+    sha256 = "1497dsvb32z9xljmxz95dnyvsbayn188ilm3l4ys8m5h25vd1xfs";
   };
 
-  buildInputs = [ confuse yajl alsaLib wirelesstools ];
+  buildInputs = [ confuse yajl alsaLib libpulseaudio libnl pkgconfig ];
 
-  makeFlags = "all";
-  installFlags = "PREFIX=\${out}";
+  makeFlags = [ "all" "PREFIX=$(out)" ];
 
   meta = {
     description = "A tiling window manager";

From 3c168a714e4da8a498ee8a8a4c8bd03e7c70d964 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Mon, 8 Feb 2016 13:09:29 +0800
Subject: [PATCH 1138/2285] dvtm: 0.14 -> 0.15

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

diff --git a/pkgs/tools/misc/dvtm/default.nix b/pkgs/tools/misc/dvtm/default.nix
index 32d6b6fa6ef1..5969c9562369 100644
--- a/pkgs/tools/misc/dvtm/default.nix
+++ b/pkgs/tools/misc/dvtm/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "dvtm-0.14";
+  name = "dvtm-0.15";
 
   meta = {
     description = "Dynamic virtual terminal manager";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "${meta.homepage}/${name}.tar.gz";
-    sha256 = "0ykl8dz7ivjgdzhmhlgidnp2ffh5gxq9lbg276w7iid4z10v76wa";
+    sha256 = "0475w514b7i3gxk6khy8pfj2gx9l7lv2pwacmq92zn1abv01a84g";
   };
 
   buildInputs = [ ncurses ];

From 9afe794f5eac3830c7df932a739520f2d3ecc0bf Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 8 Feb 2016 10:10:38 +0000
Subject: [PATCH 1139/2285] coqPackages.contribs.Bertrand: fix hash

---
 pkgs/development/coq-modules/contribs/all.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/coq-modules/contribs/all.nix b/pkgs/development/coq-modules/contribs/all.nix
index d01c32bdb0af..d2ef82c55875 100644
--- a/pkgs/development/coq-modules/contribs/all.nix
+++ b/pkgs/development/coq-modules/contribs/all.nix
@@ -11,7 +11,7 @@ AreaMethod = "07d86p5xbnhbrily18hda0hymf3zx8yhw905plmrqyfbcc6x5531";
 Automata = "0g75gjdj79ysiq1pwqk658jxs2z1l8pk702iz69008vkjzbzkhvm";
 AxiomaticABP = "19x16dgsqyw2pflza8cgv29585a6yy3r8pz4z8ns3r7qhpp1449b";
 BDDs = "0s5a67w9v1lklph8dm4d9bkd6f9qzfb377gvisr3hslacn9ya8zy";
-Bertrand = "1ih0zbk3phk0zwms0mwkcikmki25hgbp1l980gpydj5a0s9ildyg";
+Bertrand = "05i6xw9gi5ad78rsw5pfhiqllw9x4q4phfi4ddzlxpsgshiw7d0k";
 Buchberger = "1v7zi62ar4inncbcphalsyaggx8im02j81b0fnpvx2x3kyv2pr94";
 CCS = "1na7902k05z19a727wa7rz0dbf1fhcl53r4zxvcgvg5dasvwfc97";
 CFGV = "13gk597r9n2wcgcbhribsqrp9wb8mmr3qd4zbv2ig8469kng0j4m";

From f7d88238cd4f471f7798782d133d008e4a236843 Mon Sep 17 00:00:00 2001
From: artuuge <artuuge@gmail.com>
Date: Mon, 8 Feb 2016 14:21:39 +0100
Subject: [PATCH 1140/2285] epson-escpr: init at version 1.6.3

---
 .../epson-escpr/cups-filter-ppd-dirs.patch    | 62 +++++++++++++++++++
 pkgs/misc/drivers/epson-escpr/default.nix     | 36 +++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 100 insertions(+)
 create mode 100644 pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch
 create mode 100644 pkgs/misc/drivers/epson-escpr/default.nix

diff --git a/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch b/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch
new file mode 100644
index 000000000000..3065ed1a10f5
--- /dev/null
+++ b/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch
@@ -0,0 +1,62 @@
+diff --git a/configure b/configure_new
+index c3e7199..ccbf290 100755
+--- a/configure
++++ b/configure_new
+@@ -11585,55 +11585,8 @@ else
+ $as_echo "no" >&6; }
+ fi
+ 
+-
+-
+-if test "xNONE" != "x${prefix}" ; then
+-   cups_default_prefix="${prefix}"
+-else
+-   cups_default_prefix="${ac_default_prefix}"
+-fi
+-
+-
+-# Check whether --with-cupsfilterdir was given.
+-if test "${with_cupsfilterdir+set}" = set; then :
+-  withval=$with_cupsfilterdir;
+-else
+-  with_cupsfilterdir=no
+-fi
+-
+-if test "xno" = "x${with_cupsfilterdir}"; then
+-   if test "xyes" = "x$have_cups_config" ; then
+-            CUPS_FILTER_DIR="${cups_default_prefix}`cups-config --serverbin | sed -e 's,^/[^/][^/]*,,'`/filter"
+-   else
+-      CUPS_FILTER_DIR="${cups_default_prefix}/lib/cups/filter"
+-   fi
+-else
+-   CUPS_FILTER_DIR="${with_cupsfilterdir}"
+-fi
+-
+-
+-# Check whether --with-cupsppddir was given.
+-if test "${with_cupsppddir+set}" = set; then :
+-  withval=$with_cupsppddir;
+-else
+-  with_cupsppddir=no
+-fi
+-
+-if test "xno" = "x${with_cupsppddir}"; then
+-   if test -d "${cups_default_prefix}/share/ppd" ; then
+-      CUPS_PPD_DIR="${cups_default_prefix}/share/ppd"
+-   elif test "xyes" = "x$have_cups_config" ; then
+-            CUPS_PPD_DIR="${cups_default_prefix}/`cups-config --datadir | sed -e 's,^/[^/][^/]*,,'`/model"
+-   else
+-      CUPS_PPD_DIR="${cups_default_prefix}/share/cups/model"
+-   fi
+-else
+-   CUPS_PPD_DIR="${with_cupsppddir}"
+-fi
+-
+-
+-
+-
++CUPS_FILTER_DIR="${prefix}/lib/cups/filter"
++CUPS_PPD_DIR="${prefix}/share/cups/model"
+ 
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
+ $as_echo_n "checking for ANSI C header files... " >&6; }
diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix
new file mode 100644
index 000000000000..1f403947acb5
--- /dev/null
+++ b/pkgs/misc/drivers/epson-escpr/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, cups }:
+
+let
+  version = "1.6.3";
+in
+  stdenv.mkDerivation {
+
+    name = "epson-escpr-${version}";
+  
+    src = fetchurl {
+      url = "https://download3.ebz.epson.net/dsc/f/03/00/04/33/53/0177a44361d3dfeacf7f15ff4a347cef373688da/epson-inkjet-printer-escpr-1.6.3-1lsb3.2.tar.gz";
+      sha256 = "4988479ce7dd5513bfa1cce4a83f82348572d8d69d6aa3b2c6e154a58a04ad86"; 
+    }; 
+
+    patches = [ ./cups-filter-ppd-dirs.patch ]; 
+
+    buildInputs = [ cups ];
+
+    meta = {
+      homepage = https://github.com/artuuge/NixOS-files/;
+      description = "ESC/P-R Driver (generic driver)";
+      longDescription = ''
+        Epson Inkjet Printer Driver (ESC/P-R) for Linux and the
+	corresponding PPD files. The list of supported printers
+	can be found at http://www.openprinting.org/driver/epson-escpr/ .
+
+	To use the driver adjust your configuration.nix file:
+	  services.printing = {
+	    enable = true;
+	    drivers = [ pkgs.epson-escpr ];
+	  };
+      '';
+      license = stdenv.lib.licenses.gpl3Plus;
+    };
+
+  }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be51cff6fe5b..de823529ee66 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15435,6 +15435,8 @@ let
 
   crashplan = callPackage ../applications/backup/crashplan { };
 
+  epson-escpr = callPackage ../misc/drivers/epson-escpr { };
+
   gutenprint = callPackage ../misc/drivers/gutenprint { };
 
   gutenprintBin = callPackage ../misc/drivers/gutenprint/bin.nix { };

From 37d67b0cdfbf6ce6cb57a4ada70e715275c0410f Mon Sep 17 00:00:00 2001
From: Ollie Charles <ollie@ocharles.org.uk>
Date: Mon, 8 Feb 2016 14:11:38 +0000
Subject: [PATCH 1141/2285] haskell.packages.ghc801: Update to RC 2

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

diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix
index 7f337c019531..d24ad4106ee4 100644
--- a/pkgs/development/compilers/ghc/8.0.1.nix
+++ b/pkgs/development/compilers/ghc/8.0.1.nix
@@ -3,12 +3,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "8.0.0.20160111";
+  version = "8.0.0.20160204";
   name = "ghc-${version}";
 
   src = fetchurl {
-    url = "https://downloads.haskell.org/~ghc/8.0.1-rc1/${name}-src.tar.xz";
-    sha256 = "0y4nha46mw01ysw90kh8szcbsfdc37rqjm7r5fyk6flqwr8b6pvr";
+    url = "https://downloads.haskell.org/~ghc/8.0.1-rc2/${name}-src.tar.xz";
+    sha256 = "0v8pciva93i4a6h0l76vq6bbvrg76b1y4awwbxcg3m9gnqkvmy2k";
   };
 
   patches = [

From 371b57a716feeaa5309ebb376aceab62371c2348 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Mon, 8 Feb 2016 16:28:20 +0000
Subject: [PATCH 1142/2285] lr: init at 0.2

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

diff --git a/pkgs/tools/system/lr/default.nix b/pkgs/tools/system/lr/default.nix
new file mode 100644
index 000000000000..47233532df3c
--- /dev/null
+++ b/pkgs/tools/system/lr/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub }:
+
+let
+  version = "0.2";
+in
+stdenv.mkDerivation {
+  name = "lr-${version}";
+  inherit version;
+
+  src = fetchFromGitHub {
+    owner = "chneukirchen";
+    repo = "lr";
+    rev = "v${version}";
+    sha256 = "1wn1j0cf84r4nli92myf3waackh2p6r2hkavgx6533x15kdyfnf7";
+  };
+
+  makeFlags = "PREFIX=$(out)";
+
+  meta = {
+    homepage = "http://github.com/chneukirchen/lr";
+    description = "List files recursively";
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [stdenv.lib.maintainers.globin];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be51cff6fe5b..e103d1e5b536 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2236,6 +2236,8 @@ let
 
   lout = callPackage ../tools/typesetting/lout { };
 
+  lr = callPackage ../tools/system/lr { };
+
   lrzip = callPackage ../tools/compression/lrzip { };
 
   # lsh installs `bin/nettle-lfib-stream' and so does Nettle.  Give the

From 05a8185fdae5d6236c93087f25bca4744881e089 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Mon, 8 Feb 2016 12:29:37 +0100
Subject: [PATCH 1143/2285] icedtea_web: 1.6.1 -> 1.6.2

---
 pkgs/development/compilers/icedtea-web/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/icedtea-web/default.nix b/pkgs/development/compilers/icedtea-web/default.nix
index 863c74bc4c1b..fb03d98dbdc0 100644
--- a/pkgs/development/compilers/icedtea-web/default.nix
+++ b/pkgs/development/compilers/icedtea-web/default.nix
@@ -3,11 +3,11 @@
 stdenv.mkDerivation rec {
   name = "icedtea-web-${version}";
 
-  version = "1.6.1";
+  version = "1.6.2";
 
   src = fetchurl {
     url = "http://icedtea.wildebeest.org/download/source/${name}.tar.gz";
-    sha256 = "0869j9jn0z5b5pfspp4v5cj2ksmbqmmmjhqicn4kqc6wr6v6md59";
+    sha256 = "004kwrngyxxlrlzby4vzxjr0xcyngcdc9dfgnvi61ffnjr006ryf";
   };
 
   nativeBuildInputs = [ pkgconfig bc perl ];

From e5b143a964e3de7f7a4c08f8fe813ae1f9228287 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 8 Feb 2016 19:15:41 +0100
Subject: [PATCH 1144/2285] geolite-legacy 2016-02-02 -> 2016-02-08

---
 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 b8d07106565b..2be23b0f35c7 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-02-02";
+  version = "2016-02-08";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
     "0fnlznn04lpkkd7sy9r9kdl3fcp8ix7msdrncwgz26dh537ml32z";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "1h47n8fn9dfjw672jbw67mn03bidaahwnkra464ggy1q4pwkvncs";
+    "0ib93p2fwayqsxwph98rkgln7xpjrwhzzc06sc74876jpaq3g8g5";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "0nnfp8xzrlcdvy8lvsw2mvfmxavj2gmm7bvr0l2pv07n863b873y";
+    "1izlxqcvdag66sny5zjjwkmjhai0c9m77b96j117n0x0awrrk4h9";
 
   meta = with stdenv.lib; {
     description = "GeoLite Legacy IP geolocation databases";

From 32136a024708994b357636b451673147560591f3 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Sun, 7 Feb 2016 01:51:20 +0100
Subject: [PATCH 1145/2285] pcre: 8.37 with patches -> 8.38

---
 .../libraries/pcre/cve-2015-3210.patch        | 87 -------------------
 .../libraries/pcre/cve-2015-5073.patch        | 68 ---------------
 pkgs/development/libraries/pcre/default.nix   |  8 +-
 3 files changed, 3 insertions(+), 160 deletions(-)
 delete mode 100644 pkgs/development/libraries/pcre/cve-2015-3210.patch
 delete mode 100644 pkgs/development/libraries/pcre/cve-2015-5073.patch

diff --git a/pkgs/development/libraries/pcre/cve-2015-3210.patch b/pkgs/development/libraries/pcre/cve-2015-3210.patch
deleted file mode 100644
index c97849fb70c7..000000000000
--- a/pkgs/development/libraries/pcre/cve-2015-3210.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 68ff1beb43bb3d4d8838f3285c97023d1e50513a Mon Sep 17 00:00:00 2001
-From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
-Date: Fri, 15 May 2015 17:17:03 +0000
-Subject: [PATCH] Fix buffer overflow for named recursive back reference when
- the name is duplicated.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upstream commit ported to pcre-8.37:
-
-commit 4b79af6b4cbeb5326ae5e4d83f3e935e00286c19
-Author: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
-Date:   Fri May 15 17:17:03 2015 +0000
-
-    Fix buffer overflow for named recursive back reference when the name is
-    duplicated.
-
-    git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1558 2f5784b3-3f2a-0410-8824-cb99058d5e15
-
-This fixes CVE-2015-3210.
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- pcre_compile.c       | 16 ++++++++++++++--
- testdata/testinput2  |  2 ++
- testdata/testoutput2 |  2 ++
- 3 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/pcre_compile.c b/pcre_compile.c
-index 0efad26..6f06912 100644
---- a/pcre_compile.c
-+++ b/pcre_compile.c
-@@ -7173,14 +7173,26 @@ for (;; ptr++)
-           number. If the name is not found, set the value to 0 for a forward
-           reference. */
- 
-+          recno = 0;
-           ng = cd->named_groups;
-           for (i = 0; i < cd->names_found; i++, ng++)
-             {
-             if (namelen == ng->length &&
-                 STRNCMP_UC_UC(name, ng->name, namelen) == 0)
--              break;
-+              {
-+              open_capitem *oc;
-+              recno = ng->number;
-+              if (is_recurse) break;
-+              for (oc = cd->open_caps; oc != NULL; oc = oc->next)         
-+                {          
-+                if (oc->number == recno)                                     
-+                  {               
-+                  oc->flag = TRUE;                                      
-+                  break;
-+                  }                                                         
-+                }                          
-+              }    
-             }
--          recno = (i < cd->names_found)? ng->number : 0;
- 
-           /* Count named back references. */
- 
-diff --git a/testdata/testinput2 b/testdata/testinput2
-index 58fe53b..83bb471 100644
---- a/testdata/testinput2
-+++ b/testdata/testinput2
-@@ -4152,4 +4152,6 @@ backtracking verbs. --/
- 
- /((?2){73}(?2))((?1))/
- 
-+"(?J)(?'d'(?'d'\g{d}))"
-+
- /-- End of testinput2 --/
-diff --git a/testdata/testoutput2 b/testdata/testoutput2
-index b718df0..7dff52a 100644
---- a/testdata/testoutput2
-+++ b/testdata/testoutput2
-@@ -14423,4 +14423,6 @@ Failed: lookbehind assertion is not fixed length at offset 17
- 
- /((?2){73}(?2))((?1))/
- 
-+"(?J)(?'d'(?'d'\g{d}))"
-+
- /-- End of testinput2 --/
--- 
-2.4.3
-
diff --git a/pkgs/development/libraries/pcre/cve-2015-5073.patch b/pkgs/development/libraries/pcre/cve-2015-5073.patch
deleted file mode 100644
index 16fd45c87b1d..000000000000
--- a/pkgs/development/libraries/pcre/cve-2015-5073.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 354e1f8e921dcb9cf2f3a5eac93cd826d01a7d8a Mon Sep 17 00:00:00 2001
-From: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
-Date: Tue, 23 Jun 2015 16:34:53 +0000
-Subject: [PATCH] Fix buffer overflow for forward reference within backward
- assertion with excess closing parenthesis. Bugzilla 1651.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This is upstream commit ported to 8.37:
-
-commit 764692f9aea9eab50fdba6cb537441d8b34c6c37
-Author: ph10 <ph10@2f5784b3-3f2a-0410-8824-cb99058d5e15>
-Date:   Tue Jun 23 16:34:53 2015 +0000
-
-    Fix buffer overflow for forward reference within backward assertion with excess
-    closing parenthesis. Bugzilla 1651.
-
-    git-svn-id: svn://vcs.exim.org/pcre/code/trunk@1571 2f5784b3-3f2a-0410-8824-cb99058d5e15
-
-It fixes CVE-2015-5073.
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- pcre_compile.c       | 2 +-
- testdata/testinput2  | 2 ++
- testdata/testoutput2 | 3 +++
- 3 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/pcre_compile.c b/pcre_compile.c
-index 6f06912..b66b1f6 100644
---- a/pcre_compile.c
-+++ b/pcre_compile.c
-@@ -9392,7 +9392,7 @@ OP_RECURSE that are not fixed length get a diagnosic with a useful offset. The
- exceptional ones forgo this. We scan the pattern to check that they are fixed
- length, and set their lengths. */
- 
--if (cd->check_lookbehind)
-+if (errorcode == 0 && cd->check_lookbehind)
-   {
-   pcre_uchar *cc = (pcre_uchar *)codestart;
- 
-diff --git a/testdata/testinput2 b/testdata/testinput2
-index 83bb471..5cc9ce6 100644
---- a/testdata/testinput2
-+++ b/testdata/testinput2
-@@ -4154,4 +4154,6 @@ backtracking verbs. --/
- 
- "(?J)(?'d'(?'d'\g{d}))"
- 
-+/(?=di(?<=(?1))|(?=(.))))/
-+
- /-- End of testinput2 --/
-diff --git a/testdata/testoutput2 b/testdata/testoutput2
-index 7dff52a..4decb8d 100644
---- a/testdata/testoutput2
-+++ b/testdata/testoutput2
-@@ -14425,4 +14425,7 @@ Failed: lookbehind assertion is not fixed length at offset 17
- 
- "(?J)(?'d'(?'d'\g{d}))"
- 
-+/(?=di(?<=(?1))|(?=(.))))/
-+Failed: unmatched parentheses at offset 23
-+
- /-- End of testinput2 --/
--- 
-2.4.3
-
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index 3370e910565e..92f53b067204 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -5,17 +5,15 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  name = "pcre-8.37";
+  name = "pcre-8.38";
 
   src = fetchurl {
     url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/${name}.tar.bz2";
-    sha256 = "17bqykp604p7376wj3q2nmjdhrb6v1ny8q08zdwi7qvc02l9wrsi";
+    sha256 = "1pvra19ljkr5ky35y2iywjnsckrs9ch2anrf5b0dc91hw8v2vq5r";
   };
 
   patches =
-    [ ./cve-2015-3210.patch
-      ./cve-2015-5073.patch
-    ];
+    [ ];
 
   outputs = [ "out" "doc" "man" ];
 

From 63cf61e8d37afd46992792a927f263a1ee92c673 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 4 Feb 2016 21:30:39 +0100
Subject: [PATCH 1146/2285] pythonPackages: new functions to build numpy and
 scipy

---
 .../python-modules/numpy-scipy-support.nix    | 35 -------
 pkgs/development/python-modules/numpy.nix     | 51 ++++++++++
 pkgs/development/python-modules/scipy.nix     | 47 ++++++++++
 pkgs/top-level/python-packages.nix            | 94 ++++---------------
 4 files changed, 117 insertions(+), 110 deletions(-)
 delete mode 100644 pkgs/development/python-modules/numpy-scipy-support.nix
 create mode 100644 pkgs/development/python-modules/numpy.nix
 create mode 100644 pkgs/development/python-modules/scipy.nix

diff --git a/pkgs/development/python-modules/numpy-scipy-support.nix b/pkgs/development/python-modules/numpy-scipy-support.nix
deleted file mode 100644
index 422de794e31b..000000000000
--- a/pkgs/development/python-modules/numpy-scipy-support.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  # Python package expression
-  python,
-  # Name of package (e.g. numpy or scipy)
-  pkgName,
-  # OpenBLAS math library
-  openblas
-}:
-
-{
-  # Re-export openblas here so that it can be sure that the same one will be used
-  # in the propagatedBuildInputs.
-  inherit openblas;
-
-  # First "install" the package, then import what was installed, and call the
-  # .test() function, which will run the test suite.
-  checkPhase = ''
-    runHook preCheck
-    pushd dist
-    ${python.interpreter} -c 'import ${pkgName}; ${pkgName}.test("fast", verbose=10)'
-    popd
-    runHook postCheck
-  '';
-
-  # Creates a site.cfg telling the setup script where to find depended-on
-  # math libraries.
-  preBuild = ''
-    echo "Creating site.cfg file..."
-    cat << EOF > site.cfg
-    [openblas]
-    include_dirs = ${openblas}/include
-    library_dirs = ${openblas}/lib
-    EOF
-  '';
-}
diff --git a/pkgs/development/python-modules/numpy.nix b/pkgs/development/python-modules/numpy.nix
new file mode 100644
index 000000000000..141c8b14fa6d
--- /dev/null
+++ b/pkgs/development/python-modules/numpy.nix
@@ -0,0 +1,51 @@
+{lib, python, buildPythonPackage, isPyPy, gfortran, nose, blas}:
+
+args:
+
+let
+  inherit (args) version;
+in buildPythonPackage (args // rec {
+
+  name = "numpy-${version}";
+
+  disabled = isPyPy;
+  buildInputs = args.buildInputs or [ gfortran nose ];
+  propagatedBuildInputs = args.propagatedBuildInputs or [ passthru.blas ];
+
+  preConfigure = ''
+    sed -i 's/-faltivec//' numpy/distutils/system_info.py
+  '';
+
+  preBuild = ''
+    echo "Creating site.cfg file..."
+    cat << EOF > site.cfg
+    [openblas]
+    include_dirs = ${passthru.blas}/include
+    library_dirs = ${passthru.blas}/lib
+    EOF
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+    pushd dist
+    ${python.interpreter} -c 'import numpy; numpy.test("fast", verbose=10)'
+    popd
+    runHook postCheck
+  '';
+
+  passthru = {
+    blas = blas;
+  };
+
+  # The large file support test is disabled because it takes forever
+  # and can cause the machine to run out of disk space when run.
+  prePatch = ''
+    sed -i 's/test_large_file_support/donttest/' numpy/lib/tests/test_format.py
+  '';
+
+  meta = {
+    description = "Scientific tools for Python";
+    homepage = "http://numpy.scipy.org/";
+    maintainers = with lib.maintainers; [ fridh ];
+  } // (args.meta or {});
+})
diff --git a/pkgs/development/python-modules/scipy.nix b/pkgs/development/python-modules/scipy.nix
new file mode 100644
index 000000000000..ae312cd32d59
--- /dev/null
+++ b/pkgs/development/python-modules/scipy.nix
@@ -0,0 +1,47 @@
+{lib, python, buildPythonPackage, isPyPy, gfortran, nose}:
+
+args:
+
+let
+  inherit (args) version;
+  inherit (args) numpy;
+in buildPythonPackage (args // rec {
+
+  name = "scipy-${version}";
+
+  buildInputs = (args.buildInputs or [ gfortran nose ]);
+  propagatedBuildInputs = (args.propagatedBuildInputs or [ passthru.blas numpy]);
+
+  preConfigure = ''
+    sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py
+  '';
+
+  preBuild = ''
+    echo "Creating site.cfg file..."
+    cat << EOF > site.cfg
+    [openblas]
+    include_dirs = ${passthru.blas}/include
+    library_dirs = ${passthru.blas}/lib
+    EOF
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+    pushd dist
+    ${python.interpreter} -c 'import scipy; scipy.test("fast", verbose=10)'
+    popd
+    runHook postCheck
+  '';
+
+  passthru = {
+    blas = numpy.blas;
+  };
+
+  setupPyBuildFlags = [ "--fcompiler='gnu95'" ];
+
+  meta = {
+    description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. ";
+    homepage = http://www.scipy.org/;
+    maintainers = with lib.maintainers; [ fridh ];
+  } // (args.meta or {});
+})
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 18671f3b4c73..65a8279ec92d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12505,48 +12505,20 @@ in modules // {
     };
   };
 
-  numpy = let
-    support = import ../development/python-modules/numpy-scipy-support.nix {
-      inherit python;
-      openblas = pkgs.openblasCompat;
-      pkgName = "numpy";
-    };
-  in buildPythonPackage ( rec {
-    name = "numpy-${version}";
-    version = "1.10.4";
+  buildNumpyPackage = callPackage ../development/python-modules/numpy.nix {
+    gfortran = pkgs.gfortran;
+    blas = pkgs.openblasCompat;
+  };
 
+  numpy = self.numpy_1_10;
+
+  numpy_1_10 = self.buildNumpyPackage rec {
+    version = "1.10.4";
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/n/numpy/${name}.tar.gz";
+      url = "https://pypi.python.org/packages/source/n/numpy/numpy-${version}.tar.gz";
       sha256 = "7356e98fbcc529e8d540666f5a919912752e569150e9a4f8d869c686f14c720b";
     };
-
-    disabled = isPyPy;  # WIP
-
-    preConfigure = ''
-      sed -i 's/-faltivec//' numpy/distutils/system_info.py
-    '';
-
-    inherit (support) preBuild checkPhase;
-
-    buildInputs = [ pkgs.gfortran self.nose ];
-    propagatedBuildInputs = [ support.openblas ];
-
-    # Disable failing test_f2py test.
-    # f2py couldn't be found by test,
-    # even though it was used successfully to build numpy
-
-    # The large file support test is disabled because it takes forever
-    # and can cause the machine to run out of disk space when run.
-    prePatch = ''
-      sed -i 's/test_f2py/donttest/' numpy/tests/test_scripts.py
-      sed -i 's/test_large_file_support/donttest/' numpy/lib/tests/test_format.py
-    '';
-
-    meta = {
-      description = "Scientific tools for Python";
-      homepage = "http://numpy.scipy.org/";
-    };
-  });
+  };
 
   numpydoc = buildPythonPackage rec {
     name = "numpydoc-${version}";
@@ -18488,47 +18460,19 @@ in modules // {
     };
   };
 
+  buildScipyPackage = callPackage ../development/python-modules/scipy.nix {
+    gfortran = pkgs.gfortran;
+  };
 
-  scipy = let
-    support = import ../development/python-modules/numpy-scipy-support.nix {
-      inherit python;
-      openblas = pkgs.openblasCompat;
-      pkgName = "scipy";
-    };
-  in buildPythonPackage rec {
-    name = "scipy-${version}";
+  scipy = self.scipy_0_16;
+
+  scipy_0_16 = self.buildScipyPackage rec {
     version = "0.16.1";
-
     src = pkgs.fetchurl {
-      url = "http://pypi.python.org/packages/source/s/scipy/${name}.tar.gz";
+      url = "https://pypi.python.org/packages/source/s/scipy/scipy-${version}.tar.gz";
       sha256 = "ecd1efbb1c038accb0516151d1e6679809c6010288765eb5da6051550bf52260";
     };
-
-    buildInputs = [ pkgs.gfortran self.nose ];
-    propagatedBuildInputs = [ self.numpy ];
-
-    preConfigure = ''
-      sed -i '0,/from numpy.distutils.core/s//import setuptools;from numpy.distutils.core/' setup.py
-    '';
-
-    # First test: RuntimeWarning: Mean of empty slice.
-    # Second: SyntaxError: invalid syntax. Due to wrapper?
-    # Third: test checks permissions
-    prePatch = ''
-      substituteInPlace scipy/stats/tests/test_stats.py --replace "test_chisquare_masked_arrays" "remove_this_one"
-      rm scipy/linalg/tests/test_lapack.py
-      substituteInPlace scipy/weave/tests/test_catalog.py --replace "test_user" "remove_this_one"
-    '';
-
-    inherit (support) preBuild checkPhase;
-
-    patches = [../development/python-modules/scipy-0.16.1-decorator-fix.patch];
-    setupPyBuildFlags = [ "--fcompiler='gnu95'" ];
-
-    meta = {
-      description = "SciPy (pronounced 'Sigh Pie') is open-source software for mathematics, science, and engineering. ";
-      homepage = http://www.scipy.org/;
-    };
+    numpy = self.numpy_1_10;
   };
 
   scikitimage = buildPythonPackage rec {
@@ -18563,7 +18507,7 @@ in modules // {
     };
 
     buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ];
-    propagatedBuildInputs = with self; [ numpy scipy pkgs.openblas ];
+    propagatedBuildInputs = with self; [ numpy scipy numpy.blas ];
 
     LC_ALL="en_US.UTF-8";
 

From 3e476a73ef455484e7b60a36364bd29fd60bfd4a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 4 Feb 2016 21:29:25 +0100
Subject: [PATCH 1147/2285] openblas_2_14: init at 0.2.14

---
 .../science/math/openblas/0.2.14.nix          | 65 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 67 insertions(+)
 create mode 100644 pkgs/development/libraries/science/math/openblas/0.2.14.nix

diff --git a/pkgs/development/libraries/science/math/openblas/0.2.14.nix b/pkgs/development/libraries/science/math/openblas/0.2.14.nix
new file mode 100644
index 000000000000..2fac8a4db08b
--- /dev/null
+++ b/pkgs/development/libraries/science/math/openblas/0.2.14.nix
@@ -0,0 +1,65 @@
+{ stdenv, fetchurl, gfortran, perl, which, config, coreutils
+# Most packages depending on openblas expect integer width to match pointer width,
+# but some expect to use 32-bit integers always (for compatibility with reference BLAS).
+, blas64 ? null
+}:
+
+with stdenv.lib;
+
+let blas64_ = blas64; in
+
+let local = config.openblas.preferLocalBuild or false;
+    binary =
+      { i686-linux = "32";
+        x86_64-linux = "64";
+        x86_64-darwin = "64";
+      }."${stdenv.system}" or (throw "unsupported system: ${stdenv.system}");
+    genericFlags =
+      [ "DYNAMIC_ARCH=1"
+        "NUM_THREADS=64"
+      ];
+    localFlags = config.openblas.flags or
+      optionals (hasAttr "target" config.openblas) [ "TARGET=${config.openblas.target}" ];
+    blas64 = if blas64_ != null then blas64_ else hasPrefix "x86_64" stdenv.system;
+
+    version = "0.2.14";
+in
+stdenv.mkDerivation {
+  name = "openblas-${version}";
+  src = fetchurl {
+    url = "https://github.com/xianyi/OpenBLAS/archive/v${version}.tar.gz";
+    sha256 = "2411c4f56f477b42dff54db2b7ffc0b7cf53bb9778d54982595c64cc69c40fc1";
+    name = "openblas-${version}.tar.gz";
+  };
+
+  inherit blas64;
+
+  nativeBuildInputs = optionals stdenv.isDarwin [coreutils] ++ [gfortran perl which];
+
+  makeFlags =
+    (if local then localFlags else genericFlags)
+    ++
+    optionals stdenv.isDarwin ["MACOSX_DEPLOYMENT_TARGET=10.9"]
+    ++
+    [
+      "FC=gfortran"
+      # Note that clang is available through the stdenv on OSX and
+      # thus is not an explicit dependency.
+      "CC=${if stdenv.isDarwin then "clang" else "gcc"}"
+      ''PREFIX="''$(out)"''
+      "BINARY=${binary}"
+      "USE_OPENMP=${if stdenv.isDarwin then "0" else "1"}"
+      "INTERFACE64=${if blas64 then "1" else "0"}"
+    ];
+
+  doCheck = true;
+  checkTarget = "tests";
+
+  meta = with stdenv.lib; {
+    description = "Basic Linear Algebra Subprograms";
+    license = licenses.bsd3;
+    homepage = "https://github.com/xianyi/OpenBLAS";
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ ttuegel ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e103d1e5b536..2eec8c8d3dba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15029,10 +15029,12 @@ let
   liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { };
 
   openblas = callPackage ../development/libraries/science/math/openblas { };
+  openblas_2_14 = callPackage ../development/libraries/science/math/openblas/0.2.14.nix { };
 
   # A version of OpenBLAS using 32-bit integers on all platforms for compatibility with
   # standard BLAS and LAPACK.
   openblasCompat = openblas.override { blas64 = false; };
+  openblasCompat_2_14 = openblas_2_14.override { blas64 = false; };
 
   openlibm = callPackage ../development/libraries/science/math/openlibm {};
 

From 73e9cb9748bdd5e3343972aafd094669d629ff3a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 5 Feb 2016 09:03:11 +0100
Subject: [PATCH 1148/2285] pythonPackages.numpy: use openblas_2_14

---
 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 65a8279ec92d..16fc9ad808c8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12507,7 +12507,7 @@ in modules // {
 
   buildNumpyPackage = callPackage ../development/python-modules/numpy.nix {
     gfortran = pkgs.gfortran;
-    blas = pkgs.openblasCompat;
+    blas = pkgs.openblasCompat_2_14;
   };
 
   numpy = self.numpy_1_10;

From 7fad1bcff7af266d020692f804ae7d3b80a81697 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 8 Feb 2016 20:36:01 +0100
Subject: [PATCH 1149/2285] pythonPackages.scipy_0_17: init at 0.17.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 16fc9ad808c8..f4d6bd965a0f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18475,6 +18475,15 @@ in modules // {
     numpy = self.numpy_1_10;
   };
 
+  scipy_0_17 = self.buildScipyPackage rec {
+    version = "0.17.0";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/s/scipy/scipy-${version}.tar.gz";
+      sha256 = "f600b755fb69437d0f70361f9e560ab4d304b1b66987ed5a28bdd9dd7793e089";
+    };
+    numpy = self.numpy_1_10;
+  };
+
   scikitimage = buildPythonPackage rec {
     name = "scikit-image-${version}";
     version = "0.11.3";

From 9123a84fd32071257931a97f708c56603840cc80 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 5 Feb 2016 09:00:50 +0100
Subject: [PATCH 1150/2285] pythonPackages.scipy: 0.16.1 -> 0.17.0

---
 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 f4d6bd965a0f..55e36cbe71e9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18464,7 +18464,7 @@ in modules // {
     gfortran = pkgs.gfortran;
   };
 
-  scipy = self.scipy_0_16;
+  scipy = self.scipy_0_17;
 
   scipy_0_16 = self.buildScipyPackage rec {
     version = "0.16.1";

From e552ad11e3159e19904a3221324be660e25db55c Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 20:37:07 +0100
Subject: [PATCH 1151/2285] python bootstrapped-pip: pip 7.1.2 -> 8.0.2

---
 .../bootstrapped-pip/default.nix              |  10 +-
 .../bootstrapped-pip/pip-7.0.1-prefix.patch   | 151 ------------------
 2 files changed, 2 insertions(+), 159 deletions(-)
 delete mode 100644 pkgs/development/python-modules/bootstrapped-pip/pip-7.0.1-prefix.patch

diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 43f8cca4c827..86a469773930 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -11,11 +11,11 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "python-${python.version}-bootstrapped-pip-${version}";
-  version = "7.1.2";
+  version = "8.0.2";
 
   src = fetchurl {
     url = "https://pypi.python.org/packages/py2.py3/p/pip/pip-${version}-py2.py3-none-any.whl";
-    sha256 = "133hx6jaspm6hd02gza66lng37l65yficc2y2x1gh16fbhxrilxr";
+    sha256 = "249a6f3194be8c2e8cb4d4be3f6fd16a9f1e3336218caffa8e7419e3816f9988";
   };
 
   unpackPhase = ''
@@ -27,12 +27,6 @@ in stdenv.mkDerivation rec {
 
   patchPhase = ''
     mkdir -p $out/bin
-
-    # patch pip to support "pip install --prefix"
-    # https://github.com/pypa/pip/pull/3252
-    pushd $out/${python.sitePackages}/
-    patch -p1 < ${./pip-7.0.1-prefix.patch}
-    popd
   '';
 
   buildInputs = [ python makeWrapper unzip ];
diff --git a/pkgs/development/python-modules/bootstrapped-pip/pip-7.0.1-prefix.patch b/pkgs/development/python-modules/bootstrapped-pip/pip-7.0.1-prefix.patch
deleted file mode 100644
index 21936ec99e6b..000000000000
--- a/pkgs/development/python-modules/bootstrapped-pip/pip-7.0.1-prefix.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-commit e87c83d95bb91acdca92202e94488ca51a70e059
-Author: Domen Kožar <domen@dev.si>
-Date:   Mon Nov 16 17:39:44 2015 +0100
-
-    WIP
-
-diff --git a/pip/commands/install.py b/pip/commands/install.py
-index dbcf100..05d5a08 100644
---- a/pip/commands/install.py
-+++ b/pip/commands/install.py
-@@ -139,6 +139,13 @@ class InstallCommand(RequirementCommand):
-                  "directory.")
- 
-         cmd_opts.add_option(
-+            '--prefix',
-+            dest='prefix_path',
-+            metavar='dir',
-+            default=None,
-+            help="Installation prefix where lib, bin and other top-level folders are placed")
-+
-+        cmd_opts.add_option(
-             "--compile",
-             action="store_true",
-             dest="compile",
-@@ -309,6 +316,7 @@ class InstallCommand(RequirementCommand):
-                             install_options,
-                             global_options,
-                             root=options.root_path,
-+                            prefix=options.prefix_path,
-                         )
-                         reqs = sorted(
-                             requirement_set.successfully_installed,
-diff --git a/pip/locations.py b/pip/locations.py
-index 4e6f65d..43aeb1f 100644
---- a/pip/locations.py
-+++ b/pip/locations.py
-@@ -163,7 +163,7 @@ site_config_files = [
- 
- 
- def distutils_scheme(dist_name, user=False, home=None, root=None,
--                     isolated=False):
-+                     isolated=False, prefix=None):
-     """
-     Return a distutils install scheme
-     """
-@@ -187,6 +187,8 @@ def distutils_scheme(dist_name, user=False, home=None, root=None,
-     i.user = user or i.user
-     if user:
-         i.prefix = ""
-+    else:
-+        i.prefix = prefix or i.prefix
-     i.home = home or i.home
-     i.root = root or i.root
-     i.finalize_options()
-diff --git a/pip/req/req_install.py b/pip/req/req_install.py
-index 7c5bf8f..6f80a18 100644
---- a/pip/req/req_install.py
-+++ b/pip/req/req_install.py
-@@ -792,7 +792,7 @@ exec(compile(
-         else:
-             return True
- 
--    def install(self, install_options, global_options=[], root=None):
-+    def install(self, install_options, global_options=[], root=None, prefix=None):
-         if self.editable:
-             self.install_editable(install_options, global_options)
-             return
-@@ -800,7 +800,7 @@ exec(compile(
-             version = pip.wheel.wheel_version(self.source_dir)
-             pip.wheel.check_compatibility(version, self.name)
- 
--            self.move_wheel_files(self.source_dir, root=root)
-+            self.move_wheel_files(self.source_dir, root=root, prefix=prefix)
-             self.install_succeeded = True
-             return
- 
-@@ -833,6 +833,8 @@ exec(compile(
- 
-             if root is not None:
-                 install_args += ['--root', root]
-+            if prefix is not None:
-+                install_args += ['--prefix', prefix]
- 
-             if self.pycompile:
-                 install_args += ["--compile"]
-@@ -988,12 +990,13 @@ exec(compile(
-     def is_wheel(self):
-         return self.link and self.link.is_wheel
- 
--    def move_wheel_files(self, wheeldir, root=None):
-+    def move_wheel_files(self, wheeldir, root=None, prefix=None):
-         move_wheel_files(
-             self.name, self.req, wheeldir,
-             user=self.use_user_site,
-             home=self.target_dir,
-             root=root,
-+            prefix=prefix,
-             pycompile=self.pycompile,
-             isolated=self.isolated,
-         )
-diff --git a/pip/wheel.py b/pip/wheel.py
-index 403f48b..14eb141 100644
---- a/pip/wheel.py
-+++ b/pip/wheel.py
-@@ -234,12 +234,12 @@ def get_entrypoints(filename):
- 
- 
- def move_wheel_files(name, req, wheeldir, user=False, home=None, root=None,
--                     pycompile=True, scheme=None, isolated=False):
-+                     pycompile=True, scheme=None, isolated=False, prefix=None):
-     """Install a wheel"""
- 
-     if not scheme:
-         scheme = distutils_scheme(
--            name, user=user, home=home, root=root, isolated=isolated
-+            name, user=user, home=home, root=root, isolated=isolated, prefix=prefix,
-         )
- 
-     if root_is_purelib(name, wheeldir):
-diff --git a/pip/req/req_install.py b/pip/req/req_install.py
-index 51bf4a7..e2e285e 100644
---- a/pip/req/req_install.py
-+++ b/pip/req/req_install.py
-@@ -795,7 +795,7 @@ exec(compile(
-     def install(self, install_options, global_options=[], root=None,
-                 prefix=None):
-         if self.editable:
--            self.install_editable(install_options, global_options)
-+            self.install_editable(install_options, global_options, prefix=prefix)
-             return
-         if self.is_wheel:
-             version = pip.wheel.wheel_version(self.source_dir)
-@@ -929,12 +929,16 @@ exec(compile(
-             rmtree(self._temp_build_dir)
-         self._temp_build_dir = None
- 
--    def install_editable(self, install_options, global_options=()):
-+    def install_editable(self, install_options, global_options=(), prefix=None):
-         logger.info('Running setup.py develop for %s', self.name)
- 
-         if self.isolated:
-             global_options = list(global_options) + ["--no-user-cfg"]
- 
-+        if prefix:
-+            prefix_param = ['--prefix={0}'.format(prefix)]
-+            install_options = list(install_options) + prefix_param
-+
-         with indent_log():
-             # FIXME: should we do --install-headers here too?
-             cwd = self.source_dir
-

From 2bec2fa3567d85b5adbde0374284d2f9c1d983e0 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 22 Jan 2016 20:37:24 +0100
Subject: [PATCH 1152/2285] pythonPackages.pip: 7.1.2 -> 8.0.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 55e36cbe71e9..58b6c63a90a3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14745,12 +14745,12 @@ in modules // {
   };
 
   pip = buildPythonPackage rec {
-    version = "7.1.2";
+    version = "8.0.2";
     name = "pip-${version}";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/p/pip/pip-${version}.tar.gz";
-      sha256 = "0xx4aypfgchxdknxq7gyqghd8wb221zrzyqlbabzm32jy237j16a";
+      sha256 = "46f4bd0d8dfd51125a554568d646fe4200a3c2c6c36b9f2d06d2212148439521";
     };
 
     buildInputs = with self; [ mock scripttest virtualenv pytest ];

From 2f6d64bc6f1772ab7d69dee6676684c26656f890 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 8 Feb 2016 20:46:35 +0100
Subject: [PATCH 1153/2285] pythonPackages.wheel: 0.26.0 -> 0.29.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 58b6c63a90a3..37704f1f50de 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21399,11 +21399,11 @@ in modules // {
 
   wheel = buildPythonPackage rec {
     name = "wheel-${version}";
-    version = "0.26.0";
+    version = "0.29.0";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/w/wheel/${name}.tar.gz";
-      sha256 = "eaad353805c180a47545a256e6508835b65a8e830ba1093ed8162f19a50a530c";
+      sha256 = "1ebb8ad7e26b448e9caa4773d2357849bf80ff9e313964bcaf79cbf0201a1648";
     };
 
     buildInputs = with self; [ pytest pytestcov coverage ];

From 7ddd3a0d303e0bf61b770feabbcaa3cfa83a349f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 8 Feb 2016 20:47:23 +0100
Subject: [PATCH 1154/2285] python bootstrapped-pip: wheel 0.26.0 -> 0.29.0

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

diff --git a/pkgs/development/python-modules/bootstrapped-pip/default.nix b/pkgs/development/python-modules/bootstrapped-pip/default.nix
index 86a469773930..c0e5ae0ec774 100644
--- a/pkgs/development/python-modules/bootstrapped-pip/default.nix
+++ b/pkgs/development/python-modules/bootstrapped-pip/default.nix
@@ -2,8 +2,8 @@
 
 let
   wheel_source = fetchurl {
-    url = "https://pypi.python.org/packages/py2.py3/w/wheel/wheel-0.26.0-py2.py3-none-any.whl";
-    sha256 = "1sl642ncvipqx0hzypvl5hsiqngy0sib0kq242g4mic7vnid6bn9";
+    url = "https://pypi.python.org/packages/py2.py3/w/wheel/wheel-0.29.0-py2.py3-none-any.whl";
+    sha256 = "ea8033fc9905804e652f75474d33410a07404c1a78dd3c949a66863bd1050ebd";
   };
   setuptools_source = fetchurl {
     url = "https://pypi.python.org/packages/3.5/s/setuptools/setuptools-19.4-py2.py3-none-any.whl";

From bf8550998e89059ebaf277d1fbb8f77ebc27ed7d Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 8 Feb 2016 20:48:23 +0100
Subject: [PATCH 1155/2285] libpsl: 2016-01-15 -> 2016-02-06

---
 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 1dc4c57e979a..d4d24db84b9d 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -3,10 +3,10 @@
 
 let
 
-  listVersion = "2016-01-15";
+  listVersion = "2016-02-06";
   listSources = fetchFromGitHub {
-    sha256 = "1smn4fl0fhldy7gdn0k1diyghbxdxnr4cj921bjdl2i4wxas41g5";
-    rev = "77cb90dce70827bda40384e1ae8bff3c958daef3";
+    sha256 = "0jh1fbfyi9zdhw77brfdkw7mcbr03dqww8yv703kp69fqhyf2pln";
+    rev = "0efc1a2f0ec93163273f6c5c2f511a19f5cd5805";
     repo = "list";
     owner = "publicsuffix";
   };

From 82e15d9914e25c216ca162b777ac420fa9fbf356 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 8 Feb 2016 21:06:08 +0100
Subject: [PATCH 1156/2285] pagemon: 0.01.07 -> 0.01.08

Main changes:
- Add 'c' key to close pop up windows
- Enable -p option to have the PID or name of the process to monitor
- Fix zoom scaling on memory view
- Don't break on failed seek or read of map info

More:
https://github.com/ColinIanKing/pagemon/blob/f172bd17e7a11e43131629468e4b2ad191ca9b47/debian/changelog
---
 pkgs/os-specific/linux/pagemon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/pagemon/default.nix b/pkgs/os-specific/linux/pagemon/default.nix
index dee92419cd1e..4246e5123217 100644
--- a/pkgs/os-specific/linux/pagemon/default.nix
+++ b/pkgs/os-specific/linux/pagemon/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "pagemon-${version}";
-  version = "0.01.07";
+  version = "0.01.08";
 
   src = fetchFromGitHub {
-    sha256 = "041jqk11sq1qn3avsx4jbfqzvg6rfa5kmgn16q8jnwm5fqfaj037";
+    sha256 = "079x8ah33nh4faqcy0jy24x30l40j5m00d57aawaayaq18smqs3f";
     rev = "V${version}";
     repo = "pagemon";
     owner = "ColinIanKing";

From 5691a2a498f25a967af1d89bdb845eea665b672f Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Mon, 8 Feb 2016 16:37:35 -0500
Subject: [PATCH 1157/2285] xe: init at 0.5

Simple xargs and apply replacement.
---
 pkgs/tools/system/xe/default.nix | 20 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 22 insertions(+)
 create mode 100644 pkgs/tools/system/xe/default.nix

diff --git a/pkgs/tools/system/xe/default.nix b/pkgs/tools/system/xe/default.nix
new file mode 100644
index 000000000000..303374942c0d
--- /dev/null
+++ b/pkgs/tools/system/xe/default.nix
@@ -0,0 +1,20 @@
+{ stdenv, lib, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "xe-${version}";
+  version = "0.5";
+  src = fetchFromGitHub {
+    owner = "chneukirchen";
+    repo = "xe";
+    rev = "v${version}";
+    sha256 = "0rv9npgjb695slql39asyp6znv9r3a6jbcsrsa1cmhk82iy4bljc";
+  };
+  makeFlags = "PREFIX=$(out)";
+  meta = with lib; {
+    description = "Simple xargs and apply replacement";
+    homepage = "https://github.com/chneukirchen/xe";
+    license = licenses.publicDomain;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2eec8c8d3dba..13854052125e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3512,6 +3512,8 @@ let
 
   xl2tpd = callPackage ../tools/networking/xl2tpd { };
 
+  xe = callPackage ../tools/system/xe { };
+
   testdisk = callPackage ../tools/misc/testdisk { };
 
   html2text = callPackage ../tools/text/html2text { };

From 4faeca0cbd6104cbc3c39762c11038534a2fe084 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Mon, 8 Feb 2016 17:28:24 -0500
Subject: [PATCH 1158/2285] nq: init at 0.1

Unix command line queue utility.
---
 pkgs/tools/system/nq/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix  |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/system/nq/default.nix

diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/tools/system/nq/default.nix
new file mode 100644
index 000000000000..2f34b354d52e
--- /dev/null
+++ b/pkgs/tools/system/nq/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, lib, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "nq-${version}";
+  version = "0.1";
+  src = fetchFromGitHub {
+    owner = "chneukirchen";
+    repo = "nq";
+    rev = "v${version}";
+    sha256 = "17n0yqhpsys3s872ki5rf82ky73ylahz6xi9x0rfrv7fqr5nzsz4";
+  };
+  makeFlags = "PREFIX=$(out)";
+  postPatch = ''
+    sed -i tq \
+      -e 's|\bfq\b|'$out'/bin/fq|g' \
+      -e 's|\bnq\b|'$out'/bin/nq|g'
+  '';
+  meta = with lib; {
+    description = "Unix command line queue utility";
+    homepage = "https://github.com/chneukirchen/nq";
+    license = licenses.publicDomain;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ cstrahan ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 13854052125e..dddbdedf5a2c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2519,6 +2519,8 @@ let
     pythonPackages = python3Packages;
   };
 
+  nq = callPackage ../tools/system/nq { };
+
   nsjail = callPackage ../tools/security/nsjail {};
 
   nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd {};

From 71d01db76fa5c4e62417382e27f6a89f0f8a60a0 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 9 Feb 2016 00:13:07 +0100
Subject: [PATCH 1159/2285] sane: *really* fix udev error

\#12874 tried to patch out the literal /bin/sh, but an additional space
sneaked in.
---
 pkgs/applications/graphics/sane/backends/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/sane/backends/generic.nix b/pkgs/applications/graphics/sane/backends/generic.nix
index 2ee5e1ddcf51..e457ba29d975 100644
--- a/pkgs/applications/graphics/sane/backends/generic.nix
+++ b/pkgs/applications/graphics/sane/backends/generic.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
     cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules
     # the created 49-libsane references /bin/sh
     substituteInPlace $out/etc/udev/rules.d/49-libsane.rules \
-      -- replace "RUN+=\"/bin/sh" "RUN+=\"${stdenv.shell}"
+      --replace "RUN+=\"/bin/sh" "RUN+=\"${stdenv.shell}"
 
     substituteInPlace $out/lib/libsane.la \
       --replace "-ljpeg" "-L${libjpeg}/lib -ljpeg"

From 7c6771fe26c60d98659c382429dc52c6d00a057a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 9 Feb 2016 05:01:00 +0000
Subject: [PATCH 1160/2285] python3Packages.zope_testrunner: disable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 37704f1f50de..d5066d2da8f6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22213,7 +22213,8 @@ in modules // {
 
     propagatedBuildInputs = with self; [ zope_interface zope_exceptions zope_testing six ] ++ optional (!python.is_py3k or false) subunit;
 
-    doCheck = !isPy27;
+    # https://github.com/zopefoundation/zope.testrunner/issues/35
+    doCheck = !(isPy27 || isPy34);
 
     meta = {
       description = "A flexible test runner with layer support";

From 2670f9577d4cf2d0273aec6655b20457e44d1a22 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 8 Feb 2016 21:29:40 +0100
Subject: [PATCH 1161/2285] pythonPackages.blaze: 0.9.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 55e36cbe71e9..5010dafac840 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2037,11 +2037,11 @@ in modules // {
 
   blaze = buildPythonPackage rec {
     name = "blaze-${version}";
-    version = "0.9.0";
+    version = "0.9.1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/b/blaze/${name}.tar.gz";
-      sha256 = "07h284n6fr0lvy58a6lvwwfb45sy7lggllx2y2vzzs4xrvf5k1i7";
+      sha256 = "fde4fd5733d8574345521581078a4fd89bb51ad3814eda88f1f467faa3a9784a";
     };
 
     buildInputs = with self; [ pytest ];

From 4d4b9131ea284eeed330740aa9c2873bed3cd061 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 8 Feb 2016 21:29:53 +0100
Subject: [PATCH 1162/2285] pythonPackages.datashape: 0.5.0 -> 0.5.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 5010dafac840..70aafa5eba28 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4202,11 +4202,11 @@ in modules // {
 
   datashape = buildPythonPackage rec {
     name = "datashape-${version}";
-    version = "0.5.0";
+    version = "0.5.1";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/D/DataShape/${name}.tar.gz";
-      sha256 = "13w0rfaqpqkh30bxmx7i7kjfrfkm5maa35gj3c464wah7i2zm9wp";
+      sha256 = "21c424f11604873da9a36d4c55ef1d15cc3960cd208d7828b82315c494bff96a";
     };
 
     buildInputs = with self; [ pytest mock ];

From 3426f36816073af65d170d9ae04b099c3a7b0d3f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 8 Feb 2016 21:30:09 +0100
Subject: [PATCH 1163/2285] pythonPackages.ipyparallel: 4.1.1 -> 5.0.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 70aafa5eba28..779d166ccc22 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9952,17 +9952,18 @@ in modules // {
   };
 
   ipyparallel = buildPythonPackage rec {
-    version = "4.1.0";
+    version = "5.0.0";
     name = "ipyparallel-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/i/ipyparallel/${name}.tar.gz";
-      sha256 = "c943f6b3bbabb9332336d15474969e2a7a73d5b583f9786f7b357c75e4b1709a";
+      sha256 = "ffa7e2e29fdc4844b3c1721f46b42eee5a1abe5cbb851ccf79d0f4f89b9fe21a";
     };
 
     buildInputs = with self; [ nose ];
 
-    propagatedBuildInputs = with self; [ipython_genutils decorator pyzmq ipython jupyter_client ipykernel];
+    propagatedBuildInputs = with self; [ipython_genutils decorator pyzmq ipython jupyter_client ipykernel tornado
+    ] ++ optionals (!isPy3k) [ futures ];
 
     # Requires access to cluster
     doCheck = false;

From 4c79c23a0dabd3f11823de3a1e994071fc6408c3 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 8 Feb 2016 21:30:20 +0100
Subject: [PATCH 1164/2285] pythonPackages.odo: 0.4.0 -> 0.4.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 779d166ccc22..135b23c7233f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12745,11 +12745,11 @@ in modules // {
 
   odo = buildPythonPackage rec {
     name = "odo-${version}";
-    version= "0.4.0";
+    version= "0.4.2";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/o/odo/${name}.tar.gz";
-      sha256 = "0xqm4zb7a7a2cbik9kn6yk0kr26n90iqj102h5wb42x6z5v4mn79";
+      sha256 = "f793df8b212994ea23ce34e90e2048d0237d3b95ecd066ef2cfbb1c2384b79e9";
     };
 
     buildInputs = with self; [ pytest ];

From 2d2cda28748d29aaf104fc66ed41b30b6d4b63f1 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 8 Feb 2016 21:30:40 +0100
Subject: [PATCH 1165/2285] pythonPackages.pyzmq: fix tests i686

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 135b23c7233f..0c12f362b256 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22499,8 +22499,11 @@ in modules // {
     };
     buildInputs = with self; [ pkgs.zeromq3 pytest tornado ];
     propagatedBuildInputs = [ self.py ];
+
+    # Disable broken test
+    # https://github.com/zeromq/pyzmq/issues/799
     checkPhase = ''
-      py.test $out/${python.sitePackages}/zmq/
+      py.test $out/${python.sitePackages}/zmq/ -k "not test_large_send"
     '';
   };
 

From 2ebc0350aae7d3ca53e139042fc145a61fc04194 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 8 Feb 2016 21:35:07 +0100
Subject: [PATCH 1166/2285] pythonPackages.caldavclientlibrary-asynk: disable
 py3k

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0c12f362b256..43202f15a019 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1608,6 +1608,8 @@ in modules // {
       sha256 = "1i6is7lv4v9by4panrd9w63m4xsmhwlp3rq4jjj3azwg5jm10940";
     };
 
+    disabled = isPy3k;
+
     meta = {
       description = "A Python library and tool for CalDAV";
 

From f7622389e1b754382d6b687c4676ead00e247ba2 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Mon, 8 Feb 2016 21:53:45 +0100
Subject: [PATCH 1167/2285] pythonPackages.et_xmlfile: fix tests

---
 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 43202f15a019..007a25c858bb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8367,6 +8367,11 @@ in modules // {
       sha256="0nrkhcb6jdrlb6pwkvd4rycw34y3s931hjf409ij9xkjsli9fkb1";
     };
 
+    buildInputs = with self; [ lxml pytest ];
+    checkPhase = ''
+      py.test $out
+    '';
+
     meta = {
       description = "An implementation of lxml.xmlfile for the standard library";
       longDescription = ''

From 93d5f26a0d9d73280759e58777f6c3ce6cc6243c Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 8 Feb 2016 17:20:25 +0000
Subject: [PATCH 1168/2285] sublime3: 3101 -> 3103

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

diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix
index 6d0374d042fa..ad9fc056757f 100644
--- a/pkgs/applications/editors/sublime3/default.nix
+++ b/pkgs/applications/editors/sublime3/default.nix
@@ -6,7 +6,7 @@ assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux";
 assert gksuSupport -> gksu != null;
 
 let
-  build = "3101";
+  build = "3103";
   libPath = stdenv.lib.makeLibraryPath [glib xorg.libX11 gtk cairo pango];
   redirects = [ "/usr/bin/pkexec=${pkexecPath}" ]
     ++ stdenv.lib.optional gksuSupport "/usr/bin/gksudo=${gksu}/bin/gksudo";
@@ -20,13 +20,13 @@ in let
         fetchurl {
           name = "sublimetext-${build}.tar.bz2";
           url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x32.tar.bz2";
-          sha256 = "1klssh79mxm7i6r77p9a6a1rqzssnkv5y4k37bnxv8bilwqhfrcz";
+          sha256 = "1qidnczndyhyp9rfzmpqah00lrx7z1a0fy7a13lzwqq3gslhwf1l";
         }
       else
         fetchurl {
           name = "sublimetext-${build}.tar.bz2";
           url = "https://download.sublimetext.com/sublime_text_3_build_${build}_x64.tar.bz2";
-          sha256 = "0yrhn2mc5f2y4cy2ydya4h97bij0cm51yd4q06l6yjshl6qyc2db";
+          sha256 = "1x8kb3prs6wa5s5rj0gfq96zx6k5q3s168yhfsa36x2szi6x6y4x";
         };
 
     dontStrip = true;

From 55b7f03e3bf5986241655894288b7980000fb6c1 Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Wed, 3 Feb 2016 11:05:58 +0100
Subject: [PATCH 1169/2285] marathon: 0.14.1 -> 0.15.1

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

diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix
index 8f3437644457..ac666030897b 100644
--- a/pkgs/applications/networking/cluster/marathon/default.nix
+++ b/pkgs/applications/networking/cluster/marathon/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "marathon-${version}";
-  version = "0.14.1";
+  version = "0.15.1";
 
   src = fetchurl {
     url = "https://downloads.mesosphere.io/marathon/v${version}/marathon-${version}.tgz";
-    sha256 = "0vdl7jf7yhb985dj3v46qnqjv1zwfkyizlsyf9c5dq7khvxrp1l4";
+    sha256 = "1ch3nvcwj7pzjjqw4k07gdf7nmdbfkks5j07wl3518bagjqrajj2";
   };
 
   buildInputs = [ makeWrapper jdk mesos ];

From 23b747e38a02d75158006f2b27dcdd525705cade Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Thu, 4 Feb 2016 16:56:30 +0100
Subject: [PATCH 1170/2285] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20151217-10-ga610b1b using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/45176e62cac5a125e2766103c6d584ba812da687
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/4eb768170375f9a545c38db20ce635b7291ece78
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/e7c362999942041130d6f66c30289bd6be0430a3
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/a84b3a147a5c0bbaa634f2623ad6e679f33751a1
---
 .../haskell-modules/configuration-lts-0.0.nix |   22 +
 .../haskell-modules/configuration-lts-0.1.nix |   22 +
 .../haskell-modules/configuration-lts-0.2.nix |   22 +
 .../haskell-modules/configuration-lts-0.3.nix |   22 +
 .../haskell-modules/configuration-lts-0.4.nix |   22 +
 .../haskell-modules/configuration-lts-0.5.nix |   22 +
 .../haskell-modules/configuration-lts-0.6.nix |   22 +
 .../haskell-modules/configuration-lts-0.7.nix |   22 +
 .../haskell-modules/configuration-lts-1.0.nix |   22 +
 .../haskell-modules/configuration-lts-1.1.nix |   22 +
 .../configuration-lts-1.10.nix                |   22 +
 .../configuration-lts-1.11.nix                |   22 +
 .../configuration-lts-1.12.nix                |   22 +
 .../configuration-lts-1.13.nix                |   22 +
 .../configuration-lts-1.14.nix                |   22 +
 .../configuration-lts-1.15.nix                |   22 +
 .../haskell-modules/configuration-lts-1.2.nix |   22 +
 .../haskell-modules/configuration-lts-1.4.nix |   22 +
 .../haskell-modules/configuration-lts-1.5.nix |   22 +
 .../haskell-modules/configuration-lts-1.7.nix |   22 +
 .../haskell-modules/configuration-lts-1.8.nix |   22 +
 .../haskell-modules/configuration-lts-1.9.nix |   22 +
 .../haskell-modules/configuration-lts-2.0.nix |   23 +
 .../haskell-modules/configuration-lts-2.1.nix |   23 +
 .../configuration-lts-2.10.nix                |   23 +
 .../configuration-lts-2.11.nix                |   23 +
 .../configuration-lts-2.12.nix                |   23 +
 .../configuration-lts-2.13.nix                |   23 +
 .../configuration-lts-2.14.nix                |   23 +
 .../configuration-lts-2.15.nix                |   23 +
 .../configuration-lts-2.16.nix                |   23 +
 .../configuration-lts-2.17.nix                |   23 +
 .../configuration-lts-2.18.nix                |   23 +
 .../configuration-lts-2.19.nix                |   23 +
 .../haskell-modules/configuration-lts-2.2.nix |   23 +
 .../configuration-lts-2.20.nix                |   23 +
 .../configuration-lts-2.21.nix                |   23 +
 .../configuration-lts-2.22.nix                |   23 +
 .../haskell-modules/configuration-lts-2.3.nix |   23 +
 .../haskell-modules/configuration-lts-2.4.nix |   23 +
 .../haskell-modules/configuration-lts-2.5.nix |   23 +
 .../haskell-modules/configuration-lts-2.6.nix |   23 +
 .../haskell-modules/configuration-lts-2.7.nix |   23 +
 .../haskell-modules/configuration-lts-2.8.nix |   23 +
 .../haskell-modules/configuration-lts-2.9.nix |   23 +
 .../haskell-modules/configuration-lts-3.0.nix |   23 +
 .../haskell-modules/configuration-lts-3.1.nix |   23 +
 .../configuration-lts-3.10.nix                |   25 +
 .../configuration-lts-3.11.nix                |   25 +
 .../configuration-lts-3.12.nix                |   25 +
 .../configuration-lts-3.13.nix                |   25 +
 .../configuration-lts-3.14.nix                |   25 +
 .../configuration-lts-3.15.nix                |   25 +
 .../configuration-lts-3.16.nix                |   26 +
 .../configuration-lts-3.17.nix                |   26 +
 .../configuration-lts-3.18.nix                |   26 +
 .../configuration-lts-3.19.nix                |   26 +
 .../haskell-modules/configuration-lts-3.2.nix |   23 +
 .../configuration-lts-3.20.nix                |   26 +
 .../configuration-lts-3.21.nix                |   26 +
 .../configuration-lts-3.22.nix                |   26 +
 .../haskell-modules/configuration-lts-3.3.nix |   24 +
 .../haskell-modules/configuration-lts-3.4.nix |   24 +
 .../haskell-modules/configuration-lts-3.5.nix |   24 +
 .../haskell-modules/configuration-lts-3.6.nix |   24 +
 .../haskell-modules/configuration-lts-3.7.nix |   25 +
 .../haskell-modules/configuration-lts-3.8.nix |   25 +
 .../haskell-modules/configuration-lts-3.9.nix |   25 +
 .../haskell-modules/configuration-lts-4.0.nix |   31 +
 .../haskell-modules/configuration-lts-4.1.nix |   31 +
 .../haskell-modules/configuration-lts-4.2.nix |   33 +
 .../haskell-modules/configuration-lts-5.0.nix |   37 +
 .../haskell-modules/configuration-lts-5.1.nix |   39 +
 .../haskell-modules/configuration-lts-5.2.nix | 7646 +++++++++++++++++
 .../haskell-modules/hackage-packages.nix      | 1547 +++-
 75 files changed, 10662 insertions(+), 287 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/configuration-lts-5.2.nix

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index 5901106668cd..4dc205d8973d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -634,6 +634,7 @@ self: super: {
   "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";
@@ -908,6 +909,7 @@ self: super: {
   "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";
@@ -1782,6 +1784,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1887,6 +1890,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_5";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2479,6 +2483,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3194,6 +3204,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3753,6 +3764,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3893,6 +3905,7 @@ self: super: {
   "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";
@@ -4158,6 +4171,7 @@ self: super: {
   "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";
@@ -5092,6 +5106,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5224,11 +5239,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5658,6 +5675,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6582,6 +6600,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6887,6 +6906,7 @@ self: super: {
   "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";
@@ -8410,6 +8430,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -9045,6 +9066,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index d28644edfbc0..6cc26a6686e3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -634,6 +634,7 @@ self: super: {
   "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";
@@ -908,6 +909,7 @@ self: super: {
   "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";
@@ -1782,6 +1784,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1887,6 +1890,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_5";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2479,6 +2483,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3194,6 +3204,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3753,6 +3764,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3893,6 +3905,7 @@ self: super: {
   "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";
@@ -4158,6 +4171,7 @@ self: super: {
   "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";
@@ -5092,6 +5106,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5224,11 +5239,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5658,6 +5675,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6582,6 +6600,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6887,6 +6906,7 @@ self: super: {
   "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";
@@ -8410,6 +8430,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -9045,6 +9066,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index b67eba2b841c..063b2a48a5d1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -634,6 +634,7 @@ self: super: {
   "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";
@@ -908,6 +909,7 @@ self: super: {
   "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";
@@ -1782,6 +1784,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1887,6 +1890,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_5";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2479,6 +2483,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3194,6 +3204,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3753,6 +3764,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3893,6 +3905,7 @@ self: super: {
   "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";
@@ -4158,6 +4171,7 @@ self: super: {
   "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";
@@ -5092,6 +5106,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5224,11 +5239,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5658,6 +5675,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6582,6 +6600,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6887,6 +6906,7 @@ self: super: {
   "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";
@@ -8410,6 +8430,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -9045,6 +9066,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index 959df8523b86..17c987efd933 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -634,6 +634,7 @@ self: super: {
   "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";
@@ -908,6 +909,7 @@ self: super: {
   "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";
@@ -1782,6 +1784,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1887,6 +1890,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_5";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2479,6 +2483,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3194,6 +3204,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3753,6 +3764,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3893,6 +3905,7 @@ self: super: {
   "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";
@@ -4158,6 +4171,7 @@ self: super: {
   "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";
@@ -5092,6 +5106,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5224,11 +5239,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5658,6 +5675,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6582,6 +6600,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6887,6 +6906,7 @@ self: super: {
   "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";
@@ -8410,6 +8430,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -9045,6 +9066,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index 2a92a40d2e3d..c430217eb7e1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -634,6 +634,7 @@ self: super: {
   "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";
@@ -908,6 +909,7 @@ self: super: {
   "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";
@@ -1782,6 +1784,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1887,6 +1890,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_6";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2479,6 +2483,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3193,6 +3203,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3752,6 +3763,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3890,6 +3902,7 @@ self: super: {
   "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";
@@ -4155,6 +4168,7 @@ self: super: {
   "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";
@@ -5089,6 +5103,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5221,11 +5236,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5655,6 +5672,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6579,6 +6597,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6884,6 +6903,7 @@ self: super: {
   "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";
@@ -8406,6 +8426,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -9041,6 +9062,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index c079cffeaa41..8d76c7cfdd73 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -634,6 +634,7 @@ self: super: {
   "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";
@@ -908,6 +909,7 @@ self: super: {
   "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";
@@ -1782,6 +1784,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1887,6 +1890,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_6";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2479,6 +2483,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3193,6 +3203,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3752,6 +3763,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3890,6 +3902,7 @@ self: super: {
   "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";
@@ -4155,6 +4168,7 @@ self: super: {
   "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";
@@ -5089,6 +5103,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5221,11 +5236,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5655,6 +5672,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6579,6 +6597,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6884,6 +6903,7 @@ self: super: {
   "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";
@@ -8406,6 +8426,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -9041,6 +9062,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index db707caa1e89..c52414a8319a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -634,6 +634,7 @@ self: super: {
   "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";
@@ -907,6 +908,7 @@ self: super: {
   "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";
@@ -1781,6 +1783,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1886,6 +1889,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_6";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2478,6 +2482,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3192,6 +3202,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3751,6 +3762,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3889,6 +3901,7 @@ self: super: {
   "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";
@@ -4153,6 +4166,7 @@ self: super: {
   "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";
@@ -5087,6 +5101,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5219,11 +5234,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5653,6 +5670,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6576,6 +6594,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6881,6 +6900,7 @@ self: super: {
   "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";
@@ -8402,6 +8422,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -9034,6 +9055,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index 329df2fafed3..1c609caa978a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -634,6 +634,7 @@ self: super: {
   "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";
@@ -907,6 +908,7 @@ self: super: {
   "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";
@@ -1781,6 +1783,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1886,6 +1889,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_6";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2478,6 +2482,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3192,6 +3202,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3751,6 +3762,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3889,6 +3901,7 @@ self: super: {
   "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";
@@ -4153,6 +4166,7 @@ self: super: {
   "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";
@@ -5087,6 +5101,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5219,11 +5234,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5653,6 +5670,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6576,6 +6594,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6881,6 +6900,7 @@ self: super: {
   "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";
@@ -8402,6 +8422,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -9034,6 +9055,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index 76d3d874634a..98cab9aaae08 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -631,6 +631,7 @@ self: super: {
   "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";
@@ -904,6 +905,7 @@ self: super: {
   "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";
@@ -1776,6 +1778,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1879,6 +1882,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_7";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2470,6 +2474,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3183,6 +3193,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3741,6 +3752,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3879,6 +3891,7 @@ self: super: {
   "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";
@@ -4144,6 +4157,7 @@ self: super: {
   "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";
@@ -5076,6 +5090,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5208,11 +5223,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5642,6 +5659,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6565,6 +6583,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6870,6 +6889,7 @@ self: super: {
   "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";
@@ -8388,6 +8408,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -9020,6 +9041,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index 6c71b070a0f7..45096136b7d5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -631,6 +631,7 @@ self: super: {
   "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";
@@ -904,6 +905,7 @@ self: super: {
   "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";
@@ -1776,6 +1778,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1878,6 +1881,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2468,6 +2472,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3180,6 +3190,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3738,6 +3749,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3876,6 +3888,7 @@ self: super: {
   "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";
@@ -4140,6 +4153,7 @@ self: super: {
   "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";
@@ -5070,6 +5084,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5202,11 +5217,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5636,6 +5653,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6558,6 +6576,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6863,6 +6882,7 @@ self: super: {
   "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";
@@ -8376,6 +8396,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -9007,6 +9028,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index bd2523938684..c569da0fce66 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -630,6 +630,7 @@ self: super: {
   "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";
@@ -903,6 +904,7 @@ self: super: {
   "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";
@@ -1775,6 +1777,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1876,6 +1879,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2464,6 +2468,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3173,6 +3183,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3729,6 +3740,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3866,6 +3878,7 @@ self: super: {
   "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";
@@ -4129,6 +4142,7 @@ self: super: {
   "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";
@@ -5054,6 +5068,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5186,11 +5201,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5619,6 +5636,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6538,6 +6556,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6842,6 +6861,7 @@ self: super: {
   "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";
@@ -8349,6 +8369,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8977,6 +8998,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index 3ece9fed9a06..3cb13aa16965 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -630,6 +630,7 @@ self: super: {
   "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";
@@ -903,6 +904,7 @@ self: super: {
   "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";
@@ -1775,6 +1777,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1876,6 +1879,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2464,6 +2468,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3172,6 +3182,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3728,6 +3739,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3865,6 +3877,7 @@ self: super: {
   "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";
@@ -4128,6 +4141,7 @@ self: super: {
   "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";
@@ -5051,6 +5065,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5183,11 +5198,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5615,6 +5632,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6534,6 +6552,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6838,6 +6857,7 @@ self: super: {
   "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";
@@ -8345,6 +8365,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8973,6 +8994,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 5ba87607ad21..621806b6fb88 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -630,6 +630,7 @@ self: super: {
   "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";
@@ -903,6 +904,7 @@ self: super: {
   "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";
@@ -1775,6 +1777,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1876,6 +1879,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2464,6 +2468,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3172,6 +3182,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3728,6 +3739,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3865,6 +3877,7 @@ self: super: {
   "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";
@@ -4128,6 +4141,7 @@ self: super: {
   "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";
@@ -5050,6 +5064,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5182,11 +5197,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5614,6 +5631,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6533,6 +6551,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6837,6 +6856,7 @@ self: super: {
   "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";
@@ -8343,6 +8363,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8971,6 +8992,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index dbaccd55b175..652e60c78d8b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -630,6 +630,7 @@ self: super: {
   "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";
@@ -903,6 +904,7 @@ self: super: {
   "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";
@@ -1775,6 +1777,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1876,6 +1879,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2464,6 +2468,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3172,6 +3182,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3728,6 +3739,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3864,6 +3876,7 @@ self: super: {
   "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";
@@ -4127,6 +4140,7 @@ self: super: {
   "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";
@@ -5049,6 +5063,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5181,11 +5196,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5613,6 +5630,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6532,6 +6550,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6836,6 +6855,7 @@ self: super: {
   "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";
@@ -8341,6 +8361,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8969,6 +8990,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index beeae2259aab..e89537089f38 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -629,6 +629,7 @@ self: super: {
   "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";
@@ -902,6 +903,7 @@ self: super: {
   "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";
@@ -1773,6 +1775,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1874,6 +1877,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2461,6 +2465,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3169,6 +3179,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3725,6 +3736,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3861,6 +3873,7 @@ self: super: {
   "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";
@@ -4124,6 +4137,7 @@ self: super: {
   "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";
@@ -5045,6 +5059,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5176,11 +5191,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5608,6 +5625,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6526,6 +6544,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6829,6 +6848,7 @@ self: super: {
   "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";
@@ -8334,6 +8354,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8962,6 +8983,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index 6bad1e1a7c20..288a2bf2d4e0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -629,6 +629,7 @@ self: super: {
   "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";
@@ -901,6 +902,7 @@ self: super: {
   "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";
@@ -1772,6 +1774,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1873,6 +1876,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2458,6 +2462,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3165,6 +3175,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3721,6 +3732,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3857,6 +3869,7 @@ self: super: {
   "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";
@@ -4120,6 +4133,7 @@ self: super: {
   "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";
@@ -5041,6 +5055,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5172,11 +5187,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5604,6 +5621,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6520,6 +6538,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6822,6 +6841,7 @@ self: super: {
   "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";
@@ -8325,6 +8345,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8952,6 +8973,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index b1bc7909b296..75b907a56050 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -631,6 +631,7 @@ self: super: {
   "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";
@@ -904,6 +905,7 @@ self: super: {
   "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";
@@ -1776,6 +1778,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1878,6 +1881,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2466,6 +2470,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3178,6 +3188,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3735,6 +3746,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3873,6 +3885,7 @@ self: super: {
   "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";
@@ -4137,6 +4150,7 @@ self: super: {
   "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";
@@ -5067,6 +5081,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5199,11 +5214,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5633,6 +5650,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6554,6 +6572,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6858,6 +6877,7 @@ self: super: {
   "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";
@@ -8370,6 +8390,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -9001,6 +9022,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index 3a5e684b9965..987cbdd2454a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -630,6 +630,7 @@ self: super: {
   "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";
@@ -903,6 +904,7 @@ self: super: {
   "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";
@@ -1775,6 +1777,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1877,6 +1880,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2465,6 +2469,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3176,6 +3186,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3733,6 +3744,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3871,6 +3883,7 @@ self: super: {
   "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";
@@ -4134,6 +4147,7 @@ self: super: {
   "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";
@@ -5064,6 +5078,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5196,11 +5211,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5630,6 +5647,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6550,6 +6568,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6854,6 +6873,7 @@ self: super: {
   "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";
@@ -8365,6 +8385,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8996,6 +9017,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index e76d058500ef..c3ea5f923c05 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -630,6 +630,7 @@ self: super: {
   "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";
@@ -903,6 +904,7 @@ self: super: {
   "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";
@@ -1775,6 +1777,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1876,6 +1879,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2464,6 +2468,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3175,6 +3185,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3732,6 +3743,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3870,6 +3882,7 @@ self: super: {
   "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";
@@ -4133,6 +4146,7 @@ self: super: {
   "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";
@@ -5063,6 +5077,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5195,11 +5210,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5629,6 +5646,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6549,6 +6567,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6853,6 +6872,7 @@ self: super: {
   "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";
@@ -8363,6 +8383,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8993,6 +9014,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index 067ffa3fad54..fbd3969eaf96 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -630,6 +630,7 @@ self: super: {
   "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";
@@ -903,6 +904,7 @@ self: super: {
   "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";
@@ -1775,6 +1777,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1876,6 +1879,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2464,6 +2468,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3175,6 +3185,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3732,6 +3743,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3870,6 +3882,7 @@ self: super: {
   "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";
@@ -4133,6 +4146,7 @@ self: super: {
   "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";
@@ -5058,6 +5072,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5190,11 +5205,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5624,6 +5641,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6544,6 +6562,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6848,6 +6867,7 @@ self: super: {
   "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";
@@ -8358,6 +8378,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8988,6 +9009,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index a4128abdf384..c7c05da3ec4f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -630,6 +630,7 @@ self: super: {
   "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";
@@ -903,6 +904,7 @@ self: super: {
   "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";
@@ -1775,6 +1777,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1876,6 +1879,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2464,6 +2468,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3173,6 +3183,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3730,6 +3741,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3867,6 +3879,7 @@ self: super: {
   "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";
@@ -4130,6 +4143,7 @@ self: super: {
   "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";
@@ -5055,6 +5069,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5187,11 +5202,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5620,6 +5637,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6540,6 +6558,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6844,6 +6863,7 @@ self: super: {
   "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";
@@ -8353,6 +8373,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8983,6 +9004,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index c44591b3c019..56a7a77807dc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -630,6 +630,7 @@ self: super: {
   "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";
@@ -903,6 +904,7 @@ self: super: {
   "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";
@@ -1775,6 +1777,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1876,6 +1879,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2464,6 +2468,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3173,6 +3183,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3729,6 +3740,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3866,6 +3878,7 @@ self: super: {
   "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";
@@ -4129,6 +4142,7 @@ self: super: {
   "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";
@@ -5054,6 +5068,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5186,11 +5201,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5619,6 +5636,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6539,6 +6557,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6843,6 +6862,7 @@ self: super: {
   "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";
@@ -8352,6 +8372,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8982,6 +9003,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 40414cce15bb..2f8fcbf8bb47 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -625,6 +625,7 @@ self: super: {
   "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";
@@ -895,6 +896,7 @@ self: super: {
   "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";
@@ -1761,6 +1763,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1862,6 +1865,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2443,6 +2447,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3151,6 +3161,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3668,6 +3679,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3701,6 +3713,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3837,6 +3850,7 @@ self: super: {
   "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";
@@ -4100,6 +4114,7 @@ self: super: {
   "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";
@@ -5009,6 +5024,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5138,11 +5154,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5565,6 +5583,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6467,6 +6486,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6770,6 +6790,7 @@ self: super: {
   "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";
@@ -8264,6 +8285,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8885,6 +8907,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 874eb71abfdb..3df16eb26172 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -625,6 +625,7 @@ self: super: {
   "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";
@@ -895,6 +896,7 @@ self: super: {
   "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";
@@ -1761,6 +1763,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1861,6 +1864,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2442,6 +2446,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3150,6 +3160,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3667,6 +3678,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3700,6 +3712,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3836,6 +3849,7 @@ self: super: {
   "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";
@@ -4099,6 +4113,7 @@ self: super: {
   "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";
@@ -5008,6 +5023,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5137,11 +5153,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5564,6 +5582,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6466,6 +6485,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6769,6 +6789,7 @@ self: super: {
   "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";
@@ -8263,6 +8284,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8883,6 +8905,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index d803e816665d..0d6f60e04f69 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -624,6 +624,7 @@ self: super: {
   "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";
@@ -892,6 +893,7 @@ self: super: {
   "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";
@@ -1752,6 +1754,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1850,6 +1853,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2428,6 +2432,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3131,6 +3141,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3648,6 +3659,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3681,6 +3693,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3815,6 +3828,7 @@ self: super: {
   "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";
@@ -4078,6 +4092,7 @@ self: super: {
   "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";
@@ -4981,6 +4996,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5110,11 +5126,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5531,6 +5549,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6428,6 +6447,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6730,6 +6750,7 @@ self: super: {
   "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";
@@ -8212,6 +8233,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8829,6 +8851,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 5f9110846dee..1882dbd6a088 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -624,6 +624,7 @@ self: super: {
   "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";
@@ -892,6 +893,7 @@ self: super: {
   "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";
@@ -1751,6 +1753,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1849,6 +1852,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2427,6 +2431,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3130,6 +3140,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3646,6 +3657,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3679,6 +3691,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3813,6 +3826,7 @@ self: super: {
   "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";
@@ -4076,6 +4090,7 @@ self: super: {
   "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";
@@ -4977,6 +4992,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5106,11 +5122,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5527,6 +5545,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6422,6 +6441,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6724,6 +6744,7 @@ self: super: {
   "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";
@@ -8203,6 +8224,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8820,6 +8842,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 17c44fb89359..b731ee685637 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -624,6 +624,7 @@ self: super: {
   "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";
@@ -892,6 +893,7 @@ self: super: {
   "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";
@@ -1751,6 +1753,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1849,6 +1852,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2427,6 +2431,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3130,6 +3140,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3646,6 +3657,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3679,6 +3691,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3813,6 +3826,7 @@ self: super: {
   "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";
@@ -4076,6 +4090,7 @@ self: super: {
   "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";
@@ -4977,6 +4992,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5106,11 +5122,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5527,6 +5545,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6422,6 +6441,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6724,6 +6744,7 @@ self: super: {
   "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";
@@ -8202,6 +8223,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8819,6 +8841,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index 0cd601e7da67..db5547dc9ef5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -624,6 +624,7 @@ self: super: {
   "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";
@@ -892,6 +893,7 @@ self: super: {
   "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";
@@ -1751,6 +1753,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1849,6 +1852,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2427,6 +2431,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3130,6 +3140,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3646,6 +3657,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3679,6 +3691,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3812,6 +3825,7 @@ self: super: {
   "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";
@@ -4075,6 +4089,7 @@ self: super: {
   "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";
@@ -4975,6 +4990,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5104,11 +5120,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5525,6 +5543,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6420,6 +6439,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6722,6 +6742,7 @@ self: super: {
   "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";
@@ -8200,6 +8221,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8817,6 +8839,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 20e2c95adc3e..0b500291fcfb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -624,6 +624,7 @@ self: super: {
   "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";
@@ -892,6 +893,7 @@ self: super: {
   "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";
@@ -1750,6 +1752,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1848,6 +1851,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2426,6 +2430,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3128,6 +3138,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3644,6 +3655,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3677,6 +3689,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3810,6 +3823,7 @@ self: super: {
   "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";
@@ -4073,6 +4087,7 @@ self: super: {
   "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";
@@ -4972,6 +4987,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5101,11 +5117,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5522,6 +5540,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6417,6 +6436,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6719,6 +6739,7 @@ self: super: {
   "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";
@@ -8196,6 +8217,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8811,6 +8833,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index f218d7a8e6ef..f8c70e4bae83 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -624,6 +624,7 @@ self: super: {
   "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";
@@ -892,6 +893,7 @@ self: super: {
   "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";
@@ -1750,6 +1752,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1848,6 +1851,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2426,6 +2430,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3127,6 +3137,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3643,6 +3654,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3676,6 +3688,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3809,6 +3822,7 @@ self: super: {
   "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";
@@ -4072,6 +4086,7 @@ self: super: {
   "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";
@@ -4971,6 +4986,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5100,11 +5116,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5521,6 +5539,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6413,6 +6432,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6715,6 +6735,7 @@ self: super: {
   "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";
@@ -8191,6 +8212,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8805,6 +8827,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index 8dd4c6d76b2a..af59ccac5127 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -623,6 +623,7 @@ self: super: {
   "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";
@@ -891,6 +892,7 @@ self: super: {
   "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";
@@ -1749,6 +1751,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1847,6 +1850,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2423,6 +2427,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3122,6 +3132,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3638,6 +3649,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3671,6 +3683,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3804,6 +3817,7 @@ self: super: {
   "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";
@@ -4067,6 +4081,7 @@ self: super: {
   "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";
@@ -4966,6 +4981,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5095,11 +5111,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5515,6 +5533,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6407,6 +6426,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6709,6 +6729,7 @@ self: super: {
   "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";
@@ -8185,6 +8206,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8798,6 +8820,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index 682e54704f87..bdce43f45332 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -623,6 +623,7 @@ self: super: {
   "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";
@@ -891,6 +892,7 @@ self: super: {
   "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";
@@ -1747,6 +1749,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1845,6 +1848,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2421,6 +2425,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3118,6 +3128,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3633,6 +3644,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3666,6 +3678,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3799,6 +3812,7 @@ self: super: {
   "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";
@@ -4062,6 +4076,7 @@ self: super: {
   "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";
@@ -4961,6 +4976,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5090,11 +5106,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5510,6 +5528,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6401,6 +6420,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6703,6 +6723,7 @@ self: super: {
   "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";
@@ -8179,6 +8200,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8792,6 +8814,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index c3e55226d4c6..a8b13abbac89 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -623,6 +623,7 @@ self: super: {
   "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";
@@ -891,6 +892,7 @@ self: super: {
   "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";
@@ -1747,6 +1749,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1844,6 +1847,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2420,6 +2424,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3116,6 +3126,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3631,6 +3642,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3664,6 +3676,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3797,6 +3810,7 @@ self: super: {
   "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";
@@ -4060,6 +4074,7 @@ self: super: {
   "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";
@@ -4958,6 +4973,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5087,11 +5103,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5507,6 +5525,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6396,6 +6415,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6698,6 +6718,7 @@ self: super: {
   "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";
@@ -8173,6 +8194,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8785,6 +8807,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index 5dac9460466f..7f018681924b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -623,6 +623,7 @@ self: super: {
   "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";
@@ -891,6 +892,7 @@ self: super: {
   "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";
@@ -1747,6 +1749,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1844,6 +1847,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2420,6 +2424,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3116,6 +3126,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3630,6 +3641,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3663,6 +3675,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3796,6 +3809,7 @@ self: super: {
   "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";
@@ -4059,6 +4073,7 @@ self: super: {
   "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";
@@ -4957,6 +4972,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5086,11 +5102,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5505,6 +5523,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6394,6 +6413,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6696,6 +6716,7 @@ self: super: {
   "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";
@@ -8169,6 +8190,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8780,6 +8802,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index 66263036f4e5..c2aa4a3421ba 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -625,6 +625,7 @@ self: super: {
   "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";
@@ -894,6 +895,7 @@ self: super: {
   "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";
@@ -1760,6 +1762,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1858,6 +1861,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2439,6 +2443,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3147,6 +3157,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3664,6 +3675,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3697,6 +3709,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3833,6 +3846,7 @@ self: super: {
   "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";
@@ -4096,6 +4110,7 @@ self: super: {
   "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";
@@ -5005,6 +5020,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5134,11 +5150,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5561,6 +5579,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6463,6 +6482,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6766,6 +6786,7 @@ self: super: {
   "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";
@@ -8260,6 +8281,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8879,6 +8901,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index fd2da300482e..f94aa3dd4a66 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -623,6 +623,7 @@ self: super: {
   "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";
@@ -891,6 +892,7 @@ self: super: {
   "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";
@@ -1747,6 +1749,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1844,6 +1847,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2419,6 +2423,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3115,6 +3125,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3629,6 +3640,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3662,6 +3674,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3795,6 +3808,7 @@ self: super: {
   "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";
@@ -4058,6 +4072,7 @@ self: super: {
   "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";
@@ -4956,6 +4971,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5085,11 +5101,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5504,6 +5522,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6392,6 +6411,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6694,6 +6714,7 @@ self: super: {
   "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";
@@ -8166,6 +8187,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8777,6 +8799,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index 51edfea016d2..404bb06d5970 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -623,6 +623,7 @@ self: super: {
   "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";
@@ -891,6 +892,7 @@ self: super: {
   "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";
@@ -1747,6 +1749,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1844,6 +1847,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2419,6 +2423,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3115,6 +3125,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3629,6 +3640,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3662,6 +3674,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3795,6 +3808,7 @@ self: super: {
   "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";
@@ -4058,6 +4072,7 @@ self: super: {
   "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";
@@ -4956,6 +4971,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5085,11 +5101,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5503,6 +5521,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6391,6 +6410,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6692,6 +6712,7 @@ self: super: {
   "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";
@@ -8164,6 +8185,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8772,6 +8794,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 9177bc699499..ae87d1cd488c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -623,6 +623,7 @@ self: super: {
   "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";
@@ -891,6 +892,7 @@ self: super: {
   "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";
@@ -1747,6 +1749,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1844,6 +1847,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2419,6 +2423,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3115,6 +3125,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3629,6 +3640,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3662,6 +3674,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3795,6 +3808,7 @@ self: super: {
   "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";
@@ -4058,6 +4072,7 @@ self: super: {
   "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";
@@ -4955,6 +4970,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5084,11 +5100,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5502,6 +5520,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6389,6 +6408,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6690,6 +6710,7 @@ self: super: {
   "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";
@@ -8162,6 +8183,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8770,6 +8792,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index 2aac605c9a40..8566604ebe3b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -625,6 +625,7 @@ self: super: {
   "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";
@@ -894,6 +895,7 @@ self: super: {
   "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";
@@ -1760,6 +1762,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1858,6 +1861,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2439,6 +2443,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3146,6 +3156,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3663,6 +3674,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3696,6 +3708,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3832,6 +3845,7 @@ self: super: {
   "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";
@@ -4095,6 +4109,7 @@ self: super: {
   "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";
@@ -5003,6 +5018,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5132,11 +5148,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5559,6 +5577,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6461,6 +6480,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6764,6 +6784,7 @@ self: super: {
   "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";
@@ -8258,6 +8279,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8877,6 +8899,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 530e2fe37051..9f910c810548 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -625,6 +625,7 @@ self: super: {
   "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";
@@ -894,6 +895,7 @@ self: super: {
   "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";
@@ -1759,6 +1761,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1857,6 +1860,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2438,6 +2442,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3145,6 +3155,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3662,6 +3673,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3695,6 +3707,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3831,6 +3844,7 @@ self: super: {
   "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";
@@ -4094,6 +4108,7 @@ self: super: {
   "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";
@@ -5002,6 +5017,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5131,11 +5147,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5557,6 +5575,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6457,6 +6476,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6760,6 +6780,7 @@ self: super: {
   "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";
@@ -8253,6 +8274,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8872,6 +8894,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index bba0619c2a89..7d5e081463d8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -625,6 +625,7 @@ self: super: {
   "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";
@@ -894,6 +895,7 @@ self: super: {
   "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";
@@ -1759,6 +1761,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1857,6 +1860,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2437,6 +2441,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3144,6 +3154,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3661,6 +3672,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3694,6 +3706,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3830,6 +3843,7 @@ self: super: {
   "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";
@@ -4093,6 +4107,7 @@ self: super: {
   "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";
@@ -5001,6 +5016,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5130,11 +5146,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5555,6 +5573,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6455,6 +6474,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6758,6 +6778,7 @@ self: super: {
   "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";
@@ -8251,6 +8272,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8870,6 +8892,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index 4a87fe9fbcda..a1607e9aeae7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -625,6 +625,7 @@ self: super: {
   "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";
@@ -894,6 +895,7 @@ self: super: {
   "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";
@@ -1756,6 +1758,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1854,6 +1857,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2434,6 +2438,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3141,6 +3151,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3658,6 +3669,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3691,6 +3703,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3825,6 +3838,7 @@ self: super: {
   "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";
@@ -4088,6 +4102,7 @@ self: super: {
   "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";
@@ -4996,6 +5011,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5125,11 +5141,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5550,6 +5568,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6449,6 +6468,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6752,6 +6772,7 @@ self: super: {
   "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";
@@ -8243,6 +8264,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8861,6 +8883,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index edf12e275824..123833c374d2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -624,6 +624,7 @@ self: super: {
   "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";
@@ -893,6 +894,7 @@ self: super: {
   "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";
@@ -1755,6 +1757,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1853,6 +1856,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_0_8";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2433,6 +2437,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3140,6 +3150,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3657,6 +3668,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3690,6 +3702,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3824,6 +3837,7 @@ self: super: {
   "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";
@@ -4087,6 +4101,7 @@ self: super: {
   "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";
@@ -4995,6 +5010,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5124,11 +5140,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5549,6 +5567,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6448,6 +6467,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6751,6 +6771,7 @@ self: super: {
   "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";
@@ -8242,6 +8263,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8860,6 +8882,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index d7c2beee04de..6c391312b272 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -624,6 +624,7 @@ self: super: {
   "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";
@@ -892,6 +893,7 @@ self: super: {
   "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";
@@ -1754,6 +1756,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1852,6 +1855,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2432,6 +2436,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3138,6 +3148,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3655,6 +3666,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3688,6 +3700,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3822,6 +3835,7 @@ self: super: {
   "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";
@@ -4085,6 +4099,7 @@ self: super: {
   "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";
@@ -4993,6 +5008,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5122,11 +5138,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5547,6 +5565,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6446,6 +6465,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6749,6 +6769,7 @@ self: super: {
   "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";
@@ -8236,6 +8257,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8854,6 +8876,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index b724cc74d06b..7722a893c0f4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -624,6 +624,7 @@ self: super: {
   "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";
@@ -892,6 +893,7 @@ self: super: {
   "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";
@@ -1752,6 +1754,7 @@ self: super: {
   "boolexpr" = dontDistribute super."boolexpr";
   "bools" = dontDistribute super."bools";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1850,6 +1853,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_18_1_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2429,6 +2433,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3133,6 +3143,7 @@ self: super: {
   "fixed-vector-hetero" = dontDistribute super."fixed-vector-hetero";
   "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";
@@ -3650,6 +3661,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3683,6 +3695,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3817,6 +3830,7 @@ self: super: {
   "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";
@@ -4080,6 +4094,7 @@ self: super: {
   "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";
@@ -4986,6 +5001,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -5115,11 +5131,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5538,6 +5556,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6436,6 +6455,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6739,6 +6759,7 @@ self: super: {
   "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";
@@ -8222,6 +8243,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8839,6 +8861,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index 266b64b08f24..de0f4fe5fa10 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -611,6 +611,7 @@ self: super: {
   "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";
@@ -872,6 +873,7 @@ self: super: {
   "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";
@@ -1695,6 +1697,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1786,6 +1789,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2353,6 +2357,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3023,6 +3033,7 @@ self: super: {
   "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";
@@ -3533,6 +3544,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3565,6 +3577,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3694,6 +3707,7 @@ self: super: {
   "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";
@@ -3955,6 +3969,7 @@ self: super: {
   "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";
@@ -4827,6 +4842,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4944,11 +4960,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5350,6 +5368,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6206,6 +6225,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6504,6 +6524,7 @@ self: super: {
   "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";
@@ -7945,6 +7966,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8535,6 +8557,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index 9a89efadc04b..d88256166b26 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -611,6 +611,7 @@ self: super: {
   "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";
@@ -872,6 +873,7 @@ self: super: {
   "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";
@@ -1694,6 +1696,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1785,6 +1788,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2352,6 +2356,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3020,6 +3030,7 @@ self: super: {
   "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";
@@ -3530,6 +3541,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3562,6 +3574,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3691,6 +3704,7 @@ self: super: {
   "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";
@@ -3952,6 +3966,7 @@ self: super: {
   "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";
@@ -4824,6 +4839,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4941,11 +4957,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5346,6 +5364,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6200,6 +6219,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6498,6 +6518,7 @@ self: super: {
   "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";
@@ -7938,6 +7959,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8527,6 +8549,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index b319d87396de..c3a43b75622d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -606,6 +606,7 @@ self: super: {
   "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";
@@ -866,6 +867,7 @@ self: super: {
   "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";
@@ -1678,6 +1680,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1769,6 +1772,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2332,6 +2336,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -2990,6 +3000,7 @@ self: super: {
   "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";
@@ -3495,6 +3506,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3527,6 +3539,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3656,6 +3669,7 @@ self: super: {
   "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";
@@ -3915,6 +3929,7 @@ self: super: {
   "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";
@@ -4074,6 +4089,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4780,6 +4796,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4894,11 +4911,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5296,6 +5315,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6138,6 +6158,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6287,6 +6308,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6427,6 +6449,7 @@ self: super: {
   "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";
@@ -7850,6 +7873,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8423,6 +8447,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index efa75da0139d..b529c0c648fe 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -606,6 +606,7 @@ self: super: {
   "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";
@@ -866,6 +867,7 @@ self: super: {
   "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";
@@ -1677,6 +1679,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1767,6 +1770,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2330,6 +2334,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -2987,6 +2997,7 @@ self: super: {
   "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";
@@ -3492,6 +3503,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3524,6 +3536,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3653,6 +3666,7 @@ self: super: {
   "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";
@@ -3912,6 +3926,7 @@ self: super: {
   "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";
@@ -4071,6 +4086,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4777,6 +4793,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4891,11 +4908,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5293,6 +5312,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6134,6 +6154,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6283,6 +6304,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6423,6 +6445,7 @@ self: super: {
   "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";
@@ -7845,6 +7868,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8418,6 +8442,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index 2baf81224cd7..b89fa70f8b46 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -605,6 +605,7 @@ self: super: {
   "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";
@@ -865,6 +866,7 @@ self: super: {
   "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";
@@ -1676,6 +1678,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1766,6 +1769,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2325,6 +2329,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -2982,6 +2992,7 @@ self: super: {
   "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";
@@ -3486,6 +3497,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3518,6 +3530,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3647,6 +3660,7 @@ self: super: {
   "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";
@@ -3906,6 +3920,7 @@ self: super: {
   "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";
@@ -4065,6 +4080,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4771,6 +4787,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4885,11 +4902,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5287,6 +5306,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6127,6 +6147,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6276,6 +6297,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6416,6 +6438,7 @@ self: super: {
   "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";
@@ -7836,6 +7859,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8408,6 +8432,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index 77646f89eff0..f6a631e11538 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -605,6 +605,7 @@ self: super: {
   "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";
@@ -865,6 +866,7 @@ self: super: {
   "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";
@@ -1676,6 +1678,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1766,6 +1769,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2325,6 +2329,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -2982,6 +2992,7 @@ self: super: {
   "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";
@@ -3486,6 +3497,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3518,6 +3530,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3647,6 +3660,7 @@ self: super: {
   "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";
@@ -3906,6 +3920,7 @@ self: super: {
   "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";
@@ -4064,6 +4079,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4770,6 +4786,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4884,11 +4901,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5285,6 +5304,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6124,6 +6144,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6273,6 +6294,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6413,6 +6435,7 @@ self: super: {
   "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";
@@ -7833,6 +7856,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8404,6 +8428,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index a797ab5ea2af..571045bdc8ff 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -605,6 +605,7 @@ self: super: {
   "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";
@@ -865,6 +866,7 @@ self: super: {
   "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";
@@ -1674,6 +1676,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1763,6 +1766,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2321,6 +2325,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -2975,6 +2985,7 @@ self: super: {
   "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";
@@ -3479,6 +3490,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3511,6 +3523,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3640,6 +3653,7 @@ self: super: {
   "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";
@@ -3899,6 +3913,7 @@ self: super: {
   "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";
@@ -4057,6 +4072,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4762,6 +4778,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4876,11 +4893,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5276,6 +5295,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6114,6 +6134,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6263,6 +6284,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6403,6 +6425,7 @@ self: super: {
   "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";
@@ -7823,6 +7846,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8392,6 +8416,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index d9c13c28eb0f..cde1bb303ff6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -605,6 +605,7 @@ self: super: {
   "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";
@@ -865,6 +866,7 @@ self: super: {
   "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";
@@ -1674,6 +1676,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1763,6 +1766,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2321,6 +2325,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -2975,6 +2985,7 @@ self: super: {
   "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";
@@ -3478,6 +3489,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3510,6 +3522,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3639,6 +3652,7 @@ self: super: {
   "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";
@@ -3897,6 +3911,7 @@ self: super: {
   "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";
@@ -4055,6 +4070,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4758,6 +4774,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4872,11 +4889,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5272,6 +5291,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6110,6 +6130,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6259,6 +6280,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6399,6 +6421,7 @@ self: super: {
   "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";
@@ -7818,6 +7841,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8387,6 +8411,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index 027669a0662a..d3c3eecf1eae 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -605,6 +605,7 @@ self: super: {
   "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";
@@ -864,6 +865,7 @@ self: super: {
   "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";
@@ -1437,6 +1439,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_16";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1672,6 +1675,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1761,6 +1765,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2319,6 +2324,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -2972,6 +2983,7 @@ self: super: {
   "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";
@@ -3475,6 +3487,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3507,6 +3520,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3635,6 +3649,7 @@ self: super: {
   "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";
@@ -3893,6 +3908,7 @@ self: super: {
   "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";
@@ -4051,6 +4067,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4754,6 +4771,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4868,11 +4886,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5266,6 +5286,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6103,6 +6124,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6251,6 +6273,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6391,6 +6414,7 @@ self: super: {
   "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";
@@ -7804,6 +7828,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8373,6 +8398,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index 39ffaa069b0b..2f0d9ece96b1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -605,6 +605,7 @@ self: super: {
   "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";
@@ -864,6 +865,7 @@ self: super: {
   "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";
@@ -1436,6 +1438,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_16";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1671,6 +1674,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1760,6 +1764,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2316,6 +2321,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -2969,6 +2980,7 @@ self: super: {
   "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";
@@ -3472,6 +3484,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3504,6 +3517,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3631,6 +3645,7 @@ self: super: {
   "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";
@@ -3889,6 +3904,7 @@ self: super: {
   "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";
@@ -4047,6 +4063,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4749,6 +4766,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4863,11 +4881,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5260,6 +5280,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6096,6 +6117,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6244,6 +6266,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6384,6 +6407,7 @@ self: super: {
   "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";
@@ -7797,6 +7821,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8364,6 +8389,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index c3e02f0b9a22..208ba6fedffb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -605,6 +605,7 @@ self: super: {
   "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";
@@ -864,6 +865,7 @@ self: super: {
   "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";
@@ -1436,6 +1438,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_16";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1671,6 +1674,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1760,6 +1764,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2315,6 +2320,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -2968,6 +2979,7 @@ self: super: {
   "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";
@@ -3469,6 +3481,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3501,6 +3514,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3627,6 +3641,7 @@ self: super: {
   "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";
@@ -3884,6 +3899,7 @@ self: super: {
   "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";
@@ -4041,6 +4057,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4740,6 +4757,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4854,11 +4872,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5251,6 +5271,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6086,6 +6107,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6232,6 +6254,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6372,6 +6395,7 @@ self: super: {
   "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";
@@ -7783,6 +7807,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8349,6 +8374,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index 2b667569026f..296a97f41c5a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -604,6 +604,7 @@ self: super: {
   "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";
@@ -863,6 +864,7 @@ self: super: {
   "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";
@@ -1433,6 +1435,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_16";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1668,6 +1671,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1755,6 +1759,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2309,6 +2314,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -2962,6 +2973,7 @@ self: super: {
   "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";
@@ -3463,6 +3475,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3495,6 +3508,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3621,6 +3635,7 @@ self: super: {
   "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";
@@ -3878,6 +3893,7 @@ self: super: {
   "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";
@@ -4035,6 +4051,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4731,6 +4748,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4844,11 +4862,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5240,6 +5260,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6072,6 +6093,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6218,6 +6240,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6358,6 +6381,7 @@ self: super: {
   "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";
@@ -7768,6 +7792,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8333,6 +8358,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index 42808be6db23..c44009d33c0f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -609,6 +609,7 @@ self: super: {
   "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";
@@ -870,6 +871,7 @@ self: super: {
   "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";
@@ -1691,6 +1693,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1782,6 +1785,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2349,6 +2353,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3016,6 +3026,7 @@ self: super: {
   "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";
@@ -3525,6 +3536,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3557,6 +3569,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3686,6 +3699,7 @@ self: super: {
   "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";
@@ -3947,6 +3961,7 @@ self: super: {
   "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";
@@ -4819,6 +4834,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4935,11 +4951,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5339,6 +5357,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6192,6 +6211,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6489,6 +6509,7 @@ self: super: {
   "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";
@@ -7926,6 +7947,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8514,6 +8536,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index a442cad84614..32cd18e64e3e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -603,6 +603,7 @@ self: super: {
   "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";
@@ -862,6 +863,7 @@ self: super: {
   "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";
@@ -1431,6 +1433,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_16";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1666,6 +1669,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1753,6 +1757,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_7_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2307,6 +2312,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -2960,6 +2971,7 @@ self: super: {
   "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";
@@ -3461,6 +3473,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3493,6 +3506,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3619,6 +3633,7 @@ self: super: {
   "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";
@@ -3876,6 +3891,7 @@ self: super: {
   "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";
@@ -4033,6 +4049,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4729,6 +4746,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4842,11 +4860,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5237,6 +5257,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6068,6 +6089,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6214,6 +6236,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6354,6 +6377,7 @@ self: super: {
   "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";
@@ -7761,6 +7785,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8325,6 +8350,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index c5bb78d3e59b..d1ff009a56a3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -603,6 +603,7 @@ self: super: {
   "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";
@@ -862,6 +863,7 @@ self: super: {
   "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";
@@ -1431,6 +1433,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_16";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1665,6 +1668,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1752,6 +1756,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_7_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2304,6 +2309,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -2955,6 +2966,7 @@ self: super: {
   "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";
@@ -3456,6 +3468,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3488,6 +3501,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3614,6 +3628,7 @@ self: super: {
   "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";
@@ -3870,6 +3885,7 @@ self: super: {
   "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";
@@ -4027,6 +4043,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4721,6 +4738,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4834,11 +4852,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5229,6 +5249,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6057,6 +6078,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6203,6 +6225,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6343,6 +6366,7 @@ self: super: {
   "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";
@@ -7737,6 +7761,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8296,6 +8321,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
index 3d3eff509fa2..b4f37b347aaa 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -603,6 +603,7 @@ self: super: {
   "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";
@@ -862,6 +863,7 @@ self: super: {
   "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";
@@ -1431,6 +1433,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_16";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1665,6 +1668,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1752,6 +1756,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_7_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2304,6 +2309,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -2953,6 +2964,7 @@ self: super: {
   "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";
@@ -3454,6 +3466,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3486,6 +3499,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3612,6 +3626,7 @@ self: super: {
   "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";
@@ -3868,6 +3883,7 @@ self: super: {
   "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";
@@ -4024,6 +4040,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4715,6 +4732,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4828,11 +4846,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5223,6 +5243,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6051,6 +6072,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6197,6 +6219,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6337,6 +6360,7 @@ self: super: {
   "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";
@@ -7731,6 +7755,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8289,6 +8314,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index bcaea931ffcb..e7f095bac2d5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -609,6 +609,7 @@ self: super: {
   "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";
@@ -870,6 +871,7 @@ self: super: {
   "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";
@@ -1690,6 +1692,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1781,6 +1784,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2346,6 +2350,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3012,6 +3022,7 @@ self: super: {
   "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";
@@ -3521,6 +3532,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3553,6 +3565,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3682,6 +3695,7 @@ self: super: {
   "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";
@@ -3943,6 +3957,7 @@ self: super: {
   "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";
@@ -4103,6 +4118,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4813,6 +4829,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4929,11 +4946,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5333,6 +5352,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6186,6 +6206,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6483,6 +6504,7 @@ self: super: {
   "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";
@@ -7917,6 +7939,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8503,6 +8526,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index e5d13079ed74..be89c0d27b1d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -609,6 +609,7 @@ self: super: {
   "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";
@@ -870,6 +871,7 @@ self: super: {
   "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";
@@ -1690,6 +1692,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1781,6 +1784,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2346,6 +2350,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3012,6 +3022,7 @@ self: super: {
   "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";
@@ -3521,6 +3532,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3553,6 +3565,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3682,6 +3695,7 @@ self: super: {
   "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";
@@ -3943,6 +3957,7 @@ self: super: {
   "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";
@@ -4103,6 +4118,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4813,6 +4829,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4929,11 +4946,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5333,6 +5352,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6186,6 +6206,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6483,6 +6504,7 @@ self: super: {
   "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";
@@ -7916,6 +7938,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8501,6 +8524,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index 6ae70cf43415..08e7d4607c1f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -609,6 +609,7 @@ self: super: {
   "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";
@@ -870,6 +871,7 @@ self: super: {
   "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";
@@ -1689,6 +1691,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1780,6 +1783,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2345,6 +2349,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3010,6 +3020,7 @@ self: super: {
   "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";
@@ -3519,6 +3530,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3551,6 +3563,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3680,6 +3693,7 @@ self: super: {
   "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";
@@ -3940,6 +3954,7 @@ self: super: {
   "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";
@@ -4099,6 +4114,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4806,6 +4822,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4922,11 +4939,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5326,6 +5345,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6176,6 +6196,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6472,6 +6493,7 @@ self: super: {
   "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";
@@ -7902,6 +7924,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8484,6 +8507,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index 6d6ef3dccd01..75234059ec30 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -609,6 +609,7 @@ self: super: {
   "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";
@@ -870,6 +871,7 @@ self: super: {
   "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";
@@ -1689,6 +1691,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1780,6 +1783,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2345,6 +2349,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3010,6 +3020,7 @@ self: super: {
   "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";
@@ -3516,6 +3527,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3548,6 +3560,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3677,6 +3690,7 @@ self: super: {
   "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";
@@ -3937,6 +3951,7 @@ self: super: {
   "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";
@@ -4096,6 +4111,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4803,6 +4819,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4917,11 +4934,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5320,6 +5339,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6168,6 +6188,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6464,6 +6485,7 @@ self: super: {
   "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";
@@ -7893,6 +7915,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8473,6 +8496,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 497d6a82c12c..01f7fab0ca15 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -609,6 +609,7 @@ self: super: {
   "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";
@@ -870,6 +871,7 @@ self: super: {
   "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";
@@ -1686,6 +1688,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1777,6 +1780,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2341,6 +2345,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -3006,6 +3016,7 @@ self: super: {
   "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";
@@ -3512,6 +3523,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3544,6 +3556,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3673,6 +3686,7 @@ self: super: {
   "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";
@@ -3932,6 +3946,7 @@ self: super: {
   "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";
@@ -4091,6 +4106,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4797,6 +4813,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4911,11 +4928,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5314,6 +5333,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6161,6 +6181,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6313,6 +6334,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6454,6 +6476,7 @@ self: super: {
   "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";
@@ -7880,6 +7903,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8458,6 +8482,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 0141eb95d7ac..6d7df9e59a9a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -609,6 +609,7 @@ self: super: {
   "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";
@@ -870,6 +871,7 @@ self: super: {
   "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";
@@ -1684,6 +1686,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1775,6 +1778,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2338,6 +2342,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -2998,6 +3008,7 @@ self: super: {
   "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";
@@ -3504,6 +3515,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3536,6 +3548,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3665,6 +3678,7 @@ self: super: {
   "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";
@@ -3924,6 +3938,7 @@ self: super: {
   "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";
@@ -4083,6 +4098,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4789,6 +4805,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4903,11 +4920,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5305,6 +5324,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6151,6 +6171,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6301,6 +6322,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6441,6 +6463,7 @@ self: super: {
   "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";
@@ -7866,6 +7889,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8444,6 +8468,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 8dd1186fcc5f..6286cdf3a429 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -608,6 +608,7 @@ self: super: {
   "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";
@@ -868,6 +869,7 @@ self: super: {
   "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";
@@ -1681,6 +1683,7 @@ self: super: {
   "bools" = dontDistribute super."bools";
   "boolsimplifier" = dontDistribute super."boolsimplifier";
   "boomange" = dontDistribute super."boomange";
+  "boombox" = dontDistribute super."boombox";
   "boomerang" = dontDistribute super."boomerang";
   "boomslang" = dontDistribute super."boomslang";
   "borel" = dontDistribute super."borel";
@@ -1772,6 +1775,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = dontDistribute super."cabal-helper";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_6_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2335,6 +2339,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -2994,6 +3004,7 @@ self: super: {
   "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";
@@ -3499,6 +3510,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3531,6 +3543,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3660,6 +3673,7 @@ self: super: {
   "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";
@@ -3919,6 +3933,7 @@ self: super: {
   "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";
@@ -4078,6 +4093,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4784,6 +4800,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4898,11 +4915,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -5300,6 +5319,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -6145,6 +6165,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -6295,6 +6316,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = dontDistribute super."publicsuffix";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6435,6 +6457,7 @@ self: super: {
   "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";
@@ -7860,6 +7883,7 @@ self: super: {
   "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";
   "unification-fd" = dontDistribute super."unification-fd";
@@ -8438,6 +8462,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index f13fd1766e98..a11e485c3f10 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -587,6 +587,7 @@ self: super: {
   "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";
@@ -843,6 +844,7 @@ self: super: {
   "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";
@@ -1200,6 +1202,7 @@ self: super: {
   "applicative-numbers" = dontDistribute super."applicative-numbers";
   "applicative-parsec" = dontDistribute super."applicative-parsec";
   "applicative-quoters" = dontDistribute super."applicative-quoters";
+  "apply-refact" = doDistribute super."apply-refact_0_1_0_0";
   "apportionment" = dontDistribute super."apportionment";
   "approx-rand-test" = dontDistribute super."approx-rand-test";
   "approximate-equality" = dontDistribute super."approximate-equality";
@@ -1334,6 +1337,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_16";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1556,6 +1560,7 @@ self: super: {
   "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";
@@ -1640,6 +1645,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = doDistribute super."cabal-helper_0_6_2_0";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_7_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2166,6 +2172,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -2788,6 +2800,7 @@ self: super: {
   "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";
@@ -3275,6 +3288,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3306,6 +3320,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3429,6 +3444,7 @@ self: super: {
   "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";
@@ -3675,6 +3691,7 @@ self: super: {
   "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";
@@ -3828,6 +3845,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4473,6 +4491,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4594,11 +4613,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4975,6 +4996,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5067,6 +5089,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = doDistribute super."modify-fasta_0_8_0_4";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5753,6 +5776,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -5894,6 +5918,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6030,6 +6055,7 @@ self: super: {
   "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";
@@ -6173,7 +6199,9 @@ self: super: {
   "resource-simple" = dontDistribute super."resource-simple";
   "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
+  "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
+  "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -7350,6 +7378,7 @@ self: super: {
   "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";
@@ -7817,6 +7846,7 @@ self: super: {
   "yesod-lucid" = dontDistribute super."yesod-lucid";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5";
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
@@ -7862,6 +7892,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index 4e06107d7a98..33013dc368a3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -587,6 +587,7 @@ self: super: {
   "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";
@@ -843,6 +844,7 @@ self: super: {
   "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";
@@ -1198,6 +1200,7 @@ self: super: {
   "applicative-numbers" = dontDistribute super."applicative-numbers";
   "applicative-parsec" = dontDistribute super."applicative-parsec";
   "applicative-quoters" = dontDistribute super."applicative-quoters";
+  "apply-refact" = doDistribute super."apply-refact_0_1_0_0";
   "apportionment" = dontDistribute super."apportionment";
   "approx-rand-test" = dontDistribute super."approx-rand-test";
   "approximate-equality" = dontDistribute super."approximate-equality";
@@ -1332,6 +1335,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_16";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1554,6 +1558,7 @@ self: super: {
   "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";
@@ -1638,6 +1643,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = doDistribute super."cabal-helper_0_6_2_0";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_7_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2164,6 +2170,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -2782,6 +2794,7 @@ self: super: {
   "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";
@@ -3269,6 +3282,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3300,6 +3314,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3423,6 +3438,7 @@ self: super: {
   "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";
@@ -3669,6 +3685,7 @@ self: super: {
   "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";
@@ -3821,6 +3838,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4461,6 +4479,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4582,11 +4601,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4960,6 +4981,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5052,6 +5074,7 @@ self: super: {
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = doDistribute super."modify-fasta_0_8_0_4";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5736,6 +5759,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -5877,6 +5901,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -6013,6 +6038,7 @@ self: super: {
   "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";
@@ -6155,7 +6181,9 @@ self: super: {
   "resource-simple" = dontDistribute super."resource-simple";
   "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
+  "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
+  "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -7331,6 +7359,7 @@ self: super: {
   "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";
@@ -7797,6 +7826,7 @@ self: super: {
   "yesod-lucid" = dontDistribute super."yesod-lucid";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5";
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
@@ -7842,6 +7872,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
index 12a566d954c7..05a347b4c964 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
@@ -585,6 +585,7 @@ self: super: {
   "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";
@@ -840,6 +841,7 @@ self: super: {
   "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";
@@ -1193,6 +1195,7 @@ self: super: {
   "applicative-numbers" = dontDistribute super."applicative-numbers";
   "applicative-parsec" = dontDistribute super."applicative-parsec";
   "applicative-quoters" = dontDistribute super."applicative-quoters";
+  "apply-refact" = doDistribute super."apply-refact_0_1_0_0";
   "apportionment" = dontDistribute super."apportionment";
   "approx-rand-test" = dontDistribute super."approx-rand-test";
   "approximate-equality" = dontDistribute super."approximate-equality";
@@ -1327,6 +1330,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_16";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1549,6 +1553,7 @@ self: super: {
   "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";
@@ -1632,6 +1637,7 @@ self: super: {
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
   "cabal-helper" = doDistribute super."cabal-helper_0_6_3_0";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_7_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2152,6 +2158,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -2761,6 +2773,7 @@ self: super: {
   "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";
@@ -3245,6 +3258,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3276,6 +3290,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3398,6 +3413,7 @@ self: super: {
   "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";
@@ -3639,6 +3655,7 @@ self: super: {
   "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";
@@ -3789,6 +3806,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4420,6 +4438,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4541,11 +4560,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4916,6 +4937,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -5002,11 +5024,13 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_5";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = doDistribute super."modify-fasta_0_8_0_4";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -5029,6 +5053,7 @@ self: super: {
   "monad-gen" = dontDistribute super."monad-gen";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-logger" = doDistribute super."monad-logger_0_3_17";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
   "monad-memo" = dontDistribute super."monad-memo";
@@ -5687,6 +5712,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -5825,6 +5851,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -5961,6 +5988,7 @@ self: super: {
   "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";
@@ -6101,7 +6129,9 @@ self: super: {
   "resource-simple" = dontDistribute super."resource-simple";
   "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
+  "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
+  "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -7266,6 +7296,7 @@ self: super: {
   "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";
@@ -7727,6 +7758,7 @@ self: super: {
   "yesod-lucid" = dontDistribute super."yesod-lucid";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5";
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
@@ -7772,6 +7804,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
index 25e558c5e99a..7fd213cdf9fd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
@@ -576,6 +576,7 @@ self: super: {
   "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";
@@ -828,6 +829,7 @@ self: super: {
   "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";
@@ -1178,6 +1180,7 @@ self: super: {
   "applicative-numbers" = dontDistribute super."applicative-numbers";
   "applicative-parsec" = dontDistribute super."applicative-parsec";
   "applicative-quoters" = dontDistribute super."applicative-quoters";
+  "apply-refact" = doDistribute super."apply-refact_0_1_0_0";
   "apportionment" = dontDistribute super."apportionment";
   "approx-rand-test" = dontDistribute super."approx-rand-test";
   "approximate-equality" = dontDistribute super."approximate-equality";
@@ -1310,6 +1313,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_16";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1526,6 +1530,7 @@ self: super: {
   "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";
@@ -1605,6 +1610,7 @@ self: super: {
   "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags";
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_7_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2114,6 +2120,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -2544,6 +2556,7 @@ self: super: {
   "error-message" = dontDistribute super."error-message";
   "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "errors" = doDistribute super."errors_2_1_1";
   "ersatz" = dontDistribute super."ersatz";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
@@ -2704,6 +2717,7 @@ self: super: {
   "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";
@@ -2944,6 +2958,7 @@ self: super: {
   "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-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_4";
   "ghc-vis" = dontDistribute super."ghc-vis";
   "ghci-diagrams" = dontDistribute super."ghci-diagrams";
   "ghci-haskeline" = dontDistribute super."ghci-haskeline";
@@ -2995,6 +3010,7 @@ self: super: {
   "gitHUD" = dontDistribute super."gitHUD";
   "gitcache" = dontDistribute super."gitcache";
   "gitdo" = dontDistribute super."gitdo";
+  "github" = doDistribute super."github_0_14_0";
   "github-backup" = dontDistribute super."github-backup";
   "github-post-receive" = dontDistribute super."github-post-receive";
   "github-utils" = dontDistribute super."github-utils";
@@ -3175,6 +3191,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3205,6 +3222,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3325,6 +3343,7 @@ self: super: {
   "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";
@@ -3566,6 +3585,7 @@ self: super: {
   "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";
@@ -3716,6 +3736,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4337,6 +4358,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4456,11 +4478,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4828,6 +4852,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -4903,11 +4928,13 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_5";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = doDistribute super."modify-fasta_0_8_0_4";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -4930,6 +4957,7 @@ self: super: {
   "monad-gen" = dontDistribute super."monad-gen";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-logger" = doDistribute super."monad-logger_0_3_17";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
   "monad-memo" = dontDistribute super."monad-memo";
@@ -5574,6 +5602,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -5709,6 +5738,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -5841,6 +5871,7 @@ self: super: {
   "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";
@@ -5979,7 +6010,9 @@ self: super: {
   "resource-simple" = dontDistribute super."resource-simple";
   "resourcet" = doDistribute super."resourcet_1_1_7";
   "respond" = dontDistribute super."respond";
+  "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
+  "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -6653,6 +6686,7 @@ self: super: {
   "svm-light-utils" = dontDistribute super."svm-light-utils";
   "svm-simple" = dontDistribute super."svm-simple";
   "svndump" = dontDistribute super."svndump";
+  "swagger2" = doDistribute super."swagger2_1_2_1";
   "swapper" = dontDistribute super."swapper";
   "swearjure" = dontDistribute super."swearjure";
   "swf" = dontDistribute super."swf";
@@ -7113,6 +7147,7 @@ self: super: {
   "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";
@@ -7561,6 +7596,7 @@ self: super: {
   "yesod-lucid" = dontDistribute super."yesod-lucid";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5";
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
@@ -7606,6 +7642,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
index 9bd1579f1020..b9e13567f85d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
@@ -574,6 +574,7 @@ self: super: {
   "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";
@@ -826,6 +827,7 @@ self: super: {
   "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";
@@ -1174,6 +1176,7 @@ self: super: {
   "applicative-numbers" = dontDistribute super."applicative-numbers";
   "applicative-parsec" = dontDistribute super."applicative-parsec";
   "applicative-quoters" = dontDistribute super."applicative-quoters";
+  "apply-refact" = doDistribute super."apply-refact_0_1_0_0";
   "apportionment" = dontDistribute super."apportionment";
   "approx-rand-test" = dontDistribute super."approx-rand-test";
   "approximate-equality" = dontDistribute super."approximate-equality";
@@ -1303,6 +1306,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_16";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1517,6 +1521,7 @@ self: super: {
   "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";
@@ -1595,6 +1600,7 @@ self: super: {
   "cabal-ghc-dynflags" = dontDistribute super."cabal-ghc-dynflags";
   "cabal-ghci" = dontDistribute super."cabal-ghci";
   "cabal-graphdeps" = dontDistribute super."cabal-graphdeps";
+  "cabal-info" = dontDistribute super."cabal-info";
   "cabal-install" = doDistribute super."cabal-install_1_22_7_0";
   "cabal-install-bundle" = dontDistribute super."cabal-install-bundle";
   "cabal-install-ghc72" = dontDistribute super."cabal-install-ghc72";
@@ -2097,6 +2103,12 @@ self: super: {
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
   "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";
@@ -2527,6 +2539,7 @@ self: super: {
   "error-message" = dontDistribute super."error-message";
   "error-util" = dontDistribute super."error-util";
   "errorcall-eq-instance" = dontDistribute super."errorcall-eq-instance";
+  "errors" = doDistribute super."errors_2_1_1";
   "ersatz" = dontDistribute super."ersatz";
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
@@ -2687,6 +2700,7 @@ self: super: {
   "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";
@@ -2927,6 +2941,7 @@ self: super: {
   "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-typelits-natnormalise" = doDistribute super."ghc-typelits-natnormalise_0_4";
   "ghc-vis" = dontDistribute super."ghc-vis";
   "ghci-diagrams" = dontDistribute super."ghci-diagrams";
   "ghci-haskeline" = dontDistribute super."ghci-haskeline";
@@ -2978,6 +2993,7 @@ self: super: {
   "gitHUD" = dontDistribute super."gitHUD";
   "gitcache" = dontDistribute super."gitcache";
   "gitdo" = dontDistribute super."gitdo";
+  "github" = doDistribute super."github_0_14_0";
   "github-backup" = dontDistribute super."github-backup";
   "github-post-receive" = dontDistribute super."github-post-receive";
   "github-utils" = dontDistribute super."github-utils";
@@ -3158,6 +3174,7 @@ self: super: {
   "grapefruit-records" = dontDistribute super."grapefruit-records";
   "grapefruit-ui" = dontDistribute super."grapefruit-ui";
   "grapefruit-ui-gtk" = dontDistribute super."grapefruit-ui-gtk";
+  "graph-core" = doDistribute super."graph-core_0_2_2_0";
   "graph-generators" = dontDistribute super."graph-generators";
   "graph-matchings" = dontDistribute super."graph-matchings";
   "graph-rewriting" = dontDistribute super."graph-rewriting";
@@ -3188,6 +3205,7 @@ self: super: {
   "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";
   "gridland" = dontDistribute super."gridland";
   "grm" = dontDistribute super."grm";
@@ -3308,6 +3326,7 @@ self: super: {
   "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";
@@ -3547,6 +3566,7 @@ self: super: {
   "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";
@@ -3697,6 +3717,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_1";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -4317,6 +4338,7 @@ self: super: {
   "json-fu" = dontDistribute super."json-fu";
   "json-litobj" = dontDistribute super."json-litobj";
   "json-pointer" = dontDistribute super."json-pointer";
+  "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";
@@ -4436,11 +4458,13 @@ self: super: {
   "lambdacms-media" = dontDistribute super."lambdacms-media";
   "lambdacube" = dontDistribute super."lambdacube";
   "lambdacube-bullet" = dontDistribute super."lambdacube-bullet";
+  "lambdacube-compiler" = dontDistribute super."lambdacube-compiler";
   "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
   "lambdacube-samples" = dontDistribute super."lambdacube-samples";
   "lambdatex" = dontDistribute super."lambdatex";
   "lambdatwit" = dontDistribute super."lambdatwit";
@@ -4805,6 +4829,7 @@ self: super: {
   "mdapi" = dontDistribute super."mdapi";
   "mdcat" = dontDistribute super."mdcat";
   "mdo" = dontDistribute super."mdo";
+  "mdp" = dontDistribute super."mdp";
   "mecab" = dontDistribute super."mecab";
   "mecha" = dontDistribute super."mecha";
   "mediawiki" = dontDistribute super."mediawiki";
@@ -4880,11 +4905,13 @@ self: super: {
   "mkcabal" = dontDistribute super."mkcabal";
   "ml-w" = dontDistribute super."ml-w";
   "mlist" = dontDistribute super."mlist";
+  "mmorph" = doDistribute super."mmorph_1_0_5";
   "mmtl" = dontDistribute super."mmtl";
   "mmtl-base" = dontDistribute super."mmtl-base";
   "moan" = dontDistribute super."moan";
   "modbus-tcp" = dontDistribute super."modbus-tcp";
   "modelicaparser" = dontDistribute super."modelicaparser";
+  "modify-fasta" = doDistribute super."modify-fasta_0_8_0_4";
   "modsplit" = dontDistribute super."modsplit";
   "modular-arithmetic" = dontDistribute super."modular-arithmetic";
   "modular-prelude" = dontDistribute super."modular-prelude";
@@ -4905,6 +4932,7 @@ self: super: {
   "monad-gen" = dontDistribute super."monad-gen";
   "monad-interleave" = dontDistribute super."monad-interleave";
   "monad-levels" = dontDistribute super."monad-levels";
+  "monad-logger" = doDistribute super."monad-logger_0_3_17";
   "monad-loops-stm" = dontDistribute super."monad-loops-stm";
   "monad-lrs" = dontDistribute super."monad-lrs";
   "monad-memo" = dontDistribute super."monad-memo";
@@ -5549,6 +5577,7 @@ self: super: {
   "polytypeable" = dontDistribute super."polytypeable";
   "polytypeable-utils" = dontDistribute super."polytypeable-utils";
   "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";
@@ -5684,6 +5713,7 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_0_3";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -5816,6 +5846,7 @@ self: super: {
   "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";
@@ -5952,7 +5983,9 @@ self: super: {
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
   "respond" = dontDistribute super."respond";
+  "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
+  "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
   "restful-snap" = dontDistribute super."restful-snap";
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
@@ -6190,6 +6223,7 @@ self: super: {
   "servant-postgresql" = dontDistribute super."servant-postgresql";
   "servant-response" = dontDistribute super."servant-response";
   "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
@@ -6599,6 +6633,7 @@ self: super: {
   "subnet" = dontDistribute super."subnet";
   "subtitleParser" = dontDistribute super."subtitleParser";
   "subtitles" = dontDistribute super."subtitles";
+  "success" = doDistribute super."success_0_2_5";
   "suffixarray" = dontDistribute super."suffixarray";
   "suffixtree" = dontDistribute super."suffixtree";
   "sugarhaskell" = dontDistribute super."sugarhaskell";
@@ -6623,6 +6658,7 @@ self: super: {
   "svm-light-utils" = dontDistribute super."svm-light-utils";
   "svm-simple" = dontDistribute super."svm-simple";
   "svndump" = dontDistribute super."svndump";
+  "swagger2" = doDistribute super."swagger2_1_2_1";
   "swapper" = dontDistribute super."swapper";
   "swearjure" = dontDistribute super."swearjure";
   "swf" = dontDistribute super."swf";
@@ -7082,6 +7118,7 @@ self: super: {
   "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";
@@ -7529,6 +7566,7 @@ self: super: {
   "yesod-lucid" = dontDistribute super."yesod-lucid";
   "yesod-markdown" = dontDistribute super."yesod-markdown";
   "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5";
   "yesod-paginate" = dontDistribute super."yesod-paginate";
   "yesod-pagination" = dontDistribute super."yesod-pagination";
   "yesod-paginator" = dontDistribute super."yesod-paginator";
@@ -7573,6 +7611,7 @@ self: super: {
   "yjsvg" = dontDistribute super."yjsvg";
   "yjtools" = dontDistribute super."yjtools";
   "yocto" = dontDistribute super."yocto";
+  "yoctoparsec" = dontDistribute super."yoctoparsec";
   "yoko" = dontDistribute super."yoko";
   "york-lava" = dontDistribute super."york-lava";
   "youtube" = dontDistribute super."youtube";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.2.nix b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
new file mode 100644
index 000000000000..8a68bd9a2736
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
@@ -0,0 +1,7646 @@
+{ 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-5.2 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";
+  "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";
+  "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";
+  "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";
+  "ChannelT" = dontDistribute super."ChannelT";
+  "Chart-diagrams" = dontDistribute super."Chart-diagrams";
+  "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";
+  "DescriptiveKeys" = dontDistribute super."DescriptiveKeys";
+  "Dflow" = dontDistribute super."Dflow";
+  "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" = dontDistribute super."EdisonAPI";
+  "EdisonCore" = dontDistribute super."EdisonCore";
+  "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";
+  "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";
+  "HDBC-session" = dontDistribute super."HDBC-session";
+  "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";
+  "Hclip" = dontDistribute super."Hclip";
+  "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";
+  "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";
+  "LDAP" = dontDistribute super."LDAP";
+  "LRU" = dontDistribute super."LRU";
+  "LTree" = dontDistribute super."LTree";
+  "LambdaCalculator" = dontDistribute super."LambdaCalculator";
+  "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";
+  "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";
+  "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";
+  "NoTrace" = dontDistribute super."NoTrace";
+  "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";
+  "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";
+  "OneTuple" = dontDistribute super."OneTuple";
+  "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";
+  "PortMidi" = dontDistribute super."PortMidi";
+  "PostgreSQL" = dontDistribute super."PostgreSQL";
+  "PrimitiveArray" = dontDistribute super."PrimitiveArray";
+  "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";
+  "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";
+  "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";
+  "SVGFonts" = dontDistribute super."SVGFonts";
+  "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";
+  "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-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";
+  "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-utility" = dontDistribute super."accelerate-utility";
+  "accentuateus" = dontDistribute super."accentuateus";
+  "access-time" = dontDistribute super."access-time";
+  "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-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-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-lens" = dontDistribute super."aeson-lens";
+  "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
+  "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";
+  "agda-snippets" = dontDistribute super."agda-snippets";
+  "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
+  "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";
+  "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
+  "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-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";
+  "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";
+  "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-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";
+  "apply-refact" = doDistribute super."apply-refact_0_1_0_0";
+  "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";
+  "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "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";
+  "arithmoi" = dontDistribute super."arithmoi";
+  "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-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-conduit" = dontDistribute super."atom-conduit";
+  "atom-msp430" = dontDistribute super."atom-msp430";
+  "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign";
+  "atomic-primops-vector" = dontDistribute super."atomic-primops-vector";
+  "atomic-write" = dontDistribute super."atomic-write";
+  "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";
+  "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";
+  "awesomium" = dontDistribute super."awesomium";
+  "awesomium-glut" = dontDistribute super."awesomium-glut";
+  "awesomium-raw" = dontDistribute super."awesomium-raw";
+  "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";
+  "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";
+  "bdd" = dontDistribute super."bdd";
+  "bdelta" = dontDistribute super."bdelta";
+  "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
+  "beamable" = dontDistribute super."beamable";
+  "beautifHOL" = dontDistribute super."beautifHOL";
+  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
+  "bein" = dontDistribute super."bein";
+  "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";
+  "bibtex" = dontDistribute super."bibtex";
+  "bidirectionalization-combined" = dontDistribute super."bidirectionalization-combined";
+  "bidispec" = dontDistribute super."bidispec";
+  "bidispec-extras" = dontDistribute super."bidispec-extras";
+  "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-bits" = dontDistribute super."binary-bits";
+  "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-shared" = dontDistribute super."binary-shared";
+  "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-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-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";
+  "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-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-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" = dontDistribute super."bloodhound";
+  "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";
+  "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";
+  "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-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";
+  "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder";
+  "bytestringparser" = dontDistribute super."bytestringparser";
+  "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
+  "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "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-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
+  "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-info" = dontDistribute super."cabal-info";
+  "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";
+  "cached-io" = dontDistribute super."cached-io";
+  "cached-traversable" = dontDistribute super."cached-traversable";
+  "caf" = dontDistribute super."caf";
+  "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
+  "caffegraph" = dontDistribute super."caffegraph";
+  "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";
+  "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";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "codo-notation" = dontDistribute super."codo-notation";
+  "cofunctor" = dontDistribute super."cofunctor";
+  "cognimeta-utils" = dontDistribute super."cognimeta-utils";
+  "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";
+  "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";
+  "commodities" = dontDistribute super."commodities";
+  "commsec" = dontDistribute super."commsec";
+  "commsec-keyexchange" = dontDistribute super."commsec-keyexchange";
+  "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";
+  "conceit" = dontDistribute super."conceit";
+  "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-extra" = dontDistribute super."concurrent-extra";
+  "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "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-select" = dontDistribute super."config-select";
+  "config-value" = dontDistribute super."config-value";
+  "configifier" = dontDistribute super."configifier";
+  "configuration" = dontDistribute super."configuration";
+  "configuration-tools" = dontDistribute super."configuration-tools";
+  "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";
+  "constructible" = dontDistribute super."constructible";
+  "constructive-algebra" = dontDistribute super."constructive-algebra";
+  "consumers" = dontDistribute super."consumers";
+  "container" = dontDistribute super."container";
+  "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";
+  "continued-fractions" = dontDistribute super."continued-fractions";
+  "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-omega" = dontDistribute super."control-monad-omega";
+  "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";
+  "converge" = dontDistribute super."converge";
+  "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";
+  "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";
+  "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";
+  "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-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";
+  "d3js" = dontDistribute super."d3js";
+  "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
+  "daemons" = dontDistribute super."daemons";
+  "dag" = dontDistribute super."dag";
+  "damnpacket" = dontDistribute super."damnpacket";
+  "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-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-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-or" = dontDistribute super."data-or";
+  "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";
+  "dataenc" = dontDistribute super."dataenc";
+  "dataflow" = dontDistribute super."dataflow";
+  "datalog" = dontDistribute super."datalog";
+  "datapacker" = dontDistribute super."datapacker";
+  "dataurl" = dontDistribute super."dataurl";
+  "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";
+  "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-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";
+  "debian-build" = dontDistribute super."debian-build";
+  "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
+  "decepticons" = dontDistribute super."decepticons";
+  "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-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";
+  "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";
+  "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";
+  "deriving-compat" = dontDistribute super."deriving-compat";
+  "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-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-tikz" = dontDistribute super."diagrams-tikz";
+  "dialog" = dontDistribute super."dialog";
+  "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
+  "dicom" = dontDistribute super."dicom";
+  "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";
+  "dirfiles" = dontDistribute super."dirfiles";
+  "dirstream" = dontDistribute super."dirstream";
+  "disassembler" = dontDistribute super."disassembler";
+  "discordian-calendar" = dontDistribute super."discordian-calendar";
+  "discount" = dontDistribute super."discount";
+  "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-closure" = dontDistribute super."distributed-closure";
+  "distributed-process-async" = dontDistribute super."distributed-process-async";
+  "distributed-process-azure" = dontDistribute super."distributed-process-azure";
+  "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-execution" = dontDistribute super."distributed-process-execution";
+  "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "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-registry" = dontDistribute super."distributed-process-registry";
+  "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet";
+  "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor";
+  "distributed-process-task" = dontDistribute super."distributed-process-task";
+  "distributed-process-tests" = dontDistribute super."distributed-process-tests";
+  "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" = dontDistribute super."doctest-discover";
+  "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
+  "doctest-prop" = dontDistribute super."doctest-prop";
+  "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" = dontDistribute super."download";
+  "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";
+  "drClickOn" = dontDistribute super."drClickOn";
+  "draw-poker" = dontDistribute super."draw-poker";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "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";
+  "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";
+  "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";
+  "ekg-statsd" = dontDistribute super."ekg-statsd";
+  "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-get" = dontDistribute super."elm-get";
+  "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-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";
+  "ether" = doDistribute super."ether_0_3_1_1";
+  "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";
+  "every-bit-counts" = dontDistribute super."every-bit-counts";
+  "ewe" = dontDistribute super."ewe";
+  "ex-pool" = dontDistribute super."ex-pool";
+  "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exact-pi" = doDistribute super."exact-pi_0_4_1_1";
+  "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";
+  "exception-mtl" = dontDistribute super."exception-mtl";
+  "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";
+  "fail" = dontDistribute super."fail";
+  "failable-list" = dontDistribute super."failable-list";
+  "failure" = dontDistribute super."failure";
+  "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";
+  "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-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-mcmc" = dontDistribute super."flat-mcmc";
+  "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";
+  "flow2dot" = dontDistribute super."flow2dot";
+  "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-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";
+  "fold-debounce" = dontDistribute super."fold-debounce";
+  "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "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";
+  "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";
+  "free-vl" = dontDistribute super."free-vl";
+  "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";
+  "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";
+  "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";
+  "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";
+  "gamma" = dontDistribute super."gamma";
+  "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-deriving" = doDistribute super."generic-deriving_1_9_0";
+  "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
+  "generic-maybe" = dontDistribute super."generic-maybe";
+  "generic-pretty" = dontDistribute super."generic-pretty";
+  "generic-server" = dontDistribute super."generic-server";
+  "generic-storable" = dontDistribute super."generic-storable";
+  "generic-tree" = dontDistribute super."generic-tree";
+  "generic-xml" = dontDistribute super."generic-xml";
+  "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";
+  "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-imported-from" = dontDistribute super."ghc-imported-from";
+  "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-codemirror" = dontDistribute super."ghcjs-codemirror";
+  "ghcjs-dom" = dontDistribute super."ghcjs-dom";
+  "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
+  "ghcjs-websockets" = dontDistribute super."ghcjs-websockets";
+  "ghclive" = dontDistribute super."ghclive";
+  "ghczdecode" = dontDistribute super."ghczdecode";
+  "ght" = dontDistribute super."ght";
+  "gi-atk" = dontDistribute super."gi-atk";
+  "gi-cairo" = dontDistribute super."gi-cairo";
+  "gi-gdk" = dontDistribute super."gi-gdk";
+  "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
+  "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
+  "gi-glib" = dontDistribute super."gi-glib";
+  "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gtk" = dontDistribute super."gi-gtk";
+  "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
+  "gi-notify" = dontDistribute super."gi-notify";
+  "gi-pango" = dontDistribute super."gi-pango";
+  "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";
+  "gist" = dontDistribute super."gist";
+  "git-all" = dontDistribute super."git-all";
+  "git-annex" = doDistribute super."git-annex_6_20160114";
+  "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-backup" = dontDistribute super."github-backup";
+  "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";
+  "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";
+  "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";
+  "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-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";
+  "gpolyline" = dontDistribute super."gpolyline";
+  "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-core" = doDistribute super."graph-core_0_2_2_0";
+  "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";
+  "gridland" = dontDistribute super."gridland";
+  "grm" = dontDistribute super."grm";
+  "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-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-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-mac-integration" = dontDistribute super."gtk3-mac-integration";
+  "gtkglext" = dontDistribute super."gtkglext";
+  "gtkimageview" = dontDistribute super."gtkimageview";
+  "gtkrsync" = dontDistribute super."gtkrsync";
+  "gtksourceview2" = dontDistribute super."gtksourceview2";
+  "gtksourceview3" = dontDistribute super."gtksourceview3";
+  "guarded-rewriting" = dontDistribute super."guarded-rewriting";
+  "guess-combinator" = dontDistribute super."guess-combinator";
+  "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_3";
+  "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";
+  "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-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-leksah" = dontDistribute super."haddock-leksah";
+  "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-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-sass" = dontDistribute super."hakyll-sass";
+  "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";
+  "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";
+  "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";
+  "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_2";
+  "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-formatter" = dontDistribute super."haskell-formatter";
+  "haskell-ftp" = dontDistribute super."haskell-ftp";
+  "haskell-generate" = dontDistribute super."haskell-generate";
+  "haskell-gi" = dontDistribute super."haskell-gi";
+  "haskell-gi-base" = dontDistribute super."haskell-gi-base";
+  "haskell-import-graph" = dontDistribute super."haskell-import-graph";
+  "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "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-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
+  "haskell-platform-test" = dontDistribute super."haskell-platform-test";
+  "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-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-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-amazonka" = dontDistribute super."haxl-amazonka";
+  "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";
+  "hbayes" = dontDistribute super."hbayes";
+  "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";
+  "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-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";
+  "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";
+  "hesql" = dontDistribute super."hesql";
+  "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";
+  "hformat" = dontDistribute super."hformat";
+  "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";
+  "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";
+  "hinquire" = dontDistribute super."hinquire";
+  "hinstaller" = dontDistribute super."hinstaller";
+  "hint-server" = dontDistribute super."hint-server";
+  "hinvaders" = dontDistribute super."hinvaders";
+  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hipbot" = dontDistribute super."hipbot";
+  "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";
+  "hjcase" = dontDistribute super."hjcase";
+  "hjpath" = dontDistribute super."hjpath";
+  "hjs" = dontDistribute super."hjs";
+  "hjson" = dontDistribute super."hjson";
+  "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-chart" = dontDistribute super."hledger-chart";
+  "hledger-diff" = dontDistribute super."hledger-diff";
+  "hledger-irr" = dontDistribute super."hledger-irr";
+  "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" = dontDistribute super."hmt";
+  "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";
+  "hopfield" = dontDistribute super."hopfield";
+  "hopfield-networks" = dontDistribute super."hopfield-networks";
+  "hopfli" = dontDistribute super."hopfli";
+  "hops" = dontDistribute super."hops";
+  "hoq" = dontDistribute super."hoq";
+  "horizon" = dontDistribute super."horizon";
+  "hosc" = dontDistribute super."hosc";
+  "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";
+  "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";
+  "hpack" = dontDistribute super."hpack";
+  "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";
+  "hpc-strobe" = dontDistribute super."hpc-strobe";
+  "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hplayground" = dontDistribute super."hplayground";
+  "hplaylist" = dontDistribute super."hplaylist";
+  "hpodder" = dontDistribute super."hpodder";
+  "hpp" = dontDistribute super."hpp";
+  "hpqtypes" = dontDistribute super."hpqtypes";
+  "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-GeoIP" = dontDistribute super."hs-GeoIP";
+  "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";
+  "hsb2hs" = dontDistribute super."hsb2hs";
+  "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";
+  "hscolour" = doDistribute super."hscolour_1_23";
+  "hscope" = dontDistribute super."hscope";
+  "hscrtmpl" = dontDistribute super."hscrtmpl";
+  "hscuid" = dontDistribute super."hscuid";
+  "hscurses" = dontDistribute super."hscurses";
+  "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex";
+  "hsdev" = dontDistribute super."hsdev";
+  "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-monad-control" = dontDistribute super."hspec-monad-control";
+  "hspec-server" = dontDistribute super."hspec-server";
+  "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "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";
+  "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-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";
+  "htoml" = dontDistribute super."htoml";
+  "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-streams" = dontDistribute super."http-client-streams";
+  "http-conduit-browser" = dontDistribute super."http-conduit-browser";
+  "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-encodings" = dontDistribute super."http-encodings";
+  "http-enumerator" = dontDistribute super."http-enumerator";
+  "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-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";
+  "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";
+  "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";
+  "identifiers" = dontDistribute super."identifiers";
+  "idiii" = dontDistribute super."idiii";
+  "idna" = dontDistribute super."idna";
+  "idna2008" = dontDistribute super."idna2008";
+  "idris" = dontDistribute super."idris";
+  "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-inline-r" = dontDistribute super."ihaskell-inline-r";
+  "ihaskell-parsec" = dontDistribute super."ihaskell-parsec";
+  "ihaskell-plot" = dontDistribute super."ihaskell-plot";
+  "ihaskell-widgets" = dontDistribute super."ihaskell-widgets";
+  "ihttp" = dontDistribute super."ihttp";
+  "illuminate" = dontDistribute super."illuminate";
+  "image-type" = dontDistribute super."image-type";
+  "imagefilters" = dontDistribute super."imagefilters";
+  "imagemagick" = dontDistribute super."imagemagick";
+  "imagepaste" = dontDistribute super."imagepaste";
+  "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-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-sat-solver" = dontDistribute super."incremental-sat-solver";
+  "increments" = dontDistribute super."increments";
+  "indentation" = dontDistribute super."indentation";
+  "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";
+  "inquire" = dontDistribute super."inquire";
+  "inserts" = dontDistribute super."inserts";
+  "inspection-proxy" = dontDistribute super."inspection-proxy";
+  "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";
+  "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";
+  "intern" = dontDistribute super."intern";
+  "internetmarke" = dontDistribute super."internetmarke";
+  "interpol" = dontDistribute super."interpol";
+  "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
+  "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
+  "interpolation" = dontDistribute super."interpolation";
+  "intricacy" = dontDistribute super."intricacy";
+  "intset" = dontDistribute super."intset";
+  "invariant" = doDistribute super."invariant_0_3_1";
+  "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-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-colors" = dontDistribute super."irc-colors";
+  "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";
+  "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";
+  "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-backend-c" = dontDistribute super."ivory-backend-c";
+  "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "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-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";
+  "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";
+  "jose" = dontDistribute super."jose";
+  "jpeg" = dontDistribute super."jpeg";
+  "js-good-parts" = dontDistribute super."js-good-parts";
+  "jsaddle" = dontDistribute super."jsaddle";
+  "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-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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "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";
+  "judy" = dontDistribute super."judy";
+  "jukebox" = dontDistribute super."jukebox";
+  "jumpthefive" = dontDistribute super."jumpthefive";
+  "jvm-parser" = dontDistribute super."jvm-parser";
+  "kademlia" = dontDistribute super."kademlia";
+  "kafka-client" = dontDistribute super."kafka-client";
+  "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";
+  "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";
+  "lackey" = dontDistribute super."lackey";
+  "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-compiler" = dontDistribute super."lambdacube-compiler";
+  "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
+  "lambdacube-samples" = dontDistribute super."lambdacube-samples";
+  "lambdatex" = dontDistribute super."lambdatex";
+  "lambdatwit" = dontDistribute super."lambdatwit";
+  "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-c-quote" = dontDistribute super."language-c-quote";
+  "language-cil" = dontDistribute super."language-cil";
+  "language-css" = dontDistribute super."language-css";
+  "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-typescript" = dontDistribute super."language-typescript";
+  "language-vhdl" = dontDistribute super."language-vhdl";
+  "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";
+  "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";
+  "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";
+  "leksah-server" = dontDistribute super."leksah-server";
+  "lendingclub" = dontDistribute super."lendingclub";
+  "lens-datetime" = dontDistribute super."lens-datetime";
+  "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";
+  "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";
+  "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";
+  "libxml" = dontDistribute super."libxml";
+  "libxml-enumerator" = dontDistribute super."libxml-enumerator";
+  "libxslt" = dontDistribute super."libxslt";
+  "life" = dontDistribute super."life";
+  "lift-generics" = dontDistribute super."lift-generics";
+  "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";
+  "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";
+  "load-env" = dontDistribute super."load-env";
+  "loadavg" = dontDistribute super."loadavg";
+  "local-address" = dontDistribute super."local-address";
+  "local-search" = dontDistribute super."local-search";
+  "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";
+  "logfloat" = dontDistribute super."logfloat";
+  "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";
+  "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";
+  "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";
+  "ltk" = dontDistribute super."ltk";
+  "ltl" = dontDistribute super."ltl";
+  "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";
+  "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";
+  "maccatcher" = dontDistribute super."maccatcher";
+  "machinecell" = dontDistribute super."machinecell";
+  "machines-binary" = dontDistribute super."machines-binary";
+  "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";
+  "mainland-pretty" = dontDistribute super."mainland-pretty";
+  "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";
+  "manifold-random" = dontDistribute super."manifold-random";
+  "manifolds" = dontDistribute super."manifolds";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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-coroutine" = doDistribute super."monad-coroutine_0_9_0_2";
+  "monad-exception" = dontDistribute super."monad-exception";
+  "monad-fork" = dontDistribute super."monad-fork";
+  "monad-gen" = dontDistribute super."monad-gen";
+  "monad-interleave" = dontDistribute super."monad-interleave";
+  "monad-levels" = dontDistribute super."monad-levels";
+  "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" = doDistribute super."monad-parallel_0_7_2_1";
+  "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-stlike-io" = dontDistribute super."monad-stlike-io";
+  "monad-stlike-stm" = dontDistribute super."monad-stlike-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";
+  "monadplus" = dontDistribute super."monadplus";
+  "monads-fd" = dontDistribute super."monads-fd";
+  "monadtransform" = dontDistribute super."monadtransform";
+  "monarch" = dontDistribute super."monarch";
+  "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-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";
+  "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";
+  "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";
+  "multiset-comb" = dontDistribute super."multiset-comb";
+  "multisetrewrite" = dontDistribute super."multisetrewrite";
+  "multistate" = dontDistribute super."multistate";
+  "muon" = dontDistribute super."muon";
+  "murder" = dontDistribute super."murder";
+  "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";
+  "names-th" = dontDistribute super."names-th";
+  "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
+  "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";
+  "nanq" = dontDistribute super."nanq";
+  "narc" = dontDistribute super."narc";
+  "nat" = dontDistribute super."nat";
+  "nats-queue" = dontDistribute super."nats-queue";
+  "natural-number" = dontDistribute super."natural-number";
+  "natural-numbers" = dontDistribute super."natural-numbers";
+  "natural-transformation" = dontDistribute super."natural-transformation";
+  "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" = dontDistribute super."nested-routes";
+  "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-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-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "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";
+  "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";
+  "niagra" = dontDistribute super."niagra";
+  "nibblestring" = dontDistribute super."nibblestring";
+  "nicify" = dontDistribute super."nicify";
+  "nicify-lib" = dontDistribute super."nicify-lib";
+  "nicovideo-translator" = dontDistribute super."nicovideo-translator";
+  "nikepub" = dontDistribute super."nikepub";
+  "nimber" = dontDistribute super."nimber";
+  "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";
+  "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";
+  "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";
+  "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" = dontDistribute super."octane";
+  "octohat" = dontDistribute super."octohat";
+  "octopus" = dontDistribute super."octopus";
+  "oculus" = dontDistribute super."oculus";
+  "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-classy" = dontDistribute super."opaleye-classy";
+  "opaleye-sqlite" = dontDistribute super."opaleye-sqlite";
+  "opaleye-trans" = dontDistribute super."opaleye-trans";
+  "open-haddock" = dontDistribute super."open-haddock";
+  "open-pandoc" = dontDistribute super."open-pandoc";
+  "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";
+  "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-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";
+  "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";
+  "overture" = dontDistribute super."overture";
+  "pack" = dontDistribute super."pack";
+  "package-o-tron" = dontDistribute super."package-o-tron";
+  "package-vt" = dontDistribute super."package-vt";
+  "packdeps" = dontDistribute super."packdeps";
+  "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-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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "path-io" = doDistribute super."path-io_0_2_0";
+  "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-content" = doDistribute super."pdf-toolbox-content_0_0_5_1";
+  "pdf-toolbox-core" = doDistribute super."pdf-toolbox-core_0_0_4_1";
+  "pdf-toolbox-document" = doDistribute super."pdf-toolbox-document_0_0_7_1";
+  "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";
+  "period" = dontDistribute super."period";
+  "perm" = dontDistribute super."perm";
+  "permutation" = dontDistribute super."permutation";
+  "permute" = dontDistribute super."permute";
+  "persist2er" = dontDistribute super."persist2er";
+  "persistable-record" = dontDistribute super."persistable-record";
+  "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-cereal" = dontDistribute super."persistent-cereal";
+  "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-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-protobuf" = dontDistribute super."persistent-protobuf";
+  "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
+  "persistent-redis" = dontDistribute super."persistent-redis";
+  "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";
+  "pgdl" = dontDistribute super."pgdl";
+  "pgm" = dontDistribute super."pgm";
+  "pgsql-simple" = dontDistribute super."pgsql-simple";
+  "pgstream" = dontDistribute super."pgstream";
+  "phasechange" = dontDistribute super."phasechange";
+  "phizzle" = dontDistribute super."phizzle";
+  "phoityne" = dontDistribute super."phoityne";
+  "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";
+  "pinchot" = doDistribute super."pinchot_0_6_0_0";
+  "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-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-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-shell" = dontDistribute super."pipes-shell";
+  "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_2_1";
+  "pipes-transduce" = dontDistribute super."pipes-transduce";
+  "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";
+  "plan-b" = dontDistribute super."plan-b";
+  "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";
+  "pointfree" = dontDistribute super."pointfree";
+  "pointful" = dontDistribute super."pointful";
+  "pointless-fun" = dontDistribute super."pointless-fun";
+  "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";
+  "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
+  "polyseq" = dontDistribute super."polyseq";
+  "polysoup" = dontDistribute super."polysoup";
+  "polytypeable" = dontDistribute super."polytypeable";
+  "polytypeable-utils" = dontDistribute super."polytypeable-utils";
+  "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-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-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-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-generalize" = dontDistribute super."prelude-generalize";
+  "prelude-plus" = dontDistribute super."prelude-plus";
+  "prelude-prime" = dontDistribute super."prelude-prime";
+  "prelude-safeenum" = dontDistribute super."prelude-safeenum";
+  "preprocess-haskell" = dontDistribute super."preprocess-haskell";
+  "preprocessor-tools" = dontDistribute super."preprocessor-tools";
+  "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-hex" = dontDistribute super."pretty-hex";
+  "pretty-ncols" = dontDistribute super."pretty-ncols";
+  "pretty-sop" = dontDistribute super."pretty-sop";
+  "pretty-tree" = dontDistribute super."pretty-tree";
+  "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
+  "primula-board" = dontDistribute super."primula-board";
+  "primula-bot" = dontDistribute super."primula-bot";
+  "printf-mauke" = dontDistribute super."printf-mauke";
+  "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_7";
+  "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";
+  "process-streaming" = dontDistribute super."process-streaming";
+  "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";
+  "profiteur" = dontDistribute super."profiteur";
+  "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";
+  "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-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" = doDistribute super."psc-ide_0_5_0";
+  "pseudo-boolean" = dontDistribute super."pseudo-boolean";
+  "pseudo-trie" = dontDistribute super."pseudo-trie";
+  "pseudomacros" = dontDistribute super."pseudomacros";
+  "psqueues" = doDistribute super."psqueues_0_2_2_0";
+  "pub" = dontDistribute super."pub";
+  "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
+  "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-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_7_6_1";
+  "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "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";
+  "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";
+  "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-simple" = dontDistribute super."quickcheck-simple";
+  "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver";
+  "quicklz" = dontDistribute super."quicklz";
+  "quickpull" = dontDistribute super."quickpull";
+  "quickset" = dontDistribute super."quickset";
+  "quickspec" = dontDistribute super."quickspec";
+  "quicktest" = dontDistribute super."quicktest";
+  "quickwebapp" = dontDistribute super."quickwebapp";
+  "quiver" = dontDistribute super."quiver";
+  "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-http" = dontDistribute super."quiver-http";
+  "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";
+  "rascal" = dontDistribute super."rascal";
+  "rate-limit" = dontDistribute super."rate-limit";
+  "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";
+  "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";
+  "reactor" = dontDistribute super."reactor";
+  "read-bounded" = dontDistribute super."read-bounded";
+  "readline-statevar" = dontDistribute super."readline-statevar";
+  "readpyc" = dontDistribute super."readpyc";
+  "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";
+  "reedsolomon" = dontDistribute super."reedsolomon";
+  "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-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
+  "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-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";
+  "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-query" = dontDistribute super."relational-query";
+  "relational-query-HDBC" = dontDistribute super."relational-query-HDBC";
+  "relational-record" = dontDistribute super."relational-record";
+  "relational-record-examples" = dontDistribute super."relational-record-examples";
+  "relational-schemas" = dontDistribute super."relational-schemas";
+  "relative-date" = dontDistribute super."relative-date";
+  "relit" = dontDistribute super."relit";
+  "rematch" = dontDistribute super."rematch";
+  "rematch-text" = dontDistribute super."rematch-text";
+  "remote" = dontDistribute super."remote";
+  "remote-debugger" = dontDistribute super."remote-debugger";
+  "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";
+  "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-core" = doDistribute super."rest-core_0_37";
+  "rest-example" = dontDistribute super."rest-example";
+  "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "restful-snap" = dontDistribute super."restful-snap";
+  "restricted-workers" = dontDistribute super."restricted-workers";
+  "restyle" = dontDistribute super."restyle";
+  "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "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-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";
+  "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";
+  "rmonad" = dontDistribute super."rmonad";
+  "rncryptor" = dontDistribute super."rncryptor";
+  "rng-utils" = dontDistribute super."rng-utils";
+  "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";
+  "rotating-log" = dontDistribute super."rotating-log";
+  "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";
+  "sandlib" = dontDistribute super."sandlib";
+  "sarasvati" = dontDistribute super."sarasvati";
+  "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";
+  "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";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
+  "scan" = dontDistribute super."scan";
+  "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "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" = doDistribute super."scotty_0_10_2";
+  "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-rest" = dontDistribute super."scotty-rest";
+  "scotty-session" = dontDistribute super."scotty-session";
+  "scotty-tls" = dontDistribute super."scotty-tls";
+  "scp-streams" = dontDistribute super."scp-streams";
+  "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "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";
+  "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";
+  "semiring-simple" = dontDistribute super."semiring-simple";
+  "semver-range" = dontDistribute super."semver-range";
+  "sendgrid-haskell" = dontDistribute super."sendgrid-haskell";
+  "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";
+  "serialport" = dontDistribute super."serialport";
+  "serv" = dontDistribute super."serv";
+  "servant-cassava" = dontDistribute super."servant-cassava";
+  "servant-ede" = dontDistribute super."servant-ede";
+  "servant-examples" = dontDistribute super."servant-examples";
+  "servant-github" = dontDistribute super."servant-github";
+  "servant-lucid" = dontDistribute super."servant-lucid";
+  "servant-mock" = dontDistribute super."servant-mock";
+  "servant-pandoc" = dontDistribute super."servant-pandoc";
+  "servant-pool" = dontDistribute super."servant-pool";
+  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-response" = dontDistribute super."servant-response";
+  "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
+  "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-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";
+  "shelly-extra" = dontDistribute super."shelly-extra";
+  "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" = dontDistribute super."simple-log";
+  "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" = dontDistribute super."simpleirc";
+  "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";
+  "sink" = dontDistribute super."sink";
+  "sirkel" = dontDistribute super."sirkel";
+  "sitemap" = dontDistribute super."sitemap";
+  "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";
+  "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";
+  "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";
+  "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-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-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";
+  "soegtk" = dontDistribute super."soegtk";
+  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
+  "sophia" = dontDistribute super."sophia";
+  "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
+  "sorted" = dontDistribute super."sorted";
+  "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";
+  "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";
+  "spool" = dontDistribute super."spool";
+  "spoonutil" = dontDistribute super."spoonutil";
+  "spoty" = dontDistribute super."spoty";
+  "spreadsheet" = dontDistribute super."spreadsheet";
+  "spritz" = dontDistribute super."spritz";
+  "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";
+  "sql-words" = dontDistribute super."sql-words";
+  "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";
+  "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-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";
+  "stopwatch" = dontDistribute super."stopwatch";
+  "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";
+  "str" = dontDistribute super."str";
+  "stratum-tool" = dontDistribute super."stratum-tool";
+  "stream-fusion" = dontDistribute super."stream-fusion";
+  "stream-monad" = dontDistribute super."stream-monad";
+  "streamed" = dontDistribute super."streamed";
+  "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-utils" = dontDistribute super."streaming-utils";
+  "streaming-wai" = dontDistribute super."streaming-wai";
+  "strict-base-types" = doDistribute super."strict-base-types_0_4_0";
+  "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-conv" = dontDistribute super."string-conv";
+  "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";
+  "strive" = dontDistribute super."strive";
+  "strptime" = dontDistribute super."strptime";
+  "structs" = dontDistribute super."structs";
+  "structural-induction" = dontDistribute super."structural-induction";
+  "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";
+  "success" = doDistribute super."success_0_2_6";
+  "suffixarray" = dontDistribute super."suffixarray";
+  "suffixtree" = dontDistribute super."suffixtree";
+  "sugarhaskell" = dontDistribute super."sugarhaskell";
+  "suitable" = dontDistribute super."suitable";
+  "sump" = dontDistribute super."sump";
+  "sundown" = dontDistribute super."sundown";
+  "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";
+  "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_1_2_1";
+  "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";
+  "symbol" = dontDistribute super."symbol";
+  "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-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";
+  "ta" = dontDistribute super."ta";
+  "table" = dontDistribute super."table";
+  "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-transformer" = dontDistribute super."tagged-transformer";
+  "tagging" = dontDistribute super."tagging";
+  "taggy" = dontDistribute super."taggy";
+  "taggy-lens" = dontDistribute super."taggy-lens";
+  "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";
+  "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";
+  "taskpool" = dontDistribute super."taskpool";
+  "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";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "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";
+  "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-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-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";
+  "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-and-plots" = dontDistribute super."text-and-plots";
+  "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-ldap" = dontDistribute super."text-ldap";
+  "text-locale-encoding" = dontDistribute super."text-locale-encoding";
+  "text-normal" = dontDistribute super."text-normal";
+  "text-position" = dontDistribute super."text-position";
+  "text-postgresql" = dontDistribute super."text-postgresql";
+  "text-printer" = dontDistribute super."text-printer";
+  "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
+  "text-register-machine" = dontDistribute super."text-register-machine";
+  "text-render" = dontDistribute super."text-render";
+  "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-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-lift-instances" = dontDistribute super."th-lift-instances";
+  "th-printf" = dontDistribute super."th-printf";
+  "th-sccs" = dontDistribute super."th-sccs";
+  "th-traced" = dontDistribute super."th-traced";
+  "th-typegraph" = dontDistribute super."th-typegraph";
+  "themoviedb" = dontDistribute super."themoviedb";
+  "themplate" = dontDistribute super."themplate";
+  "theoremquest" = dontDistribute super."theoremquest";
+  "theoremquest-client" = dontDistribute super."theoremquest-client";
+  "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";
+  "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" = dontDistribute super."tidal";
+  "tidal-midi" = dontDistribute super."tidal-midi";
+  "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-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-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-time" = dontDistribute super."timelike-time";
+  "timemap" = dontDistribute super."timemap";
+  "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";
+  "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-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";
+  "tracker" = dontDistribute super."tracker";
+  "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-compose" = dontDistribute super."transformers-compose";
+  "transformers-convert" = dontDistribute super."transformers-convert";
+  "transformers-free" = dontDistribute super."transformers-free";
+  "transformers-runnable" = dontDistribute super."transformers-runnable";
+  "transformers-supply" = dontDistribute super."transformers-supply";
+  "transient" = dontDistribute super."transient";
+  "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";
+  "tslogger" = dontDistribute super."tslogger";
+  "tsp-viz" = dontDistribute super."tsp-viz";
+  "tsparse" = dontDistribute super."tsparse";
+  "tst" = dontDistribute super."tst";
+  "tsvsql" = dontDistribute super."tsvsql";
+  "tttool" = doDistribute super."tttool_1_5_1";
+  "tubes" = dontDistribute super."tubes";
+  "tuntap" = dontDistribute super."tuntap";
+  "tup-functor" = dontDistribute super."tup-functor";
+  "tuple" = dontDistribute super."tuple";
+  "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";
+  "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
+  "turni" = dontDistribute super."turni";
+  "tweak" = dontDistribute super."tweak";
+  "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";
+  "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-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";
+  "typography-geometry" = dontDistribute super."typography-geometry";
+  "uAgda" = dontDistribute super."uAgda";
+  "ua-parser" = dontDistribute super."ua-parser";
+  "uacpid" = dontDistribute super."uacpid";
+  "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";
+  "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";
+  "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-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";
+  "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";
+  "vado" = dontDistribute super."vado";
+  "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";
+  "vcd" = dontDistribute super."vcd";
+  "vcs-revision" = dontDistribute super."vcs-revision";
+  "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
+  "vcsgui" = dontDistribute super."vcsgui";
+  "vcswrapper" = dontDistribute super."vcswrapper";
+  "vect" = dontDistribute super."vect";
+  "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-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_1";
+  "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-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" = dontDistribute super."versions";
+  "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-utils" = dontDistribute super."vinyl-utils";
+  "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";
+  "vivid" = dontDistribute super."vivid";
+  "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";
+  "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-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-content-type" = dontDistribute super."wai-middleware-content-type";
+  "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" = dontDistribute super."wai-middleware-verbs";
+  "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-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";
+  "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" = dontDistribute super."webkitgtk3";
+  "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "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" = dontDistribute super."werewolf";
+  "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";
+  "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";
+  "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";
+  "wuss" = dontDistribute super."wuss";
+  "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-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";
+  "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";
+  "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-json" = dontDistribute super."yesod-json";
+  "yesod-links" = dontDistribute super."yesod-links";
+  "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-markdown" = dontDistribute super."yesod-markdown";
+  "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5";
+  "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";
+  "yjtools" = dontDistribute super."yjtools";
+  "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-conduit" = dontDistribute super."zip-conduit";
+  "zipedit" = dontDistribute super."zipedit";
+  "zipkin" = dontDistribute super."zipkin";
+  "zipper" = dontDistribute super."zipper";
+  "zippers" = dontDistribute super."zippers";
+  "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";
+  "zot" = dontDistribute super."zot";
+  "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 1a9a2ac97296..58ad27a8a92d 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -556,10 +556,9 @@ self: {
     ({ mkDerivation, AbortT-transformers, base, mtl }:
      mkDerivation {
        pname = "AbortT-mtl";
-       version = "1.0";
-       sha256 = "42df8b886598bdfbb10f67d718eae41fb9866618dd8852e97549d915cb26379f";
+       version = "1.0.0.1";
+       sha256 = "5175fa41e0e71627a4bedd3e61fe9b871a6730b065ffe6ae1952ba6f0de151f4";
        libraryHaskellDepends = [ AbortT-transformers base mtl ];
-       jailbreak = true;
        homepage = "http://github.com/gcross/AbortT-mtl";
        description = "mtl instances for the AbortT monad transformer";
        license = stdenv.lib.licenses.bsd3;
@@ -571,14 +570,13 @@ self: {
      }:
      mkDerivation {
        pname = "AbortT-transformers";
-       version = "1.0.1.1";
-       sha256 = "773dc6aefb5b50937032a5c02d0ccd8320218f6d361361400882e694af600303";
+       version = "1.0.1.2";
+       sha256 = "62e9da8630493deb3b63aa5ec4c0151fd75e44b0d530eba0cb7f1f58ffb978ea";
        libraryHaskellDepends = [ base transformers ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 transformers
        ];
-       jailbreak = true;
        homepage = "http://github.com/gcross/AbortT-transformers";
        description = "A monad and monadic transformer providing \"abort\" functionality";
        license = stdenv.lib.licenses.bsd3;
@@ -1187,8 +1185,8 @@ self: {
      }:
      mkDerivation {
        pname = "BNFC";
-       version = "2.8";
-       sha256 = "21be5fddcfe8e1970c94872f36d5f29d07709f69e8e139b68bf6b27e75677f34";
+       version = "2.8.1";
+       sha256 = "2c1bea5c034483813091eea0ea5c830fdde8fedd31b1fc021ea69823b30a5920";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base ];
@@ -5286,25 +5284,25 @@ self: {
      }) {};
 
   "EtaMOO" = callPackage
-    ({ mkDerivation, array, base, bytestring, case-insensitive
-     , containers, hashable, haskeline, mtl, network, old-locale, parsec
-     , pcre, pipes, pipes-bytestring, pipes-concurrency, pipes-network
-     , pureMD5, random, stm, stm-chans, text, time, transformers, unix
-     , unordered-containers, vector
+    ({ mkDerivation, array, async, base, bytestring, case-insensitive
+     , containers, cryptonite, hashable, haskeline, memory, mtl, network
+     , parsec, pcre, pipes, pipes-bytestring, pipes-concurrency
+     , pipes-network, random, stm, stm-chans, text, time, transformers
+     , unix, unordered-containers, vcache, vector
      }:
      mkDerivation {
        pname = "EtaMOO";
-       version = "0.2.0.0";
-       sha256 = "365169b4fa2eb1ff2422eedfdb32c0053b8c77cc6c605310c876b46f1ac1f86c";
+       version = "0.3.0.0";
+       sha256 = "501344b7dfe9ec437fd137a247d785eed7d497f35daacd6aed3d940b8837c57c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         array base bytestring case-insensitive containers hashable
-         haskeline mtl network old-locale parsec pipes pipes-bytestring
-         pipes-concurrency pipes-network pureMD5 random stm stm-chans text
-         time transformers unix unordered-containers vector
+         array async base bytestring case-insensitive containers cryptonite
+         hashable haskeline memory mtl network parsec pipes pipes-bytestring
+         pipes-concurrency pipes-network random stm stm-chans text time
+         transformers unix unordered-containers vcache vector
        ];
-       executableSystemDepends = [ pcre ];
+       executablePkgconfigDepends = [ pcre ];
        homepage = "http://verement.github.io/etamoo";
        description = "A new implementation of the LambdaMOO server";
        license = stdenv.lib.licenses.bsd3;
@@ -12421,6 +12419,21 @@ self: {
        license = "GPL";
      }) {};
 
+  "Lazy-Pbkdf2" = callPackage
+    ({ mkDerivation, base, base16-bytestring, binary, bytestring, SHA
+     }:
+     mkDerivation {
+       pname = "Lazy-Pbkdf2";
+       version = "1.0.2";
+       sha256 = "6318c60db0b18877c0edf0a01ba21254b44e9624210bc59834e1dc8116ca86fc";
+       libraryHaskellDepends = [ base binary bytestring SHA ];
+       testHaskellDepends = [
+         base base16-bytestring binary bytestring SHA
+       ];
+       description = "Lazy PBKDF2 generator";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "LazyVault" = callPackage
     ({ mkDerivation, base, directory, filepath, unix }:
      mkDerivation {
@@ -13368,8 +13381,8 @@ self: {
      }:
      mkDerivation {
        pname = "MoeDict";
-       version = "0.0.3";
-       sha256 = "2afdb1f3972f93619b236835680616bbfcd435ee52e097afad04a53f38c4c769";
+       version = "0.0.4";
+       sha256 = "6896d22e1ce081b55fb461fc260ea3613218009ff2c600901a8c4f2f7feef66e";
        libraryHaskellDepends = [
          aeson base bytestring containers text unordered-containers
        ];
@@ -15564,8 +15577,8 @@ self: {
      }:
      mkDerivation {
        pname = "Plot-ho-matic";
-       version = "0.9.0.0";
-       sha256 = "564428ef3f2575cfd89d0a961c4a58997063d5177376212a04e3baf19139a1c3";
+       version = "0.9.0.1";
+       sha256 = "f7cf62c612c0bdf18b7fa4791260ac7f7b1ee7bb58d8f131c358f002a9262ec9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -17739,6 +17752,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "SimpleServer" = callPackage
+    ({ mkDerivation, base, cmdargs, dyre, transformers, wai-routes
+     , warp
+     }:
+     mkDerivation {
+       pname = "SimpleServer";
+       version = "0.1.1.1";
+       sha256 = "e3f3d556ad866c442183788f64d97e4e55e50bedcab4bfef65803352146bdeb4";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base cmdargs dyre transformers wai-routes warp
+       ];
+       executableHaskellDepends = [
+         base cmdargs dyre transformers wai-routes warp
+       ];
+       description = "A simple static file server, for when apache is overkill";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "SizeCompare" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -23705,8 +23738,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-branches";
-       version = "0.1";
-       sha256 = "b792804e0bb8484e2397078751f76b9f2ac042047222446e42d03ab3a1150b11";
+       version = "0.1.1";
+       sha256 = "56bbc2b3e7c9d1db19828b80fd2fc04dcbd1396a32bfd4d5d8e123418428e94a";
        libraryHaskellDepends = [
          aivika aivika-transformers base containers mtl random
        ];
@@ -23789,8 +23822,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-transformers";
-       version = "4.3.1";
-       sha256 = "4acb26db40ab81c6436d1a3407315eddba1d677967a3210674a1783424ab0055";
+       version = "4.3.2";
+       sha256 = "34a0f93a75918a9a4c9db2062522bc6e042b33705797ad7a50215f244fa72355";
        libraryHaskellDepends = [
          aivika array base containers mtl random vector
        ];
@@ -29236,7 +29269,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "apply-refact" = callPackage
+  "apply-refact_0_1_0_0" = callPackage
     ({ mkDerivation, base, containers, directory, filemanip, filepath
      , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact
      , silently, syb, tasty, tasty-expected-failure, tasty-golden
@@ -29264,9 +29297,10 @@ self: {
        ];
        description = "Perform refactorings specified by the refact library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "apply-refact_0_2_0_0" = callPackage
+  "apply-refact" = callPackage
     ({ mkDerivation, base, containers, directory, filemanip, filepath
      , ghc, ghc-exactprint, mtl, optparse-applicative, process, refact
      , silently, syb, tasty, tasty-expected-failure, tasty-golden
@@ -29295,7 +29329,6 @@ self: {
        ];
        description = "Perform refactorings specified by the refact library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "apportionment" = callPackage
@@ -33196,7 +33229,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "b9" = callPackage
+  "b9_0_5_16" = callPackage
     ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes
      , bytestring, conduit, conduit-extra, ConfigFile, directory
      , filepath, free, hashable, hspec, hspec-expectations, mtl
@@ -33227,9 +33260,10 @@ self: {
        homepage = "https://github.com/sheyll/b9-vm-image-builder";
        description = "A tool and library for building virtual machine images";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "b9_0_5_17" = callPackage
+  "b9" = callPackage
     ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes
      , bytestring, conduit, conduit-extra, ConfigFile, directory
      , filepath, free, hashable, hspec, hspec-expectations, mtl
@@ -33260,7 +33294,6 @@ self: {
        homepage = "https://github.com/sheyll/b9-vm-image-builder";
        description = "A tool and library for building virtual machine images";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "babylon" = callPackage
@@ -37869,8 +37902,8 @@ self: {
        pname = "blank-canvas";
        version = "0.6";
        sha256 = "2a0e5c4fc50b1ce43e56b1a11056186c21d565e225da36f90c58f8c0a70f48b3";
-       revision = "1";
-       editedCabalFile = "898e9d275a0c51fe2e9de5f60d521a622186b87fd801c9336ccbaab2b4adf5fb";
+       revision = "2";
+       editedCabalFile = "4a18531b67c35f0343333d8281ad3acdbde48f5ff6a4b7e3e687d4eac4c2f570";
        libraryHaskellDepends = [
          aeson base base-compat base64-bytestring bytestring colour
          containers data-default-class http-types kansas-comet mime-types
@@ -39022,6 +39055,22 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "boombox" = callPackage
+    ({ mkDerivation, base, bytestring, comonad, semigroupoids
+     , semigroups, transformers
+     }:
+     mkDerivation {
+       pname = "boombox";
+       version = "0.0";
+       sha256 = "e48f0f1ee83d128bab671f1ac0077faa13e5f61f89031b77de151d1fcc8704fc";
+       libraryHaskellDepends = [
+         base bytestring comonad semigroupoids semigroups transformers
+       ];
+       homepage = "https://github.com/fumieval/boombox";
+       description = "Chronokinetic stream sources and incremental consumers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "boomerang" = callPackage
     ({ mkDerivation, base, mtl, template-haskell, text }:
      mkDerivation {
@@ -40840,14 +40889,13 @@ self: {
      }) {};
 
   "bytestring-short" = callPackage
-    ({ mkDerivation, base, bytestring, deepseq, QuickCheck }:
+    ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "bytestring-short";
-       version = "0.0.1.0";
-       sha256 = "9b23a18121366a02fcc49a6c63a453500f475a302eab6e5e255e27c2e1308c0c";
-       libraryHaskellDepends = [ base bytestring deepseq ];
-       testHaskellDepends = [ base bytestring QuickCheck ];
-       jailbreak = true;
+       version = "0.1.0.0";
+       sha256 = "39b303951403758dcf626f48e4501b93865d3b4d52d90ae594bbe91a4fc9fca6";
+       libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base ];
        description = "Backport copy of ShortByteString";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -40871,14 +40919,16 @@ self: {
 
   "bytestring-tree-builder" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, QuickCheck
-     , quickcheck-instances, tasty, tasty-hunit, tasty-quickcheck
-     , tasty-smallcheck
+     , quickcheck-instances, semigroups, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text
      }:
      mkDerivation {
        pname = "bytestring-tree-builder";
-       version = "0.2.2.1";
-       sha256 = "7c63bedde6d0179d0c595fa14d0bfe46625e6fc089eb82675fe463ffa015286d";
-       libraryHaskellDepends = [ base base-prelude bytestring ];
+       version = "0.2.4";
+       sha256 = "5c2c3a45e60d1a58b1036139fdc4976554d6539e6333b5e9183cd580b1e10e4f";
+       libraryHaskellDepends = [
+         base base-prelude bytestring semigroups text
+       ];
        testHaskellDepends = [
          base-prelude bytestring QuickCheck quickcheck-instances tasty
          tasty-hunit tasty-quickcheck tasty-smallcheck
@@ -41595,6 +41645,27 @@ self: {
        license = stdenv.lib.licenses.agpl3;
      }) {};
 
+  "cabal-info" = callPackage
+    ({ mkDerivation, base, Cabal, directory, filepath
+     , optparse-applicative
+     }:
+     mkDerivation {
+       pname = "cabal-info";
+       version = "0.1.0.0";
+       sha256 = "d7623ce69cdf180f3266cc14fcf4e53f4d5b2c4d9cb359f145a730878096fc6d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base Cabal directory filepath optparse-applicative
+       ];
+       executableHaskellDepends = [
+         base Cabal filepath optparse-applicative
+       ];
+       homepage = "https://github.com/barrucadu/cabal-info";
+       description = "Read information from cabal files";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "cabal-install_1_18_0_5" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , directory, filepath, HTTP, HUnit, mtl, network, pretty, process
@@ -43759,6 +43830,8 @@ self: {
        pname = "case-insensitive";
        version = "1.2.0.5";
        sha256 = "c450d04e018a027747592482d7b4d8725e334bde38e903d4f2c03f99583d3700";
+       revision = "1";
+       editedCabalFile = "4935ae0d0f5866052676c346aa5efc84f0a0a10570eaa44b6221b6db00f90aa6";
        libraryHaskellDepends = [ base bytestring deepseq hashable text ];
        testHaskellDepends = [
          base bytestring HUnit test-framework test-framework-hunit text
@@ -51847,6 +51920,8 @@ self: {
        pname = "config-value";
        version = "0.4.0.1";
        sha256 = "67e92a664a7d5b80c456d3f0cdbbf6f1fc8d00710509f784221fd01c60342f35";
+       revision = "1";
+       editedCabalFile = "a07f958c50a175dba2f3e4ee6130a1871d14eb6cb28612b4cf040251cd026b28";
        libraryHaskellDepends = [ array base pretty text transformers ];
        libraryToolDepends = [ alex happy ];
        homepage = "https://github.com/glguy/config-value";
@@ -53555,17 +53630,12 @@ self: {
      }) {};
 
   "coroutine-object" = callPackage
-    ({ mkDerivation, base, bytestring, cereal, containers, either, lens
-     , mtl, safecopy, transformers, transformers-free, uuid
-     }:
+    ({ mkDerivation, base, either, free, mtl, transformers }:
      mkDerivation {
        pname = "coroutine-object";
-       version = "0.3";
-       sha256 = "394cb02b87c8b53b4a89a1652954c0c215d302ae1ec0ae66acbcdf7818db1960";
-       libraryHaskellDepends = [
-         base bytestring cereal containers either lens mtl safecopy
-         transformers transformers-free uuid
-       ];
+       version = "0.3.0";
+       sha256 = "cf0fb74baee84167898e899f9e5779c0c71c9d2967fc4a52d25941aeddf0f7c1";
+       libraryHaskellDepends = [ base either free mtl transformers ];
        description = "Object-oriented programming realization using coroutine";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -57357,6 +57427,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-default-instances-bytestring" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class }:
+     mkDerivation {
+       pname = "data-default-instances-bytestring";
+       version = "0.0.1";
+       sha256 = "4c431278d0dc1054fd531281db70d8615f88d9b2a29924aba2567fb3cf647220";
+       libraryHaskellDepends = [ base bytestring data-default-class ];
+       homepage = "https://github.com/trskop/data-default-extra";
+       description = "Default instances for (lazy and strict) ByteString, Builder and ShortByteString";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "data-default-instances-case-insensitive" = callPackage
+    ({ mkDerivation, case-insensitive, data-default-class }:
+     mkDerivation {
+       pname = "data-default-instances-case-insensitive";
+       version = "0.0.1";
+       sha256 = "430135708ad9d0730a4c3a3d1eb574bdc6f07547a5a9c5f30202e1e786070ab4";
+       libraryHaskellDepends = [ case-insensitive data-default-class ];
+       homepage = "https://github.com/trskop/data-default-extra";
+       description = "Default instance for CI type from case-insensitive package";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "data-default-instances-containers" = callPackage
     ({ mkDerivation, base, containers, data-default-class }:
      mkDerivation {
@@ -57379,6 +57473,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-default-instances-new-base" = callPackage
+    ({ mkDerivation, base, data-default-class
+     , data-default-instances-base
+     }:
+     mkDerivation {
+       pname = "data-default-instances-new-base";
+       version = "0.0.1";
+       sha256 = "d923d291a26817f2bc54ba110efc8cb1cefcdb17c7a5af8e2d12506c594b7edc";
+       libraryHaskellDepends = [
+         base data-default-class data-default-instances-base
+       ];
+       homepage = "https://github.com/trskop/data-default-extra";
+       description = "Default instances for types in newer versions of base package";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "data-default-instances-old-locale" = callPackage
     ({ mkDerivation, base, data-default-class, old-locale }:
      mkDerivation {
@@ -57390,6 +57500,44 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-default-instances-text" = callPackage
+    ({ mkDerivation, base, data-default-class, text }:
+     mkDerivation {
+       pname = "data-default-instances-text";
+       version = "0.0.1";
+       sha256 = "db5d4c46cf36ce5956ffd0affe0f2c48e1c000b9bd61821d3e6c1b0171060cdf";
+       libraryHaskellDepends = [ base data-default-class text ];
+       homepage = "https://github.com/trskop/data-default-extra";
+       description = "Default instances for (lazy and strict) Text and Text Builder";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "data-default-instances-unordered-containers" = callPackage
+    ({ mkDerivation, data-default-class, unordered-containers }:
+     mkDerivation {
+       pname = "data-default-instances-unordered-containers";
+       version = "0.0.1";
+       sha256 = "b382a7ea90fd61127782e95fa5e7ee3a17969b762bf0aac4efd15fa7c2552fc0";
+       libraryHaskellDepends = [
+         data-default-class unordered-containers
+       ];
+       homepage = "https://github.com/trskop/data-default-extra";
+       description = "Default instances for unordered-containers";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "data-default-instances-vector" = callPackage
+    ({ mkDerivation, data-default-class, vector }:
+     mkDerivation {
+       pname = "data-default-instances-vector";
+       version = "0.0.1";
+       sha256 = "9ac84473a3af8b0c5e795ea5f84a34a0c18c3b2d5e17ce428206203f9d794666";
+       libraryHaskellDepends = [ data-default-class vector ];
+       homepage = "https://github.com/trskop/data-default-extra";
+       description = "Default instances for types defined in vector package";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "data-dispersal" = callPackage
     ({ mkDerivation, AES, array, base, binary, bytestring, entropy
      , finite-field, matrix, QuickCheck, secret-sharing, spool, syb
@@ -63352,6 +63500,7 @@ self: {
        testHaskellDepends = [
          base base16-bytestring bytestring directory HUnit temporary text
        ];
+       doCheck = false;
        homepage = "https://github.com/IreneKnapp/direct-sqlite";
        description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
        license = stdenv.lib.licenses.bsd3;
@@ -66561,6 +66710,8 @@ self: {
        pname = "dynamic-state";
        version = "0.2.0.0";
        sha256 = "53a09c16380012b35079a7d41fca332fc94b55a0b0c929937af94cc9cad5e0b6";
+       revision = "1";
+       editedCabalFile = "640601c8531dae847d624eac78db22ce0343c1607040a7158454635f486e477c";
        libraryHaskellDepends = [
          base binary bytestring hashable unordered-containers
        ];
@@ -69076,6 +69227,8 @@ self: {
        pname = "enummapset-th";
        version = "0.6.1.0";
        sha256 = "bd7ec9fd9063dcf9c8504fe509abdd15466261ef2ba9ec62d6e6abb51e8694f6";
+       revision = "1";
+       editedCabalFile = "2544cf675da1fd28debde06f5d2c9747da0d8b48aa66f2374886d38333f8dc17";
        libraryHaskellDepends = [
          base containers deepseq template-haskell
        ];
@@ -69683,7 +69836,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "errors" = callPackage
+  "errors_2_1_1" = callPackage
     ({ mkDerivation, base, safe, transformers, transformers-compat
      , unexceptionalio
      }:
@@ -69696,6 +69849,22 @@ self: {
        ];
        description = "Simplified error-handling";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "errors" = callPackage
+    ({ mkDerivation, base, safe, transformers, transformers-compat
+     , unexceptionalio
+     }:
+     mkDerivation {
+       pname = "errors";
+       version = "2.1.2";
+       sha256 = "5c818778b88b76eca016348a04395c1d4913d7c125c0b9c0a1ccf69accf9d887";
+       libraryHaskellDepends = [
+         base safe transformers transformers-compat unexceptionalio
+       ];
+       description = "Simplified error-handling";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "ersatz_0_2_6_1" = callPackage
@@ -70538,6 +70707,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "exact-pi_0_4_1_1" = callPackage
+    ({ mkDerivation, base, numtype-dk }:
+     mkDerivation {
+       pname = "exact-pi";
+       version = "0.4.1.1";
+       sha256 = "ea5928688a202ae54fd7216dbaab073ae660ffec4b3165724d98c938cc1acad8";
+       libraryHaskellDepends = [ base numtype-dk ];
+       homepage = "https://github.com/dmcclean/exact-pi/";
+       description = "Exact rational multiples of pi (and integer powers of pi)";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "exact-real" = callPackage
     ({ mkDerivation, base, checkers, directory, doctest, filepath
      , groups, integer-gmp, memoize, QuickCheck, random, tasty
@@ -74941,6 +75123,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "fixfile" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , directory, exceptions, filepath, hashable, hashtables, lens, mtl
+     , QuickCheck, tasty, tasty-quickcheck, temporary
+     }:
+     mkDerivation {
+       pname = "fixfile";
+       version = "0.1.0.0";
+       sha256 = "f52739e9ecd4b018fa1744890a3fb185da003b08c1244b748719ea657c36321a";
+       libraryHaskellDepends = [
+         array base binary bytestring containers directory filepath hashable
+         hashtables lens mtl temporary
+       ];
+       testHaskellDepends = [
+         base binary bytestring directory exceptions lens mtl QuickCheck
+         tasty tasty-quickcheck temporary
+       ];
+       homepage = "https://github.com/revnull/fixfile";
+       description = "File-backed recursive data structures";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "fixhs" = callPackage
     ({ mkDerivation, attoparsec, attoparsec-enumerator, base
      , bytestring, containers, deepseq, dlist, enumerator, HaXml
@@ -76874,18 +77078,17 @@ self: {
      }) {};
 
   "fquery" = callPackage
-    ({ mkDerivation, base, directory, extensible-exceptions, hashtables
-     , parsec, process, regex-compat, unix
+    ({ mkDerivation, base, directory, filepath, hashtables, parsec
+     , process, regex-compat, unix
      }:
      mkDerivation {
        pname = "fquery";
-       version = "0.2.1.5";
-       sha256 = "f124de95a18d2e177ed1fae3493ad093c8c365d513c0cc958227fc59f2ca38ec";
+       version = "0.2.2";
+       sha256 = "5641c8748ff11e5ba37175eac76ee4b14739a3d4d4711ea5ce023bc8d8559cbe";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base directory extensible-exceptions hashtables parsec process
-         regex-compat unix
+         base directory filepath hashtables parsec process regex-compat unix
        ];
        description = "Installed package query tool for Gentoo Linux";
        license = "unknown";
@@ -77567,8 +77770,8 @@ self: {
     ({ mkDerivation, base, directory }:
      mkDerivation {
        pname = "frown";
-       version = "0.6.2";
-       sha256 = "549b372590e98b4d182310948db8053b32465ce96d78ea8d8953494252c242d7";
+       version = "0.6.2.2";
+       sha256 = "d061880b6b3fca4f2a5c054f5669d9c0747139386c47ccf57db4d5521c02c447";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory ];
@@ -80715,7 +80918,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ghc-typelits-natnormalise" = callPackage
+  "ghc-typelits-natnormalise_0_4" = callPackage
     ({ mkDerivation, base, ghc, ghc-tcplugins-extra, tasty, tasty-hunit
      }:
      mkDerivation {
@@ -80727,6 +80930,21 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "ghc-typelits-natnormalise" = callPackage
+    ({ mkDerivation, base, ghc, ghc-tcplugins-extra, tasty, tasty-hunit
+     }:
+     mkDerivation {
+       pname = "ghc-typelits-natnormalise";
+       version = "0.4.1";
+       sha256 = "d7b1d7059eb0a9254ff6983897141f8fd0ac485dcb2c09eafd19f36dce0e5af7";
+       libraryHaskellDepends = [ base ghc ghc-tcplugins-extra ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
+       homepage = "http://www.clash-lang.org/";
+       description = "GHC typechecker plugin for types of kind GHC.TypeLits.Nat";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "ghc-vis" = callPackage
@@ -82251,7 +82469,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "github" = callPackage
+  "github_0_14_0" = callPackage
     ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat
      , base16-bytestring, binary, binary-orphans, byteable, bytestring
      , containers, cryptohash, deepseq, deepseq-generics, exceptions
@@ -82279,9 +82497,10 @@ self: {
        homepage = "https://github.com/phadej/github";
        description = "Access to the GitHub API, v3";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "github_0_14_1" = callPackage
+  "github" = callPackage
     ({ mkDerivation, aeson, aeson-compat, attoparsec, base, base-compat
      , base16-bytestring, binary, binary-orphans, byteable, bytestring
      , containers, cryptohash, deepseq, deepseq-generics, exceptions
@@ -82309,7 +82528,6 @@ self: {
        homepage = "https://github.com/phadej/github";
        description = "Access to the GitHub API, v3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github-backup" = callPackage
@@ -82320,8 +82538,8 @@ self: {
      }:
      mkDerivation {
        pname = "github-backup";
-       version = "1.20150807";
-       sha256 = "52236cba75a6e9c2a71c77e62839d22d5a672bb3e4bf4bb61d32c3c64d38a8a7";
+       version = "1.20160207";
+       sha256 = "7502179fe38bc00b21f9352a013334bfb9ca51488854bd9c01092cedf2330c64";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -82331,6 +82549,7 @@ self: {
          unix-compat
        ];
        executableToolDepends = [ git ];
+       jailbreak = true;
        homepage = "https://github.com/joeyh/github-backup";
        description = "backs up everything github knows about a repository, to the repository";
        license = stdenv.lib.licenses.gpl3;
@@ -85789,7 +86008,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "graph-core" = callPackage
+  "graph-core_0_2_2_0" = callPackage
     ({ mkDerivation, base, containers, deepseq, hashable, HTF, mtl
      , QuickCheck, safe, unordered-containers, vector
      }:
@@ -85810,24 +86029,50 @@ self: {
        homepage = "https://github.com/factisresearch/graph-core";
        description = "Fast, memory efficient and persistent graph implementation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "graph-core" = callPackage
+    ({ mkDerivation, base, containers, deepseq, hashable, HTF, mtl
+     , QuickCheck, safe, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "graph-core";
+       version = "0.3.0.0";
+       sha256 = "378f0baa40ebbb78e8c389f79e363eb573cdf182f799684d2f3d6ac51b10e854";
+       libraryHaskellDepends = [
+         base containers deepseq hashable mtl safe unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         base containers deepseq hashable HTF mtl QuickCheck safe
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/factisresearch/graph-core";
+       description = "Fast, memory efficient and persistent graph implementation";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "graph-generators" = callPackage
-    ({ mkDerivation, base, Cabal, containers, fgl, hspec
+    ({ mkDerivation, base, Cabal, containers, directory, fgl, hspec
      , hspec-expectations, multiset, mwc-random, QuickCheck
      }:
      mkDerivation {
        pname = "graph-generators";
-       version = "0.1.2.0";
-       sha256 = "3ae508177ce01f86cfcc091421294a1a0736a56f9f8a34cd07cc67486b168247";
+       version = "0.1.3.0";
+       sha256 = "1fe09712b7c52b18da467facf0ffb78e7de515113401b5c2d8adf7fb13603d50";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
          base containers fgl multiset mwc-random
        ];
+       executableHaskellDepends = [
+         base containers directory fgl multiset mwc-random
+       ];
        testHaskellDepends = [
          base Cabal containers fgl hspec hspec-expectations multiset
          mwc-random QuickCheck
        ];
-       jailbreak = true;
        homepage = "https://github.com/ulikoehler/graph-random";
        description = "Functions for generating structured or random FGL graphs";
        license = stdenv.lib.licenses.asl20;
@@ -85886,13 +86131,12 @@ self: {
      }:
      mkDerivation {
        pname = "graph-rewriting-gl";
-       version = "0.7.5";
-       sha256 = "1ece884c105a81479a57d215b50ff22e7d60a86d6b04ab072724192132fcd633";
+       version = "0.7.6";
+       sha256 = "a6157c17e07fbf167b64ebfa51e256794fd99ce1fff4ede88035d8c9e4299239";
        libraryHaskellDepends = [
          AC-Vector base base-unicode-symbols containers GLUT graph-rewriting
          graph-rewriting-layout OpenGL
        ];
-       jailbreak = true;
        homepage = "http://rochel.info/#graph-rewriting";
        description = "OpenGL interface for interactive port graph rewriting";
        license = stdenv.lib.licenses.bsd3;
@@ -85906,8 +86150,8 @@ self: {
      }:
      mkDerivation {
        pname = "graph-rewriting-lambdascope";
-       version = "0.5.6";
-       sha256 = "77efc3d0516306119c1e959a7bfb37428e9cfb67e6e34cc7bfb728216c159ee3";
+       version = "0.5.8";
+       sha256 = "e56293febd459060627af0912e7c1d0a0d6840fa31c2d5e9fcc1ca9bf9914db1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -85915,7 +86159,6 @@ self: {
          graph-rewriting-layout graph-rewriting-strategies IndentParser
          OpenGL parsec
        ];
-       jailbreak = true;
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Lambdascope, an optimal evaluator of the lambda calculus, as an interactive graph-rewriting system";
        license = stdenv.lib.licenses.bsd3;
@@ -85928,12 +86171,11 @@ self: {
      }:
      mkDerivation {
        pname = "graph-rewriting-layout";
-       version = "0.5.3";
-       sha256 = "c5950e8c5714968e59203518335dad4f796191248a8f762c8676343b9567da25";
+       version = "0.5.4";
+       sha256 = "052f1d481edf398cfd486849d981de20a298842a75a20864190b921af8fd7d92";
        libraryHaskellDepends = [
          AC-Vector base base-unicode-symbols graph-rewriting
        ];
-       jailbreak = true;
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Force-directed node placement intended for incremental graph drawing";
        license = stdenv.lib.licenses.bsd3;
@@ -85946,15 +86188,14 @@ self: {
      }:
      mkDerivation {
        pname = "graph-rewriting-ski";
-       version = "0.6.4";
-       sha256 = "4409c3422694fa332cafb8cde7711d4442c3e0cd412daa401e9d1e413ee3ae49";
+       version = "0.6.5";
+       sha256 = "019378940fb886e668a57a580b2df65309ab80def00555c77cf75b224923ac1a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl
          graph-rewriting-layout OpenGL parsec
        ];
-       jailbreak = true;
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Two evalutors of the SKI combinator calculus as interactive graph rewrite systems";
        license = stdenv.lib.licenses.bsd3;
@@ -85967,12 +86208,11 @@ self: {
      }:
      mkDerivation {
        pname = "graph-rewriting-strategies";
-       version = "0.2.3";
-       sha256 = "59a6a16d6c4d51608a0e07dc611e89ee4dc376c4096488a460e9dabafab93556";
+       version = "0.2.4";
+       sha256 = "6230a111c89e765aba002eaf62db138e7ec848474f78b300c21b7d7e087caa57";
        libraryHaskellDepends = [
          base base-unicode-symbols containers graph-rewriting
        ];
-       jailbreak = true;
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Evaluation strategies for port-graph rewriting systems";
        license = stdenv.lib.licenses.bsd3;
@@ -85986,8 +86226,8 @@ self: {
      }:
      mkDerivation {
        pname = "graph-rewriting-trs";
-       version = "0.1.6";
-       sha256 = "cf237b8faf13a36d5bb594a64b2768db0203a819b083c02ff45282ea07ab11ed";
+       version = "0.1.7";
+       sha256 = "e5e3a8e1bf70e39a933cd0b4d395eaf4c912cdbb547926b6a26472163fdbe92e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -85995,7 +86235,6 @@ self: {
          graph-rewriting graph-rewriting-gl graph-rewriting-layout OpenGL
          uu-parsinglib
        ];
-       jailbreak = true;
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Evaluate first-order applicative term rewrite systems interactively using graph reduction";
        license = stdenv.lib.licenses.bsd3;
@@ -86009,15 +86248,14 @@ self: {
      }:
      mkDerivation {
        pname = "graph-rewriting-ww";
-       version = "0.3.4";
-       sha256 = "5c6c65e3904c00c3ac62ebba5ef1ce64604101cb3f76e944a034e1127c2c3a99";
+       version = "0.3.5";
+       sha256 = "649160c0315861f275012e891a074a96aa6f59a3890f2e69f9612a1d91dece5a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base base-unicode-symbols GLUT graph-rewriting graph-rewriting-gl
          graph-rewriting-layout IndentParser OpenGL parsec
        ];
-       jailbreak = true;
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Evaluator of the lambda-calculus in an interactive graph rewriting system with explicit sharing";
        license = stdenv.lib.licenses.bsd3;
@@ -86537,6 +86775,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "greplicate" = callPackage
+    ({ mkDerivation, base, directory, doctest, filepath, lens
+     , QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "greplicate";
+       version = "0.0.2";
+       sha256 = "c73d6b8f586e6004d3d66bb7b5d1402941021ce8d29a309fbb61c45f28753ce5";
+       libraryHaskellDepends = [ base lens ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/NICTA/greplicate";
+       description = "Generalised replicate functions";
+       license = "unknown";
+     }) {};
+
   "grid" = callPackage
     ({ mkDerivation, base, cereal, containers, QuickCheck
      , test-framework, test-framework-quickcheck2
@@ -88450,6 +88705,47 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hOpenPGP_2_4_3" = 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.4.3";
+       sha256 = "3e7ff2430415856b2d99d3cba144f9c41fcfe0cceea5d0967909b4033f0a86c9";
+       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
@@ -89622,26 +89918,27 @@ self: {
      }) {};
 
   "hackport" = callPackage
-    ({ mkDerivation, array, base, bytestring, containers, deepseq
-     , directory, extensible-exceptions, filepath, HTTP, HUnit, MissingH
-     , network, network-uri, old-locale, old-time, parsec, pretty
-     , process, regex-compat, tar, time, unix, xml, zlib
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , deepseq, directory, extensible-exceptions, filepath, HTTP, HUnit
+     , MissingH, network, network-uri, old-locale, old-time, parsec
+     , pretty, process, random, regex-compat, stm, tar, time, unix, xml
+     , zlib
      }:
      mkDerivation {
        pname = "hackport";
-       version = "0.4.6";
-       sha256 = "5b5cd178fbefe5363bd4f68ca98386fd2762df88ff24435e1999f28e80b1e14e";
+       version = "0.4.7";
+       sha256 = "17dc05163b456dceeb00180a03bb56f4218e5c5e1145c7ad12af13a261b0cf36";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         array base bytestring containers deepseq directory
+         array base binary bytestring containers deepseq directory
          extensible-exceptions filepath HTTP MissingH network network-uri
-         old-locale old-time parsec pretty process regex-compat tar time
-         unix xml zlib
+         old-locale old-time parsec pretty process random regex-compat stm
+         tar time unix xml zlib
        ];
        testHaskellDepends = [
-         base bytestring containers deepseq directory extensible-exceptions
-         filepath HUnit pretty process time unix xml
+         base binary bytestring containers deepseq directory
+         extensible-exceptions filepath HUnit pretty process time unix xml
        ];
        description = "Hackage and Portage integration tool";
        license = "GPL";
@@ -89984,6 +90281,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hahp" = callPackage
+    ({ mkDerivation, base, containers, hmatrix, parallel, time }:
+     mkDerivation {
+       pname = "hahp";
+       version = "0.1.2";
+       sha256 = "8c13015c685d5abf70ec6fbb7e6b50304f8689bab332d078d53d815e66f9b7fa";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers hmatrix parallel time ];
+       executableHaskellDepends = [ base time ];
+       description = "Analytic Hierarchy Process";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
   "haiji" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, data-default, doctest
      , filepath, mtl, process-extras, scientific, tagged, tasty
@@ -93242,12 +93553,13 @@ self: {
      }) {};
 
   "haskell-bcrypt" = callPackage
-    ({ mkDerivation, base, bytestring }:
+    ({ mkDerivation, base, bytestring, QuickCheck, random }:
      mkDerivation {
        pname = "haskell-bcrypt";
-       version = "0.3.1";
-       sha256 = "ed281ee8520e24b7d0a818494d48ab1c57e8b06d47a76207e058805aefcd0cf1";
+       version = "0.3.2";
+       sha256 = "427c3f95a0b9e3bd53a8d4b17b5f44bf3656ae1d5cfa93e48f2be85e6ea48a5a";
        libraryHaskellDepends = [ base bytestring ];
+       testHaskellDepends = [ base bytestring QuickCheck random ];
        homepage = "http://www.github.com/zbskii/haskell-bcrypt";
        description = "A bcrypt implementation for haskell";
        license = stdenv.lib.licenses.mit;
@@ -95308,8 +95620,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskore";
-       version = "0.2.0.7";
-       sha256 = "5ebbd8bf1d5164a67c12d7f42e6c2cc4f3a0ea996fd5644651c0ea5f6e579a92";
+       version = "0.2.0.8";
+       sha256 = "b4ac45e260e8ae417347985cc84062b684e59cc3519d18e765fa2d35f7c3d429";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -95950,8 +96262,8 @@ self: {
     ({ mkDerivation, base-prelude, hasql, resource-pool, time }:
      mkDerivation {
        pname = "hasql-pool";
-       version = "0.3";
-       sha256 = "7afb74396758b9df4e5a5c0b2d63de1253e7717011eaea6269f9740423f18428";
+       version = "0.4";
+       sha256 = "6bb18b7f41a471e0260a60ecd0a4495ccef111e3151d0b3e55ae5e3865c3850e";
        libraryHaskellDepends = [ base-prelude hasql resource-pool time ];
        homepage = "https://github.com/nikita-volkov/hasql-pool";
        description = "A pool of connections for Hasql";
@@ -97249,6 +97561,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hcoap" = callPackage
+    ({ mkDerivation, async, base, binary, bytestring, HUnit, mtl
+     , network, QuickCheck, random, stm, time
+     }:
+     mkDerivation {
+       pname = "hcoap";
+       version = "0.1.0.2";
+       sha256 = "71a2ecfde4fc2a17d116d5cfacd6868b6abe7ae851b834710173dc6e449952a2";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base binary bytestring mtl network random stm time
+       ];
+       executableHaskellDepends = [ base bytestring network ];
+       testHaskellDepends = [
+         base bytestring HUnit network QuickCheck random
+       ];
+       homepage = "https://github.com/lulf/hcoap";
+       description = "CoAP implementation for Haskell";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "hcron" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, mtl
      , old-locale, pretty, process, random, stm, time
@@ -101049,6 +101383,8 @@ self: {
        pname = "hjsmin";
        version = "0.1.4.7";
        sha256 = "0e157fa21ad14996e9b416f78c4af595459064dc63a3cbb3ed38e3788d8e89bf";
+       revision = "1";
+       editedCabalFile = "8b24f51f4fa13d3837421f03ef731625bde85e0e2913bc43377098d44d9c2521";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -101078,6 +101414,8 @@ self: {
        pname = "hjsmin";
        version = "0.1.4.8";
        sha256 = "439f3524795e34b9999818155d2d3de0fe00ec856b3f57cb20d2e22d3e220188";
+       revision = "1";
+       editedCabalFile = "626a6e3677688c88a40f61f25025b67382c28826b908e55e4f98b9be1681c061";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -101107,6 +101445,39 @@ self: {
        pname = "hjsmin";
        version = "0.1.5.0";
        sha256 = "f4d81fd8a1cbe65642ff749aeb5866ed9487613a54d7efe6566805fe3f3bf1d7";
+       revision = "1";
+       editedCabalFile = "3f4d4ae3a1f8b219a975059ebe9957e45f260ed1e6802d886ad3f5ddc931c684";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers language-javascript text
+       ];
+       executableHaskellDepends = [
+         base blaze-builder bytestring containers language-javascript
+         optparse-applicative text
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring Cabal containers HUnit
+         language-javascript QuickCheck test-framework test-framework-hunit
+         text
+       ];
+       homepage = "http://github.com/erikd/hjsmin";
+       description = "Haskell implementation of a javascript minifier";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hjsmin_0_1_5_1" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
+     , HUnit, language-javascript, optparse-applicative, QuickCheck
+     , test-framework, test-framework-hunit, text
+     }:
+     mkDerivation {
+       pname = "hjsmin";
+       version = "0.1.5.1";
+       sha256 = "d1e36c8fe5dfd46819425877ca7fc6a5b422fce138de9787b7409850252decff";
+       revision = "1";
+       editedCabalFile = "84b6550796b29b1ee7bec20c47223fe3e2e0c57abc52bc2565b2ac6e7e929351";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -101134,8 +101505,8 @@ self: {
      }:
      mkDerivation {
        pname = "hjsmin";
-       version = "0.1.5.1";
-       sha256 = "d1e36c8fe5dfd46819425877ca7fc6a5b422fce138de9787b7409850252decff";
+       version = "0.1.5.2";
+       sha256 = "c2d04fe6b1f45d88d6b2e382b0fdf648a18b0cd913c2688af7ab77d7c27dd330";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -102210,8 +102581,8 @@ self: {
      }:
      mkDerivation {
        pname = "hlint";
-       version = "1.9.27";
-       sha256 = "3e467fdd5ce0283f4513055230ef2ea3672a2b33469d8c73780ed240f23cdf6d";
+       version = "1.9.28";
+       sha256 = "eb06658a19c362a1f522dc495a6d5e5a90af68cefbcc178713aa8ee0a4c7f710";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -107163,8 +107534,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.1.5.5";
-       sha256 = "48422c732a18cd212d12c269dce834d4c781886573c190100fe9682394305db2";
+       version = "0.1.6.0";
+       sha256 = "93a1bd6462f45d9abf39cba0479f519f562c62d4bc30a3df3153314b7d300345";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -107187,7 +107558,6 @@ self: {
          aeson aeson-lens async base containers data-default deepseq hformat
          hspec lens mtl text
        ];
-       jailbreak = true;
        homepage = "https://github.com/mvoidex/hsdev";
        description = "Haskell development library and tool with support of autocompletion, symbol info, go to declaration, find references etc";
        license = stdenv.lib.licenses.bsd3;
@@ -116584,6 +116954,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "include-file_0_1_0_3" = callPackage
+    ({ mkDerivation, base, bytestring, random, template-haskell }:
+     mkDerivation {
+       pname = "include-file";
+       version = "0.1.0.3";
+       sha256 = "208f1f3bdc717f5f953cb7c9935c84d6a6291b7cd5ed8a22fa8567184be33d29";
+       libraryHaskellDepends = [
+         base bytestring random template-haskell
+       ];
+       testHaskellDepends = [ base bytestring ];
+       description = "Inclusion of files in executables at compile-time";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "incremental-computing" = callPackage
     ({ mkDerivation, base, Cabal, cabal-test-quickcheck, containers
      , dlist, fingertree, order-maintenance, QuickCheck, transformers
@@ -117789,8 +118174,11 @@ self: {
        pname = "intervals";
        version = "0.7.0.1";
        sha256 = "e92a527f8f23b7262f58102b9d3975220f926e73c3f7e866f5da79a11e210b0b";
+       revision = "1";
+       editedCabalFile = "ff335c7921df2f341b02893cf5aa3118ca96d3b3650d39f20467838a5931d44b";
        libraryHaskellDepends = [ array base distributive ghc-prim ];
        testHaskellDepends = [ base directory doctest filepath ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/intervals";
        description = "Interval Arithmetic";
        license = stdenv.lib.licenses.bsd3;
@@ -117928,6 +118316,8 @@ self: {
        pname = "invariant";
        version = "0.3";
        sha256 = "c45b9a150b3b48b22ec41964481bbe85567b3eab0ae15b784dd75b9a666a7a00";
+       revision = "1";
+       editedCabalFile = "560be9fd410c36d98bd6d1203a9916bf321d26d1b7c2b5ba259b30215245cd6f";
        libraryHaskellDepends = [
          array base bifunctors containers contravariant ghc-prim profunctors
          semigroups StateVar stm tagged template-haskell transformers
@@ -117939,6 +118329,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "invariant_0_3_1" = callPackage
+    ({ mkDerivation, array, base, bifunctors, containers, contravariant
+     , ghc-prim, hspec, profunctors, QuickCheck, semigroups, StateVar
+     , stm, tagged, template-haskell, transformers, transformers-compat
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "invariant";
+       version = "0.3.1";
+       sha256 = "db88ce3955ba99cec99dd1da2d917ce26c204837a6779712dd55f79cc873fdff";
+       libraryHaskellDepends = [
+         array base bifunctors containers contravariant ghc-prim profunctors
+         semigroups StateVar stm tagged template-haskell transformers
+         transformers-compat unordered-containers
+       ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/nfrisby/invariant-functors";
+       description = "Haskell 98 invariant functors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "invertible-syntax" = callPackage
     ({ mkDerivation, base, partial-isomorphisms }:
      mkDerivation {
@@ -120468,12 +120880,11 @@ self: {
      }:
      mkDerivation {
        pname = "json-ast-quickcheck";
-       version = "0.1";
-       sha256 = "68c77372e7d7f1c7340d6932d91bc72fa0f24501930e01fa77387ed0e8931f1b";
+       version = "0.2";
+       sha256 = "41a6cab47756614727427311c08326ae960d7b88c21a5c9c5910f29a66e6cd04";
        libraryHaskellDepends = [
          base json-ast QuickCheck quickcheck-instances
        ];
-       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/json-ast-quickcheck";
        description = "Compatibility layer for \"json-ast\" and \"QuickCheck\"";
        license = stdenv.lib.licenses.mit;
@@ -120729,20 +121140,19 @@ self: {
      }) {};
 
   "json-encoder" = callPackage
-    ({ mkDerivation, base, base-prelude, bytestring
-     , bytestring-tree-builder, contravariant, contravariant-extras
-     , scientific, text
+    ({ mkDerivation, base-prelude, bytestring, bytestring-tree-builder
+     , contravariant, contravariant-extras, scientific, semigroups, text
      }:
      mkDerivation {
        pname = "json-encoder";
-       version = "0.1.3.1";
-       sha256 = "0127462ef932a643adc948bbb1de89de78d705a464c2591aedafddcd8382fadc";
+       version = "0.1.5";
+       sha256 = "bd71014bca5df3be295bfd851eb39d4c30bc38acaa7fd277f6cb6d8ac60c9bd4";
        libraryHaskellDepends = [
-         base base-prelude bytestring bytestring-tree-builder contravariant
-         contravariant-extras scientific text
+         base-prelude bytestring bytestring-tree-builder contravariant
+         contravariant-extras scientific semigroups text
        ];
        homepage = "https://github.com/sannsyn/json-encoder";
-       description = "A very fast single-pass JSON encoder with a declarative DSL";
+       description = "A direct-to-bytes single-pass JSON encoder with a declarative DSL";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -120832,6 +121242,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "json-pointer-hasql" = callPackage
+    ({ mkDerivation, aeson, base-prelude, either, hasql, json-pointer
+     , rebase, text, transformers
+     }:
+     mkDerivation {
+       pname = "json-pointer-hasql";
+       version = "0.1";
+       sha256 = "5ed9ae42aadc1fde554480f055df77f751e5eb1c5386d0ed71883dfe9d534a8a";
+       libraryHaskellDepends = [ base-prelude hasql json-pointer text ];
+       testHaskellDepends = [
+         aeson either hasql json-pointer rebase transformers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/sannsyn/json-pointer-hasql";
+       description = "JSON Pointer extensions for Hasql";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "json-python" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, pureMD5
      , python, template-haskell
@@ -124014,6 +124442,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lambdacube-compiler" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, containers
+     , deepseq, directory, exceptions, filepath, indentation
+     , lambdacube-ir, monad-control, mtl, optparse-applicative, parsec
+     , pretty-compact, QuickCheck, tasty, tasty-quickcheck, text, time
+     , vector
+     }:
+     mkDerivation {
+       pname = "lambdacube-compiler";
+       version = "0.4.0.0";
+       sha256 = "745a5593e7a8bf9af194c747a62ad32e16076156841863093b6aefb032b5ac74";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base containers deepseq directory exceptions filepath
+         indentation lambdacube-ir mtl parsec pretty-compact text vector
+       ];
+       executableHaskellDepends = [
+         aeson async base bytestring containers deepseq directory exceptions
+         filepath indentation lambdacube-ir monad-control mtl
+         optparse-applicative parsec pretty-compact QuickCheck tasty
+         tasty-quickcheck text time vector
+       ];
+       jailbreak = true;
+       homepage = "http://lambdacube3d.com";
+       description = "LambdaCube 3D is a DSL to program GPUs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lambdacube-core" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-trie, containers, mtl
      , vector
@@ -124088,26 +124545,34 @@ self: {
      }) {};
 
   "lambdacube-gl" = callPackage
-    ({ mkDerivation, base, binary, bitmap, bytestring, bytestring-trie
-     , containers, lambdacube-core, lambdacube-edsl, language-glsl, mtl
-     , OpenGLRaw, prettyclass, vector
+    ({ mkDerivation, base, bytestring, containers, JuicyPixels
+     , lambdacube-ir, mtl, OpenGLRaw, vector, vector-algorithms
      }:
      mkDerivation {
        pname = "lambdacube-gl";
-       version = "0.2.2";
-       sha256 = "bee622839c09a05fdab01fb88c15680eb0cc0feda1a580ddb81fa2cbbefa1d28";
+       version = "0.4.0.2";
+       sha256 = "f9ebec4a981381ffa9f998a636c0aba3f4425b4fb2ae06650ff24e9109328174";
        libraryHaskellDepends = [
-         base binary bitmap bytestring bytestring-trie containers
-         lambdacube-core lambdacube-edsl language-glsl mtl OpenGLRaw
-         prettyclass vector
+         base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw
+         vector vector-algorithms
        ];
-       jailbreak = true;
-       homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
-       description = "OpenGL backend for LambdaCube graphics language (main package)";
+       homepage = "http://lambdacube3d.com";
+       description = "OpenGL 3.3 Core Profile backend for LambdaCube 3D";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "lambdacube-ir" = callPackage
+    ({ mkDerivation, aeson, base, containers, mtl, text, vector }:
+     mkDerivation {
+       pname = "lambdacube-ir";
+       version = "0.2.0.0";
+       sha256 = "488cbb21a8dca80c16552d3aca868d5aa7085b7bfa2e9ea7c92965bd1e288c48";
+       libraryHaskellDepends = [ aeson base containers mtl text vector ];
+       description = "LambdaCube 3D intermediate representation of 3D graphics pipelines";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "lambdacube-samples" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-trie, elerea, GLFW-b
      , lambdacube-core, lambdacube-edsl, lambdacube-gl, mtl, OpenGLRaw
@@ -126483,6 +126948,8 @@ self: {
        pname = "lens";
        version = "4.13.1";
        sha256 = "987137d11f189e08ceeb0e2e5c047c1456ad666642974067d2d8e11309ef6b7b";
+       revision = "1";
+       editedCabalFile = "35b2594d3e37b4294c2a9dd3e7620af7a27ce10044631a2f91611cdaf66a55f9";
        libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring comonad containers
          contravariant distributive exceptions filepath free ghc-prim
@@ -126686,6 +127153,8 @@ self: {
        pname = "lens-family-th";
        version = "0.4.0.0";
        sha256 = "a52e7e99bb0e324ca9dc09f441db98443ad7d9af227221a461c29f75ef1ccc09";
+       revision = "1";
+       editedCabalFile = "b2236e693bf705ef944458bc08e449b6e62da03c9370cee79858a3df01ef78dd";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/DanBurton/lens-family-th#readme";
        description = "Generate lens-family style lenses";
@@ -126699,8 +127168,8 @@ self: {
        pname = "lens-family-th";
        version = "0.4.1.0";
        sha256 = "754fdc4c7c292b160a87974ec3690b755fb93f3877c8080d331cfa6ec4b39e20";
-       revision = "1";
-       editedCabalFile = "13c96ddf2d410ec4e6671c8412710b7cdbbfc837ff5be1d09a6dbb9ecdb9285d";
+       revision = "2";
+       editedCabalFile = "978c149edc250ed1c91c03be304b752415e93ab5eb76aacb194bbe94135c356a";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "http://github.com/DanBurton/lens-family-th#readme";
        description = "Generate lens-family style lenses";
@@ -127887,6 +128356,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "lift-generics_0_1_1" = callPackage
+    ({ mkDerivation, base, base-compat, generic-deriving, ghc-prim
+     , hspec, template-haskell
+     }:
+     mkDerivation {
+       pname = "lift-generics";
+       version = "0.1.1";
+       sha256 = "07cf2cc4416fb7b0e45595da8a964459498da976e18cdcc169ac2416143930cb";
+       libraryHaskellDepends = [
+         base generic-deriving ghc-prim template-haskell
+       ];
+       testHaskellDepends = [
+         base base-compat generic-deriving hspec template-haskell
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/RyanGlScott/lift-generics";
+       description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "lifted-async_0_2_0_2" = callPackage
     ({ mkDerivation, async, base, HUnit, lifted-base, monad-control
      , mtl, tasty, tasty-hunit, tasty-th, transformers-base
@@ -129871,8 +130361,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-general";
-       version = "3.5.1.0";
-       sha256 = "7c6a6634abeb541c1fea59b34743dfb37b71f92359b0d481e50f962486f99da4";
+       version = "3.5.1.1";
+       sha256 = "e1f636b445b5a161750273d11a4a70ac1263c237dd47b1b347c6150fdfd29733";
        libraryHaskellDepends = [
          array base bytestring containers llvm-general-pure mtl parsec
          setenv template-haskell transformers transformers-compat
@@ -129884,6 +130374,7 @@ self: {
          test-framework test-framework-hunit test-framework-quickcheck2
          transformers transformers-compat
        ];
+       homepage = "http://github.com/bscarlet/llvm-general/";
        description = "General purpose LLVM bindings";
        license = stdenv.lib.licenses.bsd3;
      }) {llvm-config = null;};
@@ -130616,13 +131107,12 @@ self: {
      }:
      mkDerivation {
        pname = "logging-effect";
-       version = "1.0.0";
-       sha256 = "9c7deabf027c2e7bfc800b26f103b259e25ee9ef814ce53260df3950aa682e8f";
+       version = "1.0.1";
+       sha256 = "8a27b42451dbcda3faba5db20c275061f8133441b09b0138ac36037ff0108af1";
        libraryHaskellDepends = [
          async base exceptions free monad-control mtl stm stm-delay text
          time transformers transformers-base wl-pprint-text
        ];
-       jailbreak = true;
        homepage = "https://github.com/ocharles/logging-effect";
        description = "A mtl-style monad transformer for general purpose & compositional logging";
        license = stdenv.lib.licenses.bsd3;
@@ -133415,8 +133905,8 @@ self: {
      }:
      mkDerivation {
        pname = "mappy";
-       version = "0.1.2.0";
-       sha256 = "22f99e145fd8e3208078ad67761bcdc718abd916d7c4a279aa0c09dfcb9de208";
+       version = "0.1.2.1";
+       sha256 = "54f6af643b2aeb6245ec92717a27dfca4e8b0b65442fef39cf09cd09b83268d8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -134444,6 +134934,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mdp" = callPackage
+    ({ mkDerivation, base, containers, HTF, HUnit, QuickCheck, vector
+     }:
+     mkDerivation {
+       pname = "mdp";
+       version = "0.1.0.0";
+       sha256 = "816474886b59ab0f0cd5c4779f2702e9b7484fe94179a426894f561828f86711";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base containers vector ];
+       executableHaskellDepends = [ base containers vector ];
+       testHaskellDepends = [
+         base containers HTF HUnit QuickCheck vector
+       ];
+       description = "Tools for solving Markov Decision Processes";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "mecab" = callPackage
     ({ mkDerivation, base, bytestring, mecab, text }:
      mkDerivation {
@@ -136676,7 +137184,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mmorph" = callPackage
+  "mmorph_1_0_5" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "mmorph";
@@ -136685,9 +137193,10 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "Monad morphisms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mmorph_1_0_6" = callPackage
+  "mmorph" = callPackage
     ({ mkDerivation, base, mtl, transformers, transformers-compat }:
      mkDerivation {
        pname = "mmorph";
@@ -136698,7 +137207,6 @@ self: {
        ];
        description = "Monad morphisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mmtl" = callPackage
@@ -136816,7 +137324,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "modify-fasta" = callPackage
+  "modify-fasta_0_8_0_4" = callPackage
     ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative
      , pipes, pipes-text, regex-tdfa, regex-tdfa-text, split, text
      , text-show
@@ -136838,6 +137346,31 @@ self: {
        homepage = "https://github.com/GregorySchwartz/modify-fasta";
        description = "Modify fasta (and CLIP) files in several optional ways";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "modify-fasta" = callPackage
+    ({ mkDerivation, base, containers, fasta, mtl, optparse-applicative
+     , pipes, pipes-text, regex-tdfa, regex-tdfa-text, split, text
+     , text-show
+     }:
+     mkDerivation {
+       pname = "modify-fasta";
+       version = "0.8.1.3";
+       sha256 = "362c99eb19428ed9d8f950ef5a8a377d4d9a4a8feaca229bf3aabb9ee0908585";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base containers fasta regex-tdfa regex-tdfa-text split text
+         text-show
+       ];
+       executableHaskellDepends = [
+         base containers fasta mtl optparse-applicative pipes pipes-text
+         split text
+       ];
+       homepage = "https://github.com/GregorySchwartz/modify-fasta";
+       description = "Modify fasta (and CLIP) files in several optional ways";
+       license = stdenv.lib.licenses.gpl2;
      }) {};
 
   "modsplit" = callPackage
@@ -137299,6 +137832,23 @@ self: {
        license = "GPL";
      }) {};
 
+  "monad-coroutine_0_9_0_2" = callPackage
+    ({ mkDerivation, base, monad-parallel, transformers
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "monad-coroutine";
+       version = "0.9.0.2";
+       sha256 = "c648272e0578f8d590bdf834aaf2866ebe94474517c34d8e34b4c821469b4da4";
+       libraryHaskellDepends = [
+         base monad-parallel transformers transformers-compat
+       ];
+       homepage = "http://trac.haskell.org/SCC/wiki/monad-coroutine";
+       description = "Coroutine monad transformer for suspending and resuming monadic computations";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-exception" = callPackage
     ({ mkDerivation, base, monad-control, mtl-evil-instances
      , transformers, transformers-base
@@ -137682,7 +138232,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monad-logger" = callPackage
+  "monad-logger_0_3_17" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, conduit
      , conduit-extra, exceptions, fast-logger, lifted-base
      , monad-control, monad-loops, mtl, resourcet, stm, stm-chans
@@ -137702,9 +138252,10 @@ self: {
        homepage = "https://github.com/kazu-yamamoto/logger";
        description = "A class of monads which can log messages";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monad-logger_0_3_18" = callPackage
+  "monad-logger" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, conduit
      , conduit-extra, exceptions, fast-logger, lifted-base
      , monad-control, monad-loops, mtl, resourcet, stm, stm-chans
@@ -137724,7 +138275,6 @@ self: {
        homepage = "https://github.com/kazu-yamamoto/logger";
        description = "A class of monads which can log messages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-logger-json" = callPackage
@@ -137967,6 +138517,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "monad-parallel_0_7_2_1" = callPackage
+    ({ mkDerivation, base, parallel, transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "monad-parallel";
+       version = "0.7.2.1";
+       sha256 = "8bd8e90bcf9b71375bea031703551c09a51137c05377876dde2616e375782065";
+       libraryHaskellDepends = [
+         base parallel transformers transformers-compat
+       ];
+       homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel";
+       description = "Parallel execution of monadic computations";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "monad-parallel-progressbar" = callPackage
     ({ mkDerivation, base, monad-parallel, monadIO
      , terminal-progress-bar
@@ -149137,8 +149703,8 @@ self: {
     ({ mkDerivation, base, csv, pandoc, pandoc-types, text }:
      mkDerivation {
        pname = "pandoc-csv2table";
-       version = "1.0.2";
-       sha256 = "0818e8b8e88e98b162a4fb7a9369cf3e54a2108f428d3a88b0217c7b58a6d961";
+       version = "1.0.4";
+       sha256 = "c1f14975239d5b26faba78f3db6c84573d4db99ab021560c184755259ca61b82";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base csv pandoc pandoc-types text ];
@@ -151064,6 +151630,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pdf-toolbox-content_0_0_5_1" = callPackage
+    ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring
+     , containers, io-streams, pdf-toolbox-core, text
+     }:
+     mkDerivation {
+       pname = "pdf-toolbox-content";
+       version = "0.0.5.1";
+       sha256 = "1c104e232e178603ff9dd8c6eaaf0ccbda918c70b40ed63f08fa1922a3c88488";
+       libraryHaskellDepends = [
+         attoparsec base base16-bytestring bytestring containers io-streams
+         pdf-toolbox-core text
+       ];
+       homepage = "https://github.com/Yuras/pdf-toolbox";
+       description = "A collection of tools for processing PDF files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pdf-toolbox-core" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, errors
      , io-streams, scientific, transformers, zlib-bindings
@@ -151081,6 +151665,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pdf-toolbox-core_0_0_4_1" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, errors
+     , io-streams, scientific, transformers, zlib-bindings
+     }:
+     mkDerivation {
+       pname = "pdf-toolbox-core";
+       version = "0.0.4.1";
+       sha256 = "cce3949ef5596b5d61032ce1547160dc5f52e3d5c556dcdb9aabf1582173a981";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers errors io-streams scientific
+         transformers zlib-bindings
+       ];
+       homepage = "https://github.com/Yuras/pdf-toolbox";
+       description = "A collection of tools for processing PDF files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pdf-toolbox-document" = callPackage
     ({ mkDerivation, base, bytestring, cipher-aes, cipher-rc4
      , containers, crypto-api, cryptohash, io-streams
@@ -151100,6 +151702,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pdf-toolbox-document_0_0_7_1" = callPackage
+    ({ mkDerivation, base, bytestring, cipher-aes, cipher-rc4
+     , containers, crypto-api, cryptohash, io-streams
+     , pdf-toolbox-content, pdf-toolbox-core, text, transformers
+     }:
+     mkDerivation {
+       pname = "pdf-toolbox-document";
+       version = "0.0.7.1";
+       sha256 = "3f7d379baa85c1cf9998e3f84177ad24b5cc8632fb211af7a09603e59596f0e1";
+       libraryHaskellDepends = [
+         base bytestring cipher-aes cipher-rc4 containers crypto-api
+         cryptohash io-streams pdf-toolbox-content pdf-toolbox-core text
+         transformers
+       ];
+       homepage = "https://github.com/Yuras/pdf-toolbox";
+       description = "A collection of tools for processing PDF files";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pdf-toolbox-viewer" = callPackage
     ({ mkDerivation, base, bytestring, cairo, containers, directory
      , filepath, gtk, io-streams, pdf-toolbox-content
@@ -155157,6 +155779,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-text_0_0_2_1" = 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.1";
+       sha256 = "4bb6f008ad1a56e8a685ca960ddd777647183c15989883d14f84e5a5aa21b3e3";
+       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;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pipes-transduce" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, conceit, doctest
      , foldl, free, lens-family-core, pipes, pipes-bytestring
@@ -156545,6 +157186,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "pong-server" = callPackage
+    ({ mkDerivation, base, hspec, network, QuickCheck }:
+     mkDerivation {
+       pname = "pong-server";
+       version = "0.0.1.0";
+       sha256 = "649ea24e1412408d55e4e82f4c0d0e87bdbeb100bb70ea2167627f304ee2730e";
+       libraryHaskellDepends = [ base network ];
+       testHaskellDepends = [ base hspec network QuickCheck ];
+       homepage = "http://github.com/RobertFischer/pong-server#readme";
+       description = "A simple embedded pingable server that runs in the background";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "pontarius-mediaserver" = callPackage
     ({ mkDerivation, base, HDBC, HDBC-sqlite3, hlogger, pontarius-xmpp
      , pontarius-xpmn, xml-types
@@ -157224,6 +157878,7 @@ self: {
          tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time
          transformers uuid vector
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/nikita-volkov/postgresql-binary";
        description = "Encoders and decoders for the PostgreSQL's binary format";
@@ -160284,37 +160939,6 @@ self: {
      }) {};
 
   "psc-ide" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, containers, directory
-     , edit-distance, either, filepath, fsnotify, hspec, http-client
-     , lens, lens-aeson, monad-logger, mtl, network
-     , optparse-applicative, parsec, purescript, regex-tdfa, stm, text
-     , wreq
-     }:
-     mkDerivation {
-       pname = "psc-ide";
-       version = "0.6.0";
-       sha256 = "9ec4f96eabd70cd4ba84731a527bf86cd2bd0dc8891e8cde7b99705973e72deb";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers directory edit-distance either
-         filepath fsnotify http-client lens lens-aeson monad-logger mtl
-         parsec purescript regex-tdfa stm text wreq
-       ];
-       executableHaskellDepends = [
-         base directory filepath monad-logger mtl network
-         optparse-applicative stm text
-       ];
-       testHaskellDepends = [
-         base containers hspec monad-logger mtl stm
-       ];
-       doHaddock = false;
-       homepage = "http://github.com/kRITZCREEK/psc-ide";
-       description = "Language support for the PureScript programming language";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "psc-ide_0_6_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, directory
      , edit-distance, either, filepath, fsnotify, hspec, http-client
      , lens, lens-aeson, monad-logger, mtl, network
@@ -160342,7 +160966,6 @@ self: {
        homepage = "http://github.com/kRITZCREEK/psc-ide";
        description = "Language support for the PureScript programming language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pseudo-boolean" = callPackage
@@ -160411,7 +161034,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "psqueues" = callPackage
+  "psqueues_0_2_0_3" = callPackage
     ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit
      , QuickCheck, tagged, test-framework, test-framework-hunit
      , test-framework-quickcheck2
@@ -160427,9 +161050,10 @@ self: {
        ];
        description = "Pure priority search queues";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "psqueues_0_2_1_0" = callPackage
+  "psqueues" = callPackage
     ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit
      , QuickCheck, tagged, test-framework, test-framework-hunit
      , test-framework-quickcheck2
@@ -160445,6 +161069,24 @@ self: {
        ];
        description = "Pure priority search queues";
        license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "psqueues_0_2_2_0" = callPackage
+    ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit
+     , QuickCheck, tagged, test-framework, test-framework-hunit
+     , test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "psqueues";
+       version = "0.2.2.0";
+       sha256 = "14b12f505eea093f25190a9d74109f0178e611701849b83a3878811affe0b52a";
+       libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
+       testHaskellDepends = [
+         array base deepseq ghc-prim hashable HUnit QuickCheck tagged
+         test-framework test-framework-hunit test-framework-quickcheck2
+       ];
+       description = "Pure priority search queues";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -163718,6 +164360,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "reactive-banana-sdl2" = callPackage
+    ({ mkDerivation, base, reactive-banana, sdl2 }:
+     mkDerivation {
+       pname = "reactive-banana-sdl2";
+       version = "0.1.0.0";
+       sha256 = "605dd7df6814f82b69d2ba0aa51029417659c6ab560c869c7598a06615905942";
+       revision = "1";
+       editedCabalFile = "3c82ab987be2ab12330aa5863b3c80f5022525a5fb7d65cff6b5de47288b9ae7";
+       libraryHaskellDepends = [ base reactive-banana sdl2 ];
+       testHaskellDepends = [ base ];
+       homepage = "http://github.com/cies/reactive-banana-sdl2#readme";
+       description = "Reactive Banana integration with SDL2";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "reactive-banana-threepenny" = callPackage
     ({ mkDerivation, base, reactive-banana, threepenny-gui }:
      mkDerivation {
@@ -163983,17 +164640,18 @@ self: {
   "rebase" = callPackage
     ({ mkDerivation, base, base-prelude, bifunctors, bytestring
      , containers, contravariant, contravariant-extras, deepseq, dlist
-     , hashable, profunctors, scientific, semigroups, text, time
-     , unordered-containers, uuid, vector, void
+     , either, hashable, mtl, profunctors, scientific, semigroups, text
+     , time, transformers, unordered-containers, uuid, vector, void
      }:
      mkDerivation {
        pname = "rebase";
-       version = "0.2.1";
-       sha256 = "1a6813a90e6ff5904bf3bbf1f96a25a636da1fd76b937ee34d5f7efeb34c8665";
+       version = "0.4.1";
+       sha256 = "7c5bbc55a5653b9f456f1369616e22d135f667441d8ea160a8b11e02549e5abe";
        libraryHaskellDepends = [
          base base-prelude bifunctors bytestring containers contravariant
-         contravariant-extras deepseq dlist hashable profunctors scientific
-         semigroups text time unordered-containers uuid vector void
+         contravariant-extras deepseq dlist either hashable mtl profunctors
+         scientific semigroups text time transformers unordered-containers
+         uuid vector void
        ];
        homepage = "https://github.com/nikita-volkov/rebase";
        description = "A more progressive alternative to the \"base\" package";
@@ -164800,8 +165458,8 @@ self: {
      }:
      mkDerivation {
        pname = "reflex";
-       version = "0.3.2";
-       sha256 = "55fae21380809137c5bdbde646479b01e36793f10523e44842eb35bc9c42f419";
+       version = "0.4.0";
+       sha256 = "d60c2d425c57cf2239e1088628099f44b834e3f2c661ddb6133cc397b5476b9c";
        libraryHaskellDepends = [
          base containers dependent-map dependent-sum exception-transformers
          haskell-src-exts haskell-src-meta mtl primitive ref-tf semigroups
@@ -164840,24 +165498,21 @@ self: {
     ({ mkDerivation, aeson, base, bifunctors, bytestring, containers
      , data-default, dependent-map, dependent-sum
      , dependent-sum-template, directory, exception-transformers
-     , ghcjs-dom, glib, gtk3, lens, mtl, ref-tf, reflex, safe
-     , semigroups, text, these, time, transformers, webkitgtk3
-     , webkitgtk3-javascriptcore
+     , ghcjs-dom, glib, gtk3, lens, mtl, raw-strings-qq, ref-tf, reflex
+     , safe, semigroups, text, these, time, transformers, unix
+     , webkitgtk3, webkitgtk3-javascriptcore
      }:
      mkDerivation {
        pname = "reflex-dom";
-       version = "0.2";
-       sha256 = "fd350b5e6d4613802bf37ebf15362b083af7bfec9ec22a56d1245bc3d2af86dd";
-       revision = "2";
-       editedCabalFile = "2aa20b3cf39f41e8850a54ab28b95b000065ccc5b65e44f0710171821e72cbe6";
+       version = "0.3";
+       sha256 = "a52bacd0ebdbb559a64fc3c7abfb34d8264c3c84243b8bc126c256e505b58d3a";
        libraryHaskellDepends = [
          aeson base bifunctors bytestring containers data-default
          dependent-map dependent-sum dependent-sum-template directory
-         exception-transformers ghcjs-dom glib gtk3 lens mtl ref-tf reflex
-         safe semigroups text these time transformers webkitgtk3
-         webkitgtk3-javascriptcore
+         exception-transformers ghcjs-dom glib gtk3 lens mtl raw-strings-qq
+         ref-tf reflex safe semigroups text these time transformers unix
+         webkitgtk3 webkitgtk3-javascriptcore
        ];
-       jailbreak = true;
        description = "Functional Reactive Web Apps with Reflex";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -165866,8 +166521,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.8.0.2";
-       sha256 = "784433068c59871ccfcc50aaba93298a85e96a4ad0917f2fbc9b23290d34f63a";
+       version = "0.8.0.4";
+       sha256 = "0a2b8f3739cfeaf19c2b0dca4f321c2d1fbbedc007f241cfbf85142e25f03eb5";
        libraryHaskellDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text time time-locale-compat
@@ -166042,8 +166697,8 @@ self: {
      }:
      mkDerivation {
        pname = "remote-monad";
-       version = "0.1.0.0";
-       sha256 = "c4a9aec18e78195f187b92480e2654c996cbb3e5686c5071314504f9a020035c";
+       version = "0.1.0.1";
+       sha256 = "e52a1a304d507169be144abbff8c7e28b08a36e7c05f296dbcd4be8a5fcd53e1";
        libraryHaskellDepends = [
          base natural-transformation transformers
        ];
@@ -166924,10 +167579,13 @@ self: {
        pname = "resource-pool";
        version = "0.2.3.1";
        sha256 = "2265fc16f409eeb8d8e85644029c19b46bc48834ebba8aba8cb0b1ef64e1d709";
+       revision = "1";
+       editedCabalFile = "68c8ac9105a980178fc6e2a07446b3ba87283fc662df1dec181c50953b74b96d";
        libraryHaskellDepends = [
          base hashable monad-control stm time transformers transformers-base
          vector
        ];
+       jailbreak = true;
        homepage = "http://github.com/bos/pool";
        description = "A high-performance striped resource pooling implementation";
        license = stdenv.lib.licenses.bsd3;
@@ -167476,7 +168134,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rest-core" = callPackage
+  "rest-core_0_37" = callPackage
     ({ mkDerivation, aeson, aeson-utils, base, bytestring
      , case-insensitive, errors, fclabels, HUnit, hxt, hxt-pickle-utils
      , json-schema, mtl, mtl-compat, multipart, random, rest-stringmap
@@ -167503,6 +168161,34 @@ self: {
        ];
        description = "Rest API library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "rest-core" = callPackage
+    ({ mkDerivation, aeson, aeson-utils, base, base-compat, bytestring
+     , case-insensitive, errors, fclabels, HUnit, hxt, hxt-pickle-utils
+     , json-schema, mtl, mtl-compat, multipart, random, rest-stringmap
+     , rest-types, safe, split, test-framework, test-framework-hunit
+     , text, transformers, transformers-compat, unordered-containers
+     , uri-encode, utf8-string, uuid
+     }:
+     mkDerivation {
+       pname = "rest-core";
+       version = "0.38";
+       sha256 = "b491b734c2d74729f427ca02370f12b839dd92347fea44b5fb66c66a39b11cec";
+       libraryHaskellDepends = [
+         aeson aeson-utils base base-compat bytestring case-insensitive
+         errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat
+         multipart random rest-stringmap rest-types safe split text
+         transformers transformers-compat unordered-containers uri-encode
+         utf8-string uuid
+       ];
+       testHaskellDepends = [
+         base bytestring HUnit mtl test-framework test-framework-hunit
+         transformers transformers-compat unordered-containers
+       ];
+       description = "Rest API library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "rest-example" = callPackage
@@ -167523,6 +168209,7 @@ self: {
          transformers-compat unordered-containers
        ];
        executableHaskellDepends = [ base rest-gen ];
+       jailbreak = true;
        homepage = "http://www.github.com/silkapp/rest";
        description = "Example project for rest";
        license = stdenv.lib.licenses.bsd3;
@@ -167870,7 +168557,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rest-gen" = callPackage
+  "rest-gen_0_19_0_1" = callPackage
     ({ mkDerivation, aeson, base, blaze-html, Cabal, code-builder
      , directory, fclabels, filepath, hashable, haskell-src-exts
      , HStringTemplate, HUnit, hxt, json-schema, pretty, process
@@ -167892,6 +168579,34 @@ self: {
          base fclabels haskell-src-exts HUnit rest-core test-framework
          test-framework-hunit
        ];
+       jailbreak = true;
+       description = "Documentation and client generation from rest definition";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "rest-gen" = callPackage
+    ({ mkDerivation, aeson, base, base-compat, blaze-html, Cabal
+     , code-builder, directory, fclabels, filepath, hashable
+     , haskell-src-exts, HStringTemplate, HUnit, hxt, json-schema
+     , pretty, process, rest-core, safe, scientific, semigroups, split
+     , test-framework, test-framework-hunit, text, uniplate
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "rest-gen";
+       version = "0.19.0.2";
+       sha256 = "12caa70e7b29b073cb0e066cf7d5c590b13e0fb5b2f924944cd1ae5217c79330";
+       libraryHaskellDepends = [
+         aeson base base-compat blaze-html Cabal code-builder directory
+         fclabels filepath hashable haskell-src-exts HStringTemplate hxt
+         json-schema pretty process rest-core safe scientific semigroups
+         split text uniplate unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base fclabels haskell-src-exts HUnit rest-core test-framework
+         test-framework-hunit
+       ];
        description = "Documentation and client generation from rest definition";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -167978,6 +168693,8 @@ self: {
        pname = "rest-happstack";
        version = "0.3.1";
        sha256 = "a2c2e1b1e1bfdc7870100eee642e488268e21117b08aad254342d14a53ce13d9";
+       revision = "1";
+       editedCabalFile = "bcee53122444a7394e71c1f20b614f1b3504c90f96a519ff8981f7eb05805ca1";
        libraryHaskellDepends = [
          base containers happstack-server mtl rest-core rest-gen utf8-string
        ];
@@ -168047,6 +168764,8 @@ self: {
        pname = "rest-snap";
        version = "0.2";
        sha256 = "38947f552b90b08cf21567dd8931891f1c328546e5e5dda7e083fb2f3711eefc";
+       revision = "1";
+       editedCabalFile = "86fefb10994951f66e3e125ad5bf4060fa21cc636b41d1c605ddad81744ee2af";
        libraryHaskellDepends = [
          base bytestring case-insensitive rest-core safe snap-core
          unordered-containers uri-encode utf8-string
@@ -168253,8 +168972,8 @@ self: {
        pname = "rest-wai";
        version = "0.2";
        sha256 = "92d7455c537d24c6d2ccadd9272cac385659ed2a828fbe20bca9249016897413";
-       revision = "1";
-       editedCabalFile = "66767f5908d25ffaeaf9f15ad093f57f88ed212638bbfb7ec23190ed77c133b4";
+       revision = "2";
+       editedCabalFile = "ac37af20f1f44b9ada05e25dea369b8149359ba6a020a92d5b3e841846f731c7";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers http-types mime-types
          mtl rest-core text unordered-containers wai
@@ -175122,7 +175841,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "servant-swagger" = callPackage
+  "servant-swagger_0_1_2" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring, hspec
      , http-media, lens, servant, swagger2, text, time
      , unordered-containers
@@ -175138,9 +175857,57 @@ self: {
        testHaskellDepends = [
          aeson aeson-qq base hspec lens servant swagger2 text time
        ];
+       jailbreak = true;
        homepage = "https://github.com/dmjio/servant-swagger";
        description = "Generate Swagger specification for your servant API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "servant-swagger" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, bytestring, doctest, Glob
+     , hspec, http-media, lens, QuickCheck, servant, swagger2, text
+     , time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "servant-swagger";
+       version = "1.0";
+       sha256 = "cc9bc89bd83c373d1a31ce7ba603104f302db90b96cd93f45029b125f59e668e";
+       libraryHaskellDepends = [
+         aeson base bytestring hspec http-media lens QuickCheck servant
+         swagger2 text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base doctest Glob hspec lens QuickCheck servant
+         swagger2 text time
+       ];
+       homepage = "https://github.com/haskell-servant/servant-swagger";
+       description = "Generate Swagger specification for your servant API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "servant-swagger_1_0_3" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, bytestring, doctest, Glob
+     , hspec, http-media, lens, QuickCheck, servant, swagger2, text
+     , time, unordered-containers
+     }:
+     mkDerivation {
+       pname = "servant-swagger";
+       version = "1.0.3";
+       sha256 = "ea1b3c7f33ae1c788ef33858c9c74849f450155c1bd81dcd472a36389aa17597";
+       libraryHaskellDepends = [
+         aeson base bytestring hspec http-media lens QuickCheck servant
+         swagger2 text unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base doctest Glob hspec lens QuickCheck servant
+         swagger2 text time
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/haskell-servant/servant-swagger";
+       description = "Generate Swagger specification for your servant API";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-yaml" = callPackage
@@ -175715,8 +176482,8 @@ self: {
      }:
      mkDerivation {
        pname = "sexp-grammar";
-       version = "1.1.0";
-       sha256 = "e784db96a9fdcf1fe5f48adfc62e8b4ef9795bf4558769c149f244ed5ef9415c";
+       version = "1.1.1";
+       sha256 = "4737183b0201c27d4c0824418644abff466bdfe653c411cb8da8c53899d6dbd6";
        libraryHaskellDepends = [
          array base containers mtl scientific semigroups split stack-prism
          template-haskell text wl-pprint-text
@@ -177925,8 +178692,8 @@ self: {
      }:
      mkDerivation {
        pname = "simple-log";
-       version = "0.3.3";
-       sha256 = "2b4ccfc67b6b4b7dc2a27ebfd9166b911910750e28c86e2e5ca8a8c7cad51783";
+       version = "0.3.4";
+       sha256 = "7d81fdfb91a2ee88d73dc4a5680be4f0e8b44faa460ce15d41a33d3a975c84f9";
        libraryHaskellDepends = [
          async base containers deepseq directory filepath
          MonadCatchIO-transformers mtl SafeSemaphore text time transformers
@@ -184704,6 +185471,53 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "stackage-curator_0_13_1" = callPackage
+    ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
+     , base, base16-bytestring, binary, binary-tagged, blaze-html
+     , byteable, bytestring, Cabal, classy-prelude-conduit, conduit
+     , conduit-extra, containers, cryptohash, cryptohash-conduit
+     , data-default-class, directory, filepath, hspec, html-conduit
+     , http-client, http-client-tls, http-conduit, lucid, mime-types
+     , monad-unlift, mono-traversable, mtl, old-locale
+     , optparse-applicative, optparse-simple, process, QuickCheck
+     , resourcet, semigroups, stackage-cli, stackage-install
+     , stackage-metadata, stackage-types, stm, streaming-commons
+     , system-fileio, system-filepath, tar, temporary, text, time
+     , transformers, unix-compat, utf8-string, xml-conduit, xml-types
+     , yaml, zlib
+     }:
+     mkDerivation {
+       pname = "stackage-curator";
+       version = "0.13.1";
+       sha256 = "3234df1ffa4c7131a5dec91596dd53daef0ca7558245312e4b4ae591a10a1a16";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson amazonka amazonka-core amazonka-s3 async base
+         base16-bytestring binary binary-tagged blaze-html byteable
+         bytestring Cabal classy-prelude-conduit conduit conduit-extra
+         containers cryptohash cryptohash-conduit data-default-class
+         directory filepath html-conduit http-client http-client-tls
+         http-conduit lucid mime-types monad-unlift mono-traversable mtl
+         old-locale process resourcet semigroups stackage-install
+         stackage-metadata stackage-types stm streaming-commons
+         system-fileio system-filepath tar temporary text time transformers
+         unix-compat utf8-string xml-conduit xml-types yaml zlib
+       ];
+       executableHaskellDepends = [
+         base http-client http-client-tls optparse-applicative
+         optparse-simple stackage-cli system-filepath text
+       ];
+       testHaskellDepends = [
+         base Cabal classy-prelude-conduit containers directory hspec
+         http-client http-client-tls QuickCheck text yaml
+       ];
+       homepage = "https://github.com/fpco/stackage";
+       description = "Tools for curating Stackage bundles";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stackage-install_0_1_0_3" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
      , cryptohash, directory, filepath, http-client, http-client-tls
@@ -187836,36 +188650,6 @@ self: {
      }) {};
 
   "stylish-haskell" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, cmdargs, containers
-     , directory, filepath, haskell-src-exts, HUnit, mtl, strict, syb
-     , test-framework, test-framework-hunit, yaml
-     }:
-     mkDerivation {
-       pname = "stylish-haskell";
-       version = "0.5.15.0";
-       sha256 = "58567478ec005164a3cb617b66676a1351c599e5bbf7bf81ef9c2fe4a199d9e5";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [
-         aeson base bytestring containers directory filepath
-         haskell-src-exts mtl syb yaml
-       ];
-       executableHaskellDepends = [
-         aeson base bytestring cmdargs containers directory filepath
-         haskell-src-exts mtl strict syb yaml
-       ];
-       testHaskellDepends = [
-         aeson base bytestring cmdargs containers directory filepath
-         haskell-src-exts HUnit mtl syb test-framework test-framework-hunit
-         yaml
-       ];
-       doHaddock = false;
-       homepage = "https://github.com/jaspervdj/stylish-haskell";
-       description = "Haskell code prettifier";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "stylish-haskell_0_5_15_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cmdargs, containers
      , directory, filepath, haskell-src-exts, HUnit, mtl, strict, syb
      , test-framework, test-framework-hunit, yaml
@@ -187892,7 +188676,6 @@ self: {
        homepage = "https://github.com/jaspervdj/stylish-haskell";
        description = "Haskell code prettifier";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stylized" = callPackage
@@ -188030,7 +188813,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "success" = callPackage
+  "success_0_2_5" = callPackage
     ({ mkDerivation, base, monad-control, mtl, transformers
      , transformers-base
      }:
@@ -188038,12 +188821,48 @@ self: {
        pname = "success";
        version = "0.2.5";
        sha256 = "d1548e0a685956ae0b568f89e9935af58ed6042fd5b850314b81e0a1efadabca";
+       revision = "1";
+       editedCabalFile = "0e3e195460c31e3cb90b992a36cfb7c39d5a7a5ac225cec3a45fb43aeb6a5580";
        libraryHaskellDepends = [
          base monad-control mtl transformers transformers-base
        ];
        homepage = "https://github.com/nikita-volkov/success";
        description = "A version of Either specialised for encoding of success or failure";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "success" = callPackage
+    ({ mkDerivation, base, monad-control, mtl, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "success";
+       version = "0.2.5.1";
+       sha256 = "7efbd9b238a6741ab70f5b021c5ebc95369bf4de00ab88220eecb30b3df86bec";
+       libraryHaskellDepends = [
+         base monad-control mtl transformers transformers-base
+       ];
+       homepage = "https://github.com/nikita-volkov/success";
+       description = "A version of Either specialised for encoding of success or failure";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "success_0_2_6" = callPackage
+    ({ mkDerivation, base, monad-control, mtl, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "success";
+       version = "0.2.6";
+       sha256 = "e995e77e8ae13bc4d543ea771f6a4d17853dea1ae46ef294131fc8c582f2dab6";
+       libraryHaskellDepends = [
+         base monad-control mtl transformers transformers-base
+       ];
+       homepage = "https://github.com/nikita-volkov/success";
+       description = "A version of Either specialised for encoding of success or failure";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "suffixarray" = callPackage
@@ -188580,7 +189399,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "swagger2" = callPackage
+  "swagger2_1_2_1" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, containers, doctest, Glob
      , hashable, hspec, http-media, HUnit, lens, mtl, network
      , QuickCheck, scientific, text, time, unordered-containers, vector
@@ -188602,6 +189421,58 @@ self: {
        homepage = "https://github.com/GetShopTV/swagger2";
        description = "Swagger 2.0 data model";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "swagger2" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers
+     , doctest, Glob, hashable, hspec, http-media, HUnit, lens, mtl
+     , network, QuickCheck, scientific, template-haskell, text, time
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "swagger2";
+       version = "2.0";
+       sha256 = "bbd6d2f3287e619ec9caa6e1c1628a5fd0f71ac311e451d87456d00c41a8f2d0";
+       libraryHaskellDepends = [
+         aeson base base-compat containers hashable http-media lens mtl
+         network scientific template-haskell text time transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base base-compat containers doctest Glob hashable
+         hspec HUnit lens mtl QuickCheck text time unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/GetShopTV/swagger2";
+       description = "Swagger 2.0 data model";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "swagger2_2_0_1" = callPackage
+    ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers
+     , doctest, Glob, hashable, hspec, http-media, HUnit, lens, mtl
+     , network, QuickCheck, scientific, template-haskell, text, time
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "swagger2";
+       version = "2.0.1";
+       sha256 = "ff8c3a195ff7689ba027d7caecd9b20505529ecc4962ddb7503b5130aa815898";
+       libraryHaskellDepends = [
+         aeson base base-compat containers hashable http-media lens mtl
+         network scientific template-haskell text time transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson aeson-qq base base-compat containers doctest Glob hashable
+         hspec HUnit lens mtl QuickCheck text time unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/GetShopTV/swagger2";
+       description = "Swagger 2.0 data model";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swapper" = callPackage
@@ -193184,6 +194055,31 @@ self: {
        license = "GPL";
      }) {};
 
+  "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
+     }:
+     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
+       ];
+       homepage = "http://github.com/jgm/texmath";
+       description = "Conversion between formats used to represent mathematics";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "texrunner" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, directory, filepath
      , HUnit, io-streams, lens, mtl, process, temporary, test-framework
@@ -193738,8 +194634,8 @@ self: {
        pname = "text-show";
        version = "2";
        sha256 = "5f64a35d1121c31a9166fd3910c865ad8f23e50edfc4b3733e63d4f415635694";
-       revision = "1";
-       editedCabalFile = "7009bf56e8594ddf59fcc5ac896d56f3928ba06eebfaf9e456c5298471138e5a";
+       revision = "2";
+       editedCabalFile = "26d3d47cd81cdf00d2d529569aec498a095fe424a4469405527b40ef489c3cc4";
        libraryHaskellDepends = [
          array base base-compat bytestring bytestring-builder containers
          generic-deriving ghc-prim integer-gmp nats semigroups tagged
@@ -193769,8 +194665,8 @@ self: {
        pname = "text-show";
        version = "2.1.2";
        sha256 = "76c1ce631c6932816dc241b290400e7200d7c79fd50ec03f51964e244fae320d";
-       revision = "1";
-       editedCabalFile = "3fc10600ed0d309c095024b4d320ace8d39dd883e4e8d109d182930c2b35fc9c";
+       revision = "2";
+       editedCabalFile = "b3b37a10589923b91729f07291795acf58f98efd5df1f32de99ab27fa1d3eda3";
        libraryHaskellDepends = [
          array base base-compat bytestring bytestring-builder containers
          generic-deriving ghc-prim integer-gmp nats semigroups tagged
@@ -193787,20 +194683,49 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "text-show_3" = callPackage
+    ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
+     , bytestring, bytestring-builder, containers, generic-deriving
+     , ghc-prim, hspec, integer-gmp, nats, QuickCheck
+     , quickcheck-instances, semigroups, tagged, template-haskell, text
+     , th-lift, transformers, transformers-compat, void
+     }:
+     mkDerivation {
+       pname = "text-show";
+       version = "3";
+       sha256 = "49e8110e4bd5f67fa6dbe4ce07614633fc2e65bd3dae14b0759df10e3f1b98b2";
+       libraryHaskellDepends = [
+         array base base-compat bifunctors bytestring bytestring-builder
+         containers generic-deriving ghc-prim integer-gmp nats semigroups
+         tagged template-haskell text th-lift transformers
+         transformers-compat void
+       ];
+       testHaskellDepends = [
+         array base base-compat base-orphans bifunctors bytestring
+         bytestring-builder containers generic-deriving ghc-prim hspec
+         integer-gmp nats QuickCheck quickcheck-instances semigroups tagged
+         template-haskell text transformers transformers-compat void
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/RyanGlScott/text-show";
+       description = "Efficient conversion of values into Text";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "text-show-instances" = callPackage
     ({ mkDerivation, base, base-compat, bifunctors, binary, bytestring
-     , containers, directory, ghc-prim, haskeline, hoopl, hpc, hspec
-     , old-locale, old-time, pretty, QuickCheck, quickcheck-instances
-     , random, semigroups, tagged, template-haskell, terminfo, text
-     , text-show, th-orphans, time, transformers, transformers-compat
-     , unix, unordered-containers, vector, xhtml
+     , containers, directory, generic-deriving, ghc-prim, haskeline
+     , hoopl, hpc, hspec, old-locale, old-time, pretty, QuickCheck
+     , quickcheck-instances, random, semigroups, tagged
+     , template-haskell, terminfo, text, text-show, th-orphans, time
+     , transformers, transformers-compat, unix, unordered-containers
+     , vector, xhtml
      }:
      mkDerivation {
        pname = "text-show-instances";
-       version = "2.1";
-       sha256 = "d8941910e88ad921a6337dd635356203137b85e5153a460b0b6bb3ebb0fd51b0";
-       revision = "2";
-       editedCabalFile = "f7407e5c0227a4fae2090ae9a10d4f4b62b869c56432a9ecb8bc8daf453a6cf8";
+       version = "3.0.1";
+       sha256 = "9164fd2e5ad017923d9e5cdafae6d895a4014009e982346e1a13b3ef8ecb1045";
        libraryHaskellDepends = [
          base base-compat bifunctors binary bytestring containers directory
          haskeline hoopl hpc old-locale old-time pretty random semigroups
@@ -193809,11 +194734,13 @@ self: {
        ];
        testHaskellDepends = [
          base base-compat bifunctors binary bytestring containers directory
-         ghc-prim haskeline hoopl hpc hspec old-locale old-time pretty
-         QuickCheck quickcheck-instances random semigroups tagged
-         template-haskell terminfo text-show th-orphans time transformers
-         transformers-compat unix unordered-containers vector xhtml
+         generic-deriving ghc-prim haskeline hoopl hpc hspec old-locale
+         old-time pretty QuickCheck quickcheck-instances random semigroups
+         tagged template-haskell terminfo text text-show th-orphans time
+         transformers transformers-compat unix unordered-containers vector
+         xhtml
        ];
+       jailbreak = true;
        homepage = "https://github.com/RyanGlScott/text-show-instances";
        description = "Additional instances for text-show";
        license = stdenv.lib.licenses.bsd3;
@@ -194285,8 +195212,11 @@ self: {
        pname = "th-expand-syns";
        version = "0.3.0.5";
        sha256 = "30933dcd5b92c3daa6317adb0688cb7cb0eed193a6a2af9bda142d6dd95f39f6";
+       revision = "1";
+       editedCabalFile = "f0c7ebf50e7282f73c160d7b6821e3b9da2f42c4f076655416925788eb968eb3";
        libraryHaskellDepends = [ base containers syb template-haskell ];
        testHaskellDepends = [ base template-haskell ];
+       jailbreak = true;
        description = "Expands type synonyms in Template Haskell ASTs";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -200741,6 +201671,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "unicode-show" = callPackage
+    ({ mkDerivation, base, HUnit, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2
+     }:
+     mkDerivation {
+       pname = "unicode-show";
+       version = "0.1.0.2";
+       sha256 = "7ee394879b345ee397aef87ca058628cd79d59cbfc1cec81aeda7fea65f53943";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base HUnit QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2
+       ];
+       homepage = "http://github.com/nushio3/unicode-show#readme";
+       description = "print and show in unicode";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "unicode-symbols" = callPackage
     ({ mkDerivation, base, containers }:
      mkDerivation {
@@ -202590,8 +203538,8 @@ self: {
     ({ mkDerivation, ansi-terminal, base }:
      mkDerivation {
        pname = "uu-cco";
-       version = "0.1.0.3";
-       sha256 = "12451700f85e3f7c21265698b5a799802e3a24ced34dadeecd949e2f507b4259";
+       version = "0.1.0.4";
+       sha256 = "a2913c4802337ae57d5a4ede73e2664795fe823035da00b65f52d015c42632a0";
        libraryHaskellDepends = [ ansi-terminal base ];
        homepage = "https://github.com/UU-ComputerScience/uu-cco";
        description = "Utilities for compiler construction: core functionality";
@@ -203935,6 +204883,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vector-binary-instances_0_2_1_1" = callPackage
+    ({ mkDerivation, base, binary, vector }:
+     mkDerivation {
+       pname = "vector-binary-instances";
+       version = "0.2.1.1";
+       sha256 = "9647a467cc248ea967b16982be0a395688882d711b5b6613405064bcae6a4eb7";
+       libraryHaskellDepends = [ base binary vector ];
+       homepage = "https://github.com/bos/vector-binary-instances";
+       description = "Instances of Data.Binary and Data.Serialize for vector";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vector-buffer" = callPackage
     ({ mkDerivation, base, deepseq, vector }:
      mkDerivation {
@@ -210760,8 +211721,8 @@ self: {
      }:
      mkDerivation {
        pname = "werewolf";
-       version = "0.4.2.0";
-       sha256 = "b3872595401edf28f7a1854756f661253d8e1353ded7b92e60cabf3f5e35c68c";
+       version = "0.4.3.1";
+       sha256 = "daf3e180e534b2dd36667f8855c5d1699afab5512b3d38009f64bc9d8a24a19c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -218075,8 +219036,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-content-pdf";
-       version = "0.2.0.2";
-       sha256 = "867cb1a9bbbeff69bb8ae35659f780bcf057cb44a2b1f6c8e424d280a55a0fbb";
+       version = "0.2.0.3";
+       sha256 = "8c5874e54246a70f6fed205cf29b7a6068176f3af80a991a05b0adc532803230";
        libraryHaskellDepends = [
          base blaze-builder blaze-html bytestring conduit data-default
          directory network-uri process temporary transformers yesod-core
@@ -219673,7 +220634,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-newsfeed" = callPackage
+  "yesod-newsfeed_1_5" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
      , containers, shakespeare, text, time, xml-conduit, yesod-core
      }:
@@ -219688,9 +220649,10 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Helper functions and data types for producing News feeds";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-newsfeed_1_6" = callPackage
+  "yesod-newsfeed" = callPackage
     ({ mkDerivation, base, blaze-html, blaze-markup, bytestring
      , containers, shakespeare, text, time, xml-conduit, yesod-core
      }:
@@ -219705,7 +220667,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Helper functions and data types for producing News feeds";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-paginate" = callPackage
@@ -221345,6 +222306,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "yoctoparsec" = callPackage
+    ({ mkDerivation, base, free, mtl }:
+     mkDerivation {
+       pname = "yoctoparsec";
+       version = "0.1.0.0";
+       sha256 = "d70739d3429dede8800290939dbd08d0e23cacb5717402ba93f931fa80e1335d";
+       libraryHaskellDepends = [ base free mtl ];
+       homepage = "https://github.com/mniip/yoctoparsec";
+       description = "A truly tiny monadic parsing library";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "yoko" = callPackage
     ({ mkDerivation, base, bifunctors, containers, invariant, kinds
      , mtl, records, semigroups, template-haskell, th-sccs, type-cereal

From 31f160e6dd6b971f5fac4ddac2dc8be73b7cef59 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 8 Feb 2016 11:55:23 +0100
Subject: [PATCH 1171/2285] Add LTS Haskell 5.2.

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 9014280a9146..2d0151dc5420 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -343,6 +343,9 @@ rec {
     lts-5_1 = packages.ghc7103.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.1.nix { };
     };
+    lts-5_2 = packages.ghc7103.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.2.nix { };
+    };
 
   };
 }

From d4dcfa9a767dd4c82e152b2e6bc2caf1d53c4c3b Mon Sep 17 00:00:00 2001
From: Ivan Solyankin <vanzef@gmail.com>
Date: Tue, 9 Feb 2016 16:43:37 +0300
Subject: [PATCH 1172/2285] maintainers: add vanzef

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index f73312db99e7..b7fbb90db0c0 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -316,6 +316,7 @@
   twey = "James ‘Twey’ Kay <twey@twey.co.uk>";
   urkud = "Yury G. Kudryashov <urkud+nix@ya.ru>";
   vandenoever = "Jos van den Oever <jos@vandenoever.info>";
+  vanzef = "Ivan Solyankin <vanzef@gmail.com>";
   vbgl = "Vincent Laporte <Vincent.Laporte@gmail.com>";
   vbmithr = "Vincent Bernardoff <vb@luminar.eu.org>";
   vcunat = "Vladimír Čunát <vcunat@gmail.com>";

From 3482020486352802cfe2db5b219bc67914e68975 Mon Sep 17 00:00:00 2001
From: Ivan Solyankin <vanzef@gmail.com>
Date: Tue, 9 Feb 2016 16:45:04 +0300
Subject: [PATCH 1173/2285] qtscrobbler: init at 0.11

---
 .../audio/qtscrobbler/default.nix             | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/applications/audio/qtscrobbler/default.nix

diff --git a/pkgs/applications/audio/qtscrobbler/default.nix b/pkgs/applications/audio/qtscrobbler/default.nix
new file mode 100644
index 000000000000..e7108ebe4871
--- /dev/null
+++ b/pkgs/applications/audio/qtscrobbler/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, lib, fetchurl, withMtp ? true, libmtp, pkgconfig, which, qt4 }:
+
+stdenv.mkDerivation rec {
+  name = "qtscrobbler-${version}";
+  version = "0.11";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/qtscrob/qtscrob/${version}/qtscrob-${version}.tar.bz2";
+    sha256 = "01c8e48f616ed09504833d27d92fd62f455bd645ea2d1cc2a5f4c287d641daba";
+  };
+
+  nativeBuildInputs = lib.optionals withMtp [ pkgconfig which ];
+  buildInputs = [ qt4 ] ++ lib.optional withMtp libmtp;
+
+  enableParallelBuilding = true;
+
+  postPatch = ''
+    cd src
+    sed -i "s,/usr/local,$out," common.pri
+  '';
+
+  configurePhase = "qmake";
+
+  meta = with lib; {
+    description = "Qt based last.fm scrobbler";
+    longDescription = ''
+      QTScrobbler is a tool to upload information about the tracks you have played from your Digital Audio Player (DAP) to your last.fm account.
+      It is able to gather this information from Apple iPods or DAPs running the Rockbox replacement firmware.
+    '';
+
+    homepage = http://qtscrob.sourceforge.net;
+    license = licenses.gpl2;
+    maintainers = [ maintainers.vanzef ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 92fd1d49a661..b38d374718a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12991,6 +12991,8 @@ let
 
   qtractor = callPackage ../applications/audio/qtractor { };
 
+  qtscrobbler = callPackage ../applications/audio/qtscrobbler { };
+
   quirc = callPackage ../tools/graphics/quirc {};
 
   quodlibet = callPackage ../applications/audio/quodlibet {

From 8477e5788c32734af2fc210b2a7521d669f41e42 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 9 Feb 2016 14:26:11 +0000
Subject: [PATCH 1174/2285] atom: 1.4.0 -> 1.4.3

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 7120b8f43ee9..87a36a36f90a 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -16,11 +16,11 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.4.0";
+  version = "1.4.3";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "0dipww58p0sm99jn1ariisha9wsnhl7rnd8achpxqkf4b3vwi5iz";
+    sha256 = "15ix5ww3ny5ylgmmxpkc32li6af2vc4a2p6aymx9c472fra0c41x";
     name = "${name}.deb";
   };
 

From 2fabb4b34d666ec99573218957d463d8239c2f9a Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Tue, 9 Feb 2016 14:38:06 +0000
Subject: [PATCH 1175/2285] linux-testing: 4.5-rc2 -> 4.5-rc3

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 4128edea7c26..8dc55f6e6a84 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.5-rc2";
-  modDirVersion = "4.5.0-rc2";
+  version = "4.5-rc3";
+  modDirVersion = "4.5.0-rc3";
   extraMeta.branch = "4.5";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "1nq61nimgvl7m7rrimr95ixwkc5sd473m5kvaf5qdyhfnh7m4br3";
+    sha256 = "fae5b3b318d6ca7d142b2947e8df3e4091e2330dc509ba19503abf4b9c314986";
   };
 
   features.iwlwifi = true;

From 5594bd8e2d02b7893814d54be2c2915c52d0b524 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 9 Feb 2016 14:09:54 +0000
Subject: [PATCH 1176/2285] Add etsy/hound

(cherry picked from commit ea43515da1dbcf2b2876bf44c970b33448eb0e31)
---
 pkgs/top-level/go-packages.nix | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 4c10eec65af5..97fafe7c752e 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -1849,6 +1849,27 @@ let
     };
   };
 
+  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
+    '';
+  };
+
   hologram = buildGoPackage rec {
     rev  = "63014b81675e1228818bf36ef6ef0028bacad24b";
     name = "hologram-${stdenv.lib.strings.substring 0 7 rev}";

From fdbbcef8a2b6453d2113ebc1795789fa1a7127c5 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Tue, 9 Feb 2016 14:52:54 +0000
Subject: [PATCH 1177/2285] Fix waagent revision, previous did not exist
 anymore.

---
 nixos/modules/virtualisation/azure-agent.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix
index ef4e3e1e48d4..96418d61ff85 100644
--- a/nixos/modules/virtualisation/azure-agent.nix
+++ b/nixos/modules/virtualisation/azure-agent.nix
@@ -8,10 +8,11 @@ let
 
   waagent = with pkgs; stdenv.mkDerivation rec {
     name = "waagent-2.0";
-    src = pkgs.fetchgit {
-      url = https://github.com/Phreedom/WALinuxAgent.git;
-      rev = "9dba81c7b1239c7971ec96e405e403c7cd224e6b";
-      sha256 = "0khxk3ns3z37v26f2qj6m3m698a0vqpc9bxg5p7fyr3xza5gzwhs";
+    src = pkgs.fetchFromGitHub {
+      owner = "phreedom";
+      repo = "WALinuxAgent";
+      rev = "1d31fe8cbc7f842993eed9b33a3d3f5410c364e3";
+      sha256 = "1s53pfmy3azp0rmympmnphyq96sr9jy07pbsfza6mdzpalx1ripl";
     };
     buildInputs = [ makeWrapper python pythonPackages.wrapPython ];
     runtimeDeps = [ findutils gnugrep gawk coreutils openssl openssh

From 74270469dbdf12895827929753c92ce13737d709 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Wed, 10 Feb 2016 00:03:00 +0900
Subject: [PATCH 1178/2285] firefox-bin: 44.0 -> 44.0.1

---
 .../browsers/firefox-bin/sources.nix          | 358 +++++++++---------
 1 file changed, 179 insertions(+), 179 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index bde8830145b7..ba9bae4ff920 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -4,185 +4,185 @@
 # ruby generate_sources.rb > sources.nix
 
 {
-  version = "44.0";
+  version = "44.0.1";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha256 = "c0c65ced611dcc7b788aff7f0e32cd1823467c06dc99ced2e0aca0539ce545a2"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha256 = "87068d8072d0312af90524c7470c874d33e23c2b3e94be3fe9d934998330e898"; }
-    { locale = "af"; arch = "linux-i686"; sha256 = "7c8f08471fe561a345175c350c6414e72721baeb41a3ff47a429f5b79c33c82c"; }
-    { locale = "af"; arch = "linux-x86_64"; sha256 = "4768a53842d40e81a2e357ba58da56b0a81d2224878b6ab2ffad0bfc50c20ec1"; }
-    { locale = "an"; arch = "linux-i686"; sha256 = "cdb921661a6b20738f38ab2d0fb285aa81a323401f360f77b9ae6d9e8642210d"; }
-    { locale = "an"; arch = "linux-x86_64"; sha256 = "cff97655831940b84bfa5f73dfa3dc48de084ae6503e7a5824c3e57e373f0ff0"; }
-    { locale = "ar"; arch = "linux-i686"; sha256 = "9f6322577809b557f325168953170706af6d29a29b5347886f928b5f495799b8"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha256 = "d5a1a956d7f9afe5867e2dbeaea4ba2a94e743d291062d18232d20ace29d2c94"; }
-    { locale = "as"; arch = "linux-i686"; sha256 = "750c5cddd2d436993a4630f0ebf31e9d0ac679cc23a84298071a682e7a8a8de1"; }
-    { locale = "as"; arch = "linux-x86_64"; sha256 = "5b5a2376daef30eae3ff1a94213937381148ade79783546b1f38687c9fc4489e"; }
-    { locale = "ast"; arch = "linux-i686"; sha256 = "99b5bc2c709a923a43debfe746c70c3613c206424c88d553f7593c200053a8b6"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha256 = "2fd75ff22d3b75f03c6a9ab005e369373f999ef4c38ea49438ab2adaa8e9a2c2"; }
-    { locale = "az"; arch = "linux-i686"; sha256 = "0781239c9c8f237d66ce0c8d9f39136e0eb71365f6ca8b695014648060c18c38"; }
-    { locale = "az"; arch = "linux-x86_64"; sha256 = "9fd6f6047ec3c4103c4aa761882053d4e00e018a1509fa1fbede1757394aa3fe"; }
-    { locale = "be"; arch = "linux-i686"; sha256 = "098e932b708ebc71a2aa7fe86ced4835dbc6725f8714904b25e7ebd1ca7b7d69"; }
-    { locale = "be"; arch = "linux-x86_64"; sha256 = "d9284a84e7e55ad6d73e7d599c5b6824774d7a9e6f7484064fd2985e5634d102"; }
-    { locale = "bg"; arch = "linux-i686"; sha256 = "02879ea328d1536781f2f9765db51bcb9fa05d0a0b7ad426fd659156c293f347"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha256 = "70f55197d8ff67d52f090bd58dcc106fcc08492fe6989494eee3aa3cd1c3552a"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "227873ac53fdac5f27b569a5b6a1f3d45caa4e3c822610a5f294a3abdbc2c0fd"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "0a46de9bfc19fba878104ae2865a092fba7a9eea62a64a31c0decc9fc021b3af"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha256 = "2cc4d364852fc987e97f169de9039992d4ecb848125eae38c09bced34aae8653"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "6a722ed42f251e3433d46d9b56ca06f7bc1cf0854de782da10285db6ee4a1bfd"; }
-    { locale = "br"; arch = "linux-i686"; sha256 = "14b75dc8278a946d705210306b50a85795f70d83d0527d2c77a60b13662e89e3"; }
-    { locale = "br"; arch = "linux-x86_64"; sha256 = "73e62d2869fb450b4597ec3d65ae3c36ef78984462a158dbf565bbac539b1fa5"; }
-    { locale = "bs"; arch = "linux-i686"; sha256 = "01e02d4a0e140d962e27e4f1a4ec24837c0646e9373f3ce2eb8337437c274ecf"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha256 = "59fef5429b639a52ee113e855a18080870a2f905212dd0e4aefdd838d040133d"; }
-    { locale = "ca"; arch = "linux-i686"; sha256 = "62f96267e91fb9a8df1c436adb78945f32eb14bccc57e706104ae0547b723682"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha256 = "0be231034e076e162b5568a5247da47ca2038011928f89c729fe9a7e139dd922"; }
-    { locale = "cs"; arch = "linux-i686"; sha256 = "15c8a066fe101a5b9151c96611e2390008ac54a9a1909b9430ed6f440c856920"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha256 = "40400da9851782418a12b224b74c3b5c8c112912bb98dc8f368972cc898ea155"; }
-    { locale = "cy"; arch = "linux-i686"; sha256 = "b9b8d3d4c5160eb1676f6c4531123ec28dc0ca6b51e7dcf20716611f93f1c975"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha256 = "6e00d5e5c7e50aa24468b802bd53377d8962b146fed8a8588dd5c8db4162da93"; }
-    { locale = "da"; arch = "linux-i686"; sha256 = "760c9d95fe6941847dfd53b254cd662a83f4c9f2d66f84a96b4dd1d3127adbb8"; }
-    { locale = "da"; arch = "linux-x86_64"; sha256 = "e168e7e7e11aabe54f773c960d4c9b9920e15e4ccadef9f728e2016f0240555f"; }
-    { locale = "de"; arch = "linux-i686"; sha256 = "e5c6372f3fd732fddfaa31ed3ddc81cf803386d7842e103fddd0685739ea63c7"; }
-    { locale = "de"; arch = "linux-x86_64"; sha256 = "73da0a0c66c18dddf5de7b7dda677cb9cef1e0b3c8cff5e22f48bf743ece8116"; }
-    { locale = "dsb"; arch = "linux-i686"; sha256 = "509b8233c403b629803fb0d67a29f2d6f649627d4b91c592121acd3e2ff62282"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "6089971aa6e19e2cbcb49724e2eea7922d9408936aa8e2d396b8f1966ea81eec"; }
-    { locale = "el"; arch = "linux-i686"; sha256 = "451f1a7caea7553fc18e440c2716e1954e7d7ba66f5fbe15cc6954224a36444e"; }
-    { locale = "el"; arch = "linux-x86_64"; sha256 = "d02f4b813cc16b4293f9441bdbdef56acd0a7a510d9edcce223d04270e65f2e4"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha256 = "663b7a6300fa46c4e62e7542135ab2632117496a5b0365276ec5ac94183a1d55"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "d50895a71408e74d8b5b1965be279011214c50eba56e0046f360f216326f1135"; }
-    { locale = "en-US"; arch = "linux-i686"; sha256 = "84a5fa00271f90356bbfedb1fdbcc033489d1759fef53c4dda92bd285633ae3d"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "49e55275df9e902bc234fa59b4b614a084d76dc2c256ce6218fa96663cabe2dd"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha256 = "dfe926680b0bc5852db920ba8b3e4febecf1ead33d9865568ac69e9494337072"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "83c8480482dd154519d26e43a3f79d32c82f149d81a1c6e8ef98e9511ecbf35a"; }
-    { locale = "eo"; arch = "linux-i686"; sha256 = "a27703068ff3be53e8944c750bde0316414f51ee4c10569018d121db7ec1b705"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha256 = "981462cf59716c17fc0630d0cf12b03e7cc96d72c2d8d33109c1db633895f18a"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha256 = "16b2efda57842f29c6f4432cd51296d5e9a709d30f2310e885c786fc68a96e65"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "7b6c8a2bbae8e72ec820df741b8f4a2e162c4b628db8e669a5e85dc190db6c51"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha256 = "ad18bc224500c834a159d91fa568461cbf131edd1b044ae8c97e887b2151e112"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "84c414c64bff02d8e82a4ca4c01e1b4dfae21991ee9a6850203ccbe15469cfe8"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha256 = "142db7f0bb92976345aace30d9ba53ab4ba98a47332c3f7ae7372d9d80300781"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "337de34606e018ec5b600d559d928e35c79fb28800c9b5ad28e2defe259f9b58"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha256 = "51cecc939011135842bb51c41cfda0fb4ae53c5180e49bd66a810c243b1d68be"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "cfe309df7412f68abf487c1f9065e6b9d4b4f384254576c8d1098878012e5b53"; }
-    { locale = "et"; arch = "linux-i686"; sha256 = "1540b0f0c1d867c87d1e109b4e9ad417be51306c324a03e07706d7e215f7ae4f"; }
-    { locale = "et"; arch = "linux-x86_64"; sha256 = "e7c0e4e61d17164a648ae51bcff92d99f76055a1a6a29dfec6ea12a0359f1285"; }
-    { locale = "eu"; arch = "linux-i686"; sha256 = "c2c88bf65329b168fde8fe02613eb89069d85da8b2a3114ac647158b8a345055"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha256 = "9d10a2f8a0e889a6ebe99bc486cf56cc44535b6f67ce3667ac61e87430a24eea"; }
-    { locale = "fa"; arch = "linux-i686"; sha256 = "21ba5e79f5fbe3c3a8a8a71f8fe9a4280f8e47d4c58070443bbf53305c906175"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha256 = "99d8d2e81e2a8f495d5568d7a9cbbfbcdc8a0e1d67fa297adf8a021988948a80"; }
-    { locale = "ff"; arch = "linux-i686"; sha256 = "3e1812cd98e04fcf575783eafdef2c89739c51e6648f4cd7ba7bed44fbe5f960"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha256 = "cbe37600da8bfdabe683473dbb4f2ccc96beda89a9ca15810432a8fce65a591f"; }
-    { locale = "fi"; arch = "linux-i686"; sha256 = "ecf982266072b4a15a06b939d4f0cc22c3653982404974baa51871af0e411ab5"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha256 = "345b7f038e454e6efd513e923ad2aa0a45d76d846539563bbfc79293ec84a6ec"; }
-    { locale = "fr"; arch = "linux-i686"; sha256 = "e71b05083a122ef20b5d75481129fa2e3d1e2ac608cea2c5baf7b300a5fbe5df"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha256 = "1897112ce462b341abba4c2b1664fbf39b5072a11ea6fb61c66cbfb3336358f0"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "5557347f19ab6d7c90a34bf8a9729d39eb65a02a021040091cc1863e08fb72c9"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "c77b86d5512f8343674248b9b4d31165975f0eeea002313311339ae45d9effe3"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "7a68d7de10abf095fd9240807a6a553b60ba75f3d8edc56afcf5ad1832a05eaf"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "f935b317c5aadd60553f497ceae2cc663dec3729b2fc8e48e6a98d1eb91fe263"; }
-    { locale = "gd"; arch = "linux-i686"; sha256 = "21bbca4e12b3fa230b879f190d279ba9314090454e0263b65e77dbf8f99dcbf3"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha256 = "027630690ecff7ad56f6e992ef243d2a734dac1a3e6365bb22c56a571f938fcb"; }
-    { locale = "gl"; arch = "linux-i686"; sha256 = "6973787b5136491ef28bb2e10976d49c3717a866ec6fe357a995dbf3179a751c"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha256 = "0ca57d72bf11ddf74eb79904be607c479c01f31f11fc0ff567a9ad7beef8067d"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha256 = "6f422fdcf2fd514e132b33fa079631a6bd4b12deab17a3463b1f3f1ce3f2f535"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "19cc20d1bd838ebfb8518b8076800cc3255376e4928cf2f37be86258307f1104"; }
-    { locale = "he"; arch = "linux-i686"; sha256 = "f8eb56fea0e73c247fc767541bc97cc3556e4db75ad446e01b0978a5c0b11d3f"; }
-    { locale = "he"; arch = "linux-x86_64"; sha256 = "8ee0ae75d179bfec9e081777e9a34fdae72d8d55ade73983fdac433649b596ac"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha256 = "bb64fc5285bca12542669ef83bfc465bf593154f9bca2548510f525bde5a55f3"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "52bb0b68a5f282e65d077166a3a0716fe6c9368ab88f6d5e2a8669515bcc000a"; }
-    { locale = "hr"; arch = "linux-i686"; sha256 = "f36e7b656e5898191801d6e04f3ebef9f9f7080c011dd695ddccfe12c3cb2f6b"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha256 = "9c553d5312363980364c6a9a6591fe5e0229668ff1de3a78943af18235098eee"; }
-    { locale = "hsb"; arch = "linux-i686"; sha256 = "e58662111147e836ac404cf7fc9d9e52ac141b204004c813c6b8d180a378af57"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "5aa7dcce6e48dfcb7b8b4f9f48b4bdd496bd606d901896fd37f2a2cd6b4a06bf"; }
-    { locale = "hu"; arch = "linux-i686"; sha256 = "d352b7d67ebbd5e45f972a804cccbb769f6a79700506297c0808d2f9b0f5ca8d"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha256 = "0f7e5cf8306e1fa9b8ab56cdb39b5ca1fe2ff1a3f4ded38e5982bbd842438dde"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "bf057113e03190fbfc6947f24a0fb432f53991f02e56d2b5e8270002cd742d4d"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "aa0fdba0a703f06ab5a6b667448316f9de9729c20602fecaf872d14e43a0b822"; }
-    { locale = "id"; arch = "linux-i686"; sha256 = "eb8fc36302a63113e9891f8153aeffc1da4f990f1473d9d779f28df6658bada0"; }
-    { locale = "id"; arch = "linux-x86_64"; sha256 = "6f2262e13a649499a0783922a3f2d85a71727ef37629a529f084590828746bca"; }
-    { locale = "is"; arch = "linux-i686"; sha256 = "312f1af8601c24417672383063085f1c588d9301a09ddeef15b8c54e130547ff"; }
-    { locale = "is"; arch = "linux-x86_64"; sha256 = "ed3165767c2a14329869930d2b618a5a795d3c3d34e06cbae0d1694ccdfb0c97"; }
-    { locale = "it"; arch = "linux-i686"; sha256 = "7555b6f4aac9bcc270fcd5204d15a3cb7b84cdd845f66cea2fbb843315100107"; }
-    { locale = "it"; arch = "linux-x86_64"; sha256 = "b6c2799434bceda271a004769372dfe416584953be5950fe7125920e4e428737"; }
-    { locale = "ja"; arch = "linux-i686"; sha256 = "e8606fc60aaf6ba91a2616dc991d268e8099eb8d5d3eb3c19fdeace93c6453a7"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha256 = "5da4d4c307d661868ff7076e2fc1d929e9d3b9816be25adeba02bd4f9a56f15b"; }
-    { locale = "kk"; arch = "linux-i686"; sha256 = "f77db4c679c687bd33ed125419666226989ef5da88c2a4c8a81aea0ece602e25"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha256 = "3af207c5e2b6bf089739056f2be6e585529c87d5f142e7100fee55728faaf785"; }
-    { locale = "km"; arch = "linux-i686"; sha256 = "d48c3f0952d354b9c6539d9e333a8e9c359006a25f1ca6a0895f7e3344504f70"; }
-    { locale = "km"; arch = "linux-x86_64"; sha256 = "5bc3f65a205a78b110293df5a94a9bde27a491d61b1f9e340a7fe983c1ee1b3f"; }
-    { locale = "kn"; arch = "linux-i686"; sha256 = "50efbbad9ea231a9281a00dc702d9c6103bfd09b712b45b6809d78a176714897"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha256 = "001f41e86fcf93fd6a714e5ee0450fe8424bbb3ff40cebad29cb233cb0667bca"; }
-    { locale = "ko"; arch = "linux-i686"; sha256 = "11539b78bc650b19be2d25af10242a61ee043b47a15000f2e07e50df00875e2e"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha256 = "a4f0b466c5d544f0abecec8861e1d24132755fff54091a49370414ba27c9cc7f"; }
-    { locale = "lij"; arch = "linux-i686"; sha256 = "eede4d95ac6c7f55b312aaadce690016732bb143f3926c1d1533f64efd7306e8"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha256 = "6900bfd4af3146881cc045eed187b88a58ea0fe3e0ed6acbff034f68f43b5935"; }
-    { locale = "lt"; arch = "linux-i686"; sha256 = "4cdf1ced9a687daa34235ae82aa439d69e517d5c31b8f61e12615f361440a54a"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha256 = "873f75d77adc9c142f64523c199799f7e9b0460ae0252c514fc1caa5ac5dcdb0"; }
-    { locale = "lv"; arch = "linux-i686"; sha256 = "65af6b876aeda23827c57d5886cc67665fe2c3fe93cfc2cc5b614400828b6eb7"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha256 = "1b2f6ef94bb5a1ea999af797e2aa8ff267b4a9945fd0e8afc6c9df12273ce60d"; }
-    { locale = "mai"; arch = "linux-i686"; sha256 = "65fec172ddfce096f367338c8b95b32fb2415655e900f8dc628b8ac660270e48"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha256 = "238a78c2bb240609fd0c777399d3307ef659b95cf4e88ae85700321030000eb7"; }
-    { locale = "mk"; arch = "linux-i686"; sha256 = "e591486c66c9b7175b1ab180e9646976a413338dca225eb50d7db457f95afe98"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha256 = "f8d04696d02b0af221b8642d4780d79a76be68c07096c7f9c5915a9db6d5f768"; }
-    { locale = "ml"; arch = "linux-i686"; sha256 = "19dd334052bd9c98ec9afe7b8e5141728b25d2278b7b946921b031aaedd01b2d"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha256 = "a307739cb6de6f80258c28797125f78fe7746d0edd3182e3716f312f1b0915f8"; }
-    { locale = "mr"; arch = "linux-i686"; sha256 = "c86343db611dbca1b8fac25ea1e9364b30fcd6c31d5c856f699bacf6e4128c3c"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha256 = "b25fd422e6b3b1535fbb8839d04a77dec22dfcc0abf14062f5465c0a5aa5c99c"; }
-    { locale = "ms"; arch = "linux-i686"; sha256 = "e437939df4de54d415224db8fbf6ce9e8ae21fc0402052a72612085c73faa493"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha256 = "5d9051de7a1bdc68018511d38e29658f00c0db113438a3ec84e68fa99b89f760"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "04d0bdd6235a9321d1a5467c48240cbdb790485b580c1b818b048817fae22f49"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "30afe02bd7090929841edc88eadcd745435f64189782d95477568b3b41cb107c"; }
-    { locale = "nl"; arch = "linux-i686"; sha256 = "83b01feb621cb9c7c64edb125c19aa0765bc2d16b2c20551be12690f835539da"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha256 = "c5af070524b828313a5e819f4c446cdc7a72f6bffd62e734bb8752438e5d28ef"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "527c9c2dd61a318c5b6ca5e9b26ee9b81b71ae8d7c23cdab6efee1bb5caaa685"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "6f3d800c347a70c5ed7a8838365599c7401e4805037f5e980865794d395b416a"; }
-    { locale = "or"; arch = "linux-i686"; sha256 = "e5f9ba3ebe3d641b3dd948ec51dd25671327a35e5ee87b274079a8a3ce7a26b1"; }
-    { locale = "or"; arch = "linux-x86_64"; sha256 = "53fea5b84051fea6c247fe2baf9f9d3c87b3f78d4655fc8509068fd60ff3c942"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "dc8d60a3f94da475fea5c1c748c52072f69d4642ea2c3b305e92c56fb3b09324"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "c06eb60b39cef2564e248e3d9dd711b863e46cc6d45803002c641a1335927bdc"; }
-    { locale = "pl"; arch = "linux-i686"; sha256 = "95cbcf68c03ed83590b6e257003282d710c8dd366fd75bd218880735731ed7d2"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha256 = "9f59a86501cbb9d8813fbf5812646e87d400f136f2cca5d791dd5ac0bc4964c9"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "690772121588229f34e9a9d5e6042c56a3fdb9fdcafea53f45a12997cd1d1e53"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "fce60e0a3787a2362bdab4d566766c22a4b4f777d1dde7552e195eefc8fe98b1"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "35a4981bc819fa7cba9e2f73ebb28eafd68b464eacc9da4e3e651882ae8b84bd"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "eb4f25e99cc681a6113f9de016a6993e46575caba84f5cba6195c88379e4e661"; }
-    { locale = "rm"; arch = "linux-i686"; sha256 = "cef140f0b0c4da31235147871679d009f05aeec3e1b138e56bd6acabf79cb666"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha256 = "e6aba016e9909cc43a9ab285ed8cbfc15dadf2cf7bba9c78ba340512dd9bbcc5"; }
-    { locale = "ro"; arch = "linux-i686"; sha256 = "d159bd682f8db01fea12e25bc0d4c24ef2ffffca07b3c5d64223ae75d6f77d23"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha256 = "e82f1ad5461e25c25a8c6db480a733e95b81578ec280e93a52b00b650211a0ac"; }
-    { locale = "ru"; arch = "linux-i686"; sha256 = "fc2e1166c4d9614bcf9c8ccd01aa157bc229cccbdcd2854bbc52302465d24d75"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha256 = "c08fcc4457bad70ff5861168364306753df7f03d7817a52dda8c6aad74bde389"; }
-    { locale = "si"; arch = "linux-i686"; sha256 = "78f60d4ba047d323ec2a36e2f8a775d86bb2c00bb671009105f5fe368419366f"; }
-    { locale = "si"; arch = "linux-x86_64"; sha256 = "d9c84c673378721c0bc45e767176b879858ba0feacdeeca503e600567569ad33"; }
-    { locale = "sk"; arch = "linux-i686"; sha256 = "1bbddd4c07cffc083997d3b43034438eccf8647bd9b078cbca86f63c50c588ae"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha256 = "f8278a40b25bd24a951855b633218c8d0884fec7468291d947890f2e98310acb"; }
-    { locale = "sl"; arch = "linux-i686"; sha256 = "18e9f99de5847e996ab66202e8718d9844f26ffef771a236ae16ee68098853fa"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha256 = "bbc818432701696fd140e914943d076e4d11741180a04ea27f4be75ec3558d1c"; }
-    { locale = "son"; arch = "linux-i686"; sha256 = "e1d8c54d8b1149f98adb1b46c4973e01fa76bb132f0df9b0f090c4ead0ec4676"; }
-    { locale = "son"; arch = "linux-x86_64"; sha256 = "a57f3971825a40c8dfce2d987384292f1ad3ebe6a96ff762bc38e69c6ce2889f"; }
-    { locale = "sq"; arch = "linux-i686"; sha256 = "b452ab04c4bae6079bbdc293bc6c41882dac30ec1b1483340e49d072ecf2ced4"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha256 = "b8aaff5e70e7690481a5c22fb2da97ce63de67246217fb106441173573aeb4d9"; }
-    { locale = "sr"; arch = "linux-i686"; sha256 = "135f60c2012e63622d1a75cab6fd5f686fee71138b1f1f01e367fac0b3b583c8"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha256 = "ce464a8ec58fe19e037a26a1b94e346ad314eacbe94232f4b136e0fc7b3919ac"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "937bb415ca95996207c371d111a888f68a24d690db8c31b8c1df530b2b7b30a7"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "0ee83de9b3bb77a6e3d1120194700b720d441ee116f9728823c5a78f59d28a10"; }
-    { locale = "ta"; arch = "linux-i686"; sha256 = "fb908dcbc4fa42c6472e4cb5bd9d8ae7c845bbf9965498091b32f7d1669ede24"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha256 = "5c8f1c1c09ff2eccf6becf9136f9da3517fabbb0192f157676962fd3bfd31bb8"; }
-    { locale = "te"; arch = "linux-i686"; sha256 = "5478af8e757d8282993afacd10fc78bc7a207fbdc50705d2d8a665aa98e5f910"; }
-    { locale = "te"; arch = "linux-x86_64"; sha256 = "719945b8d7a945e556137cc3bdc4a8d7ddf5693e4ac49a3884f912ec471da1f5"; }
-    { locale = "th"; arch = "linux-i686"; sha256 = "4f0dfccef932beec90f7de951bb2d454bedc192b376caf25c3ba89ecdb5de9df"; }
-    { locale = "th"; arch = "linux-x86_64"; sha256 = "e14a4cdff4cc89f85043efbf56a82211f1040bc5b369c2113866efb639969017"; }
-    { locale = "tr"; arch = "linux-i686"; sha256 = "aa5bc43997a6669b1c8da7b04a12c7a16ce8b1fedae8b0bb1a317c83176e88c5"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha256 = "3a0a5883b4e4442985fa8e24a80d0849ac450a20d278858e1b3847974cc212f2"; }
-    { locale = "uk"; arch = "linux-i686"; sha256 = "3ea926ea98fd3506cdcccc32266fd8910f7c6b563818d58fa9708872712daad9"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha256 = "c1d596a00831ed30446f8a6f9e7b455329a402939d5c7318616ad182e9564aa5"; }
-    { locale = "uz"; arch = "linux-i686"; sha256 = "d17a26657562ee017388c878867ff43a1d1d86f80c86a18fcf63268b477bd889"; }
-    { locale = "uz"; arch = "linux-x86_64"; sha256 = "7115c30ae7c0528f54aa8629402ddcfc54687e3a439d7a96c18f15e903e283c8"; }
-    { locale = "vi"; arch = "linux-i686"; sha256 = "37fe2af25d7068569770573e605f3d325e41169b3b0a82ca4ff007a0636b155b"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha256 = "5bb2b8a27065b9a71a06dbec136a1774e43fbe27a30a03092f718042d58ec26c"; }
-    { locale = "xh"; arch = "linux-i686"; sha256 = "fa44efebbc0f1174ad10f540668447ddf6bd26a2c918694dd11e63e4d6f36b9c"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha256 = "2c179d4613b0b7456d900f9b6c02a1041c39d4cf98a0ca0ea2ea97d1d7546199"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "e3c06fbffb4b2c135d31499d1a3490d23baedbed5125b46a4153ad9d60ea2fa8"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "3402f491b016e791c9f40f8ac5df5f7017dd6dd71d872020a27eae3634e4fb52"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "c77d79a6b1602c9f8c6538be18c974b8557af3ad3898910e1bccfe0a54993207"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "651e4a28750ea9376636293b934cf646b0e6981825a9801fe8bf47785114e34d"; }
+    { locale = "ach"; arch = "linux-i686"; sha256 = "eefd2889153dc96737781580089fb0db11e02118d9b6e57da3f25ae586e56597"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha256 = "80c7e6efe4334fbdc7060f779a4cb559ebc4516adcd6bdf9f22a986e75e809cd"; }
+    { locale = "af"; arch = "linux-i686"; sha256 = "452595636217272dde5adc98202fd39204fe6e9d5fb82c942499b5b27db38bd2"; }
+    { locale = "af"; arch = "linux-x86_64"; sha256 = "1e746adb9cadaa0ae7014b9b88076ae622f846f117465609367808ee351b33c2"; }
+    { locale = "an"; arch = "linux-i686"; sha256 = "4bbcc5ba7d917ff4a824c917a204710305bc500b990c0449a905adb967a2e851"; }
+    { locale = "an"; arch = "linux-x86_64"; sha256 = "2f724f9ccf43b419df2b70d9dfc4ebe779c332a398d17a38e761367de56ed658"; }
+    { locale = "ar"; arch = "linux-i686"; sha256 = "a9827a7430453c0485708d4473e5267f00127940c9878b9ba67a4698d3efbe1a"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha256 = "3422c0378d7fd37efdcdf56fecfc0295414ed3911ceac1f96fc21e6d7775363d"; }
+    { locale = "as"; arch = "linux-i686"; sha256 = "5c6d72b827db06cf813d80ebfb78a79b24e1037ba53e61b1fb51ed43bb841671"; }
+    { locale = "as"; arch = "linux-x86_64"; sha256 = "09132af34d7ada1657a466243a17517de4aa7f6f62bf10af777da3a619b465a1"; }
+    { locale = "ast"; arch = "linux-i686"; sha256 = "b544ded04a9fc7c7cc2d67cc70a3290c483cec18fe443f51d0f897aa3f60c416"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha256 = "6dda16d4f4eb05674cf6b29940241d99322793b5d306fe7c61ad17573ffdc3f0"; }
+    { locale = "az"; arch = "linux-i686"; sha256 = "c115cbdbf94d7fa0c008e676c9c39429d13f702fca70f656cd571ac008a74772"; }
+    { locale = "az"; arch = "linux-x86_64"; sha256 = "639547d368a06150405ae8bb12354db3c03fbe602410a89e21709b7f6617f24a"; }
+    { locale = "be"; arch = "linux-i686"; sha256 = "7144c4b0dffec65578b4211a04962bcd93b312977dc61356f0d4f6f6a75c872d"; }
+    { locale = "be"; arch = "linux-x86_64"; sha256 = "57504daaa8d8d02877949dbc14a6791ef6205712e3dfe70e6a46cc76f9b6725a"; }
+    { locale = "bg"; arch = "linux-i686"; sha256 = "e198c83f7986bee52b772bd44d8642d0b4385262c93cd73423fbb8d9b97c96e6"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha256 = "cb66cc10fba3ea5cfab4461f0bd2d26cc1f0816770baf16fd74bda27f6566c8e"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "c31e2c1aa1ce0965f800b13e88127b02d47657519edead877a5c32c5420acabb"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "00bfd63c8950879217ed045caa5d19839e1c9fb38eeeaad933c23eaadeba7296"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha256 = "580d9f884aba059968d25e25c2c112318d8015eb5fa29013cf96f49fd620b039"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "30029721b59b1e7fbce580e58019922e61ae751712ca27300c9a125a453e7853"; }
+    { locale = "br"; arch = "linux-i686"; sha256 = "67e682bfca447d11d2433fa1977e482a9693842e3f98c199afb1b8e41774e9e7"; }
+    { locale = "br"; arch = "linux-x86_64"; sha256 = "8442b995879ab6120bdd259606231b0daf8619abe099a1525f826611a5c34347"; }
+    { locale = "bs"; arch = "linux-i686"; sha256 = "72f78a32441a03232ae22d86ac0023674b7d6ed57ea9990244252bea35a8b681"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha256 = "cfdf126ffbfb3b8359c8d01e72fb1e462df102eb458021e66295b5754065b72a"; }
+    { locale = "ca"; arch = "linux-i686"; sha256 = "53bccb498b5510de99f4d54a5c279f499a92a8fbbec79be68737ef06e5c18325"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha256 = "6905d7d8f8cae2192af022cbfe158b77ee02afa26f25e5ade6cfd747a8836119"; }
+    { locale = "cs"; arch = "linux-i686"; sha256 = "7d8e61f1021064c41f8f6b82ae50dff272f64242d6ab289722a0ee246b141b1f"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha256 = "409d1b2c1ce1ae294c530acde139bca076fa20d71825007f08698b51ef0a30b2"; }
+    { locale = "cy"; arch = "linux-i686"; sha256 = "fc982e9355ea15ff40c998def2f3983933077fc726eab348fbd6ec72d3369cec"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha256 = "6a61f1ec194b6235561f2420fba7477a549eeadc3b54dd013c7754dc3c75180b"; }
+    { locale = "da"; arch = "linux-i686"; sha256 = "7ffbbc279ee6bf587847b4f66c8a5ab968163410a6c9c84227f0df25366f892b"; }
+    { locale = "da"; arch = "linux-x86_64"; sha256 = "7601928a20df30262df46ed1a1127fcfa4710ee7bdc951cb3ef295e20a2e2fea"; }
+    { locale = "de"; arch = "linux-i686"; sha256 = "b3a079e15c3551b9b62c4cf11decacfaafac6f8e1765c6d19c53aaadbeaa9e8d"; }
+    { locale = "de"; arch = "linux-x86_64"; sha256 = "0b13215b6f1768735cf58b87dc76b3248d196acfd21377da2095177ea8e6072d"; }
+    { locale = "dsb"; arch = "linux-i686"; sha256 = "568c330a6c397b45cc416d7b4f0086ec75077690ca6902bc7931e795b6eb9848"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "17a0be9e81a35aee281c32a78cfd3c7d34455560d29c423cdf91e8142cc1389d"; }
+    { locale = "el"; arch = "linux-i686"; sha256 = "77e4a8fe8da982bda24767d7ff499ffb835ac28599933bba7465e7fa90232461"; }
+    { locale = "el"; arch = "linux-x86_64"; sha256 = "8b48f3a412c60c4619c210724372611b7b701c5db21b805ca854aef3c823d83d"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha256 = "def26268d266206a8c2b8f5f0b91a74224a1b2d54c70790e00389593e703d09c"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "9c1f7d3ab81a025434023551b77021750634f9a468bc8d892be7e13ccaa7914c"; }
+    { locale = "en-US"; arch = "linux-i686"; sha256 = "fda066d70c87669f69c035af9bef327948f71b07c347633967bdd5c78c02beff"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "bf9d192670b516f393c20292580661b323e2ac88c90771b6834d0f46e86823c1"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha256 = "9e643d372d31cd1cbc376f7cd3a8e8da95adfdec62057e789bb4be7cda5afe66"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "b109109d6c2efa55c68778eaa21d7ada28074ad3008fe4a123107f962240a2ad"; }
+    { locale = "eo"; arch = "linux-i686"; sha256 = "8ae463d0f9608689bc4f9d60ceaa30260cf40b6408a2477a542e8fccb2c94b6b"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha256 = "6853d5d4834839070325a2a5cfbb0610891cf774d015f2d43d9cf42435e0f2df"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha256 = "fa0a952c771cd5e124c66066854767141667678cc281f783ab179f71c0a935b0"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "434fd1e7a9ce25a649c7078396319a8234e96bb535b45b2edc02fc9c9e38c04b"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha256 = "d95d1cbfd606be0b41d6281c6e2c60d53fb96bb1afcbaf3bc8331cc2dca4041a"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "118dca4966717667718b08b238466cab116683e91bcc9c3260990b89192e3e3e"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha256 = "efbe0a6c224d2593df791fbcd3b149dc157d9ae114aa8e2ad170e987da6d74e7"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "80d5a5dcfa14b1bf77b665e668fd7734d51251a5f908fcacbe73690116dac466"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha256 = "7786740923cb23542f0c9fc94169f4850e4f47c9ef4ee190e6995e6593374858"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "e8e281e6594bd3d6f8b6ac0fd13ce8794df59a72f33396247183aa10c5a33f75"; }
+    { locale = "et"; arch = "linux-i686"; sha256 = "71d575d33f9f4cea252e87d000c9d0660174c247b2ccb41421891eede42bcb1f"; }
+    { locale = "et"; arch = "linux-x86_64"; sha256 = "5408fb992704293a2da2ebf1c671adb919c5b81e3031be81b51d18a470276d94"; }
+    { locale = "eu"; arch = "linux-i686"; sha256 = "d11baf3547455e0d9c6ee5bef5a8cd421cead916e70eb83f451fcfadeea87a46"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha256 = "04c0c262f965d995f5ec0954d160c86ab5c9404f6b443b7309f6588174a348c5"; }
+    { locale = "fa"; arch = "linux-i686"; sha256 = "97f8929a4d73e726d11c79b539ba8bf7d9ee7662416e1ab3ab7ed9215bd4c028"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha256 = "77074015a70137a14a86079cae6d548d8b1d5aaef7c1d729a6681289bbc74905"; }
+    { locale = "ff"; arch = "linux-i686"; sha256 = "e9f29243dc0b1d82a749383e6608a7e166dda840695321ee79d4bdca001f2683"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha256 = "8debed13660e6565b4f80d0c7383642db5e38cc0a69baeb26a3fa54d3e5299a4"; }
+    { locale = "fi"; arch = "linux-i686"; sha256 = "f9832f9093953cada6091157c55f3d4ceff8c8fefa4c8c2f8db51d25b7d6d4d1"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha256 = "e01613a01cfc5ae121f16b58321d94a202d3e07e8a09793c307d48eccc176c93"; }
+    { locale = "fr"; arch = "linux-i686"; sha256 = "11c923e8565c7275656486e44e0109b15037ea9fb3476e53a353b9a8c6896c62"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha256 = "483944f87a6b6d9f9e5ad1720b497ea47e4260b0e87e91f9d7ef1f274f38506e"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "60e177657a81b5b1378563519b9dd0d23f2268b5b77d4880ea289522ef2fae14"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "6e4eaa7dbeae9090e0bce8dbabcb3b83c97822a387cfa940029f9bc3610532e9"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "9638bd74f130f13e16da5e743f484b4f5e8672bd4b196c646932dfd0e13e71b8"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "f8166135dea1d167c2eb686786d39ac32c2a9765b3fdf23a26b17550a2e93adb"; }
+    { locale = "gd"; arch = "linux-i686"; sha256 = "1111deb031ed3b4a8954184ac34a03e765ee044712f921f63d15a5e6def971c0"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha256 = "7c9866a8220186ae5c573871829521815241ecba134ebeabd5c18d58f494b414"; }
+    { locale = "gl"; arch = "linux-i686"; sha256 = "5c7739d6299b19b4cda00daea19e81efc7b9ae6d3a4716de8ade143e8e053c3d"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha256 = "02f4090f0c010121b3731ca8a92e0f29c10f97db7fe96309bae4b88e16e853e4"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha256 = "fc771898a75e7f8ace3d9093db82bd2648e91480d686bcebe4d6496555af2ff6"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "5492053dea2f4d809b5025d77cd38a710414b06e7e37bf2840b2ec4f6039e591"; }
+    { locale = "he"; arch = "linux-i686"; sha256 = "92a45496fdf3da5dd1ccb640d5223c1275e0e23f56246b1d82f0dd1856fe3954"; }
+    { locale = "he"; arch = "linux-x86_64"; sha256 = "b79a5112eaaed46b32cc9c54a3c0419cccf342ea8cfb421466e0837d6096a269"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha256 = "c7b2e3acb3b6707060ee0b62477a41ba0714a2b3d22e095abefab6938da4bd39"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "1f4492a3c7d0a2b4f88cd256a68c2038d6d145b461b40ffe79e3e7452af06b55"; }
+    { locale = "hr"; arch = "linux-i686"; sha256 = "d7e2291798e6a54c87fa53409f530cbb36ddea001534eaa0c038305e8aa46d38"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha256 = "9295c24919f3094cdbe89e840e5fdfe73ce9588d0b1108d328c6613ae3b1e829"; }
+    { locale = "hsb"; arch = "linux-i686"; sha256 = "cc38ff9f7e0746b2412cbfebec60c44cb0f0c4a92a8b80cd61d5f9eb3e22cb4a"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "8d9afe825ef721726edab87e6f648ed136eb7e13c5acaa59499a55898e2b74cd"; }
+    { locale = "hu"; arch = "linux-i686"; sha256 = "0e6829af6f5e955cbcd7192e94a613909369ef302349e7d8a45f8cd11df51613"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha256 = "16779aa3f754ca4a211d5489d54c15c49673d96fdfa4b64f0e6050b8f1517973"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "3e4cefe678a7f30153690f9d8b1545fc5805c62ccd0af7f1c3172a0dc4dc6772"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "363cac6106e008fe83b80f1c1c2981b46b890c1c2447b7ad4bde9cf7eea19e45"; }
+    { locale = "id"; arch = "linux-i686"; sha256 = "e3710c2b10ce747e15fa07a426fb2f97983637e9f73eeb0c3d064f2b8bacda6e"; }
+    { locale = "id"; arch = "linux-x86_64"; sha256 = "dfc2a2c1306b624e2cf9b6b4fc3c33ba9b622612f455760674103a78beebfc14"; }
+    { locale = "is"; arch = "linux-i686"; sha256 = "302d96499bf095bfe7c6c765edb197c5d5bf1c90e1dc86ad966f6185aee6873b"; }
+    { locale = "is"; arch = "linux-x86_64"; sha256 = "409fcec5ed65941cd60e78c4321f7c4d80bf8fd225065cf651d4e7db92649506"; }
+    { locale = "it"; arch = "linux-i686"; sha256 = "52e17f9210042f1eb116ec4328b136ece380ebb93fbd05190d475b7cf5617e14"; }
+    { locale = "it"; arch = "linux-x86_64"; sha256 = "cbf8b9c62616b19c448995c22563bcc4c68b6c5cbb6e59ab232115ec8bd0bc6b"; }
+    { locale = "ja"; arch = "linux-i686"; sha256 = "8da7f153541aa283454e4143ca09e3307660b429a48bca3122b7df87b4122812"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha256 = "0eaf62dc5d97ddb35ae1c7589e3cef92a345d89f6cb8f0ac177f3991123eee2c"; }
+    { locale = "kk"; arch = "linux-i686"; sha256 = "22ea4fba5f7b2a64c7f71b68488a00fb1d18a2cc05bdfdede7481ba8fc2b5b53"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha256 = "0bd0fed9e8ed8531e8b7759021afdd08ff45a3d235193c6434c630efa72f2073"; }
+    { locale = "km"; arch = "linux-i686"; sha256 = "957958b0b411c7a92bb00cadec9cd766884f9900907420d976eb84c435de22c2"; }
+    { locale = "km"; arch = "linux-x86_64"; sha256 = "c8cbef947210e4a4c397ebd366128166ba16c59f960eed9ebe1c044918169c9d"; }
+    { locale = "kn"; arch = "linux-i686"; sha256 = "0616551d7e9622227dac6d95f188fd3d11ff3b93b042c3b793447622b6affebc"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha256 = "a4914b4b950884b8bdf2b4ba65a017f813d136d0c30ed1199a51ab7394504cb1"; }
+    { locale = "ko"; arch = "linux-i686"; sha256 = "c47331bb4a65f2a024b9c2d283f9a289e623e0713e4e7a715124ca3e042f1c57"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha256 = "bc11ea2d206ab1588c01e862770b321f99a6947a5c13baab266c1ac5104ae4be"; }
+    { locale = "lij"; arch = "linux-i686"; sha256 = "ea8ad910b666fca73c7312fb338108b2c8d9413595094ae3fe3aa359d2032147"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha256 = "dedde2eae271be10923ab62e56575c5f9216d9c2b9126e745248f9744177ad94"; }
+    { locale = "lt"; arch = "linux-i686"; sha256 = "b106645051269bd594418f71b237b569d51cf85de2cf656d787ace395823fd72"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha256 = "914b64772231951b41dc3a2cd4e625098809046f7f156f958e170d2f72d50511"; }
+    { locale = "lv"; arch = "linux-i686"; sha256 = "03dffd9f7f24533034828f4c7cbf5c14337927b930b814e010c187797ce995c5"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha256 = "c29d6ffd56da153e87da73ddf5ea3db7de143949809081db9f2efdc7bd79d828"; }
+    { locale = "mai"; arch = "linux-i686"; sha256 = "db4a4f3414491641de0e91b0f66eee7f6262640fc258d3ba15cabdf9b3deb5eb"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha256 = "a39711b8769a8e9b2e78dc587e364d7c731538202cd72c0257fbda9cc691196d"; }
+    { locale = "mk"; arch = "linux-i686"; sha256 = "01eb8c625a3ffb68f7dd5fbaac8333bdfbfb6f4284510fc163d3d3db39e1465c"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha256 = "3cb0b8c6655714ca24e345093ba1b5a5380856ec1f9df04ed2b6f0399c61e2b5"; }
+    { locale = "ml"; arch = "linux-i686"; sha256 = "b00a9d53bc27950ec451a7861ac0e34d9d1d04c7e6417c767f47f799380cefaf"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha256 = "e2b53074478efc093e21e5f74ceeaac796a32bb0be347d4023b6d9a8fda99b98"; }
+    { locale = "mr"; arch = "linux-i686"; sha256 = "2d3b2ee4a0a6527ee284a29b38040208639e31fcae75acac94789f0eae0b7ca2"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha256 = "4262cccf8feb6cabe08b2e4d0932666d962ad42214b69a6cf0d55e9c9fc04219"; }
+    { locale = "ms"; arch = "linux-i686"; sha256 = "f957096ac48ffec8430a5351c0697155847ca59ea391d64c6d8111713ff20453"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha256 = "0e69c0a2f3de0207a0cf0ca3e27fcf6141920bdaa9759bf5567b40ed0e33032c"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "8c77863e64a57c4435e50e349eccc8934e128b9ae78904e93e7beb03d8632847"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "7a64b47f81a484970ea7ff5aa49936deb5ea4db6cefcbaf30c6bbe4c5caf2fc6"; }
+    { locale = "nl"; arch = "linux-i686"; sha256 = "a6c3e8aa9c9f59d41c098b7db0ee4b5a1deee33fac7934bf99880d35f97b855b"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha256 = "261c4401ede66816fb58aadab5c335841bd7c416a6fc1f2bed6c7dae4e987c54"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "d8c567a1d99c9d353d046219a9377236a046f4184e2af1c976a7cd000bc2adda"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "9a1356a688e7b9a6c0cbdc26585098310c9c2ca28f8ad1cad89f8dc4fcd157ca"; }
+    { locale = "or"; arch = "linux-i686"; sha256 = "cf46bd9016a66144c16f455feaa7c019f06c3514319b3f524c6abf05862e4245"; }
+    { locale = "or"; arch = "linux-x86_64"; sha256 = "18eed44e7431dd291b77f269e1b5c97142bc8928a8db09bb160999dafa3fdeca"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "4786b4b875da508bafe22c946e0c970f6f1024154c17b80411333ee2ab9b0ee1"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "075fe980df865eb6832956938c76fad0890edbaf22a6514997004fbb591fac66"; }
+    { locale = "pl"; arch = "linux-i686"; sha256 = "2b36f39eb98c2fde698df2bdb7e93efb8f54df2758a8fa0b8cec9ff4c084def9"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha256 = "de3e50631b67a5f3a52c92a9e5aae88397f957367808ebc753eef1f759a135a2"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "db9b2610264f93b2202de4794c1b109ef52d45bd453ed9907058e334c54e2616"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "b3424f2d933a9435ba8db2910c8f13c722beacaeb34f3c47b7369d41e1ef8a67"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "99368ef9c5f580973bd8eb21b24acf1794e9337a6faea98690378888b9185fa8"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "1e2b0c75b2451fdfb355f2ce7d1a7068106c1228aa1eb8f8c56d789e02bec5d5"; }
+    { locale = "rm"; arch = "linux-i686"; sha256 = "0da9cf51a6be5e25c9e711618f15743bee1a735eaa6fb4804589fa9d4b0513fe"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha256 = "fb6b8af9cb51a5bbde5345ed2814fd22b73c25905a8fb9ec304fcaf4b6589584"; }
+    { locale = "ro"; arch = "linux-i686"; sha256 = "8e6d9f35fbc8da78e0074cb830245804450fc6beebd049f9a4db18c627ee543b"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha256 = "b93817243d9709106148143f052c103758bc6290aecc6282a73b8e81632dc1de"; }
+    { locale = "ru"; arch = "linux-i686"; sha256 = "db0048c6ce2ab732513e09bb216b4d8732c9647f29729ebac1f95a7bda3f41b8"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha256 = "79d37bb0d64ff0c723063b4130a9a7b81e59518ed3416bd9fcf623e045c45013"; }
+    { locale = "si"; arch = "linux-i686"; sha256 = "a69dcffbc4e48881eac39f6708dfa419748852c315b232ee5f20df8daf3bb772"; }
+    { locale = "si"; arch = "linux-x86_64"; sha256 = "22b0dfecf78b254960f12d52d8e41ae4e54a73efc50bda2bec73306b6eabb967"; }
+    { locale = "sk"; arch = "linux-i686"; sha256 = "9e8d8766f8814bdeaed905cb8b58ece1b346ce8a57f3d7f21a3371cabbd8a994"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha256 = "b40d8fc6d23ec5d1b11c46354d5b3cb0e8d661880fce50dbf030bda50794f8b1"; }
+    { locale = "sl"; arch = "linux-i686"; sha256 = "e58fec03764019c33718bb520c76e8032548543f1bd25b6d8d6f6861a3a902a3"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha256 = "505a59db3c1db1e96a3f99d828c0c43dc812f58e83b1cd6cb067d3628df49f2b"; }
+    { locale = "son"; arch = "linux-i686"; sha256 = "feeea081020fccecbaeb90b79aff7ce2d132f3f9a7d0e848dab3060a06c7e876"; }
+    { locale = "son"; arch = "linux-x86_64"; sha256 = "bf98080f7ca39d9bfc1a5bafe38a66efbbf4a657019306321e13427d813ad3ab"; }
+    { locale = "sq"; arch = "linux-i686"; sha256 = "858790b16a8c642cd5f76e4d57de5f215514e470bdfa0449e44a4c97d1245b7e"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha256 = "c7f6c20a9436f3a0210010c6f90a1330ca4f3afa4091c6a2256c23021651d898"; }
+    { locale = "sr"; arch = "linux-i686"; sha256 = "77352b54412e869c66bbb73bc66dd333a1f5675d8f13d114486186a9478f92c5"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha256 = "158171775a7b9f8dc0ae87226faac2626a25f8debb5b4d3b0beac3fab2f502d0"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "70ea2d79b1c27615c7d021bdbf0e2a355f46c6e80a91485b6488b03b61266322"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "1aecd8b1a86bccba2a5cff18346bae5c2bc0e2ea8565f30fcc85bdcca2ec4eb2"; }
+    { locale = "ta"; arch = "linux-i686"; sha256 = "cd97638e80460532e1ca0b14608f0bca63e019fd2c9fa39330410a7763894cf8"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha256 = "06a46a9292681557c308aa44e09bfb6cd1a2c3af742a635aa6cc101aa8d6964f"; }
+    { locale = "te"; arch = "linux-i686"; sha256 = "fe15c02885127189ccf444e7ddd4aaab0d70b67c5e90c17ac46ba1e78956ffed"; }
+    { locale = "te"; arch = "linux-x86_64"; sha256 = "2858c26770951a4d449bfa3d5be2421e34bf26132d34efd933f15397b572b7ae"; }
+    { locale = "th"; arch = "linux-i686"; sha256 = "eaf57742712cc584f0a436aa545db0753bc23c6f023a1199886efc11946e7566"; }
+    { locale = "th"; arch = "linux-x86_64"; sha256 = "0a24697e91b6e69fcfb0dba89eac2001766d28b7a02ab3d889ed18e3af05e3ed"; }
+    { locale = "tr"; arch = "linux-i686"; sha256 = "395e18eb8c77cf20cc99de961b6c09b1d2a4a987384225f0d13c8cefbb5edd65"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha256 = "cdf8a47e0b38af8e6749ce8efff8811e6f0fc8fd497bb046cda9523757976edb"; }
+    { locale = "uk"; arch = "linux-i686"; sha256 = "2b34e068f9a4b48ea20d8173b5fc68de631454646482834393266fef258358bb"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha256 = "38afe18c3a167477a060a089d5eaf910295d293619c1627eae161e14741dfcda"; }
+    { locale = "uz"; arch = "linux-i686"; sha256 = "6d71613a41e37e077974b0806f48f483a62cb79ab7deffb3d0ce7f1874557fbd"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha256 = "28d09105d86af87750539899cd010d7edc410d7a06671dbf9d7a9633efbf0d1e"; }
+    { locale = "vi"; arch = "linux-i686"; sha256 = "3ef1bc04ad1d08551f741e676c9fd9d4a42d4b5c78f0dde4297be4321ef64a27"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha256 = "38a77586718cdc82b7b71d945cd565a075c3b3c5bb983bee0bc8c1ae25086eb2"; }
+    { locale = "xh"; arch = "linux-i686"; sha256 = "c6385ae5bb00ed59bc89fab1026b3f9fcee93fffe045564bef116d7700d78092"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha256 = "480dc73f7cc41db7c0171eeb3139d50830b8dec916111ee4f8af3ad67cf95bf8"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "f06897413ac62dda69242b09be1f44b8bb722a53c1aa1bd6350964ce9a7ae682"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "3f551ae58bdeaa0212cfc6d4e033e67a4aa379576f983e6e195c0e962e3fd466"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "ba422c4c436a06b3e4da1d48767c4ea5aed80d7e65e593b3302d76450f0f19f6"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "c6fbbbb71110415f606ffbf44cc3709975e8504e86f3baeac4b086fd1438fff6"; }
   ];
 }

From 4d760edb94e94c316fa38399277c0e71f1c6e890 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 9 Feb 2016 16:15:57 +0100
Subject: [PATCH 1179/2285] Add FIXME

---
 nixos/modules/virtualisation/qemu-vm.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 6e0dc065387a..7dfbc38efee6 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -110,6 +110,7 @@ let
 
   # Generate a hard disk image containing a /boot partition and GRUB
   # in the MBR.  Used when the `useBootLoader' option is set.
+  # FIXME: use nixos/lib/make-disk-image.nix.
   bootDisk =
     pkgs.vmTools.runInLinuxVM (
       pkgs.runCommand "nixos-boot-disk"

From 9e986c161b8127d16063ff5c0da7aad4639422c8 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Tue, 9 Feb 2016 16:53:11 +0100
Subject: [PATCH 1180/2285] wpa_supplicant module: add an option for accepting
 raw PSKs

fix #12892
---
 .../services/networking/wpa_supplicant.nix    | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 1b655af6c82d..1558c5832892 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -8,11 +8,15 @@ let
     ${optionalString cfg.userControlled.enable ''
       ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=${cfg.userControlled.group}
       update_config=1''}
-    ${concatStringsSep "\n" (mapAttrsToList (ssid: networkConfig: ''
+    ${concatStringsSep "\n" (mapAttrsToList (ssid: networkConfig: let
+      psk = if networkConfig.psk != null
+        then ''"${networkConfig.psk}"''
+        else networkConfig.pskRaw;
+    in ''
       network={
         ssid="${ssid}"
-        ${optionalString (networkConfig.psk != null) ''psk="${networkConfig.psk}"''}
-        ${optionalString (networkConfig.psk == null) ''key_mgmt=NONE''}
+        ${optionalString (psk != null) ''psk=${psk}''}
+        ${optionalString (psk == null) ''key_mgmt=NONE''}
       }
     '') cfg.networks)}
   '' else "/etc/wpa_supplicant.conf";
@@ -49,6 +53,19 @@ in {
 
                 Be aware that these will be written to the nix store
                 in plaintext!
+
+                Mutually exclusive with <varname>pskRaw</varname>.
+              '';
+            };
+
+            pskRaw = mkOption {
+              type = types.nullOr types.str;
+              default = null;
+              description = ''
+                The network's pre-shared key in hex defaulting
+                to being a network without any authentication.
+
+                Mutually exclusive with <varname>psk</varname>.
               '';
             };
           };
@@ -95,6 +112,11 @@ in {
 
   config = mkMerge [
     (mkIf cfg.enable {
+      assertions = flip mapAttrsToList cfg.networks (name: cfg: {
+        assertion = cfg.psk == null || cfg.pskRaw == null;
+        message = ''networking.wireless."${name}".psk and networking.wireless."${name}".pskRaw are mutually exclusive'';
+      });
+
       environment.systemPackages =  [ pkgs.wpa_supplicant ];
 
       services.dbus.packages = [ pkgs.wpa_supplicant ];

From 177464ade947caf561627b4f91c369a2c05dc750 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 9 Feb 2016 18:19:56 +0100
Subject: [PATCH 1181/2285] wrapFirefox: add enableAdobeReader

So far we only have 32-bit package.
It will be silently missed on 64-bit ATM.
---
 pkgs/applications/misc/adobe-reader/default.nix           | 2 ++
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix
index 6bb16a02402c..d31e9234e094 100644
--- a/pkgs/applications/misc/adobe-reader/default.nix
+++ b/pkgs/applications/misc/adobe-reader/default.nix
@@ -22,6 +22,8 @@ stdenv.mkDerivation {
   libPath = stdenv.lib.makeLibraryPath
     [ stdenv.cc.cc libX11 zlib libxml2 cups pango atk gtk glib gdk_pixbuf ];
 
+  passthru.mozillaPlugin = "/libexec/adobe-reader/Browser/intellinux";
+
   meta = {
     description = "Adobe Reader, a viewer for PDF documents";
     homepage = http://www.adobe.com/products/reader;
diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index 8c805b0bf5fe..91486b608b2c 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -4,7 +4,7 @@
 , gnash, flashplayer, hal-flash
 , MPlayerPlugin, gecko_mediaplayer, gst_all, xorg, libpulseaudio, libcanberra
 , supportsJDK, jrePlugin, icedtea_web
-, trezor-bridge, bluejeans, djview4
+, trezor-bridge, bluejeans, djview4, adobe-reader
 , google_talk_plugin, fribid, gnome3/*.gnome_shell*/
 }:
 
@@ -41,6 +41,7 @@ let
       ++ lib.optional (cfg.enableGnomeExtensions or false) gnome3.gnome_shell
       ++ lib.optional (cfg.enableTrezor or false) trezor-bridge
       ++ lib.optional (cfg.enableBluejeans or false) bluejeans
+      ++ lib.optional (cfg.enableAdobeReader or false) adobe-reader
      );
   libs = [ gst_all.gstreamer gst_all.gst-plugins-base ]
          ++ lib.optionals (cfg.enableQuakeLive or false)

From 5e3f4106f115d1904c5bc4e57f7294555446a6bb Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 9 Feb 2016 12:33:12 +0100
Subject: [PATCH 1182/2285] udiskie: build man page

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b9343e54a2e3..f4126747d961 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23343,8 +23343,19 @@ in modules // {
       export XDG_RUNTIME_DIR=/tmp
     '';
 
+    buildInputs = [
+      pkgs.asciidoc-full        # For building man page.
+    ];
+
     propagatedBuildInputs = with self; [ pkgs.gobjectIntrospection pkgs.gtk3 pyyaml pygobject3 pkgs.libnotify pkgs.udisks2 pkgs.gettext self.docopt ];
 
+    postBuild = "make -C doc";
+
+    postInstall = ''
+      mkdir -p $out/share/man/man8
+      cp -v doc/udiskie.8 $out/share/man/man8/
+    '';
+
     preFixup = ''
         wrapProgram "$out/bin/"* \
           --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH"

From e5ba71103378d1a4bb3c563a730e45a1ab058979 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 9 Feb 2016 12:34:39 +0100
Subject: [PATCH 1183/2285] udiskie: 1.1.2 -> 1.4.8

---
 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 f4126747d961..e6c536b5bcbc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23331,12 +23331,12 @@ in modules // {
   };
 
   udiskie = buildPythonPackage rec {
-    version = "1.1.2";
+    version = "1.4.8";
     name = "udiskie-${version}";
 
     src = pkgs.fetchurl {
       url = "https://github.com/coldfix/udiskie/archive/${version}.tar.gz";
-      sha256 = "07fyvwp4rga47ayfsmb79p2784sqrih0sglwnd9c4x6g63xgljvb";
+      sha256 = "0fj1kh6pmwyyy54ybc5fa625lhrxzhzmfx1nwz2lym5cpm4b21fl";
     };
 
     preConfigure = ''

From 22818c6ec4a77b640b15050dd48a1aef244075f7 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 9 Feb 2016 21:43:50 +0100
Subject: [PATCH 1184/2285] beets: 1.3.16 -> 1.3.17

one test fails, see the source comment
---
 pkgs/tools/audio/beets/default.nix | 34 +++++++++++++++++-------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index c1945ca5de0a..6a3345e1d3c9 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -1,17 +1,18 @@
 { stdenv, fetchFromGitHub, writeScript, glibcLocales
 , buildPythonPackage, pythonPackages, python, imagemagick
 
-, enableAcoustid   ? true
-, enableBadfiles   ? true, flac ? null, mp3val ? null
-, enableDiscogs    ? true
-, enableEchonest   ? true
-, enableEmbyupdate ? true
-, enableFetchart   ? true
-, enableLastfm     ? true
-, enableMpd        ? true
-, enableReplaygain ? true, bs1770gain ? null
-, enableThumbnails ? true
-, enableWeb        ? true
+, enableAcousticbrainz ? true
+, enableAcoustid       ? true
+, enableBadfiles       ? true, flac ? null, mp3val ? null
+, enableDiscogs        ? true
+, enableEchonest       ? true
+, enableEmbyupdate     ? true
+, enableFetchart       ? true
+, enableLastfm         ? true
+, enableMpd            ? true
+, enableReplaygain     ? true, bs1770gain ? null
+, enableThumbnails     ? true
+, enableWeb            ? true
 
 # External plugins
 , enableAlternatives ? false
@@ -34,6 +35,7 @@ with stdenv.lib;
 
 let
   optionalPlugins = {
+    acousticbrainz = enableAcousticbrainz;
     badfiles = enableBadfiles;
     chroma = enableAcoustid;
     discogs = enableDiscogs;
@@ -68,14 +70,14 @@ let
 
 in buildPythonPackage rec {
   name = "beets-${version}";
-  version = "1.3.16";
+  version = "1.3.17";
   namePrefix = "";
 
   src = fetchFromGitHub {
     owner = "sampsyo";
     repo = "beets";
     rev = "v${version}";
-    sha256 = "1grjcgr419yq756wwxjpzyfjdf8n51bg6i0agm465lb7l3jgqy6k";
+    sha256 = "1fskxx5xxjqf4xmfjrinh7idjiq6qncb24hiyccv09l47fr1yipc";
   };
 
   propagatedBuildInputs = [
@@ -91,7 +93,9 @@ in buildPythonPackage rec {
     python.modules.readline
   ] ++ optional enableAcoustid     pythonPackages.pyacoustid
     ++ optional (enableFetchart
-              || enableEmbyupdate) pythonPackages.requests2
+              || enableEmbyupdate
+              || enableAcousticbrainz)
+                                   pythonPackages.requests2
     ++ optional enableDiscogs      pythonPackages.discogs_client
     ++ optional enableEchonest     pythonPackages.pyechonest
     ++ optional enableLastfm       pythonPackages.pylast
@@ -135,7 +139,7 @@ in buildPythonPackage rec {
       test/test_replaygain.py
   '';
 
-  doCheck = true;
+  doCheck = false; # TODO, see https://github.com/beetbox/beets/issues/1876#issuecomment-182010438
 
   preCheck = ''
     (${concatMapStrings (s: "echo \"${s}\";") allPlugins}) \

From ee90c703befceee382be5fe4ba07bdbe2335c841 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 9 Feb 2016 21:49:45 +0100
Subject: [PATCH 1185/2285] progress: 0.12.1 -> 0.13

---
 pkgs/tools/misc/progress/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix
index 3d0d03f6c4a2..ab72dc69fa47 100644
--- a/pkgs/tools/misc/progress/default.nix
+++ b/pkgs/tools/misc/progress/default.nix
@@ -1,16 +1,17 @@
-{ stdenv, fetchFromGitHub, ncurses }:
+{ stdenv, fetchFromGitHub, pkgconfig, ncurses }:
 
 stdenv.mkDerivation rec {
   name = "progress-${version}";
-  version = "0.12.1";
+  version = "0.13";
 
   src = fetchFromGitHub {
     owner = "Xfennec";
     repo = "progress";
     rev = "v${version}";
-    sha256 = "0lwj0zdcdsl1wczk3yq7wfpyw3zi87h8x2z8yjp0wgnr45bbqibl";
+    sha256 = "0xzpcvz4n0h8m0mhxgpvn1qg8993naip3asjbk3nmk3d4lbyh0b3";
   };
 
+  nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ ncurses ];
 
   makeFlags = [ "PREFIX=$(out)" ];

From e1bcc74135cacb0180255399e76d12ddad2acabe Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Sat, 24 Oct 2015 01:32:20 +0200
Subject: [PATCH 1186/2285] wayland window managers: orbment, sway, velox

---
 pkgs/applications/misc/dmenu/wayland.nix      | 34 +++++++++++
 pkgs/applications/misc/st/wayland.nix         | 34 +++++++++++
 .../window-managers/orbment/default.nix       | 57 ++++++++++++++++++
 .../window-managers/sway/default.nix          | 38 ++++++++++++
 .../window-managers/velox/default.nix         | 29 ++++++++++
 pkgs/development/libraries/swc/default.nix    | 30 ++++++++++
 pkgs/development/libraries/wlc/default.nix    | 58 +++++++++++++++++++
 pkgs/development/libraries/wld/default.nix    | 30 ++++++++++
 pkgs/top-level/all-packages.nix               | 14 +++++
 9 files changed, 324 insertions(+)
 create mode 100644 pkgs/applications/misc/dmenu/wayland.nix
 create mode 100644 pkgs/applications/misc/st/wayland.nix
 create mode 100644 pkgs/applications/window-managers/orbment/default.nix
 create mode 100644 pkgs/applications/window-managers/sway/default.nix
 create mode 100644 pkgs/applications/window-managers/velox/default.nix
 create mode 100644 pkgs/development/libraries/swc/default.nix
 create mode 100644 pkgs/development/libraries/wlc/default.nix
 create mode 100644 pkgs/development/libraries/wld/default.nix

diff --git a/pkgs/applications/misc/dmenu/wayland.nix b/pkgs/applications/misc/dmenu/wayland.nix
new file mode 100644
index 000000000000..d55e22c5a3b8
--- /dev/null
+++ b/pkgs/applications/misc/dmenu/wayland.nix
@@ -0,0 +1,34 @@
+{stdenv, fetchurl #, libX11, libXinerama, enableXft, libXft, zlib
+, swc, wld, wayland, libxkbcommon, pixman, fontconfig
+}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "dmenu-wayland-${version}";
+  version = "git-2014-11-02";
+  rev = "6e08b77428cc3c406ed2e90d4cae6c41df76341e";
+
+  src = fetchurl {
+    url = "https://github.com/michaelforney/dmenu/archive/${rev}.tar.gz";
+    sha256 = "d0f73e442baf44a93a3b9d41a72e9cfa14f54af6049c90549f516722e3f88019";
+  };
+
+  buildInputs = [ swc wld wayland libxkbcommon pixman fontconfig ];
+
+  postPatch = ''
+    sed -ri -e 's!\<(dmenu|dmenu_path)\>!'"$out/bin"'/&!g' dmenu_run
+  '';
+
+  preConfigure = [
+    ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g; s@/usr/share/swc@$(echo "$nativeBuildInputs" | grep -o '[^ ]*-swc-[^ ]*')/share/swc@g" config.mk''
+  ];
+
+  meta = {
+      description = "a generic, highly customizable, and efficient menu for the X Window System";
+      homepage = http://tools.suckless.org/dmenu;
+      license = stdenv.lib.licenses.mit;
+      maintainers = with stdenv.lib.maintainers; [ ];
+      platforms = with stdenv.lib.platforms; all;
+  };
+}
diff --git a/pkgs/applications/misc/st/wayland.nix b/pkgs/applications/misc/st/wayland.nix
new file mode 100644
index 000000000000..ed7e0cf7ca1d
--- /dev/null
+++ b/pkgs/applications/misc/st/wayland.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, pkgconfig, writeText
+, ncurses, wayland, wld, libxkbcommon, fontconfig, pixman
+, conf? null}:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  name = "st-wayland-${version}";
+  version = "git-2015-08-29";
+  rev = "61b47b76a09599c8093214e28c48938f5b424daa";
+
+  src = fetchurl {
+    url = "https://github.com/michaelforney/st/archive/${rev}.tar.gz";
+    sha256 = "7164da135f02405dba5ae3131dfd896e072df29ac6c0928f3b887beffb8a7d97";
+  };
+
+  configFile = optionalString (conf!=null) (writeText "config.def.h" conf);
+  preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h";
+
+  buildInputs = [ pkgconfig ncurses wayland wld libxkbcommon fontconfig pixman ];
+
+  NIX_LDFLAGS = "-lfontconfig";
+
+  installPhase = ''
+    TERMINFO=$out/share/terminfo make install PREFIX=$out
+  '';
+
+  meta = {
+    homepage = http://st.suckless.org/;
+    license = stdenv.lib.licenses.mit;
+    maintainers = with maintainers; [ ];
+    platforms = with platforms; linux;
+  };
+}
diff --git a/pkgs/applications/window-managers/orbment/default.nix b/pkgs/applications/window-managers/orbment/default.nix
new file mode 100644
index 000000000000..567903f589c5
--- /dev/null
+++ b/pkgs/applications/window-managers/orbment/default.nix
@@ -0,0 +1,57 @@
+{ lib, stdenv, fetchurl, makeWrapper, cmake, pkgconfig
+, wlc, dbus_libs, wayland, libxkbcommon, pixman, libinput, udev, zlib, libpng, libdrm, libX11
+}:
+
+stdenv.mkDerivation rec {
+  name = "orbment-${version}";
+  version = "git-2015-09-30";
+  repo = "https://github.com/Cloudef/orbment";
+  rev = "229a870dbbb9dbc66c137cf2747eab11acdf1a95";
+
+  chck_repo = "https://github.com/Cloudef/chck";
+  chck_rev = "6191a69572952291c137294317874c06c9c0d6a9";
+  inihck_repo = "https://github.com/Cloudef/inihck";
+  inihck_rev = "462cbd5fd67226714ac2bdfe4ceaec8e251b2d9c";
+
+  srcs = [
+   (fetchurl {
+     url = "${repo}/archive/${rev}.tar.gz";
+     sha256 = "7aaa0262d078adaf47abdf500b9ea581f6bec164c195a44a3c165a865414ca2c";
+   })
+   (fetchurl {
+     url = "${chck_repo}/archive/${chck_rev}.tar.gz";
+     sha256 = "26b4af1390bf67c674732cad69fc94fb027a3d269241d0bd862f42fb80bd5160";
+   })
+   (fetchurl {
+     url = "${inihck_repo}/archive/${inihck_rev}.tar.gz";
+     sha256 = "d21f2ac25eafed285614f5f0ef7a1014d629ba382f4e64bc89fe2c3e98c2777f";
+   })
+  ];
+
+  sourceRoot = "orbment-${rev}";
+  postUnpack = ''
+    rm -rf orbment-${rev}/lib/chck orbment-${rev}/lib/inihck
+    ln -s ../../chck-${chck_rev} orbment-${rev}/lib/chck
+    ln -s ../../inihck-${inihck_rev} orbment-${rev}/lib/inihck
+  '';
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ makeWrapper wlc dbus_libs wayland libxkbcommon pixman libinput udev zlib libpng libX11 libdrm ];
+  makeFlags = "PREFIX=$(out)";
+  installPhase = "PREFIX=$out make install";
+
+  LD_LIBRARY_PATH = lib.makeLibraryPath [ libX11 libdrm dbus_libs ];
+  preFixup = ''
+    wrapProgram $out/bin/orbment \
+      --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}";
+  '';
+
+  meta = {
+    description = "Modular Wayland compositor";
+    homepage    = repo;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
new file mode 100644
index 000000000000..cec48fad4e56
--- /dev/null
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -0,0 +1,38 @@
+{ lib, stdenv, fetchurl, makeWrapper, cmake, pkgconfig
+, wayland, wlc, libxkbcommon, pixman, fontconfig, pcre, json_c, asciidoc, libxslt, dbus_libs
+}:
+
+stdenv.mkDerivation rec {
+  name = "sway-${version}";
+  version = "git-2015-10-16";
+
+  src = fetchurl {
+    url = "https://github.com/SirCmpwn/sway/archive/16e904634c65128610537bed7fcb16ac3bb45165.tar.gz";
+    sha256 = "52d6c4b49fea69e2a2c1b44b858908b7736301bdb9ed483c294bc54bb40e872e";
+  };
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [ makeWrapper wayland wlc libxkbcommon pixman fontconfig pcre json_c asciidoc libxslt dbus_libs ];
+
+  patchPhase = ''
+    sed -i s@/etc/sway@$out/etc/sway@g CMakeLists.txt;
+  '';
+
+  makeFlags = "PREFIX=$(out)";
+  installPhase = "PREFIX=$out make install";
+
+  LD_LIBRARY_PATH = lib.makeLibraryPath [ wlc dbus_libs ];
+  preFixup = ''
+    wrapProgram $out/bin/sway \
+      --prefix LD_LIBRARY_PATH : "${LD_LIBRARY_PATH}";
+  '';
+
+  meta = {
+    description = "i3-compatible window manager for Wayland";
+    homepage    = "http://swaywm.org";
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/applications/window-managers/velox/default.nix b/pkgs/applications/window-managers/velox/default.nix
new file mode 100644
index 000000000000..8823b32ee3ce
--- /dev/null
+++ b/pkgs/applications/window-managers/velox/default.nix
@@ -0,0 +1,29 @@
+{ lib, stdenv, fetchurl, fetchFromGitHub, pkgconfig
+, swc, libxkbcommon
+, wld, wayland, pixman, fontconfig
+}:
+
+stdenv.mkDerivation rec {
+  name = "velox-${version}";
+  version = "git-2015-09-23";
+
+  src = fetchurl {
+    url = "https://github.com/michaelforney/velox/archive/499768b5834967727e3d91139b4013b6aca95762.tar.gz";
+    sha256 = "252959f0f0ff593c187449b61c234c214fdf321e3f4e8b5d9e3c2949d932a0a2";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ swc libxkbcommon wld wayland pixman fontconfig ];
+
+  makeFlags = "PREFIX=$(out)";
+  installPhase = "PREFIX=$out make install";
+
+  meta = {
+    description = "velox window manager";
+    homepage    = "https://github.com/michaelforney/velox";
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/development/libraries/swc/default.nix b/pkgs/development/libraries/swc/default.nix
new file mode 100644
index 000000000000..448459d02750
--- /dev/null
+++ b/pkgs/development/libraries/swc/default.nix
@@ -0,0 +1,30 @@
+{ lib, stdenv, fetchurl, pkgconfig
+, wld, wayland, xwayland, fontconfig, pixman, libdrm, libinput, libevdev, libxkbcommon, libxcb, xcbutilwm
+}:
+
+stdenv.mkDerivation rec {
+  name = "swc-${version}";
+  version = "git-2015-09-05";
+  repo = "https://github.com/michaelforney/swc";
+  rev = "0dff35ad9b80fc62e6b48417f78c24df6648c9d2";
+
+  src = fetchurl {
+    url = "${repo}/archive/${rev}.tar.gz";
+    sha256 = "7af5655b5bb5fe59bb8e6643e35f794419850463b1d7f44f29b45ab6aee01ae9";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ wld wayland xwayland fontconfig pixman libdrm libinput libevdev libxkbcommon libxcb xcbutilwm ];
+
+  makeFlags = "PREFIX=$(out)";
+  installPhase = "PREFIX=$out make install";
+
+  meta = {
+    description = "A library for making a simple Wayland compositor";
+    homepage    = repo;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix
new file mode 100644
index 000000000000..a0b592df4a35
--- /dev/null
+++ b/pkgs/development/libraries/wlc/default.nix
@@ -0,0 +1,58 @@
+{ lib, stdenv, fetchurl, cmake, pkgconfig
+, glibc, wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa, libdrm, udev, systemd, dbus_libs
+, libpthreadstubs, libX11, libXau, libXdmcp, libXext, libXdamage, libxshmfence, libXxf86vm, linuxPackages_4_2
+}:
+
+stdenv.mkDerivation rec {
+  name = "wlc-${version}";
+  version = "git-2015-10-04";
+  repo = "https://github.com/Cloudef/wlc";
+  rev = "74d978cc54fd8256777c8d39327cb677523cddff";
+
+  chck_repo = "https://github.com/Cloudef/chck";
+  chck_rev = "6191a69572952291c137294317874c06c9c0d6a9";
+
+  srcs = [
+   (fetchurl {
+     url = "${repo}/archive/${rev}.tar.gz";
+     sha256 = "a3641e79252a140be089dd2e829b4d21a3b5ff10866951568d54bd4600597254";
+   })
+   (fetchurl {
+     url = "${chck_repo}/archive/${chck_rev}.tar.gz";
+     sha256 = "26b4af1390bf67c674732cad69fc94fb027a3d269241d0bd862f42fb80bd5160";
+   })
+  ];
+
+  sourceRoot = "wlc-${rev}";
+  postUnpack = ''
+    rm -rf wlc-${rev}/lib/chck
+    ln -s ../../chck-${chck_rev} wlc-${rev}/lib/chck
+  '';
+
+  patchPhase = ''
+    ( echo '#include <stdlib.h>';
+      echo '#include <libdrm/drm.h>';
+      cat src/platform/backend/drm.c
+    ) >src/platform/backend/drm.c-fix;
+    mv src/platform/backend/drm.c-fix src/platform/backend/drm.c;
+  '';
+
+  nativeBuildInputs = [ cmake pkgconfig ];
+
+  buildInputs = [
+    wayland pixman libxkbcommon libinput libxcb xcbutilwm xcbutilimage mesa libdrm udev
+    libpthreadstubs libX11 libXau libXdmcp libXext libXdamage libxshmfence libXxf86vm
+    systemd dbus_libs
+  ];
+
+  makeFlags = "PREFIX=$(out) -lchck";
+  installPhase = "PREFIX=$out make install";
+
+  meta = {
+    description = "A library for making a simple Wayland compositor";
+    homepage    = repo;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/development/libraries/wld/default.nix b/pkgs/development/libraries/wld/default.nix
new file mode 100644
index 000000000000..1dd5858ec720
--- /dev/null
+++ b/pkgs/development/libraries/wld/default.nix
@@ -0,0 +1,30 @@
+{ lib, stdenv, fetchurl, pkgconfig
+, wayland, fontconfig, pixman, freetype, libdrm
+}:
+
+stdenv.mkDerivation rec {
+  name = "wld-${version}";
+  version = "git-2015-09-01";
+  repo = "https://github.com/michaelforney/wld";
+  rev = "efe0a1ed1856a2e4a1893ed0f2d7dde43b5627f0";
+
+  src = fetchurl {
+    url = "${repo}/archive/${rev}.tar.gz";
+    sha256 = "09388f7828e18c75e7b8d41454903886a725d7a868f60e66c128bd7d2e953ee1";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ wayland fontconfig pixman freetype libdrm ];
+
+  makeFlags = "PREFIX=$(out)";
+  installPhase = "PREFIX=$out make install";
+
+  meta = {
+    description = "A primitive drawing library targeted at Wayland";
+    homepage    = repo;
+    license     = lib.licenses.mit;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3d3b6f157407..ad141e1a9663 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11146,6 +11146,8 @@ let
     enableXft = true;
   };
 
+  dmenu-wayland = callPackage ../applications/misc/dmenu/wayland.nix { };
+
   dmenu2 = callPackage ../applications/misc/dmenu2 { };
 
   dmtx = dmtx-utils;
@@ -11825,6 +11827,14 @@ let
 
   spectrwm = callPackage ../applications/window-managers/spectrwm { };
 
+  wlc = callPackage ../development/libraries/wlc { };
+  orbment = callPackage ../applications/window-managers/orbment { };
+  sway = callPackage ../applications/window-managers/sway { };
+
+  swc = callPackage ../development/libraries/swc { };
+  wld = callPackage ../development/libraries/wld { };
+  velox = callPackage ../applications/window-managers/velox { };
+
   i3 = callPackage ../applications/window-managers/i3 {
     xcb-util-cursor = if stdenv.isDarwin then xcb-util-cursor-HEAD else xcb-util-cursor;
   };
@@ -12790,6 +12800,10 @@ let
     conf = config.st.conf or null;
   };
 
+  st-wayland = callPackage ../applications/misc/st/wayland.nix {
+    conf = config.st.conf or null;
+  };
+
   stag = callPackage ../applications/misc/stag {
     curses = ncurses;
   };

From 9535d51289e6601c9c231755e5f2f6c629715792 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 9 Feb 2016 20:35:17 +0100
Subject: [PATCH 1187/2285] pythonPackages.pandas: fix tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b9343e54a2e3..8c28c97fd334 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14229,7 +14229,8 @@ in modules // {
     checkPhase = let
       testsToSkip = ["test_data" "test_excel" "test_html" "test_json"
                      "test_frequencies" "test_frame"
-                     "test_read_clipboard_infer_excel"] ++
+                     "test_read_clipboard_infer_excel"
+                     "test_interp_alt_scipy" "test_nanops" "test_stats"] ++
                     optional isPy35 "test_sql";
     in ''
       runHook preCheck

From 0ce6603bd86a83bc7800f40e2a887728aea33de5 Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Tue, 9 Feb 2016 22:13:33 +0100
Subject: [PATCH 1188/2285] pflask

---
 pkgs/os-specific/linux/pflask/default.nix | 37 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/os-specific/linux/pflask/default.nix

diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/os-specific/linux/pflask/default.nix
new file mode 100644
index 000000000000..e3ba10cbacd9
--- /dev/null
+++ b/pkgs/os-specific/linux/pflask/default.nix
@@ -0,0 +1,37 @@
+{ lib, stdenv, fetchurl, python
+}:
+
+stdenv.mkDerivation rec {
+  name = "pflask-${version}";
+  version = "git-2015-10-06";
+  rev = "1f575a73d796fbb92e8f2012ded7e97247f1c6c3";
+
+  src = fetchurl {
+    url = "https://github.com/ghedo/pflask/archive/${rev}.tar.gz";
+    sha256 = "3518aa1e8fa35e059bd63956daed9d8c4115475b66b674d02ebc80484248ddbc";
+  };
+
+  buildInputs = [ python ];
+
+  configurePhase = ''
+    ln -s ${fetchurl {
+      url = "http://ftp.waf.io/pub/release/waf-1.8.6";
+      sha256 = "81c4e6a3144c7b2021a839e7277bdaf1cedbbc87302186897b4ae03f4effcbf5";
+    }} waf
+    python waf configure --prefix=$out
+  '';
+  buildPhase = ''
+    python waf build
+  '';
+  installPhase = ''
+    python waf install
+  '';
+
+  meta = {
+    description = "Lightweight process containers for Linux";
+    homepage    = "https://ghedo.github.io/pflask/";
+    license     = lib.licenses.bsd2;
+    platforms   = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40e92629064c..33caf0a6b568 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12980,6 +12980,8 @@ let
     inherit (gst_all_1) gstreamer gst-plugins-base;
   };
 
+  pflask = callPackage ../os-specific/linux/pflask {};
+
   photoqt = qt5.callPackage ../applications/graphics/photoqt { };
 
   phototonic = qt5.callPackage ../applications/graphics/phototonic { };

From 8993b652255c07e04f72296e5ac49b6b15844cf8 Mon Sep 17 00:00:00 2001
From: Sheena Artrip <sheena.artrip@gmail.com>
Date: Tue, 9 Feb 2016 16:46:05 -0500
Subject: [PATCH 1189/2285] sipsak - init at 4.1.2.1

---
 pkgs/tools/networking/sipsak/default.nix | 25 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/networking/sipsak/default.nix

diff --git a/pkgs/tools/networking/sipsak/default.nix b/pkgs/tools/networking/sipsak/default.nix
new file mode 100644
index 000000000000..941e1d809ba1
--- /dev/null
+++ b/pkgs/tools/networking/sipsak/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchurl, autoreconfHook, c-ares, openssl ? null }:
+
+stdenv.mkDerivation rec {
+  name = "sipsak-${version}";
+  version = "4.1.2.1";
+
+  buildInputs = [
+    autoreconfHook
+    openssl
+    c-ares
+  ];
+
+  src = fetchurl {
+    url = "https://github.com/sipwise/sipsak/archive/mr${version}.tar.gz";
+    sha256 = "769fe59966b1962b67aa35aad7beb9a2110ebdface36558072a05c6405fb5374";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/sipwise/sipsak;
+    description = "SIP Swiss army knife";
+    license = stdenv.lib.licenses.gpl2;
+  };
+
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40e92629064c..c573afbc1571 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3131,6 +3131,8 @@ let
 
   simplescreenrecorder = callPackage ../applications/video/simplescreenrecorder { };
 
+  sipsak = callPackage ../tools/networking/sipsak { };
+
   skippy-xd = callPackage ../tools/X11/skippy-xd {};
 
   skydns = goPackages.skydns.bin // { outputs = [ "bin" ]; };

From c7ef45e15355a49bc8a4cb6052beb9fcae23eeaa Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Tue, 9 Feb 2016 22:54:03 +0100
Subject: [PATCH 1190/2285] pflask: git-2015-10-06 -> git-2015-12-17

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

diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/os-specific/linux/pflask/default.nix
index e3ba10cbacd9..931b074534e2 100644
--- a/pkgs/os-specific/linux/pflask/default.nix
+++ b/pkgs/os-specific/linux/pflask/default.nix
@@ -3,12 +3,12 @@
 
 stdenv.mkDerivation rec {
   name = "pflask-${version}";
-  version = "git-2015-10-06";
-  rev = "1f575a73d796fbb92e8f2012ded7e97247f1c6c3";
+  version = "git-2015-12-17";
+  rev = "599418bb6453eaa0ccab493f9411f13726c1a636";
 
   src = fetchurl {
     url = "https://github.com/ghedo/pflask/archive/${rev}.tar.gz";
-    sha256 = "3518aa1e8fa35e059bd63956daed9d8c4115475b66b674d02ebc80484248ddbc";
+    sha256 = "2545fca37f9da484b46b6fb5e3a9bbba6526a9725189fe4af5227ef6e6fca440";
   };
 
   buildInputs = [ python ];

From 877dc973ab76ad73c371a87285fc294a7edb3f41 Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Tue, 9 Feb 2016 23:41:01 +0100
Subject: [PATCH 1191/2285] wayland window managers: orbment, sway, velox ->
 latest git

---
 .../window-managers/orbment/default.nix       | 10 ++++----
 .../window-managers/sway/default.nix          |  6 +++--
 .../window-managers/velox/default.nix         |  8 ++++---
 pkgs/development/libraries/swc/default.nix    |  6 ++---
 pkgs/development/libraries/wlc/default.nix    | 24 +++++++++++++------
 5 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/window-managers/orbment/default.nix b/pkgs/applications/window-managers/orbment/default.nix
index 567903f589c5..e7cbd004087e 100644
--- a/pkgs/applications/window-managers/orbment/default.nix
+++ b/pkgs/applications/window-managers/orbment/default.nix
@@ -4,23 +4,23 @@
 
 stdenv.mkDerivation rec {
   name = "orbment-${version}";
-  version = "git-2015-09-30";
+  version = "git-2016-01-31";
   repo = "https://github.com/Cloudef/orbment";
-  rev = "229a870dbbb9dbc66c137cf2747eab11acdf1a95";
+  rev = "7f649fb76649f826dd29578a5ec41bb561b116eb";
 
   chck_repo = "https://github.com/Cloudef/chck";
-  chck_rev = "6191a69572952291c137294317874c06c9c0d6a9";
+  chck_rev = "fe5e2606b7242aa5d89af2ea9fd048821128d2bc";
   inihck_repo = "https://github.com/Cloudef/inihck";
   inihck_rev = "462cbd5fd67226714ac2bdfe4ceaec8e251b2d9c";
 
   srcs = [
    (fetchurl {
      url = "${repo}/archive/${rev}.tar.gz";
-     sha256 = "7aaa0262d078adaf47abdf500b9ea581f6bec164c195a44a3c165a865414ca2c";
+     sha256 = "5a426da0d5f4487911cfe9226865ed0cd1a7cdf253eec19d5eadc4b0d14a2ea0";
    })
    (fetchurl {
      url = "${chck_repo}/archive/${chck_rev}.tar.gz";
-     sha256 = "26b4af1390bf67c674732cad69fc94fb027a3d269241d0bd862f42fb80bd5160";
+     sha256 = "ca316b544c48e837c32f08d613be42da10e0a3251e8e4488d1848b91ef92ab9e";
    })
    (fetchurl {
      url = "${inihck_repo}/archive/${inihck_rev}.tar.gz";
diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix
index cec48fad4e56..fa81971885a4 100644
--- a/pkgs/applications/window-managers/sway/default.nix
+++ b/pkgs/applications/window-managers/sway/default.nix
@@ -4,10 +4,12 @@
 
 stdenv.mkDerivation rec {
   name = "sway-${version}";
-  version = "git-2015-10-16";
+  version = "git-2016-02-08";
+  repo = "https://github.com/SirCmpwn/sway";
+  rev = "16e904634c65128610537bed7fcb16ac3bb45165";
 
   src = fetchurl {
-    url = "https://github.com/SirCmpwn/sway/archive/16e904634c65128610537bed7fcb16ac3bb45165.tar.gz";
+    url = "${repo}/archive/${rev}.tar.gz";
     sha256 = "52d6c4b49fea69e2a2c1b44b858908b7736301bdb9ed483c294bc54bb40e872e";
   };
 
diff --git a/pkgs/applications/window-managers/velox/default.nix b/pkgs/applications/window-managers/velox/default.nix
index 8823b32ee3ce..789f074aecdf 100644
--- a/pkgs/applications/window-managers/velox/default.nix
+++ b/pkgs/applications/window-managers/velox/default.nix
@@ -5,11 +5,13 @@
 
 stdenv.mkDerivation rec {
   name = "velox-${version}";
-  version = "git-2015-09-23";
+  version = "git-2015-11-03";
+  repo = "https://github.com/michaelforney/velox";
+  rev = "53b41348df7e37886cab012609923255e4397419";
 
   src = fetchurl {
-    url = "https://github.com/michaelforney/velox/archive/499768b5834967727e3d91139b4013b6aca95762.tar.gz";
-    sha256 = "252959f0f0ff593c187449b61c234c214fdf321e3f4e8b5d9e3c2949d932a0a2";
+    url = "${repo}/archive/${rev}.tar.gz";
+    sha256 = "e49583efbbe62ea30f0084491ff757dff683f35eef6e9b68aa413e0b50c4bf20";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/swc/default.nix b/pkgs/development/libraries/swc/default.nix
index 448459d02750..48e1524e36fc 100644
--- a/pkgs/development/libraries/swc/default.nix
+++ b/pkgs/development/libraries/swc/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   name = "swc-${version}";
-  version = "git-2015-09-05";
+  version = "git-2016-02-09";
   repo = "https://github.com/michaelforney/swc";
-  rev = "0dff35ad9b80fc62e6b48417f78c24df6648c9d2";
+  rev = "1da0ef13fddc572accea12439a4471b4d2f64ddd";
 
   src = fetchurl {
     url = "${repo}/archive/${rev}.tar.gz";
-    sha256 = "7af5655b5bb5fe59bb8e6643e35f794419850463b1d7f44f29b45ab6aee01ae9";
+    sha256 = "d1894612d8aa1ce828efb78f1570290f84bba6563e21eb777e08c3c3859b7bbe";
   };
 
   nativeBuildInputs = [ pkgconfig ];
diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix
index a0b592df4a35..9b5fa32bf00f 100644
--- a/pkgs/development/libraries/wlc/default.nix
+++ b/pkgs/development/libraries/wlc/default.nix
@@ -1,32 +1,42 @@
-{ lib, stdenv, fetchurl, cmake, pkgconfig
+{ lib, stdenv, fetchurl, fetchgit, cmake, pkgconfig
 , glibc, wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa, libdrm, udev, systemd, dbus_libs
 , libpthreadstubs, libX11, libXau, libXdmcp, libXext, libXdamage, libxshmfence, libXxf86vm, linuxPackages_4_2
 }:
 
 stdenv.mkDerivation rec {
   name = "wlc-${version}";
-  version = "git-2015-10-04";
+  version = "git-2016-01-31";
   repo = "https://github.com/Cloudef/wlc";
-  rev = "74d978cc54fd8256777c8d39327cb677523cddff";
+  rev = "faa4d3cba670576c202b0844e087b13538f772c5";
 
   chck_repo = "https://github.com/Cloudef/chck";
-  chck_rev = "6191a69572952291c137294317874c06c9c0d6a9";
+  chck_rev = "fe5e2606b7242aa5d89af2ea9fd048821128d2bc";
+
+  wl_protos_repo = "git://anongit.freedesktop.org/wayland/wayland-protocols";
+  wl_protos_rev = "0b05b70f9da245582f01581be4ca36db683682b8";
+  wl_protos_rev_short = "0b05b70";
 
   srcs = [
    (fetchurl {
      url = "${repo}/archive/${rev}.tar.gz";
-     sha256 = "a3641e79252a140be089dd2e829b4d21a3b5ff10866951568d54bd4600597254";
+     sha256 = "cdf6a772dc90060d57aa1a915a4daff0f79802c141fec92ef2710245d727af67";
    })
    (fetchurl {
      url = "${chck_repo}/archive/${chck_rev}.tar.gz";
-     sha256 = "26b4af1390bf67c674732cad69fc94fb027a3d269241d0bd862f42fb80bd5160";
+     sha256 = "ca316b544c48e837c32f08d613be42da10e0a3251e8e4488d1848b91ef92ab9e";
+   })
+   (fetchgit {
+     url = "${wl_protos_repo}";
+     rev = "${wl_protos_rev}";
+     sha256 = "9c1cfbb570142b2109ecef4d11b17f25e94ed2e0569f522ea56f244c60465224";
    })
   ];
 
   sourceRoot = "wlc-${rev}";
   postUnpack = ''
-    rm -rf wlc-${rev}/lib/chck
+    rm -rf wlc-${rev}/lib/chck wlc-${rev}/protos/wayland-protocols
     ln -s ../../chck-${chck_rev} wlc-${rev}/lib/chck
+    ln -s ../../wayland-protocols-${wl_protos_rev_short} wlc-${rev}/protos/wayland-protocols
   '';
 
   patchPhase = ''

From 91ac4fc0a488ec79794f943b452d8cff0cff0919 Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Sat, 21 Nov 2015 21:54:52 +0100
Subject: [PATCH 1192/2285] irssi-otr: 640e98c74b -> 1.0.0

---
 .../networking/irc/irssi/otr/default.nix           | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix
index 4841aa8070e0..33fe5b799dba 100644
--- a/pkgs/applications/networking/irc/irssi/otr/default.nix
+++ b/pkgs/applications/networking/irc/irssi/otr/default.nix
@@ -1,16 +1,14 @@
 { stdenv, fetchurl, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }:
 
-let
-  rev = "640e98c74b";
-in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "irssi-otr-20131007-${rev}";
-  
+  name = "irssi-otr-${version}";
+  version = "1.0.0";
+
   src = fetchurl {
-    url = "https://github.com/cryptodotis/irssi-otr/tarball/${rev}";
+    url = "https://github.com/cryptodotis/irssi-otr/archive/v${version}.tar.gz";
     name = "${name}.tar.gz";
-    sha256 = "0d08ianzhy20w0ld8xx7hgrp9psg54l37619pcdpqyrnlzkkdalz";
+    sha256 = "bad09a2853ea6fb1a7af42c8f15868fd3ce45f973be90c78944ddf04f8ab517e";
   };
 
   patchPhase = ''
@@ -22,7 +20,7 @@ stdenv.mkDerivation rec {
   preConfigure = "sh ./bootstrap";
 
   buildInputs = [ libotr automake autoconf libtool glib pkgconfig irssi ];
-  
+
   meta = {
     homepage = https://github.com/cryptodotis/irssi-otr;
     license = stdenv.lib.licenses.gpl2Plus;

From 5396a01b6c638cada3d5c81e03e14ffcbf982a1f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 8 Feb 2016 20:47:55 +0300
Subject: [PATCH 1193/2285] init-script-builder: handle containers without a
 kernel

---
 .../boot/loader/init-script/init-script-builder.sh       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/loader/init-script/init-script-builder.sh b/nixos/modules/system/boot/loader/init-script/init-script-builder.sh
index 502b3b63af2f..08d4ab14c9ca 100644
--- a/nixos/modules/system/boot/loader/init-script/init-script-builder.sh
+++ b/nixos/modules/system/boot/loader/init-script/init-script-builder.sh
@@ -80,8 +80,13 @@ for generation in $(
     | sort -n -r); do
     link=/nix/var/nix/profiles/system-$generation-link
     date=$(stat --printf="%y\n" $link | sed 's/\..*//')
-    kernelVersion=$(cd $(dirname $(readlink -f $link/kernel))/lib/modules && echo *)
-    addEntry "NixOS - Configuration $generation ($date - $kernelVersion)" $link "$generation ($date)"
+    if [ -d $link/kernel ]; then
+      kernelVersion=$(cd $(dirname $(readlink -f $link/kernel))/lib/modules && echo *)
+      suffix="($date - $kernelVersion)"
+    else
+      suffix="($date)"
+    fi
+    addEntry "NixOS - Configuration $generation $suffix" $link "$generation ($date)"
 done
 
 mv $tmpOther $targetOther

From 2202bb9cf541543917e6fa6201994fc6d3aee413 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 9 Feb 2016 12:57:42 +0300
Subject: [PATCH 1194/2285] postsrsd: fix secret generation

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

diff --git a/nixos/modules/services/mail/postsrsd.nix b/nixos/modules/services/mail/postsrsd.nix
index 36a0f8218d88..68a4c1012064 100644
--- a/nixos/modules/services/mail/postsrsd.nix
+++ b/nixos/modules/services/mail/postsrsd.nix
@@ -95,7 +95,11 @@ in {
       preStart = ''
         if [ ! -e "${cfg.secretsFile}" ]; then
           echo "WARNING: secrets file not found, autogenerating!"
-          mkdir -p -m750 "$(dirname "${cfg.secretsFile}")"
+          DIR="$(dirname "${cfg.secretsFile}")"
+          if [ ! -d "$DIR" ]; then
+            mkdir -p -m750 "$DIR"
+            chown "${cfg.user}:${cfg.group}" "$DIR"
+          fi
           dd if=/dev/random bs=18 count=1 | base64 > "${cfg.secretsFile}"
           chmod 600 "${cfg.secretsFile}"
         fi

From c420a6f1ef34437cfbc9ee5465fb444d1d031b29 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 9 Feb 2016 23:37:02 +0300
Subject: [PATCH 1195/2285] acme service: update plugins enum

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

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 15e5b49878f6..3d25e811e670 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -56,8 +56,8 @@ let
 
       plugins = mkOption {
         type = types.listOf (types.enum [
-          "cert.der" "cert.pem" "chain.der" "chain.pem" "external_pem.sh"
-          "fullchain.der" "fullchain.pem" "key.der" "key.pem" "account_key.json"
+          "cert.der" "cert.pem" "chain.pem" "external_pem.sh"
+          "fullchain.pem" "full.pem" "key.der" "key.pem" "account_key.json"
         ]);
         default = [ "fullchain.pem" "key.pem" "account_key.json" ];
         description = ''

From 0024c10a5c974ee41c7bc69cd61faaa920f3a9d4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 10 Feb 2016 00:56:24 +0300
Subject: [PATCH 1196/2285] dovecot service: add sendmail_path

---
 nixos/modules/services/mail/dovecot.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 11e8b26c75ef..333a03315bca 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -13,6 +13,7 @@ let
     ''
       base_dir = ${baseDir}
       protocols = ${concatStringsSep " " cfg.protocols}
+      sendmail_path = /var/setuid-wrappers/sendmail
     ''
 
     (if isNull cfg.sslServerCert then ''

From 4dacb1116a34962e3a767059551ba1af77723d75 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 10 Feb 2016 00:05:46 +0100
Subject: [PATCH 1197/2285] mcelog: 129 -> 130

Fixes https://github.com/andikleen/mcelog/issues/31.
---
 pkgs/os-specific/linux/mcelog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index 113d59d641dc..9abd6397e85c 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "mcelog-${version}";
-  version = "129";
+  version = "130";
 
   src = fetchFromGitHub {
-    sha256 = "143xh5zvgax88yhg6mg6img64nrda85yybf76fgsk7a8gc57ghyk";
+    sha256 = "05yszlhd6kljx371nlgrzjs0fi44wwgxcv2j5rwwgklm6ifp2zza";
     rev = "v${version}";
     repo = "mcelog";
     owner = "andikleen";

From 46f3975d9996d73f2257ce92f50a75c362c5d05b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 8 Feb 2016 20:47:36 +0300
Subject: [PATCH 1198/2285] nixos-install: don't check that /mnt is a mount
 point

---
 nixos/modules/installer/tools/nixos-install.sh | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh
index 4e10615f902f..c23d7e5b509d 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -73,11 +73,6 @@ if ! test -e "$mountPoint"; then
     exit 1
 fi
 
-if ! grep -F -q " $mountPoint " /proc/mounts; then
-    echo "$mountPoint doesn't appear to be a mount point"
-    exit 1
-fi
-
 
 # Mount some stuff in the target root directory.
 mkdir -m 0755 -p $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home

From 90ef11ddcdb8ba0c1bddcd50f1a88df3c42f5cf4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 9 Feb 2016 03:07:23 +0300
Subject: [PATCH 1199/2285] postgresql service: don't use su

---
 .../modules/services/databases/postgresql.nix | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index c2045a5859c5..957fb4723a5c 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -177,7 +177,7 @@ in
 
     users.extraGroups.postgres.gid = config.ids.gids.postgres;
 
-    environment.systemPackages = [postgresql];
+    environment.systemPackages = [ postgresql ];
 
     systemd.services.postgresql =
       { description = "PostgreSQL Server";
@@ -187,35 +187,37 @@ in
 
         environment.PGDATA = cfg.dataDir;
 
-        path = [ pkgs.su postgresql ];
+        path = [ postgresql ];
 
         preStart =
+          ''
+            # Create data directory.
+            if ! test -e ${cfg.dataDir}/PG_VERSION; then
+              mkdir -m 0700 -p ${cfg.dataDir}
+              rm -f ${cfg.dataDir}/*.conf
+              chown -R postgres:postgres ${cfg.dataDir}
+            fi
+          ''; # */
+
+        script =
           ''
             # Initialise the database.
             if ! test -e ${cfg.dataDir}/PG_VERSION; then
-                mkdir -m 0700 -p ${cfg.dataDir}
-                rm -f ${cfg.dataDir}/*.conf
-                if [ "$(id -u)" = 0 ]; then
-                  chown -R postgres ${cfg.dataDir}
-                  su -s ${pkgs.stdenv.shell} postgres -c 'initdb -U root'
-                else
-                  # For non-root operation.
-                  initdb
-                fi
-                # See postStart!
-                touch "${cfg.dataDir}/.first_startup"
+              initdb -U root
+              # See postStart!
+              touch "${cfg.dataDir}/.first_startup"
             fi
-
             ln -sfn "${configFile}" "${cfg.dataDir}/postgresql.conf"
             ${optionalString (cfg.recoveryConfig != null) ''
               ln -sfn "${pkgs.writeText "recovery.conf" cfg.recoveryConfig}" \
                 "${cfg.dataDir}/recovery.conf"
             ''}
-          ''; # */
+
+             exec postgres ${toString flags}
+          '';
 
         serviceConfig =
-          { ExecStart = "@${postgresql}/bin/postgres postgres ${toString flags}";
-            ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
+          { ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
             User = "postgres";
             Group = "postgres";
             PermissionsStartOnly = true;

From 42deddb17ae28ed4c0b63c12ef0f416389e6e517 Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Mon, 26 Oct 2015 19:47:23 +0100
Subject: [PATCH 1200/2285] grsecurity: use source URL from a scraped
 repository as grsecurity.net only has the latest version

---
 pkgs/os-specific/linux/kernel/patches.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index 7e95f1dedb1a..3f7afd903226 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -22,7 +22,7 @@ let
     { name = "grsecurity-${grversion}-${kversion}";
       inherit grversion kversion revision;
       patch = fetchurl {
-        url = "http://grsecurity.net/${branch}/grsecurity-${grversion}-${kversion}-${revision}.patch";
+        url = "https://github.com/slashbeast/grsecurity-scrape/blob/master/${branch}/grsecurity-${grversion}-${kversion}-${revision}.patch?raw=true";
         inherit sha256;
       };
       features.grsecurity = true;

From 37bb4855c8da5d2010f35ebc44aef4e83eae150b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 10 Feb 2016 02:58:55 +0300
Subject: [PATCH 1201/2285] postfix module: fix link to postfix-files

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

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index f2d8189de6ef..56c89aca8b23 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -461,7 +461,7 @@ in
             rm -rf /var/lib/postfix/conf
             mkdir -p /var/lib/postfix/conf
             chmod 0755 /var/lib/postfix/conf
-            ln -sf ${pkgs.postfix}/etc/postfix/postfix-files
+            ln -sf ${pkgs.postfix}/etc/postfix/postfix-files /var/lib/postfix/conf/postfix-files
             ln -sf ${mainCfFile} /var/lib/postfix/conf/main.cf
             ln -sf ${masterCfFile} /var/lib/postfix/conf/master.cf
 

From b63c566d144d0833c2273ae0d39b47d7a6060dfd Mon Sep 17 00:00:00 2001
From: Adam Russell <adamlr6+pub@gmail.com>
Date: Sat, 6 Feb 2016 09:50:02 -0600
Subject: [PATCH 1202/2285] wine unstable: 1.9.2 -> 1.9.3

---
 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 49c7e71af8a5..b44693502d73 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -30,15 +30,15 @@ in rec {
   };
 
   unstable = fetchurl rec {
-    version = "1.9.2";
+    version = "1.9.3";
     url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";
-    sha256 = "0yjf0i2yc0yj366kg6b2ci9bwz3jq5k5vl01bqw4lbpgf5m4sk9k";
+    sha256 = "0389xbs943iwdgv3a6pvcy2gxrwqzf20vrsbpd2yrj1lan2m8ps7";
     inherit (stable) gecko32 gecko64 mono;
   };
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "05lxhl9rv936xh8v640l36xswszwc41iwpbjq7n5cwk361mdh1lp";
+    sha256 = "0r932caxlkdw36f36f8y4h2r3anpl61fmqr9payb83fj55gsiq4d";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";

From c76817291912904f3ed553366804488cf31169e4 Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Wed, 10 Feb 2016 01:48:17 +0100
Subject: [PATCH 1203/2285] tinc: enable chroot

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

diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index 34f4f6b37b60..a26b998b9155 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -166,7 +166,7 @@ in
           fi
         '';
         script = ''
-          tincd -D -U tinc.${network} -n ${network} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel}
+          tincd -R -D -U tinc.${network} -n ${network} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel}
         '';
       })
     );

From b6595185f6505e198ae4270e92e1ff86c34a2a53 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 10 Feb 2016 02:41:15 +0100
Subject: [PATCH 1204/2285] beets: Re-enable tests

The reason why the completion tests didn't pass was because we had it
already disabled in 2acc258dff1a37974edd6475851e218bb09e281a.

Meanwhile, beetbox/beets@a07cb83 has moved the file from
test/test_completion.sh to test/rsrc/test_completion.sh.

So this has silently re-enabled the completion tests, which we need to
investigate on our side why they failed in the first place.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/tools/audio/beets/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 6a3345e1d3c9..91407331d7ca 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -121,7 +121,7 @@ in buildPythonPackage rec {
 
   postPatch = ''
     sed -i -e '/assertIn.*item.*path/d' test/test_info.py
-    echo echo completion tests passed > test/test_completion.sh
+    echo echo completion tests passed > test/rsrc/test_completion.sh
 
     sed -i -e '/^BASH_COMPLETION_PATHS *=/,/^])$/ {
       /^])$/i u"${completion}"
@@ -139,7 +139,7 @@ in buildPythonPackage rec {
       test/test_replaygain.py
   '';
 
-  doCheck = false; # TODO, see https://github.com/beetbox/beets/issues/1876#issuecomment-182010438
+  doCheck = true;
 
   preCheck = ''
     (${concatMapStrings (s: "echo \"${s}\";") allPlugins}) \

From 4b6eafa884d22ab9fd17d7369de9419748b53e49 Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Wed, 10 Feb 2016 11:45:01 +0800
Subject: [PATCH 1205/2285] xboxdrv: 0.8.5 -> 0.8.8

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

diff --git a/pkgs/misc/drivers/xboxdrv/default.nix b/pkgs/misc/drivers/xboxdrv/default.nix
index a40dd0bd31dc..a6f99cca8ccd 100644
--- a/pkgs/misc/drivers/xboxdrv/default.nix
+++ b/pkgs/misc/drivers/xboxdrv/default.nix
@@ -2,13 +2,13 @@
 , libusb1, boost, glib, dbus_glib }:
 
 let
-  version = "0.8.5";
+  version = "0.8.8";
 in stdenv.mkDerivation {
   name = "xboxdrv-${version}";
 
   src = fetchurl {
-    url = "https://github.com/Grumbel/xboxdrv/archive/v${version}.tar.gz";
-    sha256 = "0xg2dhfsk3i693rgwr1pr532b3hk3zmjxlx55g6bplslr94bibi2";
+    url = "https://github.com/xboxdrv/xboxdrv/archive/v${version}.tar.gz";
+    sha256 = "0jx2wqmc7602dxyj19n3h8x0cpy929h7c0h39vcc5rf0q74fh3id";
   };
 
   patchPhase = ''

From 086cebe2bb5d79c2abf6b64dcc8c54a20e78447b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 10 Feb 2016 08:31:51 +0100
Subject: [PATCH 1206/2285] pythonPackages.blaze: add missing dependency

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8c28c97fd334..76d7004a7dac 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2051,6 +2051,7 @@ in modules // {
       cytoolz
       datashape
       flask
+      flask-cors
       h5py
       multipledispatch
       numba

From 00c6db841c6f92c25f54a53de3013fe261d58d96 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 10 Feb 2016 08:32:04 +0100
Subject: [PATCH 1207/2285] pythonPackages.flask-cors: init at 2.1.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 76d7004a7dac..e3096cff69e5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8606,6 +8606,25 @@ in modules // {
     };
   };
 
+  flask-cors = buildPythonPackage rec {
+    name = "Flask-Cors-${version}";
+    version = "2.1.2";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/F/Flask-Cors/${name}.tar.gz";
+      sha256 = "0fd618a4f88ykqx4x55viz47cm9rl214q1b45a0b4mz5vhxffqpj";
+    };
+
+    buildInputs = with self; [ nose ];
+    propagatedBuildInputs = with self; [ flask six ];
+
+    meta = {
+      description = "A Flask extension adding a decorator for CORS support";
+      homepage = https://github.com/corydolphin/flask-cors;
+      license = with licenses; [ mit ];
+    };
+  };
+
   flask-pymongo = buildPythonPackage rec {
     name = "Flask-PyMongo-${version}";
     version = "0.3.1";

From 46a76d1a7d9d9b413fe8150e1bc40ff5281f9ec8 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 10 Feb 2016 08:32:18 +0100
Subject: [PATCH 1208/2285] pythonPackages.scikitlearn: fix tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e3096cff69e5..1edeb9d84d30 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18549,6 +18549,13 @@ in modules // {
 
     LC_ALL="en_US.UTF-8";
 
+    # Exclude "test_image.py" because the Lena function/image was removed from SciPy since 0.17
+    # Should be fixed in next release.
+    # Using the -I switch broke nosetests...?
+    patchPhase = ''
+      rm sklearn/feature_extraction/tests/test_image.py
+    '';
+
     checkPhase = ''
       HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests $out/${python.sitePackages}/sklearn/
     '';

From aeee493704dccb1e0ec79f0c763bdb0347d6de75 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Wed, 10 Feb 2016 10:48:51 +0100
Subject: [PATCH 1209/2285] Bugfix: ssvnc had a hard dependency on
 /usr/bin/perl which is now replaced

---
 pkgs/applications/networking/remote/ssvnc/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/remote/ssvnc/default.nix b/pkgs/applications/networking/remote/ssvnc/default.nix
index fad7ef90ceb5..956391b71f86 100644
--- a/pkgs/applications/networking/remote/ssvnc/default.nix
+++ b/pkgs/applications/networking/remote/ssvnc/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, imake, zlib, jdk, libX11, libXt, libXmu
-, libXaw, libXext, libXpm, openjpeg, openssl, tcl, tk }:
+, libXaw, libXext, libXpm, openjpeg, openssl, tcl, tk, perl }:
 
 stdenv.mkDerivation rec {
   name = "ssvnc-${version}";
@@ -16,6 +16,7 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     sed -i -e 's|exec wish|exec ${tk}/bin/wish|' $out/lib/ssvnc/util/ssvnc.tcl
+    sed -i -e 's|/usr/bin/perl|${perl}/bin/perl|' $out/lib/ssvnc/util/ss_vncviewer
   '';
 
   meta = {

From 7ab80e8f79beacfcc5361ef037bc63e6a30a39be Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 9 Feb 2016 03:00:53 +0300
Subject: [PATCH 1210/2285] kbd module: don't setup vconsoles if we are in a
 container

---
 nixos/modules/tasks/kbd.nix | 45 ++++++++++++++++++++++---------------
 1 file changed, 27 insertions(+), 18 deletions(-)

diff --git a/nixos/modules/tasks/kbd.nix b/nixos/modules/tasks/kbd.nix
index e1574fa68ad9..02721bb3bea2 100644
--- a/nixos/modules/tasks/kbd.nix
+++ b/nixos/modules/tasks/kbd.nix
@@ -12,6 +12,8 @@ let
     FONT=${config.i18n.consoleFont}
     ${colors}
   '';
+
+  setVconsole = !config.boot.isContainer;
 in
 
 {
@@ -41,26 +43,33 @@ in
 
   ###### implementation
 
-  config = {
+  config = mkMerge [
+    (mkIf (!setVconsole) {
+      systemd.services."systemd-vconsole-setup".enable = false;
+    })
 
-    environment.systemPackages = [ pkgs.kbd ];
+    (mkIf setVconsole {
+      environment.systemPackages = [ pkgs.kbd ];
 
-    # Let systemd-vconsole-setup.service do the work of setting up the
-    # virtual consoles.  FIXME: trigger a restart of
-    # systemd-vconsole-setup.service if /etc/vconsole.conf changes.
-    environment.etc."vconsole.conf".source = vconsoleConf;
+      # Let systemd-vconsole-setup.service do the work of setting up the
+      # virtual consoles.  FIXME: trigger a restart of
+      # systemd-vconsole-setup.service if /etc/vconsole.conf changes.
+      environment.etc = [ {
+        target = "vconsole.conf";
+        source = vconsoleConf;
+      } ];
 
-    # This is identical to the systemd-vconsole-setup.service unit
-    # shipped with systemd, except that it uses /dev/tty1 instead of
-    # /dev/tty0 to prevent putting the X server in non-raw mode, and
-    # it has a restart trigger.
-    systemd.services."systemd-vconsole-setup" =
-      { wantedBy = [ "multi-user.target" ];
-        before = [ "display-manager.service" ];
-        after = [ "systemd-udev-settle.service" ];
-        restartTriggers = [ vconsoleConf ];
-      };
-
-  };
+      # This is identical to the systemd-vconsole-setup.service unit
+      # shipped with systemd, except that it uses /dev/tty1 instead of
+      # /dev/tty0 to prevent putting the X server in non-raw mode, and
+      # it has a restart trigger.
+      systemd.services."systemd-vconsole-setup" =
+        { wantedBy = [ "multi-user.target" ];
+          before = [ "display-manager.service" ];
+          after = [ "systemd-udev-settle.service" ];
+          restartTriggers = [ vconsoleConf ];
+        };
+    })
+  ];
 
 }

From 112476ec9649d51dd2fd014d759c9bce7626cd49 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <m.fellinger@gmail.com>
Date: Tue, 9 Feb 2016 23:47:41 +0100
Subject: [PATCH 1211/2285] bundix: 1.0.4 -> 2.0.4

---
 .../interpreters/ruby/bundix/default.nix      | 54 +++++++++++++------
 1 file changed, 39 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/bundix/default.nix b/pkgs/development/interpreters/ruby/bundix/default.nix
index b5a49043c60b..88679f74753d 100644
--- a/pkgs/development/interpreters/ruby/bundix/default.nix
+++ b/pkgs/development/interpreters/ruby/bundix/default.nix
@@ -1,20 +1,44 @@
-{ ruby, fetchgit, buildRubyGem, bundler }:
+{ buildRubyGem, lib, bundler, ruby, nix, nix-prefetch-scripts }:
 
-let
-  thor = buildRubyGem {
-    gemName = "thor";
-    version = "0.19.1";
-    type = "gem";
-    sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
-  };
+buildRubyGem rec {
+  inherit ruby;
 
-in buildRubyGem {
+  name = "${gemName}-${version}";
   gemName = "bundix";
-  version = "1.0.4";
-  gemPath = [ thor bundler ];
-  src = fetchgit {
-    url = "https://github.com/cstrahan/bundix.git";
-    rev = "6dcf1f71c61584f5c9b919ee9df7b0c554862076";
-    sha256 = "1w17bvc9srcgr4ry81ispcj35g9kxihbyknmqp8rnd4h5090b7b2";
+  version = "2.0.4";
+
+  sha256 = "0i7fdxi6w29yxnblpckczazb79m5x03hja8sfnabndg4yjc868qs";
+
+  buildInputs = [bundler];
+
+  postInstall = ''
+    gem_root=$GEM_HOME/gems/${gemName}-${version}
+    sed \
+      -e 's|NIX_INSTANTIATE =.*|NIX_INSTANTIATE = "${nix}/bin/nix-instantiate"|' \
+      -i $gem_root/lib/bundix.rb
+    sed \
+      -e 's|NIX_HASH =.*|NIX_HASH = "${nix}/bin/nix-hash"|' \
+      -i $gem_root/lib/bundix.rb
+    sed \
+      -e 's|NIX_PREFETCH_URL =.*|NIX_PREFETCH_URL = "${nix}/bin/nix-prefetch-url"|' \
+      -i $gem_root/lib/bundix.rb
+    sed \
+      -e 's|NIX_PREFETCH_GIT =.*|NIX_PREFETCH_GIT = "${nix-prefetch-scripts}/bin/nix-prefetch-git"|' \
+      -i $gem_root/lib/bundix.rb
+  '';
+
+  meta = {
+    inherit version;
+    description = "Creates Nix packages from Gemfiles";
+    longDescription = ''
+      This is a tool that converts Gemfile.lock files to nix expressions.
+
+      The output is then usable by the bundlerEnv derivation to list all the
+      dependencies of a ruby package.
+    '';
+    homepage = "https://github.com/manveru/bundix";
+    license = "MIT";
+    maintainers = with lib.maintainers; [ manveru zimbatm ];
+    platforms = lib.platforms.all;
   };
 }

From 9fecc506034e1f0b23dd0db6fb7df7578d687032 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Wed, 10 Feb 2016 02:00:18 +0100
Subject: [PATCH 1212/2285] alot: 0.3.6 -> 0.3.7, fixes #12914

Version bump.
The checks are back again, so far alot has no tests at all.
Add urwidtrees dependency.

The themes are copied to the derivation and set as default directory.
---
 pkgs/top-level/python-packages.nix | 47 +++++++++++++++++++++++-------
 1 file changed, 37 insertions(+), 10 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1edeb9d84d30..fa2abffd552d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -554,28 +554,35 @@ in modules // {
 
 
   alot = buildPythonPackage rec {
-    rev = "0.3.6";
-    name = "alot-0.3.6";
+    rev = "0.3.7";
+    name = "alot-${rev}";
 
-    src = pkgs.fetchurl {
-      url = "https://github.com/pazz/alot/tarball/${rev}";
-      name = "${name}.tar.bz";
-      sha256 = "1rzy70w4isvypa94310xw403vq5him21q8rlx4laa0z530phkrmq";
+    src = pkgs.fetchFromGitHub {
+      owner = "pazz";
+      repo = "alot";
+      inherit rev;
+      sha256 = "0sscmmf42gsrjbisi6wm01alzlnq6wqhpwkm8pc557075jfg19il";
     };
 
-    # error: invalid command 'test'
-    doCheck = false;
+    postPatch = ''
+      substituteInPlace alot/defaults/alot.rc.spec \
+        --replace "themes_dir = string(default=None)" \
+                  "themes_dir = string(default='$out/share/themes')"
+    '';
 
     propagatedBuildInputs =
       [ self.notmuch
         self.urwid
+        self.urwidtrees
         self.twisted
-        self.magic
+        self.python_magic
         self.configobj
         self.pygpgme
       ];
 
     postInstall = ''
+      mkdir -p $out/share
+      cp -r extra/themes $out/share
       wrapProgram $out/bin/alot \
         --prefix LD_LIBRARY_PATH : ${pkgs.notmuch}/lib:${pkgs.file}/lib:${pkgs.gpgme}/lib
     '';
@@ -583,7 +590,7 @@ in modules // {
     meta = {
       homepage = https://github.com/pazz/alot;
       description = "Terminal MUA using notmuch mail";
-      maintainers = with maintainers; [ garbas ];
+      maintainers = with maintainers; [ garbas profpatsch ];
     };
   };
 
@@ -21060,6 +21067,26 @@ in modules // {
     };
   });
 
+  urwidtrees = buildPythonPackage rec {
+    name = "urwidtrees-${rev}";
+    rev = "1.0";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "pazz";
+      repo = "urwidtrees";
+      inherit rev;
+      sha256 = "03gpcdi45z2idy1fd9zv8v9naivmpfx65hshm8r984k9wklv1dsa";
+    };
+
+    propagatedBuildInputs = with self; [ urwid ];
+
+    meta = {
+      description = "Tree widgets for urwid";
+      license = licenses.gpl3;
+      maintainer = with maintainters; [ profpatsch ];
+    };
+  };
+
   pyuv = buildPythonPackage rec {
     name = "pyuv-0.11.5";
     disabled = isPyPy;  # see https://github.com/saghul/pyuv/issues/49

From 6352bb51f909bd014e5ede6f1e27a66f5ec011df Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 10 Feb 2016 16:53:59 +0300
Subject: [PATCH 1213/2285] dwarf-fortress-packages.phoebus-theme: 20160118 ->
 20160128

---
 pkgs/games/dwarf-fortress/themes/phoebus.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/themes/phoebus.nix b/pkgs/games/dwarf-fortress/themes/phoebus.nix
index 2183a6245c0c..ca459c6ef76e 100644
--- a/pkgs/games/dwarf-fortress/themes/phoebus.nix
+++ b/pkgs/games/dwarf-fortress/themes/phoebus.nix
@@ -1,16 +1,16 @@
 { stdenv, fetchFromGitHub }:
 
-# On upgrade check https://github.com/fricy/Phoebus/blob/master/manifest.json
+# On upgrade check https://github.com/DFgraphics/Phoebus/blob/master/manifest.json
 # for compatibility information.
 
 stdenv.mkDerivation {
-  name = "phoebus-theme-20160118";
+  name = "phoebus-theme-20160128";
 
   src = fetchFromGitHub {
-    owner = "fricy";
+    owner = "DFgraphics";
     repo = "Phoebus";
-    rev = "2c5777b0f307b1d752a8a484c6a05b67531c84a9";
-    sha256 = "0a5ixm181wz7crr3rpa2mh0drb371j5hvizqninvdnhah2mypz8v";
+    rev = "52b19b69c7323f9002ad195ecd68ac02ff0099a2";
+    sha256 = "1pw5l5v7l1bvxzjf4fivmagpmghffvz0wlws2ksc7d5vy48ybcmg";
   };
 
   installPhase = ''

From 99f4f1d7ef0b6a2f1bab7daa51985da565c54f6a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 10 Feb 2016 16:54:55 +0300
Subject: [PATCH 1214/2285] dwarf-fortress-packages.cla-theme: init at 20160128

---
 pkgs/games/dwarf-fortress/default.nix    |  3 +++
 pkgs/games/dwarf-fortress/themes/cla.nix | 32 ++++++++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/games/dwarf-fortress/themes/cla.nix

diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index d91c110c34c0..bc0b97b139b9 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -16,6 +16,7 @@ let
     dwarf-fortress = callPackage ./wrapper {
       themes = {
         "phoebus" = phoebus-theme;
+        "cla" = cla-theme;
       };
     };
 
@@ -28,6 +29,8 @@ let
     dwarf-therapist = callPackage ./dwarf-therapist/wrapper.nix { };
 
     phoebus-theme = callPackage ./themes/phoebus.nix { };
+
+    cla-theme = callPackage ./themes/cla.nix { };
   };
 
 in self
diff --git a/pkgs/games/dwarf-fortress/themes/cla.nix b/pkgs/games/dwarf-fortress/themes/cla.nix
new file mode 100644
index 000000000000..f3c6b7dd279a
--- /dev/null
+++ b/pkgs/games/dwarf-fortress/themes/cla.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub }:
+
+# On upgrade check https://github.com/fricy/Phoebus/blob/master/manifest.json
+# for compatibility information.
+
+stdenv.mkDerivation {
+  name = "cla-theme-20160128";
+
+  src = fetchFromGitHub {
+    owner = "DFgraphics";
+    repo = "CLA";
+    rev = "94088b778ed6f91cbddcd3e33aa1e5efa67f3101";
+    sha256 = "0rx1375x9s791k9wzvj7sxcrv4xaggibxymzirayznvavr7zcsv1";
+  };
+
+  installPhase = ''
+    mkdir $out
+    cp -r data raw $out
+  '';
+
+  passthru.dfVersion = "0.42.05";
+
+  preferLocalBuild = true;
+
+  meta = with stdenv.lib; {
+    description = "CLA graphics set for Dwarf Fortress";
+    homepage = "http://www.bay12forums.com/smf/index.php?topic=105376.0";
+    platforms = platforms.all;
+    maintainers = with maintainers; [ abbradar ];
+    license = licenses.free;
+  };
+}

From aea262f654ee22bba84b9b3b867c62ebb17adc6c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Feb 2016 14:59:36 +0100
Subject: [PATCH 1215/2285] Fix misspelled meta.maintainers attributes

---
 .../color-theme-solarized/default.nix         |  2 +-
 .../pidgin-plugins/otr/default.nix            |  2 +-
 .../pidgin-opensteamworks/default.nix         |  2 +-
 .../purple-plugin-pack/default.nix            |  2 +-
 .../telegram/cutegram/default.nix             |  2 +-
 .../libqtelegram-aseman-edition/default.nix   |  2 +-
 .../telegram/telegram-qml/default.nix         |  2 +-
 .../window-managers/compton/git.nix           |  2 +-
 pkgs/data/fonts/google-fonts/default.nix      |  2 +-
 pkgs/data/fonts/powerline-fonts/default.nix   |  2 +-
 pkgs/data/misc/media-player-info/default.nix  |  2 +-
 .../libraries/openjpeg/generic.nix            |  2 +-
 .../phonon-backend-gstreamer/qt5/default.nix  |  2 +-
 .../tools/ocaml/ocaml-top/default.nix         |  2 +-
 pkgs/games/gzdoom/default.nix                 |  2 +-
 pkgs/games/zandronum/bin.nix                  |  2 +-
 pkgs/games/zandronum/default.nix              |  2 +-
 pkgs/games/zdoom/default.nix                  |  2 +-
 pkgs/misc/themes/vertex/default.nix           |  2 +-
 pkgs/os-specific/linux/kernel/linux-mptcp.nix |  2 +-
 pkgs/servers/mail/rmilter/default.nix         |  2 +-
 pkgs/servers/mail/rspamd/default.nix          |  2 +-
 pkgs/tools/misc/cpulimit/default.nix          |  2 +-
 pkgs/tools/misc/trash-cli/default.nix         |  2 +-
 pkgs/tools/networking/nethogs/default.nix     |  2 +-
 pkgs/tools/text/colordiff/default.nix         |  2 +-
 pkgs/top-level/python-packages.nix            | 30 +++++++++----------
 27 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
index 9a0f6855567c..ef006439a555 100644
--- a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
+++ b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Precision colors for machines and people";
     homepage = http://ethanschoonover.com/solarized;
-    maintainer = "Samuel Rivas <samuelrivas@gmail.com>";
+    maintainers = "Samuel Rivas <samuelrivas@gmail.com>";
     license = stdenv.lib.licenses.mit;
 
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
index 7b80ec85661a..c6801105a84a 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
     description = "Plugin for Pidgin 2.x which implements OTR Messaging";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainters = with maintainers; [ abbradar ];
+    maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
index e03b61b61824..e4c0697605d6 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-opensteamworks/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation rec {
     description = "Plugin for Pidgin 2.x which implements Steam Friends/Steam IM compatibility";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainters = with maintainers; [ arobyn ];
+    maintainers = with maintainers; [ arobyn ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix
index 149f62bb9816..8022d32a081a 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/purple-plugin-pack/default.nix
@@ -14,6 +14,6 @@ stdenv.mkDerivation rec {
     description = "Plugin pack for Pidgin 2.x";
     license = licenses.gpl2;
     platforms = platforms.linux;
-    maintainters = with maintainers; [ bdimcheff ];
+    maintainers = with maintainers; [ bdimcheff ];
   };
 }
diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
index 26a7eb49279b..507094f7c055 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     description = "Telegram client forked from sigram";
     homepage = "http://aseman.co/en/products/cutegram/";
     license = licenses.gpl3;
-    maintainer = [ maintainers.profpatsch ];
+    maintainers = [ maintainers.profpatsch ];
   };
 
 }
diff --git a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
index 3149ac3279af..8166514bb3ac 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     description = "A fork of libqtelegram by Aseman, using qmake";
     homepage = src.meta.homepage;
     license = stdenv.lib.licenses.gpl3;
-    maintainer = [ maintainers.profpatsch ];
+    maintainers = [ maintainers.profpatsch ];
   };
 
 }
diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
index b51f8435ce13..6bf550d4766b 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
     description = "Telegram API tools for QtQml and Qml";
     homepage = src.meta.homepage;
     license = stdenv.lib.licenses.gpl3;
-    maintainer = [ maintainers.profpatsch ];
+    maintainers = [ maintainers.profpatsch ];
   };
 
 }
diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix
index be2586c9e270..b715b3a4cf31 100644
--- a/pkgs/applications/window-managers/compton/git.nix
+++ b/pkgs/applications/window-managers/compton/git.nix
@@ -48,7 +48,7 @@ stdenv.mkDerivation {
       additional features, such as additional effects, and a fork at a
       well-defined and proper place.
     '';
-    maintainer = maintainers.ertes;
+    maintainers = maintainers.ertes;
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/data/fonts/google-fonts/default.nix b/pkgs/data/fonts/google-fonts/default.nix
index 9f14f945e353..e4c655877c8b 100644
--- a/pkgs/data/fonts/google-fonts/default.nix
+++ b/pkgs/data/fonts/google-fonts/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     description = "Font files available from Google Font";
     license = with licenses; [ asl20 ofl ufl ];
     platforms = platforms.all;
-    maintainer = with maintainers; [ manveru ];
+    maintainers = with maintainers; [ manveru ];
   };
 }
diff --git a/pkgs/data/fonts/powerline-fonts/default.nix b/pkgs/data/fonts/powerline-fonts/default.nix
index 6d620c09f06d..2e576cf6dc8b 100644
--- a/pkgs/data/fonts/powerline-fonts/default.nix
+++ b/pkgs/data/fonts/powerline-fonts/default.nix
@@ -38,6 +38,6 @@ stdenv.mkDerivation {
     '';
     license = with licenses; [ asl20 free ofl ];
     platforms = platforms.all;
-    maintainer = with maintainers; [ malyn ];
+    maintainers = with maintainers; [ malyn ];
   };
 }
diff --git a/pkgs/data/misc/media-player-info/default.nix b/pkgs/data/misc/media-player-info/default.nix
index 9abe5d6ea8e7..f31c7c503a29 100644
--- a/pkgs/data/misc/media-player-info/default.nix
+++ b/pkgs/data/misc/media-player-info/default.nix
@@ -27,6 +27,6 @@ in
       description = "A repository of data files describing media player capabilities";
       homepage = "http://www.freedesktop.org/wiki/Software/media-player-info/";
       license = licenses.bsd3;
-      maintainer = with maintainers; [ ttuegel ];
+      maintainers = with maintainers; [ ttuegel ];
     };
   }
diff --git a/pkgs/development/libraries/openjpeg/generic.nix b/pkgs/development/libraries/openjpeg/generic.nix
index 717e5a4de2cf..1b4b4af7f41c 100644
--- a/pkgs/development/libraries/openjpeg/generic.nix
+++ b/pkgs/development/libraries/openjpeg/generic.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     description = "Open-source JPEG 2000 codec written in C language";
     homepage = http://www.openjpeg.org/;
     license = licenses.bsd2;
-    maintainer = with maintainers; [ codyopel ];
+    maintainers = with maintainers; [ codyopel ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix
index 9866c0a67ce3..98aa7d81b368 100644
--- a/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix
+++ b/pkgs/development/libraries/phonon-backend-gstreamer/qt5/default.nix
@@ -34,6 +34,6 @@ stdenv.mkDerivation rec {
     homepage = http://phonon.kde.org/;
     description = "GStreamer backend for Phonon";
     platforms = platforms.linux;
-    maintainer = with maintainers; [ ttuegel ];
+    maintainers = with maintainers; [ ttuegel ];
   };
 }
diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix
index cf0a16cef68d..79c81c5c447c 100644
--- a/pkgs/development/tools/ocaml/ocaml-top/default.nix
+++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix
@@ -26,6 +26,6 @@ stdenv.mkDerivation {
     license = stdenv.lib.licenses.gpl3;
     description = "A simple cross-platform OCaml code editor built for top-level evaluation";
     platforms = ocamlPackages.ocaml.meta.platforms;
-    maintainer = with stdenv.lib.maintainers; [ vbgl ];
+    maintainers = with stdenv.lib.maintainers; [ vbgl ];
   };
 }
diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix
index 66d01905aaf3..3f8744d75cb2 100644
--- a/pkgs/games/gzdoom/default.nix
+++ b/pkgs/games/gzdoom/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = https://github.com/coelckers/gzdoom;
     description = "A Doom source port based on ZDoom. It features an OpenGL renderer and lots of new features";
-    maintainer = [ stdenv.lib.maintainers.lassulus ];
+    maintainers = [ stdenv.lib.maintainers.lassulus ];
   };
 }
 
diff --git a/pkgs/games/zandronum/bin.nix b/pkgs/games/zandronum/bin.nix
index 92f93d8f7785..ae6ab99dad29 100644
--- a/pkgs/games/zandronum/bin.nix
+++ b/pkgs/games/zandronum/bin.nix
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://zandronum.com/;
     description = "multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software. Binary version for online play.";
-    maintainer = [ stdenv.lib.maintainers.lassulus ];
+    maintainers = [ stdenv.lib.maintainers.lassulus ];
     # Binary version has different version string than source code version.
     license = stdenv.lib.licenses.unfreeRedistributable;
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix
index ecdf8cfdbd22..479a6abe9a47 100644
--- a/pkgs/games/zandronum/default.nix
+++ b/pkgs/games/zandronum/default.nix
@@ -54,7 +54,7 @@ in stdenv.mkDerivation {
   meta = with stdenv.lib; {
     homepage = http://zandronum.com/;
     description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software.";
-    maintainer = with maintainers; [ lassulus ];
+    maintainers = with maintainers; [ lassulus ];
     platforms = platforms.linux;
     license = licenses.bsdOriginal;
   };
diff --git a/pkgs/games/zdoom/default.nix b/pkgs/games/zdoom/default.nix
index 0bc63855299e..8feb78ad9693 100644
--- a/pkgs/games/zdoom/default.nix
+++ b/pkgs/games/zdoom/default.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://zdoom.org/;
     description = "Enhanced port of the official DOOM source code";
-    maintainer = [ stdenv.lib.maintainers.lassulus ];
+    maintainers = [ stdenv.lib.maintainers.lassulus ];
   };
 }
 
diff --git a/pkgs/misc/themes/vertex/default.nix b/pkgs/misc/themes/vertex/default.nix
index 60269c8dfbf6..ea79426d47e4 100644
--- a/pkgs/misc/themes/vertex/default.nix
+++ b/pkgs/misc/themes/vertex/default.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     inherit (src.meta) homepage;
     description = "Theme for GTK 3, GTK 2, Gnome-Shell, and Cinnamon";
     license = licenses.gpl3;
-    maintainer = [ maintainers.rycee ];
+    maintainers = [ maintainers.rycee ];
     platforms = platforms.unix;
   };
 }
diff --git a/pkgs/os-specific/linux/kernel/linux-mptcp.nix b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
index 2b0e3017979f..6a1d8da5a92b 100644
--- a/pkgs/os-specific/linux/kernel/linux-mptcp.nix
+++ b/pkgs/os-specific/linux/kernel/linux-mptcp.nix
@@ -7,7 +7,7 @@ import ./generic.nix (args // rec {
 
   extraMeta = {
     branch = "3.18";
-    maintainer = stdenv.lib.maintainers.layus;
+    maintainers = stdenv.lib.maintainers.layus;
   };
 
   src = fetchurl {
diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix
index 45c625466280..ad40b57f8a60 100644
--- a/pkgs/servers/mail/rmilter/default.nix
+++ b/pkgs/servers/mail/rmilter/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/vstakhov/rmilter";
     license = licenses.bsd2; 
     description = "server, used to integrate rspamd and milter compatible MTA, for example postfix or sendmail";
-    maintainer = maintainers.avnik;
+    maintainers = maintainers.avnik;
   };
 }
diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index a3b20820a6e0..1f9c36b73777 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/vstakhov/rspamd";
     license = licenses.bsd2; 
     description = "advanced spam filtering system";
-    maintainer = maintainers.avnik;
+    maintainers = maintainers.avnik;
   };
 }
diff --git a/pkgs/tools/misc/cpulimit/default.nix b/pkgs/tools/misc/cpulimit/default.nix
index 72656d2969de..1bae4b16bd82 100644
--- a/pkgs/tools/misc/cpulimit/default.nix
+++ b/pkgs/tools/misc/cpulimit/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     description = "A tool to throttle the CPU usage of programs";
     platforms = with platforms; linux ++ freebsd;
     license = licenses.gpl2;
-    maintainer = [maintainers.rycee];
+    maintainers = [maintainers.rycee];
   };
 }
diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix
index 1c8a2e495b69..78835afddef5 100644
--- a/pkgs/tools/misc/trash-cli/default.nix
+++ b/pkgs/tools/misc/trash-cli/default.nix
@@ -34,7 +34,7 @@ python2Packages.buildPythonPackage rec {
   meta = with stdenv.lib; {
     homepage = https://github.com/andreafrancia/trash-cli;
     description = "Command line tool for the desktop trash can";
-    maintainer = [ maintainers.rycee ];
+    maintainers = [ maintainers.rycee ];
     license = licenses.gpl2;
   };
 }
diff --git a/pkgs/tools/networking/nethogs/default.nix b/pkgs/tools/networking/nethogs/default.nix
index c8ff0c7a1609..dfa9b26a38e8 100644
--- a/pkgs/tools/networking/nethogs/default.nix
+++ b/pkgs/tools/networking/nethogs/default.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     homepage = http://nethogs.sourceforge.net/;
     platforms = platforms.linux;
-    maintainer = [ maintainers.rycee ];
+    maintainers = [ maintainers.rycee ];
   };
 }
diff --git a/pkgs/tools/text/colordiff/default.nix b/pkgs/tools/text/colordiff/default.nix
index 53e683561fb8..b22a1da22641 100644
--- a/pkgs/tools/text/colordiff/default.nix
+++ b/pkgs/tools/text/colordiff/default.nix
@@ -22,6 +22,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.colordiff.org/;
     license = licenses.gpl3;
     platforms = platforms.linux ++ platforms.darwin;
-    maintainer = with maintainers; [ nckx ];
+    maintainers = with maintainers; [ nckx ];
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fa2abffd552d..717604a7278c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1815,7 +1815,7 @@ in modules // {
       description = "Composable style cycles";
       homepage = http://github.com/matplotlib/cycler;
       license = licenses.bsd3;
-      maintainer = with maintainers; [ fridh ];
+      maintainers = with maintainers; [ fridh ];
     };
   };
 
@@ -10664,7 +10664,7 @@ in modules // {
       description = "Line-by-line profiler";
       homepage = https://github.com/rkern/line_profiler;
       license = licenses.bsd3;
-      maintainer = with maintainers; [ fridh ];
+      maintainers = with maintainers; [ fridh ];
     };
   };
 
@@ -12589,7 +12589,7 @@ in modules // {
     meta = {
       description = "Numerical traits for Python objects";
       license = licenses.bsd2;
-      maintainer = with maintainers; [ fridh ];
+      maintainers = with maintainers; [ fridh ];
       homepage = https://github.com/astrofrog/numtraits;
     };
   };
@@ -14905,7 +14905,7 @@ in modules // {
       description = "An audio library based on libsndfile, CFFI and NumPy";
       license = licenses.bsd3;
       homepage = https://github.com/bastibe/PySoundFile;
-      maintainer = with maintainers; [ fridh ];
+      maintainers = with maintainers; [ fridh ];
     };
 
     prePatch = ''
@@ -15994,7 +15994,7 @@ in modules // {
       description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
       homepage = http://hgomersall.github.com/pyFFTW/;
       license = with licenses; [ bsd2 bsd3 ];
-      maintainer = with maintainers; [ fridh ];
+      maintainers = with maintainers; [ fridh ];
     };
   };
 
@@ -17727,7 +17727,7 @@ in modules // {
       description = "A docutils-compatibility bridge to CommonMark";
       homepage = https://github.com/rtfd/recommonmark;
       license = licenses.mit;
-      maintainer = with maintainers; [ fridh ];
+      maintainers = with maintainers; [ fridh ];
     };
 
   };
@@ -19794,7 +19794,7 @@ in modules // {
       description = "Statistical computations and models for use with SciPy";
       homepage = "https://www.github.com/statsmodels/statsmodels";
       license = licenses.bsd3;
-      maintainer = with maintainers; [ fridh ];
+      maintainers = with maintainers; [ fridh ];
     };
 
     # Many tests fail when using latest numpy and pandas.
@@ -20072,7 +20072,7 @@ in modules // {
       description = "Pretty-print tabular data";
       homepage = https://bitbucket.org/astanin/python-tabulate;
       license = licenses.mit;
-      maintainer = with maintainers; [ fridh ];
+      maintainers = with maintainers; [ fridh ];
     };
 
   };
@@ -21083,7 +21083,7 @@ in modules // {
     meta = {
       description = "Tree widgets for urwid";
       license = licenses.gpl3;
-      maintainer = with maintainters; [ profpatsch ];
+      maintainers = with maintainers; [ profpatsch ];
     };
   };
 
@@ -25019,7 +25019,7 @@ in modules // {
       # license can actually be either bsd3 or gpl3
       # see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt
       license = licenses.bsd3;
-      maintainer = with maintainers; [ np ];
+      maintainers = with maintainers; [ np ];
     };
   };
 
@@ -25038,7 +25038,7 @@ in modules // {
       description = "Implementation of Bitcoin BIP-0039";
       homepage = https://github.com/trezor/python-mnemonic;
       license = licenses.mit;
-      maintainer = with maintainers; [ np ];
+      maintainers = with maintainers; [ np ];
     };
   };
 
@@ -25062,7 +25062,7 @@ in modules // {
       description = "Python library for communicating with TREZOR Bitcoin Hardware Wallet";
       homepage = https://github.com/trezor/python-trezor;
       license = licenses.gpl3;
-      maintainer = with maintainers; [ np ];
+      maintainers = with maintainers; [ np ];
     };
   };
 
@@ -25086,7 +25086,7 @@ in modules // {
       description = "KeepKey Python client";
       homepage = https://github.com/keepkey/python-keepkey;
       license = licenses.gpl3;
-      maintainer = with maintainers; [ np ];
+      maintainers = with maintainers; [ np ];
     };
   };
 
@@ -25139,7 +25139,7 @@ in modules // {
       description = "Using Trezor as hardware SSH agent";
       homepage = https://github.com/romanz/trezor-agent;
       license = licenses.gpl3;
-      maintainer = with maintainers; [ np ];
+      maintainers = with maintainers; [ np ];
     };
   };
 
@@ -25156,7 +25156,7 @@ in modules // {
       description = "Binding for X11 proof of work hashing";
       homepage = https://github.com/mazaclub/x11_hash;
       license = licenses.mit;
-      maintainer = with maintainers; [ np ];
+      maintainers = with maintainers; [ np ];
     };
   };
 

From 813d45663cc7d9f166809411834c43207c91a411 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 10 Feb 2016 17:02:07 +0300
Subject: [PATCH 1216/2285] dwarf-fortress-packages.cla-theme: fix comment

---
 pkgs/games/dwarf-fortress/themes/cla.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/dwarf-fortress/themes/cla.nix b/pkgs/games/dwarf-fortress/themes/cla.nix
index f3c6b7dd279a..09b2cc8b647b 100644
--- a/pkgs/games/dwarf-fortress/themes/cla.nix
+++ b/pkgs/games/dwarf-fortress/themes/cla.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub }:
 
-# On upgrade check https://github.com/fricy/Phoebus/blob/master/manifest.json
+# On upgrade check https://github.com/DFgraphics/CLA/blob/master/manifest.json
 # for compatibility information.
 
 stdenv.mkDerivation {

From ccd1029f58a3bb9eca32d81bf3f33cb4be25cc66 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 10 Feb 2016 13:50:31 +0100
Subject: [PATCH 1217/2285] Reduce the size of the Nixpkgs/NixOS jobsets

This cuts nixpkgs:trunk from 78K to 31K jobs by disabling builds of
{node,go,python,emacs,coq,r,ocaml,perl}Packages. Thus these are now
only built if they are dependencies of top-level packages (such as
end-user applications). I left haskellPackages because they take
typically longer to build than the others (which are mostly
interpreted languages), so disabling them would be more painful to
users.

This is a temporary measure until we have a binary cache based Hydra
running on faster hardware, necessitated by the fact that evaluations
now regularly time out after 6 hours.
---
 pkgs/top-level/all-packages.nix | 24 ++++++++++++------------
 pkgs/top-level/release.nix      | 16 +++++++++++-----
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40e92629064c..8e91dee299c0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2155,7 +2155,7 @@ let
 
   nodePackages_5_x = callPackage ./node-packages.nix { self = nodePackages_5_x; nodejs = nodejs-5_x; };
 
-  nodePackages_4_x = recurseIntoAttrs (callPackage ./node-packages.nix { self = nodePackages_4_x; nodejs = nodejs-4_x; });
+  nodePackages_4_x = callPackage ./node-packages.nix { self = nodePackages_4_x; nodejs = nodejs-4_x; };
 
   nodePackages_0_10 = callPackage ./node-packages.nix { self = nodePackages_0_10; nodejs = nodejs-0_10; };
 
@@ -9034,23 +9034,23 @@ let
 
   ### DEVELOPMENT / GO MODULES
 
-  go14Packages = recurseIntoAttrs (callPackage ./go-packages.nix {
+  go14Packages = callPackage ./go-packages.nix {
     go = go_1_4;
     buildGoPackage = callPackage ../development/go-modules/generic {
       go = go_1_4;
       govers = go14Packages.govers.bin;
     };
     overrides = (config.goPackageOverrides or (p: {})) pkgs;
-  });
+  };
 
-  go15Packages = recurseIntoAttrs (callPackage ./go-packages.nix {
+  go15Packages = callPackage ./go-packages.nix {
     go = go_1_5;
     buildGoPackage = callPackage ../development/go-modules/generic {
       go = go_1_5;
       govers = go15Packages.govers.bin;
     };
     overrides = (config.goPackageOverrides or (p: {})) pkgs;
-  });
+  };
 
   goPackages = go15Packages;
 
@@ -9124,20 +9124,20 @@ let
     self = python33Packages;
   };
 
-  python34Packages = recurseIntoAttrs (callPackage ./python-packages.nix {
+  python34Packages = callPackage ./python-packages.nix {
     python = python34;
     self = python34Packages;
-  });
+  };
 
   python35Packages = recurseIntoAttrs (callPackage ./python-packages.nix {
     python = python35;
     self = python35Packages;
   });
 
-  pypyPackages = recurseIntoAttrs (callPackage ./python-packages.nix {
+  pypyPackages = callPackage ./python-packages.nix {
     python = pypy;
     self = pypyPackages;
-  });
+  };
 
   bsddb3 = pythonPackages.bsddb3;
 
@@ -11831,7 +11831,7 @@ let
     cask = callPackage ../applications/editors/emacs-modes/cask { };
   };
 
-  emacs24Packages = recurseIntoAttrs (emacsPackagesGen emacs24 pkgs.emacs24Packages);
+  emacs24Packages = emacsPackagesGen emacs24 pkgs.emacs24Packages;
 
   emacsPackagesNgGen = emacs: import ./emacs-packages.nix {
     overrides = (config.emacsPackageOverrides or (p: {})) pkgs;
@@ -15173,8 +15173,8 @@ let
 
   };
 
-  coqPackages = recurseIntoAttrs (mkCoqPackages_8_4 coqPackages);
-  coqPackages_8_5 = recurseIntoAttrs (mkCoqPackages_8_5 coqPackages_8_5);
+  coqPackages = mkCoqPackages_8_4 coqPackages;
+  coqPackages_8_5 = mkCoqPackages_8_5 coqPackages_8_5;
 
   cvc3 = callPackage ../applications/science/logic/cvc3 {
     gmp = lib.overrideDerivation gmp (a: { dontDisableStatic = true; });
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index a555dcbf4fa3..6c510ea029f1 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -233,7 +233,7 @@ let
       zsh = linux;
       zsnes = ["i686-linux"];
 
-      emacs24PackagesNg = packagePlatforms pkgs.emacs24PackagesNg;
+      #emacs24PackagesNg = packagePlatforms pkgs.emacs24PackagesNg;
 
       gnome = {
         gnome_panel = linux;
@@ -244,7 +244,7 @@ let
       haskell.compiler = packagePlatforms pkgs.haskell.compiler;
       haskellPackages = packagePlatforms pkgs.haskellPackages;
 
-      rPackages = packagePlatforms pkgs.rPackages;
+      #rPackages = packagePlatforms pkgs.rPackages;
 
       strategoPackages = {
         sdf = linux;
@@ -254,9 +254,15 @@ let
         dryad = linux;
       };
 
-      pythonPackages = {
-        zfec = linux;
-      };
+      ocamlPackages = { };
+
+      perlPackages = { };
+
+      pythonPackages = { };
+      python2Packages = { };
+      python27Packages = { };
+      python3Packages = { };
+      python35Packages = { };
 
       xorg = {
         fontadobe100dpi = linux ++ darwin;

From 078a19c43fe0cf73d70d5682c9542fcad5b026f6 Mon Sep 17 00:00:00 2001
From: Ozan Sener <ozan@ozansener.com>
Date: Wed, 10 Feb 2016 16:50:59 +0200
Subject: [PATCH 1218/2285] closurecompiler: 20151015 -> 20160208

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

diff --git a/pkgs/development/compilers/closure/default.nix b/pkgs/development/compilers/closure/default.nix
index 1c684c21bf40..949008d990f8 100644
--- a/pkgs/development/compilers/closure/default.nix
+++ b/pkgs/development/compilers/closure/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "closure-compiler-${version}";
-  version = "20151015";
+  version = "20160208";
 
   src = fetchurl {
     url = "http://dl.google.com/closure-compiler/compiler-${version}.tar.gz";
-    sha256 = "0idb0qrzca8j2nj0zxfpnsspmdkmda864rr5m05xxgcvn7150x0h";
+    sha256 = "19v9z8lfxfmhc4cl9fys7vnaslqiznjy1jpk5mcv468p7vysg46p";
   };
 
   phases = [ "installPhase" ];

From 2f5ced3f1c3915accb1da8638ec12da78812cfaa Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Wed, 10 Feb 2016 17:03:21 +0100
Subject: [PATCH 1219/2285] wlc: remove linuxPackages_4_2

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

diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix
index 9b5fa32bf00f..b219bd2f44d7 100644
--- a/pkgs/development/libraries/wlc/default.nix
+++ b/pkgs/development/libraries/wlc/default.nix
@@ -1,6 +1,6 @@
 { lib, stdenv, fetchurl, fetchgit, cmake, pkgconfig
 , glibc, wayland, pixman, libxkbcommon, libinput, libxcb, xcbutilwm, xcbutilimage, mesa, libdrm, udev, systemd, dbus_libs
-, libpthreadstubs, libX11, libXau, libXdmcp, libXext, libXdamage, libxshmfence, libXxf86vm, linuxPackages_4_2
+, libpthreadstubs, libX11, libXau, libXdmcp, libXext, libXdamage, libxshmfence, libXxf86vm
 }:
 
 stdenv.mkDerivation rec {

From 5c19830b77c00f87fa67121dadeb16096a6d18e2 Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Wed, 10 Feb 2016 17:29:36 +0100
Subject: [PATCH 1220/2285] tinc: chroot option

---
 nixos/modules/services/networking/tinc.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix
index a26b998b9155..9330e6c92ba8 100644
--- a/nixos/modules/services/networking/tinc.nix
+++ b/nixos/modules/services/networking/tinc.nix
@@ -95,6 +95,16 @@ in
             '';
           };
 
+          chroot = mkOption {
+            default = true;
+            type = types.bool;
+            description = ''
+              Change process root directory to the directory where the config file is located (/etc/tinc/netname/), for added security.
+              The chroot is performed after all the initialization is done, after writing pid files and opening network sockets.
+
+              Note that tinc can't run scripts anymore (such as tinc-down or host-up), unless it is setup to be runnable inside chroot environment.
+            '';
+          };
         };
       };
     };
@@ -166,7 +176,7 @@ in
           fi
         '';
         script = ''
-          tincd -R -D -U tinc.${network} -n ${network} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel}
+          tincd -D -U tinc.${network} -n ${network} ${optionalString (data.chroot) "-R"} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel}
         '';
       })
     );

From 4ef8288dfc145d963ce4770b87b0b613f89517c2 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 10 Feb 2016 19:42:31 +0300
Subject: [PATCH 1221/2285] zathura: use mupdf by 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 8e91dee299c0..e5959283e2bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14074,7 +14074,7 @@ let
   zathuraCollection = recurseIntoAttrs
     (callPackage ../applications/misc/zathura {
         callPackage = newScope pkgs.zathuraCollection;
-        useMupdf = config.zathura.useMupdf or false;
+        useMupdf = config.zathura.useMupdf or true;
       });
 
   zathura = zathuraCollection.zathuraWrapper;

From 007c558be8a488e49fd1c00f8c800f5f67604e36 Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Wed, 10 Feb 2016 18:25:48 +0000
Subject: [PATCH 1222/2285] prosody: 0.9.8 -> 0.9.10

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

diff --git a/pkgs/servers/xmpp/prosody/default.nix b/pkgs/servers/xmpp/prosody/default.nix
index 631073da4d4a..45c42947c5a4 100644
--- a/pkgs/servers/xmpp/prosody/default.nix
+++ b/pkgs/servers/xmpp/prosody/default.nix
@@ -19,12 +19,12 @@ let
 in
 
 stdenv.mkDerivation rec {
-  version = "0.9.8";
+  version = "0.9.10";
   name = "prosody-${version}";
 
   src = fetchurl {
     url = "http://prosody.im/downloads/source/${name}.tar.gz";
-    sha256 = "0wbq4ps69l09fjb5dfjzab6i30hzpi4bvyj5kc44gf70arf42w4l";
+    sha256 = "0bv6s5c0iizz015hh1lxlwlw1iwvisywajm2rcrbdfyrskzfwdj8";
   };
 
   communityModules = fetchhg {

From c093bf9b9b1bae7e786326d004b1e0d2f8cc4641 Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Sat, 30 Jan 2016 10:18:40 +0000
Subject: [PATCH 1223/2285] python-mpd2: init at 0.5.5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 04312ca1f234..d39b742b627a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11457,6 +11457,31 @@ in modules // {
     };
   };
 
+  mpd2 = buildPythonPackage rec {
+    name = "mpd2-${version}";
+    version = "0.5.5";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/python-mpd2/python-mpd2-${version}.tar.bz2";
+      sha256 = "1gfrxf71xll1w6zb69znqg5c9j0g7036fsalkvqprh2id640cl3a";
+    };
+
+    propagatedBuildInputs = [ pkgs.mpd_clientlib ];
+
+    buildInputs = with self; [ mock ];
+    patchPhase = ''
+      sed -i -e '/tests_require/d' \
+          -e 's/cmdclass.*/test_suite="mpd_test",/' setup.py
+    '';
+
+    meta = {
+      description = "A Python client module for the Music Player Daemon";
+      homepage = "https://github.com/Mic92/python-mpd2";
+      license = licenses.lgpl3Plus;
+      maintainers = with maintainers; [ rvl ];
+    };
+  };
+
   mpv = buildPythonPackage rec {
     name = "mpv-0.1";
 

From 5a50fd4660cbbc68f6ec13b8d6acfa8ac5f856b8 Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Sat, 30 Jan 2016 10:28:12 +0000
Subject: [PATCH 1224/2285] sonata: init at 1.7b1

---
 pkgs/applications/audio/sonata/default.nix | 73 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  4 ++
 2 files changed, 77 insertions(+)
 create mode 100644 pkgs/applications/audio/sonata/default.nix

diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix
new file mode 100644
index 000000000000..74ce6a2c15f0
--- /dev/null
+++ b/pkgs/applications/audio/sonata/default.nix
@@ -0,0 +1,73 @@
+{ pkgs, stdenv, fetchFromGitHub, pkgconfig, intltool, wrapGAppsHook,
+  python, buildPythonPackage, isPy3k,
+  gnome3, gtk3, gobjectIntrospection,
+  dbus, pygobject3, mpd2 }:
+
+with pkgs.lib;
+
+buildPythonPackage rec {
+  name = "sonata-${version}";
+  version = "1.7b1";
+  namePrefix = "";
+
+  src = fetchFromGitHub {
+    owner = "multani";
+    repo = "sonata";
+    rev = "v${version}";
+    sha256 = "1npbxlrg6k154qybfd250nq2p96kxdsdkj9wwnp93gljnii3g8wh";
+  };
+
+  disabled = !isPy3k;
+
+  buildInputs = [
+    pkgconfig intltool wrapGAppsHook
+    gnome3.gnome_themes_standard gnome3.defaultIconTheme
+    gnome3.gsettings_desktop_schemas
+  ];
+
+  postPatch = ''
+    # Remove "Local MPD" tab which is not suitable for NixOS.
+    sed -i '/localmpd/d' sonata/consts.py
+  '';
+
+  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+
+  propagatedBuildInputs = [
+    gobjectIntrospection gtk3 pygobject3
+  ];
+
+  # The optional tagpy dependency (for editing metadata) is not yet
+  # included because it's difficult to build.
+  pythonPath = [ dbus pygobject3 mpd2 ];
+
+  meta = {
+    description = "An elegant client for the Music Player Daemon";
+    longDescription = ''
+      Sonata is an elegant client for the Music Player Daemon.
+
+      Written in Python and using the GTK+ 3 widget set, its features
+      include:
+
+       - Expanded and collapsed views
+       - Automatic remote and local album art
+       - Library browsing by folders, or by genre/artist/album
+       - User-configurable columns
+       - Automatic fetching of lyrics
+       - Playlist and stream support
+       - Support for editing song tags (not in NixOS version)
+       - Drag and drop to copy files
+       - Popup notification
+       - Library and playlist searching, filter as you type
+       - Audioscrobbler (last.fm) 1.2 support
+       - Multiple MPD profiles
+       - Keyboard friendly
+       - Support for multimedia keys
+       - Commandline control
+       - Available in 24 languages
+    '';
+    homepage = "http://www.nongnu.org/sonata/";
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.rvl ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be51cff6fe5b..50e4a7e177ac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3161,6 +3161,10 @@ let
 
   solvespace = callPackage ../applications/graphics/solvespace { };
 
+  sonata = callPackage ../applications/audio/sonata {
+    inherit (python3Packages) buildPythonPackage python isPy3k dbus pygobject3 mpd2;
+  };
+
   sparsehash = callPackage ../development/libraries/sparsehash { };
 
   spiped = callPackage ../tools/networking/spiped { };

From 0d1d91efdd3de291cabba23b5c28a04dc4f9e3d6 Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Tue, 9 Feb 2016 00:00:05 +0000
Subject: [PATCH 1225/2285] sunxi-tools: init at 1.3

---
 lib/maintainers.nix                           |  3 +-
 .../development/tools/sunxi-tools/default.nix | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/tools/sunxi-tools/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 49304e27f5bb..e78f03b1e278 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -94,10 +94,11 @@
   eduarrrd = "Eduard Bachmakov <e.bachmakov@gmail.com>";
   edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
   eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
+  ehmry = "Emery Hemingway <emery@vfemail.net>";
   eikek = "Eike Kettner <eike.kettner@posteo.de>";
   elasticdog = "Aaron Bull Schaefer <aaron@elasticdog.com>";
+  elitak = "Eric Litak <elitak@gmail.com>";
   ellis = "Ellis Whitehead <nixos@ellisw.net>";
-  ehmry = "Emery Hemingway <emery@vfemail.net>";
   epitrochoid = "Mabry Cervin <mpcervin@uncg.edu>";
   ericbmerritt = "Eric Merritt <eric@afiniate.com>";
   ericsagnes = "Eric Sagnes <eric.sagnes@gmail.com>";
diff --git a/pkgs/development/tools/sunxi-tools/default.nix b/pkgs/development/tools/sunxi-tools/default.nix
new file mode 100644
index 000000000000..f27b9500319e
--- /dev/null
+++ b/pkgs/development/tools/sunxi-tools/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchgit, pkgconfig, libusb }:
+stdenv.mkDerivation {
+  name = "sunxi-tools-1.3";
+
+  src = fetchgit {
+    url = "https://github.com/linux-sunxi/sunxi-tools";
+    rev = "be1b4c7400161b90437432076360c1f99970f54f";
+    sha256 = "0qbl4v66a3mvqai29q2y60zf2b5lj32mh9gyn44gfp0w2bsb10yj";
+  };
+
+  buildInputs = [ pkgconfig libusb ];
+
+  buildPhase = ''
+    make all misc
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp bin2fex fex2bin phoenix_info sunxi-bootinfo sunxi-fel sunxi-fexc sunxi-nand-part sunxi-pio $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Tools for Allwinner A10 devices";
+    homepage = http://linux-sunxi.org/;
+    license = licenses.gpl2Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ elitak ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dddbdedf5a2c..6e2dfdff37e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3207,6 +3207,8 @@ let
 
   sundtek = callPackage ../misc/drivers/sundtek { };
 
+  sunxi-tools = callPackage ../development/tools/sunxi-tools { };
+
   super = callPackage ../tools/security/super { };
 
   supertux-editor = callPackage ../applications/editors/supertux-editor { };

From 310a20eda83261f72f670770f232b3bb0ed3cdf5 Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Wed, 10 Feb 2016 20:34:05 +0100
Subject: [PATCH 1226/2285] waf

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

diff --git a/pkgs/development/tools/build-managers/waf/default.nix b/pkgs/development/tools/build-managers/waf/default.nix
new file mode 100644
index 000000000000..6956c97db50f
--- /dev/null
+++ b/pkgs/development/tools/build-managers/waf/default.nix
@@ -0,0 +1,31 @@
+{ lib, stdenv, fetchurl, python2 }:
+
+stdenv.mkDerivation rec {
+  name = "waf-${version}";
+  version = "1.8.19";
+
+  src = fetchurl {
+    url = "https://waf.io/waf-${version}.tar.bz2";
+    sha256 = "e5df90556d1f70aca82bb5c5f46aa68d2377bae16b0db044eaa0559df8668c6f";
+  };
+
+  buildInputs = [ python2 ];
+
+  configurePhase = ''
+    python waf-light configure
+  '';
+  buildPhase = ''
+    python waf-light build
+  '';
+  installPhase = ''
+    install waf $out
+  '';
+
+  meta = {
+    description = "Meta build system";
+    homepage    = "https://waf.io/";
+    license     = lib.licenses.bsd3;
+    platforms   = lib.platforms.all;
+    maintainers = with lib.maintainers; [ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 33caf0a6b568..18f717f2e025 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3639,6 +3639,8 @@ let
 
   volumeicon = callPackage ../tools/audio/volumeicon { };
 
+  waf = callPackage ../development/tools/build-managers/waf { };
+
   wakelan = callPackage ../tools/networking/wakelan { };
 
   wavemon = callPackage ../tools/networking/wavemon { };

From 60969ab93712f1edf1ccc2e55b17aa9e2944564c Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Wed, 10 Feb 2016 20:34:28 +0100
Subject: [PATCH 1227/2285] pflask: use waf package

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

diff --git a/pkgs/os-specific/linux/pflask/default.nix b/pkgs/os-specific/linux/pflask/default.nix
index 931b074534e2..b4f93e9de3fb 100644
--- a/pkgs/os-specific/linux/pflask/default.nix
+++ b/pkgs/os-specific/linux/pflask/default.nix
@@ -1,5 +1,4 @@
-{ lib, stdenv, fetchurl, python
-}:
+{ lib, stdenv, fetchurl, python, waf }:
 
 stdenv.mkDerivation rec {
   name = "pflask-${version}";
@@ -14,10 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ python ];
 
   configurePhase = ''
-    ln -s ${fetchurl {
-      url = "http://ftp.waf.io/pub/release/waf-1.8.6";
-      sha256 = "81c4e6a3144c7b2021a839e7277bdaf1cedbbc87302186897b4ae03f4effcbf5";
-    }} waf
+    ln -s ${waf} waf
     python waf configure --prefix=$out
   '';
   buildPhase = ''

From e81fd09b85e60f537587a6f6a185dd5ef3a4f7d9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 10 Feb 2016 21:48:45 +0000
Subject: [PATCH 1228/2285] gradle: 2.10 -> 2.11

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

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 8e517930cfcc..82d0d4026988 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -35,11 +35,11 @@ rec {
   };
 
   gradleLatest = gradleGen rec {
-    name = "gradle-2.10";
+    name = "gradle-2.11";
 
     src = fetchurl {
       url = "http://services.gradle.org/distributions/${name}-bin.zip";
-      sha256 = "66406247f745fc6f05ab382d3f8d3e120c339f34ef54b86f6dc5f6efc18fbb13";
+      sha256 = "1mhydg6mj9y7qr2s9bkdaijkjrq7nf6rqix415izvjan4c43fx4d";
     };
   };
 

From 99913c2820290f0c9960ead2b60f48ff72f03e67 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 10 Feb 2016 21:37:54 +0300
Subject: [PATCH 1229/2285] dwarf-fortress-wrapper: make data/dipscript
 writable

---
 pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
index c5157e82d8a5..093dae562c24 100644
--- a/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
+++ b/pkgs/games/dwarf-fortress/wrapper/dwarf-fortress-init.in
@@ -40,3 +40,4 @@ forcecopy_path data/index
 # For some reason, it's needed to be writable...
 forcecopy_path data/announcement
 forcecopy_path data/help
+forcecopy_path data/dipscript

From 4538e70661b1f9fb9f8aad1cb71a14913da6f512 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 10 Feb 2016 23:02:18 +0100
Subject: [PATCH 1230/2285] smartgithg: update 7_0_2 -> 7_1_0

---
 .../version-management/smartgithg/default.nix             | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/smartgithg/default.nix b/pkgs/applications/version-management/smartgithg/default.nix
index 778ae995f3de..420031a81019 100644
--- a/pkgs/applications/version-management/smartgithg/default.nix
+++ b/pkgs/applications/version-management/smartgithg/default.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   name = "smartgithg-${version}";
-  version = "7_0_2";
+  version = "7_1_0";
 
   src = fetchurl {
-    url = "http://www.syntevo.com/downloads/smartgit/smartgit-generic-${version}.tar.gz";
-    sha256 = "1jpi424aqy6niq31j750rgbspwii013c8kbi965i4jzjpba1pagi";
+    url = "http://www.syntevo.com/downloads/smartgit/smartgit-linux-${version}.tar.gz";
+    sha256 = "0nlv2ipmv3z1j4642gfsrpsgc2y4mxngiz6mz3nidrbrkz0ylsvy";
   };
 
   buildInputs = [
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     install_freedesktop_items = ./install_freedesktop_items.sh;
     runtime_paths = lib.makeSearchPath "bin" [
       jre
-      git mercurial subversion
+      #git mercurial subversion # the paths are requested in configuration
       which
     ];
     runtime_lib_paths = lib.makeLibraryPath [

From 7383abff09be375b009143655180b7739838dfbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 10 Feb 2016 23:04:41 +0000
Subject: [PATCH 1231/2285] pythonPackages: bump some zope packages

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 717604a7278c..42eac4716b2b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22035,15 +22035,18 @@ in modules // {
 
   zope_exceptions = buildPythonPackage rec {
      name = "zope.exceptions-${version}";
-     version = "4.0.5";
+     version = "4.0.8";
 
      src = pkgs.fetchurl {
        url = "http://pypi.python.org/packages/source/z/zope.exceptions/${name}.tar.gz";
-       md5 = "c95569fcb444ae541777de7ae5297492";
+       sha256 = "0zwxaaa66sqxg5k7zcrvs0fbg9ym1njnxnr28dfmchzhwjvwnfzl";
      };
 
      propagatedBuildInputs = with self; [ zope_interface ];
 
+     # circular deps
+     doCheck = false;
+
      meta = {
        description = "Exception interfaces and implementations";
        homepage = http://pypi.python.org/pypi/zope.exceptions;
@@ -22139,15 +22142,18 @@ in modules // {
 
 
   zope_proxy = buildPythonPackage rec {
-    name = "zope.proxy-4.1.4";
+    name = "zope.proxy-4.1.6";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/z/zope.proxy/${name}.tar.gz";
-      md5 = "3bcaf8b8512a99649ecf2f158c11d05b";
+      sha256 = "0pqwwmvm1prhwv1ziv9lp8iirz7xkwb6n2kyj36p2h0ppyyhjnm4";
     };
 
     propagatedBuildInputs = with self; [ zope_interface ];
 
+    # circular deps
+    doCheck = false;
+
     meta = {
         maintainers = with maintainers; [ goibhniu ];
     };
@@ -22276,18 +22282,12 @@ in modules // {
 
     propagatedBuildInputs = with self; [ zope_interface zope_exceptions zope_testing six ] ++ optional (!python.is_py3k or false) subunit;
 
-    # https://github.com/zopefoundation/zope.testrunner/issues/35
-    doCheck = !(isPy27 || isPy34);
-
     meta = {
       description = "A flexible test runner with layer support";
       homepage = http://pypi.python.org/pypi/zope.testrunner;
       license = licenses.zpt20;
       maintainers = with maintainers; [ goibhniu ];
     };
-
-    # Python 3.5 is not yet supported.
-    disabled = isPy35;
   };
 
 
@@ -22311,11 +22311,11 @@ in modules // {
 
 
   zope_interface = buildPythonPackage rec {
-    name = "zope.interface-4.1.1";
+    name = "zope.interface-4.1.3";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/z/zope.interface/${name}.tar.gz";
-      md5 = "edcd5f719c5eb2e18894c4d06e29b6c6";
+      sha256 = "0ks8h73b2g4bkad821qbv0wzjppdrwys33i7ka45ik3wxjg1l8if";
     };
 
     propagatedBuildInputs = with self; [ zope_event ];

From 37e1a9c844e3b554e18ba0bf784e908481055d95 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 11 Feb 2016 02:36:09 +0300
Subject: [PATCH 1232/2285] ejabberd: 15.11 -> 16.01

---
 pkgs/servers/xmpp/ejabberd/default.nix | 147 ++++++++++++++-----------
 1 file changed, 81 insertions(+), 66 deletions(-)

diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index 2fb6f7a4b2df..f1fa6bed00c2 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -17,154 +17,162 @@ let
   ctlpath = lib.makeSearchPath "bin" [ bash gnused gnugrep coreutils utillinux procps ];
 
   fakegit = writeScriptBin "git" ''
-    #! ${stdenv.shell}
-    exit 0
+    #! ${stdenv.shell} -e
+    if [ "$1" = "describe" ]; then
+      [ -r .rev ] && cat .rev || true
+    fi
   '';
 
-  # These can be extracted from `rebar.config.script`
+  # These can be extracted from `rebar.config`
   # Some dependencies are from another packages. Try commenting them out; then during build
   # you'll get necessary revision information.
   ejdeps = {
-    p1_cache_tab = fetchFromGitHub {
+    cache_tab = fetchFromGitHub {
       owner = "processone";
       repo = "cache_tab";
-      rev = "f7ea12b0ba962a3d2f9a406d2954cf7de4e27230";
-      sha256 = "043rz66s6vhcbk02qjhn1r8jv8yyy4gk0gsknmk7ya6wq2v1farw";
+      rev = "1.0.1";
+      sha256 = "1mq5vgqskb0v2pdn6i3610hzd9iyjznh8143pdbz8z57rrhxpxg4";
     };
     p1_tls = fetchFromGitHub {
       owner = "processone";
       repo = "tls";
-      rev = "e56321afd974e9da33da913cd31beebc8e73e75f";
-      sha256 = "0k8dx8mww2ilr4y5m2llhqh673l0z7r73f0lh7klyf57wfqy7hzk";
+      rev = "1.0.0";
+      sha256 = "1q6l5drgmwj4fp4nfh0075lczplia4n40sirk9pd5x76d59qcmnj";
     };
     p1_stringprep = fetchFromGitHub {
       owner = "processone";
       repo = "stringprep";
-      rev = "3c640237a3a7831dc39de6a6d329d3a9af25c579";
-      sha256 = "0mwlkivkfj16bdv80jr8kqa0vcqglxkq90m9qn0m6zp4bjc3jm3n";
+      rev = "1.0.0";
+      sha256 = "105xc0af61xrd4vjxrg49gxbij8x0fq4yribywa8qly303d1nwwa";
     };
     p1_xml = fetchFromGitHub {
       owner = "processone";
       repo = "xml";
-      rev = "1c8b016b0ac7986efb823baf1682a43565449e65";
-      sha256 = "192jhj0cwwypbiass3rm2449410pqyk3mgrdg7yyvqwmjzzkmh87";
+      rev = "1.1.1";
+      sha256 = "07zxc8ky78sd2mcbhhrxha68arbbk8vyayn9gwi402avnqcic7cx";
     };
     esip = fetchFromGitHub {
       owner = "processone";
       repo = "p1_sip";
-      rev = "d662d3fe7f6288b444ea321d854de0bd6d40e022";
-      sha256 = "1mwzkkv01vr9n13h6h3100jrrlgb683ncq9jymnbxqxk6rn7xjd1";
+      rev = "1.0.0";
+      sha256 = "02k920995b0js6srarx0rabavs428rl0dp7zz90x74l8b589zq9a";
     };
     p1_stun = fetchFromGitHub {
       owner = "processone";
       repo = "stun";
-      rev = "061bdae484268cbf0457ad4797e74b8516df3ad1";
-      sha256 = "0zaw8yq4sk7x4ybibcq93k9b6rb7fn03i0k8gb2dnlipmbcdd8cf";
+      rev = "0.9.0";
+      sha256 = "0ghf2p6z1m55f5pm4pv5gj7h7fdcwcsyqz1wzax4w8bgs9id06dm";
     };
     p1_yaml = fetchFromGitHub {
       owner = "processone";
       repo = "p1_yaml";
-      rev = "79f756ba73a235c4d3836ec07b5f7f2b55f49638";
-      sha256 = "05jjw02ay8v34izwgi5zizqp1mj68ypjilxn59c262xj7c169pzh";
+      rev = "1.0.0";
+      sha256 = "0is0vr8ygh3fbiyf0jb85cfpfakxmx31fqk6s4j90gmfhlbm16f8";
     };
     p1_utils = fetchFromGitHub {
       owner = "processone";
       repo = "p1_utils";
-      rev = "d7800881e6702723ce58b7646b60c9e4cd25d563";
-      sha256 = "07p47ccrdjymjmn6rn9jlcyg515bs9l0iwfbc75qsk10ddnmbvdi";
+      rev = "1.0.2";
+      sha256 = "11b71bnc90riy1qplkpwx6l1yr9849jai3ckri35cavfsk35j687";
     };
     jiffy = fetchFromGitHub {
       owner = "davisp";
       repo = "jiffy";
-      rev = "cfc61a2e952dc3182e0f9b1473467563699992e2";
-      sha256 = "1c2x71x90jlx4585znxz8fg46q3jxm80nk7v184lf4pqa1snk8kk";
+      rev = "0.14.5";
+      sha256 = "1xs01cl4gq1x6sjj7d1qgg4iq9iwzv3cjqjrj0kr7rqrbfqx2nq3";
     };
     oauth2 = fetchFromGitHub {
-      owner = "prefiks";
+      owner = "kivra";
       repo = "oauth2";
-      rev = "e6da9912e5d8f658e7e868f41a102d085bdbef59";
-      sha256 = "0di33bkj8xc7h17z1fs4birp8a88c1ds72jc4xz2qmz8kh7q9m3k";
+      rev = "8d129fbf8866930b4ffa6dd84e65bd2b32b9acb8";
+      sha256 = "0mbmw6668l945iqppba991793nmmkyvvf18zxgdahxcwgxg1majn";
     };
     xmlrpc = fetchFromGitHub {
       owner = "rds13";
       repo = "xmlrpc";
-      rev = "42e6e96a0fe7106830274feed915125feb1056f3";
-      sha256 = "10dk480s6z653lr5sap4rcx3zsfmg68hgapvc4jvcyf7vgg12d3s";
+      rev = "1.15";
+      sha256 = "0ihwag2hgw9rswxygallc4w1yipgpd6arw3xpr799ib7ybsn8x81";
     };
 
     p1_mysql = fetchFromGitHub {
       owner = "processone";
       repo = "mysql";
-      rev = "dfa87da95f8fdb92e270741c2a53f796b682f918";
-      sha256 = "1nw7n1xvid4yqp57s94drdjf6ffap8zpy8hkrz9yffzkhk9biz5y";
+      rev = "1.0.0";
+      sha256 = "1v3g75hhfpv5bnrar23y7lsk3pd02xl5cy4mj13j0qxl6bc4dgss";
     };
     p1_pgsql = fetchFromGitHub {
       owner = "processone";
       repo = "pgsql";
-      rev = "e72c03c60bfcb56bbb5d259342021d9cb3581dac";
-      sha256 = "0y89995h7g8bi12qi1m4cdzcswsljbv7y8zb43rjg5ss2bcq7kb6";
+      rev = "1.0.0";
+      sha256 = "1r7dkjzxhwplmhvgvdx990xn98gpslckah5jpkx8c2gm9nj3xi33";
     };
     sqlite3 = fetchFromGitHub {
       owner = "alexeyr";
       repo = "erlang-sqlite3";
-      rev = "8350dc603804c503f99c92bfd2eab1dd6885758e";
-      sha256 = "0d0pbqmi3hsvzjp4vjp7a6bq3pjvkfv0spszh6485x9cmxsbwfpc";
+      rev = "cbc3505f7a131254265d3ef56191b2581b8cc172";
+      sha256 = "1xrvygv0zhslsqf8044m5ml1zr6di7znvv2zycg3amsz190w0w2g";
     };
     p1_pam = fetchFromGitHub {
       owner = "processone";
       repo = "epam";
-      rev = "d3ce290b7da75d780a03e86e7a8198a80e9826a6";
-      sha256 = "0s0czrgjvc1nw7j66x8b9rlajcap0yfnv6zqd4gs76ky6096qpb0";
+      rev = "1.0.0";
+      sha256 = "0dlbmfwndhyg855vnhwyccxcjqzf2wcgc7522mjb9q38cva50rpr";
     };
     p1_zlib = fetchFromGitHub {
       owner = "processone";
       repo = "zlib";
-      rev = "e3d4222b7aae616d7ef2e7e2fa0bbf451516c602";
-      sha256 = "0z960nwva8x4lw1k91i53kpn2bjbf1v1amslkyp8sx2gc5zf0gbn";
+      rev = "1.0.0";
+      sha256 = "1a6m7wz6cbb8526fwhmgm7mva62absmvyjm8cjnq7cs0mzp18r0m";
+    };
+    hamcrest = fetchFromGitHub {
+      owner = "hyperthunk";
+      repo = "hamcrest-erlang";
+      rev = "908a24fda4a46776a5135db60ca071e3d783f9f6";
+      sha256 = "0irxidwrb37m0xwls6q9nn2zfs3pyxrgbnjgrhnh7gm35ib51hkj";
     };
     riakc = fetchFromGitHub {
       owner = "basho";
       repo = "riak-erlang-client";
-      rev = "1.4.2";
-      sha256 = "128jz83n1990m9c2fzwsif6hyapmq46720nzfyyb4z2j75vn85zz";
+      rev = "527722d12d0433b837cdb92a60900c2cb5df8942";
+      sha256 = "13rkwibsjsl2gdysvf11r1hqfrf89hjgpa0x0hz2910f2ryqll3y";
     };
     # dependency of riakc
     riak_pb = fetchFromGitHub {
       owner = "basho";
       repo = "riak_pb";
-      rev = "1.4.4.0";
-      sha256 = "054fg9gaxk4n0id0qs6k8i919qvxsvmh76m6fgfbmixyfxh5jp3w";
+      rev = "2.1.0.7";
+      sha256 = "1p0qmjq069f7j1m29dv36ayvz8m0pcm94ccsnv5blykfg2c5ja0c";
     };
     # dependency of riak_pb
     protobuffs = fetchFromGitHub {
       owner = "basho";
       repo = "erlang_protobuffs";
-      rev = "0.8.1p1";
-      sha256 = "1x75a26y1gx6pzr829i4sx2mxm5w40kb6hfd5y511him56jcczna";
+      rev = "0.8.2";
+      sha256 = "0w4jmsnc9x2ykqh1q6b12pl8a9973dxdhqk3y0ph17n83q5xz3h7";
     };
     rebar_elixir_plugin = fetchFromGitHub {
-      owner = "yrashk";
+      owner = "processone";
       repo = "rebar_elixir_plugin";
-      rev = "7058379b7c7e017555647f6b9cecfd87cd50f884";
-      sha256 = "1s5bvbrhal866gbp72lgp0jzphs2cmgmafmka0pylwj30im41c71";
+      rev = "0.1.0";
+      sha256 = "0x04ff53mxwd9va8nl4m70dbamp6p4dpxs646c168iqpnpadk3sk";
     };
     elixir = fetchFromGitHub {
       owner = "elixir-lang";
       repo = "elixir";
-      rev = "1d9548fd285d243721b7eba71912bde2ffd1f6c3";
-      sha256 = "1lxn9ly73rm797p6slfx7grsq32nn6bz15qhkbra834rj01fqzh8";
+      rev = "v1.1.0";
+      sha256 = "0r5673x2qdvfbwmvyvj8ddvzgxnkl3cv9jsf1yzsxgdifjbrzwx7";
     };
     p1_iconv = fetchFromGitHub {
       owner = "processone";
       repo = "eiconv";
-      rev = "8b7542b1aaf0a851f335e464956956985af6d9a2";
-      sha256 = "1w3k41fpynqylc2vnirz0fymlidpz0nnym0070f1f1s3pd6g5906";
+      rev = "0.9.0";
+      sha256 = "1ikccpj3aq6mip6slrq8c7w3kilpb82dr1jdy8kwajmiy9cmsq97";
     };
     lager = fetchFromGitHub {
       owner = "basho";
       repo = "lager";
-      rev = "4d2ec8c701e1fa2d386f92f2b83b23faf8608ac3";
-      sha256 = "03aav3cid0qpl1n8dn83hk0p70rw05nqvhq1abdh219nrlk9gfmx";
+      rev = "3.0.2";
+      sha256 = "04l40dlqpl2y6ddpbpknmnjf537bjvrmg8r0jnmw1h60dgyb2ydk";
     };
     # dependency of lager
     goldrush = fetchFromGitHub {
@@ -176,31 +184,31 @@ let
     p1_logger = fetchFromGitHub {
       owner = "processone";
       repo = "p1_logger";
-      rev = "3e19507fd5606a73694917158767ecb3f5704e3f";
-      sha256 = "0mq86gh8x3bgqcpwdjkdn7m3bj2006gbarnj7cn5dfs21m2h2mdn";
+      rev = "1.0.0";
+      sha256 = "0z11xsr139a75w09syjws4sja6ky2l9rsrwkjr6wcl7p1jz02h4r";
     };
     meck = fetchFromGitHub {
       owner = "eproxus";
       repo = "meck";
-      rev = "fc362e037f424250130bca32d6bf701f2f49dc75";
-      sha256 = "056yca394f8mbg8vwxxlq47dbjx48ykdrg4lvnbi5gfijl786i3s";
+      rev = "0.8.2";
+      sha256 = "0s4qbvryap46cz63awpbv5zzmlcay5pn2lixgmgvcjarqv70cbs7";
     };
     eredis = fetchFromGitHub {
       owner = "wooga";
       repo = "eredis";
-      rev = "770f828918db710d0c0958c6df63e90a4d341ed7";
-      sha256 = "0qv8hldn5972328pa1qz2lbblw1p2283js5y98dc8papldkicvmm";
+      rev = "v1.0.8";
+      sha256 = "10fr3kbc2nd2liggsq4y77nfirndzapcxzkjgyp06bpr9cjlvhlm";
     };
 
   };
 
 in stdenv.mkDerivation rec {
-  version = "15.11";
+  version = "16.01";
   name = "ejabberd-${version}";
 
   src = fetchurl {
     url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";
-    sha256 = "0sll1si9pd4v7yibzr8hp18hfrbxsa5nj9h7qsldvy7r4md4n101";
+    sha256 = "10fnsw52gxybw731yka63ma8mj39g4i0nsancwp9nlvhb2flgk72";
   };
 
   nativeBuildInputs = [ fakegit ];
@@ -216,13 +224,13 @@ in stdenv.mkDerivation rec {
   LANG = "en_US.UTF-8";
 
   depsNames =
-    [ "p1_cache_tab" "p1_tls" "p1_stringprep" "p1_xml" "esip" "p1_stun" "p1_yaml" "p1_utils" "jiffy" "oauth2" "xmlrpc" ]
+    [ "cache_tab" "p1_tls" "p1_stringprep" "p1_xml" "esip" "p1_stun" "p1_yaml" "p1_utils" "jiffy" "oauth2" "xmlrpc" ]
     ++ lib.optional withMysql "p1_mysql"
     ++ lib.optional withPgsql "p1_pgsql"
     ++ lib.optional withSqlite "sqlite3"
     ++ lib.optional withPam "p1_pam"
     ++ lib.optional withZlib "p1_zlib"
-    ++ lib.optionals withRiak [ "riakc" "riak_pb" "protobuffs" ]
+    ++ lib.optionals withRiak [ "hamcrest" "riakc" "riak_pb" "protobuffs" ]
     ++ lib.optionals withElixir [ "rebar_elixir_plugin" "elixir" ]
     ++ lib.optional withIconv "p1_iconv"
     ++ lib.optionals withLager [ "lager" "goldrush" ]
@@ -232,8 +240,7 @@ in stdenv.mkDerivation rec {
   ;
 
   configureFlags =
-    [ "--enable-nif"
-      (lib.enableFeature withMysql "mysql")
+    [ (lib.enableFeature withMysql "mysql")
       (lib.enableFeature withPgsql "pgsql")
       (lib.enableFeature withSqlite "sqlite")
       (lib.enableFeature withPam "pam")
@@ -247,6 +254,7 @@ in stdenv.mkDerivation rec {
     ] ++ lib.optional withSqlite "--with-sqlite3=${sqlite}";
 
   depsPaths = map (x: builtins.getAttr x ejdeps) depsNames;
+  depsRevs = map (x: x.rev) depsPaths;
 
   enableParallelBuilding = true;
 
@@ -254,12 +262,19 @@ in stdenv.mkDerivation rec {
     mkdir deps
     depsPathsA=( $depsPaths )
     depsNamesA=( $depsNames )
+    depsRevsA=( $depsRevs )
     for i in {0..${toString (builtins.length depsNames - 1)}}; do
-      cp -R ''${depsPathsA[$i]} deps/''${depsNamesA[$i]}
+      path="deps/''${depsNamesA[$i]}"
+      cp -R ''${depsPathsA[$i]} "$path"
+      chmod -R +w "$path"
+      echo "''${depsRevsA[$i]}" > "$path/.rev"
     done
-    chmod -R +w deps
     touch deps/.got
     patchShebangs .
+
+    for i in deps/*; do
+      [ -x "$i/configure" ] && ( cd "$i"; ./configure ) || true
+    done
   '';
 
   postInstall = ''

From 6a0f9ba6f6444d7d42f87d4a6b013ec61f862e37 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Thu, 11 Feb 2016 05:53:03 +0000
Subject: [PATCH 1233/2285] htop: 1.0.3-239-229d0058 -> 2.0.0

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

diff --git a/pkgs/os-specific/linux/htop/default.nix b/pkgs/os-specific/linux/htop/default.nix
index da41c95dda27..b722815f2954 100644
--- a/pkgs/os-specific/linux/htop/default.nix
+++ b/pkgs/os-specific/linux/htop/default.nix
@@ -1,11 +1,11 @@
 { fetchFromGitHub, stdenv, autoreconfHook, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "htop-1.0.3-239-229d0058";
+  name = "htop-2.0.0";
 
   src = fetchFromGitHub {
-    sha256 = "1bym6ligd8db4iyv2m1y7aylh7f9fmk71v67rkhird05hx1xb80r";
-    rev = "229d005851af8dca595b3df8e385375fb9c382b4";
+    sha256 = "1z8rzf3ndswk3090qypl0bqzq9f32w0ik2k5x4zd7jg4hkx66k7z";
+    rev = "2.0.0";
     repo = "htop";
     owner = "hishamhm";
   };

From 2d7375e64989912dd622eb9cb7385fb3a1902054 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Thu, 11 Feb 2016 15:54:19 +0900
Subject: [PATCH 1234/2285] libao: add dependencies for Darwin frameworks

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

diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index a8948e8ae8c0..c0a6d4b6b1f1 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -1,4 +1,5 @@
 { lib, stdenv, fetchurl, pkgconfig, libpulseaudio, alsaLib, libcap
+, CoreAudio, CoreServices, AudioUnit
 , usePulseAudio }:
 
 stdenv.mkDerivation rec {
@@ -12,7 +13,8 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ pkgconfig ] ++
     lib.optional stdenv.isLinux (if usePulseAudio then libpulseaudio else alsaLib) ++
-    lib.optional stdenv.isLinux libcap;
+    lib.optional stdenv.isLinux libcap ++
+    lib.optionals stdenv.isDarwin [ CoreAudio CoreServices AudioUnit ];
 
   meta = {
     longDescription = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 046d3cdaa1f5..f541c5feac8b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7074,6 +7074,7 @@ let
 
   libao = callPackage ../development/libraries/libao {
     usePulseAudio = config.pulseaudio or true;
+    inherit (darwin.apple_sdk.frameworks) CoreAudio CoreServices AudioUnit;
   };
 
   libabw = callPackage ../development/libraries/libabw { };

From 86c2a0f783b3225bf46828d677b65c95cc544b3f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Feb 2016 11:21:20 +0100
Subject: [PATCH 1235/2285] mediawiki: 1.23.9 -> 1.23.13

---
 nixos/modules/services/web-servers/apache-httpd/mediawiki.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index 52d8c89baff2..0fe8d1a89cf3 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -83,11 +83,11 @@ let
 
   # Unpack Mediawiki and put the config file in its root directory.
   mediawikiRoot = pkgs.stdenv.mkDerivation rec {
-    name= "mediawiki-1.23.9";
+    name= "mediawiki-1.23.13";
 
     src = pkgs.fetchurl {
       url = "http://download.wikimedia.org/mediawiki/1.23/${name}.tar.gz";
-      sha256 = "1l7k4g0pgz92yvrfr52w26x740s4362v0gc95pk0i30vn2sp5bql";
+      sha256 = "168wpf53n4ksj2g5q5r0hxapx6238dvsfng5ff9ixk6axsn0j5d0";
     };
 
     skins = config.skins;

From b061225c54356e5ae6ec8c5cf9de40f01d8e8fae Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Feb 2016 11:22:15 +0100
Subject: [PATCH 1236/2285] php: 5.6.17 -> 5.6.18

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

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index c963c01e65bf..66a686d78ecb 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -298,8 +298,8 @@ in {
   };
 
   php56 = generic {
-    version = "5.6.17";
-    sha256 = "0fyxg95m918ngi6lnxyfb4y0ii4f8f5znb5l4axpagp6l5b5zd3p";
+    version = "5.6.18";
+    sha256 = "1vgl2zjq6ws5cjjb3llhwpfwg9gasq3q84ibdv9hj8snm4llmkf3";
   };
 
   php70 = generic {

From 42634fe6ccc62341de56f738e412951af389f84c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Feb 2016 11:22:51 +0100
Subject: [PATCH 1237/2285] php: 5.5.31 -> 5.5.32

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

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 66a686d78ecb..1c06ecaef2eb 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -293,8 +293,8 @@ in {
   };
 
   php55 = generic {
-    version = "5.5.31";
-    sha256 = "0xx23gb70jsgbd772hy8f79wh2rja617s17gnx4vgklxk8mkhjpv";
+    version = "5.5.32";
+    sha256 = "1vljdvyqsq0vas4yhvpqycqyxl2gfndbmak6cfgxn1cfvc4c3wmh";
   };
 
   php56 = generic {

From fc84ee22df2a6d14b638a93c0e802c033233f21e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 11 Feb 2016 11:27:34 +0100
Subject: [PATCH 1238/2285] php: Remove version 5.4 which is EOL

---
 pkgs/development/interpreters/php/default.nix | 5 -----
 pkgs/top-level/all-packages.nix               | 1 -
 2 files changed, 6 deletions(-)

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 1c06ecaef2eb..5503ee9c8870 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -287,11 +287,6 @@ let
 
 in {
 
-  php54 = generic {
-    version = "5.4.45";
-    sha256 = "10k59j7zjx2mrldmgfvjrrcg2cslr2m68azslspcz5acanqjh3af";
-  };
-
   php55 = generic {
     version = "5.5.32";
     sha256 = "1vljdvyqsq0vas4yhvpqycqyxl2gfndbmak6cfgxn1cfvc4c3wmh";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f541c5feac8b..74488951ad78 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5309,7 +5309,6 @@ let
   });
 
   inherit (callPackages ../development/interpreters/php { })
-    php54
     php55
     php56
     php70;

From ccece1ca88cac4f665cb956164de48eadd2c3907 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 11 Feb 2016 13:46:33 +0300
Subject: [PATCH 1239/2285] dspam service: restart on failure

---
 nixos/modules/services/mail/dspam.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/mail/dspam.nix b/nixos/modules/services/mail/dspam.nix
index 10352ba6abcc..f18fd489f23d 100644
--- a/nixos/modules/services/mail/dspam.nix
+++ b/nixos/modules/services/mail/dspam.nix
@@ -109,6 +109,9 @@ in {
           Group = cfg.group;
           RuntimeDirectory = optional (cfg.domainSocket == defaultSock) "dspam";
           PermissionsStartOnly = true;
+          # DSPAM segfaults on just about every error
+          Restart = "on-failure";
+          RestartSec = "1s";
         };
 
         preStart = ''

From 39711944906d17ad1127e39cf2d9b634b4f3b195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 11 Feb 2016 11:29:10 -0200
Subject: [PATCH 1240/2285] opensmtpd: compile with support for 'db' tables

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

diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index cb098a84a94f..1d92a5edc445 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
     "--with-queue-user=smtpq"
     "--with-ca-file=/etc/ssl/certs/ca-certificates.crt"
     "--with-libevent-dir=${libevent}"
+    "--enable-table-db"
   ];
 
   installFlags = [

From 9f2cc141071fbb61faa93c0d068ab3473498cf0c Mon Sep 17 00:00:00 2001
From: Bojan Nikolic <bojan@bnikolic.co.uk>
Date: Thu, 11 Feb 2016 12:56:38 +0000
Subject: [PATCH 1241/2285] bzip2: Fix cross-compilation

The cross-compiling the "patchPhase" from the parent attribute set was
preventing application of patches specified in the crossDrv. Fix by
turning patchPhase into postPatch.
---
 pkgs/tools/compression/bzip2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index bb04049d8a66..0d8bfc6894e6 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -58,7 +58,7 @@ in stdenv.mkDerivation {
     ln -s bzip2 $out/bin/bzcat
   '';
 
-  patchPhase = ''
+  postPatch = ''
     substituteInPlace Makefile --replace CC=gcc CC=cc
     substituteInPlace Makefile-libbz2_so --replace CC=gcc CC=cc
   '';

From f8d0ba744732f1840d7f38a3b35c1895bfce96e0 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Tue, 9 Feb 2016 16:47:04 +0100
Subject: [PATCH 1242/2285] nntp-proxy: init at 2014-01-06 (0358e7a)

---
 lib/maintainers.nix                           |  1 +
 .../networking/nntp-proxy/default.nix         | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 34 insertions(+)
 create mode 100644 pkgs/applications/networking/nntp-proxy/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index db6a55a283fd..f3a5717c6490 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -105,6 +105,7 @@
   ertes = "Ertugrul Söylemez <ertesx@gmx.de>";
   exi = "Reno Reckling <nixos@reckling.org>";
   exlevan = "Alexey Levan <exlevan@gmail.com>";
+  fadenb = "Tristan Helmich <tristan.helmich+nixos@gmail.com>";
   falsifian = "James Cook <james.cook@utoronto.ca>";
   flosse = "Markus Kohlhase <mail@markus-kohlhase.de>";
   fluffynukeit = "Daniel Austin <dan@fluffynukeit.com>";
diff --git a/pkgs/applications/networking/nntp-proxy/default.nix b/pkgs/applications/networking/nntp-proxy/default.nix
new file mode 100644
index 000000000000..05333f67ecfa
--- /dev/null
+++ b/pkgs/applications/networking/nntp-proxy/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchFromGitHub, libconfig, pkgconfig, libevent, openssl }:
+
+stdenv.mkDerivation rec {
+  name = "nntp-proxy-${version}";
+  version = "2014-01-06";
+
+  src = fetchFromGitHub {
+    owner = "nieluj";
+    repo = "nntp-proxy";
+    rev = "0358e7ad6c4676f90ac5074320b16e1461b0011a";
+    sha256 = "0jwxh71am83fbnq9mn06jl06rq8qybm506js79xmmc3xbk5pqvy4";
+  };
+
+  buildInputs = [ libconfig pkgconfig libevent openssl ];
+
+  installFlags = "INSTALL_DIR=\${out}/bin/";
+
+  preInstall = ''
+    mkdir -p $out/bin
+    substituteInPlace Makefile \
+      --replace /usr/bin/install $(type -P install)
+  '';
+
+  meta = {
+    description = "Simple NNTP proxy with SSL support";
+    homepage = https://github.com/nieluj/nntp-proxy;
+    license = stdenv.lib.licenses.gpl2Plus;
+    maintainers = [ stdenv.lib.maintainers.fadenb ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74488951ad78..1e94b1ca90c3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8044,6 +8044,8 @@ let
     nix = pkgs.nixUnstable;
   };
 
+  nntp-proxy = callPackage ../applications/networking/nntp-proxy { };
+
   non = callPackage ../applications/audio/non { };
 
   nspr = callPackage ../development/libraries/nspr { };

From 4f7555683a5fdefa7c7e25e1943c60c57102d21e Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 11 Feb 2016 16:28:02 +0100
Subject: [PATCH 1243/2285] youtube-dl: remove all-packages deprecation

yt-dl is both a library and an executable, as such it should have a
reference in all-packages.
---
 pkgs/top-level/all-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 662905129e51..df56303c7742 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14073,6 +14073,8 @@ let
 
   inherit (gnome3) yelp;
 
+  inherit (pythonPackages) youtube-dl;
+
   qgis = callPackage ../applications/gis/qgis {};
 
   qtbitcointrader = callPackage ../applications/misc/qtbitcointrader {
@@ -16040,7 +16042,6 @@ aliases = with self; rec {
   x11 = xlibsWrapper; # added 2015-09
   xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
   xlibs = xorg; # added 2015-09
-  youtube-dl = pythonPackages.youtube-dl; # added 2015-06-07
   youtubeDL = youtube-dl;  # added 2014-10-26
   vimbWrapper = vimb; # added 2015-01
   vimprobable2Wrapper = vimprobable2; # added 2015-01

From a7a49539839a7dec8658641b17847639f9e5e3c2 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 11 Feb 2016 16:31:43 +0100
Subject: [PATCH 1244/2285] alot: create top-level binding
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Since it’s an executable.
---
 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 662905129e51..55c77464fc08 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11216,6 +11216,8 @@ let
 
   alock = callPackage ../misc/screensavers/alock { };
 
+  inherit (python2Packages) alot;
+
   alpine = callPackage ../applications/networking/mailreaders/alpine {
     tcl = tcl-8_5;
   };

From 53f231d9e0a07dbdc7bc5fd19b323b6bfd4ea3b7 Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Thu, 11 Feb 2016 17:36:48 +0100
Subject: [PATCH 1245/2285] synergy: 1.7.4 -> 1.7.5

repository has moved
---
 pkgs/applications/misc/synergy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index ac60d9285876..16323bd22571 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -5,13 +5,13 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name = "synergy-${version}";
-  version = "1.7.4";
+  version = "1.7.5";
 
   src = fetchFromGitHub {
-    owner = "synergy";
+    owner = "symless";
     repo = "synergy";
     rev = "v${version}-stable";
-    sha256 = "0pxj0qpnsaffpaxik8vc5rjfinmx8ab3b2lssrxkfbs7isskvs33";
+    sha256 = "02zv8m7yagx80wi7m0ckglfqjqyrj6rd1gywxzqzl6841scmf87n";
   };
 
   postPatch = ''

From fc8a16f4edf052ba71ec7dcd289769fdf512ae87 Mon Sep 17 00:00:00 2001
From: Eric Litak <elitak@gmail.com>
Date: Thu, 11 Feb 2016 08:44:00 -0800
Subject: [PATCH 1246/2285] unifi: LD_LIBRARY_PATH hack for embedded
 libsnappyjava.so, fixes #12897

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

diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix
index be8f12ecd32d..4dc0cd96904c 100644
--- a/nixos/modules/services/networking/unifi.nix
+++ b/nixos/modules/services/networking/unifi.nix
@@ -61,6 +61,8 @@ in
       partOf = systemdMountPoints;
       bindsTo = systemdMountPoints;
       unitConfig.RequiresMountsFor = stateDir;
+      # This a HACK to fix missing dependencies of dynamic libs extracted from jars
+      environment.LD_LIBRARY_PATH = with pkgs.stdenv; "${cc.cc}/lib";
 
       preStart = ''
         # Ensure privacy of state

From 930fce89018526946b9f16db373fddf1f565e8f3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 11 Feb 2016 19:01:40 +0100
Subject: [PATCH 1247/2285] mcelog: 130 -> 131

Don't error out when MCE write fails.
---
 pkgs/os-specific/linux/mcelog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index 9abd6397e85c..c185d69c5540 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "mcelog-${version}";
-  version = "130";
+  version = "131";
 
   src = fetchFromGitHub {
-    sha256 = "05yszlhd6kljx371nlgrzjs0fi44wwgxcv2j5rwwgklm6ifp2zza";
+    sha256 = "1hqb06gdx5bw4jh6xix0z5qhi4956asykf43zk1m1mjsj8lkzaps";
     rev = "v${version}";
     repo = "mcelog";
     owner = "andikleen";

From fce433a6c04237d64037b48744e1cb6abf5cf8e7 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 11 Feb 2016 19:23:05 +0100
Subject: [PATCH 1248/2285] wcslib: 5.13 -> 5.14

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

diff --git a/pkgs/development/libraries/wcslib/default.nix b/pkgs/development/libraries/wcslib/default.nix
index 12741379aaaa..b6ca281f0530 100644
--- a/pkgs/development/libraries/wcslib/default.nix
+++ b/pkgs/development/libraries/wcslib/default.nix
@@ -1,14 +1,14 @@
 { fetchurl,  stdenv, flex }:
 
 stdenv.mkDerivation rec {
-  version = "5.13";
+  version = "5.14";
   name = "wcslib-${version}";
 
   buildInputs = [ flex ];
 
   src = fetchurl {
     url = "ftp://ftp.atnf.csiro.au/pub/software/wcslib/${name}.tar.bz2";
-    sha256 ="1rxlp7p1b84r9fnk7m9p2ivg2cajfj88afyccrg64zlrqn5kx66n";
+    sha256 ="0zz3747m6gjzglgsqrrslwk2qkb6swsx8gmaxa459dvbcg914gsd";
   };
 
   enableParallelBuilding = true;

From 8a35315a2000336f0f785022cd56968889d8f1e0 Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Thu, 11 Feb 2016 19:49:33 +0100
Subject: [PATCH 1249/2285] gollum: init at 4.0.1

---
 pkgs/applications/misc/gollum/Gemfile      |   2 +
 pkgs/applications/misc/gollum/Gemfile.lock |  55 +++++++
 pkgs/applications/misc/gollum/default.nix  |  18 +++
 pkgs/applications/misc/gollum/gemset.nix   | 170 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |   2 +
 5 files changed, 247 insertions(+)
 create mode 100644 pkgs/applications/misc/gollum/Gemfile
 create mode 100644 pkgs/applications/misc/gollum/Gemfile.lock
 create mode 100644 pkgs/applications/misc/gollum/default.nix
 create mode 100644 pkgs/applications/misc/gollum/gemset.nix

diff --git a/pkgs/applications/misc/gollum/Gemfile b/pkgs/applications/misc/gollum/Gemfile
new file mode 100644
index 000000000000..525f54838b75
--- /dev/null
+++ b/pkgs/applications/misc/gollum/Gemfile
@@ -0,0 +1,2 @@
+source 'https://rubygems.org'
+gem 'gollum'
diff --git a/pkgs/applications/misc/gollum/Gemfile.lock b/pkgs/applications/misc/gollum/Gemfile.lock
new file mode 100644
index 000000000000..074a0c6fa43b
--- /dev/null
+++ b/pkgs/applications/misc/gollum/Gemfile.lock
@@ -0,0 +1,55 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    charlock_holmes (0.7.3)
+    diff-lcs (1.2.5)
+    github-markup (1.3.3)
+    gitlab-grit (2.7.3)
+      charlock_holmes (~> 0.6)
+      diff-lcs (~> 1.1)
+      mime-types (~> 1.15)
+      posix-spawn (~> 0.3)
+    gollum (4.0.1)
+      gollum-lib (~> 4.0, >= 4.0.1)
+      kramdown (~> 1.8.0)
+      mustache (>= 0.99.5, < 1.0.0)
+      sinatra (~> 1.4, >= 1.4.4)
+      useragent (~> 0.14.0)
+    gollum-grit_adapter (1.0.0)
+      gitlab-grit (~> 2.7, >= 2.7.1)
+    gollum-lib (4.1.0)
+      github-markup (~> 1.3.3)
+      gollum-grit_adapter (~> 1.0)
+      nokogiri (~> 1.6.4)
+      rouge (~> 1.9)
+      sanitize (~> 2.1.0)
+      stringex (~> 2.5.1)
+    kramdown (1.8.0)
+    mime-types (1.25.1)
+    mini_portile2 (2.0.0)
+    mustache (0.99.8)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    posix-spawn (0.3.11)
+    rack (1.6.4)
+    rack-protection (1.5.3)
+      rack
+    rouge (1.10.1)
+    sanitize (2.1.0)
+      nokogiri (>= 1.4.4)
+    sinatra (1.4.7)
+      rack (~> 1.5)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    stringex (2.5.2)
+    tilt (2.0.2)
+    useragent (0.14.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  gollum
+
+BUNDLED WITH
+   1.10.6
diff --git a/pkgs/applications/misc/gollum/default.nix b/pkgs/applications/misc/gollum/default.nix
new file mode 100644
index 000000000000..1c58aec02332
--- /dev/null
+++ b/pkgs/applications/misc/gollum/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, lib, bundlerEnv, ruby_2_2, icu, zlib }:
+
+bundlerEnv rec {
+  name = "gollum-${version}";
+  version = "4.0.1";
+
+  ruby = ruby_2_2;
+  gemfile = ./Gemfile;
+  lockfile = ./Gemfile.lock;
+  gemset = ./gemset.nix;
+
+  meta = with lib; {
+    description = "A simple, Git-powered wiki";
+    license = licenses.mit;
+    maintainers = with maintainers; [ jgillich ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/applications/misc/gollum/gemset.nix b/pkgs/applications/misc/gollum/gemset.nix
new file mode 100644
index 000000000000..f0c71fa455cf
--- /dev/null
+++ b/pkgs/applications/misc/gollum/gemset.nix
@@ -0,0 +1,170 @@
+{
+  useragent = {
+    version = "0.14.0";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "124r3mgkw1zjymsqq9r25zh1vwjrjgiji5fm620z53lpmmryj22j";
+    };
+  };
+  tilt = {
+    version = "2.0.2";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lkd40xfdqkp333vdfhrfjmi2y7k2hjs4azawfb62mrkfp7ivj84";
+    };
+  };
+  stringex = {
+    version = "2.5.2";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "150adm7rfh6r9b5ra6vk75mswf9m3wwyslcf8f235a08m29fxa17";
+    };
+  };
+  sinatra = {
+    version = "1.4.7";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1b81kbr65mmcl9cdq2r6yc16wklyp798rxkgmm5pr9fvsj7jwmxp";
+    };
+  };
+  sanitize = {
+    version = "2.1.0";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3";
+    };
+  };
+  rouge = {
+    version = "1.10.1";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0wp8as9ypdy18kdj9h70kny1rdfq71mr8cj2bpahr9vxjjvjasqz";
+    };
+  };
+  rack-protection = {
+    version = "1.5.3";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
+    };
+  };
+  rack = {
+    version = "1.6.4";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5";
+    };
+  };
+  posix-spawn = {
+    version = "0.3.11";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "052lnxbkvlnwfjw4qd7vn2xrlaaqiav6f5x5bcjin97bsrfq6cmr";
+    };
+  };
+  nokogiri = {
+    version = "1.6.7.2";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "11sbmpy60ynak6s3794q32lc99hs448msjy8rkp84ay7mq7zqspv";
+    };
+  };
+  mustache = {
+    version = "0.99.8";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g5hplm0k06vwxwqzwn1mq5bd02yp0h3rym4zwzw26aqi7drcsl2";
+    };
+  };
+  mini_portile2 = {
+    version = "2.0.0";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "056drbn5m4khdxly1asmiik14nyllswr6sh3wallvsywwdiryz8l";
+    };
+  };
+  mime-types = {
+    version = "1.25.1";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8";
+    };
+  };
+  kramdown = {
+    version = "1.8.0";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ryqq055h5n10c1cfba6pxsssa907l2hkw29anp0d41ryh47ca2l";
+    };
+  };
+  gollum-lib = {
+    version = "4.1.0";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "01s8pgzhc3cgcmsy6hh79wrcbn5vbadniq2a7d4qw87kpq7mzfdm";
+    };
+  };
+  gollum-grit_adapter = {
+    version = "1.0.0";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "02c5qfq0s0kx2ifnpbnbgz6258fl7rchzzzc7vpx72shi8gbpac7";
+    };
+  };
+  gollum = {
+    version = "4.0.1";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "02pgx083sns75zgnqx94p5h5bpr7cfiw5mys4ayb4k33hcjm6ydg";
+    };
+  };
+  gitlab-grit = {
+    version = "2.7.3";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nv8shx7w7fww8lf5a2rbvf7bq173rllm381m6x7g1i0qqc68q1b";
+    };
+  };
+  github-markup = {
+    version = "1.3.3";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "01r901wcgn0gs0n9h684gs5n90y1vaj9lxnx4z5ig611jwa43ivq";
+    };
+  };
+  diff-lcs = {
+    version = "1.2.5";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1";
+    };
+  };
+  charlock_holmes = {
+    version = "0.7.3";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jsl6k27wjmssxbwv9wpf7hgp9r0nvizcf6qpjnr7qs2nia53lf7";
+    };
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 662905129e51..be33897d1a91 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12225,6 +12225,8 @@ let
     inherit (gnome) GConf;
   };
 
+  gollum = callPackage ../applications/misc/gollum { };
+
   google-chrome = callPackage ../applications/networking/browsers/google-chrome { gconf = gnome.GConf; };
 
   googleearth = callPackage_i686 ../applications/misc/googleearth { };

From b861bf8ddff677031e93a8e1c55311be63e0eb63 Mon Sep 17 00:00:00 2001
From: Ben Booth <benwbooth@gmail.com>
Date: Thu, 11 Feb 2016 12:05:15 -0800
Subject: [PATCH 1250/2285] Remove double-backslashes from grub conf file

The double-backspashes in the splashimage, kernel, and initrd sections serve no purpose and confuse pygrub
---
 nixos/modules/system/boot/loader/grub/install-grub.pl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index b8ef02da4bc2..8da564bda150 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -228,7 +228,7 @@ if ($grubVersion == 1) {
     ";
     if ($splashImage) {
         copy $splashImage, "$bootPath/background.xpm.gz" or die "cannot copy $splashImage to $bootPath\n";
-        $conf .= "splashimage " . $grubBoot->path . "/background.xpm.gz\n";
+        $conf .= "splashimage " . Cwd::abs_path($grubBoot->path . "/background.xpm.gz") . "\n";
     }
 }
 
@@ -327,9 +327,9 @@ sub addEntry {
     my ($name, $path) = @_;
     return unless -e "$path/kernel" && -e "$path/initrd";
 
-    my $kernel = copyToKernelsDir(Cwd::abs_path("$path/kernel"));
-    my $initrd = copyToKernelsDir(Cwd::abs_path("$path/initrd"));
-    my $xen = -e "$path/xen.gz" ? copyToKernelsDir(Cwd::abs_path("$path/xen.gz")) : undef;
+    my $kernel = Cwd::abs_path(copyToKernelsDir(Cwd::abs_path("$path/kernel")));
+    my $initrd = Cwd::abs_path(copyToKernelsDir(Cwd::abs_path("$path/initrd")));
+    my $xen = -e "$path/xen.gz" ? Cwd::abs_path(copyToKernelsDir(Cwd::abs_path("$path/xen.gz"))) : undef;
 
     # FIXME: $confName
 

From 39bd42e650b5a6496b4ba2553fda5f1f4dfff2b3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 11 Feb 2016 21:34:49 +0100
Subject: [PATCH 1251/2285] libpsl: list 2016-02-06 -> 2016-02-09

---
 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 d4d24db84b9d..535c5cfeb65b 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -3,10 +3,10 @@
 
 let
 
-  listVersion = "2016-02-06";
+  listVersion = "2016-02-09";
   listSources = fetchFromGitHub {
-    sha256 = "0jh1fbfyi9zdhw77brfdkw7mcbr03dqww8yv703kp69fqhyf2pln";
-    rev = "0efc1a2f0ec93163273f6c5c2f511a19f5cd5805";
+    sha256 = "17jxkwdd2l6aycg2q5img8gad3pb9k6fgikf87dybl3ydn0bpdja";
+    rev = "73668f743df8125477d38690807e3a9a1e1e9f19";
     repo = "list";
     owner = "publicsuffix";
   };

From be0abb32f6a049fc5713f6b9235f01e4c6a1efcf Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 11 Feb 2016 21:36:33 +0100
Subject: [PATCH 1252/2285] miniupnpd: 1.9.20160113 -> 1.9.20160209

Changes: https://github.com/miniupnp/miniupnp/blob/master/miniupnpd/Changelog.txt
---
 pkgs/tools/networking/miniupnpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index e88ae7a1403e..7334ecc3e92e 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "miniupnpd-1.9.20160113";
+  name = "miniupnpd-1.9.20160209";
 
   src = fetchurl {
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "084ii5vb54rr8sg50cqvsw5rj6linj23p3gnxwfyl100dkkgvcaa";
+    sha256 = "0r4giqsr39s17mn9lmmy3zawrfj7kj9im7nzv7mx3rgz2ncw092z";
     name = "${name}.tar.gz";
   };
 

From 2671d4ffdbdb016439ce978aef5534367c407413 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 12 Feb 2016 00:14:01 +0100
Subject: [PATCH 1253/2285] wireless-regdb: 2015-12-14 -> 2016-02-08

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

diff --git a/pkgs/data/misc/wireless-regdb/default.nix b/pkgs/data/misc/wireless-regdb/default.nix
index 123cb7a62089..3c74123d605e 100644
--- a/pkgs/data/misc/wireless-regdb/default.nix
+++ b/pkgs/data/misc/wireless-regdb/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "wireless-regdb-${version}";
-  version = "2015-12-14";
+  version = "2016-02-08";
 
   src = fetchgit {
-    sha256 = "1ldfcxn3mdb104czy78b7nj1clsbfp8fc6mshix98zq0bg4k7rsm";
+    sha256 = "0cqnkkcni27ya6apy2ba4im7xj4nrhbcgrahlarvrzbbjkp740m9";
     url = https://git.kernel.org/pub/scm/linux/kernel/git/sforshee/wireless-regdb.git;
     rev = "refs/tags/master-${version}";
   };

From ccf73a5f675cf969ef78f948495a8156501bceff Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 12 Feb 2016 00:17:39 +0100
Subject: [PATCH 1254/2285] cassandra: 2.1.12 -> 2.1.13

---
 pkgs/servers/nosql/cassandra/2.1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/cassandra/2.1.nix b/pkgs/servers/nosql/cassandra/2.1.nix
index cac8eb3fba81..d0f70a554f7e 100644
--- a/pkgs/servers/nosql/cassandra/2.1.nix
+++ b/pkgs/servers/nosql/cassandra/2.1.nix
@@ -11,8 +11,8 @@
 
 let
 
-  version = "2.1.12";
-  sha256 = "0ngibzw7lx2nppzsq5hn6adbkyzns6bnhsrkllqpimyjf27sjfq1";
+  version = "2.1.13";
+  sha256 = "09b3vf5jsv70xlfimj30v8l1zw7c5xdgpw5fpmn6jh8n3gigybqh";
 
 in
 

From 447851b9d28211f93faf41a0cd9809aee14241e4 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 11 Feb 2016 23:31:41 +0000
Subject: [PATCH 1255/2285] jruby: 1.7.21 -> 9.0.5.0

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

diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index bc76abb45460..1d05f9406b45 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -3,17 +3,17 @@
 stdenv.mkDerivation rec {
   name = "jruby-${version}";
 
-  version = "1.7.21";
+  version = "9.0.5.0";
 
   src = fetchurl {
-    url = "http://jruby.org.s3.amazonaws.com/downloads/${version}/jruby-bin-${version}.tar.gz";
-    sha1 = "4955b69a913b22f96bd599eff2a133d8d1ed42c6";
+    url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz";
+    sha256 = "1wysymqzc7591743f2ycgwpm232y6i050izn72lck44nhnyr5wwy";
   };
 
   buildInputs = [ makeWrapper ];
 
   installPhase = ''
-     mkdir -pv $out
+     mkdir -pv $out/docs
      mv * $out
      rm $out/bin/*.{bat,dll,exe,sh}
      mv $out/COPYING $out/LICENSE* $out/docs

From 6d3f909975c8288c8ff8bcbcbd849725a40a86f6 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Fri, 12 Feb 2016 10:15:23 +0900
Subject: [PATCH 1256/2285] firefox-bin: 44.0.1 -> 44.0.2

---
 .../browsers/firefox-bin/sources.nix          | 358 +++++++++---------
 1 file changed, 179 insertions(+), 179 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/sources.nix b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
index ba9bae4ff920..31ec6f313a8b 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/sources.nix
@@ -4,185 +4,185 @@
 # ruby generate_sources.rb > sources.nix
 
 {
-  version = "44.0.1";
+  version = "44.0.2";
   sources = [
-    { locale = "ach"; arch = "linux-i686"; sha256 = "eefd2889153dc96737781580089fb0db11e02118d9b6e57da3f25ae586e56597"; }
-    { locale = "ach"; arch = "linux-x86_64"; sha256 = "80c7e6efe4334fbdc7060f779a4cb559ebc4516adcd6bdf9f22a986e75e809cd"; }
-    { locale = "af"; arch = "linux-i686"; sha256 = "452595636217272dde5adc98202fd39204fe6e9d5fb82c942499b5b27db38bd2"; }
-    { locale = "af"; arch = "linux-x86_64"; sha256 = "1e746adb9cadaa0ae7014b9b88076ae622f846f117465609367808ee351b33c2"; }
-    { locale = "an"; arch = "linux-i686"; sha256 = "4bbcc5ba7d917ff4a824c917a204710305bc500b990c0449a905adb967a2e851"; }
-    { locale = "an"; arch = "linux-x86_64"; sha256 = "2f724f9ccf43b419df2b70d9dfc4ebe779c332a398d17a38e761367de56ed658"; }
-    { locale = "ar"; arch = "linux-i686"; sha256 = "a9827a7430453c0485708d4473e5267f00127940c9878b9ba67a4698d3efbe1a"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha256 = "3422c0378d7fd37efdcdf56fecfc0295414ed3911ceac1f96fc21e6d7775363d"; }
-    { locale = "as"; arch = "linux-i686"; sha256 = "5c6d72b827db06cf813d80ebfb78a79b24e1037ba53e61b1fb51ed43bb841671"; }
-    { locale = "as"; arch = "linux-x86_64"; sha256 = "09132af34d7ada1657a466243a17517de4aa7f6f62bf10af777da3a619b465a1"; }
-    { locale = "ast"; arch = "linux-i686"; sha256 = "b544ded04a9fc7c7cc2d67cc70a3290c483cec18fe443f51d0f897aa3f60c416"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha256 = "6dda16d4f4eb05674cf6b29940241d99322793b5d306fe7c61ad17573ffdc3f0"; }
-    { locale = "az"; arch = "linux-i686"; sha256 = "c115cbdbf94d7fa0c008e676c9c39429d13f702fca70f656cd571ac008a74772"; }
-    { locale = "az"; arch = "linux-x86_64"; sha256 = "639547d368a06150405ae8bb12354db3c03fbe602410a89e21709b7f6617f24a"; }
-    { locale = "be"; arch = "linux-i686"; sha256 = "7144c4b0dffec65578b4211a04962bcd93b312977dc61356f0d4f6f6a75c872d"; }
-    { locale = "be"; arch = "linux-x86_64"; sha256 = "57504daaa8d8d02877949dbc14a6791ef6205712e3dfe70e6a46cc76f9b6725a"; }
-    { locale = "bg"; arch = "linux-i686"; sha256 = "e198c83f7986bee52b772bd44d8642d0b4385262c93cd73423fbb8d9b97c96e6"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha256 = "cb66cc10fba3ea5cfab4461f0bd2d26cc1f0816770baf16fd74bda27f6566c8e"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "c31e2c1aa1ce0965f800b13e88127b02d47657519edead877a5c32c5420acabb"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "00bfd63c8950879217ed045caa5d19839e1c9fb38eeeaad933c23eaadeba7296"; }
-    { locale = "bn-IN"; arch = "linux-i686"; sha256 = "580d9f884aba059968d25e25c2c112318d8015eb5fa29013cf96f49fd620b039"; }
-    { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "30029721b59b1e7fbce580e58019922e61ae751712ca27300c9a125a453e7853"; }
-    { locale = "br"; arch = "linux-i686"; sha256 = "67e682bfca447d11d2433fa1977e482a9693842e3f98c199afb1b8e41774e9e7"; }
-    { locale = "br"; arch = "linux-x86_64"; sha256 = "8442b995879ab6120bdd259606231b0daf8619abe099a1525f826611a5c34347"; }
-    { locale = "bs"; arch = "linux-i686"; sha256 = "72f78a32441a03232ae22d86ac0023674b7d6ed57ea9990244252bea35a8b681"; }
-    { locale = "bs"; arch = "linux-x86_64"; sha256 = "cfdf126ffbfb3b8359c8d01e72fb1e462df102eb458021e66295b5754065b72a"; }
-    { locale = "ca"; arch = "linux-i686"; sha256 = "53bccb498b5510de99f4d54a5c279f499a92a8fbbec79be68737ef06e5c18325"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha256 = "6905d7d8f8cae2192af022cbfe158b77ee02afa26f25e5ade6cfd747a8836119"; }
-    { locale = "cs"; arch = "linux-i686"; sha256 = "7d8e61f1021064c41f8f6b82ae50dff272f64242d6ab289722a0ee246b141b1f"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha256 = "409d1b2c1ce1ae294c530acde139bca076fa20d71825007f08698b51ef0a30b2"; }
-    { locale = "cy"; arch = "linux-i686"; sha256 = "fc982e9355ea15ff40c998def2f3983933077fc726eab348fbd6ec72d3369cec"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha256 = "6a61f1ec194b6235561f2420fba7477a549eeadc3b54dd013c7754dc3c75180b"; }
-    { locale = "da"; arch = "linux-i686"; sha256 = "7ffbbc279ee6bf587847b4f66c8a5ab968163410a6c9c84227f0df25366f892b"; }
-    { locale = "da"; arch = "linux-x86_64"; sha256 = "7601928a20df30262df46ed1a1127fcfa4710ee7bdc951cb3ef295e20a2e2fea"; }
-    { locale = "de"; arch = "linux-i686"; sha256 = "b3a079e15c3551b9b62c4cf11decacfaafac6f8e1765c6d19c53aaadbeaa9e8d"; }
-    { locale = "de"; arch = "linux-x86_64"; sha256 = "0b13215b6f1768735cf58b87dc76b3248d196acfd21377da2095177ea8e6072d"; }
-    { locale = "dsb"; arch = "linux-i686"; sha256 = "568c330a6c397b45cc416d7b4f0086ec75077690ca6902bc7931e795b6eb9848"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "17a0be9e81a35aee281c32a78cfd3c7d34455560d29c423cdf91e8142cc1389d"; }
-    { locale = "el"; arch = "linux-i686"; sha256 = "77e4a8fe8da982bda24767d7ff499ffb835ac28599933bba7465e7fa90232461"; }
-    { locale = "el"; arch = "linux-x86_64"; sha256 = "8b48f3a412c60c4619c210724372611b7b701c5db21b805ca854aef3c823d83d"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha256 = "def26268d266206a8c2b8f5f0b91a74224a1b2d54c70790e00389593e703d09c"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "9c1f7d3ab81a025434023551b77021750634f9a468bc8d892be7e13ccaa7914c"; }
-    { locale = "en-US"; arch = "linux-i686"; sha256 = "fda066d70c87669f69c035af9bef327948f71b07c347633967bdd5c78c02beff"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "bf9d192670b516f393c20292580661b323e2ac88c90771b6834d0f46e86823c1"; }
-    { locale = "en-ZA"; arch = "linux-i686"; sha256 = "9e643d372d31cd1cbc376f7cd3a8e8da95adfdec62057e789bb4be7cda5afe66"; }
-    { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "b109109d6c2efa55c68778eaa21d7ada28074ad3008fe4a123107f962240a2ad"; }
-    { locale = "eo"; arch = "linux-i686"; sha256 = "8ae463d0f9608689bc4f9d60ceaa30260cf40b6408a2477a542e8fccb2c94b6b"; }
-    { locale = "eo"; arch = "linux-x86_64"; sha256 = "6853d5d4834839070325a2a5cfbb0610891cf774d015f2d43d9cf42435e0f2df"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha256 = "fa0a952c771cd5e124c66066854767141667678cc281f783ab179f71c0a935b0"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "434fd1e7a9ce25a649c7078396319a8234e96bb535b45b2edc02fc9c9e38c04b"; }
-    { locale = "es-CL"; arch = "linux-i686"; sha256 = "d95d1cbfd606be0b41d6281c6e2c60d53fb96bb1afcbaf3bc8331cc2dca4041a"; }
-    { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "118dca4966717667718b08b238466cab116683e91bcc9c3260990b89192e3e3e"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha256 = "efbe0a6c224d2593df791fbcd3b149dc157d9ae114aa8e2ad170e987da6d74e7"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "80d5a5dcfa14b1bf77b665e668fd7734d51251a5f908fcacbe73690116dac466"; }
-    { locale = "es-MX"; arch = "linux-i686"; sha256 = "7786740923cb23542f0c9fc94169f4850e4f47c9ef4ee190e6995e6593374858"; }
-    { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "e8e281e6594bd3d6f8b6ac0fd13ce8794df59a72f33396247183aa10c5a33f75"; }
-    { locale = "et"; arch = "linux-i686"; sha256 = "71d575d33f9f4cea252e87d000c9d0660174c247b2ccb41421891eede42bcb1f"; }
-    { locale = "et"; arch = "linux-x86_64"; sha256 = "5408fb992704293a2da2ebf1c671adb919c5b81e3031be81b51d18a470276d94"; }
-    { locale = "eu"; arch = "linux-i686"; sha256 = "d11baf3547455e0d9c6ee5bef5a8cd421cead916e70eb83f451fcfadeea87a46"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha256 = "04c0c262f965d995f5ec0954d160c86ab5c9404f6b443b7309f6588174a348c5"; }
-    { locale = "fa"; arch = "linux-i686"; sha256 = "97f8929a4d73e726d11c79b539ba8bf7d9ee7662416e1ab3ab7ed9215bd4c028"; }
-    { locale = "fa"; arch = "linux-x86_64"; sha256 = "77074015a70137a14a86079cae6d548d8b1d5aaef7c1d729a6681289bbc74905"; }
-    { locale = "ff"; arch = "linux-i686"; sha256 = "e9f29243dc0b1d82a749383e6608a7e166dda840695321ee79d4bdca001f2683"; }
-    { locale = "ff"; arch = "linux-x86_64"; sha256 = "8debed13660e6565b4f80d0c7383642db5e38cc0a69baeb26a3fa54d3e5299a4"; }
-    { locale = "fi"; arch = "linux-i686"; sha256 = "f9832f9093953cada6091157c55f3d4ceff8c8fefa4c8c2f8db51d25b7d6d4d1"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha256 = "e01613a01cfc5ae121f16b58321d94a202d3e07e8a09793c307d48eccc176c93"; }
-    { locale = "fr"; arch = "linux-i686"; sha256 = "11c923e8565c7275656486e44e0109b15037ea9fb3476e53a353b9a8c6896c62"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha256 = "483944f87a6b6d9f9e5ad1720b497ea47e4260b0e87e91f9d7ef1f274f38506e"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "60e177657a81b5b1378563519b9dd0d23f2268b5b77d4880ea289522ef2fae14"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "6e4eaa7dbeae9090e0bce8dbabcb3b83c97822a387cfa940029f9bc3610532e9"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "9638bd74f130f13e16da5e743f484b4f5e8672bd4b196c646932dfd0e13e71b8"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "f8166135dea1d167c2eb686786d39ac32c2a9765b3fdf23a26b17550a2e93adb"; }
-    { locale = "gd"; arch = "linux-i686"; sha256 = "1111deb031ed3b4a8954184ac34a03e765ee044712f921f63d15a5e6def971c0"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha256 = "7c9866a8220186ae5c573871829521815241ecba134ebeabd5c18d58f494b414"; }
-    { locale = "gl"; arch = "linux-i686"; sha256 = "5c7739d6299b19b4cda00daea19e81efc7b9ae6d3a4716de8ade143e8e053c3d"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha256 = "02f4090f0c010121b3731ca8a92e0f29c10f97db7fe96309bae4b88e16e853e4"; }
-    { locale = "gu-IN"; arch = "linux-i686"; sha256 = "fc771898a75e7f8ace3d9093db82bd2648e91480d686bcebe4d6496555af2ff6"; }
-    { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "5492053dea2f4d809b5025d77cd38a710414b06e7e37bf2840b2ec4f6039e591"; }
-    { locale = "he"; arch = "linux-i686"; sha256 = "92a45496fdf3da5dd1ccb640d5223c1275e0e23f56246b1d82f0dd1856fe3954"; }
-    { locale = "he"; arch = "linux-x86_64"; sha256 = "b79a5112eaaed46b32cc9c54a3c0419cccf342ea8cfb421466e0837d6096a269"; }
-    { locale = "hi-IN"; arch = "linux-i686"; sha256 = "c7b2e3acb3b6707060ee0b62477a41ba0714a2b3d22e095abefab6938da4bd39"; }
-    { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "1f4492a3c7d0a2b4f88cd256a68c2038d6d145b461b40ffe79e3e7452af06b55"; }
-    { locale = "hr"; arch = "linux-i686"; sha256 = "d7e2291798e6a54c87fa53409f530cbb36ddea001534eaa0c038305e8aa46d38"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha256 = "9295c24919f3094cdbe89e840e5fdfe73ce9588d0b1108d328c6613ae3b1e829"; }
-    { locale = "hsb"; arch = "linux-i686"; sha256 = "cc38ff9f7e0746b2412cbfebec60c44cb0f0c4a92a8b80cd61d5f9eb3e22cb4a"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "8d9afe825ef721726edab87e6f648ed136eb7e13c5acaa59499a55898e2b74cd"; }
-    { locale = "hu"; arch = "linux-i686"; sha256 = "0e6829af6f5e955cbcd7192e94a613909369ef302349e7d8a45f8cd11df51613"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha256 = "16779aa3f754ca4a211d5489d54c15c49673d96fdfa4b64f0e6050b8f1517973"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "3e4cefe678a7f30153690f9d8b1545fc5805c62ccd0af7f1c3172a0dc4dc6772"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "363cac6106e008fe83b80f1c1c2981b46b890c1c2447b7ad4bde9cf7eea19e45"; }
-    { locale = "id"; arch = "linux-i686"; sha256 = "e3710c2b10ce747e15fa07a426fb2f97983637e9f73eeb0c3d064f2b8bacda6e"; }
-    { locale = "id"; arch = "linux-x86_64"; sha256 = "dfc2a2c1306b624e2cf9b6b4fc3c33ba9b622612f455760674103a78beebfc14"; }
-    { locale = "is"; arch = "linux-i686"; sha256 = "302d96499bf095bfe7c6c765edb197c5d5bf1c90e1dc86ad966f6185aee6873b"; }
-    { locale = "is"; arch = "linux-x86_64"; sha256 = "409fcec5ed65941cd60e78c4321f7c4d80bf8fd225065cf651d4e7db92649506"; }
-    { locale = "it"; arch = "linux-i686"; sha256 = "52e17f9210042f1eb116ec4328b136ece380ebb93fbd05190d475b7cf5617e14"; }
-    { locale = "it"; arch = "linux-x86_64"; sha256 = "cbf8b9c62616b19c448995c22563bcc4c68b6c5cbb6e59ab232115ec8bd0bc6b"; }
-    { locale = "ja"; arch = "linux-i686"; sha256 = "8da7f153541aa283454e4143ca09e3307660b429a48bca3122b7df87b4122812"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha256 = "0eaf62dc5d97ddb35ae1c7589e3cef92a345d89f6cb8f0ac177f3991123eee2c"; }
-    { locale = "kk"; arch = "linux-i686"; sha256 = "22ea4fba5f7b2a64c7f71b68488a00fb1d18a2cc05bdfdede7481ba8fc2b5b53"; }
-    { locale = "kk"; arch = "linux-x86_64"; sha256 = "0bd0fed9e8ed8531e8b7759021afdd08ff45a3d235193c6434c630efa72f2073"; }
-    { locale = "km"; arch = "linux-i686"; sha256 = "957958b0b411c7a92bb00cadec9cd766884f9900907420d976eb84c435de22c2"; }
-    { locale = "km"; arch = "linux-x86_64"; sha256 = "c8cbef947210e4a4c397ebd366128166ba16c59f960eed9ebe1c044918169c9d"; }
-    { locale = "kn"; arch = "linux-i686"; sha256 = "0616551d7e9622227dac6d95f188fd3d11ff3b93b042c3b793447622b6affebc"; }
-    { locale = "kn"; arch = "linux-x86_64"; sha256 = "a4914b4b950884b8bdf2b4ba65a017f813d136d0c30ed1199a51ab7394504cb1"; }
-    { locale = "ko"; arch = "linux-i686"; sha256 = "c47331bb4a65f2a024b9c2d283f9a289e623e0713e4e7a715124ca3e042f1c57"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha256 = "bc11ea2d206ab1588c01e862770b321f99a6947a5c13baab266c1ac5104ae4be"; }
-    { locale = "lij"; arch = "linux-i686"; sha256 = "ea8ad910b666fca73c7312fb338108b2c8d9413595094ae3fe3aa359d2032147"; }
-    { locale = "lij"; arch = "linux-x86_64"; sha256 = "dedde2eae271be10923ab62e56575c5f9216d9c2b9126e745248f9744177ad94"; }
-    { locale = "lt"; arch = "linux-i686"; sha256 = "b106645051269bd594418f71b237b569d51cf85de2cf656d787ace395823fd72"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha256 = "914b64772231951b41dc3a2cd4e625098809046f7f156f958e170d2f72d50511"; }
-    { locale = "lv"; arch = "linux-i686"; sha256 = "03dffd9f7f24533034828f4c7cbf5c14337927b930b814e010c187797ce995c5"; }
-    { locale = "lv"; arch = "linux-x86_64"; sha256 = "c29d6ffd56da153e87da73ddf5ea3db7de143949809081db9f2efdc7bd79d828"; }
-    { locale = "mai"; arch = "linux-i686"; sha256 = "db4a4f3414491641de0e91b0f66eee7f6262640fc258d3ba15cabdf9b3deb5eb"; }
-    { locale = "mai"; arch = "linux-x86_64"; sha256 = "a39711b8769a8e9b2e78dc587e364d7c731538202cd72c0257fbda9cc691196d"; }
-    { locale = "mk"; arch = "linux-i686"; sha256 = "01eb8c625a3ffb68f7dd5fbaac8333bdfbfb6f4284510fc163d3d3db39e1465c"; }
-    { locale = "mk"; arch = "linux-x86_64"; sha256 = "3cb0b8c6655714ca24e345093ba1b5a5380856ec1f9df04ed2b6f0399c61e2b5"; }
-    { locale = "ml"; arch = "linux-i686"; sha256 = "b00a9d53bc27950ec451a7861ac0e34d9d1d04c7e6417c767f47f799380cefaf"; }
-    { locale = "ml"; arch = "linux-x86_64"; sha256 = "e2b53074478efc093e21e5f74ceeaac796a32bb0be347d4023b6d9a8fda99b98"; }
-    { locale = "mr"; arch = "linux-i686"; sha256 = "2d3b2ee4a0a6527ee284a29b38040208639e31fcae75acac94789f0eae0b7ca2"; }
-    { locale = "mr"; arch = "linux-x86_64"; sha256 = "4262cccf8feb6cabe08b2e4d0932666d962ad42214b69a6cf0d55e9c9fc04219"; }
-    { locale = "ms"; arch = "linux-i686"; sha256 = "f957096ac48ffec8430a5351c0697155847ca59ea391d64c6d8111713ff20453"; }
-    { locale = "ms"; arch = "linux-x86_64"; sha256 = "0e69c0a2f3de0207a0cf0ca3e27fcf6141920bdaa9759bf5567b40ed0e33032c"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "8c77863e64a57c4435e50e349eccc8934e128b9ae78904e93e7beb03d8632847"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "7a64b47f81a484970ea7ff5aa49936deb5ea4db6cefcbaf30c6bbe4c5caf2fc6"; }
-    { locale = "nl"; arch = "linux-i686"; sha256 = "a6c3e8aa9c9f59d41c098b7db0ee4b5a1deee33fac7934bf99880d35f97b855b"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha256 = "261c4401ede66816fb58aadab5c335841bd7c416a6fc1f2bed6c7dae4e987c54"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "d8c567a1d99c9d353d046219a9377236a046f4184e2af1c976a7cd000bc2adda"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "9a1356a688e7b9a6c0cbdc26585098310c9c2ca28f8ad1cad89f8dc4fcd157ca"; }
-    { locale = "or"; arch = "linux-i686"; sha256 = "cf46bd9016a66144c16f455feaa7c019f06c3514319b3f524c6abf05862e4245"; }
-    { locale = "or"; arch = "linux-x86_64"; sha256 = "18eed44e7431dd291b77f269e1b5c97142bc8928a8db09bb160999dafa3fdeca"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "4786b4b875da508bafe22c946e0c970f6f1024154c17b80411333ee2ab9b0ee1"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "075fe980df865eb6832956938c76fad0890edbaf22a6514997004fbb591fac66"; }
-    { locale = "pl"; arch = "linux-i686"; sha256 = "2b36f39eb98c2fde698df2bdb7e93efb8f54df2758a8fa0b8cec9ff4c084def9"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha256 = "de3e50631b67a5f3a52c92a9e5aae88397f957367808ebc753eef1f759a135a2"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "db9b2610264f93b2202de4794c1b109ef52d45bd453ed9907058e334c54e2616"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "b3424f2d933a9435ba8db2910c8f13c722beacaeb34f3c47b7369d41e1ef8a67"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "99368ef9c5f580973bd8eb21b24acf1794e9337a6faea98690378888b9185fa8"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "1e2b0c75b2451fdfb355f2ce7d1a7068106c1228aa1eb8f8c56d789e02bec5d5"; }
-    { locale = "rm"; arch = "linux-i686"; sha256 = "0da9cf51a6be5e25c9e711618f15743bee1a735eaa6fb4804589fa9d4b0513fe"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha256 = "fb6b8af9cb51a5bbde5345ed2814fd22b73c25905a8fb9ec304fcaf4b6589584"; }
-    { locale = "ro"; arch = "linux-i686"; sha256 = "8e6d9f35fbc8da78e0074cb830245804450fc6beebd049f9a4db18c627ee543b"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha256 = "b93817243d9709106148143f052c103758bc6290aecc6282a73b8e81632dc1de"; }
-    { locale = "ru"; arch = "linux-i686"; sha256 = "db0048c6ce2ab732513e09bb216b4d8732c9647f29729ebac1f95a7bda3f41b8"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha256 = "79d37bb0d64ff0c723063b4130a9a7b81e59518ed3416bd9fcf623e045c45013"; }
-    { locale = "si"; arch = "linux-i686"; sha256 = "a69dcffbc4e48881eac39f6708dfa419748852c315b232ee5f20df8daf3bb772"; }
-    { locale = "si"; arch = "linux-x86_64"; sha256 = "22b0dfecf78b254960f12d52d8e41ae4e54a73efc50bda2bec73306b6eabb967"; }
-    { locale = "sk"; arch = "linux-i686"; sha256 = "9e8d8766f8814bdeaed905cb8b58ece1b346ce8a57f3d7f21a3371cabbd8a994"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha256 = "b40d8fc6d23ec5d1b11c46354d5b3cb0e8d661880fce50dbf030bda50794f8b1"; }
-    { locale = "sl"; arch = "linux-i686"; sha256 = "e58fec03764019c33718bb520c76e8032548543f1bd25b6d8d6f6861a3a902a3"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha256 = "505a59db3c1db1e96a3f99d828c0c43dc812f58e83b1cd6cb067d3628df49f2b"; }
-    { locale = "son"; arch = "linux-i686"; sha256 = "feeea081020fccecbaeb90b79aff7ce2d132f3f9a7d0e848dab3060a06c7e876"; }
-    { locale = "son"; arch = "linux-x86_64"; sha256 = "bf98080f7ca39d9bfc1a5bafe38a66efbbf4a657019306321e13427d813ad3ab"; }
-    { locale = "sq"; arch = "linux-i686"; sha256 = "858790b16a8c642cd5f76e4d57de5f215514e470bdfa0449e44a4c97d1245b7e"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha256 = "c7f6c20a9436f3a0210010c6f90a1330ca4f3afa4091c6a2256c23021651d898"; }
-    { locale = "sr"; arch = "linux-i686"; sha256 = "77352b54412e869c66bbb73bc66dd333a1f5675d8f13d114486186a9478f92c5"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha256 = "158171775a7b9f8dc0ae87226faac2626a25f8debb5b4d3b0beac3fab2f502d0"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "70ea2d79b1c27615c7d021bdbf0e2a355f46c6e80a91485b6488b03b61266322"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "1aecd8b1a86bccba2a5cff18346bae5c2bc0e2ea8565f30fcc85bdcca2ec4eb2"; }
-    { locale = "ta"; arch = "linux-i686"; sha256 = "cd97638e80460532e1ca0b14608f0bca63e019fd2c9fa39330410a7763894cf8"; }
-    { locale = "ta"; arch = "linux-x86_64"; sha256 = "06a46a9292681557c308aa44e09bfb6cd1a2c3af742a635aa6cc101aa8d6964f"; }
-    { locale = "te"; arch = "linux-i686"; sha256 = "fe15c02885127189ccf444e7ddd4aaab0d70b67c5e90c17ac46ba1e78956ffed"; }
-    { locale = "te"; arch = "linux-x86_64"; sha256 = "2858c26770951a4d449bfa3d5be2421e34bf26132d34efd933f15397b572b7ae"; }
-    { locale = "th"; arch = "linux-i686"; sha256 = "eaf57742712cc584f0a436aa545db0753bc23c6f023a1199886efc11946e7566"; }
-    { locale = "th"; arch = "linux-x86_64"; sha256 = "0a24697e91b6e69fcfb0dba89eac2001766d28b7a02ab3d889ed18e3af05e3ed"; }
-    { locale = "tr"; arch = "linux-i686"; sha256 = "395e18eb8c77cf20cc99de961b6c09b1d2a4a987384225f0d13c8cefbb5edd65"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha256 = "cdf8a47e0b38af8e6749ce8efff8811e6f0fc8fd497bb046cda9523757976edb"; }
-    { locale = "uk"; arch = "linux-i686"; sha256 = "2b34e068f9a4b48ea20d8173b5fc68de631454646482834393266fef258358bb"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha256 = "38afe18c3a167477a060a089d5eaf910295d293619c1627eae161e14741dfcda"; }
-    { locale = "uz"; arch = "linux-i686"; sha256 = "6d71613a41e37e077974b0806f48f483a62cb79ab7deffb3d0ce7f1874557fbd"; }
-    { locale = "uz"; arch = "linux-x86_64"; sha256 = "28d09105d86af87750539899cd010d7edc410d7a06671dbf9d7a9633efbf0d1e"; }
-    { locale = "vi"; arch = "linux-i686"; sha256 = "3ef1bc04ad1d08551f741e676c9fd9d4a42d4b5c78f0dde4297be4321ef64a27"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha256 = "38a77586718cdc82b7b71d945cd565a075c3b3c5bb983bee0bc8c1ae25086eb2"; }
-    { locale = "xh"; arch = "linux-i686"; sha256 = "c6385ae5bb00ed59bc89fab1026b3f9fcee93fffe045564bef116d7700d78092"; }
-    { locale = "xh"; arch = "linux-x86_64"; sha256 = "480dc73f7cc41db7c0171eeb3139d50830b8dec916111ee4f8af3ad67cf95bf8"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "f06897413ac62dda69242b09be1f44b8bb722a53c1aa1bd6350964ce9a7ae682"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "3f551ae58bdeaa0212cfc6d4e033e67a4aa379576f983e6e195c0e962e3fd466"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "ba422c4c436a06b3e4da1d48767c4ea5aed80d7e65e593b3302d76450f0f19f6"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "c6fbbbb71110415f606ffbf44cc3709975e8504e86f3baeac4b086fd1438fff6"; }
+    { locale = "ach"; arch = "linux-i686"; sha256 = "2d0ab9fba584576d67ccb600339efeb5ad7aac1629b2d7865e121825b1a5a6d5"; }
+    { locale = "ach"; arch = "linux-x86_64"; sha256 = "188b9aab64ab1beda84dbe7b36d899210472a3e445dd827b64ca7083ae3c0b32"; }
+    { locale = "af"; arch = "linux-i686"; sha256 = "e6b5fb28e5ad03240f0e156c81db1df16bfaf99a946ffab9672c06d8561de9c3"; }
+    { locale = "af"; arch = "linux-x86_64"; sha256 = "c2856308c9e87bf82f621c5d4c96e9c5a70e5ebb86a8e4ba8ecb4d08c1ae98ec"; }
+    { locale = "an"; arch = "linux-i686"; sha256 = "f138b17a230e9b42b334d3900bebf23156fe1dec1f4ec75f9a3b94348523e241"; }
+    { locale = "an"; arch = "linux-x86_64"; sha256 = "82d24b07dc8d887837e8fbd610c2feb1ff4975917d8a19836ec0d0db56522de8"; }
+    { locale = "ar"; arch = "linux-i686"; sha256 = "b530e58161331bff3222083298ddc5af0055c6b3337b58b1a4eb1d5d4e348d62"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha256 = "67c0e4ce7dfe54d0e4fedb168342ea86a82458e2d3ce6aca78b4497f4e813bfd"; }
+    { locale = "as"; arch = "linux-i686"; sha256 = "f17e991e97e85b981c3191a0becad6df457a29b7042d31a667fd227dadc24e80"; }
+    { locale = "as"; arch = "linux-x86_64"; sha256 = "2d955443b785a65d2f9f914232d521aeb9082b4dead8fedc89cfa29329ab8e2a"; }
+    { locale = "ast"; arch = "linux-i686"; sha256 = "c9e2784047b58eddfd72c1e56964eea8ac098240436d029665bc940c7b8d8f8d"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha256 = "4bd5cc7c34f0a1fc1e2e899942c4ebec6bdab2fbd9e3d331ecc0c67a6f8c16e4"; }
+    { locale = "az"; arch = "linux-i686"; sha256 = "1789f6c5524314df239e4b4beb677adf48ce926a097128e053b352067d13016f"; }
+    { locale = "az"; arch = "linux-x86_64"; sha256 = "4881ccb7521512b4275faa2598efda6bbcc3d7838b6200e79c8fcae358d32c23"; }
+    { locale = "be"; arch = "linux-i686"; sha256 = "e9e31e92e0732188f6c4494023de260e5b64e97c56ff07857b290355c50e25f4"; }
+    { locale = "be"; arch = "linux-x86_64"; sha256 = "00ef0cea013cdb8606d8786bb5a21e502a6054ab57b2fad4d24161c47768f418"; }
+    { locale = "bg"; arch = "linux-i686"; sha256 = "6428fa1d4f2bd0b703f207a1571e425f8076438954f955f60c0e8c1525743823"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha256 = "fc156d3d76582c95eb6a0a7ee88dbdbd6c99d46ca42b011e1d789b0552bb5885"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "d0b69158e5ce85eec29dc70c4942bfc76eaf2d8e3359c45de5783d39fe1ccaf0"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "928575b759e4ae89d3e5ee475ffa18c69e945846981102d540de01c9bd87582e"; }
+    { locale = "bn-IN"; arch = "linux-i686"; sha256 = "a92a902e4380ddda37b8e70922e91ee029d47f866adea53220dd76182c52b596"; }
+    { locale = "bn-IN"; arch = "linux-x86_64"; sha256 = "022b9ff7141cd89df35477d357df74556bc4a24639141d21111eccfbf8e2f98c"; }
+    { locale = "br"; arch = "linux-i686"; sha256 = "c398c00b98edcaa2618363637075ccf749a4d3567dfdae070b4b0cbe23832f56"; }
+    { locale = "br"; arch = "linux-x86_64"; sha256 = "60f471fdf1b71072751396049f12a198c73d11892ec69fc142f925a12c6515f4"; }
+    { locale = "bs"; arch = "linux-i686"; sha256 = "d9e3c1b5c94ad207071cea86295ef3f98d4bd9201e896f6b9d67a2e475ea2898"; }
+    { locale = "bs"; arch = "linux-x86_64"; sha256 = "2ea3bb1c14a849b5039b633963687629839174ea886d3f8314f67eddafa2b16b"; }
+    { locale = "ca"; arch = "linux-i686"; sha256 = "bf1c1c3aaa900d66c4684cf48623bb0c9e0313cd919ad0e67e8a2e3ca5987aa6"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha256 = "30c0217722c599ed8fc0e713e0b763a01dc0da37dc2f290a2a4d02cb2a86b6a3"; }
+    { locale = "cs"; arch = "linux-i686"; sha256 = "5ebd809827cdc85da0e6c973855c60426ab98e2cb898c030acd403577d3bb78a"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha256 = "a1d55b7c54fd7eb89bcf5dbdadcaea0f5d2da7110a090c424c52a55ae23150f2"; }
+    { locale = "cy"; arch = "linux-i686"; sha256 = "55df045619bbe01af6f33c6cd563d6097b9c9023ab9133fa7def0800cc9aec83"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha256 = "2ddb8bcd515aad4ddb029cf4e5c49e771aa1da14394924c4ec532c5125b7ca7b"; }
+    { locale = "da"; arch = "linux-i686"; sha256 = "b322bef3e95b24337f294b2786fc5a819d954adb43f98dee69674d41fd234b5c"; }
+    { locale = "da"; arch = "linux-x86_64"; sha256 = "3e5164351808ef2f8f4e9cea6bb1121c4d3394de56536d17869a56df3b783d3b"; }
+    { locale = "de"; arch = "linux-i686"; sha256 = "a404bf7c19dbc65adea8872b8bd080a17417bc0f1ffa3015513d86750b2903a9"; }
+    { locale = "de"; arch = "linux-x86_64"; sha256 = "3590e100bf84f2734d1b3c81508d8fa137fd100bdd1e764ae5da1f88602d5b9d"; }
+    { locale = "dsb"; arch = "linux-i686"; sha256 = "c4be1a5cc431f3aeb26694bfd0749da0dfc85c119f75b551e69083a384042833"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "36f451bb07af47aff7c930a2810ef628e3382f92560efbe396133735275f7075"; }
+    { locale = "el"; arch = "linux-i686"; sha256 = "736ee0dffe7c5dc0d5abc7755a83e29da718901252034ee503775fc3f11e31c1"; }
+    { locale = "el"; arch = "linux-x86_64"; sha256 = "1638e1fd69d1887bbfd2de95ffe7945f52934055f8e15eb919d9ccac930959e0"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha256 = "1f9c8404fd01c1cac530c0e2b1fb488a2b4f7a02d8c2f0e568e0db050dc66f18"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "4f7491b919ca7a0563cd3444bd4a1abf48a4448ccdd743c5b5eb58584e5b1e94"; }
+    { locale = "en-US"; arch = "linux-i686"; sha256 = "abe3e5d23cf557ee81e7064d6d1b2d3a8f6b6e1a5f80947fc7229f0b2b631380"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "a4b439e28274feb4bf5494ba180143e6b8617428a63d11fa2fd0e650dda41908"; }
+    { locale = "en-ZA"; arch = "linux-i686"; sha256 = "9de2931e926e0b0667f6916283a7ef019d1c067b29d6bd5b4b903fdf87ad9c17"; }
+    { locale = "en-ZA"; arch = "linux-x86_64"; sha256 = "6ada8b6a9a2b19f9515a1aaf63ad66cf35a1ab5491fc8ffc86a17fe1378ab553"; }
+    { locale = "eo"; arch = "linux-i686"; sha256 = "92db868c78ae49a8275d217327ca442ef6733b955ddc5b4940183c9a596da3de"; }
+    { locale = "eo"; arch = "linux-x86_64"; sha256 = "2e8267fb43ba6b7636c98fe386c35ddb9032265565844dcbc90f3dba18a2bc05"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha256 = "6343bacb35c929c8f7c5cb554aa0e5f67100032c71bc24203b663409e45cbf40"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "0b5a07e745aab7d1e0bb8bcf0afe12ab71a88679024ef6e9edd53bab7518df7f"; }
+    { locale = "es-CL"; arch = "linux-i686"; sha256 = "7288765c2222624e69b367ab83686c21a348330a8f26eff7c6ea8dca03a3aabf"; }
+    { locale = "es-CL"; arch = "linux-x86_64"; sha256 = "543778259a5d7c4198c8125b72f9e66e9ae98b398bc3b07ac0e103f07ab7ef2c"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha256 = "c1aec91c45591eaa6df8b15ba13ea58d15ab2cce20361719ea2549896d26ea1f"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "ee3b11c04ca280ff77e3cedd3dc2040b7b1722384639c02507bedc927c7b558b"; }
+    { locale = "es-MX"; arch = "linux-i686"; sha256 = "8adb9435f57da461150d8b283161760683e46b068eaade916119c2240f0a9c66"; }
+    { locale = "es-MX"; arch = "linux-x86_64"; sha256 = "b624c4345794a22a7c63b4f6b7a1ed6f52472fa5cba4173f69f3c12ee3b4cbe1"; }
+    { locale = "et"; arch = "linux-i686"; sha256 = "efb6c6753e8a9d8174e8bd1ae7cbf3f75b479e5da3ebe07dbbbb4ac140e60eb9"; }
+    { locale = "et"; arch = "linux-x86_64"; sha256 = "c84bb0597fa14e8a7a2d086f24d71ad2f3c04b3fca794b76977d1a4cb1aea479"; }
+    { locale = "eu"; arch = "linux-i686"; sha256 = "d116553c492ec41b811befb35393553b9174da3960034ce5106558befbf9728a"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha256 = "16c922f152d5e14c46277e23d30cfe0792c8e9828b8862df603aeff242c7ec96"; }
+    { locale = "fa"; arch = "linux-i686"; sha256 = "744ad5a8cb4473d502d1db50b6bf343e23525927b3a982677dd8a68aea111b3f"; }
+    { locale = "fa"; arch = "linux-x86_64"; sha256 = "968fea07386b96215af400524062447245fa038766caf0b133c932db6f105077"; }
+    { locale = "ff"; arch = "linux-i686"; sha256 = "0fdf06aa42cbd4d031fdad74d8ac9d6056708fc783180d72c5806cc45c5b8eec"; }
+    { locale = "ff"; arch = "linux-x86_64"; sha256 = "bfb65ec25192288b2f04f94bdcc9ce36a40a27c8a1f35f728f932c071b6756ce"; }
+    { locale = "fi"; arch = "linux-i686"; sha256 = "334c121cbd9a1469996ebc5535d838e3fecfcc419861cc70d5cdeb0cd584d5f5"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha256 = "44883a9b819a24bef03c3322681e1b9f3fe61779e382a740900dfc16a5f7db06"; }
+    { locale = "fr"; arch = "linux-i686"; sha256 = "cd196dff293aabc39156e82deb5163e139a4b0173de92a2ba72df49bb4b0afe5"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha256 = "77da207f48d7af908cb5e95767e61a2e6c04f1851e55430820ff8207da172361"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "39e8da569f2a6f67abac7782a938a906c810f8474fbb2c799dd26fb846c82707"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "44dbf644b3f96dd607e5c88eece8aaafd61ec42af9f7ba4c6ed06a272a45fa4a"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "783532acf3967f94232f42c9cd559e288db499c0ff74776543b59d71d281a74c"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "39509082dbeb935f481e95d6038943a17c5053f7001fbf71bdb0edea536adb9d"; }
+    { locale = "gd"; arch = "linux-i686"; sha256 = "dd73e1bf159f3d437d69306c5daeb7a06c951d6c5841315363c354f9aa1570c5"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha256 = "a2fb4aa1ba4a50bdb308e8c12090158c5e040ae85617171786e93852d4f48de5"; }
+    { locale = "gl"; arch = "linux-i686"; sha256 = "8ac3fd13e0f173aa1dfffd44c91511bd457c6a751daa978fbaae3f9901427cae"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha256 = "cf52827a18b400f8c3e426b00e2984bd5835014f3e97e9c1279f0b285ca5a5dc"; }
+    { locale = "gu-IN"; arch = "linux-i686"; sha256 = "1ef44836085733b52c338fdcaea78e7df5f78a0f0f470b9de3ac7b13e3ec4844"; }
+    { locale = "gu-IN"; arch = "linux-x86_64"; sha256 = "374280216142897536979fff6f876253caaf0eeb12a3d12d17b013e7ab3ba722"; }
+    { locale = "he"; arch = "linux-i686"; sha256 = "1dcca6ae796da1a1317a4f094f06369242cdf7c0f8ce3df7c9fabd22910996ab"; }
+    { locale = "he"; arch = "linux-x86_64"; sha256 = "e032513a673ba091207996b8a6a6b9da6ef05d5c080a93ed326fc4ac4ca6976a"; }
+    { locale = "hi-IN"; arch = "linux-i686"; sha256 = "2057287b406513a332d162f03f75ef7ff4c83834809163c8b870d9e5ab3f8cdf"; }
+    { locale = "hi-IN"; arch = "linux-x86_64"; sha256 = "8d19043416484c382fc9caec5dff4914fbc28feefd41a089591ef2b21f822a43"; }
+    { locale = "hr"; arch = "linux-i686"; sha256 = "995a6dd027a5a6b2123c62b74f524db53940e2c8fa6c7254dc41dca236f7889b"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha256 = "4410e7d1cbce028de083b82ee68f442d27c2219544ec1be72ef2c274cb7c445a"; }
+    { locale = "hsb"; arch = "linux-i686"; sha256 = "0dcb0de11e35475cab33e11b08b88ff766915d7d98ceeb466a0fee90883ebaed"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "1695167eea386aec4fca23bb0bf4e5b83876a22f8c584f4e81886be229e9a43b"; }
+    { locale = "hu"; arch = "linux-i686"; sha256 = "31026a26c9fa9b3777c2f9dd1d55da7e0204e4d98586f887b67588ccb86c3843"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha256 = "82d8fbe932765f100a116b6d572035297be2f027b4f0e0ba84ef88cb4b651000"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "864c112f13628bd9bc715a6a405dc92c3f8027b0e505722d819b84775fb27066"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "dddd71e651056c373225baab9bb190810f8ed6849abfa76587fcd05cc5060d89"; }
+    { locale = "id"; arch = "linux-i686"; sha256 = "3425906d6513d3e06286b9b3c62c30d702a47a3d7a31638a58f926e2fa4a254f"; }
+    { locale = "id"; arch = "linux-x86_64"; sha256 = "095d970add8bf54fc2fb2581532013f4792f648b58fa12d49a6a859f26a0e579"; }
+    { locale = "is"; arch = "linux-i686"; sha256 = "f3687eb0e7ce24e14621345543abdf2b92435466ededc98a4ec4a117c4593c3c"; }
+    { locale = "is"; arch = "linux-x86_64"; sha256 = "dbac8774c64e6c978a3eb900cf61d85a210d0c39c28df4a21e4295ba5febd0ea"; }
+    { locale = "it"; arch = "linux-i686"; sha256 = "62091c6f5214f4717462d9e2f6bacd7f30417b7e714de3fdec6fc2f703970eb7"; }
+    { locale = "it"; arch = "linux-x86_64"; sha256 = "480b9ffd4326a9a2e2002510027a15d4fdaf8ba1ea023ee6e55b2aa78b119a6c"; }
+    { locale = "ja"; arch = "linux-i686"; sha256 = "ef143bf31fa67cab3ccafc0083d81ffa8997e3365312b12312623755eb24f48d"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha256 = "f74808de8fb999dceb067b3fda64e891c37bde7190e9eff68f1693f5b5feae0d"; }
+    { locale = "kk"; arch = "linux-i686"; sha256 = "a532d49011b632aa83f6b881b39c74bcb66fab0237e3e4f8682445aa0a053d4c"; }
+    { locale = "kk"; arch = "linux-x86_64"; sha256 = "7f32ee329e8281e89472b092248a26e1d38089bdc9830d2d1d0b1af8230ca20b"; }
+    { locale = "km"; arch = "linux-i686"; sha256 = "34ecf596b0870aca2db30513ef5d6522d86caf70fce38b23a7bff08c55551b69"; }
+    { locale = "km"; arch = "linux-x86_64"; sha256 = "6e7efd621e941674038887d1e8d90c36d0ac06a095386caa01d228494228be14"; }
+    { locale = "kn"; arch = "linux-i686"; sha256 = "062ebd6b27ef9094e65e60ad64be30470ed58eb2d92f247a87a781b97e0654d9"; }
+    { locale = "kn"; arch = "linux-x86_64"; sha256 = "e88428b1cd2e1919336dda303d8795bd02e4967ba8c6d2830205f68fa4c528d0"; }
+    { locale = "ko"; arch = "linux-i686"; sha256 = "6c43a7f86f908cccc7ca3a7ed45f95ea84b69e4a21ff1e1d58136ea19bf7bd2c"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha256 = "9db2bfd818d82ee0c9bc35b6fd651ad8fe80f8d73d51326fde25fc4c2aaa295c"; }
+    { locale = "lij"; arch = "linux-i686"; sha256 = "be87fc2a6863f33f9ff9ad2990e1e6425a65002f2ee411a254dde80cbd5a31c4"; }
+    { locale = "lij"; arch = "linux-x86_64"; sha256 = "9cfb239df8195cfa355bc8ddaf63accd865de21086c5bc3180b2ad9886445f3e"; }
+    { locale = "lt"; arch = "linux-i686"; sha256 = "11e18e6baac8f31c62a301e8ee51056c707ca47332fbeb6f3492e8eaffa25c57"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha256 = "3bb4dca607abc4e08300dfa61667d2f2b06661f47cf0029d078e14fa4686d4b8"; }
+    { locale = "lv"; arch = "linux-i686"; sha256 = "bc484992f230229ab4ab6d47fab9664f43341ad1202010f5dea91d2d78200c85"; }
+    { locale = "lv"; arch = "linux-x86_64"; sha256 = "42bdc60ad7edf2ed3e82f765abfc3815f98095adc2988f8d809a8834eada63ef"; }
+    { locale = "mai"; arch = "linux-i686"; sha256 = "628f0685185f91e695af5ce9a536d9263305cfd747683ef33dccd0c90f3e1bfb"; }
+    { locale = "mai"; arch = "linux-x86_64"; sha256 = "688c33b159b4fcd23fb4c6d3a7f845d03929b4a8b02eaa2ebb93682b396c73a2"; }
+    { locale = "mk"; arch = "linux-i686"; sha256 = "a59b2a8ee82513ef78f3509afc4dba75ec3128f0f42c657bbbfbad117b981b36"; }
+    { locale = "mk"; arch = "linux-x86_64"; sha256 = "3058ff9ac581a65ee0713fe3707f8b98eace0f833b8e7b901fa397538e9503f0"; }
+    { locale = "ml"; arch = "linux-i686"; sha256 = "43c80f530ad3eaf7c138e16b23b9eb32afc1f774374fe213f580cf68e4d0e245"; }
+    { locale = "ml"; arch = "linux-x86_64"; sha256 = "43f061317f9eb5a174cd13539bb3972535b552113d38c05d9888e7a37346ef22"; }
+    { locale = "mr"; arch = "linux-i686"; sha256 = "30c0ee68eadffcc95271f1e7c1c1b0151ee21ca3744fad61a723a9a6bfb751b0"; }
+    { locale = "mr"; arch = "linux-x86_64"; sha256 = "d9dd27af41ca021f323499be556d208f69b706aff079c8d7392c7f19092705d8"; }
+    { locale = "ms"; arch = "linux-i686"; sha256 = "adb5e1968c66378ff9b59dc57c00a2c953ad1f54f67e1bc40abc499bcf79653f"; }
+    { locale = "ms"; arch = "linux-x86_64"; sha256 = "3e4b43a88b3aa2887673e1962fa4ccbd895640113e683c849a3c9733677e1fe1"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "f4be0cff21abdc80fba10db2bf781fecfb4e503c70cb95a8b083c5f7123f8dc8"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "e9b191268a6694805a5ba86559e798c9a4e29eae39a7f64dab92a925fb31611d"; }
+    { locale = "nl"; arch = "linux-i686"; sha256 = "581c73084993be0bf1ab23bb468674d062fb98e99573d823e977a263b4cfaa91"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha256 = "3fd8929341ae048187379b7648ec8e008ace53e4a5f0af1421ecabcb5ad3bf61"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "b2104d5895a727903f6a273888989887542ad9e61c998cc651bb24d64efc6cfd"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "1bf582e66da985cbb01c22f865fc291196c55b14d2f84516f68f184ea842a664"; }
+    { locale = "or"; arch = "linux-i686"; sha256 = "1ffbc776fb3ae030e6dedea009b71873bff57f9294e63331404b53e1ba36499c"; }
+    { locale = "or"; arch = "linux-x86_64"; sha256 = "b988f433a238b2cb3766042d911a1f002a5f91a47dbed5b937f70cb59ed060d2"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "6ba4941b5bef7b860194114c2704662a42f9f3007a0b634662e42f38c0aa601a"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "0d9920d4b358cfdcf8cdf4b2d2e07ceb191709eee9dbae4c59f9dbfcfffbf0f5"; }
+    { locale = "pl"; arch = "linux-i686"; sha256 = "e080fb35bf49f9eb2fc39a435a188164eedf2ea7a24f8e950d62567620a91954"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha256 = "cc37624f0c1e82d2de2048129f58e85fe8a518ee4b0ebdbee0a5205517602cf9"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "d19bf65889c686cbb284e697e8ba1315b6ec004b57096725fb576898ef105346"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "0d00d2d0bbc6045117c4df93045f70ebe0468e004504a06dfc508bfca6c6df1f"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "5225afadf2ea62792376dfda1d2b3533d986f1ee3a281781a5be294b8883ac8b"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "0c1d841ba80e32d51d41c99b551e68c6b591e97af4ccee4d7c7d6ef03f8707ea"; }
+    { locale = "rm"; arch = "linux-i686"; sha256 = "2cc9200a132c967a7158f5422dad8f4b2d90dfc7e46ada305daebabc44806de8"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha256 = "0dff628773d4f2e24b767501b9c768586a27e82c0e8b259ef1cc676985ad0125"; }
+    { locale = "ro"; arch = "linux-i686"; sha256 = "500142fe612fe6144a14ebaad486da04050940a755e205297473c1be6b9dc428"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha256 = "f3a57abec8553c8b9d8db9fb5600cd7b6e1189ebf0225df96608eaf2863e41b3"; }
+    { locale = "ru"; arch = "linux-i686"; sha256 = "1266ed09db881af90794bef049cdfee777d7179026de8c0de2931275f3f288e9"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha256 = "0f1b44177633149aaa31574ba3cf343971bd4e11ac6b4bb92a5875b6a30a42af"; }
+    { locale = "si"; arch = "linux-i686"; sha256 = "e027afd86b00379c12e014b8d0d11a05811c598f53490edf7070e7acccbf0d79"; }
+    { locale = "si"; arch = "linux-x86_64"; sha256 = "518c19c5351a2c1bd05afe63e9d8c2a0be3a9cedccf7aa1d84d1af9de7ecf7fd"; }
+    { locale = "sk"; arch = "linux-i686"; sha256 = "e3dcda7406d00166a601b77fbdf0b84181ba5372f760eb08d5476fe9d219caef"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha256 = "019c03ecd24f394b0ff76aff5cd9f0db017ffd3b8dd65388c4f5ee3188e77a6c"; }
+    { locale = "sl"; arch = "linux-i686"; sha256 = "a88391cc29643277f9d8c58a205ac959af825326b61c16361d4def6f7da31235"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha256 = "fcf45e13a0bc543988495a83e5e96400707564d2ed4fcd0579219c999ee71e83"; }
+    { locale = "son"; arch = "linux-i686"; sha256 = "a75e273e01df51ffbe2c8666545f1e6f4d00af373d7aac08978947d7afc1e5f4"; }
+    { locale = "son"; arch = "linux-x86_64"; sha256 = "9f28df29d980e6c7467e99b2b81740cb078ce8e6896fe4e2a6b1473770e6bef5"; }
+    { locale = "sq"; arch = "linux-i686"; sha256 = "2243773d7d38608e17233e1d98e4fc1ca19f40f27a3e87557ad7fbd958c080ba"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha256 = "c18faf9d8971c43db18fcc66329a85018a04e8cf4819c4843d826bc86414cadb"; }
+    { locale = "sr"; arch = "linux-i686"; sha256 = "0cd5e6a3910923aed9a88fafd95bc11263de7359c38685e209212339bb2f50dc"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha256 = "1ec48c65323b15332932060ec5193908d89715736bd0abd88472dc05e639a62a"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "6718eb3e71a3d4f5487b80bbd784fd61422345f94d3271f6de6f6feab9e2f6da"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "5b356a6334d424b5e47ea4b1c32403a858ff5dc8727bbc0b2f72e6a29c9b625f"; }
+    { locale = "ta"; arch = "linux-i686"; sha256 = "fdb4e36497a61af9badb848a067eff4e4dada7dfffefbfe6bb7266ad89a8707a"; }
+    { locale = "ta"; arch = "linux-x86_64"; sha256 = "de5f0b871425412f9f261eff5b1abb3ddbd40f588647fd8e174e2d6c5ba17b90"; }
+    { locale = "te"; arch = "linux-i686"; sha256 = "0cc82774a46580c9e2f890848f705b1dc4effac197a902f9d244f0b6f6258650"; }
+    { locale = "te"; arch = "linux-x86_64"; sha256 = "65ceda67a572053dd4d9e15b9bd47c91364651736417414d4ca4a0a7ded9775a"; }
+    { locale = "th"; arch = "linux-i686"; sha256 = "1c0084ed26218713c4606ab073bf09de888051e9dcc49652a87fb58209a8c614"; }
+    { locale = "th"; arch = "linux-x86_64"; sha256 = "5a70e29d282961e27350d26cf164472fe51247db1d7d1228dca693423c32d0a6"; }
+    { locale = "tr"; arch = "linux-i686"; sha256 = "f7fa2029a36eda63544beebb6534fc2f8432c87d7a8d08d4c8927275e659b686"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha256 = "1e3744f5908164e163818522fa902bd57edb62837b2b399983ea5a4ed487cda8"; }
+    { locale = "uk"; arch = "linux-i686"; sha256 = "0f465eda0f7e87eef88bc17b3e6868ad90a270e6993d327fecca532637442df4"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha256 = "6530af36cfab509fff37519b435c7939110c000dbdd94000fe964283a14b1622"; }
+    { locale = "uz"; arch = "linux-i686"; sha256 = "7ee5997bcb4915c3907cee90e350e3bc2b67965975faecffa738a728cf2e12e3"; }
+    { locale = "uz"; arch = "linux-x86_64"; sha256 = "d7b34e36bcb423977a2a7667504c096730ca684c9f2e861b17e8f0174f5bb0d0"; }
+    { locale = "vi"; arch = "linux-i686"; sha256 = "e9497a8eed98ec34b31e3b1ec7086a4d219121f0edf21fd8f6a01599afa41f12"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha256 = "b94fbaee83014b88490bf19cc37dbda87fb9260ed5879be3b688a2abbe709a87"; }
+    { locale = "xh"; arch = "linux-i686"; sha256 = "d5a86db6b9f3bb5162a86f976cbbc01f542a924c05729eb54a2c24dabc711065"; }
+    { locale = "xh"; arch = "linux-x86_64"; sha256 = "d765b2d324e89119fee522ad8972031c8727841c2fa2700d010be7d23633bbbc"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "fb3bbc44952207f42112c291dccb82f02fbd23bba7b54b06a1047809d2bb18d2"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "255d19959cb0e0efbcb2eeceb39b43bbb567ab2474af4da6675574a0110781e1"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "cfc90ac621dc57d7eb922c564aa3a7d5ad7f2aacc95196606d34cba7b7e30d1a"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "ff119be821acb8f99a485a60de506123c76a7a3a13ac678576248f97ff1ab882"; }
   ];
 }

From 40c7d554d42d544005afb5c35dc3552b9e4d29df Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Thu, 7 Jan 2016 22:38:22 -0500
Subject: [PATCH 1257/2285] postfix service: implement DNS blacklist support

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

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index f2d8189de6ef..e03aabd6f2b1 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -13,6 +13,18 @@ let
   haveTransport = cfg.transport != "";
   haveVirtual = cfg.virtual != "";
 
+  clientAccess =
+    if (cfg.dnsBlacklistOverrides != "")
+    then [ "check_client_access hash:/etc/postfix/client_access" ]
+    else [];
+
+  dnsBl =
+    if (cfg.dnsBlacklists != [])
+    then [ (concatStringsSep ", " (map (s: "reject_rbl_client " + s) cfg.dnsBlacklists)) ]
+    else [];
+
+  clientRestrictions = concatStringsSep ", " (clientAccess ++ dnsBl);
+
   mainCf =
     ''
       compatibility_level = 2
@@ -104,6 +116,9 @@ let
     + optionalString haveVirtual ''
       virtual_alias_maps = hash:/etc/postfix/virtual
     ''
+    + optionalString (cfg.dnsBlacklists != []) ''
+      smtpd_client_restrictions = ${clientRestrictions}
+    ''
     + cfg.extraConfig;
 
   masterCf = ''
@@ -161,6 +176,7 @@ let
 
   aliasesFile = pkgs.writeText "postfix-aliases" aliases;
   virtualFile = pkgs.writeText "postfix-virtual" cfg.virtual;
+  checkClientAccessFile = pkgs.writeText "postfix-check-client-access" cfg.dnsBlacklistOverrides;
   mainCfFile = pkgs.writeText "postfix-main.cf" mainCf;
   masterCfFile = pkgs.writeText "postfix-master.cf" masterCf;
   transportFile = pkgs.writeText "postfix-transport" cfg.transport;
@@ -366,6 +382,17 @@ in
         ";
       };
 
+      dnsBlacklists = mkOption {
+        default = [];
+        type = with types; listOf string;
+        description = "dns blacklist servers to use with smtpd_client_restrictions";
+      };
+
+      dnsBlacklistOverrides = mkOption {
+        default = "";
+        description = "contents of check_client_access for overriding dnsBlacklists";
+      };
+
       extraMasterConf = mkOption {
         type = types.lines;
         default = "";
@@ -494,6 +521,9 @@ in
     (mkIf haveVirtual {
       services.postfix.mapFiles."virtual" = virtualFile;
     })
+    (mkIf (cfg.dnsBlacklists != []) {
+      services.postfix.mapFiles."client_access" = checkClientAccessFile;
+    })
   ]);
 
 }

From 81b5223c977ecf391c13c66f4eafc33f60a3eb4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Fri, 12 Feb 2016 06:58:31 +0100
Subject: [PATCH 1258/2285] nixos: gitit, wrong type restriction redacted

---
 nixos/modules/services/misc/gitit.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/misc/gitit.nix b/nixos/modules/services/misc/gitit.nix
index ab4d385ba165..befd8c628f16 100644
--- a/nixos/modules/services/misc/gitit.nix
+++ b/nixos/modules/services/misc/gitit.nix
@@ -35,7 +35,6 @@ let
       };
 
       haskellPackages = mkOption {
-        type = types.attrsOf types.package;
         default = pkgs.haskellPackages;
         defaultText = "pkgs.haskellPackages";
         example = literalExample "pkgs.haskell.packages.ghc784";

From 5bb195bda222965b47ce07ad172f034c27ce42f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Fri, 12 Feb 2016 06:59:55 +0100
Subject: [PATCH 1259/2285] i2pd: 2.3.0 -> 2.4.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 ff41beaeb05b..2d490b917a4e 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.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "PurpleI2P";
     repo = pname;
     rev = version;
-    sha256 = "0gb6bdsyb7m0jkilln9h7z2l8gr8ia10jah17ygc15jzycygijis";
+    sha256 = "1nkf3dplvyg2lgygd3jd4bqh5s4nm6ppyks3a05a1dcbwm8ws42y";
   };
 
   buildInputs = [ boost zlib openssl ];

From 70925f0a921df7ce801c50d931462a4d83277691 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 12 Feb 2016 08:00:04 +0100
Subject: [PATCH 1260/2285] firefox: 44.0 -> 44.0.2

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

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index 7451297f8d20..f281b51fbfd5 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -133,8 +133,8 @@ in {
 
   firefox-unwrapped = common {
     pname = "firefox";
-    version = "44.0";
-    sha256 = "07ac1h6ib36nm4a0aykh1z36vgw6wqlblil0zsj0lchdhksb10pa";
+    version = "44.0.2";
+    sha256 = "17id7ala1slb2mjqkikryqjadcsmdzqmkxrrnb5m1316m50qichb";
   };
 
   firefox-esr-unwrapped = common {

From 657c56678c0d5a415f9062c30a27f3e399352b92 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 12 Feb 2016 08:00:26 +0100
Subject: [PATCH 1261/2285] firefox-esr: 38.5.2esr -> 38.6.1esr

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

diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix
index f281b51fbfd5..834c6ed339cd 100644
--- a/pkgs/applications/networking/browsers/firefox/default.nix
+++ b/pkgs/applications/networking/browsers/firefox/default.nix
@@ -139,8 +139,8 @@ in {
 
   firefox-esr-unwrapped = common {
     pname = "firefox-esr";
-    version = "38.5.2esr";
-    sha256 = "0xqirpiys2pgzk9hs4s93svknc0sss8ry60zar7n9jj74cgz590m";
+    version = "38.6.1esr";
+    sha256 = "1zyhzczhknplxfmk2r7cczavbsml8ckyimibj2sphwdc300ls5wi";
   };
 
 }

From b9c13dcbc7c512194d98926a82afba4e70fcc2f0 Mon Sep 17 00:00:00 2001
From: Michael Fellinger <m.fellinger@gmail.com>
Date: Fri, 12 Feb 2016 09:56:02 +0100
Subject: [PATCH 1262/2285] bundix: 2.0.4 -> 2.0.5

Fixes issue with the -d flag creating duplicated `dependencies` properties.
---
 pkgs/development/interpreters/ruby/bundix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/bundix/default.nix b/pkgs/development/interpreters/ruby/bundix/default.nix
index 88679f74753d..245090e66e1a 100644
--- a/pkgs/development/interpreters/ruby/bundix/default.nix
+++ b/pkgs/development/interpreters/ruby/bundix/default.nix
@@ -5,9 +5,9 @@ buildRubyGem rec {
 
   name = "${gemName}-${version}";
   gemName = "bundix";
-  version = "2.0.4";
+  version = "2.0.5";
 
-  sha256 = "0i7fdxi6w29yxnblpckczazb79m5x03hja8sfnabndg4yjc868qs";
+  sha256 = "0bsynhr44jz6nih0xn7v32h1qvywnb5335ka208gn7jp6bjwabhy";
 
   buildInputs = [bundler];
 

From 1d6f590844ccf95acbe6dec567b7235e195f4334 Mon Sep 17 00:00:00 2001
From: Jinjing Wang <nfjinjing@gmail.com>
Date: Fri, 12 Feb 2016 18:44:08 +0800
Subject: [PATCH 1263/2285] pdnsd: enable IPv6 by default

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

diff --git a/pkgs/tools/networking/pdnsd/default.nix b/pkgs/tools/networking/pdnsd/default.nix
index 40d57cd65b63..b1e7e92e815c 100644
--- a/pkgs/tools/networking/pdnsd/default.nix
+++ b/pkgs/tools/networking/pdnsd/default.nix
@@ -12,6 +12,8 @@ stdenv.mkDerivation rec {
     sed -i 's/.*(cachedir).*/:/' Makefile.in
   '';
 
+  configureFlags = [ "--enable-ipv6" ];
+
   meta = { 
     description = "Permanent DNS caching";
     homepage = http://www.phys.uu.nl/~rombouts/pdnsd.html;

From 73b9a9662df21ad7c1a372edfda403a8f4b529aa Mon Sep 17 00:00:00 2001
From: Jinjing Wang <nfjinjing@gmail.com>
Date: Thu, 11 Feb 2016 19:02:11 +0800
Subject: [PATCH 1264/2285] pdnsd service: init

---
 lib/maintainers.nix                           |  1 +
 .../doc/manual/release-notes/rl-unstable.xml  |  1 +
 nixos/modules/misc/ids.nix                    |  2 +
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/services/networking/pdnsd.nix   | 93 +++++++++++++++++++
 5 files changed, 98 insertions(+)
 create mode 100644 nixos/modules/services/networking/pdnsd.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 808d78d499de..934a58b0aab1 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -220,6 +220,7 @@
   nathan-gs = "Nathan Bijnens <nathan@nathan.gs>";
   nckx = "Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>";
   nequissimus = "Tim Steinbach <tim@nequissimus.com>";
+  nfjinjing = "Jinjing Wang <nfjinjing@gmail.com>";
   nico202 = "Nicolò Balzarotti <anothersms@gmail.com>";
   notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>";
   np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>";
diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index c814d61bcf4c..a4f25cdc51f5 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -41,6 +41,7 @@ nixos.path = ./nixpkgs-unstable-2015-12-06/nixos;
 
   <itemizedlist>
     <listitem><para><literal>services/monitoring/longview.nix</literal></para></listitem>
+    <listitem><para><literal>services/networking/pdnsd.nix</literal></para></listitem>
     <listitem><para><literal>services/web-apps/pump.io.nix</literal></para></listitem>
     <listitem><para><literal>services/security/haka.nix</literal></para></listitem>
   </itemizedlist>
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 064b4cbc4b33..29e269e3094e 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -248,6 +248,7 @@
       matrix-synapse = 224;
       rspamd = 225;
       rmilter = 226;
+      pdnsd = 227;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -473,6 +474,7 @@
       matrix-synapse = 224;
       rspamd = 225;
       rmilter = 226;
+      pdnsd = 227;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 0011544988d6..42de820951dc 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -340,6 +340,7 @@
   ./services/networking/openntpd.nix
   ./services/networking/openvpn.nix
   ./services/networking/ostinato.nix
+  ./services/networking/pdnsd.nix
   ./services/networking/polipo.nix
   ./services/networking/prayer.nix
   ./services/networking/privoxy.nix
diff --git a/nixos/modules/services/networking/pdnsd.nix b/nixos/modules/services/networking/pdnsd.nix
new file mode 100644
index 000000000000..f4467b818958
--- /dev/null
+++ b/nixos/modules/services/networking/pdnsd.nix
@@ -0,0 +1,93 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.pdnsd;
+  pdnsd = pkgs.pdnsd;
+  pdnsdUser = "pdnsd";
+  pdnsdGroup = "pdnsd";
+  pdnsdConf = pkgs.writeText "pdnsd.conf"
+    ''
+      global {
+        run_as=${pdnsdUser};
+        cache_dir="${cfg.cacheDir}";
+        ${cfg.globalConfig}
+      }
+
+      server {
+        ${cfg.serverConfig}
+      }
+      ${cfg.extraConfig}
+    '';
+in
+
+{ options =
+    { services.pdnsd =
+        { enable = mkEnableOption "pdnsd";
+
+          cacheDir = mkOption {
+            type = types.str;
+            default = "/var/cache/pdnsd";
+            description = "Directory holding the pdnsd cache";
+          };
+
+          globalConfig = mkOption {
+            type = types.lines;
+            default = "";
+            description = ''
+              Global configuration that should be added to the global directory
+              of <literal>pdnsd.conf</literal>.
+            '';
+          };
+
+          serverConfig = mkOption {
+            type = types.lines;
+            default = "";
+            description = ''
+              Server configuration that should be added to the server directory
+              of <literal>pdnsd.conf</literal>.
+            '';
+          };
+
+          extraConfig = mkOption {
+            type = types.lines;
+            default = "";
+            description = ''
+              Extra configuration directives that should be added to
+              <literal>pdnsd.conf</literal>.
+            '';
+          };
+        };
+    };
+
+  config = mkIf cfg.enable {
+    users.extraUsers = singleton {
+      name = pdnsdUser;
+      uid = config.ids.uids.pdnsd;
+      group = pdnsdGroup;
+      description = "pdnsd user";
+    };
+
+    users.extraGroups = singleton {
+      name = pdnsdGroup;
+      gid = config.ids.gids.pdnsd;
+    };
+
+    systemd.services.pdnsd =
+      { wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ];
+        preStart =
+          ''
+            mkdir -p "${cfg.cacheDir}"
+            touch "${cfg.cacheDir}/pdnsd.cache"
+            chown -R ${pdnsdUser}:${pdnsdGroup} "${cfg.cacheDir}"
+          '';
+        description = "pdnsd";
+        serviceConfig =
+          {
+            ExecStart = "${pdnsd}/bin/pdnsd -c ${pdnsdConf}";
+          };
+      };
+  };
+}

From a1fa485378f3c17946c138935fd46be2178da389 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 12 Feb 2016 13:14:34 +0100
Subject: [PATCH 1265/2285] Revert "Remove double-backslashes from grub conf
 file".

This reverts commit b861bf8ddff67703, because according to @mdorman [1] this
change rendered his NixOS systems unbootable, and we probably don't want that.

[1] https://github.com/NixOS/nixpkgs/commit/b861bf8ddff677031e93a8e1c55311be63e0eb63#commitcomment-16058598
---
 nixos/modules/system/boot/loader/grub/install-grub.pl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 8da564bda150..b8ef02da4bc2 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -228,7 +228,7 @@ if ($grubVersion == 1) {
     ";
     if ($splashImage) {
         copy $splashImage, "$bootPath/background.xpm.gz" or die "cannot copy $splashImage to $bootPath\n";
-        $conf .= "splashimage " . Cwd::abs_path($grubBoot->path . "/background.xpm.gz") . "\n";
+        $conf .= "splashimage " . $grubBoot->path . "/background.xpm.gz\n";
     }
 }
 
@@ -327,9 +327,9 @@ sub addEntry {
     my ($name, $path) = @_;
     return unless -e "$path/kernel" && -e "$path/initrd";
 
-    my $kernel = Cwd::abs_path(copyToKernelsDir(Cwd::abs_path("$path/kernel")));
-    my $initrd = Cwd::abs_path(copyToKernelsDir(Cwd::abs_path("$path/initrd")));
-    my $xen = -e "$path/xen.gz" ? Cwd::abs_path(copyToKernelsDir(Cwd::abs_path("$path/xen.gz"))) : undef;
+    my $kernel = copyToKernelsDir(Cwd::abs_path("$path/kernel"));
+    my $initrd = copyToKernelsDir(Cwd::abs_path("$path/initrd"));
+    my $xen = -e "$path/xen.gz" ? copyToKernelsDir(Cwd::abs_path("$path/xen.gz")) : undef;
 
     # FIXME: $confName
 

From 0140591eabc8bf7c50adc673da0348313e6d1a2b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Feb 2016 13:10:02 +0100
Subject: [PATCH 1266/2285] postgresql: Remove EOL 9.0 branch

---
 pkgs/servers/sql/postgresql/default.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 9a5b07e9f89a..9b26b5ed41f6 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -58,12 +58,6 @@ let
 
 in {
 
-  postgresql90 = common {
-    version = "9.0.23";
-    psqlSchema = "9.0";
-    sha256 = "1pnpni95r0ry112z6ycrqk5m6iw0vd4npg789czrl4qlr0cvxg1x";
-  };
-
   postgresql91 = common {
     version = "9.1.19";
     psqlSchema = "9.1";

From 5e6962ff2eba9142280f9a8be4ca40c6272af584 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Feb 2016 13:12:10 +0100
Subject: [PATCH 1267/2285] postgresql: Update to 9.5.1, 9.4.6, 9.3.11, 9.2.15,
 9.1.20

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

diff --git a/pkgs/servers/sql/postgresql/default.nix b/pkgs/servers/sql/postgresql/default.nix
index 9b26b5ed41f6..bba2bf2d6825 100644
--- a/pkgs/servers/sql/postgresql/default.nix
+++ b/pkgs/servers/sql/postgresql/default.nix
@@ -59,33 +59,33 @@ let
 in {
 
   postgresql91 = common {
-    version = "9.1.19";
+    version = "9.1.20";
     psqlSchema = "9.1";
-    sha256 = "1ihf9h353agsm5p2dr717dvraxvsw6j7chbn3qxdcz8la5s0bmfb";
+    sha256 = "0dr9hz1a0ax30f6jvnv2rck0zzxgk9x7nh4n1xgshrf26i1nq7kd";
   };
 
   postgresql92 = common {
-    version = "9.2.14";
+    version = "9.2.15";
     psqlSchema = "9.2";
-    sha256 = "0bi9zfsfhj84mnaa41ar63j9qgzsnac1wwgjhy2c6j0a68zhphjl";
+    sha256 = "0q1yahkfys78crf59avp02ibd0lp3z7h626xchyfi6cqb03livbw";
   };
 
   postgresql93 = common {
-    version = "9.3.10";
+    version = "9.3.11";
     psqlSchema = "9.3";
-    sha256 = "0c8mailildnqnndwpmnqf8ymxmk1qf5w5dq02hjqmydgfq7lyi75";
+    sha256 = "08ba951nfiy516flaw352shj1zslxg4ryx3w5k0adls1r682l8ix";
   };
 
   postgresql94 = common {
-    version = "9.4.5";
+    version = "9.4.6";
     psqlSchema = "9.4";
-    sha256 = "0faav7k3nlhh1z7j1r3adrhx1fpsji3jixmm2abjm93fdg350z5q";
+    sha256 = "19j0845i195ksg9pvnk3yc2fr62i7ii2bqgbidfjq556056izknb";
   };
 
   postgresql95 = common {
-    version = "9.5.0";
+    version = "9.5.1";
     psqlSchema = "9.5";
-    sha256 = "f1c0d3a1a8aa8c92738cab0153fbfffcc4d4158b3fee84f7aa6bfea8283978bc";
+    sha256 = "1ljvijaja5zy4i5b1450drbj8m3fcm3ly1zzaakp75x30s2rsc3b";
   };
 
 

From fd8bd17c3e393185533c2c87008e17546e72c404 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Feb 2016 13:18:35 +0100
Subject: [PATCH 1268/2285] postgresql: Bump default version to 9.5

---
 nixos/modules/services/databases/postgresql.nix | 2 +-
 pkgs/top-level/all-packages.nix                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix
index 957fb4723a5c..31ffe51c11ef 100644
--- a/nixos/modules/services/databases/postgresql.nix
+++ b/nixos/modules/services/databases/postgresql.nix
@@ -158,7 +158,7 @@ in
       # Note: when changing the default, make it conditional on
       # ‘system.stateVersion’ to maintain compatibility with existing
       # systems!
-      mkDefault pkgs.postgresql94;
+      mkDefault (if versionAtLeast config.system.stateVersion "16.03" then pkgs.postgresql95 else pkgs.postgresql94);
 
     services.postgresql.authentication = mkAfter
       ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 65f68feae722..fe0aaf41e3d1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9603,7 +9603,7 @@ let
     libmemcached = null; # Detection is broken upstream
   };
 
-  postgresql = postgresql94;
+  postgresql = postgresql95;
 
   inherit (callPackages ../servers/sql/postgresql { })
     postgresql90

From 99178d968b8a59694467940b5447d449269661da Mon Sep 17 00:00:00 2001
From: = <anothersms@gmail.com>
Date: Fri, 12 Feb 2016 13:37:51 +0100
Subject: [PATCH 1269/2285] jamin: init at 0.95.0

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

diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix
new file mode 100644
index 000000000000..d9f79a754fac
--- /dev/null
+++ b/pkgs/applications/audio/jamin/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, fftwFloat, gtk2, ladspaPlugins, libjack2, liblo, libxml2
+, makeWrapper, pkgconfig, perl, perlXMLParser }:
+
+stdenv.mkDerivation {
+  name = "jamin-0.95.0";
+
+  src = fetchurl {
+    url = mirror://sourceforge/jamin/jamin-0.95.0.tar.gz;
+    sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn";
+  };
+
+  buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2
+  pkgconfig perl perlXMLParser makeWrapper ];
+  
+  postInstall = ''
+      wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://jamin.sourceforge.net;
+    description = "JACK Audio Mastering interface";
+    license = licenses.gpl2;
+    maintainers = [ maintainers.nico202 ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe0aaf41e3d1..4550582d100f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12439,6 +12439,8 @@ let
 
   jalv = callPackage ../applications/audio/jalv { };
 
+  jamin = callPackage ../applications/audio/jamin { };
+
   jedit = callPackage ../applications/editors/jedit { };
 
   jigdo = callPackage ../applications/misc/jigdo { };

From 57d63ad5376db331b51cc3ce630d20853ecb4186 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Fri, 12 Feb 2016 12:42:00 +0000
Subject: [PATCH 1270/2285] mupen64plus1_5: removed

This was the same as mupen64plus, alias added.
---
 pkgs/misc/emulators/mupen64plus/1.5.nix | 33 -------------------------
 pkgs/top-level/all-packages.nix         |  4 +--
 2 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/misc/emulators/mupen64plus/1.5.nix

diff --git a/pkgs/misc/emulators/mupen64plus/1.5.nix b/pkgs/misc/emulators/mupen64plus/1.5.nix
deleted file mode 100644
index 571e14347b49..000000000000
--- a/pkgs/misc/emulators/mupen64plus/1.5.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{stdenv, fetchurl, which, pkgconfig, SDL, gtk, mesa, SDL_ttf}:
-
-stdenv.mkDerivation {
-  name = "mupen64plus-1.5";
-  src = fetchurl {
-    url = http://mupen64plus.googlecode.com/files/Mupen64Plus-1-5-src.tar.gz;
-    sha256 = "0gygfgyr2sg4yx77ijk133d1ra0v1yxi4xjxrg6kp3zdjmhdmcjq";
-  };
-  
-  buildInputs = [ which pkgconfig SDL gtk mesa SDL_ttf ];
-  
-  preConfigure = ''
-    # Some C++ incompatibility fixes
-    sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Main.cpp
-    sed -i -e 's|char \* extstr = strstr|const char * extstr = strstr|' glide64/Combine.cpp
-
-    # Fix some hardcoded paths
-    sed -i -e "s|/usr/local|$out|g" main/main.c
-
-    # Remove PATH environment variable from install script
-    sed -i -e "s|export PATH=|#export PATH=|" ./install.sh
-  '';
-  
-  buildPhase = "make all";
-  installPhase = "PREFIX=$out make install";
-  
-  meta = {
-    description = "A Nintendo 64 Emulator";
-    license = stdenv.lib.licenses.gpl2Plus;
-    homepage = http://code.google.com/p/mupen64plus;
-    maintainers = [ stdenv.lib.maintainers.sander ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe0aaf41e3d1..b71577207d45 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15607,8 +15607,6 @@ let
 
   mupen64plus = callPackage ../misc/emulators/mupen64plus { };
 
-  mupen64plus1_5 = callPackage ../misc/emulators/mupen64plus/1.5.nix { };
-
   inherit (callPackages ../tools/package-management/nix {
       storeDir = config.nix.storeDir or "/nix/store";
       stateDir = config.nix.stateDir or "/nix/var";
@@ -16030,6 +16028,8 @@ aliases = with self; rec {
   midoriWrapper = midori; # added 2015-01
   mlt-qt5 = qt5.mlt;  # added 2015-12-19
   multipath_tools = multipath-tools;  # added 2016-01-21
+  mupen64plus1_5 = mupen64plus; # added 2016-02-12
+  ncat = nmap;  # added 2016-01-26
   nfsUtils = nfs-utils;  # added 2014-12-06
   phonon_qt5 = qt5.phonon;  # added 2015-12-19
   phonon_qt5_backend_gstreamer = qt5.phonon-backend-gstreamer;  # added 2015-12-19

From 928035378d82de9641adc60e188c3b9313667729 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Feb 2016 14:31:06 +0100
Subject: [PATCH 1271/2285] Fix typo

---
 nixos/modules/tasks/network-interfaces-scripted.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix
index f07e7baeb119..c960e401f9b1 100644
--- a/nixos/modules/tasks/network-interfaces-scripted.nix
+++ b/nixos/modules/tasks/network-interfaces-scripted.nix
@@ -144,15 +144,12 @@ in
                   fi
                   ${config.systemd.package}/bin/systemctl start ip-up.target
                 '';
-            preStop =
-              ''
-                echo "releasing configured ip's..."
-              '' + flip concatMapStrings (ips) (ip:
+            preStop = flip concatMapStrings (ips) (ip:
                 let
                   address = "${ip.address}/${toString ip.prefixLength}";
                 in
                 ''
-                  echo -n "Deleting ${address}..."
+                  echo -n "deleting ${address}..."
                   ip addr del "${address}" dev "${i.name}" >/dev/null 2>&1 || echo -n " Failed"
                   echo ""
                 '');

From abdbdbebf613da18cb1b89e6c9b2216227046c0a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Feb 2016 14:31:23 +0100
Subject: [PATCH 1272/2285] nixos/tests/simple.nix: Include minimal.nix

This reduces the amount of rebuilds (particularly some X11 stuff)
after changing some dependencies like systemd.
---
 nixos/tests/simple.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/simple.nix b/nixos/tests/simple.nix
index 287712be316d..04d624adcfe9 100644
--- a/nixos/tests/simple.nix
+++ b/nixos/tests/simple.nix
@@ -4,7 +4,9 @@ import ./make-test.nix ({ pkgs, ...} : {
     maintainers = [ eelco ];
   };
 
-  machine = { config, pkgs, ... }: { };
+  machine = { config, pkgs, ... }: {
+    imports = [ ../modules/profiles/minimal.nix ];
+  };
 
   testScript =
     ''

From fb589faa0835838f41dcd94740dfbb82c6cb261b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Feb 2016 14:34:36 +0100
Subject: [PATCH 1273/2285] systemd: 228 -> 229

---
 pkgs/os-specific/linux/systemd/default.nix | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index c95e6002e847..ec5a85ef4ada 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, dbus, kmod
 , xz, pam, acl, cryptsetup, libuuid, m4, utillinux
-, glib, kbd, libxslt, coreutils, libgcrypt, libapparmor, audit, lz4
+, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libapparmor, audit, lz4
 , kexectools, libmicrohttpd, linuxHeaders, libseccomp
 , autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
 , enableKDbus ? false
@@ -8,24 +8,22 @@
 
 assert stdenv.isLinux;
 
-# FIXME: When updating, please remove makeFlags -- `hwdb_bin` flag is not supported anymore.
-
 stdenv.mkDerivation rec {
-  version = "228";
+  version = "229";
   name = "systemd-${version}";
 
   src = fetchFromGitHub {
     owner = "NixOS";
     repo = "systemd";
-    rev = "b737c07cc0234acfa87282786025d556bca91c3f";
-    sha256 = "0wca8zkn39914c232andvf3v0ni6ylv154kz3s9fcvg47rhpd5n1";
+    rev = "4936f6e6c05162516a685ebd227b55816cf2b670";
+    sha256 = "1q0pyrljmq73qcan9rfqsiw66l1g159m5in5qgb8zwlwhl928670";
   };
 
   outputs = [ "out" "man" "doc" ];
 
   buildInputs =
     [ linuxHeaders pkgconfig intltool gperf libcap kmod xz pam acl
-      /* cryptsetup */ libuuid m4 glib libxslt libgcrypt
+      /* cryptsetup */ libuuid m4 glib libxslt libgcrypt libgpgerror
       libmicrohttpd kexectools libseccomp audit lz4 libapparmor
       /* FIXME: we may be able to prevent the following dependencies
          by generating an autoconf'd tarball, but that's probably not
@@ -66,7 +64,7 @@ stdenv.mkDerivation rec {
       "--with-sysvinit-path="
       "--with-sysvrcnd-path="
       "--with-rc-local-script-path-stop=/etc/halt.local"
-    ] ++ stdenv.lib.optional enableKDbus "--enable-kdbus";
+    ] ++ (if enableKDbus then [ "--enable-kdbus" ] else [ "--disable-kdbus" ]);
 
   preConfigure =
     ''
@@ -109,13 +107,6 @@ stdenv.mkDerivation rec {
       "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\""
     ];
 
-  # Use /var/lib/udev rather than /etc/udev for the generated hardware
-  # database.  Upstream doesn't want this (see commit
-  # 1e1954f53386cb773e2a152748dd31c4d36aa2d8) because using /var is
-  # forbidden in early boot, but in NixOS the initrd guarantees that
-  # /var is mounted.
-  makeFlags = "hwdb_bin=/var/lib/udev/hwdb.bin";
-
   installFlags =
     [ "localstatedir=$(TMPDIR)/var"
       "sysconfdir=$(out)/etc"

From 6f9d3f197b5577b7aaecd85ed2dbeabed69fef99 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 12 Feb 2016 15:11:09 +0100
Subject: [PATCH 1274/2285] all-packages.nix: drop postgresql90 attribute

PostgreSQL 9.0 was removed in 0140591eabc8bf7c50adc673da0348313e6d1a2b.
---
 pkgs/top-level/all-packages.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b71577207d45..7c6f9f104b7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9606,7 +9606,6 @@ let
   postgresql = postgresql95;
 
   inherit (callPackages ../servers/sql/postgresql { })
-    postgresql90
     postgresql91
     postgresql92
     postgresql93

From aa31d99d2929eeb1082eb8bc05cc0ebbe49c9a09 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Feb 2016 15:19:59 +0100
Subject: [PATCH 1275/2285] nix: 1.11.1 -> 1.11.2

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index d615ac10646a..60fb6fc7e29b 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -89,10 +89,10 @@ in rec {
    nix = nixStable;
 
    nixStable = common rec {
-     name = "nix-1.11.1";
+     name = "nix-1.11.2";
      src = fetchurl {
        url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-       sha256 = "21a99b3d0afdbe10241aaf506738fd0a81ff868e3d7c666e3cb6b621a926ea7a";
+       sha256 = "fc1233814ebb385a2a991c1fb88c97b344267281e173fea7d9acd3f9caf969d6";
      };
    };
 

From c9d38164b76c6ee65f96c314f1ab7fdad10dda29 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 12 Feb 2016 17:37:03 +0300
Subject: [PATCH 1276/2285] dspam service: make maintenance script verbose

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

diff --git a/nixos/modules/services/mail/dspam.nix b/nixos/modules/services/mail/dspam.nix
index f18fd489f23d..2d8aebe20575 100644
--- a/nixos/modules/services/mail/dspam.nix
+++ b/nixos/modules/services/mail/dspam.nix
@@ -139,7 +139,7 @@ in {
         restartTriggers = [ cfgfile ];
 
         serviceConfig = {
-          ExecStart = "${dspam}/bin/dspam_maintenance";
+          ExecStart = "${dspam}/bin/dspam_maintenance --verbose";
           Type = "oneshot";
           User = cfg.user;
           Group = cfg.group;

From 59d1339c800b4816fd55f686b43202cd832c939e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 12 Feb 2016 17:58:53 +0300
Subject: [PATCH 1277/2285] dspam: fix maintenance script

---
 pkgs/servers/mail/dspam/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/mail/dspam/default.nix b/pkgs/servers/mail/dspam/default.nix
index 2b5949959516..99f8d45b4c1d 100644
--- a/pkgs/servers/mail/dspam/default.nix
+++ b/pkgs/servers/mail/dspam/default.nix
@@ -1,5 +1,5 @@
 { stdenv, lib, fetchurl, makeWrapper
-, gawk, gnused, gnugrep, coreutils
+, gawk, gnused, gnugrep, coreutils, which
 , perl, NetSMTP
 , withMySQL ? false, zlib, libmysql
 , withPgSQL ? false, postgresql
@@ -15,7 +15,7 @@ let
              ++ lib.optional withSQLite "sqlite3_drv"
              ++ lib.optional withDB "libdb4_drv"
             );
-  maintenancePath = lib.makeSearchPath "bin" [ gawk gnused gnugrep coreutils ];
+  maintenancePath = lib.makeSearchPath "bin" [ gawk gnused gnugrep coreutils which ];
 
 in stdenv.mkDerivation rec {
   name = "dspam-3.10.2";
@@ -83,7 +83,7 @@ in stdenv.mkDerivation rec {
     # Install maintenance script
     install -Dm755 contrib/dspam_maintenance/dspam_maintenance.sh $out/bin/dspam_maintenance
     sed -i \
-      -e '2iexport PATH=${maintenancePath}:$PATH' \
+      -e "2iexport PATH=$out/bin:${maintenancePath}:\$PATH" \
       -e 's,/usr/[a-z0-9/]*,,g' \
       -e 's,^DSPAM_CONFIGDIR=.*,DSPAM_CONFIGDIR=/etc/dspam,' \
       -e "s,^DSPAM_HOMEDIR=.*,DSPAM_HOMEDIR=/var/lib/dspam," \
@@ -93,6 +93,7 @@ in stdenv.mkDerivation rec {
       -e "s,^PGSQL_BIN_DIR=.*,PGSQL_BIN_DIR=/run/current-system/sw/bin," \
       -e "s,^SQLITE_BIN_DIR=.*,SQLITE_BIN_DIR=/run/current-system/sw/bin," \
       -e "s,^SQLITE3_BIN_DIR=.*,SQLITE3_BIN_DIR=/run/current-system/sw/bin," \
+      -e 's,^DSPAM_CRON_LOCKFILE=.*,DSPAM_CRON_LOCKFILE=/run/dspam/dspam_maintenance.pid,' \
       $out/bin/dspam_maintenance
   '';
 

From e674356c4673b0012d548a8d03bb7ea9f58e1f72 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Feb 2016 16:10:18 +0100
Subject: [PATCH 1278/2285] nix: Fix indentation

---
 pkgs/tools/package-management/nix/default.nix | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 60fb6fc7e29b..3b303bab3b74 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -86,25 +86,25 @@ let
 
 in rec {
 
-   nix = nixStable;
+  nix = nixStable;
 
-   nixStable = common rec {
-     name = "nix-1.11.2";
-     src = fetchurl {
-       url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
-       sha256 = "fc1233814ebb385a2a991c1fb88c97b344267281e173fea7d9acd3f9caf969d6";
-     };
-   };
+  nixStable = common rec {
+    name = "nix-1.11.2";
+    src = fetchurl {
+      url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz";
+      sha256 = "fc1233814ebb385a2a991c1fb88c97b344267281e173fea7d9acd3f9caf969d6";
+    };
+  };
 
-   nixUnstable = nixStable;
-   /*
-   nixUnstable = lib.lowPrio (common rec {
-     name = "nix-1.11pre4379_786046c";
-     src = fetchurl {
-       url = "http://hydra.nixos.org/build/30375557/download/4/${name}.tar.xz";
-       sha256 = "ff42c70697fce7ca6eade622a31e5fbe45aed0edf1204fb491b40df207a807d5";
-     };
-   });
-   */
+  nixUnstable = nixStable;
+  /*
+  nixUnstable = lib.lowPrio (common rec {
+    name = "nix-1.11pre4379_786046c";
+    src = fetchurl {
+      url = "http://hydra.nixos.org/build/30375557/download/4/${name}.tar.xz";
+      sha256 = "ff42c70697fce7ca6eade622a31e5fbe45aed0edf1204fb491b40df207a807d5";
+    };
+  });
+  */
 
 }

From 1f952e0172818b2185125b7775111040777f69e4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 12 Feb 2016 16:10:49 +0100
Subject: [PATCH 1279/2285] nss: 3.21 -> 3.22

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

diff --git a/pkgs/development/libraries/nss/default.nix b/pkgs/development/libraries/nss/default.nix
index ee8e38a72965..d3c2deb609ed 100644
--- a/pkgs/development/libraries/nss/default.nix
+++ b/pkgs/development/libraries/nss/default.nix
@@ -11,11 +11,11 @@ let
 
 in stdenv.mkDerivation rec {
   name = "nss-${version}";
-  version = "3.21";
+  version = "3.22";
 
   src = fetchurl {
-    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_21_RTM/src/${name}.tar.gz";
-    sha256 = "3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239";
+    url = "http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_22_RTM/src/${name}.tar.gz";
+    sha256 = "30ebd121c77e725a1383618eff79a6752d6e9f0f21882ad825ddab12e7227611";
   };
 
   buildInputs = [ nspr perl zlib sqlite ];

From 0137d4c6ff8a25041e49e37e62524e9edd3452f9 Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Fri, 12 Feb 2016 18:43:19 +0100
Subject: [PATCH 1280/2285] irssi-otr: fetchFromGithub

---
 .../applications/networking/irc/irssi/otr/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix
index 33fe5b799dba..bf462c09f54a 100644
--- a/pkgs/applications/networking/irc/irssi/otr/default.nix
+++ b/pkgs/applications/networking/irc/irssi/otr/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchurl, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }:
+{ stdenv, fetchFromGitHub, libotr, automake, autoconf, libtool, glib, pkgconfig, irssi }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "irssi-otr-${version}";
   version = "1.0.0";
 
-  src = fetchurl {
-    url = "https://github.com/cryptodotis/irssi-otr/archive/v${version}.tar.gz";
-    name = "${name}.tar.gz";
-    sha256 = "bad09a2853ea6fb1a7af42c8f15868fd3ce45f973be90c78944ddf04f8ab517e";
+  src = fetchFromGitHub {
+    owner = "cryptodotis";
+    repo = "irssi-otr";
+    rev = "v${version}";
+    sha256 = "139jawz3la6k91fy5kpgr6zvljl14n0fdpz72n2zw6wql69xlnnl";
   };
 
   patchPhase = ''

From 67fd55b5613ce4e844c5129c82de5f15fd29424d Mon Sep 17 00:00:00 2001
From: = <anothersms@gmail.com>
Date: Fri, 12 Feb 2016 18:54:25 +0100
Subject: [PATCH 1281/2285] non: 2015-12-16 -> 2016-02-07

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

diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix
index 84fcd50adc05..5a54c94f1f97 100644
--- a/pkgs/applications/audio/non/default.nix
+++ b/pkgs/applications/audio/non/default.nix
@@ -4,12 +4,12 @@ ladspaH, liblrdf, liblo, libsigcxx
 
 stdenv.mkDerivation rec {
   name = "non-${version}";
-  version = "2015-12-16";
+  version = "2016-02-07";
   src = fetchFromGitHub {
     owner = "original-male";
     repo = "non";
-    rev = "5d274f430c867f73ed1dcb306b49be0371d28128";
-    sha256 = "1yckac3r1hqn5p450j4lf4349v4knjj7n9s5p3wdcvxhs0pjv2sy";
+    rev = "1ef382fbbea598fdb56b25244a703c64ecaf8446";
+    sha256 = "1mi3nm0nrrqlk36920irvqf5080lbnj1qc8vnxspgwkjjqgdc22g";
   };
 
     buildInputs = [ pkgconfig python2 cairo libjpeg ntk libjack2 libsndfile

From c0a02801d7635a03022c6cb6b4d1c3efb516a0a9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 12 Feb 2016 21:26:11 +0300
Subject: [PATCH 1282/2285] bluez5: enable parallel building

---
 pkgs/os-specific/linux/bluez/bluez5.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix
index 21925a5e1dde..2b73dc798c3f 100644
--- a/pkgs/os-specific/linux/bluez/bluez5.nix
+++ b/pkgs/os-specific/linux/bluez/bluez5.nix
@@ -73,6 +73,8 @@ stdenv.mkDerivation rec {
     ln -s ../libexec/bluetooth/obexd $out/sbin/obexd
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = http://www.bluez.org/;
     repositories.git = https://git.kernel.org/pub/scm/bluetooth/bluez.git;

From 1f20ca1f74e3f80624bf4a81022558e6434543d5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 12 Feb 2016 22:44:15 +0300
Subject: [PATCH 1283/2285] bluez: default to bluez5

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c6f9f104b7b..a760c007ea02 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9858,16 +9858,16 @@ let
 
   batctl = callPackage ../os-specific/linux/batman-adv/batctl.nix { };
 
-  bluez4 = callPackage ../os-specific/linux/bluez {
+  bluez4 = lowPrio (callPackage ../os-specific/linux/bluez {
     pygobject = pygobject3;
-  };
+  });
 
-  bluez5 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5.nix { });
+  bluez5 = callPackage ../os-specific/linux/bluez/bluez5.nix { };
 
   # Needed for LibreOffice
   bluez5_28 = lowPrio (callPackage ../os-specific/linux/bluez/bluez5_28.nix { });
 
-  bluez = bluez4;
+  bluez = bluez5;
 
   inherit (pythonPackages) bedup;
 

From bd4b54557dcceb7d7d1a77009a717abb7b96883f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 12 Feb 2016 22:44:55 +0300
Subject: [PATCH 1284/2285] openobex: cleanup, add license

---
 pkgs/tools/bluetooth/openobex/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/bluetooth/openobex/default.nix b/pkgs/tools/bluetooth/openobex/default.nix
index 7baf1ac3ed98..ec5ca0706f49 100644
--- a/pkgs/tools/bluetooth/openobex/default.nix
+++ b/pkgs/tools/bluetooth/openobex/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, bluez, libusb, cmake}:
+{ stdenv, fetchurl, pkgconfig, bluez, libusb, cmake }:
    
 stdenv.mkDerivation rec {
   name = "openobex-1.7.1";
@@ -8,18 +8,20 @@ stdenv.mkDerivation rec {
     sha256 = "0mza0mrdrbcw4yix6qvl31kqy7bdkgxjycr0yx7yl089v5jlc9iv";
   };
 
-  buildInputs = [pkgconfig bluez libusb cmake];
+  nativeBuildInputs = [ pkgconfig cmake ];
+  buildInputs = [ bluez libusb ];
 
-  configureFlags = "--enable-apps";
+  configureFlags = [ "--enable-apps" ];
 
   patchPhase = ''
     sed -i "s!/lib/udev!$out/lib/udev!" udev/CMakeLists.txt
     sed -i "/if ( PKGCONFIG_UDEV_FOUND )/,/endif ( PKGCONFIG_UDEV_FOUND )/d" udev/CMakeLists.txt
     '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://dev.zuckschwerdt.org/openobex/;
     description = "An open source implementation of the Object Exchange (OBEX) protocol";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    license = licenses.lgpl2Plus;
   };
 }

From 4a00e1f70b62e406a0c9cc27f6e25477b1884764 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 12 Feb 2016 22:45:14 +0300
Subject: [PATCH 1285/2285] obexftp: fix pkgconfig file, add license

---
 pkgs/tools/bluetooth/obexftp/default.nix | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/bluetooth/obexftp/default.nix b/pkgs/tools/bluetooth/obexftp/default.nix
index 4a40b4393c37..12b021d5d3b3 100644
--- a/pkgs/tools/bluetooth/obexftp/default.nix
+++ b/pkgs/tools/bluetooth/obexftp/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, openobex, bluez, cmake}:
+{ stdenv, fetchurl, pkgconfig, openobex, bluez, cmake }:
    
 stdenv.mkDerivation rec {
   name = "obexftp-0.24";
@@ -8,13 +8,21 @@ stdenv.mkDerivation rec {
     sha256 = "0szy7p3y75bd5h4af0j5kf0fpzx2w560fpy4kg3603mz11b9c1xr";
   };
 
-  buildInputs = [pkgconfig bluez cmake];
+  nativeBuildInputs = [ pkgconfig cmake ];
 
-  propagatedBuildInputs = [openobex];
+  buildInputs = [ bluez ];
 
-  meta = {
+  propagatedBuildInputs = [ openobex ];
+
+  # There's no such thing like "bluetooth" library; possibly they meant "bluez" but it links correctly without this.
+  postFixup = ''
+    sed -i 's,^Requires: bluetooth,Requires:,' $out/lib/pkgconfig/obexftp.pc
+  '';
+
+  meta = with stdenv.lib; {
     homepage = http://dev.zuckschwerdt.org/openobex/wiki/ObexFtp;
     description = "A library and tool to access files on OBEX-based devices (such as Bluetooth phones)";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    license = licenses.lgpl2Plus;
   };
 }

From 62365ecf1ab3c8d115d9e2fcb9009d7b07b35aba Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 12 Feb 2016 22:45:29 +0300
Subject: [PATCH 1286/2285] obexfs: cleanup, add license

---
 pkgs/tools/bluetooth/obexfs/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/bluetooth/obexfs/default.nix b/pkgs/tools/bluetooth/obexfs/default.nix
index aeeeb4bf8d0a..94c011152da6 100644
--- a/pkgs/tools/bluetooth/obexfs/default.nix
+++ b/pkgs/tools/bluetooth/obexfs/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, pkgconfig, fuse, obexftp}:
+{ stdenv, fetchurl, pkgconfig, fuse, obexftp }:
    
 stdenv.mkDerivation rec {
   name = "obexfs-0.12";
@@ -8,12 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "1g3krpygk6swa47vbmp9j9s8ahqqcl9ra8r25ybgzv2d9pmjm9kj";
   };
 
-  buildInputs = [pkgconfig fuse obexftp];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ fuse obexftp ];
 
-  NIX_LDFLAGS = "-lobexftp";
-
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://dev.zuckschwerdt.org/openobex/wiki/ObexFs;
     description = "A tool to mount OBEX-based devices (such as Bluetooth phones)";
+    platforms = platforms.linux;
+    license = licenses.lgpl2Plus;
   };
 }

From 08361aa43e723ed5fa1554c2dccd9f7595555c03 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 12 Feb 2016 22:46:28 +0300
Subject: [PATCH 1287/2285] blueman: 1.23 -> 2.0.3

---
 pkgs/tools/bluetooth/blueman/default.nix | 68 +++++++++++++-----------
 pkgs/top-level/all-packages.nix          |  3 +-
 2 files changed, 39 insertions(+), 32 deletions(-)

diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 5330dfb82bd2..82d9f085f78e 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -1,43 +1,49 @@
-{ stdenv, fetchurl, pkgconfig, intltool, python, pyrex, pygobject, pygtk
-, notify, pythonDBus, bluez, glib, gtk, libstartup_notification
-, makeWrapper, xdg_utils, obex_data_server
-, libpulseaudio
-}:
-   
-stdenv.mkDerivation rec {
-  name = "blueman-1.23";
+{ stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3
+, obex_data_server, xdg_utils, libnotify, dconf
+, withPulseAudio ? true, libpulseaudio }:
+
+let
+  binPath = lib.makeBinPath [ xdg_utils ];
+
+in stdenv.mkDerivation rec {
+  name = "blueman-${version}";
+  version = "2.0.3";
    
   src = fetchurl {
-    url = "http://download.tuxfamily.org/blueman/${name}.tar.gz";
-    sha256 = "04ghlh4h5bwp9mqr5jxcmjm01595l5fq5561qxvf369fvjy63cjh";
+    url = "https://github.com/blueman-project/blueman/releases/download/${version}/${name}.tar.xz";
+    sha256 = "09aqlk4c2qzqpmyf7b40sic7d45c1l8fyrb9f3s22b8w83j0adi4";
   };
 
-  configureFlags = "--disable-polkit";
+  nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython ];
 
-  buildInputs =
-    [ pkgconfig intltool python pyrex pygobject pygtk notify pythonDBus
-      bluez glib gtk libstartup_notification makeWrapper
-    ];
+  buildInputs = [ bluez gtk3 pythonPackages.python libnotify dconf ]
+                ++ pythonPath
+                ++ lib.optional withPulseAudio libpulseaudio;
 
-  # !!! Ugly.
-  PYTHONPATH = "${pygobject}/lib/${python.libPrefix}/site-packages/gtk-2.0:${pygtk}/lib/${python.libPrefix}/site-packages/gtk-2.0:${notify}/lib/${python.libPrefix}/site-packages/gtk-2.0";
+  postPatch = lib.optionalString withPulseAudio ''
+    sed -i 's,CDLL(",CDLL("${libpulseaudio}/lib/,g' blueman/main/PulseAudioUtils.py
+  '';
 
-  postInstall =
-    ''
-      # Create wrappers that set the environment correctly.
-      for i in $out/bin/* $out/libexec/*; do
-          wrapProgram $i \
-              --set PYTHONPATH "$(toPythonPath $out):$PYTHONPATH" \
-              --set LD_LIBRARY_PATH "${libpulseaudio}/lib:" \
-              --prefix PATH : ${xdg_utils}/bin
-      done
+  pythonPath = with pythonPackages; [ dbus pygobject3 ];
 
-      mkdir -p $out/nix-support
-      echo ${obex_data_server} > $out/nix-support/propagated-user-env-packages
-    ''; # */
+  propagatedUserEnvPkgs = [ obex_data_server ];
 
-  meta = {
-    homepage = http://blueman-project.org/;
+  configureFlags = [ (lib.enableFeature withPulseAudio "pulseaudio") ];
+
+  postFixup = ''
+    makeWrapperArgs="\
+      --prefix PATH ':' ${binPath} \
+      --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH \
+      --prefix XDG_DATA_DIRS : $GSETTINGS_SCHEMAS_PATH \
+      --prefix GIO_EXTRA_MODULES : ${dconf}/lib/gio/modules"
+    wrapPythonPrograms
+  '';
+
+  meta = with lib; {
+    homepage = https://github.com/blueman-project;
     description = "GTK+-based Bluetooth Manager";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a760c007ea02..856ee80916e6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1012,7 +1012,8 @@ let
   bittornado = callPackage ../tools/networking/p2p/bit-tornado { };
 
   blueman = callPackage ../tools/bluetooth/blueman {
-    inherit (pythonPackages) notify;
+    inherit (gnome3) dconf;
+    withPulseAudio = config.pulseaudio or true;
   };
 
   bmrsa = callPackage ../tools/security/bmrsa/11.nix { };

From dc82532eb8fdf86ea37852bc846bf69ba03987b3 Mon Sep 17 00:00:00 2001
From: = <anothersms@gmail.com>
Date: Fri, 12 Feb 2016 20:49:26 +0100
Subject: [PATCH 1288/2285] timemachine: init at 0.3.1

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

diff --git a/pkgs/applications/audio/timemachine/default.nix b/pkgs/applications/audio/timemachine/default.nix
new file mode 100644
index 000000000000..55e95c0fc156
--- /dev/null
+++ b/pkgs/applications/audio/timemachine/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, gtk2
+, libjack2, libsndfile
+}:
+
+stdenv.mkDerivation rec {
+  name = "timemachine-${version}";
+  version = "0.3.1";
+  src = fetchFromGitHub {
+    owner = "swh";
+    repo = "timemachine";
+    rev = "1966d8524d4e4c47c525473bab3b010a168adc98";
+    sha256 = "0w5alysixnvlkfl79wf7vs5wsw2vgxl3gqxxcm0zbmhjdpmjpcal";
+  };
+
+    buildInputs = [ autoconf automake pkgconfig gtk2 libjack2
+      libsndfile
+    ];
+
+  preConfigure = "./autogen.sh";
+
+  meta = {
+    description = "JACK audio recorder";
+    homepage = http://plugin.org.uk/timemachine/;
+    license = stdenv.lib.licenses.lgpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.nico202 ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21dbbd6e9960..9ef4dd250cab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3324,6 +3324,8 @@ let
 
   tiled = qt5.callPackage ../applications/editors/tiled { };
 
+  timemachine = callPackage ../applications/audio/timemachine { };
+
   tinc = callPackage ../tools/networking/tinc { };
 
   tinc_pre = callPackage ../tools/networking/tinc/pre.nix { };

From d6f38f5fd8eee01927831efc59c8ee1e8686b9ee Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 12 Feb 2016 20:33:15 +0100
Subject: [PATCH 1289/2285] xmonad-contrib: drop obsolete overrides

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index bbf98df8079f..33914203b2e6 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -627,14 +627,6 @@ self: super: {
   # https://github.com/haskell/haddock/issues/378
   haddock-library = dontCheck super.haddock-library;
 
-  # Already fixed in upstream darcs repo.
-  xmonad-contrib = overrideCabal super.xmonad-contrib (drv: {
-    postPatch = ''
-      sed -i -e '24iimport Control.Applicative' XMonad/Util/Invisible.hs
-      sed -i -e '22iimport Control.Applicative' XMonad/Hooks/DebugEvents.hs
-    '';
-  });
-
   # https://github.com/anton-k/csound-expression-dynamic/issues/1
   csound-expression-dynamic = dontHaddock super.csound-expression-dynamic;
 

From e771dc4b06b940c00f53244de5cbd356091d7829 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 12 Feb 2016 21:03:17 +0100
Subject: [PATCH 1290/2285] haskell-hans: drop obsolete patch

---
 .../haskell-modules/configuration-common.nix          |  3 ---
 .../patches/hans-disable-webserver.patch              | 11 -----------
 2 files changed, 14 deletions(-)
 delete mode 100644 pkgs/development/haskell-modules/patches/hans-disable-webserver.patch

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 33914203b2e6..6030ec11afd9 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -765,9 +765,6 @@ self: super: {
   elm-server = markBroken super.elm-server;
   elm-yesod = markBroken super.elm-yesod;
 
-  # https://github.com/GaloisInc/HaNS/pull/8
-  hans = appendPatch super.hans ./patches/hans-disable-webserver.patch;
-
   # https://github.com/athanclark/sets/issues/2
   sets = dontCheck super.sets;
 
diff --git a/pkgs/development/haskell-modules/patches/hans-disable-webserver.patch b/pkgs/development/haskell-modules/patches/hans-disable-webserver.patch
deleted file mode 100644
index 14f7e51fdf2c..000000000000
--- a/pkgs/development/haskell-modules/patches/hans-disable-webserver.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Naur hans-2.5.0.0/hans.cabal hans-2.5.0.1/hans.cabal
---- hans-2.5.0.0/hans.cabal     2015-08-06 14:48:45.453072822 +0300
-+++ hans-2.5.0.1/hans.cabal     2015-08-06 14:49:13.044391528 +0300
-@@ -30,6 +30,7 @@
-         description:    Build the example program
-
- flag web-server
-+        default:        False
-         description:    Build a simple web-server example
-
- flag word32-in-random

From 328d9967d350f4542c5befa049c9c2cec4bf8d3f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 12 Feb 2016 21:07:11 +0100
Subject: [PATCH 1291/2285] haskell-pandoc: drop obsolete override

---
 .../haskell-modules/configuration-common.nix           | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 6030ec11afd9..18b7dbfc03be 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -605,14 +605,8 @@ self: super: {
   # https://github.com/junjihashimoto/test-sandbox-compose/issues/2
   test-sandbox-compose = dontCheck super.test-sandbox-compose;
 
-  # https://github.com/jgm/pandoc/issues/2190
-  pandoc = overrideCabal super.pandoc (drv: {
-    enableSharedExecutables = false;
-    postInstall = ''            # install man pages
-      mv man $out/
-      find $out/man -type f ! -name "*.[0-9]" -exec rm {} +
-    '';
-  });
+  # https://github.com/jgm/pandoc/issues/2709
+  pandoc = disableSharedExecutables super.pandoc;
 
   # Tests attempt to use NPM to install from the network into
   # /homeless-shelter. Disabled.

From 7f1b6d8a315042500e565fcf01023fd263e22080 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 12 Feb 2016 21:46:43 +0100
Subject: [PATCH 1292/2285] calibre: 2.50.1 -> 2.51.0

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 010deb0b17e4..5e1bebf900c2 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.50.1";
+  version = "2.51.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "0fy5fwj53hl8bcl412d2y61xm1nmkry24dlanj07nn6dhmrs0cm9";
+    sha256 = "1rhpcxic4g2zyr5s3xn8dayyb45l9r8zyniaig8j7pl5kmsfjijn";
   };
 
   inherit python;

From d9739ebcc21a778eb0971361943126ab4b3043c9 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Fri, 12 Feb 2016 20:51:13 +0000
Subject: [PATCH 1293/2285] plot.ly: upgrade to 1.9.5

(cherry picked from commit 104fde593d26c4497fec227aabf5d9bb84ef44de)
---
 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 e18bf816725e..5694d65a0163 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6628,13 +6628,13 @@ in modules // {
     };
   };
 
-  plotly = buildPythonPackage rec {
-    name = "plotly-1.9.1";
+  plotly = self.buildPythonPackage rec {
+    name = "plotly-1.9.5";
     disabled = isPy3k;
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/plotly/${name}.tar.gz";
-      md5 = "84fe80b294b639357f12fa210ce09f95";
+      md5 = "56fb77dff80325413c8cf40cf229ce90";
     };
 
     propagatedBuildInputs = with self; [ self.pytz self.six self.requests ];

From b7b6a672df1af5e2ae6e040cbcd7d6107f7c5aa3 Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Fri, 12 Feb 2016 20:59:55 +0000
Subject: [PATCH 1294/2285] {lib}mediainfo{-gui}: 0.7.81 -> 0.7.82

Built and tested locally.

From the changelog:
```
Version 0.7.82, 2016-01-27
+ Matroska: CRC-32 validation
+ Matroska: support of padding/junk at the start of a segment
+ Matroska: trace is activated for all elements (but report is still
  based on the first element met)
+ Matroska: add an intermediate level in the trace for the raw stream
  parser
x FLV: potential infinite loop fixed
x #B966, DTS: DTS-HD HR 3840 not detected anymore
x AC-3: wrong sample rate with 32 kHz streams
x #B948, EBUCore 1.6: invalid output due to position of
  containerEncoding element
x #B957, MPEG-7 output: No XML encoded value output
```
---
 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 687584de553d..ffb4c147c776 100644
--- a/pkgs/applications/misc/mediainfo-gui/default.nix
+++ b/pkgs/applications/misc/mediainfo-gui/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.81";
+  version = "0.7.82";
   name = "mediainfo-gui-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "1aah8y4kqhghqhcfm6ydgf3hj6q05dllfh0m1lbaij0y8yrrwz07";
+    sha256 = "0ivvmxx93aldfbms6wg46x9npghg304j2zxl5i70m710gybjr232";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ];
diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix
index 50454308fd20..5d953fed53a9 100644
--- a/pkgs/applications/misc/mediainfo/default.nix
+++ b/pkgs/applications/misc/mediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.81";
+  version = "0.7.82";
   name = "mediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.xz";
-    sha256 = "1aah8y4kqhghqhcfm6ydgf3hj6q05dllfh0m1lbaij0y8yrrwz07";
+    sha256 = "0ivvmxx93aldfbms6wg46x9npghg304j2zxl5i70m710gybjr232";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ];
diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix
index 19d0b84f69e3..2bc18a5a61da 100644
--- a/pkgs/development/libraries/libmediainfo/default.nix
+++ b/pkgs/development/libraries/libmediainfo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }:
 
 stdenv.mkDerivation rec {
-  version = "0.7.81";
+  version = "0.7.82";
   name = "libmediainfo-${version}";
   src = fetchurl {
     url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.xz";
-    sha256 = "0hzfrg7n7wlnwq28hmpxczis1k8x73wbwlsmfkshvqcwi7lva0cs";
+    sha256 = "1mqmk1q2phwqwrak54jc9hfwjllhhr4nqyigisrh9rcvd6wx6r86";
   };
 
   buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ];

From 16d6eb45f18fe94885d25a729313a2387765d60f Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Sat, 13 Feb 2016 05:13:49 +0100
Subject: [PATCH 1295/2285] imv: 1.2.0 -> 2.0.0

---
 pkgs/applications/graphics/imv/default.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/graphics/imv/default.nix b/pkgs/applications/graphics/imv/default.nix
index 9298c764d286..5be5a8b161db 100644
--- a/pkgs/applications/graphics/imv/default.nix
+++ b/pkgs/applications/graphics/imv/default.nix
@@ -1,19 +1,16 @@
-{ stdenv, fetchFromGitHub,
-  SDL2, freeimage
-}:
+{ stdenv, fetchgit, SDL2, SDL2_ttf, freeimage }:
 
 stdenv.mkDerivation rec {
   name = "imv-${version}";
-  version = "1.1.0";
+  version = "2.0.0";
 
-  src = fetchFromGitHub {
-    owner = "eXeC64";
-    repo  = "imv";
-    rev = "4d1a6d581b70b25d9533c5c788aab6900ebf82bb";
-    sha256 = "1c5r4pqqypir8ymicxyn2k7mhq8nl88b3x6giaafd77ssjn0vz9r";
+  src = fetchgit {
+    url = "https://github.com/eXeC64/imv.git";
+    rev = "bc90a0adcc5b22d2bf0158333eb6dfb34c402d48";
+    sha256 = "1bzx57d9mcxw9s72pdbdbwq9pns946jl6p2g881z43w68gimlpw7";
   };
 
-  buildInputs = [ SDL2 freeimage ];
+  buildInputs = [ SDL2 SDL2_ttf freeimage ];
 
   configurePhase = "substituteInPlace Makefile --replace /usr $out";
 

From d12399f3f5e58b11402c43ef7616c57022963d67 Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Sat, 13 Feb 2016 05:50:09 +0100
Subject: [PATCH 1296/2285] irssi-otr: 1.0.0 -> 1.0.1

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

diff --git a/pkgs/applications/networking/irc/irssi/otr/default.nix b/pkgs/applications/networking/irc/irssi/otr/default.nix
index bf462c09f54a..6bbe9c6c1401 100644
--- a/pkgs/applications/networking/irc/irssi/otr/default.nix
+++ b/pkgs/applications/networking/irc/irssi/otr/default.nix
@@ -3,13 +3,13 @@
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "irssi-otr-${version}";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "cryptodotis";
     repo = "irssi-otr";
-    rev = "v${version}";
-    sha256 = "139jawz3la6k91fy5kpgr6zvljl14n0fdpz72n2zw6wql69xlnnl";
+    rev = "4ad3b7b6c85be0154ab3694fe9831796db20c4fe";
+    sha256 = "1hm1whx1wzlx4fh4xf2y68rx9x6whi8bsbrhd6hqjhskg5msssrg";
   };
 
   patchPhase = ''

From 9c249a3adfbe07d31b2693ab9a3081cf37371435 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sat, 13 Feb 2016 15:22:19 +0100
Subject: [PATCH 1297/2285] nixos: i2pd, make config options adhere to version
 2.4.0

---
 nixos/modules/services/networking/i2pd.nix | 294 ++++++++-------------
 1 file changed, 108 insertions(+), 186 deletions(-)

diff --git a/nixos/modules/services/networking/i2pd.nix b/nixos/modules/services/networking/i2pd.nix
index af9424ecfeaf..e73316a9b1e8 100644
--- a/nixos/modules/services/networking/i2pd.nix
+++ b/nixos/modules/services/networking/i2pd.nix
@@ -12,21 +12,69 @@ let
 
   toOneZero = b: if b then "1" else "0";
 
+  mkEndpointOpt = name: addr: port: {
+    name = mkOption {
+      type = types.str;
+      default = name;
+      description = "The endpoint name.";
+    };
+    address = mkOption {
+      type = types.str;
+      default = addr;
+      description = "Bind address for ${name} endpoint. Default: " + addr;
+    };
+    port = mkOption {
+      type = types.int;
+      default = port;
+      description = "Bind port for ${name} endoint. Default: " + toString port;
+    };
+  };
+
+  commonTunOpts = let
+    i2cpOpts = {
+      length = mkOption {
+        type = types.int;
+        description = "Guaranteed minimum hops.";
+        default = 3;
+      };
+      quantity = mkOption {
+        type = types.int;
+        description = "Number of simultaneous tunnels.";
+        default = 5;
+      };
+    };
+  in name: {
+    outbound = i2cpOpts;
+    inbound = i2cpOpts;
+    crypto.tagsToSend = mkOption {
+      type = types.int;
+      description = "Number of ElGamal/AES tags to send.";
+      default = 40;
+    };
+   destination = mkOption {
+      type = types.str;
+      description = "Remote endpoint, I2P hostname or b32.i2p address.";
+    };
+    keys = mkOption {
+      type = types.str;
+      default = name + "-keys.dat";
+      description = "Keyset used for tunnel identity.";
+    };
+  } // mkEndpointOpt name "127.0.0.1" 0;
+
   i2pdConf = pkgs.writeText "i2pd.conf" ''
-      v6 = ${toOneZero cfg.enableIPv6}
-      unreachable = ${toOneZero cfg.unreachable}
+      ipv6 = ${toOneZero cfg.enableIPv6}
+      notransit = ${toOneZero cfg.notransit}
       floodfill = ${toOneZero cfg.floodfill}
       ${if isNull cfg.port then "" else "port = ${toString cfg.port}"}
-      httpproxyport = ${toString cfg.proxy.httpPort}
-      socksproxyport = ${toString cfg.proxy.socksPort}
-      ircaddress = ${cfg.irc.host}
-      ircport = ${toString cfg.irc.port}
-      ircdest = ${cfg.irc.dest}
-      irckeys = ${cfg.irc.keyFile}
-      eepport = ${toString cfg.eep.port}
-      ${if isNull cfg.sam.port then "" else "--samport=${toString cfg.sam.port}"}
-      eephost = ${cfg.eep.host}
-      eepkeys = ${cfg.eep.keyFile}
+      ${flip concatMapStrings
+        (collect (proto: proto ? port && proto ? address && proto ? name) cfg.proto)
+        (proto: let portStr = toString proto.port; in ''
+      [${proto.name}]
+      address = ${proto.address}
+      port = ${toString proto.port}
+      '')
+      }
   '';
 
   i2pdTunnelConf = pkgs.writeText "i2pd-tunnels.conf" ''
@@ -39,10 +87,15 @@ let
   keys = ${tun.keys}
   address = ${tun.address}
   port = ${toString tun.port}
+  inbound.length = ${toString tun.inbound.length}
+  outbound.length = ${toString tun.outbound.length}
+  inbound.quantity = ${toString tun.inbound.quantity}
+  outbound.quantity = ${toString tun.outbound.quantity}
+  crypto.tagsToSend = ${toString tun.crypto.tagsToSend}
   '')
   }
   ${flip concatMapStrings
-    (collect (tun: tun ? port && tun ? host) cfg.outTunnels)
+    (collect (tun: tun ? port && tun ? host) cfg.inTunnels)
     (tun: let portStr = toString tun.port; in ''
   [${tun.name}]
   type = server
@@ -59,10 +112,10 @@ let
   i2pdSh = pkgs.writeScriptBin "i2pd" ''
     #!/bin/sh
     ${if isNull cfg.extIp then extip else ""}
-    ${pkgs.i2pd}/bin/i2pd --log=1 --daemon=0 --service=0 \
+    ${pkgs.i2pd}/bin/i2pd --log=1 \
       --host=${if isNull cfg.extIp then "$EXTIP" else cfg.extIp} \
       --conf=${i2pdConf} \
-      --tunnelscfg=${i2pdTunnelConf}
+      --tunconf=${i2pdTunnelConf}
   '';
 
 in
@@ -91,11 +144,11 @@ in
         '';
       };
 
-      unreachable = mkOption {
+      notransit = mkOption {
         type = types.bool;
         default = false;
         description = ''
-          If the router is declared to be unreachable and needs introduction nodes.
+          Tells the router to not accept transit tunnels during startup.
         '';
       };
 
@@ -111,7 +164,7 @@ in
         type = with types; nullOr int;
         default = null;
         description = ''
-	        I2P listen port. If no one is given the router will pick between 9111 and 30777.
+          I2P listen port. If no one is given the router will pick between 9111 and 30777.
         '';
       };
 
@@ -123,184 +176,53 @@ in
         '';
       };
 
-      http = {
-        port = mkOption {
-          type = types.int;
-          default = 7070;
-          description = ''
-            HTTP listen port.
-          '';
-        };
-      };
-
-      proxy = {
-        httpPort = mkOption {
-          type = types.int;
-          default = 4446;
-          description = ''
-            HTTP proxy listen port.
-          '';
-        };
-        socksPort = mkOption {
-          type = types.int;
-          default = 4447;
-          description = ''
-            SOCKS proxy listen port.
-          '';
-        };
-      };
-
-      irc = {
-        host = mkOption {
-          type = types.str;
-          default = "127.0.0.1";
-          description = ''
-            Address to forward incoming traffic to. 127.0.0.1 by default.
-          '';
-        };
-        dest = mkOption {
-          type = types.str;
-          default = "irc.postman.i2p";
-          description = ''
-            Destination I2P tunnel endpoint address of IRC server. irc.postman.i2p by default.
-          '';
-        };
-        port = mkOption {
-          type = types.int;
-          default = 6668;
-          description = ''
-            Local IRC tunnel endoint port to listen on. 6668 by default.
-          '';
-        };
-        keyFile = mkOption {
-          type = types.str;
-          default = "privKeys.dat";
-          description = ''
-            File name containing destination keys. privKeys.dat by default.
-          '';
-        };
-      };
-
-      eep = {
-        host = mkOption {
-          type = types.str;
-          default = "127.0.0.1";
-          description = ''
-            Address to forward incoming traffic to. 127.0.0.1 by default.
-          '';
-        };
-        port = mkOption {
-          type = types.int;
-          default = 80;
-          description = ''
-            Port to forward incoming traffic to. 80 by default.
-          '';
-        };
-        keyFile = mkOption {
-          type = types.str;
-          default = "privKeys.dat";
-          description = ''
-            File name containing destination keys. privKeys.dat by default.
-          '';
-        };
-      };
-
-      sam = {
-        port = mkOption {
-          type = with types; nullOr int;
-          default = null;
-          description = ''
-            Local SAM tunnel endpoint. Usually 7656. SAM is disabled if not specified.
-          '';
-        };
-      };
+      proto.http = mkEndpointOpt "http" "127.0.0.1" 7070;
+      proto.sam = mkEndpointOpt "sam" "127.0.0.1" 7656;
+      proto.bob = mkEndpointOpt "bob" "127.0.0.1" 2827;
+      proto.i2pControl = mkEndpointOpt "i2pcontrol" "127.0.0.1" 7650;
+      proto.httpProxy = mkEndpointOpt "httpproxy" "127.0.0.1" 4446;
+      proto.socksProxy = mkEndpointOpt "socksproxy" "127.0.0.1" 4447;
 
       outTunnels = mkOption {
         default = {};
-	      type = with types; loaOf optionSet;
-	      description = ''
-	      '';
-	      options = [ ({ name, config, ... }: {
-
-	        options = {
-	          name = mkOption {
-	            type = types.str;
-	            description = "The name of the tunnel.";
-	          };
-	          destination = mkOption {
-	            type = types.str;
-	            description = "Remote endpoint, I2P hostname or b32.i2p address.";
-	          };
-	          keys = mkOption {
-	            type = types.str;
-	            default = name + "-keys.dat";
-	            description = "Keyset used for tunnel identity.";
-	          };
-	          address = mkOption {
-	            type = types.str;
-	            default = "127.0.0.1";
-	            description = "Local bind address for tunnel.";
-	          };
-	          port = mkOption {
-	            type = types.int;
-	            default = 0;
-	            description = "Local tunnel listen port.";
-	          };
-	        };
-
-	        config = {
-	          name = mkDefault name;
-	        };
-
-	      }) ];
+        type = with types; loaOf optionSet;
+        description = ''
+          Connect to someone as a client and establish a local accept endpoint
+        '';
+        options = [ ({ name, config, ... }: {
+          options = commonTunOpts name;
+          config = {
+            name = mkDefault name;
+          };
+        }) ];
       };
 
       inTunnels = mkOption {
         default = {};
-	      type = with types; loaOf optionSet;
-	      description = ''
-	      '';
-	      options = [ ({ name, config, ... }: {
+        type = with types; loaOf optionSet;
+        description = ''
+          Serve something on I2P network at port and delegate requests to address inPort.
+        '';
+        options = [ ({ name, config, ... }: {
 
-	        options = {
+          options = {
+            inPort = mkOption {
+              type = types.int;
+              default = 0;
+              description = "Service port. Default to the tunnel's listen port.";
+            };
+            accessList = mkOption {
+              type = with types; listOf str;
+              default = [];
+              description = "I2P nodes that are allowed to connect to this service.";
+            };
+          } // commonTunOpts name;
 
-	          name = mkOption {
-	            type = types.str;
-	            description = "The name of the tunnel.";
-	          };
-	          keys = mkOption {
-	            type = types.path;
-	            default = name + "-keys.dat";
-	            description = "Keyset used for tunnel identity.";
-	          };
-	          address = mkOption {
-	            type = types.str;
-	            default = "127.0.0.1";
-	            description = "Local service IP address.";
-	          };
-	          port = mkOption {
-	            type = types.int;
-	            default = 0;
-	            description = "Local tunnel listen port.";
-	          };
-	          inPort = mkOption {
-	            type = types.int;
-	            default = 0;
-	            description = "I2P service port. Default to the tunnel's listen port.";
-	          };
-	          accessList = mkOption {
-	            type = with types; listOf str;
-	            default = [];
-	            description = "I2P nodes that are allowed to connect to this service.";
-	          };
+          config = {
+            name = mkDefault name;
+          };
 
-	        };
-
-	        config = {
-	          name = mkDefault name;
-	        };
-
-	      }) ];
+        }) ];
       };
     };
   };

From 02f5a01c196bd68700d1122b4a88dbdad48e1393 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 24 Jan 2016 14:49:08 +0000
Subject: [PATCH 1298/2285] nix-prefetch-git: use fetchgit's naming heuristic

This commit fixes #6651.

Before this change the `nix-prefetch-git` script would use a different store
name than nix's `fetchgit` function. Because of that it was not possible to
use `nix-prefetch-git` as a way to pre-populate the store (for example when
the user it using private git dependencies that needs access to the ssh agent)
---
 pkgs/build-support/fetchgit/nix-prefetch-git | 23 +++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 945ba592a0ae..2c5852c646e4 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -102,6 +102,23 @@ hash_from_ref(){
     git ls-remote origin | sed -n "\,\t$ref, { s,\(.*\)\t\(.*\),\1,; p; q}"
 }
 
+# Returns a name based on the url and reference
+#
+# This function needs to be in sync with nix's fetchgit implementation
+# of urlToName() to re-use the same nix store paths.
+url_to_name(){
+    local url=$1
+    local ref=$2
+    # basename removes the / and .git suffixes
+    local base=$(basename "$url" .git)
+
+    if [[ $ref =~ [a-z0-9]+ ]]; then
+        echo "$base-${ref:0:7}"
+    else
+        echo $base
+    fi
+}
+
 # Fetch everything and checkout the right sha1
 checkout_hash(){
     local hash="$1"
@@ -288,7 +305,7 @@ else
     # If the hash was given, a file with that hash may already be in the
     # store.
     if test -n "$expHash"; then
-        finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" git-export)
+        finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" "$(url_to_name "$url" "$rev")")
         if ! nix-store --check-validity "$finalPath" 2> /dev/null; then
             finalPath=
         fi
@@ -302,7 +319,7 @@ else
         tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/git-checkout-tmp-XXXXXXXX")"
         trap "rm -rf \"$tmpPath\"" EXIT
 
-        tmpFile="$tmpPath/git-export"
+        tmpFile="$tmpPath/$(url_to_name "$url" "$rev")"
         mkdir "$tmpFile"
 
         # Perform the checkout.
@@ -313,7 +330,7 @@ else
         if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi
 
         # Add the downloaded file to the Nix store.
-        finalPath=$(nix-store --add-fixed --recursive "$hashType" $tmpFile)
+        finalPath=$(nix-store --add-fixed --recursive "$hashType" "$tmpFile")
 
         if test -n "$expHash" -a "$expHash" != "$hash"; then
             echo "hash mismatch for URL \`$url'"

From e1493f2ba77f17dd397d798752a49408956a38c8 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 13 Feb 2016 13:54:27 +0000
Subject: [PATCH 1299/2285] logstash module: use literalExample

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

diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
index e019e6c3f237..d27456e59e88 100644
--- a/nixos/modules/services/logging/logstash.nix
+++ b/nixos/modules/services/logging/logstash.nix
@@ -85,7 +85,7 @@ in
         type = types.lines;
         default = ''stdin { type => "example" }'';
         description = "Logstash input configuration.";
-        example = ''
+        example = literalExample ''
           # Read from journal
           pipe {
             command => "''${pkgs.systemd}/bin/journalctl -f -o json"
@@ -98,7 +98,7 @@ in
         type = types.lines;
         default = ''noop {}'';
         description = "logstash filter configuration.";
-        example = ''
+        example = literalExample ''
           if [type] == "syslog" {
             # Keep only relevant systemd fields
             # http://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html
@@ -114,7 +114,7 @@ in
 
       outputConfig = mkOption {
         type = types.lines;
-        default = ''stdout { debug => true debug_format => "json"}'';
+        default = literalExample ''stdout { debug => true debug_format => "json"}'';
         description = "Logstash output configuration.";
         example = ''
           redis { host => "localhost" data_type => "list" key => "logstash" codec => json }

From c2b578386ea6950f23b2085848b3797c37608108 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 13 Feb 2016 14:01:45 +0000
Subject: [PATCH 1300/2285] kibana: fix pkg and module

---
 nixos/modules/services/search/kibana.nix      | 59 ++++++++-----------
 .../development/tools/misc/kibana/default.nix |  1 +
 2 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/nixos/modules/services/search/kibana.nix b/nixos/modules/services/search/kibana.nix
index 4263ed22a8db..033b8139d341 100644
--- a/nixos/modules/services/search/kibana.nix
+++ b/nixos/modules/services/search/kibana.nix
@@ -7,37 +7,33 @@ let
 
   cfgFile = pkgs.writeText "kibana.json" (builtins.toJSON (
     (filterAttrsRecursive (n: v: v != null) ({
-      server = {
-        host = cfg.listenAddress;
-        port = cfg.port;
-        ssl = {
-          cert = cfg.cert;
-          key = cfg.key;
-        };
-      };
+      host = cfg.listenAddress;
+      port = cfg.port;
+      ssl_cert_file = cfg.cert;
+      ssl_key_file = cfg.key;
 
-      kibana = {
-        index = cfg.index;
-        defaultAppId = cfg.defaultAppId;
-      };
+      kibana_index = cfg.index;
+      default_app_id = cfg.defaultAppId;
 
-      elasticsearch = {
-        url = cfg.elasticsearch.url;
-        username = cfg.elasticsearch.username;
-        password = cfg.elasticsearch.password;
-        ssl = {
-          cert = cfg.elasticsearch.cert;
-          key = cfg.elasticsearch.key;
-          ca = cfg.elasticsearch.ca;
-        };
-      };
+      elasticsearch_url = cfg.elasticsearch.url;
+      kibana_elasticsearch_username = cfg.elasticsearch.username;
+      kibana_elasticsearch_password = cfg.elasticsearch.password;
+      kibana_elasticsearch_cert = cfg.elasticsearch.cert;
+      kibana_elasticsearch_key = cfg.elasticsearch.key;
+      ca = cfg.elasticsearch.ca;
 
-      logging = {
-        verbose = cfg.logLevel == "verbose";
-        quiet = cfg.logLevel == "quiet";
-        silent = cfg.logLevel == "silent";
-        dest = "stdout";
-      };
+      bundled_plugin_ids = [
+        "plugins/dashboard/index"
+        "plugins/discover/index"
+        "plugins/doc/index"
+        "plugins/kibana/index"
+        "plugins/markdown_vis/index"
+        "plugins/metric_vis/index"
+        "plugins/settings/index"
+        "plugins/table_vis/index"
+        "plugins/vis_types/index"
+        "plugins/visualize/index"
+      ];
     } // cfg.extraConf)
   )));
 in {
@@ -118,12 +114,6 @@ in {
       };
     };
 
-    logLevel = mkOption {
-      description = "Kibana log level";
-      default = "normal";
-      type = types.enum ["verbose" "normal" "silent" "quiet"];
-    };
-
     package = mkOption {
       description = "Kibana package to use";
       default = pkgs.kibana;
@@ -149,6 +139,7 @@ in {
       description = "Kibana Service";
       wantedBy = [ "multi-user.target" ];
       after = [ "network-interfaces.target" "elasticsearch.service" ];
+      environment = { BABEL_CACHE_PATH = "${cfg.dataDir}/.babelcache.json"; };
       serviceConfig = {
         ExecStart = "${cfg.package}/bin/kibana --config ${cfgFile}";
         User = "kibana";
diff --git a/pkgs/development/tools/misc/kibana/default.nix b/pkgs/development/tools/misc/kibana/default.nix
index 699ddd16c237..188c3df78fcf 100644
--- a/pkgs/development/tools/misc/kibana/default.nix
+++ b/pkgs/development/tools/misc/kibana/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
     rm -r $out/libexec/kibana/node
     makeWrapper $out/libexec/kibana/bin/kibana $out/bin/kibana \
       --prefix PATH : "${nodejs}/bin:${coreutils}/bin:${which}/bin"
+    sed -i 's@NODE=.*@NODE=${nodejs}/bin/node@' $out/libexec/kibana/bin/kibana
   '';
 
   meta = {

From 4bc9e8a785b9e8754ca533f64df30a040b195d30 Mon Sep 17 00:00:00 2001
From: Markus Wotringer <markus@wotringer.de>
Date: Fri, 4 Dec 2015 01:12:25 +0100
Subject: [PATCH 1301/2285] elasticsearch2: init at 2.2.0

changes by @globin:
 * updated 2.1.0 to 2.2.0
 * moved to a new derivation

closes #11446

Signed-off-by: Robin Gloster <mail@glob.in>
---
 .../modules/services/search/elasticsearch.nix | 13 ++++--
 pkgs/servers/search/elasticsearch/2.x.nix     | 41 +++++++++++++++++++
 .../search/elasticsearch/es-home-2.x.patch    | 31 ++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 4 files changed, 82 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/servers/search/elasticsearch/2.x.nix
 create mode 100644 pkgs/servers/search/elasticsearch/es-home-2.x.patch

diff --git a/nixos/modules/services/search/elasticsearch.nix b/nixos/modules/services/search/elasticsearch.nix
index 356cfd409ad4..31332489a784 100644
--- a/nixos/modules/services/search/elasticsearch.nix
+++ b/nixos/modules/services/search/elasticsearch.nix
@@ -9,6 +9,8 @@ let
     network.host: ${cfg.listenAddress}
     network.port: ${toString cfg.port}
     network.tcp.port: ${toString cfg.tcp_port}
+    # TODO: find a way to enable security manager
+    security.manager.enabled: false
     cluster.name: ${cfg.cluster_name}
     ${cfg.extraConf}
   '';
@@ -39,8 +41,8 @@ in {
 
     package = mkOption {
       description = "Elasticsearch package to use.";
-      default = pkgs.elasticsearch;
-      defaultText = "pkgs.elasticsearch";
+      default = pkgs.elasticsearch2;
+      defaultText = "pkgs.elasticsearch2";
       type = types.package;
     };
 
@@ -129,7 +131,9 @@ in {
       wantedBy = [ "multi-user.target" ];
       after = [ "network-interfaces.target" ];
       path = [ pkgs.inetutils ];
-      environment = { ES_HOME = cfg.dataDir; };
+      environment = {
+        ES_HOME = cfg.dataDir;
+      };
       serviceConfig = {
         ExecStart = "${cfg.package}/bin/elasticsearch -Des.path.conf=${configDir} ${toString cfg.extraCmdLineOptions}";
         User = "elasticsearch";
@@ -137,10 +141,11 @@ in {
       };
       preStart = ''
         mkdir -m 0700 -p ${cfg.dataDir}
-        if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi
 
         # Install plugins
         ln -sfT ${esPlugins}/plugins ${cfg.dataDir}/plugins
+        ln -sfT ${cfg.package}/lib ${cfg.dataDir}/lib
+        if [ "$(id -u)" = 0 ]; then chown -R elasticsearch ${cfg.dataDir}; fi
       '';
       postStart = mkBefore ''
         until ${pkgs.curl}/bin/curl -s -o /dev/null ${cfg.listenAddress}:${toString cfg.port}; do
diff --git a/pkgs/servers/search/elasticsearch/2.x.nix b/pkgs/servers/search/elasticsearch/2.x.nix
new file mode 100644
index 000000000000..a37703ae7fd7
--- /dev/null
+++ b/pkgs/servers/search/elasticsearch/2.x.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, makeWrapper, jre, utillinux, getopt }:
+
+with stdenv.lib;
+
+stdenv.mkDerivation rec {
+  version = "2.2.0";
+  name = "elasticsearch-${version}";
+
+  src = fetchurl {
+    url = "https://download.elasticsearch.org/elasticsearch/release/org/elasticsearch/distribution/tar/elasticsearch/${version}/${name}.tar.gz";
+    sha256 = "0c2d0mpcr8lpvifvgp2pfj7avdi7fa8a5vib0gqdap7mw60wqw7d";
+  };
+
+  patches = [ ./es-home-2.x.patch ];
+
+  buildInputs = [ makeWrapper jre ] ++
+    (if (!stdenv.isDarwin) then [utillinux] else [getopt]);
+
+  installPhase = ''
+    mkdir -p $out
+    cp -R bin config lib $out
+
+    # don't want to have binary with name plugin
+    mv $out/bin/plugin $out/bin/elasticsearch-plugin
+       wrapProgram $out/bin/elasticsearch ${if (!stdenv.isDarwin)
+        then ''--prefix PATH : "${utillinux}/bin/"''
+        else ''--prefix PATH : "${getopt}/bin"''} \
+      --set JAVA_HOME "${jre}"
+    wrapProgram $out/bin/elasticsearch-plugin --set JAVA_HOME "${jre}"
+  '';
+
+  meta = {
+    description = "Open Source, Distributed, RESTful Search Engine";
+    license = licenses.asl20;
+    platforms = platforms.unix;
+    maintainers = [
+      maintainers.offline
+      maintainers.markWot
+    ];
+  };
+}
diff --git a/pkgs/servers/search/elasticsearch/es-home-2.x.patch b/pkgs/servers/search/elasticsearch/es-home-2.x.patch
new file mode 100644
index 000000000000..0c80e8651145
--- /dev/null
+++ b/pkgs/servers/search/elasticsearch/es-home-2.x.patch
@@ -0,0 +1,31 @@
+diff -rupN a/bin/elasticsearch b/bin/elasticsearch
+--- a/bin/elasticsearch	2015-11-18 21:48:18.000000000 +0100
++++ b/bin/elasticsearch	2015-12-04 00:52:21.032475098 +0100
+@@ -72,7 +72,11 @@ while [ -h "$SCRIPT" ] ; do
+ done
+ 
+ # determine elasticsearch home
+-ES_HOME=`dirname "$SCRIPT"`/..
++
++if [ -z "$ES_HOME" ]; then
++    echo "You must set the ES_HOME var" >&2
++    exit 1
++fi
+ 
+ # make ELASTICSEARCH_HOME absolute
+ ES_HOME=`cd "$ES_HOME"; pwd`
+diff -rupN a/bin/plugin b/bin/plugin
+--- a/bin/plugin	2015-11-18 21:48:18.000000000 +0100
++++ b/bin/plugin	2015-12-04 00:52:55.947453619 +0100
+@@ -17,7 +17,10 @@ while [ -h "$SCRIPT" ] ; do
+ done
+ 
+ # determine elasticsearch home
+-ES_HOME=`dirname "$SCRIPT"`/..
++if [ -z "$ES_HOME" ]; then
++    echo "You must set the ES_HOME var" >&2
++    exit 1
++fi
+ 
+ # make ELASTICSEARCH_HOME absolute
+ ES_HOME=`cd "$ES_HOME"; pwd`
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21dbbd6e9960..5e8312764dda 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1437,6 +1437,7 @@ let
   evemu = callPackage ../tools/system/evemu { };
 
   elasticsearch = callPackage ../servers/search/elasticsearch { };
+  elasticsearch2 = callPackage ../servers/search/elasticsearch/2.x.nix { };
 
   elasticsearchPlugins = recurseIntoAttrs (
     callPackage ../servers/search/elasticsearch/plugins.nix { }

From 4374ffa19adcded710873da4e76109e6e11303ec Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 13 Feb 2016 14:58:32 +0000
Subject: [PATCH 1302/2285] kibana: 4.1.2 -> 4.4.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 188c3df78fcf..ce138014408f 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.1.2";
+  version = "4.4.1";
 
   src = fetchurl {
     url = "http://download.elastic.co/kibana/kibana-snapshot/${name}-snapshot-linux-x86.tar.gz";
-    sha256 = "00ag4wnlw6h2j6zcz0irz6j1s51fr9ix2g1smrhrdw44z5gb6wrh";
+    sha256 = "0kxvrhrkcvx7pcn7myvabhcm4nj8gi86ij4a1xi392lfds2v350z";
   };
 
   buildInputs = [ makeWrapper ];

From 31ab7d38f23e556fd4e25508bed02455474b6c97 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 13 Feb 2016 09:52:02 -0500
Subject: [PATCH 1303/2285] bzip2: fix shared library generation on darwin

This fixes #6504
---
 pkgs/tools/compression/bzip2/default.nix | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index 0d8bfc6894e6..66ff5612dd4a 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -3,9 +3,13 @@
 let
   version = "1.0.6";
 
-  sharedLibrary = !stdenv.isDarwin && !(stdenv ? isStatic)
+  sharedLibrary = !(stdenv ? isStatic)
                && stdenv.system != "i686-cygwin" && !linkStatic;
 
+  darwinMakefile = fetchurl {
+    url    = "https://gitweb.gentoo.org/repo/proj/prefix.git/plain/app-arch/bzip2/files/bzip2-1.0.6-Makefile-libbz2_dylib";
+    sha256 = "1lq6g98kfpwv2f7wn4sk8hzcf87dwf92gviq0b4691f5bvc9mawz";
+  };
 in stdenv.mkDerivation {
   name = "bzip2-${version}";
 
@@ -38,17 +42,24 @@ in stdenv.mkDerivation {
   };
 
   preBuild = stdenv.lib.optionalString sharedLibrary ''
-    make -f Makefile-libbz2_so
+    make -f ${if stdenv.isDarwin then "Makefile-libbz2_dylib" else "Makefile-libbz2_so"}
   '';
 
-  preInstall = stdenv.lib.optionalString sharedLibrary ''
+  preInstall = stdenv.lib.optionalString sharedLibrary (if !stdenv.isDarwin then ''
     mkdir -p $out/lib
     mv libbz2.so* $out/lib
     ( cd $out/lib &&
       ln -s libbz2.so.1.0.? libbz2.so &&
       ln -s libbz2.so.1.0.? libbz2.so.1
     )
-  '';
+  '' else ''
+    mkdir -p $out/lib
+    mv libbz2.*.dylib $out/lib
+    ( cd $out/lib &&
+      ln -s libbz2.1.0.?.dylib libbz2.dylib &&
+      ln -s libbz2.1.0.?.dylib libbz2.1.dylib
+    )
+  '');
 
   installFlags = [ "PREFIX=$(out)" ];
 
@@ -61,6 +72,11 @@ in stdenv.mkDerivation {
   postPatch = ''
     substituteInPlace Makefile --replace CC=gcc CC=cc
     substituteInPlace Makefile-libbz2_so --replace CC=gcc CC=cc
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    cp ${darwinMakefile} Makefile-libbz2_dylib
+    substituteInPlace Makefile-libbz2_dylib \
+      --replace "CC=gcc" "CC=cc" \
+      --replace "PREFIX=/usr" "PREFIX=$out"
   '';
 
   preConfigure = ''

From 8a8d0bd46ab6e3ba4b0557af03d319ad35c24b39 Mon Sep 17 00:00:00 2001
From: Philip Potter <philip.g.potter@gmail.com>
Date: Sat, 13 Feb 2016 15:56:35 +0000
Subject: [PATCH 1304/2285] fix fceux

fceux needs lua 5.1; 5.2 seems to have introduced breaking API changes.

I removed the SYSTEM_LUA argument because we do want to build with the
system-provided lua, not the lua bundled in the fceux tarball.
---
 pkgs/misc/emulators/fceux/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/emulators/fceux/default.nix b/pkgs/misc/emulators/fceux/default.nix
index 48860f17aaf2..64d5dfd69a7b 100644
--- a/pkgs/misc/emulators/fceux/default.nix
+++ b/pkgs/misc/emulators/fceux/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, scons, zlib, SDL, lua5, pkgconfig}:
+{stdenv, fetchurl, scons, zlib, SDL, lua5_1, pkgconfig}:
 
 stdenv.mkDerivation {
   name = "fceux-2.2.2";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    scons zlib SDL lua5 pkgconfig
+    scons zlib SDL lua5_1 pkgconfig
   ];
 
   phases = "unpackPhase buildPhase";
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     export CC="gcc"
     export CXX="g++"
     mkdir -p "$out" "$out/share/applications" "$out/share/pixmaps"
-    scons --prefix="$out" OPENGL=false GTK=false CREATE_AVI=false LOGO=false SYSTEM_LUA=false install
+    scons --prefix="$out" OPENGL=false GTK=false CREATE_AVI=false LOGO=false install
   '';
 
   meta = {

From 47282a0ee64630695d7f89051e9aed374a1acebf Mon Sep 17 00:00:00 2001
From: Sean Lee <freshdried@gmail.com>
Date: Fri, 12 Feb 2016 16:12:41 -0500
Subject: [PATCH 1305/2285] spectrojack: init at 0.4

spectrojack - moved in all-packages

spectrojack: init at 0.4

updated

spectrojack: init at 0.4
---
 lib/maintainers.nix                           |  1 +
 .../audio/spectrojack/default.nix             | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 33 insertions(+)
 create mode 100644 pkgs/applications/audio/spectrojack/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index f73312db99e7..59a7c0349b21 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -286,6 +286,7 @@
   sjmackenzie = "Stewart Mackenzie <setori88@gmail.com>";
   sjourdois = "Stéphane ‘kwisatz’ Jourdois <sjourdois@gmail.com>";
   skeidel = "Sven Keidel <svenkeidel@gmail.com>";
+  sleexyz = "Sean Lee <freshdried@gmail.com>";
   smironov = "Sergey Mironov <ierton@gmail.com>";
   spacefrogg = "Michael Raitza <spacefrogg-nixos@meterriblecrew.net>";
   spencerjanssen = "Spencer Janssen <spencerjanssen@gmail.com>";
diff --git a/pkgs/applications/audio/spectrojack/default.nix b/pkgs/applications/audio/spectrojack/default.nix
new file mode 100644
index 000000000000..83848671a3e5
--- /dev/null
+++ b/pkgs/applications/audio/spectrojack/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, pkgconfig, libjack2, fftwFloat, gtk2 }:
+
+stdenv.mkDerivation rec {
+  name = "spectrojack-${version}";
+  version = "0.4";
+
+  src = fetchurl {
+    url = "http://sed.free.fr/spectrojack/${name}.tar.gz";
+    sha256 = "0p5aa55hnazv5djw0431mza068h7mjkb9pnglxfpqkx5z0czisdx";
+  };
+  buildInputs = [ pkgconfig libjack2 fftwFloat gtk2 ];
+  configurePhase= ''
+    sed -i 's/.*home.*/#&/' ./Makefile
+    substituteInPlace ./Makefile \
+      --replace "/usr/share" "$out/usr/share"
+  '';
+  installPhase= ''
+    install -Dm755 spectrojack $out/bin/spectrojack
+    install -Dm644 spectrojack_icon.svg $out/usr/share/spectrojack/icon.svg
+    install -Dm644 -t $out/usr/share/spectrojack/colormaps colormaps/*
+  '';
+
+  meta = {
+    description = "A little spectrogram/audiogram/sonogram/whatever for JACK";
+    homepage = http://sed.free.fr/spectrojack;
+    license = stdenv.lib.licenses.publicDomain;
+    maintainers = with stdenv.lib.maintainers; [ sleexyz ];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 92fd1d49a661..ca4eb5e7b0cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15568,6 +15568,8 @@ let
 
   refind = callPackage ../tools/bootloaders/refind { };
 
+  spectrojack = callPackage ../applications/audio/spectrojack { };
+
   xlockmore = callPackage ../misc/screensavers/xlockmore { };
 
   xtrlock-pam = callPackage ../misc/screensavers/xtrlock-pam { };

From 6f2ab634f9f76365d7af195a3c8b14d81a070ff7 Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 13 Feb 2016 09:52:02 -0500
Subject: [PATCH 1306/2285] bzip2: fix shared library generation on darwin

This fixes #6504
(cherry picked from commit 31ab7d38f23e556fd4e25508bed02455474b6c97)
---
 pkgs/tools/compression/bzip2/default.nix | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index ea2ee660a2ce..59da8d107916 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -3,9 +3,13 @@
 let
   version = "1.0.6";
 
-  sharedLibrary = !stdenv.isDarwin && !(stdenv ? isStatic)
+  sharedLibrary = !(stdenv ? isStatic)
                && stdenv.system != "i686-cygwin" && !linkStatic;
 
+  darwinMakefile = fetchurl {
+    url    = "https://gitweb.gentoo.org/repo/proj/prefix.git/plain/app-arch/bzip2/files/bzip2-1.0.6-Makefile-libbz2_dylib";
+    sha256 = "1lq6g98kfpwv2f7wn4sk8hzcf87dwf92gviq0b4691f5bvc9mawz";
+  };
 in stdenv.mkDerivation {
   name = "bzip2-${version}";
 
@@ -40,17 +44,24 @@ in stdenv.mkDerivation {
   outputs = [ "dev" "bin" "static" ] ++ stdenv.lib.optional sharedLibrary "out";
 
   preBuild = stdenv.lib.optionalString sharedLibrary ''
-    make -f Makefile-libbz2_so
+    make -f ${if stdenv.isDarwin then "Makefile-libbz2_dylib" else "Makefile-libbz2_so"}
   '';
 
-  preInstall = stdenv.lib.optionalString sharedLibrary ''
+  preInstall = stdenv.lib.optionalString sharedLibrary (if !stdenv.isDarwin then ''
     mkdir -p $out/lib
     mv libbz2.so* $out/lib
     ( cd $out/lib &&
       ln -s libbz2.so.1.0.? libbz2.so &&
       ln -s libbz2.so.1.0.? libbz2.so.1
     )
-  '';
+  '' else ''
+    mkdir -p $out/lib
+    mv libbz2.*.dylib $out/lib
+    ( cd $out/lib &&
+      ln -s libbz2.1.0.?.dylib libbz2.dylib &&
+      ln -s libbz2.1.0.?.dylib libbz2.1.dylib
+    )
+  '');
 
   installFlags = [ "PREFIX=$(bin)" ];
 
@@ -66,6 +77,11 @@ in stdenv.mkDerivation {
   patchPhase = ''
     substituteInPlace Makefile --replace CC=gcc CC=cc
     substituteInPlace Makefile-libbz2_so --replace CC=gcc CC=cc
+  '' + stdenv.lib.optionalString stdenv.isDarwin ''
+    cp ${darwinMakefile} Makefile-libbz2_dylib
+    substituteInPlace Makefile-libbz2_dylib \
+      --replace "CC=gcc" "CC=cc" \
+      --replace "PREFIX=/usr" "PREFIX=$out"
   '';
 
   preConfigure = ''

From 243c336022e9f324b721630a163bfa7b01939fa9 Mon Sep 17 00:00:00 2001
From: Arnold Krille <arnold@arnoldarts.de>
Date: Sat, 13 Feb 2016 17:17:24 +0100
Subject: [PATCH 1307/2285] rsync: Add rrsync as individual app

Extract the rsync source fetching into its own expression and use that
expression to fetch the same source for rsync and rrsync.

rrsync is just copied from the support folder of rsync, no configure or build
needed. Also none of the rsync patches are needed. Only the path to rsync needs
to be patched into rrsync.
---
 .../networking/sync/rsync/default.nix         |  6 +---
 .../networking/sync/rsync/rrsync.nix          | 34 +++++++++++++++++++
 .../networking/sync/rsync/src.nix             |  7 ++++
 pkgs/top-level/all-packages.nix               |  1 +
 4 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/applications/networking/sync/rsync/rrsync.nix
 create mode 100644 pkgs/applications/networking/sync/rsync/src.nix

diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index c13bb1b329df..6608e32e8bcb 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -9,11 +9,7 @@ stdenv.mkDerivation rec {
   name = "rsync-${version}";
   version = "3.1.2";
 
-  mainSrc = fetchurl {
-    # signed with key 0048 C8B0 26D4 C96F 0E58  9C2F 6C85 9FB1 4B96 A8C5
-    url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";
-    sha256 = "1hm1q04hz15509f0p9bflw4d6jzfvpm1d36dxjwihk1wzakn5ypc";
-  };
+  mainSrc = import ./src.nix { inherit fetchurl version; };
 
   patchesSrc = fetchurl {
     # signed with key 0048 C8B0 26D4 C96F 0E58  9C2F 6C85 9FB1 4B96 A8C5
diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix
new file mode 100644
index 000000000000..044a01993f9d
--- /dev/null
+++ b/pkgs/applications/networking/sync/rsync/rrsync.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, perl, rsync }:
+
+stdenv.mkDerivation rec {
+  name = "rrsync-${version}";
+  version = "3.1.2";
+
+  src = import ./src.nix { inherit fetchurl version; };
+
+  buildInputs = [ rsync ];
+  nativeBuildInputs = [perl];
+
+  # Skip configure and build phases.
+  # We just want something from the support directory
+  configurePhase = "true";
+  dontBuild = true;
+
+  postPatch = ''
+    sed -i 's#/usr/bin/rsync#${rsync}/bin/rsync#' support/rrsync
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp support/rrsync $out/bin
+    chmod a+x $out/bin/rrsync
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://rsync.samba.org/;
+    description = "A helper to run rsync-only environments from ssh-logins.";
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ simons ehmry ];
+  };
+}
diff --git a/pkgs/applications/networking/sync/rsync/src.nix b/pkgs/applications/networking/sync/rsync/src.nix
new file mode 100644
index 000000000000..f6896d2c5985
--- /dev/null
+++ b/pkgs/applications/networking/sync/rsync/src.nix
@@ -0,0 +1,7 @@
+{ version, fetchurl }:
+
+fetchurl {
+  # signed with key 0048 C8B0 26D4 C96F 0E58  9C2F 6C85 9FB1 4B96 A8C5
+  url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";
+  sha256 = "1hm1q04hz15509f0p9bflw4d6jzfvpm1d36dxjwihk1wzakn5ypc";
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5e8312764dda..ebbd1edce0d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13225,6 +13225,7 @@ let
     enableACLs = !(stdenv.isDarwin || stdenv.isSunOS || stdenv.isFreeBSD);
     enableCopyDevicesPatch = (config.rsync.enableCopyDevicesPatch or false);
   };
+  rrsync = callPackage ../applications/networking/sync/rsync/rrsync.nix {};
 
   rtl-sdr = callPackage ../applications/misc/rtl-sdr { };
 

From 70c339dd47e1fc67bb1e2319f5619e36ded45b59 Mon Sep 17 00:00:00 2001
From: Thomas Levine <_@thomaslevine.com>
Date: Fri, 12 Feb 2016 19:48:38 +0000
Subject: [PATCH 1308/2285] gnucash: enable dbi

My accounts are stored in the DBI backend (SQLite, specifically).
Before the present change, GnuCash would be compiled without DBI
 support (`--disable-dbi` flag), so I could only use the XML backend.
Now I can use either backend.

I made the change only for 2.6. It looks like 2.4 works the same way,
so maybe I'll enable DBI for that one later.

Making nix packages is delightful! It might replace my accounting hobby!
---
 pkgs/applications/office/gnucash/2.6.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/gnucash/2.6.nix b/pkgs/applications/office/gnucash/2.6.nix
index df6eabbcff0b..3c2348bfa8b7 100644
--- a/pkgs/applications/office/gnucash/2.6.nix
+++ b/pkgs/applications/office/gnucash/2.6.nix
@@ -1,7 +1,7 @@
 { fetchurl, stdenv, pkgconfig, libxml2, libxslt, perl, perlPackages, gconf, guile
 , intltool, glib, gtk, libofx, aqbanking, gwenhywfar, libgnomecanvas, goffice
 , webkit, glibcLocales, gsettings_desktop_schemas, makeWrapper, dconf, file
-, gettext, swig, slibGuile, enchant, bzip2, isocodes
+, gettext, swig, slibGuile, enchant, bzip2, isocodes, libdbi, libdbiDrivers
 }:
 
 /*
@@ -33,6 +33,8 @@ stdenv.mkDerivation rec {
     perl perlPackages.FinanceQuote perlPackages.DateManip
     # guile
     guile slibGuile
+    # database backends
+    libdbi libdbiDrivers
     # build
     makeWrapper
   ];
@@ -41,8 +43,14 @@ stdenv.mkDerivation rec {
   patchShebangs ./src
   '';
 
-  configureFlags = "CFLAGS=-O3 CXXFLAGS=-O3 --disable-dbi --enable-ofx --enable-aqbanking";
-
+  configureFlags = [
+    "CFLAGS=-O3"
+    "CXXFLAGS=-O3"
+    "--enable-dbi"
+    "--with-dbi-dbd-dir=${libdbiDrivers}/lib/dbd/"
+    "--enable-ofx"
+    "--enable-aqbanking"
+  ];
 
   postInstall = ''
     # Auto-updaters don't make sense in Nix.

From 2656baef0c30ede6486c763e7d65899364c019df Mon Sep 17 00:00:00 2001
From: Igor Sharonov <igor.sharonov@gmail.com>
Date: Wed, 10 Feb 2016 22:27:00 +0300
Subject: [PATCH 1309/2285] dirac: init at 1.0.2

---
 lib/maintainers.nix                           |   1 +
 pkgs/development/libraries/dirac/default.nix  |  29 ++
 .../libraries/dirac/dirac-1.0.2.patch         | 362 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 4 files changed, 394 insertions(+)
 create mode 100644 pkgs/development/libraries/dirac/default.nix
 create mode 100644 pkgs/development/libraries/dirac/dirac-1.0.2.patch

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index db6a55a283fd..293f0f51377c 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -138,6 +138,7 @@
   iand675 = "Ian Duncan <ian@iankduncan.com>";
   ianwookim = "Ian-Woo Kim <ianwookim@gmail.com>";
   iElectric = "Domen Kozar <domen@dev.si>";
+  igsha = "Igor Sharonov <igor.sharonov@gmail.com>";
   ikervagyok = "Balázs Lengyel <ikervagyok@gmail.com>";
   iyzsong = "Song Wenwu <iyzsong@gmail.com>";
   j-keck = "Jürgen Keck <jhyphenkeck@gmail.com>";
diff --git a/pkgs/development/libraries/dirac/default.nix b/pkgs/development/libraries/dirac/default.nix
new file mode 100644
index 000000000000..ac94e077b9a6
--- /dev/null
+++ b/pkgs/development/libraries/dirac/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, doxygen }:
+
+stdenv.mkDerivation rec {
+  version = "1.0.2";
+  name = "dirac-${version}";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/dirac/${name}.tar.gz";
+    sha256 = "1z803yzp17cj69wn11iyb13swqdd9xdzr58dsk6ghpr3ipqicsw1";
+  };
+
+  buildInputs = [ doxygen ];
+  enableParallelBuilding = true;
+
+  patches = [ ./dirac-1.0.2.patch ];
+
+  postInstall = ''
+    # keep only necessary binaries
+    find $out/bin \( -name '*RGB*' -or -name '*YUV*' -or -name create_dirac_testfile.pl \) -delete
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://sourceforge.net/projects/dirac;
+    description = "A general-purpose video codec based on wavelets";
+    platforms = platforms.all;
+    license = with licenses; [ mpl11 gpl2 lgpl21 ];
+    maintainer = maintainers.igsha;
+  };
+}
diff --git a/pkgs/development/libraries/dirac/dirac-1.0.2.patch b/pkgs/development/libraries/dirac/dirac-1.0.2.patch
new file mode 100644
index 000000000000..3d253b8f6d67
--- /dev/null
+++ b/pkgs/development/libraries/dirac/dirac-1.0.2.patch
@@ -0,0 +1,362 @@
+diff -aur dirac-1.0.2/libdirac_byteio/parseunit_byteio.cpp dirac-1.0.2-modif/libdirac_byteio/parseunit_byteio.cpp
+--- dirac-1.0.2/libdirac_byteio/parseunit_byteio.cpp	2008-05-02 09:57:19.000000000 +0400
++++ dirac-1.0.2-modif/libdirac_byteio/parseunit_byteio.cpp	2016-02-10 19:39:09.838443767 +0300
+@@ -124,12 +124,9 @@
+ 
+     if(prefix==PU_PREFIX)
+     {
+-        unsigned char next_parse_code;
+-
+-        next_parse_code = InputUnByte();
++        (void)InputUnByte();
+         // input next unit parse-offsets
+-        int next_unit_next_parse_offset;
+-        next_unit_next_parse_offset = ReadUintLit(PU_NEXT_PARSE_OFFSET_SIZE);
++        (void)ReadUintLit(PU_NEXT_PARSE_OFFSET_SIZE);
+ 
+         int next_unit_previous_parse_offset;
+         next_unit_previous_parse_offset = ReadUintLit(PU_PREVIOUS_PARSE_OFFSET_SIZE);
+diff -aur dirac-1.0.2/libdirac_common/mot_comp.cpp dirac-1.0.2-modif/libdirac_common/mot_comp.cpp
+--- dirac-1.0.2/libdirac_common/mot_comp.cpp	2008-10-01 05:26:47.000000000 +0400
++++ dirac-1.0.2-modif/libdirac_common/mot_comp.cpp	2016-02-10 19:50:18.453051800 +0300
+@@ -1064,10 +1064,10 @@
+         // We're doing bounds checking because we'll fall off the edge of the reference otherwise.
+ 
+         //weights for doing linear interpolation, calculated from the remainder values
+-        const ValueType linear_wts[4] = {  (2 - rmdr.x) * (2 - rmdr.y),    //tl
+-                                           rmdr.x * (2 - rmdr.y),          //tr
+-                                           (2 - rmdr.x) * rmdr.y,          //bl
+-                                           rmdr.x * rmdr.y };              //br
++        const ValueType linear_wts[4] = {  ValueType((2 - rmdr.x) * (2 - rmdr.y)),    //tl
++                                           ValueType(rmdr.x * (2 - rmdr.y)),          //tr
++                                           ValueType((2 - rmdr.x) * rmdr.y),          //bl
++                                           ValueType(rmdr.x * rmdr.y) };              //br
+ 
+ 
+        for(int c = 0, uY = ref_start.y,BuY=BChk(uY,trueRefYlen),BuY1=BChk(uY+1,trueRefYlen);
+@@ -1116,10 +1116,10 @@
+     const ImageCoords ref_start( ( start_pos.x<<1 ) + roundvec.x ,( start_pos.y<<1 ) + roundvec.y );
+ 
+     //weights for doing linear interpolation, calculated from the remainder values
+-    const ValueType linear_wts[4] = {  (4 - rmdr.x) * (4 - rmdr.y),    //tl
+-                                    rmdr.x * (4 - rmdr.y),          //tr
+-                                    (4 - rmdr.x) * rmdr.y,          //bl
+-                                    rmdr.x * rmdr.y };              //br
++    const ValueType linear_wts[4] = {  ValueType((4 - rmdr.x) * (4 - rmdr.y)),    //tl
++                                    ValueType(rmdr.x * (4 - rmdr.y)),          //tr
++                                    ValueType((4 - rmdr.x) * rmdr.y),          //bl
++                                    ValueType(rmdr.x * rmdr.y) };              //br
+ 
+     //An additional stage to make sure the block to be copied does not fall outside
+     //the reference image.
+diff -aur dirac-1.0.2/libdirac_common/mot_comp_mmx.cpp dirac-1.0.2-modif/libdirac_common/mot_comp_mmx.cpp
+--- dirac-1.0.2/libdirac_common/mot_comp_mmx.cpp	2008-01-09 13:50:23.000000000 +0300
++++ dirac-1.0.2-modif/libdirac_common/mot_comp_mmx.cpp	2016-02-10 19:59:51.792793538 +0300
+@@ -244,10 +244,10 @@
+         // We're 2doing bounds checking because we'll fall off the edge of the reference otherwise.
+ 
+         //weights for doing linear interpolation, calculated from the remainder values
+-        const ValueType linear_wts[4] = {  (2 - rmdr.x) * (2 - rmdr.y),    //tl
+-                                           rmdr.x * (2 - rmdr.y),          //tr
+-                                           (2 - rmdr.x) * rmdr.y,          //bl
+-                                           rmdr.x * rmdr.y };              //br
++        const ValueType linear_wts[4] = {  ValueType((2 - rmdr.x) * (2 - rmdr.y)),    //tl
++                                           ValueType(rmdr.x * (2 - rmdr.y)),          //tr
++                                           ValueType((2 - rmdr.x) * rmdr.y),          //bl
++                                           ValueType(rmdr.x * rmdr.y) };              //br
+ 
+         ValueType act_cols1[4], act_cols2[4];
+         int uX, uY, c, l;
+diff -aur dirac-1.0.2/libdirac_common/mv_codec.cpp dirac-1.0.2-modif/libdirac_common/mv_codec.cpp
+--- dirac-1.0.2/libdirac_common/mv_codec.cpp	2008-10-01 05:26:47.000000000 +0400
++++ dirac-1.0.2-modif/libdirac_common/mv_codec.cpp	2016-02-10 19:51:57.634838245 +0300
+@@ -159,7 +159,7 @@
+ // Main code function
+ void PredModeCodec::DoWorkCode( MvData& in_data )
+ {
+-    int step,max; 
++    int step; 
+     int split_depth;  
+ 
+     for (m_sb_yp = 0, m_sb_tlb_y = 0;  m_sb_yp < in_data.SBSplit().LengthY();  ++m_sb_yp, m_sb_tlb_y += 4)
+@@ -169,7 +169,7 @@
+             split_depth = in_data.SBSplit()[m_sb_yp][m_sb_xp]; 
+ 
+             step = 4  >>  (split_depth); 
+-            max = (1 << split_depth); 
++            //max = (1 << split_depth); 
+                         
+             //now do all the block modes and mvs in the mb            
+             for (m_b_yp = m_sb_tlb_y; m_b_yp < m_sb_tlb_y+4; m_b_yp += step)
+@@ -334,7 +334,7 @@
+ // Main code function
+ void VectorElementCodec::DoWorkCode( MvData& in_data )
+ {
+-    int step,max;
++    int step;
+     int split_depth;
+ 
+     for (m_sb_yp = 0, m_sb_tlb_y = 0;  m_sb_yp < in_data.SBSplit().LengthY();  ++m_sb_yp, m_sb_tlb_y += 4)
+@@ -344,7 +344,7 @@
+             split_depth = in_data.SBSplit()[m_sb_yp][m_sb_xp];
+ 
+             step = 4  >>  (split_depth);
+-            max = (1 << split_depth);
++            //max = (1 << split_depth);
+                         
+             //now do all the block modes and mvs in the mb            
+             for (m_b_yp = m_sb_tlb_y; m_b_yp < m_sb_tlb_y+4; m_b_yp += step)
+@@ -500,7 +500,7 @@
+ // Main code function
+ void DCCodec::DoWorkCode( MvData& in_data )
+ {
+-    int step,max; 
++    int step; 
+     int split_depth;  
+     
+     for (m_sb_yp = 0, m_sb_tlb_y = 0;  m_sb_yp < in_data.SBSplit().LengthY();  ++m_sb_yp, m_sb_tlb_y += 4)
+@@ -510,7 +510,7 @@
+             split_depth = in_data.SBSplit()[m_sb_yp][m_sb_xp]; 
+ 
+             step = 4  >>  (split_depth); 
+-            max = (1 << split_depth); 
++            //max = (1 << split_depth); 
+                         
+             //now do all the block modes and mvs in the mb            
+             for (m_b_yp = m_sb_tlb_y; m_b_yp < m_sb_tlb_y+4; m_b_yp += step)
+diff -aur dirac-1.0.2/libdirac_common/wavelet_utils.cpp dirac-1.0.2-modif/libdirac_common/wavelet_utils.cpp
+--- dirac-1.0.2/libdirac_common/wavelet_utils.cpp	2008-10-20 08:21:02.000000000 +0400
++++ dirac-1.0.2-modif/libdirac_common/wavelet_utils.cpp	2016-02-10 19:58:16.205006445 +0300
+@@ -198,7 +198,6 @@
+     const bool field_coding = encparams.FieldCoding();
+     const ChromaFormat cformat = pparams.CFormat();
+     const float cpd = encparams.CPD()*cpd_scale_factor;
+-    const PictureSort psort = pparams.PicSort();
+ 
+     int xlen, ylen, xl, yl, xp, yp;
+     float xfreq, yfreq;
+diff -aur dirac-1.0.2/libdirac_encoder/picture_compress.cpp dirac-1.0.2-modif/libdirac_encoder/picture_compress.cpp
+--- dirac-1.0.2/libdirac_encoder/picture_compress.cpp	2009-01-21 08:20:57.000000000 +0300
++++ dirac-1.0.2-modif/libdirac_encoder/picture_compress.cpp	2016-02-10 20:08:17.935731263 +0300
+@@ -413,14 +413,12 @@
+ 
+         const int depth=m_encparams.TransformDepth();
+ 
+-        PicArray* comp_data[3];
+         CoeffArray* coeff_data[3];
+         OneDArray<unsigned int>* est_bits[3];
+         float lambda[3];
+ 
+         // Construction and definition of objects
+         for (int c=0;c<3;++c){
+-            comp_data[c] = &my_picture.Data((CompSort) c );
+ 	    coeff_data[c] = &my_picture.WltData((CompSort) c );
+             est_bits[c] =  new OneDArray<unsigned int>( Range( 1, 3*depth+1 ) );
+         }// c
+diff -aur dirac-1.0.2/libdirac_encoder/quant_chooser.cpp dirac-1.0.2-modif/libdirac_encoder/quant_chooser.cpp
+--- dirac-1.0.2/libdirac_encoder/quant_chooser.cpp	2009-01-21 08:22:05.000000000 +0300
++++ dirac-1.0.2-modif/libdirac_encoder/quant_chooser.cpp	2016-02-10 20:15:43.792954708 +0300
+@@ -340,7 +340,7 @@
+     {
+         for (int i=cblock.Xstart(); i<cblock.Xend(); ++i )
+         {
+-            if ( (std::abs(m_coeff_data[j][i])<<2) >= u_threshold )
++            if ( (int(std::abs(m_coeff_data[j][i]))<<2) >= u_threshold )
+                 can_skip = false;
+         }   
+     }
+@@ -349,13 +349,13 @@
+ 
+ CoeffType QuantChooser::BlockAbsMax( const Subband& node )
+ {
+-    int val( 0 );
++    CoeffType val( 0 );
+ 
+     for (int j=node.Yp() ; j<node.Yp()+node.Yl(); ++j)
+     {
+         for (int i=node.Xp() ; i<node.Xp()+node.Xl(); ++i)
+         {    
+-            val = std::max( val , std::abs(m_coeff_data[j][i]) );
++            val = std::max( val , CoeffType(std::abs(m_coeff_data[j][i])) );
+         }// i
+     }// j
+ 
+diff -aur dirac-1.0.2/libdirac_encoder/seq_compress.cpp dirac-1.0.2-modif/libdirac_encoder/seq_compress.cpp
+--- dirac-1.0.2/libdirac_encoder/seq_compress.cpp	2008-10-29 05:42:06.000000000 +0300
++++ dirac-1.0.2-modif/libdirac_encoder/seq_compress.cpp	2016-02-10 20:16:24.108885403 +0300
+@@ -663,7 +663,6 @@
+ 
+ int FrameSequenceCompressor::CodedToDisplay( const int cnum )
+ {
+-    int div;
+ 
+     if (m_L1_sep>0)
+     {
+@@ -672,7 +671,6 @@
+             return 0;
+         else if ((cnum-1)% m_L1_sep==0)
+         {//we have L1 or subsequent I pictures
+-            div=(cnum-1)/m_L1_sep;
+             return cnum+m_L1_sep-1;
+         }
+         else//we have L2 pictures
+diff -aur dirac-1.0.2/libdirac_motionest/me_utils.cpp dirac-1.0.2-modif/libdirac_motionest/me_utils.cpp
+--- dirac-1.0.2/libdirac_motionest/me_utils.cpp	2008-10-21 08:55:46.000000000 +0400
++++ dirac-1.0.2-modif/libdirac_motionest/me_utils.cpp	2016-02-10 20:04:40.068175649 +0300
+@@ -684,10 +684,10 @@
+         // We're doing bounds checking because we'll fall off the edge of the reference otherwise.
+ 
+        // weights for doing linear interpolation, calculated from the remainder values
+-        const ValueType linear_wts[4] = {  (2 - rmdr.x) * (2 - rmdr.y),    //tl
+-                                           rmdr.x * (2 - rmdr.y),          //tr
+-                                           (2 - rmdr.x) * rmdr.y,          //bl
+-                                           rmdr.x * rmdr.y };              //br
++        const ValueType linear_wts[4] = {  ValueType((2 - rmdr.x) * (2 - rmdr.y)),    //tl
++                                           ValueType(rmdr.x * (2 - rmdr.y)),          //tr
++                                           ValueType((2 - rmdr.x) * rmdr.y),          //bl
++                                           ValueType(rmdr.x * rmdr.y) };              //br
+ 
+         const int refXlen( m_ref_data.LengthX() );
+         const int refYlen( m_ref_data.LengthY() );
+@@ -848,10 +848,10 @@
+         // We're doing bounds checking because we'll fall off the edge of the reference otherwise.
+ 
+        // weights for doing linear interpolation, calculated from the remainder values
+-        const ValueType linear_wts[4] = {  (2 - rmdr.x) * (2 - rmdr.y),    //tl
+-                                           rmdr.x * (2 - rmdr.y),          //tr
+-                                           (2 - rmdr.x) * rmdr.y,          //bl
+-                                           rmdr.x * rmdr.y };              //br
++        const ValueType linear_wts[4] = {  ValueType((2 - rmdr.x) * (2 - rmdr.y)),    //tl
++                                           ValueType(rmdr.x * (2 - rmdr.y)),          //tr
++                                           ValueType((2 - rmdr.x) * rmdr.y),          //bl
++                                           ValueType(rmdr.x * rmdr.y) };              //br
+ 
+         const int refXlen( m_ref_data.LengthX() );
+         const int refYlen( m_ref_data.LengthY() );
+@@ -908,10 +908,10 @@
+     const int pic_next( m_pic_data.LengthX() - dparams.Xl() );// go down a row and back up
+ 
+     //weights for doing linear interpolation, calculated from the remainder values
+-    const ValueType linear_wts[4] = {  (4 - rmdr.x) * (4 - rmdr.y),    //tl
+-                                       rmdr.x * (4 - rmdr.y),          //tr
+-                                       (4 - rmdr.x) * rmdr.y,          //bl
+-                                       rmdr.x * rmdr.y };              //br
++    const ValueType linear_wts[4] = {  ValueType((4 - rmdr.x) * (4 - rmdr.y)),    //tl
++                                       ValueType(rmdr.x * (4 - rmdr.y)),          //tr
++                                       ValueType((4 - rmdr.x) * rmdr.y),          //bl
++                                       ValueType(rmdr.x * rmdr.y) };              //br
+ 
+     bool bounds_check( false );
+ 
+@@ -1039,10 +1039,10 @@
+     const int pic_next( m_pic_data.LengthX() - dparams.Xl() );// go down a row and back up
+ 
+     //weights for doing linear interpolation, calculated from the remainder values
+-    const ValueType linear_wts[4] = {  (4 - rmdr.x) * (4 - rmdr.y),    //tl
+-                                       rmdr.x * (4 - rmdr.y),          //tr
+-                                       (4 - rmdr.x) * rmdr.y,          //bl
+-                                       rmdr.x * rmdr.y };              //br
++    const ValueType linear_wts[4] = {  ValueType((4 - rmdr.x) * (4 - rmdr.y)),    //tl
++                                       ValueType(rmdr.x * (4 - rmdr.y)),          //tr
++                                       ValueType((4 - rmdr.x) * rmdr.y),          //bl
++                                       ValueType(rmdr.x * rmdr.y) };              //br
+ 
+     bool bounds_check( false );
+ 
+@@ -1403,10 +1403,10 @@
+     }
+     else
+     {
+-        const ValueType linear_wts[4] = {  (2 - rmdr1.x) * (2 - rmdr1.y),    //tl
+-                                           rmdr1.x * (2 - rmdr1.y),          //tr
+-                                           (2 - rmdr1.x) * rmdr1.y,          //bl
+-                                           rmdr1.x * rmdr1.y };              //br
++        const ValueType linear_wts[4] = {  ValueType((2 - rmdr1.x) * (2 - rmdr1.y)),    //tl
++                                           ValueType(rmdr1.x * (2 - rmdr1.y)),          //tr
++                                           ValueType((2 - rmdr1.x) * rmdr1.y),          //bl
++                                           ValueType(rmdr1.x * rmdr1.y) };              //br
+ 
+         // We're doing bounds checking because we'll fall off the edge of the reference otherwise.
+         for( int y=dparams.Yl(), ry=ref_start1.y, by=BChk(ry,m_ref_data1.LengthY()), by1=BChk(ry+1,m_ref_data1.LengthY()); 
+@@ -1513,10 +1513,10 @@
+     }
+     else
+     {
+-        const ValueType linear_wts[4] = {  (2 - rmdr2.x) * (2 - rmdr2.y),    //tl
+-                                           rmdr2.x * (2 - rmdr2.y),          //tr
+-                                           (2 - rmdr2.x) * rmdr2.y,          //bl
+-                                           rmdr2.x * rmdr2.y };              //br
++        const ValueType linear_wts[4] = {  ValueType((2 - rmdr2.x) * (2 - rmdr2.y)),    //tl
++                                           ValueType(rmdr2.x * (2 - rmdr2.y)),          //tr
++                                           ValueType((2 - rmdr2.x) * rmdr2.y),          //bl
++                                           ValueType(rmdr2.x * rmdr2.y) };              //br
+ 
+         // We're doing bounds checking because we'll fall off the edge of the reference otherwise.
+         for( int y=dparams.Yl(), ry=ref_start2.y, by=BChk(ry,m_ref_data2.LengthY()),by1=BChk(ry+1,m_ref_data2.LengthY()); 
+@@ -1564,14 +1564,14 @@
+     const MVector rmdr2( mv2.x & 3 , mv2.y & 3 );
+ 
+     //weights for doing linear interpolation, calculated from the remainder values
+-    const ValueType linear_wts1[4] = {  (4 - rmdr1.x) * (4 - rmdr1.y),    //tl
+-                                       rmdr1.x * (4 - rmdr1.y),          //tr
+-                                       (4 - rmdr1.x) * rmdr1.y,          //bl
+-                                       rmdr1.x * rmdr1.y };              //br
+-    const ValueType linear_wts2[4] = {  (4 - rmdr2.x) * (4 - rmdr2.y),    //tl
+-                                       rmdr2.x * (4 - rmdr2.y),          //tr
+-                                       (4 - rmdr2.x) * rmdr2.y,          //bl
+-                                       rmdr2.x * rmdr2.y };              //br
++    const ValueType linear_wts1[4] = {  ValueType((4 - rmdr1.x) * (4 - rmdr1.y)),    //tl
++                                        ValueType(rmdr1.x * (4 - rmdr1.y)),          //tr
++                                        ValueType((4 - rmdr1.x) * rmdr1.y),          //bl
++                                        ValueType(rmdr1.x * rmdr1.y) };              //br
++    const ValueType linear_wts2[4] = {  ValueType((4 - rmdr2.x) * (4 - rmdr2.y)),    //tl
++                                        ValueType(rmdr2.x * (4 - rmdr2.y)),          //tr
++                                        ValueType((4 - rmdr2.x) * rmdr2.y),          //bl
++                                        ValueType(rmdr2.x * rmdr2.y) };              //br
+ 
+     //Where to start in the upconverted images
+     const ImageCoords ref_start1( ( dparams.Xp()<<1 ) + roundvec1.x ,( dparams.Yp()<<1 ) + roundvec1.y );
+diff -aur dirac-1.0.2/util/conversion/common/bitmap.cpp dirac-1.0.2-modif/util/conversion/common/bitmap.cpp
+--- dirac-1.0.2/util/conversion/common/bitmap.cpp	2004-06-30 20:44:52.000000000 +0400
++++ dirac-1.0.2-modif/util/conversion/common/bitmap.cpp	2016-02-10 20:19:58.355494888 +0300
+@@ -142,14 +142,9 @@
+         char signature[2];
+         int fileSize;
+         int dataOffset;
+-        int size;
+         int planes;
+         int bitCount;
+         int compression;
+-        int imageSize;
+-        int xPixelsPerM, yPixelsPerM;
+-        int coloursUsed;
+-        int coloursImportant;
+         //Define buffer to read bytes into.
+         const int bufferSize = 54;
+         char buffer[bufferSize];
+@@ -175,7 +170,7 @@
+         //Reposition input buffer to skip over extra header data if necessary
+         //Should check success of operation (see The C++ Stand Lib, Josuttis, p665)
+         if (dataOffset>54) inbuf.pubseekoff(dataOffset-54, std::ios_base::cur, std::ios_base::in);
+-        size = read4bytes(buffer+14);
++        (void)read4bytes(buffer+14); // size
+         w = read4bytes(buffer+18);
+         h = read4bytes(buffer+22);
+         if ( fileSize != (dataOffset + height()*lineBufferSize()) ) input.setstate(std::ios::failbit);
+@@ -185,11 +180,11 @@
+         if ( bitCount != 24 ) input.setstate(std::ios::failbit);
+         compression = read4bytes(buffer+30);
+         if ( compression != 0 ) input.setstate(std::ios::failbit);
+-        imageSize = read4bytes(buffer+34);
+-        xPixelsPerM = read4bytes(buffer+38);
+-        yPixelsPerM = read4bytes(buffer+42);
+-        coloursUsed = read4bytes(buffer+46);
+-        coloursImportant = read4bytes(buffer+50);
++        (void)read4bytes(buffer+34); // imageSize
++        (void)read4bytes(buffer+38); // xPixelsPerM
++        (void)read4bytes(buffer+42); // yPixelsPerM
++        (void)read4bytes(buffer+46); // coloursUsed
++        (void)read4bytes(buffer+50); // coloursImportant
+         return input; }
+ 
+ }  // end namespace dirac_vu
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40e92629064c..6d3d315441fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6440,6 +6440,8 @@ let
     fltk = fltk13;
   };
 
+  dirac = callPackage ../development/libraries/dirac { };
+
   directfb = callPackage ../development/libraries/directfb { };
 
   dlib = callPackage ../development/libraries/dlib { };

From eb684127475e86298a74f22478626c874a2ceafe Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sat, 13 Feb 2016 19:30:09 +0100
Subject: [PATCH 1310/2285] mendeley: 1.15.2 -> 1.15.3

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

diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index 7b4b20e897f4..d9505c17e8de 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -12,14 +12,14 @@ let
     then "i386"
     else "amd64";
 
-  shortVersion = "1.15.2-stable";
+  shortVersion = "1.15.3-stable";
 
   version = "${shortVersion}_${arch}";
 
   url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb";
   sha256 = if stdenv.system == arch32
-    then "64e72b5749ea54f75cb0400732af68d1044037c6233a6bc0ba7a560acd3503cb"
-    else "cd13e39ad665b243fa5ca04c30cdc4c7da3ddaa259ea1af8fd1ff60f85f4eb25";
+    then "7d0737eb28cb4238fafdd6cf973ad899dd6a7622bc1a5c44f32a9c1790eaf6af"
+    else "0hvvyvbkbz8hg8s532rrrcv7jf07zh4axjzk18bvr6p9cgcdirl8";
 
   deps = [
     gcc.cc

From b6586ee69433f9ae60698d10a1ffcb09040282d1 Mon Sep 17 00:00:00 2001
From: Jason Ziglar <jpz@vt.edu>
Date: Sat, 13 Feb 2016 13:25:31 -0500
Subject: [PATCH 1311/2285] Updating ZeroMQ to 4.1.4

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

diff --git a/pkgs/development/libraries/zeromq/4.x.nix b/pkgs/development/libraries/zeromq/4.x.nix
index 22e2e8716a62..d99879d14a7e 100644
--- a/pkgs/development/libraries/zeromq/4.x.nix
+++ b/pkgs/development/libraries/zeromq/4.x.nix
@@ -1,24 +1,16 @@
 { stdenv, fetchurl, libuuid, pkgconfig, libsodium }:
 
 stdenv.mkDerivation rec {
-  name = "zeromq-4.1.3";
+  name = "zeromq-4.1.4";
 
   src = fetchurl {
     url = "http://download.zeromq.org/${name}.tar.gz";
-    sha256 = "04gligbgr0phipjkwc0dyk1vr9306r6s4dbj85z7fxxk1n1ircv1";
+    sha256 = "0y73dxgf4kaysmkvrkxqq9qk5znklxyghh749jw4qbjwwbyl97z9";
   };
 
-  # Fix zeromq-4.1.3 with libsodium-1.0.6
-  postPatch = ''
-    sed -i 's/libzmq_werror="yes"/libzmq_werror="no"/' configure
-  '';
-
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = [ libuuid libsodium ];
 
-  # https://github.com/zeromq/libzmq/commit/479db2113643e459c11db392e0fefd6400657c9e
-  patches = [ ./sodium_warning.patch ];
-
   meta = with stdenv.lib; {
     branch = "4";
     homepage = "http://www.zeromq.org";

From 6e56e09c379122ecbb871e38588416ed88e67b56 Mon Sep 17 00:00:00 2001
From: Tony White <white.tw.tw@gmail.com>
Date: Sat, 13 Feb 2016 19:04:41 +0000
Subject: [PATCH 1312/2285] alsa : 1.0.9 -> 1.1.0

- Bump versions for the following packages within alsa
- alsa-utils
- alsa-tools
- alsa-plugins
- alsa-lib
Please see http://www.alsa-project.org/main/index.php/Changes_v1.0.29_v1.1.0
for the full changelog this update brings.
---
 pkgs/os-specific/linux/alsa-lib/default.nix     | 4 ++--
 pkgs/os-specific/linux/alsa-plugins/default.nix | 4 ++--
 pkgs/os-specific/linux/alsa-tools/default.nix   | 4 ++--
 pkgs/os-specific/linux/alsa-utils/default.nix   | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/alsa-lib/default.nix b/pkgs/os-specific/linux/alsa-lib/default.nix
index ed72e7011663..c4fd46b3c7da 100644
--- a/pkgs/os-specific/linux/alsa-lib/default.nix
+++ b/pkgs/os-specific/linux/alsa-lib/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "alsa-lib-1.0.29";
+  name = "alsa-lib-1.1.0";
 
   src = fetchurl {
     urls = [
      "ftp://ftp.alsa-project.org/pub/lib/${name}.tar.bz2"
      "http://alsa.cybermirror.org/lib/${name}.tar.bz2"
     ];
-    sha256 = "1l5xzhq7xjy8xap087zbbyi14gr1bhil18pn987vwdlnxcskq13k";
+    sha256 = "dfde65d11e82b68f82e562ab6228c1fb7c78854345d3c57e2c68a9dd3dae1f15";
   };
 
   patches = [
diff --git a/pkgs/os-specific/linux/alsa-plugins/default.nix b/pkgs/os-specific/linux/alsa-plugins/default.nix
index 0450a44dae73..22c3d4647747 100644
--- a/pkgs/os-specific/linux/alsa-plugins/default.nix
+++ b/pkgs/os-specific/linux/alsa-plugins/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchurl, lib, pkgconfig, alsaLib, libogg, libpulseaudio ? null, libjack2 ? null }:
 
 stdenv.mkDerivation rec {
-  name = "alsa-plugins-1.0.29";
+  name = "alsa-plugins-1.1.0";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.alsa-project.org/pub/plugins/${name}.tar.bz2"
       "http://alsa.cybermirror.org/plugins/${name}.tar.bz2"
     ];
-    sha256 = "0ck5xa0vnjhn5w23gf87y30h7bcb6hzsx4817sw35xl5qb58ap9j";
+    sha256 = "3b83c329953bef99f5fe25ae04ec4a455fe6514939f3b45a5321966652b2c9ee";
   };
 
   # ToDo: a52, etc.?
diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix
index a2e49f465e46..193c919e3b20 100644
--- a/pkgs/os-specific/linux/alsa-tools/default.nix
+++ b/pkgs/os-specific/linux/alsa-tools/default.nix
@@ -2,14 +2,14 @@
 
 stdenv.mkDerivation rec {
   name = "alsa-tools-${version}";
-  version = "1.0.29";
+  version = "1.1.0";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.alsa-project.org/pub/tools/${name}.tar.bz2"
       "http://alsa.cybermirror.org/tools/${name}.tar.bz2"
     ];
-    sha256 = "1lgvyb81md25s9ciswpdsbibmx9s030kvyylf0673w3kbamz1awl";
+    sha256 = "3b1c3135b76e14532d3dd23fb15759ddd7daf9ffbc183f7a9a0a3a86374748f1";
   };
 
   buildInputs = [ alsaLib pkgconfig gtk gtk3 fltk13 ];
diff --git a/pkgs/os-specific/linux/alsa-utils/default.nix b/pkgs/os-specific/linux/alsa-utils/default.nix
index bcac888d4712..d47c9fa2c1a1 100644
--- a/pkgs/os-specific/linux/alsa-utils/default.nix
+++ b/pkgs/os-specific/linux/alsa-utils/default.nix
@@ -1,15 +1,15 @@
-{stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate, pciutils}:
+{stdenv, fetchurl, alsaLib, gettext, ncurses, libsamplerate, pciutils, fftw}:
 
 stdenv.mkDerivation rec {
   name = "alsa-utils-${version}";
-  version = "1.0.29";
+  version = "1.1.0";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.alsa-project.org/pub/utils/${name}.tar.bz2"
       "http://alsa.cybermirror.org/utils/${name}.tar.bz2"
     ];
-    sha256 = "16ryhgbapp4pxyvsjc258mcj14wk7x3xs6g9bpnkqj0l7s7haq2i";
+    sha256 = "3b1c3135b76e14532d3dd23fb15759ddd7daf9ffbc183f7a9a0a3a86374748f1";
   };
 
   patchPhase = ''
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       --replace "which" "type -p" \
       --replace "lspci" "${pciutils}/bin/lspci"
   '';
-  buildInputs = [ gettext alsaLib ncurses libsamplerate ];
+  buildInputs = [ gettext alsaLib ncurses libsamplerate fftw ];
 
   configureFlags = "--disable-xmlto --with-udev-rules-dir=$(out)/lib/udev/rules.d";
 

From 0a23d430bf68c1028bd8827a46b0786ba17b10eb Mon Sep 17 00:00:00 2001
From: Dan Peebles <pumpkin@me.com>
Date: Sat, 13 Feb 2016 15:46:42 -0500
Subject: [PATCH 1313/2285] stdenv-darwin: fix to work with multiple outputs

---
 pkgs/stdenv/darwin/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 0af7071e2186..810031809173 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -176,7 +176,7 @@ in rec {
 
     allowedRequisites =
       [ bootstrapTools ] ++
-      (with pkgs; [ xz libcxx libcxxabi icu ]) ++
+      (with pkgs; [ xz.bin xz.out libcxx libcxxabi icu.out ]) ++
       (with pkgs.darwin; [ dyld Libsystem CF locale ]);
 
     overrides = persistent1;
@@ -211,7 +211,7 @@ in rec {
 
     allowedRequisites =
       [ bootstrapTools ] ++
-      (with pkgs; [ icu bash libcxx libcxxabi ]) ++
+      (with pkgs; [ xz.bin xz.out icu.out bash libcxx libcxxabi ]) ++
       (with pkgs.darwin; [ dyld Libsystem locale ]);
 
     overrides = persistent2;
@@ -294,9 +294,11 @@ in rec {
     };
 
     allowedRequisites = (with pkgs; [
-      xz libcxx libcxxabi icu gmp gnumake findutils bzip2 llvm zlib libffi
-      coreutils ed diffutils gnutar gzip ncurses gnused bash gawk
-      gnugrep llvmPackages.clang-unwrapped patch pcre binutils-raw binutils gettext
+      xz.out xz.bin libcxx libcxxabi icu.out gmp.out gnumake findutils bzip2.out
+      bzip2.bin llvm zlib.out zlib.dev libffi.out coreutils ed diffutils gnutar
+      gzip ncurses.out ncurses.dev ncurses.lib ncurses.man gnused bash gawk
+      gnugrep llvmPackages.clang-unwrapped patch pcre.out binutils-raw.out
+      binutils-raw.dev binutils gettext
     ]) ++ (with pkgs.darwin; [
       dyld Libsystem CF cctools libiconv locale
     ]);

From 0cd08e7e0299c3e87ddd5241f116efd5eeec2f55 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 3 Feb 2016 11:33:31 +0200
Subject: [PATCH 1314/2285] HACK: darwin adv_cmds: Add a dummy 'out' output

---
 .../darwin/apple-source-releases/adv_cmds/default.nix          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
index d72afac88fee..b8b436efe24f 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/adv_cmds/default.nix
@@ -73,12 +73,15 @@ in appleDerivation {
 
     install -d 0755 $ps/bin
     install ps $ps/bin/ps
+    touch "$out"
   '';
 
   outputs = [
+    "out"
     "ps"
     "locale"
   ];
+  setOutputFlags = false;
 
   # ps uses this syscall to get process info
   propagatedSandboxProfile = stdenv.lib.sandbox.allow "mach-priv-task-port";

From 78e62da7f1f022e6ee3cc16a1ef716d82151f2f2 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 3 Feb 2016 00:51:08 +0200
Subject: [PATCH 1315/2285] python2: Fix on Darwin

Presumably $out/lib/python*/plat-linux2/ is a Linux-only thing.
---
 pkgs/development/interpreters/python/2.7/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 1bcb0777e85c..31839d24754e 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -141,9 +141,9 @@ let
 
         paxmark E $out/bin/python${majorVersion}
 
-        ${ optionalString includeModules "$out/bin/python ./setup.py build_ext"}
+        ${optionalString includeModules "$out/bin/python ./setup.py build_ext"}
 
-        rm "$out"/lib/python*/plat-linux2/regen # refers to glibc.dev
+        ${optionalString stdenv.isLinux ''rm "$out"/lib/python*/plat-linux2/regen # refers to glibc.dev''}
       '';
 
     passthru = rec {

From 34922a3951a0ada7af4fe808250abaf5feb4e28e Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 3 Feb 2016 00:51:08 +0200
Subject: [PATCH 1316/2285] python2: Fix on non-Linux

The location of this 'regen' script (whatever is does) depends on the
platform. AFAICT it always exists due to this:

$(srcdir)/Lib/$(PLATDIR):
        mkdir $(srcdir)/Lib/$(PLATDIR)
        cp $(srcdir)/Lib/plat-generic/regen $(srcdir)/Lib/$(PLATDIR)/regen
---
 pkgs/development/interpreters/python/2.7/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 31839d24754e..f1ae897ea4ac 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -143,7 +143,7 @@ let
 
         ${optionalString includeModules "$out/bin/python ./setup.py build_ext"}
 
-        ${optionalString stdenv.isLinux ''rm "$out"/lib/python*/plat-linux2/regen # refers to glibc.dev''}
+        rm "$out"/lib/python*/plat-*/regen # refers to glibc.dev
       '';
 
     passthru = rec {

From e7565363921eb4a8041fecaeb5a2d717ab3232b0 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@yahoo.com>
Date: Sat, 13 Feb 2016 17:13:33 -0800
Subject: [PATCH 1317/2285] doc: Fix URL to ghc-paths patch

---
 doc/haskell-users-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/haskell-users-guide.md b/doc/haskell-users-guide.md
index b11e4cf09f84..b9b2fe9e3bc9 100644
--- a/doc/haskell-users-guide.md
+++ b/doc/haskell-users-guide.md
@@ -234,7 +234,7 @@ library promises to give its users access to GHC's installation paths. Only,
 the library can't possible know that path when it's compiled, because the path
 GHC considers its own is determined only much later, when the user configures
 it through `ghcWithPackages`. So we [patched
-ghc-paths](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/ghc-paths-nix.patch)
+ghc-paths](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/haskell-modules/patches/ghc-paths-nix.patch)
 to return the paths found in those environment variables at run-time rather
 than trying to guess them at compile-time.
 

From 2cee5a42b0d278577e791bbed51521ec0d103192 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 14 Feb 2016 09:59:11 +0300
Subject: [PATCH 1318/2285] dspam service: set ClientHost

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

diff --git a/nixos/modules/services/mail/dspam.nix b/nixos/modules/services/mail/dspam.nix
index 2d8aebe20575..96b0e165c4d2 100644
--- a/nixos/modules/services/mail/dspam.nix
+++ b/nixos/modules/services/mail/dspam.nix
@@ -19,7 +19,10 @@ let
     SystemLog on
     UserLog on
 
-    ${optionalString (cfg.domainSocket != null) ''ServerDomainSocketPath "${cfg.domainSocket}"''}
+    ${optionalString (cfg.domainSocket != null) ''
+      ServerDomainSocketPath "${cfg.domainSocket}"
+      ClientHost "${cfg.domainSocket}"
+    ''}
 
     ${cfg.extraConfig}
   '';

From a0afc49f0f199c73e1173ede7d58d74842c4551d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 14 Feb 2016 10:08:56 +0300
Subject: [PATCH 1319/2285] dspam service: restrict socket access

---
 nixos/modules/services/mail/dspam.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/mail/dspam.nix b/nixos/modules/services/mail/dspam.nix
index 96b0e165c4d2..46e6f216b21e 100644
--- a/nixos/modules/services/mail/dspam.nix
+++ b/nixos/modules/services/mail/dspam.nix
@@ -111,6 +111,7 @@ in {
           User = cfg.user;
           Group = cfg.group;
           RuntimeDirectory = optional (cfg.domainSocket == defaultSock) "dspam";
+          RuntimeDirectoryMode = optional (cfg.domainSocket == defaultSock) "0750";
           PermissionsStartOnly = true;
           # DSPAM segfaults on just about every error
           Restart = "on-failure";

From 16d7237beb651575860dd59d907636fca4127ce3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 14 Feb 2016 08:36:25 +0100
Subject: [PATCH 1320/2285] pstree: add a working mirror to fix #12989

/cc maintainer @mornfall.
---
 pkgs/applications/misc/pstree/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/pstree/default.nix b/pkgs/applications/misc/pstree/default.nix
index 3d526e3f3e72..cfa772e8b5ef 100644
--- a/pkgs/applications/misc/pstree/default.nix
+++ b/pkgs/applications/misc/pstree/default.nix
@@ -4,7 +4,10 @@ stdenv.mkDerivation rec {
   name = "pstree-2.39";
 
   src = fetchurl {
-    url = "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz";
+    urls = [
+      "http://www.sfr-fresh.com/unix/misc/${name}.tar.gz"
+      "http://distfiles.macports.org/pstree/${name}.tar.gz"
+    ];
     sha256 = "17s7v15c4gryjpi11y1xq75022nkg4ggzvjlq2dkmyg67ssc76vw";
   };
 

From 63bd1cbb6ee5756a07dbca9655341e9f5df79622 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Sun, 14 Feb 2016 13:48:15 +0100
Subject: [PATCH 1321/2285] btfs: init at 2.7

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

diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix
new file mode 100644
index 000000000000..46b015cd08ac
--- /dev/null
+++ b/pkgs/os-specific/linux/btfs/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchFromGitHub, pkgconfig, autoconf, automake,
+  python, boost, fuse, libtorrentRasterbar, curl }:
+
+stdenv.mkDerivation rec {
+  name = "btfs-${version}";
+  version = "2.7";
+
+  src = fetchFromGitHub {
+    owner = "johang";
+    repo = "btfs";
+    rev = "e816b4718bd5c9d88a99805d19d2ad91971b2338";
+    sha256 = "1mac2dwg0pzpmg0x503a8d8gx3ridi4m1qx4jk6ssvl4g9v6p7fl";
+  };
+  
+  buildInputs = [
+    pkgconfig autoconf automake boost
+    fuse libtorrentRasterbar curl
+  ];
+
+  preConfigure = ''
+    autoreconf -i
+    substituteInPlace scripts/btplay \
+      --replace /usr/bin/python ${python}/bin/python
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A bittorrent filesystem based on FUSE";
+    homepage    = "https://github.com/johang/btfs";
+    license     = licenses.gpl3;
+    maintainers = with maintainers; [ rnhmjoj ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21dbbd6e9960..39ade26f5430 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -762,6 +762,8 @@ let
     sha256 = "0p2sxrpzd0vsk11zf3kb5h12yl1nq4yypb5mpjrm8ww0cfaijck2";
   };
 
+  btfs = callPackage ../os-specific/linux/btfs { };
+
   cabal2nix = haskellPackages.cabal2nix;
 
   capstone = callPackage ../development/libraries/capstone { };

From d5ed1637b6259d394cd35fc7a1b97807abd843e2 Mon Sep 17 00:00:00 2001
From: Kevin Cox <kevincox@kevincox.ca>
Date: Sat, 23 Jan 2016 09:49:19 -0500
Subject: [PATCH 1322/2285] mesos: 0.23.0 -> 0.26.0

Update mesos to 0.26.0 and build with SSL support.
---
 .../networking/cluster/mesos/default.nix      | 42 ++++++++++++-------
 .../networking/cluster/mesos/maven_repo.patch | 13 ++++++
 2 files changed, 41 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/applications/networking/cluster/mesos/maven_repo.patch

diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index cb6be73ec9bf..25bd659d63af 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -1,7 +1,7 @@
 { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf
-, automake114x, libtool, unzip, gnutar, jdk, maven, python, wrapPython
-, setuptools, boto, pythonProtobuf, apr, subversion
-, leveldb, glog, perf, utillinux, libnl, iproute
+, automake115x, libtool, unzip, gnutar, jdk, maven, python, wrapPython
+, setuptools, boto, pythonProtobuf, apr, subversion, gzip
+, leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent
 }:
 
 let
@@ -9,25 +9,26 @@ let
   soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so";
 
 in stdenv.mkDerivation rec {
-  version = "0.23.0";
+  version = "0.26.0";
   name = "mesos-${version}";
 
   dontDisableStatic = true;
 
   src = fetchurl {
     url = "mirror://apache/mesos/${version}/${name}.tar.gz";
-    sha256 = "1v5xpn4wal4vcrvcklchx9slkpa8xlwqkdbnxzy9zkzpq5g3arxr";
+    sha256 = "0csvaql9gky15w23gmiw6cvlfnrlhfxvdqd2pv3j3grr44ph0ab5";
   };
 
   patches = [
     # https://reviews.apache.org/r/36610/
     ./rb36610.patch
+    ./maven_repo.patch
   ];
 
   buildInputs = [
-    makeWrapper autoconf automake114x libtool curl sasl jdk maven
+    makeWrapper autoconf automake115x libtool curl sasl jdk maven
     python wrapPython boto setuptools leveldb
-    subversion apr glog
+    subversion apr glog openssl libevent
   ] ++ lib.optionals stdenv.isLinux [
     libnl
   ];
@@ -37,17 +38,18 @@ in stdenv.mkDerivation rec {
   ];
 
   preConfigure = ''
-    export MAVEN_OPTS="-Dmaven.repo.local=${mavenRepo}"
+    substituteInPlace src/Makefile.am --subst-var-by mavenRepo ${mavenRepo}
 
     substituteInPlace src/launcher/fetcher.cpp \
+      --replace '"gzip' '"${gzip}/bin/gzip'    \
       --replace '"tar' '"${gnutar}/bin/tar'    \
       --replace '"unzip' '"${unzip}/bin/unzip'
 
     substituteInPlace src/cli/mesos-scp        \
       --replace "'scp " "'${openssh}/bin/scp "
 
-    substituteInPlace src/cli/python/mesos/cli.py \
-      --replace "['mesos-resolve'" "['$out/bin/mesos-resolve'"
+    substituteInPlace src/python/cli/src/mesos/cli.py \
+     --replace "['mesos-resolve'" "['$out/bin/mesos-resolve'"
 
   '' + lib.optionalString (stdenv.isLinux) ''
 
@@ -57,13 +59,13 @@ in stdenv.mkDerivation rec {
     substituteInPlace src/linux/perf.cpp       \
       --replace '"perf ' '"${perf}/bin/perf '
 
-    substituteInPlace src/slave/containerizer/isolators/filesystem/shared.cpp \
+    substituteInPlace src/slave/containerizer/mesos/isolators/filesystem/shared.cpp \
       --replace '"mount ' '"${utillinux}/bin/mount ' \
 
-    substituteInPlace src/slave/containerizer/isolators/namespaces/pid.cpp \
+    substituteInPlace src/slave/containerizer/mesos/isolators/namespaces/pid.cpp \
       --replace '"mount ' '"${utillinux}/bin/mount ' \
 
-    substituteInPlace src/slave/containerizer/isolators/network/port_mapping.cpp \
+    substituteInPlace src/slave/containerizer/mesos/isolators/network/port_mapping.cpp \
       --replace '"tc ' '"${iproute}/bin/tc '   \
       --replace '"ip ' '"${iproute}/bin/ip '   \
       --replace '"mount ' '"${utillinux}/bin/mount ' \
@@ -79,6 +81,10 @@ in stdenv.mkDerivation rec {
     "--with-glog=${glog}"
     "--enable-optimize"
     "--disable-python-dependency-install"
+    "--enable-ssl"
+    "--with-ssl=${openssl}"
+    "--enable-libevent"
+    "--with-libevent=${libevent}"
   ] ++ lib.optionals stdenv.isLinux [
     "--with-network-isolator"
   ];
@@ -107,6 +113,14 @@ in stdenv.mkDerivation rec {
       --prefix="$out"
     rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py*
     popd
+
+    # optional python dependency for mesos cli 
+    pushd src/python/cli
+    ${python}/bin/${python.executable} setup.py install \
+      --install-lib=$out/lib/${python.libPrefix}/site-packages \
+      --old-and-unmanageable \
+      --prefix="$out"
+    popd
   '';
 
   postFixup = ''
@@ -127,7 +141,7 @@ in stdenv.mkDerivation rec {
     # wrap the python programs
     for prog in mesos-cat mesos-ps mesos-scp mesos-tail; do
       wrapProgram "$out/bin/$prog" \
-        --prefix PYTHONPATH ":" "$out/libexec/mesos/python"
+        --prefix PYTHONPATH ":" "$out/lib/${python.libPrefix}/site-packages"
       true
     done
   '';
diff --git a/pkgs/applications/networking/cluster/mesos/maven_repo.patch b/pkgs/applications/networking/cluster/mesos/maven_repo.patch
new file mode 100644
index 000000000000..9ee12976fde1
--- /dev/null
+++ b/pkgs/applications/networking/cluster/mesos/maven_repo.patch
@@ -0,0 +1,13 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index ae2740a..1df91a7 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1310,7 +1310,7 @@ if HAS_JAVA
+ 
+ $(MESOS_JAR): $(MESOS_JAR_SOURCE) $(MESOS_JAR_GENERATED) java/mesos.pom
+ 	@echo "Building mesos-$(PACKAGE_VERSION).jar ..."
+-	@cd $(abs_top_builddir)/src/java && $(MVN) -f mesos.pom clean package
++	@cd $(abs_top_builddir)/src/java && $(MVN) -f mesos.pom -Dmaven.repo.local=@mavenRepo@ clean package
+ 
+ # Convenience library for JNI bindings.
+ # TODO(Charles Reiss): We really should be building the Java library

From 9ba8e9a9daaffa11f3f9bce4452ec4ec3a8fdd58 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 14 Feb 2016 14:41:27 +0100
Subject: [PATCH 1323/2285] slock: 1.2 -> 1.3

---
 pkgs/misc/screensavers/slock/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix
index 5c731ff20d7f..4ff0a90ed020 100644
--- a/pkgs/misc/screensavers/slock/default.nix
+++ b/pkgs/misc/screensavers/slock/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, xproto, libX11, libXext }:
+{ stdenv, fetchurl, xproto, libX11, libXext, libXrandr }:
 stdenv.mkDerivation rec {
-  name = "slock-1.2";
+  name = "slock-1.3";
   src = fetchurl {
     url = "http://dl.suckless.org/tools/${name}.tar.gz";
-    sha256 = "1crkyr4vblhciy6vnbjwwjnlkm9yg2hzq16v6hzxm20ai67na0il";
+    sha256 = "065xa9hl7zn0lv2f7yjxphqsa35rg6dn9hv10gys0sh4ljpa7d5s";
   };
-  buildInputs = [ xproto libX11 libXext	];
+  buildInputs = [ xproto libX11 libXext libXrandr ];
   installFlags = "DESTDIR=\${out} PREFIX=";
   meta = {
     homepage = http://tools.suckless.org/slock;

From d9837dbd892ba51ab439ea7e8af62887988bc520 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 14 Feb 2016 14:43:45 +0100
Subject: [PATCH 1324/2285] slock: fix license

---
 pkgs/misc/screensavers/slock/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/screensavers/slock/default.nix b/pkgs/misc/screensavers/slock/default.nix
index 4ff0a90ed020..4e419b6cbb6d 100644
--- a/pkgs/misc/screensavers/slock/default.nix
+++ b/pkgs/misc/screensavers/slock/default.nix
@@ -7,14 +7,14 @@ stdenv.mkDerivation rec {
   };
   buildInputs = [ xproto libX11 libXext libXrandr ];
   installFlags = "DESTDIR=\${out} PREFIX=";
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://tools.suckless.org/slock;
     description = "Simple X display locker";
     longDescription = ''
       Simple X display locker. This is the simplest X screen locker.
     '';
-    license = "bsd";
-    maintainers = with stdenv.lib.maintainers; [ astsmtl ];
-    platforms = with stdenv.lib.platforms; linux;
+    license = licenses.mit;
+    maintainers = with maintainers; [ astsmtl ];
+    platforms = platforms.linux;
   };
 }

From 400ade95ff735b5d9a58617edc85db2d7a1ddb1f Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 14 Feb 2016 14:49:33 +0100
Subject: [PATCH 1325/2285] calibre: switch to qt-5.5, fixes #12793

---
 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 74cb1e7f59bb..635f0125f2f2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11399,7 +11399,7 @@ let
 
   calcurse = callPackage ../applications/misc/calcurse { };
 
-  calibre = qt5.callPackage ../applications/misc/calibre {
+  calibre = qt55.callPackage ../applications/misc/calibre {
     inherit (pythonPackages) pyqt5 sip_4_16;
   };
 

From 60a8dd4ffaefdb55ba034df0d91a2ffd0f8c7ec5 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 14 Feb 2016 10:34:58 -0600
Subject: [PATCH 1326/2285] kde5_latest.frameworks: 5.18 -> 5.19

---
 .../libraries/kde-frameworks-5.19/attica.nix  |  11 +
 .../libraries/kde-frameworks-5.19/baloo.nix   |  25 +
 .../kde-frameworks-5.19/bluez-qt.nix          |  17 +
 .../kde-frameworks-5.19/breeze-icons.nix      |  10 +
 .../libraries/kde-frameworks-5.19/default.nix | 118 ++++
 .../0001-extra-cmake-modules-paths.patch      |  74 +++
 .../extra-cmake-modules/default.nix           |  18 +
 .../extra-cmake-modules/setup-hook.sh         |  27 +
 .../kde-frameworks-5.19/fetchsrcs.sh          |  57 ++
 .../frameworkintegration.nix                  |  17 +
 .../kde-frameworks-5.19/kactivities.nix       |  22 +
 .../libraries/kde-frameworks-5.19/kapidox.nix |  12 +
 .../kde-frameworks-5.19/karchive.nix          |  11 +
 .../kde-frameworks-5.19/kauth/default.nix     |  16 +
 .../kauth/kauth-policy-install.patch          |  13 +
 .../kde-frameworks-5.19/kbookmarks.nix        |  25 +
 .../0001-qdiriterator-follow-symlinks.patch   |  25 +
 .../kde-frameworks-5.19/kcmutils/default.nix  |  17 +
 .../libraries/kde-frameworks-5.19/kcodecs.nix |  11 +
 .../kde-frameworks-5.19/kcompletion.nix       |  14 +
 .../libraries/kde-frameworks-5.19/kconfig.nix |  16 +
 .../0001-qdiriterator-follow-symlinks.patch   |  25 +
 .../kconfigwidgets/default.nix                |  17 +
 .../kde-frameworks-5.19/kcoreaddons.nix       |  16 +
 .../libraries/kde-frameworks-5.19/kcrash.nix  |  16 +
 .../kde-frameworks-5.19/kdbusaddons.nix       |  17 +
 .../kde-frameworks-5.19/kdeclarative.nix      |  22 +
 .../libraries/kde-frameworks-5.19/kded.nix    |  19 +
 .../kde-frameworks-5.19/kdelibs4support.nix   |  32 +
 .../kde-frameworks-5.19/kdesignerplugin.nix   |  34 ++
 .../libraries/kde-frameworks-5.19/kdesu.nix   |  13 +
 .../kde-frameworks-5.19/kdewebkit.nix         |  13 +
 .../libraries/kde-frameworks-5.19/kdnssd.nix  |  13 +
 .../kde-frameworks-5.19/kdoctools/default.nix |  20 +
 .../kdoctools-no-find-docbook-xml.patch       |  12 +
 .../kdoctools/setup-hook.sh                   |   5 +
 .../kde-frameworks-5.19/kemoticons.nix        |  17 +
 .../kde-frameworks-5.19/kfilemetadata.nix     |  13 +
 .../kde-frameworks-5.19/kglobalaccel.nix      |  23 +
 .../kde-frameworks-5.19/kguiaddons.nix        |  13 +
 .../libraries/kde-frameworks-5.19/khtml.nix   |  21 +
 .../libraries/kde-frameworks-5.19/ki18n.nix   |  17 +
 .../kiconthemes/default-theme-breeze.patch    |  13 +
 .../kiconthemes/default.nix                   |  18 +
 .../kde-frameworks-5.19/kiconthemes/series    |   1 +
 .../kde-frameworks-5.19/kidletime.nix         |  15 +
 .../kde-frameworks-5.19/kimageformats.nix     |  13 +
 .../kinit/0001-kinit-libpath.patch            |  42 ++
 .../kde-frameworks-5.19/kinit/default.nix     |  17 +
 .../kde-frameworks-5.19/kio/default.nix       |  33 +
 .../kio/samba-search-path.patch               |  28 +
 .../libraries/kde-frameworks-5.19/kio/series  |   1 +
 .../kde-frameworks-5.19/kitemmodels.nix       |  11 +
 .../kde-frameworks-5.19/kitemviews.nix        |  11 +
 .../kde-frameworks-5.19/kjobwidgets.nix       |  16 +
 .../libraries/kde-frameworks-5.19/kjs.nix     |  16 +
 .../kde-frameworks-5.19/kjsembed.nix          |  17 +
 .../kde-frameworks-5.19/kmediaplayer.nix      |  15 +
 .../kde-frameworks-5.19/knewstuff.nix         |  17 +
 .../kde-frameworks-5.19/knotifications.nix    |  21 +
 .../kde-frameworks-5.19/knotifyconfig.nix     |  13 +
 .../kpackage/allow-external-paths.patch       |  13 +
 .../kde-frameworks-5.19/kpackage/default.nix  |  23 +
 .../qdiriterator-follow-symlinks.patch        |  26 +
 .../kde-frameworks-5.19/kpackage/series       |   2 +
 .../libraries/kde-frameworks-5.19/kparts.nix  |  17 +
 .../libraries/kde-frameworks-5.19/kpeople.nix |  15 +
 .../kde-frameworks-5.19/kplotting.nix         |  11 +
 .../libraries/kde-frameworks-5.19/kpty.nix    |  10 +
 .../libraries/kde-frameworks-5.19/kross.nix   |  14 +
 .../libraries/kde-frameworks-5.19/krunner.nix |  16 +
 .../0001-qdiriterator-follow-symlinks.patch   |  25 +
 .../kservice/0002-no-canonicalize-path.patch  |  25 +
 .../kde-frameworks-5.19/kservice/default.nix  |  19 +
 .../kservice/setup-hook.sh                    |  43 ++
 .../ktexteditor/default.nix                   |  22 +
 .../ktexteditor/no-qcoreapplication.patch     |  36 ++
 .../kde-frameworks-5.19/ktexteditor/series    |   1 +
 .../kde-frameworks-5.19/ktextwidgets.nix      |  16 +
 .../kde-frameworks-5.19/kunitconversion.nix   |  10 +
 .../libraries/kde-frameworks-5.19/kwallet.nix |  21 +
 .../kde-frameworks-5.19/kwidgetsaddons.nix    |  11 +
 .../kde-frameworks-5.19/kwindowsystem.nix     |  13 +
 .../libraries/kde-frameworks-5.19/kxmlgui.nix |  18 +
 .../kde-frameworks-5.19/kxmlrpcclient.nix     |  10 +
 .../kde-frameworks-5.19/modemmanager-qt.nix   |  13 +
 .../kde-frameworks-5.19/networkmanager-qt.nix |  13 +
 .../kde-frameworks-5.19/oxygen-icons5.nix     |  13 +
 .../plasma-framework/default.nix              |  25 +
 .../libraries/kde-frameworks-5.19/solid.nix   |  17 +
 .../libraries/kde-frameworks-5.19/sonnet.nix  |  13 +
 .../libraries/kde-frameworks-5.19/srcs.nix    | 565 ++++++++++++++++++
 .../kde-frameworks-5.19/threadweaver.nix      |  11 +
 pkgs/top-level/all-packages.nix               |  11 +-
 94 files changed, 2349 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/attica.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/baloo.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh
 create mode 100755 pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/karchive.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kauth/kauth-policy-install.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kded.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kdoctools/setup-hook.sh
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/khtml.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kio/series
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kjs.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kpackage/series
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kparts.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kpty.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kross.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/krunner.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kservice/setup-hook.sh
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/solid.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/srcs.nix
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix

diff --git a/pkgs/development/libraries/kde-frameworks-5.19/attica.nix b/pkgs/development/libraries/kde-frameworks-5.19/attica.nix
new file mode 100644
index 000000000000..98721876c120
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/attica.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "attica";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix
new file mode 100644
index 000000000000..38c41d9271d8
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix
@@ -0,0 +1,25 @@
+{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig
+, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime
+, kio, lmdb, makeQtWrapper, qtbase, qtquick1, solid
+}:
+
+kdeFramework {
+  name = "baloo";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  buildInputs = [
+    kconfig kcrash kdbusaddons lmdb qtquick1 solid
+  ];
+  propagatedBuildInputs = [
+    kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/baloo_file"
+    wrapQtProgram "$out/bin/baloo_file_extractor"
+    wrapQtProgram "$out/bin/balooctl"
+    wrapQtProgram "$out/bin/baloosearch"
+    wrapQtProgram "$out/bin/balooshow"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix
new file mode 100644
index 000000000000..f981b0516f72
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, qtdeclarative
+}:
+
+kdeFramework {
+  name = "bluez-qt";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtdeclarative ];
+  preConfigure = ''
+    substituteInPlace CMakeLists.txt \
+      --replace /lib/udev/rules.d "$out/lib/udev/rules.d"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix
new file mode 100644
index 000000000000..879262c56a41
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix
@@ -0,0 +1,10 @@
+{ kdeFramework
+, extra-cmake-modules
+, qtsvg
+}:
+
+kdeFramework {
+  name = "breeze-icons";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedUserEnvPkgs = [ qtsvg ];
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/default.nix
new file mode 100644
index 000000000000..cd314e27cacb
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/default.nix
@@ -0,0 +1,118 @@
+# 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.
+
+{ pkgs, debug ? false }:
+
+let
+
+  inherit (pkgs) lib makeSetupHook stdenv;
+
+  mirror = "mirror://kde";
+  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
+
+  packages = self: with self; {
+    kdeFramework = args:
+      let
+        inherit (args) name;
+        inherit (srcs."${name}") src version;
+      in stdenv.mkDerivation (args // {
+        name = "${name}-${version}";
+        inherit src;
+
+        cmakeFlags =
+          (args.cmakeFlags or [])
+          ++ [ "-DBUILD_TESTING=OFF" ]
+          ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
+
+        meta = {
+          license = with lib.licenses; [
+            lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
+          ];
+          platforms = lib.platforms.linux;
+          homepage = "http://www.kde.org";
+        } // (args.meta or {});
+      });
+
+    attica = callPackage ./attica.nix {};
+    baloo = callPackage ./baloo.nix {};
+    bluez-qt = callPackage ./bluez-qt.nix {};
+    breeze-icons = callPackage ./breeze-icons.nix {};
+    extra-cmake-modules = callPackage ./extra-cmake-modules {};
+    frameworkintegration = callPackage ./frameworkintegration.nix {};
+    kactivities = callPackage ./kactivities.nix {};
+    kapidox = callPackage ./kapidox.nix {};
+    karchive = callPackage ./karchive.nix {};
+    kauth = callPackage ./kauth {};
+    kbookmarks = callPackage ./kbookmarks.nix {};
+    kcmutils = callPackage ./kcmutils {};
+    kcodecs = callPackage ./kcodecs.nix {};
+    kcompletion = callPackage ./kcompletion.nix {};
+    kconfig = callPackage ./kconfig.nix {};
+    kconfigwidgets = callPackage ./kconfigwidgets {};
+    kcoreaddons = callPackage ./kcoreaddons.nix {};
+    kcrash = callPackage ./kcrash.nix {};
+    kdbusaddons = callPackage ./kdbusaddons.nix {};
+    kdeclarative = callPackage ./kdeclarative.nix {};
+    kded = callPackage ./kded.nix {};
+    kdelibs4support = callPackage ./kdelibs4support.nix {};
+    kdesignerplugin = callPackage ./kdesignerplugin.nix {};
+    kdewebkit = callPackage ./kdewebkit.nix {};
+    kdesu = callPackage ./kdesu.nix {};
+    kdnssd = callPackage ./kdnssd.nix {};
+    kdoctools = callPackage ./kdoctools {};
+    kemoticons = callPackage ./kemoticons.nix {};
+    kfilemetadata = callPackage ./kfilemetadata.nix {};
+    kglobalaccel = callPackage ./kglobalaccel.nix {};
+    kguiaddons = callPackage ./kguiaddons.nix {};
+    khtml = callPackage ./khtml.nix {};
+    ki18n = callPackage ./ki18n.nix {};
+    kiconthemes = callPackage ./kiconthemes {};
+    kidletime = callPackage ./kidletime.nix {};
+    kimageformats = callPackage ./kimageformats.nix {};
+    kinit = callPackage ./kinit {};
+    kio = callPackage ./kio {};
+    kitemmodels = callPackage ./kitemmodels.nix {};
+    kitemviews = callPackage ./kitemviews.nix {};
+    kjobwidgets = callPackage ./kjobwidgets.nix {};
+    kjs = callPackage ./kjs.nix {};
+    kjsembed = callPackage ./kjsembed.nix {};
+    kmediaplayer = callPackage ./kmediaplayer.nix {};
+    knewstuff = callPackage ./knewstuff.nix {};
+    knotifications = callPackage ./knotifications.nix {};
+    knotifyconfig = callPackage ./knotifyconfig.nix {};
+    kpackage = callPackage ./kpackage {};
+    kparts = callPackage ./kparts.nix {};
+    kpeople = callPackage ./kpeople.nix {};
+    kplotting = callPackage ./kplotting.nix {};
+    kpty = callPackage ./kpty.nix {};
+    kross = callPackage ./kross.nix {};
+    krunner = callPackage ./krunner.nix {};
+    kservice = callPackage ./kservice {};
+    ktexteditor = callPackage ./ktexteditor {};
+    ktextwidgets = callPackage ./ktextwidgets.nix {};
+    kunitconversion = callPackage ./kunitconversion.nix {};
+    kwallet = callPackage ./kwallet.nix {};
+    kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
+    kwindowsystem = callPackage ./kwindowsystem.nix {};
+    kxmlgui = callPackage ./kxmlgui.nix {};
+    kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
+    modemmanager-qt = callPackage ./modemmanager-qt.nix {};
+    networkmanager-qt = callPackage ./networkmanager-qt.nix {};
+    oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
+    plasma-framework = callPackage ./plasma-framework {};
+    solid = callPackage ./solid.nix {};
+    sonnet = callPackage ./sonnet.nix {};
+    threadweaver = callPackage ./threadweaver.nix {};
+  };
+
+in packages
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
new file mode 100644
index 000000000000..9717716faf5b
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
@@ -0,0 +1,74 @@
+From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Fri, 20 Feb 2015 23:17:39 -0600
+Subject: [PATCH] extra-cmake-modules paths
+
+---
+ kde-modules/KDEInstallDirs.cmake | 37 ++++---------------------------------
+ 1 file changed, 4 insertions(+), 33 deletions(-)
+
+diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
+index b7cd34d..2f868ac 100644
+--- a/kde-modules/KDEInstallDirs.cmake
++++ b/kde-modules/KDEInstallDirs.cmake
+@@ -193,37 +193,8 @@
+ # (To distribute this file outside of extra-cmake-modules, substitute the full
+ #  License text for the above reference.)
+ 
+-# Figure out what the default install directory for libraries should be.
+-# This is based on the logic in GNUInstallDirs, but simplified (the
+-# GNUInstallDirs code deals with re-configuring, but that is dealt with
+-# by the _define_* macros in this module).
++# The default library directory on NixOS is *always* /lib.
+ set(_LIBDIR_DEFAULT "lib")
+-# Override this default 'lib' with 'lib64' iff:
+-#  - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
+-#  - we are NOT on debian
+-#  - we are on a 64 bits system
+-# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
+-# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
+-# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
+-# See http://wiki.debian.org/Multiarch
+-if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
+-   AND NOT CMAKE_CROSSCOMPILING)
+-  if (EXISTS "/etc/debian_version") # is this a debian system ?
+-    if(CMAKE_LIBRARY_ARCHITECTURE)
+-      set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
+-    endif()
+-  else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
+-    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
+-      message(AUTHOR_WARNING
+-        "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
+-        "Please enable at least one language before including KDEInstallDirs.")
+-    else()
+-      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
+-        set(_LIBDIR_DEFAULT "lib64")
+-      endif()
+-    endif()
+-  endif()
+-endif()
+ 
+ set(_gnu_install_dirs_vars
+     BINDIR
+@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
+         "QtQuick2 imports"
+         QML_INSTALL_DIR)
+ else()
+-    _define_relative(QTPLUGINDIR LIBDIR "plugins"
++    _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
+         "Qt plugins"
+         QT_PLUGIN_INSTALL_DIR)
+ 
+-    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports"
++    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports"
+         "QtQuick1 imports"
+         IMPORTS_INSTALL_DIR)
+ 
+-    _define_relative(QMLDIR LIBDIR "qml"
++    _define_relative(QMLDIR LIBDIR "qt5/qml"
+         "QtQuick2 imports"
+         QML_INSTALL_DIR)
+ endif()
+-- 
+2.3.0
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix
new file mode 100644
index 000000000000..4e1b1aff3bd1
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix
@@ -0,0 +1,18 @@
+{ kdeFramework, lib, stdenv, cmake, pkgconfig, qttools }:
+
+kdeFramework {
+  name = "extra-cmake-modules";
+  patches = [ ./0001-extra-cmake-modules-paths.patch ];
+
+  setupHook = ./setup-hook.sh;
+
+  # It is OK to propagate these inputs as long as
+  # extra-cmake-modules is never a propagated input
+  # of some other derivation.
+  propagatedNativeBuildInputs = [ cmake pkgconfig qttools ];
+
+  meta = {
+    license = stdenv.lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh
new file mode 100644
index 000000000000..a6fa6189240b
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh
@@ -0,0 +1,27 @@
+addMimePkg() {
+    local propagated
+
+    if [[ -d "$1/share/mime" ]]; then
+        propagated=
+        for pkg in $propagatedBuildInputs; do
+            if [[ "z$pkg" == "z$1" ]]; then
+                propagated=1
+            fi
+        done
+        if [[ -z $propagated ]]; then
+            propagatedBuildInputs="$propagatedBuildInputs $1"
+        fi
+
+        propagated=
+        for pkg in $propagatedUserEnvPkgs; do
+            if [[ "z$pkg" == "z$1" ]]; then
+                propagated=1
+            fi
+        done
+        if [[ -z $propagated ]]; then
+            propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1"
+        fi
+    fi
+}
+
+envHooks+=(addMimePkg)
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh
new file mode 100755
index 000000000000..7937e6f8bed9
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh
@@ -0,0 +1,57 @@
+#! /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.19/"
+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/development/libraries/kde-frameworks-5.19/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix
new file mode 100644
index 000000000000..26987c385ad5
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib, extra-cmake-modules, kbookmarks, kcompletion
+, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications
+, kwidgetsaddons, libXcursor, qtx11extras
+}:
+
+kdeFramework {
+  name = "frameworkintegration";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kbookmarks kcompletion kconfig knotifications kwidgetsaddons
+    libXcursor
+  ];
+  propagatedBuildInputs = [ kconfigwidgets ki18n kio kiconthemes qtx11extras ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix
new file mode 100644
index 000000000000..3225098f4398
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix
@@ -0,0 +1,22 @@
+{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig
+, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n
+, kio, kservice, kwindowsystem, kxmlgui, makeQtWrapper, qtdeclarative
+}:
+
+kdeFramework {
+  name = "kactivities";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  buildInputs = [
+    boost kcmutils kconfig kcoreaddons kdbusaddons kservice
+    kxmlgui
+  ];
+  propagatedBuildInputs = [
+    kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kactivitymanagerd"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix b/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix
new file mode 100644
index 000000000000..647be8f052c3
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix
@@ -0,0 +1,12 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, python
+}:
+
+kdeFramework {
+  name = "kapidox";
+  nativeBuildInputs = [ extra-cmake-modules python ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix
new file mode 100644
index 000000000000..a8d9a0003c3b
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "karchive";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix
new file mode 100644
index 000000000000..2b000ff3c041
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcoreaddons
+, polkit-qt
+}:
+
+kdeFramework {
+  name = "kauth";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ polkit-qt ];
+  propagatedBuildInputs = [ kcoreaddons ];
+  patches = [ ./kauth-policy-install.patch ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.19/kauth/kauth-policy-install.patch
new file mode 100644
index 000000000000..340155256f28
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kauth/kauth-policy-install.patch
@@ -0,0 +1,13 @@
+diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in
+index e859ec7..9a8ab18 100644
+--- a/KF5AuthConfig.cmake.in
++++ b/KF5AuthConfig.cmake.in
+@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/")
+ 
+ set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
+ set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
+-set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
++set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")
+ set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
+ 
+ find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix
new file mode 100644
index 000000000000..1a469ab4db6d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix
@@ -0,0 +1,25 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcodecs
+, kconfig
+, kconfigwidgets
+, kcoreaddons
+, kiconthemes
+, kxmlgui
+}:
+
+kdeFramework {
+  name = "kbookmarks";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kcodecs
+    kconfig
+    kconfigwidgets
+    kcoreaddons
+    kiconthemes
+    kxmlgui
+  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
new file mode 100644
index 000000000000..0d861fa95012
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
@@ -0,0 +1,25 @@
+From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 14 Oct 2015 06:43:53 -0500
+Subject: [PATCH] qdiriterator follow symlinks
+
+---
+ src/kpluginselector.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
+index 9c3431d..d6b1ee2 100644
+--- a/src/kpluginselector.cpp
++++ b/src/kpluginselector.cpp
+@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
+     QStringList desktopFileNames;
+     const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
+     Q_FOREACH (const QString &dir, dirs) {
+-        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
++      QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while (it.hasNext()) {
+             desktopFileNames.append(it.next());
+         }
+-- 
+2.5.2
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix
new file mode 100644
index 000000000000..dbbb783ac615
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets
+, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews
+, kpackage, kservice, kxmlgui
+}:
+
+kdeFramework {
+  name = "kcmutils";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kcoreaddons kiconthemes kitemviews kpackage kxmlgui
+  ];
+  propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ];
+  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix
new file mode 100644
index 000000000000..53a69a69b69c
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "kcodecs";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix
new file mode 100644
index 000000000000..e393774f16a5
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix
@@ -0,0 +1,14 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kconfig
+, kwidgetsaddons
+}:
+
+kdeFramework {
+  name = "kcompletion";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kconfig kwidgetsaddons ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix
new file mode 100644
index 000000000000..e132afe59886
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, makeQtWrapper
+}:
+
+kdeFramework {
+  name = "kconfig";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kreadconfig5"
+    wrapQtProgram "$out/bin/kwriteconfig5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
new file mode 100644
index 000000000000..7a6c0ee90534
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
@@ -0,0 +1,25 @@
+From 4f84780893d505b2d62a14633dd983baa8ec6e28 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 14 Oct 2015 06:47:01 -0500
+Subject: [PATCH] qdiriterator follow symlinks
+
+---
+ src/khelpclient.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
+index 53a331e..80fbb01 100644
+--- a/src/khelpclient.cpp
++++ b/src/khelpclient.cpp
+@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
+     QString docPath;
+     const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
+     Q_FOREACH (const QString &dir, desktopDirs) {
+-        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
++        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+         while (it.hasNext()) {
+             const QString desktopPath(it.next());
+             KDesktopFile desktopFile(desktopPath);
+-- 
+2.5.2
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix
new file mode 100644
index 000000000000..0e14d06edd36
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig
+, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeQtWrapper
+}:
+
+kdeFramework {
+  name = "kconfigwidgets";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  buildInputs = [ kguiaddons ];
+  propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ];
+  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/preparetips5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix
new file mode 100644
index 000000000000..f3a1db7bd484
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib, makeQtWrapper
+, extra-cmake-modules
+, shared_mime_info
+}:
+
+kdeFramework {
+  name = "kcoreaddons";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  buildInputs = [ shared_mime_info ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/desktoptojson"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix
new file mode 100644
index 000000000000..bbab78ccb409
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcoreaddons
+, kwindowsystem
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kcrash";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kcoreaddons ];
+  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix
new file mode 100644
index 000000000000..d2ceab31d14b
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, makeQtWrapper
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kdbusaddons";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  propagatedBuildInputs = [ qtx11extras ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kquitapp5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix
new file mode 100644
index 000000000000..74d107466cfc
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix
@@ -0,0 +1,22 @@
+{ kdeFramework, lib, extra-cmake-modules, epoxy, kconfig
+, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage
+, kwidgetsaddons, kwindowsystem, makeQtWrapper, pkgconfig
+, qtdeclarative
+}:
+
+kdeFramework {
+  name = "kdeclarative";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  buildInputs = [
+    epoxy kguiaddons kiconthemes kwidgetsaddons
+  ];
+  propagatedBuildInputs = [
+    kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kpackagelauncherqml"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kded.nix b/pkgs/development/libraries/kde-frameworks-5.19/kded.nix
new file mode 100644
index 000000000000..47ae2d68c68e
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kded.nix
@@ -0,0 +1,19 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kconfig
+, kcoreaddons
+, kcrash
+, kdbusaddons
+, kdoctools
+, kinit
+, kservice
+}:
+
+kdeFramework {
+  name = "kded";
+  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ];
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support.nix
new file mode 100644
index 000000000000..e61c4bb86e7c
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support.nix
@@ -0,0 +1,32 @@
+{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth
+, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
+, kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons
+, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
+, kinit, knotifications, kparts, kservice, ktextwidgets
+, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui
+, networkmanager, qtsvg, qtx11extras, xlibs
+}:
+
+# TODO: debug docbook detection
+
+kdeFramework {
+  name = "kdelibs4support";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [
+    kcompletion kconfig kded kservice kwidgetsaddons
+    kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
+  ];
+  propagatedBuildInputs = [
+    kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons
+    kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio
+    kiconthemes kitemmodels kinit knotifications kparts ktextwidgets
+    kunitconversion kwindowsystem
+  ];
+  cmakeFlags = [
+    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
+    "-DDocBookXML4_DTD_VERSION=4.5"
+  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix
new file mode 100644
index 000000000000..cbc114ccca03
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix
@@ -0,0 +1,34 @@
+{ kdeFramework, lib, makeQtWrapper
+, extra-cmake-modules
+, kcompletion
+, kconfig
+, kconfigwidgets
+, kcoreaddons
+, kdewebkit
+, kdoctools
+, kiconthemes
+, kio
+, kitemviews
+, kplotting
+, ktextwidgets
+, kwidgetsaddons
+, kxmlgui
+, sonnet
+}:
+
+kdeFramework {
+  name = "kdesignerplugin";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  buildInputs = [
+    kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit
+    kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons
+    kxmlgui
+  ];
+  propagatedBuildInputs = [ kio sonnet ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kgendesignerplugin"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix
new file mode 100644
index 000000000000..364fbd6a720b
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty
+, kservice
+}:
+
+kdeFramework {
+  name = "kdesu";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kcoreaddons kservice ];
+  propagatedBuildInputs = [ ki18n kpty ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix
new file mode 100644
index 000000000000..d361313d1d49
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
+, ki18n, kio, kjobwidgets, kparts, kservice, kwallet, qtwebkit
+}:
+
+kdeFramework {
+  name = "kdewebkit";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kconfig kcoreaddons kjobwidgets kparts kservice kwallet ];
+  propagatedBuildInputs = [ ki18n kio qtwebkit ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix
new file mode 100644
index 000000000000..f00432b0c9ce
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, avahi
+}:
+
+kdeFramework {
+  name = "kdnssd";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ avahi ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix
new file mode 100644
index 000000000000..138c3fc33b94
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix
@@ -0,0 +1,20 @@
+{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45
+, docbook5_xsl, karchive, ki18n, makeQtWrapper, perl, perlPackages
+}:
+
+kdeFramework {
+  name = "kdoctools";
+  setupHook = ./setup-hook.sh;
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ karchive ];
+  propagatedBuildInputs = [ ki18n ];
+  propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ];
+  cmakeFlags = [
+    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
+    "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
+  ];
+  patches = [ ./kdoctools-no-find-docbook-xml.patch ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
new file mode 100644
index 000000000000..4e3a33efab32
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5c4863c..f731775 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES
+                       )
+ 
+ 
+-find_package(DocBookXML4 "4.5")
+ 
+ set_package_properties(DocBookXML4 PROPERTIES
+                        TYPE REQUIRED
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/setup-hook.sh
new file mode 100644
index 000000000000..5cfffbd622d1
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/setup-hook.sh
@@ -0,0 +1,5 @@
+addXdgData() {
+    addToSearchPath XDG_DATA_DIRS "$1/share"
+}
+
+envHooks+=(addXdgData)
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix
new file mode 100644
index 000000000000..d165f84e3a2d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, karchive
+, kconfig
+, kcoreaddons
+, kservice
+}:
+
+kdeFramework {
+  name = "kemoticons";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ karchive kconfig kcoreaddons ];
+  propagatedBuildInputs = [ kservice ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata.nix
new file mode 100644
index 000000000000..be99c58d5504
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2
+, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
+}:
+
+kdeFramework {
+  name = "kfilemetadata";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ];
+  propagatedBuildInputs = [ qtbase ki18n ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix
new file mode 100644
index 000000000000..c535b3590a38
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix
@@ -0,0 +1,23 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kconfig
+, kcoreaddons
+, kcrash
+, kdbusaddons
+, kwindowsystem
+, makeQtWrapper
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kglobalaccel";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ];
+  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kglobalaccel5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix
new file mode 100644
index 000000000000..bc4e9ab11843
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kguiaddons";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtx11extras ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix
new file mode 100644
index 000000000000..d40df466ebbd
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix
@@ -0,0 +1,21 @@
+{ kdeFramework, lib, extra-cmake-modules, giflib, karchive
+, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs
+, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons
+, kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet
+}:
+
+kdeFramework {
+  name = "khtml";
+  nativeBuildInputs = [ extra-cmake-modules perl ];
+  buildInputs = [
+    giflib karchive kiconthemes knotifications kwallet kwidgetsaddons
+    kxmlgui phonon
+  ];
+  propagatedBuildInputs = [
+    kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets
+    kwindowsystem qtx11extras sonnet
+  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix
new file mode 100644
index 000000000000..268006512e7c
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, gettext
+, python
+, qtdeclarative
+, qtscript
+}:
+
+kdeFramework {
+  name = "ki18n";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtdeclarative qtscript ];
+  propagatedNativeBuildInputs = [ gettext python ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch
new file mode 100644
index 000000000000..5b3b15d5d5b5
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch
@@ -0,0 +1,13 @@
+Index: kiconthemes-5.17.0/src/kicontheme.cpp
+===================================================================
+--- kiconthemes-5.17.0.orig/src/kicontheme.cpp
++++ kiconthemes-5.17.0/src/kicontheme.cpp
+@@ -557,7 +557,7 @@ void KIconTheme::reconfigure()
+ // static
+ QString KIconTheme::defaultThemeName()
+ {
+-    return QStringLiteral("oxygen");
++    return QStringLiteral("breeze");
+ }
+ 
+ void KIconTheme::assignIconsToContextMenu(ContextMenus type,
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix
new file mode 100644
index 000000000000..b78b25582beb
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix
@@ -0,0 +1,18 @@
+{ kdeFramework, lib, copyPathsToStore
+, extra-cmake-modules, makeQtWrapper
+, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg
+}:
+
+kdeFramework {
+  name = "kiconthemes";
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  buildInputs = [ kconfigwidgets kitemviews qtsvg ];
+  propagatedBuildInputs = [ breeze-icons ki18n ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kiconfinder5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series
new file mode 100644
index 000000000000..ab5cc8a3edb2
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series
@@ -0,0 +1 @@
+default-theme-breeze.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix
new file mode 100644
index 000000000000..fc0865600239
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix
@@ -0,0 +1,15 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, qtbase
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kidletime";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtx11extras ];
+  propagatedBuildInputs = [ qtbase ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix
new file mode 100644
index 000000000000..49d66bbcc2c6
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, ilmbase
+}:
+
+kdeFramework {
+  name = "kimageformats";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch
new file mode 100644
index 000000000000..9c76079a382a
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch
@@ -0,0 +1,42 @@
+From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sat, 13 Jun 2015 08:57:55 -0500
+Subject: [PATCH] kinit libpath
+
+---
+ src/kdeinit/kinit.cpp | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
+index 9e775b6..0ac5646 100644
+--- a/src/kdeinit/kinit.cpp
++++ b/src/kdeinit/kinit.cpp
+@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args,
+         if (!libpath.isEmpty()) {
+             if (!l.load()) {
+                 if (libpath_relative) {
+-                    // NB: Because Qt makes the actual dlopen() call, the
+-                    //     RUNPATH of kdeinit is *not* respected - see
+-                    //     https://sourceware.org/bugzilla/show_bug.cgi?id=13945
+-                    //     - so we try hacking it in ourselves
+-                    QString install_lib_dir = QFile::decodeName(
+-                            CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
+-                    libpath = install_lib_dir + libpath;
+-                    l.setFileName(libpath);
++                  // Use QT_PLUGIN_PATH to find shared library directories
++                  // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5
++                  // shared libraries should be in /lib/qt5/plugins/../../
++                  const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]"));
++                  const QString up = QString::fromLocal8Bit("/../../");
++                  const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts);
++                  Q_FOREACH (const QString &path, paths) {
++                    l.setFileName(path + up + libpath);
+                     l.load();
++                    if (l.isLoaded()) break;
++                  }
+                 }
+             }
+             if (!l.isLoaded()) {
+-- 
+2.4.2
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix
new file mode 100644
index 000000000000..5f644d7c424e
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kcrash
+, kdoctools, ki18n, kio, kservice, kwindowsystem, libcap
+, libcap_progs
+}:
+
+# TODO: setuid wrapper
+
+kdeFramework {
+  name = "kinit";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ];
+  buildInputs = [ kconfig kcrash kservice libcap ];
+  propagatedBuildInputs = [ ki18n kio kwindowsystem ];
+  patches = [ ./0001-kinit-libpath.patch ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix
new file mode 100644
index 000000000000..a2131ff33850
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix
@@ -0,0 +1,33 @@
+{ kdeFramework, lib, copyPathsToStore
+, extra-cmake-modules, acl, karchive
+, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons
+, kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews
+, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet
+, kwidgetsaddons, kwindowsystem, kxmlgui, makeQtWrapper
+, qtscript, qtx11extras, solid
+}:
+
+kdeFramework {
+  name = "kio";
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  buildInputs = [
+    acl karchive kconfig kcoreaddons kdbusaddons kiconthemes
+    knotifications ktextwidgets kwallet kwidgetsaddons
+    qtscript
+  ];
+  propagatedBuildInputs = [
+    kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets
+    kservice kwindowsystem kxmlgui solid qtx11extras
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kcookiejar5"
+    wrapQtProgram "$out/bin/ktelnetservice5"
+    wrapQtProgram "$out/bin/ktrash5"
+    wrapQtProgram "$out/bin/kmailservice5"
+    wrapQtProgram "$out/bin/protocoltojson"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch b/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch
new file mode 100644
index 000000000000..c9ad46b41bb7
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch
@@ -0,0 +1,28 @@
+Index: kio-5.17.0/src/core/ksambashare.cpp
+===================================================================
+--- kio-5.17.0.orig/src/core/ksambashare.cpp
++++ kio-5.17.0/src/core/ksambashare.cpp
+@@ -67,13 +67,18 @@ KSambaSharePrivate::~KSambaSharePrivate(
+ 
+ bool KSambaSharePrivate::isSambaInstalled()
+ {
+-    if (QFile::exists(QStringLiteral("/usr/sbin/smbd"))
+-            || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))) {
+-        return true;
++    const QByteArray pathEnv = qgetenv("PATH");
++    if (!pathEnv.isEmpty()) {
++        QLatin1Char pathSep(':');
++        QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts);
++        for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) {
++            it->append("/smbd");
++            if (QFile::exists(*it)) {
++                return true;
++            }
++        }
+     }
+ 
+-    //qDebug() << "Samba is not installed!";
+-
+     return false;
+ }
+ 
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/series b/pkgs/development/libraries/kde-frameworks-5.19/kio/series
new file mode 100644
index 000000000000..77ca15450047
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kio/series
@@ -0,0 +1 @@
+samba-search-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix
new file mode 100644
index 000000000000..a9024d771cc3
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "kitemmodels";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix
new file mode 100644
index 000000000000..931019ce495d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "kitemviews";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix
new file mode 100644
index 000000000000..746edf12eea0
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcoreaddons
+, kwidgetsaddons
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kjobwidgets";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kcoreaddons kwidgetsaddons ];
+  propagatedBuildInputs = [ qtx11extras ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix
new file mode 100644
index 000000000000..768720f178c8
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kdoctools
+, makeQtWrapper
+}:
+
+kdeFramework {
+  name = "kjs";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kjs5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix
new file mode 100644
index 000000000000..22eef2d47bde
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs
+, makeQtWrapper, qtsvg
+}:
+
+kdeFramework {
+  name = "kjsembed";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  buildInputs = [ qtsvg ];
+  propagatedBuildInputs = [ ki18n kjs ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kjscmd5"
+    wrapQtProgram "$out/bin/kjsconsole"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix
new file mode 100644
index 000000000000..460458b22323
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix
@@ -0,0 +1,15 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kparts
+, kxmlgui
+}:
+
+kdeFramework {
+  name = "kmediaplayer";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kxmlgui ];
+  propagatedBuildInputs = [ kparts ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix
new file mode 100644
index 000000000000..5bcd6f301462
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib, extra-cmake-modules, attica, karchive
+, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio
+, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui
+}:
+
+kdeFramework {
+  name = "knewstuff";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    karchive kcompletion kconfig kcoreaddons kiconthemes
+    kitemviews ktextwidgets kwidgetsaddons
+  ];
+  propagatedBuildInputs = [ attica ki18n kio kservice kxmlgui ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix
new file mode 100644
index 000000000000..7e301dd0f268
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix
@@ -0,0 +1,21 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, kcodecs
+, kconfig
+, kcoreaddons
+, kwindowsystem
+, phonon
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "knotifications";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kcodecs kconfig kcoreaddons phonon
+  ];
+  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix
new file mode 100644
index 000000000000..dd99d2d4f1e5
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
+, ki18n, kio, phonon
+}:
+
+kdeFramework {
+  name = "knotifyconfig";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ kcompletion kconfig phonon ];
+  propagatedBuildInputs = [ ki18n kio ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch
new file mode 100644
index 000000000000..e9d744448148
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch
@@ -0,0 +1,13 @@
+Index: kpackage-5.18.0/src/kpackage/package.cpp
+===================================================================
+--- kpackage-5.18.0.orig/src/kpackage/package.cpp
++++ kpackage-5.18.0/src/kpackage/package.cpp
+@@ -808,7 +808,7 @@ PackagePrivate::PackagePrivate()
+     : QSharedData(),
+       fallbackPackage(0),
+       metadata(0),
+-      externalPaths(false),
++      externalPaths(true),
+       valid(false),
+       checkedValid(false)
+ {
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix
new file mode 100644
index 000000000000..aea1b0d31a0d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix
@@ -0,0 +1,23 @@
+{ kdeFramework, lib, copyPathsToStore
+, extra-cmake-modules
+, karchive
+, kconfig
+, kcoreaddons
+, kdoctools
+, ki18n
+, makeQtWrapper
+}:
+
+kdeFramework {
+  name = "kpackage";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  buildInputs = [ karchive kconfig ];
+  propagatedBuildInputs = [ kcoreaddons ki18n ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  postInstall = ''
+    wrapQtProgram "$out/bin/kpackagetool5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
new file mode 100644
index 000000000000..ddbf17d00064
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
@@ -0,0 +1,26 @@
+Index: kpackage-5.18.0/src/kpackage/packageloader.cpp
+===================================================================
+--- kpackage-5.18.0.orig/src/kpackage/packageloader.cpp
++++ kpackage-5.18.0/src/kpackage/packageloader.cpp
+@@ -241,7 +241,7 @@ QList<KPluginMetaData> PackageLoader::li
+         } else {
+             //qDebug() << "Not cached";
+             // If there's no cache file, fall back to listing the directory
+-            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories;
++            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks;
+             const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")) << QStringLiteral("metadata.json");
+ 
+             QDirIterator it(plugindir, nameFilters, QDir::Files, flags);
+Index: kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp
+===================================================================
+--- kpackage-5.18.0.orig/src/kpackage/private/packagejobthread.cpp
++++ kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp
+@@ -146,7 +146,7 @@ bool indexDirectory(const QString& dir,
+ 
+     QJsonArray plugins;
+ 
+-    QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories);
++    QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+     while (it.hasNext()) {
+         it.next();
+         const QString path = it.fileInfo().absoluteFilePath();
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series
new file mode 100644
index 000000000000..9b7f076efc70
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series
@@ -0,0 +1,2 @@
+allow-external-paths.patch
+qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix
new file mode 100644
index 000000000000..1c3e0b2cbc51
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
+, ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice
+, ktextwidgets, kwidgetsaddons, kxmlgui
+}:
+
+kdeFramework {
+  name = "kparts";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kconfig kcoreaddons kiconthemes kjobwidgets knotifications
+    kservice kwidgetsaddons
+  ];
+  propagatedBuildInputs = [ ki18n kio ktextwidgets kxmlgui ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix
new file mode 100644
index 000000000000..4c3877e7efd2
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix
@@ -0,0 +1,15 @@
+{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n
+, kitemviews, kservice, kwidgetsaddons, qtdeclarative
+}:
+
+kdeFramework {
+  name = "kpeople";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kcoreaddons kitemviews kservice kwidgetsaddons
+  ];
+  propagatedBuildInputs = [ ki18n qtdeclarative ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix b/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix
new file mode 100644
index 000000000000..c16f51b5ac3c
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "kplotting";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix
new file mode 100644
index 000000000000..2e34e6f674ce
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix
@@ -0,0 +1,10 @@
+{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }:
+
+kdeFramework {
+  name = "kpty";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [ kcoreaddons ki18n ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kross.nix b/pkgs/development/libraries/kde-frameworks-5.19/kross.nix
new file mode 100644
index 000000000000..7c6f079feaa7
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kross.nix
@@ -0,0 +1,14 @@
+{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons
+, kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons
+, kxmlgui, qtscript
+}:
+
+kdeFramework {
+  name = "kross";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ kcompletion kcoreaddons kxmlgui ];
+  propagatedBuildInputs = [ ki18n kiconthemes kio kparts kwidgetsaddons qtscript ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix
new file mode 100644
index 000000000000..12d2b54d0eb3
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
+, ki18n, kio, kservice, plasma-framework, qtquick1, solid
+, threadweaver
+}:
+
+kdeFramework {
+  name = "krunner";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kconfig kcoreaddons kservice qtquick1 solid threadweaver
+  ];
+  propagatedBuildInputs = [ ki18n kio plasma-framework ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
new file mode 100644
index 000000000000..3d8397d8ee2d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
@@ -0,0 +1,25 @@
+From ae8919eb81abad369e4a26ffcd845b140983398d Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 14 Oct 2015 06:28:57 -0500
+Subject: [PATCH 1/2] qdiriterator follow symlinks
+
+---
+ src/sycoca/kbuildsycoca.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp
+index 1deae14..250baa8 100644
+--- a/src/sycoca/kbuildsycoca.cpp
++++ b/src/sycoca/kbuildsycoca.cpp
+@@ -208,7 +208,7 @@ bool KBuildSycoca::build()
+         QStringList relFiles;
+         const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory);
+         Q_FOREACH (const QString &dir, dirs) {
+-            QDirIterator it(dir, QDirIterator::Subdirectories);
++            QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
+             while (it.hasNext()) {
+                 const QString filePath = it.next();
+                 Q_ASSERT(filePath.startsWith(dir)); // due to the line below...
+-- 
+2.5.2
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch
new file mode 100644
index 000000000000..685c68526119
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch
@@ -0,0 +1,25 @@
+From 46d124da602d84b7611a7ff0ac0862168d451cdb Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Wed, 14 Oct 2015 06:31:29 -0500
+Subject: [PATCH 2/2] no canonicalize path
+
+---
+ src/sycoca/vfolder_menu.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sycoca/vfolder_menu.cpp b/src/sycoca/vfolder_menu.cpp
+index d3e31c3..d15d743 100644
+--- a/src/sycoca/vfolder_menu.cpp
++++ b/src/sycoca/vfolder_menu.cpp
+@@ -415,7 +415,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
+     }
+ 
+     if (!relative) {
+-        QString resolved = QDir(dir).canonicalPath();
++      QString resolved = QDir::cleanPath(dir);
+         if (!resolved.isEmpty()) {
+             dir = resolved;
+         }
+-- 
+2.5.2
+
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix
new file mode 100644
index 000000000000..03b7c7c2f51d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix
@@ -0,0 +1,19 @@
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
+, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem
+}:
+
+kdeFramework {
+  name = "kservice";
+  setupHook = ./setup-hook.sh;
+  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
+  buildInputs = [ kcrash kdbusaddons ];
+  propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ];
+  propagatedUserEnvPkgs = [ kcoreaddons ];
+  patches = [
+    ./0001-qdiriterator-follow-symlinks.patch
+    ./0002-no-canonicalize-path.patch
+  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.19/kservice/setup-hook.sh
new file mode 100644
index 000000000000..c28e862ff8ae
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kservice/setup-hook.sh
@@ -0,0 +1,43 @@
+addServicePkg() {
+    local propagated
+    for dir in "share/kservices5" "share/kservicetypes5"; do
+        if [[ -d "$1/$dir" ]]; then
+            propagated=
+            for pkg in $propagatedBuildInputs; do
+                if [[ "z$pkg" == "z$1" ]]; then
+                    propagated=1
+                    break
+                fi
+            done
+            if [[ -z $propagated ]]; then
+                propagatedBuildInputs="$propagatedBuildInputs $1"
+            fi
+
+            propagated=
+            for pkg in $propagatedUserEnvPkgs; do
+                if [[ "z$pkg" == "z$1" ]]; then
+                    propagated=1
+                    break
+                fi
+            done
+            if [[ -z $propagated ]]; then
+                propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1"
+            fi
+
+            break
+        fi
+    done
+}
+
+envHooks+=(addServicePkg)
+
+local propagated
+for pkg in $propagatedBuildInputs; do
+    if [[ "z$pkg" == "z@out@" ]]; then
+        propagated=1
+        break
+    fi
+done
+if [[ -z $propagated ]]; then
+    propagatedBuildInputs="$propagatedBuildInputs @out@"
+fi
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix
new file mode 100644
index 000000000000..b8df6a5f4c0d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix
@@ -0,0 +1,22 @@
+{ kdeFramework, lib, copyPathsToStore
+, extra-cmake-modules, makeQtWrapper, perl
+, karchive, kconfig, kguiaddons, kiconthemes, kparts
+, libgit2
+, qtscript, qtxmlpatterns
+, ki18n, kio, sonnet
+}:
+
+kdeFramework {
+  name = "ktexteditor";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper perl ];
+  buildInputs = [
+    karchive kconfig kguiaddons kiconthemes kparts
+    libgit2
+    qtscript qtxmlpatterns
+  ];
+  propagatedBuildInputs = [ ki18n kio sonnet ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch
new file mode 100644
index 000000000000..19ab1e1e5513
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch
@@ -0,0 +1,36 @@
+Index: ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp
+===================================================================
+--- ktexteditor-5.18.0.orig/src/syntax/data/katehighlightingindexer.cpp
++++ ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp
+@@ -55,19 +55,16 @@ QStringList readListing(const QString &f
+ 
+ int main(int argc, char *argv[])
+ {
+-    // get app instance
+-    QCoreApplication app(argc, argv);
+-
+     // ensure enough arguments are passed
+-    if (app.arguments().size() < 3)
++    if (argc < 3)
+         return 1;
+ 
+     // open schema
+     QXmlSchema schema;
+-    if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2))))
++    if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2]))))
+         return 2;
+ 
+-    const QString hlFilenamesListing = app.arguments().value(3);
++    const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]);
+     if (hlFilenamesListing.isEmpty()) {
+         return 1;
+     }
+@@ -152,7 +149,7 @@ int main(int argc, char *argv[])
+         return anyError;
+ 
+     // create outfile, after all has worked!
+-    QFile outFile(app.arguments().at(1));
++    QFile outFile(QString::fromLocal8Bit(argv[1]));
+     if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
+         return 7;
+ 
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series
new file mode 100644
index 000000000000..46cd23829a2f
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series
@@ -0,0 +1 @@
+no-qcoreapplication.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix
new file mode 100644
index 000000000000..e332d4ff9a83
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix
@@ -0,0 +1,16 @@
+{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
+, kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem
+, sonnet
+}:
+
+kdeFramework {
+  name = "ktextwidgets";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    kcompletion kconfig kconfigwidgets kiconthemes kservice
+  ];
+  propagatedBuildInputs = [ ki18n kwindowsystem sonnet ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix
new file mode 100644
index 000000000000..3cf0f847d83d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix
@@ -0,0 +1,10 @@
+{ kdeFramework, lib, extra-cmake-modules, ki18n }:
+
+kdeFramework {
+  name = "kunitconversion";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [ ki18n ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix
new file mode 100644
index 000000000000..46e3cb37d112
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix
@@ -0,0 +1,21 @@
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets
+, kcoreaddons, kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications
+, kservice, kwidgetsaddons, kwindowsystem, libgcrypt, makeQtWrapper
+}:
+
+kdeFramework {
+  name = "kwallet";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  buildInputs = [
+    kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
+    knotifications kservice kwidgetsaddons libgcrypt
+  ];
+  propagatedBuildInputs = [ ki18n kwindowsystem ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/kwalletd5"
+    wrapQtProgram "$out/bin/kwallet-query"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix
new file mode 100644
index 000000000000..d95f44d3fecf
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "kwidgetsaddons";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix
new file mode 100644
index 000000000000..09ab1f2200de
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, qtx11extras
+}:
+
+kdeFramework {
+  name = "kwindowsystem";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ qtx11extras ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix
new file mode 100644
index 000000000000..f081d5f9170e
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix
@@ -0,0 +1,18 @@
+{ kdeFramework, lib, extra-cmake-modules, attica, kconfig
+, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews
+, ktextwidgets, kwindowsystem, sonnet
+}:
+
+kdeFramework {
+  name = "kxmlgui";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [
+    attica kconfig kiconthemes kitemviews ktextwidgets
+  ];
+  propagatedBuildInputs = [
+    kconfigwidgets kglobalaccel ki18n kwindowsystem sonnet
+  ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix
new file mode 100644
index 000000000000..20a300b68bc8
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix
@@ -0,0 +1,10 @@
+{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }:
+
+kdeFramework {
+  name = "kxmlrpcclient";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [ ki18n kio ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix
new file mode 100644
index 000000000000..7d7f769d6a9b
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, modemmanager
+}:
+
+kdeFramework {
+  name = "modemmanager-qt";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [ modemmanager ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix
new file mode 100644
index 000000000000..333378bd1431
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, networkmanager
+}:
+
+kdeFramework {
+  name = "networkmanager-qt";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  propagatedBuildInputs = [ networkmanager ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix
new file mode 100644
index 000000000000..ee350f8e1536
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix
@@ -0,0 +1,13 @@
+{ kdeFramework
+, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "oxygen-icons5";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    license = lib.licenses.lgpl3Plus;
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix
new file mode 100644
index 000000000000..d8846f777231
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix
@@ -0,0 +1,25 @@
+{ kdeFramework, lib, extra-cmake-modules, kactivities, karchive
+, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
+, kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio
+, knotifications, kpackage, kservice, kwindowsystem, kxmlgui
+, makeQtWrapper, qtscript, qtx11extras
+}:
+
+kdeFramework {
+  name = "plasma-framework";
+  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
+  buildInputs = [
+    karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons
+    kiconthemes knotifications kxmlgui qtscript
+  ];
+  propagatedBuildInputs = [
+    kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice kwindowsystem
+    qtx11extras
+  ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/plasmapkg2"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/solid.nix b/pkgs/development/libraries/kde-frameworks-5.19/solid.nix
new file mode 100644
index 000000000000..afd125e3c597
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/solid.nix
@@ -0,0 +1,17 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, makeQtWrapper
+, qtdeclarative
+}:
+
+kdeFramework {
+  name = "solid";
+  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
+  buildInputs = [ qtdeclarative ];
+  postInstall = ''
+    wrapQtProgram "$out/bin/solid-hardware5"
+  '';
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix
new file mode 100644
index 000000000000..943fe04a1c92
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix
@@ -0,0 +1,13 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+, hunspell
+}:
+
+kdeFramework {
+  name = "sonnet";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  buildInputs = [ hunspell ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix
new file mode 100644
index 000000000000..b86c0b71224d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix
@@ -0,0 +1,565 @@
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
+{ fetchurl, mirror }:
+
+{
+  attica = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/attica-5.19.0.tar.xz";
+      sha256 = "0cbvjnv2fcqsxspiy5pzmnnzrpfamlsc9j927kd6gpzai1ckf1lv";
+      name = "attica-5.19.0.tar.xz";
+    };
+  };
+  baloo = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/baloo-5.19.0.tar.xz";
+      sha256 = "02yy0w13h5wxm74a87zi439f6yd9miid6rb54nia0pgvcka98svg";
+      name = "baloo-5.19.0.tar.xz";
+    };
+  };
+  bluez-qt = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/bluez-qt-5.19.0.tar.xz";
+      sha256 = "0609i7rzhnnnp4fqnwscwp6y646ji8kl2hw5sy7azc87yllisnyv";
+      name = "bluez-qt-5.19.0.tar.xz";
+    };
+  };
+  breeze-icons = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/breeze-icons-5.19.0.tar.xz";
+      sha256 = "0bwix0jl1dscqfb7ygn9drpd9ivfx4g15vz6h01mswvxa9lz1vj0";
+      name = "breeze-icons-5.19.0.tar.xz";
+    };
+  };
+  extra-cmake-modules = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/extra-cmake-modules-5.19.0.tar.xz";
+      sha256 = "1dl3hhbara7iswb5wsc5dp17ar3ljw5f0nrncl8vry9smaz2zl63";
+      name = "extra-cmake-modules-5.19.0.tar.xz";
+    };
+  };
+  frameworkintegration = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/frameworkintegration-5.19.0.tar.xz";
+      sha256 = "00la7p7wcyqpxyi73h4fjrmm9d2gqzdaljn4468xya4bfns5ijy3";
+      name = "frameworkintegration-5.19.0.tar.xz";
+    };
+  };
+  kactivities = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kactivities-5.19.0.tar.xz";
+      sha256 = "0yml1sbn3z4jd4vsfs25kqrl03pmlcgamzbgpw3248sabhyg7ks3";
+      name = "kactivities-5.19.0.tar.xz";
+    };
+  };
+  kapidox = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kapidox-5.19.0.tar.xz";
+      sha256 = "0a9731xrkd6mnqh72592rx6gfnxxdfd7xl8pdpgdn7qs3394k1yz";
+      name = "kapidox-5.19.0.tar.xz";
+    };
+  };
+  karchive = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/karchive-5.19.0.tar.xz";
+      sha256 = "043spmi7s2d1bj8d3wbgzbhisip6h92kqjhlvg8gyv0a7vy54ymv";
+      name = "karchive-5.19.0.tar.xz";
+    };
+  };
+  kauth = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kauth-5.19.0.tar.xz";
+      sha256 = "0fm9ih2hkh2rpmlf98yw8z1r5bn2qmpva2k7mrv6ijd5h767fxss";
+      name = "kauth-5.19.0.tar.xz";
+    };
+  };
+  kbookmarks = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kbookmarks-5.19.0.tar.xz";
+      sha256 = "0q418jpdc348nqgdavsmxxka4g8sldpdi9n89i1pllfmq10kw9sd";
+      name = "kbookmarks-5.19.0.tar.xz";
+    };
+  };
+  kcmutils = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kcmutils-5.19.0.tar.xz";
+      sha256 = "0qhdjb3zvqq9ycfgb52lz4flgipyplj5ksz8h8y71bbs4w6lazd8";
+      name = "kcmutils-5.19.0.tar.xz";
+    };
+  };
+  kcodecs = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kcodecs-5.19.0.tar.xz";
+      sha256 = "1rzp314fv9n5168j7nhv1c8fjaszpmgdx6javrx4w0hyrjdfkg66";
+      name = "kcodecs-5.19.0.tar.xz";
+    };
+  };
+  kcompletion = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kcompletion-5.19.0.tar.xz";
+      sha256 = "05n0y5kf3bcc4wgn6k0js5cravv1k93xxzrgapm21323qgvfagwd";
+      name = "kcompletion-5.19.0.tar.xz";
+    };
+  };
+  kconfig = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kconfig-5.19.0.tar.xz";
+      sha256 = "0nk5hfl8yh0kgaa7xi0cc05dl6nf7prvbvxv0i99207xh9dafdmm";
+      name = "kconfig-5.19.0.tar.xz";
+    };
+  };
+  kconfigwidgets = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kconfigwidgets-5.19.0.tar.xz";
+      sha256 = "1nld27chcjwjgwv76s2j77ifmca235yp10bm08rjmvnfn6778ypv";
+      name = "kconfigwidgets-5.19.0.tar.xz";
+    };
+  };
+  kcoreaddons = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kcoreaddons-5.19.0.tar.xz";
+      sha256 = "07sm0givfdx28p302fkynzsd3xkpn1hbs43d4rscyx18yxfsldcw";
+      name = "kcoreaddons-5.19.0.tar.xz";
+    };
+  };
+  kcrash = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kcrash-5.19.0.tar.xz";
+      sha256 = "1dy03gp1sj96wn0zfa0dpbvz8pz0ia1j7p1wcif3iqk55pjxdgyl";
+      name = "kcrash-5.19.0.tar.xz";
+    };
+  };
+  kdbusaddons = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kdbusaddons-5.19.0.tar.xz";
+      sha256 = "1bb5aik0kl3kab5399drfjxrm8iysgkf813xgr0y4k64c9kwfp28";
+      name = "kdbusaddons-5.19.0.tar.xz";
+    };
+  };
+  kdeclarative = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kdeclarative-5.19.0.tar.xz";
+      sha256 = "03g02zy7wjzmpvqzxx32z8ap7jyj9sf432g1d3csb0dcbx2ny52g";
+      name = "kdeclarative-5.19.0.tar.xz";
+    };
+  };
+  kded = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kded-5.19.0.tar.xz";
+      sha256 = "0nyvg0h2aqy7qr57bad6wyc2rmcv9nhdq0py4fxc3irb6516p9hz";
+      name = "kded-5.19.0.tar.xz";
+    };
+  };
+  kdelibs4support = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/portingAids/kdelibs4support-5.19.0.tar.xz";
+      sha256 = "0iqnb2j6gfy8006arwv65vljfhxdnk6aia0zppngb481jnd9n2pn";
+      name = "kdelibs4support-5.19.0.tar.xz";
+    };
+  };
+  kdesignerplugin = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kdesignerplugin-5.19.0.tar.xz";
+      sha256 = "11inmvyair796rx4842naf1dnxqvc6bqqzrv700ycvisad646ws5";
+      name = "kdesignerplugin-5.19.0.tar.xz";
+    };
+  };
+  kdesu = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kdesu-5.19.0.tar.xz";
+      sha256 = "19w8m7ji61bpd368lzkwlizcwa1l968l568lksgm2mm9pnyjjhgz";
+      name = "kdesu-5.19.0.tar.xz";
+    };
+  };
+  kdewebkit = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kdewebkit-5.19.0.tar.xz";
+      sha256 = "04b5qanhxggffnvmi28lspyi8kj4kq7mxhxndar9fmkzzgvy70hj";
+      name = "kdewebkit-5.19.0.tar.xz";
+    };
+  };
+  kdnssd = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kdnssd-5.19.0.tar.xz";
+      sha256 = "15a8w2i29mrbhadw6y123mr0cc45ijabnwdfp3lbkd40lk8nq314";
+      name = "kdnssd-5.19.0.tar.xz";
+    };
+  };
+  kdoctools = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kdoctools-5.19.0.tar.xz";
+      sha256 = "06g77n9wxpiv4skc1kz794ppfb2mkmd3fgn6an5kr301xc76cnpn";
+      name = "kdoctools-5.19.0.tar.xz";
+    };
+  };
+  kemoticons = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kemoticons-5.19.0.tar.xz";
+      sha256 = "0fiix2sf2wrvmrpx8whdr1bzm7gbv7pvg02y47w5bl6s9gh176g5";
+      name = "kemoticons-5.19.0.tar.xz";
+    };
+  };
+  kfilemetadata = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kfilemetadata-5.19.0.tar.xz";
+      sha256 = "11j8if3xhp3xxwibwm6nxb4lh8wx40ni3zf5hki327pxv4vpq3qr";
+      name = "kfilemetadata-5.19.0.tar.xz";
+    };
+  };
+  kglobalaccel = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kglobalaccel-5.19.0.tar.xz";
+      sha256 = "021j98f7217m83aqxpamg0lzlaiskdaqsd9iabc8wrp1g0nkm05d";
+      name = "kglobalaccel-5.19.0.tar.xz";
+    };
+  };
+  kguiaddons = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kguiaddons-5.19.0.tar.xz";
+      sha256 = "019xaf7vpgifcw8wibli9d2b50brhgdaypsqknh6mqq8q9g06jhy";
+      name = "kguiaddons-5.19.0.tar.xz";
+    };
+  };
+  khtml = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/portingAids/khtml-5.19.0.tar.xz";
+      sha256 = "0hqa54a9nxy954vy8gf52y89xd3ibz9b4jgh6w347b1alp1zn145";
+      name = "khtml-5.19.0.tar.xz";
+    };
+  };
+  ki18n = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/ki18n-5.19.0.tar.xz";
+      sha256 = "0v3arc20y5d8afm9zfrz1skd2xg3ng62cq1xvxiq645w6mxf7y05";
+      name = "ki18n-5.19.0.tar.xz";
+    };
+  };
+  kiconthemes = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kiconthemes-5.19.0.tar.xz";
+      sha256 = "0riicirgda3w2b30dzsa2lq9xrr4y04qwhxyzq1p8gn2x4pp3g3n";
+      name = "kiconthemes-5.19.0.tar.xz";
+    };
+  };
+  kidletime = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kidletime-5.19.0.tar.xz";
+      sha256 = "0jlbzqv36ddhfhk8xkkgw0xhq8s371z9ama1cyv2xq8kk4vjywc6";
+      name = "kidletime-5.19.0.tar.xz";
+    };
+  };
+  kimageformats = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kimageformats-5.19.0.tar.xz";
+      sha256 = "1ydizc6b0ncndazk62h8y249yfcx381pwzyivfpka1f69zfgyvv5";
+      name = "kimageformats-5.19.0.tar.xz";
+    };
+  };
+  kinit = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kinit-5.19.0.tar.xz";
+      sha256 = "03l7pijqdnnsfg6yz9p73p7xa86sldayggl6rc5hpkzmgyczcfzm";
+      name = "kinit-5.19.0.tar.xz";
+    };
+  };
+  kio = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kio-5.19.0.tar.xz";
+      sha256 = "0c7smp7cajivx53shy65mp9zcc51pha9iyvh37dggfflxy3xf9nv";
+      name = "kio-5.19.0.tar.xz";
+    };
+  };
+  kitemmodels = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kitemmodels-5.19.0.tar.xz";
+      sha256 = "0skmim986qnncbzd84vm1wp1fr41jn04af2dgckirsk23d35bln7";
+      name = "kitemmodels-5.19.0.tar.xz";
+    };
+  };
+  kitemviews = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kitemviews-5.19.0.tar.xz";
+      sha256 = "118zv46mvrfwbvl06bb1m8axv92wnp4pfs36hsxvnjl7gfjk5xjn";
+      name = "kitemviews-5.19.0.tar.xz";
+    };
+  };
+  kjobwidgets = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kjobwidgets-5.19.0.tar.xz";
+      sha256 = "1qzf8nzy8rxkdai9aj2lyrww90245v0p2q115xiz73bsg9rahmji";
+      name = "kjobwidgets-5.19.0.tar.xz";
+    };
+  };
+  kjs = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/portingAids/kjs-5.19.0.tar.xz";
+      sha256 = "08m01762hb25vm020g3v37bh40cgvcfrj45ql135klx96x9imfaf";
+      name = "kjs-5.19.0.tar.xz";
+    };
+  };
+  kjsembed = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/portingAids/kjsembed-5.19.0.tar.xz";
+      sha256 = "1wmkgy8jgm21y2cvcbv1fdv29dxxla8n6ws78kzzbbw4cgqwwl48";
+      name = "kjsembed-5.19.0.tar.xz";
+    };
+  };
+  kmediaplayer = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/portingAids/kmediaplayer-5.19.0.tar.xz";
+      sha256 = "1vhqr2c7q8vwzdj29vpmfjfhyal8wp9ffirrnqc98vb6sffs85ay";
+      name = "kmediaplayer-5.19.0.tar.xz";
+    };
+  };
+  knewstuff = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/knewstuff-5.19.0.tar.xz";
+      sha256 = "12acd12vxk9z83zg3yz8lvmmb8737z9lzd4hs9a3jcs1z5k2nhb4";
+      name = "knewstuff-5.19.0.tar.xz";
+    };
+  };
+  knotifications = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/knotifications-5.19.0.tar.xz";
+      sha256 = "0grgm0ws16gp2j77nslqpl1jpxbi0m6g59zr7v1xnmzdk2j6n4av";
+      name = "knotifications-5.19.0.tar.xz";
+    };
+  };
+  knotifyconfig = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/knotifyconfig-5.19.0.tar.xz";
+      sha256 = "161brvryxzdkny7sf6icn1jpyi6rnw6jc808gdf5g41v50xpnxfj";
+      name = "knotifyconfig-5.19.0.tar.xz";
+    };
+  };
+  kpackage = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kpackage-5.19.0.tar.xz";
+      sha256 = "1km4sjgxfljp2pnjnzj48q3c574zvj7341a57n4ifhjwj37yzxdv";
+      name = "kpackage-5.19.0.tar.xz";
+    };
+  };
+  kparts = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kparts-5.19.0.tar.xz";
+      sha256 = "05g59x2mrqygawzcwgw3igl5n96l649h0kpzh37sfq4i8kg15g7l";
+      name = "kparts-5.19.0.tar.xz";
+    };
+  };
+  kpeople = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kpeople-5.19.0.tar.xz";
+      sha256 = "1ksf6g71li1xk4q98cvwkam8m8g32x2815kj1gfwbg4g6iw74w98";
+      name = "kpeople-5.19.0.tar.xz";
+    };
+  };
+  kplotting = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kplotting-5.19.0.tar.xz";
+      sha256 = "169x4m9ms8yhfha8zclnl8wrnfhfqshpwwg4b5bd046pcrkqmnqq";
+      name = "kplotting-5.19.0.tar.xz";
+    };
+  };
+  kpty = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kpty-5.19.0.tar.xz";
+      sha256 = "0289vzfjwppwqj9h03flzhwm18dnxz11hqhdhr9990x7rw6a4n03";
+      name = "kpty-5.19.0.tar.xz";
+    };
+  };
+  kross = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/portingAids/kross-5.19.0.tar.xz";
+      sha256 = "1nv7mrhn7wa4bs2a164x42d3b37akyvhkxqs8cg5fqp4vr2wkw0p";
+      name = "kross-5.19.0.tar.xz";
+    };
+  };
+  krunner = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/portingAids/krunner-5.19.0.tar.xz";
+      sha256 = "054s8309lxi27gpbg7iygbcxsp0pwrzbzww3h8zp2a9yiic4s5mx";
+      name = "krunner-5.19.0.tar.xz";
+    };
+  };
+  kservice = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kservice-5.19.0.tar.xz";
+      sha256 = "02lbia26r2462nwksizaxjfkhxfqqs732dp495yx8bjc7wcv3srm";
+      name = "kservice-5.19.0.tar.xz";
+    };
+  };
+  ktexteditor = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/ktexteditor-5.19.0.tar.xz";
+      sha256 = "0v3l44w4k43ajs81i8386hszk3x7rajjlb6z3jb7q98vhp91b5dp";
+      name = "ktexteditor-5.19.0.tar.xz";
+    };
+  };
+  ktextwidgets = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/ktextwidgets-5.19.0.tar.xz";
+      sha256 = "1xydb76r6x1p10bkr2nlqg3md78jw8zvqad0h42dgvl4f5xvjknp";
+      name = "ktextwidgets-5.19.0.tar.xz";
+    };
+  };
+  kunitconversion = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kunitconversion-5.19.0.tar.xz";
+      sha256 = "11g1vhqkrb1k748drj7klkbb7jca3dybakcmcgqf53g8vxfih8kb";
+      name = "kunitconversion-5.19.0.tar.xz";
+    };
+  };
+  kwallet = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kwallet-5.19.0.tar.xz";
+      sha256 = "0z0c62fdfx9syrq6z7bk0ihac4yqyxpycll7h3mijj29km4jnpjm";
+      name = "kwallet-5.19.0.tar.xz";
+    };
+  };
+  kwidgetsaddons = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kwidgetsaddons-5.19.0.tar.xz";
+      sha256 = "0b85ng0dj5gpzifqmhyzgx61nb37vq7d0gvfpfazlcp5n27ywivm";
+      name = "kwidgetsaddons-5.19.0.tar.xz";
+    };
+  };
+  kwindowsystem = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kwindowsystem-5.19.0.tar.xz";
+      sha256 = "115xs34r74j9zcsw69glnh8w59iyh764n3gniawwrk23c6yb8fch";
+      name = "kwindowsystem-5.19.0.tar.xz";
+    };
+  };
+  kxmlgui = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kxmlgui-5.19.0.tar.xz";
+      sha256 = "1al2xifiyvl3zpva9nqap8gb6vqfgmf2fnhkmymm02rwg4yn4gah";
+      name = "kxmlgui-5.19.0.tar.xz";
+    };
+  };
+  kxmlrpcclient = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kxmlrpcclient-5.19.0.tar.xz";
+      sha256 = "0lji7cxvh2lmjz42lx6ymz962gr4cyqfzksz0n5vgzfk5z0vq98g";
+      name = "kxmlrpcclient-5.19.0.tar.xz";
+    };
+  };
+  modemmanager-qt = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/modemmanager-qt-5.19.0.tar.xz";
+      sha256 = "05x9jicryjw9fj02arpya8xsh79rsnljnqjfpwbb7pi38f9i8v4w";
+      name = "modemmanager-qt-5.19.0.tar.xz";
+    };
+  };
+  networkmanager-qt = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/networkmanager-qt-5.19.0.tar.xz";
+      sha256 = "0wi0mkygzbvvyil1nyzc3ihgilvpx6j7caqaa9k38p85g93vsq13";
+      name = "networkmanager-qt-5.19.0.tar.xz";
+    };
+  };
+  oxygen-icons5 = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/oxygen-icons5-5.19.0.tar.xz";
+      sha256 = "09vfwcyidj3bl0qr4sq78bkc69zp9x8dwp8bsay5y05q8591dkg0";
+      name = "oxygen-icons5-5.19.0.tar.xz";
+    };
+  };
+  plasma-framework = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/plasma-framework-5.19.0.tar.xz";
+      sha256 = "1588r1jag0s9hhw4qq7mr2mcdd3d9az5ngb3z1l58xdhvfcc4497";
+      name = "plasma-framework-5.19.0.tar.xz";
+    };
+  };
+  solid = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/solid-5.19.0.tar.xz";
+      sha256 = "02bnvhscb55r6q5hkyh7rqi6zsc3r974y3x9shi8l0xbs78snkgz";
+      name = "solid-5.19.0.tar.xz";
+    };
+  };
+  sonnet = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/sonnet-5.19.0.tar.xz";
+      sha256 = "02ringh0wyiq1n19c200bcyf5x2w5jhw0pcxvfjzjai1sjig03x7";
+      name = "sonnet-5.19.0.tar.xz";
+    };
+  };
+  threadweaver = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/threadweaver-5.19.0.tar.xz";
+      sha256 = "1jm1sw7xq76s2ggghm6qqdn7452myy9n7p5zzdb01qbaw2y1x4pw";
+      name = "threadweaver-5.19.0.tar.xz";
+    };
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix
new file mode 100644
index 000000000000..52817921cc72
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix
@@ -0,0 +1,11 @@
+{ kdeFramework, lib
+, extra-cmake-modules
+}:
+
+kdeFramework {
+  name = "threadweaver";
+  nativeBuildInputs = [ extra-cmake-modules ];
+  meta = {
+    maintainers = [ lib.maintainers.ttuegel ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d91d975689ff..f6b0f06aa28f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14996,7 +14996,16 @@ let
     in
       recurseIntoAttrs (lib.makeScope qt55.newScope merged);
 
-  kde5_latest = kde5;
+  kde5_latest =
+    let
+      frameworks = import ../development/libraries/kde-frameworks-5.19 { inherit pkgs; };
+      plasma = import ../desktops/plasma-5.5 { inherit pkgs; };
+      apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
+      named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; };
+      merged = self:
+        named self // frameworks self // plasma self // apps self // kde5PackagesFun self;
+    in
+      recurseIntoAttrs (lib.makeScope qt55.newScope merged);
 
   theme-vertex = callPackage ../misc/themes/vertex { };
 

From 9acbb9021b1477a0a7f25d54d79811dc33b16e15 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 14 Feb 2016 16:58:51 +0000
Subject: [PATCH 1327/2285] bundix: cleaner substitution

Use the builtin substituteInPlace instead of sed
---
 .../interpreters/ruby/bundix/default.nix      | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/bundix/default.nix b/pkgs/development/interpreters/ruby/bundix/default.nix
index 245090e66e1a..1ce2528291eb 100644
--- a/pkgs/development/interpreters/ruby/bundix/default.nix
+++ b/pkgs/development/interpreters/ruby/bundix/default.nix
@@ -1,4 +1,4 @@
-{ buildRubyGem, lib, bundler, ruby, nix, nix-prefetch-scripts }:
+{ buildRubyGem, lib, bundler, ruby, nix, nix-prefetch-git }:
 
 buildRubyGem rec {
   inherit ruby;
@@ -12,19 +12,19 @@ buildRubyGem rec {
   buildInputs = [bundler];
 
   postInstall = ''
-    gem_root=$GEM_HOME/gems/${gemName}-${version}
-    sed \
-      -e 's|NIX_INSTANTIATE =.*|NIX_INSTANTIATE = "${nix}/bin/nix-instantiate"|' \
-      -i $gem_root/lib/bundix.rb
-    sed \
-      -e 's|NIX_HASH =.*|NIX_HASH = "${nix}/bin/nix-hash"|' \
-      -i $gem_root/lib/bundix.rb
-    sed \
-      -e 's|NIX_PREFETCH_URL =.*|NIX_PREFETCH_URL = "${nix}/bin/nix-prefetch-url"|' \
-      -i $gem_root/lib/bundix.rb
-    sed \
-      -e 's|NIX_PREFETCH_GIT =.*|NIX_PREFETCH_GIT = "${nix-prefetch-scripts}/bin/nix-prefetch-git"|' \
-      -i $gem_root/lib/bundix.rb
+    substituteInPlace $GEM_HOME/gems/${gemName}-${version}/lib/bundix.rb \
+      --replace \
+        "'nix-instantiate'" \
+        "'${nix}/bin/nix-instantiate'" \
+      --replace \
+        "'nix-hash'" \
+        "'${nix}/bin/nix-hash'" \
+      --replace \
+        "'nix-prefetch-url'" \
+        "'${nix}/bin/nix-prefetch-url'" \
+      --replace \
+        "'nix-prefetch-git'" \
+        "'${nix-prefetch-git}/bin/nix-prefetch-git'"
   '';
 
   meta = {

From 6738c22a462823c56bf97909c41ab06c4ff1ec47 Mon Sep 17 00:00:00 2001
From: = <anothersms@gmail.com>
Date: Wed, 6 Jan 2016 19:36:00 +0000
Subject: [PATCH 1328/2285] Added aeolus virtual organ

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

diff --git a/pkgs/applications/audio/aeolus/default.nix b/pkgs/applications/audio/aeolus/default.nix
new file mode 100644
index 000000000000..9fe781f17697
--- /dev/null
+++ b/pkgs/applications/audio/aeolus/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, libclthreads, zita-alsa-pcmi, alsaLib, libjack2
+, libclxclient, libX11, libXft, readline}:
+
+stdenv.mkDerivation rec {
+  name = "aeolus-${version}";
+  version = "0.9.0";
+  src = fetchurl {
+    url = "http://kokkinizita.linuxaudio.org/linuxaudio/downloads/${name}.tar.bz2";
+    sha256 = "0dkkibza25a6z9446njqlaynx8gfk5wb828pl9v1snmi5390iggp";
+  };
+
+  buildInputs = [ libclthreads zita-alsa-pcmi alsaLib libjack2 libclxclient
+    libX11 libXft readline ];
+
+  patchPhase = ''sed "s@ldconfig.*@@" -i source/Makefile'';
+
+  preBuild = "cd source";
+
+  makeFlags = "DESTDIR= PREFIX=$(out)";
+
+  meta = {
+    description = "Synthetized (not sampled) pipe organ emulator";
+    homepage = http://kokkinizita.linuxaudio.org/linuxaudio/aeolus/index.html;
+    license = stdenv.lib.licenses.lgpl3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.nico202 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index acbb0f68e432..acd942650ad9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11013,6 +11013,8 @@ let
 
   adobe-reader = callPackage_i686 ../applications/misc/adobe-reader { };
 
+  aeolus = callPackage ../applications/audio/aeolus { };
+
   aewan = callPackage ../applications/editors/aewan { };
 
   afterstep = callPackage ../applications/window-managers/afterstep {

From a1ac6733e3dacbcbdb13877f36e897a592926f6b Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Sun, 14 Feb 2016 18:22:49 +0000
Subject: [PATCH 1329/2285] clutter: add gtk3 as a build input

This fixes #12106.
---
 pkgs/development/libraries/clutter/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix
index 37b2c73fe44e..f101e3c18801 100644
--- a/pkgs/development/libraries/clutter/default.nix
+++ b/pkgs/development/libraries/clutter/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
 , libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib, 
-gobjectIntrospection 
+gobjectIntrospection, gtk3
 }:
 
 let
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ pkgconfig ];
   propagatedBuildInputs =
     [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango
-      atk json_glib gobjectIntrospection
+      atk json_glib gobjectIntrospection gtk3
     ];
 
   configureFlags = [ "--enable-introspection" ]; # needed by muffin AFAIK

From ad50cbe8bb41e9f9ac93813db33bf756871f02f4 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Sun, 14 Feb 2016 10:24:46 -0800
Subject: [PATCH 1330/2285] minecraft: add desktop entry; add ryantm as
 maintainer

---
 lib/maintainers.nix              |  1 +
 pkgs/games/minecraft/default.nix | 26 +++++++++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index f73312db99e7..c0b1573f82db 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -271,6 +271,7 @@
   rushmorem = "Rushmore Mushambi <rushmore@webenchanter.com>";
   rvl = "Rodney Lorrimar <dev+nix@rodney.id.au>";
   rvlander = "Gaëtan André <rvlander@gaetanandre.eu>";
+  ryantm = "Ryan Mulligan <ryan@ryantm.com>";
   rycee = "Robert Helgesson <robert@rycee.net>";
   samuelrivas = "Samuel Rivas <samuelrivas@gmail.com>";
   sander = "Sander van der Burg <s.vanderburg@tudelft.nl>";
diff --git a/pkgs/games/minecraft/default.nix b/pkgs/games/minecraft/default.nix
index 218a84d591d3..6f3093585b44 100644
--- a/pkgs/games/minecraft/default.nix
+++ b/pkgs/games/minecraft/default.nix
@@ -1,10 +1,27 @@
-{ stdenv, fetchurl, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
+{ stdenv, fetchurl, makeDesktopItem
+, jre, libX11, libXext, libXcursor, libXrandr, libXxf86vm
 , mesa, openal
 , useAlsa ? false, alsaOss ? null }:
 
 assert useAlsa -> alsaOss != null;
 
-stdenv.mkDerivation {
+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}";
+    comment = "A sandbox-building game";
+    desktopName = "Minecraft";
+    genericName = "minecraft";
+    categories = "Game;";
+  };
+
+in stdenv.mkDerivation {
   name = "minecraft-2015.07.24";
 
   src = fetchurl {
@@ -29,12 +46,15 @@ stdenv.mkDerivation {
     EOF
 
     chmod +x $out/bin/minecraft
+
+    mkdir -p $out/share/applications
+    ln -s ${desktopItem}/share/applications/* $out/share/applications/
   '';
 
   meta = {
       description = "A sandbox-building game";
       homepage = http://www.minecraft.net;
-      maintainers = [ stdenv.lib.maintainers.page ];
+      maintainers = with stdenv.lib.maintainers; [ page ryantm ];
       license = stdenv.lib.licenses.unfreeRedistributable;
   };
 }

From f13333d43c84184c4fdc70e2935e36c88823f62f Mon Sep 17 00:00:00 2001
From: Gitolite Admin <zohl@fmap.me>
Date: Sun, 14 Feb 2016 21:22:47 +0300
Subject: [PATCH 1331/2285] gammu: add some DB support

---
 pkgs/applications/misc/gammu/default.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/gammu/default.nix b/pkgs/applications/misc/gammu/default.nix
index 36e45bd04856..fc88bb3e354f 100644
--- a/pkgs/applications/misc/gammu/default.nix
+++ b/pkgs/applications/misc/gammu/default.nix
@@ -1,5 +1,8 @@
 { stdenv, fetchurl, python, pkgconfig, cmake, bluez, libusb1, curl
-, libiconv, gettext, sqlite }:
+, libiconv, gettext, sqlite
+, dbiSupport ? false, libdbi ? null, libdbiDrivers ? null
+, postgresSupport ? false, postgresql ? null
+}:
 
 with stdenv.lib;
 
@@ -14,13 +17,15 @@ stdenv.mkDerivation rec {
 
   patches = [ ./bashcomp-dir.patch ];
 
-  buildInputs = [ python pkgconfig cmake bluez libusb1 curl gettext sqlite libiconv ];
+  buildInputs = [ python pkgconfig cmake bluez libusb1 curl gettext sqlite libiconv ]
+  ++ optionals dbiSupport [ libdbi libdbiDrivers ]
+  ++ optionals postgresSupport [ postgresql ];
 
   enableParallelBuilding = true;
 
   meta = {
     homepage = "http://wammu.eu/gammu/";
-    description = "Command line utility and library to control mobil phones";
+    description = "Command line utility and library to control mobile phones";
     license = licenses.gpl2;
     platforms = platforms.linux;
     maintainers = [ maintainers.coroa ];

From 39e0909f8f0dfe14dfc0191b8b927c3a5ed6cc6f Mon Sep 17 00:00:00 2001
From: = <anothersms@gmail.com>
Date: Sat, 13 Feb 2016 01:03:58 +0100
Subject: [PATCH 1332/2285] IanniX: init at 0.9.17b (latest git)

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

diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/applications/audio/iannix/default.nix
new file mode 100644
index 000000000000..b2dde5b5b31f
--- /dev/null
+++ b/pkgs/applications/audio/iannix/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, alsaLib, pkgconfig, qt5
+}:
+
+stdenv.mkDerivation rec {
+  name = "iannix-${version}";
+  version = "2016-01-31";
+  src = fetchFromGitHub {
+    owner = "iannix";
+    repo = "IanniX";
+    rev = "f84becdcbe154b20a53aa2622068cb8f6fda0755";
+    sha256 = "184ydb9f1303v332k5k3f1ki7cb6nkxhh6ij0yn72v7dp7figrgj";
+  };
+
+    buildInputs = [ alsaLib pkgconfig qt5.qtbase qt5.qtscript ];
+
+  configurePhase = ''qmake PREFIX=/'';
+
+  installFlags = [ "INSTALL_ROOT=$(out)" ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Graphical open-source sequencer,";
+    homepage = http://www.iannix.org/;
+    license = stdenv.lib.licenses.lgpl3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.nico202 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 21dbbd6e9960..7c8b78854d41 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1940,6 +1940,8 @@ let
 
   iasl = callPackage ../development/compilers/iasl { };
 
+  iannix = callPackage ../applications/audio/iannix { };
+
   icecast = callPackage ../servers/icecast { };
 
   darkice = callPackage ../tools/audio/darkice { };

From 126bdab696f15d871f12d3d91edaaad109860f47 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Feb 2016 14:39:42 +0100
Subject: [PATCH 1333/2285] botanUnstable: 1.11.25 -> 1.11.28

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

diff --git a/pkgs/development/libraries/botan/unstable.nix b/pkgs/development/libraries/botan/unstable.nix
index 172c18480adb..b3fd76ab20c1 100644
--- a/pkgs/development/libraries/botan/unstable.nix
+++ b/pkgs/development/libraries/botan/unstable.nix
@@ -2,7 +2,7 @@
 
 callPackage ./generic.nix (args // {
   baseVersion = "1.11";
-  revision = "25";
-  sha256 = "1spjryza9yznbsa26i1kg3hz4ifjdi6cjhfd2h2lqg07xyf2a66c";
+  revision = "28";
+  sha256 = "0cjr3zkara8js1fbm8ddcbd5mkizxh1wm6fja13psw5j8mpwj554";
   openssl = null;
 })

From 4e27311fbfe5aeabfb8fc0c5472c65c3139805bf Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Feb 2016 14:40:04 +0100
Subject: [PATCH 1334/2285] botan: 1.10.10 -> 1.10.12

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

diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix
index 6eba16847f8e..3a3acbf67b9d 100644
--- a/pkgs/development/libraries/botan/default.nix
+++ b/pkgs/development/libraries/botan/default.nix
@@ -2,7 +2,7 @@
 
 callPackage ./generic.nix (args // {
   baseVersion = "1.10";
-  revision = "10";
-  sha256 = "0qs1ps25k79jnzm31zjl6hj8kxzfwwjsdrlc9bz621218r3v2rvb";
+  revision = "12";
+  sha256 = "09xcbrs48c9sgy6cj37qbc69gi6wlkjd6r3fi4zr8xwmj5wkmz5g";
   extraConfigureFlags = "--with-gnump";
 })

From 1e80424799901cc1aa4b5cfb6132fd8c023ffadb Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Feb 2016 14:42:37 +0100
Subject: [PATCH 1335/2285] sysdig: 0.6.0 -> 0.8.0; unpack kernel module when
 needed

---
 pkgs/os-specific/linux/sysdig/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix
index 62e2a48adc96..c9a594e684cf 100644
--- a/pkgs/os-specific/linux/sysdig/default.nix
+++ b/pkgs/os-specific/linux/sysdig/default.nix
@@ -3,10 +3,10 @@ let
   inherit (stdenv.lib) optional optionalString;
   s = rec {
     baseName="sysdig";
-    version = "0.6.0";
+    version = "0.8.0";
     name="${baseName}-${version}";
     url="https://github.com/draios/sysdig/archive/${version}.tar.gz";
-    sha256 = "0729mjs9gpd7kb495q80zlp23zczm8ka3xcq4571c0sm732sa3g3";
+    sha256 = "1939k3clwxg09m1bn0szqiy2nxg66srl72n7476jc58hgaraq3dr";
   };
   buildInputs = [
     cmake zlib luajit ncurses perl jsoncpp libb64 openssl curl
@@ -32,7 +32,13 @@ stdenv.mkDerivation {
     kernel_dev=${kernel.dev}
     kernel_dev=''${kernel_dev#/nix/store/}
     kernel_dev=''${kernel_dev%%-linux*dev*}
-    sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko
+    if test -f "$out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko"; then
+        sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko
+    else
+        xz -d $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko.xz
+        sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko
+        xz $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko
+    fi
   '';
 
   meta = with stdenv.lib; {

From 9e7c28cb56e08cadc88d5bcfcc3c27348005ca0a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Feb 2016 14:43:15 +0100
Subject: [PATCH 1336/2285] nginxUnstable: 1.9.10 -> 1.9.11

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

diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix
index 994a3a294801..5840dee0ba53 100644
--- a/pkgs/servers/http/nginx/unstable.nix
+++ b/pkgs/servers/http/nginx/unstable.nix
@@ -7,10 +7,10 @@
 with stdenv.lib;
 
 let
-  version = "1.9.10";
+  version = "1.9.11";
   mainSrc = fetchurl {
     url = "http://nginx.org/download/nginx-${version}.tar.gz";
-    sha256 = "1n9icvi9hq7gak21ixlhcyazjx2yjqlbws07i2habc6a8ildf57v";
+    sha256 = "07x5d2ryf547xrj4wp8w90kz2d93sxjhkfjb0vdscmxgmzs74p3a";
   };
 
 in

From 67ba412a8dde0f66e85407c23c46036980cddd7c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Feb 2016 14:44:07 +0100
Subject: [PATCH 1337/2285] gluseterfs: 3.7.6 -> 3.7.8

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

diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix
index 2563c4428a4c..7fd56e7dd7f8 100644
--- a/pkgs/tools/filesystems/glusterfs/default.nix
+++ b/pkgs/tools/filesystems/glusterfs/default.nix
@@ -6,11 +6,11 @@ let
   s = # Generated upstream information 
   rec {
     baseName="glusterfs";
-    version="3.7.6";
+    version="3.7.8";
     name="${baseName}-${version}";
-    hash="01fg132k4gvvx5p0bi88956yzd77pcnw3iyi88vrsncmpnvg10xv";
-    url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.6/glusterfs-3.7.6.tar.gz";
-    sha256="01fg132k4gvvx5p0bi88956yzd77pcnw3iyi88vrsncmpnvg10xv";
+    hash="0r5l8ax1gavhl06k30lg88xs8fj7w6iyd69s5qq5fw1jvavkx709";
+    url="http://download.gluster.org/pub/gluster/glusterfs/3.7/3.7.8/glusterfs-3.7.8.tar.gz";
+    sha256="0r5l8ax1gavhl06k30lg88xs8fj7w6iyd69s5qq5fw1jvavkx709";
   };
   buildInputs = [
     fuse bison flex_2_5_35 openssl python ncurses readline

From 4715783d2ed25428565f8fe1910874a6b1b8882f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Feb 2016 14:44:52 +0100
Subject: [PATCH 1338/2285] getmail: 4.48.0 -> 4.49.0

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

diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix
index a05b3ccfa9aa..8dd288b5588a 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/pkgs/tools/networking/getmail/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, buildPythonPackage }:
 
 buildPythonPackage rec {
-  version = "4.48.0";
+  version = "4.49.0";
   name = "getmail-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz";
-    sha256 = "0k5rm5kag14izng2ajcagvli9sns5mzvkyfa65ri4xymxs91wi29";
+    sha256 = "1m0yzxd05fklwbmjj1n2q4sx397c1j5qi9a0r5fv3h8pplz4lv0w";
   };
 
   doCheck = false;

From 4f450829151f94f5688dd3321570e32dbfcc0ce7 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Feb 2016 14:49:27 +0100
Subject: [PATCH 1339/2285] firejail: 0.9.36 -> 0.9.38

---
 pkgs/os-specific/linux/firejail/default.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix
index 4d0a066d2c38..57820f92cc4f 100644
--- a/pkgs/os-specific/linux/firejail/default.nix
+++ b/pkgs/os-specific/linux/firejail/default.nix
@@ -1,15 +1,16 @@
-{stdenv, fetchurl}:
+{stdenv, fetchurl, which}:
 let
   s = # Generated upstream information
   rec {
     baseName="firejail";
-    version="0.9.36";
+    version="0.9.38";
     name="${baseName}-${version}";
-    hash="1mxgkfn2hbacarcp51qwgi7jxxzv69wb4lz78m71zysy3kkqn23k";
-    url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.36-rc1.tar.bz2";
-    sha256="1mxgkfn2hbacarcp51qwgi7jxxzv69wb4lz78m71zysy3kkqn23k";
+    hash="0j0zvff9rwjwxcxddfhgzimjgmr99kd04nl40dllkrv3apv5ag4i";
+    url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.38-rc1.tar.bz2";
+    sha256="0j0zvff9rwjwxcxddfhgzimjgmr99kd04nl40dllkrv3apv5ag4i";
   };
   buildInputs = [
+    which
   ];
 in
 stdenv.mkDerivation {
@@ -21,6 +22,7 @@ stdenv.mkDerivation {
 
   preConfigure = ''
     sed -e 's@/bin/bash@${stdenv.shell}@g' -i $( grep -lr /bin/bash .)
+    sed -e "s@/bin/cp@$(which cp)@g" -i $( grep -lr /bin/cp .)
     sed -e '/void fs_var_run(/achar *vrcs = get_link("/var/run/current-system")\;' -i ./src/firejail/fs_var.c
     sed -e '/ \/run/iif(vrcs!=NULL){symlink(vrcs, "/var/run/current-system")\;free(vrcs)\;}' -i ./src/firejail/fs_var.c
   '';

From 4f1822bfb56d435ddf92fff0c2dc82e423bd680c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Feb 2016 15:07:12 +0100
Subject: [PATCH 1340/2285] asymptote: 2.35 -> 2.36

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

diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index c28349a31ccf..db7fad78a49c 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -10,11 +10,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="asymptote";
-    version="2.35";
+    version="2.36";
     name="${baseName}-${version}";
-    hash="11f28vxw0ybhvl7vxmqcdwvw7y6gz55ykw9ybgzb2px6lsvgag7z";
-    url="mirror://sourceforge/asymptote/2.35/asymptote-2.35.src.tgz";
-    sha256="11f28vxw0ybhvl7vxmqcdwvw7y6gz55ykw9ybgzb2px6lsvgag7z";
+    hash="0l0pznrn4k3v07cmn5rx8nq088zjs9bv2mkcks65z5lqlk5pccnd";
+    url="mirror://sourceforge/project/asymptote/2.36/asymptote-2.36.src.tgz";
+    sha256="0l0pznrn4k3v07cmn5rx8nq088zjs9bv2mkcks65z5lqlk5pccnd";
   };
   buildInputs = [
    freeglut ghostscriptX imagemagick fftw 

From 874721defa47c972470dc6354b7c0ae2ebac4b8a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Feb 2016 15:07:31 +0100
Subject: [PATCH 1341/2285] baresip: 0.4.16 -> 0.4.17

---
 .../networking/instant-messengers/baresip/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/baresip/default.nix b/pkgs/applications/networking/instant-messengers/baresip/default.nix
index a2f9ebc83173..2935979ebb9a 100644
--- a/pkgs/applications/networking/instant-messengers/baresip/default.nix
+++ b/pkgs/applications/networking/instant-messengers/baresip/default.nix
@@ -4,11 +4,11 @@
 , gsm, speex, portaudio, spandsp, libuuid
 }:
 stdenv.mkDerivation rec {
-  version = "0.4.16";
+  version = "0.4.17";
   name = "baresip-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/baresip-${version}.tar.gz";
-    sha256 = "04a9d7il39b1kfqh7al0g0q8v32hphgjx8gkixrlp5qsqlzvk876";
+    sha256 = "106nagdyayyxj3q68bs3fsps5wnwzjh82vcmy98fp42j33q6yzny";
   };
   buildInputs = [zlib openssl libre librem pkgconfig
     cairo mpg123 gstreamer gst_ffmpeg gst_plugins_base gst_plugins_bad gst_plugins_good

From eba068da620d6ccc81b024ea135cd2e2fd52be8f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Feb 2016 18:26:02 +0100
Subject: [PATCH 1342/2285] julia: add julia-git, a snapshot from mid-February
 with LLVM-3.7 (so it actually works in fresh NixPkgs)

---
 .../julia/0001.1-use-system-utf8proc.patch    |  29 +++
 pkgs/development/compilers/julia/git.nix      | 170 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   6 +
 3 files changed, 205 insertions(+)
 create mode 100644 pkgs/development/compilers/julia/0001.1-use-system-utf8proc.patch
 create mode 100644 pkgs/development/compilers/julia/git.nix

diff --git a/pkgs/development/compilers/julia/0001.1-use-system-utf8proc.patch b/pkgs/development/compilers/julia/0001.1-use-system-utf8proc.patch
new file mode 100644
index 000000000000..be4391399f55
--- /dev/null
+++ b/pkgs/development/compilers/julia/0001.1-use-system-utf8proc.patch
@@ -0,0 +1,29 @@
+From 54a66b5728ec98f44a1768f064509be4fd3f2ef6 Mon Sep 17 00:00:00 2001
+From: Thomas Tuegel <ttuegel@gmail.com>
+Date: Sat, 10 Oct 2015 13:09:48 -0500
+Subject: [PATCH 1/3] use system utf8proc
+
+---
+ src/flisp/Makefile | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/flisp/Makefile b/src/flisp/Makefile
+index bec8624..5437b5c 100644
+--- a/src/flisp/Makefile
++++ b/src/flisp/Makefile
+@@ -24,9 +24,9 @@ DOBJS = $(SRCS:%.c=$(BUILDDIR)/%.dbg.obj)
+ LLTDIR := ../support
+ LLT_release := $(BUILDDIR)/$(LLTDIR)/libsupport.a
+ LLT_debug := $(BUILDDIR)/$(LLTDIR)/libsupport-debug.a
+-LIBFILES_release := $(LLT_release) $(LIBUV) $(LIBUTF8PROC)
+-LIBFILES_debug := $(LLT_debug) $(LIBUV) $(LIBUTF8PROC)
+-LIBS :=
++LIBFILES_release := $(LLT_release) $(LIBUV)
++LIBFILES_debug := $(LLT_debug) $(LIBUV)
++LIBS := $(LIBUTF8PROC)
+ ifneq ($(OS),WINNT)
+ LIBS += -lpthread
+ endif
+-- 
+2.5.2
+
diff --git a/pkgs/development/compilers/julia/git.nix b/pkgs/development/compilers/julia/git.nix
new file mode 100644
index 000000000000..2f4ce2f4b9e6
--- /dev/null
+++ b/pkgs/development/compilers/julia/git.nix
@@ -0,0 +1,170 @@
+{ stdenv, fetchgit, fetchurl
+# build tools
+, gfortran, m4, makeWrapper, patchelf, perl, which, python2
+# libjulia dependencies
+, libunwind, llvm, readline, utf8proc, zlib
+# standard library dependencies
+, curl, fftwSinglePrec, fftw, gmp, libgit2, mpfr, openlibm, openspecfun, pcre2
+# linear algebra
+, openblas, arpack, suitesparse
+}:
+
+with stdenv.lib;
+
+# All dependencies must use the same OpenBLAS.
+let
+  arpack_ = arpack;
+  suitesparse_ = suitesparse;
+in
+let
+  arpack = arpack_.override { inherit openblas; };
+  suitesparse = suitesparse_.override { inherit openblas; };
+in
+
+let
+  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";
+  libuv = fetchurl {
+    url = "https://api.github.com/repos/JuliaLang/libuv/tarball/${libuvVersion}";
+    sha256 = "19nk8vdvx2mxyrwpndb7888c3b237ja5xvxr3jk5ah77ix3srr3h";
+  };
+
+  rmathVersion = "0.1";
+  rmath-julia = fetchurl {
+    url = "https://api.github.com/repos/JuliaLang/Rmath-julia/tarball/v${rmathVersion}";
+    sha256 = "0ai5dhjc43zcvangz123ryxmlbm51s21rg13bllwyn98w67arhb4";
+  };
+  
+  virtualenvVersion = "1.11.6";
+  virtualenv = fetchurl {
+    url = "https://pypi.python.org/packages/source/v/virtualenv/virtualenv-${virtualenvVersion}.tar.gz";
+    sha256 = "1xq4prmg25n9cz5zcvbqx68lmc3kl39by582vd8pzs9f3qalqyiy";
+  };
+in
+
+stdenv.mkDerivation rec {
+  pname = "julia";
+  version = "0.4.4-pre-2016-02-08";
+  name = "${pname}-${version}";
+
+  src = fetchgit {
+    url = "https://github.com/JuliaLang/${pname}";
+    rev = "cb93e6b70b4b1313b4de8c54e55e85c8eb43daa3";
+    sha256 = "11dmbjqiidlbh8sj5s09zsbfslm3zs0kw7iq40281hl5dfsr7zm6";
+  };
+
+  prePatch = ''
+    mkdir deps/srccache
+    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"
+    cp "${virtualenv}" "./deps/srccache/virtualenv-${virtualenvVersion}.tar.gz"
+  '';
+
+  patches = [
+    ./0001.1-use-system-utf8proc.patch
+    ./0002-use-system-suitesparse.patch
+  ];
+
+  postPatch = ''
+    patchShebangs . contrib
+  '';
+
+  buildInputs = [
+    arpack fftw fftwSinglePrec gmp libgit2 libunwind llvm mpfr
+    pcre2 openblas openlibm openspecfun readline suitesparse utf8proc
+    zlib
+  ];
+
+  nativeBuildInputs = [ curl gfortran m4 makeWrapper patchelf perl python2 which ];
+
+  makeFlags =
+    let
+      arch = head (splitString "-" stdenv.system);
+      march = { "x86_64" = "x86-64"; "i686" = "i686"; }."${arch}"
+              or (throw "unsupported architecture: ${arch}");
+      # Julia requires Pentium 4 (SSE2) or better
+      cpuTarget = { "x86_64" = "x86-64"; "i686" = "pentium4"; }."${arch}"
+                  or (throw "unsupported architecture: ${arch}");
+    in [
+      "ARCH=${arch}"
+      "MARCH=${march}"
+      "JULIA_CPU_TARGET=${cpuTarget}"
+      "PREFIX=$(out)"
+      "prefix=$(out)"
+      "SHELL=${stdenv.shell}"
+
+      "USE_SYSTEM_BLAS=1"
+      "USE_BLAS64=${if openblas.blas64 then "1" else "0"}"
+      "LIBBLAS=-lopenblas"
+      "LIBBLASNAME=libopenblas"
+
+      "USE_SYSTEM_LAPACK=1"
+      "LIBLAPACK=-lopenblas"
+      "LIBLAPACKNAME=libopenblas"
+
+      "USE_SYSTEM_SUITESPARSE=1"
+      "SUITESPARSE_LIB=-lsuitesparse"
+      "SUITESPARSE_INC=-I${suitesparse}/include"
+
+      "USE_SYSTEM_ARPACK=1"
+      "USE_SYSTEM_FFTW=1"
+      "USE_SYSTEM_GMP=1"
+      "USE_SYSTEM_LIBGIT2=1"
+      "USE_SYSTEM_LIBUNWIND=1"
+      "USE_SYSTEM_LLVM=1"
+      "USE_SYSTEM_MPFR=1"
+      "USE_SYSTEM_OPENLIBM=1"
+      "USE_SYSTEM_OPENSPECFUN=1"
+      "USE_SYSTEM_PATCHELF=1"
+      "USE_SYSTEM_PCRE=1"
+      "USE_SYSTEM_READLINE=1"
+      "USE_SYSTEM_UTF8PROC=1"
+      "USE_SYSTEM_ZLIB=1"
+    ];
+
+  NIX_CFLAGS_COMPILE = [ "-fPIC" ];
+
+  LD_LIBRARY_PATH = makeSearchPath "lib" [
+    arpack fftw fftwSinglePrec gmp libgit2 mpfr openblas openlibm
+    openspecfun pcre2 suitesparse
+  ];
+
+  dontStrip = true;
+  dontPatchELF = true;
+
+  enableParallelBuilding = true;
+
+  doCheck = true;
+  checkTarget = "testall";
+  # Julia's tests require read/write access to $HOME
+  preCheck = ''
+    export HOME="$NIX_BUILD_TOP"
+  '';
+
+  preBuild = ''
+    sed -e '/^install:/s@[^ ]*/doc/[^ ]*@@' -i Makefile
+    sed -e '/[$](DESTDIR)[$](docdir)/d' -i Makefile
+  '';
+
+  postInstall = ''
+    for prog in "$out/bin/julia" "$out/bin/julia-debug"; do
+        wrapProgram "$prog" \
+            --prefix LD_LIBRARY_PATH : "$LD_LIBRARY_PATH" \
+            --prefix PATH : "${curl}/bin"
+    done
+  '';
+
+  meta = {
+    description = "High-level performance-oriented dynamical language for technical computing";
+    homepage = "http://julialang.org/";
+    license = stdenv.lib.licenses.mit;
+    maintainers = with stdenv.lib.maintainers; [ raskin ttuegel ];
+    platforms = [ "i686-linux" "x86_64-linux" "x86_64-darwin" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ebef4484aca7..298bbfc18007 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4390,6 +4390,12 @@ let
     openblas = openblasCompat;
   };
 
+  julia-git = lowPrio (callPackage ../development/compilers/julia/git.nix {
+    gmp = gmp6;
+    llvm = llvm_37;
+    openblas = openblasCompat;
+  });
+
   kotlin = callPackage ../development/compilers/kotlin { };
 
   lazarus = callPackage ../development/compilers/fpc/lazarus.nix {

From 4262d1800ca854e244d4bac8c3c17cfda0236bb3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Feb 2016 21:13:49 +0100
Subject: [PATCH 1343/2285] libexttextcat: 3.3.1 -> 3.4.1

---
 .../libraries/libexttextcat/default.nix       |  6 +--
 .../libexttextcat/memory-leaks.patch          | 37 -------------------
 2 files changed, 2 insertions(+), 41 deletions(-)
 delete mode 100644 pkgs/development/libraries/libexttextcat/memory-leaks.patch

diff --git a/pkgs/development/libraries/libexttextcat/default.nix b/pkgs/development/libraries/libexttextcat/default.nix
index a75fada7484a..6aaadb0b02eb 100644
--- a/pkgs/development/libraries/libexttextcat/default.nix
+++ b/pkgs/development/libraries/libexttextcat/default.nix
@@ -1,15 +1,13 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libexttextcat-3.3.1";
+  name = "libexttextcat-3.4.1";
 
   src = fetchurl {
     url = "http://dev-www.libreoffice.org/src/libexttextcat/${name}.tar.xz";
-    sha256 = "1a7ablpipfbiyhl6wsraj5z8pj3qkqgnrms73wzsqhpbyww334h4";
+    sha256 = "0g1spzpsfbv3y8k9m1v53imz18437q93iq101hind7m4x00j6wpl";
   };
 
-  patches = [ ./memory-leaks.patch ];
-
   meta = {
     description = "An N-Gram-Based Text Categorization library primarily intended for language guessing";
     homepage = http://www.freedesktop.org/wiki/Software/libexttextcat;
diff --git a/pkgs/development/libraries/libexttextcat/memory-leaks.patch b/pkgs/development/libraries/libexttextcat/memory-leaks.patch
deleted file mode 100644
index 0be4ffdc93a7..000000000000
--- a/pkgs/development/libraries/libexttextcat/memory-leaks.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Combined upstream commits 980592386f23db8b0dc84c434805cb167d0cc091 and
-5ef4ad86ec934282cba891922ec2d13784da3354.
-diff -u b/src/textcat.c b/src/textcat.c
---- b/src/textcat.c
-+++ b/src/textcat.c
-@@ -212,8 +212,6 @@
-                                 sizeof(char) * (tmp_size + 1));
-             if (tmp == NULL)
-             {
--                free(finger_print_file_name);
--                finger_print_file_name_size = 0;
-                 goto BAILOUT;
-             }
-             else
-@@ -226,10 +224,7 @@
-         strcat(finger_print_file_name, segment[0]);
- 
-         if (fp_Read(h->fprint[h->size], finger_print_file_name, 400) == 0)
--        {
--            textcat_Done(h);
-             goto BAILOUT;
--        }
-         h->fprint_disable[h->size] = 0xF0;  /* 0xF0 is the code for enabled
-                                                languages, 0x0F is for disabled 
-                                              */
-@@ -242,9 +237,10 @@
-     return h;
- 
-   BAILOUT:
-+    free(finger_print_file_name);
-     fclose(fp);
-+    textcat_Done(h);
-     return NULL;
--
- }
- 
- extern candidate_t *textcat_GetClassifyFullOutput(void *handle)

From 9f3a1cc2de61cede8703c99a6044f4f4f760f4a5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Feb 2016 21:15:26 +0100
Subject: [PATCH 1344/2285] librevenge: 0.0.3 -> 0.0.4

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

diff --git a/pkgs/development/libraries/librevenge/default.nix b/pkgs/development/libraries/librevenge/default.nix
index dc7634c958cb..ac5feb1ddc8d 100644
--- a/pkgs/development/libraries/librevenge/default.nix
+++ b/pkgs/development/libraries/librevenge/default.nix
@@ -3,11 +3,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="librevenge";
-    version="0.0.3";
+    version="0.0.4";
     name="${baseName}-${version}";
-    hash="1r0n5q7rw32h5fhnxfl7f4pwvprn9agpf117nhn71jrjqx57irvw";
-    url="mirror://sourceforge/project/libwpd/librevenge/librevenge-0.0.3/librevenge-0.0.3.tar.xz";
-    sha256="1r0n5q7rw32h5fhnxfl7f4pwvprn9agpf117nhn71jrjqx57irvw";
+    hash="1cj76cz4mqcy2mgv9l5xlc95bypyk8zbq0ls9cswqrs2y0lhfgwk";
+    url="mirror://sourceforge/project/libwpd/librevenge/librevenge-0.0.4/librevenge-0.0.4.tar.xz";
+    sha256="1cj76cz4mqcy2mgv9l5xlc95bypyk8zbq0ls9cswqrs2y0lhfgwk";
   };
   buildInputs = [
     boost pkgconfig cppunit zlib

From 481b1da3efe5dbd97747eaf0947d2ee594bb5c7e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Feb 2016 21:15:44 +0100
Subject: [PATCH 1345/2285] libre: 0.4.14 -> 0.4.15

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

diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix
index 17226ef17c48..243b4b9420ae 100644
--- a/pkgs/development/libraries/libre/default.nix
+++ b/pkgs/development/libraries/libre/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, zlib, openssl}:
 stdenv.mkDerivation rec {
-  version = "0.4.14";
+  version = "0.4.15";
   name = "libre-${version}";
   src=fetchurl {
     url = "http://www.creytiv.com/pub/re-${version}.tar.gz";
-    sha256 = "0ylv7v77jsny0a5wfc8i6dxsp8bjlmlz2gcyyv7x49c76pk0gdcy";
+    sha256 = "0yvjc3hvjk29irdii2h1hpq4cg9l1c71jfvglz67y1pc89z63yax";
   };
   buildInputs = [zlib openssl];
   makeFlags = [

From c42b19e95d7f125095f2534491d959a87749e486 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 14 Feb 2016 21:16:53 +0100
Subject: [PATCH 1346/2285] libreoffice: 5.0.4.2 -> 5.1.0.3; disable one more
 fragile test

---
 .../office/libreoffice/default.nix            |  32 +++--
 .../office/libreoffice/libreoffice-srcs.nix   | 117 +++++++++---------
 2 files changed, 80 insertions(+), 69 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 30a4a47896ab..7c73e7b808c7 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip
 , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd
 , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
-, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
+, bison, flex, zip, unzip, gtk3, gtk, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, cups, xorg, libcmis
 , openssl, gperf, cppunit, GConf, ORBit2, poppler
 , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw
@@ -11,7 +11,7 @@
 , fontsConf, pkgconfig, libzip, bluez5, libtool, maven
 , libatomic_ops, graphite2, harfbuzz, libodfgen
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
-, gdb, commonsLogging
+, gdb, commonsLogging, librdf_rasqal
 , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ]
 , withHelp ? true
 }:
@@ -19,9 +19,9 @@
 let
   langsSpaces = stdenv.lib.concatStringsSep " " langs;
   major = "5";
-  minor = "0";
-  patch = "4";
-  tweak = "2";
+  minor = "1";
+  patch = "0";
+  tweak = "3";
   subdir = "${major}.${minor}.${patch}";
   version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
 
@@ -47,14 +47,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "1kdrs49agqhb2b687hqh6sq7328z2sf04dmhb3xv5zy4rjvv5pha";
+      sha256 = "1qqffq7646yh7rskzd1wvy0zgkdnkpdbyhvsny424lxqjglyw3px";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "005jwny8xmsnvvh0xkk9csnqv2jkaslr2n9xm82bqalcg81j0g2x";
+      sha256 = "0ixlq6yzn6z8hsih24l934sa05vvz2vk3p03nalpqqrhm7vdzsf2";
     };
 
   };
@@ -63,12 +63,17 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "1j3dmk5xifcgmd6dgqqifzh8wmc7daqfbkvk6cxa94611yvl0x34";
+    sha256 = "1csphxpbpc7bxrwnl5i9nvm3bh3p0j7r3h9ivsdl7cys13q066xl";
   };
 
   # Openoffice will open libcups dynamically, so we link it directly
   # to make its dlopen work.
-  NIX_LDFLAGS = "-lcups";
+  # It also seems not to mention libdl explicitly in some places.
+  NIX_LDFLAGS = "-lcups -ldl";
+
+  # For some reason librdf_redland sometimes refers to rasqal.h instead 
+  # of rasqal/rasqal.h
+  NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal";
 
   # If we call 'configure', 'make' will then call configure again without parameters.
   # It's their system.
@@ -112,6 +117,8 @@ in stdenv.mkDerivation rec {
     # http://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html
     echo > ./sd/CppunitTest_sd_tiledrendering.mk
     sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk
+    # one more fragile test?
+    sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
   '';
 
   makeFlags = "SHELL=${bash}/bin/bash";
@@ -181,7 +188,6 @@ in stdenv.mkDerivation rec {
 
     # I imagine this helps. Copied from go-oo.
     # Modified on every upgrade, though
-    "--disable-kde"
     "--disable-odk"
     "--disable-postgresql-sdbc"
     "--disable-firebird-sdbc"
@@ -213,18 +219,18 @@ in stdenv.mkDerivation rec {
   buildInputs = with xorg;
     [ ant ArchiveZip autoconf automake bison boost cairo clucene_core
       CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig
-      freetype GConf getopt gnome_vfs gperf gtk
+      freetype GConf getopt gnome_vfs gperf gtk3 gtk
       hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg
       libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
       libXaw libXext libXi libXinerama libxml2 libxslt libXtst
       libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
       gst_all_1.gst-plugins-base
-      neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler
+      neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
       python3 sablotron sane-backends tcsh unzip vigra which zip zlib
       mdds bluez5 glibc libcmis libwps libabw
       libxshmfence libatomic_ops graphite2 harfbuzz
       librevenge libe-book libmwaw glm glew
-      libodfgen CoinMP
+      libodfgen CoinMP librdf_rasqal
     ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index a70d5a7c77c3..21a16a5fc69e 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -4,21 +4,6 @@
   md5 = "7a3815b506d064313ba309617b6f5a0b";
   brief = true;
 }
-{
-  name = "commons-codec-1.6-src.tar.gz";
-  md5 = "2e482c7567908d334785ce7d69ddfff7";
-  brief = false;
-}
-{
-  name = "commons-httpclient-3.1-src.tar.gz";
-  md5 = "2c9b0f83ed5890af02c0df1c1776f39b";
-  brief = false;
-}
-{
-  name = "commons-lang-2.4-src.tar.gz";
-  md5 = "625ff5f2f968dd908bca43c9469d6e6b";
-  brief = false;
-}
 {
   name = "commons-logging-1.2-src.tar.gz";
   md5 = "ce977548f1cbf46918e93cd38ac35163";
@@ -35,23 +20,28 @@
   brief = true;
 }
 {
-  name = "boost_1_55_0.tar.bz2";
-  md5 = "d6eef4b4cacb2183f2bf265a5a03a354";
-  brief = false;
+  name = "boost_1_59_0.tar.bz2";
+  md5 = "6aa9a5c6a4ca1016edd0ed1178e3cb87";
+  brief = true;
 }
 {
   name = "bsh-2.0b5-src.zip";
   md5 = "ec1941a74d3ef513c4ce57a9092b74e1";
   brief = false;
 }
+{
+  name = "bzip2-1.0.6.tar.gz";
+  md5 = "00b516f4704d4a7cb50a1d97e6e8e15b";
+  brief = false;
+}
 {
   name = "cairo-1.10.2.tar.gz";
   md5 = "f101a9e88b783337b20b2e26dfd26d5f";
   brief = false;
 }
 {
-  name = "libcdr-0.1.1.tar.bz2";
-  md5 = "b33fd0be3befdd1b37777e08ce058bd9";
+  name = "libcdr-0.1.2.tar.bz2";
+  md5 = "6e3062b55b149d7b3c6aedb3bb5b86e2";
   brief = true;
 }
 {
@@ -100,8 +90,8 @@
   brief = false;
 }
 {
-  name = "libetonyek-0.1.3.tar.bz2";
-  md5 = "e5947373dd7834f27e93f1636faa419f";
+  name = "libetonyek-0.1.6.tar.bz2";
+  md5 = "77ff46936dcc83670557274e7dd2aa33";
   brief = true;
 }
 {
@@ -110,8 +100,8 @@
   brief = false;
 }
 {
-  name = "Firebird-2.5.2.26540-0.tar.bz2";
-  md5 = "21154d2004e025c8a3666625b0357bb5";
+  name = "Firebird-2.5.4.26856-0.tar.bz2";
+  md5 = "7a17ec9889424b98baa29e001a054434";
   brief = true;
 }
 {
@@ -130,8 +120,8 @@
   brief = false;
 }
 {
-  name = "dejavu-fonts-ttf-2.34.zip";
-  md5 = "a4e565e220b5de082c23995e256e3c12";
+  name = "dejavu-fonts-ttf-2.35.zip";
+  md5 = "d8b5214d35bcd2bfcb2cffa7795b351d";
   brief = false;
 }
 {
@@ -185,8 +175,8 @@
   brief = false;
 }
 {
-  name = "glew-1.10.0.zip";
-  md5 = "594eb47b4b1210e25438d51825404d5a";
+  name = "glew-1.12.0.zip";
+  md5 = "3941e9cab2f4f9d8faee3e8d57ae7664";
   brief = false;
 }
 {
@@ -195,9 +185,14 @@
   brief = false;
 }
 {
-  name = "graphite2-1.2.4.tgz";
-  md5 = "2ef839348fe28e3b923bf8cced440227";
-  brief = true;
+  name = "glyphy-0.2.0.tar.bz2";
+  md5 = "5d303fb955beb9bf112267316ca9d021";
+  brief = false;
+}
+{
+  name = "graphite2-minimal-1.3.4.tgz";
+  md5 = "5c0c9ac0996fbb4a0e17780ff5441959";
+  brief = false;
 }
 {
   name = "harfbuzz-0.9.40.tar.bz2";
@@ -220,8 +215,8 @@
   brief = false;
 }
 {
-  name = "icu4c-54_1-src.tgz";
-  md5 = "e844caed8f2ca24c088505b0d6271bc0";
+  name = "icu4c-56_1-src.tgz";
+  md5 = "c4a2d71ff56aec5ebfab2a3f059be99d";
   brief = false;
 }
 {
@@ -285,8 +280,8 @@
   brief = true;
 }
 {
-  name = "libjpeg-turbo-1.3.1.tar.gz";
-  md5 = "2c3a68129dac443a72815ff5bb374b05";
+  name = "libjpeg-turbo-1.4.2.tar.gz";
+  md5 = "86b0d5f7507c2e6c21c00219162c3c44";
   brief = true;
 }
 {
@@ -326,8 +321,8 @@
   subDir = "libgltf/";
 }
 {
-  name = "liblangtag-0.5.1.tar.bz2";
-  md5 = "36271d3fa0d9dec1632029b6d7aac925";
+  name = "liblangtag-0.5.8.tar.bz2";
+  md5 = "aa899eff126216dafe721149fbdb511b";
   brief = false;
 }
 {
@@ -366,8 +361,8 @@
   brief = true;
 }
 {
-  name = "libmwaw-0.3.5.tar.bz2";
-  md5 = "bdc58bbf89aaaf6d29b3516d96830a06";
+  name = "libmwaw-0.3.7.tar.bz2";
+  md5 = "4a8a53a9d997cf0e2bd208178797dbfb";
   brief = true;
 }
 {
@@ -391,8 +386,8 @@
   brief = false;
 }
 {
-  name = "libodfgen-0.1.4.tar.bz2";
-  md5 = "8716be5c22ae8353f9aaa380d74840dc";
+  name = "libodfgen-0.1.6.tar.bz2";
+  md5 = "32572ea48d9021bbd6fa317ddb697abc";
   brief = true;
 }
 {
@@ -411,9 +406,14 @@
   brief = true;
 }
 {
-  name = "liborcus-0.7.0.tar.bz2";
-  md5 = "7681383be6ce489d84c1c74f4e7f9643";
-  brief = false;
+  name = "liborcus-0.9.2.tar.gz";
+  md5 = "e6efcbe50a5fd4d50d513c9a7a4139b0";
+  brief = true;
+}
+{
+  name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
+  md5 = "593f0aa47bf2efc0efda2d28fae063b2";
+  brief = true;
 }
 {
   name = "libpagemaker-0.0.2.tar.bz2";
@@ -426,8 +426,8 @@
   brief = false;
 }
 {
-  name = "libpng-1.5.24.tar.gz";
-  md5 = "6652e428d1d3fc3c6cb1362159b1cf3b";
+  name = "libpng-1.6.19.tar.gz";
+  md5 = "3121bdc77c365a87e054b9f859f421fe";
   brief = true;
 }
 {
@@ -445,6 +445,11 @@
   md5 = "803a75927f8f241ca78633890c798021";
   brief = true;
 }
+{
+  name = "Python-3.5.0.tgz";
+  md5 = "a56c0c0b45d75a0ec9c6dee933c41c36";
+  brief = true;
+}
 {
   name = "raptor2-2.0.9.tar.gz";
   md5 = "4ceb9316488b0ea01acf011023cf7fff";
@@ -461,8 +466,8 @@
   brief = false;
 }
 {
-  name = "librevenge-0.0.2.tar.bz2";
-  md5 = "2d4183bf17aea1a71842468a71a68c47";
+  name = "librevenge-0.0.4.tar.bz2";
+  md5 = "5b9ac52ec77d4d19157cf5962ebc0aea";
   brief = true;
 }
 {
@@ -491,23 +496,23 @@
   brief = false;
 }
 {
-  name = "libvisio-0.1.1.tar.bz2";
-  md5 = "726c1f5be65eb7d649e0d48b63d920e7";
+  name = "libvisio-0.1.5.tar.bz2";
+  md5 = "cbee198a78b842b2087f32d33c522818";
   brief = true;
 }
 {
-  name = "libwpd-0.10.0.tar.bz2";
-  md5 = "0773d79a1f240ef9f4f20242b13c5bb7";
+  name = "libwpd-0.10.1.tar.bz2";
+  md5 = "79b56bcc349264d686a67994506ad199";
   brief = true;
 }
 {
-  name = "libwpg-0.3.0.tar.bz2";
-  md5 = "17da9770cb8b317b7633f9807b32b71a";
+  name = "libwpg-0.3.1.tar.bz2";
+  md5 = "dfd066658ec9d2fb2262417039a8a1c3";
   brief = true;
 }
 {
-  name = "libwps-0.4.0.tar.bz2";
-  md5 = "e9162d2566421d9d71b3ad2377a68fd5";
+  name = "libwps-0.4.2.tar.bz2";
+  md5 = "8a6c55542ce80203dd6d3b1cba99d4e5";
   brief = true;
 }
 {

From 7b7cf281d3bb3ddf21aefd8afb6304673de8bcc5 Mon Sep 17 00:00:00 2001
From: Al Zohali <zohl@fmap.me>
Date: Sat, 13 Feb 2016 22:19:31 +0300
Subject: [PATCH 1347/2285] gammu-smsd service: init

---
 nixos/modules/misc/ids.nix                 |   1 +
 nixos/modules/module-list.nix              |   1 +
 nixos/modules/services/misc/gammu-smsd.nix | 253 +++++++++++++++++++++
 3 files changed, 255 insertions(+)
 create mode 100644 nixos/modules/services/misc/gammu-smsd.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 064b4cbc4b33..cea1340e84f3 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -248,6 +248,7 @@
       matrix-synapse = 224;
       rspamd = 225;
       rmilter = 226;
+      gammu-smsd = 227;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 2ff61877c23d..d475bccf498c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -210,6 +210,7 @@
   ./services/misc/etcd.nix
   ./services/misc/felix.nix
   ./services/misc/folding-at-home.nix
+  ./services/misc/gammu-smsd.nix
   #./services/misc/gitit.nix
   ./services/misc/gitlab.nix
   ./services/misc/gitolite.nix
diff --git a/nixos/modules/services/misc/gammu-smsd.nix b/nixos/modules/services/misc/gammu-smsd.nix
new file mode 100644
index 000000000000..91047ead4364
--- /dev/null
+++ b/nixos/modules/services/misc/gammu-smsd.nix
@@ -0,0 +1,253 @@
+{ pkgs, lib, config, ... }:
+
+with lib;
+let
+  cfg = config.services.gammu-smsd;
+
+  configFile = pkgs.writeText "gammu-smsd.conf" ''
+    [gammu]
+    Device = ${cfg.device.path}
+    Connection = ${cfg.device.connection}
+    SynchronizeTime = ${if cfg.device.synchronizeTime then "yes" else "no"}
+    LogFormat = ${cfg.log.format}
+    ${if (cfg.device.pin != null) then "PIN = ${cfg.device.pin}" else ""}
+    ${cfg.extraConfig.gammu}
+
+
+    [smsd]
+    LogFile = ${cfg.log.file}
+    Service = ${cfg.backend.service}
+
+    ${optionalString (cfg.backend.service == "files") ''
+      InboxPath = ${cfg.backend.files.inboxPath}
+      OutboxPath = ${cfg.backend.files.outboxPath}
+      SentSMSPath = ${cfg.backend.files.sentSMSPath}
+      ErrorSMSPath = ${cfg.backend.files.errorSMSPath}
+    ''}
+
+    ${optionalString (cfg.backend.service == "sql" && cfg.backend.sql.driver == "sqlite") ''
+      Driver = ${cfg.backend.sql.driver}
+      DBDir = ${cfg.backend.sql.database}
+    ''}
+
+    ${optionalString (cfg.backend.service == "sql" && cfg.backend.sql.driver == "native_pgsql") (
+      with cfg.backend; ''
+        Driver = ${sql.driver}
+        ${if (sql.database!= null) then "Database = ${sql.database}" else ""}
+        ${if (sql.host != null) then "Host = ${sql.host}" else ""}
+        ${if (sql.user != null) then "User = ${sql.user}" else ""}
+        ${if (sql.password != null) then "Password = ${sql.password}" else ""}
+      '')}
+
+    ${cfg.extraConfig.smsd}
+  '';
+
+  initDBDir = "share/doc/gammu/examples/sql";
+
+  gammuPackage = with cfg.backend; (pkgs.gammu.override {
+    dbiSupport = (service == "sql" && sql.driver == "sqlite");
+    postgresSupport = (service == "sql" && sql.driver == "native_pgsql");
+  });
+
+in {
+  options = {
+    services.gammu-smsd = {
+
+      enable = mkEnableOption "gammu-smsd daemon";
+
+      user = mkOption {
+        type = types.str;
+        default = "smsd";
+        description = "User that has access to the device";
+      };
+
+      device = {
+        path = mkOption {
+          type = types.path;
+          description = "Device node or address of the phone";
+          example = "/dev/ttyUSB2";
+        };
+
+        group = mkOption {
+          type = types.str;
+          default = "root";
+          description = "Owner group of the device";
+          example = "dialout";
+        };
+
+        connection = mkOption {
+          type = types.str;
+          default = "at";
+          description = "Protocol which will be used to talk to the phone";
+        };
+
+        synchronizeTime = mkOption {
+          type = types.bool;
+          default = true;
+          description = "Whether to set time from computer to the phone during starting connection";
+        };
+
+        pin = mkOption {
+          type = types.nullOr types.str;
+          default = null;
+          description = "PIN code for the simcard";
+        };
+      };
+
+
+      log = {
+        file = mkOption {
+          type = types.str;
+          default = "syslog";
+          description = "Path to file where information about communication will be stored";
+        };
+
+        format = mkOption {
+          type = types.enum [ "nothing" "text" "textall" "textalldate" "errors" "errorsdate" "binary" ];
+          default = "errors";
+          description = "Determines what will be logged to the LogFile";
+        };
+      };
+
+
+      extraConfig = {
+        gammu = mkOption {
+          type = types.lines;
+          default = "";
+          description = "Extra config lines to be added into [gammu] section";
+        };
+
+
+        smsd = mkOption {
+          type = types.lines;
+          default = "";
+          description = "Extra config lines to be added into [smsd] section";
+        };
+      };
+
+
+      backend = {
+        service = mkOption {
+          type = types.enum [ "null" "files" "sql" ];
+          default = "null";
+          description = "Service to use to store sms data.";
+        };
+
+        files = {
+          inboxPath = mkOption {
+            type = types.path;
+            default = "/var/spool/sms/inbox/";
+            description = "Where the received SMSes are stored";
+          };
+
+          outboxPath = mkOption {
+            type = types.path;
+            default = "/var/spool/sms/outbox/";
+            description = "Where SMSes to be sent should be placed";
+          };
+
+          sentSMSPath = mkOption {
+            type = types.path;
+            default = "/var/spool/sms/sent/";
+            description = "Where the transmitted SMSes are placed";
+          };
+
+          errorSMSPath = mkOption {
+            type = types.path;
+            default = "/var/spool/sms/error/";
+            description = "Where SMSes with error in transmission is placed";
+          };
+        };
+
+        sql = {
+          driver = mkOption {
+            type = types.enum [ "native_mysql" "native_pgsql" "odbc" "dbi" ];
+            description = "DB driver to use";
+          };
+
+          sqlDialect = mkOption {
+            type = types.nullOr types.str;
+            default = null;
+            description = "SQL dialect to use (odbc driver only)";
+          };
+
+          database = mkOption {
+            type = types.str;
+            default = null;
+            description = "Database name to store sms data";
+          };
+
+          host = mkOption {
+            type = types.str;
+            default = "localhost";
+            description = "Database server address";
+          };
+
+          user = mkOption {
+            type = types.nullOr types.str;
+            default = null;
+            description = "User name used for connection to the database";
+          };
+
+          password = mkOption {
+            type = types.nullOr types.str;
+            default = null;
+            description = "User password used for connetion to the database";
+          };
+        };
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    users.extraUsers.${cfg.user} = {
+      description = "gammu-smsd user";
+      uid = config.ids.uids.gammu-smsd;
+      extraGroups = [ "${cfg.device.group}" ];
+    };
+
+    environment.systemPackages = with cfg.backend; [ gammuPackage ]
+    ++ optionals (service == "sql" && sql.driver == "sqlite")  [ pkgs.sqlite ];
+
+    systemd.services.gammu-smsd = {
+      description = "gammu-smsd daemon";
+
+      wantedBy = [ "multi-user.target" ];
+
+      wants = with cfg.backend; [ ]
+      ++ optionals (service == "sql" && sql.driver == "native_pgsql") [ "postgresql.service" ];
+
+      preStart = with cfg.backend;
+
+        optionalString (service == "files") (with files; ''
+          mkdir -m 755 -p ${inboxPath} ${outboxPath} ${sentSMSPath} ${errorSMSPath}
+          chown ${cfg.user} -R ${inboxPath}
+          chown ${cfg.user} -R ${outboxPath}
+          chown ${cfg.user} -R ${sentSMSPath}
+          chown ${cfg.user} -R ${errorSMSPath}
+        '')
+      + optionalString (service == "sql" && sql.driver == "sqlite") ''
+         cat "${gammuPackage}/${initDBDir}/sqlite.sql" \
+         | ${pkgs.sqlite}/bin/sqlite3 ${sql.database}
+        ''
+      + (let execPsql = extraArgs: concatStringsSep " " [
+          (optionalString (sql.password != null) "PGPASSWORD=${sql.password}")
+          "${config.services.postgresql.package}/bin/psql"
+          (optionalString (sql.host != null) "-h ${sql.host}")
+          (optionalString (sql.user != null) "-U ${sql.user}")
+          "$extraArgs"
+          "${sql.database}"
+        ]; in optionalString (service == "sql" && sql.driver == "native_pgsql") ''
+         echo '\i '"${gammuPackage}/${initDBDir}/pgsql.sql" | ${execPsql ""}
+       '');
+
+      serviceConfig = {
+        User = "${cfg.user}";
+        Group = "${cfg.device.group}";
+        PermissionsStartOnly = true;
+        ExecStart = "${gammuPackage}/bin/gammu-smsd -c ${configFile}";
+      };
+
+    };
+  };
+}

From af64bedaca73c660d6a3d0424981f9fe58ee9a52 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Tue, 9 Feb 2016 22:34:31 +0100
Subject: [PATCH 1348/2285] add armv7l-linux to mesaPlatforms

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

diff --git a/lib/platforms.nix b/lib/platforms.nix
index 750829da3751..5ac0b5287145 100644
--- a/lib/platforms.nix
+++ b/lib/platforms.nix
@@ -13,7 +13,7 @@ rec {
   all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos;
   none = [];
   allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all;
-  mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux"];
+  mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux"];
   x86_64 = ["x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin"];
   i686 = ["i686-linux" "i686-freebsd" "i686-netbsd" "i686-cygwin"];
   arm = ["armv5tel-linux" "armv6l-linux" "armv7l-linux" ];

From 976895c0d04b998a66853158ab312b9fda42d596 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Thu, 11 Feb 2016 09:33:42 +0100
Subject: [PATCH 1349/2285] mesa: remove broken dependency on libdrm_intel on
 armv7l-linux

does this work for other arm systems or should it be applied for
system.isArm?
---
 pkgs/development/libraries/mesa/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix
index c6af00d08b87..f2b53fc2e595 100644
--- a/pkgs/development/libraries/mesa/default.nix
+++ b/pkgs/development/libraries/mesa/default.nix
@@ -86,12 +86,16 @@ stdenv.mkDerivation {
     # TODO: Figure out how to enable opencl without having a runtime dependency on clang
     "--disable-opencl"
 
-    "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast"
+    (if "armv7l-linux" == stdenv.system
+      then null
+      else "--with-gallium-drivers=svga,i915,ilo,r300,r600,radeonsi,nouveau,freedreno,swrast")
     "--enable-shared-glapi"
     "--enable-sysfs"
     "--enable-driglx-direct" # seems enabled anyway
     "--enable-glx-tls"
-    "--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast"
+    (if "armv7l-linux" == stdenv.system
+      then "--with-dri-drivers="
+      else "--with-dri-drivers=i915,i965,nouveau,radeon,r200,swrast")
     "--with-egl-platforms=x11,wayland,drm"
 
     "--enable-gallium-llvm"

From 6c532624808336b853f31d27ef3309e6feab4ac1 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Sun, 14 Feb 2016 21:13:51 +0100
Subject: [PATCH 1350/2285] ImageMagick: build also on armv7l-linux

---
 pkgs/applications/graphics/ImageMagick/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 8fa86041414f..e75e86a4d533 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -7,6 +7,7 @@ let
   arch =
     if stdenv.system == "i686-linux" then "i686"
     else if stdenv.system == "x86_64-linux" || stdenv.system == "x86_64-darwin" then "x86-64"
+    else if stdenv.system == "armv7l-linux" then "armv7l"
     else throw "ImageMagick is not supported on this platform.";
 in
 

From d48f117d06dbf1b4e414a16672e998289298f34a Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Sun, 14 Feb 2016 23:03:26 +0000
Subject: [PATCH 1351/2285] linux-testing: 4.5-rc3 -> 4.5-rc4

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 8dc55f6e6a84..5b2034d21915 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.5-rc3";
-  modDirVersion = "4.5.0-rc3";
+  version = "4.5-rc4";
+  modDirVersion = "4.5.0-rc4";
   extraMeta.branch = "4.5";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "fae5b3b318d6ca7d142b2947e8df3e4091e2330dc509ba19503abf4b9c314986";
+    sha256 = "02kzcz2gblbjr0ixjdbwdbk4yix8wyd0xjpqk5mk78132pgj3w0a";
   };
 
   features.iwlwifi = true;

From edd63763e158d55caf90dfa4f5caf979cf85e560 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= <deroiste@syslab.com>
Date: Mon, 15 Feb 2016 00:42:16 +0100
Subject: [PATCH 1352/2285] Jamin: adjust to standard code conventions

---
 pkgs/applications/audio/jamin/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/jamin/default.nix b/pkgs/applications/audio/jamin/default.nix
index d9f79a754fac..4af53389ffdf 100644
--- a/pkgs/applications/audio/jamin/default.nix
+++ b/pkgs/applications/audio/jamin/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, fftwFloat, gtk2, ladspaPlugins, libjack2, liblo, libxml2
-, makeWrapper, pkgconfig, perl, perlXMLParser }:
+, makeWrapper, pkgconfig, perl, perlXMLParser
+}:
 
 stdenv.mkDerivation {
   name = "jamin-0.95.0";
@@ -9,11 +10,13 @@ stdenv.mkDerivation {
     sha256 = "0g5v74cm0q3p3pzl6xmnp4rqayaymfli7c6z8s78h9rgd24fwbvn";
   };
 
-  buildInputs = [ fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2
-  pkgconfig perl perlXMLParser makeWrapper ];
+  buildInputs = [
+    fftwFloat gtk2 ladspaPlugins libjack2 liblo libxml2 pkgconfig perl
+    perlXMLParser makeWrapper
+  ];
   
   postInstall = ''
-      wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa
+    wrapProgram $out/bin/jamin --set LADSPA_PATH ${ladspaPlugins}/lib/ladspa
   '';
 
   meta = with stdenv.lib; {

From 7b91d708af39fb7a7a1e6d6d08968880d863096b Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Mon, 15 Feb 2016 01:07:15 +0100
Subject: [PATCH 1353/2285] qtox: 20151221 -> 1.2.4, libtoxcore-dev: 20160105
 -> 20160131

---
 .../instant-messengers/qtox/default.nix         | 17 ++++++++++-------
 .../libraries/libtoxcore/new-api/default.nix    |  7 +++----
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 72619e417adb..541fb5727ced 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, fetchgit, pkgconfig, libtoxcore-dev, openal, opencv,
+{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, openal, opencv,
   libsodium, libXScrnSaver, glib, gdk_pixbuf, gtk2, cairo,
   pango, atk, qrencode, ffmpeg, filter-audio, makeWrapper,
   qtbase, qtsvg, qttools, qttranslations, sqlcipher }:
 
 let
-  revision = "8b671916abdcc1d553a367a502b23ec4ea7568a1";
+  version = "1.2.4";
+  revision = "v${version}";
 in
 
 stdenv.mkDerivation rec {
-  name = "qtox-dev-20151221";
+  name = "qtox-${version}";
 
-  src = fetchgit {
-      url = "https://github.com/tux3/qTox.git";
-      rev = "${revision}";
-      md5 = "a93a63d35e506be4b21abda0986f19e7";
+  src = fetchFromGitHub {
+      owner = "tux3";
+      repo = "qTox";
+      rev = revision;
+      sha256 = "0iqnl00kmbpf3pn6z38n3cjzzsqpw2793j60c24kkrydapihknz9";
   };
 
   buildInputs =
@@ -37,6 +39,7 @@ stdenv.mkDerivation rec {
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags cairo)"
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags pango)"
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags atk)"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE $(pkg-config --cflags sqlcipher)"
   '';
 
   configurePhase = ''
diff --git a/pkgs/development/libraries/libtoxcore/new-api/default.nix b/pkgs/development/libraries/libtoxcore/new-api/default.nix
index d9c543efd6c3..5bb0427f1813 100644
--- a/pkgs/development/libraries/libtoxcore/new-api/default.nix
+++ b/pkgs/development/libraries/libtoxcore/new-api/default.nix
@@ -2,13 +2,13 @@
 , libvpx, check, libconfig, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "tox-core-dev-20160105";
+  name = "tox-core-dev-20160131";
 
   src = fetchFromGitHub {
     owner  = "irungentoo";
     repo   = "toxcore";
-    rev    = "b9ef24875ce1d9bf5f04f0164ae95f729330a295";
-    sha256 = "0hxwp4nk5an3a2pmha6x2729mxm57j52vnrsq47gir31c0hk6x2x";
+    rev    = "94cc8b11ff473064526737936f64b6f9a19c239d";
+    sha256 = "0njara08p5vmhs6kp04b7gxw8l6xrlmwnlb76n2g96v0rn0i9k2w";
   };
 
   NIX_LDFLAGS = "-lgcc_s";
@@ -52,4 +52,3 @@ stdenv.mkDerivation rec {
     platforms = platforms.all;
   };
 }
-

From 6b9ae8badaa5e3f24b13fd20e17458f0ff4169bb Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 15 Feb 2016 01:11:48 +0100
Subject: [PATCH 1354/2285] debian_devscripts: 2.15.10 -> 2.16.1

Changes:
http://metadata.ftp-master.debian.org/changelogs/main/d/devscripts/devscripts_2.16.1_changelog
---
 pkgs/tools/misc/debian-devscripts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/debian-devscripts/default.nix b/pkgs/tools/misc/debian-devscripts/default.nix
index 9a4dcae7dd26..9430b1349a1e 100644
--- a/pkgs/tools/misc/debian-devscripts/default.nix
+++ b/pkgs/tools/misc/debian-devscripts/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.15.10";
+  version = "2.16.1";
   name = "debian-devscripts-${version}";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/d/devscripts/devscripts_${version}.tar.xz";
-    sha256 = "1yb26xpjxp9q5vsjzc9bv8vydpx2rs1v0i7phxhylfjn0fgpfnc6";
+    sha256 = "096f26b0z6kwv47qy99gak40wcc8mp24n0nvqwgifcicr18qv4rz";
   };
 
   buildInputs = [ perl CryptSSLeay LWP unzip xz dpkg TimeDate DBFile 

From 54e82445cb49ec4af359905383fbf6c8606a61c3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 15 Feb 2016 01:18:35 +0100
Subject: [PATCH 1355/2285] miniupnpd: 1.9.20160209 -> 1.9.20160212

Changes:
- return error 729 - ConflictWithOtherMechanisms if IGD v2 is enabled.
- add iptc_init() check in iptcrdr.c/init_redirect()
- add update_portmapping() / update_portmapping_desc_timestamp() functions
- use Linux libuuid uuid_generate() / BSD uuid_create() API

Changes: https://github.com/miniupnp/miniupnp/blob/master/miniupnpd/Changelog.txt
---
 pkgs/tools/networking/miniupnpd/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index 7334ecc3e92e..8eb96913bcab 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, fetchurl, iptables, pkgconfig }:
+{ stdenv, fetchurl, iptables, libuuid, pkgconfig }:
 
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "miniupnpd-1.9.20160209";
+  name = "miniupnpd-1.9.20160212";
 
   src = fetchurl {
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "0r4giqsr39s17mn9lmmy3zawrfj7kj9im7nzv7mx3rgz2ncw092z";
+    sha256 = "1fsl46f7lrhpb597m0a905nwijpf188cchgg6pz39fx2mgjjjk9l";
     name = "${name}.tar.gz";
   };
 
-  buildInputs = [ iptables ];
+  buildInputs = [ iptables libuuid ];
   nativeBuildInputs= [ pkgconfig ];
 
-  NIX_CFLAGS_LINK = "-liptc";
-
   makefile = "Makefile.linux";
 
   buildFlags = "miniupnpd genuuid";

From ffef91e914ce8990884aae1c2fd38ea11b2b25f1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 13 Feb 2016 18:37:29 +0100
Subject: [PATCH 1356/2285] torbrowser: 5.5 -> 5.5.2

---
 pkgs/tools/security/tor/torbrowser.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix
index ced4d868ee03..dfde2b57aa69 100644
--- a/pkgs/tools/security/tor/torbrowser.nix
+++ b/pkgs/tools/security/tor/torbrowser.nix
@@ -16,13 +16,13 @@ let
 
 in stdenv.mkDerivation rec {
   name = "tor-browser-${version}";
-  version = "5.5";
+  version = "5.5.2";
 
   src = fetchurl {
     url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${if stdenv.is64bit then "64" else "32"}-${version}_en-US.tar.xz";
     sha256 = if stdenv.is64bit then
-      "0glv2zffls1as71idbfg3l34kmsv48f3sk59swl6k8l75nvxlzjk" else
-      "0xbsixxs1hj0ydmazgi796xgvlsvbrkh8vfgaiyqcvgx4vf4ggwf";
+      "1zb5fssy9c37cb0ab083f2jifw47wnck32nc6zpijmqm059yccxc" else
+      "1gjc6prx3n769nj4gzhfjrb2qpw3ypvsb3pp0a130db1ssgnzqqr";
   };
 
   desktopItem = makeDesktopItem {

From fe4b0a4801c35af316c643bebf51a6841e6e61b5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 7 Feb 2016 18:40:15 +0100
Subject: [PATCH 1357/2285] unbound service: retab

---
 nixos/modules/services/networking/unbound.nix | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
index 73b10c1d5611..677cc2ce0c3a 100644
--- a/nixos/modules/services/networking/unbound.nix
+++ b/nixos/modules/services/networking/unbound.nix
@@ -38,28 +38,28 @@ in
     services.unbound = {
 
       enable = mkOption {
-	default = false;
-	description = "Whether to enable the Unbound domain name server.";
+        default = false;
+        description = "Whether to enable the Unbound domain name server.";
       };
 
       allowedAccess = mkOption {
-	default = ["127.0.0.0/24"];
-	description = "What networks are allowed to use unbound as a resolver.";
+        default = ["127.0.0.0/24"];
+        description = "What networks are allowed to use unbound as a resolver.";
       };
 
       interfaces = mkOption {
-	default = [ "127.0.0.1" "::1" ];
-	description = "What addresses the server should listen on.";
+        default = [ "127.0.0.1" "::1" ];
+        description = "What addresses the server should listen on.";
       };
 
       forwardAddresses = mkOption {
-	default = [ ];
-	description = "What servers to forward queries to.";
+        default = [ ];
+        description = "What servers to forward queries to.";
       };
 
       extraConfig = mkOption {
-	default = "";
-	description = "Extra lines of unbound config.";
+        default = "";
+        description = "Extra lines of unbound config.";
       };
 
     };
@@ -88,9 +88,9 @@ in
 
       preStart = ''
         mkdir -m 0755 -p ${stateDir}/dev/
-	cp ${confFile} ${stateDir}/unbound.conf
-	chown unbound ${stateDir}
-	touch ${stateDir}/dev/random
+        cp ${confFile} ${stateDir}/unbound.conf
+        chown unbound ${stateDir}
+        touch ${stateDir}/dev/random
         ${pkgs.utillinux}/bin/mount --bind -n /dev/random ${stateDir}/dev/random
       '';
 

From 9ba533ee4a68db8afda83b6f6584424c1aee8b76 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 15 Feb 2016 03:37:45 +0100
Subject: [PATCH 1358/2285] unbound service: add types to options

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

diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
index 677cc2ce0c3a..bad0d2d4e858 100644
--- a/nixos/modules/services/networking/unbound.nix
+++ b/nixos/modules/services/networking/unbound.nix
@@ -39,26 +39,31 @@ in
 
       enable = mkOption {
         default = false;
+        type = types.bool;
         description = "Whether to enable the Unbound domain name server.";
       };
 
       allowedAccess = mkOption {
         default = ["127.0.0.0/24"];
+        type = types.listOf types.str;
         description = "What networks are allowed to use unbound as a resolver.";
       };
 
       interfaces = mkOption {
         default = [ "127.0.0.1" "::1" ];
+        type = types.listOf types.str;
         description = "What addresses the server should listen on.";
       };
 
       forwardAddresses = mkOption {
         default = [ ];
+        type = types.listOf types.str;
         description = "What servers to forward queries to.";
       };
 
       extraConfig = mkOption {
         default = "";
+        type = types.str;
         description = "Extra lines of unbound config.";
       };
 

From 483e78d0f078d9449f892058b914a864d80d09f8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 15 Feb 2016 03:35:25 +0100
Subject: [PATCH 1359/2285] unbound service: add fetching root anchor for
 DNSSEC

---
 nixos/modules/services/networking/unbound.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
index bad0d2d4e858..e154aed0843a 100644
--- a/nixos/modules/services/networking/unbound.nix
+++ b/nixos/modules/services/networking/unbound.nix
@@ -16,6 +16,11 @@ let
     "forward-zone:\n  name: .\n" +
     concatMapStrings (x: "  forward-addr: ${x}\n") cfg.forwardAddresses;
 
+  rootTrustAnchorFile = "${stateDir}/root.key";
+
+  trustAnchor = optionalString cfg.enableRootTrustAnchor
+    "auto-trust-anchor-file: ${rootTrustAnchorFile}";
+
   confFile = pkgs.writeText "unbound.conf" ''
     server:
       directory: "${stateDir}"
@@ -24,6 +29,7 @@ let
       pidfile: ""
       ${interfaces}
       ${access}
+      ${trustAnchor}
     ${cfg.extraConfig}
     ${forward}
   '';
@@ -61,6 +67,12 @@ in
         description = "What servers to forward queries to.";
       };
 
+      enableRootTrustAnchor = mkOption {
+        default = true;
+        type = types.bool;
+        description = "Use and update root trust anchor for DNSSEC validation.";
+      };
+
       extraConfig = mkOption {
         default = "";
         type = types.str;
@@ -94,7 +106,8 @@ in
       preStart = ''
         mkdir -m 0755 -p ${stateDir}/dev/
         cp ${confFile} ${stateDir}/unbound.conf
-        chown unbound ${stateDir}
+        ${pkgs.unbound}/bin/unbound-anchor -a ${rootTrustAnchorFile}
+        chown unbound ${stateDir} ${rootTrustAnchorFile}
         touch ${stateDir}/dev/random
         ${pkgs.utillinux}/bin/mount --bind -n /dev/random ${stateDir}/dev/random
       '';

From 7bf80c9875e0b9fba892c9e50046a9914bf172f5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 8 Feb 2016 02:20:00 +0100
Subject: [PATCH 1360/2285] unbound: 1.5.3 -> 1.5.7

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

diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index b15473ddf4c9..035b637031c7 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "unbound-${version}";
-  version = "1.5.3";
+  version = "1.5.7";
 
   src = fetchurl {
     url = "http://unbound.net/downloads/${name}.tar.gz";
-    sha256 = "1jly2apag4yg649w3flaq73wdrcfyxnhx5py9j73y7adxmswigbn";
+    sha256 = "1a0wfgp6wqpf7cxlcbprqhnjx6z9ywf0rhrpcf7x98l1mbjqh82b";
   };
 
   buildInputs = [ openssl expat libevent ];
@@ -21,11 +21,11 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ];
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Validating, recursive, and caching DNS resolver";
-    license = stdenv.lib.licenses.bsd3;
+    license = licenses.bsd3;
     homepage = http://www.unbound.net;
-    maintainers = [ stdenv.lib.maintainers.ehmry ];
+    maintainers = with maintainers; [ ehmry fpletz ];
     platforms = stdenv.lib.platforms.unix;
   };
 }

From f415c07703496a468ebee17e90b05f3b9a69cc93 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 15 Feb 2016 04:27:49 +0100
Subject: [PATCH 1361/2285] unbound: enable compilation with PIE & relro/now

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

diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 035b637031c7..4819c004c1b8 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -17,6 +17,8 @@ stdenv.mkDerivation rec {
     "--with-libevent=${libevent}"
     "--localstatedir=/var"
     "--sysconfdir=/etc"
+    "--enable-pie"
+    "--enable-relro-now"
   ];
 
   installFlags = [ "configfile=\${out}/etc/unbound/unbound.conf" ];

From 745a11fad56964b0ce6e9a7bf5a8baab745f9184 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Mon, 8 Feb 2016 10:53:02 +0200
Subject: [PATCH 1362/2285] connman: 1.30 -> 1.31

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

diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix
index 6142f53c0564..7af692f782e8 100644
--- a/pkgs/tools/networking/connman/default.nix
+++ b/pkgs/tools/networking/connman/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "connman-${version}";
-  version = "1.30";
+  version = "1.31";
   src = fetchgit {
     url = "git://git.kernel.org/pub/scm/network/connman/connman.git";
     rev = "refs/tags/${version}";
-    sha256 = "715474351e22b52334d37c146fd5eb87d692be8501d8dac33a0e330437235295";
+    sha256 = "90dab6b11841cb4b6400711d234b59fb4fad4e8778bed6e7ad3ac7ac135d6893";
   };
 
   buildInputs = [ autoconf automake libtool pkgconfig openconnect polkit

From bb4e68b9d48ba3e91c201165a43f8198848d702f Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Mon, 15 Feb 2016 10:22:12 +0100
Subject: [PATCH 1363/2285] easytag: 2.3.2 -> 2.4.1

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

diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix
index cb1def12dfd0..83ff7ecffa18 100644
--- a/pkgs/applications/audio/easytag/default.nix
+++ b/pkgs/applications/audio/easytag/default.nix
@@ -5,11 +5,12 @@
 
 stdenv.mkDerivation rec {
   name = "easytag-${version}";
-  version = "2.3.2";
+  majorVersion = "2.4";
+  version = "${majorVersion}.1";
 
   src = fetchurl {
-    url = "mirror://gnome/sources/easytag/2.3/${name}.tar.xz";
-    sha256 = "0bj3sj4yzlnhan38j84acs7qv27fl3xy4rdrfq6dnpz4q6qccm84";
+    url = "mirror://gnome/sources/easytag/${majorVersion}/${name}.tar.xz";
+    sha256 = "1mbpwp3lh6yz5xkaq3a329x4r3chmjsr83r349crhi1gax3mzvxr";
   };
 
   preFixup = ''

From 2099b95d9c13728d82a4982627ff3347aae8c4c0 Mon Sep 17 00:00:00 2001
From: = <anothersms@gmail.com>
Date: Fri, 12 Feb 2016 16:30:52 +0100
Subject: [PATCH 1364/2285] patchage: init at 1.0.1

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

diff --git a/pkgs/applications/audio/patchage/default.nix b/pkgs/applications/audio/patchage/default.nix
new file mode 100644
index 000000000000..1deb11d99258
--- /dev/null
+++ b/pkgs/applications/audio/patchage/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, alsaLib, boost, dbus_glib, fetchsvn, ganv, glibmm, gtk2
+, gtkmm, libjack2, pkgconfig, python2
+}:
+
+stdenv.mkDerivation rec {
+  name = "patchage-${version}";
+  version = "1.0.1";
+  src = fetchsvn {
+    url = http://svn.drobilla.net/lad/trunk/patchage/;
+    rev = "5821";
+    sha256 = "1ar64l0sg468qzxj7i6ppgfqjpm92awcp5lzskamrf3ln17lrgj7";
+  };
+
+  buildInputs = [
+    alsaLib boost dbus_glib ganv glibmm gtk2 gtkmm libjack2
+    pkgconfig python2
+  ];
+
+  configurePhase = "python waf configure --prefix=$out";
+  buildPhase = "python waf build";
+  installPhase = "python waf install";
+
+  meta = {
+    description = "Modular patch bay for Jack and ALSA systems";
+    homepage = http://non.tuxfamily.org;
+    license = stdenv.lib.licenses.lgpl3;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.nico202 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c6f9f104b7b..1e10fff0ffa7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2729,6 +2729,8 @@ let
 
   patch = gnupatch;
 
+  patchage = callPackage ../applications/audio/patchage { };
+
   pbzip2 = callPackage ../tools/compression/pbzip2 { };
 
   pciutils = callPackage ../tools/system/pciutils { };

From 55b18ac486336da8f9bfe352afd3fac564b2671b Mon Sep 17 00:00:00 2001
From: Marcin Falkiewicz <avalatron@gmail.com>
Date: Mon, 15 Feb 2016 11:22:29 +0100
Subject: [PATCH 1365/2285] thin-provisioning-tools: init at 0.6.1

---
 .../linux/thin-provisioning-tools/default.nix | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/os-specific/linux/thin-provisioning-tools/default.nix

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

From 314e4edf59880c138468f5a7c271fdee9a37843f Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Mon, 15 Feb 2016 13:15:48 +0100
Subject: [PATCH 1366/2285] qtile: 0.10.2 -> 0.10.4

---
 .../qtile/0002-Restore-PATH-and-PYTHONPATH.patch   | 14 ++++++--------
 .../applications/window-managers/qtile/default.nix |  4 ++--
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch b/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch
index ba408b1f05bb..b620bfb25014 100644
--- a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch
+++ b/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch
@@ -48,13 +48,14 @@ index 84f6a2d..da31b12 100755
  import logging
  import os
 diff --git a/libqtile/utils.py b/libqtile/utils.py
-index d5f975b..0fdb080 100644
+index 284089b..ec3539e 100644
 --- a/libqtile/utils.py
 +++ b/libqtile/utils.py
-@@ -208,3 +208,10 @@ def get_cache_dir():
-     if not os.path.exists(cache_directory):
-         os.makedirs(cache_directory)
-     return cache_directory
+@@ -227,3 +227,11 @@ def describe_attributes(obj, attrs, func=None):
+             pairs.append('%s=%s' % (attr, value))
+ 
+     return ', '.join(pairs)
++
 +
 +def restore_os_environment():
 +    pythonpath = os.environ.pop("QTILE_SAVED_PYTHONPATH", "")
@@ -62,6 +63,3 @@ index d5f975b..0fdb080 100644
 +    path = os.environ.pop("QTILE_SAVED_PATH", None)
 +    if path:
 +        os.environ["PATH"] = path
--- 
-2.6.3
-
diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix
index 3f38be669274..0dae8a76c77b 100644
--- a/pkgs/applications/window-managers/qtile/default.nix
+++ b/pkgs/applications/window-managers/qtile/default.nix
@@ -7,13 +7,13 @@ in
 
 buildPythonPackage rec {
   name = "qtile-${version}";
-  version = "0.10.3";
+  version = "0.10.4";
 
   src = fetchFromGitHub {
     owner = "qtile";
     repo = "qtile";
     rev = "v${version}";
-    sha256 = "02252sfcniijkpk5rfgb800wvdpl223xrx1bhrxpzgggpgfbnmn6";
+    sha256 = "0rwklzgkp3x242xql6qmfpfnhr788hd3jc1l80pc5ybxlwyfx59i";
   };
 
   patches = [

From fb1b8464f87a502603e07228aeee0e1a00dba145 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 15 Feb 2016 13:36:34 +0100
Subject: [PATCH 1367/2285] gpodder: 3.8.4 -> 3.9.0

Changes in 3.8.5 (without bug IDs):

 * vimeo: Fix vimeo feed discovery
 * vimeo: Allow both http and https URLs
 * youtube: Improve channel migration code
 * youtube: Fix cover art downloading
 * Make the YouTube key button link to the gPodder Wiki
 * Add pattern to YouTube feed URL list
 * CLI: Cleanup old downloads on CLI startup
 * Gtk UI: Fix model column data types
 * Device sync: Handle sync failure when no space left
 * model: Limit filenames to 120 characters for eCryptFS
 * rename_download: Add add_sortdate and add_podcast_title option
 * Remove the unused 'pipe' IPC module
 * Fix coverage usage
 * Use Travis CI for running basic sanity tests
 * Various small code improvements and fixes

Release announcement for 3.8.5:

http://blog.gpodder.org/2015/12/gpodder-385-casting-agents-and-cowgirls.html

Changes in 3.9.0 (without bug IDs):

 * Added Korean translation
 * Device sync: Only fail if we can determine free disk space
 * Enqueue episodes after download
 * Ubuntu AppIndicator extension: 'visible' config option
 * gpodder.download: Ignore non-ASCII content-disposition header
 * Win32-launcher: Remove download feature (works around Norton warning)
 * Remove WebUI, QML UI and MeeGo 1.2 Harmattan support
 * Remove broken Flattr integration (use gpodder.net's Flattr support)
 * Redesign about dialog
 * Preferences: Move video services to separate tab
 * Vimeo: Fix Vimeo integration

Release announcement for 3.9.0:

http://blog.gpodder.org/2016/02/gpodder-390-helium-levitator-released.html

Built and tested locally on my machine.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @svenkeidel
---
 pkgs/applications/audio/gpodder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index c2ea35105823..216259deb43f 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -7,11 +7,11 @@ let
   inherit (pythonPackages) coverage feedparser minimock sqlite3 dbus pygtk eyeD3;
 
 in buildPythonPackage rec {
-  name = "gpodder-3.8.4";
+  name = "gpodder-3.9.0";
 
   src = fetchurl {
     url = "http://gpodder.org/src/${name}.tar.gz";
-    sha256 = "0cjpk92qjsws7ddbnq0r2h7vm5019zlpafgbxwsgllmjzkknj6pn";
+    sha256 = "1ik954idi0ldnw0wrv7mm71smyb6x66332jxcaf1dxsl12ccm44l";
   };
 
   buildInputs = [

From d9470c9e194ba612133498d8b4259a6e23cb1d6a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 15 Feb 2016 14:16:01 +0100
Subject: [PATCH 1368/2285] gpodder: Clean up package expression

We don't need to wrap twice, because we can actually pass the additional
XDG_DATA_DIRS via makeWrapperArgs.

The reason why I'm doing this within the patchPhase is because we can't
add shell variables from the current builder to makeWrapperArgs as that
content is going to end up in the wrapper verbatim.

In addition to this, gpodder was trying to search for its own directory
using the current program name, which I guess was another reason for the
double-wrap. We fix this now by setting gpodder_dir explicitly in the
main script.

Another main change is that we no longer set the "pythonX.Y-" prefix, so
the derivation name now is just "gpodder-3.9.0".

Last but not least, we enable the unit tests for gpodder in checkPhase.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @svenkeidel
---
 pkgs/applications/audio/gpodder/default.nix | 55 +++++++++------------
 1 file changed, 24 insertions(+), 31 deletions(-)

diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index 216259deb43f..55337bf1d3ad 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -1,50 +1,43 @@
-{ pkgs, stdenv, fetchurl, python, buildPythonPackage, pythonPackages, mygpoclient, intltool,
-  ipodSupport ? true, libgpod, gnome3 }:
+{ stdenv, fetchurl, buildPythonPackage, pythonPackages, mygpoclient, intltool
+, ipodSupport ? true, libgpod
+, gnome3
+}:
 
-with pkgs.lib;
+buildPythonPackage rec {
+  name = "gpodder-${version}";
+  namePrefix = "";
 
-let
-  inherit (pythonPackages) coverage feedparser minimock sqlite3 dbus pygtk eyeD3;
-
-in buildPythonPackage rec {
-  name = "gpodder-3.9.0";
+  version = "3.9.0";
 
   src = fetchurl {
     url = "http://gpodder.org/src/${name}.tar.gz";
     sha256 = "1ik954idi0ldnw0wrv7mm71smyb6x66332jxcaf1dxsl12ccm44l";
   };
 
+  postPatch = with stdenv.lib; ''
+    sed -i -re 's,^( *gpodder_dir *= *).*,\1"'"$out"'",' bin/gpodder
+
+    makeWrapperArgs="--suffix XDG_DATA_DIRS : '${concatStringsSep ":" [
+      "${gnome3.gnome_themes_standard}/share"
+      "$XDG_ICON_DIRS"
+      "$GSETTINGS_SCHEMAS_PATH"
+    ]}'"
+  '';
+
   buildInputs = [
-    coverage minimock sqlite3 mygpoclient intltool
+    intltool pythonPackages.coverage pythonPackages.minimock
     gnome3.gnome_themes_standard gnome3.defaultIconTheme
     gnome3.gsettings_desktop_schemas
   ];
 
-  propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ];
+  propagatedBuildInputs = with pythonPackages; [
+    feedparser dbus mygpoclient sqlite3 pygtk eyeD3
+  ] ++ stdenv.lib.optional ipodSupport libgpod;
 
-  pythonPath = [ feedparser dbus mygpoclient sqlite3 pygtk eyeD3 ]
-    ++ stdenv.lib.optional ipodSupport libgpod;
-
-  postPatch = "sed -ie 's/PYTHONPATH=src/PYTHONPATH=\$(PYTHONPATH):src/' makefile";
-
-  preFixup = ''
-    wrapProgram $out/bin/gpodder \
-      --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+  checkPhase = ''
+    LC_ALL=C python -m gpodder.unittests
   '';
 
-  # The `wrapPythonPrograms` script in the postFixup phase breaks gpodder. The
-  # easiest way to fix this is to call wrapPythonPrograms and then to clean up
-  # the wrapped file.
-  postFixup = ''
-    wrapPythonPrograms
-
-    sed -i "$out/bin/..gpodder-wrapped-wrapped" -e '{
-        /import sys; sys.argv/d
-    }'
-  '';
-
-  installPhase = "DESTDIR=/ PREFIX=$out make install";
-
   meta = {
     description = "A podcatcher written in python";
     longDescription = ''

From 2d3940bd662f0bb858a2da7c2f9bfa28743f5544 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Wed, 10 Feb 2016 10:45:47 +0100
Subject: [PATCH 1369/2285] scrot: 0.8 -> 0.8-17 (Debian patches), fixes #12954

---
 pkgs/tools/graphics/scrot/default.nix | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix
index aa8958bb63df..55a63712c1ec 100644
--- a/pkgs/tools/graphics/scrot/default.nix
+++ b/pkgs/tools/graphics/scrot/default.nix
@@ -1,13 +1,27 @@
-{ stdenv, fetchurl, giblib, xlibsWrapper }:
+{ stdenv, fetchurl, fetchzip, giblib, xlibsWrapper }:
 
+let
+  debPatch = fetchzip {
+    url = mirror://debian/pool/main/s/scrot/scrot_0.8-17.debian.tar.xz;
+    sha256 = "0ydsr3vah5wkcbnp91knkdbil4hx0cn0iy57frl03azqzc29bkw5";
+  };
+in
 stdenv.mkDerivation rec {
-  name = "scrot-0.8";
+  name = "scrot-0.8-17";
 
   src = fetchurl {
     url = "http://linuxbrit.co.uk/downloads/${name}.tar.gz";
     sha256 = "1wll744rhb49lvr2zs6m93rdmiq59zm344jzqvijrdn24ksiqgb1";
   };
 
+  inherit debPatch;
+
+  postPatch = ''
+    for patch in $(cat $debPatch/patches/series); do
+      patch -p1 < "$debPatch/patches/$patch"
+    done
+  '';
+
   buildInputs = [ giblib xlibsWrapper ];
 
   meta = {

From 6b1a91e04f7f1017700a7f16301574500529088c Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Mon, 15 Feb 2016 15:46:51 +0100
Subject: [PATCH 1370/2285] scrot: adding garbas as maintainer

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

diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix
index 55a63712c1ec..5e4fd3ff0624 100644
--- a/pkgs/tools/graphics/scrot/default.nix
+++ b/pkgs/tools/graphics/scrot/default.nix
@@ -24,9 +24,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ giblib xlibsWrapper ];
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = http://linuxbrit.co.uk/scrot/;
     description = "A command-line screen capture utility";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ garbas ];
   };
 }

From bc00989ca54f94bb9cef0ed731f11a3f35f80fe2 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 15 Feb 2016 15:37:23 +0100
Subject: [PATCH 1371/2285] simple-scan: 3.19.4 -> 3.19.90

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

diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index 5f8a8ac6b9ae..658df21a6545 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   name = "simple-scan-${version}";
-  version = "3.19.4";
+  version = "3.19.90";
 
   src = fetchurl {
-    sha256 = "1v9sify1s38qd5sfg26m7sdg9bkrfmai2nijs4wzah7xa9p23c83";
+    sha256 = "16s8855sqrn5iiirpqva0mys8abfpzk9xryrb6rpjbynvx2lanmd";
     url = "https://launchpad.net/simple-scan/3.19/${version}/+download/${name}.tar.xz";
   };
 

From 20c31e65ab922f4b079c056dae3a0e28a01920de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 15 Feb 2016 17:05:31 +0100
Subject: [PATCH 1372/2285] libva: use a cleaner installation method

(cherry-picked from commit 8ea5563011ee202eda146e2cc8f8754f239303cf)
Tweaked not to cause a mass rebuild ATM.
---
 pkgs/development/libraries/libva/default.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix
index e04c3b9828d8..3b4c62356864 100644
--- a/pkgs/development/libraries/libva/default.nix
+++ b/pkgs/development/libraries/libva/default.nix
@@ -21,16 +21,11 @@ stdenv.mkDerivation rec {
 
   configureFlags = lib.optionals (!minimal) [
     "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri"
-     "--enable-glx" 
-   ];
+    "--enable-glx"
+  ];
 
-   installFlags = lib.optional (!minimal) "DESTDIR=$(out)";
-
-  postInstall = lib.optionalString (!minimal) ''
-    cp -r $out/${mesa_noglu.driverLink}/* $out
-    cp -r $out/$out/* $out
-    rm -rf $out/run $out/$(echo "$out" | cut -d "/" -f2)
-  '';
+  installFlags = lib.optional (!minimal) "dummy_drv_video_ladir=$(out)/lib/dri";
+  postInstall = "";
 
   meta = with stdenv.lib; {
     homepage = http://www.freedesktop.org/wiki/Software/vaapi;

From f4a32be72988441cc67d0325cd85991505f547e2 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Sun, 14 Feb 2016 22:14:00 +0100
Subject: [PATCH 1373/2285] love: 0.8 -> 0.10.1

---
 pkgs/development/interpreters/love/0.10.nix   | 38 +++++++++++++++++++
 .../love/{default.nix => 0.8.nix}             |  0
 pkgs/top-level/all-packages.nix               |  5 ++-
 3 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/interpreters/love/0.10.nix
 rename pkgs/development/interpreters/love/{default.nix => 0.8.nix} (100%)

diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix
new file mode 100644
index 000000000000..ed5aa1e60de3
--- /dev/null
+++ b/pkgs/development/interpreters/love/0.10.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, mesa, openal, luajit,
+  libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg,
+  libtheora, which, autoconf, automake, libtool
+}:
+
+let
+  pname = "love";
+  version = "0.10.1";
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+  src = fetchFromBitbucket {
+    owner = "rude";
+    repo = "love";
+    rev = "${version}";
+    sha256 = "10a2kkyx7x9jkcj9xrqgmvp0b6gbapjqjx9fib9f6a0nbz0xaswj";
+  };
+
+  buildInputs = [
+    pkgconfig SDL2 mesa openal luajit libdevil freetype physfs libmodplug mpg123
+    libvorbis libogg libtheora autoconf which libtool automake
+  ];
+
+  preConfigure = "$shell ./platform/unix/automagic";
+
+  configureFlags = [
+    "--with-lua=luajit"
+  ];
+
+  meta = {
+    homepage = "http://love2d.org";
+    description = "A Lua-based 2D game engine/scripting language";
+    license = stdenv.lib.licenses.zlib;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+  };
+}
diff --git a/pkgs/development/interpreters/love/default.nix b/pkgs/development/interpreters/love/0.8.nix
similarity index 100%
rename from pkgs/development/interpreters/love/default.nix
rename to pkgs/development/interpreters/love/0.8.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 298bbfc18007..b16ae4744f23 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5221,9 +5221,10 @@ let
 
   lolcode = callPackage ../development/interpreters/lolcode { };
 
-  love = callPackage ../development/interpreters/love {lua=lua5_1;};
-  love_luajit = callPackage ../development/interpreters/love {lua=luajit;};
+  love_0_8 = callPackage ../development/interpreters/love/0.8.nix { };
   love_0_9 = callPackage ../development/interpreters/love/0.9.nix { };
+  love_0_10 = callPackage ../development/interpreters/love/0.10.nix { };
+  love = love_0_10;
 
   ### LUA MODULES
 

From 50bd1a0e8f388ba64b5f8fca39ed332c051ff7b2 Mon Sep 17 00:00:00 2001
From: Christoph-Simon Senjak <christoph.senjak@googlemail.com>
Date: Fri, 12 Feb 2016 14:40:49 +0100
Subject: [PATCH 1374/2285] bluez-tools: init 2015-09-10 (close #12936)

vcunat only fixed whitespace and changed the authorship e-mail
from dummy address you@example.com to the one recorded in maintainers.nix.
(Now github should recognize the commit as yours.)
---
 lib/maintainers.nix                          |  1 +
 pkgs/tools/bluetooth/bluez-tools/default.nix | 24 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 3 files changed, 27 insertions(+)
 create mode 100644 pkgs/tools/bluetooth/bluez-tools/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index e9a55ef834d0..89fe97f5feb5 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -75,6 +75,7 @@
   cstrahan = "Charles Strahan <charles.c.strahan@gmail.com>";
   cwoac = "Oliver Matthews <oliver@codersoffortune.net>";
   DamienCassou = "Damien Cassou <damien@cassou.me>";
+  dasuxullebt = "Christoph-Simon Senjak <christoph.senjak@googlemail.com>";
   davidak = "David Kleuker <post@davidak.de>";
   davidrusu = "David Rusu <davidrusu.me@gmail.com>";
   dbohdan = "Danyil Bohdan <danyil.bohdan@gmail.com>";
diff --git a/pkgs/tools/bluetooth/bluez-tools/default.nix b/pkgs/tools/bluetooth/bluez-tools/default.nix
new file mode 100644
index 000000000000..4469ba67b3b8
--- /dev/null
+++ b/pkgs/tools/bluetooth/bluez-tools/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, autoconf, automake, glib, pkgconfig, readline, fetchgit }:
+
+stdenv.mkDerivation rec {
+  date    = "2015-09-10";
+  name    = "bluez-tools-${date}";
+  rev     = "193ad6bb3db";
+
+  src = fetchgit {
+    inherit rev;
+    url    = "https://github.com/khvzak/bluez-tools.git";
+    sha256 = "3f264d14ba8ef1b0d3c45e621a5c685035a60d789da64f64d25055047f45c55b";
+  };
+  preConfigure = ''
+    ./autogen.sh
+  '';
+  buildInputs = [ stdenv autoconf automake glib pkgconfig readline ];
+
+  meta = with stdenv.lib; {
+    description = "Command line bluetooth manager for Bluez5";
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ maintainers.dasuxullebt ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0df4ce21a6e7..6f17bdab5281 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -721,6 +721,8 @@ let
 
   blockdiag = pythonPackages.blockdiag;
 
+  bluez-tools = callPackage ../tools/bluetooth/bluez-tools { };
+
   bmon = callPackage ../tools/misc/bmon { };
 
   bochs = callPackage ../applications/virtualization/bochs { };

From eef111fee8215895afe0b34e96a4dc910d27d1f1 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 15 Feb 2016 17:04:37 +0100
Subject: [PATCH 1375/2285] checkstyle: 6.14.1 -> 6.15

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

diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index 8341f1a5bd90..f9131cf2af28 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "6.14.1";
+  version = "6.15";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
-    sha256 = "1dcg7libqs797v6x5vdvvc44rqfvwcjh125wczy9v87nl8imc2l3";
+    sha256 = "1bazjgfr1mq6qfg4nmack467zg7s4z8v7zfzw46d2dk04mv8y9b8";
   };
 
   installPhase = ''

From 29e819ab6f4566c9e0612fb8dd7bb126e13716a2 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 15 Feb 2016 17:11:58 +0100
Subject: [PATCH 1376/2285] colm: 0.12.0 -> 0.13.0.3

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

diff --git a/pkgs/development/compilers/colm/default.nix b/pkgs/development/compilers/colm/default.nix
index ebfee6c4188e..3a3670279c62 100644
--- a/pkgs/development/compilers/colm/default.nix
+++ b/pkgs/development/compilers/colm/default.nix
@@ -2,17 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "colm-${version}";
-  version = "0.12.0";
+  version = "0.13.0.3";
 
   src = fetchurl {
     url = "http://www.colm.net/files/colm/${name}.tar.gz";
-    sha256 = "0kbfipxv3nvggd1a2nahk3jg22iifp2l7lkm55i5r7qkpms5sm3v";
+    sha256 = "0dadfsnkbxcrf5kihvncbprb6w64jz2myylfmj952gdmcsim4zj2";
   };
 
   buildInputs = [ makeWrapper ];
 
   doCheck = true;
-  checkPhase = ''sh ./test/runtests.sh'';
 
   postInstall = ''
     wrapProgram $out/bin/colm \

From abb07a9cdce36bce51fd9b0c6dcb9f8f26d53807 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 15 Feb 2016 17:34:52 +0100
Subject: [PATCH 1377/2285] pdfpc: 4.0.1 -> 4.0.2

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

diff --git a/pkgs/applications/misc/pdfpc/default.nix b/pkgs/applications/misc/pdfpc/default.nix
index 9e908b5a2db0..7dceaeb8a969 100644
--- a/pkgs/applications/misc/pdfpc/default.nix
+++ b/pkgs/applications/misc/pdfpc/default.nix
@@ -4,13 +4,13 @@
 stdenv.mkDerivation rec {
   name = "${product}-${version}";
   product = "pdfpc";
-  version = "4.0.1";
+  version = "4.0.2";
 
   src = fetchFromGitHub {
     repo = "pdfpc";
     owner = "pdfpc";
     rev = "v${version}";
-    sha256 = "06m30xz9jzfj6ljnsgqqg1myj13nqpc7ria9wr8aa62kp4n7bcfp";
+    sha256 = "0151i9msagcqcfaddgd1vkmman0qgqy6s3714sqas568r4r9ngdk";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];

From 5a7324ba131c725a178d5b01890c601a18cedc46 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 15 Feb 2016 16:47:58 +0000
Subject: [PATCH 1378/2285] kotlin: 1.0.0-rc-1036 -> 1.0.0

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

diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index a6f5dcc21592..2433f5ab5797 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -1,16 +1,16 @@
-{ stdenv, fetchurl, makeWrapper, jre, unzip }:
+{ stdenv, fetchurl, makeWrapper, jre, unzip, which }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.0-rc-1036";
+  version = "1.0.0";
   name = "kotlin-${version}";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/build-${version}/kotlin-compiler-${version}.zip";
-    sha256 = "8d72ff925678a2172fbbefcb6f0c5a195a300dccf240e5add16c3e8d86e13d67";
+    sha256 = "0dp5mab35sv3nsgj488ibyn6x6xw2rka76s7kygbhqhjc429kpgy";
   };
 
   propagatedBuildInputs = [ jre ] ;
-  buildInputs = [ makeWrapper unzip ] ;
+  buildInputs = [ makeWrapper unzip which ] ;
 
   installPhase = ''
     mkdir -p $out

From 6d6f3311093386d1e2e45b4580ac2f0b8838477d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 15 Feb 2016 18:29:44 +0100
Subject: [PATCH 1379/2285] ragel: 6.9 -> 7.0.0.6

---
 pkgs/development/tools/parsing/ragel/default.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix
index e55a2015a705..0b3844ef5e9b 100644
--- a/pkgs/development/tools/parsing/ragel/default.nix
+++ b/pkgs/development/tools/parsing/ragel/default.nix
@@ -1,21 +1,26 @@
-{stdenv, fetchurl, transfig, texLiveAggregationFun, texLive, texLiveExtra, ghostscript
-, build-manual ? false
+{stdenv, fetchurl, transfig, texLiveAggregationFun, texLive, texLiveExtra
+, ghostscript, colm,  build-manual ? false
 }:
 
 stdenv.mkDerivation rec {
   name = "ragel-${version}";
-  version = "6.9";
+  version = "7.0.0.6";
 
   src = fetchurl {
     url = "http://www.colm.net/files/ragel/${name}.tar.gz";
-    sha256 = "02k6rwh8cr95f1p5sjjr3wa6dilg06572xz1v71dk8awmc7vw1vf";
+    sha256 = "1ns3kbcvhinn4rwm54ajg49d1la8filxskl3rgbwws0irzw507vs";
   };
 
-  buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript (texLiveAggregationFun { paths=[ texLive texLiveExtra ]; }) ];
+  buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript
+    (texLiveAggregationFun { paths=[ texLive texLiveExtra ]; }) ];
    
   preConfigure = stdenv.lib.optional build-manual ''
     sed -i "s/build_manual=no/build_manual=yes/g" DIST
   '';
+
+  configureFlags = [ "--with-colm=${colm}" ];
+
+  doCheck = true;
   
   meta = with stdenv.lib; {
     homepage = http://www.complang.org/ragel;

From 72161f6810c9282d1bb3c2a6d8d676cbe80422c8 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 15 Feb 2016 18:34:31 +0100
Subject: [PATCH 1380/2285] ragel: use new texlive infrastructure

---
 pkgs/development/tools/parsing/ragel/default.nix | 6 ++----
 pkgs/top-level/all-packages.nix                  | 4 +++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix
index 0b3844ef5e9b..594ec7de53a2 100644
--- a/pkgs/development/tools/parsing/ragel/default.nix
+++ b/pkgs/development/tools/parsing/ragel/default.nix
@@ -1,5 +1,4 @@
-{stdenv, fetchurl, transfig, texLiveAggregationFun, texLive, texLiveExtra
-, ghostscript, colm,  build-manual ? false
+{stdenv, fetchurl, transfig, tex , ghostscript, colm,  build-manual ? false
 }:
 
 stdenv.mkDerivation rec {
@@ -11,8 +10,7 @@ stdenv.mkDerivation rec {
     sha256 = "1ns3kbcvhinn4rwm54ajg49d1la8filxskl3rgbwws0irzw507vs";
   };
 
-  buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript
-    (texLiveAggregationFun { paths=[ texLive texLiveExtra ]; }) ];
+  buildInputs = stdenv.lib.optional build-manual [ transfig ghostscript tex ];
    
   preConfigure = stdenv.lib.optional build-manual ''
     sed -i "s/build_manual=no/build_manual=yes/g" DIST
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c2b752ab5dcb..c4b95ea44c62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6062,7 +6062,9 @@ let
   };
 
 
-  ragel = callPackage ../development/tools/parsing/ragel { };
+  ragel = callPackage ../development/tools/parsing/ragel {
+    tex = texlive.combined.scheme-small;
+  };
 
   hammer = callPackage ../development/tools/parsing/hammer { };
 

From 7c7b08add4965e082a05396217abad035b41129a Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 9 Feb 2016 12:03:25 +0100
Subject: [PATCH 1381/2285] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20151217-10-ga610b1b using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/94492ca8484ac1cc1962d42050ff6cdc145665f6
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/b3a9ab4a6048a52dbabe68389d8edc10062ee925
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/e7c362999942041130d6f66c30289bd6be0430a3
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/b98e7e2d4fc1c47179a362d16d98290990eb8c28
---
 .../haskell-modules/configuration-lts-0.0.nix |   22 +
 .../haskell-modules/configuration-lts-0.1.nix |   22 +
 .../haskell-modules/configuration-lts-0.2.nix |   22 +
 .../haskell-modules/configuration-lts-0.3.nix |   22 +
 .../haskell-modules/configuration-lts-0.4.nix |   22 +
 .../haskell-modules/configuration-lts-0.5.nix |   22 +
 .../haskell-modules/configuration-lts-0.6.nix |   22 +
 .../haskell-modules/configuration-lts-0.7.nix |   22 +
 .../haskell-modules/configuration-lts-1.0.nix |   22 +
 .../haskell-modules/configuration-lts-1.1.nix |   22 +
 .../configuration-lts-1.10.nix                |   22 +
 .../configuration-lts-1.11.nix                |   22 +
 .../configuration-lts-1.12.nix                |   22 +
 .../configuration-lts-1.13.nix                |   22 +
 .../configuration-lts-1.14.nix                |   22 +
 .../configuration-lts-1.15.nix                |   22 +
 .../haskell-modules/configuration-lts-1.2.nix |   22 +
 .../haskell-modules/configuration-lts-1.4.nix |   22 +
 .../haskell-modules/configuration-lts-1.5.nix |   22 +
 .../haskell-modules/configuration-lts-1.7.nix |   22 +
 .../haskell-modules/configuration-lts-1.8.nix |   22 +
 .../haskell-modules/configuration-lts-1.9.nix |   22 +
 .../haskell-modules/configuration-lts-2.0.nix |   24 +
 .../haskell-modules/configuration-lts-2.1.nix |   24 +
 .../configuration-lts-2.10.nix                |   24 +
 .../configuration-lts-2.11.nix                |   24 +
 .../configuration-lts-2.12.nix                |   24 +
 .../configuration-lts-2.13.nix                |   24 +
 .../configuration-lts-2.14.nix                |   24 +
 .../configuration-lts-2.15.nix                |   24 +
 .../configuration-lts-2.16.nix                |   25 +
 .../configuration-lts-2.17.nix                |   25 +
 .../configuration-lts-2.18.nix                |   25 +
 .../configuration-lts-2.19.nix                |   25 +
 .../haskell-modules/configuration-lts-2.2.nix |   24 +
 .../configuration-lts-2.20.nix                |   25 +
 .../configuration-lts-2.21.nix                |   25 +
 .../configuration-lts-2.22.nix                |   25 +
 .../haskell-modules/configuration-lts-2.3.nix |   24 +
 .../haskell-modules/configuration-lts-2.4.nix |   24 +
 .../haskell-modules/configuration-lts-2.5.nix |   24 +
 .../haskell-modules/configuration-lts-2.6.nix |   24 +
 .../haskell-modules/configuration-lts-2.7.nix |   24 +
 .../haskell-modules/configuration-lts-2.8.nix |   24 +
 .../haskell-modules/configuration-lts-2.9.nix |   24 +
 .../haskell-modules/configuration-lts-3.0.nix |   28 +
 .../haskell-modules/configuration-lts-3.1.nix |   28 +
 .../configuration-lts-3.10.nix                |   35 +
 .../configuration-lts-3.11.nix                |   36 +
 .../configuration-lts-3.12.nix                |   37 +
 .../configuration-lts-3.13.nix                |   37 +
 .../configuration-lts-3.14.nix                |   37 +
 .../configuration-lts-3.15.nix                |   37 +
 .../configuration-lts-3.16.nix                |   38 +
 .../configuration-lts-3.17.nix                |   38 +
 .../configuration-lts-3.18.nix                |   39 +
 .../configuration-lts-3.19.nix                |   39 +
 .../haskell-modules/configuration-lts-3.2.nix |   29 +
 .../configuration-lts-3.20.nix                |   40 +
 .../configuration-lts-3.21.nix                |   40 +
 .../configuration-lts-3.22.nix                |   41 +
 .../haskell-modules/configuration-lts-3.3.nix |   29 +
 .../haskell-modules/configuration-lts-3.4.nix |   29 +
 .../haskell-modules/configuration-lts-3.5.nix |   30 +
 .../haskell-modules/configuration-lts-3.6.nix |   30 +
 .../haskell-modules/configuration-lts-3.7.nix |   32 +
 .../haskell-modules/configuration-lts-3.8.nix |   33 +
 .../haskell-modules/configuration-lts-3.9.nix |   33 +
 .../haskell-modules/configuration-lts-4.0.nix |   55 +
 .../haskell-modules/configuration-lts-4.1.nix |   55 +
 .../haskell-modules/configuration-lts-4.2.nix |   56 +
 .../haskell-modules/configuration-lts-5.0.nix |   67 +
 .../haskell-modules/configuration-lts-5.1.nix |   72 +
 .../haskell-modules/configuration-lts-5.2.nix |   76 +-
 .../haskell-modules/hackage-packages.nix      | 2713 ++++++++++++++---
 75 files changed, 4437 insertions(+), 495 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index 4dc205d8973d..64ea9e9b6f79 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -822,6 +822,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1498,6 +1499,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2129,6 +2131,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2482,6 +2485,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2506,6 +2510,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3175,6 +3180,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_0";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3350,6 +3356,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4126,6 +4133,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_4_0";
   "hasql-backend" = doDistribute super."hasql-backend_0_2_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4458,6 +4466,9 @@ self: super: {
   "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";
@@ -5920,6 +5931,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = dontDistribute super."multiarg";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6180,6 +6192,7 @@ self: super: {
   "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";
@@ -6255,6 +6268,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6692,6 +6706,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6871,6 +6886,7 @@ self: super: {
   "random-fu" = doDistribute super."random-fu_0_2_6_1";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -7026,6 +7042,9 @@ self: super: {
   "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";
@@ -7205,6 +7224,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8263,6 +8283,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8579,6 +8600,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_2";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-buffer" = dontDistribute super."vector-buffer";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index 6cc26a6686e3..b2bf2ceecbbc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -822,6 +822,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1498,6 +1499,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2129,6 +2131,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2482,6 +2485,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2506,6 +2510,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3175,6 +3180,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_0";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3350,6 +3356,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4126,6 +4133,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_4_0";
   "hasql-backend" = doDistribute super."hasql-backend_0_2_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4458,6 +4466,9 @@ self: super: {
   "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";
@@ -5920,6 +5931,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = dontDistribute super."multiarg";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6180,6 +6192,7 @@ self: super: {
   "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";
@@ -6255,6 +6268,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6692,6 +6706,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6871,6 +6886,7 @@ self: super: {
   "random-fu" = doDistribute super."random-fu_0_2_6_1";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -7026,6 +7042,9 @@ self: super: {
   "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";
@@ -7205,6 +7224,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8263,6 +8283,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8579,6 +8600,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_2";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-buffer" = dontDistribute super."vector-buffer";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 063b2a48a5d1..67982120f408 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -822,6 +822,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1498,6 +1499,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2129,6 +2131,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2482,6 +2485,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2506,6 +2510,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3175,6 +3180,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_0";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3350,6 +3356,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4126,6 +4133,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_4_0";
   "hasql-backend" = doDistribute super."hasql-backend_0_2_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4458,6 +4466,9 @@ self: super: {
   "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";
@@ -5920,6 +5931,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = dontDistribute super."multiarg";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6180,6 +6192,7 @@ self: super: {
   "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";
@@ -6255,6 +6268,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6692,6 +6706,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6871,6 +6886,7 @@ self: super: {
   "random-fu" = doDistribute super."random-fu_0_2_6_1";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -7026,6 +7042,9 @@ self: super: {
   "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";
@@ -7205,6 +7224,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8263,6 +8283,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8579,6 +8600,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_2";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-buffer" = dontDistribute super."vector-buffer";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index 17c987efd933..b8965141bec3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -822,6 +822,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1498,6 +1499,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2129,6 +2131,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2482,6 +2485,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2506,6 +2510,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3175,6 +3180,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_0";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3350,6 +3356,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4126,6 +4133,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_4_0";
   "hasql-backend" = doDistribute super."hasql-backend_0_2_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4458,6 +4466,9 @@ self: super: {
   "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";
@@ -5920,6 +5931,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = dontDistribute super."multiarg";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6180,6 +6192,7 @@ self: super: {
   "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";
@@ -6255,6 +6268,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6692,6 +6706,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6871,6 +6886,7 @@ self: super: {
   "random-fu" = doDistribute super."random-fu_0_2_6_1";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -7026,6 +7042,9 @@ self: super: {
   "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";
@@ -7205,6 +7224,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8263,6 +8283,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8579,6 +8600,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_2";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-buffer" = dontDistribute super."vector-buffer";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index c430217eb7e1..03bf57f3aa21 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -822,6 +822,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1498,6 +1499,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2129,6 +2131,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2482,6 +2485,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2506,6 +2510,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3174,6 +3179,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_0";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3349,6 +3355,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4123,6 +4130,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_4_1";
   "hasql-backend" = doDistribute super."hasql-backend_0_2_2";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4455,6 +4463,9 @@ self: super: {
   "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";
@@ -5917,6 +5928,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = dontDistribute super."multiarg";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6177,6 +6189,7 @@ self: super: {
   "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";
@@ -6252,6 +6265,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6689,6 +6703,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6868,6 +6883,7 @@ self: super: {
   "random-fu" = doDistribute super."random-fu_0_2_6_1";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -7023,6 +7039,9 @@ self: super: {
   "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";
@@ -7201,6 +7220,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8259,6 +8279,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8575,6 +8596,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_2";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-buffer" = dontDistribute super."vector-buffer";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index 8d76c7cfdd73..9e0026afb0b5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -822,6 +822,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1498,6 +1499,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2129,6 +2131,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2482,6 +2485,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2506,6 +2510,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3174,6 +3179,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_0";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3349,6 +3355,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4123,6 +4130,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_4_1";
   "hasql-backend" = doDistribute super."hasql-backend_0_2_2";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4455,6 +4463,9 @@ self: super: {
   "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";
@@ -5917,6 +5928,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = dontDistribute super."multiarg";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6177,6 +6189,7 @@ self: super: {
   "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";
@@ -6252,6 +6265,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6689,6 +6703,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6868,6 +6883,7 @@ self: super: {
   "random-fu" = doDistribute super."random-fu_0_2_6_1";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -7023,6 +7039,9 @@ self: super: {
   "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";
@@ -7201,6 +7220,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8259,6 +8279,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8575,6 +8596,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_2";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-buffer" = dontDistribute super."vector-buffer";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index c52414a8319a..24208bf0d225 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -821,6 +821,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1497,6 +1498,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2128,6 +2130,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2481,6 +2484,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2505,6 +2509,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3173,6 +3178,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_0";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3348,6 +3354,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4122,6 +4129,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_4_1";
   "hasql-backend" = doDistribute super."hasql-backend_0_2_2";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4453,6 +4461,9 @@ self: super: {
   "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";
@@ -5915,6 +5926,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = dontDistribute super."multiarg";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6174,6 +6186,7 @@ self: super: {
   "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";
@@ -6249,6 +6262,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6686,6 +6700,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6865,6 +6880,7 @@ self: super: {
   "random-fu" = doDistribute super."random-fu_0_2_6_1";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -7019,6 +7035,9 @@ self: super: {
   "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";
@@ -7197,6 +7216,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8255,6 +8275,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8571,6 +8592,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_2";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-buffer" = dontDistribute super."vector-buffer";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index 1c609caa978a..5ca65df38d5d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -821,6 +821,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1497,6 +1498,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2128,6 +2130,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2481,6 +2484,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2505,6 +2509,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3173,6 +3178,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_0";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3348,6 +3354,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4122,6 +4129,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_4_1";
   "hasql-backend" = doDistribute super."hasql-backend_0_2_2";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_7_3";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4453,6 +4461,9 @@ self: super: {
   "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";
@@ -5915,6 +5926,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = dontDistribute super."multiarg";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6174,6 +6186,7 @@ self: super: {
   "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";
@@ -6249,6 +6262,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6686,6 +6700,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6865,6 +6880,7 @@ self: super: {
   "random-fu" = doDistribute super."random-fu_0_2_6_1";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -7019,6 +7035,9 @@ self: super: {
   "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";
@@ -7197,6 +7216,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8255,6 +8275,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8571,6 +8592,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_2";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-buffer" = dontDistribute super."vector-buffer";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index 98cab9aaae08..1cbd61fe493b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -817,6 +817,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1493,6 +1494,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2121,6 +2123,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2473,6 +2476,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2497,6 +2501,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3164,6 +3169,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_0";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3339,6 +3345,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4113,6 +4120,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_1";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_0";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_1";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4443,6 +4451,9 @@ self: super: {
   "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";
@@ -5904,6 +5915,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = dontDistribute super."multiarg";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6163,6 +6175,7 @@ self: super: {
   "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";
@@ -6238,6 +6251,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6675,6 +6689,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6854,6 +6869,7 @@ self: super: {
   "random-fu" = doDistribute super."random-fu_0_2_6_1";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -7007,6 +7023,9 @@ self: super: {
   "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";
@@ -7185,6 +7204,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8242,6 +8262,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8557,6 +8578,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_2";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-buffer" = dontDistribute super."vector-buffer";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index 45096136b7d5..e983e46a408c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -817,6 +817,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1493,6 +1494,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2120,6 +2122,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2471,6 +2474,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2495,6 +2499,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3161,6 +3166,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_0";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3336,6 +3342,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4109,6 +4116,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_1";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_0";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_1";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4437,6 +4445,9 @@ self: super: {
   "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";
@@ -5897,6 +5908,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = dontDistribute super."multiarg";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6156,6 +6168,7 @@ self: super: {
   "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";
@@ -6231,6 +6244,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6668,6 +6682,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6847,6 +6862,7 @@ self: super: {
   "random-fu" = doDistribute super."random-fu_0_2_6_1";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -7000,6 +7016,9 @@ self: super: {
   "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";
@@ -7178,6 +7197,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8230,6 +8250,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8544,6 +8565,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_2";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-buffer" = dontDistribute super."vector-buffer";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index c569da0fce66..c22d8e43cb7e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -816,6 +816,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1492,6 +1493,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2117,6 +2119,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2467,6 +2470,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2491,6 +2495,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3154,6 +3159,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_1";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3328,6 +3334,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4098,6 +4105,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_2";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_0";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4426,6 +4434,9 @@ self: super: {
   "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";
@@ -5879,6 +5890,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = dontDistribute super."multiarg";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6137,6 +6149,7 @@ self: super: {
   "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";
@@ -6212,6 +6225,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6648,6 +6662,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6826,6 +6841,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6979,6 +6995,9 @@ self: super: {
   "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";
@@ -7157,6 +7176,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8203,6 +8223,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8516,6 +8537,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_2";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-buffer" = dontDistribute super."vector-buffer";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index 3cb13aa16965..0f85aa6e7aae 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -816,6 +816,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1492,6 +1493,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2117,6 +2119,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2467,6 +2470,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2491,6 +2495,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3154,6 +3159,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_1";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3327,6 +3333,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4097,6 +4104,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_2";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_0";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4425,6 +4433,9 @@ self: super: {
   "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";
@@ -5875,6 +5886,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = dontDistribute super."multiarg";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6133,6 +6145,7 @@ self: super: {
   "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";
@@ -6208,6 +6221,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6644,6 +6658,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6822,6 +6837,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6975,6 +6991,9 @@ self: super: {
   "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";
@@ -7153,6 +7172,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8199,6 +8219,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8512,6 +8533,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_2";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-buffer" = dontDistribute super."vector-buffer";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 621806b6fb88..ace1963e3391 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -816,6 +816,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1492,6 +1493,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2117,6 +2119,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2467,6 +2470,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2491,6 +2495,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3154,6 +3159,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_1";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3327,6 +3333,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4097,6 +4104,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_2";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_0";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4424,6 +4432,9 @@ self: super: {
   "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";
@@ -5874,6 +5885,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = dontDistribute super."multiarg";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6132,6 +6144,7 @@ self: super: {
   "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";
@@ -6207,6 +6220,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6643,6 +6657,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6821,6 +6836,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6974,6 +6990,9 @@ self: super: {
   "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";
@@ -7152,6 +7171,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8197,6 +8217,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8510,6 +8531,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_2";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-buffer" = dontDistribute super."vector-buffer";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 652e60c78d8b..5f1e148e5e1c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -816,6 +816,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1492,6 +1493,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2117,6 +2119,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2467,6 +2470,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2491,6 +2495,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3154,6 +3159,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_1";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3327,6 +3333,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4096,6 +4103,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_2";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_0";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4423,6 +4431,9 @@ self: super: {
   "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";
@@ -5873,6 +5884,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = dontDistribute super."multiarg";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6131,6 +6143,7 @@ self: super: {
   "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";
@@ -6206,6 +6219,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6642,6 +6656,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6820,6 +6835,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6973,6 +6989,9 @@ self: super: {
   "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";
@@ -7151,6 +7170,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8195,6 +8215,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8508,6 +8529,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_2";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-buffer" = dontDistribute super."vector-buffer";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index e89537089f38..6829db657723 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -815,6 +815,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1491,6 +1492,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2115,6 +2117,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2464,6 +2467,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2488,6 +2492,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3151,6 +3156,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_1";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3324,6 +3330,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4093,6 +4100,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_2";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_0";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4419,6 +4427,9 @@ self: super: {
   "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";
@@ -5867,6 +5878,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = dontDistribute super."multiarg";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6125,6 +6137,7 @@ self: super: {
   "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";
@@ -6200,6 +6213,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6636,6 +6650,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6813,6 +6828,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6966,6 +6982,9 @@ self: super: {
   "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";
@@ -7144,6 +7163,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8188,6 +8208,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8501,6 +8522,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_2";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-buffer" = dontDistribute super."vector-buffer";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index 288a2bf2d4e0..c69012197af1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -815,6 +815,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1490,6 +1491,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2113,6 +2115,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2461,6 +2464,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2485,6 +2489,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3147,6 +3152,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_2";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3320,6 +3326,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4089,6 +4096,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_2";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_0";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4415,6 +4423,9 @@ self: super: {
   "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";
@@ -5863,6 +5874,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = dontDistribute super."multiarg";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6119,6 +6131,7 @@ self: super: {
   "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";
@@ -6194,6 +6207,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6630,6 +6644,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6806,6 +6821,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6959,6 +6975,9 @@ self: super: {
   "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";
@@ -7137,6 +7156,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8179,6 +8199,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8492,6 +8513,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-buffer" = dontDistribute super."vector-buffer";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index 75b907a56050..6d1a27525b12 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -817,6 +817,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1493,6 +1494,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2119,6 +2121,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2469,6 +2472,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2493,6 +2497,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3159,6 +3164,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_0";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3334,6 +3340,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4106,6 +4113,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_2";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_0";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4434,6 +4442,9 @@ self: super: {
   "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";
@@ -5894,6 +5905,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = dontDistribute super."multiarg";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6153,6 +6165,7 @@ self: super: {
   "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";
@@ -6228,6 +6241,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6664,6 +6678,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6842,6 +6857,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6995,6 +7011,9 @@ self: super: {
   "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";
@@ -7173,6 +7192,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8224,6 +8244,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8538,6 +8559,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_2";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-buffer" = dontDistribute super."vector-buffer";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index 987cbdd2454a..1832969011f7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -816,6 +816,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1492,6 +1493,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2118,6 +2120,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2468,6 +2471,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2492,6 +2496,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3157,6 +3162,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_0";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3332,6 +3338,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4103,6 +4110,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_2";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_0";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4431,6 +4439,9 @@ self: super: {
   "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";
@@ -5890,6 +5901,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = dontDistribute super."multiarg";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6149,6 +6161,7 @@ self: super: {
   "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";
@@ -6224,6 +6237,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6660,6 +6674,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6838,6 +6853,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6991,6 +7007,9 @@ self: super: {
   "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";
@@ -7169,6 +7188,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8219,6 +8239,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8533,6 +8554,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_2";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-buffer" = dontDistribute super."vector-buffer";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index c3ea5f923c05..09660ebe9636 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -816,6 +816,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1492,6 +1493,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2117,6 +2119,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2467,6 +2470,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2491,6 +2495,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3156,6 +3161,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_0";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3331,6 +3337,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4102,6 +4109,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_2";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_0";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4430,6 +4438,9 @@ self: super: {
   "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";
@@ -5889,6 +5900,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = dontDistribute super."multiarg";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6148,6 +6160,7 @@ self: super: {
   "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";
@@ -6223,6 +6236,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6659,6 +6673,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6837,6 +6852,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6990,6 +7006,9 @@ self: super: {
   "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";
@@ -7168,6 +7187,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8217,6 +8237,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8530,6 +8551,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_2";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-buffer" = dontDistribute super."vector-buffer";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index fbd3969eaf96..58ffd1eb7a1e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -816,6 +816,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1492,6 +1493,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2117,6 +2119,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2467,6 +2470,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2491,6 +2495,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3156,6 +3161,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_1";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3331,6 +3337,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4102,6 +4109,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_2";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_0";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4430,6 +4438,9 @@ self: super: {
   "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";
@@ -5884,6 +5895,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = dontDistribute super."multiarg";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6143,6 +6155,7 @@ self: super: {
   "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";
@@ -6218,6 +6231,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6654,6 +6668,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6832,6 +6847,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6985,6 +7001,9 @@ self: super: {
   "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";
@@ -7163,6 +7182,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8212,6 +8232,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8525,6 +8546,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_2";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-buffer" = dontDistribute super."vector-buffer";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index c7c05da3ec4f..ce5855c7aae8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -816,6 +816,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1492,6 +1493,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2117,6 +2119,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2467,6 +2470,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2491,6 +2495,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3154,6 +3159,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_1";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3329,6 +3335,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4099,6 +4106,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_2";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_0";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4427,6 +4435,9 @@ self: super: {
   "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";
@@ -5880,6 +5891,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = dontDistribute super."multiarg";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6139,6 +6151,7 @@ self: super: {
   "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";
@@ -6214,6 +6227,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6650,6 +6664,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6828,6 +6843,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6981,6 +6997,9 @@ self: super: {
   "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";
@@ -7159,6 +7178,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8207,6 +8227,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8520,6 +8541,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_2";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-buffer" = dontDistribute super."vector-buffer";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index 56a7a77807dc..b6eb55cd0a89 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -816,6 +816,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1492,6 +1493,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2117,6 +2119,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2467,6 +2470,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2491,6 +2495,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3154,6 +3159,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_1";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3328,6 +3334,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4098,6 +4105,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_2";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_0";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_2";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4426,6 +4434,9 @@ self: super: {
   "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";
@@ -5879,6 +5890,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = dontDistribute super."multiarg";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6138,6 +6150,7 @@ self: super: {
   "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";
@@ -6213,6 +6226,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6649,6 +6663,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6827,6 +6842,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6980,6 +6996,9 @@ self: super: {
   "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";
@@ -7158,6 +7177,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8206,6 +8226,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8519,6 +8540,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_2";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-buffer" = dontDistribute super."vector-buffer";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 2f8fcbf8bb47..7a6eb2e704b5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -809,6 +809,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1481,6 +1482,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2101,6 +2103,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2446,6 +2449,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2470,6 +2474,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3133,6 +3138,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_2";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3303,6 +3309,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4070,6 +4077,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_3";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4394,6 +4402,9 @@ self: super: {
   "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";
@@ -4834,6 +4845,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5704,6 +5716,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5819,6 +5832,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6071,6 +6085,7 @@ self: super: {
   "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";
@@ -6146,6 +6161,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6578,6 +6594,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6755,6 +6772,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6908,6 +6926,9 @@ self: super: {
   "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";
@@ -7086,6 +7107,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8120,6 +8142,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8432,6 +8455,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 3df16eb26172..01c494fd0dfe 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -809,6 +809,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1481,6 +1482,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2100,6 +2102,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2445,6 +2448,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2469,6 +2473,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3132,6 +3137,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_2";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3302,6 +3308,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4069,6 +4076,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_3";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4393,6 +4401,9 @@ self: super: {
   "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";
@@ -4833,6 +4844,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5703,6 +5715,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5818,6 +5831,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6070,6 +6084,7 @@ self: super: {
   "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";
@@ -6145,6 +6160,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6577,6 +6593,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6754,6 +6771,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6907,6 +6925,9 @@ self: super: {
   "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";
@@ -7085,6 +7106,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8119,6 +8141,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8431,6 +8454,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index 0d6f60e04f69..231b1da6747f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -807,6 +807,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1474,6 +1475,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2088,6 +2090,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2431,6 +2434,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2455,6 +2459,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3114,6 +3119,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_2";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3283,6 +3289,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4048,6 +4055,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_3_1";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_1";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4371,6 +4379,9 @@ self: super: {
   "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";
@@ -4808,6 +4819,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5670,6 +5682,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5786,6 +5799,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6036,6 +6050,7 @@ self: super: {
   "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";
@@ -6111,6 +6126,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6539,6 +6555,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6715,6 +6732,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6868,6 +6886,9 @@ self: super: {
   "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";
@@ -7044,6 +7065,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8068,6 +8090,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8380,6 +8403,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 1882dbd6a088..2662bfe65136 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -807,6 +807,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1473,6 +1474,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2087,6 +2089,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2430,6 +2433,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2454,6 +2458,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3113,6 +3118,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_2";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3282,6 +3288,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4046,6 +4053,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_3_2";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4368,6 +4376,9 @@ self: super: {
   "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";
@@ -4805,6 +4816,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5666,6 +5678,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5781,6 +5794,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6031,6 +6045,7 @@ self: super: {
   "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";
@@ -6106,6 +6121,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6533,6 +6549,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6709,6 +6726,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6862,6 +6880,9 @@ self: super: {
   "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";
@@ -7037,6 +7058,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8059,6 +8081,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8371,6 +8394,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index b731ee685637..87bad704729d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -807,6 +807,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1473,6 +1474,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2087,6 +2089,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2430,6 +2433,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2454,6 +2458,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3113,6 +3118,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_2";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3282,6 +3288,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4046,6 +4053,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_3_2";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4368,6 +4376,9 @@ self: super: {
   "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";
@@ -4805,6 +4816,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5666,6 +5678,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5781,6 +5794,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6031,6 +6045,7 @@ self: super: {
   "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";
@@ -6106,6 +6121,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6533,6 +6549,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6709,6 +6726,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6862,6 +6880,9 @@ self: super: {
   "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";
@@ -7037,6 +7058,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8058,6 +8080,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8370,6 +8393,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index db5547dc9ef5..a22d472fb36c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -807,6 +807,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1473,6 +1474,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2087,6 +2089,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2430,6 +2433,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2454,6 +2458,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3113,6 +3118,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_2";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3282,6 +3288,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4045,6 +4052,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_3_2";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4367,6 +4375,9 @@ self: super: {
   "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";
@@ -4803,6 +4814,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5664,6 +5676,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5779,6 +5792,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6029,6 +6043,7 @@ self: super: {
   "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";
@@ -6104,6 +6119,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6531,6 +6547,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6707,6 +6724,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6860,6 +6878,9 @@ self: super: {
   "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";
@@ -7035,6 +7056,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8056,6 +8078,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8368,6 +8391,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 0b500291fcfb..0ba5ae883bb3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -807,6 +807,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1472,6 +1473,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2086,6 +2088,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2429,6 +2432,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2453,6 +2457,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3112,6 +3117,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
@@ -3280,6 +3286,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4043,6 +4050,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_3_2";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4365,6 +4373,9 @@ self: super: {
   "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";
@@ -4800,6 +4811,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5661,6 +5673,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5776,6 +5789,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6026,6 +6040,7 @@ self: super: {
   "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";
@@ -6101,6 +6116,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6528,6 +6544,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6704,6 +6721,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6857,6 +6875,9 @@ self: super: {
   "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";
@@ -7032,6 +7053,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8052,6 +8074,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8364,6 +8387,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index f8c70e4bae83..53940a40de87 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -807,6 +807,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1472,6 +1473,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2086,6 +2088,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2429,6 +2432,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2453,6 +2457,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3111,6 +3116,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
@@ -3279,6 +3285,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4042,6 +4049,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_3_2";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_2";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4364,6 +4372,9 @@ self: super: {
   "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";
@@ -4799,6 +4810,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5660,6 +5672,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5774,6 +5787,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6022,6 +6036,7 @@ self: super: {
   "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";
@@ -6097,6 +6112,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6524,6 +6540,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6700,6 +6717,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6853,6 +6871,9 @@ self: super: {
   "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";
@@ -7028,6 +7049,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8047,6 +8069,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8359,6 +8382,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index af59ccac5127..77cf4fa6807a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -177,6 +177,7 @@ self: super: {
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -806,6 +807,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1471,6 +1473,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2084,6 +2087,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2426,6 +2430,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2450,6 +2455,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3106,6 +3112,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
@@ -3274,6 +3281,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4037,6 +4045,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_3_2";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4359,6 +4368,9 @@ self: super: {
   "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";
@@ -4794,6 +4806,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5654,6 +5667,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5768,6 +5782,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6016,6 +6031,7 @@ self: super: {
   "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";
@@ -6091,6 +6107,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6518,6 +6535,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6694,6 +6712,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6847,6 +6866,9 @@ self: super: {
   "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";
@@ -7022,6 +7044,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8041,6 +8064,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8353,6 +8377,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index bdce43f45332..67b1f9a3f571 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -177,6 +177,7 @@ self: super: {
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -806,6 +807,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1470,6 +1472,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2082,6 +2085,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2424,6 +2428,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2448,6 +2453,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3102,6 +3108,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
@@ -3270,6 +3277,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4032,6 +4040,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_3_2";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4354,6 +4363,9 @@ self: super: {
   "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";
@@ -4789,6 +4801,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5649,6 +5662,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5763,6 +5777,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6010,6 +6025,7 @@ self: super: {
   "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";
@@ -6085,6 +6101,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6512,6 +6529,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6688,6 +6706,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6841,6 +6860,9 @@ self: super: {
   "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";
@@ -7016,6 +7038,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8035,6 +8058,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8347,6 +8371,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index a8b13abbac89..774b372c451b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -177,6 +177,7 @@ self: super: {
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -806,6 +807,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1470,6 +1472,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2081,6 +2084,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2423,6 +2427,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2447,6 +2452,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3100,6 +3106,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
@@ -3268,6 +3275,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4030,6 +4038,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_3_2";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4351,6 +4360,9 @@ self: super: {
   "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";
@@ -4786,6 +4798,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5646,6 +5659,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5760,6 +5774,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6006,6 +6021,7 @@ self: super: {
   "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";
@@ -6081,6 +6097,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6507,6 +6524,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6683,6 +6701,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6836,6 +6855,9 @@ self: super: {
   "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";
@@ -7011,6 +7033,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8029,6 +8052,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8341,6 +8365,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index 7f018681924b..5cfa6de7a571 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -177,6 +177,7 @@ self: super: {
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -806,6 +807,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1470,6 +1472,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2081,6 +2084,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2423,6 +2427,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2447,6 +2452,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3100,6 +3106,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
@@ -3267,6 +3274,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4029,6 +4037,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_3_2";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4350,6 +4359,9 @@ self: super: {
   "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";
@@ -4785,6 +4797,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5644,6 +5657,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5758,6 +5772,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6004,6 +6019,7 @@ self: super: {
   "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";
@@ -6079,6 +6095,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6505,6 +6522,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6681,6 +6699,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6834,6 +6853,9 @@ self: super: {
   "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";
@@ -7009,6 +7031,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8025,6 +8048,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8337,6 +8361,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index c2aa4a3421ba..90433b651fcd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -809,6 +809,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1480,6 +1481,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2097,6 +2099,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2442,6 +2445,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2466,6 +2470,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3129,6 +3134,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_2";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3299,6 +3305,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4066,6 +4073,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_3";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4390,6 +4398,9 @@ self: super: {
   "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";
@@ -4830,6 +4841,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5700,6 +5712,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5815,6 +5828,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6067,6 +6081,7 @@ self: super: {
   "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";
@@ -6142,6 +6157,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6574,6 +6590,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6751,6 +6768,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6904,6 +6922,9 @@ self: super: {
   "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";
@@ -7082,6 +7103,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8116,6 +8138,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8428,6 +8451,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index f94aa3dd4a66..a073695f433c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -177,6 +177,7 @@ self: super: {
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -806,6 +807,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1470,6 +1472,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2081,6 +2084,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2422,6 +2426,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2446,6 +2451,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3099,6 +3105,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
@@ -3266,6 +3273,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4028,6 +4036,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_3_2";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4349,6 +4358,9 @@ self: super: {
   "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";
@@ -4784,6 +4796,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5643,6 +5656,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5757,6 +5771,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6003,6 +6018,7 @@ self: super: {
   "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";
@@ -6078,6 +6094,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6503,6 +6520,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6679,6 +6697,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6832,6 +6851,9 @@ self: super: {
   "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";
@@ -7007,6 +7029,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8022,6 +8045,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8334,6 +8358,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index 404bb06d5970..544d71f16bf0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -177,6 +177,7 @@ self: super: {
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -806,6 +807,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1470,6 +1472,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2081,6 +2084,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2422,6 +2426,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2446,6 +2451,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3099,6 +3105,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
@@ -3266,6 +3273,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4028,6 +4036,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_3_2";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_3";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4349,6 +4358,9 @@ self: super: {
   "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";
@@ -4784,6 +4796,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5642,6 +5655,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5756,6 +5770,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6002,6 +6017,7 @@ self: super: {
   "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";
@@ -6077,6 +6093,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6501,6 +6518,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6677,6 +6695,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6830,6 +6849,9 @@ self: super: {
   "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";
@@ -7005,6 +7027,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8020,6 +8043,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8330,6 +8354,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index ae87d1cd488c..98e2c96e724f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -177,6 +177,7 @@ self: super: {
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_3_3";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -806,6 +807,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1470,6 +1472,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2081,6 +2084,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2422,6 +2426,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2446,6 +2451,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3099,6 +3105,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
@@ -3266,6 +3273,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4028,6 +4036,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_3_2";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_1_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_4_0";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4348,6 +4357,9 @@ self: super: {
   "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";
@@ -4783,6 +4795,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5640,6 +5653,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5754,6 +5768,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6000,6 +6015,7 @@ self: super: {
   "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";
@@ -6075,6 +6091,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6499,6 +6516,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6675,6 +6693,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6828,6 +6847,9 @@ self: super: {
   "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";
@@ -7003,6 +7025,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8018,6 +8041,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8328,6 +8352,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index 8566604ebe3b..d5f060387ce5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -809,6 +809,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1480,6 +1481,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2097,6 +2099,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2442,6 +2445,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2466,6 +2470,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3128,6 +3133,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_2";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3298,6 +3304,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4065,6 +4072,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_3";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4389,6 +4397,9 @@ self: super: {
   "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";
@@ -4828,6 +4839,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5698,6 +5710,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5813,6 +5826,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6065,6 +6079,7 @@ self: super: {
   "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";
@@ -6140,6 +6155,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6572,6 +6588,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6749,6 +6766,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6902,6 +6920,9 @@ self: super: {
   "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";
@@ -7080,6 +7101,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8114,6 +8136,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8426,6 +8449,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 9f910c810548..e595d238aeb9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -809,6 +809,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1480,6 +1481,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2096,6 +2098,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2441,6 +2444,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2465,6 +2469,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3127,6 +3132,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_2";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3297,6 +3303,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4064,6 +4071,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_3";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4388,6 +4396,9 @@ self: super: {
   "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";
@@ -4827,6 +4838,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5696,6 +5708,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5811,6 +5824,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6063,6 +6077,7 @@ self: super: {
   "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";
@@ -6138,6 +6153,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6568,6 +6584,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6745,6 +6762,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6898,6 +6916,9 @@ self: super: {
   "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";
@@ -7075,6 +7096,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8109,6 +8131,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8421,6 +8444,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 7d5e081463d8..35a9871f7cd5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -809,6 +809,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1480,6 +1481,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2096,6 +2098,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2440,6 +2443,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2464,6 +2468,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3126,6 +3131,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_2";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3296,6 +3302,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4063,6 +4070,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_3";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4387,6 +4395,9 @@ self: super: {
   "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";
@@ -4826,6 +4837,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5694,6 +5706,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5809,6 +5822,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6061,6 +6075,7 @@ self: super: {
   "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";
@@ -6136,6 +6151,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6566,6 +6582,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6743,6 +6760,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6896,6 +6914,9 @@ self: super: {
   "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";
@@ -7073,6 +7094,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8107,6 +8129,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8419,6 +8442,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index a1607e9aeae7..838a0d81ae38 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -809,6 +809,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1478,6 +1479,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2093,6 +2095,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2437,6 +2440,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2461,6 +2465,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3123,6 +3128,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_2";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3293,6 +3299,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4058,6 +4065,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_3";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4382,6 +4390,9 @@ self: super: {
   "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";
@@ -4821,6 +4832,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5689,6 +5701,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5804,6 +5817,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6055,6 +6069,7 @@ self: super: {
   "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";
@@ -6130,6 +6145,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6560,6 +6576,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6737,6 +6754,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6890,6 +6908,9 @@ self: super: {
   "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";
@@ -7067,6 +7088,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8099,6 +8121,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8411,6 +8434,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 123833c374d2..e2658c39b016 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -808,6 +808,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1477,6 +1478,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2092,6 +2094,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2436,6 +2439,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2460,6 +2464,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3122,6 +3127,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_2";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3292,6 +3298,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4057,6 +4064,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_3";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4381,6 +4389,9 @@ self: super: {
   "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";
@@ -4820,6 +4831,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5688,6 +5700,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5804,6 +5817,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6054,6 +6068,7 @@ self: super: {
   "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";
@@ -6129,6 +6144,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6559,6 +6575,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6736,6 +6753,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6889,6 +6907,9 @@ self: super: {
   "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";
@@ -7066,6 +7087,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8098,6 +8120,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8410,6 +8433,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index 6c391312b272..fe475625a7d7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -807,6 +807,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1476,6 +1477,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2091,6 +2093,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2435,6 +2438,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2459,6 +2463,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3121,6 +3126,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_2";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3290,6 +3296,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4055,6 +4062,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_3";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4379,6 +4387,9 @@ self: super: {
   "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";
@@ -4818,6 +4829,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5686,6 +5698,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5802,6 +5815,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6052,6 +6066,7 @@ self: super: {
   "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";
@@ -6127,6 +6142,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6557,6 +6573,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6734,6 +6751,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6887,6 +6905,9 @@ self: super: {
   "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";
@@ -7063,6 +7084,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8092,6 +8114,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8404,6 +8427,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index 7722a893c0f4..ff2118946cfe 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -807,6 +807,7 @@ self: super: {
   "QuickCheck" = doDistribute super."QuickCheck_2_7_6";
   "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";
@@ -1474,6 +1475,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2088,6 +2090,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustering" = dontDistribute super."clustering";
   "clustertools" = dontDistribute super."clustertools";
@@ -2432,6 +2435,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2456,6 +2460,7 @@ self: super: {
   "data-fresh" = dontDistribute super."data-fresh";
   "data-hash" = dontDistribute super."data-hash";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3116,6 +3121,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree" = doDistribute super."fingertree_0_1_0_2";
   "fingertree-psqueue" = dontDistribute super."fingertree-psqueue";
@@ -3285,6 +3291,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -4050,6 +4057,7 @@ self: super: {
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_3_1";
   "hasql-backend" = doDistribute super."hasql-backend_0_4_1";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_3_1";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4374,6 +4382,9 @@ self: super: {
   "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";
@@ -4811,6 +4822,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5677,6 +5689,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-extras" = dontDistribute super."monad-extras";
   "monad-fork" = dontDistribute super."monad-fork";
@@ -5793,6 +5806,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -6043,6 +6057,7 @@ self: super: {
   "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";
@@ -6118,6 +6133,7 @@ self: super: {
   "opentheory-unicode" = dontDistribute super."opentheory-unicode";
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-class" = dontDistribute super."operational-class";
+  "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6547,6 +6563,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6724,6 +6741,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6877,6 +6895,9 @@ self: super: {
   "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";
@@ -7053,6 +7074,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -8078,6 +8100,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8390,6 +8413,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_6_0_4";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index de0f4fe5fa10..a6b2efe0c383 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -169,6 +169,7 @@ self: super: {
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -791,7 +792,9 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickPlot" = dontDistribute super."QuickPlot";
   "Quickson" = dontDistribute super."Quickson";
   "R-pandoc" = dontDistribute super."R-pandoc";
   "RANSAC" = dontDistribute super."RANSAC";
@@ -1430,6 +1433,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2020,6 +2024,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -2130,6 +2135,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
@@ -2356,6 +2362,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2379,6 +2386,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3009,6 +3017,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -3172,6 +3181,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -3926,6 +3936,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4241,6 +4252,9 @@ self: super: {
   "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";
@@ -4662,6 +4676,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5484,6 +5499,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5590,6 +5606,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -5833,6 +5850,7 @@ self: super: {
   "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";
@@ -5904,6 +5922,7 @@ self: super: {
   "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";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6316,6 +6335,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6490,6 +6510,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6643,6 +6664,9 @@ self: super: {
   "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";
@@ -6817,6 +6841,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -7791,6 +7816,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7803,6 +7829,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8107,6 +8134,7 @@ self: super: {
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-algorithms" = doDistribute super."vector-algorithms_0_7";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index d88256166b26..2bed2cd269e2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -169,6 +169,7 @@ self: super: {
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -791,7 +792,9 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickPlot" = dontDistribute super."QuickPlot";
   "Quickson" = dontDistribute super."Quickson";
   "R-pandoc" = dontDistribute super."R-pandoc";
   "RANSAC" = dontDistribute super."RANSAC";
@@ -1429,6 +1432,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2019,6 +2023,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -2129,6 +2134,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
@@ -2355,6 +2361,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2378,6 +2385,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3006,6 +3014,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -3169,6 +3178,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -3923,6 +3933,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4238,6 +4249,9 @@ self: super: {
   "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";
@@ -4659,6 +4673,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5480,6 +5495,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5586,6 +5602,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -5828,6 +5845,7 @@ self: super: {
   "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";
@@ -5899,6 +5917,7 @@ self: super: {
   "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";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6310,6 +6329,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6484,6 +6504,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6637,6 +6658,9 @@ self: super: {
   "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";
@@ -6810,6 +6834,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -7784,6 +7809,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7796,6 +7822,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8099,6 +8126,7 @@ self: super: {
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index c3a43b75622d..3550262d4d12 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -167,6 +167,7 @@ self: super: {
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -315,6 +316,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -785,7 +787,9 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickPlot" = dontDistribute super."QuickPlot";
   "Quickson" = dontDistribute super."Quickson";
   "R-pandoc" = dontDistribute super."R-pandoc";
   "RANSAC" = dontDistribute super."RANSAC";
@@ -1309,6 +1313,7 @@ self: super: {
   "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
   "arb-fft" = dontDistribute super."arb-fft";
   "arbb-vm" = dontDistribute super."arbb-vm";
+  "arbtt" = doDistribute super."arbtt_0_9_0_7";
   "archive" = dontDistribute super."archive";
   "archiver" = dontDistribute super."archiver";
   "archlinux" = dontDistribute super."archlinux";
@@ -1416,6 +1421,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2002,6 +2008,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -2112,6 +2119,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
@@ -2335,6 +2343,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2358,6 +2367,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2539,6 +2549,7 @@ self: super: {
   "digest-pure" = dontDistribute super."digest-pure";
   "digestive-bootstrap" = dontDistribute super."digestive-bootstrap";
   "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18";
   "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze";
   "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
   "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
@@ -2977,6 +2988,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -3137,6 +3149,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -3887,6 +3900,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
   "hasql-th" = dontDistribute super."hasql-th";
@@ -4199,6 +4213,9 @@ self: super: {
   "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";
@@ -4617,6 +4634,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5430,6 +5448,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5443,6 +5462,7 @@ self: super: {
   "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
   "monad-open" = dontDistribute super."monad-open";
   "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-products" = doDistribute super."monad-products_4_0_0_1";
@@ -5534,6 +5554,7 @@ self: super: {
   "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";
@@ -5773,6 +5794,7 @@ self: super: {
   "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";
@@ -5843,6 +5865,7 @@ self: super: {
   "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";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6092,6 +6115,7 @@ self: super: {
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_1_0";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
@@ -6245,6 +6269,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6416,6 +6441,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6567,6 +6593,9 @@ self: super: {
   "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";
@@ -6740,6 +6769,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -7044,6 +7074,7 @@ self: super: {
   "smartconstructor" = dontDistribute super."smartconstructor";
   "smartword" = dontDistribute super."smartword";
   "sme" = dontDistribute super."sme";
+  "smoothie" = doDistribute super."smoothie_0_4_2_1";
   "smsaero" = dontDistribute super."smsaero";
   "smt-lib" = dontDistribute super."smt-lib";
   "smtlib2" = dontDistribute super."smtlib2";
@@ -7125,6 +7156,7 @@ self: super: {
   "sockaddr" = dontDistribute super."sockaddr";
   "socket" = dontDistribute super."socket";
   "socket-activation" = dontDistribute super."socket-activation";
+  "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "soegtk" = dontDistribute super."soegtk";
@@ -7700,6 +7732,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7712,6 +7745,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8011,6 +8045,7 @@ self: super: {
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index b529c0c648fe..b420c0559803 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -167,6 +167,7 @@ self: super: {
   "Chart-cairo" = doDistribute super."Chart-cairo_1_5_1";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -315,6 +316,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -785,7 +787,9 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickPlot" = dontDistribute super."QuickPlot";
   "Quickson" = dontDistribute super."Quickson";
   "R-pandoc" = dontDistribute super."R-pandoc";
   "RANSAC" = dontDistribute super."RANSAC";
@@ -1309,6 +1313,7 @@ self: super: {
   "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
   "arb-fft" = dontDistribute super."arb-fft";
   "arbb-vm" = dontDistribute super."arbb-vm";
+  "arbtt" = doDistribute super."arbtt_0_9_0_7";
   "archive" = dontDistribute super."archive";
   "archiver" = dontDistribute super."archiver";
   "archlinux" = dontDistribute super."archlinux";
@@ -1416,6 +1421,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -1546,6 +1552,7 @@ self: super: {
   "binary-store" = dontDistribute super."binary-store";
   "binary-streams" = dontDistribute super."binary-streams";
   "binary-strict" = dontDistribute super."binary-strict";
+  "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0";
   "binary-typed" = dontDistribute super."binary-typed";
   "binarydefer" = dontDistribute super."binarydefer";
   "bind-marshal" = dontDistribute super."bind-marshal";
@@ -2000,6 +2007,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -2110,6 +2118,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
@@ -2333,6 +2342,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2356,6 +2366,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2537,6 +2548,7 @@ self: super: {
   "digest-pure" = dontDistribute super."digest-pure";
   "digestive-bootstrap" = dontDistribute super."digestive-bootstrap";
   "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18";
   "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze";
   "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
   "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
@@ -2974,6 +2986,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -3134,6 +3147,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -3884,6 +3898,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
   "hasql-th" = dontDistribute super."hasql-th";
@@ -4196,6 +4211,9 @@ self: super: {
   "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";
@@ -4614,6 +4632,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5427,6 +5446,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5440,6 +5460,7 @@ self: super: {
   "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
   "monad-open" = dontDistribute super."monad-open";
   "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-products" = doDistribute super."monad-products_4_0_0_1";
@@ -5531,6 +5552,7 @@ self: super: {
   "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";
@@ -5770,6 +5792,7 @@ self: super: {
   "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";
@@ -5840,6 +5863,7 @@ self: super: {
   "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";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6088,6 +6112,7 @@ self: super: {
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_1_0";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
@@ -6241,6 +6266,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6412,6 +6438,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6563,6 +6590,9 @@ self: super: {
   "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";
@@ -6736,6 +6766,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -7039,6 +7070,7 @@ self: super: {
   "smartconstructor" = dontDistribute super."smartconstructor";
   "smartword" = dontDistribute super."smartword";
   "sme" = dontDistribute super."sme";
+  "smoothie" = doDistribute super."smoothie_0_4_2_1";
   "smsaero" = dontDistribute super."smsaero";
   "smt-lib" = dontDistribute super."smt-lib";
   "smtlib2" = dontDistribute super."smtlib2";
@@ -7120,6 +7152,7 @@ self: super: {
   "sockaddr" = dontDistribute super."sockaddr";
   "socket" = dontDistribute super."socket";
   "socket-activation" = dontDistribute super."socket-activation";
+  "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "soegtk" = dontDistribute super."soegtk";
@@ -7695,6 +7728,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7707,6 +7741,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8006,6 +8041,7 @@ self: super: {
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index b89fa70f8b46..534196a30ac7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -166,6 +166,7 @@ self: super: {
   "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -314,6 +315,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -784,7 +786,9 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickPlot" = dontDistribute super."QuickPlot";
   "Quickson" = dontDistribute super."Quickson";
   "R-pandoc" = dontDistribute super."R-pandoc";
   "RANSAC" = dontDistribute super."RANSAC";
@@ -1308,6 +1312,7 @@ self: super: {
   "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
   "arb-fft" = dontDistribute super."arb-fft";
   "arbb-vm" = dontDistribute super."arbb-vm";
+  "arbtt" = doDistribute super."arbtt_0_9_0_7";
   "archive" = dontDistribute super."archive";
   "archiver" = dontDistribute super."archiver";
   "archlinux" = dontDistribute super."archlinux";
@@ -1415,6 +1420,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -1545,6 +1551,7 @@ self: super: {
   "binary-store" = dontDistribute super."binary-store";
   "binary-streams" = dontDistribute super."binary-streams";
   "binary-strict" = dontDistribute super."binary-strict";
+  "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0";
   "binary-typed" = dontDistribute super."binary-typed";
   "binarydefer" = dontDistribute super."binarydefer";
   "bind-marshal" = dontDistribute super."bind-marshal";
@@ -1963,6 +1970,7 @@ self: super: {
   "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
   "clckwrks" = dontDistribute super."clckwrks";
   "clckwrks-cli" = dontDistribute super."clckwrks-cli";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
@@ -1995,6 +2003,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -2105,6 +2114,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
@@ -2328,6 +2338,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2351,6 +2362,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2532,6 +2544,7 @@ self: super: {
   "digest-pure" = dontDistribute super."digest-pure";
   "digestive-bootstrap" = dontDistribute super."digestive-bootstrap";
   "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18";
   "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze";
   "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
   "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
@@ -2969,6 +2982,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -3129,6 +3143,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -3878,6 +3893,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
   "hasql-th" = dontDistribute super."hasql-th";
@@ -4190,6 +4206,9 @@ self: super: {
   "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";
@@ -4608,6 +4627,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5421,6 +5441,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5434,6 +5455,7 @@ self: super: {
   "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
   "monad-open" = dontDistribute super."monad-open";
   "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-products" = doDistribute super."monad-products_4_0_0_1";
@@ -5525,6 +5547,7 @@ self: super: {
   "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";
@@ -5764,6 +5787,7 @@ self: super: {
   "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";
@@ -5834,6 +5858,7 @@ self: super: {
   "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";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6081,6 +6106,7 @@ self: super: {
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_1_0";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
@@ -6234,6 +6260,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6405,6 +6432,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6556,6 +6584,9 @@ self: super: {
   "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";
@@ -6729,6 +6760,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -7032,6 +7064,7 @@ self: super: {
   "smartconstructor" = dontDistribute super."smartconstructor";
   "smartword" = dontDistribute super."smartword";
   "sme" = dontDistribute super."sme";
+  "smoothie" = doDistribute super."smoothie_0_4_2_1";
   "smsaero" = dontDistribute super."smsaero";
   "smt-lib" = dontDistribute super."smt-lib";
   "smtlib2" = dontDistribute super."smtlib2";
@@ -7113,6 +7146,7 @@ self: super: {
   "sockaddr" = dontDistribute super."sockaddr";
   "socket" = dontDistribute super."socket";
   "socket-activation" = dontDistribute super."socket-activation";
+  "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "soegtk" = dontDistribute super."soegtk";
@@ -7686,6 +7720,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7698,6 +7733,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -7997,6 +8033,7 @@ self: super: {
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index f6a631e11538..29a139a9e4d4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -166,6 +166,7 @@ self: super: {
   "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -314,6 +315,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -784,7 +786,9 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickPlot" = dontDistribute super."QuickPlot";
   "Quickson" = dontDistribute super."Quickson";
   "R-pandoc" = dontDistribute super."R-pandoc";
   "RANSAC" = dontDistribute super."RANSAC";
@@ -1308,6 +1312,7 @@ self: super: {
   "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
   "arb-fft" = dontDistribute super."arb-fft";
   "arbb-vm" = dontDistribute super."arbb-vm";
+  "arbtt" = doDistribute super."arbtt_0_9_0_7";
   "archive" = dontDistribute super."archive";
   "archiver" = dontDistribute super."archiver";
   "archlinux" = dontDistribute super."archlinux";
@@ -1415,6 +1420,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -1545,6 +1551,7 @@ self: super: {
   "binary-store" = dontDistribute super."binary-store";
   "binary-streams" = dontDistribute super."binary-streams";
   "binary-strict" = dontDistribute super."binary-strict";
+  "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0";
   "binary-typed" = dontDistribute super."binary-typed";
   "binarydefer" = dontDistribute super."binarydefer";
   "bind-marshal" = dontDistribute super."bind-marshal";
@@ -1963,6 +1970,7 @@ self: super: {
   "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
   "clckwrks" = dontDistribute super."clckwrks";
   "clckwrks-cli" = dontDistribute super."clckwrks-cli";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
@@ -1995,6 +2003,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -2105,6 +2114,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
@@ -2328,6 +2338,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2351,6 +2362,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2532,6 +2544,7 @@ self: super: {
   "digest-pure" = dontDistribute super."digest-pure";
   "digestive-bootstrap" = dontDistribute super."digestive-bootstrap";
   "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18";
   "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze";
   "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
   "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
@@ -2969,6 +2982,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -3129,6 +3143,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -3878,6 +3893,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
   "hasql-th" = dontDistribute super."hasql-th";
@@ -4189,6 +4205,9 @@ self: super: {
   "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";
@@ -4607,6 +4626,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5419,6 +5439,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5432,6 +5453,7 @@ self: super: {
   "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
   "monad-open" = dontDistribute super."monad-open";
   "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-products" = doDistribute super."monad-products_4_0_0_1";
@@ -5523,6 +5545,7 @@ self: super: {
   "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";
@@ -5762,6 +5785,7 @@ self: super: {
   "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";
@@ -5832,6 +5856,7 @@ self: super: {
   "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";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6078,6 +6103,7 @@ self: super: {
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_1_0";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
@@ -6231,6 +6257,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6402,6 +6429,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6553,6 +6581,9 @@ self: super: {
   "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";
@@ -6726,6 +6757,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -7029,6 +7061,7 @@ self: super: {
   "smartconstructor" = dontDistribute super."smartconstructor";
   "smartword" = dontDistribute super."smartword";
   "sme" = dontDistribute super."sme";
+  "smoothie" = doDistribute super."smoothie_0_4_2_1";
   "smsaero" = dontDistribute super."smsaero";
   "smt-lib" = dontDistribute super."smt-lib";
   "smtlib2" = dontDistribute super."smtlib2";
@@ -7110,6 +7143,7 @@ self: super: {
   "sockaddr" = dontDistribute super."sockaddr";
   "socket" = dontDistribute super."socket";
   "socket-activation" = dontDistribute super."socket-activation";
+  "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "soegtk" = dontDistribute super."soegtk";
@@ -7683,6 +7717,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7695,6 +7730,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -7994,6 +8030,7 @@ self: super: {
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index 571045bdc8ff..b406a70ae068 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -166,6 +166,7 @@ self: super: {
   "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -314,6 +315,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -784,7 +786,9 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickPlot" = dontDistribute super."QuickPlot";
   "Quickson" = dontDistribute super."Quickson";
   "R-pandoc" = dontDistribute super."R-pandoc";
   "RANSAC" = dontDistribute super."RANSAC";
@@ -1306,6 +1310,7 @@ self: super: {
   "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
   "arb-fft" = dontDistribute super."arb-fft";
   "arbb-vm" = dontDistribute super."arbb-vm";
+  "arbtt" = doDistribute super."arbtt_0_9_0_7";
   "archive" = dontDistribute super."archive";
   "archiver" = dontDistribute super."archiver";
   "archlinux" = dontDistribute super."archlinux";
@@ -1413,6 +1418,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -1543,6 +1549,7 @@ self: super: {
   "binary-store" = dontDistribute super."binary-store";
   "binary-streams" = dontDistribute super."binary-streams";
   "binary-strict" = dontDistribute super."binary-strict";
+  "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0";
   "binary-typed" = dontDistribute super."binary-typed";
   "binarydefer" = dontDistribute super."binarydefer";
   "bind-marshal" = dontDistribute super."bind-marshal";
@@ -1960,6 +1967,7 @@ self: super: {
   "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
   "clckwrks" = dontDistribute super."clckwrks";
   "clckwrks-cli" = dontDistribute super."clckwrks-cli";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
@@ -1992,6 +2000,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -2102,6 +2111,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
@@ -2324,6 +2334,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2347,6 +2358,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2526,6 +2538,7 @@ self: super: {
   "digest-pure" = dontDistribute super."digest-pure";
   "digestive-bootstrap" = dontDistribute super."digestive-bootstrap";
   "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18";
   "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze";
   "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
   "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
@@ -2962,6 +2975,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -3122,6 +3136,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -3871,6 +3886,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
   "hasql-th" = dontDistribute super."hasql-th";
@@ -4182,6 +4198,9 @@ self: super: {
   "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";
@@ -4599,6 +4618,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5410,6 +5430,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5423,6 +5444,7 @@ self: super: {
   "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
   "monad-open" = dontDistribute super."monad-open";
   "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-products" = doDistribute super."monad-products_4_0_0_1";
@@ -5513,6 +5535,7 @@ self: super: {
   "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";
@@ -5752,6 +5775,7 @@ self: super: {
   "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";
@@ -5822,6 +5846,7 @@ self: super: {
   "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";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6068,6 +6093,7 @@ self: super: {
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_1_0";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
@@ -6221,6 +6247,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6392,6 +6419,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6543,6 +6571,9 @@ self: super: {
   "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";
@@ -6716,6 +6747,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -7019,6 +7051,7 @@ self: super: {
   "smartconstructor" = dontDistribute super."smartconstructor";
   "smartword" = dontDistribute super."smartword";
   "sme" = dontDistribute super."sme";
+  "smoothie" = doDistribute super."smoothie_0_4_2_1";
   "smsaero" = dontDistribute super."smsaero";
   "smt-lib" = dontDistribute super."smt-lib";
   "smtlib2" = dontDistribute super."smtlib2";
@@ -7100,6 +7133,7 @@ self: super: {
   "sockaddr" = dontDistribute super."sockaddr";
   "socket" = dontDistribute super."socket";
   "socket-activation" = dontDistribute super."socket-activation";
+  "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "soegtk" = dontDistribute super."soegtk";
@@ -7673,6 +7707,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7685,6 +7720,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -7984,6 +8020,7 @@ self: super: {
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index cde1bb303ff6..7df0af1bb2a5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -166,6 +166,7 @@ self: super: {
   "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -314,6 +315,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -784,7 +786,9 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickPlot" = dontDistribute super."QuickPlot";
   "Quickson" = dontDistribute super."Quickson";
   "R-pandoc" = dontDistribute super."R-pandoc";
   "RANSAC" = dontDistribute super."RANSAC";
@@ -1306,6 +1310,7 @@ self: super: {
   "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
   "arb-fft" = dontDistribute super."arb-fft";
   "arbb-vm" = dontDistribute super."arbb-vm";
+  "arbtt" = doDistribute super."arbtt_0_9_0_7";
   "archive" = dontDistribute super."archive";
   "archiver" = dontDistribute super."archiver";
   "archlinux" = dontDistribute super."archlinux";
@@ -1413,6 +1418,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -1543,6 +1549,7 @@ self: super: {
   "binary-store" = dontDistribute super."binary-store";
   "binary-streams" = dontDistribute super."binary-streams";
   "binary-strict" = dontDistribute super."binary-strict";
+  "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0";
   "binary-typed" = dontDistribute super."binary-typed";
   "binarydefer" = dontDistribute super."binarydefer";
   "bind-marshal" = dontDistribute super."bind-marshal";
@@ -1960,6 +1967,7 @@ self: super: {
   "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
   "clckwrks" = dontDistribute super."clckwrks";
   "clckwrks-cli" = dontDistribute super."clckwrks-cli";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
@@ -1992,6 +2000,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -2102,6 +2111,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
@@ -2324,6 +2334,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2347,6 +2358,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2526,6 +2538,7 @@ self: super: {
   "digest-pure" = dontDistribute super."digest-pure";
   "digestive-bootstrap" = dontDistribute super."digestive-bootstrap";
   "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18";
   "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze";
   "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
   "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
@@ -2962,6 +2975,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -3122,6 +3136,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -3869,6 +3884,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
   "hasql-th" = dontDistribute super."hasql-th";
@@ -4179,6 +4195,9 @@ self: super: {
   "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";
@@ -4595,6 +4614,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5406,6 +5426,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5419,6 +5440,7 @@ self: super: {
   "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
   "monad-open" = dontDistribute super."monad-open";
   "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-products" = doDistribute super."monad-products_4_0_0_1";
@@ -5509,6 +5531,7 @@ self: super: {
   "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";
@@ -5748,6 +5771,7 @@ self: super: {
   "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";
@@ -5818,6 +5842,7 @@ self: super: {
   "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";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6064,6 +6089,7 @@ self: super: {
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_1_0";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
@@ -6217,6 +6243,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6388,6 +6415,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6539,6 +6567,9 @@ self: super: {
   "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";
@@ -6712,6 +6743,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -7014,6 +7046,7 @@ self: super: {
   "smartconstructor" = dontDistribute super."smartconstructor";
   "smartword" = dontDistribute super."smartword";
   "sme" = dontDistribute super."sme";
+  "smoothie" = doDistribute super."smoothie_0_4_2_1";
   "smsaero" = dontDistribute super."smsaero";
   "smt-lib" = dontDistribute super."smt-lib";
   "smtlib2" = dontDistribute super."smtlib2";
@@ -7095,6 +7128,7 @@ self: super: {
   "sockaddr" = dontDistribute super."sockaddr";
   "socket" = dontDistribute super."socket";
   "socket-activation" = dontDistribute super."socket-activation";
+  "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "soegtk" = dontDistribute super."soegtk";
@@ -7668,6 +7702,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7680,6 +7715,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -7979,6 +8015,7 @@ self: super: {
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index d3c3eecf1eae..fe271aec27a0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -166,6 +166,7 @@ self: super: {
   "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -314,6 +315,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -783,7 +785,9 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickPlot" = dontDistribute super."QuickPlot";
   "Quickson" = dontDistribute super."Quickson";
   "R-pandoc" = dontDistribute super."R-pandoc";
   "RANSAC" = dontDistribute super."RANSAC";
@@ -1305,6 +1309,7 @@ self: super: {
   "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
   "arb-fft" = dontDistribute super."arb-fft";
   "arbb-vm" = dontDistribute super."arbb-vm";
+  "arbtt" = doDistribute super."arbtt_0_9_0_7";
   "archive" = dontDistribute super."archive";
   "archiver" = dontDistribute super."archiver";
   "archlinux" = dontDistribute super."archlinux";
@@ -1412,6 +1417,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -1542,6 +1548,7 @@ self: super: {
   "binary-store" = dontDistribute super."binary-store";
   "binary-streams" = dontDistribute super."binary-streams";
   "binary-strict" = dontDistribute super."binary-strict";
+  "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0";
   "binary-typed" = dontDistribute super."binary-typed";
   "binarydefer" = dontDistribute super."binarydefer";
   "bind-marshal" = dontDistribute super."bind-marshal";
@@ -1959,6 +1966,7 @@ self: super: {
   "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
   "clckwrks" = dontDistribute super."clckwrks";
   "clckwrks-cli" = dontDistribute super."clckwrks-cli";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
@@ -1991,6 +1999,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -2101,6 +2110,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
@@ -2323,6 +2333,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2346,6 +2357,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2525,6 +2537,7 @@ self: super: {
   "digest-pure" = dontDistribute super."digest-pure";
   "digestive-bootstrap" = dontDistribute super."digestive-bootstrap";
   "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18";
   "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze";
   "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
   "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
@@ -2960,6 +2973,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -3120,6 +3134,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -3866,6 +3881,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
   "hasql-th" = dontDistribute super."hasql-th";
@@ -4176,6 +4192,9 @@ self: super: {
   "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";
@@ -4592,6 +4611,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5401,6 +5421,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5414,6 +5435,7 @@ self: super: {
   "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
   "monad-open" = dontDistribute super."monad-open";
   "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-products" = doDistribute super."monad-products_4_0_0_1";
@@ -5504,6 +5526,7 @@ self: super: {
   "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";
@@ -5743,6 +5766,7 @@ self: super: {
   "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";
@@ -5813,6 +5837,7 @@ self: super: {
   "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";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6058,6 +6083,7 @@ self: super: {
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_1_0";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
@@ -6210,6 +6236,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6381,6 +6408,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6531,6 +6559,9 @@ self: super: {
   "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";
@@ -6704,6 +6735,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -7005,6 +7037,7 @@ self: super: {
   "smartconstructor" = dontDistribute super."smartconstructor";
   "smartword" = dontDistribute super."smartword";
   "sme" = dontDistribute super."sme";
+  "smoothie" = doDistribute super."smoothie_0_4_2_1";
   "smsaero" = dontDistribute super."smsaero";
   "smt-lib" = dontDistribute super."smt-lib";
   "smtlib2" = dontDistribute super."smtlib2";
@@ -7086,6 +7119,7 @@ self: super: {
   "sockaddr" = dontDistribute super."sockaddr";
   "socket" = dontDistribute super."socket";
   "socket-activation" = dontDistribute super."socket-activation";
+  "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "soegtk" = dontDistribute super."soegtk";
@@ -7252,6 +7286,7 @@ self: super: {
   "streamed" = dontDistribute super."streamed";
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
+  "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
@@ -7655,6 +7690,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7667,6 +7703,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -7966,6 +8003,7 @@ self: super: {
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index 2f0d9ece96b1..dc618d2f2b56 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -166,6 +166,7 @@ self: super: {
   "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -314,6 +315,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -783,7 +785,9 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickPlot" = dontDistribute super."QuickPlot";
   "Quickson" = dontDistribute super."Quickson";
   "R-pandoc" = dontDistribute super."R-pandoc";
   "RANSAC" = dontDistribute super."RANSAC";
@@ -1304,6 +1308,7 @@ self: super: {
   "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
   "arb-fft" = dontDistribute super."arb-fft";
   "arbb-vm" = dontDistribute super."arbb-vm";
+  "arbtt" = doDistribute super."arbtt_0_9_0_7";
   "archive" = dontDistribute super."archive";
   "archiver" = dontDistribute super."archiver";
   "archlinux" = dontDistribute super."archlinux";
@@ -1411,6 +1416,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -1541,6 +1547,7 @@ self: super: {
   "binary-store" = dontDistribute super."binary-store";
   "binary-streams" = dontDistribute super."binary-streams";
   "binary-strict" = dontDistribute super."binary-strict";
+  "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0";
   "binary-typed" = dontDistribute super."binary-typed";
   "binarydefer" = dontDistribute super."binarydefer";
   "bind-marshal" = dontDistribute super."bind-marshal";
@@ -1957,6 +1964,7 @@ self: super: {
   "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
   "clckwrks" = dontDistribute super."clckwrks";
   "clckwrks-cli" = dontDistribute super."clckwrks-cli";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
@@ -1989,6 +1997,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -2099,6 +2108,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
@@ -2320,6 +2330,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2343,6 +2354,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2522,6 +2534,7 @@ self: super: {
   "digest-pure" = dontDistribute super."digest-pure";
   "digestive-bootstrap" = dontDistribute super."digestive-bootstrap";
   "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18";
   "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze";
   "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
   "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
@@ -2957,6 +2970,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -3117,6 +3131,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -3862,6 +3877,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
   "hasql-th" = dontDistribute super."hasql-th";
@@ -4172,6 +4188,9 @@ self: super: {
   "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";
@@ -4588,6 +4607,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
   "increments" = dontDistribute super."increments";
@@ -5395,6 +5415,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5408,6 +5429,7 @@ self: super: {
   "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
   "monad-open" = dontDistribute super."monad-open";
   "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-products" = doDistribute super."monad-products_4_0_0_1";
@@ -5497,6 +5519,7 @@ self: super: {
   "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";
@@ -5736,6 +5759,7 @@ self: super: {
   "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";
@@ -5806,6 +5830,7 @@ self: super: {
   "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";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6051,6 +6076,7 @@ self: super: {
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_1_0";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
@@ -6203,6 +6229,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6374,6 +6401,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6524,6 +6552,9 @@ self: super: {
   "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";
@@ -6697,6 +6728,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -6998,6 +7030,7 @@ self: super: {
   "smartconstructor" = dontDistribute super."smartconstructor";
   "smartword" = dontDistribute super."smartword";
   "sme" = dontDistribute super."sme";
+  "smoothie" = doDistribute super."smoothie_0_4_2_1";
   "smsaero" = dontDistribute super."smsaero";
   "smt-lib" = dontDistribute super."smt-lib";
   "smtlib2" = dontDistribute super."smtlib2";
@@ -7079,6 +7112,7 @@ self: super: {
   "sockaddr" = dontDistribute super."sockaddr";
   "socket" = dontDistribute super."socket";
   "socket-activation" = dontDistribute super."socket-activation";
+  "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "soegtk" = dontDistribute super."soegtk";
@@ -7245,6 +7279,7 @@ self: super: {
   "streamed" = dontDistribute super."streamed";
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
+  "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
@@ -7648,6 +7683,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7660,6 +7696,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -7958,6 +7995,7 @@ self: super: {
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index 208ba6fedffb..8f92e45e6ca1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -166,6 +166,7 @@ self: super: {
   "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -314,6 +315,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -783,7 +785,9 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickPlot" = dontDistribute super."QuickPlot";
   "Quickson" = dontDistribute super."Quickson";
   "R-pandoc" = dontDistribute super."R-pandoc";
   "RANSAC" = dontDistribute super."RANSAC";
@@ -1304,6 +1308,7 @@ self: super: {
   "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
   "arb-fft" = dontDistribute super."arb-fft";
   "arbb-vm" = dontDistribute super."arbb-vm";
+  "arbtt" = doDistribute super."arbtt_0_9_0_7";
   "archive" = dontDistribute super."archive";
   "archiver" = dontDistribute super."archiver";
   "archlinux" = dontDistribute super."archlinux";
@@ -1411,6 +1416,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -1541,6 +1547,7 @@ self: super: {
   "binary-store" = dontDistribute super."binary-store";
   "binary-streams" = dontDistribute super."binary-streams";
   "binary-strict" = dontDistribute super."binary-strict";
+  "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0";
   "binary-typed" = dontDistribute super."binary-typed";
   "binarydefer" = dontDistribute super."binarydefer";
   "bind-marshal" = dontDistribute super."bind-marshal";
@@ -1956,6 +1963,7 @@ self: super: {
   "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
   "clckwrks" = dontDistribute super."clckwrks";
   "clckwrks-cli" = dontDistribute super."clckwrks-cli";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
@@ -1988,6 +1996,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -2098,6 +2107,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
@@ -2319,6 +2329,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2342,6 +2353,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2521,6 +2533,7 @@ self: super: {
   "digest-pure" = dontDistribute super."digest-pure";
   "digestive-bootstrap" = dontDistribute super."digestive-bootstrap";
   "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18";
   "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze";
   "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
   "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
@@ -2956,6 +2969,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -3116,6 +3130,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -3857,6 +3872,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
   "hasql-th" = dontDistribute super."hasql-th";
@@ -4166,6 +4182,9 @@ self: super: {
   "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";
@@ -4579,6 +4598,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
   "increments" = dontDistribute super."increments";
@@ -5386,6 +5406,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5399,6 +5420,7 @@ self: super: {
   "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
   "monad-open" = dontDistribute super."monad-open";
   "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-products" = doDistribute super."monad-products_4_0_0_1";
@@ -5488,6 +5510,7 @@ self: super: {
   "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";
@@ -5727,6 +5750,7 @@ self: super: {
   "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";
@@ -5797,6 +5821,7 @@ self: super: {
   "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";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6041,6 +6066,7 @@ self: super: {
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_1_0";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
@@ -6193,6 +6219,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6362,6 +6389,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6512,6 +6540,9 @@ self: super: {
   "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";
@@ -6685,6 +6716,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -6985,6 +7017,7 @@ self: super: {
   "smartconstructor" = dontDistribute super."smartconstructor";
   "smartword" = dontDistribute super."smartword";
   "sme" = dontDistribute super."sme";
+  "smoothie" = doDistribute super."smoothie_0_4_2_1";
   "smsaero" = dontDistribute super."smsaero";
   "smt-lib" = dontDistribute super."smt-lib";
   "smtlib2" = dontDistribute super."smtlib2";
@@ -7066,6 +7099,7 @@ self: super: {
   "sockaddr" = dontDistribute super."sockaddr";
   "socket" = dontDistribute super."socket";
   "socket-activation" = dontDistribute super."socket-activation";
+  "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "soegtk" = dontDistribute super."soegtk";
@@ -7232,6 +7266,7 @@ self: super: {
   "streamed" = dontDistribute super."streamed";
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
+  "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
@@ -7467,6 +7502,7 @@ self: super: {
   "testrunner" = dontDistribute super."testrunner";
   "tetris" = dontDistribute super."tetris";
   "tex2txt" = dontDistribute super."tex2txt";
+  "texmath" = doDistribute super."texmath_0_8_4_1";
   "texrunner" = dontDistribute super."texrunner";
   "text" = doDistribute super."text_1_2_1_3";
   "text-and-plots" = dontDistribute super."text-and-plots";
@@ -7634,6 +7670,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7646,6 +7683,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -7943,6 +7981,7 @@ self: super: {
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index 296a97f41c5a..b38924fbbf25 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -165,6 +165,7 @@ self: super: {
   "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -313,6 +314,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -782,7 +784,9 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickPlot" = dontDistribute super."QuickPlot";
   "Quickson" = dontDistribute super."Quickson";
   "R-pandoc" = dontDistribute super."R-pandoc";
   "RANSAC" = dontDistribute super."RANSAC";
@@ -1303,6 +1307,7 @@ self: super: {
   "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
   "arb-fft" = dontDistribute super."arb-fft";
   "arbb-vm" = dontDistribute super."arbb-vm";
+  "arbtt" = doDistribute super."arbtt_0_9_0_7";
   "archive" = dontDistribute super."archive";
   "archiver" = dontDistribute super."archiver";
   "archlinux" = dontDistribute super."archlinux";
@@ -1408,6 +1413,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -1538,6 +1544,7 @@ self: super: {
   "binary-store" = dontDistribute super."binary-store";
   "binary-streams" = dontDistribute super."binary-streams";
   "binary-strict" = dontDistribute super."binary-strict";
+  "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0";
   "binary-typed" = dontDistribute super."binary-typed";
   "binarydefer" = dontDistribute super."binarydefer";
   "bind-marshal" = dontDistribute super."bind-marshal";
@@ -1951,6 +1958,7 @@ self: super: {
   "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
   "clckwrks" = dontDistribute super."clckwrks";
   "clckwrks-cli" = dontDistribute super."clckwrks-cli";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
@@ -1983,6 +1991,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -2092,6 +2101,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
@@ -2313,6 +2323,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2336,6 +2347,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2515,6 +2527,7 @@ self: super: {
   "digest-pure" = dontDistribute super."digest-pure";
   "digestive-bootstrap" = dontDistribute super."digestive-bootstrap";
   "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18";
   "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze";
   "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
   "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
@@ -2950,6 +2963,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -3110,6 +3124,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -3851,6 +3866,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
   "hasql-th" = dontDistribute super."hasql-th";
@@ -4158,6 +4174,9 @@ self: super: {
   "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";
@@ -4570,6 +4589,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
   "increments" = dontDistribute super."increments";
@@ -5375,6 +5395,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5388,6 +5409,7 @@ self: super: {
   "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
   "monad-open" = dontDistribute super."monad-open";
   "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-products" = doDistribute super."monad-products_4_0_0_1";
@@ -5477,6 +5499,7 @@ self: super: {
   "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";
@@ -5715,6 +5738,7 @@ self: super: {
   "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";
@@ -5785,6 +5809,7 @@ self: super: {
   "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";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6027,6 +6052,7 @@ self: super: {
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_1_0";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
@@ -6179,6 +6205,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6348,6 +6375,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6498,6 +6526,9 @@ self: super: {
   "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";
@@ -6671,6 +6702,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -6971,6 +7003,7 @@ self: super: {
   "smartconstructor" = dontDistribute super."smartconstructor";
   "smartword" = dontDistribute super."smartword";
   "sme" = dontDistribute super."sme";
+  "smoothie" = doDistribute super."smoothie_0_4_2_1";
   "smsaero" = dontDistribute super."smsaero";
   "smt-lib" = dontDistribute super."smt-lib";
   "smtlib2" = dontDistribute super."smtlib2";
@@ -7051,6 +7084,7 @@ self: super: {
   "sockaddr" = dontDistribute super."sockaddr";
   "socket" = dontDistribute super."socket";
   "socket-activation" = dontDistribute super."socket-activation";
+  "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "soegtk" = dontDistribute super."soegtk";
@@ -7217,6 +7251,7 @@ self: super: {
   "streamed" = dontDistribute super."streamed";
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
+  "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
@@ -7452,6 +7487,7 @@ self: super: {
   "testrunner" = dontDistribute super."testrunner";
   "tetris" = dontDistribute super."tetris";
   "tex2txt" = dontDistribute super."tex2txt";
+  "texmath" = doDistribute super."texmath_0_8_4_1";
   "texrunner" = dontDistribute super."texrunner";
   "text" = doDistribute super."text_1_2_1_3";
   "text-and-plots" = dontDistribute super."text-and-plots";
@@ -7619,6 +7655,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7631,6 +7668,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -7928,6 +7966,7 @@ self: super: {
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index c44009d33c0f..ab3660227dcd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -169,6 +169,7 @@ self: super: {
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -317,6 +318,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -789,7 +791,9 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickPlot" = dontDistribute super."QuickPlot";
   "Quickson" = dontDistribute super."Quickson";
   "R-pandoc" = dontDistribute super."R-pandoc";
   "RANSAC" = dontDistribute super."RANSAC";
@@ -1426,6 +1430,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2016,6 +2021,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -2126,6 +2132,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
@@ -2352,6 +2359,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2375,6 +2383,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -3002,6 +3011,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -3165,6 +3175,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -3918,6 +3929,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4233,6 +4245,9 @@ self: super: {
   "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";
@@ -4654,6 +4669,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5473,6 +5489,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5579,6 +5596,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -5821,6 +5839,7 @@ self: super: {
   "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";
@@ -5892,6 +5911,7 @@ self: super: {
   "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";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6302,6 +6322,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6475,6 +6496,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6628,6 +6650,9 @@ self: super: {
   "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";
@@ -6801,6 +6826,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -7772,6 +7798,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7784,6 +7811,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8087,6 +8115,7 @@ self: super: {
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index 32cd18e64e3e..bb320bd6d3bd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -165,6 +165,7 @@ self: super: {
   "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -313,6 +314,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -781,7 +783,9 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickPlot" = dontDistribute super."QuickPlot";
   "Quickson" = dontDistribute super."Quickson";
   "R-pandoc" = dontDistribute super."R-pandoc";
   "RANSAC" = dontDistribute super."RANSAC";
@@ -1113,6 +1117,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = doDistribute super."aeson-compat_0_3_0_0";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = doDistribute super."aeson-extra_0_2_3_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1301,6 +1306,7 @@ self: super: {
   "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
   "arb-fft" = dontDistribute super."arb-fft";
   "arbb-vm" = dontDistribute super."arbb-vm";
+  "arbtt" = doDistribute super."arbtt_0_9_0_7";
   "archive" = dontDistribute super."archive";
   "archiver" = dontDistribute super."archiver";
   "archlinux" = dontDistribute super."archlinux";
@@ -1406,6 +1412,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -1536,6 +1543,7 @@ self: super: {
   "binary-store" = dontDistribute super."binary-store";
   "binary-streams" = dontDistribute super."binary-streams";
   "binary-strict" = dontDistribute super."binary-strict";
+  "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0";
   "binary-typed" = dontDistribute super."binary-typed";
   "binarydefer" = dontDistribute super."binarydefer";
   "bind-marshal" = dontDistribute super."bind-marshal";
@@ -1949,6 +1957,7 @@ self: super: {
   "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
   "clckwrks" = dontDistribute super."clckwrks";
   "clckwrks-cli" = dontDistribute super."clckwrks-cli";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
@@ -1981,6 +1990,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -2090,6 +2100,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
@@ -2311,6 +2322,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2334,6 +2346,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2513,6 +2526,7 @@ self: super: {
   "digest-pure" = dontDistribute super."digest-pure";
   "digestive-bootstrap" = dontDistribute super."digestive-bootstrap";
   "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18";
   "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze";
   "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
   "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
@@ -2948,6 +2962,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -3108,6 +3123,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -3849,6 +3865,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
   "hasql-th" = dontDistribute super."hasql-th";
@@ -4156,6 +4173,9 @@ self: super: {
   "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";
@@ -4568,6 +4588,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
   "increments" = dontDistribute super."increments";
@@ -5372,6 +5393,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5385,6 +5407,7 @@ self: super: {
   "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
   "monad-open" = dontDistribute super."monad-open";
   "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-products" = doDistribute super."monad-products_4_0_0_1";
@@ -5474,6 +5497,7 @@ self: super: {
   "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";
@@ -5712,6 +5736,7 @@ self: super: {
   "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";
@@ -5782,6 +5807,7 @@ self: super: {
   "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";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6023,6 +6049,7 @@ self: super: {
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_1_0";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
@@ -6175,6 +6202,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6344,6 +6372,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6493,6 +6522,9 @@ self: super: {
   "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";
@@ -6666,6 +6698,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -6966,6 +6999,7 @@ self: super: {
   "smartconstructor" = dontDistribute super."smartconstructor";
   "smartword" = dontDistribute super."smartword";
   "sme" = dontDistribute super."sme";
+  "smoothie" = doDistribute super."smoothie_0_4_2_1";
   "smsaero" = dontDistribute super."smsaero";
   "smt-lib" = dontDistribute super."smt-lib";
   "smtlib2" = dontDistribute super."smtlib2";
@@ -7046,6 +7080,7 @@ self: super: {
   "sockaddr" = dontDistribute super."sockaddr";
   "socket" = dontDistribute super."socket";
   "socket-activation" = dontDistribute super."socket-activation";
+  "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "soegtk" = dontDistribute super."soegtk";
@@ -7211,6 +7246,7 @@ self: super: {
   "streamed" = dontDistribute super."streamed";
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
+  "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
@@ -7446,6 +7482,7 @@ self: super: {
   "testrunner" = dontDistribute super."testrunner";
   "tetris" = dontDistribute super."tetris";
   "tex2txt" = dontDistribute super."tex2txt";
+  "texmath" = doDistribute super."texmath_0_8_4_1";
   "texrunner" = dontDistribute super."texrunner";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
@@ -7612,6 +7649,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7624,6 +7662,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -7921,6 +7960,7 @@ self: super: {
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index d1ff009a56a3..53ba6103f2c7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -165,6 +165,7 @@ self: super: {
   "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -313,6 +314,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -781,7 +783,9 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickPlot" = dontDistribute super."QuickPlot";
   "Quickson" = dontDistribute super."Quickson";
   "R-pandoc" = dontDistribute super."R-pandoc";
   "RANSAC" = dontDistribute super."RANSAC";
@@ -1113,6 +1117,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = doDistribute super."aeson-compat_0_3_0_0";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = doDistribute super."aeson-extra_0_2_3_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1301,6 +1306,7 @@ self: super: {
   "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
   "arb-fft" = dontDistribute super."arb-fft";
   "arbb-vm" = dontDistribute super."arbb-vm";
+  "arbtt" = doDistribute super."arbtt_0_9_0_7";
   "archive" = dontDistribute super."archive";
   "archiver" = dontDistribute super."archiver";
   "archlinux" = dontDistribute super."archlinux";
@@ -1406,6 +1412,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -1535,6 +1542,7 @@ self: super: {
   "binary-store" = dontDistribute super."binary-store";
   "binary-streams" = dontDistribute super."binary-streams";
   "binary-strict" = dontDistribute super."binary-strict";
+  "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0";
   "binary-typed" = dontDistribute super."binary-typed";
   "binarydefer" = dontDistribute super."binarydefer";
   "bind-marshal" = dontDistribute super."bind-marshal";
@@ -1948,6 +1956,7 @@ self: super: {
   "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
   "clckwrks" = dontDistribute super."clckwrks";
   "clckwrks-cli" = dontDistribute super."clckwrks-cli";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
@@ -1980,6 +1989,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -2087,6 +2097,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
@@ -2308,6 +2319,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2331,6 +2343,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2510,6 +2523,7 @@ self: super: {
   "digest-pure" = dontDistribute super."digest-pure";
   "digestive-bootstrap" = dontDistribute super."digestive-bootstrap";
   "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18";
   "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze";
   "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
   "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
@@ -2943,6 +2957,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -3103,6 +3118,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -3843,6 +3859,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
   "hasql-th" = dontDistribute super."hasql-th";
@@ -4150,6 +4167,9 @@ self: super: {
   "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";
@@ -4560,6 +4580,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
   "increments" = dontDistribute super."increments";
@@ -5364,6 +5385,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5377,6 +5399,7 @@ self: super: {
   "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
   "monad-open" = dontDistribute super."monad-open";
   "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-products" = doDistribute super."monad-products_4_0_0_1";
@@ -5465,6 +5488,7 @@ self: super: {
   "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";
@@ -5703,6 +5727,7 @@ self: super: {
   "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";
@@ -5773,6 +5798,7 @@ self: super: {
   "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";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6012,6 +6038,7 @@ self: super: {
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_1_0";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
@@ -6164,6 +6191,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6333,6 +6361,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6481,6 +6510,9 @@ self: super: {
   "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";
@@ -6653,6 +6685,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -6943,6 +6976,7 @@ self: super: {
   "smartconstructor" = dontDistribute super."smartconstructor";
   "smartword" = dontDistribute super."smartword";
   "sme" = dontDistribute super."sme";
+  "smoothie" = doDistribute super."smoothie_0_4_2_1";
   "smsaero" = dontDistribute super."smsaero";
   "smt-lib" = dontDistribute super."smt-lib";
   "smtlib2" = dontDistribute super."smtlib2";
@@ -7023,6 +7057,7 @@ self: super: {
   "sockaddr" = dontDistribute super."sockaddr";
   "socket" = dontDistribute super."socket";
   "socket-activation" = dontDistribute super."socket-activation";
+  "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "soegtk" = dontDistribute super."soegtk";
@@ -7188,6 +7223,7 @@ self: super: {
   "streamed" = dontDistribute super."streamed";
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
+  "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
@@ -7423,6 +7459,7 @@ self: super: {
   "testrunner" = dontDistribute super."testrunner";
   "tetris" = dontDistribute super."tetris";
   "tex2txt" = dontDistribute super."tex2txt";
+  "texmath" = doDistribute super."texmath_0_8_4_1";
   "texrunner" = dontDistribute super."texrunner";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
@@ -7589,6 +7626,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7601,6 +7639,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -7897,6 +7936,7 @@ self: super: {
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
index b4f37b347aaa..ac439cb6a017 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -165,6 +165,7 @@ self: super: {
   "ChannelT" = dontDistribute super."ChannelT";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -313,6 +314,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -781,7 +783,9 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickPlot" = dontDistribute super."QuickPlot";
   "Quickson" = dontDistribute super."Quickson";
   "R-pandoc" = dontDistribute super."R-pandoc";
   "RANSAC" = dontDistribute super."RANSAC";
@@ -1113,6 +1117,7 @@ self: super: {
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-casing" = dontDistribute super."aeson-casing";
+  "aeson-compat" = doDistribute super."aeson-compat_0_3_0_0";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = doDistribute super."aeson-extra_0_2_3_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1301,6 +1306,7 @@ self: super: {
   "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
   "arb-fft" = dontDistribute super."arb-fft";
   "arbb-vm" = dontDistribute super."arbb-vm";
+  "arbtt" = doDistribute super."arbtt_0_9_0_7";
   "archive" = dontDistribute super."archive";
   "archiver" = dontDistribute super."archiver";
   "archlinux" = dontDistribute super."archlinux";
@@ -1406,6 +1412,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -1535,6 +1542,7 @@ self: super: {
   "binary-store" = dontDistribute super."binary-store";
   "binary-streams" = dontDistribute super."binary-streams";
   "binary-strict" = dontDistribute super."binary-strict";
+  "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0";
   "binary-typed" = dontDistribute super."binary-typed";
   "binarydefer" = dontDistribute super."binarydefer";
   "bind-marshal" = dontDistribute super."bind-marshal";
@@ -1948,6 +1956,7 @@ self: super: {
   "clash-vhdl" = doDistribute super."clash-vhdl_0_5_12";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
   "clckwrks" = dontDistribute super."clckwrks";
   "clckwrks-cli" = dontDistribute super."clckwrks-cli";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
@@ -1980,6 +1989,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -2087,6 +2097,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
@@ -2308,6 +2319,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2331,6 +2343,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2510,6 +2523,7 @@ self: super: {
   "digest-pure" = dontDistribute super."digest-pure";
   "digestive-bootstrap" = dontDistribute super."digestive-bootstrap";
   "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18";
   "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze";
   "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
   "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
@@ -2941,6 +2955,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -3101,6 +3116,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -3841,6 +3857,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
   "hasql-th" = dontDistribute super."hasql-th";
@@ -4147,6 +4164,9 @@ self: super: {
   "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";
@@ -4556,6 +4576,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
   "increments" = dontDistribute super."increments";
@@ -5358,6 +5379,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5371,6 +5393,7 @@ self: super: {
   "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
   "monad-open" = dontDistribute super."monad-open";
   "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-products" = doDistribute super."monad-products_4_0_0_1";
@@ -5459,6 +5482,7 @@ self: super: {
   "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";
@@ -5697,6 +5721,7 @@ self: super: {
   "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";
@@ -5767,6 +5792,7 @@ self: super: {
   "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";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6006,6 +6032,7 @@ self: super: {
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_1_0";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
@@ -6158,6 +6185,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6327,6 +6355,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6475,6 +6504,9 @@ self: super: {
   "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";
@@ -6647,6 +6679,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -6937,6 +6970,7 @@ self: super: {
   "smartconstructor" = dontDistribute super."smartconstructor";
   "smartword" = dontDistribute super."smartword";
   "sme" = dontDistribute super."sme";
+  "smoothie" = doDistribute super."smoothie_0_4_2_1";
   "smsaero" = dontDistribute super."smsaero";
   "smt-lib" = dontDistribute super."smt-lib";
   "smtlib2" = dontDistribute super."smtlib2";
@@ -7017,6 +7051,7 @@ self: super: {
   "sockaddr" = dontDistribute super."sockaddr";
   "socket" = dontDistribute super."socket";
   "socket-activation" = dontDistribute super."socket-activation";
+  "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "soegtk" = dontDistribute super."soegtk";
@@ -7182,6 +7217,7 @@ self: super: {
   "streamed" = dontDistribute super."streamed";
   "streaming" = dontDistribute super."streaming";
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
+  "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
@@ -7417,6 +7453,7 @@ self: super: {
   "testrunner" = dontDistribute super."testrunner";
   "tetris" = dontDistribute super."tetris";
   "tex2txt" = dontDistribute super."tex2txt";
+  "texmath" = doDistribute super."texmath_0_8_4_1";
   "texrunner" = dontDistribute super."texrunner";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
@@ -7583,6 +7620,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7595,6 +7633,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -7891,6 +7930,7 @@ self: super: {
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
@@ -8240,6 +8280,7 @@ self: super: {
   "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-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_6";
   "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-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index e7f095bac2d5..42ec1ca85207 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -169,6 +169,7 @@ self: super: {
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -317,6 +318,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -789,7 +791,9 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickPlot" = dontDistribute super."QuickPlot";
   "Quickson" = dontDistribute super."Quickson";
   "R-pandoc" = dontDistribute super."R-pandoc";
   "RANSAC" = dontDistribute super."RANSAC";
@@ -1425,6 +1429,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2015,6 +2020,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -2125,6 +2131,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
@@ -2349,6 +2356,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2372,6 +2380,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2999,6 +3008,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -3161,6 +3171,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -3914,6 +3925,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4228,6 +4240,9 @@ self: super: {
   "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";
@@ -4649,6 +4664,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5468,6 +5484,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5574,6 +5591,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -5816,6 +5834,7 @@ self: super: {
   "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";
@@ -5887,6 +5906,7 @@ self: super: {
   "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";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6297,6 +6317,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6470,6 +6491,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6622,6 +6644,9 @@ self: super: {
   "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";
@@ -6795,6 +6820,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -7764,6 +7790,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7776,6 +7803,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8078,6 +8106,7 @@ self: super: {
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index be89c0d27b1d..a1b98e0c86ff 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -169,6 +169,7 @@ self: super: {
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -317,6 +318,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -789,7 +791,9 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickPlot" = dontDistribute super."QuickPlot";
   "Quickson" = dontDistribute super."Quickson";
   "R-pandoc" = dontDistribute super."R-pandoc";
   "RANSAC" = dontDistribute super."RANSAC";
@@ -1425,6 +1429,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2015,6 +2020,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -2125,6 +2131,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
@@ -2349,6 +2356,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2372,6 +2380,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2999,6 +3008,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -3161,6 +3171,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -3914,6 +3925,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4228,6 +4240,9 @@ self: super: {
   "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";
@@ -4649,6 +4664,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5468,6 +5484,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5574,6 +5591,7 @@ self: super: {
   "mulang" = dontDistribute super."mulang";
   "multext-east-msd" = dontDistribute super."multext-east-msd";
   "multi-cabal" = dontDistribute super."multi-cabal";
+  "multiaddr" = dontDistribute super."multiaddr";
   "multiarg" = doDistribute super."multiarg_0_30_0_8";
   "multifocal" = dontDistribute super."multifocal";
   "multihash" = dontDistribute super."multihash";
@@ -5816,6 +5834,7 @@ self: super: {
   "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";
@@ -5887,6 +5906,7 @@ self: super: {
   "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";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6297,6 +6317,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6470,6 +6491,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6622,6 +6644,9 @@ self: super: {
   "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";
@@ -6795,6 +6820,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -7763,6 +7789,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7775,6 +7802,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8077,6 +8105,7 @@ self: super: {
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index 08e7d4607c1f..7741253ff12f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -169,6 +169,7 @@ self: super: {
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -317,6 +318,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -789,7 +791,9 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickPlot" = dontDistribute super."QuickPlot";
   "Quickson" = dontDistribute super."Quickson";
   "R-pandoc" = dontDistribute super."R-pandoc";
   "RANSAC" = dontDistribute super."RANSAC";
@@ -1424,6 +1428,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2014,6 +2019,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -2124,6 +2130,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
@@ -2348,6 +2355,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2371,6 +2379,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2997,6 +3006,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -3159,6 +3169,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -3911,6 +3922,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4224,6 +4236,9 @@ self: super: {
   "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";
@@ -4642,6 +4657,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5461,6 +5477,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5567,6 +5584,7 @@ self: super: {
   "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";
@@ -5808,6 +5826,7 @@ self: super: {
   "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";
@@ -5879,6 +5898,7 @@ self: super: {
   "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";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6129,6 +6149,7 @@ self: super: {
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_1_0";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
@@ -6286,6 +6307,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6459,6 +6481,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6611,6 +6634,9 @@ self: super: {
   "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";
@@ -6784,6 +6810,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -7749,6 +7776,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7761,6 +7789,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8063,6 +8092,7 @@ self: super: {
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index 75234059ec30..52de97dd05a3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -169,6 +169,7 @@ self: super: {
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -317,6 +318,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -789,7 +791,9 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickPlot" = dontDistribute super."QuickPlot";
   "Quickson" = dontDistribute super."Quickson";
   "R-pandoc" = dontDistribute super."R-pandoc";
   "RANSAC" = dontDistribute super."RANSAC";
@@ -1424,6 +1428,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2014,6 +2019,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -2124,6 +2130,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
@@ -2348,6 +2355,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2371,6 +2379,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2997,6 +3006,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -3158,6 +3168,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -3908,6 +3919,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres" = doDistribute super."hasql-postgres_0_10_5";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
@@ -4221,6 +4233,9 @@ self: super: {
   "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";
@@ -4639,6 +4654,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5455,6 +5471,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5560,6 +5577,7 @@ self: super: {
   "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";
@@ -5801,6 +5819,7 @@ self: super: {
   "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";
@@ -5872,6 +5891,7 @@ self: super: {
   "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";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6121,6 +6141,7 @@ self: super: {
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_1_0";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
@@ -6278,6 +6299,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6451,6 +6473,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6603,6 +6626,9 @@ self: super: {
   "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";
@@ -6776,6 +6802,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -7741,6 +7768,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7753,6 +7781,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8054,6 +8083,7 @@ self: super: {
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 01f7fab0ca15..a04a9953c14d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -169,6 +169,7 @@ self: super: {
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -317,6 +318,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -789,7 +791,9 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickPlot" = dontDistribute super."QuickPlot";
   "Quickson" = dontDistribute super."Quickson";
   "R-pandoc" = dontDistribute super."R-pandoc";
   "RANSAC" = dontDistribute super."RANSAC";
@@ -1313,6 +1317,7 @@ self: super: {
   "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
   "arb-fft" = dontDistribute super."arb-fft";
   "arbb-vm" = dontDistribute super."arbb-vm";
+  "arbtt" = doDistribute super."arbtt_0_9_0_7";
   "archive" = dontDistribute super."archive";
   "archiver" = dontDistribute super."archiver";
   "archlinux" = dontDistribute super."archlinux";
@@ -1421,6 +1426,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2011,6 +2017,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -2121,6 +2128,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
@@ -2344,6 +2352,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2367,6 +2376,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2993,6 +3003,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -3154,6 +3165,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -3904,6 +3916,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
   "hasql-th" = dontDistribute super."hasql-th";
@@ -4216,6 +4229,9 @@ self: super: {
   "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";
@@ -4634,6 +4650,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5449,6 +5466,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5554,6 +5572,7 @@ self: super: {
   "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";
@@ -5795,6 +5814,7 @@ self: super: {
   "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";
@@ -5866,6 +5886,7 @@ self: super: {
   "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";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6115,6 +6136,7 @@ self: super: {
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_1_0";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
@@ -6270,6 +6292,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6442,6 +6465,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6594,6 +6618,9 @@ self: super: {
   "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";
@@ -6767,6 +6794,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -7072,6 +7100,7 @@ self: super: {
   "smartconstructor" = dontDistribute super."smartconstructor";
   "smartword" = dontDistribute super."smartword";
   "sme" = dontDistribute super."sme";
+  "smoothie" = doDistribute super."smoothie_0_4_2_1";
   "smsaero" = dontDistribute super."smsaero";
   "smt-lib" = dontDistribute super."smt-lib";
   "smtlib2" = dontDistribute super."smtlib2";
@@ -7730,6 +7759,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7742,6 +7772,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8042,6 +8073,7 @@ self: super: {
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 6d7df9e59a9a..737c3db5c651 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -169,6 +169,7 @@ self: super: {
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -317,6 +318,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -789,7 +791,9 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickPlot" = dontDistribute super."QuickPlot";
   "Quickson" = dontDistribute super."Quickson";
   "R-pandoc" = dontDistribute super."R-pandoc";
   "RANSAC" = dontDistribute super."RANSAC";
@@ -1313,6 +1317,7 @@ self: super: {
   "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
   "arb-fft" = dontDistribute super."arb-fft";
   "arbb-vm" = dontDistribute super."arbb-vm";
+  "arbtt" = doDistribute super."arbtt_0_9_0_7";
   "archive" = dontDistribute super."archive";
   "archiver" = dontDistribute super."archiver";
   "archlinux" = dontDistribute super."archlinux";
@@ -1421,6 +1426,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2008,6 +2014,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -2118,6 +2125,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
@@ -2341,6 +2349,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2364,6 +2373,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2545,6 +2555,7 @@ self: super: {
   "digest-pure" = dontDistribute super."digest-pure";
   "digestive-bootstrap" = dontDistribute super."digestive-bootstrap";
   "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18";
   "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze";
   "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
   "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
@@ -2985,6 +2996,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -3146,6 +3158,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -3896,6 +3909,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
   "hasql-th" = dontDistribute super."hasql-th";
@@ -4208,6 +4222,9 @@ self: super: {
   "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";
@@ -4626,6 +4643,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5439,6 +5457,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5544,6 +5563,7 @@ self: super: {
   "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";
@@ -5785,6 +5805,7 @@ self: super: {
   "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";
@@ -5856,6 +5877,7 @@ self: super: {
   "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";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6105,6 +6127,7 @@ self: super: {
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_1_0";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
@@ -6259,6 +6282,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6430,6 +6454,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6581,6 +6606,9 @@ self: super: {
   "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";
@@ -6754,6 +6782,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -7059,6 +7088,7 @@ self: super: {
   "smartconstructor" = dontDistribute super."smartconstructor";
   "smartword" = dontDistribute super."smartword";
   "sme" = dontDistribute super."sme";
+  "smoothie" = doDistribute super."smoothie_0_4_2_1";
   "smsaero" = dontDistribute super."smsaero";
   "smt-lib" = dontDistribute super."smt-lib";
   "smtlib2" = dontDistribute super."smtlib2";
@@ -7716,6 +7746,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7728,6 +7759,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8028,6 +8060,7 @@ self: super: {
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 6286cdf3a429..96dd3a372880 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -169,6 +169,7 @@ self: super: {
   "Chart-diagrams" = doDistribute super."Chart-diagrams_1_5_1";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -317,6 +318,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -787,7 +789,9 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "QuickCheck-GenT" = dontDistribute super."QuickCheck-GenT";
+  "QuickPlot" = dontDistribute super."QuickPlot";
   "Quickson" = dontDistribute super."Quickson";
   "R-pandoc" = dontDistribute super."R-pandoc";
   "RANSAC" = dontDistribute super."RANSAC";
@@ -1311,6 +1315,7 @@ self: super: {
   "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
   "arb-fft" = dontDistribute super."arb-fft";
   "arbb-vm" = dontDistribute super."arbb-vm";
+  "arbtt" = doDistribute super."arbtt_0_9_0_7";
   "archive" = dontDistribute super."archive";
   "archiver" = dontDistribute super."archiver";
   "archlinux" = dontDistribute super."archlinux";
@@ -1419,6 +1424,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -2005,6 +2011,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -2115,6 +2122,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
   "conduit-extra" = doDistribute super."conduit-extra_1_1_9_1";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
@@ -2338,6 +2346,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2361,6 +2370,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2542,6 +2552,7 @@ self: super: {
   "digest-pure" = dontDistribute super."digest-pure";
   "digestive-bootstrap" = dontDistribute super."digestive-bootstrap";
   "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18";
   "digestive-functors-blaze" = dontDistribute super."digestive-functors-blaze";
   "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
   "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
@@ -2981,6 +2992,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -3141,6 +3153,7 @@ self: super: {
   "funbot-ext-events" = dontDistribute super."funbot-ext-events";
   "funbot-git-hook" = dontDistribute super."funbot-git-hook";
   "funcmp" = dontDistribute super."funcmp";
+  "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";
@@ -3891,6 +3904,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_7_4";
+  "hasql-optparse-applicative" = dontDistribute super."hasql-optparse-applicative";
   "hasql-pool" = dontDistribute super."hasql-pool";
   "hasql-postgres-options" = dontDistribute super."hasql-postgres-options";
   "hasql-th" = dontDistribute super."hasql-th";
@@ -4203,6 +4217,9 @@ self: super: {
   "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";
@@ -4621,6 +4638,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-parser" = doDistribute super."incremental-parser_0_2_3_4";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
@@ -5434,6 +5452,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5539,6 +5558,7 @@ self: super: {
   "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";
@@ -5780,6 +5800,7 @@ self: super: {
   "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";
@@ -5850,6 +5871,7 @@ self: super: {
   "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";
   "opml-conduit" = dontDistribute super."opml-conduit";
   "opn" = dontDistribute super."opn";
@@ -6099,6 +6121,7 @@ self: super: {
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_1_0";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
@@ -6253,6 +6276,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6424,6 +6448,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6575,6 +6600,9 @@ self: super: {
   "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";
@@ -6748,6 +6776,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -7053,6 +7082,7 @@ self: super: {
   "smartconstructor" = dontDistribute super."smartconstructor";
   "smartword" = dontDistribute super."smartword";
   "sme" = dontDistribute super."sme";
+  "smoothie" = doDistribute super."smoothie_0_4_2_1";
   "smsaero" = dontDistribute super."smsaero";
   "smt-lib" = dontDistribute super."smt-lib";
   "smtlib2" = dontDistribute super."smtlib2";
@@ -7710,6 +7740,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7722,6 +7753,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -8022,6 +8054,7 @@ self: super: {
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector" = doDistribute super."vector_0_10_12_3";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index a11e485c3f10..f92b9d4175e3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -166,6 +166,7 @@ self: super: {
   "Chart-diagrams" = dontDistribute super."Chart-diagrams";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -309,6 +310,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -763,8 +765,10 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "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";
@@ -1085,6 +1089,7 @@ self: super: {
   "aeson" = doDistribute super."aeson_0_10_0_0";
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-compat" = doDistribute super."aeson-compat_0_3_0_0";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = doDistribute super."aeson-extra_0_3_0_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1209,6 +1214,7 @@ self: super: {
   "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
   "arb-fft" = dontDistribute super."arb-fft";
   "arbb-vm" = dontDistribute super."arbb-vm";
+  "arbtt" = doDistribute super."arbtt_0_9_0_7";
   "archive" = dontDistribute super."archive";
   "archiver" = dontDistribute super."archiver";
   "archlinux" = dontDistribute super."archlinux";
@@ -1311,6 +1317,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -1434,6 +1441,7 @@ self: super: {
   "binary-store" = dontDistribute super."binary-store";
   "binary-streams" = dontDistribute super."binary-streams";
   "binary-strict" = dontDistribute super."binary-strict";
+  "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0";
   "binarydefer" = dontDistribute super."binarydefer";
   "bind-marshal" = dontDistribute super."bind-marshal";
   "binding-core" = dontDistribute super."binding-core";
@@ -1831,6 +1839,7 @@ self: super: {
   "clash-vhdl" = doDistribute super."clash-vhdl_0_6_4";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
@@ -1857,6 +1866,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -1961,6 +1971,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
@@ -2171,6 +2182,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2194,6 +2206,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2364,6 +2377,7 @@ self: super: {
   "digamma" = dontDistribute super."digamma";
   "digest-pure" = dontDistribute super."digest-pure";
   "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18";
   "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
   "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
   "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp";
@@ -2546,8 +2560,10 @@ self: super: {
   "eibd-client-simple" = dontDistribute super."eibd-client-simple";
   "eigen" = dontDistribute super."eigen";
   "eithers" = dontDistribute super."eithers";
+  "ekg" = doDistribute super."ekg_0_4_0_8";
   "ekg-bosun" = dontDistribute super."ekg-bosun";
   "ekg-carbon" = dontDistribute super."ekg-carbon";
+  "ekg-json" = doDistribute super."ekg-json_0_1_0_0";
   "ekg-log" = dontDistribute super."ekg-log";
   "ekg-push" = dontDistribute super."ekg-push";
   "ekg-rrd" = dontDistribute super."ekg-rrd";
@@ -2653,10 +2669,12 @@ self: super: {
   "event-list" = dontDistribute super."event-list";
   "event-monad" = dontDistribute super."event-monad";
   "eventloop" = dontDistribute super."eventloop";
+  "eventstore" = doDistribute super."eventstore_0_10_0_1";
   "every-bit-counts" = dontDistribute super."every-bit-counts";
   "ewe" = dontDistribute super."ewe";
   "ex-pool" = dontDistribute super."ex-pool";
   "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exact-pi" = doDistribute super."exact-pi_0_4_1_0";
   "exception-hierarchy" = dontDistribute super."exception-hierarchy";
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
@@ -2777,6 +2795,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -2934,6 +2953,7 @@ self: super: {
   "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";
@@ -3001,6 +3021,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generics-eot" = dontDistribute super."generics-eot";
+  "generics-sop" = doDistribute super."generics-sop_0_2_0_0";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
   "geni-gui" = dontDistribute super."geni-gui";
@@ -3087,6 +3108,7 @@ self: super: {
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
+  "gipeda" = doDistribute super."gipeda_0_2";
   "gist" = dontDistribute super."gist";
   "git-all" = dontDistribute super."git-all";
   "git-annex" = doDistribute super."git-annex_5_20151218";
@@ -3650,6 +3672,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_15_1";
+  "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";
@@ -3945,6 +3968,9 @@ self: super: {
   "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";
@@ -4326,6 +4352,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
   "increments" = dontDistribute super."increments";
@@ -4956,6 +4983,7 @@ self: super: {
   "manatee-terminal" = dontDistribute super."manatee-terminal";
   "manatee-welcome" = dontDistribute super."manatee-welcome";
   "mancala" = dontDistribute super."mancala";
+  "mandrill" = doDistribute super."mandrill_0_5_0_0";
   "mandulia" = dontDistribute super."mandulia";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
@@ -5107,6 +5135,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5119,6 +5148,7 @@ self: super: {
   "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
   "monad-open" = dontDistribute super."monad-open";
   "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-products" = doDistribute super."monad-products_4_0_0_1";
@@ -5204,6 +5234,7 @@ self: super: {
   "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";
@@ -5245,6 +5276,7 @@ self: super: {
   "mvc" = dontDistribute super."mvc";
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
+  "mwc-probability" = doDistribute super."mwc-probability_1_0_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5428,6 +5460,7 @@ self: super: {
   "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";
@@ -5494,7 +5527,9 @@ self: super: {
   "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";
+  "opml-conduit" = doDistribute super."opml-conduit_0_4_0_0";
   "opn" = dontDistribute super."opn";
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
@@ -5620,6 +5655,9 @@ self: super: {
   "pcg-random" = dontDistribute super."pcg-random";
   "pcre-less" = dontDistribute super."pcre-less";
   "pcre-light-extra" = dontDistribute super."pcre-light-extra";
+  "pdf-toolbox-content" = doDistribute super."pdf-toolbox-content_0_0_5_0";
+  "pdf-toolbox-core" = doDistribute super."pdf-toolbox-core_0_0_4_0";
+  "pdf-toolbox-document" = doDistribute super."pdf-toolbox-document_0_0_7_0";
   "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer";
   "pdf2line" = dontDistribute super."pdf2line";
   "pdfsplit" = dontDistribute super."pdfsplit";
@@ -5716,6 +5754,7 @@ self: super: {
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_1_0";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
@@ -5859,6 +5898,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6023,6 +6063,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6111,6 +6152,7 @@ self: super: {
   "reflex-gloss" = dontDistribute super."reflex-gloss";
   "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
   "reflex-transformers" = dontDistribute super."reflex-transformers";
+  "regex-applicative-text" = doDistribute super."regex-applicative-text_0_1_0_0";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
   "regex-dfa" = dontDistribute super."regex-dfa";
@@ -6160,6 +6202,9 @@ self: super: {
   "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";
@@ -6206,6 +6251,7 @@ self: super: {
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "rethinkdb" = doDistribute super."rethinkdb_2_2_0_2";
   "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
@@ -6321,6 +6367,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -6600,6 +6647,7 @@ self: super: {
   "smartconstructor" = dontDistribute super."smartconstructor";
   "smartword" = dontDistribute super."smartword";
   "sme" = dontDistribute super."sme";
+  "smoothie" = doDistribute super."smoothie_0_4_2_1";
   "smt-lib" = dontDistribute super."smt-lib";
   "smtlib2" = dontDistribute super."smtlib2";
   "smtp-mail-ng" = dontDistribute super."smtp-mail-ng";
@@ -6675,6 +6723,7 @@ self: super: {
   "sock2stream" = dontDistribute super."sock2stream";
   "sockaddr" = dontDistribute super."sockaddr";
   "socket-activation" = dontDistribute super."socket-activation";
+  "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "soegtk" = dontDistribute super."soegtk";
@@ -6832,6 +6881,7 @@ self: super: {
   "stream-fusion" = dontDistribute super."stream-fusion";
   "stream-monad" = dontDistribute super."stream-monad";
   "streamed" = dontDistribute super."streamed";
+  "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
@@ -7055,6 +7105,7 @@ self: super: {
   "testrunner" = dontDistribute super."testrunner";
   "tetris" = dontDistribute super."tetris";
   "tex2txt" = dontDistribute super."tex2txt";
+  "texmath" = doDistribute super."texmath_0_8_4_1";
   "texrunner" = dontDistribute super."texrunner";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
@@ -7071,6 +7122,7 @@ self: super: {
   "text-region" = dontDistribute super."text-region";
   "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";
@@ -7212,6 +7264,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7224,6 +7277,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -7501,6 +7555,7 @@ self: super: {
   "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index 33013dc368a3..1a3e3e25530c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -166,6 +166,7 @@ self: super: {
   "Chart-diagrams" = dontDistribute super."Chart-diagrams";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -309,6 +310,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -763,8 +765,10 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "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";
@@ -1084,6 +1088,7 @@ self: super: {
   "aeson" = doDistribute super."aeson_0_10_0_0";
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-compat" = doDistribute super."aeson-compat_0_3_0_0";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = doDistribute super."aeson-extra_0_3_0_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1207,6 +1212,7 @@ self: super: {
   "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
   "arb-fft" = dontDistribute super."arb-fft";
   "arbb-vm" = dontDistribute super."arbb-vm";
+  "arbtt" = doDistribute super."arbtt_0_9_0_7";
   "archive" = dontDistribute super."archive";
   "archiver" = dontDistribute super."archiver";
   "archlinux" = dontDistribute super."archlinux";
@@ -1309,6 +1315,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -1432,6 +1439,7 @@ self: super: {
   "binary-store" = dontDistribute super."binary-store";
   "binary-streams" = dontDistribute super."binary-streams";
   "binary-strict" = dontDistribute super."binary-strict";
+  "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0";
   "binarydefer" = dontDistribute super."binarydefer";
   "bind-marshal" = dontDistribute super."bind-marshal";
   "binding-core" = dontDistribute super."binding-core";
@@ -1829,6 +1837,7 @@ self: super: {
   "clash-vhdl" = doDistribute super."clash-vhdl_0_6_4";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
@@ -1855,6 +1864,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -1959,6 +1969,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
@@ -2169,6 +2180,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2192,6 +2204,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2362,6 +2375,7 @@ self: super: {
   "digamma" = dontDistribute super."digamma";
   "digest-pure" = dontDistribute super."digest-pure";
   "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18";
   "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
   "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
   "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp";
@@ -2543,8 +2557,10 @@ self: super: {
   "eibd-client-simple" = dontDistribute super."eibd-client-simple";
   "eigen" = dontDistribute super."eigen";
   "eithers" = dontDistribute super."eithers";
+  "ekg" = doDistribute super."ekg_0_4_0_8";
   "ekg-bosun" = dontDistribute super."ekg-bosun";
   "ekg-carbon" = dontDistribute super."ekg-carbon";
+  "ekg-json" = doDistribute super."ekg-json_0_1_0_0";
   "ekg-log" = dontDistribute super."ekg-log";
   "ekg-push" = dontDistribute super."ekg-push";
   "ekg-rrd" = dontDistribute super."ekg-rrd";
@@ -2649,10 +2665,12 @@ self: super: {
   "event-list" = dontDistribute super."event-list";
   "event-monad" = dontDistribute super."event-monad";
   "eventloop" = dontDistribute super."eventloop";
+  "eventstore" = doDistribute super."eventstore_0_10_0_1";
   "every-bit-counts" = dontDistribute super."every-bit-counts";
   "ewe" = dontDistribute super."ewe";
   "ex-pool" = dontDistribute super."ex-pool";
   "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exact-pi" = doDistribute super."exact-pi_0_4_1_0";
   "exception-hierarchy" = dontDistribute super."exception-hierarchy";
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
@@ -2771,6 +2789,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -2928,6 +2947,7 @@ self: super: {
   "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";
@@ -2995,6 +3015,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generics-eot" = dontDistribute super."generics-eot";
+  "generics-sop" = doDistribute super."generics-sop_0_2_0_0";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
   "geni-gui" = dontDistribute super."geni-gui";
@@ -3081,6 +3102,7 @@ self: super: {
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
+  "gipeda" = doDistribute super."gipeda_0_2";
   "gist" = dontDistribute super."gist";
   "git-all" = dontDistribute super."git-all";
   "git-annex" = doDistribute super."git-annex_5_20151218";
@@ -3644,6 +3666,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_15_1";
+  "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";
@@ -3938,6 +3961,9 @@ self: super: {
   "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";
@@ -4316,6 +4342,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
   "increments" = dontDistribute super."increments";
@@ -4941,6 +4968,7 @@ self: super: {
   "manatee-terminal" = dontDistribute super."manatee-terminal";
   "manatee-welcome" = dontDistribute super."manatee-welcome";
   "mancala" = dontDistribute super."mancala";
+  "mandrill" = doDistribute super."mandrill_0_5_0_0";
   "mandulia" = dontDistribute super."mandulia";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
@@ -5092,6 +5120,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5104,6 +5133,7 @@ self: super: {
   "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
   "monad-open" = dontDistribute super."monad-open";
   "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-products" = doDistribute super."monad-products_4_0_0_1";
@@ -5189,6 +5219,7 @@ self: super: {
   "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";
@@ -5230,6 +5261,7 @@ self: super: {
   "mvc" = dontDistribute super."mvc";
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
+  "mwc-probability" = doDistribute super."mwc-probability_1_0_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5413,6 +5445,7 @@ self: super: {
   "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";
@@ -5479,7 +5512,9 @@ self: super: {
   "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";
+  "opml-conduit" = doDistribute super."opml-conduit_0_4_0_0";
   "opn" = dontDistribute super."opn";
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
@@ -5604,6 +5639,9 @@ self: super: {
   "pcg-random" = dontDistribute super."pcg-random";
   "pcre-less" = dontDistribute super."pcre-less";
   "pcre-light-extra" = dontDistribute super."pcre-light-extra";
+  "pdf-toolbox-content" = doDistribute super."pdf-toolbox-content_0_0_5_0";
+  "pdf-toolbox-core" = doDistribute super."pdf-toolbox-core_0_0_4_0";
+  "pdf-toolbox-document" = doDistribute super."pdf-toolbox-document_0_0_7_0";
   "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer";
   "pdf2line" = dontDistribute super."pdf2line";
   "pdfsplit" = dontDistribute super."pdfsplit";
@@ -5699,6 +5737,7 @@ self: super: {
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_1_0";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
@@ -5842,6 +5881,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -6006,6 +6046,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6093,6 +6134,7 @@ self: super: {
   "reflex-gloss" = dontDistribute super."reflex-gloss";
   "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
   "reflex-transformers" = dontDistribute super."reflex-transformers";
+  "regex-applicative-text" = doDistribute super."regex-applicative-text_0_1_0_0";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
   "regex-dfa" = dontDistribute super."regex-dfa";
@@ -6142,6 +6184,9 @@ self: super: {
   "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";
@@ -6188,6 +6233,7 @@ self: super: {
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "rethinkdb" = doDistribute super."rethinkdb_2_2_0_2";
   "rethinkdb-client-driver" = doDistribute super."rethinkdb-client-driver_0_0_20";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
@@ -6303,6 +6349,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -6582,6 +6629,7 @@ self: super: {
   "smartconstructor" = dontDistribute super."smartconstructor";
   "smartword" = dontDistribute super."smartword";
   "sme" = dontDistribute super."sme";
+  "smoothie" = doDistribute super."smoothie_0_4_2_1";
   "smt-lib" = dontDistribute super."smt-lib";
   "smtlib2" = dontDistribute super."smtlib2";
   "smtp-mail-ng" = dontDistribute super."smtp-mail-ng";
@@ -6657,6 +6705,7 @@ self: super: {
   "sock2stream" = dontDistribute super."sock2stream";
   "sockaddr" = dontDistribute super."sockaddr";
   "socket-activation" = dontDistribute super."socket-activation";
+  "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "soegtk" = dontDistribute super."soegtk";
@@ -6814,6 +6863,7 @@ self: super: {
   "stream-fusion" = dontDistribute super."stream-fusion";
   "stream-monad" = dontDistribute super."stream-monad";
   "streamed" = dontDistribute super."streamed";
+  "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
@@ -7037,6 +7087,7 @@ self: super: {
   "testrunner" = dontDistribute super."testrunner";
   "tetris" = dontDistribute super."tetris";
   "tex2txt" = dontDistribute super."tex2txt";
+  "texmath" = doDistribute super."texmath_0_8_4_1";
   "texrunner" = dontDistribute super."texrunner";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
@@ -7053,6 +7104,7 @@ self: super: {
   "text-region" = dontDistribute super."text-region";
   "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";
@@ -7194,6 +7246,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7206,6 +7259,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -7482,6 +7536,7 @@ self: super: {
   "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
index 05a347b4c964..6d29972d4ea5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
@@ -166,6 +166,7 @@ self: super: {
   "Chart-diagrams" = dontDistribute super."Chart-diagrams";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -309,6 +310,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -760,8 +762,10 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "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";
@@ -1080,6 +1084,7 @@ self: super: {
   "aeson" = doDistribute super."aeson_0_10_0_0";
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-compat" = doDistribute super."aeson-compat_0_3_0_0";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = doDistribute super."aeson-extra_0_3_0_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1202,6 +1207,7 @@ self: super: {
   "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
   "arb-fft" = dontDistribute super."arb-fft";
   "arbb-vm" = dontDistribute super."arbb-vm";
+  "arbtt" = doDistribute super."arbtt_0_9_0_7";
   "archive" = dontDistribute super."archive";
   "archiver" = dontDistribute super."archiver";
   "archlinux" = dontDistribute super."archlinux";
@@ -1304,6 +1310,7 @@ self: super: {
   "avers-server" = dontDistribute super."avers-server";
   "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";
@@ -1427,6 +1434,7 @@ self: super: {
   "binary-store" = dontDistribute super."binary-store";
   "binary-streams" = dontDistribute super."binary-streams";
   "binary-strict" = dontDistribute super."binary-strict";
+  "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0";
   "binarydefer" = dontDistribute super."binarydefer";
   "bind-marshal" = dontDistribute super."bind-marshal";
   "binding-core" = dontDistribute super."binding-core";
@@ -1813,12 +1821,14 @@ self: super: {
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_6_8";
   "clash-lib" = doDistribute super."clash-lib_0_6_8";
+  "clash-prelude" = doDistribute super."clash-prelude_0_10_5";
   "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
   "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_4";
   "clash-verilog" = doDistribute super."clash-verilog_0_6_4";
   "clash-vhdl" = doDistribute super."clash-vhdl_0_6_5";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
@@ -1845,6 +1855,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -1947,6 +1958,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
@@ -2157,6 +2169,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2180,6 +2193,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2346,6 +2360,7 @@ self: super: {
   "digamma" = dontDistribute super."digamma";
   "digest-pure" = dontDistribute super."digest-pure";
   "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18";
   "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
   "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
   "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp";
@@ -2526,8 +2541,10 @@ self: super: {
   "eibd-client-simple" = dontDistribute super."eibd-client-simple";
   "eigen" = dontDistribute super."eigen";
   "eithers" = dontDistribute super."eithers";
+  "ekg" = doDistribute super."ekg_0_4_0_8";
   "ekg-bosun" = dontDistribute super."ekg-bosun";
   "ekg-carbon" = dontDistribute super."ekg-carbon";
+  "ekg-json" = doDistribute super."ekg-json_0_1_0_0";
   "ekg-log" = dontDistribute super."ekg-log";
   "ekg-push" = dontDistribute super."ekg-push";
   "ekg-rrd" = dontDistribute super."ekg-rrd";
@@ -2631,10 +2648,12 @@ self: super: {
   "event-list" = dontDistribute super."event-list";
   "event-monad" = dontDistribute super."event-monad";
   "eventloop" = dontDistribute super."eventloop";
+  "eventstore" = doDistribute super."eventstore_0_10_0_1";
   "every-bit-counts" = dontDistribute super."every-bit-counts";
   "ewe" = dontDistribute super."ewe";
   "ex-pool" = dontDistribute super."ex-pool";
   "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exact-pi" = doDistribute super."exact-pi_0_4_1_0";
   "exception-hierarchy" = dontDistribute super."exception-hierarchy";
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
@@ -2750,6 +2769,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -2906,6 +2926,7 @@ self: super: {
   "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";
@@ -2973,6 +2994,7 @@ self: super: {
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
   "generics-eot" = dontDistribute super."generics-eot";
+  "generics-sop" = doDistribute super."generics-sop_0_2_0_0";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
   "geni-gui" = dontDistribute super."geni-gui";
@@ -3058,6 +3080,7 @@ self: super: {
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
+  "gipeda" = doDistribute super."gipeda_0_2";
   "gist" = dontDistribute super."gist";
   "git-all" = dontDistribute super."git-all";
   "git-annex" = doDistribute super."git-annex_5_20151218";
@@ -3615,6 +3638,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_15_1_1";
+  "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";
@@ -3905,6 +3929,9 @@ self: super: {
   "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";
@@ -4278,6 +4305,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
   "increments" = dontDistribute super."increments";
@@ -4897,6 +4925,7 @@ self: super: {
   "manatee-terminal" = dontDistribute super."manatee-terminal";
   "manatee-welcome" = dontDistribute super."manatee-welcome";
   "mancala" = dontDistribute super."mancala";
+  "mandrill" = doDistribute super."mandrill_0_5_0_0";
   "mandulia" = dontDistribute super."mandulia";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
@@ -5048,6 +5077,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -5060,6 +5090,7 @@ self: super: {
   "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
   "monad-open" = dontDistribute super."monad-open";
   "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-ran" = dontDistribute super."monad-ran";
@@ -5143,6 +5174,7 @@ self: super: {
   "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";
@@ -5183,6 +5215,7 @@ self: super: {
   "mvc" = dontDistribute super."mvc";
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
+  "mwc-probability" = doDistribute super."mwc-probability_1_0_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5366,6 +5399,7 @@ self: super: {
   "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";
@@ -5432,7 +5466,9 @@ self: super: {
   "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";
+  "opml-conduit" = doDistribute super."opml-conduit_0_4_0_0";
   "opn" = dontDistribute super."opn";
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
@@ -5557,6 +5593,9 @@ self: super: {
   "pcg-random" = dontDistribute super."pcg-random";
   "pcre-less" = dontDistribute super."pcre-less";
   "pcre-light-extra" = dontDistribute super."pcre-light-extra";
+  "pdf-toolbox-content" = doDistribute super."pdf-toolbox-content_0_0_5_0";
+  "pdf-toolbox-core" = doDistribute super."pdf-toolbox-core_0_0_4_0";
+  "pdf-toolbox-document" = doDistribute super."pdf-toolbox-document_0_0_7_0";
   "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer";
   "pdf2line" = dontDistribute super."pdf2line";
   "pdfsplit" = dontDistribute super."pdfsplit";
@@ -5652,6 +5691,7 @@ self: super: {
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_1_0";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-wai" = doDistribute super."pipes-wai_3_0_2";
@@ -5792,6 +5832,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -5956,6 +5997,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -6042,6 +6084,7 @@ self: super: {
   "reflex-gloss" = dontDistribute super."reflex-gloss";
   "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
   "reflex-transformers" = dontDistribute super."reflex-transformers";
+  "regex-applicative-text" = doDistribute super."regex-applicative-text_0_1_0_0";
   "regex-compat-tdfa" = dontDistribute super."regex-compat-tdfa";
   "regex-deriv" = dontDistribute super."regex-deriv";
   "regex-dfa" = dontDistribute super."regex-dfa";
@@ -6091,6 +6134,9 @@ self: super: {
   "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";
@@ -6136,6 +6182,7 @@ self: super: {
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "rethinkdb" = doDistribute super."rethinkdb_2_2_0_2";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retryer" = dontDistribute super."retryer";
@@ -6249,6 +6296,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -6523,6 +6571,7 @@ self: super: {
   "smartconstructor" = dontDistribute super."smartconstructor";
   "smartword" = dontDistribute super."smartword";
   "sme" = dontDistribute super."sme";
+  "smoothie" = doDistribute super."smoothie_0_4_2_1";
   "smt-lib" = dontDistribute super."smt-lib";
   "smtlib2" = dontDistribute super."smtlib2";
   "smtp-mail-ng" = dontDistribute super."smtp-mail-ng";
@@ -6598,6 +6647,7 @@ self: super: {
   "sock2stream" = dontDistribute super."sock2stream";
   "sockaddr" = dontDistribute super."sockaddr";
   "socket-activation" = dontDistribute super."socket-activation";
+  "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "soegtk" = dontDistribute super."soegtk";
@@ -6753,6 +6803,7 @@ self: super: {
   "stream-fusion" = dontDistribute super."stream-fusion";
   "stream-monad" = dontDistribute super."stream-monad";
   "streamed" = dontDistribute super."streamed";
+  "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
@@ -6974,6 +7025,7 @@ self: super: {
   "testrunner" = dontDistribute super."testrunner";
   "tetris" = dontDistribute super."tetris";
   "tex2txt" = dontDistribute super."tex2txt";
+  "texmath" = doDistribute super."texmath_0_8_4_1";
   "texrunner" = dontDistribute super."texrunner";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
@@ -6990,6 +7042,7 @@ self: super: {
   "text-region" = dontDistribute super."text-region";
   "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";
@@ -7131,6 +7184,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7143,6 +7197,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -7419,6 +7474,7 @@ self: super: {
   "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
index 7fd213cdf9fd..b7073d46b4d0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
@@ -165,6 +165,7 @@ self: super: {
   "Chart-diagrams" = dontDistribute super."Chart-diagrams";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -306,6 +307,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -447,6 +449,7 @@ self: super: {
   "HSoundFile" = dontDistribute super."HSoundFile";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
+  "HTTP" = doDistribute super."HTTP_4000_3_2";
   "HTTP-Simple" = dontDistribute super."HTTP-Simple";
   "HTab" = dontDistribute super."HTab";
   "HTicTacToe" = dontDistribute super."HTicTacToe";
@@ -748,8 +751,10 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "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";
@@ -1065,6 +1070,7 @@ self: super: {
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-compat" = doDistribute super."aeson-compat_0_3_0_0";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-extra" = doDistribute super."aeson-extra_0_3_0_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
@@ -1187,6 +1193,7 @@ self: super: {
   "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
   "arb-fft" = dontDistribute super."arb-fft";
   "arbb-vm" = dontDistribute super."arbb-vm";
+  "arbtt" = doDistribute super."arbtt_0_9_0_7";
   "archive" = dontDistribute super."archive";
   "archiver" = dontDistribute super."archiver";
   "archlinux" = dontDistribute super."archlinux";
@@ -1287,6 +1294,7 @@ self: super: {
   "avers-server" = doDistribute super."avers-server_0_0_1";
   "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";
@@ -1381,6 +1389,7 @@ self: super: {
   "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";
@@ -1405,6 +1414,7 @@ self: super: {
   "binary-store" = dontDistribute super."binary-store";
   "binary-streams" = dontDistribute super."binary-streams";
   "binary-strict" = dontDistribute super."binary-strict";
+  "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0";
   "binarydefer" = dontDistribute super."binarydefer";
   "bind-marshal" = dontDistribute super."bind-marshal";
   "binding-core" = dontDistribute super."binding-core";
@@ -1782,12 +1792,14 @@ self: super: {
   "clash" = dontDistribute super."clash";
   "clash-ghc" = doDistribute super."clash-ghc_0_6_8";
   "clash-lib" = doDistribute super."clash-lib_0_6_8";
+  "clash-prelude" = doDistribute super."clash-prelude_0_10_5";
   "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
   "clash-systemverilog" = doDistribute super."clash-systemverilog_0_6_4";
   "clash-verilog" = doDistribute super."clash-verilog_0_6_4";
   "clash-vhdl" = doDistribute super."clash-vhdl_0_6_5";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
@@ -1814,6 +1826,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -1915,6 +1928,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
@@ -2119,6 +2133,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2142,6 +2157,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2304,6 +2320,7 @@ self: super: {
   "digamma" = dontDistribute super."digamma";
   "digest-pure" = dontDistribute super."digest-pure";
   "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18";
   "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
   "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
   "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp";
@@ -2478,8 +2495,10 @@ self: super: {
   "eibd-client-simple" = dontDistribute super."eibd-client-simple";
   "eigen" = dontDistribute super."eigen";
   "eithers" = dontDistribute super."eithers";
+  "ekg" = doDistribute super."ekg_0_4_0_8";
   "ekg-bosun" = dontDistribute super."ekg-bosun";
   "ekg-carbon" = dontDistribute super."ekg-carbon";
+  "ekg-json" = doDistribute super."ekg-json_0_1_0_0";
   "ekg-log" = dontDistribute super."ekg-log";
   "ekg-push" = dontDistribute super."ekg-push";
   "ekg-rrd" = dontDistribute super."ekg-rrd";
@@ -2515,6 +2534,7 @@ self: super: {
   "empty" = dontDistribute super."empty";
   "encoding" = dontDistribute super."encoding";
   "endo" = dontDistribute super."endo";
+  "engine-io" = doDistribute super."engine-io_1_2_12";
   "engine-io-growler" = dontDistribute super."engine-io-growler";
   "engine-io-snap" = dontDistribute super."engine-io-snap";
   "engineering-units" = dontDistribute super."engineering-units";
@@ -2579,10 +2599,12 @@ self: super: {
   "event-list" = dontDistribute super."event-list";
   "event-monad" = dontDistribute super."event-monad";
   "eventloop" = dontDistribute super."eventloop";
+  "eventstore" = doDistribute super."eventstore_0_10_0_1";
   "every-bit-counts" = dontDistribute super."every-bit-counts";
   "ewe" = dontDistribute super."ewe";
   "ex-pool" = dontDistribute super."ex-pool";
   "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exact-pi" = doDistribute super."exact-pi_0_4_1_0";
   "exception-hierarchy" = dontDistribute super."exception-hierarchy";
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
@@ -2694,6 +2716,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -2846,6 +2869,7 @@ self: super: {
   "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";
@@ -2911,6 +2935,7 @@ self: super: {
   "generic-storable" = dontDistribute super."generic-storable";
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generics-sop" = doDistribute super."generics-sop_0_2_0_0";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
   "geni-gui" = dontDistribute super."geni-gui";
@@ -2993,6 +3018,7 @@ self: super: {
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
+  "gipeda" = doDistribute super."gipeda_0_2";
   "gist" = dontDistribute super."gist";
   "git-all" = dontDistribute super."git-all";
   "git-annex" = doDistribute super."git-annex_6_20160114";
@@ -3545,6 +3571,7 @@ self: super: {
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
   "hasql" = doDistribute super."hasql_0_19_3_3";
+  "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";
@@ -3833,6 +3860,9 @@ self: super: {
   "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";
@@ -4079,6 +4109,7 @@ self: super: {
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
   "http-wget" = dontDistribute super."http-wget";
+  "http2" = doDistribute super."http2_1_4_4";
   "https-everywhere-rules" = dontDistribute super."https-everywhere-rules";
   "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw";
   "httpspec" = dontDistribute super."httpspec";
@@ -4201,6 +4232,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
   "increments" = dontDistribute super."increments";
@@ -4254,6 +4286,7 @@ self: super: {
   "interpolation" = dontDistribute super."interpolation";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invariant" = doDistribute super."invariant_0_3";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-reactive" = dontDistribute super."io-reactive";
@@ -4812,6 +4845,7 @@ self: super: {
   "manatee-terminal" = dontDistribute super."manatee-terminal";
   "manatee-welcome" = dontDistribute super."manatee-welcome";
   "mancala" = dontDistribute super."mancala";
+  "mandrill" = doDistribute super."mandrill_0_5_0_0";
   "mandulia" = dontDistribute super."mandulia";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
@@ -4887,6 +4921,7 @@ self: super: {
   "mi" = dontDistribute super."mi";
   "microbench" = dontDistribute super."microbench";
   "microformats2-types" = dontDistribute super."microformats2-types";
+  "microlens-aeson" = doDistribute super."microlens-aeson_2_1_0";
   "microlens-each" = dontDistribute super."microlens-each";
   "microtimer" = dontDistribute super."microtimer";
   "mida" = dontDistribute super."mida";
@@ -4952,6 +4987,7 @@ self: super: {
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
   "monad-control" = doDistribute super."monad-control_1_0_0_4";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -4964,6 +5000,7 @@ self: super: {
   "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
   "monad-open" = dontDistribute super."monad-open";
   "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-ran" = dontDistribute super."monad-ran";
@@ -5046,6 +5083,7 @@ self: super: {
   "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";
@@ -5085,6 +5123,7 @@ self: super: {
   "mvc" = dontDistribute super."mvc";
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
+  "mwc-probability" = doDistribute super."mwc-probability_1_0_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5266,6 +5305,7 @@ self: super: {
   "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";
@@ -5332,7 +5372,9 @@ self: super: {
   "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";
+  "opml-conduit" = doDistribute super."opml-conduit_0_4_0_0";
   "opn" = dontDistribute super."opn";
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
@@ -5375,6 +5417,7 @@ self: super: {
   "pacman-memcache" = dontDistribute super."pacman-memcache";
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
+  "pagerduty" = doDistribute super."pagerduty_0_0_4";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
@@ -5387,6 +5430,7 @@ self: super: {
   "pandoc-lens" = dontDistribute super."pandoc-lens";
   "pandoc-placetable" = dontDistribute super."pandoc-placetable";
   "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-types" = doDistribute super."pandoc-types_1_16_0_1";
   "pandoc-unlit" = dontDistribute super."pandoc-unlit";
   "papillon" = dontDistribute super."papillon";
   "pappy" = dontDistribute super."pappy";
@@ -5451,6 +5495,9 @@ self: super: {
   "pcg-random" = dontDistribute super."pcg-random";
   "pcre-less" = dontDistribute super."pcre-less";
   "pcre-light-extra" = dontDistribute super."pcre-light-extra";
+  "pdf-toolbox-content" = doDistribute super."pdf-toolbox-content_0_0_5_0";
+  "pdf-toolbox-core" = doDistribute super."pdf-toolbox-core_0_0_4_0";
+  "pdf-toolbox-document" = doDistribute super."pdf-toolbox-document_0_0_7_0";
   "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer";
   "pdf2line" = dontDistribute super."pdf2line";
   "pdfsplit" = dontDistribute super."pdfsplit";
@@ -5543,6 +5590,7 @@ self: super: {
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_1_0";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
@@ -5681,6 +5729,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -5765,6 +5814,7 @@ self: super: {
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
   "pusher-haskell" = dontDistribute super."pusher-haskell";
+  "pusher-http-haskell" = doDistribute super."pusher-http-haskell_0_3_0_1";
   "pushme" = dontDistribute super."pushme";
   "putlenses" = dontDistribute super."putlenses";
   "puzzle-draw" = dontDistribute super."puzzle-draw";
@@ -5841,6 +5891,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -5924,6 +5975,7 @@ self: super: {
   "reflex-gloss" = dontDistribute super."reflex-gloss";
   "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
   "reflex-transformers" = dontDistribute super."reflex-transformers";
+  "regex-applicative-text" = doDistribute super."regex-applicative-text_0_1_0_0";
   "regex-deriv" = dontDistribute super."regex-deriv";
   "regex-dfa" = dontDistribute super."regex-dfa";
   "regex-easy" = dontDistribute super."regex-easy";
@@ -5972,6 +6024,9 @@ self: super: {
   "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";
@@ -6017,6 +6072,7 @@ self: super: {
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "rethinkdb" = doDistribute super."rethinkdb_2_2_0_2";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retryer" = dontDistribute super."retryer";
@@ -6128,6 +6184,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -6397,6 +6454,7 @@ self: super: {
   "smartconstructor" = dontDistribute super."smartconstructor";
   "smartword" = dontDistribute super."smartword";
   "sme" = dontDistribute super."sme";
+  "smoothie" = doDistribute super."smoothie_0_4_2_1";
   "smt-lib" = dontDistribute super."smt-lib";
   "smtlib2" = dontDistribute super."smtlib2";
   "smtp-mail-ng" = dontDistribute super."smtp-mail-ng";
@@ -6472,6 +6530,7 @@ self: super: {
   "sock2stream" = dontDistribute super."sock2stream";
   "sockaddr" = dontDistribute super."sockaddr";
   "socket-activation" = dontDistribute super."socket-activation";
+  "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "soegtk" = dontDistribute super."soegtk";
@@ -6557,6 +6616,7 @@ self: super: {
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
   "stack-run" = dontDistribute super."stack-run";
+  "stackage-curator" = doDistribute super."stackage-curator_0_13_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -6622,6 +6682,7 @@ self: super: {
   "stream-fusion" = dontDistribute super."stream-fusion";
   "stream-monad" = dontDistribute super."stream-monad";
   "streamed" = dontDistribute super."streamed";
+  "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
@@ -6835,6 +6896,7 @@ self: super: {
   "testrunner" = dontDistribute super."testrunner";
   "tetris" = dontDistribute super."tetris";
   "tex2txt" = dontDistribute super."tex2txt";
+  "texmath" = doDistribute super."texmath_0_8_4_1";
   "texrunner" = dontDistribute super."texrunner";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
@@ -6851,6 +6913,7 @@ self: super: {
   "text-region" = dontDistribute super."text-region";
   "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";
@@ -6989,6 +7052,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -7001,6 +7065,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -7265,6 +7330,7 @@ self: super: {
   "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
@@ -7576,6 +7642,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_6";
   "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.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
index b9e13567f85d..c25861c65c80 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
@@ -164,6 +164,7 @@ self: super: {
   "Chart-diagrams" = dontDistribute super."Chart-diagrams";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -305,6 +306,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -445,6 +447,7 @@ self: super: {
   "HSoundFile" = dontDistribute super."HSoundFile";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
+  "HTTP" = doDistribute super."HTTP_4000_3_2";
   "HTTP-Simple" = dontDistribute super."HTTP-Simple";
   "HTab" = dontDistribute super."HTab";
   "HTicTacToe" = dontDistribute super."HTicTacToe";
@@ -746,8 +749,10 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "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";
@@ -1063,6 +1068,7 @@ self: super: {
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-compat" = doDistribute super."aeson-compat_0_3_0_0";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-iproute" = dontDistribute super."aeson-iproute";
@@ -1183,6 +1189,7 @@ self: super: {
   "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
   "arb-fft" = dontDistribute super."arb-fft";
   "arbb-vm" = dontDistribute super."arbb-vm";
+  "arbtt" = doDistribute super."arbtt_0_9_0_7";
   "archive" = dontDistribute super."archive";
   "archiver" = dontDistribute super."archiver";
   "archlinux" = dontDistribute super."archlinux";
@@ -1280,6 +1287,7 @@ self: super: {
   "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";
@@ -1374,6 +1382,7 @@ self: super: {
   "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";
@@ -1397,6 +1406,7 @@ self: super: {
   "binary-store" = dontDistribute super."binary-store";
   "binary-streams" = dontDistribute super."binary-streams";
   "binary-strict" = dontDistribute super."binary-strict";
+  "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0";
   "binarydefer" = dontDistribute super."binarydefer";
   "bind-marshal" = dontDistribute super."bind-marshal";
   "binding-core" = dontDistribute super."binding-core";
@@ -1769,9 +1779,14 @@ self: super: {
   "clanki" = dontDistribute super."clanki";
   "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
+  "clash-ghc" = doDistribute super."clash-ghc_0_6_9";
+  "clash-lib" = doDistribute super."clash-lib_0_6_9";
+  "clash-prelude" = doDistribute super."clash-prelude_0_10_5";
   "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "clash-vhdl" = doDistribute super."clash-vhdl_0_6_6";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
@@ -1798,6 +1813,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -1899,6 +1915,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
@@ -2102,6 +2119,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2125,6 +2143,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2287,6 +2306,7 @@ self: super: {
   "digamma" = dontDistribute super."digamma";
   "digest-pure" = dontDistribute super."digest-pure";
   "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18";
   "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
   "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
   "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp";
@@ -2461,8 +2481,10 @@ self: super: {
   "eibd-client-simple" = dontDistribute super."eibd-client-simple";
   "eigen" = dontDistribute super."eigen";
   "eithers" = dontDistribute super."eithers";
+  "ekg" = doDistribute super."ekg_0_4_0_8";
   "ekg-bosun" = dontDistribute super."ekg-bosun";
   "ekg-carbon" = dontDistribute super."ekg-carbon";
+  "ekg-json" = doDistribute super."ekg-json_0_1_0_0";
   "ekg-log" = dontDistribute super."ekg-log";
   "ekg-push" = dontDistribute super."ekg-push";
   "ekg-rrd" = dontDistribute super."ekg-rrd";
@@ -2498,6 +2520,7 @@ self: super: {
   "empty" = dontDistribute super."empty";
   "encoding" = dontDistribute super."encoding";
   "endo" = dontDistribute super."endo";
+  "engine-io" = doDistribute super."engine-io_1_2_12";
   "engine-io-growler" = dontDistribute super."engine-io-growler";
   "engine-io-snap" = dontDistribute super."engine-io-snap";
   "engineering-units" = dontDistribute super."engineering-units";
@@ -2562,10 +2585,12 @@ self: super: {
   "event-list" = dontDistribute super."event-list";
   "event-monad" = dontDistribute super."event-monad";
   "eventloop" = dontDistribute super."eventloop";
+  "eventstore" = doDistribute super."eventstore_0_10_0_1";
   "every-bit-counts" = dontDistribute super."every-bit-counts";
   "ewe" = dontDistribute super."ewe";
   "ex-pool" = dontDistribute super."ex-pool";
   "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "exact-pi" = doDistribute super."exact-pi_0_4_1_0";
   "exception-hierarchy" = dontDistribute super."exception-hierarchy";
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
@@ -2677,6 +2702,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -2829,6 +2855,7 @@ self: super: {
   "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";
@@ -2894,6 +2921,7 @@ self: super: {
   "generic-storable" = dontDistribute super."generic-storable";
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generics-sop" = doDistribute super."generics-sop_0_2_0_0";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
   "geni-gui" = dontDistribute super."geni-gui";
@@ -2976,6 +3004,7 @@ self: super: {
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
+  "gipeda" = doDistribute super."gipeda_0_2";
   "gist" = dontDistribute super."gist";
   "git-all" = dontDistribute super."git-all";
   "git-annex" = doDistribute super."git-annex_6_20160114";
@@ -3526,6 +3555,8 @@ self: super: {
   "hasloGUI" = dontDistribute super."hasloGUI";
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
+  "hasql" = doDistribute super."hasql_0_19_6";
+  "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";
@@ -3814,6 +3845,9 @@ self: super: {
   "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";
@@ -4060,6 +4094,7 @@ self: super: {
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
   "http-wget" = dontDistribute super."http-wget";
+  "http2" = doDistribute super."http2_1_4_4";
   "https-everywhere-rules" = dontDistribute super."https-everywhere-rules";
   "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw";
   "httpspec" = dontDistribute super."httpspec";
@@ -4181,6 +4216,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
   "increments" = dontDistribute super."increments";
@@ -4234,6 +4270,7 @@ self: super: {
   "interpolation" = dontDistribute super."interpolation";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
+  "invariant" = doDistribute super."invariant_0_3";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-reactive" = dontDistribute super."io-reactive";
@@ -4502,6 +4539,7 @@ self: super: {
   "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_7_0_1";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
   "lat" = dontDistribute super."lat";
@@ -4789,6 +4827,7 @@ self: super: {
   "manatee-terminal" = dontDistribute super."manatee-terminal";
   "manatee-welcome" = dontDistribute super."manatee-welcome";
   "mancala" = dontDistribute super."mancala";
+  "mandrill" = doDistribute super."mandrill_0_5_0_0";
   "mandulia" = dontDistribute super."mandulia";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
@@ -4864,6 +4903,7 @@ self: super: {
   "mi" = dontDistribute super."mi";
   "microbench" = dontDistribute super."microbench";
   "microformats2-types" = dontDistribute super."microformats2-types";
+  "microlens-aeson" = doDistribute super."microlens-aeson_2_1_0";
   "microlens-each" = dontDistribute super."microlens-each";
   "microtimer" = dontDistribute super."microtimer";
   "mida" = dontDistribute super."mida";
@@ -4927,6 +4967,7 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
+  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_1";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -4939,6 +4980,7 @@ self: super: {
   "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
   "monad-open" = dontDistribute super."monad-open";
   "monad-ox" = dontDistribute super."monad-ox";
+  "monad-parallel" = doDistribute super."monad-parallel_0_7_2_0";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-ran" = dontDistribute super."monad-ran";
@@ -5021,6 +5063,7 @@ self: super: {
   "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";
@@ -5060,6 +5103,7 @@ self: super: {
   "mvc" = dontDistribute super."mvc";
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
+  "mwc-probability" = doDistribute super."mwc-probability_1_0_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5241,6 +5285,7 @@ self: super: {
   "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";
@@ -5307,7 +5352,9 @@ self: super: {
   "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";
+  "opml-conduit" = doDistribute super."opml-conduit_0_4_0_0";
   "opn" = dontDistribute super."opn";
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
@@ -5350,6 +5397,7 @@ self: super: {
   "pacman-memcache" = dontDistribute super."pacman-memcache";
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
+  "pagerduty" = doDistribute super."pagerduty_0_0_4";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
@@ -5362,6 +5410,7 @@ self: super: {
   "pandoc-lens" = dontDistribute super."pandoc-lens";
   "pandoc-placetable" = dontDistribute super."pandoc-placetable";
   "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-types" = doDistribute super."pandoc-types_1_16_0_1";
   "pandoc-unlit" = dontDistribute super."pandoc-unlit";
   "papillon" = dontDistribute super."papillon";
   "pappy" = dontDistribute super."pappy";
@@ -5426,6 +5475,9 @@ self: super: {
   "pcg-random" = dontDistribute super."pcg-random";
   "pcre-less" = dontDistribute super."pcre-less";
   "pcre-light-extra" = dontDistribute super."pcre-light-extra";
+  "pdf-toolbox-content" = doDistribute super."pdf-toolbox-content_0_0_5_0";
+  "pdf-toolbox-core" = doDistribute super."pdf-toolbox-core_0_0_4_0";
+  "pdf-toolbox-document" = doDistribute super."pdf-toolbox-document_0_0_7_0";
   "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer";
   "pdf2line" = dontDistribute super."pdf2line";
   "pdfsplit" = dontDistribute super."pdfsplit";
@@ -5518,6 +5570,7 @@ self: super: {
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-text" = doDistribute super."pipes-text_0_0_1_0";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
@@ -5656,6 +5709,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -5740,6 +5794,7 @@ self: super: {
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
   "pusher-haskell" = dontDistribute super."pusher-haskell";
+  "pusher-http-haskell" = doDistribute super."pusher-http-haskell_0_3_0_1";
   "pushme" = dontDistribute super."pushme";
   "putlenses" = dontDistribute super."putlenses";
   "puzzle-draw" = dontDistribute super."puzzle-draw";
@@ -5816,6 +5871,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -5898,6 +5954,7 @@ self: super: {
   "reflex-gloss" = dontDistribute super."reflex-gloss";
   "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
   "reflex-transformers" = dontDistribute super."reflex-transformers";
+  "regex-applicative-text" = doDistribute super."regex-applicative-text_0_1_0_0";
   "regex-deriv" = dontDistribute super."regex-deriv";
   "regex-dfa" = dontDistribute super."regex-dfa";
   "regex-easy" = dontDistribute super."regex-easy";
@@ -5946,6 +6003,9 @@ self: super: {
   "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";
@@ -5990,6 +6050,7 @@ self: super: {
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "rethinkdb" = doDistribute super."rethinkdb_2_2_0_2";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retryer" = dontDistribute super."retryer";
@@ -6101,6 +6162,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -6369,6 +6431,7 @@ self: super: {
   "smartconstructor" = dontDistribute super."smartconstructor";
   "smartword" = dontDistribute super."smartword";
   "sme" = dontDistribute super."sme";
+  "smoothie" = doDistribute super."smoothie_0_4_2_1";
   "smt-lib" = dontDistribute super."smt-lib";
   "smtlib2" = dontDistribute super."smtlib2";
   "smtp-mail-ng" = dontDistribute super."smtp-mail-ng";
@@ -6444,6 +6507,7 @@ self: super: {
   "sock2stream" = dontDistribute super."sock2stream";
   "sockaddr" = dontDistribute super."sockaddr";
   "socket-activation" = dontDistribute super."socket-activation";
+  "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "soegtk" = dontDistribute super."soegtk";
@@ -6529,6 +6593,7 @@ self: super: {
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
   "stack-run" = dontDistribute super."stack-run";
+  "stackage-curator" = doDistribute super."stackage-curator_0_13_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -6594,6 +6659,7 @@ self: super: {
   "stream-fusion" = dontDistribute super."stream-fusion";
   "stream-monad" = dontDistribute super."stream-monad";
   "streamed" = dontDistribute super."streamed";
+  "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
@@ -6806,6 +6872,7 @@ self: super: {
   "testrunner" = dontDistribute super."testrunner";
   "tetris" = dontDistribute super."tetris";
   "tex2txt" = dontDistribute super."tex2txt";
+  "texmath" = doDistribute super."texmath_0_8_4_1";
   "texrunner" = dontDistribute super."texrunner";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
@@ -6822,6 +6889,7 @@ self: super: {
   "text-region" = dontDistribute super."text-region";
   "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";
@@ -6960,6 +7028,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -6972,6 +7041,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -7236,6 +7306,7 @@ self: super: {
   "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector-binary" = dontDistribute super."vector-binary";
+  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_0";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
@@ -7546,6 +7617,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_6";
   "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.2.nix b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
index 8a68bd9a2736..32256ef75b12 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
@@ -164,6 +164,7 @@ self: super: {
   "Chart-diagrams" = dontDistribute super."Chart-diagrams";
   "Chart-gtk" = dontDistribute super."Chart-gtk";
   "Chart-simple" = dontDistribute super."Chart-simple";
+  "ChasingBottoms" = doDistribute super."ChasingBottoms_1_3_0_13";
   "CheatSheet" = dontDistribute super."CheatSheet";
   "Checked" = dontDistribute super."Checked";
   "Chitra" = dontDistribute super."Chitra";
@@ -305,6 +306,7 @@ self: super: {
   "Flippi" = dontDistribute super."Flippi";
   "Focus" = dontDistribute super."Focus";
   "Folly" = dontDistribute super."Folly";
+  "FontyFruity" = doDistribute super."FontyFruity_0_5_2";
   "ForSyDe" = dontDistribute super."ForSyDe";
   "ForkableT" = dontDistribute super."ForkableT";
   "FormalGrammars" = dontDistribute super."FormalGrammars";
@@ -445,6 +447,7 @@ self: super: {
   "HSoundFile" = dontDistribute super."HSoundFile";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
+  "HTTP" = doDistribute super."HTTP_4000_3_2";
   "HTTP-Simple" = dontDistribute super."HTTP-Simple";
   "HTab" = dontDistribute super."HTab";
   "HTicTacToe" = dontDistribute super."HTicTacToe";
@@ -745,8 +748,10 @@ self: super: {
   "QuadTree" = dontDistribute super."QuadTree";
   "Quelea" = dontDistribute super."Quelea";
   "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
   "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";
@@ -1062,6 +1067,7 @@ self: super: {
   "adp-multi-monadiccp" = dontDistribute super."adp-multi-monadiccp";
   "aeson-applicative" = dontDistribute super."aeson-applicative";
   "aeson-bson" = dontDistribute super."aeson-bson";
+  "aeson-compat" = doDistribute super."aeson-compat_0_3_0_0";
   "aeson-diff" = dontDistribute super."aeson-diff";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-iproute" = dontDistribute super."aeson-iproute";
@@ -1182,6 +1188,7 @@ self: super: {
   "ar-timestamp-wiper" = dontDistribute super."ar-timestamp-wiper";
   "arb-fft" = dontDistribute super."arb-fft";
   "arbb-vm" = dontDistribute super."arbb-vm";
+  "arbtt" = doDistribute super."arbtt_0_9_0_7";
   "archive" = dontDistribute super."archive";
   "archiver" = dontDistribute super."archiver";
   "archlinux" = dontDistribute super."archlinux";
@@ -1279,6 +1286,7 @@ self: super: {
   "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";
@@ -1371,6 +1379,7 @@ self: super: {
   "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";
@@ -1394,6 +1403,7 @@ self: super: {
   "binary-store" = dontDistribute super."binary-store";
   "binary-streams" = dontDistribute super."binary-streams";
   "binary-strict" = dontDistribute super."binary-strict";
+  "binary-tagged" = doDistribute super."binary-tagged_0_1_3_0";
   "binarydefer" = dontDistribute super."binarydefer";
   "bind-marshal" = dontDistribute super."bind-marshal";
   "binding-core" = dontDistribute super."binding-core";
@@ -1765,9 +1775,14 @@ self: super: {
   "clanki" = dontDistribute super."clanki";
   "clarifai" = dontDistribute super."clarifai";
   "clash" = dontDistribute super."clash";
+  "clash-ghc" = doDistribute super."clash-ghc_0_6_9";
+  "clash-lib" = doDistribute super."clash-lib_0_6_9";
+  "clash-prelude" = doDistribute super."clash-prelude_0_10_5";
   "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
+  "clash-vhdl" = doDistribute super."clash-vhdl_0_6_6";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
   "clckwrks-dot-com" = dontDistribute super."clckwrks-dot-com";
   "clckwrks-plugin-bugs" = dontDistribute super."clckwrks-plugin-bugs";
   "clckwrks-plugin-ircbot" = dontDistribute super."clckwrks-plugin-ircbot";
@@ -1794,6 +1809,7 @@ self: super: {
   "cloudyfs" = dontDistribute super."cloudyfs";
   "cltw" = dontDistribute super."cltw";
   "clua" = dontDistribute super."clua";
+  "clumpiness" = dontDistribute super."clumpiness";
   "cluss" = dontDistribute super."cluss";
   "clustertools" = dontDistribute super."clustertools";
   "clutterhs" = dontDistribute super."clutterhs";
@@ -1895,6 +1911,7 @@ self: super: {
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
@@ -2098,6 +2115,7 @@ self: super: {
   "data-concurrent-queue" = dontDistribute super."data-concurrent-queue";
   "data-construction" = dontDistribute super."data-construction";
   "data-cycle" = dontDistribute super."data-cycle";
+  "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";
@@ -2121,6 +2139,7 @@ self: super: {
   "data-flagset" = dontDistribute super."data-flagset";
   "data-fresh" = dontDistribute super."data-fresh";
   "data-interval" = dontDistribute super."data-interval";
+  "data-inttrie" = doDistribute super."data-inttrie_0_1_0";
   "data-ivar" = dontDistribute super."data-ivar";
   "data-json-token" = dontDistribute super."data-json-token";
   "data-kiln" = dontDistribute super."data-kiln";
@@ -2283,6 +2302,7 @@ self: super: {
   "digamma" = dontDistribute super."digamma";
   "digest-pure" = dontDistribute super."digest-pure";
   "digestive-foundation-lucid" = dontDistribute super."digestive-foundation-lucid";
+  "digestive-functors-aeson" = doDistribute super."digestive-functors-aeson_1_1_18";
   "digestive-functors-happstack" = dontDistribute super."digestive-functors-happstack";
   "digestive-functors-heist" = dontDistribute super."digestive-functors-heist";
   "digestive-functors-hsp" = dontDistribute super."digestive-functors-hsp";
@@ -2456,8 +2476,10 @@ self: super: {
   "eibd-client-simple" = dontDistribute super."eibd-client-simple";
   "eigen" = dontDistribute super."eigen";
   "eithers" = dontDistribute super."eithers";
+  "ekg" = doDistribute super."ekg_0_4_0_8";
   "ekg-bosun" = dontDistribute super."ekg-bosun";
   "ekg-carbon" = dontDistribute super."ekg-carbon";
+  "ekg-json" = doDistribute super."ekg-json_0_1_0_0";
   "ekg-log" = dontDistribute super."ekg-log";
   "ekg-push" = dontDistribute super."ekg-push";
   "ekg-rrd" = dontDistribute super."ekg-rrd";
@@ -2493,6 +2515,7 @@ self: super: {
   "empty" = dontDistribute super."empty";
   "encoding" = dontDistribute super."encoding";
   "endo" = dontDistribute super."endo";
+  "engine-io" = doDistribute super."engine-io_1_2_12";
   "engine-io-growler" = dontDistribute super."engine-io-growler";
   "engine-io-snap" = dontDistribute super."engine-io-snap";
   "engineering-units" = dontDistribute super."engineering-units";
@@ -2556,11 +2579,11 @@ self: super: {
   "event-list" = dontDistribute super."event-list";
   "event-monad" = dontDistribute super."event-monad";
   "eventloop" = dontDistribute super."eventloop";
+  "eventstore" = doDistribute super."eventstore_0_10_0_1";
   "every-bit-counts" = dontDistribute super."every-bit-counts";
   "ewe" = dontDistribute super."ewe";
   "ex-pool" = dontDistribute super."ex-pool";
   "exact-combinatorics" = dontDistribute super."exact-combinatorics";
-  "exact-pi" = doDistribute super."exact-pi_0_4_1_1";
   "exception-hierarchy" = dontDistribute super."exception-hierarchy";
   "exception-mailer" = dontDistribute super."exception-mailer";
   "exception-monads-fd" = dontDistribute super."exception-monads-fd";
@@ -2671,6 +2694,7 @@ self: super: {
   "filesystem-trees" = dontDistribute super."filesystem-trees";
   "filtrable" = dontDistribute super."filtrable";
   "final" = dontDistribute super."final";
+  "find-clumpiness" = dontDistribute super."find-clumpiness";
   "find-conduit" = dontDistribute super."find-conduit";
   "fingertree-tf" = dontDistribute super."fingertree-tf";
   "finite-field" = dontDistribute super."finite-field";
@@ -2823,6 +2847,7 @@ self: super: {
   "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";
@@ -2888,6 +2913,7 @@ self: super: {
   "generic-storable" = dontDistribute super."generic-storable";
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generics-sop" = doDistribute super."generics-sop_0_2_0_0";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
   "geni-gui" = dontDistribute super."geni-gui";
@@ -2969,6 +2995,7 @@ self: super: {
   "gimlh" = dontDistribute super."gimlh";
   "ginger" = dontDistribute super."ginger";
   "ginsu" = dontDistribute super."ginsu";
+  "gipeda" = doDistribute super."gipeda_0_2";
   "gist" = dontDistribute super."gist";
   "git-all" = dontDistribute super."git-all";
   "git-annex" = doDistribute super."git-annex_6_20160114";
@@ -3255,7 +3282,6 @@ self: super: {
   "hGelf" = dontDistribute super."hGelf";
   "hLLVM" = dontDistribute super."hLLVM";
   "hMollom" = dontDistribute super."hMollom";
-  "hOpenPGP" = doDistribute super."hOpenPGP_2_4_3";
   "hPDB-examples" = dontDistribute super."hPDB-examples";
   "hPushover" = dontDistribute super."hPushover";
   "hR" = dontDistribute super."hR";
@@ -3518,6 +3544,8 @@ self: super: {
   "hasloGUI" = dontDistribute super."hasloGUI";
   "hasparql-client" = dontDistribute super."hasparql-client";
   "haspell" = dontDistribute super."haspell";
+  "hasql" = doDistribute super."hasql_0_19_6";
+  "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";
@@ -3804,6 +3832,9 @@ self: super: {
   "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";
@@ -4049,6 +4080,7 @@ self: super: {
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
   "http-wget" = dontDistribute super."http-wget";
+  "http2" = doDistribute super."http2_1_4_4";
   "https-everywhere-rules" = dontDistribute super."https-everywhere-rules";
   "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw";
   "httpspec" = dontDistribute super."httpspec";
@@ -4170,6 +4202,7 @@ self: super: {
   "improve" = dontDistribute super."improve";
   "inc-ref" = dontDistribute super."inc-ref";
   "inch" = dontDistribute super."inch";
+  "include-file" = doDistribute super."include-file_0_1_0_2";
   "incremental-computing" = dontDistribute super."incremental-computing";
   "incremental-sat-solver" = dontDistribute super."incremental-sat-solver";
   "increments" = dontDistribute super."increments";
@@ -4223,7 +4256,6 @@ self: super: {
   "interpolation" = dontDistribute super."interpolation";
   "intricacy" = dontDistribute super."intricacy";
   "intset" = dontDistribute super."intset";
-  "invariant" = doDistribute super."invariant_0_3_1";
   "invertible-syntax" = dontDistribute super."invertible-syntax";
   "io-capture" = dontDistribute super."io-capture";
   "io-reactive" = dontDistribute super."io-reactive";
@@ -4492,6 +4524,7 @@ self: super: {
   "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_7_0_1";
   "language-typescript" = dontDistribute super."language-typescript";
   "language-vhdl" = dontDistribute super."language-vhdl";
   "lat" = dontDistribute super."lat";
@@ -4779,6 +4812,7 @@ self: super: {
   "manatee-terminal" = dontDistribute super."manatee-terminal";
   "manatee-welcome" = dontDistribute super."manatee-welcome";
   "mancala" = dontDistribute super."mancala";
+  "mandrill" = doDistribute super."mandrill_0_5_0_0";
   "mandulia" = dontDistribute super."mandulia";
   "manifold-random" = dontDistribute super."manifold-random";
   "manifolds" = dontDistribute super."manifolds";
@@ -4854,6 +4888,7 @@ self: super: {
   "mi" = dontDistribute super."mi";
   "microbench" = dontDistribute super."microbench";
   "microformats2-types" = dontDistribute super."microformats2-types";
+  "microlens-aeson" = doDistribute super."microlens-aeson_2_1_0";
   "microlens-each" = dontDistribute super."microlens-each";
   "microtimer" = dontDistribute super."microtimer";
   "mida" = dontDistribute super."mida";
@@ -4915,7 +4950,6 @@ self: super: {
   "monad-bool" = dontDistribute super."monad-bool";
   "monad-classes" = dontDistribute super."monad-classes";
   "monad-codec" = dontDistribute super."monad-codec";
-  "monad-coroutine" = doDistribute super."monad-coroutine_0_9_0_2";
   "monad-exception" = dontDistribute super."monad-exception";
   "monad-fork" = dontDistribute super."monad-fork";
   "monad-gen" = dontDistribute super."monad-gen";
@@ -4927,7 +4961,6 @@ self: super: {
   "monad-mersenne-random" = dontDistribute super."monad-mersenne-random";
   "monad-open" = dontDistribute super."monad-open";
   "monad-ox" = dontDistribute super."monad-ox";
-  "monad-parallel" = doDistribute super."monad-parallel_0_7_2_1";
   "monad-parallel-progressbar" = dontDistribute super."monad-parallel-progressbar";
   "monad-param" = dontDistribute super."monad-param";
   "monad-ran" = dontDistribute super."monad-ran";
@@ -5009,6 +5042,7 @@ self: super: {
   "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";
@@ -5048,6 +5082,7 @@ self: super: {
   "mvc" = dontDistribute super."mvc";
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
+  "mwc-probability" = doDistribute super."mwc-probability_1_0_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5229,6 +5264,7 @@ self: super: {
   "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";
@@ -5295,7 +5331,9 @@ self: super: {
   "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";
+  "opml-conduit" = doDistribute super."opml-conduit_0_4_0_0";
   "opn" = dontDistribute super."opn";
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
@@ -5338,6 +5376,7 @@ self: super: {
   "pacman-memcache" = dontDistribute super."pacman-memcache";
   "padKONTROL" = dontDistribute super."padKONTROL";
   "pagarme" = dontDistribute super."pagarme";
+  "pagerduty" = doDistribute super."pagerduty_0_0_4";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
@@ -5350,6 +5389,7 @@ self: super: {
   "pandoc-lens" = dontDistribute super."pandoc-lens";
   "pandoc-placetable" = dontDistribute super."pandoc-placetable";
   "pandoc-plantuml-diagrams" = dontDistribute super."pandoc-plantuml-diagrams";
+  "pandoc-types" = doDistribute super."pandoc-types_1_16_0_1";
   "pandoc-unlit" = dontDistribute super."pandoc-unlit";
   "papillon" = dontDistribute super."papillon";
   "pappy" = dontDistribute super."pappy";
@@ -5414,9 +5454,6 @@ self: super: {
   "pcg-random" = dontDistribute super."pcg-random";
   "pcre-less" = dontDistribute super."pcre-less";
   "pcre-light-extra" = dontDistribute super."pcre-light-extra";
-  "pdf-toolbox-content" = doDistribute super."pdf-toolbox-content_0_0_5_1";
-  "pdf-toolbox-core" = doDistribute super."pdf-toolbox-core_0_0_4_1";
-  "pdf-toolbox-document" = doDistribute super."pdf-toolbox-document_0_0_7_1";
   "pdf-toolbox-viewer" = dontDistribute super."pdf-toolbox-viewer";
   "pdf2line" = dontDistribute super."pdf2line";
   "pdfsplit" = dontDistribute super."pdfsplit";
@@ -5509,7 +5546,6 @@ self: super: {
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
   "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
-  "pipes-text" = doDistribute super."pipes-text_0_0_2_1";
   "pipes-transduce" = dontDistribute super."pipes-transduce";
   "pipes-vector" = dontDistribute super."pipes-vector";
   "pipes-websockets" = dontDistribute super."pipes-websockets";
@@ -5597,6 +5633,7 @@ self: super: {
   "posix-waitpid" = dontDistribute super."posix-waitpid";
   "possible" = dontDistribute super."possible";
   "postcodes" = dontDistribute super."postcodes";
+  "postgresql-binary" = doDistribute super."postgresql-binary_0_7_9";
   "postgresql-config" = dontDistribute super."postgresql-config";
   "postgresql-connector" = dontDistribute super."postgresql-connector";
   "postgresql-copy-escape" = dontDistribute super."postgresql-copy-escape";
@@ -5647,6 +5684,7 @@ self: super: {
   "primitive-simd" = dontDistribute super."primitive-simd";
   "primula-board" = dontDistribute super."primula-board";
   "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
   "printf-mauke" = dontDistribute super."printf-mauke";
   "printxosd" = dontDistribute super."printxosd";
   "priority-queue" = dontDistribute super."priority-queue";
@@ -5704,7 +5742,6 @@ self: super: {
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
   "pseudo-trie" = dontDistribute super."pseudo-trie";
   "pseudomacros" = dontDistribute super."pseudomacros";
-  "psqueues" = doDistribute super."psqueues_0_2_2_0";
   "pub" = dontDistribute super."pub";
   "publicsuffix" = doDistribute super."publicsuffix_0_20151212";
   "publicsuffixlist" = dontDistribute super."publicsuffixlist";
@@ -5731,6 +5768,7 @@ self: super: {
   "push-notify-ccs" = dontDistribute super."push-notify-ccs";
   "push-notify-general" = dontDistribute super."push-notify-general";
   "pusher-haskell" = dontDistribute super."pusher-haskell";
+  "pusher-http-haskell" = doDistribute super."pusher-http-haskell_0_3_0_1";
   "pushme" = dontDistribute super."pushme";
   "putlenses" = dontDistribute super."putlenses";
   "puzzle-draw" = dontDistribute super."puzzle-draw";
@@ -5806,6 +5844,7 @@ self: super: {
   "random-extras" = dontDistribute super."random-extras";
   "random-hypergeometric" = dontDistribute super."random-hypergeometric";
   "random-stream" = dontDistribute super."random-stream";
+  "random-tree" = dontDistribute super."random-tree";
   "random-variates" = dontDistribute super."random-variates";
   "randomgen" = dontDistribute super."randomgen";
   "randproc" = dontDistribute super."randproc";
@@ -5888,6 +5927,7 @@ self: super: {
   "reflex-gloss" = dontDistribute super."reflex-gloss";
   "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
   "reflex-transformers" = dontDistribute super."reflex-transformers";
+  "regex-applicative-text" = doDistribute super."regex-applicative-text_0_1_0_0";
   "regex-deriv" = dontDistribute super."regex-deriv";
   "regex-dfa" = dontDistribute super."regex-dfa";
   "regex-easy" = dontDistribute super."regex-easy";
@@ -5936,6 +5976,9 @@ self: super: {
   "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";
@@ -5980,6 +6023,7 @@ self: super: {
   "restricted-workers" = dontDistribute super."restricted-workers";
   "restyle" = dontDistribute super."restyle";
   "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "rethinkdb" = doDistribute super."rethinkdb_2_2_0_2";
   "rethinkdb-model" = dontDistribute super."rethinkdb-model";
   "rethinkdb-wereHamster" = dontDistribute super."rethinkdb-wereHamster";
   "retryer" = dontDistribute super."retryer";
@@ -6090,6 +6134,7 @@ self: super: {
   "salvia-websocket" = dontDistribute super."salvia-websocket";
   "sample-frame" = dontDistribute super."sample-frame";
   "sample-frame-np" = dontDistribute super."sample-frame-np";
+  "sampling" = dontDistribute super."sampling";
   "samtools" = dontDistribute super."samtools";
   "samtools-conduit" = dontDistribute super."samtools-conduit";
   "samtools-enumerator" = dontDistribute super."samtools-enumerator";
@@ -6358,6 +6403,7 @@ self: super: {
   "smartconstructor" = dontDistribute super."smartconstructor";
   "smartword" = dontDistribute super."smartword";
   "sme" = dontDistribute super."sme";
+  "smoothie" = doDistribute super."smoothie_0_4_2_1";
   "smt-lib" = dontDistribute super."smt-lib";
   "smtlib2" = dontDistribute super."smtlib2";
   "smtp-mail-ng" = dontDistribute super."smtp-mail-ng";
@@ -6433,6 +6479,7 @@ self: super: {
   "sock2stream" = dontDistribute super."sock2stream";
   "sockaddr" = dontDistribute super."sockaddr";
   "socket-activation" = dontDistribute super."socket-activation";
+  "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
   "soegtk" = dontDistribute super."soegtk";
@@ -6518,6 +6565,7 @@ self: super: {
   "stack-hpc-coveralls" = dontDistribute super."stack-hpc-coveralls";
   "stack-prism" = dontDistribute super."stack-prism";
   "stack-run" = dontDistribute super."stack-run";
+  "stackage-curator" = doDistribute super."stackage-curator_0_13_0";
   "standalone-derive-topdown" = dontDistribute super."standalone-derive-topdown";
   "standalone-haddock" = dontDistribute super."standalone-haddock";
   "star-to-star" = dontDistribute super."star-to-star";
@@ -6583,6 +6631,7 @@ self: super: {
   "stream-fusion" = dontDistribute super."stream-fusion";
   "stream-monad" = dontDistribute super."stream-monad";
   "streamed" = dontDistribute super."streamed";
+  "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
@@ -6621,7 +6670,6 @@ self: super: {
   "subnet" = dontDistribute super."subnet";
   "subtitleParser" = dontDistribute super."subtitleParser";
   "subtitles" = dontDistribute super."subtitles";
-  "success" = doDistribute super."success_0_2_6";
   "suffixarray" = dontDistribute super."suffixarray";
   "suffixtree" = dontDistribute super."suffixtree";
   "sugarhaskell" = dontDistribute super."sugarhaskell";
@@ -6794,6 +6842,7 @@ self: super: {
   "testrunner" = dontDistribute super."testrunner";
   "tetris" = dontDistribute super."tetris";
   "tex2txt" = dontDistribute super."tex2txt";
+  "texmath" = doDistribute super."texmath_0_8_4_1";
   "texrunner" = dontDistribute super."texrunner";
   "text-and-plots" = dontDistribute super."text-and-plots";
   "text-format-simple" = dontDistribute super."text-format-simple";
@@ -6810,6 +6859,7 @@ self: super: {
   "text-region" = dontDistribute super."text-region";
   "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";
@@ -6948,6 +6998,7 @@ self: super: {
   "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-free" = dontDistribute super."transformers-free";
@@ -6960,6 +7011,7 @@ self: super: {
   "travis-meta-yaml" = dontDistribute super."travis-meta-yaml";
   "trawl" = dontDistribute super."trawl";
   "traypoweroff" = dontDistribute super."traypoweroff";
+  "tree-fun" = dontDistribute super."tree-fun";
   "tree-monad" = dontDistribute super."tree-monad";
   "treemap-html" = dontDistribute super."treemap-html";
   "treemap-html-tools" = dontDistribute super."treemap-html-tools";
@@ -7224,7 +7276,6 @@ self: super: {
   "vect-floating-accelerate" = dontDistribute super."vect-floating-accelerate";
   "vect-opengl" = dontDistribute super."vect-opengl";
   "vector-binary" = dontDistribute super."vector-binary";
-  "vector-binary-instances" = doDistribute super."vector-binary-instances_0_2_1_1";
   "vector-bytestring" = dontDistribute super."vector-bytestring";
   "vector-clock" = dontDistribute super."vector-clock";
   "vector-conduit" = dontDistribute super."vector-conduit";
@@ -7534,6 +7585,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_6";
   "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/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 58ad27a8a92d..1dbe2174e50c 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -3123,7 +3123,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ChasingBottoms" = callPackage
+  "ChasingBottoms_1_3_0_13" = callPackage
     ({ mkDerivation, array, base, containers, mtl, QuickCheck, random
      , syb
      }:
@@ -3141,6 +3141,25 @@ self: {
        ];
        description = "For testing partial and infinite values";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "ChasingBottoms" = callPackage
+    ({ mkDerivation, array, base, containers, mtl, QuickCheck, random
+     , syb
+     }:
+     mkDerivation {
+       pname = "ChasingBottoms";
+       version = "1.3.0.14";
+       sha256 = "a4a296b09d8158d25ace6fdaf17a445f30e3af14f753e6bc80282806c309704a";
+       libraryHaskellDepends = [
+         base containers mtl QuickCheck random syb
+       ];
+       testHaskellDepends = [
+         array base containers mtl QuickCheck random syb
+       ];
+       description = "For testing partial and infinite values";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "CheatSheet" = callPackage
@@ -5001,8 +5020,8 @@ self: {
        pname = "Earley";
        version = "0.10.1.0";
        sha256 = "a90c5c1e210a0e37db577ace20b1ca2aa33d22454766ecaeb5dc253cb7d4887e";
-       revision = "1";
-       editedCabalFile = "2c662e0220aec5059849ac19f5ce4ad63330a4d8475332e59ad28204328cbbce";
+       revision = "2";
+       editedCabalFile = "310e7216914ee8e8338bc9481f6aa75f7cb2324d35ab03d29973b93bee2a725a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ListLike ];
@@ -5054,7 +5073,6 @@ self: {
        libraryHaskellDepends = [
          array base containers EdisonAPI mtl QuickCheck
        ];
-       jailbreak = true;
        homepage = "http://rwd.rdockins.name/edison/home/";
        description = "A library of efficent, purely-functional data structures (Core Implementations)";
        license = "unknown";
@@ -5992,7 +6010,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "FontyFruity" = callPackage
+  "FontyFruity_0_5_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq
      , directory, filepath, text, vector
      }:
@@ -6006,6 +6024,23 @@ self: {
        ];
        description = "A true type file format loader";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "FontyFruity" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq
+     , directory, filepath, text, vector
+     }:
+     mkDerivation {
+       pname = "FontyFruity";
+       version = "0.5.3.1";
+       sha256 = "24c77ee0ff24e79eeca3d60eb0e8c86e374d49f7b770c127c346ff2fbc782ecd";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq directory filepath text
+         vector
+       ];
+       description = "A true type file format loader";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "ForSyDe" = callPackage
@@ -7042,15 +7077,15 @@ self: {
     ({ mkDerivation, base, directory, gtk3, process, temporary }:
      mkDerivation {
        pname = "Gifcurry";
-       version = "0.1.0.3";
-       sha256 = "a54e2bde1b6521997af0bb4983094169eb492e65a8b5d8bc596d57d06b59e399";
+       version = "0.1.0.5";
+       sha256 = "6a862236c56993145cbcc015739a596c4ee46d5488f28544e0cf7ee8759b362c";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base directory gtk3 process temporary
        ];
        homepage = "https://github.com/lettier/gifcurry";
-       description = "Create animated GIFs, overlaid with optional text, from movies";
+       description = "Create animated GIFs, overlaid with optional text, from video files";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -9242,7 +9277,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "HTTP" = callPackage
+  "HTTP_4000_3_2" = callPackage
     ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
      , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
      , network, network-uri, parsec, pureMD5, split, test-framework
@@ -9264,6 +9299,31 @@ self: {
        homepage = "https://github.com/haskell/HTTP";
        description = "A library for client-side HTTP";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "HTTP" = callPackage
+    ({ mkDerivation, array, base, bytestring, case-insensitive, conduit
+     , conduit-extra, deepseq, http-types, httpd-shed, HUnit, mtl
+     , network, network-uri, parsec, pureMD5, split, test-framework
+     , test-framework-hunit, time, wai, warp
+     }:
+     mkDerivation {
+       pname = "HTTP";
+       version = "4000.3.3";
+       sha256 = "bbada3c2088dc1384234cdbc1bb6089ea588da068a6a38878ea259dd19de9bf2";
+       libraryHaskellDepends = [
+         array base bytestring mtl network network-uri parsec time
+       ];
+       testHaskellDepends = [
+         base bytestring case-insensitive conduit conduit-extra deepseq
+         http-types httpd-shed HUnit mtl network network-uri pureMD5 split
+         test-framework test-framework-hunit wai warp
+       ];
+       doCheck = false;
+       homepage = "https://github.com/haskell/HTTP";
+       description = "A library for client-side HTTP";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "HTTP-Simple" = callPackage
@@ -10593,19 +10653,20 @@ self: {
      }) {};
 
   "Hoed" = callPackage
-    ({ mkDerivation, array, base, containers, directory, filepath
-     , FPretty, libgraph, mtl, process, RBTree, regex-posix
-     , template-haskell, threepenny-gui
+    ({ mkDerivation, array, base, bytestring, cereal, containers
+     , directory, filepath, FPretty, libgraph, mtl, process, RBTree
+     , regex-posix, template-haskell, threepenny-gui
      }:
      mkDerivation {
        pname = "Hoed";
-       version = "0.3.4";
-       sha256 = "c82359deccc4de43e1e5215f2c28f2fc659e701d9e18bad70f9f5c54853e5f90";
+       version = "0.3.5";
+       sha256 = "b14c654effc7d4926f73966be56de290d9b0d5159371fc184320033aabba1f1f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         array base containers directory filepath FPretty libgraph mtl
-         process RBTree regex-posix template-haskell threepenny-gui
+         array base bytestring cereal containers directory filepath FPretty
+         libgraph mtl process RBTree regex-posix template-haskell
+         threepenny-gui
        ];
        homepage = "https://wiki.haskell.org/Hoed";
        description = "Lightweight algorithmic debugging";
@@ -11009,8 +11070,8 @@ self: {
      }:
      mkDerivation {
        pname = "HueAPI";
-       version = "0.2.6";
-       sha256 = "19515ecd8501ae038f060a3b10d391c865d07391d240b1819a55a165340e35c2";
+       version = "0.2.7";
+       sha256 = "041a08272fadadeac496f04d5fd3f9a4da8a4122fed2c0b9ec3e875d5273b900";
        libraryHaskellDepends = [
          aeson base containers lens lens-aeson mtl transformers wreq
        ];
@@ -13485,6 +13546,7 @@ self: {
          base data-default ghc-prim kan-extensions mmorph monad-products mtl
          parallel random transformers transformers-compat
        ];
+       jailbreak = true;
        homepage = "http://alkalisoftware.net";
        description = "Methods for composing monads";
        license = stdenv.lib.licenses.bsd3;
@@ -13545,6 +13607,7 @@ self: {
        libraryHaskellDepends = [
          base mtl random transformers transformers-compat
        ];
+       jailbreak = true;
        description = "Random-number generation monad";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13563,6 +13626,7 @@ self: {
        libraryHaskellDepends = [
          base mtl random transformers transformers-compat
        ];
+       jailbreak = true;
        description = "Random-number generation monad";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -13579,6 +13643,7 @@ self: {
        libraryHaskellDepends = [
          base mtl random transformers transformers-compat
        ];
+       jailbreak = true;
        description = "Random-number generation monad";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -15571,19 +15636,20 @@ self: {
      }) {};
 
   "Plot-ho-matic" = callPackage
-    ({ mkDerivation, base, cairo, Chart, Chart-cairo, containers
-     , data-default-class, generic-accessors, glib, gtk3, lens, text
-     , time, transformers, vector
+    ({ mkDerivation, base, bytestring, cairo, cereal, Chart
+     , Chart-cairo, containers, data-default-class, generic-accessors
+     , glib, gtk3, lens, text, time, transformers, vector
      }:
      mkDerivation {
        pname = "Plot-ho-matic";
-       version = "0.9.0.1";
-       sha256 = "f7cf62c612c0bdf18b7fa4791260ac7f7b1ee7bb58d8f131c358f002a9262ec9";
+       version = "0.9.0.2";
+       sha256 = "f67856090d2ed0c5869d57cd50da4f32c9eb8c4e654e0c0bf232765f81aea072";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base cairo Chart Chart-cairo containers data-default-class
-         generic-accessors glib gtk3 lens text time transformers vector
+         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";
@@ -16009,7 +16075,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "QuickCheck" = callPackage
+  "QuickCheck_2_8_1" = callPackage
     ({ mkDerivation, base, containers, random, template-haskell
      , test-framework, tf-random, transformers
      }:
@@ -16025,12 +16091,14 @@ 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;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "QuickCheck_2_8_2" = callPackage
+  "QuickCheck" = callPackage
     ({ mkDerivation, base, containers, random, template-haskell
      , test-framework, tf-random, transformers
      }:
@@ -16044,11 +16112,9 @@ 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;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "QuickCheck-GenT" = callPackage
@@ -16078,6 +16144,27 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "QuickPlot" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, colour
+     , haskell-src-meta, parsec, scientific, snap, snap-core
+     , template-haskell, text, vector, websockets, websockets-snap
+     }:
+     mkDerivation {
+       pname = "QuickPlot";
+       version = "0.1.0.0";
+       sha256 = "f83747c013815d9a0f780a4839f6a7381d0fd867eaf8b92f8ae0333c34afef37";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring colour haskell-src-meta parsec
+         scientific snap snap-core template-haskell text vector websockets
+         websockets-snap
+       ];
+       homepage = "http://github.com/tepf/QuickPlot#readme";
+       description = "Quick and easy data visualization with Haskell";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "Quickson" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, either, text
      }:
@@ -16162,15 +16249,16 @@ self: {
   "RFC1751" = callPackage
     ({ mkDerivation, base, binary, bytestring, HUnit, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , vector
      }:
      mkDerivation {
        pname = "RFC1751";
-       version = "0.3.0.1";
-       sha256 = "6a6686ca05bcbf4fc24786b2cb7f33003b7b53705e2e631b7187fff20165878c";
-       libraryHaskellDepends = [ base binary bytestring ];
+       version = "0.3.1.0";
+       sha256 = "d19f8c3020e76c45343a746442efbeabc7e60a80d1fdf8a11e5c29723d4937c8";
+       libraryHaskellDepends = [ base binary bytestring vector ];
        testHaskellDepends = [
          base binary bytestring HUnit QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2
+         test-framework-hunit test-framework-quickcheck2 vector
        ];
        homepage = "https://github.com/xenog/RFC1751";
        description = "RFC-1751 library for Haskell";
@@ -16334,6 +16422,38 @@ self: {
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
+  "RNAlien_1_1_0" = callPackage
+    ({ mkDerivation, aeson, base, biocore, biofasta, BlastHTTP
+     , blastxml, bytestring, cassava, ClustalParser, cmdargs, containers
+     , directory, edit-distance, either-unwrap, EntrezHTTP, filepath
+     , hierarchical-clustering, HTTP, http-conduit, hxt, matrix, network
+     , parsec, process, pureMD5, random, split, Taxonomy, text, time
+     , transformers, vector, ViennaRNAParser
+     }:
+     mkDerivation {
+       pname = "RNAlien";
+       version = "1.1.0";
+       sha256 = "450d898235dadc7879eef1bb025713b7d55e8a271332760d8d744b4deb9636d8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base biocore biofasta BlastHTTP blastxml bytestring cassava
+         ClustalParser cmdargs containers directory edit-distance
+         either-unwrap EntrezHTTP filepath hierarchical-clustering HTTP
+         http-conduit hxt matrix network parsec process pureMD5 random
+         Taxonomy text transformers vector ViennaRNAParser
+       ];
+       executableHaskellDepends = [
+         base biocore biofasta bytestring cassava cmdargs containers
+         directory either-unwrap filepath process random split time vector
+         ViennaRNAParser
+       ];
+       jailbreak = true;
+       description = "Unsupervized construction of RNA family models";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "RNAwolf" = callPackage
     ({ mkDerivation, base, BiobaseTrainingData, BiobaseXNA, bytestring
      , cmdargs, containers, deepseq, directory, parallel, PrimitiveArray
@@ -19704,6 +19824,19 @@ self: {
        license = "GPL";
      }) {};
 
+  "ViennaRNAParser_1_2_8" = callPackage
+    ({ mkDerivation, base, hspec, parsec, process, transformers }:
+     mkDerivation {
+       pname = "ViennaRNAParser";
+       version = "1.2.8";
+       sha256 = "5d298b026f0c40d04cc3da3d148671602bd602c1583c1812153a21f90b40f25e";
+       libraryHaskellDepends = [ base parsec process transformers ];
+       testHaskellDepends = [ base hspec parsec ];
+       description = "Libary for parsing ViennaRNA package output";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Vulkan" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -22346,8 +22479,8 @@ self: {
      }:
      mkDerivation {
        pname = "adblock2privoxy";
-       version = "1.4.1";
-       sha256 = "6b3242a5ddba181659f9b8eb4786dfa929751aaf48a62b070040043a3e8e0613";
+       version = "1.4.2";
+       sha256 = "2c42c4a75720d8a988898440d06df15b10a2ff1de88fe793de7b7cfe415a339e";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -22645,8 +22778,8 @@ self: {
        pname = "aeson";
        version = "0.9.0.1";
        sha256 = "92b97dbc4968a2af6bc13b499629118f85b22efe113a4d60e578fbfb0f6ef8bc";
-       revision = "1";
-       editedCabalFile = "651b27c1cd2730cd0234cc1fb5860dd74728e5ecc6682b2a5e857fd42d41fe22";
+       revision = "2";
+       editedCabalFile = "5796e32c015d96fcbce31eaf22eba93580d47a8df798bd2260732ef5eac3cb02";
        libraryHaskellDepends = [
          attoparsec base bytestring containers deepseq dlist ghc-prim
          hashable mtl scientific syb template-haskell text time transformers
@@ -22657,6 +22790,7 @@ self: {
          template-haskell test-framework test-framework-hunit
          test-framework-quickcheck2 text time unordered-containers vector
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/bos/aeson";
        description = "Fast JSON parsing and encoding";
@@ -22693,6 +22827,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson_0_11_0_0" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
+     , dlist, fail, ghc-prim, hashable, HUnit, mtl, QuickCheck
+     , quickcheck-instances, scientific, semigroups, syb
+     , template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, transformers
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson";
+       version = "0.11.0.0";
+       sha256 = "ad3849d5d73824edea0fa3aa552d4c4630e67a8cf1295250e92d34b5e824add5";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers deepseq dlist fail ghc-prim
+         hashable mtl scientific semigroups syb template-haskell text time
+         transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring containers ghc-prim HUnit QuickCheck
+         quickcheck-instances template-haskell test-framework
+         test-framework-hunit test-framework-quickcheck2 text time
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/bos/aeson";
+       description = "Fast JSON parsing and encoding";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-applicative" = callPackage
     ({ mkDerivation, aeson, base, text, unordered-containers }:
      mkDerivation {
@@ -22758,7 +22921,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "aeson-compat" = callPackage
+  "aeson-compat_0_3_0_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
      , exceptions, hashable, quickcheck-instances, scientific, tasty
      , tasty-hunit, tasty-quickcheck, text, time, unordered-containers
@@ -22780,6 +22943,33 @@ self: {
        homepage = "https://github.com/phadej/aeson-compat#readme";
        description = "Compatibility layer for aeson";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "aeson-compat" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
+     , exceptions, hashable, nats, QuickCheck, quickcheck-instances
+     , scientific, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , time-locale-compat, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-compat";
+       version = "0.3.1.0";
+       sha256 = "9275040d031433eb0006bce8228a0828e058d547c7d07d61ab0b22154286d736";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring containers exceptions hashable
+         nats scientific text time time-locale-compat unordered-containers
+         vector
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base bytestring containers exceptions hashable
+         nats QuickCheck quickcheck-instances scientific tasty tasty-hunit
+         tasty-quickcheck text time time-locale-compat unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/phadej/aeson-compat#readme";
+       description = "Compatibility layer for aeson";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "aeson-diff" = callPackage
@@ -22995,6 +23185,7 @@ self: {
          aeson base bytestring lens text unordered-containers vector
        ];
        testHaskellDepends = [ base doctest ];
+       doCheck = false;
        description = "Lens of Aeson";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -23327,8 +23518,8 @@ self: {
        pname = "aeson-utils";
        version = "0.3.0.2";
        sha256 = "71814b1be8849f945395eb81217a2ad464f2943134c50c09afd8a3126add4b1f";
-       revision = "1";
-       editedCabalFile = "effc944d02b274ca2688671ac16fe1a8c87b6d036b0ba11d06dd404da47a8634";
+       revision = "2";
+       editedCabalFile = "32116e177571bd140c1d68b2c0502ba2ab58cc327cf83ca15b40521ceab61682";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring scientific text
        ];
@@ -23738,8 +23929,8 @@ self: {
      }:
      mkDerivation {
        pname = "aivika-branches";
-       version = "0.1.1";
-       sha256 = "56bbc2b3e7c9d1db19828b80fd2fc04dcbd1396a32bfd4d5d8e123418428e94a";
+       version = "0.1.2";
+       sha256 = "6c8a2cd2b840f839881e847af3402f13cb2dc33e6fed19954477c4ae3417a417";
        libraryHaskellDepends = [
          aivika aivika-transformers base containers mtl random
        ];
@@ -24535,8 +24726,8 @@ self: {
        pname = "alternative-io";
        version = "0.0.1";
        sha256 = "90e98870a6117db09f1ce54c025944a174e643d1149d5ee76782c311d9ba1e06";
-       revision = "1";
-       editedCabalFile = "982094590ae1e54131d4b1285eaec6d4160717a2864858f90a3511522fc591d6";
+       revision = "2";
+       editedCabalFile = "08531a3a2f2c8e6c4d44a1b201feb1ec354332f75e39d635318d8f6e31e5f15a";
        libraryHaskellDepends = [
          base lifted-base monad-control transformers transformers-base
        ];
@@ -29725,7 +29916,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libXScrnSaver;};
 
-  "arbtt" = callPackage
+  "arbtt_0_9_0_7" = callPackage
     ({ mkDerivation, aeson, array, base, binary, bytestring
      , bytestring-progress, containers, deepseq, directory, filepath
      , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty
@@ -29752,6 +29943,36 @@ self: {
        homepage = "http://arbtt.nomeata.de/";
        description = "Automatic Rule-Based Time Tracker";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs.xorg) libXScrnSaver;};
+
+  "arbtt" = callPackage
+    ({ mkDerivation, aeson, array, base, binary, bytestring
+     , bytestring-progress, containers, deepseq, directory, filepath
+     , libXScrnSaver, parsec, pcre-light, process-extras, strict, tasty
+     , tasty-golden, tasty-hunit, terminal-progress-bar, time
+     , transformers, unix, utf8-string, X11
+     }:
+     mkDerivation {
+       pname = "arbtt";
+       version = "0.9.0.8";
+       sha256 = "cde0e72d4df6612c04ac7c4061fbd8a86dc5b993c28de82f046d85c2b71602bb";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson array base binary bytestring bytestring-progress containers
+         deepseq directory filepath parsec pcre-light strict
+         terminal-progress-bar time transformers unix utf8-string X11
+       ];
+       executableSystemDepends = [ libXScrnSaver ];
+       testHaskellDepends = [
+         base binary bytestring containers deepseq directory parsec
+         pcre-light process-extras tasty tasty-golden tasty-hunit time
+         transformers unix utf8-string
+       ];
+       homepage = "http://arbtt.nomeata.de/";
+       description = "Automatic Rule-Based Time Tracker";
+       license = "GPL";
      }) {inherit (pkgs.xorg) libXScrnSaver;};
 
   "archive" = callPackage
@@ -29899,6 +30120,8 @@ self: {
        pname = "argon";
        version = "0.4.0.0";
        sha256 = "49cd357e23dc8aaf1d055bde5030ea12ed4e0b18edc4550a595028e26e582899";
+       revision = "1";
+       editedCabalFile = "6b1f69222554d70ac99998239cdf836ddbb10d7cc83ec6c1e050c97b894c4060";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -29918,6 +30141,34 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
+  "argon_0_4_1_0" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, bytestring, Cabal
+     , containers, directory, docopt, filepath, ghc, ghc-paths
+     , ghc-syb-utils, hlint, hspec, lens-simple, pipes, pipes-bytestring
+     , pipes-files, pipes-group, pipes-safe, QuickCheck, syb
+     }:
+     mkDerivation {
+       pname = "argon";
+       version = "0.4.1.0";
+       sha256 = "d93c50ae118a4493bdc5ed94e5f3d1eaa434e78422c79e28476329bad4475bea";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal base bytestring Cabal containers directory ghc
+         ghc-paths ghc-syb-utils lens-simple pipes pipes-bytestring
+         pipes-files pipes-group pipes-safe syb
+       ];
+       executableHaskellDepends = [ base docopt pipes pipes-safe ];
+       testHaskellDepends = [
+         aeson ansi-terminal base filepath ghc hlint hspec pipes pipes-safe
+         QuickCheck
+       ];
+       homepage = "http://github.com/rubik/argon";
+       description = "Measure your code's complexity";
+       license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "argon2" = callPackage
     ({ mkDerivation, base, bytestring, QuickCheck, tasty
      , tasty-quickcheck, text, transformers
@@ -32262,6 +32513,18 @@ self: {
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
+  "awesome-prelude" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "awesome-prelude";
+       version = "0.1.0.0";
+       sha256 = "cf5edb7500a02aaba7400f3baab984680898dbedc0cf5b09ded2ca40568e6e57";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://notabug.org/koz.ross/awesome-prelude";
+       description = "A prelude which I can be happy with. Based on base-prelude.";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "awesomium" = callPackage
     ({ mkDerivation, aeson, attoparsec, awesomium-raw, base, containers
      , text, vector
@@ -34138,6 +34401,19 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "base-prelude_1" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "base-prelude";
+       version = "1";
+       sha256 = "ee443310c2b3a18471f05b3c8c05ce39ea6f7825a0bf78028a06d59b3f28469c";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/nikita-volkov/base-prelude";
+       description = "The most complete prelude formed from only the \"base\" package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "base-unicode-symbols" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -35158,13 +35434,14 @@ self: {
        testHaskellDepends = [
          base hspec QuickCheck transformers transformers-compat
        ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/bifunctors/";
        description = "Bifunctors";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "bifunctors" = callPackage
+  "bifunctors_5_2" = callPackage
     ({ mkDerivation, base, comonad, containers, hspec, QuickCheck
      , semigroups, tagged, template-haskell, transformers
      , transformers-compat
@@ -35180,12 +35457,14 @@ self: {
        testHaskellDepends = [
          base hspec QuickCheck transformers transformers-compat
        ];
+       jailbreak = true;
        homepage = "http://github.com/ekmett/bifunctors/";
        description = "Bifunctors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "bifunctors_5_2_1" = callPackage
+  "bifunctors" = callPackage
     ({ mkDerivation, base, comonad, containers, hspec, QuickCheck
      , semigroups, tagged, template-haskell, transformers
      , transformers-compat
@@ -35201,11 +35480,10 @@ self: {
        testHaskellDepends = [
          base hspec QuickCheck transformers transformers-compat
        ];
-       jailbreak = true;
+       doHaddock = false;
        homepage = "http://github.com/ekmett/bifunctors/";
        description = "Bifunctors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bighugethesaurus" = callPackage
@@ -35438,15 +35716,15 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "binary_0_8_2_0" = callPackage
+  "binary_0_8_2_1" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , directory, filepath, HUnit, QuickCheck, random, test-framework
      , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "binary";
-       version = "0.8.2.0";
-       sha256 = "f4e51c13800407b31ec11b3d30699c62a2f0480a765c56939fa644cd36a4725d";
+       version = "0.8.2.1";
+       sha256 = "2452e32eccfe74214f689805745a11de1018f22eb19682772df23cce8816b750";
        libraryHaskellDepends = [ array base bytestring containers ];
        testHaskellDepends = [
          array base bytestring Cabal containers directory filepath HUnit
@@ -35729,8 +36007,8 @@ self: {
        pname = "binary-orphans";
        version = "0.1.4.0";
        sha256 = "0a952a7521747a7aacf4aa1638674130262f2efacb7121727c1932d49017f742";
-       revision = "1";
-       editedCabalFile = "be6bd79c7ab5ca7f7f4f92479064945b4242dc092f512e10497a3aafd9b625fb";
+       revision = "3";
+       editedCabalFile = "b81b44514f6b9e69bb1cb36484268470dd9268112d974960fb6070a4bb1f307c";
        libraryHaskellDepends = [
          aeson base binary hashable scientific semigroups tagged text
          text-binary time unordered-containers vector
@@ -35779,6 +36057,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "binary-parser_0_5_2" = callPackage
+    ({ mkDerivation, base-prelude, bytestring, success, text
+     , transformers
+     }:
+     mkDerivation {
+       pname = "binary-parser";
+       version = "0.5.2";
+       sha256 = "712d30f26f8423704437e02bd5cc98cfff48fdbac0499e8cb41998f289245545";
+       libraryHaskellDepends = [
+         base-prelude bytestring success text transformers
+       ];
+       homepage = "https://github.com/nikita-volkov/binary-parser";
+       description = "A highly-efficient but limited parser API specialised for bytestrings";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "binary-protocol" = callPackage
     ({ mkDerivation, base, binary, bytestring, mtl }:
      mkDerivation {
@@ -35977,7 +36272,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "binary-tagged" = callPackage
+  "binary-tagged_0_1_3_0" = callPackage
     ({ mkDerivation, aeson, array, base, bifunctors, binary
      , binary-orphans, bytestring, containers, generics-sop, hashable
      , quickcheck-instances, scientific, SHA, tagged, tasty
@@ -36000,6 +36295,32 @@ self: {
        homepage = "https://github.com/phadej/binary-tagged#readme";
        description = "Tagged binary serialisation";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "binary-tagged" = callPackage
+    ({ mkDerivation, aeson, array, base, bifunctors, binary
+     , binary-orphans, bytestring, containers, generics-sop, hashable
+     , quickcheck-instances, scientific, SHA, tagged, tasty
+     , tasty-quickcheck, text, time, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "binary-tagged";
+       version = "0.1.3.1";
+       sha256 = "cdd99120148015a56d92ebc38380f9ea9254d6272e5d0952dae4e55eaf52252f";
+       libraryHaskellDepends = [
+         aeson array base binary bytestring containers generics-sop hashable
+         scientific SHA tagged text time unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson array base bifunctors binary binary-orphans bytestring
+         containers generics-sop hashable quickcheck-instances scientific
+         SHA tagged tasty tasty-quickcheck text time unordered-containers
+         vector
+       ];
+       homepage = "https://github.com/phadej/binary-tagged#readme";
+       description = "Tagged binary serialisation";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "binary-typed" = callPackage
@@ -37902,8 +38223,8 @@ self: {
        pname = "blank-canvas";
        version = "0.6";
        sha256 = "2a0e5c4fc50b1ce43e56b1a11056186c21d565e225da36f90c58f8c0a70f48b3";
-       revision = "2";
-       editedCabalFile = "4a18531b67c35f0343333d8281ad3acdbde48f5ff6a4b7e3e687d4eac4c2f570";
+       revision = "3";
+       editedCabalFile = "3a1b54006324de595823f744e3f2592e85629008eea36f4e5d7b206a91085fdf";
        libraryHaskellDepends = [
          aeson base base-compat base64-bytestring bytestring colour
          containers data-default-class http-types kansas-comet mime-types
@@ -40924,8 +41245,8 @@ self: {
      }:
      mkDerivation {
        pname = "bytestring-tree-builder";
-       version = "0.2.4";
-       sha256 = "5c2c3a45e60d1a58b1036139fdc4976554d6539e6333b5e9183cd580b1e10e4f";
+       version = "0.2.5";
+       sha256 = "05f819da3766b2521e4408497858c8fc538065375749d1dbc4d80de77e7ecf5a";
        libraryHaskellDepends = [
          base base-prelude bytestring semigroups text
        ];
@@ -43894,6 +44215,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "cases_0_1_3" = callPackage
+    ({ mkDerivation, attoparsec, base, base-prelude, HTF, HUnit
+     , loch-th, placeholders, QuickCheck, text
+     }:
+     mkDerivation {
+       pname = "cases";
+       version = "0.1.3";
+       sha256 = "67263b179ba8687f04f76de41f8dc69833baa5dd34c7089907ff7c4cef95a928";
+       libraryHaskellDepends = [ attoparsec base-prelude loch-th text ];
+       testHaskellDepends = [
+         base HTF HUnit loch-th placeholders QuickCheck text
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/nikita-volkov/cases";
+       description = "A converter for spinal, snake and camel cases";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cash" = callPackage
     ({ mkDerivation, base, deepseq, haskell98, HaXml, network, parallel
      , pretty
@@ -44218,8 +44558,8 @@ self: {
      }:
      mkDerivation {
        pname = "cassava-streams";
-       version = "0.1.1.0";
-       sha256 = "87ce8074aae24c510bde7d5d96068903e0056481f5316424e605a05425216121";
+       version = "0.2.0.0";
+       sha256 = "b4e825309533f9bd33728de92950eea33f362ea5bfd4e04689777b3760f69d6d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44229,7 +44569,6 @@ self: {
          base bytestring cassava io-streams QuickCheck tasty
          tasty-quickcheck vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/pjones/cassava-streams";
        description = "io-streams interface for the cassava CSV library";
        license = stdenv.lib.licenses.bsd3;
@@ -46290,6 +46629,7 @@ self: {
          lens lens-aeson mtl mtl-compat QuickCheck tasty tasty-hunit
          tasty-th transformers-compat
        ];
+       jailbreak = true;
        homepage = "http://clafer.org";
        description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot";
        license = stdenv.lib.licenses.mit;
@@ -46323,6 +46663,7 @@ self: {
          array base clafer cmdargs directory filepath HUnit tasty
          tasty-hunit tasty-th transformers transformers-compat
        ];
+       jailbreak = true;
        homepage = "http://clafer.org";
        description = "claferIG is an interactive tool that generates instances of Clafer models";
        license = stdenv.lib.licenses.mit;
@@ -46343,6 +46684,7 @@ self: {
          network-uri process SHA split time transformers transformers-compat
          utf8-string
        ];
+       jailbreak = true;
        homepage = "http://github.com/gsdlab/claferwiki";
        description = "A wiki-based IDE for literate modeling with Clafer";
        license = stdenv.lib.licenses.mit;
@@ -46590,7 +46932,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-ghc" = callPackage
+  "clash-ghc_0_6_9" = callPackage
     ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib
      , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl
      , containers, directory, filepath, ghc, ghc-typelits-extra
@@ -46614,6 +46956,33 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "clash-ghc" = callPackage
+    ({ mkDerivation, array, base, bifunctors, bytestring, clash-lib
+     , clash-prelude, clash-systemverilog, clash-verilog, clash-vhdl
+     , containers, directory, filepath, ghc, ghc-typelits-extra
+     , ghc-typelits-natnormalise, hashable, haskeline, lens, mtl
+     , process, text, transformers, unbound-generics, unix
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "clash-ghc";
+       version = "0.6.10";
+       sha256 = "5f8280cd4e71313c0b54942d34bcb698c1792e10d87da56f673b23ef7792ebcb";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array base bifunctors bytestring clash-lib clash-prelude
+         clash-systemverilog clash-verilog clash-vhdl containers directory
+         filepath ghc ghc-typelits-extra ghc-typelits-natnormalise hashable
+         haskeline lens mtl process text transformers unbound-generics unix
+         unordered-containers
+       ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "clash-lib_0_5_10" = callPackage
@@ -46758,7 +47127,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-lib" = callPackage
+  "clash-lib_0_6_9" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, clash-prelude
      , concurrent-supply, containers, deepseq, directory, errors, fgl
      , filepath, hashable, lens, mtl, pretty, process, template-haskell
@@ -46778,6 +47147,29 @@ 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" = 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.10";
+       sha256 = "93cb93dac0201f23a9821b02f4e908ef0b47f71f7da7f83f71c0a8bfa125a8e2";
+       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-prelude_0_9_2" = callPackage
@@ -46845,7 +47237,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-prelude" = callPackage
+  "clash-prelude_0_10_5" = callPackage
     ({ mkDerivation, array, base, data-default, doctest, ghc-prim
      , ghc-typelits-extra, ghc-typelits-natnormalise, integer-gmp, lens
      , QuickCheck, reflection, singletons, template-haskell, th-lift
@@ -46863,6 +47255,27 @@ self: {
        homepage = "http://www.clash-lang.org/";
        description = "CAES Language for Synchronous Hardware - Prelude library";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "clash-prelude" = callPackage
+    ({ mkDerivation, array, base, data-default, doctest, ghc-prim
+     , ghc-typelits-extra, ghc-typelits-natnormalise, integer-gmp, lens
+     , QuickCheck, reflection, singletons, template-haskell, th-lift
+     }:
+     mkDerivation {
+       pname = "clash-prelude";
+       version = "0.10.6";
+       sha256 = "7056c0ac7b2fecbb9cabb3e8ac029e0a269265fa40b361089d4a3af53e6e9237";
+       libraryHaskellDepends = [
+         array base data-default ghc-prim ghc-typelits-extra
+         ghc-typelits-natnormalise integer-gmp lens QuickCheck reflection
+         singletons template-haskell th-lift
+       ];
+       testHaskellDepends = [ base doctest ];
+       homepage = "http://www.clash-lang.org/";
+       description = "CAES Language for Synchronous Hardware - Prelude library";
+       license = stdenv.lib.licenses.bsd2;
      }) {};
 
   "clash-prelude-quickcheck" = callPackage
@@ -47236,7 +47649,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "clash-vhdl" = callPackage
+  "clash-vhdl_0_6_6" = callPackage
     ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
      , text, unordered-containers, wl-pprint-text
      }:
@@ -47251,6 +47664,24 @@ 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" = callPackage
+    ({ mkDerivation, base, clash-lib, clash-prelude, fgl, lens, mtl
+     , text, unordered-containers, wl-pprint-text
+     }:
+     mkDerivation {
+       pname = "clash-vhdl";
+       version = "0.6.7";
+       sha256 = "bbf5d4f3261dcf2f0ff570cce475045cf7f32001f6ef62980f522c64eafc5a51";
+       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;
      }) {};
 
   "classify" = callPackage
@@ -47544,7 +47975,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "classy-prelude" = callPackage
+  "classy-prelude_0_12_5" = callPackage
     ({ mkDerivation, base, basic-prelude, bifunctors, bytestring
      , chunked-data, containers, dlist, enclosed-exceptions, exceptions
      , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl
@@ -47569,6 +48000,34 @@ self: {
        homepage = "https://github.com/snoyberg/classy-prelude";
        description = "A typeclass-based Prelude";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "classy-prelude" = callPackage
+    ({ mkDerivation, base, basic-prelude, bifunctors, bytestring
+     , chunked-data, containers, dlist, enclosed-exceptions, exceptions
+     , ghc-prim, hashable, hspec, lifted-base, mono-traversable, mtl
+     , mutable-containers, primitive, QuickCheck, semigroups, stm, text
+     , time, time-locale-compat, transformers, unordered-containers
+     , vector, vector-instances
+     }:
+     mkDerivation {
+       pname = "classy-prelude";
+       version = "0.12.5.1";
+       sha256 = "30da07b4577005fbd41f807fddef5aee34aee7593a5d1b1eab23c7f059ef18b4";
+       libraryHaskellDepends = [
+         base basic-prelude bifunctors bytestring chunked-data containers
+         dlist enclosed-exceptions exceptions ghc-prim hashable lifted-base
+         mono-traversable mtl mutable-containers primitive semigroups stm
+         text time time-locale-compat transformers unordered-containers
+         vector vector-instances
+       ];
+       testHaskellDepends = [
+         base containers hspec QuickCheck transformers unordered-containers
+       ];
+       homepage = "https://github.com/snoyberg/classy-prelude";
+       description = "A typeclass-based Prelude";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "classy-prelude-conduit_0_10_2" = callPackage
@@ -48289,16 +48748,19 @@ self: {
      }) {};
 
   "cli" = callPackage
-    ({ mkDerivation, base, containers }:
+    ({ mkDerivation, base, directory, mtl, QuickCheck, tasty
+     , tasty-quickcheck, terminfo, transformers
+     }:
      mkDerivation {
        pname = "cli";
-       version = "0.0.5";
-       sha256 = "2d514d8c7b17566c4cd5b9ae8f50dfad4af81fa5a81f547becb5b20faed714b2";
-       isLibrary = true;
-       isExecutable = true;
-       libraryHaskellDepends = [ base containers ];
-       homepage = "https://github.com/NicolasDP/hs-cli";
-       description = "Simple Command Line Interface Library";
+       version = "0.1.1";
+       sha256 = "a348c51e5ad1c134a39145cd3e2de5aa2ca5fca1f88262d26012df07aaf68edd";
+       libraryHaskellDepends = [ base mtl terminfo transformers ];
+       testHaskellDepends = [
+         base directory QuickCheck tasty tasty-quickcheck transformers
+       ];
+       homepage = "https://github.com/vincenthz/hs-cli";
+       description = "Command Line Interface";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -48680,6 +49142,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "clumpiness" = callPackage
+    ({ mkDerivation, base, containers, tree-fun }:
+     mkDerivation {
+       pname = "clumpiness";
+       version = "0.17.0.0";
+       sha256 = "fd4b303d206eaf242c779bb65c42256e42220c8497a6bcf3bc59589b9396c495";
+       libraryHaskellDepends = [ base containers tree-fun ];
+       description = "Calculate the clumpiness of leaf properties in a tree";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "cluss" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
@@ -51410,7 +51883,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "conduit-combinators" = callPackage
+  "conduit-combinators_1_0_3" = callPackage
     ({ mkDerivation, base, base16-bytestring, base64-bytestring
      , bytestring, chunked-data, conduit, conduit-extra, containers
      , directory, filepath, hspec, monad-control, mono-traversable, mtl
@@ -51436,6 +51909,35 @@ self: {
        homepage = "https://github.com/fpco/conduit-combinators";
        description = "Commonly used conduit functions, for both chunked and unchunked data";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "conduit-combinators" = callPackage
+    ({ mkDerivation, base, base16-bytestring, base64-bytestring
+     , bytestring, chunked-data, conduit, conduit-extra, containers
+     , directory, filepath, hspec, monad-control, mono-traversable, mtl
+     , mwc-random, primitive, QuickCheck, resourcet, safe, silently
+     , text, transformers, transformers-base, unix, unix-compat, vector
+     , void
+     }:
+     mkDerivation {
+       pname = "conduit-combinators";
+       version = "1.0.3.1";
+       sha256 = "66a40be2cc964c36b06cf9b096c1a99b107dba06b62baa4b13b9c485dc4f8b48";
+       libraryHaskellDepends = [
+         base base16-bytestring base64-bytestring bytestring chunked-data
+         conduit conduit-extra filepath monad-control mono-traversable
+         mwc-random primitive resourcet text transformers transformers-base
+         unix unix-compat vector void
+       ];
+       testHaskellDepends = [
+         base base16-bytestring base64-bytestring bytestring chunked-data
+         conduit containers directory filepath hspec mono-traversable mtl
+         mwc-random QuickCheck safe silently text transformers vector
+       ];
+       homepage = "https://github.com/fpco/conduit-combinators";
+       description = "Commonly used conduit functions, for both chunked and unchunked data";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "conduit-connection" = callPackage
@@ -52879,6 +53381,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "contravariant-extras_0_3_1" = callPackage
+    ({ mkDerivation, base, base-prelude, contravariant
+     , template-haskell, tuple-th
+     }:
+     mkDerivation {
+       pname = "contravariant-extras";
+       version = "0.3.1";
+       sha256 = "5bbdc3f535163677825b95f520f0d2f9c63cafff39aabc0f23aecd6b27f99de3";
+       libraryHaskellDepends = [
+         base base-prelude contravariant template-haskell tuple-th
+       ];
+       homepage = "https://github.com/nikita-volkov/contravariant-extras";
+       description = "Extras for the \"contravariant\" package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "control-bool" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -55691,6 +56210,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cryptonite_0_11" = callPackage
+    ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim
+     , integer-gmp, memory, tasty, tasty-hunit, tasty-kat
+     , tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "cryptonite";
+       version = "0.11";
+       sha256 = "4dedc69d6aae086fe9edd7ac3b3bdb0eef5842985eece9189e578c4c1f71676c";
+       libraryHaskellDepends = [
+         base bytestring deepseq ghc-prim integer-gmp memory
+       ];
+       testHaskellDepends = [
+         base byteable bytestring memory tasty tasty-hunit tasty-kat
+         tasty-quickcheck
+       ];
+       homepage = "https://github.com/haskell-crypto/cryptonite";
+       description = "Cryptography Primitives sink";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cryptsy-api" = callPackage
     ({ mkDerivation, aeson, base, bytestring, deepseq, either
      , http-client, http-client-tls, old-locale, pipes-attoparsec
@@ -56665,12 +57206,12 @@ self: {
     ({ mkDerivation, array, attoparsec, base, base16-bytestring, binary
      , bytestring, cmdargs, containers, cryptohash, curl, data-ordlist
      , directory, filepath, FindBin, hashable, haskeline, html, HTTP
-     , HUnit, mmap, mtl, network, network-uri, old-time, parsec, process
-     , QuickCheck, random, regex-applicative, regex-compat-tdfa, sandi
-     , shelly, split, tar, terminfo, test-framework
-     , test-framework-hunit, test-framework-quickcheck2, text, time
-     , transformers, transformers-compat, unix, unix-compat, utf8-string
-     , vector, zip-archive, zlib
+     , HUnit, mmap, mtl, network, network-uri, old-locale, old-time
+     , parsec, process, QuickCheck, random, regex-applicative
+     , regex-compat-tdfa, sandi, shelly, split, tar, terminfo
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, time, transformers, transformers-compat, unix, unix-compat
+     , utf8-string, vector, zip-archive, zlib
      }:
      mkDerivation {
        pname = "darcs";
@@ -56684,9 +57225,9 @@ self: {
        libraryHaskellDepends = [
          array attoparsec base base16-bytestring binary bytestring
          containers cryptohash data-ordlist directory filepath hashable
-         haskeline html HTTP mmap mtl network network-uri old-time parsec
-         process random regex-applicative regex-compat-tdfa sandi tar
-         terminfo text time transformers transformers-compat unix
+         haskeline html HTTP mmap mtl network network-uri old-locale
+         old-time parsec process random regex-applicative regex-compat-tdfa
+         sandi tar terminfo text time transformers transformers-compat unix
          unix-compat utf8-string vector zip-archive zlib
        ];
        librarySystemDepends = [ curl ];
@@ -56698,6 +57239,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2 text unix-compat
          zip-archive zlib
        ];
+       jailbreak = true;
        postInstall = ''
          mkdir -p $out/etc/bash_completion.d
          mv contrib/darcs_completion $out/etc/bash_completion.d/darcs
@@ -57395,6 +57937,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "data-default-extra" = callPackage
+    ({ mkDerivation, base, data-default-class
+     , data-default-instances-base, data-default-instances-bytestring
+     , data-default-instances-case-insensitive
+     , data-default-instances-containers
+     , data-default-instances-new-base
+     , data-default-instances-old-locale, data-default-instances-text
+     , data-default-instances-unordered-containers
+     , data-default-instances-vector
+     }:
+     mkDerivation {
+       pname = "data-default-extra";
+       version = "0.0.1";
+       sha256 = "ddd73777101f49566654bae02203424bc7f4dd55ba5b839b5d2d8d4fa6d0812e";
+       libraryHaskellDepends = [
+         base data-default-class data-default-instances-base
+         data-default-instances-bytestring
+         data-default-instances-case-insensitive
+         data-default-instances-containers data-default-instances-new-base
+         data-default-instances-old-locale data-default-instances-text
+         data-default-instances-unordered-containers
+         data-default-instances-vector
+       ];
+       homepage = "https://github.com/trskop/data-default-extra";
+       description = "A class for types with a default value";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "data-default-generics" = callPackage
     ({ mkDerivation, base, bytestring, containers, dlist, ghc-prim
      , hspec, HUnit, old-locale, text, time, unordered-containers
@@ -57803,7 +58373,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "data-inttrie" = callPackage
+  "data-inttrie_0_1_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "data-inttrie";
@@ -57813,6 +58383,19 @@ self: {
        homepage = "http://github.com/luqui/data-inttrie";
        description = "A lazy, infinite trie of integers";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "data-inttrie" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "data-inttrie";
+       version = "0.1.2";
+       sha256 = "8ddae7ad7d3cafdf349d93c0eed5767ab1213d854980bc28d7d935163c5f1df9";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://github.com/luqui/data-inttrie";
+       description = "A lazy, infinite trie of integers";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "data-ivar" = callPackage
@@ -58808,6 +59391,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "dbmigrations_1_1" = callPackage
+    ({ mkDerivation, base, bytestring, configurator, containers
+     , directory, fgl, filepath, HDBC, HDBC-postgresql, HDBC-sqlite3
+     , HUnit, MissingH, mtl, mysql, mysql-simple, process, random, split
+     , template-haskell, text, time, yaml-light
+     }:
+     mkDerivation {
+       pname = "dbmigrations";
+       version = "1.1";
+       sha256 = "fe8075f25f1b55a55e792e654b8708e7f093c78b2cd75c1f1867efbf1a3cc2bc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring configurator containers directory fgl filepath HDBC
+         HDBC-postgresql HDBC-sqlite3 mtl mysql mysql-simple random split
+         template-haskell text time yaml-light
+       ];
+       executableHaskellDepends = [ base configurator ];
+       testHaskellDepends = [
+         base bytestring configurator containers directory fgl filepath HDBC
+         HDBC-postgresql HDBC-sqlite3 HUnit MissingH mtl mysql mysql-simple
+         process split template-haskell text time yaml-light
+       ];
+       description = "An implementation of relational database \"migrations\"";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "dbus_0_10_10" = callPackage
     ({ mkDerivation, base, bytestring, cereal, chell, chell-quickcheck
      , containers, directory, filepath, libxml-sax, network, parsec
@@ -62975,7 +63586,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "digestive-functors-aeson" = callPackage
+  "digestive-functors-aeson_1_1_18" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers
      , digestive-functors, HUnit, lens, lens-aeson, mtl, safe
      , scientific, tasty, tasty-hunit, text, vector
@@ -62995,6 +63606,29 @@ self: {
        homepage = "http://github.com/ocharles/digestive-functors-aeson";
        description = "Run digestive-functors forms against JSON";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "digestive-functors-aeson" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers
+     , digestive-functors, HUnit, lens, lens-aeson, mtl, safe
+     , scientific, tasty, tasty-hunit, text, vector
+     }:
+     mkDerivation {
+       pname = "digestive-functors-aeson";
+       version = "1.1.19";
+       sha256 = "eb58a68fee918486e6ef884e946898427a75ddc6c3d1d509dd9a475341b6daa7";
+       libraryHaskellDepends = [
+         aeson base containers digestive-functors lens lens-aeson safe text
+         vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring digestive-functors HUnit mtl scientific tasty
+         tasty-hunit text
+       ];
+       homepage = "http://github.com/ocharles/digestive-functors-aeson";
+       description = "Run digestive-functors forms against JSON";
+       license = stdenv.lib.licenses.gpl3;
      }) {};
 
   "digestive-functors-blaze" = callPackage
@@ -63653,8 +64287,8 @@ self: {
      }:
      mkDerivation {
        pname = "discrete-space-map";
-       version = "0.0.4";
-       sha256 = "98d53b95733cf40e4a59461c41cdec7f45f3b5810deacef8d7cdde1ea60f91b5";
+       version = "0.0.5";
+       sha256 = "18c12b0b2bc2796e60f5b4e8d8e10ce3c788f4723161ab0f348e53eb72cd8268";
        libraryHaskellDepends = [
          adjunctions base comonad distributive keys semigroupoids
        ];
@@ -63748,13 +64382,12 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-closure";
-       version = "0.1.0.0";
-       sha256 = "7c49a85015f428e55af318214de93ce8ab9257e627ad6ef8592b781324aac52e";
+       version = "0.2.1.0";
+       sha256 = "345140293e28e6feaae46e2e3e275e892d72029dbd57617ba8fc1b7251ae902f";
        libraryHaskellDepends = [
          base binary bytestring constraints template-haskell
        ];
        testHaskellDepends = [ base binary hspec QuickCheck ];
-       jailbreak = true;
        homepage = "https://github.com/tweag/distributed-closure";
        description = "Serializable closures for distributed programming";
        license = stdenv.lib.licenses.bsd3;
@@ -65127,8 +65760,8 @@ self: {
      }:
      mkDerivation {
        pname = "docker";
-       version = "0.2.0.3";
-       sha256 = "d6c2430d273d817947cfc87bdd120e5837a32f564b174f4ba13e53879454c227";
+       version = "0.2.0.4";
+       sha256 = "66821e0315b1016fa3c70c6760763134b5ddbde23f644410ed12975d67b94096";
        libraryHaskellDepends = [
          aeson base bytestring containers data-default HsOpenSSL
          http-client-openssl lens lens-aeson network-uri pipes
@@ -65329,8 +65962,8 @@ self: {
      }:
      mkDerivation {
        pname = "doctest-discover";
-       version = "0.1.0.6";
-       sha256 = "a39510efe8256937ab06284be91c810d429205636b8150c9aaea11e7c340f3e5";
+       version = "0.1.0.7";
+       sha256 = "ac6a65da517db7f264e65607a50b080b54f008ba592746ac11b7bb40107fbd70";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -65341,7 +65974,6 @@ self: {
        ];
        testHaskellDepends = [ base doctest ];
        doHaddock = false;
-       jailbreak = true;
        homepage = "http://github.com/karun012/doctest-discover";
        description = "Easy way to run doctests via cabal";
        license = stdenv.lib.licenses.publicDomain;
@@ -67052,10 +67684,9 @@ self: {
     ({ mkDerivation, base, bytestring, crypto-api }:
      mkDerivation {
        pname = "ed25519-donna";
-       version = "0.1";
-       sha256 = "260b064cf097cbea4a3c83deef975aade9ef6a3a037b9e8119324938caaeedf4";
+       version = "0.1.1";
+       sha256 = "6ddb25e72cb18b18e70ab9727a028c26acb0ffaa9dafafb42821c9f81d81f84e";
        libraryHaskellDepends = [ base bytestring crypto-api ];
-       jailbreak = true;
        homepage = "github.com/tommd/hs-ed25519-donna";
        description = "Haskell bindings to ed25519-donna (Elliptical Curve Signature Scheme)";
        license = stdenv.lib.licenses.bsd3;
@@ -67455,7 +68086,10 @@ self: {
        pname = "effect-monad";
        version = "0.6.1";
        sha256 = "884b7f1b26767329051ca846ad20cef871decd992f63c2d7d50475b163d3724d";
+       revision = "2";
+       editedCabalFile = "5cb34f683ee8c60c89647fd5a283cbe4b640a596cf2608a937a0819503e3b3ea";
        libraryHaskellDepends = [ base ghc-prim type-level-sets ];
+       jailbreak = true;
        description = "Embeds effect systems into Haskell using parameteric effect monads";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -67853,7 +68487,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ekg" = callPackage
+  "ekg_0_4_0_8" = callPackage
     ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
      , filepath, network, snap-core, snap-server, text, time
      , transformers, unordered-containers
@@ -67869,6 +68503,25 @@ self: {
        homepage = "https://github.com/tibbe/ekg";
        description = "Remote monitoring of processes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "ekg" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, ekg-core, ekg-json
+     , filepath, network, snap-core, snap-server, text, time
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "ekg";
+       version = "0.4.0.9";
+       sha256 = "71028dd82b19c82d8aeb3182d1b678d4deef78cfbc1bd8a23d1da45c2bb2bdb4";
+       libraryHaskellDepends = [
+         aeson base bytestring ekg-core ekg-json filepath network snap-core
+         snap-server text time transformers unordered-containers
+       ];
+       homepage = "https://github.com/tibbe/ekg";
+       description = "Remote monitoring of processes";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "ekg-bosun" = callPackage
@@ -67923,7 +68576,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ekg-json" = callPackage
+  "ekg-json_0_1_0_0" = callPackage
     ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers
      }:
      mkDerivation {
@@ -67936,6 +68589,22 @@ self: {
        homepage = "https://github.com/tibbe/ekg-json";
        description = "JSON encoding of ekg metrics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "ekg-json" = callPackage
+    ({ mkDerivation, aeson, base, ekg-core, text, unordered-containers
+     }:
+     mkDerivation {
+       pname = "ekg-json";
+       version = "0.1.0.1";
+       sha256 = "ab401e93dd9238eda389a09121bae049d3ed82a031d0fa52384494c2f8f61b3f";
+       libraryHaskellDepends = [
+         aeson base ekg-core text unordered-containers
+       ];
+       homepage = "https://github.com/tibbe/ekg-json";
+       description = "JSON encoding of ekg metrics";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "ekg-log" = callPackage
@@ -68329,8 +68998,8 @@ self: {
      }:
      mkDerivation {
        pname = "elm-init";
-       version = "1.0.2";
-       sha256 = "a0a3559b0e3abcc2cf11deaf97144fa5fc6b19dda84896cb0fdc90d90c061079";
+       version = "1.0.3";
+       sha256 = "cf185ec4ce23944dcd33ac7f364cb549182f53acfa79fc843789ca0bd7b38f8b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -68907,7 +69576,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "engine-io" = callPackage
+  "engine-io_1_2_12" = callPackage
     ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring
      , bytestring, either, free, monad-loops, mwc-random, stm, stm-delay
      , text, transformers, unordered-containers, vector, websockets
@@ -68924,6 +69593,26 @@ self: {
        homepage = "http://github.com/ocharles/engine.io";
        description = "A Haskell implementation of Engine.IO";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "engine-io" = callPackage
+    ({ mkDerivation, aeson, async, attoparsec, base, base64-bytestring
+     , bytestring, either, free, monad-loops, mwc-random, stm, stm-delay
+     , text, transformers, unordered-containers, vector, websockets
+     }:
+     mkDerivation {
+       pname = "engine-io";
+       version = "1.2.13";
+       sha256 = "5fc53f8a4a0ba563b9592e7bf3d9475a4a7ce165c66cd63a303567f6a941cf45";
+       libraryHaskellDepends = [
+         aeson async attoparsec base base64-bytestring bytestring either
+         free monad-loops mwc-random stm stm-delay text transformers
+         unordered-containers vector websockets
+       ];
+       homepage = "http://github.com/ocharles/engine.io";
+       description = "A Haskell implementation of Engine.IO";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "engine-io-growler" = callPackage
@@ -69831,6 +70520,7 @@ self: {
        libraryHaskellDepends = [
          base safe transformers transformers-compat
        ];
+       jailbreak = true;
        description = "Simplified error-handling";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70155,6 +70845,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "esqueleto_2_4_3" = callPackage
+    ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
+     , hspec, HUnit, monad-control, monad-logger, persistent
+     , persistent-sqlite, persistent-template, QuickCheck, resourcet
+     , tagged, text, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "esqueleto";
+       version = "2.4.3";
+       sha256 = "bf555cfb40519ed1573f7bb90c65f693b9639dfa93fc2222230d3ded6e897434";
+       libraryHaskellDepends = [
+         base blaze-html bytestring conduit monad-logger persistent
+         resourcet tagged text transformers unordered-containers
+       ];
+       testHaskellDepends = [
+         base conduit containers hspec HUnit monad-control monad-logger
+         persistent persistent-sqlite persistent-template QuickCheck
+         resourcet text transformers
+       ];
+       homepage = "https://github.com/prowdsponsor/esqueleto";
+       description = "Type-safe EDSL for SQL queries on persistent backends";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ess" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -70610,7 +71325,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "eventstore" = callPackage
+  "eventstore_0_10_0_1" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, cereal, containers
      , network, protobuf, random, stm, tasty, tasty-hunit, text, time
      , unordered-containers, uuid
@@ -70631,6 +71346,30 @@ self: {
        description = "EventStore TCP Client";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "eventstore" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, cereal, containers
+     , network, protobuf, random, stm, tasty, tasty-hunit, text, time
+     , unordered-containers, uuid
+     }:
+     mkDerivation {
+       pname = "eventstore";
+       version = "0.10.0.2";
+       sha256 = "dab85bb0b250c01b36665a2e4945ad6b249cfa2d4d0cd2cbcd564f1b9ad575c8";
+       libraryHaskellDepends = [
+         aeson async base bytestring cereal containers network protobuf
+         random stm text time unordered-containers uuid
+       ];
+       testHaskellDepends = [
+         aeson base stm tasty tasty-hunit text time
+       ];
+       doCheck = false;
+       homepage = "http://github.com/YoEight/eventstore";
+       description = "EventStore TCP Client";
+       license = stdenv.lib.licenses.bsd3;
+       platforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "every-bit-counts" = callPackage
@@ -70695,7 +71434,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "exact-pi" = callPackage
+  "exact-pi_0_4_1_0" = callPackage
     ({ mkDerivation, base, numtype-dk }:
      mkDerivation {
        pname = "exact-pi";
@@ -70705,9 +71444,10 @@ self: {
        homepage = "https://github.com/dmcclean/exact-pi";
        description = "Exact rational multiples of pi (and integer powers of pi)";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "exact-pi_0_4_1_1" = callPackage
+  "exact-pi" = callPackage
     ({ mkDerivation, base, numtype-dk }:
      mkDerivation {
        pname = "exact-pi";
@@ -70717,7 +71457,6 @@ self: {
        homepage = "https://github.com/dmcclean/exact-pi/";
        description = "Exact rational multiples of pi (and integer powers of pi)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exact-real" = callPackage
@@ -70879,6 +71618,7 @@ self: {
          base HUnit test-framework test-framework-hunit transformers
          transformers-compat
        ];
+       jailbreak = true;
        description = "Type classes and monads for unchecked extensible exceptions";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -72552,8 +73292,8 @@ self: {
        pname = "fay";
        version = "0.23.1.12";
        sha256 = "3d9c0a64f6d30923e2e45f27c043a7fa4f451c676466c8ca5b69a4121462f727";
-       revision = "1";
-       editedCabalFile = "4a5a1a7b9f3854292ddbc73ba9d6cdaf5ffbce062bdc015f3d4765b41ea6df1d";
+       revision = "2";
+       editedCabalFile = "8b1d2491a1f85893a14f5212460ec030b22e47e2da680f275f7ff619ad15b4b0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -73529,8 +74269,8 @@ self: {
      }:
      mkDerivation {
        pname = "feed-collect";
-       version = "0.2.0.0";
-       sha256 = "107701b470b86ef66be17fc76393995ad59e2912aa399bb4212bf63023152559";
+       version = "0.2.0.1";
+       sha256 = "8a3c57faec9f0e3df17fe9ad7ebf64e09973f1e485906378365b4f6c5395b81b";
        libraryHaskellDepends = [
          base data-default-class feed http-client http-client-tls time
          time-interval time-units timerep transformers utf8-string
@@ -73869,6 +74609,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;};
 
+  "fft_0_1_8_3" = callPackage
+    ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable
+     , QuickCheck, storable-complex, syb, transformers
+     }:
+     mkDerivation {
+       pname = "fft";
+       version = "0.1.8.3";
+       sha256 = "73f450978f2b1f2d6d549aa5a81aaeeadfe153bd8f3ce935690b149a036a3896";
+       libraryHaskellDepends = [
+         array base carray ix-shapable storable-complex syb transformers
+       ];
+       libraryPkgconfigDepends = [ fftw fftwFloat ];
+       testHaskellDepends = [ base carray QuickCheck storable-complex ];
+       description = "Bindings to the FFTW library";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;};
+
   "fftwRaw" = callPackage
     ({ mkDerivation, base, fftw }:
      mkDerivation {
@@ -74565,6 +75323,30 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "find-clumpiness" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, clumpiness, containers
+     , optparse-applicative, text, text-show, tree-fun
+     , unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "find-clumpiness";
+       version = "0.2.0.1";
+       sha256 = "87db2a011a2662481f59ac03f64e95ef6692519386aee51417c3894c2174da22";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base clumpiness containers text text-show tree-fun
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring clumpiness containers optparse-applicative
+         text tree-fun unordered-containers
+       ];
+       homepage = "http://github.com/GregorySchwartz/find-clumpiness#readme";
+       description = "Find the clumpiness of labels in a tree";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "find-conduit" = callPackage
     ({ mkDerivation, attoparsec, base, conduit, conduit-combinators
      , conduit-extra, directory, doctest, either, exceptions, filepath
@@ -76193,8 +76975,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl-transduce";
-       version = "0.4.7.0";
-       sha256 = "8836b026467a5940be86015d34f2dfca7f0b1787fd608d1bad81a8bd25cbc8e9";
+       version = "0.5.1.0";
+       sha256 = "05dd7d6cc6fd8bd925346d631a287fbef24e04dd25be0228ad7a723666d33160";
        libraryHaskellDepends = [
          base bifunctors bytestring comonad containers foldl free
          monoid-subclasses profunctors semigroupoids semigroups split text
@@ -76216,8 +76998,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl-transduce-attoparsec";
-       version = "0.1.0.1";
-       sha256 = "380616c9d8ef4997ad6793ae3ac9ddd699091cefabcfcff4c981279543bdb677";
+       version = "0.2.0.0";
+       sha256 = "0bd4c213bd949f1aa1f6f849b9c5caee6d20a6756712efcae2e383b24fe62f73";
        libraryHaskellDepends = [
          attoparsec base bytestring foldl-transduce monoid-subclasses text
          transformers
@@ -77479,16 +78261,18 @@ self: {
      }) {};
 
   "free-vl" = callPackage
-    ({ mkDerivation, base }:
+    ({ mkDerivation, base, containers, mtl, tasty, tasty-hunit }:
      mkDerivation {
        pname = "free-vl";
-       version = "0.1.3";
-       sha256 = "866cb0695f3dca802dbef507246f7833cd5167c46da42abfba88000a1a8d8837";
+       version = "0.1.4";
+       sha256 = "57f63ed35b42fc54fefb3cc183d0655e0d6c4a28d5371dba00fc9c9d3fa602bf";
+       revision = "1";
+       editedCabalFile = "150ba489128fe05a830fe3aad3771e134222a9b7327dc43676ef70b3cc99219c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
-       testHaskellDepends = [ base ];
+       testHaskellDepends = [ base containers mtl tasty tasty-hunit ];
        homepage = "http://github.com/aaronlevin/free-vl";
        description = "van Laarhoven encoded Free Monad with Extensible Effects";
        license = stdenv.lib.licenses.bsd3;
@@ -78239,6 +79023,29 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
+  "funcons-tools" = callPackage
+    ({ mkDerivation, base, bv, containers, directory, mtl, multiset
+     , parsec, split, text, vector
+     }:
+     mkDerivation {
+       pname = "funcons-tools";
+       version = "0.1.0.0";
+       sha256 = "99f2652af578a482d6f9253f9fffa057ab8fcb4272d32e6a78a23291a4fd96ef";
+       revision = "2";
+       editedCabalFile = "fee9ad9bc35f0d9b37f5a219ca853dd55ff6baaa761e587b27ab4e6f00716014";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bv containers directory mtl multiset parsec split text vector
+       ];
+       executableHaskellDepends = [
+         base bv containers directory mtl multiset parsec split text vector
+       ];
+       homepage = "http://plancomps.org";
+       description = "A modular interpreter for executing funcons";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "function-combine" = callPackage
     ({ mkDerivation, base, data-type }:
      mkDerivation {
@@ -79224,8 +80031,8 @@ self: {
        pname = "generic-aeson";
        version = "0.2.0.7";
        sha256 = "1ff3c270634ba8393ff019d2b2dd47a86d98cc2ec83495324fed6fe3b2fa0c1b";
-       revision = "4";
-       editedCabalFile = "3d30e4aa0f8c020eb282ff899dee145caa151bebac2894a376cd9bc577dd211a";
+       revision = "5";
+       editedCabalFile = "010bcf68960f2c1eebdde39a33d7159b5b34554163875deddfcca84c25e3e145";
        libraryHaskellDepends = [
          aeson attoparsec base generic-deriving mtl tagged text
          unordered-containers vector
@@ -79602,7 +80409,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "generics-sop" = callPackage
+  "generics-sop_0_2_0_0" = callPackage
     ({ mkDerivation, base, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "generics-sop";
@@ -79612,6 +80419,19 @@ self: {
        testHaskellDepends = [ base ];
        description = "Generic Programming using True Sums of Products";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "generics-sop" = callPackage
+    ({ mkDerivation, base, ghc-prim, template-haskell }:
+     mkDerivation {
+       pname = "generics-sop";
+       version = "0.2.1.0";
+       sha256 = "f5fcdd0e6c509d35971e851d29356f718e907ff4c1bdabe17c25308a69ea9f31";
+       libraryHaskellDepends = [ base ghc-prim template-haskell ];
+       testHaskellDepends = [ base ];
+       description = "Generic Programming using True Sums of Products";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "genericserialize" = callPackage
@@ -79928,8 +80748,8 @@ self: {
      }:
      mkDerivation {
        pname = "geoip2";
-       version = "0.1.0.4";
-       sha256 = "9167b8822b2aa59f24d12f3baa9c5c4f16e04e1c85f3d35af388922a17f51ec0";
+       version = "0.2.0.0";
+       sha256 = "942f7fbb0a5a433d2211a3ffb80911cb1fcef8acd7a5d73f0a25d524cdb0c6e5";
        libraryHaskellDepends = [
          base bytestring cereal containers iproute mmap reinterpret-cast
          text
@@ -81834,7 +82654,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "gipeda" = callPackage
+  "gipeda_0_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cassava, containers
      , directory, extra, filepath, gitlib, gitlib-libgit2, scientific
      , shake, split, tagged, text, unordered-containers, vector, yaml
@@ -81853,6 +82673,28 @@ self: {
        homepage = "https://github.com/nomeata/gipeda";
        description = "Git Performance Dashboard";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "gipeda" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, cassava, containers
+     , directory, extra, filepath, gitlib, gitlib-libgit2, scientific
+     , shake, split, tagged, text, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "gipeda";
+       version = "0.2.0.1";
+       sha256 = "8b2e6d06a7392b5ce4956a97aa6102213b790e575516c74feeaed371e0f7e12e";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson base bytestring cassava containers directory extra filepath
+         gitlib gitlib-libgit2 scientific shake split tagged text
+         unordered-containers vector yaml
+       ];
+       homepage = "https://github.com/nomeata/gipeda";
+       description = "Git Performance Dashboard";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "gist" = callPackage
@@ -82160,6 +83002,72 @@ self: {
          inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
          inherit (pkgs) which;};
 
+  "git-annex_6_20160211" = callPackage
+    ({ mkDerivation, aeson, async, aws, base, blaze-builder
+     , bloomfilter, bup, byteable, bytestring, case-insensitive
+     , clientsession, concurrent-output, conduit, conduit-extra
+     , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus
+     , directory, dlist, dns, edit-distance, esqueleto, exceptions
+     , fdo-notify, feed, filepath, git, gnupg, gnutls, hinotify
+     , hslogger, http-client, http-conduit, http-types, IfElse, json
+     , lsof, magic, MissingH, monad-control, monad-logger, mtl, network
+     , network-info, network-multicast, network-protocol-xmpp
+     , network-uri, old-locale, openssh, optparse-applicative
+     , path-pieces, perl, persistent, persistent-sqlite
+     , persistent-template, process, QuickCheck, random, regex-tdfa
+     , resourcet, rsync, SafeSemaphore, sandi, securemem, shakespeare
+     , stm, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun
+     , template-haskell, text, time, torrent, transformers, unix
+     , unix-compat, utf8-string, uuid, wai, wai-extra, warp, warp-tls
+     , wget, which, xml-types, yesod, yesod-core, yesod-default
+     , yesod-form, yesod-static
+     }:
+     mkDerivation {
+       pname = "git-annex";
+       version = "6.20160211";
+       sha256 = "0a7d2dab17df27c06a935c469ced47a68d3c018cbb9254c9a735b584d413fb42";
+       configureFlags = [
+         "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
+         "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
+         "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-fwebapp"
+         "-fwebapp-secure" "-fwebdav" "-fxmpp"
+       ];
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         aeson async aws base blaze-builder bloomfilter byteable bytestring
+         case-insensitive clientsession concurrent-output conduit
+         conduit-extra containers crypto-api cryptonite data-default DAV
+         dbus directory dlist dns edit-distance esqueleto exceptions
+         fdo-notify feed filepath gnutls hinotify hslogger http-client
+         http-conduit http-types IfElse json magic MissingH monad-control
+         monad-logger mtl network network-info network-multicast
+         network-protocol-xmpp network-uri old-locale optparse-applicative
+         path-pieces persistent persistent-sqlite persistent-template
+         process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi
+         securemem shakespeare stm tasty tasty-hunit tasty-quickcheck
+         tasty-rerun template-haskell text time torrent transformers unix
+         unix-compat utf8-string uuid wai wai-extra warp warp-tls xml-types
+         yesod yesod-core yesod-default yesod-form yesod-static
+       ];
+       executableSystemDepends = [
+         bup curl git gnupg lsof openssh perl rsync wget which
+       ];
+       preConfigure = "export HOME=$TEMPDIR; patchShebangs .";
+       postBuild = "ln -sf dist/build/git-annex/git-annex git-annex";
+       installPhase = "make PREFIX=$out CABAL=./Setup BUILDER=./Setup install";
+       checkPhase = "./git-annex test";
+       enableSharedExecutables = false;
+       homepage = "http://git-annex.branchable.com/";
+       description = "manage files with git, without checking their contents into git";
+       license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
+     }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
+         inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
+         inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
+         inherit (pkgs) which;};
+
   "git-checklist" = callPackage
     ({ mkDerivation, base, directory, filepath, optparse-applicative
      , parsec, pretty, process
@@ -82513,6 +83421,8 @@ self: {
        pname = "github";
        version = "0.14.1";
        sha256 = "fcd5f8957855e4a110db2dc411916309fd7afb7105534ebe378a5698f409fa7d";
+       revision = "1";
+       editedCabalFile = "a03fc2c579eb4451933e82486f705a81480c030eb17c47c4bccd07fb1e302584";
        libraryHaskellDepends = [
          aeson aeson-compat attoparsec base base-compat base16-bytestring
          binary binary-orphans byteable bytestring containers cryptohash
@@ -84062,15 +84972,16 @@ self: {
   "gnss-converters" = callPackage
     ({ mkDerivation, base, basic-prelude, binary-conduit, conduit
      , conduit-extra, lens, resourcet, rtcm, sbp, tasty, tasty-hunit
+     , time
      }:
      mkDerivation {
        pname = "gnss-converters";
-       version = "0.1.2";
-       sha256 = "8e43f583e7562c086bb8de1a88ef5b5e6bdca72a3ea4645e6d9f486861d07f0c";
+       version = "0.1.4";
+       sha256 = "82aaaade8f41cbe7d2093db80186c7919f1786187739c8cc307864d1f2717987";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base basic-prelude conduit-extra lens rtcm sbp
+         base basic-prelude conduit-extra lens rtcm sbp time
        ];
        executableHaskellDepends = [
          base basic-prelude binary-conduit conduit conduit-extra resourcet
@@ -84128,8 +85039,8 @@ self: {
      }:
      mkDerivation {
        pname = "gnuplot";
-       version = "0.5.4";
-       sha256 = "b05ac987c0abcac76edee80144090ae018b246f78155da2c6a5ecef8ee7da6e7";
+       version = "0.5.4.1";
+       sha256 = "fa54c95f5dad96e3af6a13429cf6852bffe97bd52bdd99bdce60ca9e78bee8f7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85621,8 +86532,8 @@ self: {
      }:
      mkDerivation {
        pname = "gore-and-ash-actor";
-       version = "1.1.0.0";
-       sha256 = "d7d5d9799295f5811f01be4441da968e80ad1da3e00735726235fac8581729aa";
+       version = "1.1.1.0";
+       sha256 = "2f2f9a7bd5b485e1b55e7aa89537c458fbeab66bbd259d8599f19cbf7b94bbd2";
        libraryHaskellDepends = [
          base containers deepseq exceptions gore-and-ash hashable mtl
          unordered-containers
@@ -85639,8 +86550,8 @@ self: {
      }:
      mkDerivation {
        pname = "gore-and-ash-async";
-       version = "1.0.0.0";
-       sha256 = "3e9ed4259af38831eebfd1f2084567c9bac9c9cb5b45636b82914faec0e1e1fc";
+       version = "1.0.1.0";
+       sha256 = "5e9ca4486c074d3bd9de0cb03cb830e6bb6edaba3809ef4ddb8f00b95e628abc";
        libraryHaskellDepends = [
          async base containers deepseq exceptions gore-and-ash hashable mtl
          transformers unordered-containers
@@ -85664,8 +86575,8 @@ self: {
      }:
      mkDerivation {
        pname = "gore-and-ash-demo";
-       version = "1.0.0.0";
-       sha256 = "a9199fc3ad293bff3269494b1a7b96a8f175dd8defd03797ee0b7746f97a595a";
+       version = "1.1.0.0";
+       sha256 = "08d6fa2861a03281dee03e0baa5c23a54e7366f1d5cb1390e921b90fe8c7ab3b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -85686,8 +86597,8 @@ self: {
      }:
      mkDerivation {
        pname = "gore-and-ash-logging";
-       version = "1.1.0.0";
-       sha256 = "b23ca7f32dc44894519cf62c1107876da448db703c1254e573f394c31bc7d678";
+       version = "1.1.1.0";
+       sha256 = "c35b4523e7eaaf601684b8c4054b33a787732524d8437c0c6d18abb2ff012fdd";
        libraryHaskellDepends = [
          base containers deepseq exceptions gore-and-ash mtl text text-show
          transformers
@@ -85699,24 +86610,23 @@ self: {
 
   "gore-and-ash-network" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, exceptions
-     , extra, ghc-prim, gmp, gore-and-ash, gore-and-ash-logging
-     , hashable, integer-gmp, mtl, network, text, text-show
-     , typesafe-endian, unordered-containers
+     , extra, ghc-prim, gore-and-ash, gore-and-ash-logging, hashable
+     , integer-gmp, mtl, network, text, text-show, typesafe-endian
+     , unordered-containers
      }:
      mkDerivation {
        pname = "gore-and-ash-network";
-       version = "1.1.0.1";
-       sha256 = "ef61dd238dde6ba45fb437db60c3d93d5626351d27dbe299d712b9f241e80d69";
+       version = "1.2.2.0";
+       sha256 = "29e057aa8fefad346800af73419310024cf363641012a538d3e4f9bd68eec9c7";
        libraryHaskellDepends = [
          base bytestring containers deepseq exceptions extra ghc-prim
          gore-and-ash gore-and-ash-logging hashable integer-gmp mtl network
          text text-show typesafe-endian unordered-containers
        ];
-       librarySystemDepends = [ gmp ];
        homepage = "https://github.com/Teaspot-Studio/gore-and-ash-network";
        description = "Core module for Gore&Ash engine with low level network API";
        license = stdenv.lib.licenses.bsd3;
-     }) {inherit (pkgs) gmp;};
+     }) {};
 
   "gore-and-ash-sdl" = callPackage
     ({ mkDerivation, base, containers, deepseq, exceptions
@@ -85725,8 +86635,8 @@ self: {
      }:
      mkDerivation {
        pname = "gore-and-ash-sdl";
-       version = "1.1.0.1";
-       sha256 = "44ab31fc793e2ca7416b920f94c54a08dcf9304e1cc84779c123b3a773674940";
+       version = "2.0.0.0";
+       sha256 = "0a351f7be59a61ea6f9b1c535c259c94ef4420a45d09fd6b79515948cd7636ec";
        libraryHaskellDepends = [
          base containers deepseq exceptions gore-and-ash lens linear mtl
          sdl2 text transformers unordered-containers
@@ -85744,8 +86654,8 @@ self: {
      }:
      mkDerivation {
        pname = "gore-and-ash-sync";
-       version = "1.1.0.0";
-       sha256 = "41aea8a5d021c55c130364f0726be9e4fda7a99c5e777c8b2cdca33c1b901ea2";
+       version = "1.1.1.0";
+       sha256 = "2b83fd24a3c4d671f513a3e229289fc548f2ad6c5cee8a0f08fde6383ff33411";
        libraryHaskellDepends = [
          base bytestring cereal containers deepseq exceptions gore-and-ash
          gore-and-ash-actor gore-and-ash-logging gore-and-ash-network
@@ -86026,6 +86936,7 @@ self: {
          base containers deepseq hashable HTF mtl QuickCheck safe
          unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/factisresearch/graph-core";
        description = "Fast, memory efficient and persistent graph implementation";
        license = stdenv.lib.licenses.mit;
@@ -88665,47 +89576,6 @@ self: {
      }) {};
 
   "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.4.2";
-       sha256 = "dc8472877d202c65f206f937801499cd904d65110414ba5522c5ac1a168aadb8";
-       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;
-     }) {};
-
-  "hOpenPGP_2_4_3" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base64-bytestring
      , bifunctors, binary, binary-conduit, byteable, bytestring, bzlib
      , conduit, conduit-extra, containers, crypto-cipher-types
@@ -92239,6 +93109,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;
@@ -92269,6 +93140,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;
@@ -93068,6 +93940,8 @@ self: {
        pname = "hashable-time";
        version = "0.2";
        sha256 = "97b722ab467fae0d499de91bfaf3d6e346c7c1cac126796f0031aee5dbfe2b0a";
+       revision = "1";
+       editedCabalFile = "b925aba56f1b9a5a1952fae307eaf8ee653293b68651d3807c3852dc4c771d35";
        libraryHaskellDepends = [ base hashable time ];
        description = "Hashable instances for Data.Time";
        license = stdenv.lib.licenses.bsd3;
@@ -95110,8 +95984,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskellscrabble";
-       version = "1.4.3";
-       sha256 = "73b49427676a19a55bc8c86deee8b1864cdbd39f15b74d811d7b8cc8ac1f3d9b";
+       version = "2.0.1";
+       sha256 = "514e4af38a6e889532437fcfad09479c247e0097c01f5f01295b01beda4596e4";
        libraryHaskellDepends = [
          array arrows base containers errors listsafe mtl parsec QuickCheck
          random safe semigroups split transformers unordered-containers
@@ -96039,6 +96913,7 @@ self: {
          quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
          tasty-smallcheck text time transformers uuid vector
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/nikita-volkov/hasql";
        description = "A very efficient PostgreSQL driver and a flexible mapping API";
@@ -96071,6 +96946,7 @@ self: {
          quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
          tasty-smallcheck text time transformers uuid vector
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/nikita-volkov/hasql";
        description = "A very efficient PostgreSQL driver and a flexible mapping API";
@@ -96104,6 +96980,7 @@ self: {
          quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
          tasty-smallcheck text time transformers uuid vector
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/nikita-volkov/hasql";
        description = "A very efficient PostgreSQL driver and a flexible mapping API";
@@ -96111,7 +96988,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hasql" = callPackage
+  "hasql_0_19_6" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
      , contravariant, contravariant-extras, data-default-class, dlist
      , either, hashable, hashtables, loch-th, mtl, placeholders
@@ -96137,10 +97014,76 @@ self: {
          quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
          tasty-smallcheck text time transformers uuid vector
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/nikita-volkov/hasql";
        description = "A very efficient PostgreSQL driver and a flexible mapping API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hasql" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
+     , contravariant, contravariant-extras, data-default-class, dlist
+     , either, hashable, hashtables, loch-th, mtl, placeholders
+     , postgresql-binary, postgresql-libpq, profunctors, QuickCheck
+     , quickcheck-instances, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text, time, transformers
+     , uuid, vector
+     }:
+     mkDerivation {
+       pname = "hasql";
+       version = "0.19.7";
+       sha256 = "d7fd13c5b31de9e0df8531915de9e50087dd97560b1e9d8a82b8279e1763c239";
+       libraryHaskellDepends = [
+         aeson attoparsec base base-prelude bytestring contravariant
+         contravariant-extras data-default-class dlist either hashable
+         hashtables loch-th mtl placeholders postgresql-binary
+         postgresql-libpq profunctors scientific text time transformers uuid
+         vector
+       ];
+       testHaskellDepends = [
+         base base-prelude bytestring contravariant contravariant-extras
+         data-default-class dlist either hashable profunctors QuickCheck
+         quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck text time transformers uuid vector
+       ];
+       doCheck = false;
+       homepage = "https://github.com/nikita-volkov/hasql";
+       description = "A very efficient PostgreSQL driver and a flexible mapping API";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "hasql_0_19_8" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
+     , contravariant, contravariant-extras, data-default-class, dlist
+     , either, hashable, hashtables, loch-th, mtl, placeholders
+     , postgresql-binary, postgresql-libpq, profunctors, QuickCheck
+     , quickcheck-instances, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, tasty-smallcheck, text, time, transformers
+     , uuid, vector
+     }:
+     mkDerivation {
+       pname = "hasql";
+       version = "0.19.8";
+       sha256 = "34eaaa18216ba49621f7cf4ae5202299c8e2b57b460ac45a8dc161a159a564d1";
+       libraryHaskellDepends = [
+         aeson attoparsec base base-prelude bytestring contravariant
+         contravariant-extras data-default-class dlist either hashable
+         hashtables loch-th mtl placeholders postgresql-binary
+         postgresql-libpq profunctors scientific text time transformers uuid
+         vector
+       ];
+       testHaskellDepends = [
+         base base-prelude bytestring contravariant contravariant-extras
+         data-default-class dlist either hashable profunctors QuickCheck
+         quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
+         tasty-smallcheck text time transformers uuid vector
+       ];
+       homepage = "https://github.com/nikita-volkov/hasql";
+       description = "A very efficient PostgreSQL driver and a flexible mapping API";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-backend_0_2_1" = callPackage
@@ -96258,6 +97201,22 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "hasql-optparse-applicative" = callPackage
+    ({ mkDerivation, base-prelude, hasql, hasql-pool
+     , optparse-applicative
+     }:
+     mkDerivation {
+       pname = "hasql-optparse-applicative";
+       version = "0.1";
+       sha256 = "42f0b2acdfd1e213f8c30f65abeb063cb62534cb8d8a2f7950201409b00b7ac5";
+       libraryHaskellDepends = [
+         base-prelude hasql hasql-pool optparse-applicative
+       ];
+       homepage = "https://github.com/sannsyn/hasql-optparse-applicative";
+       description = "\"optparse-applicative\" parsers for \"hasql\"";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hasql-pool" = callPackage
     ({ mkDerivation, base-prelude, hasql, resource-pool, time }:
      mkDerivation {
@@ -97567,8 +98526,8 @@ self: {
      }:
      mkDerivation {
        pname = "hcoap";
-       version = "0.1.0.2";
-       sha256 = "71a2ecfde4fc2a17d116d5cfacd6868b6abe7ae851b834710173dc6e449952a2";
+       version = "0.1.1.0";
+       sha256 = "95cbfdd22d8e41da208f5bc8aafcc252e215b56df5db4163401f0f8c71504d8d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -97576,7 +98535,7 @@ self: {
        ];
        executableHaskellDepends = [ base bytestring network ];
        testHaskellDepends = [
-         base bytestring HUnit network QuickCheck random
+         async base bytestring HUnit network QuickCheck random
        ];
        homepage = "https://github.com/lulf/hcoap";
        description = "CoAP implementation for Haskell";
@@ -99583,13 +100542,13 @@ self: {
      }:
      mkDerivation {
        pname = "hfmt";
-       version = "0.0.2.1";
-       sha256 = "1bf5c1e5b686af47739f8589134889812fd7313049777001acf74bae38011373";
+       version = "0.0.2.2";
+       sha256 = "36610511a051f13e8b604f090eff467ff88bf40d2edc809d99d7246b9ac22d5f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base Cabal Diff directory filepath haskell-src-exts hindent hlint
-         HUnit pipes pretty stylish-haskell text
+         base Cabal directory filepath haskell-src-exts hindent hlint HUnit
+         pipes stylish-haskell text
        ];
        executableHaskellDepends = [
          ansi-wl-pprint base Diff optparse-applicative pipes pretty
@@ -104962,6 +105921,48 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "hoppy-generator" = callPackage
+    ({ mkDerivation, base, containers, directory, filepath, haskell-src
+     , mtl
+     }:
+     mkDerivation {
+       pname = "hoppy-generator";
+       version = "0.1.0";
+       sha256 = "b21263c50e730e903873c59dcbb9e88ce35db066713c22938e2b87e12e7d0fad";
+       libraryHaskellDepends = [
+         base containers directory filepath haskell-src mtl
+       ];
+       homepage = "http://khumba.net/projects/hoppy";
+       description = "C++ FFI generator - Code generator";
+       license = stdenv.lib.licenses.agpl3;
+     }) {};
+
+  "hoppy-runtime" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "hoppy-runtime";
+       version = "0.1.0";
+       sha256 = "b0f7721ef01bb4f1b4b7e9debbb6c18d0ec06eae058ef3c7160f64a026e05ddb";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://khumba.net/projects/hoppy";
+       description = "C++ FFI generator - Runtime support";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
+  "hoppy-std" = callPackage
+    ({ mkDerivation, base, filepath, haskell-src, hoppy-generator }:
+     mkDerivation {
+       pname = "hoppy-std";
+       version = "0.1.0";
+       sha256 = "adde5ad934f9e52d69e9c7f246d208d2a9ded339434c4bde8633d5193ba03d78";
+       libraryHaskellDepends = [
+         base filepath haskell-src hoppy-generator
+       ];
+       homepage = "http://khumba.net/projects/hoppy";
+       description = "C++ FFI generator - Standard library bindings";
+       license = stdenv.lib.licenses.asl20;
+     }) {};
+
   "hops" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, bytestring
      , conduit, conduit-extra, containers, deepseq, directory, filepath
@@ -107558,6 +108559,8 @@ self: {
          aeson aeson-lens async base containers data-default deepseq hformat
          hspec lens mtl text
        ];
+       doHaddock = false;
+       doCheck = false;
        homepage = "https://github.com/mvoidex/hsdev";
        description = "Haskell development library and tool with support of autocompletion, symbol info, go to declaration, find references etc";
        license = stdenv.lib.licenses.bsd3;
@@ -110033,14 +111036,13 @@ self: {
      }:
      mkDerivation {
        pname = "hsqml-demo-morris";
-       version = "0.3.1.0";
-       sha256 = "ada2125507c42987735cfdb7bd13dd205958527788b44ca20c5b3f482865727e";
+       version = "0.3.1.1";
+       sha256 = "15d6fd3a62ccd3988eafafb0707775b6a0c7c749073644da30e0550bbd01d998";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          base containers deepseq directory hsqml OddWord text
        ];
-       jailbreak = true;
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "HsQML-based implementation of Nine Men's Morris";
        license = stdenv.lib.licenses.bsd3;
@@ -112895,7 +113897,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "http2" = callPackage
+  "http2_1_4_4" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
      , bytestring-builder, containers, directory, doctest, filepath
      , Glob, hex, hspec, psqueues, stm, text, unordered-containers
@@ -112923,6 +113925,37 @@ self: {
        ];
        description = "HTTP/2.0 library including frames and HPACK";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "http2" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
+     , bytestring-builder, containers, directory, doctest, filepath
+     , Glob, hex, hspec, psqueues, stm, text, unordered-containers
+     , vector, word8
+     }:
+     mkDerivation {
+       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
+         text unordered-containers vector word8
+       ];
+       description = "HTTP/2.0 library including frames and HPACK";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "httpd-shed" = callPackage
@@ -115442,6 +116475,8 @@ self: {
        pname = "ide-backend";
        version = "0.10.0.1";
        sha256 = "07186ec1d8135e94fac39c16fc10145c3a6cee957b96fa739f240afd0ae5faf0";
+       revision = "1";
+       editedCabalFile = "cf76e099362742622e03b1463e55eb77e4488755afbc768fe2aca9e8c163662d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -115647,6 +116682,8 @@ self: {
        pname = "ide-backend-common";
        version = "0.10.1.2";
        sha256 = "031028f38e1a6174a58665cecd882356c6ca7579c6c21a9e2461f13d81a5915b";
+       revision = "1";
+       editedCabalFile = "c4caa9457f4890700a79c91a9c71d11785bc43bb4bb7564e01e6b787736b9dd9";
        libraryHaskellDepends = [
          aeson async attoparsec base base64-bytestring binary bytestring
          bytestring-trie containers crypto-api data-accessor directory
@@ -116940,7 +117977,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "include-file" = callPackage
+  "include-file_0_1_0_2" = callPackage
     ({ mkDerivation, base, bytestring, random, template-haskell }:
      mkDerivation {
        pname = "include-file";
@@ -116952,9 +117989,10 @@ self: {
        testHaskellDepends = [ base bytestring ];
        description = "Inclusion of files in executables at compile-time";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "include-file_0_1_0_3" = callPackage
+  "include-file" = callPackage
     ({ mkDerivation, base, bytestring, random, template-haskell }:
      mkDerivation {
        pname = "include-file";
@@ -116966,7 +118004,6 @@ self: {
        testHaskellDepends = [ base bytestring ];
        description = "Inclusion of files in executables at compile-time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "incremental-computing" = callPackage
@@ -118306,7 +119343,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "invariant" = callPackage
+  "invariant_0_3" = callPackage
     ({ mkDerivation, array, base, bifunctors, containers, contravariant
      , ghc-prim, hspec, profunctors, QuickCheck, semigroups, StateVar
      , stm, tagged, template-haskell, transformers, transformers-compat
@@ -118327,9 +119364,10 @@ self: {
        homepage = "https://github.com/nfrisby/invariant-functors";
        description = "Haskell 98 invariant functors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "invariant_0_3_1" = callPackage
+  "invariant" = callPackage
     ({ mkDerivation, array, base, bifunctors, containers, contravariant
      , ghc-prim, hspec, profunctors, QuickCheck, semigroups, StateVar
      , stm, tagged, template-haskell, transformers, transformers-compat
@@ -118348,7 +119386,6 @@ self: {
        homepage = "https://github.com/nfrisby/invariant-functors";
        description = "Haskell 98 invariant functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "invertible-syntax" = callPackage
@@ -119617,9 +120654,12 @@ self: {
        pname = "ivor";
        version = "0.1.14.1";
        sha256 = "90f91a08095f7bd37615bec3108a3f2a1d7783193924b3b78659f3dba79b3e65";
+       revision = "1";
+       editedCabalFile = "32900700e14c90c9c9aad7d7790c36540bad4c7a4af16cfdc1c16c6289902635";
        libraryHaskellDepends = [
          base binary containers directory haskell98 mtl parsec
        ];
+       jailbreak = true;
        homepage = "http://www.dcs.st-and.ac.uk/~eb/Ivor/";
        description = "Theorem proving library based on dependent type theory";
        license = stdenv.lib.licenses.bsd3;
@@ -121303,8 +122343,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-rpc";
-       version = "0.7.0.2";
-       sha256 = "e8187d8946735a2e6845ddcc4097181c99d750aea2b9c4563bf9765e86c3be82";
+       version = "0.7.1.1";
+       sha256 = "e7587e2a4bdbfcee27aaf28718f9ff9199a4f5f6d742a93b9b077e4df49ff247";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring conduit conduit-extra deepseq
          hashable lifted-async monad-control monad-logger mtl QuickCheck stm
@@ -121315,7 +122355,6 @@ self: {
          QuickCheck stm stm-conduit test-framework
          test-framework-quickcheck2 text transformers unordered-containers
        ];
-       jailbreak = true;
        homepage = "https://github.com/xenog/json-rpc";
        description = "Fully-featured JSON-RPC 2.0 library";
        license = stdenv.lib.licenses.publicDomain;
@@ -121330,8 +122369,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-rpc-client";
-       version = "0.2.2.0";
-       sha256 = "370fb8122243ada541060a4ea201d54f19d3031b7a524ec5176545a31be72740";
+       version = "0.2.3.0";
+       sha256 = "6c4325ad6d9fc8552d496f6bf680444dd90454c44c3a4265ed7e9a5b473f6a3a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121355,8 +122394,8 @@ self: {
      }:
      mkDerivation {
        pname = "json-rpc-server";
-       version = "0.2.2.0";
-       sha256 = "49eefc830aa7164662ea2a6263e9ea5d2379ebe21de6c6eaa463847e4c4ce33c";
+       version = "0.2.3.0";
+       sha256 = "73d633f3bfeea0ad785916c53afb1f4e3d481bef55977dc20d51297180148337";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -121611,8 +122650,8 @@ self: {
        pname = "json-schema";
        version = "0.7.4.1";
        sha256 = "560d6a17d6eab734f43d329e51967e3ed62f8df2a6fea4a92d06359fe77d7c96";
-       revision = "2";
-       editedCabalFile = "34b4f2ea278bbcb6cd0e6ed8e6d5f0e97f71c6885bc72914d3f47a372cf07d3b";
+       revision = "3";
+       editedCabalFile = "a919f70860dd9f379002ed0db301bbee85803dbf2661ae4c0d1f3045987f5233";
        libraryHaskellDepends = [
          aeson base containers generic-aeson generic-deriving mtl scientific
          text time unordered-containers vector
@@ -121658,20 +122697,20 @@ self: {
      }) {};
 
   "json-stream" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, directory, hspec
+    ({ mkDerivation, aeson, base, bytestring, directory, doctest, hspec
      , QuickCheck, quickcheck-unicode, scientific, text
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "json-stream";
-       version = "0.4.0.0";
-       sha256 = "10efbff41ba46c62b0f78f650275b3dcc1c5665edca7291143ddc9a7bbc8880a";
+       version = "0.4.1.0";
+       sha256 = "eaaec9b5f640203e2aa4d78988966440e24e8c76a97e25292db630cc51d3f497";
        libraryHaskellDepends = [
          aeson base bytestring scientific text unordered-containers vector
        ];
        testHaskellDepends = [
-         aeson base bytestring directory hspec QuickCheck quickcheck-unicode
-         scientific text unordered-containers vector
+         aeson base bytestring directory doctest hspec QuickCheck
+         quickcheck-unicode scientific text unordered-containers vector
        ];
        homepage = "https://github.com/ondrap/json-stream";
        description = "Incremental applicative JSON parser";
@@ -121930,8 +122969,8 @@ self: {
      }:
      mkDerivation {
        pname = "jukebox";
-       version = "0.2.2";
-       sha256 = "efbaefbbe3a6b66aea18885faf8ddfc3c84ce58ebbd507aebefd36336f278a4f";
+       version = "0.2.3";
+       sha256 = "e57562e66b77b22f9297f5bc9e8c0e0fb00d6073f3ab0a04839284db5c6f67f9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -122209,8 +123248,8 @@ self: {
        pname = "kansas-comet";
        version = "0.4";
        sha256 = "1f1a4565f2e955b8947bafcb9611789b0ccdf9efdfed8aaa2a2aa162a07339e1";
-       revision = "2";
-       editedCabalFile = "7130c2d96d36883b648d583fda40b74b7880f217213dd11827eef86caf7bc927";
+       revision = "3";
+       editedCabalFile = "94126550ee61faf694feaf83218fb9ff4a15dbe08d66403f2833167378842115";
        libraryHaskellDepends = [
          aeson base containers data-default-class scotty stm text time
          transformers unordered-containers
@@ -124200,6 +125239,8 @@ self: {
        pname = "lambdabot-haskell-plugins";
        version = "5.0.3";
        sha256 = "a11f264918af611b4dd48e698302b73b70952f196307051acd584979e327ca47";
+       revision = "1";
+       editedCabalFile = "32242e812c3d3dff424a6672d6678878132aefa8e195b438da45124dbdca0e9a";
        libraryHaskellDepends = [
          array arrows base bytestring containers data-memocombinators
          directory filepath haskell-src-exts hoogle HTTP IOSpec
@@ -124208,6 +125249,7 @@ self: {
          parsec pretty process QuickCheck regex-tdfa show split syb
          transformers utf8-string vector-space
        ];
+       jailbreak = true;
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot Haskell plugins";
        license = "GPL";
@@ -125920,7 +126962,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "language-thrift" = callPackage
+  "language-thrift_0_7_0_1" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-discover, lens
      , parsers, QuickCheck, text, transformers, trifecta, wl-pprint
      }:
@@ -125942,6 +126984,26 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "language-thrift" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, hspec, hspec-discover
+     , megaparsec, QuickCheck, text, transformers
+     }:
+     mkDerivation {
+       pname = "language-thrift";
+       version = "0.8.0.0";
+       sha256 = "1bfb07ecaa49d8cffa2b985f1d820607ca6369692a98ea7f9f3ec3133959452a";
+       libraryHaskellDepends = [
+         ansi-wl-pprint base megaparsec text transformers
+       ];
+       testHaskellDepends = [
+         ansi-wl-pprint base hspec hspec-discover megaparsec QuickCheck text
+       ];
+       homepage = "https://github.com/abhinav/language-thrift";
+       description = "Parser and pretty printer for the Thrift IDL format";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-typescript" = callPackage
     ({ mkDerivation, base, containers, parsec, pretty }:
      mkDerivation {
@@ -126229,6 +127291,8 @@ self: {
        pname = "lattices";
        version = "1.5.0";
        sha256 = "c6e3fb4334503b9087209195f40c96f56819497f999959358a2ff5d843a45d1f";
+       revision = "1";
+       editedCabalFile = "566d0c60f273b1d938dd9db805546fbcd4b53c132f1dfa259d6d23e212e88512";
        libraryHaskellDepends = [
          base containers deepseq hashable semigroups tagged universe-base
          universe-reverse-instances unordered-containers void
@@ -126933,7 +127997,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lens_4_13_1" = callPackage
+  "lens_4_13_2" = callPackage
     ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
      , comonad, containers, contravariant, deepseq, directory
      , distributive, doctest, exceptions, filepath, free
@@ -126946,10 +128010,8 @@ self: {
      }:
      mkDerivation {
        pname = "lens";
-       version = "4.13.1";
-       sha256 = "987137d11f189e08ceeb0e2e5c047c1456ad666642974067d2d8e11309ef6b7b";
-       revision = "1";
-       editedCabalFile = "35b2594d3e37b4294c2a9dd3e7620af7a27ce10044631a2f91611cdaf66a55f9";
+       version = "4.13.2";
+       sha256 = "814b7b35949cc8a3ad1a35fc39b88fc3b78bbfb339097f3f3438627048155b78";
        libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring comonad containers
          contravariant distributive exceptions filepath free ghc-prim
@@ -127094,8 +128156,8 @@ self: {
        pname = "lens-aeson";
        version = "1.0.0.5";
        sha256 = "65faad5b75852209b4c6df43ae1f7460c2b94bf3bbc10b5cd529f43c743a5d9f";
-       revision = "1";
-       editedCabalFile = "806f94330f5b813192f1cfe62a0c07ecb43ecdb1f83b94e4aa704e7d2be017da";
+       revision = "2";
+       editedCabalFile = "fb2b4c4dc5b44f95da81837394ea09416dd0211dd98e23c30c2473e2b39e844c";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring lens scientific text
          unordered-containers vector
@@ -127841,8 +128903,8 @@ self: {
      }:
      mkDerivation {
        pname = "libgraph";
-       version = "1.9";
-       sha256 = "621f0dbd1bfc57d7fbd593698ed31af9b1943ba65fc9ece31514d6caab58748a";
+       version = "1.10";
+       sha256 = "d5d6152c80ae8be8c43ff02f1e74ac114b734254426a289f2b89e5815f9f232f";
        libraryHaskellDepends = [
          array base containers monads-tf process union-find
        ];
@@ -128338,25 +129400,6 @@ self: {
      }) {};
 
   "lift-generics" = callPackage
-    ({ mkDerivation, base, base-compat, generic-deriving, ghc-prim
-     , hspec, template-haskell
-     }:
-     mkDerivation {
-       pname = "lift-generics";
-       version = "0.1";
-       sha256 = "77db9dacd191547300bd303555492f81cfbb00827d6364495f98fce053a627e1";
-       libraryHaskellDepends = [
-         base generic-deriving ghc-prim template-haskell
-       ];
-       testHaskellDepends = [
-         base base-compat generic-deriving hspec template-haskell
-       ];
-       homepage = "https://github.com/RyanGlScott/lift-generics";
-       description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "lift-generics_0_1_1" = callPackage
     ({ mkDerivation, base, base-compat, generic-deriving, ghc-prim
      , hspec, template-haskell
      }:
@@ -128370,11 +129413,9 @@ self: {
        testHaskellDepends = [
          base base-compat generic-deriving hspec template-haskell
        ];
-       jailbreak = true;
        homepage = "https://github.com/RyanGlScott/lift-generics";
        description = "GHC.Generics-based Language.Haskell.TH.Syntax.lift implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lifted-async_0_2_0_2" = callPackage
@@ -129931,6 +130972,25 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "list-t_0_4_6" = callPackage
+    ({ mkDerivation, base-prelude, HTF, mmorph, monad-control, mtl
+     , mtl-prelude, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "list-t";
+       version = "0.4.6";
+       sha256 = "fe49a4fee6f166c677758e26bb26dadd8fa57c5a8fa288c64bbcaeeb420467b2";
+       libraryHaskellDepends = [
+         base-prelude mmorph monad-control mtl transformers
+         transformers-base
+       ];
+       testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
+       homepage = "https://github.com/nikita-volkov/list-t";
+       description = "ListT done right";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "list-t-attoparsec" = callPackage
     ({ mkDerivation, attoparsec, base-prelude, either, hspec, list-t
      , list-t-text, text, transformers
@@ -130101,8 +131161,8 @@ self: {
      }:
      mkDerivation {
        pname = "lit";
-       version = "0.1.0.9";
-       sha256 = "6e84201625f8924da5f63eee8fe66b89bbf70bd5631509c9fd3eaef0f05c240f";
+       version = "0.1.10.0";
+       sha256 = "549f3ad1a97c14c4bae4d74e49322efa5a10f5ad9056ab82b7d9529ae04f3636";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -130361,8 +131421,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-general";
-       version = "3.5.1.1";
-       sha256 = "e1f636b445b5a161750273d11a4a70ac1263c237dd47b1b347c6150fdfd29733";
+       version = "3.5.1.2";
+       sha256 = "2075b44cc1475a8623e7164add94d7b9f31ca9a157e099b23389b892886bd297";
        libraryHaskellDepends = [
          array base bytestring containers llvm-general-pure mtl parsec
          setenv template-haskell transformers transformers-compat
@@ -130386,10 +131446,8 @@ self: {
      }:
      mkDerivation {
        pname = "llvm-general-pure";
-       version = "3.5.0.0";
-       sha256 = "612d2e40ea69da99940357d88098ef30f1eaf8eda18a2f084fc300f097a3d2f8";
-       revision = "1";
-       editedCabalFile = "64ab5cdad51aaff9fcb168afee8ef6602287e8ee24c156564adc1adfd7ad1119";
+       version = "3.5.1.0";
+       sha256 = "e5349189b1c203793dd4f0e2a582b633f09fa311340189b3ade004f4794b8097";
        libraryHaskellDepends = [
          base containers mtl parsec setenv template-haskell transformers
        ];
@@ -130397,6 +131455,7 @@ self: {
          base containers HUnit mtl QuickCheck test-framework
          test-framework-hunit test-framework-quickcheck2
        ];
+       homepage = "http://github.com/bscarlet/llvm-general/";
        description = "Pure Haskell LLVM functionality (no FFI)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -133683,7 +134742,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mandrill" = callPackage
+  "mandrill_0_5_0_0" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-html
      , bytestring, containers, email-validate, http-client
      , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck
@@ -133705,6 +134764,31 @@ self: {
        ];
        description = "Library for interfacing with the Mandrill JSON API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "mandrill" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, blaze-html
+     , bytestring, containers, email-validate, http-client
+     , http-client-tls, http-types, lens, mtl, old-locale, QuickCheck
+     , raw-strings-qq, tasty, tasty-hunit, tasty-quickcheck, text, time
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "mandrill";
+       version = "0.5.1.0";
+       sha256 = "107ca6fe552fe86585fff7b31452073140be1df039a7baadd7e1efb880a063d1";
+       libraryHaskellDepends = [
+         aeson base base64-bytestring blaze-html bytestring containers
+         email-validate http-client http-client-tls http-types lens mtl
+         old-locale QuickCheck text time unordered-containers
+       ];
+       testHaskellDepends = [
+         aeson base bytestring QuickCheck raw-strings-qq tasty tasty-hunit
+         tasty-quickcheck text
+       ];
+       description = "Library for interfacing with the Mandrill JSON API";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "mandulia" = callPackage
@@ -133905,8 +134989,8 @@ self: {
      }:
      mkDerivation {
        pname = "mappy";
-       version = "0.1.2.1";
-       sha256 = "54f6af643b2aeb6245ec92717a27dfca4e8b0b65442fef39cf09cd09b83268d8";
+       version = "0.1.3.0";
+       sha256 = "6446e847c2663f752184b81c9e4f541bc7ada3fc0a8bcde9435a20363a3b72cb";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -135886,7 +136970,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "microlens-aeson" = callPackage
+  "microlens-aeson_2_1_0" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, directory
      , doctest, filepath, generic-deriving, microlens, scientific
      , semigroups, simple-reflect, text, unordered-containers, vector
@@ -135906,6 +136990,29 @@ self: {
        homepage = "http://github.com/fosskers/microlens-aeson/";
        description = "Law-abiding lenses for Aeson, using microlens";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "microlens-aeson" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, directory
+     , doctest, filepath, generic-deriving, microlens, scientific
+     , semigroups, simple-reflect, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "microlens-aeson";
+       version = "2.1.1";
+       sha256 = "5b43bcdc52d4b86b8c74040f754209efa95f5983d5d114d2af6709949614acda";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring microlens scientific text
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         base directory doctest filepath generic-deriving semigroups
+         simple-reflect
+       ];
+       homepage = "http://github.com/fosskers/microlens-aeson/";
+       description = "Law-abiding lenses for Aeson, using microlens";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "microlens-contra" = callPackage
@@ -136126,6 +137233,8 @@ self: {
        pname = "microlens-th";
        version = "0.2.2.0";
        sha256 = "bf52318c0898294ab356ba75f72b880b9453cbc9df809b71aeac8081105596f9";
+       revision = "1";
+       editedCabalFile = "838249b8311e60d02769f4d6f106be52451179d3656842d43e11d866c46b2a8e";
        libraryHaskellDepends = [
          base containers microlens template-haskell
        ];
@@ -136142,6 +137251,8 @@ self: {
        pname = "microlens-th";
        version = "0.3.0.0";
        sha256 = "951eaf33daf3b648082f754a6c091a8401bad39f5d5f659bad22252fe214d866";
+       revision = "1";
+       editedCabalFile = "9c75b584e225de81b1114a1bf81fad5f7b7c44d5d9271b09235b24ed6d17d02b";
        libraryHaskellDepends = [
          base containers microlens template-haskell
        ];
@@ -136150,6 +137261,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "microlens-th_0_3_0_1" = callPackage
+    ({ mkDerivation, base, containers, microlens, template-haskell }:
+     mkDerivation {
+       pname = "microlens-th";
+       version = "0.3.0.1";
+       sha256 = "05576f60d3cafc2f4554164330e864d965f2de8912cd29c802c2c11d719eba52";
+       libraryHaskellDepends = [
+         base containers microlens template-haskell
+       ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "Automatic generation of record lenses for microlens";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "microtimer" = callPackage
     ({ mkDerivation, base, time }:
      mkDerivation {
@@ -137743,6 +138869,7 @@ self: {
        libraryHaskellDepends = [
          base transformers transformers-base transformers-compat
        ];
+       jailbreak = true;
        homepage = "https://github.com/basvandijk/monad-control";
        description = "Lift control operations, like exception catching, through monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -137816,7 +138943,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monad-coroutine" = callPackage
+  "monad-coroutine_0_9_0_1" = callPackage
     ({ mkDerivation, base, monad-parallel, transformers
      , transformers-compat
      }:
@@ -137827,12 +138954,14 @@ self: {
        libraryHaskellDepends = [
          base monad-parallel transformers transformers-compat
        ];
+       jailbreak = true;
        homepage = "http://trac.haskell.org/SCC/wiki/monad-coroutine";
        description = "Coroutine monad transformer for suspending and resuming monadic computations";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monad-coroutine_0_9_0_2" = callPackage
+  "monad-coroutine" = callPackage
     ({ mkDerivation, base, monad-parallel, transformers
      , transformers-compat
      }:
@@ -137846,7 +138975,6 @@ self: {
        homepage = "http://trac.haskell.org/SCC/wiki/monad-coroutine";
        description = "Coroutine monad transformer for suspending and resuming monadic computations";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-exception" = callPackage
@@ -138496,13 +139624,14 @@ self: {
        libraryHaskellDepends = [
          base parallel transformers transformers-compat
        ];
+       jailbreak = true;
        homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel";
        description = "Parallel execution of monadic computations";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monad-parallel" = callPackage
+  "monad-parallel_0_7_2_0" = callPackage
     ({ mkDerivation, base, parallel, transformers, transformers-compat
      }:
      mkDerivation {
@@ -138512,12 +139641,14 @@ self: {
        libraryHaskellDepends = [
          base parallel transformers transformers-compat
        ];
+       jailbreak = true;
        homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel";
        description = "Parallel execution of monadic computations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monad-parallel_0_7_2_1" = callPackage
+  "monad-parallel" = callPackage
     ({ mkDerivation, base, parallel, transformers, transformers-compat
      }:
      mkDerivation {
@@ -138530,7 +139661,6 @@ self: {
        homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel";
        description = "Parallel execution of monadic computations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-parallel-progressbar" = callPackage
@@ -140821,6 +141951,25 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "multiaddr" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, cereal, errors
+     , hashable, tasty, tasty-hunit, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "multiaddr";
+       version = "0.1.0";
+       sha256 = "704a76498f4b0e7078151771124ddb1f4facc6e6f3d2d068c2d2f4cc9ac96b8e";
+       libraryHaskellDepends = [
+         attoparsec base bytestring cereal errors hashable text
+       ];
+       testHaskellDepends = [
+         base tasty tasty-hunit tasty-quickcheck text
+       ];
+       homepage = "http://github.com/micxjo/hs-multiaddr";
+       description = "A network address format";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "multiarg_0_30_0_8" = callPackage
     ({ mkDerivation, base, QuickCheck, tasty, tasty-quickcheck
      , tasty-th
@@ -141724,7 +142873,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mwc-probability" = callPackage
+  "mwc-probability_1_0_2" = callPackage
     ({ mkDerivation, base, mwc-random, primitive, transformers }:
      mkDerivation {
        pname = "mwc-probability";
@@ -141734,6 +142883,32 @@ self: {
        homepage = "http://github.com/jtobin/mwc-probability";
        description = "Sampling function-based probability distributions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "mwc-probability" = callPackage
+    ({ mkDerivation, base, mwc-random, primitive, transformers }:
+     mkDerivation {
+       pname = "mwc-probability";
+       version = "1.0.3";
+       sha256 = "38386c522e96768ffe4f71c4eedbe0e3418472eb8d78c8c509183fb19175c47f";
+       libraryHaskellDepends = [ base mwc-random primitive transformers ];
+       homepage = "http://github.com/jtobin/mwc-probability";
+       description = "Sampling function-based probability distributions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "mwc-probability_1_1_3" = callPackage
+    ({ mkDerivation, base, mwc-random, primitive, transformers }:
+     mkDerivation {
+       pname = "mwc-probability";
+       version = "1.1.3";
+       sha256 = "a7190d8f2b12d5aff0344a1bdc5a85386cb12960fe31e346b14806e615773363";
+       libraryHaskellDepends = [ base mwc-random primitive transformers ];
+       homepage = "http://github.com/jtobin/mwc-probability";
+       description = "Sampling function-based probability distributions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mwc-random_0_13_2_2" = callPackage
@@ -142592,8 +143767,8 @@ self: {
      }:
      mkDerivation {
        pname = "natural-transformation";
-       version = "0.3";
-       sha256 = "dce066be311d19aa14aab9431aacf99117df101db8d68f2d0dddb3ffe1796ed0";
+       version = "0.3.1";
+       sha256 = "9b5a39f18790f33807298d47dc7098e2863ca874e8b3d2b419bf696f2ad09702";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base containers quickcheck-instances tasty tasty-quickcheck
@@ -142817,6 +143992,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "neat-interpolation_0_3_1" = callPackage
+    ({ mkDerivation, base, base-prelude, HTF, parsec, template-haskell
+     , text
+     }:
+     mkDerivation {
+       pname = "neat-interpolation";
+       version = "0.3.1";
+       sha256 = "dd5ac81fb44ab9dff1ae1e0a1a67bc59358e4ad1a6fdf17529b1c7d3582a221f";
+       libraryHaskellDepends = [
+         base base-prelude parsec template-haskell text
+       ];
+       testHaskellDepends = [ base-prelude HTF ];
+       homepage = "https://github.com/nikita-volkov/neat-interpolation";
+       description = "A quasiquoter for neat and simple multiline text interpolation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "needle" = callPackage
     ({ mkDerivation, base, containers, haskell-src-meta, mtl, parsec
      , parsec-extra, template-haskell, text, vector
@@ -142842,8 +144035,8 @@ self: {
      }:
      mkDerivation {
        pname = "neet";
-       version = "0.4.0.0";
-       sha256 = "65070ee005098819c3521be167182f5d22b5ab5687c066658ef226262f3314f4";
+       version = "0.4.0.1";
+       sha256 = "f27956192a15ec9dc4d869c980562ced7abe3b4fda584b9ed89ac9036684cf9c";
        libraryHaskellDepends = [
          base cereal containers graphviz MonadRandom multimap parallel
          random transformers
@@ -145787,8 +146980,8 @@ self: {
      }:
      mkDerivation {
        pname = "number-length";
-       version = "0.1.0.0";
-       sha256 = "96b5a43ab1832891bacaf81d5642f6e0686ccd93e79330b46ab0f802e68877c3";
+       version = "0.1.0.1";
+       sha256 = "6c024aad9a8a751a621b0804b58ea2dd3e67703db1b75c71776996f67268e9c5";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [
          base HUnit QuickCheck test-framework test-framework-hunit
@@ -146192,6 +147385,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "oanda-rest-api" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, Decimal
+     , hlint, hspec, HUnit, lens, old-locale, scientific, text, time
+     , vector, wreq
+     }:
+     mkDerivation {
+       pname = "oanda-rest-api";
+       version = "0.1.0.0";
+       sha256 = "7a22fbe550d0bd7d80d9a07e4e563557ff81f294eef423026542bc2bd8a18b0f";
+       libraryHaskellDepends = [
+         aeson base bytestring containers Decimal lens old-locale scientific
+         text time vector wreq
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers Decimal hlint hspec HUnit lens
+         old-locale scientific text time vector wreq
+       ];
+       homepage = "http://github.com/jdreaver/oanda-rest-api";
+       description = "Client to the OANDA REST API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "oauthenticated" = callPackage
     ({ mkDerivation, aeson, base, base64-bytestring, blaze-builder
      , bytestring, case-insensitive, crypto-random, cryptohash, either
@@ -147760,6 +148975,18 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "operational-extra" = callPackage
+    ({ mkDerivation, base, operational, time }:
+     mkDerivation {
+       pname = "operational-extra";
+       version = "0.1.0.0";
+       sha256 = "d0ab3fa58e55ff94f2e12d563410dfcc11c6ce6c1ab863602afd6b5522549c9b";
+       libraryHaskellDepends = [ base operational time ];
+       homepage = "http://github.com/andrewthad/vinyl-operational#readme";
+       description = "Initial project template from stack";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "opml" = callPackage
     ({ mkDerivation, base, directory, xml }:
      mkDerivation {
@@ -147771,6 +148998,38 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "opml-conduit_0_4_0_0" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, conduit
+     , conduit-combinators, conduit-parse, containers, data-default
+     , exceptions, foldl, hlint, lens-simple, mono-traversable
+     , monoid-subclasses, mtl, parsers, QuickCheck, quickcheck-instances
+     , resourcet, semigroups, tasty, tasty-hunit, tasty-quickcheck, text
+     , time, timerep, uri-bytestring, xml-conduit, xml-conduit-parse
+     , xml-types
+     }:
+     mkDerivation {
+       pname = "opml-conduit";
+       version = "0.4.0.0";
+       sha256 = "7a684983ad76067cce5d6b9358cfb581a2222a6495928eca9d61aa04bd0e9e1d";
+       libraryHaskellDepends = [
+         base case-insensitive conduit conduit-parse containers exceptions
+         foldl lens-simple mono-traversable monoid-subclasses parsers
+         semigroups text time timerep uri-bytestring xml-conduit
+         xml-conduit-parse xml-types
+       ];
+       testHaskellDepends = [
+         base bytestring conduit conduit-combinators conduit-parse
+         containers data-default exceptions hlint lens-simple
+         mono-traversable mtl parsers QuickCheck quickcheck-instances
+         resourcet semigroups tasty tasty-hunit tasty-quickcheck text time
+         uri-bytestring xml-conduit-parse
+       ];
+       homepage = "https://github.com/k0ral/opml-conduit";
+       description = "Streaming parser/renderer for the OPML 2.0 format.";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "opml-conduit" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, conduit
      , conduit-combinators, conduit-parse, containers, data-default
@@ -147782,8 +149041,8 @@ self: {
      }:
      mkDerivation {
        pname = "opml-conduit";
-       version = "0.4.0.0";
-       sha256 = "7a684983ad76067cce5d6b9358cfb581a2222a6495928eca9d61aa04bd0e9e1d";
+       version = "0.4.0.1";
+       sha256 = "6b1ed378cdf1d8b6cc1aeb8038eac5ed770e572946bf8ff98b474fc315d2a93c";
        libraryHaskellDepends = [
          base case-insensitive conduit conduit-parse containers exceptions
          foldl lens-simple mono-traversable monoid-subclasses parsers
@@ -148027,6 +149286,7 @@ self: {
        libraryHaskellDepends = [
          ansi-wl-pprint base process transformers transformers-compat
        ];
+       jailbreak = true;
        homepage = "https://github.com/pcapriotti/optparse-applicative";
        description = "Utilities and combinators for parsing command line options";
        license = stdenv.lib.licenses.bsd3;
@@ -148044,6 +149304,7 @@ self: {
        libraryHaskellDepends = [
          ansi-wl-pprint base process transformers transformers-compat
        ];
+       jailbreak = true;
        homepage = "https://github.com/pcapriotti/optparse-applicative";
        description = "Utilities and combinators for parsing command line options";
        license = stdenv.lib.licenses.bsd3;
@@ -148879,7 +150140,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pagerduty" = callPackage
+  "pagerduty_0_0_4" = callPackage
     ({ mkDerivation, aeson, base, bifunctors, bytestring
      , bytestring-conversion, conduit, data-default-class, exceptions
      , generics-sop, http-client, http-types, lens, lens-aeson, mmorph
@@ -148901,6 +150162,31 @@ self: {
        homepage = "http://github.com/brendanhay/pagerduty";
        description = "Client library for PagerDuty Integration and REST APIs";
        license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "pagerduty" = callPackage
+    ({ mkDerivation, aeson, base, bifunctors, bytestring
+     , bytestring-conversion, conduit, data-default-class, exceptions
+     , generics-sop, http-client, http-types, lens, lens-aeson, mmorph
+     , monad-control, mtl, template-haskell, text, time
+     , time-locale-compat, transformers, transformers-base
+     , transformers-compat, unordered-containers
+     }:
+     mkDerivation {
+       pname = "pagerduty";
+       version = "0.0.6";
+       sha256 = "4e00ab7235af51640a1599e523fe388b98d9dffa04130d7d6f7fedfe05d342ef";
+       libraryHaskellDepends = [
+         aeson base bifunctors bytestring bytestring-conversion conduit
+         data-default-class exceptions generics-sop http-client http-types
+         lens lens-aeson mmorph monad-control mtl template-haskell text time
+         time-locale-compat transformers transformers-base
+         transformers-compat unordered-containers
+       ];
+       homepage = "http://github.com/brendanhay/pagerduty";
+       description = "Client library for PagerDuty Integration and REST APIs";
+       license = "unknown";
      }) {};
 
   "pagure-hook-receiver" = callPackage
@@ -149913,7 +151199,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pandoc-types" = callPackage
+  "pandoc-types_1_16_0_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , ghc-prim, syb
      }:
@@ -149927,6 +151213,23 @@ self: {
        homepage = "http://johnmacfarlane.net/pandoc";
        description = "Types for representing a structured document";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "pandoc-types" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, deepseq
+     , ghc-prim, syb
+     }:
+     mkDerivation {
+       pname = "pandoc-types";
+       version = "1.16.1";
+       sha256 = "846054157d7072ca3f7260b988a6752536b42bbd32c051400e55f46229b8179e";
+       libraryHaskellDepends = [
+         aeson base bytestring containers deepseq ghc-prim syb
+       ];
+       homepage = "http://johnmacfarlane.net/pandoc";
+       description = "Types for representing a structured document";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "pandoc-unlit" = callPackage
@@ -151613,7 +152916,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pdf-toolbox-content" = callPackage
+  "pdf-toolbox-content_0_0_5_0" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring
      , containers, io-streams, pdf-toolbox-core, text
      }:
@@ -151628,9 +152931,10 @@ self: {
        homepage = "https://github.com/Yuras/pdf-toolbox";
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pdf-toolbox-content_0_0_5_1" = callPackage
+  "pdf-toolbox-content" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring
      , containers, io-streams, pdf-toolbox-core, text
      }:
@@ -151645,10 +152949,9 @@ self: {
        homepage = "https://github.com/Yuras/pdf-toolbox";
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pdf-toolbox-core" = callPackage
+  "pdf-toolbox-core_0_0_4_0" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, errors
      , io-streams, scientific, transformers, zlib-bindings
      }:
@@ -151663,9 +152966,10 @@ self: {
        homepage = "https://github.com/Yuras/pdf-toolbox";
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pdf-toolbox-core_0_0_4_1" = callPackage
+  "pdf-toolbox-core" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers, errors
      , io-streams, scientific, transformers, zlib-bindings
      }:
@@ -151680,10 +152984,9 @@ self: {
        homepage = "https://github.com/Yuras/pdf-toolbox";
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pdf-toolbox-document" = callPackage
+  "pdf-toolbox-document_0_0_7_0" = callPackage
     ({ mkDerivation, base, bytestring, cipher-aes, cipher-rc4
      , containers, crypto-api, cryptohash, io-streams
      , pdf-toolbox-content, pdf-toolbox-core, text, transformers
@@ -151700,9 +153003,10 @@ self: {
        homepage = "https://github.com/Yuras/pdf-toolbox";
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pdf-toolbox-document_0_0_7_1" = callPackage
+  "pdf-toolbox-document" = callPackage
     ({ mkDerivation, base, bytestring, cipher-aes, cipher-rc4
      , containers, crypto-api, cryptohash, io-streams
      , pdf-toolbox-content, pdf-toolbox-core, text, transformers
@@ -151719,7 +153023,6 @@ self: {
        homepage = "https://github.com/Yuras/pdf-toolbox";
        description = "A collection of tools for processing PDF files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pdf-toolbox-viewer" = callPackage
@@ -152223,8 +153526,8 @@ self: {
      }:
      mkDerivation {
        pname = "persistable-record";
-       version = "0.3.0.0";
-       sha256 = "9b9383f1dfa6d3c8b700fa4417a27538175143259a3410dfd72a39e5ac299b4f";
+       version = "0.4.0.0";
+       sha256 = "b0227677da0c54514e8f98adef99ee5f2fdad5c6d251c5cfb36357e68abaeaa5";
        libraryHaskellDepends = [
          array base containers dlist names-th template-haskell transformers
        ];
@@ -152239,14 +153542,14 @@ self: {
      }:
      mkDerivation {
        pname = "persistable-types-HDBC-pg";
-       version = "0.0.1.1";
-       sha256 = "4af95781aef9366894c7c7fde4700cac7d954c617ffe16374bd90bd5833bd887";
+       version = "0.0.1.3";
+       sha256 = "586cbb0b471c957c0e3979a019ef7e5bfdf4db50092a196cac72aa4f8b82cca0";
        libraryHaskellDepends = [
          base bytestring convertible HDBC persistable-record
          relational-query-HDBC text-postgresql
        ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
-       description = "HDBC Convertible instances and HRR persistable instances of PostgreSQL extended types";
+       description = "HDBC and Relational-Record instances of PostgreSQL extended types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -155761,7 +157064,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pipes-text" = callPackage
+  "pipes-text_0_0_1_0" = callPackage
     ({ mkDerivation, base, bytestring, pipes, pipes-bytestring
      , pipes-group, pipes-parse, pipes-safe, streaming-commons, text
      , transformers
@@ -155777,9 +157080,10 @@ self: {
        homepage = "https://github.com/michaelt/text-pipes";
        description = "Text pipes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pipes-text_0_0_2_1" = callPackage
+  "pipes-text" = callPackage
     ({ mkDerivation, base, bytestring, pipes, pipes-bytestring
      , pipes-group, pipes-parse, pipes-safe, streaming-commons, text
      , transformers
@@ -155795,7 +157099,6 @@ self: {
        homepage = "https://github.com/michaelt/text-pipes";
        description = "properly streaming text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-transduce" = callPackage
@@ -156406,6 +157709,8 @@ self: {
        pname = "plugins";
        version = "1.5.5.0";
        sha256 = "57012217c22dce398b3574f45af22404be38de96145e5862d1453c599816f6a2";
+       revision = "1";
+       editedCabalFile = "84dab5882c330bdc39bcecdbc9d8834c4c964241cd4a1ce87d4987947add924a";
        libraryHaskellDepends = [
          array base Cabal containers directory filepath ghc ghc-paths
          ghc-prim haskell-src process random
@@ -157190,8 +158495,8 @@ self: {
     ({ mkDerivation, base, hspec, network, QuickCheck }:
      mkDerivation {
        pname = "pong-server";
-       version = "0.0.1.0";
-       sha256 = "649ea24e1412408d55e4e82f4c0d0e87bdbeb100bb70ea2167627f304ee2730e";
+       version = "0.0.2.0";
+       sha256 = "2964703036c52a24afc15522f3ad0a5eee5ee14f3153dd35a9e3ddd7501761ad";
        libraryHaskellDepends = [ base network ];
        testHaskellDepends = [ base hspec network QuickCheck ];
        homepage = "http://github.com/RobertFischer/pong-server#readme";
@@ -157334,15 +158639,15 @@ self: {
      }:
      mkDerivation {
        pname = "pooled-io";
-       version = "0.0.2";
-       sha256 = "b43f5d60c7549bc22130219b34f4385265b9f8a386db1816d5982931b704f46c";
+       version = "0.0.2.1";
+       sha256 = "7d405a8876d55a9c077a304dd378854bc9e6e20f643c357c82bd3f38297ff9d0";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          base concurrent-split containers deepseq transformers unsafe
          utility-ht
        ];
-       homepage = "http://code.haskell.org/~thielema/pooled-io/";
+       homepage = "http://hub.darcs.net/thielema/pooled-io/";
        description = "Run jobs on a limited number of threads and support data dependencies";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -157855,7 +159160,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "postgresql-binary" = callPackage
+  "postgresql-binary_0_7_9" = callPackage
     ({ mkDerivation, aeson, base, base-prelude, binary-parser
      , bytestring, conversion, conversion-bytestring, conversion-text
      , either, foldl, json-ast, loch-th, placeholders, postgresql-libpq
@@ -157883,6 +159188,65 @@ self: {
        homepage = "https://github.com/nikita-volkov/postgresql-binary";
        description = "Encoders and decoders for the PostgreSQL's binary format";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "postgresql-binary" = callPackage
+    ({ mkDerivation, aeson, base, base-prelude, binary-parser
+     , bytestring, conversion, conversion-bytestring, conversion-text
+     , either, foldl, json-ast, loch-th, placeholders, postgresql-libpq
+     , QuickCheck, quickcheck-instances, rebase, scientific, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time
+     , transformers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "postgresql-binary";
+       version = "0.8";
+       sha256 = "401fe41d1bbf31ec0c5cf61ef6370cc56c61ae5f49a92a5f464981bc535c09c2";
+       libraryHaskellDepends = [
+         aeson base base-prelude binary-parser bytestring foldl loch-th
+         placeholders scientific text time transformers uuid vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring conversion conversion-bytestring
+         conversion-text either json-ast loch-th placeholders
+         postgresql-libpq QuickCheck quickcheck-instances rebase scientific
+         tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time
+         transformers uuid vector
+       ];
+       doCheck = false;
+       homepage = "https://github.com/nikita-volkov/postgresql-binary";
+       description = "Encoders and decoders for the PostgreSQL's binary format";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "postgresql-binary_0_8_1" = callPackage
+    ({ mkDerivation, aeson, base, base-prelude, binary-parser
+     , bytestring, conversion, conversion-bytestring, conversion-text
+     , either, foldl, json-ast, loch-th, placeholders, postgresql-libpq
+     , QuickCheck, quickcheck-instances, rebase, scientific, tasty
+     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time
+     , transformers, uuid, vector
+     }:
+     mkDerivation {
+       pname = "postgresql-binary";
+       version = "0.8.1";
+       sha256 = "e5745c009806fb10705f1f5f23c2af4028b47a7178e1ea09e102cf697cc2581b";
+       libraryHaskellDepends = [
+         aeson base base-prelude binary-parser bytestring foldl loch-th
+         placeholders scientific text time transformers uuid vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring conversion conversion-bytestring
+         conversion-text either json-ast loch-th placeholders
+         postgresql-libpq QuickCheck quickcheck-instances rebase scientific
+         tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time
+         transformers uuid vector
+       ];
+       homepage = "https://github.com/nikita-volkov/postgresql-binary";
+       description = "Encoders and decoders for the PostgreSQL's binary format";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-config" = callPackage
@@ -159372,6 +160736,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "print-debugger" = callPackage
+    ({ mkDerivation, base, split }:
+     mkDerivation {
+       pname = "print-debugger";
+       version = "1.1.7";
+       sha256 = "3e0333a2ded92a164a8c6e33f84ee8014efb0474b8a55011c16194fabf8d6d6c";
+       libraryHaskellDepends = [ base split ];
+       homepage = "https://github.com/JohnReedLOL/HaskellPrintDebugger";
+       description = "Debug print formatting library";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "printf-mauke" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default
      , template-haskell, utf8-string
@@ -159747,8 +161123,8 @@ self: {
      }:
      mkDerivation {
        pname = "process-streaming";
-       version = "0.9.0.1";
-       sha256 = "114bf31ba101447858cf6db6f127e6fcc09e154cc6f49fda27c60e6e0db2e1dc";
+       version = "0.9.1.0";
+       sha256 = "cd1efb0a5a24a9b3c13fc24bba2054ae0be494b645a5091f733b06854a275a9c";
        libraryHaskellDepends = [
          base bifunctors bytestring conceit free kan-extensions pipes
          pipes-bytestring pipes-concurrency pipes-parse pipes-safe
@@ -160418,8 +161794,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "2.15.3";
-       sha256 = "8d83603d915fcce9ce109b70bd19499a94a70de6abc2a31ac2ebd892f76af683";
+       version = "2.15.4";
+       sha256 = "1113810f1cd23c8d84b61bdd783359ec51000d030b6c25892548447f1e0edeb5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -161054,24 +162430,6 @@ self: {
      }) {};
 
   "psqueues" = callPackage
-    ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit
-     , QuickCheck, tagged, test-framework, test-framework-hunit
-     , test-framework-quickcheck2
-     }:
-     mkDerivation {
-       pname = "psqueues";
-       version = "0.2.1.0";
-       sha256 = "54999bb6f718533771a35e3e333b41ac1ab355eb034281c8607217b53fb6891d";
-       libraryHaskellDepends = [ base deepseq ghc-prim hashable ];
-       testHaskellDepends = [
-         array base deepseq ghc-prim hashable HUnit QuickCheck tagged
-         test-framework test-framework-hunit test-framework-quickcheck2
-       ];
-       description = "Pure priority search queues";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "psqueues_0_2_2_0" = callPackage
     ({ mkDerivation, array, base, deepseq, ghc-prim, hashable, HUnit
      , QuickCheck, tagged, test-framework, test-framework-hunit
      , test-framework-quickcheck2
@@ -161087,7 +162445,6 @@ self: {
        ];
        description = "Pure priority search queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pub" = callPackage
@@ -161130,8 +162487,8 @@ self: {
     ({ mkDerivation, base, filepath, hspec, template-haskell }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20160201";
-       sha256 = "86aed1a05038b9f95038682bd8621d0bcad1cc745d0bb761636a9639ac6247e1";
+       version = "0.20160209";
+       sha256 = "60d856fc6d6d82ff96d742e253ecf638f625c4693b7d8be250501e9f334a2246";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
@@ -161913,7 +163270,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "pusher-http-haskell" = callPackage
+  "pusher-http-haskell_0_3_0_1" = callPackage
     ({ mkDerivation, aeson, base, base16-bytestring, bytestring
      , containers, cryptohash, hashable, hspec, http-client, http-types
      , mtl, QuickCheck, snap-core, snap-server, text, time, transformers
@@ -161941,6 +163298,37 @@ self: {
        homepage = "https://github.com/pusher-community/pusher-http-haskell";
        description = "Haskell client library for the Pusher HTTP API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "pusher-http-haskell" = callPackage
+    ({ mkDerivation, aeson, base, base16-bytestring, bytestring
+     , containers, cryptohash, hashable, hspec, http-client, http-types
+     , mtl, QuickCheck, snap-core, snap-server, text, time, transformers
+     , unordered-containers, yaml
+     }:
+     mkDerivation {
+       pname = "pusher-http-haskell";
+       version = "0.3.0.2";
+       sha256 = "72ce2a76a802d6c866ea0630fde7711b0298929113609998e0ec1dd733fb8098";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base16-bytestring bytestring cryptohash hashable
+         http-client http-types mtl QuickCheck text time transformers
+         unordered-containers
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers mtl snap-core snap-server text
+         transformers unordered-containers yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec http-client http-types mtl QuickCheck
+         text transformers unordered-containers
+       ];
+       homepage = "https://github.com/pusher-community/pusher-http-haskell";
+       description = "Haskell client library for the Pusher HTTP API";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "pushme" = callPackage
@@ -162612,6 +164000,7 @@ self: {
          array base bytestring containers hashable old-time QuickCheck text
          time unordered-containers
        ];
+       jailbreak = true;
        homepage = "https://github.com/aslatter/qc-instances";
        description = "Common quickcheck instances";
        license = stdenv.lib.licenses.bsd3;
@@ -163339,11 +164728,33 @@ self: {
          base bytestring containers lens QuickCheck rainbow tasty
          tasty-quickcheck text
        ];
+       doCheck = false;
        homepage = "http://www.github.com/massysett/rainbox";
        description = "Two-dimensional box pretty printing, with colors";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "rainbox_0_18_0_6" = callPackage
+    ({ mkDerivation, base, bytestring, containers, lens, QuickCheck
+     , rainbow, tasty, tasty-quickcheck, text
+     }:
+     mkDerivation {
+       pname = "rainbox";
+       version = "0.18.0.6";
+       sha256 = "8197c0b75410c760777a7e9e46632de792b5539d2ac1e4fdd9259dbb7cb3ac9b";
+       libraryHaskellDepends = [
+         base bytestring containers lens rainbow text
+       ];
+       testHaskellDepends = [
+         base bytestring containers lens QuickCheck rainbow tasty
+         tasty-quickcheck text
+       ];
+       homepage = "http://www.github.com/massysett/rainbox";
+       description = "Two-dimensional box pretty printing, with colors";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "rake" = callPackage
     ({ mkDerivation, base, containers, text }:
      mkDerivation {
@@ -163635,6 +165046,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "random-tree" = callPackage
+    ({ mkDerivation, base, containers, lens, MonadRandom, mtl, random
+     , random-shuffle, transformers, tree-fun
+     }:
+     mkDerivation {
+       pname = "random-tree";
+       version = "0.6.0.5";
+       sha256 = "2b604e7ce184e2c877fac63dbac1df3060cdc023427b8eb5844106a826591cc2";
+       libraryHaskellDepends = [
+         base containers lens MonadRandom mtl random random-shuffle
+         transformers tree-fun
+       ];
+       description = "Create random trees";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "random-variates" = callPackage
     ({ mkDerivation, base, containers, directory, erf, HUnit, lens, mtl
      , random, reinterpret-cast
@@ -164364,10 +165791,8 @@ self: {
     ({ mkDerivation, base, reactive-banana, sdl2 }:
      mkDerivation {
        pname = "reactive-banana-sdl2";
-       version = "0.1.0.0";
-       sha256 = "605dd7df6814f82b69d2ba0aa51029417659c6ab560c869c7598a06615905942";
-       revision = "1";
-       editedCabalFile = "3c82ab987be2ab12330aa5863b3c80f5022525a5fb7d65cff6b5de47288b9ae7";
+       version = "0.1.1.0";
+       sha256 = "87981c16e9ec48e898b62a121b7e60fa4ed1b977391770d21a2ad506b68e1e95";
        libraryHaskellDepends = [ base reactive-banana sdl2 ];
        testHaskellDepends = [ base ];
        homepage = "http://github.com/cies/reactive-banana-sdl2#readme";
@@ -164645,8 +166070,8 @@ self: {
      }:
      mkDerivation {
        pname = "rebase";
-       version = "0.4.1";
-       sha256 = "7c5bbc55a5653b9f456f1369616e22d135f667441d8ea160a8b11e02549e5abe";
+       version = "0.4.2";
+       sha256 = "185cb219a41c323be3b850efae9b8a95f9b5b4abe3934cad85238c5f0023c8c7";
        libraryHaskellDepends = [
          base base-prelude bifunctors bytestring containers contravariant
          contravariant-extras deepseq dlist either hashable mtl profunctors
@@ -165319,8 +166744,8 @@ self: {
     ({ mkDerivation, base, base-prelude, template-haskell }:
      mkDerivation {
        pname = "refined";
-       version = "0.1.1.0";
-       sha256 = "0390684ce0d977c49b921ed477bcba5cb7c74e09130de843c53c93f4d4cee0ae";
+       version = "0.1.2";
+       sha256 = "3e43f8a0e4f141eef379920c37a04e351d6bcf8ed57f8143c48f2cc91e5c18f8";
        libraryHaskellDepends = [ base base-prelude template-haskell ];
        homepage = "https://github.com/nikita-volkov/refined";
        description = "Refinement types with static and runtime checking";
@@ -165421,6 +166846,19 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "reflection_2_1_2" = callPackage
+    ({ mkDerivation, base, template-haskell }:
+     mkDerivation {
+       pname = "reflection";
+       version = "2.1.2";
+       sha256 = "a909882c04b24016bedb85587c09f23cf06bad71a2b1f7e781e89abaa6023c39";
+       libraryHaskellDepends = [ base template-haskell ];
+       homepage = "http://github.com/ekmett/reflection";
+       description = "Reifies arbitrary terms into types that can be reflected back into terms";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "reflection-extras" = callPackage
     ({ mkDerivation, aeson, base, constraints, lens, reflection, tagged
      }:
@@ -165540,16 +166978,16 @@ self: {
      }) {};
 
   "reflex-gloss" = callPackage
-    ({ mkDerivation, base, dependent-sum, gloss, reflex, transformers
+    ({ mkDerivation, base, dependent-sum, gloss, mtl, reflex
+     , transformers
      }:
      mkDerivation {
        pname = "reflex-gloss";
-       version = "0.1.0.2";
-       sha256 = "cfd9f09e0ff736d60fe00202295dc2ee24748003d09abcd76baa4fe37cc64ba3";
+       version = "0.2";
+       sha256 = "e8bcebe49b351de22a6cbf6caec64465b449bc4212074de1a867876151837ab6";
        libraryHaskellDepends = [
-         base dependent-sum gloss reflex transformers
+         base dependent-sum gloss mtl reflex transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/reflex-frp/reflex-gloss";
        description = "An reflex interface for gloss";
        license = stdenv.lib.licenses.bsd3;
@@ -165749,7 +167187,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "regex-applicative-text" = callPackage
+  "regex-applicative-text_0_1_0_0" = callPackage
     ({ mkDerivation, base, regex-applicative, text }:
      mkDerivation {
        pname = "regex-applicative-text";
@@ -165761,6 +167199,19 @@ self: {
        homepage = "https://github.com/phadej/regex-applicative-text#readme";
        description = "regex-applicative on text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "regex-applicative-text" = callPackage
+    ({ mkDerivation, base, regex-applicative, text }:
+     mkDerivation {
+       pname = "regex-applicative-text";
+       version = "0.1.0.1";
+       sha256 = "b093051f80865d257da2ded8ad1b566927b01b3d2f86d41da2ffee4a26c4e2d9";
+       libraryHaskellDepends = [ base regex-applicative text ];
+       homepage = "https://github.com/phadej/regex-applicative-text#readme";
+       description = "regex-applicative on text";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "regex-base" = callPackage
@@ -166521,8 +167972,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.8.0.4";
-       sha256 = "0a2b8f3739cfeaf19c2b0dca4f321c2d1fbbedc007f241cfbf85142e25f03eb5";
+       version = "0.8.0.5";
+       sha256 = "1dae8b11ade66c4be1f1755fdef7483ba569f1eb900176cd96bc48d1f904cbd7";
        libraryHaskellDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text time time-locale-compat
@@ -166543,8 +167994,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query-HDBC";
-       version = "0.5.0.0";
-       sha256 = "b6d3fb55175eab8d816b15628a24fcf401a768122a8d3db02141605f054ff789";
+       version = "0.6.0.0";
+       sha256 = "629eb2f798603e5890ac3156fc0396276017e9eb94ce3c5a2f5f2dc1c1352541";
        libraryHaskellDepends = [
          base containers convertible dlist HDBC HDBC-session names-th
          persistable-record relational-query relational-schemas
@@ -166690,6 +168141,64 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "remote-json" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, containers
+     , exceptions, fail, natural-transformation, QuickCheck
+     , quickcheck-instances, random, remote-monad, scientific, tasty
+     , tasty-quickcheck, text, transformers, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "remote-json";
+       version = "0.2";
+       sha256 = "626c1a9dc5287f538d47eba6d727a2c0f4d99ec9d07e0d1679c307b028025a8a";
+       libraryHaskellDepends = [
+         aeson base exceptions fail natural-transformation remote-monad text
+         transformers unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson attoparsec base bytestring containers natural-transformation
+         QuickCheck quickcheck-instances random scientific tasty
+         tasty-quickcheck text
+       ];
+       description = "Remote Monad implementation of the JSON RPC protocol";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "remote-json-client" = callPackage
+    ({ mkDerivation, aeson, base, lens, natural-transformation
+     , remote-json, wreq
+     }:
+     mkDerivation {
+       pname = "remote-json-client";
+       version = "0.2";
+       sha256 = "7d8fe9df424dae251b602073d618506f22a4f8e6bde5e0a39cdb6fdb7d065953";
+       revision = "1";
+       editedCabalFile = "dcaba53dfe4c923ab531dbcd8ea45bb89bbe57a06f23b431477c505a7101085f";
+       libraryHaskellDepends = [
+         aeson base lens natural-transformation remote-json wreq
+       ];
+       description = "Web client wrapper for remote-json";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "remote-json-server" = callPackage
+    ({ mkDerivation, aeson, base, data-default-class
+     , natural-transformation, remote-json, scotty, text, transformers
+     , warp
+     }:
+     mkDerivation {
+       pname = "remote-json-server";
+       version = "0.2.0.1";
+       sha256 = "69d73e270668433a9526948bf24ca7cc3e2076d8e323310c830c1326232c2553";
+       libraryHaskellDepends = [
+         aeson base data-default-class natural-transformation remote-json
+         scotty text transformers warp
+       ];
+       description = "Web server wrapper for remote-json";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "remote-monad" = callPackage
     ({ mkDerivation, base, containers, natural-transformation
      , QuickCheck, quickcheck-instances, tasty, tasty-quickcheck
@@ -166697,14 +168206,16 @@ self: {
      }:
      mkDerivation {
        pname = "remote-monad";
-       version = "0.1.0.1";
-       sha256 = "e52a1a304d507169be144abbff8c7e28b08a36e7c05f296dbcd4be8a5fcd53e1";
+       version = "0.2";
+       sha256 = "94c8fcb1c9c4088931cc960c39070778e571f195ad7ce45a12341e6f314a3f63";
+       revision = "1";
+       editedCabalFile = "a2439b1ff68620c1004e36420104d96bb8942395190607f98372f2afec20b31f";
        libraryHaskellDepends = [
          base natural-transformation transformers
        ];
        testHaskellDepends = [
-         base containers QuickCheck quickcheck-instances tasty
-         tasty-quickcheck
+         base containers natural-transformation QuickCheck
+         quickcheck-instances tasty tasty-quickcheck
        ];
        description = "An parametrizable Remote Monad, and parametrizable Applicative Functor";
        license = stdenv.lib.licenses.bsd3;
@@ -167719,6 +169230,7 @@ self: {
          transformers transformers-base transformers-compat
        ];
        testHaskellDepends = [ base hspec lifted-base transformers ];
+       jailbreak = true;
        homepage = "http://github.com/snoyberg/conduit";
        description = "Deterministic allocation and freeing of scarce resources";
        license = stdenv.lib.licenses.bsd3;
@@ -167739,6 +169251,7 @@ self: {
          transformers transformers-base transformers-compat
        ];
        testHaskellDepends = [ base hspec lifted-base transformers ];
+       jailbreak = true;
        homepage = "http://github.com/snoyberg/conduit";
        description = "Deterministic allocation and freeing of scarce resources";
        license = stdenv.lib.licenses.bsd3;
@@ -167759,6 +169272,7 @@ self: {
          transformers transformers-base transformers-compat
        ];
        testHaskellDepends = [ base hspec lifted-base transformers ];
+       jailbreak = true;
        homepage = "http://github.com/snoyberg/conduit";
        description = "Deterministic allocation and freeing of scarce resources";
        license = stdenv.lib.licenses.bsd3;
@@ -167779,6 +169293,7 @@ self: {
          transformers transformers-base transformers-compat
        ];
        testHaskellDepends = [ base hspec lifted-base transformers ];
+       jailbreak = true;
        homepage = "http://github.com/snoyberg/conduit";
        description = "Deterministic allocation and freeing of scarce resources";
        license = stdenv.lib.licenses.bsd3;
@@ -167965,6 +169480,7 @@ self: {
          monad-control mtl resourcet rest-types tostring transformers
          transformers-base transformers-compat uri-encode utf8-string
        ];
+       jailbreak = true;
        description = "Utility library for use in generated API client libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -167987,6 +169503,7 @@ self: {
          monad-control mtl resourcet rest-types tostring transformers
          transformers-base transformers-compat uri-encode utf8-string
        ];
+       jailbreak = true;
        description = "Utility library for use in generated API client libraries";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -168176,6 +169693,8 @@ self: {
        pname = "rest-core";
        version = "0.38";
        sha256 = "b491b734c2d74729f427ca02370f12b839dd92347fea44b5fb66c66a39b11cec";
+       revision = "1";
+       editedCabalFile = "edcbe69d770149b6e3aeb47cc7ae2a9f4e589fa3cd1c928f1538504ac24b8b2c";
        libraryHaskellDepends = [
          aeson aeson-utils base base-compat bytestring case-insensitive
          errors fclabels hxt hxt-pickle-utils json-schema mtl mtl-compat
@@ -168597,6 +170116,8 @@ self: {
        pname = "rest-gen";
        version = "0.19.0.2";
        sha256 = "12caa70e7b29b073cb0e066cf7d5c590b13e0fb5b2f924944cd1ae5217c79330";
+       revision = "1";
+       editedCabalFile = "afca13957f1b186ba5922659d6275cdf5c8d49ec2bca6f2319d89c213afa5c4d";
        libraryHaskellDepends = [
          aeson base base-compat blaze-html Cabal code-builder directory
          fclabels filepath hashable haskell-src-exts HStringTemplate hxt
@@ -168838,8 +170359,8 @@ self: {
        pname = "rest-stringmap";
        version = "0.2.0.6";
        sha256 = "66e5a32f04cfcf9826296b3c053c22caa745fd890ccc6ea9199c34529507524a";
-       revision = "1";
-       editedCabalFile = "a814dde006adf0a6f3b0c98956060b4e9759b47da046ca6faaa8eb0e3272e246";
+       revision = "2";
+       editedCabalFile = "286ce136699cc8dffad47ead93fdaf0538e465edafde510ff7697f96e470ea1d";
        libraryHaskellDepends = [
          aeson base containers hashable hxt json-schema tostring
          unordered-containers
@@ -168894,8 +170415,8 @@ self: {
        pname = "rest-types";
        version = "1.14.0.1";
        sha256 = "645516a501f3f6d928c04b6022b111bd5411f301572f4de6b96ef7b15e480b32";
-       revision = "1";
-       editedCabalFile = "d3f5642df902f6d3a393839b8e365481fb1b16f4ed945290f85e2c9cda253794";
+       revision = "2";
+       editedCabalFile = "ff6c3027d4c2f87d78868a23bfbda807237c2d31b6caae9399f1de159a6e0ac1";
        libraryHaskellDepends = [
          aeson base case-insensitive generic-aeson generic-xmlpickler hxt
          json-schema rest-stringmap text uuid
@@ -169053,7 +170574,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rethinkdb" = callPackage
+  "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
@@ -169075,6 +170596,31 @@ self: {
        homepage = "http://github.com/atnnn/haskell-rethinkdb";
        description = "A driver for RethinkDB 2.1";
        license = stdenv.lib.licenses.asl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "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 {
+       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 ];
+       doCheck = false;
+       homepage = "http://github.com/atnnn/haskell-rethinkdb";
+       description = "A driver for RethinkDB 2.2";
+       license = stdenv.lib.licenses.asl20;
      }) {};
 
   "rethinkdb-client-driver_0_0_13" = callPackage
@@ -171517,6 +173063,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "sampling" = callPackage
+    ({ mkDerivation, base, foldl, mwc-random, primitive, vector }:
+     mkDerivation {
+       pname = "sampling";
+       version = "0.1.1";
+       sha256 = "a1282010e483959c81cf9c018aac5560f2429cc9826e0e79452bc19ea484f19d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base foldl mwc-random primitive vector ];
+       executableHaskellDepends = [ base ];
+       homepage = "https://github.com/jtobin/sampling";
+       description = "Sample values from collections";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "samtools" = callPackage
     ({ mkDerivation, base, bytestring, c2hs, filepath, process, seqloc
      , vector, zlib
@@ -172852,6 +174413,7 @@ self: {
          async base data-default-class directory hspec hspec-wai http-types
          lifted-base network text wai
        ];
+       jailbreak = true;
        homepage = "https://github.com/scotty-web/scotty";
        description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp";
        license = stdenv.lib.licenses.bsd3;
@@ -172869,6 +174431,8 @@ self: {
        pname = "scotty";
        version = "0.11.0";
        sha256 = "892203c937ccf1279f5005ddb78ebea84629b80687a1e38fc118b38011a386ed";
+       revision = "1";
+       editedCabalFile = "2e46f8dbc3078a329ac2d6662f80aa48a7c0517d02978812b0d1293c8bc050dc";
        libraryHaskellDepends = [
          aeson base blaze-builder bytestring case-insensitive
          data-default-class fail http-types monad-control mtl nats network
@@ -173600,8 +175164,8 @@ self: {
      }:
      mkDerivation {
        pname = "secp256k1";
-       version = "0.4.2";
-       sha256 = "8033fcd488494994f79bb129ffd70a6d2233d647e010a352a7e7dca8ce6072e6";
+       version = "0.4.3";
+       sha256 = "fb4d0187d3e6189a933b95b5f884c9545b06c26c637af239ca9ceff98b2335a5";
        libraryHaskellDepends = [
          base base16-bytestring binary bytestring entropy largeword mtl
          QuickCheck string-conversions
@@ -173612,8 +175176,8 @@ self: {
          test-framework-hunit test-framework-quickcheck2
        ];
        homepage = "http://github.com/haskoin/secp256k1#readme";
-       description = "secp256k1 bindings for Haskell";
-       license = stdenv.lib.licenses.mit;
+       description = "Bindings for secp256k1 library from Bitcoin Core";
+       license = stdenv.lib.licenses.publicDomain;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -174001,6 +175565,7 @@ self: {
          distributive semigroups tagged transformers transformers-compat
        ];
        testHaskellDepends = [ base directory doctest filepath ];
+       jailbreak = true;
        doCheck = false;
        homepage = "http://github.com/ekmett/semigroupoids";
        description = "Semigroupoids: Category sans id";
@@ -175865,28 +177430,6 @@ self: {
      }) {};
 
   "servant-swagger" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, bytestring, doctest, Glob
-     , hspec, http-media, lens, QuickCheck, servant, swagger2, text
-     , time, unordered-containers
-     }:
-     mkDerivation {
-       pname = "servant-swagger";
-       version = "1.0";
-       sha256 = "cc9bc89bd83c373d1a31ce7ba603104f302db90b96cd93f45029b125f59e668e";
-       libraryHaskellDepends = [
-         aeson base bytestring hspec http-media lens QuickCheck servant
-         swagger2 text unordered-containers
-       ];
-       testHaskellDepends = [
-         aeson aeson-qq base doctest Glob hspec lens QuickCheck servant
-         swagger2 text time
-       ];
-       homepage = "https://github.com/haskell-servant/servant-swagger";
-       description = "Generate Swagger specification for your servant API";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "servant-swagger_1_0_3" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, bytestring, doctest, Glob
      , hspec, http-media, lens, QuickCheck, servant, swagger2, text
      , time, unordered-containers
@@ -175903,11 +177446,9 @@ self: {
          aeson aeson-qq base doctest Glob hspec lens QuickCheck servant
          swagger2 text time
        ];
-       jailbreak = true;
        homepage = "https://github.com/haskell-servant/servant-swagger";
        description = "Generate Swagger specification for your servant API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-yaml" = callPackage
@@ -179901,6 +181442,28 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "slave-thread_1_0_1" = callPackage
+    ({ mkDerivation, base, base-prelude, HTF, list-t, mmorph
+     , partial-handler, QuickCheck, quickcheck-instances, SafeSemaphore
+     , stm-containers, transformers
+     }:
+     mkDerivation {
+       pname = "slave-thread";
+       version = "1.0.1";
+       sha256 = "c1396bd77b21997e5d1e86b212a08b7d453030374b8baddef51593922337d755";
+       libraryHaskellDepends = [
+         base base-prelude list-t mmorph partial-handler stm-containers
+         transformers
+       ];
+       testHaskellDepends = [
+         base base-prelude HTF QuickCheck quickcheck-instances SafeSemaphore
+       ];
+       homepage = "https://github.com/nikita-volkov/slave-thread";
+       description = "A principal solution to ghost threads and silent exceptions";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "slice-cpp-gen" = callPackage
     ({ mkDerivation, base, bytestring, cmdargs, containers, directory
      , filepath, language-slice, MissingH
@@ -180296,7 +181859,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "smoothie" = callPackage
+  "smoothie_0_4_2_1" = callPackage
     ({ mkDerivation, aeson, base, linear, text, vector }:
      mkDerivation {
        pname = "smoothie";
@@ -180306,6 +181869,19 @@ self: {
        homepage = "https://github.com/phaazon/smoothie";
        description = "Smooth curves via several interpolation modes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "smoothie" = callPackage
+    ({ mkDerivation, aeson, base, linear, text, vector }:
+     mkDerivation {
+       pname = "smoothie";
+       version = "0.4.2.2";
+       sha256 = "be4f9b24ca5a1dc99165b2a1f5484b48b6baf16e5700514689875dbb2a0e4133";
+       libraryHaskellDepends = [ aeson base linear text vector ];
+       homepage = "https://github.com/phaazon/smoothie";
+       description = "Smooth curves via several interpolation modes";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "smsaero" = callPackage
@@ -181484,8 +183060,8 @@ self: {
        pname = "snaplet-fay";
        version = "0.3.3.13";
        sha256 = "39810748b7177b45a0fab785e48ac497d81587e48dde9dc8ad75e8d704bdda3f";
-       revision = "1";
-       editedCabalFile = "7e46253eccd3c819ebf3700a5398e9405ce21069bc5b8f92a29550cf8119e47a";
+       revision = "2";
+       editedCabalFile = "43c3a484e0e34f13bf2f372850d33b98de9d8057fd33e9d79be0fcc0a5013559";
        libraryHaskellDepends = [
          aeson base bytestring configurator directory fay filepath mtl snap
          snap-core transformers
@@ -182499,7 +184075,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "socket-io" = callPackage
+  "socket-io_1_3_4" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, engine-io
      , mtl, stm, text, transformers, unordered-containers, vector
      }:
@@ -182513,6 +184089,23 @@ self: {
        ];
        homepage = "http://github.com/ocharles/engine.io";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "socket-io" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, bytestring, engine-io
+     , mtl, stm, text, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "socket-io";
+       version = "1.3.5";
+       sha256 = "1604797a7095ef26b733cdff8922bf373fac551ab157c9756b031d191f90903f";
+       libraryHaskellDepends = [
+         aeson attoparsec base bytestring engine-io mtl stm text
+         transformers unordered-containers vector
+       ];
+       homepage = "http://github.com/ocharles/engine.io";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "socket-sctp" = callPackage
@@ -182846,8 +184439,8 @@ self: {
      }:
      mkDerivation {
        pname = "sox";
-       version = "0.2.2.5";
-       sha256 = "36250918961d51c7b4a3721cee264c8a8c678da07244100b8a0be2c954ff4ca6";
+       version = "0.2.2.6";
+       sha256 = "d4f486e14d67bc7f714d14ac7a1605166962a8af1405bc978a4eb59385f9fb12";
        libraryHaskellDepends = [
          base containers explicit-exception extensible-exceptions process
          sample-frame transformers unix utility-ht
@@ -184938,8 +186531,8 @@ self: {
        pname = "stack";
        version = "1.0.2";
        sha256 = "4227f4c4016e5008755a974cbf04a9772319d87d1764da32228e74f13153c5c4";
-       revision = "1";
-       editedCabalFile = "d789ed4dceed4c226571d0f5f5e6d2d5602a6b36b7f4579b78352d330934e3ab";
+       revision = "3";
+       editedCabalFile = "6843a554b3987bb6a0277f59a70e6ed49ff515da73623f97949520877736ef04";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -185424,7 +187017,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stackage-curator" = callPackage
+  "stackage-curator_0_13_0" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
      , base, base16-bytestring, binary, binary-tagged, blaze-html
      , byteable, bytestring, Cabal, classy-prelude-conduit, conduit
@@ -185471,7 +187064,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stackage-curator_0_13_1" = callPackage
+  "stackage-curator" = callPackage
     ({ mkDerivation, aeson, amazonka, amazonka-core, amazonka-s3, async
      , base, base16-bytestring, binary, binary-tagged, blaze-html
      , byteable, bytestring, Cabal, classy-prelude-conduit, conduit
@@ -186019,6 +187612,7 @@ self: {
        libraryHaskellDepends = [
          base mtl transformers transformers-compat
        ];
+       jailbreak = true;
        description = "Simple State-like monad transformer with saveable and restorable state";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -186838,6 +188432,29 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "stm-containers_0_2_10" = callPackage
+    ({ mkDerivation, base-prelude, focus, free, hashable, HTF, list-t
+     , loch-th, mtl, mtl-prelude, placeholders, primitive, QuickCheck
+     , transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "stm-containers";
+       version = "0.2.10";
+       sha256 = "1dd724fda2456279d2bf70b8666eb1f87604776932b452f3b097236ad1533e6d";
+       libraryHaskellDepends = [
+         base-prelude focus hashable list-t loch-th placeholders primitive
+         transformers
+       ];
+       testHaskellDepends = [
+         base-prelude focus free hashable HTF list-t loch-th mtl mtl-prelude
+         placeholders primitive QuickCheck transformers unordered-containers
+       ];
+       homepage = "https://github.com/nikita-volkov/stm-containers";
+       description = "Containers for STM";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "stm-delay" = callPackage
     ({ mkDerivation, base, stm }:
      mkDerivation {
@@ -187615,7 +189232,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "streaming-commons" = callPackage
+  "streaming-commons_0_1_15" = callPackage
     ({ mkDerivation, array, async, base, blaze-builder, bytestring
      , deepseq, directory, hspec, network, process, QuickCheck, random
      , stm, text, transformers, unix, zlib
@@ -187635,6 +189252,29 @@ self: {
        homepage = "https://github.com/fpco/streaming-commons";
        description = "Common lower-level functions needed by various streaming data libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "streaming-commons" = callPackage
+    ({ mkDerivation, array, async, base, blaze-builder, bytestring
+     , deepseq, directory, hspec, network, process, QuickCheck, random
+     , stm, text, transformers, unix, zlib
+     }:
+     mkDerivation {
+       pname = "streaming-commons";
+       version = "0.1.15.1";
+       sha256 = "af3b07d1022f263b1e0f95ba15697d87d55afc1cf0933c9b16fd37a687b8cacb";
+       libraryHaskellDepends = [
+         array async base blaze-builder bytestring directory network process
+         random stm text transformers unix zlib
+       ];
+       testHaskellDepends = [
+         array async base blaze-builder bytestring deepseq hspec network
+         QuickCheck text unix zlib
+       ];
+       homepage = "https://github.com/fpco/streaming-commons";
+       description = "Common lower-level functions needed by various streaming data libraries";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "streaming-histogram" = callPackage
@@ -187666,6 +189306,7 @@ self: {
          json-stream mtl pipes resourcet streaming streaming-bytestring
          transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/michaelt/streaming-utils";
        description = "http, attoparsec, pipes and conduit utilities for the streaming libraries";
        license = stdenv.lib.licenses.bsd3;
@@ -188833,22 +190474,6 @@ self: {
      }) {};
 
   "success" = callPackage
-    ({ mkDerivation, base, monad-control, mtl, transformers
-     , transformers-base
-     }:
-     mkDerivation {
-       pname = "success";
-       version = "0.2.5.1";
-       sha256 = "7efbd9b238a6741ab70f5b021c5ebc95369bf4de00ab88220eecb30b3df86bec";
-       libraryHaskellDepends = [
-         base monad-control mtl transformers transformers-base
-       ];
-       homepage = "https://github.com/nikita-volkov/success";
-       description = "A version of Either specialised for encoding of success or failure";
-       license = stdenv.lib.licenses.mit;
-     }) {};
-
-  "success_0_2_6" = callPackage
     ({ mkDerivation, base, monad-control, mtl, transformers
      , transformers-base
      }:
@@ -188862,7 +190487,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/success";
        description = "A version of Either specialised for encoding of success or failure";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "suffixarray" = callPackage
@@ -189243,6 +190867,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "svg-tree_0_3_2_2" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers
+     , JuicyPixels, lens, linear, mtl, scientific, text, transformers
+     , vector, xml
+     }:
+     mkDerivation {
+       pname = "svg-tree";
+       version = "0.3.2.2";
+       sha256 = "f1dfee9879672dc9ad3a4de3850ce9d120e45f33ca02642da5cc15bd5d9dc85a";
+       libraryHaskellDepends = [
+         attoparsec base bytestring containers JuicyPixels lens linear mtl
+         scientific text transformers vector xml
+       ];
+       description = "SVG file loader and serializer";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "svg2q" = callPackage
     ({ mkDerivation, base, haskell98, language-c, pretty, svgutils, syb
      , xml
@@ -189425,31 +191067,6 @@ self: {
      }) {};
 
   "swagger2" = callPackage
-    ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers
-     , doctest, Glob, hashable, hspec, http-media, HUnit, lens, mtl
-     , network, QuickCheck, scientific, template-haskell, text, time
-     , transformers, unordered-containers, vector
-     }:
-     mkDerivation {
-       pname = "swagger2";
-       version = "2.0";
-       sha256 = "bbd6d2f3287e619ec9caa6e1c1628a5fd0f71ac311e451d87456d00c41a8f2d0";
-       libraryHaskellDepends = [
-         aeson base base-compat containers hashable http-media lens mtl
-         network scientific template-haskell text time transformers
-         unordered-containers vector
-       ];
-       testHaskellDepends = [
-         aeson aeson-qq base base-compat containers doctest Glob hashable
-         hspec HUnit lens mtl QuickCheck text time unordered-containers
-         vector
-       ];
-       homepage = "https://github.com/GetShopTV/swagger2";
-       description = "Swagger 2.0 data model";
-       license = stdenv.lib.licenses.bsd3;
-     }) {};
-
-  "swagger2_2_0_1" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, base-compat, containers
      , doctest, Glob, hashable, hspec, http-media, HUnit, lens, mtl
      , network, QuickCheck, scientific, template-haskell, text, time
@@ -189472,7 +191089,6 @@ self: {
        homepage = "https://github.com/GetShopTV/swagger2";
        description = "Swagger 2.0 data model";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swapper" = callPackage
@@ -191036,14 +192652,16 @@ self: {
      }:
      mkDerivation {
        pname = "tagchup";
-       version = "0.4.0.4";
-       sha256 = "7700c1ded7d11945b9de3d6e5651fcef3ef5d39317dc332ad7c87b37ceb76b90";
+       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";
        license = "GPL";
@@ -193590,6 +195208,7 @@ self: {
          hspec-expectations-lifted mtl process QuickCheck regex-posix
          template-haskell text transformers transformers-compat unix
        ];
+       jailbreak = true;
        homepage = "http://gree.github.io/haskell-test-sandbox/";
        description = "Sandbox for system tests";
        license = stdenv.lib.licenses.bsd3;
@@ -194031,7 +195650,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "texmath" = callPackage
+  "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
@@ -194053,9 +195672,10 @@ self: {
        homepage = "http://github.com/jgm/texmath";
        description = "Conversion between formats used to represent mathematics";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "texmath_0_8_4_2" = callPackage
+  "texmath" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , mtl, network-uri, pandoc-types, parsec, process, split, syb
      , temporary, text, utf8-string, xml
@@ -194077,7 +195697,6 @@ self: {
        homepage = "http://github.com/jgm/texmath";
        description = "Conversion between formats used to represent mathematics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "texrunner" = callPackage
@@ -194654,7 +196273,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "text-show" = callPackage
+  "text-show_2_1_2" = callPackage
     ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
      , bytestring, bytestring-builder, containers, generic-deriving
      , ghc-prim, hspec, integer-gmp, nats, QuickCheck
@@ -194678,12 +196297,14 @@ self: {
          quickcheck-instances tagged text transformers transformers-compat
          void
        ];
+       jailbreak = true;
        homepage = "https://github.com/RyanGlScott/text-show";
        description = "Efficient conversion of values into Text";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "text-show_3" = callPackage
+  "text-show" = callPackage
     ({ mkDerivation, array, base, base-compat, base-orphans, bifunctors
      , bytestring, bytestring-builder, containers, generic-deriving
      , ghc-prim, hspec, integer-gmp, nats, QuickCheck
@@ -194706,11 +196327,10 @@ self: {
          integer-gmp nats QuickCheck quickcheck-instances semigroups tagged
          template-haskell text transformers transformers-compat void
        ];
-       jailbreak = true;
+       doHaddock = false;
        homepage = "https://github.com/RyanGlScott/text-show";
        description = "Efficient conversion of values into Text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-show-instances" = callPackage
@@ -194740,7 +196360,6 @@ self: {
          transformers transformers-compat unix unordered-containers vector
          xhtml
        ];
-       jailbreak = true;
        homepage = "https://github.com/RyanGlScott/text-show-instances";
        description = "Additional instances for text-show";
        license = stdenv.lib.licenses.bsd3;
@@ -195240,6 +196859,8 @@ self: {
        pname = "th-extras";
        version = "0.0.0.2";
        sha256 = "94212defd4d76bf27eddfb85c1a49c1ef3a73d980ea00b11d69a612ba5705897";
+       revision = "1";
+       editedCabalFile = "d9dfbdaeda88312758fd97e43f54d2d83d49039ee1bcfa94e38d87b215dedf67";
        libraryHaskellDepends = [ base syb template-haskell ];
        homepage = "https://github.com/mokus0/th-extras";
        description = "A grab bag of functions for use with Template Haskell";
@@ -195994,8 +197615,8 @@ self: {
      }:
      mkDerivation {
        pname = "threepenny-gui";
-       version = "0.6.0.5";
-       sha256 = "d64c7cd00248efda561642cf8f815b486a9dcbabc6bc17d4108423eb8cb10aa0";
+       version = "0.6.0.6";
+       sha256 = "f275e22d52d419f97feacbc0dbd4a99b32992910bf6427a0a1798b6146a2f94d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -197697,6 +199318,8 @@ self: {
        pname = "token-bucket";
        version = "0.1.0.1";
        sha256 = "312609c0037271b1091f23c2edf467e9449edca5bbed0cfb45c2c93c1bee6ad0";
+       revision = "1";
+       editedCabalFile = "41232cfabd4ba8e217d2b78f0f897d5a245756cf525c9a84c5ba2c695b533576";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base time ];
        homepage = "https://github.com/hvr/token-bucket";
@@ -198273,7 +199896,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "transformers-compat" = callPackage
+  "transformers-compat_0_4_0_4" = callPackage
     ({ mkDerivation, base, transformers }:
      mkDerivation {
        pname = "transformers-compat";
@@ -198284,9 +199907,10 @@ self: {
        homepage = "http://github.com/ekmett/transformers-compat/";
        description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "transformers-compat_0_5_1_4" = callPackage
+  "transformers-compat" = callPackage
     ({ mkDerivation, base, ghc-prim, transformers }:
      mkDerivation {
        pname = "transformers-compat";
@@ -198296,7 +199920,6 @@ self: {
        homepage = "http://github.com/ekmett/transformers-compat/";
        description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "transformers-compose" = callPackage
@@ -198521,6 +200144,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "tree-fun" = callPackage
+    ({ mkDerivation, base, containers, mtl }:
+     mkDerivation {
+       pname = "tree-fun";
+       version = "0.8.1.0";
+       sha256 = "2ae925f198e9700dedbf809c2b77086fef32f58b4a4adb6c398dca49f4d56f1f";
+       libraryHaskellDepends = [ base containers mtl ];
+       description = "Library for functions pertaining to tree exploration and manipulation";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "tree-monad" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -199146,8 +200780,8 @@ self: {
      }:
      mkDerivation {
        pname = "tttool";
-       version = "1.6";
-       sha256 = "a2e6a9ad43ec7a0b6758d9fcd639d9c2e57d39c6c25427a888876d850985efd0";
+       version = "1.6.0.1";
+       sha256 = "52d9d4e28ce1e1a81e81ff2b8fe9a2a21d0b1b74ba172777c654d0c1e608a23f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -203538,8 +205172,8 @@ self: {
     ({ mkDerivation, ansi-terminal, base }:
      mkDerivation {
        pname = "uu-cco";
-       version = "0.1.0.4";
-       sha256 = "a2913c4802337ae57d5a4ede73e2664795fe823035da00b65f52d015c42632a0";
+       version = "0.1.0.5";
+       sha256 = "cd64659a673dbea93892d8e418ababdbe41e1b9abb1a6a662a091896a99e0c01";
        libraryHaskellDepends = [ ansi-terminal base ];
        homepage = "https://github.com/UU-ComputerScience/uu-cco";
        description = "Utilities for compiler construction: core functionality";
@@ -204423,15 +206057,16 @@ self: {
      }) {};
 
   "varying" = callPackage
-    ({ mkDerivation, base, time, transformers }:
+    ({ mkDerivation, base, hspec, QuickCheck, time, transformers }:
      mkDerivation {
        pname = "varying";
-       version = "0.3.0.1";
-       sha256 = "1678e5e71eb18228acba06d7b62220edd3102af620ca19107896ef65855c2aec";
+       version = "0.4.0.0";
+       sha256 = "9a9c6b0e6f89deb748f72c1b1cf58a291235a0989305be190ebf4ec50d566092";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base time transformers ];
        executableHaskellDepends = [ base time transformers ];
+       testHaskellDepends = [ base hspec QuickCheck time transformers ];
        homepage = "https://github.com/schell/varying";
        description = "FRP through value streams and monadic splines";
        license = stdenv.lib.licenses.mit;
@@ -204485,6 +206120,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "vault_0_3_0_6" = callPackage
+    ({ mkDerivation, base, containers, hashable, unordered-containers
+     }:
+     mkDerivation {
+       pname = "vault";
+       version = "0.3.0.6";
+       sha256 = "0b433de60fa3d20e93dce6013293e18089fb3233c34211ffa3f860408866ef48";
+       libraryHaskellDepends = [
+         base containers hashable unordered-containers
+       ];
+       homepage = "https://github.com/HeinrichApfelmus/vault";
+       description = "a persistent store for values of arbitrary types";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "vaultaire-common" = callPackage
     ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
      , cereal, containers, hashable, hslogger, hspec, locators, mtl
@@ -204871,7 +206522,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "vector-binary-instances" = callPackage
+  "vector-binary-instances_0_2_1_0" = callPackage
     ({ mkDerivation, base, binary, cereal, vector }:
      mkDerivation {
        pname = "vector-binary-instances";
@@ -204881,9 +206532,10 @@ self: {
        homepage = "https://github.com/bos/vector-binary-instances";
        description = "Instances of Data.Binary and Data.Serialize for vector";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "vector-binary-instances_0_2_1_1" = callPackage
+  "vector-binary-instances" = callPackage
     ({ mkDerivation, base, binary, vector }:
      mkDerivation {
        pname = "vector-binary-instances";
@@ -204893,7 +206545,6 @@ self: {
        homepage = "https://github.com/bos/vector-binary-instances";
        description = "Instances of Data.Binary and Data.Serialize for vector";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-buffer" = callPackage
@@ -208452,6 +210103,30 @@ self: {
        license = stdenv.lib.licenses.mpl20;
      }) {};
 
+  "wai-predicates_0_8_6" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
+     , bytestring-conversion, case-insensitive, cookie, http-types
+     , singletons, tasty, tasty-hunit, tasty-quickcheck, transformers
+     , vault, vector, wai
+     }:
+     mkDerivation {
+       pname = "wai-predicates";
+       version = "0.8.6";
+       sha256 = "7aba73c37a27975b37077b6f06d6c34488750ff022210e29a0966c68fafde918";
+       libraryHaskellDepends = [
+         attoparsec base bytestring bytestring-conversion case-insensitive
+         cookie http-types singletons transformers vault vector wai
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring case-insensitive http-types tasty
+         tasty-hunit tasty-quickcheck wai
+       ];
+       homepage = "https://gitlab.com/twittner/wai-predicates/";
+       description = "WAI request predicates";
+       license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-request-spec" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, containers
      , http-types, text, wai
@@ -208631,6 +210306,32 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "wai-routes_0_9_7" = callPackage
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring
+     , case-insensitive, containers, cookie, data-default-class
+     , filepath, hspec, hspec-wai, hspec-wai-json, http-types
+     , mime-types, monad-loops, mtl, path-pieces, random
+     , template-haskell, text, vault, wai, wai-app-static, wai-extra
+     }:
+     mkDerivation {
+       pname = "wai-routes";
+       version = "0.9.7";
+       sha256 = "326fb3f6da6c87f625b75479dc4881a82129d46053a3e2b42eae37d51ca27166";
+       libraryHaskellDepends = [
+         aeson base blaze-builder bytestring case-insensitive containers
+         cookie data-default-class filepath http-types mime-types
+         monad-loops mtl path-pieces random template-haskell text vault wai
+         wai-app-static wai-extra
+       ];
+       testHaskellDepends = [
+         aeson base hspec hspec-wai hspec-wai-json text wai
+       ];
+       homepage = "https://ajnsit.github.io/wai-routes/";
+       description = "Typesafe URLs for Wai applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "wai-routing_0_12_1" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
      , bytestring-conversion, case-insensitive, containers, cookie
@@ -211721,8 +213422,8 @@ self: {
      }:
      mkDerivation {
        pname = "werewolf";
-       version = "0.4.3.1";
-       sha256 = "daf3e180e534b2dd36667f8855c5d1699afab5512b3d38009f64bc9d8a24a19c";
+       version = "0.4.4.0";
+       sha256 = "247a99b23a409c11344a70f4fbfc3b939eda436e0e52bd7363c376615644dad8";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -212291,7 +213992,7 @@ self: {
        description = "Haskell bindings for the wlc library";
        license = stdenv.lib.licenses.isc;
        hydraPlatforms = stdenv.lib.platforms.none;
-     }) {wlc = null;};
+     }) {inherit (pkgs) wlc;};
 
   "wobsurv" = callPackage
     ({ mkDerivation, aeson, attoparsec, base-prelude, bytestring
@@ -213701,8 +215402,8 @@ self: {
      }:
      mkDerivation {
        pname = "xcffib";
-       version = "0.4.0";
-       sha256 = "6cfa37a5d13d326fadd838939df457412eb752e81877e6f128b75b8e101b50db";
+       version = "0.4.1";
+       sha256 = "c5449a61a2415f0be39ca4b1be2b186e2eb0f1563391d819b555a348f35f5248";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -215572,8 +217273,10 @@ self: {
      }:
      mkDerivation {
        pname = "xournal-types";
-       version = "0.5.1";
-       sha256 = "57c9f55cc7ec3450b6ae1ee4d7e8411e9ce1da147ff104fc8cc66f0e4c6924c6";
+       version = "0.5.1.0";
+       sha256 = "b0e8d4194af0397bdd76352e1174b61947343dfcced21bef062598fb058e69cb";
+       revision = "1";
+       editedCabalFile = "d6fdc2ac2b741597d72cc1a5ef1fad122858a96212df461e3a97540eeceb78fb";
        libraryHaskellDepends = [
          base bytestring cereal containers lens strict TypeCompose
        ];
@@ -217855,7 +219558,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-auth-oauth2" = callPackage
+  "yesod-auth-oauth2_0_1_6" = callPackage
     ({ mkDerivation, aeson, authenticate, base, bytestring, hoauth2
      , hspec, http-client, http-conduit, http-types, lifted-base
      , network-uri, random, text, transformers, vector, yesod-auth
@@ -217874,6 +219577,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.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 ];
+       homepage = "http://github.com/thoughtbot/yesod-auth-oauth2";
+       description = "OAuth 2.0 authentication plugins";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "yesod-auth-pam" = callPackage
@@ -223120,6 +224850,8 @@ self: {
        pname = "zlib-lens";
        version = "0.1.1.1";
        sha256 = "3fb8a31d5ff081fa22d3fd628b49e61eb5be8a0bc43d52b5e73c60b2098b67c8";
+       revision = "1";
+       editedCabalFile = "fe783bc66f56cb660f1b06012c28f12ae025c97e24f0254ed938eb5e132f9cc2";
        libraryHaskellDepends = [ base bytestring profunctors zlib ];
        jailbreak = true;
        homepage = "http://lens.github.io/";
@@ -223134,6 +224866,8 @@ self: {
        pname = "zlib-lens";
        version = "0.1.1.2";
        sha256 = "c1e47feb44ca0aa70b152db60db7bc29b2b1820ba0d015bbb301a1340c80ee8f";
+       revision = "1";
+       editedCabalFile = "2cd596d95a3665d374fb519a9698017abd1c2c0bc0b27669708500af24c7b7ed";
        libraryHaskellDepends = [ base bytestring profunctors zlib ];
        jailbreak = true;
        homepage = "http://lens.github.io/";
@@ -223148,14 +224882,27 @@ self: {
        pname = "zlib-lens";
        version = "0.1.2";
        sha256 = "1649c2d05f8a720804b0d380f51b854fdeea4ce9bcfe682d2e335e9faa16a1ee";
-       revision = "1";
-       editedCabalFile = "353e3ef6e0281894cd494b95563bb93a30ec0ff96e309a173c36bddfc4069e66";
+       revision = "2";
+       editedCabalFile = "167ebeb448d8097a8a7d1375006d1f791139b71ac6ec5f4b66d80d5b2c7eec42";
        libraryHaskellDepends = [ base bytestring profunctors zlib ];
        homepage = "http://lens.github.io/";
        description = "Lenses for zlib";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "zlib-lens_0_1_2_1" = callPackage
+    ({ mkDerivation, base, bytestring, profunctors, zlib }:
+     mkDerivation {
+       pname = "zlib-lens";
+       version = "0.1.2.1";
+       sha256 = "e5a563453899e0896cfa3aed22a2fbfc67012990ace6d14631f31b704ff766eb";
+       libraryHaskellDepends = [ base bytestring profunctors zlib ];
+       homepage = "http://lens.github.io/";
+       description = "Lenses for zlib";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "zmcat" = callPackage
     ({ mkDerivation, base, bytestring, zeromq3-haskell }:
      mkDerivation {

From 8d0219c6ef3d28fe00bfb29fdf5dab862c3325a3 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 10 Feb 2016 22:27:49 +0100
Subject: [PATCH 1382/2285] haskell-transformers-compat: drop obsolete override
 for ghc-8.0.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index d9a5702a0949..f6e00bad49a7 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -43,9 +43,6 @@ self: super: {
   # Older versions of QuickCheck don't support our version of Template Haskell.
   QuickCheck = self.QuickCheck_2_8_2;
 
-  # Older versions don't support our version of transformers.
-  transformers-compat = self.transformers-compat_0_5_1_4;
-
   # https://github.com/hspec/HUnit/issues/7
   HUnit = dontCheck super.HUnit;
 

From 3906a32bda60d0313297a5d172bdff07adceb843 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 9 Feb 2016 21:28:20 +0100
Subject: [PATCH 1383/2285] haskell-QuickCheck: drop obsolete override for
 ghc-8.0.x

---
 pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
index f6e00bad49a7..2c1c825af53f 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-8.0.x.nix
@@ -40,9 +40,6 @@ self: super: {
   # jailbreak-cabal can use the native Cabal library.
   jailbreak-cabal = super.jailbreak-cabal.override { Cabal = null; };
 
-  # Older versions of QuickCheck don't support our version of Template Haskell.
-  QuickCheck = self.QuickCheck_2_8_2;
-
   # https://github.com/hspec/HUnit/issues/7
   HUnit = dontCheck super.HUnit;
 

From 2029027d8883ab22e3044a71a4a33cc7a0beaf2e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 9 Feb 2016 20:42:49 +0100
Subject: [PATCH 1384/2285] haskell-binary: update older compilers to the
 latest version

---
 pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix  | 2 +-
 pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix  | 4 ++--
 pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix  | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
index 2c495a80e2eb..1bdd454d4080 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-6.12.x.nix
@@ -41,7 +41,7 @@ self: super: {
   unix = null;
 
   # These packages are core libraries in GHC 7.10.x, but not here.
-  binary = self.binary_0_8_2_0;
+  binary = self.binary_0_8_2_1;
   deepseq = self.deepseq_1_3_0_1;
   haskeline = self.haskeline_0_7_2_1;
   hoopl = self.hoopl_3_10_2_0;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
index 8b9d962e8322..d354ea1305db 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.2.x.nix
@@ -42,7 +42,7 @@ self: super: {
   xhtml = self.xhtml_3000_2_1;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_2_0; process = self.process_1_2_3_0; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = self.binary_0_8_2_1; process = self.process_1_2_3_0; };
 
   # Newer versions don't compile.
   Cabal_1_18_1_7 = dontJailbreak super.Cabal_1_18_1_7;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
index 6d47ccc866c8..0103eb3c598c 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.4.x.nix
@@ -41,10 +41,10 @@ self: super: {
   xhtml = self.xhtml_3000_2_1;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_2_0; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_2_1; };
 
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_2_0; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_2_1; });
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;
diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
index 60be40a79af0..e10136a42ee0 100644
--- a/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
+++ b/pkgs/development/haskell-modules/configuration-ghc-7.6.x.nix
@@ -40,10 +40,10 @@ self: super: {
   xhtml = self.xhtml_3000_2_1;
 
   # https://github.com/haskell/cabal/issues/2322
-  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_2_0; };
+  Cabal_1_22_4_0 = super.Cabal_1_22_4_0.override { binary = dontCheck self.binary_0_8_2_1; };
 
   # Avoid inconsistent 'binary' versions from 'text' and 'Cabal'.
-  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_2_0; });
+  cabal-install = super.cabal-install.overrideScope (self: super: { binary = dontCheck self.binary_0_8_2_1; });
 
   # https://github.com/tibbe/hashable/issues/85
   hashable = dontCheck super.hashable;

From 0b72e7e2472e381b0168345f2158dfe76afc2ab0 Mon Sep 17 00:00:00 2001
From: lukasepple <git@lukasepple.de>
Date: Sun, 14 Feb 2016 16:34:30 +0100
Subject: [PATCH 1385/2285] intel2200BGFirmware: init at 3.1

This commit adds the firmware for the Intel 2200BG wireless cards for
the ipw2200 kernel module. Also it changes the
networking.enableIntel2200BGFirmware option to set it as
hardware.firmware since firmware-linux-nonfree does not contain the
appropiate firmware anymore. Also hardware.enableAllFirmware does enable
the intel2200BGFirmware now.
---
 lib/maintainers.nix                           |  1 +
 nixos/modules/hardware/all-firmware.nix       |  2 +-
 .../modules/hardware/network/intel-2200bg.nix |  2 +-
 .../firmware/intel2200BGFirmware/default.nix  | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 5 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 808d78d499de..094eaea56e68 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -184,6 +184,7 @@
   lowfatcomputing = "Andreas Wagner <andreas.wagner@lowfatcomputing.org>";
   lsix = "Lancelot SIX <lsix@lancelotsix.com>";
   ludo = "Ludovic Courtès <ludo@gnu.org>";
+  lukasepple = "Lukas Epple <post@lukasepple.de>";
   lukego = "Luke Gorrie <luke@snabb.co>";
   luispedro = "Luis Pedro Coelho <luis@luispedro.org>";
   lw = "Sergey Sofeychuk <lw@fmap.me>";
diff --git a/nixos/modules/hardware/all-firmware.nix b/nixos/modules/hardware/all-firmware.nix
index 1a04baef1930..d0d481f72a40 100644
--- a/nixos/modules/hardware/all-firmware.nix
+++ b/nixos/modules/hardware/all-firmware.nix
@@ -22,7 +22,7 @@ with lib;
   ###### implementation
 
   config = mkIf config.hardware.enableAllFirmware {
-    hardware.firmware = [ pkgs.firmwareLinuxNonfree ];
+    hardware.firmware = [ pkgs.firmwareLinuxNonfree pkgs.intel2200BGFirmware ];
   };
 
 }
diff --git a/nixos/modules/hardware/network/intel-2200bg.nix b/nixos/modules/hardware/network/intel-2200bg.nix
index 1b70057d135b..17b973474c93 100644
--- a/nixos/modules/hardware/network/intel-2200bg.nix
+++ b/nixos/modules/hardware/network/intel-2200bg.nix
@@ -23,7 +23,7 @@
 
   config = lib.mkIf config.networking.enableIntel2200BGFirmware {
 
-    hardware.enableAllFirmware = true;
+    hardware.firmware = [ pkgs.intel2200BGFirmware ];
 
   };
 
diff --git a/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix
new file mode 100644
index 000000000000..f5b6abdd9c7e
--- /dev/null
+++ b/pkgs/os-specific/linux/firmware/intel2200BGFirmware/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl }:
+
+let version = "3.1"; in
+
+stdenv.mkDerivation {
+  name = "intel2200BGFirmware-${version}";
+
+  src = fetchurl {
+    url = "http://pkgs.fedoraproject.org/repo/pkgs/ipw2200-firmware/ipw2200-fw-${version}.tgz/eaba788643c7cc7483dd67ace70f6e99/ipw2200-fw-${version}.tgz";
+    sha256 = "c6818c11c18cc030d55ff83f64b2bad8feef485e7742f84f94a61d811a6258bd";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/lib/firmware
+    for fw in \
+      ipw2200-bss.fw \
+      ipw2200-ibss.fw \
+      ipw2200-sniffer.fw
+    do
+      cp -f $fw $out/lib/firmware/$fw
+    done
+    mkdir -p $out/share/doc/intel2200BGFirmware
+    cp -f LICENSE.ipw2200-fw $out/share/doc/intel2200BGFirmware/LICENSE
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Firmware for Intel 2200BG cards";
+    homepage = http://ipw2200.sourceforge.net/firmware.php;
+    license = stdenv.lib.licenses.unfreeRedistributableFirmware;
+    maintainers = with maintainers; [ lukasepple ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 635f0125f2f2..0f4534bbdc64 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10073,6 +10073,8 @@ let
 
   ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils { };
 
+  intel2200BGFirmware = callPackage ../os-specific/linux/firmware/intel2200BGFirmware { };
+
   iomelt = callPackage ../os-specific/linux/iomelt { };
 
   iotop = callPackage ../os-specific/linux/iotop { };

From f3909c9943c64a85acd4c9e551745b5910fbe529 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 15 Feb 2016 19:58:46 +0000
Subject: [PATCH 1386/2285] atom: 1.4.3 -> 1.5.3

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index 87a36a36f90a..d7b91de80d80 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -16,11 +16,11 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.4.3";
+  version = "1.5.3";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "15ix5ww3ny5ylgmmxpkc32li6af2vc4a2p6aymx9c472fra0c41x";
+    sha256 = "101fz4c5pj7yp7fg7kg7vcpqjzpwfrbxdyb6va5liip1llg1i2z3";
     name = "${name}.deb";
   };
 
@@ -51,7 +51,7 @@ in stdenv.mkDerivation rec {
     description = "A hackable text editor for the 21st Century";
     homepage = https://atom.io/;
     license = licenses.mit;
-    maintainers = [ maintainers.offline ];
+    maintainers = [ maintainers.offline maintainers.nequissimus ];
     platforms = [ "x86_64-linux" ];
   };
 }

From d213089a2515c38c98f4427700f9a10b62527f36 Mon Sep 17 00:00:00 2001
From: Samuel Rivas <samuelrivas@gmail.com>
Date: Sat, 26 Dec 2015 18:29:08 +0100
Subject: [PATCH 1387/2285] spark: 1.4.0 -> 1.5.2

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

diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index 1147c4b64a19..727d0b0e9176 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, makeWrapper, jre, pythonPackages
+{ stdenv, fetchzip, makeWrapper, jre, pythonPackages
 , mesosSupport ? true, mesos
 }:
 
@@ -6,11 +6,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name    = "spark-${version}";
-  version = "1.4.0";
+  version = "1.5.2";
 
-  src = fetchurl {
+  src = fetchzip {
     url    = "mirror://apache/spark/${name}/${name}-bin-cdh4.tgz";
-    sha256 = "1w60xzzg9mcymin1pmqwx1mvcqmdpfyxhd2dmw5alhnrzi21ycxi";
+    sha256 = "0bgpz3bqj24flrbajzhbkz38fjsd53qmji1kls9izji8vprcjr5v";
   };
 
   buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ]

From 704e923ad5bc2b33f3f6eb9a02e19ff202cd3d45 Mon Sep 17 00:00:00 2001
From: Samuel Rivas <samuelrivas@gmail.com>
Date: Sat, 26 Dec 2015 18:29:49 +0100
Subject: [PATCH 1388/2285] spark: reduce default shell log verbosity

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

diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index 727d0b0e9176..278fc6305c78 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
     mkdir -p $out/{lib/${untarDir}/conf,bin}
     mv * $out/lib/${untarDir}
 
+    sed -e 's/INFO, console/WARN, console/' < \
+       $out/lib/${untarDir}/conf/log4j.properties.template > \
+       $out/lib/${untarDir}/conf/log4j.properties
+
     cat > $out/lib/${untarDir}/conf/spark-env.sh <<- EOF
     export JAVA_HOME="${jre}"
     export SPARK_HOME="$out/lib/${untarDir}"

From d72fad9ee4b968eb77aa79acf6b9e0a7db4d3728 Mon Sep 17 00:00:00 2001
From: Samuel Rivas <samuelrivas@gmail.com>
Date: Sat, 26 Dec 2015 18:30:28 +0100
Subject: [PATCH 1389/2285] spark: export the assembly to /share/java, fixes
 #11961

So that we can compile applications that depend on spark
---
 pkgs/applications/networking/cluster/spark/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index 278fc6305c78..5e284d4387f5 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
 
   untarDir = "${name}-bin-cdh4";
   installPhase = ''
-    mkdir -p $out/{lib/${untarDir}/conf,bin}
+    mkdir -p $out/{lib/${untarDir}/conf,bin,/share/java}
     mv * $out/lib/${untarDir}
 
     sed -e 's/INFO, console/WARN, console/' < \
@@ -37,6 +37,7 @@ stdenv.mkDerivation rec {
     for n in $(find $out/lib/${untarDir}/bin -type f ! -name "*.*"); do
       makeWrapper "$n" "$out/bin/$(basename $n)"
     done
+    ln -s $out/lib/${untarDir}/lib/spark-assembly-*.jar $out/share/java
   '';
 
   meta = {

From c7571611dc5f69737d27449cfa8a9ef4af3de64d Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Sun, 17 Jan 2016 04:11:09 -0800
Subject: [PATCH 1390/2285] cfdyndns: init at 0.0.1

---
 lib/maintainers.nix                           |  1 +
 nixos/modules/misc/ids.nix                    |  2 +
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/services/misc/cfdyndns.nix      | 70 +++++++++++++++++++
 .../networking/dyndns/cfdyndns/default.nix    | 30 ++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 6 files changed, 106 insertions(+)
 create mode 100644 nixos/modules/services/misc/cfdyndns.nix
 create mode 100644 pkgs/applications/networking/dyndns/cfdyndns/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 808d78d499de..bf6cd29996d1 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -69,6 +69,7 @@
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
   codsl = "codsl <codsl@riseup.net>";
   codyopel = "Cody Opel <codyopel@gmail.com>";
+  colemickens = "Cole Mickens <cole.mickens@gmail.com>";
   copumpkin = "Dan Peebles <pumpkingod@gmail.com>";
   coroa = "Jonas Hörsch <jonas@chaoflow.net>";
   couchemar = "Andrey Pavlov <couchemar@yandex.ru>";
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 064b4cbc4b33..82ba9018c7ce 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -248,6 +248,7 @@
       matrix-synapse = 224;
       rspamd = 225;
       rmilter = 226;
+      cfdyndns = 227;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -473,6 +474,7 @@
       matrix-synapse = 224;
       rspamd = 225;
       rmilter = 226;
+      cfdyndns = 227;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 0011544988d6..f6f674c253d4 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -201,6 +201,7 @@
   ./services/misc/bepasty.nix
   ./services/misc/canto-daemon.nix
   ./services/misc/calibre-server.nix
+  ./services/misc/cfdyndns.nix
   ./services/misc/cpuminer-cryptonight.nix
   ./services/misc/cgminer.nix
   ./services/misc/confd.nix
diff --git a/nixos/modules/services/misc/cfdyndns.nix b/nixos/modules/services/misc/cfdyndns.nix
new file mode 100644
index 000000000000..69a33d0b8c1b
--- /dev/null
+++ b/nixos/modules/services/misc/cfdyndns.nix
@@ -0,0 +1,70 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.services.cfdyndns;
+in
+{
+  options = {
+    services.cfdyndns = {
+      enable = mkEnableOption "Cloudflare Dynamic DNS Client";
+
+      email = mkOption {
+        type = types.str;
+        description = ''
+          The email address to use to authenticate to CloudFlare.
+        '';
+      };
+
+      apikey = mkOption {
+        type = types.str;
+        description = ''
+          The API Key to use to authenticate to CloudFlare.
+        '';
+      };
+
+      records = mkOption {
+        default = [];
+        example = [ "host.tld" ];
+        type = types.listOf types.str;
+        description = ''
+          The records to update in CloudFlare.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.cfdyndns = {
+      description = "CloudFlare Dynamic DNS Client";
+      after = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      startAt = "5 minutes";
+      serviceConfig = {
+        Type = "simple";
+        User = config.ids.uids.cfdyndns;
+        Group = config.ids.gids.cfdyndns;
+        ExecStart = "/bin/sh -c '${pkgs.cfdyndns}/bin/cfdyndns'";
+      };
+      environment = {
+        CLOUDFLARE_EMAIL="${cfg.email}";
+        CLOUDFLARE_APIKEY="${cfg.apikey}";
+        CLOUDFLARE_RECORDS="${concatStringsSep "," cfg.records}";
+      };
+    };
+
+    users.extraUsers = {
+      cfdyndns = {
+        group = "cfdyndns";
+        uid = config.ids.uids.cfdyndns;
+      };
+    };
+
+    users.extraGroups = {
+      cfdyndns = {
+        gid = config.ids.gids.cfdyndns;
+      };
+    };
+  };
+}
diff --git a/pkgs/applications/networking/dyndns/cfdyndns/default.nix b/pkgs/applications/networking/dyndns/cfdyndns/default.nix
new file mode 100644
index 000000000000..43d257d7b0ef
--- /dev/null
+++ b/pkgs/applications/networking/dyndns/cfdyndns/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, rustPlatform, makeWrapper, openssl }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "cfdyndns-${version}";
+  version = "0.0.1";
+  src = fetchFromGitHub {
+    owner = "colemickens";
+    repo = "cfdyndns";
+    rev = "v${version}";
+    sha256 = "1mcdjykrgh0jq6k6y664lai8sbgzk6j7k0r944f43vg63d1jql5b";
+  };
+
+  depsSha256 = "0whs3fgmpb6g1mjajs3qs9g613x5dal4x6ghzzkpl73a9pgydkpn";
+
+  buildInputs = [ makeWrapper openssl ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -p target/release/cfdyndns $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "CloudFlare Dynamic DNS Client";
+    homepage = https://github.com/colemickens/cfdyndns;
+    license = stdenv.lib.licenses.mit;
+    maintainers = with maintainers; [ colemickens ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d91d975689ff..6aaa7e07f096 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -786,6 +786,8 @@ let
 
   ccnet = callPackage ../tools/networking/ccnet { };
 
+  cfdyndns = callPackage ../applications/networking/dyndns/cfdyndns { };
+
   ckbcomp = callPackage ../tools/X11/ckbcomp { };
 
   cli53 = callPackage ../tools/admin/cli53 { };

From 69c843f392f895286ae751f91126d53f37728488 Mon Sep 17 00:00:00 2001
From: Arda Xi <arda@ardaxi.com>
Date: Mon, 28 Dec 2015 21:20:19 +0100
Subject: [PATCH 1391/2285] pythonPackages.twisted: 11.1.0 -> 13.2.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5694d65a0163..6b7ac315e373 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20792,10 +20792,10 @@ in modules // {
     # to packages like carbon (http://stackoverflow.com/questions/19894708/cant-start-carbon-12-04-python-error-importerror-cannot-import-name-daem)
     disabled = isPy3k;
 
-    name = "Twisted-11.1.0";
+    name = "Twisted-13.2.0";
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/T/Twisted/${name}.tar.bz2";
-      sha256 = "05agfp17cndhv2w0p559lvknl7nv0xqkg10apc47fm53m8llbfvz";
+      sha256 = "1wrcqv5lvgwk2aq83qb2s2ng2vx14hbjjk2gc30cg6h1iiipal89";
     };
 
     propagatedBuildInputs = with self; [ zope_interface ];

From 10a40c62447b78ac3f2df8692535ac4dfe3c7000 Mon Sep 17 00:00:00 2001
From: Arda Xi <arda@ardaxi.com>
Date: Mon, 28 Dec 2015 21:24:15 +0100
Subject: [PATCH 1392/2285] pythonPackages.nevow: 0.10.0 -> 0.11.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 6b7ac315e373..0c9e16a35775 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12145,11 +12145,11 @@ in modules // {
 
   nevow = buildPythonPackage (rec {
     name = "nevow-${version}";
-    version = "0.10.0";
+    version = "0.11.1";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/N/Nevow/Nevow-${version}.tar.gz";
-      sha256 = "90631f68f626c8934984908d3df15e7c198939d36be7ead1305479dfc67ff6d0";
+      sha256 = "1z0y8a5q4fa2nmh0dap7cs9pp5xs3jm6q0g4vpwcw77q7jagdmw9";
       name = "${name}.tar.gz";
     };
 

From a3a9a56f8fc615c4c2d596a2d656c9f344fe71de Mon Sep 17 00:00:00 2001
From: Arda Xi <arda@ardaxi.com>
Date: Mon, 28 Dec 2015 21:36:47 +0100
Subject: [PATCH 1393/2285] pythonPackages.foolscap: 0.6.4 -> 0.10.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 0c9e16a35775..4a38a060dff8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8914,14 +8914,14 @@ in modules // {
   });
 
   foolscap = buildPythonPackage (rec {
-    name = "foolscap-0.6.4";
+    name = "foolscap-0.10.1";
 
     src = pkgs.fetchurl {
       url = "http://foolscap.lothar.com/releases/${name}.tar.gz";
-      sha256 = "16cddyk5is0gjfn0ia5n2l4lhdzvbjzlx6sfpy7ddjd3d3fq7ckl";
+      sha256 = "1wrnbdq3y3lfxnhx30yj9xbr3iy9512jb60k8qi1da1phalnwz5x";
     };
 
-    propagatedBuildInputs = [ self.twisted self.pyopenssl ];
+    propagatedBuildInputs = [ self.twisted self.pyopenssl self.service-identity ];
 
     meta = {
       homepage = http://foolscap.lothar.com/;

From 443072799dc228ef1ebb8573c4ed55cf569c2b2a Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Mon, 15 Feb 2016 21:56:14 +0100
Subject: [PATCH 1394/2285] tahoelafs: 1.10.0 -> 1.10.2 and refractor
 expression, fixes #12004

---
 .../networking/p2p/tahoe-lafs/default.nix     | 26 +++++++++----------
 pkgs/top-level/all-packages.nix               |  6 +----
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
index 1f935c2f83b0..dae985febbb3 100644
--- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
@@ -1,19 +1,18 @@
-{ fetchurl, lib, unzip, buildPythonPackage, twisted, foolscap, nevow
-, simplejson, zfec, pycryptopp, sqlite3, darcsver, setuptoolsTrial, python
-, setuptoolsDarcs, numpy, nettools, pycrypto, pyasn1, mock, zope_interface }:
+{ fetchurl, lib, unzip, nettools, pythonPackages }:
 
 # FAILURES: The "running build_ext" phase fails to compile Twisted
 # plugins, because it tries to write them into Twisted's (immutable)
 # store path. The problem appears to be non-fatal, but there's probably
 # some loss of functionality because of it.
 
-buildPythonPackage rec {
-  name = "tahoe-lafs-1.10.0";
+pythonPackages.buildPythonPackage rec {
+  version = "1.10.2";
+  name = "tahoe-lafs-${version}";
   namePrefix = "";
 
   src = fetchurl {
-    url = "http://tahoe-lafs.org/source/tahoe-lafs/releases/allmydata-tahoe-1.10.0.tar.bz2";
-    sha256 = "1qng7j1vykk8zl5da9yklkljvgxfnjky58gcay6dypz91xq1cmcw";
+    url = "http://tahoe-lafs.org/source/tahoe-lafs/releases/allmydata-tahoe-${version}.tar.bz2";
+    sha256 = "1rvv0ik5biy7ji8pg56v0qycnggzr3k6dbg88n555nb6r4cxgmgy";
   };
 
   patchPhase = ''
@@ -32,13 +31,14 @@ buildPythonPackage rec {
   '';
 
   # Some tests want this + http://tahoe-lafs.org/source/tahoe-lafs/deps/tahoe-dep-sdists/mock-0.6.0.tar.bz2
-  buildInputs = [ unzip numpy ];
+  buildInputs = with pythonPackages; [ unzip numpy mock ];
 
   # The `backup' command requires `sqlite3'.
-  propagatedBuildInputs =
-    [ twisted foolscap nevow simplejson zfec pycryptopp sqlite3
-      darcsver setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface mock
-    ];
+  propagatedBuildInputs = with pythonPackages; [
+    twisted foolscap nevow simplejson zfec pycryptopp sqlite3 darcsver
+    setuptoolsTrial setuptoolsDarcs pycrypto pyasn1 zope_interface
+    service-identity
+  ];
 
   postInstall = ''
     # Install the documentation.
@@ -49,7 +49,7 @@ buildPythonPackage rec {
 
   checkPhase = ''
     # TODO: broken with wheels
-    #${python.interpreter} setup.py trial
+    #${pythonPackages.python.interpreter} setup.py trial
   '';
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 93558c8401f0..be1251595abe 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13496,11 +13496,7 @@ let
 
   tagainijisho = callPackage ../applications/office/tagainijisho {};
 
-  tahoelafs = callPackage ../tools/networking/p2p/tahoe-lafs {
-    inherit (pythonPackages) twisted foolscap simplejson nevow zfec
-      pycryptopp sqlite3 darcsver setuptoolsTrial setuptoolsDarcs
-      numpy pyasn1 mock zope_interface;
-  };
+  tahoelafs = callPackage ../tools/networking/p2p/tahoe-lafs {};
 
   tailor = callPackage ../applications/version-management/tailor {};
 

From 198f9e3b54ad576cd85d8815d98282ecd75b03cd Mon Sep 17 00:00:00 2001
From: devhell <^@regexmail.net>
Date: Mon, 15 Feb 2016 21:01:42 +0000
Subject: [PATCH 1395/2285] rainbowstream: 1.3.1 -> 1.3.3

Built and tested locally. Unfortunately no changelog seems to be
available.
---
 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 4a38a060dff8..5d053c5f314c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11260,11 +11260,11 @@ in modules // {
 
   rainbowstream = buildPythonPackage rec {
     name = "rainbowstream-${version}";
-    version = "1.3.1";
+    version = "1.3.3";
 
     src = pkgs.fetchurl {
       url    = "https://pypi.python.org/packages/source/r/rainbowstream/${name}.tar.gz";
-      sha256 = "0dhhgr0ww4x85pgl6mzp327sy4v6mv6hz3wvnsrwl0knkxknbadv";
+      sha256 = "08598slbn8sm2hjs0q1041fv7m56k2ky4q66rsihacjw0mg7blai";
     };
 
     doCheck = false;

From d0dcad3b91212179a27987ad17b1cbbfceb71a9a Mon Sep 17 00:00:00 2001
From: Balletie <skip_meesie@hotmail.com>
Date: Mon, 15 Feb 2016 22:10:32 +0100
Subject: [PATCH 1396/2285] hfsprogs: init at 332.25

---
 pkgs/tools/filesystems/hfsprogs/default.nix | 45 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/tools/filesystems/hfsprogs/default.nix

diff --git a/pkgs/tools/filesystems/hfsprogs/default.nix b/pkgs/tools/filesystems/hfsprogs/default.nix
new file mode 100644
index 000000000000..25ec31ea698a
--- /dev/null
+++ b/pkgs/tools/filesystems/hfsprogs/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, openssl, libbsd }:
+
+let version = "332.25";
+    package_name = "hfsprogs"; in
+stdenv.mkDerivation rec {
+  name = "${package_name}-${version}";
+  srcs = [
+    (fetchurl {
+      url = "http://ftp.de.debian.org/debian/pool/main/h/hfsprogs/${package_name}_${version}-11.debian.tar.gz";
+      sha256 = "62d9b8599c66ebffbc57ce5d776e20b41341130d9b27341d63bda08460ebde7c";
+    })
+    (fetchurl {
+      url = "https://opensource.apple.com/tarballs/diskdev_cmds/diskdev_cmds-${version}.tar.gz";
+      sha256 = "74c9aeca899ed7f4bf155c65fc45bf0f250c0f6d57360ea953b1d536d9aa45e6";
+    })
+  ];
+
+  sourceRoot = "diskdev_cmds-" + version;
+  patches = [ "../debian/patches/*.patch" ];
+
+  buildInputs = [ openssl libbsd ];
+  makefile = "Makefile.lnx";
+
+  # Inspired by PKGBUILD of https://www.archlinux.org/packages/community/x86_64/hfsprogs/
+  installPhase = ''
+    # Create required package directories
+    install -m 755 -d "$out/bin"
+    install -m 755 -d "$out/share/${package_name}"
+    install -m 755 -d "$out/share/man/man8/"
+    # Copy executables
+    install -m 755 "newfs_hfs.tproj/newfs_hfs" "$out/bin/mkfs.hfsplus"
+    install -m 755 "fsck_hfs.tproj/fsck_hfs" "$out/bin/fsck.hfsplus"
+    # Copy shared data
+    install -m 644 "newfs_hfs.tproj/hfsbootdata.img" "$out/share/${package_name}/hfsbootdata"
+    # Copy man pages
+    install -m 644 "newfs_hfs.tproj/newfs_hfs.8" "$out/share/man/man8/mkfs.hfsplus.8"
+    install -m 644 "fsck_hfs.tproj/fsck_hfs.8" "$out/share/man/man8/fsck.hfsplus.8"
+  '';
+
+  meta = {
+    description = "HFS/HFS+ user space utils";
+    license = stdenv.lib.licenses.apsl20;
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index be1251595abe..f7b7104508aa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1912,6 +1912,8 @@ let
 
   hevea = callPackage ../tools/typesetting/hevea { };
 
+  hfsprogs = callPackage ../tools/filesystems/hfsprogs { };
+
   highlight = callPackage ../tools/text/highlight {
     lua = lua5;
   };

From d2ed83ac391393628f6a64093176c41f0dec0898 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Sun, 17 Jan 2016 04:11:09 -0800
Subject: [PATCH 1397/2285] mxt-app: init at v1.26

---
 lib/maintainers.nix             |  1 +
 pkgs/misc/mxt-app/default.nix   | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 3 files changed, 27 insertions(+)
 create mode 100644 pkgs/misc/mxt-app/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 808d78d499de..bf6cd29996d1 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -69,6 +69,7 @@
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
   codsl = "codsl <codsl@riseup.net>";
   codyopel = "Cody Opel <codyopel@gmail.com>";
+  colemickens = "Cole Mickens <cole.mickens@gmail.com>";
   copumpkin = "Dan Peebles <pumpkingod@gmail.com>";
   coroa = "Jonas Hörsch <jonas@chaoflow.net>";
   couchemar = "Andrey Pavlov <couchemar@yandex.ru>";
diff --git a/pkgs/misc/mxt-app/default.nix b/pkgs/misc/mxt-app/default.nix
new file mode 100644
index 000000000000..cfcba8a3a8ba
--- /dev/null
+++ b/pkgs/misc/mxt-app/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub, makeWrapper, autoconf, automake, libtool }:
+
+stdenv.mkDerivation rec{
+  version="1.26";
+  name = "mxt-app-${version}";
+
+  src = fetchFromGitHub {
+    owner = "atmel-maxtouch";
+    repo = "mxt-app";
+    rev = "v${version}";
+    sha256 = "07afdgh8pnhgh2372cf5pqy6p7l6w3ing2hwnvz6db8wxw59n48h";
+  };
+
+  buildInputs = [ autoconf automake libtool ];
+  preConfigure = "./autogen.sh";
+
+  meta = with stdenv.lib; {
+    description = "Command line utility for Atmel maXTouch devices";
+    homepage = http://github.com/atmel-maxtouch/mxt-app;
+    license = licenses.bsd2;
+    maintainers = [ maintainers.colemickens ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d91d975689ff..6aedc5a3c6cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2128,6 +2128,8 @@ let
 
   multitail = callPackage ../tools/misc/multitail { };
 
+  mxt-app = callPackage ../misc/mxt-app { };
+
   netperf = callPackage ../applications/networking/netperf { };
 
   netsniff-ng = callPackage ../tools/networking/netsniff-ng { };

From d58ae071fd81a623f6a7c028db3940755faec1e2 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Tue, 16 Feb 2016 01:34:57 +0100
Subject: [PATCH 1398/2285] neovim: 0.1.1 -> 0.1.2

also updated neovim's forked libvterm to latest revision
---
 pkgs/applications/editors/neovim/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix
index 1b984c0ff9ce..e291cfcdc2bf 100644
--- a/pkgs/applications/editors/neovim/default.nix
+++ b/pkgs/applications/editors/neovim/default.nix
@@ -21,8 +21,8 @@ let
     version = "2015-11-06";
 
     src = fetchFromGitHub {
-      sha256 = "0f9r0wnr9ajcdd6as24igmch0n8s1annycb9f4k0vg6fngwaypy9";
-      rev = "04781d37ce5af3f580376dc721bd3b89c434966b";
+      sha256 = "090pyf1n5asaw1m2l9bsbdv3zd753aq1plb0w0drbc2k43ds7k3g";
+      rev = "a9c7c6fd20fa35e0ad3e0e98901ca12dfca9c25c";
       repo = "libvterm";
       owner = "neovim";
     };
@@ -60,10 +60,10 @@ let
 
   neovim = stdenv.mkDerivation rec {
     name = "neovim-${version}";
-    version = "0.1.1";
+    version = "0.1.2";
 
     src = fetchFromGitHub {
-      sha256 = "0crswjslp687yp1cpn7nmm0j2sccqhcxryzxv1s81cgpai0fzf60";
+      sha256 = "128aznp2gj08bdz05ri8mqday7wcsy9yz7dw7vdgzk0pk23vjz89";
       rev = "v${version}";
       repo = "neovim";
       owner = "neovim";

From 5e2fd638ccd9e321eb2c8a7033b9efb6c88e0a4c Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Sun, 17 Jan 2016 04:11:27 -0800
Subject: [PATCH 1399/2285] plex: add enablePlexPass (init at 0.9.15.3.1674)

enables plex pass subscribers to opt-in to the pre-release downloads
---
 pkgs/servers/plex/default.nix   | 25 +++++++++++++++++++------
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 29cd45714d7f..03f6fb63c729 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -1,15 +1,28 @@
 { stdenv, fetchurl, rpmextract, glibc
 , dataDir ? "/var/lib/plex" # Plex's data directory must be baked into the package due to symlinks.
+, enablePlexPass ? false
 }:
 
-stdenv.mkDerivation rec {
+let
+  plexpkg = if enablePlexPass then {
+    version = "0.9.15.3.1674";
+    vsnHash = "f46e7e6";
+    sha256 = "086njnjcmknmbn90mmvf60ls7q73g2m955yk621jjdngs4ybvm19";
+  } else {
+    version = "0.9.15.2.1663";
+    vsnHash = "7efd046";
+    sha256 = "1kzr826khn0n69mr2kbr5hxcb56mj12fryhwr95r3132gj02aqph";
+  };
+
+in stdenv.mkDerivation rec {
   name = "plex-${version}";
-  version = "0.9.15.2.1663";
-  vsnHash = "7efd046";
+  version = plexpkg.version;
+  vsnHash = plexpkg.vsnHash;
+  sha256 = plexpkg.sha256;
 
   src = fetchurl {
-    url    = "https://downloads.plex.tv/plex-media-server/${version}-${vsnHash}/plexmediaserver-${version}-${vsnHash}.x86_64.rpm";
-    sha256 = "f06225807c6284914bca1cfaec4490d594c53a2c794d916b321658388d40f9cf";
+    url = "https://downloads.plex.tv/plex-media-server/${version}-${vsnHash}/plexmediaserver-${version}-${vsnHash}.x86_64.rpm";
+    inherit sha256;
   };
 
   buildInputs = [ rpmextract glibc ];
@@ -57,7 +70,7 @@ stdenv.mkDerivation rec {
     homepage = http://plex.tv/;
     license = licenses.unfree;
     platforms = platforms.linux;
-    maintainers = with stdenv.lib.maintainers; [ forkk thoughtpolice ];
+    maintainers = with stdenv.lib.maintainers; [ colemickens forkk thoughtpolice ];
     description = "Media / DLNA server";
     longDescription = ''
       Plex is a media server which allows you to store your media and play it
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c07ef352e01b..396c2b535ee3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2824,7 +2824,7 @@ let
   platformioPackages = callPackage ../development/arduino/platformio { };
   platformio = platformioPackages.platformio-chrootenv.override {};
 
-  plex = callPackage ../servers/plex { };
+  plex = callPackage ../servers/plex { enablePlexPass = config.plex.enablePlexPass or false; };
 
   ploticus = callPackage ../tools/graphics/ploticus {
     libpng = libpng12;

From a5a5c1d9cd6e0feed40fa34f3d89a7573d324436 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Mon, 15 Feb 2016 17:58:33 -0800
Subject: [PATCH 1400/2285] chromium/plugins: Fix widevine substitution

Fixes: #12840
Related to: 61042a5

61042a5 changes the replaced token from $something to @something@. This
commit repeats that change in one additional location used by the
WideVine plugin
---
 pkgs/applications/networking/browsers/chromium/plugins.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 78d9086dd961..157ddf379c23 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -80,7 +80,7 @@ let
       wvName = "Widevine Content Decryption Module";
       wvDescription = "Playback of encrypted HTML audio/video content";
       wvMimeTypes = "application/x-ppapi-widevine-cdm";
-      wvModule = "$widevine/lib/libwidevinecdmadapter.so";
+      wvModule = "@widevine@/lib/libwidevinecdmadapter.so";
       wvInfo = "#${wvName}#${wvDescription};${wvMimeTypes}";
     in ''
       flashVersion="$(

From ab19061df8a097f7a70dbd205c13740032e922fc Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Tue, 16 Feb 2016 03:25:12 +0000
Subject: [PATCH 1401/2285] rethinkdb: 2.1.3 -> 2.2.4

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

diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index 57b0e0abb767..4566a6702069 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.1.3";
+  version = "2.2.4";
 
   src = fetchurl {
     url = "http://download.rethinkdb.com/dist/${name}.tgz";
-    sha256 = "03w9fq3wcvwy04b3x6zb3hvwar7b9jfbpq77rmxdlgh5w64vvgwd";
+    sha256 = "0zs07g7arrrvm85mqbkffyzgd255qawn64r6iqdws25lj1kq2qim";
   };
 
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''

From 32eeb8658f32036b262d3a2ac9275d0a7f866bb1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 16 Feb 2016 05:12:56 +0100
Subject: [PATCH 1402/2285] babeld: 1.6.1 -> 1.7.1

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

diff --git a/pkgs/tools/networking/babeld/default.nix b/pkgs/tools/networking/babeld/default.nix
index 7af9aa901a83..7a54887e9d8d 100644
--- a/pkgs/tools/networking/babeld/default.nix
+++ b/pkgs/tools/networking/babeld/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babeld-1.6.1";
+  name = "babeld-1.7.1";
 
   src = fetchurl {
     url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/${name}.tar.gz";
-    sha256 = "1d45f12mhlxsf8jlpgb1gig5bjg5izdkfk173rd9a1wi7s82pisl";
+    sha256 = "1dl7s2lb40kiysrqhr7zd0s90yfxy6xfsp0fhqgdlwfr99ymx59c";
   };
 
   preBuild = ''
@@ -16,6 +16,6 @@ stdenv.mkDerivation rec {
     homepage = "http://www.pps.univ-paris-diderot.fr/~jch/software/babel/";
     description = "Loop-avoiding distance-vector routing protocol";
     license = stdenv.lib.licenses.mit;
-    maintainers = with stdenv.lib.maintainers; [ fuuzetsu ];
+    maintainers = with stdenv.lib.maintainers; [ fuuzetsu fpletz ];
   };
 }

From 139708a10d1882ed2eee484b5408808515c7b2c9 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <bstaffin@fitbit.com>
Date: Mon, 15 Feb 2016 22:48:17 -0800
Subject: [PATCH 1403/2285] git-lfs: 1.0.0 -> 1.1.1

---
 pkgs/top-level/all-packages.nix | 2 ++
 pkgs/top-level/go-packages.nix  | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df56303c7742..364ccec6f5ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1654,6 +1654,8 @@ let
 
   git-hub = callPackage ../applications/version-management/git-and-tools/git-hub { };
 
+  git-lfs = goPackages.git-lfs.bin // { outputs = [ "bin" ]; };
+
   gitfs = callPackage ../tools/filesystems/gitfs { };
 
   gitinspector = callPackage ../applications/version-management/gitinspector { };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 97fafe7c752e..8a8bc3817481 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -878,10 +878,11 @@ let
   };
 
   git-lfs = buildFromGitHub {
-    rev = "v1.0.0";
+    date = "1.1.1";  # "date" is effectively "version"
+    rev = "v1.1.1";
     owner = "github";
     repo = "git-lfs";
-    sha256 = "1zlg3rm5yxak6d88brffv1wpj0iq4qgzn6sgg8xn0pbnzxjd1284";
+    sha256 = "1m7kii57jrsb22m5x9v8xa3s1qmipfkpk6cscgxrbrj7g0a75fnc";
 
     # Tests fail with 'lfstest-gitserver.go:46: main redeclared in this block'
     excludedPackages = [ "test" ];

From ed6adf3f44058e162d102bf9407ceacb3ed6fd26 Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Tue, 16 Feb 2016 08:42:15 +0100
Subject: [PATCH 1404/2285] re-enable grsec_testing, it has been updated since

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c07ef352e01b..0201fefad8b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10304,10 +10304,10 @@ let
   linux_grsec_stable_server_xen = throw "No longer supporteddue to https://grsecurity.net/announce.php. "
     + "Please use linux_grsec_testing_server_xen.";
 
-  # Testing kernels: outdated ATM
-  #linux_grsec_testing_desktop = grKernel grFlavors.linux_grsec_testing_desktop;
-  #linux_grsec_testing_server  = grKernel grFlavors.linux_grsec_testing_server;
-  #linux_grsec_testing_server_xen = grKernel grFlavors.linux_grsec_testing_server_xen;
+  # Testing kernels
+  linux_grsec_testing_desktop = grKernel grFlavors.linux_grsec_testing_desktop;
+  linux_grsec_testing_server  = grKernel grFlavors.linux_grsec_testing_server;
+  linux_grsec_testing_server_xen = grKernel grFlavors.linux_grsec_testing_server_xen;
 
   /* Linux kernel modules are inherently tied to a specific kernel.  So
      rather than provide specific instances of those packages for a
@@ -10454,7 +10454,7 @@ let
   linuxPackages_grsec_stable_server     = grPackage grFlavors.linux_grsec_stable_server;
   linuxPackages_grsec_stable_server_xen = grPackage grFlavors.linux_grsec_stable_server_xen;
 
-  # Testing kernels: outdated ATM
+  # Testing kernels
   linuxPackages_grsec_testing_desktop = grPackage grFlavors.linux_grsec_testing_desktop;
   linuxPackages_grsec_testing_server  = grPackage grFlavors.linux_grsec_testing_server;
   linuxPackages_grsec_testing_server_xen = grPackage grFlavors.linux_grsec_testing_server_xen;

From f59baafee2eea1489efc5fcdb9909849ccd226ab Mon Sep 17 00:00:00 2001
From: = <anothersms@gmail.com>
Date: Mon, 15 Feb 2016 21:34:59 +0100
Subject: [PATCH 1405/2285] glabels: init at 3.2.1 (git)

---
 .../applications/graphics/glabels/default.nix | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/applications/graphics/glabels/default.nix

diff --git a/pkgs/applications/graphics/glabels/default.nix b/pkgs/applications/graphics/glabels/default.nix
new file mode 100644
index 000000000000..cf1ab1942e58
--- /dev/null
+++ b/pkgs/applications/graphics/glabels/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, barcode, gnome3
+, gtk3, gtk_doc, libxml2, librsvg , libtool, libe-book
+, intltool, itstool, makeWrapper, pkgconfig, which
+}:
+
+stdenv.mkDerivation rec {
+  name = "glabels-${version}";
+  version = "3.2.1";
+  src = fetchFromGitHub {
+    owner = "jimevins";
+    repo = "glabels";
+    rev = "glabels-3_2_1";
+    sha256 = "1y6gz0v9si3cvdzhakbgkyc94fajg19rmykfgnc37alrc21vs9zg";
+  };
+
+  buildInputs = [
+    autoconf automake barcode gtk3 gtk_doc gnome3.yelp_tools
+    gnome3.gnome_common gnome3.gsettings_desktop_schemas
+    intltool itstool libxml2 librsvg libe-book libtool
+    makeWrapper pkgconfig 
+  ];
+
+  preFixup = ''
+    rm "$out/share/icons/hicolor/icon-theme.cache"
+    wrapProgram "$out/bin/glabels-3" \
+      --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
+  '';
+
+  preConfigure = "./autogen.sh";
+
+  meta = {
+    description = "Create labels and business cards";
+    homepage = http://glabels.org/;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [ stdenv.lib.maintainers.nico202 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 93558c8401f0..fa1ccd5c3273 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9400,6 +9400,8 @@ let
 
   gatling = callPackage ../servers/http/gatling { };
 
+  glabels = callPackage ../applications/graphics/glabels { };
+
   grafana = (callPackage ../servers/monitoring/grafana { }).bin // { outputs = ["bin"]; };
 
   groovebasin = callPackage ../applications/audio/groovebasin { };

From 0f7665ae37376fb7a98f86001c47f87e68b6f786 Mon Sep 17 00:00:00 2001
From: desiderius <didier@devroye.name>
Date: Tue, 16 Feb 2016 12:52:23 +0100
Subject: [PATCH 1406/2285] pythonPackages.python3pika: disable unit test

The tests adds dependencies to pyev, tornado and twisted (and
twisted is disabled for Python 3).
---
 pkgs/top-level/python-packages.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5d053c5f314c..1422ae09cc85 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14944,6 +14944,10 @@ in modules // {
   python3pika = buildPythonPackage {
     name = "python3-pika-0.9.14";
     disabled = !isPy3k;
+
+    # Unit tests adds dependencies on pyev, tornado and twisted (and twisted is disabled for Python 3)
+    doCheck = false;
+
     src = pkgs.fetchurl {
       url = https://pypi.python.org/packages/source/p/python3-pika/python3-pika-0.9.14.tar.gz;
       md5 = "f3a3ee58afe0ae06f1fa553710e1aa28";

From 5bb3ac70c624bc593b05be454ab521590fc8d0da Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Tue, 16 Feb 2016 10:57:33 +0100
Subject: [PATCH 1407/2285] backintime: 1.1.6 -> 1.1.12

---
 .../networking/sync/backintime/common.nix          | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix
index 14fa69974e8a..c3f8e0f02c66 100644
--- a/pkgs/applications/networking/sync/backintime/common.nix
+++ b/pkgs/applications/networking/sync/backintime/common.nix
@@ -1,13 +1,15 @@
-{stdenv, fetchurl, makeWrapper, gettext, python3, python3Packages, rsync, cron, openssh, sshfsFuse, encfs }:
+{stdenv, fetchFromGitHub, makeWrapper, gettext, python3, python3Packages, rsync, cron, openssh, sshfsFuse, encfs }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.6";
+  version = "1.1.12";
 
   name = "backintime-common-${version}";
 
-  src = fetchurl {
-    url = "https://launchpad.net/backintime/1.1/${version}/+download/backintime-${version}.tar.gz";
-    sha256 = "04yw1v6h959mmvc67mhh0km7vkxjzb7j1mniv5xfjdy27ryii1ig";
+  src = fetchFromGitHub {
+    owner = "bit-team";
+    repo = "backintime";
+    rev = "v${version}";
+    sha256 = "0n3x48wa8aa7i8fff85h3b5h3xpabk51ld0ymy3pkqh0krfgs59a";
   };
 
   buildInputs = [ makeWrapper gettext python3 python3Packages.dbus python3Packages.keyring openssh cron rsync sshfsFuse encfs ];
@@ -28,7 +30,7 @@ stdenv.mkDerivation rec {
     '';
 
   meta = {
-    homepage = https://launchpad.net/backintime;
+    homepage = https://github.com/bit-team/backintime;
     description = "Simple backup tool for Linux";
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.DamienCassou ];

From 108a0ae88185ebe530d90682118f067d85ebeaf6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Feb 2016 13:41:19 +0100
Subject: [PATCH 1408/2285] aws-sdk-cpp: Init at 0.9.6

---
 .../libraries/aws-sdk-cpp/default.nix         | 44 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/development/libraries/aws-sdk-cpp/default.nix

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
new file mode 100644
index 000000000000..22fb9facfea9
--- /dev/null
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -0,0 +1,44 @@
+{ lib, stdenv, fetchFromGitHub, cmake, curl }:
+
+stdenv.mkDerivation rec {
+  name = "aws-sdk-cpp-${version}";
+  version = "0.9.6";
+
+  src = fetchFromGitHub {
+    owner = "awslabs";
+    repo = "aws-sdk-cpp";
+    rev = version;
+    sha256 = "022v7naa5vjvq3wfn4mcp99li61ffsk2fnc8qqi52cb1pyxz9sk1";
+  };
+
+  buildInputs = [ cmake curl ];
+
+  # FIXME: provide flags to build only part of the SDK, or put them in
+  # different outputs.
+  # cmakeFlags = "-DBUILD_ONLY=aws-cpp-sdk-s3";
+
+  enableParallelBuilding = true;
+
+  preBuild =
+    ''
+      # Ensure that the unit tests can find the *.so files.
+      for i in testing-resources aws-cpp-sdk-*; do
+        export LD_LIBRARY_PATH=$(pwd)/$i:$LD_LIBRARY_PATH
+      done
+    '';
+
+  postInstall =
+    ''
+      # Move the .so files to a more reasonable location.
+      mv $out/lib/linux/*/Release/*.so $out/lib
+      rm -rf $out/lib/linux
+    '';
+
+  meta = {
+    description = "A C++ interface for Amazon Web Services";
+    homepage = https://github.com/awslabs/aws-sdk-cpp;
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.eelco ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2c227320bf3c..df1daa75acb0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6288,6 +6288,8 @@ let
     inherit (darwin.apple_sdk.frameworks) AudioUnit CoreServices;
   };
 
+  aws-sdk-cpp = callPackage ../development/libraries/aws-sdk-cpp { };
+
   babl = callPackage ../development/libraries/babl { };
 
   beecrypt = callPackage ../development/libraries/beecrypt { };

From 1bd0d41e0f4b62d3de5c6dea0398fd90f6d1e955 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Tue, 16 Feb 2016 10:42:13 +0100
Subject: [PATCH 1409/2285] pharo-vm: 2016.01.14 -> 2016.02.15

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

diff --git a/pkgs/development/pharo/vm/default.nix b/pkgs/development/pharo/vm/default.nix
index 9af1b5ad5ba1..0628e8545e73 100644
--- a/pkgs/development/pharo/vm/default.nix
+++ b/pkgs/development/pharo/vm/default.nix
@@ -16,12 +16,12 @@ rec {
   };
 
   pharo-spur = pharo-vm-build rec {
-    version = "2016.01.14";
+    version = "2016.02.15";
     name = "pharo-vm-spur-i386-${version}";
     binary-basename = "pharo-spur-vm";
     src = fetchurl {
       url = "${base-url}/pharo-vm-spur-${version}.tar.bz2";
-      sha256 = "1746kisa3wkhg1kwgjs544s3f17r8h99kr728qc4nk035dxkjfbx";
+      sha256 = "1lyz6wkxg9cmhgbg32a27kyj1syvk3p3015ga83z98353xlz91rx";
     };
   };
 }

From acd75605a23717e5a591c04b68eb52c70ebf538a Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 16 Feb 2016 14:13:53 +0100
Subject: [PATCH 1410/2285] vdirsyncer: 0.8.1 -> 0.9.0

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

diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index 890186992637..4d3c43db3bdf 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "0.8.1";
+  version = "0.9.0";
   name = "vdirsyncer-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://pypi.python.org/packages/source/v/vdirsyncer/${name}.tar.gz";
-    sha256 = "1abflqw6x30xd2dlj58cr5n62x98kc0ia9f9vr8l64k2z1fjlq78";
+    sha256 = "0s9awjr9v60rr80xcpwmdhkf4v1yqnydahjmxwvxmh64565is465";
   };
 
   propagatedBuildInputs = with pythonPackages; [

From 27709b6050e0eca26927aad5a91d8b6e502b7f9b Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Tue, 16 Feb 2016 14:17:28 +0100
Subject: [PATCH 1411/2285] mdp: 1.0.4 -> 1.0.5

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

diff --git a/pkgs/applications/misc/mdp/default.nix b/pkgs/applications/misc/mdp/default.nix
index 1a89bda888ee..45b0271f693e 100644
--- a/pkgs/applications/misc/mdp/default.nix
+++ b/pkgs/applications/misc/mdp/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, ncurses }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.4";
+  version = "1.0.5";
   name = "mdp-${version}";
 
   src = fetchurl {
     url = "https://github.com/visit1985/mdp/archive/${version}.tar.gz";
-    sha256 = "1wvys3sb0ki7zz5b0y4bl9x6jdj7h88lxsf8vap95k1sj2ymanlm";
+    sha256 = "0ckd9k5571zc7pzxdx84gv8k103d5qp49f2i477a395fy2pnq4m8";
   };
 
   makeFlags = "PREFIX=$(out)";

From 2ce37d089f97daefdec7a9f4a369d855064188c0 Mon Sep 17 00:00:00 2001
From: desiderius <didier@devroye.name>
Date: Tue, 16 Feb 2016 14:22:19 +0100
Subject: [PATCH 1412/2285] pythonPackages.consul: 0.4.7 -> 0.6.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1422ae09cc85..6ca2baeb35cd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3275,11 +3275,11 @@ in modules // {
 
 
   consul = buildPythonPackage (rec {
-    name = "python-consul-0.4.7";
+    name = "python-consul-0.6.0";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/p/python-consul/${name}.tar.gz";
-      sha256 = "1vb0hgl11n8krpk5n22bk90agm31004ipv4xnbcadzczj5xackg7";
+      sha256 = "0vfyr499sbc4nnhhijp2lznyj507nnak95bvv9w8y78ngxggskbh";
     };
 
     buildInputs = with self; [ requests2 six pytest ];

From 97bbc37b6fac4b0205b3da239619df5fafdbd7cf Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 16 Feb 2016 14:11:01 +0000
Subject: [PATCH 1413/2285] rekonq: fix homepage url

---
 pkgs/applications/networking/browsers/rekonq/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix
index df8ad1eb3508..70aa648ccc50 100644
--- a/pkgs/applications/networking/browsers/rekonq/default.nix
+++ b/pkgs/applications/networking/browsers/rekonq/default.nix
@@ -21,6 +21,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = [ maintainers.urkud ];
     description = "KDE Webkit browser";
-    homepage = http://rekonq.sourceforge.net;
+    homepage = https://rekonq.kde.org/;
   };
 }

From b5aa8a4e641e2b5ec0e39f7438f9febc5b09f5e6 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Tue, 16 Feb 2016 16:10:12 +0100
Subject: [PATCH 1414/2285] glibc: patch CVE-2015-7547

The glibc DNS client side resolver is vulnerable to a stack-based buffer
overflow when the getaddrinfo() library function is used. Software using
this function may be exploited with attacker-controlled domain names,
attacker-controlled DNS servers, or through a man-in-the-middle attack.
https://googleonlinesecurity.blogspot.co.uk/2016/02/cve-2015-7547-glibc-getaddrinfo-stack.html
---
 pkgs/development/libraries/glibc/common.nix   |   1 +
 .../libraries/glibc/cve-2015-7547.patch       | 569 ++++++++++++++++++
 2 files changed, 570 insertions(+)
 create mode 100644 pkgs/development/libraries/glibc/cve-2015-7547.patch

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 26d2f2454b45..45f5c24e959b 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -61,6 +61,7 @@ stdenv.mkDerivation ({
       ./security-bdf1ff05.patch
       ./cve-2014-8121.patch
       ./cve-2015-1781.patch
+      ./cve-2015-7547.patch
 
       ./glibc-locale-incompatibility.patch
     ];
diff --git a/pkgs/development/libraries/glibc/cve-2015-7547.patch b/pkgs/development/libraries/glibc/cve-2015-7547.patch
new file mode 100644
index 000000000000..1f10aafe0c05
--- /dev/null
+++ b/pkgs/development/libraries/glibc/cve-2015-7547.patch
@@ -0,0 +1,569 @@
+
+CVE-2015-7547
+
+2016-02-15  Carlos O'Donell  <carlos@redhat.com>
+
+	[BZ #18665]
+	* resolv/nss_dns/dns-host.c (gaih_getanswer_slice): Always set
+	*herrno_p.
+	(gaih_getanswer): Document functional behviour. Return tryagain
+	if any result is tryagain.
+	* resolv/res_query.c (__libc_res_nsearch): Set buffer size to zero
+	when freed.
+	* resolv/res_send.c: Add copyright text.
+	(__libc_res_nsend): Document that MAXPACKET is expected.
+	(send_vc): Document. Remove buffer reuse.
+	(send_dg): Document. Remove buffer reuse. Set *thisanssizp to set the
+	size of the buffer. Add Dprint for truncated UDP buffer.
+
+diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
+index a255d5e..47cfe27 100644
+--- a/resolv/nss_dns/dns-host.c
++++ b/resolv/nss_dns/dns-host.c
+@@ -1031,7 +1031,10 @@ gaih_getanswer_slice (const querybuf *answer, int anslen, const char *qname,
+   int h_namelen = 0;
+ 
+   if (ancount == 0)
+-    return NSS_STATUS_NOTFOUND;
++    {
++      *h_errnop = HOST_NOT_FOUND;
++      return NSS_STATUS_NOTFOUND;
++    }
+ 
+   while (ancount-- > 0 && cp < end_of_message && had_error == 0)
+     {
+@@ -1208,7 +1211,14 @@ gaih_getanswer_slice (const querybuf *answer, int anslen, const char *qname,
+   /* Special case here: if the resolver sent a result but it only
+      contains a CNAME while we are looking for a T_A or T_AAAA record,
+      we fail with NOTFOUND instead of TRYAGAIN.  */
+-  return canon == NULL ? NSS_STATUS_TRYAGAIN : NSS_STATUS_NOTFOUND;
++  if (canon != NULL)
++    {
++      *h_errnop = HOST_NOT_FOUND;
++      return NSS_STATUS_NOTFOUND;
++    }
++
++  *h_errnop = NETDB_INTERNAL;
++  return NSS_STATUS_TRYAGAIN;
+ }
+ 
+ 
+@@ -1222,11 +1232,101 @@ gaih_getanswer (const querybuf *answer1, int anslen1, const querybuf *answer2,
+ 
+   enum nss_status status = NSS_STATUS_NOTFOUND;
+ 
++  /* Combining the NSS status of two distinct queries requires some
++     compromise and attention to symmetry (A or AAAA queries can be
++     returned in any order).  What follows is a breakdown of how this
++     code is expected to work and why. We discuss only SUCCESS,
++     TRYAGAIN, NOTFOUND and UNAVAIL, since they are the only returns
++     that apply (though RETURN and MERGE exist).  We make a distinction
++     between TRYAGAIN (recoverable) and TRYAGAIN' (not-recoverable).
++     A recoverable TRYAGAIN is almost always due to buffer size issues
++     and returns ERANGE in errno and the caller is expected to retry
++     with a larger buffer.
++
++     Lastly, you may be tempted to make significant changes to the
++     conditions in this code to bring about symmetry between responses.
++     Please don't change anything without due consideration for
++     expected application behaviour.  Some of the synthesized responses
++     aren't very well thought out and sometimes appear to imply that
++     IPv4 responses are always answer 1, and IPv6 responses are always
++     answer 2, but that's not true (see the implemetnation of send_dg
++     and send_vc to see response can arrive in any order, particlarly
++     for UDP). However, we expect it holds roughly enough of the time
++     that this code works, but certainly needs to be fixed to make this
++     a more robust implementation.
++
++     ----------------------------------------------
++     | Answer 1 Status /   | Synthesized | Reason |
++     | Answer 2 Status     | Status      |        |
++     |--------------------------------------------|
++     | SUCCESS/SUCCESS     | SUCCESS     | [1]    |
++     | SUCCESS/TRYAGAIN    | TRYAGAIN    | [5]    |
++     | SUCCESS/TRYAGAIN'   | SUCCESS     | [1]    |
++     | SUCCESS/NOTFOUND    | SUCCESS     | [1]    |
++     | SUCCESS/UNAVAIL     | SUCCESS     | [1]    |
++     | TRYAGAIN/SUCCESS    | TRYAGAIN    | [2]    |
++     | TRYAGAIN/TRYAGAIN   | TRYAGAIN    | [2]    |
++     | TRYAGAIN/TRYAGAIN'  | TRYAGAIN    | [2]    |
++     | TRYAGAIN/NOTFOUND   | TRYAGAIN    | [2]    |
++     | TRYAGAIN/UNAVAIL    | TRYAGAIN    | [2]    |
++     | TRYAGAIN'/SUCCESS   | SUCCESS     | [3]    |
++     | TRYAGAIN'/TRYAGAIN  | TRYAGAIN    | [3]    |
++     | TRYAGAIN'/TRYAGAIN' | TRYAGAIN'   | [3]    |
++     | TRYAGAIN'/NOTFOUND  | TRYAGAIN'   | [3]    |
++     | TRYAGAIN'/UNAVAIL   | UNAVAIL     | [3]    |
++     | NOTFOUND/SUCCESS    | SUCCESS     | [3]    |
++     | NOTFOUND/TRYAGAIN   | TRYAGAIN    | [3]    |
++     | NOTFOUND/TRYAGAIN'  | TRYAGAIN'   | [3]    |
++     | NOTFOUND/NOTFOUND   | NOTFOUND    | [3]    |
++     | NOTFOUND/UNAVAIL    | UNAVAIL     | [3]    |
++     | UNAVAIL/SUCCESS     | UNAVAIL     | [4]    |
++     | UNAVAIL/TRYAGAIN    | UNAVAIL     | [4]    |
++     | UNAVAIL/TRYAGAIN'   | UNAVAIL     | [4]    |
++     | UNAVAIL/NOTFOUND    | UNAVAIL     | [4]    |
++     | UNAVAIL/UNAVAIL     | UNAVAIL     | [4]    |
++     ----------------------------------------------
++
++     [1] If the first response is a success we return success.
++         This ignores the state of the second answer and in fact
++         incorrectly sets errno and h_errno to that of the second
++	 answer.  However because the response is a success we ignore
++	 *errnop and *h_errnop (though that means you touched errno on
++         success).  We are being conservative here and returning the
++         likely IPv4 response in the first answer as a success.
++
++     [2] If the first response is a recoverable TRYAGAIN we return
++	 that instead of looking at the second response.  The
++	 expectation here is that we have failed to get an IPv4 response
++	 and should retry both queries.
++
++     [3] If the first response was not a SUCCESS and the second
++	 response is not NOTFOUND (had a SUCCESS, need to TRYAGAIN,
++	 or failed entirely e.g. TRYAGAIN' and UNAVAIL) then use the
++	 result from the second response, otherwise the first responses
++	 status is used.  Again we have some odd side-effects when the
++	 second response is NOTFOUND because we overwrite *errnop and
++	 *h_errnop that means that a first answer of NOTFOUND might see
++	 its *errnop and *h_errnop values altered.  Whether it matters
++	 in practice that a first response NOTFOUND has the wrong
++	 *errnop and *h_errnop is undecided.
++
++     [4] If the first response is UNAVAIL we return that instead of
++	 looking at the second response.  The expectation here is that
++	 it will have failed similarly e.g. configuration failure.
++
++     [5] Testing this code is complicated by the fact that truncated
++	 second response buffers might be returned as SUCCESS if the
++	 first answer is a SUCCESS.  To fix this we add symmetry to
++	 TRYAGAIN with the second response.  If the second response
++	 is a recoverable error we now return TRYAGIN even if the first
++	 response was SUCCESS.  */
++
+   if (anslen1 > 0)
+     status = gaih_getanswer_slice(answer1, anslen1, qname,
+ 				  &pat, &buffer, &buflen,
+ 				  errnop, h_errnop, ttlp,
+ 				  &first);
++
+   if ((status == NSS_STATUS_SUCCESS || status == NSS_STATUS_NOTFOUND
+        || (status == NSS_STATUS_TRYAGAIN
+ 	   /* We want to look at the second answer in case of an
+@@ -1242,8 +1342,15 @@ gaih_getanswer (const querybuf *answer1, int anslen1, const querybuf *answer2,
+ 						     &pat, &buffer, &buflen,
+ 						     errnop, h_errnop, ttlp,
+ 						     &first);
++      /* Use the second response status in some cases.  */
+       if (status != NSS_STATUS_SUCCESS && status2 != NSS_STATUS_NOTFOUND)
+ 	status = status2;
++      /* Do not return a truncated second response (unless it was
++         unavoidable e.g. unrecoverable TRYAGAIN).  */
++      if (status == NSS_STATUS_SUCCESS
++	  && (status2 == NSS_STATUS_TRYAGAIN
++	      && *errnop == ERANGE && *h_errnop != NO_RECOVERY))
++	status = NSS_STATUS_TRYAGAIN;
+     }
+ 
+   return status;
+diff --git a/resolv/res_query.c b/resolv/res_query.c
+index 4a9b3b3..95470a9 100644
+--- a/resolv/res_query.c
++++ b/resolv/res_query.c
+@@ -396,6 +396,7 @@ __libc_res_nsearch(res_state statp,
+ 		  {
+ 		    free (*answerp2);
+ 		    *answerp2 = NULL;
++		    *nanswerp2 = 0;
+ 		    *answerp2_malloced = 0;
+ 		  }
+ 	}
+@@ -447,6 +448,7 @@ __libc_res_nsearch(res_state statp,
+ 			  {
+ 			    free (*answerp2);
+ 			    *answerp2 = NULL;
++			    *nanswerp2 = 0;
+ 			    *answerp2_malloced = 0;
+ 			  }
+ 
+@@ -521,6 +523,7 @@ __libc_res_nsearch(res_state statp,
+ 	  {
+ 	    free (*answerp2);
+ 	    *answerp2 = NULL;
++	    *nanswerp2 = 0;
+ 	    *answerp2_malloced = 0;
+ 	  }
+ 	if (saved_herrno != -1)
+diff --git a/resolv/res_send.c b/resolv/res_send.c
+index a968b95..21843f1 100644
+--- a/resolv/res_send.c
++++ b/resolv/res_send.c
+@@ -1,3 +1,20 @@
++/* Copyright (C) 2016 Free Software Foundation, Inc.
++   This file is part of the GNU C Library.
++
++   The GNU C Library is free software; you can redistribute it and/or
++   modify it under the terms of the GNU Lesser General Public
++   License as published by the Free Software Foundation; either
++   version 2.1 of the License, or (at your option) any later version.
++
++   The GNU C Library is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++   Lesser General Public License for more details.
++
++   You should have received a copy of the GNU Lesser General Public
++   License along with the GNU C Library; if not, see
++   <http://www.gnu.org/licenses/>.  */
++
+ /*
+  * Copyright (c) 1985, 1989, 1993
+  *    The Regents of the University of California.  All rights reserved.
+@@ -355,6 +372,8 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
+ #ifdef USE_HOOKS
+ 	if (__glibc_unlikely (statp->qhook || statp->rhook))       {
+ 		if (anssiz < MAXPACKET && ansp) {
++			/* Always allocate MAXPACKET, callers expect
++			   this specific size.  */
+ 			u_char *buf = malloc (MAXPACKET);
+ 			if (buf == NULL)
+ 				return (-1);
+@@ -630,6 +649,77 @@ get_nsaddr (res_state statp, int n)
+     return (struct sockaddr *) (void *) &statp->nsaddr_list[n];
+ }
+ 
++/* The send_vc function is responsible for sending a DNS query over TCP
++   to the nameserver numbered NS from the res_state STATP i.e.
++   EXT(statp).nssocks[ns].  The function supports sending both IPv4 and
++   IPv6 queries at the same serially on the same socket.
++
++   Please note that for TCP there is no way to disable sending both
++   queries, unlike UDP, which honours RES_SNGLKUP and RES_SNGLKUPREOP
++   and sends the queries serially and waits for the result after each
++   sent query.  This implemetnation should be corrected to honour these
++   options.
++
++   Please also note that for TCP we send both queries over the same
++   socket one after another.  This technically violates best practice
++   since the server is allowed to read the first query, respond, and
++   then close the socket (to service another client).  If the server
++   does this, then the remaining second query in the socket data buffer
++   will cause the server to send the client an RST which will arrive
++   asynchronously and the client's OS will likely tear down the socket
++   receive buffer resulting in a potentially short read and lost
++   response data.  This will force the client to retry the query again,
++   and this process may repeat until all servers and connection resets
++   are exhausted and then the query will fail.  It's not known if this
++   happens with any frequency in real DNS server implementations.  This
++   implementation should be corrected to use two sockets by default for
++   parallel queries.
++
++   The query stored in BUF of BUFLEN length is sent first followed by
++   the query stored in BUF2 of BUFLEN2 length.  Queries are sent
++   serially on the same socket.
++
++   Answers to the query are stored firstly in *ANSP up to a max of
++   *ANSSIZP bytes.  If more than *ANSSIZP bytes are needed and ANSCP
++   is non-NULL (to indicate that modifying the answer buffer is allowed)
++   then malloc is used to allocate a new response buffer and ANSCP and
++   ANSP will both point to the new buffer.  If more than *ANSSIZP bytes
++   are needed but ANSCP is NULL, then as much of the response as
++   possible is read into the buffer, but the results will be truncated.
++   When truncation happens because of a small answer buffer the DNS
++   packets header feild TC will bet set to 1, indicating a truncated
++   message and the rest of the socket data will be read and discarded.
++
++   Answers to the query are stored secondly in *ANSP2 up to a max of
++   *ANSSIZP2 bytes, with the actual response length stored in
++   *RESPLEN2.  If more than *ANSSIZP bytes are needed and ANSP2
++   is non-NULL (required for a second query) then malloc is used to
++   allocate a new response buffer, *ANSSIZP2 is set to the new buffer
++   size and *ANSP2_MALLOCED is set to 1.
++
++   The ANSP2_MALLOCED argument will eventually be removed as the
++   change in buffer pointer can be used to detect the buffer has
++   changed and that the caller should use free on the new buffer.
++
++   Note that the answers may arrive in any order from the server and
++   therefore the first and second answer buffers may not correspond to
++   the first and second queries.
++
++   It is not supported to call this function with a non-NULL ANSP2
++   but a NULL ANSCP.  Put another way, you can call send_vc with a
++   single unmodifiable buffer or two modifiable buffers, but no other
++   combination is supported.
++
++   It is the caller's responsibility to free the malloc allocated
++   buffers by detecting that the pointers have changed from their
++   original values i.e. *ANSCP or *ANSP2 has changed.
++
++   If errors are encountered then *TERRNO is set to an appropriate
++   errno value and a zero result is returned for a recoverable error,
++   and a less-than zero result is returned for a non-recoverable error.
++
++   If no errors are encountered then *TERRNO is left unmodified and
++   a the length of the first response in bytes is returned.  */
+ static int
+ send_vc(res_state statp,
+ 	const u_char *buf, int buflen, const u_char *buf2, int buflen2,
+@@ -639,11 +729,7 @@ send_vc(res_state statp,
+ {
+ 	const HEADER *hp = (HEADER *) buf;
+ 	const HEADER *hp2 = (HEADER *) buf2;
+-	u_char *ans = *ansp;
+-	int orig_anssizp = *anssizp;
+-	// XXX REMOVE
+-	// int anssiz = *anssizp;
+-	HEADER *anhp = (HEADER *) ans;
++	HEADER *anhp = (HEADER *) *ansp;
+ 	struct sockaddr *nsap = get_nsaddr (statp, ns);
+ 	int truncating, connreset, n;
+ 	/* On some architectures compiler might emit a warning indicating
+@@ -731,6 +817,8 @@ send_vc(res_state statp,
+ 	 * Receive length & response
+ 	 */
+ 	int recvresp1 = 0;
++	/* Skip the second response if there is no second query.
++           To do that we mark the second response as received.  */
+ 	int recvresp2 = buf2 == NULL;
+ 	uint16_t rlen16;
+  read_len:
+@@ -767,36 +855,14 @@ send_vc(res_state statp,
+ 	u_char **thisansp;
+ 	int *thisresplenp;
+ 	if ((recvresp1 | recvresp2) == 0 || buf2 == NULL) {
++		/* We have not received any responses
++		   yet or we only have one response to
++		   receive.  */
+ 		thisanssizp = anssizp;
+ 		thisansp = anscp ?: ansp;
+ 		assert (anscp != NULL || ansp2 == NULL);
+ 		thisresplenp = &resplen;
+ 	} else {
+-		if (*anssizp != MAXPACKET) {
+-			/* No buffer allocated for the first
+-			   reply.  We can try to use the rest
+-			   of the user-provided buffer.  */
+-			DIAG_PUSH_NEEDS_COMMENT;
+-			DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
+-#if _STRING_ARCH_unaligned
+-			*anssizp2 = orig_anssizp - resplen;
+-			*ansp2 = *ansp + resplen;
+-#else
+-			int aligned_resplen
+-			  = ((resplen + __alignof__ (HEADER) - 1)
+-			     & ~(__alignof__ (HEADER) - 1));
+-			*anssizp2 = orig_anssizp - aligned_resplen;
+-			*ansp2 = *ansp + aligned_resplen;
+-#endif
+-			DIAG_POP_NEEDS_COMMENT;
+-		} else {
+-			/* The first reply did not fit into the
+-			   user-provided buffer.  Maybe the second
+-			   answer will.  */
+-			*anssizp2 = orig_anssizp;
+-			*ansp2 = *ansp;
+-		}
+-
+ 		thisanssizp = anssizp2;
+ 		thisansp = ansp2;
+ 		thisresplenp = resplen2;
+@@ -804,10 +870,14 @@ send_vc(res_state statp,
+ 	anhp = (HEADER *) *thisansp;
+ 
+ 	*thisresplenp = rlen;
+-	if (rlen > *thisanssizp) {
+-		/* Yes, we test ANSCP here.  If we have two buffers
+-		   both will be allocatable.  */
+-		if (__glibc_likely (anscp != NULL))       {
++	/* Is the answer buffer too small?  */
++	if (*thisanssizp < rlen) {
++		/* If the current buffer is not the the static
++		   user-supplied buffer then we can reallocate
++		   it.  */
++		if (thisansp != NULL && thisansp != ansp) {
++			/* Always allocate MAXPACKET, callers expect
++			   this specific size.  */
+ 			u_char *newp = malloc (MAXPACKET);
+ 			if (newp == NULL) {
+ 				*terrno = ENOMEM;
+@@ -819,6 +889,9 @@ send_vc(res_state statp,
+ 			if (thisansp == ansp2)
+ 			  *ansp2_malloced = 1;
+ 			anhp = (HEADER *) newp;
++			/* A uint16_t can't be larger than MAXPACKET
++			   thus it's safe to allocate MAXPACKET but
++			   read RLEN bytes instead.  */
+ 			len = rlen;
+ 		} else {
+ 			Dprint(statp->options & RES_DEBUG,
+@@ -948,6 +1021,66 @@ reopen (res_state statp, int *terrno, int ns)
+ 	return 1;
+ }
+ 
++/* The send_dg function is responsible for sending a DNS query over UDP
++   to the nameserver numbered NS from the res_state STATP i.e.
++   EXT(statp).nssocks[ns].  The function supports IPv4 and IPv6 queries
++   along with the ability to send the query in parallel for both stacks
++   (default) or serially (RES_SINGLKUP).  It also supports serial lookup
++   with a close and reopen of the socket used to talk to the server
++   (RES_SNGLKUPREOP) to work around broken name servers.
++
++   The query stored in BUF of BUFLEN length is sent first followed by
++   the query stored in BUF2 of BUFLEN2 length.  Queries are sent
++   in parallel (default) or serially (RES_SINGLKUP or RES_SNGLKUPREOP).
++
++   Answers to the query are stored firstly in *ANSP up to a max of
++   *ANSSIZP bytes.  If more than *ANSSIZP bytes are needed and ANSCP
++   is non-NULL (to indicate that modifying the answer buffer is allowed)
++   then malloc is used to allocate a new response buffer and ANSCP and
++   ANSP will both point to the new buffer.  If more than *ANSSIZP bytes
++   are needed but ANSCP is NULL, then as much of the response as
++   possible is read into the buffer, but the results will be truncated.
++   When truncation happens because of a small answer buffer the DNS
++   packets header feild TC will bet set to 1, indicating a truncated
++   message, while the rest of the UDP packet is discarded.
++
++   Answers to the query are stored secondly in *ANSP2 up to a max of
++   *ANSSIZP2 bytes, with the actual response length stored in
++   *RESPLEN2.  If more than *ANSSIZP bytes are needed and ANSP2
++   is non-NULL (required for a second query) then malloc is used to
++   allocate a new response buffer, *ANSSIZP2 is set to the new buffer
++   size and *ANSP2_MALLOCED is set to 1.
++
++   The ANSP2_MALLOCED argument will eventually be removed as the
++   change in buffer pointer can be used to detect the buffer has
++   changed and that the caller should use free on the new buffer.
++
++   Note that the answers may arrive in any order from the server and
++   therefore the first and second answer buffers may not correspond to
++   the first and second queries.
++
++   It is not supported to call this function with a non-NULL ANSP2
++   but a NULL ANSCP.  Put another way, you can call send_vc with a
++   single unmodifiable buffer or two modifiable buffers, but no other
++   combination is supported.
++
++   It is the caller's responsibility to free the malloc allocated
++   buffers by detecting that the pointers have changed from their
++   original values i.e. *ANSCP or *ANSP2 has changed.
++
++   If an answer is truncated because of UDP datagram DNS limits then
++   *V_CIRCUIT is set to 1 and the return value non-zero to indicate to
++   the caller to retry with TCP.  The value *GOTSOMEWHERE is set to 1
++   if any progress was made reading a response from the nameserver and
++   is used by the caller to distinguish between ECONNREFUSED and
++   ETIMEDOUT (the latter if *GOTSOMEWHERE is 1).
++
++   If errors are encountered then *TERRNO is set to an appropriate
++   errno value and a zero result is returned for a recoverable error,
++   and a less-than zero result is returned for a non-recoverable error.
++
++   If no errors are encountered then *TERRNO is left unmodified and
++   a the length of the first response in bytes is returned.  */
+ static int
+ send_dg(res_state statp,
+ 	const u_char *buf, int buflen, const u_char *buf2, int buflen2,
+@@ -957,8 +1090,6 @@ send_dg(res_state statp,
+ {
+ 	const HEADER *hp = (HEADER *) buf;
+ 	const HEADER *hp2 = (HEADER *) buf2;
+-	u_char *ans = *ansp;
+-	int orig_anssizp = *anssizp;
+ 	struct timespec now, timeout, finish;
+ 	struct pollfd pfd[1];
+ 	int ptimeout;
+@@ -991,6 +1122,8 @@ send_dg(res_state statp,
+ 	int need_recompute = 0;
+ 	int nwritten = 0;
+ 	int recvresp1 = 0;
++	/* Skip the second response if there is no second query.
++           To do that we mark the second response as received.  */
+ 	int recvresp2 = buf2 == NULL;
+ 	pfd[0].fd = EXT(statp).nssocks[ns];
+ 	pfd[0].events = POLLOUT;
+@@ -1154,55 +1287,56 @@ send_dg(res_state statp,
+ 		int *thisresplenp;
+ 
+ 		if ((recvresp1 | recvresp2) == 0 || buf2 == NULL) {
++			/* We have not received any responses
++			   yet or we only have one response to
++			   receive.  */
+ 			thisanssizp = anssizp;
+ 			thisansp = anscp ?: ansp;
+ 			assert (anscp != NULL || ansp2 == NULL);
+ 			thisresplenp = &resplen;
+ 		} else {
+-			if (*anssizp != MAXPACKET) {
+-				/* No buffer allocated for the first
+-				   reply.  We can try to use the rest
+-				   of the user-provided buffer.  */
+-#if _STRING_ARCH_unaligned
+-				*anssizp2 = orig_anssizp - resplen;
+-				*ansp2 = *ansp + resplen;
+-#else
+-				int aligned_resplen
+-				  = ((resplen + __alignof__ (HEADER) - 1)
+-				     & ~(__alignof__ (HEADER) - 1));
+-				*anssizp2 = orig_anssizp - aligned_resplen;
+-				*ansp2 = *ansp + aligned_resplen;
+-#endif
+-			} else {
+-				/* The first reply did not fit into the
+-				   user-provided buffer.  Maybe the second
+-				   answer will.  */
+-				*anssizp2 = orig_anssizp;
+-				*ansp2 = *ansp;
+-			}
+-
+ 			thisanssizp = anssizp2;
+ 			thisansp = ansp2;
+ 			thisresplenp = resplen2;
+ 		}
+ 
+ 		if (*thisanssizp < MAXPACKET
+-		    /* Yes, we test ANSCP here.  If we have two buffers
+-		       both will be allocatable.  */
+-		    && anscp
++		    /* If the current buffer is not the the static
++		       user-supplied buffer then we can reallocate
++		       it.  */
++		    && (thisansp != NULL && thisansp != ansp)
+ #ifdef FIONREAD
++		    /* Is the size too small?  */
+ 		    && (ioctl (pfd[0].fd, FIONREAD, thisresplenp) < 0
+ 			|| *thisanssizp < *thisresplenp)
+ #endif
+                     ) {
++			/* Always allocate MAXPACKET, callers expect
++			   this specific size.  */
+ 			u_char *newp = malloc (MAXPACKET);
+ 			if (newp != NULL) {
+-				*anssizp = MAXPACKET;
+-				*thisansp = ans = newp;
++				*thisanssizp = MAXPACKET;
++				*thisansp = newp;
+ 				if (thisansp == ansp2)
+ 				  *ansp2_malloced = 1;
+ 			}
+ 		}
++		/* We could end up with truncation if anscp was NULL
++		   (not allowed to change caller's buffer) and the
++		   response buffer size is too small.  This isn't a
++		   reliable way to detect truncation because the ioctl
++		   may be an inaccurate report of the UDP message size.
++		   Therefore we use this only to issue debug output.
++		   To do truncation accurately with UDP we need
++		   MSG_TRUNC which is only available on Linux.  We
++		   can abstract out the Linux-specific feature in the
++		   future to detect truncation.  */
++		if (__glibc_unlikely (*thisanssizp < *thisresplenp)) {
++			Dprint(statp->options & RES_DEBUG,
++			       (stdout, ";; response may be truncated (UDP)\n")
++			);
++		}
++
+ 		HEADER *anhp = (HEADER *) *thisansp;
+ 		socklen_t fromlen = sizeof(struct sockaddr_in6);
+ 		assert (sizeof(from) <= fromlen);
+

From 2678f3688416a5ace7302bd8f18d3cd71ffa4c05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Val=C3=A9rian=20Galliat?= <val@codejam.info>
Date: Tue, 16 Feb 2016 10:34:21 -0500
Subject: [PATCH 1415/2285] Fix OMake source URL

Current source is 404, moving to pkgs.fedoraproject.org mirror.

Should fix current aborted jobs on Hydra: http://hydra.nixos.org/eval/1237311#tabs-aborted
---
 pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
index 986bd4609d5c..40188734a996 100644
--- a/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
+++ b/pkgs/development/tools/ocaml/omake/0.9.8.6-rc1.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "${webpage}/downloads/${pname}-${version}.tar.gz";
+    url = "http://pkgs.fedoraproject.org/repo/pkgs/ocaml-omake/${pname}-${version}.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/${pname}-${version}.tar.gz";
     sha256 = "1sas02pbj56m7wi5vf3vqrrpr4ynxymw2a8ybvfj2dkjf7q9ii13";
   };
   patchFlags = "-p0";

From a6cf5ddc982f0f72336b16708ceb58be944cc5f7 Mon Sep 17 00:00:00 2001
From: Eric Hegnes <eric.hegnes@gmail.com>
Date: Mon, 15 Feb 2016 12:39:36 -0500
Subject: [PATCH 1416/2285] Update Cargo crates index

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

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index cc16f4502273..fc3e8fcb98cc 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,15 +7,15 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2016-02-02";
-  rev = "9312acc30def6bb16739ab6c4560fb9880b25c5a";
+  version = "2016-02-15";
+  rev = "af2c6a768083a66a898a07f5f3b7ec62871dbc3c";
 
   src = fetchFromGitHub {
       inherit rev;
 
       owner = "rust-lang";
       repo = "crates.io-index";
-      sha256 = "0mrfcipc7sv0kzryjs649x3j4djr8jgbl58jd21hrcihc61qa38n";
+      sha256 = "f2da91b1a11146eed04c4b4ad7599f1bd3dc2bca4e011b3377ba16365b3124aa";
   };
 
 in

From 23ab6bf6b274a0605a8099d98623e8b9af6b24f7 Mon Sep 17 00:00:00 2001
From: Eric Hegnes <eric.hegnes@gmail.com>
Date: Mon, 15 Feb 2016 15:43:31 -0500
Subject: [PATCH 1417/2285] exa: init at git 2016-02-15

---
 lib/maintainers.nix             |  1 +
 pkgs/tools/misc/exa/default.nix | 38 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 3 files changed, 41 insertions(+)
 create mode 100644 pkgs/tools/misc/exa/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index f8c7c2e21e5b..24ae4c9fc409 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -95,6 +95,7 @@
   eduarrrd = "Eduard Bachmakov <e.bachmakov@gmail.com>";
   edwtjo = "Edward Tjörnhammar <ed@cflags.cc>";
   eelco = "Eelco Dolstra <eelco.dolstra@logicblox.com>";
+  ehegnes = "Eric Hegnes <eric.hegnes@gmail.com>";
   ehmry = "Emery Hemingway <emery@vfemail.net>";
   eikek = "Eike Kettner <eike.kettner@posteo.de>";
   elasticdog = "Aaron Bull Schaefer <aaron@elasticdog.com>";
diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix
new file mode 100644
index 000000000000..8518a7331b95
--- /dev/null
+++ b/pkgs/tools/misc/exa/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, rustPlatform, openssl, cmake, zlib }:
+
+with rustPlatform;
+
+buildRustPackage rec {
+  name = "exa-${version}";
+  version = "2016-02-15";
+
+  depsSha256 = "1925nhpfph82wn755zf2nmad24f1hzbxq60gpva9sic6rnap4c1x";
+
+  src = fetchFromGitHub {
+    owner = "ogham";
+    repo = "exa";
+    rev = "252eba484476369bb966fb1af7f739732b968fc0";
+    sha256 = "1smyy32z44zgmhyhlbjaxcgfnlbcwz7am9225yppqfdsiqqgdybf";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ openssl zlib ];
+
+  # Some tests fail, but Travis ensures a proper build
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    description = "Replacement for 'ls' written in Rust";
+    longDescription = ''
+      exa is a modern replacement for ls. It uses colours for information by
+      default, helping you distinguish between many types of files, such as
+      whether you are the owner, or in the owning group. It also has extra
+      features not present in the original ls, such as viewing the Git status
+      for a directory, or recursing into directories with a tree view. exa is
+      written in Rust, so it’s small, fast, and portable.
+    '';
+    homepage = http://bsago.me/exa;
+    license = licenses.mit;
+    maintainer = [ maintainers.ehegnes ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 93558c8401f0..ad9efd6105ef 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1472,6 +1472,8 @@ let
 
   evtest = callPackage ../applications/misc/evtest { };
 
+  exa = callPackage ../tools/misc/exa { };
+
   exempi = callPackage ../development/libraries/exempi { };
 
   execline = callPackage ../tools/misc/execline { };

From b60ceea90371f27578ea6ab2f892e8a46c41ded9 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 16 Feb 2016 17:01:15 +0100
Subject: [PATCH 1418/2285] svtplay-dl: 0.30.2016.01.10 -> 0.30.2016.02.08

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

diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix
index 97737bce783f..270e1c0cb62a 100644
--- a/pkgs/tools/misc/svtplay-dl/default.nix
+++ b/pkgs/tools/misc/svtplay-dl/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "svtplay-dl-${version}";
-  version = "0.30.2016.01.10";
+  version = "0.30.2016.02.08";
 
   src = fetchFromGitHub {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    sha256 = "1npgjgbri7g27f9ayx39d3pbv7pa22860c0aipwwvayggs27g1sr";
+    sha256 = "0nkgc43lf06h0w8k4zm5pdzp6r6jjc6j94ciljcm8333n0ykfzpr";
   };
 
   pythonPaths = [ pycrypto requests2 ];

From fc48bf5a2ceb908b73dc035374e2ec5a31086aa2 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Tue, 16 Feb 2016 17:22:51 +0100
Subject: [PATCH 1419/2285] glibc: fix cve-2015-7547.patch so it applies
 cleanly

---
 pkgs/development/libraries/glibc/cve-2015-7547.patch | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/glibc/cve-2015-7547.patch b/pkgs/development/libraries/glibc/cve-2015-7547.patch
index 1f10aafe0c05..9bf0bcc388cb 100644
--- a/pkgs/development/libraries/glibc/cve-2015-7547.patch
+++ b/pkgs/development/libraries/glibc/cve-2015-7547.patch
@@ -316,7 +316,7 @@ index a968b95..21843f1 100644
 -	// int anssiz = *anssizp;
 -	HEADER *anhp = (HEADER *) ans;
 +	HEADER *anhp = (HEADER *) *ansp;
- 	struct sockaddr *nsap = get_nsaddr (statp, ns);
+	struct sockaddr_in6 *nsap = EXT(statp).nsaddrs[ns];
  	int truncating, connreset, n;
  	/* On some architectures compiler might emit a warning indicating
 @@ -731,6 +817,8 @@ send_vc(res_state statp,
@@ -328,7 +328,7 @@ index a968b95..21843f1 100644
  	int recvresp2 = buf2 == NULL;
  	uint16_t rlen16;
   read_len:
-@@ -767,36 +855,14 @@ send_vc(res_state statp,
+@@ -767,40 +855,14 @@ send_vc(res_state statp,
  	u_char **thisansp;
  	int *thisresplenp;
  	if ((recvresp1 | recvresp2) == 0 || buf2 == NULL) {
@@ -344,8 +344,10 @@ index a968b95..21843f1 100644
 -			/* No buffer allocated for the first
 -			   reply.  We can try to use the rest
 -			   of the user-provided buffer.  */
+-#if __GNUC_PREREQ (4, 7)
 -			DIAG_PUSH_NEEDS_COMMENT;
 -			DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
+-#endif
 -#if _STRING_ARCH_unaligned
 -			*anssizp2 = orig_anssizp - resplen;
 -			*ansp2 = *ansp + resplen;
@@ -356,7 +358,9 @@ index a968b95..21843f1 100644
 -			*anssizp2 = orig_anssizp - aligned_resplen;
 -			*ansp2 = *ansp + aligned_resplen;
 -#endif
+-#if __GNUC_PREREQ (4, 7)
 -			DIAG_POP_NEEDS_COMMENT;
+-#endif
 -		} else {
 -			/* The first reply did not fit into the
 -			   user-provided buffer.  Maybe the second

From 7fd2cc1ea8687568901e7f8efec940ccb9e06657 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 16 Feb 2016 19:35:35 +0300
Subject: [PATCH 1420/2285] liferea: update upstream tarball

---
 .../networking/newsreaders/liferea/default.nix       |  4 +---
 .../liferea-fix-notification-header-location.patch   | 12 ------------
 2 files changed, 1 insertion(+), 15 deletions(-)
 delete mode 100644 pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch

diff --git a/pkgs/applications/networking/newsreaders/liferea/default.nix b/pkgs/applications/networking/newsreaders/liferea/default.nix
index 442240c2718f..ff2b16b8a580 100644
--- a/pkgs/applications/networking/newsreaders/liferea/default.nix
+++ b/pkgs/applications/networking/newsreaders/liferea/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${name}.tar.bz2";
-    sha256 = "0wpinar2cxyzq2j7ff7lznc08f0n6qjdm9aavsarbgdpaf2s1xvq";
+    sha256 = "0xyy0qm3h22b69if2hmg36jzvvljxb1w0zy2m2a28kdqfzpa6m8g";
   };
 
   buildInputs = with gst_all_1; [
@@ -27,8 +27,6 @@ stdenv.mkDerivation rec {
     makeWrapper
   ];
 
-  patches = [ ./liferea-fix-notification-header-location.patch ];
-
   preFixup = ''
     for f in "$out"/bin/*; do
       wrapProgram "$f" \
diff --git a/pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch b/pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch
deleted file mode 100644
index 3cd322460b08..000000000000
--- a/pkgs/applications/networking/newsreaders/liferea/liferea-fix-notification-header-location.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/src/notification/libnotify.c b/src/notification/libnotify.c
---- a/src/notification/libnotify.c	2016-01-28 19:33:19.000000000 +0100
-+++ b/src/notification/libnotify.c	2016-02-01 19:20:39.167580131 +0100
-@@ -40,7 +40,7 @@
- #include "ui/feed_list_view.h"
- #include "ui/ui_tray.h"
- 
--#include "notification/notification.h"
-+#include "../notification.h"
- 
- static gboolean supports_actions = FALSE;
- static gboolean supports_append  = FALSE;

From 6efcbd89506590a2d16fc3ca8d540ae3e632e219 Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <svein.ove@aas.no>
Date: Tue, 16 Feb 2016 16:37:45 +0000
Subject: [PATCH 1421/2285] mprime: Init at 28.7

---
 pkgs/tools/misc/mprime/default.nix    | 56 +++++++++++++++++++++++++++
 pkgs/tools/misc/mprime/makefile.patch | 46 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 +
 3 files changed, 104 insertions(+)
 create mode 100644 pkgs/tools/misc/mprime/default.nix
 create mode 100644 pkgs/tools/misc/mprime/makefile.patch

diff --git a/pkgs/tools/misc/mprime/default.nix b/pkgs/tools/misc/mprime/default.nix
new file mode 100644
index 000000000000..9a435622c7d7
--- /dev/null
+++ b/pkgs/tools/misc/mprime/default.nix
@@ -0,0 +1,56 @@
+{ stdenv, fetchurl, unzip, pkgconfig, curl }:
+
+let
+  srcDir =
+    if stdenv.system == "x86_64-linux" then "linux64"
+    else if stdenv.system == "i686-linux" then "linux"
+    else if stdenv.system == "x86_64-darwin" then "macosx64"
+    else abort "Unsupported platform";
+  gwnum =
+    if stdenv.system == "x86_64-linux" then "make64"
+    else if stdenv.system == "i686-linux" then "makefile"
+    else if stdenv.system == "x86_64-darwin" then "makemac"
+    else abort "Unsupported platform";
+in
+
+stdenv.mkDerivation {
+  name = "mprime-28.7";
+
+  src = fetchurl {
+    url = http://www.mersenne.org/ftp_root/gimps/p95v287.source.zip;
+    sha256 = "1k3gxhs3g8hfghzpmidhcwpwyayj8r83v8zjai1z4xgsql4jwby1";
+  };
+
+  unpackCmd = "unzip -d src -q $curSrc";
+
+  buildInputs = [ unzip pkgconfig curl ];
+
+  patches = [ ./makefile.patch ];
+
+  buildPhase = ''
+    make -C gwnum -f ${gwnum}
+    echo 'override CFLAGS := $(CFLAGS)' $(pkg-config --cflags libcurl) >> ${srcDir}/makefile
+    echo 'override LIBS := $(LIBS)' $(pkg-config --libs libcurl) >> ${srcDir}/makefile
+    make -C ${srcDir}
+  '';
+
+  installPhase = ''
+    install -D ${srcDir}/mprime $out/bin/mprime
+  '';
+  
+  meta = {
+    description = "Mersenne prime search / System stability tester";
+    longDescription = ''
+      MPrime is the Linux command-line interface version of Prime95, to be run
+      in a text terminal or in a terminal emulator window as a remote shell
+      client. It is identical to Prime95 in functionality, except it lacks a
+      graphical user interface.
+    '';
+    homepage = http://www.mersenne.org/;
+    # Unfree, because of a license requirement to share prize money if you find
+    # a suitable prime. http://www.mersenne.org/legal/#EULA
+    license = stdenv.lib.licenses.unfree;
+    # Untested on linux-32 and osx. Works in theory.
+    platforms = ["i686-linux" "x86_64-linux" "x86_64-darwin"];
+  };
+}
diff --git a/pkgs/tools/misc/mprime/makefile.patch b/pkgs/tools/misc/mprime/makefile.patch
new file mode 100644
index 000000000000..7f758af7b7c4
--- /dev/null
+++ b/pkgs/tools/misc/mprime/makefile.patch
@@ -0,0 +1,46 @@
+diff -ru orig/linux/makefile patched/linux/makefile
+--- orig/linux/makefile	2015-08-09 21:06:18.000000000 +0100
++++ patched/linux/makefile	2016-02-16 16:25:45.988662423 +0000
+@@ -25,8 +25,8 @@
+ CPP = g++
+ CPPFLAGS = -I.. -I../gwnum -O2 -march=i486 -malign-double
+ 
+-LFLAGS = -Wl,-M -Wl,-L/usr/local/lib
+-LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -ldl
++LFLAGS =
++LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -lrt -lstdc++ -ldl
+ 
+ FACTOROBJ = factor32.o
+ LINUXOBJS = prime.o menu.o
+diff -ru orig/linux64/makefile patched/linux64/makefile
+--- orig/linux64/makefile	2015-08-09 21:06:20.000000000 +0100
++++ patched/linux64/makefile	2016-02-16 16:25:57.076531585 +0000
+@@ -13,13 +13,13 @@
+ #	LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic $(shell pkg-config --static --libs libcurl) -lstdc++ -Wl,-Bdynamic -ldl
+ 
+ CC = gcc
+-CFLAGS = -I.. -I../gwnum -I/usr/local/include -DX86_64 -O2 
++CFLAGS = -I.. -I../gwnum -I/usr/local/include -DX86_64 -O2
+ 
+ CPP = g++
+ CPPFLAGS = -I.. -I../gwnum -DX86_64 -O2
+ 
+-LFLAGS = -Wl,-M -Wl,-L/usr/local/lib
+-LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -Wl,-Bstatic -lcurl -Wl,-Bdynamic -lrt -lstdc++ -ldl
++LFLAGS =
++LIBS = ../gwnum/gwnum.a ../gwnum/gwnum.ld -lm -lpthread -lrt -lstdc++ -ldl
+ 
+ FACTOROBJ = factor64.o
+ LINUXOBJS = prime.o menu.o
+diff -ru orig/macosx64/makefile patched/macosx64/makefile
+--- orig/macosx64/makefile	2015-08-09 21:06:22.000000000 +0100
++++ patched/macosx64/makefile	2016-02-16 16:19:03.988415925 +0000
+@@ -10,7 +10,7 @@
+ CPPFLAGS = -I.. -I../gwnum -I../linux -O2 -DX86_64 -DCOMMAND_LINE_MPRIME -m64
+ 
+ LFLAGS = -m64 -Wl,-no_pie
+-LIBS   = ../gwnum/amd64/release/gwnum.a -lm -lpthread -lcurl -framework IOKit -framework CoreFoundation -lstdc++
++LIBS   = ../gwnum/amd64/release/gwnum.a -lm -lpthread -framework IOKit -framework CoreFoundation -lstdc++
+ 
+ FACTOROBJ = ../prime95/macosx64/factor64.o
+ OBJS = prime.o menu.o
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c98153fa533c..f40edd90bccc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2386,6 +2386,8 @@ let
 
   mpage = callPackage ../tools/text/mpage { };
 
+  mprime = callPackage ../tools/misc/mprime { };
+
   mpw = callPackage ../tools/security/mpw { };
 
   mr = callPackage ../applications/version-management/mr { };

From 8e0bc53f941a2205c7a18fa4e4df920f98e9eb42 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 9 Feb 2016 16:15:48 +0100
Subject: [PATCH 1422/2285] i2p: 0.9.23 -> 0.9.24

---
 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 0829fed1d5e9..b1bfeb215f68 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.23";
+  name = "i2p-0.9.24";
   src = fetchurl {
     url = "https://github.com/i2p/i2p.i2p/archive/${name}.tar.gz";
-    sha256 = "1vjyki86r6v8z2pil7s6r74yf6h8w000ypxxngimw3kfff121swp";
+    sha256 = "0hk28cigil6ia707zb6p8n7959xg7v816bacxxlln780cc1wi830";
   };
   buildInputs = [ jdk ant gettext which ];
   patches = [ ./i2p.patch ];

From a0661f84f0b2861ca5051aceefa3635b4482eec1 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 16 Feb 2016 21:04:18 +0100
Subject: [PATCH 1423/2285] dropbox: 3.12.6 -> 3.14.5

Also updates qt5 dependency to qt55, as per release notes: https://www.dropboxforum.com/hc/en-us/community/posts/205672126-Release-Candidate-3-14-5
---
 pkgs/applications/networking/dropbox/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix
index 8030ab313a81..edaa5ed077fd 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -20,11 +20,11 @@
 
 let
   # NOTE: When updating, please also update in current stable, as older versions stop working
-  version = "3.12.6";
+  version = "3.14.5";
   sha256 =
     {
-      "x86_64-linux" = "16d0g9bygvaixv4r42p72z6a6wqhkf5qzb058lijih93zjr8zjlj";
-      "i686-linux" = "1pgqz6axzzyaahql01g0l80an39hd9j4dnq0vfavwvb2qkb27dph";
+      "x86_64-linux" = "02yjc910j3m61yd19akfv5yxh0a06cqwx2rxb2xhdbf1cb6c2wdg";
+      "i686-linux" = "0aqni6gsnbmshczxwn10qbp43qqnprxr18spx7dc9cz9cq27rgrv";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fae36c212c6e..9ff55dca5b38 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13380,7 +13380,7 @@ let
 
   copy-com = callPackage ../applications/networking/copy-com { };
 
-  dropbox = qt5.callPackage ../applications/networking/dropbox { };
+  dropbox = qt55.callPackage ../applications/networking/dropbox { };
 
   dropbox-cli = callPackage ../applications/networking/dropbox-cli { };
 

From 7fcce2a9f09f45de51be85da7c62b109af95d753 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 16 Feb 2016 21:20:15 +0100
Subject: [PATCH 1424/2285] perl-strictures: 2.000001 -> 2.000002

---
 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 b58a6b834e05..55fd008d96c6 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10484,10 +10484,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   strictures = buildPerlPackage rec {
-    name = "strictures-2.000001";
+    name = "strictures-2.000002";
     src = fetchurl {
       url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz";
-      sha256 = "1lr0br982xb49wxra5ywq9vk4jhjmq28670i8yscks1wss58lwqy";
+      sha256 = "0021m9k1f6dfqn88znlp24g7xsqxwwjbj91w474c7n5gngf5a0qk";
     };
     meta = {
       homepage = http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=p5sagit/strictures.git;

From 8b644c5826f9e0c62f84fa7844e369fca9a41a96 Mon Sep 17 00:00:00 2001
From: Brian McKenna <bmckenna@atlassian.com>
Date: Tue, 16 Feb 2016 21:55:25 +1100
Subject: [PATCH 1425/2285] rust: fix prePatch phase fail when sourceRoot set

We want to go up more than a single directory if we're in a nested one.
---
 pkgs/build-support/rust/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/default.nix b/pkgs/build-support/rust/default.nix
index e0d451417780..79e4366eebe1 100644
--- a/pkgs/build-support/rust/default.nix
+++ b/pkgs/build-support/rust/default.nix
@@ -75,7 +75,7 @@ in stdenv.mkDerivation (args // {
     (
         set -euo pipefail
 
-        cd ../deps/registry/src/*
+        cd $NIX_BUILD_TOP/deps/registry/src/*
 
         for script in $patchRegistryDeps/*; do
           # Run in a subshell so that directory changes and shell options don't

From 93328bbd6241c42b04c75c4be9a6c16033499104 Mon Sep 17 00:00:00 2001
From: Brian McKenna <bmckenna@atlassian.com>
Date: Tue, 16 Feb 2016 21:54:53 +1100
Subject: [PATCH 1426/2285] pijul: 0.2-6ab9ba

Maintainer has been working with us, this commit was given by them.
---
 .../version-management/pijul/default.nix      | 28 ++++--
 .../pijul/pijul.org.context                   | 92 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 112 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/applications/version-management/pijul/pijul.org.context

diff --git a/pkgs/applications/version-management/pijul/default.nix b/pkgs/applications/version-management/pijul/default.nix
index f00e22bb385c..399e4cf30244 100644
--- a/pkgs/applications/version-management/pijul/default.nix
+++ b/pkgs/applications/version-management/pijul/default.nix
@@ -1,22 +1,32 @@
-{ stdenv, fetchdarcs, ocaml, findlib, cryptokit, yojson, lmdb, zlib }:
+{ stdenv, fetchdarcs, rustUnstable, openssl, libssh }:
 
-stdenv.mkDerivation rec {
+with rustUnstable;
+
+buildRustPackage rec {
   name = "pijul-${version}";
-  version = "0.1";
+  version = "0.2-6ab9ba";
 
   src = fetchdarcs {
     url = "http://pijul.org/";
-    rev = version;
-    sha256 = "0r189xx900w4smq6nyy1wnrjf9sgqrqw5as0l7k6gq0ra36szzff";
+    context = ./pijul.org.context;
+    sha256 = "1cgkcr5wdkwj7s0rda90bfchbwmchgi60w5d637894w20hkplsr4";
   };
 
-  buildInputs = [ ocaml findlib cryptokit yojson lmdb zlib ];
+  sourceRoot = "fetchdarcs/pijul";
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp pijul $out/bin/
+  depsSha256 = "110bj2lava1xs75z6k34aip7zb7rcmnxk5hmiyi32i9hs0ddsdrz";
+
+  cargoUpdateHook = ''
+    cp -r ../libpijul src/
   '';
 
+  setSourceRoot = ''
+    chmod -R u+w "$sourceRoot"
+    cp -r "$sourceRoot"/../libpijul "$sourceRoot"/src/
+  '';
+
+  buildInputs = [ openssl libssh ];
+
   meta = with stdenv.lib; {
     homepage = https://pijul.org/;
     description = "Fast DVCS based on a categorical theory of patches";
diff --git a/pkgs/applications/version-management/pijul/pijul.org.context b/pkgs/applications/version-management/pijul/pijul.org.context
new file mode 100644
index 000000000000..03a3f0f9a7c1
--- /dev/null
+++ b/pkgs/applications/version-management/pijul/pijul.org.context
@@ -0,0 +1,92 @@
+
+Context:
+
+[+libpijul/Cargo.lock
+pe@pijul.org**20160212063509
+ Ignore-this: e5a696b13850b36668a41aedb7bd1b74
+] 
+
+[+pijul/Cargo.lock
+pe@pijul.org**20160212063451
+ Ignore-this: a621a502d1701cb63e6b5c8fd0afbde8
+] 
+
+[Error detection, gnupg messages
+pe@pijul.org**20160210101417
+ Ignore-this: 3c517e122c1eca1df9520aed8fd3b0ea
+] 
+
+[Login command
+pe@pijul.org**20160210055826
+ Ignore-this: 7be5618dc418554a82c5f8a68cc8f515
+] 
+
+[Extra functions for the nest
+pe@pijul.org**20160208205519
+ Ignore-this: 39c8cbed5517b31bc846493e6ffefc76
+] 
+
+[Timestamp in RFC3339
+pe@pijul.org**20160208145551
+ Ignore-this: dd114fe418052570572d73e443683d85
+] 
+
+[Combined external_hash and contents in libpijul (makes it easier to print patches)
+pe@pijul.org**20160208145450
+ Ignore-this: 69f588e1bab551bffd719fa05ad7080a
+] 
+
+[disentangle output in libpijul
+florent.becker@ens-lyon.org**20160208094544
+ Ignore-this: 2dc35255cf48d77eb0c4ba2dde6d4f98
+] 
+
+[Disentangle libpijul::Repository::local_diff
+florent.becker@ens-lyon.org**20160207104631
+ Ignore-this: 65b119358afa95eb013e84c0d7a250d9
+] 
+
+[remove redundant import
+florent.becker@ens-lyon.org**20160207104613
+ Ignore-this: e3f7873ec678f62f4129be61238c2c0d
+] 
+
+[Disentangle add_lines and delete_lines in diff
+florent.becker@ens-lyon.org**20160207102456
+ Ignore-this: 5e89908adf7a519bbe2b2ab399cf0a2
+] 
+
+[Disentangle libpijul::rec_delete
+florent.becker@ens-lyon.org**20160206214730
+ Ignore-this: fb6a70c298a38724665c3d6452577649
+] 
+
+[Make InternalKey type be an array rather than a reference
+florent.becker@ens-lyon.org**20160205195638
+ Ignore-this: f9b5d15049358b2d8e93322d25a50e58
+] 
+
+[Ask ssh known_hosts, and new file format
+pe@pijul.org**20160207120834
+ Ignore-this: f7a7f2ae672a3f6f40a2ac85139d6e10
+] 
+
+[Handling HTTP errors (when cloning from HTTP)
+pe@pijul.org**20160204182444
+ Ignore-this: 1805ae8d3b8a4ca49da06e18dd37b151
+] 
+
+[Small debugging assertions
+pe@pijul.org**20160203143007
+ Ignore-this: e3d3dddc72511166d606e1751b19411b
+] 
+
+[Two unused functions back (used in the nest)
+pe@pijul.org**20160202075743
+ Ignore-this: 8c6904b122c8a78bfa0b9cc5416c943
+] 
+
+[TAG 0.2
+pe@pijul.org**20160202073939
+ Ignore-this: 1e9d04d5ffe231ffaccaf9c4ccb684d3
+] 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fae36c212c6e..11dc91aef810 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12862,9 +12862,7 @@ let
 
   pig = callPackage ../applications/networking/cluster/pig { };
 
-  pijul = callPackage ../applications/version-management/pijul {
-    inherit (ocamlPackages) findlib cryptokit yojson;
-  };
+  pijul = callPackage ../applications/version-management/pijul { };
 
   playonlinux = callPackage ../applications/misc/playonlinux {
      stdenv = stdenv_32bit;

From 2b6ca477e6d057c44dbea5a1b67ae7c2e638b1ea Mon Sep 17 00:00:00 2001
From: Casey Ransom <casey.ransom@lookout.com>
Date: Thu, 4 Feb 2016 13:48:52 -0500
Subject: [PATCH 1427/2285] aws_shell: init at 0.1.0

Currently depends on a specific prompt_toolkit package (which is not the
latest), so that is also pinned here.
---
 pkgs/top-level/all-packages.nix    |  2 ++
 pkgs/top-level/python-packages.nix | 42 ++++++++++++++++++++++++++++++
 2 files changed, 44 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ed5e5ab8374c..ce13cc1a54e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -582,6 +582,8 @@ let
 
   awscli = pythonPackages.awscli;
 
+  aws_shell = pythonPackages.aws_shell;
+
   azure-cli = callPackage ../tools/virtualization/azure-cli { };
 
   ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b6757094e896..01d5ba7a3946 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1159,6 +1159,36 @@ in modules // {
     };
   };
 
+  aws_shell = buildPythonPackage rec {
+    name = "aws-shell-${version}";
+    version = "0.1.0";
+    src = pkgs.fetchurl {
+        sha256 = "05isyrqbk16dg1bc3mnc4ynxr3nchslvia5wr1sdmxvc3v2y729d";
+        url = "https://pypi.python.org/packages/source/a/aws-shell/aws-shell-0.1.0.tar.gz";
+      };
+    propagatedBuildInputs = with self; [
+      configobj prompt_toolkit_52 awscli boto3 pygments sqlite3 mock pytest
+      pytestcov unittest2 tox
+    ];
+
+    #Checks are failing due to missing TTY, which won't exist.
+    doCheck = false;
+    preCheck = ''
+      mkdir -p check-phase
+      export HOME=$(pwd)/check-phase
+    '';
+
+    disabled = isPy35;
+
+
+    meta = {
+      homepage = https://github.com/awslabs/aws-shell;
+      description = "An integrated shell for working with the AWS CLI.";
+      license = licenses.asl20;
+      maintainers = [ ];
+    };
+  };
+
   azure = buildPythonPackage rec {
     version = "0.11.0";
     name = "azure-${version}";
@@ -15184,6 +15214,18 @@ in modules // {
       maintainers = with maintainers; [ nckx ];
     };
   };
+  prompt_toolkit_52 = self.prompt_toolkit.override(self: rec {
+    name = "prompt_toolkit-${version}";
+    version = "0.52";
+    src = pkgs.fetchurl {
+      sha256 = "00h9ldqmb33nhg2kpks7paldf3n3023ipp124alwp96yz16s7f1m";
+      url = "https://pypi.python.org/packages/source/p/prompt_toolkit/${name}.tar.gz";
+    };
+
+    #Only <3.4 expressly supported.
+    disabled = isPy35;
+
+  });
 
   protobuf = self.protobuf2_6;
   protobuf2_6 = self.protobufBuild pkgs.protobuf2_6;

From bd3ca11e0d5f4652d4b8da094dc77094f5e05e39 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Tue, 26 Jan 2016 21:32:24 +0100
Subject: [PATCH 1428/2285] virtualbox: 5.0.12 -> 5.0.14

---
 pkgs/applications/virtualization/virtualbox/default.nix   | 8 ++++----
 .../virtualization/virtualbox/guest-additions/default.nix | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 855694e04120..c0fd8214b317 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -18,7 +18,7 @@ let
   # revision/hash as well. See
   # http://download.virtualbox.org/virtualbox/${version}/SHA256SUMS
   # for hashes.
-  version = "5.0.12";
+  version = "5.0.14";
 
   forEachModule = action: ''
     for mod in \
@@ -39,12 +39,12 @@ let
   '';
 
   # See https://github.com/NixOS/nixpkgs/issues/672 for details
-  extpackRevision = "104815";
+  extpackRevision = "105127";
   extensionPack = requireFile rec {
     name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack";
     # IMPORTANT: Hash must be base16 encoded because it's used as an input to
     # VBoxExtPackHelperApp!
-    sha256 = "ac1bc8452b7fdf183325272149e9f18b9810cc07adf18e48755385a9cd1b236d";
+    sha256 = "4a404b0d09dfd3952107e314ab63262293b2fb0a4dc6837b57fb7274bd016865";
     message = ''
       In order to use the extension pack, you need to comply with the VirtualBox Personal Use
       and Evaluation License (PUEL) by downloading the related binaries from:
@@ -63,7 +63,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2";
-    sha256 = "de0362b1d404d1ca0298db1984acb6f0f1c6210313aeb744fea345ad9201e86e";
+    sha256 = "69abac7255b2251a18fd73c0b7c200d5f8ce72a59fa019b53a5cdbf7f2843002";
   };
 
   buildInputs =
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 43f591cf6aad..57d9d28a773a 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://download.virtualbox.org/virtualbox/${version}/VBoxGuestAdditions_${version}.iso";
-    sha256 = "61a19c9ec4b449cbc6bb41b636b03a16bf5a47ffa4943423d262863017e8bc9b";
+    sha256 = "cec0df18671adfe62a34d3810543f76f76206b212b2b61791fe026214c77507c";
   };
 
   KERN_DIR = "${kernel.dev}/lib/modules/*/build";

From c38eb526d59e2fcc985a0459e94a6ad30b1d3706 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 16 Feb 2016 21:01:21 +0000
Subject: [PATCH 1429/2285] git: fix references to gettext in bash scripts

See #13047
---
 .../version-management/git-and-tools/git/default.nix          | 4 ++++
 1 file changed, 4 insertions(+)

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 49ecce0456b2..2c07f540ecec 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -85,6 +85,10 @@ stdenv.mkDerivation {
              -e 's|	perl -e|	${perl}/bin/perl -e|g' \
              $out/libexec/git-core/{git-am,git-submodule}
 
+      # Fix references to gettext.
+      substituteInPlace $out/libexec/git-core/git-sh-i18n \
+          --replace 'gettext.sh' '${gettext}/bin/gettext.sh'
+
       # gzip (and optionally bzip2, xz, zip) are runtime dependencies for
       # gitweb.cgi, need to patch so that it's found
       sed -i -e "s|'compressor' => \['gzip'|'compressor' => ['${gzip}/bin/gzip'|" \

From a9f8613dae32b10de3bdc8a86032dae43f80db32 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sat, 16 Jan 2016 16:16:04 +0100
Subject: [PATCH 1430/2285] splix: 2.0.0 -> svn-r315

r315 has been in use for several years, but was never officially released
---
 pkgs/misc/cups/drivers/splix/default.nix | 37 +++++++++++++++---------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix
index 532ef2a45d5d..8c58d41f0fa3 100644
--- a/pkgs/misc/cups/drivers/splix/default.nix
+++ b/pkgs/misc/cups/drivers/splix/default.nix
@@ -1,24 +1,35 @@
-{stdenv, fetchurl, cups, zlib}:
-
-stdenv.mkDerivation rec {
-  name = "splix-2.0.0";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/splix/${name}.tar.bz2";
-    sha256 = "0bwivrwwvh6hzvnycpzqs7a0capgycahc4s3v9ihx552fgy07xwp";
+{ stdenv, fetchsvn, fetchurl, cups, zlib }:
+let rev = "r315"; in
+stdenv.mkDerivation (rec {
+  name = "splix-svn-${rev}";
+  src = fetchsvn {
+    # We build this from svn, because splix hasn't been in released in several years
+    # although the community has been adding some new printer models
+    # if you are having problems, please try the stable version below and report back
+    url = "svn://svn.code.sf.net/p/splix/code/splix";
+    inherit rev;
+    sha256 = "16wbm4xnz35ca3mw2iggf5f4jaxpyna718ia190ka6y4ah932jxl";
   };
 
-  patches = [ ./splix-2.0.0-gcc45.patch ];
-
-  preBuild=''
+  preBuild = ''
     makeFlags="V=1 DISABLE_JBIG=1 CUPSFILTER=$out/lib/cups/filter CUPSPPD=$out/share/cups/model"
   '';
 
-  buildInputs = [cups zlib];
+  buildInputs = [ cups zlib ];
 
   meta = {
     homepage = http://splix.sourceforge.net;
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.simons ];
   };
-}
+
+} /* // { # uncomment to build the stable version
+
+  name = "splix-2.0.0";
+  patches = [ ./splix-2.0.0-gcc45.patch ];
+  src = fetchurl {
+    url = "mirror://sourceforge/splix/${name}.tar.bz2";
+    sha256 = "0bwivrwwvh6hzvnycpzqs7a0capgycahc4s3v9ihx552fgy07xwp";
+  };  
+
+} */)

From b7b696e534bb3c4ae70ec2a80338c3a62186b2ec Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 10 Feb 2016 00:58:53 +0100
Subject: [PATCH 1431/2285] leiningen: 2.5.3 -> 2.6.1

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

diff --git a/pkgs/development/tools/build-managers/leiningen/default.nix b/pkgs/development/tools/build-managers/leiningen/default.nix
index f4f18dac487c..8a8ab9ba91f1 100644
--- a/pkgs/development/tools/build-managers/leiningen/default.nix
+++ b/pkgs/development/tools/build-managers/leiningen/default.nix
@@ -3,18 +3,18 @@
 
 stdenv.mkDerivation rec {
   pname = "leiningen";
-  version = "2.5.3";
+  version = "2.6.1";
   name = "${pname}-${version}";
 
   src = fetchurl {
     url = "https://raw.github.com/technomancy/leiningen/${version}/bin/lein-pkg";
-    sha256 = "0xbfg6v6f3qyi99dbqragh3za2a0agrcq9c0qbkshvp5yd0fx4h1";
+    sha256 = "1ndirl36gbba12cs5vw22k2zrbpqdmnpi1gciwqb1zbib2s1akg8";
   };
 
   jarsrc = fetchurl {
     # NOTE: This is actually a .jar, Github has issues
     url = "https://github.com/technomancy/leiningen/releases/download/${version}/${name}-standalone.zip";
-    sha256 = "1p93j03v02mf1cnli6lv9qqnx7gwxr571g8z7y06p0d4nq31c32b";
+    sha256 = "1533msarx6gb3xc2sp2nmspllnqy7anpnv9a0ifl0psxm3xph06p";
   };
 
   patches = [ ./lein-fix-jar-path.patch ];

From 4cb9f662ce8eae9477febdb70ba5f217496a731f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 16 Feb 2016 22:39:33 +0100
Subject: [PATCH 1432/2285] hwloc: 1.6 -> 1.11.2 and disable tests

This package was failing to build on wendy:

  lt-linux-libnuma: linux-libnuma.c:70: main: Assertion `numa_bitmask_equal(bitmask, numa_all_nodes_ptr)' failed.

Since we shouldn't run tests that depend on the hardware
characteristics of the build machine, I've disabled these.
---
 pkgs/development/libraries/hwloc/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix
index c357d808cac4..5d07cfe3a2bb 100644
--- a/pkgs/development/libraries/hwloc/default.nix
+++ b/pkgs/development/libraries/hwloc/default.nix
@@ -2,11 +2,11 @@
 , pciutils, numactl }:
 
 stdenv.mkDerivation rec {
-  name = "hwloc-1.6";
+  name = "hwloc-1.11.2";
 
   src = fetchurl {
-    url = "http://www.open-mpi.org/software/hwloc/v1.6/downloads/${name}.tar.bz2";
-    sha256 = "0y561bryiqp1f5af5lm432dcw93xwp1jw55si7wa6skxnd6ch25w";
+    url = "http://www.open-mpi.org/software/hwloc/v1.11/downloads/${name}.tar.bz2";
+    sha1 = "3d68de060808f04349538be4e63cde501cd53b0a";
   };
 
   # XXX: libX11 is not directly needed, but needed as a propagated dep of Cairo.
@@ -39,9 +39,9 @@ stdenv.mkDerivation rec {
              -e "s|-lnuma|-L$numalibdir -lnuma|g"
       '';
 
-  # XXX: A test hangs on Cygwin, see
-  # <http://hydra.bordeaux.inria.fr/build/51474/nixlog/1/raw>.
-  doCheck = !stdenv.isCygwin;
+  # Checks disabled because they're impure (hardware dependent) and
+  # fail on some build machines.
+  doCheck = false;
 
   meta = with stdenv.lib; {
     description = "Portable abstraction of hierarchical architectures for high-performance computing";

From c7ec0f6f2f75585273b1409aa1ee7cb4637c5a6a Mon Sep 17 00:00:00 2001
From: "Desmond O. Chang" <dochang@gmail.com>
Date: Thu, 11 Feb 2016 19:03:47 +0800
Subject: [PATCH 1433/2285] rolespec: init at 20160105

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

diff --git a/pkgs/development/tools/misc/rolespec/default.nix b/pkgs/development/tools/misc/rolespec/default.nix
new file mode 100644
index 000000000000..ccfe19496c15
--- /dev/null
+++ b/pkgs/development/tools/misc/rolespec/default.nix
@@ -0,0 +1,48 @@
+{ stdenv, fetchFromGitHub, makeWrapper }:
+
+stdenv.mkDerivation rec {
+
+  name = "rolespec-${meta.version}";
+
+  src = fetchFromGitHub {
+    owner = "nickjj";
+    repo = "rolespec";
+    rev = "64a2092773b77f7a888522ceddd815e97b129321";
+    sha256 = "1867acxy18a3cgi84iwsp37sxglaljn1dq50amahp5zkmd8x8vnz";
+    inherit name;
+  };
+
+  buildInputs = [ makeWrapper ];
+
+  # The default build phase (`make`) runs the test code. It's difficult to do
+  # the test in the build environment because it depends on the system package
+  # managers (apt/yum/pacman). We simply skip this phase since RoleSpec is
+  # shell based.
+  dontBuild = true;
+
+  # Wrap the program because `ROLESPEC_LIB` defaults to
+  # `/usr/local/lib/rolespec`.
+  installPhase = ''
+    make install PREFIX=$out
+    wrapProgram $out/bin/rolespec --set ROLESPEC_LIB $out/lib/rolespec
+  '';
+
+  # Since RoleSpec installs the shell script files in `lib` directory, the
+  # fixup phase shows some warnings. Disable these actions.
+  dontPatchELF = true;
+  dontStrip = true;
+
+  meta = with stdenv.lib; {
+    homepage = "https://github.com/nickjj/rolespec";
+    description = "A test library for testing Ansible roles";
+    longDescription = ''
+      A shell based test library for Ansible that works both locally and over
+      Travis-CI.
+    '';
+    downloadPage = "https://github.com/nickjj/rolespec";
+    license = licenses.gpl3;
+    version = "20160105";
+    maintainers = [ maintainers.dochang ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fae36c212c6e..5ec06dde3c87 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6089,6 +6089,8 @@ let
 
   rman = callPackage ../development/tools/misc/rman { };
 
+  rolespec = callPackage ../development/tools/misc/rolespec { };
+
   rr = callPackage ../development/tools/analysis/rr {
     stdenv = stdenv_32bit;
   };

From b58f84f236538113eaec27e17c3218e6e039b4ab Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 16 Feb 2016 22:52:33 +0100
Subject: [PATCH 1434/2285] pyxml: move to pythonPackages

---
 pkgs/top-level/all-packages.nix    | 2 +-
 pkgs/top-level/python-packages.nix | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 662905129e51..62f13dd55311 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9187,7 +9187,7 @@ let
 
   pysideShiboken = pythonPackages.pysideShiboken;
 
-  pyxml = callPackage ../development/python-modules/pyxml { };
+  pyxml = pythonPackages.pyxml;
 
   rbtools = pythonPackages.rbtools;
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 42eac4716b2b..f400d13bdf13 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -177,6 +177,8 @@ in modules // {
 
   pysideTools = callPackage ../development/python-modules/pyside/tools.nix { };
 
+  pyxml = if !isPy3k then callPackage ../development/python-modules/pyxml{ } else throw "pyxml not supported for interpreter ${python.executable}";
+
   sip = callPackage ../development/python-modules/sip { };
 
   sip_4_16 = callPackage ../development/python-modules/sip/4.16.nix { };

From fc85f1beedffe55925484747944873fab59f9a06 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <benley@gmail.com>
Date: Fri, 28 Aug 2015 20:28:32 -0700
Subject: [PATCH 1435/2285] nix-prefetch-hg: Various bash style improvements,
 fixes #9511

---
 pkgs/build-support/fetchhg/nix-prefetch-hg | 70 +++++++++++-----------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/pkgs/build-support/fetchhg/nix-prefetch-hg b/pkgs/build-support/fetchhg/nix-prefetch-hg
index 7143eecfe5c6..94c6b1ec6945 100755
--- a/pkgs/build-support/fetchhg/nix-prefetch-hg
+++ b/pkgs/build-support/fetchhg/nix-prefetch-hg
@@ -5,79 +5,79 @@ url=$1
 rev=$2
 expHash=$3
 
-hashType=$NIX_HASH_ALGO
-if test -z "$hashType"; then
-    hashType=sha256
-fi
-if test -z "$hashFormat"; then
-    hashFormat=--base32
+hashType="${NIX_HASH_ALGO:-sha256}"
+hashFormat=${hashFormat:-"--base32"}
+rev="${rev:-tip}"
+
+LOG() {
+  echo "$@" >&2
+}
+
+die() {
+  LOG "$@"
+  exit 1
+}
+
+if [[ -z "$url" || "$url" == "--help" ]]; then
+    die "Usage: nix-prefetch-hg URL [rev [EXPECTED-HASH]]"
 fi
 
-if test -z "$url"; then
-    echo "syntax: nix-prefetch-hg URL [rev [EXPECTED-HASH]]" >&2
-    exit 1
-fi
-
-if test "$fetchSubrepos" == 1; then
+if [[ "${fetchSubrepos:-0}" == 1 ]]; then
     subrepoClause=S
 else
     subrepoClause=
 fi
 
-test -n "$rev" || rev="tip"
-
-
 # If the hash was given, a file with that hash may already be in the
 # store.
-if test -n "$expHash"; then
+if [[ -n "$expHash" ]]; then
     finalPath=$(nix-store --print-fixed-path --recursive "$hashType" "$expHash" hg-archive)
     if ! nix-store --check-validity "$finalPath" 2> /dev/null; then
         finalPath=
     fi
-    hash=$expHash
+    hash="$expHash"
 fi
 
 
 # If we don't know the hash or a path with that hash doesn't exist,
 # download the file and add it to the store.
-if test -z "$finalPath"; then
+if [[ -z "$finalPath" ]]; then
 
     tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/hg-checkout-tmp-XXXXXXXX")"
-    trap "rm -rf \"$tmpPath\"" EXIT
+    cleanup() { x=$?; rm -rf "$tmpPath"; exit $x; }; trap cleanup EXIT
 
     tmpArchive="$tmpPath/hg-archive"
 
     # Perform the checkout.
-    if [[ $url != /* ]]; then
-      tmpClone=$tmpPath/hg-clone
-      hg clone -q -y -U "$url" $tmpClone >&2
+    if [[ "$url" != /* ]]; then
+      tmpClone="$tmpPath/hg-clone"
+      hg clone -q -y -U "$url" "$tmpClone" >&2
     else
       tmpClone=$url
     fi
-    hg archive -q$subrepoClause -y -r "$rev" --cwd $tmpClone $tmpArchive
-    rm -f $tmpArchive/.hg_archival.txt
+    hg archive -q$subrepoClause -y -r "$rev" --cwd "$tmpClone" "$tmpArchive"
+    rm -f "$tmpArchive/.hg_archival.txt"
 
-    echo "hg revision is $(cd $tmpClone; hg id -r "$rev" -i)"
+    LOG "hg revision is $(cd "$tmpClone"; hg id -r "$rev" -i)"
 
     # Compute the hash.
-    hash=$(nix-hash --type $hashType $hashFormat $tmpArchive)
-    if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi
+    hash=$(nix-hash --type "$hashType" "$hashFormat" "$tmpArchive")
+    if [[ -z "$QUIET" ]]; then LOG "hash is $hash"; fi
 
     # Add the downloaded file to the Nix store.
-    finalPath=$(nix-store --add-fixed --recursive "$hashType" $tmpArchive)
+    finalPath=$(nix-store --add-fixed --recursive "$hashType" "$tmpArchive")
 
-    if test -n "$expHash" -a "$expHash" != "$hash"; then
-        echo "hash mismatch for URL \`$url'"
-        exit 1
+    if [[ -n "$expHash" && "$expHash" != "$hash" ]]; then
+        die "ERROR: hash mismatch for URL \`$url'"
     fi
 
 
 fi
 
-if ! test -n "$QUIET"; then echo "path is $finalPath" >&2; fi
+if [[ -z "$QUIET" ]]; then LOG "path is $finalPath"; fi
 
-echo $hash
+echo "$hash"
 
-if test -n "$PRINT_PATH"; then
-    echo $finalPath
+if [[ -n "$PRINT_PATH" ]]; then
+    echo "$finalPath"
 fi

From fbc147494c7575cd1bcfb17d604adc7b61615bfd Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Thu, 28 Jan 2016 19:57:39 +0100
Subject: [PATCH 1436/2285] inkscape: add numpy to runtime path

This is nessecary for some plugins
---
 pkgs/applications/graphics/inkscape/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                 | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 409fd0a767ce..3704ea2f9c41 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft
 , libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm
 , glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool
-, gsl, python, pyxml, lxml, poppler, imagemagick, libwpg, librevenge
+, gsl, python, numpy, pyxml, lxml, poppler, imagemagick, libwpg, librevenge
 , libvisio, libcdr, libexif, unzip
 , boxMakerPlugin ? false # boxmaker plugin
 }:
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [
     # Python is used at run-time to execute scripts, e.g., those from
     # the "Effects" menu.
-    python pyxml lxml
+    python pyxml numpy lxml
   ];
 
   buildInputs = [
@@ -66,7 +66,7 @@ stdenv.mkDerivation rec {
     for i in "$out/bin/"*
     do
       wrapProgram "$i" --prefix PYTHONPATH :      \
-       "$(toPythonPath ${pyxml}):$(toPythonPath ${lxml})"  \
+       "$(toPythonPath ${pyxml}):$(toPythonPath ${lxml}):$(toPythonPath ${numpy})"  \
        --prefix PATH : ${python}/bin ||  \
         exit 2
     done
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6fbaec541ed3..9af966c073b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12420,7 +12420,7 @@ let
   inferno = callPackage_i686 ../applications/inferno { };
 
   inkscape = callPackage ../applications/graphics/inkscape {
-    inherit (pythonPackages) lxml;
+    inherit (pythonPackages) python pyxml lxml numpy;
     lcms = lcms2;
   };
 

From e5e4e27e740c945f769f649166e2f445dc556248 Mon Sep 17 00:00:00 2001
From: Travis Athougies <travis@athougies.net>
Date: Mon, 15 Feb 2016 14:52:13 -0800
Subject: [PATCH 1437/2285] tints: 0.11 -> 0.12

---
 pkgs/applications/misc/tint2/default.nix | 27 +++++++++++++++++-------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix
index 9eb3ed13af58..e8412ce19160 100644
--- a/pkgs/applications/misc/tint2/default.nix
+++ b/pkgs/applications/misc/tint2/default.nix
@@ -1,30 +1,41 @@
 { stdenv, fetchurl, pkgconfig, cmake, pango, cairo, glib, imlib2, libXinerama
 , libXrender, libXcomposite, libXdamage, libX11, libXrandr, gtk, libpthreadstubs
-, libXdmcp
+, libXdmcp, librsvg, fetchgit
 }:
 
 stdenv.mkDerivation rec {
   name = "tint2-${version}";
-  version = "0.11";
+  version = "0.12";
 
-  src = fetchurl {
-    url = "http://tint2.googlecode.com/files/${name}.tar.bz2";
-    sha256 = "07a74ag7lhc6706z34zvqj2ikyyl7wnzisfxpld67ljpc1m6w47y";
+  src = fetchgit {
+    url = "https://gitlab.com/o9000/tint2.git";
+    rev = version;
+    sha256 = "0pd84ydpqz2l6gkhj565nqi2xyiph8zfpn4xha60xshqpsg3pqjq";
   };
         
   buildInputs = [ pkgconfig cmake pango cairo glib imlib2 libXinerama
     libXrender libXcomposite libXdamage libX11 libXrandr gtk libpthreadstubs
-    libXdmcp
+    libXdmcp librsvg
   ];
 
-  preConfigure = "substituteInPlace CMakeLists.txt --replace /etc $out/etc";
+  preConfigure =
+    ''
+      substituteInPlace CMakeLists.txt --replace /etc $out/etc
+    '';
+  prePatch =
+    ''
+      substituteInPlace ./src/tint2conf/properties.c --replace /usr/share/ /run/current-system/sw/share/
+      substituteInPlace ./src/launcher/apps-common.c --replace /usr/share/ /run/current-system/sw/share/
+      substituteInPlace ./src/launcher/icon-theme-common.c --replace /usr/share/ /run/current-system/sw/share/
+    '';
 
   cmakeFlags = [
     "-DENABLE_TINT2CONF=0"
+    "-DENABLE_SN=0"
   ];
 
   meta = {
-    homepage = http://code.google.com/p/tint2;
+    homepage = https://gitlab.com/o9000/tint2;
     license = stdenv.lib.licenses.gpl2;
     description = "A simple panel/taskbar unintrusive and light (memory / cpu / aestetic)";
     platforms = stdenv.lib.platforms.linux;

From f567c395a704f13468ecd3948180c4dcc64a02e2 Mon Sep 17 00:00:00 2001
From: Asko Soukka <asko.soukka@iki.fi>
Date: Wed, 17 Feb 2016 09:39:30 +0200
Subject: [PATCH 1438/2285] mopidy-spotify: 2.2.0 -> 2.3.1

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

diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy-spotify/default.nix
index f1243b47b693..f44f95be140c 100644
--- a/pkgs/applications/audio/mopidy-spotify/default.nix
+++ b/pkgs/applications/audio/mopidy-spotify/default.nix
@@ -2,11 +2,11 @@
 
 pythonPackages.buildPythonPackage rec {
   name = "mopidy-spotify-${version}";
-  version = "2.2.0";
+  version = "2.3.1";
 
   src = fetchurl {
     url = "https://github.com/mopidy/mopidy-spotify/archive/v${version}.tar.gz";
-    sha256 = "0wrrkkrin92ad9k1rwgjbyv2whwrb5b66nmmykxxp6bqcdgdyl5i";
+    sha256 = "0g105kb27q1p8ssrbxkxcjgx9jkqnd9kk5smw8sjcx6f3b23wrwx";
   };
 
   propagatedBuildInputs = [ mopidy pythonPackages.pyspotify ];

From 2f3eae3a87eb4f9e330ac2c31611061c1ae8699f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 17 Feb 2016 08:47:47 +0100
Subject: [PATCH 1439/2285] pkgconfig: add a http-only mirror

It seems we don't really need `fetchurlBoot` here ATM, but let's keep it.
https://github.com/NixOS/nixpkgs/issues/12816#issuecomment-185083205
---
 pkgs/development/tools/misc/pkgconfig/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/misc/pkgconfig/default.nix b/pkgs/development/tools/misc/pkgconfig/default.nix
index c82a626336f6..d7246d22ca73 100644
--- a/pkgs/development/tools/misc/pkgconfig/default.nix
+++ b/pkgs/development/tools/misc/pkgconfig/default.nix
@@ -2,11 +2,14 @@
 
 stdenv.mkDerivation (rec {
   name = "pkg-config-0.29";
-  
+
   setupHook = ./setup-hook.sh;
-  
+
   src = fetchurl {
-    url = "http://pkgconfig.freedesktop.org/releases/${name}.tar.gz";
+    urls = [
+      "https://pkgconfig.freedesktop.org/releases/${name}.tar.gz"
+      "http://fossies.org/linux/misc/${name}.tar.gz"
+    ];
     sha256 = "0sq09a39wj4cxf8l2jvkq067g08ywfma4v6nhprnf351s82pfl68";
   };
 

From 0fe58cade5e90896dfafc49bd0c8cf89c5160fd3 Mon Sep 17 00:00:00 2001
From: Josef Knedl <josef.kemetmueller@aon.at>
Date: Sat, 13 Feb 2016 18:39:49 +0100
Subject: [PATCH 1440/2285] gcc: fix #12836: build on darwin

Patch is based on GCC Bug 66523:
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=66523
---
 .../development/compilers/gcc/4.9/default.nix |  6 +++--
 pkgs/development/compilers/gcc/builder.sh     |  2 +-
 .../gcc/gfortran-darwin-NXConstStr.patch      | 27 +++++++++++++++++++
 3 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/compilers/gcc/gfortran-darwin-NXConstStr.patch

diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix
index add9b30fb629..9e4823966cf3 100644
--- a/pkgs/development/compilers/gcc/4.9/default.nix
+++ b/pkgs/development/compilers/gcc/4.9/default.nix
@@ -71,8 +71,10 @@ let version = "4.9.3";
       # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its
       # target libraries and tools.
       ++ optional langAda ../gnat-cflags.patch
-      ++ optional langFortran ../gfortran-driving.patch;
-
+      ++ optional langFortran ../gfortran-driving.patch
+      # The NXConstStr.patch can be removed at 4.9.4
+      ++ optional stdenv.isDarwin ../gfortran-darwin-NXConstStr.patch; 
+	  
     javaEcj = fetchurl {
       # The `$(top_srcdir)/ecj.jar' file is automatically picked up at
       # `configure' time.
diff --git a/pkgs/development/compilers/gcc/builder.sh b/pkgs/development/compilers/gcc/builder.sh
index dd77c67a023e..6d9e93138737 100644
--- a/pkgs/development/compilers/gcc/builder.sh
+++ b/pkgs/development/compilers/gcc/builder.sh
@@ -24,7 +24,7 @@ if test "$noSysDirs" = "1"; then
         # Figure out what extra flags to pass to the gcc compilers
         # being generated to make sure that they use our glibc.
         extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)"
-        extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)"
+        extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before || true)"
 
         # Use *real* header files, otherwise a limits.h is generated
         # that does not include Glibc's limits.h (notably missing
diff --git a/pkgs/development/compilers/gcc/gfortran-darwin-NXConstStr.patch b/pkgs/development/compilers/gcc/gfortran-darwin-NXConstStr.patch
new file mode 100644
index 000000000000..a7e158ca364b
--- /dev/null
+++ b/pkgs/development/compilers/gcc/gfortran-darwin-NXConstStr.patch
@@ -0,0 +1,27 @@
+From 82f81877458ea372176eabb5de36329431dce99b Mon Sep 17 00:00:00 2001
+From: Iain Sandoe <iain@codesourcery.com>
+Date: Sat, 21 Dec 2013 00:30:18 +0000
+Subject: [PATCH] don't try to mark local symbols as no-dead-strip
+
+---
+ gcc/config/darwin.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
+index 40804b8..0080299 100644
+--- a/gcc/config/darwin.c
++++ b/gcc/config/darwin.c
+@@ -1259,6 +1259,11 @@ darwin_encode_section_info (tree decl, rtx rtl, int first ATTRIBUTE_UNUSED)
+ void
+ darwin_mark_decl_preserved (const char *name)
+ {
++  /* Actually we shouldn't mark any local symbol this way, but for now
++     this only happens with ObjC meta-data.  */
++  if (darwin_label_is_anonymous_local_objc_name (name))
++    return;
++
+   fprintf (asm_out_file, "\t.no_dead_strip ");
+   assemble_name (asm_out_file, name);
+   fputc ('\n', asm_out_file);
+-- 
+2.2.1

From ee994dfae6e897ee4e7405e1624be43625086622 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 17 Feb 2016 10:04:32 +0100
Subject: [PATCH 1441/2285] bootstrap tools: have curl without http2 support

I assume there's not much use for it during bootstrapping.
This fixes them as well, as curl was compiled against libnghttp2 but the
lib wasn't copied to the bootstrap tools.
---
 pkgs/stdenv/linux/make-bootstrap-tools.nix | 1 +
 pkgs/tools/networking/curl/default.nix     | 8 +++++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index e31fed39843d..7f7f4c6a2bd1 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -11,6 +11,7 @@ rec {
   });
 
   curlMinimal = curl.override {
+    http2Support = false;
     zlibSupport = false;
     sslSupport = false;
     scpSupport = false;
diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 01f013275d38..910d86066d9a 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchurl, libnghttp2, pkgconfig, perl
+{ stdenv, fetchurl, pkgconfig, perl
+, http2Support ? true, libnghttp2
 , idnSupport ? false, libidn ? null
 , ldapSupport ? false, openldap ? null
 , zlibSupport ? false, zlib ? null
@@ -8,6 +9,7 @@
 , c-aresSupport ? false, c-ares ? null
 }:
 
+assert http2Support -> libnghttp2 != null;
 assert idnSupport -> libidn != null;
 assert ldapSupport -> openldap != null;
 assert zlibSupport -> zlib != null;
@@ -29,7 +31,7 @@ stdenv.mkDerivation rec {
   # "-lz -lssl", which aren't necessary direct build inputs of
   # applications that use Curl.
   propagatedBuildInputs = with stdenv.lib;
-    [ libnghttp2 ] ++
+    optional http2Support libnghttp2 ++
     optional idnSupport libidn ++
     optional ldapSupport openldap ++
     optional zlibSupport zlib ++
@@ -47,7 +49,7 @@ stdenv.mkDerivation rec {
   configureFlags = [
       "--with-ca-bundle=/etc/ssl/certs/ca-certificates.crt"
       "--disable-manual"
-      "--with-nghttp2=${libnghttp2}"
+      ( if http2Support then "--with-nghttp2=${libnghttp2}" else "--without-nghttp2" )
       ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" )
       ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" )
       ( if ldapSupport then "--enable-ldap" else "--disable-ldap" )

From 15a1a72c4e8654c8a1031366c9976b2ef9efdc56 Mon Sep 17 00:00:00 2001
From: desiderius <didier@devroye.name>
Date: Wed, 17 Feb 2016 10:47:28 +0100
Subject: [PATCH 1442/2285] pythonPackages.redis: 2.10.3 -> 2.10.5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cfb92eb5b8a7..12a74cf94417 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17764,11 +17764,11 @@ in modules // {
   };
 
   redis = buildPythonPackage rec {
-    name = "redis-2.10.3";
+    name = "redis-2.10.5";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/r/redis/${name}.tar.gz";
-      sha256 = "1701qjwn4n05q90fdg4bsg96s27xf5s4hsb4gxhv3xk052q3gyx4";
+      sha256 = "0csmrkxb29x7xs9b51zplwkkq2hwnbh9jns1g85dykn5rxmaxysx";
     };
 
     # tests require a running redis

From 4ca2332bac720a8eb100ada05262bd9d2f5b62c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 17 Feb 2016 10:52:42 +0100
Subject: [PATCH 1443/2285] nixpkgs manual: fix typo in filename

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

diff --git a/doc/configuration.xml b/doc/configuration.xml
index ce25bbfce77b..ffeb7cf554bd 100644
--- a/doc/configuration.xml
+++ b/doc/configuration.xml
@@ -89,7 +89,7 @@ packages via <literal>packageOverrides</literal></title>
 
 <para>You can define a function called
 <varname>packageOverrides</varname> in your local
-<filename>~/.nixpkgs/config</filename> to overide nix packages.  It
+<filename>~/.nixpkgs/config.nix</filename> to overide nix packages.  It
 must be a function that takes pkgs as an argument and return modified
 set of packages.
 

From 81aab64b7f6c07ae463d4b71f0e495388773f6cf Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Wed, 25 Nov 2015 15:25:29 +0900
Subject: [PATCH 1444/2285] fcitx: group engines

---
 .../fcitx-anthy.nix => fcitx-engines/fcitx-anthy/default.nix}   | 0
 pkgs/top-level/all-packages.nix                                 | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/tools/inputmethods/{fcitx/fcitx-anthy.nix => fcitx-engines/fcitx-anthy/default.nix} (100%)

diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-anthy.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
similarity index 100%
rename from pkgs/tools/inputmethods/fcitx/fcitx-anthy.nix
rename to pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a411a7ff0ea..2ca59361b414 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1511,7 +1511,7 @@ let
 
   fcitx = callPackage ../tools/inputmethods/fcitx { };
 
-  fcitx-anthy = callPackage ../tools/inputmethods/fcitx/fcitx-anthy.nix { };
+  fcitx-anthy = callPackage ../tools/inputmethods/fcitx-engines/fcitx-anthy { };
 
   fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { };
 

From e2a62868d912dcfeae39716c988b671d2d8bd263 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Wed, 25 Nov 2015 15:27:25 +0900
Subject: [PATCH 1445/2285] fcitx-anthy: 0.2.1 -> 0.2.2

---
 .../fcitx-engines/fcitx-anthy/default.nix     | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
index 2099220f2a1f..c1cb76d3a68b 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
@@ -1,24 +1,26 @@
-{ stdenv, fetchurl, cmake, fcitx, anthy }:
+{ stdenv, fetchurl, cmake, fcitx, anthy, gettext, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "fcitx-anthy-0.2.1";
-
-  meta = with stdenv.lib; {
-    description = "Fcitx Wrapper for anthy";
-    license     = licenses.gpl2Plus;
-    platforms   = platforms.linux;
-    maintainers = with maintainers; [ iyzsong ];
-  };
+  name = "fcitx-anthy-${version}";
+  version = "0.2.2";
 
   src = fetchurl {
     url = "http://download.fcitx-im.org/fcitx-anthy/${name}.tar.xz";
-    sha256 = "13fpfhhxkzbq53h10i3hifa37nngm47jq361i70z22bgcrs8887x";
+    sha256 = "0ayrzfx95670k86y19bzl6i6w98haaln3x8dxpb39a5dwgz59pf8";
   };
 
-  buildInputs = [ cmake fcitx anthy ];
+  buildInputs = [ cmake fcitx anthy gettext pkgconfig ];
 
   preInstall = ''
     substituteInPlace src/cmake_install.cmake \
       --replace ${fcitx} $out
   '';
+
+  meta = with stdenv.lib; {
+    description = "Fcitx Wrapper for anthy";
+    license     = licenses.gpl2Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ iyzsong ericsagnes ];
+  };
+
 }

From 3068f632c7aeec4065c19439e3c2f326a946a79d Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Wed, 25 Nov 2015 15:31:28 +0900
Subject: [PATCH 1446/2285] fcitx-chewing: init at 0.2.2

---
 .../fcitx-engines/fcitx-chewing/default.nix   | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix

diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix
new file mode 100644
index 000000000000..eb8897b9d5eb
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchurl, cmake, fcitx, gettext, libchewing, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "fcitx-chewing-${version}";
+  version = "0.2.2";
+
+  src = fetchurl {
+    url = "http://download.fcitx-im.org/fcitx-chewing/${name}.tar.xz";
+    sha256 = "0l548xdx2fvjya1ixp37pn382yak0m4kwfh9lgh7l3y2sblqw9zs";
+  };
+
+  buildInputs = [ cmake fcitx gettext libchewing pkgconfig ];
+
+  preInstall = ''
+   substituteInPlace src/cmake_install.cmake \
+      --replace ${fcitx} $out
+   substituteInPlace data/cmake_install.cmake \
+      --replace ${fcitx} $out
+  '';
+
+  meta = with stdenv.lib; {
+    homepage     = "https://github.com/fcitx/fcitx-chewing";
+    downloadPage = "http://download.fcitx-im.org/fcitx-chewing/";
+    description  = "Fcitx engine for chewing";
+    license      = licenses.gpl2;
+    platforms    = platforms.linux;
+    maintainers  = with maintainers; [ ericsagnes ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2ca59361b414..220cfdfd6594 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1513,6 +1513,8 @@ let
 
   fcitx-anthy = callPackage ../tools/inputmethods/fcitx-engines/fcitx-anthy { };
 
+  fcitx-chewing = callPackage ../tools/inputmethods/fcitx-engines/fcitx-chewing { };
+
   fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { };
 
   fcitx-with-plugins = callPackage ../tools/inputmethods/fcitx/wrapper.nix {

From 1e5cd17f12a520e7f670d206a910e27f50a948d2 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Wed, 25 Nov 2015 15:34:54 +0900
Subject: [PATCH 1447/2285] fcitx-hangul: init at 0.3.0

---
 .../fcitx-engines/fcitx-hangul/default.nix    | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix

diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix
new file mode 100644
index 000000000000..529bb29f98c2
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, cmake, fcitx, libhangul, gettext, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "fcitx-hangul-${version}";
+  version = "0.3.0";
+
+  src = fetchurl {
+    url = "http://download.fcitx-im.org/fcitx-hangul/${name}.tar.xz";
+    sha256 = "1jq78nczliw6pnhfac8hspffybrry6syk17y0wwcq05j3r3nd2lp";
+  };
+
+  buildInputs = [ cmake fcitx libhangul gettext pkgconfig ];
+
+  preInstall = ''
+    substituteInPlace src/cmake_install.cmake \
+      --replace ${fcitx} $out
+    substituteInPlace data/cmake_install.cmake \
+      --replace ${fcitx} $out
+  '';
+
+  meta = with stdenv.lib; {
+    homepage     = "https://github.com/fcitx/fcitx-hangul";
+    downloadPage = "http://download.fcitx-im.org/fcitx-hangul/";
+    description  = "Fcitx Wrapper for hangul";
+    license      = licenses.gpl2;
+    platforms    = platforms.linux;
+    maintainers  = with maintainers; [ ericsagnes ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 220cfdfd6594..61347ecab52a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1515,6 +1515,8 @@ let
 
   fcitx-chewing = callPackage ../tools/inputmethods/fcitx-engines/fcitx-chewing { };
 
+  fcitx-hangul = callPackage ../tools/inputmethods/fcitx-engines/fcitx-hangul { };
+
   fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { };
 
   fcitx-with-plugins = callPackage ../tools/inputmethods/fcitx/wrapper.nix {

From eb31d296e6d4003eebf6aa5548c34c524eba3bcf Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Wed, 25 Nov 2015 15:40:39 +0900
Subject: [PATCH 1448/2285] fcitx-table-other: init at 0.2.3

---
 .../fcitx-table-other/default.nix             | 28 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix

diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix
new file mode 100644
index 000000000000..d5e74f6ba068
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchurl, cmake, fcitx, gettext }:
+
+stdenv.mkDerivation rec {
+  name = "fcitx-table-other-${version}";
+  version = "0.2.3";
+
+  src = fetchurl {
+    url = "http://download.fcitx-im.org/fcitx-table-other/${name}.tar.xz";
+    sha256 = "12fqbsjrpx5pndx2jf7fksrlp01a4yxz62h2vpxrbkpk73ljly4v";
+  };
+
+  buildInputs = [ cmake fcitx gettext ];
+
+  preInstall = ''
+   substituteInPlace tables/cmake_install.cmake \
+      --replace ${fcitx} $out
+  '';
+
+  meta = with stdenv.lib; {
+    homepage     = "https://github.com/fcitx/fcitx-table-other";
+    downloadPage = "http://download.fcitx-im.org/fcitx-table-other/";
+    description  = "Provides some other tables for Fcitx";
+    license      = licenses.gpl3Plus;
+    platforms    = platforms.linux;
+    maintainers  = with maintainers; [ ericsagnes ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 61347ecab52a..47ddbb6feda6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1517,6 +1517,8 @@ let
 
   fcitx-hangul = callPackage ../tools/inputmethods/fcitx-engines/fcitx-hangul { };
 
+  fcitx-table-other = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-other { };
+
   fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { };
 
   fcitx-with-plugins = callPackage ../tools/inputmethods/fcitx/wrapper.nix {

From 1e581966b9883a66172bb6ccae3dd33f393e4dfe Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Wed, 25 Nov 2015 16:18:26 +0900
Subject: [PATCH 1449/2285] fcitx-moz: init at 2.17.2313.102

---
 .../fcitx-engines/fcitx-mozc/default.nix      | 116 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   4 +
 2 files changed, 120 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix

diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
new file mode 100644
index 000000000000..7accea3f0fde
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
@@ -0,0 +1,116 @@
+{ clangStdenv, fetchFromGitHub, fetchurl, fetchpatch, fetchsvn, gyp, which, ninja, 
+  python, pkgconfig, protobuf, gtk, zinnia, qt4, libxcb, tegaki-zinnia-japanese,
+  fcitx, gettext }:
+let
+  japanese_usage_dictionary = fetchsvn {
+    url    = "http://japanese-usage-dictionary.googlecode.com/svn/trunk";
+    rev    = "10";
+    sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm";
+  };
+  icons = fetchurl {
+    url    = "http://download.fcitx-im.org/fcitx-mozc/fcitx-mozc-icon.tar.gz";
+    sha256 = "10bdjn481jsh32vll7r756l392anz44h6207vjqwby3rplk31np1";
+  };
+in clangStdenv.mkDerivation rec {
+  name    = "fcitx-mozc-${version}";
+  version = "2.17.2313.102";
+
+  src = fetchFromGitHub {
+    owner  = "google";
+    repo   = "mozc";
+    rev    = "3306d3314499a54a4064b8b80bbc1bce3f6cfac4";
+    sha256 = "0l7mjlnbm6i1ipni8pg9ym5bjg3rzkaxi9xwmsz2lddv348sqii2";
+  };
+
+  nativeBuildInputs = [ gyp which ninja python pkgconfig ];
+  buildInputs = [ protobuf gtk zinnia qt4 libxcb fcitx gettext ];
+
+  postUnpack = ''
+    rmdir $sourceRoot/src/third_party/japanese_usage_dictionary/
+    ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary
+    tar -xzf ${icons} -C $sourceRoot
+  '';
+
+  patch_version = "2.17.2313.102.1";
+  patches = [ 
+    (fetchpatch rec {
+      name   = "fcitx-mozc-${patch_version}.patch";
+      url    = "https://download.fcitx-im.org/fcitx-mozc/${name}";
+      sha256 = "172c34jkppibvwr9qf9xwgh2hdrmmhyx7nsdj49krxbfdlsy3yy0";
+     })
+  ];
+
+  postPatch = ''
+    substituteInPlace src/unix/fcitx/mozc.conf \
+      --replace "/usr/share/fcitx/mozc/icon/mozc.png" "mozc" 
+  '';
+
+  configurePhase = ''
+    export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1"
+    python src/build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc \
+    python src/unix/fcitx/fcitx.gyp gyp --gypdir=${gyp}/bin
+  '';
+
+  preBuildPhase = ''
+    head -n 29 src/server/mozc_server.cc > LICENSE
+  '';
+
+  buildPhase = ''
+    python src/build_mozc.py build -c Release \
+      unix/fcitx/fcitx.gyp:fcitx-mozc \
+      server/server.gyp:mozc_server \
+      gui/gui.gyp:mozc_tool
+  '';
+
+  checkPhase = ''
+    python src/build_mozc.py runtests -c Release
+  '';
+
+  installPhase = ''
+    install -d        $out/share/licenses/fcitx-mozc/
+    install -m 644    LICENSE src/data/installer/*.html     $out/share/licenses/fcitx-mozc/
+
+    install -d        $out/share/doc/mozc
+    install -m    644 src/data/installer/*.html             $out/share/doc/mozc/
+
+    install -D -m 755 src/out_linux/Release/mozc_server     $out/lib/mozc/mozc_server
+    install    -m 755 src/out_linux/Release/mozc_tool       $out/lib/mozc/mozc_tool
+
+    install -D -m 755 src/out_linux/Release/fcitx-mozc.so   $out/lib/fcitx/fcitx-mozc.so
+    install -D -m 644 src/unix/fcitx/fcitx-mozc.conf        $out/share/fcitx/addon/fcitx-mozc.conf
+    install -D -m 644 src/unix/fcitx/mozc.conf              $out/share/fcitx/inputmethod/mozc.conf
+
+    install -d        $out/share/doc/mozc
+
+    for mofile in src/out_linux/Release/gen/unix/fcitx/po/*.mo
+    do
+      filename=`basename $mofile`
+      lang=$filename.mo
+      install -D -m 644 "$mofile" "$out/share/locale/$lang/LC_MESSAGES/fcitx-mozc.mo"
+    done
+
+    install -d        $out/share/fcitx/imicon
+    install    -m 644 fcitx-mozc-icons/mozc.png                 $out/share/fcitx/imicon/mozc.png
+    install -d        $out/share/fcitx/mozc/icon
+    install    -m 644 fcitx-mozc-icons/mozc.png                 $out/share/fcitx/mozc/icon/mozc.png
+    install    -m 644 fcitx-mozc-icons/mozc-alpha_full.png      $out/share/fcitx/mozc/icon/mozc-alpha_full.png
+    install    -m 644 fcitx-mozc-icons/mozc-alpha_half.png      $out/share/fcitx/mozc/icon/mozc-alpha_half.png
+    install    -m 644 fcitx-mozc-icons/mozc-direct.png          $out/share/fcitx/mozc/icon/mozc-direct.png
+    install    -m 644 fcitx-mozc-icons/mozc-hiragana.png        $out/share/fcitx/mozc/icon/mozc-hiragana.png
+    install    -m 644 fcitx-mozc-icons/mozc-katakana_full.png   $out/share/fcitx/mozc/icon/mozc-katakana_full.png
+    install    -m 644 fcitx-mozc-icons/mozc-katakana_half.png   $out/share/fcitx/mozc/icon/mozc-katakana_half.png
+    install    -m 644 fcitx-mozc-icons/mozc-dictionary.png      $out/share/fcitx/mozc/icon/mozc-dictionary.png
+    install    -m 644 fcitx-mozc-icons/mozc-properties.png      $out/share/fcitx/mozc/icon/mozc-properties.png
+    install    -m 644 fcitx-mozc-icons/mozc-tool.png            $out/share/fcitx/mozc/icon/mozc-tool.png
+  '';
+
+  meta = with clangStdenv.lib; {
+    description  = "Fcitx engine for Google japanese input method";
+    homepage     = http://code.google.com/p/mozc/;
+    downloadPage = "http://download.fcitx-im.org/fcitx-mozc/";
+    license      = licenses.free;
+    platforms    = platforms.linux;
+    maintainers  = [ maintainers.ericsagnes ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47ddbb6feda6..cb1d083555d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1517,6 +1517,10 @@ let
 
   fcitx-hangul = callPackage ../tools/inputmethods/fcitx-engines/fcitx-hangul { };
 
+  fcitx-mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc {
+    inherit (pythonPackages) gyp;
+  };
+
   fcitx-table-other = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-other { };
 
   fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { };

From a0457135d8e4ea13610f00b26e37fcb7201ceb67 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Wed, 17 Feb 2016 02:15:15 +0900
Subject: [PATCH 1450/2285] fcitx-qt5: 1.0.4 -> 1.0.5

---
 pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
index fad7862cf3b9..428e96e8674d 100644
--- a/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
+++ b/pkgs/tools/inputmethods/fcitx/fcitx-qt5.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "fcitx-qt5-${version}";
-  version = "1.0.4";
+  version = "1.0.5";
 
   src = fetchurl {
     url = "http://download.fcitx-im.org/fcitx-qt5/${name}.tar.xz";
-    sha256 = "070dlmwkim7sg0xwxfcbb46li1jk8yd3rmj0j5fkmgyr12044aml";
+    sha256 = "1pj1b04n8r4kl7jh1qdv0xshgzb3zrmizfa3g5h3yk589h191vwc";
   };
 
   buildInputs = [ cmake fcitx extra-cmake-modules qtbase ];

From 850be632a071c2d7dd2f9bdb333d1fdffbec3340 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Wed, 25 Nov 2015 16:29:50 +0900
Subject: [PATCH 1451/2285] fcitx service: init

---
 nixos/modules/i18n/inputMethod/fcitx.nix      | 51 +++++++++++++++++++
 nixos/modules/module-list.nix                 |  1 +
 .../fcitx-engines/fcitx-anthy/default.nix     |  9 ++--
 .../fcitx-engines/fcitx-chewing/default.nix   | 13 ++---
 .../fcitx-engines/fcitx-hangul/default.nix    | 13 ++---
 .../fcitx-engines/fcitx-mozc/default.nix      | 13 ++---
 .../fcitx-table-other/default.nix             | 13 ++---
 pkgs/top-level/all-packages.nix               | 18 ++++---
 8 files changed, 96 insertions(+), 35 deletions(-)
 create mode 100644 nixos/modules/i18n/inputMethod/fcitx.nix

diff --git a/nixos/modules/i18n/inputMethod/fcitx.nix b/nixos/modules/i18n/inputMethod/fcitx.nix
new file mode 100644
index 000000000000..16fa8c764a87
--- /dev/null
+++ b/nixos/modules/i18n/inputMethod/fcitx.nix
@@ -0,0 +1,51 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.i18n.inputMethod.fcitx;
+  fcitxPackage = pkgs.fcitx-with-plugins.override { plugins = cfg.engines; };
+  fcitxEngine = types.package // {
+    name  = "fcitx-engine";
+    check = x: (lib.types.package.check x) && (attrByPath ["meta" "isFcitxEngine"] false x);
+  };
+in
+{
+  options = {
+
+    i18n.inputMethod.fcitx = {
+      enable = mkOption {
+        type    = types.bool;
+        default = false;
+        example = true;
+        description = ''
+          Enable Fcitx input method.
+          Fcitx can be used to input of Chinese, Korean, Japanese and other special characters.
+        '';
+      };
+      engines = mkOption {
+        type    = with types; listOf fcitxEngine;
+        default = [];
+        example = literalExample "with pkgs.fcitx-engines; [ mozc hangul ]";
+        description = ''
+          Enabled Fcitx engines.
+          Available engines can be found by running `nix-env "&lt;nixpkgs&gt;" . -qaP -A fcitx-engines`.
+        '';
+      };
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ fcitxPackage ];
+    gtkPlugins = [ fcitxPackage ];
+    qtPlugins  = [ fcitxPackage pkgs.kde5.fcitx-qt5 ];
+
+    environment.variables = {
+      GTK_IM_MODULE = "fcitx";
+      QT_IM_MODULE  = "fcitx";
+      XMODIFIERS    = "@im=fcitx";
+    };
+    services.xserver.displayManager.sessionCommands = "${fcitxPackage}/bin/fcitx";
+  };
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 8254cdd6f5eb..7375dcde5c5c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -43,6 +43,7 @@
   ./hardware/video/nvidia.nix
   ./hardware/video/ati.nix
   ./hardware/video/webcam/facetimehd.nix
+  ./i18n/inputMethod/fcitx.nix
   ./installer/tools/auto-upgrade.nix
   ./installer/tools/nixos-checkout.nix
   ./installer/tools/tools.nix
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
index c1cb76d3a68b..88ba436207c3 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-anthy/default.nix
@@ -17,10 +17,11 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Fcitx Wrapper for anthy";
-    license     = licenses.gpl2Plus;
-    platforms   = platforms.linux;
-    maintainers = with maintainers; [ iyzsong ericsagnes ];
+    isFcitxEngine = true;
+    description   = "Fcitx Wrapper for anthy";
+    license       = licenses.gpl2Plus;
+    platforms     = platforms.linux;
+    maintainers   = with maintainers; [ iyzsong ericsagnes ];
   };
 
 }
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix
index eb8897b9d5eb..58695434cb6c 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-chewing/default.nix
@@ -19,12 +19,13 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage     = "https://github.com/fcitx/fcitx-chewing";
-    downloadPage = "http://download.fcitx-im.org/fcitx-chewing/";
-    description  = "Fcitx engine for chewing";
-    license      = licenses.gpl2;
-    platforms    = platforms.linux;
-    maintainers  = with maintainers; [ ericsagnes ];
+    isFcitxEngine = true;
+    homepage      = "https://github.com/fcitx/fcitx-chewing";
+    downloadPage  = "http://download.fcitx-im.org/fcitx-chewing/";
+    description   = "Fcitx engine for chewing";
+    license       = licenses.gpl2;
+    platforms     = platforms.linux;
+    maintainers   = with maintainers; [ ericsagnes ];
   };
 
 }
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix
index 529bb29f98c2..54b5335d9bb2 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-hangul/default.nix
@@ -19,11 +19,12 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage     = "https://github.com/fcitx/fcitx-hangul";
-    downloadPage = "http://download.fcitx-im.org/fcitx-hangul/";
-    description  = "Fcitx Wrapper for hangul";
-    license      = licenses.gpl2;
-    platforms    = platforms.linux;
-    maintainers  = with maintainers; [ ericsagnes ];
+    isFcitxEngine = true;
+    homepage      = "https://github.com/fcitx/fcitx-hangul";
+    downloadPage  = "http://download.fcitx-im.org/fcitx-hangul/";
+    description   = "Fcitx Wrapper for hangul";
+    license       = licenses.gpl2;
+    platforms     = platforms.linux;
+    maintainers   = with maintainers; [ ericsagnes ];
   };
 }
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
index 7accea3f0fde..5366fe558770 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-mozc/default.nix
@@ -105,12 +105,13 @@ in clangStdenv.mkDerivation rec {
   '';
 
   meta = with clangStdenv.lib; {
-    description  = "Fcitx engine for Google japanese input method";
-    homepage     = http://code.google.com/p/mozc/;
-    downloadPage = "http://download.fcitx-im.org/fcitx-mozc/";
-    license      = licenses.free;
-    platforms    = platforms.linux;
-    maintainers  = [ maintainers.ericsagnes ];
+    isFcitxEngine = true;
+    description   = "Fcitx engine for Google japanese input method";
+    homepage      = http://code.google.com/p/mozc/;
+    downloadPage  = "http://download.fcitx-im.org/fcitx-mozc/";
+    license       = licenses.free;
+    platforms     = platforms.linux;
+    maintainers   = [ maintainers.ericsagnes ];
   };
 
 }
diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix
index d5e74f6ba068..40ef0b33aea4 100644
--- a/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-table-other/default.nix
@@ -17,12 +17,13 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage     = "https://github.com/fcitx/fcitx-table-other";
-    downloadPage = "http://download.fcitx-im.org/fcitx-table-other/";
-    description  = "Provides some other tables for Fcitx";
-    license      = licenses.gpl3Plus;
-    platforms    = platforms.linux;
-    maintainers  = with maintainers; [ ericsagnes ];
+    isFcitxEngine = true;
+    homepage      = "https://github.com/fcitx/fcitx-table-other";
+    downloadPage  = "http://download.fcitx-im.org/fcitx-table-other/";
+    description   = "Provides some other tables for Fcitx";
+    license       = licenses.gpl3Plus;
+    platforms     = platforms.linux;
+    maintainers   = with maintainers; [ ericsagnes ];
   };
 
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cb1d083555d3..d2e26707c45a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1511,18 +1511,22 @@ let
 
   fcitx = callPackage ../tools/inputmethods/fcitx { };
 
-  fcitx-anthy = callPackage ../tools/inputmethods/fcitx-engines/fcitx-anthy { };
+  fcitx-engines = {
 
-  fcitx-chewing = callPackage ../tools/inputmethods/fcitx-engines/fcitx-chewing { };
+    anthy = callPackage ../tools/inputmethods/fcitx-engines/fcitx-anthy { };
 
-  fcitx-hangul = callPackage ../tools/inputmethods/fcitx-engines/fcitx-hangul { };
+    chewing = callPackage ../tools/inputmethods/fcitx-engines/fcitx-chewing { };
+
+    hangul = callPackage ../tools/inputmethods/fcitx-engines/fcitx-hangul { };
+
+    mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc {
+      inherit (pythonPackages) gyp;
+    };
+
+    table-other = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-other { };
 
-  fcitx-mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc {
-    inherit (pythonPackages) gyp;
   };
 
-  fcitx-table-other = callPackage ../tools/inputmethods/fcitx-engines/fcitx-table-other { };
-
   fcitx-configtool = callPackage ../tools/inputmethods/fcitx/fcitx-configtool.nix { };
 
   fcitx-with-plugins = callPackage ../tools/inputmethods/fcitx/wrapper.nix {

From 295d67002432bc719af447a054add3292eefafed Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Wed, 10 Feb 2016 14:00:58 +0900
Subject: [PATCH 1452/2285] fcitx-with-plugins: add fcitx-configtool and
 fcitx-qt5

---
 nixos/modules/i18n/inputMethod/fcitx.nix  | 2 +-
 pkgs/tools/inputmethods/fcitx/wrapper.nix | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/i18n/inputMethod/fcitx.nix b/nixos/modules/i18n/inputMethod/fcitx.nix
index 16fa8c764a87..b0e7578810ad 100644
--- a/nixos/modules/i18n/inputMethod/fcitx.nix
+++ b/nixos/modules/i18n/inputMethod/fcitx.nix
@@ -39,7 +39,7 @@ in
   config = mkIf cfg.enable {
     environment.systemPackages = [ fcitxPackage ];
     gtkPlugins = [ fcitxPackage ];
-    qtPlugins  = [ fcitxPackage pkgs.kde5.fcitx-qt5 ];
+    qtPlugins  = [ fcitxPackage ];
 
     environment.variables = {
       GTK_IM_MODULE = "fcitx";
diff --git a/pkgs/tools/inputmethods/fcitx/wrapper.nix b/pkgs/tools/inputmethods/fcitx/wrapper.nix
index d4efb3326969..a0ae26189541 100644
--- a/pkgs/tools/inputmethods/fcitx/wrapper.nix
+++ b/pkgs/tools/inputmethods/fcitx/wrapper.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildEnv, fcitx, makeWrapper, plugins }:
+{ stdenv, buildEnv, fcitx, fcitx-configtool, makeWrapper, plugins, kde5 }:
 
 # This is based on the pidgin-with-plugins package.
 # Users should be able to configure what plugins are used
@@ -16,7 +16,7 @@ let
 drv = buildEnv {
   name = "fcitx-with-plugins-" + (builtins.parseDrvName fcitx.name).version;
 
-  paths = [ fcitx ] ++ plugins;
+  paths = [ fcitx fcitx-configtool kde5.fcitx-qt5 ] ++ plugins;
 
   postBuild = ''
     # TODO: This could be avoided if buildEnv could be forced to create all directories

From 3c9892d4d4a1049071629a269e0c7ce7a0eb0a4b Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Wed, 10 Feb 2016 11:41:51 +0900
Subject: [PATCH 1453/2285] ibus: group engines

---
 .../{ => ibus-engines}/ibus-anthy/default.nix |  0
 .../ibus-mozc}/default.nix                    |  0
 .../ibus-table-others/default.nix             |  0
 .../{ => ibus-engines}/ibus-table/default.nix |  0
 .../{ibus-qt/default.nix => ibus/ibus-qt.nix} |  0
 pkgs/top-level/all-packages.nix               | 20 +++++++++++--------
 6 files changed, 12 insertions(+), 8 deletions(-)
 rename pkgs/tools/inputmethods/{ => ibus-engines}/ibus-anthy/default.nix (100%)
 rename pkgs/tools/inputmethods/{mozc => ibus-engines/ibus-mozc}/default.nix (100%)
 rename pkgs/tools/inputmethods/{ => ibus-engines}/ibus-table-others/default.nix (100%)
 rename pkgs/tools/inputmethods/{ => ibus-engines}/ibus-table/default.nix (100%)
 rename pkgs/tools/inputmethods/{ibus-qt/default.nix => ibus/ibus-qt.nix} (100%)

diff --git a/pkgs/tools/inputmethods/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
similarity index 100%
rename from pkgs/tools/inputmethods/ibus-anthy/default.nix
rename to pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
diff --git a/pkgs/tools/inputmethods/mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
similarity index 100%
rename from pkgs/tools/inputmethods/mozc/default.nix
rename to pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
diff --git a/pkgs/tools/inputmethods/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
similarity index 100%
rename from pkgs/tools/inputmethods/ibus-table-others/default.nix
rename to pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
diff --git a/pkgs/tools/inputmethods/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
similarity index 100%
rename from pkgs/tools/inputmethods/ibus-table/default.nix
rename to pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
diff --git a/pkgs/tools/inputmethods/ibus-qt/default.nix b/pkgs/tools/inputmethods/ibus/ibus-qt.nix
similarity index 100%
rename from pkgs/tools/inputmethods/ibus-qt/default.nix
rename to pkgs/tools/inputmethods/ibus/ibus-qt.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d2e26707c45a..f6eac6123759 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1170,19 +1170,23 @@ let
 
   m17n_lib = callPackage ../tools/inputmethods/m17n-lib { };
 
-  mozc = callPackage ../tools/inputmethods/mozc {
-    inherit (pythonPackages) gyp;
-  };
-
   ibus = callPackage ../tools/inputmethods/ibus { };
 
-  ibus-qt = callPackage ../tools/inputmethods/ibus-qt { };
+  ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { };
 
-  ibus-anthy = callPackage ../tools/inputmethods/ibus-anthy { };
+  ibus-engines = {
 
-  ibus-table = callPackage ../tools/inputmethods/ibus-table { };
+    anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { };
 
-  ibus-table-others = callPackage ../tools/inputmethods/ibus-table-others { };
+    mozc = callPackage ../tools/inputmethods/ibus-engines/mozc {
+      inherit (pythonPackages) gyp;
+    };
+
+    table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { };
+
+    table-others = callPackage ../tools/inputmethods/ibus-engines/ibus-table-others { };
+
+  };
 
   brotli = callPackage ../tools/compression/brotli { };
 

From dd579a557694fcf15e705475539c4d9978e18e8d Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Wed, 10 Feb 2016 13:15:26 +0900
Subject: [PATCH 1454/2285] ibus-anthy: 1.5.7 -> 1.5.8

---
 .../ibus-engines/ibus-anthy/default.nix       | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
index 0b2382315a5d..4bdee391880b 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
@@ -1,20 +1,24 @@
-{ stdenv, fetchurl, makeWrapper, ibus, anthy, intltool, pkgconfig, glib, gobjectIntrospection, python, pythonPackages }:
+{ stdenv, fetchFromGitHub, makeWrapper, ibus, anthy, intltool, pkgconfig, glib, gobjectIntrospection,
+  python, pythonPackages, gtk3, libtool, automake, autoconf }:
 
 stdenv.mkDerivation rec {
   name = "ibus-anthy-${version}";
-  version = "1.5.7";
+  version = "1.5.8";
 
   meta = with stdenv.lib; {
     description = "IBus interface to the anthy input method";
     homepage    = http://wiki.github.com/fujiwarat/ibus-anthy;
     license     = licenses.gpl2Plus;
     platforms   = platforms.linux;
-    maintainers = with maintainers; [ gebner ];
+    maintainers = with maintainers; [ gebner ericsagnes ];
   };
 
+  preConfigure = "./autogen.sh --prefix=$out";
+
   configureFlags = "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t";
 
-  buildInputs = [ makeWrapper ibus anthy intltool pkgconfig glib gobjectIntrospection python pythonPackages.pygobject3 ];
+  buildInputs = [ makeWrapper ibus anthy intltool pkgconfig glib gobjectIntrospection
+    python pythonPackages.pygobject3 gtk3 libtool automake autoconf ];
 
   postFixup = ''
     substituteInPlace $out/share/ibus/component/anthy.xml --replace \$\{exec_prefix\} $out
@@ -25,8 +29,10 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  src = fetchurl {
-    url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz";
-    sha256 = "00sjrfhghrgkqm72mf39f8sz6wr4fwvvs9mn2alaldhgr5v0c861";
+  src = fetchFromGitHub {
+    owner  = "ibus";
+    repo   = "ibus-anthy";
+    rev    = version;
+    sha256 = "1laxwpnhgihv4dz5cgcz6d0a0880r93n7039ciz1m53hdzapwi4a";
   };
 }

From ca2f9a4f159ed71f0495126b903b5f8b65a3cb88 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Wed, 10 Feb 2016 13:34:17 +0900
Subject: [PATCH 1455/2285] ibus-mozc: 2015-05-02 -> 2.17.2313.102

---
 .../ibus-engines/ibus-hangul/default.nix      | 38 +++++++++++++++++++
 .../ibus-engines/ibus-mozc/default.nix        | 30 ++++++++++-----
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 61 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
new file mode 100644
index 000000000000..5a6af4608c0f
--- /dev/null
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, gnome, fetchFromGitHub, ibus, libhangul, autoconf, automake, gettext, libtool, librsvg,
+  intltool, pkgconfig, pythonPackages, makeWrapper, gtk3, python }:
+
+stdenv.mkDerivation rec {
+  name = "ibus-hangul-${version}";
+  version = "1.5.0";
+
+  src = fetchFromGitHub {
+    owner  = "choehwanjin";
+    repo   = "ibus-hangul";
+    rev    = version;
+    sha256 = "12l2spr32biqdbz01bzkamgq5gskbi6cd7ai343wqyy1ibjlkmp8";
+  };
+
+  buildInputs = [ ibus libhangul autoconf gettext automake libtool
+    intltool pkgconfig python pythonPackages.pygobject3 gtk3 makeWrapper ];
+
+  preConfigure = ''
+    autoreconf --verbose --force --install
+    intltoolize --automake --force --copy
+  '';
+
+  postInstall = ''
+    wrapProgram $out/bin/ibus-setup-hangul \
+      --prefix PYTHONPATH : $PYTHONPATH \
+      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
+      --prefix GDK_PIXBUF_MODULE_FILE : ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
+      --prefix LD_LIBRARY_PATH : ${libhangul}/lib
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Ibus Hangul engine.";
+    homepage    = https://github.com/choehwanjin/ibus-hangul;
+    license     = licenses.gpl2;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ ericsagnes ];
+  };
+}
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
index 20789a33a0c0..9ab640990b16 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
@@ -7,33 +7,40 @@ let
     sha256 = "0pyrpz9c8nxccwpgyr36w314mi8h132cis8ijvlqmmhqxwsi30hm";
   };
 in clangStdenv.mkDerivation rec {
-  name = "mozc-${version}";
-  version = "2015-05-02";
+  name = "ibus-mozc-${version}";
+  version = "2.17.2313.102";
 
   meta = with clangStdenv.lib; {
     description = "Japanese input method from Google";
     homepage = http://code.google.com/p/mozc/;
-    license = licenses.bsd3;
+    license = licenses.free;
     platforms = platforms.linux;
-    maintainers = [ maintainers.gebner ];
+    maintainers = with maintainers; [ gebner ericsagnes ];
   };
 
   nativeBuildInputs = [ gyp which ninja python pkgconfig ];
   buildInputs = [ protobuf ibus gtk zinnia qt4 libxcb ];
 
   src = fetchFromGitHub {
-    owner = "google";
-    repo = "mozc";
-    rev = "d9783737ecfcb68c3d98d84e7052d716f4d0e0cb";
-    sha256 = "52a83658e2e4a7b38e31a4085682be24c9c5f4c51a01578598a30b9833827b72";
+    owner  = "google";
+    repo   = "mozc";
+    rev    = "3306d3314499a54a4064b8b80bbc1bce3f6cfac4";
+    sha256 = "0l7mjlnbm6i1ipni8pg9ym5bjg3rzkaxi9xwmsz2lddv348sqii2";
   };
+
   postUnpack = ''
+    rmdir $sourceRoot/src/third_party/japanese_usage_dictionary/
     ln -s ${japanese_usage_dictionary} $sourceRoot/src/third_party/japanese_usage_dictionary
   '';
 
   configurePhase = ''
-    export GYP_DEFINES="ibus_mozc_path=$out/lib/ibus-mozc/ibus-engine-mozc ibus_mozc_icon_path=$out/share/ibus-mozc/product_icon.png document_dir=$out/share/doc/mozc zinnia_model_file=${tegaki-zinnia-japanese}/share/tegaki/models/zinnia/handwriting-ja.model use_libprotobuf=1"
-    python src/build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc
+    export GYP_DEFINES="document_dir=$out/share/doc/mozc use_libzinnia=1 use_libprotobuf=1 ibus_mozc_path=$out/lib/ibus-mozc/ibus-engine-mozc"
+    python src/build_mozc.py gyp --gypdir=${gyp}/bin --server_dir=$out/lib/mozc \
+    python src/unix/fcitx/fcitx.gyp gyp --gypdir=${gyp}/bin
+  '';
+
+  preBuildPhase = ''
+    head -n 29 src/server/mozc_server.cc > LICENSE
   '';
 
   buildPhase = ''
@@ -50,6 +57,9 @@ in clangStdenv.mkDerivation rec {
   '';
 
   installPhase = ''
+    install -d        $out/share/licenses/mozc/
+    install -m 644    LICENSE src/data/installer/*.html     $out/share/licenses/mozc/
+
     install -D -m 755 src/out_linux/Release/mozc_server $out/lib/mozc/mozc_server
     install    -m 755 src/out_linux/Release/mozc_tool   $out/lib/mozc/mozc_tool
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f6eac6123759..5d3162c6c302 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1178,7 +1178,9 @@ let
 
     anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { };
 
-    mozc = callPackage ../tools/inputmethods/ibus-engines/mozc {
+    hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { };
+
+    mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc {
       inherit (pythonPackages) gyp;
     };
 

From 7ec5dc923435e96122f3a4ac0decd099f440f68e Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Wed, 10 Feb 2016 15:57:05 +0900
Subject: [PATCH 1456/2285] ibus-wrapper: init

---
 pkgs/tools/inputmethods/ibus/wrapper.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  4 ++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/ibus/wrapper.nix

diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix
new file mode 100644
index 000000000000..270a2db7412c
--- /dev/null
+++ b/pkgs/tools/inputmethods/ibus/wrapper.nix
@@ -0,0 +1,24 @@
+{ stdenv, buildEnv, ibus, makeWrapper, plugins, hicolor_icon_theme }:
+
+let
+drv = buildEnv {
+  name = "ibus-with-plugins-" + (builtins.parseDrvName ibus.name).version;
+
+  paths = [ ibus hicolor_icon_theme ] ++ plugins;
+
+  postBuild = ''
+    # TODO: This could be avoided if buildEnv could be forced to create all directories
+    if [ -L $out/bin ]; then
+      rm $out/bin
+      mkdir $out/bin
+      for i in ${ibus}/bin/*; do
+        ln -s $i $out/bin
+      done
+    fi
+    wrapProgram $out/bin/ibus \
+      --set IBUS_COMPONENT_PATH "$out/share/ibus/component/"
+    wrapProgram $out/bin/ibus-daemon \
+      --set IBUS_COMPONENT_PATH "$out/share/ibus/component/"
+  '';
+  };
+in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5d3162c6c302..db3bc6abdc23 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1190,6 +1190,10 @@ let
 
   };
 
+  ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix {
+    plugins = [ ];
+  };
+
   brotli = callPackage ../tools/compression/brotli { };
 
   biosdevname = callPackage ../tools/networking/biosdevname { };

From 52dd53373f7fa134b0e697a0f102490f3f4ade87 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Wed, 10 Feb 2016 16:10:35 +0900
Subject: [PATCH 1457/2285] ibus service: refactoring

---
 nixos/modules/i18n/inputMethod/ibus.nix       | 52 +++++++++++++++++++
 nixos/modules/module-list.nix                 |  2 +-
 nixos/modules/programs/ibus.nix               | 51 ------------------
 nixos/modules/rename.nix                      |  4 ++
 .../ibus-engines/ibus-anthy/default.nix       | 11 ++--
 .../ibus-engines/ibus-hangul/default.nix      | 11 ++--
 .../ibus-engines/ibus-mozc/default.nix        | 11 ++--
 .../ibus-table-others/default.nix             | 11 ++--
 .../ibus-engines/ibus-table/default.nix       | 11 ++--
 9 files changed, 87 insertions(+), 77 deletions(-)
 create mode 100644 nixos/modules/i18n/inputMethod/ibus.nix
 delete mode 100644 nixos/modules/programs/ibus.nix

diff --git a/nixos/modules/i18n/inputMethod/ibus.nix b/nixos/modules/i18n/inputMethod/ibus.nix
new file mode 100644
index 000000000000..e4bc15cf8912
--- /dev/null
+++ b/nixos/modules/i18n/inputMethod/ibus.nix
@@ -0,0 +1,52 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.i18n.inputMethod.ibus;
+  ibusPackage = pkgs.ibus-with-plugins.override { plugins = cfg.engines; };
+  ibusEngine = types.package // {
+    name  = "ibus-engine";
+    check = x: (lib.types.package.check x) && (attrByPath ["meta" "isIbusEngine"] false x);
+  };
+in
+{
+  options = {
+    i18n.inputMethod.ibus = {
+      enable = mkOption {
+        type    = types.bool;
+        default = false;
+        example = true;
+        description = ''
+          Enable IBus input method.
+          IBus can be used input of Chinese, Korean, Japanese and other special characters.
+        '';
+      };
+      engines = mkOption {
+        type    = with types; listOf ibusEngine;
+        default = [];
+        example = literalExample "with pkgs.ibus-engines; [ mozc hangul ]";
+        description = ''
+          Enabled IBus engines.
+          Available engines can be found by running `nix-env "&lt;nixpkgs&gt;" . -qaP -A ibus-engines`.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    # Without dconf enabled it is impossible to use IBus
+    environment.systemPackages = [ ibusPackage pkgs.gnome3.dconf ];
+
+    gtkPlugins = [ pkgs.ibus ];
+    qtPlugins  = [ pkgs.ibus-qt ];
+
+    environment.variables = {
+      GTK_IM_MODULE = "ibus";
+      QT_IM_MODULE = "ibus";
+      XMODIFIERS = "@im=ibus";
+    };
+
+    services.xserver.displayManager.sessionCommands = "${ibusPackage}/bin/ibus-daemon --daemonize --xim --cache=none";
+  };
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 7375dcde5c5c..3df4e08e24bc 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -44,6 +44,7 @@
   ./hardware/video/ati.nix
   ./hardware/video/webcam/facetimehd.nix
   ./i18n/inputMethod/fcitx.nix
+  ./i18n/inputMethod/ibus.nix
   ./installer/tools/auto-upgrade.nix
   ./installer/tools/nixos-checkout.nix
   ./installer/tools/tools.nix
@@ -67,7 +68,6 @@
   ./programs/environment.nix
   ./programs/freetds.nix
   ./programs/fish.nix
-  ./programs/ibus.nix
   ./programs/kbdlight.nix
   ./programs/light.nix
   ./programs/man.nix
diff --git a/nixos/modules/programs/ibus.nix b/nixos/modules/programs/ibus.nix
deleted file mode 100644
index a42753a292b2..000000000000
--- a/nixos/modules/programs/ibus.nix
+++ /dev/null
@@ -1,51 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.programs.ibus;
-in
-{
-  options = {
-
-    programs.ibus = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        example = true;
-        description = "Enable IBus input method";
-      };
-      plugins = mkOption {
-        type = lib.types.listOf lib.types.path;
-        default = [];
-        description = ''
-          IBus plugin packages
-        '';
-      };
-    };
-
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.ibus pkgs.gnome3.dconf ];
-
-    gtkPlugins = [ pkgs.ibus ];
-    qtPlugins = [ pkgs.ibus-qt ];
-
-    environment.variables =
-      let
-        env = pkgs.buildEnv {
-          name = "ibus-env";
-          paths = [ pkgs.ibus ] ++ cfg.plugins;
-        };
-      in {
-        GTK_IM_MODULE = "ibus";
-        QT_IM_MODULE = "ibus";
-        XMODIFIERS = "@im=ibus";
-
-        IBUS_COMPONENT_PATH = "${env}/share/ibus/component";
-      };
-
-    services.xserver.displayManager.sessionCommands = "${pkgs.ibus}/bin/ibus-daemon --daemonize --xim --cache=none";
-  };
-}
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 6e10b47f03cc..698c28f37c8e 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -59,6 +59,10 @@ with lib;
     # Tarsnap
     (mkRenamedOptionModule [ "services" "tarsnap" "config" ] [ "services" "tarsnap" "archives" ])
 
+    # ibus
+    (mkRenamedOptionModule [ "programs" "ibus" "enable" ]  [ "i18n" "inputMethod" "ibus" "enable" ])
+    (mkRenamedOptionModule [ "programs" "ibus" "plugins" ] [ "i18n" "inputMethod" "ibus" "engines" ])
+
     # proxy
     (mkRenamedOptionModule [ "nix" "proxy" ] [ "networking" "proxy" "default" ])
 
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
index 4bdee391880b..89039745fd99 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
@@ -6,11 +6,12 @@ stdenv.mkDerivation rec {
   version = "1.5.8";
 
   meta = with stdenv.lib; {
-    description = "IBus interface to the anthy input method";
-    homepage    = http://wiki.github.com/fujiwarat/ibus-anthy;
-    license     = licenses.gpl2Plus;
-    platforms   = platforms.linux;
-    maintainers = with maintainers; [ gebner ericsagnes ];
+    isIbusEngine = true;
+    description  = "IBus interface to the anthy input method";
+    homepage     = http://wiki.github.com/fujiwarat/ibus-anthy;
+    license      = licenses.gpl2Plus;
+    platforms    = platforms.linux;
+    maintainers  = with maintainers; [ gebner ericsagnes ];
   };
 
   preConfigure = "./autogen.sh --prefix=$out";
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
index 5a6af4608c0f..b682196d5d08 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
@@ -29,10 +29,11 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Ibus Hangul engine.";
-    homepage    = https://github.com/choehwanjin/ibus-hangul;
-    license     = licenses.gpl2;
-    platforms   = platforms.linux;
-    maintainers = with maintainers; [ ericsagnes ];
+    isIbusEngine = true;
+    description  = "Ibus Hangul engine.";
+    homepage     = https://github.com/choehwanjin/ibus-hangul;
+    license      = licenses.gpl2;
+    platforms    = platforms.linux;
+    maintainers  = with maintainers; [ ericsagnes ];
   };
 }
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
index 9ab640990b16..e06d2b004ee9 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-mozc/default.nix
@@ -11,11 +11,12 @@ in clangStdenv.mkDerivation rec {
   version = "2.17.2313.102";
 
   meta = with clangStdenv.lib; {
-    description = "Japanese input method from Google";
-    homepage = http://code.google.com/p/mozc/;
-    license = licenses.free;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ gebner ericsagnes ];
+    isIbusEngine = true;
+    description  = "Japanese input method from Google";
+    homepage     = http://code.google.com/p/mozc/;
+    license      = licenses.free;
+    platforms    = platforms.linux;
+    maintainers  = with maintainers; [ gebner ericsagnes ];
   };
 
   nativeBuildInputs = [ gyp which ninja python pkgconfig ];
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
index f356bcdee85d..13d9df5de081 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
@@ -20,10 +20,11 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Various table-based input methods for IBus";
-    homepage    = https://github.com/moebiuscurve/ibus-table-others;
-    license     = licenses.gpl3;
-    platforms   = platforms.linux;
-    maintainers = with maintainers; [ mudri ];
+    isIbusEngine = true;
+    description  = "Various table-based input methods for IBus";
+    homepage     = https://github.com/moebiuscurve/ibus-table-others;
+    license      = licenses.gpl3;
+    platforms    = platforms.linux;
+    maintainers  = with maintainers; [ mudri ];
   };
 }
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index 58b890b0c929..244169cf46b6 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -12,10 +12,11 @@ stdenv.mkDerivation rec {
   buildInputs = [ ibus pkgconfig python3 pythonPackages.pygobject3 ];
 
   meta = with stdenv.lib; {
-    description = "An IBus framework for table-based input methods";
-    homepage    = https://github.com/kaio/ibus-table/wiki;
-    license     = licenses.lgpl21;
-    platforms   = platforms.linux;
-    maintainers = with maintainers; [ mudri ];
+    isIbusEngine = true;
+    description  = "An IBus framework for table-based input methods";
+    homepage     = https://github.com/kaio/ibus-table/wiki;
+    license      = licenses.lgpl21;
+    platforms    = platforms.linux;
+    maintainers  = with maintainers; [ mudri ];
   };
 }

From 2dac18aa01303be95dcf56cf4e0fa01ff30af05f Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Tue, 16 Feb 2016 22:46:17 +0900
Subject: [PATCH 1458/2285] uim: removed gtk and qt plugin update logic

---
 pkgs/tools/inputmethods/uim/data-hook.patch   |  39 +++
 pkgs/tools/inputmethods/uim/default.nix       |  11 +-
 .../inputmethods/uim/immodules_cache.patch    | 231 ------------------
 3 files changed, 45 insertions(+), 236 deletions(-)
 create mode 100644 pkgs/tools/inputmethods/uim/data-hook.patch
 delete mode 100644 pkgs/tools/inputmethods/uim/immodules_cache.patch

diff --git a/pkgs/tools/inputmethods/uim/data-hook.patch b/pkgs/tools/inputmethods/uim/data-hook.patch
new file mode 100644
index 000000000000..07fdf8733169
--- /dev/null
+++ b/pkgs/tools/inputmethods/uim/data-hook.patch
@@ -0,0 +1,39 @@
+--- a/gtk2/immodule/Makefile.in	2015-11-24 16:21:08.967087208 +0900
++++ b/gtk2/immodule/Makefile.in	2015-11-24 16:22:53.316095150 +0900
+@@ -806,7 +806,6 @@
+ 
+ install-data-am: install-moduleLTLIBRARIES
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-dvi: install-dvi-am
+ 
+ install-dvi-am:
+@@ -861,7 +860,7 @@
+ 	ctags distclean distclean-compile distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-data-hook install-dvi install-dvi-am \
++	install-data-am install-dvi install-dvi-am \
+ 	install-exec install-exec-am install-html install-html-am \
+ 	install-info install-info-am install-man \
+ 	install-moduleLTLIBRARIES install-pdf install-pdf-am \
+
+--- a/gtk3/immodule/Makefile.in	2015-11-24 16:21:08.971087209 +0900
++++ b/gtk3/immodule/Makefile.in	2015-11-24 16:23:28.251097832 +0900
+@@ -824,7 +824,6 @@
+ 
+ install-data-am: install-moduleLTLIBRARIES
+ 	@$(NORMAL_INSTALL)
+-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+ install-dvi: install-dvi-am
+ 
+ install-dvi-am:
+@@ -879,7 +878,7 @@
+ 	ctags distclean distclean-compile distclean-generic \
+ 	distclean-libtool distclean-tags distdir dvi dvi-am html \
+ 	html-am info info-am install install-am install-data \
+-	install-data-am install-data-hook install-dvi install-dvi-am \
++	install-data-am install-dvi install-dvi-am \
+ 	install-exec install-exec-am install-html install-html-am \
+ 	install-info install-info-am install-man \
+ 	install-moduleLTLIBRARIES install-pdf install-pdf-am 
diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix
index 19de302e7b1f..99a415407c17 100644
--- a/pkgs/tools/inputmethods/uim/default.nix
+++ b/pkgs/tools/inputmethods/uim/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     m17n_db
   ];
 
-  patches = [ ./immodules_cache.patch ];
+  patches = [ ./data-hook.patch ];
 
   configureFlags = [
     "--with-gtk2"
@@ -41,10 +41,11 @@ stdenv.mkDerivation rec {
     sha1 = "43b9dbdead6797880e6cfc9c032ecb2d37d42777";
   };
 
-  meta = {
-    homepage = "http://code.google.com/p/uim/";
+  meta = with stdenv.lib; {
+    homepage    = "http://code.google.com/p/uim/";
     description = "A multilingual input method framework";
-    license = stdenv.lib.licenses.bsd3;
-    platforms = stdenv.lib.platforms.linux;
+    license     = stdenv.lib.licenses.bsd3;
+    platforms   = stdenv.lib.platforms.linux;
+    maintainers = with maintainers; [ ericsagnes ];
   };
 }
diff --git a/pkgs/tools/inputmethods/uim/immodules_cache.patch b/pkgs/tools/inputmethods/uim/immodules_cache.patch
deleted file mode 100644
index c2d08b661e38..000000000000
--- a/pkgs/tools/inputmethods/uim/immodules_cache.patch
+++ /dev/null
@@ -1,231 +0,0 @@
-diff -ru -x '*~' uim-1.8.6.orig/gtk2/immodule/Makefile.am uim-1.8.6/gtk2/immodule/Makefile.am
---- uim-1.8.6.orig/gtk2/immodule/Makefile.am	2013-06-30 13:26:09.000000000 +0900
-+++ uim-1.8.6/gtk2/immodule/Makefile.am	2014-07-13 21:51:26.538400004 +0900
-@@ -1,5 +1,5 @@
- uim_gtk_im_module_path = $(libdir)/gtk-2.0
--uim_gtk_im_module_file = $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
-+uim_gtk_im_module_file = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules.cache
- 
- moduledir = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules
- 
-@@ -38,48 +38,12 @@
- 
- install-data-hook: gtk-rc-get-immodule-file
- 	if test -z $(DESTDIR); then \
--	  if test $(libdir) = $(GTK_LIBDIR); then \
--	    if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
--	      $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \
--	      echo "*** \"`$(GTK_RC_GET_IMMODULE_FILE)`\" is updated. ***";  \
--	    else \
--	      echo "********************** Warning ***********************"; \
--	      echo " $(QUERY_COMMAND) not found"; \
--	      echo " Please make sure to update"; \
--	      echo " \"`$(GTK_RC_GET_IMMODULE_FILE)`\""; \
--	      echo " manually."; \
--	      echo "******************************************************"; \
--	    fi \
--	  else \
--	    if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
--	      $(mkinstalldirs) $(sysconfdir)/gtk-2.0; \
--	      GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \
--	      echo "******************************************************"; \
--	      echo " You need to set"; \
--	      echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \
--	      echo " environment variable to use this module."; \
--	      echo "******************************************************"; \
--	    else \
--	      echo "********************** Warning ***********************"; \
--	      echo " $(QUERY_COMMAND) not found"; \
--	      echo " Please make sure to update"; \
--	      echo " \"$(uim_gtk_im_module_file)\""; \
--	      echo " manually, and set"; \
--	      echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \
--	      echo " environment variable to use this module."; \
--	      echo "******************************************************"; \
--	    fi \
--	  fi \
-+	  $(mkinstalldirs) $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@; \
-+	  GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \
- 	fi
- uninstall-hook:
- 	if test -z $(DESTDIR); then \
--	  if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
--	    if test $(libdir) = $(GTK_LIBDIR); then \
--	      $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \
--	    else \
--	      GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \
--	    fi \
--	  fi \
-+	  GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \
- 	fi
- else
- install-data-hook:
-diff -ru -x '*~' uim-1.8.6.orig/gtk2/immodule/Makefile.in uim-1.8.6/gtk2/immodule/Makefile.in
---- uim-1.8.6.orig/gtk2/immodule/Makefile.in	2013-06-30 13:27:08.000000000 +0900
-+++ uim-1.8.6/gtk2/immodule/Makefile.in	2014-07-13 22:12:27.947595507 +0900
-@@ -434,7 +434,7 @@
- top_srcdir = @top_srcdir@
- uim_pixmapsdir = @uim_pixmapsdir@
- uim_gtk_im_module_path = $(libdir)/gtk-2.0
--uim_gtk_im_module_file = $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules
-+uim_gtk_im_module_file = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules.cache
- moduledir = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules
- @GTK2_TRUE@im_uim_la = im-uim.la
- @GTK2_TRUE@im_uim_la_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir)
-@@ -875,48 +875,12 @@
- 
- @GTK2_TRUE@install-data-hook: gtk-rc-get-immodule-file
- @GTK2_TRUE@	if test -z $(DESTDIR); then \
--@GTK2_TRUE@	  if test $(libdir) = $(GTK_LIBDIR); then \
--@GTK2_TRUE@	    if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
--@GTK2_TRUE@	      $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \
--@GTK2_TRUE@	      echo "*** \"`$(GTK_RC_GET_IMMODULE_FILE)`\" is updated. ***";  \
--@GTK2_TRUE@	    else \
--@GTK2_TRUE@	      echo "********************** Warning ***********************"; \
--@GTK2_TRUE@	      echo " $(QUERY_COMMAND) not found"; \
--@GTK2_TRUE@	      echo " Please make sure to update"; \
--@GTK2_TRUE@	      echo " \"`$(GTK_RC_GET_IMMODULE_FILE)`\""; \
--@GTK2_TRUE@	      echo " manually."; \
--@GTK2_TRUE@	      echo "******************************************************"; \
--@GTK2_TRUE@	    fi \
--@GTK2_TRUE@	  else \
--@GTK2_TRUE@	    if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
--@GTK2_TRUE@	      $(mkinstalldirs) $(sysconfdir)/gtk-2.0; \
--@GTK2_TRUE@	      GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \
--@GTK2_TRUE@	      echo "******************************************************"; \
--@GTK2_TRUE@	      echo " You need to set"; \
--@GTK2_TRUE@	      echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \
--@GTK2_TRUE@	      echo " environment variable to use this module."; \
--@GTK2_TRUE@	      echo "******************************************************"; \
--@GTK2_TRUE@	    else \
--@GTK2_TRUE@	      echo "********************** Warning ***********************"; \
--@GTK2_TRUE@	      echo " $(QUERY_COMMAND) not found"; \
--@GTK2_TRUE@	      echo " Please make sure to update"; \
--@GTK2_TRUE@	      echo " \"$(uim_gtk_im_module_file)\""; \
--@GTK2_TRUE@	      echo " manually, and set"; \
--@GTK2_TRUE@	      echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \
--@GTK2_TRUE@	      echo " environment variable to use this module."; \
--@GTK2_TRUE@	      echo "******************************************************"; \
--@GTK2_TRUE@	    fi \
--@GTK2_TRUE@	  fi \
-+@GTK2_TRUE@	  $(mkinstalldirs) $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@; \
-+@GTK2_TRUE@	  GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \
- @GTK2_TRUE@	fi
- @GTK2_TRUE@uninstall-hook:
- @GTK2_TRUE@	if test -z $(DESTDIR); then \
--@GTK2_TRUE@	  if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
--@GTK2_TRUE@	    if test $(libdir) = $(GTK_LIBDIR); then \
--@GTK2_TRUE@	      $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \
--@GTK2_TRUE@	    else \
--@GTK2_TRUE@	      GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \
--@GTK2_TRUE@	    fi \
--@GTK2_TRUE@	  fi \
-+@GTK2_TRUE@	  GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \
- @GTK2_TRUE@	fi
- @GTK2_FALSE@install-data-hook:
- 
-diff -ru -x '*~' uim-1.8.6.orig/gtk3/immodule/Makefile.am uim-1.8.6/gtk3/immodule/Makefile.am
---- uim-1.8.6.orig/gtk3/immodule/Makefile.am	2013-06-30 13:26:20.000000000 +0900
-+++ uim-1.8.6/gtk3/immodule/Makefile.am	2014-07-13 21:55:38.114246503 +0900
-@@ -45,42 +45,11 @@
- 
- install-data-hook: gtk3-rc-get-immodule-file
- 	if test -z $(DESTDIR); then \
--	  if test $(libdir) = $(GTK3_LIBDIR); then \
--	    if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
--	      $(QUERY_COMMAND) --update-cache; \
--	      echo "*** \"`$(GTK3_RC_GET_IMMODULE_FILE)`\" is updated. ***";  \
--	    else \
--	      echo "********************** Warning ***********************"; \
--	      echo " $(QUERY_COMMAND) not found"; \
--	      echo " Please make sure to update"; \
--	      echo " \"`$(GTK3_RC_GET_IMMODULE_FILE)`\""; \
--	      echo " manually."; \
--	      echo "******************************************************"; \
--	    fi \
--	  else \
--	    if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
--	      GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \
--	    else \
--	      echo "********************** Warning ***********************"; \
--	      echo " $(QUERY_COMMAND) not found"; \
--	      echo " Please make sure to update"; \
--	      echo " immodules.cache"; \
--	      echo " manually, and set"; \
--	      echo " GTK_IM_MODULE_FILE=PATH_TO/immodule.cache"; \
--	      echo " environment variable to use this module."; \
--	      echo "******************************************************"; \
--	    fi \
--	  fi \
-+	  GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \
- 	fi
- uninstall-hook:
- 	if test -z $(DESTDIR); then \
--	  if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
--	    if test $(libdir) = $(GTK3_LIBDIR); then \
--	      $(QUERY_COMMAND) --update-cache; \
--	    else \
--	      GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \
--	    fi \
--	  fi \
-+	  GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \
- 	fi
- else
- install-data-hook:
-diff -ru -x '*~' uim-1.8.6.orig/gtk3/immodule/Makefile.in uim-1.8.6/gtk3/immodule/Makefile.in
---- uim-1.8.6.orig/gtk3/immodule/Makefile.in	2013-06-30 13:27:08.000000000 +0900
-+++ uim-1.8.6/gtk3/immodule/Makefile.in	2014-07-13 21:56:11.531225832 +0900
-@@ -893,42 +893,11 @@
- 
- @GTK3_TRUE@install-data-hook: gtk3-rc-get-immodule-file
- @GTK3_TRUE@	if test -z $(DESTDIR); then \
--@GTK3_TRUE@	  if test $(libdir) = $(GTK3_LIBDIR); then \
--@GTK3_TRUE@	    if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
--@GTK3_TRUE@	      $(QUERY_COMMAND) --update-cache; \
--@GTK3_TRUE@	      echo "*** \"`$(GTK3_RC_GET_IMMODULE_FILE)`\" is updated. ***";  \
--@GTK3_TRUE@	    else \
--@GTK3_TRUE@	      echo "********************** Warning ***********************"; \
--@GTK3_TRUE@	      echo " $(QUERY_COMMAND) not found"; \
--@GTK3_TRUE@	      echo " Please make sure to update"; \
--@GTK3_TRUE@	      echo " \"`$(GTK3_RC_GET_IMMODULE_FILE)`\""; \
--@GTK3_TRUE@	      echo " manually."; \
--@GTK3_TRUE@	      echo "******************************************************"; \
--@GTK3_TRUE@	    fi \
--@GTK3_TRUE@	  else \
--@GTK3_TRUE@	    if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
--@GTK3_TRUE@	      GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \
--@GTK3_TRUE@	    else \
--@GTK3_TRUE@	      echo "********************** Warning ***********************"; \
--@GTK3_TRUE@	      echo " $(QUERY_COMMAND) not found"; \
--@GTK3_TRUE@	      echo " Please make sure to update"; \
--@GTK3_TRUE@	      echo " immodules.cache"; \
--@GTK3_TRUE@	      echo " manually, and set"; \
--@GTK3_TRUE@	      echo " GTK_IM_MODULE_FILE=PATH_TO/immodule.cache"; \
--@GTK3_TRUE@	      echo " environment variable to use this module."; \
--@GTK3_TRUE@	      echo "******************************************************"; \
--@GTK3_TRUE@	    fi \
--@GTK3_TRUE@	  fi \
-+@GTK3_TRUE@	  GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \
- @GTK3_TRUE@	fi
- @GTK3_TRUE@uninstall-hook:
- @GTK3_TRUE@	if test -z $(DESTDIR); then \
--@GTK3_TRUE@	  if type $(QUERY_COMMAND) > /dev/null 2>&1; then \
--@GTK3_TRUE@	    if test $(libdir) = $(GTK3_LIBDIR); then \
--@GTK3_TRUE@	      $(QUERY_COMMAND) --update-cache; \
--@GTK3_TRUE@	    else \
--@GTK3_TRUE@	      GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \
--@GTK3_TRUE@	    fi \
--@GTK3_TRUE@	  fi \
-+@GTK3_TRUE@	  GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \
- @GTK3_TRUE@	fi
- @GTK3_FALSE@install-data-hook:
- 
-diff -ru -x '*~' uim-1.8.6.orig/qt4/immodule/quiminputcontextplugin.pro.in uim-1.8.6/qt4/immodule/quiminputcontextplugin.pro.in
---- uim-1.8.6.orig/qt4/immodule/quiminputcontextplugin.pro.in	2013-06-30 13:26:20.000000000 +0900
-+++ uim-1.8.6/qt4/immodule/quiminputcontextplugin.pro.in	2014-03-09 11:31:19.388085048 +0900
-@@ -35,4 +35,4 @@
- 
- TARGET = uiminputcontextplugin
- 
--target.path += @DESTDIR@$$[QT_INSTALL_PLUGINS]/inputmethods
-+target.path += @DESTDIR@@exec_prefix@/lib/qt4/plugins/inputmethods

From 4a199d99552046e2ffd743d501d4ee4696038b42 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Tue, 16 Feb 2016 22:52:25 +0900
Subject: [PATCH 1459/2285] uim service: init

---
 nixos/modules/i18n/inputMethod/uim.nix | 48 ++++++++++++++++++++++++++
 nixos/modules/module-list.nix          |  1 +
 2 files changed, 49 insertions(+)
 create mode 100644 nixos/modules/i18n/inputMethod/uim.nix

diff --git a/nixos/modules/i18n/inputMethod/uim.nix b/nixos/modules/i18n/inputMethod/uim.nix
new file mode 100644
index 000000000000..0154cdc5057a
--- /dev/null
+++ b/nixos/modules/i18n/inputMethod/uim.nix
@@ -0,0 +1,48 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let 
+  cfg = config.i18n.inputMethod.uim;
+in
+{
+  options = {
+
+    i18n.inputMethod.uim = {
+      enable = mkOption {
+        type    = types.bool;
+        default = false;
+        example = true;
+        description = ''
+          Enable uim input method.
+          Uim can be used to input of Chinese, Korean, Japanese and other special characters.
+        '';
+      };
+      toolbar = mkOption {
+        type    = types.enum [ "gtk" "gtk3" "gtk-systray" "gtk3-systray" "qt4" ];
+        default = "gtk";
+        example = "gtk-systray";
+        description = ''
+          selected UIM toolbar.
+        '';
+      };
+    };
+
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.uim ];
+    gtkPlugins = [ pkgs.uim ];
+    qtPlugins  = [ pkgs.uim ];
+
+    environment.variables = {
+      GTK_IM_MODULE = "uim";
+      QT_IM_MODULE  = "uim";
+      XMODIFIERS    = "@im=uim";
+    };
+    services.xserver.displayManager.sessionCommands = ''
+      ${pkgs.uim}/bin/uim-xim &
+      ${pkgs.uim}/bin/uim-toolbar-${cfg.toolbar} &
+    '';
+  };
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 3df4e08e24bc..9a7083c3ce8f 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -45,6 +45,7 @@
   ./hardware/video/webcam/facetimehd.nix
   ./i18n/inputMethod/fcitx.nix
   ./i18n/inputMethod/ibus.nix
+  ./i18n/inputMethod/uim.nix
   ./installer/tools/auto-upgrade.nix
   ./installer/tools/nixos-checkout.nix
   ./installer/tools/tools.nix

From 3ed3f061dad30f9ae8b7712b0b46140b415d4ab3 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Tue, 16 Feb 2016 23:01:03 +0900
Subject: [PATCH 1460/2285] nabi service: init

---
 nixos/modules/i18n/inputMethod/nabi.nix | 37 +++++++++++++++++++++++++
 nixos/modules/module-list.nix           |  1 +
 2 files changed, 38 insertions(+)
 create mode 100644 nixos/modules/i18n/inputMethod/nabi.nix

diff --git a/nixos/modules/i18n/inputMethod/nabi.nix b/nixos/modules/i18n/inputMethod/nabi.nix
new file mode 100644
index 000000000000..7f97135fee1e
--- /dev/null
+++ b/nixos/modules/i18n/inputMethod/nabi.nix
@@ -0,0 +1,37 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let 
+  cfg = config.i18n.inputMethod.nabi;
+in
+{
+  options = {
+
+    i18n.inputMethod.nabi = {
+      enable = mkOption {
+        type    = types.bool;
+        default = false;
+        example = true;
+        description = ''
+          Enable nabi input method.
+          Nabi can be used to input Korean.
+        '';
+      };
+    };
+
+  };
+{
+  config = mkIf cfg.enable {
+    environment.systemPackages = [ pkgs.nabi ];
+    qtPlugins  = [ pkgs.nabi ];
+
+    environment.variables = {
+      GTK_IM_MODULE = "nabi";
+      QT_IM_MODULE  = "nabi";
+      XMODIFIERS    = "@im=nabi";
+    };
+
+    services.xserver.displayManager.sessionCommands = "${pkgs.nabi}/bin/nabi &";
+  };
+}
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 9a7083c3ce8f..7fe4a90a1354 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -45,6 +45,7 @@
   ./hardware/video/webcam/facetimehd.nix
   ./i18n/inputMethod/fcitx.nix
   ./i18n/inputMethod/ibus.nix
+  ./i18n/inputMethod/nabi.nix
   ./i18n/inputMethod/uim.nix
   ./installer/tools/auto-upgrade.nix
   ./installer/tools/nixos-checkout.nix

From 1ecb2a8782aa12fdd2745256127331be135733d7 Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 17 Feb 2016 11:57:04 +0000
Subject: [PATCH 1461/2285] Fix xclip hash, make revision explicit, in stead of
 depending on HEAD.

(cherry picked from commit c9ef3b51a3e910f3850ab10378c8b58f0d2d97e8)
---
 pkgs/tools/misc/xclip/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/misc/xclip/default.nix b/pkgs/tools/misc/xclip/default.nix
index e0ad4bbab5fd..197b92295a82 100644
--- a/pkgs/tools/misc/xclip/default.nix
+++ b/pkgs/tools/misc/xclip/default.nix
@@ -6,7 +6,8 @@ stdenv.mkDerivation rec {
 
   src = fetchsvn {
     url = "svn://svn.code.sf.net/p/xclip/code/trunk";
-    sha256 = "0d6r38xas5l79l700sdm14l41vvjqhah613367ha8kcvx54zkddz";
+    rev = "87";
+    sha256 = "1rbcdgr73916wvzfgqjs1jhgzk8qs1yw2iiqy7ifrkjafhi37w6b";
   };
 
   buildInputs = [ xlibsWrapper libXmu autoreconfHook ];

From b2f2d2fef32ea89e8e4dc0a21243e84a6ced43aa Mon Sep 17 00:00:00 2001
From: Rob Vermaas <rob.vermaas@gmail.com>
Date: Wed, 17 Feb 2016 12:02:52 +0000
Subject: [PATCH 1462/2285] Fix azure image, by adding subformat=fixed to disk
 generation.

---
 nixos/modules/virtualisation/azure-image.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index 08944e641d76..7093e50ed352 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -23,7 +23,7 @@ in
           postVM =
             ''
               mkdir -p $out
-              ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -O vpc $diskImage $out/disk.vhd
+              ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -O vpc -o subformat=fixed $diskImage $out/disk.vhd
               rm $diskImage
             '';
           diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw";

From 3f3aa755a36ce11d71ada70040a6b1c3f934fe36 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Wed, 17 Feb 2016 13:33:18 +0100
Subject: [PATCH 1463/2285] pythonPackages.keyring: 3.3 -> 8.4.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 42eac4716b2b..baa4c4105072 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10431,15 +10431,19 @@ in modules // {
 
 
   keyring = buildPythonPackage rec {
-    name = "keyring-3.3";
+    name = "keyring-8.4.1";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/k/keyring/${name}.zip";
-      md5 = "81291e0c7337affb71442e6c7671e77f";
+      url = "https://pypi.python.org/packages/source/k/keyring/${name}.tar.gz";
+      sha256 = "1286sh5g53168qxbl4g5bmns9ci0ld0jl3h44b7h8is5nw1421ar";
     };
 
     buildInputs = with self;
-      [ fs gdata python_keyczar mock pyasn1 pycrypto pytest six ];
+      [ fs gdata python_keyczar mock pyasn1 pycrypto pytest_28 six setuptools_scm pytestrunner ];
+
+    checkPhase = ''
+      py.test $out
+    '';
 
     meta = {
       description = "Store and access your passwords safely";

From 04187337378414d84d716435cc87cdfc0f4f531a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 17 Feb 2016 15:53:15 +0300
Subject: [PATCH 1464/2285] vcg: init at 2016-02-14

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

diff --git a/pkgs/development/libraries/vcg/default.nix b/pkgs/development/libraries/vcg/default.nix
new file mode 100644
index 000000000000..59fadbbbc1f8
--- /dev/null
+++ b/pkgs/development/libraries/vcg/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchsvn, eigen }:
+
+stdenv.mkDerivation rec {
+  name = "vcg-2016-02-14";
+
+  src = fetchsvn {
+    url = "svn://svn.code.sf.net/p/vcg/code/trunk/vcglib";
+    rev = 5688;
+    sha256 = "0hkvz2d8prrjdcc7h0xhfd9hq86lmqg17ml045x4bkiciimx0w5s";
+  };
+
+  propagatedBuildInputs = [ eigen ];
+
+  installPhase = ''
+    mkdir -p $out/include
+    cp -r vcg wrap $out/include
+    find $out -name \*.h -exec sed -i 's,<eigenlib/,<eigen3/,g' {} \;
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://vcg.isti.cnr.it/vcglib/install.html;
+    description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0a411a7ff0ea..857de5d56eba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8803,6 +8803,8 @@ let
 
   vcdimager = callPackage ../development/libraries/vcdimager { };
 
+  vcg = callPackage ../development/libraries/vcg { };
+
   vid-stab = callPackage ../development/libraries/vid-stab { };
 
   vigra = callPackage ../development/libraries/vigra {

From 18c3420579b641bfbf8e69651c7268f7866327a5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 17 Feb 2016 15:53:32 +0300
Subject: [PATCH 1465/2285] openbrf: init at 2016-01-09

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

diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix
new file mode 100644
index 000000000000..478f02b970e5
--- /dev/null
+++ b/pkgs/applications/misc/openbrf/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchFromGitHub, qt4, vcg, glew }:
+
+stdenv.mkDerivation {
+  name = "openbrf-2016-01-09";
+
+  src = fetchFromGitHub {
+    owner = "cfcohen";
+    repo = "openbrf";
+    rev = "c18d7431e1d499cee11586f4a035fb5fdc0d3330";
+    sha256 = "0laikpz0ljz7l5fgapwj09ygizmvj1iywnpfgfd0i14j46s134xb";
+  };
+
+  buildInputs = [ qt4 vcg glew ];
+
+  enableParallelBuilding = true;
+
+  postPatch = ''
+    sed -i 's,^VCGLIB .*,VCGLIB = ${vcg}/include,' openBrf.pro
+  '';
+
+  configurePhase = ''
+    qmake PREFIX=$out openBrf.pro
+  '';
+
+  installPhase = ''
+    install -Dm755 openBrf $out/bin/openBrf
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A tool to edit resource files (BRF)";
+    homepage = https://github.com/cfcohen/openbrf;
+    maintainers = with stdenv.lib.maintainers; [ abbradar ];
+    license = licenses.free;
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 857de5d56eba..605d39b6ac9f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12997,6 +12997,8 @@ let
 
   openbox-menu = callPackage ../applications/misc/openbox-menu { };
 
+  openbrf = callPackage ../applications/misc/openbrf { };
+
   openimageio = callPackage ../applications/graphics/openimageio { };
 
   openjump = callPackage ../applications/misc/openjump { };

From aeee93faf3c3f0f87f45f8ef6996b1f2ff51245f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 14 Feb 2016 14:56:44 +0300
Subject: [PATCH 1466/2285] m3d-linux: init at 2016-01-20

---
 pkgs/misc/drivers/m3d-linux/default.nix | 25 +++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix         |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/misc/drivers/m3d-linux/default.nix

diff --git a/pkgs/misc/drivers/m3d-linux/default.nix b/pkgs/misc/drivers/m3d-linux/default.nix
new file mode 100644
index 000000000000..0e970e30d589
--- /dev/null
+++ b/pkgs/misc/drivers/m3d-linux/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation {
+  name = "M3D-Linux-2016-01-20";
+
+  src = fetchFromGitHub {
+    owner = "donovan6000";
+    repo = "M3D-Linux";
+    rev = "d0bbb0379c52a88af55740a937edc92af162cdf6";
+    sha256 = "0fwzb9mf04bw5wxabh3js7nir60kfq8iz7kcigw6c233aadwg03i";
+  };
+
+  installPhase = ''
+    install -Dm755 m3d-linux $out/bin/m3d-linux
+    install -Dm755 90-m3d-local.rules $out/lib/udev/rules.d/90-m3d-local.rules
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/donovan6000/M3D-Linux;
+    description = "A Linux program that can communicate with the Micro 3D printer";
+    license = licenses.gpl2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 605d39b6ac9f..8f1a20fb5fdc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15711,6 +15711,8 @@ let
 
   lkproof = callPackage ../tools/typesetting/tex/lkproof { };
 
+  m3d-linux = callPackage ../misc/drivers/m3d-linux { };
+
   mysqlWorkbench = newScope gnome ../applications/misc/mysql-workbench {
     lua = lua5_1;
     libctemplate = libctemplate_2_2;

From 7c02fc1b5e2756d37227fb46e6bc74993e69c021 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 14 Feb 2016 14:43:14 +0300
Subject: [PATCH 1467/2285] pythonPackages.awesome-slugify: init at 1.6.5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 12a74cf94417..6473f4638046 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1128,6 +1128,26 @@ in modules // {
     };
   }));
 
+  awesome-slugify = buildPythonPackage rec {
+    name = "awesome-slugify-${version}";
+    version = "1.6.5";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/a/awesome-slugify/${name}.tar.gz";
+      sha256 = "0wgxrhr8s5vk2xmcz9s1z1aml4ppawmhkbggl9rp94c747xc7pmv";
+    };
+
+    propagatedBuildInputs = with self; [ unidecode regex ];
+
+    meta = with stdenv.lib; {
+      homepage = https://github.com/dimka665/awesome-slugify;
+      description = "Python flexible slugify function";
+      license = licenses.gpl3;
+      platforms = platforms.all;
+      maintainers = with maintainers; [ abbradar ];
+    };
+  };
+
   awscli = buildPythonPackage rec {
     name = "awscli-${version}";
     version = "1.10.1";

From a0c9acb0077e8379bed95cd1c6a45d55bcd2d1c4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 14 Feb 2016 14:43:55 +0300
Subject: [PATCH 1468/2285] pythonPackages.sarge: init at 0.1.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6473f4638046..35ab388b9fa3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7125,6 +7125,24 @@ in modules // {
     doCheck = false;
   };
 
+  sarge = buildPythonPackage rec {
+    name = "sarge-${version}";
+    version = "0.1.4";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/s/sarge/${name}.tar.gz";
+      sha256 = "08s8896973bz1gg0pkr592w6g4p6v47bkfvws5i91p9xf8b35yar";
+    };
+
+    meta = {
+      homepage = http://sarge.readthedocs.org/;
+      description = "A wrapper for subprocess which provides command pipeline functionality";
+      license = licenses.bsd3;
+      platform = platforms.all;
+      maintainers = with maintainers; [ abbradar ];
+    };
+  };
+
   hyp = buildPythonPackage rec {
     name = "hyp-server-${version}";
     version = "1.2.0";

From b96b7c9628b73738bf2974c113d713d806711419 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 14 Feb 2016 14:46:35 +0300
Subject: [PATCH 1469/2285] pythonPackages.regex: init at 2016.01.10

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 35ab388b9fa3..e1eef9a977de 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7440,6 +7440,23 @@ in modules // {
     };
   };
 
+  regex = buildPythonPackage rec {
+    name = "regex-${version}";
+    version = "2016.01.10";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/r/regex/${name}.tar.gz";
+      sha256 = "1q3rbmnijjzn7y3cm3qy49b5lqw1fq38zv974xma387lwc37d9q2";
+    };
+
+    meta = {
+      description = "Alternative regular expression module, to replace re";
+      homepage = https://bitbucket.org/mrabarnett/mrab-regex;
+      license = licenses.psfl;
+      platforms = platforms.linux;
+      maintainers = with maintainers; [ abbradar ];
+    };
+  };
 
   repoze_lru = buildPythonPackage rec {
     name = "repoze.lru-0.6";

From ef9e10f62a13640a90d9cec9f49e60a508916698 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 14 Feb 2016 14:47:10 +0300
Subject: [PATCH 1470/2285] pythonPackages.flask_assets: init at 0.10

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e1eef9a977de..2724ca1073d1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8653,6 +8653,26 @@ in modules // {
     };
   };
 
+  flask_assets = buildPythonPackage rec {
+    name = "Flask-Assets-${version}";
+    version = "0.10";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/F/Flask-Assets/${name}.tar.gz";
+      sha256 = "1v6ika3ias21xzhg7kglki99nwfx1i33rdhnw9kdqbwxkpwbwkyl";
+    };
+
+    propagatedBuildInputs = with self; [ flask webassets flask_script nose ];
+
+    meta = {
+      homepage = http://github.com/miracle2k/flask-assets;
+      description = "Asset management for Flask, to compress and merge CSS and Javascript files";
+      license = licenses.bsd2;
+      platforms = platforms.all;
+      maintainers = with maintainers; [ abbradar ];
+    };
+  };
+
   flask_cache = buildPythonPackage rec {
     name = "Flask-Cache-0.13.1";
 

From 25616affc50ecbfb95f9054f7ff2132f08901acf Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 14 Feb 2016 14:47:36 +0300
Subject: [PATCH 1471/2285] pythonPackages.flask_login: init at 0.2.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2724ca1073d1..cc36fe7a3ae4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8709,6 +8709,29 @@ in modules // {
     };
   };
 
+  flask_login = buildPythonPackage rec {
+    name = "Flask-Login-${version}";
+    version = "0.2.2";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/F/Flask-Login/${name}.tar.gz";
+      sha256 = "09ygn0r3i3jz065a5psng6bhlsqm78msnly4z6x39bs48r5ww17p";
+    };
+
+    propagatedBuildInputs = with self; [ flask ];
+
+    # FIXME
+    doCheck = false;
+
+    meta = {
+      homepage = http://github.com/miracle2k/flask-assets;
+      description = "User session management for Flask";
+      license = licenses.mit;
+      platforms = platforms.all;
+      maintainers = with maintainers; [ abbradar ];
+    };
+  };
+
   flask-pymongo = buildPythonPackage rec {
     name = "Flask-PyMongo-${version}";
     version = "0.3.1";

From 95ffcafff327bc6af0ca11c2247622b7378a43e7 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 14 Feb 2016 14:48:17 +0300
Subject: [PATCH 1472/2285] pythonPackages.flask_principal: init at 0.4.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cc36fe7a3ae4..5a6df6a3aba4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8732,6 +8732,26 @@ in modules // {
     };
   };
 
+  flask_principal = buildPythonPackage rec {
+    name = "Flask-Principal-${version}";
+    version = "0.4.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/F/Flask-Principal/${name}.tar.gz";
+      sha256 = "0lwlr5smz8vfm5h9a9i7da3q1c24xqc6vm9jdywdpgxfbi5i7mpm";
+    };
+
+    propagatedBuildInputs = with self; [ flask blinker nose ];
+
+    meta = {
+      homepage = http://packages.python.org/Flask-Principal/;
+      description = "Identity management for flask";
+      license = licenses.bsd2;
+      platforms = platforms.all;
+      maintainers = with maintainers; [ abbradar ];
+    };
+  };
+
   flask-pymongo = buildPythonPackage rec {
     name = "Flask-PyMongo-${version}";
     version = "0.3.1";

From d7b1ffe9c707be1232f7c1afe828b159de328ebb Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 14 Feb 2016 14:48:30 +0300
Subject: [PATCH 1473/2285] pythonPackages.flask_script: init at 2.0.5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5a6df6a3aba4..4daac1ccd94b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8770,6 +8770,27 @@ in modules // {
     };
   };
 
+  flask_script = buildPythonPackage rec {
+    name = "Flask-Script-${version}";
+    version = "2.0.5";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/F/Flask-Script/${name}.tar.gz";
+      sha256 = "0zqh2yq8zk7m9b4xw1ryqmrljkdigfb3hk5155a3b5hkfnn6xxyf";
+    };
+
+    nativeBuildInputs = with self; [ pytest ];
+    propagatedBuildInputs = with self; [ flask ];
+
+    meta = {
+      homepage = http://github.com/smurfix/flask-script;
+      description = "Scripting support for Flask";
+      license = licenses.bsd3;
+      platforms = platforms.all;
+      maintainers = with maintainers; [ abbradar ];
+    };
+  };
+
   wtforms = buildPythonPackage rec {
     version = "2.0.2";
     name = "wtforms-${version}";

From 47869abeadf048df3e68a9eea3db6377fff42358 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 14 Feb 2016 14:48:45 +0300
Subject: [PATCH 1474/2285] pythonPackages.pylru: init at 1.0.9

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4daac1ccd94b..b7ffedc5e52d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10693,6 +10693,24 @@ in modules // {
     };
   };
 
+  pylru = buildPythonPackage rec {
+    name = "pylru-${version}";
+    version = "1.0.9";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pylru/${name}.tar.gz";
+      sha256 = "0b0pq0l7xv83dfsajsc49jcxzc99kb9jfx1a1dlx22hzcy962dvi";
+    };
+
+    meta = {
+      homepage = https://github.com/jlhutch/pylru;
+      description = "A least recently used (LRU) cache implementation";
+      license = licenses.gpl2;
+      platforms = platforms.all;
+      maintainers = with maintainers; [ abbradar ];
+    };
+  };
+
   lazy-object-proxy = buildPythonPackage rec {
     name = "lazy-object-proxy-${version}";
     version = "1.2.1";

From 55ddc3f96d7ee43c7eb4b0dd1d2eba8605121bb9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 14 Feb 2016 14:53:18 +0300
Subject: [PATCH 1475/2285] pythonPackages.rsa: propagate pyasn1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b7ffedc5e52d..cf8dfb8d2de5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1167,7 +1167,6 @@ in modules // {
       colorama
       docutils
       rsa
-      pyasn1
       pkgs.groff
       pkgs.less
     ];
@@ -4751,7 +4750,7 @@ in modules // {
     doCheck = false; # requires redis server
     propagatedBuildInputs = with self; [
       setuptools docker_registry_core blinker flask gevent gunicorn pyyaml
-      requests2 rsa sqlalchemy9 setuptools backports_lzma pyasn1 m2crypto
+      requests2 rsa sqlalchemy9 setuptools backports_lzma m2crypto
     ];
 
     patchPhase = "> requirements/main.txt";
@@ -12883,7 +12882,7 @@ in modules // {
       sha256 = "0phfk6s8bgpap5xihdk1xv2lakdk1pb3rg6hp2wsg94hxcxnrakl";
     };
 
-    propagatedBuildInputs = with self; [ six httplib2 pyasn1 pyasn1-modules rsa ];
+    propagatedBuildInputs = with self; [ six httplib2 pyasn1-modules rsa ];
     doCheck = false;
 
     meta = {
@@ -18470,7 +18469,8 @@ in modules // {
       sha256 = "03f3d9bebad06681771016b8752a40b12f615ff32363c7aa19b3798e73ccd615";
     };
 
-    buildInputs = with self; [ pyasn1 unittest2 ];
+    nativeBuildInputs = with self; [ unittest2 ];
+    propagatedBuildInputs = with self; [ pyasn1 ];
 
     checkPhase = ''
       ${python.interpreter} run_tests.py

From 41648cbb8bc34194122f0f35b837ec6b0374cd92 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 14 Feb 2016 14:54:17 +0300
Subject: [PATCH 1476/2285] pythonPackages.sockjs-tornado: init at 1.0.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cf8dfb8d2de5..93dd8a852255 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19149,6 +19149,27 @@ in modules // {
     };
   };
 
+  sockjs-tornado = buildPythonPackage rec {
+    name = "sockjs-tornado-${version}";
+    version = "1.0.2";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/s/sockjs-tornado/${name}.tar.gz";
+      sha256 = "15lcy40h2cm0l8aknbrk48p2sni5wzybsqjx1hxwpk9lfa1xryyv";
+    };
+
+    # This is needed for compatibility with OctoPrint
+    propagatedBuildInputs = with self; [ tornado_4_0_1 ];
+
+    meta = {
+      description = "SockJS python server implementation on top of Tornado framework";
+      homepage = http://github.com/mrjoes/sockjs-tornado/;
+      license = licenses.mit;
+      platforms = platforms.all;
+      maintainers = with maintainers; [ abbradar ];
+    };
+  };
+
   sopel = buildPythonPackage rec {
     name = "sopel-6.3.0";
 

From 75d9531c47bfc9c34c8038a149b1d391c5c55ba7 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 14 Feb 2016 14:54:58 +0300
Subject: [PATCH 1477/2285] pythonPackages.webassets: init at 0.11.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 93dd8a852255..2f64516cda8f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -21487,6 +21487,25 @@ in modules // {
     };
   };
 
+  webassets = buildPythonPackage rec {
+    name = "webassets-${version}";
+    version = "0.11.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/w/webassets/${name}.tar.gz";
+      sha256 = "0p1qypcbq9b88ipcylxh3bbnby5n6dr421wb4bwmrlcrgvj4r5lz";
+    };
+
+    propagatedBuildInputs = with self; [ pyyaml ];
+
+    meta = {
+      description = "Media asset management for Python, with glue code for various web frameworks";
+      homepage = http://github.com/miracle2k/webassets/;
+      license = licenses.bsd2;
+      platforms = platforms.all;
+      maintainers = with maintainers; [ abbradar ];
+    };
+  };
 
   webcolors = buildPythonPackage rec {
     name = "webcolors-1.4";

From f74b5ac6840280badfb25766c89de2400f9a3240 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 14 Feb 2016 14:55:15 +0300
Subject: [PATCH 1478/2285] pythonPackages.tornado_4_0_1: init at 4.0.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 2f64516cda8f..34c098a437ad 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22629,6 +22629,18 @@ in modules // {
     };
   };
 
+  tornado_4_0_1 = buildPythonPackage rec {
+    name = "tornado-${version}";
+    version = "4.0.1";
+
+    propagatedBuildInputs = with self; [ backports_ssl_match_hostname_3_4_0_2 certifi ];
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/t/tornado/${name}.tar.gz";
+      sha256 = "00crp5vnasxg7qyjv89qgssb69vd7qr13jfghdryrcbnn9l8c1df";
+    };
+  };
+
   tokenlib = buildPythonPackage rec {
     name = "tokenlib-${version}";
     version = "0.3.1";

From 90375d62001ca9488d252acb9740c9fc1a8880cf Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 14 Feb 2016 14:55:40 +0300
Subject: [PATCH 1479/2285] pythonPackages.flaskbabel: propagate dependencies

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 34c098a437ad..074ae294d119 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -23572,7 +23572,7 @@ in modules // {
       sha256 = "0k7vk4k54y55ma0nx2k5s0phfqbriwslhy5shh3b0d046q7ibzaa";
     };
 
-    buildInputs = with self; [ flask jinja2 speaklater Babel pytz ];
+    propagatedBuildInputs = with self; [ flask jinja2 speaklater Babel pytz ];
 
     meta = {
       description = "Adds i18n/l10n support to Flask applications";

From aad9a88a20c8293082d850ecf79943584c1aa643 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 14 Feb 2016 14:56:07 +0300
Subject: [PATCH 1480/2285] octoprint: init at 1.2.9

---
 pkgs/applications/misc/octoprint/default.nix | 43 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 +
 pkgs/top-level/python-packages.nix           |  1 -
 3 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/misc/octoprint/default.nix

diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
new file mode 100644
index 000000000000..3e8b35ba4350
--- /dev/null
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, pythonPackages }:
+
+pythonPackages.buildPythonPackage rec {
+  name = "OctoPrint-${version}";
+  version = "1.2.9";
+
+  src = fetchFromGitHub {
+    owner = "foosel";
+    repo = "OctoPrint";
+    rev = version;
+    sha256 = "00hhq52jqwykhk3p57mn9kkcjbjz6g9mcrp96vx8lqzhw42m3a86";
+  };
+
+  # We need old Tornado
+  propagatedBuildInputs = with pythonPackages; [
+    awesome-slugify flask_assets watchdog rsa requests2 pkginfo pylru
+    semantic-version flask_principal sarge tornado_4_0_1 werkzeug netaddr flaskbabel
+    netifaces psutil pyserial flask_login pyyaml sockjs-tornado
+  ];
+
+  postPatch = ''
+    # Jailbreak dependencies
+    sed -i \
+      -e 's,rsa==,rsa>=,g' \
+      -e 's,sockjs-tornado==,sockjs-tornado>=,g' \
+      -e 's,Flask-Principal==,Flask-Principal>=,g' \
+      -e 's,werkzeug==,werkzeug>=,g' \
+      -e 's,netaddr==,netaddr>=,g' \
+      -e 's,requests==,requests>=,g' \
+      -e 's,netifaces==,netifaces>=,g' \
+      -e 's,psutil==,psutil>=,g' \
+      -e 's,PyYAML==,PyYAML>=,g' \
+      setup.py
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://octoprint.org/;
+    description = "The snappy web interface for your 3D printer";
+    platforms = platforms.all;
+    license = licenses.agpl3;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f1a20fb5fdc..de99a999e3ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12983,6 +12983,8 @@ let
     pulseaudioSupport = config.pulseaudio or true;
   };
 
+  octoprint = callPackage ../applications/misc/octoprint { };
+
   ocrad = callPackage ../applications/graphics/ocrad { };
 
   offrss = callPackage ../applications/networking/offrss { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 074ae294d119..4c8ad7d907bb 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3651,7 +3651,6 @@ in modules // {
     };
   };
 
-
   openstackclient = buildPythonPackage rec {
     name = "openstackclient-${version}";
     version = "1.7.1";

From d006529ca9246832d42d406d5fdbed10bbeb96f2 Mon Sep 17 00:00:00 2001
From: Jakob Gillich <jakob@gillich.me>
Date: Wed, 17 Feb 2016 14:56:37 +0100
Subject: [PATCH 1481/2285] elm: update to latest revs

Some tags were updated with bug fixes. Also fixed update-elm.rb to
include the callPackage argument for release.nix.
---
 pkgs/development/compilers/elm/packages/elm-compiler.nix | 4 ++--
 pkgs/development/compilers/elm/packages/elm-make.nix     | 4 ++--
 pkgs/development/compilers/elm/packages/elm-reactor.nix  | 4 ++--
 pkgs/development/compilers/elm/update-elm.rb             | 1 +
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/elm/packages/elm-compiler.nix b/pkgs/development/compilers/elm/packages/elm-compiler.nix
index 2c390ee406f3..d602193f226c 100644
--- a/pkgs/development/compilers/elm/packages/elm-compiler.nix
+++ b/pkgs/development/compilers/elm/packages/elm-compiler.nix
@@ -10,8 +10,8 @@ mkDerivation {
   version = "0.16";
   src = fetchgit {
     url = "https://github.com/elm-lang/elm-compiler";
-    sha256 = "696413b69fa5e66f878ed189094be5f74dfaced42121c82ac88bbab1c2bb9861";
-    rev = "cb1bad3b6ebaa02d5af47e9b98eab7d475a3a48d";
+    sha256 = "b3bcdca469716f3a4195469549a9e9bc53a6030aff132ec620b9c93958a5ffe6";
+    rev = "df86c1c9b3cf06de3ccb78f26b4d2fac0129ce5a";
   };
   isLibrary = true;
   isExecutable = true;
diff --git a/pkgs/development/compilers/elm/packages/elm-make.nix b/pkgs/development/compilers/elm/packages/elm-make.nix
index 953039ec0a83..923caf8e4c86 100644
--- a/pkgs/development/compilers/elm/packages/elm-make.nix
+++ b/pkgs/development/compilers/elm/packages/elm-make.nix
@@ -8,8 +8,8 @@ mkDerivation {
   version = "0.16";
   src = fetchgit {
     url = "https://github.com/elm-lang/elm-make";
-    sha256 = "bae1206c8066fb4e191345a3da79b89a5ec488929370b210203c8b4dcb35cebc";
-    rev = "e3bfc3e3d04c9b47e18fac289c796caec88d4fef";
+    sha256 = "fc0a6ed08b236dfab43e9af73f8e83a3b88a155695a9671a2b291dc596a75116";
+    rev = "54e0b33fea0cd72400ac6a3dec7643bf1b900741";
   };
   isLibrary = false;
   isExecutable = true;
diff --git a/pkgs/development/compilers/elm/packages/elm-reactor.nix b/pkgs/development/compilers/elm/packages/elm-reactor.nix
index 7715523a88c0..90fdb68480ca 100644
--- a/pkgs/development/compilers/elm/packages/elm-reactor.nix
+++ b/pkgs/development/compilers/elm/packages/elm-reactor.nix
@@ -8,8 +8,8 @@ mkDerivation {
   version = "0.16";
   src = fetchgit {
     url = "https://github.com/elm-lang/elm-reactor";
-    sha256 = "dbf881808ff00772d464675f1dd88a40273569ab0e9298805133a3b8f3ed4f26";
-    rev = "ff4ad13ea6b55c63b2d2099b738fd1d5ec2d29b4";
+    sha256 = "55605b8443dad20c78e297ce35a603cb107b0c1e57bf1c4710faaebc60396de0";
+    rev = "b03166296d11e240fa04cdb748e1f3c4af7afc83";
   };
   isLibrary = false;
   isExecutable = true;
diff --git a/pkgs/development/compilers/elm/update-elm.rb b/pkgs/development/compilers/elm/update-elm.rb
index 4a8001059c98..363655415a95 100755
--- a/pkgs/development/compilers/elm/update-elm.rb
+++ b/pkgs/development/compilers/elm/update-elm.rb
@@ -14,6 +14,7 @@ for pkg, ver in $elm_packages
 end
 
 File.open("release.nix", 'w') do |file|
+  file.puts "{ callPackage }:"
   file.puts "{"
   file.puts "  version = \"#{$elm_version}\";"
   file.puts "  packages = {"

From 4db16aed11872f2dfaa3ad053fa83f0b007ce693 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 17 Feb 2016 15:51:20 +0300
Subject: [PATCH 1482/2285] octoprint-plugins.m3d-fio: init at 0.26

---
 .../0001-Don-t-use-static-library.patch       | 113 ++++++++++++++++++
 ...nnection-several-times-if-printer-is.patch |  57 +++++++++
 pkgs/applications/misc/octoprint/plugins.nix  |  43 +++++++
 pkgs/top-level/all-packages.nix               |   2 +
 4 files changed, 215 insertions(+)
 create mode 100644 pkgs/applications/misc/octoprint/0001-Don-t-use-static-library.patch
 create mode 100644 pkgs/applications/misc/octoprint/0002-Try-to-create-connection-several-times-if-printer-is.patch
 create mode 100644 pkgs/applications/misc/octoprint/plugins.nix

diff --git a/pkgs/applications/misc/octoprint/0001-Don-t-use-static-library.patch b/pkgs/applications/misc/octoprint/0001-Don-t-use-static-library.patch
new file mode 100644
index 000000000000..01b0c8f9cce9
--- /dev/null
+++ b/pkgs/applications/misc/octoprint/0001-Don-t-use-static-library.patch
@@ -0,0 +1,113 @@
+From 73ff28c3ee5b737303871268a5487db0fcffc0f6 Mon Sep 17 00:00:00 2001
+From: Nikolay Amiantov <ab@fmap.me>
+Date: Wed, 17 Feb 2016 14:37:31 +0300
+Subject: [PATCH 1/2] Don't use static library
+
+---
+ octoprint_m3dfio/__init__.py   | 67 +-----------------------------------------
+ shared library source/Makefile |  6 ++--
+ 2 files changed, 5 insertions(+), 68 deletions(-)
+
+diff --git a/octoprint_m3dfio/__init__.py b/octoprint_m3dfio/__init__.py
+index 5e5369b..9f59768 100644
+--- a/octoprint_m3dfio/__init__.py
++++ b/octoprint_m3dfio/__init__.py
+@@ -764,72 +764,7 @@ class M3DFioPlugin(
+ 		# Set file locations
+ 		self.setFileLocations()
+ 		
+-		# Check if running on Linux
+-		if platform.uname()[0].startswith("Linux") :
+-		
+-			# Check if running on a Raspberry Pi
+-			if platform.uname()[4].startswith("armv6l") and self.getCpuHardware() == "BCM2708" :
+-			
+-				# Set shared library
+-				self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm1176jzf-s.so")
+-			
+-			# Otherwise check if running on a Raspberry Pi 2
+-			elif platform.uname()[4].startswith("armv7l") and self.getCpuHardware() == "BCM2709" :
+-			
+-				# Set shared library
+-				self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm_cortex-a7.so")
+-			
+-			# Otherwise check if running on an ARM7 device
+-			elif platform.uname()[4].startswith("armv7") :
+-			
+-				# Set shared library
+-				self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_arm7.so")
+-			
+-			# Otherwise check if using an i386 or x86-64 device
+-			elif platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64") :
+-		
+-				# Check if Python is running as 32-bit
+-				if platform.architecture()[0].startswith("32") :
+-				
+-					# Set shared library
+-					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.so")
+-			
+-				# Otherwise check if Python is running as 64-bit
+-				elif platform.architecture()[0].startswith("64") :
+-				
+-					# Set shared library
+-					self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.so")
+-		
+-		# Otherwise check if running on Windows and using an i386 or x86-64 device
+-		elif platform.uname()[0].startswith("Windows") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) :
+-		
+-			# Check if Python is running as 32-bit
+-			if platform.architecture()[0].startswith("32") :
+-			
+-				# Set shared library
+-				self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.dll")
+-		
+-			# Otherwise check if Python is running as 64-bit
+-			elif platform.architecture()[0].startswith("64") :
+-			
+-				# Set shared library
+-				self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dll")
+-		
+-		# Otherwise check if running on OS X and using an i386 or x86-64 device
+-		elif platform.uname()[0].startswith("Darwin") and (platform.uname()[4].endswith("86") or platform.uname()[4].endswith("64")) :
+-		
+-			# Check if Python is running as 32-bit
+-			if platform.architecture()[0].startswith("32") :
+-			
+-				# Set shared library
+-				self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_i386.dylib")
+-		
+-			# Otherwise check if Python is running as 64-bit
+-			elif platform.architecture()[0].startswith("64") :
+-			
+-				# Set shared library
+-				self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/static/libraries/preprocessor_x86-64.dylib")
+-		
++		self.sharedLibrary = ctypes.cdll.LoadLibrary(self._basefolder.replace('\\', '/') + "/../../../libpreprocessor.so")
+ 		# Check if shared library was set
+ 		if self.sharedLibrary :
+ 		
+diff --git a/shared library source/Makefile b/shared library source/Makefile
+index 4062a91..89dab71 100644
+--- a/shared library source/Makefile	
++++ b/shared library source/Makefile	
+@@ -58,13 +58,15 @@ ifeq ($(TARGET_PLATFORM), OSX64)
+ 	CFLAGS = -fPIC -m64 -stdlib=libc++ -O3 -Wl,-install_name,$(PROG)$(VER)
+ endif
+ 
++PROG = lib$(LIBRARY_NAME).so
++CC = g++
+ SRCS = preprocessor.cpp gcode.cpp vector.cpp
+-CFLAGS += -Wall -std=c++11 -fvisibility=hidden -shared
++CFLAGS = -O3 -fPIC -Wall -std=c++11 -fvisibility=hidden -shared
+ 
+ all: $(PROG)
+ 
+ $(PROG):   $(SRCS)
+-	$(CC) $(CFLAGS) -o ../octoprint_m3dfio/static/libraries/$(PROG) $(SRCS)
++	$(CC) $(CFLAGS) -o $(PROG) $(SRCS)
+ 
+ clean:
+ 	rm -f ../octoprint_m3dfio/static/libraries/$(PROG)
+-- 
+2.7.0
+
diff --git a/pkgs/applications/misc/octoprint/0002-Try-to-create-connection-several-times-if-printer-is.patch b/pkgs/applications/misc/octoprint/0002-Try-to-create-connection-several-times-if-printer-is.patch
new file mode 100644
index 000000000000..63495fd6db9c
--- /dev/null
+++ b/pkgs/applications/misc/octoprint/0002-Try-to-create-connection-several-times-if-printer-is.patch
@@ -0,0 +1,57 @@
+From b99fc3fd012765c5b3d8ac7a3f64762af5121b4a Mon Sep 17 00:00:00 2001
+From: Nikolay Amiantov <ab@fmap.me>
+Date: Wed, 17 Feb 2016 15:47:34 +0300
+Subject: [PATCH 2/2] Try to create connection several times if printer is not
+ yet available
+
+---
+ octoprint_m3dfio/__init__.py | 25 ++++++++++++++++++++++---
+ 1 file changed, 22 insertions(+), 3 deletions(-)
+
+diff --git a/octoprint_m3dfio/__init__.py b/octoprint_m3dfio/__init__.py
+index 9f59768..e7d97eb 100644
+--- a/octoprint_m3dfio/__init__.py
++++ b/octoprint_m3dfio/__init__.py
+@@ -3421,8 +3421,16 @@ class M3DFioPlugin(
+ 						# Set updated port
+ 						currentPort = self.getPort()
+ 					
+-						# Re-connect
+-						connection = serial.Serial(currentPort, currentBaudrate)
++						# Re-connect; wait for the device to be available
++                                                connection = None
++                                                for i in range(1, 5):
++						        try:
++                                                                connection = serial.Serial(currentPort, currentBaudrate)
++                                                                break
++                                                        except OSError:
++                                                                time.sleep(1)
++                                                if connection is None:
++                                                        raise Exception("Couldn't reconnect to the printer")
+ 				
+ 					# Check if getting EEPROM was successful
+ 					if self.getEeprom(connection) :
+@@ -6799,8 +6807,19 @@ class M3DFioPlugin(
+ 		# Set state to connecting
+ 		comm_instance._log("Connecting to: " + str(port))
+ 		
++                # Create a connection
++                connection = None
++                for i in range(1, 5):
++                        try:
++                                connection = serial.Serial(str(port), baudrate)
++                        # If printer has just power-cycled it may not yet be ready
++                        except OSError:
++                                time.sleep(1)
++                if connection is None:
++                        raise Exception("Couldn't reconnect to the printer")
++
+ 		# Return connection
+-		return serial.Serial(str(port), baudrate)
++		return connection
+ 	
+ 	# Disable sleep
+ 	def disableSleep(self) :
+-- 
+2.7.0
+
diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
new file mode 100644
index 000000000000..a6f3d58ecce6
--- /dev/null
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, octoprint, pythonPackages }:
+
+let
+  buildPlugin = args: pythonPackages.buildPythonPackage (args // {
+    buildInputs = (args.buildInputs or []) ++ [ octoprint ];
+  });
+in {
+
+  m3d-fio = buildPlugin rec {
+    name = "M3D-Fio-${version}";
+    version = "0.26";
+
+    src = fetchFromGitHub {
+      owner = "donovan6000";
+      repo = "M3D-Fio";
+      rev = "V${version}";
+      sha256 = "1dl8m0cxp2vzla2a729r3jrq5ahxkj10pygp7m9bblj5nn2s0rll";
+    };
+
+    patches = [
+      ./0001-Don-t-use-static-library.patch
+      ./0002-Try-to-create-connection-several-times-if-printer-is.patch
+    ];
+
+    postInstall = ''
+    (
+      cd 'shared library source'
+      make
+      install -Dm755 libpreprocessor.so $out/lib/libpreprocessor.so
+    )
+    rm -rf $out/${pythonPackages.python.sitePackages}/octoprint_m3dfio/static/libraries
+    '';
+
+    meta = with stdenv.lib; {
+      homepage = https://github.com/donovan6000/M3D-Fio;
+      description = " OctoPrint plugin for the Micro 3D printer";
+      platforms = platforms.all;
+      license = licenses.gpl3;
+      maintainers = with maintainers; [ abbradar ];
+    };
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de99a999e3ae..0702a2e86f12 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12985,6 +12985,8 @@ let
 
   octoprint = callPackage ../applications/misc/octoprint { };
 
+  octoprint-plugins = callPackage ../applications/misc/octoprint/plugins.nix { };
+
   ocrad = callPackage ../applications/graphics/ocrad { };
 
   offrss = callPackage ../applications/networking/offrss { };

From 3f9acdc1487b989e3563c97a38d9a7ff854f2437 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 17 Feb 2016 16:43:44 +0300
Subject: [PATCH 1483/2285] octoprint-plugins.titlestatus: init at 0.0.2

---
 pkgs/applications/misc/octoprint/plugins.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index a6f3d58ecce6..3ea90d2fe07e 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -40,4 +40,24 @@ in {
     };
   };
 
+  titlestatus = buildPlugin rec {
+    name = "OctoPrint-TitleStatus-${version}";
+    version = "0.0.2";
+
+    src = fetchFromGitHub {
+      owner = "MoonshineSG";
+      repo = "OctoPrint-TitleStatus";
+      rev = version;
+      sha256 = "0rfbpxbcmadyihcrynh6bjywy3yqnzsnjn3yiwifisbrjgpm6sfw";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = https://github.com/MoonshineSG/OctoPrint-TitleStatus;
+      description = "Show printers status in window title";
+      platforms = platforms.all;
+      license = licenses.agpl3;
+      maintainers = with maintainers; [ abbradar ];
+    };
+  };
+
 }

From 303991218b770701d2ff5b284fc8b90756f98aaa Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 17 Feb 2016 16:43:53 +0300
Subject: [PATCH 1484/2285] octoprint-plugins.stlviewer: init at 0.3.0

---
 pkgs/applications/misc/octoprint/plugins.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 3ea90d2fe07e..801be43220d9 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -60,4 +60,24 @@ in {
     };
   };
 
+  stlviewer = buildPlugin rec {
+    name = "OctoPrint-STLViewer-${version}";
+    version = "0.3.0";
+
+    src = fetchFromGitHub {
+      owner = "jneilliii";
+      repo = "OctoPrint-STLViewer";
+      rev = "v${version}";
+      sha256 = "1a6sa8pw9ay7x27pfwr3nzb22x3jaw0c9vwyz4mrj76zkiw6svfi";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = https://github.com/jneilliii/Octoprint-STLViewer;
+      description = "A simple stl viewer tab for OctoPrint";
+      platforms = platforms.all;
+      license = licenses.agpl3;
+      maintainers = with maintainers; [ abbradar ];
+    };
+  };
+
 }

From 199aeab96ee995c0aeb983f4f2777aad7a6e667b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 16 Feb 2016 12:57:29 +0300
Subject: [PATCH 1485/2285] yaml-merge: init at 2016-02-16

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

diff --git a/pkgs/tools/text/yaml-merge/default.nix b/pkgs/tools/text/yaml-merge/default.nix
new file mode 100644
index 000000000000..00673341cfc6
--- /dev/null
+++ b/pkgs/tools/text/yaml-merge/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, fetchFromGitHub, pythonPackages }:
+
+stdenv.mkDerivation rec {
+  name= "yaml-merge-2016-02-16";
+
+  src = fetchFromGitHub {
+    owner = "abbradar";
+    repo = "yaml-merge";
+    rev = "4eef7b68632d79dec369b4eff5a8c63f995f81dc";
+    sha256 = "0mwda2shk43i6f22l379fcdchmb07fm7nf4i2ii7fk3ihkhb8dgp";
+  };
+
+  pythonPath = with pythonPackages; [ pyyaml ];
+  nativeBuildInputs = [ pythonPackages.wrapPython ];
+
+  installPhase = ''
+    install -Dm755 yaml-merge.py $out/bin/yaml-merge
+    wrapPythonPrograms
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Merge YAML data files";
+    homepage = https://github.com/abbradar/yaml-merge;
+    license = licenses.bsd2;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ abbradar ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0702a2e86f12..bac68e532010 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3801,6 +3801,8 @@ let
 
   yank = callPackage ../tools/misc/yank { };
 
+  yaml-merge = callPackage ../tools/text/yaml-merge { };
+
   # To expose more packages for Yi, override the extraPackages arg.
   yi = callPackage ../applications/editors/yi/wrapper.nix { };
 

From 53269f1455cd4b44a90a80e332de45d56e51e511 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 14 Feb 2016 14:58:09 +0300
Subject: [PATCH 1486/2285] octoprint service: init

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

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 19da804c13f3..f3883ff56d34 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -251,6 +251,7 @@
       cfdyndns = 227;
       gammu-smsd = 228;
       pdnsd = 229;
+      octoprint = 230;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
@@ -478,6 +479,7 @@
       rmilter = 226;
       cfdyndns = 227;
       pdnsd = 229;
+      octoprint = 230;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 8254cdd6f5eb..2509af7c0f28 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -229,6 +229,7 @@
   ./services/misc/nix-gc.nix
   ./services/misc/nixos-manual.nix
   ./services/misc/nix-ssh-serve.nix
+  ./services/misc/octoprint.nix
   ./services/misc/parsoid.nix
   ./services/misc/phd.nix
   ./services/misc/plex.nix
diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix
new file mode 100644
index 000000000000..bb9dc5da2eb6
--- /dev/null
+++ b/nixos/modules/services/misc/octoprint.nix
@@ -0,0 +1,118 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.octoprint;
+
+  cfgUpdate = pkgs.writeText "octoprint-config.yaml" (builtins.toJSON {
+    plugins.cura.cura_engine = "${pkgs.curaengine}/bin/CuraEngine";
+    server.host = cfg.host;
+    server.port = cfg.port;
+    webcam.ffmpeg = "${pkgs.ffmpeg}/bin/ffmpeg";
+  });
+
+  pluginsEnv = pkgs.python.buildEnv.override {
+    extraLibs = cfg.plugins pkgs.octoprint-plugins;
+  };
+
+in
+{
+  ##### interface
+
+  options = {
+
+    services.octoprint = {
+
+      enable = mkEnableOption "OctoPrint, web interface for 3D printers";
+
+      host = mkOption {
+        type = types.str;
+        default = "0.0.0.0";
+        description = ''
+          Host to bind OctoPrint to.
+        '';
+      };
+
+      port = mkOption {
+        type = types.int;
+        default = 5000;
+        description = ''
+          Port to bind OctoPrint to.
+        '';
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "octoprint";
+        description = "User for the daemon.";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "octoprint";
+        description = "Group for the daemon.";
+      };
+
+      stateDir = mkOption {
+        type = types.path;
+        default = "/var/lib/octoprint";
+        description = "State directory of the daemon.";
+      };
+
+      plugins = mkOption {
+        default = plugins: [];
+        example = literalExample "plugins: [ m3d-fio ]";
+        description = "Additional plugins.";
+      };
+
+    };
+
+  };
+
+  ##### implementation
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers = optionalAttrs (cfg.user == "octoprint") (singleton
+      { name = "octoprint";
+        group = cfg.group;
+        uid = config.ids.uids.octoprint;
+      });
+
+    users.extraGroups = optionalAttrs (cfg.group == "octoprint") (singleton
+      { name = "octoprint";
+        gid = config.ids.gids.octoprint;
+      });
+
+    systemd.services.octoprint = {
+      description = "OctoPrint, web interface for 3D printers";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      path = [ pluginsEnv ];
+      environment.PYTHONPATH = makeSearchPath pkgs.python.sitePackages [ pluginsEnv ];
+
+      preStart = ''
+        mkdir -p "${cfg.stateDir}"
+        if [ -e "${cfg.stateDir}/config.yaml" ]; then
+          ${pkgs.yaml-merge}/bin/yaml-merge "${cfg.stateDir}/config.yaml" "${cfgUpdate}" > "${cfg.stateDir}/config.yaml.tmp"
+          mv "${cfg.stateDir}/config.yaml.tmp" "${cfg.stateDir}/config.yaml"
+        else
+          cp "${cfgUpdate}" "${cfg.stateDir}/config.yaml"
+          chmod 600 "${cfg.stateDir}/config.yaml"
+        fi
+        chown -R ${cfg.user}:${cfg.group} "${cfg.stateDir}"
+      '';
+
+      serviceConfig = {
+        ExecStart = "${pkgs.octoprint}/bin/octoprint -b ${cfg.stateDir}";
+        User = cfg.user;
+        Group = cfg.group;
+        PermissionsStartOnly = true;
+      };
+    };
+
+  };
+
+}

From d03c73a2283dfba46beb3daed8a85f950574c36b Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Wed, 17 Feb 2016 15:43:53 +0100
Subject: [PATCH 1487/2285] utox: 7e290747 -> 0.5.0

---
 .../instant-messengers/utox/default.nix       | 32 ++++---------------
 1 file changed, 7 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index 61b7e8ec5105..55ec1560c5e5 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -1,41 +1,23 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, dbus, libvpx, libX11, openal, freetype, libv4l
+{ stdenv, fetchFromGitHub, pkgconfig, libtoxcore-dev, filter-audio, dbus, libvpx, libX11, openal, freetype, libv4l
 , libXrender, fontconfig, libXext, libXft, utillinux, git, libsodium }:
 
-let
-
-  filteraudio = stdenv.mkDerivation rec {
-    name = "filter_audio-20150516";
-
-    src = fetchFromGitHub {
-      owner = "irungentoo";
-      repo = "filter_audio";
-      rev = "612c5a102550c614e4c8f859e753ea64c0b7250c";
-      sha256 = "0bmf8dxnr4vb6y36lvlwqd5x68r4cbsd625kbw3pypm5yqp0n5na";
-    };
-
-    buildInputs = [ utillinux ];
-
-    doCheck = false;
-
-    makeFlags = "PREFIX=$(out)";
-  };
-
-in stdenv.mkDerivation rec {
-  name = "utox-dev-20151220";
+stdenv.mkDerivation rec {
+  name = "utox-${version}";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "GrayHatter";
     repo = "uTox";
-    rev = "7e2907470835746b6819d631b48dd54bc9c4de66";
+    rev = "v${version}";
     sha256 = "074wa0np8hyqwy9xqgyyds94pdfv2i1jh019m98d8apxc5vn36wk";
   };
 
   buildInputs = [ pkgconfig libtoxcore-dev dbus libvpx libX11 openal freetype
-                  libv4l libXrender fontconfig libXext libXft filteraudio 
+                  libv4l libXrender fontconfig libXext libXft filter-audio
                   git libsodium ];
 
   doCheck = false;
-  
+
   makeFlags = "PREFIX=$(out)";
 
   meta = with stdenv.lib; {

From db03fdea957f0f6b18c7284864a0c41aa6a426b1 Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Wed, 17 Feb 2016 15:49:37 +0100
Subject: [PATCH 1488/2285] filter_audio: remove duplicate package,
 filter-audio already exists and in use

---
 .../libraries/filter_audio/default.nix        | 24 -------------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 26 deletions(-)
 delete mode 100644 pkgs/development/libraries/filter_audio/default.nix

diff --git a/pkgs/development/libraries/filter_audio/default.nix b/pkgs/development/libraries/filter_audio/default.nix
deleted file mode 100644
index 3082e11efbff..000000000000
--- a/pkgs/development/libraries/filter_audio/default.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchFromGitHub, utillinux }:
-
-stdenv.mkDerivation rec {
-  name = "filter_audio-${version}";
-  version = "76428a6cda43ae77f3936f4527c5f86eb3a5e211";
-
-  src = fetchFromGitHub {
-    owner  = "irungentoo";
-    repo   = "filter_audio";
-    rev    = "${version}";
-    sha256 = "0c4wp9a7dzbj9ykfkbsxrkkyy0nz7vyr5map3z7q8bmv9pjylbk9";
-  };
-
-  buildInputs = [ utillinux ];
-  makeFlags = "PREFIX=$(out)";
-
-  meta = with stdenv.lib; {
-    description = "An easy to use audio filtering library made from webrtc code";
-    homepage    = https://github.com/irungentoo/filter_audio;
-    license     = licenses.bsd3;
-    maintainers = with maintainers; [ np ];
-    platforms   = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 40e92629064c..1f8cebc083f5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -877,8 +877,6 @@ let
 
   fop = callPackage ../tools/typesetting/fop { };
 
-  filter_audio = callPackage ../development/libraries/filter_audio { };
-
   fzf = goPackages.fzf.bin // { outputs = [ "bin" ]; };
 
   gencfsm = callPackage ../tools/security/gencfsm { };

From ebe983824b4fe32dc224be1aefbece1af9a6dcc7 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Wed, 17 Feb 2016 16:24:06 +0100
Subject: [PATCH 1489/2285] dropbox: 3.14.5 -> 3.14.7

---
 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 edaa5ed077fd..a180e2a01edb 100644
--- a/pkgs/applications/networking/dropbox/default.nix
+++ b/pkgs/applications/networking/dropbox/default.nix
@@ -20,11 +20,11 @@
 
 let
   # NOTE: When updating, please also update in current stable, as older versions stop working
-  version = "3.14.5";
+  version = "3.14.7";
   sha256 =
     {
-      "x86_64-linux" = "02yjc910j3m61yd19akfv5yxh0a06cqwx2rxb2xhdbf1cb6c2wdg";
-      "i686-linux" = "0aqni6gsnbmshczxwn10qbp43qqnprxr18spx7dc9cz9cq27rgrv";
+      "x86_64-linux" = "1pwmghpr0kyca2biysyk90kk9k6ffv4i95vs5rq96vc0zbckws6n";
+      "i686-linux" = "08yqrxh09cfd80kbiq1f2sirx9s85acij4khpklvvwrnf2x1i1zm";
     }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
 
   arch =

From 74bda15a94490feef13dd7313f64255acc3d6af3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 17 Feb 2016 18:16:20 +0100
Subject: [PATCH 1490/2285] gettext.sh: fixup calls to absolute paths

For discussion see https://github.com/NixOS/nixpkgs/pull/13072
---
 .../libraries/gettext/absolute-paths.diff     | 21 +++++++++++++++++++
 .../development/libraries/gettext/default.nix |  4 +++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/gettext/absolute-paths.diff

diff --git a/pkgs/development/libraries/gettext/absolute-paths.diff b/pkgs/development/libraries/gettext/absolute-paths.diff
new file mode 100644
index 000000000000..6d5cf1c1ba24
--- /dev/null
+++ b/pkgs/development/libraries/gettext/absolute-paths.diff
@@ -0,0 +1,21 @@
+diff --git a/gettext-runtime/src/gettext.sh.in b/gettext-runtime/src/gettext.sh.in
+index 1dfa3bb..d6ef8a8 100644
+--- a/gettext-runtime/src/gettext.sh.in
++++ b/gettext-runtime/src/gettext.sh.in
+@@ -86,14 +86,14 @@ fi
+ # looks up the translation of MSGID and substitutes shell variables in the
+ # result.
+ eval_gettext () {
+-  gettext "$1" | (export PATH `envsubst --variables "$1"`; envsubst "$1")
++  @out@/bin/gettext "$1" | (export PATH `envsubst --variables "$1"`; envsubst "$1")
+ }
+ 
+ # eval_ngettext MSGID MSGID-PLURAL COUNT
+ # looks up the translation of MSGID / MSGID-PLURAL for COUNT and substitutes
+ # shell variables in the result.
+ eval_ngettext () {
+-  ngettext "$1" "$2" "$3" | (export PATH `envsubst --variables "$1 $2"`; envsubst "$1 $2")
++  @out@/bin/ngettext "$1" "$2" "$3" | (export PATH `envsubst --variables "$1 $2"`; envsubst "$1 $2")
+ }
+ 
+ # Note: This use of envsubst is much safer than using the shell built-in 'eval'
diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 3d7cfc0ca310..1443626124e1 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -7,6 +7,7 @@ stdenv.mkDerivation (rec {
     url = "mirror://gnu/gettext/${name}.tar.gz";
     sha256 = "0pb9vp4ifymvdmc31ks3xxcnfqgzj8shll39czmk8c1splclqjzd";
   };
+  patches = [ ./absolute-paths.diff ];
 
   outputs = [ "out" "doc" ];
 
@@ -28,7 +29,8 @@ stdenv.mkDerivation (rec {
         "gt_cv_func_CFLocaleCopyCurrent=no"
       ]);
 
-  patchPhase = ''
+  postPatch = ''
+   substituteAllInPlace gettext-runtime/src/gettext.sh.in
    substituteInPlace gettext-tools/projects/KDE/trigger --replace "/bin/pwd" pwd
    substituteInPlace gettext-tools/projects/GNOME/trigger --replace "/bin/pwd" pwd
    substituteInPlace gettext-tools/src/project-id --replace "/bin/pwd" pwd

From c44176237af93f4497aaec8e4588ff2e896b0df4 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 17 Feb 2016 19:42:43 +0100
Subject: [PATCH 1491/2285] pythonPackages.fs: build with all Python versions

and add updated explanation of why tests are disabled.
See also https://github.com/NixOS/nixpkgs/pull/13066
---
 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 12a74cf94417..56572ab74308 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8960,10 +8960,11 @@ in modules // {
       ${python.interpreter} -m unittest discover
     '';
 
-    # Judging from SyntaxError
-    disabled = isPy3k;
-
-    # Lots of errors. Likely due to being in a chroot
+    # Because 2to3 is used the tests in $out need to be run.
+    # Both when using unittest and pytest this resulted in many errors,
+    # some Python byte/str errors, and others specific to resources tested.
+    # Failing tests due to the latter is to be expected with this type of package.
+    # Tests are therefore disabled.
     doCheck = false;
 
     meta = {

From 1199288de9c133e5f53cea9852ca1d997721910f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Wed, 17 Feb 2016 17:21:28 -0200
Subject: [PATCH 1492/2285] opensmtpd: 5.7.3p1 -> 5.7.3p2

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

diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index 1d92a5edc445..5e3f084674b2 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -4,14 +4,14 @@
 
 stdenv.mkDerivation rec {
   name = "opensmtpd-${version}";
-  version = "5.7.3p1";
+  version = "5.7.3p2";
 
   nativeBuildInputs = [ autoconf automake libtool bison ];
   buildInputs = [ libasr libevent zlib openssl db pam ];
 
   src = fetchurl {
     url = "http://www.opensmtpd.org/archives/${name}.tar.gz";
-    sha256 = "848a3c72dd22b216bb924b69dc356fc297e8b3671ec30856978950208cba74dd";
+    sha256 = "0d2973008d0f66bebb84bed516be6c32617735241cc54dd26643529281a8e52b";
   };
 
   patches = [ ./proc_path.diff ];

From e20b978708062ebfe00c73a08f71a5fbffe98d50 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 17 Feb 2016 18:53:48 +0100
Subject: [PATCH 1493/2285] ocamlPackages.gen: init at 0.3

---
 .../development/ocaml-modules/gen/default.nix | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/gen/default.nix

diff --git a/pkgs/development/ocaml-modules/gen/default.nix b/pkgs/development/ocaml-modules/gen/default.nix
new file mode 100644
index 000000000000..0b8f4253e76c
--- /dev/null
+++ b/pkgs/development/ocaml-modules/gen/default.nix
@@ -0,0 +1,25 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, qtest, ounit }:
+
+let version = "0.3"; in
+
+stdenv.mkDerivation {
+  name = "ocaml-gen-${version}";
+
+  src = fetchFromGitHub {
+    owner = "c-cube";
+    repo = "gen";
+    rev = "${version}";
+    sha256 = "0xrnkcfa5q86ammf49j5hynw5563x5sa2mk7vqf7g097j1szif72";
+  };
+
+  buildInputs = [ ocaml findlib qtest ounit ];
+
+  createFindlibDestdir = true;
+
+  meta = {
+    homepage = https://github.com/c-cube/gen;
+    description = "Simple, efficient iterators for OCaml";
+    license = stdenv.lib.licenses.bsd3;
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 605d39b6ac9f..e9fa46156647 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4687,6 +4687,8 @@ let
 
     functory = callPackage ../development/ocaml-modules/functory { };
 
+    gen = callPackage ../development/ocaml-modules/gen { };
+
     herelib = callPackage ../development/ocaml-modules/herelib { };
 
     io-page = callPackage ../development/ocaml-modules/io-page { };

From a1e96c7cbe74f4c826eb55aad498f70ce345393e Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 17 Feb 2016 18:54:23 +0100
Subject: [PATCH 1494/2285] ocamlPackages.sequence: init at 0.6

---
 .../ocaml-modules/sequence/default.nix        | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/sequence/default.nix

diff --git a/pkgs/development/ocaml-modules/sequence/default.nix b/pkgs/development/ocaml-modules/sequence/default.nix
new file mode 100644
index 000000000000..d9c49ece60d7
--- /dev/null
+++ b/pkgs/development/ocaml-modules/sequence/default.nix
@@ -0,0 +1,38 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, qtest, ounit }:
+
+let version = "0.6"; in
+
+stdenv.mkDerivation {
+  name = "ocaml-sequence-${version}";
+
+  src = fetchFromGitHub {
+    owner = "c-cube";
+    repo = "sequence";
+    rev = "${version}";
+    sha256 = "0mky5qas3br2x4y14dzcky212z624ydqnx8mw8w00x0c1xjpafkb";
+  };
+
+  buildInputs = [ ocaml findlib qtest ounit ];
+
+  configureFlags = [
+    "--enable-tests"
+  ];
+
+  doCheck = true;
+  checkTarget = "test";
+
+  createFindlibDestdir = true;
+
+  meta = {
+    homepage = https://github.com/c-cube/sequence;
+    description = "Simple sequence (iterator) datatype and combinators";
+    longDescription = ''
+      Simple sequence datatype, intended to transfer a finite number of
+      elements from one data structure to another. Some transformations on sequences,
+      like `filter`, `map`, `take`, `drop` and `append` can be performed before the
+      sequence is iterated/folded on.
+    '';
+    license = stdenv.lib.licenses.bsd2;
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e9fa46156647..c58df29cad06 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4842,6 +4842,8 @@ let
 
     re2 = callPackage ../development/ocaml-modules/re2 { };
 
+    sequence = callPackage ../development/ocaml-modules/sequence { };
+
     tuntap = callPackage ../development/ocaml-modules/tuntap { };
 
     tyxml = callPackage ../development/ocaml-modules/tyxml { };

From 26415f963aec8dee29f8dab6ca1b36124f8b0abc Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Wed, 17 Feb 2016 18:54:58 +0100
Subject: [PATCH 1495/2285] ocamlPackages.containers: init at 0.15

---
 .../ocaml-modules/containers/default.nix      | 47 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/containers/default.nix

diff --git a/pkgs/development/ocaml-modules/containers/default.nix b/pkgs/development/ocaml-modules/containers/default.nix
new file mode 100644
index 000000000000..5c2447614ada
--- /dev/null
+++ b/pkgs/development/ocaml-modules/containers/default.nix
@@ -0,0 +1,47 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib, cppo, gen, sequence, qtest, ounit }:
+
+let version = "0.15"; in
+
+stdenv.mkDerivation {
+  name = "ocaml-containers-${version}";
+
+  src = fetchFromGitHub {
+    owner = "c-cube";
+    repo = "ocaml-containers";
+    rev = "${version}";
+    sha256 = "13mdl8jp4ymg1wip7lqmh4224x4jnji3frm1ik55vvm3ac8caqng";
+  };
+
+  buildInputs = [ ocaml findlib cppo gen sequence qtest ounit ];
+
+  configureFlags = [
+    "--enable-unix"
+    "--enable-thread"
+    "--enable-bigarray"
+    "--enable-advanced"
+    "--enable-tests"
+    "--disable-bench"
+  ];
+
+  doCheck = true;
+  checkTarget = "test";
+
+  createFindlibDestdir = true;
+
+  meta = {
+    homepage = https://github.com/c-cube/ocaml-containers;
+    description = "A modular standard library focused on data structures";
+    longDescription = ''
+      Containers is a standard library (BSD license) focused on data structures,
+      combinators and iterators, without dependencies on unix. Every module is
+      independent and is prefixed with 'CC' in the global namespace. Some modules
+      extend the stdlib (e.g. CCList provides safe map/fold_right/append, and
+      additional functions on lists).
+
+      It also features optional libraries for dealing with strings, and
+      helpers for unix and threads.
+    '';
+    license = stdenv.lib.licenses.bsd2;
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c58df29cad06..a761d7bfaea2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4637,6 +4637,8 @@ let
 
     config-file = callPackage ../development/ocaml-modules/config-file { };
 
+    containers = callPackage ../development/ocaml-modules/containers { };
+
     cpdf = callPackage ../development/ocaml-modules/cpdf { };
 
     cppo = callPackage ../development/tools/ocaml/cppo { };

From 60c7bd1237696bfb1db3e191be427a51aaf7909f Mon Sep 17 00:00:00 2001
From: Allan Espinosa <allan.espinosa@outlook.com>
Date: Wed, 17 Feb 2016 00:37:55 -0600
Subject: [PATCH 1496/2285] jenkins: 1.643 -> 1.647

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index e18d2dd4b475..1427e25fb939 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "1.643";
+  version = "1.647";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "b8c6387e56d04a0a4a7ec8d9dacd379fbd5d4001d01fdfcd443f9864809f9293";
+    sha256 = "03r0wic5y8yhpa353s5px7l6m63p7jkb56sh6k4k5dacsc4qcxsj";
   };
   meta = with stdenv.lib; {
     description = "An extendable open source continuous integration server";

From 61f0527694ce4c3395e82ed06c603456ce1fac3f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 17 Feb 2016 21:02:03 +0100
Subject: [PATCH 1497/2285] pythonPackages.cycler: 0.9.0 -> 0.10.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 42eac4716b2b..a8535c8a1f0b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1802,15 +1802,24 @@ in modules // {
 
   cycler = buildPythonPackage rec {
     name = "cycler-${version}";
-    version = "0.9.0";
+    version = "0.10.0";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/C/Cycler/${name}.tar.gz";
-      sha256 = "96dc4ddf27ef62c09990c6196ac1167685e89168042ec0ae4db586de023355bc";
+      sha256 = "cd7b2d1018258d7247a71425e9f26463dfb444d411c39569972f4ce586b0c9d8";
     };
 
+    buildInputs = with self; [ coverage nose ];
     propagatedBuildInputs = with self; [ six ];
 
+    checkPhase = ''
+      ${python.interpreter} run_tests.py
+    '';
+
+    # Tests were not included in release.
+    # https://github.com/matplotlib/cycler/issues/31
+    doCheck = false;
+
     meta = {
       description = "Composable style cycles";
       homepage = http://github.com/matplotlib/cycler;

From ddec19c82301e86f94ee2c33dd066e4a1e44b254 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 17 Feb 2016 21:02:15 +0100
Subject: [PATCH 1498/2285] pythonPackages.matplotlib: 1.5.0 -> 1.5.1

---
 .../python-modules/matplotlib/default.nix           | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index 152330beac5a..1ebba52ff6f4 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -12,11 +12,11 @@ assert enableGtk2 -> pygtk != null;
 
 buildPythonPackage rec {
   name = "matplotlib-${version}";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchurl {
     url = "https://pypi.python.org/packages/source/m/matplotlib/${name}.tar.gz";
-    sha256 = "67b08b1650a00a6317d94b76a30a47320087e5244920604c5462188cba0c2646";
+    sha256 = "3ab8d968eac602145642d0db63dd8d67c85e9a5444ce0e2ecb2a8fedc7224d40";
   };
 
   NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
@@ -37,6 +37,14 @@ buildPythonPackage rec {
 
   patches = stdenv.lib.optionals stdenv.isDarwin [ ./darwin-stdenv.patch ];
 
+  checkPhase = ''
+    ${python.interpreter} tests.py
+  '';
+
+  # The entry point for running tests, tests.py, is not included in the release.
+  # https://github.com/matplotlib/matplotlib/issues/6017
+  doCheck = false;
+
   prePatch = ''
     # Failing test: ERROR: matplotlib.tests.test_style.test_use_url
     sed -i 's/test_use_url/fails/' lib/matplotlib/tests/test_style.py
@@ -52,4 +60,5 @@ buildPythonPackage rec {
     maintainers = with maintainers; [ lovek323 ];
     platforms   = platforms.unix;
   };
+
 }

From 7bdcfb33f4cb21021833d5a0adbf02b3099bc37c Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 17 Feb 2016 20:22:56 +0100
Subject: [PATCH 1499/2285] nixos: Provide a defaultText for type = package

We don't want to build all those things along with the manual, so that's
what the defaultText attribute is for.

Unfortunately a few of them were missing, so let's add them.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/modules/services/computing/slurm/slurm.nix             | 1 +
 nixos/modules/services/misc/matrix-synapse.nix               | 1 +
 nixos/modules/services/misc/plex.nix                         | 1 +
 nixos/modules/services/networking/consul.nix                 | 1 +
 nixos/modules/services/networking/ejabberd.nix               | 1 +
 nixos/modules/services/security/haka.nix                     | 1 +
 nixos/modules/services/web-servers/apache-httpd/owncloud.nix | 1 +
 7 files changed, 7 insertions(+)

diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index cf00d8946557..ad8836f40094 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -37,6 +37,7 @@ in
       package = mkOption {
         type = types.package;
         default = pkgs.slurm-llnl;
+        defaultText = "pkgs.slurm-llnl";
         example = literalExample "pkgs.slurm-llnl-full";
         description = ''
           The packge to use for slurm binaries.
diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix
index 27c5a38e6b88..0ae0516769c0 100644
--- a/nixos/modules/services/misc/matrix-synapse.nix
+++ b/nixos/modules/services/misc/matrix-synapse.nix
@@ -61,6 +61,7 @@ in {
       package = mkOption {
         type = types.package;
         default = pkgs.matrix-synapse;
+        defaultText = "pkgs.matrix-synapse";
         description = ''
           Overridable attribute of the matrix synapse server package to use.
         '';
diff --git a/nixos/modules/services/misc/plex.nix b/nixos/modules/services/misc/plex.nix
index fb62351365ed..875771dfa37f 100644
--- a/nixos/modules/services/misc/plex.nix
+++ b/nixos/modules/services/misc/plex.nix
@@ -58,6 +58,7 @@ in
       package = mkOption {
         type = types.package;
         default = pkgs.plex;
+        defaultText = "pkgs.plex";
         description = ''
           The Plex package to use. Plex subscribers may wish to use their own
           package here, pointing to subscriber-only server versions.
diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix
index 58dad56014b0..2aa101f980da 100644
--- a/nixos/modules/services/networking/consul.nix
+++ b/nixos/modules/services/networking/consul.nix
@@ -33,6 +33,7 @@ in
       package = mkOption {
         type = types.package;
         default = pkgs.consul;
+        defaultText = "pkgs.consul";
         description = ''
           The package used for the Consul agent and CLI.
         '';
diff --git a/nixos/modules/services/networking/ejabberd.nix b/nixos/modules/services/networking/ejabberd.nix
index 7af11f37a43c..8ffce23a4b10 100644
--- a/nixos/modules/services/networking/ejabberd.nix
+++ b/nixos/modules/services/networking/ejabberd.nix
@@ -32,6 +32,7 @@ in {
       package = mkOption {
         type = types.package;
         default = pkgs.ejabberd;
+        defaultText = "pkgs.ejabberd";
         description = "ejabberd server package to use";
       };
 
diff --git a/nixos/modules/services/security/haka.nix b/nixos/modules/services/security/haka.nix
index 4f2bdd29cc49..f48a79b1f7f1 100644
--- a/nixos/modules/services/security/haka.nix
+++ b/nixos/modules/services/security/haka.nix
@@ -59,6 +59,7 @@ in
 
       package = mkOption {
         default = pkgs.haka;
+        defaultText = "pkgs.haka";
         type = types.package;
         description = "
           Which Haka derivation to use.
diff --git a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
index 9994de0f9b40..a9ec20ae8471 100644
--- a/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/owncloud.nix
@@ -370,6 +370,7 @@ rec {
     package = mkOption {
       type = types.package;
       default = pkgs.owncloud70;
+      defaultText = "pkgs.owncloud70";
       example = literalExample "pkgs.owncloud70";
       description = ''
           PostgreSQL package to use.

From 98faa0c8f3d22ad168b979edb7f92212ab710369 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 17 Feb 2016 20:24:22 +0100
Subject: [PATCH 1500/2285] lib/types: Set name of types.package to "package"

Nobody seems to have noticed this (except @Profpatsch) that options with
a "package" type do not get included in the manual.

So debugging this was a bit more involving because while generating the
manual there is an optionList' attribute built from the collected
attributes of all the option declarations.

Up to that point everything is fine except if it comes to
builtins.toXML, where attributes with { type = "derivation" } won't get
included, for example see here:

nix-repl> builtins.toXML { type = "derivation"; foo = "bar"; }
"<?xml version='1.0' encoding='utf-8'?>\n<expr>\n  <derivation>
 <repeated />\n  </derivation>\n</expr>\n"

nix-repl> builtins.toXML { type = "somethingelse"; foo = "bar"; }
"<?xml version='1.0' encoding='utf-8'?>\n<expr>\n  <attrs>
     <attr name=\"foo\">\n      <string value=\"bar\" />\n    </attr>
     <attr name=\"type\">\n      <string value=\"somethingelse\" />
     </attr>\n </attrs>\n</expr>\n"

The following function in libexpr/eval.cc (Nix) is responsible for toXML
dropping the attributes:

bool EvalState::isDerivation(Value & v)
{
    if (v.type != tAttrs) return false;
    Bindings::iterator i = v.attrs->find(sType);
    if (i == v.attrs->end()) return false;
    forceValue(*i->value);
    if (i->value->type != tString) return false;
    return strcmp(i->value->string.s, "derivation") == 0;
}

So I've renamed this now to "package" which is not only more consistent
with the option type but also shouldn't cause similar issues anymore.

Tested this on base of b60ceea, because building the dependencies on
recent libc/staging changes on master took too long.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: Profpatsch <mail@profpatsch.de>
---
 lib/types.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/types.nix b/lib/types.nix
index b833417e73d4..b4d29ac84d28 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -93,7 +93,7 @@ rec {
 
     # derivation is a reserved keyword.
     package = mkOptionType {
-      name = "derivation";
+      name = "package";
       check = x: isDerivation x || isStorePath x;
       merge = loc: defs:
         let res = mergeOneOption loc defs;

From a6c09bf4b4605d765841bc2fe2d46bf90646f28f Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tomas.hlavaty@knowledgetools.de>
Date: Wed, 17 Feb 2016 22:02:17 +0100
Subject: [PATCH 1501/2285] msitools: init at 0.94

I'm leaving authorship to the one who created most of the expression.
---
 .../tools/misc/msitools/default.nix           | 21 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 23 insertions(+)
 create mode 100644 pkgs/development/tools/misc/msitools/default.nix

diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix
new file mode 100644
index 000000000000..bdc7f4f04148
--- /dev/null
+++ b/pkgs/development/tools/misc/msitools/default.nix
@@ -0,0 +1,21 @@
+{stdenv, fetchurl, intltool, glib, pkgconfig, libgsf, libuuid, gcab, bzip2}:
+
+stdenv.mkDerivation rec {
+  version = "0.94";
+  name = "msitools-${version}";
+
+  src = fetchurl {
+    url = "http://ftp.gnome.org/pub/GNOME/sources/msitools/0.94/${name}.tar.xz";
+    sha256 = "0bndnm3mgcqkw5dhwy5l1zri4lqvjbhbn5rxz651fkxlkhab8bhm";
+  };
+
+  buildInputs = [intltool glib pkgconfig libgsf libuuid gcab bzip2];
+
+  meta = with stdenv.lib; {
+    description = "Set of programs to inspect and build Windows Installer (.MSI) files";
+    homepage = https://wiki.gnome.org/msitools;
+    license = [licenses.gpl2 licenses.lgpl21];
+    maintainer = [maintainers.vcunat];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 605d39b6ac9f..c8bbccaf53cb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5988,6 +5988,8 @@ let
 
   mk = callPackage ../development/tools/build-managers/mk { };
 
+  msitools = callPackage ../development/tools/misc/msitools { };
+
   multi-ghc-travis = callPackage ../development/tools/haskell/multi-ghc-travis { };
 
   neoload = callPackage ../development/tools/neoload {

From 81fe3eb13f3457d1db41ef5ff6adfb0e7ff648af Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 17 Feb 2016 22:16:19 +0100
Subject: [PATCH 1502/2285] pythonPackages.numexpr: 2.4.6 -> 2.5

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7ece0b5ca438..de994801b87b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12538,16 +12538,16 @@ in modules // {
   };
 
   numexpr = buildPythonPackage rec {
-    version = "2.4.6";
+    version = "2.5";
     name = "numexpr-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/n/numexpr/${name}.tar.gz";
-      sha256 = "052397670dc56d7845ff894cd7d858e4f115491ecd93bcc0eda5cb83990c5da3";
+      sha256 = "319cdf4e402177a1c8ed4972cffd09f523446f186d347b7c1974787cdabf0294";
     };
 
     # Tests fail with python 3. https://github.com/pydata/numexpr/issues/177
-    doCheck = !isPy3k;
+    # doCheck = !isPy3k;
 
     propagatedBuildInputs = with self; [ numpy ];
 

From 2abb0ddb53f813256e5b3a3dfef0b1745b240817 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Wed, 17 Feb 2016 14:38:46 -0800
Subject: [PATCH 1503/2285] plex: plexpass 0.9.5.3.1674 -> 0.9.15.4.1679

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

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 03f6fb63c729..d1c77045c8a9 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -5,9 +5,9 @@
 
 let
   plexpkg = if enablePlexPass then {
-    version = "0.9.15.3.1674";
-    vsnHash = "f46e7e6";
-    sha256 = "086njnjcmknmbn90mmvf60ls7q73g2m955yk621jjdngs4ybvm19";
+    version = "0.9.15.4.1679";
+    vsnHash = "e4df231";
+    sha256 = "1l6kw5dkqam1fyihp02p4slxq3yy232dqp0m5dcg1vi146s911dh";
   } else {
     version = "0.9.15.2.1663";
     vsnHash = "7efd046";

From 454be2f4d74b711a04c7dd46e879992611cd2b0e Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Wed, 17 Feb 2016 14:47:55 -0800
Subject: [PATCH 1504/2285] plex: 0.9.15.3.1663 -> 0.9.15.3.1674

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

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index d1c77045c8a9..29a1b2d47da1 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -9,9 +9,9 @@ let
     vsnHash = "e4df231";
     sha256 = "1l6kw5dkqam1fyihp02p4slxq3yy232dqp0m5dcg1vi146s911dh";
   } else {
-    version = "0.9.15.2.1663";
-    vsnHash = "7efd046";
-    sha256 = "1kzr826khn0n69mr2kbr5hxcb56mj12fryhwr95r3132gj02aqph";
+    version = "0.9.15.3.1674";
+    vsnHash = "f46e7e6";
+    sha256 = "086njnjcmknmbn90mmvf60ls7q73g2m955yk621jjdngs4ybvm19";
   };
 
 in stdenv.mkDerivation rec {

From dc8213fa4dd95d364ac69bd663a625b9a0ae701f Mon Sep 17 00:00:00 2001
From: Svend Sorensen <svend@ciffer.net>
Date: Fri, 12 Feb 2016 15:12:14 -0800
Subject: [PATCH 1505/2285] ansible2: v2.0.0_0.6.rc1 -> v2.0.0.2

---
 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 de994801b87b..e555d919e407 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -684,12 +684,12 @@ in modules // {
   };
 
   ansible2 = buildPythonPackage rec {
-    version    = "v2.0.0_0.6.rc1";
+    version    = "v2.0.0.2";
     name       = "ansible-${version}";
 
     src = pkgs.fetchurl {
-      url    = "http://releases.ansible.com/ansible/ansible-2.0.0-0.6.rc1.tar.gz";
-      sha256 = "0v7fqi7qg9lzvpsjlaw9rzas8n1cdsyp3y9jrqzjxs9nbknwcibd";
+      url    = "http://releases.ansible.com/ansible/ansible-2.0.0.2.tar.gz";
+      sha256 = "0a2qgshbpbg2c8rz36jcc5f7zam0j1viqdhc8fqqbarz26chpnr7";
     };
 
     prePatch = ''

From 028f553d43f97be574848cdc5d957fdd98e41b6d Mon Sep 17 00:00:00 2001
From: Svend Sorensen <svend@ciffer.net>
Date: Fri, 12 Feb 2016 15:13:34 -0800
Subject: [PATCH 1506/2285] jenkins-job-builder: 1.3.0 -> 1.4.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index de994801b87b..18219c5f37ab 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -24506,12 +24506,12 @@ in modules // {
   };
 
   jenkins-job-builder = buildPythonPackage rec {
-    name = "jenkins-job-builder-1.3.0";
+    name = "jenkins-job-builder-1.4.0";
     disabled = ! (isPy26 || isPy27);
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/j/jenkins-job-builder/${name}.tar.gz";
-      sha256 = "111vpf6hzzb2mcdqi0a9r1dkf28ln9w6sgfqri0qxwf1ffbdqx6x";
+      sha256 = "10zipq3dyyfhwvrcyk70zky07b0fssiahwig2h8daw977aszsfqb";
     };
 
     patchPhase = ''

From d756ff93544b2221c3b52199092421cba4bd396d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 17 Feb 2016 16:29:42 +0100
Subject: [PATCH 1507/2285] linux: 3.18.26 -> 3.18.27

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix
index 9b90ea3556b1..a8c86d0e6188 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.18.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.18.26";
+  version = "3.18.27";
   extraMeta.branch = "3.18";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0bhf8x1h5crc9kimprjs7q74p86gsqsdr8nz54nv33c6zmryqsic";
+    sha256 = "01lz0c3ns0yp5vnjch1pn10h43g6fr4xw7w3b6kb477083cjr7dc";
   };
 
   kernelPatches = args.kernelPatches;

From 6cdf5fe85fc0e6dd1dc9789993fc59962270374a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 17 Feb 2016 16:30:13 +0100
Subject: [PATCH 1508/2285] linux: 4.1.17 -> 4.1.18

---
 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 fbcfa17a8bc7..f2286895f079 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.17";
+  version = "4.1.18";
   extraMeta.branch = "4.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "084ij19vgm27ljrjabqqmlqn27p168nsm9grhr6rajid4n79h6ab";
+    sha256 = "1n838dg058knmx4n5mfqxh2ai9d3x6w9zs1apkwzm89rpisc1ijb";
   };
 
   kernelPatches = args.kernelPatches;

From eff9726d54ee42b4a58d5c076fe4a5845844ecef Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 17 Feb 2016 16:30:29 +0100
Subject: [PATCH 1509/2285] linux: 4.3.4 -> 4.3.5

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.3.nix b/pkgs/os-specific/linux/kernel/linux-4.3.nix
index c8a994ba0b30..20573ee5cebe 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.3.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.3.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.3.4";
+  version = "4.3.5";
 
   extraMeta.branch = "4.3";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0vcsvnpxkpxiidlbw3cy1kl02hfml2jy3cbrvwj2nc4a9y5fb3hj";
+    sha256 = "0g656q51nzb61n0kb2k8br9shvz51yh8kyrsblbjmhi4dbcpizr8";
   };
 
   features.iwlwifi = true;

From ed979124cad7596de539188e86664b3784c363ca Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 15 Feb 2016 03:34:49 +0100
Subject: [PATCH 1510/2285] collectd service: Add option package

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

diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix
index 717c2c481683..414831ae9d41 100644
--- a/nixos/modules/services/monitoring/collectd.nix
+++ b/nixos/modules/services/monitoring/collectd.nix
@@ -34,6 +34,14 @@ in {
       type = bool;
     };
 
+    package = mkOption {
+      default = pkgs.collectd;
+      description = ''
+        Which collectd package to use.
+      '';
+      type = package;
+    };
+
     user = mkOption {
       default = "collectd";
       description = ''

From de5a233a71213101ccb3e06bad6a33d088f9e7f9 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 31 Jan 2016 14:31:58 +0100
Subject: [PATCH 1511/2285] firmware-linux-nonfree: 2015-12-04 -> 2016-01-26

---
 .../linux/firmware/firmware-linux-nonfree/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
index 61ea6c0c18cd..98bf27d3c4a2 100644
--- a/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
+++ b/pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   name = "firmware-linux-nonfree-${version}";
-  version = "2015-12-04";
+  version = "2016-01-26";
 
   # This repo is built by merging the latest versions of
   # http://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/
@@ -14,8 +14,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "wkennington";
     repo = "linux-firmware";
-    rev = "bbe4917c054eb0a73e250c6363341e3bf6725839";
-    sha256 = "1p9c74p8j8zmddljaan5i29h8wsbz8911dv2sykpnahg9r939ykd";
+    rev = "0922e78fc8431c2cc6585eb66e5b75f566644ac8";
+    sha256 = "07hv4kgbsxndhm1va6k6scy083886aap3naq1l4jdz7dnph4ir02";
   };
 
   preInstall = ''

From de787adb90ce7dacab74c8f25cd8babe8f85149f Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Thu, 18 Feb 2016 05:29:12 +0100
Subject: [PATCH 1512/2285] tlsdated: add missing default value for
 extraOptions

---
 nixos/modules/services/networking/tlsdated.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/tlsdated.nix b/nixos/modules/services/networking/tlsdated.nix
index ff7d0178a81a..757cce287607 100644
--- a/nixos/modules/services/networking/tlsdated.nix
+++ b/nixos/modules/services/networking/tlsdated.nix
@@ -26,6 +26,7 @@ in
 
       extraOptions = mkOption {
         type = types.string;
+        default = "";
         description = ''
           Additional command line arguments to pass to tlsdated.
         '';

From bdf89087d9aa0fb318ecaa25b76a36cda5d98584 Mon Sep 17 00:00:00 2001
From: Alexey Shmalko <rasen.dubi@gmail.com>
Date: Thu, 18 Feb 2016 07:21:04 +0200
Subject: [PATCH 1513/2285] gdb: add multitarget option

Multitarget option builds gdb with support for all targets. That's
similar to gdb-multiarch package in Ubuntu or gdb with multitarget
USE-flag in Gentoo.
---
 pkgs/development/tools/misc/gdb/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix
index 547f7a81ab6c..cdef2ee58ca9 100644
--- a/pkgs/development/tools/misc/gdb/default.nix
+++ b/pkgs/development/tools/misc/gdb/default.nix
@@ -3,6 +3,8 @@
 , python ? null
 , guile ? null
 , target ? null
+# Support all known targets in one gdb binary.
+, multitarget ? false
 # Additional dependencies for GNU/Hurd.
 , mig ? null, hurd ? null
 
@@ -47,6 +49,7 @@ stdenv.mkDerivation rec {
       "--with-separate-debug-dir=/run/current-system/sw/lib/debug"
     ]
     ++ optional (target != null) "--target=${target.config}"
+    ++ optional multitarget "--enable-targets=all"
     ++ optional (elem stdenv.system platforms.cygwin) "--without-python";
 
   crossAttrs = {
@@ -54,7 +57,9 @@ stdenv.mkDerivation rec {
     configureFlags = with stdenv.lib;
       [ "--with-gmp=${gmp.crossDrv}" "--with-mpfr=${mpfr.crossDrv}" "--with-system-readline"
         "--with-system-zlib" "--with-expat" "--with-libexpat-prefix=${expat.crossDrv}" "--without-python"
-      ] ++ optional (target != null) "--target=${target.config}";
+      ]
+      ++ optional (target != null) "--target=${target.config}"
+      ++ optional multitarget "--enable-targets=all";
   };
 
   postInstall =

From bbce88302a98338f014e7978e128f438dec3cc2d Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Wed, 17 Feb 2016 22:07:32 -0500
Subject: [PATCH 1514/2285] ghcjs: fix building with cabal-install-1.22.8.0

---
 pkgs/development/compilers/ghcjs/default.nix  |   9 +-
 .../compilers/ghcjs/ghcjs-boot.nix            |  42 ++-
 .../haskell-modules/configuration-ghcjs.nix   |  44 +--
 .../haskell-modules/generic-builder.nix       |  16 +-
 .../haskell-modules/ghcjs/gen-stage2.rb       |  43 +++
 .../haskell-modules/ghcjs/stage2.nix          | 344 ++++++++++++++++++
 6 files changed, 466 insertions(+), 32 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/ghcjs/gen-stage2.rb
 create mode 100644 pkgs/development/haskell-modules/ghcjs/stage2.nix

diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 5ddfdc419179..81a8c90b53a7 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -23,6 +23,7 @@
 , ghc, gmp
 , jailbreak-cabal
 
+, runCommand
 , nodejs, stdenv, filepath, HTTP, HUnit, mtl, network, QuickCheck, random, stm
 , time
 , zlib, aeson, attoparsec, bzlib, hashable
@@ -37,7 +38,7 @@
 , coreutils
 , libiconv
 
-, ghcjsBoot ? import ./ghcjs-boot.nix { inherit fetchgit; }
+, ghcjsBoot ? import ./ghcjs-boot.nix { inherit fetchgit runCommand; }
 , shims ? import ./shims.nix { inherit fetchFromGitHub; }
 }:
 let version = "0.2.0"; in
@@ -100,10 +101,14 @@ mkDerivation (rec {
       sed -i -e 's@ \(a\|b\)/boot/[^/]\+@ \1@g' $patch
     done
   '';
+  # We build with --quick so we can build stage 2 packages separately.
+  # This is necessary due to: https://github.com/haskell/cabal/commit/af19fb2c2d231d8deff1cb24164a2bf7efb8905a
+  # Cabal otherwise fails to build: http://hydra.nixos.org/build/31824079/nixlog/1/raw
   postInstall = ''
     PATH=$out/bin:$PATH LD_LIBRARY_PATH=${gmp}/lib:${stdenv.cc}/lib64:$LD_LIBRARY_PATH \
       env -u GHC_PACKAGE_PATH $out/bin/ghcjs-boot \
         --dev \
+        --quick \
         --with-cabal ${cabal-install}/bin/cabal \
         --with-gmp-includes ${gmp}/include \
         --with-gmp-libraries ${gmp}/lib
@@ -111,7 +116,7 @@ mkDerivation (rec {
   passthru = {
     isGhcjs = true;
     nativeGhc = ghc;
-    inherit nodejs;
+    inherit nodejs ghcjsBoot;
   };
 
   homepage = "https://github.com/ghcjs/ghcjs";
diff --git a/pkgs/development/compilers/ghcjs/ghcjs-boot.nix b/pkgs/development/compilers/ghcjs/ghcjs-boot.nix
index cbf21cb8f5bc..add39a35242b 100644
--- a/pkgs/development/compilers/ghcjs/ghcjs-boot.nix
+++ b/pkgs/development/compilers/ghcjs/ghcjs-boot.nix
@@ -1,7 +1,35 @@
-{ fetchgit }:
-fetchgit {
-  url = git://github.com/ghcjs/ghcjs-boot.git;
-  rev = "97dea5c4145bf80a1e7cffeb1ecd4d0ecacd5a2f";
-  sha256 = "1cgjzm595l2dx6fibzbkyv23bp1857qia0hb9d8aghf006al558j";
-  fetchSubmodules = true;
-}
+{ runCommand, fetchgit }:
+
+let
+  src = fetchgit {
+    url = git://github.com/ghcjs/ghcjs-boot.git;
+    rev = "97dea5c4145bf80a1e7cffeb1ecd4d0ecacd5a2f";
+    sha256 = "1cgjzm595l2dx6fibzbkyv23bp1857qia0hb9d8aghf006al558j";
+    fetchSubmodules = true;
+  };
+
+in
+
+# we remove the patches so ghcjs-boot doesn't try to apply them again.
+runCommand "${src.name}-patched" {} ''
+  cp -r ${src} $out
+  chmod -R +w $out
+
+  # Make the patches be relative their corresponding package's directory.
+  # See: https://github.com/ghcjs/ghcjs-boot/pull/12
+  for patch in $out/patches/*.patch; do
+    echo ">> fixing patch: $patch"
+    sed -i -e 's@ \(a\|b\)/boot/[^/]\+@ \1@g' $patch
+  done
+
+  for package in $(cd $out/boot; echo *); do
+    patch=$out/patches/$package.patch
+    if [[ -e $patch ]]; then
+      echo ">> patching package: $package"
+      pushd $out/boot/$package
+      patch -p1 < $patch
+      rm $patch
+      popd
+    fi
+  done
+''
diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index dd51b99bf930..dfdad72cd3d8 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -7,54 +7,56 @@ in
 
 with import ./lib.nix { inherit pkgs; };
 
-self: super: {
+self: super:
+  # The stage 2 packages. Regenerate with ./ghcjs/gen-stage2.rb
+  let stage2 =
+    (import ./ghcjs/stage2.nix {
+       inherit (self) callPackage;
+       inherit (self.ghc) ghcjsBoot;
+    }); in stage2 // {
+
+  old-time = overrideCabal stage2.old-time (drv: {
+    postPatch = ''
+      ${pkgs.autoconf}/bin/autoreconf --install --force --verbose
+    '';
+  });
+
+  mkDerivation = drv: super.mkDerivation (drv // {
+    # Need Cabal lib to be available.
+    libraryHaskellDepends = drv.libraryHaskellDepends
+      # Be careful not to end up in infinite recursion!
+      ++ pkgs.lib.optional (!(builtins.elem drv.pname ["Cabal" "hscolour"])) self.Cabal;
+  });
 
   # LLVM is not supported on this GHC; use the latest one.
   inherit (pkgs) llvmPackages;
 
   inherit (pkgs.haskell.packages.ghc7103) jailbreak-cabal alex happy gtk2hs-buildtools rehoo hoogle;
 
-  # This is the list of packages that are built into a booted ghcjs installation
+  # This is the list of the Stage 1 packages that are built into a booted ghcjs installation
   # It can be generated with the command:
   # nix-shell -p haskell.packages.ghcjs.ghc --command "ghcjs-pkg list | sed -n 's/^    \(.*\)-\([0-9.]*\)$/\1_\2/ p' | sed 's/\./_/g' | sed 's/-\(.\)/\U\1/' | sed 's/^\([^_]*\)\(.*\)$/\1 = null;/'"
-  Cabal = null;
-  aeson = null;
   array = null;
-  async = null;
-  attoparsec = null;
   base = null;
   binary = null;
   rts = null;
   bytestring = null;
-  case-insensitive = null;
   containers = null;
   deepseq = null;
   directory = null;
-  dlist = null;
-  extensible-exceptions = null;
   filepath = null;
   ghc-prim = null;
-  ghcjs-base = null;
   ghcjs-prim = null;
-  hashable = null;
   integer-gmp = null;
-  mtl = null;
   old-locale = null;
-  old-time = null;
-  parallel = null;
   pretty = null;
   primitive = null;
   process = null;
-  scientific = null;
-  stm = null;
-  syb = null;
   template-haskell = null;
-  text = null;
   time = null;
   transformers = null;
   unix = null;
-  unordered-containers = null;
-  vector = null;
+  integer-simple = null;
 
   # These packages are core libraries in GHC 7.10.x, but not here.
   bin-package-db = null;
@@ -105,7 +107,7 @@ self: super: {
      }) {};
 
   ghcjs-dom = overrideCabal super.ghcjs-dom (drv: {
-    libraryHaskellDepends =
+    libraryHaskellDepends = [ self.ghcjs-base ] ++
       removeLibraryHaskellDepends [
         "glib" "gtk" "gtk3" "webkitgtk" "webkitgtk3"
       ] drv.libraryHaskellDepends;
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index e3847528ad00..d05980192831 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -36,6 +36,7 @@
 , testDepends ? [], testHaskellDepends ? [], testSystemDepends ? []
 , testTarget ? ""
 , broken ? false
+, preCompileBuildDriver ? "", postCompileBuildDriver ? ""
 , preUnpack ? "", postUnpack ? ""
 , patches ? [], patchPhase ? "", prePatch ? "", postPatch ? ""
 , preConfigure ? "", postConfigure ? ""
@@ -56,6 +57,7 @@ let
                        concatStringsSep enableFeature optionalAttrs toUpper;
 
   isGhcjs = ghc.isGhcjs or false;
+  nativeGhc = if isGhcjs then ghc.nativeGhc else ghc;
 
   newCabalFileUrl = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal";
   newCabalFile = fetchurl {
@@ -123,7 +125,15 @@ let
 
   ghcEnv = ghc.withPackages (p: haskellBuildInputs);
 
-  setupCommand = if isGhcjs then "${ghc.nodejs}/bin/node ./Setup.jsexe/all.js" else "./Setup";
+  setupBuilder = if isGhcjs
+                 then (if !(builtins.elem pname ["Cabal" "hscolour"])
+                       then ghcCommand
+                       else "${nativeGhc}/bin/ghc")
+                 else ghcCommand;
+
+  setupCommand = if isGhcjs && !(builtins.elem pname ["Cabal" "hscolour"])
+                 then "${ghc.nodejs}/bin/node ./Setup.jsexe/all.js"
+                 else "./Setup";
   ghcCommand = if isGhcjs then "ghcjs" else "ghc";
   ghcCommandCaps = toUpper ghcCommand;
 
@@ -199,7 +209,7 @@ stdenv.mkDerivation ({
     done
 
     echo setupCompileFlags: $setupCompileFlags
-    ${ghcCommand} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i
+    ${setupBuilder} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i
 
     runHook postCompileBuildDriver
   '';
@@ -295,6 +305,8 @@ stdenv.mkDerivation ({
          ;
 
 }
+// optionalAttrs (preCompileBuildDriver != "")  { inherit preCompileBuildDriver; }
+// optionalAttrs (postCompileBuildDriver != "") { inherit postCompileBuildDriver; }
 // optionalAttrs (preUnpack != "")      { inherit preUnpack; }
 // optionalAttrs (postUnpack != "")     { inherit postUnpack; }
 // optionalAttrs (configureFlags != []) { inherit configureFlags; }
diff --git a/pkgs/development/haskell-modules/ghcjs/gen-stage2.rb b/pkgs/development/haskell-modules/ghcjs/gen-stage2.rb
new file mode 100644
index 000000000000..260e2ee2f12c
--- /dev/null
+++ b/pkgs/development/haskell-modules/ghcjs/gen-stage2.rb
@@ -0,0 +1,43 @@
+#!/usr/bin/env ruby
+
+require 'pathname'
+
+# from boot.yaml in ghcjs/ghcjs
+stage2_packages = [
+  "boot/async",
+  "boot/aeson",
+  "boot/attoparsec",
+  "boot/case-insensitive",
+  "boot/dlist",
+  "boot/extensible-exceptions",
+  "boot/hashable",
+  "boot/mtl",
+  "boot/old-time",
+  "boot/parallel",
+  "boot/scientific",
+  "boot/stm",
+  "boot/syb",
+  "boot/text",
+  "boot/unordered-containers",
+  "boot/vector",
+  "ghcjs/ghcjs-base",
+  # not listed under stage2, but needed when "quick booting".
+  "boot/cabal/Cabal"
+]
+
+nixpkgs = File.expand_path("../../../../..", __FILE__)
+boot = `nix-build #{nixpkgs} -A haskell.packages.ghcjs.ghc.ghcjsBoot`.chomp
+
+stage2_packages.each do |package|
+  name = Pathname.new(package).basename
+  nix = `cabal2nix file://#{boot}/#{package}  --jailbreak`
+  nix.sub!(/src =.*?$/, "src = \"${ghcjsBoot}/#{package}\";")
+  nix.sub!("libraryHaskellDepends", "doCheck = false;\n  libraryHaskellDepends")
+  nix = nix.split("\n").join("\n    ")
+
+  out = "".dup
+  out << "#{name} = callPackage\n"
+  out << "  (#{nix}) {};"
+
+  puts out
+end
diff --git a/pkgs/development/haskell-modules/ghcjs/stage2.nix b/pkgs/development/haskell-modules/ghcjs/stage2.nix
new file mode 100644
index 000000000000..f840869568c9
--- /dev/null
+++ b/pkgs/development/haskell-modules/ghcjs/stage2.nix
@@ -0,0 +1,344 @@
+{ ghcjsBoot, callPackage }:
+
+{
+  async = callPackage
+    ({ mkDerivation, base, HUnit, stdenv, stm, test-framework
+      , test-framework-hunit
+      }:
+      mkDerivation {
+        pname = "async";
+        version = "2.0.1.6";
+        src = "${ghcjsBoot}/boot/async";
+        doCheck = false;
+        libraryHaskellDepends = [ base stm ];
+        testHaskellDepends = [
+          base HUnit test-framework test-framework-hunit
+        ];
+        jailbreak = true;
+        homepage = "https://github.com/simonmar/async";
+        description = "Run IO operations asynchronously and wait for their results";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  aeson = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
+      , dlist, ghc-prim, hashable, HUnit, mtl, QuickCheck, scientific
+      , stdenv, syb, template-haskell, test-framework
+      , test-framework-hunit, test-framework-quickcheck2, text, time
+      , transformers, unordered-containers, vector
+      }:
+      mkDerivation {
+        pname = "aeson";
+        version = "0.9.0.1";
+        src = "${ghcjsBoot}/boot/aeson";
+        doCheck = false;
+        libraryHaskellDepends = [
+          attoparsec base bytestring containers deepseq dlist ghc-prim
+          hashable mtl scientific syb template-haskell text time transformers
+          unordered-containers vector
+        ];
+        testHaskellDepends = [
+          attoparsec base bytestring containers ghc-prim HUnit QuickCheck
+          template-haskell test-framework test-framework-hunit
+          test-framework-quickcheck2 text time unordered-containers vector
+        ];
+        jailbreak = true;
+        homepage = "https://github.com/bos/aeson";
+        description = "Fast JSON parsing and encoding";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  attoparsec = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, deepseq
+      , QuickCheck, quickcheck-unicode, scientific, stdenv
+      , test-framework, test-framework-quickcheck2, text, transformers
+      , vector
+      }:
+      mkDerivation {
+        pname = "attoparsec";
+        version = "0.13.0.1";
+        src = "${ghcjsBoot}/boot/attoparsec";
+        doCheck = false;
+        libraryHaskellDepends = [
+          array base bytestring containers deepseq scientific text
+          transformers
+        ];
+        testHaskellDepends = [
+          array base bytestring containers deepseq QuickCheck
+          quickcheck-unicode scientific test-framework
+          test-framework-quickcheck2 text transformers vector
+        ];
+        jailbreak = true;
+        homepage = "https://github.com/bos/attoparsec";
+        description = "Fast combinator parsing for bytestrings and text";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  case-insensitive = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, hashable, HUnit, stdenv
+      , test-framework, test-framework-hunit, text
+      }:
+      mkDerivation {
+        pname = "case-insensitive";
+        version = "1.2.0.4";
+        src = "${ghcjsBoot}/boot/case-insensitive";
+        doCheck = false;
+        libraryHaskellDepends = [ base bytestring deepseq hashable text ];
+        testHaskellDepends = [
+          base bytestring HUnit test-framework test-framework-hunit text
+        ];
+        jailbreak = true;
+        homepage = "https://github.com/basvandijk/case-insensitive";
+        description = "Case insensitive string comparison";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  dlist = callPackage
+    ({ mkDerivation, base, Cabal, deepseq, QuickCheck, stdenv }:
+      mkDerivation {
+        pname = "dlist";
+        version = "0.7.1.1";
+        src = "${ghcjsBoot}/boot/dlist";
+        doCheck = false;
+        libraryHaskellDepends = [ base deepseq ];
+        testHaskellDepends = [ base Cabal QuickCheck ];
+        jailbreak = true;
+        homepage = "https://github.com/spl/dlist";
+        description = "Difference lists";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  extensible-exceptions = callPackage
+    ({ mkDerivation, base, stdenv }:
+      mkDerivation {
+        pname = "extensible-exceptions";
+        version = "0.1.1.4";
+        src = "${ghcjsBoot}/boot/extensible-exceptions";
+        doCheck = false;
+        libraryHaskellDepends = [ base ];
+        jailbreak = true;
+        description = "Extensible exceptions";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  hashable = callPackage
+    ({ mkDerivation, base, bytestring, ghc-prim, HUnit, integer-gmp
+      , QuickCheck, random, stdenv, test-framework, test-framework-hunit
+      , test-framework-quickcheck2, text, unix
+      }:
+      mkDerivation {
+        pname = "hashable";
+        version = "1.2.3.2";
+        src = "${ghcjsBoot}/boot/hashable";
+        doCheck = false;
+        libraryHaskellDepends = [
+          base bytestring ghc-prim integer-gmp text
+        ];
+        testHaskellDepends = [
+          base bytestring ghc-prim HUnit QuickCheck random test-framework
+          test-framework-hunit test-framework-quickcheck2 text unix
+        ];
+        jailbreak = true;
+        homepage = "http://github.com/tibbe/hashable";
+        description = "A class for types that can be converted to a hash value";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  mtl = callPackage
+    ({ mkDerivation, base, stdenv, transformers }:
+      mkDerivation {
+        pname = "mtl";
+        version = "2.2.1";
+        src = "${ghcjsBoot}/boot/mtl";
+        doCheck = false;
+        libraryHaskellDepends = [ base transformers ];
+        jailbreak = true;
+        homepage = "http://github.com/ekmett/mtl";
+        description = "Monad classes, using functional dependencies";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  old-time = callPackage
+    ({ mkDerivation, base, old-locale, stdenv }:
+      mkDerivation {
+        pname = "old-time";
+        version = "1.1.0.3";
+        src = "${ghcjsBoot}/boot/old-time";
+        doCheck = false;
+        libraryHaskellDepends = [ base old-locale ];
+        jailbreak = true;
+        description = "Time library";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  parallel = callPackage
+    ({ mkDerivation, array, base, containers, deepseq, stdenv }:
+      mkDerivation {
+        pname = "parallel";
+        version = "3.2.0.6";
+        src = "${ghcjsBoot}/boot/parallel";
+        doCheck = false;
+        libraryHaskellDepends = [ array base containers deepseq ];
+        jailbreak = true;
+        description = "Parallel programming library";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  scientific = callPackage
+    ({ mkDerivation, array, base, bytestring, deepseq, ghc-prim
+      , hashable, integer-gmp, QuickCheck, smallcheck, stdenv, tasty
+      , tasty-ant-xml, tasty-hunit, tasty-quickcheck, tasty-smallcheck
+      , text
+      }:
+      mkDerivation {
+        pname = "scientific";
+        version = "0.3.3.8";
+        src = "${ghcjsBoot}/boot/scientific";
+        doCheck = false;
+        libraryHaskellDepends = [
+          array base bytestring deepseq ghc-prim hashable integer-gmp text
+        ];
+        testHaskellDepends = [
+          base bytestring QuickCheck smallcheck tasty tasty-ant-xml
+          tasty-hunit tasty-quickcheck tasty-smallcheck text
+        ];
+        jailbreak = true;
+        homepage = "https://github.com/basvandijk/scientific";
+        description = "Numbers represented using scientific notation";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  stm = callPackage
+    ({ mkDerivation, array, base, stdenv }:
+      mkDerivation {
+        pname = "stm";
+        version = "2.4.4";
+        src = "${ghcjsBoot}/boot/stm";
+        doCheck = false;
+        libraryHaskellDepends = [ array base ];
+        jailbreak = true;
+        description = "Software Transactional Memory";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  syb = callPackage
+    ({ mkDerivation, base, containers, HUnit, mtl, stdenv }:
+      mkDerivation {
+        pname = "syb";
+        version = "0.5.1";
+        src = "${ghcjsBoot}/boot/syb";
+        doCheck = false;
+        libraryHaskellDepends = [ base ];
+        testHaskellDepends = [ base containers HUnit mtl ];
+        jailbreak = true;
+        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/SYB";
+        description = "Scrap Your Boilerplate";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  text = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, deepseq, directory
+      , ghc-prim, HUnit, integer-simple, QuickCheck, quickcheck-unicode
+      , random, stdenv, test-framework, test-framework-hunit
+      , test-framework-quickcheck2
+      }:
+      mkDerivation {
+        pname = "text";
+        version = "1.2.1.1";
+        src = "${ghcjsBoot}/boot/text";
+        doCheck = false;
+        libraryHaskellDepends = [
+          array base binary bytestring deepseq ghc-prim integer-simple
+        ];
+        testHaskellDepends = [
+          array base binary bytestring deepseq directory ghc-prim HUnit
+          integer-simple QuickCheck quickcheck-unicode random test-framework
+          test-framework-hunit test-framework-quickcheck2
+        ];
+        jailbreak = true;
+        homepage = "https://github.com/bos/text";
+        description = "An efficient packed Unicode text type";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  unordered-containers = callPackage
+    ({ mkDerivation, base, ChasingBottoms, containers, deepseq, hashable
+      , HUnit, QuickCheck, stdenv, test-framework, test-framework-hunit
+      , test-framework-quickcheck2
+      }:
+      mkDerivation {
+        pname = "unordered-containers";
+        version = "0.2.5.1";
+        src = "${ghcjsBoot}/boot/unordered-containers";
+        doCheck = false;
+        libraryHaskellDepends = [ base deepseq hashable ];
+        testHaskellDepends = [
+          base ChasingBottoms containers hashable HUnit QuickCheck
+          test-framework test-framework-hunit test-framework-quickcheck2
+        ];
+        jailbreak = true;
+        homepage = "https://github.com/tibbe/unordered-containers";
+        description = "Efficient hashing-based container types";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  vector = callPackage
+    ({ mkDerivation, base, deepseq, ghc-prim, primitive, QuickCheck
+      , random, stdenv, template-haskell, test-framework
+      , test-framework-quickcheck2, transformers
+      }:
+      mkDerivation {
+        pname = "vector";
+        version = "0.11.0.0";
+        src = "${ghcjsBoot}/boot/vector";
+        doCheck = false;
+        libraryHaskellDepends = [ base deepseq ghc-prim primitive ];
+        testHaskellDepends = [
+          base QuickCheck random template-haskell test-framework
+          test-framework-quickcheck2 transformers
+        ];
+        jailbreak = true;
+        homepage = "https://github.com/haskell/vector";
+        description = "Efficient Arrays";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+  ghcjs-base = callPackage
+    ({ mkDerivation, aeson, array, attoparsec, base, bytestring
+      , containers, deepseq, directory, dlist, ghc-prim, ghcjs-prim
+      , hashable, HUnit, integer-gmp, primitive, QuickCheck
+      , quickcheck-unicode, random, scientific, stdenv, test-framework
+      , test-framework-hunit, test-framework-quickcheck2, text, time
+      , transformers, unordered-containers, vector
+      }:
+      mkDerivation {
+        pname = "ghcjs-base";
+        version = "0.2.0.0";
+        src = "${ghcjsBoot}/ghcjs/ghcjs-base";
+        doCheck = false;
+        libraryHaskellDepends = [
+          aeson attoparsec base bytestring containers deepseq dlist ghc-prim
+          ghcjs-prim hashable integer-gmp primitive scientific text time
+          transformers unordered-containers vector
+        ];
+        testHaskellDepends = [
+          array base bytestring deepseq directory ghc-prim ghcjs-prim HUnit
+          primitive QuickCheck quickcheck-unicode random test-framework
+          test-framework-hunit test-framework-quickcheck2 text
+        ];
+        jailbreak = true;
+        homepage = "http://github.com/ghcjs/ghcjs-base";
+        description = "base library for GHCJS";
+        license = stdenv.lib.licenses.mit;
+      }) {};
+  Cabal = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+      , deepseq, directory, extensible-exceptions, filepath, HUnit
+      , old-time, pretty, process, QuickCheck, regex-posix, stdenv
+      , test-framework, test-framework-hunit, test-framework-quickcheck2
+      , time, unix
+      }:
+      mkDerivation {
+        pname = "Cabal";
+        version = "1.22.4.0";
+        src = "${ghcjsBoot}/boot/cabal/Cabal";
+        doCheck = false;
+        libraryHaskellDepends = [
+          array base binary bytestring containers deepseq directory filepath
+          pretty process time unix
+        ];
+        testHaskellDepends = [
+          base bytestring containers directory extensible-exceptions filepath
+          HUnit old-time process QuickCheck regex-posix test-framework
+          test-framework-hunit test-framework-quickcheck2 unix
+        ];
+        jailbreak = true;
+        homepage = "http://www.haskell.org/cabal/";
+        description = "A framework for packaging Haskell software";
+        license = stdenv.lib.licenses.bsd3;
+      }) {};
+}

From 97d9071b95e25eb2d9840b0f24639e2fb8eab5e0 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Thu, 18 Feb 2016 03:11:42 -0500
Subject: [PATCH 1515/2285] ghcjs: use native ghc to build Setup.hs

---
 pkgs/development/haskell-modules/generic-builder.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index d05980192831..b871b7d73faa 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -125,15 +125,8 @@ let
 
   ghcEnv = ghc.withPackages (p: haskellBuildInputs);
 
-  setupBuilder = if isGhcjs
-                 then (if !(builtins.elem pname ["Cabal" "hscolour"])
-                       then ghcCommand
-                       else "${nativeGhc}/bin/ghc")
-                 else ghcCommand;
-
-  setupCommand = if isGhcjs && !(builtins.elem pname ["Cabal" "hscolour"])
-                 then "${ghc.nodejs}/bin/node ./Setup.jsexe/all.js"
-                 else "./Setup";
+  setupBuilder = if isGhcjs then "${nativeGhc}/bin/ghc" else ghcCommand;
+  setupCommand = "./Setup";
   ghcCommand = if isGhcjs then "ghcjs" else "ghc";
   ghcCommandCaps = toUpper ghcCommand;
 

From 1318ab1246c68a9448ea7dbf00a7f3587f3f557d Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 18 Feb 2016 06:41:40 -0500
Subject: [PATCH 1516/2285] Fix sha256 for alsa-tools.

---
 pkgs/os-specific/linux/alsa-tools/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/alsa-tools/default.nix b/pkgs/os-specific/linux/alsa-tools/default.nix
index 193c919e3b20..f03525304804 100644
--- a/pkgs/os-specific/linux/alsa-tools/default.nix
+++ b/pkgs/os-specific/linux/alsa-tools/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
       "ftp://ftp.alsa-project.org/pub/tools/${name}.tar.bz2"
       "http://alsa.cybermirror.org/tools/${name}.tar.bz2"
     ];
-    sha256 = "3b1c3135b76e14532d3dd23fb15759ddd7daf9ffbc183f7a9a0a3a86374748f1";
+    sha256 = "0ldbaz3qr7z0639xg37ba7cmrb512rrjavap6r5jjl0ab665ad3x";
   };
 
   buildInputs = [ alsaLib pkgconfig gtk gtk3 fltk13 ];

From 799a3f81478b94f11ba25e3ab7666f5599cd4faf Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 18 Feb 2016 04:41:06 +0100
Subject: [PATCH 1517/2285] rmilter: 1.6.7 -> 1.7.3

Fixes #13080.
---
 pkgs/servers/mail/rmilter/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/mail/rmilter/default.nix b/pkgs/servers/mail/rmilter/default.nix
index ad40b57f8a60..c12ca525294c 100644
--- a/pkgs/servers/mail/rmilter/default.nix
+++ b/pkgs/servers/mail/rmilter/default.nix
@@ -2,21 +2,25 @@
 
 stdenv.mkDerivation rec {
   name = "rmilter-${version}";
-  version = "1.6.7";
+  version = "1.7.3";
+
   src = fetchFromGitHub {
     owner = "vstakhov";
     repo = "rmilter";
     rev = version;
-    sha256 = "1syviydlv4m1isl0r52sk4s0a75fyk788j1z3yvfzzf1hga333gn";
+    sha256 = "04xalaxq5xgg5ls0f4ayp8yhzdfq5gqjb8qwfyha3mrx4dqrgh7s";
   };
 
   nativeBuildInputs = [ bison cmake flex ];
-  buildInputs = [ libmilter openssl pcre opendkim];
+  buildInputs = [ libmilter openssl pcre opendkim ];
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/vstakhov/rmilter";
-    license = licenses.bsd2; 
-    description = "server, used to integrate rspamd and milter compatible MTA, for example postfix or sendmail";
-    maintainers = maintainers.avnik;
+    license = licenses.bsd2;
+    description = ''
+      Daemon to integrate rspamd and milter compatible MTA, for example
+      postfix or sendmail
+    '';
+    maintainers = with maintainers; [ avnik fpletz ];
   };
 }

From 30213ffa3bb01b2847077d19930ccea093be0384 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 18 Feb 2016 04:41:24 +0100
Subject: [PATCH 1518/2285] rspamd: git-2016-01-16 -> 1.1.3

---
 pkgs/servers/mail/rspamd/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/mail/rspamd/default.nix b/pkgs/servers/mail/rspamd/default.nix
index 1f9c36b73777..bd4f3db3ab5d 100644
--- a/pkgs/servers/mail/rspamd/default.nix
+++ b/pkgs/servers/mail/rspamd/default.nix
@@ -1,17 +1,18 @@
 { stdenv, fetchFromGitHub, cmake, perl
- ,file , glib, gmime, libevent, luajit, openssl, pcre, pkgconfig, sqlite }:
+, file, glib, gmime, libevent, luajit, openssl, pcre, pkgconfig, sqlite }:
 
 let libmagic = file;  # libmagic provided buy file package ATM
 in
 
 stdenv.mkDerivation rec {
   name = "rspamd-${version}";
-  version = "git-2016-01-16";
+  version = "1.1.3";
+
   src = fetchFromGitHub {
     owner = "vstakhov";
     repo = "rspamd";
-    rev = "04bfc92c1357c0f908ce9371ab303f8bf57657df";
-    sha256 = "1zip1msjjy5q7jcsn4l0yyg92c3wdsf1v5jv1acglrih8dbfl7zj";
+    rev = version;
+    sha256 = "0mvh812a91yqynmcpv159dmkipx72fwg7rgscq7virzphchkbzvj";
   };
 
   nativeBuildInputs = [ cmake pkgconfig perl ];
@@ -31,8 +32,8 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = "https://github.com/vstakhov/rspamd";
-    license = licenses.bsd2; 
+    license = licenses.bsd2;
     description = "advanced spam filtering system";
-    maintainers = maintainers.avnik;
+    maintainers = with maintainers; [ avnik fpletz ];
   };
 }

From aa2e03e6ff1138e168b47a2f155d5d099b050d95 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 25 Jan 2016 06:31:06 -0600
Subject: [PATCH 1519/2285] qt55.qtbase: upstream patch for backing store issue

The included patch from upstream fixes the issue described here:
https://bugreports.qt.io/browse/QTBUG-48321
The backing store of certain widgets was being improperly invalidated,
leading to display bugs in, e.g. VLC.

This patch is included in Qt 5.6, so we should remove it when we
upgrade.
---
 pkgs/development/libraries/qt-5/5.5/qtbase/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
index 24e5ccb36f37..e6927ffb9ca4 100644
--- a/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-5/5.5/qtbase/default.nix
@@ -26,6 +26,12 @@
 let
   inherit (srcs.qt5) version;
   system-x86_64 = lib.elem stdenv.system lib.platforms.x86_64;
+
+  dontInvalidateBacking = fetchurl {
+    url = "https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=patch;h=0f68f8920573cdce1729a285a92ac8582df32841;hp=24c50f8dcf7fa61ac3c3d4d6295c259a104a2b8c";
+    name = "qtbug-48321-dont-invalidate-backing-store.patch";
+    sha256 = "07vnndmvri73psz0nrs2hg0zw2i4b1k1igy2al6kwjbp7d5xpglr";
+  };
 in
 
 stdenv.mkDerivation {
@@ -49,6 +55,10 @@ stdenv.mkDerivation {
 
   postPatch =
     ''
+      cd qtbase
+      patch -p1 <${dontInvalidateBacking}
+      cd ..
+
       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

From e5e633ca11b4145e7610231056f0cfe1157cb18d Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Thu, 18 Feb 2016 09:57:15 -0500
Subject: [PATCH 1520/2285] ant: preserve antRun script

---
 .../tools/build-managers/apache-ant/default.nix          | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/build-managers/apache-ant/default.nix b/pkgs/development/tools/build-managers/apache-ant/default.nix
index b15c9065e0ec..8816a005ca0f 100644
--- a/pkgs/development/tools/build-managers/apache-ant/default.nix
+++ b/pkgs/development/tools/build-managers/apache-ant/default.nix
@@ -23,9 +23,14 @@ stdenv.mkDerivation {
       mv * $out/lib/ant/
 
       # Get rid of the manual (35 MiB).  Maybe we should put this in a
-      # separate output.  Also get rid of the Ant scripts since we
-      # provide our own.
+      # separate output.  Keep the antRun script since it's vanilla sh
+      # and needed for the <exec/> task (but since we set ANT_HOME to
+      # a weird value, we have to move antRun to a weird location).
+      # Get rid of the other Ant scripts since we provide our own.
+      mv $out/lib/ant/bin/antRun $out/bin/
       rm -rf $out/lib/ant/{manual,bin,WHATSNEW}
+      mkdir $out/lib/ant/bin
+      mv $out/bin/antRun $out/lib/ant/bin/
 
       # Install ant-contrib.
       unpackFile $contrib

From 584427c69430268a0c2806805dc8f8392299a4e4 Mon Sep 17 00:00:00 2001
From: Asko Soukka <asko.soukka@iki.fi>
Date: Thu, 18 Feb 2016 18:16:15 +0200
Subject: [PATCH 1521/2285] dockerTools: Fix issue where image name with
 repository prefix was not supported

---
 pkgs/build-support/docker/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 55344aad566f..8e4a51071e33 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -267,7 +267,9 @@ EOF
 
     let
 
-      baseJson = writeText "${name}-config.json" (builtins.toJSON {
+      baseName = baseNameOf name;
+
+      baseJson = writeText "${baseName}-config.json" (builtins.toJSON {
           created = "1970-01-01T00:00:01Z";
           architecture = "amd64";
           os = "linux";
@@ -277,11 +279,11 @@ EOF
       layer = (if runAsRoot == null
                then mkPureLayer { inherit baseJson contents extraCommands; }
                else mkRootLayer { inherit baseJson fromImage fromImageName fromImageTag contents runAsRoot diskSize extraCommands; });
-      depsTarball = mkTarball { name = "${name}-deps";
+      depsTarball = mkTarball { name = "${baseName}-deps";
                                 drv = layer;
                                 onlyDeps = true; };
       
-      result = runCommand "${name}.tar.gz" {
+      result = runCommand "${baseName}.tar.gz" {
         buildInputs = [ jshon ];
 
         imageName = name;

From cb1051880693065e062f7181aa203f5b3c13772b Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 18 Feb 2016 17:02:05 +0000
Subject: [PATCH 1522/2285] dispad: init at 0.3.1

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

diff --git a/pkgs/tools/X11/dispad/default.nix b/pkgs/tools/X11/dispad/default.nix
new file mode 100644
index 000000000000..853feb08002c
--- /dev/null
+++ b/pkgs/tools/X11/dispad/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchFromGitHub, libX11, libXi, confuse }:
+
+stdenv.mkDerivation rec {
+  name = "dispad-${version}";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    owner = "BlueDragonX";
+    repo = "dispad";
+    rev = "v${version}";
+    sha256 = "0y0n9mf1hs3s706gkpmg1lh74m6vvkqc9rdbzgc6s2k7vdl2zp1y";
+  };
+
+  buildInputs = [ libX11 libXi confuse ];
+
+  meta = with stdenv.lib; {
+    description = "A small daemon for disabling trackpads while typing";
+    homepage = https://github.com/BlueDragonX/dispad;
+    license = licenses.gpl2;
+    maintainers = with maintainers; [ zimbatm ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 662905129e51..cf3884856762 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -298,6 +298,8 @@ let
     inherit helperFunctions;
   };
 
+  dispad = callPackage ../tools/X11/dispad { };
+
   scatterOutputHook = makeSetupHook {} ../build-support/setup-hooks/scatter_output.sh;
 
   vsenv = callPackage ../build-support/vsenv {

From 936312879c8a22250947598904f606e6448713a0 Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Wed, 10 Feb 2016 21:39:44 +0100
Subject: [PATCH 1523/2285] spark: 1.4 -> 1.6.

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

diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index 5e284d4387f5..a0abe4f31422 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -6,11 +6,11 @@ with stdenv.lib;
 
 stdenv.mkDerivation rec {
   name    = "spark-${version}";
-  version = "1.5.2";
+  version = "1.6.0";
 
   src = fetchzip {
     url    = "mirror://apache/spark/${name}/${name}-bin-cdh4.tgz";
-    sha256 = "0bgpz3bqj24flrbajzhbkz38fjsd53qmji1kls9izji8vprcjr5v";
+    sha256 = "0waq8xx4bjj1yvfbadv1gdvz8s4kh5zasicv2n5623ld6lj7zgad";
   };
 
   buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ]

From 6326172fed599be1125222ffda1abf5ec271ce34 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Thu, 18 Feb 2016 17:36:36 +0000
Subject: [PATCH 1524/2285] redis: 3.0.6 -> 3.0.7

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

diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index dacbaff1835e..04bb9fc2bbde 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "3.0.6";
+  version = "3.0.7";
   name = "redis-${version}";
 
   src = fetchurl {
     url = "http://download.redis.io/releases/${name}.tar.gz";
-    sha256 = "092nnxjyaf7h9mnwac5rwjl0ikyyqa44vn426w64hn2534iia7kg";
+    sha256 = "08vzfdr67gp3lvk770qpax2c5g2sx8hn6p64jn3jddrvxb2939xj";
   };
 
   makeFlags = "PREFIX=$(out)";

From 7b2ac69adae1927602e336981aa96cdbb53f77e3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 18 Feb 2016 19:04:02 +0100
Subject: [PATCH 1525/2285] aws-sdk-cpp: Allow building some APIS and disabling
 custom memory management

---
 pkgs/development/libraries/aws-sdk-cpp/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/aws-sdk-cpp/default.nix b/pkgs/development/libraries/aws-sdk-cpp/default.nix
index 22fb9facfea9..6a881e4245aa 100644
--- a/pkgs/development/libraries/aws-sdk-cpp/default.nix
+++ b/pkgs/development/libraries/aws-sdk-cpp/default.nix
@@ -1,4 +1,9 @@
-{ lib, stdenv, fetchFromGitHub, cmake, curl }:
+{ lib, stdenv, fetchFromGitHub, cmake, curl
+, # Allow building a limited set of APIs, e.g. ["s3" "ec2"].
+  apis ? ["*"]
+, # Whether to enable AWS' custom memory management.
+  customMemoryManagement ? true
+}:
 
 stdenv.mkDerivation rec {
   name = "aws-sdk-cpp-${version}";
@@ -13,9 +18,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cmake curl ];
 
-  # FIXME: provide flags to build only part of the SDK, or put them in
-  # different outputs.
-  # cmakeFlags = "-DBUILD_ONLY=aws-cpp-sdk-s3";
+  cmakeFlags =
+    lib.optional (!customMemoryManagement) "-DCUSTOM_MEMORY_MANAGEMENT=0"
+    ++ lib.optional (apis != ["*"])
+      "-DBUILD_ONLY=${lib.concatMapStringsSep ";" (api: "aws-cpp-sdk-" + api) apis}";
 
   enableParallelBuilding = true;
 

From b2b15113530964fc3c8bef23b41bfb8eabf3a112 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 18 Feb 2016 20:28:08 +0100
Subject: [PATCH 1526/2285] nixos/collectd: add defaultText to package option

CC @fpletz
---
 nixos/modules/services/monitoring/collectd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix
index 414831ae9d41..a3280b08bd0c 100644
--- a/nixos/modules/services/monitoring/collectd.nix
+++ b/nixos/modules/services/monitoring/collectd.nix
@@ -36,6 +36,7 @@ in {
 
     package = mkOption {
       default = pkgs.collectd;
+      defaultText = "pkgs.collectd";
       description = ''
         Which collectd package to use.
       '';

From f98a5946b7607ac7541b0122e73c9b9fec69a981 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 18 Feb 2016 20:54:52 +0100
Subject: [PATCH 1527/2285] glibc: 2.21 -> 2.22

---
 pkgs/development/libraries/glibc/common.nix   |   8 +-
 .../libraries/glibc/cve-2014-8121.patch       | 230 ------------------
 .../libraries/glibc/cve-2015-1781.patch       |  27 --
 .../libraries/glibc/cve-2015-7547.patch       |  91 +++----
 .../libraries/glibc/security-4a28f4d5.patch   |  53 ----
 .../libraries/glibc/security-bdf1ff05.patch   |  39 ---
 6 files changed, 51 insertions(+), 397 deletions(-)
 delete mode 100644 pkgs/development/libraries/glibc/cve-2014-8121.patch
 delete mode 100644 pkgs/development/libraries/glibc/cve-2015-1781.patch
 delete mode 100644 pkgs/development/libraries/glibc/security-4a28f4d5.patch
 delete mode 100644 pkgs/development/libraries/glibc/security-bdf1ff05.patch

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 45f5c24e959b..496440b1039f 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -13,7 +13,7 @@ cross:
 
 let
 
-  version = "2.21";
+  version = "2.22";
 
 in
 
@@ -57,10 +57,6 @@ stdenv.mkDerivation ({
          patch extends the search path by "/run/current-system/sw/bin". */
       ./fix_path_attribute_in_getconf.patch
 
-      ./security-4a28f4d5.patch
-      ./security-bdf1ff05.patch
-      ./cve-2014-8121.patch
-      ./cve-2015-1781.patch
       ./cve-2015-7547.patch
 
       ./glibc-locale-incompatibility.patch
@@ -165,7 +161,7 @@ stdenv.mkDerivation ({
     }
     else fetchurl {
       url = "mirror://gnu/glibc/glibc-${version}.tar.gz";
-      sha256 = "0f4prv4c0fcpi85wv4028wqxn075197gwxhgf0vp571fiw2pi3wd";
+      sha256 = "1rcby0cqgswgqaxyqz0yqc4zizb1kvpi5vlfqp7dh3sa132109m6";
     };
 
   # Remove absolute paths from `configure' & co.; build out-of-tree.
diff --git a/pkgs/development/libraries/glibc/cve-2014-8121.patch b/pkgs/development/libraries/glibc/cve-2014-8121.patch
deleted file mode 100644
index 95a86259dba8..000000000000
--- a/pkgs/development/libraries/glibc/cve-2014-8121.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-From 03d2730b44cc2236318fd978afa2651753666c55 Mon Sep 17 00:00:00 2001
-From: Florian Weimer <fweimer@redhat.com>
-Date: Wed, 29 Apr 2015 14:41:25 +0200
-Subject: [PATCH] CVE-2014-8121: Do not close NSS files database during
- iteration [BZ #18007]
-MIME-Version: 1.0
-Content-Type: text/plain; charset=utf8
-Content-Transfer-Encoding: 8bit
-
-Robin Hack discovered Samba would enter an infinite loop processing
-certain quota-related requests.  We eventually tracked this down to a
-glibc issue.
-
-Running a (simplified) test case under strace shows that /etc/passwd
-is continuously opened and closed:
-
-…
-open("/etc/passwd", O_RDONLY|O_CLOEXEC) = 3
-lseek(3, 0, SEEK_CUR)                   = 0
-read(3, "root:x:0:0:root:/root:/bin/bash\n"..., 4096) = 2717
-lseek(3, 2717, SEEK_SET)                = 2717
-close(3)                                = 0
-open("/etc/passwd", O_RDONLY|O_CLOEXEC) = 3
-lseek(3, 0, SEEK_CUR)                   = 0
-lseek(3, 0, SEEK_SET)                   = 0
-read(3, "root:x:0:0:root:/root:/bin/bash\n"..., 4096) = 2717
-lseek(3, 2717, SEEK_SET)                = 2717
-close(3)                                = 0
-open("/etc/passwd", O_RDONLY|O_CLOEXEC) = 3
-lseek(3, 0, SEEK_CUR)                   = 0
-…
-
-The lookup function implementation in
-nss/nss_files/files-XXX.c:DB_LOOKUP has code to prevent that.  It is
-supposed skip closing the input file if it was already open.
-
-  /* Reset file pointer to beginning or open file.  */			      \
-  status = internal_setent (keep_stream);				      \
-									      \
-  if (status == NSS_STATUS_SUCCESS)					      \
-    {									      \
-      /* Tell getent function that we have repositioned the file pointer.  */ \
-      last_use = getby;							      \
-									      \
-      while ((status = internal_getent (result, buffer, buflen, errnop	      \
-					H_ERRNO_ARG EXTRA_ARGS_VALUE))	      \
-	     == NSS_STATUS_SUCCESS)					      \
-	{ break_if_match }						      \
-									      \
-      if (! keep_stream)						      \
-	internal_endent ();						      \
-    }									      \
-
-keep_stream is initialized from the stayopen flag in internal_setent.
-internal_setent is called from the set*ent implementation as:
-
-  status = internal_setent (stayopen);
-
-However, for non-host database, this flag is always 0, per the
-STAYOPEN magic in nss/getXXent_r.c.
-
-Thus, the fix is this:
-
--  status = internal_setent (stayopen);
-+  status = internal_setent (1);
-
-This is not a behavioral change even for the hosts database (where the
-application can specify the stayopen flag) because with a call to
-sethostent(0), the file handle is still not closed in the
-implementation of gethostent.
----
- ChangeLog                 |   8 ++++
- NEWS                      |  12 +++--
- nss/Makefile              |   2 +-
- nss/nss_files/files-XXX.c |   2 +-
- nss/tst-nss-getpwent.c    | 118 ++++++++++++++++++++++++++++++++++++++++++++++
- 5 files changed, 136 insertions(+), 6 deletions(-)
- create mode 100644 nss/tst-nss-getpwent.c
-
-diff --git a/nss/Makefile b/nss/Makefile
-index d75dad2..65ab7b5 100644
---- a/nss/Makefile
-+++ b/nss/Makefile
-@@ -47,7 +47,7 @@ install-bin             := getent makedb
- makedb-modules = xmalloc hash-string
- extra-objs		+= $(makedb-modules:=.o)
- 
--tests			= test-netdb tst-nss-test1 test-digits-dots
-+tests			= test-netdb tst-nss-test1 test-digits-dots tst-nss-getpwent
- xtests			= bug-erange
- 
- # Specify rules for the nss_* modules.  We have some services.
-diff --git a/nss/nss_files/files-XXX.c b/nss/nss_files/files-XXX.c
-index a7a45e5..a7ce5ea 100644
---- a/nss/nss_files/files-XXX.c
-+++ b/nss/nss_files/files-XXX.c
-@@ -134,7 +134,7 @@ CONCAT(_nss_files_set,ENTNAME) (int stayopen)
- 
-   __libc_lock_lock (lock);
- 
--  status = internal_setent (stayopen);
-+  status = internal_setent (1);
- 
-   if (status == NSS_STATUS_SUCCESS && fgetpos (stream, &position) < 0)
-     {
-diff --git a/nss/tst-nss-getpwent.c b/nss/tst-nss-getpwent.c
-new file mode 100644
-index 0000000..f2e8abc
---- /dev/null
-+++ b/nss/tst-nss-getpwent.c
-@@ -0,0 +1,118 @@
-+/* Copyright (C) 2015 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, see
-+   <http://www.gnu.org/licenses/>.  */
-+
-+#include <pwd.h>
-+#include <stdbool.h>
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+
-+int
-+do_test (void)
-+{
-+  /* Count the number of entries in the password database, and fetch
-+     data from the first and last entries.  */
-+  size_t count = 0;
-+  struct passwd * pw;
-+  char *first_name = NULL;
-+  uid_t first_uid = 0;
-+  char *last_name = NULL;
-+  uid_t last_uid = 0;
-+  setpwent ();
-+  while ((pw  = getpwent ()) != NULL)
-+    {
-+      if (first_name == NULL)
-+	{
-+	  first_name = strdup (pw->pw_name);
-+	  if (first_name == NULL)
-+	    {
-+	      printf ("strdup: %m\n");
-+	      return 1;
-+	    }
-+	  first_uid = pw->pw_uid;
-+	}
-+
-+      free (last_name);
-+      last_name = strdup (pw->pw_name);
-+      if (last_name == NULL)
-+	{
-+	  printf ("strdup: %m\n");
-+	  return 1;
-+	}
-+      last_uid = pw->pw_uid;
-+      ++count;
-+    }
-+  endpwent ();
-+
-+  if (count == 0)
-+    {
-+      printf ("No entries in the password database.\n");
-+      return 0;
-+    }
-+
-+  /* Try again, this time interleaving with name-based and UID-based
-+     lookup operations.  The counts do not match if the interleaved
-+     lookups affected the enumeration.  */
-+  size_t new_count = 0;
-+  setpwent ();
-+  while ((pw  = getpwent ()) != NULL)
-+    {
-+      if (new_count == count)
-+	{
-+	  printf ("Additional entry in the password database.\n");
-+	  return 1;
-+	}
-+      ++new_count;
-+      struct passwd *pw2 = getpwnam (first_name);
-+      if (pw2 == NULL)
-+	{
-+	  printf ("getpwnam (%s) failed: %m\n", first_name);
-+	  return 1;
-+	}
-+      pw2 = getpwnam (last_name);
-+      if (pw2 == NULL)
-+	{
-+	  printf ("getpwnam (%s) failed: %m\n", last_name);
-+	  return 1;
-+	}
-+      pw2 = getpwuid (first_uid);
-+      if (pw2 == NULL)
-+	{
-+	  printf ("getpwuid (%llu) failed: %m\n",
-+		  (unsigned long long) first_uid);
-+	  return 1;
-+	}
-+      pw2 = getpwuid (last_uid);
-+      if (pw2 == NULL)
-+	{
-+	  printf ("getpwuid (%llu) failed: %m\n",
-+		  (unsigned long long) last_uid);
-+	  return 1;
-+	}
-+    }
-+  endpwent ();
-+  if (new_count < count)
-+    {
-+      printf ("Missing entry in the password database.\n");
-+      return 1;
-+    }
-+
-+  return 0;
-+}
-+
-+#define TEST_FUNCTION do_test ()
-+#include "../test-skeleton.c"
-
diff --git a/pkgs/development/libraries/glibc/cve-2015-1781.patch b/pkgs/development/libraries/glibc/cve-2015-1781.patch
deleted file mode 100644
index 6831d5ac7426..000000000000
--- a/pkgs/development/libraries/glibc/cve-2015-1781.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2959eda9272a033863c271aff62095abd01bd4e3 Mon Sep 17 00:00:00 2001
-From: Arjun Shankar <arjun.is@lostca.se>
-Date: Tue, 21 Apr 2015 14:06:31 +0200
-Subject: [PATCH] CVE-2015-1781: resolv/nss_dns/dns-host.c buffer overflow
- [BZ#18287]
-
----
- ChangeLog                 | 6 ++++++
- NEWS                      | 9 ++++++++-
- resolv/nss_dns/dns-host.c | 3 ++-
- 3 files changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
-index b16b0dd..d8c5579 100644
---- a/resolv/nss_dns/dns-host.c
-+++ b/resolv/nss_dns/dns-host.c
-@@ -615,7 +615,8 @@ getanswer_r (const querybuf *answer, int anslen, const char *qname, int qtype,
-   int have_to_map = 0;
-   uintptr_t pad = -(uintptr_t) buffer % __alignof__ (struct host_data);
-   buffer += pad;
--  if (__glibc_unlikely (buflen < sizeof (struct host_data) + pad))
-+  buflen = buflen > pad ? buflen - pad : 0;
-+  if (__glibc_unlikely (buflen < sizeof (struct host_data)))
-     {
-       /* The buffer is too small.  */
-     too_small:
-
diff --git a/pkgs/development/libraries/glibc/cve-2015-7547.patch b/pkgs/development/libraries/glibc/cve-2015-7547.patch
index 9bf0bcc388cb..55d58c166981 100644
--- a/pkgs/development/libraries/glibc/cve-2015-7547.patch
+++ b/pkgs/development/libraries/glibc/cve-2015-7547.patch
@@ -1,23 +1,31 @@
+commit b995d95a5943785be3ab862b2d3276f3b4a22481
+Author: Carlos O'Donell <carlos@systemhalted.org>
+Date:   Tue Feb 16 21:26:37 2016 -0500
 
-CVE-2015-7547
-
-2016-02-15  Carlos O'Donell  <carlos@redhat.com>
-
-	[BZ #18665]
-	* resolv/nss_dns/dns-host.c (gaih_getanswer_slice): Always set
-	*herrno_p.
-	(gaih_getanswer): Document functional behviour. Return tryagain
-	if any result is tryagain.
-	* resolv/res_query.c (__libc_res_nsearch): Set buffer size to zero
-	when freed.
-	* resolv/res_send.c: Add copyright text.
-	(__libc_res_nsend): Document that MAXPACKET is expected.
-	(send_vc): Document. Remove buffer reuse.
-	(send_dg): Document. Remove buffer reuse. Set *thisanssizp to set the
-	size of the buffer. Add Dprint for truncated UDP buffer.
+    CVE-2015-7547: getaddrinfo() stack-based buffer overflow (Bug 18665).
+    
+    * A stack-based buffer overflow was found in libresolv when invoked from
+      libnss_dns, allowing specially crafted DNS responses to seize control
+      of execution flow in the DNS client.  The buffer overflow occurs in
+      the functions send_dg (send datagram) and send_vc (send TCP) for the
+      NSS module libnss_dns.so.2 when calling getaddrinfo with AF_UNSPEC
+      family.  The use of AF_UNSPEC triggers the low-level resolver code to
+      send out two parallel queries for A and AAAA.  A mismanagement of the
+      buffers used for those queries could result in the response of a query
+      writing beyond the alloca allocated buffer created by
+      _nss_dns_gethostbyname4_r.  Buffer management is simplified to remove
+      the overflow.  Thanks to the Google Security Team and Red Hat for
+      reporting the security impact of this issue, and Robert Holiday of
+      Ciena for reporting the related bug 18665. (CVE-2015-7547)
+    
+    See also:
+    https://sourceware.org/ml/libc-alpha/2016-02/msg00416.html
+    https://sourceware.org/ml/libc-alpha/2016-02/msg00418.html
+    
+    (cherry picked from commit e9db92d3acfe1822d56d11abcea5bfc4c41cf6ca)
 
 diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
-index a255d5e..47cfe27 100644
+index 357ac04..a0fe9a8 100644
 --- a/resolv/nss_dns/dns-host.c
 +++ b/resolv/nss_dns/dns-host.c
 @@ -1031,7 +1031,10 @@ gaih_getanswer_slice (const querybuf *answer, int anslen, const char *qname,
@@ -69,8 +77,8 @@ index a255d5e..47cfe27 100644
 +     expected application behaviour.  Some of the synthesized responses
 +     aren't very well thought out and sometimes appear to imply that
 +     IPv4 responses are always answer 1, and IPv6 responses are always
-+     answer 2, but that's not true (see the implemetnation of send_dg
-+     and send_vc to see response can arrive in any order, particlarly
++     answer 2, but that's not true (see the implementation of send_dg
++     and send_vc to see response can arrive in any order, particularly
 +     for UDP). However, we expect it holds roughly enough of the time
 +     that this code works, but certainly needs to be fixed to make this
 +     a more robust implementation.
@@ -107,12 +115,12 @@ index a255d5e..47cfe27 100644
 +     ----------------------------------------------
 +
 +     [1] If the first response is a success we return success.
-+         This ignores the state of the second answer and in fact
-+         incorrectly sets errno and h_errno to that of the second
++	 This ignores the state of the second answer and in fact
++	 incorrectly sets errno and h_errno to that of the second
 +	 answer.  However because the response is a success we ignore
 +	 *errnop and *h_errnop (though that means you touched errno on
-+         success).  We are being conservative here and returning the
-+         likely IPv4 response in the first answer as a success.
++	 success).  We are being conservative here and returning the
++	 likely IPv4 response in the first answer as a success.
 +
 +     [2] If the first response is a recoverable TRYAGAIN we return
 +	 that instead of looking at the second response.  The
@@ -158,7 +166,7 @@ index a255d5e..47cfe27 100644
        if (status != NSS_STATUS_SUCCESS && status2 != NSS_STATUS_NOTFOUND)
  	status = status2;
 +      /* Do not return a truncated second response (unless it was
-+         unavoidable e.g. unrecoverable TRYAGAIN).  */
++	 unavoidable e.g. unrecoverable TRYAGAIN).  */
 +      if (status == NSS_STATUS_SUCCESS
 +	  && (status2 == NSS_STATUS_TRYAGAIN
 +	      && *errnop == ERANGE && *h_errnop != NO_RECOVERY))
@@ -195,7 +203,7 @@ index 4a9b3b3..95470a9 100644
  	  }
  	if (saved_herrno != -1)
 diff --git a/resolv/res_send.c b/resolv/res_send.c
-index a968b95..21843f1 100644
+index 5e53cc2..6511bb1 100644
 --- a/resolv/res_send.c
 +++ b/resolv/res_send.c
 @@ -1,3 +1,20 @@
@@ -219,7 +227,7 @@ index a968b95..21843f1 100644
  /*
   * Copyright (c) 1985, 1989, 1993
   *    The Regents of the University of California.  All rights reserved.
-@@ -355,6 +372,8 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
+@@ -363,6 +380,8 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
  #ifdef USE_HOOKS
  	if (__glibc_unlikely (statp->qhook || statp->rhook))       {
  		if (anssiz < MAXPACKET && ansp) {
@@ -228,7 +236,7 @@ index a968b95..21843f1 100644
  			u_char *buf = malloc (MAXPACKET);
  			if (buf == NULL)
  				return (-1);
-@@ -630,6 +649,77 @@ get_nsaddr (res_state statp, int n)
+@@ -638,6 +657,77 @@ get_nsaddr (res_state statp, int n)
      return (struct sockaddr *) (void *) &statp->nsaddr_list[n];
  }
  
@@ -270,7 +278,7 @@ index a968b95..21843f1 100644
 +   are needed but ANSCP is NULL, then as much of the response as
 +   possible is read into the buffer, but the results will be truncated.
 +   When truncation happens because of a small answer buffer the DNS
-+   packets header feild TC will bet set to 1, indicating a truncated
++   packets header field TC will bet set to 1, indicating a truncated
 +   message and the rest of the socket data will be read and discarded.
 +
 +   Answers to the query are stored secondly in *ANSP2 up to a max of
@@ -306,7 +314,7 @@ index a968b95..21843f1 100644
  static int
  send_vc(res_state statp,
  	const u_char *buf, int buflen, const u_char *buf2, int buflen2,
-@@ -639,11 +729,7 @@ send_vc(res_state statp,
+@@ -647,11 +737,7 @@ send_vc(res_state statp,
  {
  	const HEADER *hp = (HEADER *) buf;
  	const HEADER *hp2 = (HEADER *) buf2;
@@ -316,19 +324,19 @@ index a968b95..21843f1 100644
 -	// int anssiz = *anssizp;
 -	HEADER *anhp = (HEADER *) ans;
 +	HEADER *anhp = (HEADER *) *ansp;
-	struct sockaddr_in6 *nsap = EXT(statp).nsaddrs[ns];
+ 	struct sockaddr *nsap = get_nsaddr (statp, ns);
  	int truncating, connreset, n;
  	/* On some architectures compiler might emit a warning indicating
-@@ -731,6 +817,8 @@ send_vc(res_state statp,
+@@ -743,6 +829,8 @@ send_vc(res_state statp,
  	 * Receive length & response
  	 */
  	int recvresp1 = 0;
 +	/* Skip the second response if there is no second query.
-+           To do that we mark the second response as received.  */
++	   To do that we mark the second response as received.  */
  	int recvresp2 = buf2 == NULL;
  	uint16_t rlen16;
   read_len:
-@@ -767,40 +855,14 @@ send_vc(res_state statp,
+@@ -779,40 +867,14 @@ send_vc(res_state statp,
  	u_char **thisansp;
  	int *thisresplenp;
  	if ((recvresp1 | recvresp2) == 0 || buf2 == NULL) {
@@ -372,7 +380,7 @@ index a968b95..21843f1 100644
  		thisanssizp = anssizp2;
  		thisansp = ansp2;
  		thisresplenp = resplen2;
-@@ -804,10 +870,14 @@ send_vc(res_state statp,
+@@ -820,10 +882,14 @@ send_vc(res_state statp,
  	anhp = (HEADER *) *thisansp;
  
  	*thisresplenp = rlen;
@@ -391,7 +399,7 @@ index a968b95..21843f1 100644
  			u_char *newp = malloc (MAXPACKET);
  			if (newp == NULL) {
  				*terrno = ENOMEM;
-@@ -819,6 +889,9 @@ send_vc(res_state statp,
+@@ -835,6 +901,9 @@ send_vc(res_state statp,
  			if (thisansp == ansp2)
  			  *ansp2_malloced = 1;
  			anhp = (HEADER *) newp;
@@ -401,7 +409,7 @@ index a968b95..21843f1 100644
  			len = rlen;
  		} else {
  			Dprint(statp->options & RES_DEBUG,
-@@ -948,6 +1021,66 @@ reopen (res_state statp, int *terrno, int ns)
+@@ -997,6 +1066,66 @@ reopen (res_state statp, int *terrno, int ns)
  	return 1;
  }
  
@@ -425,7 +433,7 @@ index a968b95..21843f1 100644
 +   are needed but ANSCP is NULL, then as much of the response as
 +   possible is read into the buffer, but the results will be truncated.
 +   When truncation happens because of a small answer buffer the DNS
-+   packets header feild TC will bet set to 1, indicating a truncated
++   packets header field TC will bet set to 1, indicating a truncated
 +   message, while the rest of the UDP packet is discarded.
 +
 +   Answers to the query are stored secondly in *ANSP2 up to a max of
@@ -468,7 +476,7 @@ index a968b95..21843f1 100644
  static int
  send_dg(res_state statp,
  	const u_char *buf, int buflen, const u_char *buf2, int buflen2,
-@@ -957,8 +1090,6 @@ send_dg(res_state statp,
+@@ -1006,8 +1135,6 @@ send_dg(res_state statp,
  {
  	const HEADER *hp = (HEADER *) buf;
  	const HEADER *hp2 = (HEADER *) buf2;
@@ -477,16 +485,16 @@ index a968b95..21843f1 100644
  	struct timespec now, timeout, finish;
  	struct pollfd pfd[1];
  	int ptimeout;
-@@ -991,6 +1122,8 @@ send_dg(res_state statp,
+@@ -1040,6 +1167,8 @@ send_dg(res_state statp,
  	int need_recompute = 0;
  	int nwritten = 0;
  	int recvresp1 = 0;
 +	/* Skip the second response if there is no second query.
-+           To do that we mark the second response as received.  */
++	   To do that we mark the second response as received.  */
  	int recvresp2 = buf2 == NULL;
  	pfd[0].fd = EXT(statp).nssocks[ns];
  	pfd[0].events = POLLOUT;
-@@ -1154,55 +1287,56 @@ send_dg(res_state statp,
+@@ -1203,55 +1332,56 @@ send_dg(res_state statp,
  		int *thisresplenp;
  
  		if ((recvresp1 | recvresp2) == 0 || buf2 == NULL) {
@@ -570,4 +578,3 @@ index a968b95..21843f1 100644
  		HEADER *anhp = (HEADER *) *thisansp;
  		socklen_t fromlen = sizeof(struct sockaddr_in6);
  		assert (sizeof(from) <= fromlen);
-
diff --git a/pkgs/development/libraries/glibc/security-4a28f4d5.patch b/pkgs/development/libraries/glibc/security-4a28f4d5.patch
deleted file mode 100644
index 25f994d859c1..000000000000
--- a/pkgs/development/libraries/glibc/security-4a28f4d5.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 4a28f4d55a6cc33474c0792fe93b5942d81bf185 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@suse.de>
-Date: Thu, 26 Feb 2015 14:55:24 +0100
-Subject: [PATCH] Fix read past end of pattern in fnmatch (bug 18032)
-
----
- ChangeLog            | 7 +++++++
- NEWS                 | 2 +-
- posix/fnmatch_loop.c | 5 ++---
- posix/tst-fnmatch3.c | 8 +++++---
- 4 files changed, 15 insertions(+), 7 deletions(-)
-
-diff --git a/posix/fnmatch_loop.c b/posix/fnmatch_loop.c
-index c0cb2fc..72c5d8f 100644
---- a/posix/fnmatch_loop.c
-+++ b/posix/fnmatch_loop.c
-@@ -945,14 +945,13 @@ FCT (pattern, string, string_end, no_leading_period, flags, ends, alloca_used)
- 		  }
- 		else if (c == L('[') && *p == L('.'))
- 		  {
--		    ++p;
- 		    while (1)
- 		      {
- 			c = *++p;
--			if (c == '\0')
-+			if (c == L('\0'))
- 			  return FNM_NOMATCH;
- 
--			if (*p == L('.') && p[1] == L(']'))
-+			if (c == L('.') && p[1] == L(']'))
- 			  break;
- 		      }
- 		    p += 2;
-diff --git a/posix/tst-fnmatch3.c b/posix/tst-fnmatch3.c
-index d27a557..75bc00a 100644
---- a/posix/tst-fnmatch3.c
-+++ b/posix/tst-fnmatch3.c
-@@ -21,9 +21,11 @@
- int
- do_test (void)
- {
--  const char *pattern = "[[:alpha:]'[:alpha:]\0]";
--
--  return fnmatch (pattern, "a", 0) != FNM_NOMATCH;
-+  if (fnmatch ("[[:alpha:]'[:alpha:]\0]", "a", 0) != FNM_NOMATCH)
-+    return 1;
-+  if (fnmatch ("[a[.\0.]]", "a", 0) != FNM_NOMATCH)
-+    return 1;
-+  return 0;
- }
- 
- #define TEST_FUNCTION do_test ()
-
diff --git a/pkgs/development/libraries/glibc/security-bdf1ff05.patch b/pkgs/development/libraries/glibc/security-bdf1ff05.patch
deleted file mode 100644
index b4175694f912..000000000000
--- a/pkgs/development/libraries/glibc/security-bdf1ff05.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From bdf1ff052a8e23d637f2c838fa5642d78fcedc33 Mon Sep 17 00:00:00 2001
-From: Paul Pluzhnikov <ppluzhnikov@google.com>
-Date: Sun, 22 Feb 2015 12:01:47 -0800
-Subject: [PATCH] Fix BZ #17269 -- _IO_wstr_overflow integer overflow
-
----
- ChangeLog       | 6 ++++++
- NEWS            | 6 +++---
- libio/wstrops.c | 8 +++++++-
- 3 files changed, 16 insertions(+), 4 deletions(-)
-
-diff --git a/libio/wstrops.c b/libio/wstrops.c
-index 43d847d..3993579 100644
---- a/libio/wstrops.c
-+++ b/libio/wstrops.c
-@@ -95,8 +95,11 @@ _IO_wstr_overflow (fp, c)
- 	  wchar_t *old_buf = fp->_wide_data->_IO_buf_base;
- 	  size_t old_wblen = _IO_wblen (fp);
- 	  _IO_size_t new_size = 2 * old_wblen + 100;
--	  if (new_size < old_wblen)
-+
-+	  if (__glibc_unlikely (new_size < old_wblen)
-+	      || __glibc_unlikely (new_size > SIZE_MAX / sizeof (wchar_t)))
- 	    return EOF;
-+
- 	  new_buf
- 	    = (wchar_t *) (*((_IO_strfile *) fp)->_s._allocate_buffer) (new_size
- 									* sizeof (wchar_t));
-@@ -186,6 +189,9 @@ enlarge_userbuf (_IO_FILE *fp, _IO_off64_t offset, int reading)
-     return 1;
- 
-   _IO_size_t newsize = offset + 100;
-+  if (__glibc_unlikely (newsize > SIZE_MAX / sizeof (wchar_t)))
-+    return 1;
-+
-   wchar_t *oldbuf = wd->_IO_buf_base;
-   wchar_t *newbuf
-     = (wchar_t *) (*((_IO_strfile *) fp)->_s._allocate_buffer) (newsize
-

From e6e9970891781768d85a1c3005c2486b591723c7 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Thu, 18 Feb 2016 15:00:34 -0500
Subject: [PATCH 1528/2285] ghcjs: don't propagate Cabal to all packages

Previously, we were compiling Setup.hs with ghcjs (instead of  ghc),
and that required that Cabal be available, otherwise the Setup.hs would
fail to compile.

Now that we are compiling Setup.hs with ghc, it's no longer necessary
to add Cabal as a dependency to all ghcjs packages.
---
 pkgs/development/haskell-modules/configuration-ghcjs.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index dfdad72cd3d8..53da845210e2 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -21,13 +21,6 @@ self: super:
     '';
   });
 
-  mkDerivation = drv: super.mkDerivation (drv // {
-    # Need Cabal lib to be available.
-    libraryHaskellDepends = drv.libraryHaskellDepends
-      # Be careful not to end up in infinite recursion!
-      ++ pkgs.lib.optional (!(builtins.elem drv.pname ["Cabal" "hscolour"])) self.Cabal;
-  });
-
   # LLVM is not supported on this GHC; use the latest one.
   inherit (pkgs) llvmPackages;
 

From 1ab14aad7ad61fead6bc93145d1169eca91d7b91 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 18 Feb 2016 21:11:15 +0100
Subject: [PATCH 1529/2285] glibc: Drop hurd support

This hasn't been maintained since 2012.

Also, renamed glibc's kernelHeaders argument to linuxHeaders.
---
 pkgs/development/libraries/glibc/builder.sh   | 15 +---
 pkgs/development/libraries/glibc/common.nix   | 86 ++++++-------------
 pkgs/development/libraries/glibc/default.nix  | 28 +-----
 pkgs/development/libraries/glibc/info.nix     |  4 +-
 pkgs/development/libraries/glibc/locales.nix  |  4 +-
 .../linux/cpufrequtils/default.nix            |  2 +-
 pkgs/os-specific/linux/dietlibc/default.nix   |  2 +-
 pkgs/tools/networking/nbd/default.nix         |  4 +-
 pkgs/top-level/all-packages.nix               |  6 +-
 9 files changed, 43 insertions(+), 108 deletions(-)

diff --git a/pkgs/development/libraries/glibc/builder.sh b/pkgs/development/libraries/glibc/builder.sh
index 2836063e3bf4..d0684d6194d0 100644
--- a/pkgs/development/libraries/glibc/builder.sh
+++ b/pkgs/development/libraries/glibc/builder.sh
@@ -22,22 +22,11 @@ postInstall() {
 
     test -f $out/etc/ld.so.cache && rm $out/etc/ld.so.cache
 
-    # FIXME: Use `test -n $linuxHeaders' when `kernelHeaders' has been
-    # renamed.
-    if test -z "$hurdHeaders"; then
+    if test -n "$linuxHeaders"; then
         # Include the Linux kernel headers in Glibc, except the `scsi'
         # subdirectory, which Glibc provides itself.
         (cd $out/include && \
-         ln -sv $(ls -d $kernelHeaders/include/* | grep -v 'scsi$') .)
-    fi
-
-    if test -f "$out/lib/libhurduser.so"; then
-        # libc.so, libhurduser.so, and libmachuser.so depend on each
-        # other, so add them to libc.so (a RUNPATH on libc.so.0.3
-        # would be ignored by the cross-linker.)
-        echo "adding \`libhurduser.so' and \`libmachuser.so' to the \`libc.so' linker script..."
-        sed -i "$out/lib/libc.so" \
-            -e"s|\(libc\.so\.[^ ]\+\>\)|\1 $out/lib/libhurduser.so $out/lib/libmachuser.so|g"
+         ln -sv $(ls -d $linuxHeaders/include/* | grep -v 'scsi$') .)
     fi
 
     # Fix for NIXOS-54 (ldd not working on x86_64).  Make a symlink
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 496440b1039f..6a468657716e 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -3,10 +3,8 @@
 
 cross:
 
-{ name, fetchurl, fetchgit ? null, stdenv, installLocales ? false
-, gccCross ? null, kernelHeaders ? null
-, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null
-, mig ? null
+{ name, fetchurl, lib, stdenv, installLocales ? false
+, gccCross ? null, linuxHeaders ? null
 , profilingLibraries ? false, meta
 , withGd ? false, gd ? null, libpng ? null
 , preConfigure ? "", ... }@args:
@@ -18,12 +16,9 @@ let
 in
 
 assert cross != null -> gccCross != null;
-assert mig != null -> machHeaders != null;
-assert machHeaders != null -> hurdHeaders != null;
-assert hurdHeaders != null -> libpthreadHeaders != null;
 
 stdenv.mkDerivation ({
-  inherit kernelHeaders installLocales;
+  inherit linuxHeaders installLocales;
 
   # The host/target system.
   crossConfig = if cross != null then cross.config else null;
@@ -32,9 +27,7 @@ stdenv.mkDerivation ({
 
   enableParallelBuilding = true;
 
-  /* Don't try to apply these patches to the Hurd's snapshot, which is
-     older.  */
-  patches = stdenv.lib.optionals (hurdHeaders == null)
+  patches =
     [ /* Have rpcgen(1) look for cpp(1) in $PATH.  */
       ./rpcgen-path.patch
 
@@ -96,36 +89,35 @@ stdenv.mkDerivation ({
       "--sysconfdir=/etc"
       "--localedir=/var/run/current-system/sw/lib/locale"
       "libc_cv_ssp=no"
-      (if kernelHeaders != null
-       then "--with-headers=${kernelHeaders}/include"
+      (if linuxHeaders != null
+       then "--with-headers=${linuxHeaders}/include"
        else "--without-headers")
       (if profilingLibraries
        then "--enable-profile"
        else "--disable-profile")
-    ] ++ stdenv.lib.optionals (cross == null && kernelHeaders != null) [
+    ] ++ lib.optionals (cross == null && linuxHeaders != null) [
       "--enable-kernel=2.6.32"
-    ] ++ stdenv.lib.optionals (cross != null) [
+    ] ++ lib.optionals (cross != null) [
       (if cross.withTLS then "--with-tls" else "--without-tls")
       (if cross.float == "soft" then "--without-fp" else "--with-fp")
-    ] ++ stdenv.lib.optionals (cross != null
+    ] ++ lib.optionals (cross != null
           && cross.platform ? kernelMajor
           && cross.platform.kernelMajor == "2.6") [
       "--enable-kernel=2.6.0"
       "--with-__thread"
-    ] ++ stdenv.lib.optionals (cross == null && stdenv.isArm) [
+    ] ++ lib.optionals (cross == null && stdenv.isArm) [
       "--host=arm-linux-gnueabi"
       "--build=arm-linux-gnueabi"
 
       # To avoid linking with -lgcc_s (dynamic link)
       # so the glibc does not depend on its compiler store path
       "libc_cv_as_needed=no"
-    ] ++ stdenv.lib.optional withGd "--with-gd";
+    ] ++ lib.optional withGd "--with-gd";
 
   installFlags = [ "sysconfdir=$(out)/etc" ];
 
-  buildInputs = stdenv.lib.optionals (cross != null) [ gccCross ]
-    ++ stdenv.lib.optional (mig != null) mig
-    ++ stdenv.lib.optionals withGd [ gd libpng ];
+  buildInputs = lib.optionals (cross != null) [ gccCross ]
+    ++ lib.optionals withGd [ gd libpng ];
 
   # Needed to install share/zoneinfo/zone.tab.  Set to impure /bin/sh to
   # prevent a retained dependency on the bootstrap tools in the stdenv-linux
@@ -137,32 +129,22 @@ stdenv.mkDerivation ({
   # I.e. when gcc is compiled with --with-arch=i686, then the
   # preprocessor symbol `__i686' will be defined to `1'.  This causes
   # the symbol __i686.get_pc_thunk.dx to be mangled.
-  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString (stdenv.system == "i686-linux") "-U__i686"
+  NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.system == "i686-linux") "-U__i686"
     + " -Wno-error=strict-prototypes";
 }
 
 # Remove the `gccCross' attribute so that the *native* glibc store path
 # doesn't depend on whether `gccCross' is null or not.
-// (removeAttrs args [ "gccCross" "fetchurl" "fetchgit" "withGd" "gd" "libpng" ]) //
+// (removeAttrs args [ "lib" "gccCross" "fetchurl" "withGd" "gd" "libpng" ]) //
 
 {
   name = name + "-${version}" +
-    stdenv.lib.optionalString (cross != null) "-${cross.config}";
+    lib.optionalString (cross != null) "-${cross.config}";
 
-  src =
-    if hurdHeaders != null
-    then fetchgit {
-      # Shamefully the "official" glibc won't build on GNU, so use the one
-      # maintained by the Hurd folks, `tschwinge/Roger_Whittaker' branch.
-      # See <http://www.gnu.org/software/hurd/source_repositories/glibc.html>.
-      url = "git://git.sv.gnu.org/hurd/glibc.git";
-      sha256 = "cecec9dd5a2bafc875c56b058b6d7628a22b250b53747513dec304f31ffdb82d";
-      rev = "d3cdecf18e6550b0984a42b43ed48c5fb26501e1";
-    }
-    else fetchurl {
-      url = "mirror://gnu/glibc/glibc-${version}.tar.gz";
-      sha256 = "1rcby0cqgswgqaxyqz0yqc4zizb1kvpi5vlfqp7dh3sa132109m6";
-    };
+  src = fetchurl {
+    url = "mirror://gnu/glibc/glibc-${version}.tar.gz";
+    sha256 = "1rcby0cqgswgqaxyqz0yqc4zizb1kvpi5vlfqp7dh3sa132109m6";
+  };
 
   # Remove absolute paths from `configure' & co.; build out-of-tree.
   preConfigure = ''
@@ -178,17 +160,18 @@ stdenv.mkDerivation ({
 
     configureScript="`pwd`/../$sourceRoot/configure"
 
-    ${stdenv.lib.optionalString (stdenv.cc.libc != null)
+    ${lib.optionalString (stdenv.cc.libc != null)
       ''makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib"''
     }
 
     ${preConfigure}
   '';
 
+  preBuild = lib.optionalString withGd "unset NIX_DONT_SET_RPATH";
+
   meta = {
     homepage = http://www.gnu.org/software/libc/;
-    description = "The GNU C Library"
-      + stdenv.lib.optionalString (hurdHeaders != null) ", for GNU/Hurd";
+    description = "The GNU C Library";
 
     longDescription =
       '' Any Unix-like operating system needs a C library: the library which
@@ -199,24 +182,9 @@ stdenv.mkDerivation ({
          most systems with the Linux kernel.
       '';
 
-    license = stdenv.lib.licenses.lgpl2Plus;
+    license = lib.licenses.lgpl2Plus;
 
-    maintainers = [ ];
-    #platforms = stdenv.lib.platforms.linux;
+    maintainers = [ lib.maintainers.eelco ];
+    #platforms = lib.platforms.linux;
   } // meta;
-}
-
-// stdenv.lib.optionalAttrs withGd {
-  preBuild = "unset NIX_DONT_SET_RPATH";
-}
-
-// stdenv.lib.optionalAttrs (hurdHeaders != null) {
-  # Work around the fact that the configure snippet that looks for
-  # <hurd/version.h> does not honor `--with-headers=$sysheaders' and that
-  # glibc expects Mach, Hurd, and pthread headers to be in the same place.
-  CPATH = "${hurdHeaders}/include:${machHeaders}/include:${libpthreadHeaders}/include";
-
-  # Install NSS stuff in the right place.
-  # XXX: This will be needed for all new glibcs and isn't Hurd-specific.
-  makeFlags = ''vardbdir="$out/var/db"'';
 })
diff --git a/pkgs/development/libraries/glibc/default.nix b/pkgs/development/libraries/glibc/default.nix
index 08eaf555e02d..5e25c2dc8bc8 100644
--- a/pkgs/development/libraries/glibc/default.nix
+++ b/pkgs/development/libraries/glibc/default.nix
@@ -1,6 +1,4 @@
-{ stdenv, fetchurl, fetchgit ? null, kernelHeaders
-, machHeaders ? null, hurdHeaders ? null, libpthreadHeaders ? null
-, mig ? null
+{ lib, stdenv, fetchurl, linuxHeaders
 , installLocales ? true
 , profilingLibraries ? false
 , gccCross ? null
@@ -16,11 +14,10 @@ let
 in
   build cross ({
     name = "glibc"
-      + stdenv.lib.optionalString (hurdHeaders != null) "-hurd"
-      + stdenv.lib.optionalString debugSymbols "-debug"
-      + stdenv.lib.optionalString withGd "-gd";
+      + lib.optionalString debugSymbols "-debug"
+      + lib.optionalString withGd "-gd";
 
-    inherit fetchurl fetchgit stdenv kernelHeaders installLocales
+    inherit lib stdenv fetchurl linuxHeaders installLocales
       profilingLibraries gccCross withGd gd libpng;
 
     builder = ./builder.sh;
@@ -58,23 +55,6 @@ in
 
   //
 
-  (if hurdHeaders != null
-   then rec {
-     inherit machHeaders hurdHeaders libpthreadHeaders mig fetchgit;
-
-     propagatedBuildInputs = [ machHeaders hurdHeaders libpthreadHeaders ];
-
-     passthru = {
-       # When building GCC itself `propagatedBuildInputs' above is not
-       # honored, so we pass it here so that the GCC builder can do the right
-       # thing.
-       inherit propagatedBuildInputs;
-     };
-   }
-   else { })
-
-  //
-
   (if cross != null
    then {
       preConfigure = ''
diff --git a/pkgs/development/libraries/glibc/info.nix b/pkgs/development/libraries/glibc/info.nix
index e4cdb42dd689..1e60856430db 100644
--- a/pkgs/development/libraries/glibc/info.nix
+++ b/pkgs/development/libraries/glibc/info.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, texinfo, perl }:
+{ lib, stdenv, fetchurl, texinfo, perl }:
 
 let build = import ./common.nix; in
 
@@ -6,7 +6,7 @@ let build = import ./common.nix; in
 build null {
   name = "glibc-info";
 
-  inherit fetchurl stdenv;
+  inherit fetchurl stdenv lib;
 
   configureFlags = [ "--enable-add-ons" ];
 
diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix
index cbf7af22cac1..9607d7ecb223 100644
--- a/pkgs/development/libraries/glibc/locales.nix
+++ b/pkgs/development/libraries/glibc/locales.nix
@@ -6,14 +6,14 @@
    http://sourceware.org/cgi-bin/cvsweb.cgi/libc/localedata/SUPPORTED?cvsroot=glibc
 */
 
-{ stdenv, fetchurl, writeText, allLocales ? true, locales ? ["en_US.UTF-8/UTF-8"] }:
+{ lib, stdenv, fetchurl, writeText, allLocales ? true, locales ? ["en_US.UTF-8/UTF-8"] }:
 
 let build = import ./common.nix; in
 
 build null {
   name = "glibc-locales";
 
-  inherit fetchurl stdenv;
+  inherit fetchurl stdenv lib;
   installLocales = true;
 
   builder = ./locales-builder.sh;
diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix
index b7822035c20c..65be409a75e3 100644
--- a/pkgs/os-specific/linux/cpufrequtils/default.nix
+++ b/pkgs/os-specific/linux/cpufrequtils/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
       -i Makefile
   '';
 
-  buildInputs = [ stdenv.cc.libc.kernelHeaders libtool gettext ];
+  buildInputs = [ stdenv.cc.libc.linuxHeaders libtool gettext ];
 
   meta = {
     description = "Tools to display or change the CPU governor settings";
diff --git a/pkgs/os-specific/linux/dietlibc/default.nix b/pkgs/os-specific/linux/dietlibc/default.nix
index b795cb60da6e..d98bfb967356 100644
--- a/pkgs/os-specific/linux/dietlibc/default.nix
+++ b/pkgs/os-specific/linux/dietlibc/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
   
   inherit glibc;
-  kernelHeaders = glibc.kernelHeaders;
+  kernelHeaders = glibc.linuxHeaders;
 
   patches = [
 
diff --git a/pkgs/tools/networking/nbd/default.nix b/pkgs/tools/networking/nbd/default.nix
index 6cb75152af06..967b3863f205 100644
--- a/pkgs/tools/networking/nbd/default.nix
+++ b/pkgs/tools/networking/nbd/default.nix
@@ -8,7 +8,9 @@ stdenv.mkDerivation rec {
     sha256 = "1pkkid657zgjymwxv3fm32cxnq9llfz29rl15vp6mn42vnzbj1di";
   };
 
-  buildInputs = [ pkgconfig glib ] ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.kernelHeaders;
+  buildInputs =
+    [ pkgconfig glib ]
+    ++ stdenv.lib.optional (stdenv ? glibc) stdenv.glibc.linuxHeaders;
 
   postInstall = ''
     mkdir -p "$out/share/doc/${name}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38d8bf296423..4cce2e159130 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6707,22 +6707,18 @@ let
   glfw3 = callPackage ../development/libraries/glfw/3.x.nix { };
 
   glibc = callPackage ../development/libraries/glibc {
-    kernelHeaders = linuxHeaders;
     installLocales = config.glibc.locales or false;
-    machHeaders = null;
-    hurdHeaders = null;
     gccCross = null;
   };
 
   glibc_memusage = callPackage ../development/libraries/glibc {
-    kernelHeaders = linuxHeaders;
     installLocales = false;
     withGd = true;
   };
 
   glibcCross = forceNativeDrv (glibc.override {
     gccCross = gccCrossStageStatic;
-    kernelHeaders = linuxHeadersCross;
+    linuxHeaders = linuxHeadersCross;
   });
 
   # We can choose:

From 076de98c9461eeb91b266fd44a11a6e7ac1b62ad Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 18 Feb 2016 21:37:26 +0100
Subject: [PATCH 1530/2285] separateDebugInfo: Restore ELF check

---
 pkgs/build-support/setup-hooks/separate-debug-info.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh
index 55e3236847df..617bbba58456 100644
--- a/pkgs/build-support/setup-hooks/separate-debug-info.sh
+++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh
@@ -18,6 +18,7 @@ _separateDebugInfo() {
         # Skip non-ELF files.
         exec 10< "$i"
         read -n 4 -u 10 magic
+        if ! [[ "$magic" =~ ELF ]]; then continue; fi
         exec 10<&-
 
         # Extract the Build ID. FIXME: there's probably a cleaner way.

From 854c27c69c2f38b2e5a7ed5099c88aa0bcc520d1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 18 Feb 2016 21:58:41 +0100
Subject: [PATCH 1531/2285] coreutils: 8.24 -> 8.25

---
 pkgs/tools/misc/coreutils/default.nix | 41 +++++++++++++--------------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index baa3900ad97a..78c272916485 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, gmp ? null
+{ lib, stdenv, fetchurl, perl, gmp ? null
 , aclSupport ? false, acl ? null
 , selinuxSupport? false, libselinux ? null, libsepol ? null
 , autoconf, automake114x, texinfo
@@ -8,32 +8,33 @@
 assert aclSupport -> acl != null;
 assert selinuxSupport -> libselinux != null && libsepol != null;
 
-
-with { inherit (stdenv.lib) optional optionals optionalString optionalAttrs; };
+with lib;
 
 let
   self = stdenv.mkDerivation rec {
-    name = "coreutils-8.24";
+    name = "coreutils-8.25";
 
     src = fetchurl {
       url = "mirror://gnu/coreutils/${name}.tar.xz";
-      sha256 = "0w11jw3fb5sslf0f72kxy7llxgk1ia3a6bcw0c9kmvxrlj355mx2";
+      sha256 = "11yfrnb94xzmvi4lhclkcmkqsbhww64wf234ya1aacjvg82prrii";
     };
 
-    patches = if stdenv.isCygwin then ./coreutils-8.23-4.cygwin.patch else
-              (if stdenv.isArm then (fetchurl {
-                  url = "http://git.savannah.gnu.org/cgit/coreutils.git/patch/?id=3ba68f9e64fa2eb8af22d510437a0c6441feb5e0";
-                  sha256 = "1dnlszhc8lihhg801i9sz896mlrgfsjfcz62636prb27k5hmixqz";
-                  name = "coreutils-tail-inotify-race.patch";
-              }) else null);
+    patches =
+      lib.optional stdenv.isCygwin ./coreutils-8.23-4.cygwin.patch
+      ++ lib.optional stdenv.isArm
+        (fetchurl {
+          url = "http://git.savannah.gnu.org/cgit/coreutils.git/patch/?id=3ba68f9e64fa2eb8af22d510437a0c6441feb5e0";
+          sha256 = "1dnlszhc8lihhg801i9sz896mlrgfsjfcz62636prb27k5hmixqz";
+          name = "coreutils-tail-inotify-race.patch";
+        });
 
     # The test tends to fail on btrfs and maybe other unusual filesystems.
-    postPatch = stdenv.lib.optionalString (!stdenv.isDarwin) ''
+    postPatch = optionalString (!stdenv.isDarwin) ''
       sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh
       sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh
     '' +
        # This is required by coreutils-tail-inotify-race.patch to avoid more deps
-       stdenv.lib.optionalString stdenv.isArm ''
+       optionalString stdenv.isArm ''
          touch -r src/stat.c src/tail.c
        '';
 
@@ -83,20 +84,18 @@ let
     enableParallelBuilding = false;
 
     NIX_LDFLAGS = optionalString selinuxSupport "-lsepol";
-    FORCE_UNSAFE_CONFIGURE = stdenv.lib.optionalString (stdenv.system == "armv7l-linux" || stdenv.isSunOS) "1";
+    FORCE_UNSAFE_CONFIGURE = optionalString (stdenv.system == "armv7l-linux" || stdenv.isSunOS) "1";
 
     makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0";
 
     # e.g. ls -> gls; grep -> ggrep
-    postFixup = # feel free to simplify on a mass rebuild
-      if withPrefix then
+    postFixup = optionalString withPrefix
       ''
         (
           cd "$out/bin"
           find * -type f -executable -exec mv {} g{} \;
         )
-      ''
-      else null;
+      '';
 
     meta = {
       homepage = http://www.gnu.org/software/coreutils/;
@@ -109,11 +108,11 @@ let
         operating system.
       '';
 
-      license = stdenv.lib.licenses.gpl3Plus;
+      license = licenses.gpl3Plus;
 
-      platforms = stdenv.lib.platforms.all;
+      platforms = platforms.all;
 
-      maintainers = [ stdenv.lib.maintainers.eelco ];
+      maintainers = [ maintainers.eelco ];
     };
   };
 in

From bf63de1613396a1a4d1f27fea73f125988d468a7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 18 Feb 2016 22:30:42 +0100
Subject: [PATCH 1532/2285] separateDebugInfo: Handle weird filenames properly

---
 .../build-support/setup-hooks/separate-debug-info.sh | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh
index 617bbba58456..cf3d7b07a499 100644
--- a/pkgs/build-support/setup-hooks/separate-debug-info.sh
+++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh
@@ -11,15 +11,13 @@ _separateDebugInfo() {
     dst="$dst/lib/debug/.build-id"
 
     # Find executables and dynamic libraries.
-    local -a files=($(find "$prefix" -type f -a \( -perm /0100 -o -name "*.so" -o -name "*.so.*" \)))
-
     local i magic
-    for i in "${files[@]}"; do
+    while IFS= read -r -d $'\0' i; do
         # Skip non-ELF files.
-        exec 10< "$i"
-        read -n 4 -u 10 magic
+        exec {fd}< "$i"
+        read -n 4 -u $fd magic
+        exec {fd}<&-
         if ! [[ "$magic" =~ ELF ]]; then continue; fi
-        exec 10<&-
 
         # Extract the Build ID. FIXME: there's probably a cleaner way.
         local id="$(readelf -n "$i" | sed 's/.*Build ID: \([0-9a-f]*\).*/\1/; t; d')"
@@ -36,7 +34,7 @@ _separateDebugInfo() {
 
         # Also a create a symlink <original-name>.debug.
         ln -sfn ".build-id/${id:0:2}/${id:2}.debug" "$dst/../$(basename "$i")"
-    done
+    done < <(find "$prefix" -type f -a \( -perm /0100 -o -name "*.so" -o -name "*.so.*" \) -print0)
 }
 
 # - We might prefer to compress the debug info during link-time already,

From d71a4851e8a2ef52f6d806d65822290cdbae8804 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 18 Feb 2016 22:52:44 +0100
Subject: [PATCH 1533/2285] Don't try to apply patchelf to non-ELF binaries

---
 .../setup-hooks/separate-debug-info.sh          |  8 ++------
 .../tools/misc/patchelf/setup-hook.sh           | 17 ++++++++++-------
 pkgs/stdenv/generic/setup.sh                    | 11 +++++++++++
 3 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/pkgs/build-support/setup-hooks/separate-debug-info.sh b/pkgs/build-support/setup-hooks/separate-debug-info.sh
index cf3d7b07a499..37753d9ce406 100644
--- a/pkgs/build-support/setup-hooks/separate-debug-info.sh
+++ b/pkgs/build-support/setup-hooks/separate-debug-info.sh
@@ -13,11 +13,7 @@ _separateDebugInfo() {
     # Find executables and dynamic libraries.
     local i magic
     while IFS= read -r -d $'\0' i; do
-        # Skip non-ELF files.
-        exec {fd}< "$i"
-        read -n 4 -u $fd magic
-        exec {fd}<&-
-        if ! [[ "$magic" =~ ELF ]]; then continue; fi
+        if ! isELF "$i"; then continue; fi
 
         # Extract the Build ID. FIXME: there's probably a cleaner way.
         local id="$(readelf -n "$i" | sed 's/.*Build ID: \([0-9a-f]*\).*/\1/; t; d')"
@@ -34,7 +30,7 @@ _separateDebugInfo() {
 
         # Also a create a symlink <original-name>.debug.
         ln -sfn ".build-id/${id:0:2}/${id:2}.debug" "$dst/../$(basename "$i")"
-    done < <(find "$prefix" -type f -a \( -perm /0100 -o -name "*.so" -o -name "*.so.*" \) -print0)
+    done < <(find "$prefix" -type f -print0)
 }
 
 # - We might prefer to compress the debug info during link-time already,
diff --git a/pkgs/development/tools/misc/patchelf/setup-hook.sh b/pkgs/development/tools/misc/patchelf/setup-hook.sh
index a76fbfbd509c..03b6f362a779 100644
--- a/pkgs/development/tools/misc/patchelf/setup-hook.sh
+++ b/pkgs/development/tools/misc/patchelf/setup-hook.sh
@@ -5,12 +5,15 @@
 fixupOutputHooks+=('if [ -z "$dontPatchELF" ]; then patchELF "$prefix"; fi')
 
 patchELF() {
-    header "patching ELF executables and libraries in $prefix"
-    if [ -e "$prefix" ]; then
-        find "$prefix" \( \
-            \( -type f -a -name "*.so*" \) -o \
-            \( -type f -a -perm -0100 \) \
-            \) -print -exec patchelf --shrink-rpath '{}' \;
-    fi
+    header "shrinking RPATHs of ELF executables and libraries in $prefix"
+
+    local i
+    while IFS= read -r -d $'\0' i; do
+        if [[ "$i" =~ .build-id ]]; then continue; fi
+        if ! isELF "$i"; then continue; fi
+        echo "shrinking $i"
+        patchelf --shrink-rpath "$i" || true
+    done < <(find "$prefix" -type f -print0)
+
     stopNest
 }
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 7d25472993c5..8081b69bffd3 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -180,6 +180,17 @@ installBin() {
 }
 
 
+# Return success if the specified file is an ELF object.
+isELF() {
+    local fn="$1"
+    local magic
+    exec {fd}< "$fn"
+    read -n 4 -u $fd magic
+    exec {fd}<&-
+    if [[ "$magic" =~ ELF ]]; then return 0; else return 1; fi
+}
+
+
 ######################################################################
 # Initialisation.
 

From 516057ffa9746ac1bf58d5a868957c18c5b5a252 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Thu, 18 Feb 2016 18:15:14 -0500
Subject: [PATCH 1534/2285] ghcjs: replace integer-simple with integer-gmp

GHCJS uses integer-gmp, but cabal2nix generates a dependency list that
includes integer-simple instead. This tweaks the stage2 generator to
replace any instance of integer-simple with integer-gmp.

Things currently still work without this change (assuming
integer-simple is defined as null), as ghcjs includes integer-gmp in
its stage1 packages - so it's always available.

However, this change makes things a bit more explicit, rather than
leaving things to chance. If at any point the stage1 packages are also
split up into separate derivations, the integer-gmp package will need to
be passed along to the packages that depend on it. This change should
prevent some confusion going forward.
---
 .../haskell-modules/configuration-ghcjs.nix   |  6 ++++-
 .../haskell-modules/ghcjs/gen-stage2.rb       | 22 ++++++++++++++-----
 .../haskell-modules/ghcjs/stage2.nix          |  6 ++---
 3 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 53da845210e2..ac7a30d4cfb0 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -49,7 +49,11 @@ self: super:
   time = null;
   transformers = null;
   unix = null;
-  integer-simple = null;
+
+  # Don't set integer-simple to null!
+  # GHCJS uses integer-gmp, so any package expression that depends on
+  # integer-simple is wrong.
+  #integer-simple = null;
 
   # These packages are core libraries in GHC 7.10.x, but not here.
   bin-package-db = null;
diff --git a/pkgs/development/haskell-modules/ghcjs/gen-stage2.rb b/pkgs/development/haskell-modules/ghcjs/gen-stage2.rb
index 260e2ee2f12c..c801dbe3e4b7 100644
--- a/pkgs/development/haskell-modules/ghcjs/gen-stage2.rb
+++ b/pkgs/development/haskell-modules/ghcjs/gen-stage2.rb
@@ -28,16 +28,26 @@ stage2_packages = [
 nixpkgs = File.expand_path("../../../../..", __FILE__)
 boot = `nix-build #{nixpkgs} -A haskell.packages.ghcjs.ghc.ghcjsBoot`.chomp
 
+out = "".dup
+out << "{ ghcjsBoot, callPackage }:\n"
+out << "\n"
+out << "{\n"
+
 stage2_packages.each do |package|
   name = Pathname.new(package).basename
   nix = `cabal2nix file://#{boot}/#{package}  --jailbreak`
   nix.sub!(/src =.*?$/, "src = \"${ghcjsBoot}/#{package}\";")
   nix.sub!("libraryHaskellDepends", "doCheck = false;\n  libraryHaskellDepends")
-  nix = nix.split("\n").join("\n    ")
+  # cabal2nix somehow generates the deps for 'text' as if it had selected flag
+  # 'integer-simple' (despite not passing the flag within the generated
+  # expression). We want integer-gmp instead.
+  nix.gsub!(/integer-simple/, "integer-gmp")
+  nix = nix.split("\n").join("\n      ")
 
-  out = "".dup
-  out << "#{name} = callPackage\n"
-  out << "  (#{nix}) {};"
-
-  puts out
+  out << "  #{name} = callPackage\n"
+  out << "    (#{nix}) {};\n"
 end
+
+out << "}"
+
+puts out
diff --git a/pkgs/development/haskell-modules/ghcjs/stage2.nix b/pkgs/development/haskell-modules/ghcjs/stage2.nix
index f840869568c9..f84ddbdefa45 100644
--- a/pkgs/development/haskell-modules/ghcjs/stage2.nix
+++ b/pkgs/development/haskell-modules/ghcjs/stage2.nix
@@ -225,7 +225,7 @@
       }) {};
   text = callPackage
     ({ mkDerivation, array, base, binary, bytestring, deepseq, directory
-      , ghc-prim, HUnit, integer-simple, QuickCheck, quickcheck-unicode
+      , ghc-prim, HUnit, integer-gmp, QuickCheck, quickcheck-unicode
       , random, stdenv, test-framework, test-framework-hunit
       , test-framework-quickcheck2
       }:
@@ -235,11 +235,11 @@
         src = "${ghcjsBoot}/boot/text";
         doCheck = false;
         libraryHaskellDepends = [
-          array base binary bytestring deepseq ghc-prim integer-simple
+          array base binary bytestring deepseq ghc-prim integer-gmp
         ];
         testHaskellDepends = [
           array base binary bytestring deepseq directory ghc-prim HUnit
-          integer-simple QuickCheck quickcheck-unicode random test-framework
+          integer-gmp QuickCheck quickcheck-unicode random test-framework
           test-framework-hunit test-framework-quickcheck2
         ];
         jailbreak = true;

From 24e0fc99f9fecc817d917944f937648c7de119f2 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 24 Jan 2016 23:27:06 +0000
Subject: [PATCH 1535/2285] buildRubyGem: remove unecessary duplication

---
 .../ruby/build-ruby-gem/default.nix           | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix b/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix
index c5b9fba37aa0..effd343ecfd9 100644
--- a/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix
+++ b/pkgs/development/interpreters/ruby/build-ruby-gem/default.nix
@@ -50,24 +50,24 @@ lib.makeOverridable (
 , passthru ? {}
 , ...} @ attrs:
 
-if ! builtins.elem type [ "git" "gem" ]
-then throw "buildRubyGem: don't know how to build a gem of type \"${type}\""
-else
-
 let
   shellEscape = x: "'${lib.replaceChars ["'"] [("'\\'" + "'")] x}'";
   rubygems = (attrs.rubygems or defs.rubygems).override {
     inherit ruby;
   };
   src = attrs.src or (
-    if type == "gem"
-    then fetchurl {
-      urls = map (remote: "${remote}/gems/${gemName}-${version}.gem") remotes;
-      inherit (attrs) sha256;
-    } else fetchgit {
-      inherit (attrs) url rev sha256 fetchSubmodules;
-      leaveDotGit = true;
-    }
+    if type == "gem" then
+      fetchurl {
+        urls = map (remote: "${remote}/gems/${gemName}-${version}.gem") remotes;
+        inherit (attrs) sha256;
+      }
+    else if type == "git" then
+      fetchgit {
+        inherit (attrs) url rev sha256 fetchSubmodules;
+        leaveDotGit = true;
+      }
+    else
+      throw "buildRubyGem: don't know how to build a gem of type \"${type}\""
   );
   documentFlag =
     if document == []

From a92c609ec6428cedd816229f739b0aa28addde2a Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 25 Jan 2016 10:22:00 +0000
Subject: [PATCH 1536/2285] gemconfig: add eventmachine and msgpack

---
 pkgs/development/interpreters/ruby/gemconfig/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/interpreters/ruby/gemconfig/default.nix b/pkgs/development/interpreters/ruby/gemconfig/default.nix
index 787c3be54e35..dd4ae725095d 100644
--- a/pkgs/development/interpreters/ruby/gemconfig/default.nix
+++ b/pkgs/development/interpreters/ruby/gemconfig/default.nix
@@ -21,6 +21,7 @@
 , libiconv, postgresql, v8_3_16_14, clang, sqlite, zlib, imagemagick
 , pkgconfig , ncurses, xapian, gpgme, utillinux, fetchpatch, tzdata, icu, libffi
 , cmake, libssh2, openssl, mysql, darwin, git, perl, gecode_3, curl
+, libmsgpack
 }:
 
 let
@@ -40,6 +41,10 @@ in
     '';
   };
 
+  eventmachine = attrs: {
+    buildInputs = [ openssl ];
+  };
+
   ffi = attrs: {
     buildInputs = [ libffi pkgconfig ];
   };
@@ -56,6 +61,10 @@ in
     buildFlags = [ "--with-system-v8=true" ];
   };
 
+  msgpack = attrs: {
+    buildInputs = [ libmsgpack ];
+  };
+
   mysql2 = attrs: {
     buildInputs = [ mysql.lib zlib openssl ];
   };

From 3ad12f2decdab0da872899107917e8c247fd07dc Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Tue, 16 Feb 2016 23:10:46 +0900
Subject: [PATCH 1537/2285] inputMethod service: init

---
 nixos/modules/i18n/inputMethod/default.nix | 29 ++++++++++++++++++++++
 nixos/modules/i18n/inputMethod/fcitx.nix   | 11 +-------
 nixos/modules/i18n/inputMethod/ibus.nix    | 11 +-------
 nixos/modules/i18n/inputMethod/nabi.nix    | 22 +---------------
 nixos/modules/i18n/inputMethod/uim.nix     | 11 +-------
 nixos/modules/module-list.nix              |  1 +
 nixos/modules/rename.nix                   |  1 -
 7 files changed, 34 insertions(+), 52 deletions(-)
 create mode 100644 nixos/modules/i18n/inputMethod/default.nix

diff --git a/nixos/modules/i18n/inputMethod/default.nix b/nixos/modules/i18n/inputMethod/default.nix
new file mode 100644
index 000000000000..7e6a25bfb084
--- /dev/null
+++ b/nixos/modules/i18n/inputMethod/default.nix
@@ -0,0 +1,29 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+{
+  options = {
+    i18n.inputMethod = {
+      enabled = mkOption {
+        type    = types.nullOr (types.enum [ "ibus" "fcitx" "nabi" "uim" ]);
+        default = null;
+        example = "fcitx";
+        description = ''
+          Select the enabled input method. Input methods is a software to input symbols that are not available on standard input devices.
+
+          Input methods are specially used to input Chinese, Japanese and Korean characters.
+
+          Currently the following input methods are available in NixOS:
+
+          <itemizedlist>
+          <listitem><para>ibus: The intelligent input bus, extra input engines can be added using <literal>i18n.inputMethod.ibus.engines</literal>.</para></listitem>
+          <listitem><para>fcitx: A customizable lightweight input method, extra input engines can be added using <literal>i18n.inputMethod.fcitx.engines</literal>.</para></listitem>
+          <listitem><para>nabi: A Korean input method based on XIM. Nabi doesn't support Qt 5.</para></listitem>
+          <listitem><para>uim: The universal input method, is a library with a XIM bridge. uim mainly support Chinese, Japanese and Korean.</para></listitem>
+          </itemizedlist>
+        '';
+      };
+    };
+  };
+}
diff --git a/nixos/modules/i18n/inputMethod/fcitx.nix b/nixos/modules/i18n/inputMethod/fcitx.nix
index b0e7578810ad..f168f4451703 100644
--- a/nixos/modules/i18n/inputMethod/fcitx.nix
+++ b/nixos/modules/i18n/inputMethod/fcitx.nix
@@ -14,15 +14,6 @@ in
   options = {
 
     i18n.inputMethod.fcitx = {
-      enable = mkOption {
-        type    = types.bool;
-        default = false;
-        example = true;
-        description = ''
-          Enable Fcitx input method.
-          Fcitx can be used to input of Chinese, Korean, Japanese and other special characters.
-        '';
-      };
       engines = mkOption {
         type    = with types; listOf fcitxEngine;
         default = [];
@@ -36,7 +27,7 @@ in
 
   };
 
-  config = mkIf cfg.enable {
+  config = mkIf (config.i18n.inputMethod.enabled == "fcitx") {
     environment.systemPackages = [ fcitxPackage ];
     gtkPlugins = [ fcitxPackage ];
     qtPlugins  = [ fcitxPackage ];
diff --git a/nixos/modules/i18n/inputMethod/ibus.nix b/nixos/modules/i18n/inputMethod/ibus.nix
index e4bc15cf8912..86059751a3d2 100644
--- a/nixos/modules/i18n/inputMethod/ibus.nix
+++ b/nixos/modules/i18n/inputMethod/ibus.nix
@@ -13,15 +13,6 @@ in
 {
   options = {
     i18n.inputMethod.ibus = {
-      enable = mkOption {
-        type    = types.bool;
-        default = false;
-        example = true;
-        description = ''
-          Enable IBus input method.
-          IBus can be used input of Chinese, Korean, Japanese and other special characters.
-        '';
-      };
       engines = mkOption {
         type    = with types; listOf ibusEngine;
         default = [];
@@ -34,7 +25,7 @@ in
     };
   };
 
-  config = mkIf cfg.enable {
+  config = mkIf (config.i18n.inputMethod.enabled == "ibus") {
     # Without dconf enabled it is impossible to use IBus
     environment.systemPackages = [ ibusPackage pkgs.gnome3.dconf ];
 
diff --git a/nixos/modules/i18n/inputMethod/nabi.nix b/nixos/modules/i18n/inputMethod/nabi.nix
index 7f97135fee1e..8c3965955130 100644
--- a/nixos/modules/i18n/inputMethod/nabi.nix
+++ b/nixos/modules/i18n/inputMethod/nabi.nix
@@ -1,28 +1,8 @@
 { config, pkgs, lib, ... }:
 
 with lib;
-
-let 
-  cfg = config.i18n.inputMethod.nabi;
-in
 {
-  options = {
-
-    i18n.inputMethod.nabi = {
-      enable = mkOption {
-        type    = types.bool;
-        default = false;
-        example = true;
-        description = ''
-          Enable nabi input method.
-          Nabi can be used to input Korean.
-        '';
-      };
-    };
-
-  };
-{
-  config = mkIf cfg.enable {
+  config = mkIf (config.i18n.inputMethod.enabled == "nabi") {
     environment.systemPackages = [ pkgs.nabi ];
     qtPlugins  = [ pkgs.nabi ];
 
diff --git a/nixos/modules/i18n/inputMethod/uim.nix b/nixos/modules/i18n/inputMethod/uim.nix
index 0154cdc5057a..401e1932f70c 100644
--- a/nixos/modules/i18n/inputMethod/uim.nix
+++ b/nixos/modules/i18n/inputMethod/uim.nix
@@ -9,15 +9,6 @@ in
   options = {
 
     i18n.inputMethod.uim = {
-      enable = mkOption {
-        type    = types.bool;
-        default = false;
-        example = true;
-        description = ''
-          Enable uim input method.
-          Uim can be used to input of Chinese, Korean, Japanese and other special characters.
-        '';
-      };
       toolbar = mkOption {
         type    = types.enum [ "gtk" "gtk3" "gtk-systray" "gtk3-systray" "qt4" ];
         default = "gtk";
@@ -30,7 +21,7 @@ in
 
   };
 
-  config = mkIf cfg.enable {
+  config = mkIf (config.i18n.inputMethod.enabled == "uim") {
     environment.systemPackages = [ pkgs.uim ];
     gtkPlugins = [ pkgs.uim ];
     qtPlugins  = [ pkgs.uim ];
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 7fe4a90a1354..eb4045fdfdc3 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -43,6 +43,7 @@
   ./hardware/video/nvidia.nix
   ./hardware/video/ati.nix
   ./hardware/video/webcam/facetimehd.nix
+  ./i18n/inputMethod/default.nix
   ./i18n/inputMethod/fcitx.nix
   ./i18n/inputMethod/ibus.nix
   ./i18n/inputMethod/nabi.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 698c28f37c8e..6d5ee6fc84e9 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -60,7 +60,6 @@ with lib;
     (mkRenamedOptionModule [ "services" "tarsnap" "config" ] [ "services" "tarsnap" "archives" ])
 
     # ibus
-    (mkRenamedOptionModule [ "programs" "ibus" "enable" ]  [ "i18n" "inputMethod" "ibus" "enable" ])
     (mkRenamedOptionModule [ "programs" "ibus" "plugins" ] [ "i18n" "inputMethod" "ibus" "engines" ])
 
     # proxy

From c374ce26b0dec50bfd51aab86bc61648296e28d4 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Thu, 18 Feb 2016 19:15:02 -0500
Subject: [PATCH 1538/2285] ghcjs-shims: 2016/01/07 -> 2016/02/10

Bump revisions: 45f44f5f027 -> 4df1808d031
---
 pkgs/development/compilers/ghcjs/shims.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs/shims.nix b/pkgs/development/compilers/ghcjs/shims.nix
index dbbf15de6c8b..2d68ea075515 100644
--- a/pkgs/development/compilers/ghcjs/shims.nix
+++ b/pkgs/development/compilers/ghcjs/shims.nix
@@ -2,6 +2,6 @@
 fetchFromGitHub {
   owner = "ghcjs";
   repo = "shims";
-  rev = "45f44f5f027ec03264b61b8049951e765cc0b23a";
-  sha256 = "090pz4rzwlcrjavbbzxhf6c7rq7rzmr10g89hmhw4c65c4fyyykp";
+  rev = "4df1808d03117ddcd45f276f0ddd85c73e59506a";
+  sha256 = "0nay4pmq3yqqvpz23709i3729840idpcc2ii2jd0xvaj1z61adda";
 }

From 392699a82d2c98fe4fa451364ec3b50d22ed5732 Mon Sep 17 00:00:00 2001
From: Brian McKenna <bmckenna@atlassian.com>
Date: Thu, 18 Feb 2016 13:50:26 +1100
Subject: [PATCH 1539/2285] ue4: init at 4.10.2

This builds Unreal Engine 4 and has a wrapper to start the editor.

Sadly the application requires write access to a lot of paths. I have a
hack to do a symlink tree under $HOME and it works well, the UE4Editor
binary just needs to be not a symlink.
---
 pkgs/games/ue4/cdn-deps.nix              | 7028 ++++++++++++++++++++++
 pkgs/games/ue4/default.nix               |   82 +
 pkgs/games/ue4/generate-expr-from-cdn.sh |   37 +
 pkgs/top-level/all-packages.nix          |    2 +
 4 files changed, 7149 insertions(+)
 create mode 100644 pkgs/games/ue4/cdn-deps.nix
 create mode 100644 pkgs/games/ue4/default.nix
 create mode 100644 pkgs/games/ue4/generate-expr-from-cdn.sh

diff --git a/pkgs/games/ue4/cdn-deps.nix b/pkgs/games/ue4/cdn-deps.nix
new file mode 100644
index 000000000000..76c11c6baa70
--- /dev/null
+++ b/pkgs/games/ue4/cdn-deps.nix
@@ -0,0 +1,7028 @@
+{ fetchurl }:
+
+{
+  "0049fd8a61e04257b6dcb37217d4d603cd74cc6b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0049fd8a61e04257b6dcb37217d4d603cd74cc6b;
+    sha256 = "1dcyxixgqsw4lcwg9066q39yghhppfp85yyi4r4drq5j5rg3dgb1";
+  };
+  "0055e020f7505cf021eb66b73e3a8fa3cc308b05" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/0055e020f7505cf021eb66b73e3a8fa3cc308b05;
+    sha256 = "1i2ff0hzrs2kdqv860wjnddyp80asanx5zzispsbzm95iljfby70";
+  };
+  "007491dae0c56c74ca78a46639d8e41243bde83f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/007491dae0c56c74ca78a46639d8e41243bde83f;
+    sha256 = "14q664k5dgyc4f30mc6f2537w9mxw9407nba3023xss9vfijldgv";
+  };
+  "00927d42baa3e7f8fb204e62ea43ff39384f8679" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/00927d42baa3e7f8fb204e62ea43ff39384f8679;
+    sha256 = "1jpzh24r1xkn8vifqyqljfbb9jbmcl7syigaq2lkjjxfl9nzwqqv";
+  };
+  "0092dbc71c6b4bd985a697ac3d1f1597c0bc82f6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/0092dbc71c6b4bd985a697ac3d1f1597c0bc82f6;
+    sha256 = "17cdmr5p4vyq04m0njv4b82l6gnp0dpxs22y5466ksnksckh9xwz";
+  };
+  "009f9921fd444183569a1057648f0c3573688f98" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/009f9921fd444183569a1057648f0c3573688f98;
+    sha256 = "0pc107dgkg8v51gy4083myp01lby8xfvlkx5xplsq55lxifkxcqy";
+  };
+  "00ab55311f402e65385f797ea5e1c4ab4663553e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/00ab55311f402e65385f797ea5e1c4ab4663553e;
+    sha256 = "1d2hwgd2zk4alxb6fb4fzkxcpkl3gp95v39jd0g77frj5ajnf5yc";
+  };
+  "00add27414f59890b092ab4b03bbbc585cedb847" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/00add27414f59890b092ab4b03bbbc585cedb847;
+    sha256 = "0jmbay34rl6srpkylamsy409a2rpqb9jwhyxfph34bazsp3jv04k";
+  };
+  "00b98d4aec7a1f350c0fdd8186841aa96c0cce53" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/00b98d4aec7a1f350c0fdd8186841aa96c0cce53;
+    sha256 = "0lh9rdgg9nr2mxvgx0rdg0zk4q5gsza4yacxp933bm41vvdwr3kq";
+  };
+  "00c4eb5dc59035a15405197341b6b925473708db" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/00c4eb5dc59035a15405197341b6b925473708db;
+    sha256 = "00xl95hd2qcnzylvqc77pv758frws8z8anf4kb5vhz3lcv8c1n9n";
+  };
+  "00f460c11eef99d9e125c11687a40d39f7b74873" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/00f460c11eef99d9e125c11687a40d39f7b74873;
+    sha256 = "1zp0qrc4nrv2cy7mc0z7chm75pa6ffzzz7yr32lw9ijzv5rbcjml";
+  };
+  "0104416c142ca7b3174660267c22f049db573bdb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/0104416c142ca7b3174660267c22f049db573bdb;
+    sha256 = "0lzg75w1cnbm9yll32la7gcq5wv7wr8ckx3kxv4adhkkaz53bail";
+  };
+  "01687bd36252e9a263022192524ca8835ae9552b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/01687bd36252e9a263022192524ca8835ae9552b;
+    sha256 = "0cdql0x9nppg7lh4rlnc1k4cj4pv404881z02miqlr99a05rwzpv";
+  };
+  "01a1b60633d0e13df7952058973ca4979a5389e2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/01a1b60633d0e13df7952058973ca4979a5389e2;
+    sha256 = "127llh0ybq7f6fnsmh1hrh4xh46ap0x3za9xxqfmj0qhfbz5nanr";
+  };
+  "01b5b6310231646e87a0bfefaebfee7f0c9e1929" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/01b5b6310231646e87a0bfefaebfee7f0c9e1929;
+    sha256 = "0agyb9fy1vpnc06073c8j1k3d9n475pznf5chaxpcqpppcqi8j55";
+  };
+  "01d26cddb178f064c3cd74a09430970bf6cc12b7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/01d26cddb178f064c3cd74a09430970bf6cc12b7;
+    sha256 = "1lxb8g2hd2jdswinzgnr4dqknh1c6nm6xh3fwbkvniglglrr7w9z";
+  };
+  "01e6c01a96b3cbe860204f191d1b9153509a9dee" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/01e6c01a96b3cbe860204f191d1b9153509a9dee;
+    sha256 = "1ll3kahg1bvrw1djm855fan0yhfv385qaqbvsx11h4f7nsk1y8l1";
+  };
+  "0255260ee4d81de161e877cdcc3af4d7fcf8d0e3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0255260ee4d81de161e877cdcc3af4d7fcf8d0e3;
+    sha256 = "1b35v17pkpxjak9nslgmqik0779yqpfmrqhxih85fw38cx883y9k";
+  };
+  "0287d808513bc8ab41d3a122437451b3505e5a06" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0287d808513bc8ab41d3a122437451b3505e5a06;
+    sha256 = "0kjqvqs537kjji645wj9c7g0vm49saz7844gmsvaxbxa7j6qpv8r";
+  };
+  "0294cec564dabb2b74767382fed8bf1d85c3dd6a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0294cec564dabb2b74767382fed8bf1d85c3dd6a;
+    sha256 = "1bc87j7aqh55c08r95iqhjy7yqyvjfrhnl5p9nvd9rmsywlcdpy6";
+  };
+  "02b79c9e934ba5d5df21ca904400f6921b0e919c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/02b79c9e934ba5d5df21ca904400f6921b0e919c;
+    sha256 = "0ky6wm47c5nly14jj171nvr1hyx9qn027jpxzhffmdj1zd0ab1n2";
+  };
+  "02db54285fbdc7bcbc5072716c06102dadbe73a3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/02db54285fbdc7bcbc5072716c06102dadbe73a3;
+    sha256 = "08j35dhpj1wpsjck57w6sncy9vciqmhpnzsmrb8a698alb4nq4la";
+  };
+  "02e23f8b72f230a371e141cf422d6339edc7f136" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/02e23f8b72f230a371e141cf422d6339edc7f136;
+    sha256 = "0lgfl91hyy4isy03jp1lprlr6p6vq95vs408rr620xrrx8v9g1xj";
+  };
+  "02e31aefb786970a757120d82ef7e57d99598e2a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/02e31aefb786970a757120d82ef7e57d99598e2a;
+    sha256 = "0kzp6hvpclqgm6ik46ifsb7q8cnyc1jpmn9hablz3bbcgz1ja1v6";
+  };
+  "02e3996085d4a6eadcc0403adb002e453626ad38" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/02e3996085d4a6eadcc0403adb002e453626ad38;
+    sha256 = "1av0m7l2yb9k74482i60gbshpbiay25j6272p78vzzky55gfvvkq";
+  };
+  "02f911003167be7b08c3fbf9bdababa124958f48" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2489400-f6cf8f7e3aa44b46b137c223b0724bd6/02f911003167be7b08c3fbf9bdababa124958f48;
+    sha256 = "1a63d9d3ca0fhzniqwksxfs1q9fzxa8wz8mmcavnhmh2hcdf8l7s";
+  };
+  "037becd787cf315691a800ac53fc1ace30efc22f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/037becd787cf315691a800ac53fc1ace30efc22f;
+    sha256 = "19jwdg0gi8axng2jc52i39bahzyhsksmza8ich6xbga7vzmcslic";
+  };
+  "038a65feb0c32e0a8997e4798012f90e380a5fa4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/038a65feb0c32e0a8997e4798012f90e380a5fa4;
+    sha256 = "11c1sk31f1wv2by7fvmwjlw0bf2khjh1gn7sx5iib6bx10mfk6zg";
+  };
+  "03bb65f1dc5e3bf35f5d6d5d6068a10aed0cf4a8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/03bb65f1dc5e3bf35f5d6d5d6068a10aed0cf4a8;
+    sha256 = "1akwa8n1h491r45w8z4396bpg53szq42ac081ra087a92x699h59";
+  };
+  "03eac14bed108c28a0a4450fa4f534d145c12179" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/03eac14bed108c28a0a4450fa4f534d145c12179;
+    sha256 = "1y2gwhynvyr499kj3l4w5wj55q938n6swb8wbzily46r24g8d6g6";
+  };
+  "0419d8143ae34750eb7de7c51c4d3cd231bbce51" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0419d8143ae34750eb7de7c51c4d3cd231bbce51;
+    sha256 = "1nr22bs71msfzp0ndi5hm7y4blv51039dpcv05a0xv4s939y16bl";
+  };
+  "041d9b9407ae8d58c7c3a7110af093916fee573e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/041d9b9407ae8d58c7c3a7110af093916fee573e;
+    sha256 = "14syxk0bgc8khzabliibvm82asc692pyxa8m78f3jii47gy6vwcn";
+  };
+  "042de486169ab637609e1b035138f64893e04ad5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/042de486169ab637609e1b035138f64893e04ad5;
+    sha256 = "0j5p0bid72xs8r63nbkyx77w89fy6d1kbx6axph5w6nnkr2flvy6";
+  };
+  "049aaeab9a2e4405e946d0097d1a3e824c128df6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/049aaeab9a2e4405e946d0097d1a3e824c128df6;
+    sha256 = "0d56izrz5cbgib0mxzd5zj6yzvfln4rglpvxi1h05l5xrd9rcc9s";
+  };
+  "04b9a9091bba671b960e607283c6434625072697" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/04b9a9091bba671b960e607283c6434625072697;
+    sha256 = "1sbhvy7dyir4gk6ignmbssmmhjkqm34rpzri9jv50k59lhdzrmz4";
+  };
+  "04e55b081d4e6680ca0da096eab39443e53aeb2a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2621793-1958bfdd4e3b49f3a0ca6a4c08a60a0a/04e55b081d4e6680ca0da096eab39443e53aeb2a;
+    sha256 = "1f4mypy8nv0m4xzljlj9d5h13670r78lmp1nrzkyj6pkjaiz9l1h";
+  };
+  "04ec121ce824aec5caca1ddb70eaa21e0191a5b4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/04ec121ce824aec5caca1ddb70eaa21e0191a5b4;
+    sha256 = "0a32ss082pizm8qybmpsl91mc60290wj192rlgbp7q7rvn85j5yi";
+  };
+  "04f2ae9278db23034ee3cb0bbbe67db49b5881fc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/04f2ae9278db23034ee3cb0bbbe67db49b5881fc;
+    sha256 = "1d0l0kjscdgwm5sb454hd7n5vn0x61v78b7zklhjrfzmfsqxxijz";
+  };
+  "052ad62516b7d63eaf4c6410cd2dca0264734665" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/052ad62516b7d63eaf4c6410cd2dca0264734665;
+    sha256 = "1a70f5mk7z053i0xl949gngkysdg3kc810mm88mirzn501xc6rq3";
+  };
+  "05be3410a78afea71327d64933707b9f7550d2f6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/05be3410a78afea71327d64933707b9f7550d2f6;
+    sha256 = "1vb8vsjx7h1k9vdikm02lzwjpyfm409kh8q8bv94d0plh9cpg03l";
+  };
+  "061b4fb485e75b96f3266aff9a762a28b2d77616" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/061b4fb485e75b96f3266aff9a762a28b2d77616;
+    sha256 = "0f4nbrgdpb6dy6z0brk7fidx97svxljqcwng4skqg0rww9275hh2";
+  };
+  "0625d1c6055de9cf9025b2e61299912a56f88ccb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/0625d1c6055de9cf9025b2e61299912a56f88ccb;
+    sha256 = "150c0n1n1fa6f89pxv3rp8yxfcvkca3ygp7fwia0s8zcakn02ail";
+  };
+  "0668d99201136f1b598c5795fa3e58050020e8b1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0668d99201136f1b598c5795fa3e58050020e8b1;
+    sha256 = "0cmd3ix5b39bakyrra0p9847lq14kb7jkvcl3hw30v8kww4m056w";
+  };
+  "067baa5f7a564bf867b5b337369950ad00e13e99" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/067baa5f7a564bf867b5b337369950ad00e13e99;
+    sha256 = "1jmdc1hpl7hgn22ws8357lg0v98a51d3qa1fqhq3bbvhcssgls62";
+  };
+  "06ebb79f97706bad4850ce9077a9e7e90185e324" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/06ebb79f97706bad4850ce9077a9e7e90185e324;
+    sha256 = "18ykxqm31gd1ij30a9vf8saygjk162k2jqmpybx00vqawqwbbcx5";
+  };
+  "06f561a38764b8e9c4087a97ed512c995363927c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/06f561a38764b8e9c4087a97ed512c995363927c;
+    sha256 = "1wassg3y5yd5i5jqsd528ddb8j9f65r4k5g981z6l70spk5l0v34";
+  };
+  "0702299294e21ac823c34d43de2a89140288143d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/0702299294e21ac823c34d43de2a89140288143d;
+    sha256 = "08wjf4zk7pba5ac5s2d26zlrq7ld12bd7l35xn2pz9lsd1j4qwry";
+  };
+  "070b80d72403fb102b91c2c7c1eababab6aec2f7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/070b80d72403fb102b91c2c7c1eababab6aec2f7;
+    sha256 = "0jv0j6qp1k1zwww3qvrckisa5cdj39xq9aw3ljsvdfsp10x4i4a3";
+  };
+  "07a88f4f32dff82062e33545b17b0011c4f3242b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/07a88f4f32dff82062e33545b17b0011c4f3242b;
+    sha256 = "139xl7bzcab78s1ma42vl2yqxflxrpgl8qglnwbfdlq1nxbj8yiq";
+  };
+  "07bac5d4a23c9a7bc1695e030017c8694d72a735" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/07bac5d4a23c9a7bc1695e030017c8694d72a735;
+    sha256 = "0f6pjix0slzd06yqgd7vfsdssc3qkqi3av6kvfmjcn22xryq2qn6";
+  };
+  "0818124e55b7ae14e580ada76b6fca5656c05836" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0818124e55b7ae14e580ada76b6fca5656c05836;
+    sha256 = "0a3frk5viy0pv4ac7jv50j74d985hgq2dnjq6vgkrdcrir7zbz0m";
+  };
+  "084e5de210ff35e876901668dd00537a3a019ac5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/084e5de210ff35e876901668dd00537a3a019ac5;
+    sha256 = "08v9q7796r1nab02ghyvbdsip8bmw07cab6w079vvrqwkrg2ajcm";
+  };
+  "0898f76e0b61476b01184a79f59737933332711f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0898f76e0b61476b01184a79f59737933332711f;
+    sha256 = "1qrz8ld9a5lv5pxs34icsic6c8fy1ydjx79zf35hvzdaqkds22jc";
+  };
+  "08aafc6b5bf5f6834032ea41a414bf57378e9d6e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/08aafc6b5bf5f6834032ea41a414bf57378e9d6e;
+    sha256 = "10v3b2bsx240fa9xvarh5r4klz2gnqg9ljf2h34j8pqs1fq6dvc2";
+  };
+  "09007b1cd8b9f90a5ab85549323903759f18b852" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/09007b1cd8b9f90a5ab85549323903759f18b852;
+    sha256 = "0vx3k63svxh9iyzy69vwkm6i9kays9jdkc8fzyd71k9wspq4ynvr";
+  };
+  "09510670263d739c9271c8d43047c1e427873509" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2702576-55d4c00170ec40c8a92540c9aee72a96/09510670263d739c9271c8d43047c1e427873509;
+    sha256 = "1wzb6gsxrvc3l1yhlaj533k1ha8c6s5bpnivs0jcqflnc3lfcza7";
+  };
+  "095aae7dd171f8fa10295657651b0889b387ad68" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/095aae7dd171f8fa10295657651b0889b387ad68;
+    sha256 = "0fig4i1afa9y27hhq3dkc5j36hwi5m1h2yviwv2kv60g9k01rsil";
+  };
+  "09601c1491f5d27c2533b4e7c9fb26a2e5eaa4d3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/09601c1491f5d27c2533b4e7c9fb26a2e5eaa4d3;
+    sha256 = "1b99ms4v6shf8ld7faxlckgmz8c8ii5avkhk88809ry6v4mhm2qx";
+  };
+  "09732d6bf762ba4d866616248b46adff0e12d76b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/09732d6bf762ba4d866616248b46adff0e12d76b;
+    sha256 = "0g096y34r6a3f270n7gkh96ybrjl4afgscpzwbk860dik4xkzvnj";
+  };
+  "09b220dceaa8205e3a32a877c58c678dfdb8555f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/09b220dceaa8205e3a32a877c58c678dfdb8555f;
+    sha256 = "1a108nfspg6v2mfgj7g310cxvgq1b3b9i8l0sll8p7dcwdqk5077";
+  };
+  "0a17d50561c9bf1d85e82416f97726243726fe8e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/0a17d50561c9bf1d85e82416f97726243726fe8e;
+    sha256 = "1ibf6hr9zkrvj7x4mlmmvi552is75p60rgbcrr2bxjnk5vd5kixn";
+  };
+  "0a85e36f224c350b058936fdb88cb656864411c4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0a85e36f224c350b058936fdb88cb656864411c4;
+    sha256 = "1wdrvm3s4asra41zgr309y5rwlw0nng1m4cd8p4gcch8q8vybl1z";
+  };
+  "0adcf8b7399354848f3b1659ae1bdfebe7c5fb54" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0adcf8b7399354848f3b1659ae1bdfebe7c5fb54;
+    sha256 = "0f3zipklkp21qmsi5y9bm5539pgjn9h85w3r7qxhsa7arq4bfv9y";
+  };
+  "0ae58afa6b821d9172b327831297925b165ba540" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0ae58afa6b821d9172b327831297925b165ba540;
+    sha256 = "0xi644mlx97vyfzcp4zg2xy4d7xl6bpsqbyrja8vc02ddcqrz8ws";
+  };
+  "0b0c49fd66d2a1e20b9c3dfbaf57920646259399" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0b0c49fd66d2a1e20b9c3dfbaf57920646259399;
+    sha256 = "1862n366gcqqkf5apc19qg6w6vmyap3hz5f91lskhd3i28zmzcr6";
+  };
+  "0b19af7719665b5651dfb183e0f462030575539c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0b19af7719665b5651dfb183e0f462030575539c;
+    sha256 = "02015jsy2mzf4hkir3f11xxg2z21vrz5qnwyias322jr3g3k4x8n";
+  };
+  "0b2364f6696f39626a964e4370380b3fc8768b43" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/0b2364f6696f39626a964e4370380b3fc8768b43;
+    sha256 = "0nfz5g0wp7l4kbdjg3qvl0p2nzcravivw0bhbwb7zppmmrsz08b9";
+  };
+  "0b2cd11ad11c170163c7958e24f339bf66609001" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2620227-83084f9091244f6c9bba34d6d2a0fc20/0b2cd11ad11c170163c7958e24f339bf66609001;
+    sha256 = "0qhsp71xk2pj9dq3al2pghnh5w1zsvfwgg4ykm2czn8dqpr6v2fm";
+  };
+  "0b41a5fe69764ca460a102d4569d5cf0a96262dc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0b41a5fe69764ca460a102d4569d5cf0a96262dc;
+    sha256 = "1w56h4m41178dyi9swrqjbl6jk6hz36i1ax27gmbvlmn71bd25sr";
+  };
+  "0b650b20c8c8aba9b4ffbfff4555352296b8026d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0b650b20c8c8aba9b4ffbfff4555352296b8026d;
+    sha256 = "0z46pi0np99l1dd63b8c7wlpzn9aqgfs8m90i8shkb8rr83yvqrd";
+  };
+  "0b65847315b6c2c97cf1cb6e6d159e22233c8251" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0b65847315b6c2c97cf1cb6e6d159e22233c8251;
+    sha256 = "14pcxkamnwscpdq1gw0jdmpxsvilq8wdgpzlgsifdmwhrbzq9dhw";
+  };
+  "0b6608a97e2540ea5f17c2efa77ffe1ee1b3c533" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0b6608a97e2540ea5f17c2efa77ffe1ee1b3c533;
+    sha256 = "03j28mjv9qhw3inkj2sq9ri7vbajkfg4yq4fydqgas8zxiy7p5sa";
+  };
+  "0bbfc90e364f03102506acd5ad039a28e02cadf7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2618399-180c811b4d074c95af323aa82cdccb34/0bbfc90e364f03102506acd5ad039a28e02cadf7;
+    sha256 = "1p276i1gcj0hm4y3n46mz7inc0dh5naz2kj85aa07dy734qmnayf";
+  };
+  "0bcc47e413bef8dae40e79c9757941b0db15f97a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0bcc47e413bef8dae40e79c9757941b0db15f97a;
+    sha256 = "0h6qjxy1p9x7yfyawygb44bhlmdli96riclq9jbw9dypgpywmff3";
+  };
+  "0be87d25f74713be10bd98e1e966d795cfe4e5dc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0be87d25f74713be10bd98e1e966d795cfe4e5dc;
+    sha256 = "0pd540vl2hs57fsbjrxj0vzsilr8mqx5ad47kmcpsk3nckrq6p1w";
+  };
+  "0c8fc2ef1a59d232fd4f22a022e20d492f6e2a84" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/0c8fc2ef1a59d232fd4f22a022e20d492f6e2a84;
+    sha256 = "0knhyb5y0fmbjds7qjhgxq5cvicv925qbp5pkdsa4bqab8vgzjaq";
+  };
+  "0c95d970796b73f6699b10dc55a5f23caeb0e7b6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0c95d970796b73f6699b10dc55a5f23caeb0e7b6;
+    sha256 = "157klpl089j437v12ngyfy20jipwdb252khg84dhz54dnmsl30l7";
+  };
+  "0cad2c40463fe8795e6ba38765dd8c775689eca4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/0cad2c40463fe8795e6ba38765dd8c775689eca4;
+    sha256 = "1h85ix8ilw61jqiihm4xgkhknsqwfmkhw6zmyc1b3h5iczwa56m4";
+  };
+  "0cb75afcdc3e2acc810f4eaab1c4d0e47b71e66e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0cb75afcdc3e2acc810f4eaab1c4d0e47b71e66e;
+    sha256 = "1w1h8gj1sln0h4vsbqljnbdwmvfii0iykf9p8pfi616pi1rk0zrz";
+  };
+  "0cec09dea442a96d2db56d5f25830c204faf9c73" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0cec09dea442a96d2db56d5f25830c204faf9c73;
+    sha256 = "1lik501r5m0jgnrlkimbwanwdd9j5j81xlwcksiyfaf4mx4jfd5q";
+  };
+  "0d1962bd98cbfd172126e306fff8cf75b8796bc7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0d1962bd98cbfd172126e306fff8cf75b8796bc7;
+    sha256 = "1vjgl25j9v7qnv9829jprsgdlgagsh9rzv22fpq9yyiclxavhza2";
+  };
+  "0d5caa5b5d94abc659bf759feee88b37f4cf4618" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/0d5caa5b5d94abc659bf759feee88b37f4cf4618;
+    sha256 = "0660nyachjcvccrdkrarqwwalp5whg7ja998la6vqbpfq3m4x9dx";
+  };
+  "0dcd2138b0d77e84dd01b019736eefc97445f806" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0dcd2138b0d77e84dd01b019736eefc97445f806;
+    sha256 = "0a5693qjs5ap9m3idqiadaym0k6j4saan6jd7mi1db9y66r4czsk";
+  };
+  "0e1315e453e0b243c9c0afc4965bc9042f5eadfa" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/0e1315e453e0b243c9c0afc4965bc9042f5eadfa;
+    sha256 = "1gjk3jjcnns9pcab7q7b8i46k8lsn5sjmp9vh0cswkl23v3qqwwg";
+  };
+  "0e1a08f56c646fa8ce394a0e41b8cab5a658268d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/0e1a08f56c646fa8ce394a0e41b8cab5a658268d;
+    sha256 = "1905j12lxpla20xiv6f2cjmnp100mzzp8076n8j295fdn7vbrb9v";
+  };
+  "0e26168a7254c7ba26bf4c06b28033e8387c689c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/0e26168a7254c7ba26bf4c06b28033e8387c689c;
+    sha256 = "026w09ixxqzfgp0kbf60h7qwixd2gnx4v13kb9l3nn0g9p73slzk";
+  };
+  "0e4c8e5cf7fcfddf545be976ecd6d676331d54c9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613635-9840736c5f9647ffa600ff7b7e36f4ea/0e4c8e5cf7fcfddf545be976ecd6d676331d54c9;
+    sha256 = "0r42n43jnwi8w8z0z08p6pzha973qxy3km94w3n0ywn7f1b20wbp";
+  };
+  "0e6c43d516af17c6766c4b204af1a1358451d364" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2748421-cc8960341ac147a18a63389f5fd32945/0e6c43d516af17c6766c4b204af1a1358451d364;
+    sha256 = "1n4n643zzh11k77vwvcsqsz10s8pks5729qbh9wq9ccrs2b5k2kd";
+  };
+  "0e934ae8f346ea8f7834da572917c93731ee3e71" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/0e934ae8f346ea8f7834da572917c93731ee3e71;
+    sha256 = "0n6czxwf531phc7l9d1daymylsvlhspfa6byx73nj2piifrnzcm3";
+  };
+  "0ed7e089f52f2e816998664ec165b776a056ee6e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/0ed7e089f52f2e816998664ec165b776a056ee6e;
+    sha256 = "0nl7j84np4v6109dnvslal6p6w8ycx8ai9nnagkg8bcsq9a4ramz";
+  };
+  "0ee5f371d8dffa94c5df7c2c1337d8a7029c022c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0ee5f371d8dffa94c5df7c2c1337d8a7029c022c;
+    sha256 = "0jh51nbdqcd7bz5sqj112q4y3iqr47lnp725f32s5ad9ywa2jrpv";
+  };
+  "0ef3349a6ee43e03e0390d117749207582bd62fb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/0ef3349a6ee43e03e0390d117749207582bd62fb;
+    sha256 = "14qi1p9fxb0mgvhnriqf1qx716ap18vfsjp7kdcmn295fqzkxl8x";
+  };
+  "0f5530749f1eb9cd579c611a2c19eb675d225841" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/0f5530749f1eb9cd579c611a2c19eb675d225841;
+    sha256 = "1i3ngjajjhv2yamk2hcza399iylja42ygjbp7kwqx6qxvc2vh02p";
+  };
+  "0f74ff9d91cbb2b2061d50909d5d7f093b845a72" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/0f74ff9d91cbb2b2061d50909d5d7f093b845a72;
+    sha256 = "06a5r840iksqmzch0l6hkngd2rv2s7dbwlp7dw1gwfd1ql9vm3c1";
+  };
+  "1015366202732d5b428dc71ad9ec5fa99ca1b874" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1015366202732d5b428dc71ad9ec5fa99ca1b874;
+    sha256 = "1s4q8bzbxypj650pwrbb6mqr9yqskavdrcj8kw03hj5fz29d9szy";
+  };
+  "1016254965add7631ca2982903c6d0169b0d45b2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1016254965add7631ca2982903c6d0169b0d45b2;
+    sha256 = "17rp6pixbs3qi9xyzh0w7kq1hcywckayd1q2db77m48rg36gvg6s";
+  };
+  "1028eaded56f0e46a92e7188a0e4dae970bc77c8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1028eaded56f0e46a92e7188a0e4dae970bc77c8;
+    sha256 = "0867qswbqmmlam1l1a2d2ynzb1p5fwwp92mfb19n1ippgy6d128g";
+  };
+  "104b55382829a7351cea26478445bfa8e601d755" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/104b55382829a7351cea26478445bfa8e601d755;
+    sha256 = "0sr5c506zphmxclrzbq9b23jc8bcvwx58hpqzqg07d94qw9p4rsb";
+  };
+  "104eb620cbaf2629b13d4f5dc9edc9a888ff2e33" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/104eb620cbaf2629b13d4f5dc9edc9a888ff2e33;
+    sha256 = "01z335z3ddkvsx4z96m9w96hbksg29miqyn6wmvgpbsvgbp1wmgp";
+  };
+  "106f60f7c4e09a6444df98f226b3b925941480d8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/106f60f7c4e09a6444df98f226b3b925941480d8;
+    sha256 = "18xzn1iphddc7hyniyhrlsv36cijij7724psb9nq2dz5dpclg3db";
+  };
+  "10723922ccc14914c163a9546c40f01779891869" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/10723922ccc14914c163a9546c40f01779891869;
+    sha256 = "0pi4s4r7pk6adb8v5f1g9bs3jb028yqsg4d82nd7p99qw4q4q20x";
+  };
+  "1077e9c2c6e2f36520c08a148ce3709a6e10a8ab" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1077e9c2c6e2f36520c08a148ce3709a6e10a8ab;
+    sha256 = "1ms7r8pkbrsrb7brbcralbmxl20lhb8a77zhiad3b9xbwyil4p67";
+  };
+  "109ac2799187c1e94076a2db14922c275e94adbb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/109ac2799187c1e94076a2db14922c275e94adbb;
+    sha256 = "1viw9fa3gd8sc4qdfxh5x5b9pz8712xa15sfgjr16h6mb9h5y4yy";
+  };
+  "10bc8f77ff0fe6245b5ecf2b32ffcee97d4d42d4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/10bc8f77ff0fe6245b5ecf2b32ffcee97d4d42d4;
+    sha256 = "0f7i36149z2g7i4j8z7d5d3xnw476d3raiij87y0siixw0fl0js1";
+  };
+  "10d7ee1bc39b827fc0238870cf1aebbee7ed2b0b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/10d7ee1bc39b827fc0238870cf1aebbee7ed2b0b;
+    sha256 = "1088hkj96l5kxx3mww39nmkv2mzvc97syx2a9w6yys89n5y166qg";
+  };
+  "1142cb9f18f922166ae87d131c1fd09dce63f6d9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1142cb9f18f922166ae87d131c1fd09dce63f6d9;
+    sha256 = "1frmz1rbhzfinz06lg14pcz7mbr1sddl6v9n53p2dq64lkrpcsw6";
+  };
+  "11485b16ed1b0a1f37aef0aec2e8a7afbf490e75" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/11485b16ed1b0a1f37aef0aec2e8a7afbf490e75;
+    sha256 = "1i1619cvimdj4a6786prdr1c76ga37blckyx6zzqkarq4idl3k9y";
+  };
+  "11beb714095ff4a699b6f0a3543c8c2b82cf1a0d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/11beb714095ff4a699b6f0a3543c8c2b82cf1a0d;
+    sha256 = "1iyb0g8rbhhjs87z8iadjddk254z3jn6g9c80v93i6vgw8k9bcbf";
+  };
+  "11fad551f44760406d524cb0e1892580b9be77bc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/11fad551f44760406d524cb0e1892580b9be77bc;
+    sha256 = "00bj5pkychks7kaipf1dqkw7bhf0597g4qlh6rbm8qn4zd5f2747";
+  };
+  "12468bf1be869d88d9a8104ffde7c4887839843d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/12468bf1be869d88d9a8104ffde7c4887839843d;
+    sha256 = "0h5a4gfvj1hjxv4lj0m4bzavfh8akwbz6wg027q0mjnr143k0pr9";
+  };
+  "12d1a73c1c063a416ba2a70fa0cb25ebee04cedf" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/12d1a73c1c063a416ba2a70fa0cb25ebee04cedf;
+    sha256 = "0wkrw8jwjwhk3zvrs883xhrwcrppg8j3plnvxb109d67k7c1pd1h";
+  };
+  "12d213957fbfe643a97d5072b1f6ae30aeebcbb7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/12d213957fbfe643a97d5072b1f6ae30aeebcbb7;
+    sha256 = "0p4pzcn3fmqnkz93wk023zzs1f12c1xpsx7fkz2hv8i4jm8mrkb4";
+  };
+  "12eb0444499ce41f101b1b5f9dd6b87894949511" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/12eb0444499ce41f101b1b5f9dd6b87894949511;
+    sha256 = "19nggqdvkq6rap0sqnpkyrwsc882dzy1cg2lbsbd88s2nn6lrc3q";
+  };
+  "131d64c4948a0370d99897b2ad5a968b160e4300" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/131d64c4948a0370d99897b2ad5a968b160e4300;
+    sha256 = "1g0wf836rpmy7g291wyf0xwyr8g196cb0val8lzg5pa5qxivpr1g";
+  };
+  "132e734bba8f24cfaecbe6e03b85b76158a57d1f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/132e734bba8f24cfaecbe6e03b85b76158a57d1f;
+    sha256 = "0g7qw0y8006hmmfpmrz80628l35380960j54iqrp88jbqlqsd1p9";
+  };
+  "139f335e517878be52106907638e80140951abaa" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/139f335e517878be52106907638e80140951abaa;
+    sha256 = "1xdwmml0i40dvdi148fzk7xp0wcpx4vfp488159xl09p88ad9zk3";
+  };
+  "13b3c6250566821e05b35dd3296b5686aae3f325" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/13b3c6250566821e05b35dd3296b5686aae3f325;
+    sha256 = "0dcis8x0fpq6k33bxfhnh0j0bywr084l8nla6jkx6pfvwirq06cy";
+  };
+  "13c7b27a977c4bf9c4e07a19ffb106c1128995bd" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/13c7b27a977c4bf9c4e07a19ffb106c1128995bd;
+    sha256 = "1387mczy66xavzg995734s7vg45nn895pm3pp8n2yrgzhd1qfzjz";
+  };
+  "13f0a72b4826430335caa709e76f92079ca53b13" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/13f0a72b4826430335caa709e76f92079ca53b13;
+    sha256 = "1w7wbwifr9896ndbmpxmx85md5hb1v8amd8paryn8jb573hjl28d";
+  };
+  "1411432bb3fedd8dc4b429d4f6929746ef0e0a2e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2622402-86d1483fa60742b6be9fd5a0b0b946e0/1411432bb3fedd8dc4b429d4f6929746ef0e0a2e;
+    sha256 = "07586dvm3qmccm5i0894lwcc8zfjx95c8vvdp619vip6xg825g5x";
+  };
+  "142674e220c8509ae1f8b001af30a95d6b08951c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/142674e220c8509ae1f8b001af30a95d6b08951c;
+    sha256 = "0bzlrpir8fw10360kzi422zbhaal8sqdpl77qx3fk3gxhvj26r2h";
+  };
+  "145ca8052bc6fccd7bf7af21f36664fc217f2f70" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/145ca8052bc6fccd7bf7af21f36664fc217f2f70;
+    sha256 = "1ip6wspykfvmxidbwfhflfzbcnqzfmmmhgax5nxg5pla2yn71kdk";
+  };
+  "1463ec95f086a9205c1ab27df290f232964381a3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1463ec95f086a9205c1ab27df290f232964381a3;
+    sha256 = "186vk4bdmrd6ggyxz2db5713i3zkqzph0lyr3aivgj0a4ha8gfkn";
+  };
+  "1467cb6b7644671f3127567be26cf07d20b6da7e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/1467cb6b7644671f3127567be26cf07d20b6da7e;
+    sha256 = "0laxdgvsskc4gzbfnbal80ab7pd81v31qg8rcp9pjw1np5zpb63j";
+  };
+  "146b3768fb0d7880b8c751140d38a1177906de0f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/146b3768fb0d7880b8c751140d38a1177906de0f;
+    sha256 = "15v9nwb7m1746zrwfrgfgf8va5x88by8chsa3ivgraa5j6if1px4";
+  };
+  "1471837617ec5898ca2e49cf20ad5e0795687b7b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/1471837617ec5898ca2e49cf20ad5e0795687b7b;
+    sha256 = "0gycs7mhhq9y3c5dd014ggbbg3609kds5vzj3v45kkydkylqm0l2";
+  };
+  "148131344e6fe6a2249ce840916527aca52dbc35" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/148131344e6fe6a2249ce840916527aca52dbc35;
+    sha256 = "0y5h5v8vlr8jr8yyy529yrjg5rw75jpxz4fa7jmbpr6syai2bdwx";
+  };
+  "149605f77f4487d4f238f2439c46df83708b08f8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/149605f77f4487d4f238f2439c46df83708b08f8;
+    sha256 = "04rqssi1ndhgps7wsq1zxd2sk5p6michbfn1hi9g072gc0qp5c8a";
+  };
+  "14b7da233b40c5199352d0ad87f5c2ef529fbfc2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/14b7da233b40c5199352d0ad87f5c2ef529fbfc2;
+    sha256 = "1akz1k4wh5hz1w8zd6hvkmvc6w6hadw2psrr4rwpvdnkvhmnh3yh";
+  };
+  "14d50f80e32417f2f524ef471610a343fd6eb8b3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/14d50f80e32417f2f524ef471610a343fd6eb8b3;
+    sha256 = "18db45x0zfwxd9v0x1jmid7lklp3ib565d98sqjzbyzfvmq8q6f3";
+  };
+  "15299d434cd85410167be0405f54ccdeeaa3f831" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/15299d434cd85410167be0405f54ccdeeaa3f831;
+    sha256 = "0ivkh9ysa6nx4dw5bgqb00nynjzbn9gb1ihj43nccxskj0rynz7a";
+  };
+  "154306df1d2a4877cbc22db8224277c856f1b6b2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/154306df1d2a4877cbc22db8224277c856f1b6b2;
+    sha256 = "0jys95p7vg6gjxsphg1widz471ap8hw3y4vz1msw85clkgxh9szl";
+  };
+  "1567a031ece4d70d2c360767b32f084b40eeef63" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1567a031ece4d70d2c360767b32f084b40eeef63;
+    sha256 = "04gzs1apaimrmkgsc76qlccqh4z7y7d221fxfaszdlvjaz9k7njs";
+  };
+  "157c6388b0a3c7a95bc29c5ae0f8e920a39dd7dc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/157c6388b0a3c7a95bc29c5ae0f8e920a39dd7dc;
+    sha256 = "10sx2ac6w30jbf40l8gixwv8zx4rkdpi5n8a0nfgbpay72rymi2k";
+  };
+  "15a502cd7ed28b9a7f8bb3e95ed15009b0e9a29e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/15a502cd7ed28b9a7f8bb3e95ed15009b0e9a29e;
+    sha256 = "14zkdf9f592y3ivk49by1dpydv9rrpzggwm5997ykxz7ws04i1lp";
+  };
+  "15a50c3fc6a68c2b5fc5d130da66af83529e7ed2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2709658-e5f367f730d84b618e9cbc16aceb91ca/15a50c3fc6a68c2b5fc5d130da66af83529e7ed2;
+    sha256 = "00021z0mfhlx9pkfn04cv07k4xlzywj4nd19mydqppm9r0vw5fwy";
+  };
+  "15eddf9d2c822c3f5a608ff772c24ca1c2928c60" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/15eddf9d2c822c3f5a608ff772c24ca1c2928c60;
+    sha256 = "0jnslw7j2msim71pgjv2w8jd2xq48ipjw0iryw9i8vibgb30ri90";
+  };
+  "160a1829963e541ea0fc69e090047543f0c547a2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/160a1829963e541ea0fc69e090047543f0c547a2;
+    sha256 = "0lshw7xhf4z4jzanbrr6q8hmq8xir8w9syl6akfbpjdc25yab0jy";
+  };
+  "1623d3a181ce7eddf10a90c3c235075fe55bca69" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/1623d3a181ce7eddf10a90c3c235075fe55bca69;
+    sha256 = "0r8plai0830ywnqpmrikzr7y1hw34qbfgiigagrr04z97g775l4k";
+  };
+  "1627ab02a99a1389c8f3330ff31a92d4994ef631" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/1627ab02a99a1389c8f3330ff31a92d4994ef631;
+    sha256 = "042si54d7qxziwy6d23fqkcdifqjpqf8j1gs9s5w2csaqy1bjyvl";
+  };
+  "162be3e52c290eda8052be126f9b1b9f19a5e182" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/162be3e52c290eda8052be126f9b1b9f19a5e182;
+    sha256 = "01g1bj3sld338a22ian9f0mnim418l6j3n7zy23sk6a5qip4h726";
+  };
+  "16311b83711df9620e3ea0adad878eb4547e2dc8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/16311b83711df9620e3ea0adad878eb4547e2dc8;
+    sha256 = "084iaizc503s24cmximifd4gadlksslras2dv4l46ngik7mmwkzw";
+  };
+  "163784cb855cf579aa85c8d84241ac308c31d9c6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/163784cb855cf579aa85c8d84241ac308c31d9c6;
+    sha256 = "185fjh744ynh1s45z7ikyhw0mml2vwfa2db4byv8zv122x10844h";
+  };
+  "1679ff7ab2527671a6c79835501cd4447f769d26" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1679ff7ab2527671a6c79835501cd4447f769d26;
+    sha256 = "1rdlg3y9ihvhi2lf1isabj58y6f8lj24x6yb4xh9jqm8fgdjbn5x";
+  };
+  "167a3b509221baa789dd8c568b74ddcaf7c4a7c5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/167a3b509221baa789dd8c568b74ddcaf7c4a7c5;
+    sha256 = "143g5h823i5pcbqb30419i1k6mq2s3mhmcgcfn8v0jm83lwar4i9";
+  };
+  "16e421c9204b08586edd8de93b93b19fb10644ea" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/16e421c9204b08586edd8de93b93b19fb10644ea;
+    sha256 = "0b9ki8rj1xmy9zaa52d3zbq7jk95mjv8b17qyb0zrpirl51g46gg";
+  };
+  "16ff1b3c00e3fef8b809b49a5b63be510b23dc97" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/16ff1b3c00e3fef8b809b49a5b63be510b23dc97;
+    sha256 = "1fa3b7wri025cgjkd4f4v7pmi13qkza4i1f9zpmcpwfiwvvi8dgx";
+  };
+  "17a98e6cd0892c88290f9dd9e9cb3fde84e8798f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/17a98e6cd0892c88290f9dd9e9cb3fde84e8798f;
+    sha256 = "0yhrwdwjn7fszj38ihq9cac1gk44xinnrh506rglmcw81iwz4j39";
+  };
+  "17b2ed6bd21c462973aa928a668bafd1f8ebcfbb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/17b2ed6bd21c462973aa928a668bafd1f8ebcfbb;
+    sha256 = "1pw6irhilhicr1xkxf5pvv1ylkckxr8180nvsdnfigrzyk5732sc";
+  };
+  "17f24542b619ed66aa29fe28eb716b4dd4c33d84" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/17f24542b619ed66aa29fe28eb716b4dd4c33d84;
+    sha256 = "15ssnahf78zv5is9n69cd4hyn55iij0zcdqzg446bzpslpd2y1vr";
+  };
+  "1802e0cd4e93677f9da0d094475296d070a0a167" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1802e0cd4e93677f9da0d094475296d070a0a167;
+    sha256 = "195dqkx2pwmymd6agn5k72rs6plp6nvap7gk7h5wk9yip51lkmh4";
+  };
+  "1819e4a555e0b22457eb52ec088f2d106697434b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1819e4a555e0b22457eb52ec088f2d106697434b;
+    sha256 = "1pmz470s77fsl1d2sqf2kdspb8k08xw6hw3f3y1wk9w3w10mcqfd";
+  };
+  "184edcd2f9fc791ab8f0ecbb980e124e1622311d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/184edcd2f9fc791ab8f0ecbb980e124e1622311d;
+    sha256 = "0zcc4qhgzg56hayaiqxjp63bxa0jkf8ws95kfm9x3b4va4qzg907";
+  };
+  "185535353a9576cb4f9e4a7fa3c1fe649d00f26b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/185535353a9576cb4f9e4a7fa3c1fe649d00f26b;
+    sha256 = "0llsp8z8av08d6dp442abpp4pwvc7l5flh9nd29q7l156dxz5nq9";
+  };
+  "185908a865ebe7f6ee31701211aad217de343c7f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/185908a865ebe7f6ee31701211aad217de343c7f;
+    sha256 = "1xmi888fc5hwcvgyw73g6f7gwwhwpybi8sl41dbrj5pjcvrj2clg";
+  };
+  "187cc49caa5b9c37b965dc6d5ae486c963873c47" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/187cc49caa5b9c37b965dc6d5ae486c963873c47;
+    sha256 = "1ghn25c2pxibw2wnr5c7wyk8hfdvchm27bqncnxi0vby0bwdis6n";
+  };
+  "18943d114a03b9994e64f86843cbfbea2c18fc60" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/18943d114a03b9994e64f86843cbfbea2c18fc60;
+    sha256 = "00dgywg4p8502rm5b8ykm5xqfb8i98nqip3z96vpbwqlqllxz2fq";
+  };
+  "18d1e1adb711eb56d874c79f49ae68b3e26fb044" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/18d1e1adb711eb56d874c79f49ae68b3e26fb044;
+    sha256 = "1zmdhkcbb8bsciycigj8x7ijc7wxcg5hj21588jimfl4i48zqw78";
+  };
+  "1916cbea932d8ec4cbe73743294b2456b6f82f4d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1916cbea932d8ec4cbe73743294b2456b6f82f4d;
+    sha256 = "1a0dqqqmk6aj2j90qgf6qz91i37azisqjbrr9srxs42x8q8mhx2s";
+  };
+  "1919f737357402ffd6035ef99089bf4492ef39ce" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1919f737357402ffd6035ef99089bf4492ef39ce;
+    sha256 = "1qnry1aa0hhi4cr279293y35ywl57llrkdgrmhpwi6cvamyfpyrb";
+  };
+  "196a7cd92cd85833aa987ab46cc84abad637e671" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/196a7cd92cd85833aa987ab46cc84abad637e671;
+    sha256 = "1xfbv83r1920v5lv4fpklmv21mmhfykkrfar0cm0yky3nyl93wi3";
+  };
+  "19bf552b5636cd53f93b288b3393447e0a9fa015" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/19bf552b5636cd53f93b288b3393447e0a9fa015;
+    sha256 = "02cxv7wmy2frhl6kc93y8r98ccpq9cdjji5pdyxniwmwjvnbd152";
+  };
+  "19c8ede828d4e84d3023a8cad20c4118e92c51f6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/19c8ede828d4e84d3023a8cad20c4118e92c51f6;
+    sha256 = "1br3pqv9fwrfcrxmxai88qa0wbi56ik5v66x4pzwp2k20ihahmny";
+  };
+  "19eb01d07ed61f10eba97cb487040edf44235d88" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/19eb01d07ed61f10eba97cb487040edf44235d88;
+    sha256 = "13pyc8jpln5a5d3nxbbgjkqrl8v3vngg0lzsgkjaf0ddk6jr0vjv";
+  };
+  "1a2a4f3777f219966c172ba8de9cb16dc214645a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1a2a4f3777f219966c172ba8de9cb16dc214645a;
+    sha256 = "0ghw873w98wx4xv0qwfqa0yshfyf6l58yymf64yw5gignay2jzf1";
+  };
+  "1a42be4a1a8f42a72c27e99abb9741fb826a99e9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1a42be4a1a8f42a72c27e99abb9741fb826a99e9;
+    sha256 = "15ph4vwd1r4gcv25ib0y93jvcxd4nihs32c5j1f5jvr8xgrgrn7f";
+  };
+  "1a546bb1c6ba2765dbc10b34126650d033464bf8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1a546bb1c6ba2765dbc10b34126650d033464bf8;
+    sha256 = "089h0npcbvxh3nisns5p4ld9pfyk18f16gm9zf90jjcq4r528dqh";
+  };
+  "1a5ecbad3eddb57b522f4873840b8a716d98b2b9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1a5ecbad3eddb57b522f4873840b8a716d98b2b9;
+    sha256 = "04yfwjcj5w7iwyghhzbqfj4vymy9lfvc9ncxk9z0ll75f2sf0kil";
+  };
+  "1a81e6c5fd4cc760a6589fa20070d26a9cb6e53a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/1a81e6c5fd4cc760a6589fa20070d26a9cb6e53a;
+    sha256 = "0gyx0sq7k9cilcbcl2z49icf5jbknc1qcix2156nar2f8v5mqxmz";
+  };
+  "1aad9a745382e917c890acd98a988a1536087fe2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/1aad9a745382e917c890acd98a988a1536087fe2;
+    sha256 = "1hjxm0jz4bwllb08ix354i6cy78dy9vwklw9rpspdxqqkis8jxs9";
+  };
+  "1acfcb65de4dc96785b1705ca6c0029e5e4cea95" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1acfcb65de4dc96785b1705ca6c0029e5e4cea95;
+    sha256 = "169xwg1jrwclx20qyci8az8rffmfn22z1x2zvib9dsmi3451mk3i";
+  };
+  "1af0a9938323c32bfd00373e1eeec3f0eb7267f4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1af0a9938323c32bfd00373e1eeec3f0eb7267f4;
+    sha256 = "1a70ajr3s1msvsmyjmyg6vq8jh8ba5xc1f0k2afjycj3vzjrlgmr";
+  };
+  "1af8c3dcef0a363b208600f3db2ab066d1c407b0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2738476-1eae05647f894f068d67ed64f86505f8/1af8c3dcef0a363b208600f3db2ab066d1c407b0;
+    sha256 = "13q98b90nhzqm9mz24nhdahz1i1gvja5gkab5p5mxsqbkm15r6vn";
+  };
+  "1b6ac4ad1dd42a8d52a6cb4a24b64cd86c92cc83" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1b6ac4ad1dd42a8d52a6cb4a24b64cd86c92cc83;
+    sha256 = "03nfc20m6av56gqsg20h2jzc28crmvxs8ychxg0k7cmx7bzz1r23";
+  };
+  "1b6e2211b6ef64b74fd226f74bb7fdf14f384868" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/1b6e2211b6ef64b74fd226f74bb7fdf14f384868;
+    sha256 = "0fnzj5qxrmgc1mly6my307g9if6mr3pq8mnsdhz7sdpglvqx9745";
+  };
+  "1b929d889ec58a690a9fb4fe5c7e74eb60c339a5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1b929d889ec58a690a9fb4fe5c7e74eb60c339a5;
+    sha256 = "1mrvhvp5r3mhq490w4ymjdf4f7ymp56ic8waxdd6ms8xgkrq9cpa";
+  };
+  "1bc440e5f448e7dec6f97dbb519814d6c4b17b0e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1bc440e5f448e7dec6f97dbb519814d6c4b17b0e;
+    sha256 = "1vriwq47ck2inw22jl3vy4hn82sphlkdp22jzsxl9wg1bjkp7phf";
+  };
+  "1be30bac2f567e402ae48b89e8355a4b4e609b8a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2621166-706a1811c2684ac5bae65fafa17839c2/1be30bac2f567e402ae48b89e8355a4b4e609b8a;
+    sha256 = "145nr5766qs6nhakskrh03b13m650n499q3q1pcj2yzb8qcmr8ml";
+  };
+  "1bfd97f204592ed48706e423bb6ab7a6128cad7d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1bfd97f204592ed48706e423bb6ab7a6128cad7d;
+    sha256 = "1702mbcd7a2y4hsqmqy7cdr23h628f31spyj6wyajrixqb0xgr24";
+  };
+  "1c70d51c5e2d2a9ebdb87dc176b3cbe48c275309" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2621163-719903f8599f48949652ccefc2a2d5be/1c70d51c5e2d2a9ebdb87dc176b3cbe48c275309;
+    sha256 = "0rzwsxpr3bwsgfpwci3mmy9wvwjkf1p6jam19rnnqz1h88w7ijxx";
+  };
+  "1c803eb30ed3570e150cffbce8729d1cc54e8fc3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/1c803eb30ed3570e150cffbce8729d1cc54e8fc3;
+    sha256 = "0p9iyll322a8cfdy0h1briv01hxw0iafbq43w5k7sy8kysv5ffl0";
+  };
+  "1c8d955be9265f85641ccaa5c0c9abacc66115f7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1c8d955be9265f85641ccaa5c0c9abacc66115f7;
+    sha256 = "0x7f04mypvy01v78xqjf2q9psw5f0fhhyyf2q4hww70s23xl3j2s";
+  };
+  "1cbf6a11e17024243825f5ea454051bf5b1e7d3f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1cbf6a11e17024243825f5ea454051bf5b1e7d3f;
+    sha256 = "0xhgb9grcd2nca9yn495n5d0c0higjqcglhc2ra5kp57fsqmf9vx";
+  };
+  "1ce933b4731d07d18548a668fca861035354bbf2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1ce933b4731d07d18548a668fca861035354bbf2;
+    sha256 = "1bww5rid4w5zjn40701x1509qgn44wfhp9mz723axmdykp5ak6kc";
+  };
+  "1cf61777b0744f76064a8cb5a1d0bc1bb2d3165b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/1cf61777b0744f76064a8cb5a1d0bc1bb2d3165b;
+    sha256 = "1x3jww0rzkrx2ybx85ncq0d4zwa60x6h05sjm4r0gps8vmjalnl9";
+  };
+  "1d09bb4f8ba502cef13de6d570839e6790bf3542" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1d09bb4f8ba502cef13de6d570839e6790bf3542;
+    sha256 = "1xfdfyf3pkazb1583qjgv6planywm5ajhqpjndhwn0wkim6lakmb";
+  };
+  "1d5c9571ce51f244f1e0158e0cd49bd36f16bfc5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/1d5c9571ce51f244f1e0158e0cd49bd36f16bfc5;
+    sha256 = "040f2qb2g7jf9hzc48xkszy5adbwnbxy22jmp8v6q9h9qkfvm7w4";
+  };
+  "1d81bb3fd4494d2d93359f0cbecd2e9e20e67a09" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2532063-ce5a2c068f9844c8bb5d0e603da092af/1d81bb3fd4494d2d93359f0cbecd2e9e20e67a09;
+    sha256 = "16xman4991dvi5m50rmplp18xb89181261g5rczkjznkf7q2973a";
+  };
+  "1d82f1e693e8f317ca408dc5159b1a6afd317016" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1d82f1e693e8f317ca408dc5159b1a6afd317016;
+    sha256 = "1ng1h62id2a1h3kd9mhakbfr568wkm2whbn2lv2x4l1q3ahrw9ix";
+  };
+  "1dc7018f35ab6ebe2908608910fbaf9214506ecd" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/1dc7018f35ab6ebe2908608910fbaf9214506ecd;
+    sha256 = "118xrnwqmjfqndg3shn1iw90jnjvxbmr6y9ws0zrn4bas0bsn9bj";
+  };
+  "1e0c495e2e2fc0f9ab567761cfeec0d8659f6572" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1e0c495e2e2fc0f9ab567761cfeec0d8659f6572;
+    sha256 = "0423h6jq38k03zcfrnh1kkz3dsplpyij4ysrqqyyagni3l0wpwad";
+  };
+  "1e8e90fc8fbee70866085a1fbd7ee5585941dc31" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/1e8e90fc8fbee70866085a1fbd7ee5585941dc31;
+    sha256 = "1qdm6qkkmxxcml9bi121dvg36j55qzzzy7hslzg5ap8c65vcd00x";
+  };
+  "1ef5c21107774059ed6c5010dd2d5f3373c81445" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/1ef5c21107774059ed6c5010dd2d5f3373c81445;
+    sha256 = "14lmgyagsk3sszh04w9r4gnyi99vhqkccy9408fypxs33l3g2n3a";
+  };
+  "1f10b8e0a3d6f6fdfe5b451508626eda10e3e771" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1f10b8e0a3d6f6fdfe5b451508626eda10e3e771;
+    sha256 = "1plprfagzg8izyrr3dy5wnmlp0sm76kg0w36001j105accnqkn7l";
+  };
+  "1f3815ccc8afbd78900f57993ac9ee538ad3a776" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716370-1fe4be93d0274863a43a7797419557e3/1f3815ccc8afbd78900f57993ac9ee538ad3a776;
+    sha256 = "11i9z6hzviapkp8llkn96m5nb9xmlkbxiv8196zkmqxp759a2917";
+  };
+  "1f8e075fc05cbc97e7fd21ab40e0ceeb595c741a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/1f8e075fc05cbc97e7fd21ab40e0ceeb595c741a;
+    sha256 = "11g2rvmdj5dv5r2kfrw5ccmgl8cbkkhjmbaqpdmhiw306fd9fq5a";
+  };
+  "1fe2947f6b39cef244fd00698c7cb7adcee1d927" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/1fe2947f6b39cef244fd00698c7cb7adcee1d927;
+    sha256 = "0kviyyjr9hqnibzk36fxnbk7ad8fb2a7gf3hdmlb88jq3ymd4bm2";
+  };
+  "1ff18f725dd963421e618df72bf8a01bbb35d02b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/1ff18f725dd963421e618df72bf8a01bbb35d02b;
+    sha256 = "1ki17xws01fvhk796f1qf7yshwgv1a9xnmg25iq2ikm47gjjx9bi";
+  };
+  "2061aaa6e57d72cbc697076a3bfff9ede7a0a405" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/2061aaa6e57d72cbc697076a3bfff9ede7a0a405;
+    sha256 = "1siplly88g11327ync8771kzpbdc9g75645fai37rvawip526cln";
+  };
+  "2099a8b27bb01df580dca27c74682abb819d7424" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/2099a8b27bb01df580dca27c74682abb819d7424;
+    sha256 = "1jjcpc1nqk10xhk5y53qv0xwzh34wjcvn2cykjxn5g10n1vs5iqx";
+  };
+  "20b2c00511aaf3fb29dfe2ad61683427686bdb7e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/20b2c00511aaf3fb29dfe2ad61683427686bdb7e;
+    sha256 = "1dkbivkv0vz5rdwaanjzvc47k1yczdgjb9w0qllxwrdgixacnbv4";
+  };
+  "20ce1ae8d2c0f8a6cc946c302b619dfa82a8d0be" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/20ce1ae8d2c0f8a6cc946c302b619dfa82a8d0be;
+    sha256 = "0jba3b03d4gb62a7zj758j856mgw5l16zw99xdcgp8qd17nwlksp";
+  };
+  "20f22f8b8176717ac951ccdc7e6f5f56806df59d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/20f22f8b8176717ac951ccdc7e6f5f56806df59d;
+    sha256 = "1fndrfy6azyh1ckzmq4261cs1mpq393abl1mc2k3cxgn67s4ymcn";
+  };
+  "211fe5f3ea5194f89c18a81f99259151734b4118" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/211fe5f3ea5194f89c18a81f99259151734b4118;
+    sha256 = "121q1z4mj75vmcvbvyzb6i05xl8s7nkn700fd156z65g7ywn1dfd";
+  };
+  "2130d3a7a6cb4b7985001c43cece413b95605a04" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2130d3a7a6cb4b7985001c43cece413b95605a04;
+    sha256 = "0bx84arn6w9iic3q5xwd9v20qlpgashanm12qwrxy9dpvixb6z0l";
+  };
+  "215f16be383b3e37f6ab866a94263c078729c9ef" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/215f16be383b3e37f6ab866a94263c078729c9ef;
+    sha256 = "1k9dqr8ll66yp75mv2rx7if4zknrb02yb927xkwb2vvf8smy84x3";
+  };
+  "218b41b249f8b8cc60c48cdfe5f9f3139acec694" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2605020-6cb4e3cef2f14bbc9f4e8bd763c3120d/218b41b249f8b8cc60c48cdfe5f9f3139acec694;
+    sha256 = "09iqnxhngdhsysdvlr05nvz261x7y320b66pgl3m5q5nm1b4vxc4";
+  };
+  "21907541d849646ca7b37552024a6bcbab11cce0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/21907541d849646ca7b37552024a6bcbab11cce0;
+    sha256 = "1dscgs1k5p0nsxkfhmwiw29vik2zs317gks9hb6hlkcl62852snl";
+  };
+  "219229e93fb1bf7a335603340498ba0d7dded08a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/219229e93fb1bf7a335603340498ba0d7dded08a;
+    sha256 = "19wwpdx566x9bj3ygiyni23z7q2qdj9nxvzl9wb5nym3nfk75zq5";
+  };
+  "21fa784bbf679195e305e3c41f0638cd402f6834" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/21fa784bbf679195e305e3c41f0638cd402f6834;
+    sha256 = "0iga4d8n471pvk1jfzkg0mvz37lp3b3908dmqfls0lvrqivyi68b";
+  };
+  "220e020f8e3d2a2de2da4e1a95e72d0a2efe26bd" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/220e020f8e3d2a2de2da4e1a95e72d0a2efe26bd;
+    sha256 = "0jiva87bjrriz0jyx153p6ddisckqam6wl7vzxlxwg9bhc9yadww";
+  };
+  "22118798b30814806475890a25dbd3082cf56d24" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/22118798b30814806475890a25dbd3082cf56d24;
+    sha256 = "1sdlqrj1k5adb1z19mjikbm8cdg12h2kvaprnh6pc4bhs9l8210b";
+  };
+  "222160b66bde04349f00f790676a49a8bd3f2aac" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/222160b66bde04349f00f790676a49a8bd3f2aac;
+    sha256 = "0nyd9x389a3bk22kpgmispq6a62y8p5gbjbzdchcznvfjvbg8mdk";
+  };
+  "2265f48eeeda05a6393f1268fedaea74e5d989d4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/2265f48eeeda05a6393f1268fedaea74e5d989d4;
+    sha256 = "11wk6krf02vqza7mxxdfm22bl19dfsdb79fd23m56yq3i154z65b";
+  };
+  "22b3cc937fab3025d3abf8d725b2cb3b1d12ef3c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/22b3cc937fab3025d3abf8d725b2cb3b1d12ef3c;
+    sha256 = "17blrcaa86q8my9b4c1gnp804w7csbrxw92pa5jcag1h68vb2dir";
+  };
+  "22c962e9607d75b5917d731e9a66bd74fd15f2a2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2458551-07195e4b171247cfbc0f6645046eda02/22c962e9607d75b5917d731e9a66bd74fd15f2a2;
+    sha256 = "1vzg92pqixpi093rjb8mvnmxd94dplhwpwwm2wkip9asis0wamcb";
+  };
+  "22f8914859f73cc332699e1c40e17cd44d700b87" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2597566-6e859699948f4adda2592656e3924b32/22f8914859f73cc332699e1c40e17cd44d700b87;
+    sha256 = "019zcs7safk4pldr47v9qn710q4d5cw20v8i26frwwqimnjdgjka";
+  };
+  "232d603ed060bcff36c5d452ec42caf19d74ec9e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/232d603ed060bcff36c5d452ec42caf19d74ec9e;
+    sha256 = "0y9jplgh3dcf6p3n6vsrs7shz60jj8kx8ccz8yldm9wy7sjqhkzj";
+  };
+  "232eab324de501a6a4db9e0af2922875e7b6303f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2597177-394deee1ae174b2db1462326aa83252a/232eab324de501a6a4db9e0af2922875e7b6303f;
+    sha256 = "0dvnfwqnf1hwnbg3y0az2hc0zib18fizdska9w64xjni6zq3fy2y";
+  };
+  "2339c1d3bfb2db1621ef01225df981c1bcc32f49" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2339c1d3bfb2db1621ef01225df981c1bcc32f49;
+    sha256 = "17wks3c6nz4qxlz6qwgnbp14v4wda2ss5b8mhdiisc6zhsn2sn4f";
+  };
+  "23563ae9b7815c9196c9ea7c27b2c1b78c2e3b77" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/23563ae9b7815c9196c9ea7c27b2c1b78c2e3b77;
+    sha256 = "0v1pafnd21lss6pf6af5r3h5n3minzl45ckmxa1v4rmx3c3j8xnb";
+  };
+  "235cc68a11ea8011ea5ca0d1326a488fd48ee713" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/235cc68a11ea8011ea5ca0d1326a488fd48ee713;
+    sha256 = "0xcpafbrys5hkxqd76fx12cxjbf7i80b9206iz69hfprh0hsa2h6";
+  };
+  "236633a6e0745c5413ea190b0e07deb9e9b9d409" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/236633a6e0745c5413ea190b0e07deb9e9b9d409;
+    sha256 = "0ffj6q65nwwpr67pah2h3nzkp7m549zzb47pkbxsk54d06b9q1lq";
+  };
+  "23b01ee08bbe595a4dcb1a72014151b82e5e76ff" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/23b01ee08bbe595a4dcb1a72014151b82e5e76ff;
+    sha256 = "00fml6x864bvh4prq3bkpqn3q6ca4zwif7zxhnsx3ksia8kj9845";
+  };
+  "23cc3f11d38de5312fd5798024de0d232bbf2e68" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/23cc3f11d38de5312fd5798024de0d232bbf2e68;
+    sha256 = "1w0nr2hvcl0h8fkivrxval1l2vw4546rh9vpkwhybfwjh2g06q1y";
+  };
+  "2408381821f1ad904404880379feec1a2eeb2ad4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/2408381821f1ad904404880379feec1a2eeb2ad4;
+    sha256 = "159g6gb74b6nrmi7rln4mpk1yj3kzsf6bppx53i2sa9wcp0vzqyv";
+  };
+  "249d8cdb69fcbdd5f0dfef3a752eb2b7daaf01f4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/249d8cdb69fcbdd5f0dfef3a752eb2b7daaf01f4;
+    sha256 = "1jgr54z0ic0gaby8zml5kj7iyx60v1spf4a1wqiqq61frbkm4qgr";
+  };
+  "24f19b36203cb12aa6892d2d4399df0a679189f7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/24f19b36203cb12aa6892d2d4399df0a679189f7;
+    sha256 = "0drx0nv2249nfdbmlhc24isigf0bxv2n0vyjr62hpddb6xjqikq2";
+  };
+  "252915e59bf956eba7b4eb84256f1eb9c08c16e6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/252915e59bf956eba7b4eb84256f1eb9c08c16e6;
+    sha256 = "0qkvmqhirgdq9wlv0zkkqqa1gl45bw3i19711vfv487n37d2acmf";
+  };
+  "254bdc731ce0a3bef83fa6dd6c76771cadefeab5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/254bdc731ce0a3bef83fa6dd6c76771cadefeab5;
+    sha256 = "0pr4zh0kf2j52msqfwaailrgm5i091msf7s72nk9j5p4zjmcy4qw";
+  };
+  "2573361ce50bbcbed674e108ea4cbb055cd0f2ec" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2573361ce50bbcbed674e108ea4cbb055cd0f2ec;
+    sha256 = "1ms3v0avlbwf3p8g2zw9w5d90hmyf7ba5d3ya7w4mv9sc3a8h5v2";
+  };
+  "25a0a89eda2d7c97ae3a37ba14f151b4682617e9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/25a0a89eda2d7c97ae3a37ba14f151b4682617e9;
+    sha256 = "1656qa6wxbw19kcihb0rl0ssyhrr7pklhflrbwz7f9nsanw6zjmf";
+  };
+  "25a1ae1b60746c8e36e21531648e67b4c330d30d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/25a1ae1b60746c8e36e21531648e67b4c330d30d;
+    sha256 = "04wb1hkil0khgk7qsndar970wgky73f93ng3kgp4c9sgck46gkqz";
+  };
+  "25b04d770d7a50481f9276487a5ed9834119dabd" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2602350-38e0d307a57a47baa00ee5f892c9ced6/25b04d770d7a50481f9276487a5ed9834119dabd;
+    sha256 = "1pxvxdxjidk0qsxr0j04jsmjxbjz8havi7ngqfx9dfl6w9nxc0vn";
+  };
+  "25d67f4de95951cb969435a84594979cd05c4091" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/25d67f4de95951cb969435a84594979cd05c4091;
+    sha256 = "0rjmj5395cbcg275yd47gmd8gjgq1nip77k8vy8nn4k2cqpn2rlh";
+  };
+  "260381a0277c560f8c2006d8bfd4f7069cd5640d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/260381a0277c560f8c2006d8bfd4f7069cd5640d;
+    sha256 = "03v2nzwhbb0f728qyd60l68w2nvpadfz8sppzr3y1zbz75rd2k3r";
+  };
+  "2616e3cfebab7a82dd81c3bfee37a62f3317e357" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2616e3cfebab7a82dd81c3bfee37a62f3317e357;
+    sha256 = "1m01ldgxq49rpr4bvrqppkfk9l8ajrw0401704hgnz06xs3sczql";
+  };
+  "26407337ede0c844ad2b9b9e4eec2286431b0fc9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/26407337ede0c844ad2b9b9e4eec2286431b0fc9;
+    sha256 = "0kwhdyyg2wqy9z0x9v4rprvy84a1l65777fp9nlq5kqmkhl5qhaa";
+  };
+  "267f7ab24d96a8949db4cbc89f50cb9aa755e5e7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/267f7ab24d96a8949db4cbc89f50cb9aa755e5e7;
+    sha256 = "1m26i9cxxy8dbfgnmcpar7a19jr7kz57nxqnim3vbkycvfj0i75q";
+  };
+  "269c797991f91dddf54acd99a214152e8f155f8f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/269c797991f91dddf54acd99a214152e8f155f8f;
+    sha256 = "0k61nipciisz9q6riyd08n7zi78nnm5b454zg4rnpv4fxkxwrmkh";
+  };
+  "27098f36979ec3e79f5f7d7145dae3cfedf9b0a9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/27098f36979ec3e79f5f7d7145dae3cfedf9b0a9;
+    sha256 = "0ygswmzmb89m4mpl2zansjppn1r83dkwxg5r68ssk4isrr8dha8m";
+  };
+  "279afe349fb3fbd2a845d8f650df0bf1dbb73c45" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/279afe349fb3fbd2a845d8f650df0bf1dbb73c45;
+    sha256 = "1rcww7wpbygq82zlpnh6gh79yw9w7rb7zjlx9dpdkys3v81rkzr0";
+  };
+  "27ab355d7817d1ffb8eb77e96879aab84b9ad7de" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2599004-dd46a4b56e3e4811a26bcf6c9cddf877/27ab355d7817d1ffb8eb77e96879aab84b9ad7de;
+    sha256 = "104zskbv7ii90incdrl8gwqx60bgfghyl8si1rmnvch2ppnb9cmx";
+  };
+  "27e4175b9bbb4b175f9daaa9a824638a178a6d76" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2393838-48fca459a31f4f83a05d71c733f01d7a/27e4175b9bbb4b175f9daaa9a824638a178a6d76;
+    sha256 = "0845rjmqick7mmymkprd4bjpszldxrqcgg56kndy4x0qrmdmh5lc";
+  };
+  "2827f79a76e04e6ba05b6cd3cc73e4dfce1ca961" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/2827f79a76e04e6ba05b6cd3cc73e4dfce1ca961;
+    sha256 = "18y83fxfr8r6fya771s8wn3fpwd0f0kpdd3bvnr5f0dqqqa84g1d";
+  };
+  "28438bc19c11df6c698e30491b3413fed60b2f0e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/28438bc19c11df6c698e30491b3413fed60b2f0e;
+    sha256 = "0vp18h36h5wdy17a31mwl2mf049kk2mkg09ldjidn25qfd4cdjm4";
+  };
+  "28783f63ac21ccc8c6ba68949502795e3a63f569" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/28783f63ac21ccc8c6ba68949502795e3a63f569;
+    sha256 = "19cd3p7gsd9ka8gmpzrabcya7pzmsmmjr3djmvj5nmraf4qxprd1";
+  };
+  "288cc5ec4da8903ba6077e259a8d9f1a0e5360c5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/288cc5ec4da8903ba6077e259a8d9f1a0e5360c5;
+    sha256 = "0ypv6mj46hibaa5hbi1i8a44gjmbp1y7qlvk4xywrqsj9fiadjyj";
+  };
+  "288d0122b6bf19ad09a81fb7a631a19113ae96f1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/288d0122b6bf19ad09a81fb7a631a19113ae96f1;
+    sha256 = "0araqg4vmbmpfbda1m1pj7b62rh1nd8pqs3smha0jpmfx1gj75xb";
+  };
+  "28926b6102371746bf5dd7c493c2353392ba76f7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/28926b6102371746bf5dd7c493c2353392ba76f7;
+    sha256 = "0b24j3l4ln2rjkc6bfczdyzpgzmc0kbai26di8afz2lsklsmpjdn";
+  };
+  "289a1b921105ce48ba09d95a245cd2daa77b05bb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/289a1b921105ce48ba09d95a245cd2daa77b05bb;
+    sha256 = "0p903d63x9zxqlfs23c48v52gmvja3p71z8bcc2qbryrcv7w50bl";
+  };
+  "289c460fd7eac93f2aa4548c3c805ce6f69f32ce" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/289c460fd7eac93f2aa4548c3c805ce6f69f32ce;
+    sha256 = "123pwgcmmyv03b1i9i6q6ks457hsipwbkvap8jfjvn2rppy4cr1b";
+  };
+  "28a656853baebf8714c795ebceb8ac04f687f67f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/28a656853baebf8714c795ebceb8ac04f687f67f;
+    sha256 = "0g4w1nkwi27mbh523511qwsdpjzi5lz9awcaha94031krjayfn69";
+  };
+  "28f2170447e86afc17f7c14affde7f2dd410c256" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/28f2170447e86afc17f7c14affde7f2dd410c256;
+    sha256 = "07y161rsf1j7s6pna2nsjm9jvzr9ai8i5hxwxd2q64labz0403z5";
+  };
+  "28f89206861167b3d68bb1c6d131985c152b757d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/28f89206861167b3d68bb1c6d131985c152b757d;
+    sha256 = "0rfkf21snlq5rsq39sfz9ala1qf4d85ns9qfy9k8sf274sr0z1sh";
+  };
+  "2914f32cdeac7870819661e0fe54b4833a9962c0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2914f32cdeac7870819661e0fe54b4833a9962c0;
+    sha256 = "1rkl3b1j864x9j1rbw7h7hhnhdb9m4r7b17py9kqvy6mfhacjanr";
+  };
+  "292a8fbb5a1aff92533e52ded470f85af5ffd6c4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/292a8fbb5a1aff92533e52ded470f85af5ffd6c4;
+    sha256 = "0flbsvx3d2x5qlxfj5fk9nsd6b2x9nn8mx65dqlwws2pvkw6ah8s";
+  };
+  "2944a0052b881a644f04844186daa4ae54aad523" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2944a0052b881a644f04844186daa4ae54aad523;
+    sha256 = "1fzmcs75y6q3fmlldrp6yk10bfw7vxmlg2swz995i9ry1avmjmq1";
+  };
+  "295f41723355e152d24716ed3125507d5155eccc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/295f41723355e152d24716ed3125507d5155eccc;
+    sha256 = "1gzxs53jhaskdwkiqw5kxvhfh02b9vcyql1v1kzii23f3vv1kvx3";
+  };
+  "29681ec614276ed188ccfff2342d818c3503f114" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/29681ec614276ed188ccfff2342d818c3503f114;
+    sha256 = "1f10r2iv2xq3zcl4bpcapzab9rkfscpxm83g23hszbp8yjs2bvi8";
+  };
+  "29ba225936b8addec463e591b235407a300ecaca" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/29ba225936b8addec463e591b235407a300ecaca;
+    sha256 = "1rvhh8hxxy6dv23m8qhn1bvy409szfxj7yz73dv6bzj4kf8xhm05";
+  };
+  "29eae01c452b3ae340b64ad4266ea1152b4e6729" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/29eae01c452b3ae340b64ad4266ea1152b4e6729;
+    sha256 = "1y4cmksxajljfgr8vmh7rvn7dlf43z2rw4hxfnxhri3bl55y5cg8";
+  };
+  "2a26f841843dd2551c447764a346353954884612" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/2a26f841843dd2551c447764a346353954884612;
+    sha256 = "0zn93s7bwy5z1cscs79bd27qxyjgdj6ry9j1nwkcvd9irw2ca14k";
+  };
+  "2aa18a35f72b72172e9b2c30c8ef7dbe2031303c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2aa18a35f72b72172e9b2c30c8ef7dbe2031303c;
+    sha256 = "0jj1cjhj4y50hjbsslxhrjc8byjngvcg4fllc6fysd01hdbzx267";
+  };
+  "2acb20ce30a8d1a5aa3f7506c94c9f8a93297c8d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2acb20ce30a8d1a5aa3f7506c94c9f8a93297c8d;
+    sha256 = "07pr5hm5pv8s1qw3lmgasg8ppsga50h6dhpbm7z5lcnc70nd5fkm";
+  };
+  "2b1ea22d749ba6df5bafa9119fe8a0c0d4ba68c1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/2b1ea22d749ba6df5bafa9119fe8a0c0d4ba68c1;
+    sha256 = "1i5cvjjm2sjx77qahmk4p26gm30rri50fdm1jfypp45y0hqa34wn";
+  };
+  "2b2f6a55cc19d94c0130e833f2e70c29e8bfa2e4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/2b2f6a55cc19d94c0130e833f2e70c29e8bfa2e4;
+    sha256 = "0z3vk2yn1afbkx5lni2pwii3v9by37rixz1brws112h79a2mnbd4";
+  };
+  "2b83155ddf092ccd8d8baeb9898fe084b587e82d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2488287-03e6f1d9f826475c81f3125cbcc669d9/2b83155ddf092ccd8d8baeb9898fe084b587e82d;
+    sha256 = "1jg06zvfzbz1s34wfnvcnkpjhad8kmlcf0byf61dyfacjw0rpfr0";
+  };
+  "2bac5c303baf3d4800852e359ebe06398d185cd9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2bac5c303baf3d4800852e359ebe06398d185cd9;
+    sha256 = "1wg72mlyh82ah0p7fxkj83wkllx6r8ya0x9adizvlaf8mw7ymhvj";
+  };
+  "2bc488cec0bae3f273fcf9d172b61b9a12489423" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2622232-9cbce5f5f69743598cf4bcb212040bd6/2bc488cec0bae3f273fcf9d172b61b9a12489423;
+    sha256 = "10bqvkyzynfi9k4s697i6qzpfc3p5dyw77k3wqsdm686kaaa035x";
+  };
+  "2c391f34048aae95fed7d9649088e50dc62d614a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2c391f34048aae95fed7d9649088e50dc62d614a;
+    sha256 = "0k6vzh8kkfvgb8km5jd6qn3fw84snm9xz0fmx3jffc7g5n1jywsz";
+  };
+  "2c42aecf4d302508d97a42889f9c616197b1bd9d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2c42aecf4d302508d97a42889f9c616197b1bd9d;
+    sha256 = "0f7h2w6pppdi7gp8h50528xf25d382fkf1mckckzfilvs3xvsqrn";
+  };
+  "2c6a334523bb0b39b337ae9f3754d787d930b6ce" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/2c6a334523bb0b39b337ae9f3754d787d930b6ce;
+    sha256 = "1537cbvm3byiz5yifw43236yv2ffr1h9xn5kn1m3x031q1lkrvj7";
+  };
+  "2c8420f6e48f529d116aafee46759cdf99e8a724" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2748148-aeba26080cd64d52aecc49d22cba05f4/2c8420f6e48f529d116aafee46759cdf99e8a724;
+    sha256 = "01bc98a4q8h02f3iclrd99sg215jpznqr5dviakrhakvyg2qifm5";
+  };
+  "2ccd26d6297607f50e2fd8c1b54cde1f6e6509a5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/2ccd26d6297607f50e2fd8c1b54cde1f6e6509a5;
+    sha256 = "12w39ljrf6nrvixky4dzx8q4izwba17a8bc65f561wp49305rq8j";
+  };
+  "2cd1739a082210f13445cb6acb076e89cb209759" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/2cd1739a082210f13445cb6acb076e89cb209759;
+    sha256 = "1g8miwfg84c0z6hxm2j7lqk7khbvk80jkzavb0fwygyml9xlwgfv";
+  };
+  "2cf7b40136915c48e206e1052021eb226c0050ca" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2495503-7390cc25898b4ab0a4f9f846f2fd7754/2cf7b40136915c48e206e1052021eb226c0050ca;
+    sha256 = "0gs5ylym2j8sk1jg4b6217nchv10d9bigl1nd94amzss2d4aq86j";
+  };
+  "2d54103141e313b63ef5cf774325a15054e9ff39" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/2d54103141e313b63ef5cf774325a15054e9ff39;
+    sha256 = "109gvy1i6g2bk3cj0q833gc2rc2mg5w34q6j4jx6ff956dvl9drb";
+  };
+  "2d883815049fa9361c8c5c425fbea36dcd903c7a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/2d883815049fa9361c8c5c425fbea36dcd903c7a;
+    sha256 = "0g2ld1zbwck746j2i2gl61xplp4rg54vw7yk9rc81w60889z7zbh";
+  };
+  "2dc37c85bc4dd351cd3d177f7e6f986d186bd1f2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/2dc37c85bc4dd351cd3d177f7e6f986d186bd1f2;
+    sha256 = "1nf42p4lzwz88g91wc9i4vcawsdnskjf4s93sha70mx38xbk82fd";
+  };
+  "2de8f1186afad5e4c4f23315078e4d2bf6df4264" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2653899-1a26143a64884f27a8bfc418cb1e75f0/2de8f1186afad5e4c4f23315078e4d2bf6df4264;
+    sha256 = "1hcpcss34rv1q9cw8g3lnqfxhmd4gqb52zll1g44biid1ybhjyqj";
+  };
+  "2e01332dbabb9d7f2325d7f297f41fcd48933c46" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/2e01332dbabb9d7f2325d7f297f41fcd48933c46;
+    sha256 = "07j0r50lbva8dzkpp1cym72995p9lsbc3hxkczhdydaff2cxkbpp";
+  };
+  "2e09a8e7ade5fdf179f0918bc2abac9c18e85901" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/2e09a8e7ade5fdf179f0918bc2abac9c18e85901;
+    sha256 = "1sh9srrwzs9fzy1ds452h8dzangi8q2kvnn9sq39b8cpgffjy1qc";
+  };
+  "2e601894255189d2db25a10b7d612d09c725aba7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2e601894255189d2db25a10b7d612d09c725aba7;
+    sha256 = "1y0pfngnbfzc7zlwalf7w1f97fx6aclrkhzl91axjdgnkwcnnp2f";
+  };
+  "2e6729373c277fcfd3a59532e1e7738523370fb8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/2e6729373c277fcfd3a59532e1e7738523370fb8;
+    sha256 = "12farscg3s037w3mylb5s7xnv4gzriqpbgadg7jxpl4znpdafdy2";
+  };
+  "2e6b877018994d97122a9b698eba651b59cbe02d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2e6b877018994d97122a9b698eba651b59cbe02d;
+    sha256 = "1pgfa4bx7sy8x7dq1zy0jifkaj2jmw12v0fnd4wdcnkraw9wh25y";
+  };
+  "2e8c5279ef8b2e93ab8c738c3e9b8689fc63b839" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/2e8c5279ef8b2e93ab8c738c3e9b8689fc63b839;
+    sha256 = "10hff6yk8q7kwn3557s4fbx7gbhwxsk44j7h8xqn26qzm6xbwd34";
+  };
+  "2ecfd27e7e8beaa971269c4d29040f148b7fdf07" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2ecfd27e7e8beaa971269c4d29040f148b7fdf07;
+    sha256 = "128y3l95zg1qxz9bwf3wzjb8hr89d3v74dix0c4qiv4srk300d1c";
+  };
+  "2eddeeafbb16203bad1207fe3c70aaf2e165ebea" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/2eddeeafbb16203bad1207fe3c70aaf2e165ebea;
+    sha256 = "1gr063b3z1q7d7q9ygvyj7qh1z922r8c2mh5aw2wq0s15sxjqq7p";
+  };
+  "2eebb65cf7012650afcab43c7f2f559c86b2f3a3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2eebb65cf7012650afcab43c7f2f559c86b2f3a3;
+    sha256 = "1v1kwg15r7fns0gash84zff9r25amphma6jfpzl2yr2qcydyqkdn";
+  };
+  "2efd964b62d457693b93d311acd7d54dc4e7f177" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/2efd964b62d457693b93d311acd7d54dc4e7f177;
+    sha256 = "1kd99v2l23ming81m799zz666pyk7pvzlykd9iqd9a1b8xi8q80l";
+  };
+  "2f143d8520d94bbf2cb250b35a8f79e3d3e8572c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2f143d8520d94bbf2cb250b35a8f79e3d3e8572c;
+    sha256 = "1wrzkwv1vl3r7hczgmyxw4gv2nlwjivds8x1myicrb3wqz85b2wr";
+  };
+  "2f3b66c8bc4bc7ba4a38982c19f7aea56a40fa44" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/2f3b66c8bc4bc7ba4a38982c19f7aea56a40fa44;
+    sha256 = "1bz12dwy7yyg4niq822jqv7vi5g7mmfiscsdbay08184niw1a2fc";
+  };
+  "2f4b14734a09e63c0347c348f77cd0da3c72b561" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/2f4b14734a09e63c0347c348f77cd0da3c72b561;
+    sha256 = "0ypvfnnsl2q15qmqkq9qs1mfmyk63jjxhr2w54v7xcxv40l2d0ah";
+  };
+  "2f8b4043d609acb0eee65a86210c9881d1e4a9b5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/2f8b4043d609acb0eee65a86210c9881d1e4a9b5;
+    sha256 = "0yqildrca6fx0gvhb08s3m4dwfkrzbyq877nkcykzid687q6f2h6";
+  };
+  "2fb0ce94e7960b83e88bc4d2687ba07c94e9d96f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/2fb0ce94e7960b83e88bc4d2687ba07c94e9d96f;
+    sha256 = "0jlakpvdmqscxgdwlgyrx69bdpfpx9bxinz56hwrfdqlsl13d6zp";
+  };
+  "2fbbb90552e28dbaf47f41fa63652c11c7b99c78" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/2fbbb90552e28dbaf47f41fa63652c11c7b99c78;
+    sha256 = "1w8zvb659f0xd5fa0bhclmrkavb82nj8xwwcan1rwys38vvghl6h";
+  };
+  "2fda5ea89a82d953d04583ab86b387b1b3f3dd6f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/2fda5ea89a82d953d04583ab86b387b1b3f3dd6f;
+    sha256 = "1l8slfjrais377xrpj9lm0058y2r4qb24yvh30fpxmw3alvw5wg2";
+  };
+  "2fdbf124501fb7d04dae2e4dea0e796f8a098f36" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2fdbf124501fb7d04dae2e4dea0e796f8a098f36;
+    sha256 = "1b4id5wcrfjl6b0qp5c1y1dq62g8sn7ln8j1idvi5ffwwrmsx8j3";
+  };
+  "2fe1fb9f98af4a68ceb9adee909fe7b67917ea81" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2621991-64978bb873e64559b7c143597fba3856/2fe1fb9f98af4a68ceb9adee909fe7b67917ea81;
+    sha256 = "0n35g4sb7wymb0k22n0frapdhw6zz1aiiv5xynjk8c99pivdnism";
+  };
+  "2ff8709ada5b8bbfe994f55ce697983225440813" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/2ff8709ada5b8bbfe994f55ce697983225440813;
+    sha256 = "1h57h9z44acyrw5klcslbg9g7zxgxaz26d3ab18q2mp17mrw3wk3";
+  };
+  "3012eb0c18cf3faab0fd1a8290905b902456192c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/3012eb0c18cf3faab0fd1a8290905b902456192c;
+    sha256 = "1halwqjmiprn659fqcdfw5g3ffanx34j0ri8n00xmbwv4hhkvsvh";
+  };
+  "307b166459a0b56cda3d5d3235e3c39b37b2e2e7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/307b166459a0b56cda3d5d3235e3c39b37b2e2e7;
+    sha256 = "0hmc67ngk3s4by9k2kcl5kqi8vmkrqp0vaphd0v88z162vax44pk";
+  };
+  "30bf523aff5cc60cdbb2da5ca9b51226e6aefc9b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/30bf523aff5cc60cdbb2da5ca9b51226e6aefc9b;
+    sha256 = "0cvfn3vv6jhhpimc8s9q37k041c3qc8rrh1fkab89y1d1g430mil";
+  };
+  "30e4e0e87aa3c6ed5b9d99e89c3e3986727405b4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/30e4e0e87aa3c6ed5b9d99e89c3e3986727405b4;
+    sha256 = "0gpvcs6q6cprbirwndirz8a75d5xrsxdzplh9j2zknqkybwbdsyg";
+  };
+  "31513973d4d5ca51b8bb4b0b965dd53bed0284bf" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/31513973d4d5ca51b8bb4b0b965dd53bed0284bf;
+    sha256 = "1y1lnwvzs2v6yibnxb5lxcc74gn2pgarqdqhs26501hf35cw400m";
+  };
+  "31a9943db56acc38a4a6083517d5981accfd7b0f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/31a9943db56acc38a4a6083517d5981accfd7b0f;
+    sha256 = "0i6n6hhcjg2ccqxmajmb3nhwbfx2bkfszxycs1k4ip34yhb7fbcd";
+  };
+  "31b00e20c26ba53e1e4071f88ae88e478dddc667" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/31b00e20c26ba53e1e4071f88ae88e478dddc667;
+    sha256 = "0n9fwvmp1r5h3z9sbqx1ywr1azm0ckrgk4j2557n06l4f539bah5";
+  };
+  "31d76d0dbcad8d9f1b4242247389a533fb8e3ca1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/31d76d0dbcad8d9f1b4242247389a533fb8e3ca1;
+    sha256 = "1iwqppypjqvq32csylhbrq7kjcm1533fdaq4m6pdnb8cf3q0haa3";
+  };
+  "31dc2af99e1bb1eecb4ddcb3b2983a0563cde9f6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/31dc2af99e1bb1eecb4ddcb3b2983a0563cde9f6;
+    sha256 = "03awckc4gh0ypdkglzhy4fg79fik904nczmwpf4vwrd83xin7dp7";
+  };
+  "3227bc9c7feb2325ecd2c4144ae0feae8ddc8b90" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/3227bc9c7feb2325ecd2c4144ae0feae8ddc8b90;
+    sha256 = "1k11sd1jsbbcgr71jn67vq4zjwxa96y8qknl4b9p3333skixvhmy";
+  };
+  "32860f0809372d37c40310daf0184877322fc636" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/32860f0809372d37c40310daf0184877322fc636;
+    sha256 = "0dg7hjwhpbfbqxwn4dgclpfrbbrjn5l8xbdpx9n3fvsrr861zdxg";
+  };
+  "32bb97834c48d10d8115a0167b8372bca6b8b179" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/32bb97834c48d10d8115a0167b8372bca6b8b179;
+    sha256 = "04z8ppim2mh792m2fqw2xws7j1m6xrd1jp1pcn7lgfaiz98yxvr1";
+  };
+  "32d809d2943a46adfb06d390602d4be87fa510ba" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/32d809d2943a46adfb06d390602d4be87fa510ba;
+    sha256 = "04fn639135gmvmrq4i7jq0s6k8rfd3jj4a11740avbpbynw9gr25";
+  };
+  "32f81135ef65d05728ba2f1c5b5f3935a52334d7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/32f81135ef65d05728ba2f1c5b5f3935a52334d7;
+    sha256 = "0sczgfd4kksl69gw3zazx7r046vb3dxgbpb6njzv52yj5q13ha4f";
+  };
+  "330afd81b039c963aa95ebf7fcb5e01b8ce9ee3f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2620227-83084f9091244f6c9bba34d6d2a0fc20/330afd81b039c963aa95ebf7fcb5e01b8ce9ee3f;
+    sha256 = "0fv2jyajl8p8v9vini5iqmj6gnzzccjvmgzk121vmnhnm4090p1m";
+  };
+  "330e7d22693575d7c1e3bc8598676d1ad936a018" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/330e7d22693575d7c1e3bc8598676d1ad936a018;
+    sha256 = "08s5fpxn14xppyif4yx6w1sgrxb74q2aw4ar126b9pc1ihlw2c0h";
+  };
+  "33450e05fddd79d7692866accaff42adf9cb9a97" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/33450e05fddd79d7692866accaff42adf9cb9a97;
+    sha256 = "0yg8i2hg1mrx6mppwm1xs3hwpdv9m20l5881vbncyvgpy9a37kgb";
+  };
+  "3347d72ae38994059c896549688eac5a145b35fe" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3347d72ae38994059c896549688eac5a145b35fe;
+    sha256 = "1pxfsdbmrhal911bb5pjmkk0j70nik0m5kc1b9i675v4h4ysfk3x";
+  };
+  "33870814a45b700847bc8d18c59c18d1daa72623" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/33870814a45b700847bc8d18c59c18d1daa72623;
+    sha256 = "015v4x2gkkcpnz7jf35gbq0z1x3b0drcyp21ignx3xz7w6cxz97m";
+  };
+  "33902cc01c7eda10161025651275a129da5ead6e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/33902cc01c7eda10161025651275a129da5ead6e;
+    sha256 = "1g3i1zx14zg5dmbs6pcrrg0xw1rpsqavvbrxd79m5r09c90y6kbh";
+  };
+  "33d0a2949662b327b35a881192e85107ecafc8ac" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/33d0a2949662b327b35a881192e85107ecafc8ac;
+    sha256 = "1x60d939njwsak5r3mga01bkv2c2ggvq28hvqnx6s0z7icch7vib";
+  };
+  "342f323d0582f6c4897956e82b4549bbf9c47973" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/342f323d0582f6c4897956e82b4549bbf9c47973;
+    sha256 = "1l6wr3rbkg5hs0wda43c1dk2gfg2a9r53rki2yls0i9xirhfmkd7";
+  };
+  "345fb7a468fc7c5315a11b86b2c600ac91955213" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/345fb7a468fc7c5315a11b86b2c600ac91955213;
+    sha256 = "1jw46pcrndls655pyx57acdj44v4kr3jg7b04ibmxc31j0mn1955";
+  };
+  "34901ceb8b3afa22d4a75f06c3c465a3292592d3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/34901ceb8b3afa22d4a75f06c3c465a3292592d3;
+    sha256 = "1lmnfbi5l6fk6p4iaa30dpali392xm8r1fz1nd0jil0zr7d3kcll";
+  };
+  "349fb1419c99f4b260e3bb7b3a7cb5273c5b88dc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/349fb1419c99f4b260e3bb7b3a7cb5273c5b88dc;
+    sha256 = "0xdrf7zqci1ffn6w0pw8hq4ijbppbka72fb2lgrqjiawzmhh1i5h";
+  };
+  "34a9c86849d93a7f932667ae0e2d9fc3f4aceeb7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/34a9c86849d93a7f932667ae0e2d9fc3f4aceeb7;
+    sha256 = "0fvrksn1668yxx9fbpchawvnah6n4zpicc865djhfqq1h5vfndfv";
+  };
+  "34b38730a025a0c75cff4caa03512a0054d0695c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/34b38730a025a0c75cff4caa03512a0054d0695c;
+    sha256 = "03m8rvh9hrz1rp0004vav5gdkj2c79j2h3adhjlbgcx8llr3z3p4";
+  };
+  "34da962d8bda23fc14978d82c2c5fb761acc5815" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/34da962d8bda23fc14978d82c2c5fb761acc5815;
+    sha256 = "13xv0nb13z4f57xf9rvnnd73ssf8cx26mvagjmikzsi7chvbpbwn";
+  };
+  "34f9df3c5cbc087be9cf8b8b2084287fb9f3b2e2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/34f9df3c5cbc087be9cf8b8b2084287fb9f3b2e2;
+    sha256 = "0dywks9jrd72xlmxzvcgd5blphf89r98g5h6k76grmc9k2mswwv3";
+  };
+  "351da091078402bf85cff8964a50e1ecaf81e7ce" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/351da091078402bf85cff8964a50e1ecaf81e7ce;
+    sha256 = "1qx85bsc094gzng5x426d6gcbhfjnqhahly3s0dq3g3vw915jl2s";
+  };
+  "353076c56a6ecfb890a7ab5f30c881a73e09d508" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/353076c56a6ecfb890a7ab5f30c881a73e09d508;
+    sha256 = "17lbpk2zkm36l67lfbrmf0wc8x47ywkji127592q707wc4zgh397";
+  };
+  "3579a812b187dc0ebafb13d5914b27deab2c4367" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3579a812b187dc0ebafb13d5914b27deab2c4367;
+    sha256 = "0pnppnyx0nk9grvn2sqha2wmfky42f92mvnxs7scavg913zxi3sg";
+  };
+  "357fc4cd09e4eea77faa70a271346bfd5d0b8417" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/357fc4cd09e4eea77faa70a271346bfd5d0b8417;
+    sha256 = "05xfhmc9y3q31nrjsfnifx709l5yrss0qkilbw19da4lhxqknb6i";
+  };
+  "35b0e5ed5cbf20a0b47af4bb9ca6ffef4d3e5d8e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2602350-38e0d307a57a47baa00ee5f892c9ced6/35b0e5ed5cbf20a0b47af4bb9ca6ffef4d3e5d8e;
+    sha256 = "1i88krwy1kxphjcl4l5bxfp4z8dyl4lgj9nrw09dvj8k7azzjvlx";
+  };
+  "35e0d2f1b5d56bea19aa9443dd5c41b4ef095b4e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/35e0d2f1b5d56bea19aa9443dd5c41b4ef095b4e;
+    sha256 = "16k5gkkwmwldbaf29yfshhawqxxq5ccpwylw8wklc56705ib3x96";
+  };
+  "35f95404a8393dcd6374b594b1c2bb5acce427ed" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/35f95404a8393dcd6374b594b1c2bb5acce427ed;
+    sha256 = "0qvh62961qhp0j46p18iiyv3fw783lrcljlxzr3vv3zszpvnqyhv";
+  };
+  "3639943c4bf99c8f284de9f812bf2cd6eff5d49b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2456855-d820875aa14148d6807c08cda631b764/3639943c4bf99c8f284de9f812bf2cd6eff5d49b;
+    sha256 = "00rdh4lcfb7mwlkqxzrpqd9g88znfajm1cbcd83zxdyc2jkipi18";
+  };
+  "363bd76bc4fa81ad344802f2fb8610153a5ca75f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/363bd76bc4fa81ad344802f2fb8610153a5ca75f;
+    sha256 = "0sllg3pgm9jqq73i89l1smrl2y35cgd8667q05v1x9ilhlxpb2zs";
+  };
+  "36922d450606299836b10b930c0c66af1f780347" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/36922d450606299836b10b930c0c66af1f780347;
+    sha256 = "0ribsanhwk7m3qvqydpkhvhi00js7n9wabi3c3l0jib6knndphsh";
+  };
+  "36923d3780cea992eb61b86d48b1a61297b44536" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/36923d3780cea992eb61b86d48b1a61297b44536;
+    sha256 = "0i4av37slygbl1xynai7h6cb7dsg773zgafdmy10jmc2bb8dp4ky";
+  };
+  "36af7f5290dd60c07f83b8a398eb9721c24a6154" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/36af7f5290dd60c07f83b8a398eb9721c24a6154;
+    sha256 = "0rwi5y9sra4pnxdw5l8ykf6s26dg5clflr76f66vdppvipd38rf0";
+  };
+  "372698b3d3b17da23c0c53958fefda69c1198f54" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/372698b3d3b17da23c0c53958fefda69c1198f54;
+    sha256 = "1824igxlj2yc3b2li4gapwlgzgx9gd3kw2gnlkcxdsw1m2h79npd";
+  };
+  "374b33734d17be020f3eec73cf16a100e905a8c5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/374b33734d17be020f3eec73cf16a100e905a8c5;
+    sha256 = "0d3ax4shw2y8bivqajmfgzmf3bg1syz6i91pk8jbl38i1007h4l1";
+  };
+  "376fa7bdb1a776f7100bfaa29f24a9b81bb5a97a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2701146-722550daa90f4e4996a6cdd478880969/376fa7bdb1a776f7100bfaa29f24a9b81bb5a97a;
+    sha256 = "1znfn4asyx1spinx8jpc5r479a30n5cnbb4pvlas6sb3hy8q68hd";
+  };
+  "3779adbbb84b7918fcaa4bc8df4b64a45e50aa88" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3779adbbb84b7918fcaa4bc8df4b64a45e50aa88;
+    sha256 = "0g3gww1rq1z7lrnxw6gw3i33h799fbmh717qm599w47pq73xmffl";
+  };
+  "37a47bf076c47063d031b82f827412bf05a5f500" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2550873-dbd5ea4331fc461794c4770d56863ff2/37a47bf076c47063d031b82f827412bf05a5f500;
+    sha256 = "0v71m3c03xv44f17rznw6jbn5k7vac2g3547wsvin7y1vr7jhy11";
+  };
+  "37d805efe0d2358727b0deeb9f5c56b3b68a8478" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2653899-1a26143a64884f27a8bfc418cb1e75f0/37d805efe0d2358727b0deeb9f5c56b3b68a8478;
+    sha256 = "0chznyg2xnyx3zz2q9q6i9cdk26m6chcp6pjzm8lnvc4k7p2mbls";
+  };
+  "37f1c844684794da07d9c537b175855f8266fdbb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/37f1c844684794da07d9c537b175855f8266fdbb;
+    sha256 = "07ypy820rrps4d4icdv0bklaa6kyn50gyyaq5yspmwkn07rp5hbv";
+  };
+  "37ff9ca732f3611a92185cfbfd25e6eb7d3d2fde" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/37ff9ca732f3611a92185cfbfd25e6eb7d3d2fde;
+    sha256 = "0lj5ajjx53k7d7m770hdm0mfanfi0kj7vhnfi7x5h75gpzihi6g6";
+  };
+  "3811b277d1080f2314e9ffd524da841aefd84ce0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/3811b277d1080f2314e9ffd524da841aefd84ce0;
+    sha256 = "1m9hjjiskwc6xnfkyzbg52mx2alxl8qh19cawykr1dnd1qs2ngz6";
+  };
+  "38c9a6c68be0ce7a36d83391a637010447ad3301" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/38c9a6c68be0ce7a36d83391a637010447ad3301;
+    sha256 = "08j52b49p3ps6i78v9h04gwxzcbibg41i5dcxqi47vq9ihhb1nsa";
+  };
+  "38e0e2e02bc165327038c973058790e3962d6079" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2686985-76325fadec474557a67995f00383ea6d/38e0e2e02bc165327038c973058790e3962d6079;
+    sha256 = "0yb69a7b63sjcjha8lh1l86jlfxln1gz5y7gplqbj0m0c4qrg72v";
+  };
+  "38e6833dfb6b74f5acf23d984bb9ad01086e1f39" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/38e6833dfb6b74f5acf23d984bb9ad01086e1f39;
+    sha256 = "10ln9haj9317g49zmi5jc4dq56qs0b4qr8g1g6rypiw8ndlm00rq";
+  };
+  "38e79fc7612d6ebd7278e23e7d0a9df3b95155d5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2739939-d1b07735d39c4b8c8427e05b6d9e3571/38e79fc7612d6ebd7278e23e7d0a9df3b95155d5;
+    sha256 = "0w1lwm9dfrprxa3dcaln774c3l5b4ai2sssww81f8adjafbvzr7l";
+  };
+  "392d5e0536abeb83ccfc28ba9fb96e9d1d6507f3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/392d5e0536abeb83ccfc28ba9fb96e9d1d6507f3;
+    sha256 = "1b9a86drlml4cflilwa188i5ay69ydhpc3q477947vs5gbgc7ln7";
+  };
+  "3965204d2b18ccd0b4d2191500d373ac064180df" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3965204d2b18ccd0b4d2191500d373ac064180df;
+    sha256 = "0k801x11n4zmfshdmb6sby0k29bjcd83hzcbwp0hg7vnnxqsmfm9";
+  };
+  "39935e746b413e3c60c9a519e893cd19db5425ed" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/39935e746b413e3c60c9a519e893cd19db5425ed;
+    sha256 = "1cr5666m83v6xkpwr2j51sf1c3a0q5kahh3j8ygrd74alm9v4wqd";
+  };
+  "3994a8a3195661395d89f209755bbab5ce1861c1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3994a8a3195661395d89f209755bbab5ce1861c1;
+    sha256 = "1jybg0wg5n99rsmzd4i3a1bs1p78gngzar0qan131scdywcv8384";
+  };
+  "39e7e3f8feb9564c8b90f2f6d630bb8ba96f2eb9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/39e7e3f8feb9564c8b90f2f6d630bb8ba96f2eb9;
+    sha256 = "098vn5ps7qv0qjs6fvrzyx9qiq9qw7pslnhy4djm4xzamxs0n49n";
+  };
+  "3a6db69d4f8128addbe24660128ecd2ed9fd6dd0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3a6db69d4f8128addbe24660128ecd2ed9fd6dd0;
+    sha256 = "04kx57syka9vpvgh5mjlmc1gg8d2ng5snrv36vmw4gq3pm0dpfi5";
+  };
+  "3a7f7a47aca5ad86176f1ceafd77139a06b89e11" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/3a7f7a47aca5ad86176f1ceafd77139a06b89e11;
+    sha256 = "06vrb7nwi09vdkv8b143g2wz0wvn1qbp0l3l95g9frp4xkd6j8cf";
+  };
+  "3ab17699ce95c427b0c0f3466b4226e2e30b92d0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3ab17699ce95c427b0c0f3466b4226e2e30b92d0;
+    sha256 = "0vl7np8bpwcylsgdlvy8hmkzapj1a8pqywy0n01vk7q0fi0wxmc8";
+  };
+  "3b07d6bb5a24bb96557c48982e8b3389df33cfef" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/3b07d6bb5a24bb96557c48982e8b3389df33cfef;
+    sha256 = "1fgkqm5f66x937nlmbsz2qx2lnd276f7rjhcyf073prv9hwhi2vh";
+  };
+  "3b14a44c8ac4cda934824f4a48fdf11ae6dc27fc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/3b14a44c8ac4cda934824f4a48fdf11ae6dc27fc;
+    sha256 = "16y6n3nlpkccpafcbavp8qhcc9adyjfyw75wjafkaw5ixd7c89ag";
+  };
+  "3b1f533104a3f316e188203a3b20770df4580018" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/3b1f533104a3f316e188203a3b20770df4580018;
+    sha256 = "1wmryvw8i7zvkcb2z2ajafsngnj66cls3918n91d2lqihsjp5x6c";
+  };
+  "3b5ec1d1c8209489d78b2eabab46ec59ea1f65b2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3b5ec1d1c8209489d78b2eabab46ec59ea1f65b2;
+    sha256 = "1qvjpm5sy6544wfvnlgd5qa2sw9q0nd3dvxqdqsvbjfzf1da6min";
+  };
+  "3b5feab7a5f46b3129c78ca6512692588d73eb8a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3b5feab7a5f46b3129c78ca6512692588d73eb8a;
+    sha256 = "1q0is2ciaxcan8fzlf57pbwj096d1lhnym8653ifxbxii9jm7ng3";
+  };
+  "3b8d4ffa1666bbdbcc426ba6232275bc853755ea" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/3b8d4ffa1666bbdbcc426ba6232275bc853755ea;
+    sha256 = "0mws36ydilcpavzhc32jzxllwgkxsk7d5yhrfa51j1b894wn60qp";
+  };
+  "3b9f2ea7dea75e5b70ff3776eb46e114725fed92" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3b9f2ea7dea75e5b70ff3776eb46e114725fed92;
+    sha256 = "054gxl8l03zzib7awcq2va0gh0xisl7yzz2x4rdpiv97zm0hlzx7";
+  };
+  "3ba6f94d6907237623e86c589cc6e9a1399e5a2e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/3ba6f94d6907237623e86c589cc6e9a1399e5a2e;
+    sha256 = "022lj7l1w267kw44flfjpbsq9qj99xinw5qqxk352h8py2nddm2a";
+  };
+  "3bbd878e5357ee3dc1e752b07819ba87b7230ef4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3bbd878e5357ee3dc1e752b07819ba87b7230ef4;
+    sha256 = "146g6zzaiwj2lcfazn6ap8ldqxs16cfdm6larc93g3yys16c87y9";
+  };
+  "3bc0fb4bdfdd1b6c1c684583efe02591afadb98e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3bc0fb4bdfdd1b6c1c684583efe02591afadb98e;
+    sha256 = "1diniwvlf76vcfxb3cqxx2xdkwsvd486qwkdgfvwyx3np2kypk8b";
+  };
+  "3c01d8c58f5ec428fdb8057af5387b8bca2816eb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3c01d8c58f5ec428fdb8057af5387b8bca2816eb;
+    sha256 = "0mrfagcmk325vzrhw1zb96ka5b0a37xm7g1k2b4s62xcl641qk55";
+  };
+  "3c048c63475cdefe078376d2fc1ab8294de64e58" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3c048c63475cdefe078376d2fc1ab8294de64e58;
+    sha256 = "1gkh00i117krs57p2xwpi4s3vwby5na98nni0n5xf3aglqwa9anz";
+  };
+  "3c262ad594e83bd32b0d3a0f794b737101eb2874" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3c262ad594e83bd32b0d3a0f794b737101eb2874;
+    sha256 = "065r44gb0jsfz4m6zfvlj3w6wgh4fdmr52f353r5z1gxqqzqszr2";
+  };
+  "3c3769be5270bdf2ff4215c9f2f6c15d0ae05b7e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/3c3769be5270bdf2ff4215c9f2f6c15d0ae05b7e;
+    sha256 = "0ia41s3fvywhfgb2riqxq9mhhzy477yjix2v1bzq034g19bp4s1i";
+  };
+  "3c3a62993361bbb928b7f5c0407be6bee08da734" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3c3a62993361bbb928b7f5c0407be6bee08da734;
+    sha256 = "0qn8mkxlll5rg4vr22xlwr6dmbsmvvyniry3jv7d3cj3bajqgavp";
+  };
+  "3c477e2e63d3533e62d654e63f012e59da5a3edc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/3c477e2e63d3533e62d654e63f012e59da5a3edc;
+    sha256 = "1f625rs8277bqv7wb6cpxpv1ry7zcy4an9q5gq5iz0f56qs3hyxc";
+  };
+  "3c65149be3cd5e4689b4eda6bf5569d16b149f6e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/3c65149be3cd5e4689b4eda6bf5569d16b149f6e;
+    sha256 = "1zs20c26z86jwjx18zsppkra3d147vynyigibx0klrp0g2lfkpdr";
+  };
+  "3c6fd2f94e3497924851a5d8254666518d47a633" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3c6fd2f94e3497924851a5d8254666518d47a633;
+    sha256 = "00rh0skjjx7b8pd8mmnd2v35vhmsly1f0pnrvwyr9d5pfzsnxb6j";
+  };
+  "3c70f43afffaaed52bb87c78f1ecf8de846ce76d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/3c70f43afffaaed52bb87c78f1ecf8de846ce76d;
+    sha256 = "106bj18q36wr5f1k2fjfish63q6phzwavcl5fh6sq1vzlh6gggz4";
+  };
+  "3c8149ddaa7dec626f08fd4fc2d852a4536ddabc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2621991-64978bb873e64559b7c143597fba3856/3c8149ddaa7dec626f08fd4fc2d852a4536ddabc;
+    sha256 = "1zl5kv0d37dhvkrhzzs9xn5qx1zpfa5nzy3cc4dvmfhsp74bgf7y";
+  };
+  "3c9ccdfb5da6f595a26f2e1f746cfc9f639e57dd" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2625762-5759dd47f697403cb15f8e48090b1010/3c9ccdfb5da6f595a26f2e1f746cfc9f639e57dd;
+    sha256 = "17wp0p9miy3yll9wyl5kggdg8x1rlbjwpw1w8gyinbvlp87y41md";
+  };
+  "3cc84281c7db62939c39b08c06b3174dc52ae63f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3cc84281c7db62939c39b08c06b3174dc52ae63f;
+    sha256 = "06da44vi1v0gcrq4q3aanrqbpywqjrcm12w6i38kkwa8w2m7fq9d";
+  };
+  "3cd0df317d9f5715cd35c147537107dc3a588008" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3cd0df317d9f5715cd35c147537107dc3a588008;
+    sha256 = "0ic2xh8327zzgrpgrcggdq10cx906sidv55ys6bn37yqcm86ihyr";
+  };
+  "3ce154ee1488f62d7804205c87d8e37504733e7a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3ce154ee1488f62d7804205c87d8e37504733e7a;
+    sha256 = "1gn1lmmnz00cbrm054q8wf3hxb2i7dhi7vb38dmgy4zwk67qdf3y";
+  };
+  "3ce4d40ab5c9c0141c6b805ed0eaa638cacc0e8f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3ce4d40ab5c9c0141c6b805ed0eaa638cacc0e8f;
+    sha256 = "1zv992b5bndxizgvcmxwdl1mrahg0xpn356s8y4xnbvf4ysimpiv";
+  };
+  "3d0b21a35355415e71e8fb7ea0012b306e2a037e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/3d0b21a35355415e71e8fb7ea0012b306e2a037e;
+    sha256 = "1zwykg73i0rnga0y6cal2x4jlz69n3c6iq3g7c1c7d7a4hsgpy76";
+  };
+  "3d2991e772cfa979508e25de5935a89210973591" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3d2991e772cfa979508e25de5935a89210973591;
+    sha256 = "1cacv6pd0p5wmxmfxfp56v4qd3chz6r27c6kbax3p325b6cjf9kz";
+  };
+  "3d3ffa0f6b5db075797d9657c491f1cec7434474" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3d3ffa0f6b5db075797d9657c491f1cec7434474;
+    sha256 = "0gzfpaw0v6xxbwrj14k1hl6dzn3g532war2h0mbpk5x2zgf05ppw";
+  };
+  "3dae84206c49a13a781a04f072560fdaae772628" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2542875-37bf4143b09d4d7a88bd89c6cbba110c/3dae84206c49a13a781a04f072560fdaae772628;
+    sha256 = "027xmslcmb490svay10k7xhj8rsjlmqv13igafnrqw082fz2crvi";
+  };
+  "3e2b9f360e17b90289d6aa8e07f64f8bec445375" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/3e2b9f360e17b90289d6aa8e07f64f8bec445375;
+    sha256 = "0hpm43hbn6wj8gv2hr47cnbfky2732pbqpmhjd33lgd5zjm17ki5";
+  };
+  "3edebf50b702f5e5d08876bdea65dbffa3d1e98f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/3edebf50b702f5e5d08876bdea65dbffa3d1e98f;
+    sha256 = "196mmj2w2dzp9d9gyllpivnmik2kg54kk1qini5c7va9v0iifh7l";
+  };
+  "3eeb2f03152b2114d56a8804fb8d634405321569" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3eeb2f03152b2114d56a8804fb8d634405321569;
+    sha256 = "1mr55cjp8l7jmql2lj146lw2rqgyxb7wff71nm2i8b5mp6w7fa5i";
+  };
+  "3ef09650cc8541a72fb0c287cf9008a6ed209a58" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3ef09650cc8541a72fb0c287cf9008a6ed209a58;
+    sha256 = "0wmf0hxsyxqzbzj8r1d7f2pfrqjqwa56wj4i2nnp6cccb7z8vdh1";
+  };
+  "3f4cbf00af0438c956f74f514929e02e3e8d43bc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/3f4cbf00af0438c956f74f514929e02e3e8d43bc;
+    sha256 = "0294prdqycf6w77hb88jxirl7jgm00sjgc4nzwkznpf6q32jc1if";
+  };
+  "3f75f49ccfcf87ae2a3bcc2a68cf49fb510ada09" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/3f75f49ccfcf87ae2a3bcc2a68cf49fb510ada09;
+    sha256 = "1yq7yamysw27k0znsji1p850gk56vq07lbhxs837x0j9mp2qbfml";
+  };
+  "3f77d7050ec7beb565e4f6d6ad5f1291b2a066e4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/3f77d7050ec7beb565e4f6d6ad5f1291b2a066e4;
+    sha256 = "1ibs8qdbh8vp9ba04qs3bziwss5hbqknylqsydafqzmsvg0qgm5k";
+  };
+  "3fb53e132dfce0a5c72b3b10fb63fd6b5b89b16d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/3fb53e132dfce0a5c72b3b10fb63fd6b5b89b16d;
+    sha256 = "0lrs4n23klz5jqvchpzpflk3hyva9rr335qx3psd34q64hnkxs89";
+  };
+  "401dde870b0593ea8eb48a00e180d088dd331d41" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/401dde870b0593ea8eb48a00e180d088dd331d41;
+    sha256 = "0ijdkqiymih4nm75gky9h6yycd496hjg60kimjnz73bdadanq4g5";
+  };
+  "4022d82d143e72ccce04e7825d3328a7b02fc901" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4022d82d143e72ccce04e7825d3328a7b02fc901;
+    sha256 = "0f69a35zcjw4l68gd1qv21xnxhlwgx5fxi2msxfa5blg9i45vkvv";
+  };
+  "402bb37cf56e4ae0f047b4de8eed748f259c6a15" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/402bb37cf56e4ae0f047b4de8eed748f259c6a15;
+    sha256 = "0l3sgilafh4ri0mjz6jlx59bz82qbd6q119alb9wjpvlwgk19s9d";
+  };
+  "402bd33734002ac97efc2300bb3bcf9d2cad7bac" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2514362-4164223ab78d4e529a0f07d941c2c537/402bd33734002ac97efc2300bb3bcf9d2cad7bac;
+    sha256 = "18p16j0jpavsdyv2mgif0s7xcqhw9574vfi95qs7q4pb4lpd89pq";
+  };
+  "402fa9c093561a043e89a83d3b0553126fdf2bb7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/402fa9c093561a043e89a83d3b0553126fdf2bb7;
+    sha256 = "1ga2xj4v20a28fj6n8byq7082psawipfr00f54mx33wr2flb6c7n";
+  };
+  "403c4174a81ed034269a740a7bb9739dd07b91da" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/403c4174a81ed034269a740a7bb9739dd07b91da;
+    sha256 = "157xba3mjgw37m6i29chdk2l4jg4jmlp4fkmfsanl9g66z7aw4hg";
+  };
+  "4041329918332581cd573d410c6a163dcf7b7495" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/4041329918332581cd573d410c6a163dcf7b7495;
+    sha256 = "1gvjy14zqhnyx4nnlcbj6649d2aw3vwaxhrls3ngrkw5jw74ckxj";
+  };
+  "409e09bd60df0765b85577118bd3da12988d97d9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613445-f4cf430b68ba4dbf80d97361d7c5dd6e/409e09bd60df0765b85577118bd3da12988d97d9;
+    sha256 = "0lq5lril4ylw3xg46djxzlkbvv109lpa4l0l7ag0q555yzhfcnp8";
+  };
+  "40b467567f62e9c6d0bf5cba7d2ff43cb9a687b3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2599079-89300969452d4a5eaefe1ab4af976839/40b467567f62e9c6d0bf5cba7d2ff43cb9a687b3;
+    sha256 = "02qslivwbnycygypvqicgv8syrsrdw9cv7bmz4zxp9ghbkmasx5g";
+  };
+  "40ddad780beeb95a141365c9ee5c50502ecf9a3f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/40ddad780beeb95a141365c9ee5c50502ecf9a3f;
+    sha256 = "0bd531adivbi47mb1nqmwm23plhsh6hbj54wrpnkyzbkciq24jd8";
+  };
+  "40f7222800bd5c3a14980a0f6e706ce2b8a6dc8a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/40f7222800bd5c3a14980a0f6e706ce2b8a6dc8a;
+    sha256 = "13rzkw224mz4qfsz7f3pywdl2nkly5k28jvrzqqhksrrddf4y78g";
+  };
+  "410e46447d67d73c00b681403bff72bd1c8db3e1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/410e46447d67d73c00b681403bff72bd1c8db3e1;
+    sha256 = "0dahfv97qdxza2yjp60mkflmf541s99c8j0m119vigv5795nrp2l";
+  };
+  "4138035f335e8ef4c9bd7d4700011e8ce6bc06dc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4138035f335e8ef4c9bd7d4700011e8ce6bc06dc;
+    sha256 = "1fn99hdnba0zza6w416xkqj6vajgk57s5qphqbn2jsrf024kaal4";
+  };
+  "41478e3ee1bd4eb5b22ccbef4265d78586e0a9d3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/41478e3ee1bd4eb5b22ccbef4265d78586e0a9d3;
+    sha256 = "0k259kbgvw1zm8dcs0mp21lh88zvkxzy1v2zyj8yb8hp94gdwp1r";
+  };
+  "416a2ef9e1d85c9801e1c11b5b75e6647f40b196" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/416a2ef9e1d85c9801e1c11b5b75e6647f40b196;
+    sha256 = "1zxg97c2211hspph0d9jzaqlvrfd8cx49d40k5halnz3h682cl2d";
+  };
+  "416d80d6a7cfb22bb899d4a75a80c78ddd81ffbf" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/416d80d6a7cfb22bb899d4a75a80c78ddd81ffbf;
+    sha256 = "16xfnicsjfvhzcnzpf1rpbb9q42dq67kbxi84mb4gvdrqigkvmg5";
+  };
+  "4179740ad0fac203ef6afbed2ade36619667a9f2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4179740ad0fac203ef6afbed2ade36619667a9f2;
+    sha256 = "02kg5bp115via7359bkr3vgbk1nvylhzjc9szzqjbff3mb2fxgdn";
+  };
+  "418d45c49afe937049dd1f731516162b1f716dda" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/418d45c49afe937049dd1f731516162b1f716dda;
+    sha256 = "05fqszk0lv9ynzpf6lr44jddhm5lr476naxiiqsvwj4g62i8nv6i";
+  };
+  "41b5b5efc87e1d57447016f701ab6688ba9bed94" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/41b5b5efc87e1d57447016f701ab6688ba9bed94;
+    sha256 = "0gcfhbzh8hqhv5xzyfz20j01haxgyirilv8nphg74ky961y2sj2g";
+  };
+  "41d5dc73ef01e6cc21c028fba64a655a4f2d3d52" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/41d5dc73ef01e6cc21c028fba64a655a4f2d3d52;
+    sha256 = "13sdr479wysfckxv8lx7p3kh0mc9ajdyknkvzgklaxcxpl591y67";
+  };
+  "41e03d2c0ea9b66441ae01c7aa831107fba3ffed" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/41e03d2c0ea9b66441ae01c7aa831107fba3ffed;
+    sha256 = "0zfmpa24cl54f7zlpcmc6ki6kqh0qnv6g5kfi9jv51m9l2cg0x5g";
+  };
+  "41e5224b15d09a7227b36b443d5ad87d74e45b50" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/41e5224b15d09a7227b36b443d5ad87d74e45b50;
+    sha256 = "1mpq5lifwddv3mg2lxh3973nz3k3j9bs6r0ma3zknc9pjzvhr6z4";
+  };
+  "41fd3f7a3fb916297e3f478f49ee73a7ef8b0eea" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/41fd3f7a3fb916297e3f478f49ee73a7ef8b0eea;
+    sha256 = "1m0san717x975926nnbinwbq8wchxbrj8w9pddq72s9k3h57a51q";
+  };
+  "41fddcc984061641cb8c27aba4b296bd158bb7b6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2622402-86d1483fa60742b6be9fd5a0b0b946e0/41fddcc984061641cb8c27aba4b296bd158bb7b6;
+    sha256 = "0pq8gl1n7anxky03fy135mwcp76y6270i5jjq7il985mhqa9n3xs";
+  };
+  "42325aa5f02bc9fc9310d7edd42e4e731ef6896a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/42325aa5f02bc9fc9310d7edd42e4e731ef6896a;
+    sha256 = "1r6fhxi4341408ibhgq92yw8hih2nq7m9klax7hsfmdr4di537hg";
+  };
+  "4245e1d2e7ad643f66f744a3ed38052789489640" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4245e1d2e7ad643f66f744a3ed38052789489640;
+    sha256 = "08fnw7apzsdwx44q2bc66r6gb24z5df5573zsf0fibnflz457zj0";
+  };
+  "427e2d72759a41c12424a8f41db8c46c533e7aad" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/427e2d72759a41c12424a8f41db8c46c533e7aad;
+    sha256 = "1anhhx1xifzqa7lifb63jgrfdx0j5j3ngr7pd9acbwhf1fnz1xan";
+  };
+  "4287f776bff018fbd5847a483885c62661d3e8b7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/4287f776bff018fbd5847a483885c62661d3e8b7;
+    sha256 = "0ka3mm4icsf0rvlq84s0zc2pyyymwfl7vidvhp6gphi9wb0gg0si";
+  };
+  "429bcf5d037539b13d24742b82d8b2e4dfc310a2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/429bcf5d037539b13d24742b82d8b2e4dfc310a2;
+    sha256 = "15609z8zkg3xf0374ccr3qw4c0y4l6via1c8vpn1g3n3aclgrcvr";
+  };
+  "42a2da181f0e0c22a37f4fd84ebb8992f5801a40" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/42a2da181f0e0c22a37f4fd84ebb8992f5801a40;
+    sha256 = "134cik312f2mc2cm6syz3khm11j4z5mki1ajis11plp9yc4awlrb";
+  };
+  "42a53ede1b023f8c062f8cdda02e206b50d9b706" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/42a53ede1b023f8c062f8cdda02e206b50d9b706;
+    sha256 = "0bf6waiwj827d6q4jlk84iz194gkrwyq62iqbh5k7via2xwq8j1w";
+  };
+  "42d3f4d56675451d30b582bc5dbd45fd3782d471" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/42d3f4d56675451d30b582bc5dbd45fd3782d471;
+    sha256 = "1k865pqjyn2i29kypga3m3g705pclw082zcr50yx4pzb4gyx81ss";
+  };
+  "43024ccccfd7e2f51ab71730d53234756da7f75e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/43024ccccfd7e2f51ab71730d53234756da7f75e;
+    sha256 = "0qiafmz9hg9g936y32jfi81whv6ijsbxi3wq2vjygwvw12z3pp7k";
+  };
+  "4325240311aaa4a187fdea78519062e5a4d7269b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4325240311aaa4a187fdea78519062e5a4d7269b;
+    sha256 = "13im2y96y8wlfq6i85dw6rpbrzqypvzhbb5f6272zi8mg0vl68c4";
+  };
+  "434d698cf6b167859c6903ad11759566d8f57b0e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/434d698cf6b167859c6903ad11759566d8f57b0e;
+    sha256 = "1p1mx0lffkz0lb4ryrjv8nbvmb3vzr1yhd6bar6mgn9j26x68nhd";
+  };
+  "4358d2bea62c66562030e8970bcc999a9f049cd9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2565979-eaaf2006b54843b69b5280979c12ed6d/4358d2bea62c66562030e8970bcc999a9f049cd9;
+    sha256 = "10g40dfpwcmwid6x2zj4jsr8wlfaj19wncimrj64ma84x9asid6l";
+  };
+  "439b6b4397b03135c193062962f4e04f7efb2f97" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/439b6b4397b03135c193062962f4e04f7efb2f97;
+    sha256 = "0fxgi0m96lz8vsig99mi43bmkxj4zqhdrmcin3s15qgqv5fnpp0i";
+  };
+  "43af1512f9c03f740a4b1e5e5d430bc184358f2c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2482391-24fb529bc09847ca8c3576d69ba36285/43af1512f9c03f740a4b1e5e5d430bc184358f2c;
+    sha256 = "0rllprr8x2wylsymvmwjbfxm5wc81q6hxz9xqz7ps99wnaa376vj";
+  };
+  "43ce938e9264c991f07b4ab978d5801d8b385c7f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/43ce938e9264c991f07b4ab978d5801d8b385c7f;
+    sha256 = "1xlk578ab6r0jia0ipsznr8kb0r95ljzqxhlxbp2gizyad80rbvw";
+  };
+  "43d2fd6b8e568774d422003e4f1d8cbd90c8ad09" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/43d2fd6b8e568774d422003e4f1d8cbd90c8ad09;
+    sha256 = "1gz46rhfy3w67945dwrbj5364z3r5vfkq7kcsdvlam8sn31mban6";
+  };
+  "43d5b1f0c816ddc1a75dc7c9eba7e3861bfac93b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/43d5b1f0c816ddc1a75dc7c9eba7e3861bfac93b;
+    sha256 = "05x9b14mm65v3kg0w3vknv0las5669dxqi863pj283gykai5y5j8";
+  };
+  "44550fffb2c3c4bd3e389a62349314f917149551" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/44550fffb2c3c4bd3e389a62349314f917149551;
+    sha256 = "0gwbyp4cz93dhp4lvlzb16ylkdkl1861q5sc9x8lzcfhrdlzbbqx";
+  };
+  "44988d061edf9fe35e6423243372b984f7bbc8ce" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/44988d061edf9fe35e6423243372b984f7bbc8ce;
+    sha256 = "1ijy29lal9bg8kwbjgzvzjc57f1vls2g073hvlgvha84a32qhd5f";
+  };
+  "44aea7fc4f0d356841e342fce80616815268e97c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/44aea7fc4f0d356841e342fce80616815268e97c;
+    sha256 = "1xspkr7cq8whhk66z695yvgf0z1z4w6rck41n9jxr9c2xkycafvs";
+  };
+  "44bfee33fde62aa26954c1ac4481489a0997550f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/44bfee33fde62aa26954c1ac4481489a0997550f;
+    sha256 = "1r6zdd24m7m0rykn7qbl1bkbxmiwh2jmkkqva5nw0zyc33rhy6dz";
+  };
+  "44e185cd6baca3dd0931a5b2c536c61efdb62652" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/44e185cd6baca3dd0931a5b2c536c61efdb62652;
+    sha256 = "10ji73zvb3wjsr9283r2may7kwjwrch0zdkw5qi845q1xdsy03qn";
+  };
+  "44f209fa07e3956ffbde948b34a35bca08039bf4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/44f209fa07e3956ffbde948b34a35bca08039bf4;
+    sha256 = "19h5cpf1n828wxy77sa7ajfiy3pfg2hjnaprml3wl7g607zsb2wi";
+  };
+  "450752e8befdc19f8af240d074de7cfdff240ff6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/450752e8befdc19f8af240d074de7cfdff240ff6;
+    sha256 = "03f7fvkqvbxi8xfqc5x6zzwa141rzjrvxfn4npcqifzv543zlwfl";
+  };
+  "451249045a83162ab51a602006391035d937b4fe" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/451249045a83162ab51a602006391035d937b4fe;
+    sha256 = "1f594dpxyb2vln0bjj10yzxmxim88d27asaxb05b7msj8s4if4qz";
+  };
+  "457e4cce8cc3af1d0237efdf32e01dd8149d1366" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/457e4cce8cc3af1d0237efdf32e01dd8149d1366;
+    sha256 = "0ipki4pq2irfhy10sapsah9frp3nx6j33sjdi5a82sz5hc00czvy";
+  };
+  "458ce5eadcec7db6c79cc7c4785864957159d82d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2649176-0ea78bc522e047c6b5b5e477faaaf0eb/458ce5eadcec7db6c79cc7c4785864957159d82d;
+    sha256 = "0xlz9ag4xxqza8c1bbx4aj73nphngqnqmb2g2kx4wzrsf60balqk";
+  };
+  "45b816b4d0f405c95179b48d4aef89b863be886b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/45b816b4d0f405c95179b48d4aef89b863be886b;
+    sha256 = "1b6n8l0xwxfpxysljvqgh2pccqxsv7hhsgvigk7bc7bfvm4f2bc5";
+  };
+  "45b8181ade7c5f9416382db55ebb9ff006a860ae" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/45b8181ade7c5f9416382db55ebb9ff006a860ae;
+    sha256 = "0mns61vw4kv3v6pjmkqzad95x9sqlvkazr2qcxlp2pjl41h349jw";
+  };
+  "45b97a83e7de5add19253c91c6f9c3fca6133a0b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2515854-a6b06d306d9743a78268eae33a3084ae/45b97a83e7de5add19253c91c6f9c3fca6133a0b;
+    sha256 = "0bymag4rf1gnyc3yfn4xjmi1n22zkfqzqdpg09wbnrmghld92rhx";
+  };
+  "45c2f6d67121c2498bd3723b899243959da6e017" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/45c2f6d67121c2498bd3723b899243959da6e017;
+    sha256 = "1z8ks07y1q8ifi8mbb2n1igfa6a6dpmmzscn14mr860a8lh9lp1v";
+  };
+  "4653f71982a36f99d16331bbaebded3036eff50f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4653f71982a36f99d16331bbaebded3036eff50f;
+    sha256 = "05n5s7vhiiisamy7n1c31s68yy7iplfsr8q7qkjwijp6svpz3w4r";
+  };
+  "46cacf33335ca2ec60df0c71cc36af0602ca8bfb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/46cacf33335ca2ec60df0c71cc36af0602ca8bfb;
+    sha256 = "117j7ps781wbi14cc9r5v0n64xsl7p8yr2ism8i4n8ij3i106cf7";
+  };
+  "46cea2f0ed5abe44ea23ba16c356889ae16636e3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/46cea2f0ed5abe44ea23ba16c356889ae16636e3;
+    sha256 = "1rsy2lac1ck6flh60jh5b640kns104f40qr5ffsf7mxj3zzc9h3w";
+  };
+  "46e1d0fc2b1da401fb554e93a9e7f69ba5b9857e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/46e1d0fc2b1da401fb554e93a9e7f69ba5b9857e;
+    sha256 = "18vcpjb9qvy9xswrk2zna7g2xmj0dycpsnnpddydlby8mrda1vd0";
+  };
+  "47057afb3b675c9635a3a671c05a32525083c8c4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/47057afb3b675c9635a3a671c05a32525083c8c4;
+    sha256 = "120gd17dy4m36r4y36ivjkmn9vvfgycfw0jna7vx85qys7f2qslx";
+  };
+  "471521a96267727393067d510fa208a9f090ee56" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/471521a96267727393067d510fa208a9f090ee56;
+    sha256 = "043gl3chcbcyh3na9wcv26kag7hixk31yh8synihybml4bf30am1";
+  };
+  "4733ca75068a23a29a578352ecc8dddc16d714e6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4733ca75068a23a29a578352ecc8dddc16d714e6;
+    sha256 = "11g301j3gim04xisk1pzdsxv5ygj6mf39rkxw9hfrbzky4y5zfb5";
+  };
+  "476436af18523fd743894ca8676ceb74f5d392f4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/476436af18523fd743894ca8676ceb74f5d392f4;
+    sha256 = "1qld1qqnmmn6bcw8gxs8fi0227w5d2pwyk9hxqqwfvqazmbmrdra";
+  };
+  "4782725e3bb079fa03e2bc6e6d6ca44c9352c9ce" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4782725e3bb079fa03e2bc6e6d6ca44c9352c9ce;
+    sha256 = "002qq97afjmvpwa5vhpzyknywxfg4f6hm8f9z6vhcbc487j24dfx";
+  };
+  "47c3dd6d524f1923aa08644c2e4083ced4d481a0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/47c3dd6d524f1923aa08644c2e4083ced4d481a0;
+    sha256 = "093zcfgvnr9x6b50zi4dcvp0qp6dsp4y9z438gzf8cz41ilmk2mq";
+  };
+  "47cb5394541c26f3bab3e60fab36b8acba1d8907" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/47cb5394541c26f3bab3e60fab36b8acba1d8907;
+    sha256 = "0aqwpc5krlqi81g2wcbq2591kbnnv01cgiq4qdyd9jlkfpk79ra3";
+  };
+  "485fd4e8653da37ae3302212c1ff6c808f2e1e7a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/485fd4e8653da37ae3302212c1ff6c808f2e1e7a;
+    sha256 = "10k9s21042a9gi2k03d9r5lg8h2gx07sa39wx8zrfs697g0g9082";
+  };
+  "486e59fe184e878bc399bc95f1f81b94c3e84237" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/486e59fe184e878bc399bc95f1f81b94c3e84237;
+    sha256 = "19ck4wmlzfj43w9b1l54na3ql62n0jx0h7ffb0ghizswnb36nvcv";
+  };
+  "487d06c15e88caec9f131b002ba4ced31ca8ea46" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/487d06c15e88caec9f131b002ba4ced31ca8ea46;
+    sha256 = "1mfvbd2p8508f07dhh1dfqaq1a9n7c4l5dsfajzhcdndlzawrbbc";
+  };
+  "488efa1da7ed78314cdd0c95ad874f812853fcd7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/488efa1da7ed78314cdd0c95ad874f812853fcd7;
+    sha256 = "09jjzzvszqv7f7a70i8gib9x04h6967by6cs8dfqfb8ysfrx426n";
+  };
+  "489e5e0492743ad3dbfd8599a5d00f284d4b13d3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/489e5e0492743ad3dbfd8599a5d00f284d4b13d3;
+    sha256 = "1szgnqakysr4r59zqi8i1sjqbpykjb7flvmw8p00mx0zqpw2qi6y";
+  };
+  "48a51059aeb73ec544e6c1ace7303ebc6143b782" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/48a51059aeb73ec544e6c1ace7303ebc6143b782;
+    sha256 = "0w212ajaypf69mx8hc94kz61l1f64dvh99rpmzrycwllxk17il1w";
+  };
+  "48becdab8fce5451f3de26a98ad8c4b41c51c09e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/48becdab8fce5451f3de26a98ad8c4b41c51c09e;
+    sha256 = "1pb09gl5ji1c71nhg2bv6i3wknx11vnxcjjyfvlzgpfsw7mi9c99";
+  };
+  "48e9d691a3bd11810596fcf32aef9faa872a8fc3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/48e9d691a3bd11810596fcf32aef9faa872a8fc3;
+    sha256 = "0anv20icv51j79f4vzzh7q1a9jwpk65zzs0brsylyfkylskd9wz7";
+  };
+  "4905bf362dac5be04631d1ce552b8184a6f9eb7f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4905bf362dac5be04631d1ce552b8184a6f9eb7f;
+    sha256 = "0yf7x9wc9zwdpdpqh6x8kcrphmc63ij9xcb6ggfbihjhhfkq9m2y";
+  };
+  "493b6e580a2441b91435c406da869b799e031da2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/493b6e580a2441b91435c406da869b799e031da2;
+    sha256 = "0ic4h663s8yyckvzrkbbhg8ih888igvcswsnnh66zwrl3h5wjshd";
+  };
+  "497e1a2128ecd56307d393c59ed4962de200412c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2621802-1efd555e661e4948aa22f3883712aa6c/497e1a2128ecd56307d393c59ed4962de200412c;
+    sha256 = "0860mkkg6k4c2fjzq573xpf13cvcmn276z45hi146y0llsb9hpwf";
+  };
+  "49d7eaf76b4f243057c59f3fda3310c655144a0e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/49d7eaf76b4f243057c59f3fda3310c655144a0e;
+    sha256 = "07sn2y8bzh0flhrkkw12x7rc9p78mmsx0dphsm0mxb9nkkznygq0";
+  };
+  "49e02b1078a769deaf14989f1731daeb927f2192" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2787088-b587684669f0414288401564922cf5d8/49e02b1078a769deaf14989f1731daeb927f2192;
+    sha256 = "180yvr32wnhgivkz5i00l88wkw4l5v9d5vgmdxhjvndzv52ij00p";
+  };
+  "49ffdfd5801c4c8c2b51be4b2e51108595a340f7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/49ffdfd5801c4c8c2b51be4b2e51108595a340f7;
+    sha256 = "0m0qv1wyslkdg75ymbba0ppp35ir9wmm51jqsaac3wxjacgwp85f";
+  };
+  "4a3c35cce04ee67dd38baa7ef7703dbd6fa6b14f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/4a3c35cce04ee67dd38baa7ef7703dbd6fa6b14f;
+    sha256 = "02kqv01gjhj6402i18cq5ihp9nbcl4ij7hanb2l6k3mw2f3h9202";
+  };
+  "4a6de8866429da8f1baf5ddaf3973c381e507f9f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4a6de8866429da8f1baf5ddaf3973c381e507f9f;
+    sha256 = "113qadrkv6calsid2bbb0lswimr3qasf0mzyvbxcg888q934dirp";
+  };
+  "4a996ed0676c92d061e923599186c0d592b8c180" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4a996ed0676c92d061e923599186c0d592b8c180;
+    sha256 = "0gfmg2si5wmv99d0f3z82qdpcnkb377hvd9mjn29npvmzcxdk8xl";
+  };
+  "4aac38fbf89541859c14c7fbf320b1f9deb410f4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4aac38fbf89541859c14c7fbf320b1f9deb410f4;
+    sha256 = "1snz21gw73zi27bha2jq2099j4hgk03xrn382rgc9l0j6zx1hcld";
+  };
+  "4ac1a3a1641db0a7d533dc58b147c50ee5e61f2d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2495503-7390cc25898b4ab0a4f9f846f2fd7754/4ac1a3a1641db0a7d533dc58b147c50ee5e61f2d;
+    sha256 = "1b0wz0gz103l9vvg2g9xbds3nc65x3bv7nb4rw8k1lafnpypxvx4";
+  };
+  "4ac1a96d979c84bea010254903c746d8f0192931" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/4ac1a96d979c84bea010254903c746d8f0192931;
+    sha256 = "0p4zjrik6jbp25vsahv7g8jkpvydkh19winqiswiz91xfjzi7wfl";
+  };
+  "4adb6983f2858294dd67959dbb107cb141c93c74" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4adb6983f2858294dd67959dbb107cb141c93c74;
+    sha256 = "07fbgdm1d6ymv6m046pmjh0af4syin13f3g36kyh19gbsf81gn51";
+  };
+  "4b0a3157b647ecf945962c64e6c1f2a4b0841404" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4b0a3157b647ecf945962c64e6c1f2a4b0841404;
+    sha256 = "0qh7irvdj2ak0ixbq8mvgnyak9l378463ffgvh8a76rvajlmfw01";
+  };
+  "4b6a1631906e490aad98097955aaed303b835e4c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/4b6a1631906e490aad98097955aaed303b835e4c;
+    sha256 = "1c8mzirs8qbk2532ai7sj6gx98lhzl2r8c5w78p2zhxc44qds6cy";
+  };
+  "4b6f876e200503f43b0378c2bff4e3371dede19d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/4b6f876e200503f43b0378c2bff4e3371dede19d;
+    sha256 = "1wxz4zscc57j0h8jrdxiy7qjx5gyz5wv552hkx9swzl8zv1c4vxi";
+  };
+  "4ba7bd51b92bbbea7f47cede7dccb18ed74c4da9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4ba7bd51b92bbbea7f47cede7dccb18ed74c4da9;
+    sha256 = "10mgd6mhyp147v70vrjs2pni99f10wvjzzxgv4s1yb0kb1f3rx7m";
+  };
+  "4ba9e150400597410bcc2038b890c5ebfab59f97" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4ba9e150400597410bcc2038b890c5ebfab59f97;
+    sha256 = "11gnqjjjdjjlxnzsx2p2j08xjjpr28zy5g0y5ba2q9fzz1pmi0xd";
+  };
+  "4bb876b638318dcb891581ef5c5b60ab49f84a14" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4bb876b638318dcb891581ef5c5b60ab49f84a14;
+    sha256 = "0kabkyrgb8jbp90hbmksmh03r5bbfk9rk61rix4krk2dlcb0dazi";
+  };
+  "4bc5d5526880f85cc76aa4910df1d4cb262afea4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/4bc5d5526880f85cc76aa4910df1d4cb262afea4;
+    sha256 = "18g5sk5ck5yv7bm84c3hm4q1b05kwm4vv5dq5l54a0pkgp59grqv";
+  };
+  "4bdc7380f8fb8cd1f70702e4b5dd2f4ea262d125" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4bdc7380f8fb8cd1f70702e4b5dd2f4ea262d125;
+    sha256 = "0j924pcmddwqap395nsygs3jzcsfp3f225waypzjzwzf0dqdwvdm";
+  };
+  "4be9c06ad3f3ec9e3ab2f093677c38c9a57609fd" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4be9c06ad3f3ec9e3ab2f093677c38c9a57609fd;
+    sha256 = "0inyckyvag3cjbjw7yir3ga8qx6kly82xhi4ibrqs5anmlbvg6wn";
+  };
+  "4bf3ad76dabf85f8e9a2caef2ec4cc44035c1748" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2557508-14de7cde62764f07a29f3058b3db36e8/4bf3ad76dabf85f8e9a2caef2ec4cc44035c1748;
+    sha256 = "0d9igj7ncm9bgx4z8sybfw5qa0vsslfp155wgycj77sqbk4vxw6f";
+  };
+  "4ca619b184d0aecc977846b5cb89a7789844736d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/4ca619b184d0aecc977846b5cb89a7789844736d;
+    sha256 = "0x6km34gk5wmd1p3i2b9a8bhv32337dxmilaq2x9zg12g5j0ab76";
+  };
+  "4ca7aeb41838db40fce0bd1181781152f3273c85" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4ca7aeb41838db40fce0bd1181781152f3273c85;
+    sha256 = "1c47j2as7c67aa4y21gkli9qxzik75aq0abdvjln2mw2yidd9f6q";
+  };
+  "4cdfababde3088412ac7195d034c19f4f7e873cc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4cdfababde3088412ac7195d034c19f4f7e873cc;
+    sha256 = "0mqq1vbh9ikcrplnr5sa0lz73p45kl8wc1py3ylmycifymjcb7jk";
+  };
+  "4cf428f5e7b38cea3b24dce0380c776e1a06ecaf" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2787088-b587684669f0414288401564922cf5d8/4cf428f5e7b38cea3b24dce0380c776e1a06ecaf;
+    sha256 = "078yzqnwidsx5xqa5p9jvl4qqvhdmx5i2rv31azjc1s9bbyihnyg";
+  };
+  "4d0630a1e99d1c060c8dd45b809b2e6c5e6bde7a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4d0630a1e99d1c060c8dd45b809b2e6c5e6bde7a;
+    sha256 = "0hrpqrb934z5qjxmvp2hpjqkbr80xwqrd8bxj63pdcz11axnk1c1";
+  };
+  "4d1f805d1ce7a7c6f0eb46295359f5ef01297c17" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/4d1f805d1ce7a7c6f0eb46295359f5ef01297c17;
+    sha256 = "1fh46cz761wk4cy6xskjs07a58sb2im6n56gk20mmslw2iv8y1z2";
+  };
+  "4d65a777c9a440e869ef25b04b71a9d9a6ff7190" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2593226-b511ed7dda124055acab1a4474628222/4d65a777c9a440e869ef25b04b71a9d9a6ff7190;
+    sha256 = "0jv2bpb77dshi3kj0wlgzl0y7f5b1g0jr0h47fyraxk2mg10ry5q";
+  };
+  "4d6f9c6d7a261e35898225b1fade32da175cb530" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4d6f9c6d7a261e35898225b1fade32da175cb530;
+    sha256 = "1kn5zg25rwl37vskaggw7hlb2yxxambk0lhaa4i0mlgj8050m2n6";
+  };
+  "4db41bf84756d686fc71e275d2c94c5c2299de97" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4db41bf84756d686fc71e275d2c94c5c2299de97;
+    sha256 = "17rijjf8k5fa827szbj2adz8ix8z6h607xpa0mg69hrl9jxbi7jp";
+  };
+  "4dbf88901817044507142dfafe605a1b527a5733" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2416381-a1125fd46e044645898de0a3f7870b3d/4dbf88901817044507142dfafe605a1b527a5733;
+    sha256 = "0bsykmshh4677rlkgd7qx2j0alcskw8krkvfzardcq481zkv3i7n";
+  };
+  "4de19ef682be73fd5616348eafabda7e5b5c2614" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4de19ef682be73fd5616348eafabda7e5b5c2614;
+    sha256 = "0m3phx8581x615y7dg98kg0bdkka07897pjcd759dxjfbvvy2fyl";
+  };
+  "4e0bab5bde5138bbeb03c118ed5450afb6087c8f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/4e0bab5bde5138bbeb03c118ed5450afb6087c8f;
+    sha256 = "1afci1zkw3skyih5ij2ld2z75xp3vf2q4ssdb39xgjw84hagxybl";
+  };
+  "4e10a129d42108f8b10039ca6b879fd30bfeb431" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/4e10a129d42108f8b10039ca6b879fd30bfeb431;
+    sha256 = "0qyadw0q43aj15c699minvb2xbd6hlarwjy7gfsym9vbrv55fhjh";
+  };
+  "4e6e5e7b59b428c37f77a90e081f121a450cb039" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/4e6e5e7b59b428c37f77a90e081f121a450cb039;
+    sha256 = "0vpr0k1mf4zg5k90jkx8jxm11dl0ky8jlyq17zcdl4v0ricadw57";
+  };
+  "4e7e810806daa53af602a84d64ae8277b20e8884" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/4e7e810806daa53af602a84d64ae8277b20e8884;
+    sha256 = "1j4ms2b2g34d3hr2cwbimwlljpm9a08vwv6d644ryib170kiv8z2";
+  };
+  "4e98b65102ae8ae6833a82df09b1c4926070f680" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/4e98b65102ae8ae6833a82df09b1c4926070f680;
+    sha256 = "12np9i6rrfb72pzb53wqs9i2pi54gfd95sq5g1b5appj3qqvl5cw";
+  };
+  "4eacf8ae62800ea91a75533032d4a4abad00c1dc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/4eacf8ae62800ea91a75533032d4a4abad00c1dc;
+    sha256 = "1i23518c07q9q9npwrbmxl1dxx0sxyviv4l9892s8kjj2gamf4kn";
+  };
+  "4ee7da06ece4e65e4b1f6c4f3f60b4f183a6b0cc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4ee7da06ece4e65e4b1f6c4f3f60b4f183a6b0cc;
+    sha256 = "1pliz4710qi465vhy2z90w9br02jx6k3r192izn96njsnd02mm4x";
+  };
+  "4efa7b4c022fb3147eafad578190d50881927acd" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/4efa7b4c022fb3147eafad578190d50881927acd;
+    sha256 = "1pic400nbygcarkrkzcdvhb00pq25iipn3bwlgcng38ihfay7wjm";
+  };
+  "4f65d69acee548a54f8329d2457356d425bee4a7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4f65d69acee548a54f8329d2457356d425bee4a7;
+    sha256 = "1bl8arab79mh10qclam0gmf0bf7rqj4zbas3bsz2jq6mnw7hz7py";
+  };
+  "4f6a87f4bf05f150a09c25735784bc3739871dfb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/4f6a87f4bf05f150a09c25735784bc3739871dfb;
+    sha256 = "0kal7sz290wjq3p8v76kyhj9l783h8br06cfyd8vr93xnrmxj18s";
+  };
+  "4f81cd7206cb477f1b15d71433f87035b8ef4b61" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/4f81cd7206cb477f1b15d71433f87035b8ef4b61;
+    sha256 = "0dkad05vjbxqvdhx3594j7vx7qjjckpzcsnbwmlb6jvlp7ki4qal";
+  };
+  "4f9629d19fa7928aaae10e4bb7c79195fb4f2436" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/4f9629d19fa7928aaae10e4bb7c79195fb4f2436;
+    sha256 = "0w26dm0npmlbdg73j89rmbxpkr64i80wdm4zzgsafrh3vmaqs38n";
+  };
+  "4fb2c8f58c15b33818735ef8f75ba170a1b1f65d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/4fb2c8f58c15b33818735ef8f75ba170a1b1f65d;
+    sha256 = "111hbfbikwl85iscj37k3wn35s47cd6qzpcsir1ylaxcb9q350j7";
+  };
+  "4fbda194b6083d60ec1a9e281eb6caad5716cf1e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2489751-c4626d8ec02a40d3817d364f1bc426a5/4fbda194b6083d60ec1a9e281eb6caad5716cf1e;
+    sha256 = "0nfihbl3pwni0gpfrpcdi4xggdkr0m9d4lq788w9hfb4phfppkjh";
+  };
+  "4fe88f539e62bf77da44db73cb91ffe913569e34" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/4fe88f539e62bf77da44db73cb91ffe913569e34;
+    sha256 = "0vl7g23l199imd5n0ll78bf6bk5spx33r1sdzwbwyf439xd53zn5";
+  };
+  "4fecd0bf8aca3391671cf59243a551e7b58f745f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2787088-b587684669f0414288401564922cf5d8/4fecd0bf8aca3391671cf59243a551e7b58f745f;
+    sha256 = "0yzh9i84lm4gh8wsljsa66bg9g6p0xbff3vq5rk1nha0zwg0i7x1";
+  };
+  "502e3c3b4dcae339b71743fc346f2398f2d7a218" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/502e3c3b4dcae339b71743fc346f2398f2d7a218;
+    sha256 = "1qirpjwv6cmx2g74dlswhd5haaqff9km47xv79m6rd3c4q5xn0xs";
+  };
+  "50606bde1b8f7f906c86dad14730c53cab06b477" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/50606bde1b8f7f906c86dad14730c53cab06b477;
+    sha256 = "1kfvwbxhl69f08ryfh39105xda14vz06r6zhvi18d3cy50znamw4";
+  };
+  "508797aad17ea00c10d3c50bebc98d3981dd7bb9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/508797aad17ea00c10d3c50bebc98d3981dd7bb9;
+    sha256 = "1r9csvlr703whm8dk759xnn89glrp1gbdxs60ahspls48yxj1syg";
+  };
+  "5098f795311987869f91ed638f4c0a395312211a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/5098f795311987869f91ed638f4c0a395312211a;
+    sha256 = "1j3k1vixg49ilcmvd9k82dq7lj0dlmf8iaz8zvsgzgril9azd3nw";
+  };
+  "50eea30641c70b731a2069bd514ef5f1709825de" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/50eea30641c70b731a2069bd514ef5f1709825de;
+    sha256 = "0p9k5jhmhv26i18c7axi9yvr29d4wzq4zr08875m1hcwhij3wyxg";
+  };
+  "51298934386bbe2da528af9262277810d6653396" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/51298934386bbe2da528af9262277810d6653396;
+    sha256 = "1yygwd8i6cp67rgz59g192x1klh3rxgsyzpmxcinj4b0iwihglvc";
+  };
+  "512f28040301a00935d7f1ded68e709b048d7f1d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/512f28040301a00935d7f1ded68e709b048d7f1d;
+    sha256 = "075szic2vp5f6c3kmy432xn8r81pb6c82dwhpigmyvjl0hjqqcf5";
+  };
+  "51413e0814803560ea68a0cdfa59ae901551ad14" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/51413e0814803560ea68a0cdfa59ae901551ad14;
+    sha256 = "1cbb5a1drx313zi7llrbwsj7yqshinxs3i1q86y63vrjh9yimsb6";
+  };
+  "514684d898b2ab6135a63ae87054e6af91cac2ae" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/514684d898b2ab6135a63ae87054e6af91cac2ae;
+    sha256 = "0xha9la702szpf8nqrm9kril6qdfl3vxpl18npm8d3rxgsbrrj1p";
+  };
+  "5147927b8b7ebed2923c8d3ae6b0e1f716b5fb61" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610954-bd0fcbe6f0c748508fe9438073c40b27/5147927b8b7ebed2923c8d3ae6b0e1f716b5fb61;
+    sha256 = "18p404kg10mqfh5d2rcwalxrgr5ihw0lp14rm5xf1aiw303mlf61";
+  };
+  "5152492459f57a1bb4d120be68d29ed666c87c33" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5152492459f57a1bb4d120be68d29ed666c87c33;
+    sha256 = "17nfafsnk349q31cyrppz4w50z8c5n0ff2v6n5s3z8vzx4pj1zhg";
+  };
+  "519dd66ccb831a904959a155fd43639be5a97863" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2686985-76325fadec474557a67995f00383ea6d/519dd66ccb831a904959a155fd43639be5a97863;
+    sha256 = "01rd9jvys40vi6xqpyf2r1dqj4r3gg61w58madq8wq7q0x4wvvcg";
+  };
+  "519e03a04b64bc3d14eefb416e21ae15c6f0121e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/519e03a04b64bc3d14eefb416e21ae15c6f0121e;
+    sha256 = "15gfg5klklnhbfbsx0jqy33zamc32l0aiji064mjbkliwv1hm51b";
+  };
+  "51f74fd271b725c13ee25b2dae5d9b5250116180" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/51f74fd271b725c13ee25b2dae5d9b5250116180;
+    sha256 = "1zn2lm64icq0bjnayczrl7a6d66jyxbv46cgnixlnvpa0dq1bx5m";
+  };
+  "51fd67fd01d7f93ebe372aa67ec66496e9ccf3b1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/51fd67fd01d7f93ebe372aa67ec66496e9ccf3b1;
+    sha256 = "0xzjsdcfbzl41lwbblq00hy4w3kmjsbl8ai85xa5qdkzc8d8krsk";
+  };
+  "525da4df29fa810fe46aef9432572bbb5743b36f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/525da4df29fa810fe46aef9432572bbb5743b36f;
+    sha256 = "0y445vx9i0572y6cj5jbzl9gkcxgs8kn1qpc3zjzhn61ckdijc4s";
+  };
+  "5270c6b547cfda7e26cad076321fd7be0e5a061d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2602350-38e0d307a57a47baa00ee5f892c9ced6/5270c6b547cfda7e26cad076321fd7be0e5a061d;
+    sha256 = "14r1vw9hw6nlndj1iplwk0qfnr2y8b880g6fgnzwd31p0dbcim8s";
+  };
+  "52ad7360b0e7a95cc19aa7de2f2433ca955eac9b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/52ad7360b0e7a95cc19aa7de2f2433ca955eac9b;
+    sha256 = "0z164smiksv7hka7cj4d68cj5nmy4marwipq48nan3365g9j0r37";
+  };
+  "530b33d367b237887fd7f3666822b40a696806f3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/530b33d367b237887fd7f3666822b40a696806f3;
+    sha256 = "0vj4bax08c5iq035kqihrpksprrkh0nj6hyfswx5qqsca0znh4br";
+  };
+  "53190479c1e53af3a2670f6eeb1f4bda0ebd5a80" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/53190479c1e53af3a2670f6eeb1f4bda0ebd5a80;
+    sha256 = "0gncl86d1j8228hcrfckn6ap632ljkxfbkya8wpqq8cspr5xbb0k";
+  };
+  "536b4cf746322581a3abe99533df6307e7a9c2c7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/536b4cf746322581a3abe99533df6307e7a9c2c7;
+    sha256 = "08d2hxd3v469b39ra57cb13shkzv4dxk44ksy92dw3m5wnwpq6w8";
+  };
+  "53738d12a38995c76f4de6f5f064a567f0ff3ac8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/53738d12a38995c76f4de6f5f064a567f0ff3ac8;
+    sha256 = "1ba1ygd5xwwgciy93pvl8ibd79glh8h7z8mxd32c301n1g7zyh42";
+  };
+  "541bb03057456219ae8a2ab97be5603923921739" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/541bb03057456219ae8a2ab97be5603923921739;
+    sha256 = "0fc4a7yw1psd4qlbc95gkanynyl5jmwdg3ddz3w93i02cd4l3y42";
+  };
+  "541d949e247ee005e6e55562dc29055d6159fb64" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/541d949e247ee005e6e55562dc29055d6159fb64;
+    sha256 = "11bws26a0j9wa8amwmpq632glrwmcwkfc5pzapwrhkd3s4snc5x8";
+  };
+  "5435cf07dad1155ea3ddbd5178f3dd6013a507d8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/5435cf07dad1155ea3ddbd5178f3dd6013a507d8;
+    sha256 = "1mkhn4q4rrf7pdi49fd1968hrikham7s4wx6ch22psfinn5ysda6";
+  };
+  "543ebe1dfdaff4a1590fbd156175d836ae2beb0f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/543ebe1dfdaff4a1590fbd156175d836ae2beb0f;
+    sha256 = "1mdp47id04fc4gb247k0g40byv4nidrjnmyavpgq977yljfpzwip";
+  };
+  "544dffe0e2da98dba3a519141a740f849c5ca7ee" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/544dffe0e2da98dba3a519141a740f849c5ca7ee;
+    sha256 = "1kain6a7p6y533wl1075adfzh8733sdac87iq886hjqr89k5jdyx";
+  };
+  "5495c21514ee03fd9e7736742077960a79934c74" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5495c21514ee03fd9e7736742077960a79934c74;
+    sha256 = "0n9cg673wa58r1xzspyxb4h3qa73jpw4sk9gc8d4dgl6z3q6lsji";
+  };
+  "54be461a1c72b36e4f01f2db78849473477d73dd" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/54be461a1c72b36e4f01f2db78849473477d73dd;
+    sha256 = "0zlp7nhdl0b9yhlbclx3d3r2g4cymppwaa5w168chd4gym8qnv44";
+  };
+  "551654d82bdacbe12dfe0a27ff7948b6ad1894b5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/551654d82bdacbe12dfe0a27ff7948b6ad1894b5;
+    sha256 = "1d1bxj880nyrap1vrxfp9fn1b3pz5dbz6f50ccw6bvfwjg4fwkv1";
+  };
+  "5525223a6059a69ca58ad0617598cac64d8659b8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2620872-38314c216e7741359375cb68452fb2b2/5525223a6059a69ca58ad0617598cac64d8659b8;
+    sha256 = "1rvg2sgkbcnymrvp38847rw828ijr3mxl1zsa5706ndly6gysygb";
+  };
+  "553aa77e78f9ac7693e56c9b2ae642c4141aed66" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/553aa77e78f9ac7693e56c9b2ae642c4141aed66;
+    sha256 = "0nr6gsba11kk96l0r1hk08bbn2iy5z41hah14f85dcidcdfn8q3j";
+  };
+  "55575c3f7cb2cd14356f9dd1836e4beeb057941b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/55575c3f7cb2cd14356f9dd1836e4beeb057941b;
+    sha256 = "0g2x108hmsnfp3cgzxcdj91ikz3x3x4br6rl9vlry03dfvhzwvf3";
+  };
+  "5559dc18c6a3a435b34446daa5b51264cf9971fc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/5559dc18c6a3a435b34446daa5b51264cf9971fc;
+    sha256 = "10dvc0spvjp7r6lsvhr0f9r6nxm29053pr4q712akak7jnqh6nrd";
+  };
+  "55d527b168c8ad85340fae2fb9b238e7a568f338" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/55d527b168c8ad85340fae2fb9b238e7a568f338;
+    sha256 = "1dcjnifabnbk2v3pwkmk1hn07svavjqsck694dh8ybqcxbkf4sbq";
+  };
+  "561af5c6ee4445a0c380bce19a7f5ee82b3fe756" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/561af5c6ee4445a0c380bce19a7f5ee82b3fe756;
+    sha256 = "0r5p7rb865yrjag2wn1p8ps76ap6pa83c0lbq7fmsn4xr2m9aq8c";
+  };
+  "562c6d13b647a43c555b040ce69507c475089c24" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/562c6d13b647a43c555b040ce69507c475089c24;
+    sha256 = "1lq7cl1rbh2xyg52p6260gbqd2l6n58cm0g1ny0fwgkaskbsbvwx";
+  };
+  "567807ac295099a07a6c59a7bff568f21dd14860" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2534734-323cf099317f457e9467fda2d086db9a/567807ac295099a07a6c59a7bff568f21dd14860;
+    sha256 = "1cimyysd3z3miz0zwvnmqc60s2cc5ymb2dj4dy88iw3zw1a75hsk";
+  };
+  "568dc16559220cee02d71db824805edd0d74a3d4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2621991-64978bb873e64559b7c143597fba3856/568dc16559220cee02d71db824805edd0d74a3d4;
+    sha256 = "1gmfb8106wb12757plw73g6znwqazya41dygzlpmc6zfc5sfd9kw";
+  };
+  "56b3ac7ff0cfd2d96ea21ec3d48bce76e2720807" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/56b3ac7ff0cfd2d96ea21ec3d48bce76e2720807;
+    sha256 = "0vf7hh0cav351qrpkvf897pwdlwnzwjhgfwr8dly6pjf0pqm4c3f";
+  };
+  "56d72a0ee05d644fc991dfc250a1534fdacb5b3e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/56d72a0ee05d644fc991dfc250a1534fdacb5b3e;
+    sha256 = "0r2kc6cnijar4z50xbsdf6ma4zfjqs9mzklbdamjy3niyzjy5s32";
+  };
+  "5725149f4c8e211494463fc9280b6c10907ea321" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/5725149f4c8e211494463fc9280b6c10907ea321;
+    sha256 = "0ifxhhl3rrcaqcxy1izy0abpmii9jzgs55kd537ifmnspi02674i";
+  };
+  "57518e7a38c99e38c3bb12baa69c5124f3780152" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/57518e7a38c99e38c3bb12baa69c5124f3780152;
+    sha256 = "1fya8iyfyjnqs0vgqsh3zkdb85z8s9snc188qnwypmyfpy8mpwp5";
+  };
+  "57a803d869d2db9788911933ffa0282320e75170" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/57a803d869d2db9788911933ffa0282320e75170;
+    sha256 = "1gy1dyjmpr6qap6irs2mzfpzmkjhkrci2r4ak1855ggycvy98d12";
+  };
+  "57be8202d1bdd44a6b6686351edba4e653af9f01" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/57be8202d1bdd44a6b6686351edba4e653af9f01;
+    sha256 = "167dndrfslwss276i0m1dwavg8kk27rhhalj200wk5ywb7dm6xg5";
+  };
+  "57d629f9fb09a65be5be7697a5d33a20c2b557a4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/57d629f9fb09a65be5be7697a5d33a20c2b557a4;
+    sha256 = "0xq600178i6hih6ap7aydgp0xpmmgz56ix21acrawikj89ykv5aq";
+  };
+  "57ffba4219a312d7e7daab46237a0f61ddb3ad28" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/57ffba4219a312d7e7daab46237a0f61ddb3ad28;
+    sha256 = "1qnw6qn7ywd96pv9bi9g006lnib6c60p312dlhyclphsykbn0lzf";
+  };
+  "58031ce6c4634d8b348854a1ad4bc1c74d022c7b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/58031ce6c4634d8b348854a1ad4bc1c74d022c7b;
+    sha256 = "0lz5wd4qzy64c2sr841ky129z46ha3mxx2xx0l9icxmcxczgaxq7";
+  };
+  "5828edda3a662171a3c8e304b857dc7a745b85e4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/5828edda3a662171a3c8e304b857dc7a745b85e4;
+    sha256 = "0m3p8iz4n03nw97v6iia6cdgniqp5f9zqr0mqxziwss5hhvwhaf6";
+  };
+  "5890d07428ec2ee9086c9f8d07792db118a1b57b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/5890d07428ec2ee9086c9f8d07792db118a1b57b;
+    sha256 = "1x5bqq655j50zfn31kxbrl0zbvf3zjvfgkgsp2w816lg01bkbr97";
+  };
+  "58b4bdbc8f5686d4ece9cb4a18f6367d8222f073" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/58b4bdbc8f5686d4ece9cb4a18f6367d8222f073;
+    sha256 = "0cw0gw0ky6gal0zjlxqbivhsxb1ys7whjfgjbcph9wfmws0n9cnv";
+  };
+  "58c296582abb3dba4bc073aa6708c81bc8798ff7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/58c296582abb3dba4bc073aa6708c81bc8798ff7;
+    sha256 = "1197ridzhpvih14rs5gxhvpnbpaz1l52x3cpxnfs5hd80qk212l6";
+  };
+  "58c56183f54227469e3aba4fe40c8fc227c66e55" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/58c56183f54227469e3aba4fe40c8fc227c66e55;
+    sha256 = "1nz8qyfhd6a7chs3a44aa8da1y0p7ikgd45y9w09k1wlmjgzby5i";
+  };
+  "58cf115d701dba2092d2e4a3f0ed075cc6fe3069" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/58cf115d701dba2092d2e4a3f0ed075cc6fe3069;
+    sha256 = "17h20ivmf3ks276vd96xc0z1ashyk3prk7f0p1w8z5vj7kv1y6wa";
+  };
+  "58db59892f8758da63e7b9c465b5615f6318634b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/58db59892f8758da63e7b9c465b5615f6318634b;
+    sha256 = "151qdvx1kk3r2hisn32g63jpcz5ji5n65ql000wxmav75m25dl9s";
+  };
+  "58e46f1625d6b6603897665bac292c5a3566d565" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/58e46f1625d6b6603897665bac292c5a3566d565;
+    sha256 = "0hh2kg1qz3xvcp0gmfky73gm8v2in7593hm59rqcwzk18q9pzwcs";
+  };
+  "58e4e03689103981844fc3f19413c5d3eebe2489" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/58e4e03689103981844fc3f19413c5d3eebe2489;
+    sha256 = "0h7qlwy4agc9130wb8j5a51pdy2ndvm6lbz1p55a3rjzxpmi7idf";
+  };
+  "58f1a93515f38b967b50196a9be74684efbca7b7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/58f1a93515f38b967b50196a9be74684efbca7b7;
+    sha256 = "1bwlqqs4pp20vzxvhs0cqpj3108bxbqk505q93rbgyvlif0kyidy";
+  };
+  "58f5f621564cce6f1eb3c9099a1645a0369ece56" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/58f5f621564cce6f1eb3c9099a1645a0369ece56;
+    sha256 = "04finlmybwqzb146rkqmgyfrq34ql2ih5gmxhalfwn2lvlzkykgd";
+  };
+  "58f7288e0fe3a5997003f6a117a30579d15f5973" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/58f7288e0fe3a5997003f6a117a30579d15f5973;
+    sha256 = "00a351ajzmfjpc6pbj80dbm677mqrdnx1b7dsjhx91gcarxq8q26";
+  };
+  "5906155140815aedc94241abd916f56c6ab4564b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5906155140815aedc94241abd916f56c6ab4564b;
+    sha256 = "12ywwixraayk1hvfq4i2hr5dgykv693sxv6vk6nigxq8kbg0rnqk";
+  };
+  "5925a9b0f257cc9517f224bec3dee7ecf883aa08" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/5925a9b0f257cc9517f224bec3dee7ecf883aa08;
+    sha256 = "0vglai3jkbls46qvss4l28h4b21ph5x79271hln3ypd2j4chswlx";
+  };
+  "59717f7d7697f047103bbfbca63b68088e7172bd" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/59717f7d7697f047103bbfbca63b68088e7172bd;
+    sha256 = "1gfm6b9cypdsvndc4id9idainvddjb0zrsa601acy62h97b9gjpm";
+  };
+  "5977705c2272d0c3385b70ffc3e5f0a2983e986c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5977705c2272d0c3385b70ffc3e5f0a2983e986c;
+    sha256 = "08zlxija7h63j10nhchjnh7mclsfqny6lr6ay8rwcxcgfqz3kr0z";
+  };
+  "5983c069abdec3469db5b5874ac27c17341e3f27" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5983c069abdec3469db5b5874ac27c17341e3f27;
+    sha256 = "0f8y8vikn7a6f1rkqkp9y1vyvnx5g8y4pmc0gyvw5lj6hi0ph83w";
+  };
+  "598492be84474143365fa6267a0e73936ce8a248" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/598492be84474143365fa6267a0e73936ce8a248;
+    sha256 = "1s6cvk6p6m8j0w1g45gg2hdnjiwa1sf8zsaf8xvlr10jcwlnc802";
+  };
+  "59c4bec5e2957d30ef37c5198c4b90381f3ba20f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/59c4bec5e2957d30ef37c5198c4b90381f3ba20f;
+    sha256 = "1pxdkbji2wqh6dp648ikn4367zzxfxa8g0lbvdrvbq0a6s5px02r";
+  };
+  "59d5809fb3d0b096e7104e798b12b06dc68c750e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/59d5809fb3d0b096e7104e798b12b06dc68c750e;
+    sha256 = "1i9mqv3jngvibkby1bfxqjrhib4a1w63sjp4y68cc52gqkv02c22";
+  };
+  "5a001646d2ea8b208174c4b954cf99309889bac0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/5a001646d2ea8b208174c4b954cf99309889bac0;
+    sha256 = "01gxymd2h4bm1b76yn6jpjpxnyw2ixax3rccmn7f36j8zjbnmcm0";
+  };
+  "5a2a13ad5533dc3b2172eb552b404c7c458983ac" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5a2a13ad5533dc3b2172eb552b404c7c458983ac;
+    sha256 = "1k2kjhx4y1zgz5sfnjsfdrqvjbr8vdqzg9q425ncd6zr198p5pl1";
+  };
+  "5a4c5b85fb81b291e8fb6f7c37c0b152f8aeb1bb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/5a4c5b85fb81b291e8fb6f7c37c0b152f8aeb1bb;
+    sha256 = "1s2nlmd81bnk6a884hpmpkgbznnwvilmbbkmx74r8wxwnsnsq3fc";
+  };
+  "5a668ab8aef15368ff281ed35e8f730cc8ec5c7f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/5a668ab8aef15368ff281ed35e8f730cc8ec5c7f;
+    sha256 = "0ha9h8ghv84byrxy7f0jqqq6gzw777vk73sh9n9kxk994a7r2dc2";
+  };
+  "5ab07520be55c428c36c959bcc9d4738bcc55daf" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/5ab07520be55c428c36c959bcc9d4738bcc55daf;
+    sha256 = "029p4hajh92z6qf433kr6a4ahprqjj4cgbfqabf636q2d3cjwmxy";
+  };
+  "5b00e89032246f6937f2093a0f6510beb7eab715" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5b00e89032246f6937f2093a0f6510beb7eab715;
+    sha256 = "1svvf9jmhhjr36dwlw2lq6y1kl09vnhwcj2m2i8z5fbs2pa724bq";
+  };
+  "5b0c314a325c53eec5d98afdb50067ad99c6e99a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/5b0c314a325c53eec5d98afdb50067ad99c6e99a;
+    sha256 = "0g7yxicms3pkn4y90r14rf7m076fnf2vwq8rbb3wldqjl1yxmjik";
+  };
+  "5b37da6b06afe4b358305eda6827bea44e782b44" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/5b37da6b06afe4b358305eda6827bea44e782b44;
+    sha256 = "0d4k8ramsgvir0689dqxj79flqa1vls9lnjidhkwl8k7an5jf9p8";
+  };
+  "5b81c9f201693bb927130d9d31a3768f7143dfde" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/5b81c9f201693bb927130d9d31a3768f7143dfde;
+    sha256 = "1nk5jan996kb09v2cr1invjq8x3zlh4zmli57hik378x282isszz";
+  };
+  "5bbeebcd7d784670bb16f73b0bf59374d12e300d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5bbeebcd7d784670bb16f73b0bf59374d12e300d;
+    sha256 = "1i4xck1p3269fqa1p69pr7j5r5ssi4hf8p1iq988hhi10wnb74mn";
+  };
+  "5bd038cfe2a2f12f6753e85dee691c08d4fcb6e3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/5bd038cfe2a2f12f6753e85dee691c08d4fcb6e3;
+    sha256 = "184pccfp59sq2sg5wk7i20l2qxswv524nym06dpabm1fv9hi8v0m";
+  };
+  "5c42920f6f44c053dcf7e87f29ccef27b326822c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5c42920f6f44c053dcf7e87f29ccef27b326822c;
+    sha256 = "1z5ii5hslidbijzjqbx66f8h087vn7aidw02m1840pas9dqj9mwc";
+  };
+  "5c4dd9ea4a964b483b1e90c4c6a70cedc63ac70b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/5c4dd9ea4a964b483b1e90c4c6a70cedc63ac70b;
+    sha256 = "08d1f17f7prkw4c64xalywss6r0f3ab0q46hpamj5cb6xs4igccz";
+  };
+  "5c517712601cff542ae326efa6bdc3a7734755c9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5c517712601cff542ae326efa6bdc3a7734755c9;
+    sha256 = "0szgq7q7pf5chr81b1a021r6p2rlb30cyhyjazgq4snprx3f0ih2";
+  };
+  "5c53d41540d89216421c6738a2b0b389ab94ea8a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/5c53d41540d89216421c6738a2b0b389ab94ea8a;
+    sha256 = "0hcz2dj3aansxbyqcrhygsvksa3xlc156c4692rqgcfdawyz1yz2";
+  };
+  "5c65fc01f0d8703654412f609c5e78a363870079" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/5c65fc01f0d8703654412f609c5e78a363870079;
+    sha256 = "1v6vgkp5vvjb4zfipyy7a5y5fqafpckb2636fx0bcfqd2ggbqwqd";
+  };
+  "5c8363a3b4c54cf612de94a0521b30e565085fc8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5c8363a3b4c54cf612de94a0521b30e565085fc8;
+    sha256 = "19fq6zfwiazkgra4dvpawh0fsk0c9278kl3jzanjlyxms9isncsf";
+  };
+  "5c9dc79aa298468ccc506369dd777f36e980e71e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/5c9dc79aa298468ccc506369dd777f36e980e71e;
+    sha256 = "0wxn9pw1h2ailgsvkpykrrjdffjdrhswhvznny0l49g7jy39asa2";
+  };
+  "5ca8bb4804169df408781649b3ef8a3d6dd2f414" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/5ca8bb4804169df408781649b3ef8a3d6dd2f414;
+    sha256 = "1nimfzwxc0nfyrp0avf0nhi7n8z21pgsr9321sk21rfv3ln74bab";
+  };
+  "5cf160a27902278f941572aa592a11cf80ac6972" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/5cf160a27902278f941572aa592a11cf80ac6972;
+    sha256 = "0x9ljwsb5jy434kpf0gkk6v1grsmksk691gv9ypn98r20rj1yix3";
+  };
+  "5d09c96c7e23adaab207052fa2fe12dea14e6a44" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5d09c96c7e23adaab207052fa2fe12dea14e6a44;
+    sha256 = "052z4i5naspmnvqlrnz13rvsgfm0qx6yiwq0w3lxwgp09ix612av";
+  };
+  "5d2198866f1b1047bb8a047bbeb38cc0622a4cfb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/5d2198866f1b1047bb8a047bbeb38cc0622a4cfb;
+    sha256 = "1qw4i3v9hfs04r9ys85074j0rdxadzmmjaf3fl6pvrqfprxl0x0x";
+  };
+  "5d8e7a77ae12035781174084d8cb9a4e1bcbfb0b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5d8e7a77ae12035781174084d8cb9a4e1bcbfb0b;
+    sha256 = "0xwnanfz1rxb8jkh27sirf7iv6dkb99i51q7my15amv5a6r9svrh";
+  };
+  "5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2489162-8b935a4b34ed4b3586d7fe3f6ce28b34/5dbebfe34ab5c28eca7d7b6c57ff41cda029cf64;
+    sha256 = "0kl73ymnq3w0wi630i3kdm2b0j60i708i5938qipq340cwjw4m7c";
+  };
+  "5e2314065445393471dbf0e9d3f2755a491d1bba" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/5e2314065445393471dbf0e9d3f2755a491d1bba;
+    sha256 = "1i9v4q0r13jd9x4n4inkin8p2936qzlx9bkm6wl0ab9fy0bzl0lm";
+  };
+  "5e58fbb85b49d5886aa35ed06da2fc6788db1320" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2596395-e8e15c40b8f2449b881e17834a75d9f8/5e58fbb85b49d5886aa35ed06da2fc6788db1320;
+    sha256 = "05051mjf0ywp7h94g4sxcxdplm3vfq5nc2l52y08gyz4348s66a5";
+  };
+  "5e7d96af5e5b1cafa670bd77ae918457a118f7a5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5e7d96af5e5b1cafa670bd77ae918457a118f7a5;
+    sha256 = "1p9phbl68bq2q7h0afa2q429pbyb0m2wprym4v1ydlz7c50mpkp9";
+  };
+  "5e9b459db24eeba207710184e58445974e211543" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5e9b459db24eeba207710184e58445974e211543;
+    sha256 = "0r3vxr2hi86v8fhpcr3n4hacaisqn92a9ayh84fym4y964zg5c2d";
+  };
+  "5ec11a04eda7f0d96f115e200ac8029b95d4115d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5ec11a04eda7f0d96f115e200ac8029b95d4115d;
+    sha256 = "06jfn17h59jc4d0f81s09yfjl2a12r7d9b5p4pn08h50zjkwwhac";
+  };
+  "5ef88b8b3029a7aa2ddaaaf702ab09e6f18a9ab1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/5ef88b8b3029a7aa2ddaaaf702ab09e6f18a9ab1;
+    sha256 = "18zs81swncyyff3a26dlc9c87gvq75b9c0sscwhqak2m18jz1xqs";
+  };
+  "5f026e163284ef4d1dd49f3e7ab1ddb74e2e8dbf" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/5f026e163284ef4d1dd49f3e7ab1ddb74e2e8dbf;
+    sha256 = "0rnhwgizkbxn5xdf63kbacsf9s54hzxl3zz6m72jzmlr0i3z17hh";
+  };
+  "5f116087ea09d4cd18e565462f0cb21da53cad86" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2407513-a097e3fe93574082b279540eec49fa58/5f116087ea09d4cd18e565462f0cb21da53cad86;
+    sha256 = "10blnrsjd5f90bkd48k4bqbz69xa0dd41yvkf4v21ffl4sdj184b";
+  };
+  "5f239795752cebffb0bd14bc3d14db541d74b95f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/5f239795752cebffb0bd14bc3d14db541d74b95f;
+    sha256 = "17wnf2ps8abp04i6mkqz9wmfm58vwjy355pqqs216ap3bq7l7iw7";
+  };
+  "5f29467ca4107002987a75eafe3c02d49c0d3fc8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5f29467ca4107002987a75eafe3c02d49c0d3fc8;
+    sha256 = "1irzs3c6qwh0xl7dhpyk24iwbdxyrmpn9qdly7zshgqqzgz26caj";
+  };
+  "5fa26a7a3b2978df4bee466d4c76c7b95497e4a4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/5fa26a7a3b2978df4bee466d4c76c7b95497e4a4;
+    sha256 = "03d8366sam4f1xjf7jg2awir5hd3h7hgggif3nisbpvg91nip0vb";
+  };
+  "5fe5595a5a46eab069dcd2d6813c1b68cd9ade4f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/5fe5595a5a46eab069dcd2d6813c1b68cd9ade4f;
+    sha256 = "0s3a3w3xd7w1c7x19nljmkp68xq2b1m2klx60i739y5lb2g7x0lv";
+  };
+  "6028c6247770e169982f50ed839356448f3d93f5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6028c6247770e169982f50ed839356448f3d93f5;
+    sha256 = "0fcg2pm4l5cg2vah26s2p0p5ljy3hk0vssc0f1f18pvw5zicv3g9";
+  };
+  "604e9fc9dd1c1b397add8f900213a87a9964ee51" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/604e9fc9dd1c1b397add8f900213a87a9964ee51;
+    sha256 = "0xsns5k5165s37f4q2qy12958zz112487313n6mlgny6zrp1azf9";
+  };
+  "607c94b25b7e4fd2ad13dfdf210e43eca3abf392" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/607c94b25b7e4fd2ad13dfdf210e43eca3abf392;
+    sha256 = "169603qzhzfnpmik6vaz14zggkvad57s3d46xlnc63hcq7ambj4a";
+  };
+  "60864e331c9e60034c81b9544ca30a14688574a3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/60864e331c9e60034c81b9544ca30a14688574a3;
+    sha256 = "1hqyxcf0nfwx83qb94534y5idxb0a3554nncbrxx9s4vigm4pdb7";
+  };
+  "6093beca3b21ddf0d2d599e6a841ea070ac01fae" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/6093beca3b21ddf0d2d599e6a841ea070ac01fae;
+    sha256 = "1hxgib9wc4d9s8n0b4y8vaisxqpbhxa699ls5358nz4gdw8zr0q8";
+  };
+  "60c5bb5120f6c73b23af87c97dd5179f0ade011f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/60c5bb5120f6c73b23af87c97dd5179f0ade011f;
+    sha256 = "0lcnjvklsxhfzcda286wkwjqdczyb7w0k8v9yybl0cj3ls1ikgnb";
+  };
+  "60d58acfdcf8d83f8a76a00017b7b2e18671b5a9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716370-1fe4be93d0274863a43a7797419557e3/60d58acfdcf8d83f8a76a00017b7b2e18671b5a9;
+    sha256 = "1gfl59bmrkvg038xw90xi2g1vmz6wzh84wmsk5g6mm8klpd57aw9";
+  };
+  "60f481b9e0149933c045fafa2e119c902e698d0e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/60f481b9e0149933c045fafa2e119c902e698d0e;
+    sha256 = "0l9rq8fh7mmkj363gzl673rknaacjv32276y0b52vxxg0m8fylfc";
+  };
+  "6110e8d90324f6bac6bd3173bc69f6c58d459d08" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/6110e8d90324f6bac6bd3173bc69f6c58d459d08;
+    sha256 = "15rqyi5w0nklw3v2r7fagaa0v6am1p1rgvq7fpk0x98axp7nvx71";
+  };
+  "61402aec078bfe9e6535f5a6ae537710fa5e79b0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/61402aec078bfe9e6535f5a6ae537710fa5e79b0;
+    sha256 = "0f9yjkz2myf9qnnk21n2alsb4ibznl96hh9i57d1y9w425jg4a2x";
+  };
+  "61588d85e249c225350c50ef50608fa8b9f4941a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/61588d85e249c225350c50ef50608fa8b9f4941a;
+    sha256 = "0daalrsynapmicj8bbv2cvg4kijm3x0c8zkayjjzixw5qy8sada9";
+  };
+  "618449250b93c28bb8f15751ff6bb653143e5ff0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/618449250b93c28bb8f15751ff6bb653143e5ff0;
+    sha256 = "0zkpxgpqcmkfd1a8rsivfrw5qxkqlcw9apa2jkf46417m1k5w2k1";
+  };
+  "61a4313e93aab82bab5da58a1b601aad41ecbd60" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/61a4313e93aab82bab5da58a1b601aad41ecbd60;
+    sha256 = "1gf7d5hxdl8hyfs30b2y9f1h6d3b17jfb65jlrx8fbcg70brad42";
+  };
+  "61edd2f04c73c5c3eca0bfae13c92213516504e3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/61edd2f04c73c5c3eca0bfae13c92213516504e3;
+    sha256 = "1aslzizrnnibzn5ynspirz9zz7667mzpz4gfvqb8k0x6zk46j5xz";
+  };
+  "61ff058a4cd1eab2481a48a115063c62660b78ca" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/61ff058a4cd1eab2481a48a115063c62660b78ca;
+    sha256 = "08m4b9c2dyld2hr7c8mxpfgvxxdaxj7svaspdfsg91ghq42mscdd";
+  };
+  "622d9c355d2344266a6a9065ae16e911791d9ac2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/622d9c355d2344266a6a9065ae16e911791d9ac2;
+    sha256 = "1i51r1bwfx7fsrykfbj5ylm1yjcp2q9a305vx070rig8m33qygla";
+  };
+  "6253baddbb265d8bcab9334e1bb48fee69c0a14c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6253baddbb265d8bcab9334e1bb48fee69c0a14c;
+    sha256 = "0xfz545zngq5jnji3zxr8wlwjf8y7c8wd6bmmwkkjf1a2pipywiy";
+  };
+  "62cfaf0ed5a8437e74ef0b7331f28a86942cc8c8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/62cfaf0ed5a8437e74ef0b7331f28a86942cc8c8;
+    sha256 = "1asb6h92cnh2xmwnggn6kk9qly4pzw43aax3v07zhs69d3jbhg2x";
+  };
+  "62d297add5bd88f5ea16b2ba6b97664dd888eef8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/62d297add5bd88f5ea16b2ba6b97664dd888eef8;
+    sha256 = "1ajrnfsz53imm4hcsnjznbq087yvbj87s30v948x2vxy7ja17hi2";
+  };
+  "62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/62e18e2b34d9ca5872cacacfd6eb9e94afd0eb2e;
+    sha256 = "0jirs3ij917vqznqffqh5bisx4bvqfhbhr56fmlfyykckqwmq7i8";
+  };
+  "62e5d1e864e96e11f84e99dcab8cd16345641f43" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/62e5d1e864e96e11f84e99dcab8cd16345641f43;
+    sha256 = "1s7k9h8vpg5j5jq9mc4mgnrb1lyp3y3lvgc7n7l76djm61amqchz";
+  };
+  "63574e974c45ae3f0e8fbfcc9d896c53798dd161" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/63574e974c45ae3f0e8fbfcc9d896c53798dd161;
+    sha256 = "181s6b5j1zqv1hf905paxxgl4j4k20s7ypnv1h7f05qp4sq6wia2";
+  };
+  "6359e2376de35d2b27246726788d28d678796a20" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/6359e2376de35d2b27246726788d28d678796a20;
+    sha256 = "006mdqfgkxgppxcx8fdfza7z9f80rq27gjncnqpgk3wawb9033r6";
+  };
+  "6372acc1b0c4c85801bbd2b0fc9bd17a043c1b67" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6372acc1b0c4c85801bbd2b0fc9bd17a043c1b67;
+    sha256 = "0c8fgaqy17nvsqx4lsiy4fd9z563rbf69sac18bkwyvw0wb4w1s6";
+  };
+  "637e6e050e0e294f4e7191f12ad96c9be75aa747" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/637e6e050e0e294f4e7191f12ad96c9be75aa747;
+    sha256 = "1s1vx86pp7c7kabvi0jpvqqykjb5127qwf6ljz8r6awmx9k32yly";
+  };
+  "6393b6f72772149473aacbdd6425bc77b7146697" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/6393b6f72772149473aacbdd6425bc77b7146697;
+    sha256 = "0jpjsh7r1m4isbhmmijlysv7jmnf01f3rj9q8z3v6fdmbi6v0d68";
+  };
+  "6393ed28494cd0c7bbfc3d90ee14a3c4fb5ffe2e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/6393ed28494cd0c7bbfc3d90ee14a3c4fb5ffe2e;
+    sha256 = "0972073k9di5s980ypdn4dww5y0drc1fsn7q5bk71ylz6pdx7ijh";
+  };
+  "639844a81c2400a43810b5674c144824ce23f3db" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2653253-b6a14aed15124b4891aa1fe8706033fb/639844a81c2400a43810b5674c144824ce23f3db;
+    sha256 = "0rflhgn3nxl5msfd7f8xmz56msgkqhadyh5n7b120lk34wa7bvw3";
+  };
+  "63b510d13c94072e9005674901d2b32ec9853167" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/63b510d13c94072e9005674901d2b32ec9853167;
+    sha256 = "1j10rlxqrdy1zv5fpx0zk4hy73fbi93zk7qsq59cfgpbgsd9n79g";
+  };
+  "63ceab8331229d4e03c85aa9b5f4671eda2643f1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/63ceab8331229d4e03c85aa9b5f4671eda2643f1;
+    sha256 = "05jv83mc7abw5zyad8wccnnh7q8f5ba82hq10w7d589gasdbj9s8";
+  };
+  "63fb6b15f90b5647d4e46169447beceac52a5dff" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/63fb6b15f90b5647d4e46169447beceac52a5dff;
+    sha256 = "1bhljn5pai17hw9znr22kv87p0fl01sx8h231v4mb96f8d1037q3";
+  };
+  "645a1e3bcfcb7345c6416a0ed520fae63329b8b3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2622232-9cbce5f5f69743598cf4bcb212040bd6/645a1e3bcfcb7345c6416a0ed520fae63329b8b3;
+    sha256 = "1mdx70n7hv42j7ychalbn2rwq8irm1nl1s0i5rgnbvsxb0z445pn";
+  };
+  "64e87def5324af1f8687a977b1aeca68f9ecf0a6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/64e87def5324af1f8687a977b1aeca68f9ecf0a6;
+    sha256 = "1alslkmk8i0vmg4v5bd8lizm1b51bp1mcy5bmwy03dfnpv9hd8yk";
+  };
+  "64f0b7d72766b49356b5948a55695a43f845be22" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/64f0b7d72766b49356b5948a55695a43f845be22;
+    sha256 = "0x7rh3sw20czicj5pb9p0z4xdhd7vc32562wlcwf5c9k0vdyddri";
+  };
+  "6522f3b24668a2691bee084b8ee44262dc6cc644" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6522f3b24668a2691bee084b8ee44262dc6cc644;
+    sha256 = "0brl515h4axh92dypzyrcx5gjf3lzakmn48nn2aapk25l8lzw7fm";
+  };
+  "65578de12deaee566474c4d151d51dfbd4c073c9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/65578de12deaee566474c4d151d51dfbd4c073c9;
+    sha256 = "0n1rhn916zqr83fxzb6slwd3sj7xbxyi4j5371pndfq1ah8yynkr";
+  };
+  "6580420e45c35e3175f7714b91aa918b46c45984" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6580420e45c35e3175f7714b91aa918b46c45984;
+    sha256 = "1xsyvsp7gr58v19k3b5d33ayhz38amckz6kcabv2jaj22d1m4zwv";
+  };
+  "658fa72e61b1133bc866dc68b7317dda0c190d51" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2372492-7eda6cf2d68f471699ac1d302230bcd3/658fa72e61b1133bc866dc68b7317dda0c190d51;
+    sha256 = "0am1lpxk2jxhf015siabscd3b8i2p43xgg8p5bp0r0sxrcbxwy2j";
+  };
+  "65a719d77d9dbaa46e24a210a17ef22399982d13" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/65a719d77d9dbaa46e24a210a17ef22399982d13;
+    sha256 = "15wh8wv0fj30xy5lhz1vhw5a7d6fqk8pjpcivzmlc9qp48jaa9jr";
+  };
+  "65b78b6ca4fcbc234e459578f687f0a5f21ff467" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/65b78b6ca4fcbc234e459578f687f0a5f21ff467;
+    sha256 = "1xpkj42dfkpqa0bq1fvwwy8n4286h2xlwz0fm2m4yk3p7qs2yyn5";
+  };
+  "65c815431a222281ca4027a3409714aca969c404" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/65c815431a222281ca4027a3409714aca969c404;
+    sha256 = "11n5ra9mwj06zlilmn58xwhqr081ml58f8jd57sz994f3ci78kf4";
+  };
+  "65f992d64db107757f6c8186765571a2f85d60d1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/65f992d64db107757f6c8186765571a2f85d60d1;
+    sha256 = "1jfrsagmfvvjxji32w4p7qq6b2vyqfmn52d1xinxn11v575cmrxw";
+  };
+  "663723ac5cff1d4ea06e07da58676eda31ded8b7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/663723ac5cff1d4ea06e07da58676eda31ded8b7;
+    sha256 = "0yc5wmplmj4nqfzlydrf3gcphnym0vdy5l8xsb6l6gjm1rzn3w61";
+  };
+  "66b5c49c095c24e8ff5576638e6f43f40b60e398" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/66b5c49c095c24e8ff5576638e6f43f40b60e398;
+    sha256 = "1r4cq5hz5ciak42xy5h6jk8r55cy4a2am2x7nsm8n40pn1m86xg3";
+  };
+  "66e6d819829e7f036392ae108ecdedd0068b3fed" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/66e6d819829e7f036392ae108ecdedd0068b3fed;
+    sha256 = "00h32jp49052x7fms634savpk88976q973s1ixnkcl4q10y3ygc3";
+  };
+  "675414213a5992bda8f4bf33aa2feac7508eadb9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/675414213a5992bda8f4bf33aa2feac7508eadb9;
+    sha256 = "0b20idjyc0m9dqrnpzxxdshw29l7nlj1g7fi5zhf9y0hh77v1ji3";
+  };
+  "6758891f27f3f1b33f508442151c2d1d4244cacf" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/6758891f27f3f1b33f508442151c2d1d4244cacf;
+    sha256 = "0ixakp9gxjjn5c19mir7qxjh7ywx6n2pncqiv37mbhj5c9z5r7mb";
+  };
+  "676f25261064cf478cd211dd584b7a391376f599" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/676f25261064cf478cd211dd584b7a391376f599;
+    sha256 = "0f0ix6vbx89pa9bpvnf87kwhbnf7q34mxf8ycw6md4brrjps21js";
+  };
+  "677b668be4a2ec5fa834fa988bf502390ca975d1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2703853-c90e6f22156c41b6b1968b2a029d291e/677b668be4a2ec5fa834fa988bf502390ca975d1;
+    sha256 = "16ppk310afb40np5slr1b7qy6ksq16d0pl2zavd4wrxr626c0yjb";
+  };
+  "67ebcec99338fbc806e98fe5ddcc80abd7cfe885" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/67ebcec99338fbc806e98fe5ddcc80abd7cfe885;
+    sha256 = "1rhm5ziiax99nlnyz1y3gqai9wkkvi0lwmsjn64xsqhp2cm93sag";
+  };
+  "67f9a57842391bca1072e56b907d2adde02d2d34" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2609785-e83ceb61e76a4e4bb9b4dc17c52d07b1/67f9a57842391bca1072e56b907d2adde02d2d34;
+    sha256 = "1i8aa40i83zlzydfdbf3k023329mlvlh32kwln6q9pg9998k5hr0";
+  };
+  "68290cfc4aa5f88785b355b66e5efa7ae2451f3f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/68290cfc4aa5f88785b355b66e5efa7ae2451f3f;
+    sha256 = "1s6m4qakr8bzyhak2v7d6b7h3g75iy4wfxplbz0r1bk79mlzh8ch";
+  };
+  "682beb667137b4be322732642ec6bd7a7fb77a67" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2474673-cc4b4abcf8d5453d9c14a5ad304063e3/682beb667137b4be322732642ec6bd7a7fb77a67;
+    sha256 = "1sap6ri29l2cd8yw5g5g8axy9nz8gy4lhrkvp1fnnf5c68cqqhm4";
+  };
+  "684a26e9ee9814c8e55834710a5e5395db2acbf6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/684a26e9ee9814c8e55834710a5e5395db2acbf6;
+    sha256 = "1g8alym478k5mla106h38zmspr1gvgbyckhc0hbjk950kffwg537";
+  };
+  "69435a1a9c544a85003dac3e715da698388e8cfe" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/69435a1a9c544a85003dac3e715da698388e8cfe;
+    sha256 = "1wb8slsppm2cz2g5qlccjgjayv3q8bl0p5hybz3gpicnjyhla1c0";
+  };
+  "694d6d6d33e802bd013aa60c6ceef225f1769a21" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/694d6d6d33e802bd013aa60c6ceef225f1769a21;
+    sha256 = "100b3c46qf5nhw3758203khsqjk5jq9hi3s7hsjsjrrz03p2fclp";
+  };
+  "696aa11a029bfeebe1885750c0a1219698f45667" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/696aa11a029bfeebe1885750c0a1219698f45667;
+    sha256 = "0nbr429yjr1xi2zlqz0k33p62d4mq4pcc49xshkdjbqm8j76yg9r";
+  };
+  "69fc2b97ab8ad300bd86bdb295b868f7e2bce67e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/69fc2b97ab8ad300bd86bdb295b868f7e2bce67e;
+    sha256 = "0538b6klq4k379vp6miha7y73sz3lbgj093hxhzl4jb7fqnrwpdr";
+  };
+  "6a0ea024e2030b5079a2b9e20aa262fcb1a4a4b3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/6a0ea024e2030b5079a2b9e20aa262fcb1a4a4b3;
+    sha256 = "1i6rijsnpwq58ngwdak1kx0kv53w2bqgl0jfwww2mpm9nwr34dgk";
+  };
+  "6a12e8d5c57226c69cfd4eea779767ef39cc7040" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/6a12e8d5c57226c69cfd4eea779767ef39cc7040;
+    sha256 = "0fpbgjzi79f8y2k8dmj596kndbjrpkaqvld1mpfd8mfxjg435psd";
+  };
+  "6a471e2c9660b457b6c96bac1a80ff31694ca135" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2602350-38e0d307a57a47baa00ee5f892c9ced6/6a471e2c9660b457b6c96bac1a80ff31694ca135;
+    sha256 = "0ifvzqzrjf1ich2m8r75czl46kyr0y2aagsb6h5mqnxmqbznwkq0";
+  };
+  "6a50182277880d3cdd4488457883c08e6765df35" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2587672-91bd78b10f504d6789cdb334ed27eda0/6a50182277880d3cdd4488457883c08e6765df35;
+    sha256 = "1pr0sfpya1izpppfdpypkpyqsalr02v0azcxyn2p8jibnzkg4qqa";
+  };
+  "6a67f7a815e887377e17dc82a86617bcbfd74f12" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/6a67f7a815e887377e17dc82a86617bcbfd74f12;
+    sha256 = "1wqf8h7wlwzwiv2syrs3c69lbiqr7505kkbfckrscj8ym2rgmqxl";
+  };
+  "6a6962c3f79f9f08e1b48bdf76659d8d0ac02e20" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/6a6962c3f79f9f08e1b48bdf76659d8d0ac02e20;
+    sha256 = "01dlplk4r00san6hbw5mclppb0kapx51w4mv2piihx6vcdq2dv2w";
+  };
+  "6a8708499175f48f9ac6e36dcde1684f5908e594" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6a8708499175f48f9ac6e36dcde1684f5908e594;
+    sha256 = "0v67h7q7wz0xa66l8m8kk7adrf7mr9arns5w5rdv3m6dq9730cz1";
+  };
+  "6a9c5875310b65c3a8a12766aa12d23c75256911" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/6a9c5875310b65c3a8a12766aa12d23c75256911;
+    sha256 = "1x5q67kq3jrxhcvnc4xj2ic28ssmiyld4yp3y612vl71z02rsaji";
+  };
+  "6b3a9a128f40523d7b4663b4aff1259e204dc2fa" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/6b3a9a128f40523d7b4663b4aff1259e204dc2fa;
+    sha256 = "1nhpvs47s221k07ix1i5sp4ba8mia36zmqfz66dz2x9yx87xm3gj";
+  };
+  "6b44b6d36ae3887d630357d09ac1f4655e43ca7b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6b44b6d36ae3887d630357d09ac1f4655e43ca7b;
+    sha256 = "0rmj38k1zz4q2ckwngs38jn6z5w9kaxrghckqv60ajjpn47dk008";
+  };
+  "6b67c4b93edd66dc6876acdfaf991559f2387756" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/6b67c4b93edd66dc6876acdfaf991559f2387756;
+    sha256 = "0mq7wi48fck0c8i1f08mkya5fjr5a2sip3g9lzzi4my3k6g0jdlc";
+  };
+  "6b6ea1539e3e10b995b117a201cd14188d7361cf" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2528357-44d3814edbb84d09a5279fe4fd30ba86/6b6ea1539e3e10b995b117a201cd14188d7361cf;
+    sha256 = "1y7r4z90rp10b9pqp54awmnxqibx8pr2924l52z2abm3hza7h6da";
+  };
+  "6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6b990f3e47bfc2ed0ca6a8c68c9188a6788110bd;
+    sha256 = "1mwmkci1q5lk8vrqgcrng5p8vdg2y2k18g5x5csgfa0j0harwr20";
+  };
+  "6ba54736caaad91cbe96699871e5e369c615d477" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2528371-50b896349a4f4b48b4cce5ef240b0c45/6ba54736caaad91cbe96699871e5e369c615d477;
+    sha256 = "093pf4kdkisr2k3xkz7qx88503mr70y3crx4170lblax8mji89ib";
+  };
+  "6be690bb0e769b3f7e8d0ea9dc261b06f0496249" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6be690bb0e769b3f7e8d0ea9dc261b06f0496249;
+    sha256 = "18cidvs8cv9air0l9g65s0010a677qpj3rjdx1z1p19mcr7w9ddz";
+  };
+  "6c0977b3790d44b85c497cbd724ffa4f744bd6b6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/6c0977b3790d44b85c497cbd724ffa4f744bd6b6;
+    sha256 = "0wcypa2p4wx0si460677y544hjp38vf81im61z5kq4scr5l4kwxs";
+  };
+  "6c431edb06befc6eec62ca59cc72f45697da876b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6c431edb06befc6eec62ca59cc72f45697da876b;
+    sha256 = "0bm4r49wzm0bx5wa0xdpmld8y0cv6jin9wl3djlp7kwg0nix2fv8";
+  };
+  "6cac0ce67fc25ab9057de053ed68e469376a951a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/6cac0ce67fc25ab9057de053ed68e469376a951a;
+    sha256 = "04kbpf0pwsc1a5kz2yhg1azp0ng2zc4ff8dyhc58n543nyla68v2";
+  };
+  "6cb6768eacda17fd4b9089b3667e49c91b543347" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6cb6768eacda17fd4b9089b3667e49c91b543347;
+    sha256 = "1wj29bzdnf3s0w5vymnj599jq926m5whdrllfx6869z32q8xasms";
+  };
+  "6d0a3530ef64aa77b0e3b1121ab3e5148367b843" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/6d0a3530ef64aa77b0e3b1121ab3e5148367b843;
+    sha256 = "16brrbwwhh9ddjs22ijqkaxrz56n4bmzfbkshipmc74p6ildw05n";
+  };
+  "6d10bf18bc8be763d3e8f14a5f604b8bbc8ba92b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6d10bf18bc8be763d3e8f14a5f604b8bbc8ba92b;
+    sha256 = "12mw32xsaa1j0lcj5nbir2m7m3bp9sgvjf2022l5rxzs196kncdy";
+  };
+  "6d17b68e3ef2ba04421c03ad37c21c1871a7291b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2468685-6ced80b1c43d4f92b6c325ead32ec577/6d17b68e3ef2ba04421c03ad37c21c1871a7291b;
+    sha256 = "0lb1q5wp4px4kh5lkfbva078jk0jj2nli6nqf6501yq1gbq80q5v";
+  };
+  "6d2192770af113f0d25717171721654f92522bc7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6d2192770af113f0d25717171721654f92522bc7;
+    sha256 = "0x9ayw21alzjqp5xwlj291klnxdkhqqgbz1wvppklmnw3yrqbha2";
+  };
+  "6d263531086a2ac8abcd381816ca4bbebeb2bb89" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6d263531086a2ac8abcd381816ca4bbebeb2bb89;
+    sha256 = "10wihlpfq2ilg2a3rj6hdj2109rwsvsnjfs4x9l8pmr0imn6w4pz";
+  };
+  "6d2b2990842e4e124fa1767f5e6fb10dc1c8f0bd" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/6d2b2990842e4e124fa1767f5e6fb10dc1c8f0bd;
+    sha256 = "1jvcscijpcpl4g17wl8h39p6jwngh8qys423najf9hxqxvx9l9w1";
+  };
+  "6d7357dd4987e9a687f666583450e9650b6bec3b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/6d7357dd4987e9a687f666583450e9650b6bec3b;
+    sha256 = "0xzzdsb63zb9771lxm845390d23hihgax7ksyrlhjmvj30kxxkhk";
+  };
+  "6d8bf7bc3f485cc58257d2f301a88e430fe47518" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6d8bf7bc3f485cc58257d2f301a88e430fe47518;
+    sha256 = "1pvs3fl5qschq6gk12ig84wd4568sgmv4gv05kdvda44pnz3fbnd";
+  };
+  "6d9e988311499cbfde8b162b1b772f3ab0826cfa" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6d9e988311499cbfde8b162b1b772f3ab0826cfa;
+    sha256 = "0bp2gbl6b2dimw4izmsa9cpsw2650g1a1apq5pv1j0a0ihahwfjn";
+  };
+  "6dbc1369cf4eb542c999ef1a7dc17798e967968e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/6dbc1369cf4eb542c999ef1a7dc17798e967968e;
+    sha256 = "15vl7c83w4l3jd366lxljgpjyh2dxi22s11sk83bkca9ig8p9rlb";
+  };
+  "6e12c754b5531592e7583c0ddf5ea9f617bc4393" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/6e12c754b5531592e7583c0ddf5ea9f617bc4393;
+    sha256 = "095hbf0bx9iwcyrljr23zg1dwd3n382s4pxgpvalpb6flk346i9l";
+  };
+  "6e4f2760b5d09171b1caf834191e8eff91e09092" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6e4f2760b5d09171b1caf834191e8eff91e09092;
+    sha256 = "042615c1ssd8jd0swn6qxl55v619ilz3y5549qqaj2qbs2rxgda6";
+  };
+  "6e59a6401cd7e9537de8df24d6923df4897465b2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6e59a6401cd7e9537de8df24d6923df4897465b2;
+    sha256 = "1pbk0lxx24w1bblnjnl2zvljy2pg4c8pad7xyfp5gwinz9ns045w";
+  };
+  "6e5a4c88769060bd4e1cc4b17dc6944cd5f3d5cf" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/6e5a4c88769060bd4e1cc4b17dc6944cd5f3d5cf;
+    sha256 = "0y08zj57v9n6a1hp9rgrvx5zcj63kq3363xi2vfl5g0fl3n0rfn4";
+  };
+  "6e730e7ead3a2958afb3beeffb7961d98b372ba4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6e730e7ead3a2958afb3beeffb7961d98b372ba4;
+    sha256 = "1d5rkr6qa8h4kxqcxarmvwfmn49k1rnfljvrm4b72yscl3x89pri";
+  };
+  "6e81558b9e889ebb9d8f50cf1f1d5c4ab32617ce" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6e81558b9e889ebb9d8f50cf1f1d5c4ab32617ce;
+    sha256 = "1ljwpklbqah13l6mvrgfbn4xxwpxqycb4cr2ibh90aigjyjbijni";
+  };
+  "6ebcf68520fb80c14bda307947650ecbe5ed0335" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/6ebcf68520fb80c14bda307947650ecbe5ed0335;
+    sha256 = "1xq7g59xy3a25qiib3dv30in8yqg8667wpq940z64gapbsvjk106";
+  };
+  "6efaf9b48d52aee2c7a89e9fb7c8face3a1dab34" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/6efaf9b48d52aee2c7a89e9fb7c8face3a1dab34;
+    sha256 = "10iv45b9g9l3krxqs8cqkgad5zhvy64n84q94ghkyn86ilg6pmqb";
+  };
+  "6f05a4518d46fff2a081dfff843f2af3e163a983" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6f05a4518d46fff2a081dfff843f2af3e163a983;
+    sha256 = "07qkvg5g4dnzwjv9s38gqjc5mzsa13xmv0g2d9wii4vwm9ray2sw";
+  };
+  "6f0e8b5effca878a55ca98bb70c7fc5b9c33a7ca" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6f0e8b5effca878a55ca98bb70c7fc5b9c33a7ca;
+    sha256 = "1whaajzna61zci7cjpw0p3j7z1y3wiqz98qkn5s3lpl0j37l3pql";
+  };
+  "6f3fed4aa88e43e6ccbf7498ff502f8440e1d8b4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/6f3fed4aa88e43e6ccbf7498ff502f8440e1d8b4;
+    sha256 = "0hcsv3588k6ra0cd5l1f64m5r35fl6wbs9a8p9j29nigy3vdmbvv";
+  };
+  "6f51406032cee2275e7da1c749608e097223bcb1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/6f51406032cee2275e7da1c749608e097223bcb1;
+    sha256 = "1lcaxdjbkx2nklln244ljdfyhi4b246zvk7pl6hg29kbjaxh3grw";
+  };
+  "6f7d171cf322dcfd650c55aad7573fb99f926026" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/6f7d171cf322dcfd650c55aad7573fb99f926026;
+    sha256 = "06yn4cdz4rrvh1h483fj06n6n0jamngx2z24mjc1raf63slidb07";
+  };
+  "6f920a415787627f9dc4c1ef92a2a039a21976a6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/6f920a415787627f9dc4c1ef92a2a039a21976a6;
+    sha256 = "12szpcgm9mgddiyyf6yhs8rf6hlwa0kw0m9wzs9xdq1phxwwcvy6";
+  };
+  "701e08162a99eeb25b55b6133dfee51bf36e08d3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/701e08162a99eeb25b55b6133dfee51bf36e08d3;
+    sha256 = "1mffiwbv7qbwadrj6jkm1n4hzkjl5m3fc4dgxdijz7i79d8pgyk1";
+  };
+  "7054b730a39f0d762ba1602fbca946a38a8811cf" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2565979-eaaf2006b54843b69b5280979c12ed6d/7054b730a39f0d762ba1602fbca946a38a8811cf;
+    sha256 = "1vmx4g2jyv97k5pbv6rayn8a0qd29dwmvbl60v266m2ld25mv59r";
+  };
+  "705da00d6ddc859d91abda6fb8299b957eb0d99f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/705da00d6ddc859d91abda6fb8299b957eb0d99f;
+    sha256 = "0sizr4r95pddbynh4kns28id4n99hb7cz5dxx5pj5ma8n3w5295f";
+  };
+  "7077b313799ab4557f8c8d9aa345313eb3c6fbae" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2622232-9cbce5f5f69743598cf4bcb212040bd6/7077b313799ab4557f8c8d9aa345313eb3c6fbae;
+    sha256 = "0mhm5c9z63i6v24bfkhci6zdzjzqwaimkd77p5whrnqrfw44iqz2";
+  };
+  "70bb4371a8b8f7a2118ee2f0a7604496b68eef9b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/70bb4371a8b8f7a2118ee2f0a7604496b68eef9b;
+    sha256 = "1sjrdhycvh0dy9c1b2abkpar8bjmm57xqpfp2qznah918mp43jds";
+  };
+  "70bd0e0e4dbec19c4cffb718ebb1ac84e037940e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/70bd0e0e4dbec19c4cffb718ebb1ac84e037940e;
+    sha256 = "0banm0bvf6rsz8jpkx7ivghf47ds8wf6dbcfg17f7nbbcnjg125d";
+  };
+  "70f50e9df2d8e0011bf9748ea4c1df4c8c8c2202" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/70f50e9df2d8e0011bf9748ea4c1df4c8c8c2202;
+    sha256 = "1cw8ykv8nzrvwc1rdr45ilr2cyl8f6crby374n8049dyx1bd2mmx";
+  };
+  "71031e888d4b28104016a406b7ab6e993322d9c8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/71031e888d4b28104016a406b7ab6e993322d9c8;
+    sha256 = "1ixxwv77kbnz8y8z64v0radxx3q7azbakcpq9nl84k8b93lzmp3z";
+  };
+  "716adbc60694f3f72ef5e25a38f3fb973fdc7a2e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/716adbc60694f3f72ef5e25a38f3fb973fdc7a2e;
+    sha256 = "1c8w4k96i6fgkd0jc9vwpmw31p4bcfw88x09c6781ri64qw1asl6";
+  };
+  "71a6745bfe2208e7c0eea0718fc3a06d9ebf12cf" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/71a6745bfe2208e7c0eea0718fc3a06d9ebf12cf;
+    sha256 = "1q9ymfkjvbwv1bwvq5m5c31yb3kcvfwvgrsr803wqa6qm4s40zdd";
+  };
+  "71a806e6c281e55c56f6e0feb65e35d553d03b68" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/71a806e6c281e55c56f6e0feb65e35d553d03b68;
+    sha256 = "05065h1wgxihrmih7yc291vxgpyimcj2kgbqn4j8mly43llylp5f";
+  };
+  "71b05376f1ca6f9ebfddddb4cb2258620d57951f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/71b05376f1ca6f9ebfddddb4cb2258620d57951f;
+    sha256 = "09ccxpvjjs3yjc45ygjd6phff9ax7xa0lhr5sb5jzswfnblkb04i";
+  };
+  "71f91c9ee187d974e3f5da3d91a352d568c260a8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/71f91c9ee187d974e3f5da3d91a352d568c260a8;
+    sha256 = "1j2jk0qb9wdczxww1wl3rm07rhz1q3b4n6z23jja3r1fqsn8w50v";
+  };
+  "7210d2acb28ac3185e52b3c854c02db46878b00b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2499790-9469133ca7fa466794728dd13190004c/7210d2acb28ac3185e52b3c854c02db46878b00b;
+    sha256 = "15llgg0n7w2awbbkb0lvb90g8sjip1zj7knca21lyxgb86p4nfbq";
+  };
+  "7214bfbc3129849a9681c342e1873b66020b0420" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2621802-1efd555e661e4948aa22f3883712aa6c/7214bfbc3129849a9681c342e1873b66020b0420;
+    sha256 = "0qpkvfjnmmf8bcvd8qddfyyf3hglkp3870z8rhpxcpyqbv5q644x";
+  };
+  "7221d90f16cb54cc4f5be63f68865da103cd4f5a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/7221d90f16cb54cc4f5be63f68865da103cd4f5a;
+    sha256 = "0xzcfz1npvnf3qidc2yffx5xqs587spjmrxsnsra8fqmghy7y513";
+  };
+  "7228172fbb398b4f9cca6ca9b5db85d1a6644b4a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/7228172fbb398b4f9cca6ca9b5db85d1a6644b4a;
+    sha256 = "1d62b5vw3l58667k2nf2dvladpkwpaaa0ai9x58bh46x1gazfdyq";
+  };
+  "725d0cc30e3c4b6a9e3dfac3f320a6c9904dd8a9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/725d0cc30e3c4b6a9e3dfac3f320a6c9904dd8a9;
+    sha256 = "1lq5pdjpa6jgrywfzx92vczlkqp8ggr6mqlnly772c6a4p507xvi";
+  };
+  "72e906fb126222e8269f7d46e2d9f1ac603baa5e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/72e906fb126222e8269f7d46e2d9f1ac603baa5e;
+    sha256 = "0by17bnb94wwv35bqbb7gxn64xppf6m88m50lm6dxyblclizk1sx";
+  };
+  "72e922640673b6171e86c8c7fcdfa148004c1301" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/72e922640673b6171e86c8c7fcdfa148004c1301;
+    sha256 = "0xbd7jd9pj1g3yf4252dy84w1x7czlqa1gxalk6p6awn1n1va815";
+  };
+  "72fc2150939a11815cfa929001ecb00ad565ce7e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/72fc2150939a11815cfa929001ecb00ad565ce7e;
+    sha256 = "1jbhd6mcrxk21dbjavkz6mf610zdql9srkd6c4flb794kfxx0gir";
+  };
+  "72fee8305071d508698fa86e4a89c80f5ee236b3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/72fee8305071d508698fa86e4a89c80f5ee236b3;
+    sha256 = "1dkbhigrqnbdpp7ixm8fwhn4x294n7zi33xijw9vngysc7kngx7g";
+  };
+  "7305d73041a77bded642dbf6567625ac3c0208fe" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2466157-4ecb0085873048178dd6d2b8872eea79/7305d73041a77bded642dbf6567625ac3c0208fe;
+    sha256 = "17l3s1kn54kzjg7ajxhx7rvmw6rsvk1ad748dp9mqi5qd80096bp";
+  };
+  "730822767c19d479de3afc2e926cfd7438e23852" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/730822767c19d479de3afc2e926cfd7438e23852;
+    sha256 = "1hgcf7mzjamjjrs2636zdkz47knwy8hbvf1l4rm4slzi1mr2zrk1";
+  };
+  "7320897f4f1584c0e42fd2546557d85ca8f513db" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/7320897f4f1584c0e42fd2546557d85ca8f513db;
+    sha256 = "0r77s64pcx4585g5s3gbjksfsggbmp552fsipqzs4fv7qmanym5r";
+  };
+  "736ccee7ee45e606201ef7b7c643498cfa13d70e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/736ccee7ee45e606201ef7b7c643498cfa13d70e;
+    sha256 = "0p69pgkm72g46s76k1v8m2k77hh08sb0amx6lsszkipn86kx7ff4";
+  };
+  "73bae428e969b828d72a1c4b71208bd855b67233" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/73bae428e969b828d72a1c4b71208bd855b67233;
+    sha256 = "1x3ikd5ymqixs0zsny0lp6la3jhxay54iajw2m99w4bzfscqdkz5";
+  };
+  "73ee6ef047e32991fff9aeb313c0e8c7faf673dc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/73ee6ef047e32991fff9aeb313c0e8c7faf673dc;
+    sha256 = "06xm65k8i87crf0dq2iyj6mxwbyp0spmjwqha3n93fv63sgg3zrf";
+  };
+  "73ffe57844e03a4cafc0e9aa8819694c90e1522b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/73ffe57844e03a4cafc0e9aa8819694c90e1522b;
+    sha256 = "0j5ysqydqi51y5yv984wzs4q2y5d2d2cdrraw001yda5ghiidp4d";
+  };
+  "746b744c6a42c0f8af6feef784581873bde794e1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/746b744c6a42c0f8af6feef784581873bde794e1;
+    sha256 = "1wsmy3wazhzjk50yd2n3g9zrivzfwqvl2r5blcv7zvvqwyfhnpax";
+  };
+  "7491079d020d11f40f14eb94536fe09006ff2c16" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7491079d020d11f40f14eb94536fe09006ff2c16;
+    sha256 = "03aqvnhvbw15kh30384pyg01s4nixjqz22780yjja4hj51frxps3";
+  };
+  "749a111a54b3257ccd4600b6ece1fd86a57efe58" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/749a111a54b3257ccd4600b6ece1fd86a57efe58;
+    sha256 = "09lf0sslsikg4jks8yzb6b9k3y9d0dbig5j45kfk58yjx90mgfhv";
+  };
+  "74a5411261270860b0b2d315c8398df07f956fa0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/74a5411261270860b0b2d315c8398df07f956fa0;
+    sha256 = "1c8zc6kryl6nn9bv77fim2ccd5ikqjnj5n0b75dii63znm8hlp2i";
+  };
+  "74bdfe7b7c5448f6b002b747a29ddf4eb214dc0a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/74bdfe7b7c5448f6b002b747a29ddf4eb214dc0a;
+    sha256 = "10kq66r73gc8ghb3b5jgahbgs9rnv2s3kbvd72vjbdbyz58wacrx";
+  };
+  "74c4761d61aabc4f7e227da3ff18fc3af1ea7f5f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/74c4761d61aabc4f7e227da3ff18fc3af1ea7f5f;
+    sha256 = "176b4fv2dmppcs9zyci4yilvj0kmn92cxybbwjllp2cr9x2ard91";
+  };
+  "74df4c8f82ff3081bd49648cee83a06677495bd4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/74df4c8f82ff3081bd49648cee83a06677495bd4;
+    sha256 = "12brl8hsdyv0gf4hggi7mf9j5q2r19w3najivicrq86rg0f2km1y";
+  };
+  "74f904f20ed3e1cd02cc9d0e07a2778948328274" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/74f904f20ed3e1cd02cc9d0e07a2778948328274;
+    sha256 = "0169jszrsidkhbhz906yc8a10ffkcnp2kxz193r46j9qpv69dk2q";
+  };
+  "75124406de34db23633265523d08e569d7889164" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/75124406de34db23633265523d08e569d7889164;
+    sha256 = "0709ach7hq7qn6452xd7n6jlqx6j5b597yyvzvmcfsbnp5nmn39k";
+  };
+  "751d2649bc4cf19cea075804463f00cf0ae61ed7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/751d2649bc4cf19cea075804463f00cf0ae61ed7;
+    sha256 = "1a5g17mvwa7f8ydwikgc0f4hf8wp8w491fhhzvnn4m4i6jam6hwn";
+  };
+  "753eb938736a4b412147164d4077e991f9c89950" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2618214-623983ec05b34939b08acd26ecfb4f92/753eb938736a4b412147164d4077e991f9c89950;
+    sha256 = "18zkl0jsx165akaxgxxzf3619jmclxc18nggcbyb1iwqmxrxpcak";
+  };
+  "759eb0a64477d1269a2089f229e3f0a2276fb531" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/759eb0a64477d1269a2089f229e3f0a2276fb531;
+    sha256 = "1v0wgzzv2d6mxmkb0s96q7jb9d5knnh2p0ja261kmqhyc6dlzlqr";
+  };
+  "75e0842c76b2e55a861da42ea1d7c4636ab53833" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/75e0842c76b2e55a861da42ea1d7c4636ab53833;
+    sha256 = "05a3azlaw3y38ysr9rdrjk8mcrzm46q39k9xy75jxg52qpbdxmzi";
+  };
+  "76b0c3828b07ab86d995f91647a8fddeda00981a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/76b0c3828b07ab86d995f91647a8fddeda00981a;
+    sha256 = "1jybpkydwa8ry4197hxb43f6lgszv6sl9fnpbd335mipn5gs9das";
+  };
+  "76df9b164d66551812ce65dddef45a44604b8c8c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2736314-83d0b2c86e6940798eae7a6b4a7a011b/76df9b164d66551812ce65dddef45a44604b8c8c;
+    sha256 = "1knls10cjd66hr0z4988gw5p782q7f7lyagpx9f63zxbqjn0l3v3";
+  };
+  "7725a79a9a5f662ca2adf8ae2efb114d32ff45a2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7725a79a9a5f662ca2adf8ae2efb114d32ff45a2;
+    sha256 = "1vszgcnacspqzz1fj0y38gjj54qavksbwswbz2cmyml0m77h8qfr";
+  };
+  "77352bcc40b2053c8db752c49772dbf0d158af62" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/77352bcc40b2053c8db752c49772dbf0d158af62;
+    sha256 = "1pgz55g9wk1z146f00r6kbij5qkng7cb7ni22jgr6x3inblq28da";
+  };
+  "77464fb66258632d2799ac5491f4316d35cc346c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/77464fb66258632d2799ac5491f4316d35cc346c;
+    sha256 = "0iixcb51kdjnl8llbqiib1dkcv421d8pi9hly1r00clds5b5bpf0";
+  };
+  "7756f8e0698993a2efb94e15819a1d1a22edd9aa" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7756f8e0698993a2efb94e15819a1d1a22edd9aa;
+    sha256 = "0pm34hr3jm8nsvaypl68nacmbpzi2ynfnxm02rkn589f03778sni";
+  };
+  "777419bfd692da1795221b0711a3b11467f5e4ad" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/777419bfd692da1795221b0711a3b11467f5e4ad;
+    sha256 = "1g2rl7j740zhf4y8pcbcdhpzxzw9hcp0vb82zm72nhfw8hp9z212";
+  };
+  "777fe4089b0a02f749411d577a2a17adf635dec1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/777fe4089b0a02f749411d577a2a17adf635dec1;
+    sha256 = "1lvj3lvc20rh4yvwbyafw270chkl16jlardv8pqavil085qz332f";
+  };
+  "77ab57479dfe164e72b8298375e3b9b577e6640d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/77ab57479dfe164e72b8298375e3b9b577e6640d;
+    sha256 = "18qjd9d7d66qjk087xg246d6gssbiiv08y3rq2v1d7cddbsbbzda";
+  };
+  "785a36aff000132218d273b16e36412342def12d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/785a36aff000132218d273b16e36412342def12d;
+    sha256 = "0235bgb8hzg5x5fhk8a5iasdjfbj5xzh0ccxx3iaadmadcn3xgxj";
+  };
+  "786040422666da11604af7280dd6eed639de30d4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/786040422666da11604af7280dd6eed639de30d4;
+    sha256 = "0na97fbmlgwl7kfp5asvj41llyrk6srn11argjq20vwrpzj9c0h4";
+  };
+  "788022e3bc41bf23e517d88df0ca24f715b1cad4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/788022e3bc41bf23e517d88df0ca24f715b1cad4;
+    sha256 = "1hhilba17whyl3iycd906nh0c4v9mia51pb8cgy7kqjiawypcp6k";
+  };
+  "788b132136ad4d08c5f03e4078824ec04b1ac0b9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2622232-9cbce5f5f69743598cf4bcb212040bd6/788b132136ad4d08c5f03e4078824ec04b1ac0b9;
+    sha256 = "1wf1kizj5s4nkkmyhc1xs1mqzzwc1b2vdybbnx3g7rn9p9rq3jgc";
+  };
+  "789b2bc3606dc2558b7cab5dbb62e8e76f20ef74" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/789b2bc3606dc2558b7cab5dbb62e8e76f20ef74;
+    sha256 = "10pzb9ylqbsls482sa1frmk7r8ra7b6y0fjb7x97v482pdskh64r";
+  };
+  "79042a16d0ef7feeccc76315246c5ee6f36dfafe" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/79042a16d0ef7feeccc76315246c5ee6f36dfafe;
+    sha256 = "1wn397vwkkakm5q0r2kk1axq3zxfrc1f65cbwqlixzfgpz8lybil";
+  };
+  "7927b5a5a5c57b3801e7d0d4a42fcb142f267b78" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2653252-2bb04ebcdd0e406596c1b14273fe0c06/7927b5a5a5c57b3801e7d0d4a42fcb142f267b78;
+    sha256 = "14w4h37fsmj9mjsfa53hc4ymx9j6b9dfia3n4gwkwmbw5sj8l9gp";
+  };
+  "792a616c0f78fa0b294f67b56549092efbbbeff6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/792a616c0f78fa0b294f67b56549092efbbbeff6;
+    sha256 = "1875sind4si5lwmbypjn3ssbdxn1w5a5wv61kllqw9a8iz76pc0x";
+  };
+  "79477f2a4147dd648f89b314306f5f0346278735" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/79477f2a4147dd648f89b314306f5f0346278735;
+    sha256 = "180qwmv30vf5fx724mn44l8p9j6ipaqqs83fsiwyaifa1zn4kaf8";
+  };
+  "796f0c398bb010288b3688e6743420cfb681a4b8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/796f0c398bb010288b3688e6743420cfb681a4b8;
+    sha256 = "07mj9nfb7ganiv6pc4yz30zsbfbhqpap2x21nrq93f7r75jckssw";
+  };
+  "7983882382ee0785a3619bfda754358f8d6cd5c9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/7983882382ee0785a3619bfda754358f8d6cd5c9;
+    sha256 = "0z3jwzxdmsdwx623fbhzp5jif0yv8v31br3ipbv6d3d8kv0cw90w";
+  };
+  "7996e8351b085aa99ee962c9a0abbbe9b077e23c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/7996e8351b085aa99ee962c9a0abbbe9b077e23c;
+    sha256 = "1wsg1f8y22m01m1x8ryxzbyqzgrk0v8wssvpzcdg95ld4n46z6ps";
+  };
+  "79cbc648416e750ee538d57d6b608e3b7bd7717d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/79cbc648416e750ee538d57d6b608e3b7bd7717d;
+    sha256 = "1z5ibq34jhlyszxxllfn1ffmp8b0y7w7cqmxridnq78b1zirsj65";
+  };
+  "7a02f98f23ebb4382454f2813a70cbb932fb9e13" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/7a02f98f23ebb4382454f2813a70cbb932fb9e13;
+    sha256 = "0k8ayk7rh6kkxf8bk9hqy4wa7zh1m5gzbxfds6cc0zd4kr150sqg";
+  };
+  "7a7d7497e9f19ef7a2e4e35a37308b21cec9f982" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/7a7d7497e9f19ef7a2e4e35a37308b21cec9f982;
+    sha256 = "0ba05lnjy3ghs3jy519pcjyav5r75lpall461qns2bppzpm4a076";
+  };
+  "7a8446207acdf4eaf9676898ddacf9bdbf595de9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7a8446207acdf4eaf9676898ddacf9bdbf595de9;
+    sha256 = "1lndbrl5sp0gj7fasrzsc2yz4vmcr8q29yvp8cva2b9691q8gj4i";
+  };
+  "7ac1ecd1bdbc99aa980807c5645a78ae48ea9577" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604998-3c15fbba3f5f4174942b1436c2db55e8/7ac1ecd1bdbc99aa980807c5645a78ae48ea9577;
+    sha256 = "04m1a8g9w4hyclfx1nc6prd02kicjdsnzg4spwk63rgv3lamjqd0";
+  };
+  "7ad6959d0c1c635355409e72473d108d90869dab" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/7ad6959d0c1c635355409e72473d108d90869dab;
+    sha256 = "19nr57sy463g1m2fbrdhpb8p5yd5dls64gw9zq2zb4jyjj7y8fia";
+  };
+  "7adad32ec30d0be94dcf1a19012e273b9971057e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/7adad32ec30d0be94dcf1a19012e273b9971057e;
+    sha256 = "13f8c98an8ycv27kglnc46jl6abgyvnq6dm8xpzzlh28fj88gbjk";
+  };
+  "7ae477712090513005fe5af06c6026b245d3c946" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/7ae477712090513005fe5af06c6026b245d3c946;
+    sha256 = "1w1ihg63ks2ba8x4m04yblbc7d8ycgbczsjz2lp28j5dy7b10i48";
+  };
+  "7b091ff0e3269cd3b11fb00a394f82b1604095c7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/7b091ff0e3269cd3b11fb00a394f82b1604095c7;
+    sha256 = "10cysl5b6iagx699w1kw5xfa51flr433g4wl55bjz9bdjw4ln51r";
+  };
+  "7b6219b2124e3663a1f4383de616fd63676c9693" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/7b6219b2124e3663a1f4383de616fd63676c9693;
+    sha256 = "0260b4p3ng5jdjb8z22cpp2376wahvh4gihjxcghlk3bal5k743c";
+  };
+  "7b7d2e469aa46e6b7a1550e355690591e4ac54fa" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7b7d2e469aa46e6b7a1550e355690591e4ac54fa;
+    sha256 = "1nyx2fjbcpdfrlbqb966x2zd1rbk7kx9x61knrfhhz7r5kb1z5bm";
+  };
+  "7b83af4328df75db5202d9e02c057d139ca1a9dc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/7b83af4328df75db5202d9e02c057d139ca1a9dc;
+    sha256 = "1igfygl9hk0q3ndjiji6bfgb4p77038bbk31kgrdy4gvky3qz21l";
+  };
+  "7ba89ad415dac138be18aeefe3423e3ebd56c0ee" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2448689-7792f1b8be254cc19b4c3379509684cc/7ba89ad415dac138be18aeefe3423e3ebd56c0ee;
+    sha256 = "10yn9d19andj61gj8x771yyrl2y7l0rgqg22mm53hkbdkfghml8h";
+  };
+  "7bc9f224a762158a310d9dd9c355f21bc20cf5fb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/7bc9f224a762158a310d9dd9c355f21bc20cf5fb;
+    sha256 = "1rxd81p9gd5rwqz9krv48bl5qzdqdb08xlc3ikn85mk847n6riyq";
+  };
+  "7bd4669f05c73f4cc2d165c712eeb0cca6711e7c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7bd4669f05c73f4cc2d165c712eeb0cca6711e7c;
+    sha256 = "1ps1j2vywaxxcprmxbyzi3nzvks9gxviqjcvha4wv8p4igm7p861";
+  };
+  "7be14b1c31f9c742d61528f894b5a0faafdca608" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7be14b1c31f9c742d61528f894b5a0faafdca608;
+    sha256 = "01snf2y4scl2vhbbmzs4hjayjp7hkydr7a2kbjgwc1kb41vcvvmg";
+  };
+  "7c8c84dac9bcec95152cac9aa9acac67f7702d08" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2639799-4ac82b5356a9467b8556f714f8dd9e00/7c8c84dac9bcec95152cac9aa9acac67f7702d08;
+    sha256 = "0w0ry83bxhw07l0y2zw3s1szx6gbhh2zbvwnjnd3qhjdic8abvzy";
+  };
+  "7c963542515f21d8db5b961bee100b6412d597d1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2377358-53c9e09a80d741708f589736e8974c22/7c963542515f21d8db5b961bee100b6412d597d1;
+    sha256 = "0y6186f5l3glsnnqv23npj6b1m23jxy18j6mg30g38g4lr2vk0ad";
+  };
+  "7cc355b9c369e318b838b18f749c24e2afd259c4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/7cc355b9c369e318b838b18f749c24e2afd259c4;
+    sha256 = "1jiz1n0wy6mqnv2m7v8mksrh3v6vwliqc8v6jjv7rxz1x4zclinz";
+  };
+  "7d8e31de63a57ce9a9e79c5263a63d5d46615baa" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/7d8e31de63a57ce9a9e79c5263a63d5d46615baa;
+    sha256 = "1iz5vbwxajss32yvjwdss1hfczp3viz8nfl9xsk35bh5q5az0mfx";
+  };
+  "7d9e9a2f89c7bbc7404f79811bf83f4076b5bc32" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/7d9e9a2f89c7bbc7404f79811bf83f4076b5bc32;
+    sha256 = "1p37wspipadj5qicv6bs3rg3vqiqx49jkd6q3pgkb40bp0gs70ld";
+  };
+  "7db350110118d3076728f890e80db47042b1c9c4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/7db350110118d3076728f890e80db47042b1c9c4;
+    sha256 = "1x5j73m7lvz6dacd7cl1g6x0206pmh394l650aidzmmywnmpni5y";
+  };
+  "7db51b6372a7e6ccd911890e40586056b5c3bf70" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/7db51b6372a7e6ccd911890e40586056b5c3bf70;
+    sha256 = "003dg3cglf6dbljyfdamahznka718qcpsfbkvsk1kbysa6nz0kcd";
+  };
+  "7dc9a4ae40e2c039f47bfa781f706c6ba93f5e77" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/7dc9a4ae40e2c039f47bfa781f706c6ba93f5e77;
+    sha256 = "11bjnjh99mdh9fqcrnddnhgjr1znlhi11rbqajc1wjwk4zrs7h51";
+  };
+  "7ddc7ee608268e6d717f879cf6b6b7305f636cd2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/7ddc7ee608268e6d717f879cf6b6b7305f636cd2;
+    sha256 = "16cz1bvq3za22myf04p2al6im72x6al6a2y5sv5mgz7nvnhi0q4d";
+  };
+  "7de52ed6339fe756210b171c838332e276370e70" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2619995-d5e097f793bd479d8592679759fb98be/7de52ed6339fe756210b171c838332e276370e70;
+    sha256 = "076p1hj2bjysj1yk45ywrahrz9d9k8q0cvw52g0141985g9av8fs";
+  };
+  "7df9510763997f0e8873568712dd0de573058bf3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/7df9510763997f0e8873568712dd0de573058bf3;
+    sha256 = "0iy45rddw5cq5w9qm6vd6lxjnf2b4hm4abnna0ay7qnmdkcxy0zp";
+  };
+  "7e1d5652590c12db0c440eac59f69a777425f9bf" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/7e1d5652590c12db0c440eac59f69a777425f9bf;
+    sha256 = "0j3f2saflmsylyi4i2w4z56kwzpdvimi9na49m3nfd16d5m50fnz";
+  };
+  "7e6ab4f547b9d8bf5f8a35a74d335d500588d8d9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2431986-5a8dd079cf514ebd8b20693fadfa5a4e/7e6ab4f547b9d8bf5f8a35a74d335d500588d8d9;
+    sha256 = "0m45dhadisgl1n32vbj71vhj1avn9mcl3gx7dsrgd5pyj2cm0v2v";
+  };
+  "7e741bb7378733b67fd4bf594a5798fdbbf4c06b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7e741bb7378733b67fd4bf594a5798fdbbf4c06b;
+    sha256 = "0090i1z4ggh0rjka4lk2nyh8vz6w5kbxrf5y8sb4lyhbggshypz4";
+  };
+  "7e74577c3774e9eb2328f96f667ae7df976b62e7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/7e74577c3774e9eb2328f96f667ae7df976b62e7;
+    sha256 = "03p73gsai1gzazyhi0s409d88b0vlnvap2dy5qas5xazhsj3s32v";
+  };
+  "7e929e26670125eb017b7f33f7906adcbf8cdbe9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/7e929e26670125eb017b7f33f7906adcbf8cdbe9;
+    sha256 = "04dx7sqs1s3h8msjfah395hjx4a2x51k0innh4np11zr0chw4rf0";
+  };
+  "7eab47f1da799465d08b68e26c7ae336a7b07a47" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/7eab47f1da799465d08b68e26c7ae336a7b07a47;
+    sha256 = "1nkgnvif8ysz26rwhxmr3kfk5xajr7z5nbbx4givpv16fmr67hp1";
+  };
+  "7f0b7231a2a6fd1df206769a4acb8cb861b09f02" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/7f0b7231a2a6fd1df206769a4acb8cb861b09f02;
+    sha256 = "0fbsqakyam8jacxw9kmifddmgilr1rlvcxp0dskvdlb31pfzzlx7";
+  };
+  "7f5b42e091a41c16eb4bfdfb2de3a36670854201" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/7f5b42e091a41c16eb4bfdfb2de3a36670854201;
+    sha256 = "1qbwixy33i07qcicgc2xra46nhb9jklal25pw0wrc0r7migxv9f9";
+  };
+  "7f8b724b75c6f29c33f33a1f310cb495e079aaa1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/7f8b724b75c6f29c33f33a1f310cb495e079aaa1;
+    sha256 = "0clv70849r47m9y7l5515xn9z2qn4vazkkpfpwdrgmbh8wjb0xnl";
+  };
+  "7fe64241b07105e31272f224ac763156f8b8296c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/7fe64241b07105e31272f224ac763156f8b8296c;
+    sha256 = "1h4b430rjv86bv4vcrj6hrza71b5hrrivllxn7an78yi7rigc761";
+  };
+  "801295549915c66473e6cd436dc1623ad50a6868" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/801295549915c66473e6cd436dc1623ad50a6868;
+    sha256 = "0d889wz1r7l3801gdcmdchnij3z3ch8adw0rn5rc613r3nz613hh";
+  };
+  "806cb366cb892bd749bb1e697026060f9943b794" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/806cb366cb892bd749bb1e697026060f9943b794;
+    sha256 = "0k470mdbdk4r7ryrm7b2m2mnmiwg9bqn6xrm9f426vj6409sh3bp";
+  };
+  "8083297580223f34923e3ed275ba2082cb6ff1b6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2639799-4ac82b5356a9467b8556f714f8dd9e00/8083297580223f34923e3ed275ba2082cb6ff1b6;
+    sha256 = "0rl4vw9nnarpbg9in4kj08yjran73yk821q03kggxjs9kd3m6p9a";
+  };
+  "80cd8c5c566432905a991761c25be7e43613ea68" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/80cd8c5c566432905a991761c25be7e43613ea68;
+    sha256 = "08d0cchndgs7z1m1iw78ri9b740z06daclbb1krnd9jbjbr72540";
+  };
+  "80cf2aada6b342c76be1c6617a893008f7a2e992" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/80cf2aada6b342c76be1c6617a893008f7a2e992;
+    sha256 = "1is1wl3m8l1gnfnhadnig3h4p3lg2dbrhx0j18zl01s5y5l5dz72";
+  };
+  "80fbbdd5d2b95966d99e270b260593880769871c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/80fbbdd5d2b95966d99e270b260593880769871c;
+    sha256 = "1dcag3ris9wpm0vfk296902arm6xph496gi13xr1lv2ic0ay4ajh";
+  };
+  "8113584b3d880586f19985a5103712b5251a347d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8113584b3d880586f19985a5103712b5251a347d;
+    sha256 = "0qgsp5kjlbzmp2v979wnc30isn10mv8w42riynpkia2waqq1yypf";
+  };
+  "81306b38538d7e69e278eb4d4a1acb25c2d44dfc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2505717-ca6614fe3fb64e47b28005ce3736302b/81306b38538d7e69e278eb4d4a1acb25c2d44dfc;
+    sha256 = "1b3hfip5h2ra2cj3c80v87fyn5g52kfl8hi7l9ynx6rbh45jd7cp";
+  };
+  "81594c92fcec0b95d7d0b47ad36aef8d2605c8b8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2466157-4ecb0085873048178dd6d2b8872eea79/81594c92fcec0b95d7d0b47ad36aef8d2605c8b8;
+    sha256 = "0cj2l82yi6yp8x2rsv5ga7cl5jrmnl7wv68608ymrdimnrg1l19j";
+  };
+  "815c7f4ed8653c23f02829438b553e4e310c1185" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/815c7f4ed8653c23f02829438b553e4e310c1185;
+    sha256 = "1bd8y1165dgw5naxwzh92plkx24v468fz8i0afaxk8cpqvjcn4b4";
+  };
+  "815ceaba7a67e678c4a7187990c7367805ed6d7c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/815ceaba7a67e678c4a7187990c7367805ed6d7c;
+    sha256 = "0zrlxcqp7arscfbjsffganmr8ykjy9kavkq6r0sjv33nf2wahcxw";
+  };
+  "81bce187e69fb02baaecaa20027bd477eb1f990b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/81bce187e69fb02baaecaa20027bd477eb1f990b;
+    sha256 = "1pmpm2dppzr71qvrfb8h5837mxgl654hiihymh2aw12bh1hl84dk";
+  };
+  "820a14581d58bc24e04e70e2d050e8568367b29f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/820a14581d58bc24e04e70e2d050e8568367b29f;
+    sha256 = "0h5kl259s20bv2y8k0pklvl5lpv4qc2y742nfyph04d8gh44i11r";
+  };
+  "823786b849304f4f046e804e4c7a9578b0e7dc4d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/823786b849304f4f046e804e4c7a9578b0e7dc4d;
+    sha256 = "1nxcnkv4p6m57rwr4wj4pz19z579sf9mqay6x64ddbnlc0d8ijfv";
+  };
+  "82752934d29486bef3008fe2e7e9953dacd3a238" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/82752934d29486bef3008fe2e7e9953dacd3a238;
+    sha256 = "0i7l4yw0qrp29ax36lp3sgyqbqshv5v0y2y4jp9g8b996rr42ypp";
+  };
+  "82896a288bed5637b5e537aff3c81d9a146cad8b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/82896a288bed5637b5e537aff3c81d9a146cad8b;
+    sha256 = "0g2nh96n0k2mv4fdaw6sqlav9diclhmljsixvfbp0550p44i3dhf";
+  };
+  "82921dd1135940696b085da4d09cdd25eb6b740d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/82921dd1135940696b085da4d09cdd25eb6b740d;
+    sha256 = "0i7yiz8d1qqiy7i6yy389b44v29i3zl479jarss0x77m7nzlpi7v";
+  };
+  "82b74cc467fe5e422dffc6ccdaa2746b68a52fde" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/82b74cc467fe5e422dffc6ccdaa2746b68a52fde;
+    sha256 = "057npy7g6dvcqkj4yw89cpci8cizg636gah9qq82h00684215jsj";
+  };
+  "82db6fcd53c153656a49118fc20771a50c406e2c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/82db6fcd53c153656a49118fc20771a50c406e2c;
+    sha256 = "0wmb1vn704srn9w5a61bs7mb3rp3azgv5bh6rl4hi7wa9wffwmbi";
+  };
+  "8305a66fae9404fe58331fbef287d0215d05f2b3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8305a66fae9404fe58331fbef287d0215d05f2b3;
+    sha256 = "196zwpsd8fz1s6gkd35psacb4v6bik4zjgbaqy6ff2118bg3l19y";
+  };
+  "83080f6144d571a9ef0996315476290d9c3fff68" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/83080f6144d571a9ef0996315476290d9c3fff68;
+    sha256 = "0rmk1xzs86dvr9k971mb3d5d9q0nbyxr6lh753pf5bqkjsrwirp8";
+  };
+  "83095c9481a4bebd25dad78e6ae747bd3674e086" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/83095c9481a4bebd25dad78e6ae747bd3674e086;
+    sha256 = "1r2p3xp0rv19i9dyrf0chc5n8f736d90w5paq90fdxvfzzzx562f";
+  };
+  "8309626bf9429a32adfd8e1526f7dcbfb250ca49" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2640065-e0e714c2e4584d65837eabf6f55a41ba/8309626bf9429a32adfd8e1526f7dcbfb250ca49;
+    sha256 = "02n8g65lp6zbqprxswz598076syxav2vy350yq2gvq6s2p1ad12y";
+  };
+  "831c19b0009bccd44d4c2837f3c8ba6e08753be0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2579917-73d6be760fd9486fbc9abe582732eb6e/831c19b0009bccd44d4c2837f3c8ba6e08753be0;
+    sha256 = "1b0gsmrzb0bh8mrjfmmxlp55867x5fhqm18wacqvzx2g62zmm0f3";
+  };
+  "8336cdf6f693aca7ab55371790ccf0bd5043c224" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/8336cdf6f693aca7ab55371790ccf0bd5043c224;
+    sha256 = "0bqsgbzhsd8dfjlfafs1yx833gwa8pm9jhgq72ymnk83kijhj01x";
+  };
+  "835db4359138adfe88490eae6e8d8c90b322dba7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/835db4359138adfe88490eae6e8d8c90b322dba7;
+    sha256 = "1wbs8pnhyyx84bb60ck5l18fljc37fma5131ijzmjqms84k34rqf";
+  };
+  "836ee88c57cc1b5617f36a2b9fb19db420285b69" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/836ee88c57cc1b5617f36a2b9fb19db420285b69;
+    sha256 = "1yiypr57ik8wpq2w7x5yqib411j2qphk6mnpgpraqydfc22qypca";
+  };
+  "83960dda908738b13095ce2b7d9b31fde2baf36a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/83960dda908738b13095ce2b7d9b31fde2baf36a;
+    sha256 = "0dld18rdn6yjmqzpy3fg36ih3dzr63jma237skjb2nz2d554nkvp";
+  };
+  "83b8a24a4c385e1b384d645d948485842fc3cc76" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2426077-b850b68463b841e5964d120c64b8bf13/83b8a24a4c385e1b384d645d948485842fc3cc76;
+    sha256 = "1z2a60b2h039a99ipx5gs299s5dbrmy23dgwpw4nrqksh0szzrhx";
+  };
+  "83c26e75614987b0816315db03de7aca670aae61" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/83c26e75614987b0816315db03de7aca670aae61;
+    sha256 = "0vsvf3yhc3gv4vcif0qlsakzmxdrziqjv575xpzbx421pk2sg809";
+  };
+  "83cf82ec1c25f57a747c78a0c0ee954463d3aaf8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/83cf82ec1c25f57a747c78a0c0ee954463d3aaf8;
+    sha256 = "180f440v26v4bmj6hbm162jj06vw9sd4kyvarnrazyiq4vmbx3wb";
+  };
+  "83d99abd11bcb8782d32661775471266e6254ae4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/83d99abd11bcb8782d32661775471266e6254ae4;
+    sha256 = "0h49cfl1ybxvxgg9p5jq0nb93rqjlqbjabhsjkdzhb4pv9gm1fcf";
+  };
+  "83da0ef16746ffdc1151ecbda04a0b161e3f119e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/83da0ef16746ffdc1151ecbda04a0b161e3f119e;
+    sha256 = "0d4bximz6dkr5q5bbyzlnl2py330qij4i0w5pvgc76asyxl11s3n";
+  };
+  "83dc459b2d9c7905eb6f80c6ffd7c0c912a4b007" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/83dc459b2d9c7905eb6f80c6ffd7c0c912a4b007;
+    sha256 = "1xshwv0v6bzkn2px64jy5kzbwsh9mqmc9salvqdhw7c594gi1lki";
+  };
+  "83e36792413d3e3b767aae667cc67fd3b02ee133" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/83e36792413d3e3b767aae667cc67fd3b02ee133;
+    sha256 = "1vpvk4r3bxrb54ibpjffrj3wg37zp44xf8mz9fk3cn4gz8v18g1n";
+  };
+  "83eae7ee8ccb30a23878582ea6466cd8487f17f3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/83eae7ee8ccb30a23878582ea6466cd8487f17f3;
+    sha256 = "1s011h62ql0w95lkwwa0pwk2x4d086apijgw0zgmh7cmlzknppvk";
+  };
+  "83fd339d2e91415631d3bbe960361fef5a8a1d1b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2738476-1eae05647f894f068d67ed64f86505f8/83fd339d2e91415631d3bbe960361fef5a8a1d1b;
+    sha256 = "06zcfs55vhpy9jh8330b1zrmsmf0j2f8w92kpxvgd8zi6xz5y9bs";
+  };
+  "841906d093cebbe152a1ae20fbab8decbd282e19" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/841906d093cebbe152a1ae20fbab8decbd282e19;
+    sha256 = "1zjl5jvq80cgr8lb03k687slrq9l336dryn2dwvwsrfc32rnpynl";
+  };
+  "841af4efd38ead50b821af773faa68345269e26f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/841af4efd38ead50b821af773faa68345269e26f;
+    sha256 = "0zrv8difxrfkkhhzni7qc91s1k30dwp6462c99iaxds8ly117p89";
+  };
+  "8460d3dfed9655b4e8ce53fc3cb879c8905b05f4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/8460d3dfed9655b4e8ce53fc3cb879c8905b05f4;
+    sha256 = "07cgvrc4yhakjs4p2sbkx5c3mch26krvvdx6ag0ijm85mx0gdl8l";
+  };
+  "8463cbaaa73774638635ddfac40864bed92f3c29" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/8463cbaaa73774638635ddfac40864bed92f3c29;
+    sha256 = "1si653ab54yh0fxfxh1wfwfzdq3v8wsxq2vzppl2l2wj96zc8cdr";
+  };
+  "848145830d667120c6b744edf11f9f6c7e2f8b7a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/848145830d667120c6b744edf11f9f6c7e2f8b7a;
+    sha256 = "0vvbpaksh7qdgiwcahdm9h9skp51qxiipzg3gdadam8v10a1g1xx";
+  };
+  "84a55e9bd6ceea8c4b1ef30457675290b8de8b27" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/84a55e9bd6ceea8c4b1ef30457675290b8de8b27;
+    sha256 = "16zjckcf8851kf9cnzij7mz6iwcvld7g7gxrs750gdp01i5wjpbn";
+  };
+  "84b6f854fbee939820a32e6dc3d2b219b84bd6a1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/84b6f854fbee939820a32e6dc3d2b219b84bd6a1;
+    sha256 = "1xd3hcs0nshn7c21kr1jhaskrslb6z91rp5rrlsq3pzclx740ssm";
+  };
+  "85317d647433d1e73e61ca6fe79b44f9b3abca42" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/85317d647433d1e73e61ca6fe79b44f9b3abca42;
+    sha256 = "0ix9vagi91lpqgn224qfxb4h1wvjc6jf3yz5zx4asv6c1bdx7x8l";
+  };
+  "85393f1f0730c3ae240238686b47d7643899d34d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/85393f1f0730c3ae240238686b47d7643899d34d;
+    sha256 = "0yy91726kxdpifa3pfhf987m1yya025q6ybh8c3650i0h9z2hzsw";
+  };
+  "853b10bea00eac17238cb14c6b39474e5d2d1518" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/853b10bea00eac17238cb14c6b39474e5d2d1518;
+    sha256 = "0lhld9bb134mphx4g83abrxf9syz5dx2hmjm701dnx7dsayfl5i9";
+  };
+  "858f8eae96cc6e3a7d1fc624e44ef972c47011b1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/858f8eae96cc6e3a7d1fc624e44ef972c47011b1;
+    sha256 = "0j9h3ysp390psxrc3g71029qsfy21j9jlyqqxgdsns465q0fb031";
+  };
+  "85b191ae1844ad6da93fa57876c8850de342b4ca" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/85b191ae1844ad6da93fa57876c8850de342b4ca;
+    sha256 = "0v5i8fznarbq8zdgi9kvg8hl8kb2293vfj6504a3km1my7frww96";
+  };
+  "85ba3d3276f5f01cc86df8c39d7cd730ed3b9a4d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/85ba3d3276f5f01cc86df8c39d7cd730ed3b9a4d;
+    sha256 = "1i53nv4v3wyy8vpgaglj865d8krmfd2yc8my9wq2yyyyiq9zvr3y";
+  };
+  "85ead6085f10e657e1a91326f3704d60b31164b3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/85ead6085f10e657e1a91326f3704d60b31164b3;
+    sha256 = "1xqzxrys82qxihz27s1p811gqhhswqjalzgdfafk490diah527ss";
+  };
+  "85f7ee1e6e05e198cbb99f56c5a3a9d81b41276c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2605823-fed77bb1e455453286ca4bfc444c86ac/85f7ee1e6e05e198cbb99f56c5a3a9d81b41276c;
+    sha256 = "03qfjg299d6dx0xzgm822js1mwqs8n9v8hvw9mjc883y77piasgb";
+  };
+  "864bfa01d63681c131168385b66aa9d3e6b7e23b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/864bfa01d63681c131168385b66aa9d3e6b7e23b;
+    sha256 = "0lfc8a5f5skbdx263jh5m55fqnslva2pkx3yvifnzsgf396872bk";
+  };
+  "86a3ef300ab5182d7d6f3c7e1dec1ab017621176" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/86a3ef300ab5182d7d6f3c7e1dec1ab017621176;
+    sha256 = "1b8a7pm5bxf6gcrrx8d4ld19qgck19gd2nhp01dyjm7vqc8cl201";
+  };
+  "86ad290cb6e4e954f3e8ad5203151d7614279554" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2515854-a6b06d306d9743a78268eae33a3084ae/86ad290cb6e4e954f3e8ad5203151d7614279554;
+    sha256 = "1spwcj4yb5hc94m0f2hx13yfjrzsvkhcvgbmlj10ak9bvpkyx96m";
+  };
+  "86c299a2f4f573039b2558718ba45d95ff08ade1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/86c299a2f4f573039b2558718ba45d95ff08ade1;
+    sha256 = "18qmy1kl7x4jvyj0d9rsyiaq9gszjpx2v0983vbgdqszbgics4ax";
+  };
+  "86cf1c73f3f607e472fa7ae7be4709c191878044" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2605596-b0ea63cedf984da9bdd8cabc290cfcc0/86cf1c73f3f607e472fa7ae7be4709c191878044;
+    sha256 = "0avis11c8p42c28k8pdvfns3m397mraj21kk2bnbaw9hmv5difzv";
+  };
+  "86fca9c30e8dbd28a791714c1385aea7dc583091" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/86fca9c30e8dbd28a791714c1385aea7dc583091;
+    sha256 = "1a91dlqcfrqck0q5285cljzdr9zi14g5dgbzy9772gabc49c01fq";
+  };
+  "8741e3f2519f1221c2f8bdb966cfa4504f3ba5a7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/8741e3f2519f1221c2f8bdb966cfa4504f3ba5a7;
+    sha256 = "028fhjrjcqnrjqx9i0v17mib24l20pd1bcpl8sc1bipa8yc0lk81";
+  };
+  "87758c549dbc2d3ff96e0ee0b82d6d99f20c0ab1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/87758c549dbc2d3ff96e0ee0b82d6d99f20c0ab1;
+    sha256 = "1jl52dabxi8rqhfadkwwrq68yiqxfvc2n82f9qvmc6viydjdrmpz";
+  };
+  "87925181e3a8b737757401a6114a8acf82625a49" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/87925181e3a8b737757401a6114a8acf82625a49;
+    sha256 = "1xkykqs3fzvkwf7hm0qxrbhjx1cibyns81cm4lcpad2b4f4a29nd";
+  };
+  "879da85ee7839263b362a6d69f41f3d4477d2263" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/879da85ee7839263b362a6d69f41f3d4477d2263;
+    sha256 = "1d89w13vkl8wjp0x22fsnz9yf7ln4jiadb3mfxfzykix884jr79w";
+  };
+  "8817e4ce5e9049b3ef1374d0f56fa509fa491f73" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8817e4ce5e9049b3ef1374d0f56fa509fa491f73;
+    sha256 = "1ip08vk00921qgz5q70v60zsykyapjjxg7hghn2lbw54ylfy755r";
+  };
+  "88192934143593f3b9bdf82185f4ac7a7373da7b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/88192934143593f3b9bdf82185f4ac7a7373da7b;
+    sha256 = "0p4y1fi48k2jh288d2axriffynn4w824ngh0vfcd1wlrf988gcvp";
+  };
+  "883890e30ce2c617da8433831db3b480780ce910" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/883890e30ce2c617da8433831db3b480780ce910;
+    sha256 = "04knac1hybywc9rmd7cq11scg8hc3qn4yszf7hbak6z807j0abd0";
+  };
+  "885b477d70802077c49ab7c32a784bacd55ad24b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/885b477d70802077c49ab7c32a784bacd55ad24b;
+    sha256 = "0acf1z7q9wyvshacv9mfgc55kkl1fa4c7a3gv94jmk0jccmf6lkd";
+  };
+  "888feb5c0fbff7928f650be69fab3ac123ebaa26" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/888feb5c0fbff7928f650be69fab3ac123ebaa26;
+    sha256 = "1rj3434znf64z0cgi0dwx3pz5dhziqgm7gpcrx5ag2chkzixl7b0";
+  };
+  "88ea146643258d378d159b9f928c783774ea9c53" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/88ea146643258d378d159b9f928c783774ea9c53;
+    sha256 = "1wh8zfcswfp5ms94lgvl8yn0qjkbrznh95wln2hi9civ7594j3zs";
+  };
+  "88fb7a15bfd879a0c14ff7a16e321cc2b8896c38" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/88fb7a15bfd879a0c14ff7a16e321cc2b8896c38;
+    sha256 = "107xs4qhzjn2305hd84cbp2xnymba6sr8axd5snwwa9dzl39yaaz";
+  };
+  "8901801fb587b12a9aa6263540cdd95b46710f9c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8901801fb587b12a9aa6263540cdd95b46710f9c;
+    sha256 = "1msg49v9hyvfy5ms00lyq9x322qwvw6akzpz1v6kylrakri8nwvr";
+  };
+  "8906ef4c42cb5d492b620e5d8dc2118dd976ea12" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/8906ef4c42cb5d492b620e5d8dc2118dd976ea12;
+    sha256 = "1xibvx905vvfvs0cdyjqbjy7wb3pvimzazd9ii5rwyvci6gj1vb8";
+  };
+  "89080b8cfede13b245eaadefec0b89e901ff8646" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/89080b8cfede13b245eaadefec0b89e901ff8646;
+    sha256 = "1103qvaxr40xq97p20x8zfv32hkz3nnv53lc8624qkjyhnqwni8c";
+  };
+  "890adf51623c1e158f5c9f34db7f7f686e7005b7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/890adf51623c1e158f5c9f34db7f7f686e7005b7;
+    sha256 = "00cb7r13zpgiw9x0ahiimx915ynikicv4ixlxgxrfyfvqvkb2w7b";
+  };
+  "890f859d20731989f0ce0e2ccc89da28cf0f8dbe" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/890f859d20731989f0ce0e2ccc89da28cf0f8dbe;
+    sha256 = "1sfsps751hwql9akgqvsxvbfp0hzzlgcxg4pf9wzv0fmsm5zk910";
+  };
+  "89550f66a2a48a9f1b9089703e9b33eb14a23ae5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/89550f66a2a48a9f1b9089703e9b33eb14a23ae5;
+    sha256 = "16bbs2r4i3bl6i0qp7snlifjh9s3gy33pdfjjpvnv0357wzama9g";
+  };
+  "89a680846da64558e5147c08cdce03270f11e7a4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/89a680846da64558e5147c08cdce03270f11e7a4;
+    sha256 = "119sjc3c9nqc1g8jij70kaa2rj2q4q6nd8dm4m4xmk32l9vf98rg";
+  };
+  "89be40342b7a93b0b11a6d495aa56ff3b8aebdbe" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/89be40342b7a93b0b11a6d495aa56ff3b8aebdbe;
+    sha256 = "0lbq80772si922f6s3qahsx89hdyzvd8351j2pqr019pnasgpic6";
+  };
+  "89cf6e0f862a93ef9e543780d100517db3f3327b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2605642-f320d1a5ef22435181fcba597b91c63e/89cf6e0f862a93ef9e543780d100517db3f3327b;
+    sha256 = "0b5p8gphgwx322ddyizq83mlwx318m8ndw8b6d10pvh6kfzf5ry8";
+  };
+  "89d28cf4154268be0856af7d9417e5f4018f65b9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/89d28cf4154268be0856af7d9417e5f4018f65b9;
+    sha256 = "1mksxkj5hx9wbnswb3dal0qqijlnrcrxprc7ashz0cgs8svhvkj2";
+  };
+  "89e79ac4565d509ccc57badb152f9d534469f4e6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/89e79ac4565d509ccc57badb152f9d534469f4e6;
+    sha256 = "1vinxn36cb93zpri4zk8jxhbjnb11drb13fw7dxvjbivqdzakahl";
+  };
+  "8a1ff4c3dc8b96b41c8fca1325ddf964f3768446" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8a1ff4c3dc8b96b41c8fca1325ddf964f3768446;
+    sha256 = "06gan1mbhj26z6flw0p1mw2qijv0nc8hpxl5q9dvwdmv5j1s937z";
+  };
+  "8a251169614945698a2c1990c0898641d380b289" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/8a251169614945698a2c1990c0898641d380b289;
+    sha256 = "1bd15y5ka1pzmj0y0i19w5r4pvgx36py84sfq097gvsbffx3ik56";
+  };
+  "8a7c6b0f9cc883870556fb456f20715ed40367c5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/8a7c6b0f9cc883870556fb456f20715ed40367c5;
+    sha256 = "1gd8mxmr9874577fzyhl5cl6rrx0sl4g8c7j8is3jp97zcng853g";
+  };
+  "8a933dd63dadc44c26fb7afa83573b5ab52aaf33" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8a933dd63dadc44c26fb7afa83573b5ab52aaf33;
+    sha256 = "19fjz78gjlp50xq490wfvkjzpay9rrf78jnv0x0gs6kpnyd56x35";
+  };
+  "8abd833e1a283680a6e19d7896cda23b4f559012" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8abd833e1a283680a6e19d7896cda23b4f559012;
+    sha256 = "0xq3c1hcmlki59g6y36zpfq6pm6cryg88sy364rayihlzgbc2dra";
+  };
+  "8ad5dea631af368fec9f5f42b6f235997a8131e9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/8ad5dea631af368fec9f5f42b6f235997a8131e9;
+    sha256 = "1hwnldwf0g7k34wg19yvzfz6939qc9kw9758fq7dsi0737cxykqc";
+  };
+  "8ad8c126595c03e31b971166788c82bdc9cf0544" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8ad8c126595c03e31b971166788c82bdc9cf0544;
+    sha256 = "17vvcdpba4mijzlpi97xx7d022knpdw918npwq40vcmswmn758vg";
+  };
+  "8ae41d0c7d8fe2a00251726554c48ce1dec9ca04" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8ae41d0c7d8fe2a00251726554c48ce1dec9ca04;
+    sha256 = "04dmv62qlczyj67rrfjnm790ksbpfwdgzl05zgqgi9lyrrsq3m8c";
+  };
+  "8af47f724bed2b5bd921d98f1d04d577d07ad781" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/8af47f724bed2b5bd921d98f1d04d577d07ad781;
+    sha256 = "0jy4dvz4fdf50283w6mcycq1hd7rvc3nawv9zylvb0pgxs6bvlnm";
+  };
+  "8b025a64e2081e1caa1c37427ec0e6194ec0275a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2517611-d0c4506b0eb74bb5b22fcaa18bed9682/8b025a64e2081e1caa1c37427ec0e6194ec0275a;
+    sha256 = "1pm6inqkiqwjf1yjc38ncky6ibm22ha1pj9r84mpwxc1c7f9js6x";
+  };
+  "8b0519b8991a39be23e66177b1f881b62f967cb0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/8b0519b8991a39be23e66177b1f881b62f967cb0;
+    sha256 = "1x5zmgn9h2hxnjsrip75mvj8qs5q5mws8zb72v6rlw8iy7hjf8vh";
+  };
+  "8b3162447aae7621530652ee14ce8da1c287d6b0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8b3162447aae7621530652ee14ce8da1c287d6b0;
+    sha256 = "0r2377k0a3jjn73x5fn1g4ppnjdywzkfxgdf801wk06zdkn41gpk";
+  };
+  "8b8340f444f8bcbe6806d7f4b2a6d3894354baf5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8b8340f444f8bcbe6806d7f4b2a6d3894354baf5;
+    sha256 = "0yqm3ib77952dsydjvw5dmw7fw94iny0zj1y4kkl8wpbcj414kk0";
+  };
+  "8bb26a65444fea08370321879198f39f86ba188c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/8bb26a65444fea08370321879198f39f86ba188c;
+    sha256 = "09912hlzrsgd7pickg9kgrc4rag393h1xkxybm5vnr3iyhd20wk7";
+  };
+  "8bcf71af2f119d1ff9d3b09fe4ddcb08fc1a7d95" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2700683-67efb93bd15f484599a98be1ae830afc/8bcf71af2f119d1ff9d3b09fe4ddcb08fc1a7d95;
+    sha256 = "1zs71smgc45hh3sr3f22l98ch9k5f1z6hppx0dbs2lgg2s8bgkfn";
+  };
+  "8bdaed33beb2fa505dd0ba8f7d9ca94208ec44a9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/8bdaed33beb2fa505dd0ba8f7d9ca94208ec44a9;
+    sha256 = "09x8k8apm7kly0kb04ladywwzyy90nzjvnd6hh476ir9mss1mjj0";
+  };
+  "8c062ee2e53c0fdeef88071aad2ed5ca1787cc1e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8c062ee2e53c0fdeef88071aad2ed5ca1787cc1e;
+    sha256 = "1ymf1zl36xfsc0wmipsps3l90jx04qgz8ri7hmwpy4831hc7r594";
+  };
+  "8c220042a37dc4cc1b8b05afb13afadab972b12d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/8c220042a37dc4cc1b8b05afb13afadab972b12d;
+    sha256 = "1hjg7wwfb217dansimncjya4ll7lsxshi0yvnyi2f2f9bm7jijd9";
+  };
+  "8c9f2e92d67f683596da321c8af36ece1d8ac774" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8c9f2e92d67f683596da321c8af36ece1d8ac774;
+    sha256 = "0hiq4c2w47msrn5fiqggb7gf6fn59rk708xxl92jid8wa4h6xipa";
+  };
+  "8ca8fc4f81c127e4c748fcb899af430506bd0b01" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/8ca8fc4f81c127e4c748fcb899af430506bd0b01;
+    sha256 = "0y551cnm9r4jm05iqiwi8ysglkny6c78mwxrmxssabknlh0v15vv";
+  };
+  "8cd8b767b771e6d10c8f1f0b54ab812881f22fcd" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604000-fac6782aa4fd45888363b062a8353761/8cd8b767b771e6d10c8f1f0b54ab812881f22fcd;
+    sha256 = "1wp04cwi17h2y01is0wvv02nhcn8nyb1f8c28hcm7dqswyw738j5";
+  };
+  "8d5fa95a3df6eb36318fcf2a135f464a76257cc5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8d5fa95a3df6eb36318fcf2a135f464a76257cc5;
+    sha256 = "0axx62bip7rfrm0gbvdszdx1ik4mhxqxvi4ybmlbfhf2c1b26grg";
+  };
+  "8d8a695159bf666e16ab7b3558bb1d5e4e3b4698" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/8d8a695159bf666e16ab7b3558bb1d5e4e3b4698;
+    sha256 = "07c4p0dsl575zxamvvwh12hin7qnhk9lcd4aivnbbmrlhlrb23cf";
+  };
+  "8da60707e5826860752528702f9a7256a5d2ef81" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8da60707e5826860752528702f9a7256a5d2ef81;
+    sha256 = "1701n4r1713crfxkaa0n2id346j1mf5nfg93givnr3c2qqlqz5yq";
+  };
+  "8db9bb91759363ec605c3d44273194136ce7dc1f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/8db9bb91759363ec605c3d44273194136ce7dc1f;
+    sha256 = "06xajy55psab26x65cvxyji5bm4cxyh4qb1kcg9a9qpfjip7wfjg";
+  };
+  "8dbbbdecc05ee43425e31b4f4eafb33b90db30ac" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8dbbbdecc05ee43425e31b4f4eafb33b90db30ac;
+    sha256 = "1zch7l01gxhwwkm4i9a9dwa577rrp37vr6nkn1mkhakrjfirfams";
+  };
+  "8dd3bfc182e5277d4408943dba3520659e2928f4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8dd3bfc182e5277d4408943dba3520659e2928f4;
+    sha256 = "02f3h1lsn8vkrixyb1lx1cbwffvby3i74ym71a05higvhw61mxaj";
+  };
+  "8ddadc13864ca20375d4b0f4ea443c123c3df3b7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/8ddadc13864ca20375d4b0f4ea443c123c3df3b7;
+    sha256 = "10vbj0h5k6s3ka3dqzfwz796cpx1ic5dxbaipcwyc45k2vj6ni4x";
+  };
+  "8e039420fc01a77f694997d93310f9ae83f1b6cb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/8e039420fc01a77f694997d93310f9ae83f1b6cb;
+    sha256 = "0jpxci1p47inn5qyp0jjh69ja0s7m5k07jhqvkpyvhy7pgdk0m56";
+  };
+  "8ec6e7ee9b649b9774e5429add4c5058fe492fd1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/8ec6e7ee9b649b9774e5429add4c5058fe492fd1;
+    sha256 = "1b29i8b6fh4siq5h8s48d97s0az2761l77z8vzykb4h0psxpzmy1";
+  };
+  "8f4c0d2091f953f5c7ea8154eaa6e6d04add923a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/8f4c0d2091f953f5c7ea8154eaa6e6d04add923a;
+    sha256 = "0sc09156h0vjc6jc67q1sp0khpzzkkvy9c8bh62rg7rbzlldlgiv";
+  };
+  "8f92c27e6fe54071ccf92649c25ae44991ea42c8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/8f92c27e6fe54071ccf92649c25ae44991ea42c8;
+    sha256 = "1ndfkv2zcamf377pbg67f257c4rqxh7ri06r4x2xqc4a5q0s60zl";
+  };
+  "8fb54a6908a0bea0b6a901eb32dd120dd2360fe2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2611810-c0cf8ef9a734410da79e56e1df15e175/8fb54a6908a0bea0b6a901eb32dd120dd2360fe2;
+    sha256 = "07dgqsshhamlgi79884dllr4253yr29ni84dhnrcfn540vpxbs5k";
+  };
+  "8fbbdcccea26e1c7cbd56a84637ec3564aec691b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/8fbbdcccea26e1c7cbd56a84637ec3564aec691b;
+    sha256 = "1vnpb1d239wp1nyrvwiv57rr7qwr2rplws6zcxfnl3rxmmfhkman";
+  };
+  "8fc77c86e05ff31bec85d8974938b0b5aa12fd1a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/8fc77c86e05ff31bec85d8974938b0b5aa12fd1a;
+    sha256 = "1v92ggrafax000jrdc6yhysyr8mridvdcss8zjc8ib5bwism9sdm";
+  };
+  "8ff23362f6d2fe2b1e7f422a3f52c13797ef128e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/8ff23362f6d2fe2b1e7f422a3f52c13797ef128e;
+    sha256 = "0faigq1s7yjji1khqm2g5bi6fm6217lm7lk5gy61ddwxqz1jkf6k";
+  };
+  "901760156bc3f4720396fcb487ad396709e18d9b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/901760156bc3f4720396fcb487ad396709e18d9b;
+    sha256 = "0sgp780bfy2gri238s8fsnbh7vbdrg5mdxla39j15nllfr1ybxfj";
+  };
+  "904a3b18b20eee856202f89aa46a20df12388dc1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/904a3b18b20eee856202f89aa46a20df12388dc1;
+    sha256 = "0ncm73g11s6x5lp5pz5b4xm2kfn7254hp4nzdfxwd841l96b4b7s";
+  };
+  "90874ee4cf89c6b1658479cf16716dd6d9f3391f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/90874ee4cf89c6b1658479cf16716dd6d9f3391f;
+    sha256 = "0hjrsp0jq1qgm9v31kdh7l67z9w54415a9f73lznsb1zmw1phz22";
+  };
+  "90d2bac8a115eb18639fab5f7840138c63cf9b8d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/90d2bac8a115eb18639fab5f7840138c63cf9b8d;
+    sha256 = "0ifayjg539ki273zzxx7b5jpjzdy50pyvb8d2a3r84216anww3qn";
+  };
+  "91475080ede727f0185da20abde65457b43d5476" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/91475080ede727f0185da20abde65457b43d5476;
+    sha256 = "0z6ql3zfvpiay87g3h14pfv5dyjx6d4r7n7ks0pvx829yb2h0n4c";
+  };
+  "9148d7be7b0930b397ef995a2e8cfdc6c7e2617f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/9148d7be7b0930b397ef995a2e8cfdc6c7e2617f;
+    sha256 = "13cw8rzvf6rm9dvj1d7q86l5r3bs4q23z588yd6imlvpf2pp7f5m";
+  };
+  "914d43c1dd28877dfe0d8b3b2fe4dca1ea17a575" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/914d43c1dd28877dfe0d8b3b2fe4dca1ea17a575;
+    sha256 = "1m7y3m9b1vvvvdw05g6hcs2hv9jh0947l9gjhr5zdj9adqf3aa72";
+  };
+  "9157e95d94d3ff3b40e3e507ef12528e8574f8d7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9157e95d94d3ff3b40e3e507ef12528e8574f8d7;
+    sha256 = "0n825h58ygdqv93naavg0xm7p3ncxlyzp2c89dlfzzq4cs7mnvaz";
+  };
+  "91639ede60c084c481daea6546adf05ba88aeb17" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2618867-a941974a307a4d11a35487de88a65fbe/91639ede60c084c481daea6546adf05ba88aeb17;
+    sha256 = "0r2s4k616aj3y5q4cc6wmg1im4sd9qbi477kk4av2yxf1db078vg";
+  };
+  "919773af16fc549ebf79e9b9629c8d0c79d37927" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/919773af16fc549ebf79e9b9629c8d0c79d37927;
+    sha256 = "01xmmimdnzywvlnp3j9417iszkqmprjsb07gkh2rb6pqbabbjh3g";
+  };
+  "919cacfafb5826d92667b345276a3637499d8eac" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/919cacfafb5826d92667b345276a3637499d8eac;
+    sha256 = "00yyly9c0ggpl793mkzsa8dlbsh4drdagdhhv8vwdkldq666jizy";
+  };
+  "91eb46476dcb659fc2275fc18c2061796b561bed" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/91eb46476dcb659fc2275fc18c2061796b561bed;
+    sha256 = "020wajrnlvqk2c4pjpxf7562acryacxk1535fib0f6250wjhmh8r";
+  };
+  "91f1332208a164cfc7739215d515dc4574548eb4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/91f1332208a164cfc7739215d515dc4574548eb4;
+    sha256 = "1mxhnjf7vda1cxny35rw3ib4kp9i3h09a5lv0r70pazqj1ir23zi";
+  };
+  "91f5cdeaacc7b2be3fe926cfc1b9d3a054e143f2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/91f5cdeaacc7b2be3fe926cfc1b9d3a054e143f2;
+    sha256 = "0cvqrr7wvlgyvhh5bz61laigv9dy7ra65hdszi3sg467zy35b1dy";
+  };
+  "920bbd06b0082189854b0b43390a039f451bf843" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604998-3c15fbba3f5f4174942b1436c2db55e8/920bbd06b0082189854b0b43390a039f451bf843;
+    sha256 = "0r4wh2iswm4w1zgnjbmw8x4jpgd9zr2c1azy2nvgwg2rcja73adw";
+  };
+  "922b2bdba29589b9fa7f0b9dd3668e5703e9c88c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/922b2bdba29589b9fa7f0b9dd3668e5703e9c88c;
+    sha256 = "1af3n4b4h1yd92y4w660kslpz0nkvpsvinfs3p9l5yv1jfrz2lxi";
+  };
+  "9230b9bb873b7a7cfc1fd2410d1749427c7c3499" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/9230b9bb873b7a7cfc1fd2410d1749427c7c3499;
+    sha256 = "0c6c6rahp2x4n5vahs2csgx8gyzgqzajvzwx0dii1p44crb4cc2h";
+  };
+  "9241f4cc15ce04da3b203bb3ef60aa2a71cb19c4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9241f4cc15ce04da3b203bb3ef60aa2a71cb19c4;
+    sha256 = "0v7xa1wzsd2rif4dikbm7dzzzw2k7c70vr6rp7l0wv3d978p9fr1";
+  };
+  "925f53a8ddf5e922520fc19cf6a17b00419817e7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/925f53a8ddf5e922520fc19cf6a17b00419817e7;
+    sha256 = "0p4l1r57w29bkir2k9y3pl50ycr5q3436ldrrm0dzzqb8ag5bkfd";
+  };
+  "926540c5a0b84439444ce2305aa3737763bb95a3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/926540c5a0b84439444ce2305aa3737763bb95a3;
+    sha256 = "1m1bsgri6xi5ijpyhpybrir760qrqy2hmwrsbifw0j5yxwxlvyrz";
+  };
+  "9285328e0b04faaf9fdc22bd27b76ef259020492" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9285328e0b04faaf9fdc22bd27b76ef259020492;
+    sha256 = "0c2jz4pjf5f62ga9nlac4m3q92n9wgccjcwbyvr2scangawjh7sq";
+  };
+  "92abcde8582abb2913e4531cf3ea720b0e8c7d33" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/92abcde8582abb2913e4531cf3ea720b0e8c7d33;
+    sha256 = "1h66p5sp1j2l1jm4d6pjg34ng9k0d1796mns38gkcily554v4v6n";
+  };
+  "93423a9a78f3eaad42d062f8d2ff25e901ff455d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/93423a9a78f3eaad42d062f8d2ff25e901ff455d;
+    sha256 = "1hc5hwd0pazkcscicn8dpyyy9dc0aysbz9z95fwjfqsz1l7hg9k2";
+  };
+  "935837a33fa46d5ef7713fd4a123c61845ce49e5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/935837a33fa46d5ef7713fd4a123c61845ce49e5;
+    sha256 = "01dchcyd4z8a6vhk2j071a5rw3hv529cz5fhjkasplfqvl1dri7y";
+  };
+  "937a8d559bb1eaa790bd343ce8439885289660ad" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/937a8d559bb1eaa790bd343ce8439885289660ad;
+    sha256 = "17050dmx7pmsvxv4agmphln7xcy5bq058pmi47pqwlsf2njqskgm";
+  };
+  "93992b5277a20ed987f224c8f23f713677e0e25a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2546088-6cf476c573f0461594db3f64f59ec9cc/93992b5277a20ed987f224c8f23f713677e0e25a;
+    sha256 = "0v60rm9bh086p2agj0hl924lhmzsdbk6akycra97vvjf8riaznmd";
+  };
+  "93d5d44b151da63343cd4f052e5efab5039f13f8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/93d5d44b151da63343cd4f052e5efab5039f13f8;
+    sha256 = "0zq57rg4pw8ly7vr8wjshq5zjp93n4zgzzjqkwgh1lz542w8jrli";
+  };
+  "9402187f503c2f391c471ecb84988e49b0cac918" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2603097-3140b87e2cb94286beb08198353da9a9/9402187f503c2f391c471ecb84988e49b0cac918;
+    sha256 = "0qvxgvjr3fk8v4i5fcsz8vlxzw07hdyy0q94psngzjpvp0f9943d";
+  };
+  "941fcfee8a4d9b5b95af5e64593a01405ed864b8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2605823-fed77bb1e455453286ca4bfc444c86ac/941fcfee8a4d9b5b95af5e64593a01405ed864b8;
+    sha256 = "0ipyq7ycmysav0p4n285w49394nxrq4nqqpdmlmd6gcjppv2hsd2";
+  };
+  "9480aeff10931a3129abfc074e9d75dc46fb60b1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9480aeff10931a3129abfc074e9d75dc46fb60b1;
+    sha256 = "1mjpiaf4jh4fh8bld18gh97bnwhflyqyqb8zmawngbd0f686jhr6";
+  };
+  "948831f2786e73219fac5ebfe8a92939c3ea637f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/948831f2786e73219fac5ebfe8a92939c3ea637f;
+    sha256 = "0z6gh9j67d0as8x8v62n07w5xj2gj6x6k2pgynx01jp6z6k9x4dz";
+  };
+  "94ab4be561c4e5ce07253ce94aa3794090a44428" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/94ab4be561c4e5ce07253ce94aa3794090a44428;
+    sha256 = "0j0nwdwk46yskmmgx3y84wcr50ak801zdfj4mxwlai3bvb04f38n";
+  };
+  "94b9d86dc4aef7c178c2f9b2cd5360412b13b2df" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/94b9d86dc4aef7c178c2f9b2cd5360412b13b2df;
+    sha256 = "0fmkvvqy0v4wsd58hqlgrcpvm4a4qsrasfy5fy5h5b7j8z5q3vcl";
+  };
+  "94cfed4a88c4801ef537b65413db4cc3326b0a89" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/94cfed4a88c4801ef537b65413db4cc3326b0a89;
+    sha256 = "0smaxw3d54i6yymcil00mkdc5mp5yw95p18gc65sx0ir0yycviyc";
+  };
+  "954237c72446f3cdf8886043123658ca943e6a89" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/954237c72446f3cdf8886043123658ca943e6a89;
+    sha256 = "11rrbx70dmjyd97sk964lzjbpcyjg07zjfjnvn25z6v9bv3a49xb";
+  };
+  "957337ec86f032a91c82dfc2f859843e3a1c1e88" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/957337ec86f032a91c82dfc2f859843e3a1c1e88;
+    sha256 = "0gz05g4nh8645h4zdvrhmkpw9m3jlddk8ggd2h203h4zx51l3aav";
+  };
+  "95b668ea9989cc5ca54f2f7db9aafc7ae8277fb8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/95b668ea9989cc5ca54f2f7db9aafc7ae8277fb8;
+    sha256 = "1rprhq2rjgd5s4r8jn5f5nz6w20yckr79sh9mwmsfkx7zxkwda1b";
+  };
+  "95e4d7dc9cb01e3491442f9370e98e0d6361f556" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/95e4d7dc9cb01e3491442f9370e98e0d6361f556;
+    sha256 = "0w86a2dcdm4r0yqdy1ibdrmgmnb122znhacx9cz7jm2bsjb81nh6";
+  };
+  "95f7b61131b0b7361bd6b788845382016a65618d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/95f7b61131b0b7361bd6b788845382016a65618d;
+    sha256 = "1li07rkzvnasm9qc4qza2y6vyw7xhx33wmjzqbc2gwmawxjpl6an";
+  };
+  "960e4509e3bf35c6ecf5e52ebd53c18379354b18" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2634249-f2b4469cf0774eac818e7cb4565f1224/960e4509e3bf35c6ecf5e52ebd53c18379354b18;
+    sha256 = "16y0ffz0kn1k723xmr4vmna8giqsl6pqgp83a7w1hp8slmg1z1xs";
+  };
+  "960f838a00eaece74604333768e1901f77dc91e7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2597177-394deee1ae174b2db1462326aa83252a/960f838a00eaece74604333768e1901f77dc91e7;
+    sha256 = "08v86w4b8jx5af5agv2cyhxwc3a3w9xzr69lfvdljms51991qmkv";
+  };
+  "963f0fd12da9d6cf7d35a71dce090f7d5271d802" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/963f0fd12da9d6cf7d35a71dce090f7d5271d802;
+    sha256 = "133mrcxjpqhrffjbhiviwn91h3x5csqpk1fhhzlmc0spyf9bnswa";
+  };
+  "96421d48a3164d2d4259c4c9500dfbf44d9b90fb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2483157-ef88c8fb9abd408b8fe496d060749077/96421d48a3164d2d4259c4c9500dfbf44d9b90fb;
+    sha256 = "0kvplc4pwnjv7j240d2bcggwibrws3afamx6wh32lap5pps67d81";
+  };
+  "9653a9d2aef2e0fff14e4e16ca9058b38f172dd0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9653a9d2aef2e0fff14e4e16ca9058b38f172dd0;
+    sha256 = "0d2z11fpnvx15yncyf840n7ww4vaaypyn4r7cg2ddscg8llp7056";
+  };
+  "9690133f46e7a766b46b38365897102baf062020" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/9690133f46e7a766b46b38365897102baf062020;
+    sha256 = "1jim7i5ih76c4wjm06y75iqw9ldcmc5wr0gs5vichdhgdj1y0ay6";
+  };
+  "96a0e755dc47a57b85791e7d748fe25e7258173e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/96a0e755dc47a57b85791e7d748fe25e7258173e;
+    sha256 = "1ibam8hh271ci3fp18baiw3jsll89i1w1q8z87gmi7y5qdasar02";
+  };
+  "96e618ee3726b5d13ee509923aeff0bb6272498c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/96e618ee3726b5d13ee509923aeff0bb6272498c;
+    sha256 = "13xa397xfya40cypwl20j332bp0rcljyj66z8vwdc10vxwwrdqv1";
+  };
+  "96ec8bc282d262d4764767c1478400c10994bf5e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/96ec8bc282d262d4764767c1478400c10994bf5e;
+    sha256 = "00x67b5sd3230k6q08z8n0ad95ia3fxzk0mssz6lmbi0zqqsvvbl";
+  };
+  "973fb0c29b2e3a44d2d370a545ef1a38a81ed07f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/973fb0c29b2e3a44d2d370a545ef1a38a81ed07f;
+    sha256 = "1n7kvxc135za5a2lzmrp18kpyka2gc2dynr30fpn1m1lfa09985b";
+  };
+  "97772a52cd613920ec0a84f0c8b57d0c8e88b1b6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/97772a52cd613920ec0a84f0c8b57d0c8e88b1b6;
+    sha256 = "1l262n4qq78fbvgrd6qilmp70rx4x5ciw444nw6qdjvbxag2va6g";
+  };
+  "9788909a70709303adf419bf0340b73ab037600b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9788909a70709303adf419bf0340b73ab037600b;
+    sha256 = "1vw1a4nlwq6arcddbfiid9lmkfv8ylaakpggzb706hgr9jj1qi7h";
+  };
+  "980f3e90adc8557d71bfbef57bc146374612493f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/980f3e90adc8557d71bfbef57bc146374612493f;
+    sha256 = "1xvybmljiw3p3rwy91fi1dk7fmcpdys8b1c13yw4sij7ym0dqjkf";
+  };
+  "9851cf052473a71589aa7577f62e6b82f0298832" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/9851cf052473a71589aa7577f62e6b82f0298832;
+    sha256 = "0kd2bcr3n9l3qjxjij06gm0rgv5dhvrq3mdv6sqwmv3f28q1r8bq";
+  };
+  "985271d1e9b876cc6b98ce871d8efed7b2b3cbeb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/985271d1e9b876cc6b98ce871d8efed7b2b3cbeb;
+    sha256 = "1mh8jr05wk2wg1830bv1yq30ifxngjrb8nnilw2hwl1g6dmss3g9";
+  };
+  "985fcff275609870f5fa9ace4a4e31fcdef7eb1f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/985fcff275609870f5fa9ace4a4e31fcdef7eb1f;
+    sha256 = "03jw2kr34vxh4rpjq58rq00h0vv7mlbi3pc63aq6914yqwzvv36v";
+  };
+  "986472c357451eab93419161f5ccadfefcbdb41e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/986472c357451eab93419161f5ccadfefcbdb41e;
+    sha256 = "05arp7raj4ins0azci930klihg54zmj2b0ykhmnp91z6mdqw3nx0";
+  };
+  "98bce6b328014cb7a038cf71a5c84a03c88f3b63" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2605596-b0ea63cedf984da9bdd8cabc290cfcc0/98bce6b328014cb7a038cf71a5c84a03c88f3b63;
+    sha256 = "1b50jfk9cz2x13378pbyd8lcg0m9jahhjwc1a9zfg68y6pf08rbm";
+  };
+  "98d4e369b78b0733da5369ef5d9a3d0821224bd8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/98d4e369b78b0733da5369ef5d9a3d0821224bd8;
+    sha256 = "1mdsmf24lwsbybjy687lsqhifg0d1za7vc6vaggba2x4gbb2rh2s";
+  };
+  "98dd7a062fbe1436797395825aec70ab45a9e01f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/98dd7a062fbe1436797395825aec70ab45a9e01f;
+    sha256 = "05xrlniqxkkw7c08r8m5ph88pmwsz1jbp0y437nrh4lz7z8xk6i8";
+  };
+  "98eaec4f30d9a8b65a6d9865fe0b1e5b7df1e740" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/98eaec4f30d9a8b65a6d9865fe0b1e5b7df1e740;
+    sha256 = "0kkzj77y0n39diqyfzx29rdi47ayg0f5cr6yi2syyimbq9i8vmb2";
+  };
+  "98f6aead047382d81ea82cfcf7d678c3d279b6ad" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/98f6aead047382d81ea82cfcf7d678c3d279b6ad;
+    sha256 = "0n6v34qn2v5cvqgzv1agp68hllcm9qjdl6928llln8mx56byr1y4";
+  };
+  "9905967a7ecb273ea4c135e170605bb12051e395" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/9905967a7ecb273ea4c135e170605bb12051e395;
+    sha256 = "1yn3gqiqdbbmxn1yn36d0cyf7cb8c74r0kq586fa9kyfq1kp6hcj";
+  };
+  "99408ec397e6f41cef3cc1118a42007c42240b73" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2483157-ef88c8fb9abd408b8fe496d060749077/99408ec397e6f41cef3cc1118a42007c42240b73;
+    sha256 = "07cx908z756kf2b7cbihipabh21zln8d58jaj0vh11fi7znwln7q";
+  };
+  "9960c14a54da2eea43d72be9aefeeb85b8cd4e7c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9960c14a54da2eea43d72be9aefeeb85b8cd4e7c;
+    sha256 = "1wslww24dria8ka5d6a6by0ix81yg74783b2l8k59afjry3d4gn7";
+  };
+  "9974452a9032d4ef1911e1347776b088bf0f03df" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2579446-f2ba68e6c4fe40608f55a21e4d359a29/9974452a9032d4ef1911e1347776b088bf0f03df;
+    sha256 = "1kvgca25l2bbp416cqqw7ghrjq9mmwgy33qhbmkd665kyi3xcx02";
+  };
+  "998f25b9ce65d4cd484598d5f49cfdb023205ace" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/998f25b9ce65d4cd484598d5f49cfdb023205ace;
+    sha256 = "11m90pb307bpkd1cplzjavhbz76j8ywfwc1lrdp4zl5yb42avj7p";
+  };
+  "99985696491968b007dbff31cfeb9439637ad92d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/99985696491968b007dbff31cfeb9439637ad92d;
+    sha256 = "1n1rgz44hairjjvjc3937pin9rhxxa44sssi87z82965kbhqwmq3";
+  };
+  "9a10248ffa6ef2de0ff39750b0126e7d0b1557b6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9a10248ffa6ef2de0ff39750b0126e7d0b1557b6;
+    sha256 = "1j4m3dg8l69iyxhy9gz915rinaas4a5mflj9a70lwciq01py9fad";
+  };
+  "9a27b682ddf08347ffdd2673c005febde327223b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/9a27b682ddf08347ffdd2673c005febde327223b;
+    sha256 = "050ywwrsm40br2mnqckg3jrgc2q31j8xf4h0za2l5ih2h3vq2ymn";
+  };
+  "9a6f36fd2204a5938bfaa23310ac94f3eac70d91" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/9a6f36fd2204a5938bfaa23310ac94f3eac70d91;
+    sha256 = "0ybib9bi9lfdxfb9ql3jip9fbfglzczyp8r9fsycfbwin33nqn6s";
+  };
+  "9a709e39d73f4dd05adc8a171c9e771ca1facd83" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9a709e39d73f4dd05adc8a171c9e771ca1facd83;
+    sha256 = "1qrv0r9srbrqqwzw96ndirkn54my1ypyinsd1vdfvrwd19amwdpa";
+  };
+  "9abf05827a71d1c0a15a65473fe44db0a9c8676b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9abf05827a71d1c0a15a65473fe44db0a9c8676b;
+    sha256 = "0x3kjyy72v9hx55bfj5yy5bhzip3i7fkpd0q6kgqi408wvz8345j";
+  };
+  "9ace33ad3d9ba29d499d254c077206230291f79a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9ace33ad3d9ba29d499d254c077206230291f79a;
+    sha256 = "0jw0d0ck3p5h727apyp7190dm21q2mvf4kcipbaaa0rwdkynq70b";
+  };
+  "9ad3062b35efb39cfe52f02269e5e28c03df86f5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9ad3062b35efb39cfe52f02269e5e28c03df86f5;
+    sha256 = "16lg92frzz8jqnvdw2r9w6a3fjlgvmndr7m1jlhq66k034d7jwia";
+  };
+  "9aec8735040beb57da24cffa27ef5d254408275f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9aec8735040beb57da24cffa27ef5d254408275f;
+    sha256 = "1qgbkjhvhrsy7iy0r0gvs41m88har7i8m3ys03y5lrbmdazgb3q9";
+  };
+  "9b2025a39ed5dc7d0f745fd5f484fa5bd2f9b319" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2514423-e0ca01e1f08b4e2480fb868bca2e338b/9b2025a39ed5dc7d0f745fd5f484fa5bd2f9b319;
+    sha256 = "1jnlw9ifq8iyfvz8yn2jigfdq5qmhviy48vh461kfpx3isl1wvq3";
+  };
+  "9b367562030fc7238553c6aebec57181c96d88fa" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9b367562030fc7238553c6aebec57181c96d88fa;
+    sha256 = "1jdr332ks1d1gqi9ygxdmjyr3lingzzb1pdgrnxkg7jbl9i7y4l7";
+  };
+  "9b622139c6c9738ed9a9c4bca74a20d18bea5a75" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2700727-ab54589e54a547ecb0e365d946b4351f/9b622139c6c9738ed9a9c4bca74a20d18bea5a75;
+    sha256 = "11i6g22ncsjn50yq3fmhv2mm6inxw6zhi0zznv0y7gwdyjrisasy";
+  };
+  "9b6f3a80dd242ad667ee7c33f54385d4fa791086" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/9b6f3a80dd242ad667ee7c33f54385d4fa791086;
+    sha256 = "0lb42d3a79q1k35jfa3b1c1z8n774nxkcr918cp9bay4saifvfzw";
+  };
+  "9b85c2fa156837a820c7e7ae27d2ade465850441" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9b85c2fa156837a820c7e7ae27d2ade465850441;
+    sha256 = "1klwhr444j1pqn44fnjyq2nvlaiaib04n0dwykx181bz2nkjqdqv";
+  };
+  "9b8fbaeb9433a52f4f65397b66bc6da378e067b7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9b8fbaeb9433a52f4f65397b66bc6da378e067b7;
+    sha256 = "1l4x5r8ghf70ddfyz1q6wpqlhrc10l41h33gmfhkjwm45fkvkxdh";
+  };
+  "9b97586a3c9bf005cab1870015b75587e39f94da" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/9b97586a3c9bf005cab1870015b75587e39f94da;
+    sha256 = "0a2nw9ibdv51n2b7a9x0jnx8cqxilknm79x210pr3h8p3fjdzlb7";
+  };
+  "9bb171f0382c86c213e8f4d3ffafe1e676490b21" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2718426-3062c3938efa4be7b8cd7493e66818c4/9bb171f0382c86c213e8f4d3ffafe1e676490b21;
+    sha256 = "1hgfyfwn19k47y6garrdfy4jlhis0mi1h7zfnab8x43w7pqjgjpv";
+  };
+  "9bb63a05f1dd1d7171eeb8018c29c90d81773605" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/9bb63a05f1dd1d7171eeb8018c29c90d81773605;
+    sha256 = "18cfpjnyamzwnrmz4i06iwir58dx6657gy4i8jgk8ga736j31vxr";
+  };
+  "9bdd5448dfc6229ba9d0261514a078236c882986" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/9bdd5448dfc6229ba9d0261514a078236c882986;
+    sha256 = "129pclb41yip44m87pr8l1rhdajhgnzcarh84j5w2kgqqmma9h8r";
+  };
+  "9be02ac4f895d7559b0cba2d4b65f8ffb5626236" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/9be02ac4f895d7559b0cba2d4b65f8ffb5626236;
+    sha256 = "0dh8vcf5dm36j4pjyc7m0i9f4947mk3r91ldbj6mhxfi90c6sn0j";
+  };
+  "9bfa76eaf50a585e99981b54ef5628fd89b397e7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2499980-1bec026979484bddb8aa39afef8358b9/9bfa76eaf50a585e99981b54ef5628fd89b397e7;
+    sha256 = "0rmv4ibakmvpllmq5cs1ihfkpvy1brkn8l42kmls66zlz478115l";
+  };
+  "9c2836065510901f9ba07928e4c7e319dd33b670" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/9c2836065510901f9ba07928e4c7e319dd33b670;
+    sha256 = "1b6igbp0mn78hvjgg33xyi6v7gd7nqvl3f4hgq5wfr8dzghx5gky";
+  };
+  "9c2b99ebfed2e931067e8842161b2811d04206eb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9c2b99ebfed2e931067e8842161b2811d04206eb;
+    sha256 = "0j0p40hjbc1v0ld3halwhic0573n1z58sgpy112rqb1m667q87q6";
+  };
+  "9c45f6155855d24fbb8f12e7a40895df1e55b205" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9c45f6155855d24fbb8f12e7a40895df1e55b205;
+    sha256 = "08rpzwbnxwpk5gvybxv7q0s9k25gn8vcm77k7s69r5wva0p8hl9r";
+  };
+  "9c46b9b756ef22a0a9aad7d5efcf7e670cf46b3c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9c46b9b756ef22a0a9aad7d5efcf7e670cf46b3c;
+    sha256 = "17jc44fj6vs0kqxk568vn6vjapyc1r7k9b88pc5l96m53bdkn7cm";
+  };
+  "9c8dc173e3087266551343fc43db0a118e573cd5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/9c8dc173e3087266551343fc43db0a118e573cd5;
+    sha256 = "1np5grzkj4cib5mzwxksqh3crbfllwgsk3ss7jz03s5hgh8jk2fa";
+  };
+  "9cb4e1d5ca0e7935f8d937f678a9245ca0a8baf1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9cb4e1d5ca0e7935f8d937f678a9245ca0a8baf1;
+    sha256 = "0wpqjvls8rdi6g47w8xzs71ynfg1aiw7jw1g160wxk11qvn17rid";
+  };
+  "9cdfcaa36a081486e8c591d1b0de339f20e19712" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9cdfcaa36a081486e8c591d1b0de339f20e19712;
+    sha256 = "0y7h2ass8kgfabkvdwr3jcdi4znc6mcg4zklvw4yr3420d5h16x3";
+  };
+  "9cf547b1a8d0349c6997827cf3b1c76934a8f7e1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2714108-1287c19490104fa7a8ca7bc71daf7ae8/9cf547b1a8d0349c6997827cf3b1c76934a8f7e1;
+    sha256 = "1hh19pkjsnhjcsd8vj7d8l5nlk01iyp4kxf5hn2ymf0j1df0xns0";
+  };
+  "9d0629861bfc4948fc177763e87dc1ea3ac042ba" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/9d0629861bfc4948fc177763e87dc1ea3ac042ba;
+    sha256 = "0bal97q5lyz4s5z39jnxbabhll2agydcdw3mx0sikwr666aa8hac";
+  };
+  "9d238c0aed4cd73464dbba5fbf034030858fe441" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/9d238c0aed4cd73464dbba5fbf034030858fe441;
+    sha256 = "1n3fj5dsc4b9i8jwb1nzlnk1vbjnzlva3ljwkd16z8xfcdq3aqjd";
+  };
+  "9d2a8629491c47d32fd852ad683ba3be0f91dca2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9d2a8629491c47d32fd852ad683ba3be0f91dca2;
+    sha256 = "0csiwyx12frg2bzyp72is2h6fi2vv961byc23k30p0yz22cybr6c";
+  };
+  "9d4088ad171c93938ed41b2c224a98da2eb8e600" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9d4088ad171c93938ed41b2c224a98da2eb8e600;
+    sha256 = "02z4578c3939zq6m6l9ckjf0kiyf9biq98yqb6dmp93lanr9sahc";
+  };
+  "9d48d62d8894986890f0f871523b546e25618a96" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9d48d62d8894986890f0f871523b546e25618a96;
+    sha256 = "12j6p2l09n1yv388h0ynxl0p1bply6217600ix7d8mpm4jjri9sa";
+  };
+  "9d6293584ce78fd938acc5ddf91597dead7b8ff0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/9d6293584ce78fd938acc5ddf91597dead7b8ff0;
+    sha256 = "1qxm6h3nl2aawl9z04gn1kzlaiaajccyh0b9gr85d6x8x2dwxjpg";
+  };
+  "9d8150632d85b43bd2be46924eb71dd19d5b444b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9d8150632d85b43bd2be46924eb71dd19d5b444b;
+    sha256 = "14yw0xbyg1rq18xyfydfy3z0gnvkzr27f2vscsgiw1xmps0fsa6h";
+  };
+  "9d835adb6f30382cec8e1701c61f3a305fe5ebe5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/9d835adb6f30382cec8e1701c61f3a305fe5ebe5;
+    sha256 = "0vq311bgcj0zcicb05l5d1pl5jw1vqbblfzmzk3h6nf0hgn2db24";
+  };
+  "9d8f4ef5363610f4b47829299c0824147fa3c486" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9d8f4ef5363610f4b47829299c0824147fa3c486;
+    sha256 = "0p5kp49clxg0ws3l3dslff5j54gi11bdpbsks2nh9081pfddla5z";
+  };
+  "9da60f5683310aa2ed53d90b2a9a246879223099" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9da60f5683310aa2ed53d90b2a9a246879223099;
+    sha256 = "0zgiz6m2g1i5884izczyigh42bfw0xbkvf1r6jmavays26r83lb5";
+  };
+  "9dd86d52ca2bc2688244bec708a9054313d175c5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9dd86d52ca2bc2688244bec708a9054313d175c5;
+    sha256 = "0viis6zccnxasxwfbi34xpqf4rnzr0w439qsskx7mbhg3zi8p0hz";
+  };
+  "9ddf004692c477b60fed575d57551fabdb00997c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9ddf004692c477b60fed575d57551fabdb00997c;
+    sha256 = "1ij1pdln5llxl6cxsiz6kbfzsgqmk901mrgbzsdki3ibs75dzr1m";
+  };
+  "9de93e74f384195b52fb90f9e7767ece5fd84570" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9de93e74f384195b52fb90f9e7767ece5fd84570;
+    sha256 = "1mj2syhcxq5qg23li9rh3814wiws421yasjw83j7b63yvpqbnyvl";
+  };
+  "9ded54d67930bcf5c3e95a10d2176c6106f2a3f8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/9ded54d67930bcf5c3e95a10d2176c6106f2a3f8;
+    sha256 = "0csk1i20kwp4rd1j6lci9v4wmc9jx3ji1i1m051iik0dy0553z3p";
+  };
+  "9e3075eea5e5e885d9aa9e6b2952ebe61a8b60a1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/9e3075eea5e5e885d9aa9e6b2952ebe61a8b60a1;
+    sha256 = "10gxi4n3k6fjsigv12603xsjp097b09bl6lli308xngjkiz55syp";
+  };
+  "9e397995b47d5acc37d38c9fa4935abec922ba48" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/9e397995b47d5acc37d38c9fa4935abec922ba48;
+    sha256 = "0cqayf9ag0snn0fab83fz3l5fqbjhllv86ik3vzx09zmg4i0d7n5";
+  };
+  "9e728c35e842f7af53a3e822acd469326d7cd52f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2677283-a70890a1537c42869136794b62c332a4/9e728c35e842f7af53a3e822acd469326d7cd52f;
+    sha256 = "1brpgrvcshwcrignfc257zg2jchav13kaz94n06i6i4fvd4la6ix";
+  };
+  "9e804a449e34aea4d5227c2a0cb3d96352a82de2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2621793-1958bfdd4e3b49f3a0ca6a4c08a60a0a/9e804a449e34aea4d5227c2a0cb3d96352a82de2;
+    sha256 = "1rfn257jpdl61g0qf92lqybhj9j81gxq7h8igb7x5kwswa74c7ws";
+  };
+  "9e9a678ef5fe8d87a10fc7621ae8dd3c501e6236" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9e9a678ef5fe8d87a10fc7621ae8dd3c501e6236;
+    sha256 = "1mijmzfvnxnii8z805a5hnhbiwwh3j16p8i7i0rhrmvkw5gnd68r";
+  };
+  "9ef14ed15fba71337b14c1e33972d9cd36fa9278" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9ef14ed15fba71337b14c1e33972d9cd36fa9278;
+    sha256 = "157dz7i640q6scfpzqjw24i8qwlwjvrbdxqi60sx9hgkax1xw0n7";
+  };
+  "9ef93659a347d11fc1e9478c37043a0236e34ba5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/9ef93659a347d11fc1e9478c37043a0236e34ba5;
+    sha256 = "0qn4vd5pyjrsaa75n5avy0ri1s71nwnnkgn66qcdc2x5fckq6p3j";
+  };
+  "9f07f59f3c436bdfae1916ca914e86d02a7239eb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/9f07f59f3c436bdfae1916ca914e86d02a7239eb;
+    sha256 = "14qyjvd23zqc5dhv15z8sp9yl324fsfzy9p7x2nl35x14j667l8j";
+  };
+  "9f3ea83f4797ad2eb48a62d176d4849ab3b11b4e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/9f3ea83f4797ad2eb48a62d176d4849ab3b11b4e;
+    sha256 = "1fiah07i0wyvya8dwnlkfyq6csg9f0yly1x51j9s6jazy45xffrb";
+  };
+  "9f67c39f021b4b42e5fa8aec0f0be533c8341cac" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/9f67c39f021b4b42e5fa8aec0f0be533c8341cac;
+    sha256 = "0p4a43z84i8qjpnpich9rdxg0gsycblmif3slsad8ydabj094vkp";
+  };
+  "9fb4a9e94f7c935385fd64a3d3c2f58144e7118a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/9fb4a9e94f7c935385fd64a3d3c2f58144e7118a;
+    sha256 = "03hyf8kladlf5hwc1rija042pqcyzlbmla0c3pysrla33h4ca5qc";
+  };
+  "9fc2d2e4632111eca96621a257b4547fddf03746" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/9fc2d2e4632111eca96621a257b4547fddf03746;
+    sha256 = "0bmg6jvpwq02azazsh98mdh0x716lxslqai6g2b8icwxxi84p20s";
+  };
+  "a003e87a1243a65a9d38ce8666ba05cf9dff34df" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2634249-f2b4469cf0774eac818e7cb4565f1224/a003e87a1243a65a9d38ce8666ba05cf9dff34df;
+    sha256 = "08cbncxgcr83mld0qv6zc6mzjc00jjx8za0ii2v8r7a5jhr7hcr7";
+  };
+  "a00af92cb7dfede2f60df7468c841462cd3ef7bd" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a00af92cb7dfede2f60df7468c841462cd3ef7bd;
+    sha256 = "13arcphd636ahrdbxlxwb6yrximqgm9ixl745yqp83aihk2wwls1";
+  };
+  "a037040fb7bcc432add0b7d65dc1d3b078b6f143" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a037040fb7bcc432add0b7d65dc1d3b078b6f143;
+    sha256 = "1jjcbw831yijkabzavbi4vmw3ba8vk248dnaqsjm5gkcajgwagxp";
+  };
+  "a04dbee3efc3178e3a175b2fb572cc36210ba9ce" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2599079-89300969452d4a5eaefe1ab4af976839/a04dbee3efc3178e3a175b2fb572cc36210ba9ce;
+    sha256 = "0xwqk4czfy62r9dh5yyan4kggijy5hgvbq084zbz3fc53cxrj3kc";
+  };
+  "a05558cf2d18454f06cd9c1a5b610a654ec0294d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a05558cf2d18454f06cd9c1a5b610a654ec0294d;
+    sha256 = "0m9pngd6gnndqbww5xnwcfdf1gnkyipccixi6w4msps20s2bbkfr";
+  };
+  "a056afc246a9cdce5d7321930c97ccf0b9f19f15" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/a056afc246a9cdce5d7321930c97ccf0b9f19f15;
+    sha256 = "1y41y758jn47y9zy46f0inxlzl0h8wrdj4fm9937ypd2fyfw6nmg";
+  };
+  "a09bd78594e737689115679ea7f6a09ed557d18e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a09bd78594e737689115679ea7f6a09ed557d18e;
+    sha256 = "1b1kivdj0qz5cr5igqmzbcyrmhbygvdavmfrqlqlrs1775411b7x";
+  };
+  "a0d83db11d6b2a64fdb82cc496d07a03ccaa142f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a0d83db11d6b2a64fdb82cc496d07a03ccaa142f;
+    sha256 = "1qqrpmmdc0zg13x6qvjzi6zk6wvq0khiml4ksrhbn60si3gr8li0";
+  };
+  "a0de04466a75125d3528739deb44e12686e7a970" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a0de04466a75125d3528739deb44e12686e7a970;
+    sha256 = "1k6ivx8bi63yivbw36lrpz8sv8gc2gzslb6pq2hq19jacl4v7xwy";
+  };
+  "a0f7010e4bf1452ec48d287d971a48198a78da69" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a0f7010e4bf1452ec48d287d971a48198a78da69;
+    sha256 = "06s4hiwd7vr3n18p5pg34h1irzvq575n2pw9l2sskz6fj82m2fv8";
+  };
+  "a12df808dfee07a06515eabdd6c1b0124a7385d0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2619995-d5e097f793bd479d8592679759fb98be/a12df808dfee07a06515eabdd6c1b0124a7385d0;
+    sha256 = "1xnjwnfzaja205cm6c54nc53m3nbjfqk28ggi7h2rxg9cdjcv59y";
+  };
+  "a1820034a04f046e5f0c74444f653ee4869647c6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/a1820034a04f046e5f0c74444f653ee4869647c6;
+    sha256 = "1mi6z4s5wz9j4y097b27xp9038nar7nn2gmc1x7yaw97kh2z76n8";
+  };
+  "a18cebf9d16dc2e5a99da03353e404d64bce3ae6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/a18cebf9d16dc2e5a99da03353e404d64bce3ae6;
+    sha256 = "1g0arlnn0f4zhhj9lwmj3mjlwjwvj0gw8m8fbr2jw6rylmfag4av";
+  };
+  "a1c1fcef149d29408d496f35628d18dd9bd2e6df" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a1c1fcef149d29408d496f35628d18dd9bd2e6df;
+    sha256 = "1b66dsbjjvz4gm7vm4vaapykhv7ni2y5rkycbfahzcigi5kasf57";
+  };
+  "a1f9df46b4e95588043a59820ba65fc28a8eea7f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a1f9df46b4e95588043a59820ba65fc28a8eea7f;
+    sha256 = "0fbzj0bkkbm7rxdi6lva7g2qhgqmj4y2mhg72z1iw842bikr4l2f";
+  };
+  "a1fc05440064b28d5deb42b383bf1960ca27cb3b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/a1fc05440064b28d5deb42b383bf1960ca27cb3b;
+    sha256 = "1b0xagh5f596ww8g6yng6frrvkrs8vrhzzbnl59ab1cpbq3xn7dw";
+  };
+  "a21a78f021d580176e09c67d0643b83e80ca2744" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/a21a78f021d580176e09c67d0643b83e80ca2744;
+    sha256 = "1xjclk357lm9rydmhzvznq8rd4yysr2jzh5y1bvrbpvxpx4hc3if";
+  };
+  "a243a00aa61675be8ae46cdba7db99c8e8195984" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/a243a00aa61675be8ae46cdba7db99c8e8195984;
+    sha256 = "1lvmwf0ajkjsdz68n22dhiihddv4ric0nch46ixvqg8di50fanj2";
+  };
+  "a24d76c382036592b023a22d61abbe88d52cb526" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a24d76c382036592b023a22d61abbe88d52cb526;
+    sha256 = "0brdmg3xp6jgfhralw483pkyvgd305g3m4bcqcpg9vazsrwawypm";
+  };
+  "a2587b8104dccd8347dc49a52bb5643842856a16" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a2587b8104dccd8347dc49a52bb5643842856a16;
+    sha256 = "0j8pwamzj2icivglw0ylpvbx76c0xyys79l049l7lpirp95y0hb0";
+  };
+  "a260cd8d85a752caa55d8857af979f5ae8a68d97" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2597174-0975f975d1f0463f931b68ea4b0ef6d0/a260cd8d85a752caa55d8857af979f5ae8a68d97;
+    sha256 = "19fijnc4j8pr726j3v3c0x35k8mnswk8jfjjzmgxdn6s95c6q9pm";
+  };
+  "a2731fbc3c50dde19f92ac5706a3b73a2fb50c05" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2761703-4d21a69f627145d58d1b542fa90eeb3e/a2731fbc3c50dde19f92ac5706a3b73a2fb50c05;
+    sha256 = "1adi6x27znln5qqkcl1x281csw27v5xd981n0az5wxqxfpssxriq";
+  };
+  "a2b0d085248240cde57087bc35816b078511c856" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a2b0d085248240cde57087bc35816b078511c856;
+    sha256 = "0ksv63yssyqhphll4glyrizrsylkk2p82l2n653sw0jjrrbp5m20";
+  };
+  "a2b1b97c80248fb89a7ce7322cc399a4fdf3173c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a2b1b97c80248fb89a7ce7322cc399a4fdf3173c;
+    sha256 = "1908grxgwb9sy4rd02jzc4zyi543dkxhynx0wkc0imfw4x2l9ixa";
+  };
+  "a2ce002a2a6a420e4c746eae8f553665e409a116" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/a2ce002a2a6a420e4c746eae8f553665e409a116;
+    sha256 = "021q59y3gi3f6ygddr736l75japm8zky3lz21z4bzik7kmirxq98";
+  };
+  "a2d4c282439a7d50a9b7005e9c3feb136cc093e8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/a2d4c282439a7d50a9b7005e9c3feb136cc093e8;
+    sha256 = "1wbn5yxpmfq5r20j9h27kpyc1v66a78dil39b83cpp4j7jkv687c";
+  };
+  "a333e2129a0a7518d47d81753d193ceecc5b881a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a333e2129a0a7518d47d81753d193ceecc5b881a;
+    sha256 = "1ih9hbcsslfslb9wr1i5f2vk9746zczygn54lac2m108kf6y0jk4";
+  };
+  "a353e5dd34009fcbd0a5f9eced792d02ffd2cb97" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2710757-d76358e2c5474af8a7d14e3262b517a4/a353e5dd34009fcbd0a5f9eced792d02ffd2cb97;
+    sha256 = "1wf8zzpyp45c9bq2zwfcy5j33yj2gzf73zbfqcppxz89knyakic7";
+  };
+  "a36932c96e52dc3b154313d65c128fc6efa79367" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a36932c96e52dc3b154313d65c128fc6efa79367;
+    sha256 = "1j2qd8j6sp3vj2rm8cxbli2d0l741i786widws427bddp1ma805y";
+  };
+  "a37744cecf38c8c2ca371eb33120654f8a53b5a3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/a37744cecf38c8c2ca371eb33120654f8a53b5a3;
+    sha256 = "1gi17xrvy9hl31z1bsxdq6awy93hllizvc4hbdc74xmpxdgnnqkx";
+  };
+  "a3891b8c154921b18b27b3c7915a8bab0b886565" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/a3891b8c154921b18b27b3c7915a8bab0b886565;
+    sha256 = "1ak3n4yyxpj34v9cjlglgpy0q292xrh7363p26xbkln39il8h51w";
+  };
+  "a3ea753b468f54a0a4c306c03130572f0ec0eee4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/a3ea753b468f54a0a4c306c03130572f0ec0eee4;
+    sha256 = "0fc6xv7d20c1nvzvw8dc1mwh1c51447y9fgl6z93c6xabvijc2q5";
+  };
+  "a3edc07dfea80da6d7d09067737fc4630c4bb81a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/a3edc07dfea80da6d7d09067737fc4630c4bb81a;
+    sha256 = "11wh3glqpficz5wj9cgif1kjpmcbziapza719gzadkcrjc1vasbl";
+  };
+  "a41d00077f02fab1c6a05e4607094b4eea3b6ad0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/a41d00077f02fab1c6a05e4607094b4eea3b6ad0;
+    sha256 = "1xrf0szqj7wxwqcw7lw43fpzqjq9lh3rr04jyfmnddasxd6qzfwz";
+  };
+  "a456f0111a1d9a6fb8045d0e5e9450b7c36f9374" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a456f0111a1d9a6fb8045d0e5e9450b7c36f9374;
+    sha256 = "1p9bhg7sjvc70jsansrf9qa2wnxwk9dn4ic5k9jai9alcr48bjan";
+  };
+  "a46938a8170197df7ac0c8d9ca3c7e5aca696271" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a46938a8170197df7ac0c8d9ca3c7e5aca696271;
+    sha256 = "01ipp4xnpgnnhlkqh1hpman6ifj77jij5b9mrra87dkcy83wd7j2";
+  };
+  "a4d7e28c74a63f10107957b9b6af00486f1e7358" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a4d7e28c74a63f10107957b9b6af00486f1e7358;
+    sha256 = "19ldb1kdwiji7bwjz6fx8rak2dk8gpnvib5b3s3ywl0dxa85yv13";
+  };
+  "a507276db67feeb197bacced284be29d92bfb2b7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a507276db67feeb197bacced284be29d92bfb2b7;
+    sha256 = "1a46d8km3ci1jy1hgq7mxcq0bhkd2n8bqrdd7x1nyybvh5r7hjn7";
+  };
+  "a561c854b1abb49bc710438edd6a17feb5370e73" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a561c854b1abb49bc710438edd6a17feb5370e73;
+    sha256 = "0s9sw7kx3gj4xrckivfl2w2dvw2criwwm0bibh6dmajsj058pl84";
+  };
+  "a5a4b35f662228caee7476ddab2567611de6c35c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/a5a4b35f662228caee7476ddab2567611de6c35c;
+    sha256 = "0580qlzrvf1vw8rfncc50vyy9y5g79rwcvj8rjaxvdwmg1n4dpw0";
+  };
+  "a6287affa4b828301aafa84f7bd9ce71935997b1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/a6287affa4b828301aafa84f7bd9ce71935997b1;
+    sha256 = "06kdx9x2a4230k1c1b60cwkadarg62rnsbycgbqzhgbp6h4j8awn";
+  };
+  "a717434c111c75d501e35d8a5f4de2b75e299566" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/a717434c111c75d501e35d8a5f4de2b75e299566;
+    sha256 = "1410w7shpi913irx8b48mk7004vdsf0xa3hrh21bvd70askxn4ci";
+  };
+  "a74403ad656c7c68733bf1d09d994d0e8dccd94e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/a74403ad656c7c68733bf1d09d994d0e8dccd94e;
+    sha256 = "0b8kcrdcd4jmn2anxgd0x04szkf2k1gkqkl8srkbf4f5hh7aj27x";
+  };
+  "a744790bed001ed939d533b58c7d7132d8599ee6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/a744790bed001ed939d533b58c7d7132d8599ee6;
+    sha256 = "15gxpbd7p0pj67b1dwgnsq841zdfmzw27qvpzpg15nbdsm4bqknq";
+  };
+  "a7460f75270bd4946c7e856b9cba426bfd756474" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/a7460f75270bd4946c7e856b9cba426bfd756474;
+    sha256 = "1xl68yyf67zr08390y11p8il1g99crr9j71m7bqkps4sr236iv1l";
+  };
+  "a75892ec39777f5deec95c7ab34ac829e42f61f7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/a75892ec39777f5deec95c7ab34ac829e42f61f7;
+    sha256 = "1x83zbrnqx9856s515lqix9na8ir8991whgszbx84xjzs7507wag";
+  };
+  "a7675f8de766ef5fa71fd6c904b6000b880a463d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a7675f8de766ef5fa71fd6c904b6000b880a463d;
+    sha256 = "0jmc22yiaw09cqx0wanyzbh46iblxpjzs9v1bl8hhicv360rq1ya";
+  };
+  "a7c85f34f7555c16973a534e2c21b5d0bf278e29" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a7c85f34f7555c16973a534e2c21b5d0bf278e29;
+    sha256 = "1a7zbrmj2gdq61q2gw6jr6j3848mg85snj8hghmajndww1wspjlp";
+  };
+  "a8278a17fc9fa29308c59351a8c53b8330d33e88" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2605188-b2b13e5f7b3d453eb5d6b0cde31b638c/a8278a17fc9fa29308c59351a8c53b8330d33e88;
+    sha256 = "0d391bz9b9c73xdnkxm3l8zyz1zjb6nv0vn5m3ihpgb7hkdgfxgz";
+  };
+  "a82d5d8a7e63a42fa0e2414ad66c400a3beb640a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2498161-1c427a8c10084d53ae743a11e6148406/a82d5d8a7e63a42fa0e2414ad66c400a3beb640a;
+    sha256 = "1cr9k5zlj9kl24ph9inczwm84rbch1vkvrkycs22yhqblgwf5zid";
+  };
+  "a84e9f4455088def00bab0652ca92a80ecce5e57" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/a84e9f4455088def00bab0652ca92a80ecce5e57;
+    sha256 = "1ks51i2490lymg2whdj1807z9asyl6gpsgbshw4bgdxd903aka1l";
+  };
+  "a8e8deae490071080b69408bf16c09b087801323" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/a8e8deae490071080b69408bf16c09b087801323;
+    sha256 = "1v0aaimfzl3f52cajgzv9v6wzjn4jpf95y40kalqbj2w7qvyzz4i";
+  };
+  "a980d01787b472fb299cc01e49a8a9da740ce81d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/a980d01787b472fb299cc01e49a8a9da740ce81d;
+    sha256 = "1laqjx21ik77p2xggii4pbcj7np9a6bpn8wlhivzk23zg0jnp0xz";
+  };
+  "a98192f145db4e2a545f79bc9d595f8f5c7fda34" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/a98192f145db4e2a545f79bc9d595f8f5c7fda34;
+    sha256 = "0kwb4jawlfvql1n1fbw04kqik33gmlzci7zc236gyhz4mhb86xd1";
+  };
+  "a98819bf37317dabf20f86b0fd6800a911717698" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a98819bf37317dabf20f86b0fd6800a911717698;
+    sha256 = "0lh1288ab45p06082lb1a4cjh1k3gqmpxnbsilq5cgic98x7fwr9";
+  };
+  "a99daa4bfd46db4b416f47b4fc1972b221ea57e7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a99daa4bfd46db4b416f47b4fc1972b221ea57e7;
+    sha256 = "1mk3s8g5vgjpmhw6pb14akvipbm31il3887f4qqgfxcdfgkj261h";
+  };
+  "a9c62ffacb1508452705b057c5f796573d47c78d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/a9c62ffacb1508452705b057c5f796573d47c78d;
+    sha256 = "0c0gm8yqkwbzbdlx625bng0hwg9l8fnwf02fkm7mai8qg2xbb76z";
+  };
+  "a9c93107f208faee20ff396148c3b9954b33aa06" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/a9c93107f208faee20ff396148c3b9954b33aa06;
+    sha256 = "0qrg2k8rf3ic7z9y0pv0mainwbqmhn4p5q6jajf08wndz2k3plr3";
+  };
+  "a9dfe0dbd869009eeca3fb67d49ce2c691877dc8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/a9dfe0dbd869009eeca3fb67d49ce2c691877dc8;
+    sha256 = "0i84q4qa7jp3yils2hi8qd9mp0xpazdmnr93739sqhd8wrvi3isi";
+  };
+  "a9f9260691fe2d9ade072d9589f478dbce491a25" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/a9f9260691fe2d9ade072d9589f478dbce491a25;
+    sha256 = "1bkkfvnxxxscv1rglxn9174h7zfa093j0ilq3wpc682hlihg1c7s";
+  };
+  "aa0999ac4a6e388aa9547c455a6ea08c98d7036a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/aa0999ac4a6e388aa9547c455a6ea08c98d7036a;
+    sha256 = "004gm6cfkrv1hccsqwd9qzby37rjjb5cmhz8z8a4wyr52vcccp6f";
+  };
+  "aa212839e3606b3a1bbb68c9c1353c627853d8d5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/aa212839e3606b3a1bbb68c9c1353c627853d8d5;
+    sha256 = "166y3z7h9ncjz34g9ljbch4knqgi8syhsyl1gkh5wnqwkhsdkyjl";
+  };
+  "aa40eee6849fd0b67b4a01d245e14e6f9cb562fe" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2481391-2b0dc74bc6d44dd4917420631716dc19/aa40eee6849fd0b67b4a01d245e14e6f9cb562fe;
+    sha256 = "1zhfxhr1ngxkigy2kbr0x19qa6bfh5jqh2kb04x6b5c5cl2rxnx0";
+  };
+  "aa7f77e42dedc93399b370b494f11d5cafe3ac1b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/aa7f77e42dedc93399b370b494f11d5cafe3ac1b;
+    sha256 = "0zj2dqfl1zc15i511n89g5gbjkxgr7ivsvjjnyxdw6pdcbx3820c";
+  };
+  "aa92bb8c104afa015ba28312d3eb02c006426dc4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/aa92bb8c104afa015ba28312d3eb02c006426dc4;
+    sha256 = "0xw13lfrl0nbhjr1haz9k5yf6vra4h2q72mf213h5aar0h2sfivl";
+  };
+  "aab7c2855fd330fbd2d86fae15fb7fc38e8117a4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/aab7c2855fd330fbd2d86fae15fb7fc38e8117a4;
+    sha256 = "1g615imqp4nvryqr7fzdg2xd62nv6nkq0n6a9s4vfl8di3hfywaz";
+  };
+  "aad648813ec7c3909fab2cba04e54a790f99d97d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/aad648813ec7c3909fab2cba04e54a790f99d97d;
+    sha256 = "1056xhjfdpyg3x778w33wmydzacgv24p9mrcsb0h1n09lkxbab5p";
+  };
+  "aadaaad6c3a74db06ec29a860e4cbdb518a7e965" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/aadaaad6c3a74db06ec29a860e4cbdb518a7e965;
+    sha256 = "1xyx0sr4vgbkyizvmjsykn3lg7mg0rgs3ha8xcvkn4m4wzhciwxs";
+  };
+  "aaf3a012f48b24c193628af42ef3302d96784c3f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/aaf3a012f48b24c193628af42ef3302d96784c3f;
+    sha256 = "1idl0rsr7waqbgydsbnlq7bl26s202arhzv5bzmcghy2jlzgavj1";
+  };
+  "aafb65596f063aac27c03ad64646b10e9cbd9e5f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/aafb65596f063aac27c03ad64646b10e9cbd9e5f;
+    sha256 = "0gmi9sd9sgzb1bmwgyaghslz2rxyba96qyvzn9mdxnh661cwnwsk";
+  };
+  "aaff771bff40e67acec754ff6a73103840091d71" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/aaff771bff40e67acec754ff6a73103840091d71;
+    sha256 = "15f92i5jph2hiihknkbyssif2gwlcm59vkqwj155c164g6fghdsc";
+  };
+  "ab091055311fa9bc429f0aacec0cc24290af3166" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ab091055311fa9bc429f0aacec0cc24290af3166;
+    sha256 = "124wr5mfd3n11k6rdd60177hfjbjicyn57fccwzn2sxhq3rdxl7p";
+  };
+  "ab0a48b5c47c246a0d31750e9ae6b073ad35963e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/ab0a48b5c47c246a0d31750e9ae6b073ad35963e;
+    sha256 = "0ldkcyzq6jsjkb1w8qgrjjjz9sgpfa7syvmfnr4micv2jna867vc";
+  };
+  "ab0accca4b2e0942f55d408ed30bb84183371d99" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/ab0accca4b2e0942f55d408ed30bb84183371d99;
+    sha256 = "0j2pc8bpm3ikwzlkssgmbk1wcqskkbv9akyb07742vl034vzzc5z";
+  };
+  "ab199653d5f9dea6b89095016907a7ada2eea972" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ab199653d5f9dea6b89095016907a7ada2eea972;
+    sha256 = "0fk560jgq4avnlqvrj6y3qbd9r1zcyjxpvvpdcbwr57kqxqgki5d";
+  };
+  "ab1c1bb528f1ce09f2cd32ba886bdf658ee6ef6e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ab1c1bb528f1ce09f2cd32ba886bdf658ee6ef6e;
+    sha256 = "0jkdyzxqffi9zyfhi8pmh5z57z5cs4inn5cw92gbgh1fx760shx6";
+  };
+  "ab56f3655c7511b5ce622c56fc8f769b82720a77" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/ab56f3655c7511b5ce622c56fc8f769b82720a77;
+    sha256 = "10f5kb8yswwd8178104jz5ph7s5j3hzmicfggfsdmviw4760iplm";
+  };
+  "ab5d351cc1959e213540cc41dbe93cea75dda4d9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ab5d351cc1959e213540cc41dbe93cea75dda4d9;
+    sha256 = "1br599a6lsg7cq8a1zy7wicpjjmg1pvdmd9wph6xd4a4i5r5msh9";
+  };
+  "ab6ec6af0e90d693b32e063348193dfc34a5d608" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/ab6ec6af0e90d693b32e063348193dfc34a5d608;
+    sha256 = "1saj3cr67jik0xfak36j394irs648w4ws8yg1bzb2i4kxl4x4qjf";
+  };
+  "ab9668aa1cb36fe03fd80ec800264850f247911e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/ab9668aa1cb36fe03fd80ec800264850f247911e;
+    sha256 = "1z3sq5jnxannf084xrd5sgm64d54n5w4vhh2jcrch53vylkkf771";
+  };
+  "abcd992f6c90c47b9150148778b5e5dd0be366f5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/abcd992f6c90c47b9150148778b5e5dd0be366f5;
+    sha256 = "0sxcxwpz4xpxjnr5026xpp7m9jagvqb4ff0073r46a9jzp0y0nwh";
+  };
+  "abd31f5aa1a5bc7ad21bd97551365c4785a30537" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/abd31f5aa1a5bc7ad21bd97551365c4785a30537;
+    sha256 = "1si98cl159fdlqpqaagk3bsf8295nwbyf1x12fps78fw8svshhps";
+  };
+  "ac32cbcbb8641f87ce0f4e5e8ea11cdb33568e98" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2700710-7fab47bfec3142a7b4fa395fdd001748/ac32cbcbb8641f87ce0f4e5e8ea11cdb33568e98;
+    sha256 = "0vvxrykslg2klrfmg8nczaxb2picf30fiz19vnwrmkc2hdx8ipj5";
+  };
+  "ac90a77a8f7a8cffa48d869e60f393981eeb2ff1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2620418-84d187e8202a426594ec7cac6eeb85a1/ac90a77a8f7a8cffa48d869e60f393981eeb2ff1;
+    sha256 = "093cl6yhppbc6xqgfiy46rm2wip3cpvnkzxgff0k7bbb8chxp3al";
+  };
+  "ac98ab61a879076754296cafc03b793203fb6701" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ac98ab61a879076754296cafc03b793203fb6701;
+    sha256 = "1jcm9grs9s7prn4qxhpaw5np56g6s6k0z2xa8ky64i1c9rq0dyx4";
+  };
+  "ace785dacecc7b1203d5fd7ca358003149131381" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/ace785dacecc7b1203d5fd7ca358003149131381;
+    sha256 = "1i5aiksqi4hvjyzlrflh9v3dw9n4n4f38aw62flr92psnfy0ahr0";
+  };
+  "acf6558b1e3950d55a31da4e8614e4a357aa653c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/acf6558b1e3950d55a31da4e8614e4a357aa653c;
+    sha256 = "1gsdlhcwdd5dzl5qm8hsrgyg9bjmp0iyaa863fa4h40ammj0kg7a";
+  };
+  "ad4246832e88a45f0bdd6f9cafffd383ed378120" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/ad4246832e88a45f0bdd6f9cafffd383ed378120;
+    sha256 = "00g2y2p4aavw5bfc116k4qj49qkw2gprg4cxv2mnp1ldj9jh81fc";
+  };
+  "ad48b0d39c84ad3a23ee670e06d009fd1ef406ae" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ad48b0d39c84ad3a23ee670e06d009fd1ef406ae;
+    sha256 = "0a396fmil6q217fh2vr6wwm63wyq74j495dxj7y509swjsjf6zsc";
+  };
+  "ad735ce413f80f79900a87098c112c355b2269b9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ad735ce413f80f79900a87098c112c355b2269b9;
+    sha256 = "1qgccwwrhkljak4xks9qnf0zq4j4q36n4134xs3nvmzbma9l6xw2";
+  };
+  "ad8485d0661bcc3b36bc884373baac7c82c1db1a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/ad8485d0661bcc3b36bc884373baac7c82c1db1a;
+    sha256 = "1w441r581slp32qhpnrpm2hacy3db8y7v5by2z0xycl2nfz25n1l";
+  };
+  "ada3dc17e0a699e9f0888f167ab43c95b9d087c9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610954-bd0fcbe6f0c748508fe9438073c40b27/ada3dc17e0a699e9f0888f167ab43c95b9d087c9;
+    sha256 = "0zzk3laz8wv0sd4gqc54p5hw86wvbjmy8vrdlq5hpfhg6z046cch";
+  };
+  "ada964ecffeda8e2a6db59b92272ea1e22dd17b5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/ada964ecffeda8e2a6db59b92272ea1e22dd17b5;
+    sha256 = "0s23ag4qfdy2h7cz7184i2vzbbb3bm3j3655vs8yb8gfjj1rbiyx";
+  };
+  "adb1f445a4a127969356b6635da51f637f54a0ac" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/adb1f445a4a127969356b6635da51f637f54a0ac;
+    sha256 = "1h5siwqpjjgqi695gsmbkdj4qx9cd3w4378i7w59dxv512zgkgrz";
+  };
+  "ade00d1c90e8988488643bcf563040510c4be517" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ade00d1c90e8988488643bcf563040510c4be517;
+    sha256 = "07wc8b6i06hqp5mas7jjhs71ag0lb00z3w5gs25zrmz36ly898hl";
+  };
+  "adeb881928e136d07bc7684746ce44d02956f822" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/adeb881928e136d07bc7684746ce44d02956f822;
+    sha256 = "1bs2z2aw2pqiygq6ykznncfd029v483za1ii6sxbxdg59am4brii";
+  };
+  "ae2770ddebf925141015b1cd4b1bb15fe7ece06c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2659695-e878a65d22304b68a9e6878b07b5db24/ae2770ddebf925141015b1cd4b1bb15fe7ece06c;
+    sha256 = "074dv8w0rkv95qcjxrwsbr6imx41w5ywfx7vcd73l3llzdgfk46l";
+  };
+  "ae70c01ba3575e5558b7bde673a82e53494df34b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ae70c01ba3575e5558b7bde673a82e53494df34b;
+    sha256 = "14qd1wbnp3zkfb2ni0dghjbgca4w6c8mnh90f0ijfxwnywk1myba";
+  };
+  "ae8089d30509415ded81477eb41b29f55a431272" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ae8089d30509415ded81477eb41b29f55a431272;
+    sha256 = "10y28v1pfxz5vdjxvb5kah2756lsl70z9grmda57l5wd4s9qmy91";
+  };
+  "ae874d3eb1af9a5081c94361a989f0b77e0ecf1b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ae874d3eb1af9a5081c94361a989f0b77e0ecf1b;
+    sha256 = "1r3a0qndxy43pgwsjcc7ia3njip4zvh0419wbm502006amj07yrl";
+  };
+  "ae901fb15f84f70cf6979dafda0d8f5dbcc5c269" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ae901fb15f84f70cf6979dafda0d8f5dbcc5c269;
+    sha256 = "1jipsy7d39z9qmz27ib75yixmgp0qqfazljgmisiw7kyii1m5fpp";
+  };
+  "aecbc01c44a31c0809a43e68b99e44ed1a66bd00" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/aecbc01c44a31c0809a43e68b99e44ed1a66bd00;
+    sha256 = "0vxvjjpr0hvivfsszf94ii8xl67xnb262mxfwm5xmml7472xzhsn";
+  };
+  "aeeedf07121752bb79af7caf8438e5c3d612cd7f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/aeeedf07121752bb79af7caf8438e5c3d612cd7f;
+    sha256 = "1dk4xvniy7cr3xss4s9nrbjgbmibbsb9s7plw20hlg0gzcyg24pn";
+  };
+  "af0b9f348ea115df7f34f8c6a13da31e75e76e16" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/af0b9f348ea115df7f34f8c6a13da31e75e76e16;
+    sha256 = "00y3h6bw7ljrnvy1d9fxff6ncsvgpqaj3hyp44q41w3xlwilsyq7";
+  };
+  "af0da89763358318771d8aefcb742e3416f57423" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/af0da89763358318771d8aefcb742e3416f57423;
+    sha256 = "18xak3xnl38n8mbqa5rv3m70595y36yy2l5rwlhy1k9g66lfvwf8";
+  };
+  "af313d299a6ace9cd07fe010e73680f12b0b5147" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/af313d299a6ace9cd07fe010e73680f12b0b5147;
+    sha256 = "151bsqly7rqy1isklgjvy39bnbxqd3vyjbqaf60lgs6h81ggj5fn";
+  };
+  "af32114b8b970d1d65271ed99052f0de3d4651eb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/af32114b8b970d1d65271ed99052f0de3d4651eb;
+    sha256 = "1pg0r81c1rg9r6m80k3907s77j9mqh8xy2zaym734r3zvjamwf54";
+  };
+  "af412e3bcac064293cc367941ad02eddcc3e5a44" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/af412e3bcac064293cc367941ad02eddcc3e5a44;
+    sha256 = "1gzy8vni5d61pp6v5ns1ykmg2xcgcrm6gd2w90bxgjn7fjxbm6y0";
+  };
+  "af915ecf45e7ce1cfbc694f16a90c5131e953240" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/af915ecf45e7ce1cfbc694f16a90c5131e953240;
+    sha256 = "192x7nbj1mkzvwcjmhaw65wpq0gkjsyx709dh4mkcrm6djw2si6v";
+  };
+  "afb2a10bcf6c13c0cfc4506cce58b6a4e8a8741d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/afb2a10bcf6c13c0cfc4506cce58b6a4e8a8741d;
+    sha256 = "0zqjqww51znppvgkgqinxa91zpwva3jwc8rd7x78f319f3wpka24";
+  };
+  "afb9d2946f9c3633fb9df0e2acc0f5a2cb5a7753" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/afb9d2946f9c3633fb9df0e2acc0f5a2cb5a7753;
+    sha256 = "0z2c3ac6ja8r82wr7fgbh6j9gpma7p1wxrwgqxdwysgys39z7dvr";
+  };
+  "afc1c36f600c80efcf810f3f49289880b32ab502" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/afc1c36f600c80efcf810f3f49289880b32ab502;
+    sha256 = "1clkj01cmpgx51zlqbypjdarm1anispwmch98y87gsmhpbgmgm7l";
+  };
+  "afd3591b1c847bb2dca52c7bab74b7f00043a210" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2621658-dcc28ef36e554dd28b121fd140f310e9/afd3591b1c847bb2dca52c7bab74b7f00043a210;
+    sha256 = "1ymdczzqabd5alr8j3gmisrljfvdlncb79d8n62dkxkgp0f894ix";
+  };
+  "aff26a6b13744512c90c853c58676ace9431b24a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/aff26a6b13744512c90c853c58676ace9431b24a;
+    sha256 = "0g66byknihd0fkcd7h1bb7vbgzz8rsyjnkgf61sxbidxdis9v722";
+  };
+  "affb2ac1292b281f85114871becaf2e7a7adfa7e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/affb2ac1292b281f85114871becaf2e7a7adfa7e;
+    sha256 = "0s90sfpjphy4zs3ccwfhhxjh9irr0x4sijjg1k9r5ixzn19klb77";
+  };
+  "b05b1e539b6610459cb8b45e8d0b48d4de00fa44" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/b05b1e539b6610459cb8b45e8d0b48d4de00fa44;
+    sha256 = "0ac90aqnhkm3dvcm5ql5wg959v8y7pyjibppgran58sf0jph91v8";
+  };
+  "b08e33bfe04cad899bb61fb3d822e79b9203df59" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b08e33bfe04cad899bb61fb3d822e79b9203df59;
+    sha256 = "126xswxfgsv1yp33hvpxjfk4m22j3dvs4dhr83rpwqvyw139bxc8";
+  };
+  "b0ad17ab6dad98419386251c9553b4a5d0a73fad" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2597177-394deee1ae174b2db1462326aa83252a/b0ad17ab6dad98419386251c9553b4a5d0a73fad;
+    sha256 = "08rnn13hqbz2j70ldigc3ksa99jmc8gg9x5a2am545s5qw6p5myr";
+  };
+  "b0b3d44fba913897d01ea2ef6e8089c64f988ac6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b0b3d44fba913897d01ea2ef6e8089c64f988ac6;
+    sha256 = "0lq9vbdkw3cqn0w7zd78n1wpnldxkr3azp02786gqrcx3lgwxffr";
+  };
+  "b0f0802f90e19b137dfc3482c478ce06deda9019" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b0f0802f90e19b137dfc3482c478ce06deda9019;
+    sha256 = "0ivpnd7z9pl4pkdxsmfn0qnxh5ny19zxh2jvsdkwzj6qk49r7w8x";
+  };
+  "b10f9ee97120ca6711610befa4e7fab7977b88e9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/b10f9ee97120ca6711610befa4e7fab7977b88e9;
+    sha256 = "0mf5w54jw7vsk1l8x613zhq9060cd6xj03cjk93pbmkizvy0hxc1";
+  };
+  "b1554d1196eebddea596b1a7274981d7a2670be4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b1554d1196eebddea596b1a7274981d7a2670be4;
+    sha256 = "0rsf740756cc4samd688c81y49fsw1bkiipvahpj1h4kpqys8w4v";
+  };
+  "b16036ff8aa037d50175f1e65bd5504964b26e9a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b16036ff8aa037d50175f1e65bd5504964b26e9a;
+    sha256 = "034rljnxdmy11xhr3rpgzv4sdab87z3ybbrww0gvl0av3chmga5g";
+  };
+  "b176340bbc5d5b5bac78f855162c5a3ff0ba19ce" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/b176340bbc5d5b5bac78f855162c5a3ff0ba19ce;
+    sha256 = "1ckgycqh4s28c0yq593d8405cz1g7pnmjpnnfvn3y8gn0yh8qb56";
+  };
+  "b176ee25e0ebb7afdb44613dac3f4254dc99ce2a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b176ee25e0ebb7afdb44613dac3f4254dc99ce2a;
+    sha256 = "0jb1vsabmj29s03ghc2g48r9sjz2h4s96lvhkf6xgfgqi26nx0vq";
+  };
+  "b17f3e987930d01e04a825ded615a345c7af5ef7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/b17f3e987930d01e04a825ded615a345c7af5ef7;
+    sha256 = "1d4ibb02h26i5za5z7a9sj2cirvz8y93h2jxrb0llq9hfazzzgpv";
+  };
+  "b1bc628c3ffbbceef6e1ef0dfb467b793da712dc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b1bc628c3ffbbceef6e1ef0dfb467b793da712dc;
+    sha256 = "1li9rf71003ixz42k3gcavfnnjjfgbp69qzxmddv7w8iykas5vli";
+  };
+  "b1cdfd2a0b486252f482eca80d3408be44b15168" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/b1cdfd2a0b486252f482eca80d3408be44b15168;
+    sha256 = "03ipjskn7j0ar4hz9n9w8r6m1wp3ag35n21sx3v594b332ma25cg";
+  };
+  "b1dfb94e146a98148e1f9ba9a56d7114a84628a8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/b1dfb94e146a98148e1f9ba9a56d7114a84628a8;
+    sha256 = "09imd5nsrina53my95vsd4jm9400qz0kc7vik3aafga9648h5nj6";
+  };
+  "b1f44610d6ce19e42537f436c4bfc70e275b432a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/b1f44610d6ce19e42537f436c4bfc70e275b432a;
+    sha256 = "1bfgybl30pgmjzvxiisy0bm6anh2nif2gc67a43ij0gxmbiigwyd";
+  };
+  "b20c27d04963b4b8e0c5dcfd81e51dfc59e30db2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b20c27d04963b4b8e0c5dcfd81e51dfc59e30db2;
+    sha256 = "1sfrx4dnqmp5d7j7xid8p0iv6fglbv7zsas1d1ig0knda2gc5c05";
+  };
+  "b24bbd337d9a9cf1085d4cd1df1e43e928749b90" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/b24bbd337d9a9cf1085d4cd1df1e43e928749b90;
+    sha256 = "0qsi9g0vn6q49w8xkfghkrjhb32jczinnjiyp5isyb19802zc6vm";
+  };
+  "b2b40485507860ae0f1ba756693b78123347a60b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b2b40485507860ae0f1ba756693b78123347a60b;
+    sha256 = "1y9i6ly60x5cyqf429ay00sy3f796ha65wcinjvsmixpgsqivm8h";
+  };
+  "b33175575bd5fbb07b2308fa24fbf8f548763435" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b33175575bd5fbb07b2308fa24fbf8f548763435;
+    sha256 = "120489jn9bnsj3v4v6icl3pvcpzm27g3900l3k8f263b8qz52jpy";
+  };
+  "b33dbe936d08959ce00d8d551c9861052b05a0e3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/b33dbe936d08959ce00d8d551c9861052b05a0e3;
+    sha256 = "13l63iipsscfz4iqm9jsp68y0w1l2pmmg2skv5mnmlfm4ryq5dc5";
+  };
+  "b3643e64562cf8928fe74794820c500f305fac17" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/b3643e64562cf8928fe74794820c500f305fac17;
+    sha256 = "1gy3p72p0v67psb8n5gqmw6skxavcamq7c5i3mgc5pmys2jmspqd";
+  };
+  "b386d93988dde07a87de09757eacd3a2ecfd6202" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b386d93988dde07a87de09757eacd3a2ecfd6202;
+    sha256 = "1nmsqsm0g8zz3x4x5h3m2nf5ii5cqpr5x3kpcs5x9dpcsz1z5q9f";
+  };
+  "b3a267c43c45f392523e300a6f61318f4ae52d99" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/b3a267c43c45f392523e300a6f61318f4ae52d99;
+    sha256 = "1grivshi7cgmin5cab447s30byjlapnlcg010assxx36vgkhpihp";
+  };
+  "b3ba54dd3b4a9c7c235223aca9ad7d6007559484" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b3ba54dd3b4a9c7c235223aca9ad7d6007559484;
+    sha256 = "15as68yknbf35zv5638qfc8j4pwry8zbmhn8k0ycjzyi7c5gqqpv";
+  };
+  "b3df044bb928c0123e3067b6ca07bc8db2c7c93c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610298-3f4939c916b54d799ac5de807895697f/b3df044bb928c0123e3067b6ca07bc8db2c7c93c;
+    sha256 = "1zcc27kh9mwhawpkfxishqhkngwp0ixasw091g0ydxvsawq7wikb";
+  };
+  "b4179284c669b70deca0e515159443b89dced17a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b4179284c669b70deca0e515159443b89dced17a;
+    sha256 = "1yi9jlqh5chhq5zrsi6581d20hy4wva56dwvik7p5azcwkv7jh2i";
+  };
+  "b4411a92ba0b237e9dee0988897930e64daca1a7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b4411a92ba0b237e9dee0988897930e64daca1a7;
+    sha256 = "17ffzs8zmcwf3znbc8jzja6db4kcgj4mnzf90g061k6bx29rrnxi";
+  };
+  "b44f92d2adf2245433cfea594b8718a8a1d0935a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b44f92d2adf2245433cfea594b8718a8a1d0935a;
+    sha256 = "0r5mqhyn811cbwspbi6l9yssx2w8pg6brv52g8qhwjiapr70p6xf";
+  };
+  "b453a1dc5c79a3ef309710fa63d80177fdb4c947" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b453a1dc5c79a3ef309710fa63d80177fdb4c947;
+    sha256 = "0c331fw0hzzh15b0s1i0x52bmdlwwzyjxr9gj1rflm9i0h83xqk6";
+  };
+  "b4815536b7d3c4f5a1a07bf7a0a85f780d0a9a8f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/b4815536b7d3c4f5a1a07bf7a0a85f780d0a9a8f;
+    sha256 = "18r4lblc3zg86sfj27izlbgjdap2aw1hhx64s9aykj32k0slhq3k";
+  };
+  "b49270a6fb0733c3b9a3e6627fdc96c5b2b400f7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b49270a6fb0733c3b9a3e6627fdc96c5b2b400f7;
+    sha256 = "11v6h8xgr5lj7x8aakirdny73fsdidshg9ijhck7lq25sqrpg681";
+  };
+  "b49ba6bcffb62e7245700758aeb276ae404637e1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/b49ba6bcffb62e7245700758aeb276ae404637e1;
+    sha256 = "083hj8s2ihr85gb1lpy6zy2xfd7ilr3yr46jvv62i2v8v551y2ri";
+  };
+  "b4a7011b1f4b663e34e08b5caa1fe927463eb914" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2615623-07d97909df1d48be99bb54a411313382/b4a7011b1f4b663e34e08b5caa1fe927463eb914;
+    sha256 = "1442aqg7ds4xxq80jsk7y2bhj2dgnm4bk8ma0kcdhy8qnmhwwvz3";
+  };
+  "b4b01b3870e9301073475bb924e5463d76e87c0f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b4b01b3870e9301073475bb924e5463d76e87c0f;
+    sha256 = "0720v8f1mgqrkxgdk85w3bj68kai90xy6i5gc5b9sbg3dgw1giss";
+  };
+  "b5b76e5c16852517072b42a8cb51945d692252b7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b5b76e5c16852517072b42a8cb51945d692252b7;
+    sha256 = "0cxz5vh3j0mf2vfr94v535zl3aa41m0ynydw3phmi45nws9rqck1";
+  };
+  "b5d004587689d2ebd79e34905d174a376e575f5f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b5d004587689d2ebd79e34905d174a376e575f5f;
+    sha256 = "0gj82721n05pymy3fpghics0v2pi5ck1liqv0d6976y89anz7vlj";
+  };
+  "b63ccd1617b08574d0129948ec7ad1e48f94a220" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b63ccd1617b08574d0129948ec7ad1e48f94a220;
+    sha256 = "1i1l5aq5da080145qxraaj8mh5hpjwk3l6cdl1k3acn3y8rdyb27";
+  };
+  "b66bb0fd25eed1110f4b97f5f4c3cccd294cb884" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b66bb0fd25eed1110f4b97f5f4c3cccd294cb884;
+    sha256 = "166m1j21yq89qpf3g8h7rdkcdzcnhcj6aps29n5yx1zgay6kq9sd";
+  };
+  "b66faabd2faed41ddcfaa83fbc45e1c038712800" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b66faabd2faed41ddcfaa83fbc45e1c038712800;
+    sha256 = "0lg35984x9q9y0binxrkdwnj4c910nj8wj41bsggwsmfdxz3vi1b";
+  };
+  "b6774cdd5b050cfcaac3143c0a8f89705c6bde71" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/b6774cdd5b050cfcaac3143c0a8f89705c6bde71;
+    sha256 = "0xllvgabdrafyy0gh1plqnzbr9lwxw5xn357dc4bpz7a8nllnzpl";
+  };
+  "b6aa88050eb1fb1e9317e28c1342c6ea4ab7dbad" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/b6aa88050eb1fb1e9317e28c1342c6ea4ab7dbad;
+    sha256 = "1yxxvjhrj20m6jj26y53azikjw1jmdb1sc0l5876bkmwadl7rkyh";
+  };
+  "b6e51c5ce4619cf24deb50699e19457246a65fde" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/b6e51c5ce4619cf24deb50699e19457246a65fde;
+    sha256 = "00q6pplg3rq5wy73nj9gi0h14dvcnvsi0b51xbbbsvd6qnpgf9in";
+  };
+  "b751385c56ed5ce096df337d0a736bdb517071c0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/b751385c56ed5ce096df337d0a736bdb517071c0;
+    sha256 = "134snqqpd11yd05jgw199fpv41pnw94kh8fig3gmkv2rc0ppdrqc";
+  };
+  "b76100c79e2052b6a9156a3a3b44dc46b73ba80b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/b76100c79e2052b6a9156a3a3b44dc46b73ba80b;
+    sha256 = "02igaa6r8rs8qk7235jvbryycz2v3cl4pd08ifwhg471w65zrwz9";
+  };
+  "b774b3a6af176fe17e8988b8ce8aae6fac0081c8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/b774b3a6af176fe17e8988b8ce8aae6fac0081c8;
+    sha256 = "1vjz9m66hfr3anm75vfb815i0al393rq0y0w0nbi8l5nxayl2fr4";
+  };
+  "b792f771ba89b6e97aa0da38cab7975e31240901" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/b792f771ba89b6e97aa0da38cab7975e31240901;
+    sha256 = "0wjqqiaj00ngyl6mzxqqpk4jbb4xngk6zcahs9jgiiwvr0fs31gr";
+  };
+  "b7cac0682cd1b758954a6990731d98ac60e931f4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/b7cac0682cd1b758954a6990731d98ac60e931f4;
+    sha256 = "1sjhah3cj62frm38rqs3v3mm0jmab39qx0ys39kgq15wl4gyhrs3";
+  };
+  "b7d98916d7231a6cc8fa4b5ba6d9a123af873b7c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/b7d98916d7231a6cc8fa4b5ba6d9a123af873b7c;
+    sha256 = "1y0iwjm5hkwqxz17b69xfvl200nsyf86i2fdm4kcyf8wq99a905r";
+  };
+  "b7e5e66ec2b311c32f25563c90d3883eaf9d7f01" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2386906-35f20c2d3732491bab9f172643aaf695/b7e5e66ec2b311c32f25563c90d3883eaf9d7f01;
+    sha256 = "02c5s02nj5zab4w019bawz9xf3z253w2kjwsnxx0pjzcgzn5dsic";
+  };
+  "b8063b5f31f092324c94ccf41e3dbbca020714c6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b8063b5f31f092324c94ccf41e3dbbca020714c6;
+    sha256 = "0sx6wmnjqmka3838541dwi668lxdyf4z8ddyy3x94qcg7xr67hx8";
+  };
+  "b8147ae4f4e48c66013e2ce160e307bdbf8bb643" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b8147ae4f4e48c66013e2ce160e307bdbf8bb643;
+    sha256 = "0p9sv64h64pjq8g2p2wb7yvmfma1d3dyp1p26vq9pxyx5vaj6c0h";
+  };
+  "b8280b60d889420165c4849a608f2f77a636a96e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/b8280b60d889420165c4849a608f2f77a636a96e;
+    sha256 = "0vqj80qdwi1dfxgijzjgk9wwfkvf07khgyjjw05801vkkjj75nyb";
+  };
+  "b832b94004977756477412eec3019f6cb37e62d1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/b832b94004977756477412eec3019f6cb37e62d1;
+    sha256 = "1vja9zxjlil78d20bmwq1cnzb99q2k3g2g75bpz51v6g5smnwwzm";
+  };
+  "b8394a23db9e6efd8594d13cde39d95e60a2b46d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b8394a23db9e6efd8594d13cde39d95e60a2b46d;
+    sha256 = "199qs2a3ii5353ijcg7vrd2qjz1ig0zs58qpywjkqq5gcx1h3d3a";
+  };
+  "b8692885cc79308225c50faa58244e7006dadf91" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/b8692885cc79308225c50faa58244e7006dadf91;
+    sha256 = "0dmjw6wr6mb0y6ika02fnqngk9lghkm4hdwl2khlhzp25hn2ki6f";
+  };
+  "b88c8f32e5693eade30c534bf94f295df40e1d87" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2474673-cc4b4abcf8d5453d9c14a5ad304063e3/b88c8f32e5693eade30c534bf94f295df40e1d87;
+    sha256 = "0br9zqlnczmdcnay2lja9j6wahsi13182jvd823q0c5rz8r7y9ha";
+  };
+  "b8b07927a65a87a42232ceb51c98a8b5d6893348" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b8b07927a65a87a42232ceb51c98a8b5d6893348;
+    sha256 = "03kgb1qbibsrhf1h1xx6zlm0dckjymxbjkd0rr3r896xg10rgr5i";
+  };
+  "b8ddc52b5bf66003c85e7e259287f4741bfe8119" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/b8ddc52b5bf66003c85e7e259287f4741bfe8119;
+    sha256 = "1207ryz0lz26nw1vjnhicxn94xzf6i55h312xqgl3w1mz3l6m4pw";
+  };
+  "b8e153475935a408d91ca55c8e98030d5cc99ceb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2435859-13d694fe2b4f4b1b838326ec956dab4d/b8e153475935a408d91ca55c8e98030d5cc99ceb;
+    sha256 = "1rv2kj03nacyhh3bddn2vsvh98ld3f1rizx71hg5q5qx5ikihabp";
+  };
+  "b8e9ff6bec00725cf169b237001ce72af9342600" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/b8e9ff6bec00725cf169b237001ce72af9342600;
+    sha256 = "19cv6afmrykdhfwci6532yx560pc1l6a4z9k7fjh2y9zcgz5v38h";
+  };
+  "b8fd57460311ef331feabf98c510f76f80053855" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/b8fd57460311ef331feabf98c510f76f80053855;
+    sha256 = "0xki6y0slv4g5wg8z323pa09z2s0v14pkmkas9h7j1z8jh2wczwi";
+  };
+  "b94c9f0d77457d47a979c48f936f9be3c11930e0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/b94c9f0d77457d47a979c48f936f9be3c11930e0;
+    sha256 = "1nlg8bv50idaxxhawrxnwdr9s2cq31ac46s383lqmnxmbiyinx9q";
+  };
+  "b955f5ba1db0d7a6f27b22a2a79e008593d687e4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/b955f5ba1db0d7a6f27b22a2a79e008593d687e4;
+    sha256 = "0ywsp3g116w2cbavbm6hiv6sm60zm74lix5j1ipliq9nlkkjfd6a";
+  };
+  "b9e5928d9d628a4f6a0795a3f4947e59fd82874e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/b9e5928d9d628a4f6a0795a3f4947e59fd82874e;
+    sha256 = "1p3sb9hzqi7isqpw3a4mzra1a56qrzvhrsc483qb8dpj85a134cr";
+  };
+  "ba2567e2e68ba6bc101c3614005d68fd1d0ac2c0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2624272-fa13935f6af5491e88fc623f350f6d60/ba2567e2e68ba6bc101c3614005d68fd1d0ac2c0;
+    sha256 = "055hiysma8dhw6fxclbc87s8r24sqrs8hddri0alc3x3ckgx1xvr";
+  };
+  "ba59a62dae63fc2d143e0cf4c7c65185055b6cfc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ba59a62dae63fc2d143e0cf4c7c65185055b6cfc;
+    sha256 = "0ds72np4k5a83wdianr988wl3l83ml4mmrv7xhq7knmxga11zgww";
+  };
+  "ba6332a94c99ed09c2a9e428e54763da5b1576f9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ba6332a94c99ed09c2a9e428e54763da5b1576f9;
+    sha256 = "0hq06wfzqwddzmji8iwl93gn1h7bsrm5wydfhd2jdkvbchdjrng9";
+  };
+  "ba6a5b201e1374856d563e960e0a5f7a935cf37d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ba6a5b201e1374856d563e960e0a5f7a935cf37d;
+    sha256 = "0i3lsazrz4d5y8k4569jc9qyr45r5mkp1bkm705ah2ykli1mwvgn";
+  };
+  "ba8f3a342d5ba472b330c322376f9f3d7921dcd3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/ba8f3a342d5ba472b330c322376f9f3d7921dcd3;
+    sha256 = "1m04gn311csvzbn4qmass7v0zpwgc6gb9bh76xk1nqirzm1sqjjx";
+  };
+  "bad3d27e656261f89d7bfe9409032b1623077a17" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bad3d27e656261f89d7bfe9409032b1623077a17;
+    sha256 = "0j6q8pjr2iazpk2ljdxaa0f4m4nsw1bvgpqbnl3l7s8514r98yj5";
+  };
+  "bb049becabe678eba91b10ef8dceac666811ba85" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bb049becabe678eba91b10ef8dceac666811ba85;
+    sha256 = "1gzd6j43gq4w5zrib4ww8ipdhkh8zmzfkiq55wwmfk6jpqqxyaxv";
+  };
+  "bb258d693db2159bec8923eb69e53769e0082936" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/bb258d693db2159bec8923eb69e53769e0082936;
+    sha256 = "0pgvj37zvrrxrpkd3a3iwp7d2kyd5c854vsbksq24cpjbdmdiazf";
+  };
+  "bb2be5134bddeb480f0a728bd702988afdd4811f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/bb2be5134bddeb480f0a728bd702988afdd4811f;
+    sha256 = "0z85frk7i22ql1flrnyipp5vwlyy2j5fw6nyx04pjhv8i0d86ims";
+  };
+  "bb5ab39ad700a8ef35bb3bbd27b4c382839c69ea" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/bb5ab39ad700a8ef35bb3bbd27b4c382839c69ea;
+    sha256 = "1p8q27cjb4mxn8y3x4l61z880bxs0swn6a8zgrmyzdmcxxnrkbck";
+  };
+  "bb77f99554309b937e1c3bc3c0569d3ef0568a00" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/bb77f99554309b937e1c3bc3c0569d3ef0568a00;
+    sha256 = "12kyhxb2sxk0n0j7xnsqccrmf6svsblpmg9hgx5p84qr1wwi3l8g";
+  };
+  "bbb17328cc23f4bf942377d41807a13a7b852229" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bbb17328cc23f4bf942377d41807a13a7b852229;
+    sha256 = "13nj59zrhss1z8czcahqsljdgjbpcrn7ajyz2v0nvhlxv5zvqk56";
+  };
+  "bbcf231dbaac1a61eba6aa76798c72923c7ddc56" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/bbcf231dbaac1a61eba6aa76798c72923c7ddc56;
+    sha256 = "1zqi6x73wj86nzsnq3gc19f25s0hzjc72zhhn3k2mmmzg6c5rk06";
+  };
+  "bbd3ed12cac3a5812ed814525f0d0018011bcd2f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/bbd3ed12cac3a5812ed814525f0d0018011bcd2f;
+    sha256 = "13k4nj6cls0bm9fbfznanlpaxi6rf5cl96fjzdh5knakhr5pg4vb";
+  };
+  "bbdc2b6ed549549505ee1860ea5068ae5bfc7db2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/bbdc2b6ed549549505ee1860ea5068ae5bfc7db2;
+    sha256 = "04vf62h854l2bby4a101c4wcngvzh04n0agv8kckjbxd4484kqkh";
+  };
+  "bc249eda4e4d0e13fd0e6a660e8cb471ace80c0a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/bc249eda4e4d0e13fd0e6a660e8cb471ace80c0a;
+    sha256 = "01saqqwf52fg5cv3cbf7kx80pa5lp6n70wjc1vzkx322sz1d37wc";
+  };
+  "bc927fee31049f8467d1a02704ac805cef57cb71" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/bc927fee31049f8467d1a02704ac805cef57cb71;
+    sha256 = "03zny0fk95qr83wrdhhnb6knygc8m4y4z1b45m89gvxjz3s7qz9g";
+  };
+  "bca8b698f2e07aaa627a4e94587fdef669602b23" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716370-1fe4be93d0274863a43a7797419557e3/bca8b698f2e07aaa627a4e94587fdef669602b23;
+    sha256 = "1rdpv3fci2l9q3802wajkr1b8as0g17g1mnzyzndsr68jwafn4sf";
+  };
+  "bcb92df46de5890dc5538dd7f0256a6504653c01" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bcb92df46de5890dc5538dd7f0256a6504653c01;
+    sha256 = "1rfdcc2ap488hr67sbpdafc3g4kpxhqv49yjqm9aygj9pb237amw";
+  };
+  "bcc1b9fa37b696e2b1e09da24ada79401007ef3b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bcc1b9fa37b696e2b1e09da24ada79401007ef3b;
+    sha256 = "1g113bj35nm7nm0xabfdsrbx5p02cqynp2xr5m656k3iln0q57fg";
+  };
+  "bcc352fe44e93b30ce97deea8345406542f840d7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/bcc352fe44e93b30ce97deea8345406542f840d7;
+    sha256 = "0m5vf9x58s47bm4x1vrrs0hrv4pjiy1a6qxx36qrsrqfv6shb6k0";
+  };
+  "bcd0cabdfbee7db486a249459af2c96bbe597c9b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/bcd0cabdfbee7db486a249459af2c96bbe597c9b;
+    sha256 = "1gl16fgzp7ljwablwn7n7l6d27m2vfiwycwpqag3nmvcqmsa236c";
+  };
+  "bd11c74bd2655f16eff2974a9ea3299f642a52cf" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bd11c74bd2655f16eff2974a9ea3299f642a52cf;
+    sha256 = "168rzxjij3dpqjymrqyqqgablffs3mgqfhmi4fnd31mpq1cmx7lf";
+  };
+  "bd969e12b2d210ce0b8817860e18034a3a30c510" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bd969e12b2d210ce0b8817860e18034a3a30c510;
+    sha256 = "0yal1m4cpkd4nqfarccf5z7szaz46k1cflv9v0797dlk81zgrwjh";
+  };
+  "bdd022a7d16d25b6d56f693ab8ddb909273da156" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/bdd022a7d16d25b6d56f693ab8ddb909273da156;
+    sha256 = "1zqrs5nan5ipaxf392f25ynyppxfc5zq9nafq15ic4z7a5az2nz7";
+  };
+  "be2367fa9ac1bcb508f247e19ea18ae92e277583" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/be2367fa9ac1bcb508f247e19ea18ae92e277583;
+    sha256 = "1pffz2clg1ql5d14an4y6g6i148vxiai2kq2hzkbvv23hgmhczlz";
+  };
+  "be250ea55f51ad2bfa64247db8ab7f7ba22bcc99" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/be250ea55f51ad2bfa64247db8ab7f7ba22bcc99;
+    sha256 = "1hrj2ggi584mlc8nxpniczsyj4xcgygf3adi7xql5vmmb5h8gvim";
+  };
+  "be6492e4410913060da03bbab7fc0ce412e8bb38" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/be6492e4410913060da03bbab7fc0ce412e8bb38;
+    sha256 = "0mpw68bffg01n0g5706nllhck685n32fy1fbg4fs6hk199ddz252";
+  };
+  "be6c1ac56f7b742b9f733b29f46549c5b46f7644" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/be6c1ac56f7b742b9f733b29f46549c5b46f7644;
+    sha256 = "1m4kszd8nqb7xwgmbf14d5ndfpjf1li2w7wsg00km3d5plsl1458";
+  };
+  "be8aba4af0c0804bb17d6ce660ccc3973fb6c35d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/be8aba4af0c0804bb17d6ce660ccc3973fb6c35d;
+    sha256 = "0y77nmzw5hg874iw4y69qmyiz5xg0kr685gprs4nhx09ia4j0c91";
+  };
+  "bee8e68740f8d36a56d9f09e880ff29b5adf0496" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/bee8e68740f8d36a56d9f09e880ff29b5adf0496;
+    sha256 = "1xkdq0792shkjmgf48j4cy4pf3d710zx91g2xmbjfax892n5k1lc";
+  };
+  "bf03069e8d65f6b224763824352cf754ebcbc339" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bf03069e8d65f6b224763824352cf754ebcbc339;
+    sha256 = "1kv8kfwh0bki0zdfimhkrhib56p2bj02by25dmhqvg39r480rs36";
+  };
+  "bf03cada636a04cf211c2e10d586f47b2dda7902" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/bf03cada636a04cf211c2e10d586f47b2dda7902;
+    sha256 = "085zw12vjkdg9r3lki1wnzm8981d7mlzvsgihb7v34zh77idy2vd";
+  };
+  "bf30590744b68cebf21b6124ffdccdf6964f7163" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bf30590744b68cebf21b6124ffdccdf6964f7163;
+    sha256 = "08dd0mg3p60gmzqh0dyfj65icyaa7q44daidqwdbd62h9yxxf9c3";
+  };
+  "bf49c9dd965903acaa8c00eba5613c4de5fe0250" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/bf49c9dd965903acaa8c00eba5613c4de5fe0250;
+    sha256 = "08ga8yhh586h0yc0i2n3a28wmwbzlhz57va40rq269dx93gap3mn";
+  };
+  "bf4dda70b776a7efb6c3302f7abb3d24e90652d7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2579917-73d6be760fd9486fbc9abe582732eb6e/bf4dda70b776a7efb6c3302f7abb3d24e90652d7;
+    sha256 = "0m11crr85b0315yvb4n4pwvzg24zdwgqzw0c5yf1kvjdzkm1z8w7";
+  };
+  "bf920c60bfd2a78e29432783f56c62f419515f85" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/bf920c60bfd2a78e29432783f56c62f419515f85;
+    sha256 = "1rvkpgzckmwrn4bndlq6zc38kc0wj4y6lv0xv26harw3z467fzbp";
+  };
+  "bfed7e9e92de3969ace22aefdf5d85a45b2068c5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/bfed7e9e92de3969ace22aefdf5d85a45b2068c5;
+    sha256 = "0srdb9aahfik14g4s2b7j6ff73g139iqx36fnm86nalf09digdnp";
+  };
+  "bff70448477367ce462c3ee06f051b1f047549ad" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613445-f4cf430b68ba4dbf80d97361d7c5dd6e/bff70448477367ce462c3ee06f051b1f047549ad;
+    sha256 = "1z2jva1iph244fay5f84srg2wpji4gyfv6qss3130i0yzwlbkpqd";
+  };
+  "c0078092106c7019d3c1a17afb492202a59101b2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/c0078092106c7019d3c1a17afb492202a59101b2;
+    sha256 = "0k2i5d1lylbjq7wzi7hzazq5hhyiav9yjpc5y26dz5d2l06nc43i";
+  };
+  "c007855aa7a0479a01364a56f831920abf69f840" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/c007855aa7a0479a01364a56f831920abf69f840;
+    sha256 = "1cjd5amlgpgqr7fm98g515qd3hl169mw4lg7i7hv9h4d6jrynxrh";
+  };
+  "c02b5a7580fbfb67eb000c6b641d7431e90ce87f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/c02b5a7580fbfb67eb000c6b641d7431e90ce87f;
+    sha256 = "1iri4r9nrv07sd060d1iy31pp584svm3470rxb0a82wdifh592k5";
+  };
+  "c0476a6a0442712d3245a0babbf62c40e8e75b95" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/c0476a6a0442712d3245a0babbf62c40e8e75b95;
+    sha256 = "134j96dp2yy1n19mbh15cdbwwfi5kfi37bb36vc3jbpbispgbiw7";
+  };
+  "c05811bfedda9e7307a79810ed22e36c9b1e3639" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2728442-495b054ed4db444082c281db65b26f74/c05811bfedda9e7307a79810ed22e36c9b1e3639;
+    sha256 = "11jrzgkzjhnvzl26rq4cg64rn1w354fivkp0kmpn4l323ih89hlw";
+  };
+  "c059220dd6a95113a01bfba79f5ed3d5e1766535" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c059220dd6a95113a01bfba79f5ed3d5e1766535;
+    sha256 = "1hlhsmrqkmivz7cgsj1r7g041fkgjqvff5dcafm6zfh9invjminv";
+  };
+  "c0890e191c0abbf571bc8e71dd0996ecee557a66" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c0890e191c0abbf571bc8e71dd0996ecee557a66;
+    sha256 = "0gnmkajymhhvkygd35qbqbdfza3msjpsziwapr4l7fkzwn9nw4b6";
+  };
+  "c0c041729c29323273ff25722a4fde1aa90a2b9a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2388509-1346da53605048a5b86087c481124153/c0c041729c29323273ff25722a4fde1aa90a2b9a;
+    sha256 = "1kg32w0qqnsz45fpwj9vqcnnvn03f6m7ngswi5gni3asg3xxnlfa";
+  };
+  "c0c56d20bbce88d3e626d132185502535d37ae8c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c0c56d20bbce88d3e626d132185502535d37ae8c;
+    sha256 = "1zijd325z8zvmz78qi34vn7bwc6glw0bv07av8kyxxl3q08yyi5y";
+  };
+  "c1023e403c67693d0cda4a7067f08cc4868b331f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/c1023e403c67693d0cda4a7067f08cc4868b331f;
+    sha256 = "1z1ridxkw4v62r7wpy8p3a2pvbbk5s6fvnb3pj6risyd2nalnx84";
+  };
+  "c1348ebfc2f62edbbaf065a9987835d16f3faebe" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c1348ebfc2f62edbbaf065a9987835d16f3faebe;
+    sha256 = "1rbz1jawc4rga0r0153w48n10b5gvamv0356iw79pjag6naylb2z";
+  };
+  "c1621ab3068dbffadc595d03ef2ca486f7a5d484" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c1621ab3068dbffadc595d03ef2ca486f7a5d484;
+    sha256 = "005d8nk35149kqw2jy0bmfkgs036ymj6khdpgyhybafyqns3kxl5";
+  };
+  "c16c7518b7bf0b8838fb4ec5d024020f7d7dcd2c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c16c7518b7bf0b8838fb4ec5d024020f7d7dcd2c;
+    sha256 = "0v3frxr6pb15y1m6lvkblhhy08k67vbcnjxb0r6pldqqgr10w74d";
+  };
+  "c18d93c3fb088e46dc560285a889e191b2350e3b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c18d93c3fb088e46dc560285a889e191b2350e3b;
+    sha256 = "1gpivr38hx21v5vclbgrbzjdg0ly1ksrdx03vnkjzm2f2564qany";
+  };
+  "c1aea1c747a9068d40e613d94eaf43b511d8008c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/c1aea1c747a9068d40e613d94eaf43b511d8008c;
+    sha256 = "0b7vs9yh0hl73zn5q7lxgwj898rh3qmphsmrab9b2byfbj4mk76k";
+  };
+  "c1d09face93090ba4fb6700351d2c5202a35a2f7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c1d09face93090ba4fb6700351d2c5202a35a2f7;
+    sha256 = "117cl93bgd91lpp7xd6sr87xcr1j8bsam637khgdcw8mj5k3npqz";
+  };
+  "c25bec168e93ab9183b4187a3172187d41e8b094" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/c25bec168e93ab9183b4187a3172187d41e8b094;
+    sha256 = "0pgzkljpjj8r7l7b6bqqrvqhqcv67r4drbdlq0fqw1cgpspvk9zi";
+  };
+  "c260984388b36733a83e5c5a2d1bddf9202de51e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c260984388b36733a83e5c5a2d1bddf9202de51e;
+    sha256 = "1qd8vzscnfygqbmwxf61df75j565jr052igscsrq2jy79ls6gndz";
+  };
+  "c28e42653d329ca15b9b65ef130aa7e18df44da4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716370-1fe4be93d0274863a43a7797419557e3/c28e42653d329ca15b9b65ef130aa7e18df44da4;
+    sha256 = "0bsbd40nwyx5592fs2clf6bf7am52fswa68lkpqdimq5srabwcyf";
+  };
+  "c299da387c827b828bdc3e81fb617c8992d1ffbe" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c299da387c827b828bdc3e81fb617c8992d1ffbe;
+    sha256 = "1lfv6s7cjfibbyn89pwc15xfmz0ismcsd8hjna9a9isbi9bfqf8r";
+  };
+  "c2b5d2cc4aa67357f3ee15def8c1d137016f723e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/c2b5d2cc4aa67357f3ee15def8c1d137016f723e;
+    sha256 = "0y15qbgnfx0av2qlnff4xj0n1njnq00agxlr7sr0xwqabkkzlm9y";
+  };
+  "c2c0e9b8e4352e01ad72f4a6d2ce4e6c0c26878e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c2c0e9b8e4352e01ad72f4a6d2ce4e6c0c26878e;
+    sha256 = "1b50br0m1ff7haidcqhnn3ggxa0jf57bsnzq1h90320ciszkk3rj";
+  };
+  "c2d1aa057a438fe3a8996316005b4f584d087df7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/c2d1aa057a438fe3a8996316005b4f584d087df7;
+    sha256 = "1fdgibvi2aiy9xd3xjvv6fm5qvz2bsmax9v648sb8gdlvp1a2s1i";
+  };
+  "c3390a1d1d84fd03f5aa0a105422b669c9f6ab91" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/c3390a1d1d84fd03f5aa0a105422b669c9f6ab91;
+    sha256 = "16gmb4j6ky53h7lzyccd59aidqxyvjiq9bh43m326jwvbnmcr7lg";
+  };
+  "c3a4ce7861427e417e289e118620ba02ecec6995" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c3a4ce7861427e417e289e118620ba02ecec6995;
+    sha256 = "03qqa0w3p8isci9243jsivlrzzw0scf5w6371jfs4h109fw0qg6b";
+  };
+  "c40ca2cfe00fdc980844d0a02dfb2571b7fe48c3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c40ca2cfe00fdc980844d0a02dfb2571b7fe48c3;
+    sha256 = "0cxr3qncsx37g69labw8lz622yn9rjxybagd6wrf1bgvacg9f8kv";
+  };
+  "c430a47ee45e5afb9a0831bf2ea38b466b497549" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c430a47ee45e5afb9a0831bf2ea38b466b497549;
+    sha256 = "1bz6j9s06jn1nwyiczama8axg707vd5ny6p44i905z7z2r46s5nj";
+  };
+  "c431002fc0e408cf00a8650910c2f4bb3b85df53" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/c431002fc0e408cf00a8650910c2f4bb3b85df53;
+    sha256 = "01dc7m14cdf4dmc389d3wng39chqj7wiisxzzm83knbjdihrhfrp";
+  };
+  "c461017451f8ce7d5833a200e5d6fa969138fc0f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/c461017451f8ce7d5833a200e5d6fa969138fc0f;
+    sha256 = "1bm0alxlmrkzrrv23s2qab55wxccl3vkhq2srzcw2fnvi407gzif";
+  };
+  "c467b9d4b67580014c04e62e822a99d7cd7a6dbb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c467b9d4b67580014c04e62e822a99d7cd7a6dbb;
+    sha256 = "0jw6ppirc57wqn41x1c4c9x6i8xrxy8yjwk999rz0swf4dwambx0";
+  };
+  "c4ac8e5f2224886f32727c69401d26eaf54e6d17" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c4ac8e5f2224886f32727c69401d26eaf54e6d17;
+    sha256 = "05lsv3lpg7sa57q6vm98iskxmmza487nppahzqnc4g7h16k7x0v9";
+  };
+  "c4d70abc45c0067c48d200a7195e87cb07990867" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c4d70abc45c0067c48d200a7195e87cb07990867;
+    sha256 = "12lbg924x6g1zq6bq0ah54k1vgj5bplayizb4ihrn28sgfmc9y29";
+  };
+  "c54921d21c20e7c27fee9dadcf212291b32f32de" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c54921d21c20e7c27fee9dadcf212291b32f32de;
+    sha256 = "0yb7amg4pnaz7fjqwmjsydz6wig9rqig5wv74zpmc9yalxyfym5k";
+  };
+  "c57259f627108af7691176d6a5ab0a8bdb504fe8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c57259f627108af7691176d6a5ab0a8bdb504fe8;
+    sha256 = "0426ssgyxinyvqq69hcah4ddl249ic412bdvlgwfx10m636h7nk4";
+  };
+  "c58fa62bd83bf317b52d835b43fe31cb0a5fed9c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c58fa62bd83bf317b52d835b43fe31cb0a5fed9c;
+    sha256 = "0s66g3ggy0zz70p6vs4qwkwgv3jnk2b2y3a7rh58385gg3dk4ccm";
+  };
+  "c596e1a5af08148c69666476cb7a935d5b860e04" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c596e1a5af08148c69666476cb7a935d5b860e04;
+    sha256 = "0sglq3myrvkw38gah4pgpslrsfrx7j1h9dxbx8dbykzjzprf3i0j";
+  };
+  "c620a0e05618810252d4b0f8e82fe97a677dde26" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c620a0e05618810252d4b0f8e82fe97a677dde26;
+    sha256 = "1i95wlgkq1d3m7k4qdfm5h6vs2m0f45d6hpcg3dj8jxy5zvqsgmq";
+  };
+  "c63b8b65198dbac3e3764c69e57b85f011332ea1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c63b8b65198dbac3e3764c69e57b85f011332ea1;
+    sha256 = "0ybhwi57ic2c0xshlj2jw9y0rmmnn9yy22dff4c51mj08g9xqjr0";
+  };
+  "c64839804e94445b7c1ac409d5d0f8f1ea36e54c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c64839804e94445b7c1ac409d5d0f8f1ea36e54c;
+    sha256 = "00s8l1sr0cfkchqyhfvp0ix3fpf10a2smj93xibimkh9lfaz6i35";
+  };
+  "c650d7a313cf559c35793ae4885bfb7ab7e24cd2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2597174-0975f975d1f0463f931b68ea4b0ef6d0/c650d7a313cf559c35793ae4885bfb7ab7e24cd2;
+    sha256 = "1j9rkf1zys5sygijb650s5si25s95hfh6v5z2ahii1gylkrn7lh5";
+  };
+  "c653b9ebfd67dfad854b519e55534735d82f73f2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c653b9ebfd67dfad854b519e55534735d82f73f2;
+    sha256 = "0s2fq88ay1080qqf3qlvh7g0sddbbs8a0jvb6992wbbb0y23839a";
+  };
+  "c705af8ab47f089acd3efa03df30ad116079209c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c705af8ab47f089acd3efa03df30ad116079209c;
+    sha256 = "0dmpf4agrq74ga9sgp8qlb4wsps3fg33jiv0x8mj82d9h064y4li";
+  };
+  "c77e5ef4d0349554ba75af77135182db3577571a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/c77e5ef4d0349554ba75af77135182db3577571a;
+    sha256 = "03gir460iljc089y523fqlxvbp7sq1n9v6ldi6ij52fpm6wvzid1";
+  };
+  "c78d32aaf4ea80b2746ac7ad1692b021b1b548b7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c78d32aaf4ea80b2746ac7ad1692b021b1b548b7;
+    sha256 = "1gwakfigb6bxjjr2scx753kjjvxy32npc5s5l3jqiidw27mbwrjh";
+  };
+  "c7945d9532844fa35363f33da23f208a629dbe28" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c7945d9532844fa35363f33da23f208a629dbe28;
+    sha256 = "1g43sj9v065rvg73jynaycnp3jlw9cngbzr0lv4jyiip8ycd9m7z";
+  };
+  "c7a7c3acf3dd7cd611ae94f5c86473ecd3a2955b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c7a7c3acf3dd7cd611ae94f5c86473ecd3a2955b;
+    sha256 = "1nh8drrb4sk4sid00m2l41pwz01n752jxn7xcxdjfgf1qri7gmfp";
+  };
+  "c7d451a7ac00e4726f44c4fb551c45dfd4614302" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/c7d451a7ac00e4726f44c4fb551c45dfd4614302;
+    sha256 = "0fmsf826chnq5lsfqgp8ndys4aa6v9gpsq3jcwwak3kl8vni21x8";
+  };
+  "c7ea7e43fc1d7ff54a1a54b74c3962098d7851bb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c7ea7e43fc1d7ff54a1a54b74c3962098d7851bb;
+    sha256 = "0gxk8c51f6hsx98sx6f4laqmcc3ln3sslr8848blqwvnhwy3fqfn";
+  };
+  "c7fb09c7cbdf7c014549eb2b9c1345a0f2ac3770" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2714108-1287c19490104fa7a8ca7bc71daf7ae8/c7fb09c7cbdf7c014549eb2b9c1345a0f2ac3770;
+    sha256 = "1c51kddffr04xf65sykxy8lmx25066gcrz881m7iwx20l5rnlc1m";
+  };
+  "c840da0835818272e18eacdd15f50e802453c69c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/c840da0835818272e18eacdd15f50e802453c69c;
+    sha256 = "137193jraim288jy64k6sinwg4pqhc6cchspxjzzn8h7dzfbmyjr";
+  };
+  "c874ee18eb2aefe1e6d4345996da6c6ce2087d43" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/c874ee18eb2aefe1e6d4345996da6c6ce2087d43;
+    sha256 = "09i5kmida7s8zw8az2b1wxnsradjfv47hiy20fkrdqhpz0ra8lh7";
+  };
+  "c884f0dbf617ea1c10f5b347fd4f19d3d87befb2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c884f0dbf617ea1c10f5b347fd4f19d3d87befb2;
+    sha256 = "1nhrhkzlvfdb4lp0v2syiwpd13sjx0z390wh404197p31xjwjvyq";
+  };
+  "c88fb38c74260fca80491abeaa7a26fd116fba25" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c88fb38c74260fca80491abeaa7a26fd116fba25;
+    sha256 = "0bk6g0fns1g08zghm5nf2wipbcxzwprcg106d9rifgsq4w1bxk7i";
+  };
+  "c8fcf9a784756d66ad119b3e642423161380add6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2572690-84e70917b1c64a80b248151191ccd58a/c8fcf9a784756d66ad119b3e642423161380add6;
+    sha256 = "1ixadgvvl3w9wirikl6fsj3g7lkbji4pa67pplys3fxd3rwflzqg";
+  };
+  "c939abca16161626114a6afa440cfb71ae87dc6d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/c939abca16161626114a6afa440cfb71ae87dc6d;
+    sha256 = "1mqhplp4zkxr2qzcl4xdqgh8ng5yhgrmjqsm5g04zlyn1xb46ghi";
+  };
+  "c93c98cb950c9d8f504bea894ad865f29b9991ec" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2528371-50b896349a4f4b48b4cce5ef240b0c45/c93c98cb950c9d8f504bea894ad865f29b9991ec;
+    sha256 = "006lrid8py6qhn21gi6n80nfd4y7v29xpjz8c80q8a4p1klayvkr";
+  };
+  "c93f0a56e40373b70b8f6cfcd57796df6e3e5d64" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/c93f0a56e40373b70b8f6cfcd57796df6e3e5d64;
+    sha256 = "0s7dgwc50q78b20l33ra8wrlxkqf0666ldxqb4isx6bk973yf7kv";
+  };
+  "c9440b326c43f4ba6af0b71b1ca029ae223ecabb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/c9440b326c43f4ba6af0b71b1ca029ae223ecabb;
+    sha256 = "1wzfk57gnly1qafvjcy7jxa5nbq3fm89fjna9h7xfaf382kwviwm";
+  };
+  "c946526ac2560a1cf84cb7a63c24bc9994fed050" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/c946526ac2560a1cf84cb7a63c24bc9994fed050;
+    sha256 = "117i8fkym78xq4ssk9hvhfw51myx69xnxm9zxd8mvsa7yrfd3420";
+  };
+  "c95cdaed781fb020898a671e373b60aa382404ff" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c95cdaed781fb020898a671e373b60aa382404ff;
+    sha256 = "19626mhx070k3myam8g2s9dvqqx82pv7jbrdnnkbiz3kc0i65xzm";
+  };
+  "c96e9cd94a86b222bed132142b65c1d90314445d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2441582-104388acf6d34237af496ee648a9c7db/c96e9cd94a86b222bed132142b65c1d90314445d;
+    sha256 = "1vp5lzll11hhn6qwn21qnidhlr6md2mm4cnafpbgsj7ci5jy9i8v";
+  };
+  "c9b2fa52f0b68b4de48806e71af562ddd9ab8363" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2501204-f81f6b4f13824670853a18474a99a9e4/c9b2fa52f0b68b4de48806e71af562ddd9ab8363;
+    sha256 = "1lhr1k6qj5v1j3h4g6q4cwmswpk96l3v26gbq5hj2alab6r5chvs";
+  };
+  "c9f7bd390be6e2f50469fcf024ace928b624a38d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/c9f7bd390be6e2f50469fcf024ace928b624a38d;
+    sha256 = "1rsbwbgiqgvck30gd86p2sh53gykb68sfgyfpflqng9psffzxfja";
+  };
+  "ca146ad3bcc63037df80affd27568080de042fd2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ca146ad3bcc63037df80affd27568080de042fd2;
+    sha256 = "0dd3piwj2g5zfiidysy219xvcdypdmdqfccwv0ib4ddb6yxa0csd";
+  };
+  "ca3317bb9d7ae47177c0d9362f17d53c865d8b92" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/ca3317bb9d7ae47177c0d9362f17d53c865d8b92;
+    sha256 = "17vb8vrkc7y3rspnbd6nw34v58ifi8dr206kcf2ah8zpfbpqqkcd";
+  };
+  "ca72923ffc518f8f79ad2bb67a376e8c4e51c3ff" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/ca72923ffc518f8f79ad2bb67a376e8c4e51c3ff;
+    sha256 = "0zk6xryzk7d8g0f148n4n2zk92jspi71v530bp50nqpjzclv4j7f";
+  };
+  "ca83db39ca850bdf08a4e3bda07b207534365c24" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ca83db39ca850bdf08a4e3bda07b207534365c24;
+    sha256 = "10a9vl982ni45wj3mnky56n2yljvha2xic4mf2n3vrmrr1aqxrah";
+  };
+  "caafa6d602fb6dfd386f6eb601ff8ed2b2e74234" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2622402-86d1483fa60742b6be9fd5a0b0b946e0/caafa6d602fb6dfd386f6eb601ff8ed2b2e74234;
+    sha256 = "1r4vjwkkckaj25ajhw3csn351lppwgb46dc6im023dy8lj5fvc5d";
+  };
+  "cad827e1f1025fed382fad69988e6878edf449bc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/cad827e1f1025fed382fad69988e6878edf449bc;
+    sha256 = "0fz5m8ab4xa5zm8n9w8a4yrzhzjfq7wald118r8s50r4fwsnm517";
+  };
+  "cb540e992bfeed51b40d2faa7209ebc16384c2cc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/cb540e992bfeed51b40d2faa7209ebc16384c2cc;
+    sha256 = "145pgs42bmwr56r4fkjf40l24j9imhcf1f004k2bbmjn8518h4nb";
+  };
+  "cb5e9b0f8eb95171fa01852fb15eabf2845a79f5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/cb5e9b0f8eb95171fa01852fb15eabf2845a79f5;
+    sha256 = "0yy29b05a07h2zk1zy298i1ydlh3vr9mmjawqb34fgff18m1xy3w";
+  };
+  "cb73a430e097bac42d93ec902203b7888ed0b681" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/cb73a430e097bac42d93ec902203b7888ed0b681;
+    sha256 = "1nysj9pxf2kwsh7v8iqz305slwy2s6ysmg9ra76ysmns7rh9rvap";
+  };
+  "cb81a778a0190199a4c52ec5e9e3f749c532fdf8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/cb81a778a0190199a4c52ec5e9e3f749c532fdf8;
+    sha256 = "1hl7yhy7ysg35vrq5y4ngq4aiqfkb5h74zd6x7qay1k588k3af7g";
+  };
+  "cbafcbe19329c889151577a995439d8c09b69f61" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/cbafcbe19329c889151577a995439d8c09b69f61;
+    sha256 = "194zad942iv7rr5fngyk0kpckafip987mhgl1bk2fflvxvs5nckg";
+  };
+  "cbe9427bf8fe34234353780bf7d7188dbd5673af" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/cbe9427bf8fe34234353780bf7d7188dbd5673af;
+    sha256 = "18ri7fwgvyp6p3qm4qn32dyiiwl2vw3f4j5g0dgv4k8p29cpx7d3";
+  };
+  "cc2764b781992363c5941eb2399962b3dc251c9a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/cc2764b781992363c5941eb2399962b3dc251c9a;
+    sha256 = "0sxvjqbyz3bvppf090vpwggb0f758mxh16m0f5lf3z6xv917vbqw";
+  };
+  "cc6c17f5d19462048695c62e88e553ff08996aea" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/cc6c17f5d19462048695c62e88e553ff08996aea;
+    sha256 = "0mi2m0f6j89dj3qbm43clcih8d06z943iv585ni8rp8dpvm733xn";
+  };
+  "ccb1bc3ca1edbf4177b3c0d1784bfcb61f87daae" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ccb1bc3ca1edbf4177b3c0d1784bfcb61f87daae;
+    sha256 = "0lxc3imyakyqxphhyw7xxjlinyvvhpq050xwnydks6bja2nqjrvx";
+  };
+  "ccbf9e16dbb06aba05b68b87bd827f67b8eac84b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ccbf9e16dbb06aba05b68b87bd827f67b8eac84b;
+    sha256 = "1v65rdr6f3a5l8k9pa6aqnarv279ik4g82m3arnndlhs8d1fwry4";
+  };
+  "cd0d52d3a393b848c4524f8d20e9c3d772779d50" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/cd0d52d3a393b848c4524f8d20e9c3d772779d50;
+    sha256 = "1b1vccn5jhy79k1h1ilj572j0nkrv6imb3m3fk9zy897fp8phm86";
+  };
+  "cd136c8c017886023a62be7a07da35d0a4af997e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/cd136c8c017886023a62be7a07da35d0a4af997e;
+    sha256 = "0aw9ipcqp0iq706nw26rriqn1jvsczypwj46yk3sjxmcp7bzf0rg";
+  };
+  "cd20dd95dc2f4e182bbf98e7f0d6a7cd87f10df6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/cd20dd95dc2f4e182bbf98e7f0d6a7cd87f10df6;
+    sha256 = "06ba9m6rcvia5rr1pghi1x4z7xjvw1rj9p9hpd7yvzbn02vx58y1";
+  };
+  "cd28a4a14b5471b45eae79e893b8acbc4f7e1f94" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/cd28a4a14b5471b45eae79e893b8acbc4f7e1f94;
+    sha256 = "110936dirzdy78nxcplpnz8z2hnqpcwdbgb6yfsg9w7a9x0290pd";
+  };
+  "cd31abaa21b8f9ec03052817bf36f6c16178f5e5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2597174-0975f975d1f0463f931b68ea4b0ef6d0/cd31abaa21b8f9ec03052817bf36f6c16178f5e5;
+    sha256 = "0imni7w08al0d35nis2xz501zl5qz1dmc4myhhabvm0l6cf3x4ig";
+  };
+  "cd5ab248342e1a8cf9bd3f635151bfdd3d41ad3b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/cd5ab248342e1a8cf9bd3f635151bfdd3d41ad3b;
+    sha256 = "173d24jramz5i4h5pvm4v22jiqnw87b4g1bg0y2v79n313k4p87g";
+  };
+  "ce44b880be5cb6a25056be3c177c866b85aee1d5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/ce44b880be5cb6a25056be3c177c866b85aee1d5;
+    sha256 = "0gcvwwwzyl8s91fxvzaqnxvkz9kpw08643gra8acmbvplx2r92sj";
+  };
+  "ce8de3d894102a4bb85d1eaaa271f605239a2fd1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ce8de3d894102a4bb85d1eaaa271f605239a2fd1;
+    sha256 = "1m385wpp8zv140c51yq0bybpja4j7rgy837myqb7xsi3cmwsmrdz";
+  };
+  "ced0e06e0c817a6519c5a995d3ba2743df02ecdf" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ced0e06e0c817a6519c5a995d3ba2743df02ecdf;
+    sha256 = "0hfxs8i2cjifry6sbyqhw5f54ngbl3dnhzmikvhci0mz1np1blah";
+  };
+  "ced6c6d11883cd80b95d5f522d9526e6467945e5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ced6c6d11883cd80b95d5f522d9526e6467945e5;
+    sha256 = "0ii9010n609i4i4zip2mgjqnhpfb7imfxviqi8kbax35mkfv38ci";
+  };
+  "ceefcb84598a9a4c5ce8d34e749d52d7511a8013" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/ceefcb84598a9a4c5ce8d34e749d52d7511a8013;
+    sha256 = "0rynh9y2scir13ffmgwqcdvcm21p2n0q4i3di1aval7r690b0wz1";
+  };
+  "cefd87d67f6688e869ab62068aa16c5f02113c8c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2597174-0975f975d1f0463f931b68ea4b0ef6d0/cefd87d67f6688e869ab62068aa16c5f02113c8c;
+    sha256 = "0nli07f78bpmjk6bxaa2x32m1l7ds6d4rh8iycciywm8fwbw0ak6";
+  };
+  "cf4a635ba3a4c070a83394e45c5bae8ef8651afe" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2621163-719903f8599f48949652ccefc2a2d5be/cf4a635ba3a4c070a83394e45c5bae8ef8651afe;
+    sha256 = "0pb38cbss34md3pn9j1rzhwanq1dwqw2jpaygsb9fzxnrgypismr";
+  };
+  "cf5e1ce959a11e3674cc1a7c352dc878022c2eff" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2547993-1fb84b9e293242c988e586c599eeeb56/cf5e1ce959a11e3674cc1a7c352dc878022c2eff;
+    sha256 = "0lyp1iavwk61iv47nlaw7s3bdfr469in0d9rngp7mr9w1b367szx";
+  };
+  "cf784788aae211d789405fe0a7308e059e15627c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/cf784788aae211d789405fe0a7308e059e15627c;
+    sha256 = "02cl56q4232l8y34ajl04s0zxq8mdbvbx7bad1q4f2fcx6g395x7";
+  };
+  "cfaa6e2212f937f340e867175482030d495675ed" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2448689-7792f1b8be254cc19b4c3379509684cc/cfaa6e2212f937f340e867175482030d495675ed;
+    sha256 = "0wdpkcnlnkj6bwv1q4g3i3yn2j7rv98h6l58y323h4bn2hn8f90y";
+  };
+  "cfc8c6e323848f57580a531e48fc4b81cdd17efd" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2458551-07195e4b171247cfbc0f6645046eda02/cfc8c6e323848f57580a531e48fc4b81cdd17efd;
+    sha256 = "1bjsd26ckak6212lvb706653raz8sn8b380n5dp653frbsagnmgw";
+  };
+  "cff332b0fe6e7874406db49746b5a2be18f822f5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/cff332b0fe6e7874406db49746b5a2be18f822f5;
+    sha256 = "15w6kfv1pxzswr71knkkyw8zc7i1ibk9rapgp7s9ybkfkdfwrfjn";
+  };
+  "cffe52e7d9b8a547c321247c96a680a061a7c077" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/cffe52e7d9b8a547c321247c96a680a061a7c077;
+    sha256 = "1ha9z55y46lm88zai4dh9404gab7kfkcl95fm0ch22mv3ps94a86";
+  };
+  "d00340b56c80a33987bae91b824e43fa883353b9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/d00340b56c80a33987bae91b824e43fa883353b9;
+    sha256 = "1f9nz3vjw21gvg9s4ycmjcjp3kb79q0inirjnbp0wbxmmd0w102i";
+  };
+  "d01535f7276e94b02b13cc27f3966f8867e79101" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/d01535f7276e94b02b13cc27f3966f8867e79101;
+    sha256 = "05mzb8x5rhs4z9cdfsgv43ggigvpnhkq6jfd5apvsqqyzsrxpn48";
+  };
+  "d04d874a8a5abeb10db060dd59e268c16687663b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d04d874a8a5abeb10db060dd59e268c16687663b;
+    sha256 = "1qaspy0c182xnbpplw4bmnahd52l47g3gmws77gic0ls9dlm98b2";
+  };
+  "d0566c823351a86a79411b3b8d001317aa356284" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d0566c823351a86a79411b3b8d001317aa356284;
+    sha256 = "1i2fxmzs90wjsaxrc26jjmy045gq08p8a3k7z8p9lxkk9xnvvq49";
+  };
+  "d0916b22915dc03f3e2bae8097e2ad696e7c8f4e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2620197-1c557d2f91dd4277b16fd1ed8715aab3/d0916b22915dc03f3e2bae8097e2ad696e7c8f4e;
+    sha256 = "06fl6qfyax8nkccimh3r771l6a36q9rkihdqhn13ax0klab27cmv";
+  };
+  "d0ac4798d087f4f67f533a8d8cc04a7685a380aa" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/d0ac4798d087f4f67f533a8d8cc04a7685a380aa;
+    sha256 = "1fbzjkmizabaxrjipsfx5y4qlsd0vddb0b20cwxx8q74q2m2ai63";
+  };
+  "d110f2213c54503001102b5f9a81fc0743ba32c0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d110f2213c54503001102b5f9a81fc0743ba32c0;
+    sha256 = "12l3jzkrlqfkxrq9nk7ksyzy4ffawci9hlbfnrcwrckiz107360z";
+  };
+  "d111d246a5dff2d0eed94cb2592bfe277ad9e0ea" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d111d246a5dff2d0eed94cb2592bfe277ad9e0ea;
+    sha256 = "0qjagdpy4wx39jg31ib87dh1gfyyhd06aa1g044jnc9zjdx47n7a";
+  };
+  "d1450a3f59e35f9d62efa518fa3ecc4e3ce0b0ef" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d1450a3f59e35f9d62efa518fa3ecc4e3ce0b0ef;
+    sha256 = "0i7hjlykmzasgyxpw5sx7nrcpi6nmqj3ckcr1ayaym7j2d2dljpw";
+  };
+  "d165f29f588eae8d8a55d377f73b67973713c670" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/d165f29f588eae8d8a55d377f73b67973713c670;
+    sha256 = "0gqsm4h2bzvp7pm77z3alrm21pf8vp4m4ihlc9qqwv2jm98gmfi6";
+  };
+  "d1a31fc8df90aed8358e255ead086de9df9b8eea" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2622268-4534504e79af46a28b290d0661d1cc42/d1a31fc8df90aed8358e255ead086de9df9b8eea;
+    sha256 = "0gfbvm7l4skz5snpbk39hr9ccmja5fxkvnrr5278l9ways2d2ilg";
+  };
+  "d1cc40fc311b1fe882b059047a6c7f53925c9827" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d1cc40fc311b1fe882b059047a6c7f53925c9827;
+    sha256 = "0lxfzdv2gwjscqmxsdhdli5sg1mr08djq7ik8a26h96mvxwqna4j";
+  };
+  "d1e8035d7cb1c18606f75bf22a42e813f926497a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d1e8035d7cb1c18606f75bf22a42e813f926497a;
+    sha256 = "0il1fg83apcy0hvr78gfginpw3y522vqky8523wkbvrbipzqps1g";
+  };
+  "d25faf54b177d399192ede835440a8eb4948ab59" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d25faf54b177d399192ede835440a8eb4948ab59;
+    sha256 = "1fwd7slxj50zh75lcj8i17mijsah1gqnid4mvhvyh33fmgbmwc10";
+  };
+  "d27c0f6b2f82d4e0112056dc4963a251ad84b3c5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2482054-e6ea3bde29504ce5b51935e2939eefee/d27c0f6b2f82d4e0112056dc4963a251ad84b3c5;
+    sha256 = "1f6h8h1aaffy0hn17mlzynfaammkm8whsbjlbb31czgpiq445h9w";
+  };
+  "d27cda6ec1c697039954ff45ad0d4bc809382324" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d27cda6ec1c697039954ff45ad0d4bc809382324;
+    sha256 = "119vqrcws2yfw532n7gykqbgh4p0jhx8vfyc7vkzfrj0ynrda9m6";
+  };
+  "d280f17be242e85379048663a32b3f86bfcd6625" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2629494-07ea5ec481884143ac3af33e276b7492/d280f17be242e85379048663a32b3f86bfcd6625;
+    sha256 = "1lfm6gjsz8y3z90ix3prmvpmx0ps8g4rpzflwd8p1wk8h8kqr4jy";
+  };
+  "d28b2e8946d305dc75d30be04ee1c9bfec7bf72a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d28b2e8946d305dc75d30be04ee1c9bfec7bf72a;
+    sha256 = "15yjgzhi621bj13nz1wrs9m7jy2v0mjgx3w59fyv5vgf94mj6nyq";
+  };
+  "d292729e71bdf7b0dfe9367148d16b19fa7a5da7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/d292729e71bdf7b0dfe9367148d16b19fa7a5da7;
+    sha256 = "0g7z09z0rxrjf82y9m30qc2a2gbz34gf0hvwxyb3pwzgfbsapxh1";
+  };
+  "d2a00e055f1285c1fa4a975781d66bcdc44da301" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d2a00e055f1285c1fa4a975781d66bcdc44da301;
+    sha256 = "0ndhbjbcr9mhjzzvfqxx38a84ch7jpb4vik096i71kji8pbby5my";
+  };
+  "d2dbfcbb4a4a5cb2324c962101ba1ae4ebedc502" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d2dbfcbb4a4a5cb2324c962101ba1ae4ebedc502;
+    sha256 = "0ywl10w2xkcm1nc7zcwzsz1q3j25w37hhyrkkvhg41vqjdnibx2p";
+  };
+  "d2dc1c9128c24c0a330a534ae29cc6ae6beaffc0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d2dc1c9128c24c0a330a534ae29cc6ae6beaffc0;
+    sha256 = "16d5d8n5m1srr2iddf0hvigpaybpyiwr3w2850sgn1qskbx5n2gb";
+  };
+  "d324c1434b20b5ef66a2937ab08337f78c5646a0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d324c1434b20b5ef66a2937ab08337f78c5646a0;
+    sha256 = "0xnx3clcsxg0b5hmq22dz8wplhfvmckiz921arnl1hbwgfgjiwis";
+  };
+  "d338b1e7e6160d0f539aa12687e23db81cce61c4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2623227-c4b8ee6a09664c9dac75b68f4d1629d4/d338b1e7e6160d0f539aa12687e23db81cce61c4;
+    sha256 = "1zpbqrzxnmiq1wsvxr5gxv2gyf1kip08d8zpgfz6952bxh2ql2d2";
+  };
+  "d347f6ee6f9955b5ddb428582f0a5694be416663" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d347f6ee6f9955b5ddb428582f0a5694be416663;
+    sha256 = "0a67s7r0gnpnb11p4dlz61zqmrk6jm3s2q6n6vz3sak9q046wiz6";
+  };
+  "d3603561d5e25d4f17d441b894b6b532ac8ca892" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745458-2d2488161ce24ccca70e5ce98643ad1d/d3603561d5e25d4f17d441b894b6b532ac8ca892;
+    sha256 = "1farglicxvs0xvrlkp8vhj8zad9c2zm7m7bwwgs35nbmk7ii3hvv";
+  };
+  "d3c4fc80dcded70862e182185119d810e694728f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d3c4fc80dcded70862e182185119d810e694728f;
+    sha256 = "1g15fbqvwz35hy6czvwb23wv3hv8z62c2hzgnh6wpyliz8hvwvsm";
+  };
+  "d3fa6eb331487a41362af20fc809e610469ecc14" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d3fa6eb331487a41362af20fc809e610469ecc14;
+    sha256 = "1n15651kjzdp4nhxv8rl331gqa9drj2h2lz590ldcqngc27gdm7r";
+  };
+  "d40c0edc4a86159f31ffdeb1c868655892857c27" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/d40c0edc4a86159f31ffdeb1c868655892857c27;
+    sha256 = "08k3m19bgb2l0c7r1680gg3rhprinr9gr1qnmqw9vkpaclkbmhya";
+  };
+  "d43babee559c0a43f3cdfe93ac68d127740c7c60" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/d43babee559c0a43f3cdfe93ac68d127740c7c60;
+    sha256 = "16by5ci4078gbm4qq84np3z1gl6p9g1988nqzwavb1gmcd5l39lp";
+  };
+  "d48b4b394816bf765766cfb0de720c2fcf3dbe91" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d48b4b394816bf765766cfb0de720c2fcf3dbe91;
+    sha256 = "03r22czm4w4l1cz5i9dl5v5nbij3zs4bkh5kgxbq9jd4vqkg15n0";
+  };
+  "d570076bdc206ebe525e4fdc41a05520d5f706fd" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/d570076bdc206ebe525e4fdc41a05520d5f706fd;
+    sha256 = "1bs1j3rya8w5xlmpws006dyzl6ma498qmjpbvy46588zv6id0h9d";
+  };
+  "d59bfb566ff92e983f4a66e10ce13ac21e90924d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2649176-0ea78bc522e047c6b5b5e477faaaf0eb/d59bfb566ff92e983f4a66e10ce13ac21e90924d;
+    sha256 = "0wgw0q5ln0cz34jc1pn2pqk49b2cbkxljw1c7cyixw81mq0750z3";
+  };
+  "d5cc1b80671cb302ce39ef82a91478483444777a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/d5cc1b80671cb302ce39ef82a91478483444777a;
+    sha256 = "1klyngm5zxnswi2cxj5sd6lcnxmxmj894mpzkbj5fc9l5k9zzh4f";
+  };
+  "d5f5f1dab637b46122ba0000804b82a3466d4f57" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d5f5f1dab637b46122ba0000804b82a3466d4f57;
+    sha256 = "0wzzk0xm9q17myvgk7mbv21gnyjgms4cr397gxkdjfjljbb78n9b";
+  };
+  "d613d9e9dacb47de3549938a8e516310c73c64bc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/d613d9e9dacb47de3549938a8e516310c73c64bc;
+    sha256 = "17rskdgxjwdlq1v17l756z7fj1l0r96fkzpbagsp7w4h7lxkr3ii";
+  };
+  "d63c4c238a195e3f8e062b2a9cf0757f0ed55587" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d63c4c238a195e3f8e062b2a9cf0757f0ed55587;
+    sha256 = "0waid6qlkmm5avzmd63j7dapq2c5kad6727aalc66kf3bxqqk628";
+  };
+  "d65a42fdc8154793ead3cde82b7ec619bd249478" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d65a42fdc8154793ead3cde82b7ec619bd249478;
+    sha256 = "097124ah7iynh2xq14wlarnqj5kqay45mcsfzy57fkr49kl9q31x";
+  };
+  "d6c884c9dad1608090dcb5009a5146b5e2cb307d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d6c884c9dad1608090dcb5009a5146b5e2cb307d;
+    sha256 = "1z0nixzhmi07w3nfn2zb81qlq3hgc8x1n42rdafq7m4ddgaccp5b";
+  };
+  "d717fddace1fd0e9b4a4b2c78118ebb0c354e35a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2620878-145fecd6dbcb4cf59f55c309f12ff608/d717fddace1fd0e9b4a4b2c78118ebb0c354e35a;
+    sha256 = "0a25mfvkjyycc6ybffg5a453vvzgs0lxs11iwgbd366p1q1a9fc5";
+  };
+  "d777e45fe21ea823174bd647cf6817128035cf2d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d777e45fe21ea823174bd647cf6817128035cf2d;
+    sha256 = "1p363fd1fdl04md3cwpl8sk4n8vs1kbzlvf1m5hfjwjpwf4nrflr";
+  };
+  "d79b515a8ffc174a508593ce109108ecb9e44813" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d79b515a8ffc174a508593ce109108ecb9e44813;
+    sha256 = "0wxp8x8f1s961vxlrr507rmngqqwaikj3i09zwzzif54gip02g2x";
+  };
+  "d7a56916778ad1fa03472f47ec92e8a9eed66219" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2482391-24fb529bc09847ca8c3576d69ba36285/d7a56916778ad1fa03472f47ec92e8a9eed66219;
+    sha256 = "06w8nb6bzpc98brswfk1ciikgghvx575w6il3l3p7yjx87093vbx";
+  };
+  "d7ae2a94509bb8a9d5e77006c5538cd11b721439" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/d7ae2a94509bb8a9d5e77006c5538cd11b721439;
+    sha256 = "12cwb2ajb3ikrr2pnk9djd9c4cyh2prigfy7x3q2kdni28dw4v9i";
+  };
+  "d7cd467675e181dbeba3cf24443590ebb76f9515" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d7cd467675e181dbeba3cf24443590ebb76f9515;
+    sha256 = "0d6s9lk446ixhiivxxrxv3s8l6xxlxqljkcj1ynyxcfcm9q6d29r";
+  };
+  "d7df186da35e7874ec3096cafd37119085cf5ce5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/d7df186da35e7874ec3096cafd37119085cf5ce5;
+    sha256 = "0l553fq2pmm2jpv9kag039kg8mjspnqaf9ja2g6ylgbkclm8sc60";
+  };
+  "d7eaad8d8e27e59910b9a915de128b42dda290db" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d7eaad8d8e27e59910b9a915de128b42dda290db;
+    sha256 = "1l641nqdiyp8wvpiydmanb1i32da6naad7fiwggjk8y9dd035j3z";
+  };
+  "d814756dd80360682458cdbeed8859d522418bd2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/d814756dd80360682458cdbeed8859d522418bd2;
+    sha256 = "0lmvilkzvcipf1favy33khkfdg285l6cvfykzprljyff1jgqb16w";
+  };
+  "d82a48c7d5dec9cc59dfa1a8ee7298c7e787cee7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2627198-ce999b21af1d474180ef48e136faa3d2/d82a48c7d5dec9cc59dfa1a8ee7298c7e787cee7;
+    sha256 = "1lvp57nm4y0xfc09wqckfd6736qf994sgdwhvzd3a39xnjcm1zcf";
+  };
+  "d841bdc828b7ed9f4a76d474d455264dcaadbe38" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/d841bdc828b7ed9f4a76d474d455264dcaadbe38;
+    sha256 = "0vi449pj78607r89y2zbx2dm5qdk0njdnws55cmx6wv7p13wiwq4";
+  };
+  "d852eca7663f1c36dab87cbd527dbfac895faf97" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d852eca7663f1c36dab87cbd527dbfac895faf97;
+    sha256 = "09y0jdcsxnj6wmb1q60a79dfpn0qq9laxsh20glpgw00a302917z";
+  };
+  "d87a6dc2de5d3e0f991324f8edf80b016f15f204" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d87a6dc2de5d3e0f991324f8edf80b016f15f204;
+    sha256 = "08bmfkq48m62gahq3c9gjkjvwg1f7986kiq82xzr0vd15742l3vh";
+  };
+  "d889e4d65d962a36e5839fedc6a70a00ac10fafd" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d889e4d65d962a36e5839fedc6a70a00ac10fafd;
+    sha256 = "15f3gbgqfjhcnmqqcbklp5qh5l4jrcb0mfg0gf4njaprb479274r";
+  };
+  "d8a13d14cf5b0d5bd31f2b05c3b53dbffdedc49c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/d8a13d14cf5b0d5bd31f2b05c3b53dbffdedc49c;
+    sha256 = "13hipnkqpzlxkx87yy49303fxs8mpna2947yaf06nyjwphy9y554";
+  };
+  "d8abbf7642437f66197d216a0eceef1ccce557c9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d8abbf7642437f66197d216a0eceef1ccce557c9;
+    sha256 = "0jdfxmw3bqp1nws33hrch9j7irnln19ac5cf21bnzavsvkvfrwhv";
+  };
+  "d8f99844942adf5e16059b6743f25804288ee4ca" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/d8f99844942adf5e16059b6743f25804288ee4ca;
+    sha256 = "14fihk8cpbsdf26vfvhfx5finmvz6ckbxmhbkm7qh34wi6h10v6r";
+  };
+  "d904eb14d805f07ce46163d3b8b20c434fe0db0b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2706207-4f57365c766141c988cbd0106cf38f5c/d904eb14d805f07ce46163d3b8b20c434fe0db0b;
+    sha256 = "0pwnpnmca2s8qg2k27malnw6d20si50dp3rlqcciaihn6dbjn8qh";
+  };
+  "d92734f6a18a11d0dfbf8c9e12f63f2180c5225d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d92734f6a18a11d0dfbf8c9e12f63f2180c5225d;
+    sha256 = "1m8yai075pib0imrh5dlwifdgbzsijk0vcgz8n8yzgq4j7k6rk16";
+  };
+  "d9a9e14ffd76c4ec3dd9ed97fe543c3169480ecb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/d9a9e14ffd76c4ec3dd9ed97fe543c3169480ecb;
+    sha256 = "009fzivb39c6wx2mv4z6kjkfqr51fhkx6w08h8d9g0z0kin4hffl";
+  };
+  "d9b01b6ec88b6bdfbdb3493b4881158a6b4c8d81" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/d9b01b6ec88b6bdfbdb3493b4881158a6b4c8d81;
+    sha256 = "1nnk36bh320bblcnd8zvhfvgd9q456a007zwk8l11akx4yd645pj";
+  };
+  "d9eb718a9365d9af9b6cc77b440a8da1ea6c1bc1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/d9eb718a9365d9af9b6cc77b440a8da1ea6c1bc1;
+    sha256 = "15z0bl57iixqyghm5ac3gy8czvx03spwbm5m6i13nk48dvlfyh8w";
+  };
+  "d9edee7f1f74e5386558b4a961fca4552e02ed53" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/d9edee7f1f74e5386558b4a961fca4552e02ed53;
+    sha256 = "17gkslrvbvdkkdapsqpck8q3rczk4cam00c9yhyi137j7n1lkpyk";
+  };
+  "da1a0a91f4e47865a8becf9da734feefa1851a0e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/da1a0a91f4e47865a8becf9da734feefa1851a0e;
+    sha256 = "0lz6gkyn0vcwpgd3ln60cm4nnsz01g20h7qz00pgjczpa4j2qas4";
+  };
+  "da7b12758710d9e2c5869e221e94cef9c9eedfc1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/da7b12758710d9e2c5869e221e94cef9c9eedfc1;
+    sha256 = "03pxq5gncfxllslif2vsfacwxv3wpfgajsgdx0s62slsqrfgrm1h";
+  };
+  "da7ba6ca87d1fd789d7ec8278b87f5eb53200dae" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/da7ba6ca87d1fd789d7ec8278b87f5eb53200dae;
+    sha256 = "1xx0kk0n7lmd7llildsw03a7zbfd3dr3jcjjm2ljb3x2zxksapwz";
+  };
+  "da8b24eeab7203c68fbffbc306797cd5a0ad0a21" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2622247-8eee96f5d21944c4aceb4b5731ec49c7/da8b24eeab7203c68fbffbc306797cd5a0ad0a21;
+    sha256 = "0h522mjxnb25w077j7vfd7vw588w2wj3lhvb740hmzs8hg50grbf";
+  };
+  "db0072b27b24bda3fd51a10fdc7e99e0cd839029" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2621850-a9425aa00359454986fe050ca270f1f8/db0072b27b24bda3fd51a10fdc7e99e0cd839029;
+    sha256 = "16py0ri5wzfyxi5yv673wwx4cvqdgibgf8g5gndwkvbxdk1901i1";
+  };
+  "db0399e0ca29f1327956d92769300c29b37b2b11" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/db0399e0ca29f1327956d92769300c29b37b2b11;
+    sha256 = "1rn19ggfrq07xpwv7hxlqsq01rz4s5aw8jyyk9jpgwm8951mdk0m";
+  };
+  "db1ce685def3bdbdaa34985a4bcc7f9397fe18c5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/db1ce685def3bdbdaa34985a4bcc7f9397fe18c5;
+    sha256 = "1jvh0j9208qp3msz14gg2dliasys859zfkwagwgcpwzz8r9750dg";
+  };
+  "db49a1753cbbba64d471588023c076a11c7f8ed0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2515540-18724700a05d4a0c889f39065edf2969/db49a1753cbbba64d471588023c076a11c7f8ed0;
+    sha256 = "19jb6xz05mnypcs43ld8lf2jvybkj8xr2mmbrhkpvwbxj0gz9mgq";
+  };
+  "dbaad381a8fe78e42dee5bc0259045658757985f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/dbaad381a8fe78e42dee5bc0259045658757985f;
+    sha256 = "10g36av438yi4gif8c1r35z2jfpqynkqw65nyhy3pnxhwph92hk8";
+  };
+  "dbd67380af0391a17ceebc816f623b42e665cd2d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/dbd67380af0391a17ceebc816f623b42e665cd2d;
+    sha256 = "11cdb6rm97vvmfhnf50sl1bcyrg3zki3v5vdhm3w4bzazmvw4d6b";
+  };
+  "dbe75239cd713a39f272a0de6cac2dfb95039ebb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/dbe75239cd713a39f272a0de6cac2dfb95039ebb;
+    sha256 = "0sy95z08ps7hmkzyg0ym20q9b2f2d1mfs8wp9zbcqixlbkgna90l";
+  };
+  "dc103daa4b0245c15f666e3b82ee1ca395c26e15" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/dc103daa4b0245c15f666e3b82ee1ca395c26e15;
+    sha256 = "1xy9yz8nrk8b1l64x0jq6cgdk10xjf1mmm4g62fqg6sn0zcl5ai0";
+  };
+  "dc8af4beee95a25b1c0cab56a5b11a66babc6a87" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/dc8af4beee95a25b1c0cab56a5b11a66babc6a87;
+    sha256 = "1shf8pf5xyqsjqslnj9m7a93xm9f6lydsf35vhq81p2sll5786kr";
+  };
+  "dc999c480c689209d1072c9b4435243a1121150a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/dc999c480c689209d1072c9b4435243a1121150a;
+    sha256 = "0lg507q9kwc16hn0f9dapahd0iymywswrn2iqd26lx7g6lvnckd0";
+  };
+  "dccb30d618cfef75cf0ac5c9e91b08be0183d1c6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/dccb30d618cfef75cf0ac5c9e91b08be0183d1c6;
+    sha256 = "1z6qy8hsnznrdfx3k6fqnnb8flv8s894ljrglppmr0f0sdbrvavk";
+  };
+  "dcd771e85d726f704215a4feaa632c6ad6472de7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/dcd771e85d726f704215a4feaa632c6ad6472de7;
+    sha256 = "0yqwa73qvwi1rmv4qlgwcn4fp88yqwijd4qw510abfljqgvkwnh5";
+  };
+  "dd2d043a6fefc80a25ca78d62c7e8ac26e471cc5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/dd2d043a6fefc80a25ca78d62c7e8ac26e471cc5;
+    sha256 = "10i0f74cgc3n0yiv88vggiwpsf8jjxg0jvqnqfcmpapd8m6f9s99";
+  };
+  "dd37156cd306b8d31089c3a93edede1ffb0d3293" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/dd37156cd306b8d31089c3a93edede1ffb0d3293;
+    sha256 = "0qldw0lnwx6qnlis7gxpgzdag2sk9cyg2myy8phmmd0407a4l6pl";
+  };
+  "dd67559046c4cec3957fcc155765827a5c36dfb2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/dd67559046c4cec3957fcc155765827a5c36dfb2;
+    sha256 = "1fxk257fjj23k4vx0p6fydbg0kmqd8lx0fbn0fiy94binwym6aiq";
+  };
+  "dd6aa88361efd8c13bc630db41c40d185f94dafa" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/dd6aa88361efd8c13bc630db41c40d185f94dafa;
+    sha256 = "1cd1knbxhzzjddavdnd996n53km3nrq0183nrvh7kmy7jp51b6i7";
+  };
+  "dd765b2a31ae5ecdd886e1550b3a93dbc11a74ae" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/dd765b2a31ae5ecdd886e1550b3a93dbc11a74ae;
+    sha256 = "1vlzi62gws4dby85aan2aw96gd9n1frrwvkym5jw9cn7m3rp7di3";
+  };
+  "dd8ef40e0195694f7f018da7e80a520807402c9b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2468936-39e1c39556f84e60be8d850c452aed67/dd8ef40e0195694f7f018da7e80a520807402c9b;
+    sha256 = "030hfr8vk0rn374h9gav0j3x8mvm5r8ggq37h666q4fswazqa2cv";
+  };
+  "ddad05592e192eebafd8842ac556d92572eef1aa" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/ddad05592e192eebafd8842ac556d92572eef1aa;
+    sha256 = "000r1d5nifky1yczl7p2fdygrl8yn9n5ajqbxmx2ccmavxr2wqjz";
+  };
+  "ddc5b08945cb44c8aa6434129c3f898bd87a41af" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ddc5b08945cb44c8aa6434129c3f898bd87a41af;
+    sha256 = "0gr5ra1izhksappm1k4s4n632dyzfxdlxv1ilnmfmcs4vhjphpg6";
+  };
+  "ddcc2181537ebf3c5cf4ba351f0960b885372aa9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ddcc2181537ebf3c5cf4ba351f0960b885372aa9;
+    sha256 = "0hp5d6xj8dh033801j5bl07wji2489v4ci6fl0jljhsfwh9r9zcf";
+  };
+  "ddef4f0acf5f073d28dd6a38c4fa58630d3a68f8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/ddef4f0acf5f073d28dd6a38c4fa58630d3a68f8;
+    sha256 = "1p8ag7dgnrnpj2cj7l94ic98gghhs5xc1qsmwmr5m5v6ra6mkm3s";
+  };
+  "ddffea76154050032a408a3890c07633f1ba3b0b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2604938-a9e6e886491749ef99155ebfe50a18fa/ddffea76154050032a408a3890c07633f1ba3b0b;
+    sha256 = "1bfwfwg9hn4sh5nqwpd8nfjbqkkyp5nzns2cw47cqvrrz9m645hw";
+  };
+  "de0049c6936b76d5da37bb69dd25ac91e83514c3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/de0049c6936b76d5da37bb69dd25ac91e83514c3;
+    sha256 = "1abk2d6mp27rya7yp3dhvgwr18z7yny9l024l9wv2dzgfhw4mlmr";
+  };
+  "de01c69dad3bc654ab534e5eedcd2b8374f2a2e0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/de01c69dad3bc654ab534e5eedcd2b8374f2a2e0;
+    sha256 = "1dggg7qwqsfzcnr296qcw0k5k7bisg2nlxic185qydca0y844khg";
+  };
+  "de04f7b02c49aa87b2b6da18c62a5ff36858352c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/de04f7b02c49aa87b2b6da18c62a5ff36858352c;
+    sha256 = "1fljk9j3l64v4yf4by4n22pfdxa63frilac93wbw663nb7w5hrw6";
+  };
+  "de2d73029d96c42d88f7765a10be8b6af0007eb8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2701057-ddd66ac9b77f4863be4b1dc8e90d0e10/de2d73029d96c42d88f7765a10be8b6af0007eb8;
+    sha256 = "10hc364qj9mav9nqa8jvkiwmmrmx24xqpn8gknra4iw7nqhp43c8";
+  };
+  "de40a1a3ef4f09ae9523868d74d8cc9af2745ec8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/de40a1a3ef4f09ae9523868d74d8cc9af2745ec8;
+    sha256 = "16jhqdx31vid1knbfldhwf3d4vlap6p815q6ri64fb5g0drny9zn";
+  };
+  "de7be9bd446cca2c3d817d2f1d7042e9a6f27378" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/de7be9bd446cca2c3d817d2f1d7042e9a6f27378;
+    sha256 = "139pvk98m51s0i31s4621x83cdx81459fw5jj7sr1kby3g900adh";
+  };
+  "dea23be7b0f4c3aec67d1c95e616bc04d4e99100" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/dea23be7b0f4c3aec67d1c95e616bc04d4e99100;
+    sha256 = "09z1az90fg35rp8rfsnlqh5bhgrw1pdw14lkavnhz1kcpxzg429h";
+  };
+  "debdde2d089368f9ec40b6d50aed4cab14a4e785" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2533444-8b800f9092dc4a4c822daa186a0dd399/debdde2d089368f9ec40b6d50aed4cab14a4e785;
+    sha256 = "1gvk274y842is0k67pancjpbw7s0yqv1lqz36ar2l84b7mky9ncq";
+  };
+  "debfd2113b48ed4529163d952262d80fe8cc11f1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/debfd2113b48ed4529163d952262d80fe8cc11f1;
+    sha256 = "0ijv1i1xdsj15b63dvj1j248bcqylbp62cncza464jzpf1mgmjl1";
+  };
+  "df2925eb96fbc24fb45e29b8553772c650ff8c53" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2791326-4a233957ffc54c94b38c9ceaf84d58de/df2925eb96fbc24fb45e29b8553772c650ff8c53;
+    sha256 = "1msa6jm9c3x8150sci2bbs47l424xchjfgg5ixr388q5fiqjwv50";
+  };
+  "df3e6640f45ebf0909095b9ae74a7cb7404e447d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/df3e6640f45ebf0909095b9ae74a7cb7404e447d;
+    sha256 = "1rg63nvywdrzwvslzpq8z53wkhfm3fgw8x7lzxkqay58v3npdz44";
+  };
+  "df4ccc222a9b196a9484691be86f2d14462b2357" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/df4ccc222a9b196a9484691be86f2d14462b2357;
+    sha256 = "17gf45g193ind6i7m49ckwxrfffryi1xp3dl8gkgfj8q9yvlh01n";
+  };
+  "df5437931a8964c846c6c9377f381c0213082e22" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/df5437931a8964c846c6c9377f381c0213082e22;
+    sha256 = "0hllda7r7v1nvffb504djzc2l6l6bg1ldl3fgn5dz152jgvylq95";
+  };
+  "df54fb21975e218c1da9d209d52b225e78430abf" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/df54fb21975e218c1da9d209d52b225e78430abf;
+    sha256 = "0cdj50yxdl4lfpmhydkymzc5p1zb07z86cgqmsyqs3b4xp7a410n";
+  };
+  "df6d4711f83f1c570af30ec97dd418f0664398b5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/df6d4711f83f1c570af30ec97dd418f0664398b5;
+    sha256 = "03vr4pvvr03nwwf4jp3q0fps1kaybk327z6r80cf934q8dq1hmam";
+  };
+  "df7074a5b6e12f2c024e07d5dd9fdcd863f0553a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2574758-8fd9f8c50854489f98b3664933c83100/df7074a5b6e12f2c024e07d5dd9fdcd863f0553a;
+    sha256 = "0m9mk7mr9i2i0rly7jb9vbz000rpxmpgrlawa1isvgpp98nq9jx9";
+  };
+  "df877ce5674ccd5af752d839ce7729c724750815" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/df877ce5674ccd5af752d839ce7729c724750815;
+    sha256 = "087wfyc54y7ay8bh5ml8g46402pk42mmimzvlpskq6vz6hwqbwg1";
+  };
+  "dfd7ec76ea282f899f489dcf84e86c17e2d5176b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/dfd7ec76ea282f899f489dcf84e86c17e2d5176b;
+    sha256 = "0yhnv54lb22ksa1b9rd12jwrpbfia6v46j60qszgp3wfzh927b7p";
+  };
+  "dfdacbcbdca178e9cf577d37637399e02c80c006" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/dfdacbcbdca178e9cf577d37637399e02c80c006;
+    sha256 = "1k16n6jf7jv3ja47faf27vkbhcwn99y6rgfzk5d9m5r18326m6is";
+  };
+  "e002d0958c673752ae43a0801b444a2ce1624b4a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/e002d0958c673752ae43a0801b444a2ce1624b4a;
+    sha256 = "14wkqdp6bwy7i9dx9lb7fxrhwsspxwn9hpsxc3qqd43gbff6vmg0";
+  };
+  "e02e3dbebd645b7ffc82cb42b41d79fd60a268cd" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2634392-be4d7ed7261341cdaeeca1438154a993/e02e3dbebd645b7ffc82cb42b41d79fd60a268cd;
+    sha256 = "1gj5921y97f0f64iqf566hpsmm8gf39p0x51ps67r5hk89k52gj8";
+  };
+  "e03589b69f1b5cdf2431809897f2a1287d4d1db2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/e03589b69f1b5cdf2431809897f2a1287d4d1db2;
+    sha256 = "0bwr0lf8b523kwgrakm6cj2rpcaw1ql213xsa4gmaxbqjxmhjwn9";
+  };
+  "e0a2c1da63edd46fd58df91cebed0a6ba9d4e2ba" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e0a2c1da63edd46fd58df91cebed0a6ba9d4e2ba;
+    sha256 = "1wlxk5v5jabmdg4i6nm91kqgx4lak68455chgyyzw83n3921cwc6";
+  };
+  "e0b52177b69db23587e60178455553700fca7a3e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e0b52177b69db23587e60178455553700fca7a3e;
+    sha256 = "1dpp1ixnl806d5b7ag0chzd771nrlqpr0vp0xg6sqz77y9f64jdc";
+  };
+  "e0da56b57fd7c9eadf21a0c6bcaa75267e6eddd0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2762618-27ee95221f7a46349f0cabdf112a1cd5/e0da56b57fd7c9eadf21a0c6bcaa75267e6eddd0;
+    sha256 = "05phccb0fvx9li9yr689l2wxbana6hvzljwsn1a2113rkh794gql";
+  };
+  "e10e19c255056c096d6105cfbff767f6749ffeea" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/e10e19c255056c096d6105cfbff767f6749ffeea;
+    sha256 = "0356fyglgynnlm1myic04f0g9c1yz12zz8z4vi7j8plypnsanqs8";
+  };
+  "e119a785ae743089d9760220e95431e5b5a828c3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e119a785ae743089d9760220e95431e5b5a828c3;
+    sha256 = "1vqrm60v9jgd3xdvdwkavxfapl1424pcwm0w9zn4gypbkwfigs8g";
+  };
+  "e1a0aba6fa5c1c2bd71eb9f8b6fa3b6bd0c08378" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/e1a0aba6fa5c1c2bd71eb9f8b6fa3b6bd0c08378;
+    sha256 = "1qvnscdxnyyps3sm2625hjvb2glkcaxj3kd4qhcpaw99p22cp61z";
+  };
+  "e1a2109b7b2cea0b5a275ee93d3ec4dd15bda288" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e1a2109b7b2cea0b5a275ee93d3ec4dd15bda288;
+    sha256 = "0b1namzxfx0pshfcixvzwpm19d29ma70wbsb5v37jx79bwplxvly";
+  };
+  "e1fb2b61f5ab2e0ded49292c3ba53d25ee0e31d4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e1fb2b61f5ab2e0ded49292c3ba53d25ee0e31d4;
+    sha256 = "04xd0vdrqrlnakxg94racp4q4rqq8z383n6jyg798g386gd2nkyw";
+  };
+  "e214f8d9834372bc3a68863ed9b25f6d3468aab6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e214f8d9834372bc3a68863ed9b25f6d3468aab6;
+    sha256 = "1x8alx8qywjysqs8fznf7f2rgz47ryi02711fj2vdifhiazl81z6";
+  };
+  "e2e2347e195fcb6908121d1d8252b675c0225733" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e2e2347e195fcb6908121d1d8252b675c0225733;
+    sha256 = "0am2g2w1p9gbdc4r75gib8kadfkzxk0pl93bkggrvbc04gaajq0y";
+  };
+  "e2f498b239aa783a65b663c31fbe397e04857c5f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e2f498b239aa783a65b663c31fbe397e04857c5f;
+    sha256 = "1abyxjalrqhvinl4agkhc5mwyvi18hip7v6rjvvzxi6c6jvlfbsf";
+  };
+  "e2f8447f74d7ae894d6ebc37fd1de2b774b15bb2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/e2f8447f74d7ae894d6ebc37fd1de2b774b15bb2;
+    sha256 = "08j2hxs3grsfk5y3xfq4ch1z4hd9rwgn5yfzd2h31ldrpyx4r39y";
+  };
+  "e2ff2a15b3b4f835c8275051591b9d4de07df86b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/e2ff2a15b3b4f835c8275051591b9d4de07df86b;
+    sha256 = "0q77kjwr6xi1drxv0kqxc4kbm93r42ygsyxfyk2rqjfa30v72496";
+  };
+  "e3adc0e94fdc76e94c4297ae60dc8b7678ff6d13" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/e3adc0e94fdc76e94c4297ae60dc8b7678ff6d13;
+    sha256 = "1cihl2vayvhqd8g2jvnzirfv2a2c7dadyvg2cmkd8rdcf7ry7r7m";
+  };
+  "e3e99323ec9693b9c6beafc30a7c439d27d51019" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2738466-c1f653d3509f461bb7b24e2d8451128d/e3e99323ec9693b9c6beafc30a7c439d27d51019;
+    sha256 = "1dw27yqsfdh6d8p4d9afwn9pz8dhd1lw1y72vw6vj15ns1m1hsj3";
+  };
+  "e3f2410485eaec849a562752ca8348217b12f390" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2611810-c0cf8ef9a734410da79e56e1df15e175/e3f2410485eaec849a562752ca8348217b12f390;
+    sha256 = "17n58ay2q59xc7d02dxzx4lxcqf1fm92pyz07w6fjlwiqlr30pz6";
+  };
+  "e412f545b4a58b60e62cd1dcf57ca25871356b05" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2515174-63b13cf90d1f431ebc611d28340ef4ba/e412f545b4a58b60e62cd1dcf57ca25871356b05;
+    sha256 = "19vbfalid5jpg1x9dbxip4fbdvpvyrhdjz8wfk9ysiw8nbk1xyj2";
+  };
+  "e4328c9505893ca9157deacf1baf1aea7d01f8d4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e4328c9505893ca9157deacf1baf1aea7d01f8d4;
+    sha256 = "0ksgc1abgwmhgz9j557l6kj6awdfzivm08dfk0n4bspc8dmdp728";
+  };
+  "e458507f455e3bac9232d632426fc4b75f29841d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e458507f455e3bac9232d632426fc4b75f29841d;
+    sha256 = "1y3w5h0ss3iq6sv0pmzw8n62s3asp616j6n3fqy8vja3bm6s57hr";
+  };
+  "e465c13305ee8aa9186e587aed90d1007e5b31e7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e465c13305ee8aa9186e587aed90d1007e5b31e7;
+    sha256 = "04ig4zfzv4g24yr882hfrx4570jvhd3abvpig9mc1d7x6hg2vnn3";
+  };
+  "e4770351a3cb31df020fd6bff26ce03237621428" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e4770351a3cb31df020fd6bff26ce03237621428;
+    sha256 = "1sza989jj7mhwv60ridbqpypskddsyx97vrlpflwq4i8xk8f0qhn";
+  };
+  "e4db89beb65b004392150dc83a65a28ea62cb155" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/e4db89beb65b004392150dc83a65a28ea62cb155;
+    sha256 = "14b951ymdf4difjjrcc9n6kg5ib5wks26kdagrr04bdb0qpv6m5s";
+  };
+  "e4e9b76a89d03aea789e6df7b7dcbc13cc7ca8cf" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/e4e9b76a89d03aea789e6df7b7dcbc13cc7ca8cf;
+    sha256 = "1v9ldnkaq65zym2d439zbqvybfvpwj30hj6mdhwny84mf71kimmi";
+  };
+  "e4fa82ded20830726a04678904111f9fa6f26954" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2621793-1958bfdd4e3b49f3a0ca6a4c08a60a0a/e4fa82ded20830726a04678904111f9fa6f26954;
+    sha256 = "0r22snlddx333vbz83h776njmycshb8kmx2biw7hs4qfyvj99y0j";
+  };
+  "e50119c064462a0e056574db4e21f359f7f0c159" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e50119c064462a0e056574db4e21f359f7f0c159;
+    sha256 = "0gb1rbclzkxs1c63ylabam1il1nw85xvrd7n3s3gjb7s7dq5mmwb";
+  };
+  "e5146f66274a1f5409227f94447af2a1f4bfafd9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2745394-b798b336538945738fe2766d7bbc5abe/e5146f66274a1f5409227f94447af2a1f4bfafd9;
+    sha256 = "0vcn9fr140kvc5z65ra6qjymfzc4dmgmds4mnzg7n29bfkvmsxff";
+  };
+  "e55d8897009789617d8b961ae3c6c1d00a845bb3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/e55d8897009789617d8b961ae3c6c1d00a845bb3;
+    sha256 = "1rc7xs76q551a7vcy9642jrgvbl97y98gkdqkrb62ibpv3c2g4ps";
+  };
+  "e5e8a89007ed0e73685f9b0366b1eedf31f4c1e8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/e5e8a89007ed0e73685f9b0366b1eedf31f4c1e8;
+    sha256 = "19w1q3wxbskznn1yiyzmds6dsnnb5ik31lhdqsxzqzjm0hl01m1w";
+  };
+  "e62a73c1c93258f0b94c3cc46e35318469afe84e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e62a73c1c93258f0b94c3cc46e35318469afe84e;
+    sha256 = "1yrwbvldncip3xpcxq2n9q707z21zg85yxhgvp37j24nqagm6wfi";
+  };
+  "e65191a9b59946c7f04782468840b7352ab5c96b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/e65191a9b59946c7f04782468840b7352ab5c96b;
+    sha256 = "0q8qnncfb723n9ljzfsyi7v44q2301v37c2yjcaqdvs6vaij517x";
+  };
+  "e67a9dfa527d0eeb0ed24ef9d5e22b41baa25251" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e67a9dfa527d0eeb0ed24ef9d5e22b41baa25251;
+    sha256 = "0vplmbsk6zpr416x96fdshakjymwa631y78c0sr24gqd853w88b4";
+  };
+  "e6a8b07d1017a517555ae184a3ce22fa2b948c72" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/e6a8b07d1017a517555ae184a3ce22fa2b948c72;
+    sha256 = "0wvi5d9ndis8zrbxgy62m6hmr3bvgygfw4hmq6gqay12z78rvchy";
+  };
+  "e6b8c05e76abc49f7a2264f2b95199b825fa851c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e6b8c05e76abc49f7a2264f2b95199b825fa851c;
+    sha256 = "0m4dwy0mmyr0f1vjk8grqiapwc1q36cj3ischp2gf2ibj1xxiixa";
+  };
+  "e6fda4b3f8fe12c3bbe8ccf91bdcc8d759ea1ea2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e6fda4b3f8fe12c3bbe8ccf91bdcc8d759ea1ea2;
+    sha256 = "0ggsvrwnfp10h4ns5vadpxnxm6m0nf5i0zr3i57k2h2kxx7vn192";
+  };
+  "e70061ffc85b6027a648cac0b1c8c6ef7d4e3106" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/e70061ffc85b6027a648cac0b1c8c6ef7d4e3106;
+    sha256 = "0y2lka9gippprgffs4w1p6yh3kvj8m3d749ysbc8lwjvijhh0dyg";
+  };
+  "e70429fd818fe983008a06e931d39724ea7a382c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e70429fd818fe983008a06e931d39724ea7a382c;
+    sha256 = "0vhfpdbbv46z7kdl1dlnn7mlcpvygn4k6fb8wdgykavp0phzhj4j";
+  };
+  "e76c34cb7cbdb14d92e415c4af5ccdc344c4c58d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e76c34cb7cbdb14d92e415c4af5ccdc344c4c58d;
+    sha256 = "0jkx8w6p77l53233cac8gzbwdmbbs3znkw588g8mcvwzkpszwbxi";
+  };
+  "e77064e9ba8339459d66bc680e55880bbcc5991f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2467022-c410c14385ba462bb86b4995040cdcb9/e77064e9ba8339459d66bc680e55880bbcc5991f;
+    sha256 = "1fc9jnqb7l5v20asz6cqyrp8vr0617n35k41wrqdcsy0qib9alkn";
+  };
+  "e7808a43acaf99637e43857c76760d74f77d6ae5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e7808a43acaf99637e43857c76760d74f77d6ae5;
+    sha256 = "0s88msrsnmcqnjyzk7afzf6wikwyajjlybq7jsjyfaax4vaj1cbv";
+  };
+  "e7a4ddc64af2a43bf5c7d439244636d60a7dae07" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2500002-69b23dcf7a2d4165b2b432780845acb0/e7a4ddc64af2a43bf5c7d439244636d60a7dae07;
+    sha256 = "13i3cnkrkk0z01bf0prl77wmx4qbnckihgbxjv34lizv3mhd1yzg";
+  };
+  "e7fdcefcd4a8853ab010e1eb4f2d88b5bd9726a9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e7fdcefcd4a8853ab010e1eb4f2d88b5bd9726a9;
+    sha256 = "1v4yq5b9rng7p1jsvhlnqvcxpnfd1iwmnmd9ygq25prxirlklx8z";
+  };
+  "e85ad2ef6896adbbc28a46b023af6b64deb29b88" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/e85ad2ef6896adbbc28a46b023af6b64deb29b88;
+    sha256 = "1albg4m9z0g6rv7bqd3mzb8k6r07n6hin3s05gzhl21qqiarwf95";
+  };
+  "e902a543218c50ffc9cd9a41bd8d53d0df1939c2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/e902a543218c50ffc9cd9a41bd8d53d0df1939c2;
+    sha256 = "17b3c4kp6a9kbs2k473zygn7w2xmmb19z3sk08alcp658isby3l4";
+  };
+  "e997f5bba3b4d4b283427ec3ca644a876f6dee7d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e997f5bba3b4d4b283427ec3ca644a876f6dee7d;
+    sha256 = "1gc2rzz40ipkjy17fz6qiwsv2wxi4qmblmp0rbvafg8mgrhs2jnf";
+  };
+  "e9a64dd557215b53134c33355716c8a4bd1e22f7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2622402-86d1483fa60742b6be9fd5a0b0b946e0/e9a64dd557215b53134c33355716c8a4bd1e22f7;
+    sha256 = "1kjvf0spvmp1r8yh75n39a64w3xp1qiw17w8fv6lip3df8dbjywi";
+  };
+  "e9b508ed95c44a9c9e0d979b1ae02f7dcd5590a6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e9b508ed95c44a9c9e0d979b1ae02f7dcd5590a6;
+    sha256 = "01dl9z60593mizz76sg55zhc949sgxcdp60vkfhrdkhl1l212sga";
+  };
+  "e9c7b3390ef65a90310c9cd4a97594bff007303c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/e9c7b3390ef65a90310c9cd4a97594bff007303c;
+    sha256 = "0jnx4b7pkycly81dka9vn01ky96j0xnzxg0f4z5fpfl8z8al3cgh";
+  };
+  "e9cec016ae177e586ef08f408aec2f7c4de9afdc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/e9cec016ae177e586ef08f408aec2f7c4de9afdc;
+    sha256 = "0k193y1kbmjq6yjxdgv59w1dn9f1b8i7yr2dbzwi2cr57wx3h483";
+  };
+  "e9d6f32dcb7a670874503cb3cb5d73fd9cb09cb2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/e9d6f32dcb7a670874503cb3cb5d73fd9cb09cb2;
+    sha256 = "0k3rw21ngsf677m8q4n1zil9fmbsdd97sxss3jv6hkyjq5r6djxl";
+  };
+  "e9f10cc1fed35407864f324f08f3c9fcb5a2847f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/e9f10cc1fed35407864f324f08f3c9fcb5a2847f;
+    sha256 = "1fz73zsa0f4dma3v47s0dcgdzz8aniryvmpx9rpx955rckrrawsg";
+  };
+  "ea58f8314459f7bf1d36a672ccc1f2c60c4e0eba" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ea58f8314459f7bf1d36a672ccc1f2c60c4e0eba;
+    sha256 = "1xlyfkxpk86w2ik8ppx6czlx6b5jfvz33k6in9y0zvpi1mvkvam3";
+  };
+  "ea7cb20f21cb971f2f7da29210e7bba16e97a53f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ea7cb20f21cb971f2f7da29210e7bba16e97a53f;
+    sha256 = "1vl4hy09jqhb9h43gn6ymnq2027yc7cfvwh5bn860mj5syayjznl";
+  };
+  "eaceaa2d359d151c5394522df962ce393938a21b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/eaceaa2d359d151c5394522df962ce393938a21b;
+    sha256 = "124s81bi0y3sx8r6f4qp7mb5294bivjickw7izg0qym3r35vpvy8";
+  };
+  "eaea434c65e3ccf8cec643ea1ec391bdddbc6fac" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/eaea434c65e3ccf8cec643ea1ec391bdddbc6fac;
+    sha256 = "0mdxz6820gcwgzaaipg8k0psddp4i5k0kgl4771kp3my736zsdp1";
+  };
+  "eb24d02e3515e1a1c0df3b6323b5ba9b795e16e3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/eb24d02e3515e1a1c0df3b6323b5ba9b795e16e3;
+    sha256 = "02768h2a16rzwn5d1qrcbxydi0nijyaf301aac32ngsp92y24ycg";
+  };
+  "eb942c482591c680356ad05c627b9153756a5c8a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/eb942c482591c680356ad05c627b9153756a5c8a;
+    sha256 = "05vpd0hwalasgjskblzqba8xadmrj10mjsvqis7chdq0am7g66r9";
+  };
+  "ebb51925dec18058068c3d6ba8d32c6bd5d8f5a8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ebb51925dec18058068c3d6ba8d32c6bd5d8f5a8;
+    sha256 = "0k1w16kh1fbk255qg9lhnbb192lifjskv5mqkd95rmzacpk1vypi";
+  };
+  "ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ebcdbd3113ce1b1b12aba710b9ed475f2b77bf74;
+    sha256 = "0iqxilmibqdpcl0k2qvcipw1nphvxykqi0b04si2mls71lawrklz";
+  };
+  "ebf62a48af4d0a972019aca5d8365670d7260bdd" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ebf62a48af4d0a972019aca5d8365670d7260bdd;
+    sha256 = "14gfqpfqr5nnj8q26vxa10c5p793zkf57j60563bk5ijm2rxrmgp";
+  };
+  "ebf8732591def396954f78bf472667f690877f95" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ebf8732591def396954f78bf472667f690877f95;
+    sha256 = "13p11mvlnanlc64ap1xmq69m0gqgcks2jvh0f3j546dgw9x36yvc";
+  };
+  "ec13b2ec5777dbbd7c22e1e2bdcb3e127496b370" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2621793-1958bfdd4e3b49f3a0ca6a4c08a60a0a/ec13b2ec5777dbbd7c22e1e2bdcb3e127496b370;
+    sha256 = "0fqy9izbfficxmzf1pbw9w4yasvs55dawm0186afpkg7gcc8rqvd";
+  };
+  "ec35da884d7ee63a6b73a14153ebc0ef84e83072" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/ec35da884d7ee63a6b73a14153ebc0ef84e83072;
+    sha256 = "0vg8qmf8v73d2zg51yixzhsrgd92d03s5lfviympplshychims77";
+  };
+  "ec59e3143dfd3d4c018548a31a6481bc3f9e1137" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2431986-5a8dd079cf514ebd8b20693fadfa5a4e/ec59e3143dfd3d4c018548a31a6481bc3f9e1137;
+    sha256 = "1qfg4cmvb07q61rkj8ca6wzly9zzfaqbx77jlvy5gc0yn4mpijfy";
+  };
+  "ec5de1727c79fc933c910e364d19af5e7ebcbf99" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ec5de1727c79fc933c910e364d19af5e7ebcbf99;
+    sha256 = "1cppbmy26118b0gxz6j4zk0zi9rlnd2v1pcbkj1ba86mh6b2d1bh";
+  };
+  "ec6d576df884aeea2ed37256df7caa8cc8040d6e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ec6d576df884aeea2ed37256df7caa8cc8040d6e;
+    sha256 = "1139k9957gbripd65125gp72lg303z10j7yzkfafpbkkixbsi4n1";
+  };
+  "eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/eceee0a55c343bdc9f43a6d2a6e1f7ae7429da77;
+    sha256 = "1xd4y3y13qw8nm29d7w55k2cdy50j3jsndm7yhay2ciwwl9jqlhp";
+  };
+  "ed023b655c8dbac838b64bf7e6103b7e9d563ad0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/ed023b655c8dbac838b64bf7e6103b7e9d563ad0;
+    sha256 = "0d53hk0wkgrr8nwa74326ni3z00fmwvifq1i1fj4wca0n3qlgq3j";
+  };
+  "ed23ade7aa2af09963a993ee53ab33389aae2e80" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ed23ade7aa2af09963a993ee53ab33389aae2e80;
+    sha256 = "1215la804zb4hnc6ily5vjzyrvzb0npyjfjl19kb8qrmcyiymfpz";
+  };
+  "ed2c9b990f683ecb84050df89e925e9f65e3883f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/ed2c9b990f683ecb84050df89e925e9f65e3883f;
+    sha256 = "1aixypsgvv780pyy8ncizmmysfx1hjym9rbb3m0h4xiizcl4q5ym";
+  };
+  "ed384e6a16f79979d70b9926060a68eeb610de53" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610584-8220d2cd9ec743a5b8ec0d50768a5d76/ed384e6a16f79979d70b9926060a68eeb610de53;
+    sha256 = "0bx62ijccnfyrknqrcw3ymvzvdjgc0qpllzaqn9vhnygxsjy4w2f";
+  };
+  "ed8d4fee989f83055b4947da8ddd5639f8168782" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ed8d4fee989f83055b4947da8ddd5639f8168782;
+    sha256 = "1gf587b6qa3n3m3abshiw26nypr4wnzzj4i9qycfr33aasasgckg";
+  };
+  "edcad0b0c2862c776fa60784960b9a3a8b3ce6ef" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/edcad0b0c2862c776fa60784960b9a3a8b3ce6ef;
+    sha256 = "10ffm3i1lbyx05ffl8mksp58kagfwdh8kqfgplyxnlxpn2qxf48f";
+  };
+  "edd66f69f77a99b2383d34436d6be71565769a43" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/edd66f69f77a99b2383d34436d6be71565769a43;
+    sha256 = "0h7giabjphgikhdrc6r662xb0ahw4spr89jhckzgplr4l8z8nzz5";
+  };
+  "ee33cb45be04ea08ab507a4058d81bcdd1da7746" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2761703-4d21a69f627145d58d1b542fa90eeb3e/ee33cb45be04ea08ab507a4058d81bcdd1da7746;
+    sha256 = "0n99fhb5qng2x0y5rxp4x88jsdcyqliqi1z078lj6qhsjd8dmqlh";
+  };
+  "ee8662030dbca92bd70af3ba1550ece5c275d13e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/ee8662030dbca92bd70af3ba1550ece5c275d13e;
+    sha256 = "00hfl5h4yk3mc8dhxrlk0zg8nyfgrnmzzhglk0vgzi3mkcvc7jv1";
+  };
+  "eeaa24c1e61cc4b0806496b256349c44f84c02bc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/eeaa24c1e61cc4b0806496b256349c44f84c02bc;
+    sha256 = "10kzf6q01v3xd9s7d594biwjy4zzq4wgnqq0ib50ii62rsvli112";
+  };
+  "eef24b0bf5f818f43c64498f50e0a79f5b683883" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/eef24b0bf5f818f43c64498f50e0a79f5b683883;
+    sha256 = "0sg9nyp4gvcqmxdx842nr9szfk1fmi4nrwxmmyvqhs774xavxw4d";
+  };
+  "ef8182b6df585c7dd91f05618e06fd8ee15be5f3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/ef8182b6df585c7dd91f05618e06fd8ee15be5f3;
+    sha256 = "1xrjsspjnfapf26k3ppjx3fzlfcq7qdnxwhvfhn4669spw0a8zgi";
+  };
+  "ef923ee8da67064c7a03f02651b14c309db14a3c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/ef923ee8da67064c7a03f02651b14c309db14a3c;
+    sha256 = "1rc0v251migvcrhvxc7cmv3c5qp1a51fzff6whl7h1qqbzc82ick";
+  };
+  "efd4413cfd5173a82811ede79b4a13bad5f6a450" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/efd4413cfd5173a82811ede79b4a13bad5f6a450;
+    sha256 = "1f76f939x8xkp5z2k8p0i70ig6i2m4ryj9lrc3x393sjlj26nqaa";
+  };
+  "efd812740856e722b88087211add0e268de83d7a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/efd812740856e722b88087211add0e268de83d7a;
+    sha256 = "0yj404y245zicyqgwg2bs9l14gr9vlaakrawk3hdrr24m4lczyz9";
+  };
+  "efe81a03fc4e327388573f361faff5b233243834" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/efe81a03fc4e327388573f361faff5b233243834;
+    sha256 = "1hd7zv4pv604pfbvfya15g3rba9ip6pbzqm6vazi7q7znigzxyql";
+  };
+  "eff7dae5ebb303e1c5f823e0de1accf1075e8402" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2638350-39632eb9e5f94ba4ab8e97fa2d5a3251/eff7dae5ebb303e1c5f823e0de1accf1075e8402;
+    sha256 = "0fa1ikjab52kxkrxb5lnajvwa2ims8d5sm7mi52sx1f67gb3dnb3";
+  };
+  "f0263ddc2018e02536d900df1e275809633e73a5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/f0263ddc2018e02536d900df1e275809633e73a5;
+    sha256 = "0likfdcz1k5acs9w9gxb4r7236ws01cwllrq8qnz3sc2ym111bm1";
+  };
+  "f04bb0803c834328c048cff05056081b1d0e8120" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f04bb0803c834328c048cff05056081b1d0e8120;
+    sha256 = "0rncg0q01swbkl9pwr7jia19vgpx2yyl1bmyf6l9gz9sfmin1a1i";
+  };
+  "f0887df1b56e17573badb6af33d52f7ec6fb6138" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/f0887df1b56e17573badb6af33d52f7ec6fb6138;
+    sha256 = "1n0gg5af4i0bm854fbv7bvinwgjqda7fbr12q4zm0wqw41r19l3s";
+  };
+  "f0ae004e1cc9e390958b1988391d02b9c74849c3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f0ae004e1cc9e390958b1988391d02b9c74849c3;
+    sha256 = "1k3gdybbilnkpsd2qf14gn6a0klb8ggdahmlp6wa373pvxf71vz6";
+  };
+  "f0d6a898c18d4750e572c04c2dc290f0628f238c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/f0d6a898c18d4750e572c04c2dc290f0628f238c;
+    sha256 = "1a3ymsi7x4aw0dgb5i1yfq517x9i9fs01mb51irxaamiavxw2zdq";
+  };
+  "f13495e23590f813c800280c335b159a2f568a9d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f13495e23590f813c800280c335b159a2f568a9d;
+    sha256 = "14d25nmaic3j24dl6viy09alqi63q8vw71wzi7yxyhvgzy51ajv9";
+  };
+  "f1372e2ede9021ff61444ea132b18024ee271b60" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/f1372e2ede9021ff61444ea132b18024ee271b60;
+    sha256 = "113m23b78k218ag72040ggm73846xdyyyfqjc83pzx5g7gfzswyk";
+  };
+  "f13adaffef53d65d806c3eb02f96c6c7f0ac7272" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f13adaffef53d65d806c3eb02f96c6c7f0ac7272;
+    sha256 = "1i7kv84qdf1srg0828yl4a984pc0c5gh6iqlh2wngxrk79vpvrmh";
+  };
+  "f14abb295c0159f6c8c07119ef3cd201b5062479" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/f14abb295c0159f6c8c07119ef3cd201b5062479;
+    sha256 = "05vakydf2xgpc07262dgv8h0761jswjcpz5z4gp6kan550zx46z4";
+  };
+  "f18da05b89b485f1870ff2b88125f3c1511f8805" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f18da05b89b485f1870ff2b88125f3c1511f8805;
+    sha256 = "1xp77cwjj0iav25hk3w7n25mzchsbxbbkqhlicvqh41y4q489sxd";
+  };
+  "f199d69df437b77400f96b6d2d4f02360535404c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f199d69df437b77400f96b6d2d4f02360535404c;
+    sha256 = "1cm14f0i1k92l4flbc00gwvqnvpiwhyyx0g0rf4ssnyp2is9jhy3";
+  };
+  "f1e035fa0d8b44b2b3aeb9958e9dea3862744d82" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f1e035fa0d8b44b2b3aeb9958e9dea3862744d82;
+    sha256 = "10k3dhgg4h26kjxrvqbvzx6vxq5v9qyi4iwk2csjpyp6xpwzb74q";
+  };
+  "f2374c3116e4d1fae6b4cbd246c9033e282a6c10" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/f2374c3116e4d1fae6b4cbd246c9033e282a6c10;
+    sha256 = "07bjgb6ip8gzyckhsjwi1nlby9059givw8i7gxx09j9xmq6s6n15";
+  };
+  "f24d05b616e3f50a24367e32f8c42d68d40797a3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2605550-2722e8035d7444a18952cbd04a5c58c7/f24d05b616e3f50a24367e32f8c42d68d40797a3;
+    sha256 = "01an1abvb6w7id44avc3fp35919avvqspmgl24ygp872xz6g5glh";
+  };
+  "f268daf62521a638834ffec5779bd359e0ffe63d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/f268daf62521a638834ffec5779bd359e0ffe63d;
+    sha256 = "0z4zbyjm9vlzk14r80j9ka8hdinylnbmf43mpna4rva27rqwsprh";
+  };
+  "f279ae70e30f66de7b592409e9ed96993301657f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f279ae70e30f66de7b592409e9ed96993301657f;
+    sha256 = "057dpl4pgjd8p98vik95gwdj2z42al9ibr210h1j92jdvyjxg99z";
+  };
+  "f286035c2605a855fb9dda2fc06bb71648b1dbe6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/f286035c2605a855fb9dda2fc06bb71648b1dbe6;
+    sha256 = "10vsqbadg5y58skq4p79vdxlkwqqfvac5v91kq4dflgcs4h05960";
+  };
+  "f288cbb85cc9eecfcf90abe6376c32c54435f879" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f288cbb85cc9eecfcf90abe6376c32c54435f879;
+    sha256 = "077rd0cqcpl629niwgs2qldrh4ld2xyiskg5x32m9igfwkq8dxyv";
+  };
+  "f2c0ebdd94707b207218226a42b19201386b9713" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2634249-f2b4469cf0774eac818e7cb4565f1224/f2c0ebdd94707b207218226a42b19201386b9713;
+    sha256 = "126bhrrj1q7b04wpbiyk1c8j9dpnkinfmm47z330jwis5mblrzzy";
+  };
+  "f2cc42adcfafd68a62e7d1b7e6af4e4968c0be10" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2572690-84e70917b1c64a80b248151191ccd58a/f2cc42adcfafd68a62e7d1b7e6af4e4968c0be10;
+    sha256 = "0kqv0iiy4fmcnbizc17kl3h8jv1knvn0h687fdjk68jhpkfh1fmv";
+  };
+  "f2dfdcb3b2d9423b17c83e2bf5fea37b9bee4681" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/f2dfdcb3b2d9423b17c83e2bf5fea37b9bee4681;
+    sha256 = "1p8dafdpjr058agppmhm2b5flsgk43f7rzisiplhw3qbmxn8s98x";
+  };
+  "f2e462f932cdcf953218a6d7c9cf6aeebf7dbfe4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613635-9840736c5f9647ffa600ff7b7e36f4ea/f2e462f932cdcf953218a6d7c9cf6aeebf7dbfe4;
+    sha256 = "07ypkcwj25x76055p99z54qramz975wlk3px6wy827i79zpgfx7s";
+  };
+  "f3543f8286961b827b3ed3afa8f7663b98d38b90" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2787088-b587684669f0414288401564922cf5d8/f3543f8286961b827b3ed3afa8f7663b98d38b90;
+    sha256 = "09lc3lpn3d0hqpldqld38l7lgdj9xscnnsamly8bxcajm3y3d9vr";
+  };
+  "f355e6bd836583380c61a5ed5a0c5d6150fe7542" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/f355e6bd836583380c61a5ed5a0c5d6150fe7542;
+    sha256 = "1pblr5r97iwmyv1j54hgsisdp4f7vp3l8mwj8zkiggk7nih7yi03";
+  };
+  "f380b2adccc3afba7a9a9a501560525a8359a651" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/f380b2adccc3afba7a9a9a501560525a8359a651;
+    sha256 = "0dh4k513j0q3h4ja144825fcc4cib1pfzjcpsr79kaj0villfp6i";
+  };
+  "f38889741341129aaa57f66f2c36e093673c46ea" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/f38889741341129aaa57f66f2c36e093673c46ea;
+    sha256 = "0nazhgzcmmrkkdjfqp29q2m01ca09cg2wwa23nvrjxra1bx394p4";
+  };
+  "f3a58411dee61c2a7993eb792fffd09b343e42eb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f3a58411dee61c2a7993eb792fffd09b343e42eb;
+    sha256 = "1xffc2cbd8ccs1sw7yy8vvqy9pvngg5jwlp4g8hnyvvf2jpd0532";
+  };
+  "f441f0d4f281e728c3ca0c5b5f0e5838637eefba" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/f441f0d4f281e728c3ca0c5b5f0e5838637eefba;
+    sha256 = "122bsyzki9w8b2yz5l68k6yz9r4w7zs1949ii0ccy2d5dd707zzk";
+  };
+  "f44c1c4d05656c9a8e943d8738705031cef49e0b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/f44c1c4d05656c9a8e943d8738705031cef49e0b;
+    sha256 = "0piwkmqxqgp7i6r5z39xv1yqwx4v7k01yy2l4j70fbqa8zcvikdw";
+  };
+  "f4569ad2ff2b2fc1e09a93d172caa5084bdfe887" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f4569ad2ff2b2fc1e09a93d172caa5084bdfe887;
+    sha256 = "0hnzdxvy9l3jwp6mp9hfvgks9mikpbhkdnv9dc3ydyw46f8d8m6f";
+  };
+  "f49df27b644738c41a183cbea4451a65d6ed937d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f49df27b644738c41a183cbea4451a65d6ed937d;
+    sha256 = "1j2y6x1yilb35snqpsfz4d253hry23zbc2i1cas05yz7j06d248a";
+  };
+  "f4ac5ca56e38b43436485f6d2a480e5bc47d1e3c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/f4ac5ca56e38b43436485f6d2a480e5bc47d1e3c;
+    sha256 = "1cpdciik3mh3nh4z255yja75fpvsq1bfiwd5zlia95ypvfvvabyf";
+  };
+  "f4b57562abffd4d02b186411d743d78de996f9c1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2528371-50b896349a4f4b48b4cce5ef240b0c45/f4b57562abffd4d02b186411d743d78de996f9c1;
+    sha256 = "0lih22kxxnrnq7bg6hgmcszrjqidh89z6kz38c607wfgqks3f3fm";
+  };
+  "f4e5c321293ab07639b720b5f3c43e81d2476f5d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/f4e5c321293ab07639b720b5f3c43e81d2476f5d;
+    sha256 = "1rrzw4yms3rfdxb51sz6lfzh7w34v79fb6nlmqhs7zgjqg7nj5rq";
+  };
+  "f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f4f360f81e0fe0c3b19ba2e927c0edf2ca16dd74;
+    sha256 = "1ynp6x1zwx4kahvjp7c3k62f5kimg37l28v1jxrk42c6c590a9k1";
+  };
+  "f4f52945149f9b540099572fcd29c911f8f8fc18" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f4f52945149f9b540099572fcd29c911f8f8fc18;
+    sha256 = "05jp9y3bsm2a5vyr6azbgn6isiw00wld1vbyw8f5sc7j4rbr2c8c";
+  };
+  "f51cdb5d1eca4ab02befd826a9ff14a8d168ba9d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f51cdb5d1eca4ab02befd826a9ff14a8d168ba9d;
+    sha256 = "0089lky37w6yfm4xlwqdlrdj3jj6k3bkyhw3nbhprlf94r8h8s5s";
+  };
+  "f56a72b63003eb41d4300d8b2b39b21f53acfc8c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/f56a72b63003eb41d4300d8b2b39b21f53acfc8c;
+    sha256 = "0a0f4vfpncifw87j6h0ajnzwhk9d0s35l5s5dad6rp0ijh6d5axv";
+  };
+  "f56edcc07a586e9b6792c219e9e8eca444362bfa" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f56edcc07a586e9b6792c219e9e8eca444362bfa;
+    sha256 = "1nk5jxlgscmsv9hnjqprsbkvc2g3wcdqx04xhnzcr992b4xr7p9a";
+  };
+  "f5a791771dabe2848c00de5551dea8e2ec534cc5" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f5a791771dabe2848c00de5551dea8e2ec534cc5;
+    sha256 = "0wrs36vv55lzbzn2ixqyjnf15mf41xzbw7fvfgzcdxcmpscc76cy";
+  };
+  "f5a8823af793b1af1d0d25d57df351ef32bf3d40" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f5a8823af793b1af1d0d25d57df351ef32bf3d40;
+    sha256 = "171lmzp6i9l2inwhpcif35v8j00dg44ipfkq1fxay58iinqjk9x1";
+  };
+  "f5d3ceb33b27c7cfc4a8e4689a6b49f594aea8e3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2590354-88fba4596efa431eaf994358f50a5f48/f5d3ceb33b27c7cfc4a8e4689a6b49f594aea8e3;
+    sha256 = "0pfplb9yqmhzxzkafhi8j5c8s7y9wqywrzxs7av8hnrhxxj0nasa";
+  };
+  "f602c209a799d0cc6814312718f806f70e09062b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f602c209a799d0cc6814312718f806f70e09062b;
+    sha256 = "1kjb7vbq5xqz9wdbcwsyayr6mrl5r6zczqb7pjpgavwx7kfk5xw8";
+  };
+  "f65aee70832fe31db72589b465574d372fa46ea9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613304-102512ed386740db8ece250c091d390e/f65aee70832fe31db72589b465574d372fa46ea9;
+    sha256 = "14vany0873b0hsa28g724fj1zrk2ls4jwjrhs379wxmddhllrrfv";
+  };
+  "f6fadd3d388c12b5d7246b025244646c62920fdc" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f6fadd3d388c12b5d7246b025244646c62920fdc;
+    sha256 = "1qx4xdscnfg5aha11sfvkqrp5w7db2idwhak9vph9fd5r2kg9anx";
+  };
+  "f6fdc33805bc89e2eaff8003a996f6bf8f880789" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f6fdc33805bc89e2eaff8003a996f6bf8f880789;
+    sha256 = "1r5hx97nasmk8m37pw490im1fq85q35khjpm5kq36byly3f6nvph";
+  };
+  "f7301b809afdfc0f640f1ae1c5683ff024e82766" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f7301b809afdfc0f640f1ae1c5683ff024e82766;
+    sha256 = "1bnbh14kj5ywifry0xnbzz1j9shnxizwamvi94ddjxidxacg8byh";
+  };
+  "f7543772618d958884a94ad5d6a90a39de6049c2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/f7543772618d958884a94ad5d6a90a39de6049c2;
+    sha256 = "1hl95yhmxgs6qwrg4fjlk1klqdf7wdssid60ysm7dyqcaf0pxq1s";
+  };
+  "f7a44be87cd8b2cc22a5c6580998902cd597ffac" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2615502-35e684f430004977ab5aaed43a0fab81/f7a44be87cd8b2cc22a5c6580998902cd597ffac;
+    sha256 = "0zcdg0hyrb57wl3hy3w5mh1jibd31k9lcj3sa1bqx1wvgy3axs35";
+  };
+  "f7f52ad80e2bfa86c133febe8231fb1c1f321c68" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/f7f52ad80e2bfa86c133febe8231fb1c1f321c68;
+    sha256 = "1wmasx8b2vjprs16iz2mm6djd0f9j5j2jp9mii9s55hqlc2x3zlv";
+  };
+  "f7ff067e31d48918ce41494b39f2f30c48890e55" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/f7ff067e31d48918ce41494b39f2f30c48890e55;
+    sha256 = "1xz599vrazq3gk6jcdnsrvg20dy6dfsjacm71fgi61ja9mb85kbx";
+  };
+  "f859df604a7deb221be8fb75f5eabac9a4518834" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641912-e998389b29084ea288ee35c8e738d35c/f859df604a7deb221be8fb75f5eabac9a4518834;
+    sha256 = "1mh460676fcx2557fjkfkvwl2ahxwadqyfa5axaf07fss3dnj865";
+  };
+  "f859fcf20b1d5912f1dd1fba6f9bd4393a014968" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f859fcf20b1d5912f1dd1fba6f9bd4393a014968;
+    sha256 = "0nqg6j8kxhs5qrriaycj0ihv5hwwj8h5w4a9zjs2c23982cxgd6y";
+  };
+  "f8a7fca733ca940a07647121bde451787b5afb66" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/f8a7fca733ca940a07647121bde451787b5afb66;
+    sha256 = "18kg4v54a769z22py9zzm4llz6r8kf38nm1i54704mkm5py2h35l";
+  };
+  "f8deb83eeba474abd3c4332328d32de585f40d2e" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f8deb83eeba474abd3c4332328d32de585f40d2e;
+    sha256 = "0ra7znx005gdyzybn66246bwjdkx3bwmzi99k0wqc8h3np0x3vh4";
+  };
+  "f938e9fb108c5df460b316ad63f8e4d43de264a9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/f938e9fb108c5df460b316ad63f8e4d43de264a9;
+    sha256 = "0xy3y79i0arjb3qcmq1psd3xbync91zbdfyxg2w542iviwcqx8b9";
+  };
+  "f9b69d517e1417f8099af43fbb448801dd00c40d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2539301-e5e4001afc404628b562e71e48fbe47f/f9b69d517e1417f8099af43fbb448801dd00c40d;
+    sha256 = "1813v1a3aaxpsa8fwfkwc5ik9fks5fcs1xy1spdag422iqg7752r";
+  };
+  "f9c0960de898d46640b7767a29c2119310539a4c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2612065-7518df1e66b64067baa9f5dbe835628e/f9c0960de898d46640b7767a29c2119310539a4c;
+    sha256 = "0vj3giryjmh9g43bngrimn0qm7lv41hsgwd034db6n341q2dcpsc";
+  };
+  "fa0f4ef2e4265e7a8b79791ead562e32bf436c05" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2431986-5a8dd079cf514ebd8b20693fadfa5a4e/fa0f4ef2e4265e7a8b79791ead562e32bf436c05;
+    sha256 = "1570238pvmaj2id29whvch7hn8914b2d8adf0gy6mcckgrjlx8d9";
+  };
+  "fa392f24144f8018b8a29676f4cae4fe188e7a7b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2610711-48667bb021d647959b5e191a0aa242db/fa392f24144f8018b8a29676f4cae4fe188e7a7b;
+    sha256 = "024xcvz6jh5zvx65rrip7wwrixpzdc3ww1kp6711w15qdv5nsqhk";
+  };
+  "fa3c3cf43525a5cf7e63f9b4de6d7441a0e826af" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/fa3c3cf43525a5cf7e63f9b4de6d7441a0e826af;
+    sha256 = "172birg7k18453hdz4smcr28n1dg3pvb8p3w8knjqmmg8kgy6lqv";
+  };
+  "fab186b2b42815a73845c32093d591f8d4623f0a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/fab186b2b42815a73845c32093d591f8d4623f0a;
+    sha256 = "1h55af59wbw1rq5gxrca12k1f9n65kxrqnp5bczvlmcm1nb3gi1h";
+  };
+  "fab30d459fc6efe51b656ac70e86c70a8772e5ae" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2528371-50b896349a4f4b48b4cce5ef240b0c45/fab30d459fc6efe51b656ac70e86c70a8772e5ae;
+    sha256 = "0zfymfssbgb22ixpqsiylyzygs331w5dnkjwqs1i6nwi5i2i83ds";
+  };
+  "fac6370a5441886d40a7aa7b4494da0c3304b397" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/fac6370a5441886d40a7aa7b4494da0c3304b397;
+    sha256 = "1y3b4rs1ca5v0imxx7iijr9lzxawf4brjdm62haxv6wadaqd27qm";
+  };
+  "fb092729cca1243487ce2f17b83e612ee2e645f0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fb092729cca1243487ce2f17b83e612ee2e645f0;
+    sha256 = "136ddzazdpyzk4178g7c88adh50c91bcnv993z87fny2yzc71rh8";
+  };
+  "fb175aabdcfafb6d77b5b7bad0de2c37cbabac81" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/fb175aabdcfafb6d77b5b7bad0de2c37cbabac81;
+    sha256 = "06hxp3g03bk3dvwnif9f5yhl6fc4dah722x5sabhi9pphq0z3ckc";
+  };
+  "fb4d3c4309ce988d3ebc299d517c232e83fdfe7b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/fb4d3c4309ce988d3ebc299d517c232e83fdfe7b;
+    sha256 = "1qkg8zi3czwsija16npjjgfkb2k15q6zrrp3f6nz6mn6443248my";
+  };
+  "fb634cba7663cb05cb4751272114071ba34cc677" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fb634cba7663cb05cb4751272114071ba34cc677;
+    sha256 = "0qd9raqdaw6ayza6ii6hs79ah97pb957bb22azvijmk6p2a81krz";
+  };
+  "fb807fd862137423f4c6611e8ee553e2b04a62e7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2785401-212f8ec6a3d142c8bfeb17366702bbce/fb807fd862137423f4c6611e8ee553e2b04a62e7;
+    sha256 = "14b8pbm93xd7nrb7spwb1wpsiyrqksb25y4mfn2inaismakzxq8p";
+  };
+  "fb8b95b64656d46eb01aeb66dc7607697828e39f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fb8b95b64656d46eb01aeb66dc7607697828e39f;
+    sha256 = "1bznalkd43vbl6x5p0mwpnjmjvs91l2v0nscling0csxkkkrna1w";
+  };
+  "fbc4c9072ed5c93f777e5f6fe6f43486862fa0b8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2613671-efa8cb7212aa45139aff99785a99f6c2/fbc4c9072ed5c93f777e5f6fe6f43486862fa0b8;
+    sha256 = "0kxdjzwk81ixnxxfp4wmn19qq2lbdgv1xic01mpdp00naxzw6s68";
+  };
+  "fc571a1d0a7202a062ecd269c06a2308ab378cb4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc571a1d0a7202a062ecd269c06a2308ab378cb4;
+    sha256 = "1zfdsd060m1njrkx2hlw7bcwpff23pggyklza2hpdj9k6h3jmdn2";
+  };
+  "fc71358f88c1a01c32f496b064386dba3145a36a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc71358f88c1a01c32f496b064386dba3145a36a;
+    sha256 = "1sq6f7zpmbqq9b27irf4xx8zg9p906xfpgsdxyrzgwf15vqc3cxc";
+  };
+  "fc72803a9439e161de25108be11e5429ed900f77" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc72803a9439e161de25108be11e5429ed900f77;
+    sha256 = "1nhbsry6l2wb1w8rv4lkzp42r0iqfhd5r21ckxz10gsngf9v8d5z";
+  };
+  "fc7b29cbf72c69bffecb661d7345ac5be329c14d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2717066-919cce012f444f43b8fd9849400ad87b/fc7b29cbf72c69bffecb661d7345ac5be329c14d;
+    sha256 = "0gqb44kivk31lyrmvnfff65sb0llaqi04vc3270366x5h4sii9n9";
+  };
+  "fc97754c9af277910c57351443a42a210b2eb8a2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc97754c9af277910c57351443a42a210b2eb8a2;
+    sha256 = "047psrjpddw50plbk1al6wgapzcdhzs8a7g0h2pypwiknxkw09cy";
+  };
+  "fc9d37a2c0ab6854c6b039c509d86b9459982472" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fc9d37a2c0ab6854c6b039c509d86b9459982472;
+    sha256 = "1p8j4q0blxpi9lblbyvix6w0vnds1yxn7ydq4z3qqaxmnixv9kvf";
+  };
+  "fcaba3584b9391b167f49dfe53afe253623ada36" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2608258-d12288bf79ea446a9353c7f9d223b24e/fcaba3584b9391b167f49dfe53afe253623ada36;
+    sha256 = "11dfccim0y3z9pw8hy0z0pqam8wcs3pn5sdr3yjd3g097hz2firp";
+  };
+  "fd441937ce92861563e4bd9e3619d5d9cdf73a55" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/fd441937ce92861563e4bd9e3619d5d9cdf73a55;
+    sha256 = "0fbyr6sax9j9mxfa86waw8v499yzb3sk4pqfsykcamy9dvzav6hm";
+  };
+  "fd44fdad76da5efbaf3bced1a5d2bf12eb028b35" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fd44fdad76da5efbaf3bced1a5d2bf12eb028b35;
+    sha256 = "141rnzqcg3p51saqqd54bl5nj7f5kkm6ysvbcmlcpd5qmxg0swqb";
+  };
+  "fd521968de6928ff3ba9e7a3568d3190fc56573a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fd521968de6928ff3ba9e7a3568d3190fc56573a;
+    sha256 = "0gxwqdk6d6lg3akvn5ydvr2jr2ywq4w38ql0ck1xxj8p5jnwh90m";
+  };
+  "fd5c39fee72ecaed24e8e462a4a71a69c06e4509" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/fd5c39fee72ecaed24e8e462a4a71a69c06e4509;
+    sha256 = "0jfdv5cbgqczza53gd35qgxykxa1660rj5r7p57kbyfhhn116785";
+  };
+  "fd621bb2eef661c744d767a89b7b835495af2a90" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/fd621bb2eef661c744d767a89b7b835495af2a90;
+    sha256 = "14pfnxzc77k809m22l6arqpi2rzdm8f5s07hkqn7ikvddyh55snq";
+  };
+  "fd63513879784b9901479056b82fc51c57ba8666" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/fd63513879784b9901479056b82fc51c57ba8666;
+    sha256 = "0qcxd2x5lhj2vkpc99y8yh0knsx0cnbr6h6zpv35ympybxffdm9r";
+  };
+  "fd9f084abed9009fd3d7585637980961e5ac37c9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2746336-9279cae0020b417daa2c9ef71df497d5/fd9f084abed9009fd3d7585637980961e5ac37c9;
+    sha256 = "1q21jh1pnq2hnc5pyx2bvjivly9d83mf3kh5xsvxgz73sviqr42h";
+  };
+  "fdb6c138bd7f73ccfc7a2324408b8199fe18c5c8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fdb6c138bd7f73ccfc7a2324408b8199fe18c5c8;
+    sha256 = "1sapx3lsi13mz76vljdiwddq5say5ing9jpckjpsg9vvzwpmd03k";
+  };
+  "fdddaa298c770236e8e0ae3fa46d56ab464ff590" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fdddaa298c770236e8e0ae3fa46d56ab464ff590;
+    sha256 = "0psr2i314z03ispws9cr2wfk6vq9l0fwcw1vz65rcns7i24l4bii";
+  };
+  "fdea9eb5b7adc1f8cdca84ff533afa9978bc74e2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2369826-2acd3c361c9d4a858bd63938a2ab980e/fdea9eb5b7adc1f8cdca84ff533afa9978bc74e2;
+    sha256 = "17pnggfb9aj0lahbbs0blfiywdz53bszbrh4bx0n86viyls5g36r";
+  };
+  "fe108abb775ce219aed6c508fa1d8d9ec9710c50" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/fe108abb775ce219aed6c508fa1d8d9ec9710c50;
+    sha256 = "0qknlj971xn147z7992idp3hbwif2fqy02ml8jbxah4v82d1ssdk";
+  };
+  "fe26cc5b44599296ab8cca48bf52350d32f5ccf3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2645089-febc94e74d4940f8a601cd6b98abe18d/fe26cc5b44599296ab8cca48bf52350d32f5ccf3;
+    sha256 = "154jg46kbbfn7ipjap4s8bgfjhzazj3pd2n7yd009drw2l1ald1q";
+  };
+  "fe2fd0043d9dceb3bd974fd46a7f657222f0068f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2616691-982be94b99b442419e99de37630ca843/fe2fd0043d9dceb3bd974fd46a7f657222f0068f;
+    sha256 = "0rq7hnir60k0ncfk0qzin2fk8w2m9l9259qzx7cryf9hvssy1vxq";
+  };
+  "fe34956f65e0611aa1584ca611b7843e22e3e29f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2636785-bb59fe7a4b5f4abc9305901e79ac10da/fe34956f65e0611aa1584ca611b7843e22e3e29f;
+    sha256 = "1hnasgpz4ml4095nnr1936jfx09vfajib3g9szrwdy0bf9rcrdh8";
+  };
+  "fe39e5851d68399087d05d9c22da12a1fdd7b6de" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2641797-79a5af4419414bd1af098301c8bac322/fe39e5851d68399087d05d9c22da12a1fdd7b6de;
+    sha256 = "1rfaalg6rbc1w45b5iipb81n6y0mdqkf1ylfphzbchpqliipl5ba";
+  };
+  "fe79883294e7b730b4ea0e6e72c662ced28e999b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2500002-69b23dcf7a2d4165b2b432780845acb0/fe79883294e7b730b4ea0e6e72c662ced28e999b;
+    sha256 = "0rc7vagcgn74cg4vkzhkhy0jyv5wphacb3kd8kfxzidb1v92k4br";
+  };
+  "fe94f39680410922eeef278b013e20b5ee27e7fe" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2372940-e2185854aff3439f82782883f74d5bf8/fe94f39680410922eeef278b013e20b5ee27e7fe;
+    sha256 = "0wllmwfggykl56kwb92jdz8rcfvrn4hxvj9mav19sc9fg2dibfzf";
+  };
+  "fecddbf47598e42c13644ce42253e7ca8178eb29" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/fecddbf47598e42c13644ce42253e7ca8178eb29;
+    sha256 = "0xwi7xa1jm012lmxhz3al7yhwwv33qz332bqvwamcza63ir6zpw9";
+  };
+  "fed2a12f5d40235d6295fed1092707889ff01b08" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/fed2a12f5d40235d6295fed1092707889ff01b08;
+    sha256 = "08cyqg80grwpmv9fkm7nldz8p12nzssg08cyijc4d5afx6xddym4";
+  };
+  "ff38188923ffc7c35c9b2e533f2ce6f3a9aa3a3d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ff38188923ffc7c35c9b2e533f2ce6f3a9aa3a3d;
+    sha256 = "03vknw5a43n6kl3llyk7czg5a0w4fkic29b6d8i0q71jxknizf50";
+  };
+  "ff61432b09f3c5882ed0f5f932a0537f38cde5cf" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2716009-3335bc961a4d42e9ac0bd72e7491e442/ff61432b09f3c5882ed0f5f932a0537f38cde5cf;
+    sha256 = "08qcnz8qrxqrrhsll0n9k49cp6fqiacl85n0jhq53jsh805hlw2b";
+  };
+  "ff66ba394c099b33decda558509ec6f4fdb43892" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2581810-569aa4e20f7249d0bfc2a94ef91ec1a8/ff66ba394c099b33decda558509ec6f4fdb43892;
+    sha256 = "12qmiff7fynifhpaivsyg23v6jm89i903dhqqs2xiihbd77ln8lb";
+  };
+  "ffd25a14ee418633d47a558d3a953c501f56e2f3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2493588-b79d458e39e94a44804912814d8e1e50/ffd25a14ee418633d47a558d3a953c501f56e2f3;
+    sha256 = "0kclig15z3ywc7mb0xyv5pvijkzzj4llimij5hqagwwdgi31rirg";
+  };
+  "ffe1832c9002fb490bd976e6906fe43792e2e487" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2487260-b428468bcd6545bfbb79f02a6605b9ef/ffe1832c9002fb490bd976e6906fe43792e2e487;
+    sha256 = "1n5q3v765kblvn9z74jdgxj1f1qdqpnypx1i00xf8ni5if5w183d";
+  };
+  "ffe4b29f6febe2e6345b292bd341aefed751ae1d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2565979-eaaf2006b54843b69b5280979c12ed6d/ffe4b29f6febe2e6345b292bd341aefed751ae1d;
+    sha256 = "159bff8wiz2smjl34l7d581wyy9ihxr576s4blq8hdqkm1wl0va9";
+  };
+  "025037991170960704b2d2a49e7bf37cebf06b85" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/025037991170960704b2d2a49e7bf37cebf06b85;
+    sha256 = "05p86qn4g7qg9wzz62piksf2xi599hyim2bqi38158qrmfmqigdw";
+  };
+  "091a839006f281b7b12ee0d1bd0fff225f0ac73a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/091a839006f281b7b12ee0d1bd0fff225f0ac73a;
+    sha256 = "0m79g350p4gv3yb13i5921gbcc7bx852p5lmivfpwx3wqvghd5pz";
+  };
+  "09dbd9ce439ba4adad23922f5b9002fa4e759bd1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/09dbd9ce439ba4adad23922f5b9002fa4e759bd1;
+    sha256 = "188f2j0ik5c2cmw5ck386diabc24p57yhqrb4c7303d13dnqr1mm";
+  };
+  "0c416ae48c3e2ad2be1333ccc20f6992ce982aa4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/0c416ae48c3e2ad2be1333ccc20f6992ce982aa4;
+    sha256 = "1bm210fw20prl3k51dr9gai3asdg3kq30diln70lgm9wyk18kiv4";
+  };
+  "117189ccfc8241744b0cde19d866507341334ea0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/117189ccfc8241744b0cde19d866507341334ea0;
+    sha256 = "1nv2s6g8i7scqgwbqgsyicys2cwaf3mkvcqqvpc807ag2ad3rxl6";
+  };
+  "12164f23f40b93eb0a4cf6f0acb58596becc8f2f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/12164f23f40b93eb0a4cf6f0acb58596becc8f2f;
+    sha256 = "0px9qidckfldj9b9znxg31alsqrzzgpfjixr003lv410hbn099ir";
+  };
+  "1580d9078ae389f2cea6d568fc4ea0b0ebd5d183" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/1580d9078ae389f2cea6d568fc4ea0b0ebd5d183;
+    sha256 = "1xffqr3bhd4x5h36vk4dnz0hmc64gjg273ysnn68x9k2zdqgdmj0";
+  };
+  "1c44fa7c763743e619fef130346733eb5f107049" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/1c44fa7c763743e619fef130346733eb5f107049;
+    sha256 = "05nms6yrclw38v6180b4bqswwdmlb7l2l388wj4f7i0zi9cc0z1d";
+  };
+  "1f209ff22ef667820d2143b0bef1783612c2dc33" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/1f209ff22ef667820d2143b0bef1783612c2dc33;
+    sha256 = "1w6prwjci9fbp4jln2dl0pdjjiis30r982cjk261jb7ryrzm1bc6";
+  };
+  "2a13498d62f2897b95a2fde8f9117caf2213369d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/2a13498d62f2897b95a2fde8f9117caf2213369d;
+    sha256 = "11khy0pbyqbchzksfp51ihw8ahgpf9kvby6jp2spwf4cqglr4yzj";
+  };
+  "2c0a73c42dae723ea6ada9f3a83b520b4094655f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/2c0a73c42dae723ea6ada9f3a83b520b4094655f;
+    sha256 = "1gm11rsybfsdsbzbyrfwvp1wpy9x84plgwayv59qmn4j15hz7hya";
+  };
+  "2ea89fc7cf11ce2e9f8bd6df71dd99eff85bcc15" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/2ea89fc7cf11ce2e9f8bd6df71dd99eff85bcc15;
+    sha256 = "1zn4b57cf0w74m125iihbn2yjba95v22pn8gxq49qrfg5aci928r";
+  };
+  "2f7a26433cf0506c014fcc5694c194b28a811006" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/2f7a26433cf0506c014fcc5694c194b28a811006;
+    sha256 = "0ikgmmv133lamgmm5dah5sy50pr5g1125bw8rx4l27mgbz5yq276";
+  };
+  "316245a9c9d050b2bce9f47deafb0baa66af6347" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/316245a9c9d050b2bce9f47deafb0baa66af6347;
+    sha256 = "1389lmbg8dby7g14yq8jphvzdzswnwhkpm8aqa3h74ivnpabnpni";
+  };
+  "3536f544f9e91433e6939163fb611c524a5f468f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/3536f544f9e91433e6939163fb611c524a5f468f;
+    sha256 = "0wm2djjaksndivynjdz0f2c56a792r6q13vi19baipm0hglbaq3w";
+  };
+  "3663f96dbca6fd930e000a6617a3bb214a6ee0f0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/3663f96dbca6fd930e000a6617a3bb214a6ee0f0;
+    sha256 = "0qhpfkja24fxnzgl6vihwz2ilvz0jsdk04g5jn5r08iv90klj5c8";
+  };
+  "3d32ebca9fef4352a99f2e0636ac45e9d3b35d03" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/3d32ebca9fef4352a99f2e0636ac45e9d3b35d03;
+    sha256 = "02dsfahlg3fcvzb9aqxiycwd5vcb0q205gbzrh3x5m989flyrs1y";
+  };
+  "44c8dbacafb32300e6af2a0cf5897e5145c2b7f4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/44c8dbacafb32300e6af2a0cf5897e5145c2b7f4;
+    sha256 = "1vjyvp13qbfmv5jgdbicikhjq6wm9216ikqk23w1qsz0xzbn9wb9";
+  };
+  "4511815cd4297243a8afd7a2e799c60880a6ea95" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/4511815cd4297243a8afd7a2e799c60880a6ea95;
+    sha256 = "1rw6h3sc30ypr6304mjg6pzh841wmn5gjd4a3xv4y681nqys30li";
+  };
+  "4d9e2249062c1ccd50913501cbc7ea2fdb8cc94c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/4d9e2249062c1ccd50913501cbc7ea2fdb8cc94c;
+    sha256 = "0z86cczszfk05fmcd7dwfahnv0cm1wj7xq0yr0i332a7jr0g5s6d";
+  };
+  "4e3bb620861aa7c3d996fd8ee7cd3a40c2096bb0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/4e3bb620861aa7c3d996fd8ee7cd3a40c2096bb0;
+    sha256 = "0l9bfkanklr3zywkyn4lb5lzfpqkhr4c4n6kvw9gi4nzg063ifnh";
+  };
+  "574e359a11791294117e7f4ad4f677a99424170a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/574e359a11791294117e7f4ad4f677a99424170a;
+    sha256 = "1vhnylasbla79d2syx41804pshyd7w8ph1y88yyjp5w9g8zbcy0g";
+  };
+  "5756967d4a6019de75418949a564995c64fd81b1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/5756967d4a6019de75418949a564995c64fd81b1;
+    sha256 = "1fy2h21myp9yzc60545appg75in12f13rslhr7bpmsssgjrrz2fg";
+  };
+  "5c884c59ad7491166618894713300acc03499f45" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/5c884c59ad7491166618894713300acc03499f45;
+    sha256 = "19zrbvfnmhivs7gy0bm92kn04fqyc8179mkir5v4wycx7q24w938";
+  };
+  "5ea84c79c69cb4f20a2cbde31b1e9655f352f1c8" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/5ea84c79c69cb4f20a2cbde31b1e9655f352f1c8;
+    sha256 = "02rhs442s9y67kb8gympr42yl3xxx3d34iwqz926gr5721if0gh0";
+  };
+  "60be604621599e16ffec1f76e08339b6f9d89f8d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/60be604621599e16ffec1f76e08339b6f9d89f8d;
+    sha256 = "1nyll0lj0fmdphmah4zd5n6bn2zgy2sgff6mnwch2mm6bvxmgzlm";
+  };
+  "659b18633abf461608be32b8b565f4b70725ee20" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/659b18633abf461608be32b8b565f4b70725ee20;
+    sha256 = "00jywmppclqm62q0zq3b1dww6f27blblc633kcskyxc9f2i8p3qs";
+  };
+  "6f25ee59e861b5697b41d487ab19360684b2079b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/6f25ee59e861b5697b41d487ab19360684b2079b;
+    sha256 = "0y3fiwflj6qfmmpgpyi3xkyn6dls620iwcwq5cdpz4jhzhz5vbqm";
+  };
+  "723429357fc93c212749453abdecffa83625ce63" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/723429357fc93c212749453abdecffa83625ce63;
+    sha256 = "126ncm0szxkskfgwfbx5mhnbdpxl395gn62dv3rdg7xm4wjg3s07";
+  };
+  "73163f4d3a1f9f7015cad45b8b2fe49ee716aed2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/73163f4d3a1f9f7015cad45b8b2fe49ee716aed2;
+    sha256 = "1lkd1i92yc8lyfpnxp9gkgrklmxfj0p3zj1j0png50a4v6qyw55d";
+  };
+  "74ee06b2cb0a84dec755ca05d0b832517a58db9a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/74ee06b2cb0a84dec755ca05d0b832517a58db9a;
+    sha256 = "10xp24ija0l7dn3xd690dk6a342ma4iafmcywinvh111xcwkvvql";
+  };
+  "77c1ef425fc9a747ed3815f78a2616fee747fd12" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/77c1ef425fc9a747ed3815f78a2616fee747fd12;
+    sha256 = "0gspscdvrnvj0ps5z2ckga2ji00y8m9kj3zaqpl06kywyz5p1q1l";
+  };
+  "77cf0dabcf5441932f1317ec4ee4e28bf2039a85" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/77cf0dabcf5441932f1317ec4ee4e28bf2039a85;
+    sha256 = "1mdngkvkss3ia9g6kjiybvqj4w7q39iif1kqfjxzr1gs098q23ng";
+  };
+  "80d27f0c38fd20a082015a2b069457560f523b57" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/80d27f0c38fd20a082015a2b069457560f523b57;
+    sha256 = "1s2cxkgwnzisbj9r55ciwkv42m423cq7nhkywd7d80hy2wrpir5p";
+  };
+  "817fe5e5ddfde58d79455a8b2cf70079f0642770" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/817fe5e5ddfde58d79455a8b2cf70079f0642770;
+    sha256 = "03dh02fjc2ksdhifwx92qfvcaymvkhc5cf4m8jlg9v3lkz1dxa2z";
+  };
+  "81cf86d27a982faf7f6331f91b6b5634cfaa00d0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/81cf86d27a982faf7f6331f91b6b5634cfaa00d0;
+    sha256 = "0n9ra5ynq4kqpd5gsdx72qk8nn8nh9bffbqvyp1jwkbc7vbf6rn1";
+  };
+  "82368148bbcf9a6d07bead1e678bfee5f8631cfb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/82368148bbcf9a6d07bead1e678bfee5f8631cfb;
+    sha256 = "06f7ysl5zxx15x2mc0yl2qxdfydnaclr7zwffip03s1szjfdf078";
+  };
+  "85df0b8a16e3e1c2b99bd8d8703a8c00f80c4ffd" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/85df0b8a16e3e1c2b99bd8d8703a8c00f80c4ffd;
+    sha256 = "0gl18m1fqb2gyd0fnf5bvq77bqvlyngqvqbjikdr1vhj78jp8l2p";
+  };
+  "8a73223e8d37b2fb9151a753a24139f37818e434" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8a73223e8d37b2fb9151a753a24139f37818e434;
+    sha256 = "0sk5l8ijfjrys0l3mj6ypgx4araw0hnxz0cjzm9bk8y605331znx";
+  };
+  "8ab79f2416da3c5f785bf291971680dbfdb62e26" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8ab79f2416da3c5f785bf291971680dbfdb62e26;
+    sha256 = "1xlnzpljknkmbw85xz35a48h2fdv9c2ijf0nm7cdc489699v9gfv";
+  };
+  "8c09c7e57e2bc1a99df552e75f3bc3033364bbd1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8c09c7e57e2bc1a99df552e75f3bc3033364bbd1;
+    sha256 = "168yb57ri0wibsy1gr940y8sxdc9s2vcniizkk4dykpnkay0izl1";
+  };
+  "8e02b6fe5eaaad154d3b7677458a9f52c538129f" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8e02b6fe5eaaad154d3b7677458a9f52c538129f;
+    sha256 = "0zlz81qm00klwfmnc1133c8q1jgxn1w6b5fajs8jigmhwqahi806";
+  };
+  "8ef45e913784e24ac5b05d020bb1c90e5e1f65b4" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8ef45e913784e24ac5b05d020bb1c90e5e1f65b4;
+    sha256 = "13rd7mvzc3vxgz7zpa89rdfidflvaxzlv60m1ngcsjigwank5a52";
+  };
+  "8f31c3a2ca87728958356ef279d797c21ff800d2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/8f31c3a2ca87728958356ef279d797c21ff800d2;
+    sha256 = "10vqrm360csnbncrhkyy45nnl9md88jl0f9lmvlav19m60cdxazi";
+  };
+  "90647a14bfb8f6e8cbcc8d8ecce7d8e2500818b9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/90647a14bfb8f6e8cbcc8d8ecce7d8e2500818b9;
+    sha256 = "0hlknlph7dw2c74pmg99apbhdfd844vq77navnynxm890nrjzqs0";
+  };
+  "a0032cd8280294edff61604e9bf0312230cfd79b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a0032cd8280294edff61604e9bf0312230cfd79b;
+    sha256 = "026b18ka0nsb1ri7wk0iqnjz60fsnr11c22lvhq2wiqh9jqsl9f6";
+  };
+  "a038a78206b6b0572fa3a86e5a96e3fee0d32b04" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a038a78206b6b0572fa3a86e5a96e3fee0d32b04;
+    sha256 = "0ahhkyb4h23apy04jjif0ys6nqjjrzf27w7h3xvw93mzasc4x515";
+  };
+  "a27eb78abbdabe194ad5b4c1bfe56dfca38e43b0" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a27eb78abbdabe194ad5b4c1bfe56dfca38e43b0;
+    sha256 = "0bba6vpl4lk376yhjjlgxc81m20i9qq9b7kr2bf7lg76fx485ydq";
+  };
+  "a2e5471c647ec896793c1df59ec6c214756b7644" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a2e5471c647ec896793c1df59ec6c214756b7644;
+    sha256 = "05n7fnxpg01xg4b8k323h0lbhlqxq2b432454rg5lj5ydd71w9vd";
+  };
+  "a6f1cf388c274ffbbbf5ee9f678d2fd2c982ac9d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/a6f1cf388c274ffbbbf5ee9f678d2fd2c982ac9d;
+    sha256 = "0l0fdmypq1h5whfnk1132z77sbnmgwqhizss8pgjwi9k0qgahgcc";
+  };
+  "afad2bca0d8075378f5239206210c90bc449f66d" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/afad2bca0d8075378f5239206210c90bc449f66d;
+    sha256 = "13944ai93z6md86wq4ghjhlgnw3xd5xf64ski1n0imxy3xnclki9";
+  };
+  "b49b4db86170da54d36c9f77345132f501569443" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/b49b4db86170da54d36c9f77345132f501569443;
+    sha256 = "1dm4ln3cky50hzwpfb8hyzj3wyiwnjzpwybmri7sp51yhfjbssh4";
+  };
+  "b928e6544636d28eb1f1fad8cbfb3a508d6b523b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/b928e6544636d28eb1f1fad8cbfb3a508d6b523b;
+    sha256 = "0a2lgynlylx99aj6jlzkbid6sq8sc1y9sblr3vjdc0rxpzyr7saf";
+  };
+  "bac3a42148c64a342e3a138e254acfc37baf7f7c" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/bac3a42148c64a342e3a138e254acfc37baf7f7c;
+    sha256 = "0z3vq7qnjjihk5h7rr4sjgiyqvqvm64ivra2bdb89hklycawz6c5";
+  };
+  "bf6954d37d21ccd063ce7829bdbf17a34a5972f6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/bf6954d37d21ccd063ce7829bdbf17a34a5972f6;
+    sha256 = "1wmm2rhf0c1351y9mjdyi4dxq2jmsl893ijm99f4zr64nqgxh76b";
+  };
+  "c48ea333ebc4208f44ca53ccec1b4a9224234423" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/c48ea333ebc4208f44ca53ccec1b4a9224234423;
+    sha256 = "0q536yk3rncy3gf6ch5mmsvjizq1n5lkk8nfhg1lrvg7mhxsd257";
+  };
+  "c4ab35a8f3c52c8999804559d5a506f4a4ea28d6" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/c4ab35a8f3c52c8999804559d5a506f4a4ea28d6;
+    sha256 = "03id4awm9lnrrk92d9vdzlwy5g6bai9ig4i5lsk90f814vhz11nq";
+  };
+  "c5f44e9ae34828343c5c6eb3e73c2c451120da78" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/c5f44e9ae34828343c5c6eb3e73c2c451120da78;
+    sha256 = "15qbc27xc2gp431i3hhslwbgsgg3az37swvc37rarqw8jaayfdzw";
+  };
+  "c97e1a685bb16bacc741e943d668230b044da28b" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/c97e1a685bb16bacc741e943d668230b044da28b;
+    sha256 = "1an5cdb74lspq3v15xdksjld444saw7b62nx8c9vy8hq0qkxmyg0";
+  };
+  "ceed10f922981467ca264e2f3c1ba9a6834ee9fb" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/ceed10f922981467ca264e2f3c1ba9a6834ee9fb;
+    sha256 = "0lsghjsy1dxr94crqd4z28vgl1fzwbw2q02k7yh2hzq3p5w5n08s";
+  };
+  "d657a675c488b3ceece090f664b8b3890c0f72c7" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/d657a675c488b3ceece090f664b8b3890c0f72c7;
+    sha256 = "1ddbjh67h2iz3pm0sfj77yc907zcfrzmn0bzyaa4rkz234zzp6hl";
+  };
+  "d80b9d2bef36dbe0669cfea717fe30315568ba9a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/d80b9d2bef36dbe0669cfea717fe30315568ba9a;
+    sha256 = "11p1dbc3zrakwhmw7xi2wdshsbm6azdix8gy81gf8icy55ggg8ma";
+  };
+  "d87b8c33d15b51b773c6f091853c54f865561e64" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/d87b8c33d15b51b773c6f091853c54f865561e64;
+    sha256 = "0qx0pb86fw6v50nl1p59d375bmc3x35cwd0qvbsbszr5w0wla0w2";
+  };
+  "d995c76652895e51297226aedf32dd0c715582e3" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/d995c76652895e51297226aedf32dd0c715582e3;
+    sha256 = "0pgwg8w2svxvnw1p7cp233p866f4kpmfsgaw1ids8z37dw8qa7h0";
+  };
+  "de6a3578fbc96909e587a897c860f56738c9a027" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/de6a3578fbc96909e587a897c860f56738c9a027;
+    sha256 = "1vpm2s3ndg9nqnady3kswfh4bwcrmx1x37m79kcvbpaalbb1w7cr";
+  };
+  "e0a272e2ea952c9c27d010098f6ed3be34d70023" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/e0a272e2ea952c9c27d010098f6ed3be34d70023;
+    sha256 = "1cw0bn4lrk11nynab2s56i982fljd39ibczp92lwv6f9crpbxqqd";
+  };
+  "e18cf443cf050171be2dafbb7847b1eef470d743" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/e18cf443cf050171be2dafbb7847b1eef470d743;
+    sha256 = "10pf020vhki6wv2a8ja4gx5lr4l8fc6fhbyvkmjw6fszf4qkmgzd";
+  };
+  "e89e8d979ec25d6a66f7a72b8390aaa876cb54b2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/e89e8d979ec25d6a66f7a72b8390aaa876cb54b2;
+    sha256 = "0x7mcg0rfx0nvr9356yk4lzilz5x732bhir53qis4z7rfjhdi3fn";
+  };
+  "ecee7a937781e9f7f6528b7bf03dd4cdc12bbd1a" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/ecee7a937781e9f7f6528b7bf03dd4cdc12bbd1a;
+    sha256 = "16l5vasgq7iykpgrhr2q5x5rp780fy5nhzg459varwpr2ixlj640";
+  };
+  "eef376599acf8af872a7ecceb89b8afc1dc53cca" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/eef376599acf8af872a7ecceb89b8afc1dc53cca;
+    sha256 = "10kjixb4gsdy2m0zj0v4sd38qqjbxcy4wmiwvpbpj95nyckf4695";
+  };
+  "f32b43ead099376849798c829e67335923b6f5df" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/f32b43ead099376849798c829e67335923b6f5df;
+    sha256 = "0bzabjvzamnadzx2idzviiyzhv3nkbp7w2wcq20lpzmszk0lxdn5";
+  };
+  "f6efa02b7fe9e154763f4e74a2d13e6016651478" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/f6efa02b7fe9e154763f4e74a2d13e6016651478;
+    sha256 = "1qwgrh9pdhp5rsiimwm6v0hvmi9v3fbijx4pkdgklm6c7mxfmh6g";
+  };
+  "f82d0258fa61f3050a7ec0c48a72a14882f4f9ff" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/f82d0258fa61f3050a7ec0c48a72a14882f4f9ff;
+    sha256 = "10yqzj12sma2xqcxvqdh3s24dl5pwk9wlplxiaplkwm802fn95sw";
+  };
+  "fd8eb71773dfc69f5da73a588a9487e8155eb7d9" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/fd8eb71773dfc69f5da73a588a9487e8155eb7d9;
+    sha256 = "1xfvsj2rsbmnhmgv67j7xkc41n3c61ikvmlglj47iyqxlrcp15hs";
+  };
+  "fe7abbfa12319d22b0735b908af92eafc25d27a2" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/fe7abbfa12319d22b0735b908af92eafc25d27a2;
+    sha256 = "0f6cvhhba05slb5wxyymx46syb7v1ggbgcvisifiaf8wnivh46f9";
+  };
+  "ff648984dc86f826cc03f174f5a1b26e33268529" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/ff648984dc86f826cc03f174f5a1b26e33268529;
+    sha256 = "0l2p41n9w4iap9nixxivn6vlzbl5bb3x47pkr250lgd3s81slhg5";
+  };
+  "ffcb54fe4e2f0e1ee2f22f84cff4ddc49da010f1" = fetchurl {
+    url = http://cdn.unrealengine.com/dependencies/2818068-50a136646fbe4d1b8b290d40ccd3f30a/ffcb54fe4e2f0e1ee2f22f84cff4ddc49da010f1;
+    sha256 = "1irjabajfblyl5s36lasq5rclxagc1finwb7y68wsj3w5195gihg";
+  };
+}
diff --git a/pkgs/games/ue4/default.nix b/pkgs/games/ue4/default.nix
new file mode 100644
index 000000000000..ac14c40f52b8
--- /dev/null
+++ b/pkgs/games/ue4/default.nix
@@ -0,0 +1,82 @@
+{ stdenv, writeScript, fetchurl, requireFile, unzip, clang_35, mono, which,
+  xorg, xdg-user-dirs }:
+
+let
+  inherit (stdenv) lib;
+  deps = import ./cdn-deps.nix { inherit fetchurl; };
+  linkDeps = writeScript "link-deps.sh" (lib.concatMapStringsSep "\n" (hash:
+    let prefix = lib.concatStrings (lib.take 2 (lib.stringToCharacters hash));
+    in ''
+      mkdir -p .git/ue4-gitdeps/${prefix}
+      ln -s ${lib.getAttr hash deps} .git/ue4-gitdeps/${prefix}/${hash}
+    ''
+  ) (lib.attrNames deps));
+  libPath = stdenv.lib.makeLibraryPath [
+    xorg.libX11 xorg.libXScrnSaver xorg.libXau xorg.libXcursor xorg.libXext
+    xorg.libXfixes xorg.libXi xorg.libXrandr xorg.libXrender xorg.libXxf86vm
+    xorg.libxcb
+  ];
+in
+stdenv.mkDerivation rec {
+  name = "ue4-${version}";
+  version = "4.10.2";
+  sourceRoot = "UnrealEngine-${version}-release";
+  src = requireFile {
+    name = "${sourceRoot}.zip";
+    url = "https://github.com/EpicGames/UnrealEngine/releases/tag/${version}";
+    sha256 = "1rh6r2z00kjzq1i2235py65bg9i482az4rwr14kq9n4slr60wkk1";
+  };
+  unpackPhase = ''
+    ${unzip}/bin/unzip $src
+  '';
+  configurePhase = ''
+    ${linkDeps}
+
+    # Sometimes mono segfaults and things start downloading instead of being
+    # deterministic. Let's just fail in that case.
+    export http_proxy="nodownloads"
+
+    patchShebangs Setup.sh
+    patchShebangs Engine/Build/BatchFiles/Linux
+    ./Setup.sh
+    ./GenerateProjectFiles.sh
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/UnrealEngine
+
+    sharedir="$out/share/UnrealEngine"
+
+    cat << EOF > $out/bin/UE4Editor
+    #! $SHELL -e
+
+    sharedir="$sharedir"
+
+    # Can't include spaces, so can't piggy-back off the other Unreal directory.
+    workdir="\$HOME/.config/unreal-engine-nix-workdir"
+    if [ ! -e "\$workdir" ]; then
+      mkdir -p "\$workdir"
+      ${xorg.lndir}/bin/lndir "\$sharedir" "\$workdir"
+      unlink "\$workdir/Engine/Binaries/Linux/UE4Editor"
+      cp "\$sharedir/Engine/Binaries/Linux/UE4Editor" "\$workdir/Engine/Binaries/Linux/UE4Editor"
+    fi
+
+    cd "\$workdir/Engine/Binaries/Linux"
+    export PATH="${xdg-user-dirs}/bin\''${PATH:+:}\$PATH"
+    export LD_LIBRARY_PATH="${libPath}\''${LD_LIBRARY_PATH:+:}\$LD_LIBRARY_PATH"
+    exec ./UE4Editor "\$@"
+    EOF
+    chmod +x $out/bin/UE4Editor
+
+    cp -r . "$sharedir"
+  '';
+  buildInputs = [ clang_35 mono which xdg-user-dirs ];
+
+  meta = {
+    description = "A suite of integrated tools for game developers to design and build games, simulations, and visualizations";
+    homepage = https://www.unrealengine.com/what-is-unreal-engine-4;
+    license = stdenv.lib.licenses.unfree;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.puffnfresh ];
+  };
+}
diff --git a/pkgs/games/ue4/generate-expr-from-cdn.sh b/pkgs/games/ue4/generate-expr-from-cdn.sh
new file mode 100644
index 000000000000..91cab1ca32f5
--- /dev/null
+++ b/pkgs/games/ue4/generate-expr-from-cdn.sh
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+go() {
+    file="$1"
+
+    IFS=$'\n'
+    for pack in $(perl -n -e '/(<Pack .*\/>)/ && print "$1\n"' $file); do
+        remotepath=$(echo "$pack" | perl -n -e '/RemotePath="([^"]*)"/ && print $1')
+        hash=$(echo "$pack" | perl -n -e '/Hash="([^"]*)"/ && print $1')
+        url="http://cdn.unrealengine.com/dependencies/$remotepath/$hash"
+
+        until sha256=$(nix-prefetch-url $url --type sha256); do
+            true
+        done
+
+        cat <<EOF
+  "$hash" = fetchurl {
+    url = $url;
+    sha256 = "$sha256";
+  };
+EOF
+    done
+}
+
+
+cat <<EOF
+{ fetchurl }:
+
+{
+EOF
+
+go Engine/Build/Commit.gitdeps.xml
+go Engine/Build/Promoted.gitdeps.xml
+
+cat <<EOF
+}
+EOF
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38d8bf296423..b943065283e9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14619,6 +14619,8 @@ let
 
   urbanterror = callPackage ../games/urbanterror { };
 
+  ue4 = callPackage ../games/ue4 { };
+
   ue4demos = recurseIntoAttrs (callPackage ../games/ue4demos { });
 
   ut2004demo = callPackage ../games/ut2004demo { };

From 9cf93ba13587dba8116fa99279e51cf60c7bde88 Mon Sep 17 00:00:00 2001
From: Scott Olson <scott@solson.me>
Date: Thu, 18 Feb 2016 22:10:43 -0600
Subject: [PATCH 1540/2285] Simplify fetchurl assertion logic.

The two lines I removed technically assert the exact same thing, since `!a -> b`
is equivalent to `a || b`. So, I replaced the two lines with the more symmetric
form to make it clearer.
---
 pkgs/build-support/fetchurl/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index 804974954d10..2c802bb3679c 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -85,8 +85,7 @@ in
 }:
 
 assert builtins.isList urls;
-assert urls != [] -> url == "";
-assert url != "" -> urls == [];
+assert urls == [] || url == "";
 
 
 let

From bfea299a6a6ee75569abbde872ea2c55ea89b4a1 Mon Sep 17 00:00:00 2001
From: Asko Soukka <asko.soukka@iki.fi>
Date: Fri, 19 Feb 2016 07:07:14 +0200
Subject: [PATCH 1541/2285] rabbitpy: init at 0.26.2

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index abdf7b424fb9..84aef8900584 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14362,6 +14362,24 @@ in modules // {
     };
   };
 
+  pamqp = buildPythonPackage rec {
+    version = "1.6.1";
+    name = "pamqp-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pamqp/${name}.tar.gz";
+      sha256 = "1vmyvynqzx5zvbipaxff4fnzy3h3dvl3zicyr15yb816j93jl2ca";
+    };
+
+    buildInputs = with self; [ mock nose pep8 pylint ];
+
+    meta = {
+      description = "RabbitMQ Focused AMQP low-level library";
+      homepage = https://pypi.python.org/pypi/pamqp;
+      license = licenses.bsd3;
+    };
+  };
+
   parsedatetime = buildPythonPackage rec {
     name = "parsedatetime-${version}";
     version = "1.4";
@@ -17460,6 +17478,25 @@ in modules // {
     };
   });
 
+  rabbitpy = buildPythonPackage rec {
+    version = "0.26.2";
+    name = "rabbitpy-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/r/rabbitpy/${name}.tar.gz";
+      sha256 = "0pgijv7mgxc4sm7p9s716dhl600l8isisxzyg4hz7ng1sk09p1w3";
+    };
+
+    buildInputs = with self; [ mock nose ];
+
+    propagatedBuildInputs = with self; [ pamqp ];
+
+    meta = {
+      description = "A pure python, thread-safe, minimalistic and pythonic RabbitMQ client library";
+      homepage = https://pypi.python.org/pypi/rabbitpy;
+      license = licenses.bsd3;
+    };
+  };
 
   recaptcha_client = buildPythonPackage rec {
     name = "recaptcha-client-1.0.6";

From 718848d5aac47660b0c0d7bdd1702c1f474debf1 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Thu, 18 Feb 2016 17:30:06 -0800
Subject: [PATCH 1542/2285] azure: package qemu @ 2.2.0

This commit packages qemu-220. This package is qemu-2.2.0
and is only used with Azure.
---
 nixos/modules/virtualisation/azure-image.nix       |  4 ++--
 .../azure-qemu-220-no-etc-install.patch            | 14 ++++++++++++++
 pkgs/build-support/vm/default.nix                  |  9 +++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)
 create mode 100644 nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch

diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index 7093e50ed352..f0a739bc95d1 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -16,14 +16,14 @@ in
               cyl=$(((${diskSize}*1024*1024)/(512*63*255)))
               size=$(($cyl*255*63*512))              
               roundedsize=$((($size/(1024*1024)+1)*(1024*1024)))
-              ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw $diskImage $roundedsize
+              ${pkgs.vmTools.qemu-220}/bin/qemu-img create -f raw $diskImage $roundedsize
               mv closure xchg/
             '';
 
           postVM =
             ''
               mkdir -p $out
-              ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -O vpc -o subformat=fixed $diskImage $out/disk.vhd
+              ${pkgs.vmTools.qemu-220}/bin/qemu-img convert -f raw -O vpc -o subformat=fixed $diskImage $out/disk.vhd
               rm $diskImage
             '';
           diskImageBase = "nixos-image-${config.system.nixosLabel}-${pkgs.stdenv.system}.raw";
diff --git a/nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch b/nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch
new file mode 100644
index 000000000000..81d29feea3de
--- /dev/null
+++ b/nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch
@@ -0,0 +1,14 @@
+diff --git a/Makefile b/Makefile
+index d6b9dc1..ce7c493 100644
+--- a/Makefile
++++ b/Makefile
+@@ -384,8 +384,7 @@ install-confdir:
+ install-sysconfig: install-datadir install-confdir
+ 	$(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)"
+ 
+-install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \
+-install-datadir install-localstatedir
++install: all $(if $(BUILD_DOCS),install-doc) install-datadir
+ ifneq ($(TOOLS),)
+ 	$(call install-prog,$(TOOLS),$(DESTDIR)$(bindir))
+ endif
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 96611b725bec..23f95bd49790 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -11,6 +11,15 @@ rec {
 
   qemu = pkgs.qemu_kvm;
 
+  qemu-220 = lib.overrideDerivation pkgs.qemu_kvm (attrs: rec {
+    version = "2.2.0";
+    src = fetchurl {
+      url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";
+      sha256 = "1703c3scl5n07gmpilg7g2xzyxnr7jczxgx6nn4m8kv9gin9p35n";
+    };
+    patches = [ ../../../nixos/modules/virtualisation/azure-qemu-220-no-etc-install.patch ];
+  });
+
   qemuProg = "${qemu}/bin/qemu-kvm";
 
 

From 86cbd505c557466ec5c175afae2f89c4c4792303 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Thu, 18 Feb 2016 17:39:36 -0800
Subject: [PATCH 1543/2285] azure-agent: switch back to upstream WALinuxAgent

---
 nixos/modules/virtualisation/azure-agent.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/virtualisation/azure-agent.nix b/nixos/modules/virtualisation/azure-agent.nix
index 4fbc8fd3511c..640519758c74 100644
--- a/nixos/modules/virtualisation/azure-agent.nix
+++ b/nixos/modules/virtualisation/azure-agent.nix
@@ -9,10 +9,10 @@ let
   waagent = with pkgs; stdenv.mkDerivation rec {
     name = "waagent-2.0";
     src = pkgs.fetchFromGitHub {
-      owner = "phreedom";
+      owner = "Azure";
       repo = "WALinuxAgent";
-      rev = "1d31fe8cbc7f842993eed9b33a3d3f5410c364e3";
-      sha256 = "1s53pfmy3azp0rmympmnphyq96sr9jy07pbsfza6mdzpalx1ripl";
+      rev = "1b3a8407a95344d9d12a2a377f64140975f1e8e4";
+      sha256 = "10byzvmpgrmr4d5mdn2kq04aapqb3sgr1admk13wjmy5cd6bwd2x";
     };
     buildInputs = [ makeWrapper python pythonPackages.wrapPython ];
     runtimeDeps = [ findutils gnugrep gawk coreutils openssl openssh

From 90873ea02a6d3373b30a33cad499d5a1dbc6ee21 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Fri, 19 Feb 2016 06:38:40 +0000
Subject: [PATCH 1544/2285] requests2: 2.8.1 -> 2.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 de994801b87b..bbf84844aff4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17562,11 +17562,11 @@ in modules // {
 
   requests2 = buildPythonPackage rec {
     name = "requests-${version}";
-    version = "2.8.1";
+    version = "2.9.1";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/r/requests/${name}.tar.gz";
-      sha256 = "0ny2nr1sqr4hcn3903ghmh7w2yni8shlfv240a8c9p6wyidqvzl4";
+      sha256 = "0zsqrzlybf25xscgi7ja4s48y2abf9wvjkn47wh984qgs1fq2xy5";
     };
 
     buildInputs = [ self.pytest ];

From 7177d4fa6b4a4474dd327e0aef56cc24e26c52d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 18 Feb 2016 23:14:44 +0100
Subject: [PATCH 1545/2285] live555: 2015.10.12 -> 2016.02.09 (unbreaks
 download)

The old version is not available in the mirrors.

Build tested with vlc, the only immediate dependee.
---
 pkgs/development/libraries/live555/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/live555/default.nix b/pkgs/development/libraries/live555/default.nix
index f61f2723752d..de4d295ebe3b 100644
--- a/pkgs/development/libraries/live555/default.nix
+++ b/pkgs/development/libraries/live555/default.nix
@@ -2,14 +2,14 @@
 
 # Based on https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD
 let
-  version = "2015.10.12";
+  version = "2016.02.09";
 in
 stdenv.mkDerivation {
   name = "live555-${version}";
 
   src = fetchurl { # the upstream doesn't provide a stable URL
     url = "mirror://sourceforge/slackbuildsdirectlinks/live.${version}.tar.gz";
-    sha256 = "05qwws4hda4x3l4ym22k55cc9j07w7g5vj3r18dancgf0fla40j4";
+    sha256 = "02z2f8z5cy0ajnh9pgar40lsxdknfw5cbyw52138hxnpr6adrvak";
   };
 
   postPatch = "sed 's,/bin/rm,rm,g' -i genMakefiles";

From cc58339345399d6831fb2e44801e5aca33e4323a Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 19 Feb 2016 09:03:06 +0100
Subject: [PATCH 1546/2285] pythonPackages.scikitlearn: 0.17 -> 0.17.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index abdf7b424fb9..60baacff9f1c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18588,12 +18588,12 @@ in modules // {
 
   scikitlearn = buildPythonPackage rec {
     name = "scikit-learn-${version}";
-    version = "0.17";
+    version = "0.17.1";
     disabled = stdenv.isi686;  # https://github.com/scikit-learn/scikit-learn/issues/5534
 
     src = pkgs.fetchurl {
-      url = "https://github.com/scikit-learn/scikit-learn/archive/${version}.tar.gz";
-      sha256 = "9946ab26bec8ba771a366c6c496514e37da88b9cb4cd05b3bb1c031eb1da1168";
+      url = "https://pypi.python.org/packages/source/s/scikit-learn/${name}.tar.gz";
+      sha256 = "9f4cf58e57d81783289fc503caaed1f210bab49b7a6f680bf3c04b1e0a96e5f0";
     };
 
     buildInputs = with self; [ nose pillow pkgs.gfortran pkgs.glibcLocales ];
@@ -18601,13 +18601,6 @@ in modules // {
 
     LC_ALL="en_US.UTF-8";
 
-    # Exclude "test_image.py" because the Lena function/image was removed from SciPy since 0.17
-    # Should be fixed in next release.
-    # Using the -I switch broke nosetests...?
-    patchPhase = ''
-      rm sklearn/feature_extraction/tests/test_image.py
-    '';
-
     checkPhase = ''
       HOME=$TMPDIR OMP_NUM_THREADS=1 nosetests $out/${python.sitePackages}/sklearn/
     '';

From 43a523526dfe924e59b0eadf9319bb1a72fad743 Mon Sep 17 00:00:00 2001
From: Scott Olson <scott@solson.me>
Date: Fri, 19 Feb 2016 03:13:10 -0600
Subject: [PATCH 1547/2285] Require at least one of url or urls in fetchurl.

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

diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index 2c802bb3679c..d4b46cf9e9d4 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -85,7 +85,7 @@ in
 }:
 
 assert builtins.isList urls;
-assert urls == [] || url == "";
+assert (urls == []) != (url == "");
 
 
 let

From 49c68939db5ae9634f1400cfc7c78253939ff6df Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 19 Feb 2016 10:30:50 +0100
Subject: [PATCH 1548/2285] buildPythonApplication: function for building
 Python applications

Currently, the only difference is that namePrefix is not set
---
 pkgs/top-level/all-packages.nix    | 1 +
 pkgs/top-level/python-packages.nix | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 662905129e51..be40056e3534 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9103,6 +9103,7 @@ let
 
   # python function with default python interpreter
   buildPythonPackage = pythonPackages.buildPythonPackage;
+  buildPythonApplication = pythonPackages.buildPythonApplication;
 
   # `nix-env -i python-nose` installs for 2.7, the default python.
   # Therefore we do not recurse into attributes here, in contrast to
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 42eac4716b2b..0a7224fcd6c0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19,6 +19,8 @@ let
     bootstrapped-pip = callPackage ../development/python-modules/bootstrapped-pip { };
   });
 
+  buildPythonApplication = args: buildPythonPackage ({namePrefix="";} // args );
+
   # Unique python version identifier
   pythonName =
     if isPy26 then "python26" else
@@ -38,7 +40,7 @@ let
 
 in modules // {
 
-  inherit python isPy26 isPy27 isPy33 isPy34 isPy35 isPyPy isPy3k pythonName buildPythonPackage;
+  inherit python isPy26 isPy27 isPy33 isPy34 isPy35 isPyPy isPy3k pythonName buildPythonPackage buildPythonApplication;
 
   # helpers
 

From 5584ad1dc58b46fb372cdeff462901816d4f9c3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Fri, 19 Feb 2016 10:33:57 +0100
Subject: [PATCH 1549/2285] pythonPackages.requests_toolbelt: add test phase
 dependencies

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 60baacff9f1c..f0f7911146c9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17615,7 +17615,7 @@ in modules // {
 
     propagatedBuildInputs = with self; [ requests2 ];
 
-    buildInputs = with self; [ betamax ];
+    buildInputs = with self; [ betamax mock pytest ];
 
     meta = {
       description = "A toolbelt of useful classes and functions to be used with python-requests";

From 65be2135813c19bffc243dbb6158554ecd1d2761 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Fri, 19 Feb 2016 10:35:03 +0100
Subject: [PATCH 1550/2285] pythonPackages.ptest: init at 1.5.3

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f0f7911146c9..941ddb8a1bae 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16821,6 +16821,23 @@ in modules // {
     propagatedBuildInputs = with self; [pkgs.openldap pkgs.cyrus_sasl pkgs.openssl];
   };
 
+  ptest = buildPythonPackage rec {
+    name = pname + "-" + version;
+    pname = "ptest";
+    version =  "1.5.3";
+    src = pkgs.fetchFromGitHub {
+      owner = "KarlGong";
+      repo = pname;
+      rev = version + "-release";
+      sha256 = "1r50lm6n59jzdwpp53n0c0hp3aj1jxn304bk5gh830226gsaf2hn";
+    };
+    meta = {
+      description = "Test classes and test cases using decorators, execute test cases by command line, and get clear reports.";
+      homepage = https://pypi.python.org/pypi/ptest;
+      license = licenses.asl20;
+    };
+  };
+
   ptyprocess = buildPythonPackage rec {
     name = "ptyprocess-${version}";
     version = "0.5";

From 88f5d1c8baac39c642573f66659d8e76ee55843c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 19 Feb 2016 10:59:38 +0100
Subject: [PATCH 1551/2285] Move CONTRIBUTING.md to .github

See https://github.com/blog/2111-issue-and-pull-request-templates.
---
 CONTRIBUTING.md => .github/CONTRIBUTING.md | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename CONTRIBUTING.md => .github/CONTRIBUTING.md (100%)

diff --git a/CONTRIBUTING.md b/.github/CONTRIBUTING.md
similarity index 100%
rename from CONTRIBUTING.md
rename to .github/CONTRIBUTING.md

From 9d1501437dbf07f3e273a6d83afa0afc740d8f63 Mon Sep 17 00:00:00 2001
From: Philipp Steinpass <philipp@xndr.de>
Date: Tue, 9 Feb 2016 12:38:09 +0100
Subject: [PATCH 1552/2285] Added perl packages that allow kpcli to work with
 xclip, squashed fixes.

---
 pkgs/tools/security/kpcli/default.nix |  2 +-
 pkgs/top-level/perl-packages.nix      | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/security/kpcli/default.nix b/pkgs/tools/security/kpcli/default.nix
index 58ea52bc4c08..7303db34649d 100644
--- a/pkgs/tools/security/kpcli/default.nix
+++ b/pkgs/tools/security/kpcli/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
     wrapProgram $out/bin/kpcli --set PERL5LIB \
       "${with perlPackages; stdenv.lib.makePerlPath [
-         Clone CryptRijndael SortNaturally TermReadKey TermShellUI FileKeePass TermReadLineGnu XMLParser
+         CaptureTiny Clipboard Clone CryptRijndael SortNaturally TermReadKey TermShellUI FileKeePass TermReadLineGnu XMLParser
       ]}"
   '';
 
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b58a6b834e05..496d11402634 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1898,6 +1898,19 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
+  Clipboard = buildPerlPackage {
+    name = "Clipboard-0.13";
+    src = fetchurl {
+      url = mirror://cpan/authors/id/K/KI/KING/Clipboard-0.13.tar.gz;
+      sha256 = "eebf1c9cb2484be850abdae017147967cf47f8ccd99293771517674b0046ec8a";
+    };
+    meta = {
+      description = "Clipboard - Copy and Paste with any OS";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+    };
+  };
+
+
   Clone = buildPerlPackage rec {
     name = "Clone-0.38";
     src = fetchurl {

From 14f1ff80ce42fcfb4ee8e85e7882b3fac8f97cde Mon Sep 17 00:00:00 2001
From: Jascha Geerds <jascha@jgeerds.name>
Date: Fri, 19 Feb 2016 11:32:01 +0100
Subject: [PATCH 1553/2285] gnome3.eog: 3.18.1 -> 3.18.2

---
 pkgs/desktops/gnome-3/3.18/core/eog/src.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.18/core/eog/src.nix b/pkgs/desktops/gnome-3/3.18/core/eog/src.nix
index 937f1dcaa215..444d66fbb31a 100644
--- a/pkgs/desktops/gnome-3/3.18/core/eog/src.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/eog/src.nix
@@ -1,10 +1,10 @@
 # Autogenerated by maintainers/scripts/gnome.sh update
 
 fetchurl: {
-  name = "eog-3.18.1";
+  name = "eog-3.18.2";
 
   src = fetchurl {
-    url = mirror://gnome/sources/eog/3.18/eog-3.18.1.tar.xz;
-    sha256 = "7b7bb47a680518701e2e724c8632fcf12dcb3c3e45ce1f2bdd4c4ace325793a7";
+    url = mirror://gnome/sources/eog/3.18/eog-3.18.2.tar.xz;
+    sha256 = "dc2d16e3754cad12703261fe586e7599c4df2e39282f6c28681a514f749fe636";
   };
 }

From 9525abdeec4129de158369d323c673fa19c5fa64 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 19 Feb 2016 14:07:09 +0300
Subject: [PATCH 1554/2285] steamPackages.runtime: use mirrors, add my mirror

---
 pkgs/build-support/fetchurl/mirrors.nix | 6 ++++++
 pkgs/games/steam/update-runtime.py      | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index 767444e76981..c5107781c333 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -333,4 +333,10 @@ rec {
     ftp://ftp.halifax.rwth-aachen.de/pub/OpenBSD/
     ftp://mirror.switch.ch/pub/OpenBSD/
   ];
+
+  # Steam Runtime mirrors
+  steamrt = [
+    http://repo.steampowered.com/steamrt/
+    https://abbradar.net/steamrt/
+  ];
 }
diff --git a/pkgs/games/steam/update-runtime.py b/pkgs/games/steam/update-runtime.py
index 324429708490..0292e725cea1 100755
--- a/pkgs/games/steam/update-runtime.py
+++ b/pkgs/games/steam/update-runtime.py
@@ -40,9 +40,9 @@ def download_file(file_base, file_name, file_url):
 	out.write("    rec {\n")
 	out.write("      name = \"%s\";\n" % file_name)
 	out.write("      md5 = \"%s\";\n" % md5.strip())
+	out.write("      url = \"%s\";\n" % file_url.replace(REPO, "mirror://steamrt", 1))
 	out.write("      source = fetchurl {\n")
-	out.write("        url = \"%s\";\n" % file_url)
-	out.write("        inherit md5;\n")
+	out.write("        inherit url md5;\n")
 	out.write("        name = \"%s\";\n" % file_shortname)
 	out.write("      };\n")
 	out.write("    }\n")

From e41c80e7901702d7f24b0d880249056fc9ed730f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 19 Feb 2016 14:07:27 +0300
Subject: [PATCH 1555/2285] steamPackages: add runtime-mirror helper derivation

---
 pkgs/games/steam/runtime-mirror.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 pkgs/games/steam/runtime-mirror.nix

diff --git a/pkgs/games/steam/runtime-mirror.nix b/pkgs/games/steam/runtime-mirror.nix
new file mode 100644
index 000000000000..49986a346e8e
--- /dev/null
+++ b/pkgs/games/steam/runtime-mirror.nix
@@ -0,0 +1,20 @@
+{ pkgs ? import <nixpkgs> {} }:
+
+let
+  inherit (pkgs) lib;
+  rt = import ./runtime-generated.nix { inherit (pkgs) fetchurl; };
+  convRt = x: {
+    path = lib.removePrefix "mirror://steamrt/" x.url;
+    file = x.source;
+  };
+  files = builtins.map convRt (lib.concatLists (lib.attrValues rt));
+  
+in pkgs.stdenv.mkDerivation {
+  name = "steam-runtime-mirror";
+  buildCommand = ''
+    mkdir $out
+  '' + lib.concatMapStringsSep "\n" (x: ''
+    mkdir -p $(dirname $out/${x.path})
+    ln -sf ${x.file} $out/${x.path}
+  '') files;
+}

From b64192744a985a5214fb249565bef0841936d4ae Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 19 Feb 2016 14:09:34 +0300
Subject: [PATCH 1556/2285] steamPackages.runtime: 20151020 -> 2016-02-18

---
 pkgs/games/steam/runtime-generated.nix | 1672 ++++++++++++------------
 pkgs/games/steam/runtime.nix           |    2 +-
 2 files changed, 837 insertions(+), 837 deletions(-)

diff --git a/pkgs/games/steam/runtime-generated.nix b/pkgs/games/steam/runtime-generated.nix
index 8dbd8cd67219..9b94f56c796e 100644
--- a/pkgs/games/steam/runtime-generated.nix
+++ b/pkgs/games/steam/runtime-generated.nix
@@ -6,1737 +6,1737 @@
     rec {
       name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_amd64";
       md5 = "cbbb1118a27ed0dfb126a109d1d265b3";
+      url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "dconf-gsettings-backend.deb";
       };
     }
     rec {
       name = "freeglut3_2.6.0-1ubuntu3+srt4_amd64";
       md5 = "c54e97c2023e1d1d5df16eb2c426c0be";
+      url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "freeglut3.deb";
       };
     }
     rec {
       name = "gcc-4.6-base_4.6.3-1ubuntu5+srt4_amd64";
       md5 = "1c719a43eb7fa0745eabcea972b0c473";
+      url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "gcc-4.6-base.deb";
       };
     }
     rec {
       name = "gtk2-engines_2.20.2-1ubuntu1+srt4_amd64";
       md5 = "3870b0a51a7614f28bc40e3e58d39a9c";
+      url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "gtk2-engines.deb";
       };
     }
     rec {
       name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_amd64";
       md5 = "607f89071971116adf22fe989408a395";
+      url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "gtk2-engines-murrine.deb";
       };
     }
     rec {
       name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_amd64";
       md5 = "ea6e6b0f99808a2cc8135036824bcfca";
+      url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "gtk2-engines-pixbuf.deb";
       };
     }
     rec {
       name = "libacl1_2.2.51-5ubuntu1+srt6_amd64";
       md5 = "5a11378ebba911b6e139c1dc3fee7990";
+      url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt6_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt6_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libacl1.deb";
       };
     }
     rec {
       name = "libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_amd64";
       md5 = "2ab7433f1e12be2d35c3916e2530b969";
+      url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libappindicator1.deb";
       };
     }
     rec {
       name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64";
       md5 = "aaf2e682393b856d25619d05c44c2108";
+      url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libasn1-8-heimdal.deb";
       };
     }
     rec {
       name = "libasound2_1.0.25-1ubuntu10.1+steamrt1+srt4_amd64";
       md5 = "11add9186e7d6a171a95fea6b0d15a01";
+      url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.0.25-1ubuntu10.1+steamrt1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/a/alsa-lib/libasound2_1.0.25-1ubuntu10.1+steamrt1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libasound2.deb";
       };
     }
     rec {
       name = "libasound2-plugins_1.0.25-1ubuntu1+srt4_amd64";
       md5 = "d4c4fad47ef8f25a8f521f4af9b7fa59";
+      url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.0.25-1ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.0.25-1ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libasound2-plugins.deb";
       };
     }
     rec {
       name = "libasyncns0_0.8-4+srt4_amd64";
       md5 = "f318986e6b639fd680117e27e60ab497";
+      url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libasyncns0.deb";
       };
     }
     rec {
       name = "libatk1.0-0_2.4.0-0ubuntu1+srt4_amd64";
       md5 = "36b951c9e4bb13126bd12f4a895c77ce";
+      url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.4.0-0ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/a/atk1.0/libatk1.0-0_2.4.0-0ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libatk1.0-0.deb";
       };
     }
     rec {
       name = "libattr1_2.4.46-5ubuntu1+srt4_amd64";
       md5 = "4bfcd91866196506d53c114d81b5bf90";
+      url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libattr1.deb";
       };
     }
     rec {
       name = "libavahi-client3_0.6.30-5ubuntu2+srt4_amd64";
       md5 = "e2f370e89883d69abdf4cae6151bb22d";
+      url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libavahi-client3.deb";
       };
     }
     rec {
       name = "libavahi-common3_0.6.30-5ubuntu2+srt4_amd64";
       md5 = "154923fce5cea989b98ca1c11fe35196";
+      url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libavahi-common3.deb";
       };
     }
     rec {
       name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64";
       md5 = "6d9d47d9695b5ece354c5a6cbcde905d";
+      url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libavcodec53.deb";
       };
     }
     rec {
       name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64";
       md5 = "f5d71b18f095842d8f881e3362d031ac";
+      url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libavfilter2.deb";
       };
     }
     rec {
       name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64";
       md5 = "88181968144020fb0fbf90ae740456d8";
+      url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libavformat53.deb";
       };
     }
     rec {
       name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64";
       md5 = "790046586a22c706ab561ad5f3c94ac6";
+      url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libavutil51.deb";
       };
     }
     rec {
       name = "libbz2-1.0_1.0.6-1+srt4_amd64";
       md5 = "9e9dc9f5739feb34dbabc4e471317a5a";
+      url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libbz2-1.0.deb";
       };
     }
     rec {
       name = "libcairo2_1.10.2-6.1ubuntu3+srt4_amd64";
       md5 = "a474e80d3f221776d59084f2ac60ef00";
+      url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libcairo2.deb";
       };
     }
     rec {
       name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_amd64";
       md5 = "18a66b67dce65dad49c374965e0921f0";
+      url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libcanberra-gtk-module.deb";
       };
     }
     rec {
       name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_amd64";
       md5 = "2b756be54454a87929c5d3a724297496";
+      url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libcanberra-gtk0.deb";
       };
     }
     rec {
       name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt4_amd64";
       md5 = "bc12bbc912b3d71dc8c6340e9f43136c";
+      url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libcanberra0.deb";
       };
     }
     rec {
       name = "libcap2_2.22-1ubuntu3+srt4_amd64";
       md5 = "d8264c1c6f71865f4357d7f59062098f";
+      url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libcap2.deb";
       };
     }
     rec {
       name = "libcg_3.0.0016-0ubuntu1+srt4_amd64";
       md5 = "c0c923294f11ba74f0ef566e1effb4e6";
+      url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libcg.deb";
       };
     }
     rec {
       name = "libcomerr2_1.42-1ubuntu2.2+srt1_amd64";
       md5 = "12cd8bbe50da1b698d5280c8cd1efe38";
+      url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.2+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.2+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libcomerr2.deb";
       };
     }
     rec {
       name = "libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_amd64";
       md5 = "bf3f1fd3fb7376ac8a4de5837d0b24a3";
+      url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libcups2.deb";
       };
     }
     rec {
       name = "libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64";
       md5 = "12acf5241daf7ff86e9dc23c64a2f71b";
+      url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libcurl3.deb";
       };
     }
     rec {
       name = "libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64";
       md5 = "0fddfa641103922bdc38ec71c61ba681";
+      url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libcurl3-gnutls.deb";
       };
     }
     rec {
       name = "libdbus-1-3_1.4.18-1ubuntu1.7+srt1_amd64";
       md5 = "5082143b56f4d6a72c21244c4b7bc653";
+      url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.7+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.7+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libdbus-1-3.deb";
       };
     }
     rec {
       name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_amd64";
       md5 = "28cf6b803847aa977ce557f479f52846";
+      url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libdbus-glib-1-2.deb";
       };
     }
     rec {
       name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_amd64";
       md5 = "85833a32196fb585db2bbb65fdd28c1d";
+      url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libdbusmenu-glib4.deb";
       };
     }
     rec {
       name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_amd64";
       md5 = "ee79e60c712f7139a305d929c51974e1";
+      url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libdbusmenu-gtk4.deb";
       };
     }
     rec {
       name = "libexif12_0.6.20-2ubuntu0.1+srt4_amd64";
       md5 = "6234ec87a59fb9a534e53efb3978347a";
+      url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libexif12.deb";
       };
     }
     rec {
       name = "libexpat1_2.0.1-7.2ubuntu1.2+srt1_amd64";
       md5 = "a7148db45279001346cebc02a7d7c1af";
+      url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.2+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.2+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libexpat1.deb";
       };
     }
     rec {
       name = "libffi6_3.0.11~rc1-5+srt4_amd64";
       md5 = "522cb933493dd7ad25b35381325579aa";
+      url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libffi6.deb";
       };
     }
     rec {
       name = "libflac8_1.2.1-6+srt4_amd64";
       md5 = "87dcbc179e3d5ba43629b3d3045d9253";
+      url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/f/flac/libflac8_1.2.1-6+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libflac8.deb";
       };
     }
     rec {
       name = "libfltk1.1_1.1.10-10+srt4_amd64";
       md5 = "4d89126341f2e70a7a248e20dc024240";
+      url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libfltk1.1.deb";
       };
     }
     rec {
       name = "libfontconfig1_2.8.0-3ubuntu9.1+srt4_amd64";
       md5 = "d90eb7f1c85b5c1c256e87ae0f840986";
+      url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libfontconfig1.deb";
       };
     }
     rec {
       name = "libfreetype6_2.4.8-1ubuntu2.3+srt1_amd64";
       md5 = "06f7ccb54bba06c1e2673471866039a0";
+      url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.3+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.3+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libfreetype6.deb";
       };
     }
     rec {
       name = "libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64";
       md5 = "a16aa8ab25b2d926085b686bdccfd31d";
+      url = "mirror://steamrt/pool/main/g/gcc-4.8/libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gcc-4.8/libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgcc1.deb";
       };
     }
     rec {
       name = "libgconf-2-4_3.2.5-0ubuntu2+srt4_amd64";
       md5 = "54e9d0b216e195c52491aa6714262abc";
+      url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgconf-2-4.deb";
       };
     }
     rec {
-      name = "libgcrypt11_1.5.0-3ubuntu0.4+srt1_amd64";
-      md5 = "e97b1a78944b7b07871dd36116b07bfe";
+      name = "libgcrypt11_1.5.0-3ubuntu0.5+srt1_amd64";
+      md5 = "502feac74b4fdda9c2b4a12efd15c82e";
+      url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.5+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.4+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgcrypt11.deb";
       };
     }
     rec {
       name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_amd64";
       md5 = "6becfe1861ebea500d23273acece2eb7";
+      url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgdk-pixbuf2.0-0.deb";
       };
     }
     rec {
       name = "libglew1.10_1.10.0-3+srt4_amd64";
       md5 = "f61ea5e775178ce123d40198c1157b9f";
+      url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libglew1.10.deb";
       };
     }
     rec {
       name = "libglew1.6_1.6.0-4+srt4_amd64";
       md5 = "bdff67db0a4d67674896f13bbc6effd3";
+      url = "mirror://steamrt/pool/main/g/glew/libglew1.6_1.6.0-4+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/glew/libglew1.6_1.6.0-4+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libglew1.6.deb";
       };
     }
     rec {
       name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_amd64";
       md5 = "a1a4af8a6ecf974bfdac345319a2e953";
+      url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libglib2.0-0.deb";
       };
     }
     rec {
       name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt4_amd64";
       md5 = "170edcba12461120395cfae26db8ef39";
+      url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libglu1-mesa.deb";
       };
     }
     rec {
       name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt4_amd64";
       md5 = "ddae75bcd90b6e11cde2071ccb05799d";
+      url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgmp10.deb";
       };
     }
     rec {
-      name = "libgnutls26_2.12.14-5ubuntu3.9+srt1_amd64";
-      md5 = "110f432d9438cf534f1a2cb3e0269900";
+      name = "libgnutls26_2.12.14-5ubuntu3.11+srt1_amd64";
+      md5 = "5393d7b8c652fcdb4bc7b0063e7bc595";
+      url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.11+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.9+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgnutls26.deb";
       };
     }
     rec {
       name = "libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64";
       md5 = "0a2b96a562ddf2e2e8018ee42fc44697";
+      url = "mirror://steamrt/pool/main/g/gcc-4.8/libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gcc-4.8/libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgomp1.deb";
       };
     }
     rec {
       name = "libgpg-error0_1.10-2ubuntu1+srt4_amd64";
       md5 = "2732fe5e798a8355f1f42ce803144b5e";
+      url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgpg-error0.deb";
       };
     }
     rec {
-      name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.6+srt1_amd64";
-      md5 = "29fa7b271e5177464705bba4042c800a";
+      name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64";
+      md5 = "68cc7194070bc391898a2ac64f60238d";
+      url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.6+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgssapi-krb5-2.deb";
       };
     }
     rec {
       name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64";
       md5 = "aec9eef24bdbf46a564a8c3a2e5e9996";
+      url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgssapi3-heimdal.deb";
       };
     }
     rec {
       name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_amd64";
       md5 = "d7d638c9706de787b067b90538f5d161";
+      url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgstreamer-plugins-base0.10-0.deb";
       };
     }
     rec {
       name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_amd64";
       md5 = "5b1d88d1613f8a15dbcf4721006a928e";
+      url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgstreamer0.10-0.deb";
       };
     }
     rec {
       name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_amd64";
       md5 = "3967c473e9250f043ce694f0f0881b95";
+      url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgtk2.0-0.deb";
       };
     }
     rec {
       name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all";
       md5 = "5a2f731bdac2bd089780af2f63635f7b";
+      url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgtk2.0-common.deb";
       };
     }
     rec {
       name = "libgudev-1.0-0_175-0ubuntu9.2+srt4_amd64";
       md5 = "042f301b15c2213e918332b827ed876e";
+      url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.2+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.2+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgudev-1.0-0.deb";
       };
     }
     rec {
       name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64";
       md5 = "c714f66ed7629e5ea8da89b301314dbf";
+      url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libhcrypto4-heimdal.deb";
       };
     }
     rec {
       name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64";
       md5 = "adc4837d7e7a8bb59d1eff8dc009a787";
+      url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libheimbase1-heimdal.deb";
       };
     }
     rec {
       name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64";
       md5 = "c9832147e9399447d25db46b932009d5";
+      url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libheimntlm0-heimdal.deb";
       };
     }
     rec {
       name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64";
       md5 = "ec9e8fc0b860a9e67a75965a684a1b10";
+      url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libhx509-5-heimdal.deb";
       };
     }
     rec {
       name = "libice6_1.0.7-2build1+srt4_amd64";
       md5 = "165e91c5ea7d2268e54c4483d6bfee21";
+      url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libice6.deb";
       };
     }
     rec {
       name = "libidn11_1.23-2+steamrt1+srt4_amd64";
       md5 = "6039786cec09e8196f0344a0eaba4b35";
+      url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libidn11.deb";
       };
     }
     rec {
       name = "libindicator7_0.5.0-0ubuntu1+srt4_amd64";
       md5 = "e50b84332411dfe83f3cdb280a340659";
+      url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libindicator7.deb";
       };
     }
     rec {
       name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_amd64";
       md5 = "9e2fbb98f0a36c193b7de2e0aedf504c";
+      url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libjack-jackd2-0.deb";
       };
     }
     rec {
       name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_amd64";
       md5 = "214eaa463aeef6e881231c3bd902fb97";
+      url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libjpeg-turbo8.deb";
       };
     }
     rec {
       name = "libjpeg62_6b1-2ubuntu1.1+srt4_amd64";
       md5 = "fc7df95d832fea01fa6ec6134518f785";
+      url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libjpeg62.deb";
       };
     }
     rec {
       name = "libjson0_0.9-1ubuntu1.1+srt2_amd64";
       md5 = "9181b67bd4b26368f29922a872998ad6";
+      url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt2_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt2_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libjson0.deb";
       };
     }
     rec {
-      name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.6+srt1_amd64";
-      md5 = "d82d1f7b8a31f69ccebdd1f4e28f7763";
+      name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64";
+      md5 = "14a85bce181c6fe78bd00c156bd71033";
+      url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.6+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libk5crypto3.deb";
       };
     }
     rec {
       name = "libkeyutils1_1.5.2-2+srt4_amd64";
       md5 = "cc6a001e351c3e4e0ece1f59c92fe9a9";
+      url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libkeyutils1.deb";
       };
     }
     rec {
       name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64";
       md5 = "6de94826e9407f5ebf3880ba4306e287";
+      url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libkrb5-26-heimdal.deb";
       };
     }
     rec {
-      name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.6+srt1_amd64";
-      md5 = "3e8acba6db5d5e1f36f4b2792f726b63";
+      name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64";
+      md5 = "39ce748ff830b7e01f93e12e3829c90e";
+      url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.6+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libkrb5-3.deb";
       };
     }
     rec {
-      name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.6+srt1_amd64";
-      md5 = "8198e8fc9f96d9310d41a5b2f3d70870";
+      name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64";
+      md5 = "dda5082adc17603046892b6c9a6f8d96";
+      url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.6+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libkrb5support0.deb";
       };
     }
     rec {
       name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_amd64";
       md5 = "6aa3befa823b58e2ef17137c6ce4ed26";
+      url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "liblcms2-2.deb";
       };
     }
     rec {
       name = "libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_amd64";
       md5 = "736acf677d1bc728947297ae33d8d53c";
+      url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libldap-2.4-2.deb";
       };
     }
     rec {
       name = "libltdl7_2.4.2-1ubuntu1+srt4_amd64";
       md5 = "eeb2a0afa5eb25eb240a7a5aac1fc6eb";
+      url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libltdl7.deb";
       };
     }
     rec {
       name = "libmikmod2_3.1.12-2+srt4_amd64";
       md5 = "aaf3c4e2d1c733dc9847d1b4b160faba";
+      url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libmikmod2.deb";
       };
     }
     rec {
       name = "libncurses5_5.9-4+srt4_amd64";
       md5 = "a1e80e9cb80e7de986ce7730ae0e27d9";
+      url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libncurses5.deb";
       };
     }
     rec {
       name = "libncursesw5_5.9-4+srt4_amd64";
       md5 = "69f8d641d346520d794ed925961df35c";
+      url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libncursesw5.deb";
       };
     }
     rec {
       name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64";
       md5 = "f227e6607d7b84cbe99e3eaf7fa726c8";
+      url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libnm-glib4.deb";
       };
     }
     rec {
       name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64";
       md5 = "da911ace3dc8956ae2d776a9de38491c";
+      url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libnm-util2.deb";
       };
     }
     rec {
       name = "libnotify4_0.7.5-1+srt4_amd64";
       md5 = "d75b12a9714d3e5bf5513e43cfecb9e1";
+      url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libnotify4.deb";
       };
     }
     rec {
-      name = "libnspr4_4.10.7-0ubuntu0.12.04.1+srt1_amd64";
-      md5 = "81f950d909bd07f87fd03828bc1b0b76";
+      name = "libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_amd64";
+      md5 = "189258c833f8ddf0eb22fe26ad3fa3b9";
+      url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/n/nspr/libnspr4_4.10.7-0ubuntu0.12.04.1+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libnspr4.deb";
       };
     }
     rec {
-      name = "libnss3_3.19.2-0ubuntu0.12.04.1+srt1_amd64";
-      md5 = "ba6be27b60728d1bbdc849354376adf8";
+      name = "libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_amd64";
+      md5 = "9e73637724364e1e0f95df26ccee054a";
+      url = "mirror://steamrt/pool/main/n/nss/libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/n/nss/libnss3_3.19.2-0ubuntu0.12.04.1+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libnss3.deb";
       };
     }
     rec {
       name = "libogg0_1.2.2~dfsg-1ubuntu1+srt4_amd64";
       md5 = "bf9932f2354ee1026d636d3cb7026b05";
+      url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libogg0.deb";
       };
     }
     rec {
       name = "libopenal1_1.13-4ubuntu3+steamrt1+srt4_amd64";
       md5 = "286033d0e031389e350644f2979f7b62";
+      url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.13-4ubuntu3+steamrt1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/o/openal-soft/libopenal1_1.13-4ubuntu3+steamrt1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libopenal1.deb";
       };
     }
     rec {
       name = "liborc-0.4-0_0.4.16-1ubuntu2+srt4_amd64";
       md5 = "838a5f35acfc6e454954ed9ae776ef7d";
+      url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "liborc-0.4-0.deb";
       };
     }
     rec {
       name = "libp11-kit0_0.12-2ubuntu1+srt4_amd64";
       md5 = "5834045994d6e316a68568a01257bed9";
+      url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libp11-kit0.deb";
       };
     }
     rec {
       name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_amd64";
       md5 = "6f81b9ab5fa21dd99eae337be3ed546e";
+      url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libpango1.0-0.deb";
       };
     }
     rec {
       name = "libpci3_3.1.8-2ubuntu5+srt4_amd64";
       md5 = "6ebc019119624fb5f776d9829ee49478";
+      url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu5+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu5+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libpci3.deb";
       };
     }
     rec {
       name = "libpcre3_8.12-4+srt4_amd64";
       md5 = "134666c4e50fb2422a12018f061dc2ce";
+      url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/p/pcre3/libpcre3_8.12-4+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libpcre3.deb";
       };
     }
     rec {
       name = "libpcrecpp0_8.12-4+srt4_amd64";
       md5 = "f4beb4a2b0d24d1bf3a75f5794580d9a";
+      url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libpcrecpp0.deb";
       };
     }
     rec {
       name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_amd64";
       md5 = "52134e1b8190957f069268827f2bde74";
+      url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libpixman-1-0.deb";
       };
     }
     rec {
-      name = "libpng12-0_1.2.46-3ubuntu4+srt4_amd64";
-      md5 = "2365d5fa1080d019aed6810031301476";
+      name = "libpng12-0_1.2.46-3ubuntu4.2+srt1_amd64";
+      md5 = "0e79e11954e9dd12b345de34ae9dda6d";
+      url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libpng12-0.deb";
       };
     }
     rec {
       name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_amd64";
       md5 = "e5314b3129eda4940896d1cad7701a22";
+      url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libpulse0.deb";
       };
     }
     rec {
       name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64";
       md5 = "3cdc654725b6fd08c96eee54041b2ce3";
+      url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libroken18-heimdal.deb";
       };
     }
     rec {
       name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt4_amd64";
       md5 = "d5ad690e85842798c27c8afb8c0c9d53";
+      url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "librtmp0.deb";
       };
     }
     rec {
       name = "libsamplerate0_0.1.8-4+srt4_amd64";
       md5 = "1680e147372fd0500aa6a27a9a557662";
+      url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsamplerate0.deb";
       };
     }
     rec {
       name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_amd64";
       md5 = "d51e140f457c694957bc476128dfa965";
+      url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsasl2-2.deb";
       };
     }
     rec {
       name = "libsdl-image1.2_1.2.10-3+srt4_amd64";
       md5 = "965cbe12d8b1b31eae47d0eb9651c72c";
+      url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsdl-image1.2.deb";
       };
     }
     rec {
       name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_amd64";
       md5 = "b60fff841525e6097f0bd3f9e224e8a1";
+      url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsdl-mixer1.2.deb";
       };
     }
     rec {
       name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_amd64";
       md5 = "30bd93bf4d524594021b8b3f9b35eb2c";
+      url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsdl-ttf2.0-0.deb";
       };
     }
     rec {
       name = "libsdl1.2debian_1.2.15-5+steamrt1+srt4_amd64";
       md5 = "ea14d71381e1d55c59b5790f37531900";
+      url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsdl1.2debian.deb";
       };
     }
     rec {
-      name = "libsdl2_2.0.3+steamrt1+srt4_amd64";
-      md5 = "cf7de8c8621e0aabdee673ee7bbac873";
+      name = "libsdl2_2.0.4+steamrt1+srt1_amd64";
+      md5 = "95ea5d6fb188e0ef66881e699cbf95b2";
+      url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.4+steamrt1+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libs/libsdl2/libsdl2_2.0.3+steamrt1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsdl2.deb";
       };
     }
     rec {
-      name = "libsdl2-image_2.0.0+steamrt1+srt4_amd64";
-      md5 = "0ae2b72c2271d9ec01be98c0cec205f9";
+      name = "libsdl2-image_2.0.1+steamrt2+srt1_amd64";
+      md5 = "7a16e55edbcc24311753260947eb2574";
+      url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.1+steamrt2+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.0+steamrt1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsdl2-image.deb";
       };
     }
     rec {
-      name = "libsdl2-mixer_2.0.0+steamrt1+srt4_amd64";
-      md5 = "18f22f3f91e55cb361f7ab75ae1bc9ac";
+      name = "libsdl2-mixer_2.0.1+steamrt1+srt1_amd64";
+      md5 = "00c0fceba317e355e52353f1b453419c";
+      url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.1+steamrt1+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.0+steamrt1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsdl2-mixer.deb";
       };
     }
     rec {
-      name = "libsdl2-net_2.0.0+srt4_amd64";
-      md5 = "012b3825100003918c26f9e66bdea246";
+      name = "libsdl2-net_2.0.1+srt1_amd64";
+      md5 = "9544e9d02e1aacdaaefcae68f57baa44";
+      url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.0+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsdl2-net.deb";
       };
     }
     rec {
-      name = "libsdl2-ttf_2.0.12+srt4_amd64";
-      md5 = "703513c348e3456f6035ddcd41bc5785";
+      name = "libsdl2-ttf_2.0.14+srt1_amd64";
+      md5 = "7bdbbba9e9150b8596a28afb4c49dd13";
+      url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.12+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsdl2-ttf.deb";
       };
     }
     rec {
       name = "libselinux1_2.1.0-4.1ubuntu1+srt4_amd64";
       md5 = "cb3455f005e98fd8eb7aa5d4a72e7458";
+      url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libselinux1.deb";
       };
     }
     rec {
       name = "libsm6_1.2.0-2build1+srt4_amd64";
       md5 = "7682f5ffd1f30dc5818b3759be85e21a";
+      url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsm6.deb";
       };
     }
     rec {
       name = "libsndfile1_1.0.25-4+srt4_amd64";
       md5 = "e7a184667cc034127615e7bc15bc050b";
+      url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsndfile1.deb";
       };
     }
     rec {
       name = "libspeex1_1.2~rc1-3ubuntu2+srt4_amd64";
       md5 = "95acf2dbab5d8c6d7c0cd4b809025b87";
+      url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libspeex1.deb";
       };
     }
     rec {
       name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt4_amd64";
       md5 = "38f8216be0d2b2dfd2850d87c7e306df";
+      url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libspeexdsp1.deb";
       };
     }
     rec {
       name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt1_amd64";
       md5 = "1a9c37c32fa46f7d55a2e384cd6ce5a6";
+      url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsqlite3-0.deb";
       };
     }
     rec {
-      name = "libssl1.0.0_1.0.1-4ubuntu5.31+srt1_amd64";
-      md5 = "0ea8b768e93487f8108336c5da92b952";
+      name = "libssl1.0.0_1.0.1-4ubuntu5.33+srt1_amd64";
+      md5 = "eabb32b42b50ae68d5a4b2ef0b323c95";
+      url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.33+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.31+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libssl1.0.0.deb";
       };
     }
     rec {
       name = "libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64";
       md5 = "c5d4ad341622e56660a5202500af4930";
+      url = "mirror://steamrt/pool/main/g/gcc-4.8/libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gcc-4.8/libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libstdc++6.deb";
       };
     }
     rec {
       name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_amd64";
       md5 = "0776afbc253637cb3491d08d65601a7e";
+      url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libstdc++6-4.6-pic.deb";
       };
     }
     rec {
       name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64";
       md5 = "0aac40ddee7040acf921dbacc2776bea";
+      url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libswscale2.deb";
       };
     }
     rec {
       name = "libtasn1-3_2.10-1ubuntu1.4+srt1_amd64";
       md5 = "6e092ebafe0cf5a49ee9319e2cf6f4fd";
+      url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.4+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.4+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libtasn1-3.deb";
       };
     }
     rec {
       name = "libtbb2_4.0+r233-1+srt4_amd64";
       md5 = "ccd7521c751d0e3596ef200a3363df4b";
+      url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libtbb2.deb";
       };
     }
     rec {
       name = "libtdb1_1.2.9-4+srt4_amd64";
       md5 = "56b46df3ed2af08c54838cbe67c0b937";
+      url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libtdb1.deb";
       };
     }
     rec {
       name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_amd64";
       md5 = "c1381636444b1d35be7898611fbc4150";
+      url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libtheora0.deb";
       };
     }
     rec {
       name = "libtiff4_3.9.5-2ubuntu1.8+srt1_amd64";
       md5 = "7c44d58a6acf73b6c298cfa03e982e0f";
+      url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.8+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.8+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libtiff4.deb";
       };
     }
     rec {
       name = "libtinfo5_5.9-4+srt4_amd64";
       md5 = "708d85139b45dc5e93a3ca00990204ab";
+      url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libtinfo5.deb";
       };
     }
     rec {
       name = "libudev0_175-0ubuntu9.2+srt4_amd64";
       md5 = "89d4fbfa14053514448ecaff1d8cb2c4";
+      url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.2+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.2+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libudev0.deb";
       };
     }
     rec {
       name = "libusb-1.0-0_1.0.19-1+srt1_amd64";
       md5 = "3d2612fa64d30aa01a477e02886f9ea1";
+      url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libusb-1.0-0.deb";
       };
     }
     rec {
       name = "libuuid1_2.20.1-1ubuntu3+srt4_amd64";
       md5 = "0d0a1e7e54df9e10e758ee90e96a8f55";
+      url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libuuid1.deb";
       };
     }
     rec {
       name = "libva-glx1_1.3.1-3+steamrt4+srt1_amd64";
       md5 = "21794fa4d2936f13999455ea16575df4";
+      url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.3.1-3+steamrt4+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libv/libva/libva-glx1_1.3.1-3+steamrt4+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libva-glx1.deb";
       };
     }
     rec {
       name = "libva-x11-1_1.3.1-3+steamrt4+srt1_amd64";
       md5 = "ebf9276cc75fddbc81958aa8e7a2f285";
+      url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.3.1-3+steamrt4+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libv/libva/libva-x11-1_1.3.1-3+steamrt4+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libva-x11-1.deb";
       };
     }
     rec {
       name = "libva1_1.3.1-3+steamrt4+srt1_amd64";
       md5 = "6d8d1a89d63c536e4ba77cffb9af7df9";
+      url = "mirror://steamrt/pool/main/libv/libva/libva1_1.3.1-3+steamrt4+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libv/libva/libva1_1.3.1-3+steamrt4+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libva1.deb";
       };
     }
     rec {
       name = "libvdpau1_0.4.1-3ubuntu1.2+srt1_amd64";
       md5 = "d31594fc832bfd0bc65c43f2e7f40ac5";
+      url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libvdpau1.deb";
       };
     }
     rec {
       name = "libvorbis0a_1.3.2-1ubuntu3+srt4_amd64";
       md5 = "6acf08e8df17c93563dae9a381cc26ac";
+      url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libvorbis0a.deb";
       };
     }
     rec {
       name = "libvorbisenc2_1.3.2-1ubuntu3+srt4_amd64";
       md5 = "b6a1ab86060a3c4e1963d513ae68376b";
+      url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libvorbisenc2.deb";
       };
     }
     rec {
       name = "libvorbisfile3_1.3.2-1ubuntu3+srt4_amd64";
       md5 = "56218bd8b7278303574f6f4bc23fac1a";
+      url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libvorbisfile3.deb";
       };
     }
     rec {
       name = "libvpx1_1.0.0-1+srt4_amd64";
       md5 = "7ecb41c7e23f1caa6764abed122a2f6b";
+      url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libvpx1.deb";
       };
     }
     rec {
       name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64";
       md5 = "a1e5b4a8f8200feef82dab976f1b4e5d";
+      url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libwind0-heimdal.deb";
       };
     }
     rec {
       name = "libwrap0_7.6.q-21+srt4_amd64";
       md5 = "52c3a2c8395cbba79e65c3d60a82e1fd";
+      url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libwrap0.deb";
       };
     }
     rec {
       name = "libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64";
       md5 = "22ca2e28aa3f3d70b77632a8772a4a9d";
+      url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libx11-6.deb";
       };
     }
     rec {
       name = "libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all";
       md5 = "c012bbc8654c3c012dc7b5901c486f4d";
+      url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all.deb";
-        inherit md5;
+        inherit url md5;
         name = "libx11-data.deb";
       };
     }
     rec {
       name = "libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64";
       md5 = "e94af0629e0b59f21c1ccc4f4d4088b5";
+      url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libx11-xcb1.deb";
       };
     }
     rec {
       name = "libxau6_1.0.6-4+srt4_amd64";
       md5 = "a1de8ce9992f09ca56f20ab8327c34a2";
+      url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxau6.deb";
       };
     }
     rec {
       name = "libxaw7_1.0.9-3ubuntu1+srt4_amd64";
       md5 = "57942d64120a191d0a1ca3bcb1fb2b8f";
+      url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxaw7.deb";
       };
     }
     rec {
       name = "libxcb-composite0_1.10-2ubuntu1+srt4_amd64";
       md5 = "ec25a999e0cd681955ef2f9b06161dfe";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-composite0_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-composite0.deb";
       };
     }
     rec {
       name = "libxcb-damage0_1.10-2ubuntu1+srt4_amd64";
       md5 = "a34a6950609570a554e574b086b73c7f";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-damage0_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-damage0.deb";
       };
     }
     rec {
       name = "libxcb-doc_1.10-2ubuntu1+srt4_all";
       md5 = "d4fd2c66b60ff1db1c87e6884d5ae093";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-doc_1.10-2ubuntu1+srt4_all.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-doc_1.10-2ubuntu1+srt4_all.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-doc.deb";
       };
     }
     rec {
       name = "libxcb-dpms0_1.10-2ubuntu1+srt4_amd64";
       md5 = "ba4c437f0ab6f71284dca7d61b0e6df0";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-dpms0.deb";
       };
     }
     rec {
       name = "libxcb-dri2-0_1.10-2ubuntu1+srt4_amd64";
       md5 = "ea4e1ff16a644f136ae45c7e2b9849c8";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-dri2-0.deb";
       };
     }
     rec {
       name = "libxcb-dri3-0_1.10-2ubuntu1+srt4_amd64";
       md5 = "386ba46c8f015d642d9351d690f0a822";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-dri3-0.deb";
       };
     }
     rec {
       name = "libxcb-glx0_1.10-2ubuntu1+srt4_amd64";
       md5 = "e2eeda427ea95e90068f4434a926fd25";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-glx0_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-glx0.deb";
       };
     }
     rec {
       name = "libxcb-present0_1.10-2ubuntu1+srt4_amd64";
       md5 = "0519bd96e7af25f6acf1a6cd63536d38";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-present0_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-present0.deb";
       };
     }
     rec {
       name = "libxcb-randr0_1.10-2ubuntu1+srt4_amd64";
       md5 = "bc24264b0ca68cc209e66f1620aeb232";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-randr0_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-randr0.deb";
       };
     }
     rec {
       name = "libxcb-record0_1.10-2ubuntu1+srt4_amd64";
       md5 = "2ee93429107681f1afddcd932b55710b";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-record0_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-record0.deb";
       };
     }
     rec {
       name = "libxcb-render0_1.10-2ubuntu1+srt4_amd64";
       md5 = "ec46d80b43969cffd7aebbef27359897";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-render0_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-render0.deb";
       };
     }
     rec {
       name = "libxcb-res0_1.10-2ubuntu1+srt4_amd64";
       md5 = "74a13db70ec5ab4a0be7ea5afababa8b";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-res0_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-res0.deb";
       };
     }
     rec {
       name = "libxcb-screensaver0_1.10-2ubuntu1+srt4_amd64";
       md5 = "e20c88e8b39404b5e60841ea24860c48";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-screensaver0.deb";
       };
     }
     rec {
       name = "libxcb-shape0_1.10-2ubuntu1+srt4_amd64";
       md5 = "64773ffa7219574d1356fa2b621d5f4f";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-shape0_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-shape0.deb";
       };
     }
     rec {
       name = "libxcb-shm0_1.10-2ubuntu1+srt4_amd64";
       md5 = "d263f46ada805900e88deb8bd6e7016e";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-shm0_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-shm0.deb";
       };
     }
     rec {
       name = "libxcb-sync1_1.10-2ubuntu1+srt4_amd64";
       md5 = "df0ce39512e455f442268bf9f9c0c52e";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-sync1_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-sync1.deb";
       };
     }
     rec {
       name = "libxcb-xevie0_1.10-2ubuntu1+srt4_amd64";
       md5 = "dfd64e3afb9c3eb4c2938bbf8288323a";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-xevie0.deb";
       };
     }
     rec {
       name = "libxcb-xf86dri0_1.10-2ubuntu1+srt4_amd64";
       md5 = "09107ec941a6361acb73922f49905edf";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-xf86dri0.deb";
       };
     }
     rec {
       name = "libxcb-xfixes0_1.10-2ubuntu1+srt4_amd64";
       md5 = "cf8ee2c9b5459dd229f2967ab28b7bba";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-xfixes0.deb";
       };
     }
     rec {
       name = "libxcb-xinerama0_1.10-2ubuntu1+srt4_amd64";
       md5 = "c418c00f009cdb7e4ed25a0fc4059a1e";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-xinerama0.deb";
       };
     }
     rec {
       name = "libxcb-xkb1_1.10-2ubuntu1+srt4_amd64";
       md5 = "c06f25c1c69e78e0f0fe39f0e20ca796";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-xkb1.deb";
       };
     }
     rec {
       name = "libxcb-xprint0_1.10-2ubuntu1+srt4_amd64";
       md5 = "760966200beff9f7c9ff0f4af224e65a";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-xprint0.deb";
       };
     }
     rec {
       name = "libxcb-xtest0_1.10-2ubuntu1+srt4_amd64";
       md5 = "e2f30b8aaf1cdc0bf7d234db9bbbf50e";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-xtest0.deb";
       };
     }
     rec {
       name = "libxcb-xv0_1.10-2ubuntu1+srt4_amd64";
       md5 = "d16c7873af0ffc0b370332ce1d562755";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-xv0_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-xv0.deb";
       };
     }
     rec {
       name = "libxcb-xvmc0_1.10-2ubuntu1+srt4_amd64";
       md5 = "ea26ad6eef4b71fff944008f542eed5d";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-xvmc0.deb";
       };
     }
     rec {
       name = "libxcb1_1.10-2ubuntu1+srt4_amd64";
       md5 = "93dbb1e6d32178cc1a2e994b6d87d8d3";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.10-2ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb1_1.10-2ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb1.deb";
       };
     }
     rec {
       name = "libxcomposite1_0.4.3-2build1+srt4_amd64";
       md5 = "e817d11de4660b9fd4a66db90cdc2588";
+      url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcomposite1.deb";
       };
     }
     rec {
       name = "libxcursor1_1.1.12-1ubuntu0.1+srt4_amd64";
       md5 = "7055ec097c7ed9cc6497f111311b4f75";
+      url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcursor1.deb";
       };
     }
     rec {
       name = "libxdamage1_1.1.3-2build1+srt4_amd64";
       md5 = "2b3f144fdbd30408c25379a7409ba045";
+      url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxdamage1.deb";
       };
     }
     rec {
       name = "libxdmcp6_1.1.0-4+srt4_amd64";
       md5 = "201844de38f2d957a5ced6a28d2c80cb";
+      url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxdmcp6.deb";
       };
     }
     rec {
       name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_amd64";
       md5 = "b6dcf651f5b9dda20fd39912bf03a4c3";
+      url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxext6.deb";
       };
     }
     rec {
       name = "libxfixes3_5.0-4ubuntu4.4+srt1_amd64";
       md5 = "a80bcd458215e445daddf4cf0d625758";
+      url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxfixes3.deb";
       };
     }
     rec {
       name = "libxft2_2.2.0-3ubuntu2+srt4_amd64";
       md5 = "de249fadd51c61b98bada7eb7cff8d29";
+      url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxft2.deb";
       };
     }
     rec {
       name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt1_amd64";
       md5 = "f25d86e540477fe044c0294670b5f1b5";
+      url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxi6.deb";
       };
     }
     rec {
       name = "libxinerama1_1.1.1-3ubuntu0.1+srt4_amd64";
       md5 = "44dc2b8d96d4d3db048e358174500584";
+      url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxinerama1.deb";
       };
     }
     rec {
-      name = "libxml2_2.7.8.dfsg-5.1ubuntu4.11+srt1_amd64";
-      md5 = "65ae8b0560c18f4618bd0c9414e881fa";
+      name = "libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_amd64";
+      md5 = "cca32ece7e930886fc2667e6f4849af5";
+      url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.11+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxml2.deb";
       };
     }
     rec {
       name = "libxmu6_1.1.0-3+srt4_amd64";
       md5 = "8f6657584a244c039bcfa24ad8934e75";
+      url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxmu6.deb";
       };
     }
     rec {
       name = "libxpm4_3.5.9-4+srt4_amd64";
       md5 = "807b3e86250c3640175da4980db87ab5";
+      url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxpm4.deb";
       };
     }
     rec {
       name = "libxrandr2_1.3.2-2ubuntu0.3+srt1_amd64";
       md5 = "bde5d98946e1bfd60a42482339e29787";
+      url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.3+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.3+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxrandr2.deb";
       };
     }
     rec {
       name = "libxrender1_0.9.6-2ubuntu0.2+srt1_amd64";
       md5 = "6781fa18b873dc95da21e82cc61609d6";
+      url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt1_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt1_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxrender1.deb";
       };
     }
     rec {
       name = "libxss1_1.2.1-2+srt4_amd64";
       md5 = "3d034c5c118d8794e2b76207c52a198e";
+      url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxss1.deb";
       };
     }
     rec {
       name = "libxt6_1.1.1-2ubuntu0.1+srt4_amd64";
       md5 = "e4d13d933531f436c56e3245c94be638";
+      url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxt6.deb";
       };
     }
     rec {
       name = "libxtst6_1.2.0-4ubuntu0.1+srt4_amd64";
       md5 = "75a55367e5185eac420f89807e39faa2";
+      url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxtst6.deb";
       };
     }
     rec {
       name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt4_amd64";
       md5 = "e8e91fa6a42cfce330883dc1286f3d78";
+      url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxxf86vm1.deb";
       };
     }
     rec {
       name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_amd64";
       md5 = "d9d307b821b71b3cdd91cb8d2137c527";
+      url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "nvidia-cg-toolkit.deb";
       };
     }
     rec {
       name = "zenity_3.4.0-0ubuntu4+steamrt2+srt4_amd64";
       md5 = "44a2bda05acf6d10aaad2216a69507db";
+      url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "zenity.deb";
       };
     }
     rec {
       name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_amd64";
       md5 = "3370614dc8c2667679aefb4c1e4c07af";
+      url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_amd64.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_amd64.deb";
-        inherit md5;
+        inherit url md5;
         name = "zlib1g.deb";
       };
     }
@@ -1745,1737 +1745,1737 @@
     rec {
       name = "dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_i386";
       md5 = "2ec67bae5e0c088d1ac13ba4eee194bf";
+      url = "mirror://steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/d/d-conf/dconf-gsettings-backend_0.12.0-0ubuntu1.1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "dconf-gsettings-backend.deb";
       };
     }
     rec {
       name = "freeglut3_2.6.0-1ubuntu3+srt4_i386";
       md5 = "8fc95adac306cc313523179824b43835";
+      url = "mirror://steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/f/freeglut/freeglut3_2.6.0-1ubuntu3+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "freeglut3.deb";
       };
     }
     rec {
       name = "gcc-4.6-base_4.6.3-1ubuntu5+srt4_i386";
       md5 = "499ec92726b0ce7115697d2553d0176d";
+      url = "mirror://steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gcc-4.6/gcc-4.6-base_4.6.3-1ubuntu5+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "gcc-4.6-base.deb";
       };
     }
     rec {
       name = "gtk2-engines_2.20.2-1ubuntu1+srt4_i386";
       md5 = "2c7feb2392d943f07c985d8cf83ed067";
+      url = "mirror://steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gtk2-engines/gtk2-engines_2.20.2-1ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "gtk2-engines.deb";
       };
     }
     rec {
       name = "gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_i386";
       md5 = "73bc5a4840f1ab72d715964721e97f75";
+      url = "mirror://steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gtk2-engines-murrine/gtk2-engines-murrine_0.98.2-0ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "gtk2-engines-murrine.deb";
       };
     }
     rec {
       name = "gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_i386";
       md5 = "cf294afff2a4d5893e48beb4d308f7b8";
+      url = "mirror://steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gtk+2.0/gtk2-engines-pixbuf_2.24.10-0ubuntu6+steamrt1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "gtk2-engines-pixbuf.deb";
       };
     }
     rec {
       name = "libacl1_2.2.51-5ubuntu1+srt6_i386";
       md5 = "b335451ab178fabccf1ea5d3fc3bf17e";
+      url = "mirror://steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt6_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/a/acl/libacl1_2.2.51-5ubuntu1+srt6_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libacl1.deb";
       };
     }
     rec {
       name = "libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_i386";
       md5 = "e1998f1e6dfd34d993ae2cb1a2621c05";
+      url = "mirror://steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/liba/libappindicator/libappindicator1_0.4.92-0ubuntu1+steamrt1+srt5_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libappindicator1.deb";
       };
     }
     rec {
       name = "libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386";
       md5 = "49228f60eedb525d344a8f756ac18df0";
+      url = "mirror://steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/h/heimdal/libasn1-8-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libasn1-8-heimdal.deb";
       };
     }
     rec {
       name = "libasound2_1.0.25-1ubuntu10.1+steamrt1+srt4_i386";
       md5 = "306ee9c004c5677442661dfdc1617911";
+      url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.0.25-1ubuntu10.1+steamrt1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/a/alsa-lib/libasound2_1.0.25-1ubuntu10.1+steamrt1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libasound2.deb";
       };
     }
     rec {
       name = "libasound2-plugins_1.0.25-1ubuntu1+srt4_i386";
       md5 = "8afcb694c51af22d48366d8d0ee11738";
+      url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.0.25-1ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.0.25-1ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libasound2-plugins.deb";
       };
     }
     rec {
       name = "libasyncns0_0.8-4+srt4_i386";
       md5 = "59ed0cdc4eb0cae2355c368dbdd5103b";
+      url = "mirror://steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/liba/libasyncns/libasyncns0_0.8-4+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libasyncns0.deb";
       };
     }
     rec {
       name = "libatk1.0-0_2.4.0-0ubuntu1+srt4_i386";
       md5 = "7fbe2a86e8e8a547626b9dc42edd6c83";
+      url = "mirror://steamrt/pool/main/a/atk1.0/libatk1.0-0_2.4.0-0ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/a/atk1.0/libatk1.0-0_2.4.0-0ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libatk1.0-0.deb";
       };
     }
     rec {
       name = "libattr1_2.4.46-5ubuntu1+srt4_i386";
       md5 = "cd9827abda30e1bf97c78a7d3dffc150";
+      url = "mirror://steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/a/attr/libattr1_2.4.46-5ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libattr1.deb";
       };
     }
     rec {
       name = "libavahi-client3_0.6.30-5ubuntu2+srt4_i386";
       md5 = "b62360b70b965c13c86536fbcd5c3dd2";
+      url = "mirror://steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/a/avahi/libavahi-client3_0.6.30-5ubuntu2+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libavahi-client3.deb";
       };
     }
     rec {
       name = "libavahi-common3_0.6.30-5ubuntu2+srt4_i386";
       md5 = "ef91c00328996a43243b7de90f60d145";
+      url = "mirror://steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/a/avahi/libavahi-common3_0.6.30-5ubuntu2+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libavahi-common3.deb";
       };
     }
     rec {
       name = "libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386";
       md5 = "4787c81afc9a17c9b9f7700249d42e9d";
+      url = "mirror://steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/liba/libav/libavcodec53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libavcodec53.deb";
       };
     }
     rec {
       name = "libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386";
       md5 = "396ec91c52c5f3bd22d53c6f9ec58836";
+      url = "mirror://steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/liba/libav/libavfilter2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libavfilter2.deb";
       };
     }
     rec {
       name = "libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386";
       md5 = "a0b3c36045eaa4b93ec0c8db5999e95c";
+      url = "mirror://steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/liba/libav/libavformat53_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libavformat53.deb";
       };
     }
     rec {
       name = "libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386";
       md5 = "21589331257b33edf01f06f2cea89494";
+      url = "mirror://steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/liba/libav/libavutil51_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libavutil51.deb";
       };
     }
     rec {
       name = "libbz2-1.0_1.0.6-1+srt4_i386";
       md5 = "6af7e943feae8691d7331c8e616ea402";
+      url = "mirror://steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/b/bzip2/libbz2-1.0_1.0.6-1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libbz2-1.0.deb";
       };
     }
     rec {
       name = "libcairo2_1.10.2-6.1ubuntu3+srt4_i386";
       md5 = "33c0e1be296288e7681d88d5775cd3c1";
+      url = "mirror://steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/c/cairo/libcairo2_1.10.2-6.1ubuntu3+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libcairo2.deb";
       };
     }
     rec {
       name = "libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_i386";
       md5 = "53b3f4d615e0571aefec5ba4990c246d";
+      url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libc/libcanberra/libcanberra-gtk-module_0.28-3ubuntu3+steamrt1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libcanberra-gtk-module.deb";
       };
     }
     rec {
       name = "libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_i386";
       md5 = "af77180b67e083ca1c7c16f125d773d8";
+      url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libc/libcanberra/libcanberra-gtk0_0.28-3ubuntu3+steamrt1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libcanberra-gtk0.deb";
       };
     }
     rec {
       name = "libcanberra0_0.28-3ubuntu3+steamrt1+srt4_i386";
       md5 = "ffca46ec6dc8f075f3bd224ae0e4e535";
+      url = "mirror://steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libc/libcanberra/libcanberra0_0.28-3ubuntu3+steamrt1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libcanberra0.deb";
       };
     }
     rec {
       name = "libcap2_2.22-1ubuntu3+srt4_i386";
       md5 = "21af02a5fe56b6ec332eb0c6f1e1d187";
+      url = "mirror://steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libc/libcap2/libcap2_2.22-1ubuntu3+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libcap2.deb";
       };
     }
     rec {
       name = "libcg_3.0.0016-0ubuntu1+srt4_i386";
       md5 = "5d8b9bd239ea094bc25041c7437a60d7";
+      url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/n/nvidia-cg-toolkit/libcg_3.0.0016-0ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libcg.deb";
       };
     }
     rec {
       name = "libcomerr2_1.42-1ubuntu2.2+srt1_i386";
       md5 = "a7450fa3b218cc993b252f7f51b4f83a";
+      url = "mirror://steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.2+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/e/e2fsprogs/libcomerr2_1.42-1ubuntu2.2+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libcomerr2.deb";
       };
     }
     rec {
       name = "libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_i386";
       md5 = "134c7e63ef61bb469ebc61c26309e42e";
+      url = "mirror://steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/c/cups/libcups2_1.5.3-0ubuntu8.2+steamrt1+srt3_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libcups2.deb";
       };
     }
     rec {
       name = "libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_i386";
       md5 = "b2dc62a422bf1ebc4014073664d38b3b";
+      url = "mirror://steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/c/curl/libcurl3_7.22.0-3ubuntu4.8+steamrt2+srt5_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libcurl3.deb";
       };
     }
     rec {
       name = "libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_i386";
       md5 = "f95df746d4c7319e4cb83f082d39ab38";
+      url = "mirror://steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/c/curl/libcurl3-gnutls_7.22.0-3ubuntu4.8+steamrt2+srt5_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libcurl3-gnutls.deb";
       };
     }
     rec {
       name = "libdbus-1-3_1.4.18-1ubuntu1.7+srt1_i386";
       md5 = "36d5b7a27a90cc6069c14317c5b182e8";
+      url = "mirror://steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.7+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/d/dbus/libdbus-1-3_1.4.18-1ubuntu1.7+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libdbus-1-3.deb";
       };
     }
     rec {
       name = "libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_i386";
       md5 = "4082582c368e35112478847ca5afad30";
+      url = "mirror://steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/d/dbus-glib/libdbus-glib-1-2_0.98-1ubuntu1.1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libdbus-glib-1-2.deb";
       };
     }
     rec {
       name = "libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_i386";
       md5 = "593ce60da5a985932e8a43802e662237";
+      url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libd/libdbusmenu/libdbusmenu-glib4_0.6.2-0ubuntu0.1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libdbusmenu-glib4.deb";
       };
     }
     rec {
       name = "libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_i386";
       md5 = "1982414c7f72db3106ab8446596cdbb9";
+      url = "mirror://steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libd/libdbusmenu/libdbusmenu-gtk4_0.6.2-0ubuntu0.1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libdbusmenu-gtk4.deb";
       };
     }
     rec {
       name = "libexif12_0.6.20-2ubuntu0.1+srt4_i386";
       md5 = "eb203ec5c79ed77e053efaa1bc8d65d4";
+      url = "mirror://steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libe/libexif/libexif12_0.6.20-2ubuntu0.1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libexif12.deb";
       };
     }
     rec {
       name = "libexpat1_2.0.1-7.2ubuntu1.2+srt1_i386";
       md5 = "44b8336cf9a2340a693528f2ebe19da2";
+      url = "mirror://steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.2+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/e/expat/libexpat1_2.0.1-7.2ubuntu1.2+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libexpat1.deb";
       };
     }
     rec {
       name = "libffi6_3.0.11~rc1-5+srt4_i386";
       md5 = "4a07d2ad9dc8e67ad6edaccad85170ae";
+      url = "mirror://steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libf/libffi/libffi6_3.0.11~rc1-5+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libffi6.deb";
       };
     }
     rec {
       name = "libflac8_1.2.1-6+srt4_i386";
       md5 = "543202e74de54764bd9ca25548d4bd86";
+      url = "mirror://steamrt/pool/main/f/flac/libflac8_1.2.1-6+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/f/flac/libflac8_1.2.1-6+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libflac8.deb";
       };
     }
     rec {
       name = "libfltk1.1_1.1.10-10+srt4_i386";
       md5 = "8be404e25f342918fb99b40320f8bc4c";
+      url = "mirror://steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/f/fltk1.1/libfltk1.1_1.1.10-10+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libfltk1.1.deb";
       };
     }
     rec {
       name = "libfontconfig1_2.8.0-3ubuntu9.1+srt4_i386";
       md5 = "57d781f78fc1c75d947208e09a58a39b";
+      url = "mirror://steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/f/fontconfig/libfontconfig1_2.8.0-3ubuntu9.1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libfontconfig1.deb";
       };
     }
     rec {
       name = "libfreetype6_2.4.8-1ubuntu2.3+srt1_i386";
       md5 = "2b1dd9e53e6a94443e9959de83d8621f";
+      url = "mirror://steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.3+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/f/freetype/libfreetype6_2.4.8-1ubuntu2.3+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libfreetype6.deb";
       };
     }
     rec {
       name = "libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386";
       md5 = "61f4822f145d812c453b2fc5d71f5eae";
+      url = "mirror://steamrt/pool/main/g/gcc-4.8/libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gcc-4.8/libgcc1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgcc1.deb";
       };
     }
     rec {
       name = "libgconf-2-4_3.2.5-0ubuntu2+srt4_i386";
       md5 = "1c0863073b6fdbdbe5ff911ed3cc781d";
+      url = "mirror://steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gconf/libgconf-2-4_3.2.5-0ubuntu2+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgconf-2-4.deb";
       };
     }
     rec {
-      name = "libgcrypt11_1.5.0-3ubuntu0.4+srt1_i386";
-      md5 = "3ee78c6888bcf55b43fb6830059c65e3";
+      name = "libgcrypt11_1.5.0-3ubuntu0.5+srt1_i386";
+      md5 = "a77e997aabfde09c5cdf4b5f5d8e305f";
+      url = "mirror://steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.5+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libg/libgcrypt11/libgcrypt11_1.5.0-3ubuntu0.4+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgcrypt11.deb";
       };
     }
     rec {
       name = "libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_i386";
       md5 = "9108b1542d78b682f141c3b488f33821";
+      url = "mirror://steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gdk-pixbuf/libgdk-pixbuf2.0-0_2.26.1-1+steamrt3+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgdk-pixbuf2.0-0.deb";
       };
     }
     rec {
       name = "libglew1.10_1.10.0-3+srt4_i386";
       md5 = "cbd2c842295be412d25bf35ad4329c7a";
+      url = "mirror://steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/glew/libglew1.10_1.10.0-3+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libglew1.10.deb";
       };
     }
     rec {
       name = "libglew1.6_1.6.0-4+srt4_i386";
       md5 = "36344ae65699fdfac8d169c54f45dabf";
+      url = "mirror://steamrt/pool/main/g/glew/libglew1.6_1.6.0-4+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/glew/libglew1.6_1.6.0-4+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libglew1.6.deb";
       };
     }
     rec {
       name = "libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_i386";
       md5 = "2bb8b70952f8f6d724700e72db8bbef8";
+      url = "mirror://steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/glib2.0/libglib2.0-0_2.32.3-0ubuntu1+steamrt2+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libglib2.0-0.deb";
       };
     }
     rec {
       name = "libglu1-mesa_8.0.4-0ubuntu0.7+srt4_i386";
       md5 = "bbdb5055ac6164380a6c344bdca59a74";
+      url = "mirror://steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/m/mesa/libglu1-mesa_8.0.4-0ubuntu0.7+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libglu1-mesa.deb";
       };
     }
     rec {
       name = "libgmp10_5.0.2+dfsg-2ubuntu1+srt4_i386";
       md5 = "669fcbbac0ba7510cb5df1ed7a4b58a8";
+      url = "mirror://steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gmp/libgmp10_5.0.2+dfsg-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgmp10.deb";
       };
     }
     rec {
-      name = "libgnutls26_2.12.14-5ubuntu3.9+srt1_i386";
-      md5 = "51da86a2dd3205580f9cbc43cabf921f";
+      name = "libgnutls26_2.12.14-5ubuntu3.11+srt1_i386";
+      md5 = "360d15ec7d327371bcb69a8b51b1e556";
+      url = "mirror://steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.11+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gnutls26/libgnutls26_2.12.14-5ubuntu3.9+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgnutls26.deb";
       };
     }
     rec {
       name = "libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386";
       md5 = "d52479b3e735785256c8b6ba2a278ed3";
+      url = "mirror://steamrt/pool/main/g/gcc-4.8/libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gcc-4.8/libgomp1_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgomp1.deb";
       };
     }
     rec {
       name = "libgpg-error0_1.10-2ubuntu1+srt4_i386";
       md5 = "8cda79074a80e9c079251962c86cc5cf";
+      url = "mirror://steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libg/libgpg-error/libgpg-error0_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgpg-error0.deb";
       };
     }
     rec {
-      name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.6+srt1_i386";
-      md5 = "8fc7da47074cdac1c721b280db75b571";
+      name = "libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386";
+      md5 = "bba863478cbafe60780618b9e2e3ba39";
+      url = "mirror://steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/k/krb5/libgssapi-krb5-2_1.10+dfsg~beta1-2ubuntu0.6+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgssapi-krb5-2.deb";
       };
     }
     rec {
       name = "libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386";
       md5 = "1160d5fb86160631a7e699d66f1d6805";
+      url = "mirror://steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/h/heimdal/libgssapi3-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgssapi3-heimdal.deb";
       };
     }
     rec {
       name = "libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_i386";
       md5 = "b3e0cb34c2b21fb68fe4fbde8ae640a7";
+      url = "mirror://steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gst-plugins-base0.10/libgstreamer-plugins-base0.10-0_0.10.36-1ubuntu0.1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgstreamer-plugins-base0.10-0.deb";
       };
     }
     rec {
       name = "libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_i386";
       md5 = "633c94c28db5caa2001fce91ca6a726f";
+      url = "mirror://steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gstreamer0.10/libgstreamer0.10-0_0.10.36-1ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgstreamer0.10-0.deb";
       };
     }
     rec {
       name = "libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_i386";
       md5 = "a903c62e138ca58cc32aa7412ec4a3ec";
+      url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gtk+2.0/libgtk2.0-0_2.24.10-0ubuntu6+steamrt1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgtk2.0-0.deb";
       };
     }
     rec {
       name = "libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all";
       md5 = "5a2f731bdac2bd089780af2f63635f7b";
+      url = "mirror://steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gtk+2.0/libgtk2.0-common_2.24.10-0ubuntu6+steamrt1+srt4_all.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgtk2.0-common.deb";
       };
     }
     rec {
       name = "libgudev-1.0-0_175-0ubuntu9.2+srt4_i386";
       md5 = "a120c25c89a1136ef0daa25644387d26";
+      url = "mirror://steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.2+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/u/udev/libgudev-1.0-0_175-0ubuntu9.2+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libgudev-1.0-0.deb";
       };
     }
     rec {
       name = "libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386";
       md5 = "14714cd92839ae0a1716929840bd340f";
+      url = "mirror://steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/h/heimdal/libhcrypto4-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libhcrypto4-heimdal.deb";
       };
     }
     rec {
       name = "libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386";
       md5 = "9be4a5f3f6735aa3b9153c8cb5ba4ff9";
+      url = "mirror://steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/h/heimdal/libheimbase1-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libheimbase1-heimdal.deb";
       };
     }
     rec {
       name = "libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386";
       md5 = "363aac3460da3724144165325f29f52a";
+      url = "mirror://steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/h/heimdal/libheimntlm0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libheimntlm0-heimdal.deb";
       };
     }
     rec {
       name = "libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386";
       md5 = "5591041cf73d1593730ff40428b407dc";
+      url = "mirror://steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/h/heimdal/libhx509-5-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libhx509-5-heimdal.deb";
       };
     }
     rec {
       name = "libice6_1.0.7-2build1+srt4_i386";
       md5 = "ed56f05e4b1fcf06189374a60aa740eb";
+      url = "mirror://steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libi/libice/libice6_1.0.7-2build1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libice6.deb";
       };
     }
     rec {
       name = "libidn11_1.23-2+steamrt1+srt4_i386";
       md5 = "79c6f01961c13e74d48978fe94aecce3";
+      url = "mirror://steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libi/libidn/libidn11_1.23-2+steamrt1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libidn11.deb";
       };
     }
     rec {
       name = "libindicator7_0.5.0-0ubuntu1+srt4_i386";
       md5 = "a365d22a80311e9875bde88c9b7b5146";
+      url = "mirror://steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libi/libindicator/libindicator7_0.5.0-0ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libindicator7.deb";
       };
     }
     rec {
       name = "libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_i386";
       md5 = "c0e59176b50a2da0ec61d48902014ce5";
+      url = "mirror://steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/j/jackd2/libjack-jackd2-0_1.9.8~dfsg.1-1ubuntu2+srt3_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libjack-jackd2-0.deb";
       };
     }
     rec {
       name = "libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_i386";
       md5 = "83c82f7924110b659b8786b54ca6fb27";
+      url = "mirror://steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_1.1.90+svn733-0ubuntu4.3+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libjpeg-turbo8.deb";
       };
     }
     rec {
       name = "libjpeg62_6b1-2ubuntu1.1+srt4_i386";
       md5 = "5084441d1da0b2d77de32cfadc21ee5f";
+      url = "mirror://steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libj/libjpeg6b/libjpeg62_6b1-2ubuntu1.1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libjpeg62.deb";
       };
     }
     rec {
       name = "libjson0_0.9-1ubuntu1.1+srt2_i386";
       md5 = "358ed87729682d1d5a44b04a99f9cca8";
+      url = "mirror://steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt2_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/j/json-c/libjson0_0.9-1ubuntu1.1+srt2_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libjson0.deb";
       };
     }
     rec {
-      name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.6+srt1_i386";
-      md5 = "9d903a775501687794f3579a439f62b0";
+      name = "libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386";
+      md5 = "09e0b933d71e0b842906f22334845104";
+      url = "mirror://steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/k/krb5/libk5crypto3_1.10+dfsg~beta1-2ubuntu0.6+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libk5crypto3.deb";
       };
     }
     rec {
       name = "libkeyutils1_1.5.2-2+srt4_i386";
       md5 = "77b6a1fdfe5d2976650e882df68f1bb7";
+      url = "mirror://steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/k/keyutils/libkeyutils1_1.5.2-2+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libkeyutils1.deb";
       };
     }
     rec {
       name = "libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386";
       md5 = "94eb595546d5b421504c6df661d29975";
+      url = "mirror://steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/h/heimdal/libkrb5-26-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libkrb5-26-heimdal.deb";
       };
     }
     rec {
-      name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.6+srt1_i386";
-      md5 = "b68e1bfee0598418a0a6b4280302f5f6";
+      name = "libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386";
+      md5 = "4efd6dd3da5e989b7aaf990cb5dae9a4";
+      url = "mirror://steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/k/krb5/libkrb5-3_1.10+dfsg~beta1-2ubuntu0.6+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libkrb5-3.deb";
       };
     }
     rec {
-      name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.6+srt1_i386";
-      md5 = "b6a905144b615ef32e1a1ca67a10379e";
+      name = "libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386";
+      md5 = "ce8372e9411aa5d734ef44773820cd3b";
+      url = "mirror://steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.7+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/k/krb5/libkrb5support0_1.10+dfsg~beta1-2ubuntu0.6+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libkrb5support0.deb";
       };
     }
     rec {
       name = "liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_i386";
       md5 = "aea8d6beda7f992becfdbb3880b5b3c6";
+      url = "mirror://steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/l/lcms2/liblcms2-2_2.2+git20110628-2ubuntu3.1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "liblcms2-2.deb";
       };
     }
     rec {
       name = "libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_i386";
       md5 = "770471a9c33a9b708427dfa5d8b944b4";
+      url = "mirror://steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/o/openldap/libldap-2.4-2_2.4.28-1.1ubuntu4.2+steamrt1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libldap-2.4-2.deb";
       };
     }
     rec {
       name = "libltdl7_2.4.2-1ubuntu1+srt4_i386";
       md5 = "ab9d4dabd065bcc31430d839a04a5844";
+      url = "mirror://steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libt/libtool/libltdl7_2.4.2-1ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libltdl7.deb";
       };
     }
     rec {
       name = "libmikmod2_3.1.12-2+srt4_i386";
       md5 = "fb5286eb01a90318bb95bdd671c6c512";
+      url = "mirror://steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libm/libmikmod/libmikmod2_3.1.12-2+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libmikmod2.deb";
       };
     }
     rec {
       name = "libncurses5_5.9-4+srt4_i386";
       md5 = "f3343e67c571b9f279ca0f9ce27f8981";
+      url = "mirror://steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/n/ncurses/libncurses5_5.9-4+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libncurses5.deb";
       };
     }
     rec {
       name = "libncursesw5_5.9-4+srt4_i386";
       md5 = "aa693feffb52a101beda0d578de71db3";
+      url = "mirror://steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/n/ncurses/libncursesw5_5.9-4+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libncursesw5.deb";
       };
     }
     rec {
       name = "libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386";
       md5 = "361fba889b4a4fb66c7fc59f7e837f6e";
+      url = "mirror://steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/n/network-manager/libnm-glib4_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libnm-glib4.deb";
       };
     }
     rec {
       name = "libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386";
       md5 = "39d620f28e9ecee9dc25e7ac4e679a81";
+      url = "mirror://steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/n/network-manager/libnm-util2_0.9.4.0-0ubuntu4.2+steamrt1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libnm-util2.deb";
       };
     }
     rec {
       name = "libnotify4_0.7.5-1+srt4_i386";
       md5 = "a4207e3d76879a94430cb641fe2001be";
+      url = "mirror://steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libn/libnotify/libnotify4_0.7.5-1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libnotify4.deb";
       };
     }
     rec {
-      name = "libnspr4_4.10.7-0ubuntu0.12.04.1+srt1_i386";
-      md5 = "78d9dc08637bd09f425821c8d35f3b03";
+      name = "libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_i386";
+      md5 = "6d15e2401761ea09428c7170381a3ff3";
+      url = "mirror://steamrt/pool/main/n/nspr/libnspr4_4.10.10-0ubuntu0.12.04.1+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/n/nspr/libnspr4_4.10.7-0ubuntu0.12.04.1+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libnspr4.deb";
       };
     }
     rec {
-      name = "libnss3_3.19.2-0ubuntu0.12.04.1+srt1_i386";
-      md5 = "35330de1ca02b0034f468c0df11882bd";
+      name = "libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_i386";
+      md5 = "bc611346e46985b47d0cf7fe0464e4af";
+      url = "mirror://steamrt/pool/main/n/nss/libnss3_3.19.2.1-0ubuntu0.12.04.2+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/n/nss/libnss3_3.19.2-0ubuntu0.12.04.1+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libnss3.deb";
       };
     }
     rec {
       name = "libogg0_1.2.2~dfsg-1ubuntu1+srt4_i386";
       md5 = "bc3afb09d1ea93764c808c7a268c1cd2";
+      url = "mirror://steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libo/libogg/libogg0_1.2.2~dfsg-1ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libogg0.deb";
       };
     }
     rec {
       name = "libopenal1_1.13-4ubuntu3+steamrt1+srt4_i386";
       md5 = "2548d953611d999a85463581df4efac5";
+      url = "mirror://steamrt/pool/main/o/openal-soft/libopenal1_1.13-4ubuntu3+steamrt1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/o/openal-soft/libopenal1_1.13-4ubuntu3+steamrt1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libopenal1.deb";
       };
     }
     rec {
       name = "liborc-0.4-0_0.4.16-1ubuntu2+srt4_i386";
       md5 = "d2cd63e1f984b45561128d7d4d67bd06";
+      url = "mirror://steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/o/orc/liborc-0.4-0_0.4.16-1ubuntu2+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "liborc-0.4-0.deb";
       };
     }
     rec {
       name = "libp11-kit0_0.12-2ubuntu1+srt4_i386";
       md5 = "e5dacb77c07e97db660bc5312387a9d6";
+      url = "mirror://steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/p/p11-kit/libp11-kit0_0.12-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libp11-kit0.deb";
       };
     }
     rec {
       name = "libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_i386";
       md5 = "dbc50fdd82e6df45bb9bb8ce18f1fe2c";
+      url = "mirror://steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/p/pango1.0/libpango1.0-0_1.30.0-0ubuntu3.1+steamrt1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libpango1.0-0.deb";
       };
     }
     rec {
       name = "libpci3_3.1.8-2ubuntu5+srt4_i386";
       md5 = "cdf2a41b3ba93c2061f196920420b99d";
+      url = "mirror://steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu5+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/p/pciutils/libpci3_3.1.8-2ubuntu5+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libpci3.deb";
       };
     }
     rec {
       name = "libpcre3_8.12-4+srt4_i386";
       md5 = "d4134108e9b21b6e623eafeaaa84e37f";
+      url = "mirror://steamrt/pool/main/p/pcre3/libpcre3_8.12-4+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/p/pcre3/libpcre3_8.12-4+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libpcre3.deb";
       };
     }
     rec {
       name = "libpcrecpp0_8.12-4+srt4_i386";
       md5 = "e1bd40c3840669cbfb0b12e6dd07629d";
+      url = "mirror://steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/p/pcre3/libpcrecpp0_8.12-4+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libpcrecpp0.deb";
       };
     }
     rec {
       name = "libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_i386";
       md5 = "630fa4416398e12dfae1816acdac1d89";
+      url = "mirror://steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/p/pixman/libpixman-1-0_0.30.2-1ubuntu0.0.0.0.2+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libpixman-1-0.deb";
       };
     }
     rec {
-      name = "libpng12-0_1.2.46-3ubuntu4+srt4_i386";
-      md5 = "23f4f520f160d48dc127ce8ad88900c3";
+      name = "libpng12-0_1.2.46-3ubuntu4.2+srt1_i386";
+      md5 = "978502e6116df1c98dd985dd07bc1022";
+      url = "mirror://steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4.2+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libp/libpng/libpng12-0_1.2.46-3ubuntu4+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libpng12-0.deb";
       };
     }
     rec {
       name = "libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_i386";
       md5 = "4591d057af7dc6709d1960c5ce590560";
+      url = "mirror://steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/p/pulseaudio/libpulse0_1.1-0ubuntu15.2+steamrt1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libpulse0.deb";
       };
     }
     rec {
       name = "libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386";
       md5 = "cc8d8e5b7a4e002de9e86633b2c53804";
+      url = "mirror://steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/h/heimdal/libroken18-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libroken18-heimdal.deb";
       };
     }
     rec {
       name = "librtmp0_2.4~20110711.gitc28f1bab-1+srt4_i386";
       md5 = "3ccb52ce883b4c1885857c80cbd11e56";
+      url = "mirror://steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/r/rtmpdump/librtmp0_2.4~20110711.gitc28f1bab-1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "librtmp0.deb";
       };
     }
     rec {
       name = "libsamplerate0_0.1.8-4+srt4_i386";
       md5 = "e218128429da602e392c047940b62a23";
+      url = "mirror://steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libs/libsamplerate/libsamplerate0_0.1.8-4+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsamplerate0.deb";
       };
     }
     rec {
       name = "libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_i386";
       md5 = "963632ad4d1477ef230dc4c68dc7ffa2";
+      url = "mirror://steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/c/cyrus-sasl2/libsasl2-2_2.1.25.dfsg1-3ubuntu0.1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsasl2-2.deb";
       };
     }
     rec {
       name = "libsdl-image1.2_1.2.10-3+srt4_i386";
       md5 = "1adfd99b505fe3ff6fd08a2919277780";
+      url = "mirror://steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/s/sdl-image1.2/libsdl-image1.2_1.2.10-3+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsdl-image1.2.deb";
       };
     }
     rec {
       name = "libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_i386";
       md5 = "8687aaa0fb6981d674ade4062884ff52";
+      url = "mirror://steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/s/sdl-mixer1.2/libsdl-mixer1.2_1.2.11-7+steamrt1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsdl-mixer1.2.deb";
       };
     }
     rec {
       name = "libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_i386";
       md5 = "887ac0bbaa344b203d9effdd32dd072a";
+      url = "mirror://steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/s/sdl-ttf2.0/libsdl-ttf2.0-0_2.0.9-1.1ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsdl-ttf2.0-0.deb";
       };
     }
     rec {
       name = "libsdl1.2debian_1.2.15-5+steamrt1+srt4_i386";
       md5 = "7b4319a41a9dcb24aab37be255579ce7";
+      url = "mirror://steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libs/libsdl1.2/libsdl1.2debian_1.2.15-5+steamrt1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsdl1.2debian.deb";
       };
     }
     rec {
-      name = "libsdl2_2.0.3+steamrt1+srt4_i386";
-      md5 = "f34b318dc7daf934125d09cceeafe10c";
+      name = "libsdl2_2.0.4+steamrt1+srt1_i386";
+      md5 = "b88ec76ac0c55871648c51749ba2e661";
+      url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.4+steamrt1+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libs/libsdl2/libsdl2_2.0.3+steamrt1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsdl2.deb";
       };
     }
     rec {
-      name = "libsdl2-image_2.0.0+steamrt1+srt4_i386";
-      md5 = "715fde2a619afc4335720d0aba7895b2";
+      name = "libsdl2-image_2.0.1+steamrt2+srt1_i386";
+      md5 = "076b0df6aff11c3a828eb5978be1ff66";
+      url = "mirror://steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.1+steamrt2+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libs/libsdl2-image/libsdl2-image_2.0.0+steamrt1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsdl2-image.deb";
       };
     }
     rec {
-      name = "libsdl2-mixer_2.0.0+steamrt1+srt4_i386";
-      md5 = "7795a5fb826960a5078a2d73f3ee2113";
+      name = "libsdl2-mixer_2.0.1+steamrt1+srt1_i386";
+      md5 = "1883cd445c1e5d3ad12bbb7f8d1932cc";
+      url = "mirror://steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.1+steamrt1+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libs/libsdl2-mixer/libsdl2-mixer_2.0.0+steamrt1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsdl2-mixer.deb";
       };
     }
     rec {
-      name = "libsdl2-net_2.0.0+srt4_i386";
-      md5 = "d10bb11e6231b93d06e5f3254c0de8fd";
+      name = "libsdl2-net_2.0.1+srt1_i386";
+      md5 = "f97097f7e4594a691f7e866e1f4bd6d4";
+      url = "mirror://steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.1+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libs/libsdl2-net/libsdl2-net_2.0.0+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsdl2-net.deb";
       };
     }
     rec {
-      name = "libsdl2-ttf_2.0.12+srt4_i386";
-      md5 = "26ba9191716e3f7f3971fd68e7e8d4c1";
+      name = "libsdl2-ttf_2.0.14+srt1_i386";
+      md5 = "6b4c6e4c15de54d5222da1ccab849b69";
+      url = "mirror://steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.14+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libs/libsdl2-ttf/libsdl2-ttf_2.0.12+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsdl2-ttf.deb";
       };
     }
     rec {
       name = "libselinux1_2.1.0-4.1ubuntu1+srt4_i386";
       md5 = "f96dd8143f7f3bb2600d761f5fb6e854";
+      url = "mirror://steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libs/libselinux/libselinux1_2.1.0-4.1ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libselinux1.deb";
       };
     }
     rec {
       name = "libsm6_1.2.0-2build1+srt4_i386";
       md5 = "fcdebe0131ecd0b0777e52b06ad99055";
+      url = "mirror://steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libs/libsm/libsm6_1.2.0-2build1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsm6.deb";
       };
     }
     rec {
       name = "libsndfile1_1.0.25-4+srt4_i386";
       md5 = "0a2518a2d66430e20d660883c71b84a2";
+      url = "mirror://steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libs/libsndfile/libsndfile1_1.0.25-4+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsndfile1.deb";
       };
     }
     rec {
       name = "libspeex1_1.2~rc1-3ubuntu2+srt4_i386";
       md5 = "f34f05ac30f3c11bde9b20cdc219c676";
+      url = "mirror://steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/s/speex/libspeex1_1.2~rc1-3ubuntu2+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libspeex1.deb";
       };
     }
     rec {
       name = "libspeexdsp1_1.2~rc1-3ubuntu2+srt4_i386";
       md5 = "239a3b273c387ca41ecff1e371b90d41";
+      url = "mirror://steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/s/speex/libspeexdsp1_1.2~rc1-3ubuntu2+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libspeexdsp1.deb";
       };
     }
     rec {
       name = "libsqlite3-0_3.7.9-2ubuntu1.2+srt1_i386";
       md5 = "6653a03901b263af6fce56e6c394e9b3";
+      url = "mirror://steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/s/sqlite3/libsqlite3-0_3.7.9-2ubuntu1.2+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libsqlite3-0.deb";
       };
     }
     rec {
-      name = "libssl1.0.0_1.0.1-4ubuntu5.31+srt1_i386";
-      md5 = "40b412b5964f9f48ef4f5997702da3d5";
+      name = "libssl1.0.0_1.0.1-4ubuntu5.33+srt1_i386";
+      md5 = "abed18b597fc44363a47caf1f4d760c4";
+      url = "mirror://steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.33+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/o/openssl/libssl1.0.0_1.0.1-4ubuntu5.31+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libssl1.0.0.deb";
       };
     }
     rec {
       name = "libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386";
       md5 = "76c7adc814605b316426ef1d9ffab195";
+      url = "mirror://steamrt/pool/main/g/gcc-4.8/libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gcc-4.8/libstdc++6_4.8.1-2ubuntu1~12.04+steamrt2+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libstdc++6.deb";
       };
     }
     rec {
       name = "libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_i386";
       md5 = "2a5142925aeb5054395edd56112e83a9";
+      url = "mirror://steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/g/gcc-4.6/libstdc++6-4.6-pic_4.6.3-1ubuntu5+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libstdc++6-4.6-pic.deb";
       };
     }
     rec {
       name = "libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386";
       md5 = "facd5280993d266f3f1f1809138e6cd2";
+      url = "mirror://steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/liba/libav/libswscale2_0.8.13-0ubuntu0.12.04.1+steamrt1+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libswscale2.deb";
       };
     }
     rec {
       name = "libtasn1-3_2.10-1ubuntu1.4+srt1_i386";
       md5 = "c24dd57cc16746dbead2fbfa571f978a";
+      url = "mirror://steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.4+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libt/libtasn1-3/libtasn1-3_2.10-1ubuntu1.4+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libtasn1-3.deb";
       };
     }
     rec {
       name = "libtbb2_4.0+r233-1+srt4_i386";
       md5 = "99dd92dba5e3f93e0e349ee9f3ebe22a";
+      url = "mirror://steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/t/tbb/libtbb2_4.0+r233-1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libtbb2.deb";
       };
     }
     rec {
       name = "libtdb1_1.2.9-4+srt4_i386";
       md5 = "8d165fc985106bb4b3df301bda4a8c22";
+      url = "mirror://steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/t/tdb/libtdb1_1.2.9-4+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libtdb1.deb";
       };
     }
     rec {
       name = "libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_i386";
       md5 = "966fee9cbc71519350a2730e34a1d8e6";
+      url = "mirror://steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libt/libtheora/libtheora0_1.1.1+dfsg.1-3ubuntu2+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libtheora0.deb";
       };
     }
     rec {
       name = "libtiff4_3.9.5-2ubuntu1.8+srt1_i386";
       md5 = "8374a1fc7909c42faa5ee585eb967b20";
+      url = "mirror://steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.8+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/t/tiff/libtiff4_3.9.5-2ubuntu1.8+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libtiff4.deb";
       };
     }
     rec {
       name = "libtinfo5_5.9-4+srt4_i386";
       md5 = "9c5ab1104d91b8bd6cd2fd21c06eb9ee";
+      url = "mirror://steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/n/ncurses/libtinfo5_5.9-4+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libtinfo5.deb";
       };
     }
     rec {
       name = "libudev0_175-0ubuntu9.2+srt4_i386";
       md5 = "f2dfa9304cacc609abce0c85f984b48f";
+      url = "mirror://steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.2+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/u/udev/libudev0_175-0ubuntu9.2+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libudev0.deb";
       };
     }
     rec {
       name = "libusb-1.0-0_1.0.19-1+srt1_i386";
       md5 = "f4328e5fa069f3b43d301992719b2d8e";
+      url = "mirror://steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libu/libusb-1.0/libusb-1.0-0_1.0.19-1+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libusb-1.0-0.deb";
       };
     }
     rec {
       name = "libuuid1_2.20.1-1ubuntu3+srt4_i386";
       md5 = "d5ef9ef9c92b5b7edfd2bac2853d00ad";
+      url = "mirror://steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/u/util-linux/libuuid1_2.20.1-1ubuntu3+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libuuid1.deb";
       };
     }
     rec {
       name = "libva-glx1_1.3.1-3+steamrt4+srt1_i386";
       md5 = "6ef48bb25671111d17d696ff4db2c684";
+      url = "mirror://steamrt/pool/main/libv/libva/libva-glx1_1.3.1-3+steamrt4+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libv/libva/libva-glx1_1.3.1-3+steamrt4+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libva-glx1.deb";
       };
     }
     rec {
       name = "libva-x11-1_1.3.1-3+steamrt4+srt1_i386";
       md5 = "90e2e7271ca563cd66993ea4652018c3";
+      url = "mirror://steamrt/pool/main/libv/libva/libva-x11-1_1.3.1-3+steamrt4+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libv/libva/libva-x11-1_1.3.1-3+steamrt4+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libva-x11-1.deb";
       };
     }
     rec {
       name = "libva1_1.3.1-3+steamrt4+srt1_i386";
       md5 = "dfc1877ecc94d01b4cdae6b527bee3a9";
+      url = "mirror://steamrt/pool/main/libv/libva/libva1_1.3.1-3+steamrt4+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libv/libva/libva1_1.3.1-3+steamrt4+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libva1.deb";
       };
     }
     rec {
       name = "libvdpau1_0.4.1-3ubuntu1.2+srt1_i386";
       md5 = "61cd2560476f54dc11b3e859e104daec";
+      url = "mirror://steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libv/libvdpau/libvdpau1_0.4.1-3ubuntu1.2+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libvdpau1.deb";
       };
     }
     rec {
       name = "libvorbis0a_1.3.2-1ubuntu3+srt4_i386";
       md5 = "03077bd7302ea56045c0548c6b2cb983";
+      url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libv/libvorbis/libvorbis0a_1.3.2-1ubuntu3+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libvorbis0a.deb";
       };
     }
     rec {
       name = "libvorbisenc2_1.3.2-1ubuntu3+srt4_i386";
       md5 = "6efe364cedbc437ddb1446cb846ad532";
+      url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libv/libvorbis/libvorbisenc2_1.3.2-1ubuntu3+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libvorbisenc2.deb";
       };
     }
     rec {
       name = "libvorbisfile3_1.3.2-1ubuntu3+srt4_i386";
       md5 = "7521e4dcb5378621ee56ea860f0f00ca";
+      url = "mirror://steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libv/libvorbis/libvorbisfile3_1.3.2-1ubuntu3+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libvorbisfile3.deb";
       };
     }
     rec {
       name = "libvpx1_1.0.0-1+srt4_i386";
       md5 = "97cc2ca1fd5a0e8134d33884fbd8decd";
+      url = "mirror://steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libv/libvpx/libvpx1_1.0.0-1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libvpx1.deb";
       };
     }
     rec {
       name = "libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386";
       md5 = "6265aab9d541aea8aad3496ebcc5908e";
+      url = "mirror://steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/h/heimdal/libwind0-heimdal_1.6~git20120311.dfsg.1-2+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libwind0-heimdal.deb";
       };
     }
     rec {
       name = "libwrap0_7.6.q-21+srt4_i386";
       md5 = "a0ac6fa38ef4664b1dc1e3255788852c";
+      url = "mirror://steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/t/tcp-wrappers/libwrap0_7.6.q-21+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libwrap0.deb";
       };
     }
     rec {
       name = "libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386";
       md5 = "cc208840d2883eec6f9770b623c24b9d";
+      url = "mirror://steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-6_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libx11-6.deb";
       };
     }
     rec {
       name = "libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all";
       md5 = "c012bbc8654c3c012dc7b5901c486f4d";
+      url = "mirror://steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-data_1.4.99.1-0ubuntu2.3+steamrt1+srt1_all.deb";
-        inherit md5;
+        inherit url md5;
         name = "libx11-data.deb";
       };
     }
     rec {
       name = "libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386";
       md5 = "2ef2ffe569708f8433cfb36e754526ec";
+      url = "mirror://steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libx11/libx11-xcb1_1.4.99.1-0ubuntu2.3+steamrt1+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libx11-xcb1.deb";
       };
     }
     rec {
       name = "libxau6_1.0.6-4+srt4_i386";
       md5 = "9274a9813575848a1646d67b44e10bac";
+      url = "mirror://steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxau/libxau6_1.0.6-4+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxau6.deb";
       };
     }
     rec {
       name = "libxaw7_1.0.9-3ubuntu1+srt4_i386";
       md5 = "70fa4b78b06a4d4b194cfb6baf1cdef1";
+      url = "mirror://steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxaw/libxaw7_1.0.9-3ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxaw7.deb";
       };
     }
     rec {
       name = "libxcb-composite0_1.10-2ubuntu1+srt4_i386";
       md5 = "a72a94bc35581c25ef827023f643489d";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-composite0_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-composite0_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-composite0.deb";
       };
     }
     rec {
       name = "libxcb-damage0_1.10-2ubuntu1+srt4_i386";
       md5 = "50f4656bbcb193c3a3047c45db06a4f7";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-damage0_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-damage0_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-damage0.deb";
       };
     }
     rec {
       name = "libxcb-doc_1.10-2ubuntu1+srt4_all";
       md5 = "d4fd2c66b60ff1db1c87e6884d5ae093";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-doc_1.10-2ubuntu1+srt4_all.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-doc_1.10-2ubuntu1+srt4_all.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-doc.deb";
       };
     }
     rec {
       name = "libxcb-dpms0_1.10-2ubuntu1+srt4_i386";
       md5 = "f805af07ee88d28de1fd06209aa42fc8";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-dpms0_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-dpms0.deb";
       };
     }
     rec {
       name = "libxcb-dri2-0_1.10-2ubuntu1+srt4_i386";
       md5 = "85812dd4c61ff7d99060c495f4d17669";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-dri2-0_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-dri2-0.deb";
       };
     }
     rec {
       name = "libxcb-dri3-0_1.10-2ubuntu1+srt4_i386";
       md5 = "70e2618de627e6e8308e4afda77b0966";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-dri3-0_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-dri3-0.deb";
       };
     }
     rec {
       name = "libxcb-glx0_1.10-2ubuntu1+srt4_i386";
       md5 = "850f3cb9ed1d79a9bdec55960a74611c";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-glx0_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-glx0_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-glx0.deb";
       };
     }
     rec {
       name = "libxcb-present0_1.10-2ubuntu1+srt4_i386";
       md5 = "e86ec58c992441124622921b38685d01";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-present0_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-present0_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-present0.deb";
       };
     }
     rec {
       name = "libxcb-randr0_1.10-2ubuntu1+srt4_i386";
       md5 = "4acaa6b473aba1684731f529506e2ff8";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-randr0_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-randr0_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-randr0.deb";
       };
     }
     rec {
       name = "libxcb-record0_1.10-2ubuntu1+srt4_i386";
       md5 = "1e28443a65256cd013b2dc0c937badcd";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-record0_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-record0_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-record0.deb";
       };
     }
     rec {
       name = "libxcb-render0_1.10-2ubuntu1+srt4_i386";
       md5 = "b6362e8ca7da70c873c08e9849ac79ca";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-render0_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-render0_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-render0.deb";
       };
     }
     rec {
       name = "libxcb-res0_1.10-2ubuntu1+srt4_i386";
       md5 = "1bd0d0e0f5134651c350ba4955463b02";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-res0_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-res0_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-res0.deb";
       };
     }
     rec {
       name = "libxcb-screensaver0_1.10-2ubuntu1+srt4_i386";
       md5 = "8b51441ce72d20a788a8e12149ea2cf8";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-screensaver0_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-screensaver0.deb";
       };
     }
     rec {
       name = "libxcb-shape0_1.10-2ubuntu1+srt4_i386";
       md5 = "470deea0b247279c51c2c76265263980";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shape0_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-shape0_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-shape0.deb";
       };
     }
     rec {
       name = "libxcb-shm0_1.10-2ubuntu1+srt4_i386";
       md5 = "abb2fe37023253653d404dd6116829a0";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-shm0_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-shm0_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-shm0.deb";
       };
     }
     rec {
       name = "libxcb-sync1_1.10-2ubuntu1+srt4_i386";
       md5 = "3bf95ebc0bd67e4200f754b7282c4608";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-sync1_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-sync1_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-sync1.deb";
       };
     }
     rec {
       name = "libxcb-xevie0_1.10-2ubuntu1+srt4_i386";
       md5 = "e0a5eda95251b20499a85f4bcec888a5";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-xevie0_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-xevie0.deb";
       };
     }
     rec {
       name = "libxcb-xf86dri0_1.10-2ubuntu1+srt4_i386";
       md5 = "1b227b824b6270407594b25b2dc12769";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-xf86dri0_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-xf86dri0.deb";
       };
     }
     rec {
       name = "libxcb-xfixes0_1.10-2ubuntu1+srt4_i386";
       md5 = "c0170a7d5ae40f1c0a4b4680991bc4ff";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-xfixes0_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-xfixes0.deb";
       };
     }
     rec {
       name = "libxcb-xinerama0_1.10-2ubuntu1+srt4_i386";
       md5 = "4de2e06a592ac634b109affebc31fb07";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-xinerama0_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-xinerama0.deb";
       };
     }
     rec {
       name = "libxcb-xkb1_1.10-2ubuntu1+srt4_i386";
       md5 = "2e154033ce7657e58f3a8e18d35ff5e3";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-xkb1_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-xkb1.deb";
       };
     }
     rec {
       name = "libxcb-xprint0_1.10-2ubuntu1+srt4_i386";
       md5 = "ca610d0695befd4442145e037f6a6f94";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-xprint0_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-xprint0.deb";
       };
     }
     rec {
       name = "libxcb-xtest0_1.10-2ubuntu1+srt4_i386";
       md5 = "813f01d8e7012bd8f58df239c2df47b0";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-xtest0_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-xtest0.deb";
       };
     }
     rec {
       name = "libxcb-xv0_1.10-2ubuntu1+srt4_i386";
       md5 = "1ccea01cd8c2549e5cb5b13b90d986d6";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xv0_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-xv0_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-xv0.deb";
       };
     }
     rec {
       name = "libxcb-xvmc0_1.10-2ubuntu1+srt4_i386";
       md5 = "4cbe887cb4ed19e79970ea076cc171c8";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb-xvmc0_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb-xvmc0.deb";
       };
     }
     rec {
       name = "libxcb1_1.10-2ubuntu1+srt4_i386";
       md5 = "5fcdea3958e6f0d60b841ecec606c3c0";
+      url = "mirror://steamrt/pool/main/libx/libxcb/libxcb1_1.10-2ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcb/libxcb1_1.10-2ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcb1.deb";
       };
     }
     rec {
       name = "libxcomposite1_0.4.3-2build1+srt4_i386";
       md5 = "dce0aac7322e5d9e7d74ca464c5db1f5";
+      url = "mirror://steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcomposite/libxcomposite1_0.4.3-2build1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcomposite1.deb";
       };
     }
     rec {
       name = "libxcursor1_1.1.12-1ubuntu0.1+srt4_i386";
       md5 = "97a5238d1048e8b005d535b14720039e";
+      url = "mirror://steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxcursor/libxcursor1_1.1.12-1ubuntu0.1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxcursor1.deb";
       };
     }
     rec {
       name = "libxdamage1_1.1.3-2build1+srt4_i386";
       md5 = "3d1d3d865c89c97e5cf980df806966ec";
+      url = "mirror://steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxdamage/libxdamage1_1.1.3-2build1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxdamage1.deb";
       };
     }
     rec {
       name = "libxdmcp6_1.1.0-4+srt4_i386";
       md5 = "eeefcc12cc694b069acec7937e4a6650";
+      url = "mirror://steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxdmcp/libxdmcp6_1.1.0-4+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxdmcp6.deb";
       };
     }
     rec {
       name = "libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_i386";
       md5 = "7f18f7c6fb6bca8a033e243ca4222057";
+      url = "mirror://steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxext/libxext6_1.3.0-3ubuntu0.2+steamrt1+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxext6.deb";
       };
     }
     rec {
       name = "libxfixes3_5.0-4ubuntu4.4+srt1_i386";
       md5 = "25d8be35a5e5a6bac479d4bdce8dceba";
+      url = "mirror://steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxfixes/libxfixes3_5.0-4ubuntu4.4+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxfixes3.deb";
       };
     }
     rec {
       name = "libxft2_2.2.0-3ubuntu2+srt4_i386";
       md5 = "44bf95c720b8634f0ea8419fa939f71e";
+      url = "mirror://steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/x/xft/libxft2_2.2.0-3ubuntu2+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxft2.deb";
       };
     }
     rec {
       name = "libxi6_1.7.1.901-1ubuntu1~precise3+srt1_i386";
       md5 = "5f82357fd11b009d7fee5020e8ff2c8a";
+      url = "mirror://steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxi/libxi6_1.7.1.901-1ubuntu1~precise3+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxi6.deb";
       };
     }
     rec {
       name = "libxinerama1_1.1.1-3ubuntu0.1+srt4_i386";
       md5 = "eb23a3d322ff57ff5cad1ae062201b89";
+      url = "mirror://steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxinerama/libxinerama1_1.1.1-3ubuntu0.1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxinerama1.deb";
       };
     }
     rec {
-      name = "libxml2_2.7.8.dfsg-5.1ubuntu4.11+srt1_i386";
-      md5 = "c6a64d2f5324a6af10fb70988649a3bb";
+      name = "libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_i386";
+      md5 = "426d497ed13c731342e5af754975e6ef";
+      url = "mirror://steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.14+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxml2/libxml2_2.7.8.dfsg-5.1ubuntu4.11+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxml2.deb";
       };
     }
     rec {
       name = "libxmu6_1.1.0-3+srt4_i386";
       md5 = "8e7fae57eec7ef0eae90c7573bde46a9";
+      url = "mirror://steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxmu/libxmu6_1.1.0-3+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxmu6.deb";
       };
     }
     rec {
       name = "libxpm4_3.5.9-4+srt4_i386";
       md5 = "dc095202dcca66b471d2619af7164135";
+      url = "mirror://steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxpm/libxpm4_3.5.9-4+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxpm4.deb";
       };
     }
     rec {
       name = "libxrandr2_1.3.2-2ubuntu0.3+srt1_i386";
       md5 = "659bfe8b731e831f32b047e66643ae05";
+      url = "mirror://steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.3+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxrandr/libxrandr2_1.3.2-2ubuntu0.3+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxrandr2.deb";
       };
     }
     rec {
       name = "libxrender1_0.9.6-2ubuntu0.2+srt1_i386";
       md5 = "e5ea9172d234d61d6a31d86465428b05";
+      url = "mirror://steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt1_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxrender/libxrender1_0.9.6-2ubuntu0.2+srt1_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxrender1.deb";
       };
     }
     rec {
       name = "libxss1_1.2.1-2+srt4_i386";
       md5 = "83aeab12e6c75d38be99d9df3ad1b632";
+      url = "mirror://steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxss/libxss1_1.2.1-2+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxss1.deb";
       };
     }
     rec {
       name = "libxt6_1.1.1-2ubuntu0.1+srt4_i386";
       md5 = "a15335885d70016c10c88b20e65ac677";
+      url = "mirror://steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxt/libxt6_1.1.1-2ubuntu0.1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxt6.deb";
       };
     }
     rec {
       name = "libxtst6_1.2.0-4ubuntu0.1+srt4_i386";
       md5 = "60cf7b25685a4bce2bbf031778831468";
+      url = "mirror://steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxtst/libxtst6_1.2.0-4ubuntu0.1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxtst6.deb";
       };
     }
     rec {
       name = "libxxf86vm1_1.1.1-2ubuntu0.1+srt4_i386";
       md5 = "7b97be0b67b400eba70eec57f50a92ac";
+      url = "mirror://steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/libx/libxxf86vm/libxxf86vm1_1.1.1-2ubuntu0.1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "libxxf86vm1.deb";
       };
     }
     rec {
       name = "nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_i386";
       md5 = "65ed88dfc8eaa02cd5373308826f540b";
+      url = "mirror://steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/n/nvidia-cg-toolkit/nvidia-cg-toolkit_3.0.0016-0ubuntu1+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "nvidia-cg-toolkit.deb";
       };
     }
     rec {
       name = "zenity_3.4.0-0ubuntu4+steamrt2+srt4_i386";
       md5 = "58ba7752e14f61f59698ce4aba860cd8";
+      url = "mirror://steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/z/zenity/zenity_3.4.0-0ubuntu4+steamrt2+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "zenity.deb";
       };
     }
     rec {
       name = "zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_i386";
       md5 = "c2c51ba06c022ea81a6af843f27b34b0";
+      url = "mirror://steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_i386.deb";
       source = fetchurl {
-        url = "http://repo.steampowered.com/steamrt/pool/main/z/zlib/zlib1g_1.2.3.4.dfsg-3ubuntu4+srt4_i386.deb";
-        inherit md5;
+        inherit url md5;
         name = "zlib1g.deb";
       };
     }
diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix
index c4ca98f02683..1de2dd9f24cc 100644
--- a/pkgs/games/steam/runtime.nix
+++ b/pkgs/games/steam/runtime.nix
@@ -9,7 +9,7 @@ let arch = if stdenv.system == "x86_64-linux" then "amd64"
     inputFile = writeText "steam-runtime.json" (builtins.toJSON input);
 
 in stdenv.mkDerivation {
-  name = "steam-runtime-20151020";
+  name = "steam-runtime-2016-02-18";
 
   nativeBuildInputs = [ python2 dpkg binutils ];
 

From 673bc7f32aaf40c6c83900b9ce883d345c668318 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Thu, 18 Feb 2016 00:59:31 +0100
Subject: [PATCH 1557/2285] go: add 1.6 compiler and packages

---
 pkgs/development/compilers/go/1.6.nix | 141 ++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  13 +++
 2 files changed, 154 insertions(+)
 create mode 100644 pkgs/development/compilers/go/1.6.nix

diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix
new file mode 100644
index 000000000000..cb1d396f50a1
--- /dev/null
+++ b/pkgs/development/compilers/go/1.6.nix
@@ -0,0 +1,141 @@
+{ stdenv, lib, fetchurl, tzdata, iana_etc, go_1_4, runCommand
+, perl, which, pkgconfig, patch
+, pcre
+, Security, Foundation }:
+
+let
+  goBootstrap = runCommand "go-bootstrap" {} ''
+    mkdir $out
+    cp -rf ${go_1_4}/* $out/
+    chmod -R u+w $out
+    find $out -name "*.c" -delete
+    cp -rf $out/bin/* $out/share/go/bin/
+  '';
+in
+
+stdenv.mkDerivation rec {
+  name = "go-${version}";
+  version = "1.6";
+
+  src = fetchurl {
+    url = "https://github.com/golang/go/archive/go${version}.tar.gz";
+    sha256 = "04g7w34qamgy9gqpy75xm03s8xbbslv1735iv1a06z8sphpkgs7m";
+  };
+
+  # perl is used for testing go vet
+  nativeBuildInputs = [ perl which pkgconfig patch ];
+  buildInputs = [ pcre ];
+  propagatedBuildInputs = lib.optionals stdenv.isDarwin [
+    Security Foundation
+  ];
+
+  # I'm not sure what go wants from its 'src', but the go installation manual
+  # describes an installation keeping the src.
+  preUnpack = ''
+    mkdir -p $out/share
+    cd $out/share
+  '';
+
+  prePatch = ''
+    # Ensure that the source directory is named go
+    cd ..
+    if [ ! -d go ]; then
+      mv * go
+    fi
+
+    cd go
+    patchShebangs ./ # replace /bin/bash
+
+    # Disabling the 'os/http/net' tests (they want files not available in
+    # chroot builds)
+    rm src/net/{listen,parse}_test.go
+    rm src/syscall/exec_linux_test.go
+    # !!! substituteInPlace does not seems to be effective.
+    # The os test wants to read files in an existing path. Just don't let it be /usr/bin.
+    sed -i 's,/usr/bin,'"`pwd`", src/os/os_test.go
+    sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go
+    # Disable the unix socket test
+    sed -i '/TestShutdownUnix/areturn' src/net/net_test.go
+    # Disable the hostname test
+    sed -i '/TestHostname/areturn' src/os/os_test.go
+    # ParseInLocation fails the test
+    sed -i '/TestParseInSydney/areturn' src/time/format_test.go
+    # Remove the api check as it never worked
+    sed -i '/src\/cmd\/api\/run.go/ireturn nil' src/cmd/dist/test.go
+    # Remove the coverage test as we have removed this utility
+    sed -i '/TestCoverageWithCgo/areturn' src/cmd/go/go_test.go
+
+    sed -i 's,/etc/protocols,${iana_etc}/etc/protocols,' src/net/lookup_unix.go
+    sed -i 's,/etc/services,${iana_etc}/etc/services,' src/net/port_unix.go
+  '' + lib.optionalString stdenv.isLinux ''
+    sed -i 's,/usr/share/zoneinfo/,${tzdata}/share/zoneinfo/,' src/time/zoneinfo_unix.go
+  '' + lib.optionalString stdenv.isDarwin ''
+    substituteInPlace src/race.bash --replace \
+      "sysctl machdep.cpu.extfeatures | grep -qv EM64T" true
+    sed -i 's,strings.Contains(.*sysctl.*,true {,' src/cmd/dist/util.go
+    sed -i 's,"/etc","'"$TMPDIR"'",' src/os/os_test.go
+    sed -i 's,/_go_os_test,'"$TMPDIR"'/_go_os_test,' src/os/path_test.go
+    sed -i '/TestCgoLookupIP/areturn' src/net/cgo_unix_test.go
+    sed -i '/TestChdirAndGetwd/areturn' src/os/os_test.go
+    sed -i '/TestRead0/areturn' src/os/os_test.go
+    sed -i '/TestNohup/areturn' src/os/signal/signal_test.go
+    sed -i '/TestSystemRoots/areturn' src/crypto/x509/root_darwin_test.go
+
+    sed -i '/TestGoInstallRebuildsStalePackagesInOtherGOPATH/areturn' src/cmd/go/go_test.go
+    sed -i '/TestBuildDashIInstallsDependencies/areturn' src/cmd/go/go_test.go
+
+    sed -i '/TestDisasmExtld/areturn' src/cmd/objdump/objdump_test.go
+
+    touch $TMPDIR/group $TMPDIR/hosts $TMPDIR/passwd
+  '';
+
+  patches = [
+    ./cacert-1.5.patch
+    ./remove-tools-1.5.patch
+  ]
+  # -ldflags=-s is required to compile on Darwin, see
+  # https://github.com/golang/go/issues/11994
+  ++ stdenv.lib.optional stdenv.isDarwin ./strip.patch;
+
+  GOOS = if stdenv.isDarwin then "darwin" else "linux";
+  GOARCH = if stdenv.isDarwin then "amd64"
+           else if stdenv.system == "i686-linux" then "386"
+           else if stdenv.system == "x86_64-linux" then "amd64"
+           else if stdenv.isArm then "arm"
+           else throw "Unsupported system";
+  GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5";
+  GO386 = 387; # from Arch: don't assume sse2 on i686
+  CGO_ENABLED = 1;
+  GOROOT_BOOTSTRAP = "${goBootstrap}/share/go";
+
+  # The go build actually checks for CC=*/clang and does something different, so we don't
+  # just want the generic `cc` here.
+  CC = if stdenv.isDarwin then "clang" else "cc";
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    export GOROOT="$(pwd)/"
+    export GOBIN="$out/bin"
+    export PATH="$GOBIN:$PATH"
+    cd ./src
+    echo Building
+    ./all.bash
+  '';
+
+  preFixup = ''
+    rm -r $out/share/go/pkg/bootstrap
+  '';
+
+  setupHook = ./setup-hook.sh;
+
+  disallowedReferences = [ go_1_4 ];
+
+  meta = with stdenv.lib; {
+    branch = "1.6";
+    homepage = http://golang.org/;
+    description = "The Go Programming language";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ cstrahan wkennington ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44c42e012a40..8c758d536c5b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4293,6 +4293,10 @@ let
     inherit (darwin.apple_sdk.frameworks) Security Foundation;
   };
 
+  go_1_6 = callPackage ../development/compilers/go/1.6.nix {
+    inherit (darwin.apple_sdk.frameworks) Security Foundation;
+  };
+
   go = go_1_5;
 
   go-repo-root = goPackages.go-repo-root.bin // { outputs = [ "bin" ]; };
@@ -9114,6 +9118,15 @@ let
     overrides = (config.goPackageOverrides or (p: {})) pkgs;
   };
 
+  go16Packages = callPackage ./go-packages.nix {
+    go = go_1_6;
+    buildGoPackage = callPackage ../development/go-modules/generic {
+      go = go_1_6;
+      govers = go16Packages.govers.bin;
+    };
+    overrides = (config.goPackageOverrides or (p: {})) pkgs;
+  };
+
   goPackages = go15Packages;
 
   ### DEVELOPMENT / LISP MODULES

From 26109869917c99191bef2a8c438f1e7833ad9fa2 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Thu, 18 Feb 2016 11:53:40 +0100
Subject: [PATCH 1558/2285] chromium/plugins: use jshon for extracting the
 Flash version from JSON

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

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index 157ddf379c23..c3b294876c87 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -1,4 +1,5 @@
 { stdenv
+, jshon
 , enablePepperFlash ? false
 , enableWideVine ? false
 
@@ -83,9 +84,7 @@ let
       wvModule = "@widevine@/lib/libwidevinecdmadapter.so";
       wvInfo = "#${wvName}#${wvDescription};${wvMimeTypes}";
     in ''
-      flashVersion="$(
-        sed -n -r 's/.*"version": "([^"]+)",.*/\1/p' PepperFlash/manifest.json
-      )"
+      flashVersion="$(${jshon}/bin/jshon -F PepperFlash/manifest.json -e version -u)"
 
       install -vD PepperFlash/libpepflashplayer.so \
         "$flash/lib/libpepflashplayer.so"

From 54a29f2fca0bbf2387752f3300447a21a32baa9c Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Thu, 21 Jan 2016 10:41:09 +0800
Subject: [PATCH 1559/2285] ugarit: init at 2.0

---
 pkgs/tools/backup/ugarit/default.nix |  41 +++
 pkgs/tools/backup/ugarit/eggs.nix    | 486 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |   2 +
 3 files changed, 529 insertions(+)
 create mode 100644 pkgs/tools/backup/ugarit/default.nix
 create mode 100644 pkgs/tools/backup/ugarit/eggs.nix

diff --git a/pkgs/tools/backup/ugarit/default.nix b/pkgs/tools/backup/ugarit/default.nix
new file mode 100644
index 000000000000..56da9a810208
--- /dev/null
+++ b/pkgs/tools/backup/ugarit/default.nix
@@ -0,0 +1,41 @@
+{ pkgs, stdenv, eggDerivation, fetchegg }:
+let
+  eggs = import ./eggs.nix { inherit pkgs stdenv eggDerivation fetchegg; };
+in with pkgs; eggDerivation rec {
+  pname = "ugarit";
+  version = "2.0";
+  name = "${pname}-${version}";
+
+  src = fetchegg {
+    inherit version;
+    name = pname;
+    sha256 = "1l5zkr6b8l5dw9p5mimbva0ncqw1sbvp3d4cywm1hqx2m03a0f1n";
+  };
+
+  buildInputs = with eggs; [
+    aes
+    crypto-tools
+    matchable
+    message-digest
+    miscmacros
+    parley
+    pathname-expand
+    posix-extras
+    regex
+    sha2
+    sql-de-lite
+    srfi-37
+    ssql
+    stty
+    tiger-hash
+    z3
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://www.kitten-technologies.co.uk/project/ugarit/;
+    description = "A backup/archival system based around content-addressible storage";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.ebzzry ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/backup/ugarit/eggs.nix b/pkgs/tools/backup/ugarit/eggs.nix
new file mode 100644
index 000000000000..25260674f1f3
--- /dev/null
+++ b/pkgs/tools/backup/ugarit/eggs.nix
@@ -0,0 +1,486 @@
+{ pkgs, stdenv, eggDerivation, fetchegg }:
+rec {
+  aes = eggDerivation {
+    name = "aes-1.3";
+
+    src = fetchegg {
+      name = "aes";
+      version = "1.3";
+      sha256 = "0zhkqdms2f9if1j5v8myay2mfiislvpj3bcqawb4s4dw0qcp20kb";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  blob-utils = eggDerivation {
+    name = "blob-utils-1.0.3";
+
+    src = fetchegg {
+      name = "blob-utils";
+      version = "1.0.3";
+      sha256 = "17vdn02fnxnjx5ixgqimln93lqvzyq4y9w02fw7xnbdcjzqm0xml";
+    };
+
+    buildInputs = [
+      setup-helper
+      string-utils
+    ];
+  };
+
+  check-errors = eggDerivation {
+    name = "check-errors-1.13.0";
+
+    src = fetchegg {
+      name = "check-errors";
+      version = "1.13.0";
+      sha256 = "12a0sn82n98jybh72zb39fdddmr5k4785xglxb16750fhy8rmjwi";
+    };
+
+    buildInputs = [
+      setup-helper
+    ];
+  };
+
+  crypto-tools = eggDerivation {
+    name = "crypto-tools-1.3";
+
+    src = fetchegg {
+      name = "crypto-tools";
+      version = "1.3";
+      sha256 = "0442wly63zis19vh8xc9nhxgp9sabaccxylpzmchd5f1d48iag65";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  foreigners = eggDerivation {
+    name = "foreigners-1.4.1";
+
+    src = fetchegg {
+      name = "foreigners";
+      version = "1.4.1";
+      sha256 = "07nvyadhkd52q0kkvch1a5d7ivpmrhmyg295s4mxb1nw4wz46gfz";
+    };
+
+    buildInputs = [
+      matchable
+    ];
+  };
+
+  lookup-table = eggDerivation {
+    name = "lookup-table-1.13.5";
+
+    src = fetchegg {
+      name = "lookup-table";
+      version = "1.13.5";
+      sha256 = "1nzly6rhynawlvzlyilk8z8cxz57cf9n5iv20glkhh28pz2izmrb";
+    };
+
+    buildInputs = [
+      setup-helper
+      check-errors
+      miscmacros
+      record-variants
+      synch
+    ];
+  };
+
+  lru-cache = eggDerivation {
+    name = "lru-cache-0.5.3";
+
+    src = fetchegg {
+      name = "lru-cache";
+      version = "0.5.3";
+      sha256 = "0z6g3106c4j21v968hfzy9nnbfq2d83y0nyd20aifpq4g55c0d40";
+    };
+
+    buildInputs = [
+      record-variants
+    ];
+  };
+
+  matchable = eggDerivation {
+    name = "matchable-3.3";
+
+    src = fetchegg {
+      name = "matchable";
+      version = "3.3";
+      sha256 = "07y3lpzgm4djiwi9y2adc796f9kwkmdr28fkfkw65syahdax8990";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  message-digest = eggDerivation {
+    name = "message-digest-3.1.0";
+
+    src = fetchegg {
+      name = "message-digest";
+      version = "3.1.0";
+      sha256 = "1w6bax19dwgih78vcimiws0rja7qsd8hmbm6qqg2hf9cw3vab21s";
+    };
+
+    buildInputs = [
+      setup-helper
+      miscmacros
+      check-errors
+      variable-item
+      blob-utils
+      string-utils
+    ];
+  };
+
+  miscmacros = eggDerivation {
+    name = "miscmacros-2.96";
+
+    src = fetchegg {
+      name = "miscmacros";
+      version = "2.96";
+      sha256 = "1ajdgjrni10i2hmhcp4rawnxajjxry3kmq1krdmah4sf0kjrgajc";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  parley = eggDerivation {
+    name = "parley-0.9.2";
+
+    src = fetchegg {
+      name = "parley";
+      version = "0.9.2";
+      sha256 = "1vsbx4dk1240gzq02slzmavd1jrq04qj7ssnvg15h8xh81xwhbbz";
+    };
+
+    buildInputs = [
+      stty
+      srfi-71
+      miscmacros
+    ];
+  };
+
+  pathname-expand = eggDerivation {
+    name = "pathname-expand-0.1";
+
+    src = fetchegg {
+      name = "pathname-expand";
+      version = "0.1";
+      sha256 = "14llya7l04z49xpi3iylk8aglrw968vy304ymavhhqlyzmzwkx3g";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  posix-extras = eggDerivation {
+    name = "posix-extras-0.1.6";
+
+    src = fetchegg {
+      name = "posix-extras";
+      version = "0.1.6";
+      sha256 = "0gnmhn2l0161ham7f8i0lx1ay94ap8l8l7ga4nw9qs86lk024abi";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  record-variants = eggDerivation {
+    name = "record-variants-0.5.1";
+
+    src = fetchegg {
+      name = "record-variants";
+      version = "0.5.1";
+      sha256 = "15wgysxkm8m4hx9nhhw9akchzipdnqc7yj3qd3zn0z7sxg4sld1h";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  regex = eggDerivation {
+    name = "regex-1.0";
+
+    src = fetchegg {
+      name = "regex";
+      version = "1.0";
+      sha256 = "1z9bh7xvab6h5cdlsz8jk02pv5py1i6ryqarbcs3wdgkkjgmmkif";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  setup-helper = eggDerivation {
+    name = "setup-helper-1.5.5";
+
+    src = fetchegg {
+      name = "setup-helper";
+      version = "1.5.5";
+      sha256 = "1lpplp8f2wyc486dd98gs4wl1kkhh1cs6vdqkxrdk7f92ikmwbx3";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  sha2 = eggDerivation {
+    name = "sha2-3.1.0";
+
+    src = fetchegg {
+      name = "sha2";
+      version = "3.1.0";
+      sha256 = "01ch290f2kcv1yv8spjdaqwipl80vvgpqc4divsj3vxckvgkawq2";
+    };
+
+    buildInputs = [
+      message-digest
+    ];
+  };
+
+  sql-de-lite = eggDerivation {
+    name = "sql-de-lite-0.6.6";
+
+    src = fetchegg {
+      name = "sql-de-lite";
+      version = "0.6.6";
+      sha256 = "1mh3hpsibq2gxcpjaycqa4ckznj268xpfzsa6pn0i6iac6my3qra";
+    };
+
+    buildInputs = [
+      lru-cache
+      foreigners
+    ];
+  };
+
+  srfi-37 = eggDerivation {
+    name = "srfi-37-1.3.1";
+
+    src = fetchegg {
+      name = "srfi-37";
+      version = "1.3.1";
+      sha256 = "1a2zdkdzrv15fw9dfdy8067fsgh4kr8ppffm8mc3cmlczrrd58cb";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  srfi-71 = eggDerivation {
+    name = "srfi-71-1.1";
+
+    src = fetchegg {
+      name = "srfi-71";
+      version = "1.1";
+      sha256 = "01mlaxw2lfczykmx69xki2s0f4ywlg794rl4kz07plvzn0s3fbqq";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  ssql = eggDerivation {
+    name = "ssql-0.2.2";
+
+    src = fetchegg {
+      name = "ssql";
+      version = "0.2.2";
+      sha256 = "10557ymy0fgvqqazsg2jsbqvng0b91jqcjfgsxkrq8xs3klyd5mf";
+    };
+
+    buildInputs = [
+      matchable
+    ];
+  };
+
+  string-utils = eggDerivation {
+    name = "string-utils-1.2.4";
+
+    src = fetchegg {
+      name = "string-utils";
+      version = "1.2.4";
+      sha256 = "07alvghg0dahilrm4jg44bndl0x69sv1zbna9l20cbdvi35i0jp1";
+    };
+
+    buildInputs = [
+      setup-helper
+      miscmacros
+      lookup-table
+      check-errors
+    ];
+  };
+
+  stty = eggDerivation {
+    name = "stty-0.2.6";
+
+    src = fetchegg {
+      name = "stty";
+      version = "0.2.6";
+      sha256 = "09jmjpdsd3yg6d0f0imcihmn49i28x09lgl60i2dllffs25k22s4";
+    };
+
+    buildInputs = [
+      setup-helper
+      foreigners
+    ];
+  };
+
+  synch = eggDerivation {
+    name = "synch-2.1.2";
+
+    src = fetchegg {
+      name = "synch";
+      version = "2.1.2";
+      sha256 = "1m9mnbq0m5jsxmd1a3rqpwpxj0l1b7vn1fknvxycc047pmlcyl00";
+    };
+
+    buildInputs = [
+      setup-helper
+      check-errors
+    ];
+  };
+
+  tiger-hash = eggDerivation {
+    name = "tiger-hash-3.1.0";
+
+    src = fetchegg {
+      name = "tiger-hash";
+      version = "3.1.0";
+      sha256 = "0j9dsbjp9cw0y4w4srg0qwgh53jw2v3mx4y4h040ds0fkxlzzknx";
+    };
+
+    buildInputs = [
+      message-digest
+    ];
+  };
+
+  ugarit = eggDerivation {
+    name = "ugarit-2.0";
+
+    src = fetchegg {
+      name = "ugarit";
+      version = "2.0";
+      sha256 = "1l5zkr6b8l5dw9p5mimbva0ncqw1sbvp3d4cywm1hqx2m03a0f1n";
+    };
+
+    buildInputs = [
+      miscmacros
+      sql-de-lite
+      crypto-tools
+      srfi-37
+      stty
+      matchable
+      regex
+      tiger-hash
+      message-digest
+      posix-extras
+      parley
+      ssql
+      pathname-expand
+    ];
+  };
+
+  variable-item = eggDerivation {
+    name = "variable-item-1.3.1";
+
+    src = fetchegg {
+      name = "variable-item";
+      version = "1.3.1";
+      sha256 = "19b3mhb8kr892sz9yyzq79l0vv28dgilw9cf415kj6aq16yp4d5n";
+    };
+
+    buildInputs = [
+      setup-helper
+      check-errors
+    ];
+  };
+
+  bind = eggDerivation {
+    name = "bind-1.5.2";
+
+    src = fetchegg {
+      name = "bind";
+      version = "1.5.2";
+      sha256 = "1x768k7dlfmkvgaf2idiaaqqgnqdnif5yb7ib6a6zndacbwz9jps";
+    };
+
+    buildInputs = [
+      silex
+      matchable
+      coops
+      regex
+      make
+    ];
+  };
+
+  coops = eggDerivation {
+    name = "coops-1.93";
+
+    src = fetchegg {
+      name = "coops";
+      version = "1.93";
+      sha256 = "0mrkk7pmn9r691svzm4113mn0xsk36zi3f15m86n29a6c7897php";
+    };
+
+    buildInputs = [
+      matchable
+      record-variants
+    ];
+  };
+
+  make = eggDerivation {
+    name = "make-1.8";
+
+    src = fetchegg {
+      name = "make";
+      version = "1.8";
+      sha256 = "1w6xsjyapi2x8dv21dpidkyw1kjfsbasddn554xx561pi3i0yv9h";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  silex = eggDerivation {
+    name = "silex-1.4";
+
+    src = fetchegg {
+      name = "silex";
+      version = "1.4";
+      sha256 = "17x7f07aa3qnay3bhjr7knjivhycs54j97jyv3gjs1h8qnp63g00";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  z3 = eggDerivation {
+    name = "z3-1.44";
+
+    src = fetchegg {
+      name = "z3";
+      version = "1.44";
+      sha256 = "16ayp4zkgm332q4bmjj22acqg197aqp6d8ifyyjj205iv6k0f3x4";
+    };
+
+    buildInputs = [
+      bind
+    ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 88cfc2dbba9b..94eff4273ee3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3549,6 +3549,8 @@ let
 
   xxkb = callPackage ../applications/misc/xxkb { };
 
+  ugarit = callPackage ../tools/backup/ugarit { };
+
   unarj = callPackage ../tools/archivers/unarj { };
 
   unshield = callPackage ../tools/archivers/unshield { };

From 38f06289286a1c0504b29757146d64a5ac196616 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Thu, 18 Feb 2016 16:48:59 +0100
Subject: [PATCH 1560/2285] vdirsyncer: 0.8.1 -> 0.9.0

---
 pkgs/tools/misc/vdirsyncer/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index 890186992637..df7cbc04a142 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, pythonPackages }:
 
 pythonPackages.buildPythonPackage rec {
-  version = "0.8.1";
+  version = "0.9.0";
   name = "vdirsyncer-${version}";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://pypi.python.org/packages/source/v/vdirsyncer/${name}.tar.gz";
-    sha256 = "1abflqw6x30xd2dlj58cr5n62x98kc0ia9f9vr8l64k2z1fjlq78";
+    sha256 = "0s9awjr9v60rr80xcpwmdhkf4v1yqnydahjmxwvxmh64565is465";
   };
 
   propagatedBuildInputs = with pythonPackages; [
@@ -20,6 +20,11 @@ pythonPackages.buildPythonPackage rec {
     atomicwrites
   ];
 
+  # Unfortunately, checking this package seems a bit too complex
+  # https://github.com/NixOS/nixpkgs/pull/13098#issuecomment-185914025
+  # https://github.com/untitaker/vdirsyncer/issues/334#issuecomment-185872854
+  doCheck = false;
+
   meta = with stdenv.lib; {
     homepage = https://github.com/untitaker/vdirsyncer;
     description = "Synchronize calendars and contacts";

From 4d06bf70f4580d5cb907278dd3c384c305f95c74 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 19 Feb 2016 13:12:11 +0100
Subject: [PATCH 1561/2285] buildPythonApplication: use new function for Python
 applications

---
 pkgs/applications/audio/gpodder/default.nix            |  4 ++--
 pkgs/applications/audio/gtklick/default.nix            |  2 +-
 pkgs/applications/audio/lastfmsubmitd/default.nix      |  2 +-
 pkgs/applications/audio/lastwatch/default.nix          |  2 +-
 pkgs/applications/audio/mimms/default.nix              |  2 +-
 pkgs/applications/audio/mopidy-gmusic/default.nix      |  2 +-
 pkgs/applications/audio/mopidy-moped/default.nix       |  2 +-
 pkgs/applications/audio/mopidy-mopify/default.nix      |  2 +-
 .../audio/mopidy-musicbox-webclient/default.nix        |  2 +-
 pkgs/applications/audio/mopidy-soundcloud/default.nix  |  2 +-
 .../audio/mopidy-spotify-tunigo/default.nix            |  2 +-
 pkgs/applications/audio/mopidy-spotify/default.nix     |  2 +-
 pkgs/applications/audio/mopidy-youtube/default.nix     |  2 +-
 pkgs/applications/audio/mopidy/default.nix             |  2 +-
 pkgs/applications/audio/picard/default.nix             |  4 ++--
 pkgs/applications/audio/pithos/default.nix             |  2 +-
 pkgs/applications/audio/quodlibet/default.nix          |  4 ++--
 pkgs/applications/audio/sonata/default.nix             |  4 ++--
 pkgs/applications/editors/leo-editor/default.nix       |  2 +-
 pkgs/applications/editors/nvpy/default.nix             |  4 ++--
 pkgs/applications/graphics/jbrout/default.nix          |  4 ++--
 pkgs/applications/graphics/mcomix/default.nix          |  4 ++--
 pkgs/applications/graphics/mirage/default.nix          |  4 ++--
 pkgs/applications/misc/bleachbit/default.nix           |  2 +-
 pkgs/applications/misc/electrum-dash/default.nix       |  4 ++--
 pkgs/applications/misc/electrum/default.nix            |  4 ++--
 pkgs/applications/misc/gramps/default.nix              |  4 ++--
 .../applications/misc/hamster-time-tracker/default.nix |  4 ++--
 pkgs/applications/misc/khal/default.nix                |  2 +-
 pkgs/applications/misc/khard/default.nix               |  2 +-
 pkgs/applications/misc/loxodo/default.nix              |  2 +-
 pkgs/applications/misc/ocropus/default.nix             |  2 +-
 pkgs/applications/misc/octoprint/default.nix           |  2 +-
 pkgs/applications/misc/octoprint/plugins.nix           |  2 +-
 pkgs/applications/misc/pdfdiff/default.nix             |  2 +-
 pkgs/applications/misc/pitz/default.nix                |  4 ++--
 pkgs/applications/misc/printrun/default.nix            |  2 +-
 pkgs/applications/misc/pytrainer/default.nix           |  2 +-
 pkgs/applications/misc/ranger/default.nix              |  4 ++--
 pkgs/applications/misc/rtv/default.nix                 |  2 +-
 pkgs/applications/misc/solaar/default.nix              |  2 +-
 pkgs/applications/misc/zscroll/default.nix             |  2 +-
 .../networking/browsers/qutebrowser/default.nix        |  4 ++--
 .../networking/feedreaders/canto-curses/default.nix    |  2 +-
 .../networking/feedreaders/canto-daemon/default.nix    |  2 +-
 .../networking/feedreaders/rawdog/default.nix          |  2 +-
 .../networking/instant-messengers/blink/default.nix    |  2 +-
 .../networking/mailreaders/mailnag/default.nix         |  4 ++--
 .../networking/mailreaders/mailpile/default.nix        |  2 +-
 pkgs/applications/office/keepnote/default.nix          |  4 ++--
 pkgs/applications/office/zim/default.nix               |  4 ++--
 pkgs/applications/science/spyder/default.nix           |  4 ++--
 .../git-and-tools/git-cola/default.nix                 |  2 +-
 .../version-management/git-review/default.nix          |  2 +-
 .../version-management/gitinspector/default.nix        |  4 ++--
 pkgs/applications/version-management/meld/default.nix  |  4 ++--
 pkgs/applications/version-management/peru/default.nix  |  2 +-
 .../version-management/rabbitvcs/default.nix           |  2 +-
 .../applications/version-management/tailor/default.nix |  2 +-
 .../version-management/tortoisehg/default.nix          |  2 +-
 pkgs/applications/video/devede/default.nix             |  4 ++--
 pkgs/applications/video/kazam/default.nix              |  2 +-
 pkgs/applications/video/key-mon/default.nix            |  4 ++--
 pkgs/applications/video/miro/default.nix               |  4 ++--
 pkgs/applications/virtualization/openstack/glance.nix  |  2 +-
 .../applications/virtualization/openstack/keystone.nix |  2 +-
 pkgs/applications/virtualization/openstack/neutron.nix |  2 +-
 pkgs/applications/virtualization/openstack/nova.nix    |  2 +-
 .../virtualization/virt-manager/default.nix            |  2 +-
 pkgs/applications/window-managers/qtile/default.nix    |  4 ++--
 pkgs/development/arduino/ino/default.nix               |  4 ++--
 .../tools/build-managers/buildbot-slave/default.nix    |  4 ++--
 .../tools/build-managers/buildbot/default.nix          |  4 ++--
 pkgs/development/tools/devpi-client/default.nix        |  2 +-
 pkgs/development/tools/grabserial/default.nix          |  4 ++--
 pkgs/development/tools/misc/nixbang/default.nix        |  2 +-
 pkgs/development/tools/misc/ycmd/default.nix           |  2 +-
 pkgs/development/tools/profiling/gprof2dot/default.nix |  2 +-
 pkgs/development/tools/winpdb/default.nix              |  4 ++--
 pkgs/games/mnemosyne/default.nix                       |  4 ++--
 pkgs/misc/frescobaldi/default.nix                      |  2 +-
 pkgs/os-specific/linux/iotop/default.nix               |  4 ++--
 pkgs/servers/matrix-synapse/default.nix                |  6 +++---
 pkgs/shells/xonsh/default.nix                          |  2 +-
 pkgs/tools/X11/arandr/default.nix                      |  2 +-
 pkgs/tools/X11/winswitch/default.nix                   |  4 ++--
 pkgs/tools/X11/xpra/default.nix                        |  4 ++--
 pkgs/tools/X11/xpra/gtk3.nix                           |  4 ++--
 pkgs/tools/admin/cli53/default.nix                     |  4 ++--
 pkgs/tools/admin/letsencrypt/default.nix               |  2 +-
 pkgs/tools/admin/simp_le/default.nix                   |  2 +-
 pkgs/tools/audio/beets/alternatives-plugin.nix         |  4 ++--
 pkgs/tools/audio/beets/default.nix                     |  6 +++---
 pkgs/tools/backup/attic/default.nix                    |  2 +-
 pkgs/tools/backup/borg/default.nix                     |  2 +-
 pkgs/tools/backup/obnam/default.nix                    |  2 +-
 pkgs/tools/backup/s3ql/default.nix                     |  2 +-
 pkgs/tools/backup/wal-e/default.nix                    |  2 +-
 pkgs/tools/compression/dtrx/default.nix                |  2 +-
 pkgs/tools/filesystems/gitfs/default.nix               |  4 ++--
 pkgs/tools/filesystems/nixpart/0.4/blivet.nix          |  4 ++--
 pkgs/tools/filesystems/nixpart/0.4/default.nix         | 10 +++++-----
 pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix     |  4 ++--
 pkgs/tools/filesystems/nixpart/0.4/pyparted.nix        |  4 ++--
 pkgs/tools/filesystems/nixpart/default.nix             |  4 ++--
 pkgs/tools/misc/apt-offline/default.nix                |  4 ++--
 pkgs/tools/misc/diffoscope/default.nix                 |  2 +-
 pkgs/tools/misc/i3minator/default.nix                  |  4 ++--
 pkgs/tools/misc/trash-cli/default.nix                  |  2 +-
 pkgs/tools/misc/vdirsyncer/default.nix                 |  2 +-
 pkgs/tools/misc/youtube-dl/default.nix                 |  4 ++--
 pkgs/tools/networking/getmail/default.nix              |  4 ++--
 pkgs/tools/networking/gmvault/default.nix              |  4 ++--
 pkgs/tools/networking/httpie/default.nix               |  2 +-
 pkgs/tools/networking/offlineimap/default.nix          |  4 ++--
 pkgs/tools/networking/p2p/tahoe-lafs/default.nix       |  2 +-
 pkgs/tools/networking/s3cmd/default.nix                |  2 +-
 pkgs/tools/networking/speedtest-cli/default.nix        |  2 +-
 pkgs/tools/networking/urlwatch/default.nix             |  2 +-
 pkgs/tools/package-management/nixops/generic.nix       |  2 +-
 pkgs/tools/package-management/nox/default.nix          |  2 +-
 pkgs/tools/package-management/python2nix/default.nix   |  2 +-
 pkgs/tools/security/fail2ban/default.nix               |  2 +-
 pkgs/tools/security/knockknock/default.nix             |  4 ++--
 pkgs/tools/security/sshuttle/default.nix               |  2 +-
 pkgs/tools/security/volatility/default.nix             |  4 ++--
 pkgs/tools/system/honcho/default.nix                   |  4 ++--
 pkgs/tools/text/grin/default.nix                       |  2 +-
 pkgs/tools/typesetting/odpdown/default.nix             |  4 ++--
 pkgs/tools/video/vnc2flv/default.nix                   |  2 +-
 pkgs/tools/virtualization/cloud-init/default.nix       |  2 +-
 pkgs/tools/virtualization/euca2ools/default.nix        |  2 +-
 pkgs/top-level/all-packages.nix                        |  6 +++---
 133 files changed, 195 insertions(+), 195 deletions(-)

diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix
index 55337bf1d3ad..7b724ca3d019 100644
--- a/pkgs/applications/audio/gpodder/default.nix
+++ b/pkgs/applications/audio/gpodder/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, fetchurl, buildPythonPackage, pythonPackages, mygpoclient, intltool
+{ stdenv, fetchurl, buildPythonApplication, pythonPackages, mygpoclient, intltool
 , ipodSupport ? true, libgpod
 , gnome3
 }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "gpodder-${version}";
   namePrefix = "";
 
diff --git a/pkgs/applications/audio/gtklick/default.nix b/pkgs/applications/audio/gtklick/default.nix
index b11e1ac0fa79..c0a137d7de92 100644
--- a/pkgs/applications/audio/gtklick/default.nix
+++ b/pkgs/applications/audio/gtklick/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages, gettext, klick}:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "gtklick-${version}";
   namePrefix = "";
   version = "0.6.4";
diff --git a/pkgs/applications/audio/lastfmsubmitd/default.nix b/pkgs/applications/audio/lastfmsubmitd/default.nix
index 314361329c75..ea182d73a5ba 100644
--- a/pkgs/applications/audio/lastfmsubmitd/default.nix
+++ b/pkgs/applications/audio/lastfmsubmitd/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "lastfmsubmitd-${version}";
   namePrefix = ""; 
   version = "1.0.6";
diff --git a/pkgs/applications/audio/lastwatch/default.nix b/pkgs/applications/audio/lastwatch/default.nix
index 2cffb0ebacf4..168a67a53f00 100644
--- a/pkgs/applications/audio/lastwatch/default.nix
+++ b/pkgs/applications/audio/lastwatch/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, pythonPackages }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "lastwatch-${version}";
   namePrefix = "";
   version = "0.4.1";
diff --git a/pkgs/applications/audio/mimms/default.nix b/pkgs/applications/audio/mimms/default.nix
index b337dbf6d821..cee3469e3f53 100644
--- a/pkgs/applications/audio/mimms/default.nix
+++ b/pkgs/applications/audio/mimms/default.nix
@@ -2,7 +2,7 @@
 
 let version = "3.2";
 in
-  pythonPackages.buildPythonPackage {
+  pythonPackages.buildPythonApplication {
     name = "mimms-${version}";
     src = fetchurl {
       url = "http://download.savannah.gnu.org/releases/mimms/mimms-${version}.tar.bz2";
diff --git a/pkgs/applications/audio/mopidy-gmusic/default.nix b/pkgs/applications/audio/mopidy-gmusic/default.nix
index 00468db767a2..6984593cd417 100644
--- a/pkgs/applications/audio/mopidy-gmusic/default.nix
+++ b/pkgs/applications/audio/mopidy-gmusic/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages, mopidy }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "mopidy-gmusic-${version}";
   version = "1.0.0";
 
diff --git a/pkgs/applications/audio/mopidy-moped/default.nix b/pkgs/applications/audio/mopidy-moped/default.nix
index 6bf73c021857..ee3134f5fd82 100644
--- a/pkgs/applications/audio/mopidy-moped/default.nix
+++ b/pkgs/applications/audio/mopidy-moped/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages, mopidy }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "mopidy-moped-${version}";
   version = "0.6.0";
 
diff --git a/pkgs/applications/audio/mopidy-mopify/default.nix b/pkgs/applications/audio/mopidy-mopify/default.nix
index b7a1fbf2f08c..abb9c50d71c5 100644
--- a/pkgs/applications/audio/mopidy-mopify/default.nix
+++ b/pkgs/applications/audio/mopidy-mopify/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages, mopidy }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "mopidy-mopify-${version}";
 
   version = "1.5.8";
diff --git a/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix b/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix
index e13a1a978fdc..b2bca838cee2 100644
--- a/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix
+++ b/pkgs/applications/audio/mopidy-musicbox-webclient/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pythonPackages, mopidy }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "mopidy-musicbox-webclient-${version}";
 
   version = "2.0.0";
diff --git a/pkgs/applications/audio/mopidy-soundcloud/default.nix b/pkgs/applications/audio/mopidy-soundcloud/default.nix
index c81de3e0d062..098812961649 100644
--- a/pkgs/applications/audio/mopidy-soundcloud/default.nix
+++ b/pkgs/applications/audio/mopidy-soundcloud/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pythonPackages, mopidy }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "mopidy-soundcloud-${version}";
 
   version = "2.0.2";
diff --git a/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix b/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix
index ab07b0f1f68e..4d7c1cb73266 100644
--- a/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix
+++ b/pkgs/applications/audio/mopidy-spotify-tunigo/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pythonPackages, mopidy, mopidy-spotify }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "mopidy-spotify-tunigo-${version}";
 
   version = "0.2.1";
diff --git a/pkgs/applications/audio/mopidy-spotify/default.nix b/pkgs/applications/audio/mopidy-spotify/default.nix
index f44f95be140c..3a717344aef5 100644
--- a/pkgs/applications/audio/mopidy-spotify/default.nix
+++ b/pkgs/applications/audio/mopidy-spotify/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages, mopidy }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "mopidy-spotify-${version}";
   version = "2.3.1";
 
diff --git a/pkgs/applications/audio/mopidy-youtube/default.nix b/pkgs/applications/audio/mopidy-youtube/default.nix
index efd1425e2554..2942cba95f0f 100644
--- a/pkgs/applications/audio/mopidy-youtube/default.nix
+++ b/pkgs/applications/audio/mopidy-youtube/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pythonPackages, mopidy }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "mopidy-youtube-${version}";
 
   version = "2.0.1";
diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix
index ae53008d58c4..29426f43de13 100644
--- a/pkgs/applications/audio/mopidy/default.nix
+++ b/pkgs/applications/audio/mopidy/default.nix
@@ -2,7 +2,7 @@
 , glib_networking, gst_plugins_good, gst_plugins_base, gst_plugins_ugly
 }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "mopidy-${version}";
 
   version = "1.1.2";
diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix
index df76b8073b66..2373bbc549d5 100644
--- a/pkgs/applications/audio/picard/default.nix
+++ b/pkgs/applications/audio/picard/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, buildPythonPackage, fetchurl, gettext
+{ stdenv, buildPythonApplication, fetchurl, gettext
 , pkgconfig, libofa, ffmpeg, chromaprint
 , pyqt4, mutagen, python-libdiscid
 }:
 
 let version = "1.3.2"; in
-buildPythonPackage {
+buildPythonApplication {
   name = "picard-${version}";
   namePrefix = "";
 
diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/applications/audio/pithos/default.nix
index 4095d672f828..1083f9434a94 100644
--- a/pkgs/applications/audio/pithos/default.nix
+++ b/pkgs/applications/audio/pithos/default.nix
@@ -1,7 +1,7 @@
 { fetchFromGitHub, stdenv, pythonPackages, gtk3, gobjectIntrospection, libnotify
 , gst_all_1, wrapGAppsHook }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   pname = "pithos";
   version = "1.1.2";
   name = "${pname}-${version}";
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index 38c679d7a3e4..56ec04611023 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, buildPythonPackage, mutagen, pygtk, pygobject, intltool
+{ stdenv, fetchurl, python, buildPythonApplication, mutagen, pygtk, pygobject, intltool
 , pythonDBus, gst_python, withGstPlugins ? false, gst_plugins_base ? null
 , gst_plugins_good ? null, gst_plugins_ugly ? null, gst_plugins_bad ? null }:
 
@@ -9,7 +9,7 @@ assert withGstPlugins -> gst_plugins_base != null
 
 let version = "2.6.3"; in
 
-buildPythonPackage {
+buildPythonApplication {
   # call the package quodlibet and just quodlibet
   name = "quodlibet-${version}"
          + stdenv.lib.optionalString withGstPlugins "-with-gst-plugins";
diff --git a/pkgs/applications/audio/sonata/default.nix b/pkgs/applications/audio/sonata/default.nix
index 74ce6a2c15f0..e23a54043682 100644
--- a/pkgs/applications/audio/sonata/default.nix
+++ b/pkgs/applications/audio/sonata/default.nix
@@ -1,11 +1,11 @@
 { pkgs, stdenv, fetchFromGitHub, pkgconfig, intltool, wrapGAppsHook,
-  python, buildPythonPackage, isPy3k,
+  python, buildPythonApplication, isPy3k,
   gnome3, gtk3, gobjectIntrospection,
   dbus, pygobject3, mpd2 }:
 
 with pkgs.lib;
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "sonata-${version}";
   version = "1.7b1";
   namePrefix = "";
diff --git a/pkgs/applications/editors/leo-editor/default.nix b/pkgs/applications/editors/leo-editor/default.nix
index 597f9148564b..6f540d1d74ad 100644
--- a/pkgs/applications/editors/leo-editor/default.nix
+++ b/pkgs/applications/editors/leo-editor/default.nix
@@ -1,6 +1,6 @@
 { stdenv, pythonPackages, fetchgit }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "leo-editor-${version}";
   namePrefix = "";
   version = "5.1";
diff --git a/pkgs/applications/editors/nvpy/default.nix b/pkgs/applications/editors/nvpy/default.nix
index 29402f3b3d80..a6dd7bcb4033 100644
--- a/pkgs/applications/editors/nvpy/default.nix
+++ b/pkgs/applications/editors/nvpy/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, fetchurl, tk, buildPythonPackage, pythonPackages }:
+{ pkgs, fetchurl, tk, buildPythonApplication, pythonPackages }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   version = "0.9.2";
   name = "nvpy-${version}";
 
diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix
index e37c2c283e47..8d6c15129cb3 100644
--- a/pkgs/applications/graphics/jbrout/default.nix
+++ b/pkgs/applications/graphics/jbrout/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchsvn, buildPythonPackage, python, pyGtkGlade, makeWrapper, pyexiv2,  pythonPackages, fbida, which }:
+{ stdenv, fetchsvn, buildPythonApplication, python, pyGtkGlade, makeWrapper, pyexiv2,  pythonPackages, fbida, which }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "jbrout-${version}";
   version = "338";
 
diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix
index 069a4bace286..39d17a32eec3 100644
--- a/pkgs/applications/graphics/mcomix/default.nix
+++ b/pkgs/applications/graphics/mcomix/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, buildPythonPackage, python27Packages }:
+{ stdenv, fetchurl, buildPythonApplication, python27Packages }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
     namePrefix = "";
     name = "mcomix-1.01";
 
diff --git a/pkgs/applications/graphics/mirage/default.nix b/pkgs/applications/graphics/mirage/default.nix
index c4b14388d1ba..c3f06544bb4a 100644
--- a/pkgs/applications/graphics/mirage/default.nix
+++ b/pkgs/applications/graphics/mirage/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, buildPythonPackage, python, pygtk, pillow, libX11, gettext }:
+{ stdenv, fetchurl, buildPythonApplication, python, pygtk, pillow, libX11, gettext }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
     namePrefix = "";
     name = "mirage-0.9.5.2";
 
diff --git a/pkgs/applications/misc/bleachbit/default.nix b/pkgs/applications/misc/bleachbit/default.nix
index 511455ba6bb0..cfab4195a09b 100644
--- a/pkgs/applications/misc/bleachbit/default.nix
+++ b/pkgs/applications/misc/bleachbit/default.nix
@@ -1,5 +1,5 @@
 { stdenv, pythonPackages, fetchurl }:
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "bleachbit-${version}";
   version = "1.8";
 
diff --git a/pkgs/applications/misc/electrum-dash/default.nix b/pkgs/applications/misc/electrum-dash/default.nix
index f046ecc9bf2d..7b1bdef4eb59 100644
--- a/pkgs/applications/misc/electrum-dash/default.nix
+++ b/pkgs/applications/misc/electrum-dash/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, buildPythonPackage, pythonPackages, slowaes }:
+{ stdenv, fetchurl, buildPythonApplication, pythonPackages, slowaes }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "electrum-dash-${version}";
   version = "2.4.1";
 
diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 632ae689f31f..6025fce776c7 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, buildPythonPackage, pythonPackages, slowaes }:
+{ stdenv, fetchurl, buildPythonApplication, pythonPackages, slowaes }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "electrum-${version}";
   version = "2.5.4";
 
diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix
index 31cdb8d17863..79393eee7f11 100644
--- a/pkgs/applications/misc/gramps/default.nix
+++ b/pkgs/applications/misc/gramps/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gtk3, pythonPackages, python, pycairo, pygobject3, intltool,
   pango, gsettings_desktop_schemas }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   version = "4.1.1";
   name = "gramps-${version}";
   namePrefix = "";
@@ -18,7 +18,7 @@ pythonPackages.buildPythonPackage rec {
 
   pythonPath = [ pygobject3 pango pycairo pythonPackages.bsddb ];
 
-  # Same installPhase as in buildPythonPackage but without --old-and-unmanageble
+  # Same installPhase as in buildPythonApplication but without --old-and-unmanageble
   # install flag.
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/applications/misc/hamster-time-tracker/default.nix b/pkgs/applications/misc/hamster-time-tracker/default.nix
index 52298e6c297b..1732a7e1fb07 100644
--- a/pkgs/applications/misc/hamster-time-tracker/default.nix
+++ b/pkgs/applications/misc/hamster-time-tracker/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchzip, buildPythonPackage, docbook2x, libxslt, gnome_doc_utils
+{ stdenv, fetchzip, buildPythonApplication, docbook2x, libxslt, gnome_doc_utils
 , intltool, dbus_glib, pygobject, pygtk, pyxdg, gnome_python, dbus, sqlite3
 , hicolor_icon_theme
 }:
@@ -8,7 +8,7 @@
 #
 #   WARNING:root:Could not import wnck - workspace tracking will be disabled
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "hamster-time-tracker-1.04";
   namePrefix = "";
 
diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 22610c853e3b..52a4f0dee753 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgs, pythonPackages }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   version = "0.7.0";
   name = "khal-${version}";
 
diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 0c88314ed02e..dae5ea4075f8 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pkgs, pythonPackages }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   version = "0.8.1";
   name = "khard-${version}";
   namePrefix = "";
diff --git a/pkgs/applications/misc/loxodo/default.nix b/pkgs/applications/misc/loxodo/default.nix
index 05d29ce7e09d..f4243285e8e6 100644
--- a/pkgs/applications/misc/loxodo/default.nix
+++ b/pkgs/applications/misc/loxodo/default.nix
@@ -3,7 +3,7 @@ let
   py = python27Packages;
   python = py.python;
 in
-py.buildPythonPackage rec {
+py.buildPythonApplication rec {
   name = "loxodo-0.20150124";
 
   src = fetchgit {
diff --git a/pkgs/applications/misc/ocropus/default.nix b/pkgs/applications/misc/ocropus/default.nix
index 0e6b13f9a288..7e066fbc5919 100644
--- a/pkgs/applications/misc/ocropus/default.nix
+++ b/pkgs/applications/misc/ocropus/default.nix
@@ -17,7 +17,7 @@ let
   ];
 
 in
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "ocropus-${version}";
   version = "20150316";
 
diff --git a/pkgs/applications/misc/octoprint/default.nix b/pkgs/applications/misc/octoprint/default.nix
index 3e8b35ba4350..67b351ba906e 100644
--- a/pkgs/applications/misc/octoprint/default.nix
+++ b/pkgs/applications/misc/octoprint/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pythonPackages }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "OctoPrint-${version}";
   version = "1.2.9";
 
diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 801be43220d9..829ae11fc7e3 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchFromGitHub, octoprint, pythonPackages }:
 
 let
-  buildPlugin = args: pythonPackages.buildPythonPackage (args // {
+  buildPlugin = args: pythonPackages.buildPythonApplication (args // {
     buildInputs = (args.buildInputs or []) ++ [ octoprint ];
   });
 in {
diff --git a/pkgs/applications/misc/pdfdiff/default.nix b/pkgs/applications/misc/pdfdiff/default.nix
index 43b980353439..90149263644d 100644
--- a/pkgs/applications/misc/pdfdiff/default.nix
+++ b/pkgs/applications/misc/pdfdiff/default.nix
@@ -2,7 +2,7 @@
 let
   py = pythonPackages;
 in
-py.buildPythonPackage rec {
+py.buildPythonApplication rec {
   name = "pdfdiff-${version}";
   version = "0.92";
 
diff --git a/pkgs/applications/misc/pitz/default.nix b/pkgs/applications/misc/pitz/default.nix
index e4f097469a49..1eb65a59470b 100644
--- a/pkgs/applications/misc/pitz/default.nix
+++ b/pkgs/applications/misc/pitz/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, tempita, jinja2, pyyaml, clepy, mock
+{ stdenv, fetchurl, buildPythonApplication, tempita, jinja2, pyyaml, clepy, mock
 , nose, decorator, docutils
 }:
 
@@ -11,7 +11,7 @@
 # pitz-shell is not the primary interface, so it is not critical to have it
 # working. Concider fixing pitz upstream.
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "pitz-1.2.4";
   namePrefix = "";
 
diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix
index 7420441850b6..27a55f4464f2 100644
--- a/pkgs/applications/misc/printrun/default.nix
+++ b/pkgs/applications/misc/printrun/default.nix
@@ -1,6 +1,6 @@
 { stdenv, python27Packages, fetchFromGitHub }:
 
-python27Packages.buildPythonPackage rec {
+python27Packages.buildPythonApplication rec {
   name = "printrun-20150310";
 
   src = fetchFromGitHub {
diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix
index 2f731fea1b0d..bc6b4e16a378 100644
--- a/pkgs/applications/misc/pytrainer/default.nix
+++ b/pkgs/applications/misc/pytrainer/default.nix
@@ -11,7 +11,7 @@ let
 
 in
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "pytrainer-${version}";
   version = "1.10.0";
 
diff --git a/pkgs/applications/misc/ranger/default.nix b/pkgs/applications/misc/ranger/default.nix
index 19a0582a79ca..14ae58a29327 100644
--- a/pkgs/applications/misc/ranger/default.nix
+++ b/pkgs/applications/misc/ranger/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, buildPythonPackage, python, w3m, file }:
+{ stdenv, fetchurl, buildPythonApplication, python, w3m, file }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "ranger-1.7.2";
 
   meta = {
diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix
index 2126ce23d3a0..68097c2e2544 100644
--- a/pkgs/applications/misc/rtv/default.nix
+++ b/pkgs/applications/misc/rtv/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pkgs, lib, python, pythonPackages }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   version = "1.8.0";
   name = "rtv-${version}";
 
diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix
index 9a199c7ee499..55153d25cf98 100644
--- a/pkgs/applications/misc/solaar/default.nix
+++ b/pkgs/applications/misc/solaar/default.nix
@@ -1,5 +1,5 @@
 {fetchurl, stdenv, gtk3, python34Packages, gobjectIntrospection}:
-python34Packages.buildPythonPackage rec {
+python34Packages.buildPythonApplication rec {
   name = "solaar-${version}";
   version = "0.9.2";
   namePrefix = "";
diff --git a/pkgs/applications/misc/zscroll/default.nix b/pkgs/applications/misc/zscroll/default.nix
index 91e6c33310dc..4d9197c8fd44 100644
--- a/pkgs/applications/misc/zscroll/default.nix
+++ b/pkgs/applications/misc/zscroll/default.nix
@@ -2,7 +2,7 @@
 
 let version = "1.0"; in
 
-python3Packages.buildPythonPackage {
+python3Packages.buildPythonApplication {
   name = "zscroll-${version}";
   # don't prefix with python version
   namePrefix = "";
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 61b02d2a6394..1be28829e351 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -1,10 +1,10 @@
-{ stdenv, fetchurl, python, buildPythonPackage, qtmultimedia, pyqt5
+{ stdenv, fetchurl, python, buildPythonApplication, qtmultimedia, pyqt5
 , jinja2, pygments, pyyaml, pypeg2, gst-plugins-base, gst-plugins-good
 , gst-plugins-bad, gst-libav, wrapGAppsHook, glib_networking }:
 
 let version = "0.5.1"; in
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "qutebrowser-${version}";
   namePrefix = "";
 
diff --git a/pkgs/applications/networking/feedreaders/canto-curses/default.nix b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
index 8db1dac3b4b6..37736d6edd78 100644
--- a/pkgs/applications/networking/feedreaders/canto-curses/default.nix
+++ b/pkgs/applications/networking/feedreaders/canto-curses/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, python34Packages, readline, ncurses, canto-daemon }:
 
-python34Packages.buildPythonPackage rec {
+python34Packages.buildPythonApplication rec {
   version = "0.9.6";
   name = "canto-curses-${version}";
 
diff --git a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
index 0de38c259a34..b6f0ff19dc33 100644
--- a/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
+++ b/pkgs/applications/networking/feedreaders/canto-daemon/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, python34Packages, }:
 
-python34Packages.buildPythonPackage rec {
+python34Packages.buildPythonApplication rec {
   version = "0.9.5";
   name = "canto-daemon-${version}";
   namePrefix = "";
diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix
index e5e8f823d277..eca53ccf2ec0 100644
--- a/pkgs/applications/networking/feedreaders/rawdog/default.nix
+++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "rawdog-${version}";
   version = "2.21";
 
diff --git a/pkgs/applications/networking/instant-messengers/blink/default.nix b/pkgs/applications/networking/instant-messengers/blink/default.nix
index 9c75af2c77f5..7b0e4d70fd93 100644
--- a/pkgs/applications/networking/instant-messengers/blink/default.nix
+++ b/pkgs/applications/networking/instant-messengers/blink/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pythonPackages, pyqt4, cython, libvncserver, zlib, twisted
 , gnutls, libvpx }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "blink-${version}";
   version = "1.4.2";
   
diff --git a/pkgs/applications/networking/mailreaders/mailnag/default.nix b/pkgs/applications/networking/mailreaders/mailnag/default.nix
index 4818de49e42b..673856e062a8 100644
--- a/pkgs/applications/networking/mailreaders/mailnag/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailnag/default.nix
@@ -1,9 +1,9 @@
-{ stdenv, buildPythonPackage, fetchurl, gettext, gtk3, pythonPackages
+{ stdenv, buildPythonApplication, fetchurl, gettext, gtk3, pythonPackages
 , gdk_pixbuf, libnotify, gst_all_1
 , libgnome_keyring3 ? null, networkmanager ? null
 }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "mailnag-${version}";
   version = "1.1.0";
 
diff --git a/pkgs/applications/networking/mailreaders/mailpile/default.nix b/pkgs/applications/networking/mailreaders/mailpile/default.nix
index c43944dc5979..0ace6a01b3f3 100644
--- a/pkgs/applications/networking/mailreaders/mailpile/default.nix
+++ b/pkgs/applications/networking/mailreaders/mailpile/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, pythonPackages, gnupg1orig, makeWrapper, openssl }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "mailpile-${version}";
   version = "0.4.1";
 
diff --git a/pkgs/applications/office/keepnote/default.nix b/pkgs/applications/office/keepnote/default.nix
index 409da36b2640..d4790edbb3e0 100644
--- a/pkgs/applications/office/keepnote/default.nix
+++ b/pkgs/applications/office/keepnote/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, buildPythonPackage, pythonPackages, pygtk }:
+{ stdenv, fetchurl, buildPythonApplication, pythonPackages, pygtk }:
 
-buildPythonPackage {
+buildPythonApplication {
   name = "keepnote-0.7.8";
   namePrefix = "";
 
diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix
index d5163eef4d88..4d2396e8a117 100644
--- a/pkgs/applications/office/zim/default.nix
+++ b/pkgs/applications/office/zim/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, buildPythonPackage, pythonPackages, pygtk, pygobject, python }:
+{ stdenv, lib, fetchurl, buildPythonApplication, pythonPackages, pygtk, pygobject, python }:
 
 #
 # TODO: Declare configuration options for the following optional dependencies:
@@ -7,7 +7,7 @@
 #  -  pyxdg: Need to make it work first (see setupPyInstallFlags).
 #
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "zim-${version}";
   version = "0.63";
   namePrefix = "";
diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix
index 9e74a2332365..73847624e85a 100644
--- a/pkgs/applications/science/spyder/default.nix
+++ b/pkgs/applications/science/spyder/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, unzip, buildPythonPackage, makeDesktopItem
+{ stdenv, fetchurl, unzip, buildPythonApplication, makeDesktopItem
 # mandatory
 , pyside
 # recommended
@@ -7,7 +7,7 @@
 , ipython ? null, pylint ? null, pep8 ? null
 }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "spyder-${version}";
   version = "2.3.8";
   namePrefix = "";
diff --git a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
index c10ab14f6398..44a617d70e1f 100644
--- a/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-cola/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, python, pythonPackages, makeWrapper, gettext }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "git-cola-${version}";
   version = "2.2.1";
 
diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix
index fb6d542f4790..de934db5f3ba 100644
--- a/pkgs/applications/version-management/git-review/default.nix
+++ b/pkgs/applications/version-management/git-review/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages, python} :
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "git-review-${version}";
   version = "1.25.0";
 
diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix
index 43df0e5b885f..4e440d4bc6ab 100644
--- a/pkgs/applications/version-management/gitinspector/default.nix
+++ b/pkgs/applications/version-management/gitinspector/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchzip, buildPythonPackage }:
+{ stdenv, fetchzip, buildPythonApplication }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "gitinspector-${version}";
   version = "0.4.1";
   namePrefix = "";
diff --git a/pkgs/applications/version-management/meld/default.nix b/pkgs/applications/version-management/meld/default.nix
index 2f7c4af0024f..d25decf35eb6 100644
--- a/pkgs/applications/version-management/meld/default.nix
+++ b/pkgs/applications/version-management/meld/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, itstool, buildPythonPackage, python27, intltool, makeWrapper
+{ stdenv, fetchurl, itstool, buildPythonApplication, python27, intltool, makeWrapper
 , libxml2, pygobject3, gobjectIntrospection, gtk3, gnome3, pycairo, cairo
 }:
 
@@ -8,7 +8,7 @@ let
   version = "${minor}.0";
 in
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "meld-${version}";
   namePrefix = "";
 
diff --git a/pkgs/applications/version-management/peru/default.nix b/pkgs/applications/version-management/peru/default.nix
index d97aee233883..40e7d2f18838 100644
--- a/pkgs/applications/version-management/peru/default.nix
+++ b/pkgs/applications/version-management/peru/default.nix
@@ -4,7 +4,7 @@ let
   version = "0.2.3"; 
 in
 
-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonApplication rec {
   
   # Do not prefix name with python specific version identifier.
   namePrefix = "";
diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix
index 100e854f29b8..58b29c10ae36 100644
--- a/pkgs/applications/version-management/rabbitvcs/default.nix
+++ b/pkgs/applications/version-management/rabbitvcs/default.nix
@@ -1,5 +1,5 @@
 { fetchFromGitHub, lib, python2Packages, meld, subversion, gvfs, xdg_utils }:
-python2Packages.buildPythonPackage rec {
+python2Packages.buildPythonApplication rec {
   name = "rabbitvcs-${version}";
   version = "0.16";
   namePrefix = "";
diff --git a/pkgs/applications/version-management/tailor/default.nix b/pkgs/applications/version-management/tailor/default.nix
index ebc0906fc6bb..dde09dfe22d1 100644
--- a/pkgs/applications/version-management/tailor/default.nix
+++ b/pkgs/applications/version-management/tailor/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "tailor-${version}";
   version = "0.9.35";
 
diff --git a/pkgs/applications/version-management/tortoisehg/default.nix b/pkgs/applications/version-management/tortoisehg/default.nix
index 5e95b408bf7e..ec20122d0ce8 100644
--- a/pkgs/applications/version-management/tortoisehg/default.nix
+++ b/pkgs/applications/version-management/tortoisehg/default.nix
@@ -1,6 +1,6 @@
 { pkgs, lib, mercurial, pyPackages ? pkgs.python27Packages }:
 
-pkgs.buildPythonPackage rec {
+pkgs.buildPythonApplication rec {
     name = "tortoisehg-${version}";
     version = "3.6";
     namePrefix = "";
diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix
index 6520f7ac21fa..ce44377260e7 100644
--- a/pkgs/applications/video/devede/default.nix
+++ b/pkgs/applications/video/devede/default.nix
@@ -1,9 +1,9 @@
-{ pkgs, stdenv, fetchurl, pythonPackages, buildPythonPackage, pygtk, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor }:
+{ pkgs, stdenv, fetchurl, pythonPackages, buildPythonApplication, pygtk, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor }:
 
 let
   inherit (pythonPackages) dbus;
 
-in buildPythonPackage rec {
+in buildPythonApplication rec {
   name = "devede-3.23.0";
   namePrefix = "";
 
diff --git a/pkgs/applications/video/kazam/default.nix b/pkgs/applications/video/kazam/default.nix
index 17bf282a459a..7217f4746c8f 100644
--- a/pkgs/applications/video/kazam/default.nix
+++ b/pkgs/applications/video/kazam/default.nix
@@ -2,7 +2,7 @@
 , gtk3, libwnck3, keybinder, intltool, libcanberra }:
 
 
-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonApplication rec {
   name = "kazam-${version}";
   version = "1.4.3";
   namePrefix = "";
diff --git a/pkgs/applications/video/key-mon/default.nix b/pkgs/applications/video/key-mon/default.nix
index 5d1a0e4a95b6..12fc7151cd0d 100644
--- a/pkgs/applications/video/key-mon/default.nix
+++ b/pkgs/applications/video/key-mon/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, buildPythonPackage, gnome, librsvg, pygtk, pythonPackages }:
+{ stdenv, fetchurl, buildPythonApplication, gnome, librsvg, pygtk, pythonPackages }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "key-mon-${version}";
   version = "1.17";
   namePrefix = "";
diff --git a/pkgs/applications/video/miro/default.nix b/pkgs/applications/video/miro/default.nix
index 6585306b2898..66f249b8e4a5 100644
--- a/pkgs/applications/video/miro/default.nix
+++ b/pkgs/applications/video/miro/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, buildPythonPackage, pythonPackages, pkgconfig
+{ stdenv, fetchurl, python, buildPythonApplication, pythonPackages, pkgconfig
 , pyrex096, ffmpeg, boost, glib, pygobject, gtk2, webkitgtk2, libsoup, pygtk
 , taglib, sqlite, pycurl, mutagen, pycairo, pythonDBus, pywebkitgtk
 , libtorrentRasterbar, glib_networking, gsettings_desktop_schemas
@@ -10,7 +10,7 @@ assert enableBonjour -> avahi != null;
 
 with stdenv.lib;
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "miro-${version}";
   namePrefix = "";
   version = "6.0";
diff --git a/pkgs/applications/virtualization/openstack/glance.nix b/pkgs/applications/virtualization/openstack/glance.nix
index caa72f49b943..0aacbeed0550 100644
--- a/pkgs/applications/virtualization/openstack/glance.nix
+++ b/pkgs/applications/virtualization/openstack/glance.nix
@@ -1,7 +1,7 @@
 
 { stdenv, fetchurl, pythonPackages, sqlite, which, strace }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "glance-${version}";
   version = "11.0.0";
   namePrefix = "";
diff --git a/pkgs/applications/virtualization/openstack/keystone.nix b/pkgs/applications/virtualization/openstack/keystone.nix
index 3060dcb04cb3..956f3b28152d 100644
--- a/pkgs/applications/virtualization/openstack/keystone.nix
+++ b/pkgs/applications/virtualization/openstack/keystone.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages, xmlsec, which, openssl }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "keystone-${version}";
   version = "8.0.0";
   namePrefix = "";
diff --git a/pkgs/applications/virtualization/openstack/neutron.nix b/pkgs/applications/virtualization/openstack/neutron.nix
index ce44ed2913ce..0520fcfc027e 100644
--- a/pkgs/applications/virtualization/openstack/neutron.nix
+++ b/pkgs/applications/virtualization/openstack/neutron.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages, xmlsec, which, dnsmasq }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "neutron-${version}";
   version = "7.0.0";
   namePrefix = "";
diff --git a/pkgs/applications/virtualization/openstack/nova.nix b/pkgs/applications/virtualization/openstack/nova.nix
index ee139868ba09..20e250bf05cc 100644
--- a/pkgs/applications/virtualization/openstack/nova.nix
+++ b/pkgs/applications/virtualization/openstack/nova.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages, openssl, openssh }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "nova-${version}";
   version = "12.0.0";
   namePrefix = "";
diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix
index d22072f1095f..60599d18922c 100644
--- a/pkgs/applications/virtualization/virt-manager/default.nix
+++ b/pkgs/applications/virtualization/virt-manager/default.nix
@@ -7,7 +7,7 @@
 with stdenv.lib;
 with pythonPackages;
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "virt-manager-${version}";
   version = "1.3.1";
   namePrefix = "";
diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix
index 0dae8a76c77b..f2f864506d37 100644
--- a/pkgs/applications/window-managers/qtile/default.nix
+++ b/pkgs/applications/window-managers/qtile/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage, python27Packages, pkgs }:
+{ stdenv, fetchFromGitHub, buildPythonApplication, python27Packages, pkgs }:
 
 let cairocffi-xcffib = python27Packages.cairocffi.override {
     pythonPath = [ python27Packages.xcffib ];
   };
 in
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "qtile-${version}";
   version = "0.10.4";
 
diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix
index 47c7c68c1ab2..073a2339720d 100644
--- a/pkgs/development/arduino/ino/default.nix
+++ b/pkgs/development/arduino/ino/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, buildPythonPackage, pythonPackages, picocom
+{ stdenv, fetchurl, buildPythonApplication, pythonPackages, picocom
 , avrdude, arduino-core, avrgcclibc }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "ino-0.3.6";
   namePrefix = "";
 
diff --git a/pkgs/development/tools/build-managers/buildbot-slave/default.nix b/pkgs/development/tools/build-managers/buildbot-slave/default.nix
index 715b009a17ef..30fbe056926e 100644
--- a/pkgs/development/tools/build-managers/buildbot-slave/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot-slave/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildPythonPackage, fetchurl, coreutils, twisted }:
+{ stdenv, buildPythonApplication, fetchurl, coreutils, twisted }:
 
-buildPythonPackage (rec {
+buildPythonApplication (rec {
   name = "buildbot-slave-0.8.10";
   namePrefix = "";
 
diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index a7c4fb89007b..99c1352b4fb6 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, buildPythonPackage, fetchurl, twisted, dateutil, jinja2
+{ stdenv, buildPythonApplication, fetchurl, twisted, dateutil, jinja2
 , sqlalchemy , sqlalchemy_migrate_0_7
 , enableDebugClient ? false, pygobject ? null, pyGtkGlade ? null
 }:
@@ -8,7 +8,7 @@
 
 assert enableDebugClient -> pygobject != null && pyGtkGlade != null;
 
-buildPythonPackage (rec {
+buildPythonApplication (rec {
   name = "buildbot-0.8.12";
   namePrefix = "";
 
diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix
index 5db62da06d85..f3db234cd969 100644
--- a/pkgs/development/tools/devpi-client/default.nix
+++ b/pkgs/development/tools/devpi-client/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages, python} :
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "devpi-client-${version}";
   version = "2.3.2";
 
diff --git a/pkgs/development/tools/grabserial/default.nix b/pkgs/development/tools/grabserial/default.nix
index bafde1f96873..34a45fa0b846 100644
--- a/pkgs/development/tools/grabserial/default.nix
+++ b/pkgs/development/tools/grabserial/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchgit, buildPythonPackage, pythonPackages }:
+{ stdenv, fetchgit, buildPythonApplication, pythonPackages }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
 
   name = "grabserial-20141120";
   namePrefix = "";
diff --git a/pkgs/development/tools/misc/nixbang/default.nix b/pkgs/development/tools/misc/nixbang/default.nix
index a97dc3a249a0..ade9954021a1 100644
--- a/pkgs/development/tools/misc/nixbang/default.nix
+++ b/pkgs/development/tools/misc/nixbang/default.nix
@@ -1,7 +1,7 @@
 { lib, pythonPackages, fetchFromGitHub }:
 
 let version = "0.1.2"; in
-pythonPackages.buildPythonPackage {
+pythonPackages.buildPythonApplication {
   name = "nixbang-${version}";
   namePrefix = "";
 
diff --git a/pkgs/development/tools/misc/ycmd/default.nix b/pkgs/development/tools/misc/ycmd/default.nix
index 029e76e0c996..44bf2ac855c9 100644
--- a/pkgs/development/tools/misc/ycmd/default.nix
+++ b/pkgs/development/tools/misc/ycmd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, cmake, python, llvmPackages, boost, pythonPackages, buildPythonPackage, makeWrapper
+{ stdenv, fetchgit, cmake, python, llvmPackages, boost, pythonPackages, buildPythonApplication, makeWrapper
 }:
 
 stdenv.mkDerivation rec {
diff --git a/pkgs/development/tools/profiling/gprof2dot/default.nix b/pkgs/development/tools/profiling/gprof2dot/default.nix
index 38315116eeb7..154c0da93d49 100644
--- a/pkgs/development/tools/profiling/gprof2dot/default.nix
+++ b/pkgs/development/tools/profiling/gprof2dot/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pythonPackages }:
 
-pythonPackages.buildPythonPackage {
+pythonPackages.buildPythonApplication {
   name = "gprof2dot-2015-04-27";
 
   src = fetchFromGitHub {
diff --git a/pkgs/development/tools/winpdb/default.nix b/pkgs/development/tools/winpdb/default.nix
index fd6e0a991387..58a857c22148 100644
--- a/pkgs/development/tools/winpdb/default.nix
+++ b/pkgs/development/tools/winpdb/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, buildPythonPackage, wxPython, makeDesktopItem }:
+{ stdenv, fetchurl, buildPythonApplication, wxPython, makeDesktopItem }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "winpdb-1.4.8";
   namePrefix = "";
 
diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix
index 8624e168f921..d4f90a906d80 100644
--- a/pkgs/games/mnemosyne/default.nix
+++ b/pkgs/games/mnemosyne/default.nix
@@ -1,12 +1,12 @@
 { stdenv
 , fetchurl
-, buildPythonPackage
+, buildPythonApplication
 , pyqt4
 , pythonPackages
 }:
 let
   version = "2.3.2";
-in buildPythonPackage rec {
+in buildPythonApplication rec {
   name = "mnemosyne-${version}";
   src = fetchurl {
     url    = "http://sourceforge.net/projects/mnemosyne-proj/files/mnemosyne/${name}/Mnemosyne-${version}.tar.gz";
diff --git a/pkgs/misc/frescobaldi/default.nix b/pkgs/misc/frescobaldi/default.nix
index 0ccc0c7c6cfe..04370424abb7 100644
--- a/pkgs/misc/frescobaldi/default.nix
+++ b/pkgs/misc/frescobaldi/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages, lilypond, pyqt4, pygame }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "frescobaldi-${version}";
   version = "2.0.16";
 
diff --git a/pkgs/os-specific/linux/iotop/default.nix b/pkgs/os-specific/linux/iotop/default.nix
index 7481edeee7b0..a83d4a2ad9fd 100644
--- a/pkgs/os-specific/linux/iotop/default.nix
+++ b/pkgs/os-specific/linux/iotop/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, buildPythonPackage, pythonPackages }:
+{ stdenv, fetchurl, buildPythonApplication, pythonPackages }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "iotop-0.6";
   namePrefix = "";
 
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index 714ff9d002c8..9165e03d79cf 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, stdenv, buildPythonPackage, pythonPackages, fetchurl, fetchFromGitHub }:
+{ pkgs, stdenv, buildPythonApplication, pythonPackages, fetchurl, fetchFromGitHub }:
 let
-  matrix-angular-sdk = buildPythonPackage rec {
+  matrix-angular-sdk = buildPythonApplication rec {
     name = "matrix-angular-sdk-${version}";
     version = "0.6.6";
 
@@ -10,7 +10,7 @@ let
     };
   };
 in
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "matrix-synapse-${version}";
   version = "0.12.0";
 
diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix
index 6b33f5833d86..4aa65a7d8bde 100644
--- a/pkgs/shells/xonsh/default.nix
+++ b/pkgs/shells/xonsh/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchFromGitHub, python3Packages}:
 
-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonApplication rec {
   name = "xonsh-${version}";
   version = "0.1.3";
 
diff --git a/pkgs/tools/X11/arandr/default.nix b/pkgs/tools/X11/arandr/default.nix
index a6af7b996512..68355d0d8aa8 100644
--- a/pkgs/tools/X11/arandr/default.nix
+++ b/pkgs/tools/X11/arandr/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, python, xrandr, pythonPackages }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "arandr-0.1.8";
 
   src = fetchurl {
diff --git a/pkgs/tools/X11/winswitch/default.nix b/pkgs/tools/X11/winswitch/default.nix
index ad7ac7c64c82..767edbc47d56 100644
--- a/pkgs/tools/X11/winswitch/default.nix
+++ b/pkgs/tools/X11/winswitch/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, buildPythonPackage, pythonPackages
+{ stdenv, fetchurl, buildPythonApplication, pythonPackages
 , which, xpra, xmodmap }:
 
 let
-  base = buildPythonPackage rec {
+  base = buildPythonApplication rec {
     name = "winswitch-${version}";
     namePrefix = "";
     version = "0.12.16";
diff --git a/pkgs/tools/X11/xpra/default.nix b/pkgs/tools/X11/xpra/default.nix
index c5b8db591c4c..e0e12051bffd 100644
--- a/pkgs/tools/X11/xpra/default.nix
+++ b/pkgs/tools/X11/xpra/default.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, buildPythonPackage, pythonPackages
+{ stdenv, fetchurl, buildPythonApplication, pythonPackages
 , python, cython, pkgconfig
 , xorg, gtk, glib, pango, cairo, gdk_pixbuf, atk, pycairo
 , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config
 , ffmpeg, x264, libvpx, libwebp
 , libfakeXinerama }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "xpra-0.15.3";
   namePrefix = "";
 
diff --git a/pkgs/tools/X11/xpra/gtk3.nix b/pkgs/tools/X11/xpra/gtk3.nix
index 6e485dc0a052..5b81ec0a7edc 100644
--- a/pkgs/tools/X11/xpra/gtk3.nix
+++ b/pkgs/tools/X11/xpra/gtk3.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, buildPythonPackage
+{ stdenv, fetchurl, buildPythonApplication
 , python, cython, pkgconfig
 , xorg, gtk3, glib, pango, cairo, gdk_pixbuf, atk, pygobject3, pycairo, gobjectIntrospection
 , makeWrapper, xkbcomp, xorgserver, getopt, xauth, utillinux, which, fontsConf, xkeyboard_config
 , ffmpeg, x264, libvpx, libwebp
 , libfakeXinerama }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "xpra-0.14.19";
   namePrefix = "";
 
diff --git a/pkgs/tools/admin/cli53/default.nix b/pkgs/tools/admin/cli53/default.nix
index 2fa54796e4c4..3248ac63bf79 100644
--- a/pkgs/tools/admin/cli53/default.nix
+++ b/pkgs/tools/admin/cli53/default.nix
@@ -1,6 +1,6 @@
-{ lib, buildPythonPackage, pythonPackages, fetchurl }:
+{ lib, buildPythonApplication, pythonPackages, fetchurl }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "cli53-${version}";
   namePrefix = "";  # Suppress "python27-" name prefix
   version = "0.4.4";
diff --git a/pkgs/tools/admin/letsencrypt/default.nix b/pkgs/tools/admin/letsencrypt/default.nix
index 2c74a677b913..516fc20c5a74 100644
--- a/pkgs/tools/admin/letsencrypt/default.nix
+++ b/pkgs/tools/admin/letsencrypt/default.nix
@@ -1,6 +1,6 @@
 { stdenv, pythonPackages, fetchurl, dialog }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   version = "0.1.0";
   name = "letsencrypt-${version}";
 
diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix
index f6b352056fa0..77c45e0ad3fe 100644
--- a/pkgs/tools/admin/simp_le/default.nix
+++ b/pkgs/tools/admin/simp_le/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pythonPackages }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "simp_le-2016-01-09";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/audio/beets/alternatives-plugin.nix b/pkgs/tools/audio/beets/alternatives-plugin.nix
index 1b0c9b3992b9..75f74e71be52 100644
--- a/pkgs/tools/audio/beets/alternatives-plugin.nix
+++ b/pkgs/tools/audio/beets/alternatives-plugin.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub, pythonPackages }:
+{ stdenv, buildPythonApplication, fetchFromGitHub, pythonPackages }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "beets-alternatives-${version}";
   version = "0.8.2";
 
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
index 91407331d7ca..4532d6424116 100644
--- a/pkgs/tools/audio/beets/default.nix
+++ b/pkgs/tools/audio/beets/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, writeScript, glibcLocales
-, buildPythonPackage, pythonPackages, python, imagemagick
+, buildPythonApplication, pythonPackages, python, imagemagick
 
 , enableAcousticbrainz ? true
 , enableAcoustid       ? true
@@ -68,7 +68,7 @@ let
   testShell = "${bashInteractive}/bin/bash --norc";
   completion = "${bashCompletion}/share/bash-completion/bash_completion";
 
-in buildPythonPackage rec {
+in buildPythonApplication rec {
   name = "beets-${version}";
   version = "1.3.17";
   namePrefix = "";
@@ -103,7 +103,7 @@ in buildPythonPackage rec {
     ++ optional enableThumbnails   pythonPackages.pyxdg
     ++ optional enableWeb          pythonPackages.flask
     ++ optional enableAlternatives (import ./alternatives-plugin.nix {
-      inherit stdenv buildPythonPackage pythonPackages fetchFromGitHub;
+      inherit stdenv buildPythonApplication pythonPackages fetchFromGitHub;
     });
 
   buildInputs = with pythonPackages; [
diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix
index 0e2462c5ec85..4f659428c00a 100644
--- a/pkgs/tools/backup/attic/default.nix
+++ b/pkgs/tools/backup/attic/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchzip, python3Packages, openssl, acl }:
 
-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonApplication rec {
   name = "attic-${version}";
   version = "0.16";
   namePrefix = "";
diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index 1ea8095bd38c..208c3d4b1aa6 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, python3Packages, acl, lz4, openssl }:
 
-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonApplication rec {
   name = "borgbackup-${version}";
   version = "0.30.0";
   namePrefix = "";
diff --git a/pkgs/tools/backup/obnam/default.nix b/pkgs/tools/backup/obnam/default.nix
index c287efe8e112..0df9fa9d39f0 100644
--- a/pkgs/tools/backup/obnam/default.nix
+++ b/pkgs/tools/backup/obnam/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, python, pythonPackages, pycrypto, attr }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "obnam-${version}";
   version = "1.19.1";
 
diff --git a/pkgs/tools/backup/s3ql/default.nix b/pkgs/tools/backup/s3ql/default.nix
index b455c672b104..e94af89a7c6d 100644
--- a/pkgs/tools/backup/s3ql/default.nix
+++ b/pkgs/tools/backup/s3ql/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, python3Packages, sqlite  }:
 
-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonApplication rec {
   name = "${pname}-${version}";
   pname = "s3ql";
   version = "2.13";
diff --git a/pkgs/tools/backup/wal-e/default.nix b/pkgs/tools/backup/wal-e/default.nix
index 025a998aed4e..3b66ac1b491f 100644
--- a/pkgs/tools/backup/wal-e/default.nix
+++ b/pkgs/tools/backup/wal-e/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages, lzop, postgresql, pv }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "wal-e-${version}";
   version = "0.6.10";
 
diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix
index 343709dd9571..d412a4e433ef 100644
--- a/pkgs/tools/compression/dtrx/default.nix
+++ b/pkgs/tools/compression/dtrx/default.nix
@@ -1,6 +1,6 @@
 {stdenv, fetchurl, pythonPackages}:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "dtrx-${version}";
   version = "7.1";
 
diff --git a/pkgs/tools/filesystems/gitfs/default.nix b/pkgs/tools/filesystems/gitfs/default.nix
index cd79f5db85b3..9c44394697f7 100644
--- a/pkgs/tools/filesystems/gitfs/default.nix
+++ b/pkgs/tools/filesystems/gitfs/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, python, buildPythonPackage, pythonPackages }:
+{ stdenv, fetchFromGitHub, python, buildPythonApplication, pythonPackages }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "gitfs-0.2.5";
 
   src = fetchFromGitHub {
diff --git a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
index d4129f4d390a..d3b3b716ffa0 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/blivet.nix
@@ -1,11 +1,11 @@
-{ stdenv, fetchurl, buildPythonPackage, pykickstart, pyparted, pyblock
+{ stdenv, fetchurl, buildPythonApplication, pykickstart, pyparted, pyblock
 , libselinux, cryptsetup, multipath_tools, lsof, utillinux
 , useNixUdev ? true, udev ? null
 }:
 
 assert useNixUdev -> udev != null;
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "blivet-${version}";
   version = "0.17-1";
 
diff --git a/pkgs/tools/filesystems/nixpart/0.4/default.nix b/pkgs/tools/filesystems/nixpart/0.4/default.nix
index 01a3caafc5dd..1d9838168952 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/default.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, python, buildPythonPackage
+{ stdenv, fetchurl, python, buildPythonApplication
 # Propagated to blivet
 , useNixUdev ? true
 # No longer needed, but kept for backwards-compatibility with older NixOps.
@@ -9,7 +9,7 @@
 
 let
   blivet = import ./blivet.nix {
-    inherit stdenv fetchurl buildPythonPackage;
+    inherit stdenv fetchurl buildPythonApplication;
     inherit pykickstart pyparted pyblock cryptsetup multipath_tools;
     inherit useNixUdev;
     inherit (pkgs) lsof utillinux udev;
@@ -48,15 +48,15 @@ let
   };
 
   pykickstart = import ./pykickstart.nix {
-    inherit stdenv fetchurl python buildPythonPackage urlgrabber;
+    inherit stdenv fetchurl python buildPythonApplication urlgrabber;
   };
 
   pyparted = import ./pyparted.nix {
-    inherit stdenv fetchurl python buildPythonPackage parted;
+    inherit stdenv fetchurl python buildPythonApplication parted;
     inherit (pkgs) pkgconfig e2fsprogs;
   };
 
-in buildPythonPackage rec {
+in buildPythonApplication rec {
   name = "nixpart-${version}";
   version = "0.4.1";
 
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
index 7bc3f54c2363..86479126d393 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/pykickstart.nix
@@ -1,6 +1,6 @@
-{ stdenv, python, buildPythonPackage, fetchurl, urlgrabber }:
+{ stdenv, python, buildPythonApplication, fetchurl, urlgrabber }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "pykickstart-${version}";
   version = "1.99.39";
 
diff --git a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
index 67f318c863e1..721e5185be3f 100644
--- a/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
+++ b/pkgs/tools/filesystems/nixpart/0.4/pyparted.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgconfig, python, buildPythonPackage, parted, e2fsprogs }:
+{ stdenv, fetchurl, pkgconfig, python, buildPythonApplication, parted, e2fsprogs }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "pyparted-${version}";
   version = "3.10";
 
diff --git a/pkgs/tools/filesystems/nixpart/default.nix b/pkgs/tools/filesystems/nixpart/default.nix
index 895ae99c3093..ce00367c771c 100644
--- a/pkgs/tools/filesystems/nixpart/default.nix
+++ b/pkgs/tools/filesystems/nixpart/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, buildPythonPackage, blivet }:
+{ stdenv, fetchurl, buildPythonApplication, blivet }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "nixpart-${version}";
   version = "1.0.0";
 
diff --git a/pkgs/tools/misc/apt-offline/default.nix b/pkgs/tools/misc/apt-offline/default.nix
index 219cb2139f58..e479167dc159 100644
--- a/pkgs/tools/misc/apt-offline/default.nix
+++ b/pkgs/tools/misc/apt-offline/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, bash, buildPythonPackage }:
+{ stdenv, fetchurl, bash, buildPythonApplication }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   version = "1.3";
   name = "apt-offline-${version}";
 
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 6715f1ac38fd..304f721ee8d9 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -4,7 +4,7 @@
 , enableBloat ? false
 }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "diffoscope-${version}";
   version = "45";
 
diff --git a/pkgs/tools/misc/i3minator/default.nix b/pkgs/tools/misc/i3minator/default.nix
index 0c3907b89bfe..45fd27b7f4f9 100644
--- a/pkgs/tools/misc/i3minator/default.nix
+++ b/pkgs/tools/misc/i3minator/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, buildPythonPackage, pythonPackages, python }:
+{ stdenv, fetchurl, buildPythonApplication, pythonPackages, python }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   name = "i3minator-${version}";
   version = "0.0.4";
 
diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix
index 78835afddef5..e3adbfe3887d 100644
--- a/pkgs/tools/misc/trash-cli/default.nix
+++ b/pkgs/tools/misc/trash-cli/default.nix
@@ -2,7 +2,7 @@
 
 assert stdenv.isLinux;
 
-python2Packages.buildPythonPackage rec {
+python2Packages.buildPythonApplication rec {
   name = "trash-cli-${version}";
   version = "0.12.9.14";
   namePrefix = "";
diff --git a/pkgs/tools/misc/vdirsyncer/default.nix b/pkgs/tools/misc/vdirsyncer/default.nix
index df7cbc04a142..d6789bf52bc5 100644
--- a/pkgs/tools/misc/vdirsyncer/default.nix
+++ b/pkgs/tools/misc/vdirsyncer/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   version = "0.9.0";
   name = "vdirsyncer-${version}";
   namePrefix = "";
diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 8baa5cc91740..9bb3250675dd 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, buildPythonPackage, makeWrapper, ffmpeg, zip
+{ stdenv, fetchurl, buildPythonApplication, makeWrapper, ffmpeg, zip
 , pandoc ? null
 }:
 
@@ -9,7 +9,7 @@
 # case someone wants to use this derivation to build a Git version of
 # the tool that doesn't have the formatted man page included.
 
-buildPythonPackage rec {
+buildPythonApplication rec {
 
   name = "youtube-dl-${version}";
   version = "2016.01.01";
diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix
index 8dd288b5588a..d11e154817d4 100644
--- a/pkgs/tools/networking/getmail/default.nix
+++ b/pkgs/tools/networking/getmail/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, buildPythonPackage }:
+{ stdenv, fetchurl, buildPythonApplication }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   version = "4.49.0";
   name = "getmail-${version}";
   namePrefix = "";
diff --git a/pkgs/tools/networking/gmvault/default.nix b/pkgs/tools/networking/gmvault/default.nix
index aa52e4f3ae24..4ccd09ac555a 100644
--- a/pkgs/tools/networking/gmvault/default.nix
+++ b/pkgs/tools/networking/gmvault/default.nix
@@ -1,6 +1,6 @@
-{ pkgs, fetchurl, buildPythonPackage, pythonPackages }:
+{ pkgs, fetchurl, buildPythonApplication, pythonPackages }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   version = "1.8.1-beta";
   name = "gmvault-${version}";
 
diff --git a/pkgs/tools/networking/httpie/default.nix b/pkgs/tools/networking/httpie/default.nix
index cc1531961b32..a3c52f7dd501 100644
--- a/pkgs/tools/networking/httpie/default.nix
+++ b/pkgs/tools/networking/httpie/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "httpie-0.9.2";
   namePrefix = "";
 
diff --git a/pkgs/tools/networking/offlineimap/default.nix b/pkgs/tools/networking/offlineimap/default.nix
index 5331f71a96ac..00061b3aeff1 100644
--- a/pkgs/tools/networking/offlineimap/default.nix
+++ b/pkgs/tools/networking/offlineimap/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage, sqlite3 }:
+{ stdenv, fetchFromGitHub, buildPythonApplication, sqlite3 }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   version = "6.6.1";
   name = "offlineimap-${version}";
   namePrefix = "";
diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
index dae985febbb3..5f1d6b4ef1a4 100644
--- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
+++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix
@@ -5,7 +5,7 @@
 # store path. The problem appears to be non-fatal, but there's probably
 # some loss of functionality because of it.
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   version = "1.10.2";
   name = "tahoe-lafs-${version}";
   namePrefix = "";
diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix
index 2287671aef2e..0ff741ef7e2c 100644
--- a/pkgs/tools/networking/s3cmd/default.nix
+++ b/pkgs/tools/networking/s3cmd/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "s3cmd-1.5.2";
   
   src = fetchurl {
diff --git a/pkgs/tools/networking/speedtest-cli/default.nix b/pkgs/tools/networking/speedtest-cli/default.nix
index 4e1391dfeb97..10b35298461b 100644
--- a/pkgs/tools/networking/speedtest-cli/default.nix
+++ b/pkgs/tools/networking/speedtest-cli/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "speedtest-cli-${version}";
   version = "0.3.1";
   namePrefix = "";
diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix
index ef420961a1f3..8ad930951607 100644
--- a/pkgs/tools/networking/urlwatch/default.nix
+++ b/pkgs/tools/networking/urlwatch/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, python3Packages }:
 
-python3Packages.buildPythonPackage rec {
+python3Packages.buildPythonApplication rec {
   name = "urlwatch-2.0";
 
   src = fetchurl {
diff --git a/pkgs/tools/package-management/nixops/generic.nix b/pkgs/tools/package-management/nixops/generic.nix
index b9b9eee8d160..023ec07dba16 100644
--- a/pkgs/tools/package-management/nixops/generic.nix
+++ b/pkgs/tools/package-management/nixops/generic.nix
@@ -3,7 +3,7 @@
 , src, version
 }:
 
-pythonPackages.buildPythonPackage {
+pythonPackages.buildPythonApplication {
   name = "nixops-${version}";
   namePrefix = "";
 
diff --git a/pkgs/tools/package-management/nox/default.nix b/pkgs/tools/package-management/nox/default.nix
index 92edd915ad79..89e72307ead1 100644
--- a/pkgs/tools/package-management/nox/default.nix
+++ b/pkgs/tools/package-management/nox/default.nix
@@ -1,6 +1,6 @@
 { lib, pythonPackages, fetchurl }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "nox-${version}";
   version = "0.0.2";
   namePrefix = "";
diff --git a/pkgs/tools/package-management/python2nix/default.nix b/pkgs/tools/package-management/python2nix/default.nix
index 1e84a81e5241..0bc92314e02c 100644
--- a/pkgs/tools/package-management/python2nix/default.nix
+++ b/pkgs/tools/package-management/python2nix/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, pythonPackages }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "python2nix-20140927";
  
   src = fetchFromGitHub {
diff --git a/pkgs/tools/security/fail2ban/default.nix b/pkgs/tools/security/fail2ban/default.nix
index 667157978a38..9443eac01da7 100644
--- a/pkgs/tools/security/fail2ban/default.nix
+++ b/pkgs/tools/security/fail2ban/default.nix
@@ -2,7 +2,7 @@
 
 let version = "0.9.3"; in
 
-pythonPackages.buildPythonPackage {
+pythonPackages.buildPythonApplication {
   name = "fail2ban-${version}";
   namePrefix = "";
 
diff --git a/pkgs/tools/security/knockknock/default.nix b/pkgs/tools/security/knockknock/default.nix
index 6258f2315904..089dd0de2bda 100644
--- a/pkgs/tools/security/knockknock/default.nix
+++ b/pkgs/tools/security/knockknock/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchFromGitHub, buildPythonPackage, python, pycrypto, hping }:
+{ stdenv, fetchFromGitHub, buildPythonApplication, python, pycrypto, hping }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   rev  = "bf14bbff";
   name = "knockknock-r${rev}";
 
diff --git a/pkgs/tools/security/sshuttle/default.nix b/pkgs/tools/security/sshuttle/default.nix
index b7cefdd86ea4..b78eb43782ed 100644
--- a/pkgs/tools/security/sshuttle/default.nix
+++ b/pkgs/tools/security/sshuttle/default.nix
@@ -1,7 +1,7 @@
 { stdenv, pythonPackages, fetchurl, makeWrapper, pandoc
 , coreutils, iptables, nettools, openssh, procps }:
   
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "sshuttle-${version}";
   version = "0.76";
 
diff --git a/pkgs/tools/security/volatility/default.nix b/pkgs/tools/security/volatility/default.nix
index 6aa3a9d5ea11..bed7d5369579 100644
--- a/pkgs/tools/security/volatility/default.nix
+++ b/pkgs/tools/security/volatility/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, buildPythonPackage, pycrypto }:
+{ stdenv, fetchurl, buildPythonApplication, pycrypto }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
   namePrefix = "";
   name = "volatility-2.4";
 
diff --git a/pkgs/tools/system/honcho/default.nix b/pkgs/tools/system/honcho/default.nix
index b52c1c0f636d..5aca54ad9182 100644
--- a/pkgs/tools/system/honcho/default.nix
+++ b/pkgs/tools/system/honcho/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchzip, pythonPackages, buildPythonPackage }:
+{ stdenv, fetchzip, pythonPackages, buildPythonApplication }:
 
-let honcho = buildPythonPackage rec {
+let honcho = buildPythonApplication rec {
   name = "honcho-${version}";
   version = "0.6.6";
   namePrefix = "";
diff --git a/pkgs/tools/text/grin/default.nix b/pkgs/tools/text/grin/default.nix
index 2ea4a9501452..da3a77e8d2e4 100644
--- a/pkgs/tools/text/grin/default.nix
+++ b/pkgs/tools/text/grin/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "grin-1.2.1";
   namePrefix = "";
 
diff --git a/pkgs/tools/typesetting/odpdown/default.nix b/pkgs/tools/typesetting/odpdown/default.nix
index 9ff33b2fb698..fe1e915e27bf 100644
--- a/pkgs/tools/typesetting/odpdown/default.nix
+++ b/pkgs/tools/typesetting/odpdown/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, fetchurl, buildPythonPackage, libreoffice, lpod, lxml, mistune, pillow
+{ stdenv, fetchurl, buildPythonApplication, libreoffice, lpod, lxml, mistune, pillow
 , pygments
 }:
 
-buildPythonPackage rec {
+buildPythonApplication rec {
 
   name = "odpdown-${version}";
   version = "0.4.1";
diff --git a/pkgs/tools/video/vnc2flv/default.nix b/pkgs/tools/video/vnc2flv/default.nix
index 55f54e2cf3de..3675b5ab091b 100644
--- a/pkgs/tools/video/vnc2flv/default.nix
+++ b/pkgs/tools/video/vnc2flv/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, pythonPackages }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "vnc2flv-20100207";
   namePrefix = "";
 
diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix
index af2779e59e36..34b6226ff98d 100644
--- a/pkgs/tools/virtualization/cloud-init/default.nix
+++ b/pkgs/tools/virtualization/cloud-init/default.nix
@@ -2,7 +2,7 @@
 
 let version = "0.7.6";
 
-in pythonPackages.buildPythonPackage rec {
+in pythonPackages.buildPythonApplication rec {
   name = "cloud-init-${version}";
   namePrefix = "";
 
diff --git a/pkgs/tools/virtualization/euca2ools/default.nix b/pkgs/tools/virtualization/euca2ools/default.nix
index a87dd5683229..7a93d96036f4 100644
--- a/pkgs/tools/virtualization/euca2ools/default.nix
+++ b/pkgs/tools/virtualization/euca2ools/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchgit, which, pythonPackages }:
 
-pythonPackages.buildPythonPackage rec {
+pythonPackages.buildPythonApplication rec {
   name = "euca2ools-2.1.4";
   namePrefix = "";
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 090dbc005ba4..440040bac29c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3197,7 +3197,7 @@ let
   solvespace = callPackage ../applications/graphics/solvespace { };
 
   sonata = callPackage ../applications/audio/sonata {
-    inherit (python3Packages) buildPythonPackage python isPy3k dbus pygobject3 mpd2;
+    inherit (python3Packages) buildPythonApplication python isPy3k dbus pygobject3 mpd2;
   };
 
   sparsehash = callPackage ../development/libraries/sparsehash { };
@@ -13216,7 +13216,7 @@ let
   };
 
   qutebrowser = qt55.callPackage ../applications/networking/browsers/qutebrowser {
-    inherit (python34Packages) buildPythonPackage python pyqt5 jinja2 pygments pyyaml pypeg2;
+    inherit (python34Packages) buildPythonApplication python pyqt5 jinja2 pygments pyyaml pypeg2;
     inherit (gst_all_1) gst-plugins-base gst-plugins-good gst-plugins-bad gst-libav;
   };
 
@@ -14090,7 +14090,7 @@ let
   xpra = callPackage ../tools/X11/xpra { inherit (texFunctions) fontsConf; };
   libfakeXinerama = callPackage ../tools/X11/xpra/libfakeXinerama.nix { };
   #TODO: 'pil' is not available for python3, yet
-  xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonPackage python cython pygobject3 pycairo; };
+  xpraGtk3 = callPackage ../tools/X11/xpra/gtk3.nix { inherit (texFunctions) fontsConf; inherit (python3Packages) buildPythonApplication python cython pygobject3 pycairo; };
 
   xrestop = callPackage ../tools/X11/xrestop { };
 

From 44aed98556a240402bfebf09b09760f523cb7548 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 19 Feb 2016 06:19:26 -0600
Subject: [PATCH 1562/2285] kde5.frameworks: 5.18.0 -> 5.19.0

---
 .../libraries/kde-frameworks-5.18/attica.nix  |  11 -
 .../libraries/kde-frameworks-5.18/baloo.nix   |  25 -
 .../kde-frameworks-5.18/bluez-qt.nix          |  17 -
 .../kde-frameworks-5.18/breeze-icons.nix      |  10 -
 .../libraries/kde-frameworks-5.18/default.nix | 112 ----
 .../0001-extra-cmake-modules-paths.patch      |  74 ---
 .../extra-cmake-modules/default.nix           |  18 -
 .../extra-cmake-modules/setup-hook.sh         |  27 -
 .../kde-frameworks-5.18/fetchsrcs.sh          |  57 --
 .../frameworkintegration.nix                  |  17 -
 .../kde-frameworks-5.18/kactivities.nix       |  22 -
 .../libraries/kde-frameworks-5.18/kapidox.nix |  12 -
 .../kde-frameworks-5.18/karchive.nix          |  11 -
 .../kde-frameworks-5.18/kauth/default.nix     |  16 -
 .../kauth/kauth-policy-install.patch          |  13 -
 .../kde-frameworks-5.18/kbookmarks.nix        |  25 -
 .../0001-qdiriterator-follow-symlinks.patch   |  25 -
 .../kde-frameworks-5.18/kcmutils/default.nix  |  17 -
 .../libraries/kde-frameworks-5.18/kcodecs.nix |  11 -
 .../kde-frameworks-5.18/kcompletion.nix       |  14 -
 .../libraries/kde-frameworks-5.18/kconfig.nix |  16 -
 .../0001-qdiriterator-follow-symlinks.patch   |  25 -
 .../kconfigwidgets/default.nix                |  17 -
 .../kde-frameworks-5.18/kcoreaddons.nix       |  16 -
 .../libraries/kde-frameworks-5.18/kcrash.nix  |  16 -
 .../kde-frameworks-5.18/kdbusaddons.nix       |  17 -
 .../kde-frameworks-5.18/kdeclarative.nix      |  22 -
 .../libraries/kde-frameworks-5.18/kded.nix    |  19 -
 .../kde-frameworks-5.18/kdelibs4support.nix   |  32 -
 .../kde-frameworks-5.18/kdesignerplugin.nix   |  34 --
 .../libraries/kde-frameworks-5.18/kdesu.nix   |  13 -
 .../kde-frameworks-5.18/kdewebkit.nix         |  13 -
 .../libraries/kde-frameworks-5.18/kdnssd.nix  |  13 -
 .../kde-frameworks-5.18/kdoctools/default.nix |  20 -
 .../kdoctools-no-find-docbook-xml.patch       |  12 -
 .../kdoctools/setup-hook.sh                   |   5 -
 .../kde-frameworks-5.18/kemoticons.nix        |  17 -
 .../kde-frameworks-5.18/kfilemetadata.nix     |  13 -
 .../kde-frameworks-5.18/kglobalaccel.nix      |  23 -
 .../kde-frameworks-5.18/kguiaddons.nix        |  13 -
 .../libraries/kde-frameworks-5.18/khtml.nix   |  21 -
 .../libraries/kde-frameworks-5.18/ki18n.nix   |  17 -
 .../kiconthemes/default-theme-breeze.patch    |  13 -
 .../kiconthemes/default.nix                   |  18 -
 .../kde-frameworks-5.18/kiconthemes/series    |   1 -
 .../kde-frameworks-5.18/kidletime.nix         |  15 -
 .../kde-frameworks-5.18/kimageformats.nix     |  13 -
 .../kinit/0001-kinit-libpath.patch            |  42 --
 .../kde-frameworks-5.18/kinit/default.nix     |  17 -
 .../kde-frameworks-5.18/kio/default.nix       |  33 -
 .../kio/samba-search-path.patch               |  28 -
 .../libraries/kde-frameworks-5.18/kio/series  |   1 -
 .../kde-frameworks-5.18/kitemmodels.nix       |  11 -
 .../kde-frameworks-5.18/kitemviews.nix        |  11 -
 .../kde-frameworks-5.18/kjobwidgets.nix       |  16 -
 .../libraries/kde-frameworks-5.18/kjs.nix     |  16 -
 .../kde-frameworks-5.18/kjsembed.nix          |  17 -
 .../kde-frameworks-5.18/kmediaplayer.nix      |  15 -
 .../kde-frameworks-5.18/knewstuff.nix         |  17 -
 .../kde-frameworks-5.18/knotifications.nix    |  21 -
 .../kde-frameworks-5.18/knotifyconfig.nix     |  13 -
 .../kpackage/allow-external-paths.patch       |  13 -
 .../kde-frameworks-5.18/kpackage/default.nix  |  23 -
 .../qdiriterator-follow-symlinks.patch        |  26 -
 .../kde-frameworks-5.18/kpackage/series       |   2 -
 .../libraries/kde-frameworks-5.18/kparts.nix  |  17 -
 .../libraries/kde-frameworks-5.18/kpeople.nix |  15 -
 .../kde-frameworks-5.18/kplotting.nix         |  11 -
 .../libraries/kde-frameworks-5.18/kpty.nix    |  10 -
 .../libraries/kde-frameworks-5.18/kross.nix   |  14 -
 .../libraries/kde-frameworks-5.18/krunner.nix |  16 -
 .../0001-qdiriterator-follow-symlinks.patch   |  25 -
 .../kservice/0002-no-canonicalize-path.patch  |  25 -
 .../kde-frameworks-5.18/kservice/default.nix  |  19 -
 .../kservice/setup-hook.sh                    |  43 --
 .../ktexteditor/default.nix                   |  22 -
 .../ktexteditor/no-qcoreapplication.patch     |  36 --
 .../kde-frameworks-5.18/ktexteditor/series    |   1 -
 .../kde-frameworks-5.18/ktextwidgets.nix      |  16 -
 .../kde-frameworks-5.18/kunitconversion.nix   |  10 -
 .../libraries/kde-frameworks-5.18/kwallet.nix |  21 -
 .../kde-frameworks-5.18/kwidgetsaddons.nix    |  11 -
 .../kde-frameworks-5.18/kwindowsystem.nix     |  13 -
 .../libraries/kde-frameworks-5.18/kxmlgui.nix |  18 -
 .../kde-frameworks-5.18/kxmlrpcclient.nix     |  10 -
 .../kde-frameworks-5.18/modemmanager-qt.nix   |  13 -
 .../kde-frameworks-5.18/networkmanager-qt.nix |  13 -
 .../kde-frameworks-5.18/oxygen-icons5.nix     |  13 -
 .../plasma-framework/default.nix              |  25 -
 .../libraries/kde-frameworks-5.18/solid.nix   |  17 -
 .../libraries/kde-frameworks-5.18/sonnet.nix  |  13 -
 .../libraries/kde-frameworks-5.18/srcs.nix    | 565 ------------------
 .../kde-frameworks-5.18/threadweaver.nix      |  11 -
 pkgs/top-level/all-packages.nix               |   2 +-
 94 files changed, 1 insertion(+), 2334 deletions(-)
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/attica.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/baloo.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/bluez-qt.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/breeze-icons.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
 delete mode 100755 pkgs/development/libraries/kde-frameworks-5.18/fetchsrcs.sh
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/frameworkintegration.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kactivities.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kapidox.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/karchive.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kauth/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kauth/kauth-policy-install.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kbookmarks.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kcmutils/0001-qdiriterator-follow-symlinks.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kcmutils/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kcodecs.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kcompletion.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kconfig.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kcoreaddons.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kcrash.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdbusaddons.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdeclarative.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kded.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdesignerplugin.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdesu.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdewebkit.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdnssd.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdoctools/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdoctools/kdoctools-no-find-docbook-xml.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kdoctools/setup-hook.sh
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kemoticons.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kglobalaccel.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kguiaddons.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/khtml.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/ki18n.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default-theme-breeze.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/series
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kidletime.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kimageformats.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kinit/0001-kinit-libpath.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kinit/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kio/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kio/samba-search-path.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kio/series
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kitemmodels.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kitemviews.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kjobwidgets.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kjs.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kjsembed.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kmediaplayer.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/knewstuff.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/knotifications.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/knotifyconfig.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kpackage/allow-external-paths.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kpackage/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kpackage/qdiriterator-follow-symlinks.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kpackage/series
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kparts.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kpeople.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kplotting.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kpty.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kross.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/krunner.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kservice/0001-qdiriterator-follow-symlinks.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kservice/0002-no-canonicalize-path.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/no-qcoreapplication.patch
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/series
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/ktextwidgets.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kunitconversion.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kwallet.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kwidgetsaddons.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kwindowsystem.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kxmlgui.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/kxmlrpcclient.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/modemmanager-qt.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/networkmanager-qt.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/oxygen-icons5.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/plasma-framework/default.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/solid.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/sonnet.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/srcs.nix
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/threadweaver.nix

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/attica.nix b/pkgs/development/libraries/kde-frameworks-5.18/attica.nix
deleted file mode 100644
index 98721876c120..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/attica.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "attica";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.18/baloo.nix
deleted file mode 100644
index 38c41d9271d8..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/baloo.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kauth, kconfig
-, kcoreaddons, kcrash, kdbusaddons, kfilemetadata, ki18n, kidletime
-, kio, lmdb, makeQtWrapper, qtbase, qtquick1, solid
-}:
-
-kdeFramework {
-  name = "baloo";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [
-    kconfig kcrash kdbusaddons lmdb qtquick1 solid
-  ];
-  propagatedBuildInputs = [
-    kauth kcoreaddons kfilemetadata ki18n kio kidletime qtbase
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/baloo_file"
-    wrapQtProgram "$out/bin/baloo_file_extractor"
-    wrapQtProgram "$out/bin/balooctl"
-    wrapQtProgram "$out/bin/baloosearch"
-    wrapQtProgram "$out/bin/balooshow"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks-5.18/bluez-qt.nix
deleted file mode 100644
index f981b0516f72..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/bluez-qt.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qtdeclarative
-}:
-
-kdeFramework {
-  name = "bluez-qt";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtdeclarative ];
-  preConfigure = ''
-    substituteInPlace CMakeLists.txt \
-      --replace /lib/udev/rules.d "$out/lib/udev/rules.d"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks-5.18/breeze-icons.nix
deleted file mode 100644
index 879262c56a41..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/breeze-icons.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kdeFramework
-, extra-cmake-modules
-, qtsvg
-}:
-
-kdeFramework {
-  name = "breeze-icons";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedUserEnvPkgs = [ qtsvg ];
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/default.nix
deleted file mode 100644
index f41aebcb59d3..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/default.nix
+++ /dev/null
@@ -1,112 +0,0 @@
-# Maintainer's Notes:
-#
-# How To Update
-#  1. Edit the URL in ./manifest.sh
-#  2. Run ./manifest.sh
-#  3. Fix build errors.
-
-{ pkgs, debug ? false }:
-
-let
-
-  inherit (pkgs) lib makeSetupHook stdenv;
-
-  mirror = "mirror://kde";
-  srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
-
-  packages = self: with self; {
-    kdeFramework = args:
-      let
-        inherit (args) name;
-        inherit (srcs."${name}") src version;
-      in stdenv.mkDerivation (args // {
-        name = "${name}-${version}";
-        inherit src;
-
-        cmakeFlags =
-          (args.cmakeFlags or [])
-          ++ [ "-DBUILD_TESTING=OFF" ]
-          ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
-
-        meta = {
-          license = with lib.licenses; [
-            lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
-          ];
-          platforms = lib.platforms.linux;
-          homepage = "http://www.kde.org";
-        } // (args.meta or {});
-      });
-
-    attica = callPackage ./attica.nix {};
-    baloo = callPackage ./baloo.nix {};
-    bluez-qt = callPackage ./bluez-qt.nix {};
-    breeze-icons = callPackage ./breeze-icons.nix {};
-    extra-cmake-modules = callPackage ./extra-cmake-modules {};
-    frameworkintegration = callPackage ./frameworkintegration.nix {};
-    kactivities = callPackage ./kactivities.nix {};
-    kapidox = callPackage ./kapidox.nix {};
-    karchive = callPackage ./karchive.nix {};
-    kauth = callPackage ./kauth {};
-    kbookmarks = callPackage ./kbookmarks.nix {};
-    kcmutils = callPackage ./kcmutils {};
-    kcodecs = callPackage ./kcodecs.nix {};
-    kcompletion = callPackage ./kcompletion.nix {};
-    kconfig = callPackage ./kconfig.nix {};
-    kconfigwidgets = callPackage ./kconfigwidgets {};
-    kcoreaddons = callPackage ./kcoreaddons.nix {};
-    kcrash = callPackage ./kcrash.nix {};
-    kdbusaddons = callPackage ./kdbusaddons.nix {};
-    kdeclarative = callPackage ./kdeclarative.nix {};
-    kded = callPackage ./kded.nix {};
-    kdelibs4support = callPackage ./kdelibs4support.nix {};
-    kdesignerplugin = callPackage ./kdesignerplugin.nix {};
-    kdewebkit = callPackage ./kdewebkit.nix {};
-    kdesu = callPackage ./kdesu.nix {};
-    kdnssd = callPackage ./kdnssd.nix {};
-    kdoctools = callPackage ./kdoctools {};
-    kemoticons = callPackage ./kemoticons.nix {};
-    kfilemetadata = callPackage ./kfilemetadata.nix {};
-    kglobalaccel = callPackage ./kglobalaccel.nix {};
-    kguiaddons = callPackage ./kguiaddons.nix {};
-    khtml = callPackage ./khtml.nix {};
-    ki18n = callPackage ./ki18n.nix {};
-    kiconthemes = callPackage ./kiconthemes {};
-    kidletime = callPackage ./kidletime.nix {};
-    kimageformats = callPackage ./kimageformats.nix {};
-    kinit = callPackage ./kinit {};
-    kio = callPackage ./kio {};
-    kitemmodels = callPackage ./kitemmodels.nix {};
-    kitemviews = callPackage ./kitemviews.nix {};
-    kjobwidgets = callPackage ./kjobwidgets.nix {};
-    kjs = callPackage ./kjs.nix {};
-    kjsembed = callPackage ./kjsembed.nix {};
-    kmediaplayer = callPackage ./kmediaplayer.nix {};
-    knewstuff = callPackage ./knewstuff.nix {};
-    knotifications = callPackage ./knotifications.nix {};
-    knotifyconfig = callPackage ./knotifyconfig.nix {};
-    kpackage = callPackage ./kpackage {};
-    kparts = callPackage ./kparts.nix {};
-    kpeople = callPackage ./kpeople.nix {};
-    kplotting = callPackage ./kplotting.nix {};
-    kpty = callPackage ./kpty.nix {};
-    kross = callPackage ./kross.nix {};
-    krunner = callPackage ./krunner.nix {};
-    kservice = callPackage ./kservice {};
-    ktexteditor = callPackage ./ktexteditor {};
-    ktextwidgets = callPackage ./ktextwidgets.nix {};
-    kunitconversion = callPackage ./kunitconversion.nix {};
-    kwallet = callPackage ./kwallet.nix {};
-    kwidgetsaddons = callPackage ./kwidgetsaddons.nix {};
-    kwindowsystem = callPackage ./kwindowsystem.nix {};
-    kxmlgui = callPackage ./kxmlgui.nix {};
-    kxmlrpcclient = callPackage ./kxmlrpcclient.nix {};
-    modemmanager-qt = callPackage ./modemmanager-qt.nix {};
-    networkmanager-qt = callPackage ./networkmanager-qt.nix {};
-    oxygen-icons5 = callPackage ./oxygen-icons5.nix {};
-    plasma-framework = callPackage ./plasma-framework {};
-    solid = callPackage ./solid.nix {};
-    sonnet = callPackage ./sonnet.nix {};
-    threadweaver = callPackage ./threadweaver.nix {};
-  };
-
-in packages
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
deleted file mode 100644
index 9717716faf5b..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Fri, 20 Feb 2015 23:17:39 -0600
-Subject: [PATCH] extra-cmake-modules paths
-
----
- kde-modules/KDEInstallDirs.cmake | 37 ++++---------------------------------
- 1 file changed, 4 insertions(+), 33 deletions(-)
-
-diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
-index b7cd34d..2f868ac 100644
---- a/kde-modules/KDEInstallDirs.cmake
-+++ b/kde-modules/KDEInstallDirs.cmake
-@@ -193,37 +193,8 @@
- # (To distribute this file outside of extra-cmake-modules, substitute the full
- #  License text for the above reference.)
- 
--# Figure out what the default install directory for libraries should be.
--# This is based on the logic in GNUInstallDirs, but simplified (the
--# GNUInstallDirs code deals with re-configuring, but that is dealt with
--# by the _define_* macros in this module).
-+# The default library directory on NixOS is *always* /lib.
- set(_LIBDIR_DEFAULT "lib")
--# Override this default 'lib' with 'lib64' iff:
--#  - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
--#  - we are NOT on debian
--#  - we are on a 64 bits system
--# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
--# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
--# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
--# See http://wiki.debian.org/Multiarch
--if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
--   AND NOT CMAKE_CROSSCOMPILING)
--  if (EXISTS "/etc/debian_version") # is this a debian system ?
--    if(CMAKE_LIBRARY_ARCHITECTURE)
--      set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
--    endif()
--  else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
--    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
--      message(AUTHOR_WARNING
--        "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
--        "Please enable at least one language before including KDEInstallDirs.")
--    else()
--      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
--        set(_LIBDIR_DEFAULT "lib64")
--      endif()
--    endif()
--  endif()
--endif()
- 
- set(_gnu_install_dirs_vars
-     BINDIR
-@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
-         "QtQuick2 imports"
-         QML_INSTALL_DIR)
- else()
--    _define_relative(QTPLUGINDIR LIBDIR "plugins"
-+    _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
-         "Qt plugins"
-         QT_PLUGIN_INSTALL_DIR)
- 
--    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports"
-+    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports"
-         "QtQuick1 imports"
-         IMPORTS_INSTALL_DIR)
- 
--    _define_relative(QMLDIR LIBDIR "qml"
-+    _define_relative(QMLDIR LIBDIR "qt5/qml"
-         "QtQuick2 imports"
-         QML_INSTALL_DIR)
- endif()
--- 
-2.3.0
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/default.nix
deleted file mode 100644
index 4e1b1aff3bd1..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kdeFramework, lib, stdenv, cmake, pkgconfig, qttools }:
-
-kdeFramework {
-  name = "extra-cmake-modules";
-  patches = [ ./0001-extra-cmake-modules-paths.patch ];
-
-  setupHook = ./setup-hook.sh;
-
-  # It is OK to propagate these inputs as long as
-  # extra-cmake-modules is never a propagated input
-  # of some other derivation.
-  propagatedNativeBuildInputs = [ cmake pkgconfig qttools ];
-
-  meta = {
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
deleted file mode 100644
index a6fa6189240b..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-addMimePkg() {
-    local propagated
-
-    if [[ -d "$1/share/mime" ]]; then
-        propagated=
-        for pkg in $propagatedBuildInputs; do
-            if [[ "z$pkg" == "z$1" ]]; then
-                propagated=1
-            fi
-        done
-        if [[ -z $propagated ]]; then
-            propagatedBuildInputs="$propagatedBuildInputs $1"
-        fi
-
-        propagated=
-        for pkg in $propagatedUserEnvPkgs; do
-            if [[ "z$pkg" == "z$1" ]]; then
-                propagated=1
-            fi
-        done
-        if [[ -z $propagated ]]; then
-            propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1"
-        fi
-    fi
-}
-
-envHooks+=(addMimePkg)
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.18/fetchsrcs.sh
deleted file mode 100755
index 84b882a0a075..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/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.18/"
-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/development/libraries/kde-frameworks-5.18/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.18/frameworkintegration.nix
deleted file mode 100644
index 26987c385ad5..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/frameworkintegration.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kbookmarks, kcompletion
-, kconfig, kconfigwidgets, ki18n, kiconthemes, kio, knotifications
-, kwidgetsaddons, libXcursor, qtx11extras
-}:
-
-kdeFramework {
-  name = "frameworkintegration";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kbookmarks kcompletion kconfig knotifications kwidgetsaddons
-    libXcursor
-  ];
-  propagatedBuildInputs = [ kconfigwidgets ki18n kio kiconthemes qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.18/kactivities.nix
deleted file mode 100644
index 3225098f4398..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kactivities.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, boost, kcmutils, kconfig
-, kcoreaddons, kdbusaddons, kdeclarative, kglobalaccel, ki18n
-, kio, kservice, kwindowsystem, kxmlgui, makeQtWrapper, qtdeclarative
-}:
-
-kdeFramework {
-  name = "kactivities";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [
-    boost kcmutils kconfig kcoreaddons kdbusaddons kservice
-    kxmlgui
-  ];
-  propagatedBuildInputs = [
-    kdeclarative kglobalaccel ki18n kio kwindowsystem qtdeclarative
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kactivitymanagerd"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kapidox.nix b/pkgs/development/libraries/kde-frameworks-5.18/kapidox.nix
deleted file mode 100644
index 647be8f052c3..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kapidox.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, python
-}:
-
-kdeFramework {
-  name = "kapidox";
-  nativeBuildInputs = [ extra-cmake-modules python ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.18/karchive.nix
deleted file mode 100644
index a8d9a0003c3b..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/karchive.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "karchive";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kauth/default.nix
deleted file mode 100644
index 2b000ff3c041..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kauth/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcoreaddons
-, polkit-qt
-}:
-
-kdeFramework {
-  name = "kauth";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ polkit-qt ];
-  propagatedBuildInputs = [ kcoreaddons ];
-  patches = [ ./kauth-policy-install.patch ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kauth/kauth-policy-install.patch b/pkgs/development/libraries/kde-frameworks-5.18/kauth/kauth-policy-install.patch
deleted file mode 100644
index 340155256f28..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kauth/kauth-policy-install.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/KF5AuthConfig.cmake.in b/KF5AuthConfig.cmake.in
-index e859ec7..9a8ab18 100644
---- a/KF5AuthConfig.cmake.in
-+++ b/KF5AuthConfig.cmake.in
-@@ -4,7 +4,7 @@ set(KAUTH_STUB_FILES_DIR "${PACKAGE_PREFIX_DIR}/@KF5_DATA_INSTALL_DIR@/kauth/")
- 
- set(KAUTH_BACKEND_NAME "@KAUTH_BACKEND_NAME@")
- set(KAUTH_HELPER_BACKEND_NAME "@KAUTH_HELPER_BACKEND_NAME@")
--set(KAUTH_POLICY_FILES_INSTALL_DIR "@KAUTH_POLICY_FILES_INSTALL_DIR@")
-+set(KAUTH_POLICY_FILES_INSTALL_DIR "\${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions")
- set(KAUTH_HELPER_INSTALL_DIR "@KAUTH_HELPER_INSTALL_DIR@")
- 
- find_dependency(KF5CoreAddons "@KF5_DEP_VERSION@")
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.18/kbookmarks.nix
deleted file mode 100644
index 1a469ab4db6d..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kbookmarks.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcodecs
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kiconthemes
-, kxmlgui
-}:
-
-kdeFramework {
-  name = "kbookmarks";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcodecs
-    kconfig
-    kconfigwidgets
-    kcoreaddons
-    kiconthemes
-    kxmlgui
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.18/kcmutils/0001-qdiriterator-follow-symlinks.patch
deleted file mode 100644
index 0d861fa95012..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kcmutils/0001-qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f14d2a275323a47104b33eb61c5b6910ae1a9f59 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:43:53 -0500
-Subject: [PATCH] qdiriterator follow symlinks
-
----
- src/kpluginselector.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kpluginselector.cpp b/src/kpluginselector.cpp
-index 9c3431d..d6b1ee2 100644
---- a/src/kpluginselector.cpp
-+++ b/src/kpluginselector.cpp
-@@ -305,7 +305,7 @@ void KPluginSelector::addPlugins(const QString &componentName,
-     QStringList desktopFileNames;
-     const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, componentName + QStringLiteral("/kpartplugins"), QStandardPaths::LocateDirectory);
-     Q_FOREACH (const QString &dir, dirs) {
--        QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
-+      QDirIterator it(dir, QStringList() << QStringLiteral("*.desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             desktopFileNames.append(it.next());
-         }
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kcmutils/default.nix
deleted file mode 100644
index dbbb783ac615..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kcmutils/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfigwidgets
-, kcoreaddons, kdeclarative, ki18n, kiconthemes, kitemviews
-, kpackage, kservice, kxmlgui
-}:
-
-kdeFramework {
-  name = "kcmutils";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcoreaddons kiconthemes kitemviews kpackage kxmlgui
-  ];
-  propagatedBuildInputs = [ kconfigwidgets kdeclarative ki18n kservice ];
-  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.18/kcodecs.nix
deleted file mode 100644
index 53a69a69b69c..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kcodecs.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kcodecs";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.18/kcompletion.nix
deleted file mode 100644
index e393774f16a5..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kcompletion.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kconfig
-, kwidgetsaddons
-}:
-
-kdeFramework {
-  name = "kcompletion";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kconfig kwidgetsaddons ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.18/kconfig.nix
deleted file mode 100644
index e132afe59886..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kconfig.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, makeQtWrapper
-}:
-
-kdeFramework {
-  name = "kconfig";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kreadconfig5"
-    wrapQtProgram "$out/bin/kwriteconfig5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
deleted file mode 100644
index 7a6c0ee90534..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4f84780893d505b2d62a14633dd983baa8ec6e28 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:47:01 -0500
-Subject: [PATCH] qdiriterator follow symlinks
-
----
- src/khelpclient.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/khelpclient.cpp b/src/khelpclient.cpp
-index 53a331e..80fbb01 100644
---- a/src/khelpclient.cpp
-+++ b/src/khelpclient.cpp
-@@ -48,7 +48,7 @@ void KHelpClient::invokeHelp(const QString &anchor, const QString &_appname)
-     QString docPath;
-     const QStringList desktopDirs = QStandardPaths::standardLocations(QStandardPaths::ApplicationsLocation);
-     Q_FOREACH (const QString &dir, desktopDirs) {
--        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories);
-+        QDirIterator it(dir, QStringList() << appname + QLatin1String(".desktop"), QDir::NoFilter, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-         while (it.hasNext()) {
-             const QString desktopPath(it.next());
-             KDesktopFile desktopFile(desktopPath);
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/default.nix
deleted file mode 100644
index 0e14d06edd36..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kauth, kcodecs, kconfig
-, kdoctools, kguiaddons, ki18n, kwidgetsaddons, makeQtWrapper
-}:
-
-kdeFramework {
-  name = "kconfigwidgets";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ kguiaddons ];
-  propagatedBuildInputs = [ kauth kconfig kcodecs ki18n kwidgetsaddons ];
-  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/preparetips5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.18/kcoreaddons.nix
deleted file mode 100644
index f3a1db7bd484..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kcoreaddons.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib, makeQtWrapper
-, extra-cmake-modules
-, shared_mime_info
-}:
-
-kdeFramework {
-  name = "kcoreaddons";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ shared_mime_info ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/desktoptojson"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.18/kcrash.nix
deleted file mode 100644
index bbab78ccb409..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kcrash.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcoreaddons
-, kwindowsystem
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kcrash";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons ];
-  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdbusaddons.nix
deleted file mode 100644
index d2ceab31d14b..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kdbusaddons.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, makeQtWrapper
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kdbusaddons";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  propagatedBuildInputs = [ qtx11extras ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kquitapp5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdeclarative.nix
deleted file mode 100644
index 74d107466cfc..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kdeclarative.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, epoxy, kconfig
-, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kpackage
-, kwidgetsaddons, kwindowsystem, makeQtWrapper, pkgconfig
-, qtdeclarative
-}:
-
-kdeFramework {
-  name = "kdeclarative";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [
-    epoxy kguiaddons kiconthemes kwidgetsaddons
-  ];
-  propagatedBuildInputs = [
-    kconfig kglobalaccel ki18n kio kpackage kwindowsystem qtdeclarative
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kpackagelauncherqml"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kded.nix b/pkgs/development/libraries/kde-frameworks-5.18/kded.nix
deleted file mode 100644
index 47ae2d68c68e..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kded.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kconfig
-, kcoreaddons
-, kcrash
-, kdbusaddons
-, kdoctools
-, kinit
-, kservice
-}:
-
-kdeFramework {
-  name = "kded";
-  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons kinit kservice ];
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix
deleted file mode 100644
index e61c4bb86e7c..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45, kauth
-, karchive, kcompletion, kconfig, kconfigwidgets, kcoreaddons
-, kcrash, kdbusaddons, kded, kdesignerplugin, kdoctools, kemoticons
-, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio, kitemmodels
-, kinit, knotifications, kparts, kservice, ktextwidgets
-, kunitconversion, kwidgetsaddons, kwindowsystem, kxmlgui
-, networkmanager, qtsvg, qtx11extras, xlibs
-}:
-
-# TODO: debug docbook detection
-
-kdeFramework {
-  name = "kdelibs4support";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [
-    kcompletion kconfig kded kservice kwidgetsaddons
-    kxmlgui networkmanager qtsvg qtx11extras xlibs.libSM
-  ];
-  propagatedBuildInputs = [
-    kauth karchive kconfigwidgets kcoreaddons kcrash kdbusaddons
-    kdesignerplugin kemoticons kglobalaccel kguiaddons ki18n kio
-    kiconthemes kitemmodels kinit knotifications kparts ktextwidgets
-    kunitconversion kwindowsystem
-  ];
-  cmakeFlags = [
-    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-    "-DDocBookXML4_DTD_VERSION=4.5"
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdesignerplugin.nix
deleted file mode 100644
index cbc114ccca03..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kdesignerplugin.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ kdeFramework, lib, makeQtWrapper
-, extra-cmake-modules
-, kcompletion
-, kconfig
-, kconfigwidgets
-, kcoreaddons
-, kdewebkit
-, kdoctools
-, kiconthemes
-, kio
-, kitemviews
-, kplotting
-, ktextwidgets
-, kwidgetsaddons
-, kxmlgui
-, sonnet
-}:
-
-kdeFramework {
-  name = "kdesignerplugin";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    kcompletion kconfig kconfigwidgets kcoreaddons kdewebkit
-    kiconthemes kitemviews kplotting ktextwidgets kwidgetsaddons
-    kxmlgui
-  ];
-  propagatedBuildInputs = [ kio sonnet ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kgendesignerplugin"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdesu.nix
deleted file mode 100644
index 364fbd6a720b..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kdesu.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n, kpty
-, kservice
-}:
-
-kdeFramework {
-  name = "kdesu";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons kservice ];
-  propagatedBuildInputs = [ ki18n kpty ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdewebkit.nix
deleted file mode 100644
index d361313d1d49..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kdewebkit.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, ki18n, kio, kjobwidgets, kparts, kservice, kwallet, qtwebkit
-}:
-
-kdeFramework {
-  name = "kdewebkit";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kconfig kcoreaddons kjobwidgets kparts kservice kwallet ];
-  propagatedBuildInputs = [ ki18n kio qtwebkit ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdnssd.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdnssd.nix
deleted file mode 100644
index f00432b0c9ce..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kdnssd.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, avahi
-}:
-
-kdeFramework {
-  name = "kdnssd";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ avahi ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/default.nix
deleted file mode 100644
index 138c3fc33b94..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/default.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, docbook_xml_dtd_45
-, docbook5_xsl, karchive, ki18n, makeQtWrapper, perl, perlPackages
-}:
-
-kdeFramework {
-  name = "kdoctools";
-  setupHook = ./setup-hook.sh;
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ karchive ];
-  propagatedBuildInputs = [ ki18n ];
-  propagatedNativeBuildInputs = [ makeQtWrapper perl perlPackages.URI ];
-  cmakeFlags = [
-    "-DDocBookXML4_DTD_DIR=${docbook_xml_dtd_45}/xml/dtd/docbook"
-    "-DDocBookXSL_DIR=${docbook5_xsl}/xml/xsl/docbook"
-  ];
-  patches = [ ./kdoctools-no-find-docbook-xml.patch ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/kdoctools-no-find-docbook-xml.patch
deleted file mode 100644
index 4e3a33efab32..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/kdoctools-no-find-docbook-xml.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5c4863c..f731775 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -46,7 +46,6 @@ set_package_properties(LibXml2 PROPERTIES
-                       )
- 
- 
--find_package(DocBookXML4 "4.5")
- 
- set_package_properties(DocBookXML4 PROPERTIES
-                        TYPE REQUIRED
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/setup-hook.sh
deleted file mode 100644
index 5cfffbd622d1..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/setup-hook.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-addXdgData() {
-    addToSearchPath XDG_DATA_DIRS "$1/share"
-}
-
-envHooks+=(addXdgData)
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.18/kemoticons.nix
deleted file mode 100644
index d165f84e3a2d..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kemoticons.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, karchive
-, kconfig
-, kcoreaddons
-, kservice
-}:
-
-kdeFramework {
-  name = "kemoticons";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ karchive kconfig kcoreaddons ];
-  propagatedBuildInputs = [ kservice ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata.nix b/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata.nix
deleted file mode 100644
index be99c58d5504..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, attr, ebook_tools, exiv2
-, ffmpeg, karchive, ki18n, poppler, qtbase, taglib
-}:
-
-kdeFramework {
-  name = "kfilemetadata";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ attr ebook_tools exiv2 ffmpeg karchive poppler taglib ];
-  propagatedBuildInputs = [ qtbase ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.18/kglobalaccel.nix
deleted file mode 100644
index c535b3590a38..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kglobalaccel.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kconfig
-, kcoreaddons
-, kcrash
-, kdbusaddons
-, kwindowsystem
-, makeQtWrapper
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kglobalaccel";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ kconfig kcoreaddons kcrash kdbusaddons ];
-  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kglobalaccel5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks-5.18/kguiaddons.nix
deleted file mode 100644
index bc4e9ab11843..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kguiaddons.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kguiaddons";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.18/khtml.nix
deleted file mode 100644
index d40df466ebbd..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/khtml.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, giflib, karchive
-, kcodecs, kglobalaccel, ki18n, kiconthemes, kio, kjs
-, knotifications, kparts, ktextwidgets, kwallet, kwidgetsaddons
-, kwindowsystem, kxmlgui, perl, phonon, qtx11extras, sonnet
-}:
-
-kdeFramework {
-  name = "khtml";
-  nativeBuildInputs = [ extra-cmake-modules perl ];
-  buildInputs = [
-    giflib karchive kiconthemes knotifications kwallet kwidgetsaddons
-    kxmlgui phonon
-  ];
-  propagatedBuildInputs = [
-    kcodecs kglobalaccel ki18n kio kjs kparts ktextwidgets
-    kwindowsystem qtx11extras sonnet
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.18/ki18n.nix
deleted file mode 100644
index 268006512e7c..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/ki18n.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, gettext
-, python
-, qtdeclarative
-, qtscript
-}:
-
-kdeFramework {
-  name = "ki18n";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtdeclarative qtscript ];
-  propagatedNativeBuildInputs = [ gettext python ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default-theme-breeze.patch b/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default-theme-breeze.patch
deleted file mode 100644
index 5b3b15d5d5b5..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default-theme-breeze.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kiconthemes-5.17.0/src/kicontheme.cpp
-===================================================================
---- kiconthemes-5.17.0.orig/src/kicontheme.cpp
-+++ kiconthemes-5.17.0/src/kicontheme.cpp
-@@ -557,7 +557,7 @@ void KIconTheme::reconfigure()
- // static
- QString KIconTheme::defaultThemeName()
- {
--    return QStringLiteral("oxygen");
-+    return QStringLiteral("breeze");
- }
- 
- void KIconTheme::assignIconsToContextMenu(ContextMenus type,
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default.nix
deleted file mode 100644
index b78b25582beb..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules, makeQtWrapper
-, kconfigwidgets, ki18n, breeze-icons, kitemviews, qtsvg
-}:
-
-kdeFramework {
-  name = "kiconthemes";
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ kconfigwidgets kitemviews qtsvg ];
-  propagatedBuildInputs = [ breeze-icons ki18n ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kiconfinder5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/series b/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/series
deleted file mode 100644
index ab5cc8a3edb2..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/series
+++ /dev/null
@@ -1 +0,0 @@
-default-theme-breeze.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.18/kidletime.nix
deleted file mode 100644
index fc0865600239..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kidletime.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qtbase
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kidletime";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  propagatedBuildInputs = [ qtbase ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.18/kimageformats.nix
deleted file mode 100644
index 49d66bbcc2c6..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kimageformats.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, ilmbase
-}:
-
-kdeFramework {
-  name = "kimageformats";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR";
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.18/kinit/0001-kinit-libpath.patch
deleted file mode 100644
index 9c76079a382a..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kinit/0001-kinit-libpath.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 723c9b1268a04127647a1c20eebe9804150566dd Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Sat, 13 Jun 2015 08:57:55 -0500
-Subject: [PATCH] kinit libpath
-
----
- src/kdeinit/kinit.cpp | 18 ++++++++++--------
- 1 file changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/src/kdeinit/kinit.cpp b/src/kdeinit/kinit.cpp
-index 9e775b6..0ac5646 100644
---- a/src/kdeinit/kinit.cpp
-+++ b/src/kdeinit/kinit.cpp
-@@ -660,15 +660,17 @@ static pid_t launch(int argc, const char *_name, const char *args,
-         if (!libpath.isEmpty()) {
-             if (!l.load()) {
-                 if (libpath_relative) {
--                    // NB: Because Qt makes the actual dlopen() call, the
--                    //     RUNPATH of kdeinit is *not* respected - see
--                    //     https://sourceware.org/bugzilla/show_bug.cgi?id=13945
--                    //     - so we try hacking it in ourselves
--                    QString install_lib_dir = QFile::decodeName(
--                            CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/");
--                    libpath = install_lib_dir + libpath;
--                    l.setFileName(libpath);
-+                  // Use QT_PLUGIN_PATH to find shared library directories
-+                  // For KF5, the plugin path is /lib/qt5/plugins/, so kdeinit5
-+                  // shared libraries should be in /lib/qt5/plugins/../../
-+                  const QRegExp pathSepRegExp(QString::fromLatin1("[:\b]"));
-+                  const QString up = QString::fromLocal8Bit("/../../");
-+                  const QStringList paths = QString::fromLocal8Bit(qgetenv("QT_PLUGIN_PATH")).split(pathSepRegExp, QString::KeepEmptyParts);
-+                  Q_FOREACH (const QString &path, paths) {
-+                    l.setFileName(path + up + libpath);
-                     l.load();
-+                    if (l.isLoaded()) break;
-+                  }
-                 }
-             }
-             if (!l.isLoaded()) {
--- 
-2.4.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kinit/default.nix
deleted file mode 100644
index 5f644d7c424e..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kinit/default.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcrash
-, kdoctools, ki18n, kio, kservice, kwindowsystem, libcap
-, libcap_progs
-}:
-
-# TODO: setuid wrapper
-
-kdeFramework {
-  name = "kinit";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools libcap_progs ];
-  buildInputs = [ kconfig kcrash kservice libcap ];
-  propagatedBuildInputs = [ ki18n kio kwindowsystem ];
-  patches = [ ./0001-kinit-libpath.patch ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kio/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kio/default.nix
deleted file mode 100644
index a2131ff33850..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kio/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules, acl, karchive
-, kbookmarks, kcompletion, kconfig, kconfigwidgets, kcoreaddons
-, kdbusaddons, kdoctools, ki18n, kiconthemes, kitemviews
-, kjobwidgets, knotifications, kservice, ktextwidgets, kwallet
-, kwidgetsaddons, kwindowsystem, kxmlgui, makeQtWrapper
-, qtscript, qtx11extras, solid
-}:
-
-kdeFramework {
-  name = "kio";
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    acl karchive kconfig kcoreaddons kdbusaddons kiconthemes
-    knotifications ktextwidgets kwallet kwidgetsaddons
-    qtscript
-  ];
-  propagatedBuildInputs = [
-    kbookmarks kcompletion kconfigwidgets ki18n kitemviews kjobwidgets
-    kservice kwindowsystem kxmlgui solid qtx11extras
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kcookiejar5"
-    wrapQtProgram "$out/bin/ktelnetservice5"
-    wrapQtProgram "$out/bin/ktrash5"
-    wrapQtProgram "$out/bin/kmailservice5"
-    wrapQtProgram "$out/bin/protocoltojson"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kio/samba-search-path.patch b/pkgs/development/libraries/kde-frameworks-5.18/kio/samba-search-path.patch
deleted file mode 100644
index c9ad46b41bb7..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kio/samba-search-path.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: kio-5.17.0/src/core/ksambashare.cpp
-===================================================================
---- kio-5.17.0.orig/src/core/ksambashare.cpp
-+++ kio-5.17.0/src/core/ksambashare.cpp
-@@ -67,13 +67,18 @@ KSambaSharePrivate::~KSambaSharePrivate(
- 
- bool KSambaSharePrivate::isSambaInstalled()
- {
--    if (QFile::exists(QStringLiteral("/usr/sbin/smbd"))
--            || QFile::exists(QStringLiteral("/usr/local/sbin/smbd"))) {
--        return true;
-+    const QByteArray pathEnv = qgetenv("PATH");
-+    if (!pathEnv.isEmpty()) {
-+        QLatin1Char pathSep(':');
-+        QStringList paths = QFile::decodeName(pathEnv).split(pathSep, QString::SkipEmptyParts);
-+        for (QStringList::iterator it = paths.begin(); it != paths.end(); ++it) {
-+            it->append("/smbd");
-+            if (QFile::exists(*it)) {
-+                return true;
-+            }
-+        }
-     }
- 
--    //qDebug() << "Samba is not installed!";
--
-     return false;
- }
- 
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kio/series b/pkgs/development/libraries/kde-frameworks-5.18/kio/series
deleted file mode 100644
index 77ca15450047..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kio/series
+++ /dev/null
@@ -1 +0,0 @@
-samba-search-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks-5.18/kitemmodels.nix
deleted file mode 100644
index a9024d771cc3..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kitemmodels.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kitemmodels";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.18/kitemviews.nix
deleted file mode 100644
index 931019ce495d..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kitemviews.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kitemviews";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.18/kjobwidgets.nix
deleted file mode 100644
index 746edf12eea0..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kjobwidgets.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcoreaddons
-, kwidgetsaddons
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kjobwidgets";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcoreaddons kwidgetsaddons ];
-  propagatedBuildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.18/kjs.nix
deleted file mode 100644
index 768720f178c8..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kjs.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kdoctools
-, makeQtWrapper
-}:
-
-kdeFramework {
-  name = "kjs";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kjs5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.18/kjsembed.nix
deleted file mode 100644
index 22eef2d47bde..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kjsembed.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kdoctools, ki18n, kjs
-, makeQtWrapper, qtsvg
-}:
-
-kdeFramework {
-  name = "kjsembed";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ qtsvg ];
-  propagatedBuildInputs = [ ki18n kjs ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kjscmd5"
-    wrapQtProgram "$out/bin/kjsconsole"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks-5.18/kmediaplayer.nix
deleted file mode 100644
index 460458b22323..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kmediaplayer.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kparts
-, kxmlgui
-}:
-
-kdeFramework {
-  name = "kmediaplayer";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kxmlgui ];
-  propagatedBuildInputs = [ kparts ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.18/knewstuff.nix
deleted file mode 100644
index 5bcd6f301462..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/knewstuff.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, attica, karchive
-, kcompletion, kconfig, kcoreaddons, ki18n, kiconthemes, kio
-, kitemviews, kservice, ktextwidgets, kwidgetsaddons, kxmlgui
-}:
-
-kdeFramework {
-  name = "knewstuff";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    karchive kcompletion kconfig kcoreaddons kiconthemes
-    kitemviews ktextwidgets kwidgetsaddons
-  ];
-  propagatedBuildInputs = [ attica ki18n kio kservice kxmlgui ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.18/knotifications.nix
deleted file mode 100644
index 7e301dd0f268..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/knotifications.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, kcodecs
-, kconfig
-, kcoreaddons
-, kwindowsystem
-, phonon
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "knotifications";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcodecs kconfig kcoreaddons phonon
-  ];
-  propagatedBuildInputs = [ kwindowsystem qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.18/knotifyconfig.nix
deleted file mode 100644
index dd99d2d4f1e5..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/knotifyconfig.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
-, ki18n, kio, phonon
-}:
-
-kdeFramework {
-  name = "knotifyconfig";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ kcompletion kconfig phonon ];
-  propagatedBuildInputs = [ ki18n kio ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/allow-external-paths.patch
deleted file mode 100644
index e9d744448148..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/allow-external-paths.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kpackage-5.18.0/src/kpackage/package.cpp
-===================================================================
---- kpackage-5.18.0.orig/src/kpackage/package.cpp
-+++ kpackage-5.18.0/src/kpackage/package.cpp
-@@ -808,7 +808,7 @@ PackagePrivate::PackagePrivate()
-     : QSharedData(),
-       fallbackPackage(0),
-       metadata(0),
--      externalPaths(false),
-+      externalPaths(true),
-       valid(false),
-       checkedValid(false)
- {
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/default.nix
deleted file mode 100644
index aea1b0d31a0d..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules
-, karchive
-, kconfig
-, kcoreaddons
-, kdoctools
-, ki18n
-, makeQtWrapper
-}:
-
-kdeFramework {
-  name = "kpackage";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [ karchive kconfig ];
-  propagatedBuildInputs = [ kcoreaddons ki18n ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  postInstall = ''
-    wrapQtProgram "$out/bin/kpackagetool5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/qdiriterator-follow-symlinks.patch
deleted file mode 100644
index ddbf17d00064..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Index: kpackage-5.18.0/src/kpackage/packageloader.cpp
-===================================================================
---- kpackage-5.18.0.orig/src/kpackage/packageloader.cpp
-+++ kpackage-5.18.0/src/kpackage/packageloader.cpp
-@@ -241,7 +241,7 @@ QList<KPluginMetaData> PackageLoader::li
-         } else {
-             //qDebug() << "Not cached";
-             // If there's no cache file, fall back to listing the directory
--            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories;
-+            const QDirIterator::IteratorFlags flags = QDirIterator::Subdirectories | QDirIterator::FollowSymlinks;
-             const QStringList nameFilters = QStringList(QStringLiteral("metadata.desktop")) << QStringLiteral("metadata.json");
- 
-             QDirIterator it(plugindir, nameFilters, QDir::Files, flags);
-Index: kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp
-===================================================================
---- kpackage-5.18.0.orig/src/kpackage/private/packagejobthread.cpp
-+++ kpackage-5.18.0/src/kpackage/private/packagejobthread.cpp
-@@ -146,7 +146,7 @@ bool indexDirectory(const QString& dir,
- 
-     QJsonArray plugins;
- 
--    QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories);
-+    QDirIterator it(dir, *metaDataFiles, QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-     while (it.hasNext()) {
-         it.next();
-         const QString path = it.fileInfo().absoluteFilePath();
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/series b/pkgs/development/libraries/kde-frameworks-5.18/kpackage/series
deleted file mode 100644
index 9b7f076efc70..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/series
+++ /dev/null
@@ -1,2 +0,0 @@
-allow-external-paths.patch
-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.18/kparts.nix
deleted file mode 100644
index 1c3e0b2cbc51..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kparts.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, ki18n, kiconthemes, kio, kjobwidgets, knotifications, kservice
-, ktextwidgets, kwidgetsaddons, kxmlgui
-}:
-
-kdeFramework {
-  name = "kparts";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kconfig kcoreaddons kiconthemes kjobwidgets knotifications
-    kservice kwidgetsaddons
-  ];
-  propagatedBuildInputs = [ ki18n kio ktextwidgets kxmlgui ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.18/kpeople.nix
deleted file mode 100644
index 4c3877e7efd2..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kpeople.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n
-, kitemviews, kservice, kwidgetsaddons, qtdeclarative
-}:
-
-kdeFramework {
-  name = "kpeople";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcoreaddons kitemviews kservice kwidgetsaddons
-  ];
-  propagatedBuildInputs = [ ki18n qtdeclarative ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kplotting.nix b/pkgs/development/libraries/kde-frameworks-5.18/kplotting.nix
deleted file mode 100644
index c16f51b5ac3c..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kplotting.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kplotting";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.18/kpty.nix
deleted file mode 100644
index 2e34e6f674ce..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kpty.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcoreaddons, ki18n }:
-
-kdeFramework {
-  name = "kpty";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ kcoreaddons ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kross.nix b/pkgs/development/libraries/kde-frameworks-5.18/kross.nix
deleted file mode 100644
index 7c6f079feaa7..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kross.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcompletion, kcoreaddons
-, kdoctools, ki18n, kiconthemes, kio, kparts, kwidgetsaddons
-, kxmlgui, qtscript
-}:
-
-kdeFramework {
-  name = "kross";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ kcompletion kcoreaddons kxmlgui ];
-  propagatedBuildInputs = [ ki18n kiconthemes kio kparts kwidgetsaddons qtscript ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.18/krunner.nix
deleted file mode 100644
index 12d2b54d0eb3..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/krunner.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, ki18n, kio, kservice, plasma-framework, qtquick1, solid
-, threadweaver
-}:
-
-kdeFramework {
-  name = "krunner";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kconfig kcoreaddons kservice qtquick1 solid threadweaver
-  ];
-  propagatedBuildInputs = [ ki18n kio plasma-framework ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.18/kservice/0001-qdiriterator-follow-symlinks.patch
deleted file mode 100644
index 3d8397d8ee2d..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kservice/0001-qdiriterator-follow-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ae8919eb81abad369e4a26ffcd845b140983398d Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:28:57 -0500
-Subject: [PATCH 1/2] qdiriterator follow symlinks
-
----
- src/sycoca/kbuildsycoca.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sycoca/kbuildsycoca.cpp b/src/sycoca/kbuildsycoca.cpp
-index 1deae14..250baa8 100644
---- a/src/sycoca/kbuildsycoca.cpp
-+++ b/src/sycoca/kbuildsycoca.cpp
-@@ -208,7 +208,7 @@ bool KBuildSycoca::build()
-         QStringList relFiles;
-         const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_resourceSubdir, QStandardPaths::LocateDirectory);
-         Q_FOREACH (const QString &dir, dirs) {
--            QDirIterator it(dir, QDirIterator::Subdirectories);
-+            QDirIterator it(dir, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
-             while (it.hasNext()) {
-                 const QString filePath = it.next();
-                 Q_ASSERT(filePath.startsWith(dir)); // due to the line below...
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/0002-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.18/kservice/0002-no-canonicalize-path.patch
deleted file mode 100644
index 685c68526119..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kservice/0002-no-canonicalize-path.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 46d124da602d84b7611a7ff0ac0862168d451cdb Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Wed, 14 Oct 2015 06:31:29 -0500
-Subject: [PATCH 2/2] no canonicalize path
-
----
- src/sycoca/vfolder_menu.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/sycoca/vfolder_menu.cpp b/src/sycoca/vfolder_menu.cpp
-index d3e31c3..d15d743 100644
---- a/src/sycoca/vfolder_menu.cpp
-+++ b/src/sycoca/vfolder_menu.cpp
-@@ -415,7 +415,7 @@ VFolderMenu::absoluteDir(const QString &_dir, const QString &baseDir, bool keepR
-     }
- 
-     if (!relative) {
--        QString resolved = QDir(dir).canonicalPath();
-+      QString resolved = QDir::cleanPath(dir);
-         if (!resolved.isEmpty()) {
-             dir = resolved;
-         }
--- 
-2.5.2
-
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
deleted file mode 100644
index 03b7c7c2f51d..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, kcrash, kdbusaddons, kdoctools, ki18n, kwindowsystem
-}:
-
-kdeFramework {
-  name = "kservice";
-  setupHook = ./setup-hook.sh;
-  nativeBuildInputs = [ extra-cmake-modules kdoctools ];
-  buildInputs = [ kcrash kdbusaddons ];
-  propagatedBuildInputs = [ kconfig kcoreaddons ki18n kwindowsystem ];
-  propagatedUserEnvPkgs = [ kcoreaddons ];
-  patches = [
-    ./0001-qdiriterator-follow-symlinks.patch
-    ./0002-no-canonicalize-path.patch
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh
deleted file mode 100644
index c28e862ff8ae..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kservice/setup-hook.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-addServicePkg() {
-    local propagated
-    for dir in "share/kservices5" "share/kservicetypes5"; do
-        if [[ -d "$1/$dir" ]]; then
-            propagated=
-            for pkg in $propagatedBuildInputs; do
-                if [[ "z$pkg" == "z$1" ]]; then
-                    propagated=1
-                    break
-                fi
-            done
-            if [[ -z $propagated ]]; then
-                propagatedBuildInputs="$propagatedBuildInputs $1"
-            fi
-
-            propagated=
-            for pkg in $propagatedUserEnvPkgs; do
-                if [[ "z$pkg" == "z$1" ]]; then
-                    propagated=1
-                    break
-                fi
-            done
-            if [[ -z $propagated ]]; then
-                propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1"
-            fi
-
-            break
-        fi
-    done
-}
-
-envHooks+=(addServicePkg)
-
-local propagated
-for pkg in $propagatedBuildInputs; do
-    if [[ "z$pkg" == "z@out@" ]]; then
-        propagated=1
-        break
-    fi
-done
-if [[ -z $propagated ]]; then
-    propagatedBuildInputs="$propagatedBuildInputs @out@"
-fi
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/default.nix
deleted file mode 100644
index b8df6a5f4c0d..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{ kdeFramework, lib, copyPathsToStore
-, extra-cmake-modules, makeQtWrapper, perl
-, karchive, kconfig, kguiaddons, kiconthemes, kparts
-, libgit2
-, qtscript, qtxmlpatterns
-, ki18n, kio, sonnet
-}:
-
-kdeFramework {
-  name = "ktexteditor";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper perl ];
-  buildInputs = [
-    karchive kconfig kguiaddons kiconthemes kparts
-    libgit2
-    qtscript qtxmlpatterns
-  ];
-  propagatedBuildInputs = [ ki18n kio sonnet ];
-  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/no-qcoreapplication.patch
deleted file mode 100644
index 19ab1e1e5513..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/no-qcoreapplication.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp
-===================================================================
---- ktexteditor-5.18.0.orig/src/syntax/data/katehighlightingindexer.cpp
-+++ ktexteditor-5.18.0/src/syntax/data/katehighlightingindexer.cpp
-@@ -55,19 +55,16 @@ QStringList readListing(const QString &f
- 
- int main(int argc, char *argv[])
- {
--    // get app instance
--    QCoreApplication app(argc, argv);
--
-     // ensure enough arguments are passed
--    if (app.arguments().size() < 3)
-+    if (argc < 3)
-         return 1;
- 
-     // open schema
-     QXmlSchema schema;
--    if (!schema.load(QUrl::fromLocalFile(app.arguments().at(2))))
-+    if (!schema.load(QUrl::fromLocalFile(QString::fromLocal8Bit(argv[2]))))
-         return 2;
- 
--    const QString hlFilenamesListing = app.arguments().value(3);
-+    const QString hlFilenamesListing = QString::fromLocal8Bit(argv[3]);
-     if (hlFilenamesListing.isEmpty()) {
-         return 1;
-     }
-@@ -152,7 +149,7 @@ int main(int argc, char *argv[])
-         return anyError;
- 
-     // create outfile, after all has worked!
--    QFile outFile(app.arguments().at(1));
-+    QFile outFile(QString::fromLocal8Bit(argv[1]));
-     if (!outFile.open(QIODevice::WriteOnly | QIODevice::Truncate))
-         return 7;
- 
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/series b/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/series
deleted file mode 100644
index 46cd23829a2f..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/series
+++ /dev/null
@@ -1 +0,0 @@
-no-qcoreapplication.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.18/ktextwidgets.nix
deleted file mode 100644
index e332d4ff9a83..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/ktextwidgets.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kcompletion, kconfig
-, kconfigwidgets, ki18n, kiconthemes, kservice, kwindowsystem
-, sonnet
-}:
-
-kdeFramework {
-  name = "ktextwidgets";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    kcompletion kconfig kconfigwidgets kiconthemes kservice
-  ];
-  propagatedBuildInputs = [ ki18n kwindowsystem sonnet ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.18/kunitconversion.nix
deleted file mode 100644
index 3cf0f847d83d..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kunitconversion.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, ki18n }:
-
-kdeFramework {
-  name = "kunitconversion";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ ki18n ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.18/kwallet.nix
deleted file mode 100644
index 7c4177e009d2..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kwallet.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications
-, kservice, kwidgetsaddons, kwindowsystem, libgcrypt, makeQtWrapper
-}:
-
-kdeFramework {
-  name = "kwallet";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    kconfig kcoreaddons kdbusaddons kiconthemes knotifications
-    kservice kwidgetsaddons libgcrypt
-  ];
-  propagatedBuildInputs = [ ki18n kwindowsystem ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/kwalletd5"
-    wrapQtProgram "$out/bin/kwallet-query"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.18/kwidgetsaddons.nix
deleted file mode 100644
index d95f44d3fecf..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kwidgetsaddons.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "kwidgetsaddons";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.18/kwindowsystem.nix
deleted file mode 100644
index 09ab1f2200de..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kwindowsystem.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, qtx11extras
-}:
-
-kdeFramework {
-  name = "kwindowsystem";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ qtx11extras ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.18/kxmlgui.nix
deleted file mode 100644
index f081d5f9170e..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kxmlgui.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, attica, kconfig
-, kconfigwidgets, kglobalaccel, ki18n, kiconthemes, kitemviews
-, ktextwidgets, kwindowsystem, sonnet
-}:
-
-kdeFramework {
-  name = "kxmlgui";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [
-    attica kconfig kiconthemes kitemviews ktextwidgets
-  ];
-  propagatedBuildInputs = [
-    kconfigwidgets kglobalaccel ki18n kwindowsystem sonnet
-  ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.18/kxmlrpcclient.nix
deleted file mode 100644
index 20a300b68bc8..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/kxmlrpcclient.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, ki18n, kio }:
-
-kdeFramework {
-  name = "kxmlrpcclient";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ ki18n kio ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.18/modemmanager-qt.nix
deleted file mode 100644
index 7d7f769d6a9b..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/modemmanager-qt.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, modemmanager
-}:
-
-kdeFramework {
-  name = "modemmanager-qt";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ modemmanager ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.18/networkmanager-qt.nix
deleted file mode 100644
index 333378bd1431..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/networkmanager-qt.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, networkmanager
-}:
-
-kdeFramework {
-  name = "networkmanager-qt";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  propagatedBuildInputs = [ networkmanager ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks-5.18/oxygen-icons5.nix
deleted file mode 100644
index ee350f8e1536..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/oxygen-icons5.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework
-, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "oxygen-icons5";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    license = lib.licenses.lgpl3Plus;
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.18/plasma-framework/default.nix
deleted file mode 100644
index d8846f777231..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/plasma-framework/default.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ kdeFramework, lib, extra-cmake-modules, kactivities, karchive
-, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative
-, kdoctools, kglobalaccel, kguiaddons, ki18n, kiconthemes, kio
-, knotifications, kpackage, kservice, kwindowsystem, kxmlgui
-, makeQtWrapper, qtscript, qtx11extras
-}:
-
-kdeFramework {
-  name = "plasma-framework";
-  nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
-  buildInputs = [
-    karchive kconfig kconfigwidgets kcoreaddons kdbusaddons kguiaddons
-    kiconthemes knotifications kxmlgui qtscript
-  ];
-  propagatedBuildInputs = [
-    kactivities kdeclarative kglobalaccel ki18n kio kpackage kservice kwindowsystem
-    qtx11extras
-  ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/plasmapkg2"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/solid.nix b/pkgs/development/libraries/kde-frameworks-5.18/solid.nix
deleted file mode 100644
index afd125e3c597..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/solid.nix
+++ /dev/null
@@ -1,17 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, makeQtWrapper
-, qtdeclarative
-}:
-
-kdeFramework {
-  name = "solid";
-  nativeBuildInputs = [ extra-cmake-modules makeQtWrapper ];
-  buildInputs = [ qtdeclarative ];
-  postInstall = ''
-    wrapQtProgram "$out/bin/solid-hardware5"
-  '';
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.18/sonnet.nix
deleted file mode 100644
index 943fe04a1c92..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/sonnet.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-, hunspell
-}:
-
-kdeFramework {
-  name = "sonnet";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  buildInputs = [ hunspell ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.18/srcs.nix
deleted file mode 100644
index 12c5c30a2471..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/srcs.nix
+++ /dev/null
@@ -1,565 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-  attica = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/attica-5.18.0.tar.xz";
-      sha256 = "1n6pkaak9xf7nyi0b1wr8fm5qkv7mgpsws9igd7g2xqvvqzyp5xw";
-      name = "attica-5.18.0.tar.xz";
-    };
-  };
-  baloo = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/baloo-5.18.0.tar.xz";
-      sha256 = "0sdnd6v01rcgq7v2jny0655jrghfamwyj0win7xfhx1622dfi8l8";
-      name = "baloo-5.18.0.tar.xz";
-    };
-  };
-  bluez-qt = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/bluez-qt-5.18.0.tar.xz";
-      sha256 = "17vx77w4fwdi7y394s2pqph2vmfs8n0107rmz4q7aa62q9iwdrbr";
-      name = "bluez-qt-5.18.0.tar.xz";
-    };
-  };
-  breeze-icons = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/breeze-icons-5.18.0.tar.xz";
-      sha256 = "0a4iqr5zrb56aln5hdsk5zrl23w8w8y5nmrxb093h205r36hfw4z";
-      name = "breeze-icons-5.18.0.tar.xz";
-    };
-  };
-  extra-cmake-modules = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/extra-cmake-modules-5.18.0.tar.xz";
-      sha256 = "1kp0pysa154cbp1ysgyqk03w8s335v3wmfrx4pshyfpg1s24k83y";
-      name = "extra-cmake-modules-5.18.0.tar.xz";
-    };
-  };
-  frameworkintegration = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/frameworkintegration-5.18.0.tar.xz";
-      sha256 = "06hw885mk0i2173lfdqz3hyp1fx2bndpj00hk32s3i2ggnn2y1rv";
-      name = "frameworkintegration-5.18.0.tar.xz";
-    };
-  };
-  kactivities = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kactivities-5.18.0.tar.xz";
-      sha256 = "0nqa63ds7vj87zg2gz1mx42c30l3ypfk4ghhgxwziab315bpcpmr";
-      name = "kactivities-5.18.0.tar.xz";
-    };
-  };
-  kapidox = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kapidox-5.18.0.tar.xz";
-      sha256 = "1hackjnpxijqqpn9cvnwcn9yc0jni21qgjccj74025ihdgigp70s";
-      name = "kapidox-5.18.0.tar.xz";
-    };
-  };
-  karchive = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/karchive-5.18.0.tar.xz";
-      sha256 = "0ph59w8y49b3znaj9c1qk0zwkg0pmjjcyr4jlv5w56mh0zkq37h5";
-      name = "karchive-5.18.0.tar.xz";
-    };
-  };
-  kauth = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kauth-5.18.0.tar.xz";
-      sha256 = "14kvy7cbw31sc48f0aldpi52wxhwd69prwadvjhqwy912s8kr04n";
-      name = "kauth-5.18.0.tar.xz";
-    };
-  };
-  kbookmarks = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kbookmarks-5.18.0.tar.xz";
-      sha256 = "0qi2f612s756qh5ldibscfhcq8q802vgr2497fm9xl95kfqmcg1n";
-      name = "kbookmarks-5.18.0.tar.xz";
-    };
-  };
-  kcmutils = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kcmutils-5.18.0.tar.xz";
-      sha256 = "1m53308icq1x1877afcxlhygl56dsl50fiwmfjf0g5pfmnql3qfp";
-      name = "kcmutils-5.18.0.tar.xz";
-    };
-  };
-  kcodecs = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kcodecs-5.18.0.tar.xz";
-      sha256 = "1injdpz7kdf2j6is2w3v3xgd9ahgls0j632q03q7qa48xp4wx64h";
-      name = "kcodecs-5.18.0.tar.xz";
-    };
-  };
-  kcompletion = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kcompletion-5.18.0.tar.xz";
-      sha256 = "0gkj4gplm7qwx4nqhhph5h3jp4h8b22ssmw0vvv6bpsnq7idk76b";
-      name = "kcompletion-5.18.0.tar.xz";
-    };
-  };
-  kconfig = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kconfig-5.18.0.tar.xz";
-      sha256 = "1s7fvhflsvv8zwb9cr50m3hxh0d4z5grh0nkri5ngzqb123wi91n";
-      name = "kconfig-5.18.0.tar.xz";
-    };
-  };
-  kconfigwidgets = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kconfigwidgets-5.18.0.tar.xz";
-      sha256 = "08i12040prs2nxybxbbf3w0n91c9p0c64j8fz18axi4yszrmv8im";
-      name = "kconfigwidgets-5.18.0.tar.xz";
-    };
-  };
-  kcoreaddons = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kcoreaddons-5.18.0.tar.xz";
-      sha256 = "05y8pan8hdn6qj2si9v9igjrx00l7bqzhdm2qq9vbjrv5xj8axzf";
-      name = "kcoreaddons-5.18.0.tar.xz";
-    };
-  };
-  kcrash = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kcrash-5.18.0.tar.xz";
-      sha256 = "0rk27zr0mb4jlicm1s175x139avzi0q4jk3mlczfg4rkrxzgbx5w";
-      name = "kcrash-5.18.0.tar.xz";
-    };
-  };
-  kdbusaddons = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kdbusaddons-5.18.0.tar.xz";
-      sha256 = "0l9ww3zaz1x6bk9axmm6zlj1dcn0gr0z61v9lw5y31rypxclhza8";
-      name = "kdbusaddons-5.18.0.tar.xz";
-    };
-  };
-  kdeclarative = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kdeclarative-5.18.0.tar.xz";
-      sha256 = "0mpvwn26msg3sc9z1r1vnw32rkl842jxpvpx2vg8kwcd9snwx9a6";
-      name = "kdeclarative-5.18.0.tar.xz";
-    };
-  };
-  kded = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kded-5.18.0.tar.xz";
-      sha256 = "0y5sn7yxalylcwcz2j4h349lll2vkf44bw3n6w2cbqqf5wnr2za5";
-      name = "kded-5.18.0.tar.xz";
-    };
-  };
-  kdelibs4support = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/portingAids/kdelibs4support-5.18.0.tar.xz";
-      sha256 = "0flhhjnnm2wh6869q8gxk45wlpq0679xlklzqlxvqx7a4kxdl8d8";
-      name = "kdelibs4support-5.18.0.tar.xz";
-    };
-  };
-  kdesignerplugin = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kdesignerplugin-5.18.0.tar.xz";
-      sha256 = "163lfx8vxxdhxbn090k5r4m9vy940kfwvsyjsi8v0pp9ww49g13n";
-      name = "kdesignerplugin-5.18.0.tar.xz";
-    };
-  };
-  kdesu = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kdesu-5.18.0.tar.xz";
-      sha256 = "0dqjmvi440p4n62w9y3qw4n7fcivyg3d54fv9nrf1sx87vdw7r83";
-      name = "kdesu-5.18.0.tar.xz";
-    };
-  };
-  kdewebkit = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kdewebkit-5.18.0.tar.xz";
-      sha256 = "1ahr62xfk085kb9p2axx04gf7bpnr0vv2d4kpc4s0xrj3xi0alnl";
-      name = "kdewebkit-5.18.0.tar.xz";
-    };
-  };
-  kdnssd = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kdnssd-5.18.0.tar.xz";
-      sha256 = "12vplqfsc3zks1grmb5i4hdww0g51lv54nb1drpj42mzyi1q1v1l";
-      name = "kdnssd-5.18.0.tar.xz";
-    };
-  };
-  kdoctools = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kdoctools-5.18.0.tar.xz";
-      sha256 = "10h74lb4597fs1h88x60ykpkz47pgfa4k04h4i5l0qb5vb1jlw7d";
-      name = "kdoctools-5.18.0.tar.xz";
-    };
-  };
-  kemoticons = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kemoticons-5.18.0.tar.xz";
-      sha256 = "0lba6rzmij20ndkq0vw9zkxbjq6g98may3ypyj0kc82d3sw9hkhs";
-      name = "kemoticons-5.18.0.tar.xz";
-    };
-  };
-  kfilemetadata = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kfilemetadata-5.18.0.tar.xz";
-      sha256 = "19b8nh5x8c0w516afh8ln72vi5dk91wl8bcsqd84h3s6gw55rsm4";
-      name = "kfilemetadata-5.18.0.tar.xz";
-    };
-  };
-  kglobalaccel = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kglobalaccel-5.18.0.tar.xz";
-      sha256 = "1v22rh8c103zl63cgg4gx430qw29f9yn9k5219pcw5n57jx0n5c1";
-      name = "kglobalaccel-5.18.0.tar.xz";
-    };
-  };
-  kguiaddons = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kguiaddons-5.18.0.tar.xz";
-      sha256 = "153mjbiwg4p65c2msj8j3pycn5gys39ahg9ik7jqg7w4cjcl2jxz";
-      name = "kguiaddons-5.18.0.tar.xz";
-    };
-  };
-  khtml = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/portingAids/khtml-5.18.0.tar.xz";
-      sha256 = "0kgin1bhbx95kypsg1k318qjxz3258x3a6kkdbky3cvfmq8r5ka5";
-      name = "khtml-5.18.0.tar.xz";
-    };
-  };
-  ki18n = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/ki18n-5.18.0.tar.xz";
-      sha256 = "14vlq49a0bp1vpjb2zxkgqsd5yjmb0azri2iq9sgxxx1v6gyy9h9";
-      name = "ki18n-5.18.0.tar.xz";
-    };
-  };
-  kiconthemes = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kiconthemes-5.18.0.tar.xz";
-      sha256 = "10pj2q28y57ng26xg2211v9vy91hqqmcyxh90q1qj89clykimwid";
-      name = "kiconthemes-5.18.0.tar.xz";
-    };
-  };
-  kidletime = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kidletime-5.18.0.tar.xz";
-      sha256 = "0726nq508rpzjxvfp354jd8n14m49grv6nfv09q2zyw02cf6n9bi";
-      name = "kidletime-5.18.0.tar.xz";
-    };
-  };
-  kimageformats = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kimageformats-5.18.0.tar.xz";
-      sha256 = "1y6zc04sx4sqyfavr8nf05a1p4kyb8ic335iy5s869r6zrvljpnc";
-      name = "kimageformats-5.18.0.tar.xz";
-    };
-  };
-  kinit = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kinit-5.18.0.tar.xz";
-      sha256 = "142xm7yglssw771340bs0lk1xgsr53218zh87v6n9hchrd34zg08";
-      name = "kinit-5.18.0.tar.xz";
-    };
-  };
-  kio = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kio-5.18.0.tar.xz";
-      sha256 = "020gvxs5xp9v4pra814200nv79c9b9j59skbrxq9cazhnywnnlns";
-      name = "kio-5.18.0.tar.xz";
-    };
-  };
-  kitemmodels = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kitemmodels-5.18.0.tar.xz";
-      sha256 = "0r5r7ia1lwqll6bz92k4qgj737hsg6pfhxmycr6g88b9fiab1qw4";
-      name = "kitemmodels-5.18.0.tar.xz";
-    };
-  };
-  kitemviews = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kitemviews-5.18.0.tar.xz";
-      sha256 = "10pbh0fpzrh0ijbadjx81690p9iw34rs2waks99fc0jy3hamny3b";
-      name = "kitemviews-5.18.0.tar.xz";
-    };
-  };
-  kjobwidgets = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kjobwidgets-5.18.0.tar.xz";
-      sha256 = "0gxvh9wxnfkrxm9zc7yx579vlxs3xmihfyqs92fpkjhy2shfd2sg";
-      name = "kjobwidgets-5.18.0.tar.xz";
-    };
-  };
-  kjs = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/portingAids/kjs-5.18.0.tar.xz";
-      sha256 = "0z89l2yhs3vld1qbd6v506lksmxvwrzgdq77aghy3mbkfgz3jd62";
-      name = "kjs-5.18.0.tar.xz";
-    };
-  };
-  kjsembed = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/portingAids/kjsembed-5.18.0.tar.xz";
-      sha256 = "0mpq7aywspm6l13afrr2dis8ygyld5il21g90ij0fc1jwp95zk3d";
-      name = "kjsembed-5.18.0.tar.xz";
-    };
-  };
-  kmediaplayer = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/portingAids/kmediaplayer-5.18.0.tar.xz";
-      sha256 = "07m3agz73yzmfn8ykg0f6a2c39rkzchzqc1iam2zfydqxyvh4bxb";
-      name = "kmediaplayer-5.18.0.tar.xz";
-    };
-  };
-  knewstuff = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/knewstuff-5.18.0.tar.xz";
-      sha256 = "0mda1n0py6nm9wp89z5hkhhk9ah5sjrkzl1dshd4lq77f7p7i1g4";
-      name = "knewstuff-5.18.0.tar.xz";
-    };
-  };
-  knotifications = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/knotifications-5.18.0.tar.xz";
-      sha256 = "1npir2v4irhm6xmzf60aj5388slq6fw7jbcwjjscldrwk2ca06hz";
-      name = "knotifications-5.18.0.tar.xz";
-    };
-  };
-  knotifyconfig = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/knotifyconfig-5.18.0.tar.xz";
-      sha256 = "0q2735m2m1wrnp7g4ycnbjy7qgpjxc5fvx9zrwnd0jl5rmdw4sbb";
-      name = "knotifyconfig-5.18.0.tar.xz";
-    };
-  };
-  kpackage = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kpackage-5.18.0.tar.xz";
-      sha256 = "14q2ssf3g7ljakzpq7q9q2zbm8jqk01ybjx4s16qpw9gakcrbli9";
-      name = "kpackage-5.18.0.tar.xz";
-    };
-  };
-  kparts = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kparts-5.18.0.tar.xz";
-      sha256 = "1q4xd4dy40mh4a8vgpvdamy1242isjy9ma94cf95qqc6qgjnqxhy";
-      name = "kparts-5.18.0.tar.xz";
-    };
-  };
-  kpeople = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kpeople-5.18.0.tar.xz";
-      sha256 = "0d0mp2qz3f1bki6rfw8x6zc0rmv4n43mi06k3vh30qpiaj7crl5k";
-      name = "kpeople-5.18.0.tar.xz";
-    };
-  };
-  kplotting = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kplotting-5.18.0.tar.xz";
-      sha256 = "1jiqx9gdv69frfh8vanphp6lzc3vxn2q1lhibi7v03qkc2qaw5cc";
-      name = "kplotting-5.18.0.tar.xz";
-    };
-  };
-  kpty = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kpty-5.18.0.tar.xz";
-      sha256 = "1baz1xs22r4qli74sqwpcjmxnfrd0iqyyzg1fmljr8fvs4pdy1x1";
-      name = "kpty-5.18.0.tar.xz";
-    };
-  };
-  kross = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/portingAids/kross-5.18.0.tar.xz";
-      sha256 = "1ky13yqxhkghxqd21jrnrpjfnrkgspv0p3dfij994rkaqq8rm1r6";
-      name = "kross-5.18.0.tar.xz";
-    };
-  };
-  krunner = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/portingAids/krunner-5.18.0.tar.xz";
-      sha256 = "14c51kiwr49dbdxg8y6ivmmfr9h6p8jjd32k35pi4gpi2vlh29pf";
-      name = "krunner-5.18.0.tar.xz";
-    };
-  };
-  kservice = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kservice-5.18.0.tar.xz";
-      sha256 = "0pbs1n2i7vjgjh7j87ps8gkzmj5igw1aib1aq089m4hfrl8pbrq8";
-      name = "kservice-5.18.0.tar.xz";
-    };
-  };
-  ktexteditor = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/ktexteditor-5.18.0.tar.xz";
-      sha256 = "0fx82s5y1wya3v36qq3agmfrnff9a7v94fhifvfiwmhk2ddwwg3v";
-      name = "ktexteditor-5.18.0.tar.xz";
-    };
-  };
-  ktextwidgets = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/ktextwidgets-5.18.0.tar.xz";
-      sha256 = "1wflqfmgqa3lh3apf22sami6caclvyv7li6qiskwfkzkb0a6x373";
-      name = "ktextwidgets-5.18.0.tar.xz";
-    };
-  };
-  kunitconversion = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kunitconversion-5.18.0.tar.xz";
-      sha256 = "0gpmndyly977dzfyfhrd0q434c0qr1sinh75dwf9clmqw576jl6i";
-      name = "kunitconversion-5.18.0.tar.xz";
-    };
-  };
-  kwallet = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kwallet-5.18.0.tar.xz";
-      sha256 = "0w69y0xdvvrvcydv160z7s03y1n5vxjj3sfk530zc6bjszplvxis";
-      name = "kwallet-5.18.0.tar.xz";
-    };
-  };
-  kwidgetsaddons = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kwidgetsaddons-5.18.0.tar.xz";
-      sha256 = "06fqz7cwczp5sahg54zi46rf9jf2si88w5yizp61z8yv57kvpvk1";
-      name = "kwidgetsaddons-5.18.0.tar.xz";
-    };
-  };
-  kwindowsystem = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kwindowsystem-5.18.0.tar.xz";
-      sha256 = "01hzd4r8y4hdpynnh32qf418hxzbd67fkdq6a4vabl384aipnmk7";
-      name = "kwindowsystem-5.18.0.tar.xz";
-    };
-  };
-  kxmlgui = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kxmlgui-5.18.0.tar.xz";
-      sha256 = "0yimy0r73sv8z4wq0mkdx24icjrzmy5bciblwlnzagd61f8j8qri";
-      name = "kxmlgui-5.18.0.tar.xz";
-    };
-  };
-  kxmlrpcclient = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kxmlrpcclient-5.18.0.tar.xz";
-      sha256 = "0h88pc3h5z3q58b7qxdn69klwr0p9ffbirzncyvxjrhr7dq36nv9";
-      name = "kxmlrpcclient-5.18.0.tar.xz";
-    };
-  };
-  modemmanager-qt = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/modemmanager-qt-5.18.0.tar.xz";
-      sha256 = "09k07wxkn511sa4hwmrs6jfx4lnnw3zcac5dzz43hhsmw74yj9az";
-      name = "modemmanager-qt-5.18.0.tar.xz";
-    };
-  };
-  networkmanager-qt = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/networkmanager-qt-5.18.0.tar.xz";
-      sha256 = "11j818ws5jz23hyilfpf3npk893hs388v1xpwhh0lkjwm60wkzln";
-      name = "networkmanager-qt-5.18.0.tar.xz";
-    };
-  };
-  oxygen-icons5 = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/oxygen-icons5-5.18.0.tar.xz";
-      sha256 = "11zmxc9n7x6iwdckwxwjji0497yjcsjli7pzr8d049lbc7xsjvi8";
-      name = "oxygen-icons5-5.18.0.tar.xz";
-    };
-  };
-  plasma-framework = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/plasma-framework-5.18.0.tar.xz";
-      sha256 = "1lxhlzx3jcqzx90kjl8w8p53nrgrkjiz1xf92ah3mygjyvi5rlh8";
-      name = "plasma-framework-5.18.0.tar.xz";
-    };
-  };
-  solid = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/solid-5.18.0.tar.xz";
-      sha256 = "0ilki4s3f3gjsdj6z41a8k4h2b52w8xrh2api0sqj0ifk2yhx6wh";
-      name = "solid-5.18.0.tar.xz";
-    };
-  };
-  sonnet = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/sonnet-5.18.0.tar.xz";
-      sha256 = "1780jvsfkasabdbk9xjhjcihcc6mxxipi2rsq2001flxnnx4kykg";
-      name = "sonnet-5.18.0.tar.xz";
-    };
-  };
-  threadweaver = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/threadweaver-5.18.0.tar.xz";
-      sha256 = "00c9vvyhyysg0cdlmvpls0h3pdbbhhwfxlm9l9i9r3j8x6rigm54";
-      name = "threadweaver-5.18.0.tar.xz";
-    };
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.18/threadweaver.nix
deleted file mode 100644
index 52817921cc72..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/threadweaver.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ kdeFramework, lib
-, extra-cmake-modules
-}:
-
-kdeFramework {
-  name = "threadweaver";
-  nativeBuildInputs = [ extra-cmake-modules ];
-  meta = {
-    maintainers = [ lib.maintainers.ttuegel ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 090dbc005ba4..3be0a681f86d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15032,7 +15032,7 @@ let
 
   kde5 =
     let
-      frameworks = import ../development/libraries/kde-frameworks-5.18 { inherit pkgs; };
+      frameworks = import ../development/libraries/kde-frameworks-5.19 { inherit pkgs; };
       plasma = import ../desktops/plasma-5.5 { inherit pkgs; };
       apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
       named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; };

From 7bca3cd8dc080ed42035a156964eb14739688bb9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 19 Feb 2016 06:21:50 -0600
Subject: [PATCH 1563/2285] kde5: reduce default installation size

---
 nixos/modules/services/x11/desktop-managers/kde5.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/kde5.nix b/nixos/modules/services/x11/desktop-managers/kde5.nix
index 713a156d35ab..867dea63cc22 100644
--- a/nixos/modules/services/x11/desktop-managers/kde5.nix
+++ b/nixos/modules/services/x11/desktop-managers/kde5.nix
@@ -76,8 +76,6 @@ in
 
     environment.systemPackages =
       [
-        pkgs.qt4 # qtconfig is the only way to set Qt 4 theme
-
         kde5.frameworkintegration
         kde5.kinit
 
@@ -103,16 +101,12 @@ in
         kde5.plasma-workspace
         kde5.plasma-workspace-wallpapers
 
-        kde5.ark
         kde5.dolphin
         kde5.dolphin-plugins
         kde5.ffmpegthumbs
-        kde5.gwenview
-        kde5.kate
         kde5.kdegraphics-thumbnailers
         kde5.kio-extras
         kde5.konsole
-        kde5.okular
         kde5.print-manager
 
         # Oxygen icons moved to KDE Frameworks 5.16 and later.

From 4b581903b3c49a11b7db9358308bed76df7b2ffa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 19 Feb 2016 13:46:21 +0100
Subject: [PATCH 1564/2285] requireFile: preferLocalBuild = true

There's no point trying to "distribute" showing the error message.
---
 pkgs/build-support/trivial-builders.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 134ef48ad061..6cd82adf8e70 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -118,15 +118,16 @@ rec {
       name = name_;
       outputHashAlgo = hashAlgo;
       outputHash = hash;
+      preferLocalBuild = true;
       builder = writeScript "restrict-message" ''
-source ${stdenv}/setup
-cat <<_EOF_
+        source ${stdenv}/setup
+        cat <<_EOF_
 
-***
-${msg}
-***
+        ***
+        ${msg}
+        ***
 
-_EOF_
+        _EOF_
       '';
     };
 

From 6f466c9dad0cc3f3a84e5fc2199131d6b8e2694b Mon Sep 17 00:00:00 2001
From: Jinjing Wang <nfjinjing@gmail.com>
Date: Fri, 19 Feb 2016 16:25:57 +0800
Subject: [PATCH 1565/2285] shadowsocks-libev: init at 2.4.5

---
 .../networking/shadowsocks-libev/default.nix  | 42 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/tools/networking/shadowsocks-libev/default.nix

diff --git a/pkgs/tools/networking/shadowsocks-libev/default.nix b/pkgs/tools/networking/shadowsocks-libev/default.nix
new file mode 100644
index 000000000000..e49f2e5dd63a
--- /dev/null
+++ b/pkgs/tools/networking/shadowsocks-libev/default.nix
@@ -0,0 +1,42 @@
+{ withPolarSSL ? false
+, stdenv, fetchurl, zlib
+, openssl ? null
+, polarssl ? null
+}:
+
+let
+
+  version = "2.4.5";
+  sha256 = "08bf7f240ee39fa700aac636ca84b65f2f0cfbcfa63a0783afb05872940067e2";
+
+in
+
+stdenv.mkDerivation rec {
+  inherit version;
+  name = "shadowsocks-libev-${version}";
+  src = fetchurl {
+    url = "https://github.com/shadowsocks/shadowsocks-libev/archive/v${version}.tar.gz";
+    inherit sha256;
+  };
+
+  buildInputs = [ zlib ]
+                ++ stdenv.lib.optional (!withPolarSSL) openssl
+                ++ stdenv.lib.optional withPolarSSL polarssl;
+
+  configureFlags = stdenv.lib.optional (withPolarSSL)
+                     [ "--with-crypto-library=polarssl"
+                       "--with-polarssl=${polarssl}"
+                     ];
+
+  meta = {
+    description = "A lightweight secured SOCKS5 proxy";
+    longDescription = ''
+      Shadowsocks-libev is a lightweight secured SOCKS5 proxy for embedded devices and low-end boxes.
+      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;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38d8bf296423..c6366ea85a64 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3133,6 +3133,8 @@ let
 
   sg3_utils = callPackage ../tools/system/sg3_utils { };
 
+  shadowsocks-libev = callPackage ../tools/networking/shadowsocks-libev { };
+
   sharutils = callPackage ../tools/archivers/sharutils { };
 
   shotwell = callPackage ../applications/graphics/shotwell {

From c6f143307c10ca4ecf448c523267bc37fa10299e Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 19 Feb 2016 17:00:19 +0300
Subject: [PATCH 1566/2285] uwsgi: refactor, throw sensible error if plugin is
 not found

---
 pkgs/servers/uwsgi/default.nix  | 46 ++++++++++++++++++---------------
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix
index abcbaa04b8c0..2d447d3c82a9 100644
--- a/pkgs/servers/uwsgi/default.nix
+++ b/pkgs/servers/uwsgi/default.nix
@@ -1,28 +1,35 @@
 { stdenv, lib, fetchurl, pkgconfig, jansson
-# plugins: list of strings, eg. [python2, python3]
+# plugins: list of strings, eg. [ "python2" "python3" ]
 , plugins
-, pam, withPAM ? stdenv.isLinux
-, systemd, withSystemd ? stdenv.isLinux
+, pam, withPAM ? false
+, systemd, withSystemd ? false
 , python2, python3, ncurses
 }:
 
-let pythonPlugin = pkg : { name = "python${if pkg ? isPy2 then "2" else "3"}";
-                           interpreter = pkg;
+let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else "3"}" {
+                           interpreter = pkg.interpreter;
                            path = "plugins/python";
-                           deps = [ pkg ncurses ];
+                           inputs = [ pkg ncurses ];
                            install = ''
                              install -Dm644 uwsgidecorators.py $out/${pkg.sitePackages}/uwsgidecorators.py
                              ${pkg.executable} -m compileall $out/${pkg.sitePackages}/
                              ${pkg.executable} -O -m compileall $out/${pkg.sitePackages}/
                            '';
                          };
-    available = [ (pythonPlugin python2)
+
+    available = lib.listToAttrs [
+                  (pythonPlugin python2)
                   (pythonPlugin python3)
                 ];
-     needed = builtins.filter (x: lib.any (y: x.name == y) plugins) available;
-in
 
-assert builtins.filter (x: lib.all (y: y.name != x) available) plugins == [];
+    getPlugin = name:
+      let all = lib.concatStringsSep ", " (lib.attrNames available);
+      in if lib.hasAttr name available
+         then lib.getAttr name available // { inherit name; }
+         else throw "Unknown UWSGI plugin ${name}, available : ${all}";
+
+    needed = builtins.map getPlugin plugins;
+in
 
 stdenv.mkDerivation rec {
   name = "uwsgi-2.0.11.2";
@@ -34,17 +41,15 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ python3 pkgconfig ];
 
-  buildInputs =  with stdenv.lib;
-                 [ jansson ]
-              ++ optional withPAM pam
-              ++ optional withSystemd systemd
-              ++ lib.concatMap (x: x.deps) needed
+  buildInputs =  [ jansson ]
+              ++ lib.optional withPAM pam
+              ++ lib.optional withSystemd systemd
+              ++ lib.concatMap (x: x.inputs) needed
               ;
 
-  basePlugins =  with stdenv.lib;
-                 concatStringsSep ","
-                 (  optional withPAM "pam"
-                 ++ optional withSystemd "systemd_logger"
+  basePlugins =  lib.concatStringsSep ","
+                 (  lib.optional withPAM "pam"
+                 ++ lib.optional withSystemd "systemd_logger"
                  );
 
   passthru = {
@@ -59,12 +64,11 @@ stdenv.mkDerivation rec {
   buildPhase = ''
     mkdir -p $pluginDir
     python3 uwsgiconfig.py --build nixos
-    ${lib.concatMapStringsSep ";" (x: "${x.interpreter.interpreter} uwsgiconfig.py --plugin ${x.path} nixos ${x.name}") needed}
+    ${lib.concatMapStringsSep ";" (x: "${x.interpreter} uwsgiconfig.py --plugin ${x.path} nixos ${x.name}") needed}
   '';
 
   installPhase = ''
     install -Dm755 uwsgi $out/bin/uwsgi
-    #cp *_plugin.so $pluginDir || true
     ${lib.concatMapStringsSep "\n" (x: x.install) needed}
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44c42e012a40..e915658b3505 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3477,6 +3477,8 @@ let
 
   uwsgi = callPackage ../servers/uwsgi {
     plugins = [];
+    withPAM = stdenv.isLinux;
+    withSystemd = stdenv.isLinux;
   };
 
   vacuum = callPackage ../applications/networking/instant-messengers/vacuum {};

From d39d87bb812fcd63a551b207bb0c66022048aed9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 19 Feb 2016 17:00:31 +0300
Subject: [PATCH 1567/2285] uwsgi: disable built-in yaml support

---
 pkgs/servers/uwsgi/nixos.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/uwsgi/nixos.ini b/pkgs/servers/uwsgi/nixos.ini
index 454eb51893fc..51bc6da33f6c 100644
--- a/pkgs/servers/uwsgi/nixos.ini
+++ b/pkgs/servers/uwsgi/nixos.ini
@@ -2,4 +2,5 @@
 plugin_dir = @pluginDir@
 main_plugin = @basePlugins@
 json = true
+yaml = false
 inherit = base

From c9b5c4a445845c48a7c7a3479087f2859c739f72 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 19 Feb 2016 15:12:08 +0100
Subject: [PATCH 1568/2285] kde5.kdeconnect: init at 0.9g

---
 pkgs/applications/misc/kdeconnect/0.7.nix     | 36 ++++++++++
 pkgs/applications/misc/kdeconnect/default.nix | 66 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  4 +-
 3 files changed, 82 insertions(+), 24 deletions(-)
 create mode 100644 pkgs/applications/misc/kdeconnect/0.7.nix

diff --git a/pkgs/applications/misc/kdeconnect/0.7.nix b/pkgs/applications/misc/kdeconnect/0.7.nix
new file mode 100644
index 000000000000..551d7c06468a
--- /dev/null
+++ b/pkgs/applications/misc/kdeconnect/0.7.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
+, gettext, kdelibs, libXtst, libfakekey, makeWrapper, qca2, qjson
+}:
+
+stdenv.mkDerivation rec {
+  name = "kdeconnect-${version}";
+  version = "0.7.3";
+
+  src = fetchurl {
+    url = "http://download.kde.org/unstable/kdeconnect/${version}/src/kdeconnect-kde-${version}.tar.xz";
+    sha256 = "1vrr047bq5skxvibv5pb9ch9dxh005zmar017jzbyb9hilxr8kg4";
+  };
+
+  buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper qca2 qjson ];
+
+  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
+
+  meta = with stdenv.lib; {
+    description = "A tool to connect and sync your devices with KDE";
+    longDescription = ''
+        The corresponding Android app, "KDE Connect", is available in
+        F-Droid and Google play and has the following features:
+
+        - Share files and URLs to KDE from any app
+        - Clipboard share: copy from or to your desktop
+        - Notifications sync (4.3+): Read your Android notifications from KDE
+        - Multimedia remote control: Use your phone as a remote control
+        - WiFi connection: no usb wire or bluetooth needed
+        - RSA Encryption: your information is safe 
+    '';
+    license = licenses.gpl2;
+    homepage = https://projects.kde.org/projects/playground/base/kdeconnect-kde;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.goibhniu ];
+  };
+}
diff --git a/pkgs/applications/misc/kdeconnect/default.nix b/pkgs/applications/misc/kdeconnect/default.nix
index 551d7c06468a..ff9c451461d5 100644
--- a/pkgs/applications/misc/kdeconnect/default.nix
+++ b/pkgs/applications/misc/kdeconnect/default.nix
@@ -1,36 +1,56 @@
-{ stdenv, fetchurl, automoc4, cmake, perl, pkgconfig
-, gettext, kdelibs, libXtst, libfakekey, makeWrapper, qca2, qjson
+{ stdenv
+, lib
+, fetchurl
+, extra-cmake-modules
+, makeQtWrapper
+, qtquick1
+, kcmutils
+, kconfigwidgets
+, kdbusaddons
+, kiconthemes
+, ki18n
+, knotifications
+, qca-qt5
+, libfakekey
+, libXtst
 }:
 
 stdenv.mkDerivation rec {
   name = "kdeconnect-${version}";
-  version = "0.7.3";
+  version = "0.9g";
 
   src = fetchurl {
-    url = "http://download.kde.org/unstable/kdeconnect/${version}/src/kdeconnect-kde-${version}.tar.xz";
-    sha256 = "1vrr047bq5skxvibv5pb9ch9dxh005zmar017jzbyb9hilxr8kg4";
+    url = http://download.kde.org/unstable/kdeconnect/0.9/src/kdeconnect-kde-0.9g.tar.xz;
+    sha256 = "4033754057bbc993b1d4350959afbe1d17a4f1e56dd60c6df6abca5a321ee1b8";
   };
 
-  buildInputs = [ gettext kdelibs libXtst libfakekey makeWrapper qca2 qjson ];
+  buildInputs = [
+    kcmutils
+    kconfigwidgets
+    kdbusaddons
+    qca-qt5
+    qtquick1
+    ki18n
+    kiconthemes
+    knotifications
+    libfakekey
+    libXtst
+  ];
 
-  nativeBuildInputs = [ automoc4 cmake perl pkgconfig ];
+  nativeBuildInputs = [
+    extra-cmake-modules
+    makeQtWrapper
+  ];
 
-  meta = with stdenv.lib; {
-    description = "A tool to connect and sync your devices with KDE";
-    longDescription = ''
-        The corresponding Android app, "KDE Connect", is available in
-        F-Droid and Google play and has the following features:
+  postInstall = ''
+    wrapQtProgram "$out/bin/kdeconnect-cli"
+  '';
 
-        - Share files and URLs to KDE from any app
-        - Clipboard share: copy from or to your desktop
-        - Notifications sync (4.3+): Read your Android notifications from KDE
-        - Multimedia remote control: Use your phone as a remote control
-        - WiFi connection: no usb wire or bluetooth needed
-        - RSA Encryption: your information is safe 
-    '';
-    license = licenses.gpl2;
-    homepage = https://projects.kde.org/projects/playground/base/kdeconnect-kde;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.goibhniu ];
+  meta = {
+    description = "KDE Connect provides several features to integrate your phone and your computer";
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ fridh ];
+    homepage = https://community.kde.org/KDEConnect;
   };
+
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 662905129e51..8cda40f93b7b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14734,7 +14734,7 @@ let
 
           kde_wacomtablet = callPackage ../applications/misc/kde-wacomtablet { };
 
-          kdeconnect = callPackage ../applications/misc/kdeconnect { };
+          kdeconnect = callPackage ../applications/misc/kdeconnect/0.7.nix { };
 
           kdenlive = callPackage ../applications/video/kdenlive { mlt = mlt-qt4; };
 
@@ -14926,6 +14926,8 @@ let
 
     k9copy = callPackage ../applications/video/k9copy {};
 
+    kdeconnect = callPackage ../applications/misc/kdeconnect { };
+
     konversation = callPackage ../applications/networking/irc/konversation/1.6.nix {
     };
 

From 883b788ab0c602a62f68e59e127522ae2fd22b45 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 19 Feb 2016 14:18:48 +0000
Subject: [PATCH 1569/2285] ricochet: 1.1.1 -> 1.1.2

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

diff --git a/pkgs/applications/networking/instant-messengers/ricochet/default.nix b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
index 89487e5bf27e..81e8d1b76a9c 100644
--- a/pkgs/applications/networking/instant-messengers/ricochet/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ricochet/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "ricochet-${version}";
-  version = "1.1.1";
+  version = "1.1.2";
 
   src = fetchurl {
     url = "https://github.com/ricochet-im/ricochet/archive/v${version}.tar.gz";
-    sha256 = "0y79igzgl9xn00981zcyxdlks7vnqxhb4rq3x8gwxm0yr98p39ms";
+    sha256 = "1szb5vmlqal0vhan87kgbks184f7xbfay1hr3d3vm8r1lvcjjfkr";
   };
 
   desktopItem = makeDesktopItem {

From 825ba05efbf26801138ca3558b42a040ea774f0a Mon Sep 17 00:00:00 2001
From: Adrien Devresse <adrien.devresse@epfl.ch>
Date: Thu, 18 Feb 2016 23:39:18 +0100
Subject: [PATCH 1570/2285] vmmlib: init at 1.6.2

vmmlib is a vector and matrix C++ library
---
 pkgs/development/libraries/vmmlib/default.nix | 41 +++++++++++++++++++
 .../libraries/vmmlib/disable-cpack.patch      | 11 +++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/libraries/vmmlib/default.nix
 create mode 100644 pkgs/development/libraries/vmmlib/disable-cpack.patch

diff --git a/pkgs/development/libraries/vmmlib/default.nix b/pkgs/development/libraries/vmmlib/default.nix
new file mode 100644
index 000000000000..3a7f8770e6c7
--- /dev/null
+++ b/pkgs/development/libraries/vmmlib/default.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, boost, blas }:
+
+stdenv.mkDerivation rec {
+  version = "1.6.2";
+  name = "vmmlib-${version}";
+  buildInputs = [ stdenv pkgconfig cmake boost blas ];
+
+  src = fetchFromGitHub {
+    owner = "VMML";
+    repo = "vmmlib";
+    rev = "release-${version}";
+    sha256 = "0sn6jl1r5k6ka0vkjsdnn14hb95dqq8158dapby6jk72wqj9kdml";
+  };
+
+  patches = [ 
+		./disable-cpack.patch   #disable the need of cpack/rpm
+	    ];
+  
+  enableParallelBuilding = true;
+
+  doCheck = true;
+
+  checkTarget = "test";
+
+  meta = with stdenv.lib; {
+    description = "A vector and matrix math library implemented using C++ templates";
+
+    longDescription = ''vmmlib is a vector and matrix math library implemented 
+            using C++ templates. Its basic functionality includes a vector 
+            and a matrix class, with additional functionality for the 
+            often-used 3d and 4d vectors and 3x3 and 4x4 matrices.
+            More advanced functionality include solvers, frustum 
+            computations and frustum culling classes, and spatial data structures'';
+
+    license     = licenses.bsd2;
+    homepage    = http://github.com/VMML/vmmlib/;
+    maintainers = [ maintainers.adev ];
+    platforms   = platforms.all;
+  };  
+}
+
diff --git a/pkgs/development/libraries/vmmlib/disable-cpack.patch b/pkgs/development/libraries/vmmlib/disable-cpack.patch
new file mode 100644
index 000000000000..8b9a7983a928
--- /dev/null
+++ b/pkgs/development/libraries/vmmlib/disable-cpack.patch
@@ -0,0 +1,11 @@
+diff -ur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	1970-01-01 00:00:01.000000000 +0000
++++ b/CMakeLists.txt	2016-02-19 08:49:30.053759000 +0000
+@@ -178,6 +178,5 @@
+ install(FILES ${DOCS} DESTINATION share/vmmlib COMPONENT dev)
+ 
+ include(DoxygenRule) # must be after all targets
+-include(CPackConfig)
+ include(CTest)
+-include(PackageConfig)
++
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38d8bf296423..cd4fb6cc904e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6508,6 +6508,8 @@ let
   eigen = callPackage ../development/libraries/eigen {};
 
   eigen2 = callPackage ../development/libraries/eigen/2.0.nix {};
+  
+  vmmlib = callPackage ../development/libraries/vmmlib {};  
 
   enchant = callPackage ../development/libraries/enchant { };
 

From e48c991131b4f75445e79b4da8871ae721339ae2 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 19 Feb 2016 17:02:14 +0300
Subject: [PATCH 1571/2285] uwsgi service: refactor, throw more errors and drop
 simultaneous Python 2/3 in path

---
 nixos/modules/services/web-servers/uwsgi.nix | 112 +++++++++++++------
 1 file changed, 77 insertions(+), 35 deletions(-)

diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix
index 3e18a6f0e986..39f7047af2da 100644
--- a/nixos/modules/services/web-servers/uwsgi.nix
+++ b/nixos/modules/services/web-servers/uwsgi.nix
@@ -5,44 +5,86 @@ with lib;
 let
   cfg = config.services.uwsgi;
 
-  python2Pkgs = pkgs.python2Packages.override {
-    python = pkgs.uwsgi.python2;
-    self = python2Pkgs;
-  };
-
-  python3Pkgs = pkgs.python3Packages.override {
-    python = pkgs.uwsgi.python3;
-    self = python3Pkgs;
-  };
-
-  buildCfg = c: if builtins.typeOf c != "set" then builtins.readFile c else builtins.toJSON {
-    uwsgi =
-      if c.type == "normal"
-        then {
-          pythonpath =
-               (if c ? python2Packages
-                then builtins.map (x: "${x}/${pkgs.uwsgi.python2.sitePackages}") (c.python2Packages python2Pkgs)
-                else [])
-            ++ (if c ? python3Packages
-                then builtins.map (x: "${x}/${pkgs.uwsgi.python3.sitePackages}") (c.python3Packages python3Pkgs)
-                else []);
-          plugins = cfg.plugins;
-        } // removeAttrs c [ "type" "python2Packages" "python3Packages" ]
-      else if c.type == "emperor"
-        then {
-          emperor = if builtins.typeOf c.vassals != "set" then c.vassals
-                    else pkgs.buildEnv {
-                      name = "vassals";
-                      paths = mapAttrsToList (n: c: pkgs.writeTextDir "${n}.json" (buildCfg c)) c.vassals;
-                    };
-        } // removeAttrs c [ "type" "vassals" ]
-      else abort "type should be either 'normal' or 'emperor'";
-  };
-
   uwsgi = pkgs.uwsgi.override {
     plugins = cfg.plugins;
   };
 
+  buildCfg = name: c:
+    let
+      plugins =
+        if any (n: !any (m: m == n) cfg.plugins) (c.plugins or [])
+        then throw "`plugins` attribute in UWSGI configuration contains plugins not in config.services.uwsgi.plugins"
+        else c.plugins or cfg.plugins;
+
+      hasPython = v: filter (n: n == "python${v}") plugins != [];
+      hasPython2 = hasPython "2";
+      hasPython3 = hasPython "3";
+
+      python =
+        if hasPython2 && hasPython3 then
+          throw "`plugins` attribute in UWSGI configuration shouldn't contain both python2 and python3"
+        else if hasPython2 then uwsgi.python2
+        else if hasPython3 then uwsgi.python3
+        else null;
+
+      pythonPackages = pkgs.pythonPackages.override {
+        inherit python;
+        self = pythonPackages;
+      };
+
+      json = builtins.toJSON {
+        uwsgi =
+          if c.type == "normal"
+            then {
+              inherit plugins;
+            } // removeAttrs c [ "type" "pythonPackages" ]
+              // optionalAttrs (python != null) {
+                pythonpath = "@PYTHONPATH@";
+                env = (c.env or {}) // {
+                  PATH = optionalString (c ? env.PATH) "${c.env.PATH}:" + "@PATH@";
+                };
+              }
+          else if c.type == "emperor"
+            then {
+              emperor = if builtins.typeOf c.vassals != "set" then c.vassals
+                        else pkgs.buildEnv {
+                          name = "vassals";
+                          paths = mapAttrsToList buildCfg c.vassals;
+                        };
+            } // removeAttrs c [ "type" "vassals" ]
+          else throw "`type` attribute in UWSGI configuration should be either 'normal' or 'emperor'";
+      };
+
+    in
+      if python == null || c.type != "normal"
+      then pkgs.writeTextDir "${name}.json" json
+      else pkgs.stdenv.mkDerivation {
+        name = "uwsgi-config";
+        inherit json;
+        passAsFile = [ "json" ];
+        nativeBuildInputs = [ pythonPackages.wrapPython ];
+        pythonInputs = (c.pythonPackages or (self: [])) pythonPackages;
+
+        buildCommand = ''
+          mkdir $out
+          declare -A pythonPathsSeen=()
+          program_PYTHONPATH=
+          program_PATH=
+          if [ -n "$pythonInputs" ]; then
+            for i in $pythonInputs; do
+              _addToPythonPath $i
+            done
+          fi
+          # A hack to replace "@PYTHONPATH@" with a JSON list
+          if [ -n "$program_PYTHONPATH" ]; then
+            program_PYTHONPATH="\"''${program_PYTHONPATH//:/\",\"}\""
+          fi
+          substitute $jsonPath $out/${name}.json \
+            --replace '"@PYTHONPATH@"' "[$program_PYTHONPATH]" \
+            --subst-var-by PATH "$program_PATH"
+        '';
+      };
+
 in {
 
   options = {
@@ -118,7 +160,7 @@ in {
       '';
       serviceConfig = {
         Type = "notify";
-        ExecStart = "${uwsgi}/bin/uwsgi --uid ${cfg.user} --gid ${cfg.group} --json ${pkgs.writeText "uwsgi.json" (buildCfg cfg.instance)}";
+        ExecStart = "${uwsgi}/bin/uwsgi --uid ${cfg.user} --gid ${cfg.group} --json ${buildCfg "server" cfg.instance}/server.json";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         ExecStop = "${pkgs.coreutils}/bin/kill -INT $MAINPID";
         NotifyAccess = "main";

From b6c49abba028bea76ba85966beb1e4149d5865be Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 19 Feb 2016 17:10:05 +0300
Subject: [PATCH 1572/2285] uwsgi service: update documentation

---
 nixos/modules/services/web-servers/uwsgi.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/web-servers/uwsgi.nix b/nixos/modules/services/web-servers/uwsgi.nix
index 39f7047af2da..e6c25e6215c1 100644
--- a/nixos/modules/services/web-servers/uwsgi.nix
+++ b/nixos/modules/services/web-servers/uwsgi.nix
@@ -113,21 +113,24 @@ in {
             vassals = {
               moin = {
                 type = "normal";
-                python2Packages = self: with self; [ moinmoin ];
+                pythonPackages = self: with self; [ moinmoin ];
                 socket = "${config.services.uwsgi.runDir}/uwsgi.sock";
               };
             };
           }
         '';
         description = ''
-          uWSGI configuration. This awaits either a path to file or a set which will be made into one.
-          If given a set, it awaits an attribute <literal>type</literal> which can be either <literal>normal</literal>
-          or <literal>emperor</literal>.
+          uWSGI configuration. It awaits an attribute <literal>type</literal> inside which can be either
+          <literal>normal</literal> or <literal>emperor</literal>.
+
+          For <literal>normal</literal> mode you can specify <literal>pythonPackages</literal> as a function
+          from libraries set into a list of libraries. <literal>pythonpath</literal> will be set accordingly.
 
-          For <literal>normal</literal> mode you can specify <literal>python2Packages</literal> and
-          <literal>python3Packages</literal> as functions from libraries set into lists of libraries.
           For <literal>emperor</literal> mode, you should use <literal>vassals</literal> attribute
           which should be either a set of names and configurations or a path to a directory.
+
+          Other attributes will be used in configuration file as-is. Notice that you can redefine
+          <literal>plugins</literal> setting here.
         '';
       };
 

From 24edc61fcde7367f628a6403762cb87a2f9845c2 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 19 Feb 2016 16:22:39 +0100
Subject: [PATCH 1573/2285] khard: Fix version 0.8.1 runtime error by rewriting
 dependencies

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

diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index 0c88314ed02e..8326347b02e6 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -11,14 +11,15 @@ pythonPackages.buildPythonPackage rec {
   };
 
   propagatedBuildInputs = with pythonPackages; [
+    atomicwrites
     configobj
     vobject
     argparse
+    pyyaml
   ];
 
   buildInputs = with pythonPackages; [
     pkgs.vdirsyncer
-    pyyaml
   ];
 
   meta = {

From cb8ac5742d87cb566996c1b4e8f4f2cc21f604ee Mon Sep 17 00:00:00 2001
From: "Rommel M. Martinez" <ebzzry@gmail.com>
Date: Sat, 20 Feb 2016 01:30:54 +0800
Subject: [PATCH 1574/2285] ugarit-manifest-maker: init at 0.1

---
 .../backup/ugarit-manifest-maker/default.nix  |  31 ++
 .../backup/ugarit-manifest-maker/eggs.nix     | 431 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 3 files changed, 464 insertions(+)
 create mode 100644 pkgs/tools/backup/ugarit-manifest-maker/default.nix
 create mode 100644 pkgs/tools/backup/ugarit-manifest-maker/eggs.nix

diff --git a/pkgs/tools/backup/ugarit-manifest-maker/default.nix b/pkgs/tools/backup/ugarit-manifest-maker/default.nix
new file mode 100644
index 000000000000..00651806a10a
--- /dev/null
+++ b/pkgs/tools/backup/ugarit-manifest-maker/default.nix
@@ -0,0 +1,31 @@
+{ pkgs, stdenv, eggDerivation, fetchegg }:
+let
+  eggs = import ./eggs.nix { inherit pkgs stdenv eggDerivation fetchegg; };
+in with pkgs; eggDerivation rec {
+  pname = "ugarit-manifest-maker";
+  version = "0.1";
+  name = "${pname}-${version}";
+
+  src = fetchegg {
+    inherit version;
+    name = pname;
+    sha256 = "1jv8lhn4s5a3qphqd3zfwl1py0m5cmqj1h55ys0935m5f422547q";
+  };
+
+  buildInputs = with eggs; [
+    matchable
+    srfi-37
+    fnmatch
+    miscmacros
+    ugarit
+    numbers
+  ];
+
+  meta = with stdenv.lib; {
+    homepage = https://www.kitten-technologies.co.uk/project/ugarit-manifest-maker/;
+    description = "A tool for generating import manifests for Ugarit";
+    license = licenses.bsd3;
+    maintainers = [ maintainers.ebzzry ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix b/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix
new file mode 100644
index 000000000000..182af5328eeb
--- /dev/null
+++ b/pkgs/tools/backup/ugarit-manifest-maker/eggs.nix
@@ -0,0 +1,431 @@
+{ pkgs, stdenv, eggDerivation, fetchegg }:
+rec {
+  blob-utils = eggDerivation {
+    name = "blob-utils-1.0.3";
+
+    src = fetchegg {
+      name = "blob-utils";
+      version = "1.0.3";
+      sha256 = "17vdn02fnxnjx5ixgqimln93lqvzyq4y9w02fw7xnbdcjzqm0xml";
+    };
+
+    buildInputs = [
+      setup-helper
+      string-utils
+    ];
+  };
+
+  check-errors = eggDerivation {
+    name = "check-errors-1.13.0";
+
+    src = fetchegg {
+      name = "check-errors";
+      version = "1.13.0";
+      sha256 = "12a0sn82n98jybh72zb39fdddmr5k4785xglxb16750fhy8rmjwi";
+    };
+
+    buildInputs = [
+      setup-helper
+    ];
+  };
+
+  crypto-tools = eggDerivation {
+    name = "crypto-tools-1.3";
+
+    src = fetchegg {
+      name = "crypto-tools";
+      version = "1.3";
+      sha256 = "0442wly63zis19vh8xc9nhxgp9sabaccxylpzmchd5f1d48iag65";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  fnmatch = eggDerivation {
+    name = "fnmatch-1.0.1";
+
+    src = fetchegg {
+      name = "fnmatch";
+      version = "1.0.1";
+      sha256 = "1m3jmyhkyqmjr7v628g6w5n3cqihcfnryrxn91k4597q7vjhikqr";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  foreigners = eggDerivation {
+    name = "foreigners-1.4.1";
+
+    src = fetchegg {
+      name = "foreigners";
+      version = "1.4.1";
+      sha256 = "07nvyadhkd52q0kkvch1a5d7ivpmrhmyg295s4mxb1nw4wz46gfz";
+    };
+
+    buildInputs = [
+      matchable
+    ];
+  };
+
+  lookup-table = eggDerivation {
+    name = "lookup-table-1.13.5";
+
+    src = fetchegg {
+      name = "lookup-table";
+      version = "1.13.5";
+      sha256 = "1nzly6rhynawlvzlyilk8z8cxz57cf9n5iv20glkhh28pz2izmrb";
+    };
+
+    buildInputs = [
+      setup-helper
+      check-errors
+      miscmacros
+      record-variants
+      synch
+    ];
+  };
+
+  lru-cache = eggDerivation {
+    name = "lru-cache-0.5.3";
+
+    src = fetchegg {
+      name = "lru-cache";
+      version = "0.5.3";
+      sha256 = "0z6g3106c4j21v968hfzy9nnbfq2d83y0nyd20aifpq4g55c0d40";
+    };
+
+    buildInputs = [
+      record-variants
+    ];
+  };
+
+  matchable = eggDerivation {
+    name = "matchable-3.3";
+
+    src = fetchegg {
+      name = "matchable";
+      version = "3.3";
+      sha256 = "07y3lpzgm4djiwi9y2adc796f9kwkmdr28fkfkw65syahdax8990";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  message-digest = eggDerivation {
+    name = "message-digest-3.1.0";
+
+    src = fetchegg {
+      name = "message-digest";
+      version = "3.1.0";
+      sha256 = "1w6bax19dwgih78vcimiws0rja7qsd8hmbm6qqg2hf9cw3vab21s";
+    };
+
+    buildInputs = [
+      setup-helper
+      miscmacros
+      check-errors
+      variable-item
+      blob-utils
+      string-utils
+    ];
+  };
+
+  miscmacros = eggDerivation {
+    name = "miscmacros-2.96";
+
+    src = fetchegg {
+      name = "miscmacros";
+      version = "2.96";
+      sha256 = "1ajdgjrni10i2hmhcp4rawnxajjxry3kmq1krdmah4sf0kjrgajc";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  numbers = eggDerivation {
+    name = "numbers-4.4";
+
+    src = fetchegg {
+      name = "numbers";
+      version = "4.4";
+      sha256 = "0bg5zs6jcr9arj4a7r2xqxf2n17bx93640jaivgchbdj1gixranm";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  parley = eggDerivation {
+    name = "parley-0.9.2";
+
+    src = fetchegg {
+      name = "parley";
+      version = "0.9.2";
+      sha256 = "1vsbx4dk1240gzq02slzmavd1jrq04qj7ssnvg15h8xh81xwhbbz";
+    };
+
+    buildInputs = [
+      stty
+      srfi-71
+      miscmacros
+    ];
+  };
+
+  pathname-expand = eggDerivation {
+    name = "pathname-expand-0.1";
+
+    src = fetchegg {
+      name = "pathname-expand";
+      version = "0.1";
+      sha256 = "14llya7l04z49xpi3iylk8aglrw968vy304ymavhhqlyzmzwkx3g";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  posix-extras = eggDerivation {
+    name = "posix-extras-0.1.6";
+
+    src = fetchegg {
+      name = "posix-extras";
+      version = "0.1.6";
+      sha256 = "0gnmhn2l0161ham7f8i0lx1ay94ap8l8l7ga4nw9qs86lk024abi";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  record-variants = eggDerivation {
+    name = "record-variants-0.5.1";
+
+    src = fetchegg {
+      name = "record-variants";
+      version = "0.5.1";
+      sha256 = "15wgysxkm8m4hx9nhhw9akchzipdnqc7yj3qd3zn0z7sxg4sld1h";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  regex = eggDerivation {
+    name = "regex-1.0";
+
+    src = fetchegg {
+      name = "regex";
+      version = "1.0";
+      sha256 = "1z9bh7xvab6h5cdlsz8jk02pv5py1i6ryqarbcs3wdgkkjgmmkif";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  setup-helper = eggDerivation {
+    name = "setup-helper-1.5.5";
+
+    src = fetchegg {
+      name = "setup-helper";
+      version = "1.5.5";
+      sha256 = "1lpplp8f2wyc486dd98gs4wl1kkhh1cs6vdqkxrdk7f92ikmwbx3";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  sql-de-lite = eggDerivation {
+    name = "sql-de-lite-0.6.6";
+
+    src = fetchegg {
+      name = "sql-de-lite";
+      version = "0.6.6";
+      sha256 = "1mh3hpsibq2gxcpjaycqa4ckznj268xpfzsa6pn0i6iac6my3qra";
+    };
+
+    buildInputs = [
+      lru-cache
+      foreigners
+    ];
+  };
+
+  srfi-37 = eggDerivation {
+    name = "srfi-37-1.3.1";
+
+    src = fetchegg {
+      name = "srfi-37";
+      version = "1.3.1";
+      sha256 = "1a2zdkdzrv15fw9dfdy8067fsgh4kr8ppffm8mc3cmlczrrd58cb";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  srfi-71 = eggDerivation {
+    name = "srfi-71-1.1";
+
+    src = fetchegg {
+      name = "srfi-71";
+      version = "1.1";
+      sha256 = "01mlaxw2lfczykmx69xki2s0f4ywlg794rl4kz07plvzn0s3fbqq";
+    };
+
+    buildInputs = [
+      
+    ];
+  };
+
+  ssql = eggDerivation {
+    name = "ssql-0.2.2";
+
+    src = fetchegg {
+      name = "ssql";
+      version = "0.2.2";
+      sha256 = "10557ymy0fgvqqazsg2jsbqvng0b91jqcjfgsxkrq8xs3klyd5mf";
+    };
+
+    buildInputs = [
+      matchable
+    ];
+  };
+
+  string-utils = eggDerivation {
+    name = "string-utils-1.2.4";
+
+    src = fetchegg {
+      name = "string-utils";
+      version = "1.2.4";
+      sha256 = "07alvghg0dahilrm4jg44bndl0x69sv1zbna9l20cbdvi35i0jp1";
+    };
+
+    buildInputs = [
+      setup-helper
+      miscmacros
+      lookup-table
+      check-errors
+    ];
+  };
+
+  stty = eggDerivation {
+    name = "stty-0.2.6";
+
+    src = fetchegg {
+      name = "stty";
+      version = "0.2.6";
+      sha256 = "09jmjpdsd3yg6d0f0imcihmn49i28x09lgl60i2dllffs25k22s4";
+    };
+
+    buildInputs = [
+      setup-helper
+      foreigners
+    ];
+  };
+
+  synch = eggDerivation {
+    name = "synch-2.1.2";
+
+    src = fetchegg {
+      name = "synch";
+      version = "2.1.2";
+      sha256 = "1m9mnbq0m5jsxmd1a3rqpwpxj0l1b7vn1fknvxycc047pmlcyl00";
+    };
+
+    buildInputs = [
+      setup-helper
+      check-errors
+    ];
+  };
+
+  tiger-hash = eggDerivation {
+    name = "tiger-hash-3.1.0";
+
+    src = fetchegg {
+      name = "tiger-hash";
+      version = "3.1.0";
+      sha256 = "0j9dsbjp9cw0y4w4srg0qwgh53jw2v3mx4y4h040ds0fkxlzzknx";
+    };
+
+    buildInputs = [
+      message-digest
+    ];
+  };
+
+  ugarit = eggDerivation {
+    name = "ugarit-2.0";
+
+    src = fetchegg {
+      name = "ugarit";
+      version = "2.0";
+      sha256 = "1l5zkr6b8l5dw9p5mimbva0ncqw1sbvp3d4cywm1hqx2m03a0f1n";
+    };
+
+    buildInputs = [
+      miscmacros
+      sql-de-lite
+      crypto-tools
+      srfi-37
+      stty
+      matchable
+      regex
+      tiger-hash
+      message-digest
+      posix-extras
+      parley
+      ssql
+      pathname-expand
+    ];
+  };
+
+  ugarit-manifest-maker = eggDerivation {
+    name = "ugarit-manifest-maker-0.1";
+
+    src = fetchegg {
+      name = "ugarit-manifest-maker";
+      version = "0.1";
+      sha256 = "1jv8lhn4s5a3qphqd3zfwl1py0m5cmqj1h55ys0935m5f422547q";
+    };
+
+    buildInputs = [
+      matchable
+      srfi-37
+      fnmatch
+      miscmacros
+      ugarit
+      numbers
+    ];
+  };
+
+  variable-item = eggDerivation {
+    name = "variable-item-1.3.1";
+
+    src = fetchegg {
+      name = "variable-item";
+      version = "1.3.1";
+      sha256 = "19b3mhb8kr892sz9yyzq79l0vv28dgilw9cf415kj6aq16yp4d5n";
+    };
+
+    buildInputs = [
+      setup-helper
+      check-errors
+    ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 118e5358fffb..143ce5b7383a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3646,6 +3646,8 @@ let
 
   ugarit = callPackage ../tools/backup/ugarit { };
 
+  ugarit-manifest-maker = callPackage ../tools/backup/ugarit-manifest-maker { };
+
   unarj = callPackage ../tools/archivers/unarj { };
 
   unshield = callPackage ../tools/archivers/unshield { };

From 6d6a7881efea68cadd1237a4c3f0bb652a7157b1 Mon Sep 17 00:00:00 2001
From: Michael Raitza <spacefrogg-github@meterriblecrew.net>
Date: Fri, 19 Feb 2016 20:11:28 +0100
Subject: [PATCH 1575/2285] gnome3.libgxps: Fix dependency propagation bug

Packages that want to use libgxps also need libarchive, thus it is moved
to propagatedBuildInputs.
---
 pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix b/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix
index 72d307f4f1a7..5168dec203fa 100644
--- a/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/libgxps/default.nix
@@ -10,7 +10,8 @@ stdenv.mkDerivation rec {
     sha256 = "1gi0b0x0354jyqc48vspk2hg2q1403cf2p9ibj847nzhkdrh9l9r";
   };
 
-  buildInputs = [ pkgconfig glib cairo libarchive freetype libjpeg libtiff acl openssl bzip2 attr];
+  buildInputs = [ pkgconfig glib cairo freetype libjpeg libtiff acl openssl bzip2 attr];
+  propagatedBuildInputs = [ libarchive ];
 
   configureFlags = "--without-liblcms2";
 

From 58cbe7d068ceb54951ba8fb68b31ba7c86c0a9cc Mon Sep 17 00:00:00 2001
From: Michael Raitza <spacefrogg-github@meterriblecrew.net>
Date: Fri, 19 Feb 2016 20:15:19 +0100
Subject: [PATCH 1576/2285] gnome3.evince: Add XPS file support

XPS support is optional via supportXPS argument and turned off by
default.
---
 pkgs/desktops/gnome-3/3.18/core/evince/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.18/core/evince/default.nix b/pkgs/desktops/gnome-3/3.18/core/evince/default.nix
index 154182eef887..3220e9060643 100644
--- a/pkgs/desktops/gnome-3/3.18/core/evince/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/evince/default.nix
@@ -1,8 +1,9 @@
 { fetchurl, stdenv, pkgconfig, intltool, perl, perlXMLParser, libxml2
 , glib, gtk3, pango, atk, gdk_pixbuf, shared_mime_info, itstool, gnome3
 , poppler, ghostscriptX, djvulibre, libspectre, libsecret , makeWrapper
-, librsvg, recentListSize ? null # 5 is not enough, allow passing a different number
-, gobjectIntrospection
+, librsvg, gobjectIntrospection
+, recentListSize ? null # 5 is not enough, allow passing a different number
+, supportXPS ? false    # Open XML Paper Specification via libgxps
 }:
 
 stdenv.mkDerivation rec {
@@ -15,11 +16,12 @@ stdenv.mkDerivation rec {
     gnome3.libgnome_keyring gnome3.gsettings_desktop_schemas
     poppler ghostscriptX djvulibre libspectre
     makeWrapper libsecret librsvg gnome3.adwaita-icon-theme
-  ];
+  ] ++ stdenv.lib.optional supportXPS gnome3.libgxps;
 
   configureFlags = [
     "--disable-nautilus" # Do not use nautilus
     "--enable-introspection"
+    (if supportXPS then "--enable-xps" else "--disable-xps")
   ];
 
   NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0";

From 5ea21d69f5312db17f9a9d98e439ad1f22d80f73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Fri, 19 Feb 2016 21:54:41 +0100
Subject: [PATCH 1577/2285] syncthing: 0.12.10 -> 0.12.19

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 8a8bc3817481..dc8e71af323f 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3347,11 +3347,11 @@ let
   };
 
   syncthing = buildFromGitHub rec {
-    version = "0.12.10";
+    version = "0.12.19";
     rev = "v${version}";
     owner = "syncthing";
     repo = "syncthing";
-    sha256 = "1xvar4mm6f33mg8d8z8h49cni6sj1vfns379zspqvszs404fra0z";
+    sha256 = "11ij8whaqrrzriavxa08jpsmbd1zkc2qxsni1nbgszw2hymmv38g";
     buildFlags = [ "-tags noupgrade,release" ];
     disabled = isGo14;
     buildInputs = [

From 94a401258d01aab403241540217ab01901742454 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 19 Feb 2016 22:48:42 +0100
Subject: [PATCH 1578/2285] libfilezilla: init at 0.3.1

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

diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
new file mode 100644
index 000000000000..74ca0a30892b
--- /dev/null
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "libfilezilla-${version}";
+  version = "0.3.1";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/project/filezilla/libfilezilla/${version}/${name}.tar.bz2";
+    sha256 = "1vshy00bz9l5nzphkxpd35plcfcrz2wha5qiic7mx5yywafdxbd4";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = https://lib.filezilla-project.org/;
+    description = "A modern C++ library, offering some basic functionality to build high-performing, platform-independent programs";
+    license = licenses.gpl2Plus;
+    maintainers = with maintainers; [ pSub ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 01cd56d33c98..a219658881a7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7336,6 +7336,8 @@ let
 
   libfakekey = callPackage ../development/libraries/libfakekey { };
 
+  libfilezilla = callPackage ../development/libraries/libfilezilla { };
+
   libfm = callPackage ../development/libraries/libfm { };
   libfm-extra = callPackage ../development/libraries/libfm {
     extraOnly = true;

From 8b06e2fab152e5dee87693341d5938b161f959b5 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 19 Feb 2016 22:49:13 +0100
Subject: [PATCH 1579/2285] filezilla: 3.14.1 -> 3.15.0.2

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

diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index 6c8df2fcd65b..8f53102d5f53 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
-, pkgconfig, xdg_utils, gtk2, sqlite, pugixml }:
+, pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla }:
 
-let version = "3.14.1"; in
+let version = "3.15.0.2"; in
 stdenv.mkDerivation {
   name = "filezilla-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
-    sha256 = "0v6lb7miy6jbnswii816na8818xqxlvs1vadnii21xfmrsv7225i";
+    sha256 = "0kvwkz01v73qi8y6n8wlidglwh0vg7pajsjm8xq7gch6jmq4cg1k";
   };
 
   configureFlags = [
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     dbus gnutls wxGTK30 libidn tinyxml gettext pkgconfig xdg_utils gtk2 sqlite
-    pugixml ];
+    pugixml libfilezilla ];
 
   meta = with stdenv.lib; {
     homepage = http://filezilla-project.org/;

From 17aefb1460f9ac0b9647eae3bf0c5d06a2ed0276 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Thu, 18 Feb 2016 01:07:23 -0500
Subject: [PATCH 1580/2285] weechat: make language plugins optional, fixes
 #13092

They're still enabled by default, but now can be disabled.

Python has not been made optional due to the additional complexity of:
  - python2 vs python3
  - pync support on Darwin
Making Python support optional should be revisited at another time.
---
 .../networking/irc/weechat/default.nix        | 48 +++++++++++++++----
 1 file changed, 38 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix
index a781a8ceb353..54bba77b182b 100644
--- a/pkgs/applications/networking/irc/weechat/default.nix
+++ b/pkgs/applications/networking/irc/weechat/default.nix
@@ -1,8 +1,24 @@
-{ stdenv, fetchurl, ncurses, openssl, perl, python, aspell, gnutls
-, zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile
-, pythonPackages, cmake, makeWrapper, libobjc, libiconv
+{ stdenv, fetchurl, ncurses, openssl, aspell, gnutls
+, zlib, curl , pkgconfig, libgcrypt
+, cmake, makeWrapper, libobjc, libiconv
+, guileSupport ? true, guile
+, luaSupport ? true, lua5
+, perlSupport ? true, perl
+, pythonPackages
+, rubySupport ? true, ruby
+, tclSupport ? true, tcl
 , extraBuildInputs ? [] }:
 
+assert guileSupport -> guile != null;
+assert luaSupport -> lua5 != null;
+assert perlSupport -> perl != null;
+assert rubySupport -> ruby != null;
+assert tclSupport -> tcl != null;
+
+let
+  inherit (pythonPackages) python pycrypto pync;
+in
+
 stdenv.mkDerivation rec {
   version = "1.4";
   name = "weechat-${version}";
@@ -12,14 +28,26 @@ stdenv.mkDerivation rec {
     sha256 = "1m6xq6izcac5186xvvmm8znfjzrg9hq42p69jabdvv7cri4rjvg0";
   };
 
-  cmakeFlags = stdenv.lib.optional stdenv.isDarwin
-    "-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib";
+  cmakeFlags = with stdenv.lib; []
+    ++ optional stdenv.isDarwin "-DICONV_LIBRARY=${libiconv}/lib/libiconv.dylib"
+    ++ optional (!guileSupport) "-DENABLE_GUILE=OFF"
+    ++ optional (!luaSupport)   "-DENABLE_LUA=OFF"
+    ++ optional (!perlSupport)  "-DENABLE_PERL=OFF"
+    ++ optional (!rubySupport)  "-DENABLE_RUBY=OFF"
+    ++ optional (!tclSupport)   "-DENABLE_TCL=OFF"
+    ;
 
-  buildInputs = 
-    [ ncurses perl python openssl aspell gnutls zlib curl pkgconfig
-      libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper
-      cmake ]
-    ++ stdenv.lib.optionals stdenv.isDarwin [ pythonPackages.pync libobjc ]
+  buildInputs = with stdenv.lib; [
+      ncurses python openssl aspell gnutls zlib curl pkgconfig
+      libgcrypt pycrypto makeWrapper
+      cmake
+    ]
+    ++ optionals stdenv.isDarwin [ pync libobjc ]
+    ++ optional  guileSupport    guile
+    ++ optional  luaSupport      lua5
+    ++ optional  perlSupport     perl
+    ++ optional  rubySupport     ruby
+    ++ optional  tclSupport      tcl
     ++ extraBuildInputs;
 
   NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix} -DCA_FILE=/etc/ssl/certs/ca-certificates.crt";

From f3110c0a0123638d9fad798d986a008c2bafb5bd Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 19 Feb 2016 16:02:52 -0600
Subject: [PATCH 1581/2285] kde5.frameworks: 5.18 -> 5.19

This will cause some merge conflicts, but the changes in closure-size
will be overwritten by the upgrade in master otherwise.
---
 .../libraries/kde-frameworks-5.18/srcs.nix    | 565 ------------------
 .../attica.nix                                |   0
 .../baloo.nix                                 |   0
 .../bluez-qt.nix                              |   0
 .../breeze-icons.nix                          |   0
 .../default.nix                               |   0
 .../extra-cmake-modules/default.nix           |   0
 .../extra-cmake-modules/nix-lib-path.patch    |   0
 .../extra-cmake-modules/series                |   0
 .../extra-cmake-modules/setup-hook.sh         |   0
 .../fetchsrcs.sh                              |   2 +-
 .../frameworkintegration.nix                  |   0
 .../kactivities.nix                           |   0
 .../kapidox.nix                               |   0
 .../karchive.nix                              |   0
 .../kauth/cmake-install-paths.patch           |   0
 .../kauth/default.nix                         |   0
 .../kauth/series                              |   0
 .../kbookmarks.nix                            |   0
 .../0001-qdiriterator-follow-symlinks.patch   |   0
 .../kcmutils/default.nix                      |   0
 .../kcodecs.nix                               |   0
 .../kcompletion.nix                           |   0
 .../kconfig.nix                               |   0
 .../0001-qdiriterator-follow-symlinks.patch   |   0
 .../kconfigwidgets/default.nix                |   0
 .../kcoreaddons.nix                           |   0
 .../kcrash.nix                                |   0
 .../kdbusaddons.nix                           |   0
 .../kdeclarative.nix                          |   0
 .../kded.nix                                  |   0
 .../kdelibs4support/default.nix               |   0
 .../kdelibs4support/nix-kde-include-dir.patch |   0
 .../kdelibs4support/series                    |   0
 .../kdelibs4support/setup-hook.sh             |   0
 .../kdesignerplugin.nix                       |   0
 .../kdesu.nix                                 |   0
 .../kdewebkit.nix                             |   0
 .../kdnssd.nix                                |   0
 .../kdoctools/default.nix                     |   0
 .../kdoctools-no-find-docbook-xml.patch       |   0
 .../kemoticons.nix                            |   0
 .../kfilemetadata/cmake-install-paths.patch   |   0
 .../kfilemetadata/default.nix                 |   0
 .../kfilemetadata/series                      |   0
 .../kglobalaccel.nix                          |   0
 .../kguiaddons.nix                            |   0
 .../khtml.nix                                 |   0
 .../ki18n.nix                                 |   0
 .../kiconthemes/default-theme-breeze.patch    |   0
 .../kiconthemes/default.nix                   |   0
 .../kiconthemes/series                        |   0
 .../kidletime.nix                             |   0
 .../kimageformats.nix                         |   0
 .../kinit/0001-kinit-libpath.patch            |   0
 .../kinit/default.nix                         |   0
 .../kio/default.nix                           |   0
 .../kio/samba-search-path.patch               |   0
 .../kio/series                                |   0
 .../kitemmodels.nix                           |   0
 .../kitemviews.nix                            |   0
 .../kjobwidgets.nix                           |   0
 .../kjs.nix                                   |   0
 .../kjsembed.nix                              |   0
 .../kmediaplayer.nix                          |   0
 .../knewstuff.nix                             |   0
 .../knotifications.nix                        |   0
 .../knotifyconfig.nix                         |   0
 .../kpackage/allow-external-paths.patch       |   0
 .../kpackage/default.nix                      |   0
 .../qdiriterator-follow-symlinks.patch        |   0
 .../kpackage/series                           |   0
 .../kparts.nix                                |   0
 .../kpeople.nix                               |   0
 .../kplotting.nix                             |   0
 .../kpty.nix                                  |   0
 .../kross.nix                                 |   0
 .../krunner.nix                               |   0
 .../0001-qdiriterator-follow-symlinks.patch   |   0
 .../kservice/0002-no-canonicalize-path.patch  |   0
 .../kservice/default.nix                      |   0
 .../ktexteditor/default.nix                   |   0
 .../ktexteditor/no-qcoreapplication.patch     |   0
 .../ktexteditor/series                        |   0
 .../ktextwidgets.nix                          |   0
 .../kunitconversion.nix                       |   0
 .../kwallet.nix                               |  12 +-
 .../kwidgetsaddons.nix                        |   0
 .../kwindowsystem.nix                         |   0
 .../kxmlgui.nix                               |   0
 .../kxmlrpcclient.nix                         |   0
 .../modemmanager-qt.nix                       |   0
 .../networkmanager-qt.nix                     |   0
 .../oxygen-icons5.nix                         |   0
 .../plasma-framework/default.nix              |   0
 .../solid.nix                                 |   0
 .../sonnet.nix                                |   0
 .../libraries/kde-frameworks-5.19/srcs.nix    | 565 ++++++++++++++++++
 .../threadweaver.nix                          |   0
 pkgs/top-level/all-packages.nix               |   2 +-
 100 files changed, 573 insertions(+), 573 deletions(-)
 delete mode 100644 pkgs/development/libraries/kde-frameworks-5.18/srcs.nix
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/attica.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/baloo.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/bluez-qt.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/breeze-icons.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/extra-cmake-modules/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/extra-cmake-modules/nix-lib-path.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/extra-cmake-modules/series (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/extra-cmake-modules/setup-hook.sh (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/fetchsrcs.sh (96%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/frameworkintegration.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kactivities.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kapidox.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/karchive.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kauth/cmake-install-paths.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kauth/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kauth/series (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kbookmarks.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kcmutils/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kcmutils/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kcodecs.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kcompletion.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kconfig.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kconfigwidgets/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kcoreaddons.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kcrash.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kdbusaddons.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kdeclarative.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kded.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kdelibs4support/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kdelibs4support/nix-kde-include-dir.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kdelibs4support/series (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kdelibs4support/setup-hook.sh (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kdesignerplugin.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kdesu.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kdewebkit.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kdnssd.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kdoctools/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kdoctools/kdoctools-no-find-docbook-xml.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kemoticons.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kfilemetadata/cmake-install-paths.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kfilemetadata/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kfilemetadata/series (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kglobalaccel.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kguiaddons.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/khtml.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/ki18n.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kiconthemes/default-theme-breeze.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kiconthemes/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kiconthemes/series (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kidletime.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kimageformats.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kinit/0001-kinit-libpath.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kinit/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kio/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kio/samba-search-path.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kio/series (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kitemmodels.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kitemviews.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kjobwidgets.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kjs.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kjsembed.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kmediaplayer.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/knewstuff.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/knotifications.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/knotifyconfig.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kpackage/allow-external-paths.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kpackage/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kpackage/qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kpackage/series (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kparts.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kpeople.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kplotting.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kpty.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kross.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/krunner.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kservice/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kservice/0002-no-canonicalize-path.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kservice/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/ktexteditor/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/ktexteditor/no-qcoreapplication.patch (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/ktexteditor/series (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/ktextwidgets.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kunitconversion.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kwallet.nix (51%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kwidgetsaddons.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kwindowsystem.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kxmlgui.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/kxmlrpcclient.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/modemmanager-qt.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/networkmanager-qt.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/oxygen-icons5.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/plasma-framework/default.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/solid.nix (100%)
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/sonnet.nix (100%)
 create mode 100644 pkgs/development/libraries/kde-frameworks-5.19/srcs.nix
 rename pkgs/development/libraries/{kde-frameworks-5.18 => kde-frameworks-5.19}/threadweaver.nix (100%)

diff --git a/pkgs/development/libraries/kde-frameworks-5.18/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.18/srcs.nix
deleted file mode 100644
index 12c5c30a2471..000000000000
--- a/pkgs/development/libraries/kde-frameworks-5.18/srcs.nix
+++ /dev/null
@@ -1,565 +0,0 @@
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-  attica = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/attica-5.18.0.tar.xz";
-      sha256 = "1n6pkaak9xf7nyi0b1wr8fm5qkv7mgpsws9igd7g2xqvvqzyp5xw";
-      name = "attica-5.18.0.tar.xz";
-    };
-  };
-  baloo = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/baloo-5.18.0.tar.xz";
-      sha256 = "0sdnd6v01rcgq7v2jny0655jrghfamwyj0win7xfhx1622dfi8l8";
-      name = "baloo-5.18.0.tar.xz";
-    };
-  };
-  bluez-qt = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/bluez-qt-5.18.0.tar.xz";
-      sha256 = "17vx77w4fwdi7y394s2pqph2vmfs8n0107rmz4q7aa62q9iwdrbr";
-      name = "bluez-qt-5.18.0.tar.xz";
-    };
-  };
-  breeze-icons = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/breeze-icons-5.18.0.tar.xz";
-      sha256 = "0a4iqr5zrb56aln5hdsk5zrl23w8w8y5nmrxb093h205r36hfw4z";
-      name = "breeze-icons-5.18.0.tar.xz";
-    };
-  };
-  extra-cmake-modules = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/extra-cmake-modules-5.18.0.tar.xz";
-      sha256 = "1kp0pysa154cbp1ysgyqk03w8s335v3wmfrx4pshyfpg1s24k83y";
-      name = "extra-cmake-modules-5.18.0.tar.xz";
-    };
-  };
-  frameworkintegration = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/frameworkintegration-5.18.0.tar.xz";
-      sha256 = "06hw885mk0i2173lfdqz3hyp1fx2bndpj00hk32s3i2ggnn2y1rv";
-      name = "frameworkintegration-5.18.0.tar.xz";
-    };
-  };
-  kactivities = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kactivities-5.18.0.tar.xz";
-      sha256 = "0nqa63ds7vj87zg2gz1mx42c30l3ypfk4ghhgxwziab315bpcpmr";
-      name = "kactivities-5.18.0.tar.xz";
-    };
-  };
-  kapidox = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kapidox-5.18.0.tar.xz";
-      sha256 = "1hackjnpxijqqpn9cvnwcn9yc0jni21qgjccj74025ihdgigp70s";
-      name = "kapidox-5.18.0.tar.xz";
-    };
-  };
-  karchive = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/karchive-5.18.0.tar.xz";
-      sha256 = "0ph59w8y49b3znaj9c1qk0zwkg0pmjjcyr4jlv5w56mh0zkq37h5";
-      name = "karchive-5.18.0.tar.xz";
-    };
-  };
-  kauth = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kauth-5.18.0.tar.xz";
-      sha256 = "14kvy7cbw31sc48f0aldpi52wxhwd69prwadvjhqwy912s8kr04n";
-      name = "kauth-5.18.0.tar.xz";
-    };
-  };
-  kbookmarks = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kbookmarks-5.18.0.tar.xz";
-      sha256 = "0qi2f612s756qh5ldibscfhcq8q802vgr2497fm9xl95kfqmcg1n";
-      name = "kbookmarks-5.18.0.tar.xz";
-    };
-  };
-  kcmutils = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kcmutils-5.18.0.tar.xz";
-      sha256 = "1m53308icq1x1877afcxlhygl56dsl50fiwmfjf0g5pfmnql3qfp";
-      name = "kcmutils-5.18.0.tar.xz";
-    };
-  };
-  kcodecs = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kcodecs-5.18.0.tar.xz";
-      sha256 = "1injdpz7kdf2j6is2w3v3xgd9ahgls0j632q03q7qa48xp4wx64h";
-      name = "kcodecs-5.18.0.tar.xz";
-    };
-  };
-  kcompletion = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kcompletion-5.18.0.tar.xz";
-      sha256 = "0gkj4gplm7qwx4nqhhph5h3jp4h8b22ssmw0vvv6bpsnq7idk76b";
-      name = "kcompletion-5.18.0.tar.xz";
-    };
-  };
-  kconfig = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kconfig-5.18.0.tar.xz";
-      sha256 = "1s7fvhflsvv8zwb9cr50m3hxh0d4z5grh0nkri5ngzqb123wi91n";
-      name = "kconfig-5.18.0.tar.xz";
-    };
-  };
-  kconfigwidgets = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kconfigwidgets-5.18.0.tar.xz";
-      sha256 = "08i12040prs2nxybxbbf3w0n91c9p0c64j8fz18axi4yszrmv8im";
-      name = "kconfigwidgets-5.18.0.tar.xz";
-    };
-  };
-  kcoreaddons = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kcoreaddons-5.18.0.tar.xz";
-      sha256 = "05y8pan8hdn6qj2si9v9igjrx00l7bqzhdm2qq9vbjrv5xj8axzf";
-      name = "kcoreaddons-5.18.0.tar.xz";
-    };
-  };
-  kcrash = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kcrash-5.18.0.tar.xz";
-      sha256 = "0rk27zr0mb4jlicm1s175x139avzi0q4jk3mlczfg4rkrxzgbx5w";
-      name = "kcrash-5.18.0.tar.xz";
-    };
-  };
-  kdbusaddons = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kdbusaddons-5.18.0.tar.xz";
-      sha256 = "0l9ww3zaz1x6bk9axmm6zlj1dcn0gr0z61v9lw5y31rypxclhza8";
-      name = "kdbusaddons-5.18.0.tar.xz";
-    };
-  };
-  kdeclarative = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kdeclarative-5.18.0.tar.xz";
-      sha256 = "0mpvwn26msg3sc9z1r1vnw32rkl842jxpvpx2vg8kwcd9snwx9a6";
-      name = "kdeclarative-5.18.0.tar.xz";
-    };
-  };
-  kded = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kded-5.18.0.tar.xz";
-      sha256 = "0y5sn7yxalylcwcz2j4h349lll2vkf44bw3n6w2cbqqf5wnr2za5";
-      name = "kded-5.18.0.tar.xz";
-    };
-  };
-  kdelibs4support = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/portingAids/kdelibs4support-5.18.0.tar.xz";
-      sha256 = "0flhhjnnm2wh6869q8gxk45wlpq0679xlklzqlxvqx7a4kxdl8d8";
-      name = "kdelibs4support-5.18.0.tar.xz";
-    };
-  };
-  kdesignerplugin = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kdesignerplugin-5.18.0.tar.xz";
-      sha256 = "163lfx8vxxdhxbn090k5r4m9vy940kfwvsyjsi8v0pp9ww49g13n";
-      name = "kdesignerplugin-5.18.0.tar.xz";
-    };
-  };
-  kdesu = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kdesu-5.18.0.tar.xz";
-      sha256 = "0dqjmvi440p4n62w9y3qw4n7fcivyg3d54fv9nrf1sx87vdw7r83";
-      name = "kdesu-5.18.0.tar.xz";
-    };
-  };
-  kdewebkit = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kdewebkit-5.18.0.tar.xz";
-      sha256 = "1ahr62xfk085kb9p2axx04gf7bpnr0vv2d4kpc4s0xrj3xi0alnl";
-      name = "kdewebkit-5.18.0.tar.xz";
-    };
-  };
-  kdnssd = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kdnssd-5.18.0.tar.xz";
-      sha256 = "12vplqfsc3zks1grmb5i4hdww0g51lv54nb1drpj42mzyi1q1v1l";
-      name = "kdnssd-5.18.0.tar.xz";
-    };
-  };
-  kdoctools = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kdoctools-5.18.0.tar.xz";
-      sha256 = "10h74lb4597fs1h88x60ykpkz47pgfa4k04h4i5l0qb5vb1jlw7d";
-      name = "kdoctools-5.18.0.tar.xz";
-    };
-  };
-  kemoticons = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kemoticons-5.18.0.tar.xz";
-      sha256 = "0lba6rzmij20ndkq0vw9zkxbjq6g98may3ypyj0kc82d3sw9hkhs";
-      name = "kemoticons-5.18.0.tar.xz";
-    };
-  };
-  kfilemetadata = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kfilemetadata-5.18.0.tar.xz";
-      sha256 = "19b8nh5x8c0w516afh8ln72vi5dk91wl8bcsqd84h3s6gw55rsm4";
-      name = "kfilemetadata-5.18.0.tar.xz";
-    };
-  };
-  kglobalaccel = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kglobalaccel-5.18.0.tar.xz";
-      sha256 = "1v22rh8c103zl63cgg4gx430qw29f9yn9k5219pcw5n57jx0n5c1";
-      name = "kglobalaccel-5.18.0.tar.xz";
-    };
-  };
-  kguiaddons = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kguiaddons-5.18.0.tar.xz";
-      sha256 = "153mjbiwg4p65c2msj8j3pycn5gys39ahg9ik7jqg7w4cjcl2jxz";
-      name = "kguiaddons-5.18.0.tar.xz";
-    };
-  };
-  khtml = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/portingAids/khtml-5.18.0.tar.xz";
-      sha256 = "0kgin1bhbx95kypsg1k318qjxz3258x3a6kkdbky3cvfmq8r5ka5";
-      name = "khtml-5.18.0.tar.xz";
-    };
-  };
-  ki18n = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/ki18n-5.18.0.tar.xz";
-      sha256 = "14vlq49a0bp1vpjb2zxkgqsd5yjmb0azri2iq9sgxxx1v6gyy9h9";
-      name = "ki18n-5.18.0.tar.xz";
-    };
-  };
-  kiconthemes = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kiconthemes-5.18.0.tar.xz";
-      sha256 = "10pj2q28y57ng26xg2211v9vy91hqqmcyxh90q1qj89clykimwid";
-      name = "kiconthemes-5.18.0.tar.xz";
-    };
-  };
-  kidletime = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kidletime-5.18.0.tar.xz";
-      sha256 = "0726nq508rpzjxvfp354jd8n14m49grv6nfv09q2zyw02cf6n9bi";
-      name = "kidletime-5.18.0.tar.xz";
-    };
-  };
-  kimageformats = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kimageformats-5.18.0.tar.xz";
-      sha256 = "1y6zc04sx4sqyfavr8nf05a1p4kyb8ic335iy5s869r6zrvljpnc";
-      name = "kimageformats-5.18.0.tar.xz";
-    };
-  };
-  kinit = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kinit-5.18.0.tar.xz";
-      sha256 = "142xm7yglssw771340bs0lk1xgsr53218zh87v6n9hchrd34zg08";
-      name = "kinit-5.18.0.tar.xz";
-    };
-  };
-  kio = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kio-5.18.0.tar.xz";
-      sha256 = "020gvxs5xp9v4pra814200nv79c9b9j59skbrxq9cazhnywnnlns";
-      name = "kio-5.18.0.tar.xz";
-    };
-  };
-  kitemmodels = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kitemmodels-5.18.0.tar.xz";
-      sha256 = "0r5r7ia1lwqll6bz92k4qgj737hsg6pfhxmycr6g88b9fiab1qw4";
-      name = "kitemmodels-5.18.0.tar.xz";
-    };
-  };
-  kitemviews = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kitemviews-5.18.0.tar.xz";
-      sha256 = "10pbh0fpzrh0ijbadjx81690p9iw34rs2waks99fc0jy3hamny3b";
-      name = "kitemviews-5.18.0.tar.xz";
-    };
-  };
-  kjobwidgets = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kjobwidgets-5.18.0.tar.xz";
-      sha256 = "0gxvh9wxnfkrxm9zc7yx579vlxs3xmihfyqs92fpkjhy2shfd2sg";
-      name = "kjobwidgets-5.18.0.tar.xz";
-    };
-  };
-  kjs = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/portingAids/kjs-5.18.0.tar.xz";
-      sha256 = "0z89l2yhs3vld1qbd6v506lksmxvwrzgdq77aghy3mbkfgz3jd62";
-      name = "kjs-5.18.0.tar.xz";
-    };
-  };
-  kjsembed = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/portingAids/kjsembed-5.18.0.tar.xz";
-      sha256 = "0mpq7aywspm6l13afrr2dis8ygyld5il21g90ij0fc1jwp95zk3d";
-      name = "kjsembed-5.18.0.tar.xz";
-    };
-  };
-  kmediaplayer = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/portingAids/kmediaplayer-5.18.0.tar.xz";
-      sha256 = "07m3agz73yzmfn8ykg0f6a2c39rkzchzqc1iam2zfydqxyvh4bxb";
-      name = "kmediaplayer-5.18.0.tar.xz";
-    };
-  };
-  knewstuff = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/knewstuff-5.18.0.tar.xz";
-      sha256 = "0mda1n0py6nm9wp89z5hkhhk9ah5sjrkzl1dshd4lq77f7p7i1g4";
-      name = "knewstuff-5.18.0.tar.xz";
-    };
-  };
-  knotifications = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/knotifications-5.18.0.tar.xz";
-      sha256 = "1npir2v4irhm6xmzf60aj5388slq6fw7jbcwjjscldrwk2ca06hz";
-      name = "knotifications-5.18.0.tar.xz";
-    };
-  };
-  knotifyconfig = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/knotifyconfig-5.18.0.tar.xz";
-      sha256 = "0q2735m2m1wrnp7g4ycnbjy7qgpjxc5fvx9zrwnd0jl5rmdw4sbb";
-      name = "knotifyconfig-5.18.0.tar.xz";
-    };
-  };
-  kpackage = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kpackage-5.18.0.tar.xz";
-      sha256 = "14q2ssf3g7ljakzpq7q9q2zbm8jqk01ybjx4s16qpw9gakcrbli9";
-      name = "kpackage-5.18.0.tar.xz";
-    };
-  };
-  kparts = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kparts-5.18.0.tar.xz";
-      sha256 = "1q4xd4dy40mh4a8vgpvdamy1242isjy9ma94cf95qqc6qgjnqxhy";
-      name = "kparts-5.18.0.tar.xz";
-    };
-  };
-  kpeople = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kpeople-5.18.0.tar.xz";
-      sha256 = "0d0mp2qz3f1bki6rfw8x6zc0rmv4n43mi06k3vh30qpiaj7crl5k";
-      name = "kpeople-5.18.0.tar.xz";
-    };
-  };
-  kplotting = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kplotting-5.18.0.tar.xz";
-      sha256 = "1jiqx9gdv69frfh8vanphp6lzc3vxn2q1lhibi7v03qkc2qaw5cc";
-      name = "kplotting-5.18.0.tar.xz";
-    };
-  };
-  kpty = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kpty-5.18.0.tar.xz";
-      sha256 = "1baz1xs22r4qli74sqwpcjmxnfrd0iqyyzg1fmljr8fvs4pdy1x1";
-      name = "kpty-5.18.0.tar.xz";
-    };
-  };
-  kross = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/portingAids/kross-5.18.0.tar.xz";
-      sha256 = "1ky13yqxhkghxqd21jrnrpjfnrkgspv0p3dfij994rkaqq8rm1r6";
-      name = "kross-5.18.0.tar.xz";
-    };
-  };
-  krunner = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/portingAids/krunner-5.18.0.tar.xz";
-      sha256 = "14c51kiwr49dbdxg8y6ivmmfr9h6p8jjd32k35pi4gpi2vlh29pf";
-      name = "krunner-5.18.0.tar.xz";
-    };
-  };
-  kservice = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kservice-5.18.0.tar.xz";
-      sha256 = "0pbs1n2i7vjgjh7j87ps8gkzmj5igw1aib1aq089m4hfrl8pbrq8";
-      name = "kservice-5.18.0.tar.xz";
-    };
-  };
-  ktexteditor = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/ktexteditor-5.18.0.tar.xz";
-      sha256 = "0fx82s5y1wya3v36qq3agmfrnff9a7v94fhifvfiwmhk2ddwwg3v";
-      name = "ktexteditor-5.18.0.tar.xz";
-    };
-  };
-  ktextwidgets = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/ktextwidgets-5.18.0.tar.xz";
-      sha256 = "1wflqfmgqa3lh3apf22sami6caclvyv7li6qiskwfkzkb0a6x373";
-      name = "ktextwidgets-5.18.0.tar.xz";
-    };
-  };
-  kunitconversion = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kunitconversion-5.18.0.tar.xz";
-      sha256 = "0gpmndyly977dzfyfhrd0q434c0qr1sinh75dwf9clmqw576jl6i";
-      name = "kunitconversion-5.18.0.tar.xz";
-    };
-  };
-  kwallet = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kwallet-5.18.0.tar.xz";
-      sha256 = "0w69y0xdvvrvcydv160z7s03y1n5vxjj3sfk530zc6bjszplvxis";
-      name = "kwallet-5.18.0.tar.xz";
-    };
-  };
-  kwidgetsaddons = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kwidgetsaddons-5.18.0.tar.xz";
-      sha256 = "06fqz7cwczp5sahg54zi46rf9jf2si88w5yizp61z8yv57kvpvk1";
-      name = "kwidgetsaddons-5.18.0.tar.xz";
-    };
-  };
-  kwindowsystem = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kwindowsystem-5.18.0.tar.xz";
-      sha256 = "01hzd4r8y4hdpynnh32qf418hxzbd67fkdq6a4vabl384aipnmk7";
-      name = "kwindowsystem-5.18.0.tar.xz";
-    };
-  };
-  kxmlgui = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kxmlgui-5.18.0.tar.xz";
-      sha256 = "0yimy0r73sv8z4wq0mkdx24icjrzmy5bciblwlnzagd61f8j8qri";
-      name = "kxmlgui-5.18.0.tar.xz";
-    };
-  };
-  kxmlrpcclient = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/kxmlrpcclient-5.18.0.tar.xz";
-      sha256 = "0h88pc3h5z3q58b7qxdn69klwr0p9ffbirzncyvxjrhr7dq36nv9";
-      name = "kxmlrpcclient-5.18.0.tar.xz";
-    };
-  };
-  modemmanager-qt = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/modemmanager-qt-5.18.0.tar.xz";
-      sha256 = "09k07wxkn511sa4hwmrs6jfx4lnnw3zcac5dzz43hhsmw74yj9az";
-      name = "modemmanager-qt-5.18.0.tar.xz";
-    };
-  };
-  networkmanager-qt = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/networkmanager-qt-5.18.0.tar.xz";
-      sha256 = "11j818ws5jz23hyilfpf3npk893hs388v1xpwhh0lkjwm60wkzln";
-      name = "networkmanager-qt-5.18.0.tar.xz";
-    };
-  };
-  oxygen-icons5 = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/oxygen-icons5-5.18.0.tar.xz";
-      sha256 = "11zmxc9n7x6iwdckwxwjji0497yjcsjli7pzr8d049lbc7xsjvi8";
-      name = "oxygen-icons5-5.18.0.tar.xz";
-    };
-  };
-  plasma-framework = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/plasma-framework-5.18.0.tar.xz";
-      sha256 = "1lxhlzx3jcqzx90kjl8w8p53nrgrkjiz1xf92ah3mygjyvi5rlh8";
-      name = "plasma-framework-5.18.0.tar.xz";
-    };
-  };
-  solid = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/solid-5.18.0.tar.xz";
-      sha256 = "0ilki4s3f3gjsdj6z41a8k4h2b52w8xrh2api0sqj0ifk2yhx6wh";
-      name = "solid-5.18.0.tar.xz";
-    };
-  };
-  sonnet = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/sonnet-5.18.0.tar.xz";
-      sha256 = "1780jvsfkasabdbk9xjhjcihcc6mxxipi2rsq2001flxnnx4kykg";
-      name = "sonnet-5.18.0.tar.xz";
-    };
-  };
-  threadweaver = {
-    version = "5.18.0";
-    src = fetchurl {
-      url = "${mirror}/stable/frameworks/5.18/threadweaver-5.18.0.tar.xz";
-      sha256 = "00c9vvyhyysg0cdlmvpls0h3pdbbhhwfxlm9l9i9r3j8x6rigm54";
-      name = "threadweaver-5.18.0.tar.xz";
-    };
-  };
-}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/attica.nix b/pkgs/development/libraries/kde-frameworks-5.19/attica.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/attica.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/attica.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/baloo.nix b/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/baloo.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/baloo.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/bluez-qt.nix b/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/bluez-qt.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/breeze-icons.nix b/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/breeze-icons.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/nix-lib-path.patch b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/nix-lib-path.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/series b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/series
rename to pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/extra-cmake-modules/setup-hook.sh
rename to pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/fetchsrcs.sh b/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh
similarity index 96%
rename from pkgs/development/libraries/kde-frameworks-5.18/fetchsrcs.sh
rename to pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh
index 84b882a0a075..7937e6f8bed9 100755
--- a/pkgs/development/libraries/kde-frameworks-5.18/fetchsrcs.sh
+++ b/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh
@@ -4,7 +4,7 @@
 set -x
 
 # The trailing slash at the end is necessary!
-RELEASE_URL="http://download.kde.org/stable/frameworks/5.18/"
+RELEASE_URL="http://download.kde.org/stable/frameworks/5.19/"
 EXTRA_WGET_ARGS='-A *.tar.xz'
 
 mkdir tmp; cd tmp
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/frameworkintegration.nix b/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/frameworkintegration.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kactivities.nix b/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kactivities.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kapidox.nix b/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kapidox.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/karchive.nix b/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/karchive.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/karchive.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kauth/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kauth/cmake-install-paths.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kauth/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kauth/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kauth/series b/pkgs/development/libraries/kde-frameworks-5.19/kauth/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kauth/series
rename to pkgs/development/libraries/kde-frameworks-5.19/kauth/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kbookmarks.nix b/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kbookmarks.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kcmutils/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kcmutils/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kcmutils/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kcodecs.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kcodecs.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kcompletion.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kcompletion.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kconfig.nix b/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kconfig.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kconfigwidgets/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kcoreaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kcoreaddons.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kcrash.nix b/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kcrash.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdbusaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdbusaddons.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdeclarative.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdeclarative.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kded.nix b/pkgs/development/libraries/kde-frameworks-5.19/kded.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kded.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kded.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/nix-kde-include-dir.patch b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/nix-kde-include-dir.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/series b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/series
rename to pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/setup-hook.sh b/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdelibs4support/setup-hook.sh
rename to pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdesignerplugin.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdesignerplugin.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdesu.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdesu.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdewebkit.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdewebkit.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdnssd.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdnssd.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdoctools/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kdoctools/kdoctools-no-find-docbook-xml.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kemoticons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kemoticons.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/cmake-install-paths.patch b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/cmake-install-paths.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/series b/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kfilemetadata/series
rename to pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kglobalaccel.nix b/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kglobalaccel.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kguiaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kguiaddons.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/khtml.nix b/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/khtml.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/khtml.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ki18n.nix b/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/ki18n.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default-theme-breeze.patch b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default-theme-breeze.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/series b/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kiconthemes/series
rename to pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kidletime.nix b/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kidletime.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kimageformats.nix b/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kimageformats.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kinit/0001-kinit-libpath.patch b/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kinit/0001-kinit-libpath.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kinit/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kinit/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kio/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kio/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kio/samba-search-path.patch b/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kio/samba-search-path.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kio/series b/pkgs/development/libraries/kde-frameworks-5.19/kio/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kio/series
rename to pkgs/development/libraries/kde-frameworks-5.19/kio/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kitemmodels.nix b/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kitemmodels.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kitemviews.nix b/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kitemviews.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kjobwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kjobwidgets.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kjs.nix b/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kjs.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kjs.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kjsembed.nix b/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kjsembed.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kmediaplayer.nix b/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kmediaplayer.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/knewstuff.nix b/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/knewstuff.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/knotifications.nix b/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/knotifications.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/knotifyconfig.nix b/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/knotifyconfig.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/allow-external-paths.patch b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kpackage/allow-external-paths.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kpackage/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kpackage/qdiriterator-follow-symlinks.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpackage/series b/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kpackage/series
rename to pkgs/development/libraries/kde-frameworks-5.19/kpackage/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kparts.nix b/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kparts.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kparts.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpeople.nix b/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kpeople.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kplotting.nix b/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kplotting.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kpty.nix b/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kpty.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kpty.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kross.nix b/pkgs/development/libraries/kde-frameworks-5.19/kross.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kross.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kross.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/krunner.nix b/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/krunner.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/krunner.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kservice/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/0002-no-canonicalize-path.patch b/pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kservice/0002-no-canonicalize-path.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kservice/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/no-qcoreapplication.patch b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/no-qcoreapplication.patch
rename to pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/series b/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/ktexteditor/series
rename to pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/ktextwidgets.nix b/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/ktextwidgets.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kunitconversion.nix b/pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kunitconversion.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kwallet.nix b/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix
similarity index 51%
rename from pkgs/development/libraries/kde-frameworks-5.18/kwallet.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix
index 7c4177e009d2..5ade5f63a8d0 100644
--- a/pkgs/development/libraries/kde-frameworks-5.18/kwallet.nix
+++ b/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix
@@ -1,14 +1,14 @@
-{ kdeFramework, lib, extra-cmake-modules, kconfig, kcoreaddons
-, kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications
-, kservice, kwidgetsaddons, kwindowsystem, libgcrypt, makeQtWrapper
-}:
+{ kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets
+, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes
+, knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt
+, makeQtWrapper }:
 
 kdeFramework {
   name = "kwallet";
   nativeBuildInputs = [ extra-cmake-modules kdoctools makeQtWrapper ];
   buildInputs = [
-    kconfig kcoreaddons kdbusaddons kiconthemes knotifications
-    kservice kwidgetsaddons libgcrypt
+    kconfig kconfigwidgets kcoreaddons kdbusaddons kiconthemes
+    knotifications kservice kwidgetsaddons libgcrypt
   ];
   propagatedBuildInputs = [ ki18n kwindowsystem ];
   postInstall = ''
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kwidgetsaddons.nix b/pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kwidgetsaddons.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kwindowsystem.nix b/pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kwindowsystem.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kxmlgui.nix b/pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kxmlgui.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/kxmlrpcclient.nix b/pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/kxmlrpcclient.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/modemmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/modemmanager-qt.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/networkmanager-qt.nix b/pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/networkmanager-qt.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/oxygen-icons5.nix b/pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/oxygen-icons5.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/plasma-framework/default.nix b/pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/plasma-framework/default.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/solid.nix b/pkgs/development/libraries/kde-frameworks-5.19/solid.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/solid.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/solid.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/sonnet.nix b/pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/sonnet.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix b/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix
new file mode 100644
index 000000000000..b86c0b71224d
--- /dev/null
+++ b/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix
@@ -0,0 +1,565 @@
+# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
+{ fetchurl, mirror }:
+
+{
+  attica = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/attica-5.19.0.tar.xz";
+      sha256 = "0cbvjnv2fcqsxspiy5pzmnnzrpfamlsc9j927kd6gpzai1ckf1lv";
+      name = "attica-5.19.0.tar.xz";
+    };
+  };
+  baloo = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/baloo-5.19.0.tar.xz";
+      sha256 = "02yy0w13h5wxm74a87zi439f6yd9miid6rb54nia0pgvcka98svg";
+      name = "baloo-5.19.0.tar.xz";
+    };
+  };
+  bluez-qt = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/bluez-qt-5.19.0.tar.xz";
+      sha256 = "0609i7rzhnnnp4fqnwscwp6y646ji8kl2hw5sy7azc87yllisnyv";
+      name = "bluez-qt-5.19.0.tar.xz";
+    };
+  };
+  breeze-icons = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/breeze-icons-5.19.0.tar.xz";
+      sha256 = "0bwix0jl1dscqfb7ygn9drpd9ivfx4g15vz6h01mswvxa9lz1vj0";
+      name = "breeze-icons-5.19.0.tar.xz";
+    };
+  };
+  extra-cmake-modules = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/extra-cmake-modules-5.19.0.tar.xz";
+      sha256 = "1dl3hhbara7iswb5wsc5dp17ar3ljw5f0nrncl8vry9smaz2zl63";
+      name = "extra-cmake-modules-5.19.0.tar.xz";
+    };
+  };
+  frameworkintegration = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/frameworkintegration-5.19.0.tar.xz";
+      sha256 = "00la7p7wcyqpxyi73h4fjrmm9d2gqzdaljn4468xya4bfns5ijy3";
+      name = "frameworkintegration-5.19.0.tar.xz";
+    };
+  };
+  kactivities = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kactivities-5.19.0.tar.xz";
+      sha256 = "0yml1sbn3z4jd4vsfs25kqrl03pmlcgamzbgpw3248sabhyg7ks3";
+      name = "kactivities-5.19.0.tar.xz";
+    };
+  };
+  kapidox = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kapidox-5.19.0.tar.xz";
+      sha256 = "0a9731xrkd6mnqh72592rx6gfnxxdfd7xl8pdpgdn7qs3394k1yz";
+      name = "kapidox-5.19.0.tar.xz";
+    };
+  };
+  karchive = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/karchive-5.19.0.tar.xz";
+      sha256 = "043spmi7s2d1bj8d3wbgzbhisip6h92kqjhlvg8gyv0a7vy54ymv";
+      name = "karchive-5.19.0.tar.xz";
+    };
+  };
+  kauth = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kauth-5.19.0.tar.xz";
+      sha256 = "0fm9ih2hkh2rpmlf98yw8z1r5bn2qmpva2k7mrv6ijd5h767fxss";
+      name = "kauth-5.19.0.tar.xz";
+    };
+  };
+  kbookmarks = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kbookmarks-5.19.0.tar.xz";
+      sha256 = "0q418jpdc348nqgdavsmxxka4g8sldpdi9n89i1pllfmq10kw9sd";
+      name = "kbookmarks-5.19.0.tar.xz";
+    };
+  };
+  kcmutils = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kcmutils-5.19.0.tar.xz";
+      sha256 = "0qhdjb3zvqq9ycfgb52lz4flgipyplj5ksz8h8y71bbs4w6lazd8";
+      name = "kcmutils-5.19.0.tar.xz";
+    };
+  };
+  kcodecs = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kcodecs-5.19.0.tar.xz";
+      sha256 = "1rzp314fv9n5168j7nhv1c8fjaszpmgdx6javrx4w0hyrjdfkg66";
+      name = "kcodecs-5.19.0.tar.xz";
+    };
+  };
+  kcompletion = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kcompletion-5.19.0.tar.xz";
+      sha256 = "05n0y5kf3bcc4wgn6k0js5cravv1k93xxzrgapm21323qgvfagwd";
+      name = "kcompletion-5.19.0.tar.xz";
+    };
+  };
+  kconfig = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kconfig-5.19.0.tar.xz";
+      sha256 = "0nk5hfl8yh0kgaa7xi0cc05dl6nf7prvbvxv0i99207xh9dafdmm";
+      name = "kconfig-5.19.0.tar.xz";
+    };
+  };
+  kconfigwidgets = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kconfigwidgets-5.19.0.tar.xz";
+      sha256 = "1nld27chcjwjgwv76s2j77ifmca235yp10bm08rjmvnfn6778ypv";
+      name = "kconfigwidgets-5.19.0.tar.xz";
+    };
+  };
+  kcoreaddons = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kcoreaddons-5.19.0.tar.xz";
+      sha256 = "07sm0givfdx28p302fkynzsd3xkpn1hbs43d4rscyx18yxfsldcw";
+      name = "kcoreaddons-5.19.0.tar.xz";
+    };
+  };
+  kcrash = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kcrash-5.19.0.tar.xz";
+      sha256 = "1dy03gp1sj96wn0zfa0dpbvz8pz0ia1j7p1wcif3iqk55pjxdgyl";
+      name = "kcrash-5.19.0.tar.xz";
+    };
+  };
+  kdbusaddons = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kdbusaddons-5.19.0.tar.xz";
+      sha256 = "1bb5aik0kl3kab5399drfjxrm8iysgkf813xgr0y4k64c9kwfp28";
+      name = "kdbusaddons-5.19.0.tar.xz";
+    };
+  };
+  kdeclarative = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kdeclarative-5.19.0.tar.xz";
+      sha256 = "03g02zy7wjzmpvqzxx32z8ap7jyj9sf432g1d3csb0dcbx2ny52g";
+      name = "kdeclarative-5.19.0.tar.xz";
+    };
+  };
+  kded = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kded-5.19.0.tar.xz";
+      sha256 = "0nyvg0h2aqy7qr57bad6wyc2rmcv9nhdq0py4fxc3irb6516p9hz";
+      name = "kded-5.19.0.tar.xz";
+    };
+  };
+  kdelibs4support = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/portingAids/kdelibs4support-5.19.0.tar.xz";
+      sha256 = "0iqnb2j6gfy8006arwv65vljfhxdnk6aia0zppngb481jnd9n2pn";
+      name = "kdelibs4support-5.19.0.tar.xz";
+    };
+  };
+  kdesignerplugin = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kdesignerplugin-5.19.0.tar.xz";
+      sha256 = "11inmvyair796rx4842naf1dnxqvc6bqqzrv700ycvisad646ws5";
+      name = "kdesignerplugin-5.19.0.tar.xz";
+    };
+  };
+  kdesu = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kdesu-5.19.0.tar.xz";
+      sha256 = "19w8m7ji61bpd368lzkwlizcwa1l968l568lksgm2mm9pnyjjhgz";
+      name = "kdesu-5.19.0.tar.xz";
+    };
+  };
+  kdewebkit = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kdewebkit-5.19.0.tar.xz";
+      sha256 = "04b5qanhxggffnvmi28lspyi8kj4kq7mxhxndar9fmkzzgvy70hj";
+      name = "kdewebkit-5.19.0.tar.xz";
+    };
+  };
+  kdnssd = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kdnssd-5.19.0.tar.xz";
+      sha256 = "15a8w2i29mrbhadw6y123mr0cc45ijabnwdfp3lbkd40lk8nq314";
+      name = "kdnssd-5.19.0.tar.xz";
+    };
+  };
+  kdoctools = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kdoctools-5.19.0.tar.xz";
+      sha256 = "06g77n9wxpiv4skc1kz794ppfb2mkmd3fgn6an5kr301xc76cnpn";
+      name = "kdoctools-5.19.0.tar.xz";
+    };
+  };
+  kemoticons = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kemoticons-5.19.0.tar.xz";
+      sha256 = "0fiix2sf2wrvmrpx8whdr1bzm7gbv7pvg02y47w5bl6s9gh176g5";
+      name = "kemoticons-5.19.0.tar.xz";
+    };
+  };
+  kfilemetadata = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kfilemetadata-5.19.0.tar.xz";
+      sha256 = "11j8if3xhp3xxwibwm6nxb4lh8wx40ni3zf5hki327pxv4vpq3qr";
+      name = "kfilemetadata-5.19.0.tar.xz";
+    };
+  };
+  kglobalaccel = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kglobalaccel-5.19.0.tar.xz";
+      sha256 = "021j98f7217m83aqxpamg0lzlaiskdaqsd9iabc8wrp1g0nkm05d";
+      name = "kglobalaccel-5.19.0.tar.xz";
+    };
+  };
+  kguiaddons = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kguiaddons-5.19.0.tar.xz";
+      sha256 = "019xaf7vpgifcw8wibli9d2b50brhgdaypsqknh6mqq8q9g06jhy";
+      name = "kguiaddons-5.19.0.tar.xz";
+    };
+  };
+  khtml = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/portingAids/khtml-5.19.0.tar.xz";
+      sha256 = "0hqa54a9nxy954vy8gf52y89xd3ibz9b4jgh6w347b1alp1zn145";
+      name = "khtml-5.19.0.tar.xz";
+    };
+  };
+  ki18n = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/ki18n-5.19.0.tar.xz";
+      sha256 = "0v3arc20y5d8afm9zfrz1skd2xg3ng62cq1xvxiq645w6mxf7y05";
+      name = "ki18n-5.19.0.tar.xz";
+    };
+  };
+  kiconthemes = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kiconthemes-5.19.0.tar.xz";
+      sha256 = "0riicirgda3w2b30dzsa2lq9xrr4y04qwhxyzq1p8gn2x4pp3g3n";
+      name = "kiconthemes-5.19.0.tar.xz";
+    };
+  };
+  kidletime = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kidletime-5.19.0.tar.xz";
+      sha256 = "0jlbzqv36ddhfhk8xkkgw0xhq8s371z9ama1cyv2xq8kk4vjywc6";
+      name = "kidletime-5.19.0.tar.xz";
+    };
+  };
+  kimageformats = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kimageformats-5.19.0.tar.xz";
+      sha256 = "1ydizc6b0ncndazk62h8y249yfcx381pwzyivfpka1f69zfgyvv5";
+      name = "kimageformats-5.19.0.tar.xz";
+    };
+  };
+  kinit = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kinit-5.19.0.tar.xz";
+      sha256 = "03l7pijqdnnsfg6yz9p73p7xa86sldayggl6rc5hpkzmgyczcfzm";
+      name = "kinit-5.19.0.tar.xz";
+    };
+  };
+  kio = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kio-5.19.0.tar.xz";
+      sha256 = "0c7smp7cajivx53shy65mp9zcc51pha9iyvh37dggfflxy3xf9nv";
+      name = "kio-5.19.0.tar.xz";
+    };
+  };
+  kitemmodels = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kitemmodels-5.19.0.tar.xz";
+      sha256 = "0skmim986qnncbzd84vm1wp1fr41jn04af2dgckirsk23d35bln7";
+      name = "kitemmodels-5.19.0.tar.xz";
+    };
+  };
+  kitemviews = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kitemviews-5.19.0.tar.xz";
+      sha256 = "118zv46mvrfwbvl06bb1m8axv92wnp4pfs36hsxvnjl7gfjk5xjn";
+      name = "kitemviews-5.19.0.tar.xz";
+    };
+  };
+  kjobwidgets = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kjobwidgets-5.19.0.tar.xz";
+      sha256 = "1qzf8nzy8rxkdai9aj2lyrww90245v0p2q115xiz73bsg9rahmji";
+      name = "kjobwidgets-5.19.0.tar.xz";
+    };
+  };
+  kjs = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/portingAids/kjs-5.19.0.tar.xz";
+      sha256 = "08m01762hb25vm020g3v37bh40cgvcfrj45ql135klx96x9imfaf";
+      name = "kjs-5.19.0.tar.xz";
+    };
+  };
+  kjsembed = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/portingAids/kjsembed-5.19.0.tar.xz";
+      sha256 = "1wmkgy8jgm21y2cvcbv1fdv29dxxla8n6ws78kzzbbw4cgqwwl48";
+      name = "kjsembed-5.19.0.tar.xz";
+    };
+  };
+  kmediaplayer = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/portingAids/kmediaplayer-5.19.0.tar.xz";
+      sha256 = "1vhqr2c7q8vwzdj29vpmfjfhyal8wp9ffirrnqc98vb6sffs85ay";
+      name = "kmediaplayer-5.19.0.tar.xz";
+    };
+  };
+  knewstuff = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/knewstuff-5.19.0.tar.xz";
+      sha256 = "12acd12vxk9z83zg3yz8lvmmb8737z9lzd4hs9a3jcs1z5k2nhb4";
+      name = "knewstuff-5.19.0.tar.xz";
+    };
+  };
+  knotifications = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/knotifications-5.19.0.tar.xz";
+      sha256 = "0grgm0ws16gp2j77nslqpl1jpxbi0m6g59zr7v1xnmzdk2j6n4av";
+      name = "knotifications-5.19.0.tar.xz";
+    };
+  };
+  knotifyconfig = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/knotifyconfig-5.19.0.tar.xz";
+      sha256 = "161brvryxzdkny7sf6icn1jpyi6rnw6jc808gdf5g41v50xpnxfj";
+      name = "knotifyconfig-5.19.0.tar.xz";
+    };
+  };
+  kpackage = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kpackage-5.19.0.tar.xz";
+      sha256 = "1km4sjgxfljp2pnjnzj48q3c574zvj7341a57n4ifhjwj37yzxdv";
+      name = "kpackage-5.19.0.tar.xz";
+    };
+  };
+  kparts = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kparts-5.19.0.tar.xz";
+      sha256 = "05g59x2mrqygawzcwgw3igl5n96l649h0kpzh37sfq4i8kg15g7l";
+      name = "kparts-5.19.0.tar.xz";
+    };
+  };
+  kpeople = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kpeople-5.19.0.tar.xz";
+      sha256 = "1ksf6g71li1xk4q98cvwkam8m8g32x2815kj1gfwbg4g6iw74w98";
+      name = "kpeople-5.19.0.tar.xz";
+    };
+  };
+  kplotting = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kplotting-5.19.0.tar.xz";
+      sha256 = "169x4m9ms8yhfha8zclnl8wrnfhfqshpwwg4b5bd046pcrkqmnqq";
+      name = "kplotting-5.19.0.tar.xz";
+    };
+  };
+  kpty = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kpty-5.19.0.tar.xz";
+      sha256 = "0289vzfjwppwqj9h03flzhwm18dnxz11hqhdhr9990x7rw6a4n03";
+      name = "kpty-5.19.0.tar.xz";
+    };
+  };
+  kross = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/portingAids/kross-5.19.0.tar.xz";
+      sha256 = "1nv7mrhn7wa4bs2a164x42d3b37akyvhkxqs8cg5fqp4vr2wkw0p";
+      name = "kross-5.19.0.tar.xz";
+    };
+  };
+  krunner = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/portingAids/krunner-5.19.0.tar.xz";
+      sha256 = "054s8309lxi27gpbg7iygbcxsp0pwrzbzww3h8zp2a9yiic4s5mx";
+      name = "krunner-5.19.0.tar.xz";
+    };
+  };
+  kservice = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kservice-5.19.0.tar.xz";
+      sha256 = "02lbia26r2462nwksizaxjfkhxfqqs732dp495yx8bjc7wcv3srm";
+      name = "kservice-5.19.0.tar.xz";
+    };
+  };
+  ktexteditor = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/ktexteditor-5.19.0.tar.xz";
+      sha256 = "0v3l44w4k43ajs81i8386hszk3x7rajjlb6z3jb7q98vhp91b5dp";
+      name = "ktexteditor-5.19.0.tar.xz";
+    };
+  };
+  ktextwidgets = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/ktextwidgets-5.19.0.tar.xz";
+      sha256 = "1xydb76r6x1p10bkr2nlqg3md78jw8zvqad0h42dgvl4f5xvjknp";
+      name = "ktextwidgets-5.19.0.tar.xz";
+    };
+  };
+  kunitconversion = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kunitconversion-5.19.0.tar.xz";
+      sha256 = "11g1vhqkrb1k748drj7klkbb7jca3dybakcmcgqf53g8vxfih8kb";
+      name = "kunitconversion-5.19.0.tar.xz";
+    };
+  };
+  kwallet = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kwallet-5.19.0.tar.xz";
+      sha256 = "0z0c62fdfx9syrq6z7bk0ihac4yqyxpycll7h3mijj29km4jnpjm";
+      name = "kwallet-5.19.0.tar.xz";
+    };
+  };
+  kwidgetsaddons = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kwidgetsaddons-5.19.0.tar.xz";
+      sha256 = "0b85ng0dj5gpzifqmhyzgx61nb37vq7d0gvfpfazlcp5n27ywivm";
+      name = "kwidgetsaddons-5.19.0.tar.xz";
+    };
+  };
+  kwindowsystem = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kwindowsystem-5.19.0.tar.xz";
+      sha256 = "115xs34r74j9zcsw69glnh8w59iyh764n3gniawwrk23c6yb8fch";
+      name = "kwindowsystem-5.19.0.tar.xz";
+    };
+  };
+  kxmlgui = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kxmlgui-5.19.0.tar.xz";
+      sha256 = "1al2xifiyvl3zpva9nqap8gb6vqfgmf2fnhkmymm02rwg4yn4gah";
+      name = "kxmlgui-5.19.0.tar.xz";
+    };
+  };
+  kxmlrpcclient = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/kxmlrpcclient-5.19.0.tar.xz";
+      sha256 = "0lji7cxvh2lmjz42lx6ymz962gr4cyqfzksz0n5vgzfk5z0vq98g";
+      name = "kxmlrpcclient-5.19.0.tar.xz";
+    };
+  };
+  modemmanager-qt = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/modemmanager-qt-5.19.0.tar.xz";
+      sha256 = "05x9jicryjw9fj02arpya8xsh79rsnljnqjfpwbb7pi38f9i8v4w";
+      name = "modemmanager-qt-5.19.0.tar.xz";
+    };
+  };
+  networkmanager-qt = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/networkmanager-qt-5.19.0.tar.xz";
+      sha256 = "0wi0mkygzbvvyil1nyzc3ihgilvpx6j7caqaa9k38p85g93vsq13";
+      name = "networkmanager-qt-5.19.0.tar.xz";
+    };
+  };
+  oxygen-icons5 = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/oxygen-icons5-5.19.0.tar.xz";
+      sha256 = "09vfwcyidj3bl0qr4sq78bkc69zp9x8dwp8bsay5y05q8591dkg0";
+      name = "oxygen-icons5-5.19.0.tar.xz";
+    };
+  };
+  plasma-framework = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/plasma-framework-5.19.0.tar.xz";
+      sha256 = "1588r1jag0s9hhw4qq7mr2mcdd3d9az5ngb3z1l58xdhvfcc4497";
+      name = "plasma-framework-5.19.0.tar.xz";
+    };
+  };
+  solid = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/solid-5.19.0.tar.xz";
+      sha256 = "02bnvhscb55r6q5hkyh7rqi6zsc3r974y3x9shi8l0xbs78snkgz";
+      name = "solid-5.19.0.tar.xz";
+    };
+  };
+  sonnet = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/sonnet-5.19.0.tar.xz";
+      sha256 = "02ringh0wyiq1n19c200bcyf5x2w5jhw0pcxvfjzjai1sjig03x7";
+      name = "sonnet-5.19.0.tar.xz";
+    };
+  };
+  threadweaver = {
+    version = "5.19.0";
+    src = fetchurl {
+      url = "${mirror}/stable/frameworks/5.19/threadweaver-5.19.0.tar.xz";
+      sha256 = "1jm1sw7xq76s2ggghm6qqdn7452myy9n7p5zzdb01qbaw2y1x4pw";
+      name = "threadweaver-5.19.0.tar.xz";
+    };
+  };
+}
diff --git a/pkgs/development/libraries/kde-frameworks-5.18/threadweaver.nix b/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.18/threadweaver.nix
rename to pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f093dc106338..f7d7c8f03f0b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15015,7 +15015,7 @@ let
 
   kde5 =
     let
-      frameworks = import ../development/libraries/kde-frameworks-5.18 { inherit pkgs; };
+      frameworks = import ../development/libraries/kde-frameworks-5.19 { inherit pkgs; };
       plasma = import ../desktops/plasma-5.5 { inherit pkgs; };
       apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
       named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; };

From c5416370d50a3bc6d03624cf85eb2329ae4b3798 Mon Sep 17 00:00:00 2001
From: Asko Soukka <asko.soukka@iki.fi>
Date: Sat, 20 Feb 2016 00:07:15 +0200
Subject: [PATCH 1582/2285] pycontracts: init at 1.7.9

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8ec275834e8f..a98bc5e93af4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3906,6 +3906,26 @@ in modules // {
     };
   };
 
+  pycontracts = buildPythonPackage rec {
+    version = "1.7.9";
+    name = "PyContracts-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/P/PyContracts/${name}.tar.gz";
+      sha256 = "0rdc9pz08885vqkazjc3lyrrghmf3jzxnlsgpn8akl808x1qrfqf";
+    };
+
+    buildInputs = with self; [ nose ];
+
+    propagatedBuildInputs = with self; [ pyparsing decorator six ];
+
+    meta = {
+      description = "Allows to declare constraints on function parameters and return values.";
+      homepage = https://pypi.python.org/pypi/PyContracts;
+      license = licenses.lgpl2;
+    };
+  };
+
   pycparser = buildPythonPackage rec {
     name = "pycparser-${version}";
     version = "2.14";

From 433f979cee469434081b6c7cdf69d5f949f32ebb Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 19 Feb 2016 22:56:19 +0000
Subject: [PATCH 1583/2285] zerotierone: adopt systemd unit from upstream

See
https://github.com/zerotier/ZeroTierOne/blob/5db538d85ef739fa969a5b71d294501ac0bb5335/ext/installfiles/linux/systemd/zerotier-one.service
---
 nixos/modules/services/networking/zerotierone.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/zerotierone.nix b/nixos/modules/services/networking/zerotierone.nix
index 886ea18d9809..6237f95b127b 100644
--- a/nixos/modules/services/networking/zerotierone.nix
+++ b/nixos/modules/services/networking/zerotierone.nix
@@ -21,10 +21,9 @@ in
         chown -R root:root /var/lib/zerotier-one
         '';
       serviceConfig = {
-        Type = "forking";
-        User = "root";
-        PIDFile = "/var/lib/zerotier-one/zerotier-one.pid";
-        ExecStart = "${pkgs.zerotierone}/bin/zerotier-one -d";
+        ExecStart = "${pkgs.zerotierone}/bin/zerotier-one";
+        Restart = "always";
+        KillMode = "process";
       };
     };
   environment.systemPackages = [ pkgs.zerotierone ];

From 99910d97c2e95e8e85a14d2aced3a7c3be9ca547 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 19 Feb 2016 23:01:30 +0000
Subject: [PATCH 1584/2285] zerotierone: 1.1.0 -> 1.1.4

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

diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index d9a50d7dc696..e2ba2102d76b 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -3,12 +3,12 @@
 with stdenv.lib;
 
 stdenv.mkDerivation rec {
-  version = "1.1.0";
+  version = "1.1.4";
   name = "zerotierone";
 
   src = fetchurl {
     url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz";
-    sha256 = "2d7ff178bd7fd284ebb7011d8a91bde51befda60f100eb5429a2dcb6626cf676";
+    sha256 = "10aw0dlkmprdvph3aqkqximxqkryf0l4jcnv2bbm7f1qvclqihva";
   };
 
   preConfigure = ''

From e51d562f9f9f44798e48248cb11d0e58b55a3cb1 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 19 Feb 2016 23:08:04 +0100
Subject: [PATCH 1585/2285] perl-podlators: 2.5.3 -> 4.06

---
 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 fa95c98dbca5..2c36d38abbb1 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9739,11 +9739,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  podlators = buildPerlPackage {
-    name = "podlators-2.5.3";
+  podlators = buildPerlPackage rec {
+    name = "podlators-4.06";
     src = fetchurl {
-      url = mirror://cpan/authors/id/R/RR/RRA/podlators-2.5.3.tar.gz;
-      sha256 = "c80d6d65a8694720deff1c6b2067d7564727db713b6d6b536afbad70299647d1";
+      url = "mirror://cpan/authors/id/R/RR/RRA/${name}.tar.gz";
+      sha256 = "0fsb1k88fsqwgmk5fkcz57jf27g6ip4ncikawslm596d1si2h48a";
     };
     meta = {
       description = "Convert POD data to various other formats";

From 06424612e680cfd526f9d515aaa58586c255a2c2 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Fri, 19 Feb 2016 23:40:56 +0100
Subject: [PATCH 1586/2285] perl-MooseX-Role-WithOverloading: 0.13 -> 0.17

---
 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 2c36d38abbb1..b03290cf8e9e 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8149,10 +8149,10 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  MooseXRoleWithOverloading = buildPerlPackage {
-    name = "MooseX-Role-WithOverloading-0.13";
+  MooseXRoleWithOverloading = buildPerlPackage rec {
+    name = "MooseX-Role-WithOverloading-0.17";
     src = fetchurl {
-      url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Role-WithOverloading-0.13.tar.gz;
+      url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
       sha256 = "01mqpvbz7yw993918hgp72vl22i6mgicpq5b3zrrsp6vl8sqj2sw";
     };
     buildInputs = [ TestCheckDeps TestNoWarnings ModuleMetadata];

From 2d5537d89efb93eda88e96beb13ab169f2e08c37 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Sat, 20 Feb 2016 10:22:54 +0900
Subject: [PATCH 1587/2285] fcitx-m17n: init at 0.2.3

---
 .../fcitx-engines/fcitx-m17n/default.nix      | 29 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix

diff --git a/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix
new file mode 100644
index 000000000000..ff42bbbbcc8e
--- /dev/null
+++ b/pkgs/tools/inputmethods/fcitx-engines/fcitx-m17n/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, cmake, fcitx, gettext, m17n_lib, m17n_db, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "fcitx-m17n-${version}";
+  version = "0.2.3";
+
+  src = fetchurl {
+    url = "http://download.fcitx-im.org/fcitx-m17n/${name}.tar.xz";
+    sha256 = "0ffyhsg7bc6525k94kfhnja1h6ajlfprq72d286dp54cksnakyc4";
+  };
+
+  buildInputs = [ cmake fcitx gettext m17n_lib m17n_db pkgconfig ];
+
+  preInstall = ''
+    substituteInPlace im/cmake_install.cmake \
+    --replace ${fcitx} $out
+    '';
+
+  meta = with stdenv.lib; {
+    isFcitxEngine = true;
+    homepage      = "https://github.com/fcitx/fcitx-m17n";
+    downloadPage  = "http://download.fcitx-im.org/fcitx-table-other/";
+    description   = "Fcitx wrapper for m17n";
+    license       = licenses.gpl3Plus;
+    platforms     = platforms.linux;
+    maintainers   = with maintainers; [ ericsagnes ];
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db3bc6abdc23..89af7ad5a8c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1529,6 +1529,8 @@ let
 
     hangul = callPackage ../tools/inputmethods/fcitx-engines/fcitx-hangul { };
 
+    m17n = callPackage ../tools/inputmethods/fcitx-engines/fcitx-m17n { };
+
     mozc = callPackage ../tools/inputmethods/fcitx-engines/fcitx-mozc {
       inherit (pythonPackages) gyp;
     };

From 9e7ddbdcbd8d33f996242774aef630204b264613 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Sat, 20 Feb 2016 10:49:35 +0900
Subject: [PATCH 1588/2285] ibus-m17n: init at 1.3.4

---
 .../ibus-engines/ibus-m17n/default.nix        | 32 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
new file mode 100644
index 000000000000..30329c4306f2
--- /dev/null
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub, ibus, m17n_lib, m17n_db, automake, autoconf,
+  gettext, libtool, pkgconfig, python, pythonPackages }:
+
+stdenv.mkDerivation rec {
+  name = "ibus-m17n-${version}";
+  version = "1.3.4";
+
+  src = fetchFromGitHub {
+    owner  = "ibus";
+    repo   = "ibus-m17n";
+    rev    = version;
+    sha256 = "1n0bvgc4jyksgvzrw5zs2pxcpxcn3gcc0j2kasbznm34fpv3frsr";
+  };
+
+  buildInputs = [ 
+    ibus m17n_lib m17n_db automake autoconf gettext 
+    libtool pkgconfig python pythonPackages.pygobject3 
+  ];
+
+  preConfigure = ''
+    autoreconf --verbose --force --install
+  '';
+
+  meta = with stdenv.lib; {
+    isIbusEngine = true;
+    description  = "m17n engine for ibus.";
+    homepage     = https://github.com.com/ibus/ibus-m17n;
+    license      = licenses.gpl2;
+    platforms    = platforms.linux;
+    maintainers  = with maintainers; [ ericsagnes ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89af7ad5a8c9..3929c174b134 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1180,6 +1180,8 @@ let
 
     hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { };
 
+    m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { };
+
     mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc {
       inherit (pythonPackages) gyp;
     };

From dc6bd6118730873a9746261ba72d9ae5fe497607 Mon Sep 17 00:00:00 2001
From: Eric Sagnes <eric.sagnes@gmail.com>
Date: Tue, 16 Feb 2016 23:32:01 +0900
Subject: [PATCH 1589/2285] added input method related changelog

---
 .../doc/manual/release-notes/rl-unstable.xml  | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index c2d1563e0a5d..393f0fdeb40c 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -44,6 +44,7 @@ nixos.path = ./nixpkgs-unstable-2015-12-06/nixos;
     <listitem><para><literal>services/networking/pdnsd.nix</literal></para></listitem>
     <listitem><para><literal>services/web-apps/pump.io.nix</literal></para></listitem>
     <listitem><para><literal>services/security/haka.nix</literal></para></listitem>
+    <listitem><para><literal>i18n/inputMethod/default.nix</literal></para></listitem>
   </itemizedlist>
 </para>
 
@@ -197,6 +198,32 @@ fileSystems."/example" = {
     <literal>services.hardware.opengl.extraPackages{,32}</literal> instead. You can
     also specify VDPAU drivers there.</para>
   </listitem>
+
+  <listitem>
+    <para>
+    <literal>programs.ibus</literal> moved to <literal>i18n.inputMethod.ibus</literal>.
+    The option <literal>programs.ibus.plugins</literal> changed to <literal>i18n.inputMethod.ibus.engines</literal>
+    and the option to enable ibus changed from <literal>programs.ibus.enable</literal> to
+    <literal>i18n.inputMethod.enabled</literal>.
+    <literal>i18n.inputMethod.enabled</literal> should be set to the used input method name,
+    <literal>"ibus"</literal> for ibus.
+    An example of the new style:
+
+<programlisting>
+i18n.inputMethod.enabled = "ibus";
+i18n.inputMethod.ibus.engines = with pkgs.ibus-engines; [ anthy mozc ];
+</programlisting>
+
+That is equivalent to the old version:
+
+<programlisting>
+programs.ibus.enable = true;
+programs.ibus.plugins = with pkgs; [ ibus-anthy mozc ];
+</programlisting>
+
+    </para>
+  </listitem>
+
 </itemizedlist>
 
 
@@ -215,6 +242,12 @@ fileSystems."/example" = {
     NixOS.</para>
   </listitem>
 
+  <listitem>
+    <para>Input method support was improved. New NixOS modules (fcitx, nabi and uim),
+    fcitx engines (chewing, hangul, m17n, mozc and table-other) and ibus engines (hangul and m17n)
+    have been added.</para>
+  </listitem>
+
 </itemizedlist></para>
 
 </section>

From a0912fd3b4d4ff5c1d601d37dd1f436b54fab02c Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 20 Feb 2016 11:36:16 +0100
Subject: [PATCH 1590/2285] lazarus: 1.4.4 -> 1.6

---
 pkgs/development/compilers/fpc/lazarus.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index c579ba5612a2..0db5f03a1ab9 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/pkgs/development/compilers/fpc/lazarus.nix
@@ -8,10 +8,10 @@ stdenv, fetchurl
 let
   s =
   rec {
-    version = "1.4.4";
-    versionSuffix = "-0";
+    version = "1.6";
+    versionSuffix = ".0-0";
     url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}${versionSuffix}.tar.gz";
-    sha256 = "12w3xwqif96a65b0ygi4riqrp0122wsp0ykb1j7k8hjfyk91x91a";
+    sha256 = "1a1w9yibi0rsr51bl7csnq6mr59x0934850kiabs80nr3sz05knb";
     name = "lazarus-${version}";
   };
   buildInputs = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation {
     "bigide"
   ];
   preBuild = ''
-    export makeFlags="$makeFlags LAZARUS_INSTALL_DIR=$out/lazarus/ INSTALL_PREFIX=$out/"
+    export makeFlags="$makeFlags LAZARUS_INSTALL_DIR=$out/share/lazarus/ INSTALL_PREFIX=$out/"
     export NIX_LDFLAGS="$NIX_LDFLAGS -L${stdenv.cc.cc}/lib -lXi -lX11 -lglib-2.0 -lgtk-x11-2.0 -lgdk-x11-2.0 -lc -lXext -lpango-1.0 -latk-1.0 -lgdk_pixbuf-2.0 -lcairo -lgcc_s"
     export LCL_PLATFORM=gtk2
     mkdir -p $out/share "$out/lazarus"

From c3b4dd920b50d6fd7625ada250d042b47fbd0217 Mon Sep 17 00:00:00 2001
From: Arnold Krille <arnold@arnoldarts.de>
Date: Sat, 13 Feb 2016 18:50:07 +0100
Subject: [PATCH 1591/2285] rsync/rrsync: less code duplication

- refactor the common parts all into the base.nix
- add myself as maintainer
---
 .../networking/sync/rsync/base.nix            | 26 +++++++++++++++++++
 .../networking/sync/rsync/default.nix         | 20 +++++---------
 .../networking/sync/rsync/rrsync.nix          | 18 ++++++-------
 .../networking/sync/rsync/src.nix             |  7 -----
 4 files changed, 41 insertions(+), 30 deletions(-)
 create mode 100644 pkgs/applications/networking/sync/rsync/base.nix
 delete mode 100644 pkgs/applications/networking/sync/rsync/src.nix

diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix
new file mode 100644
index 000000000000..ef159d4d0e39
--- /dev/null
+++ b/pkgs/applications/networking/sync/rsync/base.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl }:
+
+let
+  version = "3.2.1";
+in
+{
+  version = version;
+  src = fetchurl {
+    # signed with key 0048 C8B0 26D4 C96F 0E58  9C2F 6C85 9FB1 4B96 A8C5
+    url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";
+    sha256 = "1hm1q04hz15509f0p9bflw4d6jzfvpm1d36dxjwihk1wzakn5ypc";
+  };
+  patches = fetchurl {
+    # signed with key 0048 C8B0 26D4 C96F 0E58  9C2F 6C85 9FB1 4B96 A8C5
+    url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz";
+    sha256 = "09i3dcl37p22dp75vlnsvx7bm05ggafnrf1zwhf2kbij4ngvxvpd";
+  };
+
+  meta = with stdenv.lib; {
+    homepage = http://rsync.samba.org/;
+    #description = "A helper to run rsync-only environments from ssh-logins.";
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ simons ehmry kampfschlaefer ];
+  };
+}
\ No newline at end of file
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 6608e32e8bcb..8a4ff67e2eb5 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -5,17 +5,15 @@
 
 assert enableACLs -> acl != null;
 
+let
+  base = import ./base.nix { inherit stdenv fetchurl; };
+in
 stdenv.mkDerivation rec {
-  name = "rsync-${version}";
-  version = "3.1.2";
+  name = "rsync-${base.version}";
 
-  mainSrc = import ./src.nix { inherit fetchurl version; };
+  mainSrc = base.src;
 
-  patchesSrc = fetchurl {
-    # signed with key 0048 C8B0 26D4 C96F 0E58  9C2F 6C85 9FB1 4B96 A8C5
-    url = "mirror://samba/rsync/rsync-patches-${version}.tar.gz";
-    sha256 = "09i3dcl37p22dp75vlnsvx7bm05ggafnrf1zwhf2kbij4ngvxvpd";
-  };
+  patchesSrc = base.patches;
 
   srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc;
   patches = stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff";
@@ -25,11 +23,7 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--with-nobody-group=nogroup";
 
-  meta = with stdenv.lib; {
-    homepage = http://rsync.samba.org/;
+  meta = base.meta // {
     description = "A fast incremental file transfer utility";
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ simons ehmry ];
   };
 }
diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix
index 044a01993f9d..6260fc0ddeca 100644
--- a/pkgs/applications/networking/sync/rsync/rrsync.nix
+++ b/pkgs/applications/networking/sync/rsync/rrsync.nix
@@ -1,10 +1,12 @@
 { stdenv, fetchurl, perl, rsync }:
 
+let
+  base = import ./base.nix { inherit stdenv fetchurl; };
+in
 stdenv.mkDerivation rec {
-  name = "rrsync-${version}";
-  version = "3.1.2";
+  name = "rrsync-${base.version}";
 
-  src = import ./src.nix { inherit fetchurl version; };
+  src = base.src;
 
   buildInputs = [ rsync ];
   nativeBuildInputs = [perl];
@@ -15,7 +17,7 @@ stdenv.mkDerivation rec {
   dontBuild = true;
 
   postPatch = ''
-    sed -i 's#/usr/bin/rsync#${rsync}/bin/rsync#' support/rrsync
+    substituteInPlace support/rrsync --replace /usr/bin/rsync ${rsync}/bin/rsync
   '';
 
   installPhase = ''
@@ -24,11 +26,7 @@ stdenv.mkDerivation rec {
     chmod a+x $out/bin/rrsync
   '';
 
-  meta = with stdenv.lib; {
-    homepage = http://rsync.samba.org/;
-    description = "A helper to run rsync-only environments from ssh-logins.";
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ simons ehmry ];
+  meta = base.meta // {
+    description = "A helper to run rsync-only environments from ssh-logins";
   };
 }
diff --git a/pkgs/applications/networking/sync/rsync/src.nix b/pkgs/applications/networking/sync/rsync/src.nix
deleted file mode 100644
index f6896d2c5985..000000000000
--- a/pkgs/applications/networking/sync/rsync/src.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ version, fetchurl }:
-
-fetchurl {
-  # signed with key 0048 C8B0 26D4 C96F 0E58  9C2F 6C85 9FB1 4B96 A8C5
-  url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";
-  sha256 = "1hm1q04hz15509f0p9bflw4d6jzfvpm1d36dxjwihk1wzakn5ypc";
-}
\ No newline at end of file

From e1a3b4128fe9107d21b28334cc3e434c982ec200 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Fri, 19 Feb 2016 14:56:59 -0800
Subject: [PATCH 1592/2285] mpv: 0.14.0 -> 0.15.0

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

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 38efe61a7df5..5bc2eee24145 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/mpv-player/mpv/archive/v${meta.version}.tar.gz";
-    sha256 = "0cqjwl0xyg0sv1jflipfkvqjg32y0kqfh4gc3lyhqgv0hgs3fa84";
+    sha256 = "1p0b83048g66icpz5n66v3k4ldr1z0rmg5d2rr7kcbspm1xj2cbx";
   };
 
   patchPhase = ''
@@ -125,7 +125,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    version = "0.14.0";
+    version = "0.15.0";
     description = "A media player that supports many video formats (MPlayer and mplayer2 fork)";
     homepage = http://mpv.io;
     license = licenses.gpl2Plus;

From 9e0b5358e2df4e265de30692a7f718c84909af4e Mon Sep 17 00:00:00 2001
From: mingchuan <ming@culpring.com>
Date: Sat, 20 Feb 2016 19:24:25 +0800
Subject: [PATCH 1593/2285] pcmanx-gtk2: init at 1.3

---
 lib/maintainers.nix                           |  1 +
 .../applications/misc/pcmanx-gtk2/default.nix | 23 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/misc/pcmanx-gtk2/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 7426e18a61b9..39d91df04987 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -211,6 +211,7 @@
   meisternu = "Matt Miemiec <meister@krutt.org>";
   michelk = "Michel Kuhlmann <michel@kuhlmanns.info>";
   michaelpj = "Michael Peyton Jones <michaelpj@gmail.com>";
+  mingchuan = "Ming Chuan <ming@culpring.com>";
   mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>";
   mschristiansen = "Mikkel Christiansen <mikkel@rheosystems.com>";
   modulistic = "Pablo Costa <modulistic@gmail.com>";
diff --git a/pkgs/applications/misc/pcmanx-gtk2/default.nix b/pkgs/applications/misc/pcmanx-gtk2/default.nix
new file mode 100644
index 000000000000..fb655ceba5dc
--- /dev/null
+++ b/pkgs/applications/misc/pcmanx-gtk2/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, gtk2, libXft, intltool, automake115x, autoconf, libtool, pkgconfig }:
+
+stdenv.mkDerivation {
+  name = "pcmanx-gtk2-1.3";
+  src = fetchurl {
+    url = "https://github.com/pcman-bbs/pcmanx/archive/1.3.tar.gz";
+    sha256 = "2e5c59f6b568036f2ad6ac67ca2a41dfeeafa185451e507f9fb987d4ed9c4302";
+  };
+
+  buildInputs = [ gtk2 libXft intltool automake115x autoconf libtool pkgconfig ];
+
+  preConfigurePhases = ''
+    ./autogen.sh
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://pcman.ptt.cc";
+    license = licenses.gpl2;
+    description = "Telnet BBS browser with GTK+ interface";
+    maintainers = [ maintainers.mingchuan ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a219658881a7..c7a754421985 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12898,6 +12898,8 @@ let
 
   pcmanfm = callPackage ../applications/misc/pcmanfm { };
 
+  pcmanx-gtk2 = callPackage ../applications/misc/pcmanx-gtk2 { };
+
   pig = callPackage ../applications/networking/cluster/pig { };
 
   pijul = callPackage ../applications/version-management/pijul {

From 9eb6372c6be1057d69e40b0c7c5d3978e2ca9f6c Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <layus.on@gmail.com>
Date: Sat, 20 Feb 2016 14:02:38 +0100
Subject: [PATCH 1594/2285] teamviewer: fix wrong in sed usage

---
 pkgs/applications/networking/remote/teamviewer/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index dd947d86daf8..1abedc890f46 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
     ${if stdenv.system == "x86_64-linux" then ''
       sed -i "s,TV_LD64_PATH=.*,TV_LD64_PATH=$(cat ${ld64})," script/tvw_config
     '' else ''
-      sed -i ",TV_LD64_PATH=.*,d" script/tvw_config
+      sed -i "/TV_LD64_PATH=.*/d" script/tvw_config
     ''}
 
     sed -i "s,/opt/teamviewer,$out/share/teamviewer,g" desktop/teamviewer-*.desktop

From bd8158593d837b1bc521a3bf183b2cc1675aa8ce Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 20 Feb 2016 07:10:58 -0600
Subject: [PATCH 1595/2285] spotify: 1.0.19.106 -> 1.0.23.93

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

diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix
index f345e9710d2f..bf06761bc533 100644
--- a/pkgs/applications/audio/spotify/default.nix
+++ b/pkgs/applications/audio/spotify/default.nix
@@ -5,7 +5,7 @@
 assert stdenv.system == "x86_64-linux";
 
 let
-  version = "1.0.19.106.gb8a7150f";
+  version = "1.0.23.93.gd6cfae15-30";
 
   deps = [
     alsaLib
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
   src =
     fetchurl {
       url = "http://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb";
-      sha256 = "be6b99329bb2fccdc9d77bc949dd463576fdb40db7f56195b4284bd348c470be";
+      sha256 = "0n6vz51jv6s20dp4zlqkk52bpmpyfm1qn5bfm4lfq09x1g6ir5lr";
     };
 
   buildInputs = [ dpkg makeWrapper ];

From 0e96c96b84852a5e81134bcfb5d34a3def3f995f Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sat, 20 Feb 2016 14:44:41 +0100
Subject: [PATCH 1596/2285] mosquitto: Use built-in Makefile for installation.

This will also install man pages, client-binaries (mosquitto_sub,
mosquitto_pub), libs, headers, etc.
---
 pkgs/servers/mqtt/mosquitto/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/mqtt/mosquitto/default.nix b/pkgs/servers/mqtt/mosquitto/default.nix
index 4fdb475d89b8..0dacaf4cfe47 100644
--- a/pkgs/servers/mqtt/mosquitto/default.nix
+++ b/pkgs/servers/mqtt/mosquitto/default.nix
@@ -13,11 +13,14 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ openssl libuuid ];
 
-  buildFlags = "mosquitto";
+  makeFlags = [
+    "DESTDIR=$(out)"
+    "PREFIX="
+  ];
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp src/mosquitto $out/bin/
+  preBuild = ''
+    substituteInPlace config.mk \
+      --replace "/usr/local" ""
   '';
 
   meta = {

From b18bc4f5b655eac05705e2e9d00f552a676f7cc1 Mon Sep 17 00:00:00 2001
From: Asko Soukka <asko.soukka@iki.fi>
Date: Fri, 19 Feb 2016 23:53:13 +0200
Subject: [PATCH 1597/2285] ldap3: init at 1.0.4

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8ec275834e8f..ee59c2597640 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9092,6 +9092,22 @@ in modules // {
     };
   });
 
+  forbiddenfruit = buildPythonPackage rec {
+    version = "0.1.0";
+    name = "forbiddenfruit-${version}";
+
+    src = pkgs.fetchurl {
+      url= "https://pypi.python.org/packages/source/f/forbiddenfruit/${name}.tar.gz";
+      sha256 = "0xra2kw6m8ag29ifwmhi5zqksh4cr0yy1waqd488rm59kcr3zl79";
+    };
+
+    meta = {
+      description = "Patch python built-in objects";
+      homepage = https://pypi.python.org/pypi/forbiddenfruit;
+      license = licenses.mit;
+    };
+  };
+
   fs = buildPythonPackage rec {
     name = "fs-0.5.4";
 
@@ -9638,6 +9654,32 @@ in modules // {
     };
   };
 
+  gssapi = buildPythonPackage rec {
+    version = "1.1.4";
+    name = "gssapi-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/g/gssapi/${name}.tar.gz";
+      sha256 = "0mdl7m6h57n0zkfmm6fqz0hldfxrb2d7d48k2lhc8hqbr3962c7x";
+    };
+
+    GSSAPI_SUPPORT_DETECT = "false";
+    LD_LIBRARY_PATH="${pkgs.krb5Full}/lib";
+
+    buildInputs = [ pkgs.gss pkgs.krb5Full pkgs.which
+                    self.nose self.shouldbe ];
+
+    propagatedBuildInputs = with self; [ decorator enum34 six ];
+
+    doCheck = false; # No such file or directory: '/usr/sbin/kadmin.local'
+
+    meta = {
+      homepage = https://pypi.python.org/pypi/gssapi;
+      description = "Python GSSAPI Wrapper";
+      license = licenses.mit;
+    };
+  };
+
   gyp = buildPythonPackage rec {
     name = "gyp-${version}";
     version = "2015-06-11";
@@ -16996,6 +17038,26 @@ in modules // {
     propagatedBuildInputs = with self; [pkgs.openldap pkgs.cyrus_sasl pkgs.openssl];
   };
 
+  ldap3 = buildPythonPackage rec {
+    version = "1.0.4";
+    name = "ldap3-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/l/ldap3/${name}.tar.gz";
+      sha256 = "0j4qqj9vq022hy7wfqn8s0j4vm2g6paabbzas1vbyspawvcfai98";
+    };
+
+    buildInputs = with self; [ gssapi ];
+
+    propagatedBuildInputs = with self; [ pyasn1 ];
+
+    meta = {
+      homepage = https://pypi.python.org/pypi/ldap3;
+      description = "A strictly RFC 4510 conforming LDAP V3 pure Python client library";
+      license = licenses.lgpl3;
+    };
+  };
+
   ptest = buildPythonPackage rec {
     name = pname + "-" + version;
     pname = "ptest";
@@ -19003,6 +19065,27 @@ in modules // {
     };
   };
 
+  shouldbe = buildPythonPackage rec {
+    version = "0.1.0";
+    name = "shouldbe-${version}";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/s/shouldbe/${name}.tar.gz";
+      sha256 = "07pchxpv1xvjbck0xy44k3a1jrvklg0wbyccn14w0i7d135d4174";
+    };
+
+    buildInputs = with self; [ nose ];
+
+    propagatedBuildInputs = with self; [ forbiddenfruit ];
+
+    doCheck = false;  # Segmentation fault on py 3.5
+
+    meta = {
+      description = "Python Assertion Helpers inspired by Shouldly";
+      homepage =  https://pypi.python.org/pypi/shouldbe/;
+      license = licenses.mit;
+    };
+  };
 
   simplejson = buildPythonPackage (rec {
     name = "simplejson-3.8.1";

From 11733b39b58a377ecebde444d2c630731882eb50 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 20 Feb 2016 14:07:27 +0000
Subject: [PATCH 1598/2285] git: fixes references to gettext properly

A better implementation of 5273dbf530a1149076cfd22c676b09c5f2627524

Fixes https://github.com/NixOS/nixpkgs/issues/13150

The attached patch removes a whole swath of unnecessary runtime gettext
detection. It also adds gettext on the PATH so that git-rebase can find it.
---
 .../git-and-tools/git/default.nix             |  3 +-
 .../git-and-tools/git/git-sh-i18n.patch       | 78 +++++++++++++++++++
 2 files changed, 80 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch

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 53c9dc84dfbf..ca6087ce318b 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -24,6 +24,7 @@ stdenv.mkDerivation {
   patches = [
     ./docbook2texi.patch
     ./symlinks-in-bin.patch
+    ./git-sh-i18n.patch
   ];
 
   buildInputs = [curl openssl zlib expat gettext cpio makeWrapper libiconv]
@@ -85,7 +86,7 @@ stdenv.mkDerivation {
 
       # Fix references to gettext.
       substituteInPlace $out/libexec/git-core/git-sh-i18n \
-          --replace 'gettext.sh' '${gettext}/bin/gettext.sh'
+          --subst-var-by gettext ${gettext}
 
       # gzip (and optionally bzip2, xz, zip) are runtime dependencies for
       # gitweb.cgi, need to patch so that it's found
diff --git a/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch
new file mode 100644
index 000000000000..8e3ee2bce896
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git/git-sh-i18n.patch
@@ -0,0 +1,78 @@
+diff --git a/git-sh-i18n.sh b/git-sh-i18n.sh
+index e6c3116..4e34a2c 100644
+--- a/git-sh-i18n.sh
++++ b/git-sh-i18n.sh
+@@ -15,69 +15,11 @@ else
+ fi
+ export TEXTDOMAINDIR
+ 
+-# First decide what scheme to use...
+-GIT_INTERNAL_GETTEXT_SH_SCHEME=fallthrough
+-if test -n "@@USE_GETTEXT_SCHEME@@"
+-then
+-	GIT_INTERNAL_GETTEXT_SH_SCHEME="@@USE_GETTEXT_SCHEME@@"
+-elif test -n "$GIT_INTERNAL_GETTEXT_TEST_FALLBACKS"
+-then
+-	: no probing necessary
+-elif test -n "$GIT_GETTEXT_POISON"
+-then
+-	GIT_INTERNAL_GETTEXT_SH_SCHEME=poison
+-elif type gettext.sh >/dev/null 2>&1
+-then
+-	# GNU libintl's gettext.sh
+-	GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
+-elif test "$(gettext -h 2>&1)" = "-h"
+-then
+-	# gettext binary exists but no gettext.sh. likely to be a gettext
+-	# binary on a Solaris or something that is not GNU libintl and
+-	# lack eval_gettext.
+-	GIT_INTERNAL_GETTEXT_SH_SCHEME=gettext_without_eval_gettext
+-fi
+-export GIT_INTERNAL_GETTEXT_SH_SCHEME
+-
+-# ... and then follow that decision.
+-case "$GIT_INTERNAL_GETTEXT_SH_SCHEME" in
+-gnu)
+-	# Use libintl's gettext.sh, or fall back to English if we can't.
+-	. gettext.sh
+-	;;
+-gettext_without_eval_gettext)
+-	# Solaris has a gettext(1) but no eval_gettext(1)
+-	eval_gettext () {
+-		gettext "$1" | (
+-			export PATH $(git sh-i18n--envsubst --variables "$1");
+-			git sh-i18n--envsubst "$1"
+-		)
+-	}
+-	;;
+-poison)
+-	# Emit garbage so that tests that incorrectly rely on translatable
+-	# strings will fail.
+-	gettext () {
+-		printf "%s" "# GETTEXT POISON #"
+-	}
+-
+-	eval_gettext () {
+-		printf "%s" "# GETTEXT POISON #"
+-	}
+-	;;
+-*)
+-	gettext () {
+-		printf "%s" "$1"
+-	}
++# GNU gettext
++export GIT_INTERNAL_GETTEXT_SH_SCHEME=gnu
++export PATH=@gettext@/bin:$PATH
+ 
+-	eval_gettext () {
+-		printf "%s" "$1" | (
+-			export PATH $(git sh-i18n--envsubst --variables "$1");
+-			git sh-i18n--envsubst "$1"
+-		)
+-	}
+-	;;
+-esac
++. @gettext@/bin/gettext.sh
+ 
+ # Git-specific wrapper functions
+ gettextln () {

From b4eebd86c16957222e9bc05de6b2cae27ac6b1d9 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 20 Feb 2016 16:12:32 +0100
Subject: [PATCH 1599/2285] Be less location-dependent

---
 maintainers/scripts/nix-call-package | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/nix-call-package b/maintainers/scripts/nix-call-package
index 76f09e9ddeb8..be478fca2b75 100755
--- a/maintainers/scripts/nix-call-package
+++ b/maintainers/scripts/nix-call-package
@@ -1,5 +1,5 @@
 #! /bin/sh
 
-echo "let pkgs = import /etc/nixos/nixpkgs$2 {}; x = pkgs.callPackage $1 { $3 }; in ${4:-x}" |
+echo "let pkgs = import <nixpkgs$2> {}; x = pkgs.callPackage $1 { $3 }; in ${4:-x}" |
 nix-instantiate --show-trace - |
 xargs nix-store -r -K

From 113106df1b8e2bbb1ba6cb8b11b36cd7be3e393d Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 20 Feb 2016 12:14:29 +0100
Subject: [PATCH 1600/2285] ddclient: 3.8.2 -> 3.8.3

Also remove patch for issue that has been fixed upstream, add simple
meta section, and minor other cleanups.
---
 .../ddclient/ddclient-foreground.patch        | 12 ----------
 pkgs/tools/networking/ddclient/default.nix    | 23 ++++++++++++-------
 2 files changed, 15 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/tools/networking/ddclient/ddclient-foreground.patch

diff --git a/pkgs/tools/networking/ddclient/ddclient-foreground.patch b/pkgs/tools/networking/ddclient/ddclient-foreground.patch
deleted file mode 100644
index 1ae3621f5079..000000000000
--- a/pkgs/tools/networking/ddclient/ddclient-foreground.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u ddclient-3.8.1/ddclient ddclient-3.8.1.patched/ddclient
---- ddclient-3.8.1/ddclient	2011-07-11 23:04:21.000000000 +0200
-+++ ddclient-3.8.1.patched/ddclient	2012-11-08 11:52:31.930647236 +0100
-@@ -574,7 +574,7 @@
-     "usage: ${program} [options]",
-     "options are:",
-     [ "daemon",      "=s", "-daemon delay         : run as a daemon, specify delay as an interval." ],
--+     [ "foreground",  "!",  "-foreground           : do not fork" ],
-+    [ "foreground",  "!",  "-foreground           : do not fork" ],
-     [ "proxy",       "=s", "-proxy host           : use 'host' as the HTTP proxy" ],
-     [ "server",      "=s", "-server host          : update DNS information on 'host'" ],
-     [ "protocol",    "=s", "-protocol type        : update protocol used" ],
diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix
index 41688d843513..1664fbf37077 100644
--- a/pkgs/tools/networking/ddclient/default.nix
+++ b/pkgs/tools/networking/ddclient/default.nix
@@ -1,24 +1,25 @@
-{buildPerlPackage, fetchurl, perlPackages, iproute}:
+{ stdenv, buildPerlPackage, fetchurl, perlPackages, iproute }:
 
-buildPerlPackage {
-  name = "ddclient-3.8.2";
+buildPerlPackage rec {
+  name = "ddclient-${version}";
+  version = "3.8.3";
 
   src = fetchurl {
-    url = mirror://sourceforge/ddclient/ddclient-3.8.2.tar.gz ;
-    sha256 = "17mcdqxcwa6c05m8xhxi4r37j4qvbp3wgbpvzqgmrmgwava5wcrw";
+    url = "mirror://sourceforge/ddclient/${name}.tar.gz";
+    sha256 = "1j8zdn7fy7i0bjk3jf0hxnbnshc2yf054vxq64imxdpfd7n5zgfy";
   };
 
   buildInputs = [ perlPackages.IOSocketSSL perlPackages.DigestSHA1 ];
 
-  patches = [ ./ddclient-foreground.patch ./ddclient-line-buffer-stdout.patch ];
+  patches = [ ./ddclient-line-buffer-stdout.patch ];
 
   # Use iproute2 instead of ifconfig
-  preConfigure = '' 
+  preConfigure = ''
     touch Makefile.PL
     substituteInPlace ddclient --replace 'in the output of ifconfig' 'in the output of ip addr show'
     substituteInPlace ddclient --replace 'ifconfig -a' '${iproute}/sbin/ip addr show'
     substituteInPlace ddclient --replace 'ifconfig $arg' '${iproute}/sbin/ip addr show $arg'
-  ''; 
+  '';
 
   installPhase = ''
     mkdir -p $out/bin
@@ -26,4 +27,10 @@ buildPerlPackage {
   '';
 
   doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://sourceforge.net/p/ddclient/wiki/Home/;
+    description = "Client for updating dynamic DNS service entries";
+    license = licenses.gpl2Plus;
+  };
 }

From 8bfc5d7e724da7d9642b7b20f8634727280ec9a4 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 20 Feb 2016 19:10:23 +0200
Subject: [PATCH 1601/2285] coreutils: Remove ARM patch
 (coreutils-tail-inotify-race.patch)

The patch no longer applies as it's applied in the 8.25 release.

While at it don't use FORCE_UNSAFE_CONFIGURE on ARM as I don't see why
it's needed and it works for me without it.

Build-tested GNU hello on ARMv7 and verified that this affect its hash
on i686.
---
 pkgs/tools/misc/coreutils/default.nix | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 78c272916485..3bd5a9cbc589 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -19,24 +19,13 @@ let
       sha256 = "11yfrnb94xzmvi4lhclkcmkqsbhww64wf234ya1aacjvg82prrii";
     };
 
-    patches =
-      lib.optional stdenv.isCygwin ./coreutils-8.23-4.cygwin.patch
-      ++ lib.optional stdenv.isArm
-        (fetchurl {
-          url = "http://git.savannah.gnu.org/cgit/coreutils.git/patch/?id=3ba68f9e64fa2eb8af22d510437a0c6441feb5e0";
-          sha256 = "1dnlszhc8lihhg801i9sz896mlrgfsjfcz62636prb27k5hmixqz";
-          name = "coreutils-tail-inotify-race.patch";
-        });
+    patches = optional stdenv.isCygwin ./coreutils-8.23-4.cygwin.patch;
 
     # The test tends to fail on btrfs and maybe other unusual filesystems.
     postPatch = optionalString (!stdenv.isDarwin) ''
       sed '2i echo Skipping dd sparse test && exit 0' -i ./tests/dd/sparse.sh
       sed '2i echo Skipping cp sparse test && exit 0' -i ./tests/cp/sparse.sh
-    '' +
-       # This is required by coreutils-tail-inotify-race.patch to avoid more deps
-       optionalString stdenv.isArm ''
-         touch -r src/stat.c src/tail.c
-       '';
+    '';
 
     configureFlags = optionalString stdenv.isSunOS "ac_cv_func_inotify_init=no";
 
@@ -84,7 +73,7 @@ let
     enableParallelBuilding = false;
 
     NIX_LDFLAGS = optionalString selinuxSupport "-lsepol";
-    FORCE_UNSAFE_CONFIGURE = optionalString (stdenv.system == "armv7l-linux" || stdenv.isSunOS) "1";
+    FORCE_UNSAFE_CONFIGURE = optionalString stdenv.isSunOS "1";
 
     makeFlags = optionalString stdenv.isDarwin "CFLAGS=-D_FORTIFY_SOURCE=0";
 

From 686c09dd38a58287586da83ca31afd5dfbd3bf5c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 20 Feb 2016 17:41:02 +0000
Subject: [PATCH 1602/2285] wpa_supplicant module: after
 network-interfaces.target

fixes #13136
---
 nixos/modules/services/networking/wpa_supplicant.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 1558c5832892..88345fdc11e7 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -127,6 +127,7 @@ in {
       in {
         description = "WPA Supplicant";
 
+        after = [ "network-interfaces.target" ];
         wantedBy = [ "network.target" ];
 
         path = [ pkgs.wpa_supplicant ];

From 50f45db51c33ec784bdbc5f4a7c7325559087e53 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sat, 20 Feb 2016 20:27:56 +0100
Subject: [PATCH 1603/2285] icmake: 8.00.05 -> 8.01.00

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

diff --git a/pkgs/development/tools/build-managers/icmake/default.nix b/pkgs/development/tools/build-managers/icmake/default.nix
index b3788d7f324d..e4bad4f500c8 100644
--- a/pkgs/development/tools/build-managers/icmake/default.nix
+++ b/pkgs/development/tools/build-managers/icmake/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "icmake-${version}";
-  version = "8.00.05";
+  version = "8.01.00";
 
   src = fetchFromGitHub {
-    sha256 = "06bfz9awi2vh2mzikw4sp7wqrp0nlcg89b9br43awz2801k15hpf";
+    sha256 = "1vgjywbc4w1agkakfndr2qf0z0ncxisihdv8sz9ipry9f170np39";
     rev = version;
     repo = "icmake";
     owner = "fbb-git";

From 3e7e8e88078b6e73b7b72aa64efd87bf4feedc2c Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Sat, 20 Feb 2016 22:27:15 +0000
Subject: [PATCH 1604/2285] voxelands: 1506.00 -> 1512.00

source had been moved
---
 pkgs/games/voxelands/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix
index 4c0c76d60b8c..c3ec47273d8f 100644
--- a/pkgs/games/voxelands/default.nix
+++ b/pkgs/games/voxelands/default.nix
@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   name = "voxelands-${version}";
-  version = "1506.00";
+  version = "1512.00";
 
   src = fetchurl {
-      url = "http://voxelands.com/downloads/${name}-src.tar.bz2";
-      sha256 = "0j82zidxv2rzx7fmw5z27nfldqkixbrs1f6l3fs433xr3d05406y";
+    url = "http://voxelands.com/downloads/${name}-src.tar.bz2";
+    sha256 = "0bims0y0nyviv2f2nxfj37s3258cjbfp9xd97najz0yylnk3qdfw";
   };
 
   cmakeFlags = [

From 410107cf7606ac61436f46fe52c3ccdcf0de784e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sat, 20 Feb 2016 22:32:26 +0000
Subject: [PATCH 1605/2285] Revert "cups: 2.0.4 -> 2.1.2"

This reverts commit 35e1f4954555f465fb4499880dcb6a68417fb959.
---
 pkgs/misc/cups/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 7dedf26096df..8fa111ecc023 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -3,7 +3,7 @@
 , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
 }:
 
-let version = "2.1.2"; in
+let version = "2.0.4"; in
 
 with stdenv.lib;
 stdenv.mkDerivation {
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2";
-    sha256 = "1bc1y8fjgh54ryh520gk63i5rbagn6jijsrskcqlibhfm0xwmc5s";
+    sha256 = "1gaakz24k6x5nc09rmpiq0xq20j1qdjc3szag8qwmyi4ky6ydmg1";
   };
 
   buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls libpaper ]
@@ -51,6 +51,7 @@ stdenv.mkDerivation {
       # Idem for /etc.
       "PAMDIR=$(out)/etc/pam.d"
       "DBUSDIR=$(out)/etc/dbus-1"
+      "INITDIR=$(out)/etc/rc.d"
       "XINETD=$(out)/etc/xinetd.d"
       "SERVERROOT=$(out)/etc/cups"
       # Idem for /usr.
@@ -60,8 +61,6 @@ stdenv.mkDerivation {
       "CUPS_PRIMARY_SYSTEM_GROUP=root"
     ];
 
-  enableParallelBuilding = true;
-
   postInstall = ''
       # Delete obsolete stuff that conflicts with cups-filters.
       rm -rf $out/share/cups/banners $out/share/cups/data/testprint

From 2a3d8fc70ca7b78fad344b47c659bc70d697f535 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas@tuxera.com>
Date: Wed, 17 Feb 2016 04:40:27 +0200
Subject: [PATCH 1606/2285] diffoscope: 45 -> 49

We have a new tool dependency for cd-iccdump which comes from the colord
package - put this in the bloat category.
---
 pkgs/tools/misc/diffoscope/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 6715f1ac38fd..4c40afbaa0df 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -1,19 +1,19 @@
 { lib, stdenv, fetchgit, fetchpatch, pythonPackages, docutils
-, acl, binutils, bzip2, cbfstool, cdrkit, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc, gnupg1
-, gzip, jdk, libcaca, mono, pdftk, poppler_utils, rpm, sng, sqlite, squashfsTools, unzip, vim, xz
+, acl, binutils, bzip2, cbfstool, cdrkit, colord, cpio, diffutils, e2fsprogs, file, fpc, gettext, ghc
+, gnupg1, gzip, jdk, libcaca, mono, pdftk, poppler_utils, rpm, sng, sqlite, squashfsTools, unzip, vim, xz
 , enableBloat ? false
 }:
 
 pythonPackages.buildPythonPackage rec {
   name = "diffoscope-${version}";
-  version = "45";
+  version = "49";
 
   namePrefix = "";
 
   src = fetchgit {
     url = "git://anonscm.debian.org/reproducible/diffoscope.git";
     rev = "refs/tags/${version}";
-    sha256 = "1wdphcmr2n0pyg7zwvczy7ik1bzjlrjb76jwbzk971lwba3ajazk";
+    sha256 = "0kh96h95rp7bk8rgc1z18jwv89dyp1n36bawqyqxhwwklmrgxr66";
   };
 
   patches =
@@ -29,13 +29,13 @@ pythonPackages.buildPythonPackage rec {
     sed -i setup.py -e "/'rpm-python',/d"
   '';
 
-  # Still missing these tools: enjarify otool(maybe OS X only) showttf
+  # Still missing these tools: enjarify, otool & lipo (maybe OS X only), showttf
   # Also these libraries: python3-guestfs
   # FIXME: move xxd into a separate package so we don't have to pull in all of vim.
   propagatedBuildInputs = (with pythonPackages; [ debian libarchive-c python_magic tlsh ]) ++
     [ acl binutils bzip2 cbfstool cdrkit cpio diffutils e2fsprogs file gettext
       gzip libcaca poppler_utils rpm sng sqlite squashfsTools unzip vim xz
-    ] ++ lib.optionals enableBloat [ jdk ghc fpc gnupg1 pdftk mono ];
+    ] ++ lib.optionals enableBloat [ colord fpc ghc gnupg1 jdk mono pdftk ];
 
   doCheck = false; # Calls 'mknod' in squashfs tests, which needs root
 

From 29711967a2b4afef9311f195b84757a42e60849b Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <bstaffin@fitbit.com>
Date: Fri, 19 Feb 2016 14:54:00 -0800
Subject: [PATCH 1607/2285] openssh: update gssapi patch to match openssh
 version

Should fix the openssh_with_kerberos build.

Fixes #13140

(cherry picked from commit 3dae6c7e1e1eb64b3ceb2796eea1ad0ae1596688)
---
 pkgs/tools/networking/openssh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 73e92aa4b8e5..a6aed5169c8b 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -16,8 +16,8 @@ let
   };
 
   gssapiSrc = fetchpatch {
-    url = "http://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?h=debian/6.9p1-3";
-    sha256 = "03zlgkb3a1igj20kn8cz55ggaxg65h6f0kg20m39m0wsb94qjdb1";
+    url = "http://anonscm.debian.org/cgit/pkg-ssh/openssh.git/plain/debian/patches/gssapi.patch?h=debian/7.1p2-2";
+    sha256 = "05nsch879nlpyyiwm240wlq9rasy71j9d03j1rfi8kp865zhjfbm";
   };
 
 in

From ab742b42ab636b78b1b3bc2e5329ba151ec82b90 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Sun, 21 Feb 2016 08:02:01 +0100
Subject: [PATCH 1608/2285] vlc: 2.2.1 -> 2.2.2 and take maintainership

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

diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index ebfa2f0484d3..0e08c21fc991 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -20,11 +20,11 @@ assert (!withQt5 -> qt4 != null);
 
 stdenv.mkDerivation rec {
   name = "vlc-${version}";
-  version = "2.2.1";
+  version = "2.2.2";
 
   src = fetchurl {
     url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz";
-    sha256 = "1jqzrzrpw6932lbkf863xk8cfmn4z2ngbxz7w8ggmh4f6xz9sgal";
+    sha256 = "1dazxbmzx2g5570pkg519a7fsj07rdr155kjsw7b9y8npql33lls";
   };
 
   buildInputs =

From b4ac8fb39bbd1bd01c619fa7f19cb4dcd200cde2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 21 Feb 2016 09:59:00 +0100
Subject: [PATCH 1609/2285] (r)rsync: simplify and don't copy maintainers

Let's keep the original rsync maintainers only on rsync,
as I haven't noticed them wanting to maintain rrsync as well.
---
 pkgs/applications/networking/sync/rsync/base.nix    | 9 ++-------
 pkgs/applications/networking/sync/rsync/default.nix | 1 +
 pkgs/applications/networking/sync/rsync/rrsync.nix  | 1 +
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/sync/rsync/base.nix b/pkgs/applications/networking/sync/rsync/base.nix
index ef159d4d0e39..86b90ea22ef2 100644
--- a/pkgs/applications/networking/sync/rsync/base.nix
+++ b/pkgs/applications/networking/sync/rsync/base.nix
@@ -1,10 +1,7 @@
 { stdenv, fetchurl }:
 
-let
+rec {
   version = "3.2.1";
-in
-{
-  version = version;
   src = fetchurl {
     # signed with key 0048 C8B0 26D4 C96F 0E58  9C2F 6C85 9FB1 4B96 A8C5
     url = "mirror://samba/rsync/src/rsync-${version}.tar.gz";
@@ -18,9 +15,7 @@ in
 
   meta = with stdenv.lib; {
     homepage = http://rsync.samba.org/;
-    #description = "A helper to run rsync-only environments from ssh-logins.";
     license = licenses.gpl3Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ simons ehmry kampfschlaefer ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix
index 8a4ff67e2eb5..b65eb43351ef 100644
--- a/pkgs/applications/networking/sync/rsync/default.nix
+++ b/pkgs/applications/networking/sync/rsync/default.nix
@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
 
   meta = base.meta // {
     description = "A fast incremental file transfer utility";
+    maintainers = with stdenv.lib.maintainers; [ simons ehmry kampfschlaefer ];
   };
 }
diff --git a/pkgs/applications/networking/sync/rsync/rrsync.nix b/pkgs/applications/networking/sync/rsync/rrsync.nix
index 6260fc0ddeca..7563b0ea1950 100644
--- a/pkgs/applications/networking/sync/rsync/rrsync.nix
+++ b/pkgs/applications/networking/sync/rsync/rrsync.nix
@@ -28,5 +28,6 @@ stdenv.mkDerivation rec {
 
   meta = base.meta // {
     description = "A helper to run rsync-only environments from ssh-logins";
+    maintainers = [ stdenv.lib.maintainers.kampfschlaefer ];
   };
 }

From 59617de6d7f8a05f12bbb652e1c68a6a7e6362b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 21 Feb 2016 10:30:09 +0100
Subject: [PATCH 1610/2285] glibc: 2.22 -> 2.23

The two patches were included upstream.
(Even the one from guix, except for a whitespace difference.)
---
 pkgs/development/libraries/glibc/common.nix   |  10 +-
 .../libraries/glibc/cve-2015-7547.patch       | 580 ------------------
 .../glibc/glibc-locale-incompatibility.patch  |  25 -
 3 files changed, 3 insertions(+), 612 deletions(-)
 delete mode 100644 pkgs/development/libraries/glibc/cve-2015-7547.patch
 delete mode 100644 pkgs/development/libraries/glibc/glibc-locale-incompatibility.patch

diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index 6a468657716e..13d5adcd9b13 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -11,8 +11,8 @@ cross:
 
 let
 
-  version = "2.22";
-
+  version = "2.23";
+  sha256 = "1lk9a8jv5kyx8hp0wmfzjyk047q95ybyjqbyw5idl7414jxqml1b";
 in
 
 assert cross != null -> gccCross != null;
@@ -49,10 +49,6 @@ stdenv.mkDerivation ({
          "/bin:/usr/bin", which is inappropriate on NixOS machines. This
          patch extends the search path by "/run/current-system/sw/bin". */
       ./fix_path_attribute_in_getconf.patch
-
-      ./cve-2015-7547.patch
-
-      ./glibc-locale-incompatibility.patch
     ];
 
   postPatch =
@@ -143,7 +139,7 @@ stdenv.mkDerivation ({
 
   src = fetchurl {
     url = "mirror://gnu/glibc/glibc-${version}.tar.gz";
-    sha256 = "1rcby0cqgswgqaxyqz0yqc4zizb1kvpi5vlfqp7dh3sa132109m6";
+    inherit sha256;
   };
 
   # Remove absolute paths from `configure' & co.; build out-of-tree.
diff --git a/pkgs/development/libraries/glibc/cve-2015-7547.patch b/pkgs/development/libraries/glibc/cve-2015-7547.patch
deleted file mode 100644
index 55d58c166981..000000000000
--- a/pkgs/development/libraries/glibc/cve-2015-7547.patch
+++ /dev/null
@@ -1,580 +0,0 @@
-commit b995d95a5943785be3ab862b2d3276f3b4a22481
-Author: Carlos O'Donell <carlos@systemhalted.org>
-Date:   Tue Feb 16 21:26:37 2016 -0500
-
-    CVE-2015-7547: getaddrinfo() stack-based buffer overflow (Bug 18665).
-    
-    * A stack-based buffer overflow was found in libresolv when invoked from
-      libnss_dns, allowing specially crafted DNS responses to seize control
-      of execution flow in the DNS client.  The buffer overflow occurs in
-      the functions send_dg (send datagram) and send_vc (send TCP) for the
-      NSS module libnss_dns.so.2 when calling getaddrinfo with AF_UNSPEC
-      family.  The use of AF_UNSPEC triggers the low-level resolver code to
-      send out two parallel queries for A and AAAA.  A mismanagement of the
-      buffers used for those queries could result in the response of a query
-      writing beyond the alloca allocated buffer created by
-      _nss_dns_gethostbyname4_r.  Buffer management is simplified to remove
-      the overflow.  Thanks to the Google Security Team and Red Hat for
-      reporting the security impact of this issue, and Robert Holiday of
-      Ciena for reporting the related bug 18665. (CVE-2015-7547)
-    
-    See also:
-    https://sourceware.org/ml/libc-alpha/2016-02/msg00416.html
-    https://sourceware.org/ml/libc-alpha/2016-02/msg00418.html
-    
-    (cherry picked from commit e9db92d3acfe1822d56d11abcea5bfc4c41cf6ca)
-
-diff --git a/resolv/nss_dns/dns-host.c b/resolv/nss_dns/dns-host.c
-index 357ac04..a0fe9a8 100644
---- a/resolv/nss_dns/dns-host.c
-+++ b/resolv/nss_dns/dns-host.c
-@@ -1031,7 +1031,10 @@ gaih_getanswer_slice (const querybuf *answer, int anslen, const char *qname,
-   int h_namelen = 0;
- 
-   if (ancount == 0)
--    return NSS_STATUS_NOTFOUND;
-+    {
-+      *h_errnop = HOST_NOT_FOUND;
-+      return NSS_STATUS_NOTFOUND;
-+    }
- 
-   while (ancount-- > 0 && cp < end_of_message && had_error == 0)
-     {
-@@ -1208,7 +1211,14 @@ gaih_getanswer_slice (const querybuf *answer, int anslen, const char *qname,
-   /* Special case here: if the resolver sent a result but it only
-      contains a CNAME while we are looking for a T_A or T_AAAA record,
-      we fail with NOTFOUND instead of TRYAGAIN.  */
--  return canon == NULL ? NSS_STATUS_TRYAGAIN : NSS_STATUS_NOTFOUND;
-+  if (canon != NULL)
-+    {
-+      *h_errnop = HOST_NOT_FOUND;
-+      return NSS_STATUS_NOTFOUND;
-+    }
-+
-+  *h_errnop = NETDB_INTERNAL;
-+  return NSS_STATUS_TRYAGAIN;
- }
- 
- 
-@@ -1222,11 +1232,101 @@ gaih_getanswer (const querybuf *answer1, int anslen1, const querybuf *answer2,
- 
-   enum nss_status status = NSS_STATUS_NOTFOUND;
- 
-+  /* Combining the NSS status of two distinct queries requires some
-+     compromise and attention to symmetry (A or AAAA queries can be
-+     returned in any order).  What follows is a breakdown of how this
-+     code is expected to work and why. We discuss only SUCCESS,
-+     TRYAGAIN, NOTFOUND and UNAVAIL, since they are the only returns
-+     that apply (though RETURN and MERGE exist).  We make a distinction
-+     between TRYAGAIN (recoverable) and TRYAGAIN' (not-recoverable).
-+     A recoverable TRYAGAIN is almost always due to buffer size issues
-+     and returns ERANGE in errno and the caller is expected to retry
-+     with a larger buffer.
-+
-+     Lastly, you may be tempted to make significant changes to the
-+     conditions in this code to bring about symmetry between responses.
-+     Please don't change anything without due consideration for
-+     expected application behaviour.  Some of the synthesized responses
-+     aren't very well thought out and sometimes appear to imply that
-+     IPv4 responses are always answer 1, and IPv6 responses are always
-+     answer 2, but that's not true (see the implementation of send_dg
-+     and send_vc to see response can arrive in any order, particularly
-+     for UDP). However, we expect it holds roughly enough of the time
-+     that this code works, but certainly needs to be fixed to make this
-+     a more robust implementation.
-+
-+     ----------------------------------------------
-+     | Answer 1 Status /   | Synthesized | Reason |
-+     | Answer 2 Status     | Status      |        |
-+     |--------------------------------------------|
-+     | SUCCESS/SUCCESS     | SUCCESS     | [1]    |
-+     | SUCCESS/TRYAGAIN    | TRYAGAIN    | [5]    |
-+     | SUCCESS/TRYAGAIN'   | SUCCESS     | [1]    |
-+     | SUCCESS/NOTFOUND    | SUCCESS     | [1]    |
-+     | SUCCESS/UNAVAIL     | SUCCESS     | [1]    |
-+     | TRYAGAIN/SUCCESS    | TRYAGAIN    | [2]    |
-+     | TRYAGAIN/TRYAGAIN   | TRYAGAIN    | [2]    |
-+     | TRYAGAIN/TRYAGAIN'  | TRYAGAIN    | [2]    |
-+     | TRYAGAIN/NOTFOUND   | TRYAGAIN    | [2]    |
-+     | TRYAGAIN/UNAVAIL    | TRYAGAIN    | [2]    |
-+     | TRYAGAIN'/SUCCESS   | SUCCESS     | [3]    |
-+     | TRYAGAIN'/TRYAGAIN  | TRYAGAIN    | [3]    |
-+     | TRYAGAIN'/TRYAGAIN' | TRYAGAIN'   | [3]    |
-+     | TRYAGAIN'/NOTFOUND  | TRYAGAIN'   | [3]    |
-+     | TRYAGAIN'/UNAVAIL   | UNAVAIL     | [3]    |
-+     | NOTFOUND/SUCCESS    | SUCCESS     | [3]    |
-+     | NOTFOUND/TRYAGAIN   | TRYAGAIN    | [3]    |
-+     | NOTFOUND/TRYAGAIN'  | TRYAGAIN'   | [3]    |
-+     | NOTFOUND/NOTFOUND   | NOTFOUND    | [3]    |
-+     | NOTFOUND/UNAVAIL    | UNAVAIL     | [3]    |
-+     | UNAVAIL/SUCCESS     | UNAVAIL     | [4]    |
-+     | UNAVAIL/TRYAGAIN    | UNAVAIL     | [4]    |
-+     | UNAVAIL/TRYAGAIN'   | UNAVAIL     | [4]    |
-+     | UNAVAIL/NOTFOUND    | UNAVAIL     | [4]    |
-+     | UNAVAIL/UNAVAIL     | UNAVAIL     | [4]    |
-+     ----------------------------------------------
-+
-+     [1] If the first response is a success we return success.
-+	 This ignores the state of the second answer and in fact
-+	 incorrectly sets errno and h_errno to that of the second
-+	 answer.  However because the response is a success we ignore
-+	 *errnop and *h_errnop (though that means you touched errno on
-+	 success).  We are being conservative here and returning the
-+	 likely IPv4 response in the first answer as a success.
-+
-+     [2] If the first response is a recoverable TRYAGAIN we return
-+	 that instead of looking at the second response.  The
-+	 expectation here is that we have failed to get an IPv4 response
-+	 and should retry both queries.
-+
-+     [3] If the first response was not a SUCCESS and the second
-+	 response is not NOTFOUND (had a SUCCESS, need to TRYAGAIN,
-+	 or failed entirely e.g. TRYAGAIN' and UNAVAIL) then use the
-+	 result from the second response, otherwise the first responses
-+	 status is used.  Again we have some odd side-effects when the
-+	 second response is NOTFOUND because we overwrite *errnop and
-+	 *h_errnop that means that a first answer of NOTFOUND might see
-+	 its *errnop and *h_errnop values altered.  Whether it matters
-+	 in practice that a first response NOTFOUND has the wrong
-+	 *errnop and *h_errnop is undecided.
-+
-+     [4] If the first response is UNAVAIL we return that instead of
-+	 looking at the second response.  The expectation here is that
-+	 it will have failed similarly e.g. configuration failure.
-+
-+     [5] Testing this code is complicated by the fact that truncated
-+	 second response buffers might be returned as SUCCESS if the
-+	 first answer is a SUCCESS.  To fix this we add symmetry to
-+	 TRYAGAIN with the second response.  If the second response
-+	 is a recoverable error we now return TRYAGIN even if the first
-+	 response was SUCCESS.  */
-+
-   if (anslen1 > 0)
-     status = gaih_getanswer_slice(answer1, anslen1, qname,
- 				  &pat, &buffer, &buflen,
- 				  errnop, h_errnop, ttlp,
- 				  &first);
-+
-   if ((status == NSS_STATUS_SUCCESS || status == NSS_STATUS_NOTFOUND
-        || (status == NSS_STATUS_TRYAGAIN
- 	   /* We want to look at the second answer in case of an
-@@ -1242,8 +1342,15 @@ gaih_getanswer (const querybuf *answer1, int anslen1, const querybuf *answer2,
- 						     &pat, &buffer, &buflen,
- 						     errnop, h_errnop, ttlp,
- 						     &first);
-+      /* Use the second response status in some cases.  */
-       if (status != NSS_STATUS_SUCCESS && status2 != NSS_STATUS_NOTFOUND)
- 	status = status2;
-+      /* Do not return a truncated second response (unless it was
-+	 unavoidable e.g. unrecoverable TRYAGAIN).  */
-+      if (status == NSS_STATUS_SUCCESS
-+	  && (status2 == NSS_STATUS_TRYAGAIN
-+	      && *errnop == ERANGE && *h_errnop != NO_RECOVERY))
-+	status = NSS_STATUS_TRYAGAIN;
-     }
- 
-   return status;
-diff --git a/resolv/res_query.c b/resolv/res_query.c
-index 4a9b3b3..95470a9 100644
---- a/resolv/res_query.c
-+++ b/resolv/res_query.c
-@@ -396,6 +396,7 @@ __libc_res_nsearch(res_state statp,
- 		  {
- 		    free (*answerp2);
- 		    *answerp2 = NULL;
-+		    *nanswerp2 = 0;
- 		    *answerp2_malloced = 0;
- 		  }
- 	}
-@@ -447,6 +448,7 @@ __libc_res_nsearch(res_state statp,
- 			  {
- 			    free (*answerp2);
- 			    *answerp2 = NULL;
-+			    *nanswerp2 = 0;
- 			    *answerp2_malloced = 0;
- 			  }
- 
-@@ -521,6 +523,7 @@ __libc_res_nsearch(res_state statp,
- 	  {
- 	    free (*answerp2);
- 	    *answerp2 = NULL;
-+	    *nanswerp2 = 0;
- 	    *answerp2_malloced = 0;
- 	  }
- 	if (saved_herrno != -1)
-diff --git a/resolv/res_send.c b/resolv/res_send.c
-index 5e53cc2..6511bb1 100644
---- a/resolv/res_send.c
-+++ b/resolv/res_send.c
-@@ -1,3 +1,20 @@
-+/* Copyright (C) 2016 Free Software Foundation, Inc.
-+   This file is part of the GNU C Library.
-+
-+   The GNU C Library is free software; you can redistribute it and/or
-+   modify it under the terms of the GNU Lesser General Public
-+   License as published by the Free Software Foundation; either
-+   version 2.1 of the License, or (at your option) any later version.
-+
-+   The GNU C Library is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+   Lesser General Public License for more details.
-+
-+   You should have received a copy of the GNU Lesser General Public
-+   License along with the GNU C Library; if not, see
-+   <http://www.gnu.org/licenses/>.  */
-+
- /*
-  * Copyright (c) 1985, 1989, 1993
-  *    The Regents of the University of California.  All rights reserved.
-@@ -363,6 +380,8 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen,
- #ifdef USE_HOOKS
- 	if (__glibc_unlikely (statp->qhook || statp->rhook))       {
- 		if (anssiz < MAXPACKET && ansp) {
-+			/* Always allocate MAXPACKET, callers expect
-+			   this specific size.  */
- 			u_char *buf = malloc (MAXPACKET);
- 			if (buf == NULL)
- 				return (-1);
-@@ -638,6 +657,77 @@ get_nsaddr (res_state statp, int n)
-     return (struct sockaddr *) (void *) &statp->nsaddr_list[n];
- }
- 
-+/* The send_vc function is responsible for sending a DNS query over TCP
-+   to the nameserver numbered NS from the res_state STATP i.e.
-+   EXT(statp).nssocks[ns].  The function supports sending both IPv4 and
-+   IPv6 queries at the same serially on the same socket.
-+
-+   Please note that for TCP there is no way to disable sending both
-+   queries, unlike UDP, which honours RES_SNGLKUP and RES_SNGLKUPREOP
-+   and sends the queries serially and waits for the result after each
-+   sent query.  This implemetnation should be corrected to honour these
-+   options.
-+
-+   Please also note that for TCP we send both queries over the same
-+   socket one after another.  This technically violates best practice
-+   since the server is allowed to read the first query, respond, and
-+   then close the socket (to service another client).  If the server
-+   does this, then the remaining second query in the socket data buffer
-+   will cause the server to send the client an RST which will arrive
-+   asynchronously and the client's OS will likely tear down the socket
-+   receive buffer resulting in a potentially short read and lost
-+   response data.  This will force the client to retry the query again,
-+   and this process may repeat until all servers and connection resets
-+   are exhausted and then the query will fail.  It's not known if this
-+   happens with any frequency in real DNS server implementations.  This
-+   implementation should be corrected to use two sockets by default for
-+   parallel queries.
-+
-+   The query stored in BUF of BUFLEN length is sent first followed by
-+   the query stored in BUF2 of BUFLEN2 length.  Queries are sent
-+   serially on the same socket.
-+
-+   Answers to the query are stored firstly in *ANSP up to a max of
-+   *ANSSIZP bytes.  If more than *ANSSIZP bytes are needed and ANSCP
-+   is non-NULL (to indicate that modifying the answer buffer is allowed)
-+   then malloc is used to allocate a new response buffer and ANSCP and
-+   ANSP will both point to the new buffer.  If more than *ANSSIZP bytes
-+   are needed but ANSCP is NULL, then as much of the response as
-+   possible is read into the buffer, but the results will be truncated.
-+   When truncation happens because of a small answer buffer the DNS
-+   packets header field TC will bet set to 1, indicating a truncated
-+   message and the rest of the socket data will be read and discarded.
-+
-+   Answers to the query are stored secondly in *ANSP2 up to a max of
-+   *ANSSIZP2 bytes, with the actual response length stored in
-+   *RESPLEN2.  If more than *ANSSIZP bytes are needed and ANSP2
-+   is non-NULL (required for a second query) then malloc is used to
-+   allocate a new response buffer, *ANSSIZP2 is set to the new buffer
-+   size and *ANSP2_MALLOCED is set to 1.
-+
-+   The ANSP2_MALLOCED argument will eventually be removed as the
-+   change in buffer pointer can be used to detect the buffer has
-+   changed and that the caller should use free on the new buffer.
-+
-+   Note that the answers may arrive in any order from the server and
-+   therefore the first and second answer buffers may not correspond to
-+   the first and second queries.
-+
-+   It is not supported to call this function with a non-NULL ANSP2
-+   but a NULL ANSCP.  Put another way, you can call send_vc with a
-+   single unmodifiable buffer or two modifiable buffers, but no other
-+   combination is supported.
-+
-+   It is the caller's responsibility to free the malloc allocated
-+   buffers by detecting that the pointers have changed from their
-+   original values i.e. *ANSCP or *ANSP2 has changed.
-+
-+   If errors are encountered then *TERRNO is set to an appropriate
-+   errno value and a zero result is returned for a recoverable error,
-+   and a less-than zero result is returned for a non-recoverable error.
-+
-+   If no errors are encountered then *TERRNO is left unmodified and
-+   a the length of the first response in bytes is returned.  */
- static int
- send_vc(res_state statp,
- 	const u_char *buf, int buflen, const u_char *buf2, int buflen2,
-@@ -647,11 +737,7 @@ send_vc(res_state statp,
- {
- 	const HEADER *hp = (HEADER *) buf;
- 	const HEADER *hp2 = (HEADER *) buf2;
--	u_char *ans = *ansp;
--	int orig_anssizp = *anssizp;
--	// XXX REMOVE
--	// int anssiz = *anssizp;
--	HEADER *anhp = (HEADER *) ans;
-+	HEADER *anhp = (HEADER *) *ansp;
- 	struct sockaddr *nsap = get_nsaddr (statp, ns);
- 	int truncating, connreset, n;
- 	/* On some architectures compiler might emit a warning indicating
-@@ -743,6 +829,8 @@ send_vc(res_state statp,
- 	 * Receive length & response
- 	 */
- 	int recvresp1 = 0;
-+	/* Skip the second response if there is no second query.
-+	   To do that we mark the second response as received.  */
- 	int recvresp2 = buf2 == NULL;
- 	uint16_t rlen16;
-  read_len:
-@@ -779,40 +867,14 @@ send_vc(res_state statp,
- 	u_char **thisansp;
- 	int *thisresplenp;
- 	if ((recvresp1 | recvresp2) == 0 || buf2 == NULL) {
-+		/* We have not received any responses
-+		   yet or we only have one response to
-+		   receive.  */
- 		thisanssizp = anssizp;
- 		thisansp = anscp ?: ansp;
- 		assert (anscp != NULL || ansp2 == NULL);
- 		thisresplenp = &resplen;
- 	} else {
--		if (*anssizp != MAXPACKET) {
--			/* No buffer allocated for the first
--			   reply.  We can try to use the rest
--			   of the user-provided buffer.  */
--#if __GNUC_PREREQ (4, 7)
--			DIAG_PUSH_NEEDS_COMMENT;
--			DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
--#endif
--#if _STRING_ARCH_unaligned
--			*anssizp2 = orig_anssizp - resplen;
--			*ansp2 = *ansp + resplen;
--#else
--			int aligned_resplen
--			  = ((resplen + __alignof__ (HEADER) - 1)
--			     & ~(__alignof__ (HEADER) - 1));
--			*anssizp2 = orig_anssizp - aligned_resplen;
--			*ansp2 = *ansp + aligned_resplen;
--#endif
--#if __GNUC_PREREQ (4, 7)
--			DIAG_POP_NEEDS_COMMENT;
--#endif
--		} else {
--			/* The first reply did not fit into the
--			   user-provided buffer.  Maybe the second
--			   answer will.  */
--			*anssizp2 = orig_anssizp;
--			*ansp2 = *ansp;
--		}
--
- 		thisanssizp = anssizp2;
- 		thisansp = ansp2;
- 		thisresplenp = resplen2;
-@@ -820,10 +882,14 @@ send_vc(res_state statp,
- 	anhp = (HEADER *) *thisansp;
- 
- 	*thisresplenp = rlen;
--	if (rlen > *thisanssizp) {
--		/* Yes, we test ANSCP here.  If we have two buffers
--		   both will be allocatable.  */
--		if (__glibc_likely (anscp != NULL))       {
-+	/* Is the answer buffer too small?  */
-+	if (*thisanssizp < rlen) {
-+		/* If the current buffer is not the the static
-+		   user-supplied buffer then we can reallocate
-+		   it.  */
-+		if (thisansp != NULL && thisansp != ansp) {
-+			/* Always allocate MAXPACKET, callers expect
-+			   this specific size.  */
- 			u_char *newp = malloc (MAXPACKET);
- 			if (newp == NULL) {
- 				*terrno = ENOMEM;
-@@ -835,6 +901,9 @@ send_vc(res_state statp,
- 			if (thisansp == ansp2)
- 			  *ansp2_malloced = 1;
- 			anhp = (HEADER *) newp;
-+			/* A uint16_t can't be larger than MAXPACKET
-+			   thus it's safe to allocate MAXPACKET but
-+			   read RLEN bytes instead.  */
- 			len = rlen;
- 		} else {
- 			Dprint(statp->options & RES_DEBUG,
-@@ -997,6 +1066,66 @@ reopen (res_state statp, int *terrno, int ns)
- 	return 1;
- }
- 
-+/* The send_dg function is responsible for sending a DNS query over UDP
-+   to the nameserver numbered NS from the res_state STATP i.e.
-+   EXT(statp).nssocks[ns].  The function supports IPv4 and IPv6 queries
-+   along with the ability to send the query in parallel for both stacks
-+   (default) or serially (RES_SINGLKUP).  It also supports serial lookup
-+   with a close and reopen of the socket used to talk to the server
-+   (RES_SNGLKUPREOP) to work around broken name servers.
-+
-+   The query stored in BUF of BUFLEN length is sent first followed by
-+   the query stored in BUF2 of BUFLEN2 length.  Queries are sent
-+   in parallel (default) or serially (RES_SINGLKUP or RES_SNGLKUPREOP).
-+
-+   Answers to the query are stored firstly in *ANSP up to a max of
-+   *ANSSIZP bytes.  If more than *ANSSIZP bytes are needed and ANSCP
-+   is non-NULL (to indicate that modifying the answer buffer is allowed)
-+   then malloc is used to allocate a new response buffer and ANSCP and
-+   ANSP will both point to the new buffer.  If more than *ANSSIZP bytes
-+   are needed but ANSCP is NULL, then as much of the response as
-+   possible is read into the buffer, but the results will be truncated.
-+   When truncation happens because of a small answer buffer the DNS
-+   packets header field TC will bet set to 1, indicating a truncated
-+   message, while the rest of the UDP packet is discarded.
-+
-+   Answers to the query are stored secondly in *ANSP2 up to a max of
-+   *ANSSIZP2 bytes, with the actual response length stored in
-+   *RESPLEN2.  If more than *ANSSIZP bytes are needed and ANSP2
-+   is non-NULL (required for a second query) then malloc is used to
-+   allocate a new response buffer, *ANSSIZP2 is set to the new buffer
-+   size and *ANSP2_MALLOCED is set to 1.
-+
-+   The ANSP2_MALLOCED argument will eventually be removed as the
-+   change in buffer pointer can be used to detect the buffer has
-+   changed and that the caller should use free on the new buffer.
-+
-+   Note that the answers may arrive in any order from the server and
-+   therefore the first and second answer buffers may not correspond to
-+   the first and second queries.
-+
-+   It is not supported to call this function with a non-NULL ANSP2
-+   but a NULL ANSCP.  Put another way, you can call send_vc with a
-+   single unmodifiable buffer or two modifiable buffers, but no other
-+   combination is supported.
-+
-+   It is the caller's responsibility to free the malloc allocated
-+   buffers by detecting that the pointers have changed from their
-+   original values i.e. *ANSCP or *ANSP2 has changed.
-+
-+   If an answer is truncated because of UDP datagram DNS limits then
-+   *V_CIRCUIT is set to 1 and the return value non-zero to indicate to
-+   the caller to retry with TCP.  The value *GOTSOMEWHERE is set to 1
-+   if any progress was made reading a response from the nameserver and
-+   is used by the caller to distinguish between ECONNREFUSED and
-+   ETIMEDOUT (the latter if *GOTSOMEWHERE is 1).
-+
-+   If errors are encountered then *TERRNO is set to an appropriate
-+   errno value and a zero result is returned for a recoverable error,
-+   and a less-than zero result is returned for a non-recoverable error.
-+
-+   If no errors are encountered then *TERRNO is left unmodified and
-+   a the length of the first response in bytes is returned.  */
- static int
- send_dg(res_state statp,
- 	const u_char *buf, int buflen, const u_char *buf2, int buflen2,
-@@ -1006,8 +1135,6 @@ send_dg(res_state statp,
- {
- 	const HEADER *hp = (HEADER *) buf;
- 	const HEADER *hp2 = (HEADER *) buf2;
--	u_char *ans = *ansp;
--	int orig_anssizp = *anssizp;
- 	struct timespec now, timeout, finish;
- 	struct pollfd pfd[1];
- 	int ptimeout;
-@@ -1040,6 +1167,8 @@ send_dg(res_state statp,
- 	int need_recompute = 0;
- 	int nwritten = 0;
- 	int recvresp1 = 0;
-+	/* Skip the second response if there is no second query.
-+	   To do that we mark the second response as received.  */
- 	int recvresp2 = buf2 == NULL;
- 	pfd[0].fd = EXT(statp).nssocks[ns];
- 	pfd[0].events = POLLOUT;
-@@ -1203,55 +1332,56 @@ send_dg(res_state statp,
- 		int *thisresplenp;
- 
- 		if ((recvresp1 | recvresp2) == 0 || buf2 == NULL) {
-+			/* We have not received any responses
-+			   yet or we only have one response to
-+			   receive.  */
- 			thisanssizp = anssizp;
- 			thisansp = anscp ?: ansp;
- 			assert (anscp != NULL || ansp2 == NULL);
- 			thisresplenp = &resplen;
- 		} else {
--			if (*anssizp != MAXPACKET) {
--				/* No buffer allocated for the first
--				   reply.  We can try to use the rest
--				   of the user-provided buffer.  */
--#if _STRING_ARCH_unaligned
--				*anssizp2 = orig_anssizp - resplen;
--				*ansp2 = *ansp + resplen;
--#else
--				int aligned_resplen
--				  = ((resplen + __alignof__ (HEADER) - 1)
--				     & ~(__alignof__ (HEADER) - 1));
--				*anssizp2 = orig_anssizp - aligned_resplen;
--				*ansp2 = *ansp + aligned_resplen;
--#endif
--			} else {
--				/* The first reply did not fit into the
--				   user-provided buffer.  Maybe the second
--				   answer will.  */
--				*anssizp2 = orig_anssizp;
--				*ansp2 = *ansp;
--			}
--
- 			thisanssizp = anssizp2;
- 			thisansp = ansp2;
- 			thisresplenp = resplen2;
- 		}
- 
- 		if (*thisanssizp < MAXPACKET
--		    /* Yes, we test ANSCP here.  If we have two buffers
--		       both will be allocatable.  */
--		    && anscp
-+		    /* If the current buffer is not the the static
-+		       user-supplied buffer then we can reallocate
-+		       it.  */
-+		    && (thisansp != NULL && thisansp != ansp)
- #ifdef FIONREAD
-+		    /* Is the size too small?  */
- 		    && (ioctl (pfd[0].fd, FIONREAD, thisresplenp) < 0
- 			|| *thisanssizp < *thisresplenp)
- #endif
-                     ) {
-+			/* Always allocate MAXPACKET, callers expect
-+			   this specific size.  */
- 			u_char *newp = malloc (MAXPACKET);
- 			if (newp != NULL) {
--				*anssizp = MAXPACKET;
--				*thisansp = ans = newp;
-+				*thisanssizp = MAXPACKET;
-+				*thisansp = newp;
- 				if (thisansp == ansp2)
- 				  *ansp2_malloced = 1;
- 			}
- 		}
-+		/* We could end up with truncation if anscp was NULL
-+		   (not allowed to change caller's buffer) and the
-+		   response buffer size is too small.  This isn't a
-+		   reliable way to detect truncation because the ioctl
-+		   may be an inaccurate report of the UDP message size.
-+		   Therefore we use this only to issue debug output.
-+		   To do truncation accurately with UDP we need
-+		   MSG_TRUNC which is only available on Linux.  We
-+		   can abstract out the Linux-specific feature in the
-+		   future to detect truncation.  */
-+		if (__glibc_unlikely (*thisanssizp < *thisresplenp)) {
-+			Dprint(statp->options & RES_DEBUG,
-+			       (stdout, ";; response may be truncated (UDP)\n")
-+			);
-+		}
-+
- 		HEADER *anhp = (HEADER *) *thisansp;
- 		socklen_t fromlen = sizeof(struct sockaddr_in6);
- 		assert (sizeof(from) <= fromlen);
diff --git a/pkgs/development/libraries/glibc/glibc-locale-incompatibility.patch b/pkgs/development/libraries/glibc/glibc-locale-incompatibility.patch
deleted file mode 100644
index 8ca2ce4cd88a..000000000000
--- a/pkgs/development/libraries/glibc/glibc-locale-incompatibility.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-http://git.savannah.gnu.org/cgit/guix.git/plain/gnu/packages/patches/glibc-locale-incompatibility.patch
-
-This patch avoids an assertion failure when incompatible locale data
-is encountered:
-
-  https://sourceware.org/ml/libc-alpha/2015-09/msg00575.html
-
---- glibc-2.22/locale/loadlocale.c	2015-09-22 17:16:02.321981548 +0200
-+++ glibc-2.22/locale/loadlocale.c	2015-09-22 17:17:34.814659064 +0200
-@@ -120,10 +120,11 @@
- 	 _nl_value_type_LC_XYZ array.  There are all pointers.  */
-       switch (category)
- 	{
--#define CATTEST(cat) \
--	case LC_##cat:							      \
--	  assert (cnt < (sizeof (_nl_value_type_LC_##cat)		      \
--			 / sizeof (_nl_value_type_LC_##cat[0])));	      \
-+#define CATTEST(cat)						\
-+	case LC_##cat:						\
-+	  if (cnt >= (sizeof (_nl_value_type_LC_##cat)		\
-+		      / sizeof (_nl_value_type_LC_##cat[0])))	\
-+	    goto puntdata;					\
- 	  break
- 	  CATTEST (NUMERIC);
- 	  CATTEST (TIME);

From 92179785b60d9fd9e67ac5301e78b892b1b7a0c7 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 25 Nov 2015 17:13:44 +0100
Subject: [PATCH 1611/2285] DOC: Overview of Nixpkgs/channels/Hydra/tests
 (close #11263)

What I missed when I began using Nix and NixOS was a clear overview of
how packages, channels, Hydra, the master branch and updates to channels
relate to each other.

I've noticed I am not the only one, given the amount of times these
questions pop up.

For now I propose to include this in the Nixpkgs manual, since this
seems to be the best fit. However, I think it would be good to include
this in either a new manual, i.e., a user manual, or an 'official'
tutorial.
---
 doc/default.nix      |  5 +++++
 doc/introduction.md  | 48 ++++++++++++++++++++++++++++++++++++++++++++
 doc/introduction.xml | 21 -------------------
 3 files changed, 53 insertions(+), 21 deletions(-)
 create mode 100644 doc/introduction.md
 delete mode 100644 doc/introduction.xml

diff --git a/doc/default.nix b/doc/default.nix
index 7e41380d6358..65e12254f78d 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -42,6 +42,11 @@ stdenv.mkDerivation {
     mkdir ./languages-frameworks
     cp -s '${sources-langs}'/* ./languages-frameworks
   ''
+  + toDocbook {
+      inputFile = ./introduction.md;
+      outputFile = "introduction.xml";
+      useChapters = true;
+    }
   + toDocbook {
       inputFile = ./haskell-users-guide.md;
       outputFile = "haskell-users-guide.xml";
diff --git a/doc/introduction.md b/doc/introduction.md
new file mode 100644
index 000000000000..618251a6e156
--- /dev/null
+++ b/doc/introduction.md
@@ -0,0 +1,48 @@
+---
+title: Introduction
+author: Frederik Rietdijk
+date: 2015-11-25
+---
+
+# Introduction
+
+The Nix Packages collection (Nixpkgs) is a set of over 30,000 packages for the
+[Nix package manager](http://nixos.org/nix/), released under a [permissive MIT/X11 license](https://github.com/NixOS/nixpkgs/blob/master/COPYING).
+Packages are available for several architectures, and can be used with the Nix package manager
+on most GNU/Linux distributions as well as NixOS.
+
+This manual describes how to write packages for the Nix Packages collection
+(Nixpkgs). Thus it’s for packagers and developers who want to add packages to
+Nixpkgs. If you like to learn more about the Nix package manager and the Nix
+expression language, then you are kindly referred to the [Nix manual](http://nixos.org/nix/manual/).
+
+## Overview of Nixpkgs
+
+Nix expressions describe how to build packages from source and are collected in
+the [nixpkgs repository](https://github.com/NixOS/nixpkgs). Also included in the
+collection are Nix expressions for [NixOS modules](http://nixos.org/nixos/manual/index.html#sec-writing-modules). With
+these expressions the Nix package manager can build binary packages.
+
+Packages, including the Nix packages collection, are distributed through
+[channels](http://nixos.org/nix/manual/#sec-channels). The collection is
+distributed for users of Nix on non-NixOS distributions through the channel
+`nixpkgs`. Users of NixOS generally use one of the `nixos-*` channels, e.g.
+`nixos-15.09`, which includes all packages and modules for the stable NixOS
+15.09. The channels of the stable NixOS releases are generally only given
+security updates. More up to date packages and modules are available via the
+`nixos-unstable` channel.
+
+Both `nixos-unstable` and `nixpkgs` follow the `master` branch of the Nixpkgs
+repository, although both do lag the `master` branch by generally [a couple of days](http://howoldis.herokuapp.com/). Updates to a channel are distributed as
+soon as all tests for that channel pass, e.g. [this table](http://hydra.nixos.org/job/nixpkgs/trunk/unstable#tabs-constituents)
+shows the status of tests for the `nixpkgs` channel.
+
+The tests are conducted by a cluster called [Hydra](http://nixos.org/hydra/),
+which also builds binary packages from the Nix expressions in Nixpkgs. As soon
+as a channel is updated, the binaries are made available via a [binary cache](https://cache.nixos.org). Until the channel updates, binaries that have
+already been built, are available via [Hydra's binary cache](https://hydra.nixos.org).
+
+The current Nix expressions of the channels are available in the
+[`nixpkgs-channels`](https://github.com/NixOS/nixpkgs-channels) repository,
+which has branches corresponding to the available channels. There is also the
+Nixpkgs Monitor which keeps track of updates and security vulnerabilities.
diff --git a/doc/introduction.xml b/doc/introduction.xml
deleted file mode 100644
index 577b739e7d18..000000000000
--- a/doc/introduction.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xml:id="chap-introduction">
-
-<title>Introduction</title>
-
-<para>This manual tells you how to write packages for the Nix Packages
-collection (Nixpkgs).  Thus it’s for packagers and developers who want
-to add packages to Nixpkgs.  End users are kindly referred to the
-<link xlink:href="http://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual">Nix
-manual</link>.</para>
-
-<para>This manual does not describe the syntax and semantics of the
-Nix expression language, which are given in the Nix manual in the
-<link
-xlink:href="http://hydra.nixos.org/job/nix/trunk/tarball/latest/download-by-type/doc/manual/#chap-writing-nix-expressions">chapter
-on writing Nix expressions</link>.  It only describes the facilities
-provided by Nixpkgs to make writing packages easier, such as the
-standard build environment (<literal>stdenv</literal>).</para>
-
-</chapter>

From f612dc703eca9d8bb3b2fb85eedf885f70b52a2f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Fri, 12 Feb 2016 13:30:06 +0100
Subject: [PATCH 1612/2285] kde5.kile: init at git 2016-02-12

This adds a kde5/frameworks version of kile.
---
 pkgs/applications/editors/kile/frameworks.nix | 66 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 68 insertions(+)
 create mode 100644 pkgs/applications/editors/kile/frameworks.nix

diff --git a/pkgs/applications/editors/kile/frameworks.nix b/pkgs/applications/editors/kile/frameworks.nix
new file mode 100644
index 000000000000..ff8bc371cf34
--- /dev/null
+++ b/pkgs/applications/editors/kile/frameworks.nix
@@ -0,0 +1,66 @@
+{ stdenv
+, lib
+, fetchgit
+, extra-cmake-modules
+, kdoctools
+, makeQtWrapper
+, qtscript
+, kconfig
+, kcrash
+, kdbusaddons
+, kdelibs4support
+, kguiaddons
+, kiconthemes
+, kinit
+, khtml
+, kparts
+, ktexteditor
+, kwindowsystem
+, poppler
+}:
+
+stdenv.mkDerivation rec {
+  name = "kile-${version}";
+  version = "2016-02-12";
+
+  src = fetchgit {
+    url = git://anongit.kde.org/kile.git;
+    rev = "c586532031872319ae5102fb13ab6de8d80da065";
+    sha256 = "7d5ef8b8c1254a5988a1028e415c9139fbd20a9e6771413c38fa58345a744a7b";
+
+  };
+
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+    makeQtWrapper
+  ];
+
+  buildInputs = [
+    qtscript
+    kconfig
+    kcrash
+    kdbusaddons
+    kdelibs4support
+    kdoctools
+    kguiaddons
+    kiconthemes
+    kinit
+    khtml
+    kparts
+    ktexteditor
+    kwindowsystem
+    poppler
+  ];
+
+  postInstall = ''
+    wrapQtProgram "$out/bin/kile"
+  '';
+
+  meta = {
+    description = "Kile is a user friendly TeX/LaTeX authoring tool for the KDE desktop environment";
+    homepage = https://www.kde.org/applications/office/kile/;
+    maintainers = with lib.maintainers; [ fridh ];
+    license = lib.licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac4336c67010..c06c35c481f0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15029,6 +15029,8 @@ let
 
     kdeconnect = callPackage ../applications/misc/kdeconnect { };
 
+    kile = callPackage ../applications/editors/kile/frameworks.nix { };
+
     konversation = callPackage ../applications/networking/irc/konversation/1.6.nix {
     };
 

From 895f51222e9aa87b11028502d3cd2895c1d91dda Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 16 Feb 2016 17:45:15 +0300
Subject: [PATCH 1613/2285] buildPythonPackage: add installFlags

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

diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix
index 15f369a44f2d..1fdbd4ffc0bd 100644
--- a/pkgs/development/python-modules/generic/default.nix
+++ b/pkgs/development/python-modules/generic/default.nix
@@ -42,6 +42,9 @@
 # generated binaries.
 , makeWrapperArgs ? []
 
+# Additional flags to pass to "pip install".
+, installFlags ? []
+
 , ... } @ attrs:
 
 
@@ -95,7 +98,7 @@ python.stdenv.mkDerivation (builtins.removeAttrs attrs ["disabled" "doCheck"] //
     export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH"
 
     pushd dist
-    ${bootstrapped-pip}/bin/pip install *.whl --no-index --prefix=$out --no-cache
+    ${bootstrapped-pip}/bin/pip install *.whl --no-index --prefix=$out --no-cache ${toString installFlags}
     popd
 
     runHook postInstall

From b08c0472e1cb4644cef4532186bac784f60c33b3 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Tue, 16 Feb 2016 17:45:28 +0300
Subject: [PATCH 1614/2285] pythonPackages.pip: force installing

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f925e688933e..17d5bb6d03a4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15067,6 +15067,10 @@ in modules // {
       sha256 = "46f4bd0d8dfd51125a554568d646fe4200a3c2c6c36b9f2d06d2212148439521";
     };
 
+    # pip detects that we already have bootstrapped_pip "installed", so we need
+    # to force it a little.
+    installFlags = [ "--ignore-installed" ];
+
     buildInputs = with self; [ mock scripttest virtualenv pytest ];
   };
 

From a7d64fef3851dbbf91feadd04e9a9d53e8ca4f07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 21 Feb 2016 09:24:43 -0300
Subject: [PATCH 1615/2285] xfce4-whiskermenu-plugin: fix xfce4-panel path in
 xfce4-popup-whiskermenu script

---
 .../desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
index 420eb128a420..79e84f6470a3 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
@@ -20,6 +20,11 @@ stdenv.mkDerivation rec {
   buildInputs = [ cmake pkgconfig intltool libxfce4util libxfcegui4 xfce4panel
                   gtk exo garcon ];
 
+  preFixup = ''
+    substituteInPlace $out/bin/xfce4-popup-whiskermenu \
+      --replace $out/bin/xfce4-panel ${xfce4panel}/bin/xfce4-panel
+  '';
+
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
     description = "Whisker Menu is an alternate application launcher for Xfce.";

From dc3a1bff576cd73ff7043c113d722842ec360f40 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Sun, 21 Feb 2016 13:51:08 +0100
Subject: [PATCH 1616/2285] cups: add a comment about updates

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

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 8fa111ecc023..82fd1d65baf5 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -3,6 +3,8 @@
 , libusb ? null, gnutls ? null, avahi ? null, libpaper ? null
 }:
 
+### IMPORTANT: before updating cups, make sure the nixos/tests/printing.nix test
+### works at least for your platform.
 let version = "2.0.4"; in
 
 with stdenv.lib;

From aee654870169ef30f757d2d71fc61860b878f310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 21 Feb 2016 09:51:44 -0300
Subject: [PATCH 1617/2285] xfce4-whiskermenu-plugin: 1.5.1 -> 1.5.2

---
 .../xfce/panel-plugins/xfce4-whiskermenu-plugin.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
index 420eb128a420..bb77f5687357 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
@@ -5,8 +5,8 @@ with stdenv.lib;
 stdenv.mkDerivation rec {
   p_name  = "xfce4-whiskermenu-plugin";
   ver_maj = "1.5";
-  ver_min = "1";
-  rev = "18c31a357c102ab38e98ac24c154f9e6187b3ef8";
+  ver_min = "2";
+  rev = "d08418c8d55edfacef190ec14e03e1e9a6988101";
 
   name = "${p_name}-${ver_maj}.${ver_min}";
 
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
     owner = "gottcode";
     repo = "xfce4-whiskermenu-plugin";
     inherit rev;
-    sha256 = "442e887877ffc347378c23ded2466ebbfc7aacb6b91fc395b12071320616eb76";
+    sha256 = "0icphm6bm5p3csh9kwyyvkj2y87shrs12clfifbhv35dm0skb2dx";
   };
 
   buildInputs = [ cmake pkgconfig intltool libxfce4util libxfcegui4 xfce4panel

From ce763e2d663cf3d79f5c679043bd815cc15a4fa0 Mon Sep 17 00:00:00 2001
From: taku0 <mxxouy6x3m_github@tatapa.org>
Date: Sun, 21 Feb 2016 22:16:26 +0900
Subject: [PATCH 1618/2285] thunderbird-bin: 38.5.1 -> 38.6.0

---
 .../mailreaders/thunderbird-bin/sources.nix   | 234 +++++++++---------
 1 file changed, 117 insertions(+), 117 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
index b758bf996d26..19477d86a3c4 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/sources.nix
@@ -4,123 +4,123 @@
 # ruby generate_sources.rb > sources.nix
 
 {
-  version = "38.5.1";
+  version = "38.6.0";
   sources = [
-    { locale = "ar"; arch = "linux-i686"; sha256 = "428fb92fe6a30f528c13f59d321eb479638133b98692e9abb2821550312027ed"; }
-    { locale = "ar"; arch = "linux-x86_64"; sha256 = "aaa65b171336d8fac42d94f2b7e41ea286415ee0337afcff2c8dc55ea4d01d09"; }
-    { locale = "ast"; arch = "linux-i686"; sha256 = "432e71e48a46bc7e90bfac8820b470346fe6b95e8545a7b6a8b5e799c7658fb6"; }
-    { locale = "ast"; arch = "linux-x86_64"; sha256 = "d8ee8d92f9635396cfe8a27dc57b407a428a0fb210c849b5faa9d7a1458328db"; }
-    { locale = "be"; arch = "linux-i686"; sha256 = "19b33c2683b5ee20264533d64c717320fb82187074c1b4d42e902b3021ac8907"; }
-    { locale = "be"; arch = "linux-x86_64"; sha256 = "8b7659c5327cd6552c4a743cd92100bbdc10b6623021eab79265027b9a0f1550"; }
-    { locale = "bg"; arch = "linux-i686"; sha256 = "02a0d0858de83abb9c732787522b45e8cfad419b765a0922426197c9f9a00f9f"; }
-    { locale = "bg"; arch = "linux-x86_64"; sha256 = "dd0ae9d067365b66a55e337c6b294d672c997c88024b17223583d9ccfb667488"; }
-    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "422b42cc56b3fda6aecece1e0d934f43970fa7a8dfed0bbe859bf0e7daf6f8fd"; }
-    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "f4edee91b6101aa4b8c308cf02d1cb926cff4beb44f840b86e0d01232dc5b88f"; }
-    { locale = "br"; arch = "linux-i686"; sha256 = "d64078fe9092e9288cb270b0d35be25a5d8d225f70d4a902d8a5c89b36b0a1a2"; }
-    { locale = "br"; arch = "linux-x86_64"; sha256 = "68b3234560f9678f3b9b1f11ccdfa2109026ca3dce321bb2732b024fbd77ce0e"; }
-    { locale = "ca"; arch = "linux-i686"; sha256 = "a7082da8adf2098449ecaf6750607e394fb03e3e1ba974852bf596c4dc961531"; }
-    { locale = "ca"; arch = "linux-x86_64"; sha256 = "6a81e6713b0b4e01d575c4709137eb8b50811f3ce4fb7222c3466e5dcedcd244"; }
-    { locale = "cs"; arch = "linux-i686"; sha256 = "512a02a544c522b59fd86705668264b2fa85fc738dd93878289230e05f38bd71"; }
-    { locale = "cs"; arch = "linux-x86_64"; sha256 = "809ff680e80ffc8b5aaa631b346d8a34df4b99362e048d16e4d415f32d721710"; }
-    { locale = "cy"; arch = "linux-i686"; sha256 = "c0a3b6f3e8b78e624a7b8f3d68185063fcc2cfb4b8f06942586a384de738eabb"; }
-    { locale = "cy"; arch = "linux-x86_64"; sha256 = "bba5556ed1f3873b9111d47ff978a2ca5fd43a48e7e32bf25cc7ad4650d5b37b"; }
-    { locale = "da"; arch = "linux-i686"; sha256 = "4b296fdd61f2cdf2d644503befafed114f5d18fd8e8bbd37d3f6a06275e8d11d"; }
-    { locale = "da"; arch = "linux-x86_64"; sha256 = "30fd49c129cee05a86a60147ea706286c0dd9a48fe6b43178d80b2a2726fcc48"; }
-    { locale = "de"; arch = "linux-i686"; sha256 = "814d073fc127b74d9edcace83c38ad2e80c74bafa327d2eac44de7673e0b2958"; }
-    { locale = "de"; arch = "linux-x86_64"; sha256 = "00dfd1ed1b981ba5bb66dc86ded8a7aee25e1a67d0c5e739a5ec252e4b4f0764"; }
-    { locale = "dsb"; arch = "linux-i686"; sha256 = "97473204548f40f6b806c1de5835477998f58ad4e9be8a1eb2bc7097def7ceb6"; }
-    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "42042946079e486c24ff5e76c2e572d81a4e996dfb9ca37a9b19417933defd32"; }
-    { locale = "el"; arch = "linux-i686"; sha256 = "9056a466e7e99efa10b30be00d7f0ff2c64c077725a57397ea7462fa2de6bac0"; }
-    { locale = "el"; arch = "linux-x86_64"; sha256 = "06b223ca8ec5e47b2876c7261b94fbb82fefec50527a777802c74ebbc71c6256"; }
-    { locale = "en-GB"; arch = "linux-i686"; sha256 = "8f74bee700e9d6414d379e723e5be952725a96fc4155f1652701327fe36b493c"; }
-    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "dccdf5e29b19852895eccfd479c2d04d7ae3d7847af050028a6cada9700ef948"; }
-    { locale = "en-US"; arch = "linux-i686"; sha256 = "d2d564f048a9cbc9a956fb1b937c0d43758c97315fd19bde79d63bb0bdd7b9a5"; }
-    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "70a8bdd408cea0d015a560969083445046c3a8e02c7777b2b22eedf6b46888b6"; }
-    { locale = "es-AR"; arch = "linux-i686"; sha256 = "c03ca2ea86db9dc6428e96f50cf8fc86343faa539b5ebff0e476f0e0bcb2c6c3"; }
-    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "eedc718bc25219803666e95870ce4a0ddfec7443392aa0f3840b2689bb09ab55"; }
-    { locale = "es-ES"; arch = "linux-i686"; sha256 = "962de04ebaa81296a04c84e1dd3574ec1ed5fe1784f1b0345b30fdf6de214301"; }
-    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "3821a77b83cfe174b10a9b472d8a4a29dc069a8e1c82b536923d90761fa31a4d"; }
-    { locale = "et"; arch = "linux-i686"; sha256 = "17ee3d2c863d7e8c0562a1ba75d7b1b6e469e93d3665aa2de662e98eaff1d921"; }
-    { locale = "et"; arch = "linux-x86_64"; sha256 = "84ffe20179728d1ab3dffd93428b330c6958b3c825ffdca6c8cf63dc831a7519"; }
-    { locale = "eu"; arch = "linux-i686"; sha256 = "424de9056f295b710be3db287a9ee48759efed25e311881750a49c1b30c33fe1"; }
-    { locale = "eu"; arch = "linux-x86_64"; sha256 = "5fdaafd1b691d29df5d1056555a052a0feeaa6d7b01a0383241bbc8b988da7d2"; }
-    { locale = "fi"; arch = "linux-i686"; sha256 = "1037c3d031d00eb4fea5aab50215108d0fcce6668d7226e594f47784a8aa3edb"; }
-    { locale = "fi"; arch = "linux-x86_64"; sha256 = "71f6a24995b16b1e5dfcdd5b3758940a69bf348430d71f800522bc1c0eeb6341"; }
-    { locale = "fr"; arch = "linux-i686"; sha256 = "095f6a9c8876aabbd890a97724060a704336605655a7b1feb890b05e051ae810"; }
-    { locale = "fr"; arch = "linux-x86_64"; sha256 = "97f3b49f91724608520202384d82accd3705290cb6c295dfd88d49ec33dd76c4"; }
-    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "59be75d317a2ebef649adf7eff64a8e9706d5e6f58971e12ab3de3e9da306fe7"; }
-    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "b5c4dc6e07d17fb4150d04e5c377e4c2ec18fe6304fb84a2bb19bdf554113b4a"; }
-    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "59afa36ca0b31e9f0cfdaedb5e49889ef1d5d1f9c08b6fb9e6cd21a282ecacae"; }
-    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "6e9c48d531cc65f08e08f54170721ce0cecde785978cbca0bffad6847433a5e3"; }
-    { locale = "gd"; arch = "linux-i686"; sha256 = "2c6e63a2c89f74df52d06c8bb6bd46871c04b4c91506c166acd28de1aeba8d8a"; }
-    { locale = "gd"; arch = "linux-x86_64"; sha256 = "73c4923a5a425e2b96cf1e1b05584e282f5802b76337a5180b9c89c0163fb47f"; }
-    { locale = "gl"; arch = "linux-i686"; sha256 = "4ca2c0ab487eb79272fcfe253cef93838eb57925bb2631c29de36f2510fedc1d"; }
-    { locale = "gl"; arch = "linux-x86_64"; sha256 = "7b731eb0ece93a1944ffd8dd7b0f91cad1292955e967a511ab72080b3dc66fdf"; }
-    { locale = "he"; arch = "linux-i686"; sha256 = "056cff554994ef984356b7fb27759548ac546c10b918c727e130adb970430018"; }
-    { locale = "he"; arch = "linux-x86_64"; sha256 = "5592613852a34b7b5990a06ba31b1713bb9b277a5472e153a26e780f0620f2c4"; }
-    { locale = "hr"; arch = "linux-i686"; sha256 = "abe18e183a2b26315dbad115c187eb56fe70daffd8eac3465e1ee2c3b2f364b6"; }
-    { locale = "hr"; arch = "linux-x86_64"; sha256 = "d657795e84fe1ca238e986438d5501e4baf628a890835258bcbd3a32040fef4c"; }
-    { locale = "hsb"; arch = "linux-i686"; sha256 = "806e9da32095fbb5dd6610f715006a3cf0732b69759e8b88d6c3f39617a9fd2c"; }
-    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "3c0c1cdd739d1d82aef6ce864e0a65c735591acdb127a50ebdb8e5999a524b17"; }
-    { locale = "hu"; arch = "linux-i686"; sha256 = "a052932572784bdc90e8a16ffafa855a5817ea28bdd3365fa18f40685bb2f77e"; }
-    { locale = "hu"; arch = "linux-x86_64"; sha256 = "1f98b63f900ab64989ee8860ce3580394dad438078e574e4c7d997bf5a840fd9"; }
-    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "b7148002a1f1790bbc52c1c3fbab837acc9a7681077aad115cc81bd05f1e1a33"; }
-    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "cc18eaa5b72c57438c11b8fd5a77f677218d1323ad844f8eb8d294132e40d86c"; }
-    { locale = "id"; arch = "linux-i686"; sha256 = "a1c7fadbb96293391e99ee0abe16b20331a9ee274e5c56d5972a339ccf62b1da"; }
-    { locale = "id"; arch = "linux-x86_64"; sha256 = "7ac143a557c5f913966c81235f6dd398516c3e153e667442297cef82024f2af9"; }
-    { locale = "is"; arch = "linux-i686"; sha256 = "f884769780d273d7e921a236ad6fc21b1749ae8c1c483b9b57943e42bc23206e"; }
-    { locale = "is"; arch = "linux-x86_64"; sha256 = "b10fd3af349285bcecbf0334ec22b93b6811abb9c580f5a38e84b5dede4264d1"; }
-    { locale = "it"; arch = "linux-i686"; sha256 = "1ac48c611c6ae2163ae27970dcef5c20e1ba932a2210eec659ea31cb4967dfd1"; }
-    { locale = "it"; arch = "linux-x86_64"; sha256 = "23930f00a7b9b47d43a23611d4f804025d11aa489101c120449428d866179517"; }
-    { locale = "ja"; arch = "linux-i686"; sha256 = "148df7f75b69757a64427bb96bcb9a2a0d8f885b907130c1d7c519bf6e7a1718"; }
-    { locale = "ja"; arch = "linux-x86_64"; sha256 = "4992ae5d3f348648a9febadb058f558dce7659d18065e352a1d560e552d27e6e"; }
-    { locale = "ko"; arch = "linux-i686"; sha256 = "b4f9668d9d56b15c6af69d7a23716c70074adbb90100725c951d913682003789"; }
-    { locale = "ko"; arch = "linux-x86_64"; sha256 = "43f134ad246b5896a003cb75c73339cc27cc7bdf02584d5b5455a4606112a7a3"; }
-    { locale = "lt"; arch = "linux-i686"; sha256 = "b3e48defce4416d32c968056f07498c268428746c2e99f68c91c08cd623f2741"; }
-    { locale = "lt"; arch = "linux-x86_64"; sha256 = "f8cb85d3f033e6a7c6ea8d7af7e31604a3f67e2435557d108d8bff18a5612785"; }
-    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "ebe6134f09bcd52b7da5461247372b5e352aa78b882039993f0f7e6d08e19047"; }
-    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "c2137e014c37c149dfe847dd4516af45307f1ee7ae9f915b48c78b882f7e4b0b"; }
-    { locale = "nl"; arch = "linux-i686"; sha256 = "d2edd221ef00a02a38b037f961671a8f82595ea6796556bbc5cb94041a2e131c"; }
-    { locale = "nl"; arch = "linux-x86_64"; sha256 = "af2110f44b303d5182140771001d3d10b9ed7b44c31261f740b15ea4caa21545"; }
-    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "c0db7cd88d5f0e38e6683181729a2de5ba63abdc4d0af17fbd72de723c909426"; }
-    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "040da2abe7aaef427386e31aa24e67aeb389f8294f14f445ab68fb8714f74094"; }
-    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "ca2e02b0ac8f4b5ab6b4af3e905a1c65274dd17bea6c4b84bfa0afa99f5bb6d3"; }
-    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "3324461c1d47872b96d6fcfdfe10971e70b7698789fa8a7b439d5d226f87d0fb"; }
-    { locale = "pl"; arch = "linux-i686"; sha256 = "2094e2136ccdac7572203772b0a2cfed2f78116e2ee72c7038137ca198b0f404"; }
-    { locale = "pl"; arch = "linux-x86_64"; sha256 = "59f9d72974f84c2b349a7fd7c614b7473b6dba4fdaf0c57b267369624b13f2b6"; }
-    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "beeb965afb626565155ca1f882ed27fc5489ab650f3eee94064227c213aa9100"; }
-    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "a72296d59a7971aaba395fa058b8ecfa4889ccbede3ee0161744b70e848436df"; }
-    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "b8e0925a64aab9e23bf13bd9b2afd1baab7d964e6c1c3af3973201fc6b7a71c9"; }
-    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "bd12cfcb485b85bc0444111f7bf7f1e9ecff42a1bf03515e46aeff668da690a8"; }
-    { locale = "rm"; arch = "linux-i686"; sha256 = "220767594e50de01d636d29d38ef87d0ad4871c718ba2f5e9c8f8bdc13023408"; }
-    { locale = "rm"; arch = "linux-x86_64"; sha256 = "298f69008f20a23eda68a92912fbd050eff73f806e0cb8ce0c40f1fc53b76fc2"; }
-    { locale = "ro"; arch = "linux-i686"; sha256 = "3be80143bb1affa8df3c94bcb048bcd2f22f39f60db02d2f9afeeb44b45c67ae"; }
-    { locale = "ro"; arch = "linux-x86_64"; sha256 = "715963ac282e8f972e22f3fcc5b51e03346f011b8848f16b8a8cb9b6a23c864c"; }
-    { locale = "ru"; arch = "linux-i686"; sha256 = "0c793708c8501df82582f5d820c65ee11a46819f012b7d616c7fd4b1424e7eef"; }
-    { locale = "ru"; arch = "linux-x86_64"; sha256 = "5f4fbfaa52b4eca748dd12da12c6bc38286e5fdee2fd81d337d926ea4e0df378"; }
-    { locale = "si"; arch = "linux-i686"; sha256 = "ede99dd26481f9864dbd0ad276f3b10a1bea8a2267a3f0055f10de4c185a3e3d"; }
-    { locale = "si"; arch = "linux-x86_64"; sha256 = "15ca9bb30fe45879bfaac936187951f36af45a134cdf756314e7c1b1d508db22"; }
-    { locale = "sk"; arch = "linux-i686"; sha256 = "9ac426f0148d232de2c11fb0404bfd317aa26d0fecca710c63dda52eb73841d5"; }
-    { locale = "sk"; arch = "linux-x86_64"; sha256 = "8f67b9449e4b0759b82d748c1c0aab3ba42da1c3643e1579f3f0e1cda00cf61f"; }
-    { locale = "sl"; arch = "linux-i686"; sha256 = "12d52efd990e472230cbee546b544f01b2aa7bf8e1812cc561102e9cba58bfa0"; }
-    { locale = "sl"; arch = "linux-x86_64"; sha256 = "432071992c94ae8964db97f02d7c26d1584ab6ba43a3bb87bb605d9933f37673"; }
-    { locale = "sq"; arch = "linux-i686"; sha256 = "b070ecb797dae27d66c449feb34c57d383f64ddbe6dc37cd836658e3e8c28e54"; }
-    { locale = "sq"; arch = "linux-x86_64"; sha256 = "065eebd594fa00315bd017f76eb35ff64e371347b346ec54eef6edbc738476b4"; }
-    { locale = "sr"; arch = "linux-i686"; sha256 = "a76a9b519fbfa5e3ac305522fe313c3f1c52c2bdb1c44878341a0ff5f50c5a36"; }
-    { locale = "sr"; arch = "linux-x86_64"; sha256 = "e90a8c3dd54d69de3e092d1e63288365807238ec3ab01383778bb10aa9799309"; }
-    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "da60ffb3131d7ff150d9a2f70b1071d0399cfaf671003c5b5b598911561eddb8"; }
-    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "686162ef37b00757ff49784fb6c2fd04ea55103c78af6f97bf5e7e6be34cb46a"; }
-    { locale = "ta-LK"; arch = "linux-i686"; sha256 = "ad8702ca5223fd9a17dce9e71360299938f53548e357d93a5bc23d24cbec8039"; }
-    { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "f6178474338c75f1b216176ae40a9e09df68697d9cc1ccdc661293b51ae133ed"; }
-    { locale = "tr"; arch = "linux-i686"; sha256 = "54c88fd15417a271368a981b79467064a968993e7076e2f4a87f0cb280b4954f"; }
-    { locale = "tr"; arch = "linux-x86_64"; sha256 = "d1943ef072cfc40ab90d0b008527d6e4607db2299eb536573db5a7e832babb9c"; }
-    { locale = "uk"; arch = "linux-i686"; sha256 = "276ed6dac2090fdd53c967daadda3d39c8f05b70f6d91779af2998b446a831dd"; }
-    { locale = "uk"; arch = "linux-x86_64"; sha256 = "f18455e1df20364ff0c4e2f44397b068faf387f7efa25941f167750f349f93a5"; }
-    { locale = "vi"; arch = "linux-i686"; sha256 = "3a72f5935f32de88a0bf88eb5252864b19b8bdd1f01fa49b14d54021a88fb2cf"; }
-    { locale = "vi"; arch = "linux-x86_64"; sha256 = "3f53c378fce2c5a7245103510714b2d99b8915ef78452d469cbd4f0343a3767d"; }
-    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "6ac29a8081a339f334ea0b22ac49b81d79d26a22995ea592f1a78fe9c66a4edc"; }
-    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "82733b4f96f42fe3d0fd7e429e8f23bd1aa059890a6403cc991b3236f31399c6"; }
-    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "4d376644e762630bd7e9077d616cd4b4c0175ea3fd3df04c4c76ac489d87cecf"; }
-    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "0044c3e78014df76fd09009142d75858fd8ac5abea54920d52870bf2d6599310"; }
+    { locale = "ar"; arch = "linux-i686"; sha256 = "141b3e5a5a51b0ed8f11bc9233d19bccc3116e55d568eb4995bcd48c91ba3390"; }
+    { locale = "ar"; arch = "linux-x86_64"; sha256 = "f2841d9da85e788d868eb56a43baa8e7d72d40c9c82ca60f4f958b9285be5bc3"; }
+    { locale = "ast"; arch = "linux-i686"; sha256 = "aa52c0672bf8c2b28ae5efb26aa552592aad6c637b660f9cb4533cad72b9a4fc"; }
+    { locale = "ast"; arch = "linux-x86_64"; sha256 = "1a083214fc2f31e52b0d03bffbef64e364b77457e447ddc134dc363004768b03"; }
+    { locale = "be"; arch = "linux-i686"; sha256 = "f3e7653a7f9957e9722cf29a7a97b751ffc2b19bd4982ff603f6460afb07445d"; }
+    { locale = "be"; arch = "linux-x86_64"; sha256 = "55d7082b20da1bbe23b8d1a2e1e07f6a02f9dd96b065cab1a8a2acd086790d21"; }
+    { locale = "bg"; arch = "linux-i686"; sha256 = "132fb89107e653cb30e9f6fffbca6ced0451811080b89058a652dcb5187601f3"; }
+    { locale = "bg"; arch = "linux-x86_64"; sha256 = "03868dab14f8bd671eed93a05c50c3836bb047e4195a2b8e92d04d3cf3244c67"; }
+    { locale = "bn-BD"; arch = "linux-i686"; sha256 = "ffa2c116e814da8f0a5995f382de0b4d614e72b55ecc905185c014abea763851"; }
+    { locale = "bn-BD"; arch = "linux-x86_64"; sha256 = "74631bb2d75687aefc6e8dfa9414176a92de7a22890704f6f84603703a3dd880"; }
+    { locale = "br"; arch = "linux-i686"; sha256 = "3942e35a9ea655ac365a4b00f70d8b97e7833e50d00d7d07e5ce851956f55f00"; }
+    { locale = "br"; arch = "linux-x86_64"; sha256 = "33dba57581571faac7cc11aeafda68fce323c9fc322a3c8e43cbce794489ab39"; }
+    { locale = "ca"; arch = "linux-i686"; sha256 = "5001132684f89e6e4c4ab8d22f37739da4465577e850bed4748ad3079a0b592e"; }
+    { locale = "ca"; arch = "linux-x86_64"; sha256 = "3cfad5f05320d179b575bc263ceecef0c9bfec08e7a3471dd779be8798f8f8e8"; }
+    { locale = "cs"; arch = "linux-i686"; sha256 = "14879dadca5936473b42ccefc2485707330aa7062bd1c2094adafee0dde83a50"; }
+    { locale = "cs"; arch = "linux-x86_64"; sha256 = "92f39de732f2264c5658e3282d0a4259b437f81277c926b3fe0a1c51bb18a27b"; }
+    { locale = "cy"; arch = "linux-i686"; sha256 = "e38d9c45558bbf1414efff8568b79ed58c0383329923944aca72bcd075c71967"; }
+    { locale = "cy"; arch = "linux-x86_64"; sha256 = "43f11c8ea150c1b58031fd765fc5d789e56df68ef36dd989a8a67135d9a1e501"; }
+    { locale = "da"; arch = "linux-i686"; sha256 = "9815c3fb3c95d4fb73faeb9db10591a39131edcb846fb72b6c2b01ac132602f5"; }
+    { locale = "da"; arch = "linux-x86_64"; sha256 = "6435f69ebb748f2f81dfcd1da4d66030792e73735d11c788c4478cdb750de89d"; }
+    { locale = "de"; arch = "linux-i686"; sha256 = "d8601890fe1021c61b48cb755a98358fffb0e5c3de106d0408baa748c6e4ff21"; }
+    { locale = "de"; arch = "linux-x86_64"; sha256 = "96626e10573940ce9a77277f8776066e1f33d852ff1a9be25c613ea54b2ad3d0"; }
+    { locale = "dsb"; arch = "linux-i686"; sha256 = "c0cf3e5db343c031171cca6507839e18bb4232a498eb0ff87864c0d3f54c31d3"; }
+    { locale = "dsb"; arch = "linux-x86_64"; sha256 = "5c94f8200bf7e5bccdb4f454232707c1354d4cb87713648847d742d1d127b5bc"; }
+    { locale = "el"; arch = "linux-i686"; sha256 = "43b61ae50412d5df24f903bd1890be52164689b53ec9bbfe134b7bbb36952377"; }
+    { locale = "el"; arch = "linux-x86_64"; sha256 = "163e041e125f84db5f9d55f6e8a2e8d15b7ac6335187a55f00f7019b3038249c"; }
+    { locale = "en-GB"; arch = "linux-i686"; sha256 = "b34105daffdf9088fecd199e1525ebbc332ff6536487caa058d19daa4c7306c4"; }
+    { locale = "en-GB"; arch = "linux-x86_64"; sha256 = "ac54bf8c804d17ecebab6a865471ce5adf712466612eb435e5871a4ffcc7238a"; }
+    { locale = "en-US"; arch = "linux-i686"; sha256 = "2e60a2a5764cdee16659b125f7ad2dde7ff6e993c69a738d86fb39530e469328"; }
+    { locale = "en-US"; arch = "linux-x86_64"; sha256 = "f0b4b0d5a7f4b21845e76411cd75d59b0e34a341747cafcb3e871a00b1b2535e"; }
+    { locale = "es-AR"; arch = "linux-i686"; sha256 = "fa9de1698297336d3db8d7cc6c59ea1cad595c2d5caf8081f85fc217535d630d"; }
+    { locale = "es-AR"; arch = "linux-x86_64"; sha256 = "62bf96299b20de2b6ea17db2113fd8220c60507314d9c3dfbd2ef06557746298"; }
+    { locale = "es-ES"; arch = "linux-i686"; sha256 = "1e79df1375e29c6aaf2839584ee51e23a326587e02440c07f10969f82e29daa3"; }
+    { locale = "es-ES"; arch = "linux-x86_64"; sha256 = "e5ef4e579c83b1f982b5d071966b3c1be39b94aa128e0ef14f4244e51b19c6c9"; }
+    { locale = "et"; arch = "linux-i686"; sha256 = "110dc75c81abcca2199c2f6bee542fe0909bfbe678e91376a1413a81bac88edf"; }
+    { locale = "et"; arch = "linux-x86_64"; sha256 = "71f7f7d5d9025423438138a62728d3494f2227c3b1daf8945cbd20d65e7629b3"; }
+    { locale = "eu"; arch = "linux-i686"; sha256 = "ad2e6071fafe18f3db5d4af4d938450ec1a8f538e2a5efc7f8ce1d28f1f3dd66"; }
+    { locale = "eu"; arch = "linux-x86_64"; sha256 = "32c8b0e825912b97a36cedf19ead4eba8427e08ac059b4bb9fda15c568ce6cff"; }
+    { locale = "fi"; arch = "linux-i686"; sha256 = "203006ba5572a315f851e69e74779f92123df25d6a1964283bbf546c43ca0ecb"; }
+    { locale = "fi"; arch = "linux-x86_64"; sha256 = "f87904779b68a60aef440a7eb5cf490fe224bc25517d9fa463575fd35c4fc895"; }
+    { locale = "fr"; arch = "linux-i686"; sha256 = "4d92b6273006f6a20c6b405cfdd017930e7341230f0deefdbe8961a3ab2099d7"; }
+    { locale = "fr"; arch = "linux-x86_64"; sha256 = "a7858e1fca3007710053cd6ffcd8d17fe111ec3727e98cfc410f426fb4dd04a1"; }
+    { locale = "fy-NL"; arch = "linux-i686"; sha256 = "d222ea0506db332ab7590fc85dce4102613489506d7680bac31c82b855ae238e"; }
+    { locale = "fy-NL"; arch = "linux-x86_64"; sha256 = "b466075727c3d3f709b9ddb1987f9fe69deb1efa34fecbd73aa1c5231ef844d8"; }
+    { locale = "ga-IE"; arch = "linux-i686"; sha256 = "d786389a7866d2be769c079ec65396fe3888968f80f3fbd8d54e355ac3098f91"; }
+    { locale = "ga-IE"; arch = "linux-x86_64"; sha256 = "8134a011c31cf63a5538fea89ef332a28ab510fb08e1251a9d460ba83946f656"; }
+    { locale = "gd"; arch = "linux-i686"; sha256 = "a5b5cb6e9a2daf1587af84083cd680b14f49a0f998d4e6e80f09c37aebac0b0f"; }
+    { locale = "gd"; arch = "linux-x86_64"; sha256 = "7b15ab841f95eda59256c7cb4c9c876b0bea34df9f0e1d3af3bd144230d7254a"; }
+    { locale = "gl"; arch = "linux-i686"; sha256 = "7bee6ae14c9f43689ab2c7b9a7de60af9fe4d9d567efb94b26e3109af04d6c43"; }
+    { locale = "gl"; arch = "linux-x86_64"; sha256 = "b9a6e5bd2c62745a82fd3685a694a6f34d3327b60a62af6e283caf3a67d77f22"; }
+    { locale = "he"; arch = "linux-i686"; sha256 = "17a322f92322de536ead76e292d877ab8e9deff9855b1c12fc20855d3935a548"; }
+    { locale = "he"; arch = "linux-x86_64"; sha256 = "e542cfdfd29f7d54520dc86c9b73252e57fd3346874f9d629fd31b25be463471"; }
+    { locale = "hr"; arch = "linux-i686"; sha256 = "fe1fc94042eaeeedc1e7592cbedc5e4c922c5e05cd212feff8a654898d2c2a9e"; }
+    { locale = "hr"; arch = "linux-x86_64"; sha256 = "de191f3cc421ed5b06ce981c0431decb933799252107b27103bc3c45ac6995be"; }
+    { locale = "hsb"; arch = "linux-i686"; sha256 = "f55ad886854541ea1d684d168f8fb3c858fc8a11324dc14fb64340cb47f6d7fe"; }
+    { locale = "hsb"; arch = "linux-x86_64"; sha256 = "ee03f60c834c141d3340dca9ecfce8f427ee50a3b6b963f4a565a843e895f614"; }
+    { locale = "hu"; arch = "linux-i686"; sha256 = "8462e0a665d04b9273dbfc1095ef57831165438c21c34b5d04d22b51276fc047"; }
+    { locale = "hu"; arch = "linux-x86_64"; sha256 = "6cc42919c6417860e19fcc851b8210b9d6e405c4b2ff0bf51cffb18af733b488"; }
+    { locale = "hy-AM"; arch = "linux-i686"; sha256 = "2c3f4f4358387dad669254da46e21b4da1f54cedbc7be62c38448862a88edf37"; }
+    { locale = "hy-AM"; arch = "linux-x86_64"; sha256 = "0556cb57c012554449d7044efaa5e8b4b938b15d55a19f91cb31ea5187b7ef76"; }
+    { locale = "id"; arch = "linux-i686"; sha256 = "26d31f04b836d3e5e3874c4e37d258effc8bd228223f6b963df3434d2276529c"; }
+    { locale = "id"; arch = "linux-x86_64"; sha256 = "55b2be7503278c0a41785796425fe35f5635e0c635d79a4246f7830a7cf6f075"; }
+    { locale = "is"; arch = "linux-i686"; sha256 = "29ce03e041c320aaa61c8ecefbe1a6cd2e9b96e916f3605f09a59cd271cfb741"; }
+    { locale = "is"; arch = "linux-x86_64"; sha256 = "44d7856e1779e86d715026a26fdc0db8beb8fac1bcba5c27ed652779f858c12e"; }
+    { locale = "it"; arch = "linux-i686"; sha256 = "47dd016eda154be31646105061570653ab61ab99d8bf873cf9e8e4b727847fc6"; }
+    { locale = "it"; arch = "linux-x86_64"; sha256 = "299941c56912734dd06c2f1dd89838d3a746dfde10df39f6caf198cf4fc6a332"; }
+    { locale = "ja"; arch = "linux-i686"; sha256 = "ff809f8f752612d242d5787f511b4821294855dd42027d7493f789200747575a"; }
+    { locale = "ja"; arch = "linux-x86_64"; sha256 = "babda834d5e6fa669691b974c4c4ea4b9207c3926796d0c1d76784b733d738a3"; }
+    { locale = "ko"; arch = "linux-i686"; sha256 = "a04ca9cd1cd435d4ab5d832efaeb1a6fee5e9e6c933c5a3a9b0e21bbc5141f24"; }
+    { locale = "ko"; arch = "linux-x86_64"; sha256 = "0390d47ca644679631b8bbb83cb45e404b4b7f1e4ad237d439318fd6464aeeb4"; }
+    { locale = "lt"; arch = "linux-i686"; sha256 = "9e9d3ed60a3ba5ef761937e5b2b06a4eaac1c6f6c1d72a9b3fe0ab7818e3d18f"; }
+    { locale = "lt"; arch = "linux-x86_64"; sha256 = "8d7cf2a173df6b7930a37244829934b2729341a8938288c988120010d1a52d2f"; }
+    { locale = "nb-NO"; arch = "linux-i686"; sha256 = "fde6089efa39e867f8c8b4b6d6e9d5c006f87c4ceaabb78517b34ea288cebe1e"; }
+    { locale = "nb-NO"; arch = "linux-x86_64"; sha256 = "9ff74ec5e87468f3912b1ec847eff2d215c35224b4ef82ba29efaba4a48f2bb0"; }
+    { locale = "nl"; arch = "linux-i686"; sha256 = "349101916960741272549700a4050850730679826ef3f6c837b542628ac9b17b"; }
+    { locale = "nl"; arch = "linux-x86_64"; sha256 = "0bc2cf52b46f15976cd5355960b81106279c4cea9b7d55ac0360a56dd934ce6a"; }
+    { locale = "nn-NO"; arch = "linux-i686"; sha256 = "6eff1f88b362d81d71833b50606afffdb7e0210160bc9933226c472daa692259"; }
+    { locale = "nn-NO"; arch = "linux-x86_64"; sha256 = "748726556948ebc59913a72965a54de67615217a93cf0351ece356524d8e3097"; }
+    { locale = "pa-IN"; arch = "linux-i686"; sha256 = "6606ee970387998235ed96fdbacc64a47fe2bc0d78061cf4205200517ab6f092"; }
+    { locale = "pa-IN"; arch = "linux-x86_64"; sha256 = "0a77fe35ddce1921252d2e2acbeb09d6e719d34b4d81af8d6ef9c5c846359780"; }
+    { locale = "pl"; arch = "linux-i686"; sha256 = "b8d81eba8470a29768ded1c6882cdbf2f3306843754d29fa35e385b0a6efce25"; }
+    { locale = "pl"; arch = "linux-x86_64"; sha256 = "2b10f69274860e7af35cbb795042d058c9480ad195cd435e457923da2341c99d"; }
+    { locale = "pt-BR"; arch = "linux-i686"; sha256 = "4391c285e1db0767f7242fad4fbf6441572ef930acabc63209f1d2ac64e6d08c"; }
+    { locale = "pt-BR"; arch = "linux-x86_64"; sha256 = "003060a341e1134870f96e1e032023884f3f22fa62261b07084e3cb8813423fb"; }
+    { locale = "pt-PT"; arch = "linux-i686"; sha256 = "d261cbc11bd9b176b656c3ae75f802aee4f1828e14f1a9f0e8c7822e9a24c090"; }
+    { locale = "pt-PT"; arch = "linux-x86_64"; sha256 = "81fb37b9591a159e9d5ceff18921683037b4c965765b47e736c9124ba6268ee2"; }
+    { locale = "rm"; arch = "linux-i686"; sha256 = "a7d699ac74a568922a363eabaa38627564fbc715cdd3612a8f51e0c373594646"; }
+    { locale = "rm"; arch = "linux-x86_64"; sha256 = "ab9c84765f54f02e385b360025d1c70937af91350cbf8eea666f97aec4e36276"; }
+    { locale = "ro"; arch = "linux-i686"; sha256 = "00db7d515ee4abcba36713a7bac64a2afdfa1782bc3e4175ae2c69535c7b6cdf"; }
+    { locale = "ro"; arch = "linux-x86_64"; sha256 = "03da97e6c832ce49ccf6736ddac4a14b92768442f6f462b0174324964693aaa7"; }
+    { locale = "ru"; arch = "linux-i686"; sha256 = "d7d78792a83d76ce4c521674275b3b6443d0c12ad376b4ec3c34bc4edef64078"; }
+    { locale = "ru"; arch = "linux-x86_64"; sha256 = "bc4c751c5079d3863df1b0dd5717d7f5c07c031fefe798642ff3ff91e8f7512c"; }
+    { locale = "si"; arch = "linux-i686"; sha256 = "9525a7a704f262efa1ad18ab154d7f0eeec8f923f641621a38cce3be5c090cd4"; }
+    { locale = "si"; arch = "linux-x86_64"; sha256 = "2e847ce3ee90d27b7e20602844cbc1c3a9e458a7d449386e5bc8067163b6559d"; }
+    { locale = "sk"; arch = "linux-i686"; sha256 = "389e6dea7b61aced9ad491b57441963cf9c3f5f0c90a80778ccee71320a8bf53"; }
+    { locale = "sk"; arch = "linux-x86_64"; sha256 = "c36e78ce9aecaa23cf183a453e6ae817a52b84e2129f4e41fd409a61e1705c6a"; }
+    { locale = "sl"; arch = "linux-i686"; sha256 = "e8f1dd49850b2c359a66e8f79839a95d6e1a09de5cdd41a64c44315fdcea544c"; }
+    { locale = "sl"; arch = "linux-x86_64"; sha256 = "3ae2a85dadbaf99109fa971bb0c7a825d4ad3d1357f4d51bc7bb20455564ea68"; }
+    { locale = "sq"; arch = "linux-i686"; sha256 = "dd52238fbd564d49ae8f3dfcee7e608615d3e78bd99373b1bbcdf51b9e20c354"; }
+    { locale = "sq"; arch = "linux-x86_64"; sha256 = "cbeadcb1de666c42c9e5b42b2a6c1fa14f80e4c6454ea8cfc34b0ad5dd472bb8"; }
+    { locale = "sr"; arch = "linux-i686"; sha256 = "1318c997a56245b296b2f9ac004b07f87d6492448272c8978e78193fe484336b"; }
+    { locale = "sr"; arch = "linux-x86_64"; sha256 = "0898d16c990669028fbea084755221c747db48392b30b7c498770fcb5df7b328"; }
+    { locale = "sv-SE"; arch = "linux-i686"; sha256 = "50c76b8904b51a84136a1c69939e49541205ce8b804c2ce90cff196e826c275c"; }
+    { locale = "sv-SE"; arch = "linux-x86_64"; sha256 = "bf3e5c83815458726317c8415963825975500452202f240200be0fab43b1e226"; }
+    { locale = "ta-LK"; arch = "linux-i686"; sha256 = "7d62ec98b8f01b12425e7692c4966faeeeb42ea66cd6105c37742698215bde5a"; }
+    { locale = "ta-LK"; arch = "linux-x86_64"; sha256 = "416cffbe25f2b00cd584fa455768b09c5f8d1bc7938263880903050f8c08fab4"; }
+    { locale = "tr"; arch = "linux-i686"; sha256 = "581d6c8df1611d749d0dda9d1f248ebf354825f8a8097624fd08338ea5e01d38"; }
+    { locale = "tr"; arch = "linux-x86_64"; sha256 = "24b1b9bfa251add2d7f3183b0c3aafdea6b4caa5bdbcea718462185d6dc63e5b"; }
+    { locale = "uk"; arch = "linux-i686"; sha256 = "97175dba275e382b2436e9b7a948c46f137ed38612e90ea43466dd3fe20c878b"; }
+    { locale = "uk"; arch = "linux-x86_64"; sha256 = "273b08710fbc57c30828736c38a158ff66ac788b2ca3726118367466cab09797"; }
+    { locale = "vi"; arch = "linux-i686"; sha256 = "e0391fdecb11b5daac913f57894970208b51e1e7f1665ff56cb7a68dba0c442a"; }
+    { locale = "vi"; arch = "linux-x86_64"; sha256 = "af51ee3bd2ac246a4b465aa65b13d1aa661dbce5e0988524532616fb9d2d651b"; }
+    { locale = "zh-CN"; arch = "linux-i686"; sha256 = "5e7d1543d41912ffa0a71137b90c40ab5569ffab65e8b99f0b62446561a78ca2"; }
+    { locale = "zh-CN"; arch = "linux-x86_64"; sha256 = "f85c8086b462474e40b0b090f9b566aa55b228ec49ec18fa1b5987ec3efa048b"; }
+    { locale = "zh-TW"; arch = "linux-i686"; sha256 = "6f161428af67a1635364660a8ec6d7c785350204d5bac602ebcd32861e9baf62"; }
+    { locale = "zh-TW"; arch = "linux-x86_64"; sha256 = "2088379539a9b4ece3012b603a5731c92567fa4b3e5c448ae54e2729c8df0658"; }
   ];
 }

From 696052cb622b718cfe7543126b86d543ba19f43b Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 21 Feb 2016 14:59:04 +0100
Subject: [PATCH 1619/2285] pythonPackages.protobuf: fix

---
 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 17d5bb6d03a4..df742a5c84cf 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15496,7 +15496,7 @@ in modules // {
       ${python.executable} setup.py test
     '';
 
-    installFlags = optional (versionAtLeast protobuf.version "2.6.0") "--cpp_implementation";
+    installFlags = optional (versionAtLeast protobuf.version "2.6.0") "--install-option='--cpp_implementation'";
 
     doCheck = true;
 

From a3017f92d845b9313dffdd3ed1ef5dcd4808d96a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 21 Feb 2016 15:30:05 +0100
Subject: [PATCH 1620/2285] libcrossguid: init at 2016-02-21

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

diff --git a/pkgs/development/libraries/libcrossguid/default.nix b/pkgs/development/libraries/libcrossguid/default.nix
new file mode 100644
index 000000000000..cf142ac68c42
--- /dev/null
+++ b/pkgs/development/libraries/libcrossguid/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, libuuid }:
+
+stdenv.mkDerivation rec {
+  name = "lib" + pname + "-" + version;
+  pname = "crossguid";
+  version = "2016-02-21";
+
+  src = fetchFromGitHub {
+    owner = "graeme-hill";
+    repo = pname;
+    rev = "8f399e8bd4252be9952f3dfa8199924cc8487ca4";
+    sha256 = "1i29y207qqddvaxbn39pk2fbh3gx8zvdprfp35wasj9rw2wjk3s9";
+  };
+
+  buildInputs = [ libuuid ];
+
+  buildPhase = ''
+    g++ -c guid.cpp -o guid.o $CXXFLAGS -std=c++11 -DGUID_LIBUUID
+    ar rvs libcrossguid.a guid.o
+  '';
+  installPhase = ''
+    mkdir -p $out/{lib,include}
+    install -D -m644 libcrossguid.a "$out/lib/libcrossguid.a"
+    install -D -m644 guid.h "$out/include/guid.h"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Lightweight cross platform C++ GUID/UUID library";
+    license = licenses.mit;
+    maintainers = with maintainers; [ edwtjo ];
+    homepage = https://github.com/graeme-hill/crossguid;
+  };
+
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c06c35c481f0..ae201693745a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7232,6 +7232,8 @@ let
 
   libcrafter = callPackage ../development/libraries/libcrafter { };
 
+  libcrossguid = callPackage ../development/libraries/libcrossguid { };
+
   libuchardet = callPackage ../development/libraries/libuchardet { };
 
   libchop = callPackage ../development/libraries/libchop { };

From 8968a6e60476fd5160ee450e4ea7f9d69877fd8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 21 Feb 2016 15:30:50 +0100
Subject: [PATCH 1621/2285] dcadec: init at 0.2.0

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

diff --git a/pkgs/development/tools/dcadec/default.nix b/pkgs/development/tools/dcadec/default.nix
new file mode 100644
index 000000000000..ba2c13fbc3b2
--- /dev/null
+++ b/pkgs/development/tools/dcadec/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = pname + "-" + version;
+  pname = "dcadec";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "foo86";
+    repo = pname;
+    rev = "v" + version;
+    sha256 = "07nd0ajizrp1w02bsyfcv18431r8m8rq8gjfmz9wmckpg7cxj2hs";
+  };
+
+  installPhase = "make PREFIX=/ DESTDIR=$out install";
+
+  meta = with stdenv.lib; {
+    description = "DTS Coherent Acoustics decoder with support for HD extensions.";
+    maintainers = with maintainers; [ edwtjo ];
+    homepage = http://github.com/foo86/dcadec;
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ae201693745a..c6bf469169bd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5807,6 +5807,8 @@ let
 
   libsigrokdecode = callPackage ../development/tools/libsigrokdecode { };
 
+  dcadec = callPackage ../development/tools/dcadec { };
+
   dejagnu = callPackage ../development/tools/misc/dejagnu { };
 
   dfeet = callPackage ../development/tools/misc/d-feet {

From ad4bfe4dda80815c2d02016623cc48df7a5ed8ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 21 Feb 2016 15:31:41 +0100
Subject: [PATCH 1622/2285] kodi: 15.2 -> 16.0

---
 pkgs/applications/video/kodi/default.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index e1dc182ba0b9..5761a443df8a 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -15,7 +15,8 @@
 , lzo, libcdio, libmodplug, libass, libbluray
 , sqlite, mysql, nasm, gnutls, libva, wayland
 , curl, bzip2, zip, unzip, glxinfo, xdpyinfo
-, libcec, libcec_platform
+, libcec, libcec_platform, dcadec, libuuid
+, libcrossguid
 , dbus_libs ? null, dbusSupport ? true
 , udev, udevSupport ? true
 , libusb ? null, usbSupport ? false
@@ -36,18 +37,18 @@ assert pulseSupport -> libpulseaudio != null;
 assert rtmpSupport  -> rtmpdump != null;
 
 let
-  rel = "Isengard";
-  ffmpeg_2_6_4 = fetchurl {
-    url = "https://github.com/xbmc/FFmpeg/archive/2.6.4-${rel}.tar.gz";
-    sha256 = "0gsjz8sr0dqq68gcln29xhz3h35n77769h1gb0ias0apmpaad1r4";
+  rel = "Jarvis";
+  ffmpeg_2_8_6 = fetchurl {
+    url = "https://github.com/xbmc/FFmpeg/archive/2.8.6-${rel}-16.0.tar.gz";
+    sha256 = "00cvjwfpz6ladmln4yny4d4viwflrbgrid1na412g5pif70qv3dh";
   };
 in stdenv.mkDerivation rec {
     name = "kodi-" + version;
-    version = "15.2";
+    version = "16.0";
 
     src = fetchurl {
       url = "https://github.com/xbmc/xbmc/archive/${version}-${rel}.tar.gz";
-      sha256 = "043i0f1crx9glwxil4xm45z5kxpkrx316gi4ir4d3rbd5safp2nx";
+      sha256 = "0iirspvv7czf785l2lqf232dvdaj87srbn9ni97ngvnd6w9yl884";
     };
 
     buildInputs = [
@@ -68,7 +69,8 @@ in stdenv.mkDerivation rec {
       lzo libcdio libmodplug libass libbluray
       sqlite mysql.lib nasm avahi libdvdcss lame
       curl bzip2 zip unzip glxinfo xdpyinfo
-      libcec libcec_platform
+      libcec libcec_platform dcadec libuuid
+      libcrossguid
     ]
     ++ lib.optional dbusSupport dbus_libs
     ++ lib.optional udevSupport udev
@@ -85,7 +87,7 @@ in stdenv.mkDerivation rec {
         --replace 'usr/share/zoneinfo' 'etc/zoneinfo'
       substituteInPlace tools/depends/target/ffmpeg/autobuild.sh \
         --replace "/bin/bash" "${bash}/bin/bash -ex"
-      cp ${ffmpeg_2_6_4} tools/depends/target/ffmpeg/ffmpeg-2.6.4-${rel}.tar.gz
+      cp ${ffmpeg_2_8_6} tools/depends/target/ffmpeg/ffmpeg-2.8.6-${rel}-16.0.tar.gz
     '';
 
     preConfigure = ''

From 4046d3ce8dbecb74fc9da8f03d7fcd651ca94f35 Mon Sep 17 00:00:00 2001
From: devresse <adrien.devresse@epfl.ch>
Date: Fri, 19 Feb 2016 10:52:22 +0000
Subject: [PATCH 1623/2285] neuron: init at 7.4

---
 .../science/biology/neuron/default.nix        | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  6 +++
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/applications/science/biology/neuron/default.nix

diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix
new file mode 100644
index 000000000000..33f6d50d8ad8
--- /dev/null
+++ b/pkgs/applications/science/biology/neuron/default.nix
@@ -0,0 +1,38 @@
+{ stdenv 
+, fetchurl 
+, pkgconfig 
+, ncurses 
+, mpi ? null
+}:
+
+stdenv.mkDerivation rec {
+  name = "neuron-7.4";
+  buildInputs = [ stdenv pkgconfig ncurses mpi ];
+
+  src = fetchurl {
+    url = "http://www.neuron.yale.edu/ftp/neuron/versions/v7.4/nrn-7.4.tar.gz";
+    sha256 = "1rid8cmv5mca0vqkgwahm0prkwkbdvchgw2bdwvx4adkn8bbl0ql";
+  };
+
+
+  enableParallelBuilding = true;
+
+  configureFlags = [ "--without-x"
+		     "${if mpi != null then "--with-mpi" else "--without-mpi"}" ];
+
+  meta = with stdenv.lib; {
+    description = "Simulation environment for empirically-based simulations of neurons and networks of neurons";
+
+    longDescription = "NEURON is a simulation environment for developing and exercising models of 
+		neurons and networks of neurons. It is particularly well-suited to problems where 
+		cable properties of cells play an important role, possibly including extracellular 
+		potential close to the membrane), and where cell membrane properties are complex, 
+		involving many ion-specific channels, ion accumulation, and second messengers";
+
+    license     = licenses.bsd3;
+    homepage    = http://www.neuron.yale.edu/neuron;
+    maintainers = [ maintainers.adev ];
+    platforms   = platforms.all;
+  };  
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38d8bf296423..f5e6452fcc55 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15074,6 +15074,12 @@ let
 
   emboss = callPackage ../applications/science/biology/emboss { };
 
+  neuron = callPackage ../applications/science/biology/neuron { };
+
+  neuron-mpi = appendToName "mpi" (neuron.override {
+    mpi = pkgs.openmpi;
+  });
+
   mrbayes = callPackage ../applications/science/biology/mrbayes { };
 
   ncbi_tools = callPackage ../applications/science/biology/ncbi-tools { };

From 4575d58b3d414210e35468fef6ab86c423a77f67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 21 Feb 2016 16:15:13 +0100
Subject: [PATCH 1624/2285] kodiPlugins.genesis: 5.1.3 -> 5.1.4

---
 pkgs/applications/video/kodi/plugins.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 9e0f4cd2b68d..078de59bdb1c 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, fetchpatch, cmake, kodi, steam, libcec_platform, tinyxml }:
+{ stdenv, fetchurl, fetchFromGitHub, fetchpatch, cmake, kodi, steam, libcec_platform, tinyxml, unzip }:
 
 let
 
@@ -70,17 +70,15 @@ in
 
   };
 
-  genesis = mkKodiPlugin rec {
+  genesis = (mkKodiPlugin rec {
 
     plugin = "genesis";
     namespace = "plugin.video.genesis";
-    version = "5.1.3";
+    version = "5.1.4";
 
-    src = fetchFromGitHub {
-      owner = "lambda81";
-      repo = "lambda-addons";
-      rev = "f2cd04f33af88d60e1330573bbf2ef9cee7f0a56";
-      sha256 = "0z0ldckqqif9v5nhnjr5n2495cm3z9grjmrh7czl4xlnq4bvviqq";
+    src = fetchurl {
+      url = "https://offshoregit.com/lambda81/lambda-repo/${namespace}/${namespace}-${version}.zip";
+      sha256 = "0b0pdzgg42mgxgkb6sb83rldh4k19c3l9z7g2wnvxm3s2p6rjy3v";
     };
 
     meta = with stdenv.lib; {
@@ -89,8 +87,7 @@ in
       platforms = platforms.all;
       maintainers = with maintainers; [ edwtjo ];
     };
-
-  };
+  }).override { buildInputs = [ unzip ]; };
 
   urlresolver = (mkKodiPlugin rec {
 

From bc1e1c56985811d5f64032c78305b8e5492b4e8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Sun, 21 Feb 2016 16:15:54 +0100
Subject: [PATCH 1625/2285] kodiPlugins.salts: 1.0.98 -> 2.0.6

---
 pkgs/applications/video/kodi/plugins.nix | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 078de59bdb1c..34b454ddcddd 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -109,24 +109,21 @@ in
       maintainers = with maintainers; [ edwtjo ];
     };
   }).override {
-    patches = [ (fetchpatch {
-      url = https://github.com/Eldorados/script.module.urlresolver/pull/355.patch;
-      sha256 = "0q1n2sqdjqq32202s6ifh81c9a1l5a7yfkkf170dbkiajvxglz1m";
-    }) ];
+    postPatch = "sed -i -e 's,settings_file = os.path.join(addon_path,settings_file = os.path.join(profile_path,g' lib/urlresolver/common.py";
   };
 
-  salts = (mkKodiPlugin rec {
+  salts = mkKodiPlugin rec {
 
     plugin = "salts";
     namespace = "plugin.video.salts";
-    version = "1.0.98";
+    version = "2.0.6";
 
     src = fetchFromGitHub {
       name = plugin + "-" + version + ".tar.gz";
       owner = "tknorris";
       repo = plugin;
-      rev = "02cb63360ac1f60c01ec29d1da94902542f9a47a";
-      sha256 = "10cy633g383m1xy6yap46aqzyz96dh62y7c5rn5nvyw8ms18089z";
+      rev = "5100565bec5818cdcd8a891ab6a6d67b0018e070";
+      sha256 = "00nlcddmgzyi3462i12qikdryfwqzqd1i30rkp485ay16akyj0lr";
     };
 
     meta = with stdenv.lib; {
@@ -134,11 +131,6 @@ in
       description = "Stream All The Sources";
       maintainers = with maintainers; [ edwtjo ];
     };
-  }).override {
-    patches = [ (fetchpatch {
-      url = https://github.com/tknorris/salts/pull/115.patch;
-      sha256 = "157dhp049mw8lna6cg3x549jv2b9zq1vj6v94mil65q2hlw09sjd";
-    }) ];
   };
 
   svtplay = mkKodiPlugin rec {

From a6638c62a84a5208251cf40cceade9c472a47217 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sun, 21 Feb 2016 17:57:39 +0200
Subject: [PATCH 1626/2285] Revert "linux: 4.1.17 -> 4.1.18"

This reverts commit 6cdf5fe85fc0e6dd1dc9789993fc59962270374a.

This version has a crypto regression:
https://lkml.org/lkml/2016/2/19/748 which is blocking the channel update
due to a failing luksroot test: http://hydra.nixos.org/build/32159615
---
 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 f2286895f079..fbcfa17a8bc7 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.18";
+  version = "4.1.17";
   extraMeta.branch = "4.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1n838dg058knmx4n5mfqxh2ai9d3x6w9zs1apkwzm89rpisc1ijb";
+    sha256 = "084ij19vgm27ljrjabqqmlqn27p168nsm9grhr6rajid4n79h6ab";
   };
 
   kernelPatches = args.kernelPatches;

From e6d3a4e7d1e2262c0b28dac67538d253cc4e719e Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 23 Jan 2016 15:32:58 -0800
Subject: [PATCH 1627/2285] ghcjs: Remove wrapper, which seems long unused

---
 pkgs/development/compilers/ghcjs/wrapper.nix | 77 --------------------
 1 file changed, 77 deletions(-)
 delete mode 100644 pkgs/development/compilers/ghcjs/wrapper.nix

diff --git a/pkgs/development/compilers/ghcjs/wrapper.nix b/pkgs/development/compilers/ghcjs/wrapper.nix
deleted file mode 100644
index 751b7d9a7de7..000000000000
--- a/pkgs/development/compilers/ghcjs/wrapper.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{ stdenv, ghc, makeWrapper, coreutils, writeScript }:
-let
-  ghcjs = ghc;
-  packageDBFlag = "-package-db";
-
-  GHCGetPackages = writeScript "ghc-get-packages.sh" ''
-    #! ${stdenv.shell}
-    # Usage:
-    #  $1: version of GHC
-    #  $2: invocation path of GHC
-    #  $3: prefix
-    version="$1"
-    if test -z "$3"; then
-      prefix="${packageDBFlag} "
-    else
-      prefix="$3"
-    fi
-    PATH="$PATH:$2"
-    IFS=":"
-    for p in $PATH; do
-      for i in "$p/../share/ghcjs/$system-${ghcjs.version}-${ghcjs.ghc.version}"{,/lib,/ghcjs}"/package.conf.d" "$p/../lib/ghcjs-${ghc.version}_ghc-${ghc.ghc.version}/package.conf.d" ; do
-        # output takes place here
-        test -f $i/package.cache && echo -n " $prefix$i"
-      done
-    done
-  '';
-
-  GHCPackages = writeScript "ghc-packages.sh" ''
-    #! ${stdenv.shell} -e
-    declare -A GHC_PACKAGES_HASH # using bash4 hashs to get uniq paths
-
-    for arg in $(${GHCGetPackages} ${ghcjs.version} "$(dirname $0)"); do # Why is ghc.version passed in from here instead of captured in the other script directly?
-      case "$arg" in
-        ${packageDBFlag}) ;;
-        *)
-          CANONICALIZED="$(${coreutils}/bin/readlink -f -- "$arg")"
-          GHC_PACKAGES_HASH["$CANONICALIZED"]= ;;
-      esac
-    done
-
-    for path in ''${!GHC_PACKAGES_HASH[@]}; do
-      echo -n "$path:"
-    done
-  '';
-in
-stdenv.mkDerivation {
-  name = "ghcjs-ghc${ghcjs.ghc.version}-${ghcjs.version}-wrapper";
-
-  buildInputs = [makeWrapper];
-  propagatedBuildInputs = [ghcjs];
-
-  unpackPhase = "true";
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out/bin
-    for prg in ghcjs ; do
-      makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$(${GHCGetPackages} ${ghcjs.version} \"\$(dirname \$0)\")"
-    done
-    for prg in ghcjs-pkg ; do
-      makeWrapper $ghc/bin/$prg $out/bin/$prg --add-flags "\$(${GHCGetPackages} ${ghcjs.version} \"\$(dirname \$0)\" -${packageDBFlag}=)"
-    done
-
-    mkdir -p $out/nix-support
-    ln -s $out/nix-support/propagated-build-inputs $out/nix-support/propagated-user-env-packages
-
-    mkdir -p $out/share/doc
-    ln -s $ghc/lib $out/lib
-    ln -s $ghc/share/doc/ghc $out/share/doc/ghc-${ghcjs.version}
-
-    runHook postInstall
-  '';
-
-  ghc = ghcjs;
-  inherit GHCGetPackages GHCPackages;
-  inherit (ghcjs) meta version;
-}

From 114cd6765d9a1dc405af223294657b9e765a6f3d Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sun, 21 Feb 2016 10:15:04 -0800
Subject: [PATCH 1628/2285] haskell: Expose the package set used to build each
 GHC, where possible

Tested to not change hashes
---
 pkgs/development/compilers/ghc/7.10.2.nix    |  7 ++++-
 pkgs/development/compilers/ghc/7.10.3.nix    |  7 ++++-
 pkgs/development/compilers/ghc/8.0.1.nix     | 10 +++++++-
 pkgs/development/compilers/ghc/head.nix      | 11 ++++++--
 pkgs/development/compilers/ghc/nokinds.nix   |  7 ++++-
 pkgs/development/compilers/ghcjs/default.nix | 10 +++++---
 pkgs/top-level/haskell-packages.nix          | 27 ++++++++++++--------
 7 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/compilers/ghc/7.10.2.nix b/pkgs/development/compilers/ghc/7.10.2.nix
index 73fcd788c74f..87490842b3b6 100644
--- a/pkgs/development/compilers/ghc/7.10.2.nix
+++ b/pkgs/development/compilers/ghc/7.10.2.nix
@@ -1,8 +1,9 @@
-{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils
+{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
 , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour
 }:
 
 let
+  inherit (bootPkgs) ghc;
 
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
@@ -60,6 +61,10 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  passthru = {
+    inherit bootPkgs;
+  };
+
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
diff --git a/pkgs/development/compilers/ghc/7.10.3.nix b/pkgs/development/compilers/ghc/7.10.3.nix
index 88d1bec4d42b..53ba058def4d 100644
--- a/pkgs/development/compilers/ghc/7.10.3.nix
+++ b/pkgs/development/compilers/ghc/7.10.3.nix
@@ -1,8 +1,9 @@
-{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils
+{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
 , libxml2, libxslt, docbook_xsl, docbook_xml_dtd_45, docbook_xml_dtd_42, hscolour
 }:
 
 let
+  inherit (bootPkgs) ghc;
 
   docFixes = fetchurl {
     url = "https://downloads.haskell.org/~ghc/7.10.3/ghc-7.10.3a.patch";
@@ -61,6 +62,10 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  passthru = {
+    inherit bootPkgs;
+  };
+
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
diff --git a/pkgs/development/compilers/ghc/8.0.1.nix b/pkgs/development/compilers/ghc/8.0.1.nix
index d24ad4106ee4..00482d013c23 100644
--- a/pkgs/development/compilers/ghc/8.0.1.nix
+++ b/pkgs/development/compilers/ghc/8.0.1.nix
@@ -1,7 +1,11 @@
-{ stdenv, fetchurl, fetchpatch, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils
+{ stdenv, fetchurl, fetchpatch, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
 , hscolour
 }:
 
+let
+  inherit (bootPkgs) ghc;
+
+in 
 stdenv.mkDerivation rec {
   version = "8.0.0.20160204";
   name = "ghc-${version}";
@@ -51,6 +55,10 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  passthru = {
+    inherit bootPkgs;
+  };
+
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix
index 9b360b609e43..18e22f0100be 100644
--- a/pkgs/development/compilers/ghc/head.nix
+++ b/pkgs/development/compilers/ghc/head.nix
@@ -1,8 +1,11 @@
-{ stdenv, fetchgit, ghc, perl, gmp, ncurses, libiconv, binutils, coreutils
+{ stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, libiconv, binutils, coreutils
 , autoconf, automake, happy, alex
 }:
 
-stdenv.mkDerivation rec {
+let
+  inherit (bootPkgs) ghc;
+
+in stdenv.mkDerivation rec {
   version = "7.11.20151216";
   name = "ghc-${version}";
   rev = "28638dfe79e915f33d75a1b22c5adce9e2b62b97";
@@ -62,6 +65,10 @@ stdenv.mkDerivation rec {
     done
   '';
 
+  passthru = {
+    inherit bootPkgs;
+  };
+
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The Glasgow Haskell Compiler";
diff --git a/pkgs/development/compilers/ghc/nokinds.nix b/pkgs/development/compilers/ghc/nokinds.nix
index 6334759496f0..acaef9c5ab11 100644
--- a/pkgs/development/compilers/ghc/nokinds.nix
+++ b/pkgs/development/compilers/ghc/nokinds.nix
@@ -1,6 +1,7 @@
-{ stdenv, fetchgit, ghc, perl, gmp, ncurses, libiconv, autoconf, automake, happy, alex }:
+{ stdenv, fetchgit, bootPkgs, perl, gmp, ncurses, libiconv, autoconf, automake, happy, alex }:
 
 let
+  inherit (bootPkgs) ghc;
 
   buildMK = ''
     libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib"
@@ -66,6 +67,10 @@ stdenv.mkDerivation rec {
   # that in turn causes GHCi to abort
   stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!stdenv.isDarwin) "--keep-file-symbols";
 
+  passthru = {
+    inherit bootPkgs;
+  };
+
   meta = {
     homepage = "http://haskell.org/ghc";
     description = "The dependently-typed 'nokinds' branch of the Glasgow Haskell Compiler by Richard Eisenberg";
diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 81a8c90b53a7..3aca5f239192 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -20,7 +20,7 @@
 , ghcjs-prim
 , regex-posix
 
-, ghc, gmp
+, bootPkgs, gmp
 , jailbreak-cabal
 
 , runCommand
@@ -41,8 +41,11 @@
 , ghcjsBoot ? import ./ghcjs-boot.nix { inherit fetchgit runCommand; }
 , shims ? import ./shims.nix { inherit fetchFromGitHub; }
 }:
-let version = "0.2.0"; in
-mkDerivation (rec {
+let
+  inherit (bootPkgs) ghc;
+  version = "0.2.0";
+
+in mkDerivation (rec {
   pname = "ghcjs";
   inherit version;
   src = fetchFromGitHub {
@@ -114,6 +117,7 @@ mkDerivation (rec {
         --with-gmp-libraries ${gmp}/lib
   '';
   passthru = {
+    inherit bootPkgs;
     isGhcjs = true;
     nativeGhc = ghc;
     inherit nodejs ghcjsBoot;
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2d0151dc5420..2eadcbeefef3 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -34,24 +34,29 @@ rec {
     ghc784 = callPackage ../development/compilers/ghc/7.8.4.nix {
       ghc = compiler.ghc742Binary;
     };
-    ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix {
-      ghc = compiler.ghc784; inherit (packages.ghc784) hscolour;
+    ghc7102 = callPackage ../development/compilers/ghc/7.10.2.nix rec {
+      bootPkgs = packages.ghc784;
+      inherit (bootPkgs) hscolour;
     };
-    ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix {
-      ghc = compiler.ghc784; inherit (packages.ghc784) hscolour;
+    ghc7103 = callPackage ../development/compilers/ghc/7.10.3.nix rec {
+      bootPkgs = packages.ghc784;
+      inherit (bootPkgs) hscolour;
     };
-    ghc801 = callPackage ../development/compilers/ghc/8.0.1.nix {
-      ghc = compiler.ghc7103; inherit (packages.ghc7103) hscolour;
+    ghc801 = callPackage ../development/compilers/ghc/8.0.1.nix rec {
+      bootPkgs = packages.ghc7103;
+      inherit (bootPkgs) hscolour;
     };
-    ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
-      inherit (packages.ghc784) ghc alex happy;
+    ghcHEAD = callPackage ../development/compilers/ghc/head.nix rec {
+      bootPkgs = packages.ghc784;
+      inherit (bootPkgs) alex happy;
     };
-    ghcNokinds = callPackage ../development/compilers/ghc/nokinds.nix {
-      inherit (packages.ghc784) ghc alex happy;
+    ghcNokinds = callPackage ../development/compilers/ghc/nokinds.nix rec {
+      bootPkgs = packages.ghc784;
+      inherit (bootPkgs) alex happy;
     };
 
     ghcjs = packages.ghc7103.callPackage ../development/compilers/ghcjs {
-      ghc = compiler.ghc7103;
+      bootPkgs = packages.ghc7103;
     };
 
     jhc = callPackage ../development/compilers/jhc {

From 51b66ed4d918a795af55ae50de05fd0cb4b19a38 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Fri, 19 Feb 2016 08:40:33 -0800
Subject: [PATCH 1629/2285] haskell: Add notion of cross compiler and define
 nativeGhc with it

Tested to not change hashes
---
 pkgs/development/compilers/ghcjs/default.nix         | 2 +-
 pkgs/development/haskell-modules/generic-builder.nix | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 3aca5f239192..722c3eab10ae 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -118,8 +118,8 @@ in mkDerivation (rec {
   '';
   passthru = {
     inherit bootPkgs;
+    isCross = true;
     isGhcjs = true;
-    nativeGhc = ghc;
     inherit nodejs ghcjsBoot;
   };
 
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index b871b7d73faa..50efcc27fe63 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -56,8 +56,9 @@ let
   inherit (stdenv.lib) optional optionals optionalString versionOlder
                        concatStringsSep enableFeature optionalAttrs toUpper;
 
+  isCross = ghc.isCross or false;
   isGhcjs = ghc.isGhcjs or false;
-  nativeGhc = if isGhcjs then ghc.nativeGhc else ghc;
+  nativeGhc = if isCross then ghc.bootPkgs.ghc else ghc;
 
   newCabalFileUrl = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal";
   newCabalFile = fetchurl {
@@ -97,7 +98,7 @@ let
     (optionalString (isGhcjs || versionOlder "7.4" ghc.version) (enableFeature enableSharedExecutables "executable-dynamic"))
     (optionalString (isGhcjs || versionOlder "7" ghc.version) (enableFeature doCheck "tests"))
   ] ++ optionals isGhcjs [
-    "--with-hsc2hs=${ghc.nativeGhc}/bin/hsc2hs"
+    "--with-hsc2hs=${nativeGhc}/bin/hsc2hs"
     "--ghcjs"
   ];
 

From f13eede7e58d06a64bae410602ada6626af39991 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Fri, 19 Feb 2016 08:45:45 -0800
Subject: [PATCH 1630/2285] haskell: Tiny refactor in generic-builder. No
 hashes/interfaces changed.

---
 .../development/haskell-modules/generic-builder.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 50efcc27fe63..8b54a19c2b59 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -58,7 +58,15 @@ let
 
   isCross = ghc.isCross or false;
   isGhcjs = ghc.isGhcjs or false;
+  packageDbFlag = if isGhcjs || versionOlder "7.6" ghc.version
+                  then "package-db"
+                  else "package-conf";
+
   nativeGhc = if isCross then ghc.bootPkgs.ghc else ghc;
+  nativeIsCross = nativeGhc.isCross or false;
+  nativePackageDbFlag = if versionOlder "7.6" nativeGhc.version
+                        then "package-db"
+                        else "package-conf";
 
   newCabalFileUrl = "http://hackage.haskell.org/package/${pname}-${version}/revision/${revision}.cabal";
   newCabalFile = fetchurl {
@@ -72,9 +80,6 @@ let
                      main = defaultMain
                    '';
 
-  ghc76xOrLater = isGhcjs || stdenv.lib.versionOlder "7.6" ghc.version;
-  packageDbFlag = if ghc76xOrLater then "package-db" else "package-conf";
-
   hasActiveLibrary = isLibrary && (enableStaticLibraries || enableSharedLibraries || enableLibraryProfiling);
 
   # We cannot enable -j<n> parallelism for libraries because GHC is far more
@@ -126,7 +131,7 @@ let
 
   ghcEnv = ghc.withPackages (p: haskellBuildInputs);
 
-  setupBuilder = if isGhcjs then "${nativeGhc}/bin/ghc" else ghcCommand;
+  setupBuilder = if isCross then "${nativeGhc}/bin/ghc" else ghcCommand;
   setupCommand = "./Setup";
   ghcCommand = if isGhcjs then "ghcjs" else "ghc";
   ghcCommandCaps = toUpper ghcCommand;

From f0b072abaa64b0d3d4f66a7f69b6798ccfdb2f9e Mon Sep 17 00:00:00 2001
From: Eugene Akentyev <ak3ntev@gmail.com>
Date: Sun, 21 Feb 2016 21:34:30 +0300
Subject: [PATCH 1631/2285] staruml: init at 2.6.0

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

diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix
new file mode 100644
index 000000000000..4c60e790238e
--- /dev/null
+++ b/pkgs/tools/misc/staruml/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, makeWrapper, dpkg, patchelf, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, udev }:
+
+stdenv.mkDerivation rec {
+  version = "2.6.0";
+  name = "staruml-${version}";
+
+  src =
+    if stdenv.system == "i686-linux" then fetchurl {
+      url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-32-bit.deb";
+      sha256 = "684d7ce7827a98af5bf17bf68d18f934fd970f13a2112a121b1f1f76d6387849";
+    } else fetchurl {
+      url = "http://staruml.io/download/release/v${version}/StarUML-v${version}-64-bit.deb";
+      sha256 = "36e0bdc1bb57b7d808a007a3fafb1b38662d5b0793424d5ad4f51a3a6a9a636d";
+    };
+
+  buildInputs = [ dpkg ];
+
+  nativeBuildInputs = [ makeWrapper ];
+  
+  unpackPhase = ''
+    mkdir pkg
+    dpkg-deb -x $src pkg
+    sourceRoot=pkg
+  '';
+  
+  installPhase = ''
+    mkdir $out
+    mv opt/staruml $out/bin
+
+    ${patchelf}/bin/patchelf \
+      --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+      $out/bin/StarUML
+    
+    mkdir -p $out/lib
+    
+    ln -s ${stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/
+    ln -s ${udev}/lib/libudev.so.1 $out/lib/libudev.so.0
+
+    wrapProgram $out/bin/StarUML \
+      --prefix LD_LIBRARY_PATH : $out/lib:${glib}/lib:${gtk2}/lib:${gdk_pixbuf}/lib/:${alsaLib}/lib/:${nss}/lib/:${nspr}/lib/:${GConf}/lib/:${cups}/lib/:${libgcrypt}/lib/:${dbus}/lib/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A sophisticated software modeler";
+    homepage = http://staruml.io/;
+    license = licenses.unfree;
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e016152a5c1..476bdb0b9de5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3316,6 +3316,8 @@ let
 
   stricat = callPackage ../tools/security/stricat { };
 
+  staruml = callPackage ../tools/misc/staruml { inherit (gnome) GConf; libgcrypt = libgcrypt_1_5; };
+  
   privoxy = callPackage ../tools/networking/privoxy {
     w3m = w3m-batch;
   };

From 17ad5ab0a9bde13c3e97f5be050f32d7c8dd503e Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 21 Feb 2016 18:22:59 +0000
Subject: [PATCH 1632/2285] gist: 4.4.2 -> 4.5.0

Fixes #13158
---
 pkgs/tools/text/gist/Gemfile      |  2 --
 pkgs/tools/text/gist/Gemfile.lock | 10 ----------
 pkgs/tools/text/gist/default.nix  | 30 +++++++++++++++++++++---------
 pkgs/tools/text/gist/gemset.nix   |  9 ---------
 4 files changed, 21 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/tools/text/gist/Gemfile
 delete mode 100644 pkgs/tools/text/gist/Gemfile.lock
 delete mode 100644 pkgs/tools/text/gist/gemset.nix

diff --git a/pkgs/tools/text/gist/Gemfile b/pkgs/tools/text/gist/Gemfile
deleted file mode 100644
index 18500f898f1c..000000000000
--- a/pkgs/tools/text/gist/Gemfile
+++ /dev/null
@@ -1,2 +0,0 @@
-source "https://rubygems.org"
-gem "gist"
diff --git a/pkgs/tools/text/gist/Gemfile.lock b/pkgs/tools/text/gist/Gemfile.lock
deleted file mode 100644
index 7414da072ada..000000000000
--- a/pkgs/tools/text/gist/Gemfile.lock
+++ /dev/null
@@ -1,10 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    gist (4.4.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  gist
diff --git a/pkgs/tools/text/gist/default.nix b/pkgs/tools/text/gist/default.nix
index 223ba59eecbe..ca9de0590ca2 100644
--- a/pkgs/tools/text/gist/default.nix
+++ b/pkgs/tools/text/gist/default.nix
@@ -1,15 +1,27 @@
-{ stdenv, lib, bundlerEnv }:
+{ buildRubyGem, lib, ruby, makeWrapper }:
+
+buildRubyGem rec {
+  inherit ruby;
+  name = "${gemName}-${version}";
+  gemName = "gist";
+  version = "4.5.0";
+  sha256 = "0k9bgjdmnr14whmjx6c8d5ak1dpazirj96hk5ds69rl5d9issw0l";
+
+  buildInputs = [ makeWrapper ];
+
+  postInstall = ''
+    # Fix the default ruby wrapper
+    makeWrapper $out/${ruby.gemPath}/bin/gist $out/bin/gist \
+      --set GEM_PATH $out/${ruby.gemPath}:${ruby}/${ruby.gemPath}
+  '';
+
+  dontStrip = true;
 
-let version = "4.4.2";
-in bundlerEnv {
-  name = "gist-${version}";
-  gemfile = ./Gemfile;
-  lockfile = ./Gemfile.lock;
-  gemset = ./gemset.nix;
   meta = with lib; {
-    homepage = "http://defunkt.io/gist/";
     description = "upload code to https://gist.github.com (or github enterprise)";
-    platforms = platforms.all;
+    homepage = "http://defunkt.io/gist/";
     license = licenses.mit;
+    maintainers = with maintainers; [ zimbatm ];
+    platforms = ruby.meta.platforms;
   };
 }
diff --git a/pkgs/tools/text/gist/gemset.nix b/pkgs/tools/text/gist/gemset.nix
deleted file mode 100644
index 961f96dcb97f..000000000000
--- a/pkgs/tools/text/gist/gemset.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "gist" = {
-    version = "4.4.2";
-    source = {
-      type = "gem";
-      sha256 = "0lr4rywpm549llk0ypdpb3sjdpqw9snzwzqc3dggg8qn5wj69k81";
-    };
-  };
-}
\ No newline at end of file

From 5d8c4443f1827e8ba0d86885a13215251e55c69b Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 21 Feb 2016 20:24:07 +0100
Subject: [PATCH 1633/2285] ddclient: add meta.platforms

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

diff --git a/pkgs/tools/networking/ddclient/default.nix b/pkgs/tools/networking/ddclient/default.nix
index 1664fbf37077..53a0f4c3e6dd 100644
--- a/pkgs/tools/networking/ddclient/default.nix
+++ b/pkgs/tools/networking/ddclient/default.nix
@@ -32,5 +32,8 @@ buildPerlPackage rec {
     homepage = https://sourceforge.net/p/ddclient/wiki/Home/;
     description = "Client for updating dynamic DNS service entries";
     license = licenses.gpl2Plus;
+
+    # Mostly since `iproute` is Linux only.
+    platforms = platforms.linux;
   };
 }

From 7d6f2c4e3f84daa2ec3f5d971918f0f34d556f1f Mon Sep 17 00:00:00 2001
From: Michael Hoy <mjh@mjhoy.com>
Date: Sun, 21 Feb 2016 13:41:02 -0600
Subject: [PATCH 1634/2285] mdk: init at 1.2.9

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

diff --git a/pkgs/development/tools/mdk/default.nix b/pkgs/development/tools/mdk/default.nix
new file mode 100644
index 000000000000..f54b409efb6d
--- /dev/null
+++ b/pkgs/development/tools/mdk/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, intltool, pkgconfig, glib }:
+
+stdenv.mkDerivation {
+  name = "gnu-mdk-1.2.9";
+  src = fetchurl {
+    url = http://ftp.gnu.org/gnu/mdk/v1.2.9/mdk-1.2.9.tar.gz;
+    md5 = "08c96baa4b99dd9d25190dd15fe415a5";
+  };
+  buildInputs = [ intltool pkgconfig glib ];
+  postInstall = ''
+    mkdir -p $out/share/emacs/site-lisp/
+    cp -v ./misc/*.el $out/share/emacs/site-lisp
+  '';
+
+  meta = {
+    description = "GNU MIX Development Kit (MDK)";
+    homepage = https://www.gnu.org/software/mdk/;
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e016152a5c1..2871a261b0f9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2344,6 +2344,8 @@ let
     inherit (gnome) scrollkeeper;
   };
 
+  mdk = callPackage ../development/tools/mdk { };
+
   mdp = callPackage ../applications/misc/mdp { };
 
   mednafen = callPackage ../misc/emulators/mednafen { };

From b58e26dbf6ada6a424e958c69da049b1af8e84e7 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 2 Aug 2015 01:11:17 +0100
Subject: [PATCH 1635/2285] cide: init at 0.8.1

---
 .../tools/continuous-integration/cide/Gemfile |   6 +
 .../continuous-integration/cide/Gemfile.lock  |  40 +++++++
 .../continuous-integration/cide/default.nix   |  32 ++++++
 .../continuous-integration/cide/gemset.nix    | 103 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 5 files changed, 183 insertions(+)
 create mode 100644 pkgs/development/tools/continuous-integration/cide/Gemfile
 create mode 100644 pkgs/development/tools/continuous-integration/cide/Gemfile.lock
 create mode 100644 pkgs/development/tools/continuous-integration/cide/default.nix
 create mode 100644 pkgs/development/tools/continuous-integration/cide/gemset.nix

diff --git a/pkgs/development/tools/continuous-integration/cide/Gemfile b/pkgs/development/tools/continuous-integration/cide/Gemfile
new file mode 100644
index 000000000000..7e72ac0529d6
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/cide/Gemfile
@@ -0,0 +1,6 @@
+source "https://rubygems.org"
+
+gem 'cide'
+
+# Optional dependency, only used by `cide upload`
+gem 'aws-sdk', '~> 2'
diff --git a/pkgs/development/tools/continuous-integration/cide/Gemfile.lock b/pkgs/development/tools/continuous-integration/cide/Gemfile.lock
new file mode 100644
index 000000000000..7db1b9db9b37
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/cide/Gemfile.lock
@@ -0,0 +1,40 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    aws-sdk (2.2.17)
+      aws-sdk-resources (= 2.2.17)
+    aws-sdk-core (2.2.17)
+      jmespath (~> 1.0)
+    aws-sdk-resources (2.2.17)
+      aws-sdk-core (= 2.2.17)
+    axiom-types (0.1.1)
+      descendants_tracker (~> 0.0.4)
+      ice_nine (~> 0.11.0)
+      thread_safe (~> 0.3, >= 0.3.1)
+    cide (0.8.1)
+      thor (~> 0.19)
+      virtus (~> 1.0)
+    coercible (1.0.0)
+      descendants_tracker (~> 0.0.1)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    equalizer (0.0.11)
+    ice_nine (0.11.2)
+    jmespath (1.1.3)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    virtus (1.0.5)
+      axiom-types (~> 0.1)
+      coercible (~> 1.0)
+      descendants_tracker (~> 0.0, >= 0.0.3)
+      equalizer (~> 0.0, >= 0.0.9)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  aws-sdk (~> 2)
+  cide
+
+BUNDLED WITH
+   1.10.6
diff --git a/pkgs/development/tools/continuous-integration/cide/default.nix b/pkgs/development/tools/continuous-integration/cide/default.nix
new file mode 100644
index 000000000000..1dc8f8def337
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/cide/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, lib, bundlerEnv, makeWrapper, docker }:
+
+stdenv.mkDerivation rec {
+  name = "cide-${version}";
+  version = "0.8.1";
+
+  env = bundlerEnv {
+    name = "${name}-gems";
+
+    gemfile = ./Gemfile;
+    lockfile = ./Gemfile.lock;
+    gemset = ./gemset.nix;
+  };
+
+  phases = ["installPhase"];
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    makeWrapper ${env}/bin/cide $out/bin/cide \
+      --set PATH ${docker}/bin
+  '';
+
+  meta = with lib; {
+    description = "Isolated test runner with Docker";
+    homepage    = http://zimbatm.github.io/cide/;
+    license     = licenses.mit;
+    maintainers = with maintainers; [ zimbatm ];
+    platforms   = docker.meta.platforms;
+  };
+}
diff --git a/pkgs/development/tools/continuous-integration/cide/gemset.nix b/pkgs/development/tools/continuous-integration/cide/gemset.nix
new file mode 100644
index 000000000000..2d5df24bb450
--- /dev/null
+++ b/pkgs/development/tools/continuous-integration/cide/gemset.nix
@@ -0,0 +1,103 @@
+{
+  virtus = {
+    dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"];
+    source = {
+      sha256 = "06iphwi3c4f7y9i2rvhvaizfswqbaflilziz4dxqngrdysgkn1fk";
+      type = "gem";
+    };
+    version = "1.0.5";
+  };
+  thread_safe = {
+    source = {
+      sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr";
+      type = "gem";
+    };
+    version = "0.3.5";
+  };
+  thor = {
+    source = {
+      sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
+      type = "gem";
+    };
+    version = "0.19.1";
+  };
+  jmespath = {
+    version = "1.1.3";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vpvd61kc60f98jn28kw7x7vi82qrwgglam42nvzh98i43yxwsfb";
+    };
+  };
+  ice_nine = {
+    version = "0.11.2";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x";
+    };
+  };
+  equalizer = {
+    source = {
+      sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4";
+      type = "gem";
+    };
+    version = "0.0.11";
+  };
+  descendants_tracker = {
+    dependencies = ["thread_safe"];
+    source = {
+      sha256 = "15q8g3fcqyb41qixn6cky0k3p86291y7xsh1jfd851dvrza1vi79";
+      type = "gem";
+    };
+    version = "0.0.4";
+  };
+  coercible = {
+    dependencies = ["descendants_tracker"];
+    source = {
+      sha256 = "1p5azydlsz0nkxmcq0i1gzmcfq02lgxc4as7wmf47j1c6ljav0ah";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  cide = {
+    version = "0.8.1";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vsa7smab5dj6mcf0csl9wm18x95h6yphm7x18is53bv5hrzgill";
+    };
+  };
+  axiom-types = {
+    dependencies = ["descendants_tracker" "ice_nine" "thread_safe"];
+    source = {
+      sha256 = "10q3k04pll041mkgy0m5fn2b1lazm6ly1drdbcczl5p57lzi3zy1";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  aws-sdk-resources = {
+    version = "2.2.17";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vdnpjmil99n9d1fpk1w6ssgvmzx4wfmrqcij8nyd0iqdaacx3fj";
+    };
+  };
+  aws-sdk-core = {
+    version = "2.2.17";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vq7ny5n3rdfzkdqdm76r48slmp2a5v7565llrl4bw5hb5k4p75z";
+    };
+  };
+  aws-sdk = {
+    version = "2.2.17";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1cwycrdk21blzjzf8fj1wlmdix94rj9aixj6phx6lwbqykn2dzx9";
+    };
+  };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2e016152a5c1..4a3ea879016d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5754,6 +5754,8 @@ let
 
   chruby = callPackage ../development/tools/misc/chruby { rubies = null; };
 
+  cide = callPackage ../development/tools/continuous-integration/cide { };
+
   "cl-launch" = callPackage ../development/tools/misc/cl-launch {};
 
   coan = callPackage ../development/tools/analysis/coan { };

From 6908e75441f5b34dc923a66a8dfbdde0cb7ed9ec Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 21 Feb 2016 22:28:04 +0000
Subject: [PATCH 1636/2285] curl: fixes installation of 7.15

It was trying to install /etc/ssl/cert/ca-certificates.pem

See https://hydra.nixos.org/build/32167398/nixlog/1
---
 pkgs/tools/networking/curl/7.15.nix                |  2 ++
 .../tools/networking/curl/disable-ca-install.patch | 14 ++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/tools/networking/curl/disable-ca-install.patch

diff --git a/pkgs/tools/networking/curl/7.15.nix b/pkgs/tools/networking/curl/7.15.nix
index 1e91d6bd0883..356c9b4f32d2 100644
--- a/pkgs/tools/networking/curl/7.15.nix
+++ b/pkgs/tools/networking/curl/7.15.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
     sha256 = "061bgjm6rv0l9804vmm4jvr023l52qvmy9qq4zjv4lgqhlljvhz3";
   };
 
+  patches = [ ./disable-ca-install.patch ];
+
   # Zlib and OpenSSL must be propagated because `libcurl.la' contains
   # "-lz -lssl", which aren't necessary direct build inputs of
   # applications that use Curl.
diff --git a/pkgs/tools/networking/curl/disable-ca-install.patch b/pkgs/tools/networking/curl/disable-ca-install.patch
new file mode 100644
index 000000000000..aedf8ef5c3e2
--- /dev/null
+++ b/pkgs/tools/networking/curl/disable-ca-install.patch
@@ -0,0 +1,14 @@
+--- a/lib/Makefile.in
++++ b/lib/Makefile.in
+@@ -106,10 +106,7 @@ else
+ endif
+ 
+ install-data-hook:
+-	@if test -n "@CURL_CA_BUNDLE@"; then \
+-	  $(mkinstalldirs) `dirname $(DESTDIR)@CURL_CA_BUNDLE@`; \
+-	  @INSTALL_DATA@ $(srcdir)/ca-bundle.crt $(DESTDIR)@CURL_CA_BUNDLE@; \
+-        fi
++	echo "install-data-hook disabled"
+ 
+ # this hook is mainly for non-unix systems to build even if configure
+ # isn't run

From 8765e9b3bc7e102ac8be7464fbdfdaf971315b94 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 21 Feb 2016 20:42:26 -0600
Subject: [PATCH 1637/2285] melpaPackages 2016-02-21

---
 .../editors/emacs-modes/melpa-generated.nix   | 8719 +++++++++--------
 1 file changed, 4713 insertions(+), 4006 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-generated.nix
index b8128ddfe8a6..138c53dfe9a2 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/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/0blayout";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/0blayout";
           sha256 = "027k85h34998i8vmbg2hi4q1m4f7jfva5jm38k0g9m1db700gk92";
           name = "_0blayout";
         };
@@ -30,7 +30,7 @@
           sha256 = "1p9qn9n8mfb4z62h1s94mlg0vshpzafbhsxgzvx78sqlf6bfc80l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/2048-game";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/2048-game";
           sha256 = "0z7x9bnyi3qlq7l0fskb61i6yr9gm7w7wplqd28wz8p1j5yw8aa0";
           name = "_2048-game";
         };
@@ -51,7 +51,7 @@
           sha256 = "1fybicg46fc5jjqv7g2d3dnj1x9n58m2fg9x6qxn9l8qlzk9yxkq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/4clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/4clojure";
           sha256 = "1w9zxy6jwiln28cmdgkbbdfk3pdscqlfahrqi6lbgpjvkw9z44mb";
           name = "_4clojure";
         };
@@ -72,7 +72,7 @@
           sha256 = "1h4gwp2gyd4jhbkb8ai1zbzhhmlhmihbwzr0wsxg5yq074n72ifs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/abc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/abc-mode";
           sha256 = "0qf5lbszyscmagiqhc0d05vzkhdky7ini4w33z1h3j5417sscrcx";
           name = "abc-mode";
         };
@@ -93,7 +93,7 @@
           sha256 = "09hy7rj27h7xbvasd87146di4vhpg5cmqc9f39fy0ihmv9gy56za";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/abl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/abl-mode";
           sha256 = "0h25lc87pa8irgxflnmnmkr9dcv4kz841nfc45fcz4awrn75kkzb";
           name = "abl-mode";
         };
@@ -114,7 +114,7 @@
           sha256 = "1zifkqkxb0wzddfcapm71g3k52fn36ink779imyncg72plg216g0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/abyss-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/abyss-theme";
           sha256 = "0ckrgfd7fjls6g510v8fqpkd0fd18lr0spg3lf5s88gky8ihdg6c";
           name = "abyss-theme";
         };
@@ -135,7 +135,7 @@
           sha256 = "19msfx3f3px1maj41bzh139s6sv2pjk9vm3bphn7758fqhzyin0f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-alchemist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-alchemist";
           sha256 = "02ll3hcixgdb8zyszn78714gy1h2q0vkhpbnwap9302mr2racwl0";
           name = "ac-alchemist";
         };
@@ -148,15 +148,15 @@
     ac-anaconda = callPackage ({ anaconda-mode, auto-complete, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ac-anaconda";
-        version = "20150912.308";
+        version = "20160221.1323";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "ac-anaconda";
-          rev = "d0dec5c026235f65f9fd6594540df8886ed1b6a8";
-          sha256 = "0vrd6g9cl02jjxrjxpshq4pd748b5xszhpmakywrw8s08nh8jf44";
+          rev = "e42b68f648a4179c76b56b7ff03d25a6e482f38c";
+          sha256 = "092m8y38h4irh2ig6n6510gw2scjjxah37zim6mk92jzn1xv06d0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-anaconda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-anaconda";
           sha256 = "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf";
           name = "ac-anaconda";
         };
@@ -177,7 +177,7 @@
           sha256 = "1z6rj15p5gjv0jwnnck8789n9csf1pwxfvsz37graihgfy2khj0y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-c-headers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-c-headers";
           sha256 = "1cq5rz2w79bj185va7y13x7bciihrpsvyxwk6msmcxb4g86s9phv";
           name = "ac-c-headers";
         };
@@ -198,7 +198,7 @@
           sha256 = "1llpnb9vy612sg214i76rxnzcl3qx8pqnixczc5pik9kd3fdaz5f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-cake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-cake";
           sha256 = "0s2pgf0m98ixgadsnn201vm5gnawanpvxv56sf599f33krqnxzkl";
           name = "ac-cake";
         };
@@ -219,7 +219,7 @@
           sha256 = "0mlmhdl9s28z981y8bnpj8jpfzm6bgfiyl0zmpgvhyqw1wzqywwv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-cake2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-cake2";
           sha256 = "0qxilldx23wqf8ilif2nin119bvd0l7b6f6wifixx28a6kl1vsgy";
           name = "ac-cake2";
         };
@@ -240,7 +240,7 @@
           sha256 = "0nyq34yq4jcp3p30ygma3iz1h0q551p33792byj76pa5ps09g1da";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-capf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-capf";
           sha256 = "1drgk5iz2wp3rxzd39pj0n4cfmm5z8zqlp50jw5z7ffbbg35qxbm";
           name = "ac-capf";
         };
@@ -261,7 +261,7 @@
           sha256 = "1k4zk27zvxmcffwwg0zx19rcy2ysd65nnrifwspdw699glpwx2l5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-cider";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-cider";
           sha256 = "1dszpb706h34miq2bxqyq1ycbran5ax36vcniwp8vvhgcjsw5sz6";
           name = "ac-cider";
         };
@@ -282,7 +282,7 @@
           sha256 = "0n9zagwh3rz7b76irj4ya8wskffns9v1c1pivsdqgpd76spvl7n5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-clang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-clang";
           sha256 = "070s06xhkzaqfc3j8c4i44rks6gn8z66lwd54j17p8d91x3qjpr4";
           name = "ac-clang";
         };
@@ -300,7 +300,7 @@
           sha256 = "0q0lbhdng5s5hqa342yyvg02hf2bfbwq513lj1rlaqz4ykvpd7fh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-dabbrev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-dabbrev";
           sha256 = "03lndw7y55bzz4rckl80j0kh66qa82xxxhfakzs1dh1h9f1f0azh";
           name = "ac-dabbrev";
         };
@@ -321,7 +321,7 @@
           sha256 = "1dydjkilvyzxl7wwy3afmn1cjf8jv0385im4nhn8c3xr8iiil7yv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-dcd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-dcd";
           sha256 = "086jp9c6bilc361n1hscza3pbhgvqlq944z7cil2jm1kicsf8s7r";
           name = "ac-dcd";
         };
@@ -342,7 +342,7 @@
           sha256 = "1lkhqmfkjga7qi4r1m7mjax3pyf9m6minsn57cbzm2z2kvkhq22g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-emmet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-emmet";
           sha256 = "09ycjllfpdgqaf5iis5bkkhal1vxvl3qkxrn2759p67s97c49f3x";
           name = "ac-emmet";
         };
@@ -363,7 +363,7 @@
           sha256 = "19981mzxnqqdb8dsdizy2i8byb8sx9138x3nrvi6ap2qbcsabjmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-emoji";
           sha256 = "0msh3dh89jzk6hxva34gp9d5pazchgdknxjbi72z26rss9bkp1mw";
           name = "ac-emoji";
         };
@@ -384,7 +384,7 @@
           sha256 = "140i02b2ipyfmki945l1xd1nsqdpganhmi3bmwj1h9w8cg078bd4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-etags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-etags";
           sha256 = "0ag49k9izrs4ikzac9lifvvwhcn5n89lr2vb20pngsvg1czdyhzb";
           name = "ac-etags";
         };
@@ -405,7 +405,7 @@
           sha256 = "02ifz25rq64z0ifxs52aqdz0iz4mi6xvj88hcn3aakkmsj749vvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-geiser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-geiser";
           sha256 = "0v558qz1mp8b1bgk8kgdk5sx5mpd353mw77n5b0pw4b2ikzpz2mx";
           name = "ac-geiser";
         };
@@ -426,7 +426,7 @@
           sha256 = "0m33v9iy3y37sicfmpx7kvmn8v1a8k6cs7d0v9v5k93p4d5ila41";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-haskell-process";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-haskell-process";
           sha256 = "0kv4z850kv03wiax1flnrp6sgqja25j23l719w7rkr7ck110q8rw";
           name = "ac-haskell-process";
         };
@@ -447,7 +447,7 @@
           sha256 = "1ycchpiiavxw8n08gra0bsp9pxp6ln8cgjrkz9jjq7i6ixi8f9d6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-helm";
           sha256 = "16ajxlhcah5zbvywpc6l4l1arr308gjpgvdx6l1nrv2zvpckhlwq";
           name = "ac-helm";
         };
@@ -468,7 +468,7 @@
           sha256 = "1sip87j4wvlf9pfnpr0zyyhys1dd9smh6hy3zs08ihbdh98krgs5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-html";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-html";
           sha256 = "0qf8f75b6dvy844dq8vh8d9c6k599rh1ynjcif9bwvdpf6pxwvqa";
           name = "ac-html";
         };
@@ -489,7 +489,7 @@
           sha256 = "1v3ia439h4n2i204n0sazzbwwm0l5k6j31gq58iv2rqrq2ysikny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-html-angular";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-html-angular";
           sha256 = "05rbxf5kbr4jlskrhvfvhf82qvb55zl5cb6z1ymfh9l3h9j9xk3s";
           name = "ac-html-angular";
         };
@@ -510,7 +510,7 @@
           sha256 = "0v33p6lnsq1nwyxfbgs6vg6fidfyqwxd5wls2yza95yxzl30m9r7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-html-bootstrap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-html-bootstrap";
           sha256 = "0z71m6xws0k9smhsswaivpikr64mv0wh6klnmi5cwhwcqas6kdi1";
           name = "ac-html-bootstrap";
         };
@@ -531,7 +531,7 @@
           sha256 = "0swbw62zh5rjjf73pvmp8brrrmk6bp061k793z4z83v7ic0cicrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-html-csswatcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-html-csswatcher";
           sha256 = "0jb9dnm2lxadrxssf0rjqw8yvvskcq4hys8c21shjyj3gkvwbfqn";
           name = "ac-html-csswatcher";
         };
@@ -552,7 +552,7 @@
           sha256 = "0xdqk0qr1mmm5q3049ldwlmrcfgz6rzk4yxc8qgz6kll27kciia0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-inf-ruby";
           sha256 = "04jclf0yxz78x1fsaf5sh1p466947nqrcx337kyhqn0nkj3hplqr";
           name = "ac-inf-ruby";
         };
@@ -573,7 +573,7 @@
           sha256 = "1cq73bdv3lkn8v3nx6aznygqaac9s5i7pvirl8wz9ib31hsgwpbk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-ispell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-ispell";
           sha256 = "1vsy2qjh60n5lavivpqhhcpg5pk8zz2r0wy1sb65capn841zdi67";
           name = "ac-ispell";
         };
@@ -594,7 +594,7 @@
           sha256 = "0yn9333rjs2pzb1wk1japclsqagdcl28j0yjl3q5b70g5gi5vx7k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-js2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-js2";
           sha256 = "0gcr0xdi89nj3854v2z3nndfgazmcdzmd6wdndl0i4s7pdfl96fa";
           name = "ac-js2";
         };
@@ -615,7 +615,7 @@
           sha256 = "0p5cdaw9v8jgnmjqpb95bxy4khwbdgg19wzg8jkr2j2p55dpfbd6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-math";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-math";
           sha256 = "1gx35m0wv60cfgm87y2c7vrpwdsqjzk9bz4pp9dbs8dhxvji0ay4";
           name = "ac-math";
         };
@@ -636,7 +636,7 @@
           sha256 = "19cb8kq8gmrplkxil22ahvbyq5cng1l2vh2lrfiyqpjsap7zfjz5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-mozc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-mozc";
           sha256 = "1v3iiid8cq50i076q98ycks9m827xzncgxqwqs2rqhab0ncy3h0f";
           name = "ac-mozc";
         };
@@ -657,7 +657,7 @@
           sha256 = "16bg2zg08223x7q54rmfjziaccgm64h9vc8z59sjljkw1bgx9m7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-octave";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-octave";
           sha256 = "1g5s4dk1rcgkjn17jfw6g201pw0vfhqcx1nhigmnizpnzy0man9z";
           name = "ac-octave";
         };
@@ -678,7 +678,7 @@
           sha256 = "013j8iv62jiq3pbammh3ia6dcf9dm28w938nkh7hljh1c26hg4hp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-php";
           sha256 = "0p9qq8nszp5jb71s35cxnmcxp50b62y2jv1ha7vvqfz5p8miallk";
           name = "ac-php";
         };
@@ -710,7 +710,7 @@
           sha256 = "0g7xbfsfqpmcay56y8xbmif52ccz430s3rjxf5bgl9ahkk7zgkzl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-racer";
           sha256 = "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp";
           name = "ac-racer";
         };
@@ -731,7 +731,7 @@
           sha256 = "1nvz0jfz4x99xc5ywspl8fdpyqns5zd0j7i4bwzlwplmy3qakjwm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-skk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-skk";
           sha256 = "0iycyfgv8v15ygngvyx66m3w3sv8p9h6q6j1hbpzwd8azl8fzj5z";
           name = "ac-skk";
         };
@@ -752,7 +752,7 @@
           sha256 = "13yghv7p6c91fn8mrxbwrb6ldk5n3b6nj6a7pwsvks1q73i1pl88";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-slime";
           sha256 = "0mk3k1lcbqa16xvsbgk28x09vzqyaidqaqpq934xdbrwhdgwgckg";
           name = "ac-slime";
         };
@@ -773,7 +773,7 @@
           sha256 = "0mif35chyj4ai1bj4gq8qi38dyfsp72yi1xchhzy9zi2plpvqa7a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-sly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-sly";
           sha256 = "1ng81b5f8w2s9mm9s7h5kwyx8fdwndnlsbzx50slmqyaz2ad15mx";
           name = "ac-sly";
         };
@@ -794,7 +794,7 @@
           sha256 = "1msj0dbzfan0jax5wh5rmv4l7cp5zhrp5wy5k1n9s7xdgz2dprzj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-flyspell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-flyspell";
           sha256 = "0f24qrpcvyg7h6ylyggn4zrbydci537iigshac1d8yywsr0j47gd";
           name = "ace-flyspell";
         };
@@ -815,7 +815,7 @@
           sha256 = "02i3gxk7kfv3a0pcc82z69hgvjw8bvn40y8h7d59chg8bixcwbyr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-isearch";
           sha256 = "0n8qf08z9n8c2sp5ks29nxcfks5mil1jj6wq348apda8safk36hm";
           name = "ace-isearch";
         };
@@ -825,22 +825,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ace-jump-buffer = callPackage ({ ace-jump-mode, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ace-jump-buffer = callPackage ({ avy, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-jump-buffer";
-        version = "20150215.34";
+        version = "20160219.1756";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "ace-jump-buffer";
-          rev = "9299ebd4bbbf6ba78dcb40440b3aadd7b540375c";
-          sha256 = "11c9jfrh9mzi0qwbvgcjia6s1gkwb76ssiraka3f4k7rc8dli11y";
+          rev = "d652091416bbe01d1a839809976b8fd6b8eddf32";
+          sha256 = "154p332ikyc06hl0paqjyq3hzmf1afv9mwspx6333frsif0g0bds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-jump-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-jump-buffer";
           sha256 = "0hkxa0ps0v1hwmjafqbnyr6rc4s0w95igk8y3w53asl7f5sj5mpi";
           name = "ace-jump-buffer";
         };
-        packageRequires = [ ace-jump-mode dash ];
+        packageRequires = [ avy dash ];
         meta = {
           homepage = "http://melpa.org/#/ace-jump-buffer";
           license = lib.licenses.free;
@@ -849,15 +849,15 @@
     ace-jump-helm-line = callPackage ({ avy, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-jump-helm-line";
-        version = "20151113.1300";
+        version = "20160220.136";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "ace-jump-helm-line";
-          rev = "8400dbdd93d0442493f74f4030b09bbfac2d5700";
-          sha256 = "0yfhny921krpl9j8x7xflj8jzbrj8fkabc8373b8q5hyz20d332k";
+          rev = "cda9ef9c8d5efdcd027600fe0628b990e32d698f";
+          sha256 = "0qd49jbm4rlkv6idjfhfyhifmjlqfag0n06rm7wmyhbzg11lfynf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-jump-helm-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-jump-helm-line";
           sha256 = "04q8wh6jskvbiq6y2xsp2ir23vgz5zw09rm127sgiqrmn0jc61b9";
           name = "ace-jump-helm-line";
         };
@@ -878,7 +878,7 @@
           sha256 = "17axrgd99glnl6ma4ls3k01ysdqmiqr581wnrbsn3s4gp53mm2x6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-jump-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-jump-mode";
           sha256 = "0yk0kppjyblr5wamncrjm3ym3n8jcl0r0g0cbnwni89smvpngij6";
           name = "ace-jump-mode";
         };
@@ -899,7 +899,7 @@
           sha256 = "0z0rblr41r94l4b2gh9fcw50nk82ifxrr3ilxqzbb8wmvil54gh4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-jump-zap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-jump-zap";
           sha256 = "07bkmly3lvlbby2m13nj3m1q0gcnwy5sas7d6ws6vr9jh0d36byb";
           name = "ace-jump-zap";
         };
@@ -920,7 +920,7 @@
           sha256 = "1vs5rwd3gwpydr2fyszjxdkvpzl0vrr48g8f0180fz5b3phh1h1i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-link";
           sha256 = "1jl805r2s3wa0xyhss1q28rcy6y2fngf0yfcrcd9wf8kamhpajk5";
           name = "ace-link";
         };
@@ -941,7 +941,7 @@
           sha256 = "1zx94dysd817i4xgapzm6fb8fcqb90sqym212b57qlqimyi3f59m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-pinyin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-pinyin";
           sha256 = "18gmj71zd0i6yx8ifjxsqz2v81jx0j37f5kxllf31w7fj32ymbkc";
           name = "ace-pinyin";
         };
@@ -962,7 +962,7 @@
           sha256 = "1qiiivkwa95bhyym8ly7fnwwglc9dcifkyr314bsq8m4rp1mgry4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-popup-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-popup-menu";
           sha256 = "1cq1mpv7v98bqrpsm598krq1741b6rwih71cx3yjifpbagrv4m5s";
           name = "ace-popup-menu";
         };
@@ -983,7 +983,7 @@
           sha256 = "053074jyinr3a2zkr1jfgmizdbhk5s37vrvf490x2hwf19dzis4a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-window";
           sha256 = "1k0x8m1phmvgdxb5aj841iai9q96a5lfq8i4b5vnlbc3w888n3xa";
           name = "ace-window";
         };
@@ -1003,7 +1003,7 @@
           sha256 = "0zjncby2884cv8nz2ss7i0p17l15lsk88zwvb7b0gr3apbfpcpa3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/achievements";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/achievements";
           sha256 = "1pwlibq87ph20z2pssk5hbgs6v8kdym9193jjdx2rxp0nic4k0cr";
           name = "achievements";
         };
@@ -1024,7 +1024,7 @@
           sha256 = "02ba4d8qkvgy52g0zcbyfvsnhr9685gq569nkwa2as30xdcq3khm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ack-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ack-menu";
           sha256 = "1d2kw04ndxji2qjcm1b65qnxpp08zx8gbia8bl6x6mnjb2isc2d9";
           name = "ack-menu";
         };
@@ -1045,7 +1045,7 @@
           sha256 = "1rxx2j7kkzjdsk06zgisiydg8dc18vqll4wl6q9mfhrg2y12lq94";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/actionscript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/actionscript-mode";
           sha256 = "1dkiay9jmizvslji5kzab4dxm1dq0jm8ps7sjq6710g7a5aqdvwq";
           name = "actionscript-mode";
         };
@@ -1058,15 +1058,15 @@
     addressbook-bookmark = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "addressbook-bookmark";
-        version = "20160108.1008";
+        version = "20160205.133";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "addressbook-bookmark";
-          rev = "a1de09c69666195f53532e652706b1cec86b9c0d";
-          sha256 = "1ag8zs8bkazblvgxm0q4lnpvdlnzswx1jb4jjbrs2bmq7qmmwvns";
+          rev = "4bac9327e8ccfbe48d0928c2167c4392d14e7019";
+          sha256 = "044piw8jrg6j313cijry38x9mrwvl4b2a46ak2949xqrljh766k6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/addressbook-bookmark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/addressbook-bookmark";
           sha256 = "15p00v4ndrsbadal0ss176mks4ynj39786bmrnil29b6sqibd43r";
           name = "addressbook-bookmark";
         };
@@ -1087,7 +1087,7 @@
           sha256 = "01fn73vyhdcy84s60r2jjy9a0xm3zwagpzi6b4qlankbvswypask";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/adoc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/adoc-mode";
           sha256 = "0wgagcsh0fkb51fy17ilrs20z2vzdpmz97vpwijcfy2b9rypxq15";
           name = "adoc-mode";
         };
@@ -1108,7 +1108,7 @@
           sha256 = "1p90yv2xl1hhpjm0mmhdjyf1jagf79610hkzhw8nycy2p1y4gvl6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aes";
           sha256 = "11vl9x3ldrv7q7rd29xk4xmlvfxs0m6iys84f6mlgf00190l5r5v";
           name = "aes";
         };
@@ -1129,7 +1129,7 @@
           sha256 = "19d5d6qs5nwmpf26rsb86ranb5p4236qp7p2b4i88cimcmzspylb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/afternoon-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/afternoon-theme";
           sha256 = "13xgdw8px58sxpl7nyhkcdxwqdpp13i8wghvlb3l4471plw3vqgj";
           name = "afternoon-theme";
         };
@@ -1150,7 +1150,7 @@
           sha256 = "1ra5nrc4nvp41rcdc4nkjs9lk7131zd54v63c6lyi3zkg3dyl7im";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ag";
           sha256 = "1r4ai09vdckkg4h4i7dp781qqmm4kky53p4q8azp3n2c78i1vz6g";
           name = "ag";
         };
@@ -1171,7 +1171,7 @@
           sha256 = "18zlxgwcvqhlw9y7zn6fywmy04f7rs71fd5ihcx28j4rx9ay929c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aggressive-fill-paragraph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aggressive-fill-paragraph";
           sha256 = "1df4bk3ks09805y67af6z1gpfln0lz773jzbbckfl0fy3yli0dja";
           name = "aggressive-fill-paragraph";
         };
@@ -1184,15 +1184,15 @@
     aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "aggressive-indent";
-        version = "20160115.1614";
+        version = "20160209.1156";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "aggressive-indent-mode";
-          rev = "651812f8fca9c0beb337a04438949bbfb879b5f7";
-          sha256 = "1mymlsm469nl4jaxkjgn26ij37mdf4rjv7kswjwf626bxq9s3136";
+          rev = "1b831d21ac9688e3f31703f0b492202f6d24a75b";
+          sha256 = "0g8mhfab55a4jvb00kcv9f8cyx4l4d5qyfvp7sf7z12qnkik7b6w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aggressive-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aggressive-indent";
           sha256 = "1qi8jbr28gax35siim3hnnkiy8pa2vcrzqzc6axr98wzny46x0i2";
           name = "aggressive-indent";
         };
@@ -1211,7 +1211,7 @@
           sha256 = "0fnn52b2prai8dlsj4759mbcgbbbvhr2lbqs3f0k5d2q8vvqrch1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ahg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ahg";
           sha256 = "0kw138lfzwp54fmly3jzzml11y7fhcjp3w0irmwdzr68lc206lr4";
           name = "ahg";
         };
@@ -1224,15 +1224,15 @@
     ahk-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ahk-mode";
-        version = "20151104.1737";
+        version = "20160214.1922";
         src = fetchFromGitHub {
           owner = "ralesi";
           repo = "ahk-mode";
-          rev = "e08a1b467d42b9d5e719c39407908152011b4573";
-          sha256 = "122as0ssc6xzmxb5hlvhx6dlx6gq2f70xisz0z8pxgm3bpf9h6mx";
+          rev = "d437ed0b3d3d38d0d0eec794ded019459b32f42a";
+          sha256 = "1ff0am1j619ypvjkmihrc8zxvv45grllj6wyka0r6mb3z189xyjl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ahk-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ahk-mode";
           sha256 = "066l4hsb49wbyv381qgn9k4hn8gxlzi20h3qaim9grngjj5ljbni";
           name = "ahk-mode";
         };
@@ -1245,15 +1245,15 @@
     ahungry-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ahungry-theme";
-        version = "20151014.2138";
+        version = "20160208.2232";
         src = fetchFromGitHub {
           owner = "ahungry";
           repo = "color-theme-ahungry";
-          rev = "52b050992ef6fe0e6e57b51bcb5c98e02c616541";
-          sha256 = "0dlk53zij907413fl6wh02i8nwzrbbrm22nn3i9h5sc8x9dhzazg";
+          rev = "1ce5a659e968af25122b46a3fc3b04b30b5ebdd5";
+          sha256 = "1436i7vdzaqykimfrm2y1s3dw2q398dzv1hyr9mr5z4kxa5f0rjj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ahungry-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ahungry-theme";
           sha256 = "0fhim0qscpqx9siprp3ax1azxzmqkzvrjx517d9bnd68z7xxbpqy";
           name = "ahungry-theme";
         };
@@ -1274,7 +1274,7 @@
           sha256 = "0blrpqn8wy9pwzikgzb0v6x4hk7axv93j4byfci62fh1905zfkkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/airline-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/airline-themes";
           sha256 = "0jkhb6nigyjmwqny7g59h4ssfy64vl3qnwcw46wnx5k9i73cjyih";
           name = "airline-themes";
         };
@@ -1295,7 +1295,7 @@
           sha256 = "1lxpfswp1bjrz192px79f155dycf2kazpr7dfrcr1gyshlgxkpf7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/airplay";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/airplay";
           sha256 = "095nibgs197iplphk6csvkgsrgh1fcfyy33py860v6qmihvk538f";
           name = "airplay";
         };
@@ -1308,15 +1308,15 @@
     alchemist = callPackage ({ company, dash, elixir-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "alchemist";
-        version = "20160125.107";
+        version = "20160215.144";
         src = fetchFromGitHub {
           owner = "tonini";
           repo = "alchemist.el";
-          rev = "f7d442107910b16a7e5727c4435463be1307b6a4";
-          sha256 = "0z87n537g2l99s9sgqdaagappfr3fm9p7yyh0946cnh80m8c71la";
+          rev = "091a6f3b5e2785dcac3ae1a514eb73b0e8dbf469";
+          sha256 = "0vc1nadbj16wv75xfl4l662ifmhgsankldj6c580v4clj3ck482b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/alchemist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/alchemist";
           sha256 = "18jxw0zb7y34qbm4bcpfpb2656f0h9grmrbfskgp4ra4q5q3n369";
           name = "alchemist";
         };
@@ -1326,6 +1326,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    alda-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "alda-mode";
+        version = "20160220.923";
+        src = fetchFromGitHub {
+          owner = "jgkamat";
+          repo = "alda-mode";
+          rev = "a77e835d117375eb31c975f4eda61f6513d07142";
+          sha256 = "0pyfilaqwcnvllwmy575ldi8ac5is2dj4qhxaw19300iqa1hpfkj";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/alda-mode";
+          sha256 = "0vpxiw3k0qxp6s19n93qkkyrr44rbw38ygriqdrfpp84pa09wprh";
+          name = "alda-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/alda-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     alect-themes = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "alect-themes";
@@ -1337,7 +1358,7 @@
           sha256 = "0hvf7ydd2p3dfk5hqjqcbaajhgihkyvlwvqcr97a8jknznk7hfzp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/alect-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/alect-themes";
           sha256 = "04fq65qnxlvl5nc2q037c6yb4nf422dfw2913gv6zfh9rdmxsks8";
           name = "alect-themes";
         };
@@ -1358,7 +1379,7 @@
           sha256 = "0z7yfjg14bzndpm9ski1a1mdixvrykg7d08cd86dc82bghb3px2z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/alert";
           sha256 = "0x3cvczq09jvshz435jw2fjm69457x2wxdvvbbjq46nfnybhi118";
           name = "alert";
         };
@@ -1379,7 +1400,7 @@
           sha256 = "0l2rgs0rd4nmv4v7m10zhf2znzfvdifv1vlhpa3zbppg0fj8zph1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/align-cljlet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/align-cljlet";
           sha256 = "0pnhhv33rvlmb3823xpy9v5h6q99fa7fn38djbwry4rymi4jmlih";
           name = "align-cljlet";
         };
@@ -1397,7 +1418,7 @@
           sha256 = "10j70bwa28xpmqwigvls76jg6vz0iky88lmkq4pk35bg3rz09r4m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/all-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/all-ext";
           sha256 = "1zi266cm5hpfhnnnzbsm4s1w0lsy4sj5z8d020y0cg57yn2v62dv";
           name = "all-ext";
         };
@@ -1407,22 +1428,31 @@
           license = lib.licenses.free;
         };
       }) {};
-    amd-mode = callPackage ({ dash, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s }:
+    amd-mode = callPackage ({ ag, dash, f, fetchFromGitHub, fetchurl, js2-mode, js2-refactor, lib, makey, melpaBuild, projectile, s }:
     melpaBuild {
         pname = "amd-mode";
-        version = "20160202.953";
+        version = "20160210.732";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "amd-mode.el";
-          rev = "e552bdd3a0d24e9c471fd21c4a2ae17cb20c7594";
-          sha256 = "1b7w8zrcliibwxlrrzmi2r684f59jzd892c556svh3qad048mriv";
+          rev = "e3dc1a3d02734a2b6194aa80e7c0ec1c82e68c6f";
+          sha256 = "09vzcy842lzi67lbx5kkhn868nsxvbahkp13697p6dhb58b71rlk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/amd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/amd-mode";
           sha256 = "17ry6vm5xlmdfs0mykdyn05cik38yswq5axdgn8hxrvvb6f58d06";
           name = "amd-mode";
         };
-        packageRequires = [ dash f js2-mode js2-refactor makey projectile s ];
+        packageRequires = [
+          ag
+          dash
+          f
+          js2-mode
+          js2-refactor
+          makey
+          projectile
+          s
+        ];
         meta = {
           homepage = "http://melpa.org/#/amd-mode";
           license = lib.licenses.free;
@@ -1439,7 +1469,7 @@
           sha256 = "18cicz11i19cpabrq6khnl9ks1khn6gw5a4ckaq4y65r40x0cr6g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ample-regexps";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ample-regexps";
           sha256 = "00y07pd438v7ldkn5f1w84cpxa1mvcnzjkj6sf5l5pm97xqiz7j2";
           name = "ample-regexps";
         };
@@ -1460,7 +1490,7 @@
           sha256 = "0x72czw5rmz89w5fa27z54bz8qirrr882g0r37pb8li04j1hk7kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ample-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ample-theme";
           sha256 = "055c6jy2q761za4cl1vlqdskcd3mc1j58k8b4418q7h2lv2zc0ry";
           name = "ample-theme";
         };
@@ -1481,7 +1511,7 @@
           sha256 = "18z9jl5d19a132k6g1dvwqfbbdh5cx66b2qxlcjsfiqxlxglc2sa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ample-zen-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ample-zen-theme";
           sha256 = "0xygk80mh05qssrbfj4h6k50pg557dyj6kzc2pdlmnr5r4gnzdn3";
           name = "ample-zen-theme";
         };
@@ -1494,15 +1524,15 @@
     anaconda-mode = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic, s }:
     melpaBuild {
         pname = "anaconda-mode";
-        version = "20150922.737";
+        version = "20160221.1323";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "anaconda-mode";
-          rev = "e8f6d910993ac1ecaa41b07abc4cdc9e76e66fb8";
-          sha256 = "01a9l785chmcf6d7fsyc72gapapb4gddgqmpps705zpkhjm8f6wj";
+          rev = "395b111de79cc204a976be5d37133a08d794b54c";
+          sha256 = "0ripdiyr93c6cdb42inni18p1p39gl9pjjgbzkp1b072y8dgrv10";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anaconda-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anaconda-mode";
           sha256 = "0gz16aam4zrm3s9ms13h4qcdflf55506kgkpyncq3bi54cvv8n1r";
           name = "anaconda-mode";
         };
@@ -1523,7 +1553,7 @@
           sha256 = "1ym43y0wqifkzpkm7ayf8cq2wz8pc2wgg9zvdyi0cn9lr9mwpbav";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anaphora";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anaphora";
           sha256 = "1wb7fb3pc4gxvpjlm6gjbyx0rbhjiwd93qwc4vfw6p865ikl19y2";
           name = "anaphora";
         };
@@ -1542,7 +1572,7 @@
           sha256 = "1hklypbp79pgaf1yklbm3qx4skm3xlml0cm1r9b9js3dbqyha651";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anchored-transpose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anchored-transpose";
           sha256 = "19dgj1605qxc2znvzj0cj6x29zyrh00qnzk2rlwpn9hvzypg9v7w";
           name = "anchored-transpose";
         };
@@ -1563,7 +1593,7 @@
           sha256 = "1ms338qq17nwivpq8c1xsnld5k532rfhgvfxx1zg3l8wrjh235d2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/android-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/android-mode";
           sha256 = "1nqrvq411yg4b9xb5cvc7ai7lfalwc2rfhclzprvymc4vxh6k4cc";
           name = "android-mode";
         };
@@ -1584,7 +1614,7 @@
           sha256 = "1m0c7ns7aiycg86cgglir8bkw730fslyg1n15m9ki0da4cnmm97a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/angry-police-captain";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/angry-police-captain";
           sha256 = "1cshhd4bkgbkg0n6m8gz53z47z4nq0hcriz2qh3v7m4cqgkw1m9r";
           name = "angry-police-captain";
         };
@@ -1605,7 +1635,7 @@
           sha256 = "04kg2x0lif91knmkkh05mj42xw3dkzsnysjda6ian95v57wfg377";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/angular-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/angular-mode";
           sha256 = "1bwfmjldnxki0lqi3ys6r2a3nlhbwm1dibsg2dvzirq8qql02w1i";
           name = "angular-mode";
         };
@@ -1626,7 +1656,7 @@
           sha256 = "0hdm1a323mzxjfdply8ri3addk146f21d8cmpd18r7dw3j3cdfrn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/angular-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/angular-snippets";
           sha256 = "057phgizn1c6njvdfigb23ljs31knq247gr0rcpqfrdaxsnnzm5c";
           name = "angular-snippets";
         };
@@ -1647,7 +1677,7 @@
           sha256 = "08gs96r9mbdg0s5l504yp6i5nmi9qr4nwxq3xprsbx9bdzv5l2dx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/annotate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/annotate";
           sha256 = "1ajykgara2m713blj2kfmdz12fzm8jw7klyakkyi6i3c3a9m44jy";
           name = "annotate";
         };
@@ -1668,7 +1698,7 @@
           sha256 = "1ppq3kszzj2fgr7mwj565bjs8bs285ymy384cnnw7paddgcr9z02";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/annoying-arrows-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/annoying-arrows-mode";
           sha256 = "13bwqv3mv7kgi1gms58f5g03q5g7q98n4vv6n28zqmppxm5z33s7";
           name = "annoying-arrows-mode";
         };
@@ -1689,7 +1719,7 @@
           sha256 = "19k71dj83kvc8mks6zhl45vsrsb61via53dqxjv9bny1ybh2av85";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ansi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ansi";
           sha256 = "04n0kvaqq8214prdk20bplqyzlsnlzfzsg23ifkrzjgqjjpdcyi1";
           name = "ansi";
         };
@@ -1710,7 +1740,7 @@
           sha256 = "03d240jngxw51ybrsjw8kdxygrr0ymdckzwga2jr1bqf26v559j2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ansible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ansible";
           sha256 = "1xdc05fdglqfbizra6s1zl6knnvaq526dkxqnw9g7w269j8f4z8g";
           name = "ansible";
         };
@@ -1731,7 +1761,7 @@
           sha256 = "1h3rqrjrl8wx7xvvd631jkbbczq3srd4mgz7y9wh3cvz1njdpy62";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ansible-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ansible-doc";
           sha256 = "03idvnn79fr9id81aivkm7g7cmlsg0c520wcq4da8g013xvi342w";
           name = "ansible-doc";
         };
@@ -1744,15 +1774,15 @@
     ant = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ant";
-        version = "20131228.107";
+        version = "20160211.943";
         src = fetchFromGitHub {
           owner = "apgwoz";
           repo = "ant-el";
-          rev = "8afe6cd0ee4674911ce6b9381b551ab22c567c49";
-          sha256 = "1g4ah0iwqrvvzcxr0ss6il5kign73gzcz1dbc22wdgprlfa4hah7";
+          rev = "510b5a3f57ee4b2855422d88d359a28922c1ab70";
+          sha256 = "0jb5vl3cq5m3r23fjhcxgxl4g011zkjkkyn5mqqxx22a1sydsvab";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ant";
           sha256 = "03rxn2dh0xj89kl24jd19q7kmrn1hnr2cdl3519bpng298kxwni6";
           name = "ant";
         };
@@ -1765,15 +1795,15 @@
     anti-zenburn-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "anti-zenburn-theme";
-        version = "20160119.1705";
+        version = "20160205.2009";
         src = fetchFromGitHub {
           owner = "m00natic";
           repo = "anti-zenburn-theme";
-          rev = "72906fbf1f47035ad97e39c0dea1a6b46b091a64";
-          sha256 = "0h3zl56n27r331xrbx4sa6vhqbhrhkji1idqlmba0z16dlzfp1pw";
+          rev = "bbb3517dcba4ea3b03bb6e0469b8e71c8b9a76e1";
+          sha256 = "02m991awps2b0h31ybrwxznbz88f10a241fmy34r671lrni2ymgi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anti-zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anti-zenburn-theme";
           sha256 = "1sp9p6m2jy4m9fdn1hz25cmasy0mwwgn46qmvm92i56f5x6jlzzk";
           name = "anti-zenburn-theme";
         };
@@ -1794,7 +1824,7 @@
           sha256 = "0fzxzar8m9qznfxv3wr7vfj9y2110wf6mm5cj55k3sd5djdjhmf1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anx-api";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anx-api";
           sha256 = "1vzg3wsqyfb9rsfxrpz8k2gazjlz2nwnf4gnn1dypsjspjnzcb8r";
           name = "anx-api";
         };
@@ -1815,7 +1845,7 @@
           sha256 = "0qy5q4rq68nb21k7w3xpil8k8k5awcpjrjlxjwnhcklwb83w3dhf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anybar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anybar";
           sha256 = "0prnr8wjhishpf2zmn4b7054vfahk10w05nzsg2p6whaxywcachm";
           name = "anybar";
         };
@@ -1836,7 +1866,7 @@
           sha256 = "05lq0bllgn44zs85mgnfdcyjasm6j8m70jdcxksf798i0qdqnk7n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anyins";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anyins";
           sha256 = "0ncf3kn8rackcidkgda2zs60km3hx87rwr9daj7ksmbb6am09s7c";
           name = "anyins";
         };
@@ -1856,7 +1886,7 @@
           sha256 = "e90ded84609e59a4cef22bfd9d9a543ec6b677b78ab44fb4eb6cbae9eb248669";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything";
           sha256 = "13pmks0bsby57v3vp6jcvvzwb771d4qq62djgvrw4ykxqzkcb8fj";
           name = "anything";
         };
@@ -1877,7 +1907,7 @@
           sha256 = "0dbf510gcd0m191samih0r4lx6d7sgk0ls0sx2jrdkyacy82ridy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-exuberant-ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything-exuberant-ctags";
           sha256 = "0p0jq2ggdgaxv2gd9m5iza0y3mjjc82xmgp899yr15pfffa4wihk";
           name = "anything-exuberant-ctags";
         };
@@ -1898,7 +1928,7 @@
           sha256 = "0gj0p7420wx5c186kdccjb9icn656sg5b0zwnwy3fjvhsbbvrb2r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-git-files";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything-git-files";
           sha256 = "13giasg8lh5968plva449ki9nc3478a63700f8c0yghnwjb77asw";
           name = "anything-git-files";
         };
@@ -1919,7 +1949,7 @@
           sha256 = "06fyvk7cjz1aag6fj52qraqmr23b0fqwml41yyid8gjxl4ygmkpv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-git-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything-git-grep";
           sha256 = "1kw88fvxil9l80w8zn16az7avqplyf2m0l7kp431wb5b1b1508jl";
           name = "anything-git-grep";
         };
@@ -1940,7 +1970,7 @@
           sha256 = "1jw6gqwcl3fx1m7w0a15w2pnzzlqyr1fbg0m81ay358s4w3jn6v7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-milkode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything-milkode";
           sha256 = "1apc865a01jyx602ldzj32rrjk6xmgnxdccpjpcfgh24h2aqpdan";
           name = "anything-milkode";
         };
@@ -1961,7 +1991,7 @@
           sha256 = "16a7i01q8qqkgph1s3jnwdr2arjq3cm3jpv5bk5sqs29c003q0pp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything-project";
           sha256 = "10crwm34igb4kjh97alni15xzhsb2s0d4ghva86f2gpjidka9fhr";
           name = "anything-project";
         };
@@ -1982,7 +2012,7 @@
           sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-prosjekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything-prosjekt";
           sha256 = "15kgn0wrnbh666kchijdlssf2gp7spgbymr2nwgv6k730cb4mfa8";
           name = "anything-prosjekt";
         };
@@ -2003,7 +2033,7 @@
           sha256 = "1834yj2vgs4dasdfnppc8iw8ll3yif948biq9hj0sbpsa2d8y44k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-replace-string";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything-replace-string";
           sha256 = "1fagi6cn88p6sf1yhx1qsi7nw9zpyx9hdfl66iyskqwddfvywp71";
           name = "anything-replace-string";
         };
@@ -2024,7 +2054,7 @@
           sha256 = "08xr6fkk1r4r5jqh349d4dfal9nbs2a8y2fp8zn3zlrj2cd0g80k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything-sage";
           sha256 = "1878vj8hzrwfyd2yvxcm0f1vm9m0ndwnj0pcq7j8zm9lxj0w48p3";
           name = "anything-sage";
         };
@@ -2045,7 +2075,7 @@
           sha256 = "1dxaf68przg0hh0p1zhxsq2dysp3ln178yxhbqalxw67bjy8ikny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anzu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anzu";
           sha256 = "0i2ia0jisj31vc2pjx9bhv8jccbp24q7c406x3nhh9hxjzs1f41i";
           name = "anzu";
         };
@@ -2063,7 +2093,7 @@
           sha256 = "10vdmxzifxx3fkpyg76ngnj79k3d2pq0f322rd8ssc66alxhkz3g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aok";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aok";
           sha256 = "1nkkbfwqp5r44wjwl902gm0xc8p3d2qj5mk1cchilr2rib52zd46";
           name = "aok";
         };
@@ -2084,7 +2114,7 @@
           sha256 = "0528z3axjmplg2fdbv4jxgy1p39vr4rnsm4a3ps2fanf8bwsyx3l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aozora-view";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aozora-view";
           sha256 = "0pd2574a6dkhrfr0jf5gvv34ganp6ddylyb6cfpg2d4znwbc2r2w";
           name = "aozora-view";
         };
@@ -2102,7 +2132,7 @@
           sha256 = "1jndhcjvj6s1clmyyphl5ss5267c7b5a58fz8gbp1ffk1d9ylfik";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/apache-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/apache-mode";
           sha256 = "1a1pj3bk0gplfx217yd6qdn7qrhfbkx2bhkk33k0gq5sia6rzs44";
           name = "apache-mode";
         };
@@ -2123,7 +2153,7 @@
           sha256 = "0sdxnf4b8rqs1cbjxh23wvxmj7ll3zddv8yfdgif6zmgyy8xhc9m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/apel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/apel";
           sha256 = "0zhlm8lfri3zkhj62cycvdhkkgrn72lqb0dalh8qgr049bdv816y";
           name = "apel";
         };
@@ -2144,7 +2174,7 @@
           sha256 = "0br0jl6xnajdx37s5cvs13srn9lldg58y9587a11s3s651xjdq0z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/apples-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/apples-mode";
           sha256 = "05ssnxs9ybc26jhr69xl9jpb41bz1688minmlc9msq2nvyfnj97s";
           name = "apples-mode";
         };
@@ -2164,7 +2194,7 @@
           sha256 = "0n3y0314ajqhn5hzih09gl72110ifw4vzcgdxm8n6npjbx7irbml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/applescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/applescript-mode";
           sha256 = "1ya0dh7gz7qfflhn6dq43rapb2zg7djvxwn7p4jajyjnwbxmk611";
           name = "applescript-mode";
         };
@@ -2185,7 +2215,7 @@
           sha256 = "1wyz8jvdy4m0cn75mm3zvxagm2gl10q51479f91gnqv14b4rndfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aproject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aproject";
           sha256 = "0v3gx2mff2s7knm69y253pm1yr4svy8w00pqbn1chrvymb62jhp2";
           name = "aproject";
         };
@@ -2204,7 +2234,7 @@
           sha256 = "0wc9zg30a48cj2ssfj9wc7ga0ip9igcxcdbn1wr0qmndzxxa7x5k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/apropos-fn+var";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/apropos-fn+var";
           sha256 = "1s5gnsipsj7dhc8ca806grg32i6vlwm78hcxhrbs830vx9k84g5x";
           name = "apropos-fn-plus-var";
         };
@@ -2217,15 +2247,15 @@
     apropospriate-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "apropospriate-theme";
-        version = "20160124.118";
+        version = "20160212.1130";
         src = fetchFromGitHub {
           owner = "waymondo";
           repo = "apropospriate-theme";
-          rev = "c35c9799556194298e67dd0f03a7dcfa72040a54";
-          sha256 = "0gipjdjg6ds04wlg6kf6qjanl24jfzzhkjw8ngjqwla98vly7qcr";
+          rev = "bdd9deddd78df2e8dda0030de5d3e86003bf2f4e";
+          sha256 = "0j0k5ak5pzh3n2grf7b6b7ajxsp4ssv2l5gmg08kmbdwscavzc4r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/apropospriate-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/apropospriate-theme";
           sha256 = "10bj2bsi7b104m686z8mgvbh493liidsvivxfvfxzbndc8wyjsw9";
           name = "apropospriate-theme";
         };
@@ -2243,7 +2273,7 @@
           sha256 = "1xbvky0mspmbi8ghqhqhgbjn70acipwf0qwn6s5zdarwch10nljj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/apu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/apu";
           sha256 = "0399rmjwcs7fykj10s9m0lm2wb1cr2bzw2bkgm5rp4n3va0rzaa2";
           name = "apu";
         };
@@ -2261,7 +2291,7 @@
           sha256 = "1mhj6x0n2ya3xd7gykmkcf70ji5g8qd8xawz764ykdlcribpsq52";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/archive-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/archive-region";
           sha256 = "03x2fqhx4w0c7xd8x8zlnyzdwyay6r2yxf4jzgkcg87q7rqjk9nd";
           name = "archive-region";
         };
@@ -2282,7 +2312,7 @@
           sha256 = "1yvaqjc9hadbnnay5fprnh890xsp53kidad1zpb4a5z4a5z61n3c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/arduino-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/arduino-mode";
           sha256 = "1lpsjpc7par12zsmg9sf4r1h039kxa4n68anjr3mhpp3d6rapjcx";
           name = "arduino-mode";
         };
@@ -2302,7 +2332,7 @@
           sha256 = "2713755e56b03e28a5a6e10c85865c1ace0247e71caeb8b89ec65d5618addafc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aria2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aria2";
           sha256 = "10x2k99m3kl6y0k0mw590gq1ac162nmdwk58i8i7a4mb72zmsmhc";
           name = "aria2";
         };
@@ -2323,7 +2353,7 @@
           sha256 = "0vh9wfc3657sd12ybjcrxpg6f757x2ghkcl1lw01szmyy5vmj27h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ariadne";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ariadne";
           sha256 = "0lfhving19wcfr40gjb2gnginiz8cncixiyyxhwx08lm84qb3a7p";
           name = "ariadne";
         };
@@ -2344,7 +2374,7 @@
           sha256 = "1i6y3kv2vii6f8gpd845vv6h832hqx0vxb3fmb1x80kwx3gda682";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/arjen-grey-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/arjen-grey-theme";
           sha256 = "18q66f7hhys2ab9ljsdp9013mp7d6v6d1lrb0d1bb035r1b4pfj7";
           name = "arjen-grey-theme";
         };
@@ -2365,7 +2395,7 @@
           sha256 = "133c1n4ra7z3vb6y47400y71a6ac19pyji0bgd4kr9fcbx0flx91";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/artbollocks-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/artbollocks-mode";
           sha256 = "0dlnxicn6nzyiz44y92pbl4nzr9jxfb9a99wacjrwq2ahdrwhhjp";
           name = "artbollocks-mode";
         };
@@ -2383,7 +2413,7 @@
           sha256 = "05fjsj5nmc05cmsi0qj914dqdwk8rll1d4dwhn0crw36p2ivql75";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ascii";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ascii";
           sha256 = "0jb63f7qwhfbz0n4yrvnvx03cjqly3mqsc3rq9mgf4svy2zw702r";
           name = "ascii";
         };
@@ -2404,7 +2434,7 @@
           sha256 = "1s973vzivibaqjb8acn4ylrdasxh17jcfmmvqp4wm05nwhg75597";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/asilea";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/asilea";
           sha256 = "1lb8nr6r6yy06m4pxg8w9ja4zv8k5xwhl95v2wv95y1qwhgnwg3j";
           name = "asilea";
         };
@@ -2425,7 +2455,7 @@
           sha256 = "0h18x9nh152dnyqjv5b1zjksl8wb75s8zmx3v8vvmwqyy6ql8gcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/asn1-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/asn1-mode";
           sha256 = "0iswisb08dqz7jc5ra4wcdhbmglildgyrb547dm5362xmvm9ifmy";
           name = "asn1-mode";
         };
@@ -2446,7 +2476,7 @@
           sha256 = "074wdciq62jfc41f829590p4y52dnkn3nxicj9lcabgxwz7cahjp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/async";
           sha256 = "063ci4f35x1zm9ixy110i5ds0vsrcafpixrz3xkvpnfqdn29si3f";
           name = "async";
         };
@@ -2467,7 +2497,7 @@
           sha256 = "0rnnvr8x1czphbinby2z2dga7ikwgd13d7zhgmp3ggamzyaz6nf1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/@";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/@";
           sha256 = "0w91qx955z67w2yh8kf86b58bb3b6s6490mmbky8467knf2q83qz";
           name = "at";
         };
@@ -2488,7 +2518,7 @@
           sha256 = "0jfpzv8dmvl4nr6kvq5aii830s5h632bq2q3jbnfc4zdql7id464";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/atom-dark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/atom-dark-theme";
           sha256 = "1ci61blm7wc83wm2iyax017ai4jljyag5j1mvw86rimmmjzr0v8f";
           name = "atom-dark-theme";
         };
@@ -2509,7 +2539,7 @@
           sha256 = "027j027w2nbplg1gi28hg9iyiirigydj5n4npf7y9a6g626snxz0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/atom-one-dark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/atom-one-dark-theme";
           sha256 = "0wwnkhq7vyysqiqcxc1jsn98155ri4mf4w03k7inl1f8ffpwahvw";
           name = "atom-one-dark-theme";
         };
@@ -2530,7 +2560,7 @@
           sha256 = "1h0044zfzklc9sy0a02vcdr75ly6wlhjx3n5bvq7yiicqd012316";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auctex-latexmk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auctex-latexmk";
           sha256 = "1rdlgkiwlgm06i1gjxcfciz6wgdskfhln8qhixyfxk7pnz0ax327";
           name = "auctex-latexmk";
         };
@@ -2551,7 +2581,7 @@
           sha256 = "0lgfgvnaln5rhhwgcrzwrhbj0gz8sgaf6xxdl7njf3sa6bfgngsz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auctex-lua";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auctex-lua";
           sha256 = "0v999jvinljkvhbn205p36a6jfzppn0xvflvzr8mid1hnqlrpjhf";
           name = "auctex-lua";
         };
@@ -2572,7 +2602,7 @@
           sha256 = "0q79kblcbz5vlzj0f49vpc1902767ydmvkmwwjs60x3w2f3aq3cm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/audio-notes-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/audio-notes-mode";
           sha256 = "0q88xmi7jbrx47nvbbmwggbm6i7agzpnv5y7cpdh73lg165xsz2h";
           name = "audio-notes-mode";
         };
@@ -2593,7 +2623,7 @@
           sha256 = "0z0wq79ks8251fflk2iwrhd885h5qbki2m19f0jy4a8c00ydmxyz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aurel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aurel";
           sha256 = "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl";
           name = "aurel";
         };
@@ -2614,7 +2644,7 @@
           sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aurora-config-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aurora-config-mode";
           sha256 = "0yqmpwj1vp0d5w9zw1hbyxzsbvw165dsgk1v1dxizkqwn7b1v7jm";
           name = "aurora-config-mode";
         };
@@ -2635,7 +2665,7 @@
           sha256 = "1z2n6gd63mgj2wj45n6g1gmfrk0iwzlrzb6g1rdd9r9a03c03qi6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aurora-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aurora-theme";
           sha256 = "1fhlng30v25ycr502vfvajl70vimscqkipva6ghr670j35ac5vz5";
           name = "aurora-theme";
         };
@@ -2656,7 +2686,7 @@
           sha256 = "0gi65n1np63zi2ylc4y1licwvk97jl92s1v98fv5y61kppi1d8sq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auth-password-store";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auth-password-store";
           sha256 = "118ll12dhhxmlsp2mxmy5cd91166a1qsk406yhap5zw1qvyg58w5";
           name = "auth-password-store";
         };
@@ -2675,7 +2705,7 @@
           sha256 = "1c8nm4sz9a67q8w0b1jahg5ldy185zws7nilj9yv3miklg07zq17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-async-byte-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-async-byte-compile";
           sha256 = "108jhrdx67chbdd4h824072i2wrn90zdh2hw5vqd4a5svhhf28jj";
           name = "auto-async-byte-compile";
         };
@@ -2696,7 +2726,7 @@
           sha256 = "1whbvqylwnxg8d8gn55kcky39rgyc49rakyxlbkplh813lk6lxb7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-auto-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-auto-indent";
           sha256 = "08s73pnyrmklb660jl5rshncpq31z3m9fl55v7453ch8syp7gzh7";
           name = "auto-auto-indent";
         };
@@ -2714,7 +2744,7 @@
           sha256 = "1lk9zwng7wkjvb8hprlgyrab1s56n8a61xjva931h0bgypwl1dfi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-capitalize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-capitalize";
           sha256 = "18fygc71n9bc0vrpymz2f7sw9hzkpqxzfglh53shmbm1zns3wkw0";
           name = "auto-capitalize";
         };
@@ -2735,7 +2765,7 @@
           sha256 = "07vnk8az4lcxncqn01jvks38b4hpdmg43nbby2b39zy50agqnwsg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-compile";
           sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks";
           name = "auto-compile";
         };
@@ -2756,7 +2786,7 @@
           sha256 = "07ib2pd3apm97v7kalavpc6fyk00cjky8kfwahn37zmw2j2fdhpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete";
           sha256 = "1c4ij5bnclg94jdzhkqvq2vxwv6wvs051mbki1ibjm5f2hlacvh3";
           name = "auto-complete";
         };
@@ -2777,7 +2807,7 @@
           sha256 = "1wri8q5llpy1q1h4ac4kjnnkgj6fby8i9vrpr6mrb13d4gnk4gr2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-auctex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-auctex";
           sha256 = "00npvryds5wd3d5a13r9prlvw6vvjlag8d32x5xf9bfmmvs0fgqh";
           name = "auto-complete-auctex";
         };
@@ -2798,7 +2828,7 @@
           sha256 = "12mzi6bwg702sp0f0wd1ag555blbpk252rr9rqs03bn8pkw89h4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-c-headers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-c-headers";
           sha256 = "02pkrxvzrpyjrr2fkxnl1qw06aspzv8jlp2c1piln6zcjd92l3j7";
           name = "auto-complete-c-headers";
         };
@@ -2819,7 +2849,7 @@
           sha256 = "1zhbpxpl443ghpkl9i68jcjfcw1vnf8ky06pf5qjjmqbxlcyd9li";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-chunk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-chunk";
           sha256 = "1937j1xm20vfcqm9ig4nvciqfkz7rpw0nsfhlg69gkmv0nqszdr3";
           name = "auto-complete-chunk";
         };
@@ -2840,7 +2870,7 @@
           sha256 = "12y6f47xbjl4gy14j2f5wlisy5vl6rhx74n27w61pjv38m0a7mi1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-clang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-clang";
           sha256 = "1rnmphl7ml5ryjl5ka2l58hddir8b34iz1rm905wdwh164piljva";
           name = "auto-complete-clang";
         };
@@ -2861,7 +2891,7 @@
           sha256 = "1sw0wxrjcjqk0w1llfj376g6axa5bnk2lq2vv66746bkz14h0s8f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-clang-async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-clang-async";
           sha256 = "1jj0jn1v3070g7g0j5gvpybv145kki8nsjxqb8fjf9qag8ilfkjh";
           name = "auto-complete-clang-async";
         };
@@ -2882,7 +2912,7 @@
           sha256 = "1fqgyg986fg1dzac5wa97bx82mfddqb6qrfnpr3zksmw3vgykxr0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-exuberant-ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-exuberant-ctags";
           sha256 = "1i2s3ycc8jafkzdsz3kbvx1hh95ydi5s6rq6n0wzw1kyy3km35gd";
           name = "auto-complete-exuberant-ctags";
         };
@@ -2903,7 +2933,7 @@
           sha256 = "18bf1kw85mab0zp7rn85cm1nxjxg5c1dmiv0j0mjwzsv8an4px5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-nxml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-nxml";
           sha256 = "0viscr5k1carn9vhflry16kgihr6fvh6h36b049pgnk6ww085k6a";
           name = "auto-complete-nxml";
         };
@@ -2924,7 +2954,7 @@
           sha256 = "1hf2f903hy9afahrgy2fx9smgn631drs6733188zgqi3nkyizj26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-pcmp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-pcmp";
           sha256 = "1mpgkwj8jwpvxphlm6iaprwjrldmihbgg97jav0fbm1kjnm4azna";
           name = "auto-complete-pcmp";
         };
@@ -2945,7 +2975,7 @@
           sha256 = "107svb82cgfns9kcrmy3hh56cab81782jkbz5i9959ms81xizfb8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-rst";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-rst";
           sha256 = "0dazkpnzzr0imb2a01qq8l60jxhhlknzjx7wccnbm7d2rk3338m6";
           name = "auto-complete-rst";
         };
@@ -2966,7 +2996,7 @@
           sha256 = "0l49ciic7g30vklxq6l1ny3mz87l5p8qc30rmkjvkzvg8r52ksn3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-sage";
           sha256 = "02sxbir3arvmnkvxgndlkln9y05jnlv6i8czd6a0wcxk4nj43lq1";
           name = "auto-complete-sage";
         };
@@ -2987,7 +3017,7 @@
           sha256 = "0rfjx0x2an28821shgb4v5djza4kwn5nnrsl2cvh3px4wrvw3izp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-dictionary";
           sha256 = "1va485a8lxvb3507kr83cr6wpssxnf8y4l42mamn9daa8sjx3q16";
           name = "auto-dictionary";
         };
@@ -3008,7 +3038,7 @@
           sha256 = "0lqfnv8wqnbb5ddwmh9svphc3bgmwdpwx40qw9sgqdzpj3xh7v8g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-dim-other-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-dim-other-buffers";
           sha256 = "0n9d23sfcmkjfqlm80vrgf856wy08ak4n4rk0z7vadq07yj46zxh";
           name = "auto-dim-other-buffers";
         };
@@ -3029,7 +3059,7 @@
           sha256 = "0jfiax1qqnyznhlnqkjsr9nnv7fpjywvfhj9jq59460j0nbrgs5c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-highlight-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-highlight-symbol";
           sha256 = "02mkji4sxym07jf5ww5kgv1c18x0xdfn8cmvgns5h4gij64lnr66";
           name = "auto-highlight-symbol";
         };
@@ -3050,7 +3080,7 @@
           sha256 = "1hlsgsdxpx42kmqkjgy9b9ldz5i4dbi879v87pjd2qbkj8iywb6y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-indent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-indent-mode";
           sha256 = "1nk78p8lqs8cx90asfs8iaqnwwyy8fi5bafaprm9c0nrxz299ibz";
           name = "auto-indent-mode";
         };
@@ -3068,7 +3098,7 @@
           sha256 = "043pb2wk7jh0jgxphdl4848rjyabna26gj0vlhpiyd8zc361pg9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-install";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-install";
           sha256 = "1gaxc2ya4r903k0jf3319wg7wg5kzq7k8rfy8ac9b0wfzv247ixk";
           name = "auto-install";
         };
@@ -3089,7 +3119,7 @@
           sha256 = "05llpa6g4nb4qswmcn7j3bs7hnmkrkax7hsk7wvklr0wrljyg9a2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-package-update";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-package-update";
           sha256 = "0fdcniq5mrwbc7yvma4088r0frdfvc2ydfil0s003faz0nrjcp8k";
           name = "auto-package-update";
         };
@@ -3110,7 +3140,7 @@
           sha256 = "10aw3bpvawkqj1l8brvzq057wx3mkzpxs4zc3yhppkhq2cpvx7i2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-save-buffers-enhanced";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-save-buffers-enhanced";
           sha256 = "123vf6nnvdhrrfjn8n8h8a11mkqmy2zm3w3yn99np0zj31x8z7bb";
           name = "auto-save-buffers-enhanced";
         };
@@ -3131,7 +3161,7 @@
           sha256 = "1h8zsgw30axprs7a5kkygbhvilillzazxgqz01ng36il65fi28s6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-shell-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-shell-command";
           sha256 = "1i78fh72i8yv91rnabf0vs78r43qrjkr36hndmn5ya2xs3b1g41j";
           name = "auto-shell-command";
         };
@@ -3141,6 +3171,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    auto-virtualenv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, pyvenv, s }:
+    melpaBuild {
+        pname = "auto-virtualenv";
+        version = "20160220.836";
+        src = fetchFromGitHub {
+          owner = "marcwebbie";
+          repo = "auto-virtualenv";
+          rev = "e55bf927da4e29b0f4d9198f3358a87f9970c3b6";
+          sha256 = "1ya5rn55sclh2w5bjy4b2b75gd6bgavfqmhdisz6afp8w4l4a2bv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-virtualenv";
+          sha256 = "0xv51g74l5pxa3s185867dpc98m6y26xbj5wgz7f9177qchvdbhk";
+          name = "auto-virtualenv";
+        };
+        packageRequires = [ cl-lib pyvenv s ];
+        meta = {
+          homepage = "http://melpa.org/#/auto-virtualenv";
+          license = lib.licenses.free;
+        };
+      }) {};
     auto-yasnippet = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "auto-yasnippet";
@@ -3152,7 +3203,7 @@
           sha256 = "14qr8c4i4644vwqvlh5d3xhw1dzmqz3v74hqlp7g8991yaka72va";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-yasnippet";
           sha256 = "02281gyy07cy72a29fjsixg9byqq3izb9m1jxv98ni8pcy3bpsqa";
           name = "auto-yasnippet";
         };
@@ -3173,7 +3224,7 @@
           sha256 = "01q3k8i8vrs7pcr507kh48np0bc6smanh0ald1hv9h4dylkq89k7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autobookmarks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/autobookmarks";
           sha256 = "11zhg3y9fb5mq67fwsnjrql9mnwkp3hwib7fpllb3yyf2yywc8zp";
           name = "autobookmarks";
         };
@@ -3194,7 +3245,7 @@
           sha256 = "1pf2mwnicj5x2kksxwmrzz2vfxj9y9r6rzgc1fl8028mfrmrmg8s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autodisass-java-bytecode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/autodisass-java-bytecode";
           sha256 = "1k19nkbxnysm3qkpdhz4gv2x9nnrp94xl40x84q8n84s6xaan4dc";
           name = "autodisass-java-bytecode";
         };
@@ -3215,7 +3266,7 @@
           sha256 = "1fq4h5fmamyh7z8nq6pigx74p5v8k3qfm64k66vwsm8bl5jdkw17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autodisass-llvm-bitcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/autodisass-llvm-bitcode";
           sha256 = "0bh73nzll9jp7kiqfnb5dwkipw85p3c3cyq58s0nghig02z63j01";
           name = "autodisass-llvm-bitcode";
         };
@@ -3234,7 +3285,7 @@
           sha256 = "1af45z1w69dkdk4mzjphwn420m9rrkc3djv5kpp6lzbxxnmswbqw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autofit-frame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/autofit-frame";
           sha256 = "0p24qqnfa1vfn5pgnpvbxwi11zjkd6f3cv5igwg6h0pr5s7spnvw";
           name = "autofit-frame";
         };
@@ -3255,7 +3306,7 @@
           sha256 = "02nnyncfh6g0xizy7wa8721ahpnwk451kngd6n0y0249f50p3962";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/automargin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/automargin";
           sha256 = "0llqz01wmacc0f8j3h7r0j57vkmzksl9vj1h0igfxzpm347mm9q8";
           name = "automargin";
         };
@@ -3276,7 +3327,7 @@
           sha256 = "1z3hd2jkibwz2ijvyh066ki5g30pdqgh2vj2r35prpp12bqabw4a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autopair";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/autopair";
           sha256 = "161qhk8rc1ldj9hpg0k9phka0gflz9vny7gc8rnylk90p6asmr28";
           name = "autopair";
         };
@@ -3297,7 +3348,7 @@
           sha256 = "109il2s5ynfam510yli4xmi5zgw7xhr5gv096li24idqdp0gpf9n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autotest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/autotest";
           sha256 = "0f46m5pc40i531dzfnhkcn192dcs1q20y083c1c0wg2zhjcdr5iy";
           name = "autotest";
         };
@@ -3318,7 +3369,7 @@
           sha256 = "162zay36mmkkpbfvp0lagv2js4cr1z75dc1z5l2505814m5sx3az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autotetris-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/autotetris-mode";
           sha256 = "0k4yq4pvrs1zaf9aqxmlb6l2v4k774zbxj4zcx49w3l1h8gwxpbb";
           name = "autotetris-mode";
         };
@@ -3339,7 +3390,7 @@
           sha256 = "1lip7282g41ghn64dvx2ab437s83cj9l8ps1rd8rbhqyz4bx5wb9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autumn-light-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/autumn-light-theme";
           sha256 = "0g3wqv1yw3jycq30mcj3w4sn9nj6i6gyd2ljzimf547ggcai536a";
           name = "autumn-light-theme";
         };
@@ -3360,7 +3411,7 @@
           sha256 = "0awxmd2lf5rzkw9zdlsxm614asqrl324x2qv9lgakc1f663q72sl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/avy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/avy";
           sha256 = "0gjq79f8jagbngp0shkcqmwhisc3hpgwfk34kq30nb929nbnlmag";
           name = "avy";
         };
@@ -3381,7 +3432,7 @@
           sha256 = "1a6h44a6id4ash8kp0a59f34658p7czcl2d3i1880k8hckhy445j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/avy-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/avy-menu";
           sha256 = "1g2bsm0jpig51jwn9f9mx6z5glb0bn4s21194xam768qin0rf4iw";
           name = "avy-menu";
         };
@@ -3394,15 +3445,15 @@
     avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
     melpaBuild {
         pname = "avy-migemo";
-        version = "20160110.2233";
+        version = "20160210.1114";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "avy-migemo";
-          rev = "dc951e4c1cca64b97934bed1e7512859d8ff27ac";
-          sha256 = "0d8s16f8y9kypl083hgz5rbv47fkb3hvimgw57czf6hlcaaldy75";
+          rev = "d95d0485f2fc580a918c4769f669d273c7a6c334";
+          sha256 = "0n1c5xvr782zgvby38w6wxrqac1lx35n0m7rl4ki325c6dchkgsx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/avy-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/avy-migemo";
           sha256 = "1zvgkhma445gj1zjl8j25prw95bdpjbvfy8yr0r5liay6g2hf296";
           name = "avy-migemo";
         };
@@ -3423,7 +3474,7 @@
           sha256 = "0s7lhls6gs055kw0893nkb9myv7m2q2p251lq9wh2r3bmia9d6pg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/avy-zap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/avy-zap";
           sha256 = "1zbkf21ggrmg1w0xaw40i3swgc1g4fz0j8p0r9djm9j120d94zkx";
           name = "avy-zap";
         };
@@ -3441,7 +3492,7 @@
           sha256 = "1r1vbi1r3rdbkyb2naciqwja7hxigjhqfxsfcinnygabsi7fw9aw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/awk-it";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/awk-it";
           sha256 = "1rnrm9jf9wvfrwyylhj0bfrz9140945lc87lrh21caf7q88fpvkw";
           name = "awk-it";
         };
@@ -3461,7 +3512,7 @@
           sha256 = "1qq0b92mf73fnx2viwzlsxr6672wkskf0vjimymyhv9aq3gw165w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/axiom-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/axiom-environment";
           sha256 = "1d3h1fn5zfbh7kpm2i02kza3bq9s6if4yd2vvfjdhgrykvl86h66";
           name = "axiom-environment";
         };
@@ -3482,7 +3533,7 @@
           sha256 = "140lbpqq4qz45ykycdn8nvcn8pv0xqfwpapgprvyg8z5fjkyc4sg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/babel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/babel";
           sha256 = "0sdpp4iym61ni32zv75n48ylj4jib8ca6n9hyqwj1b7nqg76mm1c";
           name = "babel";
         };
@@ -3503,7 +3554,7 @@
           sha256 = "1wfssdv6ag36ww6v7al2x04mbpaajlx92wfm8rbq8rp8887724s5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/babel-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/babel-repl";
           sha256 = "0h11i8w8s4ia1x0lm5n7bnc3db4bv0a7f7hzl27qrg38m3c7dl6x";
           name = "babel-repl";
         };
@@ -3524,7 +3575,7 @@
           sha256 = "0rj6a8rdwa0h2ckz7h4d91hnxqcin98l4ikbfyak2whfb47z909l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/back-button";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/back-button";
           sha256 = "0vyhvm445d0rs14j5xi419akk5nd88d4hvm4251z62fmnvs50j85";
           name = "back-button";
         };
@@ -3549,7 +3600,7 @@
           sha256 = "0b9vvi2m0fdv36wj8mvawl951gjmg3pypg08a8n6rzn3rwg0fwz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/backup-each-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/backup-each-save";
           sha256 = "1fv9sf6vkjyv93vil4l9hjm2fg73zlxbnif0xfm3kpmva9xin337";
           name = "backup-each-save";
         };
@@ -3570,7 +3621,7 @@
           sha256 = "0z4d8x9lkad50720lgvr8f85p1ligv07865i30lgr9ck0q04w68v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/backup-walker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/backup-walker";
           sha256 = "0hfr27yiiblrd0p3zhpapbj4vijfdk7wqh406xnlwf2yvnfsqycd";
           name = "backup-walker";
         };
@@ -3591,7 +3642,7 @@
           sha256 = "0g8smx6pi2wqv78mhxfgwg51mx5msqsgcc55xcz29aq0q3naw4z1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/badger-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/badger-theme";
           sha256 = "01h5bsqllgn6gs0wpl0y2h041007mn3ldjswkz6f3mayrgl4c6yf";
           name = "badger-theme";
         };
@@ -3604,15 +3655,15 @@
     badwolf-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "badwolf-theme";
-        version = "20160120.1138";
+        version = "20160218.1631";
         src = fetchFromGitHub {
           owner = "bkruczyk";
           repo = "badwolf-emacs";
-          rev = "c75fad427851c65c2a7f11aeb95401acb951038e";
-          sha256 = "1jknanz09li3shlkdc6afg9qajz79bkinp5va3mymrmilj82wp1v";
+          rev = "1e3a9c50b884578d6add6149bf5fcab6f7d1e55c";
+          sha256 = "0rymxwxp6gi9ir8crvnv1mz4pns72xdhd9pnpzdqxvawwc76h4cc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/badwolf-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/badwolf-theme";
           sha256 = "03plkzpmlh0pgfp1c9padsh4w2g23clsznym8x4jabxnk0ynhq41";
           name = "badwolf-theme";
         };
@@ -3633,7 +3684,7 @@
           sha256 = "00skx1aywzvnqqsm41n2mwry5i6ifib8kzq5klymbrc7qfnbb55f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/baidu-life";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/baidu-life";
           sha256 = "0rib50hja33qk8dmw5i62gaxhx7mscj2y0n25jmnds7k88ms8z19";
           name = "baidu-life";
         };
@@ -3654,7 +3705,7 @@
           sha256 = "16240dj0hvxkljas9973wjdgkbx213sqws77j167yr5xf761dlsr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/base16-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/base16-theme";
           sha256 = "1zxbvfj6gvz1ynhj6i9q9y65hq7aq41qx4vnx738cjizcq0rc8bs";
           name = "base16-theme";
         };
@@ -3675,7 +3726,7 @@
           sha256 = "06c42531dy5ngscwfvg8rksg6jcsakfn7104hmlg1jp4kvfiy1kg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bash-completion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bash-completion";
           sha256 = "0l41yj0sb87i27hw6dh35l32hg4qkka6r3bpkckjnfm0xifrd9hj";
           name = "bash-completion";
         };
@@ -3696,7 +3747,7 @@
           sha256 = "1pbnw6ccphxynbhnc4g687jfcg33p1sa7a0mfxc2ai0i3z59gn78";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/basic-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/basic-theme";
           sha256 = "16rgff1d0s65alh328lr93zc06zmgbzgwx1rf3k3l4d10ki4cc27";
           name = "basic-theme";
         };
@@ -3714,7 +3765,7 @@
           sha256 = "1aa611jrzw4svmxvw1ghgh53x4nry0sl7mxmp4kxiaybqqvz6a1p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/batch-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/batch-mode";
           sha256 = "1p0rh5r8w00jag64sbjy8xb9g6lqhm2fz476v201kbrj9ggp643x";
           name = "batch-mode";
         };
@@ -3735,7 +3786,7 @@
           sha256 = "1fy9qnwsxvb8qnyk13bnjjbnlhdads5qf1byg5agg6lq5np3w5jf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bats-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bats-mode";
           sha256 = "1l5winy30w8fs3f5cylc3a3j3mfkvchwanlgsin7q76jivn87h7w";
           name = "bats-mode";
         };
@@ -3756,7 +3807,7 @@
           sha256 = "17ip24fk13aj9zldn2qsr4naa8anqhm484m1an5l5i9m9awfiyn7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbcode-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbcode-mode";
           sha256 = "0ixxavmilr6na56yc148prbh3nlhcwir6rxqvh332cr8vr9gmp89";
           name = "bbcode-mode";
         };
@@ -3775,7 +3826,7 @@
           sha256 = "e20dfe8085782948c1411685d45bad0cb7ff088bc2d1d2c1654c276356382b26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbdb";
           sha256 = "0zhs4psa9b9yf9hxm19q5znsny11cdp23pya3rrlmj39j4jfn73j";
           name = "bbdb";
         };
@@ -3796,7 +3847,7 @@
           sha256 = "17nbnkg0zn6p89r27mk9hl6qhv6xscwdsq8iyikdw03svpr16lnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbdb-";
           sha256 = "1vzbalcchay4pxl9f1sxg0zclgc095f59dlj15pj0bqq61sbl9jf";
           name = "bbdb-";
         };
@@ -3817,7 +3868,7 @@
           sha256 = "0m80k87dahzdpfa4snbl4p9zm5d5anc8s91535mwzsnfbr98qmhm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-android";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbdb-android";
           sha256 = "0v3njygqkcrwjkf7jrqmza6bwk2jp3956cx1qvf9ph7dfxsq7rn3";
           name = "bbdb-android";
         };
@@ -3838,7 +3889,7 @@
           sha256 = "07plwm5nh58qya03l8z0iaqh8bmyhywx7qiffkf803n8wwjb3kdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-china";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbdb-china";
           sha256 = "111lf256zxlnylfmwis0pngbpj73p59s520v8abbm7pn82k2m72b";
           name = "bbdb-china";
         };
@@ -3859,7 +3910,7 @@
           sha256 = "1h9vi9wb3dzzjrw5zfypk60afzzshxa3qmnbc24ypby5dr7qy91l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-csv-import";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbdb-csv-import";
           sha256 = "0r7pc2ypd1ydqrnvcqmsg69rm047by7k0zhm563538ra82597wnm";
           name = "bbdb-csv-import";
         };
@@ -3880,7 +3931,7 @@
           sha256 = "1ydf89mmp3zjfqdymnrwg18wclyf7psarz9f2k82pl58h0khh71g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbdb-ext";
           sha256 = "0fnxcvzdyh0602rdfz3lz3vmvza4s0syz1vn2fgsn2lg3afqq7li";
           name = "bbdb-ext";
         };
@@ -3901,7 +3952,7 @@
           sha256 = "04yxky7qxh0s4y4addry85qd1074l97frhp0hw77xd1bc7n5zzg0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-handy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbdb-handy";
           sha256 = "0qv1lw4fv9w9c1ypzpbnvkm6ypqrzqpwyw5gpi7n9almxpd8d68z";
           name = "bbdb-handy";
         };
@@ -3922,7 +3973,7 @@
           sha256 = "1zlf9xhpirln72xr7v6kgndkg5wyz5ipsl4gpq9lbmp92jlgbwlj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-vcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbdb-vcard";
           sha256 = "1kn98b7mh9a28933r4yl8qfl9p92rpix4vkp71sar9cka0m71ilj";
           name = "bbdb-vcard";
         };
@@ -3943,7 +3994,7 @@
           sha256 = "1zkh7dcas80wwjvigl27wj8sp4b5z6lh3qj7zkziinwamwnxbdbs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb2erc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbdb2erc";
           sha256 = "0k1f6mq9xd3568vg01dqqvcdbdshbdsi4ivkjyxis6dqfnqhlfdd";
           name = "bbdb2erc";
         };
@@ -3964,7 +4015,7 @@
           sha256 = "1cdm4d6fjf3m495phynq0dzvv0wc0gfsw6fdq4d47iyxs0p4q2dl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbyac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbyac";
           sha256 = "19s9fqcdyqz22m981vr0p8jwghbs267yrlxsv9xkfzd7fccnx170";
           name = "bbyac";
         };
@@ -3985,7 +4036,7 @@
           sha256 = "0d5b7zyl2vg621w1ll2lw3kjz5hx6lqxc0jivh0i449gckk5pzkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bdo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bdo";
           sha256 = "0vp8am2x11abxganw90025w9qxnqjdkj015592glbbzpa6338nfl";
           name = "bdo";
         };
@@ -3998,15 +4049,15 @@
     beacon = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "beacon";
-        version = "20160125.547";
+        version = "20160206.1117";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "beacon";
-          rev = "7104ad532419689513d8f72dc61badd4e0272558";
-          sha256 = "016c8lmcwlivxr1snh9dk57ssl0vj8v4nazddxchqxc2bibd3csl";
+          rev = "9e55c293a80c6173db756200742e74cb06468ab0";
+          sha256 = "04gnbil12ixkvgmmdw5fx90b9hbz2jf0hzic1v96fnzq9280ccjf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/beacon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/beacon";
           sha256 = "1pwxvdfzs9qjd44wvgimipi2hg4qw5sh5wlsl8h8mq2kyx09s7hq";
           name = "beacon";
         };
@@ -4019,15 +4070,15 @@
     beeminder = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "beeminder";
-        version = "20150104.1634";
+        version = "20160209.2103";
         src = fetchFromGitHub {
           owner = "sodaware";
           repo = "beeminder.el";
-          rev = "92fa1a8d1df3e2fd0698192008f604b1794ee5f8";
-          sha256 = "1ckbl8z59p81jsq8xsgcwqqrpzv1apzjr594w3dyp9bzqb7h2acm";
+          rev = "a4e159250bac89bc25ced8523a5eac2a951cd5b6";
+          sha256 = "0ki9q3ylssjabh15dr49k7dxv88snpj4564g0myp3c61qzyy82lk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/beeminder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/beeminder";
           sha256 = "0aj7ix7nrsl89f9c449kik8fbzhfk9li50wrh50cdwgfh8gda0fx";
           name = "beeminder";
         };
@@ -4048,7 +4099,7 @@
           sha256 = "1hyiz7iwnzbg1616q0w7fndllbnx4m98kakgxn04bsqib5fqk78p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/beginend";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/beginend";
           sha256 = "1y81kr9q0zrsr3c3s14rm6l86y5wf1a0kia6d98112fy4fwdm7kq";
           name = "beginend";
         };
@@ -4069,7 +4120,7 @@
           sha256 = "058mic9jkwiqvmp3k9sfd6gb70ysdphnb1iynlszhixbrz5w7zs2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/benchmark-init";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/benchmark-init";
           sha256 = "0dknch4b1j7ff1079z2fhqng7kp4903b3v7mhj15b5vzspbp3wal";
           name = "benchmark-init";
         };
@@ -4090,7 +4141,7 @@
           sha256 = "06izbc0ksyhgh4gsjiifhj11v0gx9x5xjx9aqci5mc4kc6mg05sf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bert";
           sha256 = "1zhz1dcy1nf84p244x6lc4ajancv5fgmqmbrm080yhb2ral1z8x7";
           name = "bert";
         };
@@ -4111,7 +4162,7 @@
           sha256 = "1rxznx2l0cdpiz8mad8s6q17m1fngpgb1cki7ch6yh18r3qz8ysr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/better-defaults";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/better-defaults";
           sha256 = "13bqcmx2gagm2ykg921ik3awp8zvw5d4lb69rr6gkpjlqp7nq2cm";
           name = "better-defaults";
         };
@@ -4129,7 +4180,7 @@
           sha256 = "05dlhhvd1m9q642gqqj6klif13shbinqi6bi72fldidi1z6wcqlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/better-registers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/better-registers";
           sha256 = "01i0qjrwsc5way2h9z3pmsgccsbdifsq1dh6zhka4h6qfgrmn3bx";
           name = "better-registers";
         };
@@ -4150,7 +4201,7 @@
           sha256 = "02b2m0cq04ynjcmr4j8gpdzjv9mpf1fysn736xv724xgaymj396n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bf-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bf-mode";
           sha256 = "0b1yf9bx1ldkzry7v5qvcnl059rq62a50dvpa10i2f5v0y96n1q9";
           name = "bf-mode";
         };
@@ -4171,7 +4222,7 @@
           sha256 = "1y9fxs1nbf0xsn8mw45m9ghmji3h64wdbfnyr1npmf5fb27rmd17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bfbuilder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bfbuilder";
           sha256 = "16ckybqd0a8l75ascm3k4cdzp969lzq7m050aymdyjhwif6ld2r7";
           name = "bfbuilder";
         };
@@ -4192,7 +4243,7 @@
           sha256 = "0rwy4k06nd9a31hpyqs0fxp45dpddbvbhwcw1gzx4f73qmgawq9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bibretrieve";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bibretrieve";
           sha256 = "1mf884c6adx7rq5c2z5wrnjpb6znljy30mscxskwqiyfs8c62mii";
           name = "bibretrieve";
         };
@@ -4213,7 +4264,7 @@
           sha256 = "077shjz9sd0k0akvxzzgjd8a626ck650xxlhp2ws4gs7rjd7a823";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bibslurp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bibslurp";
           sha256 = "178nhng87bdi8s0r2bdh2gk31w9mmjkyi6ncnddk3v7p8fsh4jjp";
           name = "bibslurp";
         };
@@ -4234,7 +4285,7 @@
           sha256 = "1qf45s53vcbd90v2d2brynv3xmp8sy9w9jp611cf0dzfl1k7x8p8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bibtex-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bibtex-utils";
           sha256 = "13llsyyvy0xc9s51cqqc1rz13m3qdqh8jw07gwywfbixlma59z8l";
           name = "bibtex-utils";
         };
@@ -4255,7 +4306,7 @@
           sha256 = "05lhxbrgwbyz0nkb19yln9a46jh91ic685943hd58cn91lxsw3al";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bind-chord";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bind-chord";
           sha256 = "01a3c298kq8cfsxsscpic0shkjm77adiamgbgk8laqkbrlsrrcsb";
           name = "bind-chord";
         };
@@ -4268,15 +4319,15 @@
     bind-key = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bind-key";
-        version = "20160112.958";
+        version = "20160206.1456";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "a29e0328c0076cc927e5fd3d8db1878c0f978ace";
-          sha256 = "0s4qmqgym12gk8kiz90ck5yi7icz8dydyks0psfam1nza89cbfys";
+          rev = "6b1956813f0f0e553a7eb6923ff846f9c3556146";
+          sha256 = "13yzxlxkykv3qkaaifn3pf0y94dgqysxz5p7vh71jpqxi6d7jmgr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bind-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bind-key";
           sha256 = "1qw2c27016d3yfg0w10is1v72y2jvzhq07ca4h6v17yi94ahj5xm";
           name = "bind-key";
         };
@@ -4289,15 +4340,15 @@
     bind-map = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "bind-map";
-        version = "20160201.656";
+        version = "20160211.1121";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-bind-map";
-          rev = "00b7778826f683e56ccfa3044b6312a1fcfdeb13";
-          sha256 = "1kk2hig6ag07iihkhr880n332789r5p2zz26a25dwqkr27jgs7x8";
+          rev = "f4fad049d0bb6ebdc729bc6d356288f2dd96e2f3";
+          sha256 = "023rck51m264qx38270ai5ib8wipa8q952bagi1dqi6xp5k6lsjs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bind-map";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bind-map";
           sha256 = "1jzkp010b4vs1bdhccf5igmymfxab4vxs1pccpk9n5n5a4xaa358";
           name = "bind-map";
         };
@@ -4318,7 +4369,7 @@
           sha256 = "0pmpg54faq0l886f2cmnmwm28d2yfg8adk7gp7623gx0ifggn332";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bing-dict";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bing-dict";
           sha256 = "0s5pd08rcnvmgi1hw17xbzvswlv0yni6h2h2gccrjmf6izi8whh1";
           name = "bing-dict";
         };
@@ -4339,7 +4390,7 @@
           sha256 = "1n5icy29ks5rxrxp7v4sf0523z7wxn0fh9lx4y6jb7ppdjnff12s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/birds-of-paradise-plus-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/birds-of-paradise-plus-theme";
           sha256 = "0vdv2siy30kf1qhzrc39sygjk17lwm3ix58pcs3shwkg1y5amj3m";
           name = "birds-of-paradise-plus-theme";
         };
@@ -4360,7 +4411,7 @@
           sha256 = "0iccafawm9ah62f7qq1k77kjpafhcpjcaiqh5xjig1wxnpc43ck7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bison-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bison-mode";
           sha256 = "097gimlzmyrsfnl76cbzyyi9dm0d2y3f9107672h56ncri35mh66";
           name = "bison-mode";
         };
@@ -4381,7 +4432,7 @@
           sha256 = "14dsjbw4ss3i6ydynm121v5j3idvy85sk1vqbr5r871d32179xan";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bitbake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bitbake";
           sha256 = "1k2n1i8g0jc78sp1icm64rlhi1q0vqar2a889nldp134a1l7bfah";
           name = "bitbake";
         };
@@ -4402,7 +4453,7 @@
           sha256 = "1cnx5kr0hah4h4b6arp7hb2i556vpx1dwmziny2csil39hkcjgbs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bitlbee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bitlbee";
           sha256 = "15xb0vjamnfwi25yqd37zwfm6xb6p71if88hk2ymxikza4i47x0f";
           name = "bitlbee";
         };
@@ -4423,7 +4474,7 @@
           sha256 = "09blh9cbcbqr3pdaiwm9fmh5kzqm1v9mffy623z3jn87g5wadrmb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bitly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bitly";
           sha256 = "032s7ax8qp3qzcj1njbyyxiyadjirphswqdlr45zj6hzajfsr247";
           name = "bitly";
         };
@@ -4441,7 +4492,7 @@
           sha256 = "1wdplnmdllbydwr9gyyq4fbkxl5xjh7220vd4iajyv74pg2jkkkv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/blank-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/blank-mode";
           sha256 = "1pyx5xwflnni9my5aqpgf8xz4q4rvmj67pwb4zxx1lghrca97z87";
           name = "blank-mode";
         };
@@ -4462,7 +4513,7 @@
           sha256 = "1pslwyaq18d1z7fay2ih3n27i6b49ss62drqqb095l1jxk42xxm0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/blgrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/blgrep";
           sha256 = "0w7453vh9c73hdfgr06693kwvhznn9xr1hqa65izlsx2fjhqc9gm";
           name = "blgrep";
         };
@@ -4483,7 +4534,7 @@
           sha256 = "0dn0i3nxrqd82b9d17p1v0ddlpxnlfclkc8sqzrwq6cf19wcrmdr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bliss-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bliss-theme";
           sha256 = "1kzvi6zymfgirr41l8r2kazfz1y4xkigbp5qa1fafcdmw81anmdh";
           name = "bliss-theme";
         };
@@ -4504,7 +4555,7 @@
           sha256 = "0zhcjg68nzqdrlnbm7akzgn4px3prrqjjym2qzfirmdbq6dxifgg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/blog-admin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/blog-admin";
           sha256 = "0l2si3fyi7kz4px3m8m0i71xvlsrx0y81247j1kcl7iax53zkl8c";
           name = "blog-admin";
         };
@@ -4525,7 +4576,7 @@
           sha256 = "1ggqg0lgvxg2adq91damvh55m36qsa23n3z6zyf5z6855ilzaa4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bm";
           sha256 = "07459r7m12j2nsb7qrb26bx32alylhaaq3z448n42lz02a8dc63g";
           name = "bm";
         };
@@ -4546,7 +4597,7 @@
           sha256 = "0fy2jwpgvqlff5bn0l971xxb76krm3idjqjl61qgim6a45kip057";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bog";
           sha256 = "1ci8xxca7dclmi5v37y5k45qlmzs6a9hi6m7czgiwxii902w5pkl";
           name = "bog";
         };
@@ -4567,7 +4618,7 @@
           sha256 = "0ghjfrwc2i04rxg3nqc5fg2kgfyjlhk8n2qcz53p9i7ncc3zgpha";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bongo";
           sha256 = "07i9gw067r2igp6s2g2iakm1ybvw04q6zznna2cfdf08nax64ghv";
           name = "bongo";
         };
@@ -4588,7 +4639,7 @@
           sha256 = "06cpbjbv8ysz81szwgglgy5r1aay8rrzw5k86wyqg9jdzwpmilpn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bonjourmadame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bonjourmadame";
           sha256 = "0d36yradh37359fjk59s54hxkbh4qcc17sblj2ylcdyw7181iwfn";
           name = "bonjourmadame";
         };
@@ -4609,7 +4660,7 @@
           sha256 = "11m0w8i2nq0nqrpg6m7vnn9sd3v1ln5b3rka7m9fnasadf77nmpv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/boogie-friends";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/boogie-friends";
           sha256 = "0cfs7gvjxsx2027dbzh4yypz500nmk503ikiiprbww8jyvc8grk7";
           name = "boogie-friends";
         };
@@ -4627,7 +4678,7 @@
           sha256 = "06621js3bvslfmzmkphzzcrd8hbixin2nx30ammcqaa6572y14ad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bookmark+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bookmark+";
           sha256 = "0121xx7dp2pakk9g7sg6par4mkxd9ky746yk4wh2wrhprc9dqzni";
           name = "bookmark-plus";
         };
@@ -4640,15 +4691,15 @@
     boon = callPackage ({ emacs, expand-region, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors }:
     melpaBuild {
         pname = "boon";
-        version = "20160202.1455";
+        version = "20160208.1544";
         src = fetchFromGitHub {
           owner = "jyp";
           repo = "boon";
-          rev = "f6edf01a9f300d6e160f0c2c17619d3f6d1fa785";
-          sha256 = "149slx8cqh28hzb5cfa1ink99c18dh548jg2w54hvkzvqhhwhn7v";
+          rev = "61ba05750964a765c4cff89ecd13092bcf420549";
+          sha256 = "061alzr4w0xxyc71ri8ramafmzj5c4iwvd3zcq6i0p67qyic4nsx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/boon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/boon";
           sha256 = "0gryw7x97jd46jgrm93cjagj4p7w93cjc36i2ps9ajf0d8m4gajb";
           name = "boon";
         };
@@ -4669,7 +4720,7 @@
           sha256 = "0yzfxxv2bw4x320268bixfc7yf97851804bz3829vbdhnr4kp6y5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/borland-blue-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/borland-blue-theme";
           sha256 = "1sc8qngm40bwdym8k1dgbahg48i73c00zxd99kqqwm9fnd6nm7qx";
           name = "borland-blue-theme";
         };
@@ -4690,7 +4741,7 @@
           sha256 = "1gys5ri56s2s525wdji3m72sxzswmb8cmhmw5iha84v7hlqkrahb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/boron-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/boron-theme";
           sha256 = "1rrqlq08jnh9ihb99ji1vvmamj742assnm4a7xqz6gp7f248nb81";
           name = "boron-theme";
         };
@@ -4711,7 +4762,7 @@
           sha256 = "0235l4f1cxj7nysfnay4fz52mg0c13pzqxbhw65vdpfzz1gl1p73";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/boxquote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/boxquote";
           sha256 = "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s";
           name = "boxquote";
         };
@@ -4732,7 +4783,7 @@
           sha256 = "0chmarbpqingdma54d6chbr6v6jg8lapbw56cpvcpbl04fz980r0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bpe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bpe";
           sha256 = "08zfqcgs7i2ram2qpy8vrzksx5722aahr66vdi4d9bcxm03s19fm";
           name = "bpe";
         };
@@ -4753,7 +4804,7 @@
           sha256 = "05x9fmxlybas3gcv3qf1vcfh5k265hjwh73232fyg2v562if748z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bpr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bpr";
           sha256 = "0rjxn40n4s4xdq51bq0w3455g9pli2pvcf1gnbr96zawbngrw6x2";
           name = "bpr";
         };
@@ -4774,7 +4825,7 @@
           sha256 = "00463z740xrkr4yz46g9zxz23zy878jgvba81pnwvg4l6hd3kc8s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bracketed-paste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bracketed-paste";
           sha256 = "1v7zwi29as0218vy6ch21iqqcxfhyh373m3dbcdzm2pb8bpcg58j";
           name = "bracketed-paste";
         };
@@ -4795,7 +4846,7 @@
           sha256 = "1nzgjgzidyrplfs4jl8nikd5wwvb4rmrnm51qxmw9y2if0hpq0jd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/brainfuck-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/brainfuck-mode";
           sha256 = "08jzx329mrr3c2pifs3hb4i79dsw606b0iviagaaja8s808m40cd";
           name = "brainfuck-mode";
         };
@@ -4816,7 +4867,7 @@
           sha256 = "0w6b9rxdciy1365kgf6fh3vgrjr8xd5ar6xcn0g4h56f2zg9hdmj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/broadcast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/broadcast";
           sha256 = "1h2c3mb49q3vlpalrsrx8q3rmy1zg0y45ayvzbvzdkfgs8idgbib";
           name = "broadcast";
         };
@@ -4837,7 +4888,7 @@
           sha256 = "0q71ah62q6acivhxzsw9j1ky54i9hhlnj97sjn8bxrxx7nw01gf7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/browse-at-remote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/browse-at-remote";
           sha256 = "1d40b9j3pc6iy3l25062k7f52aq0vk9sizdwd7wii3v5nciczv6w";
           name = "browse-at-remote";
         };
@@ -4858,7 +4909,7 @@
           sha256 = "0sndzhza9k4vcf70fzxsyzrfryaz92lm1y7bbb0dx10m65qljpbi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/browse-kill-ring";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/browse-kill-ring";
           sha256 = "1d97ap0vrg5ymp96z7y6si98fspxzy02jh1i4clvw5lggjfibhq4";
           name = "browse-kill-ring";
         };
@@ -4877,7 +4928,7 @@
           sha256 = "1z6pix1ml3s97jh34fwjj008ihlrz4hkipdh5yzcvc6nhrimjw2f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/browse-kill-ring+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/browse-kill-ring+";
           sha256 = "1flw7vmqgsjjvr2zlgz2909gvpq9mhz8qkg6hvsrzwg95f4l548w";
           name = "browse-kill-ring-plus";
         };
@@ -4898,7 +4949,7 @@
           sha256 = "1rcihwdxrzhgcz573rh1yp3770ihkwqjqvd39yhic1d3sgwxz2hy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/browse-url-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/browse-url-dwim";
           sha256 = "13bv2ka5pp9k4kwrxfqfawwxzsqlakvpi9a32gxgx7qfi0dcb1rf";
           name = "browse-url-dwim";
         };
@@ -4916,7 +4967,7 @@
           sha256 = "1yslzlx54n17330sf6b2pynz01y6ifnkhipz4hggn1i55bz8hvrw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bs-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bs-ext";
           sha256 = "0dddligqr71qdakgfkx0r45k9py85qlym7y5f204bxppyw5jmwb6";
           name = "bs-ext";
         };
@@ -4937,7 +4988,7 @@
           sha256 = "022j0gw5qkxjz8f70vqjxysifv2mz6cigf9n5z03zmpvwwvxmx2z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/btc-ticker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/btc-ticker";
           sha256 = "1vfnx114bvnly1k3fmcpkqq4m9558wqr5c9k9yj8f046dgfh8dp1";
           name = "btc-ticker";
         };
@@ -4958,7 +5009,7 @@
           sha256 = "1qgasaqhqm0birjmb6k6isd2f5pn58hva8db8qfhva9g5kg1f38w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bts";
           sha256 = "1i1lbjracrgdxr52agxhxxgkra4w291dmz85s195lcx38rva7ib3";
           name = "bts";
         };
@@ -4979,7 +5030,7 @@
           sha256 = "1sfr3j11jz4k9jnfa9i05bp4v5vkil38iyrgsp3kxf15797b9dg9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bts-github";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bts-github";
           sha256 = "03lz12bbkjqbs82alc97k6s1pmk721qip3h9cifq8a5ww5cbq9ln";
           name = "bts-github";
         };
@@ -5000,7 +5051,7 @@
           sha256 = "1aha8rzilv4k300rr4l9qjfygydfwllkbw17lhm8jz0kh9w6bd28";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bubbleberry-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bubbleberry-theme";
           sha256 = "056pcr9ynsl34wqa2pw6sh4bdl5kpp1r0pl1vvw15p4866l9bdz3";
           name = "bubbleberry-theme";
         };
@@ -5021,7 +5072,7 @@
           sha256 = "1p5a29bpjqr1gs6sb6rr7y0j06nlva23wxkwfskap25zvjpgwbvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buffer-buttons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/buffer-buttons";
           sha256 = "1p0ydbrff9197sann3s0d7hpav7r9g461w4llncafmy31w7m1dn6";
           name = "buffer-buttons";
         };
@@ -5042,7 +5093,7 @@
           sha256 = "0s43cvkr1za5sd2cvl55ig34wbp8xyjf85snmf67ps04swyyk92q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buffer-flip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/buffer-flip";
           sha256 = "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098";
           name = "buffer-flip";
         };
@@ -5063,7 +5114,7 @@
           sha256 = "1yzga2zs9flbarsh704hh7k4l3w09g4li9a7r3fsvl4kll80x393";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buffer-move";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/buffer-move";
           sha256 = "0wysywff2bggrha7lpl83c8x6ln7zgdj9gsqmjva6gramqb260fg";
           name = "buffer-move";
         };
@@ -5081,7 +5132,7 @@
           sha256 = "0d87cl7a4rcd6plbjyf26vaar7imwd18z24xdi4dz734m9zbkg6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buffer-stack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/buffer-stack";
           sha256 = "00vxfd4ki5pqf9n9vbmn1441vn2y14bdr1v05h46hswf13b4hzrn";
           name = "buffer-stack";
         };
@@ -5102,7 +5153,7 @@
           sha256 = "1mnf0dgr6g58k0jyia7985jsinrla04vm5sjl2iajwphbhadjk8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buffer-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/buffer-utils";
           sha256 = "0cfipdn4fc4fvz513mwiaihvbdi05mza3z5z1379wlljw6r539z2";
           name = "buffer-utils";
         };
@@ -5123,7 +5174,7 @@
           sha256 = "1plh77xzpbhgmjdagm5rhqx6nkhc0g39ir0b6s5yh003wmx6r1hh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bufshow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bufshow";
           sha256 = "027cd0jzb8yxm66q1bhyi75f2m9f2pq3aswgav1d18na3ybwg65h";
           name = "bufshow";
         };
@@ -5144,7 +5195,7 @@
           sha256 = "0zr1raf0q5wi3vr66kglxcfxswlm8g2l501adm8c27clvqizpnrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bug-reference-github";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bug-reference-github";
           sha256 = "18yzxwanbrxsab6ba75z1196x0m6dapdhbvy6df5b5x5viz99cf6";
           name = "bug-reference-github";
         };
@@ -5165,7 +5216,7 @@
           sha256 = "0gr4v6fmg0im17f6i3pw6h8l401n5l5lzxz0hgi8lrisvx73iqa5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bundler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bundler";
           sha256 = "0i5ybc6i8ackxpaa75kwrg44zdq3jkvy48c42vaaafpddjwjnsy4";
           name = "bundler";
         };
@@ -5186,7 +5237,7 @@
           sha256 = "1bzilpjibyyj97z5j7zz89jx0kfqr842lrjlnq1qki8r5kj18p4j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bury-successful-compilation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bury-successful-compilation";
           sha256 = "1gkq4r1573m6m57fp7x69k7kcpqchpcqfcz3792v0wxr22zhkwr3";
           name = "bury-successful-compilation";
         };
@@ -5207,7 +5258,7 @@
           sha256 = "1viq7cb41r8klr8i38c5zjrhdnww31gh4j51xdgy4v2lc3z321zi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buster-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/buster-mode";
           sha256 = "1qndhchc8y27x49znhnc4rny1ynfcplr64rczrlbj53qmkxn5am7";
           name = "buster-mode";
         };
@@ -5228,7 +5279,7 @@
           sha256 = "11djqlw4qf3qs2rwiz7dn5q2zw5i8sykwdf4hg4awsgv8g0bbxn6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buster-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/buster-snippets";
           sha256 = "0k36c2k7wwix10rgmjxipc77fkn9jahjyvl191af6w41wla47x4x";
           name = "buster-snippets";
         };
@@ -5249,7 +5300,7 @@
           sha256 = "11z987frzswnsym8g3l0s9wwdly1zn5inl2l558m6kcvfy7g59cx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/busybee-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/busybee-theme";
           sha256 = "0w0z5x2fbnalv404av3mapfkqbfgyk81a1mzvngll8x0pirbyi10";
           name = "busybee-theme";
         };
@@ -5270,7 +5321,7 @@
           sha256 = "0pp604r2gzzdpfajw920607pklwflk842difdyl4hy9w87fgc0jg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/butler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/butler";
           sha256 = "1jv74l9jy55qpwf5np9nlj6a1wqsm3xirm7wm89d1h2mbsfcr0mq";
           name = "butler";
         };
@@ -5283,15 +5334,15 @@
     buttercup = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "buttercup";
-        version = "20160110.122";
+        version = "20160217.1542";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "emacs-buttercup";
-          rev = "e1f71acdef3de3033d24be1cb41933eefc75029f";
-          sha256 = "0lpfx7q0qrclxii4ffrrjffb678bsx908za91nsy7mc2g0cxcapb";
+          rev = "2aa840cb0e99251d299507859e98eb7341758fc9";
+          sha256 = "0lskdb1bxgnpamxvg5c5kdqafp0k770zy3ic38945nb6bnd1bimv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buttercup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/buttercup";
           sha256 = "1grrrdk5pl9l1jvnwzl8g0102gipvxb5qn6k2nmv28jpl57v8dkb";
           name = "buttercup";
         };
@@ -5312,7 +5363,7 @@
           sha256 = "06qjvybf65ffrcnhhbqs333lg51fawaxnva3jvdg7zbrsv4m9acl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/button-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/button-lock";
           sha256 = "1arrdmb3nm570hgs18y9sz3z9v0wlkr3vwa2zgfnc15lmf0y34mp";
           name = "button-lock";
         };
@@ -5333,7 +5384,7 @@
           sha256 = "040mcq2cwzbrf96f9mghb4314cd8xwp7ki2ix9fxpmbwiy323ld5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/c-c-combo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/c-c-combo";
           sha256 = "09rvh6n2hqls7qki5dc34s2hmcmlvdsbgzcxgglhcmrhwx5w4vxn";
           name = "c-c-combo";
         };
@@ -5354,7 +5405,7 @@
           sha256 = "0mlm5f66541namqn04vx6csf14mxhsiknbm36yqdnp1lxb7knv7a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/c-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/c-eldoc";
           sha256 = "13grkww14w39y2x6mrbfa9nzljsnl5l7il8dnj6sjdyv0hz9x8vm";
           name = "c-eldoc";
         };
@@ -5375,7 +5426,7 @@
           sha256 = "10k90r4ckkkdjn9pqcbfyp6ynvrd5k0ngqcn5d0v1qvkn6jifxjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/c0-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/c0-mode";
           sha256 = "0s3h4b3lpz4jsk222yyfdxh780dvykhaqgyv6r3ambz95vrmmpl4";
           name = "c0-mode";
         };
@@ -5385,6 +5436,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    cabledolphin = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, seq }:
+    melpaBuild {
+        pname = "cabledolphin";
+        version = "20160204.338";
+        src = fetchFromGitHub {
+          owner = "legoscia";
+          repo = "cabledolphin";
+          rev = "fffc192cafa61558e924323d6da8166fe5f2a6f9";
+          sha256 = "1h395hvia7r76zlgr10qdr9q2159qyrs89znhkp2czikwm8kjiqk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cabledolphin";
+          sha256 = "04slrx0vkcm66q59158limn0cpxn18ghlqyx7z8nrn7frrc03z03";
+          name = "cabledolphin";
+        };
+        packageRequires = [ emacs seq ];
+        meta = {
+          homepage = "http://melpa.org/#/cabledolphin";
+          license = lib.licenses.free;
+        };
+      }) {};
     cache = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cache";
@@ -5396,7 +5468,7 @@
           sha256 = "1hp6dk84vvgkmj5lzghvqlpq3axwzgx9c7gly2yx6497fgf9jlby";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cache";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cache";
           sha256 = "0lzj0h23g6alqcmd20ack53p72g9i09dp9x0bp3rdw5izcfkvhh3";
           name = "cache";
         };
@@ -5417,7 +5489,7 @@
           sha256 = "07kzhyqr8ycjvkknijqhsfr26zd5jc8wxm9sl8bp6pzn4jbs1dmx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cacoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cacoo";
           sha256 = "0kri4vi6dpsf0zk24psm16f3aa27cq5b54ga7zygmr02csq24a6z";
           name = "cacoo";
         };
@@ -5438,7 +5510,7 @@
           sha256 = "0bvrwzjx93qyx97qqw0imvnkkx4w91yk99rnhcmk029zj1fy0kzg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cake";
           sha256 = "06qlqrazz2jr08g44q73hx9vpp6xnjvkpd6ky108g0xc5p9q2hcr";
           name = "cake";
         };
@@ -5459,7 +5531,7 @@
           sha256 = "0xq10jkbk3crdhbh4lab39xhfw6vvcqz3if5q3yy4gzhx7zp94i4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cake-inflector";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cake-inflector";
           sha256 = "04mrqcm1igb638skaq2b3nr5yzxnck2vwhln61rnh7lkfxq7wbwf";
           name = "cake-inflector";
         };
@@ -5480,7 +5552,7 @@
           sha256 = "15w21r0gqblbn9wlvb4wlm3706wf01r38mp465snjzi839f6sazb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cake2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cake2";
           sha256 = "03q8vqqjlhahgnyy976c46x52splwdjpmb9ngrj5c2z7d8n9145x";
           name = "cake2";
         };
@@ -5501,7 +5573,7 @@
           sha256 = "03hi0ggq81nm1kd0mcf8fwnya4axzd80vfdjdbhgpxbkvnxldzpv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cal-china-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cal-china-x";
           sha256 = "06mh2p14m2axci8vy1hr7jpy53jj215z0djyn8h7zpr0k62ajhka";
           name = "cal-china-x";
         };
@@ -5522,7 +5594,7 @@
           sha256 = "1rv6slk3a7ca2q16isjlkmgxbxmbqx4lx2ip7z33fvnq10r5h60n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/calfw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/calfw";
           sha256 = "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8";
           name = "calfw";
         };
@@ -5543,7 +5615,7 @@
           sha256 = "14n5rci4bkbl7037xvkd69gfxnjlgvd2j1xzciqcgz92f06ir3xi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/calfw-gcal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/calfw-gcal";
           sha256 = "182p56wiycrm2cjzmlqabksyshpk7nga68jf80vjjmaavp5xqsq8";
           name = "calfw-gcal";
         };
@@ -5564,7 +5636,7 @@
           sha256 = "0n6y4z3qg04qnlsrjysf8ldxl2f2bk7n8crijydwabyy672qxd9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/calmer-forest-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/calmer-forest-theme";
           sha256 = "0riz5n8fzvxdnzgg650xqc2zwc4xvhwjlrrzls5h0pl5adaxz96p";
           name = "calmer-forest-theme";
         };
@@ -5585,7 +5657,7 @@
           sha256 = "1fxmk9ykvxkd0ldmldqnwdn5grzzzigla7zsw1yqqmlfwd48ggf8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/camcorder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/camcorder";
           sha256 = "1kbnpz3kn8ycpy8nlp8bsnnd1k1h7m02h7w5f7raw97sk4cnpvbi";
           name = "camcorder";
         };
@@ -5604,7 +5676,7 @@
           sha256 = "16qw82m87i1fcnsccqcvr9l6p2cy0jdhljsgaivq0q10hdmbgqdw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/caml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/caml";
           sha256 = "0kxrn9s1h2l05akcdcj6fd3g6x5wbi511mf14g9glcn8azyfs698";
           name = "caml";
         };
@@ -5625,7 +5697,7 @@
           sha256 = "08cp45snhyir5w8gyp6xws1q7c54pz06q099l0m3zmwn9277g68z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/capture";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/capture";
           sha256 = "1hxrvyq8my5886q7wj5w3mhyja7d6cf19gyclap492ci7kmrkdk2";
           name = "capture";
         };
@@ -5646,7 +5718,7 @@
           sha256 = "07szswvfzvyd9sx1r4x8hyyc3984k4qqj8m24ybnjgmiax57hgkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cargo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cargo";
           sha256 = "06zq657cxfk5l4867qqsvhskcqc9wswyl030wj27a43idj8n41jx";
           name = "cargo";
         };
@@ -5667,7 +5739,7 @@
           sha256 = "14ijcb9qp1gv8ianqm7cdvwjkgpwdaw3lz34j29c3rmg5ir26bjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/caroline-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/caroline-theme";
           sha256 = "07flxggnf0lb1fnvprac1daplgx4bi5fnnkgfc58wnw805s12k32";
           name = "caroline-theme";
         };
@@ -5688,7 +5760,7 @@
           sha256 = "1nibzay3nb1n7z36w55m6kjqsj5yqj89way81f647jgbjggr6bih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/caseformat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/caseformat";
           sha256 = "1qwyr74jbx4jpfcw8sccg47q1vdg094rr06m111gsz2yaj9m0gfk";
           name = "caseformat";
         };
@@ -5709,7 +5781,7 @@
           sha256 = "0zky8d9kdrcfh4vh8v6wbzs80nixr1xnnyjgg1zdingyklrxl79y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cask";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cask";
           sha256 = "11nr6my3vlb1xiyai7qwii3nszda2mnkhkjlbh3d0699h0yw7dk5";
           name = "cask";
         };
@@ -5730,7 +5802,7 @@
           sha256 = "1m40s9q00l06fz525m3zrvwd6s60lggdqls5k5njkn671aa3h71s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cask-package-toolset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cask-package-toolset";
           sha256 = "13ix093c0a58rjqj7zfp3914xj3hvj276gb2d8zhvrx9vvs1345g";
           name = "cask-package-toolset";
         };
@@ -5751,7 +5823,7 @@
           sha256 = "15sq5vrkhb7c5j6ny6wy4bkyl5pggch4l7zw46an29rzni3pffr3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/caskxy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/caskxy";
           sha256 = "0x4s3c8m75zxsvqpgfc5xwll0489zzdnngmnq048z9gkgcd7pd2s";
           name = "caskxy";
         };
@@ -5772,7 +5844,7 @@
           sha256 = "125d5i7ycdn2hgffc1l3jqcfzvk70m1ciywj4h53qakkl15r9m38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cbm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cbm";
           sha256 = "02ch0gdw610c8dfxxjxs7ijsc9lzbhklj7hqgwfwksnyc36zcjmn";
           name = "cbm";
         };
@@ -5789,11 +5861,11 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "64ad0ea6d03c0d46030cc5aaa3715b5cf3a82d3c";
-          sha256 = "02bsiq0kxm9cbbr6hr20ac4888mcyk0i8p9hrrdvaijq4fhkk76b";
+          rev = "4cb5da1418f447423cb81ca99539f77a6067ad77";
+          sha256 = "145n50vspxaslvhf3ahlp435h5slz24csa2h62zly18xprw1ai1h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ccc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ccc";
           sha256 = "0fckhmz4svcg059v4acbn13yf3ijs09fxmq1axc1b9bm3xxig2cq";
           name = "ccc";
         };
@@ -5814,7 +5886,7 @@
           sha256 = "1a93cim1w96aaj81clhjv25r7v9bwqm9a818mn8lk4aj1bmhgc4c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cd-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cd-compile";
           sha256 = "1a24rv1jbb883vwhjkw6qxv3h3qy039iqkhkx3jkq1ydidr9f0hv";
           name = "cd-compile";
         };
@@ -5831,11 +5903,11 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "64ad0ea6d03c0d46030cc5aaa3715b5cf3a82d3c";
-          sha256 = "02bsiq0kxm9cbbr6hr20ac4888mcyk0i8p9hrrdvaijq4fhkk76b";
+          rev = "4cb5da1418f447423cb81ca99539f77a6067ad77";
+          sha256 = "145n50vspxaslvhf3ahlp435h5slz24csa2h62zly18xprw1ai1h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cdb";
           sha256 = "1gx34062h25gqsl3j1fjlklha19snvmfaw068q6bv6x9r92niqnf";
           name = "cdb";
         };
@@ -5856,7 +5928,7 @@
           sha256 = "1jj9vmhc4s3ych08bjm1c2xwi81z1p20rj7bvxrgvb5aga2ghi9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cdlatex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cdlatex";
           sha256 = "1jsfmzl13fykbg7l4wv9si7z11ai5lzvkndzbxh9cyqlvznq0m64";
           name = "cdlatex";
         };
@@ -5877,7 +5949,7 @@
           sha256 = "0aspci0zg8waa3l234l0f8fjfzm67z2gydfdwwpxksz49sm2s1jk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cdnjs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cdnjs";
           sha256 = "1clm86n643z1prxrlxlg59jg43l9wwm34x5d88bj6yvix8g6wkb7";
           name = "cdnjs";
         };
@@ -5898,7 +5970,7 @@
           sha256 = "1f8gdj3p54q3410c66716y3l7i7nnkmq6hqz0dg1a1sc6jwdij3v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cedit";
           sha256 = "169sy7a1bgczwfxkkzjiggb7vdjxhrx7i3a39g6zv9f1zs6byk6m";
           name = "cedit";
         };
@@ -5919,7 +5991,7 @@
           sha256 = "0974bxy85rcxia6dkfryas2g46nanjdf8fv90adbc7kyj07xsf7c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/celery";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/celery";
           sha256 = "0m3hmvp6xz2m7z1kbb0ii0j3c95zi19652gfixq5a5x23kz8y59h";
           name = "celery";
         };
@@ -5938,7 +6010,7 @@
           sha256 = "15psyizjz8wf9wfxwwcdmg1bxf8jbv0qy40rskz7si7vxin8hhxl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/centered-cursor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/centered-cursor-mode";
           sha256 = "0a5mymnkwjvpra8iffxjwa5fq3kq4vc8fw7pr7gmrwq8ml7il5zl";
           name = "centered-cursor-mode";
         };
@@ -5948,22 +6020,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    centered-window-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    centered-window-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "centered-window-mode";
-        version = "20160121.526";
+        version = "20160210.447";
         src = fetchFromGitHub {
           owner = "ikame";
           repo = "centered-window-mode";
-          rev = "cfb1bdb851de13a588dc90cac864d38d10792763";
-          sha256 = "0dcfhx9rlcqglcyg78jkgdxm625q2czw849z0c03wb75nblkcsdp";
+          rev = "ff2350f5258249bbc9e07ac60c76028f4ae07190";
+          sha256 = "1i5ipll7jlrxqb0kcwq0rlrpfaxsyp663bwjdnhj84c50wlv052f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/centered-window-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/centered-window-mode";
           sha256 = "0f5qwv4f8gn5nxsqn57bbb3y0w5whjvhv3pls88d5n68lkd1k4si";
           name = "centered-window-mode";
         };
-        packageRequires = [];
+        packageRequires = [ s ];
         meta = {
           homepage = "http://melpa.org/#/centered-window-mode";
           license = lib.licenses.free;
@@ -5980,7 +6052,7 @@
           sha256 = "0zqrpaq9c3lm12jxnvysh8f3m3193k22zaj0ycscdqd1jpq4wcgh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/centimacro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/centimacro";
           sha256 = "1qbyfi6s4hdp5sv394w3sib8g2kx06i06q8gh6hdv5pis5kq9fx6";
           name = "centimacro";
         };
@@ -6001,7 +6073,7 @@
           sha256 = "17jg5d5afh9zpnjx8wkys8bjllxq99j0yhz8j3fvkskisvhkz1im";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cerbere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cerbere";
           sha256 = "1g3svmh5dlh5mvyag3hmiy90dfkk6f7ppd9qpwckxqyll9vl7r06";
           name = "cerbere";
         };
@@ -6018,11 +6090,11 @@
         src = fetchFromGitHub {
           owner = "cfengine";
           repo = "core";
-          rev = "5bfd7f68f17f94452716659a04f534653aa42795";
-          sha256 = "1ycps7amnxgxr9y8hnhlrfj6phs9ky2nx7yszl2260q64g0jyhvm";
+          rev = "5f96d077e8eec87b0e718ee200d29ea50f404936";
+          sha256 = "1yl5j5zshgwidvvpdqqjnzndvpw11b30q340db57ywh6vlgkgl88";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cfengine-code-style";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cfengine-code-style";
           sha256 = "1ny8xvdnz740qmw9m81xnwd0gh0a516arpvl3nfimglaai5bfc9a";
           name = "cfengine-code-style";
         };
@@ -6043,7 +6115,7 @@
           sha256 = "019vqjmq6hb2f5lddqy0ya5q0fd47xix29cashlchz0r034rc32r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cff";
           sha256 = "04b2ck1jkhsrka6dbyn6rpsmmc2bn13kpyhzibd781hj73d93jgc";
           name = "cff";
         };
@@ -6058,11 +6130,11 @@
         version = "20150819.604";
         src = fetchsvn {
           url = "http://beta.visl.sdu.dk/svn/visl/tools/vislcg3/trunk/emacs";
-          rev = "11323";
+          rev = "11350";
           sha256 = "1v8wgm3cvz4xx2jlx95ipd9340mxfxgk5hqialp76y74x03vfzq1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cg";
           sha256 = "0ra6mxf8l9fjn1vszjj71fs6f6l08hwypka8zsb3si96fzb6sgjh";
           name = "cg";
         };
@@ -6083,7 +6155,7 @@
           sha256 = "1m9sq93bwajbld3lnlzkjbsby5zlm9sxjzqynryyvsb9zr1d0a9z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/change-inner";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/change-inner";
           sha256 = "0r693056wykg4bs7inbfzfniyawmb91igk6kjjpq3njk0v84y1sj";
           name = "change-inner";
         };
@@ -6104,7 +6176,7 @@
           sha256 = "0d2zac02zqf3al4x412cnz3hr57j3xpc34i30z1q6g429v4krkam";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chapel-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chapel-mode";
           sha256 = "0hmnsv8xf85fc4jqkaqz5j3sf56hgib4jp530vvyc2dl2sps6vzz";
           name = "chapel-mode";
         };
@@ -6125,7 +6197,7 @@
           sha256 = "0jq5xicf0y7z1v68cgsg9vniw6pa793izz350a4wgdq8f5fcm24f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/char-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/char-menu";
           sha256 = "11jkwghrmmvpv7piznkpa0wilwjdsps9rix3950pfabhlllw268l";
           name = "char-menu";
         };
@@ -6144,7 +6216,7 @@
           sha256 = "00b0jv58wkvhahfnqwbfawz1z3nbm6d8s8cq0nn631w4m509kgq0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/character-fold+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/character-fold+";
           sha256 = "01ibdwd7vap9m64w0bhyknxa3iank3wfss49gsgg4xbbxibyrjh3";
           name = "character-fold-plus";
         };
@@ -6165,7 +6237,7 @@
           sha256 = "0zf9i7ajjm639hw34iqwjvni6gn0smzi79582d5l36jvr0z4gnkq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/charmap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/charmap";
           sha256 = "1j7762d2i17ysn9ys8j7wfv989avmax8iylml2hc26mwbpyfpm84";
           name = "charmap";
         };
@@ -6186,7 +6258,7 @@
           sha256 = "1r2s3fszblk5wa6v3hnbzsri550gi5qsmp2w1spvmf1726n900cb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chatwork";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chatwork";
           sha256 = "0p71swcpfqbx2zmp5nh57f0m30cn68g3019005wa5x4fg7dx746p";
           name = "chatwork";
         };
@@ -6207,7 +6279,7 @@
           sha256 = "15kam5hf2f4nwp29nvxqm5bs8nyhqf5m44fdb21qljgbmjdlh38y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cheatsheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cheatsheet";
           sha256 = "11z3svlzvmhdy0pkxbx9qz9bnq056cgkbfyw9z34aq1yxazi2cpq";
           name = "cheatsheet";
         };
@@ -6228,7 +6300,7 @@
           sha256 = "0660ix17ksxy5a5v8yqy7adr9d4bs6p1mnkc6lpyw96k4pn62h45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/checkbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/checkbox";
           sha256 = "17gw6w1m6bs3sfx8nqa8nzdq26m8w85a0fca5qw3bmd18bcmknqa";
           name = "checkbox";
         };
@@ -6238,6 +6310,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    cheerilee = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, xelb }:
+    melpaBuild {
+        pname = "cheerilee";
+        version = "20160219.1743";
+        src = fetchFromGitHub {
+          owner = "Vannil";
+          repo = "cheerilee.el";
+          rev = "6c1a31a03a29871df1cef43ca3a3529b8db5142e";
+          sha256 = "08jna2rpads54fp8mi47np046ap3yzgzqp0v632n8r8mcrdg02rn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cheerilee";
+          sha256 = "15igjlnq35cg9nslyqa63i1inqipx3y8g7zg4r26m69k25simqrv";
+          name = "cheerilee";
+        };
+        packageRequires = [ xelb ];
+        meta = {
+          homepage = "http://melpa.org/#/cheerilee";
+          license = lib.licenses.free;
+        };
+      }) {};
     chef-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chef-mode";
@@ -6249,7 +6342,7 @@
           sha256 = "1mnskri5r1lyzzcag60x7amn00613jyl7by7hd4sqm2a7zd4r5aa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chef-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chef-mode";
           sha256 = "1pz82s82d4z3vkm8mpmwdxb9pd11kq09g23mg461lzqxjjw734rr";
           name = "chef-mode";
         };
@@ -6270,7 +6363,7 @@
           sha256 = "0m97xr6lddy2jdmd4bl4kbp2568p4n110yfa9k7fqc20ihq8jkyd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cherry-blossom-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cherry-blossom-theme";
           sha256 = "1i3kafj3m7iij5mr0vhg45zdnkl9pg9ndrq0b0i3k3mw7d5siq7w";
           name = "cherry-blossom-theme";
         };
@@ -6291,7 +6384,7 @@
           sha256 = "0j61lvr99viaharg4553whcppp7lxhimkk5lps0izz9mnd8y2wm5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chicken-scheme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chicken-scheme";
           sha256 = "0ns49p7nsifpi7wrzr02ljrr0p6hxanrg54zaixakvjkxwcgfabr";
           name = "chicken-scheme";
         };
@@ -6301,6 +6394,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    chinese-conv = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "chinese-conv";
+        version = "20160218.1515";
+        src = fetchFromGitHub {
+          owner = "gucong";
+          repo = "emacs-chinese-conv";
+          rev = "07417e2e01e77d6f0eac69d54f7dcb41729e39c8";
+          sha256 = "1b1zarbjiz5w1aw49a153d8s2hk0jgissl39s9smknmay0hynwyk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chinese-conv";
+          sha256 = "1lqpq7pg0nqqqj29f8is6c724vl75wscmm1v08j480pfks3l8cnr";
+          name = "chinese-conv";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/chinese-conv";
+          license = lib.licenses.free;
+        };
+      }) {};
     chinese-fonts-setup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "chinese-fonts-setup";
@@ -6312,7 +6426,7 @@
           sha256 = "08ln66kx73019klzw0rsvlz3cs4ch8wxjfljmkyswjjd179h882c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chinese-fonts-setup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chinese-fonts-setup";
           sha256 = "141ri6a6mnxf7fn17gw48kxk8pvl3khdxkb4pw8brxwrr9rx0xd5";
           name = "chinese-fonts-setup";
         };
@@ -6325,15 +6439,15 @@
     chinese-pyim = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip }:
     melpaBuild {
         pname = "chinese-pyim";
-        version = "20160204.440";
+        version = "20160214.2358";
         src = fetchFromGitHub {
           owner = "tumashu";
           repo = "chinese-pyim";
-          rev = "9e4479b602d20c31df41108e657ad1d7277eab5a";
-          sha256 = "0v3iq865hrcqzg6rm3jmrxb41zq9faj5jnjcmwi6kpxmj06brn1g";
+          rev = "213222ce67d1a30ef53d22b632c0a35cf44b5d49";
+          sha256 = "0k7na7wlpq5fagr10f8ryn2vwf0d1ymakhyfal4gbrhrbwz595zk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chinese-pyim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chinese-pyim";
           sha256 = "0zdx5zhgj1ly89pl48vigjzd8g74fxnxcd9bxrqykcn7y5qvim8l";
           name = "chinese-pyim";
         };
@@ -6354,7 +6468,7 @@
           sha256 = "06k13wk659qw40aczq3i9gj0nyz6vb9z1nwsz7c1bgjbl2lh6hcv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chinese-remote-input";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chinese-remote-input";
           sha256 = "0nnccm6w9i0qsgiif22hi1asr0xqdivk8fgg76mp26a2fv8d3dag";
           name = "chinese-remote-input";
         };
@@ -6375,7 +6489,7 @@
           sha256 = "0cx1g6drkr8gyqqdxjf7j4wprxcbq30gam2racgnvdicgij0apwg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chinese-wbim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chinese-wbim";
           sha256 = "1pax3kpmvg170mpvfrjbpj9czq0xykmfbany2f7vbn96jb5xfmsb";
           name = "chinese-wbim";
         };
@@ -6396,7 +6510,7 @@
           sha256 = "1jsy43avingxxccs0zw2qm5ysx8g76xhhh1mnyypxskl9m60qb4j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chinese-word-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chinese-word-at-point";
           sha256 = "0pjs4ckncv84qrdj0pyibrbiy86f1gmjla9n2cgh10xbc7j9y0c4";
           name = "chinese-word-at-point";
         };
@@ -6417,7 +6531,7 @@
           sha256 = "14yzmyzkf846yjrwnqrbzmvyhfav39qa5fr8jnb7lyz8rm7y9pnq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chinese-yasdcv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chinese-yasdcv";
           sha256 = "1y2qywldf8b8b0km1lcf74p0w6rd8gr86qcj7ikwhhbvd19dfglm";
           name = "chinese-yasdcv";
         };
@@ -6435,7 +6549,7 @@
           sha256 = "1r274pf0xrcdml4sy2nhhp3v5pr3y3s4lvk45hd3pmw1i4pw2fd8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chm-view";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chm-view";
           sha256 = "1acz0fvl3inn7g4himq680yf64bgm7n61hsv2zpm1k6smrdl78nz";
           name = "chm-view";
         };
@@ -6456,7 +6570,7 @@
           sha256 = "1mqdz3rvx0jm80fgzw3s3lqn448kqrlrifdwcg36cqq4qmkpalq4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chronos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chronos";
           sha256 = "1fwpll0mk6pc37qagbq3b3z32d2qwz993nxp9pjw4qbmlnq6sy9d";
           name = "chronos";
         };
@@ -6477,7 +6591,7 @@
           sha256 = "0gx0bd7j71rlniq64vw8k59yzl070mdia05ry18br8kpsbk3bhrl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chruby";
           sha256 = "0pk6vdvmifiq52n452lbrkklxa69c40bfyzra9qhrghxr2q5v3mk";
           name = "chruby";
         };
@@ -6490,15 +6604,15 @@
     cider = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, queue, seq, spinner }:
     melpaBuild {
         pname = "cider";
-        version = "20160204.1208";
+        version = "20160218.447";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "cider";
-          rev = "17b88cce0cdf856e1150973d271223b83b2cf165";
-          sha256 = "12rdrd8qfy2bgvhrx0m6yv6cd0k9s68rr7fxk96ac6lzyq5rh8aj";
+          rev = "212023a86fbb76f37202a8b62acacc98edddceaf";
+          sha256 = "137h2s1nl10h60j8papm6rairs1yxln3ihbfvwyh9xf27mnndmzg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cider";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cider";
           sha256 = "1a6hb728a3ir18c2dn9zfd3jn79fi5xjn5gqr7ljy6qb063xd4qx";
           name = "cider";
         };
@@ -6519,7 +6633,7 @@
           sha256 = "1w4y65s3m2irga4iqfqqkcmvl6ss24zmaxqzbfib8jmi84r4lpac";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cider-decompile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cider-decompile";
           sha256 = "0jhsm31zcfwkbpsdh1lvmjm1fv2m7y849930sjvf5nxv3ffhx3b4";
           name = "cider-decompile";
         };
@@ -6540,7 +6654,7 @@
           sha256 = "1gpklkrw6iishfb3yilnqysh6zij67l1sl3ixq1bi3f6r237v1pg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cider-eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cider-eval-sexp-fu";
           sha256 = "1n4sgv042qd9560pllabysx0c5snly6i22bk126y8f8rn0zj58iq";
           name = "cider-eval-sexp-fu";
         };
@@ -6561,7 +6675,7 @@
           sha256 = "0lgq4p7rs4prqfqd83v1l36xxacrd65jsfzbp7q62b2pjqikpgk0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cider-profile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cider-profile";
           sha256 = "14jc98h4r9rb7pxfb60ps4ss8p0bm66wdl6n8z1357hk93h9kmfs";
           name = "cider-profile";
         };
@@ -6574,15 +6688,15 @@
     cider-spy = callPackage ({ cider, cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cider-spy";
-        version = "20151123.946";
+        version = "20160219.401";
         src = fetchFromGitHub {
           owner = "jonpither";
           repo = "cider-spy";
-          rev = "6913a52c4ee781c5325074af05fcdfab864d6c41";
-          sha256 = "1hvvfp58x269yapnayxwyclgqy52azf76rb703mlfqivj1gzd7p3";
+          rev = "db4372880e65b1ab1cfe61f0e1b960a8c954c8d0";
+          sha256 = "1jk180l1n3w2k32v9mw7iwr9q7xs3cc65420g1jlks5m7yzb5z55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cider-spy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cider-spy";
           sha256 = "0478jlg76h0mrjwk2b1kdj16s1q1b03b7ygacai45jh89bc025fh";
           name = "cider-spy";
         };
@@ -6603,7 +6717,7 @@
           sha256 = "1w0ya0446rqsg1j59fd1mp4wavv2f3h1k3mw9svm5glymdirw4d1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cil-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cil-mode";
           sha256 = "1h18r086bqspyn5n252yzw8x2zgyaqzdd8pbcf5gqlh1w8kapq4y";
           name = "cil-mode";
         };
@@ -6624,7 +6738,7 @@
           sha256 = "190n4kdcqdwglhnawnj9mqjarmcaqylxipc07whmrii0jv279kjw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cinspect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cinspect";
           sha256 = "0djh61mrfgcm3767ll1l5apw6646j4fdcaripksrmvn5aqfn8rjj";
           name = "cinspect";
         };
@@ -6637,15 +6751,15 @@
     circe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "circe";
-        version = "20160201.641";
+        version = "20160207.435";
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "35618a1e890dfff7bc3c879e4f0e23868d00bf85";
-          sha256 = "1qw8ax3a1v1053qh9i41ci93hc4034ghlcwq8hldr3amsz344fhj";
+          rev = "ca3e957f41e47afa05f73962c1ad72f401666384";
+          sha256 = "0gwkm8c9g501g80rvqlzmn24q4ylkb94bklsf173yiinqmz1jhkc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/circe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/circe";
           sha256 = "1f54d8490gfx0r0cdvgmcjdxqpni43msy0k2mgqd1qz88a4b5l07";
           name = "circe";
         };
@@ -6666,7 +6780,7 @@
           sha256 = "1mc8kayw8fmvpl0z09v6i68s2lharlwpzff0cvcsfn0an2imj2d0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cl-lib-highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cl-lib-highlight";
           sha256 = "13qdrvpxq928p27b1xdcbsscyhqk042rwfa17037gp9h02fd42j8";
           name = "cl-lib-highlight";
         };
@@ -6682,11 +6796,11 @@
         version = "20151116.638";
         src = fetchsvn {
           url = "http://llvm.org/svn/llvm-project/cfe/trunk/tools/clang-format";
-          rev = "259829";
+          rev = "261504";
           sha256 = "180s33f8ngcc432x7639vxwchgvd5nwy4irby8ldzckdf5a4gd4h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clang-format";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clang-format";
           sha256 = "19qaihb0lqnym2in4465lv8scw6qba6fdn8rcbkpsq09hpzikbah";
           name = "clang-format";
         };
@@ -6707,7 +6821,7 @@
           sha256 = "1h6k6kzim1zb87y1kzpqjzk3ip9bmfxyg54kdh2sfp4xy0g5h3p0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clean-aindent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clean-aindent-mode";
           sha256 = "1whzbs2gg2ar24kw29ffv94dgvrlfy2v4zdn0g7ksjjmmdr8ahh4";
           name = "clean-aindent-mode";
         };
@@ -6728,7 +6842,7 @@
           sha256 = "03dbxg51zs4wbfwjv1qxlm5w06j89mvniisnyyahjkvpiqrp96yd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clean-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clean-buffers";
           sha256 = "025sxrqxm24yg1wpfncrjw1nm91h0h7jy2xd5g20xqlinqqvdihj";
           name = "clean-buffers";
         };
@@ -6749,7 +6863,7 @@
           sha256 = "19q6zbnl9fg4cwgi56d7p4qp6y3g0fdyihinpakby49xv2n2k8dx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clevercss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clevercss";
           sha256 = "189f2l4za1j9ds0bhxrzyp7da9p6svh5dx2vnzf4vql7qhjk3gf0";
           name = "clevercss";
         };
@@ -6759,18 +6873,39 @@
           license = lib.licenses.free;
         };
       }) {};
+    click-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "click-mode";
+        version = "20160219.2013";
+        src = fetchFromGitHub {
+          owner = "bmalehorn";
+          repo = "click-mode";
+          rev = "4e39ef28e65124671f53fb5eaef8c7b87c4deab8";
+          sha256 = "1n8114h0azjyavq4bzny2nasl4wsz8k7li002gqjvi0snw16yypn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/click-mode";
+          sha256 = "1p5dz4a74w5zxdlw17h5z9dglapia4p29880liw3bif2c7dzkg0r";
+          name = "click-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/click-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "cliphist";
-        version = "20151012.729";
+        version = "20160210.317";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "cliphist";
-          rev = "c0db2da95fa3d3a58160f465c636989bb4b251d5";
-          sha256 = "11c0zpk8gg70d4xiiyjc7v13knwb2ihbrxnlaxzh3rdg2c12676q";
+          rev = "413af96bbd0dfc8b264f5b8e3920c319af065c50";
+          sha256 = "07q8naxhag2q0m5cb9c2n5js6j5qdrjyyiqbcpxmq598b8mw8kzd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cliphist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cliphist";
           sha256 = "0mg6pznijba3kvp3r57pi54v6mgih2vfwj2kg6qmcy1abrc0xq29";
           name = "cliphist";
         };
@@ -6791,7 +6926,7 @@
           sha256 = "07a55q97j2vsqpha0akri2kq90v1l97mc1mgr97pq39gc1bbc5d3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clipmon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clipmon";
           sha256 = "1gvy1722px4fh88jyb8xx7k1dgyjgq7zjadr5fghdir42l0byw7i";
           name = "clipmon";
         };
@@ -6812,7 +6947,7 @@
           sha256 = "0msmigzip7hpjxwkz0khhlc2lj9wgb2919i4k0kv8ppi9j2f9hjc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clippy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clippy";
           sha256 = "0nqmc8f2qrsp25vzc66xw6b232n7fyw6g06mwn2cdpm3d2pgb7rg";
           name = "clippy";
         };
@@ -6833,7 +6968,7 @@
           sha256 = "0i6sj5rs4b9v8aqq9l6wr15080qb101hdxspx6innhijhajgmssd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clips-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clips-mode";
           sha256 = "083wrhjn04rg8vr6j0ziffdbdhbfn63wzl4q7yzpkf8qckh6mxhf";
           name = "clips-mode";
         };
@@ -6846,15 +6981,15 @@
     clj-refactor = callPackage ({ cider, dash, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }:
     melpaBuild {
         pname = "clj-refactor";
-        version = "20160128.1121";
+        version = "20160221.914";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clj-refactor.el";
-          rev = "85d29af959b8d2b581f68f06f6d220bd26e58690";
-          sha256 = "0h8x2ikggry16nd11l489523ldxg1cxbk10scpbxn9jhb11wgzd9";
+          rev = "39e4cea6de61be0a062875c4de67245212c5ff66";
+          sha256 = "1ra00h3zksgifyfy7h5pijzfcqx1y7fsdq6dz3jylfh6ikria9gy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clj-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clj-refactor";
           sha256 = "1qvds6dylazvrzz1ji2z2ldw72pa2nxqacb9d04gasmkqc32ipvz";
           name = "clj-refactor";
         };
@@ -6886,7 +7021,7 @@
           sha256 = "0ydv2prnw1j3m5nk23fqn4iv202kjswr8z0ip4zacdm8bl0q25ln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cljr-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cljr-helm";
           sha256 = "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc";
           name = "cljr-helm";
         };
@@ -6907,7 +7042,7 @@
           sha256 = "1cdim8fancrsrm9avzv4m2v384i7n4632nibyfnxkhq03bj00j1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cljsbuild-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cljsbuild-mode";
           sha256 = "0qvb990dgq4v75lwnd661wxszbdbhlgxpsyv4zaj6h10gp1vi214";
           name = "cljsbuild-mode";
         };
@@ -6928,7 +7063,7 @@
           sha256 = "0za8j7pwcmvjm2ls62z9f8sjryzzsmms4slikzixc0rxyiqnqyd1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clmemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clmemo";
           sha256 = "03qa79ip0gqinj1kk898lcvixk98hf6gknz0yc2fnqcrm642k2vs";
           name = "clmemo";
         };
@@ -6949,7 +7084,7 @@
           sha256 = "1rflc00yrbb7xzfh8c54ajf4qnhsp3mq07gkr257gjyrwsdw762v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cloc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cloc";
           sha256 = "1ny5wixa9x4fq5jvhs01jmyvwkfvwwi9aamrcqsl42s9sx6ygz7a";
           name = "cloc";
         };
@@ -6970,7 +7105,7 @@
           sha256 = "0hz6a7gj0zfsdaifkhwf965c96rkjc3kivvqlf50zllsw0ysbnn0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clocker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clocker";
           sha256 = "0cckrk40k1labiqjh7ghzpx5zi136xz70j3ipp117x52qf24k10k";
           name = "clocker";
         };
@@ -6991,7 +7126,7 @@
           sha256 = "1r189c0xm6vh05k0y715i5ldj1pxzvwkxqbq0n85m489mjnf2wv6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clojars";
           sha256 = "1skvd29347hwapgdqznbzwfcp2nf077qkdzknxc8ylmqa32yf5w1";
           name = "clojars";
         };
@@ -7012,7 +7147,7 @@
           sha256 = "1ljb0g4yvrqgjqgmz8qz0c0swbx1m6gldmcdqnmxd72bs3w9p0k8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-cheatsheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clojure-cheatsheet";
           sha256 = "05sw3bkdcadslpsk64ds0ciavmdgqk7fr5q3z505vvafmszfnaqv";
           name = "clojure-cheatsheet";
         };
@@ -7025,15 +7160,15 @@
     clojure-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "clojure-mode";
-        version = "20160204.1143";
+        version = "20160213.1637";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "3a701b1f495d0eaa22387b45e6309c2d987c62fa";
-          sha256 = "1ka2km49ar08wp0m7czfap5dvh2ql1d3cv7lyfbxicylqw1354hn";
+          rev = "affd573660b2112e5b4629e6634fd8a5abcbdaa4";
+          sha256 = "0pn1a1w6x5678ssy0p5f5bc4d5qsgnr2d1qyrd7pxz47w78c3hlz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clojure-mode";
           sha256 = "11n0rjhs1mmlzdqy711g432an5ybdka5xj0ipsk8dx6xcyab70np";
           name = "clojure-mode";
         };
@@ -7050,11 +7185,11 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clojure-mode";
-          rev = "3a701b1f495d0eaa22387b45e6309c2d987c62fa";
-          sha256 = "1ka2km49ar08wp0m7czfap5dvh2ql1d3cv7lyfbxicylqw1354hn";
+          rev = "affd573660b2112e5b4629e6634fd8a5abcbdaa4";
+          sha256 = "0pn1a1w6x5678ssy0p5f5bc4d5qsgnr2d1qyrd7pxz47w78c3hlz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-mode-extra-font-locking";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clojure-mode-extra-font-locking";
           sha256 = "00nff9mkj61i76dj21x87vhz0bbkzgvkx1ypkxcv6yf3pfhq7r8n";
           name = "clojure-mode-extra-font-locking";
         };
@@ -7075,7 +7210,7 @@
           sha256 = "1vgahik2q2sn6vqm9wg5b9jc74mkbc1md8pl69apz4cg397kjkzr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-quick-repls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clojure-quick-repls";
           sha256 = "10glzyd4y3918pwp048pc1y7y7fa34fkqckn1nbys841dbssmay0";
           name = "clojure-quick-repls";
         };
@@ -7088,15 +7223,15 @@
     clojure-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "clojure-snippets";
-        version = "20150504.344";
+        version = "20160217.242";
         src = fetchFromGitHub {
           owner = "mpenet";
           repo = "clojure-snippets";
-          rev = "24ebfd34665e1a3b74aaa823f8b2e3e4a5e0b827";
-          sha256 = "1w8izhrj23b8kqcsqalgrzxqnq18nvdxl48305p8cnwll646xjl2";
+          rev = "21b17dd388db62e8713289478623c72a2c7180d0";
+          sha256 = "0wlzhj2mfxxkffsx14n1c0r89l3pszn71brx4l3dfyzmb806xrig";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clojure-snippets";
           sha256 = "15622mdd6b3fpwp22d32p78yap08pyscs2vc83sv1xz4338i0lij";
           name = "clojure-snippets";
         };
@@ -7117,7 +7252,7 @@
           sha256 = "0v0wdq0b5jz4x0d7dl3ilgf3aqp2hk375db366ij6gxwd0b9i3na";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/closure-lint-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/closure-lint-mode";
           sha256 = "1xmi1gjgayd5xbm3xx721xv57ns3x56r8ps94zpwyf2znpdchqfy";
           name = "closure-lint-mode";
         };
@@ -7138,7 +7273,7 @@
           sha256 = "07kvnb6p35swkyj92c4wymsqq4r2885wdpqhv7nhicvi6n658kpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cloud-to-butt-erc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cloud-to-butt-erc";
           sha256 = "061mmw39dq8sqzi2589lf7svy15n2iyiwbfiram48r2yhma5dd0f";
           name = "cloud-to-butt-erc";
         };
@@ -7159,7 +7294,7 @@
           sha256 = "0fnl3b62clg9llcs2l511sxp4yishan4pqk45sqp8ih4rdzvy7ar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clues-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clues-theme";
           sha256 = "12g7373js5a2fa0m396k9kjhxvx3qws7n1r435nr9zgwaw7xvciy";
           name = "clues-theme";
         };
@@ -7180,7 +7315,7 @@
           sha256 = "0m94692gkq299sf56m4c637j5xp78dvgv0ad1hv4ys1hzp1qw1l5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cm-mode";
           sha256 = "1rgfpxbnp8wiq9j8aywm2n07rxzkhqljigwynrkyvrnsgxlq2a9x";
           name = "cm-mode";
         };
@@ -7201,7 +7336,7 @@
           sha256 = "030kg3m546gcm6cf1k928ld51znsfrzhlpm005dvqap3gkcrg4sf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmake-font-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cmake-font-lock";
           sha256 = "0ws4kd94m8fh55d7whsf3rj9qrxjp1wsgxh0valsjxyp2ck9zrz0";
           name = "cmake-font-lock";
         };
@@ -7214,15 +7349,15 @@
     cmake-ide = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, levenshtein, lib, melpaBuild, seq }:
     melpaBuild {
         pname = "cmake-ide";
-        version = "20160127.1859";
+        version = "20160211.750";
         src = fetchFromGitHub {
           owner = "atilaneves";
           repo = "cmake-ide";
-          rev = "9107eecfc726f89b65f33dd103f06c07d3d5788c";
-          sha256 = "0kc85ripwjhjvjhwvx5cc2ks99xhaqmlb0inpd4d59f3x68pk69m";
+          rev = "816ac6c19d664f584e21c3449d5fe12e50332e09";
+          sha256 = "1hagmcg7303ckbfdbz30s84vavg3a89m7mq71gf044jdx6nyci97";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmake-ide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cmake-ide";
           sha256 = "0xvy7l80zw67jgvk1rkhwzjvsqjqckmd8zj6s67rgbm56z6ypmcg";
           name = "cmake-ide";
         };
@@ -7239,11 +7374,11 @@
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "7b1fbcc4b035c591491c5033cbfbfc0aabd80fde";
-          sha256 = "0rb6wn635ylm58cpr7jq7821g0iw1mzb4b1h9mwrl57m6gcb5v98";
+          rev = "7e32bd945a9f32144ac63fdcd085197658229f9c";
+          sha256 = "012pzl5258f14xdpjmmfgz6mn76902s153ps4yrvhhj5mmcs2knm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmake-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cmake-mode";
           sha256 = "0zbn8syb5lw5xp1qcy3qcl75zfiyik30xvqyl38gdqddm9h7qmz7";
           name = "cmake-mode";
         };
@@ -7264,7 +7399,7 @@
           sha256 = "0fyzi8xac80wnhnwwm1j6yxpvpg1n4diq2lcl3qkj8klvk5gpxr6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmake-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cmake-project";
           sha256 = "13n6j9ljvzjzkknbm9zkhxljcn12avl39gxqq95hah44dr11rns3";
           name = "cmake-project";
         };
@@ -7282,7 +7417,7 @@
           sha256 = "13r8pjxknsfd6ywzlgcy4bm7fvr768ba34k6b7y365y3c1asz6y3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmds-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cmds-menu";
           sha256 = "12s75y9d75cxqgg3hj0s4w0d10zy8y230b5gy09685ab5lcajfks";
           name = "cmds-menu";
         };
@@ -7303,7 +7438,7 @@
           sha256 = "0xdcw329d2gssx86iajwrgpr7yv69b9nflmzjgb4jvg4pskj4pgx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cmm-mode";
           sha256 = "184b8x19cnvx8z4dr9alv62wchzc7vr7crzz8jiyqw9d544zs50h";
           name = "cmm-mode";
         };
@@ -7324,7 +7459,7 @@
           sha256 = "1635k51ppivq6v2702fihq8dvi33445smds9zhqm0drnpv9rv5cr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cn-outline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cn-outline";
           sha256 = "0cw1rr56hdngvhmx59j76hvkfzgybasn0fwhd6vwm709jqiiiwiz";
           name = "cn-outline";
         };
@@ -7345,7 +7480,7 @@
           sha256 = "1sx8grp3j7zcma3nb7zj6kijkdqx166vw1qgmm29hvx48bys6vlp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cobra-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cobra-mode";
           sha256 = "11jscpbclxlq2xqy2nsfa4y575bp8h0kpkp8cfjqb05lm5ybcp89";
           name = "cobra-mode";
         };
@@ -7366,7 +7501,7 @@
           sha256 = "0mcf0xyh4p6pk2hf1f554vy4amd0qcimspgnncff2a0qc2bsg5sy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/code-library";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/code-library";
           sha256 = "0gi8lz2q0vis4nyziykq15jp3m3vykfwycbk6amhf1ybkn9k3ywj";
           name = "code-library";
         };
@@ -7387,7 +7522,7 @@
           sha256 = "11v671c4338bsizbmm7ypp4x9s5hiwyddsg2ig6h157gfv2597pp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/codebug";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/codebug";
           sha256 = "1cb2wvawp3wqslhgbmbw9xwcqgwfscqg0jfgqzi3nr42mjp9zgqj";
           name = "codebug";
         };
@@ -7408,7 +7543,7 @@
           sha256 = "0ch3naqp3ji0q4blpjfr1xbzgzxhw10h08y2akik96kk1pnkwism";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/codesearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/codesearch";
           sha256 = "0z7zvain9n0rm6bvrh3j7z275l32fmp46p4b33mizqd1y86w89nx";
           name = "codesearch";
         };
@@ -7429,7 +7564,7 @@
           sha256 = "14jcxrs3b02pbppvdsabr7c74i3c6d1lmd6l1p9dj8gv413pghsz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/codic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/codic";
           sha256 = "0fq2qfqhkd6injgl66vcpd61j67shl9xj260aj6cgb2nriq0jxgn";
           name = "codic";
         };
@@ -7450,7 +7585,7 @@
           sha256 = "010v886ak0rbbhqwxwj6m0mkgh19s232igy7wwbv07l2pdqszf3p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/coffee-fof";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/coffee-fof";
           sha256 = "02cqza46qp8y69jd33cg4nmcgvrpwz23vyxqnmzwwvlmnbky96yc";
           name = "coffee-fof";
         };
@@ -7463,15 +7598,15 @@
     coffee-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "coffee-mode";
-        version = "20160111.532";
+        version = "20160208.2102";
         src = fetchFromGitHub {
           owner = "defunkt";
           repo = "coffee-mode";
-          rev = "c741811a96b20a939612f3affa678a576f0ad9f1";
-          sha256 = "0r0615q30awj77dwhvgz2cjmnfmvff9clg3krzr9zpskdkhdib8h";
+          rev = "cb1e997c0195a8a51bfa77d6bdec919e68a88904";
+          sha256 = "0f7v6zjmsgsip17jazbhn6667gn5ialfv4nl58bhjhkrb21j9zbk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/coffee-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/coffee-mode";
           sha256 = "1px50hs0x30psa5ljndpcc22c0qwcaxslpjf28cfgxinawnp74g1";
           name = "coffee-mode";
         };
@@ -7490,7 +7625,7 @@
           sha256 = "1fpkymmgv58b734d2rr7cfj2j2if1qkwgrpk3yp2ibw2n2567y0s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/col-highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/col-highlight";
           sha256 = "1kycjdlrg7a5x37b0pzqhg56yn7kaisryrk303qx1084kwq9464i";
           name = "col-highlight";
         };
@@ -7511,7 +7646,7 @@
           sha256 = "0jjj1miwc7hw2fbb1fnmfnydim81djswla8iy4waam9014yraqci";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/colemak-evil";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/colemak-evil";
           sha256 = "1bfzs5px1k6g3cnwjdaq2m78bbnfy3lxhjzkcch7zdv3nyacwl5z";
           name = "colemak-evil";
         };
@@ -7532,7 +7667,7 @@
           sha256 = "1k3sd07ffgpfhzg7d9mb1gc3n02zsvilxc30bgiycbjrbjgqq0i6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/colonoscopy-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/colonoscopy-theme";
           sha256 = "0x9bfr4j0sp41jkgnyjlaxnnjjrc102x6sznn6cgcmqk5qhswl4q";
           name = "colonoscopy-theme";
         };
@@ -7553,7 +7688,7 @@
           sha256 = "0m98i8w513zdzkskw9a96dd73lnfbfwvr947b0djsrazn8grh6hv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-identifiers-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/color-identifiers-mode";
           sha256 = "1hxp8lzn7kfckn5ngxic6qiz3nbynilqlxhlq9k1n1llfg216gfq";
           name = "color-identifiers-mode";
         };
@@ -7574,7 +7709,7 @@
           sha256 = "1p1f30qz4nd5a8ym2iwrgp6vhws0dls2qlc0apblj9nj3b0ziv0x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-moccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/color-moccur";
           sha256 = "17b9walfc5c9qfdvl9pcwb2gjikc3wxk1d3v878ckypmxd38vciq";
           name = "color-moccur";
         };
@@ -7594,7 +7729,7 @@
           sha256 = "17bidzq9kiz250gal1fn9mg8gf8l749nz69z0awpc4x2222wxxiz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/color-theme";
           sha256 = "1p4bjh8a9f6ixmwwnyjb520myk3bww1v9w6427za07v68m9cdh79";
           name = "color-theme";
         };
@@ -7615,7 +7750,7 @@
           sha256 = "1b0ymwszqsjcihcbfp7s4fjam983ixh3yb7sdc0rmqlyric1zwxq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-approximate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/color-theme-approximate";
           sha256 = "1wdnia9q42x7vky3ks555iic5s50g4mx7ss5ppaljvgxvbxyxqh1";
           name = "color-theme-approximate";
         };
@@ -7636,7 +7771,7 @@
           sha256 = "0gvc9jy34a8wvzwjpmqhshbx2kpk6ckmdrdj5v00iya7c4afnckx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-buffer-local";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/color-theme-buffer-local";
           sha256 = "1448rffyzn5k5mr31hwd28wlj7if7rp5sjlqcsvbxd2mnbgkgjz0";
           name = "color-theme-buffer-local";
         };
@@ -7657,7 +7792,7 @@
           sha256 = "0q9ss11i31iiv0vn8238922fkic7j6d02f9ykbip04sm46p5k6kj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-modern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/color-theme-modern";
           sha256 = "0f662ham430fgxpqw96zcl1whcm28cv710g6wvg4fma60sblaxcm";
           name = "color-theme-modern";
         };
@@ -7678,7 +7813,7 @@
           sha256 = "07703v8xyia1vx9s636aaql99i29a4r5v9z0lvaypixgsidshx10";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-sanityinc-solarized";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/color-theme-sanityinc-solarized";
           sha256 = "0xg79hgb893f1nqx6q4q6hp4w6rvgp1aah1v2r3scg2jk057qxkf";
           name = "color-theme-sanityinc-solarized";
         };
@@ -7691,15 +7826,15 @@
     color-theme-sanityinc-tomorrow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-sanityinc-tomorrow";
-        version = "20160202.135";
+        version = "20160205.2000";
         src = fetchFromGitHub {
           owner = "purcell";
           repo = "color-theme-sanityinc-tomorrow";
-          rev = "22e40391f4a4be9455e4fa591c31a954a24dbeeb";
-          sha256 = "161xzd0jlwyafq2sck47z4igsrvrk2b1ibl206866hc56q9x1pmn";
+          rev = "9a8f304477500baa2a782f9c9cafd76c6030ccdf";
+          sha256 = "0la3xwk0s5qx9n2s4lv4n8ilkj82spxk46mjih7zch8xpydfl15w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-sanityinc-tomorrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/color-theme-sanityinc-tomorrow";
           sha256 = "1k8iwjc7iidq5sxybs47rnswa6c5dwqfdzfw7w0by2h1id2z6nqd";
           name = "color-theme-sanityinc-tomorrow";
         };
@@ -7712,15 +7847,15 @@
     color-theme-solarized = callPackage ({ color-theme, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "color-theme-solarized";
-        version = "20160108.1741";
+        version = "20160219.1124";
         src = fetchFromGitHub {
           owner = "sellout";
           repo = "emacs-color-theme-solarized";
-          rev = "d7f9165adf02c01ea67a2ecc31df56c7495199e6";
-          sha256 = "1ddscmxn6k00ip3mb4bjy4zxfklxv3jjnlbgwwr793qzwsi64vi7";
+          rev = "890e5a3dd19b8c0d44de7e3a089bc6f1322fbb1e";
+          sha256 = "1yn0wacicf218212d9qgn67pf16i7x6bih67zdfcplq4i9lqbpg3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-solarized";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/color-theme-solarized";
           sha256 = "011rzq38ffmq7f2nzwrq96wwz67p82p1f0p5nib4nwqa47xlx7kf";
           name = "color-theme-solarized";
         };
@@ -7741,7 +7876,7 @@
           sha256 = "18hzm7yzwlfjlbkx46rgdl31p9xyfqnxlvg8337h2bicpks7kjia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/colorsarenice-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/colorsarenice-theme";
           sha256 = "09zlglldjbjr97clwyzyz7c0k8hswclnk2zbkm03nnn9n9yyg2qi";
           name = "colorsarenice-theme";
         };
@@ -7762,7 +7897,7 @@
           sha256 = "0ay4wrnyrdp4v3vjxr99hy8fpq6zsyh246c0gbp7bh63l5fx8nwr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/column-enforce-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/column-enforce-mode";
           sha256 = "1qh7kwr65spbbnzvq744gkksx50x04zs0nwn5ly60swc05d05lcg";
           name = "column-enforce-mode";
         };
@@ -7780,7 +7915,7 @@
           sha256 = "05bv198zhqw5hqq6cr11mhz02dpca74hhp1ycwq369m0yb2naxy9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/column-marker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/column-marker";
           sha256 = "1xgfsiw46aib2vb9bbjlgnhcgfnlfhdcxd0cl0jqj4fjfxzbz0bq";
           name = "column-marker";
         };
@@ -7801,7 +7936,7 @@
           sha256 = "0fnyksbynlmmvl39f4is0xjp6b13yshfazigbksv012hxp0whslm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/command-log-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/command-log-mode";
           sha256 = "11jq6055bvpwvrm0b8cgab25wa2mcyylpz4j56h1nqj7cnhb6ppj";
           name = "command-log-mode";
         };
@@ -7822,7 +7957,7 @@
           sha256 = "06y7ika4781gkh94ygdaz7a760s7ahrma6af6n7cqhgjyikz7lg1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/commander";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/commander";
           sha256 = "17y0hg6a90hflgwn24ww23qmvc1alzivpipca8zvpf0nih4fl393";
           name = "commander";
         };
@@ -7843,7 +7978,7 @@
           sha256 = "0kzlv2my0cc7d3nki2rlm32nmb2nyjb38inmvlf13z0m2kybg2ps";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/comment-dwim-2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/comment-dwim-2";
           sha256 = "1w9w2a72ygsj5w47vjqcljajmmbz0mi8dhz5gjnpwxjwsr6fn6lj";
           name = "comment-dwim-2";
         };
@@ -7856,15 +7991,15 @@
     commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "commenter";
-        version = "20160131.39";
+        version = "20160219.1027";
         src = fetchFromGitHub {
           owner = "yuutayamada";
           repo = "commenter";
-          rev = "eec3bf91a57ff3aa3b93c36611e136572f031571";
-          sha256 = "1jvjwk776p9qrbr3j0368nqv8ydp8k0s6c66nfpcqf33rz4w1h1g";
+          rev = "6d1885419434ba779270c6fda0e30d390bb074bd";
+          sha256 = "1jwd3whag39qhzhbsfivzdlcr6vj37dv5ychkhmilw8v6dfdnpdb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/commenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/commenter";
           sha256 = "01bm8jbj6xw23nls4fps6zwjkgvcsjhmn3l3ncqd764kwhxdx8q3";
           name = "commenter";
         };
@@ -7885,7 +8020,7 @@
           sha256 = "04bma9sdn7h8fjz62wlcwayzhr7lvzhidh48wc5rk195zlbgagwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/commify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/commify";
           sha256 = "1jc6iqa4hna3277hx13scfcqzkr43yv6gndbxv7qf4ydi01ysd0m";
           name = "commify";
         };
@@ -7906,7 +8041,7 @@
           sha256 = "1cc9ak9193m92g6l4mrfxbkkmvljl3c51d0xzdidwww978q3x6ad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/common-lisp-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/common-lisp-snippets";
           sha256 = "0ig8cz00cbfx0jckqk1xhsvm18ivl2mjvcn65s941nblsywfvxjl";
           name = "common-lisp-snippets";
         };
@@ -7919,15 +8054,15 @@
     company = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "company";
-        version = "20160201.1600";
+        version = "20160211.720";
         src = fetchFromGitHub {
           owner = "company-mode";
           repo = "company-mode";
-          rev = "a619a93069dab79b12d695fd4e8b043aa82d96ca";
-          sha256 = "0hy59hf2lq3w6wn5vsz839nrkijc87lyb8xyw2sj9jifd5ikpqi8";
+          rev = "e251568e99de9e684b21cc74306fa1c3678444b5";
+          sha256 = "15zkaq3vc74f8vbdjrxd1ha4mh7p0hn7x5nyg4dh0i3qchinlkjn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company";
           sha256 = "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4";
           name = "company";
         };
@@ -7940,15 +8075,15 @@
     company-anaconda = callPackage ({ anaconda-mode, cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "company-anaconda";
-        version = "20151230.1303";
+        version = "20160221.1323";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "company-anaconda";
-          rev = "991621d2c3d4d57eb9a6caa2e27588376d55defb";
-          sha256 = "0r8ip22gr2ihicznyl2vbwgy3gsp5b5gy0m2i60001kyhssgmg6v";
+          rev = "23a21e17e24f1f673d86bc8a0ace80df516636ce";
+          sha256 = "0hfhkpy8qpai6qspqcf1pnxygnnyn7ncmhp5bmg2p4b6qm328yxi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-anaconda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-anaconda";
           sha256 = "1s7y47ghy7q35qpfqavh4p9wr91i6r579mdbpvv6h5by856yn4gl";
           name = "company-anaconda";
         };
@@ -7969,7 +8104,7 @@
           sha256 = "06gh33qzglv40r62dsapzhxwparw8ciblv80g7h6y6ilyazwcidn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-ansible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-ansible";
           sha256 = "084l9dr2hvm00952y4m3jhchzxjhcd61sfn5ywj9b9a1d4sr110d";
           name = "company-ansible";
         };
@@ -7990,7 +8125,7 @@
           sha256 = "067xb4mwfnmbqjyfv4717417fg7ysvz9flnx1nrk6iv96gnf4vfx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-arduino";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-arduino";
           sha256 = "1bch447lllikip1xd90kdgssgc67sl04a70fxqkqlrc1bs6gkkws";
           name = "company-arduino";
         };
@@ -8019,7 +8154,7 @@
           sha256 = "0mkyg9y1rhl6hdzhr51psnvy2q0zw4y29m9p0ivb7s643k3fjjp5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-auctex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-auctex";
           sha256 = "1jia80sqmm83kzjcf1h1d9iz2k4k9albzvfka5hx6hpa4h8nm5q4";
           name = "company-auctex";
         };
@@ -8040,7 +8175,7 @@
           sha256 = "16cva7ccc0hrc6yf659kpsznlk1bkgv525lqr4nj8a12q0avjdxf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-c-headers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-c-headers";
           sha256 = "1715vnjr5cjiq8gjcd3idnpnijg5cg3sw3f8gr5x2ixcrip1hx3a";
           name = "company-c-headers";
         };
@@ -8061,7 +8196,7 @@
           sha256 = "0ll9dxzsgrpy4psz3dqhzny990lfccn63swcyfvl8mnqgwbrq8k0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-cabal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-cabal";
           sha256 = "0pbjidj88c9qri6xw8023yqwnczad5ig224cbsz6vsmdla2nlxra";
           name = "company-cabal";
         };
@@ -8074,15 +8209,15 @@
     company-coq = callPackage ({ cl-lib ? null, company, company-math, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "company-coq";
-        version = "20160204.942";
+        version = "20160212.808";
         src = fetchFromGitHub {
           owner = "cpitclaudel";
           repo = "company-coq";
-          rev = "484c5f058c8a6c30ac4b4dfdb23b362ddda80fed";
-          sha256 = "0wf7m6i6qrmcj469j9dnjl805b9x1a9hk5465av8dyv3zs5csj5k";
+          rev = "f99c17b693c29d0d385c28c3c0409e083aeba440";
+          sha256 = "003fbj21a8sb8fv33svbwyhdjywqrmh2y08d1hwmmp0vhd38333i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-coq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-coq";
           sha256 = "1iagm07ckf60kg4i8m4n0gfmv0brqc4dcn7lkcz229r3f4kyqksa";
           name = "company-coq";
         };
@@ -8103,7 +8238,7 @@
           sha256 = "0qbis9jqcrgj71cf8i9yfxsm7yj6d546gxw6linqd7slqn97l8rl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-dcd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-dcd";
           sha256 = "03849k4jzs23iglk9ghcq6283c9asffcq4dznypcjax7y4x113vd";
           name = "company-dcd";
         };
@@ -8123,15 +8258,15 @@
     company-edbi = callPackage ({ cl-lib ? null, company, edbi, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "company-edbi";
-        version = "20151230.1251";
+        version = "20160221.1323";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "company-edbi";
-          rev = "7debb5a700ab36fa86e78c3decd8ad16fc028c8a";
-          sha256 = "1fx9hch42kax95nd8zadsbnadq9cylrna0qf0q4bx5yj1afz91p1";
+          rev = "08dc69ccfbcf10ca83f7075e9b735c6885cd7e11";
+          sha256 = "0n2hvrfbybsp57w6m9mm7ywjq30fwwx9bzc2rllfr06d2ms7naai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-edbi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-edbi";
           sha256 = "067ff1xdyqy4qzgk5pmqf4kksfjk1glkrslcj3rk4zmhcalwrfrm";
           name = "company-edbi";
         };
@@ -8152,7 +8287,7 @@
           sha256 = "1lm26av6z18p70gxz23h87l25airawljr5lm7hw6krg706cp3aq6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-emoji";
           sha256 = "1mflqqw9gnfcqjb6g8ivdfl7s4mdyjg7j0457hamgyvgvpxsh8x3";
           name = "company-emoji";
         };
@@ -8173,7 +8308,7 @@
           sha256 = "1rg6jynzp37qnaq4lj48sfrhmv7mgcd2rzkixbpb3hgsy10dj9j0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-flx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-flx";
           sha256 = "1r4jcfzrhdpclblfrmi4qbl8dnhc2d7d4c1425xnslg7bhwd2vxn";
           name = "company-flx";
         };
@@ -8190,11 +8325,11 @@
         src = fetchFromGitHub {
           owner = "iquiw";
           repo = "company-ghc";
-          rev = "d78fcee6c8fa4f786a1e15a3bb78d2dd2c56b6af";
-          sha256 = "06ljm0ysz8czdr32gfq1y3nm3jcywihdszgnc2alx1hcgqiq0ds6";
+          rev = "96c78650da0030a55daee11668b04e313468294e";
+          sha256 = "0iydcp02x8mqbvxzihzzd1mnq065s19dpi0pq33a2v4nnlddlj1q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-ghc";
           sha256 = "07adykza4dqs64bk8vjmgryr54khxmcy28hms5z8i1qpsk9vmvnn";
           name = "company-ghc";
         };
@@ -8215,7 +8350,7 @@
           sha256 = "0jsnf60nz37s4csk8pnyr45fjdsac1ls64fvsh5gzi6hipxz5y6z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-ghci";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-ghci";
           sha256 = "0h9hqfb8fm90h87bi3myl84nppbbminhnvv6jqg62qi9k6snn1iq";
           name = "company-ghci";
         };
@@ -8232,11 +8367,11 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "db85a48a7870f46784edc202c780b19e2f65053a";
-          sha256 = "15jjmhw3pd4hx1khbvrypd8s2kh3ymkf8p4qh1c9rbw9csypj3al";
+          rev = "659c0a429af764118d27692d02b77c544a32cfe3";
+          sha256 = "1gfad94acp7qxm6yg0prjfkx370caq309zc8dy20ssi4x19j4n0x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-go";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-go";
           sha256 = "1ncy5wlg3ywr17zrxb1d1bap4gdvwr35w9a8b0crz5h3l3y4cp29";
           name = "company-go";
         };
@@ -8257,7 +8392,7 @@
           sha256 = "0fnv4rvvs9rqzrs86g23jcrpg0rcgk25299hm6jm08ia0kjjby1m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-inf-ruby";
           sha256 = "0cb1w0sxgb5jf0p2a5s2i4d511lsjjhyaqkqlwjz8nk4w14n0zxm";
           name = "company-inf-ruby";
         };
@@ -8278,7 +8413,7 @@
           sha256 = "0y1a9wxk9w2jk4177hkqzgqzknswikxc1dc60hzj4samyp2jhvfl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-irony";
           sha256 = "15adamk1b9y1i6k06i5ahf1wn70cgwlhgk0x6fk8pl5izg05z1km";
           name = "company-irony";
         };
@@ -8299,7 +8434,7 @@
           sha256 = "1x2dfjmy86icyv2g1y5bjlr87w8rixqdcndkwm1sba6ha277wp9i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-irony-c-headers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-irony-c-headers";
           sha256 = "0kiag5ggmc2f5c3gd8nn40x16i686jpdrfrflgrz2aih8p3g6af8";
           name = "company-irony-c-headers";
         };
@@ -8320,7 +8455,7 @@
           sha256 = "1ihqapp4dv92794rsgyq0rmhwika60cmradqd4bn9b72ss6plxs1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-jedi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-jedi";
           sha256 = "1krrgrjq967c3j02y0i345yx6w4crisnj1k3bhih6j849fvy3fvj";
           name = "company-jedi";
         };
@@ -8341,7 +8476,7 @@
           sha256 = "114z2p5ivdsfhkir9yzrm4zw34c8jlilwqyyd4y5ing8awc9jhv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-math";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-math";
           sha256 = "0chig8k8l65bnd0a6734fiy0ikl20k9v2wlndh3ckz5a8h963g87";
           name = "company-math";
         };
@@ -8362,7 +8497,7 @@
           sha256 = "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-nand2tetris";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-nand2tetris";
           sha256 = "1g2i33jjh7kbpzk835kbnqicf0w4cq5rqv934bqzz5kavj9cg886";
           name = "company-nand2tetris";
         };
@@ -8375,15 +8510,15 @@
     company-nixos-options = callPackage ({ cl-lib ? null, company, fetchFromGitHub, fetchurl, lib, melpaBuild, nixos-options }:
     melpaBuild {
         pname = "company-nixos-options";
-        version = "20151013.1809";
+        version = "20160215.257";
         src = fetchFromGitHub {
           owner = "travisbhartwell";
           repo = "nix-emacs";
-          rev = "6b1418611b49a6cf77380a76f7e6236bbb5df83a";
-          sha256 = "0ia9wgn33znaviy7ilfm83yfalc2dbpm1g7nvss5s4rznqkdfhn3";
+          rev = "63061d379460c53abbe88ec695a61e22feae438f";
+          sha256 = "100vjppa6nipn227v871nkmjmqln2l1lv1v8in1lcjhsz4rxrhs9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-nixos-options";
           sha256 = "1yrqqdadmf7qfxpqp8wwb325zjnwwjmn2hhnl7i3j0ckg6hqyqf0";
           name = "company-nixos-options";
         };
@@ -8396,15 +8531,15 @@
     company-qml = callPackage ({ company, fetchFromGitHub, fetchurl, lib, melpaBuild, qml-mode }:
     melpaBuild {
         pname = "company-qml";
-        version = "20151027.1035";
+        version = "20160212.1712";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "company-qml";
-          rev = "ae4a5f1ac30eb31e74e2eebf98c895c2cb5a51df";
-          sha256 = "07vcxwqynji7ggy9sb8lgpinkfjdiav0aybn5pnb0v8ck9v1w6k3";
+          rev = "92ee2d46197698a428af049a95eb66cc00eebf3f";
+          sha256 = "0sl59b9wwnpz6p2kxsc87b3q28vvfxg7pwk67c51q8qyrl0c1klv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-qml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-qml";
           sha256 = "0sva7i93dam8mc2z3cp785vmgcg7cphrpkwyvqyqhq8w51qg8mxx";
           name = "company-qml";
         };
@@ -8417,15 +8552,15 @@
     company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }:
     melpaBuild {
         pname = "company-quickhelp";
-        version = "20160204.647";
+        version = "20160211.918";
         src = fetchFromGitHub {
           owner = "expez";
           repo = "company-quickhelp";
-          rev = "24f89640729210f6c7056b66e30d72282a211b3a";
-          sha256 = "0qsz03ps9654wn965s31r85va3fwj3zvwn5naijj85nm8zwb9lb6";
+          rev = "39e206f7797962992aa1e555c293b6d872d6718b";
+          sha256 = "1b2v84ss5k43nnbsnvabgvb19ardsacbs1prn2h9i1k2d5mb8icw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-quickhelp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-quickhelp";
           sha256 = "042bwv0wd4hksbm528zb7pbllzk83p8qjq5f8z46p84c8mmxfp9g";
           name = "company-quickhelp";
         };
@@ -8446,7 +8581,7 @@
           sha256 = "1lk3fqsgbi6mg4hrpc9gy4hbfp9snyj4yvc0zh8iqqw5nx12dab4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-racer";
           sha256 = "0zc8dzvsjz5qsrwhv7x9f7djzvb9awacc3pgjirsv8f8sp7p3am4";
           name = "company-racer";
         };
@@ -8467,7 +8602,7 @@
           sha256 = "04829y7510zxjww9pq8afvnzwyyv30c0b3a71mxwf6ympfxb9rx5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-restclient";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-restclient";
           sha256 = "1md0n4k4wmbh9rmbwqh3kg2fj0c34rzqfd56jsq8lcdg14k0kdcb";
           name = "company-restclient";
         };
@@ -8483,6 +8618,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    company-shell = callPackage ({ cl-lib ? null, company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "company-shell";
+        version = "20160212.1339";
+        src = fetchFromGitHub {
+          owner = "Alexander-Miller";
+          repo = "company-shell";
+          rev = "d725646cb19a71a14b76add40e0b8ebb3031ad1b";
+          sha256 = "097v261fp0j7sjg6fkxwywpqf1vg1i2gq3i7m34vxzvs9l7ahagl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-shell";
+          sha256 = "0my9jghf3s4idkgrpki8mj1lm5ichfvznb09lfwf07fjhg0q1apz";
+          name = "company-shell";
+        };
+        packageRequires = [ cl-lib company dash ];
+        meta = {
+          homepage = "http://melpa.org/#/company-shell";
+          license = lib.licenses.free;
+        };
+      }) {};
     company-sourcekit = callPackage ({ company, dash, dash-functional, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sourcekit }:
     melpaBuild {
         pname = "company-sourcekit";
@@ -8494,7 +8650,7 @@
           sha256 = "1xzwalchl9lnq9848dlvhhbzyh1wkwbciz20d1iw0fsigj5g156c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-sourcekit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-sourcekit";
           sha256 = "0hr5j1ginf43h4qf3fvsh3z53z0c7w5a9lhrvdwmlzj396qhqmzs";
           name = "company-sourcekit";
         };
@@ -8507,15 +8663,15 @@
     company-tern = callPackage ({ cl-lib ? null, company, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild, s, tern }:
     melpaBuild {
         pname = "company-tern";
-        version = "20151230.1300";
+        version = "20160221.1323";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "company-tern";
-          rev = "0c5fa13381915d21b62a70818d25901efb0f4a05";
-          sha256 = "1b7p6g478para62bnpz5aqijaim8j72c9b27c2qahjmy2zj2f460";
+          rev = "87752b771447dd01c940ee03d96d21e4acaff777";
+          sha256 = "0zjgw8v93z4dyj9g1dny6digqkh9v8m9x44zkx5magq8dbv69qsc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-tern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-tern";
           sha256 = "17pw4jx3f1hymj6sc0ri18jz9ngggj4a41kxx14fnmmm8adqn6wh";
           name = "company-tern";
         };
@@ -8536,7 +8692,7 @@
           sha256 = "18hy60fm3b3dmp29cmzbs6grlihkwifjbzv30gprwj5f6x7m8knf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-try-hard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-try-hard";
           sha256 = "1rwn521dc8kxh43vcd3rf0h8jc53d4gmid3szj2msi0da1sk0mmj";
           name = "company-try-hard";
         };
@@ -8557,7 +8713,7 @@
           sha256 = "1a9qx041w7i1ahg6rmi82hv161k57z4aljzm8wpa9wrfj8a6df2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-web";
           sha256 = "0dj0m6wcc8cyvblp9b5b3am95gc18j9y4va44hvljxv1h7l5hhvy";
           name = "company-web";
         };
@@ -8578,7 +8734,7 @@
           sha256 = "0znchya89zzk30mwl4qfm0q9sfa5m3jspapb892ydj0mck5n4nyj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-ycm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-ycm";
           sha256 = "1q4d63c7nr3g7q0smd55pp636vqa9lf1pkwjn9iq265369npvina";
           name = "company-ycm";
         };
@@ -8591,15 +8747,15 @@
     company-ycmd = callPackage ({ company, dash, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, s, ycmd }:
     melpaBuild {
         pname = "company-ycmd";
-        version = "20160203.1121";
+        version = "20160215.629";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "c64684df763411249985159ee33b10d948b9fc91";
-          sha256 = "12jwqhzqskdp2l6h60rich19rddzjcl94zaf72ljnq8h0mqc3xy0";
+          rev = "61601543ca9b70f6a92a87fb9057af6143ba5ed1";
+          sha256 = "10j8zv5m36400wwkwbncqnsm616v59ww0bbkhrxcf6mn56iq8162";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-ycmd";
           sha256 = "0fqmkb0q8ai605jzn2kwd585b2alwxbmnb3yqnn9fgkcvyc9f0pk";
           name = "company-ycmd";
         };
@@ -8620,7 +8776,7 @@
           sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/concurrent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/concurrent";
           sha256 = "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf";
           name = "concurrent";
         };
@@ -8641,7 +8797,7 @@
           sha256 = "0zz1k4h16pjdwiqavfbfbrbvi83ww93kgf838ap4f3n034hqfx20";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/config-parser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/config-parser";
           sha256 = "0wncg1v4wccb9j16rcmwz8fcmrscj7knfisq0r4qqx3skrmpccah";
           name = "config-parser";
         };
@@ -8661,7 +8817,7 @@
           sha256 = "1l6970ng046hw2izzb15cbbbf83l6m8c9mvic8fzjixfi3g1dl55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/confluence";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/confluence";
           sha256 = "003lykwd3ya0xwlahmm35nx9p6mk8vylq57yxrmgdcc64630bdpf";
           name = "confluence";
         };
@@ -8682,7 +8838,7 @@
           sha256 = "0sz3qx1bn0lwjhka2l6wfl4b5486ji9dklgjs7fdlkg3dgpp1ahx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/conkeror-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/conkeror-minor-mode";
           sha256 = "1ch108f20k7xbf79azsp31hh4wmw7iycsxddcszgxkbm7pj11933";
           name = "conkeror-minor-mode";
         };
@@ -8703,7 +8859,7 @@
           sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/connection";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/connection";
           sha256 = "1y68d2kay8p5vapailxhrc5dl7b8k8nkvp7pa54md3fsivwp1d0q";
           name = "connection";
         };
@@ -8720,11 +8876,11 @@
         src = fetchFromGitHub {
           owner = "lshift-de";
           repo = "contextual";
-          rev = "8134a2d8034c624f4fdbbb0b3893de12f4257909";
-          sha256 = "0s4b7dkndhnh8q3plvg2whjx8zd7ffz4hnbn3xh86xd3k7sch7av";
+          rev = "9e009614fb72ef14964d7107abd44de5aed21659";
+          sha256 = "0ykc3lzdypf543dgm7jpi70z08kz9hwhn2gvp06ylb22id8b3fai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/contextual";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/contextual";
           sha256 = "0vribs0fa1xf5kwkmvzjwhiawni0p3v56c5l4dkz8d7wn2g6wfdx";
           name = "contextual";
         };
@@ -8745,7 +8901,7 @@
           sha256 = "1qsq543rb0z2fq716a2khs8zqyh13npzmbj58f00s8b3w3andpbh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/control-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/control-mode";
           sha256 = "1biq4p2w8rqcbvr09gxbchjqlaixjf1fzv7xv8lpv81dlhi7dgz6";
           name = "control-mode";
         };
@@ -8766,7 +8922,7 @@
           sha256 = "1x87rra9pxvcs8jxnzhg2jr9wq0l3kp3qqqsw77bc4jsizdndss1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/corral";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/corral";
           sha256 = "1drccqk4qzkgvkgkzlrrfd1dcgj8ziqriijrjihrzjgjsbpzv6da";
           name = "corral";
         };
@@ -8779,15 +8935,15 @@
     counsel = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "counsel";
-        version = "20160201.1343";
+        version = "20160221.1109";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "00f08f74f1568b6f835abadecff32cd7c9a7a556";
-          sha256 = "0hnqw1mhaa7ybldd6mvz9lyv32yspn3x2bgx3fsrh8rhsmns06qh";
+          rev = "4af5c2e4e83f51da91675b0de7301b09c4b24b2c";
+          sha256 = "0ra5sa0dfrh1bv1q3r81r92i6xzazvw3lzz5n5qfbxcpnf8lygzk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/counsel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/counsel";
           sha256 = "0y8cb2q4mqvzan5n8ws5pjpm7bkjcghg5q19mzc3gqrq9vrvyzi6";
           name = "counsel";
         };
@@ -8797,6 +8953,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    coverage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ov }:
+    melpaBuild {
+        pname = "coverage";
+        version = "20160219.1753";
+        src = fetchFromGitHub {
+          owner = "trezona-lecomte";
+          repo = "coverage";
+          rev = "57476dc0523a702e9772ebf2d500b1e1b56920b2";
+          sha256 = "0ss00jqwvgb9xk2fjx7z023lqfsfz6axw7ylfp5ji60lp5wbi0qs";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/coverage";
+          sha256 = "0ja7wsx2sj0h01sk1l3c0aidbs1ld4gj3kiwq6brs7r018sz45pm";
+          name = "coverage";
+        };
+        packageRequires = [ cl-lib ov ];
+        meta = {
+          homepage = "http://melpa.org/#/coverage";
+          license = lib.licenses.free;
+        };
+      }) {};
     cp5022x = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cp5022x";
@@ -8808,7 +8985,7 @@
           sha256 = "1z67x4a0aricd9q6i2w33k74alddl6w0rijjhzyxwml7ibhbvphz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cp5022x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cp5022x";
           sha256 = "0v1jhkix01l299m67jag43rnps68m19zy83vvdglxa8dj3naz5dl";
           name = "cp5022x";
         };
@@ -8821,15 +8998,15 @@
     cpputils-cmake = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cpputils-cmake";
-        version = "20151030.603";
+        version = "20160216.2240";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "cpputils-cmake";
-          rev = "9a496c9c14d1f287d9819aa0ed017be9fad9d3f4";
-          sha256 = "0kjkqylg0fncizrgcr8xx2qgjr8id41904n2pip0gicbry1n8bqg";
+          rev = "f18c96750b1b2f4e1537fac7df2818524ccda665";
+          sha256 = "0ky59gz5pvi4m5b9rh13ywfmclrmiwalynpqw652rmc6yfzv0fnz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cpputils-cmake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cpputils-cmake";
           sha256 = "0fswmmmrjv897n51nidmn8gs8yp00595g35vwjafsq6rzfg58j60";
           name = "cpputils-cmake";
         };
@@ -8850,7 +9027,7 @@
           sha256 = "0y37fx4ghx8a74cp7ci6p5yfpji8g42hlah2xcwfnyw0qlpqfbnl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/crab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/crab";
           sha256 = "1jz26bw2h7ahcb7y2qhpqrlfald244c92m6pvfrb0jg0z384i6aj";
           name = "crab";
         };
@@ -8871,7 +9048,7 @@
           sha256 = "12g6l6xlbs9h24q5lk8yjgk91xqd7r3v7r6czy10r09cmfjmkxbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/crappy-jsp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/crappy-jsp-mode";
           sha256 = "00wj61maib77qldzq06l9v0pbvp9jih75w1xw0ry9mij0r6ca8ii";
           name = "crappy-jsp-mode";
         };
@@ -8892,7 +9069,7 @@
           sha256 = "0l4bvk3m355b25d7pdnhczn3fckbq0rg2l4r0a0d94004ksvylqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/creds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/creds";
           sha256 = "0n11xxaf93bbc9ih25wj09zzw4sj32wb99qig4zcy8bpkl5y3llk";
           name = "creds";
         };
@@ -8913,7 +9090,7 @@
           sha256 = "18c4jfjnhb7asdhwj41g06cp9rz5xd7bbx2s1xvk6gahay27rlrv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/creole";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/creole";
           sha256 = "1pqgm7m2gzkn65v3qic71c38qiira29cwx11l96qph8h8sf47zw5";
           name = "creole";
         };
@@ -8934,7 +9111,7 @@
           sha256 = "0japww5x89vd1ahjm2bc3biz6wxv94vvqq5fyyzkqsblgk5bys0h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/creole-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/creole-mode";
           sha256 = "1lj9a0bgn7lmc2wyjzzvmpaz1f1spj02l51ki2wydjbfhxq61k0s";
           name = "creole-mode";
         };
@@ -8955,7 +9132,7 @@
           sha256 = "1kl6blr4dlz40gfc845071nhfms4fm59284ja2177bhghy3wmw6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/crm-custom";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/crm-custom";
           sha256 = "14w15skxr44p9ilhpswlgdbqfw8jghxi69l37yk4m449m7g9694c";
           name = "crm-custom";
         };
@@ -8976,7 +9153,7 @@
           sha256 = "1r9dhk8h8lq18vi0hjai8y4z42yjxg18786mcr2qs5m3q1ampf9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/crontab-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/crontab-mode";
           sha256 = "16qc2isvf6cgl5ihdbwmvv0gbhns4mkhd5lxkl6f8f6h0za054ci";
           name = "crontab-mode";
         };
@@ -8995,7 +9172,7 @@
           sha256 = "120hxk82i0r4qan4hfk9ldmw5a8bzv7p683lrnlcx9gyxgkia3am";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/crosshairs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/crosshairs";
           sha256 = "1gf73li6q5rg1dimzihxq0rdxiqzbl2w78r1qzc9mxw3qj7azxqp";
           name = "crosshairs";
         };
@@ -9008,15 +9185,15 @@
     crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "crux";
-        version = "20160130.1452";
+        version = "20160214.437";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "crux";
-          rev = "382834edb99de9b347d61beca8834838da199911";
-          sha256 = "0hrbh1vdr80l816zzzgd22vx77nl8ckc8b91z1gm675z6sqmipzf";
+          rev = "ca62859c495732b720faebf9a08e40fd5db0d947";
+          sha256 = "0skwj8cp8x2v8443jp03safrfx9adabdgsp01x95jhlc5hf2hfdc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/crux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/crux";
           sha256 = "10lim1sngqbdqqwyq6ksqjjqpkm97aj1jk550sgwj28338lnw73c";
           name = "crux";
         };
@@ -9037,7 +9214,7 @@
           sha256 = "00wgbcw09xn9xi52swi4wyi9dj9p9hyin7i431xi6zkhxysw4q7w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cryptol-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cryptol-mode";
           sha256 = "08iq69gqmps8cckybhj9065b8a2a49p0rpzgx883qxnypsmjfmf2";
           name = "cryptol-mode";
         };
@@ -9058,7 +9235,7 @@
           sha256 = "0ry0087g1br3397js7a9iy6k2x6p0dgqlggxx9gaqhms7pmpq14b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cryptsy-public-api";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cryptsy-public-api";
           sha256 = "1v78rm44af3vgsml5f6kpwvnb4ks6n49br2fhjgh6nc7g3jmz97n";
           name = "cryptsy-public-api";
         };
@@ -9071,15 +9248,15 @@
     csharp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "csharp-mode";
-        version = "20160117.1521";
+        version = "20160217.1411";
         src = fetchFromGitHub {
           owner = "josteink";
           repo = "csharp-mode";
-          rev = "bc3bd2a2e2e14f81f3e297841fbb6a761c35b417";
-          sha256 = "09b5n36z99asa81k7h7xr7906g1vpr3sg3kdcq2fdbznbpjydnvl";
+          rev = "57b23533673b39da9cd6d76f69a52ac4a2a607cb";
+          sha256 = "1q5kpzxgv14dj1q2dmlpxw2yj01gv3mjl2shhr1n89z8zpf6figl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/csharp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/csharp-mode";
           sha256 = "17j84qrprq492dsn103dji8mvh29mbdlqlpsszbgfdgnpvfr1rv0";
           name = "csharp-mode";
         };
@@ -9100,7 +9277,7 @@
           sha256 = "0ljhar80kk7k54jz1xiq4r0w6s1wkacl7qz9wkvvbzhjb0z049hq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/css-comb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/css-comb";
           sha256 = "1axwrvbc3xl1ixhh72bii3hhbi9d96y6i1my1rpvwqyd6f7wb2cf";
           name = "css-comb";
         };
@@ -9121,7 +9298,7 @@
           sha256 = "1mgc6bd0dzrp1dq1yj8m2qxjnpysd8ppdk2yp96d3zd07zllw4rx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/css-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/css-eldoc";
           sha256 = "1f079q3ccrr4drk2hvn4xs4vbrd3hg87xqbk3r9mmjvkagd1v7rf";
           name = "css-eldoc";
         };
@@ -9142,7 +9319,7 @@
           sha256 = "0hyf4im7b8zka065daw7yxrb3670dpp8q92vd2gcsva1jla92h9y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cssfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cssfmt";
           sha256 = "12yq4dhyv3p5gxnd2w193ilpj2d3gx5ns09w0z1zkg7ax3a4q4b8";
           name = "cssfmt";
         };
@@ -9163,7 +9340,7 @@
           sha256 = "1xf2hy077frfz8qf91c0l0qppcjxzr4bsbb622bx6fidqkpa3a1a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cssh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cssh";
           sha256 = "10yvvyzqr06jvijmzis9clb1slzp2mn80yclis8wvrmg4p8djljk";
           name = "cssh";
         };
@@ -9181,7 +9358,7 @@
           sha256 = "15rfg3326xcs3zj3siy9rn7yff101vfch1srskdi2650c3l3krva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/csv-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/csv-nav";
           sha256 = "0626vsm2f5zc2wi5pyx4xrwcr4ai8w9a3l7gi9883smvayr619sj";
           name = "csv-nav";
         };
@@ -9202,7 +9379,7 @@
           sha256 = "07vasdlai49qs0nsmq2cz1kcq1adqyarv8199imgwwcbh4vn7dqb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ctable";
           sha256 = "040qmlgfvjc1f908n52m5ll2fizbrhjzbd0kgrsw37bvm3029rx1";
           name = "ctable";
         };
@@ -9221,7 +9398,7 @@
           sha256 = "1xgrb4ivgz7gmingfafmclqqflxdvkarmfkqqv1zjk6yrjhlcvwf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ctags";
           sha256 = "11fp8l99rj4fmi0vd3hkffgpfhk1l82ggglzb74jr3qfzv3dcn6y";
           name = "ctags";
         };
@@ -9242,7 +9419,7 @@
           sha256 = "1va394nls4yi77rgm0kz5r00xiidj6lwcabhqxisz08m3h8gfkh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctags-update";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ctags-update";
           sha256 = "1k43l667mvr2y33nblachdlvdqvn256gysc1iwv5zgv7gj9i65qf";
           name = "ctags-update";
         };
@@ -9263,7 +9440,7 @@
           sha256 = "1d89gxyzv0z0nk7v1aa4qa0xfms2g2dsrr07cw0d99xsnyxfky31";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ctl-mode";
           sha256 = "0fydq779b0y6hmh8srfdimr5rl9mk3sj08rbvlljxv3kqv5ajczj";
           name = "ctl-mode";
         };
@@ -9284,7 +9461,7 @@
           sha256 = "1jlr2miwqsg06hk2clvsrw9fa98m2n76qfq8qv5svrb8dpil04wb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctxmenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ctxmenu";
           sha256 = "03g9px858mg19wapqszwav3599slljdyam8bvn1ri85fpa5ydvdp";
           name = "ctxmenu";
         };
@@ -9305,7 +9482,7 @@
           sha256 = "184plai32sn0indvi1dma6ykz907zgnrdyxdw6f5mghwca96g5kx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cucumber-goto-step";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cucumber-goto-step";
           sha256 = "1ydsd455dvaw6a180b6570bfgg0kxn01sn6cb57smqj835am6gx8";
           name = "cucumber-goto-step";
         };
@@ -9326,7 +9503,7 @@
           sha256 = "1ms0z5zplcbdwwdbgsjsbm32i57z9i2i8j9y3wm0pwzyz4zr36zy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cuda-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cuda-mode";
           sha256 = "0ip4vax93x72bjrh6prik6ddmrvszpsmgm0fxfz772rp24smc300";
           name = "cuda-mode";
         };
@@ -9344,7 +9521,7 @@
           sha256 = "1w0msh4mfhwglkwgb8ksqfdzbd1bvspllydnjzhc0yl3s7qrifbd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cursor-chg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cursor-chg";
           sha256 = "0d1ilall8c1y4w014wks9yx4fz743hvx5lc8jqxxlrq7pmqyqdxk";
           name = "cursor-chg";
         };
@@ -9365,7 +9542,7 @@
           sha256 = "0wmnhizv4jfcl1w9za4ydxf6xwxgm5vwmn1zi5vn70zmv4d6r49l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cursor-test";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cursor-test";
           sha256 = "1c1d5xq4alamlwyqxjx557aykz5dw87acp0lyglsrzzkdynbwlb1";
           name = "cursor-test";
         };
@@ -9383,7 +9560,7 @@
           sha256 = "1p0kacbw5zfrd7zplhlh7j1890spvn8p0bryvqqmyf8w5873pcmh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cus-edit+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cus-edit+";
           sha256 = "1kazcdfajcnrzvhsgsmwwx96rkry0dglprrc02hbd7ky1fppp4sz";
           name = "cus-edit-plus";
         };
@@ -9404,7 +9581,7 @@
           sha256 = "1yhizh8j745hv5ancpvijds9dasvsr2scwjscksp2x3krnd26ssp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cyberpunk-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cyberpunk-theme";
           sha256 = "0l2bwb5afkkhrbh99v2gns1vil9s5911hbnlq5w35nmg1wvbmbc9";
           name = "cyberpunk-theme";
         };
@@ -9425,7 +9602,7 @@
           sha256 = "1d5i8sm1xrsp4v4myidfyb40hm3wp7hgva7dizg9gbb7prmn1p5w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cycbuf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cycbuf";
           sha256 = "0gyj48h5wgjawqq3j4hgk5a8d23nffmhd1q53kg7b9vfsda51hbw";
           name = "cycbuf";
         };
@@ -9446,7 +9623,7 @@
           sha256 = "0hf3r89n9zn7wkay71drxadsnd9zm6p6kvg5mvwzdy3x3z4cfyi3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cycle-resize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cycle-resize";
           sha256 = "0vp57plwqx4nf3pbv5g4frjriq8niiia9xc3bv6c3gzd4a0zm7xi";
           name = "cycle-resize";
         };
@@ -9467,7 +9644,7 @@
           sha256 = "125s6vwbb9zpx6h3vrxnn7nr8pb45vhxd70ba2r3f87dlxah93am";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cycle-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cycle-themes";
           sha256 = "1whp9q26sgyf59wygbrvdf9gc94bn4dmhr2f2qivpajx550fjfbc";
           name = "cycle-themes";
         };
@@ -9485,7 +9662,7 @@
           sha256 = "09my4gj3qm9rdpk8lg6n6ki8ywj7kwzwd4hhgwascfnfi1hzwdvw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cygwin-mount";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cygwin-mount";
           sha256 = "0ik2c8ab9bsx58mgcv511p50h45cpv7455n4b0kri83sx9xf5abb";
           name = "cygwin-mount";
         };
@@ -9506,7 +9683,7 @@
           sha256 = "1xcd8j5chh5j3fibi8bg2il6r09vza5xlb5fqm9j8sg3vkab26z8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cyphejor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cyphejor";
           sha256 = "18l5km4xm5j3vv19k3fxs8i3rg4qnhrvx7b62vmyfcqmpiasrh6g";
           name = "cyphejor";
         };
@@ -9527,7 +9704,7 @@
           sha256 = "0vbcq807jpjssabmyjcdkpp6nnx1288is2c6x79dkrviw2xxw3qf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cypher-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cypher-mode";
           sha256 = "174rfbm7yzkznkfjmh9bdnm5fgqv9bjwm85h39317pv1g8c3mgv0";
           name = "cypher-mode";
         };
@@ -9544,11 +9721,11 @@
         src = fetchFromGitHub {
           owner = "cython";
           repo = "cython";
-          rev = "fa946e8435a4dcc3497fc7b0f4e87256d40844ba";
-          sha256 = "1w09wwp6gaa0c65mwa9jfcjksppxqv1xb7mlgsk1wxbyprcllaq5";
+          rev = "eca0803d7ce59597cdaf35fd54ce7cda193f262b";
+          sha256 = "1r9mky9qm8y49pwr3qqbgydvvjnxkd1c0wfj6h0izrmpwjz35r0r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cython-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cython-mode";
           sha256 = "0asai1f1pncrfxx296fn6ky09hj1qam5j0dpxxkzhy0a34xz0k2i";
           name = "cython-mode";
         };
@@ -9569,7 +9746,7 @@
           sha256 = "1ck1a61m0kjynqwzbw9hnc7y2a6gd6l1430wm7mw3qqsq959qwm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/czech-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/czech-holidays";
           sha256 = "10c0zscbn7pr9xqdqksy4kh0cxjg9bhw8p4qzlk18fd4c8rhqn84";
           name = "czech-holidays";
         };
@@ -9590,7 +9767,7 @@
           sha256 = "0fqirypxhbvnhz86rznwdx553ppg0z0hxh1h04qg7y58g01vpsdq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/d-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/d-mode";
           sha256 = "060k9ndjx0n5vlpzfxlv5zxnizx72d7y9vk7gz7gdvpm6w2ha0a2";
           name = "d-mode";
         };
@@ -9611,7 +9788,7 @@
           sha256 = "0fp40cyamchc9qq5vbpxgq3yp6vs8p3ncg46mjzr54psy3fc86dm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dactyl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dactyl-mode";
           sha256 = "0ppcabddcpwshfd04x42nbrbkagbyi1bg4vslysnlxn4kaxjs7pm";
           name = "dactyl-mode";
         };
@@ -9632,7 +9809,7 @@
           sha256 = "0fd0h07m42q2h1ggsjra20kzv209rpb4apjv408h2dxqm8sy0jiy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dakrone-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dakrone-theme";
           sha256 = "0ma4rfmgwd6k24jzn6pgk46b88jfix7mz0ib7c7r90h5vmpiq814";
           name = "dakrone-theme";
         };
@@ -9653,7 +9830,7 @@
           sha256 = "1abwx7fqbr395z3l3dshh242lxqpwr1mszmj1pxj420qi1qria6n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/darcula-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/darcula-theme";
           sha256 = "13d21gwzv66ibn0gs56ff3sn76sa2mkjvjmpd2ncxq3mcgxajnjg";
           name = "darcula-theme";
         };
@@ -9674,7 +9851,7 @@
           sha256 = "07w5aycgaps904q8lk52d0g28wxq41c82xgl5mw2q56n3s5iixfx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dark-krystal-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dark-krystal-theme";
           sha256 = "056aql35502sgvdpbgphpqdxzbjf4ay01rra6pm11c1dya8avv0j";
           name = "dark-krystal-theme";
         };
@@ -9684,6 +9861,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    dark-mint-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "dark-mint-theme";
+        version = "20160217.1502";
+        src = fetchFromGitHub {
+          owner = "shaunvxc";
+          repo = "dark-mint-theme";
+          rev = "1a6d7e49982832c0a282128e011512161c8f2b21";
+          sha256 = "0xsbmhpyis0c0hfk6qzx298pw042ns44qmm80qf8hwhhqp38mfyx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dark-mint-theme";
+          sha256 = "0rljpwycarbn8rnac9vz7n23j69wmx35gn5dx77v0f0ws8ni4k9m";
+          name = "dark-mint-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/dark-mint-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     dark-souls = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dark-souls";
@@ -9695,7 +9893,7 @@
           sha256 = "1w0y2j0j9n107dbk7ksr9bipshjfs9dk08qbs9m6h5aqh4hmwa4r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dark-souls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dark-souls";
           sha256 = "1ilsn657mpl7v8vkbzqf3gp0gmvy0dgynfsn8w4cb49qaiy337xc";
           name = "dark-souls";
         };
@@ -9716,7 +9914,7 @@
           sha256 = "19vrxfzhi0sqf7frzjx5z02d65r2jp1w2nhhf0527g7baid5hqvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/darkburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/darkburn-theme";
           sha256 = "18hwdnwmkf640vcyx8d66i424wwazbzjq3k0w0xjmwsn2mpyhm9w";
           name = "darkburn-theme";
         };
@@ -9737,7 +9935,7 @@
           sha256 = "0ajxlrnz1228w8ldgraw6a4s605isbr67p8s382jvia2zf821fmp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/darkmine-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/darkmine-theme";
           sha256 = "06vzldyqlmfd11g8dqrqh5x244ikfa20qwpsmbgsiry3041k8iw5";
           name = "darkmine-theme";
         };
@@ -9758,7 +9956,7 @@
           sha256 = "1p7ih9fmcxnnxkj2mz56xa403m828wyyqvliabf5amklzjlhb3z9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/darktooth-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/darktooth-theme";
           sha256 = "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs";
           name = "darktooth-theme";
         };
@@ -9771,15 +9969,15 @@
     dart-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "dart-mode";
-        version = "20150721.1854";
+        version = "20160212.1321";
         src = fetchFromGitHub {
           owner = "nex3";
           repo = "dart-mode";
-          rev = "1b7562262c83de94a5118ffc55b495dae8aa7367";
-          sha256 = "1pd7a76znzypwi0khssdlas5kcma8r865d68jmr3n6xvwdmy8dlc";
+          rev = "05fbd30fb4dd1ce931fb15a3e88b13eeec5526ef";
+          sha256 = "0ylzgaf4g0fh16rc061iaw3jrl2sjiwpr4x1ndk2bp0j14n7hqid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dart-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dart-mode";
           sha256 = "0wxfh8v716dhrmx1klhpnsrlsj66llk8brmwryjg2h7c391sb5ff";
           name = "dart-mode";
         };
@@ -9800,7 +9998,7 @@
           sha256 = "1g7vrfhafmkqwdpfllfiwirl4pi437pyaws38jsd8laxmsa4m4wb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dash";
           sha256 = "0azm47900bk2frpjsgy108fr3p1jk4h9kmp4b5j5pibgsm26azgz";
           name = "dash";
         };
@@ -9821,7 +10019,7 @@
           sha256 = "0zd50sr51mmvndjb9qfc3sn502nhc939rhd454jbkmlrzqsxvphj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dash-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dash-at-point";
           sha256 = "0x4nq42nbh2qgbg111lgbknc7w7m7lxd14mp9s8dcrpwsaxz960m";
           name = "dash-at-point";
         };
@@ -9842,7 +10040,7 @@
           sha256 = "1g7vrfhafmkqwdpfllfiwirl4pi437pyaws38jsd8laxmsa4m4wb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dash-functional";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dash-functional";
           sha256 = "0hx36hs12mf4nmskaaqrqpcgwrfjdqj6qcxn6bwb0s5m2jf9hs8p";
           name = "dash-functional";
         };
@@ -9863,7 +10061,7 @@
           sha256 = "0l4z9rjla4xvm2hmp07xil69q1cg0v8iff0ya41svaqr944qf7hf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/date-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/date-at-point";
           sha256 = "0r26df6px6q5jlxj29nhl3qbp6kzy9hs5vd72kpiirgn4wlmagp0";
           name = "date-at-point";
         };
@@ -9884,7 +10082,7 @@
           sha256 = "1lmwnj2fnvijj9qp4rjggl7c4x91vnpb47rqaam6m2wmr5wbrx3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/date-field";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/date-field";
           sha256 = "0fmw13sa4ajs1xkrkdpcjpbp0jl9d81cgvwh93myg8yjjn7wbmvk";
           name = "date-field";
         };
@@ -9905,7 +10103,7 @@
           sha256 = "0ry7magy9x63xv2apjbpgszp0slch92g23gqwl4rd564qafajmf0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/datomic-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/datomic-snippets";
           sha256 = "0lax0pj4k9c9n0gmrvil240pc9p25535q3n5m8nb2ar4sli8dn8r";
           name = "datomic-snippets";
         };
@@ -9926,7 +10124,7 @@
           sha256 = "1j0mk8vyr6sniliq0ix77jldx8vzl73nd5yhh82klzgyymal58ms";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dayone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dayone";
           sha256 = "0hi09dj00h6g5r84jxglwkgbijhfxknx4mq5gcl5jzjis5affk8l";
           name = "dayone";
         };
@@ -9947,7 +10145,7 @@
           sha256 = "0syv4kr319d34yqi4q61b8jh5yy22wvd148x1m3pc511znh2ry5k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/db";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/db";
           sha256 = "05jhga9n6gh1bmj8gda14sb703gn7jgjlvy55mlr5kdb2z3rqw1n";
           name = "db";
         };
@@ -9968,7 +10166,7 @@
           sha256 = "15r0qwjkl33p8kh2k5kxz9wnbkv1k470b1h0i6svvljkx9ynk68a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/db-pg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/db-pg";
           sha256 = "06nfibw01ijv7nr0m142y80jbbpg9kk1dh19s5wq7i6fqf7g08xg";
           name = "db-pg";
         };
@@ -9985,11 +10183,11 @@
         src = fetchFromGitHub {
           owner = "skk-dev";
           repo = "ddskk";
-          rev = "64ad0ea6d03c0d46030cc5aaa3715b5cf3a82d3c";
-          sha256 = "02bsiq0kxm9cbbr6hr20ac4888mcyk0i8p9hrrdvaijq4fhkk76b";
+          rev = "4cb5da1418f447423cb81ca99539f77a6067ad77";
+          sha256 = "145n50vspxaslvhf3ahlp435h5slz24csa2h62zly18xprw1ai1h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ddskk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ddskk";
           sha256 = "01pb00p126q7swsl12yjrhghln2wgaj65jhjr0k7dkk64x4psyc9";
           name = "ddskk";
         };
@@ -10010,7 +10208,7 @@
           sha256 = "1darxggvyv100cfb7imyzvgif8a09pnky62pf3bl2612hhvaijfb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/debpaste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/debpaste";
           sha256 = "1vgirfy4vdqkhllnnmcplhwmzqqwca3la5jfvvansykqriwbq9lw";
           name = "debpaste";
         };
@@ -10031,7 +10229,7 @@
           sha256 = "1n99nrp42slmyp5228d1nz174bysjn122jgs8fn1x0qxywg7jyxp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/debug-print";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/debug-print";
           sha256 = "01dsqq2qdsbxny6j9dhvg770493awxjhk1m85c14ysgh6sl199rm";
           name = "debug-print";
         };
@@ -10052,7 +10250,7 @@
           sha256 = "01bafkc99g9vi45y95mi3sqin2lsfw885z63f7llpqvnfav86n4y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/decl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/decl";
           sha256 = "0wdhmp226wmrjvjgpbz8ihvhxxv3rrxh97sdqm3mgsav3n071n6k";
           name = "decl";
         };
@@ -10073,7 +10271,7 @@
           sha256 = "0pba9s0h37sxyqh733vi6k5raa4cs7aradipf3826inw36jcw414";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dedicated";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dedicated";
           sha256 = "1ka8n02r3nd2ksbid23g2qd6707c7xsjx7lbbdi6pcmwam5mglw9";
           name = "dedicated";
         };
@@ -10094,7 +10292,7 @@
           sha256 = "1haixiy94r50rfza64dypb7fi256231pf06g6p2il9kyscqg0zz2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dedukti-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dedukti-mode";
           sha256 = "17adfmrhfks5f45ddr6ygjq870ac50vfzc5872ycv414zg0w4sa9";
           name = "dedukti-mode";
         };
@@ -10115,7 +10313,7 @@
           sha256 = "1ysv1q7n7k2l4x8x7hlzmxmawyxl5lx627sbdv3phkvjh5zccsm8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/default-text-scale";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/default-text-scale";
           sha256 = "18r90ic38fnlsbg4gi3r962vban398x2bf3rqhrc6z4jk4aiv3mi";
           name = "default-text-scale";
         };
@@ -10136,7 +10334,7 @@
           sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/deferred";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/deferred";
           sha256 = "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr";
           name = "deferred";
         };
@@ -10157,7 +10355,7 @@
           sha256 = "02i621yq2ih0zp7mna8iykj41prv77hvcadz7rx8c942zyvjzxqd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/define-word";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/define-word";
           sha256 = "035fdfwnxw0mir1dyvrimygx2gafcgnvlcsmwmry1rsfh39n5b9a";
           name = "define-word";
         };
@@ -10178,7 +10376,7 @@
           sha256 = "07jzr571q02l0lg5d40rnmzg16hmybi1nkjgslmvlx46z3c4xvyr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/defproject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/defproject";
           sha256 = "1gld2fkssrjh4smpp54017549d6aw3n1zisp5s4kkb6cmszwj5gm";
           name = "defproject";
         };
@@ -10197,7 +10395,7 @@
           sha256 = "15c3ec6fcfae63201652394205fee951f3c1db8d3c6fc5f48c306b9b775c8e63";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/deft";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/deft";
           sha256 = "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p";
           name = "deft";
         };
@@ -10215,7 +10413,7 @@
           sha256 = "1gap2icsqi7cryfvcffh41zqg2ghl4y7kg9pngzdfjrc3m7sf635";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/delight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/delight";
           sha256 = "1d9m5k18k73vhidwd50mcbq7mlvwdn4sb9ih8r5gri9a9whi2nkj";
           name = "delight";
         };
@@ -10236,7 +10434,7 @@
           sha256 = "06a20sd8nc273azrgha40l1fbqvv9qmxsmkjiqbf6dcf1blkwjyf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/delim-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/delim-kill";
           sha256 = "1pplc456771hi52ap1p87y7pabxlvm6raszcxjvnxff3xzw56pig";
           name = "delim-kill";
         };
@@ -10257,7 +10455,7 @@
           sha256 = "13jfhc9gavvb9dxmgi3k7ivp5iwh4yw4m11r2s8wpwn6p056bmfl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/demangle-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/demangle-mode";
           sha256 = "0ky0bb6rc99vrdli4lhs656qjndnla9b7inc2ji9l4n1zki5qxzk";
           name = "demangle-mode";
         };
@@ -10278,7 +10476,7 @@
           sha256 = "1hdnjwsmwbwn0ziyw805jjpaj3zpm374g9y4yn5ip4l9x4vq73xv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/demo-it";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/demo-it";
           sha256 = "063v115xy9mcga4qv16v538k12rn9maz92khzwa35wx56bwz4gg7";
           name = "demo-it";
         };
@@ -10299,7 +10497,7 @@
           sha256 = "13fasbhdjwc4jh3cy25gm5sbbg56hq8la271098qpx6dhqm2wycq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/describe-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/describe-number";
           sha256 = "0gvriailni2ppz69g0bwnb1ik1ghjkj341k45vllz30j0frp9iji";
           name = "describe-number";
         };
@@ -10320,7 +10518,7 @@
           sha256 = "18k5898r4n96h93xsvjrpm90hz3rd0ir6x3axjzqwwrgs2ik7pj2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/desktop+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/desktop+";
           sha256 = "0w7i6k4814hwb19l7ly9yq59674xiw57ylrwxq7yprwx52sgs2r8";
           name = "desktop-plus";
         };
@@ -10340,7 +10538,7 @@
           sha256 = "7c7727dd1d63be98e428700bfe340f2c4e7ff713fcc9b2b743a3366d786ae02d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/desktop-registry";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/desktop-registry";
           sha256 = "02mj0nlawx6vpksqsvp1q7l8rd6b1bs8f9c8c2rmda46jaf5npyr";
           name = "desktop-registry";
         };
@@ -10360,7 +10558,7 @@
           sha256 = "0lg6i9vw6xsnaamfjczz0cr41vlv1bs03h8c8y2jxpdkgaab31nc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dic-lookup-w3m";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dic-lookup-w3m";
           sha256 = "0myv7sns9ajyr7fzn6kd8a64pfapjdksgby5ilh9mr99imm8dcfv";
           name = "dic-lookup-w3m";
         };
@@ -10381,7 +10579,7 @@
           sha256 = "0b8yg03h5arfl5rlzlg2a6q7nhx452mdyngizjzxlvkmrqnlra4v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dictcc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dictcc";
           sha256 = "0x1y742hb3dm7xmh5810dlqki38kybw68rmg9adcchm2rn86jqlm";
           name = "dictcc";
         };
@@ -10402,7 +10600,7 @@
           sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dictionary";
           sha256 = "0zr9sm5rmr0frxdr0za72wiffip9391fn9dm5y5x0aj1z4c1n28w";
           name = "dictionary";
         };
@@ -10423,7 +10621,7 @@
           sha256 = "0sjwpvzd4x9c1b9iv66b33llvp96ryyzyp8pn1rnhvxfvjv43cnz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/diff-hl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/diff-hl";
           sha256 = "0kw0v9xcqidhf26qzrqwdlav2zhq32xx91k7akd2536jpji5pbn6";
           name = "diff-hl";
         };
@@ -10444,7 +10642,7 @@
           sha256 = "14ccak3cmv36pd085188lypal9gd3flyikcrxn0wi6hn60w2dgvr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/diffscuss-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/diffscuss-mode";
           sha256 = "06jd7wh4yzryz0yjwa4a0xddz7srl5mif8ff1wvcpxsb66m2zbvh";
           name = "diffscuss-mode";
         };
@@ -10465,7 +10663,7 @@
           sha256 = "0diw887x4q7kbgdvxbbnxdw51z33kqwxw3v9m45fczxbywyi4cxf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/diffview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/diffview";
           sha256 = "0vlzmykvxjwjww313brl1nr13kz41jypsk0s3l8q3rbsnkpfic5k";
           name = "diffview";
         };
@@ -10478,15 +10676,15 @@
     digistar-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "digistar-mode";
-        version = "20150402.1922";
+        version = "20160218.1355";
         src = fetchFromGitHub {
           owner = "retroj";
           repo = "digistar-mode";
-          rev = "fcc0447b9ad97ac76f86de7485e0947440966d3f";
-          sha256 = "0rjqfpya6wkf8nv00q2d40fcnssnsr3p07j9blbpcrqalkdm27ds";
+          rev = "15288b1e1a04b79b5ab7097fdd26d48b2ff41076";
+          sha256 = "0qxdfv1p0140fqcxh677hhxwpx1fihvwhvh76pysn4q4pcfr6ldr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/digistar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/digistar-mode";
           sha256 = "0khzxlrm09h31i1nqz6rnzhrdssb3kppc4klpxza612l306fih0s";
           name = "digistar-mode";
         };
@@ -10507,7 +10705,7 @@
           sha256 = "17jfmgyras32w9xr8fldqj924bijgng4bjg9fy6ckwb3mgihyil8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dim";
           sha256 = "0gsyily47g3g55qmhp1wzfz319l1pkgjz4lbigafjzlzqxyclz52";
           name = "dim";
         };
@@ -10528,7 +10726,7 @@
           sha256 = "0bw1gkaycbbv2glnaa36gwzkl1l6lsq7i2i7jinka92b27zvrans";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dim-autoload";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dim-autoload";
           sha256 = "0lhzzjrgfvbqnzwhjywrk3skdb7x10xdq7d21q6kdk3h5r0np9f9";
           name = "dim-autoload";
         };
@@ -10549,7 +10747,7 @@
           sha256 = "04vfc5zgcjp0pax5zk1x98ivx5g349c5g3748lb9pgsijqaprgg4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/diminish";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/diminish";
           sha256 = "1h6a31jllypk47akjflz89xk6h47na96pim17d6g4rpqcafc2k43";
           name = "diminish";
         };
@@ -10570,7 +10768,7 @@
           sha256 = "1ldqxdwy6r0fd2vh0ckkhgpincvybghavi8c7vvyd24j91i57y2f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dionysos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dionysos";
           sha256 = "1wjgj74dnlwd79gc3l7ymbx75jka8rw9smzbb10dsfppw3rrzfmz";
           name = "dionysos";
         };
@@ -10591,7 +10789,7 @@
           sha256 = "0mcsfsybpsxhzkd2m9bzc0np49azm6qf5x4x9h9lbxc8vfgh4z8s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dircmp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dircmp";
           sha256 = "0cnj7b0s8vc83sh9sai1cldw54krk5qbz1qmlvvd1whryf2pc95c";
           name = "dircmp";
         };
@@ -10604,15 +10802,15 @@
     dired-atool = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-atool";
-        version = "20160203.458";
+        version = "20160208.633";
         src = fetchFromGitHub {
           owner = "HKey";
           repo = "dired-atool";
-          rev = "8a1fb134875e83bf0ffeb693d02066c96c1c312f";
-          sha256 = "1i4q65y6r1npcxsp7fjk695my668jys46cq62syv2b8c4vbgapn3";
+          rev = "f188ccf6092330dbbefc0e75aa4fad3e7258749d";
+          sha256 = "06m2p5sf47ykhkl958x4k0j0rxzrq0wfwf86mvnarlgc1215dbaf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-atool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-atool";
           sha256 = "0qljx6fmz1hal9r2smjyc957wcvcpg16vp5mv65ip6d26k5qsj0w";
           name = "dired-atool";
         };
@@ -10629,11 +10827,11 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bc5b52efbad15a95a898dfcf3e828bf852555135";
-          sha256 = "1r5pn8j1c6bs41pm7ix6bjn1qv29nk7qw6xhskzakg0y1z5zlyvd";
+          rev = "49bb19a92a4256057f151da9ad6d0a91d46dacc0";
+          sha256 = "0hdpn2q55qqvqffb70c8z72ah516l1d3gbzibrr5d0i31xggx4g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-avfs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-avfs";
           sha256 = "1q42pvrpmd525887iicd3m5gw4w2a78xb72v7fjfl30ay1kir4bm";
           name = "dired-avfs";
         };
@@ -10651,7 +10849,7 @@
           sha256 = "1ddrhj1kw0wl7jbs9jn067vfffsvqhz4izfw9f7ihxz34fdl2iza";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-details";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-details";
           sha256 = "1390vl3i4qbnl7lbia98wznhf6x887d24f8p7146fpqjsiwbm5ck";
           name = "dired-details";
         };
@@ -10670,7 +10868,7 @@
           sha256 = "07z4h5l8763ks6b6m8dcmq78jiyq4xvan1mb0z8fbasmi1bsrya4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-details+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-details+";
           sha256 = "1gzr3z4nyzip299z08mignhigxr7drak7rv9z6gmdjrika9a29lx";
           name = "dired-details-plus";
         };
@@ -10691,7 +10889,7 @@
           sha256 = "1lcmpzwj43gix2q56bh2gw3gfqh8vl5j3mqr8s7v3k0aw816j0ni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-dups";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-dups";
           sha256 = "05s02gw8b339yvsr7vvka1r2140y7mbjzs8px4kn4acgb5y7rk71";
           name = "dired-dups";
         };
@@ -10712,7 +10910,7 @@
           sha256 = "0jj9da880b4zwxba140fldai1x9p2sxc6hdf3wz6lnbvz1pyn1mv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-efap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-efap";
           sha256 = "01j5v6584qi8ia7zmk03kx3i3kmm6hn6ycfgqlh5va6lp2h9sr00";
           name = "dired-efap";
         };
@@ -10733,7 +10931,7 @@
           sha256 = "1lnqjkbzryv655n16xj1c5bxck2jb5ccy8yckz1wp5yikkr06ba8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-fdclone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-fdclone";
           sha256 = "11aikq2q3m9h4zpgl24f8npvpwd98jgh8ygjwy2x5q8as8i89vf9";
           name = "dired-fdclone";
         };
@@ -10746,15 +10944,15 @@
     dired-filetype-face = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-filetype-face";
-        version = "20151216.2057";
+        version = "20160217.247";
         src = fetchFromGitHub {
           owner = "jixiuf";
           repo = "dired-filetype-face";
-          rev = "c51bb2d5fba8964b86e63242c247c4688441b9db";
-          sha256 = "0v6n4ymlnphzmqaqlfbxvf24dh1pa0xy37xhz9xfjkk02l02wsgf";
+          rev = "ca37251cee6b4e07004326169d701745a80f595f";
+          sha256 = "06hxcxgivxds42qilraqa6q1mlrhkn21w2adb1dg70p8qyrjqfk6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-filetype-face";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-filetype-face";
           sha256 = "1g9wzkkqmlkxlxwx43446q9mlam035zwq0wzpf7m6394rw2xlwx6";
           name = "dired-filetype-face";
         };
@@ -10771,11 +10969,11 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bc5b52efbad15a95a898dfcf3e828bf852555135";
-          sha256 = "1r5pn8j1c6bs41pm7ix6bjn1qv29nk7qw6xhskzakg0y1z5zlyvd";
+          rev = "49bb19a92a4256057f151da9ad6d0a91d46dacc0";
+          sha256 = "0hdpn2q55qqvqffb70c8z72ah516l1d3gbzibrr5d0i31xggx4g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-filter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-filter";
           sha256 = "1mw94210i57wrqfyif6rh689xbwbpv1qp6bgc0j7z6g4xypvd52p";
           name = "dired-filter";
         };
@@ -10792,11 +10990,11 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bc5b52efbad15a95a898dfcf3e828bf852555135";
-          sha256 = "1r5pn8j1c6bs41pm7ix6bjn1qv29nk7qw6xhskzakg0y1z5zlyvd";
+          rev = "49bb19a92a4256057f151da9ad6d0a91d46dacc0";
+          sha256 = "0hdpn2q55qqvqffb70c8z72ah516l1d3gbzibrr5d0i31xggx4g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-hacks-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-hacks-utils";
           sha256 = "1vgl0wqf7gc2nbiqjn0rkrdlnxfm3wrgspx5b3cixv2n8rqx8kyi";
           name = "dired-hacks-utils";
         };
@@ -10817,7 +11015,7 @@
           sha256 = "088h9yn6wndq4pq6f7q4iz17f9f4ci29z9nh595idljp3vwr7qid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-imenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-imenu";
           sha256 = "09yix4fkr03jq6j2rmvyg6gkmcnraw49a8m9649r3m525qdnhxs1";
           name = "dired-imenu";
         };
@@ -10838,7 +11036,7 @@
           sha256 = "13xpbbdd190lklz8jmj8nw8qm414kpkij9wrd7a9ws9j1jzj8x6s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-k";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-k";
           sha256 = "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8";
           name = "dired-k";
         };
@@ -10855,11 +11053,11 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bc5b52efbad15a95a898dfcf3e828bf852555135";
-          sha256 = "1r5pn8j1c6bs41pm7ix6bjn1qv29nk7qw6xhskzakg0y1z5zlyvd";
+          rev = "49bb19a92a4256057f151da9ad6d0a91d46dacc0";
+          sha256 = "0hdpn2q55qqvqffb70c8z72ah516l1d3gbzibrr5d0i31xggx4g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-narrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-narrow";
           sha256 = "1rgqiscbizalh78jwc53zbj599dd13a6vzdgf75vzllc1w7jsg6d";
           name = "dired-narrow";
         };
@@ -10872,15 +11070,15 @@
     dired-open = callPackage ({ dash, dired-hacks-utils, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-open";
-        version = "20150819.1148";
+        version = "20160205.1413";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bc5b52efbad15a95a898dfcf3e828bf852555135";
-          sha256 = "1r5pn8j1c6bs41pm7ix6bjn1qv29nk7qw6xhskzakg0y1z5zlyvd";
+          rev = "49bb19a92a4256057f151da9ad6d0a91d46dacc0";
+          sha256 = "0hdpn2q55qqvqffb70c8z72ah516l1d3gbzibrr5d0i31xggx4g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-open";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-open";
           sha256 = "0a4ksz2jkva4gvhprywjc1fzrbf95xdk8gn25nv1h1c1ckhr91qx";
           name = "dired-open";
         };
@@ -10898,7 +11096,7 @@
           sha256 = "0fhag6jhb97jg50rb32s93mml0adncsd58z9grs7l95zva439pc2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired+";
           sha256 = "1dmp6wcynran03nsa0fd26b9q0zj9wp8ngaafx1i1ybwn2gx32g5";
           name = "dired-plus";
         };
@@ -10915,11 +11113,11 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bc5b52efbad15a95a898dfcf3e828bf852555135";
-          sha256 = "1r5pn8j1c6bs41pm7ix6bjn1qv29nk7qw6xhskzakg0y1z5zlyvd";
+          rev = "49bb19a92a4256057f151da9ad6d0a91d46dacc0";
+          sha256 = "0hdpn2q55qqvqffb70c8z72ah516l1d3gbzibrr5d0i31xggx4g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-rainbow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-rainbow";
           sha256 = "1b9yh8p2x1dg7dyqhjhnqqiiymyl6bwsam65j0lpvbdx8r4iw882";
           name = "dired-rainbow";
         };
@@ -10936,11 +11134,11 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bc5b52efbad15a95a898dfcf3e828bf852555135";
-          sha256 = "1r5pn8j1c6bs41pm7ix6bjn1qv29nk7qw6xhskzakg0y1z5zlyvd";
+          rev = "49bb19a92a4256057f151da9ad6d0a91d46dacc0";
+          sha256 = "0hdpn2q55qqvqffb70c8z72ah516l1d3gbzibrr5d0i31xggx4g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-ranger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-ranger";
           sha256 = "19lbbzqflqda5b0alqfzdhpbgqssghqb4n4viq8x4l1fac8mby6h";
           name = "dired-ranger";
         };
@@ -10961,7 +11159,7 @@
           sha256 = "01xvaqckyr31ywsn1fp9sz9wq4h4dd1hgghfqypc9s4akrxmgnf2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-single";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-single";
           sha256 = "13h8dsn7bkz8ji2rrb7vyrqb2znxarpiynqi65mfli7dn5k086vf";
           name = "dired-single";
         };
@@ -10979,7 +11177,7 @@
           sha256 = "1dpxkxxfs14sdm3hwxv0j26lq0qzx4gryw42vrcdi680aj24962z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-sort";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-sort";
           sha256 = "1dzy2601yikmmbfqivf9s5xi4vd1f5g3c53f8rc74kfnxr1qn59x";
           name = "dired-sort";
         };
@@ -10997,7 +11195,7 @@
           sha256 = "1i42r7j1c8677qf79ig33bia24d2yvcj26y92migfvrlbi03w4qi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-sort-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-sort-menu";
           sha256 = "0n7zh8s3vdw3pcax8wkas9rykf917wn2dzikdlyrl5bbil9ijblb";
           name = "dired-sort-menu";
         };
@@ -11016,7 +11214,7 @@
           sha256 = "1hjci4zfzig04ji1jravxg9n67rdr4wyhmxmahbrzq9kjnql510i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-sort-menu+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-sort-menu+";
           sha256 = "19ah8qgbfdvyhfszdr6hlw8l01lbdb84vf5snldw8qh3x6lw8cfq";
           name = "dired-sort-menu-plus";
         };
@@ -11033,11 +11231,11 @@
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "dired-hacks";
-          rev = "bc5b52efbad15a95a898dfcf3e828bf852555135";
-          sha256 = "1r5pn8j1c6bs41pm7ix6bjn1qv29nk7qw6xhskzakg0y1z5zlyvd";
+          rev = "49bb19a92a4256057f151da9ad6d0a91d46dacc0";
+          sha256 = "0hdpn2q55qqvqffb70c8z72ah516l1d3gbzibrr5d0i31xggx4g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-subtree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-subtree";
           sha256 = "1vqcnkh3g6dwi2hwfkb534q0j19pkqzqk3yb7ah8ck4z4ln4ppfk";
           name = "dired-subtree";
         };
@@ -11058,7 +11256,7 @@
           sha256 = "1yx20h16hc1b04knsqhrxni0j8qgwnq7i5b0dlggq3dakcvqfxma";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-toggle";
           sha256 = "18v571kp440n5g1d7pj86rr8dgbbm324f9vblkdbdvn13c5dczf5";
           name = "dired-toggle";
         };
@@ -11079,7 +11277,7 @@
           sha256 = "0ajj8d6k5in2hclcrqckinfh80ylddplva0ryfbkzsjkfq167cv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-toggle-sudo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-toggle-sudo";
           sha256 = "0fy05af9aq9791ij4j9pscdk5j44pbg0kmhpqli41qiazjw7v2va";
           name = "dired-toggle-sudo";
         };
@@ -11100,7 +11298,7 @@
           sha256 = "1rx7vq6yl83fbmb76sczbb1bv972s4cyg160sm2yap1i6nzhd10p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/diredful";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/diredful";
           sha256 = "0y8x6q1yfsk0srxsh4g5nbsms1g9pk9d103jx7cfdac79mcigw7x";
           name = "diredful";
         };
@@ -11121,7 +11319,7 @@
           sha256 = "0mis3m6lg3vlvp8qm8iajprgx3pm3gcbhdszsm9mvrcgkahdjqnr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/direx";
           sha256 = "1x3rnrhhyrrvgry9n7kc0734la1zp4gc4bpy50f2qpfd452jwqdm";
           name = "direx";
         };
@@ -11142,7 +11340,7 @@
           sha256 = "0swdh0qynpijsv6a2d308i42hfa0jwqsnmf4sm8vrhaf3vv25f5h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/direx-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/direx-grep";
           sha256 = "0y2wrzq06prm55akwgaqjg56znknyvbayav13asirqzg258skvm2";
           name = "direx-grep";
         };
@@ -11161,7 +11359,7 @@
           sha256 = "1q03q4j0wkbg9p2nzf1kb7l517b21mskp2v52i95jbxh09igbjjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dirtree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dirtree";
           sha256 = "0wfz9ks5iha2n0rya9yjmrb6f9lhp620iaqi92lw9smm7w83zj29";
           name = "dirtree";
         };
@@ -11182,7 +11380,7 @@
           sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dirtree-prosjekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dirtree-prosjekt";
           sha256 = "0pyb6c0gvc16z5rc5h0kpl8021hz2hzv86cmjsd20gbhz7imrqwk";
           name = "dirtree-prosjekt";
         };
@@ -11203,7 +11401,7 @@
           sha256 = "1srlz63pncxndh1kmb6dl5sxaanspxa444wg998dld3dkdflwavq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/disaster";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/disaster";
           sha256 = "1ad8q81n0s13cwmm216wqx3s92195pda1amc4wxvpb3lq7dbd3yn";
           name = "disaster";
         };
@@ -11224,7 +11422,7 @@
           sha256 = "0f7h2rhh37lrs6xclj182li6s1fawv5m8w3hgy6qgm06dam45lka";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/discover";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/discover";
           sha256 = "1hf57p90jn1zzhjl63zv9ascbgkcbr0p0zmd3fvzpjsw84235dga";
           name = "discover";
         };
@@ -11245,7 +11443,7 @@
           sha256 = "0l2g58f55p8zmzv2q2hf163ggm9p0wk8hg93wlkyldrgyb94dgf4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/discover-clj-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/discover-clj-refactor";
           sha256 = "08bz60fxcgzab77690mmv0f7wdxcpygmasazcss427k37z9ysm7r";
           name = "discover-clj-refactor";
         };
@@ -11266,7 +11464,7 @@
           sha256 = "1vnbn4asz3lifscvy4shzisl6r0gkgq0qsa3kpgif3853wcd2rvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/discover-js2-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/discover-js2-refactor";
           sha256 = "139zq66cpcn4dnidf22h7x88p812ywrrz4c3c62w3915b75f71ki";
           name = "discover-js2-refactor";
         };
@@ -11287,7 +11485,7 @@
           sha256 = "0b73nc4jkf9bggnlp0l34jfcgx91vxbpavz6bpnf5rjvm0v1bil9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/discover-my-major";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/discover-my-major";
           sha256 = "0ch2y4grdjp7pvw2kxqnqdl7jd3q609n3pm3r0gn6k0xmcw85fgg";
           name = "discover-my-major";
         };
@@ -11305,7 +11503,7 @@
           sha256 = "1c0pgqvl1z2f5hprszln53pn2v2pqy110r3wx3g84v71w6378bbv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/disk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/disk";
           sha256 = "0bij9gr4zv6jmc6dwsy3lb06vsxvmyzl8xrm8wzasxisk1qd2l6n";
           name = "disk";
         };
@@ -11326,7 +11524,7 @@
           sha256 = "075gj81rnhrvv061wnldixpfmlsyfbnvacnk107z6f9v3m2m3vl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dispass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dispass";
           sha256 = "08c1s4zgl4rha10mva48cfkxzrqnpdhy03pxq51ihw94v6vxzg3z";
           name = "dispass";
         };
@@ -11347,7 +11545,7 @@
           sha256 = "0r560bpgw5p2pfcgkgcrlpp1bprv1f23dl4y5fjk06dg93fgaysa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/display-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/display-theme";
           sha256 = "07nqscmfa6iykll1m6gyiqca1g5ncx3rx468iyf2ahygpvqvnbxa";
           name = "display-theme";
         };
@@ -11368,7 +11566,7 @@
           sha256 = "03d8zb2is7n2y2z0k6j37cijjc3ndgasxsm9gqyq7drlq9bqwzsm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/distinguished-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/distinguished-theme";
           sha256 = "0h03aqgijrmisbgqga42zlb5yz4x3jn9jgr29rq8canyhayr3rk4";
           name = "distinguished-theme";
         };
@@ -11389,7 +11587,7 @@
           sha256 = "120zgp38nz4ssid6bv0zy5rnf2claa5s880incgljqyl0vmj9nq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dizzee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dizzee";
           sha256 = "1axydags80jkyhpzp3m4gyplwr9k3a13w6vmrrzcv161nln7jhhs";
           name = "dizzee";
         };
@@ -11410,7 +11608,7 @@
           sha256 = "15i25zh54b2fqji0qmkg502051ymccih6pgqnzq02c43dpnsqhqv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/django-manage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/django-manage";
           sha256 = "0j95g7fps28xhlrikkg61xgpbpf52xb56swmns2qdib6x1xzd6rh";
           name = "django-manage";
         };
@@ -11431,7 +11629,7 @@
           sha256 = "0dw0m77w7kdwxxh53b4k15jjkpfl5vha17hw9dn29ap77pf820va";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/django-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/django-mode";
           sha256 = "1rdkzqvicjpfh9k66m31ky6jshx9fqw7pza7add36bk6xg8lbara";
           name = "django-mode";
         };
@@ -11452,7 +11650,7 @@
           sha256 = "0dw0m77w7kdwxxh53b4k15jjkpfl5vha17hw9dn29ap77pf820va";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/django-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/django-snippets";
           sha256 = "1qs9fw104kidbr5zbxc1q71yy033nq3wxh98vvzk4z4fppnd29sw";
           name = "django-snippets";
         };
@@ -11473,7 +11671,7 @@
           sha256 = "1azf4p6salga7269l0kf13bqlxf9idp0ys8mm20qpyjpj79p5g9w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/django-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/django-theme";
           sha256 = "1rydl857zfpbvd7aziz6h7n3rrh584z2cbfxlss3wgfclzmbyhgf";
           name = "django-theme";
         };
@@ -11494,7 +11692,7 @@
           sha256 = "1nbvdnw9g3zbbb0n2sn2kxfzs5wichhl9qid3qjp8dsiq1wpv459";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dkdo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dkdo";
           sha256 = "0p7ybgldjs046jrkkbpli1iicfmblpxfz9lql8m8sz7lpjn7h300";
           name = "dkdo";
         };
@@ -11515,7 +11713,7 @@
           sha256 = "063nnln5m42qf190vr2z0ibacyn7n0xkxm3v5vaa4gxdvdwzhshs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dklrt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dklrt";
           sha256 = "11ss5x9sxgxp1wx2r1m0vsp5z5qm8m4ww20ybr6bqjw0a1gax561";
           name = "dklrt";
         };
@@ -11536,7 +11734,7 @@
           sha256 = "1nz71g8pb19aqjcb4s94hhn6j30cc04q05kmwvcbxpjb11qqrv49";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dkmisc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dkmisc";
           sha256 = "0nnbl272hldcmhyj47r463yvj7b06rjdkpkl5xk0gw9ikyja7w0z";
           name = "dkmisc";
         };
@@ -11557,7 +11755,7 @@
           sha256 = "0spj80vq6m2kqbdy6y1vh9fzwqyqkij30457d2n39kjn2gzbyar8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dmenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dmenu";
           sha256 = "1w1pgaj2yasfhsd1ibvrwy11ykq8v17h913g298h3ycsvqv8gic0";
           name = "dmenu";
         };
@@ -11578,7 +11776,7 @@
           sha256 = "0z28j7x7wgkc1cg1q1kz1lhdx1v1n6s88ixgkm8hn458h9bfnr3n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dna-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dna-mode";
           sha256 = "0ak3g152q3xxkiz1a4pl5y2vgbigbbmbc95fggirbcrh52zkzgk9";
           name = "dna-mode";
         };
@@ -11599,7 +11797,7 @@
           sha256 = "1nbm3wzd12rsrhnwlcc6b72b1ala328mfpcp5bwlfcdshw6mfcrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/docbook-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/docbook-snippets";
           sha256 = "1ipqfylgiw9iyjc1nckbay890clfkhda81nr00cq06sjmm71iniq";
           name = "docbook-snippets";
         };
@@ -11620,7 +11818,7 @@
           sha256 = "055kr0qknjgnjs7dn6gdmahrdbs8piwldbz7vg1hgq3b046x8lky";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/docean";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/docean";
           sha256 = "1mqmn2i9axnv5vnkg9gwfdjpzr6gxx4ia9mcdpm200ix297dg7x9";
           name = "docean";
         };
@@ -11641,7 +11839,7 @@
           sha256 = "12n63z4kkgfzkc2xji1z0k924af0v633qhvrr0rm83db9hz9j318";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/docker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/docker";
           sha256 = "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk";
           name = "docker";
         };
@@ -11662,7 +11860,7 @@
           sha256 = "0bvnvs17cbisymiqp96q4y2w2jqy5hd0zyk6rv7mihr9p97ak9kv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/docker-tramp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/docker-tramp";
           sha256 = "19kky80qm68n2izpjfyiy4gjywav7ljcmp101kmziklpqdldgh1w";
           name = "docker-tramp";
         };
@@ -11683,7 +11881,7 @@
           sha256 = "0vx7lv54v4bznn4mik4i6idb9dl7fpp3gw7nyhymbkr6hx884haw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dockerfile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dockerfile-mode";
           sha256 = "1dxvzn35a9qd3x8pjvrvb2g71yf84404g6vz81y0p353rf2zknpa";
           name = "dockerfile-mode";
         };
@@ -11704,7 +11902,7 @@
           sha256 = "1qfmq8l4jqyrhfplsr1zd8bg9qqqwbh3mhipqzja0px0knjpqj85";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dokuwiki-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dokuwiki-mode";
           sha256 = "0q5ybyj35dyh8k0nfvbglsq3ad2apc8cdijw4wqczc5180fckgy9";
           name = "dokuwiki-mode";
         };
@@ -11725,7 +11923,7 @@
           sha256 = "1xyqsnymgdd8ic3az2lgwv7s7vld6d4pcycb234bxm4in9fixgdj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dollaro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dollaro";
           sha256 = "06kaqzb0nh8sndhk7p5n4acn5nc27dyxw3ldgcbp81wj6ipii26h";
           name = "dollaro";
         };
@@ -11735,27 +11933,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    dom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "dom";
-        version = "20150414.1810";
-        src = fetchFromGitHub {
-          owner = "toroidal-code";
-          repo = "dom.el";
-          rev = "19a3cadd02ef2cafc258b7ddb1f1609eec894ed6";
-          sha256 = "165d22qkkdxd8zsbln0991r5n7aklz92f2snf6d8578flkqvdmm2";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/dom";
-          sha256 = "0cpd12vhshlk2v3w42n769gc0b3rsqc8wb7g84846v9r05ypinj2";
-          name = "dom";
-        };
-        packageRequires = [ cl-lib ];
-        meta = {
-          homepage = "http://melpa.org/#/dom";
-          license = lib.licenses.free;
-        };
-      }) {};
     doom = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "doom";
@@ -11767,7 +11944,7 @@
           sha256 = "04h1hlsc83w4dppw9m44jq7mkcpy0bblvnzrhvsh06pibjywdd73";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/doom";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/doom";
           sha256 = "098q77lix7kwpmarv26yndyk1yy1h4k3l9kaf3g7sg6ji6k7d3wl";
           name = "doom";
         };
@@ -11785,7 +11962,7 @@
           sha256 = "0201clwq9nbl8336lddcbwah8d6xipr7q8135yq79szfxq2bdg6v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/doremi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/doremi";
           sha256 = "11i4cdxgrspx44p44zz5py89ypji5li6p5w77wy0b07i8a5gq2gb";
           name = "doremi";
         };
@@ -11804,7 +11981,7 @@
           sha256 = "1m7jn80apya6s9d8phd859rq1m13xf2wz9664pqpr1p65yz2pyvl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/doremi-cmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/doremi-cmd";
           sha256 = "1qzspirn1abqps0dn5z8w6ymffc6b02dyki5hr8v74wfs8fhzx05";
           name = "doremi-cmd";
         };
@@ -11823,7 +12000,7 @@
           sha256 = "0v7ycmddh1ds64m1y5yai5nh34bd32q3wcm5y2pdzhj6jk7nj5wz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/doremi-frm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/doremi-frm";
           sha256 = "1rj3p665q32acsxxwygv1j5nbmjqrhi0b4glzrk88xki4lyz0ihz";
           name = "doremi-frm";
         };
@@ -11841,7 +12018,7 @@
           sha256 = "157kvlb4dqiyk1h7b4p0dhrr6crdakwnrxydyl6yh51w2hdnnigw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/doremi-mac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/doremi-mac";
           sha256 = "0n9fffgxnpqc7cch7aci5kxbwzk36iljdz2r8gcp5y5n1p7aamls";
           name = "doremi-mac";
         };
@@ -11859,7 +12036,7 @@
           sha256 = "0sfmcd1rq6wih9q7d9vkcfrw6gf7309mm7491jx091ij8m4p8ypp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dos";
           sha256 = "0cpijbqpci96s0d6rwqz5bbi9b0zkan1bg8vdgib1f87r7g980nc";
           name = "dos";
         };
@@ -11877,7 +12054,7 @@
           sha256 = "0xhbzq3yvfvvvl6mfihrzkd3pn5p5yxvbcyf2jhsppk7lscifsgk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dot-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dot-mode";
           sha256 = "1fik32635caq3r5f9k62qbj2dkwczz2z1v28mc7bcj7jv2p93nvh";
           name = "dot-mode";
         };
@@ -11898,7 +12075,7 @@
           sha256 = "0gc7z5ribp5yvadclq07l731m65pja00wgch4bgxsihiy7wvwknr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/download-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/download-region";
           sha256 = "1mrl2x6j708nchyh9y5avbf2cq10kpnhfj553l6akarvl5n5pvkl";
           name = "download-region";
         };
@@ -11919,7 +12096,7 @@
           sha256 = "0s7swvfd7h8r0n3cjmkps6ary9vwg61jylfm4qrkp3idsz6is548";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/downplay-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/downplay-mode";
           sha256 = "1v6nga101ljzza8qj3lkmkzzl0vvzj4lsh1m69698s8prnczxr9b";
           name = "downplay-mode";
         };
@@ -11940,7 +12117,7 @@
           sha256 = "11s4vxr6waswyx4lz3q70s8xdz0v7354sn0pfwj42mmww4pzkizs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dpaste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dpaste";
           sha256 = "17mrdkldv4gfwm6ggc047l4a69xg2fy9f9mjbphkjl0p5nr6b4kz";
           name = "dpaste";
         };
@@ -11961,7 +12138,7 @@
           sha256 = "1avpg0cgzk8d6g1q0ryx41lkcdgkm0mkzr5xr32xm28dzrfmgd4z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dpaste_de";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dpaste_de";
           sha256 = "0dql9qsl5gj51i3l2grl7nhw0ign8h4xa4jnhwn196j71c0rdwwp";
           name = "dpaste_de";
         };
@@ -11978,11 +12155,11 @@
         src = fetchFromGitHub {
           owner = "zenorocha";
           repo = "dracula-theme";
-          rev = "c158eb289d48a1b4eef3be62157df798675b172c";
-          sha256 = "1gxamb8hdrpm52541z37r6yr36n3sbj35mcasfipnwa5qryc3gxa";
+          rev = "a97d71234a9cb07b03caab684601b7b40d67c063";
+          sha256 = "1ly5d5dbhbmgflcl3gvwkd1i4bikffmdc4c42rmxxf1xw6gp7s2c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dracula-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dracula-theme";
           sha256 = "0ayv00wvajia8kbfrqkrkpb3qp3k70qcnqkav7am16p5kbvzp10r";
           name = "dracula-theme";
         };
@@ -12003,7 +12180,7 @@
           sha256 = "0z3w58zplm5ks195zfsaq8kwbc944p3kbzs702jgz02wcrm4c28y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/draft-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/draft-mode";
           sha256 = "1wg9cx39f4dhrykb4zx4fh0x5cfrh5aicwwfh1h3yzpc4zlr7xfh";
           name = "draft-mode";
         };
@@ -12024,7 +12201,7 @@
           sha256 = "08kkiqhfy1i6j9156gbl85jvyj592vd08qy24ng2dj0prjvap8w1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/drag-stuff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/drag-stuff";
           sha256 = "0hzbh58ijv1akamav8r0zs76pwda2zd9mjaj31ffalzhhsm5jnyc";
           name = "drag-stuff";
         };
@@ -12045,7 +12222,7 @@
           sha256 = "1yvg3w9gm5vs26qhw3xb72v9fgdhqq9w5pksiz2gj5m19l81irar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/drawille";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/drawille";
           sha256 = "01rl21hbj3hwy072yr27jl6iql331v131d3mr9zifg9v6f3jqbil";
           name = "drawille";
         };
@@ -12066,7 +12243,7 @@
           sha256 = "0lzq0mkhhj3s5yrcbs576qxkd8h0m2ikc4iplk97ddpzh4nz4127";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/drill-instructor-AZIK-force";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/drill-instructor-AZIK-force";
           sha256 = "1bb698r11m58csd2rm17fmiw691p25npphzqgjiiqbn4vx35ja7f";
           name = "drill-instructor-AZIK-force";
         };
@@ -12087,7 +12264,7 @@
           sha256 = "1s4cz5s0mw733ak9ps62fs150y3psqmb6v5s6s88jjfsi0r03c0s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dropbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dropbox";
           sha256 = "0ak6g2d2sq026ml6cmn6v1qz7sczkplgv2j9zq9zgzafihyyzs5f";
           name = "dropbox";
         };
@@ -12105,7 +12282,7 @@
           sha256 = "1szy46sk3nvlbb3yzk1s983281kkf507xr3fkclkki3d3x31n08a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dropdown-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dropdown-list";
           sha256 = "14i9w897gnb3mvnkbzhzij04bgr551r8km310mbrmzzag54w077z";
           name = "dropdown-list";
         };
@@ -12126,7 +12303,7 @@
           sha256 = "0am3n25qcfjkqfp4wjj1d2zigrmi8hg7p5sy2h91zg3blypqmpsr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/drupal-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/drupal-mode";
           sha256 = "14jvk4phq3wcff3yvhygix0c9cpbphh0dvm961i93jpsx7g9awgn";
           name = "drupal-mode";
         };
@@ -12147,7 +12324,7 @@
           sha256 = "156cscpavrp695lp8pgjg5jnq3b8n9c2h8qg8w89dd4vfkc3iikd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/drupal-spell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/drupal-spell";
           sha256 = "117rr2bfnc99g3qsr127grxwaqp54cxjaj3nl2nr6z78nja0fij3";
           name = "drupal-spell";
         };
@@ -12162,11 +12339,11 @@
         version = "20130120.1457";
         src = fetchsvn {
           url = "http://svn.apache.org/repos/asf/subversion/trunk/contrib/client-side/emacs/";
-          rev = "1728559";
+          rev = "1731575";
           sha256 = "016dxpzm1zba8rag7czynlk58hys4xab4mz1nkry5bfihknpzcrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dsvn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dsvn";
           sha256 = "12cviq6v08anif762a5qav3l8ircp81kmnl9q4yl6bkh9zxv7vy6";
           name = "dsvn";
         };
@@ -12187,7 +12364,7 @@
           sha256 = "1blfx3r2xd3idbfjrx44ma3x1d83xp67il2s2bmdwa8qz92z99lf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dtrace-script-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dtrace-script-mode";
           sha256 = "0v29rzlyccrc37052w2qmvjaii84jihhp736l807b0hjjfryras4";
           name = "dtrace-script-mode";
         };
@@ -12208,7 +12385,7 @@
           sha256 = "0x8c3h3jvyn2462r0sagz63vv9pr5ivfzkshr69603ibyfgqxxkp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dtrt-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dtrt-indent";
           sha256 = "1npn2jngy1wq0jpwmg1hkn8lx6ncbqsi587jl38lyp2xwchshfk5";
           name = "dtrt-indent";
         };
@@ -12229,7 +12406,7 @@
           sha256 = "0cafvhbpfqd8ajqg2757fs64kryrl2ckvbp5abldb4y8fa14pb9l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dts-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dts-mode";
           sha256 = "1k8cbiayajbzwkm0s0kyin0qpq9yhymidz0srs4hbvsnb6hvp234";
           name = "dts-mode";
         };
@@ -12250,7 +12427,7 @@
           sha256 = "1ixb78dv66lmqlbv4zl5ysvv1xqafvqh1h5cfdv03jdkqlfk34jz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ducpel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ducpel";
           sha256 = "1cqrkgg7n9bhjswnpl7yc6w6yjs4gfbliaqsimmf9z43wk2ml4pc";
           name = "ducpel";
         };
@@ -12260,6 +12437,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    dumb-jump = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "dumb-jump";
+        version = "20160220.2341";
+        src = fetchFromGitHub {
+          owner = "jacktasia";
+          repo = "dumb-jump";
+          rev = "27c0826a6b078e7483e002aa8b3a9f03d2ec6da1";
+          sha256 = "1saz5ysy99i2l97kzy5acxxzy7iy3v4zxszmpw2b9ppbbxrwanfk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dumb-jump";
+          sha256 = "1pgbs2k1g8w7gr65w50fazrmcky6w37c9rvyxqfmh06yx90nj4kc";
+          name = "dumb-jump";
+        };
+        packageRequires = [ dash f s ];
+        meta = {
+          homepage = "http://melpa.org/#/dumb-jump";
+          license = lib.licenses.free;
+        };
+      }) {};
     dummy-h-mode = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "dummy-h-mode";
         version = "20140816.733";
@@ -12268,7 +12466,7 @@
           sha256 = "0zq94x4br3sk6n4chrfnw7hpnsicxa02fcpk8hw1hfsaq3327n6v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dummy-h-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dummy-h-mode";
           sha256 = "1h2pm37y9kz62id0rm0zzgh1hpkhd9gvq95kjd29w0awsp9b6ca4";
           name = "dummy-h-mode";
         };
@@ -12289,7 +12487,7 @@
           sha256 = "0g72nnz0j6dvllyxyrw20z1vg6p7sy46yy0fq017pa77sgqm0xzh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dummyparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dummyparens";
           sha256 = "1yah8kpqkk9ygm73iy51fzwc8q5nw0xlwqir2qld1fc5y1lkb7dk";
           name = "dummyparens";
         };
@@ -12310,7 +12508,7 @@
           sha256 = "1qaiwm8mf4656gc1pdj8ivgy4abkjsypr52pvf4nrdkkln9qzfli";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/duplicate-thing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/duplicate-thing";
           sha256 = "1jx2b6h23dj561xhizzbpxp3av69ic8zdw4kkf0py1jm3gnrmlm4";
           name = "duplicate-thing";
         };
@@ -12330,7 +12528,7 @@
           sha256 = "0ghxnzi2iy1g633fshl9wdpg2asrcl0v5rkk61gqd6axm7fjaxcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dyalog-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dyalog-mode";
           sha256 = "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq";
           name = "dyalog-mode";
         };
@@ -12351,7 +12549,7 @@
           sha256 = "011423kvbfcd7jifg9425j89hlzmnw4j751s4mdz9wyr979k19ny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dylan-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dylan-mode";
           sha256 = "0kimvz8vmcvgxi0wvf7dqv6plj31xlksmvgip8h3bhyy7slxj3yy";
           name = "dylan-mode";
         };
@@ -12372,7 +12570,7 @@
           sha256 = "150dj1g49q9x9zx9wkymq30l5gc8c4mhsq91fm6q0yj6ip7hlfxh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dynamic-fonts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dynamic-fonts";
           sha256 = "0a210ca41maa755lv1n7hhpxp0f7lfxrxbi0x34icbkfkmijhl6q";
           name = "dynamic-fonts";
         };
@@ -12393,7 +12591,7 @@
           sha256 = "1jsjk4fkisgprn2w1d1385kbc9w1bd707biapd1y453k20q5c4h5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dynamic-ruler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dynamic-ruler";
           sha256 = "13jc3xbsyc3apkdfy0iafmsfvgqs0zfa5w8jxp7zj4dhb7pxpnmc";
           name = "dynamic-ruler";
         };
@@ -12414,7 +12612,7 @@
           sha256 = "0d18kdpw4zfbq4bkqh19cf42xlinxqa71lr2d994phaxqxqq195w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2ansi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2ansi";
           sha256 = "0ns1sldipx5kyqpi0bw79kdmhi1ry5glwxfzfx8r01hbbkf0cc94";
           name = "e2ansi";
         };
@@ -12435,7 +12633,7 @@
           sha256 = "1lx0c7s810x6prf7x1lnx412gll8nn8gqpmi56n319n406cxhnhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm";
           sha256 = "0dp360jr3fgxqywkp7g88cp02g37kw2hdsc0f70hjak9n3sy03la";
           name = "e2wm";
         };
@@ -12456,7 +12654,7 @@
           sha256 = "1g77gf24abwcvf7z52vs762s6jp978pnvza8zmzwkwfvp1mkx233";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-R";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm-R";
           sha256 = "09v4fz178lch4d6m801ipclfxm2qrap5601aysnzyvc2apvyr3sh";
           name = "e2wm-R";
         };
@@ -12477,7 +12675,7 @@
           sha256 = "121vd44f42bxqvdjswmjlghf1jalbs974b6cip2i049k1n08xgh0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-bookmark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm-bookmark";
           sha256 = "1myaqxzrgff5gxcn3zn1bsmyf5122ql1mwr05wamd450lq8nmbw5";
           name = "e2wm-bookmark";
         };
@@ -12498,7 +12696,7 @@
           sha256 = "09i7d2rc9zd4s3nqrhd3ggs1ykdpxf0pyhxixxw2xy0q6nbswjia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm-direx";
           sha256 = "0nv8aciq0swxi9ahwc2pvk9c7i3rmlp7vrzqcan58ml0i3nm17wg";
           name = "e2wm-direx";
         };
@@ -12519,7 +12717,7 @@
           sha256 = "1vrlfzy1wynm7x4m7pl8vim7ykqd6qkcilwz7sjc1lbckz11ig0d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-pkgex4pl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm-pkgex4pl";
           sha256 = "0hgdbqfw3015fr929m36kfiqqzsid6afs3222iqq0apg7gfj7jil";
           name = "e2wm-pkgex4pl";
         };
@@ -12540,7 +12738,7 @@
           sha256 = "0h1fnlpvy2mqfxjv64znghmiadh9qimj9q9a60cxhyc0bq0prz6f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-svg-clock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm-svg-clock";
           sha256 = "0q02lksrbn43s8d9rzpglqybalglpi6qi9lix0cllag6i7fzcbms";
           name = "e2wm-svg-clock";
         };
@@ -12561,7 +12759,7 @@
           sha256 = "0mz43mwcgyc1c9p9b7nflnjxdxjm2nxbhl0scj6llzphikicr35g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-sww";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm-sww";
           sha256 = "0x45j62cjivf9v7jp1b41yya3f9akp92md6cbv0v7bwz98g2vsk8";
           name = "e2wm-sww";
         };
@@ -12582,7 +12780,7 @@
           sha256 = "0qv3kh6q3q7vgfsd8x25x8agi3fp96dkpjnxdidkwk6k8h9n0jzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm-term";
           sha256 = "0wrq06yap80a96l9l0hs7x7rng7sx6vi1hz778kknb6il4f2f45g";
           name = "e2wm-term";
         };
@@ -12603,7 +12801,7 @@
           sha256 = "09ikwg5s42b50lfj0796pa2h32larkf5j6cy042dzh8c441vgih4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-after-load";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/easy-after-load";
           sha256 = "1mn4hpx82nifphzx71yw3rbixbgis8bhvl3iyxcgcd88n5hqwvys";
           name = "easy-after-load";
         };
@@ -12624,7 +12822,7 @@
           sha256 = "1qn0givyh07w41sv5xayfzlwbpbq7p39wbhmwsgffgfqzzz5r2ys";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-escape";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/easy-escape";
           sha256 = "1zspb79x6s151wwiian45j1nh0xps8y8yd98byyn5lbwbj2pp2gk";
           name = "easy-escape";
         };
@@ -12645,7 +12843,7 @@
           sha256 = "0i2plbvaalapx3svryn5lrc68m0qj1xm0z577xxzq7i9z91nanq7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/easy-kill";
           sha256 = "10jcv7a4vcnaj3wkabip2xwzcwlmvdlqkl409a9lnzfasxcpf32i";
           name = "easy-kill";
         };
@@ -12666,7 +12864,7 @@
           sha256 = "18fn9qnm0cwdy47nv6wafiy6cf7rnv4av4w8zmjwjj0n8ql4jl08";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-kill-extras";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/easy-kill-extras";
           sha256 = "0xzlzv57nvrc142saydwfib51fyqcdzjccc1hj6xvgcdbwadlnjy";
           name = "easy-kill-extras";
         };
@@ -12687,7 +12885,7 @@
           sha256 = "0qpabig0qrkyhhiifjpq9a7qv7h3nlqmpz79xy8lk58xy6rj0zk0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-lentic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/easy-lentic";
           sha256 = "1j141lncgcgfpa42m505xndiy6lh848xymfvb3cz4d6h73421khg";
           name = "easy-lentic";
         };
@@ -12708,7 +12906,7 @@
           sha256 = "18bm5ns1qrxq0rrz9sylshr62wkymh1m6b7ch2y74f8rcwdwjgnq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-repeat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/easy-repeat";
           sha256 = "1vx57gpw0nbxh976s18va4ali1nqxqffhaxv1c5rhf4pwlk2fa06";
           name = "easy-repeat";
         };
@@ -12729,7 +12927,7 @@
           sha256 = "0ysym38xaqyx1wc7xd3fvjm62dmiq4727dnjvyxv7hs4czff1gcb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ebal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ebal";
           sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg";
           name = "ebal";
         };
@@ -12739,18 +12937,39 @@
           license = lib.licenses.free;
         };
       }) {};
+    ebf = callPackage ({ cl-lib ? null, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ebf";
+        version = "20160211.1158";
+        src = fetchFromGitHub {
+          owner = "rexim";
+          repo = "ebf";
+          rev = "b52dd2fa8c6a4a7acf4d93c16f54fbd9fbe087df";
+          sha256 = "1yyx6z251bgvcfi3jzdq4cnmyd8vmz3gffbzii5bdga4ms288j5d";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ebf";
+          sha256 = "072w1hczzb4z0dadvqy8px9zfnfd2z0w8nwa7q2qm5njg30rrqpb";
+          name = "ebf";
+        };
+        packageRequires = [ cl-lib dash dash-functional ];
+        meta = {
+          homepage = "http://melpa.org/#/ebf";
+          license = lib.licenses.free;
+        };
+      }) {};
     ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }:
     melpaBuild {
         pname = "ebib";
-        version = "20160125.1621";
+        version = "20160219.408";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "ebib";
-          rev = "edb289c39e1ccc9f7277b852527bc665e4912cd5";
-          sha256 = "0grm2kskwms97w8jyp3ybfhrs2ynss0825knkw2x2wbdl8sg87lv";
+          rev = "09211cde0a56ac38781269fb1db24424c76d0ad9";
+          sha256 = "1pzx6izs9zg9fivplzagjf3a8477f4cka1py7mq8na6cv5wijyam";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ebib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ebib";
           sha256 = "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid";
           name = "ebib";
         };
@@ -12771,7 +12990,7 @@
           sha256 = "1hs069m4m6vhb37ac2x6hzbp9mfmpd3zhp4m631lx8dlmx11rydz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ecb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ecb";
           sha256 = "097hdskhfh255znrqamcssx4ns1sgkxchlbc7pjqwzpflsi0fx89";
           name = "ecb";
         };
@@ -12789,7 +13008,7 @@
           sha256 = "0jk7pb2sr4qbxwcn4ipcjc9phl9zjmgg8sf91qj113112xx7vvxa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/echo-bell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/echo-bell";
           sha256 = "0adhdfbcpmdhd9252rh0jik2z3v9bzf0brpzfvcjn5py2x6724ws";
           name = "echo-bell";
         };
@@ -12810,7 +13029,7 @@
           sha256 = "1vxa6d8kp4h1havr9cq7zqgqm1xsjxhbgbi4hvi842ma6xwh4m5w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eclipse-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eclipse-theme";
           sha256 = "0mww0jysxqky1zkkhvhj7fn20w970n2w6501rdm5jwqfb58ivxfx";
           name = "eclipse-theme";
         };
@@ -12831,7 +13050,7 @@
           sha256 = "0h6vh719ai0cxyja6wpfi6m76d42vskj56wg666j0h6j0qw6h3i2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ecukes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ecukes";
           sha256 = "0ava8hrc7r1mzv6xgbrb84qak5xrf6fj8g9qr4i4g0cr7843nrw0";
           name = "ecukes";
         };
@@ -12852,7 +13071,7 @@
           sha256 = "1x5y1d5crc48iddlsf6irkr017p32a9xjcmlm9wf3zggmr95fr3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edbi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edbi";
           sha256 = "0qq0j16n8lyvkqqlcsrq1m7r7f0in6b92d74mpx5c6siv6z2vxlr";
           name = "edbi";
         };
@@ -12865,15 +13084,15 @@
     edbi-database-url = callPackage ({ edbi, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "edbi-database-url";
-        version = "20150126.603";
+        version = "20160221.1323";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "edbi-database-url";
-          rev = "08b833584460ddfd4d0d76e5b159625dde684bcf";
-          sha256 = "1l5lkdgcy1z6fkjh3zrhf0f4f26bzhpqy33ak1xacvm9fyf54s2x";
+          rev = "a6e4be7547ee8e0bb43a11ff173d6271b21b5012";
+          sha256 = "0f59s0a7zpa3dny1k7x6zrymrnzba184smq8v1vvz8hkc0ym1j1v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edbi-database-url";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edbi-database-url";
           sha256 = "018rxijmy0lvisy281d501ra9lnh5xi0wmvz5avbjpb0fi4q1zdn";
           name = "edbi-database-url";
         };
@@ -12886,15 +13105,15 @@
     edbi-django = callPackage ({ edbi, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "edbi-django";
-        version = "20150115.1301";
+        version = "20160221.1323";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "edbi-django";
-          rev = "e6c786aac7b3db9552d9e0d8f46413ffae8c34af";
-          sha256 = "0m08ijhlmsvxcf21jb7qmqq0bsgzv2jkm6b0x8s2mzmrzavfmggj";
+          rev = "bdafb3f0a7b20aad4c1898d19d03f56e0554c850";
+          sha256 = "16qpficprg1xw1paz0m2988bw436ykx1lr6bwffp1d7hjvccp9d5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edbi-django";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edbi-django";
           sha256 = "1s59hab35hwnspyklxbhi0js0sgdn0rc7y33dqjk0psjcikqymg1";
           name = "edbi-django";
         };
@@ -12907,15 +13126,15 @@
     edbi-minor-mode = callPackage ({ edbi, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "edbi-minor-mode";
-        version = "20150421.703";
+        version = "20160221.1323";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "edbi-minor-mode";
-          rev = "afcbaf9e8264278e8526ca7509e6fc6bfd0d7937";
-          sha256 = "1lndz0qlmjvi9r2f1yzw217b971ym5jzfrddcd6rind1asrzl32a";
+          rev = "cce1cd0953866b2989ecbfd4321de71f308d6e9d";
+          sha256 = "176954d4agk4by5w8a5ky65iwjky1dqxxvz8vdf8fxj82r5k9fhh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edbi-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edbi-minor-mode";
           sha256 = "0p7vdf9cp6i7mhjxj82670pfflf1kacalmakb7ssgigs1nsf3spi";
           name = "edbi-minor-mode";
         };
@@ -12928,15 +13147,15 @@
     edbi-sqlite = callPackage ({ edbi, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "edbi-sqlite";
-        version = "20150115.1301";
+        version = "20160221.1323";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "edbi-sqlite";
-          rev = "929009365529b56daec172b87d7632240b15be1f";
-          sha256 = "0xnaj2f9zvnc6abjkaa23j6ga4anmq676aplws0n01y7qz6w0xk8";
+          rev = "52cb9ca1af7691b592f2cfd2f007847e7a4ccd5f";
+          sha256 = "1vll81386fx90lq5sy4rlxcik6mvw7zx5cc51f0yaca9bkcckp51";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edbi-sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edbi-sqlite";
           sha256 = "1w53ypz3pdqaml3vq9j3f1w443n8s9hb2ys090kxvjqnb8x8v44y";
           name = "edbi-sqlite";
         };
@@ -12957,7 +13176,7 @@
           sha256 = "1cfjw9b1lm29s5cbh0qqmkchbq2382s71w4rpb0gyf603s0yg13m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ede-compdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ede-compdb";
           sha256 = "1ypi7rxbgg2qck1b571hcw5m4ipllb48g6sindpdf180kbfbfpn7";
           name = "ede-compdb";
         };
@@ -12978,7 +13197,7 @@
           sha256 = "1zgiifi1k2d9g8sarfpjzamk8g1yx4ilgn60mqhy2pznp30b5qb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edebug-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edebug-x";
           sha256 = "0mzrip6y346mix4ny1xj8rkji1w531ix24k3cczmlmm4hm7l29ql";
           name = "edebug-x";
         };
@@ -12999,7 +13218,7 @@
           sha256 = "0crwdgng377sy1zbq7kqkz24v697mlzgdsvkdp1m8r7ympikkj6w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edit-at-point";
           sha256 = "0sn5a644zm165li44yffcpcai8bhl3yfvqcljghlwaa0w45sc9im";
           name = "edit-at-point";
         };
@@ -13020,7 +13239,7 @@
           sha256 = "0vk954f44m2bq7qb122pzlb8fibrisx47ihvn3h96m8nmx0fv32r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-color-stamp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edit-color-stamp";
           sha256 = "1f8v8w3w7vb8jv29w06mplah8yfcs5qfjz2w4irv0rg7dwzy3zk8";
           name = "edit-color-stamp";
         };
@@ -13041,7 +13260,7 @@
           sha256 = "10c84aad1lnr7z9f75k5ylgchykr3srcdmn88hlcx2n2c4jfbkds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-indirect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edit-indirect";
           sha256 = "0q5jjmrvx5kaajllmhaxihsab2kr1vmcsfqrhxdhw3x3nf41s439";
           name = "edit-indirect";
         };
@@ -13062,7 +13281,7 @@
           sha256 = "0981hy1n50yizc3k06vbxqrpfml817a67kab1hkgkw5v6ymm1hc9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edit-list";
           sha256 = "0mi12jfgx06i0yr8k5nk80xryqszjv0xykdnri505862rb90xakv";
           name = "edit-list";
         };
@@ -13083,7 +13302,7 @@
           sha256 = "0ssmhwg4wfh5cxgqv8bl55449204h4zi863m7jhvas4c9zq005kd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edit-server";
           sha256 = "0ffxcgmnz0f2c1i3vfwm8vlm6jyd7ibf4kq5z8c6n50zkwfdmns0";
           name = "edit-server";
         };
@@ -13104,7 +13323,7 @@
           sha256 = "174xq45xc632zrb916aw7q4bch96pbi6zgy3dk77qla3ky9cfpl3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-server-htmlize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edit-server-htmlize";
           sha256 = "007lv3698a88wxan7kplz2117azxxpzzgshin9c1aabg059hszlj";
           name = "edit-server-htmlize";
         };
@@ -13117,15 +13336,15 @@
     editorconfig = callPackage ({ editorconfig-core, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig";
-        version = "20160204.12";
+        version = "20160217.2152";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "6fcae90cbe88f98ccc6b152f04cc6d2ffaaab288";
-          sha256 = "17qvr9gqd4mkn0lzpxvijhwg1cbrqkqg4l9wnidbxa1wfzsr9mrd";
+          rev = "c8ab99b94929ab86a18128464b9c464f21e0d0b7";
+          sha256 = "1qsmx1wamjfdbhzj45kmkiprakfvfivm9fgy51byqk0sh84r2pkk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/editorconfig";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/editorconfig";
           sha256 = "0na5lfi9bs4k1q73pph3ff0v8k8vzrfpzh47chyzk8nxsmvklw35";
           name = "editorconfig";
         };
@@ -13138,15 +13357,15 @@
     editorconfig-core = callPackage ({ cl-lib ? null, editorconfig-fnmatch, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig-core";
-        version = "20160127.35";
+        version = "20160212.306";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "6fcae90cbe88f98ccc6b152f04cc6d2ffaaab288";
-          sha256 = "17qvr9gqd4mkn0lzpxvijhwg1cbrqkqg4l9wnidbxa1wfzsr9mrd";
+          rev = "c8ab99b94929ab86a18128464b9c464f21e0d0b7";
+          sha256 = "1qsmx1wamjfdbhzj45kmkiprakfvfivm9fgy51byqk0sh84r2pkk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/editorconfig-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/editorconfig-core";
           sha256 = "18d7byqkxn6lyw3nqsvqs5vyj9alh9wjd2mim44a3zcc9r2j061r";
           name = "editorconfig-core";
         };
@@ -13159,15 +13378,15 @@
     editorconfig-fnmatch = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig-fnmatch";
-        version = "20160127.35";
+        version = "20160212.306";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "6fcae90cbe88f98ccc6b152f04cc6d2ffaaab288";
-          sha256 = "17qvr9gqd4mkn0lzpxvijhwg1cbrqkqg4l9wnidbxa1wfzsr9mrd";
+          rev = "c8ab99b94929ab86a18128464b9c464f21e0d0b7";
+          sha256 = "1qsmx1wamjfdbhzj45kmkiprakfvfivm9fgy51byqk0sh84r2pkk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/editorconfig-fnmatch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/editorconfig-fnmatch";
           sha256 = "0ji243vrw527jc3alsgmqi9rdnslxyq48zzx33rbpkqcjssm11iv";
           name = "editorconfig-fnmatch";
         };
@@ -13177,22 +13396,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    edn = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, peg, s }:
+    edn = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, peg }:
     melpaBuild {
         pname = "edn";
-        version = "20150929.346";
+        version = "20160215.619";
         src = fetchFromGitHub {
           owner = "expez";
           repo = "edn.el";
-          rev = "501a69696bec2fc09bf5d61e38a3ea344ed77a47";
-          sha256 = "107ljwqibnd247h4iyav37y75zcgl0j2yav09s38kl3nbxmaad2y";
+          rev = "be9e32d1b49e35247b263b0243df7cfdc8d413ab";
+          sha256 = "1xp2hjhn52k6l1g6ypva6dsklpawni7gvjafbz6404f9dyxflh7l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edn";
           sha256 = "00cy8axhy2p3zalzl8k2083l5a7s3aswb9qfk9wsmf678m8pqwqg";
           name = "edn";
         };
-        packageRequires = [ cl-lib dash emacs peg s ];
+        packageRequires = [ cl-lib emacs peg ];
         meta = {
           homepage = "http://melpa.org/#/edn";
           license = lib.licenses.free;
@@ -13209,7 +13428,7 @@
           sha256 = "0vsrcvrd02nx647gxp65r548qlxg50w73dy0rs1lxwy6mdgp0npv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edts";
           sha256 = "0f0rbd0mqqwn743qmr1g5mmi1sbmlcglclww8jxvbvb61jq8vspr";
           name = "edts";
         };
@@ -13239,7 +13458,7 @@
           sha256 = "1c2iyv392ap35nss4j901h33d3lx9lmq5v43flf2rid1766pam6v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/efire";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/efire";
           sha256 = "1c8vdc58i0k7vvanwhckfc31226d3rb5xq77lh9ydgnd4i97gq2w";
           name = "efire";
         };
@@ -13260,7 +13479,7 @@
           sha256 = "1l9p8nairqr3ym5ydy0rwczcmkx2jq9b2g9r0r96n0vnjpybk6q2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/egg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/egg";
           sha256 = "144g1fvs2cmn3px0a98nvxl5cz70kx30v936k5ppyi8gvbj0md5i";
           name = "egg";
         };
@@ -13273,15 +13492,15 @@
     egison-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "egison-mode";
-        version = "20150827.2329";
+        version = "20160217.1805";
         src = fetchFromGitHub {
           owner = "egisatoshi";
           repo = "egison3";
-          rev = "bea1bf82ae9c3c22e1303a34496ce8132f722b3e";
-          sha256 = "1s9anqlby0ikaal0i9vg8dkn4n0fhnqy1war4lx35qkmg3dg1m33";
+          rev = "04b6a26e4e9abc9791bc5c4f230282628623d25a";
+          sha256 = "0ykjddp8jc2a2b2dkbnp96sda4qb9c70f8vqzndykzvccfhl7kan";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/egison-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/egison-mode";
           sha256 = "0x11fhv8kkx34h831k2q70y5qfz7wnfia4ka5mbmps7mpr68zcwi";
           name = "egison-mode";
         };
@@ -13293,14 +13512,14 @@
       }) {};
     eide = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "eide";
-        version = "20151212.1406";
+        version = "20160210.1438";
         src = fetchgit {
           url = "git://git.tuxfamily.org/gitroot/eide/emacs-ide.git";
-          rev = "524494fd2b23217c6807b30b43bb95b5724f809e";
-          sha256 = "3f41ade3332a3f1dc5cfb0b33077396feb7b683b2cf2c235b7a5f07f0b2e3271";
+          rev = "9d7fb8c50568ece04bb0382caca42d3ab68fbb01";
+          sha256 = "200307116b3617feeb5b52fb7234ad1a13a2afd89830afbdc291c265fa762ae2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eide";
           sha256 = "16cf32n2l4wy1px7fm6x4vxx7pbqdp7zh2jn3bymg0b40i2321sz";
           name = "eide";
         };
@@ -13318,7 +13537,7 @@
           sha256 = "024qyipwlj3g0fff06cgq357blkh3hyr14vpmkqsv15x6gb9snir";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eimp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eimp";
           sha256 = "11z23kx89yy03hzs1xlbcih70lsp2lplxs8nkc8jvfcpsjwypsl0";
           name = "eimp";
         };
@@ -13339,7 +13558,7 @@
           sha256 = "05nvfjslfwzr54m1h2xjq3icd29khxpy0mka5r05gmlj3xzhkldv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ein";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ein";
           sha256 = "1nksj1cpf4d9brr3rb80bgp2x05qdq9xmlp8mwbic1s27mw80bpp";
           name = "ein";
         };
@@ -13360,7 +13579,7 @@
           sha256 = "1w0b3giy9ca35pp2ni4afnqas64a2vriilab7jiw9anp3ryh6570";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ein-mumamo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ein-mumamo";
           sha256 = "029sk90xz9fhv2s56f5hp0aks1d6ybz517009vv4892bbzkpjv1w";
           name = "ein-mumamo";
         };
@@ -13370,6 +13589,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    eink-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "eink-theme";
+        version = "20160221.702";
+        src = fetchFromGitHub {
+          owner = "maio";
+          repo = "eink-emacs";
+          rev = "61f5ecbb165b2e18fc131c8056a2522e8bf8802a";
+          sha256 = "0bbaxg8g7gs75ih6shc3hxy9mwq7ci3q9iyly2snssaa613hijyv";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eink-theme";
+          sha256 = "0z437cpf1b8bqyi7bv0w0dnc52q4f5g17530lwdcxjkr38s9b1zn";
+          name = "eink-theme";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/eink-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     el-autoyas = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-autoyas";
@@ -13381,7 +13621,7 @@
           sha256 = "0dbp2zz993cm7mrd58c4iflbzqwg50wzgn2cpwfivk14w1mznh4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-autoyas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-autoyas";
           sha256 = "0hh5j79f3z82nmb3kqry8k8lgc1qswk6ni3g9jg60pasc3wkbh6c";
           name = "el-autoyas";
         };
@@ -13394,15 +13634,15 @@
     el-get = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "el-get";
-        version = "20151117.1015";
+        version = "20160206.140";
         src = fetchFromGitHub {
           owner = "dimitri";
           repo = "el-get";
-          rev = "415817cafc576c917b2459c2d29b6acf21d6ad53";
-          sha256 = "1fl3846f70v3niklz5qsi6w1fgp0ga9vq2b712k8gikdkk1rf1i9";
+          rev = "9126044d31ab5e266472d9921fcb61c62c47beb3";
+          sha256 = "1c64ln6b6ddhac5wq66y51h693iiwwawgxhsjkw5kmimv2rkygrs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-get";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-get";
           sha256 = "1438v2sw5n67q404c93y2py226v469nagqwp4w9l6yyy40h4myhz";
           name = "el-get";
         };
@@ -13419,11 +13659,11 @@
         src = fetchFromGitHub {
           owner = "HKey";
           repo = "el-init";
-          rev = "a23cc95dd67fe63e131da211caa48eae804b11c5";
-          sha256 = "140afbksvm1kvam7pyaibay8rqhfhmb22rrh39mvdnqskqfnlqgr";
+          rev = "6b45551b8ed473c8a0c897b743b0378a3501556c";
+          sha256 = "0qk5jk0n7ga2cxqnm69rsy5cjjn5b4l4yqgaafvmmrrp70p8drmi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-init";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-init";
           sha256 = "121n6z8p9kzi7axp4i2kyi621gw20635w4j81i1bryblaqrv5kl5";
           name = "el-init";
         };
@@ -13440,11 +13680,11 @@
         src = fetchFromGitHub {
           owner = "HKey";
           repo = "el-init-viewer";
-          rev = "6e1aaab3e49d87253763e5b437d4f43f445b7774";
-          sha256 = "13cc7nnslij28fa1469s9pfmnz8j0m6bayhrqxckd0xplvwwipnx";
+          rev = "dbcb4418fe342dfd7da805f2d7caf1def68db7f9";
+          sha256 = "0flf0pa3xwrdhfkshyr6nqrm957sgx9jkganbasqavbq1dvlw6lj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-init-viewer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-init-viewer";
           sha256 = "0kkmsml9xf2n8nlrcicfg2l78s3dlhd6ssx0s62v77v4wdpl297m";
           name = "el-init-viewer";
         };
@@ -13465,7 +13705,7 @@
           sha256 = "1jiq2hpym3wpk80zsl4lffpv4kgkykc2zp08sb01wa7pl8d1knmm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-mock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-mock";
           sha256 = "07m7w7n202nijnxidy0j0r4nbcvlnbkm9b0n8qb2bwi3d4cfp77l";
           name = "el-mock";
         };
@@ -13486,7 +13726,7 @@
           sha256 = "1iykhicc1ic1r6h4vj3701rm0vfy41b16w3d98amf8jjypv54wv7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-pocket";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-pocket";
           sha256 = "0fgylpfixsx5l1nrgz6n1c2ayf52p60f9q290hmkn36siyx5hixw";
           name = "el-pocket";
         };
@@ -13507,7 +13747,7 @@
           sha256 = "1lsq7980pwcwlg7z37hrig8ddm9nyvaqrlczv1w0vy631vc5z2az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-spec";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-spec";
           sha256 = "017syizs8qw5phwvpzzffzdnj6rh9q4n7s51qjvj8qfb3088igkh";
           name = "el-spec";
         };
@@ -13528,7 +13768,7 @@
           sha256 = "1sba405h1sy5vxg4ki631p4979gyaqv8wnwbgca5jp2pm8l3viri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-spice";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-spice";
           sha256 = "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg";
           name = "el-spice";
         };
@@ -13549,7 +13789,7 @@
           sha256 = "04k1fz0ypmfzgwamncp2vz0lq54bq6y7c8k9nm39csp2564vmbbc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-sprunge";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-sprunge";
           sha256 = "0rb1cr7zrfl1s5prxy3xwdqgnm8ddw33pcvk049km2qbccb08v6a";
           name = "el-sprunge";
         };
@@ -13570,7 +13810,7 @@
           sha256 = "016l3inzb7dby0w58najj2pvymwk6gllsxvqj2fkz3599i36p1pn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-spy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-spy";
           sha256 = "1bgv4mgsnkmjdyay7lhkqdszvnwpjy4dxxw11kq45w866ba8645n";
           name = "el-spy";
         };
@@ -13588,7 +13828,7 @@
           sha256 = "1g2jhm9m5qcj6a231n5ch6b8bqwzq3kj275nd4s89p89v1252qhn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-swank-fuzzy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-swank-fuzzy";
           sha256 = "1m7y4c0r1w8ndmr1wgc2llrbfawbbxnvcvgjpsckb3704s87yxr1";
           name = "el-swank-fuzzy";
         };
@@ -13609,7 +13849,7 @@
           sha256 = "1i6j44ssxm1xdg0mf91nh1lnprwsaxsx8vsrf720nan7mfr283h5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-x";
           sha256 = "1721d9mljlcbdwb5b9934q7a48y30x6706pp4bjvgys0r64dml5g";
           name = "el-x";
         };
@@ -13630,7 +13870,7 @@
           sha256 = "03xlxx57z1id9mr7afkvf77m2f9rrknrm1380p51vka84v2hl3mh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el2markdown";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el2markdown";
           sha256 = "1a52qm0jrcvvpb01blr5l7apaxqn4bvhkgha53cr48rdkmmq318g";
           name = "el2markdown";
         };
@@ -13651,7 +13891,7 @@
           sha256 = "1wikmzl9gi72h6fxawj0h20828n4vypw9rrv35kqnl4gfrdmxzkk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elang";
           sha256 = "0frhn3hm8351qzljicpzars28af1fghgv45717ml79rwb4vi6yiy";
           name = "elang";
         };
@@ -13672,7 +13912,7 @@
           sha256 = "0vppa9xihn8777rphiw1aqp96xn16vgjwff1dwvp8z861silp8ar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eldoc-eval";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eldoc-eval";
           sha256 = "0z4scgi2xgrgd47aqqmyv1ww8alh43s0qny5qmh3f1nnppz3nd7c";
           name = "eldoc-eval";
         };
@@ -13690,7 +13930,7 @@
           sha256 = "13ncpp3hrwk0h030c5nnm2zfiingilr5b876jsf2wxmylg57nbch";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eldoc-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eldoc-extension";
           sha256 = "0azkdx4ncjhb7qyhyg1a5pxgqqf2z1wq9iz802j0nxxnjzh9ny24";
           name = "eldoc-extension";
         };
@@ -13711,7 +13951,7 @@
           sha256 = "0s4y1319sr4xc0k6h2zhzzxsx2kc3pc2m6saah18y4kip0hjyhr8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/electric-case";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/electric-case";
           sha256 = "11mab7799kxs3w47srmds5prmwh6ldxzial9kqbqy33vybpkprmd";
           name = "electric-case";
         };
@@ -13724,15 +13964,15 @@
     electric-operator = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, names }:
     melpaBuild {
         pname = "electric-operator";
-        version = "20160122.213";
+        version = "20160207.643";
         src = fetchFromGitHub {
           owner = "davidshepherd7";
           repo = "electric-operator";
-          rev = "4c2f271f89e59a8cc28b447daaf80f1b73db5bb9";
-          sha256 = "0qbljvc1y39h6571xqjg4xyah0xwkv0qxx619x9frxlvlh83y4xc";
+          rev = "cc5da970863c0b8d241cc716cc5cfbcb34bf6c3d";
+          sha256 = "1ihy7cmflp8wghm0708y6fsw7cxrjkdimk6ixm2in7q56qijx4d4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/electric-operator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/electric-operator";
           sha256 = "043bkpvvk42lmkll5jnz4q8i0m44y4wdxvkz6hiqhqcp1rv03nw2";
           name = "electric-operator";
         };
@@ -13753,7 +13993,7 @@
           sha256 = "0q1pb01h48wdbjgi04a6ck2jn7yfh92wpq1vka5pg54wv2k9b5fn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/electric-spacing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/electric-spacing";
           sha256 = "0fcsz9wmibqp6ci0pa5r4gzlrsyj5klajxpgfksa0nfj3dc94cvg";
           name = "electric-spacing";
         };
@@ -13774,7 +14014,7 @@
           sha256 = "1ijrhm9vrzh5wl1rr9ayl11dwm05bh1i43fnbz3ga58l6whgkfpw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elein";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elein";
           sha256 = "0af263zq4xxaxhpypn769q8h1dla0ygpnd6l8xc13zlni6jjwdsg";
           name = "elein";
         };
@@ -13795,7 +14035,7 @@
           sha256 = "1c3xwjzln5grxp7cci2mmly73mzl02f8wjm4hbd9napx72wjcxiy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elfeed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elfeed";
           sha256 = "1psga7fcjk2b8xjg10fndp9l0ib72l5ggf43gxp62i4lxixzv8f9";
           name = "elfeed";
         };
@@ -13816,7 +14056,7 @@
           sha256 = "1r2liqjww0yscxjpg13dsfhhv3yjahlbas0dabqlh4f9q0jdrgj4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elfeed-goodies";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elfeed-goodies";
           sha256 = "0zpk6nx757hasgzcww90fzkcdn078my33p7yax7xslvi4msm37bi";
           name = "elfeed-goodies";
         };
@@ -13844,7 +14084,7 @@
           sha256 = "0cp8sbhym83db88ii7gyab6iqxppinjlrkzb9627gq7xgb5mqj5j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elfeed-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elfeed-org";
           sha256 = "0xf2r5ca3gnx2cv9f8rr4s1hds2ggqsbllvfr229gznkcqjnglik";
           name = "elfeed-org";
         };
@@ -13865,7 +14105,7 @@
           sha256 = "1c3xwjzln5grxp7cci2mmly73mzl02f8wjm4hbd9napx72wjcxiy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elfeed-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elfeed-web";
           sha256 = "14ydwvjjc6wbhkj4g4xdh0c3nh4asqsz8ln7my5vjib881vmaq1n";
           name = "elfeed-web";
         };
@@ -13886,7 +14126,7 @@
           sha256 = "0rdhnnyn0xsmnshnf289kxk974r57i6nx0vii1w36j6p6q0b7f9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elhome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elhome";
           sha256 = "1k7936wxgslr29511dz9az38i9vi35rcxk68gzv35v9lpj89lalh";
           name = "elhome";
         };
@@ -13904,7 +14144,7 @@
           sha256 = "0khc3gacw27aw9pkfrnla9844lqbspgm0hrz7q0h5nr73d9pnc02";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elisp-depend";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elisp-depend";
           sha256 = "08zxzvj60v23b7d5q0hvgffm1jxq7lc5y9w22m6nv2fp29yadyiy";
           name = "elisp-depend";
         };
@@ -13925,7 +14165,7 @@
           sha256 = "1ci6nyk1vvb3wgxzarbf6448i9rjb74zzrhcmls634gfxbryxdyy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elisp-lint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elisp-lint";
           sha256 = "102hrxdw72bm11a29i15g09lv7jlnd7vkv7292fm3mcxf5f4hkw9";
           name = "elisp-lint";
         };
@@ -13946,7 +14186,7 @@
           sha256 = "168ljhscqyvp24lw70ylv4a3c0y51sx4f66lfahbs7zpjvwf25x0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elisp-sandbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elisp-sandbox";
           sha256 = "1bazm1cf9ghh9b7jzqqgyfcalnrfg7vmxqbn4fiy2c76gbzlr2bp";
           name = "elisp-sandbox";
         };
@@ -13967,7 +14207,7 @@
           sha256 = "11vyy0bvzbs1h1kggikrvhd658j7c730w0pdp6qkm60rigvfi1ih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elisp-slime-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elisp-slime-nav";
           sha256 = "009zgp68i4naprpjr8lcp06lh3i5ickn0nh0lgvrqs0niprnzh8c";
           name = "elisp-slime-nav";
         };
@@ -13988,7 +14228,7 @@
           sha256 = "18dhijvgnx2hr9vnprcc1fl0k49bb3lpnghrqbkf7fj599kcjl7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elixir-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elixir-mode";
           sha256 = "1dba3jfg210i2rw8qy866396xn2xjgmbcyl006d6fibpr3j4lxaf";
           name = "elixir-mode";
         };
@@ -14009,7 +14249,7 @@
           sha256 = "1sdq4372i19wdxpdp3347a1rf5zf5w6sa0da6lr511m7ri0lj6hd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elixir-yasnippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elixir-yasnippets";
           sha256 = "0927znqd9j91wc51hdwcl2rxb66i1h549nyr1h39r13353gbwk3a";
           name = "elixir-yasnippets";
         };
@@ -14022,15 +14262,15 @@
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "20160204.128";
+        version = "20160211.226";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "61671af42d2162b06ee06b4857bc4a63bf82a57b";
-          sha256 = "0cjxvmsfjki8zal31zbf4ynf7i0gy5vykpq6858qpa68vkd1p0iz";
+          rev = "47ea2e8d06e9f39be4e1d5a79b6cc634f9d46e58";
+          sha256 = "0qiwzcpwiwlkjy89pxvss3gvjvbp4d6qpaxnbm50va1gbn21n72v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elm-mode";
           sha256 = "1gw9szkyr1spcx7qijddhxlm36h0hmfd53b4yzp1336yx44mlnd1";
           name = "elm-mode";
         };
@@ -14051,7 +14291,7 @@
           sha256 = "181hcyg5v62nxrgmb7pl9672rm9fy8crc4lqhdwvdvd7ngki1fiz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elmacro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elmacro";
           sha256 = "0644rgwawivrq1shsjx1x2p53z7jgr6bxqgn2smzql8pp6azy7xz";
           name = "elmacro";
         };
@@ -14072,7 +14312,7 @@
           sha256 = "1463y4zc6yabd30k6806yw0am18fjv0bkxm56p2siqrwn9pbsh8k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elmine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elmine";
           sha256 = "1gi94dyz9x50swkvryd4vj36rqgz4s58nrb4h4vwwviiiqmc8fvz";
           name = "elmine";
         };
@@ -14093,7 +14333,7 @@
           sha256 = "0p3cj5vgka388i4dk9r7bx8pv8mywnfij9ahgqak5jlsddflh8hw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elnode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elnode";
           sha256 = "0piy5gy9a7c8s10b99fmdyh6glhvjvdyrz0x2bv30h7wplx5szi6";
           name = "elnode";
         };
@@ -14114,7 +14354,7 @@
           sha256 = "19yvhyg34w1idsh712cahmcy1pzbxcipw9j6xk567lvkqkinqg7s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elog";
           sha256 = "0hixsi60nf0khm9xmya3saf95ahn1gydp0l5wxawsc491qwg4vqd";
           name = "elog";
         };
@@ -14135,7 +14375,7 @@
           sha256 = "1jcr8bxffvnfs0ym6zkgs79hd6a0m81r4x4jr3v5l9zwxw04sy15";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elogcat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elogcat";
           sha256 = "0sqdqlpg4firswr742nrb6b8sz3bpijf6pbxvandq3ddpm0rx9ia";
           name = "elogcat";
         };
@@ -14156,7 +14396,7 @@
           sha256 = "1dadf24x6v1vk57bp6w0g2dysigy5cqjzwldc8dn129f4pfrhipy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elpa-audit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elpa-audit";
           sha256 = "0l8har14zrlh9kdkh9vlmkmzg49vb0r8j1wnznryaidalvk84a52";
           name = "elpa-audit";
         };
@@ -14177,7 +14417,7 @@
           sha256 = "1hjmvn3kls63alh0ihb5c8gf90lrfvq1hxrlf4162qiaa0s15f8a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elpa-mirror";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elpa-mirror";
           sha256 = "1jnviav2ybr13cgllg26kfjrwrl25adggnqiiwyjwgbbzxfycah8";
           name = "elpa-mirror";
         };
@@ -14198,7 +14438,7 @@
           sha256 = "1xjm9b32a9nfzvphj6vm0dqcr4i072zcx29kcgiyyni8zbgbwmwv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elpy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elpy";
           sha256 = "051irp7k0cp1hqp3hzrmapllf2iim7cq0iz38489g4fkh2ybk709";
           name = "elpy";
         };
@@ -14225,7 +14465,7 @@
           sha256 = "055kam18k4ni1zw3310cpsvdnrp62d579r30lq67ig2lq3yxzc1m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elscreen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elscreen";
           sha256 = "1mlqbw14ilk6d3ba38kfw50pnlhb9f6sm5hy9dw58gp59siark5s";
           name = "elscreen";
         };
@@ -14246,7 +14486,7 @@
           sha256 = "0bbashrqpyhs282w5i15rzravvj0fjnydbh9vfnfnfnk8a9sssxz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elscreen-buffer-group";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elscreen-buffer-group";
           sha256 = "1clmhpk9zp6hsgz6a4jpmbrr9fr6k8b324s0x61n5yi4yzgdmc0v";
           name = "elscreen-buffer-group";
         };
@@ -14267,7 +14507,7 @@
           sha256 = "091dxsb73bhqmrddwnmvblmfpwa7v7fa0ha18daxc8j0lrhzdhlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elscreen-mew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elscreen-mew";
           sha256 = "06g4wcfjs036nn64ac0zsvr08cfmak2hyj83y7a0r35yxr1853w4";
           name = "elscreen-mew";
         };
@@ -14288,7 +14528,7 @@
           sha256 = "1cninrbgxzg0gykkpjx0i8pk2yc7sgr2kliqd35lgcxz2q4jlr51";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elscreen-multi-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elscreen-multi-term";
           sha256 = "1zwrzblkag1d18xz450b7khsdssvsxyl1x6a682vy0dkn1y5qh1n";
           name = "elscreen-multi-term";
         };
@@ -14309,7 +14549,7 @@
           sha256 = "06g7fl2c7cvwsrgi462wf6j13ny56y6zvgkizz9f256xjjq77ymf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elscreen-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elscreen-persist";
           sha256 = "1rjfvpsx0y5l9b76wa1ilj5lx39jd0m78nb1a4bqn81z0rkfpl4k";
           name = "elscreen-persist";
         };
@@ -14330,7 +14570,7 @@
           sha256 = "1w34nnl4zalxzmyfbc81qd82m7qp3zvz608dx6hfi44pjz0dp36f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elscreen-separate-buffer-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elscreen-separate-buffer-list";
           sha256 = "1d8kc137cd8i3wglir1rlvk7w8mrdhd3xvcihi2f2f2g5nh2n5jk";
           name = "elscreen-separate-buffer-list";
         };
@@ -14351,7 +14591,7 @@
           sha256 = "1k7npf93xbmrsq607x8zlgrpzqvplgia3ixz5w1lr1jlv1m2m8x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elwm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elwm";
           sha256 = "0rf663ih3lfg4n4pj4dpp133967zha5m1wr46riaxpha7xr59al9";
           name = "elwm";
         };
@@ -14364,15 +14604,15 @@
     elx = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "elx";
-        version = "20151215.639";
+        version = "20160220.1114";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "elx";
-          rev = "a8dff14f0626f729e745092dd88a1801c6239710";
-          sha256 = "1mchc4d61li5gfsf05dwhgb694fjj9hljnbvwvc12c1iik0zavq0";
+          rev = "24bb321b275d441ca532c4ca7417143a79a88dcf";
+          sha256 = "0n5y3xq5dmqpsd9hhg9ac1jkj5qi9y7lgvg5nir3ghd8ldmrg09s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elx";
           sha256 = "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x";
           name = "elx";
         };
@@ -14393,7 +14633,7 @@
           sha256 = "171xgznpgvwl03kzqa9nbpvj3mfznnf050pl2wih390nk5djpg12";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacs-eclim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacs-eclim";
           sha256 = "1l55jhz5mb3bqw90cbf4jhcqgwj962br706qhm2wn5i2a1mg8xlv";
           name = "emacs-eclim";
         };
@@ -14414,7 +14654,7 @@
           sha256 = "15l3ab11vcmzqibkd6h5zqw5a83k8dmgcp4n26px29c0gv6bkpy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacs-setup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacs-setup";
           sha256 = "1x4rh8vx6fsb2d6dz2g9j6jamin1vmpppwy3yzbl1dnf7w4hx4kh";
           name = "emacs-setup";
         };
@@ -14435,7 +14675,7 @@
           sha256 = "0ciqxyahlzaxq854jm25zbrbmrhcaj5csdhxa0az9crwha8wkmw2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsagist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsagist";
           sha256 = "1cyz7nf0zxa21979jf5kdmkgwiyd17vsmpcmrw1af37ly27l8l64";
           name = "emacsagist";
         };
@@ -14456,7 +14696,7 @@
           sha256 = "1rqr08gj07hw37mqd0flmq4a10wn16vy7wg0msqq0ab2smwjhns7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsc";
           sha256 = "1fbf9al3yds0il18jz6hbpj1fsjlpb1kgp450gb6r09lc46x77mk";
           name = "emacsc";
         };
@@ -14466,6 +14706,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    emacsist-view = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "emacsist-view";
+        version = "20160217.2240";
+        src = fetchFromGitHub {
+          owner = "lujun9972";
+          repo = "emacsist-view";
+          rev = "4bfda87db63825bd40a2a3aad5c5a7760e2d4f38";
+          sha256 = "0wrv2pkp8hf56lk5snxvypizydwyjpki7f4q6la4vbbf43zr1z2s";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsist-view";
+          sha256 = "0lf280ppi3zksqvx81y8mm9479j26kd5wywfghhwk36kz410hk99";
+          name = "emacsist-view";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/emacsist-view";
+          license = lib.licenses.free;
+        };
+      }) {};
     emacsql = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, finalize, lib, melpaBuild }:
     melpaBuild {
         pname = "emacsql";
@@ -14477,7 +14738,7 @@
           sha256 = "0ld5qpl7b3iksgxcfysznf88wj019l5271kdz4nalqi4kchf5xad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsql";
           sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax";
           name = "emacsql";
         };
@@ -14498,7 +14759,7 @@
           sha256 = "0ld5qpl7b3iksgxcfysznf88wj019l5271kdz4nalqi4kchf5xad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsql-mysql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsql-mysql";
           sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy";
           name = "emacsql-mysql";
         };
@@ -14519,7 +14780,7 @@
           sha256 = "0ld5qpl7b3iksgxcfysznf88wj019l5271kdz4nalqi4kchf5xad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsql-psql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsql-psql";
           sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3";
           name = "emacsql-psql";
         };
@@ -14540,7 +14801,7 @@
           sha256 = "0ld5qpl7b3iksgxcfysznf88wj019l5271kdz4nalqi4kchf5xad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsql-sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsql-sqlite";
           sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i";
           name = "emacsql-sqlite";
         };
@@ -14561,7 +14822,7 @@
           sha256 = "0jn4xj206idh5kgbklgcrngx6wvz9gwfm61wygar6pbfzqyx1y9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsshot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsshot";
           sha256 = "08xqx017yfizdj8wz7nbh9i7qpar6398sri78abzf78inv828s9j";
           name = "emacsshot";
         };
@@ -14582,7 +14843,7 @@
           sha256 = "00iklf97mszrsdv20q55qhml1dscvmmalpfnlkwi9mabklyq3i6z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emagician-fix-spell-memory";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emagician-fix-spell-memory";
           sha256 = "0ffjrpiph21dn8bplklsz3hrsai25l67yyr7n8qjxlwlibwqzv6j";
           name = "emagician-fix-spell-memory";
         };
@@ -14603,7 +14864,7 @@
           sha256 = "0j9vpiybpklf7kgmwpkdyywk29vpigzbn39d0m54z1kvy23xvx6x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emamux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emamux";
           sha256 = "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz";
           name = "emamux";
         };
@@ -14624,7 +14885,7 @@
           sha256 = "1idsvilsvlxh72waalhl8vrsmh0vfvz56qcv56fc2c0pb1i90icn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emamux-ruby-test";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emamux-ruby-test";
           sha256 = "1l1hp2dggjlc287qkfyj21w9lri4agh91g5x707qqq8nicdlv3xm";
           name = "emamux-ruby-test";
         };
@@ -14645,7 +14906,7 @@
           sha256 = "0cv8y6hr719648yxr2fbgb1hyg36m60bsbd57f2vvvqvg87si4jz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ember-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ember-mode";
           sha256 = "0fwd34cim29dg802ibsfd120px9sj54d4wzp3ggmjjzwkl9ky7dx";
           name = "ember-mode";
         };
@@ -14666,7 +14927,7 @@
           sha256 = "1sj033acw1q80accdfkrxw4kzfl8p1ld16y188ikbizvq75lfkpp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ember-yasnippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ember-yasnippets";
           sha256 = "1alqrv9yhc1f8dhvh2kjcv8qbn1hdgza5iasmchr1wggxds3s50i";
           name = "ember-yasnippets";
         };
@@ -14687,7 +14948,7 @@
           sha256 = "0037nikvlcw6i228jym76pl1mgw4fn5dpz8hfr86b3m0zb012inj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emmet-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emmet-mode";
           sha256 = "0w5nnhha70mndpk2a58raaxqanv868z05mfy1a8prgapm56mm819";
           name = "emmet-mode";
         };
@@ -14699,14 +14960,14 @@
       }) {};
     emms = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "emms";
-        version = "20151211.1353";
+        version = "20160207.620";
         src = fetchgit {
           url = "git://git.sv.gnu.org/emms.git";
-          rev = "489df29303fc89d4f80bffae91ad53f937ccd59a";
-          sha256 = "6e653c3b44442e21ec6e4410d8b9c0e51b2f03ed1ae62c1bb1a2ffa6c8c144da";
+          rev = "141ab95c2a0a2554b205f6eec991fa36d7d0531f";
+          sha256 = "7a3dcd8e93e7c2261f1af64d5dc2381b4c94db927326a577895a68c4325ae4d0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emms";
           sha256 = "0kzli8b0z5maizfwhlhph1f5w3v6pwxvs2dfs90l8c0h97m4yy2m";
           name = "emms";
         };
@@ -14727,7 +14988,7 @@
           sha256 = "07qbbs2i05bqndr4dxb84z50wav8ffbc56f6saw6pdx6n0sw6n6n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-info-mediainfo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emms-info-mediainfo";
           sha256 = "17x8vvfhx739hcj9j1nh6j4r6zqnwa5zq9zpi9b6lxc8979k3m4w";
           name = "emms-info-mediainfo";
         };
@@ -14748,7 +15009,7 @@
           sha256 = "03a7sn8pl0pnr05rmrrbw4hjyi8vpjqbvkvh0fqnij913a6qc64l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-mark-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emms-mark-ext";
           sha256 = "13h6hy8y0as0xfc1cg8balw63as81fzar32q9h4zhnndl3hc1081";
           name = "emms-mark-ext";
         };
@@ -14761,15 +15022,15 @@
     emms-mode-line-cycle = callPackage ({ emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emms-mode-line-cycle";
-        version = "20151009.946";
+        version = "20160221.520";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "emms-mode-line-cycle";
-          rev = "0488de1f9b4d0be6aa7dfe2fe0231cfd9b4d4295";
-          sha256 = "1pz2xvv5hzfg4a8s6xnbr14mpwnr94cwsa1bpk83i7x15hmxj938";
+          rev = "2c2f395e484a1d345050ddd61ff5fab71a92a6bc";
+          sha256 = "0q80f0plch6k4lhs8c9qm3mfycfbp3kn5sjrk9zxgxwnn901y9mp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-mode-line-cycle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emms-mode-line-cycle";
           sha256 = "1jdmfh1i9v84iy7bj2dbc3s2wfzkrby3pabd99gnqzd9gn1cn8ca";
           name = "emms-mode-line-cycle";
         };
@@ -14790,7 +15051,7 @@
           sha256 = "1yy4dmjp53l2df5qix31g4vizhv80wm88vjqq6qqa9p822732n0m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-player-mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emms-player-mpv";
           sha256 = "175rmqx3bgys4chw8ylyf9rk07sg0llwbs9ivrv2d3ayhcz1lg9y";
           name = "emms-player-mpv";
         };
@@ -14811,7 +15072,7 @@
           sha256 = "05n7jcd3nsnchv0swakf068klhlvckfcb3xjmxf5nnjibffjz77r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-player-mpv-jp-radios";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emms-player-mpv-jp-radios";
           sha256 = "0gdap5cv08pz370fl92v9lyvgkbbyjhp9wsc4kyjm4f4pwx9fybv";
           name = "emms-player-mpv-jp-radios";
         };
@@ -14832,7 +15093,7 @@
           sha256 = "0ajxyv7yx4ni8dizs7acpsxnmy3c9s0dx28vw9y1ym0bxkgfyzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-player-simple-mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emms-player-simple-mpv";
           sha256 = "15aljprjd74ha7wpzsmv3d873i6fy3x1jwhzm03hvw0sw18m25i1";
           name = "emms-player-simple-mpv";
         };
@@ -14853,7 +15114,7 @@
           sha256 = "0nx5bb5fjmaa1nhkbfnhd1aydqrq390x4rl1vfh11ilnf52wzzld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-soundcloud";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emms-soundcloud";
           sha256 = "0nf1f719m4pvxn0mf4qyx8mzwhrhv6kchnrpiy9clx520y8x3dqi";
           name = "emms-soundcloud";
         };
@@ -14874,7 +15135,7 @@
           sha256 = "1rk7am0xvpnv98yi7a62wlyh576md4n2ddj7nm201bjd4wdl2yxk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emoji-cheat-sheet-plus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emoji-cheat-sheet-plus";
           sha256 = "1ciwlbw0ihm0p5gnnl3safcj7dxwiy53bkj8cmw3i334al0gjnnv";
           name = "emoji-cheat-sheet-plus";
         };
@@ -14895,7 +15156,7 @@
           sha256 = "0sh4q4sb4j58ryvvmlsx7scry9inzgv2ssa87vbyzpxq0435l229";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emoji-display";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emoji-display";
           sha256 = "04cf18z26d64l0sv8qkbxjixi2wbw23awd5fznvg1cs8ixss01j9";
           name = "emoji-display";
         };
@@ -14916,7 +15177,7 @@
           sha256 = "0qi7p1grann3mhaq8kc0yc27cp9fm983g2gaqddljchn7lmgagrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emoji-fontset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emoji-fontset";
           sha256 = "19affsvlm1rzrzdh1k6xsv79icdkzx4izxivrd2ia6y2wcg9wc5d";
           name = "emoji-fontset";
         };
@@ -14937,7 +15198,7 @@
           sha256 = "1fqhydv9anhw0z8zjbz17kbl01bdzif9ncd25vdaa5dzddd16rb1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emojify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emojify";
           sha256 = "15v2h5jfksfc208qphiczplg56yka07qv4w4482c10yzwq76zp17";
           name = "emojify";
         };
@@ -14958,7 +15219,7 @@
           sha256 = "0bm0cxnv7g2dzfvfhkyy16kzn6shvy9gzypiqyjj42ng54xmhs0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/empos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/empos";
           sha256 = "0wbrszl9rq4is0ymxq9lxpqzlfg93gljh6almjy0hp3cs7pkzyl4";
           name = "empos";
         };
@@ -14968,25 +15229,27 @@
           license = lib.licenses.free;
         };
       }) {};
-    emr = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, list-utils, melpaBuild, paredit, popup, projectile, redshank, s }:
+    emr = callPackage ({ cl-lib ? null, clang-format, dash, emacs, fetchFromGitHub, fetchurl, iedit, lib, list-utils, melpaBuild, paredit, popup, projectile, redshank, s }:
     melpaBuild {
         pname = "emr";
-        version = "20160202.1703";
+        version = "20160218.1947";
         src = fetchFromGitHub {
           owner = "chrisbarrett";
           repo = "emacs-refactor";
-          rev = "d545d9084a76f2043a7f3c9d21ef5692e6843e30";
-          sha256 = "0l0jw5rakb2bsj2n1dxlj02hxvvyrgc2dfh6kn29i145lxpa03bf";
+          rev = "138157999d62372e60e966f67c8b85be53dabde1";
+          sha256 = "1frcn6694q74is8qbvrjkcsw0q1wz56z4gl35n4v3wakr9wvdvd1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emr";
           sha256 = "05vpfxg6lviclnms2zyrza8dc87m60mimlwd11ihvsbngi9gcw8x";
           name = "emr";
         };
         packageRequires = [
           cl-lib
+          clang-format
           dash
           emacs
+          iedit
           list-utils
           paredit
           popup
@@ -15010,7 +15273,7 @@
           sha256 = "0dz5xm05d7irh1j8iy08jk521p19cjai1kw68z2nngnyf1az7cim";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/enclose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/enclose";
           sha256 = "04gs468qqhdc9avx7lgibr0f1i444714i7rifad37dfmim8qk759";
           name = "enclose";
         };
@@ -15031,7 +15294,7 @@
           sha256 = "0k5ns40s5nskn0zialwq96qll1v5k50lfa5xh8hxbpcamsfym6h8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/encourage-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/encourage-mode";
           sha256 = "0fwn6w7s61c08z0d8z3awclqrhszia9is30gm2kx4hwr9dhhwh63";
           name = "encourage-mode";
         };
@@ -15048,11 +15311,11 @@
         src = fetchFromGitHub {
           owner = "hrs";
           repo = "engine-mode";
-          rev = "98020c5c8fcc3c675999fc6215af6a6259c5c017";
-          sha256 = "1k17z1dy9m9lx2fy78ack8fyf5vqb79fwjn078f93bcjl5mc7d4k";
+          rev = "a1b3e4fb71155c01963a3451c3e45d3a08215ede";
+          sha256 = "1hxvla26j6zm287cbn5mpwhrkbn4grgglh2rk9hrrzhm7xcb21mx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/engine-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/engine-mode";
           sha256 = "1gg7i93163m7k7lr3pnal1svymnhzwrfpfcdc0798d7ybv26gg8c";
           name = "engine-mode";
         };
@@ -15073,7 +15336,7 @@
           sha256 = "008wggl6xxk339njrgpj2fndbil7k9f3i2hg1mjwqk033j87nbz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/enh-ruby-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/enh-ruby-mode";
           sha256 = "0r486yajjf7vsaz92ypxpfmz2nsvw9giffpxb9szj7fcry3nfdns";
           name = "enh-ruby-mode";
         };
@@ -15094,7 +15357,7 @@
           sha256 = "0vd7zy06nqb1ayjlnf2wl0bfv1cqv2qcb3cgy3zr9k9c4whcd8jh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/enlive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/enlive";
           sha256 = "1dyayk37zik12qfh8zbjmhsch64yqsx3acrlm7hcnavx465hmhnz";
           name = "enlive";
         };
@@ -15115,7 +15378,7 @@
           sha256 = "1qimqrvk0myqfi2l3viigkx1ld90qpjgi1gs6xhw2g51r8x4i3in";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eno";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eno";
           sha256 = "0k4n4vw261v3bcxg7pqhxr99vh673l963yjridl0dp1663gcrfpk";
           name = "eno";
         };
@@ -15136,7 +15399,7 @@
           sha256 = "0v5p97dvzrk3j59yjc6iny71j3fdw9bb8737wnnzm098ff42dfmd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/enotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/enotify";
           sha256 = "0mii6m6zw9y8njgzi79rcf1n251iw7qz3yqjjij3c19rk3zpm5qi";
           name = "enotify";
         };
@@ -15149,15 +15412,15 @@
     ensime = callPackage ({ company, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, s, sbt-mode, scala-mode2, yasnippet }:
     melpaBuild {
         pname = "ensime";
-        version = "20160201.837";
+        version = "20160219.1431";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "ensime-emacs";
-          rev = "52db33ae0304952d2deac6f4467fbeeee75bc62b";
-          sha256 = "1h7hgfzzhl7crwxkaskjhi9axb8aywb0z33a9d5z3c9safmq2r03";
+          rev = "6ce0d22ba4f4cc9a8420ae5a8902a1c8a4218c7e";
+          sha256 = "1s3fpigsm988jp9jpcyk1zr7khby12m5cy71k1ag0cbgrv66l4za";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ensime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ensime";
           sha256 = "1d8y72l7bh93x9zdj3d3qjhrrzr804rgi6kjifyrin772dffjwby";
           name = "ensime";
         };
@@ -15178,15 +15441,15 @@
     envdir = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "envdir";
-        version = "20150519.955";
+        version = "20160221.1323";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "envdir-mode";
-          rev = "efbfc45de320d33cd5c52edfa73a399a8b4dc34b";
-          sha256 = "0jb8hf4v02b0zd02749533arrypjr3b3k88129grfks2kf29ybhb";
+          rev = "f29346c55ccf11d8c75628edc6d430ed63c36917";
+          sha256 = "1jyhr9gv3d0rxv5iks2g9x6xbxqv1bvf1fnih96h4pgsfxz8wrp6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/envdir";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/envdir";
           sha256 = "085bfm4w7flrv8jvzdnzbdg3j5n29xfzbs1wlrr29mg9dja6s8g8";
           name = "envdir";
         };
@@ -15199,15 +15462,15 @@
     eopengrok = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, s }:
     melpaBuild {
         pname = "eopengrok";
-        version = "20160102.429";
+        version = "20160214.147";
         src = fetchFromGitHub {
           owner = "youngker";
           repo = "eopengrok.el";
-          rev = "30154a083b2fd8cbb9336d0d2134f790efd4163b";
-          sha256 = "1yn9jn6jl6rmknj50g18z5yvpa1d8mzzx3j1pfdwfn36ak4nc9ba";
+          rev = "0bf07c636f8d29a98e9776243ec9496875ddff51";
+          sha256 = "0pmawjfyihqygqz7y0nvyrs6jcvckqzkq9k6z6yanpvkd2x5g13x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eopengrok";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eopengrok";
           sha256 = "0756x78113286hwk1i1m5s8xq04gh7zxb4fkmw58lg2ssff8q6av";
           name = "eopengrok";
         };
@@ -15228,7 +15491,7 @@
           sha256 = "11z08y61xd00rlw5mcyrix8nx41mqs127wighhjsxsyzbfqydxdr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/epc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/epc";
           sha256 = "1l9rcx07pa4b9z5654gyw6b64c95lcigzg15amphwr56v2g3rbzx";
           name = "epc";
         };
@@ -15249,7 +15512,7 @@
           sha256 = "18gfi1287skv5xvh12arkvxy2c4fism8bdk42wc5q3y21h8nsiim";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/epic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/epic";
           sha256 = "0gfl8if83jbs0icz6gcjkwxvcz5v744k1kvqnbx3ga481kds9rqf";
           name = "epic";
         };
@@ -15270,7 +15533,7 @@
           sha256 = "0s4k2grikhibd075435giv3bmba1mx71ndxlr0k1i0q0xawpyyb4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/epl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/epl";
           sha256 = "0zr3r2hn9jaxscrl83hyixznb8l5dzfr6fsac76aa8x12xgsc5hn";
           name = "epl";
         };
@@ -15291,7 +15554,7 @@
           sha256 = "1a8gzf7abda0zgcllyl351m47avnf995i9lvwjf05nyx2jb31dnw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/epresent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/epresent";
           sha256 = "1x16wqfjfrh7kaqar5px61bf3lnlibvcbr5xaf3mcgph37sgi6la";
           name = "epresent";
         };
@@ -15312,7 +15575,7 @@
           sha256 = "1wwg46xdb488wxvglwvsy08vznrnmdmmbcvm9vb60dy3gqjmz7cw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eprime-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eprime-mode";
           sha256 = "0vswjcs24f3mdyw6ai7p21ab8pdn327lr2d6css0a5nrg539cn2g";
           name = "eprime-mode";
         };
@@ -15333,7 +15596,7 @@
           sha256 = "13ds5z2nvanx8cvxrzi0da6ixx7kw222z6mrlbs8cldqcmzm7xh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eproject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eproject";
           sha256 = "0kpg4r57khbyinc73v9kj32b9m3b4nb5014r5fkl5mzzpzmd85b4";
           name = "eproject";
         };
@@ -15354,7 +15617,7 @@
           sha256 = "18r66yl52xm1gjbn0dm8z80gv4p3794pi91qa8i2sri4grbsyi5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-colorize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-colorize";
           sha256 = "1m941q7ql3yb71s71783nvz822bwhn1krmin18fvh0fbsbbnck2a";
           name = "erc-colorize";
         };
@@ -15375,7 +15638,7 @@
           sha256 = "0v2ly3q1r169lxwp6ml70plm6i0s96d0a1wy91ngvqgqpnpk4746";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-crypt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-crypt";
           sha256 = "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3";
           name = "erc-crypt";
         };
@@ -15385,6 +15648,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    erc-hipchatify = callPackage ({ alert, emacs, fetchhg, fetchurl, lib, melpaBuild, request, s }:
+    melpaBuild {
+        pname = "erc-hipchatify";
+        version = "20160216.1814";
+        src = fetchhg {
+          url = "https://bitbucket.com/seanfarley/erc-hipchatify";
+          rev = "a1a163004d98";
+          sha256 = "0bk4vr26abhbiwkmpns4hdlg23pxa25lca78fhz1900jkv4imk0f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-hipchatify";
+          sha256 = "1a4gl05i757vvap0rzrfwms7mhw80sa84gvbwafrvj3x11rja24x";
+          name = "erc-hipchatify";
+        };
+        packageRequires = [ alert emacs request s ];
+        meta = {
+          homepage = "http://melpa.org/#/erc-hipchatify";
+          license = lib.licenses.free;
+        };
+      }) {};
     erc-hl-nicks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erc-hl-nicks";
@@ -15396,7 +15679,7 @@
           sha256 = "1k0g3bwp3w0dd6zwdv6k2wpqs2krjayilrzsr1hli649ljcx55d7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-hl-nicks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-hl-nicks";
           sha256 = "1lhw77n2nrjnb5yhnpm6yhbcp022xxjcmdgqf21z9rd0igss9mja";
           name = "erc-hl-nicks";
         };
@@ -15417,7 +15700,7 @@
           sha256 = "03r13x2hxy4hk0n0ri5wld8rp8frx4j3mig6mn2v25k0cr52689f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-image";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-image";
           sha256 = "1cgzygkysjyrsdr6jwqkxlnisxccsvh4kxgn19rk4n61ms7bafvf";
           name = "erc-image";
         };
@@ -15438,7 +15721,7 @@
           sha256 = "0k3gp4c74g5awk7v9lzb6py3dvf59nggh6dw7530cswxb6kg2psa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-social-graph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-social-graph";
           sha256 = "07arn3k89cqxab5x5lczv8bpgrbirmlw9p6c37fgrl3df6f46h4h";
           name = "erc-social-graph";
         };
@@ -15459,7 +15742,7 @@
           sha256 = "0cfqbqskh260zfq1lx1s8jz2351w2ij9m73rqim16fy7zr0s0670";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-terminal-notifier";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-terminal-notifier";
           sha256 = "0vrxkg62qr3ki8n9mdn02sdni5fkj79fpkn0drx0a4kqp0nrrj7c";
           name = "erc-terminal-notifier";
         };
@@ -15480,7 +15763,7 @@
           sha256 = "0n107d77z04ahypa7hn2165kkb6490v4vkzdm5zwm4lfhvlmp0x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-track-score";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-track-score";
           sha256 = "19wjwah2n8ri6gyrsbzxnrvxwr5cj48sxrar1226n9miqvgj5whx";
           name = "erc-track-score";
         };
@@ -15501,7 +15784,7 @@
           sha256 = "118q4zj9dh5xnimcsi229j5pflhcd8qz0p212kc4p9dmyrx2iw0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-tweet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-tweet";
           sha256 = "0bazwq21mah4qrzwaji6w13m91l6v9dqh9svxrd13ij8yycr184b";
           name = "erc-tweet";
         };
@@ -15522,7 +15805,7 @@
           sha256 = "0bzi2sh2fhrz49j5y53h6jgf41av6rx78smb3bbk6m74is8vim2y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-view-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-view-log";
           sha256 = "1k6fawblz0d7kz1y7sa3q43s7ci28jsmzkp9vnl1nf55p9xvv4cf";
           name = "erc-view-log";
         };
@@ -15543,7 +15826,7 @@
           sha256 = "0kh4amx3l3a14qaiyvjyak1jbybs6n49mdvzjrd1i2vd1y74zj5w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-youtube";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-youtube";
           sha256 = "12ylxkskkgfv5x7vlkib963ichb3rlmdzkf4zh8a39cgl8wsmacx";
           name = "erc-youtube";
         };
@@ -15564,7 +15847,7 @@
           sha256 = "1dlw34kaslyvnsrahf4rm76r2b7qqqn589i4mmhr23prl8xbz9z9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-yt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-yt";
           sha256 = "0yrwvahv4l2s1aavy6y6mjlrw8l11i00a249825ab5yaxrkzz7xc";
           name = "erc-yt";
         };
@@ -15585,7 +15868,7 @@
           sha256 = "0xw3d9fz4kmn1myrsy44ki4bgg0aclv41wldl6r9nhvkrnri41cv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ercn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ercn";
           sha256 = "0yvis02bypw6v1zv7i326y8s6j0id558n0bdri52hr5pw85imnlp";
           name = "ercn";
         };
@@ -15604,7 +15887,7 @@
           sha256 = "0cdyhklmsv0xfcq97c3wqh8scs6910jzvvp04w0jxlayd1dbzx49";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eredis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eredis";
           sha256 = "1j0y4h97pqsw6k18w6r3rza3ql04ag3cixyndji7i1smbfsh4v95";
           name = "eredis";
         };
@@ -15625,7 +15908,7 @@
           sha256 = "1v8x6qmhywfxs7crzv7hfl5n4zq5y3ar40l873946l4wyk0wclng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erefactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erefactor";
           sha256 = "0ma9sbrq4n8y5w7vvbhhgmw25aiykbq5yhxzm0knj32bgpviprw7";
           name = "erefactor";
         };
@@ -15638,15 +15921,15 @@
     ergoemacs-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "ergoemacs-mode";
-        version = "20160204.1341";
+        version = "20160221.103";
         src = fetchFromGitHub {
           owner = "ergoemacs";
           repo = "ergoemacs-mode";
-          rev = "fd672d7377e49df17816c5aba6e0fcd35b61efd3";
-          sha256 = "12s4rsnp59n8swwisi7jrf721dbz9dr7a9n5r6vnq38avsfa5zw4";
+          rev = "80780ef8603577cb0ab8c64630d1301f7afef2ec";
+          sha256 = "1dfl8qwzjygnhfivf9w2dkv0vqyg0grnfganl7vh2l0lszps735d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ergoemacs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ergoemacs-mode";
           sha256 = "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62";
           name = "ergoemacs-mode";
         };
@@ -15663,11 +15946,11 @@
         src = fetchFromGitHub {
           owner = "erlang";
           repo = "otp";
-          rev = "a03b7add86b92d0d7d2d744e5555314bedbc2197";
-          sha256 = "06hx5cscqylha7lghlf05mgihiw7mwzg7jjzqx4ffwdkpg5zsnb9";
+          rev = "d0002b70b1f948dcef3e08781b9db589907776c5";
+          sha256 = "19cm7zq3n78a3qb1299rhc6n7diy5a5ix94k9ljkww5qydx9qi77";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erlang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erlang";
           sha256 = "1gmrdkfanivb9l5lmkl0853snlhl62w34537r82w11z2fbk9lxhc";
           name = "erlang";
         };
@@ -15688,7 +15971,7 @@
           sha256 = "0hn9i405nfhjd1h9vnwj43nxbbz00khrwkjq0acfyxjaz1shfac9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ert-async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ert-async";
           sha256 = "004798ckri5j72j0xvzkyciss1iz4lw9gya2749hkjxlamg14cn5";
           name = "ert-async";
         };
@@ -15706,7 +15989,7 @@
           sha256 = "0cwy3ilsid90abzzjb7ha2blq9kmv3gfp3icwwfcz6qczgirq6g7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ert-expectations";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ert-expectations";
           sha256 = "094lkf1h83rc0dkvdv8923xjrzj5pnpnsb4izk8n5n7g0rbz1l9w";
           name = "ert-expectations";
         };
@@ -15726,7 +16009,7 @@
           sha256 = "eedfdd6753c32d16baa341e6d20abee8713921d8eb850d16782cde55bdbeec46";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ert-junit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ert-junit";
           sha256 = "0bv22mhh1ahbjwi6s1csxkh11dmy0srabkddjd33l4havykxlg6g";
           name = "ert-junit";
         };
@@ -15747,7 +16030,7 @@
           sha256 = "08yfq3qzscxvzyxvyvdqpkrm787278yhkdd9prbvrgjj80p8n7vq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ert-modeline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ert-modeline";
           sha256 = "06pc50q9ggin20cbfafxd53x35ac3kh85dap0nbws7514f473m7b";
           name = "ert-modeline";
         };
@@ -15768,7 +16051,7 @@
           sha256 = "0ivnfc42pw9pc9glx2m4klzx4csy4m60hj1x12js7492bd0ri933";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ert-runner";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ert-runner";
           sha256 = "0fnb8rmjr5lvc3dq0fnyxhws8ync1lj5xp8ycs63z4ax6gmdqr48";
           name = "ert-runner";
         };
@@ -15789,7 +16072,7 @@
           sha256 = "0jq4yp80wiphlpsc0429rg8n50g8l4lf78q0l3nywz2p93smjy9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/es-lib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/es-lib";
           sha256 = "0mwvgf5385qsp91zsdw75ipif1h90xy277xdmrpwixsxd7abbn0n";
           name = "es-lib";
         };
@@ -15802,15 +16085,15 @@
     es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "es-mode";
-        version = "20160128.1119";
+        version = "20160220.2252";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "es-mode";
-          rev = "a0c142951e6fc932c691e344262aecd422538d17";
-          sha256 = "0hrhj08xnd4xavvx8hyaysnz52c1wd1fgfwgark4lcjlh6aiagdf";
+          rev = "4424f5e3731852a16468d4aaa4ef7f5fab78d4d5";
+          sha256 = "0km7nvagipjqqppv1njm40cm4l7iyajqnqjy9a3j0r7civ4cz5y6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/es-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/es-mode";
           sha256 = "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp";
           name = "es-mode";
         };
@@ -15831,7 +16114,7 @@
           sha256 = "14rsifcx2kwdmwq9zh41fkb848l0f4igp5v9pk3x4jd2yw9gay7m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/es-windows";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/es-windows";
           sha256 = "112ngkan0hv3y7m71479f46x5gwdmf0vhbqrzs5kcjwlacqlrahx";
           name = "es-windows";
         };
@@ -15852,7 +16135,7 @@
           sha256 = "0id7820vjbprlpprj4fyhylkjvx00b87mw4n7jnxn1gczvjgafmc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/escreen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/escreen";
           sha256 = "0yis27362jc63jkzdndz1wpysmf1b51rrbv3swvi6b36da5i6b54";
           name = "escreen";
         };
@@ -15873,7 +16156,7 @@
           sha256 = "1k8k9hl9m4vjqdw3x9wg04cy2lb9x64mq0mm0i3i6w59zrsnkn4q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/esh-buf-stack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/esh-buf-stack";
           sha256 = "0zmwlsm98m9vbjk9mldfj2nf6cip7mlvb71j33ddix76yqggp4qg";
           name = "esh-buf-stack";
         };
@@ -15894,7 +16177,7 @@
           sha256 = "1yfvdx763xxhxf2r6kjjjyafaxrj1lpgrz1sgbhzkyj6nspmm9ms";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/esh-help";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/esh-help";
           sha256 = "1k925wmn8jy9rxxsxxawasxq6r4yzwl116digdx314gd3i04sh3w";
           name = "esh-help";
         };
@@ -15915,7 +16198,7 @@
           sha256 = "13crzgkx1lham1nfsg6hj2zg875majvnig0v4ydg691zk1qi4hc2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eshell-autojump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eshell-autojump";
           sha256 = "09l2680hknmdbwr4cncv1v4b0adik0c3sm5i9m3qbwyyxm8m41i5";
           name = "eshell-autojump";
         };
@@ -15936,7 +16219,7 @@
           sha256 = "0v0wshck5n4hspcv1zk1g2nm6xiigcjp16lx0dc8wzkl6ymljvbg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eshell-did-you-mean";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eshell-did-you-mean";
           sha256 = "1z1wpn3sj1gi5nn0a71wg0i3av0dijnk79dc32zh3qlh500kz8mz";
           name = "eshell-did-you-mean";
         };
@@ -15957,7 +16240,7 @@
           sha256 = "1b94pamb92a26lvlbwyr7kgaiwax4hkgmmalh8l5ldcwxkscq09c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eshell-git-prompt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eshell-git-prompt";
           sha256 = "0a8pyppqvnavvb8rwsjxagb76hra9zhs5gwa0ylyznmql83f8w8s";
           name = "eshell-git-prompt";
         };
@@ -15970,15 +16253,15 @@
     eshell-prompt-extras = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "eshell-prompt-extras";
-        version = "20150726.159";
+        version = "20160213.1950";
         src = fetchFromGitHub {
           owner = "kaihaosw";
           repo = "eshell-prompt-extras";
-          rev = "0b7670972b6b424b4a15a88b1733b99324dcf387";
-          sha256 = "0r2fbz5z935vny9cbi857ryddhbg9v8i93jrzn2xvqs3h5wj9jn9";
+          rev = "61973d732c1e6b24d3fd0374162669dec83f5ed6";
+          sha256 = "1k8falfyd5rfgn56pdin36k4afx0zp0z00jldg1jn22c6p3ndsfl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eshell-prompt-extras";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eshell-prompt-extras";
           sha256 = "1plvc8azpmb3phlrxhw3y18dv5y0xljsr5fqym4w84m66lq5csfj";
           name = "eshell-prompt-extras";
         };
@@ -15999,7 +16282,7 @@
           sha256 = "0znk2wmvk7b5mi727cawbddvzx74dlm1lwsxgkiylx2qp299ark0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eshell-z";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eshell-z";
           sha256 = "14ixazj0nscyqsdv7brqnfr0q8llir1pwb91yhl9jdqypmadpm6d";
           name = "eshell-z";
         };
@@ -16020,7 +16303,7 @@
           sha256 = "0ir7j4dgy0fq9ybixaqs52kiqk73p9v6prgqzjs8nyicjrpmnpyq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/espresso-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/espresso-theme";
           sha256 = "1bsff8fnq5z0f6cwg6wprz8qi3ivsqxpxx6v6fxfammn74qqyvb5";
           name = "espresso-theme";
         };
@@ -16041,7 +16324,7 @@
           sha256 = "16r4j27j9yfdiy841w9q5ykkc6n3wrm7hvfacagb32mydk821ijg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/espuds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/espuds";
           sha256 = "16yzw9l64ahf5v92jzb7vyb4zqxxplq6qh0y9rkfmvm59s4nhk6c";
           name = "espuds";
         };
@@ -16062,7 +16345,7 @@
           sha256 = "05f8n24yvzm3zjvc1523ib44wv76ms5sn6mv8s1wrjsl190av0rn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/esqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/esqlite";
           sha256 = "1dny5qjzl9gaj90ihzbhliwk0n0x7jz333hzf6gaw7wsjmx91wlh";
           name = "esqlite";
         };
@@ -16083,7 +16366,7 @@
           sha256 = "05f8n24yvzm3zjvc1523ib44wv76ms5sn6mv8s1wrjsl190av0rn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/esqlite-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/esqlite-helm";
           sha256 = "00y2nwyx13xlny40afczr31lvbpnw1cgmj5wc3iycyznizg5kvhq";
           name = "esqlite-helm";
         };
@@ -16096,15 +16379,15 @@
     ess = callPackage ({ fetchFromGitHub, fetchurl, julia-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "ess";
-        version = "20160127.1710";
+        version = "20160208.653";
         src = fetchFromGitHub {
           owner = "emacs-ess";
           repo = "ESS";
-          rev = "27d5150f9a9262b3fd861321561b18446d0fb479";
-          sha256 = "091ac8l6d1dvj4jvmpqx6cibydpc7safaamp7845qasm2j97zm4n";
+          rev = "9ef548725d8fd8bd301ff2b4c8f292c309871110";
+          sha256 = "0376yic7aldqxrzc91f7g3licc8svvqdqn4jdbnhw4cdk94w46fm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ess";
           sha256 = "02kz4fjxr0vrj5mg13cq758nzykizq4dmsijraxv46snvh337v5i";
           name = "ess";
         };
@@ -16125,7 +16408,7 @@
           sha256 = "1ya2ay52gkrd31pmw45ban8kkxgnzhhwkzkypwdhjfccq3ys835x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess-R-data-view";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ess-R-data-view";
           sha256 = "0r2fzwayf3yb7fqk6f31x4xfqiiczwik8qw4rrvkqx2h3s1kz7i0";
           name = "ess-R-data-view";
         };
@@ -16146,7 +16429,7 @@
           sha256 = "0q8pbaa6wahli6fh0kng5zmnypsxi1fr2bzs2mfk3h8vf4nikpv0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess-R-object-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ess-R-object-popup";
           sha256 = "1dxwgahfki6d6ywh85ifk3kq6f2a1114kkd8xcv4lcpzqykp93zj";
           name = "ess-R-object-popup";
         };
@@ -16167,7 +16450,7 @@
           sha256 = "0ici253mllqyzcbhxrazfj2kl50brr8qid99fk9nlyfgh516ms1x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess-smart-equals";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ess-smart-equals";
           sha256 = "0mfmxmsqr2byj56psx4h08cjc2j3aac3xqr04yd47k2mlivnyrxp";
           name = "ess-smart-equals";
         };
@@ -16188,7 +16471,7 @@
           sha256 = "01xa98q0pqsf4gyl6ixlpjjdqazqsxg1sf7a3j2wbh7196ps61v5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess-smart-underscore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ess-smart-underscore";
           sha256 = "01pki1xa8zpgvldcbjwg6vmslj7ddf44hsx976xipc95vrdk15r2";
           name = "ess-smart-underscore";
         };
@@ -16198,6 +16481,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ess-view = callPackage ({ ess, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "ess-view";
+        version = "20160218.344";
+        src = fetchFromGitHub {
+          owner = "GioBo";
+          repo = "ess-view";
+          rev = "d2eecbf43a1e68bd9716b52853aca46d6667ef18";
+          sha256 = "0wz6n41aqph1b460m8vnxvz6mnmh6n7kxbx4wriknjlacxamksyy";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ess-view";
+          sha256 = "1zx5sbxmbs6ya349ic7yvnx56v3km2cb27p8kan5ygisnwwq2wc4";
+          name = "ess-view";
+        };
+        packageRequires = [ ess f s ];
+        meta = {
+          homepage = "http://melpa.org/#/ess-view";
+          license = lib.licenses.free;
+        };
+      }) {};
     esup = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "esup";
@@ -16209,7 +16513,7 @@
           sha256 = "034rs6mmc5f6y8ply2a90b5s4pi4qx9m49wsxc9v0zwa9i5skmx1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/esup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/esup";
           sha256 = "0cv3zc2zzm38ki3kxq58g9sp4gsk3dffa398wky6z83a3zc02zs0";
           name = "esup";
         };
@@ -16230,7 +16534,7 @@
           sha256 = "0mrfkq3jcsjfccqir02yijl24hllc347b02y7gk3b2yn0b676dv3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/esxml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/esxml";
           sha256 = "0nn074abkxz7p4w59l1za586p5ya392xhl3sx92yys8a3194n6hz";
           name = "esxml";
         };
@@ -16251,7 +16555,7 @@
           sha256 = "1k361bbwd9z17qlycymb1x7scidvgvrh9bdp06rhwfh9j3slrbxy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/etable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/etable";
           sha256 = "0m4h24mmhp680wfhb90im228mrcyxapzyi4kla8xdmss83gc0c32";
           name = "etable";
         };
@@ -16269,7 +16573,7 @@
           sha256 = "0gmlmxlwfsfk5axn3x5cfvqy9bx26ynpbg50mdxiljk7wzqs5dyb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/etags-select";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/etags-select";
           sha256 = "0j6mxj10n7jf087l7j86s3a8si5hzpwmvrpqisfvlnvn6a0rdy7h";
           name = "etags-select";
         };
@@ -16287,7 +16591,7 @@
           sha256 = "0apm8as606bbkpa7i1hkwcbajzsmsyxn6cwfk9dkkll5bh4vglqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/etags-table";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/etags-table";
           sha256 = "1jzij9jknab42jmx358g7f1c0d8lsp9baxbk3xsy7w4nl0l53d84";
           name = "etags-table";
         };
@@ -16308,7 +16612,7 @@
           sha256 = "098mfyw63b23h7jajaik1rfj307sxs82nnwf6b81j550kl2n05y6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ethan-wspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ethan-wspace";
           sha256 = "0k4kqkf5c6ysyhh1vpi9v4220yxm5ir3ippq2gmvvhnk77pg6hws";
           name = "ethan-wspace";
         };
@@ -16329,7 +16633,7 @@
           sha256 = "0vd2crs261na9a682d74ycz1il661kavsz1bvs0bkak09lplc1qz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eval-in-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eval-in-repl";
           sha256 = "10h5vy9wdiqf9dgk1d1bsvp93y8sfcxghzg8zbhhn7m5cqg2wh63";
           name = "eval-in-repl";
         };
@@ -16350,7 +16654,7 @@
           sha256 = "1syqakdyg3ydnq9gvkjf2rw9rz3kyhzp7avhy6dvyy65pv2ndyc2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eval-sexp-fu";
           sha256 = "17cazf81z4cszflnfp66zyq2cclw5sp9539pxskdf267cf7r0ycs";
           name = "eval-sexp-fu";
         };
@@ -16363,15 +16667,15 @@
     evalator = callPackage ({ fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
     melpaBuild {
         pname = "evalator";
-        version = "20160130.1359";
+        version = "20160212.1928";
         src = fetchFromGitHub {
           owner = "seanirby";
           repo = "evalator";
-          rev = "edf3840f5aa025cf38d0c2677b2f88f59079409e";
-          sha256 = "1a3y69s7lb24zdivxcpsjh9l6adxyjqxbpgradnj0q1n6kdyq679";
+          rev = "f30da4da48c0b3f3cfa1fc1c7cfdb53ffe79df36";
+          sha256 = "1llxxdprs8yw2hqj4dhrkrrzmkl25h7p4rcaa2cw544fmg3kvlz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evalator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evalator";
           sha256 = "0k6alxwg89gc4v5m2bxmzmj7l6kywhbh4036xgz19q28xnlbr9xk";
           name = "evalator";
         };
@@ -16381,17 +16685,38 @@
           license = lib.licenses.free;
         };
       }) {};
+    evalator-clojure = callPackage ({ cider, evalator, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evalator-clojure";
+        version = "20160208.1548";
+        src = fetchFromGitHub {
+          owner = "seanirby";
+          repo = "evalator-clojure";
+          rev = "caa4e0a137bdfada86593128a654e16aa617ad50";
+          sha256 = "1q5s1ffmfh5dby92853xm8kjhgjfd5vbvcg1xbf8lswc1i41k7n7";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evalator-clojure";
+          sha256 = "10mxlgirnsq3z7l1izrf2v1l1yr4sbdjsaszz7llqv6l80y4bji3";
+          name = "evalator-clojure";
+        };
+        packageRequires = [ cider evalator ];
+        meta = {
+          homepage = "http://melpa.org/#/evalator-clojure";
+          license = lib.licenses.free;
+        };
+      }) {};
     evil = callPackage ({ fetchhg, fetchurl, goto-chg, lib, melpaBuild, undo-tree }:
     melpaBuild {
         pname = "evil";
-        version = "20160203.721";
+        version = "20160215.1148";
         src = fetchhg {
           url = "https://bitbucket.com/lyro/evil";
-          rev = "5c0114702ea3";
-          sha256 = "1sysqcvzdnzg5qvawv3c0rwfyacjb80mvfdhdmc07vr4pyma6vcj";
+          rev = "70005dd4c11e";
+          sha256 = "0hdysszfc3796d19nyw1f4cqzisspih1if0hh9hp2xjgxh3vj0mw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil";
           sha256 = "09qrhy7l229w0qk3ba1i2xg4vqz8525v8scrbm031lqp30jp54hc";
           name = "evil";
         };
@@ -16412,7 +16737,7 @@
           sha256 = "05fba10yvxl82g2xl48mxwz7cwjp4pylb7n8a4b08i8f9xasny7f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-annoying-arrows";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-annoying-arrows";
           sha256 = "024zz9l43y1kk2hm8l96h1ahril23cj35f0x72jrcfjysid7wpry";
           name = "evil-annoying-arrows";
         };
@@ -16433,7 +16758,7 @@
           sha256 = "0cnj91lwpmk4c8nf3xi80yvv6anvkg8h1kbzbp16glkgmy6jpmy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-anzu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-anzu";
           sha256 = "19cmc61l370mm4h2m6jw5pdcsvj4wcv9zpa8z7k1fjg57mwmmn70";
           name = "evil-anzu";
         };
@@ -16454,7 +16779,7 @@
           sha256 = "1nh7wa4ynr7ln42x32znzqsmh7ijzy5ymd7rszf49l8677alvazq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-args";
           sha256 = "1bwdvf1i3jc77bw2as1wr1djm8z3a7wms60694xkyqh0m909hs2w";
           name = "evil-args";
         };
@@ -16475,7 +16800,7 @@
           sha256 = "1q6znbnshk45mdglx519qlbfhb7g47qsm245i93ka4djsjy55j9l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-avy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-avy";
           sha256 = "1hc96dd78yxgr8cs9sk9y1i5h1qnyk110vlb3wnlxv1hwn92qvrd";
           name = "evil-avy";
         };
@@ -16496,7 +16821,7 @@
           sha256 = "08cpgbwsrk8n88qiq2z90s6wx0ayvrrb38m8dks595x2qzzpa1gi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-cleverparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-cleverparens";
           sha256 = "10zkyaxy52ixh26hzm9v1y0gakcn5sdwz4ny8v1vcmjqjphnk799";
           name = "evil-cleverparens";
         };
@@ -16509,15 +16834,15 @@
     evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-commentary";
-        version = "20151210.527";
+        version = "20160221.1430";
         src = fetchFromGitHub {
           owner = "linktohack";
           repo = "evil-commentary";
-          rev = "122880a6721fcf16479f406c78c6e490a25efab0";
-          sha256 = "1qiym8f56a18j5swrxx5is48nz7z76531k8cw2c7czr6611l8l5a";
+          rev = "6d9079894da0bdda8a317c03c90481b8754635c7";
+          sha256 = "183fdg7rmnnbps0knnj2kmhf1hxk0q91wbqx1flhciq6wq4rilni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-commentary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-commentary";
           sha256 = "151iiimmkpn58pl9zn40qssfahbrqy83axyl9dcd6kx2ywv5gcxz";
           name = "evil-commentary";
         };
@@ -16538,7 +16863,7 @@
           sha256 = "0fdlj2m8bzdwqh43qb34il3fmang0zpdgxfkrsmxy9kpc0bsx940";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-dvorak";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-dvorak";
           sha256 = "1iq9wzcb625vs942khja39db1js8r46vrdiqcm47yfji98g39gsn";
           name = "evil-dvorak";
         };
@@ -16551,15 +16876,15 @@
     evil-easymotion = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-easymotion";
-        version = "20160105.1418";
+        version = "20160217.2043";
         src = fetchFromGitHub {
           owner = "PythonNut";
           repo = "evil-easymotion";
-          rev = "b39fc6250a3893acbf98cafbf028a0f4abb1a8a2";
-          sha256 = "17dng6iik4jzri6f435icrfb5g9zs2zqc6jgwkpphsgjcc12izrr";
+          rev = "5b77d65b0a8d93b8b9602d4757a40c548a3bc997";
+          sha256 = "01nk89wkqbi6jpggdj6yl74k8jzlh329i4p77wljyr18akbrdz9l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-easymotion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-easymotion";
           sha256 = "0zixgdhc228y6yqr044cbyls0pihzacqsgvybhhar916p4h8izgv";
           name = "evil-easymotion";
         };
@@ -16580,7 +16905,7 @@
           sha256 = "16pz48gdpl68azaqwyixh10y1x9xzi1lnhq2v0nrd0y6bfcqcvc7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-ediff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-ediff";
           sha256 = "1xwl2511byb00ybfnm6q6mbkgzarrq8bfv5rbip67zqbw2qgmb6i";
           name = "evil-ediff";
         };
@@ -16601,7 +16926,7 @@
           sha256 = "1dl201jx7kfmkhd7ism6wlmlnbgfg1qn17faryz7kc5v2mms69b4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-escape";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-escape";
           sha256 = "0rlwnnshcvsb5kn7db5qy39s89qmqlllvg2z8cnxyri8bsssks4k";
           name = "evil-escape";
         };
@@ -16622,7 +16947,7 @@
           sha256 = "0gbpd1wmlcvddiym0r410rch8bjg4gxslynwmfqywwgbva8zm46c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-exchange";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-exchange";
           sha256 = "1mvw7w23yfbfmhzj6wimslbryb0gppryw24ac0wh4fzl9rdcma4r";
           name = "evil-exchange";
         };
@@ -16643,7 +16968,7 @@
           sha256 = "1cv24qnxxf6n1grf4n5969v8y9xll5zb9mbfdnq9iavdvhnndk2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-god-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-god-state";
           sha256 = "1g547d58zf11qw0zz3fk5kmrzmfx1rhawyh5d2h8bll8hwygnrxf";
           name = "evil-god-state";
         };
@@ -16664,7 +16989,7 @@
           sha256 = "1kdigwpl9pp88l11bkpxkw91pvs8z3gachxccibivzgjxd2pnvfl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-iedit-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-iedit-state";
           sha256 = "1dihyh7vqcp7kvfic613k7v33czr93hz04d635awrsyzgy8savhl";
           name = "evil-iedit-state";
         };
@@ -16685,7 +17010,7 @@
           sha256 = "1g6r1ydscwjvmhh1zg4q3nap4avk8lb9msdqrh7dff6pla0r2qs6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-indent-plus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-indent-plus";
           sha256 = "15vnvch0qsaram22d44k617bqhr9rrf8qc86sf20yvdyy3gi5j12";
           name = "evil-indent-plus";
         };
@@ -16706,7 +17031,7 @@
           sha256 = "0nghisnc49ivh56mddfdlcbqv3y2vqzjvkpgwv3zp80ga6ghvdmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-indent-textobject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-indent-textobject";
           sha256 = "172a3krid5lrx1w9xcifkhjnvlxg1nbz4w102d99d0grr9465r09";
           name = "evil-indent-textobject";
         };
@@ -16719,15 +17044,15 @@
     evil-jumper = callPackage ({ cl-lib ? null, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-jumper";
-        version = "20160119.1809";
+        version = "20160214.1515";
         src = fetchFromGitHub {
           owner = "bling";
           repo = "evil-jumper";
-          rev = "f18fbae5c971211bec6bd56cccf7196ede798bf7";
-          sha256 = "1p9r7dqhp2bnsgj18fpmf7wamndgmgkw1c5lrnx3hngwnfkw2fgh";
+          rev = "3fdbf356b8d86bfcdbd32a476420bec9da370596";
+          sha256 = "1bcravq8z2bj9dvfhmmv82vxx2lfhc1pqb4kq5b1nfvajjy1g8pn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-jumper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-jumper";
           sha256 = "0zwsk7slzvcgvgh8fjrwangylishrwc1w0glxcr71sybxph2g46x";
           name = "evil-jumper";
         };
@@ -16748,7 +17073,7 @@
           sha256 = "10xrlimsxk09z9cw6rxdz8qvvn1i0vhc1gdicwxri0j10p0hacl3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-leader";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-leader";
           sha256 = "154s2nb170hzksmc87wnzlwg3ic3w3ravgsfvwkyfi2q285vmra6";
           name = "evil-leader";
         };
@@ -16769,7 +17094,7 @@
           sha256 = "0lvjqs40caxj3781cs41qavk10vlz2mjw0r6fmxa2z3c087cxnxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-lisp-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-lisp-state";
           sha256 = "117irac05fs73n7sgja3zd7yh4nz9h0gw5b1b57lfkav6y3ndgcy";
           name = "evil-lisp-state";
         };
@@ -16782,15 +17107,15 @@
     evil-magit = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "evil-magit";
-        version = "20160203.1803";
+        version = "20160211.709";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "evil-magit";
-          rev = "6bccbe90390436fd814d55e9ba4408e0454c99cd";
-          sha256 = "0mih5s2kk6pas1w1i62ghsi3jdx5qm0b7yqbc924rz2zp6za3p0m";
+          rev = "593a0e5b3118aca28de672870fa7b8611f6760ef";
+          sha256 = "0dqhxl9df9d6s9rx5dvgzf0i88y0y2jq3vzr2v2q8vh3ffvj2s2g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-magit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-magit";
           sha256 = "10mhq6mzpklk5sj28lvd478dv9k84s81ax5jkwwxj26mqdw1ybg6";
           name = "evil-magit";
         };
@@ -16811,7 +17136,7 @@
           sha256 = "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-mark-replace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-mark-replace";
           sha256 = "03cq43vlv1b53w4kw7mjvk026i8rzhhryfb27ddn6ipgc6xh68a0";
           name = "evil-mark-replace";
         };
@@ -16832,7 +17157,7 @@
           sha256 = "0kf4m1ghpxfalqx2zwm1d8xav4d6l6bpk79g5cvssk5jz5913fbi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-matchit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-matchit";
           sha256 = "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq";
           name = "evil-matchit";
         };
@@ -16845,15 +17170,15 @@
     evil-mc = callPackage ({ cl-lib ? null, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-mc";
-        version = "20160202.1527";
+        version = "20160205.1942";
         src = fetchFromGitHub {
           owner = "gabesoft";
           repo = "evil-mc";
-          rev = "d06bb3f47411e5f210ac986abc04a60d15808f68";
-          sha256 = "12af93aba20m9h8dgz6bxhm63khrlx0iclnwflkdy4s5w229938q";
+          rev = "97c81605a627fec0eaa32466615b8c2f4b3feb17";
+          sha256 = "1i9m827ffwqphkw2b5nmj11y7c5jn5dc8ds6k0dpdiq5whjklplh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-mc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-mc";
           sha256 = "0cq4xg6svb5gz4ra607wy768as2igla4h1xcrfnxldknk476fqqs";
           name = "evil-mc";
         };
@@ -16863,18 +17188,39 @@
           license = lib.licenses.free;
         };
       }) {};
+    evil-mu4e = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "evil-mu4e";
+        version = "20160214.522";
+        src = fetchFromGitHub {
+          owner = "JorisE";
+          repo = "evil-mu4e";
+          rev = "e52ffae4c19385575f4dbd2b7af3d0a0221b4efa";
+          sha256 = "0zqmmv3if9zzq9fgjg8wj62pk1qn65nax9hsk9m7lx2ncdv8cph1";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-mu4e";
+          sha256 = "1ks4vnga7dkz27a7gza5hakzbcsiqgkq1ysc0lcx7g82ihpmrrcq";
+          name = "evil-mu4e";
+        };
+        packageRequires = [ dash emacs evil ];
+        meta = {
+          homepage = "http://melpa.org/#/evil-mu4e";
+          license = lib.licenses.free;
+        };
+      }) {};
     evil-nerd-commenter = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-nerd-commenter";
-        version = "20160111.444";
+        version = "20160209.249";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "evil-nerd-commenter";
-          rev = "981c80bb53384f93987d03c1b307767f2a68791a";
-          sha256 = "16wn74690572n3xpxvnvka524fzswxxni3dy98bwpvsqj6yx2ds5";
+          rev = "d61c6629b44b8eb15378b2b75addcd5011b752d9";
+          sha256 = "0msk65smj05wgs8dr42wy0w265pgcffrpgbvclahxhyj9ypscwsb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-nerd-commenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-nerd-commenter";
           sha256 = "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d";
           name = "evil-nerd-commenter";
         };
@@ -16895,7 +17241,7 @@
           sha256 = "1aq95hj8x13py0pwsnc6wvd8cc5yv5qin8ym9js42y5966vwj4np";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-numbers";
           sha256 = "1lpmkklwjdf7ayhv99g9zh3l9hzrwm0hr0ijvbc7yz3n398zn1b2";
           name = "evil-numbers";
         };
@@ -16916,7 +17262,7 @@
           sha256 = "0pir7a3xxbcp5f3q9pi36rpdpi8pbx18afmh0r3501ynssyjfq53";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-org";
           sha256 = "18w07fbafry3wb87f55kd8y0yra3s18a52f3m5kkdlcz5zwagi1c";
           name = "evil-org";
         };
@@ -16937,7 +17283,7 @@
           sha256 = "0b08y4spapl4g2292j3l4cr84gjlvm3rpma3gqld4yb1sxd7v78p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-paredit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-paredit";
           sha256 = "0xvxxa3gjgsrv10a61y0591bn3gj8v1ff2wck8s0svwfl076gyfy";
           name = "evil-paredit";
         };
@@ -16958,7 +17304,7 @@
           sha256 = "1ja9ggj70wf0nmma4xnc1zdzg2crq9h1cv3cj7cgwjmllflgkfq7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-quickscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-quickscope";
           sha256 = "0xym1mh4p68i00l1lshywf5fdg1vw3szxp3fk9fwfcg04z6vd489";
           name = "evil-quickscope";
         };
@@ -16979,7 +17325,7 @@
           sha256 = "12rdx5zjp5pck008cykpw200rr1y0b3lj2dpzf82llfyfaxzh7wi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-rails";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-rails";
           sha256 = "0ah0nvzl30z19566kacyrsznsdm3cpij8n3bw3dfng7263rh60gj";
           name = "evil-rails";
         };
@@ -16992,15 +17338,15 @@
     evil-rsi = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-rsi";
-        version = "20151027.1719";
+        version = "20160221.1504";
         src = fetchFromGitHub {
           owner = "linktohack";
           repo = "evil-rsi";
-          rev = "efba0e191a71198bff118d29c0766ee2b351377a";
-          sha256 = "176rdp7mp9p0w5s7539jgldfn3r79q653g8yzcp99y59b8dycbh5";
+          rev = "236bf6ed1e2285698db808463e5f2f69f5f5e7c0";
+          sha256 = "1xz629qv1ss1fap397k48piawcwl8lrybraq5449bw1vvn1a4d9f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-rsi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-rsi";
           sha256 = "0mc39n72420n36kwyf9zpw1pgyih0aigfnmkbywb0yxgj7myc345";
           name = "evil-rsi";
         };
@@ -17021,7 +17367,7 @@
           sha256 = "1jfi2k9dm0cc9bx8klppm965ydhdw17a2n664199vhxrap6g27yk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-search-highlight-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-search-highlight-persist";
           sha256 = "0iia136js364iygi1mydyzwvizhic6w5z9pbwmhva4654pq8dzqy";
           name = "evil-search-highlight-persist";
         };
@@ -17042,7 +17388,7 @@
           sha256 = "0xwrg03w40pncdy5ppn7f77ravcbimj1ylc1r4clpqiha1d4xkhi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-smartparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-smartparens";
           sha256 = "1viwrd6gfqmwhlil80pk68dikn3cjf9ddsy0z781z3qfx0j35qza";
           name = "evil-smartparens";
         };
@@ -17063,7 +17409,7 @@
           sha256 = "0iyk8pn7pc3js3ppn46myzfr2i0b47wwrzv72939aydpw64rx76q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-snipe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-snipe";
           sha256 = "0gcmpjw3iw7rjk86b2k6clfigp48vakfjd1a9n8qramhnc85rgkn";
           name = "evil-snipe";
         };
@@ -17084,7 +17430,7 @@
           sha256 = "1x4nphjq8lvg8qsm1pj04mk9n59xc6jlxiv5s3bih1nl4xkssrxy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-space";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-space";
           sha256 = "1asvh873r1xgffvz3nr653yn8h5ifaphnafp6wf1b1mja6as7f23";
           name = "evil-space";
         };
@@ -17105,7 +17451,7 @@
           sha256 = "01p02h17ls0pmisnfbyna7xf6fz2c7fyyvdb1yq38dwv2j4zi1b4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-surround";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-surround";
           sha256 = "1bcjxw0yrk2bqj5ihl5r2c4id0m9wbnj7fpd0wwmw9444xvwp8ag";
           name = "evil-surround";
         };
@@ -17118,15 +17464,15 @@
     evil-tabs = callPackage ({ elscreen, evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-tabs";
-        version = "20150127.1546";
+        version = "20160217.920";
         src = fetchFromGitHub {
           owner = "krisajenkins";
           repo = "evil-tabs";
-          rev = "93eba393e86ea4574aebaf4edbd27dce4fd7b2e6";
-          sha256 = "1rjpgcl9m23fzlw9gfp0yyf5k5dcgn88pjm8glmmdpx1b08ymk79";
+          rev = "53d3314a810017b6056ab6796aef671f5ea1c063";
+          sha256 = "1qklx0j3fz3mp87v64yqbyyq5csfymbjfwvy2s4nk634wbnrra93";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-tabs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-tabs";
           sha256 = "0qgvpv5hcai8wmkv2fp6i2vdy7qp4gwidwpzz8j6vl9519x73s62";
           name = "evil-tabs";
         };
@@ -17147,7 +17493,7 @@
           sha256 = "10aic2r1akk38hh761hr5vp9fjlh1m5nimag0nzdq5x9g9467cc8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-terminal-cursor-changer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-terminal-cursor-changer";
           sha256 = "1300ch6f8mkz45na1hdffglhw0cdrrxmwnbd3g4m3sl5z4midian";
           name = "evil-terminal-cursor-changer";
         };
@@ -17168,7 +17514,7 @@
           sha256 = "1v4z2snllgg32cy8glv7xl0m9ib7rwi5ixgdydz1d0sx0z62jyhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-textobj-anyblock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-textobj-anyblock";
           sha256 = "03vk30s2wkcszcjxmh5ww39rihnag9cp678wdzq4bnqy0c6rnjwa";
           name = "evil-textobj-anyblock";
         };
@@ -17189,7 +17535,7 @@
           sha256 = "0nff90v6d97n2xizvfz126ksrf7ngd5rp0j7k7lhbv0v5zcqgxiv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-textobj-column";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-textobj-column";
           sha256 = "13q3nawx05rn3k6kzq1889vxjznr454cib96pc9lmrq7h65lym2h";
           name = "evil-textobj-column";
         };
@@ -17210,7 +17556,7 @@
           sha256 = "00yfq8aflxvp2nnz7smgq0c5wlb7cips5irj8qs6193ixlkpffvx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-tutor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-tutor";
           sha256 = "1hvc2w5ykrgh62n4sxqqqcdk5sd7nmh6xzv4mir5vf9y2dgqcvsn";
           name = "evil-tutor";
         };
@@ -17231,7 +17577,7 @@
           sha256 = "0m4ipz3x5k3gbyjgsnhl6rr4jvhqn61cyc1gmv0mkc2pbqqs1ijq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-vimish-fold";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-vimish-fold";
           sha256 = "01wp4h97hjyzbpd7iighjj26m79499wp5pn8m4pa7v59f6r3sdk6";
           name = "evil-vimish-fold";
         };
@@ -17252,7 +17598,7 @@
           sha256 = "07cmql8zsqz1qchq2mp3qybbay499dk1yglisig6jfddcmrbbggz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-visual-mark-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-visual-mark-mode";
           sha256 = "1qgr2dfhfz6imnlznicl7lplajd1s8wny7mlxs1bkms3xjcjfi48";
           name = "evil-visual-mark-mode";
         };
@@ -17273,7 +17619,7 @@
           sha256 = "11y2jrwbsw4fcx77zkhj1cn2hl1zcdqy00bv3mpbcrs03jywssrk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-visualstar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-visualstar";
           sha256 = "135l9hjfbpn0a6p53picnpydi9qs5vrk2rfn64gxa5ag2apcyycy";
           name = "evil-visualstar";
         };
@@ -17294,7 +17640,7 @@
           sha256 = "0739v0m9vj70a55z0canslyqgafzys815i7a0r6bxj2f9iwq6rhb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evm";
           sha256 = "19l6cs5schbnph0pwhhj66gkxsswd4bmjpy79l9kxzpjf107wc03";
           name = "evm";
         };
@@ -17315,7 +17661,7 @@
           sha256 = "1frhcgkiys0pqrlcsi5zcl3ngblr38wrwfi6wzqk75x21rnwnbqv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ewmctrl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ewmctrl";
           sha256 = "1w60pb7szai1kh06jd3qvgpzq3z1ci4a77ysnpqjfk326s6zv7hl";
           name = "ewmctrl";
         };
@@ -17336,7 +17682,7 @@
           sha256 = "1i6zf17rwa390c33cbspz81dz86vwlphyhjjsia4gp205nfk3s20";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eww-lnum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eww-lnum";
           sha256 = "1y745z4wa90snizq2g0amdwwgjafd6hkrayn93ca50f1wghdbk79";
           name = "eww-lnum";
         };
@@ -17357,7 +17703,7 @@
           sha256 = "0xxk0cr28g7vw8cwsnwrdrc8xqr50g6m9h0v43mx2iws9pn9dd47";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/exec-path-from-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/exec-path-from-shell";
           sha256 = "1j6f52qs1m43878ikl6nplgb72pdbxfznkfn66wyzcfiz2hrvvm9";
           name = "exec-path-from-shell";
         };
@@ -17378,7 +17724,7 @@
           sha256 = "0wz4h5hrr5ci0w8pynd2nr1b2zl5hl4pa8gc16mcabik5927rf7z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/expand-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/expand-line";
           sha256 = "07nfgp6jlrb9wxqy835j79i4g88714zndidkda84z16qn2y901a9";
           name = "expand-line";
         };
@@ -17399,7 +17745,7 @@
           sha256 = "0qqqv0pp25xg1zh72i6fsb7l9vi14nd96rx0qdj1f3pdwfidqms1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/expand-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/expand-region";
           sha256 = "1c7f1nqsqdc75h22fxxnyg0m4yxj6l23sirk3c71fqj14paxqnwg";
           name = "expand-region";
         };
@@ -17420,7 +17766,7 @@
           sha256 = "0ah8zayipwp760909llb9whcdvmbsdgkg0x5y4qlcicm1r9kwcc7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/express";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/express";
           sha256 = "0lhisy4ds96bwpc7k8w9ws1zi1qh0d36nhxsp36bqzfi09ig0nb9";
           name = "express";
         };
@@ -17433,15 +17779,15 @@
     extempore-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "extempore-mode";
-        version = "20151225.51";
+        version = "20160218.2301";
         src = fetchFromGitHub {
           owner = "extemporelang";
           repo = "extempore-emacs-mode";
-          rev = "a08be9f0cec32c2818f93a6f7633c14fc2013e61";
-          sha256 = "0nry653cd3qzsj6asrf9hh4zkzhz8nnwjrg1wp17f5ggzpjyybjw";
+          rev = "7ef138c18abbe78fafdc7da71f73e323be88ac5a";
+          sha256 = "0vpxrwaghzffj3rhsvmia4ykj8z059gjxws5vkgjjffh35d72ask";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/extempore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/extempore-mode";
           sha256 = "1z8nzpcj27s74kxfjz7wyr3848jpd6mbyjkssd06ri5p694j9php";
           name = "extempore-mode";
         };
@@ -17462,7 +17808,7 @@
           sha256 = "15dwl1rb3186k328a83dz9xmslc0px60ah16fifvmr3migis9hwz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/extend-dnd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/extend-dnd";
           sha256 = "0rknpvp8yw051pg3blvmjpp3c9a82jw7f10mq67ggbz98w227417";
           name = "extend-dnd";
         };
@@ -17483,7 +17829,7 @@
           sha256 = "0w2g7rpw26j65j4r23w6j8nw3arw73l601kyy6qv9p9bkk1yc072";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eyebrowse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eyebrowse";
           sha256 = "09fkzm8z8nkr4s9fbmfcjc80h50051f48v6n14l76xicglr5p861";
           name = "eyebrowse";
         };
@@ -17502,7 +17848,7 @@
           sha256 = "1fg3j0jlww2rqc6k2nq95hcg6i26nqdp043h7kyjcwrgqbjfsigl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eyedropper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eyedropper";
           sha256 = "07kdn90vm2nbdprw9hwdgi4py6gqzmrad09y1fwqdy49hrvbwdzk";
           name = "eyedropper";
         };
@@ -17523,7 +17869,7 @@
           sha256 = "1rgzydxv7c455vj1jm44vvs6xc4qgivqqb0g6zh5x4wdcpgdi2g9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eyuml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eyuml";
           sha256 = "0ada2gcl8bw9nn0fz8g9lbqy8a8w1554q03fzd7lv8qla33ri3wx";
           name = "eyuml";
         };
@@ -17544,7 +17890,7 @@
           sha256 = "15qa09x206s7rxmk35rslqniydh6hdb3n2kbspm5zrndcmsqz4zi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ez-query-replace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ez-query-replace";
           sha256 = "1h9ijr1qagwp9vvikh7ajby0dqgfypjgc45s7d93zb9jrg2n5cgx";
           name = "ez-query-replace";
         };
@@ -17565,7 +17911,7 @@
           sha256 = "0lzqfr5xgc3qvpbs6vf63yiw7pc2mybfvsrhczf9ghlmlawqa6k1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/f";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/f";
           sha256 = "0s7fqav0dc9g4y5kqjjyqjs90gi34cahaxyx2s0kf9fwcgn23ja2";
           name = "f";
         };
@@ -17586,7 +17932,7 @@
           sha256 = "0crhkdbxz1ldbrvppi95g005ni5zg99z1271rkrnk5i6cvc4hlq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fabric";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fabric";
           sha256 = "1mkblsakdhvi10b67bv3j0jsf7hr8lf9sibmprvx8smqsih7l88m";
           name = "fabric";
         };
@@ -17604,7 +17950,7 @@
           sha256 = "0yr3fqpn9pj6y8bsb6g7hkg75sl703pzngn8gp0sgs3v90c180l5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/face-remap+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/face-remap+";
           sha256 = "0vq6xjrv3qic89pxzi6mx1s08k4ba27g8wqm1ap4fxh3l14wkg0y";
           name = "face-remap-plus";
         };
@@ -17622,7 +17968,7 @@
           sha256 = "1kayc4hsalvqnn577y3f97w9kz94c53vcxwx01s0k34ffav919c2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/facemenu+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/facemenu+";
           sha256 = "0lbggalgkj59wj67z95949jmppmqrzrp63mdhw42r2x0fz1ir0iv";
           name = "facemenu-plus";
         };
@@ -17640,7 +17986,7 @@
           sha256 = "0sqrymmr583cgqmv4bs6rjms5ij5cm8vvxjrfc9alacwyz5f7w8m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/faces+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/faces+";
           sha256 = "0k3m434f3d3061pvir0dnykmv6r9jswl7pzybzja3afiy591hh92";
           name = "faces-plus";
         };
@@ -17661,7 +18007,7 @@
           sha256 = "0sjmjydapfnv979dx8dwiz67wffamiaf41s4skkwa0wn2h4p6wja";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/faceup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/faceup";
           sha256 = "0l41xp38iji55dv20lk7r187ywcz8s1g2jmwbjwkspzmcf763xvx";
           name = "faceup";
         };
@@ -17682,7 +18028,7 @@
           sha256 = "19zm9my7fl1r3q48axjv2f8x9hcjk6qah4y4r92b90bzfmcdc30y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/factlog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/factlog";
           sha256 = "163482vfpa52b5ya5xps4qnclbaql1x0q54gqdwwmm04as8qbfz7";
           name = "factlog";
         };
@@ -17703,7 +18049,7 @@
           sha256 = "1sc5f867h7i0n2gd9qcydqn1b2pk227l92ad4bf9nnpl3jmdr26v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/faff-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/faff-theme";
           sha256 = "1dmwbkp94zsddy0brs3mkdjr09n69maw2mrdfhriqcdk56qpwp4g";
           name = "faff-theme";
         };
@@ -17724,7 +18070,7 @@
           sha256 = "11fm0h9rily5731s137mgv8rdbfqi99s6f36bgr0arwbq3f2j3fs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fakespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fakespace";
           sha256 = "09dsmrqax4wfcw8fd5jf07bjxm5dizpc2qvjkqwg74j2n352wv27";
           name = "fakespace";
         };
@@ -17745,7 +18091,7 @@
           sha256 = "1w5apzbzr1jd983b0rzsy9ldb0z0zcq6mpyb5r8czl5wd4vvj69h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fakir";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fakir";
           sha256 = "07bicglgpm6qkcsxwj6rswhx4hgh27rfg8s1cki7g8qcvk2f7b25";
           name = "fakir";
         };
@@ -17766,7 +18112,7 @@
           sha256 = "0m7rjzl9js2gjfcaqp2n5pn5ykpqnv8qfv35l5m5kpfigsi9cbb0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fancy-battery";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fancy-battery";
           sha256 = "03rkfdkrzyal9abdiv8c73w10sm974hxf3xg5015hibfi6kzg8ii";
           name = "fancy-battery";
         };
@@ -17787,7 +18133,7 @@
           sha256 = "0825hyz8b2biil0pd2bgjxqd2zm3gw9si7br5hnh51qasbaw9hid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fancy-narrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fancy-narrow";
           sha256 = "15i86jz6rdpva1az7gqp1wbm8kispcfc8h6v9fqsbag9sbzvgcyv";
           name = "fancy-narrow";
         };
@@ -17808,7 +18154,7 @@
           sha256 = "08lgfa2k42qpcs4999b77ycsg76zb56qbcxbsvmg0pcwjwa1ambz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/farmhouse-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/farmhouse-theme";
           sha256 = "0hbqdrw6x25b331qhbg3yaaa45c2b896wknsjm0a1kg142klq229";
           name = "farmhouse-theme";
         };
@@ -17829,7 +18175,7 @@
           sha256 = "0m2qn3rd16s7ahyw6f9a4jb73sdc8bqp6d03p450yzcn36lw78z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fasd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fasd";
           sha256 = "0i49z50bpi7fx0dm5jywlndnq9hb0dm5a906k4017w8y7sfpfl6c";
           name = "fasd";
         };
@@ -17850,7 +18196,7 @@
           sha256 = "0y95lrdqd9i2kbb266s1wdiim4m8vrn3br19d8s55ib6xlywf8cx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fastnav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fastnav";
           sha256 = "08hg256w8k9f5nzgpyl1jykbf28vmvv09kkhzs0s2zhwbl2158a5";
           name = "fastnav";
         };
@@ -17871,7 +18217,7 @@
           sha256 = "0m9nzl0z3gc6fjpfqklwrsxlcgbbyydls004a39wfppyz0wr94fy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/faust-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/faust-mode";
           sha256 = "1lfn4q1wcc3vzazv2yzcnpvnmq6bqcczq8lpkz7w8yj8i5kpjvsc";
           name = "faust-mode";
         };
@@ -17884,15 +18230,15 @@
     fcitx = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fcitx";
-        version = "20160202.1609";
+        version = "20160209.2240";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "fcitx.el";
-          rev = "7a7a07c6cebb0f765a28d27de042c8088969a789";
-          sha256 = "0ybxm656j4p3j47cgh3xm4wln6rai16s8ag55dbsznxdn158c3ss";
+          rev = "f0a6d309de52893331c002fdc69b937abe9a4831";
+          sha256 = "0xknl32hglmkj85h69cpwqpar589ylfzr3mxx730fy2gkaqzd2nf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fcitx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fcitx";
           sha256 = "0a8wd588c26p3czfp5hn2n46f2vwyg5v301sv0y07b55b1i3ynmx";
           name = "fcitx";
         };
@@ -17913,7 +18259,7 @@
           sha256 = "0c56j8ip2fyma9yvwaanz89jyzgi9k11xwwkflzlzc4smnvgfibr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fcopy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fcopy";
           sha256 = "13337ymf8vlbk8c4jpj6paqi06xdmk39yf72s40kmfrbvgmi8qy1";
           name = "fcopy";
         };
@@ -17934,7 +18280,7 @@
           sha256 = "0ylm4zcf82f5rl4lps5p6p8dc3i5p2v7w93caadgzv5qbl400h5d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/feature-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/feature-mode";
           sha256 = "0ryinmpqb3c91qcna6gbijcmqv3skxdc947dlr5s1w623z9nxgqg";
           name = "feature-mode";
         };
@@ -17955,7 +18301,7 @@
           sha256 = "0pjw9fb3n08yd38680ifdn2wlnw2k6q97lzhqb2259mywsycyqy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fetch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fetch";
           sha256 = "1jqc6pspgcrdzm7ij46r1q6vpjq7il5dy2xyxwn2c1ky5a80paby";
           name = "fetch";
         };
@@ -17973,7 +18319,7 @@
           sha256 = "110h0ff7bkwx7icph0j997hq53zpyz426dji4vs89zf75cf1nl7s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fic-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fic-mode";
           sha256 = "037f2jr8bs2sfxw28cal2d49bsbrg0zkz2xdham627l04qnkgv8x";
           name = "fic-mode";
         };
@@ -17985,14 +18331,14 @@
       }) {};
     figlet = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "figlet";
-        version = "20141104.1037";
+        version = "20160218.1637";
         src = fetchhg {
           url = "https://bitbucket.com/jpkotta/figlet";
-          rev = "255e7570a3e2";
-          sha256 = "0xnr709vmwbryyfxngxs80gjfxv009ik6wcs4jd74ph5lm6gqh4f";
+          rev = "70ca269d706e";
+          sha256 = "1c18b1h154sdxkksqwk8snyk8n43bwzgavi75l8mnz8dnl1ciaxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/figlet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/figlet";
           sha256 = "1m7hw56awdbvgzdnjysb3wqkhkjqy68jxsxh9f7fx266wjqhp6yj";
           name = "figlet";
         };
@@ -18010,7 +18356,7 @@
           sha256 = "0s79b5jj3jfl3aih6r3fa0zix40arysk6mz4fijapd8ybaflz25n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/files+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/files+";
           sha256 = "1m1pxf6knrnyc9ygmyr27gm709ydxf0kkh1xrfcza6n476frmwr8";
           name = "files-plus";
         };
@@ -18028,7 +18374,7 @@
           sha256 = "020rpjrjp2gh4w6mrphrvk27kdizfqbjsw2sxraf8jz0dibg9gfg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/filesets+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/filesets+";
           sha256 = "06n8pw8c65bmrkxda2akvv57ndfijgbp95l40j7sjg8bjp385spn";
           name = "filesets-plus";
         };
@@ -18049,7 +18395,7 @@
           sha256 = "0gbqspqn4y7f2fwqq8210b6k5q22c0zr7b4ws8qgz9swav8g3vrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fill-column-indicator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fill-column-indicator";
           sha256 = "0w8cmijv7ihij9yyncz6lixb6awzzl7n9qpjj2bks1d5rx46blma";
           name = "fill-column-indicator";
         };
@@ -18070,7 +18416,7 @@
           sha256 = "1x9wmxbcmd6qgdyzrl978nczfqrgyk6xz3rnh5hffbapy1v1rw47";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fillcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fillcode";
           sha256 = "0bfsw55vjhx88jpy6npnzfwinvggivbvkk7fa3iwzq19005fkag2";
           name = "fillcode";
         };
@@ -18091,7 +18437,7 @@
           sha256 = "0f76cgh97z0rbbg2bp217nqmxfimzkvw85k9mx8bj78i9s2cdmwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/finalize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/finalize";
           sha256 = "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq";
           name = "finalize";
         };
@@ -18112,7 +18458,7 @@
           sha256 = "18a4ydp30ycx5w80j3xgghclzmzbvrkl2awxixy4aj68nmljk480";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-by-pinyin-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/find-by-pinyin-dired";
           sha256 = "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq";
           name = "find-by-pinyin-dired";
         };
@@ -18130,7 +18476,7 @@
           sha256 = "1pch1kjbgnbf8zmlxh6wg4ch9bpfg7hmwkw1mrr1hiym05xvza0m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-dired+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/find-dired+";
           sha256 = "06a6lwx61xindlchh3ps8khhxc6sr7i9d7i60rjw1h07nxmh0fli";
           name = "find-dired-plus";
         };
@@ -18151,7 +18497,7 @@
           sha256 = "0bf32nhpmjvvgnr6g9xqh8pqnhr3dl24y3g40lsv4pc8ffs70ydm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-file-in-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/find-file-in-project";
           sha256 = "0aznnv82xhnilc9j4cdmcgh6ksv7bhjjm3pa76hynnyrfn7kq7wy";
           name = "find-file-in-project";
         };
@@ -18172,7 +18518,7 @@
           sha256 = "090m5647dpc8r8fwi3mszvc8kp0420ma5sv0lmqr2fpxyn9ybkjh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-file-in-repository";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/find-file-in-repository";
           sha256 = "0q1ym06w2yn3nzpj018dj6h68f7rmkxczyl061mirjp8z9c6a9q6";
           name = "find-file-in-repository";
         };
@@ -18193,7 +18539,7 @@
           sha256 = "1d6zn3qsg4lpk13cvn5r1w88dnhfydnhwf59x6cb4sy5q1ihk0g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-temp-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/find-temp-file";
           sha256 = "0c98zm94958rb9kdvqr3pad744nh63y3vy3lshfm0lsg85k9j62p";
           name = "find-temp-file";
         };
@@ -18214,7 +18560,7 @@
           sha256 = "1r6cs7p43pi6n2inbrv9q924m679izxwxqgyr4sjjj3lg6an4cnx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-things-fast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/find-things-fast";
           sha256 = "1fs3wf61lzm1hxh5sx8pr74g7g9np3npdwg7xmk81b5f2jx2vy6m";
           name = "find-things-fast";
         };
@@ -18232,7 +18578,7 @@
           sha256 = "0x3f9qygp26c4yw32cgyy35bb4f1fq0fg7q8s9vs777skyl3rvp4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/finder+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/finder+";
           sha256 = "1ichxghp2vzx01n129fmjm6iwx4b98ay3xk1ja1i8vzyd2p0z8vh";
           name = "finder-plus";
         };
@@ -18250,7 +18596,7 @@
           sha256 = "0a04mgya59w468jv2bmkqlayzgh0r8sdz0qg3n70wn9rhdcwnl9q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/findr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/findr";
           sha256 = "0pxyfnn3f70gknxv09mfkjixqkzn77rdbql703wsslrj2v1l7bfq";
           name = "findr";
         };
@@ -18271,7 +18617,7 @@
           sha256 = "1vjgcxyzv2p74igr3y0z6hk7bj6yqwjawx90xvvmp9z7m91d4yrg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fingers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fingers";
           sha256 = "1r8fy6q6isjxz9mvaa8in4imdghzla3gg1l93dfm1v2rlr7bhzbg";
           name = "fingers";
         };
@@ -18292,7 +18638,7 @@
           sha256 = "14yy7kr2iv549xaf5gkav48lk2hzmvipwbs0rzljzw60il6k05hk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fiplr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fiplr";
           sha256 = "0l68rl5cy2maynny6iq6c4qr6c99y44i0i1z613k9rk08z7h0k5i";
           name = "fiplr";
         };
@@ -18313,7 +18659,7 @@
           sha256 = "02ajday0lnk37dnzf4747ha3w0azisq35fmdhq322hx0hfb1c66x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/firebelly-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/firebelly-theme";
           sha256 = "0lns846l70wcrzqb6p5cy5hpd0szh4gvjxd4xq4zsb0z5nfz97jr";
           name = "firebelly-theme";
         };
@@ -18334,7 +18680,7 @@
           sha256 = "0v8liv6aq10f8dxbl3d4rph1qk891dlxm9wqdc6w8aj318750hfm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/firecode-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/firecode-theme";
           sha256 = "10lxd93lkrvz8884dv4sh6fzzg355j7ab4p5dpvwry79rhs7f739";
           name = "firecode-theme";
         };
@@ -18355,7 +18701,7 @@
           sha256 = "1hr4mfvaz8rc60fn5xi7sp1xn72rk2fg346di3mmcfnb9na9cbzq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/firefox-controller";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/firefox-controller";
           sha256 = "03y96b3l75w9al8ylijnlb8pcfkwddyfnh8xwig1b6k08zxfgal6";
           name = "firefox-controller";
         };
@@ -18376,7 +18722,7 @@
           sha256 = "1smg4mqc5qdwzk5mp2hfm6l4s7k408x46xfl7fl45csb18islmrp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fireplace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fireplace";
           sha256 = "1apcypznq23fc7xgy4xy1c5hvfvjx1xhyq3aaq1lf59v99zchciw";
           name = "fireplace";
         };
@@ -18397,7 +18743,7 @@
           sha256 = "0s8rml5xbskvnjpi8qp7vqflxhh5yis6zr6ay2bxmd2chjlhli55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/firestarter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/firestarter";
           sha256 = "1cpx664hyrdnpb1jps1x6lm7idwlfjblkfygj48cjz9pzd6ld5mp";
           name = "firestarter";
         };
@@ -18418,7 +18764,7 @@
           sha256 = "17djaz79spms9il71m4xdfjhm58dzswb6fpncngkgx8kxvcy9y24";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fish-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fish-mode";
           sha256 = "0l6k06bs0qdhj3h8vf5fv8c3rbhiqfwszrpb0v2cgnb6xhwzmq14";
           name = "fish-mode";
         };
@@ -18436,7 +18782,7 @@
           sha256 = "082c6yyb1269va6k602hxpdf7ylfxz8gq8swqzwf07qaas0b5qxd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fit-frame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fit-frame";
           sha256 = "1xcq4n9gj0npjjl98vqacms0a0wnzw62a9iplyf7bgj7n77pgkjb";
           name = "fit-frame";
         };
@@ -18457,7 +18803,7 @@
           sha256 = "16rd23ygh76fs4i7rni94k8gwa9n360h40qmhm65snp31kqnpr1p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fix-input";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fix-input";
           sha256 = "03xpr7rlv0xq1d9126j1fk0c2j7ssf366n0yc8yzm9vq32n9pp4p";
           name = "fix-input";
         };
@@ -18478,7 +18824,7 @@
           sha256 = "17f11v9sd5fay3i4k6lmpsjicdw9j3zvx3fvhx0a86mp7ay2ywwf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fix-word";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fix-word";
           sha256 = "0a8w09cx8p5pkkd4533nd199axkhdhs2a7blp7syfn40bkscx6xc";
           name = "fix-word";
         };
@@ -18499,7 +18845,7 @@
           sha256 = "1x4k8890pzdcizzl0p6v96ylrx5xid9ykgrmggx0b3y0gx0vhwic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fixmee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fixmee";
           sha256 = "0wnp6h8f547fsi1lkk4ajny7g21dnr76qfhxl82n0l5h1ps4w8mp";
           name = "fixmee";
         };
@@ -18527,7 +18873,7 @@
           sha256 = "07hv6l80ka10qszm16fpan8sas4b0qvl5s6qixxlz02fm7m0s7m5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flappymacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flappymacs";
           sha256 = "0dcpl5n7wwsk62ddgfrkq5dkm91569y4i4f0yqa61pdmzhgllx7d";
           name = "flappymacs";
         };
@@ -18548,7 +18894,7 @@
           sha256 = "0z77lm6jv2w5z551pwarcx6xg9kx8fgms9dlskngfvnzbqkldj1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flash-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flash-region";
           sha256 = "1rgg7j34ka0nj1yjl688asim07bbz4aavh67kly6dzzwndr0nw8c";
           name = "flash-region";
         };
@@ -18569,7 +18915,7 @@
           sha256 = "0ib6r6q4wbkkxdwgqsd25nx7ccxhk16lqkvwikign80j9n11g7s1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flatland-black-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flatland-black-theme";
           sha256 = "0cl2qbry56nb4prbsczffx8h35x91pgicw5pld0ndw3pxid9h2da";
           name = "flatland-black-theme";
         };
@@ -18590,7 +18936,7 @@
           sha256 = "0cl8m1i1aaw4zmkrkhfchhp0gxhpvhcmpjglsisjni47y5mydypf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flatland-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flatland-theme";
           sha256 = "14drqwcp9nv269aqm34d426a7gx1a7kr9ygnqa2c8ia1fsizybl3";
           name = "flatland-theme";
         };
@@ -18611,7 +18957,7 @@
           sha256 = "0j8pklgd2sk01glgkr24b5n5521425vws8zwdi4sxcv74922j5zr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flatui-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flatui-theme";
           sha256 = "0s88xihw44ks4b07wcb9swr52f3l1ls0jn629mxvfkv4a6hn7rmz";
           name = "flatui-theme";
         };
@@ -18632,7 +18978,7 @@
           sha256 = "187ah7yhmr3ckw23bf4fivx8v79yj0zmilrkjj7k6l198w8wmvql";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flex-autopair";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flex-autopair";
           sha256 = "0hphrqwryp3c0wwyf2f16hj8nc7jlg2dkvljgm2rdvmh2kgj3007";
           name = "flex-autopair";
         };
@@ -18652,7 +18998,7 @@
           sha256 = "02z1w8z9fqdshyyf03c26zjwhmmclb02caw3b6nhhk4w1rkbh6is";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flex-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flex-isearch";
           sha256 = "1msgrimi2a0xm5h23p78jflh00bl5bx44xpc3sc9pspznjv1d0k3";
           name = "flex-isearch";
         };
@@ -18673,7 +19019,7 @@
           sha256 = "1w913kw4b3dipawn567847jxl89j0prnf6656yqi2rp96axx3lhp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flim";
           sha256 = "1gkaq549svflx8qyqrk0ccb52b7wp17wmd5jgzkw1109bpc4k6jc";
           name = "flim";
         };
@@ -18691,7 +19037,7 @@
           sha256 = "1viigj04kla20dk46xm913jzqrmx05rpjrpghnc0ylbqppqdwzpw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fliptext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fliptext";
           sha256 = "0cmyan9hckjsv5wk1mvjzif9nrc07frhzkhhl6pkgm0j0f1q30ji";
           name = "fliptext";
         };
@@ -18712,7 +19058,7 @@
           sha256 = "12b1b7avjdbfm184mcg3bh3s6k0ygfz1sraz8q7qnrsyw4170893";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/floobits";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/floobits";
           sha256 = "1jpk0q4mkf9ag1rqyai993nz5ngzfvxq9n9avmaaq59gkk9cjraf";
           name = "floobits";
         };
@@ -18733,7 +19079,7 @@
           sha256 = "10f9135i9z2y4k0x6fbwm0g6vhsj6ag41xq504zpygqzp6y6ikmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flx";
           sha256 = "04plfhrnw7jx2jaxhbhw4ypydfcb8v0x2m5hyacvrli1mca2iyf9";
           name = "flx";
         };
@@ -18754,7 +19100,7 @@
           sha256 = "10f9135i9z2y4k0x6fbwm0g6vhsj6ag41xq504zpygqzp6y6ikmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flx-ido";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flx-ido";
           sha256 = "00wcwbvfjbcx8kyap7rl1b6nsgqdwjzlpv6al2cdpdd19rm1vgdc";
           name = "flx-ido";
         };
@@ -18775,7 +19121,7 @@
           sha256 = "1cmjw1zrb1nq9nx0d634ajli1di8x48k6s88zi2s2q0mbi28lzz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flx-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flx-isearch";
           sha256 = "14cshv5xb57ch5g3m3hfhawnnabdnbacp4kx40d0pw6jxw677gqd";
           name = "flx-isearch";
         };
@@ -18788,15 +19134,15 @@
     flycheck = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, pkg-info, seq }:
     melpaBuild {
         pname = "flycheck";
-        version = "20160129.511";
+        version = "20160220.935";
         src = fetchFromGitHub {
           owner = "flycheck";
           repo = "flycheck";
-          rev = "89d57c2771967b64351a1bc489a053912f06b48d";
-          sha256 = "1h172zkvlz1bx1s82vknm6wz2hhwk8253fdhd6bqaa2f5biivw71";
+          rev = "12099e93422c75fb1a0d5b731543d469e19b5455";
+          sha256 = "1lhp53r7n7j4lv7gl9lnqpa6b9ip7xyy9rdm5gygqkp27pdjx39y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck";
           sha256 = "045k214dq8bmrai13da6gwdz97a2i998gggxqswqs4g52l1h6hvr";
           name = "flycheck";
         };
@@ -18817,7 +19163,7 @@
           sha256 = "0fh5z68gnggm0qjb8ncmfngv195lbp1dxz9jbmdi418d47mlba9c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-ats2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-ats2";
           sha256 = "0xm7zzz6hs5qnqkmv7hwxpvp3jjca57agx71sj0m12v0h53gbzhr";
           name = "flycheck-ats2";
         };
@@ -18838,7 +19184,7 @@
           sha256 = "0klnhq0zfn5zbkwl7y9kja7x49n1w6r1qbphk7a7v9svgm3h9s7n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-cask";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-cask";
           sha256 = "1lq559nyhkpnagncj68h84i3cq85vhdikr534kj018n2zcilsyw7";
           name = "flycheck-cask";
         };
@@ -18859,7 +19205,7 @@
           sha256 = "18nhfj0vx8rg2236nb9475s27rhyb34m81i7l6zkhifqba6rb0bb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-checkbashisms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-checkbashisms";
           sha256 = "1rq0ymlr1dl39v0sfyjmdv4pq3q9116cz9wvgpvfgalq8759q5sz";
           name = "flycheck-checkbashisms";
         };
@@ -18880,7 +19226,7 @@
           sha256 = "1ckzs32wzqpnw89rrw3l7i4gbyn25wagbadsc4mcrixml5nf0mck";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-clangcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-clangcheck";
           sha256 = "1316cj3ynl80j39ha0371ss7cqw5hcr3m8944pdacdzbmp2sak2m";
           name = "flycheck-clangcheck";
         };
@@ -18897,11 +19243,11 @@
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "squiggly-clojure";
-          rev = "98c6362a131c777e81624aaeb7eda9da5c7f6b5d";
-          sha256 = "0ndhhcfgpd5yg95jg64785mc9g6cgm1k7dwakzb3qlqnynbrjrcp";
+          rev = "d677cde2720fa1b9f66b551af28f006e09474ca7";
+          sha256 = "0flpma49m99i6pr0gx43ifhhgb222zsbqgcwyvfrpi90s9wny7mr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-clojure";
           sha256 = "1b20gcs6fvq9pm4nl2qwsf34sg6wxngdql921q2pyh5n1xsxhm28";
           name = "flycheck-clojure";
         };
@@ -18922,7 +19268,7 @@
           sha256 = "11xc08xld758xx9myqjsiqz8vk3gh4d9c4yswswvky6mrx34c0y5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-color-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-color-mode-line";
           sha256 = "0hw19nsh5h2l8qbp7brqmml2fhs8a0x850vlvq3qfd7z248gvhrq";
           name = "flycheck-color-mode-line";
         };
@@ -18943,7 +19289,7 @@
           sha256 = "073vkjgcyqp8frsi05s6x8ml3ar6hwjmn2c7ryfab5b35kp9gmdi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-css-colorguard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-css-colorguard";
           sha256 = "1n56j5nicac94jl7kp8fbqxmd115vbhzklzgfz5jbib2ab8y60jc";
           name = "flycheck-css-colorguard";
         };
@@ -18956,15 +19302,15 @@
     flycheck-cstyle = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-cstyle";
-        version = "20160126.2116";
+        version = "20160209.22";
         src = fetchFromGitHub {
           owner = "alexmurray";
           repo = "flycheck-cstyle";
-          rev = "50a8899c61083f6f5466a0b1b954fe3efdc2ecf2";
-          sha256 = "072868zy2624m8la0i291f8xmqlv4s1r683qw8l0s24vhi1d22fk";
+          rev = "7c4cc5ab4909a80ade184a0bd6a36fa9deff678c";
+          sha256 = "019h17p24cvsn1ny1fxlhwpjs3fz5gfar7dj0m2znjmx6qm72577";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-cstyle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-cstyle";
           sha256 = "0p3lzpcgwk4nkq1w0iq40njz8ll2h3vi9z5fbvv1ar4r80fqd909";
           name = "flycheck-cstyle";
         };
@@ -18985,7 +19331,7 @@
           sha256 = "0b4yq39c8m03pv5cgvvqcippc3yfphpgjw3bh2bnxch1pwfik3xm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-d-unittest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-d-unittest";
           sha256 = "0n4m4f0zqcx966582af1nqff5sla7jcr0wrmgzzxnn97yjrlnzk2";
           name = "flycheck-d-unittest";
         };
@@ -19006,7 +19352,7 @@
           sha256 = "1hw875dirz041vzw1pxjpk5lr1zmrp2kp9m6pazs9j19d686hyn6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-dedukti";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-dedukti";
           sha256 = "00nc18w4nsi6vicpbqqpr4xcdh48g95vnay3kirb2xp5hc2rw3x8";
           name = "flycheck-dedukti";
         };
@@ -19027,7 +19373,7 @@
           sha256 = "15dc76r047pnxll229z0pmpn76zw3cc6qs81b7wg7yc5czsk8axh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-dialyzer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-dialyzer";
           sha256 = "0bn81yzijmnfg5xcnvcvxvqxz995iaafhgbfckgcal974s229kd2";
           name = "flycheck-dialyzer";
         };
@@ -19048,7 +19394,7 @@
           sha256 = "0dqkd9h54qmr9cv2gmic010j2h03i80psajrv4wq3c4pvxyqyn2j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-dmd-dub";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-dmd-dub";
           sha256 = "0pg3sf7h6xqv65yqclhlb7fx1mp2w0m3qk4vji6m438kxy6fhzqm";
           name = "flycheck-dmd-dub";
         };
@@ -19069,7 +19415,7 @@
           sha256 = "08dlm3g2d8rl53hq0b4z7gp8529almlkyf69d3c8f9didmlhizk7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-elm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-elm";
           sha256 = "06dpv19wgbw48gbf701c77vw1dkpddx8056wpim3zbvwwfwk8ra4";
           name = "flycheck-elm";
         };
@@ -19090,7 +19436,7 @@
           sha256 = "0lk7da7axn9fm0kzlzx10ir014rsdsycffi8jcy4biqllw6yi4dx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-flow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-flow";
           sha256 = "0p4vvk09vjgk98dwzr2qzldvij3v6af56pradssi6sm3shbqhkk3";
           name = "flycheck-flow";
         };
@@ -19111,7 +19457,7 @@
           sha256 = "0q1m1f3vhw1wy0pa3njy55z28psznbw2xwmwk2v1p5c86n74ns8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-ghcmod";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-ghcmod";
           sha256 = "0mqxg622lqnkb52a0wff7h8b0k6mm1k7fhkfi95fi5sahclja0rp";
           name = "flycheck-ghcmod";
         };
@@ -19132,7 +19478,7 @@
           sha256 = "0j2mvf3zjznwkm8dykcgs1v5sz0i882mrivghxqr3h6n3ni4wag4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-gometalinter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-gometalinter";
           sha256 = "1bnvj5kwgbh0dv989rsjcvmcij1ahwcz0vpr6a8f2p6wwvksw1h2";
           name = "flycheck-gometalinter";
         };
@@ -19153,7 +19499,7 @@
           sha256 = "0fykawnq9ch1vj76rsimwbmn2xxdamsnvbj4ahqaqhq7adb2wyrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-google-cpplint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-google-cpplint";
           sha256 = "0llrvg6mhcsj5aascsndhbv99122zj32agxk1w6s8xn8ksk2i90b";
           name = "flycheck-google-cpplint";
         };
@@ -19174,7 +19520,7 @@
           sha256 = "01y3nv4h5zz4w2bydw7f2w98rbyhbyq80w5w5y5nal5w4vd76qb7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-haskell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-haskell";
           sha256 = "12lgirz3j6n5ns2ikq4n41z0d33qp1lb5lfz1q11qvpbpn9d0jn7";
           name = "flycheck-haskell";
         };
@@ -19195,7 +19541,7 @@
           sha256 = "1x61q0fqr1jbqs9kk59f565a02qjxh1gnp1aigys0yz6qnshvzbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-hdevtools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-hdevtools";
           sha256 = "0ahvai1q4x59ryiyccvqvjisgqbaiahx4gk8ssaxhblhj0sqga93";
           name = "flycheck-hdevtools";
         };
@@ -19216,7 +19562,7 @@
           sha256 = "1ax55yhf9q8i8z1f97zp3r08dqv8npd2llllbwa67d1bj49bsf2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-irony";
           sha256 = "0qk814m5s7mjba659llml0gy1g3045w8l1g73w2pnm1pbpqdfn3z";
           name = "flycheck-irony";
         };
@@ -19237,7 +19583,7 @@
           sha256 = "15cgqbl6n3nyqiizgs2zvcvfs6bcnjk3bj81lhhwrzizbjvap3rv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-ledger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-ledger";
           sha256 = "0807pd2km4r60wgd6jakscbx63ab22d9kvf1cml0ad8wynsap7jl";
           name = "flycheck-ledger";
         };
@@ -19258,7 +19604,7 @@
           sha256 = "0isqa6ybdd4166h3rdcg0b8pcxn00v8dav58xwfcj92nhzvs0qca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-mercury";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-mercury";
           sha256 = "1z2y6933f05yv9y2aapmn876jnsydh642zqid3j88bb9kqi67x0h";
           name = "flycheck-mercury";
         };
@@ -19271,15 +19617,15 @@
     flycheck-mypy = callPackage ({ fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-mypy";
-        version = "20150915.333";
+        version = "20160220.1632";
         src = fetchFromGitHub {
           owner = "lbolla";
           repo = "emacs-flycheck-mypy";
-          rev = "263339e6e44c3d0d4c10ff3528e5575db97a353f";
-          sha256 = "1vdnw6hnhg8aqcsdqcd2rqz4fsfgxn2xr3xixkvwmpplb4x40c8k";
+          rev = "2675dc0e31f8c08eb69f77b8d99e3f7d985c62ee";
+          sha256 = "01r2ycbayhsxh3dq4d3qky5s0gcv3fjlp8j08y8dgyl406pkzhdz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-mypy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-mypy";
           sha256 = "1w418jm6x3vcg2x31nzc8a3b8asx6gznl6m76ip8w98riz7vy02f";
           name = "flycheck-mypy";
         };
@@ -19300,7 +19646,7 @@
           sha256 = "06hs41l41hm08dv93wldd98hmnd3jqbg58pj5ymn15kgdsy1rirg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-nim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-nim";
           sha256 = "0w6f6998rqx8a3i4xhga7mrmvhxrm690wkqwfzspidid2z7v71az";
           name = "flycheck-nim";
         };
@@ -19321,7 +19667,7 @@
           sha256 = "0fm8w7126vf04n76qhh33rzybvl1n7va2whbqzafbvmv2nny3v94";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-ocaml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-ocaml";
           sha256 = "1cv2bb66aql2kj1y1gsl4xji8yrzrq6rd8hxxs5vpfsk47052lf7";
           name = "flycheck-ocaml";
         };
@@ -19342,7 +19688,7 @@
           sha256 = "0aa8cnh9f0f2zr2kkba2kf9djzjnsd51fzj8l578pbj016zdarwd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-package";
           sha256 = "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d";
           name = "flycheck-package";
         };
@@ -19363,7 +19709,7 @@
           sha256 = "0ffas4alqhijvm8wl1p5nqjhnxki8gs6b5bxb4nsqwnma8qmlcx3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-perl6";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-perl6";
           sha256 = "0czc0fqx7g543afzkbjyz4bhxfl4s3v5swn9xrkayv8cgk8acvp4";
           name = "flycheck-perl6";
         };
@@ -19384,7 +19730,7 @@
           sha256 = "11brmradnsz3qqj11rviwdh6hqhbicgycr2zs5wrfbq8rifx4cv1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-pos-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-pos-tip";
           sha256 = "09i2jmwj8b915fhyczwdb1j7c551ggbva33avis77ga1s9v3nsf9";
           name = "flycheck-pos-tip";
         };
@@ -19397,15 +19743,15 @@
     flycheck-protobuf = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, protobuf-mode }:
     melpaBuild {
         pname = "flycheck-protobuf";
-        version = "20150731.512";
+        version = "20160211.900";
         src = fetchFromGitHub {
           owner = "edvorg";
           repo = "flycheck-protobuf";
-          rev = "2f0ab48b1b2e8f6c4b86ce876598f9ac9868d1da";
-          sha256 = "0dq4ikqskkpcl3z4s5vl6h4f4bx4dsgyn2knlr3x4wjcgzyrv0qn";
+          rev = "3d4c71b535bb456045e4d0e88d63791dbe2093b5";
+          sha256 = "1adcijysw4v8rrxzswi8zhd6w99iaqq7asps0jp21gr9nqci8vdj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-protobuf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-protobuf";
           sha256 = "0cn5b9pr9i9hrix7dbrylwb2812al8ipbpqvlb9bm2f8hc9kgsmc";
           name = "flycheck-protobuf";
         };
@@ -19426,7 +19772,7 @@
           sha256 = "1r8k38ldw7mldhl2hsqc8gvb99svc1vlhlqfnj8hqd3vvqxd5r1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-purescript";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-purescript";
           sha256 = "05j1iscyg9khw0zq63676zrisragklxp48hmbc7vrbmbiy964lwd";
           name = "flycheck-purescript";
         };
@@ -19447,7 +19793,7 @@
           sha256 = "16albss527dq4ncpiy8p326fib038qc6wjbh985lw2p1f9babswa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-pyflakes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-pyflakes";
           sha256 = "186h5ky48i1xmjbvvhn1i0rzhsy8bgdv1d8f7rlr2z4brb52f9c1";
           name = "flycheck-pyflakes";
         };
@@ -19468,7 +19814,7 @@
           sha256 = "08ar85p5llk0lxlm2rd7rfc8s449vrknsrzzxqg8kvakgpd0nx7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-rust";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-rust";
           sha256 = "1k0n0y6lbp71v4465dwq7864vp1qqyx7zjz0kssszcpx5gl1596w";
           name = "flycheck-rust";
         };
@@ -19481,15 +19827,15 @@
     flycheck-status-emoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-status-emoji";
-        version = "20150924.1314";
+        version = "20160207.1651";
         src = fetchFromGitHub {
           owner = "liblit";
           repo = "flycheck-status-emoji";
-          rev = "a6ae7b108110acc4dba32e616c8b02555455ea67";
-          sha256 = "17mhsxnixw37x9jpy59nn3npw93r1rza2zcw6jmqzandmj0jyvm4";
+          rev = "695bc8fdc8309a062b69f8a91434d99d0470cc99";
+          sha256 = "0v7d0yijqn3mhgjwqiv1rsdhw2ay6ffbn8i45x0dlp960v7k2k8f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-status-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-status-emoji";
           sha256 = "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p";
           name = "flycheck-status-emoji";
         };
@@ -19510,7 +19856,7 @@
           sha256 = "0hn3qjff1lcpd2ghjixkkq2bpmrmqab3860vy38yw201yy4xmn5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-tip";
           sha256 = "0zab1zknrnsw5xh5pwzzcpz7p40bbywkf9zx99sgsd6b5j1jz656";
           name = "flycheck-tip";
         };
@@ -19523,15 +19869,15 @@
     flycheck-typescript-tslint = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-typescript-tslint";
-        version = "20151209.1647";
+        version = "20160213.1249";
         src = fetchFromGitHub {
           owner = "Simplify";
           repo = "flycheck-typescript-tslint";
-          rev = "79d33ba8fbc23df604c239cfc32c21e07339faa1";
-          sha256 = "0m9fjfpand20qy9d196z5khiznn25n95zbmgs8q2s2wcn4f7022p";
+          rev = "05505563dc980be078aab3642d499ced8f625da3";
+          sha256 = "1a9rmp0m5w68qvypxgwvixz32z13xcianyl6hjd6xmaax7f6r0bh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-typescript-tslint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-typescript-tslint";
           sha256 = "141x4scl13gqxyg0nlc8vig1iaybc3g95il5r51k4k83isi62iyq";
           name = "flycheck-typescript-tslint";
         };
@@ -19544,15 +19890,15 @@
     flycheck-ycmd = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, ycmd }:
     melpaBuild {
         pname = "flycheck-ycmd";
-        version = "20160114.429";
+        version = "20160206.150";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "c64684df763411249985159ee33b10d948b9fc91";
-          sha256 = "12jwqhzqskdp2l6h60rich19rddzjcl94zaf72ljnq8h0mqc3xy0";
+          rev = "61601543ca9b70f6a92a87fb9057af6143ba5ed1";
+          sha256 = "10j8zv5m36400wwkwbncqnsm616v59ww0bbkhrxcf6mn56iq8162";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-ycmd";
           sha256 = "0m99ssynrqxgzf32d35n17iqyh1lyc6948inxpnwgcb98rfamchv";
           name = "flycheck-ycmd";
         };
@@ -19573,7 +19919,7 @@
           sha256 = "10i0rbvk6vyifgbgskdyspmw9q64x99fzi8i1h8bgv58xhfx6pm7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-coffee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-coffee";
           sha256 = "1aig1d4fgjdg31vrg8k43z5hbqiydgfvxi45p1695s3kbdm8pr2d";
           name = "flymake-coffee";
         };
@@ -19594,7 +19940,7 @@
           sha256 = "1dlxn8hhz3gfrhvkwhlxjmby6zc0g8yy9n9j9dn8c4cbi2fhyx5m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-cppcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-cppcheck";
           sha256 = "11brzgq2zl32a8a2dgj2imsldjqaqvxwk2jypf4bmfwa3mkcqh3d";
           name = "flymake-cppcheck";
         };
@@ -19615,7 +19961,7 @@
           sha256 = "00cnz3snhs44aknq6wmf19hq9bzb5pj0hvfzz93l6n7ngd8vvpzy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-css";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-css";
           sha256 = "0kqm3wn9symqc9ivnh11gqgq8ql2bhpqvxfm86d8vwm082hd92c5";
           name = "flymake-css";
         };
@@ -19633,7 +19979,7 @@
           sha256 = "10cpzrd588ya52blghxss5zkn6x8hc7bx1h0qbcdlybbmkjgpkxr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-cursor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-cursor";
           sha256 = "1s065w0z3sfv3d348w4zhlw96xf3j28bcz14sl46963mj2dm90lr";
           name = "flymake-cursor";
         };
@@ -19654,7 +20000,7 @@
           sha256 = "1mylcsklnv3q27q1gvf7wrila39rmxab1ypmvjh5p56d91y6pszc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-easy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-easy";
           sha256 = "19p6s9fllgvs35v167xf624k5dn16l9fnvaqcj9ks162gl9vymn7";
           name = "flymake-easy";
         };
@@ -19675,7 +20021,7 @@
           sha256 = "04w6g4wixrpfidxbk2bwazhvf0cx3c2v2mxnycqqlqkg0m0sb0fn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-elixir";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-elixir";
           sha256 = "15r3m58hnc75l3j02xdr8yg25fbn2sbz1295ac44widzis82m792";
           name = "flymake-elixir";
         };
@@ -19696,7 +20042,7 @@
           sha256 = "14kbqyw4v1c51dx7pfgqbn8x4j8j3rgyyq2fa9klqzxpldcskl24";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-gjshint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-gjshint";
           sha256 = "19jcd5z4883z3fzlrdn4fzmsvn16f4hfnhgw4vbs5b0ma6a8ka44";
           name = "flymake-gjshint";
         };
@@ -19717,7 +20063,7 @@
           sha256 = "03gh0y988pksghmmvb5av2vnlbcsncafvn4nwihsis0bhys8k28q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-go";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-go";
           sha256 = "030m67d8g60ljm7ny3jh4vwj3cshypsklgbjpcvh32y109ga1hy1";
           name = "flymake-go";
         };
@@ -19738,7 +20084,7 @@
           sha256 = "0zldhlvxmk0xcjmj4ns48pp4h3bvijrzs1md69ya7m3dmsbayfrc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-google-cpplint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-google-cpplint";
           sha256 = "0q7v70xbprh03f1yabq216q4q82a58s2c1ykr6ig49cg1jdgzkf3";
           name = "flymake-google-cpplint";
         };
@@ -19759,7 +20105,7 @@
           sha256 = "08rcsg76qdq2l6z8q339yw770kv1q657ywqvq6a20pxxz2158a8l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-haml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-haml";
           sha256 = "0dmdhh12h4xrx6mc0qrwavngk2sx0l4pfqkjjyavabsgcs9wlgp1";
           name = "flymake-haml";
         };
@@ -19780,7 +20126,7 @@
           sha256 = "0hwcgas83wwhk0szwgw7abf70400knb8dfabknwv0qrcsk4gqffd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-haskell-multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-haskell-multi";
           sha256 = "0cyzmmghwkkv6020s6n436lwymi6dr49i7gkci5n0hw5pdywcaij";
           name = "flymake-haskell-multi";
         };
@@ -19801,7 +20147,7 @@
           sha256 = "003fdrgxlyhs595ndcdzhmdkcpsf9bpw53hrlrrrh07qlnqxwrvp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-hlint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-hlint";
           sha256 = "0wq1ijhn3ypy31yk8jywl5hnz0r0vlhcxjyznzccwqbdc5vf7b2x";
           name = "flymake-hlint";
         };
@@ -19822,7 +20168,7 @@
           sha256 = "0ywm9fpb7d7ry2fly8719fa41q97yj9za3phqhv6j1chzaxvcv3a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-jshint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-jshint";
           sha256 = "0j4djylz6mrq14qmbm35k3gvvsw6i9qc4gd9ma4fykiqzkdjsg7j";
           name = "flymake-jshint";
         };
@@ -19843,7 +20189,7 @@
           sha256 = "0y01albwwcnhj4pnpvcry0zw7z2g9py9q2p3sw5zhgw3g0v5p9ls";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-jslint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-jslint";
           sha256 = "1cq8fni4p0qhigx0qh34ypmcsbnilra1ixgnrn9mgg8x3cvcm4cm";
           name = "flymake-jslint";
         };
@@ -19864,7 +20210,7 @@
           sha256 = "1qn15pr7c07fmki484z5xpqyn8546qb5dr9gcp5n1172wnh2a534";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-json";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-json";
           sha256 = "1p5kajiycpqy2id664bs0fb1mbf73a43qqfdi4c57n6j9x7fxp4d";
           name = "flymake-json";
         };
@@ -19885,7 +20231,7 @@
           sha256 = "0ggi8a4j4glpsar0sqg8q06rscajjaziis5ann31wphx88rc5wd7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-less";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-less";
           sha256 = "05k5daphxy94164c73ia7f4l1gv2cmlw8xzs8xnddg7ly22gjhi0";
           name = "flymake-less";
         };
@@ -19906,7 +20252,7 @@
           sha256 = "1fz7kywp1y2nhp50b2v961wz604sw1gzqcid4k8igz9aii3ygxcv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-lua";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-lua";
           sha256 = "0pa66ymhazcfgd9jmxizq5w2sgj008hph42wsa9ljr2rina1gai6";
           name = "flymake-lua";
         };
@@ -19927,7 +20273,7 @@
           sha256 = "1f4l2r4gp03s18255jawc7s5abpjjrw54937wzygmvzvqvmaiikj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-perlcritic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-perlcritic";
           sha256 = "0hibnh463wzhvpix7gygpgs04gi6salwjrsjc6d43lxlsn3y1im8";
           name = "flymake-perlcritic";
         };
@@ -19948,7 +20294,7 @@
           sha256 = "09mibjdji5mf3qvngspv1zmik1zd9jwp4mb4c1w4256202359sf4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-php";
           sha256 = "12ds2l5kvs7fz38syp4amasbjkpqd36rlpajnb3xxll0hbk6vffk";
           name = "flymake-php";
         };
@@ -19969,7 +20315,7 @@
           sha256 = "140rlp6m0aqibwa0bhv8w6l3giziybqdw7x271nq8f3r60ch13bi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-phpcs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-phpcs";
           sha256 = "0zzxi3c203fiw6jp1ar9bb9f28x2lg23bczgy8n5cicrq59jfsn9";
           name = "flymake-phpcs";
         };
@@ -19990,7 +20336,7 @@
           sha256 = "1r3yjqxig2j7l50l787qsi96mkvjcgqll9vb4ci51j7b43d53c5m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-puppet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-puppet";
           sha256 = "1izq6s33p74dy4wzfnjii8wjs723bm5ggl0w6hkvzgbmyjc01hxv";
           name = "flymake-puppet";
         };
@@ -20011,7 +20357,7 @@
           sha256 = "1aijapvpw4skfhfmz09v5kpaxay6b0bp77bbjkrvgyizsqdd39vp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-python-pyflakes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-python-pyflakes";
           sha256 = "0asbjxv03zkbcjayanv13qzbv4z7b6fi0z1j6yv7fl6q9mgvm497";
           name = "flymake-python-pyflakes";
         };
@@ -20032,7 +20378,7 @@
           sha256 = "13yk9cncp3zw6d7zkgdpgprpw6wrirk2gxgjvkr15dwcyx1g3109";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-ruby";
           sha256 = "1shr6d03vx85nmyxnysglzlc1pz0zy3n28nrcmxqgdm02g197bzr";
           name = "flymake-ruby";
         };
@@ -20053,7 +20399,7 @@
           sha256 = "1qxb3vhh83ikhmm89ms7irdip2l03hnjcq5ncmgywkaqkpslaacv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-rust";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-rust";
           sha256 = "080cvgl2cg08kyvmgg080zqb6k6bngga3m5lfwb2dpmi1bajywc1";
           name = "flymake-rust";
         };
@@ -20074,7 +20420,7 @@
           sha256 = "0rwjiplpqw3rrh76llnx2fn78f6avxsg0la5br46q1rgw4n8r1w1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-sass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-sass";
           sha256 = "0sz6n5r9pdphgvvaljg9zdwj3dqayaxzxmb4s8x4b05c8yx3ba0d";
           name = "flymake-sass";
         };
@@ -20095,7 +20441,7 @@
           sha256 = "0c2lz1p91yhprmlbmp0756d96yiy0w92zf0c9vlp0i9abvd0cvkc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-shell";
           sha256 = "13ff4r0k29yqgx8ybxz7hh50cjsadcjb7pd0075s9xcrzia5x63i";
           name = "flymake-shell";
         };
@@ -20116,7 +20462,7 @@
           sha256 = "0qpr0frcn3w0f6yz8vgavwbxvn6wb0qkfk653v4cfy57dvslr4wf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-vala";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-vala";
           sha256 = "0yp81phd96z594ckav796qrjm0wlkrfsl0rwpmgg840qn49w71vx";
           name = "flymake-vala";
         };
@@ -20137,7 +20483,7 @@
           sha256 = "0mdam39a85csi9b90wak9j3zkd25lj6x54affwkg3fym8yphmplm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-yaml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-yaml";
           sha256 = "17wghm797np4hlidf3wwb47w4klwc6qyk6ry1z05psl3nykws1g7";
           name = "flymake-yaml";
         };
@@ -20158,7 +20504,7 @@
           sha256 = "07hy1kyw4cbxydmhp4scsy3dcbk2s50rmdp8rch1vbcjk5lj4mvb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flyparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flyparens";
           sha256 = "1mvbfq062qj8vmgzk6rymg3idlfc1makfp1scmjvpw98h30j2a0a";
           name = "flyparens";
         };
@@ -20179,7 +20525,7 @@
           sha256 = "1g09s57b773nm9xqslzbin5i2h18k55nx00s5nnkvx1qg0n0mzkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flyspell-lazy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flyspell-lazy";
           sha256 = "0lzazrhsfh5m7n57dzx0v46d5mg87wpwwkjzf5j9gpv1mc1xfg1y";
           name = "flyspell-lazy";
         };
@@ -20200,7 +20546,7 @@
           sha256 = "1rdpggnw9mz3qr4kp5gh9nvwncivj446vdhpc04d4jgrl568bhqb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flyspell-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flyspell-popup";
           sha256 = "0wp15ra1ry6xpwal6mb53ixh3f0s4nps0rdyfli7hhaiwbr9bhql";
           name = "flyspell-popup";
         };
@@ -20221,7 +20567,7 @@
           sha256 = "1fk4zsb4jliwz10sqz5bpqgj1p479mc506dmvy4zq3vqnpbypqvs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fm";
           sha256 = "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f";
           name = "fm";
         };
@@ -20242,7 +20588,7 @@
           sha256 = "0984fhf1nlpdh9mh3gd2xak3v2rlv76qxppqvr6a4kl1dxwg37r3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fm-bookmarks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fm-bookmarks";
           sha256 = "12ami0k6rfwhrr6xgj0dls4mkk6dp0r9smwzhr4897dv0lw89bdj";
           name = "fm-bookmarks";
         };
@@ -20263,7 +20609,7 @@
           sha256 = "0vqjyc00ba9wy2rn454hhy9rnnghljc1i8f3zrpkdmkqn5cg3336";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/focus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/focus";
           sha256 = "0jw26j8npyl3dgsrs7ap2djxmkafn2hl6gfqvi7v76bccs4jkyv8";
           name = "focus";
         };
@@ -20284,7 +20630,7 @@
           sha256 = "1k5xhnr1jkfw8896kf2nl4633r6ni5bnc53rs6lxn8y9lj0srafb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/focus-autosave-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/focus-autosave-mode";
           sha256 = "1zwp99mk360mqk4mjnnjr6islavginc9732p0jn9g5yz62xypxpc";
           name = "focus-autosave-mode";
         };
@@ -20294,6 +20640,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    foggy-night-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "foggy-night-theme";
+        version = "20160209.908";
+        src = fetchFromGitHub {
+          owner = "mswift42";
+          repo = "foggy-night-theme";
+          rev = "60a12abdac29c2d913e1cf24485d0cc083e26093";
+          sha256 = "1mnak9k0hz99jq2p7gydxajzvx2vcql8yzwcm0v80a6xji2whl70";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/foggy-night-theme";
+          sha256 = "03x3dhkk81d2zh9nflq6wd7v3khpy9046v8qhq4i9dw6davvy9j4";
+          name = "foggy-night-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/foggy-night-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     fold-dwim = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fold-dwim";
@@ -20305,7 +20672,7 @@
           sha256 = "1yz1wis31asw6xa5maliyd1ck2q02xnnh7dc6swgj9cb4wi7k6i1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fold-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fold-dwim";
           sha256 = "0c9yxx45zlhb1h4ldgkjv7bndwlagpyingaaqn9dcsxidrvp3p5x";
           name = "fold-dwim";
         };
@@ -20326,7 +20693,7 @@
           sha256 = "14jvbkahwvv4wb0s9vp8gqmlpv1d4269j5rsjxn79q5pawjzslxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fold-dwim-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fold-dwim-org";
           sha256 = "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn";
           name = "fold-dwim-org";
         };
@@ -20347,7 +20714,7 @@
           sha256 = "1cbabpyp66nl5j8yhyj2jih4mhaljxvjh9ij05clai71z4598ahn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fold-this";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fold-this";
           sha256 = "1iri4a6ixw3q7qr803cj2ik7rvmww1b6ybj5q2pvkf1v25r8655d";
           name = "fold-this";
         };
@@ -20368,7 +20735,7 @@
           sha256 = "1z2dkyzj1gq3gp9cc3lhi240f8f3yjpjnw520xszm0wvx1rp06ny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/folding";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/folding";
           sha256 = "0rb4f4llc4z502znmmc0hfi7n07lp01msx4y1iyqijvqzlq2i93y";
           name = "folding";
         };
@@ -20386,7 +20753,7 @@
           sha256 = "04j9xybn9an3bm2p2aqmqnswxxg3gwq2mc96brkgxkr88h316d4q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/font-lock+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/font-lock+";
           sha256 = "1wn99cb53ykds87lg9mrlfpalrmjj177nwskrnp9wglyqs65lk4g";
           name = "font-lock-plus";
         };
@@ -20407,7 +20774,7 @@
           sha256 = "04n32rgdz7m24jji8p0j42zmf2r60sdbbr4mkr6435fqyvmdd20k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/font-lock-studio";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/font-lock-studio";
           sha256 = "0swwbfaypc78cg4ak24cc92kgxmr1x9vcpaw3jz4zgpm2wzbgmrq";
           name = "font-lock-studio";
         };
@@ -20428,7 +20795,7 @@
           sha256 = "1k90w8v5rpswqb8fn1cc8sq5w12gf4sn6say5dhvqd63512b0055";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/font-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/font-utils";
           sha256 = "0k33jdchjkj7j211a23kfp5axg74cfsrrq4axsb1pfp124swh2n5";
           name = "font-utils";
         };
@@ -20449,7 +20816,7 @@
           sha256 = "103xz042h8w6c85hn19cglfsa34syjh18asm41rjhr9krp15sdl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fontawesome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fontawesome";
           sha256 = "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3";
           name = "fontawesome";
         };
@@ -20462,15 +20829,15 @@
     forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "forecast";
-        version = "20151105.1635";
+        version = "20160208.1748";
         src = fetchFromGitHub {
           owner = "cadadr";
           repo = "forecast.el";
-          rev = "51526906140700f076bd329753abe7ae31b6da90";
-          sha256 = "1jw888nqmbi9kcd9ycl2fqrmrnqxnmkx72n0b3nf3hp7j956yb21";
+          rev = "7531c979a8756a9c78e4e3d221534a4143f5804d";
+          sha256 = "091v9iazqiyarabpdh0v71ddsw018mhy5nnis7jfkafp60psn0nj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/forecast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/forecast";
           sha256 = "0whag2n1120384w304g0w4bqr7svdxxncdhnz4rznfpxlgiw2rsc";
           name = "forecast";
         };
@@ -20491,7 +20858,7 @@
           sha256 = "1fczg710a0rjs932yv6vv9rwr9g5ii6cwva82nqfzyhlkf0b1sn5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/foreign-regexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/foreign-regexp";
           sha256 = "189cq8n759f28nx10fn3w4qbq7q49bb788kp9l70pj38jgnjn7n7";
           name = "foreign-regexp";
         };
@@ -20512,7 +20879,7 @@
           sha256 = "00wqn8h50xr90pyvwk4sv552yiajlzq56wh6f6lad5w90j47q1lx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/foreman-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/foreman-mode";
           sha256 = "0p3kwbld05wf3dwcv0k6ynz727fiy0ik2srx4js9wvagy57x98kv";
           name = "foreman-mode";
         };
@@ -20533,7 +20900,7 @@
           sha256 = "0nj056x87gcpdqkgx3li5syp6wbj58a1mw2aqa48zflbqwyvs03i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/form-feed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/form-feed";
           sha256 = "1abwjkzi3irw0jwpv3f584zc72my9n8iq8zp5s0354xk6iwrl1rh";
           name = "form-feed";
         };
@@ -20554,7 +20921,7 @@
           sha256 = "0mikksamljps1czacgqavlnzzhgs8s3f8q4jza6v3csf8kgp5zd0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/format-sql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/format-sql";
           sha256 = "0684xqzs933vj9d3n3lv7afk4gii41kaqykbb05cribaswapsanj";
           name = "format-sql";
         };
@@ -20575,7 +20942,7 @@
           sha256 = "1nqx2igxmwswjcrnzdjpx5qcjr60zjy3q9cadq5disms17wdcr6y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fortpy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fortpy";
           sha256 = "1nn5vx1rspfsijwhilnjhiy0mjw154ds3lwxvkpwxpchygirlyxj";
           name = "fortpy";
         };
@@ -20596,7 +20963,7 @@
           sha256 = "1kk04hl2y2svrs07w4pq9f4g7vs9qzy2qpw9prvi1gravmnfrzc4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fortune-cookie";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fortune-cookie";
           sha256 = "0xg0zk7hnyhnbhqpxnzrgqs5yz0sy6wb0n9982qc0pa6jqnl9z78";
           name = "fortune-cookie";
         };
@@ -20609,15 +20976,15 @@
     fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "fountain-mode";
-        version = "20160118.2004";
+        version = "20160221.707";
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "fountain-mode";
-          rev = "cca2529a2d97ab404f51edd82a73bfabf7656a2d";
-          sha256 = "0jrqkrjjqg471x9ymzf5faxnv9zc8lyy2lh2m4dys2l4wc704lhr";
+          rev = "4627868e70408b9608a47980d6cfda10024221d5";
+          sha256 = "1zy45s1m1injwr4d1qvpnvfvv4nkkv9mricshxjannsjfbz09ra7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fountain-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fountain-mode";
           sha256 = "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840";
           name = "fountain-mode";
         };
@@ -20636,7 +21003,7 @@
           sha256 = "1867zmm3pyqz8p9ig44jf598z9jkyvbp04mfg6j6ys3hyqfkw942";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/frame-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/frame-cmds";
           sha256 = "0xwzp6sgcb5ap76hpzm8g4kl08a8cgq7i2x9w64njyfink7frwc0";
           name = "frame-cmds";
         };
@@ -20654,7 +21021,7 @@
           sha256 = "0lvlyxb62sgrm37hc21dn7qzlrq2yagiwpspa926q6dpzcsbam15";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/frame-fns";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/frame-fns";
           sha256 = "1wq8wva9q1hdzkvjk582a3fgig0lpqz9ch1p2jd6p29kb1i15f5p";
           name = "frame-fns";
         };
@@ -20675,7 +21042,7 @@
           sha256 = "0n6jhm1198c8slvdymsfjif0dfx3wlf8q4mm0yvpiln46shhwldx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/frame-restore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/frame-restore";
           sha256 = "0b321iyf57nkrm6xv8d1aydivrdapdgng35zcnrg298ws2naysvm";
           name = "frame-restore";
         };
@@ -20696,7 +21063,7 @@
           sha256 = "1vvkdgj8warl40kqmd0408q46dxy9qp2sclq4q92b6falry9qy30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/frame-tag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/frame-tag";
           sha256 = "1n13xcc3ny9j9h1h4vslpjl6k9mqksr73kgmqrmkq301p8zps94q";
           name = "frame-tag";
         };
@@ -20714,7 +21081,7 @@
           sha256 = "03ll68d0j0b55rfxymzcirdigkmxcy8556d0i67ghdzmcqfwily7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/framemove";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/framemove";
           sha256 = "10qf017j0zfnzmcs1i56pznhbvgw7mv4232p8znqaaxphgh6r0ar";
           name = "framemove";
         };
@@ -20735,7 +21102,7 @@
           sha256 = "11h9xw6jnw7dacyv1jch2a77xp7hfb93690m7hhazy6l87xmm4dk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/framesize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/framesize";
           sha256 = "1rwiwx3n7gkpfihbf6ndl1lxza4zi2rlj5av6lfp5qypbw9wddkf";
           name = "framesize";
         };
@@ -20756,7 +21123,7 @@
           sha256 = "12rmwf7gm9ib2c99jangygh2yswy41vxlp90rg0hvlhdfmbqa8p0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/free-keys";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/free-keys";
           sha256 = "0j9cfgy2nkbska4lm5z32p804i9n8pdgn50bs5zzk1ilwd5vbalj";
           name = "free-keys";
         };
@@ -20777,7 +21144,7 @@
           sha256 = "0zwlnzbi91hkfz1jgj9s9pxwi21s21cwp6psdm687wj2a3wy4231";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fringe-current-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fringe-current-line";
           sha256 = "125yn0wbrrxrmdn7qfxj0f4538sb3xnqb3r2inz3gpblc1vxnqb8";
           name = "fringe-current-line";
         };
@@ -20798,7 +21165,7 @@
           sha256 = "0ra9rc53l1gvkqank8apasl3r7wz2yfjrcvmfk3wpxhh24ppxv9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fringe-helper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fringe-helper";
           sha256 = "1vki5jd8jfrlrjcfd12gisgk12y20q3943i2qjgg4qvcj9k28cbv";
           name = "fringe-helper";
         };
@@ -20808,43 +21175,43 @@
           license = lib.licenses.free;
         };
       }) {};
-    fsharp-mode = callPackage ({ auto-complete, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, popup, pos-tip, s }:
+    fsharp-mode = callPackage ({ company, company-quickhelp, dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip, s }:
     melpaBuild {
         pname = "fsharp-mode";
-        version = "20160126.945";
+        version = "20160205.900";
         src = fetchFromGitHub {
           owner = "rneatherway";
           repo = "emacs-fsharp-mode-bin";
-          rev = "b2a70da8ba3c573e02c6a9951ef5f0089cec6c78";
-          sha256 = "115xl18nsg2j9sbp3qqzrjfpnzczk1zmrwrfrpqjq3jmv21ilsv3";
+          rev = "3dd9cb858266608570ca264ec308f9776c370045";
+          sha256 = "0q802gykb3rmn4ssqhs92d23r38jgshl8pjy2y6shmizmixzykml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fsharp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fsharp-mode";
           sha256 = "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z";
           name = "fsharp-mode";
         };
-        packageRequires = [ auto-complete dash popup pos-tip s ];
+        packageRequires = [ company company-quickhelp dash pos-tip s ];
         meta = {
           homepage = "http://melpa.org/#/fsharp-mode";
           license = lib.licenses.free;
         };
       }) {};
-    fstar-mode = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    fstar-mode = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fstar-mode";
-        version = "20160118.2138";
+        version = "20160215.907";
         src = fetchFromGitHub {
           owner = "FStarLang";
           repo = "fstar-mode.el";
-          rev = "2d9874827702c919590a19540d6641a4ffa245fd";
-          sha256 = "19f3fzz0p99mc747m2qqii0idslac3q0fc1q39macd8kx715jkhl";
+          rev = "247c9fc0a5f59a6df137d7cd82644b13ab4050ee";
+          sha256 = "1257wsxvxp412s5vvaqf541kj1fr5whhlyalkfb0b2k1madal2al";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fstar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fstar-mode";
           sha256 = "0kyzkghdkrnqqbd5b969pjyz9jxgq0j8hkmvlcwikl7ynnhm9lgy";
           name = "fstar-mode";
         };
-        packageRequires = [ cl-lib dash emacs ];
+        packageRequires = [ dash emacs ];
         meta = {
           homepage = "http://melpa.org/#/fstar-mode";
           license = lib.licenses.free;
@@ -20856,11 +21223,11 @@
         version = "20151204.543";
         src = fetchgit {
           url = "git://factorcode.org/git/factor.git";
-          rev = "fffb501486083871377237b9320159de140a943a";
-          sha256 = "e2bddf41eacdf63ce42ff433b0a23da3a8de21a6e6b11ab8405ae5a17e09b493";
+          rev = "69d5a3a276439b1b7b249dbfce2f8c46549536c1";
+          sha256 = "c05f9f72c6a0f3582aecc258d8187a9e809041fd79ebcaed735b6803cdb7e4ac";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fuel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fuel";
           sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756";
           name = "fuel";
         };
@@ -20881,7 +21248,7 @@
           sha256 = "0bjny4ryrs788myhiaf3ir99vadf2v4swa5gkz9i36a7j6wzpgk5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/full-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/full-ack";
           sha256 = "09ikhyhpvkcl6yl6pa4abnw6i7yfsx5jkmzypib94w7khikvb309";
           name = "full-ack";
         };
@@ -20894,15 +21261,15 @@
     fullframe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fullframe";
-        version = "20160119.411";
+        version = "20160210.118";
         src = fetchFromGitHub {
           owner = "tomterl";
           repo = "fullframe";
-          rev = "24a362bc6e2db08ada1a53292d526d472d41e7b2";
-          sha256 = "1gq67hx5m3ifzr49k110azcr5y68sdb3aljqx3yg71apfi5dg4w6";
+          rev = "3c046dd4c27a5c96d9dc3bc50a44eb1e7fd68912";
+          sha256 = "1narmlcd8ycwkmsrgk64l7q0ljsbq2fsikl8hjbrsc20nma032m4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fullframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fullframe";
           sha256 = "08sh8lmb6g8asv28fcb36ilcn0ka4fc6ka0pnslid0h4c32fxp2a";
           name = "fullframe";
         };
@@ -20915,15 +21282,15 @@
     function-args = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "function-args";
-        version = "20151022.751";
+        version = "20160206.717";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "function-args";
-          rev = "25e447d8a8930a8c515077de57a7693c6a642514";
-          sha256 = "0m7fcw0cswypiwi5abg6vhw7a3agx9vhp10flbbbji6lblb0fya8";
+          rev = "33ed7e45027b6ce2e455467f7a1a05ca4abdd078";
+          sha256 = "067fmk46wk6jpc01wylagw948sgs3ndrq18mp3x81pdv3dykzmr6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/function-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/function-args";
           sha256 = "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak";
           name = "function-args";
         };
@@ -20942,7 +21309,7 @@
           sha256 = "109z1d0zrya1s9wy28nz5ynpg4zl7i1p6q1n57m1b1kkhhckjcv5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/furl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/furl";
           sha256 = "15njmanpj3qb8ic3k4sbrngqnsg85lvlj32dmii3y9bpgvis3k6f";
           name = "furl";
         };
@@ -20963,7 +21330,7 @@
           sha256 = "0rzp8c2164w775ggm2fs4j5dz33vqcah84ysp81majirwfql1niv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fuzzy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fuzzy";
           sha256 = "1hwdh9bx4g4vzzyc20vdwxsii611za37kc9ik40kwjjk62qmll8h";
           name = "fuzzy";
         };
@@ -20981,7 +21348,7 @@
           sha256 = "1iv0x1cb12kknnxyq2gca7m3c3rg9s4cxz397sazkh1csrn0b2i7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fuzzy-format";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fuzzy-format";
           sha256 = "055b8710yxbi2sdqsqk6jqgnzky4nykv8jgqgwy8q2isgj6q98jb";
           name = "fuzzy-format";
         };
@@ -20999,7 +21366,7 @@
           sha256 = "1q3gbv9xp2jxrf9vfarjqk9k805xc9z72zbaw7aqdxrj1bafxwnz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fuzzy-match";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fuzzy-match";
           sha256 = "0mpy84f2zdyzmipzhs06b8rl2pxiypazf35ls1nc1yj8r16ijrds";
           name = "fuzzy-match";
         };
@@ -21012,15 +21379,15 @@
     fvwm-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fvwm-mode";
-        version = "20141105.2236";
+        version = "20160217.859";
         src = fetchFromGitHub {
           owner = "theBlackDragon";
           repo = "fvwm-mode";
-          rev = "cfd14546b6905806e0f2ad3df58b08de2401be3c";
-          sha256 = "0w2kqmx38ji5273mzhn9sp4r6vn7jfwb5qpsf2w8d46avpf8rj5i";
+          rev = "89d5dad68224ada08378014c0fee1111a5830c2b";
+          sha256 = "14nr19skannq60cvvxg359vb45jxs593mmz370v1hi6k652z4pny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fvwm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fvwm-mode";
           sha256 = "07y32cnp4qfhncp7s24gmlxljdrj5miicinfaf4gc7hihb4bkrkb";
           name = "fvwm-mode";
         };
@@ -21041,7 +21408,7 @@
           sha256 = "08qnyr945938hwjg1ypkf2x4mfxbh3bbf1xrgz1rk2ddrfv7hmkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fwb-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fwb-cmds";
           sha256 = "0wnjvi0v0l2h1mhwlsk2d8ggwh3nk7pks48l55gp18nmj00jxycx";
           name = "fwb-cmds";
         };
@@ -21054,15 +21421,15 @@
     fxrd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "fxrd-mode";
-        version = "20160121.1253";
+        version = "20160210.1733";
         src = fetchFromGitHub {
           owner = "msherry";
           repo = "fxrd-mode";
-          rev = "7b49c7bec2ed4a579fa0234555667377e8ba0f53";
-          sha256 = "1sk2z71xfi4wqb7ap8jvad8cbzdbilwzqx9vy45zmgx1jh7g4ba9";
+          rev = "28792b17878c5e8c45b81c53bef83b751a73119c";
+          sha256 = "1p0l3fvbpvwdg4p82yj9ab7fxmsyvrvqsbclrvns6k3xlgpcrcbc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fxrd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fxrd-mode";
           sha256 = "17zimg64lqc1yh9gnp5izshkvviz996aym7q6n9p61a4kqq37z4r";
           name = "fxrd-mode";
         };
@@ -21083,7 +21450,7 @@
           sha256 = "08x5li0mshrlamr7vswy7xh358bqhh3pngjr4ckswfi0l2r5fjbd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fyure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fyure";
           sha256 = "0k5z2xqlrzp5lyvp2lr462x38kqdmqld845bvyvkfjd2k4yri71x";
           name = "fyure";
         };
@@ -21104,7 +21471,7 @@
           sha256 = "0rjn4z7ssl1jy0brvsci44mhpig3zkdbcj8gcylzznhz0qfk1ljj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fzf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fzf";
           sha256 = "0jjzm1gq85fx1gmj6nqaijnjws9bm8hmk40ws3x7fmsp41qq5py0";
           name = "fzf";
         };
@@ -21125,7 +21492,7 @@
           sha256 = "0sn3y1ilbg532mg941qmzipvzq86q31x86ypaf0h0m4015r7l59v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gandalf-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gandalf-theme";
           sha256 = "0wkmsg3pdw98gyp3q508wsqkzw821qsqi796ynm53zd7a4jfap4p";
           name = "gandalf-theme";
         };
@@ -21144,7 +21511,7 @@
           sha256 = "1jsw2mywc0y8sf7yl7y3i3l8vs3jv1srjf34lgb5xfz6p8wc5lc0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gap-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gap-mode";
           sha256 = "07whab3gi4b8gsvy5ijmjnj700lw0rm3bnr1769byhnpi7qpqin2";
           name = "gap-mode";
         };
@@ -21165,7 +21532,7 @@
           sha256 = "0j0dg7nl9kmanayvw0712x5c5x9h48qmqdsyi0pijvgmv8l5slg5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gather";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gather";
           sha256 = "1f0cqqp1a7w8g1pfvzxxb0hjrxq4m79a4n85dncqj2xhjxrkm0xk";
           name = "gather";
         };
@@ -21184,7 +21551,7 @@
           sha256 = "01kbvmylymm6qww45mbjjxmb8ccdl9c2pxdyqfq3g73vwzrvndk4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/geben";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/geben";
           sha256 = "1hvvy1kp8wrb1qasm42fslgdkg095g4jxgzbnwpa4vp5cq270qbm";
           name = "geben";
         };
@@ -21205,7 +21572,7 @@
           sha256 = "14v5gm931dcsfflhsvijr4ihx7cs6jymvnjzph3arvhvqwyqhwgq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/geeknote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/geeknote";
           sha256 = "1ci82fj3layd95lqj2w40y87xps6bs7x05z8ai9m59k244g26m8v";
           name = "geeknote";
         };
@@ -21218,15 +21585,15 @@
     geiser = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "geiser";
-        version = "20160119.2245";
+        version = "20160215.1932";
         src = fetchFromGitHub {
           owner = "jaor";
           repo = "geiser";
-          rev = "04b0b3915741860a61532059b7e5291b7b98e031";
-          sha256 = "0mcn29ldm01vf7np73mn29j69n6nlc17vb789m65cl59gm4b7lb8";
+          rev = "c425acc5528bd24ca90fa7b5b3c3edba12b8f4fb";
+          sha256 = "1na5wq15prn1qkla1bxg0jb8k86kdczvm4if878f7djj4vhkvxx5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/geiser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/geiser";
           sha256 = "067rrjvyn5sz60w9h7qn542d9iycm2q4ryvx3n6xlard0dky5596";
           name = "geiser";
         };
@@ -21247,7 +21614,7 @@
           sha256 = "1l3ps28a1wdrg2fgvvkdxdadfgpplijs4ig1yqq8yi7k13k046p4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/general-close";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/general-close";
           sha256 = "17v0aprfvxbygx5517a8hrl88qm5lb9k7523yd0ps5p9l5x96964";
           name = "general-close";
         };
@@ -21268,7 +21635,7 @@
           sha256 = "08cw1fa25kbhbq2sp1cpn90bz38i9hjfdj93xf6wvki55b52s0nn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/genrnc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/genrnc";
           sha256 = "1nwbdscl0yh9j1n421can93m6s8j9dkyb3xmpampr6x528g6z0lm";
           name = "genrnc";
         };
@@ -21289,7 +21656,7 @@
           sha256 = "0344w4sbd6wlgl13j163v0hzjw9nwhvpr5s7658xsdd90wp4i701";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/german-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/german-holidays";
           sha256 = "0fgrxdgyl6va6axjc5l4sp90pyqaz5zha1g73xyhbxblshm5dwxn";
           name = "german-holidays";
         };
@@ -21310,7 +21677,7 @@
           sha256 = "1ch8yp0mgk57x0pny9bvkknsqj27fd1rcmpm9s7qpryrwqkp1ix4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gerrit-download";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gerrit-download";
           sha256 = "1rlz0iqgvr8yxnv5qmk29xs1jwf0g0ckzanlyldcxvs7n6mhkjjp";
           name = "gerrit-download";
         };
@@ -21331,7 +21698,7 @@
           sha256 = "0bwjiq4a4f5pg0ngvc3lmkk7aki8n9zqfa1dym0lk4vy6yfhcbhp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ggo-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ggo-mode";
           sha256 = "1403x530n90jlfz3lq2vfiqx84cxsrhgs6hhmniq960cjj31q35p";
           name = "ggo-mode";
         };
@@ -21352,7 +21719,7 @@
           sha256 = "1qjh7av046ax4240iw40hv5fc0k23c36my9hili7fp4y2ak99l8n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ggtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ggtags";
           sha256 = "1cmry4knxbx9257ivhfxsd09z07z3g3wjihi99nrwmhb9h4mpqyw";
           name = "ggtags";
         };
@@ -21373,7 +21740,7 @@
           sha256 = "0fkq3yl9jpakfnahymjv28fcal38c210garnq055rgmyhyhhpdwd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gh";
           sha256 = "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0";
           name = "gh";
         };
@@ -21394,7 +21761,7 @@
           sha256 = "0g3bjpnwgqczw6ddh4mv7pby0zyqzqgywjrjz2ib6hwmdqzyp1s0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gh-md";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gh-md";
           sha256 = "0b72fl1hj7gkqlqrr8hklq0w3ryqqqfn5qpb7a9i6q0vh98652xm";
           name = "gh-md";
         };
@@ -21411,11 +21778,11 @@
         src = fetchFromGitHub {
           owner = "kazu-yamamoto";
           repo = "ghc-mod";
-          rev = "d77e262915d5726dc48549e3e7ea25c89e675475";
-          sha256 = "06p4hg8nkjphqkfim3ax1v82i29sfawfd8bdc4i3zrlbrvhdcnli";
+          rev = "add699af4831b7b7df5d65ed7203427a125d1888";
+          sha256 = "0lpxiqjyqsqjf36q3j078xcv10llljqyvm4knwgijd35axsxrcvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ghc";
           sha256 = "0xqriwggd1ahla5aff7k0j4admx6q18rmqsx3ipn4nfk86wrhb8g";
           name = "ghc";
         };
@@ -21436,7 +21803,7 @@
           sha256 = "1ywwyc2kz1c1s26c412nmzh55cinh84cfiazyyi3jsy5zzwhrbhi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ghc-imported-from";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ghc-imported-from";
           sha256 = "10cxz4c341lknyz4ns63bri00mya39278xav12c73if03llsyzy5";
           name = "ghc-imported-from";
         };
@@ -21457,7 +21824,7 @@
           sha256 = "17fl3k2sqiavbv3bp6rnp3p89j6pnpkkp7wi26pzzk4675r5k45q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ghci-completion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ghci-completion";
           sha256 = "1a6k47z5kmacj1s5479393jyj27bjx0911yaqfmmwg2hr0yz7vll";
           name = "ghci-completion";
         };
@@ -21478,7 +21845,7 @@
           sha256 = "0lcbyw6yrl6c8py5v2hqghcbsf9cbiplzil90al4lwqps7rw09a8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gherkin-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gherkin-mode";
           sha256 = "0dhrsz24hn0sdf22wpmzbkn66g4540vdkl03pc27kv21gwa9ixxv";
           name = "gherkin-mode";
         };
@@ -21499,7 +21866,7 @@
           sha256 = "1aj5j0y244r1fbbbl0lzb53wnyhljw91kb4n3hi2gagm7zwp8jcf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ghq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ghq";
           sha256 = "0prvywcgwdhx5pw66rv5kkfriahal2mli2ibam5np3z6bwcq4ngh";
           name = "ghq";
         };
@@ -21520,7 +21887,7 @@
           sha256 = "1na8pp1g940zi22jgqi6drsm12db0hyw99v493i5j1p2y67c4hxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gildas-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gildas-mode";
           sha256 = "0bc3d8bnvg1w2chrr4rp9daq1x8p41qgklrniq0bbkr2h93cmkgv";
           name = "gildas-mode";
         };
@@ -21541,7 +21908,7 @@
           sha256 = "18433gjhra0gqrwnxssd3njpxbvqhh64bds9rym1vq9l7w09z024";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gist";
           sha256 = "053fl8aw0ram9wsabzvmlm5w2klwd2pgcn2w9r1yqfs4xqja5sd3";
           name = "gist";
         };
@@ -21562,7 +21929,7 @@
           sha256 = "0471xm0h6jkmxnrcqy5agq42i8immdb2qpnw7q7czrbsl521al8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git";
           sha256 = "1nd2yvfgin13m368gjn7xah99glspnam4g4fh348x4makxcaw8w5";
           name = "git";
         };
@@ -21575,15 +21942,15 @@
     git-annex = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-annex";
-        version = "20131119.1645";
+        version = "20160215.1311";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "git-annex-el";
-          rev = "a37648ae83783bb48221ef6299aa4ef5ceccf51b";
-          sha256 = "0yxmrcrvl9pbwhd7w4vnrv2jqyskzvqp17sr3vzjlvv694jd4dms";
+          rev = "e61ef24f22c74dff4b64235191414c98d60aa11a";
+          sha256 = "0d2blcnyqd1br7zhwprdxpx2jphjhsb4jgaw9dr4gvv0xdb2sr87";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-annex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-annex";
           sha256 = "0194y24vq1w6m2cjgqgx9dqp99cq8y9licyry2zxa5brbrsxi94l";
           name = "git-annex";
         };
@@ -21604,7 +21971,7 @@
           sha256 = "0psmr7749nzxln4b500sl3vrf24x3qijp12ir0i5z4x25k72hrlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-auto-commit-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-auto-commit-mode";
           sha256 = "0nf4n63xnzcsizjk1yl8qvqj9wjdqy57kvn6r736xvsxwzd44xgl";
           name = "git-auto-commit-mode";
         };
@@ -21625,7 +21992,7 @@
           sha256 = "0g839pzmipjlv32r0gh166jn3na5d0wh2w1sia2k4yx1w0ch1bsx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-blame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-blame";
           sha256 = "0glmnj77vya8ivjin4qja7lis67wyibzy9k6z8b54z7mqf9ikx06";
           name = "git-blame";
         };
@@ -21646,7 +22013,7 @@
           sha256 = "1irqmypgc4l1jlzj4g65ihpic3ffnnkcg1hlysj7qpip5nbflqgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-command";
           sha256 = "1hsxak63y6648n0jkzl5ajxg45w84qq8vljvjh0bmwfrbb67kwbg";
           name = "git-command";
         };
@@ -21663,11 +22030,11 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "08d0d095c7c16fb8223d3beeea232412f88936f5";
-          sha256 = "08h1lypdvgv0rkq1sjkmw9zwvbjwvpklzjyawb5chgfa5grgfiii";
+          rev = "08c61ea85ca62e8cc04c4e8a0a55a5d947a8d01f";
+          sha256 = "18jk5bl30kncbc5n7sra5i0n4d57c2nd348kmw154xq1dc7w8b64";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-commit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-commit";
           sha256 = "1i7122fydqga68cilgzir80xfq77hnrw75zrvn52mjymfli6aza2";
           name = "git-commit";
         };
@@ -21688,7 +22055,7 @@
           sha256 = "1vdyrqg2w5q4xmazqqh2ymjnrp9p1x5172nllwryz43jvvxaw05s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-commit-insert-issue";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-commit-insert-issue";
           sha256 = "0mhpszm2y178dxgjv3kh2n744hg2kd60h16zbgmjf4f8228xw8j3";
           name = "git-commit-insert-issue";
         };
@@ -21706,7 +22073,7 @@
           sha256 = "074k1r8rkvyhhwnqy4gnyd7shidxgc25l1xq4hmnwjn13nsyqfnv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-dwim";
           sha256 = "0vdd2cksiqbnxplqbpb16bcmp137fj3p9a7pa0622wx8vd5p0rkr";
           name = "git-dwim";
         };
@@ -21719,16 +22086,16 @@
     git-gutter = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "git-gutter";
-        version = "20160202.1027";
+        version = "20160210.228";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-git-gutter";
-          rev = "07410145fe492c9f36c8fa3e91c0e8210c73ba96";
-          sha256 = "0hgqimvh09nppm96x5mz4kzdqr9f8dja3si9xn1169xl1279kqvb";
+          rev = "b680e11144863f67813cd8139bff7b13df9c6d8c";
+          sha256 = "0h4ascd1ywfx9mjssl9py6xj7g4q6h4ab7g8y7dgbs6yzjjyhyn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-gutter";
-          sha256 = "12yjl9hsd72dwzl42hdcmjfdbxyi356jcq0kz8k7jvcsn57z4p2k";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-gutter";
+          sha256 = "19s344i95piixlzq4mjgmgjw7cy8af02z6hg89jjjdbxrfl4i2fg";
           name = "git-gutter";
         };
         packageRequires = [ cl-lib emacs ];
@@ -21748,8 +22115,8 @@
           sha256 = "0vc1da72vwlys723xi7xvv4ii43sjxgsywb2ss0l0kcm0rays6lv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-gutter-fringe";
-          sha256 = "14wyiyyi2rram2sz3habvmygy5a5m2jfi6x9fqcyfr3vpcjn1k4i";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-gutter-fringe";
+          sha256 = "10k07dzmkxsxzwc70vpv05rxjyps9494y6k7yhlv8d46x7xjyp0z";
           name = "git-gutter-fringe";
         };
         packageRequires = [ cl-lib emacs fringe-helper git-gutter ];
@@ -21769,7 +22136,7 @@
           sha256 = "1rsj193zpblndki4khjjlwl2njxb329d42l75ki55msxifqrn4fi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-gutter-fringe+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-gutter-fringe+";
           sha256 = "1zkjb8p08cq2nqskn79rjszlhp9mrblplgamgi66yskz8qb1bgcc";
           name = "git-gutter-fringe-plus";
         };
@@ -21790,7 +22157,7 @@
           sha256 = "0bhrrgdzzj8gwxjx7b2kibp1b6s0vgvykfg0n47iq49m6rqkgi5q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-gutter+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-gutter+";
           sha256 = "1w78p5cz6kyl9kmndgvwnfrs80ha707s8952hycrihgfb6lixmp0";
           name = "git-gutter-plus";
         };
@@ -21811,7 +22178,7 @@
           sha256 = "02p73q0kl9z44b9a2bhqg03mkqx6gf61n88qlwwg4420dxrf7sbc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-lens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-lens";
           sha256 = "1vv3s89vk5ncinqh2f724z0qbbzp8g4y5y670ryy56w1l6v2acfb";
           name = "git-lens";
         };
@@ -21832,7 +22199,7 @@
           sha256 = "1la3zzcjnmzgxkd4ljr9b5335ddbrvid47kfzp2s358xknzmbsdf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-link";
           sha256 = "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7";
           name = "git-link";
         };
@@ -21853,7 +22220,7 @@
           sha256 = "082g2gqbf8yjgvj2c32ix6j3wwba5fmgcyi75bf0q0bbg4ck5rab";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-messenger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-messenger";
           sha256 = "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn";
           name = "git-messenger";
         };
@@ -21874,7 +22241,7 @@
           sha256 = "1v0jk35ynfg9hivw9gdz2snk73pac67xlfx7av8argdcss1bmyb0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-ps1-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-ps1-mode";
           sha256 = "15gswi9s0m3hrsl1qqyjnjgbglsai95klbdp51h3pcq7zj22wkn6";
           name = "git-ps1-mode";
         };
@@ -21895,7 +22262,7 @@
           sha256 = "1brz9dc7ngywndlxbqbi3pbjbjydgqc9bjzf05lgx0pzr1ppc3w3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-timemachine";
           sha256 = "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq";
           name = "git-timemachine";
         };
@@ -21916,7 +22283,7 @@
           sha256 = "1ivnf4vsqk6c7iw1cid7q1hxp7047ajd1mpg0fl002d7m7ginhyl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-wip-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-wip-timemachine";
           sha256 = "02fi51k6l23cgnwjp507ylkiwb8azmnhc0fips68nwn9dghzp6dw";
           name = "git-wip-timemachine";
         };
@@ -21937,7 +22304,7 @@
           sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitattributes-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gitattributes-mode";
           sha256 = "1gjs0pjh6ap0h54savamzx94lq6vqrg58jxqaq5n5qplrbg15a6x";
           name = "gitattributes-mode";
         };
@@ -21958,7 +22325,7 @@
           sha256 = "184q3vsxa9rvhc1n57ms47r73f3zap25wswzi66rm6rmfi2k7678";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitconfig";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gitconfig";
           sha256 = "126znl1c4vwgskj7ka9id8v2bdrdn5nkyx3mmc6cz9ylc27ainm7";
           name = "gitconfig";
         };
@@ -21979,7 +22346,7 @@
           sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitconfig-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gitconfig-mode";
           sha256 = "0hqky40kcgxdnghnf56gpi0xp7ik45ssia1x84v0mvfwqc50dgn1";
           name = "gitconfig-mode";
         };
@@ -21992,15 +22359,15 @@
     github-browse-file = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "github-browse-file";
-        version = "20151112.1825";
+        version = "20160205.827";
         src = fetchFromGitHub {
           owner = "osener";
           repo = "github-browse-file";
-          rev = "fa5cc00a40869430fb44596792961a4cddf9c265";
-          sha256 = "07vgnmfn0kbg3h3vhf3xk443yi1b55761x881xlmw9sr9nraa578";
+          rev = "9742a5183af853788c6ecb83fb7ee0b00d1675ac";
+          sha256 = "0i3dkm0j4gh21b7r5vxr6dddql5rj7lg8xlaairvild0ccf3bhdl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/github-browse-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/github-browse-file";
           sha256 = "03xvgxlw7wmfby898din7dfcg87ihahkhlav1n7qklw6qi7skjcr";
           name = "github-browse-file";
         };
@@ -22021,7 +22388,7 @@
           sha256 = "000m6w2akx1z1lb32nvy6qzyggpcvlbdjh1i8419rzaidxf5gaxg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/github-clone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/github-clone";
           sha256 = "0ffrm4lmcj3d9kx3g2d5xbiih7hn4frs0prjrvcjq8acvsbc50q9";
           name = "github-clone";
         };
@@ -22042,7 +22409,7 @@
           sha256 = "065gpnllsk4x574fn9d6m4ajxl7mj5w2w5g9in421sp5r80fp9fv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/github-issues";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/github-issues";
           sha256 = "12c6yb3v7xwkzc51binfgl4jb3sm3al5nlrklbsxhn44alazsvb0";
           name = "github-issues";
         };
@@ -22063,7 +22430,7 @@
           sha256 = "11nfpy39xdkjxaxbfn8rppj4rcz57wl15gyibp01j9w7wmb5b4pr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/github-notifier";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/github-notifier";
           sha256 = "1jqc2wx1pvkca8syj97ds32404szm0wn12b7zpa98265sg3n64nw";
           name = "github-notifier";
         };
@@ -22084,7 +22451,7 @@
           sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitignore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gitignore-mode";
           sha256 = "1i98ribmnxr4hwphd95f9hcfm5wfwgdbcxw3g0w17ws7z0ir61mn";
           name = "gitignore-mode";
         };
@@ -22105,7 +22472,7 @@
           sha256 = "00mma30r7ixbrxjmmddz4klh517fcr3yn6ss4zw33fh2hzj3w6rl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitlab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gitlab";
           sha256 = "0vxsqfnipgapnd2ijvdnkspk68dlnki3pkpkzg2h6hyazmzrsqnq";
           name = "gitlab";
         };
@@ -22126,7 +22493,7 @@
           sha256 = "1h66wywhl5ipryx0s0w1vxp3ydg57zpizjz61wvf6qd8zn07nhng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitolite-clone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gitolite-clone";
           sha256 = "1la1nrfns9j6wii6lriwwsd44cx3ksyhh09h8lf9dai6wp67kjac";
           name = "gitolite-clone";
         };
@@ -22147,7 +22514,7 @@
           sha256 = "0y8msn22lzfwh7d417abay9by2zhs9zswhcj8a0l7ln2ksljl500";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitty";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gitty";
           sha256 = "1z6w4vbn0aaajyqanc7h1m5ali7dbrnh4ngw87a2x2pkxarx6x16";
           name = "gitty";
         };
@@ -22160,15 +22527,15 @@
     glsl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "glsl-mode";
-        version = "20150114.1033";
+        version = "20160209.1033";
         src = fetchFromGitHub {
           owner = "jimhourihan";
           repo = "glsl-mode";
-          rev = "6bd83d429307d682fef0efd46c78b3e055e2caf1";
-          sha256 = "0b6ldcfzbdn0mzrcl08zm9kx1hap3djsbzd1qvph1pa2gab25n8j";
+          rev = "b4709644bb01b522ba9c8afe16ed2394783c481f";
+          sha256 = "14ziljq34k585scwn606hqbkcvy8h1iylsc4h2n1grfmm8ilf0ws";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/glsl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/glsl-mode";
           sha256 = "0d05qb60k5f7wwpsp3amzghayfbwcha6rh8nrslhnklpjbg87aw5";
           name = "glsl-mode";
         };
@@ -22189,7 +22556,7 @@
           sha256 = "0j3pay3gd1wdnpc853gy5j68hbavrwy6cc2bgmd12ag29xki3hcg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gmail-message-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gmail-message-mode";
           sha256 = "0py0i7b893ihb8l1hmk3jfl0xil450znadcd18q7svr3zl2m0gkk";
           name = "gmail-message-mode";
         };
@@ -22210,7 +22577,7 @@
           sha256 = "01hhanijqlh741f9wh6xn88qvghwqnfj5j0rvys5mghssfspqs3z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gmail2bbdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gmail2bbdb";
           sha256 = "03jhrk4vpjim3ybzjxy7s9r1cgjysj9vlc4criz5k0w7vqz3r28j";
           name = "gmail2bbdb";
         };
@@ -22231,7 +22598,7 @@
           sha256 = "08d6j5wws2ngngf3p31ic0lrsrp9i9lkpr3nxgmiiadm617x8hv4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gmpl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gmpl-mode";
           sha256 = "1f60xim8h85jmqpvgfg402ff8mjd66gla8fa0cwi7l18ijnjblpz";
           name = "gmpl-mode";
         };
@@ -22252,7 +22619,7 @@
           sha256 = "160qm8xf0yghygb52p8cykhb5vpg9ww3gjprcdkcxplr4b230nnc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnome-calendar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnome-calendar";
           sha256 = "00clamlm5b42zqggxywdqrf6s2dnsxir5rpd8mjpyc502kqmsfn6";
           name = "gnome-calendar";
         };
@@ -22273,7 +22640,7 @@
           sha256 = "1svnvm9fqqx4mrk9jjn11pzqwk71w8kyyd9wwxam8gz22ykw5jb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnomenm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnomenm";
           sha256 = "01vmr64j6hcvdbzg945c5a2g4fiidl18dsk4px7mdf85cv45kzqm";
           name = "gnomenm";
         };
@@ -22294,7 +22661,7 @@
           sha256 = "1nvyjjjydrimpxy4cpg90si7sr8lmldbhlcm2mx8npklp9pn5y3a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gntp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gntp";
           sha256 = "1ywj3p082g54dcpy8q4jnkqfr12npikx8yz14r0njxdlr0janh4f";
           name = "gntp";
         };
@@ -22315,7 +22682,7 @@
           sha256 = "1dfkjzx33wzafj9cfm1bpj99bmnq5a8qrvzmhjykr7mfkca79ymz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnu-apl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnu-apl-mode";
           sha256 = "0971pzc14gw8f0b4lzvicxww1k3wc58gbr3fd0qvdra2jifk2is6";
           name = "gnu-apl-mode";
         };
@@ -22336,7 +22703,7 @@
           sha256 = "1gm116479gdwc4hr3nyv1id692dcd1sx7w2a80pvmgr35ybccn7c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnuplot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnuplot";
           sha256 = "06c5gqf02fkra8c52xck1lqvf4yg45zfibyf9zqmnbwk7p2jxrds";
           name = "gnuplot";
         };
@@ -22357,7 +22724,7 @@
           sha256 = "1pss9a60dh6i277pkp8j5g1v5h7qlh11w2fki50qcp0zglyw1kaq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnuplot-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnuplot-mode";
           sha256 = "1avpik06cmi4h6v6039c64b4zw1r1nsg3nrryl254gl881pysfxg";
           name = "gnuplot-mode";
         };
@@ -22378,7 +22745,7 @@
           sha256 = "1i278npayv3kfxxd1ypi9n83q5l402sbc1zkm11pf8g006ifqsp4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnus-alias";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnus-alias";
           sha256 = "0mbq9v8fiqqyldpb66v9bc777mzxywaq2dabivabxjg6554s8chf";
           name = "gnus-alias";
         };
@@ -22391,15 +22758,15 @@
     gnus-desktop-notify = callPackage ({ fetchFromGitHub, fetchurl, gnus ? null, lib, melpaBuild }:
     melpaBuild {
         pname = "gnus-desktop-notify";
-        version = "20150703.854";
+        version = "20160210.447";
         src = fetchFromGitHub {
           owner = "wavexx";
           repo = "gnus-desktop-notify";
-          rev = "cbd5352d7cb5209a410db7f0faa60b4585f8647b";
-          sha256 = "0ylcphnf4lv78kiazdkl5izn7ql402fpvv82n7n1gpjiqq4ylalr";
+          rev = "c363af85f341cc878d6c0be53fd32efa8ca9423b";
+          sha256 = "1zizmxjf55bkm9agmrym80h2mnyvpc9bamkjy2azs42fqgi9pqjn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnus-desktop-notify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnus-desktop-notify";
           sha256 = "0hf2dszk5d7vn80bm0msaqv7iji384n85dxgw8ng64c0f9f6752b";
           name = "gnus-desktop-notify";
         };
@@ -22417,7 +22784,7 @@
           sha256 = "1r6bck1hsvk39ccri1h128jj8zd0fh9bsrlp8ijb0v9f6x3cysw4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnus-spotlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnus-spotlight";
           sha256 = "065jcix6a4mxwq8wc8gkr0x9lxmn6hlvf0rqmhi8hb840km1syjx";
           name = "gnus-spotlight";
         };
@@ -22438,7 +22805,7 @@
           sha256 = "1dzb3h5swvmwwy7x1lhz79cq2kpmamk35jb4dwmmxz6j248kmv6b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnus-summary-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnus-summary-ext";
           sha256 = "0svyz8fy4k9ba6gpdymf4cf8zjjpgm71y48vlybxbv507xjm17qf";
           name = "gnus-summary-ext";
         };
@@ -22459,7 +22826,7 @@
           sha256 = "1i3f67x2l9l5c5agspbkxr2mmh3rpq3009d8yzh6r1lih0b4hril";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnus-x-gm-raw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnus-x-gm-raw";
           sha256 = "1a5iccghzqmcndql2bppvr48535sf6jbvc83iypr1031z1b5k4wg";
           name = "gnus-x-gm-raw";
         };
@@ -22476,11 +22843,11 @@
         src = fetchFromGitHub {
           owner = "nsf";
           repo = "gocode";
-          rev = "db85a48a7870f46784edc202c780b19e2f65053a";
-          sha256 = "15jjmhw3pd4hx1khbvrypd8s2kh3ymkf8p4qh1c9rbw9csypj3al";
+          rev = "659c0a429af764118d27692d02b77c544a32cfe3";
+          sha256 = "1gfad94acp7qxm6yg0prjfkx370caq309zc8dy20ssi4x19j4n0x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-autocomplete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-autocomplete";
           sha256 = "1ldsq81a167dk2r2mvzyp3v3j2mxc4l9p6b12i7pv8zrjlkhma5a";
           name = "go-autocomplete";
         };
@@ -22501,7 +22868,7 @@
           sha256 = "0phy24cra8cza89xrqsx9xrwg98v9qwqx0fzgm1gwlf333zb3hha";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-complete";
           sha256 = "0dl0ibw145f84kd709r5i2kaw07z1sjzn3dmsiqn8dncspcf2vb4";
           name = "go-complete";
         };
@@ -22522,7 +22889,7 @@
           sha256 = "09rxz40bkr0l75v3lmf8lcwqsgjiv5c8zjmwzy2d4syj4qv69c5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-direx";
           sha256 = "0dq5d7fsld4hww8fl68c18qp6fl3781dqqwd98cg68bihw2wwni7";
           name = "go-direx";
         };
@@ -22543,7 +22910,7 @@
           sha256 = "0wha1h5mnnh3nsiaf5q1drrvk1gj2cn18bapi8ysy5jdpzi4xqsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-dlv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-dlv";
           sha256 = "13mk7mg2xk7v65r1rs6rmvi4g5nvm8jqg3p9nhk62d46i7dzp61i";
           name = "go-dlv";
         };
@@ -22556,15 +22923,15 @@
     go-eldoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
     melpaBuild {
         pname = "go-eldoc";
-        version = "20151028.210";
+        version = "20160217.2131";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-go-eldoc";
-          rev = "684f1414913c85695eb8ca4a2643cea04ee60527";
-          sha256 = "1jwh5rqk7vr6kna6i0p3fl3wjk3mhlr6gxklc3xij4r2zdyfj8na";
+          rev = "ef18dd32e76cab22f17a704943338ffddf283791";
+          sha256 = "1y4zrslmvg88c1q1asf9g509w69cyr3zgknfakdd98xrgfbg580n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-eldoc";
           sha256 = "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk";
           name = "go-eldoc";
         };
@@ -22585,7 +22952,7 @@
           sha256 = "1fm6xd3vsi8mqh0idddjpfxlsmz1ljmjppw3qkxl1vr0qz3598k3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-errcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-errcheck";
           sha256 = "11a75h32cd5h5xjv30x83k60s49k9fhgis31358q46y2gbvqp5bs";
           name = "go-errcheck";
         };
@@ -22598,15 +22965,15 @@
     go-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "go-mode";
-        version = "20160127.204";
+        version = "20160220.1951";
         src = fetchFromGitHub {
           owner = "dominikh";
           repo = "go-mode.el";
-          rev = "63e67b187e8fbe6153995a754c60f65217e53142";
-          sha256 = "10bmd6vx1pxaal61kx87xabw13cyvl7v8z7cfxbxhv5cx0l3qizq";
+          rev = "27b74155dc2896a1809c905a7326b1d6d36014f3";
+          sha256 = "1x29shbz3hmljr92f07kpplj2hpyz64c4miy11a20xlymixchnzb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-mode";
           sha256 = "1852zjxandmq0cpbf7m56ar3rbdi7bx613gdgsf1bg8hsdvkgzfx";
           name = "go-mode";
         };
@@ -22627,7 +22994,7 @@
           sha256 = "1hpxvp0slqafbxhkashnmfjssb0ccjq67x01b4p7gznf6rwji166";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-playground";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-playground";
           sha256 = "1rabwc80qwkafq833m6a199zfiwwmf0hha89721gc7i0myk9pac6";
           name = "go-playground";
         };
@@ -22648,7 +23015,7 @@
           sha256 = "0xm3v6snsxv1x8i4jdq3k2aax7v1xm4zvgc9khabwhc2y63xja46";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-playground-cli";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-playground-cli";
           sha256 = "00h89rh8d7lq1di77nv609xbzxmjmffq6mz3cmagylxncflg81jc";
           name = "go-playground-cli";
         };
@@ -22669,7 +23036,7 @@
           sha256 = "16n8655i7qidakxijymx1n84pnkn3hxpj7lsr901j03blxdrij5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-projectile";
           sha256 = "07diik27gr82n11a8k62v1jxq8rhi16f02ybk548f6cn7iqgp2ml";
           name = "go-projectile";
         };
@@ -22685,11 +23052,11 @@
         version = "20151027.838";
         src = fetchgit {
           url = "https://go.googlesource.com/tools";
-          rev = "a6e3cc80e87d58d7fdb23da870845b456969b929";
-          sha256 = "ba6f77b796479d401f0037132a71493665c0af9830b6b26b1c9ed477247cde8e";
+          rev = "86372b3255bd23c074d3112bdb87052e725463ed";
+          sha256 = "b57e416275e60520686e1f40df43ac646b19e84723e93619497d6800d9d21a4f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-rename";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-rename";
           sha256 = "1sc3iwxiydgs787a6pi778i0qzqv3bf498r47jwiw5b6mmib3fah";
           name = "go-rename";
         };
@@ -22710,7 +23077,7 @@
           sha256 = "1a6vg2vwgnafb61pwrd837fwlq5gs80wawbzjsnykawnmcaag8pm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-scratch";
           sha256 = "11ahvmxbh67wa39cymymxmcpkq0kcn5jz0rrvazjy2p1hx3x1ma5";
           name = "go-scratch";
         };
@@ -22731,7 +23098,7 @@
           sha256 = "0di6xwpl6pi0430q208gliz8dgrzwqnmp997q7xcczbkk8zfwn0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-snippets";
           sha256 = "1wcbnfzxailv18spxyv4a0nwlqh9l7yf5vxg0qcjcp5ajd2w12kn";
           name = "go-snippets";
         };
@@ -22752,7 +23119,7 @@
           sha256 = "0n5nsyfwx2pdlwx6bl35wrfyady5dwraimv92f58mhc344ajd70y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-stacktracer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-stacktracer";
           sha256 = "1laz2ggqydnyr7b36ggb7sphlib79dhp7nszw42wssmv212v94cy";
           name = "go-stacktracer";
         };
@@ -22773,7 +23140,7 @@
           sha256 = "1am415k4xxcva6y3vbvyvknzc6bma49pq3p85zmpjsdmsp18qdix";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/god-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/god-mode";
           sha256 = "01xx2byjh6vlckaxamm2x2qzicd9qc8h6amyjg0bxz3932a4llaa";
           name = "god-mode";
         };
@@ -22794,7 +23161,7 @@
           sha256 = "1k4i9z9h4m0h0y92mncr96jir63q5h1bix5bpnlfxhxl5w8pvk1q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gold-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gold-mode";
           sha256 = "1b67hd1fp6xcj65xxp5jcpdjspxsbzxy26v6lqg5kiy8knls57kf";
           name = "gold-mode";
         };
@@ -22815,7 +23182,7 @@
           sha256 = "0wdw89n7ngxpcdigv8c01h4i84hsdh0y7xq6jdj1i6mnajl8gk92";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/golden-ratio";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/golden-ratio";
           sha256 = "15fkrv0sgpzmnw2h4fp2gb83d8s42khkfq1h76l241njjayk1f81";
           name = "golden-ratio";
         };
@@ -22836,7 +23203,7 @@
           sha256 = "18a7dv8yshspyq4bi30j0l4ap9qp696syfc29mgvly4xyqh9x4qm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/golden-ratio-scroll-screen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/golden-ratio-scroll-screen";
           sha256 = "1ygh104vr65s7frlkzyhrfi6shrbvp2b2j3ynj5dip253v85xki5";
           name = "golden-ratio-scroll-screen";
         };
@@ -22857,7 +23224,7 @@
           sha256 = "16lghkdi0rd7l1fph0a254k6axxivmpmc6grx4ryvza3f4yf7483";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/golint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/golint";
           sha256 = "1q4y6mgll8wyp0c7zx810nzsm0k4wvz0wkly1fbja9z63sjzzxwb";
           name = "golint";
         };
@@ -22878,7 +23245,7 @@
           sha256 = "1anjzlg53kjdqfjcdahbxy8zk9hdha075c1f9nzrnnbbqvmirbbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gom-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gom-mode";
           sha256 = "07zr38gzqb3ds9mpf94c1vhl1rqd0cjh4g4j2bz86q16c0rnmp7m";
           name = "gom-mode";
         };
@@ -22899,7 +23266,7 @@
           sha256 = "06p1dpnmg7lhdff1g7c04qq8f9srgkmnm42jlqy85k87j3p5ys2i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/google";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/google";
           sha256 = "15z8l3adw8il0simk8phjgksh0v88cffb6gg3hv8a7nf5bla43my";
           name = "google";
         };
@@ -22916,11 +23283,11 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "styleguide";
-          rev = "2a576b1397e7f983940d75f1219813ea1d591da9";
-          sha256 = "12m3hxfwp9r86xdwbslvfxcanpxszcg6x0kcgv5i1k6aygrim9h2";
+          rev = "b43afc71a5ae4a2585a583333b45ce664cd2c3c6";
+          sha256 = "0ksbrnca7zyapz874m4kvfvzv7m30d08gpqdi50q8v5197b1h0rv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/google-c-style";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/google-c-style";
           sha256 = "10gsbg880jbvxs4291vi2ww30ird2f313lbgcb11lswivmhrmd1r";
           name = "google-c-style";
         };
@@ -22941,7 +23308,7 @@
           sha256 = "1h7nj570drp2l9x6475gwzcjrp75ms8dkixa7qsgszjdk58qyhnb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/google-contacts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/google-contacts";
           sha256 = "0wgi244zy2am90alimgzazshk2z756bk1hchphssfa4j15n16jgn";
           name = "google-contacts";
         };
@@ -22962,7 +23329,7 @@
           sha256 = "183igr5lp20zcqi7rc01fk76sfxdhksd74i11v16gdsifdkjimd0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/google-maps";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/google-maps";
           sha256 = "0a0wqs3cnlpar2dzdi6h14isw78vgqr2r6psmrzbdl00s4fcyxwx";
           name = "google-maps";
         };
@@ -22983,7 +23350,7 @@
           sha256 = "0r6hngf3h5x55lk2qwfgd6bhjhkax5nz8ml43d1x23y5bjnrricq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/google-this";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/google-this";
           sha256 = "0hg9y1b03aiamyn3mam3hyxmxy21wygxrnrww91zcbwlzgp4dd2c";
           name = "google-this";
         };
@@ -23004,7 +23371,7 @@
           sha256 = "0hvxyqkxv5hfsa9sv71m7d98g25a1xc962r961nw6vmbvsf64z6b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/google-translate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/google-translate";
           sha256 = "1crgzdd32mk6hrawdypg496dwh51wzwfb5wqw4a2j5l8y958xf47";
           name = "google-translate";
         };
@@ -23025,7 +23392,7 @@
           sha256 = "0l022aqpnb38q6kgdqpbxrc1r7fljwl7xq14yi5jb7qgzw2v43cz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gore-mode";
           sha256 = "0nljybh2pw8pbbajfsz57r11rs4bvzfxmwpbm5qrdn6dzzv65nq3";
           name = "gore-mode";
         };
@@ -23046,7 +23413,7 @@
           sha256 = "1abb78xxsggawl43hspl0cr0f7i1b3jd9r6xl1nl5jg97i4byg0b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gorepl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gorepl-mode";
           sha256 = "12h9r4kf9y2v601myhzzdw2c4jc5cb7s94r5dkzriq578digxphl";
           name = "gorepl-mode";
         };
@@ -23067,7 +23434,7 @@
           sha256 = "0vf42j9jpa75879pxb1h7qgflcrrg78dgq5lg8v0sbpy7z86zaxr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gotest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gotest";
           sha256 = "1kan3gykhci33jgg67jjiiz7rqlz5mpxp8sh6mb0n6kpfmgb4ly9";
           name = "gotest";
         };
@@ -23088,7 +23455,7 @@
           sha256 = "12lglll20w321vvl6zpqd8r9745y58g6zzfm83iifyzd9hzx7v30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gotham-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gotham-theme";
           sha256 = "0jars6rvf7hkyf71vq06mqki1r840i1dvv43dissqjg5i4lr79cl";
           name = "gotham-theme";
         };
@@ -23106,7 +23473,7 @@
           sha256 = "078d6p4br5vips7b9x4v6cy0wxf6m5ij9gpqd4g33bryn22gnpij";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/goto-chg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/goto-chg";
           sha256 = "0fs0fc1mksbb1266sywasl6pppdn1f9a4q9dwycl9zycr588yjyv";
           name = "goto-chg";
         };
@@ -23127,7 +23494,7 @@
           sha256 = "0j2hdxqfsifm0d8ilwcw7np6mvn4xm58xglzh42gigj2fxv87g99";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/goto-gem";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/goto-gem";
           sha256 = "06vy9m01qccvahxr5xn0plzw9knl5ig7gi5q5r1smfx92bmzkg3a";
           name = "goto-gem";
         };
@@ -23148,7 +23515,7 @@
           sha256 = "1f0zlvva7d7iza1v79yjp0bm7vd011q4cy14g1saryll32z115z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/goto-last-change";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/goto-last-change";
           sha256 = "1yl9p95ls04bkmf4d6az72pycp27bv7q7wxxzvj8sj97bgwvwajx";
           name = "goto-last-change";
         };
@@ -23165,11 +23532,11 @@
         src = fetchFromGitHub {
           owner = "vmware";
           repo = "govmomi";
-          rev = "367391c0c3de585b791b72bdcd045810fb17d606";
-          sha256 = "1bqqdwwc63g05wwnk15745mmf4g7r23nzyq681im6icy13x6z07x";
+          rev = "227420a68c86f8890c8c768fd908e1ef3a816702";
+          sha256 = "0hm5w34z6wghmaf4d6j9pzcbpz6nsmz6xwzx6rd1gr73v5marayp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/govc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/govc";
           sha256 = "1ivgaziv25wlzg6y4zh8x7mv97pnyhi7p8jpvgh5fg5lnqpzhl4v";
           name = "govc";
         };
@@ -23190,7 +23557,7 @@
           sha256 = "1fzf43my7qs4n37yh1jm6fyp76dfgknc5g4zin7x5b5lc63g0wxb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/govet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/govet";
           sha256 = "1rpgngixf1xnnqf0l2vvh6y9q3395qyj9ln1rh0xz5lm7d4pq4hy";
           name = "govet";
         };
@@ -23211,7 +23578,7 @@
           sha256 = "1l43h008l7n6waclb2km32dy8aj7m5yavm1pkq38p9ppzayfxqq1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gplusify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gplusify";
           sha256 = "0fgkcvppkq6pba1giddkfxp9z4c8v2cid9nb8a190b3g85wcwycr";
           name = "gplusify";
         };
@@ -23232,7 +23599,7 @@
           sha256 = "0xs2278gamzg0710bm1fkhjh1p75m2l1jcl98ldhyjhvaf9d0ysc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gradle-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gradle-mode";
           sha256 = "0lx9qi93wmiy9pxjxqp68scbcb4bx88b6jiqk3y8jg5cajizh24g";
           name = "gradle-mode";
         };
@@ -23249,11 +23616,11 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "792b0c5a72f7500c8e07f37b77b96fd1f91ac61b";
-          sha256 = "03dranmbrq9gkvlcvzlrvv0nvpkgk02hcwfcjkdifql2j8h23jgy";
+          rev = "d17b29b0ccffb1a7c6e5f3f13268ad2c5770249b";
+          sha256 = "0gvz0zdpspl8dhsm17f0q9020ayvxmgmm15yy7hnl4z0xrv9yvjr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grails-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grails-mode";
           sha256 = "1zdlmdkwyaj2zns3xwmqpil83j7857aj2070kvx8xza66dxcnlm4";
           name = "grails-mode";
         };
@@ -23274,7 +23641,7 @@
           sha256 = "11ry4p5r0hg3jlmfhp6hfkryzrp6snl38v8j7ds8limhbpdh5wr4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grails-projectile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grails-projectile-mode";
           sha256 = "0dy8v2mila7ccvb7j5jlfkhfjsjfk3bm3rcy84m0rgbqjai67amn";
           name = "grails-projectile-mode";
         };
@@ -23295,7 +23662,7 @@
           sha256 = "1202fwwwdr74q6s5jv1n0mvmq4n9mra85l14hdhwh2kks513s6vs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grandshell-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grandshell-theme";
           sha256 = "1mnnjsw1kx40b6ws8wmk25fz9rq8rd70xia9cjpwdfkg7kh8xvsa";
           name = "grandshell-theme";
         };
@@ -23316,7 +23683,7 @@
           sha256 = "1f34bhjxmbf2jjrkpdvqg2gwp83ka6d5vrxmsxdl3r57yc6rbrwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/graphene";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/graphene";
           sha256 = "1wz3rvd8b7gx5d0k7yi4dd69ax5bybcm10vdc7xp4yn296lmyl9k";
           name = "graphene";
         };
@@ -23349,7 +23716,7 @@
           sha256 = "1bidfn4x5lb6dylhadyf05g4l2k7jg83mi058cmv76av1glawk17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/graphene-meta-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/graphene-meta-theme";
           sha256 = "1cqdr93lccdpxkzgap3r3qc92dh8vqgdlnxvqkw7lrcbs31fvf3q";
           name = "graphene-meta-theme";
         };
@@ -23370,7 +23737,7 @@
           sha256 = "12r6a3hikzqcdbplmraa4p4w136c006yamylxfjf8580v15xngrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/graphviz-dot-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/graphviz-dot-mode";
           sha256 = "04rkynsrsk6w4sxn1pc0b9b6pij1p7yraywbrk7qvv05fv69kri2";
           name = "graphviz-dot-mode";
         };
@@ -23391,7 +23758,7 @@
           sha256 = "0nvl8mh7jxailisq31h5bi64s9b74ah1465wiwh18x502swr2s3c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grapnel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grapnel";
           sha256 = "019cdx1wdx8sc2ibqwgp1akgckzxxvrayyp2sv806gha0kn6yf6r";
           name = "grapnel";
         };
@@ -23411,7 +23778,7 @@
           sha256 = "0djv2ps2ahw9b1b5i45hgy7l7cch7cgh7rzq601c0r6vi7gm2ac5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grass-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grass-mode";
           sha256 = "1lq6bk4bwgcy4ra3d9rlca3fk87ydg7xnnqcqjg0pw4m9xnr3f7v";
           name = "grass-mode";
         };
@@ -23432,7 +23799,7 @@
           sha256 = "0rgv96caigcjffg1983274p4ff1icx1xh5bj7rcd53hai5ag16mp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/green-phosphor-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/green-phosphor-theme";
           sha256 = "1p4l75lahmbjcx74ca5jcyc04828vlcahk7gzv5lr7z9mhvq6fbh";
           name = "green-phosphor-theme";
         };
@@ -23453,7 +23820,7 @@
           sha256 = "1670pxgmqflzw5d02mzsmqjf3gp0c4wf25z0crmaamyfmwdz9pag";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gregorio-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gregorio-mode";
           sha256 = "0f226l67bqqc6m8wb97m7lkxvwrfbw74b1riasirca1anzjl8jfx";
           name = "gregorio-mode";
         };
@@ -23474,7 +23841,7 @@
           sha256 = "1f8262mrlinzgnn4m49hbj1hm3c1mvzza24py4b37sasn49546lw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grep-a-lot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grep-a-lot";
           sha256 = "1513vnm5b587r15hcbnplgsfv7kv8g5fd0w4nwb6pq7myzv53ra1";
           name = "grep-a-lot";
         };
@@ -23486,13 +23853,13 @@
       }) {};
     grep-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "grep-plus";
-        version = "20151231.1524";
+        version = "20160212.825";
         src = fetchurl {
           url = "http://www.emacswiki.org/emacs/download/grep+.el";
-          sha256 = "1pqx01c61i3rxvq2qf8l6gcla8jsmc1af5780s78clqfi51kbg2g";
+          sha256 = "08jl4xhh25znyc6cm7288x4b55pykrpcsyym78fdlrw3xxr77cxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grep+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grep+";
           sha256 = "1qj4f6d3l88bdcnq825pylnc76m22x2i15yxdhc2b6rv80df7zsx";
           name = "grep-plus";
         };
@@ -23513,7 +23880,7 @@
           sha256 = "14c09m9p6556rrf0qfad4zsv7qxa5flamzg6fa83cxh0qfg7wjbp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/greymatters-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/greymatters-theme";
           sha256 = "10cxajyws5rwk62i4vk26c1ih0dq490kcfx7gijw38q3b5r1l8nr";
           name = "greymatters-theme";
         };
@@ -23532,7 +23899,7 @@
           sha256 = "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grin";
           sha256 = "0mvzwmws5pi6hpzgkc43fjxs98ngkr0jvqbclza2jbbqawifzzbk";
           name = "grin";
         };
@@ -23553,7 +23920,7 @@
           sha256 = "1d2kwiq3zy8wdg5zig0q9rrdcs4xdv6zsgvgc21b3kv83daq1dsq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grizzl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grizzl";
           sha256 = "1klds0w9qrsgfppq105qr69c26zi91y575db2hxr6h9vypf2rq24";
           name = "grizzl";
         };
@@ -23570,11 +23937,11 @@
         src = fetchFromGitHub {
           owner = "Groovy-Emacs-Modes";
           repo = "groovy-emacs-modes";
-          rev = "792b0c5a72f7500c8e07f37b77b96fd1f91ac61b";
-          sha256 = "03dranmbrq9gkvlcvzlrvv0nvpkgk02hcwfcjkdifql2j8h23jgy";
+          rev = "d17b29b0ccffb1a7c6e5f3f13268ad2c5770249b";
+          sha256 = "0gvz0zdpspl8dhsm17f0q9020ayvxmgmm15yy7hnl4z0xrv9yvjr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/groovy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/groovy-mode";
           sha256 = "1pxw7rdn56klmr6kw21lhzh7zhp338gyf54ypsml64ibzr1x9kal";
           name = "groovy-mode";
         };
@@ -23587,15 +23954,15 @@
     gruber-darker-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "gruber-darker-theme";
-        version = "20151223.252";
+        version = "20160209.416";
         src = fetchFromGitHub {
           owner = "rexim";
           repo = "gruber-darker-theme";
-          rev = "60d8262d8e38103568bbe58e2ece1d9a970fc15a";
-          sha256 = "0l6gkhzg0dn4q223gljh1jh305aa9n8rbf9h5gg5d1aygs7cb3ha";
+          rev = "87bb44be343676b622dd7fb7f09e2861b21e2346";
+          sha256 = "0mb38niiscl0jljq43z9scl6zarqqgavhal3c4dzwbjyfy21c16a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gruber-darker-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gruber-darker-theme";
           sha256 = "0vn4msixb77xj6p5mlfchjyyjhzah0lcmp0z82s8849zd194fxqi";
           name = "gruber-darker-theme";
         };
@@ -23616,7 +23983,7 @@
           sha256 = "1js849s8b9x0n6ak2qwv90lk6zr71mgkk9f0xccdhikz4c8vxk0r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grunt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grunt";
           sha256 = "1qdzqcrff9x97kyy0d4j636d5i751qja10liw8i0lf4lk6n0lywz";
           name = "grunt";
         };
@@ -23637,7 +24004,7 @@
           sha256 = "04jknwkax9gdmzz0yq0m21grl9c43vr3abdam3g8zjh5sjx5gs14";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gruvbox-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gruvbox-theme";
           sha256 = "042mnwlmixygk2mf24ygk7rkv1rfavc5a36hs9x8b68jnf3khj32";
           name = "gruvbox-theme";
         };
@@ -23658,7 +24025,7 @@
           sha256 = "1d89gxyzv0z0nk7v1aa4qa0xfms2g2dsrr07cw0d99xsnyxfky31";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gs-mode";
           sha256 = "02ldd92fv1k28nygl34i8gv0b0i1v5qd7nl1l17cf5f3akdwc6iq";
           name = "gs-mode";
         };
@@ -23679,7 +24046,7 @@
           sha256 = "1dfd22629gz0c8r4wplvbn0n7bm20549mg5chq289s826ca0kxqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gscholar-bibtex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gscholar-bibtex";
           sha256 = "0d41gr9amf9vdn9pl9lamhp2swqllxslv9r3wsgzqvjl7zayd1az";
           name = "gscholar-bibtex";
         };
@@ -23700,7 +24067,7 @@
           sha256 = "14sx5m6fpkm2q8ljkicl1yy1sw003k4rzz9hi7lm1nfqr2l4n6q0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/guide-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/guide-key";
           sha256 = "0zjrdvppcg8b2k6hfdj45rswc1ks9xgimcr2yvgpc8prrwk1yjsf";
           name = "guide-key";
         };
@@ -23721,7 +24088,7 @@
           sha256 = "1s6p4ysdbqx5fk68s317ckj5rjmpkwwb0324sbqqa6byhw3j0xyj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/guide-key-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/guide-key-tip";
           sha256 = "0h2vkkbxq361dkn6irm1v19qj7bkhxcjljiksd5wwlq5zsq6bd06";
           name = "guide-key-tip";
         };
@@ -23742,7 +24109,7 @@
           sha256 = "16h1g88y4q737sxcjkm1kxirv5m2x3l9wgmz0s4hlxjzli8fc7jr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/guru-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/guru-mode";
           sha256 = "0j25nxs3ndybq1ik36qyqdprmhav4ba8ny7v2z61s23id8hz3xjs";
           name = "guru-mode";
         };
@@ -23763,7 +24130,7 @@
           sha256 = "0060qw4gr9fv6db20xf3spgl2fwg2iid5ckfjm3vj3ydyv62q13s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gvpr-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gvpr-mode";
           sha256 = "19p6f06qdjvh2vmgbabajvkfxpn13j899jrivw9mqyssz0cyvzgw";
           name = "gvpr-mode";
         };
@@ -23784,7 +24151,7 @@
           sha256 = "15d7zjxjp9h8jmxq3dqakwzlymqk6hqsg7zklkjs0ih7fz0d25pl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hackernews";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hackernews";
           sha256 = "1x1jf5gkhmpiby5rmy0sziywh6c1f1n0p4f6dlz6ifbwns7har6a";
           name = "hackernews";
         };
@@ -23805,7 +24172,7 @@
           sha256 = "0d3xmagl18pas19zbpg27j0lmdiry23df48z4vkjsrcllqg25v5g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ham-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ham-mode";
           sha256 = "000qrdby7d6zmp5066vs4gjlc9ik0ybrgcwzcbfgxb16w1g9xpmz";
           name = "ham-mode";
         };
@@ -23826,7 +24193,7 @@
           sha256 = "1rnkzl51h263nck1bd0jyb7q58b54d764gcsh7wqxfgzs1jfr4am";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hamburg-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hamburg-theme";
           sha256 = "149ln7670kjyhdfj5j9akxch47dlff2hd58amla7j3297z1nhg4k";
           name = "hamburg-theme";
         };
@@ -23847,7 +24214,7 @@
           sha256 = "0fmcm4pcivigz9xhf7z9wsxz9pg1yfx9qv8na2dxj426bibk0a6w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haml-mode";
           sha256 = "0ih0m7zr6kgn6zd45zbp1jgs1ydc5i5gmq6l080wma83v5w1436f";
           name = "haml-mode";
         };
@@ -23868,7 +24235,7 @@
           sha256 = "1njrpb1s2v9skyfbgb28clrxyvyp8i4b8kwa68ynvq3vjb4fnws6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hamlet-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hamlet-mode";
           sha256 = "0ils4w8ry1inlfj4931ypibj3n60xq6ah74hig62y4vrs4d47gyx";
           name = "hamlet-mode";
         };
@@ -23889,7 +24256,7 @@
           sha256 = "0w443knp6kvjm2m79cni5d17plyhbsl0a4kip7yrpv5nmg370q3p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/handlebars-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/handlebars-mode";
           sha256 = "11ahrm4n588v7ir2r7sp4dkbypl5nhnr22px849hdxjcrwal24vj";
           name = "handlebars-mode";
         };
@@ -23910,7 +24277,7 @@
           sha256 = "1z37di9vk1l35my8kl8jnyqlkr1rnp0iz13hpc0r065mib67v58k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/handlebars-sgml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/handlebars-sgml-mode";
           sha256 = "10sxm7v94yxa92mqbwj3shqjs6f3zbxjvwgbvg9m2fh3b7xj617w";
           name = "handlebars-sgml-mode";
         };
@@ -23931,7 +24298,7 @@
           sha256 = "0whn8rc98dhncgizzrb22nx6b6cm655q1cf2fpn6g3knq1c2471r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/handoff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/handoff";
           sha256 = "0iqqvygx50wi2vcbs6bfgqzhcz9a89zrwb7sg0ang9qrkiz5k36w";
           name = "handoff";
         };
@@ -23952,7 +24319,7 @@
           sha256 = "124k803pgxc7fz325yy6jcyam69f5fk9kdwfgmnwwca9ablq4cfb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hardcore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hardcore-mode";
           sha256 = "1bgi1acpw4z7i03d0i8mrd2hpjn6hyvkdsk0ks9q380yp9mqmiwd";
           name = "hardcore-mode";
         };
@@ -23973,7 +24340,7 @@
           sha256 = "13pgxskddir74lqknkkflzkrv6q455cf5s7wjww1zgvw95j7q50v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hardhat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hardhat";
           sha256 = "16pdbpm647ag9cadmdm75nwwyzrqsd9y1b4zgkl3pg669mi5vl5z";
           name = "hardhat";
         };
@@ -23994,7 +24361,7 @@
           sha256 = "1l08d6qn7ixs3yg6svh8fd2x6zwjkbv0s34vm5aa7krx7yhydblx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-emacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haskell-emacs";
           sha256 = "1wkh7qws35c32hha0p9rpjz5pls2844920nh919lvp2wmq9l6jd6";
           name = "haskell-emacs";
         };
@@ -24015,7 +24382,7 @@
           sha256 = "1l08d6qn7ixs3yg6svh8fd2x6zwjkbv0s34vm5aa7krx7yhydblx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-emacs-base";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haskell-emacs-base";
           sha256 = "1fwkds6qyhbxxdgxfzmgd7dlcxr08ynrrg5jdp9r7f924pd536vb";
           name = "haskell-emacs-base";
         };
@@ -24036,7 +24403,7 @@
           sha256 = "1l08d6qn7ixs3yg6svh8fd2x6zwjkbv0s34vm5aa7krx7yhydblx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-emacs-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haskell-emacs-text";
           sha256 = "1j18fhhra6lv32xrq8jc6l8i56fgn68da81wymcimpmpbp0hl5fy";
           name = "haskell-emacs-text";
         };
@@ -24049,15 +24416,15 @@
     haskell-mode = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "haskell-mode";
-        version = "20160202.1531";
+        version = "20160221.351";
         src = fetchFromGitHub {
           owner = "haskell";
           repo = "haskell-mode";
-          rev = "b562d054972c5d976f1c5d222bec9aa1189bd0dd";
-          sha256 = "0w5q3cff31qsyq9z4ci6x9pdacjmdlh5w6h0n485b92yb8ryxa5r";
+          rev = "2193190a271cc99e09399f53164c06d62826a490";
+          sha256 = "0alyyffv8x74nfgp2alai711hvwhgqh7xl38gcvpdfdl7w1msfzi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haskell-mode";
           sha256 = "0wijvcpfdbl17iwzy47vf8brkj2djarfr8y28rw0wqvbs381zzwp";
           name = "haskell-mode";
         };
@@ -24078,7 +24445,7 @@
           sha256 = "1wha5f2zx5hr6y0wvpmkg7jnxcgbzx99gd70h96c3dqqqhqz6d2a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haskell-snippets";
           sha256 = "10bvv7q694fahcpm83v8lpqihg1gvfzrp1hdzwiffxydfvdbalh2";
           name = "haskell-snippets";
         };
@@ -24098,7 +24465,7 @@
           sha256 = "7e41c910d6901638b9dfb697206659f5441e26e0558f9227c4ba7c6f2f47d841";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-tab-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haskell-tab-indent";
           sha256 = "0vdfmy56w5yi202nbd28v1bzj97v1wxnfnb5z3dh9687p2abgnr7";
           name = "haskell-tab-indent";
         };
@@ -24119,7 +24486,7 @@
           sha256 = "1gmh455ahd9if11f8mrqbfky24c784bb4fgdl3pj8i0n5sl51i88";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haste";
           sha256 = "0wz15p58g4mxvwbpy9k60gixs1g4jw7pay5pbxnlggc39x1py8nf";
           name = "haste";
         };
@@ -24139,7 +24506,7 @@
           sha256 = "106a7kpjj4laxl7x8aqpv75ih54569b3bs2a1b8z4rghmikqc4aw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haxe-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haxe-mode";
           sha256 = "032h0nxlsrk30bsqb02by842ycrw1qscpfprifjjkaiq08wigh1l";
           name = "haxe-mode";
         };
@@ -24160,7 +24527,7 @@
           sha256 = "1si5r86zvnp4wbzvvqyc4zhap14k8pcq5nqigx45mgvpdnwdvzln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haxor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haxor-mode";
           sha256 = "1y4m058whdqnkkf9s6hzi0h6w0fc8ajfawhpjj0wqjam4adnfkq5";
           name = "haxor-mode";
         };
@@ -24181,7 +24548,7 @@
           sha256 = "0pjxyhh8a02i54a9jsqr8p1mcqfl6k9b8gv9lnzb242gy4518y3l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hayoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hayoo";
           sha256 = "1rqvnv5nxlsyvsa5my1wpfm82sw21s7kfbg80vrjmxh0mwlyv4p9";
           name = "hayoo";
         };
@@ -24202,7 +24569,7 @@
           sha256 = "0rgcj47h7a67qkw6696pcm1a4g4ryx8nrz55s69fw86958fp08hk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hc-zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hc-zenburn-theme";
           sha256 = "0jcddk9ppgcizyyciabj3sgk1pmingl97knf9nmr0mi89h7n2g5y";
           name = "hc-zenburn-theme";
         };
@@ -24223,7 +24590,7 @@
           sha256 = "1vf5130bj1ii9j8qq9vdw0ga0qgfk8brjz34ysfmz9l2ihlcxvl0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hcl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hcl-mode";
           sha256 = "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin";
           name = "hcl-mode";
         };
@@ -24241,7 +24608,7 @@
           sha256 = "00j74cqdnaf5rl7w4wabm4z88cm20s152y0yxnv73z9pvqbknrmm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/header2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/header2";
           sha256 = "1dg25krx3wxma2l5vb2ji7rpfp17qbrl62jyjpa52cjfsvyp6v06";
           name = "header2";
         };
@@ -24262,7 +24629,7 @@
           sha256 = "06hq6p6a4fzprbj4r885vsvzddlvx0wxqk5kik06v5bm7hjmnyrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/headlong";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/headlong";
           sha256 = "042ybplkqjb30qf5cpbw5d91j1rdc71b789v277h036bri7hgxz6";
           name = "headlong";
         };
@@ -24275,15 +24642,15 @@
     helm = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "helm";
-        version = "20160204.1126";
+        version = "20160217.1158";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "6085777884bf8cc63a6e15cbbb506d09d782f0cc";
-          sha256 = "1rwdh2mwn3ynw1c1b5fxdblnyfrqcnbs5045dfl4f8afwqqh92w8";
+          rev = "27baadfe942d7b3a2b5049029c002d6a1cc9fea2";
+          sha256 = "04fw48six952jxcp9mriz7pcfj223z80am9ig1y4rp3yanqm6z1x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm";
           sha256 = "0xsf4rg7kn0m5wjlbwhd1mc38lg2822037dyd0h66h6x2gbs3fd9";
           name = "helm";
         };
@@ -24304,7 +24671,7 @@
           sha256 = "0nip0zrmn944wy0x2dc5ryr0m7a948rn2a8cbaajghs7a7zai4cr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-R";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-R";
           sha256 = "0zq9f2xhgap3ihnrlsrsaxaz0nx014k0820bfsq7lckwcnm0mng1";
           name = "helm-R";
         };
@@ -24325,7 +24692,7 @@
           sha256 = "04rvbafa77blps7x7cmlsciys8fgmvhfhq4v51pk8z5q3j1lrgc5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ack";
           sha256 = "1a8sc5gd2g57dl9g18wyydfmihy74yniwhjr27h7vxylnf2g3pni";
           name = "helm-ack";
         };
@@ -24346,7 +24713,7 @@
           sha256 = "0hxfgdn56c7qr64r59g9hvxxwa4mw0ad9c9m0z5cj85bsdd7rlx4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ad";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ad";
           sha256 = "0h2zjfj9hy7bkpmmjjs0a4a06asbw0yww8mw9rk2xi1gc2aqq4hi";
           name = "helm-ad";
         };
@@ -24363,12 +24730,12 @@
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-helm-ag";
-          rev = "33a924553eb0cc8d80022bea491718aba48801d0";
-          sha256 = "1gbvhc8wpai3gvnzsmg1y7qffvimg77b36dcm7n82iy6pavdn9z3";
+          rev = "e8af4023bcd49700751c2b6dc3591b5e48016413";
+          sha256 = "0ig7d8a0ikslm3yvq8yjzc83rg2xxs0gl54g01bi4rydl3p9b6s3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ag";
-          sha256 = "023zvgmi5b5b2qga3jqd7jrq9ap8n3rhvl6jrv9fsi565sg1fv43";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ag";
+          sha256 = "050qh5xqh8lwkgmz3jxm8gql5nd7bq8sp9q6mzm2z7367qy4qqyf";
           name = "helm-ag";
         };
         packageRequires = [ emacs helm ];
@@ -24388,7 +24755,7 @@
           sha256 = "1rifdkhzvf7xd2npban0i8v3rjcji69063dw9rs1d32w4n7fzlfa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ag-r";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ag-r";
           sha256 = "0ivh7f021lbmbaj6gs4y8m99s63js57w04q7cwx7v4i32cpas7r9";
           name = "helm-ag-r";
         };
@@ -24409,7 +24776,7 @@
           sha256 = "153zq1q3s3ihjh15wyci9qdic3pin8f1j1gq2qlzyhmy0njlvgjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-anything";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-anything";
           sha256 = "0yjlwsiahb7n4q3522d68xrdb8caad9gpnglz5php245yqy3n5vx";
           name = "helm-anything";
         };
@@ -24430,7 +24797,7 @@
           sha256 = "1bnypr906gfc1fbyrqfsfilsl6wiacrnhr8flpa0gmdjhvmrw7af";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-aws";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-aws";
           sha256 = "0sjgdjpznjxsf6nlv2ah45fw17j8j5apdphd1fp43rjv1lskkgc5";
           name = "helm-aws";
         };
@@ -24451,7 +24818,7 @@
           sha256 = "0d6h4gbb69abxxgm85pdi5rsaf9h72yryg72ykd5633i1g4s8a76";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-backup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-backup";
           sha256 = "182jbm36yzayxi9y3vhpyn25ivrgay37sncqvah35vbw52lnjcn3";
           name = "helm-backup";
         };
@@ -24464,15 +24831,15 @@
     helm-bibtex = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, parsebib, s }:
     melpaBuild {
         pname = "helm-bibtex";
-        version = "20160127.1352";
+        version = "20160210.1638";
         src = fetchFromGitHub {
           owner = "tmalsburg";
           repo = "helm-bibtex";
-          rev = "be4c894463ee77ee719d0c5517cf414a8fcc6cce";
-          sha256 = "046gycmwrn0h1ld37b7pwylb9nkyzgpzlbf7p99fq8p2mnsz3rcj";
+          rev = "7895ac0f016cca71b6e171a98fee236d5ed312dd";
+          sha256 = "0j6ygwkwmjs7hblllj3mv2byc7lcqxx9vyjxs34j8q1vpam972p3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-bibtex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-bibtex";
           sha256 = "1rsplnh18w1fqr6da79vj8x9q2lyss9sssy8pfz3hfw7p6qi6zkg";
           name = "helm-bibtex";
         };
@@ -24493,7 +24860,7 @@
           sha256 = "10k7hjfz9jmfpbmsv20jy9vr6fqxx1yp8v115hprqvw057iifsl9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-bibtexkey";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-bibtexkey";
           sha256 = "00i7ni4r73mmxavhfcm0fd7jhx6gxvxx7prax1yxmhs46fpz8jwj";
           name = "helm-bibtexkey";
         };
@@ -24514,7 +24881,7 @@
           sha256 = "1wmcy7q4ys2sf8ya5l4n7a6bq5m9d6m19amjfwkmkh4ajkwl041y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-bind-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-bind-key";
           sha256 = "1yfj6mmxc165in1i85ccanssch6bg19ib1fcm7sa4i4hv0mgwaid";
           name = "helm-bind-key";
         };
@@ -24535,7 +24902,7 @@
           sha256 = "1gcx7imq9gxfgmh188a8xlpmmlrdif1vsnnff49qvk82082ghbfz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-bm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-bm";
           sha256 = "1dnlcvn0zv4qv4ii4j0h9r8w6vhi3l0c5aa768kblh5r2rf4bjjh";
           name = "helm-bm";
         };
@@ -24556,7 +24923,7 @@
           sha256 = "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-bundle-show";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-bundle-show";
           sha256 = "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7";
           name = "helm-bundle-show";
         };
@@ -24577,7 +24944,7 @@
           sha256 = "0w4svbg32y63v049plvk7djc1m2amjzrr1v979d9s6jbnnpzlb5c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-c-moccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-c-moccur";
           sha256 = "1i6a4jqjy9amlhdbj5d26wzagndfgszha09vs5qf4760vjl7kn4b";
           name = "helm-c-moccur";
         };
@@ -24598,7 +24965,7 @@
           sha256 = "03c4w34r0q7xpz1ny8dya8f96rhjpc9r2c24n7vg9x6x4i2wl204";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-c-yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-c-yasnippet";
           sha256 = "0jwj4giv6lxb3h7vqqb2alkwq5kp0shy2nraik33956p4l8dfs90";
           name = "helm-c-yasnippet";
         };
@@ -24619,7 +24986,7 @@
           sha256 = "0wkskm0d1mvh49l65xg6pgwd7yxy02llflkzx59ayqv4wjvsyayb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-chrome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-chrome";
           sha256 = "0p3n2pna83mp4ym8x69lk4r3q4apbj5v2blg2mwcsd9zij153nxz";
           name = "helm-chrome";
         };
@@ -24640,7 +25007,7 @@
           sha256 = "1dmj4f8pris1i7wvfplp4dbnyfm403l6rplxfrfi0cd9afg7m68i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-chronos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-chronos";
           sha256 = "1a65b680741cx4cyyizyl2c3bss36x3j2m9sh9hjc87xrzarg0s3";
           name = "helm-chronos";
         };
@@ -24661,7 +25028,7 @@
           sha256 = "18j4ikb3q8ygdq74zqzm83wgb39x7w209n3186mm051n8lfmkaif";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-cider-history";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-cider-history";
           sha256 = "12l8jyl743zqk8m2xzcz75y1ybdkbkvcbvfkn1k88k09s31kdq4h";
           name = "helm-cider-history";
         };
@@ -24674,15 +25041,15 @@
     helm-circe = callPackage ({ circe, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-circe";
-        version = "20150317.44";
+        version = "20160207.52";
         src = fetchFromGitHub {
           owner = "lesharris";
           repo = "helm-circe";
-          rev = "0b7ecf5380971ee7b6291fca6a2805c320638238";
-          sha256 = "1iqjc15pz5qr8zjxaxz1b2vys2689ri76jacmipxvgjk0y7vc5f0";
+          rev = "9091651d9fdd8d49d8ff6f9dcf3a2ae416c9f15a";
+          sha256 = "1gwg299s8ps0q97iw6p515gwn73rjk1icgl3j7cj1s143njjg122";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-circe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-circe";
           sha256 = "12jfzg03573lih2aapvv5h2mi3pwqc9nrmv538ivjywix5117k3v";
           name = "helm-circe";
         };
@@ -24692,6 +25059,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-clojuredocs = callPackage ({ edn, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-clojuredocs";
+        version = "20160221.1512";
+        src = fetchFromGitHub {
+          owner = "mbuczko";
+          repo = "helm-clojuredocs";
+          rev = "ac9e82c56f269f284968acbdf831b30b61b8ea70";
+          sha256 = "0c6gicql7jl0ygwp30axy5wrvwjj1xjnm3x0cjqg07pbycjhl65x";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-clojuredocs";
+          sha256 = "0yz0wlyay9286by8i30gs3ispswq8ayqlcnna1s7bgspjvb7scmk";
+          name = "helm-clojuredocs";
+        };
+        packageRequires = [ edn helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-clojuredocs";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-cmd-t = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-cmd-t";
@@ -24703,7 +25091,7 @@
           sha256 = "10cp21v8vwgp8hv2rkdn9x8v2n8wqbphgslb561rlwc2rfpvzqvs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-cmd-t";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-cmd-t";
           sha256 = "04fmhravd3ld4n1n820wlnr1jvmk7c7cdazd15gazixrlz6fm4fk";
           name = "helm-cmd-t";
         };
@@ -24724,7 +25112,7 @@
           sha256 = "05nvbwz3inbmfj88am69sz032wsj8jkfpjk5drgfijw98il9blk9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-codesearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-codesearch";
           sha256 = "1v21zwcyx73bc1lcfk60v8xim31bwdk4p06g9i4qag3cijdlli9q";
           name = "helm-codesearch";
         };
@@ -24745,7 +25133,7 @@
           sha256 = "0fxrmvb64lav4aqs61z3a4d2mcp9s2nw7fvysyjn0r1291pkzk9j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-commandlinefu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-commandlinefu";
           sha256 = "150nqib0sr4n35vdj1xrxcja8gkv3chzhdbgkjxqgkz2yq10xxnd";
           name = "helm-commandlinefu";
         };
@@ -24766,7 +25154,7 @@
           sha256 = "189qmc6fdj5a01a7w45r0qpn9qjf2q9g83qic9sgnrccc841zpyg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-company";
           sha256 = "1pbsg7zrz447siwd8pasw2hz5z21wa1xpqs5nrylhbghsk076ld3";
           name = "helm-company";
         };
@@ -24779,15 +25167,15 @@
     helm-core = callPackage ({ async, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-core";
-        version = "20160203.419";
+        version = "20160217.1158";
         src = fetchFromGitHub {
           owner = "emacs-helm";
           repo = "helm";
-          rev = "6085777884bf8cc63a6e15cbbb506d09d782f0cc";
-          sha256 = "1rwdh2mwn3ynw1c1b5fxdblnyfrqcnbs5045dfl4f8afwqqh92w8";
+          rev = "27baadfe942d7b3a2b5049029c002d6a1cc9fea2";
+          sha256 = "04fw48six952jxcp9mriz7pcfj223z80am9ig1y4rp3yanqm6z1x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-core";
           sha256 = "1dyv8rv1728vwsp6vfdq954sp878jbp3srbfxl9gsgjnv1l6vjda";
           name = "helm-core";
         };
@@ -24808,7 +25196,7 @@
           sha256 = "0nhi8xhcf7qpsibpyy5v364xx7lqkhskzai7awkg0xcdq8b5090x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-cscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-cscope";
           sha256 = "13a76wc1ia4c0v701dxqc9ycbb43d5k09m5pfsvs8mccisfzk9y4";
           name = "helm-cscope";
         };
@@ -24829,7 +25217,7 @@
           sha256 = "01a3pahpsxb7d15dkfgxypl7gzqb4dy4f36lmid1w77b9rhs6nph";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-css-scss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-css-scss";
           sha256 = "0iflwl0rijbkx1b7i1s7984dw7sz1wa1cb74fqij0kcn76kal7ak";
           name = "helm-css-scss";
         };
@@ -24850,7 +25238,7 @@
           sha256 = "18d96alik66nw3rkk7k8740b4rx2bnh3pwn27ahpgj5yf51wm0ry";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ctest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ctest";
           sha256 = "1mphc9fsclbw19p5i1xf52qg6ljljbajvbcsl95hisrnvhg89vpm";
           name = "helm-ctest";
         };
@@ -24863,15 +25251,15 @@
     helm-dash = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-dash";
-        version = "20160103.734";
+        version = "20160220.635";
         src = fetchFromGitHub {
           owner = "areina";
           repo = "helm-dash";
-          rev = "50eecc195d019afa86a77330db5e23b96e5b75aa";
-          sha256 = "1fbwxd6fm36ci85svl22h30bjqm8p5p8fxsnbmvkksln5psghn5d";
+          rev = "372bba923904d229ecfbd44990f7fb4edec4d6a6";
+          sha256 = "1g02vk1pfk969c3zvc307wg7kzgiwzwa861hk60zsffhinhw795y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-dash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-dash";
           sha256 = "1cnxssj2ilszq94v5cc4ixblar1nlilv9askqjp9gfnkj2z1n9cy";
           name = "helm-dash";
         };
@@ -24892,7 +25280,7 @@
           sha256 = "0y0xxs67bzh6j68j3f4zxzrl2ij5g1qvvxqklw7nz305xliis29g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-descbinds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-descbinds";
           sha256 = "1890ss4pimjxskzzllf57fg07xbs8zqcrp6r8r6x989llrfvd1h7";
           name = "helm-descbinds";
         };
@@ -24902,6 +25290,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-describe-modes = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
+    melpaBuild {
+        pname = "helm-describe-modes";
+        version = "20160211.2318";
+        src = fetchFromGitHub {
+          owner = "emacs-helm";
+          repo = "helm-describe-modes";
+          rev = "d2253c7c2bf4f28b9ff8a2d281bd7527c0106527";
+          sha256 = "0li9bi1lm5ldwfpvzahxp7hyfd94jr1kl43rprx0myxb016yk2p5";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-describe-modes";
+          sha256 = "0ajy9kwspm8rzafl0df57fad5867s86yjqj29shznqb12r91lpqb";
+          name = "helm-describe-modes";
+        };
+        packageRequires = [ cl-lib emacs helm ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-describe-modes";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-dictionary = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-dictionary";
@@ -24913,7 +25322,7 @@
           sha256 = "05mb7kb4x7kzh0w9r531ppd92hzsa2v3wqcmafkcn1z5wfp7zw68";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-dictionary";
           sha256 = "1pak8qn0qvbzyclhzvr5ka3pl370i4kiykypfkwbfgvqqwczhl3n";
           name = "helm-dictionary";
         };
@@ -24934,7 +25343,7 @@
           sha256 = "14sifdrfg8ydvi9mj8qm2bfphbffglxrkb5ky4q5b3j96bn8v110";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-dired-recent-dirs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-dired-recent-dirs";
           sha256 = "0kh0n5674ksswjzi9gji2qmx8v8g0axx8xbi0m3zby9nwcpv4qzs";
           name = "helm-dired-recent-dirs";
         };
@@ -24955,7 +25364,7 @@
           sha256 = "183vj5yi575aqkak19hl8k4mw38r0ki9p1fnpa8nny2srjyy34yb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-dirset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-dirset";
           sha256 = "0vng52axp7r01s00cqbbclbm5bx1qbhmlrx9h9kj7smx1al4daml";
           name = "helm-dirset";
         };
@@ -24976,7 +25385,7 @@
           sha256 = "0c3mn5w98phsv7gsljyp5vxxmr2w6n3nczh5zm4hcpwsra3wh1v9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-emmet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-emmet";
           sha256 = "1dkn9qa3dv2im11lm19wfh5jwwwp42sv7jc0p6qg35rhzwdpfg03";
           name = "helm-emmet";
         };
@@ -24997,7 +25406,7 @@
           sha256 = "0330s07b41nw9q32xhjdl7yw83p8ikj6b2qkir3y0jyx16gk10dl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-emms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-emms";
           sha256 = "1vq7cxnacmhyczsa4s5h1nnzc08m66harfnxsqxyrdsnggv9hbf5";
           name = "helm-emms";
         };
@@ -25018,7 +25427,7 @@
           sha256 = "00yhmpv5xjlw1gwbcrznz83gkaby8zlqv74d3p7plca2cwjll1g9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-filesets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-filesets";
           sha256 = "1yhhchksi0r4r5c5q1mggz2hykkvk93baq91b5hkaflqi30d1v8f";
           name = "helm-filesets";
         };
@@ -25039,7 +25448,7 @@
           sha256 = "0vmlpj6zfif5f3wzgq8lkfqprl3z5gjsqj86347krblgfzhqlz30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-firefox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-firefox";
           sha256 = "0677nj0zsk11vvp3q3xl9nk8dhz3ki9yl3kfb57wgnmprp109wgs";
           name = "helm-firefox";
         };
@@ -25060,7 +25469,7 @@
           sha256 = "1j2ziyzyhd177b3rhrdbkqjmqbr3a8aj670mayy6l2r4ydp5xmaq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-flx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-flx";
           sha256 = "03vxr5f5m4s6k6rm0976w8h3s4c3b5mrdqgmkd281hmyh9q3cslq";
           name = "helm-flx";
         };
@@ -25081,7 +25490,7 @@
           sha256 = "0k5703nj838qh0h6hzgffjrp0df9rs7psczg4r9mxpi19vqk8ff0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-flycheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-flycheck";
           sha256 = "038f9294qc0jnkzrrjxm97hyhwa4sca3wdsjbaya50cf0g4cmk7b";
           name = "helm-flycheck";
         };
@@ -25102,7 +25511,7 @@
           sha256 = "1liaid4l4x8sb133lj944gwwpqngsf8hzibdwyfdmsi4m4abh73h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-flymake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-flymake";
           sha256 = "0h87yd56nhxpahrcpk6hin142hzv3sdr5bvz0injbv8a2lwnny3b";
           name = "helm-flymake";
         };
@@ -25123,7 +25532,7 @@
           sha256 = "1k7invgzqrcm11plyvinqwf98yxibr8i4r9yw3csfsicc8b6if59";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-flyspell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-flyspell";
           sha256 = "1g6xry2y6396pg7rg8hc0l84z5r3j2df7dpd1jgffxa8xa3i661f";
           name = "helm-flyspell";
         };
@@ -25136,15 +25545,15 @@
     helm-fuzzier = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-fuzzier";
-        version = "20151111.838";
+        version = "20160220.240";
         src = fetchFromGitHub {
           owner = "EphramPerdition";
           repo = "helm-fuzzier";
-          rev = "7e8573de1a639c031056f20c677d13760f2cece0";
-          sha256 = "1jns0428jmxrm4w9yk67ffbzmgyjgp1v5ii152y0wsb105ary0xp";
+          rev = "f24c2e92b1dfcfa0c43b9030f8160cbe1c94decc";
+          sha256 = "15am2dpva3fzj68sw9n4mpdxkw75l97l1k2j9vlvi2lbqk1h46pi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-fuzzier";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-fuzzier";
           sha256 = "0qdgf0phs3iz29zj3qjhdgb3i4xvf5r2vi0709pwxx2s6r13pvcc";
           name = "helm-fuzzier";
         };
@@ -25165,7 +25574,7 @@
           sha256 = "1yxnmxq6ppfgwxrk5ryc5xfn82kjf4j65j14hy077gphr0q61q6a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-fuzzy-find";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-fuzzy-find";
           sha256 = "0lczlrpd5jy2vhy9jl3rjcdyiwr136spqm8k2rj8m9s8wpn0v75i";
           name = "helm-fuzzy-find";
         };
@@ -25186,7 +25595,7 @@
           sha256 = "16p1gisbza48qircsvrwx020n96ss1c6s68d7cgqqfc0bf2467is";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ghc";
           sha256 = "1q5ia8sgpflv2hhvw7hjpkfb25vmrjwlrqz1f9qj2qgmki5mix2d";
           name = "helm-ghc";
         };
@@ -25207,7 +25616,7 @@
           sha256 = "0y379qap3mssz9nslb08vfzq5ihqcm156fbx0dszgz9d6xgkpdhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ghq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ghq";
           sha256 = "14f3cbsj7jhlhrp561d8pasllnx1cmi7jk6v2fja7ghzj76dnvq6";
           name = "helm-ghq";
         };
@@ -25228,7 +25637,7 @@
           sha256 = "1yfy4a52hx44r32i0b75bka8gfcn5lp61jl86lzrsi2cr9wg10pn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-git";
           sha256 = "1ib73p7cmkw96csxxpkqwn6m60k1xrd46z6vyp29gj85cs4fpsb8";
           name = "helm-git";
         };
@@ -25249,7 +25658,7 @@
           sha256 = "157b525h0kiaknn12fsw67fg26lzb20apx8sssmvlcicqcd51iaw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-git-files";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-git-files";
           sha256 = "02109r956nc1dmqh4v082vkr9wdixh03xhl7icwkzl7ipr5453s6";
           name = "helm-git-files";
         };
@@ -25270,7 +25679,7 @@
           sha256 = "1mp5gbda81szbx19rvaa6ybb28v64q49hqic8d478ggnjjsqhfyr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-git-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-git-grep";
           sha256 = "1ww6a4q78w5hnwikq7y93ic2b7x070c27r946lh6p8cz1k4b8vqi";
           name = "helm-git-grep";
         };
@@ -25291,7 +25700,7 @@
           sha256 = "1sbhh3dmb47sy3r2iw6vmvbq5bpjac4xdg8i5a0m0c392a38nfqn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-github-stars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-github-stars";
           sha256 = "1r4mc4v71171sq9rbbhm346s92fb7jnvvl91y2q52jqmrnzzl9zy";
           name = "helm-github-stars";
         };
@@ -25312,7 +25721,7 @@
           sha256 = "0pd755s5zcg8y1svxj3g8m0znkp6cyx5y6lsj4lxczrk7lynzc3g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-gitignore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-gitignore";
           sha256 = "01l7mx8g1m5qnwz973hzrgds4gywm56jgl4hcdxqvpi1n56md3x6";
           name = "helm-gitignore";
         };
@@ -25333,7 +25742,7 @@
           sha256 = "00mma30r7ixbrxjmmddz4klh517fcr3yn6ss4zw33fh2hzj3w6rl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-gitlab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-gitlab";
           sha256 = "010ihx3yddhb8j3jqcssc49qnf3i7xlz0s380mpgrdxgz6yahsmd";
           name = "helm-gitlab";
         };
@@ -25354,7 +25763,7 @@
           sha256 = "1r01nl1k9jjb70214rkmbqaa4qrkyd3apiyq00w02wsymy12wwic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-go-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-go-package";
           sha256 = "102yhn1xg83l67yaq3brn35a03fkvqqhad10rq0h39n4i1slq3z6";
           name = "helm-go-package";
         };
@@ -25375,7 +25784,7 @@
           sha256 = "0ml5mv282dz73hmgjalcsypdvc30pwhsfbamyz46744j7wxn6ik2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-google";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-google";
           sha256 = "0d1y7232rm888car3h40fba1m1pna2nh1a3fcvpra74igwarfi32";
           name = "helm-google";
         };
@@ -25388,15 +25797,15 @@
     helm-grepint = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-grepint";
-        version = "20151030.1137";
+        version = "20160220.1240";
         src = fetchFromGitHub {
           owner = "kopoli";
           repo = "helm-grepint";
-          rev = "0327f64121751065a85c76527dda2c037c8fb0d8";
-          sha256 = "07bmk4wbn07rg8h8rdhah285hsaaqkx5n84g87lpb7y5ba3ivlk5";
+          rev = "2c0a2a95c3403bb1090665f4d56e6e1ed085a91e";
+          sha256 = "0n1nfi1zbp70bjyik7s8mif2vwyadacikvasrdry0s3mnrx0hsnx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-grepint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-grepint";
           sha256 = "00wr3wk41sbpamxbjkqlby49g8y5z9n79p51sg7ginban4qy91gf";
           name = "helm-grepint";
         };
@@ -25417,7 +25826,7 @@
           sha256 = "0p0mk44y2z875ra8mzcb6vlf4rbkiq9yank5hdxvg2x2sxsaambk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-growthforecast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-growthforecast";
           sha256 = "0716rhs5dam6p8ym83vy19svl6jr49lcfgb29mm3cqi9jcch3ckh";
           name = "helm-growthforecast";
         };
@@ -25438,8 +25847,8 @@
           sha256 = "1hqmwbdcjssvvl7prdykhlgbfrf4qylkvqp0nnnxp8r1wy6h6aws";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-gtags";
-          sha256 = "0snx0b8b4yc507q3i4fzvrd68xgzqxly8kn5cwp26ik6cv840y29";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-gtags";
+          sha256 = "1kbpfqhhbxmp3f70h91x2fws9mhx87zx4nzjjl29lpl93vf8xckl";
           name = "helm-gtags";
         };
         packageRequires = [ emacs helm ];
@@ -25459,7 +25868,7 @@
           sha256 = "189dv3qqqmfyhsqa1n52cgcn1xv7k49f92ndn43y2v20234nhl9f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-hatena-bookmark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-hatena-bookmark";
           sha256 = "14091zrp4vj7752rb5s3pkyvrrsdl7iaj3q9ys8rjmbsjwcv30id";
           name = "helm-hatena-bookmark";
         };
@@ -25480,7 +25889,7 @@
           sha256 = "08pfzs030d8g5s7vkpgicz4srp5cr3xpd84lhrr24ncrhbszxar9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-hayoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-hayoo";
           sha256 = "0xdvl6q2rpfsma4hx8m4snbd05s4z0bi8psdalixywlp5s4vzr32";
           name = "helm-hayoo";
         };
@@ -25501,7 +25910,7 @@
           sha256 = "05ksfx54ar2j4mypzwh0gfir8r26s4f1i4xw319q5pa1y2100cpn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-helm-commands";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-helm-commands";
           sha256 = "0dq9p37i5rrp2nb1vhqzzqfmdg11va2xr3yz8hdxpwykm1ldqdcf";
           name = "helm-helm-commands";
         };
@@ -25522,7 +25931,7 @@
           sha256 = "052hzybign54qawdm1fflsaz4bcwflycksv6wb1nw1jv79s2qbap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-hoogle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-hoogle";
           sha256 = "0672mqm0c261mknbgc3a4pahq27gw2pfklflxl1y4ykbs6q7vcyw";
           name = "helm-hoogle";
         };
@@ -25543,7 +25952,7 @@
           sha256 = "0128nrhwyzslzl0l7wcjxn3dlx3h1sjmwnbbnp2fj4bjk7chc59q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-idris";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-idris";
           sha256 = "1y52675j4kcq14jypxjw1rflxrxwaxyn1n3m613klad55wpfaamf";
           name = "helm-idris";
         };
@@ -25564,7 +25973,7 @@
           sha256 = "0py4xs27z2jvg99i6qaf2ccz0mvk6bb9cvdyz8v8ngmnj3rw2vla";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-img";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-img";
           sha256 = "0sq9l1wgm97ppfc45w3bdcv0qq5m85ygnanv1bdcp8bxbdl4vg0q";
           name = "helm-img";
         };
@@ -25585,7 +25994,7 @@
           sha256 = "04vdin0n3514c8bycdjrwk3l6pkarrwanlklnm75315b91nkkbcp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-img-tiqav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-img-tiqav";
           sha256 = "1m083hiih2rpyy8i439745mj4ldqy85fpnvms8qnv3042b8x35y0";
           name = "helm-img-tiqav";
         };
@@ -25606,7 +26015,7 @@
           sha256 = "04ddjdia09y14gq4h6m8g6aiwkqvdxp66yjx3j5dh2xrkyxhlxpz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ispell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ispell";
           sha256 = "0qyj6whgb2p0v231wn6pvx4awvl1wxppppqqbx5255j8r1f3l1b0";
           name = "helm-ispell";
         };
@@ -25627,7 +26036,7 @@
           sha256 = "1czgf5br89x192g3lh3x2n998f79hi1n2f309ll264qnl35kv14w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-itunes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-itunes";
           sha256 = "15z5lgh5x1ykz5p31i994fig8v05s7ckkgw6p9jifn11sn1a39nb";
           name = "helm-itunes";
         };
@@ -25648,7 +26057,7 @@
           sha256 = "0f2psp7p82sa2fip282w152zc1rjd3l0sna1g7rgwi9x29gcsh0v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-j-cheatsheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-j-cheatsheet";
           sha256 = "0lppzk60vl3ps9fqnrh020awiy5w46gwlb6d91pr889x24ryphmm";
           name = "helm-j-cheatsheet";
         };
@@ -25669,7 +26078,7 @@
           sha256 = "0vhqpcv8xi6a6q7n6xxahdzijr1x5s40fvk9nc44q55psbyv627g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-jstack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-jstack";
           sha256 = "0giix1rv2jrmdxyg990w90ivl8bvgbbvah6nkpj7gb6vbnm15ldz";
           name = "helm-jstack";
         };
@@ -25690,7 +26099,7 @@
           sha256 = "0nkmc17ggyfi7iz959mvzh6q7116j44zqwi7ydm9i8z49xfpzafy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-lobsters";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-lobsters";
           sha256 = "0dkb78n373kywxj8zba2s5a2g85vx19rdswv9i78xjwv1lqh8cpp";
           name = "helm-lobsters";
         };
@@ -25711,7 +26120,7 @@
           sha256 = "129mlpx5vqxyg2scrdiajxp71phxamrvijpc054k1q1an8vgn0kv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ls-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ls-git";
           sha256 = "08rsy9479nk03kinjfkxddrq6wi4sx2a0wrz37cl2q517qi7sibj";
           name = "helm-ls-git";
         };
@@ -25732,7 +26141,7 @@
           sha256 = "1msrsqiwk7bg5gry5cia8a6c7ifymfyn738hk8g2qwzzw4vkxxcs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ls-hg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ls-hg";
           sha256 = "0ca0xn7n8bagxb504xgkcv04rpm1vxhx2m77biqrx5886pwl25bh";
           name = "helm-ls-hg";
         };
@@ -25748,11 +26157,11 @@
         version = "20150717.239";
         src = fetchsvn {
           url = "https://svn.macports.org/repository/macports/users/chunyang/helm-ls-svn.el";
-          rev = "145428";
+          rev = "145939";
           sha256 = "0b7gah21rkfd43mb89lrwaqrrwq646abh7wi4q74sx796gmpz4dz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ls-svn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ls-svn";
           sha256 = "08mwzi340akw4ar20by0q981mzmzvf0wz3mn738q4inn2kqgs60d";
           name = "helm-ls-svn";
         };
@@ -25773,7 +26182,7 @@
           sha256 = "05z1s01wgdj2s7qln42cg7nnjq0hmq2ji4xjldzj6w770a5nvb7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-make";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-make";
           sha256 = "1r6jjy1rlsii6p6pinbz7h6gcw4vmcycd3vj338bfbnqp5rrf2mc";
           name = "helm-make";
         };
@@ -25794,7 +26203,7 @@
           sha256 = "0gzlprf5js4y3vzkf7si2xc7ai5j97b5cqrs002hyjj5ij4f2vix";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-migemo";
           sha256 = "1cjvb1lm1fsg5ky63fvrphwl5a7r7xf6qzb4mvl06ikj8hv2h33x";
           name = "helm-migemo";
         };
@@ -25815,7 +26224,7 @@
           sha256 = "1lbxb4vnnv6s46m90qihkj99qdbdylwncwaijjfd7i2kap2ayawh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-mode-manager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-mode-manager";
           sha256 = "1w9svq1kyyj8mmljardhbdvykb334nq1y18s956g4rvqyas2ciyd";
           name = "helm-mode-manager";
         };
@@ -25836,7 +26245,7 @@
           sha256 = "09rb8aq7fnf661w3liwbkkaczjph3dzvg26slm9cwcnl7pqnvagl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-mt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-mt";
           sha256 = "04hx8cg8wmm2w8g942nc9mvm12ammmjnx4k61ljrq76smd8s3x2a";
           name = "helm-mt";
         };
@@ -25857,7 +26266,7 @@
           sha256 = "0zcpdkh2ycmnv2nkv02khqp5r7za3x3vji2sj4nwz1wd86rrpbv5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-mu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-mu";
           sha256 = "0pydp6scj5icaqfp3dp5h0q1y2i7z9mfyw1ll6iphsz9qh3x2bj2";
           name = "helm-mu";
         };
@@ -25874,11 +26283,11 @@
         src = fetchFromGitHub {
           owner = "travisbhartwell";
           repo = "nix-emacs";
-          rev = "6b1418611b49a6cf77380a76f7e6236bbb5df83a";
-          sha256 = "0ia9wgn33znaviy7ilfm83yfalc2dbpm1g7nvss5s4rznqkdfhn3";
+          rev = "63061d379460c53abbe88ec695a61e22feae438f";
+          sha256 = "100vjppa6nipn227v871nkmjmqln2l1lv1v8in1lcjhsz4rxrhs9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-nixos-options";
           sha256 = "1nsi4hfw53iwn29fp33dkri1c6w8kdyn4sa0yn2fi6144ilmq933";
           name = "helm-nixos-options";
         };
@@ -25899,8 +26308,8 @@
           sha256 = "1wkmbc7247f209krvw4dzja3z0wyny12x5yi1cn3fnfh5nx04851";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-open-github";
-          sha256 = "121sszwvihbv688nq5lhdclvsjj8759glh42h82r4pcw30lxggxb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-open-github";
+          sha256 = "1wqlwg21s9pjgcrwr8kdrppinmjn235nadkp4003g0md1d64zxpx";
           name = "helm-open-github";
         };
         packageRequires = [ cl-lib gh helm-core ];
@@ -25920,7 +26329,7 @@
           sha256 = "1zyjxrrda7nxxjqczv2p3sfimxy2pq734kf51j6v2y0biclc4bk3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-orgcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-orgcard";
           sha256 = "1a56y8fny7qxxidc357n7l3yi7h66hidhvwhkam8y5wk6k61460p";
           name = "helm-orgcard";
         };
@@ -25941,7 +26350,7 @@
           sha256 = "14ad0b9d07chabjclffjyvnmrasar1di9wmpzf78bw5yg99cbisw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-package";
           sha256 = "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y";
           name = "helm-package";
         };
@@ -25962,7 +26371,7 @@
           sha256 = "0yngs3q6142g2nn1wwdaifylyfjjs3gmmy0jck5zh8mhmdgdqr06";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-pages";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-pages";
           sha256 = "1v3w8100invb5wsmm3dyl41pjs7s889s3b1rlr6vlcspa1ncv3wj";
           name = "helm-pages";
         };
@@ -25983,8 +26392,8 @@
           sha256 = "13wnagmgicl2mi4iksqckrjbaiz05j9ykbmvj26jy8zcbll5imfs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-perldoc";
-          sha256 = "0b0cl2xj5w1r71zrjhnqhrzsnz1296jv21qx5adzslra6lk55q2r";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-perldoc";
+          sha256 = "1qx0g81qcqanjiz5fxysagjhsxaj31g6nsi2hhdgq4x4nqrlmrhb";
           name = "helm-perldoc";
         };
         packageRequires = [ cl-lib deferred helm-core ];
@@ -26004,7 +26413,7 @@
           sha256 = "076yhcf447fas14k8gg67rc743x049xf66627sd9lgjv7107r8vr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-proc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-proc";
           sha256 = "1bq60giy2bs9m3hlbc5nwvy51702a98s0vqass3b290hdgki4bnx";
           name = "helm-proc";
         };
@@ -26025,7 +26434,7 @@
           sha256 = "0j54c1kzsjgr05qx25rg3ylawvyw6n6liypiwaas47vpyfswbxhv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-project-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-project-persist";
           sha256 = "1n87kn1n3453mpdj6amyrgivslskmnzdafpspvkz7b0smf9mv2ld";
           name = "helm-project-persist";
         };
@@ -26038,15 +26447,15 @@
     helm-projectile = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, projectile }:
     melpaBuild {
         pname = "helm-projectile";
-        version = "20151220.421";
+        version = "20160221.26";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "helm-projectile";
-          rev = "2544343b4214511988fa1b652474d7984008f807";
-          sha256 = "1c6pfy3qghpqnng1jsnxnvqnd6sq41f2dm7kkwkgml405asqlcqa";
+          rev = "64880aad1828044db113c9f455c971bc90dea56b";
+          sha256 = "1c4x1zidabysyi5cms93zn3naczhfagd8q4mvg9jkhd1z0lk19gc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-projectile";
           sha256 = "18y7phrvbpdi3cnghwyhh0v1bwm95nwq1lymzf8lrcbmrwcvh36a";
           name = "helm-projectile";
         };
@@ -26067,7 +26476,7 @@
           sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-prosjekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-prosjekt";
           sha256 = "019rya3bf13cnval8iz680wby3sqlmqg4nbn0a13l1pkhlnv9fvm";
           name = "helm-prosjekt";
         };
@@ -26080,15 +26489,15 @@
     helm-pt = callPackage ({ fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-pt";
-        version = "20151208.2130";
+        version = "20160214.1742";
         src = fetchFromGitHub {
           owner = "ralesi";
           repo = "helm-pt";
-          rev = "afdf50913c49b8bbb0ff40ee5d9dfe3eb8b7c71a";
-          sha256 = "01wcybzb1jdyybr7scblzxp3c16zm01ms9ci1hcpfsv2y55gbg5y";
+          rev = "8acc52911dad1ed0c3975f134a468762afe0b76b";
+          sha256 = "03ys40rr0pvgp35j5scw9c28j184f1c9m58a3x0c8f0lgyfpssjk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-pt";
           sha256 = "1imhy0bsm9aldv0pvf88280qdya01lznxpx5gi5wffhrz17yh4pi";
           name = "helm-pt";
         };
@@ -26098,6 +26507,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, window-purpose }:
+    melpaBuild {
+        pname = "helm-purpose";
+        version = "20160218.1209";
+        src = fetchFromGitHub {
+          owner = "bmag";
+          repo = "helm-purpose";
+          rev = "de9e38c55b114cadeed60e70fc406f5181ff30d8";
+          sha256 = "1lxknzjfhl6irrspynlkc1dp02s0byp94y4qp69gcl9sla9262ip";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-purpose";
+          sha256 = "0am8fy7ihk4hv07a6bnk9mwy986h6i6qxwpdmfhajzga71ixchg6";
+          name = "helm-purpose";
+        };
+        packageRequires = [ emacs helm window-purpose ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-purpose";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-pydoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-pydoc";
@@ -26109,8 +26539,8 @@
           sha256 = "1hlbyw6jvh6pm3ivmhd6qvs9j7km322fki9g4yd4qw7w15a3wkyy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-pydoc";
-          sha256 = "0cnbhjw951f8sci63cvzcc65d0ffdx3rb8l1g38qql5rzkam48fn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-pydoc";
+          sha256 = "1sh7gqqiwk85kx89l1sihlkb8ff1g9n460nwj1y1bsrpfl6if4j7";
           name = "helm-pydoc";
         };
         packageRequires = [ cl-lib helm-core ];
@@ -26130,7 +26560,7 @@
           sha256 = "1a26r21jvgzk21vh3mf29s1dhvvv70jh860zaq9ihrpfrrl91158";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-rails";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-rails";
           sha256 = "1iihfsmnkpfp08pldghf3w5k8v5dlmy5ns0l4niwdwp5w8lyjcd6";
           name = "helm-rails";
         };
@@ -26151,7 +26581,7 @@
           sha256 = "1b74jsr28ldz80mrqz3d1bmykpcprdbhf3fzhc0awd5i5xdnfaid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-rb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-rb";
           sha256 = "14pkrj1rpi2ihpb7c1hx6xwzvc1x7l41lwr9znp5vn7z93i034fr";
           name = "helm-rb";
         };
@@ -26172,7 +26602,7 @@
           sha256 = "0nbny1a41sy4w3k2irp7rh6663jhbssqqshxd3y82iq0hs9h2wda";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-recoll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-recoll";
           sha256 = "0pr2pllplml55k1xx9inr3dm90ichg2wb62dvgvmbq2sqdf4606b";
           name = "helm-recoll";
         };
@@ -26193,7 +26623,7 @@
           sha256 = "05mf0021jhr4zmysy28cgilkfxyp08qmkc20v9wlykksg73l2crk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-rhythmbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-rhythmbox";
           sha256 = "0pnm7yvas0q3b38ch5idm7v4ih2fjyfai8217j74xhkpcc2w4g4a";
           name = "helm-rhythmbox";
         };
@@ -26214,7 +26644,7 @@
           sha256 = "163ljqar3vvbavzc8sk6rnf8awyc2rhh2g117fglswich3c8lnqg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-robe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-robe";
           sha256 = "1gi4nkm9xvnxv0frmhiiw8dkmnmhfpr9n0b6jpidlvr8xr4s5kyw";
           name = "helm-robe";
         };
@@ -26235,7 +26665,7 @@
           sha256 = "0s4hb1fvwr9za5gkz8s5w1kh9qjyygz6g59w7vmrg2d8ds2an03d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-rubygems-local";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-rubygems-local";
           sha256 = "18p18bly15a8xjc34k11jbvxlmr127sll0vh5ma2p787x6a3mc7c";
           name = "helm-rubygems-local";
         };
@@ -26256,7 +26686,7 @@
           sha256 = "1sff8kagyhmwcxf9062il1077d4slvr2kq76abj496610gpb75i0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-rubygems-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-rubygems-org";
           sha256 = "04ni03ak53z3rggdgf68qh7ksgcf3s0f2cv6skwjqw7v8qhph6qs";
           name = "helm-rubygems-org";
         };
@@ -26277,7 +26707,7 @@
           sha256 = "0qm5wlqklwf0y8grqhl2hfyfbkyj8200cdmbcf9cfr51lrh3cn8v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-safari";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-safari";
           sha256 = "0lvwghcl5w67g0lc97r7hfvca7ss0mysy2mxj9axxbpyiq6fmh0y";
           name = "helm-safari";
         };
@@ -26298,7 +26728,7 @@
           sha256 = "1s6aw1viyzhhrfiazzi82n7bkvshp7clwi6539660m72lfwc5zdl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-sage";
           sha256 = "1vnq15fjaap0ai7dadi64sm4415xssmahk2j7kx45sasy4qaxlbj";
           name = "helm-sage";
         };
@@ -26319,7 +26749,7 @@
           sha256 = "00wnqcgpf4hqdnqj5zrizr4s0pffb93xwya8k5c3rp4plncrcdzx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-sheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-sheet";
           sha256 = "0lx70l5gq43hckgdfna8s6wx287sw5ms9l1z3n6vg2x8nr9m61kc";
           name = "helm-sheet";
         };
@@ -26340,7 +26770,7 @@
           sha256 = "0sw7g1zcs1jfqcpprxwjq97lsk4qfngwamkj3q8jhm77zh7kfa3b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-spaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-spaces";
           sha256 = "0hdvkk173k98iycvii5xpbiblx044125pl7jyz4kb8r1vvwcv791";
           name = "helm-spaces";
         };
@@ -26361,7 +26791,7 @@
           sha256 = "133dcqk42nq5gh5qlcbcmx3lczisfgymcnypnld318jvjgd2ma8a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-spotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-spotify";
           sha256 = "1rzvxnaqh8bm78qp0rhpqs971pc855qrq589r3s8z3gpqzmwlnmf";
           name = "helm-spotify";
         };
@@ -26382,7 +26812,7 @@
           sha256 = "0n7fma8zp6shyz814mxfljj8x23gcwnkrbghkmfjp87cr1zkmw41";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-swoop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-swoop";
           sha256 = "1fqbhj75hcmy7c2vdd0m7fk3m34njmv5s6k1i9y94djpbd13i3d8";
           name = "helm-swoop";
         };
@@ -26403,8 +26833,8 @@
           sha256 = "0a9h6rmjc6c6krkvxbgrzv35if260d9ma9a2k47jzm9psnyp9s2w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-themes";
-          sha256 = "1j64w6dnxmq0rfycci9wfy2z5lbddsggf486pknxfgwwqgvns90l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-themes";
+          sha256 = "0r7kyd0i0spwi7xkjrpm2kyphrsl3hqm5pw96nd3ia0jiwp8550j";
           name = "helm-themes";
         };
         packageRequires = [ helm-core ];
@@ -26424,7 +26854,7 @@
           sha256 = "1ypnsbx623gg3q07gxrbkn82jzy38sj4p52hj1wcb54qjqzyznkg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-unicode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-unicode";
           sha256 = "052xqzvcfzpsbl75ylqb1khqndvc2dqdymqlwivs0darlds0w8y4";
           name = "helm-unicode";
         };
@@ -26445,7 +26875,7 @@
           sha256 = "0xlz9rxx7y9pkrzvxmv42vgys5iwx75zv9g50k8ihwc08z80dhcq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-w32-launcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-w32-launcher";
           sha256 = "0bzn2vhspn6lla815qxwsl9gwfyiwgwmnysr6rjpyacmi17d73ri";
           name = "helm-w32-launcher";
         };
@@ -26466,7 +26896,7 @@
           sha256 = "0d47mqib4zkfadq26vpy0ih7j18d6n5v4c21wvr4hhg6hg205iiz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-w3m";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-w3m";
           sha256 = "1rr83ija93iqz74k236hk3v75jk0iwcccwqpqgys7spvrld0b9pz";
           name = "helm-w3m";
         };
@@ -26487,7 +26917,7 @@
           sha256 = "03a5hzgqak8wg6i2h2p3fr9ij55lqarcsblml8qrnrj27ghcvzzh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-wordnet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-wordnet";
           sha256 = "0di8gxsa9r8mzja4akhz0wpgrhlidqyn1s1ix5szplwxklwf2r2f";
           name = "helm-wordnet";
         };
@@ -26508,7 +26938,7 @@
           sha256 = "19l8vysjygscr1nsddjz2yv0fjhbsswfq40rdny8zsmaa6qhpj35";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-words";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-words";
           sha256 = "0l9mb7g3xzasna1bw2p7vh2wdg1hmjkff40p8kpqvwwzszdm9v76";
           name = "helm-words";
         };
@@ -26529,7 +26959,7 @@
           sha256 = "1yqr5z5sw7schvaq9pmwg79anp806gikm28s6xvrayzyn4idz2n6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-xcdoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-xcdoc";
           sha256 = "1ikphlnj053i4g1l8r2pqaljvdqglj1yk0xx4vygnw98qyzdsx4v";
           name = "helm-xcdoc";
         };
@@ -26550,7 +26980,7 @@
           sha256 = "11fznbfcv4rac4h50mkax1g66wd2f91f5dw2v4jxjq2f5y4h4w0g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-zhihu-daily";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-zhihu-daily";
           sha256 = "0hkgail60s9qhxl0pskqxjvfz93iq1qh1kcmcq0x5kq7d08b911r";
           name = "helm-zhihu-daily";
         };
@@ -26568,7 +26998,7 @@
           sha256 = "00x3ln7x4d6r422x845smf3h0x1z85l5jqyjkrllqcs7qijcrk5w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/help-fns+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/help-fns+";
           sha256 = "10vz7w79k3barlcs3ph3pc7914xdhcygagdk2wj3bq0wmwxa1lia";
           name = "help-fns-plus";
         };
@@ -26586,7 +27016,7 @@
           sha256 = "0qmf81maq6yvs68b8vlbxwkjk72qldamq75znrma9mhvlv8igrgx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/help-mode+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/help-mode+";
           sha256 = "1pmb845bxa5kazjpdxm12rm2wcshmv2cmisigs3kyva1pmi1shra";
           name = "help-mode-plus";
         };
@@ -26604,7 +27034,7 @@
           sha256 = "1r7kf9plnsjx87bhflsdh47wybvhis7gb10izqa1p6w0aqsg178s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/help+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/help+";
           sha256 = "1jx0wa4md1mvdsvjyx2yvi4hhm5w061qqcafsrw4axsz7gjpd4yi";
           name = "help-plus";
         };
@@ -26625,7 +27055,7 @@
           sha256 = "178dvigiw162m01x7dm8pf61w2n3bq51lvk5q7jzpb9s35pz1697";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hemisu-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hemisu-theme";
           sha256 = "0byzrz74yvk12m8dl47kkmkziwrrql193q72qx974zbqdj8h2sph";
           name = "hemisu-theme";
         };
@@ -26646,7 +27076,7 @@
           sha256 = "0c45pib8qpwgyr271g5ddnsn7hzq68mqflv0yyc8803ni06w9vhj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/heroku";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/heroku";
           sha256 = "1kadmxmqhc60cb5k14943rad1gbril2hlcnqxnsy4h3j2ykmcdyy";
           name = "heroku";
         };
@@ -26667,7 +27097,7 @@
           sha256 = "15hk0v6ck076mahsz4spq75jcnv587fx4d3w50c7bdh423fl0xvx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/heroku-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/heroku-theme";
           sha256 = "0mchh9y3pqwamry6105qrv1bp1qg1g0jmz7rzc5svz9giynypwf9";
           name = "heroku-theme";
         };
@@ -26685,7 +27115,7 @@
           sha256 = "0rqjidjxa5j6rjknklfks743lczbq3qsyiranrf2z3ghzi0gf7fd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hexrgb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hexrgb";
           sha256 = "0mzqslrrf7sc262syj3ja7b7rnbg80dwf2p9bzxdrzx6b8vvsx06";
           name = "hexrgb";
         };
@@ -26706,7 +27136,7 @@
           sha256 = "06hm98aq87l91fhb2bqz8jw427k8fb280ygz5g44fy6sqc6js7v0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hgignore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hgignore-mode";
           sha256 = "0ja71l3cghhn1c6w2pff80km8h8xgzf0j9gcldfyc72ar6ifhjkj";
           name = "hgignore-mode";
         };
@@ -26727,7 +27157,7 @@
           sha256 = "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hi2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hi2";
           sha256 = "1wxkjg1jnw05lqzggi20jy2jl20d8brvv76vmrf6lnz62g6jv9h2";
           name = "hi2";
         };
@@ -26745,7 +27175,7 @@
           sha256 = "1l5jvgjgd0kzv1sn6h467fbnl487hma4h4pkwq4x1dhbc26yvfpz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hide-comnt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hide-comnt";
           sha256 = "181kns2rg4rc0pyyxw305qc06d10v025ad7v2m037y72vfwb0igx";
           name = "hide-comnt";
         };
@@ -26763,7 +27193,7 @@
           sha256 = "1q87yp1pr62cza3pqimqd09a39yyij4c7pncdww84zz7cii9qrn2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hide-lines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hide-lines";
           sha256 = "146sgvd88w20rqvd8y8kc76cb1nqk6dvqsz9rgl4rcrf0xfqvp7q";
           name = "hide-lines";
         };
@@ -26781,7 +27211,7 @@
           sha256 = "1zxrygpf47bzj6p808r3qhj3dfr3m8brp1xgxs33c7f88rinfval";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hide-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hide-region";
           sha256 = "0nsc6m3yza658xsxvjz8766vkp71rcm6vwnvcv225r2pr94mq7vm";
           name = "hide-region";
         };
@@ -26802,7 +27232,7 @@
           sha256 = "1dr06b9njzih8z97k62l9w3x0a801x4bp043zvk7av9qkz8izl2r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hideshow-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hideshow-org";
           sha256 = "1bzx5ii06r64nra92zv1dvw5zv3im7la2dd3md801hxyfrpb74gc";
           name = "hideshow-org";
         };
@@ -26820,7 +27250,7 @@
           sha256 = "15ax1j3j7kylyc8a91ja825sp4mhbdgx0j4i5kqxwhvmwvpmyrv6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hideshowvis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hideshowvis";
           sha256 = "1ajr71fch3v5g8brb83kwmlakcam5w21i3yr8df00c5j2pnc6v1f";
           name = "hideshowvis";
         };
@@ -26838,7 +27268,7 @@
           sha256 = "15s4463damlszd5wqi22a6w25i8l0m5rvqdg73k3yp01i65jc29z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight";
           sha256 = "0clv4mzy9kllcvc0cgsbx3a9anw68dc2c7vzwbrv13sw5gh9skc0";
           name = "highlight";
         };
@@ -26859,7 +27289,7 @@
           sha256 = "0c65jk00j88qxfki2g88hy9g6n92rzskwcn1fbmwcw3qgaz4b6w5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-blocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-blocks";
           sha256 = "1a32iv5kgf6g6ygbs559w156dh578k45m860czazfx0d6ap3k5m1";
           name = "highlight-blocks";
         };
@@ -26877,7 +27307,7 @@
           sha256 = "18y6cw43mhizccvwfydv6g2kz8w7vff0n3k9sq5ghwq3rb3z14b2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-chars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-chars";
           sha256 = "19jawbjvqx1hsjbynx0jgpziap3r64k8s1xfckajrx8aq8m4c6i0";
           name = "highlight-chars";
         };
@@ -26895,7 +27325,7 @@
           sha256 = "0r3kzs2fsi3kl5gqmsv75dc7lgfl4imrrqhg09ij6kq1ri8gjxjw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-cl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-cl";
           sha256 = "164h3c3rzriahb7v5hk2pw4i0gk2vk5ak722bai6x4zx4l1xp20w";
           name = "highlight-cl";
         };
@@ -26914,7 +27344,7 @@
           sha256 = "1aki7a7nnj9n7vh19k4fr0v7cqbwkrpc6b3f3yv95vcqj8a4y34c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-current-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-current-line";
           sha256 = "01bga6is3frzlzfajpvpgz224vhl0jnc2bl2ipvlygdcmv4h8973";
           name = "highlight-current-line";
         };
@@ -26935,7 +27365,7 @@
           sha256 = "1l10xnjyvcbv1v8xlldaca7z3fk5qav7nsbhfnjxxd0bgh5v9by2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-defined";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-defined";
           sha256 = "1vjxm35wf4c2qphpkjh57hf03a5qdssdlmfj0n0gwxsdw1q5rpms";
           name = "highlight-defined";
         };
@@ -26956,7 +27386,7 @@
           sha256 = "0rs8zyjz5mh26n8bdxn6fmyw2809nihz1vp7ih59dq11lx3mf9az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-escape-sequences";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-escape-sequences";
           sha256 = "0938b29cqapid9v9q4w2jwh8kdb0p70qwzy9xm2nxaairm7436d6";
           name = "highlight-escape-sequences";
         };
@@ -26977,7 +27407,7 @@
           sha256 = "10m1cr5plzsxbq08lck4c2w0whcdrnl9h2qm4bbr9srhnpry7fxj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-indent-guides";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-indent-guides";
           sha256 = "00ghp677qgb5clxhdjarfl8ab3mbp6v7yfsldm9bn0s14lyaq5pm";
           name = "highlight-indent-guides";
         };
@@ -26998,7 +27428,7 @@
           sha256 = "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-indentation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-indentation";
           sha256 = "0iblrrbssjwfn71n8xxjcl98pjv1qw1igf3hlz6mh8740fsca3d6";
           name = "highlight-indentation";
         };
@@ -27019,7 +27449,7 @@
           sha256 = "1vy6j63jp83ljdqkrqglpys74yfh7p61sd0lqiwczgr5nqyc60rl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-leading-spaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-leading-spaces";
           sha256 = "0h2ww2vqmarghf4zg0wbwn0wgndmkcjy696mc885rwavck2dav4p";
           name = "highlight-leading-spaces";
         };
@@ -27040,7 +27470,7 @@
           sha256 = "0ffhc5s0h34064bix4qyiiyx30m4hpv0phmxwcrwiyvanj9ggfai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-numbers";
           sha256 = "1bywrjv9ybr65mwkrxggb52jdqn16z8acgs5vqm0faq43an8i5yv";
           name = "highlight-numbers";
         };
@@ -27061,7 +27491,7 @@
           sha256 = "0kzqx1y6rr4ryxi2md9087saad4g4bzysckmp8272k521d46xa1r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-parentheses";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-parentheses";
           sha256 = "1b0n9mz4a6baljvvgb881w53391smm35c9pwd45g861hk1qvrk5k";
           name = "highlight-parentheses";
         };
@@ -27082,7 +27512,7 @@
           sha256 = "1gq8inxfni9zgz2brqm4nlswgr8b0spq15wr532xfrgr456g10ks";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-quoted";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-quoted";
           sha256 = "0x6gxi0jfxvpx7r1fm43ikxlxilnbk2xbhdy9xivhgmmdyqiqqkl";
           name = "highlight-quoted";
         };
@@ -27103,7 +27533,7 @@
           sha256 = "0gnr1dqkcmc9gfzqjaixh76g1kq7xp20mg1h6vl3c4na7nk6a3fg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-stages";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-stages";
           sha256 = "0r4kmjmrpi38q3y0q9h5xkxh7x728ha2nbnc152lzw6zfsxnm4x4";
           name = "highlight-stages";
         };
@@ -27124,7 +27554,7 @@
           sha256 = "19cgyk0sh8nsmf3jbi92i8qsdx4l4yilfq5jj9zfdbj9p5gvwx96";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-symbol";
           sha256 = "0gw8ffr64s58qdbvm034s1b9xz1hynzvbk8ld67j06fxpc98qaj4";
           name = "highlight-symbol";
         };
@@ -27142,7 +27572,7 @@
           sha256 = "1bbiyqddqkrp3c7xsg1m4143611bhg1kkakrwscqjb4cfmx29qqg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-tail";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-tail";
           sha256 = "187kv3n262l38jdapi9bwcafz8fh61pdq2zliwiz7m7xdspp2iws";
           name = "highlight-tail";
         };
@@ -27155,15 +27585,15 @@
     highlight-thing = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "highlight-thing";
-        version = "20151001.221";
+        version = "20160220.1842";
         src = fetchFromGitHub {
           owner = "fgeller";
           repo = "highlight-thing.el";
-          rev = "eaf817d61d13fc97142996211222f8d54b48d3aa";
-          sha256 = "01cx05dkrshcpddciiqvbfcc0zg0awbvg3r2n1v44kiixyfdpdwr";
+          rev = "821f408c055838f1f245fc18c026889c300b198b";
+          sha256 = "00s2nm0rfdgkpn2v9m36y0l42jyfah5hp5hd3bkwljgs99cp1ihk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-thing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-thing";
           sha256 = "0rvdb1lx9xn9drqw0sw9ih759n10g7k0af39w6n8g0wfr67p96w1";
           name = "highlight-thing";
         };
@@ -27184,7 +27614,7 @@
           sha256 = "0hhc2l4pz6q8injpplv6b5l08l8q2lnjdpwabp7gwmhraq54rhjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-unique-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-unique-symbol";
           sha256 = "0lwl8pkmq0q4dvyflarggnn8vzpvk5hhcnk508r6xml2if1sg9zx";
           name = "highlight-unique-symbol";
         };
@@ -27205,7 +27635,7 @@
           sha256 = "06nnqry36ncqacfzd8yvc4q59bwk3vgf9a14rkpph2hk2rfvq2m6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight2clipboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight2clipboard";
           sha256 = "19r7abbpm31b0azf2v3xn0rjagg9h01i8g72qapp8dhqb4d9n9r0";
           name = "highlight2clipboard";
         };
@@ -27226,7 +27656,7 @@
           sha256 = "1phyaf6fwaxi2plq38m09cfb5ls401ay8jw0yf5rix8nyvm8nrn9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hindent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hindent";
           sha256 = "1f3vzgnqigwbwvglxv0ziz3kyp5dxjraw3vlghkpw39f57mky4xz";
           name = "hindent";
         };
@@ -27244,7 +27674,7 @@
           sha256 = "1jkjg7zxpc06plzlyvj1a8dcvj8ijqzhkxwlsd12cgkymvp411yl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hippie-exp-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hippie-exp-ext";
           sha256 = "14py5hz523847f7bhw67v81x5cfhzz5la15mrqavc4z4yicy63iq";
           name = "hippie-exp-ext";
         };
@@ -27265,7 +27695,7 @@
           sha256 = "1l76r8hzhaapx76f6spm5jmjbrrm5zf79cpd5024xw3hpj1jbkjp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hippie-expand-slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hippie-expand-slime";
           sha256 = "0kxyv1lpkg33qgfv1jfqx03640py7525bcnc9dk98w6y6y92zf4m";
           name = "hippie-expand-slime";
         };
@@ -27286,7 +27716,7 @@
           sha256 = "0b5wrid428s11afc48d6mdifmd31gmzyrj9zcpd3jwk63ydiihdc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hippie-namespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hippie-namespace";
           sha256 = "1bzjhq116ci9c9f0aw121fn3drmg2pw5ny1w6wcasa4p30syxxf0";
           name = "hippie-namespace";
         };
@@ -27307,7 +27737,7 @@
           sha256 = "17dcpwx2y464g8qi3ixlsf3la8dn0bkxax296bhfg4vh73dxccl3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hipster-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hipster-theme";
           sha256 = "1xrgpqlzp4lhh5h3sv7pg1nqzc9wcv1hs6ybv2h4x6jangicwfl2";
           name = "hipster-theme";
         };
@@ -27328,7 +27758,7 @@
           sha256 = "1dmrg39g0faqqkgrpcbybjbb91vcpkwawxsplckkj92y59zanq3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/history";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/history";
           sha256 = "0s8pcz53bk1w4h5847204vb6j838vr8za66ni1b2y4pas76zjr5g";
           name = "history";
         };
@@ -27349,7 +27779,7 @@
           sha256 = "1y275fchhx0n6dv038hsr44a3bjghqdhc8j1dcpm2rvs8chgm8g0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/historyf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/historyf";
           sha256 = "15pcaqfjpkfwcy46yqqw10q8kpw7aamcg0gr4frbdgzbv0yld08s";
           name = "historyf";
         };
@@ -27370,7 +27800,7 @@
           sha256 = "097lrj9lgfa7szww324hlqywwkbi31n1pxfqyg0zbfj45djkp9bx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hive";
           sha256 = "1marz8gmk824hb0nkhaw48d4qw1xjk1aad27gviya7f5ilypxrya";
           name = "hive";
         };
@@ -27391,7 +27821,7 @@
           sha256 = "177blksgncxpxd1zi9kmbcfjnpd3ll1szjxiyc4am8a6hs1dyyqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hiwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hiwin";
           sha256 = "0klhxwxsz7xan2vsknw79r1dj4qhhjbfpddr67mk9qzccp8q0w8g";
           name = "hiwin";
         };
@@ -27412,7 +27842,7 @@
           sha256 = "0889dzrwizpkyh3wms13k8zx27ipsrsxfa4j4yzk4cwk3aicckcr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-anything";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hl-anything";
           sha256 = "15n998nhirvg3f719b7x9s7jpqv6gzkr22kp4zbbq99lbx2wfc1k";
           name = "hl-anything";
         };
@@ -27430,7 +27860,7 @@
           sha256 = "170sz6hjd85cw1x0y2g81ks3x3niib4f7y2xz6k8x0dpw357ggv3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-defined";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hl-defined";
           sha256 = "1y7vbhvpwxz70kja5hfm4i57mdd1cv43m4y9fr978y3nk265p8xx";
           name = "hl-defined";
         };
@@ -27451,7 +27881,7 @@
           sha256 = "17apqs7yqd89mv5283kmwp7byaaimj7j0vis0z1d89jlmp8i6zbc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hl-indent";
           sha256 = "1z42kcwcyinjay65mv042ijh4xfaaiyri368g0sjw0fflsg0ikcr";
           name = "hl-indent";
         };
@@ -27469,7 +27899,7 @@
           sha256 = "1kxq79pfs83gp12p2g093m6shsf25q88mi29bvhapxx77ahmxpkn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-line+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hl-line+";
           sha256 = "13yv2nmx1wb80z4yifnh6d67rag17wirmp7z8ssq3havjl8lbpix";
           name = "hl-line-plus";
         };
@@ -27490,7 +27920,7 @@
           sha256 = "0pjfbm8p077frk475bx8xkygn8r4vdsvnx4rcqbjlpjawj0ndgxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-sentence";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hl-sentence";
           sha256 = "16sjfs0nnpwzj1cqfna9vhmxgznwwhb2qdmjci25hlgrdxwwyahs";
           name = "hl-sentence";
         };
@@ -27511,7 +27941,7 @@
           sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-sexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hl-sexp";
           sha256 = "0kg0m20i9ylphf4w0qcvii8yp65abdl2q5flyphilk0jahwbj9jy";
           name = "hl-sexp";
         };
@@ -27529,7 +27959,7 @@
           sha256 = "0m84d1rdsp9r5ip79jlrp69pf1daw0ch8c378q3kc328606i3p2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-spotlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hl-spotlight";
           sha256 = "1166g27fp2pj4j3a8904pzvp5idlq4l22i0w6lbk5c9zh5pqyyf3";
           name = "hl-spotlight";
         };
@@ -27550,7 +27980,7 @@
           sha256 = "0lwcvwnkbfpjw92k4qfj57nlhv8xbl614p5dfi8qy76y8bs71cvd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-todo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hl-todo";
           sha256 = "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4";
           name = "hl-todo";
         };
@@ -27571,7 +28001,7 @@
           sha256 = "02mkfrs55d32948x739f94v35343gw6a0f7fknbcigbz56mzsvsp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hlint-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hlint-refactor";
           sha256 = "1311z6y7ycwx0mj67bya7a39j5hiypg72y6yg93dhgpk23wk7frq";
           name = "hlint-refactor";
         };
@@ -27592,7 +28022,7 @@
           sha256 = "0yw89kxvz53i9rbq3lsbp5xkgfl1986s23vyra5pipakfv85gmq4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hlinum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hlinum";
           sha256 = "04b6m0njr7yrbcbpkhqz4hmqpfacmyca3lw75dyw3vpjpsj2g0iv";
           name = "hlinum";
         };
@@ -27612,7 +28042,7 @@
           sha256 = "bf4056192044808554a5dfd537512ec939cbcf628a9becd61736d6409f7e7ce8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hoa-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hoa-mode";
           sha256 = "06rfqn7sqvmgpvwhfmk17qqs4q0frfzhm597z3p1q7kys2035kiv";
           name = "hoa-mode";
         };
@@ -27633,7 +28063,7 @@
           sha256 = "0g2r4d0ivbadqw1k8jsv0jwv8krpfahsg0qmzyi909p2yfddqk1l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hoa-pp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hoa-pp-mode";
           sha256 = "01ijfn0hd645j6j88rids5dsanmzwmky37slf50yqffnv69jwvla";
           name = "hoa-pp-mode";
         };
@@ -27654,7 +28084,7 @@
           sha256 = "1sj8pz48cilk8l6zn47fv1wkv833wrkvrf2mrmbdkvj3lqjrz0b3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/homebrew-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/homebrew-mode";
           sha256 = "088wc5fq4r5yj1nbh7mriyqf0xwqmbxvblj9d2wwrkkdm5flc8mj";
           name = "homebrew-mode";
         };
@@ -27675,7 +28105,7 @@
           sha256 = "1yvz9d5h7npxhsdf6s9fgxpmqk5ixx91iwivbhzcz935gs2886hc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hookify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hookify";
           sha256 = "0prls539ifk2fsqklcxmbrwmgbm9hya50z486d7sw426lh648qmy";
           name = "hookify";
         };
@@ -27696,7 +28126,7 @@
           sha256 = "1gm5nczq5lsxqkfb38ajffg65zwxkfqvqhk33bwnnd00rpa1ix6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hound";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hound";
           sha256 = "0qri6bddd3c4sqvaqvmqw6xg46vwlfi1by3gc9i3izpq4xl1cr1v";
           name = "hound";
         };
@@ -27717,7 +28147,7 @@
           sha256 = "0vygbdjy2dv7n50vrkcnqyswq48sgas0zzjfsac8x5g9vhxjkawj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/how-many-lines-in-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/how-many-lines-in-project";
           sha256 = "145zmfmsxcbmfh9s0mvxxgfh1d51q66396zc29k1c0hw94ffhkdd";
           name = "how-many-lines-in-project";
         };
@@ -27738,7 +28168,7 @@
           sha256 = "01sj9c8mxqaif8wh6zz9v2czjaq7vcdi66drldyjmifkln6rg2v8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/howdoi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/howdoi";
           sha256 = "12vgbypawxhhrnjp8dgh0wrcp7pvjccfaxw4yhq7msai7ik3h83b";
           name = "howdoi";
         };
@@ -27759,7 +28189,7 @@
           sha256 = "17x5w5kzam8cgaphyasnqzm2yhc0hwm38azvmin7ra4h912vlisd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ht";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ht";
           sha256 = "16vmxksannn2wyn8r44jbkdp19jvz1bg57ggbs1vn0yi7nkanwbd";
           name = "ht";
         };
@@ -27780,7 +28210,7 @@
           sha256 = "10lbxf56gvy26grzrhhx2p710fzs0h866jd2zmmgkisvyb0vaiay";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/html-check-frag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/html-check-frag";
           sha256 = "0drancb9ryifiln44b40l6cal0c7nyp597a6q26288s3v909yk2a";
           name = "html-check-frag";
         };
@@ -27801,7 +28231,7 @@
           sha256 = "0k9ga0qi6h33akip2vrpclfp4zljnbw5ax40lxyxc1813hwkdrmh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/html-script-src";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/html-script-src";
           sha256 = "1pin1x6g68y75pa3vz2i9h5pmhjamh5rd5ladb1z3flcavsls64j";
           name = "html-script-src";
         };
@@ -27822,7 +28252,7 @@
           sha256 = "09n3zm9ivln8ng80fv5vwwzh9mj355ni685axda3m85xfxgai8gi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/html-to-markdown";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/html-to-markdown";
           sha256 = "1gjh9ndqsb3nfb7w5h7carjckkgy6qh63b4mg141j19dsyx9rrjv";
           name = "html-to-markdown";
         };
@@ -27841,7 +28271,7 @@
           sha256 = "8afaf87b30628afd8d376965247a6b2791129339ad7238c5529f4b173f908251";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/htmlize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/htmlize";
           sha256 = "15pym76iwqb1dqkbmkgc1yar450g2xinfl89fyss2ifyi4am1nxp";
           name = "htmlize";
         };
@@ -27862,7 +28292,7 @@
           sha256 = "1i0r677zwnl5xl64cqk47y0gfd87vw49nf6ry5v2imbc95ni56wc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/http";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/http";
           sha256 = "1176jhm8m7s1pzp0zv1sqawcgn4m5zvxghypmsrjyyb5p7m6dalm";
           name = "http";
         };
@@ -27880,7 +28310,7 @@
           sha256 = "1wp2rwc1hgd5c3yr6b96yzzakd1qmy5d95mhc6q4f6lx279nx0my";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/http-post-simple";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/http-post-simple";
           sha256 = "1b2fh0hp5z3712ncgc5ns1f3sww84khkq7zb3k9xclsp1p12a4cf";
           name = "http-post-simple";
         };
@@ -27901,7 +28331,7 @@
           sha256 = "008iq5fhsw4qklw2l457a1cfqq8diadpnf1c1di5p07sc0za5562";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/http-twiddle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/http-twiddle";
           sha256 = "153qavpcwvk2g15w5a814xjsnsv54xksx4iz6yjffvvzq14a08ry";
           name = "http-twiddle";
         };
@@ -27922,7 +28352,7 @@
           sha256 = "02jz8qwxl69zhwvpmlqc15znr8x4f30paqszmm7xrrrz5x1c1rn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/httpcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/httpcode";
           sha256 = "05k1al1j119x6zf03p7jn2r9qql33859583nbf85k41bhicknpgh";
           name = "httpcode";
         };
@@ -27943,7 +28373,7 @@
           sha256 = "0wd4wmy99mx677x4sdbp57bxxll1fsnnf8hk97r85xdmmjsmrkld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/httprepl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/httprepl";
           sha256 = "0899qb1yfnsyf04hhvnk47qnq4d1f4vd5ghj43x4743wd2b9qawh";
           name = "httprepl";
         };
@@ -27964,7 +28394,7 @@
           sha256 = "1vy521ljn16a1lcmpj09mr9y0m15lfjhl6xk04sb7nisps3vljyl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hungry-delete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hungry-delete";
           sha256 = "0hcsm3yndkyfqzb77ibx7df6bjppc34x5yabi6nd389pdscp9rpz";
           name = "hungry-delete";
         };
@@ -27985,7 +28415,7 @@
           sha256 = "16z43mpj839bzafhyzpcbw6bmv4ckrf9ryslvg6z6q4g93k64q2m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hy-mode";
           sha256 = "1vxrqla3p82x7s3kn7x4h33vcdfms21srxgxzidr02k37f0vi82m";
           name = "hy-mode";
         };
@@ -27998,15 +28428,15 @@
     hyai = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "hyai";
-        version = "20151218.610";
+        version = "20160216.825";
         src = fetchFromGitHub {
           owner = "iquiw";
           repo = "hyai";
-          rev = "9c229e6bbccb8481b3889643d02de9869956875c";
-          sha256 = "0d3kdpwzr1gs0q986pkj8b9av9knzbh1ax9ybhn0k66hi55hn7bc";
+          rev = "256c0e2a1a7188bce7ed808804a1f4216ff9db9d";
+          sha256 = "1w490lcncl3zfm694x7xpi847527qkqmy0qkpzf72ak2zhywldj0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hyai";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hyai";
           sha256 = "00ns7q5b11c5amwkq11fs4p5vrmdfmjljfrcxbwb39gc12yrhn7s";
           name = "hyai";
         };
@@ -28027,7 +28457,7 @@
           sha256 = "11vgz64f8vs8vqp4scj9qvrfdshag7bs615ly9zvzzlk68jivdya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hydandata-light-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hydandata-light-theme";
           sha256 = "0jw43m91m10ifqg335y6d52r6ri77hcmxkird8wsyrpsnk3cfb60";
           name = "hydandata-light-theme";
         };
@@ -28048,7 +28478,7 @@
           sha256 = "14gxbza26ccah8jl0fm7ksvaag0mv3c348bgqjy88dqq2qlwcrav";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hyde";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hyde";
           sha256 = "18kjcxm7qmv9bfh4crw37zgax8khjqs9zkp4lrb490zlad2asbs3";
           name = "hyde";
         };
@@ -28069,7 +28499,7 @@
           sha256 = "13ghz8mvnqn59m9alwcrxlml1k4cbw4a9wwwgf211ap4q618qjqs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hydra";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hydra";
           sha256 = "1c59l43p39ins3dn9690gm6llwm4b9p0pk78lip0dwlx736drdbw";
           name = "hydra";
         };
@@ -28090,7 +28520,7 @@
           sha256 = "17k41rah17l9kf7bvlm83x71nzz4aizgn7254cl5sb59mdhcm8pm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/i2b2-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/i2b2-mode";
           sha256 = "172qnprmfliic3rszzg3g7q015i3dchd23skrbdikg0kxj5c57lf";
           name = "i2b2-mode";
         };
@@ -28111,7 +28541,7 @@
           sha256 = "1gl21li9vqfjvls4ffjw8a4bicas2c7hmaa621k3hpllgpy6qdg5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iasm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/iasm-mode";
           sha256 = "09xh41ayaha07fi5crk3c6pn17gwm3samsf6h71ldkywvz74kipv";
           name = "iasm-mode";
         };
@@ -28132,7 +28562,7 @@
           sha256 = "1s5qvlf310b0z7q9k1xhcf4qmyfqd37jpqd67ciahaxk7cp224rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ibuffer-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ibuffer-git";
           sha256 = "048888y07bzmi9x5i43fg6bgqbzdqi3nfjfnn6zr29jvlx366r5z";
           name = "ibuffer-git";
         };
@@ -28153,7 +28583,7 @@
           sha256 = "1zcnp61c9cp2kvns3v499hifk072rxm4rhw4pvdv2mm966vcxzvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ibuffer-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ibuffer-projectile";
           sha256 = "1qh4krggmsc6lx5mg60n8aakmi3f6ppl1gw094vfcsni96jl34fk";
           name = "ibuffer-projectile";
         };
@@ -28174,7 +28604,7 @@
           sha256 = "15lapyj7qkkw1i1g1aizappm7gxkfnxhvd4fq66lghkzb76clz2m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ibuffer-rcirc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ibuffer-rcirc";
           sha256 = "1y6pyc6g8j42hs103yynjsdkkxvcq0q4xsz4r93rqwsr3za3wcmc";
           name = "ibuffer-rcirc";
         };
@@ -28195,7 +28625,7 @@
           sha256 = "1mfrbr725p27p3s5nxh7xhm81pdr78ysz8l3kwrlp97bb6dmljmq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ibuffer-tramp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ibuffer-tramp";
           sha256 = "11a9b9g1jk2r3fldi012zka4jzy68kfn4991xp046qm2fbc7la32";
           name = "ibuffer-tramp";
         };
@@ -28216,7 +28646,7 @@
           sha256 = "0fwxhkx5rkyv3w5vs2swhmly9siahlww2ipsmk7v8xmvk4a63bhp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ibuffer-vc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ibuffer-vc";
           sha256 = "0bn5qyiq07cgzci10xl57ss5wsk7bfhi3hjq2v6yvpy9v704dvla";
           name = "ibuffer-vc";
         };
@@ -28234,7 +28664,7 @@
           sha256 = "16fsxw7w0l4dxgdi71q2izcki9ykqbjxaffsjh4k0zl7nxyyvv6q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/icicles";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/icicles";
           sha256 = "15h2511gm38q14avsd86j5mnxhsjvcdmwbnhj66ashj5p5nxhr92";
           name = "icicles";
         };
@@ -28252,7 +28682,7 @@
           sha256 = "0z7v4pj0m6pwrjzyzz2xmwf6a53kmka9hxlzd1dxcpzx47pyvz3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/icomplete+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/icomplete+";
           sha256 = "0gxqkj4bjrxb046qisfz22wvanxx6bzl4hfv91rfwm78q3484slx";
           name = "icomplete-plus";
         };
@@ -28273,7 +28703,7 @@
           sha256 = "0bzbp0vgnzvd1m3lhbcrxmknpi0cjisff6jd49f1nvkdx3p2ks40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/id-manager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/id-manager";
           sha256 = "13g5fi06hvx0x2wn1d1d8rkfq5n6wbk9g5bhx2b5sar2yw0akmwm";
           name = "id-manager";
         };
@@ -28286,15 +28716,15 @@
     idea-darkula-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "idea-darkula-theme";
-        version = "20160121.1540";
+        version = "20160209.111";
         src = fetchFromGitHub {
           owner = "fourier";
           repo = "idea-darkula-theme";
-          rev = "45c077eaa32e5784cb15b66d3b40c76ef642b2d6";
-          sha256 = "08wr379dslh3sjg81p20vpqj218wgw0cf3lxn3n4cbzsy0hifh81";
+          rev = "ecff87b3bad30243848edad57d3c43580b0f7dae";
+          sha256 = "01irrj41rnbsmyny7vai01prwdkwh3ig1x5zmpmqa5spwq2lgack";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/idea-darkula-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/idea-darkula-theme";
           sha256 = "0lanhwlhd7pbzjc047vd5sgsmi2bx66gr3inr8y57swgrfw3l8sk";
           name = "idea-darkula-theme";
         };
@@ -28315,7 +28745,7 @@
           sha256 = "047gzycr49cs8wlmm9j4ry7b7jxmfhmbayx6rbbxs49lba8dgwlk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/identica-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/identica-mode";
           sha256 = "1r69ylykjap305g23cry4wajiqhpgw08nw3b5d9i1y3mwx0j253q";
           name = "identica-mode";
         };
@@ -28336,7 +28766,7 @@
           sha256 = "0x4w1ksrw7dicl84zpf4d4scg672dyan9g95jkn6zvri0lr8xciv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/idle-highlight-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/idle-highlight-mode";
           sha256 = "1i5ky61bq0dpk71yasfpjhsrv29mmp9nly9f5xxin7gz3x0f36fc";
           name = "idle-highlight-mode";
         };
@@ -28357,7 +28787,7 @@
           sha256 = "0f8rxvc3dk2hi4x524l18fx73xrxy0qqwbybdma4ca67ck9n6xam";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/idle-require";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/idle-require";
           sha256 = "1lr330bqj4rfh2jgn3562sliani4yw5y4j2hr6cq9cfjjp18qgsj";
           name = "idle-require";
         };
@@ -28378,7 +28808,7 @@
           sha256 = "1bii7vj8pmmijcpvq3a1scky4ais7k6d7zympb3m9dmz355m9rpp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-at-point";
           sha256 = "0jpgq2iiwgqifwdhwhqv0cd3lp846pdqar6rxqgw9fvvb8bijqm0";
           name = "ido-at-point";
         };
@@ -28399,7 +28829,7 @@
           sha256 = "14nmldahr0pj2x4vkzpnpx0bsxafmiihgjylk5j5linqvy8q6wk6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-clever-match";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-clever-match";
           sha256 = "081i6cjvqyfpgj0nvzc94zrl2v3l6nv6mhfda4zf7c8qqbvx1m8m";
           name = "ido-clever-match";
         };
@@ -28420,7 +28850,7 @@
           sha256 = "1aih8n10lcrw0bdgvlrkxzhkpxpmphw07cvbp6zd27ia25037fzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-complete-space-or-hyphen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-complete-space-or-hyphen";
           sha256 = "1wk0cq5gjnprmpyvhh80ksz3fash42hckvmx8m95crbzjg9j0gbc";
           name = "ido-complete-space-or-hyphen";
         };
@@ -28433,15 +28863,15 @@
     ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-completing-read-plus";
-        version = "20151219.1036";
+        version = "20160220.1842";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "78458a8bc3c3bffae933efb9fd7dfd04c481b3de";
-          sha256 = "0aqx69pvpz4bdhzg3awjpd7xn3h34pygip75dqjwpd6jp350g8r0";
+          rev = "a491b106d9da87bfe45121078563389a77f8788c";
+          sha256 = "1ddy590xgv982zsgs1civqy0ch0a88z98qhq0bqqjivf9gq3v0pf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-completing-read+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-completing-read+";
           sha256 = "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh";
           name = "ido-completing-read-plus";
         };
@@ -28462,7 +28892,7 @@
           sha256 = "0055dda1la7yah33xsi19j4hcdmqp17ily2dvkipm4y6d3ww8yqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-describe-bindings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-describe-bindings";
           sha256 = "1lsa09h025vd908r9q571iq2ia0zdpnq04mlihb3crpp5v9n9ws2";
           name = "ido-describe-bindings";
         };
@@ -28483,7 +28913,7 @@
           sha256 = "1s93q47cadanynvm1y4y08s68yq0l8q8vfasdk7w39vrjsxxsj3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-exit-target";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-exit-target";
           sha256 = "17vmg47xwk6yjlbcsswirl8s2q565k291ajzjglnz7qg2fwx6spi";
           name = "ido-exit-target";
         };
@@ -28504,7 +28934,7 @@
           sha256 = "0ifdwd5vnjv2iyb5bnz8pij35lc0ymmyx8j8zhpkbgjigz8f05ip";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-gnus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-gnus";
           sha256 = "14ijb8q4s846984h102h72ij713v5bj3k2vfdvr94gw1f0iya2yg";
           name = "ido-gnus";
         };
@@ -28525,7 +28955,7 @@
           sha256 = "1ip8g0r0aimhc4a1f06m711zmbs0krxn8hmayk99gk5kkz12igkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-grid-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-grid-mode";
           sha256 = "1wl1yclcxmkbfnvp0il23csdf6gprzf7fkcknpivk784fhl19acr";
           name = "ido-grid-mode";
         };
@@ -28546,7 +28976,7 @@
           sha256 = "01p4az128k1jvd9i1gshgg87z6048cw9cnm57l8qdlw01c3h6dkx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-hacks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-hacks";
           sha256 = "05f9pdkqppnp7wafka2d2yj84gqchjd7vnrl5rcywy1l47gbxiw0";
           name = "ido-hacks";
         };
@@ -28567,7 +28997,7 @@
           sha256 = "0l69sr3g1n2x61j6sv6hnbiyk8a2qra6y2kh413qp0sfpx4fzchv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-load-library";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-load-library";
           sha256 = "13f83gqh39p3yjy7r7qc7kzgdcmqh4b5c07zl7rwzb8y9rz59lhj";
           name = "ido-load-library";
         };
@@ -28588,7 +29018,7 @@
           sha256 = "15iajhrgy989pn91ijcd1mq2015bkaacaplm79rmb0ggxhh8vq38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-migemo";
           sha256 = "02hbwchwx2bcwdxz7gz555699l7n9wisfikax1j6idn167n4wdpi";
           name = "ido-migemo";
         };
@@ -28609,7 +29039,7 @@
           sha256 = "0zlkq29wxd3a4vg0w6ds2jad5h1pja7ccd3l6ppl0kz1b1517qlr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-occasional";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-occasional";
           sha256 = "1vdh5i9qznzd9r148a6jw9v47swf7ykwyciqfzc3ismv5q909bl2";
           name = "ido-occasional";
         };
@@ -28630,7 +29060,7 @@
           sha256 = "0j12li001yq08vzwh1b25qyq09llizrkgaay9k07g9pvfxlx6zb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-occur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-occur";
           sha256 = "058l2pklg12wkvyyshk8va6shphpbc508fv9a8x25pw857a28pji";
           name = "ido-occur";
         };
@@ -28651,7 +29081,7 @@
           sha256 = "0qvf3h2ljlbf3z36dhywzza62mfi6mqbrfc0sqfsbyia9bn1df4f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-select-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-select-window";
           sha256 = "03xqfpnagy2sk67yq7n7s6ma3im37d558zzx8sdzd9pbfxy9ij23";
           name = "ido-select-window";
         };
@@ -28672,7 +29102,7 @@
           sha256 = "149cznbybwj0gkjyvpnh4kn258kxw449m7cn95n9jbh1r45vljvy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-skk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-skk";
           sha256 = "1fyzjkw9xp126bzfv1254bvyakh323iw3wdzrkd9gb4ir39k5jzw";
           name = "ido-skk";
         };
@@ -28693,7 +29123,7 @@
           sha256 = "0w3cr2yf8644i0g8w6r147vi9wanibn41sg7dzws51yb9q0y92vd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-sort-mtime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-sort-mtime";
           sha256 = "1dkny9y3x49dv1vjwz78x2qhb6kdq3fa8qh1xkm30jyapvgiwdg2";
           name = "ido-sort-mtime";
         };
@@ -28714,7 +29144,7 @@
           sha256 = "14py5amh66jzhqyqjz5pxq0g19vzlmqnrr5wij1ix64xwfr3xdy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-springboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-springboard";
           sha256 = "04jqnag8jiyfbwvc3vd9ikrsmf6cajld7dz2gz9y0zkj1k4gs7zv";
           name = "ido-springboard";
         };
@@ -28727,15 +29157,15 @@
     ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-ubiquitous";
-        version = "20160115.1826";
+        version = "20160220.1842";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "78458a8bc3c3bffae933efb9fd7dfd04c481b3de";
-          sha256 = "0aqx69pvpz4bdhzg3awjpd7xn3h34pygip75dqjwpd6jp350g8r0";
+          rev = "a491b106d9da87bfe45121078563389a77f8788c";
+          sha256 = "1ddy590xgv982zsgs1civqy0ch0a88z98qhq0bqqjivf9gq3v0pf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-ubiquitous";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-ubiquitous";
           sha256 = "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp";
           name = "ido-ubiquitous";
         };
@@ -28756,7 +29186,7 @@
           sha256 = "1vl87phswkciijq0j07lqlgmha5dmff8yd4j4jn7cfrkrdjp6jbx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-vertical-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-vertical-mode";
           sha256 = "1vg5s6nd6v2g8ychz1q9cdqvsdw6vag7d9w68sn7blpmlr0nqhfm";
           name = "ido-vertical-mode";
         };
@@ -28766,22 +29196,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-yes-or-no = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ido-yes-or-no = callPackage ({ fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-yes-or-no";
-        version = "20140625.2306";
+        version = "20160217.1817";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-yes-or-no";
-          rev = "a9de5731b64f888be38073773c3d72b19c61ed4f";
-          sha256 = "0zqjmi1pbvpby84g1nsrmwcv7w5k0nl3hmkqj0fvhdsmayxqc6j8";
+          rev = "9ddee9e878ad62d58c9f4b3a7685f22b8e36e420";
+          sha256 = "046ns1nqisz830f6xwlly1qgmi4v2ikw6vmj0f93jprv4vkjylpq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-yes-or-no";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-yes-or-no";
           sha256 = "0glag4yb9xyf1lxxbdhph2nq6s1vg44i6f2z1ii8bkxpambz2ana";
           name = "ido-yes-or-no";
         };
-        packageRequires = [];
+        packageRequires = [ ido-completing-read-plus ];
         meta = {
           homepage = "http://melpa.org/#/ido-yes-or-no";
           license = lib.licenses.free;
@@ -28798,7 +29228,7 @@
           sha256 = "1vx2g1xgxpcabr49mkl6ggzrpa3k2zhm479j6262vb64swzx33jw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/idomenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/idomenu";
           sha256 = "0mg601ak9mhp2fg5n13npcfzphgyms4vkqd18ldmv098z2z1412h";
           name = "idomenu";
         };
@@ -28819,7 +29249,7 @@
           sha256 = "16gk7ry4yiaxk9dp6s2m4g79klw344yvr86d7hr0qdjkkf229m56";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/idris-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/idris-mode";
           sha256 = "0hiiizz976hz3z3ciwg1gs9y10qhxbs8givhz89kvyn4s4861a1s";
           name = "idris-mode";
         };
@@ -28840,7 +29270,7 @@
           sha256 = "1k7h1795kaczmhd21hzqgns7blqc6zjh2xg4w3rj986ll8lb9fpr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ids-edit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ids-edit";
           sha256 = "0jzmcynr6lvsr36nblqzrjwxawyqcdz972zsv4rqkihdydpqfz7m";
           name = "ids-edit";
         };
@@ -28861,7 +29291,7 @@
           sha256 = "1n2yz6jzbminrviadhd3h42fwvfrdy0v2nw7sk5plkzc8zrs3x25";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/iedit";
           sha256 = "02gjshvkcvyr58yf6vlg3s2pzls5sd54xpxggdmqajfg8xmpkq04";
           name = "iedit";
         };
@@ -28882,7 +29312,7 @@
           sha256 = "0b86x675g95yrlc0alffx0z9fmficlwv3gpy5cy86z1xvvyh3nzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ietf-docs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ietf-docs";
           sha256 = "0wnk36z9g7lksmynd04hb2m6rx45wpxnxj1lhrlpjnzsrknhf4k3";
           name = "ietf-docs";
         };
@@ -28903,7 +29333,7 @@
           sha256 = "18rlyjsn9w0zbs0c002s84qzark3rrcmjn9vq4nap7i6zpaq8hki";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iflipb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/iflipb";
           sha256 = "1nfrrxgi9nlhn477z8ay7jxycpcghhhmmg9dagdhrlrr20fx697d";
           name = "iflipb";
         };
@@ -28924,7 +29354,7 @@
           sha256 = "161algqrrjbc1ja08416q5wzz34rrg6shr2sim7vba0j3svyggnf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ignoramus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ignoramus";
           sha256 = "1czqdmlrds1l5afi8ldg7nrxcwav86538z2w1npad3dz8xk67da9";
           name = "ignoramus";
         };
@@ -28942,7 +29372,7 @@
           sha256 = "0qiv69v7ig38iizif7zg8aljdmpa1jk8bsfa0iyhqqqrkvsmhc29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/igrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/igrep";
           sha256 = "1vyhrziy29q6w8w9vvanb7d29r1n7nfkznbcd62il991n48d08i3";
           name = "igrep";
         };
@@ -28961,7 +29391,7 @@
           sha256 = "cefc95ead9e5d425d3763f8d63afa10dea416493cafd7144f4d3cdeee0d0fa86";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/igv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/igv";
           sha256 = "01igm3cb0lncmcyy72mjf93byh42k2hvscqhg8r7iljbxm58460z";
           name = "igv";
         };
@@ -28982,7 +29412,7 @@
           sha256 = "068z3ygq9p139ikm04xqhhqhc994an5isba5c7kpqs009y09xw3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/image-archive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/image-archive";
           sha256 = "0x0lv5dr1gc9bnr3dn26bc9s1ccq2rp8c4a1licbi929f0jyxxfp";
           name = "image-archive";
         };
@@ -29003,7 +29433,7 @@
           sha256 = "1n2ya9s0ld257a8iryjd0dz0z2zs1xhzfiwsdkq4l4azwxl54m29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/image-dired+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/image-dired+";
           sha256 = "0hhwqfn490n7p12n7ij4xbjh15gfvicmn21fvwbnrmfqc343pcdy";
           name = "image-dired-plus";
         };
@@ -29024,7 +29454,7 @@
           sha256 = "0v66wk9nh0raih4jhrzmmyi5lbysjnmbv791vm2230ffi2hmwxnd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/image+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/image+";
           sha256 = "1a9dxswnqn6cvx28180kclpjc0vc6fimzp7n91gpdwnmy123x6hg";
           name = "image-plus";
         };
@@ -29045,7 +29475,7 @@
           sha256 = "0f3xdqhq9nprvl8bnmgrx20h08ddkfak0is29bsqwckkfgn7pmqp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imakado";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/imakado";
           sha256 = "18mj0vpv3dybfpa8hl9jwlagsivbhgqgz8lwb8cswsq9hwv3jgd3";
           name = "imakado";
         };
@@ -29058,15 +29488,15 @@
     imenu-anywhere = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "imenu-anywhere";
-        version = "20160131.412";
+        version = "20160213.732";
         src = fetchFromGitHub {
           owner = "vitoshka";
           repo = "imenu-anywhere";
-          rev = "15e080254b4a55e5613493583c9624feb3ef9b5d";
-          sha256 = "15vh09d91l6r8zlyps1mg7i0pygdzqi8w01grk1ka25ak7378c2v";
+          rev = "e2419b1558cecdbc8fe8a31806334b8ce2556622";
+          sha256 = "0h4x8wbg6kp8iqhka0f5m67hxh3yd5kb95j12k30wbgqgabi01md";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imenu-anywhere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/imenu-anywhere";
           sha256 = "0p93g7ay9n4nhf1qk24mbax0w9sr06xd2kjmrz00gbg75sr9r2s8";
           name = "imenu-anywhere";
         };
@@ -29079,15 +29509,15 @@
     imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "imenu-list";
-        version = "20160203.807";
+        version = "20160211.541";
         src = fetchFromGitHub {
           owner = "bmag";
           repo = "imenu-list";
-          rev = "ee4f38dc9d590808d627789102afe4b12c20f5e6";
-          sha256 = "0ay008mivxyn23bncnc8qbs91w26i0ym7c57nd5z16kwg1gnh4a7";
+          rev = "a68d596b437ce1c125d8bd5414467ca1ff55bdcc";
+          sha256 = "1j0p0zkk89lg5xk5qzdnj9nxxiaxhff2y9iv9lw456kvb3lsyvjk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imenu-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/imenu-list";
           sha256 = "092fsn7hnbfabcyakbqyk20pk62sr8xrs45aimkv1l91681np98s";
           name = "imenu-list";
         };
@@ -29105,7 +29535,7 @@
           sha256 = "00w88d37mg2hdrzpw5cxrgqz5jbf7rylmir95hs8j1cm8fk787bb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imenu+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/imenu+";
           sha256 = "1v2h3xs5pnv7z5qphkn2y5pa1p8pivrknkw7xihm5yr4a4dqjv5d";
           name = "imenu-plus";
         };
@@ -29118,15 +29548,15 @@
     imenus = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "imenus";
-        version = "20150107.1139";
+        version = "20160219.458";
         src = fetchFromGitHub {
           owner = "alezost";
           repo = "imenus.el";
-          rev = "a153eadef49bcc0a2dd5d045c0e003fdfd8c13cd";
-          sha256 = "0wi346m05b18i14xxih4qvwdrfcgv30gdvxjjcn6vd7gr0wdk2ns";
+          rev = "e492fcdcd2fa4c0fda0356ae6e23500514e544d3";
+          sha256 = "1zg9rv9qpzxsc3r6gmbcyizx7jvhfdyn08dfgim3g382czbapfbc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imenus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/imenus";
           sha256 = "1q0j6r2n5vjlbgchkz9zdglmmbpd8agawzcg61knqrgzpc4lk82r";
           name = "imenus";
         };
@@ -29147,7 +29577,7 @@
           sha256 = "1q53r3f3x0hpzryxd1v1w3qgs54p384q0azi7xj2gppi1q49sa42";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imgix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/imgix";
           sha256 = "0dh7qsz5c9mflldcw60vc8mrxrw76n2ydd7blv6jfmsnr19ila4q";
           name = "imgix";
         };
@@ -29168,7 +29598,7 @@
           sha256 = "0nzgfj083im8lc62ifgsh1pmbw0j9wivimjgih7k6ny3jgw834rs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imgur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/imgur";
           sha256 = "0hr2zz7nq65jig2036g5sa8q2lhb42jv40ijikcz8s4f5v3y14i7";
           name = "imgur";
         };
@@ -29189,7 +29619,7 @@
           sha256 = "0rbamm9qvipgswxng8g1d7rbdbcj7sgwrccg7imcfapwwq7xhj4h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/immutant-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/immutant-server";
           sha256 = "15vcxag1ni41ja4b3q0444sq5ysrisis59la7li6h3617wy8r02i";
           name = "immutant-server";
         };
@@ -29210,7 +29640,7 @@
           sha256 = "0vr4i3ayp1n8zg3v9rfv81qnr0vrdbkzphwd5kyadjgy4sbfjykj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/impatient-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/impatient-mode";
           sha256 = "05vp04zh5w0ss959galdrnridv268dzqymqzqfpkfjbg8kryzfxg";
           name = "impatient-mode";
         };
@@ -29227,11 +29657,11 @@
         src = fetchFromGitHub {
           owner = "trotzig";
           repo = "import-js";
-          rev = "00d5178c247fabe1574a5239f2b134942cfadbd6";
-          sha256 = "1d79vvrxi0mxgr6wm3cjbqkgryh74jcjc1fkxpln8wyhjcddphzf";
+          rev = "288fe97646d19a4185dad4a034752e6f79a23155";
+          sha256 = "0210mxcbb470h6k1b0nny9jpa7bfy1c46v901gjlpzqxz41r0fiy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/import-js";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/import-js";
           sha256 = "1grvzy378qj14wlbmhb3j7fx2zkl9wp65b5g0brjimav08nz7bls";
           name = "import-js";
         };
@@ -29252,7 +29682,7 @@
           sha256 = "0ycsdwwfb27g85aby4jix1aj41a4vq6bf541iwla0xh3wsyxb01w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/import-popwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/import-popwin";
           sha256 = "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy";
           name = "import-popwin";
         };
@@ -29273,7 +29703,7 @@
           sha256 = "1p54w9dwkc76nvc4m0q9a0lh4bdxp4ad1wzscadayqy8qbrylf97";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/indent-guide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/indent-guide";
           sha256 = "029fj9rr9vfmkysi6lzpwra92j6ppw675qpj3sinfq7fqqlicvp7";
           name = "indent-guide";
         };
@@ -29294,7 +29724,7 @@
           sha256 = "1zsw68zzvjjh93cldc0w83k67hzcgi226vz3d0nzqc9sczqk8civ";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/indicators";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/indicators";
           sha256 = "1rhmz8sfi2gnv72sbw6kgyzidk43mnp05wnscw9vjvz9v0vwirss";
           name = "indicators";
         };
@@ -29315,7 +29745,7 @@
           sha256 = "0kv0aj444i2rzksvcfz8sw0yyig3ca3m05agnhw9jzr01y05yl1n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/indy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/indy";
           sha256 = "118n3n07h1vx576fdv6v5a94aa004q0gmy9hlsnrswpxa30ahnw7";
           name = "indy";
         };
@@ -29328,15 +29758,15 @@
     inf-clojure = callPackage ({ clojure-mode, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-clojure";
-        version = "20160201.1147";
+        version = "20160206.1019";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "inf-clojure";
-          rev = "a246bf3f6d286f7bcbc6dbc091e7c67876a3e8e8";
-          sha256 = "18sg9lq6wxjk9jiyid9l67b5y4hwrljz1gh3w59rdy59f2fcmnav";
+          rev = "3e7896a7cb467ce28e2d5eca6a8d6c2ad2335983";
+          sha256 = "04ydxjh3wcs1qnack9f1sgq67chl9ihypplhj9i3shnj4zx1a6n8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inf-clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inf-clojure";
           sha256 = "0n8w0vx1dnbfz88j45a57z9bsmkxr2zyh6ld72ady8asanf17zhl";
           name = "inf-clojure";
         };
@@ -29357,7 +29787,7 @@
           sha256 = "14kf3zvms1w8cbixhpgw3m2xxc2r87i57gmx00jwh89282i6kgsi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inf-mongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inf-mongo";
           sha256 = "09hf3jmacsk4hl0rxk35cza8vjl0xfmv19dagb8h8fli97fb65hh";
           name = "inf-mongo";
         };
@@ -29378,7 +29808,7 @@
           sha256 = "1z5ns94xgj2dkv2sc2ckax6bzwdxsm19pkvni24ys2w7d5nhajzr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inf-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inf-php";
           sha256 = "011sc6f0ka7mmik8z0df8qk24mf6ygq22jy781f2ikhjh94gy83d";
           name = "inf-php";
         };
@@ -29391,15 +29821,15 @@
     inf-ruby = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "inf-ruby";
-        version = "20151104.1437";
+        version = "20160221.610";
         src = fetchFromGitHub {
           owner = "nonsequitur";
           repo = "inf-ruby";
-          rev = "24c08fca2a18b76a3a200c79bdb5e41b50e04296";
-          sha256 = "0rg7md4b8chqfh565l9dhsjyiiqrbhm2xcaf88h2zian2rp0p1wh";
+          rev = "aad537f010a64e8123b610329fd09fedc82abb41";
+          sha256 = "0r0gjv6wg60v6xc4a0zmyib07ac04h7vcwjbshjgjwybfvx98raj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inf-ruby";
           sha256 = "02f01vwzr6j9iqcdns4l579bhia99sw8hwdqfwqjs9gk3xampfpp";
           name = "inf-ruby";
         };
@@ -29420,7 +29850,7 @@
           sha256 = "0061hcmj63g13bvacwkmcb5iggwnk27dvb04fz4hihqis6jg01c5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inflections";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inflections";
           sha256 = "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70";
           name = "inflections";
         };
@@ -29438,7 +29868,7 @@
           sha256 = "068y1p44ynimxfrqgrrhrj4gldf661dr0kbc9p7dqm1mw928hxmm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/info+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/info+";
           sha256 = "0flpmi8dsaalg14xd86xcr087j51899sm8ghsa150ag4g4acfggr";
           name = "info-plus";
         };
@@ -29458,7 +29888,7 @@
           sha256 = "3c00805529518edba788671fed0c3e56810d1dbec2a0dbd3cb42f42991326ca6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inform7-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inform7-mode";
           sha256 = "1kbyl69vwhp1wdivr3ijmj7mghdnjaw7adk8az7bwyzjvpq73171";
           name = "inform7-mode";
         };
@@ -29479,7 +29909,7 @@
           sha256 = "1zykh80k2sy0as1rn7qaa2hyvkagcvzzmxik4jpb0apw0ha1bf6s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/init-loader";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/init-loader";
           sha256 = "0rq7759abp0ml0l8dycvdl0j5wsxw9z5y9pyx68973a4ssbx2i0r";
           name = "init-loader";
         };
@@ -29500,7 +29930,7 @@
           sha256 = "0xk7lyhd9pgahbscqwa2qkh2vgnbs5yz78am3zh930k4ig9lbmjh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/init-open-recentf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/init-open-recentf";
           sha256 = "0xlmfxhxb2car8vfx7krxmxb3d56x0r3zzkj8ds7yqvr65z85x2r";
           name = "init-open-recentf";
         };
@@ -29521,7 +29951,7 @@
           sha256 = "1qvkxpxdv0n9qlzigvi25iw485824pgbpb10lwhh8bs2074dvrgq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/initsplit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/initsplit";
           sha256 = "0n9dk3x62vgxfn39jkmdg8wxsik0xqkprifgvqzyvn8xcx1blyyq";
           name = "initsplit";
         };
@@ -29542,7 +29972,7 @@
           sha256 = "063v3a783si5fi8jrnysss60qma1c3whvyb48i10qbrrrx750cmv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inkpot-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inkpot-theme";
           sha256 = "0w4q74w769n88zb2q7x326cxji42278lf95wnpslgjybnaxycgw7";
           name = "inkpot-theme";
         };
@@ -29563,7 +29993,7 @@
           sha256 = "0jipds844432a8m4d5gxbbkk2h1rsq9fg748g6bxy2q066kyzfz6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inline-crypt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inline-crypt";
           sha256 = "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n";
           name = "inline-crypt";
         };
@@ -29584,7 +30014,7 @@
           sha256 = "15nasjknmzy57ilj1gaz3w5sj8b3ijcpgwcd6w2r9xhgcl86m40q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inlineR";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inlineR";
           sha256 = "1fflq2gkpfn3jkv4a6yywzmxsq6qszfid1ri85ass1ppw6scdvzw";
           name = "inlineR";
         };
@@ -29605,7 +30035,7 @@
           sha256 = "1np3ih2bz9831p97rx5bssq78grjxj7f9241z372l6ggimrqhkbx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/insert-shebang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/insert-shebang";
           sha256 = "0z88l1q925v9lwzr6nas9qjy0f57qxilg6smgpx9wj6lll3f7p5v";
           name = "insert-shebang";
         };
@@ -29626,7 +30056,7 @@
           sha256 = "112s3c0ii8zjc6vlj2im2qd2pl3hb95pq4zibm86gjpw428wd8iy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/insfactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/insfactor";
           sha256 = "0c6q1d864qc78sqk9iadjpd01xc7myipgnf89pqa2z75yprndvyn";
           name = "insfactor";
         };
@@ -29646,7 +30076,7 @@
           sha256 = "0krscid3yz2b7kv75gd9fs92zgfl7pnl77dbp5gycv5rmw5mivp8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/instapaper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/instapaper";
           sha256 = "1yibdpj3lx6vr33s75s1y415lxqljrk7pqc901f8nfa01kca7axn";
           name = "instapaper";
         };
@@ -29667,7 +30097,7 @@
           sha256 = "0jdm4xjzpl5dr5s8n2hhd5md6hfl6m6v10nwd1n54pb7bv98aqsl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/interaction-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/interaction-log";
           sha256 = "1r9qbvgssc2zdwgwmmwv5kapvmg1y3px7268gkiakkfanw3kqk6j";
           name = "interaction-log";
         };
@@ -29680,15 +30110,15 @@
     interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "interleave";
-        version = "20151120.835";
+        version = "20160208.437";
         src = fetchFromGitHub {
           owner = "rudolfochrist";
           repo = "interleave";
-          rev = "4b8ce53ee8ca075029ce88d203735256a875e516";
-          sha256 = "13bsszx4rsq3awg6zgzfdwgflkldw38nihkc9nldfixzvw1gdqqv";
+          rev = "6b28363eac939227c6cdc8a73a1d3ea5b002442d";
+          sha256 = "1qs6j9cz152wfy54c5d1a558l0df6wxv3djlvfl2mx58wf0sk73h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/interleave";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/interleave";
           sha256 = "18b3fpxn07y5abkcnaw9is9ihdhik7xjdj6kzl1pz958lk9f4hfy";
           name = "interleave";
         };
@@ -29709,7 +30139,7 @@
           sha256 = "1zv6m24ryls9hvla3hf8wzp6r7fzbxa1lzr1mb0wz0s292l38wjz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/interval-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/interval-list";
           sha256 = "0926z3lxkmpxalpq7hj355cjzbgpdiw7z4s8xdrpa1pi818d35zf";
           name = "interval-list";
         };
@@ -29730,7 +30160,7 @@
           sha256 = "0fqnn9xhrc9hkaiziafjgg288l6m05416z9kz8l5845fnqsb7pb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/interval-tree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/interval-tree";
           sha256 = "13zynac3h50x68f1ja72kqdrapjks2zmgqd4g7qwscq92mmh60i9";
           name = "interval-tree";
         };
@@ -29751,7 +30181,7 @@
           sha256 = "10xpxmbzhmi0lmby2rpmxrbr3qf1vlbif2inmfsvkj85wyh8a7rp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/io-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/io-mode";
           sha256 = "1fpiml7lvbl4s2xw4wk2y10iifvfza24kd9j8qvi1bgd85qkx42q";
           name = "io-mode";
         };
@@ -29772,7 +30202,7 @@
           sha256 = "1ard88kc13c57y9zdkyr012w8rdrwahz8a3fb5v6hwqymg16m20s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/io-mode-inf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/io-mode-inf";
           sha256 = "0hwhvf1qwkmzzlzdda1flw6p1jjh9rzxsfwm2sc4795ac2xm6dhc";
           name = "io-mode-inf";
         };
@@ -29793,7 +30223,7 @@
           sha256 = "1rz5wf19lg1lnm0h73ynhb0vl3c99k7vpipay2f8jls24pv60bra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ioccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ioccur";
           sha256 = "1a9iy6x4lkm4wgkcb0pv86c2kvpq8ymrc4ssp109r67kwqw7lrr6";
           name = "ioccur";
         };
@@ -29814,7 +30244,7 @@
           sha256 = "14zfxa8fc7h4rkz1hyplwf4q2lga3l5dd7a2xq5kk0kvf2fs4mk3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iodine-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/iodine-theme";
           sha256 = "05mnq0bgcla0pxsgywpvcdgd4sk2xr7bjlp87l0dx8j121vqripj";
           name = "iodine-theme";
         };
@@ -29835,7 +30265,7 @@
           sha256 = "043dnij48zdyg081sa7y64lm35z7zvrv8gcymv3l3a98r1yhy3v6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iplayer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/iplayer";
           sha256 = "0wnxvdlnvlmspqsaqx0ldw8j03qjckkqzvx3cbpc2yfs55pm3p7r";
           name = "iplayer";
         };
@@ -29856,7 +30286,7 @@
           sha256 = "0skyd9c7pz68v17aj3h47ralszbmc4gqg552q8jpimcjd1lacc7l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ipretty";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ipretty";
           sha256 = "1zysip6cb8s4nzsxiwk052gq6higz2xnd376r9wxmgj7w8him2c4";
           name = "ipretty";
         };
@@ -29877,7 +30307,7 @@
           sha256 = "1cy9xwhswj9vahg8zr16r2crm2mm3vczqs73gc580iidasb1q1i2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ir-black-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ir-black-theme";
           sha256 = "1qpq9zbv63ywzk5mlr8x53g3rn37k0mdv6x1l1hcd90gka7vga9v";
           name = "ir-black-theme";
         };
@@ -29898,7 +30328,7 @@
           sha256 = "1ch610b3d0x3nxglp749305syliivamc108rgv9if4ihb67gp8b5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iregister";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/iregister";
           sha256 = "0iq1nlj5czi4nblrszfv3grkl1fni7blh8bhcfccidms8v9r3mdm";
           name = "iregister";
         };
@@ -29916,7 +30346,7 @@
           sha256 = "197ybqwbj8qjh2p9pkf5mvqnrkpcgmv8c5s2gvl6msyrabk0mnca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/irfc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/irfc";
           sha256 = "0186l6zk5l427vjvmjvi0xhwk8a4fjhsvw9kd0yw88q3ggpdl25i";
           name = "irfc";
         };
@@ -29937,7 +30367,7 @@
           sha256 = "11mwl22i4r9an992xprzyi24rc3ci3l13s461yjavkgl3nbnlf7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/irony";
           sha256 = "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a";
           name = "irony";
         };
@@ -29958,7 +30388,7 @@
           sha256 = "01fjpfixfcca01a5fnnpd2wga4j30p0kwhbai25prvib4qcp1kqn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/irony-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/irony-eldoc";
           sha256 = "03m0h13jd37vfvn4mavaq3vbzx4x0lklbs0mbc29zaz8pwqlcwz6";
           name = "irony-eldoc";
         };
@@ -29979,7 +30409,7 @@
           sha256 = "17d0816awadvsw1qc7r0p6ira75jmgxaj9hsk9ypayxsaf6ynyrb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/isearch-dabbrev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/isearch-dabbrev";
           sha256 = "1hl7zl5vjcsk3z452874g4nfcnmna8m2242dc9cgpl5jddzwqa7x";
           name = "isearch-dabbrev";
         };
@@ -29991,13 +30421,13 @@
       }) {};
     isearch-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "isearch-plus";
-        version = "20160128.1005";
+        version = "20160212.1523";
         src = fetchurl {
           url = "http://www.emacswiki.org/emacs/download/isearch+.el";
-          sha256 = "1l269vc92jxrw3snhjykxb28xdg672cj43q35lk61yg4fl2ny9bc";
+          sha256 = "0rfvaz0fa458nk5lyb87vhaxpygbkh4wzfk9ynghp5778faqabgq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/isearch+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/isearch+";
           sha256 = "1rzlsf08nmc3p3vhpwbiy8cgnnl2c10xrnsr2rlpv0g2kxkrd69r";
           name = "isearch-plus";
         };
@@ -30015,7 +30445,7 @@
           sha256 = "1i1ypganr2ivwgi0vgjihgk1s4yglwj8nbqnqjiiwdywf8g5hcmr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/isearch-prop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/isearch-prop";
           sha256 = "1z9y88b23m4ffil8p3wcq61q1fiyqjxphyd3wacs5fnc53mdzad9";
           name = "isearch-prop";
         };
@@ -30036,7 +30466,7 @@
           sha256 = "09z49850c32x0rchxg203cxg504xi2b6cjgnd0i4axcs5fmq7gv9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/isearch-symbol-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/isearch-symbol-at-point";
           sha256 = "0j5fr7qdvpd5b096h5a83fz8sh9wybdnsgix6v94gv8lkzdsqkr8";
           name = "isearch-symbol-at-point";
         };
@@ -30057,7 +30487,7 @@
           sha256 = "022j39r2vvppnh3p5rp9i4cgc3lg24ksjcmcjmbmna1vf624izn0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/isend-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/isend-mode";
           sha256 = "0sk80a08ny9vqw94klqfgii297qm633000wlcldha76ip8viikdv";
           name = "isend-mode";
         };
@@ -30078,7 +30508,7 @@
           sha256 = "09hx28lmldm7z3x22a0qx34id09fdp3z61pdr61flgny213q1ach";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/isgd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/isgd";
           sha256 = "0yc9mkjzj3w64f48flnjvd193mk9gndrrqbxz3cvmvq3vgahhzyi";
           name = "isgd";
         };
@@ -30099,7 +30529,7 @@
           sha256 = "0992lzgar0kz9i1sk5vz17q9qzfgl8fkyxa1q0hmhgnpjf503cnj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iss-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/iss-mode";
           sha256 = "1my4vi1x07hg0dva97i685lx6m6fcbfk16j1zy93zriyd7z5plkc";
           name = "iss-mode";
         };
@@ -30120,7 +30550,7 @@
           sha256 = "1az986mk8j8hyvr1mi9hirixwcd73jcqkjsw4xy34vjbwxi122r9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/itail";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/itail";
           sha256 = "0mcyly88a3c15hl3wll56agpdsyvd26r501h0v64lasfr4k634m7";
           name = "itail";
         };
@@ -30141,7 +30571,7 @@
           sha256 = "08gagq74702x65dy75n2f53fsh806nppnidim9z6ycp8qw1ibyfp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iterator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/iterator";
           sha256 = "17q10fw6y0icsv6vv9n968bwmbjlihrpkkyw62d1kfxhs9yw659z";
           name = "iterator";
         };
@@ -30162,7 +30592,7 @@
           sha256 = "12nqpzcmz724wpk8p16lc3z26rxma3wp6pf6dvrsqagnlixrs9si";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ivariants";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ivariants";
           sha256 = "00fgcm62g4fw4306lw9ld2k7w0c358fcbkxn969k5p009g7pk5bw";
           name = "ivariants";
         };
@@ -30183,7 +30613,7 @@
           sha256 = "1926pyfsbr6j7cn3diq8ibs0db94rgsf0aifvbqrqp4grs85pkva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ivs-edit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ivs-edit";
           sha256 = "0gzhvzrfk17j2vwlg82f5ifk4dcfc1yv7barcij38ckran8cqmb2";
           name = "ivs-edit";
         };
@@ -30204,7 +30634,7 @@
           sha256 = "069alh9vs6is3hvbwxbwr9g8qq9md5c92wg5bfswi99yciqdvc4i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ix";
           sha256 = "1fl76dk8vgw3mrh5iz99lrsllwya6ij9d1lj3szcrs4qnj0b5ql3";
           name = "ix";
         };
@@ -30222,7 +30652,7 @@
           sha256 = "19l9d5gp1xj40iyy35r8hh7v6bjnzjx7pb8dvwrmndzg0rlsp7mi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iy-go-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/iy-go-to-char";
           sha256 = "055qj2pc32l824vyjl2w2j8c3rpd9g4x0sazi8svqf923lgcs5s8";
           name = "iy-go-to-char";
         };
@@ -30243,7 +30673,7 @@
           sha256 = "07kbicf760nw4qlb2lkf1ns8yzqy0r5jqqwqjbsnqxx4sm52hml9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/j-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/j-mode";
           sha256 = "0f9lsr9hjhdvmzx565ivlncfzb4iq4rjjn6a41053cjy50bl066i";
           name = "j-mode";
         };
@@ -30263,7 +30693,7 @@
           sha256 = "994d5c2d917a2874c660ec30827d041ee1f1be55b4d8130cb7a780d60c90158d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jabber";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jabber";
           sha256 = "1g5pc80n3cd5pzs3hmpbnmxbldwakd72pdn3vvb0h26j9v073pa8";
           name = "jabber";
         };
@@ -30284,7 +30714,7 @@
           sha256 = "0yv86nadp6dfzl05vhk8c1kahg2pcrhfmd3mnfjrngp7ksac5lyf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jabber-otr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jabber-otr";
           sha256 = "114z5bwhkza03yvfa4nmicaih2jdq83lh6micxjimpddsc8fjgi0";
           name = "jabber-otr";
         };
@@ -30304,7 +30734,7 @@
           sha256 = "7036a0eddf25a2274a6fd1584ff497d2b8078869fa6cc9d61504e6540ff863a8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jack-connect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jack-connect";
           sha256 = "1ssl126wihaf8m2f6ms0l5ai6pz5wn348a09k6l0h3jfww032g1q";
           name = "jack-connect";
         };
@@ -30325,7 +30755,7 @@
           sha256 = "1q6wpjb7vhsy92li6fag34pwyil4zvcchbvfjml612aaykiys506";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jade-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jade-mode";
           sha256 = "156j0d9wx6hrhph0nsjsi1jha4h65rcbrbff1j2yr8vdsszjrs94";
           name = "jade-mode";
         };
@@ -30346,7 +30776,7 @@
           sha256 = "0x0vz7m9kn7b2aiqvrdqx8qh84ynbpzy2asz2b18l47bcwa7r5bh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jammer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jammer";
           sha256 = "01c4bii7gswhp6z9dgx4bhvsywiwbbdv7mg1zj6vp1530l74zx6z";
           name = "jammer";
         };
@@ -30367,7 +30797,7 @@
           sha256 = "1mwm9wpnxqq3nw7fl0jf40a92ha51yd95vvr58zllhbxdpy3q9pv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/japanese-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/japanese-holidays";
           sha256 = "0pxpkikkn2ys0kgf3lbrdxv8iym50h5ik2xzza0qk7cw1v93jza9";
           name = "japanese-holidays";
         };
@@ -30388,7 +30818,7 @@
           sha256 = "1lrsm282lhp7pf0gwr3aad2228lvpqnqs1qdv2xk0zljqnqc0bhx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/japanlaw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/japanlaw";
           sha256 = "1pxss1mjk5660k80r1xqgslnbrsr6r4apgp9abjwjfxpg4f6d0sa";
           name = "japanlaw";
         };
@@ -30409,7 +30839,7 @@
           sha256 = "0xmv7gw5xms6nhjcl51cw33yvjgw0c6bpnlyca3195x7g34sg1zj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jape-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jape-mode";
           sha256 = "1gd685r86h0kr36msw81gfgwv7d35hihz6h0jkc6vd22wf6qc3ly";
           name = "jape-mode";
         };
@@ -30430,7 +30860,7 @@
           sha256 = "0nydj0y58yhfh16492q5gzkkz7qrxbdhp4gh2xbiykcbynygj2mq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jar-manifest-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jar-manifest-mode";
           sha256 = "0kx358m3p23r8m7z45454i62ijmdlf4mljlbqc20jkihfanr6wqd";
           name = "jar-manifest-mode";
         };
@@ -30451,7 +30881,7 @@
           sha256 = "1zcrxijcwqfs6r1cd6w4jq8g3ly0a69nf0cbx93w5v86x2kjpz0l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jasminejs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jasminejs-mode";
           sha256 = "1a70j3aglrwmaw9g8m99sxad2vs53y4swxh97gqjsgx1rrx03g52";
           name = "jasminejs-mode";
         };
@@ -30472,7 +30902,7 @@
           sha256 = "1bv0al89wlwdv3bhasxnwhsv84phgnixclgrh4l52385rjn8v53f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jaunte";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jaunte";
           sha256 = "0chqiai7fv1idga71gc5dw4rdv1rblg5rrbdijh3glyi8yfr4snf";
           name = "jaunte";
         };
@@ -30493,7 +30923,7 @@
           sha256 = "0d8r7pw6v2b3b6brspkpra7q7fmmjh6zm23gmnhdrk72f37fgzdz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/java-imports";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/java-imports";
           sha256 = "1waz6skyrm1n8wpc0pwa652l11wz8qz1m89mqxk27k3lwyd84n98";
           name = "java-imports";
         };
@@ -30514,7 +30944,7 @@
           sha256 = "09pa1hmk0dyh7vw0lb9awyrvdarakgaxn66gag5fzbg5vgdfz32i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/java-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/java-snippets";
           sha256 = "0bsmp6sc3khdadkmwqy8khz8kzqijcsv70gimm2cs1kwnbyj6pfp";
           name = "java-snippets";
         };
@@ -30527,15 +30957,15 @@
     javadoc-lookup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "javadoc-lookup";
-        version = "20151222.1310";
+        version = "20160213.1831";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "javadoc-lookup";
-          rev = "0d5316407c9ec183040ca5c6ab71091b9444276f";
-          sha256 = "0ljpqgp2w3lr61n2vr748n3wyshlqnnbin0643jffa319l99z35r";
+          rev = "507a2dd443d60b537b8f779c1847e2cd0ccd1382";
+          sha256 = "16gywcma1s8kslwznlxwlx0xj0gs5g31637kb74vfdplk48f04zj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/javadoc-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/javadoc-lookup";
           sha256 = "1fffs0iqkk9rg5vbxifvn09j4i2751p81bzcvy5fslr3r1r2nv79";
           name = "javadoc-lookup";
         };
@@ -30556,7 +30986,7 @@
           sha256 = "070r4mg4v937n4h2bmzdbn3vsmmq7ijz69nankqs761jxv5gcwlg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/javap-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/javap-mode";
           sha256 = "19p39l4nwgxm52yimy4j6l43845cpk8g5qdrldlwfxd7dvay09ay";
           name = "javap-mode";
         };
@@ -30577,7 +31007,7 @@
           sha256 = "1430xwd86fdlv1gzkdlp9a0x3w4blbplw24z0m7y8b0j9rhl4fka";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jaword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jaword";
           sha256 = "05pzh99zfl8n3p6lxdd9abr52m24hqcb105458i1cy0ra840bf4d";
           name = "jaword";
         };
@@ -30598,7 +31028,7 @@
           sha256 = "00havgs6xc44plnr3vbs13xxiwygr93izm6nx4y98zhcv389ajb0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jazz-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jazz-theme";
           sha256 = "0ad8kvrmd3gyb8wfghcl4r3kwzplk5gxlw3p23wsbx6c2xq6xr7g";
           name = "jazz-theme";
         };
@@ -30611,15 +31041,15 @@
     jbeans-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jbeans-theme";
-        version = "20151217.954";
+        version = "20160218.1012";
         src = fetchFromGitHub {
           owner = "synic";
           repo = "jbeans-emacs";
-          rev = "282f4236b11d42b2927f18b4e0b458bf61550867";
-          sha256 = "0yx64jrq1br0aylfn4mm26f71gyyw6kad97kv40sb0ashm3di96h";
+          rev = "25007aa6c241b8891a5609cc05d29e94442f7934";
+          sha256 = "0mmvq3kp90fllj3ix0iqbnmpfmzr1ykhpz5q066930kjlgz25nvp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jbeans-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jbeans-theme";
           sha256 = "0y7ccycfnpykgzr88968w7dl45qazf8b9zlf7ydw3ghkl4f6lbwl";
           name = "jbeans-theme";
         };
@@ -30632,15 +31062,15 @@
     jdee = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jdee";
-        version = "20160130.1630";
+        version = "20160207.228";
         src = fetchFromGitHub {
           owner = "jdee-emacs";
           repo = "jdee";
-          rev = "d676043d9b25af39961ceec4428bbada52922b64";
-          sha256 = "0kxqdz8w7lyvl8nyba3c7m0l6nncraml3yyzn250mfbsvbijn1hd";
+          rev = "0296ef1c25c0d75ed5ac1bb951e0d82d1a85c05e";
+          sha256 = "04l2p1lhg88jhnsi1v4a5rqra6fkwbhnyk2vc94j7j6gzzzxg71l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jdee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jdee";
           sha256 = "1yn8vszj0hs2jwwd4x55f11hs2wrxjjvxpngsj7lkcwax04kkvq3";
           name = "jdee";
         };
@@ -30657,11 +31087,11 @@
         src = fetchFromGitHub {
           owner = "tkf";
           repo = "emacs-jedi";
-          rev = "8da022c8cda511428c72a6dc4c5be3c0a0c88584";
-          sha256 = "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7";
+          rev = "e6b0139cba46bd4e53afaf044bc84c618b8afb38";
+          sha256 = "1zh7jbks0c6swzdm0wwxv4bbpvh15ab7bgs0w7ca1dnlvm07ybjm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jedi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jedi";
           sha256 = "1777060q25k9n2g6h1lm5lkki900pmjqkxq72mrk3j19jr4pk9m4";
           name = "jedi";
         };
@@ -30678,11 +31108,11 @@
         src = fetchFromGitHub {
           owner = "tkf";
           repo = "emacs-jedi";
-          rev = "8da022c8cda511428c72a6dc4c5be3c0a0c88584";
-          sha256 = "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7";
+          rev = "e6b0139cba46bd4e53afaf044bc84c618b8afb38";
+          sha256 = "1zh7jbks0c6swzdm0wwxv4bbpvh15ab7bgs0w7ca1dnlvm07ybjm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jedi-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jedi-core";
           sha256 = "0pzi32zdb4g9n4kvpmkdflmqypa7nckmnjq60a3ngym4wlzbb32f";
           name = "jedi-core";
         };
@@ -30703,7 +31133,7 @@
           sha256 = "1pgi5vnwz5agrpvy7nwg3gv2nfbbmimhk8dxkg81k6yf1iiqxcap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jedi-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jedi-direx";
           sha256 = "1y4n4c2imnm3f1q129bvbi4gzk0iazd8qq959gvq9j9fl1aziiz1";
           name = "jedi-direx";
         };
@@ -30724,7 +31154,7 @@
           sha256 = "0rx72rid7922mhw21j85kxmx0fhpkmkv9jvxmj9izy01xnjbk00c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jekyll-modes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jekyll-modes";
           sha256 = "1305f1yg1mamyw3bkzrk5q3q58ihs8f5k9vjknsww5xvrzz3r1si";
           name = "jekyll-modes";
         };
@@ -30745,7 +31175,7 @@
           sha256 = "08ywfmsjv3vjqy95hx095kasy8knh3asl7mrlkgmv9wjwnxw45zs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jenkins";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jenkins";
           sha256 = "0ji42r7p3f3hh643839xf74gb231vr7anycr2xhkga8qy2vwa53s";
           name = "jenkins";
         };
@@ -30766,7 +31196,7 @@
           sha256 = "0jayhv8j7b527dimhvcs0d7ax25x7v50dk0k6apisqc23psvkq66";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jenkins-watch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jenkins-watch";
           sha256 = "0brgjgbw804x0gf2vq01yv6bd0ilp3x9kvr1nnsqxb9c03ffmb2m";
           name = "jenkins-watch";
         };
@@ -30779,14 +31209,14 @@
     jg-quicknav = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "jg-quicknav";
-        version = "20150217.2028";
+        version = "20160216.2235";
         src = fetchgit {
           url = "https://github.com/jeffgran/jg-quicknav";
-          rev = "67293fdbbb0c6afe2528ec6c03dc54eaa59a2c98";
-          sha256 = "a7aa00b03d474549a25faec9ae0394f9d1065c05049268dea507409f84c801a1";
+          rev = "1b598ee3d691b68dc64f1727a959eab538893d07";
+          sha256 = "e442217463a1aa1ed4f05415a56d7d36617acfcab85e385b62e28ead06aa9c98";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jg-quicknav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jg-quicknav";
           sha256 = "1v46ck9imffhrmx6s4c3kbi5g5spf2mn2axy5nfpn7q8sc8bf0s3";
           name = "jg-quicknav";
         };
@@ -30807,7 +31237,7 @@
           sha256 = "0l26wcy496k6xk7q5sf905xir0p73ziy6c44is77854lv3y0z381";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jinja2-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jinja2-mode";
           sha256 = "0480fh719r4v7xdwyf4jlg1k36y54i5zrv7gxlhfm66pil75zafx";
           name = "jinja2-mode";
         };
@@ -30825,7 +31255,7 @@
           sha256 = "18b6hdqk59gnqh4ibq8lj59kbsg5gbyfb7vfcvpgmxjikpl3cgkz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jira";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jira";
           sha256 = "0cf5zgkxagvka5v6scgyxqx4mz1n7lxbynn3gl2a4s9s64jycsy6";
           name = "jira";
         };
@@ -30846,7 +31276,7 @@
           sha256 = "1ack7dmapva3wc2gm22prd5wd3cmq19sl4xl9f04a3nk2msr6ksx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jira-markup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jira-markup-mode";
           sha256 = "0f3sw41b4wl0aajq0ap66942rb2015d9iks0ss016jgzashw7zsp";
           name = "jira-markup-mode";
         };
@@ -30867,7 +31297,7 @@
           sha256 = "0mh7990zqrprsa1g9jzpqm666pynlqd2nh9z236zyzykf8d8il8c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jist";
           sha256 = "11m9li1016cfkm4931h69d7g1dc59lwjl83wy3yipswdg3zlw0ar";
           name = "jist";
         };
@@ -30888,7 +31318,7 @@
           sha256 = "1idby2rjkslw85593qd4zy6an9zz71yzwqc6rck57r54xyfs8mij";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jknav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jknav";
           sha256 = "0c0a8plqrlsw8lhmyj9c1lfkj2b48cjkbw9pna8qcizvwgym9089";
           name = "jknav";
         };
@@ -30909,7 +31339,7 @@
           sha256 = "1a0091r1xs3fpvg1wynh53xibdsiaf2khz1gp6s8dc45z8r0bclx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jonprl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jonprl-mode";
           sha256 = "0763ad65dmpl2l5lw91mlppfdvrjg6ym45brhi8sdwwri1xnyv9z";
           name = "jonprl-mode";
         };
@@ -30922,15 +31352,15 @@
     jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "jq-mode";
-        version = "20151030.651";
+        version = "20160217.1831";
         src = fetchFromGitHub {
           owner = "ljos";
           repo = "jq-mode";
-          rev = "305ead8f087b1b817291d5f0365e5226199ec58c";
-          sha256 = "014qfzl0qc23pa9w9f3v4yi80jr7nxpd0pz6d615x5mq3zi6l0gp";
+          rev = "7f03354a4c1e26796482c39ce543d1d1f075a18d";
+          sha256 = "0ws0297v6sairvsk665wrfzymfi599g5ljshfnpmi81qnnnbwjgf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jq-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jq-mode";
           sha256 = "1xvh641pdkvbppb2nzwn1ljdk7sv6laq29kdv09kxaqd89vm0vin";
           name = "jq-mode";
         };
@@ -30951,7 +31381,7 @@
           sha256 = "0gh2bgmsbi9lby89ssvl49kpz07jqrfnyg47g6b9xmf5rw42s1z9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jquery-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jquery-doc";
           sha256 = "0pyg90izdrb9mvpbz9nx21mp8m3svqjnz1jr8i7wqgfjxsxdklxj";
           name = "jquery-doc";
         };
@@ -30964,15 +31394,15 @@
     js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nvm }:
     melpaBuild {
         pname = "js-comint";
-        version = "20151126.2038";
+        version = "20160220.550";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "js-comint";
-          rev = "6eb9b2be4fc1c43d600ae9d4cfeacee40fba5c73";
-          sha256 = "0hh49j4ngnw7zkp31nm7bckkic3ya3xwzrsz4ksj2ws4fyjkqc9v";
+          rev = "c4114b41db94ef17720b67cb2b714d670f453cc4";
+          sha256 = "1f1zad423q5adycbbh62094m622gl8ncwbr8vxad1a6zcga70cgi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js-comint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js-comint";
           sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1";
           name = "js-comint";
         };
@@ -30985,15 +31415,15 @@
     js-doc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "js-doc";
-        version = "20131215.719";
+        version = "20160208.1907";
         src = fetchFromGitHub {
           owner = "mooz";
           repo = "js-doc";
-          rev = "cf9b5292b7fca655bafb87bd55662edcf842d5b6";
-          sha256 = "1d2jy71iw1v7l0jrvszmr3qdls5mak6kjvyvk0n9895z87lhgm8g";
+          rev = "c844eb75e3acff0aea035ba41727e036d81ccd29";
+          sha256 = "12kwjkhw5x6jb79m49gbypb6br482bpi73788h71lgl5i3g95s5q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js-doc";
           sha256 = "0nafqgb4kf8jgrb7ijfcvigq8kf043ki89h61izda4hccm3c42pk";
           name = "js-doc";
         };
@@ -31014,7 +31444,7 @@
           sha256 = "0105vx7bc681q9v2x6wj2r63pwp7g0cjjgpg7k4r852zmndfbzsc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js2-closure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js2-closure";
           sha256 = "19732bf98lk2ah2ssgkr1ngxx7rz3nhsiw84lsfmydb0vvm4fpk7";
           name = "js2-closure";
         };
@@ -31035,7 +31465,7 @@
           sha256 = "1gad5a18m3jfhnklsj0ka3p2wbihh1yvpcn7mwlmm7cjjxcaly9g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js2-highlight-vars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js2-highlight-vars";
           sha256 = "07bq393g2jy8ydvaqyqn6vdyfvyminvgi239yvwzg5g9a1xjc475";
           name = "js2-highlight-vars";
         };
@@ -31056,7 +31486,7 @@
           sha256 = "09hwxh353w6wk47sqx871fn59la7kncqlskxdrz316jyps6kj890";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js2-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js2-mode";
           sha256 = "0f9cj3n55qnlifxwk1yp8n1kfd319jf7qysnkk28xpvglzw24yjv";
           name = "js2-mode";
         };
@@ -31077,7 +31507,7 @@
           sha256 = "08wxsz90x5zhma3q8kqfd01avhzxjmcrjc95s757l5xaynsc2bly";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js2-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js2-refactor";
           sha256 = "09dcfwpxxyw0ffgjjjaaxbsj0x2nwfrmxy1a05h8ba3r3jl4kl1r";
           name = "js2-refactor";
         };
@@ -31098,7 +31528,7 @@
           sha256 = "137lypg6jwsisn2g5h0wiqh57icj46zv3albxjf2q1k5isszhy1l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js3-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js3-mode";
           sha256 = "12s5qf6zfcv4m5kqxvh9b4zgwf433x39a210d957gjjp5mywbb1r";
           name = "js3-mode";
         };
@@ -31119,7 +31549,7 @@
           sha256 = "1bqsv2drhcs8ia7nxss33f80p2mhcl4mr1nalphzw6s1f4mq2sgy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jscs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jscs";
           sha256 = "1yw251f6vpj2bikjw79arywprk8qnmmfcki99mvwnqhsqlv1a8iv";
           name = "jscs";
         };
@@ -31140,7 +31570,7 @@
           sha256 = "0h9gx5cl3lashk0n8pv9yzb0mm8dyziddfbwfqfm70638p93ylhc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jsfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jsfmt";
           sha256 = "1syy32sv2d57b3gja0ly65h36mfnyq6hzf5lnnl3r58yvbdzngqd";
           name = "jsfmt";
         };
@@ -31161,7 +31591,7 @@
           sha256 = "0sxkp9m68rvff8dbr8jlsx85w5ngifn19lwhcydysm7grbwzrdi3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/json-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/json-mode";
           sha256 = "014j10wgxsqy6d6aksnkz2dr5cmpsi8c7v4a825si1vgb4622a70";
           name = "json-mode";
         };
@@ -31174,15 +31604,15 @@
     json-reformat = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "json-reformat";
-        version = "20151204.1100";
+        version = "20160212.253";
         src = fetchFromGitHub {
           owner = "gongo";
           repo = "json-reformat";
-          rev = "b9bd375ec1deb10d2ba09c409bdcf99c56d7a716";
-          sha256 = "0qp4n2k6s69jj4gwwimkpadjv245y54wk3bxb1x96f034gkp81vs";
+          rev = "24c2bf3c41897b5cf1398dcaedfec88526308bf4";
+          sha256 = "05bjyw0hkpiyfadsx3giawykbj4qinfr1ilzd0xvx8akzq2ipq0y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/json-reformat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/json-reformat";
           sha256 = "1m5p895w9qdgb8f67xykhzriribgmp20a1lvj64iap4aam6wp8na";
           name = "json-reformat";
         };
@@ -31203,7 +31633,7 @@
           sha256 = "0xgrb0zfxyfmfnvx1l7ca99lzl6f2qyal798rcra45167c0j0vbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/json-rpc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/json-rpc";
           sha256 = "1v1pfmm9g18p6kgn27q1m1bjgwbzvwfm0jbsxp8gdsssaygky71k";
           name = "json-rpc";
         };
@@ -31224,7 +31654,7 @@
           sha256 = "05zsgnk7grgw9jzwl80h5sxfpifxlr37b4mkbvx7mjq4z14xc2jw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/json-snatcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/json-snatcher";
           sha256 = "0f6j9g3c5fz3wlqa88706cbzinrs3dnfpgsr2d3h3117gic4iwp4";
           name = "json-snatcher";
         };
@@ -31245,7 +31675,7 @@
           sha256 = "07yd7sxb5f2mbm2nva7b2nwyxxkmsi2rdd5qig0bq1b2mf3g5l83";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jss";
           sha256 = "050hskqcjz5kc8nni255vj3hc9m936w1rybvg5kqyz4p4lpzj00k";
           name = "jss";
         };
@@ -31266,7 +31696,7 @@
           sha256 = "16jgmabcqrjb3v9c6q711jqn9dna88bmzm4880mdry69ixwcydxy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jst";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jst";
           sha256 = "0hp1f7p6m1gfv1a3plavzkzn87dllb5g2xrgg3mch4qsgdbqx65i";
           name = "jst";
         };
@@ -31287,7 +31717,7 @@
           sha256 = "1g648r0wrd8m5ggl5jrplmj7jmr68bh2ykyii5wv30zfba97r1sh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jsx-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jsx-mode";
           sha256 = "1lnjnyn8qf3biqr92z443z6b58dly7glksp1g986vgqzdprq3n1b";
           name = "jsx-mode";
         };
@@ -31299,14 +31729,14 @@
       }) {};
     jtags = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "jtags";
-        version = "20160119.1503";
+        version = "20160211.1429";
         src = fetchgit {
           url = "git://git.code.sf.net/p/jtags/code";
-          rev = "46ff683a3b452729364d9f2fcb86b3f020d9baac";
-          sha256 = "96d9335e9baa6d466447a79219c955b71a9eb1e800d1e1311d9bf72dafcc358d";
+          rev = "b50daa48510f71e74ce0ec2eb85030896a79cf96";
+          sha256 = "1eedc86541cc3dcb0b0d0c6acc7ddf8b4755c757addb6eacbe33811058f2850f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jtags";
           sha256 = "0in5ybgwmghlpa5d7wz0477ba6n14f1mwp5dxcl4y11f1lsq041r";
           name = "jtags";
         };
@@ -31319,15 +31749,15 @@
     julia-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "julia-mode";
-        version = "20150912.1000";
+        version = "20160219.1903";
         src = fetchFromGitHub {
           owner = "JuliaLang";
           repo = "julia";
-          rev = "baf336ff1940c355a9b66805330b7623a6b910f0";
-          sha256 = "0z78bppjl3d0qcc1vxh66gi3if35n35bh61569hr1hhyc0x8pzpq";
+          rev = "772d903709276ef83fe01df9ef17aec70311036f";
+          sha256 = "1d04y5dildjc1zw0i33n0kfds776b2632y2m9layqhm58fiby9d8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/julia-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/julia-mode";
           sha256 = "0c5bdgh98hw7484s2is84af7hznd8c4z5vlzfd98s8qxi7bldqjm";
           name = "julia-mode";
         };
@@ -31348,7 +31778,7 @@
           sha256 = "0r4ajn3f1c8n0r831ihvzwyzy94aiv0ijqrwhpq0s85cqvzr7pq8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/julia-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/julia-shell";
           sha256 = "0182irlvk6nn71zk4j8xjgcqp4bxi7a2dbj44frrssy6018cd410";
           name = "julia-shell";
         };
@@ -31369,7 +31799,7 @@
           sha256 = "1f0kai4cz3r25fqlnryyvnyf80cf57xa655dvv1rx8si3xd20x4j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jumblr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jumblr";
           sha256 = "1wnawz1m6x95iyzac453p55h7hlr5q0ry5437aqqx0bw7gdwg3dp";
           name = "jumblr";
         };
@@ -31390,7 +31820,7 @@
           sha256 = "0061hcmj63g13bvacwkmcb5iggwnk27dvb04fz4hihqis6jg01c5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jump";
           sha256 = "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364";
           name = "jump";
         };
@@ -31411,7 +31841,7 @@
           sha256 = "0vpla6lyr30fyq9gi7g9zmnhysbm077m0qgi7w3axppfbxdvg67q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jump-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jump-char";
           sha256 = "0l8zvfwpngkgcxl1a36jwwxdh23hi390mikz7xrq63w5zwm0007n";
           name = "jump-char";
         };
@@ -31432,7 +31862,7 @@
           sha256 = "1s9plmg323m1p625xqnks0yqz0zlsjacdj7pv8f783r0d9jmfq3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jump-to-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jump-to-line";
           sha256 = "09ifhsggl5mrb6l8nqnl38yph0v26v30y98ic8hl23i455hqkkdr";
           name = "jump-to-line";
         };
@@ -31453,7 +31883,7 @@
           sha256 = "0ykzvy8034mchq6ffyi7vqnwyrj6gnqqgn39ki81pv97qh8hh8yl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jumplist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jumplist";
           sha256 = "06xjg1q8b2fwfhfmdkb76bw2id8pgqc61fmwlgri5746jgdmd7nf";
           name = "jumplist";
         };
@@ -31474,7 +31904,7 @@
           sha256 = "0k91cdjlpil8npc4d3zsgx2gk41crl7qgm9r85khcgxs59kmkniw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jvm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jvm-mode";
           sha256 = "1r283b4s0pzq4hgwcz5cnhlvdvq4gy0x51g3vp0762s8qx969a5w";
           name = "jvm-mode";
         };
@@ -31495,7 +31925,7 @@
           sha256 = "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kaesar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kaesar";
           sha256 = "0zhi1dv1ay1azh7afq4x6bdg91clwpsr13nrzy7539yrn9sglj5l";
           name = "kaesar";
         };
@@ -31516,7 +31946,7 @@
           sha256 = "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kaesar-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kaesar-file";
           sha256 = "0dcizg82maad98mbqqw5lamwz7n2lpai09jsrc66x3wy8k784alc";
           name = "kaesar-file";
         };
@@ -31537,7 +31967,7 @@
           sha256 = "1pl0514rj99b1j3y33x2bnhjbdbv9bfxgqn9498bf4ns8zayc6y9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kaesar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kaesar-mode";
           sha256 = "0yqnlchbpmhsqc8j531n08vybwa32cy0v9sy4f9fgxa90rfqczry";
           name = "kaesar-mode";
         };
@@ -31558,7 +31988,7 @@
           sha256 = "0b6af8hnrn0v4z1xpahjfpw5iga2bmgd3qwfn3is2rygsn5rkm40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kakapo-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kakapo-mode";
           sha256 = "0a99cqflpzasl4wcmmf99aj8xgywkym37j7mvnsajrsk5wawdlss";
           name = "kakapo-mode";
         };
@@ -31577,7 +32007,7 @@
           sha256 = "14g0f51jig8b1y6zfaw7b1cp692lddqzkc0ngf4y89sw9gbmsh3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kanban";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kanban";
           sha256 = "1sif2ayb8fq5vjz9lpkaq40aw9wiciz84yipab2qczszlgw1l1hb";
           name = "kanban";
         };
@@ -31598,7 +32028,7 @@
           sha256 = "0vfagfzhh4rkmvjzfhfcm7w3z1x31aqzxwigk5yw9scnfb77pinz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kanji-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kanji-mode";
           sha256 = "0nnkv7lp7ks9qhkbhz15ixm53grc2q0xfspzykxi9c4b59kypcq5";
           name = "kanji-mode";
         };
@@ -31611,15 +32041,15 @@
     kaomoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
     melpaBuild {
         pname = "kaomoji";
-        version = "20160119.943";
+        version = "20160218.220";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "kaomoji.el";
-          rev = "ffe8890019bb22eac586f42c7c7a184a243c8ba0";
-          sha256 = "1z35gk58jwynygyq1n3c9cb7xgqp5bmbsgq2j3bb43cagc55xixh";
+          rev = "cde86e7f27008dbe03230d63941a0f5bd0512c10";
+          sha256 = "0vqjbv3pqlbyibqylfsqqjzkvjhdg01hlxszfblpg72fziyzcci5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kaomoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kaomoji";
           sha256 = "1p61pbqf2lnwr6ryxxc4jkd5bmlgknrc27lg89h3b4pw7k39cqy1";
           name = "kaomoji";
         };
@@ -31632,15 +32062,15 @@
     karma = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "karma";
-        version = "20150120.2358";
+        version = "20160220.645";
         src = fetchFromGitHub {
           owner = "tonini";
           repo = "karma.el";
-          rev = "34952d4b5288d4b09a9f65b32ee8cb5f65926fe9";
-          sha256 = "03wdi0zwnsb42rbrlrck553mgn9vgnd896d5xpiqf1ik4z4cf10z";
+          rev = "31d3e7708246183d7ed0686be92bf23140af348c";
+          sha256 = "12v242kfcx849j8w95v2g7djh9xqbx8n033iaxyavfxnz0pp7zdl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/karma";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/karma";
           sha256 = "19wl7js7wmw7jv2q3l4r5zl718lhy2a0jhl79k57ihwhxdc58fwc";
           name = "karma";
         };
@@ -31661,7 +32091,7 @@
           sha256 = "1kkzs7nrcr74qn1m456vaj52a9j3ah4biakimz06hls415l56yk9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kerl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kerl";
           sha256 = "0f8n7cm5c432pwj28bcpv2jj5z3br3k164xj6nwfis3dvijwsgss";
           name = "kerl";
         };
@@ -31679,7 +32109,7 @@
           sha256 = "03m44pqggfrd53nh9dvpdjgm0rvca34qxmd30hr33hzprzjambxg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/key-chord";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/key-chord";
           sha256 = "0cr9lx1pvr0qc762nn5pbh8w93dx1hh1zzf806cag2b9pgk6d4an";
           name = "key-chord";
         };
@@ -31700,7 +32130,7 @@
           sha256 = "1is7s50lgn77lxxwgakiaywx6jqdfg8045d18m4zn3ilxg6k8ljf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/key-combo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/key-combo";
           sha256 = "1v8saw92jphvjkyy7j9jx7cxzgisl4zpf4wjzdjfw3la5lz11waf";
           name = "key-combo";
         };
@@ -31721,7 +32151,7 @@
           sha256 = "143nfs8pgi5yy3mjq7nirffplk4vb8kik4q7zypynh2pddip30a4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/key-intercept";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/key-intercept";
           sha256 = "1z776jbpjks5bir6bd0748mlrmz05nf0jy9l4hlmwgyn72dcbx16";
           name = "key-intercept";
         };
@@ -31742,7 +32172,7 @@
           sha256 = "14xk0crl25alcckkcg0wx7gwb65hmicfn01db1zip8swk249g9w3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/key-leap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/key-leap";
           sha256 = "0z1fhpf8g0c4rh3bf8dfmdgyhj5w686kavjr214czaga0x7mwlwj";
           name = "key-leap";
         };
@@ -31763,7 +32193,7 @@
           sha256 = "05vpydcgiaya35b62cdjxna9y02vnwzzg6p8jh0dkr9k44h4iy3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/key-seq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/key-seq";
           sha256 = "166k6hl9vvsnnksvhrv5cbhv9bdiclnbfv7qf67q4c1an9xzqi74";
           name = "key-seq";
         };
@@ -31784,7 +32214,7 @@
           sha256 = "0xm7vybqgglacm0xz6fa7ipfvsx14qqws629gi9i16maxn3by9ci";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keychain-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/keychain-environment";
           sha256 = "1w77cg00bwx68h0d6k6r1fzwdwz97q12ch2hmpzjnblqs0i4sv8v";
           name = "keychain-environment";
         };
@@ -31805,7 +32235,7 @@
           sha256 = "0dkc51bmix4b8czs2wg6vz8vk32qlll1b9fjmx6xshrxm85cyhvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keydef";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/keydef";
           sha256 = "0yb2vgj7abyg8j7qmv74nsanv50lf350q1m58rjv8wm31yykg992";
           name = "keydef";
         };
@@ -31826,7 +32256,7 @@
           sha256 = "18qiw2324gx5w12pqka9njsysxym8dpglk7dzadg0k1wji73nn6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keyfreq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/keyfreq";
           sha256 = "1rw6hzmw7h5ngvndy7aa41pq911y2hr9kqc9w4gdd5v2p4ln1qh7";
           name = "keyfreq";
         };
@@ -31839,15 +32269,15 @@
     keymap-utils = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "keymap-utils";
-        version = "20151030.526";
+        version = "20151128.844";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "keymap-utils";
-          rev = "f9164e23dbc58c4fdce635138ed59fe2eb285313";
-          sha256 = "18kc48glbwy9njw863fzlrgc4g0a65s5wf2iarfsjqcynad7r4c7";
+          rev = "d5d09bc13cecbe334747be23112c99c4ba9f19c7";
+          sha256 = "07x52cybb0m94wgbi0rw2ldx9zg1i6l309gfmi9c199g1zj4wsh5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keymap-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/keymap-utils";
           sha256 = "0nbcwz4nls0pva79lbx91bpzkl38g98yavwkvg2rxbhn9vjbhzs9";
           name = "keymap-utils";
         };
@@ -31864,11 +32294,11 @@
         src = fetchFromGitHub {
           owner = "HKey";
           repo = "keyset";
-          rev = "0a186c3316fda5baa72ae1fdf50c31e00761cc21";
-          sha256 = "1kkp3frsk644djmdwxq3l1m88690gch3g8pijlzv566xrwkd903j";
+          rev = "41bbfc4dbed5de6ecf3ec1dba634c7c26241ca84";
+          sha256 = "0cm6naqlwk65xy9lwnn5r7m6nc1l7ims2ckydmyzny5ak8y5jbws";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keyset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/keyset";
           sha256 = "1kfw0pfb6qm2ji1v0kb8xgz8q2yd2k9kxmaz5vxcdixdlax3xiqg";
           name = "keyset";
         };
@@ -31889,7 +32319,7 @@
           sha256 = "0zw4klp9ifb6yylr9yab3p3vjv18as6clpg2i3w4r2xah9chxgqq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keyword-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/keyword-search";
           sha256 = "0wvci1v8pblfbdslfzpi46c149y8pi49kza9jf33jzhj357lp5qa";
           name = "keyword-search";
         };
@@ -31910,7 +32340,7 @@
           sha256 = "0xq835xzywks4b4kaz5i0pp759i23kibs5gkvvxasw0dncqh7j5c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kfg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kfg";
           sha256 = "0vvvxl6a4ac27igwmsgzpf0whf9h2pjl9d89fd9fizad6gi8x1fs";
           name = "kfg";
         };
@@ -31931,7 +32361,7 @@
           sha256 = "0s2hb2lvfmcvm3n1fg4biaafc1p7j7w990d7w15gicaw6rr2j4nr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kibit-helper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kibit-helper";
           sha256 = "15viybjqksylvm5ash2kzsil0cpdka56wj1rryixa8y1bwlj8y4s";
           name = "kibit-helper";
         };
@@ -31952,7 +32382,7 @@
           sha256 = "0a2jmk4wryngs56rqh6sxiyk5yh25l2qvping86yipic2wia17n8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kill-or-bury-alive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kill-or-bury-alive";
           sha256 = "0mm0m8hpy5v98cap4f0s38dcviirm7s6ra4l94mknyvnx0f73lz8";
           name = "kill-or-bury-alive";
         };
@@ -31973,7 +32403,7 @@
           sha256 = "0yrc09k64rv5is4wvss938mkj2pkvbr98lr3ahsi7p0aqn7s444v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kill-ring-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kill-ring-search";
           sha256 = "1pg4j1rrji64rrdv2xpwz33vlyk8r0hz4j4fikzwpbcbmni3skan";
           name = "kill-ring-search";
         };
@@ -31994,7 +32424,7 @@
           sha256 = "05rbh5hkj3jsn9pw0qa4d5a5pi6367vdqkijcn9k14fdfbmyd30x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/killer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/killer";
           sha256 = "10z4vqwrpss7mk0gq8xdsbsl0qibpp7s1g0l8wlmrsgn6kjkr2ma";
           name = "killer";
         };
@@ -32015,7 +32445,7 @@
           sha256 = "1cr4i66lws6yhyxmyx5jw6d5x7i75435mafkkych4nfa0mv4vicd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kite";
           sha256 = "04x92qcvx428l2cvm2nk9px7r8i159k0ra0haq2sjncjr1ajhg9m";
           name = "kite";
         };
@@ -32036,7 +32466,7 @@
           sha256 = "1m0f1hiczq88qjy573rhlkw2lmjy814cgdl42zxsjbf78wg4qx8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kite-mini";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kite-mini";
           sha256 = "1g644406zm3db0fjyv704aa8dbd20v1apmysb3mmh2vldbch4iyh";
           name = "kite-mini";
         };
@@ -32053,11 +32483,11 @@
         src = fetchFromGitHub {
           owner = "kivy";
           repo = "kivy";
-          rev = "41cb82ab0dd480452139e20d61e264c40e37813f";
-          sha256 = "0vdl0bkgvb0fjja50yffv8izvh0fa2r7bdrcn9qzf5jild49n8m7";
+          rev = "546e8857b427de32e95cfd15b5ffdc230e5edeea";
+          sha256 = "0hd48iii48bi0nrpy0qz5713m0rlgcla42708m8znhzw69myvbna";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kivy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kivy-mode";
           sha256 = "02l230rwivr7rbiqm4vg70458z35f9v9w3mdapcrqd5d07y5mvi1";
           name = "kivy-mode";
         };
@@ -32078,7 +32508,7 @@
           sha256 = "1ld3ccg8q7hmjrj60rxvmmfy4dpm2lvlshjqdf9ifgjzp221g4vb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kixtart-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kixtart-mode";
           sha256 = "079bw4lgxbmk65rrfyy8givs8j5wsyhpcjjw915ifkg577gj87qp";
           name = "kixtart-mode";
         };
@@ -32091,15 +32521,15 @@
     know-your-http-well = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "know-your-http-well";
-        version = "20151220.813";
+        version = "20160208.1704";
         src = fetchFromGitHub {
           owner = "for-GET";
           repo = "know-your-http-well";
-          rev = "d72da09014d44f67b1c6283e4391643b7f311e92";
-          sha256 = "19x08gjqzghxwdrvadjmb8kqm4cszla65nk3ihk2y60riksz9hbs";
+          rev = "c381a9735f3ea86ebc9667e35cdfeab0b67fefb7";
+          sha256 = "1lppggnii2r9fvlhh33gbdrwb50za8lnalavlq9s86ngndn4n94k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/know-your-http-well";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/know-your-http-well";
           sha256 = "0k2x0ajxkivim8nfpli716y7f4ssrmvwi56r94y34x4j3ib3px3q";
           name = "know-your-http-well";
         };
@@ -32120,7 +32550,7 @@
           sha256 = "0yr4yxwxgxp5pm9f8gaqlikxp26inv01inq0ya42dzam5yphkafw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kolon-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kolon-mode";
           sha256 = "0wcg8ph3mk4zcmzqpvl2w6rfgvrfvhmgwb14y8agh9b7v5d9xwj3";
           name = "kolon-mode";
         };
@@ -32133,15 +32563,15 @@
     kooten-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "kooten-theme";
-        version = "20151228.1026";
+        version = "20160214.651";
         src = fetchFromGitHub {
           owner = "kootenpv";
           repo = "emacs-kooten-theme";
-          rev = "d35f58beece81008fa647a4b8a2cb70a3077fc91";
-          sha256 = "1ly55ldf2maf8qfpnsqzn0rbz9cz1f08ak9rr3zijaip3zvlm9q9";
+          rev = "7caf9e31219281a7c5a2a7b60404d9c18460de4b";
+          sha256 = "02217kskgy82dnq3cqrss8hf355aypfm1dxx6ijv6s855kww2zjc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kooten-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kooten-theme";
           sha256 = "1kkk8nl1xykc4c487icmjrc2xsv8i4s2r5h5gbcpyrk2myqi4179";
           name = "kooten-theme";
         };
@@ -32162,7 +32592,7 @@
           sha256 = "1m9hixlclynph2i5q18miq077dyvhx14pfzgawrwj82j1kslz50x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kpm-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kpm-list";
           sha256 = "0022bhy1mzngjmjydyqnmlgnhww05v4dxsfav034r8nyyc7677z0";
           name = "kpm-list";
         };
@@ -32183,7 +32613,7 @@
           sha256 = "11axxmhdpwgrcyjz200pf5bqzjw9wz4085r8p1n2vr5gx98374fr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kroman";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kroman";
           sha256 = "0y9ji3c8kndrz605n7b4w5xq0qp093d61hxwhblm3qrh3370mws7";
           name = "kroman";
         };
@@ -32204,7 +32634,7 @@
           sha256 = "0da4y9pf6vq0i6w7bmvrszg9bji3ylhr44hmyrmxvah28pigb2fz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kurecolor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kurecolor";
           sha256 = "0q0q0dfv376h7j3sgwxqwfpxy1qjbvb6i5clsxz9xp4ly89w4d4f";
           name = "kurecolor";
         };
@@ -32225,7 +32655,7 @@
           sha256 = "0r0lz2s6gvy04fwnafai668jsf4546h4k6zd6isx5wpk0n33pj5m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kv";
           sha256 = "1vzifi6zpkmsh1a3c2njrw7mpfdgyjvpbz3bj42j8cg3vwjnjznb";
           name = "kv";
         };
@@ -32246,7 +32676,7 @@
           sha256 = "0irbfgip493hyh45msnb7climgfwr8f05nvc97bzaqggnay88scy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kwin";
           sha256 = "1pxnyj81py3ygadmyfrqndb0jkk6xlbf0rg3857hsy3ccblzm7ki";
           name = "kwin";
         };
@@ -32264,7 +32694,7 @@
           sha256 = "01vs0v17l76zwyrblf9c6x0xg5fagd4qv8pr1fwfw7kl64hb9aa2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lacarte";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lacarte";
           sha256 = "0a0n1lqakgsbz0scn6617rkkkvzwranzlvkzw9q4zapiz1s9xqp9";
           name = "lacarte";
         };
@@ -32285,7 +32715,7 @@
           sha256 = "135k7inkvdz51j7al3nndaamrkyn989vlv1mxcp8lwx8cgq0rqfj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lang-refactor-perl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lang-refactor-perl";
           sha256 = "02fv25d76rvxqzxs48j4lkrifdhqayyb1in05ryyz2pk9x5hbax9";
           name = "lang-refactor-perl";
         };
@@ -32306,7 +32736,7 @@
           sha256 = "0svci7xs4iysv8ysf93g382arip0xpgi0fllw8xx2vrd70sz7lff";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/langdoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/langdoc";
           sha256 = "19i6ys58wswl5ckf33swl6lsfzg4znx850br4icik15yrry65yj7";
           name = "langdoc";
         };
@@ -32327,7 +32757,7 @@
           sha256 = "1rj0j4vxfwss0w6bwh591w5mbyzjg5rkbwyjaphyi6p7wq5w6np1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/langtool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/langtool";
           sha256 = "1xq70jyhzg0qmvialy015crbdk9rdibhwpl36khab9hi2999wxyw";
           name = "langtool";
         };
@@ -32348,7 +32778,7 @@
           sha256 = "1cqbdgk3sd0xbw76qrhlild9dvgds3vgldq0rcl200kh7y8l6g4k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/latest-clojure-libraries";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/latest-clojure-libraries";
           sha256 = "1vnm9piq71nx7q1843izm4vydfjq1564ax4ffwmqmlpisqzd6wq5";
           name = "latest-clojure-libraries";
         };
@@ -32361,15 +32791,15 @@
     latex-extra = callPackage ({ auctex, cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "latex-extra";
-        version = "20160103.1607";
+        version = "20160209.945";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "latex-extra";
-          rev = "72fc297ffda2041acb20db2d9daf12276789f3f3";
-          sha256 = "17dp23ggd380fln3g5djs7gwx9z3ixbkn51zfccbh4s5549krl5y";
+          rev = "efb76e4bfb3282da2dcefb8e9a472f0021ab7c61";
+          sha256 = "04dz7ab0bxg5j3s5qh7jdidg1x8jvy9hdp2xkm6irblxhsh64dsk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/latex-extra";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/latex-extra";
           sha256 = "1w98ngxymafigjpfalybhs12jcf4916wk4nlxflfjcx8ryd9wjcj";
           name = "latex-extra";
         };
@@ -32390,7 +32820,7 @@
           sha256 = "118xrgrnwsmsysmframf6bmb0gkrdrm3jbkgivzxs41cw92fhbzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/latex-math-preview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/latex-math-preview";
           sha256 = "14bn0q5czrrkb1vjdkwx6f2x4zwjkxgrc0bcncv23l13qls1gkmr";
           name = "latex-math-preview";
         };
@@ -32410,7 +32840,7 @@
           sha256 = "0h9hncf2ghfkd3i3342ajj1niykhfr0aais3j6sjg1vkm16xbr3b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/latex-pretty-symbols";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/latex-pretty-symbols";
           sha256 = "1f2s2f64bmsx89a3crm4skhdi4pq9w18z9skxw3i3ydaj15s8jgl";
           name = "latex-pretty-symbols";
         };
@@ -32431,7 +32861,7 @@
           sha256 = "1bvhrh9xfl7p474b8jcczw255d2pjmrz5b60wis0lmmxdljplrfa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/latex-preview-pane";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/latex-preview-pane";
           sha256 = "1id1l473azmc9hm5vq5wba8gad9np7sv38x94qd2zkf8b78pzkbw";
           name = "latex-preview-pane";
         };
@@ -32441,6 +32871,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    latex-unicode-math-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "latex-unicode-math-mode";
+        version = "20160209.1117";
+        src = fetchFromGitHub {
+          owner = "Christoph-D";
+          repo = "latex-unicode-math-mode";
+          rev = "71da85b55870aa870be722ced9d1f7df54b17f97";
+          sha256 = "165qhh6cfrr24yg0qvpq4vk64a70z30nchkbbhhwg4f6ib7v5f5h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/latex-unicode-math-mode";
+          sha256 = "1p9gpp28vylibv1s95bzfgscznw146ybgk6f3qdbbnafrcrmifcr";
+          name = "latex-unicode-math-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/latex-unicode-math-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     launch = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "launch";
@@ -32452,7 +32903,7 @@
           sha256 = "0ciycsqzyj6ld60c7sfqjq59ln3jvk3w9vy606kqzpcvj01ihmv1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/launch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/launch";
           sha256 = "043gwz583pa1wv84fl634p1v86lcsldsw7qkjbm6y678q5mms0m6";
           name = "launch";
         };
@@ -32473,7 +32924,7 @@
           sha256 = "154z7bhb7qagvl3dlgrlsxdg4chz2863ijglg47xs3yhjp5ypanj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/launchctl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/launchctl";
           sha256 = "07fq445cjpv4ndi7hnjmsrmskm2rlp6ghq0k3bcbjxl21smd9vs9";
           name = "launchctl";
         };
@@ -32494,7 +32945,7 @@
           sha256 = "1mg923rs2dk104bcr461dif3mg42r081ii8ipnnr588w7il0xh7k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lavender-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lavender-theme";
           sha256 = "1x7mk3dpk44fkzll6xmh2dw270cgb3a9qs3h8bmiq2dw0wrcwcd1";
           name = "lavender-theme";
         };
@@ -32515,7 +32966,7 @@
           sha256 = "03mv2r6k9syr7bk4vmdafmpa8kz19hv5h68ahj2bmdcmwlvwhkf3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ldap-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ldap-mode";
           sha256 = "0lkfpbzsry9jigrx5zp14bkrvqnavnk4y3s0whnbigc4fgpf94rq";
           name = "ldap-mode";
         };
@@ -32532,11 +32983,11 @@
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger";
-          rev = "9b49ade03a3e5d9089ee031bdf733004cee8a36e";
-          sha256 = "0cp5ywmk48sd7c8s8d5a0sv0ng4fl0hybss2z8fwhw6z47iypzmi";
+          rev = "b7f84d69001f75a18807772dee514f5918e3a926";
+          sha256 = "0vm32jv36s6kprmqbij5rpjg9djj3qsla4gpbpm8nycfg73bgylw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ledger-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ledger-mode";
           sha256 = "0hi9waxmw1bbg88brlr3816vhdi0jj05wcwvrvfc1agvrvzyqq8s";
           name = "ledger-mode";
         };
@@ -32557,7 +33008,7 @@
           sha256 = "0yrrlwmxg1wy65bqyacjpzd5ksljgp41x4zyizl7h0zx9rmqcdvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/leerzeichen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/leerzeichen";
           sha256 = "0h7zpskcgkswr110vckfdbxggz5b3g9grk1j1cbd98pmrpgfqrvp";
           name = "leerzeichen";
         };
@@ -32575,7 +33026,7 @@
           sha256 = "0vjf2f5kpmgnw7904jsv2wnn6dcv654v7h1v917wmj72sy941xml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/legalese";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/legalese";
           sha256 = "0xsf3w5h4g7wigrv5kbys7lf9lfv2cab5ch320p74l3l3r2lj9wz";
           name = "legalese";
         };
@@ -32596,7 +33047,7 @@
           sha256 = "0n6jrm5ilm5wzfrh7yjxn3sr5m10hwdm55b179ild32lh4795zj7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lemon-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lemon-mode";
           sha256 = "0jdf3556kmv55jh85ljqh2gdx0jl2b8zgvpz9a4kf53xifk3lqz5";
           name = "lemon-mode";
         };
@@ -32617,7 +33068,7 @@
           sha256 = "0ab84qiqaz3swiraks8lx0y1kzwylpy9wz2104xgnpwnc5169z65";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lenlen-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lenlen-theme";
           sha256 = "1bddkcl9kzj3v071qpzmxzjwywqfj5j6cldz240qgp5mx685r0a9";
           name = "lenlen-theme";
         };
@@ -32638,7 +33089,7 @@
           sha256 = "04h6vk7w25yp4kzkwqnsmc59bm0182qqkyk5nxm3a1lv1v1590lf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lentic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lentic";
           sha256 = "0y94y1qwj23kqp491b1fzqsrjak96k1dmmzmakbl7q8vc9bncl5m";
           name = "lentic";
         };
@@ -32659,7 +33110,7 @@
           sha256 = "0c6wkfz6sdcs4aglvx6h3slhma2vbj7idckwzvp8ji6s7p1mavlv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lentic-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lentic-server";
           sha256 = "1y9idhf9qcsw3dbdj7rwa7bdrn1q0m3bg3r2jzwdnvkq8aas1w56";
           name = "lentic-server";
         };
@@ -32680,7 +33131,7 @@
           sha256 = "1w6mbk4gc63sh2p9rsy851x2kid0dp2ja4ai5badkr5prxkcpfdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/less-css-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/less-css-mode";
           sha256 = "188iplnwwhawq3dby3388kimy0jh1k9r8v9nxz52hy9rhh9hykf8";
           name = "less-css-mode";
         };
@@ -32701,7 +33152,7 @@
           sha256 = "06hggcbz98qhfbvp0fxn89j98d0mmki4wc4k8kfzp5fhg071chbi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/letcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/letcheck";
           sha256 = "1sjwi1ldg6b1qvj9cvfwxq3qlkfas6pm8zasf43baljmnz38mxh2";
           name = "letcheck";
         };
@@ -32714,15 +33165,15 @@
     leuven-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "leuven-theme";
-        version = "20160115.942";
+        version = "20160207.1243";
         src = fetchFromGitHub {
           owner = "fniessen";
           repo = "emacs-leuven-theme";
-          rev = "991c573ede413fa416cb365d903d1ddf512ade55";
-          sha256 = "088ijndcyfi5jai8x2pd9cbh7x9r41nbimw20hz71n9izy2xnjl0";
+          rev = "ea5c7891573f9fefe937801b3e6365218893958d";
+          sha256 = "15qixxvg0az3z8q8plrwyind40acr1wv392q81vlad0ngvl81v4r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/leuven-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/leuven-theme";
           sha256 = "0pm5majr9cmj6g4zr7vb55ypk9fmfbvxx78mgmgignknbasq9g9a";
           name = "leuven-theme";
         };
@@ -32740,7 +33191,7 @@
           sha256 = "0m94z18i1428bispxi285flvjf22kjm33s4sm0ad11m0w0jizir6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/levenshtein";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/levenshtein";
           sha256 = "1iypnz0bw3baqxa9gldz8cikxvdhw60pvqp00kq5p3v4x3xcy4z2";
           name = "levenshtein";
         };
@@ -32761,7 +33212,7 @@
           sha256 = "167ayfl1k8dnajw173hh67nbwbk4frmjc4fzc515q67m9d7m5932";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lexbind-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lexbind-mode";
           sha256 = "1hs9wg45mwp3fwi827rc4g0gjx4fk87zlibq3id9fcqic8q7nrnl";
           name = "lexbind-mode";
         };
@@ -32778,11 +33229,11 @@
         src = fetchFromGitHub {
           owner = "rvirding";
           repo = "lfe";
-          rev = "f6867fcab654e86e42e1d27d5b68c47597a5ed21";
-          sha256 = "1h0nzdnd698scn4hl6i3j5d0l51vgkf1y9q5prar0rj5n1sjd3vc";
+          rev = "f0c613e6ebe9cd185782de224dfb5c1f261403cc";
+          sha256 = "0bqqgjzx8wj9sbdc146crmmskm9jmnmbp858kd67bnzdhpw3jf6k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lfe-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lfe-mode";
           sha256 = "06b382ncgk4zz3q8akyzfy55j86a53r97gf0l92qvlca7fbs8jjx";
           name = "lfe-mode";
         };
@@ -32800,7 +33251,7 @@
           sha256 = "077cy2clllrvabw44wb1pzcqz97r3y92j7cb9lnhd9pix0wpcq6g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lib-requires";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lib-requires";
           sha256 = "1g22jh56z8rnq0h80wj10gs38yig1rk9xmk3kmhmm5mm6b14iwdx";
           name = "lib-requires";
         };
@@ -32821,7 +33272,7 @@
           sha256 = "039awlam3nrgkxrarcapfyc2myvc77aw7whrkcsjjybzylpzv0pr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/libmpdee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/libmpdee";
           sha256 = "0z4d8y8jlsjw20b31akkaikh5xl0c05lj77d2i1xbgzam4iixma0";
           name = "libmpdee";
         };
@@ -32842,7 +33293,7 @@
           sha256 = "11c3vmxyddx7zm8fpxmzhq2xygyijbszinfiwllgb4l738bxwljb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lice";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lice";
           sha256 = "1hv2hz3153x0gk7f2js18dbx5pyprfdf2pfxb658fj16vxpp7y6x";
           name = "lice";
         };
@@ -32863,7 +33314,7 @@
           sha256 = "04dik8z2mg6qr4d3fkd26kg29b4c5crvbnc1lfsrzyrik7ipvsi8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/light-soap-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/light-soap-theme";
           sha256 = "09p4w51d5szhi81a6a3l0r4zd4ixkrkzxldr938bcmj0qmj62iyk";
           name = "light-soap-theme";
         };
@@ -32884,7 +33335,7 @@
           sha256 = "0rkx0hk3y79rwhjqs3wvgxhg1rj83mxbqkhhm3jfawp8c1av4f40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lingr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lingr";
           sha256 = "1445bxiirsxl9kgm0j86xc9d0pbaa5f07c1i66pw2vl40bvhrjff";
           name = "lingr";
         };
@@ -32905,7 +33356,7 @@
           sha256 = "0gz03hji6mcrzvxd74qim63g159sc8ggb6hq3x42x5l01g980fbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/link";
           sha256 = "17jpsg3f2954b740vyj37ikygrg5gmp0bjhbid8bh8vbz7xx9zy8";
           name = "link";
         };
@@ -32926,7 +33377,7 @@
           sha256 = "1glwsc1a3nhw7xwqlf1pgswgnwkvfy2a6a0k0lxshdajxiayyh7d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/link-hint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/link-hint";
           sha256 = "12fb2zm9jnh92fc2nzmzmwjlhi64rhakwbh9lsydx9svsvkgcs89";
           name = "link-hint";
         };
@@ -32947,7 +33398,7 @@
           sha256 = "01yv6239z90hvncwmm9g5nh4xvyxv2ig3h4hsmxdn4kacfxvc84n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/linphone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/linphone";
           sha256 = "0q7mw1npxq24szhwswc93qz5h6magcxw63ymba7hwhif6my65zx7";
           name = "linphone";
         };
@@ -32960,15 +33411,15 @@
     linum-off = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "linum-off";
-        version = "20130419.2254";
+        version = "20160217.1537";
         src = fetchFromGitHub {
           owner = "mattfidler";
           repo = "linum-off";
-          rev = "e16826e9a4cfe104d55884dc3cc4b4b1ced364ca";
-          sha256 = "0x0k4m7nan2klvrhyzqvgpqnw99fq805hvipnrp2j755x7sv92g5";
+          rev = "116e66ac259b183e0763b85616888316ab196822";
+          sha256 = "1pvgp76n2qnm01l5f9mkb9yqwfxag9x23wwqbsna66rmvsag69w0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/linum-off";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/linum-off";
           sha256 = "1yilsdsyxlzmh64dpzirzga9c7lhp1phps9cdgp2898zpnzaclay";
           name = "linum-off";
         };
@@ -32989,7 +33440,7 @@
           sha256 = "01r8vbblpqfyfafmgbcw02f371j6c2g940bwmvi54rmjf9kjd6h7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/linum-relative";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/linum-relative";
           sha256 = "0s1lc3lppazv0481dxknm6qrxhvkv0r9hw8xmdrpjc282l91whkj";
           name = "linum-relative";
         };
@@ -33010,7 +33461,7 @@
           sha256 = "1r2yhjfby4mibbr7d14m1rifchdy7bvwy50xz2wx4004zqhjmnjd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lisp-extra-font-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lisp-extra-font-lock";
           sha256 = "1xchqwhav9x7b02787ghka567fihdc14aamx92jg549c6d14qpwk";
           name = "lisp-extra-font-lock";
         };
@@ -33028,7 +33479,7 @@
           sha256 = "1m07gb3v1a7al0h4nj3914y8lqrwzi8fwb1ih66nxzn6kb0qj3mf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lispxmp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lispxmp";
           sha256 = "02gfbyng3dh2445jfkasxzjc9dlk02dafbfkjm40iwmb8h0fzji4";
           name = "lispxmp";
         };
@@ -33041,15 +33492,15 @@
     lispy = callPackage ({ ace-window, emacs, fetchFromGitHub, fetchurl, hydra, iedit, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "lispy";
-        version = "20160202.1340";
+        version = "20160218.432";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "lispy";
-          rev = "37999ed32e2bd32f417cc84f9109795fcf1cb72a";
-          sha256 = "1ajymlhx3f2q132vzczgynwf2fyxbm8sbqcg62bpk9iii6ddxql3";
+          rev = "91c05e6bfb7dbabfee08be9dbe3ad32e86aae1e3";
+          sha256 = "1gi6f1kpjjj5ik4fxmycj53lk7j4ppmv7jrwhwfn97nj4p5kd43s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lispy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lispy";
           sha256 = "12qk2gpwzz7chfz7x3wds39r4iiipvcw2rjqncir46b6zzlb1q0g";
           name = "lispy";
         };
@@ -33070,7 +33521,7 @@
           sha256 = "0n0mk01h9c3f24gzpws5xf6syrdwkq4kzs9mgwl74x9l0x904rgf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lispyscript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lispyscript-mode";
           sha256 = "02biai45l5xl2m9l1drphrlj6r01msmadhyg774ijdk1x4gm5nhr";
           name = "lispyscript-mode";
         };
@@ -33091,7 +33542,7 @@
           sha256 = "1szbs16jlxfj71986dbg0d3j5raaxcwz0xq5ar352731r5mdcqw4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/list-environment";
           sha256 = "1zdhrlp8vk8knjwh56pws6dyn003r6avjzvhghlkgnw9nfrdk57h";
           name = "list-environment";
         };
@@ -33112,7 +33563,7 @@
           sha256 = "02l7q5376ydz6a8i9x74bsx5bbxz8xkasmv1lzvf79d3jbg28l1s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-packages-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/list-packages-ext";
           sha256 = "15m4888fm5xv697y7jspghg1ra49fyrny4y2x7h8ivcbslvpglvk";
           name = "list-packages-ext";
         };
@@ -33131,7 +33582,7 @@
           sha256 = "1bssvyjgk1h1wiaxxdi2m5gjy6a790a9rwvi0r22hin7iskg300a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-processes+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/list-processes+";
           sha256 = "10x7hkba2bmryyl68w769fggw65dl4f3a9g0gqdzmkdj80rcipky";
           name = "list-processes-plus";
         };
@@ -33149,7 +33600,7 @@
           sha256 = "1sv1x2bc1xg7z3q4r9pbvjspj041q4zn883w9m071h7dgx8i9a6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-register";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/list-register";
           sha256 = "06q7q3j9qvqbp25cx9as2ckmgcz2myfvi2n34jp60v3ayhna79r4";
           name = "list-register";
         };
@@ -33170,7 +33621,7 @@
           sha256 = "05nn4db8s8h4mn3fxhwsa111ayvlq1raf6bifh7jciyw7a2c3aww";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-unicode-display";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/list-unicode-display";
           sha256 = "01x9i5k5vhjscmkx0l6r27w1cdp9n6xk1pdjf98z3y88dnsmyfha";
           name = "list-unicode-display";
         };
@@ -33191,7 +33642,7 @@
           sha256 = "0b6pnkhm5hnim2lpari93la08ic8qyh4nv0d7mw0cyfyk8phzzvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/list-utils";
           sha256 = "0bknprr4jb1d20i9lj2aa17vpg1kqwdyzzwmy1kfydnkpf5scnr3";
           name = "list-utils";
         };
@@ -33212,7 +33663,7 @@
           sha256 = "0mr0king5dj20vdycpszxnfs9ch808fhcz3q7svxfngj3d3671wd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lit-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lit-mode";
           sha256 = "05rf7ki060nqnvircn0dkpdrg7xbh7phb8bqgsab89ycc7l9vv59";
           name = "lit-mode";
         };
@@ -33233,7 +33684,7 @@
           sha256 = "1nbz119ldwjvkm3xd9m0dx820lc177frz5mn585fsd7kqdbkam99";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/litable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/litable";
           sha256 = "073yw3ivkl093xxppn5vqyh69jhfc97al505mnyn34fwdj5v8fji";
           name = "litable";
         };
@@ -33254,7 +33705,7 @@
           sha256 = "1pxcm4dxb0mggjzcv6r0a34qwq6jyih1afplysh01wk5p3nqlpyk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/litecoin-ticker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/litecoin-ticker";
           sha256 = "14gak0av8wljmyq9lcf44dc2bvlfjb86filanqh0wkf2swpbdw85";
           name = "litecoin-ticker";
         };
@@ -33275,7 +33726,7 @@
           sha256 = "1wxysnsigjw40ykdwngg0gqfaag0dx6zg029i2zx25kl3gr1lflc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/literate-coffee-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/literate-coffee-mode";
           sha256 = "1bll1y9q3kcg3v250asjvx2k9kb314qadaq1iwanwgdlp3qvvs40";
           name = "literate-coffee-mode";
         };
@@ -33296,7 +33747,7 @@
           sha256 = "1v37bii372w2g3pl09n5dcrk6y7glhpg8qiv17zsk9jy3ps2xm1b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/literate-starter-kit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/literate-starter-kit";
           sha256 = "1n2njf007fmrmsb8zrgxbz1cpxmr5nsp8w41yxa934iqc7qygkjy";
           name = "literate-starter-kit";
         };
@@ -33317,7 +33768,7 @@
           sha256 = "1j0qa96vlsqybhp0082a466qb1hd2b0621306brl9pfl5srf5jsj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/live-code-talks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/live-code-talks";
           sha256 = "173mjmxanva13vk2f3a06s4dy62x271kynsa7pbhdg4fd72hdjma";
           name = "live-code-talks";
         };
@@ -33330,15 +33781,15 @@
     live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "20160204.1323";
+        version = "20160204.1914";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "5ebfc696dc4fa3812d934f8ce8f047717053feea";
-          sha256 = "1k7r1cc9hwjdid88hi4l325bwvfdclqxrkw2pm0605l3jpa9jqpy";
+          rev = "185babbba069742f81ec39cc0fb3fb542b457921";
+          sha256 = "1w3598ivxcffqfa8147sp3if5scnx3w88a5syf49afvfca2hvd0b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/live-py-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/live-py-mode";
           sha256 = "0yn1a0gf9yn068xifpv8p77d917mnalc56pll800zlpsdk8ljicq";
           name = "live-py-mode";
         };
@@ -33356,7 +33807,7 @@
           sha256 = "1z9b0arn7vby4fkwzgj3ml537lh94gvf61vs03cqfkc95lv14r76";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lively";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lively";
           sha256 = "1wjd6kfnknhw9lc2p9iipaxfm9phpkqqmjw43bhc70ybsq1xaln7";
           name = "lively";
         };
@@ -33377,7 +33828,7 @@
           sha256 = "0kqjz0i0zapyhh8z57cvc8ifiizngix3ca01mjnvyq3zxg1bqrsg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/livescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/livescript-mode";
           sha256 = "1fdfhp39zr2mhy5rd6mwqv5fwd8xaypdqig7v3ksv77m5zq7cmmj";
           name = "livescript-mode";
         };
@@ -33398,7 +33849,7 @@
           sha256 = "178ldzpk8a9m9abn8xlplxn5jgcca71dpkp82bs5g7bsccp3rx6p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/livid-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/livid-mode";
           sha256 = "0jy16m6injqznx4gmxzvhys480pclw9g07z4qll2dna37177ww9d";
           name = "livid-mode";
         };
@@ -33439,7 +33890,7 @@
           sha256 = "0gvc9jy34a8wvzwjpmqhshbx2kpk6ckmdrdj5v00iya7c4afnckx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/load-theme-buffer-local";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/load-theme-buffer-local";
           sha256 = "13829yrh36qac7gpxanizlk4n7av99ngvv06y6mmi5rq06a4hjx4";
           name = "load-theme-buffer-local";
         };
@@ -33460,7 +33911,7 @@
           sha256 = "0i0ainawjvfl3qix329hx01x7rxyfin2xgpjk7y5dgmh4p3xhv94";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/loc-changes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/loc-changes";
           sha256 = "1akgij61b2ixpkchrriabwvx68cg4v5r5w9ncjrjh91hskjprfxh";
           name = "loc-changes";
         };
@@ -33481,7 +33932,7 @@
           sha256 = "1npz90zf91wqf35bqd3zmkh0b538i69w8ygc78x5w2x5005aqr0p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/loccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/loccur";
           sha256 = "06pv2i05yzjzal4q21krbnp9rp4bsainxcwvpc98020vsmms0z8h";
           name = "loccur";
         };
@@ -33502,7 +33953,7 @@
           sha256 = "1cdnm270kzixa0kpis0xw2ybkw8lqh7kykc7blxkxjrr9yjvbawl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lodgeit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lodgeit";
           sha256 = "1ax2w5yxscycjz90g4jdbhd64g9sipzxpfjs7gq3na77s5dcjzsq";
           name = "lodgeit";
         };
@@ -33523,7 +33974,7 @@
           sha256 = "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/log4e";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/log4e";
           sha256 = "1klj59dv8k4r0hily489dp12ra5hq1jnsdc0wcakh6zirmakhs34";
           name = "log4e";
         };
@@ -33543,7 +33994,7 @@
           sha256 = "c552abe449a7288210e8490070dc58e037d7d9571633d316dc6b91799119a697";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/log4j-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/log4j-mode";
           sha256 = "06lam4iqxlbl9ib2n2db2nj6jbjzrw2ak8r99n6w4s3fny1q3yxx";
           name = "log4j-mode";
         };
@@ -33564,7 +34015,7 @@
           sha256 = "0lj3i9i3mg17xws13gzx8myc6d7djgsj47yx4kaq5hycgkni1p7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/logalimacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/logalimacs";
           sha256 = "0ai7a01bdi3a0amgi63pwgdp8wgcgx10an4nhc627wgb1cqxb7p6";
           name = "logalimacs";
         };
@@ -33585,7 +34036,7 @@
           sha256 = "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/logito";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/logito";
           sha256 = "0bk4qnz66kvhzsk88lw45209778y53kg17iih70ix4ma1x6a3v5l";
           name = "logito";
         };
@@ -33606,7 +34057,7 @@
           sha256 = "05px3zc3is7k2jmh7mal0al5zx5cqvn1bzmhgqq02pp6lwsx5xqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/logstash-conf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/logstash-conf";
           sha256 = "03i2ilphf3fdjag7m9z5gi23n6ik36qn42mzc22432m4y3c7iksh";
           name = "logstash-conf";
         };
@@ -33627,7 +34078,7 @@
           sha256 = "1wglgjf45rl4rl5zp1p1z318p2d1hy1w77m65wwg35v6pkl1mikr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/logview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/logview";
           sha256 = "0gks3j5avx8k3427a36lv7gr95id3cylaamgn5qwbg14s54y0vsh";
           name = "logview";
         };
@@ -33648,7 +34099,7 @@
           sha256 = "0pyfgywmmnlz1arvdxwyw96gr6xcg2sp3bqjli8xfcl8i0nww4kb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lolcode-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lolcode-mode";
           sha256 = "0dxdqr3z5bw0vcfxhhhc1499vrfk1xqwxshr0kvlhdalpf59rqiw";
           name = "lolcode-mode";
         };
@@ -33669,7 +34120,7 @@
           sha256 = "0w9pbjcp4d2w3qb3nnyzq2d0d9f0pgz5lyzapidxa9z1xcj51ccj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/look-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/look-dired";
           sha256 = "0dddx5nxr519wqdgrbglh0pqjl3alg4ddmank42g4llzycy61wsd";
           name = "look-dired";
         };
@@ -33687,7 +34138,7 @@
           sha256 = "0sl6hqggi6qn2qp9khw11qp5hamngwxrrwx98k3pwpj9kgicdpgp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/look-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/look-mode";
           sha256 = "0y3wjfjx0g5jclmv9m3vimv7zd18pk5im7smr41qk09hswi63yqj";
           name = "look-mode";
         };
@@ -33708,7 +34159,7 @@
           sha256 = "1wmd7s3dk9krgmhs4f92mig18vx6y551n45ai7cvj92f4fbrsd08";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/loop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/loop";
           sha256 = "0pav16kinzljmzx84vfz63fvi39af4628vk1jw79jk0pyg9rjbar";
           name = "loop";
         };
@@ -33729,7 +34180,7 @@
           sha256 = "0grzl4kqpc1x6569yfh9xdzzbgmhcskxwk6f7scjpl32acr88cmx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lorem-ipsum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lorem-ipsum";
           sha256 = "0p62yifbrknjn8z0613wy2aaknj44liyrgbknhpa0qn0d4fcrp4h";
           name = "lorem-ipsum";
         };
@@ -33750,7 +34201,7 @@
           sha256 = "179r4pz3hlb5p6bjfhdikkx1zvh09ln5dbw3c3rmlyww1q7v26yl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/love-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/love-minor-mode";
           sha256 = "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m";
           name = "love-minor-mode";
         };
@@ -33771,7 +34222,7 @@
           sha256 = "1psk4202rmkkfy1ir1ax4x4djfngd5pfry7x30ybq2ifqzymb9qb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lua-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lua-mode";
           sha256 = "0gyi7w2h192h3pmrhq39lxwlwd9qyqs303lnp2655pikdzk9js94";
           name = "lua-mode";
         };
@@ -33792,7 +34243,7 @@
           sha256 = "0mv73s89n59m44szc37086wq55py5sx0lc0jxncfybawhsqyd0ar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lush-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lush-theme";
           sha256 = "03kqws8dzm0ay5k86f4v7g2g2ygwk4fzmz2vyzhzhbsj8hrniq9p";
           name = "lush-theme";
         };
@@ -33813,7 +34264,7 @@
           sha256 = "1r1xfn0dyc4m49064g9n6hpwn4r763kpbg3dgprsv30i5ska61qa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lusty-explorer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lusty-explorer";
           sha256 = "0xqanmmkyvzcg2g4zvascq5j004bqz7vmz1a19c25g9cs3rdh0ps";
           name = "lusty-explorer";
         };
@@ -33834,7 +34285,7 @@
           sha256 = "090gk0il4yyypzjbh2qrjdaldwf90fi30impmh4zcfl73bic5q9q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lxc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lxc";
           sha256 = "1rv1ybmbjx7n3cavx21nzmvckw63q3jmjsfdr2pcgavrr2ck6lka";
           name = "lxc";
         };
@@ -33855,7 +34306,7 @@
           sha256 = "1rrfvshl6zbsrswg5hrvq1p0rd9vacqwbr4s44kln7vg4ybcgr24";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/m-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/m-buffer";
           sha256 = "0l2rayglv48pcwnr1ggmn8c0az0mffgv02ivnzr9jcfs55ki07fc";
           name = "m-buffer";
         };
@@ -33876,7 +34327,7 @@
           sha256 = "119c77s3qp1vqc5m2yf7m4s81aphkhsvsnwqmpq6xl08r3592zxz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/macro-math";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/macro-math";
           sha256 = "1r7splwq5kdrdhbmw5zn81vxymsrllgil48g8dl0r60293384h00";
           name = "macro-math";
         };
@@ -33894,7 +34345,7 @@
           sha256 = "07iw9iarz6z9n6vnhqqljfjpvq6vb97ca2hwj9v0k5k8mafdqg7d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/macros+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/macros+";
           sha256 = "0aihszxsjnc93pbbkmkr1iwzvii3jw8yh1f6dpnjykgvb328pvqi";
           name = "macros-plus";
         };
@@ -33911,11 +34362,11 @@
         src = fetchFromGitHub {
           owner = "joddie";
           repo = "macrostep";
-          rev = "a3338d351e18bfbacd970d371735f840e7d5fe38";
-          sha256 = "0j95lv4b01p8a5fpxnj5qs2ajg1yxnsg97vw3184dfy9r5hy7ryb";
+          rev = "1e2593279f3722e31d8a8f07e297a5c546586cba";
+          sha256 = "0g9bnq4p3ffvva30hpll80dn3i41m51mcvw3qf787zg1nmc5a0j6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/macrostep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/macrostep";
           sha256 = "1wjibxbdsp5qfhq8xy0mcf3ms0q74qhdrhqndprn6jh3kcn5q63c";
           name = "macrostep";
         };
@@ -33936,7 +34387,7 @@
           sha256 = "1flamyk7z3r723cczqra0f4yabc6kmgwjaw2bvs3kisppqmmz72g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mag-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mag-menu";
           sha256 = "1r1yisjnqxl9llpf91rwqp4q47jc4qp32xnkl8wzsgr0r2qf5yk2";
           name = "mag-menu";
         };
@@ -33949,15 +34400,15 @@
     magic-filetype = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "magic-filetype";
-        version = "20160120.704";
+        version = "20160220.818";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "magic-filetype.el";
-          rev = "db734bdd7aa429e188a628e772c40542b0216d5c";
-          sha256 = "0i38942lr4b7d624313hgydyy0ynmd6psjkz8xcvbb7gw0kcc436";
+          rev = "1111a67dd07b1d2a91614c8234e459081ca95e24";
+          sha256 = "1km5g9g1jmyx1r3fhd9w8091xainmmvmhi6bzqr1l4nx138wwf2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magic-filetype";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magic-filetype";
           sha256 = "0gcys45cqn5ghppkn0rmyvfybprlfz1x6hqr21yv93mf79h75zhg";
           name = "magic-filetype";
         };
@@ -33970,15 +34421,15 @@
     magic-latex-buffer = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "magic-latex-buffer";
-        version = "20160121.952";
+        version = "20160212.803";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "magic-latex-buffer";
-          rev = "60e680c36fe8e1621a675f1407b901f617dc7cc8";
-          sha256 = "1vq709sw4lxydqxzf42yrw9alzr44hk18am4074znwb5vnnrg5sn";
+          rev = "21c5030996bcd773b32b6fdd5990a64fcc3255f3";
+          sha256 = "1gmhb8g1pl4qqk1d32hlvmhx2jqfsn3hkc4lkzhgk1n3qzfrq4hf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magic-latex-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magic-latex-buffer";
           sha256 = "0xm4vk4aggyfw96cgya5cp97jzx5ha0xwpf2yfh7c3m8d9cca4y8";
           name = "magic-latex-buffer";
         };
@@ -33991,15 +34442,15 @@
     magit = callPackage ({ async, dash, emacs, fetchFromGitHub, fetchurl, git-commit, lib, magit-popup, melpaBuild, with-editor }:
     melpaBuild {
         pname = "magit";
-        version = "20160202.2338";
+        version = "20160219.1702";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "08d0d095c7c16fb8223d3beeea232412f88936f5";
-          sha256 = "08h1lypdvgv0rkq1sjkmw9zwvbjwvpklzjyawb5chgfa5grgfiii";
+          rev = "08c61ea85ca62e8cc04c4e8a0a55a5d947a8d01f";
+          sha256 = "18jk5bl30kncbc5n7sra5i0n4d57c2nd348kmw154xq1dc7w8b64";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit";
           sha256 = "0518ax2y7y2ji4jp7yghy84yxm0zgb059aqfa4v17grm4kr8p16q";
           name = "magit";
         };
@@ -34019,15 +34470,15 @@
     magit-annex = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-annex";
-        version = "20151213.38";
+        version = "20160204.2135";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-annex";
-          rev = "154345a5192f3581af105022541911398a566cce";
-          sha256 = "1h1i8712w0pn6bhc5lpps7ri7bf6f3vy23i6qld13hdgvimgisd9";
+          rev = "db655ed50f38af8940e808afc30447746e2c648a";
+          sha256 = "18xvcw6rbkzrvk7b9cl42fdcaphnx08klnss1vw1b7q9ijbinpbp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-annex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-annex";
           sha256 = "1ri58s1ly416ksmb7mql6vnmx7hq59lmhi7qijknjarw7qs3bqys";
           name = "magit-annex";
         };
@@ -34048,7 +34499,7 @@
           sha256 = "0nkxxhxkhy314jv1l3hza84vigl8q7fc8hjjvrx58gfgsfgifx6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-filenotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-filenotify";
           sha256 = "00a77czdi24n3zkx6jwaj2asablzpxq16iqd8s84kkqxcfiiahn7";
           name = "magit-filenotify";
         };
@@ -34069,7 +34520,7 @@
           sha256 = "1j3jsrp0qpaa2xd98d1g9z0zc4b93knwajrlnlsc7l6g0vlfsddb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-find-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-find-file";
           sha256 = "1d5flydyhwhvhlhi541zcnz2b03bi07zrp21bfz5sm069bf2c96b";
           name = "magit-find-file";
         };
@@ -34090,7 +34541,7 @@
           sha256 = "0f8bcrvnffpcfxgxwp3rvrd4m0apdc7k93952l4v1mqc762lql1s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-gerrit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-gerrit";
           sha256 = "1iwvg10ly6dlf8llz9f8d4qfdbvd3s28wf48qgn1wjlxpka6zrd4";
           name = "magit-gerrit";
         };
@@ -34103,15 +34554,15 @@
     magit-gh-pulls = callPackage ({ emacs, fetchFromGitHub, fetchurl, gh, lib, magit, melpaBuild, pcache, s }:
     melpaBuild {
         pname = "magit-gh-pulls";
-        version = "20151212.1243";
+        version = "20160215.432";
         src = fetchFromGitHub {
           owner = "sigma";
           repo = "magit-gh-pulls";
-          rev = "728819217c697b4eed996eb14261a8c7c3388df7";
-          sha256 = "03m4gr86lm8rs3zn6hdirlgfixf1w033iyhsg9dwlhvmfpfghxb5";
+          rev = "323dbd8f67e3cc307da12e93b1799583902d46a5";
+          sha256 = "08742hdjzcgl12g2i7f37fnwx7mil28i3kdh96wir9pci2jvjcxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-gh-pulls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-gh-pulls";
           sha256 = "0qn9vjxi33pya9s8v3g95scmhwrn2yf5pjm7d24frq766wigjv8d";
           name = "magit-gh-pulls";
         };
@@ -34124,15 +34575,15 @@
     magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "magit-gitflow";
-        version = "20150905.239";
+        version = "20160208.1504";
         src = fetchFromGitHub {
           owner = "jtatarik";
           repo = "magit-gitflow";
-          rev = "dd1d88888957f0fd8b950037e0e58dba2d3221d9";
-          sha256 = "10c1qd1l92h0z7mz7j004bx3fc9p6ij3m732lwmni9vlfbishbb4";
+          rev = "46dc3f20b6f6d5e91e9765da372c909e9cc7b355";
+          sha256 = "1ar9gdp4svymibr9arrlxil1xm1x41gxinlifdb8lgpmawb62d9w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-gitflow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-gitflow";
           sha256 = "0wsqq3xpqqfak4aqwsh5sxjb1m62z3z0ysgdmnrch3qsh480r8vf";
           name = "magit-gitflow";
         };
@@ -34149,11 +34600,11 @@
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit";
-          rev = "08d0d095c7c16fb8223d3beeea232412f88936f5";
-          sha256 = "08h1lypdvgv0rkq1sjkmw9zwvbjwvpklzjyawb5chgfa5grgfiii";
+          rev = "08c61ea85ca62e8cc04c4e8a0a55a5d947a8d01f";
+          sha256 = "18jk5bl30kncbc5n7sra5i0n4d57c2nd348kmw154xq1dc7w8b64";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-popup";
           sha256 = "0w6m384bbmp3bd4qbss5h1jvcfp4qnpqvzlfykhdgjwpv2b2a2fj";
           name = "magit-popup";
         };
@@ -34174,7 +34625,7 @@
           sha256 = "1pqbrrp4366kwfk1d32h2lb70id32ynfc03i7m2832w97f1xp16c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-rockstar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-rockstar";
           sha256 = "1i4fmraiypyd3q6vvibkg9xqfxiq83kcz64b1dr3wmwn30j7986n";
           name = "magit-rockstar";
         };
@@ -34187,15 +34638,15 @@
     magit-stgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-stgit";
-        version = "20151228.1001";
+        version = "20160217.947";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-stgit";
-          rev = "0aec74f70ca1544ee81c586de4aa621ad5f66205";
-          sha256 = "0gb7wpwdhar2a81shd3c5s85ywv8vvjqykpc4py06ybjk8qpspcw";
+          rev = "082a2e89eb769ffb95fb3895c9b32163e4c476ae";
+          sha256 = "1xkzgakm83djf91a5n3cbid0k15439lfgmq8hw0vmb3vb2fz3h9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-stgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-stgit";
           sha256 = "12wg1ig2jzy2np76brpwxdix9pwv75chviq3c24qyv4y80pd11sv";
           name = "magit-stgit";
         };
@@ -34216,7 +34667,7 @@
           sha256 = "0r3nkrisyjawjwbm74yi6fqiwcqzlfkypsdscfhii0q50ky8plph";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-svn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-svn";
           sha256 = "02n732z06f0bhxqkxzlvm36bpqr40pas09zbzpfdk4pb6f9f80s0";
           name = "magit-svn";
         };
@@ -34229,15 +34680,15 @@
     magit-topgit = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
     melpaBuild {
         pname = "magit-topgit";
-        version = "20151018.1231";
+        version = "20160215.1039";
         src = fetchFromGitHub {
           owner = "magit";
           repo = "magit-topgit";
-          rev = "732de604c31c74e9da24616428c6e9668b57c881";
-          sha256 = "0dj183vphnvz9k2amga0ydcb4gkjxr28qz67055mxrf89q1qjq33";
+          rev = "baa503babf7e15bfb448122f5213398a8b4ef8a1";
+          sha256 = "1qwq51b4ihk6nfa00fzzv4qkkxf1vpxh5l69bxrgwgyqbxvci0c6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-topgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-topgit";
           sha256 = "1ngrgf40n1g6ncd5nqgr0zgxwlkmv9k4fik96dgzysgwincx683i";
           name = "magit-topgit";
         };
@@ -34254,11 +34705,11 @@
         src = fetchFromGitHub {
           owner = "ThibautVerron";
           repo = "magma-mode";
-          rev = "b6ccdeb774348ef3e87cc877de9fc90405872760";
-          sha256 = "0alcdr84g2gvvshpa3cws87n47n5shcryzbj947nsbicmp7f9k8j";
+          rev = "4c858609b0f36c6f8b395441920c9510dcbddca8";
+          sha256 = "0v3ikqv2m5hcg1rkfbw58a9w4y6sk51bblp0k2h0srcvim6sqlpm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magma-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magma-mode";
           sha256 = "1gq6yi51h1h7ivrm1xr6nfrpabx8ylbk0waaw04gnw3bb54dmmvc";
           name = "magma-mode";
         };
@@ -34279,7 +34730,7 @@
           sha256 = "1hqz26zm4bdz5wavna4j9yia3ns4z19dnszl7k0lcpgbgmb0wh8y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magnatune";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magnatune";
           sha256 = "0fmxlrq5ls6fpbk5fv67aan8gg1c61i1chfw5lhf496pwqzq901d";
           name = "magnatune";
         };
@@ -34300,7 +34751,7 @@
           sha256 = "06sjwl0bk648wnnrmyh6qgnlqmxypjmy0gkfl6kpv01r8vh7x2q5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/main-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/main-line";
           sha256 = "0c9c5kmixvhk9il8hsxzf2k14fggb9b9mw59g8q3hgpn5g7kgpkv";
           name = "main-line";
         };
@@ -34321,7 +34772,7 @@
           sha256 = "1wwc9byjihpdm08a0c0mzbw2r55lhr7c4k0gbcl05hygphymwng7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/majapahit-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/majapahit-theme";
           sha256 = "04k2smrya27rrjlzvnl3a6llg8vj8x4mm9qyk4kwrmckhd6jd68s";
           name = "majapahit-theme";
         };
@@ -34342,7 +34793,7 @@
           sha256 = "1ky3scyjb69wi76xg6a8qx4ja6lr6mk530bv5gmhj7fxbq8b3x5c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/make-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/make-color";
           sha256 = "0mrv8b67lpid5m8rfbhcik76bvnjlw4xmcrd2c2iinyl02y07r5k";
           name = "make-color";
         };
@@ -34363,7 +34814,7 @@
           sha256 = "00j5n9pil1qik4mrzvam4rp6213w8jm4qw7c4z8sxpq57xa0b679";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/make-it-so";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/make-it-so";
           sha256 = "0a8abz54mb60mfr0bl9ry8yawq99vx9hjl4fm2sivns58qjgfy73";
           name = "make-it-so";
         };
@@ -34384,7 +34835,7 @@
           sha256 = "0w3kar52yf8clf9801c4jzfrixi10clc8fs8ni2d4pzhdwwca2zw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/maker-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/maker-mode";
           sha256 = "03q09jxmhwqy7g09navj08z9ir0rbh7w26c1av7hwhmq4i6xwg8a";
           name = "maker-mode";
         };
@@ -34405,7 +34856,7 @@
           sha256 = "1rr7vpm3xxzcaam3m8xni3ajy8ycyljix07n2jzczayri9sd8csy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/makey";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/makey";
           sha256 = "06xgrlkqvg288yd4lyhx4vi80jlfarhblxk5m5zzs5as7n08cvk4";
           name = "makey";
         };
@@ -34426,7 +34877,7 @@
           sha256 = "0hlxs9gi2vml2id9q0r1r0xdm0zshjzc1w3phjf2ab0aa3hl5k6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/malabar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/malabar-mode";
           sha256 = "026ing7v22rz1pfzs2j9z09pm6dajpys992n45gzhwirz5f0q1rk";
           name = "malabar-mode";
         };
@@ -34447,7 +34898,7 @@
           sha256 = "1a22xkhnmpfffllarsjdw10n5cd3nwifcl1iv98kb4j4x96kd4xg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/malinka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/malinka";
           sha256 = "1245mpxsxwnnpdsf0pd28mddgdfhh7x32a2l3sxfq0dyg2xlgvrp";
           name = "malinka";
         };
@@ -34468,7 +34919,7 @@
           sha256 = "18x3cssfn81k8hg4frj7dhzphg784321z51wbbvn3bjhq7s6j3a2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mallard-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mallard-mode";
           sha256 = "0y2ikjgy107kb85pz50vv7ywslqgbrrkcfsrd8gsk1jky4qn8izd";
           name = "mallard-mode";
         };
@@ -34489,7 +34940,7 @@
           sha256 = "0qk7i47nmyp4llwp6x0i1i5dk82ck26iyz1sjvvlihaw8a5akny2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mallard-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mallard-snippets";
           sha256 = "0437qd7q9i32pmhxaz3vi2dnfpj4nddmzgnqpwsgl28slhjw2hv8";
           name = "mallard-snippets";
         };
@@ -34510,7 +34961,7 @@
           sha256 = "1lfq4hsq2n33l58ja5kzy6bwk9jxbcdsg6y8gqlk71lcslzqldrk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/man-commands";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/man-commands";
           sha256 = "1yl7y0k24gydldfs406v1n523q46m9x6in6pgljgjnjravc67wnq";
           name = "man-commands";
         };
@@ -34531,7 +34982,7 @@
           sha256 = "10wl7kc76dyijrmdlcl5cx821jg7clsj35r22955mbbgh7zl1x07";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/manage-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/manage-minor-mode";
           sha256 = "11jdj8kd401q0y8bbyyn72f27f51bckqid10dnh64z8w7hv59cw6";
           name = "manage-minor-mode";
         };
@@ -34548,11 +34999,11 @@
         src = fetchFromGitHub {
           owner = "mandoku";
           repo = "mandoku";
-          rev = "1f31c150443e19d99c16f95e258536b1d0bc2fc1";
-          sha256 = "08c31h2nan5ikjh171j63xbbznfc1bg6qay1ijx26r5f0c3n6b9k";
+          rev = "b1ac72baebc4df601fb94e40922d4f95719de1ef";
+          sha256 = "0065fxw0zc7vbxcl37nl8v5cgxcr3gzx3k1n16gpw7fgbdp060d4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mandoku";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mandoku";
           sha256 = "1pg7ir3y6yk92kfs5agbxapcxf7gy60m353rjv8g3kfkx5zyh3mv";
           name = "mandoku";
         };
@@ -34573,7 +35024,7 @@
           sha256 = "0pd6bh7wrrh59blp86a2jl2vi4qkzx49z0hy7dkc71ccg0wjsgz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/map-progress";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/map-progress";
           sha256 = "0zc5vii72gbfwbb35w8m30c8r9zck971hwgcn1a4wjczgn4vkln7";
           name = "map-progress";
         };
@@ -34594,7 +35045,7 @@
           sha256 = "0kk1sk3cr4dbmgq4wzml8kdf14dn9jbyq4bwmvk0i7dic9vwn21c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/map-regexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/map-regexp";
           sha256 = "0yiif0033lhaqggywzfizfia3siggwcz7yv4z7przhnr04akdmbj";
           name = "map-regexp";
         };
@@ -34615,7 +35066,7 @@
           sha256 = "0y4b69r2l6kvh7g8f1y9v1pdall3n668ci24lp04lcms6rxcrsnh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/marcopolo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/marcopolo";
           sha256 = "1nbck1m7lhync7n474578d2g1zc72c841hi236xjbdd2lnxz3zz0";
           name = "marcopolo";
         };
@@ -34636,7 +35087,7 @@
           sha256 = "1x3anvy3hlmydxyfzr1rhaiy502yi1yz3v54sg8wc1w7jrvwaj29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mark-multiple";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mark-multiple";
           sha256 = "179wd9g0smm76k92n7j2vgg8gz5wn9lczrns5ggq2yhbc77j0gn4";
           name = "mark-multiple";
         };
@@ -34657,7 +35108,7 @@
           sha256 = "0k4zvbs09mkr8vdffv18s55rn9cyxldzav9vw04lm7v296k94ivz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mark-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mark-tools";
           sha256 = "1688y7lnzhwdva2ildjabzi10i87klfsgvs947i7gfgxl7jwhisq";
           name = "mark-tools";
         };
@@ -34667,18 +35118,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    markdown-mode = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
+    markdown-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
-        version = "20160121.728";
-        src = fetchgit {
-          url = "git://jblevins.org/git/markdown-mode.git";
-          rev = "846a2d0db5f6ce71af9a67a793bfd89e751825fe";
-          sha256 = "9ebb4e9fde3364042a64842a62f7e9b7dc5bfefabc1387b2f6b9e9237596b104";
+        version = "20160219.1113";
+        src = fetchFromGitHub {
+          owner = "jrblevin";
+          repo = "markdown-mode";
+          rev = "3e88d58ab783f4c9c8b932b1b30a2742ddda2c50";
+          sha256 = "1zmq7g9rlf3n36rrgarbw3xwn4zrhc1qg9ammfp08n9pd0vahy77";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-mode";
-          sha256 = "02lmhihv495drv9cb40h6l0xsbx7yglbvsdzc4r0vf78j87rs33f";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/markdown-mode";
+          sha256 = "0gfb3hp87kpcrvxax3m5hsaclwwk1qmxc73cg26smzd1kjfwgz14";
           name = "markdown-mode";
         };
         packageRequires = [ cl-lib ];
@@ -34698,7 +35150,7 @@
           sha256 = "1adl36fj506kgfw40gpagzsd7aypfdvy60141raggd5844i6y96r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-mode+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/markdown-mode+";
           sha256 = "1535kcj9nmcgmk2448jxc0jmnqy7f50cw2ngffjq5w8bfhgf7q00";
           name = "markdown-mode-plus";
         };
@@ -34719,7 +35171,7 @@
           sha256 = "1i5gr3j9dq41p2zl4bfyvzv6i5z7hgrxzrycmbdc3s7nja36k9z4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-preview-eww";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/markdown-preview-eww";
           sha256 = "0j6924f84is41dspib68y5lnz1f8nm7pqyhv47alxra50cjrpxnx";
           name = "markdown-preview-eww";
         };
@@ -34732,15 +35184,15 @@
     markdown-preview-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, websocket }:
     melpaBuild {
         pname = "markdown-preview-mode";
-        version = "20160115.154";
+        version = "20160215.1049";
         src = fetchFromGitHub {
           owner = "ancane";
           repo = "markdown-preview-mode";
-          rev = "97d9276210465f4e9492169f3c0ed831a57cedf4";
-          sha256 = "10h5zh03c3v0c6pqcxvlns6l70k2l916nqvza53ikjpldmc4mln2";
+          rev = "ff75e31a57f62156441d66d5c4033ad204d49a87";
+          sha256 = "1yi5hsgf8hr7v1wyn3bw650g3ysbglwn5qfrmb6yl3s08lvi1vlf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-preview-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/markdown-preview-mode";
           sha256 = "0i0mld45d8y96nkqn2r77nvbyw6wgsf8r54d3c2jrv04mnaxs7pg";
           name = "markdown-preview-mode";
         };
@@ -34753,15 +35205,15 @@
     markdown-toc = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, s }:
     melpaBuild {
         pname = "markdown-toc";
-        version = "20160108.241";
+        version = "20160207.1058";
         src = fetchFromGitHub {
           owner = "ardumont";
           repo = "markdown-toc";
-          rev = "e0382443ee83e982cc40878ee04d8543dbe0a12a";
-          sha256 = "1s5sasp8z9s1pfq7nww221lb427qblryilx0h5y7bg4z2ay9yr03";
+          rev = "ddaba5fde8e15dad74ebc20abc71c7766c8fd980";
+          sha256 = "17ninp3hpy8k1r6a4mz28dbk4kwg3myhzny2r7mix50rbvcf0y8n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-toc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/markdown-toc";
           sha256 = "0slky735yzmbfi4ld264vw64b4a4nllhywp19ya0sljbsfycbihv";
           name = "markdown-toc";
         };
@@ -34782,7 +35234,7 @@
           sha256 = "1i95b15mvkkki2iq8hysdr7jr1d5nix9jjkh7jz0alvaybqlsnqi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/markup";
           sha256 = "0yw4b42nc2n7nanqvj596hwjf0p4qc7x6g2d9g5cwi7975iak8pf";
           name = "markup";
         };
@@ -34803,7 +35255,7 @@
           sha256 = "1w6i1m7xdr9cijnmdj35cl99r12vl83qws0qlfhrgvisilshnr27";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markup-faces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/markup-faces";
           sha256 = "12z92j9f0mpn7w2qkiwg54wh743q3inx56q3f8qcpfzyks546grq";
           name = "markup-faces";
         };
@@ -34824,7 +35276,7 @@
           sha256 = "1ygznmqb3fqy94p8qi71i223m7cpw3f596pkls2ybjlbpb4psjcl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/marmalade";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/marmalade";
           sha256 = "0ppa2s1fma1lc01byanfxpxfrjqk2snxbsmdbkcipjdi5dpb0a9s";
           name = "marmalade";
         };
@@ -34845,7 +35297,7 @@
           sha256 = "017k109nfif5mzkj547py8pdnzlr4sxb74yqqsl944znflq67blr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/marmalade-client";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/marmalade-client";
           sha256 = "0llwqwwxrf7qdkpdb03ij0iinll0vc9qr557zyr3bn5zb4fad1sq";
           name = "marmalade-client";
         };
@@ -34866,7 +35318,7 @@
           sha256 = "0fwhhzfd6vgpaf5mrw90hvm35j2kzhk9h3gbrwd7y7q08nrmsx9p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/marshal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/marshal";
           sha256 = "17ikd8f1k42f28d4v5dn83zb44bsx7g336db60q068w6z8d4jbgl";
           name = "marshal";
         };
@@ -34879,15 +35331,15 @@
     material-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "material-theme";
-        version = "20160120.303";
+        version = "20160212.154";
         src = fetchFromGitHub {
           owner = "cpaulik";
           repo = "emacs-material-theme";
-          rev = "204abe37742a52eaf2775279d56e38bf163b2327";
-          sha256 = "0627kpc03hwa489d6bsfls8jc67f31m4m167748g12w07rswb7ba";
+          rev = "3bdb927099e58a71fac0f73b80bf223342b31cc8";
+          sha256 = "108n2w8f0vsazw8wl50af8cb8amyb1qrg30nxwfwqgvi8d8iba4f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/material-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/material-theme";
           sha256 = "1d259avldc5fq121xrqv53h8s4f4bp6b89nz2rvjhygz7f8hargq";
           name = "material-theme";
         };
@@ -34908,7 +35360,7 @@
           sha256 = "186gb83y3g1q7d0sdrxqz22nr62qq6fy7m74qwirlsf7vnnm4gpx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/math-symbol-lists";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/math-symbol-lists";
           sha256 = "01j11k29acj0b1pcapmgi2d2s3p50bkms21i2qcj0cbqgz8h6s27";
           name = "math-symbol-lists";
         };
@@ -34929,7 +35381,7 @@
           sha256 = "1chyxi096krjbi9zgbrnrkvwgmn4wygnia9m57m0jh4arlbm28la";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/math-symbols";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/math-symbols";
           sha256 = "0sx9cgyk56npjd6z78y9cldbvjl5ipl7k1nc1sylg1iggkbwxnqx";
           name = "math-symbols";
         };
@@ -34939,18 +35391,18 @@
           license = lib.licenses.free;
         };
       }) {};
-    matlab-mode = callPackage ({ fetchcvs, fetchurl, lib, melpaBuild }:
+    matlab-mode = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "matlab-mode";
-        version = "20141227.1244";
-        src = fetchcvs {
-          cvsRoot = ":pserver:anonymous@matlab-emacs.cvs.sourceforge.net:/cvsroot/matlab-emacs";
-          module = "matlab-emacs";
-          sha256 = "694652e361b9d15a3f1542d45b43c6516f20030dbaa8a058b5fdb4c833885465";
+        version = "20160210.427";
+        src = fetchgit {
+          url = "git://git.code.sf.net/p/matlab-emacs/src";
+          rev = "e08bf6d49b9c1a325dd0e3bb71881b65c6348d66";
+          sha256 = "787c5ea50aa906d387c7cef39d44a86cd0d6998e391239bd0ff30a47fd75681d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/matlab-mode";
-          sha256 = "06s7mrbfbkk6baf8j1vc26nb2bg3ma1n7d297zqz8ay90cv81y76";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/matlab-mode";
+          sha256 = "1bybc5xv5hbjh8afmh03qda5g3m2wcgsk6lgj6jkyyxzdfxqkrck";
           name = "matlab-mode";
         };
         packageRequires = [];
@@ -34962,14 +35414,14 @@
     matrix-client = callPackage ({ fetchgit, fetchurl, json ? null, lib, melpaBuild, request }:
     melpaBuild {
         pname = "matrix-client";
-        version = "20160118.1725";
+        version = "20160205.1800";
         src = fetchgit {
           url = "git://fort.kickass.systems/personal/rrix/pub/matrix.el";
-          rev = "421ad8ebf3858acc99634a4cca442c57ca2b3707";
-          sha256 = "34e1f7bd0c4ab21b2b0ca6d2a6ba83c9a1a5591e9de9ceb1c5f8fe06a4738acb";
+          rev = "3b00bd20739268d60a029bae580372d7f4cdecd4";
+          sha256 = "006b30332ec67e837b6d822fd926adc7ea3afb9073fa9c5dac05292a3c13af01";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/matrix-client";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/matrix-client";
           sha256 = "09mgxk0xngw8j46vz6f5nwkb01iq96bf9m51w2q61wxivypnsyr6";
           name = "matrix-client";
         };
@@ -34989,7 +35441,7 @@
           sha256 = "06k07qvhm2mbqasn72649lx3pwzb0r466854a18g6lciwhiww7vy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/maude-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/maude-mode";
           sha256 = "04b6q328hj0w33z4c50nqyark0pn5sqi0s8096m9di4rjwxaw0ma";
           name = "maude-mode";
         };
@@ -35010,7 +35462,7 @@
           sha256 = "1xn2yyr8mr90cynbxgv0h5v180pzf0ydnjr9spg34mrdicqlki6c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/maven-test-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/maven-test-mode";
           sha256 = "1k9w51rh003p67yalzq1w8am40nnr2khyyb5y4bwxgpms8z391fm";
           name = "maven-test-mode";
         };
@@ -35031,7 +35483,7 @@
           sha256 = "0g9kpsg6623nmxnshj49q8k952xybrkmqqy6m892m8wnm22pjdz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/maxframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/maxframe";
           sha256 = "10cwy3gi3xb3pfdh6xiafxp3vvssawci3y26jda6550d0w5vardj";
           name = "maxframe";
         };
@@ -35049,7 +35501,7 @@
           sha256 = "0w8clp96jblsc9v87404zpc280ms0d644in34jdgjc5r33f4i0g3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mb-depth+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mb-depth+";
           sha256 = "031hh227rh7l818p3di4h34i4698yynw5g9a5sl2hj47c0734q6w";
           name = "mb-depth-plus";
         };
@@ -35070,7 +35522,7 @@
           sha256 = "1qd4vya49sy7iwcpnyd91d0zx3niwsavhdcq6387rsb0j64hwybl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mb-url";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mb-url";
           sha256 = "1nf8ssan00qsn3d4dc6h6qzdwqzh977qb5d2m33kiwi6qb98988h";
           name = "mb-url";
         };
@@ -35091,7 +35543,7 @@
           sha256 = "1zywygdgnp2zr8fxqhl0cbrgbl43931k936b9imhqi96p6622pb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mbe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mbe";
           sha256 = "0h18mbcjy8nh4gl12kg2v8x6ps320yk7sbgq5alqnx2shp80kri3";
           name = "mbe";
         };
@@ -35112,7 +35564,7 @@
           sha256 = "1vr85fdlb4zwgid1v00ndppla9fqqk25g2x2f5alm69pfqssr75z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mbo70s-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mbo70s-theme";
           sha256 = "1abx2rw09xxp122ff7i9sry5djd4l6vn4lfzxs92rknjzkyc40pb";
           name = "mbo70s-theme";
         };
@@ -35133,7 +35585,7 @@
           sha256 = "0252wdq4sd6jhzfy0pn3gdm6aq2h13nnp8hvrn1mpml9x473a5n1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mc-extras";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mc-extras";
           sha256 = "0b110x6ygc95v5pb9lk1i731x5s6dagl5afzv37l1qchys36xrym";
           name = "mc-extras";
         };
@@ -35154,7 +35606,7 @@
           sha256 = "1j8gp3byanf1mq8sc4hv838rgcywlv35d8q1vjwzsjaznvz8hvc3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/md-readme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/md-readme";
           sha256 = "1krq0f79jjrlihr2aqq87pxdqixv2zdjw4hm732sz79g996yxyw3";
           name = "md-readme";
         };
@@ -35175,7 +35627,7 @@
           sha256 = "136lh39hakwx46rd1gsmsfhsj78mrpamid766v2vjx9rkkprk0zv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/meacupla-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/meacupla-theme";
           sha256 = "09q88q2xghj5vn5y3mjrcparfwdzavkgjyg2ay55h7wf5f2zpw2d";
           name = "meacupla-theme";
         };
@@ -35196,7 +35648,7 @@
           sha256 = "0f0p6ppgj1w0gfyja9hbah6wsw7glx9ybpbs6kn7lwm0ir9rd33s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mediawiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mediawiki";
           sha256 = "17cbrzfdp6jbbf74mn2fi1cwv7d1hvdbw9j84p43jzscnaa5ikx6";
           name = "mediawiki";
         };
@@ -35217,7 +35669,7 @@
           sha256 = "0bilwhvprzk634sk5hnxilrvrl0yv593swzznch0p38hqxl585ld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mellow-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mellow-theme";
           sha256 = "0kl1psykx7akxwabszk4amszh3zil8ia4bfbjjvr6h9phgx66pb0";
           name = "mellow-theme";
         };
@@ -35238,7 +35690,7 @@
           sha256 = "12cp56ppmwpdgf5afx7hd2qb8d1qq8z27191fbbf5zqw8cq5zkpd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/melpa-upstream-visit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/melpa-upstream-visit";
           sha256 = "0j4afy9ipzr7pwkij8ab207mabd7srganlyyif9h1hvclj9svdmf";
           name = "melpa-upstream-visit";
         };
@@ -35259,7 +35711,7 @@
           sha256 = "0pjqax3pi6pb650yb8iwa4brwwl6cdka7jym3cfkpppyy782dm0q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/memento";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/memento";
           sha256 = "0f8ajhj677r2kxszmad6h1j1b827ja0vaz2my1vx145y3gf160b8";
           name = "memento";
         };
@@ -35280,7 +35732,7 @@
           sha256 = "0fjwlrdm270qcrqffvarw5yhijk656q4lam79ybhaznzj0dq3xpw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/memoize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/memoize";
           sha256 = "0mzz3hghnbkmxf9wgjqv3sbyxyqqzvvscazq9ybb0b41qrzm73s6";
           name = "memoize";
         };
@@ -35301,7 +35753,7 @@
           sha256 = "1jd4rjv812iv7kp4wyxdz8sk7j0442m8x2ypk6hiqis0braxnspm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/memolist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/memolist";
           sha256 = "1whajbwmz1v01dirv795bhvs27vq9dh0qmj10dk2xia7vhn42mgh";
           name = "memolist";
         };
@@ -35322,7 +35774,7 @@
           sha256 = "11hyydc13jdai6lkxx8nqf8xljh0gx7fcmywhik4f1hf3pdv7i2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mentor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mentor";
           sha256 = "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s";
           name = "mentor";
         };
@@ -35340,7 +35792,7 @@
           sha256 = "1i96s0z0q9z2ws2b1lz1n50j6hih9y4rsy7mwx0k8a4ikll0gx82";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/menu-bar+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/menu-bar+";
           sha256 = "181jxjnzdckmvpsdknhm21xwimvsp0qxn8azfn58dz41gl4xcg90";
           name = "menu-bar-plus";
         };
@@ -35361,8 +35813,8 @@
           sha256 = "1amb375dpy5al1ddh2ln9l1lw6xqfjigld6y5k7vvh730zild824";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/merlin";
-          sha256 = "0wnh7512sknagdk56j6gd8vamh9ns3vnggm56s73pik0m009w0xr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/merlin";
+          sha256 = "177cy9xcrjckxv8gvi1zhg2ndfr8cmsr37inyvpi5dxqy6d6alhp";
           name = "merlin";
         };
         packageRequires = [];
@@ -35379,7 +35831,7 @@
           sha256 = "05ic97plsysh4nqwdrsl5m9f24m11w24bahj8bxzfdawfima2bkf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/message-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/message-x";
           sha256 = "0z12alizwrqp5f9wq3qllym9k5xljh904c9qhlfhp9biazj6yqwj";
           name = "message-x";
         };
@@ -35400,7 +35852,7 @@
           sha256 = "1x425ah3ymjyp3pxvyzyp4gd8zrjx8lgdzprml8qvf1yk82iv45l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/meta-presenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/meta-presenter";
           sha256 = "0f70cfa91wavchlx8d9hdlgq90cmnylhbg2dbw603rzjkyvslp5d";
           name = "meta-presenter";
         };
@@ -35442,7 +35894,7 @@
           sha256 = "1rascpmv17dksyn9y0llmjb8r4484x5ax54w6r83k1x7ha1iacx5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/metascript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/metascript-mode";
           sha256 = "1kgs4ki0s6bxx2ri6zxmsy2b2w56gnr9hjkr6302wcmp3qy7clwn";
           name = "metascript-mode";
         };
@@ -35463,7 +35915,7 @@
           sha256 = "06mbdb4zb07skq1jpv05hr45k5x96d9hgkb358jiq0kfsqlrbbb4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/metaweblog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/metaweblog";
           sha256 = "11y5x3a8iv0hjj7ppi2sa7vawn7r475qfsh1jg415j4y4fzwpk6y";
           name = "metaweblog";
         };
@@ -35484,7 +35936,7 @@
           sha256 = "1rkipcv53p7zra3gbjc77ywyxn8d1kx2gniyfqq16d2p2jw0lbzb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mew";
           sha256 = "0423xxn3cw6jmsd7vrw30hx9phga5chxzi6x7cvpswg1mhcyn9fk";
           name = "mew";
         };
@@ -35505,7 +35957,7 @@
           sha256 = "0bhllmyk1r9y63jw5gx10v09791w33lc54qs31gcxbnss094l6py";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mexican-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mexican-holidays";
           sha256 = "0awf4vv6mbp1xr92nsgdn513g4adqhp21k12q4fbm85b2l3jlspb";
           name = "mexican-holidays";
         };
@@ -35518,15 +35970,15 @@
     mhc = callPackage ({ calfw, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mhc";
-        version = "20160129.141";
+        version = "20160210.2237";
         src = fetchFromGitHub {
           owner = "yoshinari-nomura";
           repo = "mhc";
-          rev = "79b0208995c37c5b81b40dc60630ebce63688ed2";
-          sha256 = "0dbchc5l6cv4hjrdshd68jhhwjzswwyhsl20q102kvj4l8n0sncz";
+          rev = "f520c1f8c46e635c8131754b79b9b071612e295d";
+          sha256 = "0ahbf4cd9q65xrvsc1clym3swdwwsl8llccrl5l1qgxqx5xg61hv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mhc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mhc";
           sha256 = "02ikn9hx0kcfc2xrx4f38zpkfi6vgz7chcxk6q5d0vcsp93b4lql";
           name = "mhc";
         };
@@ -35544,7 +35996,7 @@
           sha256 = "1ibim60fx0srmvchwbb2s04dmcc7mv7zyg1vqavas24ya2gmixc5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mic-paren";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mic-paren";
           sha256 = "1kdmp0wd7838nk58lby8gx91pjan47lq3izk4vdb2vm0h0iq57sa";
           name = "mic-paren";
         };
@@ -35565,7 +36017,7 @@
           sha256 = "1cigsr0hkbi1860w38k2j8fw6j4w43pgv2bpkmdsifbqy6l8grpg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/midje-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/midje-mode";
           sha256 = "0069hwy5cyrsv5b1yvjhmjasywbmc8x3daq9hkzidy3a2fmqgqv3";
           name = "midje-mode";
         };
@@ -35575,27 +36027,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    midje-test-mode = callPackage ({ cider, clojure-mode, fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "midje-test-mode";
-        version = "20131208.1114";
-        src = fetchFromGitHub {
-          owner = "bpoweski";
-          repo = "midje-test-mode";
-          rev = "46fc081865d48f30b950f21a597eadd59a802fc9";
-          sha256 = "0f3iq4ghi4ig2by1smfciavr2f0lx6vhvajykxdfs0afn006w4cs";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/midje-test-mode";
-          sha256 = "0i5j9bnrncxar8hpy3d0566d0y5s4ywakskf27d3kxfyrwqi4l4f";
-          name = "midje-test-mode";
-        };
-        packageRequires = [ cider clojure-mode ];
-        meta = {
-          homepage = "http://melpa.org/#/midje-test-mode";
-          license = lib.licenses.free;
-        };
-      }) {};
     migemo = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "migemo";
@@ -35607,7 +36038,7 @@
           sha256 = "1az4mnmanhz9ga0g46jf33w8axcw8lnrb9lmszajwv7y5j9nk7yr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/migemo";
           sha256 = "0y49imdwygv5zd7cyh9ngda4gyb2mld2a4s7zh4yzlh7z5ha9qkr";
           name = "migemo";
         };
@@ -35628,7 +36059,7 @@
           sha256 = "1qg64mxsm2cswk52mlj7sx7k6gfnrsdwnf68i7cachri0i8aq4ap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/milkode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/milkode";
           sha256 = "07v6xgalx7vcw5sghckwvz584746cba05ql8flv8n556glm7hibh";
           name = "milkode";
         };
@@ -35648,7 +36079,7 @@
           sha256 = "1b2kn4c90hl07lzdg10wamd4lq8f24wmaj4zvr728pwyga99b2av";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minesweeper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minesweeper";
           sha256 = "1n6r3a3rl09pv4jvb7ald1gaipqylfchggza973qv9rgh5g90nag";
           name = "minesweeper";
         };
@@ -35661,15 +36092,15 @@
     mingus = callPackage ({ fetchFromGitHub, fetchurl, lib, libmpdee, melpaBuild }:
     melpaBuild {
         pname = "mingus";
-        version = "20151115.1317";
+        version = "20160206.310";
         src = fetchFromGitHub {
           owner = "pft";
           repo = "mingus";
-          rev = "151f2225f9af3c4cc7ca89e94dc6a19077baf6a4";
-          sha256 = "0r4jh58pls859fljb6qm49l4imfxxif9mxsmjgwan0czfhq33xqh";
+          rev = "8c8b3ba4d9295f2eacb2d073c2405ffc2b2c0f58";
+          sha256 = "0h4di0z6df28sv596hn38snvq2xv9pj1a0xwbsifxj4nrzglq1fc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mingus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mingus";
           sha256 = "0vw09qk56l792706vvp465f40shf678mcmdh7iw8wsjix4401bzi";
           name = "mingus";
         };
@@ -35690,7 +36121,7 @@
           sha256 = "1n4b039448826w2jcsv4r2iw3v2vlrsxw8dbci8wcfigmkbfc879";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minibuf-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minibuf-isearch";
           sha256 = "0n36d152lc53zj9jy38b0c7hlww0z6hx94y3x2njy6cmh3p5g8nh";
           name = "minibuf-isearch";
         };
@@ -35711,7 +36142,7 @@
           sha256 = "1zyb6c3xwdzk7dpn7xi0mvbcjdfxvzz1a0zlbs053pfar8iim5fk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minibuffer-complete-cycle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minibuffer-complete-cycle";
           sha256 = "0y1mxs6q9a8lzprrlb22qff6x5mvkw4gp2l6p2js2r0j9jzyffq2";
           name = "minibuffer-complete-cycle";
         };
@@ -35732,7 +36163,7 @@
           sha256 = "011kg76zr4hfhi2gngnc7jlmp0l0nvhmlgyc0y9bir2jbjf4yyvz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minibuffer-cua";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minibuffer-cua";
           sha256 = "1ragvr73ykbvpgynnq3z0z4yzrlfhfqlwc1vbxclb8x2xmxq7pzw";
           name = "minibuffer-cua";
         };
@@ -35753,7 +36184,7 @@
           sha256 = "1850z96gly0jnr50472idqz1drzqarr0n23bbasslrc501xkg0bq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/miniedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/miniedit";
           sha256 = "10s407q7igdi2hsaaahbw8vckalrl7z3s6l9cflf51q16xh2ih87";
           name = "miniedit";
         };
@@ -35774,7 +36205,7 @@
           sha256 = "1sj5sq932w079y3vy55q5b6wybwrzz30y092iq1mpfg5xvl42sbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minimal-session-saver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minimal-session-saver";
           sha256 = "1ay7wvriga28bdmarpfwagqzmmk93ri9f3idhr6z6iivwggwyy2i";
           name = "minimal-session-saver";
         };
@@ -35795,7 +36226,7 @@
           sha256 = "1iy1z2kwnbzxhz5r4gsy4zm0l3xbwy314dqxliprbl8n2m9w0lmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minimal-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minimal-theme";
           sha256 = "0l4xj5q06h5fk634d6v3idm0zniq8grz4rjm6qzi7b4jr9sc60gm";
           name = "minimal-theme";
         };
@@ -35816,7 +36247,7 @@
           sha256 = "08sy08bzn2as4n6jydrzvn0h0xahyihr2snfr3ps25gkfwxsk4aq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minitest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minitest";
           sha256 = "0x6nd4kkhiw8hh79r69861pf41j8p1y39kzf2rl61zlmyjz9zpmw";
           name = "minitest";
         };
@@ -35837,7 +36268,7 @@
           sha256 = "0808cl5ixvmhd8pa6fc8rn7wbxzvqjgz43mz1pambj89vbkzmw1c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minizinc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minizinc-mode";
           sha256 = "1blb6mbyqvmdvwp477p1ggs3n6rzi9sdfvi0v1wfzmd7k749b10c";
           name = "minizinc-mode";
         };
@@ -35855,7 +36286,7 @@
           sha256 = "0vwvvhzqiad82qvfwygb2arq1mdvh1lj6q2as0a92fg1vc95qcb0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minor-mode-hack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minor-mode-hack";
           sha256 = "1f2wy25iphk3hzjy39ls5j04173g7gaq2rdp2grkawfhwx0ld4pj";
           name = "minor-mode-hack";
         };
@@ -35876,7 +36307,7 @@
           sha256 = "12k9ii4090dn03xvgqisl4zl4qi33054zxyfkqzzpa9wv72h4knc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mip-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mip-mode";
           sha256 = "1wx5zg4kimd29vqipbzm4vjphn0mldri12g6b18kc290nhgj22ar";
           name = "mip-mode";
         };
@@ -35894,7 +36325,7 @@
           sha256 = "0sc4l0prwmakxmdq22xd5mj8ddwhzrs034zmx2swi2k3s07x15id";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/misc-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/misc-cmds";
           sha256 = "0bylb84icddgznmim18fwq1mhh3qz8yh8ch6lpadf9p3h420qgcl";
           name = "misc-cmds";
         };
@@ -35912,7 +36343,7 @@
           sha256 = "1mksmxy741sv7d5lr9wlj4klb0sg06bg5z1zpd5hj0bd4b3mx7x0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/misc-fns";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/misc-fns";
           sha256 = "1spjbkcac33lyfsgkd6z186a3432x9nw3akmx194gaap2863xcam";
           name = "misc-fns";
         };
@@ -35933,7 +36364,7 @@
           sha256 = "1d08i2cfn1q446nyyji0hi9vlw7bzkpxhn6653jz2k77vd2y0wmk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mkdown";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mkdown";
           sha256 = "1b2vi8q6jhq1xv7yr5f3aiyp1w8j59w19vxys0pv6bqr2gra07i1";
           name = "mkdown";
         };
@@ -35954,7 +36385,7 @@
           sha256 = "1lcc2p9qz70kpykgx82isv0qiqlsajp4vvcj6bvag92d7h9yk9bv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mmm-jinja2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mmm-jinja2";
           sha256 = "0579sv77dyzishhcw4xxi444inwy4jgh9vmxwd856nd05j3cyc7z";
           name = "mmm-jinja2";
         };
@@ -35974,7 +36405,7 @@
           sha256 = "0rpp748ym79sxccp9pyrwri14m7624zzb80srfgjfdpysrrs0jrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mmm-mako";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mmm-mako";
           sha256 = "0a4af5q9wxafrid8visp30cz6073ig0c961b78vmmgqrwvvxd3kn";
           name = "mmm-mako";
         };
@@ -35995,7 +36426,7 @@
           sha256 = "04rapmqblfjvmdccm9kqi8gn0him1x2q7hjwsyb8mg4lwxcd7qp9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mmm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mmm-mode";
           sha256 = "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw";
           name = "mmm-mode";
         };
@@ -36016,7 +36447,7 @@
           sha256 = "05nmcx3f63ds31cj3qwwp03ksflkfwlcn3z2xyxbny83r0dxbgvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mmt";
           sha256 = "0hal3qcw6x9658xpdaw6q9l2rr2z107pvg5bdzshf67p1b3lf9dq";
           name = "mmt";
         };
@@ -36037,7 +36468,7 @@
           sha256 = "1dh92hzpicfvrlg6swrw4igwb771xbsmsf7hxp1a4iry4w8dk398";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mo-git-blame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mo-git-blame";
           sha256 = "1dp9pxhggappb70m5hyp8sxlnh06y996adabq7x6qvm745mk6f0x";
           name = "mo-git-blame";
         };
@@ -36058,7 +36489,7 @@
           sha256 = "0k0scl9z35d8x4ikxm2db1frpbx151p2m181fa1armxbd9lbfvnn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mo-vi-ment-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mo-vi-ment-mode";
           sha256 = "1pg889mgpv0waccm135mlvag7q13gzfkzchv2532jngwrn6amqc7";
           name = "mo-vi-ment-mode";
         };
@@ -36079,7 +36510,7 @@
           sha256 = "04hbd7mv29v3fv4ld0b3skrir0wp9dix2n5nbqp63fj6n5i4cyyz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mobdebug-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mobdebug-mode";
           sha256 = "19k0c7igqsqvib6hx0nssig4l5f959dlr4wijd1hp5h1hmcb5vv8";
           name = "mobdebug-mode";
         };
@@ -36100,7 +36531,7 @@
           sha256 = "1jyqj7qdpaf0p8d7csc24ch0kgg3vfigadn118gh84xvr1brvvwk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mocha";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mocha";
           sha256 = "0kjgrl5iy7cd3b9csgpjg3y0wp0q6c7c8cvf0mx8gdbsj7296kyx";
           name = "mocha";
         };
@@ -36113,15 +36544,15 @@
     mocha-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "mocha-snippets";
-        version = "20150116.1000";
+        version = "20160211.1032";
         src = fetchFromGitHub {
           owner = "cowboyd";
           repo = "mocha-snippets.el";
-          rev = "b8d321eda797e8382f0033901694860fe52f19a9";
-          sha256 = "06c92q1wrj6b8d8k7i10d4gcy5liag3x4f4chh510c4d3wi0f6sp";
+          rev = "ac1f196bc0214cf7ec99bf34aafcbe13d53dffc4";
+          sha256 = "1f8h5c9vvwynq92b1ii5hdpqmf52l5j443ir5hdbiigq30wkwlhx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mocha-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mocha-snippets";
           sha256 = "0dbsdk4jpzxv2sxx0nia9zhd0a0wmkz1qcqmbd15m1909ccdwxds";
           name = "mocha-snippets";
         };
@@ -36142,7 +36573,7 @@
           sha256 = "0dngznaraphpc5amn9n120la7ga3rj7h67pnnal6qwflh5rqcmss";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mocker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mocker";
           sha256 = "1g90jp1czrrzrmn7n4linby3q4fb4gcflzv2amjv0sdimw1ln1w3";
           name = "mocker";
         };
@@ -36163,7 +36594,7 @@
           sha256 = "0r24186d1q9436h3qhqz1z8q978d01an0dvpvzirf4x9ickrib3k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/modalka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/modalka";
           sha256 = "0bkjykvl6sw797h7j76dzn1viy598asly98gcl5wrq13n4w1md4c";
           name = "modalka";
         };
@@ -36173,21 +36604,21 @@
           license = lib.licenses.free;
         };
       }) {};
-    mode-icons = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    mode-icons = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mode-icons";
-        version = "20160125.1221";
+        version = "20160221.803";
         src = fetchgit {
           url = "git://ryuslash.org/mode-icons.git";
-          rev = "1b8249cad9723c467ccc9e6c25fad4c260900d1f";
-          sha256 = "5d599c604623b33ac1d332c54c4eca5587c58528bd93d14bdd0c342ee306936b";
+          rev = "d2c9926a8e79e13ef9942fe96b8109add24a9978";
+          sha256 = "cb98bc1e199688337efd03bbd18a340514740257f9ede19089f01f5ad6e69b74";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mode-icons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mode-icons";
           sha256 = "18w221zjrrsfcymprv5x75i3qv04zy4bxl9mqjv0ys7qcc8xf1dp";
           name = "mode-icons";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "http://melpa.org/#/mode-icons";
           license = lib.licenses.free;
@@ -36204,7 +36635,7 @@
           sha256 = "1lkw9nnlns6v7r6nx915f85whq1ri4w8lccwyxrvam40hfvq60s1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mode-line-debug";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mode-line-debug";
           sha256 = "0ppj14bm3rx3xgg4mfxa5zcm2r129jgmsx817wq3h7akjngcbfkd";
           name = "mode-line-debug";
         };
@@ -36222,7 +36653,7 @@
           sha256 = "1dlprk1jlfw7b7vnxi0d0mf85737wkjc5fkvycx8nawngb2fqhbw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/modeline-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/modeline-char";
           sha256 = "1cb6pm69db0jbksmc4mkawf643i74is9v7ka34pv3mb21nj095qp";
           name = "modeline-char";
         };
@@ -36240,7 +36671,7 @@
           sha256 = "1r4zq355h570hk7qq0ik121bwsr4hjnhacal4d4h119d11gq2p8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/modeline-posn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/modeline-posn";
           sha256 = "0dngfcbcdh22fl6nd47dhg9z9iivj67six67zjr9j1cbngp10dwk";
           name = "modeline-posn";
         };
@@ -36261,7 +36692,7 @@
           sha256 = "0ri841cwx2mx8ri50lhvifmxnysdc022421mlmklql0252kn775l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/modtime-skip-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/modtime-skip-mode";
           sha256 = "1drafwf4kqp83jp47j2ddl2n4a92zf1589fnp6c72hmjqcxv3l28";
           name = "modtime-skip-mode";
         };
@@ -36274,15 +36705,15 @@
     moe-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "moe-theme";
-        version = "20151124.1709";
+        version = "20160216.2021";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "moe-theme.el";
-          rev = "56b0833e3549e1b2f008388549972971936b053f";
-          sha256 = "0dyp8jpznb9ivzkka2cgydzcldc275238p0f1c9pcrxjf7mjglmx";
+          rev = "b6dcf5f5dc822bee8e6d6b6a79ae6889910ed247";
+          sha256 = "05lh052dnwdpf6iqypipa8yjhl9mwka3h77d4pnfwq8wdz7ywp12";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/moe-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/moe-theme";
           sha256 = "1nqvj8spvffgjvqlf25rcm3dc6w1axb6qlwwsjhq401a6xhw67f6";
           name = "moe-theme";
         };
@@ -36303,7 +36734,7 @@
           sha256 = "1hqa59pdrnwfykyl58lr8pfbh2f13sygvmrh707hbwc2aii0jjv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/molokai-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/molokai-theme";
           sha256 = "0srdh3yx7j6xs7rgpzmsyzz6ds00kq887rs2sfa0nvk0j0ga6baf";
           name = "molokai-theme";
         };
@@ -36324,7 +36755,7 @@
           sha256 = "0z8mcfhj425hb91fkj1pyg3apw1kf4mgy8lx6n1sc8zmib38py0x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mongo";
           sha256 = "103zkslqdihjyl81688fvkq96rzk3an1vf3gz8rlmmz5anbql8ai";
           name = "mongo";
         };
@@ -36345,7 +36776,7 @@
           sha256 = "0ddkcb5rzpcqpsrwkhvm9kzpx2mlrrsp7psljkz5q5qfvy3wdagh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/monky";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/monky";
           sha256 = "1m7hy3ijwgxqjk3vjvqkxqj8b5bqnd201bmf302k45n0dpjmhshz";
           name = "monky";
         };
@@ -36366,7 +36797,7 @@
           sha256 = "1sxhpvxapzgrwvzibkg7zd3ppmfcz5rhrbvg73b8rggjg4m5snyf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/monochrome-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/monochrome-theme";
           sha256 = "191ikqns1sxcz6ca6xp6mb2vyfj19x19cmcf17snrf46kmx60qk9";
           name = "monochrome-theme";
         };
@@ -36387,7 +36818,7 @@
           sha256 = "0rszr7p5v47s66kj872mz68apkbykhl51lp4v1apwj1ay32lbx9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/monokai-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/monokai-theme";
           sha256 = "13mv4vgsmdbf3v748lqi7b42hvr3yp86n97rb6792bcgd3kbdx7a";
           name = "monokai-theme";
         };
@@ -36408,7 +36839,7 @@
           sha256 = "1z1gyknxscvk2qpfcrgzymf9w5m8jcnj525q852b8s6yf5fnffmh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/monroe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/monroe";
           sha256 = "04rhninxppvilk7s90g0wwa0g9vfcg7mk8mrb2m2c7cb9vj6wyig";
           name = "monroe";
         };
@@ -36429,7 +36860,7 @@
           sha256 = "1ndgw4799d816pkn2bwja5kmigydpmj9znn8cax4dxsd9fg2hzjy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/morlock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/morlock";
           sha256 = "0693jr1k8mzd7hwp52azkl62c1g1p5yinarjcmdksfyqblqq5jna";
           name = "morlock";
         };
@@ -36450,7 +36881,7 @@
           sha256 = "10mf96r75558scn71pri71aa8nhp6hmnb5rwjxlh5dlf80r5dfd7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mote-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mote-mode";
           sha256 = "1lg5z5d0d35sh21maiwmgzvc31iki9yg6x0awy5xrfsains7ykn9";
           name = "mote-mode";
         };
@@ -36471,7 +36902,7 @@
           sha256 = "17570labnwdnwca2cg4ga0mrrm00n0h3wlxry823k5yn3k93rnj1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/motion-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/motion-mode";
           sha256 = "1lfsc8ayiz2v3dfn8c0mmfch8vpzqyddxw8kscan2lzl2lcj50h0";
           name = "motion-mode";
         };
@@ -36489,7 +36920,7 @@
           sha256 = "0rakxcpqdx175hic3ykwbd5if53dvvf0sxhq0gplpsybpqvkimyv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mouse+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mouse+";
           sha256 = "1fv7jnqzskx9iv92dm2pf0mqy2accl0svjl2kkb6v273n1day3f8";
           name = "mouse-plus";
         };
@@ -36510,7 +36941,7 @@
           sha256 = "05pzplb3gmlnlvn2azbxdlf4vrkvk8fc9dkgi2nq4shysnh4c9v7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mouse-slider-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mouse-slider-mode";
           sha256 = "0aqxjm78k7i8c59w6mw9wsfw3rail1pg40ac1dbcjkm62fjbh5hy";
           name = "mouse-slider-mode";
         };
@@ -36528,7 +36959,7 @@
           sha256 = "1831jpi06hi5v2jdjgs83jma7fp8xiqdmvvwxfyp2zpbfwi1lkb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mouse3";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mouse3";
           sha256 = "1rppn55axjpqwqm2lq4dvwi3z7xkd5jkyqi1x8jqgcsfc9w6m777";
           name = "mouse3";
         };
@@ -36549,7 +36980,7 @@
           sha256 = "0baynb6gq04rxh10l6rn0myrhg7c7fwqaryiiyddp4jy7llf83c8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/move-dup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/move-dup";
           sha256 = "0b0lmiisl9yckblwf7619if88qsmbka3bl4qiaqam7fka7psxs7f";
           name = "move-dup";
         };
@@ -36559,16 +36990,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    move-text = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
+    move-text = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
         pname = "move-text";
-        version = "20140307.1044";
-        src = fetchurl {
-          url = "http://www.emacswiki.org/emacs/download/move-text.el";
-          sha256 = "0azda60cbz3kpvy6zd7pvlj40iwvj1zjdxv1brzqa6yfa4kyixv2";
+        version = "20160211.2047";
+        src = fetchFromGitHub {
+          owner = "emacsfodder";
+          repo = "move-text";
+          rev = "6219c1e222c463217007efc7f4eaeffef166fe21";
+          sha256 = "0f7gwwkyxk9rv6rhpc88w8vz4x0ww6r9cxmy7bs9lqsf8a7y2095";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/move-text";
-          sha256 = "1xgq7wsh08fb23zv71lfw5rska9wijsl64ijpi2m06zyw1m7mdqr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/move-text";
+          sha256 = "04bfrkanafmbrdyw06ciw9kiyn7h3kpikxk3clx2gc04jl67hzgy";
           name = "move-text";
         };
         packageRequires = [];
@@ -36588,7 +37022,7 @@
           sha256 = "179mc70x3dvj0cz6yyhs00ndh0xvk71gmiscln9y0f1ngxr5h338";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mowedline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mowedline";
           sha256 = "0c2hvvwa7s5iyz517jaskshdcq9zs15zr6xsvrcb3biahrh4bmfb";
           name = "mowedline";
         };
@@ -36609,7 +37043,7 @@
           sha256 = "1g06i3d8xv8ja6nfww4k60l3467xr1s9xsk7i6dbicq0lf8559h9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/moz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/moz";
           sha256 = "0ar2xgsi7csjj6fgiamrjwjc58j942dm32j3f3lz21yn2c4pnyxi";
           name = "moz";
         };
@@ -36630,7 +37064,7 @@
           sha256 = "0fssn33ld6xhjlwg1dbrjg8sa0pjmglq0dw792yrmvm4fj0zjph8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/moz-controller";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/moz-controller";
           sha256 = "18gca1csl9dfi9995mky8cbgi3xzf1if8pzdjiz5404gzcqk0rfd";
           name = "moz-controller";
         };
@@ -36672,7 +37106,7 @@
           sha256 = "03j5fy2xw204807wi7ivwcqlgkh1f7msshh5yrk6c7qdpp08062r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mozc-im";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mozc-im";
           sha256 = "1gqzmm712npj36qfi506zgl0ycd6k7l5m46c7zz2z2lb6jpssw10";
           name = "mozc-im";
         };
@@ -36693,7 +37127,7 @@
           sha256 = "1mbpkjc6sk7qqmgsmr5a5l2ycwnqp8bkwgikdavgs6hnal10bkmn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mozc-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mozc-popup";
           sha256 = "1n43lwflxzzyskxgzg19rg3hiqqkf5l7vfgaydryf4sk8480x687";
           name = "mozc-popup";
         };
@@ -36714,7 +37148,7 @@
           sha256 = "11c8pr3s77aq34ic32lnsialwh8bw3m78kj838xl2aab2pgrlny2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mpages";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mpages";
           sha256 = "11scjjwwrpgaz6i4jq9y7m864nfak46vnbfb0w15625znz926jcs";
           name = "mpages";
         };
@@ -36735,7 +37169,7 @@
           sha256 = "09731mwm23b6ic53366lnxy2p7dfd245yh75gaf6ijfa22jks7gb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mpg123";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mpg123";
           sha256 = "184ip9pvv4zkfxnrzxbfajjadc9f4dz4psn33f9x3sfh7s1y4nw8";
           name = "mpg123";
         };
@@ -36756,7 +37190,7 @@
           sha256 = "193j90sgn1zgl00mji86wll4djj57vk5arhwbmhhf5b1qx3wpbhm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mpv";
           sha256 = "1vq308ac6jj1h8qa2b2sypisb38hbvwjimqndhpfir06fghkw94l";
           name = "mpv";
         };
@@ -36777,7 +37211,7 @@
           sha256 = "1draiwbwb8zfi6rdr5irv8091xv2pmnifq7pzi3rrvjb8swb28z3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/msvc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/msvc";
           sha256 = "04gq2klana557qvsi3bv6416l0319jsqb6bdfs7y6729qd94hlq3";
           name = "msvc";
         };
@@ -36798,7 +37232,7 @@
           sha256 = "1gxspy50gh7j4sysvr17fvvp8p417ww39ii5dy0fxncfwczdsa19";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mu-cite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mu-cite";
           sha256 = "0ap21sw4r2x774q2np6rhrxh2m2rf3f6ak3k71iar159chx32y6q";
           name = "mu-cite";
         };
@@ -36811,15 +37245,15 @@
     mu4e-alert = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, ht, lib, melpaBuild, s }:
     melpaBuild {
         pname = "mu4e-alert";
-        version = "20160109.2212";
+        version = "20160215.409";
         src = fetchFromGitHub {
           owner = "iqbalansari";
           repo = "mu4e-alert";
-          rev = "86d0dbd3418c8d61f982430111ceb6697a576285";
-          sha256 = "065pncwj0sgiacn24c4pimcw325xc7wncbq0s1rrgq0920dxc9rc";
+          rev = "6a724e8457fc9e4d2a9464f06316253e04048bd4";
+          sha256 = "0klnpbb47l3s8cdv1ikldiqw83mggxcbnhlvs3g13a36vx6cxxp4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mu4e-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mu4e-alert";
           sha256 = "15nwj09iyrvjsc9lrxla6qa0s8izcllxghw5gx3ffncfcrx2l8qm";
           name = "mu4e-alert";
         };
@@ -36840,7 +37274,7 @@
           sha256 = "1cvpzs65fjmhdza1vi2lpk68vkvivb0igrpgm42andi42gc6k50b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mu4e-maildirs-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mu4e-maildirs-extension";
           sha256 = "1xz19dxrj1grnl7wy9qglh08xb3dr509232l3xizpkxgqqk8pwbi";
           name = "mu4e-maildirs-extension";
         };
@@ -36861,7 +37295,7 @@
           sha256 = "0f5hc6mgq0hg1wwnvqd4fp7ck58lcavvgqjggz9zlhrjgkmynjxx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multi";
           sha256 = "1c240d1c1g8wb2ld944344zklnv86d9rycmya4z53b2ai10642ig";
           name = "multi";
         };
@@ -36874,15 +37308,15 @@
     multi-compile = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "multi-compile";
-        version = "20160204.1541";
+        version = "20160215.1419";
         src = fetchFromGitHub {
           owner = "ReanGD";
           repo = "emacs-multi-compile";
-          rev = "7bbd1e84a4ed411fed77007ebae0fa7d870be75e";
-          sha256 = "0bayjp60lzv2ay34k9yvx46vyk5ffnivrlvb3hw1kfpwyw46fww6";
+          rev = "ac128d246971fb43a1c33d4cdf3e3bd1557f37cf";
+          sha256 = "10fnps2mw2n8y456qxsxqx4cmlhk0fag9p0c6kwx78mwz8akk07w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multi-compile";
           sha256 = "16fv0hpwcjw1771zlbgznph0fix9fbm6yqj2rcz1f9l26iih6apz";
           name = "multi-compile";
         };
@@ -36900,7 +37334,7 @@
           sha256 = "1w1jwfznpl214a1xx46zlgqbx9c5yjzpyqqrkn3xqjgnj485yhkl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi-eshell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multi-eshell";
           sha256 = "1i0mvgqxsc99dwp9qcdrijqxsxflrbxw846rgw89p1jfs8mp4l7d";
           name = "multi-eshell";
         };
@@ -36921,7 +37355,7 @@
           sha256 = "13rp6kbabjy9dy0x4696065yyaxlgmfnwcqq9vcw2jhbb2gl9gs5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multi-line";
           sha256 = "1aadmijnjr029s1qq4gk8xyl9m8xb5x5774b8i3jyfixyjqvhvwp";
           name = "multi-line";
         };
@@ -36941,7 +37375,7 @@
           sha256 = "0lcx73vzm7zwvzzc53pfb5y16bhvq9cm9fdy63d3242s8v834z3c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multi-project";
           sha256 = "19dy2wl5ad1xldiznlw2vjvr9ja8h9wiv6igcggixq56fhngp40x";
           name = "multi-project";
         };
@@ -36959,7 +37393,7 @@
           sha256 = "062c52xd469jdmsq4fvdhsmgfjrlanv0bb1w5vglz7bsn68d2bim";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multi-term";
           sha256 = "1va4ihngwv5qvwps3m9jj0150gbrmq3zllnyq1hbx5ap8hjrhvdx";
           name = "multi-term";
         };
@@ -36980,7 +37414,7 @@
           sha256 = "0mc4kkgwnwfk27wwc21nw5ly7qcsl7y5bd8wf2y8r6pxhvwran4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi-web-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multi-web-mode";
           sha256 = "0vi4yvahr10aqpcz4127c8pcqpr5srwc1yhgipnbnm86qnh34ql5";
           name = "multi-web-mode";
         };
@@ -37001,7 +37435,7 @@
           sha256 = "1ispa0wxpkydm0cyj4scyyacfrbilrip5v8bsrcqfc6qs597z8rf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multicolumn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multicolumn";
           sha256 = "1ylnc3s4ixvnqn7g2p6nzz8x29ggqc703waci430f1rp1lsd3q09";
           name = "multicolumn";
         };
@@ -37022,7 +37456,7 @@
           sha256 = "065l04ylplng1vgykkbn2vnkcs3sn1k2cikx1ha2q8wmgx6bkvai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multifiles";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multifiles";
           sha256 = "0m0pi2qjis9p6z9cd8hlxm1r88ynwmd2ks8wg65sffffwsdbg4kz";
           name = "multifiles";
         };
@@ -37035,15 +37469,15 @@
     multiple-cursors = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "multiple-cursors";
-        version = "20151205.1425";
+        version = "20160213.1017";
         src = fetchFromGitHub {
           owner = "magnars";
           repo = "multiple-cursors.el";
-          rev = "a393384b3508e7d8d721e66d2bfb97fa7153dd4f";
-          sha256 = "0hl9ll7pgqv74dnihyy0gz15wz0swj1cpa208484qd3g0dvin8j6";
+          rev = "68961b4cf39b6d56d21ece0246f8c215f95cc3e1";
+          sha256 = "07g03z1jx0d8gr9m30vn33jm7ym3afqcj83j499wa2hj3wqnaf9f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multiple-cursors";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multiple-cursors";
           sha256 = "0mky5p9wpd3270wr5vfna8rkk2ff81wk7vicyxli39195m0qgg0x";
           name = "multiple-cursors";
         };
@@ -37064,7 +37498,7 @@
           sha256 = "1n2ymd92qpvsby6ms0l3kjhdzzc47rri2aiscc6bs07hm4mjpr9q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mustache";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mustache";
           sha256 = "1pjr00xx77mlfw1myxaz6i3y2gbivhbiq5hyjxxbjlfrkm1vxc8g";
           name = "mustache";
         };
@@ -37085,7 +37519,7 @@
           sha256 = "15gw4d0hp15rglsj8hzd290li4p0kadj2dsz0dgfcxld7hnimihk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mustache-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mustache-mode";
           sha256 = "076ar57qhwcpl4n634ma827r2rh61670778wqr5za2444a6ax1gs";
           name = "mustache-mode";
         };
@@ -37106,7 +37540,7 @@
           sha256 = "19qd34dcfspv621p4y07zhq2pr8pwss3lcssm9sfhr6w2vmvgcr4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mustang-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mustang-theme";
           sha256 = "0771l3x6109ki914nwpfz3fj7pbvpcg9vf485mrccq2wlxymr5dr";
           name = "mustang-theme";
         };
@@ -37127,7 +37561,7 @@
           sha256 = "170qhbbvcv9dg6jzfd9r95in5m8z1k647mn0gaqflfj0hvq5hwgf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mustard-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mustard-theme";
           sha256 = "0izxhivhmv49dja4wy9n0ipd41xdzdza2ql7pfa7ny35ji5hskik";
           name = "mustard-theme";
         };
@@ -37148,7 +37582,7 @@
           sha256 = "1faqbkff0v6pigsnnq2dxnzdra8q62cvlxigscwalwxd27bbz548";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mutant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mutant";
           sha256 = "0m5l5r37zb0ig96757ldyl9hbb01lknzqf08ap6dsmdwr1zayvp1";
           name = "mutant";
         };
@@ -37166,7 +37600,7 @@
           sha256 = "1xihp3zdqs9054j3bfrd9wnahsvvxjk1ags1iy50ncv5850ppjis";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/muttrc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/muttrc-mode";
           sha256 = "0ym6rfrhrmpnlqhkxv9ck5893qm0yhswslvgc9vb4nl9hyc1b5jn";
           name = "muttrc-mode";
         };
@@ -37179,15 +37613,15 @@
     mvn = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mvn";
-        version = "20151001.129";
+        version = "20160211.943";
         src = fetchFromGitHub {
           owner = "apgwoz";
           repo = "mvn-el";
-          rev = "01ede605d49c5fb6f2da038f5df6f31112de802f";
-          sha256 = "1gvn0a49lgbjnkl0j2sv4p9zdfqzj9s4jw0k2f4ypmsd1fc0q6d6";
+          rev = "8a65b4eb88c9801aa3bff1921b600c72dfb8791a";
+          sha256 = "1jg3xrk44lspxli0zr02jcsl8phj0ns7ly3dkd7rx2wgsk69ari3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mvn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mvn";
           sha256 = "1ykiz5fviq2n2474izwp0vvqanpbmxg7lzh1xbpn281kwmp0mwin";
           name = "mvn";
         };
@@ -37208,7 +37642,7 @@
           sha256 = "0qdlbyq47gr65yq5ri8s9lxw4wp9fmyqc2prkh560d4hkvw60aw3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mwe-log-commands";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mwe-log-commands";
           sha256 = "05z2ax9mgyxldd3ds44xnh9f5w5q4ziy4rxmnfiqjykan2f5hnkn";
           name = "mwe-log-commands";
         };
@@ -37229,7 +37663,7 @@
           sha256 = "0hvq6z754niqjyv79jzb833wrwbspc7npfg85scwdv8vzwassjx4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mwim";
           sha256 = "0bsibwplvyv96y5i5svm2b0jwzs5a7jr2aara7v7xnpj0nqaxm8k";
           name = "mwim";
         };
@@ -37250,7 +37684,7 @@
           sha256 = "0cf0c9g9k2lk1ifi2dlw7c601sh1ycxf3fgl2hy5wliyd6l9rf86";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/myanmar-input-methods";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/myanmar-input-methods";
           sha256 = "1yg8zy2z18pbyr507ms2b162c0819rna1ilwyp6hb3iv2zjw45sd";
           name = "myanmar-input-methods";
         };
@@ -37271,7 +37705,7 @@
           sha256 = "0a9a6hmv8vjmp6h9mnzin9vc0sncg79v5z72pasvbrplfxijzan0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mykie";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mykie";
           sha256 = "12ram39fp3m9ar6q184rsnpkxb14y0ajibng7ia2ck54ck7n36cj";
           name = "mykie";
         };
@@ -37292,7 +37726,7 @@
           sha256 = "18ml0qz3iipm9w36zvwz77cbbrg885jgvzk6z4a33xcfp524xhma";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mynt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mynt-mode";
           sha256 = "17s0wdwgh2dcpww6h3qszc9dcs7ki00xkyisvsfn4xqajrmmp75b";
           name = "mynt-mode";
         };
@@ -37313,7 +37747,7 @@
           sha256 = "0q5809hq22hyzxx5xr2hwwf3jh3qlpf3mkbl3fxqq93gm16plh1i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mysql2sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mysql2sqlite";
           sha256 = "1jblrbw4rq2jwpb8d1dyna0fiv52b9va3sj881cb17rqx200y3nd";
           name = "mysql2sqlite";
         };
@@ -37334,7 +37768,7 @@
           sha256 = "18wqgjn38jxzsbivmf2fkcq3r1y4lffh3dbpv1jj7s9qn91pyp6a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/myterminal-controls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/myterminal-controls";
           sha256 = "0ipk5s2whf3l68q0dydm1j6rcb6jhk61hgjwxygdphifvih7c5y2";
           name = "myterminal-controls";
         };
@@ -37355,7 +37789,7 @@
           sha256 = "1lp1bx9110vqzjww94va8pdks39qvqzl8rf0p8na1q0qn06rnk9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/n3-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/n3-mode";
           sha256 = "0hasxq39phgyc259dgxskhqxjsp0yi98vx1bs8ynvwa26la4ddzh";
           name = "n3-mode";
         };
@@ -37376,7 +37810,7 @@
           sha256 = "1pd6c0jc1zxx3i3nk4qdx7gdf1qn8sc9jgqd72pkkpzvdwv998cp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/n4js";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/n4js";
           sha256 = "0x7smxs91ffriyxx2df61fh1abpl39gqy4m62k77h7xb6fg7af6m";
           name = "n4js";
         };
@@ -37394,7 +37828,7 @@
           sha256 = "0zq13qjqfpxjba1bhdqqxkvgxq1dxyb7hd1bpnk6cbhsxr6mr50i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/naked";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/naked";
           sha256 = "06p6dzhn34dva3677mrvwq2a2x3bhw7f486y654hszla7i75pilq";
           name = "naked";
         };
@@ -37415,7 +37849,7 @@
           sha256 = "0amhw630hgc0j8wr8m6aav399ixi3vbwrck79hhlr3pmyh91vv7n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/name-this-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/name-this-color";
           sha256 = "12nrk1ww766jb4gb4iz6w485nimh2iv8wni2jq4l38v8ndh490zb";
           name = "name-this-color";
         };
@@ -37436,7 +37870,7 @@
           sha256 = "07zgwyrss23yb8plnhhwmh0khdvfp539891sj1z1vs50jcllcpw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nameframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nameframe";
           sha256 = "0iq8cfii39ha8sxn9w7kyfvys8kwyax8g4l0pkl05q0a0s95padp";
           name = "nameframe";
         };
@@ -37457,7 +37891,7 @@
           sha256 = "07zgwyrss23yb8plnhhwmh0khdvfp539891sj1z1vs50jcllcpw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nameframe-perspective";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nameframe-perspective";
           sha256 = "0wgr90m2pazc514slgdl1lin4mr3xxizasc82k7qinvdvdja515x";
           name = "nameframe-perspective";
         };
@@ -37478,7 +37912,7 @@
           sha256 = "07zgwyrss23yb8plnhhwmh0khdvfp539891sj1z1vs50jcllcpw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nameframe-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nameframe-projectile";
           sha256 = "11z64wy8mnnrjmgfs2sjbv3mh136aki8r5f89myx861nfx18hc3k";
           name = "nameframe-projectile";
         };
@@ -37499,7 +37933,7 @@
           sha256 = "13v0v90vrc2w0wi7wmzmpql6yjbr6lpzh29kxggq9fy38lahd3ks";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nameless";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nameless";
           sha256 = "14agx54h2vqfb0656n12z761ywyxsdskd6xa1ccar70l9vwj85vq";
           name = "nameless";
         };
@@ -37520,7 +37954,7 @@
           sha256 = "0m82g27gwf9mvicivmcilqghz5b24ijmnw0jf0wl2skfbbg0sydh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/names";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/names";
           sha256 = "1q784606jlakw1z6sx2g2x8hz8c8arywrm2r626wj0v105v510vg";
           name = "names";
         };
@@ -37541,7 +37975,7 @@
           sha256 = "157hhb253m6a9l5wy6x8w5ar3x0qz1326l7a0npxif6pma0dd140";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/namespaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/namespaces";
           sha256 = "02pb7762khxpah4q6xg8r7dmlv1kwyzinffi7pcaps6ycj29q2fr";
           name = "namespaces";
         };
@@ -37562,7 +37996,7 @@
           sha256 = "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nand2tetris";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nand2tetris";
           sha256 = "1zg9xx7mj8334m2v2zqqfkr5vkj4dzqbj8y13qk6xhzb7qkppyqd";
           name = "nand2tetris";
         };
@@ -37583,7 +38017,7 @@
           sha256 = "003zgkpzz9q0bkkw6psks0vbfikzikfm42myqk14xn7330vgcxz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nand2tetris-assembler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nand2tetris-assembler";
           sha256 = "1761kgrflipxba8894cnx90ks7f3ba4nj6ci515zzxcx9s45mfyy";
           name = "nand2tetris-assembler";
         };
@@ -37603,7 +38037,7 @@
           sha256 = "1nzkamy53kl1g4y1jm7j5zgpkdsyg5ykp8zp1f0bg5mhy8mmf75w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nanowrimo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nanowrimo";
           sha256 = "1nhyj38qyn1x6a5rbrwhcxwfwzyqqjm3dvksdnmam6vfwn3s2r31";
           name = "nanowrimo";
         };
@@ -37624,7 +38058,7 @@
           sha256 = "0mxf61ky1dd7r2qd4j7k6bdppmkilkq5l9gv257a12539wkw5yq2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/naquadah-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/naquadah-theme";
           sha256 = "1aml1f2lgn530i86218nrc1pk3zw5n3qd2gw4gylwi7g75i0cqn1";
           name = "naquadah-theme";
         };
@@ -37642,7 +38076,7 @@
           sha256 = "1lyszm94pd3jxs73v7k0aaazm0sd2rpz2pphcdag7lk7k6vppd9n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/narrow-indirect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/narrow-indirect";
           sha256 = "10aq4gssayh3adw8yz2lza1xbypyffi8r03lsc0kiis6gd9ibiyj";
           name = "narrow-indirect";
         };
@@ -37663,7 +38097,7 @@
           sha256 = "10yn215xb4s6kshk108y75im1xbdp0vwc9kah5bbaflp9234i0zh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/narrow-reindent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/narrow-reindent";
           sha256 = "0fybal70kk62zlra63x4jb72694m0mzv4cx746prx9anvq1ss2i0";
           name = "narrow-reindent";
         };
@@ -37684,7 +38118,7 @@
           sha256 = "0ydxj6dc10knambma2hpimqrhfz216nbj96w1dcwgjixs4cd4nax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/narrowed-page-navigation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/narrowed-page-navigation";
           sha256 = "1yrmih60dd69qnin505jlmfidm2svzpdrz46286r7nm6pk7s4pb7";
           name = "narrowed-page-navigation";
         };
@@ -37705,7 +38139,7 @@
           sha256 = "19v1qp4rzqvyzrk5zaxdjhki8cjl4fg6lr4ai3vi06yf62ds9mcs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nasm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nasm-mode";
           sha256 = "1626yf9mmqlsw8w01vzqsyb5ipa56259d4kl6w871k7rvhxwff17";
           name = "nasm-mode";
         };
@@ -37724,7 +38158,7 @@
           sha256 = "0kfqpji6z3ra8sc951vmm1bzyhkws7vb5q6djvl45wlf1wrgkc4p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nav";
           sha256 = "036lf6iirxamlqzq3w6m0hji36l480yx5c9wnwypms85hi8hq0vl";
           name = "nav";
         };
@@ -37745,7 +38179,7 @@
           sha256 = "07wjicbvzg7cz983hv0p2qw1qlln07djigkmbqfpwvg3fk50fdyg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nav-flash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nav-flash";
           sha256 = "0936kr0s6zxxmjwaqm7ywdw2im4dxai1xb7j6xa2gp7c70qvvsx3";
           name = "nav-flash";
         };
@@ -37766,7 +38200,7 @@
           sha256 = "1yywbfa0syhb8zmn2qjjw2hxy7vz9ky3xd7kv3nz3gd2x989nb9a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/navi-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/navi-mode";
           sha256 = "0f5db983w9kxq8mcjr22zfrm7cpxydml4viac62lvab2kwbpbrmi";
           name = "navi-mode";
         };
@@ -37787,7 +38221,7 @@
           sha256 = "15l2zmm8bp4ip8m1hfxkvswfwa29pg72kisfya2n5v900r184a4m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/navi2ch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/navi2ch";
           sha256 = "13xwvyy27dz1abjkkazm3s1p6cw32l2klr1bnln02w0azkbdy7x3";
           name = "navi2ch";
         };
@@ -37808,7 +38242,7 @@
           sha256 = "0g7rmvfm0ldv0d2x7f8k761mgmi47siyspfi1ns40ijhkpc15x8l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/navorski";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/navorski";
           sha256 = "0dnzpsm0ya8rbcik5wp378hc9k7gjb3gwmkqqj889c38q5cdwsx7";
           name = "navorski";
         };
@@ -37829,7 +38263,7 @@
           sha256 = "0gbv5fv401z58ycbqlivqamf5kp3x6krhi36q7q0m4gvy448xz0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ncl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ncl-mode";
           sha256 = "0hmd606xgapzbc79px9l1q6pphrhdzip495yprvg20xsdpmjlfw9";
           name = "ncl-mode";
         };
@@ -37850,7 +38284,7 @@
           sha256 = "178gjv7kq97p9i4naxql7xabvmchw5x8idkpyjqqky3b24v5wkis";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nclip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nclip";
           sha256 = "016jp1rqrf1baxlxbi3476m88a0l3r405dh6pmly519wm2k8pipw";
           name = "nclip";
         };
@@ -37884,15 +38318,15 @@
     neotree = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "neotree";
-        version = "20160204.326";
+        version = "20160214.732";
         src = fetchFromGitHub {
           owner = "jaypei";
           repo = "emacs-neotree";
-          rev = "7ac86e96f1a0eb542ba38da741b4abd21312c7dd";
-          sha256 = "105a8qwhjaay2nfspp5zj227zkwl85ggymakgbqqf6gi0s789vyh";
+          rev = "c61f21aeb7ec42af4f3687d6f670a1363bea4df9";
+          sha256 = "1v3ifr3ndkyxkfyg1n6yknb74313pv96yfq93k80ncxyj40ci5jl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/neotree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/neotree";
           sha256 = "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06";
           name = "neotree";
         };
@@ -37913,7 +38347,7 @@
           sha256 = "1kkflj2qnrn6kzh1l6bjl5n5507qilb22pqj3h0f2m6hfyn0sw5z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/netherlands-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/netherlands-holidays";
           sha256 = "181linsbg5wrx1z7zbj3in2d3d4zd2v7drspkj0b6l0c5yfxwayf";
           name = "netherlands-holidays";
         };
@@ -37934,7 +38368,7 @@
           sha256 = "0p00mmid04pfsna4ify3cy0b9lx431q1r5h772hihsg4f1rs2ppy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/never-comment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/never-comment";
           sha256 = "0sn8y57895bfpgiynnj4m9b3x3dbb9v5fwkcwmf9jr39dbf98v6s";
           name = "never-comment";
         };
@@ -37955,7 +38389,7 @@
           sha256 = "05jwaj7wlrdpmylawv14ypwpg9qz9pqqqd1nvb94b9gbs79j86z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/newlisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/newlisp-mode";
           sha256 = "0i2d2gyzzvpr5qm2cqzbn9my21lfb66315hg9fj86ac5pkc25zrd";
           name = "newlisp-mode";
         };
@@ -37976,7 +38410,7 @@
           sha256 = "1xnx6v49i6abzbhq4fl4bp9d0pp9gby40splpcj211xsb8yiry27";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nexus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nexus";
           sha256 = "1mdphgsqg6n4hryr53rk42z58vfv0g5wkar5ipanr4h4iclkf5vd";
           name = "nexus";
         };
@@ -37997,7 +38431,7 @@
           sha256 = "08bpyk0brx0x2l0y8hn8zpkaxb2ndmxz22kzxxypj6hdz303wf38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nginx-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nginx-mode";
           sha256 = "07k17m64zhv6gik8v4n73d8l1k6fsp4qp8cl94r384ny0187y65c";
           name = "nginx-mode";
         };
@@ -38018,7 +38452,7 @@
           sha256 = "147vw3qlsply5h8cjmjzqr5dv9jzf9xlmhjnmcpyb1r7krh1l8xm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/niflheim-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/niflheim-theme";
           sha256 = "1dipxwaar7rghmz7s733v035vrbijcg1dla9f7cld1gkgiq9iq36";
           name = "niflheim-theme";
         };
@@ -38031,15 +38465,15 @@
     nim-mode = callPackage ({ commenter, emacs, epc, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "nim-mode";
-        version = "20160202.2209";
+        version = "20160219.924";
         src = fetchFromGitHub {
           owner = "nim-lang";
           repo = "nim-mode";
-          rev = "9e119eba89ad1574a129b7502d14237ec9f54825";
-          sha256 = "1wlfar160gs7ar6kl6and3jv8k75wj2f189ygbawyag4dyq5a9h2";
+          rev = "b75968ee3191861110d0e5a6bedca5d698e6fd44";
+          sha256 = "0hag9mzy9h4nnbqggzwfn2p31m5p7vx0qqfgpm0z9qbbxcf49w00";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nim-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nim-mode";
           sha256 = "1kzn3kkkj7jzs7fqhvib196sl3vp7kbhb4icqzmvvmv366lkaib6";
           name = "nim-mode";
         };
@@ -38056,11 +38490,11 @@
         src = fetchFromGitHub {
           owner = "martine";
           repo = "ninja";
-          rev = "8028e91a9dc90b51b4da7ded70cc38234ed62451";
-          sha256 = "0zkm6ddsrwbp2fvw80y6mgvihr24nvf1d6pjb784qvmil716fm3j";
+          rev = "d1763746b65cc7349d4ed9478befdb651aa24589";
+          sha256 = "0n64966sb8lyy4gcasmnmsjni7viabwrq1f2gwbvlbcq7mrpqvnj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ninja-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ninja-mode";
           sha256 = "1m7f25sbkz8k343giczrnw2ah5i3mk4c7csi8kk9x5y16030asik";
           name = "ninja-mode";
         };
@@ -38077,11 +38511,11 @@
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "c780c1124ec6711f09b9855c3b574b6655af6625";
-          sha256 = "1nps30kq70zy81690wsr80khaqgds0awx8hd7wzl6xcs56zjq07x";
+          rev = "4f011bccf87a494586039a773548be94d6365467";
+          sha256 = "1bly30ds9kbpq877fdqnfmpb9grdycllzx6wy4bcxy3258m7pq3d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nix-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nix-mode";
           sha256 = "00rqawi8zs2x79c91gmk0anfyqbwalvfwmpak20i11lfzmdsza1s";
           name = "nix-mode";
         };
@@ -38091,18 +38525,39 @@
           license = lib.licenses.free;
         };
       }) {};
-    nixos-options = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    nix-sandbox = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
-        pname = "nixos-options";
-        version = "20151013.1809";
+        pname = "nix-sandbox";
+        version = "20160214.418";
         src = fetchFromGitHub {
           owner = "travisbhartwell";
           repo = "nix-emacs";
-          rev = "6b1418611b49a6cf77380a76f7e6236bbb5df83a";
-          sha256 = "0ia9wgn33znaviy7ilfm83yfalc2dbpm1g7nvss5s4rznqkdfhn3";
+          rev = "63061d379460c53abbe88ec695a61e22feae438f";
+          sha256 = "100vjppa6nipn227v871nkmjmqln2l1lv1v8in1lcjhsz4rxrhs9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nix-sandbox";
+          sha256 = "13zr0jbc6if2wvyiplay2gkd5548imfm38x1qy1dw6m2vhbzwp0k";
+          name = "nix-sandbox";
+        };
+        packageRequires = [ dash s ];
+        meta = {
+          homepage = "http://melpa.org/#/nix-sandbox";
+          license = lib.licenses.free;
+        };
+      }) {};
+    nixos-options = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "nixos-options";
+        version = "20160209.1241";
+        src = fetchFromGitHub {
+          owner = "travisbhartwell";
+          repo = "nix-emacs";
+          rev = "63061d379460c53abbe88ec695a61e22feae438f";
+          sha256 = "100vjppa6nipn227v871nkmjmqln2l1lv1v8in1lcjhsz4rxrhs9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nixos-options";
           sha256 = "1m3jipidk10zj68rzjbacgjlal31jf80gqjxlgj4qs8lm671gxmm";
           name = "nixos-options";
         };
@@ -38123,7 +38578,7 @@
           sha256 = "1skbjmyikzyiic470sngskggs05r35m8vzm69wbmrjapczginnak";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nm";
           sha256 = "004rjbrkc7jalbd8ih170sy97w2g16k3whqrqwywh09pzrzb05kw";
           name = "nm";
         };
@@ -38144,7 +38599,7 @@
           sha256 = "0gzxcq0gki89dz9ad26683zhq1nif3wdz185cdplwy68z9szbdx1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nnir-est";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nnir-est";
           sha256 = "04ih47pipph8sl84nv6ka4xlpd8vhnpwhs5cchgk5k1zv3l5scxv";
           name = "nnir-est";
         };
@@ -38165,7 +38620,7 @@
           sha256 = "0wk86gm0by9c8mfbvydz5va07qd30n6wx067inqfa7wjffaq0xr7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/noccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/noccur";
           sha256 = "0a8l50v09bgap7rsls808k9wyjpjbcxaffsvz7hh9rw9s7m5fz5g";
           name = "noccur";
         };
@@ -38186,7 +38641,7 @@
           sha256 = "1a1pp3sd5g4wkhywb5jfchcdpjsjb0iyhk2sxvd0gpc4kk4zh6xs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/noctilux-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/noctilux-theme";
           sha256 = "15ymyv3rq0n31d8h0ry0l4w4r5a8as0q63ajm9wb6yrxxjl1imfp";
           name = "noctilux-theme";
         };
@@ -38207,7 +38662,7 @@
           sha256 = "1cgmq00ackabwcl4h0n2bb8y08wz0ir5rzca2q3sk4asly6d02m7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/node-resolver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/node-resolver";
           sha256 = "1ng4rgm8f745fajqnbjhi2rshvn6icwdpbh5dzpzhim1w9kb3bhh";
           name = "node-resolver";
         };
@@ -38228,7 +38683,7 @@
           sha256 = "03vcs458rcn1hgfvmgmijadjvri7zlh2z4lxgaplzfnga13mapym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nodejs-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nodejs-repl";
           sha256 = "0rvhhrsw87kfrwdhm8glq6b3nr0v90ivm7fcc0da4yc2jmcyk907";
           name = "nodejs-repl";
         };
@@ -38249,7 +38704,7 @@
           sha256 = "0g70gnmfi8n24jzfci9nrj0n9bn1qig7b8f9f325rin8h7x32ypf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/noflet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/noflet";
           sha256 = "0vzamqb52n330mi6rydrd4ls8nbwh5s42fc2gs5y15zakp6mvhr3";
           name = "noflet";
         };
@@ -38268,7 +38723,7 @@
           sha256 = "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nose";
           sha256 = "0l77hsmn3qk934ppdav1gy9sq48g0v1dzc5qy0rp9vv4yz2jx2jk";
           name = "nose";
         };
@@ -38280,14 +38735,14 @@
       }) {};
     notmuch = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "notmuch";
-        version = "20160108.632";
+        version = "20160220.652";
         src = fetchgit {
           url = "git://git.notmuchmail.org/git/notmuch";
-          rev = "1fcbf095828dc91423f61a290887fe244750bf8a";
-          sha256 = "b53261201a0541c81ec91f5289d194e04bc80e78c5583ab478c4c7bdd7f4d543";
+          rev = "c689d1ff13ed48507230ca7035021ce42d3dcd64";
+          sha256 = "077a58f04748f71f99da39c3609497a16dbfccf93b8ce70470eda0239d7f832b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/notmuch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/notmuch";
           sha256 = "1sy9k6xbfl035qhnp8sdq9cb3xvgw3lkmdczyd6fw6yrzm5n0g1r";
           name = "notmuch";
         };
@@ -38308,7 +38763,7 @@
           sha256 = "1ss87vlp7625lnn2iah3rc1xfxcbpx4kmiww9n16jx073fs2rj18";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/notmuch-labeler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/notmuch-labeler";
           sha256 = "1c0cbkk5k8ps01xl63a0xa2adkqaj0znw8qs8ca4ai8v1420bpl0";
           name = "notmuch-labeler";
         };
@@ -38326,7 +38781,7 @@
           sha256 = "0mmdf3z9299hbs3wr8hqgpmg74sb2xm0rxyh38sjcqmk8f310rqh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/novice+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/novice+";
           sha256 = "0r4w4c6y4fny8k0kipzqjsn7idwbi9jq6x9yw51d41ra3pkpvfzf";
           name = "novice-plus";
         };
@@ -38347,7 +38802,7 @@
           sha256 = "0jahr1380919p272srym1pp16ifdz69fn1m45ppglm54q4a741d8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/noxml-fold";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/noxml-fold";
           sha256 = "11dninxxwhflf2qrmvwmrryspd9j6m95kdlmyx59ykqvw8j0siqc";
           name = "noxml-fold";
         };
@@ -38368,7 +38823,7 @@
           sha256 = "1nwj1ax2qmmlab4lik0b7japhqd424d0rb995dfv89p99gp8vmvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nrepl-eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nrepl-eval-sexp-fu";
           sha256 = "17g4nih9kz2483ylp651lwfxkvmaj7wpinpgnifwbciyrplfvx2j";
           name = "nrepl-eval-sexp-fu";
         };
@@ -38389,7 +38844,7 @@
           sha256 = "1129r3rzmfbl8nxjz71xnlyaszhhldawj467zbl36brdadp014n1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nrepl-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nrepl-sync";
           sha256 = "01b504b4d8rrhlf3sfq3kk9i222fch6jd5jbm02kqw20fgv6q3jd";
           name = "nrepl-sync";
         };
@@ -38410,7 +38865,7 @@
           sha256 = "1w80mbwlvmpd5ff7vy84z61b27klzh9z4wa6m2g7cy674fw4r1xp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nsis-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nsis-mode";
           sha256 = "0pc047ryw906sz5mv0awvl67kh20prsgx6fbh0j1qm0cali2792l";
           name = "nsis-mode";
         };
@@ -38431,7 +38886,7 @@
           sha256 = "0nbmpnljl0wdkwmxzg6lqd3mand9w043qmwp727hb84gxy0j4dib";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nu-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nu-mode";
           sha256 = "0h5jaw577vgm3hfiwc2c0k1wn8zda8ps06vj6mqj952m8bqhf4i7";
           name = "nu-mode";
         };
@@ -38452,7 +38907,7 @@
           sha256 = "045m83rdqryjpqh6y9s6x0yf9fw9xrwmxbm4qgg8ka164x9szv0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/number";
           sha256 = "1nwcdv5ibirxx3sqadh6mnpj40ni3wna7wnjh343mx38dk2dzncf";
           name = "number";
         };
@@ -38473,7 +38928,7 @@
           sha256 = "1i0yymsx8kin28bkrgwkk9ngsmjh0gh5j4hb0k03bq4fy799f2xx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nummm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nummm-mode";
           sha256 = "10khhc6q0zjzrhsv4fgfdbs7qcwi1bgkwq4yqzidqcdndsailyh0";
           name = "nummm-mode";
         };
@@ -38494,7 +38949,7 @@
           sha256 = "0prag0ks511ifa5mdpqmizp5n8190dxp4vdr81ld9w9xv7migpd7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nvm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nvm";
           sha256 = "03gy7wavc2q02lnr9pmp3l1pn0lzbdq0kwnmg9fvklmq6r6n3x34";
           name = "nvm";
         };
@@ -38515,7 +38970,7 @@
           sha256 = "1v8ndr8hdbqhd7nca8882g05y36pigv6lj7hpxl50lr1lvp1kmmf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nyan-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nyan-mode";
           sha256 = "1z2wnsbjllqa533g1ab5cgbv3d9hjix7fsd7z9c45nqh5cmadmyv";
           name = "nyan-mode";
         };
@@ -38536,7 +38991,7 @@
           sha256 = "0bgspjy8h3d7v12sfjnd2ghj4183pdf0z48g5xs129jwd3nycykp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nyan-prompt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nyan-prompt";
           sha256 = "1s0qyhpfpncsv9qfxy07rbp4gv8pp5xzb48rbd3r14nkjlnylnfb";
           name = "nyan-prompt";
         };
@@ -38557,7 +39012,7 @@
           sha256 = "0xs6787a4v7djgd2zz2v1pk14x27mg2ganz30j9f0gdiai7da6ch";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/o-blog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/o-blog";
           sha256 = "08grkyvg27wd5232q3y8p0v7higfq7bmsdzmvhja96v6qy2xsbja";
           name = "o-blog";
         };
@@ -38578,7 +39033,7 @@
           sha256 = "058dyk1c3iw0ip8n8rfpskvqiriqilpclkzc18x73msp5svrh3lj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/oauth";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/oauth";
           sha256 = "18z3i5brxm60z373cwx2sa3hx7v38a5s62gbs9b0lxb20ah4p9rz";
           name = "oauth";
         };
@@ -38598,7 +39053,7 @@
           sha256 = "1qq0b92mf73fnx2viwzlsxr6672wkskf0vjimymyhv9aq3gw165w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-axiom";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-axiom";
           sha256 = "12cmzhgzk8314y6nvzdjwidalccz6h440lil83c1h4lz4ddlwmf6";
           name = "ob-axiom";
         };
@@ -38619,7 +39074,7 @@
           sha256 = "1nzli8wk3nd05j2z2fw511857qbawirhg8mfw21wqclkz8zqn813";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-browser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-browser";
           sha256 = "1yqbzmmazamgf8fi8ipq14ffm8h1pp5d2lkflbxjsagdq61hirxm";
           name = "ob-browser";
         };
@@ -38640,7 +39095,7 @@
           sha256 = "1xbczyqfqdig5w6jvx2kg57mk16sbiz5ysv445v83wqk0sz6nc9n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-cypher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-cypher";
           sha256 = "1ygmx0rjvxjl8hifkkwrkk9gpsmdsk6ndb6pg7y78p8hfp5jpyq3";
           name = "ob-cypher";
         };
@@ -38661,7 +39116,7 @@
           sha256 = "0qknm1h2ijnzs1km51hqwpnv5083m9ngi3nbxd90r7d6vva5fhhk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-elixir";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-elixir";
           sha256 = "1l5b9hww2vmqnjlsd6lbjpz9walck82ngang1amfnk4xn6d0gdhi";
           name = "ob-elixir";
         };
@@ -38671,18 +39126,39 @@
           license = lib.licenses.free;
         };
       }) {};
+    ob-go = callPackage ({ fetchFromGitHub, fetchurl, go-mode, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ob-go";
+        version = "20151211.1801";
+        src = fetchFromGitHub {
+          owner = "pope";
+          repo = "ob-go";
+          rev = "70684286f7344eaa30c47a680a81b74b0d11ea36";
+          sha256 = "0iwyldw8pfy88hvzrqmh9fbx8zj092ycl9wjf9ddji2zxnm44499";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-go";
+          sha256 = "09d8jrzijf8gr08615rdmf366zgip43dxvyihy0yzhk7j0p3iahj";
+          name = "ob-go";
+        };
+        packageRequires = [ go-mode ];
+        meta = {
+          homepage = "http://melpa.org/#/ob-go";
+          license = lib.licenses.free;
+        };
+      }) {};
     ob-http = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "ob-http";
-        version = "20160128.423";
+        version = "20160210.458";
         src = fetchFromGitHub {
           owner = "zweifisch";
           repo = "ob-http";
-          rev = "149a921b0a18ae765afaaa8d3b792a0f25b94faf";
-          sha256 = "14jpr8igxgs8gwcr2w13hnis66qlyjgmcn7fibvyprrpg8z69xak";
+          rev = "e10b35accd4c758d781ab9f6e00b7b792dccf380";
+          sha256 = "0bqr6yl1hpykpykjpfb247xnpnz510zrg9yv7nkxlrig4pjgdcx1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-http";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-http";
           sha256 = "0b7ghz9pqbyn3b52cpmnwa2wnd4svj23p6gc48ybwzwiid42wiss";
           name = "ob-http";
         };
@@ -38703,7 +39179,7 @@
           sha256 = "0r5p2gr7ri4w79lmhil4fgh6g8cmxs1qp8glkbvycvlaxwrzszhs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-ipython";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-ipython";
           sha256 = "06llf365k8m81ljmlajqvxlh84qg6h0flp3m6gb0zx71xilvw186";
           name = "ob-ipython";
         };
@@ -38724,7 +39200,7 @@
           sha256 = "01cjwg27m0iqndkwwl0v5w8vvk270xvi81za3y5hyrmb7dq6bfy7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-kotlin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-kotlin";
           sha256 = "19g4s9dnipg9aa360mp0affmnslm6h7byg595rnaz6rz25a3qdpx";
           name = "ob-kotlin";
         };
@@ -38745,7 +39221,7 @@
           sha256 = "1mk7qcf4svf4yk4mimcyhbw5imq3zps2vh2zzq9gwjcn17jnplhn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-lfe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-lfe";
           sha256 = "11cpaxk9wb27b9zhyns75dqpds4gh3cbjcvia4p2bnvmbm8lz4y8";
           name = "ob-lfe";
         };
@@ -38766,7 +39242,7 @@
           sha256 = "0qibnn908a59jyfslsnpjanbm85f8xw9zywsqsh37nv27ncbx0hr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-mongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-mongo";
           sha256 = "1cgmqsl5dzi8xy3sh5xsfkczl555fpd4q6kgsh9xkn74sz227907";
           name = "ob-mongo";
         };
@@ -38787,7 +39263,7 @@
           sha256 = "14scbds1rlmii52i0zr3s0r1wmga7qysj63c2dpinhagxa36d51n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-prolog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-prolog";
           sha256 = "0ki8yd20yk5xwn0zpk06zjxzgrsf8paydif9n98svb9s2l9wrh1s";
           name = "ob-prolog";
         };
@@ -38808,7 +39284,7 @@
           sha256 = "18b5k02mnswsv6jijvh9kb5ps5r0imkvr9r3r3x8fkyjh3k4f5il";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-restclient";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-restclient";
           sha256 = "0nv2wsqmpschym6ch8fr4a79hlnpz31jc8y2flsygaqj0annjkfk";
           name = "ob-restclient";
         };
@@ -38818,6 +39294,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ob-scala = callPackage ({ ensime, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ob-scala";
+        version = "20160209.835";
+        src = fetchFromGitHub {
+          owner = "reactormonk";
+          repo = "ob-scala";
+          rev = "e30cf06dc849f230db5ca57ec0e1f5281715942f";
+          sha256 = "1ax78ggmzz4lmaw62j0cm8l0n60nyhp6c8f02mdszvv6vnpvyncm";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-scala";
+          sha256 = "1cjbdfxkj5rk164wrad7r470xynfjjaa1aj130zbw9zmn36m6lza";
+          name = "ob-scala";
+        };
+        packageRequires = [ ensime ];
+        meta = {
+          homepage = "http://melpa.org/#/ob-scala";
+          license = lib.licenses.free;
+        };
+      }) {};
     ob-sml = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, sml-mode }:
     melpaBuild {
         pname = "ob-sml";
@@ -38829,7 +39326,7 @@
           sha256 = "0gymna48igcixrapjmg842pnlsshhw8zplxwyyn0x2yrma9fjyyg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-sml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-sml";
           sha256 = "04qvzhwjr8ipvq3znnhn0wbl4pbb1rwxi90iidavzk3phbkpaskn";
           name = "ob-sml";
         };
@@ -38850,7 +39347,7 @@
           sha256 = "1yaqs6zcx8228pwzsm19h6272bw9lhib6xz5xzzq8x8n54l81225";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-translate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-translate";
           sha256 = "1hi0rxbyxvk9sbk2fy3kqw7l4lgri921vya1mn4i1q2i1979r2gz";
           name = "ob-translate";
         };
@@ -38871,7 +39368,7 @@
           sha256 = "1ycqdjqn5361pcnc95hxhjqd3y96cjjnaylrnzwhmacl38jm3vai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-typescript";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-typescript";
           sha256 = "1wpy928ndvc076jzi14f6k5fsw8had0pz7f1yjdqql4icszhqa0p";
           name = "ob-typescript";
         };
@@ -38892,7 +39389,7 @@
           sha256 = "16462cgq91jg7i97h440zss5vw2qkxgdy7gm148ns4djr2fchnf6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/oberon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/oberon";
           sha256 = "1wna7ld670r6ljdg5yx0ga0grbq1ma8q92gkari0d5czr7s9lggv";
           name = "oberon";
         };
@@ -38913,7 +39410,7 @@
           sha256 = "138c1nm579vr37dqprqsakfkhs2awm3klzyyd6bv9rhkrysrpbqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/objc-font-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/objc-font-lock";
           sha256 = "0njslpgdcph3p3gamrbd6pc04szks07yv4ij3p1l7p5dc2p06rs6";
           name = "objc-font-lock";
         };
@@ -38934,7 +39431,7 @@
           sha256 = "00v21iw9wwxap8jhg9035cp47fm5v2djmldq6nprv860m01xlwh1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/obsidian-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/obsidian-theme";
           sha256 = "17ckshimdma6fqiis4kxczxkbrsfpm2a0b41m5f3qz3qlhcw2xgr";
           name = "obsidian-theme";
         };
@@ -38955,7 +39452,7 @@
           sha256 = "0pnliw02crqw8hbg088klz54z6s1ih8q2lcn9mq5f12xi752hxm8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/occidental-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/occidental-theme";
           sha256 = "1ra5p8k96wvb04v69xm87jl4jlgi57v4jw2xxzkwbwxbydncnv0b";
           name = "occidental-theme";
         };
@@ -38976,7 +39473,7 @@
           sha256 = "1v1c2481v2xgnw8kgbbqhqkdd41lzvki9hm3iypbf3n0jxz8nnzy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/occur-context-resize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/occur-context-resize";
           sha256 = "0sp5v4rwqgqdj26gdkrmjvkmbp4g6jq4lrn2c3zm8s2gq0s3l6ri";
           name = "occur-context-resize";
         };
@@ -38997,7 +39494,7 @@
           sha256 = "1zj0xhvl5qx42injv0av4lyzd3jsjls1m368dqd2qnswhfw8wfn6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/occur-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/occur-x";
           sha256 = "1xq1k9rq7k1zw90shbgiidwvcn0ys1d53q03b5mpvvfqhj4n0i1g";
           name = "occur-x";
         };
@@ -39018,7 +39515,7 @@
           sha256 = "155gmls6cz3zf4lcj89kzb96y7k0glx0f659jg5z0skgxq79hf48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ocodo-svg-modelines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ocodo-svg-modelines";
           sha256 = "0fa88ns70wsr9i9gf4zx3fvmn1a32mrjsda105n0cx6c965kfmay";
           name = "ocodo-svg-modelines";
         };
@@ -39035,11 +39532,11 @@
         src = fetchFromGitHub {
           owner = "OCamlPro";
           repo = "ocp-indent";
-          rev = "a463bee9088178f429022d1c6c4db216178384e9";
-          sha256 = "0p3wsxkj9jpnxanl6r8glf9wvyjbf5z24idvaa1j07whlq68bcrq";
+          rev = "267a6fdb9cac9a6afa1fe645e0a6bc54ff4f4168";
+          sha256 = "00fm6xg3q7d0vrx5wdg9badv587g4v9k3szwj00wscn9jb0bjhd3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ocp-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ocp-indent";
           sha256 = "0wc4z9dsnnyr24n3vg1npvc3rm53av8bpbvrl8kldxxdiwgnbkjw";
           name = "ocp-indent";
         };
@@ -39060,7 +39557,7 @@
           sha256 = "0dp7dhmgrq078rjhpm1cr993qjqz7qgy2z4sn73qw6j55va7d9kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/octicons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/octicons";
           sha256 = "02f37bvnc5qvkvfbyx5wp54nz71bqm747mq1p5361sx091lllkxk";
           name = "octicons";
         };
@@ -39081,7 +39578,7 @@
           sha256 = "0p9ph62vnw1r9dbvrjyw356a9bjnzh0hglssi97dr0qd6cs8whf3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/octopress";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/octopress";
           sha256 = "0zsir6chjvn5i1irmf5aj6mmb401c553r5wykq796sz7jnjhrjg0";
           name = "octopress";
         };
@@ -39102,7 +39599,7 @@
           sha256 = "1bjrgj8klg7ly63vx90jpaih9virn02bhqi16p6z0mw36q1q7ysq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/offlineimap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/offlineimap";
           sha256 = "0nza7lrz7cn06njcblwh9hy3050j8ja4awbxx7jzv6nazjg7201b";
           name = "offlineimap";
         };
@@ -39123,7 +39620,7 @@
           sha256 = "0y9fxrsxp1158fyjp4f69r7g2s7b6nbxlsmsb8clwqc8pmmg2z82";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/oldlace-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/oldlace-theme";
           sha256 = "1pxiqqh5x4wsayqgwplzvsbalbj44zvby7x0pijdvwcnsh74znj8";
           name = "oldlace-theme";
         };
@@ -39144,7 +39641,7 @@
           sha256 = "1mh4dlx5j2zwv7zx8x52vl6h38jr41ly5bn6zqsncnafd1a8l7x7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/olivetti";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/olivetti";
           sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd";
           name = "olivetti";
         };
@@ -39165,7 +39662,7 @@
           sha256 = "03szb2i2xk3nq578cz1drsddsbld03ryvykdfzmfvwcmlpaknvzb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/om-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/om-mode";
           sha256 = "1q2h9wjnyg7wlk913px4vj1cxqynd6xfh9ind7kjyra436yw3l4j";
           name = "om-mode";
         };
@@ -39186,7 +39683,7 @@
           sha256 = "1925mh47n4x9v780qp5l6cksl64v9mpyb87znsg93x6sxr0cvv4c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omni-kill";
           sha256 = "03kydl16rd9mnc1rnan2byqa6f70891fhcj16wkavl2r68rfj75k";
           name = "omni-kill";
         };
@@ -39207,7 +39704,7 @@
           sha256 = "1nvgh9wvgswcs3r958b579rsx540xrhlnafc6cmcd63z6yck19w0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omni-log";
           sha256 = "0c29243zq8r89ax4rxlmb8imag12icnldcb0q0xsnhjccw8lyw1r";
           name = "omni-log";
         };
@@ -39228,7 +39725,7 @@
           sha256 = "1x8af8jv4n83sl4rgj0d2rpmw9g78rknm1h523f3b1a5x4kdvsz6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-quotes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omni-quotes";
           sha256 = "0dqki0ibabs9cpcjvnh8lc2114x46i1xmnyjc6qqblfxa3ggdygs";
           name = "omni-quotes";
         };
@@ -39249,7 +39746,7 @@
           sha256 = "1icdk19vwihc8mn04yxl2brql2gssn3gxd5bv7ljdd6mn5hkw500";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omni-scratch";
           sha256 = "190dkqcw8xywzrq8a99w4rqi0y1h2aj23s84g2ln1sf7jaf6d6n9";
           name = "omni-scratch";
         };
@@ -39270,7 +39767,7 @@
           sha256 = "1lvnkdrav7h15p8d5ayhfsjynllwp4br1vqxmw0ppxnlyq7337n5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-tags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omni-tags";
           sha256 = "133ww1jf14jbw02ssbx2a46mp52j18a2wwzb6x77azb0akmf1lzl";
           name = "omni-tags";
         };
@@ -39291,7 +39788,7 @@
           sha256 = "1hzvpajq58py6k7z2rwwax1c7pm65m534mq8mr9g9kxn9hqiz9n8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omniref";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omniref";
           sha256 = "0lgw1knqppdg046zqx4m7nbzvsasr89wa9i4594hf46w1094dabj";
           name = "omniref";
         };
@@ -39312,7 +39809,7 @@
           sha256 = "1iq8yzjv7wb0jfi3lqqyx4n7whvb7xf8ls0q0w7pgsrsslrxbwcm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omnisharp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omnisharp";
           sha256 = "0dwya22y92k7x2s223az1g8hmrpfmk1sgwbr9z47raaa8kd52iad";
           name = "omnisharp";
         };
@@ -39331,6 +39828,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    omtose-phellack-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "omtose-phellack-theme";
+        version = "20160212.547";
+        src = fetchFromGitHub {
+          owner = "franksn";
+          repo = "omtose-phellack-theme";
+          rev = "33c7f6a96bf9aaf7e46939a38e821bab9466958a";
+          sha256 = "0jpxnfxgc7xpbk6894hygbr5qq6wkvy866l87jrprj8klvp2c0b9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omtose-phellack-theme";
+          sha256 = "09nyc7sdhzy4vmngzdj6r7cv2nbbwqlcyyi2mcg5a8lml4f6fj5i";
+          name = "omtose-phellack-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/omtose-phellack-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     on-parens = callPackage ({ dash, emacs, evil, fetchFromGitHub, fetchurl, lib, melpaBuild, smartparens }:
     melpaBuild {
         pname = "on-parens";
@@ -39342,7 +39860,7 @@
           sha256 = "1616bdvrf1bawcqgj7balbxaw26waw81gxiw7yspnvpyb009j66y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/on-parens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/on-parens";
           sha256 = "19kyzpkgfl0ipbcgnl8fbfbapnfdxr8w9i7prfkm6rjp6amxyqab";
           name = "on-parens";
         };
@@ -39363,7 +39881,7 @@
           sha256 = "1rksk0j9b27w913bzbq7w2ws75yi66m24ic6ljdhhbrq3z2ic7dy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/on-screen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/on-screen";
           sha256 = "104jisc2bckzrajxlvj1cfx1drnjj7jhqjblvm89ry32xdnjxmqb";
           name = "on-screen";
         };
@@ -39381,7 +39899,7 @@
           sha256 = "05njigqi9061d34530d76kwsdzqgk9qxnwhn9xis64w59f5nzf1h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/oneonone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/oneonone";
           sha256 = "0v4nvhzgq97zbi18jd3ds57yh1fpv57b2a1cd7r8jbxwaaz3gpg9";
           name = "oneonone";
         };
@@ -39402,7 +39920,7 @@
           sha256 = "1yqrp9icci5snp1485wb6y8mr2hjp9006ahch58lvmnq98bn7j45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/opam";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/opam";
           sha256 = "004r93nn1ranvxkcc0y5m3p8gh4axgghgnsvim38nc1sqda5h6xa";
           name = "opam";
         };
@@ -39420,7 +39938,7 @@
           sha256 = "1vjmgayksdgg54b46aqmvhd7a9arjx9p3jyrjs2z9262f6r288lj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/open-junk-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/open-junk-file";
           sha256 = "0ybycprs5di9niai4hbmfq4xdacfgrzf1mwq1aj1hi53phl8l4di";
           name = "open-junk-file";
         };
@@ -39430,6 +39948,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    opencl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "opencl-mode";
+        version = "20160220.1109";
+        src = fetchFromGitHub {
+          owner = "salmanebah";
+          repo = "opencl-mode";
+          rev = "14109a4bb56105a9c052ae49ad4c638b4cc210b2";
+          sha256 = "0n64l1jrrk60g192nn0240qcv2p9r138mi9gb38qq5k65wffbc21";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/opencl-mode";
+          sha256 = "1g351wiaycwmg1bnf4s2mdnc3lb2ml5l54g19184xqssfqlx7y79";
+          name = "opencl-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/opencl-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     openstack-cgit-browse-file = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "openstack-cgit-browse-file";
@@ -39441,7 +39980,7 @@
           sha256 = "0086pfk4pq6xmknk7a42fihcjgzkcplqqc1rk9fhwmn9j7djbq70";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/openstack-cgit-browse-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/openstack-cgit-browse-file";
           sha256 = "05dl28a4npnnzzipypfcqb21sdww715lwji2xnsabx3fb1h1w5jl";
           name = "openstack-cgit-browse-file";
         };
@@ -39460,7 +39999,7 @@
           sha256 = "1wl6gnxsyhaad4cl9bxjc0qbc5jzvlwbwjbajs0n1s6qr07d6r01";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/openwith";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/openwith";
           sha256 = "05lkx3yfv2445fp07bhqv2aqz5hgf3dxp39lmz3nfxn4c9v8nkqi";
           name = "openwith";
         };
@@ -39481,7 +40020,7 @@
           sha256 = "0iw3c8sn702ziki59mvd5gxm484i7f0bwsy8fz95y08s9gknjjf9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/operate-on-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/operate-on-number";
           sha256 = "1rw3fqbzfizgcbz3yaf99rr2546msna4z7dyfa8dbi8h7yzl4fhk";
           name = "operate-on-number";
         };
@@ -39502,7 +40041,7 @@
           sha256 = "1xckin2d6s40kgr2293g72ipc57f8gp6y63303kmqcv3qm8q13ca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-ac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-ac";
           sha256 = "059jr3v3558cgw626zbqfwmwwv5f4637ai26h7b6psqh0x9sf3mr";
           name = "org-ac";
         };
@@ -39523,7 +40062,7 @@
           sha256 = "15xgkm5p30qfghyhkjivh5n4770794qf4pza462vb0xl5v6kffbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-agenda-property";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-agenda-property";
           sha256 = "0zsjzjw52asl609q7a2s4jcsm478p4cxzhnd3azyr9ypxydjf6qk";
           name = "org-agenda-property";
         };
@@ -39544,7 +40083,7 @@
           sha256 = "0yzvir2gmyv9k43q3sf37lc9xcmfyaj5wh825xax7305j3b2hhvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-alert";
           sha256 = "0n5a24iv8cj395xr0gfgi0hs237dd98zm2fws05k47vy3ygni152";
           name = "org-alert";
         };
@@ -39565,7 +40104,7 @@
           sha256 = "0f4ja4m1r6bbgachipswb2001ryg8cqcxjvwmnab951mw0cbg7v4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-attach-screenshot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-attach-screenshot";
           sha256 = "0108kahyd499q87wzvirv5d6p7jrb7ckz8r96pwqzgflj3njbnmn";
           name = "org-attach-screenshot";
         };
@@ -39586,7 +40125,7 @@
           sha256 = "0j6fqgzvbmvvdh0dgwsxq004wxys2zwnq9wa3idm087ynp2a2ani";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-autolist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-autolist";
           sha256 = "1jvspxhxlvd7h1srk9dbk1v5dykmf8jsjaqicpll7ial6i0qgikj";
           name = "org-autolist";
         };
@@ -39607,7 +40146,7 @@
           sha256 = "00iklf97mszrsdv20q55qhml1dscvmmalpfnlkwi9mabklyq3i6z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-beautify-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-beautify-theme";
           sha256 = "1j2gi3f72kvavdcj6xs7zng0dcnivrhc7pjzm2g4mjm5ad5s1flq";
           name = "org-beautify-theme";
         };
@@ -39628,7 +40167,7 @@
           sha256 = "10nr4sjffnqbllv6gmak6pviyynrb7pi5nvrq331h5alm3xcpq0w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-bullets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-bullets";
           sha256 = "1kxhlabaqi1g6pz215afp65d9cp324s8mvabjh7q1h7ari32an75";
           name = "org-bullets";
         };
@@ -39649,7 +40188,7 @@
           sha256 = "0lq2rx6wgz0aymwhw597xs2pabinhk3jpnnhjwq0jk8ggp3afqaz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-caldav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-caldav";
           sha256 = "0166y04gxrwnynm4jshm2kqk5jbvl5g5078dxvw18nicrgq3y4r8";
           name = "org-caldav";
         };
@@ -39670,7 +40209,7 @@
           sha256 = "1g9fanikdcbkmvbh9bp5dg3s2maawkqinjavn5158p0gy68ab240";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-cliplink";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-cliplink";
           sha256 = "19l3k9w9csgvdr7n824bzg7jja0f28dmz6caldxh43vankpmlg3p";
           name = "org-cliplink";
         };
@@ -39680,6 +40219,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-clock-convenience = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
+    melpaBuild {
+        pname = "org-clock-convenience";
+        version = "20160217.306";
+        src = fetchFromGitHub {
+          owner = "dfeich";
+          repo = "org-clock-convenience";
+          rev = "49450ede58660f0bd51337a0770aebef46ea58b8";
+          sha256 = "0l0r44brs3fcgpjjirfrbf5cgxmsc0siqakv5mlvmr64xd1vi2lw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-clock-convenience";
+          sha256 = "1zis0fp7q253qfxypm7a69zb3w8jb4cbrbj2rk34d1jisvnn4irw";
+          name = "org-clock-convenience";
+        };
+        packageRequires = [ cl-lib emacs org ];
+        meta = {
+          homepage = "http://melpa.org/#/org-clock-convenience";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-context = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-context";
@@ -39691,7 +40251,7 @@
           sha256 = "0q4v216ihhwv8rlb9xc8xy7nj1p058xabfflglhgcd7mfjrsyayx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-context";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-context";
           sha256 = "19y8aln7wix9p506ajvfkl641147c5mdmjm98jnq68cx2r4wp6zz";
           name = "org-context";
         };
@@ -39712,7 +40272,7 @@
           sha256 = "0nrfvmqb70phnq0k4wbdj6z666wq6xvabg4pgv8qn62rbrw4yyhm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-cua-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-cua-dwim";
           sha256 = "0p7v564p8n1hm7rzlrbm2pnhyha8aif2r9g7g4kg0iqln89f5yhc";
           name = "org-cua-dwim";
         };
@@ -39733,7 +40293,7 @@
           sha256 = "1nqfi139cag3ll8wxk8rh59hay97vi8i0mlgnams4jla285zydj5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-dashboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-dashboard";
           sha256 = "1hvhhbmyx12wsf2n1hd0hg5cy05zyspd82xxcdh04g4s9r3ikqj5";
           name = "org-dashboard";
         };
@@ -39754,7 +40314,7 @@
           sha256 = "1wrgqdrfdxc1vrcr6dsa8dcxrwj6zgjr9h1fzilwnxlzfvdilnsm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-doing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-doing";
           sha256 = "17w49z78fvbz182sxv9mnryj124gm9jbdmbybppjqz4rk6wvnm2j";
           name = "org-doing";
         };
@@ -39775,7 +40335,7 @@
           sha256 = "15zrnd168n4pwa1bj5fz79hcrgw61braf0b095rsfhjh5w2sasy7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-dotemacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-dotemacs";
           sha256 = "1vc391fdkdqd4g0piq66zhrlgqx5s2ijv7qd1rc3a235sjb9i2n4";
           name = "org-dotemacs";
         };
@@ -39796,7 +40356,7 @@
           sha256 = "12k3iqzmj92cvi0d99mn3ylxj00p2f2f8049dd2nxnp1gxs2k4dq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-download";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-download";
           sha256 = "19yjx0qqpmrdwagp3d6lwwv7dcb745m9ccq3m29sin74f5p4svsi";
           name = "org-download";
         };
@@ -39806,6 +40366,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-dp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-dp";
+        version = "20160206.402";
+        src = fetchFromGitHub {
+          owner = "tj64";
+          repo = "org-dp";
+          rev = "ffd4a133f5b39235eaa00e4eb29fba9e8f72750c";
+          sha256 = "1a1j654n0if9yh74j7xwrjmsi3aiy1bw7nzzbqda1zd7qbr6r253";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-dp";
+          sha256 = "0fnrzpgw8l0g862j20yy4mw1wfcm2i04r6dxi4yd7yay8bw2i4yq";
+          name = "org-dp";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/org-dp";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-drill-table = callPackage ({ cl-lib ? null, dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, org-plus-contrib, s }:
     melpaBuild {
         pname = "org-drill-table";
@@ -39817,7 +40398,7 @@
           sha256 = "0m5c9x0vazciq6czpg5y9nr5yzjf6nl0qp5cfajv49cw2h0cwqyy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-drill-table";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-drill-table";
           sha256 = "1gb5b4hj4xr8nv8bxfar145i38zcic6c34gk98wpshvwzvb43r69";
           name = "org-drill-table";
         };
@@ -39838,7 +40419,7 @@
           sha256 = "0jjdsng7fm4wbhvd9naqzdfsmkvj1sf1d9rikprg1pd58azv6idx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-dropbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-dropbox";
           sha256 = "0qfvdz13ncqn7qaz03lwabzsnk62z6wqzlxlvdqv5xyllcy9m6ln";
           name = "org-dropbox";
         };
@@ -39859,7 +40440,7 @@
           sha256 = "0kqvwqmwnwg2h7r38fpjg6qlkcj9v8011df8nmsgs1w1mfdvnjsq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-ehtml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-ehtml";
           sha256 = "0n82fbd7aircqg2c9m138qfv8csrv0amhya3xlwswdkqn51vn3gw";
           name = "org-ehtml";
         };
@@ -39880,7 +40461,7 @@
           sha256 = "0va8wm319vvw7w0j102mx656icy3fi4mz3b6bxira6z6xl9b92s0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-elisp-help";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-elisp-help";
           sha256 = "0a4wvz52hkcw5nrml3h1yp8w97vg5jw22wnpfbb827zh7iwb259h";
           name = "org-elisp-help";
         };
@@ -39901,7 +40482,7 @@
           sha256 = "1mpdk34l08m53r7dk8qaza7kvscy9jxv7bjwc232s1xhgy3mcin5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-eww";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-eww";
           sha256 = "132asshgfpphjckd5vz1vcs18lj55mrqs1l4ggfa89rc6aj8xrca";
           name = "org-eww";
         };
@@ -39921,7 +40502,7 @@
           sha256 = "35000fb42e317ec1a6e6c7b448bfdec7ecf65fd9f5ab4723062513c3a4acba79";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-fstree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-fstree";
           sha256 = "11ddkfddmsy26mmhgw24757f753ssh056v9vxn89pxp4qypxidfz";
           name = "org-fstree";
         };
@@ -39942,7 +40523,7 @@
           sha256 = "0r5w85bflmky3xzwqr7g7x7srdm43i93vg0gqnhh6k0ldy7ypc06";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-gcal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-gcal";
           sha256 = "1mp6cm0rhd4r9pfvsjjp86sdqxjbbg7gk41zx0zf0s772smddy3q";
           name = "org-gcal";
         };
@@ -39963,7 +40544,7 @@
           sha256 = "0b57ik05iax2h3nrj96kysbk4hxmxlaabd0n6lv1xsayrlli3sj1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-gnome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-gnome";
           sha256 = "0c37gfs6xs0jbvg6ypd4z5ip1khm26wr5lxgmv1dzcc383ynzg0v";
           name = "org-gnome";
         };
@@ -39984,7 +40565,7 @@
           sha256 = "10jwqzs431mnwz717qdmcn0v8raklw41sbxbnkb36yrgznk8c09c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-grep";
           sha256 = "0kpgizy0zxnlmyh0prwdll62ri2c1l4sb0yrkl7yw17cr4gxmkkz";
           name = "org-grep";
         };
@@ -40005,7 +40586,7 @@
           sha256 = "1iyqv34b7q2k73srshcnpvfzcadq47w4rzkqp6m1d3ajk8x2vypq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-if";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-if";
           sha256 = "0h0jdyawz2j4mp33w85z8q77l37qid8palvw5n4z379qa0wr5h96";
           name = "org-if";
         };
@@ -40026,7 +40607,7 @@
           sha256 = "1n7l70pl9x6mh7dyyiihg4zi1advzlaq2x7vivhas1i2120884i6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-iv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-iv";
           sha256 = "1akhabp6mdw1h7zms6ahlfvwizl07fwsizwxpdzi4viggfccsfwx";
           name = "org-iv";
         };
@@ -40047,7 +40628,7 @@
           sha256 = "0whv8nsla93194jjpxrhlr6g230spdxbac8ibmzmyad075vx97z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-jekyll";
           sha256 = "0jh3rla8s8prprvhnlg0psdrj7swz7v6vf2xy1m6ff66p9saiv8i";
           name = "org-jekyll";
         };
@@ -40068,7 +40649,7 @@
           sha256 = "0b5f8qkyzh4jwj3kvbaj3m4dpjbvh1fql7v1nb9bi5n7iwkv3lxp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-jira";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-jira";
           sha256 = "11h7kbkf38p2xycw8hvabpaacp72xdgy8c7kzcgjb2a8qlbs5ifm";
           name = "org-jira";
         };
@@ -40089,7 +40670,7 @@
           sha256 = "15swkzq5v9jnpmsziy8mj9rkriilxrm1c24lbfg0a4pwax5nkzp9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-journal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-journal";
           sha256 = "078z9b9hxbvmmxib6098f49rn7n3d0v4x37p7xxb0v8cv4izlb4s";
           name = "org-journal";
         };
@@ -40110,7 +40691,7 @@
           sha256 = "1797pd264zn19zk93nifyw6pwk2a7wrpfir373qclk601yv2g5h8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-link-travis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-link-travis";
           sha256 = "0hj4x7cw7a3ry8xislkz9bnavy77z4cpmnvns02yi3gnib53mlfs";
           name = "org-link-travis";
         };
@@ -40123,15 +40704,15 @@
     org-linkany = callPackage ({ fetchFromGitHub, fetchurl, lib, log4e, melpaBuild, yaxception }:
     melpaBuild {
         pname = "org-linkany";
-        version = "20140314.1308";
+        version = "20160206.2211";
         src = fetchFromGitHub {
           owner = "aki2o";
           repo = "org-linkany";
-          rev = "ed4a6614b56c9baef31647ea728b3d5fae6ed3a2";
-          sha256 = "1bggz782ci0z6aw76v51ykbmfzh5g6cxh43w798as1152sn7im3p";
+          rev = "8cfe2f1a46e6654a79f56505349d1396263cecb3";
+          sha256 = "0lqxzmjxs80z3z90f66f3zfrdajiamdcwpvfv5j2w40js9xz4x37";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-linkany";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-linkany";
           sha256 = "0arjj3c23yqm1ljvbnl7v9cqvd9lbz4381g8f3jyqbafs25bdc3c";
           name = "org-linkany";
         };
@@ -40147,11 +40728,11 @@
         version = "20140107.719";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "99697abdb98f67d8fad90a2fd39316ea3c0982dd";
-          sha256 = "9124972a0892d6782da739102e0648af184f24c6a5ca0e24b7571d6a018356b5";
+          rev = "2b3c72e231de4bd5f9f1d3ddfeff45c1edd901dd";
+          sha256 = "096532e2cd59fe5d54ffe34f8767e007fc0f6e2c422ea9e3cc68e8a671df07d7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-mac-iCal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-mac-iCal";
           sha256 = "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw";
           name = "org-mac-iCal";
         };
@@ -40167,11 +40748,11 @@
         version = "20160109.1643";
         src = fetchgit {
           url = "git://orgmode.org/org-mode.git";
-          rev = "99697abdb98f67d8fad90a2fd39316ea3c0982dd";
-          sha256 = "9124972a0892d6782da739102e0648af184f24c6a5ca0e24b7571d6a018356b5";
+          rev = "2b3c72e231de4bd5f9f1d3ddfeff45c1edd901dd";
+          sha256 = "096532e2cd59fe5d54ffe34f8767e007fc0f6e2c422ea9e3cc68e8a671df07d7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-mac-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-mac-link";
           sha256 = "02rmhrwikppppw8adnzvwj43kp9wsyk60csj5pygg7cd7wah7khw";
           name = "org-mac-link";
         };
@@ -40192,7 +40773,7 @@
           sha256 = "0d22q57mizw70qxbvwi4yz15jg86icqq1z963rliwss3wgpirndh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-mobile-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-mobile-sync";
           sha256 = "1cj0pxcjngiipmyl0w1p0g4wrxgm2y98a8862x1lcbali9lqbrwj";
           name = "org-mobile-sync";
         };
@@ -40213,7 +40794,7 @@
           sha256 = "0zbpzm9lni6z180s7n52x8s5by5zkq2nlhx82l2h9i7in9y4r6c3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-multiple-keymap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-multiple-keymap";
           sha256 = "16iv5575634asvn1b2k535ml8g4lqgy8z5w6ykma5f9phq5idb9f";
           name = "org-multiple-keymap";
         };
@@ -40234,7 +40815,7 @@
           sha256 = "132jv1zvp3yp4pa4ysl0n3a81d39cdi3nqfziz1ha1pl10qbn6wr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-octopress";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-octopress";
           sha256 = "0r6ms9j4xxsrik4206g7gz4wz41wr4ylpal6yfqs4hhz88yhxrhw";
           name = "org-octopress";
         };
@@ -40255,7 +40836,7 @@
           sha256 = "10dddbs9jppqqzwwv5y6pj2szdkw3223gvzzd4pzn9biv5d9kzsb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-outlook";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-outlook";
           sha256 = "0cn8h6yy67jr5h1yxsfqmr8q7ii4f99pgghfp821m01pj55qyjx9";
           name = "org-outlook";
         };
@@ -40268,15 +40849,15 @@
     org-page = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, ht, htmlize, lib, melpaBuild, mustache, org, simple-httpd }:
     melpaBuild {
         pname = "org-page";
-        version = "20160201.353";
+        version = "20160216.647";
         src = fetchFromGitHub {
           owner = "kelvinh";
           repo = "org-page";
-          rev = "83303ceaff69a08d9885471ca4b4b9a0f73584f2";
-          sha256 = "0lcbahpq90sv9a265r0ajm3zx3h1dmsz7fz2gw5ndjkz3c59qk93";
+          rev = "268761d12b1bd0905cd767efa3513d2b6df01aaf";
+          sha256 = "1mnghhc07727fcp0vd8qjm2v7amv5mv6357l5cjjs4c24qchxiy0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-page";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-page";
           sha256 = "1326m3w7vz22zk7rx40z28fddsccy5fl1qhbb7clci8l69blcc2v";
           name = "org-page";
         };
@@ -40297,7 +40878,7 @@
           sha256 = "022qqas919aziq4scs5j1wdbvd0qyw8kkirn2vzfb5k2fjl8z7iq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-pandoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-pandoc";
           sha256 = "1r6j6rkwfv7fv7kp73gh1bdz3y5ffwk5f2wyv4mpxs885cfbsm8v";
           name = "org-pandoc";
         };
@@ -40318,7 +40899,7 @@
           sha256 = "0b02d6x8kmq5h3x2fk1cl59jq10c1wy6xmmcsrn37di8bpygdwhy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-password-manager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-password-manager";
           sha256 = "1l3h0qhv0ad9l933d47as8y3h9x94zw315ax4qsgiw3046nzkdwv";
           name = "org-password-manager";
         };
@@ -40339,7 +40920,7 @@
           sha256 = "16z44kdsg8w1p27fsi72k8wqr35xbb0777rq7h7swv6j2jn1b6hc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-pdfview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-pdfview";
           sha256 = "1z4gb5lw7ngphixw06b5484kwlxbc098w2xshzml5sywr16a4iab";
           name = "org-pdfview";
         };
@@ -40360,7 +40941,7 @@
           sha256 = "015idpk66835jdg1sbvpksyr07xk4vn17z8cng2qw87fss688ihb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-pomodoro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-pomodoro";
           sha256 = "1vdi07hrhniyhhvg0hcr5mlixy6bjynvwm89z2lvfyvnnxpx0r27";
           name = "org-pomodoro";
         };
@@ -40381,7 +40962,7 @@
           sha256 = "1n9magg7r7xnw16d43fh6nzjf42s70l3mxq6ph727zi4lz5ngmfm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-present";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-present";
           sha256 = "09h0cjqjwhqychyrdv1hmiyak677vgf1b94392sdsq3ns70zyjk7";
           name = "org-present";
         };
@@ -40402,7 +40983,7 @@
           sha256 = "1jxw9r1mn9zf0vlvy89w9w6v6mhl8i210hkx86c9vcrkpcrpzmvi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-projectile";
           sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm";
           name = "org-projectile";
         };
@@ -40423,7 +41004,7 @@
           sha256 = "1jzp65sf1am6pz533kg1z666h4jlynvjyx1mf24gyksiiwdhypsy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-protocol-jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-protocol-jekyll";
           sha256 = "18wg489n2d1sx9jk00ki6p2rxkqz67kqwnmy2kb1ga1rmb6x9wfs";
           name = "org-protocol-jekyll";
         };
@@ -40433,6 +41014,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-random-todo";
+        version = "20160208.626";
+        src = fetchFromGitHub {
+          owner = "unhammer";
+          repo = "org-random-todo";
+          rev = "27ed9f3878736f0e12a076db8e1658964e46257b";
+          sha256 = "06apaa8pjrw14g2gyjpxjd6bjv1w0md4vl5jx78krcyr0bcc08mx";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-random-todo";
+          sha256 = "0yflppdbkfn2phd21zkjdlidzasfm846mzniay83v3akz0qx31lr";
+          name = "org-random-todo";
+        };
+        packageRequires = [ alert emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/org-random-todo";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-readme = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, header2, http-post-simple, lib, lib-requires, melpaBuild, yaoddmuse }:
     melpaBuild {
         pname = "org-readme";
@@ -40444,7 +41046,7 @@
           sha256 = "1q3s12s0ll7jhrnd3adkaxv7ff69ppprv0pyl5f6gy8y51y63k8d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-readme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-readme";
           sha256 = "1qqbsgspd006gy0kc614w7bg6na0ygmflvqkmw47899pbgj81hxh";
           name = "org-readme";
         };
@@ -40460,22 +41062,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-redmine = callPackage ({ anything, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    org-redmine = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-redmine";
-        version = "20151021.931";
+        version = "20160205.544";
         src = fetchFromGitHub {
           owner = "gongo";
           repo = "org-redmine";
-          rev = "4289eb06c506f19ef8c467acb2a05bcf04f187c9";
-          sha256 = "1q99b9l6y97iic46xqj7rqnkrzk8f0qq4qy81jv9wz54hq51w07v";
+          rev = "836d9a4c4dc3a05064667be687cd8f587017cb44";
+          sha256 = "0q26knckq213r885i5947970qagjmb7ybs4ag0ignls4dzbqlbmz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-redmine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-redmine";
           sha256 = "0y2pm18nnyzm9wjc0j15v46nf3xi7a0wvspfzi360qv08i54skqv";
           name = "org-redmine";
         };
-        packageRequires = [ anything ];
+        packageRequires = [];
         meta = {
           homepage = "http://melpa.org/#/org-redmine";
           license = lib.licenses.free;
@@ -40484,15 +41086,15 @@
     org-ref = callPackage ({ dash, emacs, f, fetchFromGitHub, fetchurl, helm, helm-bibtex, hydra, key-chord, lib, melpaBuild, s }:
     melpaBuild {
         pname = "org-ref";
-        version = "20160203.2047";
+        version = "20160221.1737";
         src = fetchFromGitHub {
           owner = "jkitchin";
           repo = "org-ref";
-          rev = "4d0eaf48db5711d4a67bf5352ae9d79aa29dc5ec";
-          sha256 = "0bh5faz51hiy82j3355n78dqbcwwx5scizq6w5n1snpdxw6dxfjw";
+          rev = "d336811c11844c0f5dcf62fa4f2d398c174e463d";
+          sha256 = "1xnwpl28d742406fhrwl39r9l9z3wbapjz556zc9km376f7sx9d8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-ref";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-ref";
           sha256 = "087isxf3z8cgmmniaxr3lpq9jg3sriw88dwp4f0ky286hlvgzw08";
           name = "org-ref";
         };
@@ -40513,7 +41115,7 @@
           sha256 = "03c88jzwvl95dl39703mknkvnk3cmw4gss5c1y2k9py2rgh6bpr9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-repo-todo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-repo-todo";
           sha256 = "0l5ns1hs3i4dhrpmvzl34zc9zysgjkfa7j8apbda59n9jdvml5v1";
           name = "org-repo-todo";
         };
@@ -40523,22 +41125,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    org-rtm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, org, rtm }:
+    org-rtm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, rtm }:
     melpaBuild {
         pname = "org-rtm";
-        version = "20160119.824";
+        version = "20160214.636";
         src = fetchFromGitHub {
           owner = "pmiddend";
           repo = "org-rtm";
-          rev = "b40475213d32ea46d0bbb055c3d682242140794c";
-          sha256 = "1596npclhghlarb1cfg3q7ky43y8zm73npjv169acjb77yz29rix";
+          rev = "adc42ad1fbe92ab447ccc9553780f4456f2508d2";
+          sha256 = "1hn8y9933x5x6lxpijcqx97p3hln69ahabqdsl2bmzda3mxm4bn2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-rtm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-rtm";
           sha256 = "1paiy5zmdlxb3a1cjk9d30mqbl60bkairw6xkix2qw36p07jwlj5";
           name = "org-rtm";
         };
-        packageRequires = [ org rtm ];
+        packageRequires = [ rtm ];
         meta = {
           homepage = "http://melpa.org/#/org-rtm";
           license = lib.licenses.free;
@@ -40555,7 +41157,7 @@
           sha256 = "14zn0b8qs740ls1069kg2lwm0b9yc4qv525fg8km0hgi0yp8qw7z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-sync";
           sha256 = "0n8fz2d1vg9r8dszgasbnb6pgaxr2i8mqrp953prf1nhmfpjpxad";
           name = "org-sync";
         };
@@ -40576,7 +41178,7 @@
           sha256 = "1qx3kd02sxs9k7adlvdlbmyhkc5kr7ni5lw4gxjw3nphnc536bkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-table-comment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-table-comment";
           sha256 = "1d40vl8aa1x27z4gwnkzxgrqp7vd3ln2pc445ijjxp1wr8bjxvdz";
           name = "org-table-comment";
         };
@@ -40597,7 +41199,7 @@
           sha256 = "1x241jaw726zjsplwf6svbvr8af09k6kqj7icpvcbyayivkbhxy2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-tfl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-tfl";
           sha256 = "1rqmmw0222vbxfn5wxq9ni2j813x92lpv99jjszqjvgnf2rkhjhf";
           name = "org-tfl";
         };
@@ -40618,7 +41220,7 @@
           sha256 = "1apd5yyr12skagma7xpzrh22rhplmhhv0pma4zf5b0i6nkxy06j2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-themis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-themis";
           sha256 = "08rajz5y7h88fh94s2ad0f66va4vi31k9hwdv8p212bs276rp7ln";
           name = "org-themis";
         };
@@ -40639,7 +41241,7 @@
           sha256 = "04adkz950vvwyzy3da468nnqsknpr5kw5369w2yqhnph16cwwfxb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-time-budgets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-time-budgets";
           sha256 = "0r8km586n6xdnjha7xnzlh03nw1dp066hydaz8kxfmhvygl9cpah";
           name = "org-time-budgets";
         };
@@ -40660,7 +41262,7 @@
           sha256 = "014337wimvzy0rxh2p2c647ly215zcyhgym2hcljkdriv15cafna";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-toodledo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-toodledo";
           sha256 = "0c7qr0jsc4iyrwkc22xp9nmk6984v7q1k0rvpd62m07lb5gvbiq3";
           name = "org-toodledo";
         };
@@ -40681,7 +41283,7 @@
           sha256 = "053wf36lq9piyzq7rv2lid34zanj6l9fvawp3r3nsniy5nlfckqx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-tracktable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-tracktable";
           sha256 = "0mngf9q2ffxq32cgng0xl30661mj15wmr9y4hr3xddj626kxrp00";
           name = "org-tracktable";
         };
@@ -40702,7 +41304,7 @@
           sha256 = "1h15fr16kgbyrxambmk4hsmha6hx4c4yqkccb82g3wlvzmnqj5x3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-transform-tree-table";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-transform-tree-table";
           sha256 = "0n68cw769nk90ms6w1w6cc1nxjwn1navkz56mf11bsiqvsk3km7r";
           name = "org-transform-tree-table";
         };
@@ -40723,7 +41325,7 @@
           sha256 = "19id53sjv0r0xnm3l8d694s27dxlmdfm9dal57zlf60s5lg8hykq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-tree-slide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-tree-slide";
           sha256 = "0v857zplv0wdbg4li667v2p5pn5zcf9fgbqcwa75x8babilkl6jn";
           name = "org-tree-slide";
         };
@@ -40736,16 +41338,16 @@
     org-trello = callPackage ({ dash, dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }:
     melpaBuild {
         pname = "org-trello";
-        version = "20151213.936";
+        version = "20160213.1307";
         src = fetchFromGitHub {
           owner = "org-trello";
           repo = "org-trello";
-          rev = "ae291d19752d86d01bb21cec6fb410c1eb9145d7";
-          sha256 = "0w0gw3varx8qrcfh3iwg6qqxavprm25bjv9ada34xqjdhsv537xc";
+          rev = "1ecb8f4f1dd41c8f41073c13a9557c0c583d7c88";
+          sha256 = "0pinp7485mwi99f8qx8xhcdymn5yyd7irxh514j3f23n4b90hk4l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-trello";
-          sha256 = "1rm91xccvdsqghdnrnjvyp8xfvrw5ac677vzzz24rz9dssh2mz9b";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-trello";
+          sha256 = "14lq8nn1x6qb3jx518zaaz5582m4npd593w056igqhahkfm0qp8i";
           name = "org-trello";
         };
         packageRequires = [
@@ -40772,7 +41374,7 @@
           sha256 = "1m2xdp6wfg11wi7s4i675c3m5qancm8bpizcf380r6vmkcdfkrdy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-vcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-vcard";
           sha256 = "0l6azshvzl1wws582njqr3qx4h73gwrdqwa3jcic1qbs9hg2l4yl";
           name = "org-vcard";
         };
@@ -40785,15 +41387,15 @@
     org-wc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "org-wc";
-        version = "20160204.1329";
+        version = "20160204.1915";
         src = fetchFromGitHub {
           owner = "dato";
           repo = "org-wc";
-          rev = "bfb9f2d670c9f700e86e1dd965be1cd6fdc86e32";
-          sha256 = "0xhfpv5g2smxywrnwzk2sgak99lv950imm03jdgldhrjz6z1g78y";
+          rev = "7735d5111f779a84c40b1eb3783631e6048fb6fe";
+          sha256 = "08yww77697kck1ld9xcrcx8amqdh28rdc4fsavp5d3my78qk7rac";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-wc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-wc";
           sha256 = "1sa9fcy0bnn06swwq2gfrgmppd6dsbmw2mq0v73mizg3l6has1zb";
           name = "org-wc";
         };
@@ -40814,7 +41416,7 @@
           sha256 = "1izf0lxycg4wh3wfki1sfy283qwgfdf8rzb365z3sk1zzijjaw6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-webpage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-webpage";
           sha256 = "0vwv8cv38gx8rnfskbmnaf8y8sffjqy1408655bwhjz6dp69qmah";
           name = "org-webpage";
         };
@@ -40835,7 +41437,7 @@
           sha256 = "1cagmwl3acanwc2nky7m61cawi0i0x703sjc6zlw968lacyw86wa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-wunderlist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-wunderlist";
           sha256 = "08zg3wgr80rp89c53ffqzz22ws9bp62a1m74xvxa74x6nq9i4xl0";
           name = "org-wunderlist";
         };
@@ -40852,11 +41454,11 @@
         src = fetchFromGitHub {
           owner = "punchagan";
           repo = "org2blog";
-          rev = "c0f849b7119b0314934ef33e2ea405cf4db90735";
-          sha256 = "0q6dpih869rz94dqbi910vk5iwffbbl6hkraazc8rky7fnb4nh4s";
+          rev = "11e4cbc8df34461b02d6d93cb2164ec16925b3a1";
+          sha256 = "180mhqf56vvl6y5ff1lsy33b1xxz0zrzy826g2qllw9w5g77xxzq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org2blog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org2blog";
           sha256 = "0ancvn4ji4552k4nfd2ijclsd027am93ngg241ll8f6h6k0wpmzq";
           name = "org2blog";
         };
@@ -40877,7 +41479,7 @@
           sha256 = "064kw64w9snm0lbshxn8d6yd9xvyislhg37fmhq1w7vy8lm61xvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org2jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org2jekyll";
           sha256 = "1j9d6xf5nsakifxwd4zmjc29lbj46ffn3z109k2y2yhz7q3r9hzv";
           name = "org2jekyll";
         };
@@ -40898,7 +41500,7 @@
           sha256 = "194mcm7xlzlwm4phy3b9pz7na3sdw6galnidf8aqjk97mgw9z74r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/organic-green-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/organic-green-theme";
           sha256 = "1fdj3dpcdqx0db5q8dlxag6pr2qn4yiz1hmg3c7dkmh51n85ssw2";
           name = "organic-green-theme";
         };
@@ -40919,7 +41521,7 @@
           sha256 = "0hwmr67nky9xp5xlrkp54nw6b72d29lmna28dnbgqs2i5rccbk55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orgbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/orgbox";
           sha256 = "12wfqlpjh9nr7zgqs4h8kmfsk825n68qcbn8z2fw2mpshg3nj7l8";
           name = "orgbox";
         };
@@ -40940,7 +41542,7 @@
           sha256 = "1wxxdx3c5qacsii4kysk438cjr1hnmpir78kp6xgk9xw5g9snlnj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/orgit";
           sha256 = "0askccb3h98v8gmylwxaph3gbyv5b1sp4slws76aqz1kq9x0jy7w";
           name = "orgit";
         };
@@ -40961,7 +41563,7 @@
           sha256 = "12y395ld36jnlbcrfycnvr4g723w6vahfv9iqf1wr6m94ka9pz3d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orglink";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/orglink";
           sha256 = "0ldrvvqs3hlazj0dch162gsbnbxcg6fgrxid8p7w9gj19vbcl52b";
           name = "orglink";
         };
@@ -40982,7 +41584,7 @@
           sha256 = "1w0hadpslxcjn29yxl9i37sja4qf4kp7ffjpwij5hs73r518c2z6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orglue";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/orglue";
           sha256 = "14g4q2k9zjzipzrp5mg72s40b0rwiaixgq3rvi15wh4vvcw5xajn";
           name = "orglue";
         };
@@ -41003,7 +41605,7 @@
           sha256 = "0am2yfnaxwc6f2wvrg4d508pdcs88cynr32k7bgyyadwq4xq3zsg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orgtbl-aggregate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/orgtbl-aggregate";
           sha256 = "0gnyjwn6jshs8bzdssm2xppg2s9p2x3rrhp523q39aydskc6ggc9";
           name = "orgtbl-aggregate";
         };
@@ -41024,7 +41626,7 @@
           sha256 = "1vbnp37xz0nrpyi0hah345928zsb1xw915mdb0wybq1fzn93mp1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orgtbl-ascii-plot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/orgtbl-ascii-plot";
           sha256 = "1ssjbdprbn34nsfx1xjc382l2195rbh8mybpn31d4kcjx6fqf78h";
           name = "orgtbl-ascii-plot";
         };
@@ -41045,7 +41647,7 @@
           sha256 = "06nc82wiha11i79izqil53dkd95fl55nb5m739gyyzvx3sksb0dg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orgtbl-join";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/orgtbl-join";
           sha256 = "1kq2h0lb521z8q2xb9bsi37xzzdsa0hw4mm3qkzidi5j9fi3apf1";
           name = "orgtbl-join";
         };
@@ -41066,7 +41668,7 @@
           sha256 = "0zfiq9d5jqzpmscngb1s2jgfiqmbi4dyw0fqa59v2g84gxjg793x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orgtbl-show-header";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/orgtbl-show-header";
           sha256 = "1xgqjg3lmcczdblxaka47cc1ad8p8jhyb2nqwq0qnbqw46fqjp3k";
           name = "orgtbl-show-header";
         };
@@ -41087,7 +41689,7 @@
           sha256 = "0p53l0s8rxr8v77kj83qjrbln7nck16q0zgdp4sqmqb1121ily48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/origami";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/origami";
           sha256 = "0rkb55zcvsgxzp190vrnbzdfbcjd8zi6vhbhwpqxi0qmyq6a08pr";
           name = "origami";
         };
@@ -41108,7 +41710,7 @@
           sha256 = "1iybrhp607a5rb3ynlaf8w2x9wdgdbril702z44dgcg3wxih2zy1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-browse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-browse";
           sha256 = "06rfzq2hxhzg6jh2zs28r7ffxwlq40nz954j13ly8403c7rmbrfm";
           name = "osx-browse";
         };
@@ -41129,7 +41731,7 @@
           sha256 = "1ykn48src7qhx9cmpjkaqsz7h36p75kkq1h9wlcpv5fhaky2d4n4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-clipboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-clipboard";
           sha256 = "0gjgr451v6rlyarz96v6h8kfbvkk7npvhgvkgwdi0bjighrhlv4f";
           name = "osx-clipboard";
         };
@@ -41142,15 +41744,15 @@
     osx-dictionary = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "osx-dictionary";
-        version = "20151108.2352";
+        version = "20160215.926";
         src = fetchFromGitHub {
           owner = "xuchunyang";
           repo = "osx-dictionary.el";
-          rev = "ffbc358a4c686ea77e8bb88319ad192b4ff1aa55";
-          sha256 = "0frv92i7rj9fbjzgwf80zngq77394wjgijggda6d8ai75n5f47g1";
+          rev = "3b2e1f0fbcf60453947bba00c4d5de96b4f97a3a";
+          sha256 = "04fh4i8mydmvq58hd60lf0dglpcjqgzpwk93wqss72kpifwh68vc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-dictionary";
           sha256 = "13033fxc5vjd1f7mm6znmprcp3mwxbvblb2d25shr8d4imqqhv82";
           name = "osx-dictionary";
         };
@@ -41171,7 +41773,7 @@
           sha256 = "0kh7mrgwalys2vmf1dyrl2cc9v58zah2r8lr43nsky8dkszrz2al";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-lib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-lib";
           sha256 = "12wvki8jhzqsanxv5yqzjmfx6ifwz9ab9zh6r8nss86bk8864ix4";
           name = "osx-lib";
         };
@@ -41192,7 +41794,7 @@
           sha256 = "1csnxpsfnv9lv07kgvc60qx5c33sshmnz60p3qjz7ym7rnjy9b5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-location";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-location";
           sha256 = "1p12mmrw70p3b04zlprkdxdfnb7m3vkm6gci3fwhr5zyfvwxvn0c";
           name = "osx-location";
         };
@@ -41213,7 +41815,7 @@
           sha256 = "1rgykby1ysbapq53lnk9yy04r9q4qirnzs2abgvz7g2qjq5fyzag";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-org-clock-menubar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-org-clock-menubar";
           sha256 = "1y5qxslxl0d93f387nyj8zngz5nh1p4rzdfx0lnbvya6shfaxaf6";
           name = "osx-org-clock-menubar";
         };
@@ -41234,7 +41836,7 @@
           sha256 = "0830kkmvc3ss7ygqfwz3j75s7mhxfxyadaksrp0v2cc4y6wn6nfv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-plist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-plist";
           sha256 = "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8";
           name = "osx-plist";
         };
@@ -41255,7 +41857,7 @@
           sha256 = "1j601gzizxjsvkw6bvih4a49iq05yfkw0ni77xbc5klc7x7s80hk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-pseudo-daemon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-pseudo-daemon";
           sha256 = "150fxj2phj5axnh5i8ws5fv2qzzmpyisch452wgxb604p56j7vy8";
           name = "osx-pseudo-daemon";
         };
@@ -41276,7 +41878,7 @@
           sha256 = "1l231168bjqz6lwzs0r9vihxi53d46csrr2gq7g33lg1zm3696ah";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-trash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-trash";
           sha256 = "1f6pi53mhp2pvrfjm8544lqqj36gzpzxq245lzvv91lvqkxr9ysj";
           name = "osx-trash";
         };
@@ -41297,7 +41899,7 @@
           sha256 = "116cwlhn7s47rhivz6113lh8lvaz3bjb3ynjlbx9hyf7gq3nfnxn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/outline-magic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/outline-magic";
           sha256 = "085yayzph3y7fh6pd5sdjdkhdcvwfzcyqd6y3xlbz7wni5ac6b5f";
           name = "outline-magic";
         };
@@ -41318,7 +41920,7 @@
           sha256 = "0d9hfr4kb6rkhwacdn70bkfchgam26gj92zfyaqw77a2sgwcmwwv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/outlined-elisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/outlined-elisp-mode";
           sha256 = "165sivmv5h4nvh08ampq95x6b0bkzxgrdjbxjxlq6rv00vaidn7v";
           name = "outlined-elisp-mode";
         };
@@ -41339,7 +41941,7 @@
           sha256 = "0jhqpm31rsmc2r01ra48nbnd9rx9am90qk6i0qrhgfzx9q1svmj9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/outorg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/outorg";
           sha256 = "04swss84p33a9baa4swqc1a9lfp6wziqrwa7vcyi3y0yzllx36cx";
           name = "outorg";
         };
@@ -41356,11 +41958,11 @@
         src = fetchFromGitHub {
           owner = "tj64";
           repo = "outshine";
-          rev = "14baed9f4673a52eb9f90c71ec0ae70b4d447fc5";
-          sha256 = "0y5r1wy9pjyygzkkjhm7ain2n5p875s2kivns3kmxyak3nl689sy";
+          rev = "c7764a408095b3e822b02a70b934e9049af02b3b";
+          sha256 = "0bc4lq6gadmjpnag6j7vhq5bf2hgmvgnqy2nxiwnk4glrmks7imm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/outshine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/outshine";
           sha256 = "1i8c3q6n9hpfbpg2f8n8brwgaq36af1jn3g5js88yiyyb5dknxq4";
           name = "outshine";
         };
@@ -41381,7 +41983,7 @@
           sha256 = "1rk5pzm5wmdq68d99hhhbq8pq37bnph0dip5j2jnfj6zsw70whr2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ov";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ov";
           sha256 = "0d71mpv74cfxcnwixbrl90nr22cw4kv5sdgpny5wycvh6cgmd6qb";
           name = "ov";
         };
@@ -41402,7 +42004,7 @@
           sha256 = "1bfj56ackza8c1jja660v6ss9ii7prcaim5plnfqsv3k149r8qlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/overseer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/overseer";
           sha256 = "04wfwcal051jrnmm5dga6vl4c9j10pm416586yxb8smi6fxws2jg";
           name = "overseer";
         };
@@ -41423,7 +42025,7 @@
           sha256 = "0f2psx4lq98l3q3fnibsfqxp2hvvwk7b30zjvjlry3bffg3l7pfk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/owdriver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/owdriver";
           sha256 = "0j8z7ynan0zj581x50gsi9lljkbi6bwmzpfyha3i6q8ch5qkdxfd";
           name = "owdriver";
         };
@@ -41444,7 +42046,7 @@
           sha256 = "03ivnvqxc5xdcik4skk32fhr686yv2y5mj8w7v27dhyc0vdpfhvy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-asciidoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-asciidoc";
           sha256 = "07b549dqyh1gk226d7zbls1mw6q4mas7kbfwkansmyykax0r2zyr";
           name = "ox-asciidoc";
         };
@@ -41465,7 +42067,7 @@
           sha256 = "0gfkb12rn40m71xv292dn3nj3h1bnn81698pinirp0nd8p4bvnin";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-gfm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-gfm";
           sha256 = "065ngmzfd3g2h8n903hc4d363hz4z5rrdgizh2xpz03kf3plca6q";
           name = "ox-gfm";
         };
@@ -41486,7 +42088,7 @@
           sha256 = "19h3w3fcas60jv02v7hxjmh05804sb7bif70jssq3qwisj0j09xm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-html5slide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-html5slide";
           sha256 = "0nqk6chg0ky98ap2higa74786prj7dbwx2a3l67m0llmdajw76qn";
           name = "ox-html5slide";
         };
@@ -41507,7 +42109,7 @@
           sha256 = "1kf2si2lyy0xc971bx5zd2j9mnz1smc9s8l0dwc6iksh2v9q8cy9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-impress-js";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-impress-js";
           sha256 = "0p0cc51lmxgl0xv951ybdg5n8gbzv8qf0chfgigijizzjypxc21l";
           name = "ox-impress-js";
         };
@@ -41528,7 +42130,7 @@
           sha256 = "0p03xzldz5v8lx3ip2pgll0da00ldfxmhr6r3jahwp6692kxpr6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-ioslide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-ioslide";
           sha256 = "0z0qnvpw64wxbgz8203rphswlh9hd2i11pz2mlay8l3bzz4gx4vc";
           name = "ox-ioslide";
         };
@@ -41549,7 +42151,7 @@
           sha256 = "0c2m02g6csg5fqizj3zqcm88q7w17kgvgi7swcx4fzz6rixnpsji";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-mediawiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-mediawiki";
           sha256 = "0lijj2n4saw0xd3jaghbvx9v6a4ldl5gd8wy7s7hfcm30wb75cdb";
           name = "ox-mediawiki";
         };
@@ -41570,7 +42172,7 @@
           sha256 = "0cc14p6c3d4djfmrkac0abb2jq128vlmayv2a8cyvnyjffyvjbk7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-nikola";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-nikola";
           sha256 = "1amplnazs9igfd382djq23d8j7r0knr0hwlpasd01aypc25c82a4";
           name = "ox-nikola";
         };
@@ -41591,7 +42193,7 @@
           sha256 = "0bawigwc6v5420642xlkyxdd0i82gicx69wqlnjf6lvhfvs990is";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-pandoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-pandoc";
           sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc";
           name = "ox-pandoc";
         };
@@ -41612,7 +42214,7 @@
           sha256 = "0adj6gm39qw4ivb7csfh21qqqipcnw1sgm1xdqvrk86kbs9k1b2g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-pukiwiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-pukiwiki";
           sha256 = "10sfbri5hv5hyx9jc1bzlk4qmzfmpfgfy8wkjkpv7lv2x0axqd8a";
           name = "ox-pukiwiki";
         };
@@ -41633,7 +42235,7 @@
           sha256 = "196bjiij0nj19qsz95y9l44sr63673mxxj0cv6aa3ijpm48vmj9p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-reveal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-reveal";
           sha256 = "092swxkkisvj2y18ynal8dn7wcfi7h4y6n0dlzqq28bfflarbwik";
           name = "ox-reveal";
         };
@@ -41654,7 +42256,7 @@
           sha256 = "1js4n8iwimc86fp2adzhbhy4ixss1yqngjd8gq7pxgpgmnhd66x3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-rst";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-rst";
           sha256 = "1vyj6frrl7328n2x7vc3qwv3ssdhi8bp6ja5h2q4bqalc6bl1pq0";
           name = "ox-rst";
         };
@@ -41675,7 +42277,7 @@
           sha256 = "1r9c4s9f7cvxxzf9h07rg75bil0295zq1inh5i4r6za5jabkr4dg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-textile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-textile";
           sha256 = "01kri7vh16xhy8x5qd6s5z08xr0q964rk6xrligdb3i6x78wfvi4";
           name = "ox-textile";
         };
@@ -41696,7 +42298,7 @@
           sha256 = "1wmjmkx2nz7alhdrbbm59dsrhrhn9fm3kjsvv3lmwgqg029vi3fp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-tiddly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-tiddly";
           sha256 = "196i8lzxv2smpj5yhmiqwazn4pvc14yqyzasrgimhv3vi2xnxlfb";
           name = "ox-tiddly";
         };
@@ -41717,7 +42319,7 @@
           sha256 = "0w6963jvz1sk732nh18735dxivd6nl59jd4m26ps6l4wqhqby0db";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-trac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-trac";
           sha256 = "0f8b3i83vzxzfa91p4ahlqz6njql18xy5nk265sjxpy9zr898rsa";
           name = "ox-trac";
         };
@@ -41730,15 +42332,15 @@
     ox-twbs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ox-twbs";
-        version = "20151223.1320";
+        version = "20160221.834";
         src = fetchFromGitHub {
           owner = "marsmining";
           repo = "ox-twbs";
-          rev = "fb3bb0dc9c7ded39605fb6dd805b81b25e1c8f19";
-          sha256 = "0gjwpjr7gpqcnqxcgcfy2zgzh1i4z3dw9yryaqnqc8fbxrqqvk9p";
+          rev = "38fdd35e483c9fec4a055f60c6bdf6b24e63ae5c";
+          sha256 = "126afhg2v14zimh1cwm0ydgkhmhap4yrkfdcdzfssiy5kpf4p7yk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-twbs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-twbs";
           sha256 = "15csgnph5wh2dvcc2dnvrlm7whh428rq8smqji1509ib7aw9y5mx";
           name = "ox-twbs";
         };
@@ -41759,7 +42361,7 @@
           sha256 = "1wmjmkx2nz7alhdrbbm59dsrhrhn9fm3kjsvv3lmwgqg029vi3fp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-twiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-twiki";
           sha256 = "1p1k0yg5fxcjgwpq2ix9ckh2kn69m7d5rnz76h14hw9p72cb54r0";
           name = "ox-twiki";
         };
@@ -41780,7 +42382,7 @@
           sha256 = "12jsnfppif4l548wymvakx0f2zlm63xs6kfrb49hicmk668cq4ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/p4";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/p4";
           sha256 = "0215li17gn35wmvd84gnp4hkwa2jd81wz4frb1cba2b5j33rlprc";
           name = "p4";
         };
@@ -41801,7 +42403,7 @@
           sha256 = "0cbsl184szbl486454jkn28zj4p7danp92h0zv8yscrlnyl68p0y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pabbrev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pabbrev";
           sha256 = "1mbfa40pbzbi00sp155zm43sj6nw221mcayc2rk3ppin9ps95hx3";
           name = "pabbrev";
         };
@@ -41816,14 +42418,14 @@
         pname = "package-build";
         version = "20160129.1532";
         src = fetchFromGitHub {
-          owner = "milkypostman";
+          owner = "melpa";
           repo = "melpa";
-          rev = "0fe7b0857828a041ee06b30edd2cd488cc3394c7";
-          sha256 = "15q2fwihg7pc3r3vcp3magyddzz9ylbrwyba1rf2yxh54i0mgrl5";
+          rev = "fdd35b0df7b71661561c155a8f7ba7c2236f3e30";
+          sha256 = "0nl17brqf53pcjgrl4c608zvb82xl27xsliknkvl0zysx0kynkhm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/package-build";
-          sha256 = "1m245q81c2jifgqxwd2fi35jrcbf6v9a1a5zy815861avq3fg9g0";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/package-build";
+          sha256 = "0618z43j6628jjj448hcigvsfwcs7p0n4bbcmqscrb6p59b7n4wx";
           name = "package-build";
         };
         packageRequires = [ cl-lib ];
@@ -41843,7 +42445,7 @@
           sha256 = "0i7f8ambcrhyqq15xwlk31jjdcii2hr37y45va8m5w6n9mkpz8c6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/package-filter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/package-filter";
           sha256 = "0am73zch2fy1hfjwzk8kg0j3lgbcz3hzxjrdf0j0a9w0myp0mmjm";
           name = "package-filter";
         };
@@ -41864,7 +42466,7 @@
           sha256 = "1xv0ra130qg0ksgqi4npspnv0ckq77k7f5kcibavj030h578kj97";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/package+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/package+";
           sha256 = "1mbsxr4llz8ny7n7w3lykld9yvbaywlfqnvr9l0aiv9rvmdv03bn";
           name = "package-plus";
         };
@@ -41885,7 +42487,7 @@
           sha256 = "1pdv6d6bm5jmpgjqf9ycvzasxz1205zdi0zjrmkr33c03azwz7rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/package-safe-delete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/package-safe-delete";
           sha256 = "12ss5yjhnyxsif4vlbgxamn5jfa0wxkkphffxnv6drhvmpq226jw";
           name = "package-safe-delete";
         };
@@ -41906,7 +42508,7 @@
           sha256 = "138l07qmxj4fkvf43f1hdn4skadxb50c023bc5101l3njzmf74wa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/package-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/package-utils";
           sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r";
           name = "package-utils";
         };
@@ -41919,15 +42521,15 @@
     packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "packed";
-        version = "20150723.638";
+        version = "20160209.1105";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "packed";
-          rev = "9d77e39c9df29c6224302cb7973b2de7e05f8bd7";
-          sha256 = "0743scd1g5xf3k9fbqv1qd9w421vfxwjlnb0vwix0ypahd83r3db";
+          rev = "a6ed874d4c637ec62ed7d1e56a079d9e1b035bbb";
+          sha256 = "0phs3ycp2vak95b3n0ppzlq4z83vf5q04cf3ms23qhsyr2y4y04v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/packed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/packed";
           sha256 = "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z";
           name = "packed";
         };
@@ -41948,7 +42550,7 @@
           sha256 = "0zx72qbqy2n1r6mjylw67zb6nnchp2b49vsdyl0k5bdaq2xyqv6i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pacmacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pacmacs";
           sha256 = "0w0r6z365jrglpbifb94w6c22wqi9x93qgkss9pn820hrndqbqxy";
           name = "pacmacs";
         };
@@ -41969,7 +42571,7 @@
           sha256 = "0mqd18w98p6z0i08xx7jga10ljh9360x6sqfyvfq6bjfi2jvxdbk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/page-break-lines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/page-break-lines";
           sha256 = "0q1166z190dxznzgf2f29klj2jkaqlic483p4h3bylihkqp93ij7";
           name = "page-break-lines";
         };
@@ -41990,7 +42592,7 @@
           sha256 = "1dq5ibz7rx9a7gm9zq2pz4c1sxgrm59yibyq92bvmi68lvf2q851";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pager";
           sha256 = "0s5zwimkbsivbwlyd7g8dpnjyzqcfc5plg53ij4sljiipgjh5brl";
           name = "pager";
         };
@@ -42011,7 +42613,7 @@
           sha256 = "11msqs8v9wn8sj45dw1fl0ldi3sw33v0xclynbxgmawyabfq3bqm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pager-default-keybindings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pager-default-keybindings";
           sha256 = "0vqb3s1fxkl1fxxspq89344s55sfcplz26z0pbh347l1681h3pci";
           name = "pager-default-keybindings";
         };
@@ -42029,7 +42631,7 @@
           sha256 = "1qnv84y0s437xcsjxh0gs9rb36pydba3qfrihvz5pqs9g9w7m94k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/palette";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/palette";
           sha256 = "1v6dsph18rqfbvda2c25mqgdwap2a4zrg6qqq57n205zprpcwxc0";
           name = "palette";
         };
@@ -42050,7 +42652,7 @@
           sha256 = "1kbja107smdjqv82p84jx13jk1410c9vms89p1iy1jvn7s8g9fiq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/palimpsest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/palimpsest";
           sha256 = "18kklfdlcg982pdrslh0xqa42h28f91bdm7q2zn890d6dcivp6bk";
           name = "palimpsest";
         };
@@ -42071,7 +42673,7 @@
           sha256 = "03mlg6dmpjw8fq2s3c4gpqj20kjhzldz3m51bf6s0mxq9bclx2xw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pallet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pallet";
           sha256 = "0q50cdwnn2w1n5h4bappncjjyi5yaixxannwgy23fngdrz1mxwd7";
           name = "pallet";
         };
@@ -42084,15 +42686,15 @@
     pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "pandoc-mode";
-        version = "20160204.340";
+        version = "20160210.600";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "pandoc-mode";
-          rev = "db7d7a6e887ec3d50e1f94a5743b5ef4c3af2914";
-          sha256 = "1q3r0vhch3yb0kjnp7l3x5ma39w6ir9rini4i0c7jfh54abyf78r";
+          rev = "60d3abea189467e04b5ce7dbe38d8b76ce5686cf";
+          sha256 = "0g2iab5fmz85z532102lqn2wp1wgqy07bxkca95azi2gkbg0kbmj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pandoc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pandoc-mode";
           sha256 = "0qvc6cf87h1jqf590kd68jfg25snxaxayfds634wj4z6gp70l781";
           name = "pandoc-mode";
         };
@@ -42113,7 +42715,7 @@
           sha256 = "01zc2cvkyfx80snwrm3cs8cbwgxmd56rgvvbsyq53r4q3zhdk1li";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pangu-spacing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pangu-spacing";
           sha256 = "082qh26vlk7kifz1800lyai17yvngwjygrfrsh1dsd8dxhk6l9j8";
           name = "pangu-spacing";
         };
@@ -42134,7 +42736,7 @@
           sha256 = "1xh614czldjvfl66vhkyaai5k4qsg1l3mz6wd5b1w6kd45qrc54i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paper-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paper-theme";
           sha256 = "04diqm2c9fm29zyms3hplkzb4kb7b2kyrxdsy0jxyjj5kabypd50";
           name = "paper-theme";
         };
@@ -42151,11 +42753,11 @@
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "paradox";
-          rev = "8eca9880ed52d0d53d7d5e28858ec95987fa22e1";
-          sha256 = "1vc59n9jmsn5d15v2m9xl64564h3q0c78pv4a4n3dhd1iz797l3x";
+          rev = "ecc0190cef9f6edb11c602374126054bcf8615f0";
+          sha256 = "1s1lmnrnwm2sq4kdw1byyn03k2qzjkb9fgngn2rrc2vm4wbmx8l7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paradox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paradox";
           sha256 = "1xq14nfvprsq18464qr4mhphq7cl1f570lji5n8z6j9vpfm9a4p2";
           name = "paradox";
         };
@@ -42174,7 +42776,7 @@
           sha256 = "34dd7d8c07c697b54ea943566e6967012f7366d6f5a21e31e3d768716bc4928f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paredit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paredit";
           sha256 = "1rp859y4qyqdfvp261l8mmbd62p1pw0dypm1mng6838b6q6ycakr";
           name = "paredit";
         };
@@ -42195,7 +42797,7 @@
           sha256 = "1jkpb67h96sm3fnga9hrg3kwhlp3czdv66v49a9szq174zpsnrgv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paredit-everywhere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paredit-everywhere";
           sha256 = "0gbkwk8mrbjr2l8pz3q4y6j8q4m12zmzl31c88ngs1k5d86wav36";
           name = "paredit-everywhere";
         };
@@ -42216,7 +42818,7 @@
           sha256 = "15xkanrwxh3qqay3vkfqvhzs88g7nnfv9bqk509qflyhqnvc9sxr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paredit-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paredit-menu";
           sha256 = "05jp4cc548x5f07k096dgizhivdpaajxq38hin831sm0p9cibm4p";
           name = "paredit-menu";
         };
@@ -42237,7 +42839,7 @@
           sha256 = "0fds9s16c0dgq6ah98x4pv5bgwbikqwiikcxjzmk9g1m3s232fl8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paren-completer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paren-completer";
           sha256 = "0xh17h8vmsgbrq6yf5sfy3kpia4za68f43gwgkvi2m430g15fr0x";
           name = "paren-completer";
         };
@@ -42258,7 +42860,7 @@
           sha256 = "0ggpb58dw4dv9i0czj064a8fdcalgjqgl4cm5zsk7hcvjcmal9af";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paren-face";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paren-face";
           sha256 = "0dmzk66m3rd8x0rb925pyrfpc2qsvayks4kmhpb2ccdrx68pg8gf";
           name = "paren-face";
         };
@@ -42279,7 +42881,7 @@
           sha256 = "0i5bc7lyyrx6swqlrp9l5x72yzwi53qn6ldrfs99gh08b3yvsnni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/parent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/parent-mode";
           sha256 = "1ndn6m6aasmk9yrml9xqj8141100nw7qi1bhnlsss3v8b6njwwig";
           name = "parent-mode";
         };
@@ -42300,7 +42902,7 @@
           sha256 = "1z8cp1cdkxmdqislixxvncj0s1jx42i6arx48kdl5paymnnp282s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/parse-csv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/parse-csv";
           sha256 = "0khpfxbarw0plx8kka357d8wl1vvdih5797xlld9adc0g3cng0zz";
           name = "parse-csv";
         };
@@ -42321,7 +42923,7 @@
           sha256 = "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/parsebib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/parsebib";
           sha256 = "07br2x68scsxykdk2ajc4mfqhdb7vjkcfgz3vnpy91sirxzgfjdd";
           name = "parsebib";
         };
@@ -42334,15 +42936,15 @@
     pass = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, password-store }:
     melpaBuild {
         pname = "pass";
-        version = "20151109.603";
+        version = "20160214.435";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "pass";
-          rev = "f43f6ada151a81f0bca4397b78382e4f6160d0ad";
-          sha256 = "14zpkxnwvwdi7wnjw4827lzzn6kw8wmwr2whavpi4rlkq8ix6dv2";
+          rev = "2e1b08e7e4620e6abbb9151a27601405bbd2e480";
+          sha256 = "0npm5kv00fcnb5ajj76jp1dc84zxp7fgrkn472yxdq4hppvx0ixv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pass";
           sha256 = "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr";
           name = "pass";
         };
@@ -42363,7 +42965,7 @@
           sha256 = "0yckh61v9a798gpyk8x2z9990h3b61lwsw0kish571pygfyqhjkq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/passthword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/passthword";
           sha256 = "076jayziipjx260yk3p37pf5k0qsagalidah3y6hiflrlq4sfgjn";
           name = "passthword";
         };
@@ -42384,7 +42986,7 @@
           sha256 = "1pw401ar114wpayibphv3n6m0gz68zjmiwz60r4lbar45bmxvihx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/password-generator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/password-generator";
           sha256 = "0aahpplmiwmp6a06y6hl4zvv8lvzkmakmaazlckl5r3rqbsf24cb";
           name = "password-generator";
         };
@@ -42400,11 +43002,11 @@
         version = "20151027.1649";
         src = fetchgit {
           url = "http://git.zx2c4.com/password-store";
-          rev = "bffca1ee21a38f1e808fa83e5df2fcf0f808cb9f";
-          sha256 = "9c3ee0155b9d6b96acacaab8e799b23e92550ef136ffa2c07880029af3061733";
+          rev = "0b2f803fe61992af02b8820c400984b1f615a299";
+          sha256 = "36b4cf6025f52ac74daa0026f712951ee7a45c63401cce7f2286fd533e3f9885";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/password-store";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/password-store";
           sha256 = "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss";
           name = "password-store";
         };
@@ -42425,7 +43027,7 @@
           sha256 = "0921xwg3d3345hiqz4c1iyqwvfyg8rv0wggcnig7xh9qivspag4c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/password-vault";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/password-vault";
           sha256 = "17i556xwq6yaxv9v18l1abcpbaz6hygsa4vf4b68fc98vcy7396a";
           name = "password-vault";
         };
@@ -42443,7 +43045,7 @@
           sha256 = "17br64snqby465bjb0l1hzw0pcms5m2knrvb6y9gn3kir4sdi6kn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pastebin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pastebin";
           sha256 = "19fgjcbxgmnm59qjkxhvy2aib5qs5d5a43hwvjdhxq2k6rn3f2gj";
           name = "pastebin";
         };
@@ -42464,7 +43066,7 @@
           sha256 = "0m6qjsq6qfwwszm95lj8c58l75vbmx9r5hm9bfywyympfgy0fa1n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pastehub";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pastehub";
           sha256 = "1slvqn5ay6gkbi0ai1gy1wmc02h4g3n6srrh4fqn72y7b9nv5i0v";
           name = "pastehub";
         };
@@ -42485,7 +43087,7 @@
           sha256 = "1v5mpjb8kavbqhvg4rizwg8cypgmi6ngdiy8qp9pimmkb56y42ly";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pastelmac-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pastelmac-theme";
           sha256 = "168zzqhp2dbfcnknwfqxk68rgmibfw71ksghvi6h2j2c1m08l23f";
           name = "pastelmac-theme";
         };
@@ -42505,7 +43107,7 @@
           sha256 = "c53b4f2c7449bf74648c091f249c33da3ddd8f621474a8901745b4e985cb26ab";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pastels-on-dark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pastels-on-dark-theme";
           sha256 = "0zdr29793gg229r47yjb3plagxc9pszqyy4sx81ffp3rpdf0nlbh";
           name = "pastels-on-dark-theme";
         };
@@ -42526,7 +43128,7 @@
           sha256 = "1ffnkw8djs8kvfjd1crnaqram1vl4w3g1zhsqp74ds0mccsd6830";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/path-headerline-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/path-headerline-mode";
           sha256 = "0dwr8iyq62ad5xkh7r4kpywpypdq1wljsdzwqbq9zdr79yfqx337";
           name = "path-headerline-mode";
         };
@@ -42547,7 +43149,7 @@
           sha256 = "0kkgqaxyrv65rfg2ng1vmmmrc9bm98yqpsv2pcb760287dn0l27m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paxedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paxedit";
           sha256 = "06ymilr0zrwfpyzql7dcpg48lhkx73f2jlaw3caxgsjaz7x3n4ic";
           name = "paxedit";
         };
@@ -42568,7 +43170,7 @@
           sha256 = "138w0dlp3msjmr2x09kfcnxwhdldbz9xjfy7l6lig1x9ima0z5w6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pbcopy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pbcopy";
           sha256 = "1989pkhaha6s2rmgyswnzps92x9hhzymjz4ng4a5jda1b9snp60q";
           name = "pbcopy";
         };
@@ -42589,7 +43191,7 @@
           sha256 = "1jj5h92qakrn9d5d88dvl43b7ppw96rm11hqg3791i6k48nx1d1m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pc-bufsw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pc-bufsw";
           sha256 = "01d7735ininlsjkql7dy57irgwgk4k9br8bl18wq51vgkg90i5k5";
           name = "pc-bufsw";
         };
@@ -42610,7 +43212,7 @@
           sha256 = "0xbbq8ddlirhvv921nrf7bwazh0i98bk0a9xzyx8iqpyg66vbfa8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcache";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pcache";
           sha256 = "1q2wlbc58lyf3dxfs9ppdxvdsp81jmkq874zbd7f39wvc5ckbz0l";
           name = "pcache";
         };
@@ -42631,7 +43233,7 @@
           sha256 = "0pwx1nbgciy28rivvrgka46zihmag9ljrs40bvscgd9rkragm4zy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcmpl-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pcmpl-args";
           sha256 = "0sry4zvr8xmzyygf2m5dms52srkd1apj3i7a3aj23qa8jvndx8vr";
           name = "pcmpl-args";
         };
@@ -42652,7 +43254,7 @@
           sha256 = "0pspxgicc0mkypp94r0jydmkjr3ngv8y4w1xpj93kp79hnvyls0a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcmpl-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pcmpl-git";
           sha256 = "12y9pg1g4i1ghnjvgfdpa6p84h4bcqrr23y9bazwl9n6aj20cmxk";
           name = "pcmpl-git";
         };
@@ -42673,7 +43275,7 @@
           sha256 = "17i5j5005dhzgwzds5jj1a7d31xvbshjc139vawwz2xip5aynji4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcmpl-homebrew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pcmpl-homebrew";
           sha256 = "1gckzcwpg4am1ryjy08aic98mbafb64wkfmnm98d64kiwbpaacly";
           name = "pcmpl-homebrew";
         };
@@ -42694,7 +43296,7 @@
           sha256 = "14pz15by9gp0307bcdv9h90mcr35ya89wbn3y13n7k0z5r45gn58";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcmpl-pip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pcmpl-pip";
           sha256 = "17nmgq4wgv4yl2rsdf32585hfa58j0825mzzajrlwgmjiqx9i778";
           name = "pcmpl-pip";
         };
@@ -42715,7 +43317,7 @@
           sha256 = "0h0p4c08z0dqxmg55fzch1d2f38rywfk1j0an2f4sc94lj7ckbm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcomplete-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pcomplete-extension";
           sha256 = "0m0c9ir44p21rj93fkisvpvi08936717ljmzsr4qdf69b3i54cwc";
           name = "pcomplete-extension";
         };
@@ -42732,11 +43334,11 @@
         src = fetchFromGitHub {
           owner = "joddie";
           repo = "pcre2el";
-          rev = "57ee828d07953329fd85ff85d6a4f27a0ce512a1";
-          sha256 = "0ymbximchjfllrglkwv4lwb2sqprvva77vfbjb6n6kzni0ix70s3";
+          rev = "166a10472002010692dbc35f323ffb8110a294c5";
+          sha256 = "1dpfhrxbaqpgjzac3m9hclbzlnrxq9b8bx6za53aqvml72yzxc6i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcre2el";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pcre2el";
           sha256 = "1l72hv9843qk5p8gi9ibr15wczm804j3ws2v1x7nx4dr7pc5c7l3";
           name = "pcre2el";
         };
@@ -42757,7 +43359,7 @@
           sha256 = "0aaprjczjf3al5vcypw1fsnz5a0xnnlhmvy0lc83i9aqbsa2y8af";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcsv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pcsv";
           sha256 = "1zphndkbva59g1fd319a240yvq8fjk315b1fyrb8zvmqpgk9n0dl";
           name = "pcsv";
         };
@@ -42778,7 +43380,7 @@
           sha256 = "1xkkyz7y08jr71rzdacb9v7gk95qsxlsshkdsxq8jp70irq51099";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pdb-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pdb-mode";
           sha256 = "1ihkxd15kx5m5xb9yxwz8wqbmyk9iaskry9szzdz1j4gjlczb6hy";
           name = "pdb-mode";
         };
@@ -42799,7 +43401,7 @@
           sha256 = "1cj489dv8dw7qkczwib47n7zsdw4k53jkxcqm57a2jpv42bhxz4i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pdf-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pdf-tools";
           sha256 = "1hnc8cci00mw78h7d7gs8smzrgihqz871sdc9hfvamb7iglmdlxw";
           name = "pdf-tools";
         };
@@ -42820,7 +43422,7 @@
           sha256 = "1clvrmvijwpffigh5f29vnwcvffqk0nrvlz26158hip1z9x7nah3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/peacock-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/peacock-theme";
           sha256 = "0jpdq090r37d07bm52yx3x9y3gsip6fyxxq1ax1k5k0r0js45kq9";
           name = "peacock-theme";
         };
@@ -42841,7 +43443,7 @@
           sha256 = "11nv6pll0zj9dkgzlzgav39a6x3sfi7kvfhwm96fa3iy4v8bixrb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/peek-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/peek-mode";
           sha256 = "07wcnh3jmp2gi9xhd3d8i2n0pr2g9kav497nnz94i85awhzf8fi4";
           name = "peek-mode";
         };
@@ -42862,7 +43464,7 @@
           sha256 = "1qi9qzcvclyw9wiamsw0z8q09hs0mfhaj2giny42nd6sqacvfr7m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/peep-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/peep-dired";
           sha256 = "16k5y3h2ip96k071vhx83avg4r4nplnd973b1271vvxbx2bly735";
           name = "peep-dired";
         };
@@ -42883,7 +43485,7 @@
           sha256 = "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/peg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/peg";
           sha256 = "0nxy9xn99myz0p36m4jflfj48qxhhn1sspbfx8d90030xg3cc2gm";
           name = "peg";
         };
@@ -42903,7 +43505,7 @@
           sha256 = "1rh87jf0a15q35a8h00bx6k5wa931rb6gh600zbs7j4r3y8qsylf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/per-buffer-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/per-buffer-theme";
           sha256 = "1czcaybpfmx4mwff7hs07iayyvgvlhifkickccap6kpd0cp4n6hn";
           name = "per-buffer-theme";
         };
@@ -42924,7 +43526,7 @@
           sha256 = "0fzypcxxd5zlkcybz0xppf09l0vf4vsfisr2y3ijsmxhg7yrwzj5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/perl-completion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/perl-completion";
           sha256 = "01p17mlkwjm60f14arda3ly8ng0r98nn3rly94ghn6jr7r7fv14b";
           name = "perl-completion";
         };
@@ -42945,7 +43547,7 @@
           sha256 = "11fs78b7ssz18wr35vxf6h4zpfj4l4vsikfzayq6hyqjnchv7b45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/perl6-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/perl6-mode";
           sha256 = "0af1djypd8n0n1fq10sl8mrdg27354kg9g87d6xz4q5phvi48cqv";
           name = "perl6-mode";
         };
@@ -42966,7 +43568,7 @@
           sha256 = "0wg0cpqxzfgln6xdngzspsbfirn9a5jxpgk66m0fpi33215z9q26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/perlbrew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/perlbrew";
           sha256 = "1qadwkcic2qckqy8hgrnj08ajhxayknhpyxkc6ir15vfqjk5crr8";
           name = "perlbrew";
         };
@@ -42987,7 +43589,7 @@
           sha256 = "0h05j55y3csq91a5m2fg99y4rzsh7zca7hnifb6kic5zb3nahi00";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/persistent-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/persistent-scratch";
           sha256 = "0iai65lsg3zxj07hdb9201w3rwrvdb3wffr6k2jdl8hzg5idghn1";
           name = "persistent-scratch";
         };
@@ -43008,7 +43610,7 @@
           sha256 = "14p20br8vzxs39d4hswzrrkgwql5nnmn5j17cpbabzjvck42rixc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/persistent-soft";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/persistent-soft";
           sha256 = "0a4xiwpgyyynjf69s8p183mqd3z53absv544ggvhb2gkpm6jravc";
           name = "persistent-soft";
         };
@@ -43021,15 +43623,15 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "20160129.655";
+        version = "20160221.655";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "fe239586593c9f7884d4a105ce21038ab464e251";
-          sha256 = "0ah2zimbs59ivg7mvnz5zv3q4lx3ms43ip49l2zyf8jf2dnmhpn0";
+          rev = "d38deb4f09be1c945862e37d673e236bf948107b";
+          sha256 = "0p18290a79ccnv7dmfqy69jhdayj3fj2q82w5y9dzv0ln641rgxr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/persp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/persp-mode";
           sha256 = "1bgni7y5xsn4a21494npr90w3320snfzw1hvql30xrr57pw3765w";
           name = "persp-mode";
         };
@@ -43050,7 +43652,7 @@
           sha256 = "0b9hz253m6d58dwsjsk9d1fw0ql33m9wfvyx10ncsqbr0j0s98k5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/persp-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/persp-projectile";
           sha256 = "10l2kqjyigg98qbbpf3qf4d5bm63kkk4vp7ip8fibgj1p9gqmnxm";
           name = "persp-projectile";
         };
@@ -43063,15 +43665,15 @@
     perspective = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "perspective";
-        version = "20151211.1654";
+        version = "20160219.1822";
         src = fetchFromGitHub {
           owner = "nex3";
           repo = "perspective-el";
-          rev = "b6f4f05951d3f0d16a503bf462f136c689ede4df";
-          sha256 = "1ajmyl3bg01a3gkhay4qibgk9a0r6s8rhf1cc1678w3cm0w6yvmd";
+          rev = "add79422bf742c2d605137ba5fa02f1ec9bad9e2";
+          sha256 = "1acbhnqnajk21jz0m575yq4fvdxfwjbq90nvwp7ikz690nhvjb0k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/perspective";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/perspective";
           sha256 = "150dxcsd0ylvfi9mmfpcki1wd3nl8q9mbszd3dgqfnm40yncklml";
           name = "perspective";
         };
@@ -43092,7 +43694,7 @@
           sha256 = "1zh7v4nnpzvbi8yj1ynlqlawk5bmlxi6s80b5f2y7hkdqb5q26k0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pg";
           sha256 = "0n0187ndvwza1nis9a12h584qdqkwqfzhdw21kz5d1i6c43g7gji";
           name = "pg";
         };
@@ -43113,7 +43715,7 @@
           sha256 = "0c9d4c24ic67y07y74bv5b7vc56b6l0lbh2fbzm870r1dl5zbzcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pgdevenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pgdevenv";
           sha256 = "0za35sdwwav81wpk4jjqh56icaswwxxyg3bqqp0qiz24llb5ln1w";
           name = "pgdevenv";
         };
@@ -43134,7 +43736,7 @@
           sha256 = "1qxsc5wyk8l9gkgmqy3mzwxdhji1ljqw9s1jfxkax7fyv4d1v31p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ph";
           sha256 = "0azx4cpfdn01yrqyn0q1gg9z7w0h0rn7zl39v3dx6yidd76ysh0l";
           name = "ph";
         };
@@ -43155,7 +43757,7 @@
           sha256 = "0y77ld1cmfpv9p7yx2mlbvjm5ivsrf2j0g0h4zabfrahz22v39d4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phabricator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phabricator";
           sha256 = "07988f2xyp76xjs25b3rdblhmijs2piriz4p0q92jw69bdvkl14c";
           name = "phabricator";
         };
@@ -43176,7 +43778,7 @@
           sha256 = "14g06ndxrqz80kdyhil6ajcqqxkfa77r1gr7vwqa9sq6jgm8dpx5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phi-autopair";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phi-autopair";
           sha256 = "1ya1bvh28qgz1zg9kdh2lzbsf0w0lx4xr42mdrjwaz3bbfa9asg4";
           name = "phi-autopair";
         };
@@ -43197,7 +43799,7 @@
           sha256 = "1rchxhp4kji5kbg8kzkzdbfy8sdbgbqd5g59cch7ia9agh5jvwyx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phi-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phi-grep";
           sha256 = "1y5lq6lq9qdydbypb1pjnxryh94a295nnqqh2x27whiwdiysirjj";
           name = "phi-grep";
         };
@@ -43218,7 +43820,7 @@
           sha256 = "0d2c579rg8wdfmn94nzaix9332jch4wlr939jszls330s38d0iv4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phi-rectangle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phi-rectangle";
           sha256 = "08yw04wmbgbbr60i638m0rspfwn3cp47ky5ssgjcgcmmdgg9yfvy";
           name = "phi-rectangle";
         };
@@ -43239,7 +43841,7 @@
           sha256 = "10kyq3lkhmbmj1hl9awzc0w8073dn9mbjd5skh660ljg5mmi6x62";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phi-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phi-search";
           sha256 = "0nj06ixl76dd80zg83q4bi8k224mcwb612mr4gd1xppj5k8xl03g";
           name = "phi-search";
         };
@@ -43260,7 +43862,7 @@
           sha256 = "1b44947hncw4q42fxxrz6fm21habzp4pyp0569xdwysrx2rca2fn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phi-search-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phi-search-dired";
           sha256 = "1gf3vs3vrp5kbq4ixnj7adazmnqixi63qswgc2512p10gf7inf8p";
           name = "phi-search-dired";
         };
@@ -43281,7 +43883,7 @@
           sha256 = "0r6cl1ng41s6wsy5syjlkaip0mp8h491diipdc1psbhnpk4vabsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phi-search-mc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phi-search-mc";
           sha256 = "07hd80rbyzr5n3yd7hv1j51nl6pvcxmln20g6xvw8gh5yfl9k0m8";
           name = "phi-search-mc";
         };
@@ -43302,7 +43904,7 @@
           sha256 = "1k8hjnkinzdxy9qxldsyvj6npa2sv48m905d1cvxr8lyzpc5hikh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phi-search-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phi-search-migemo";
           sha256 = "0qk73s09sasm438w29j5z2bmlb60p1mgbv2ch43rgq8c6kjzg6h6";
           name = "phi-search-migemo";
         };
@@ -43323,7 +43925,7 @@
           sha256 = "1fg63g1cm9mp50sf3ldcb0pr4bvlfxx010arisxdkj102pmib2ri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phoenix-dark-mono-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phoenix-dark-mono-theme";
           sha256 = "15in299j170n0wxmkg3cx1zzx1n7r1ifraqqzfqhcnk8i8lmc939";
           name = "phoenix-dark-mono-theme";
         };
@@ -43344,7 +43946,7 @@
           sha256 = "042yw44d5pwykl177sdh209drc5f17yzhq0mxrf7qhycbjs4h8cg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phoenix-dark-pink-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phoenix-dark-pink-theme";
           sha256 = "0bz6iw73d85bi12qqx6fdw3paqknrxvn0asbwjmgdcrlqrfczjlr";
           name = "phoenix-dark-pink-theme";
         };
@@ -43365,7 +43967,7 @@
           sha256 = "1l64rka9wrnwdgfgwv8xh7mq9f1937z2v3r82qcfi6il3anw4zm0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php-auto-yasnippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/php-auto-yasnippets";
           sha256 = "1hhddvpc80b6wvjpbpibsf24rp5a5p45m0bg7m0c8mx181h9mqgn";
           name = "php-auto-yasnippets";
         };
@@ -43386,7 +43988,7 @@
           sha256 = "10lzbyr7z95mynz885k75n2ibsy92dh3mg3s5m69n03jnf9gv1jy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php-boris";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/php-boris";
           sha256 = "19yfbrlfqikix2lnnlbpzm6yakjhl84ix0zra2ycpvgg2pl88r0g";
           name = "php-boris";
         };
@@ -43407,7 +44009,7 @@
           sha256 = "1wk7vq80v97psxfg0pwy4mc6kdc61gm6h1vgl9p71ii6g6zvzcqg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php-boris-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/php-boris-minor-mode";
           sha256 = "1cmpd303chldss7kylpinv8qc3c78srz02a9cp9x79c8arq7apwl";
           name = "php-boris-minor-mode";
         };
@@ -43428,7 +44030,7 @@
           sha256 = "0hm6myvf91f4d2yfc7fs2xky9m8hfnimx1gkfzmn9f5pcc2l2p0i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/php-eldoc";
           sha256 = "1q5fkl8crqrgxik2mxbkqv10qnqhqrazd66rgfw797s3jcchv58j";
           name = "php-eldoc";
         };
@@ -43449,7 +44051,7 @@
           sha256 = "0206jv7rz9gm016lpfdwh2l0z6da25szc6hfxgcz2qvkzjpvrlr6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/php-mode";
           sha256 = "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y";
           name = "php-mode";
         };
@@ -43470,7 +44072,7 @@
           sha256 = "0f1n0jcla157ngqshq5n8iws216ar63ynjd6743cbdrzj0v030wg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php+-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/php+-mode";
           sha256 = "1ibcsky6la3l7gawpgx814w1acjf73b68i6wbb4p6saxhwg6adik";
           name = "php-plus--mode";
         };
@@ -43491,7 +44093,7 @@
           sha256 = "163albjkq7ldc9fki368540m7nl58qa70wfpff08gx3gsvywfnyi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php-refactor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/php-refactor-mode";
           sha256 = "0gj0nv6ii7pya0hcxs8haz5pahj0sa12c2ls53c3j85in645zb3s";
           name = "php-refactor-mode";
         };
@@ -43512,7 +44114,7 @@
           sha256 = "09rinyx0621d7613xmbyvrrlav6d4ia332wkgg0m9dn265g3h56z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phpcbf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phpcbf";
           sha256 = "1hf88ys4grffpqgavrbc72dn3m7crafgid2ygzx9c5j55syh8mfv";
           name = "phpcbf";
         };
@@ -43533,7 +44135,7 @@
           sha256 = "1zghw5nfm4a9j98vsaw4fc8r4f98s5fhgvgbnbyyxapl851fa9i6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phpunit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phpunit";
           sha256 = "0nj8ss1yjkcqnbnn4jgbp0403ljjk2xhipzikdrl3dbxlf14i4f8";
           name = "phpunit";
         };
@@ -43554,7 +44156,7 @@
           sha256 = "053jqzl0sp3dnl4919vi30xqrdcpi9jsqx5hndj1bprf7926w11d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pianobar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pianobar";
           sha256 = "16vsf2cig9qjbh9s58zb5byjmyghxbsxpzpm5hyyrv251jap1jjn";
           name = "pianobar";
         };
@@ -43575,7 +44177,7 @@
           sha256 = "0p91ysyjksbravnw3l78mshay6swgb5k1zi5bbppppk8zkmdp115";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/picolisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/picolisp-mode";
           sha256 = "1n56knbapyfs8n23arzlz27y0q4846r64krwlwh8agfqkcdw9dp5";
           name = "picolisp-mode";
         };
@@ -43596,7 +44198,7 @@
           sha256 = "1yg9n265ljdjlh6a3jrjwyvj3f76wp68x25bl0p8dxrrsyr9kvfx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pig-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pig-mode";
           sha256 = "0gmvc4rrqkn0cx8fk1sxk6phfbpf8dcba3k6i24k3idcx8rxsw3x";
           name = "pig-mode";
         };
@@ -43617,7 +44219,7 @@
           sha256 = "1yg9n265ljdjlh6a3jrjwyvj3f76wp68x25bl0p8dxrrsyr9kvfx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pig-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pig-snippets";
           sha256 = "1sqi0a2dsqgmabkrncxiyrhibyryyy25d11b15ybhlngd05wqbx2";
           name = "pig-snippets";
         };
@@ -43638,7 +44240,7 @@
           sha256 = "19i8hgzr7kdj4skf0cnv6vlsklq9qcyxcv3p33k9vgq7y4f9mah8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pillar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pillar";
           sha256 = "1lklky3shyvm1iygp621hbldpx37m0a9vd5l6mxs4y60ksj6z0js";
           name = "pillar";
         };
@@ -43659,7 +44261,7 @@
           sha256 = "0wy9c37g6m5khchlp8qvfnjgkwq4r38659adcm5prvzjgzqhlfja";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pinboard-api";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pinboard-api";
           sha256 = "0yzvgnpkj2fhl01id36nc5pj8vyb05bllraiz3lwwcc66y98h9n0";
           name = "pinboard-api";
         };
@@ -43680,7 +44282,7 @@
           sha256 = "1wc31r5fpcia4n4vbpg7vv3rzrnjzh18yygi3kp4wvl2wzx2azqh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pinot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pinot";
           sha256 = "1kjzq02pddnkia637xz2mnjjyglyh6qzragnf7nnxbw9ayiim58i";
           name = "pinot";
         };
@@ -43701,7 +44303,7 @@
           sha256 = "096izagfjw8cnxjq3v70x8a55npyxnr40mg1fc9b1jnqw6qwf491";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pinyin-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pinyin-search";
           sha256 = "1si693nmmxgg0kp5mxvj5nq946kfc5cv3wfsl4znbqzps8qb2b7z";
           name = "pinyin-search";
         };
@@ -43722,7 +44324,7 @@
           sha256 = "0j4h6q1s2s9dw1pp22xsajchwg8nh3x4x5qxbzf19i1xbpcghw7h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pip-requirements";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pip-requirements";
           sha256 = "1wsjfyqga7pzp8gsm5x53qrkn40srairbjpifyrqbi2fpzmwhrnz";
           name = "pip-requirements";
         };
@@ -43743,7 +44345,7 @@
           sha256 = "1sbwqrk9nciqwm53sfbq3nr9f9zzpz79dmxs8yp005dk7accdlls";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pivotal-tracker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pivotal-tracker";
           sha256 = "195wcfn434yp0p93zqih1snkkg1v7nxgb4gn0klajahmyrrjq2a2";
           name = "pivotal-tracker";
         };
@@ -43764,7 +44366,7 @@
           sha256 = "0nnvf2p593gn8sbyrvczyll030xgnkxn900a2hy7ia7xh0wmvddp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pixie-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pixie-mode";
           sha256 = "16z15yh78837k548xk5widdmy6fv03vym6q54i40knmgf5cllsl8";
           name = "pixie-mode";
         };
@@ -43777,15 +44379,15 @@
     pixiv-novel-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pixiv-novel-mode";
-        version = "20150110.54";
+        version = "20160220.821";
         src = fetchFromGitHub {
           owner = "zonuexe";
           repo = "pixiv-novel-mode.el";
-          rev = "65809cf31816257d8c6c92868af6c30abf7b2043";
-          sha256 = "14gn2qd72x3zfqzh2cngxcjpdiibyki1g4d1vdav5v9vcbglgm5d";
+          rev = "0d1ca524d92b91f20a7105402a773bc21779b434";
+          sha256 = "18rvnvm097ca4yc1nfswdv7dfqg36insnif5kfj19aa60m9qxl09";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pixiv-novel-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pixiv-novel-mode";
           sha256 = "0f1rxvf9nrw984122i6dzsgik9axfjv6yscmg203s065n9lz17px";
           name = "pixiv-novel-mode";
         };
@@ -43806,7 +44408,7 @@
           sha256 = "1xkdbyhz9mgdz5zmjm4hh050klsl12w5lkckw2l77ihcxv0vjnf2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pkg-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pkg-info";
           sha256 = "0whcvralk76mfmvbvwn57va5dkb1irj7iwffgddi7r0ima49iszx";
           name = "pkg-info";
         };
@@ -43827,7 +44429,7 @@
           sha256 = "077vp3fxwxj7b98ydw6iyi391w3acp73qwk6615yqdylpp66m750";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pkgbuild-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pkgbuild-mode";
           sha256 = "1lp7frjahcpr4xnzxz77qj5hbpxbxm2g28apkixrnc1xjha66v3x";
           name = "pkgbuild-mode";
         };
@@ -43848,7 +44450,7 @@
           sha256 = "0rpiyp95k14fsc5hdbnj4hs3snh0vm8a2skcplsdwkmb5j9547w1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plan9-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/plan9-theme";
           sha256 = "0bvr877mc79s1shr82b33ipspz09jzc3809c6pkbw0jqpfid44cc";
           name = "plan9-theme";
         };
@@ -43869,7 +44471,7 @@
           sha256 = "0q4zdw58yawqp9rhx04lhq0v7iaf61ydbw19gpw4an85j2hxrkzq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/planet-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/planet-theme";
           sha256 = "1mhbydvk7brmkgmij5gpp6l9ixcyh1g3r4fw3kpq8nvgbwknsqc9";
           name = "planet-theme";
         };
@@ -43890,7 +44492,7 @@
           sha256 = "0jvs051ncpv7pwx2kr14fm1wqakabwc031xcv7lba0mx7shxzqdg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plantuml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/plantuml-mode";
           sha256 = "0fg313mx9jz92lf9lr5apvma9ixfz02dvyzw1phsgzawi7hai264";
           name = "plantuml-mode";
         };
@@ -43911,7 +44513,7 @@
           sha256 = "1k3bqv5y2xp1jl2hpf8qhs11yzhcl8k40fxqjzv7mvc0ysq9y6wb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/platformio-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/platformio-mode";
           sha256 = "022l20sfyfkvp6kmmqxr7gcmcdx6b1dgsakjjnx8fknrpxr5kyps";
           name = "platformio-mode";
         };
@@ -43932,7 +44534,7 @@
           sha256 = "11cbpgjsnw8fiqf1s12hbm9qxgjcw6y2zxx7wz4wg7idmi7m0b7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/plenv";
           sha256 = "0dw9fy5wd9wm76ag6yyw3f9jnlj7rcdcxgdjm30h514qfi9hxbw4";
           name = "plenv";
         };
@@ -43953,7 +44555,7 @@
           sha256 = "07hspp4bkb3f5dm0l1arm0w1m04cq4glg81x4a9kf7bl601wzki2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plim-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/plim-mode";
           sha256 = "0247fpvxki5jhxw6swv7pcw0qwxrqnp75acnfss2lf984vggzhxi";
           name = "plim-mode";
         };
@@ -43974,7 +44576,7 @@
           sha256 = "1r2yxa7gqr0z9fwhx38siwjpg73a93rdmnhr4h6nm6lr32vviyxm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plsense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/plsense";
           sha256 = "1ka06r4ashhjkfyzql9mfvs3gj7n684h4gaycj29w4nfqrhcw9va";
           name = "plsense";
         };
@@ -43995,7 +44597,7 @@
           sha256 = "0s34nbqqy6aqi113xj452pbmqp43046wfbfbbfv1xwhybgq0c1j1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plsense-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/plsense-direx";
           sha256 = "0qd4b7gkmn5ydadhp70995rap3643s1aa8gfi5izgllzhg0i864j";
           name = "plsense-direx";
         };
@@ -44013,7 +44615,7 @@
           sha256 = "1v0wvy9fd1qq3aq83x5jv3953n0n51x7y2r2ql11j0h8xasy42p1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plsql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/plsql";
           sha256 = "1jvppmfdll34b8dav5dvbabfxiapv92p7lciblj59a707bbdb7l1";
           name = "plsql";
         };
@@ -44032,7 +44634,7 @@
           sha256 = "0x3s9fj41n6a21la762qm1si9ysv3zj5bbp6ykfskr73sxq6s9ff";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pmdm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pmdm";
           sha256 = "1zmy6cbnqhsbwc5vx30mx45xn88d2186hgrl75ws7vvbl197j03b";
           name = "pmdm";
         };
@@ -44053,7 +44655,7 @@
           sha256 = "1p1j2kfwj7gzir7q5ls34k8764kwbnb6d0dhlw4zb4kvwlidp6c1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/point-stack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/point-stack";
           sha256 = "17z9mc49x4092axs7lq6b6z7yrrhkl8bdx5f8gq6qy5lampgyzch";
           name = "point-stack";
         };
@@ -44071,7 +44673,7 @@
           sha256 = "13c1iw77ccvrfrv4lyljg8fpm7xqhnv29yzvig8wr8b5j2vsd8bz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/point-undo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/point-undo";
           sha256 = "0by7ifj1lf0w9pp7v1j9liqjs40k8kk9yjnznxchq172816zbg3k";
           name = "point-undo";
         };
@@ -44092,7 +44694,7 @@
           sha256 = "016cjy5pnnqccjqb0njqc9jq6kf6p165nlki83b8c0sj75yxghav";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pointback";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pointback";
           sha256 = "198q511hixvzc13b3ih89xs9g47rdvbiixn5baqakpmpx3a12hz4";
           name = "pointback";
         };
@@ -44105,15 +44707,15 @@
     polymode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "polymode";
-        version = "20151216.733";
+        version = "20160217.1428";
         src = fetchFromGitHub {
           owner = "vitoshka";
           repo = "polymode";
-          rev = "af589492a49b4703d390a7a91b281cf0d10d91a7";
-          sha256 = "0dlgmp1vmpvfjx19jz52xjmpg0fi1d0gy3zz7rsyjdkdw8dmr1v6";
+          rev = "e90497a1e44adb95ec3cd761a95a47e4775849ee";
+          sha256 = "0cg7pgzd19pq9m6gbj6pl2cnaq2impjbnss2w177i3ahkfm4rl4k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/polymode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/polymode";
           sha256 = "0ndavaan7k55l3ghm5h08i0slmmzc82c0gl4b8w91fa8bi2lq4h4";
           name = "polymode";
         };
@@ -44134,7 +44736,7 @@
           sha256 = "1dlk0ypw8316vgvb7z2p7fvaiz1wcy1l8crixypaya1zdsnh9v1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pomodoro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pomodoro";
           sha256 = "075sbypas8xlhsw8wg3mgi3fn5yf7xb3klyjgyy8wfkgdz0269f8";
           name = "pomodoro";
         };
@@ -44155,7 +44757,7 @@
           sha256 = "1g1yw0ykwswl9dnicyi7kxskqqry40wjykshgrqhs4k09j3jnacr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pony-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pony-mode";
           sha256 = "1hgiryhpxv30bjlgv9pywzqn2ypimwzdhx03znqvn56zrwn1frnl";
           name = "pony-mode";
         };
@@ -44168,15 +44770,15 @@
     pony-snippets = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, yasnippet }:
     melpaBuild {
         pname = "pony-snippets";
-        version = "20160126.2307";
+        version = "20160204.2211";
         src = fetchFromGitHub {
           owner = "seantallen";
           repo = "pony-snippets";
-          rev = "91c17c8af222f8177df12122d36399ea1ec6e8b4";
-          sha256 = "139j696lvwpx5kwmk37xhaklid3zs431lyqyml2hy8wbz316jrra";
+          rev = "a6615ab0693f17fc47ec45753202010238157810";
+          sha256 = "002jhj47b9aqrfjy8b31ccbqhah5sn9wn7dmrhm1wbbgj9rfyw6s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pony-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pony-snippets";
           sha256 = "06rrzfg20kzpscnqr2lin9jvrcydq4wnrv7nj1d0lm6988qz88jx";
           name = "pony-snippets";
         };
@@ -44197,7 +44799,7 @@
           sha256 = "0jlycv0ck5kbszwc0v2gbka6k5h39nz8763ws0v8jada7zzmyvxm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ponylang-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ponylang-mode";
           sha256 = "02fq0qp7f4bzmynzszrwskfs78nzsmf413qjxqndrh3hamixzpi1";
           name = "ponylang-mode";
         };
@@ -44218,7 +44820,7 @@
           sha256 = "0n1w1adglbavqgrv16rzhym72c3q083mh0c8yl5lj7adn4nr4gr3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pophint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pophint";
           sha256 = "1chq2j79hg095jxw5z3pz4qicqrccw0gj4sxrin0a55hnprzzp72";
           name = "pophint";
         };
@@ -44239,7 +44841,7 @@
           sha256 = "0ja1kq4pl62zxlzwv2m8zzb55lg2fl366bi9pzvxl38frvbqg8qx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/poporg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/poporg";
           sha256 = "08s42689kd78h2fmw230ja5dd3c3b4lx5mzadncwq0lj91y86kd8";
           name = "poporg";
         };
@@ -44260,7 +44862,7 @@
           sha256 = "19sbdxs6l66nflfb4kmx4lb6z0shwpfq79b5h9hhi0xr70xacd4b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/popup";
           sha256 = "151g00h9rkid76qf6c53n8bncsfaikmhj8fqcb3r3a6mbngcd5k2";
           name = "popup";
         };
@@ -44281,7 +44883,7 @@
           sha256 = "1q9zajv6g7mi6k98kzq3498nhmdkp1z9d2b8vgzbk7745d39gm9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popup-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/popup-complete";
           sha256 = "04bpm31zx87j390r2xi1yl4kyqgalmyqc48xarsm67zfww9fw9c1";
           name = "popup-complete";
         };
@@ -44294,15 +44896,15 @@
     popup-imenu = callPackage ({ dash, fetchFromGitHub, fetchurl, flx-ido, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "popup-imenu";
-        version = "20160108.923";
+        version = "20160214.1104";
         src = fetchFromGitHub {
           owner = "ancane";
           repo = "popup-imenu";
-          rev = "81a47cb6ffa5082fcb1165835040228057474c48";
-          sha256 = "0fvj61n0kriniz1v96lxbdb9x6gbx00xwkcg83ajqv7f18j3m6wh";
+          rev = "29ac87726987ab5d451e04251336fd8c2a782450";
+          sha256 = "07gwfmp53gwk2zpip5m1vrn3i36c22c71z3grn65hm3k3ykl2a1y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popup-imenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/popup-imenu";
           sha256 = "0lxwfaa9vhdn55dj3idp8c3fg1g26qsqq46y5bimfd0s89bjbaxn";
           name = "popup-imenu";
         };
@@ -44323,7 +44925,7 @@
           sha256 = "1zdwlmk3vr0mq0dxrnkqjncalnbmvpxc0lma2sv3a4czl8yv0inn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popup-kill-ring";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/popup-kill-ring";
           sha256 = "1jfw669xi2983jj3hiw5lyhc0rc0318qrmqx03f7m4ylg70dgxip";
           name = "popup-kill-ring";
         };
@@ -44344,7 +44946,7 @@
           sha256 = "19c916bz354di7p4md8456xhf3i72db86mwlk2wrq0d4kx16dh0c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popup-switcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/popup-switcher";
           sha256 = "1888xiqhrn7fcpjnr3smchmmqwfayfbbyvdkdb79c6drzjcvidp1";
           name = "popup-switcher";
         };
@@ -44365,7 +44967,7 @@
           sha256 = "0nips9npm4zmz3f37vvb4s0g1ci0p9cl6w0z4sc6agg4rybjhpdp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/popwin";
           sha256 = "1zp54nv8rh0b3g8y5aj4793miiw2r1ijwbzq31lkwmbdr09mixmf";
           name = "popwin";
         };
@@ -44386,7 +44988,7 @@
           sha256 = "1pm4x74pw67m2izr9dir201dn5g9icgk6h2j8rqvasgx8v8krv3i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/portage-navi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/portage-navi";
           sha256 = "1wjkh8xj5120v9fz1nrpkd6x4f22ni8h2lfkd82df7kjz6bzdfwg";
           name = "portage-navi";
         };
@@ -44407,7 +45009,7 @@
           sha256 = "168hl76rhj6f5ncmrij4rd3z55228h6kb23384h2phsjw0avgf23";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pos-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pos-tip";
           sha256 = "13qjz112qlrnq34lr70087gshzq8m44knfl6694hfprzjgix84vh";
           name = "pos-tip";
         };
@@ -44417,6 +45019,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    pov-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "pov-mode";
+        version = "20120825.916";
+        src = fetchFromGitHub {
+          owner = "melmothx";
+          repo = "pov-mode";
+          rev = "e60e497f84a310814ccf97b056da77dd0f42394f";
+          sha256 = "14silfng5rbdc8hnzswjmqk705pncjlk8iphjcxcm799h44pnlcr";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pov-mode";
+          sha256 = "1xzdmlfi5ixdh08v0ca80zkh9n3gfn4ql5pnl3jh745wbj9azxp9";
+          name = "pov-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/pov-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     pow = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "pow";
@@ -44428,7 +45051,7 @@
           sha256 = "1jzqav2lchr0ggckjq9rwlxwryi7m7xnmn8471zgiamd1h04ddqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pow";
           sha256 = "05wc4ylp0xjqbzrm046lcsv4aw2a6s2rfv1ra38bfr0dai6qrsrn";
           name = "pow";
         };
@@ -44449,7 +45072,7 @@
           sha256 = "0dq7fqlv72p72hbshzbwz5k40mqfdw10v9hsd1m18s2rf7082570";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/powerline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/powerline";
           sha256 = "0gsffr6ilmckrzifsmhwd42vr85vs42pc26f1205pbxb7ma34dhx";
           name = "powerline";
         };
@@ -44470,7 +45093,7 @@
           sha256 = "1c8y4r7zdr6764kzs5bc64idv2pfjvi78lg2f1d2hp1595ia8y5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/powerline-evil";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/powerline-evil";
           sha256 = "0cdnmq9f06lzkj0hs948a7j5sgg6fl5f36bfnyaxgss23akbfjhr";
           name = "powerline-evil";
         };
@@ -44483,15 +45106,15 @@
     powershell = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "powershell";
-        version = "20160127.2323";
+        version = "20160210.2058";
         src = fetchFromGitHub {
           owner = "jschaf";
           repo = "powershell.el";
-          rev = "7feddfc9ea073b374575c67a10692b7bfc35907b";
-          sha256 = "096dks3wib5x29k722d7qkgr61n3qk29gw3rzkwsrid23zhvgnkn";
+          rev = "0e51db56fddcafcfe0611142ea939969673c2b58";
+          sha256 = "1ym373mjyk3vfbw2c918zgaf9m35j8bkrpcj9d8m9drf4h7a8d3b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/powershell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/powershell";
           sha256 = "162k8y9k2n48whaq93sqk86zy3p9qvsfxgyfv9n1nvk4l5wn70wk";
           name = "powershell";
         };
@@ -44509,7 +45132,7 @@
           sha256 = "10gsdjdr8qngimqh57qxcljjnypbf38asxqb3zlfwc2ls52fc19q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pp-c-l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pp-c-l";
           sha256 = "0gbqxlrsh9lcdkrj8bqh1mpxyhdlwbaxz4ndp5s90inmisaqb83v";
           name = "pp-c-l";
         };
@@ -44527,7 +45150,7 @@
           sha256 = "0zlmcrg8gx812gm04cil7p2z0g4814c158yv1ghmrbxshn8p45fg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pp+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pp+";
           sha256 = "1ng5x7dp85y6yqj6q43h08qdnapg2j1ab8rmc47w4w79d1pryniq";
           name = "pp-plus";
         };
@@ -44548,7 +45171,7 @@
           sha256 = "0pv671j8g09pn61kkfb3pa9axfa9zd2jdrkgr81rm2gqb2vh1hsq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ppd-sr-speedbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ppd-sr-speedbar";
           sha256 = "1m2918hqvb9c6rgb5szs95ds99gdjdxggcbdfqzmbb5sz2936av8";
           name = "ppd-sr-speedbar";
         };
@@ -44569,7 +45192,7 @@
           sha256 = "0yrfd9qaz16nqcvjyjm9qci526qgkv6k51q5752h3iyqkxnss1pd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/preproc-font-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/preproc-font-lock";
           sha256 = "1ra0lgjv6713zym2h8pblf2ryf0f658l1khbxbwnxl023gkyj9v4";
           name = "preproc-font-lock";
         };
@@ -44590,7 +45213,7 @@
           sha256 = "1dyi9nc2q43jf87xiz9xw42irrbla2vyixifdiibh6nm9misnfj0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/preseed-generic-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/preseed-generic-mode";
           sha256 = "0c0zs07lspwczbcba56fai0rshjzx9zd3jqxgj9nwjf9xlcr8m3j";
           name = "preseed-generic-mode";
         };
@@ -44608,7 +45231,7 @@
           sha256 = "1fn24399wsn12453py0hw2vbbkrkakiwi06cjvjzsdk7g3326ma4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pretty-lambdada";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pretty-lambdada";
           sha256 = "16v5fgifz672c37xyzv557mm6za4rldvdrb26vdymxqg4fy62fd6";
           name = "pretty-lambdada";
         };
@@ -44629,7 +45252,7 @@
           sha256 = "0ccqym98c6zdyrparj5n97bpp9rspxb3z5lqfcrjypp0kn04z1ss";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pretty-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pretty-mode";
           sha256 = "1zxi4nj7vnchiiz1ndx17b719a1wipiqniykzn4pa1w7dsnqg21f";
           name = "pretty-mode";
         };
@@ -44650,7 +45273,7 @@
           sha256 = "1n0594msgy53ia58gjfkm3z3cnmq52wrq5992fm28s4jgazbgdfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pretty-sha-path";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pretty-sha-path";
           sha256 = "0qqsg383391dnsk46xm8plq7xmdmnis3iv7h7dmchpzd99bkm9lq";
           name = "pretty-sha-path";
         };
@@ -44671,7 +45294,7 @@
           sha256 = "1f00l9f6an1mh8yhf629mw0p37m4jcpl8giz47xbdyw1k6bqn830";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pretty-symbols";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pretty-symbols";
           sha256 = "0d1ad2x4md0n3fad3s2355wm8hl311qdhih1gkdqwdaj4i1d6gvb";
           name = "pretty-symbols";
         };
@@ -44692,7 +45315,7 @@
           sha256 = "0zng64f5vwnpkf9fk59yv1ndc646q608a6awr1y9qk0mhzbfzhqm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/private";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/private";
           sha256 = "1glpcwcyndyn683q9mg99hr0h3l8pz7rrhbnfak01v826d5cnk9g";
           name = "private";
         };
@@ -44713,7 +45336,7 @@
           sha256 = "1pxr5a9ik09k0f58lawhxiv179n5j8q24zhrs9vjk93yskl1ydwn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/private-diary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/private-diary";
           sha256 = "0dgnf375c00nlkp66kbkzsf469063l03b9miiplbhd63zshlv1i1";
           name = "private-diary";
         };
@@ -44734,7 +45357,7 @@
           sha256 = "0nly5h0d6w8dc08ifb2fiqcn4cqcn9crkh2wn0jzlz4zd2x75qrb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/proc-net";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/proc-net";
           sha256 = "0562x2s3kk9vlaavak4lya1nlmn4mwlzlc7nw1l3687q023z4hmv";
           name = "proc-net";
         };
@@ -44755,7 +45378,7 @@
           sha256 = "1smw786dcjvdn2j6bwqn2rfzhw039rrhxiv7vlrgzm0fyy2v1q6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/processing-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/processing-mode";
           sha256 = "184yg9z14ighz9djg53ji5dgnb98dnxkkwx55m8f0f879x31i89m";
           name = "processing-mode";
         };
@@ -44776,7 +45399,7 @@
           sha256 = "1smw786dcjvdn2j6bwqn2rfzhw039rrhxiv7vlrgzm0fyy2v1q6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/processing-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/processing-snippets";
           sha256 = "09vkm9asmjz1in0f63s7bf4amifspsqf5w9pxiy5y0qvmn28fr2r";
           name = "processing-snippets";
         };
@@ -44797,7 +45420,7 @@
           sha256 = "18j0jwp8z4ff7xfiijyh09cvb14mbjfaygin2qjp6bxgx3c1mpin";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/prodigy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/prodigy";
           sha256 = "032868bgy2wmb2ws48lfibs4118inpna7mmml8m7i4m4y9ll6g85";
           name = "prodigy";
         };
@@ -44818,7 +45441,7 @@
           sha256 = "0hx7rxa3smdippcpj4j63k0r5l4wflllb0vpnwwknc9j93r7042b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/professional-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/professional-theme";
           sha256 = "1l8nisn2c124cpylyahr76hfpdim2125zrns2897p466l5wcxcx5";
           name = "professional-theme";
         };
@@ -44839,7 +45462,7 @@
           sha256 = "1szxsbk470fg3jp70r20va9hnnf4jj0mb7kxdkn6rd7ky6w34lwm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/prognth";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/prognth";
           sha256 = "0hr5a3s0ij4hvn424v885z7pcs62yqm9mamw5b096hgjxgjf6ylm";
           name = "prognth";
         };
@@ -44860,7 +45483,7 @@
           sha256 = "1yklm43d0ppyf4simhqab6m892z4mmxs2145lzw6kpizixavcv00";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/programmer-dvorak";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/programmer-dvorak";
           sha256 = "1w8r35hkl6qy9a89l0m74x9q2vcc4h2hvmi3r2hqcy2ypkn5l5bv";
           name = "programmer-dvorak";
         };
@@ -44881,7 +45504,7 @@
           sha256 = "04l4m3kxbwvyw9xy6cwakrdxxdswrrs7sya8zn6m738aawbr1mcd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-explorer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/project-explorer";
           sha256 = "076lzmyi1n7yrgdgyh9qinq271qk6k64x0msbzarihr3p4psrn8m";
           name = "project-explorer";
         };
@@ -44900,7 +45523,7 @@
           sha256 = "1bb5b6hxg3gvwf0sqwkd97nnipsmr60py0rnsfhgvizn4cj3khhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-local-variables";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/project-local-variables";
           sha256 = "0mrf7p420rmjm8ydwc5blpxr6299pdg3sy3jwz2zz0420gkp0ihl";
           name = "project-local-variables";
         };
@@ -44921,7 +45544,7 @@
           sha256 = "1fvjap0bsyw5q92q50wk8c81yv4g8nqb6jdlnarf80glwk50avrs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/project-persist";
           sha256 = "0csjwj0qaw0hz2qrj8kxgxlixh2hi3aqib98vm19sr3f1b8qab24";
           name = "project-persist";
         };
@@ -44942,7 +45565,7 @@
           sha256 = "1nq320ph8fs9a197ji4mnw2xa24dld0r1nka476yvkg4azmcc9x8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-persist-drawer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/project-persist-drawer";
           sha256 = "1jv2y2hcqakyvfibclzm7g4diw0bvsv3a8fa43yf19wb64jm8hdb";
           name = "project-persist-drawer";
         };
@@ -44962,7 +45585,7 @@
           sha256 = "08dd2y6hdsj1rxcqa2hnjypnn9c2z43y7z2hz0fi4vny547qybz8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-root";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/project-root";
           sha256 = "0xjir204zk254y2x70k9vqwirx2ljmrikpsgn5kn170d1bxvhwmb";
           name = "project-root";
         };
@@ -44975,15 +45598,15 @@
     projectile = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info }:
     melpaBuild {
         pname = "projectile";
-        version = "20160130.657";
+        version = "20160221.240";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "projectile";
-          rev = "543841e3f6dc4d46c75755cf227b22acc1bfad48";
-          sha256 = "17w0nlr7h8dga8fl48lfb22i898cbgnqmxrqa7cah212yqyn4fp0";
+          rev = "7c484a56ef2cce5034f759185f53e47f827b91c2";
+          sha256 = "1lvkpwy17c0d2yqvrf3b6cawzk65k7mwi0qrk30bmbz9mxq3337w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/projectile";
           sha256 = "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn";
           name = "projectile";
         };
@@ -45004,7 +45627,7 @@
           sha256 = "0ch3naqp3ji0q4blpjfr1xbzgzxhw10h08y2akik96kk1pnkwism";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projectile-codesearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/projectile-codesearch";
           sha256 = "0jgvs9is59q45wh2a7k5sb6vj179ixqgj5dlndj9r6fh59qgrzdk";
           name = "projectile-codesearch";
         };
@@ -45017,15 +45640,15 @@
     projectile-rails = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, inf-ruby, inflections, lib, melpaBuild, projectile, rake }:
     melpaBuild {
         pname = "projectile-rails";
-        version = "20160204.1003";
+        version = "20160211.1640";
         src = fetchFromGitHub {
           owner = "asok";
           repo = "projectile-rails";
-          rev = "21ce05e412b0efebfeab9f84d38c679758ddbf76";
-          sha256 = "0f0siz230xsv20h8wmwa1i8wdsp964y6qmb2i3l485yh03bz1x95";
+          rev = "7fa21453f97801eb44ed45b92e14d6b665387970";
+          sha256 = "1x9jp5bb14gc08irq3dhcn2j6a4kqfp0h3vpriz939dianz580ih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projectile-rails";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/projectile-rails";
           sha256 = "0fgvignqdqh0ma91z9385782l89mvwfn77rp1gmy8cbkwi3b7fkq";
           name = "projectile-rails";
         };
@@ -45046,7 +45669,7 @@
           sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projectile-sift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/projectile-sift";
           sha256 = "1wbgpwq9yy3v7hqidaczrvvsw5ajj7m3n4gsy3b169xv5h673a0i";
           name = "projectile-sift";
         };
@@ -45067,7 +45690,7 @@
           sha256 = "0lr3vx1byf0i9jdzbyrvvzyzi1nfddvw5r9f9wm7gpfp5l8772la";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projectile-speedbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/projectile-speedbar";
           sha256 = "0dli4gzsiycivh8dwa00lfpbimyg42qygfachzrhi8qy5413pwlp";
           name = "projectile-speedbar";
         };
@@ -45088,7 +45711,7 @@
           sha256 = "0y8zbywin99nhcrs5nzx4d179r84rdy39admajpi0j76v0b9pwl3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projector";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/projector";
           sha256 = "0hrinplk607wcc2ibn05pl8ghikv9f3zvymncp6nz95jw9brdapf";
           name = "projector";
         };
@@ -45109,7 +45732,7 @@
           sha256 = "0hvvlh24157qjxz82sbg22d4cbrf95xyx202cybp0n1vyxsmjcmw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/projekt";
           sha256 = "1bhb24701flihl54w8xrj6yxhynpq4dk0fp5ciac7k28n4930lw8";
           name = "projekt";
         };
@@ -45130,7 +45753,7 @@
           sha256 = "1sxxy0s96sgm6i743qwjs0qjpsdr03gqc1cddvvpxbryh42vw9jn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projmake-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/projmake-mode";
           sha256 = "192gvmhcz1anl80hpmcjwwd08dljyrap9sk6qj0y85mcnaafm882";
           name = "projmake-mode";
         };
@@ -45151,7 +45774,7 @@
           sha256 = "1hq8426i8rpb3qzkd5akv3i08pa4jsp9lwsskn38bfgp71pwild2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/prompt-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/prompt-text";
           sha256 = "1b9sj9kzx5ydq2zsfmkwsx78pzg0vsvrn92397js6b2cm24vrwwc";
           name = "prompt-text";
         };
@@ -45172,7 +45795,7 @@
           sha256 = "18ap2liz5r5a8ja2zz9182fnfm47jnsbyblpq859zks356k37iwc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/prop-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/prop-menu";
           sha256 = "0dhy52fxxpa058mhhx0slw3sly3dlxm9vkax6fd1sap6f6v00p5i";
           name = "prop-menu";
         };
@@ -45193,7 +45816,7 @@
           sha256 = "0lch20njy248w7bnvgs7jz0zqasskf5dakmykxwpb48llm6kx95v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/propfont-mixed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/propfont-mixed";
           sha256 = "19k0ydpkiviznsngwcqwn4k30r6j8w34pchgpjlsfwq1bndaai9y";
           name = "propfont-mixed";
         };
@@ -45214,7 +45837,7 @@
           sha256 = "1m8zvrv5aws7b0dffk8y6b5mncdk2c4k90mx69jys10fs0gc5hb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/prosjekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/prosjekt";
           sha256 = "1fn7ii1bq7bjkz27hihclpvx0aabgwy3kv47r9qibjl2jin97rck";
           name = "prosjekt";
         };
@@ -45231,11 +45854,11 @@
         src = fetchFromGitHub {
           owner = "google";
           repo = "protobuf";
-          rev = "bd8a476510d17d3841ff2509fbd67b7f4b543c1c";
-          sha256 = "0x6419waryq14y1q8v53riwjnqfw6azf4sfpsik9qjsznzmlgxx9";
+          rev = "32daf513ced8d51e8de6cc8d800cfc972c4df5d6";
+          sha256 = "03mi6g58y9j9pqrh8qjygcv20f3q58cry4phv5q6807rxj4q2hpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/protobuf-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/protobuf-mode";
           sha256 = "1hh0w93fg6mfwsbb9wvp335ry8kflj50k8hybchpjcn6f4x39xsj";
           name = "protobuf-mode";
         };
@@ -45256,7 +45879,7 @@
           sha256 = "0awlkvbll2cxc9rzzm1ln5qhp05jikihcay1wz74dkwzwlfjlp17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/psc-ide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/psc-ide";
           sha256 = "1f8bphrbksz7si9flyhz54brb7w1lcz19pmn92hjwx7kd4nl18i9";
           name = "psc-ide";
         };
@@ -45277,7 +45900,7 @@
           sha256 = "08j31bg5vwgirv5n5fsw7w6gncrkpwpjlj2m00dhj8wbvhp503sn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/psci";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/psci";
           sha256 = "0sgrz8byz2pcsad2pydinp4hh2xb48pdb03r93wg2vvyy8p15j9g";
           name = "psci";
         };
@@ -45298,7 +45921,7 @@
           sha256 = "1b8w9wnrwk4j2gn543phz9qp8813ksqakr5pi509m6ijwcv0cp7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/psession";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/psession";
           sha256 = "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a";
           name = "psession";
         };
@@ -45319,7 +45942,7 @@
           sha256 = "1jz1g0igpnsjn2r144205bffj10iyp8izm8678mzkhnricxkn0d6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/psvn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/psvn";
           sha256 = "1wdww25pjla7c8zf04mvgia1ws8cal9rb7z8g3vn2s3gp68py12n";
           name = "psvn";
         };
@@ -45340,7 +45963,7 @@
           sha256 = "1q8fk25qwnnm9z1zcf9f1k3b060lk6g6f16c8db90psp6za0xdwz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/psysh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/psysh";
           sha256 = "0ygnfmfx1ifppg6j3vfz10srbcpr5ird2bhw6pvydijxkyd75vy5";
           name = "psysh";
         };
@@ -45361,7 +45984,7 @@
           sha256 = "0ca8j7xlqxbidqfz2iarwn7qq4v12pwvsq6vzj2473n2g1c09xzj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pt";
           sha256 = "0zmz1hcr4ajc2ydvpdxhy1dlhp7hvlkv6y6w1b79ffvq6acdd5mj";
           name = "pt";
         };
@@ -45382,7 +46005,7 @@
           sha256 = "024g793y6vqhk5h6vqjv5hljvfyb0j6b6j51fjhijgdxmqhlk9vm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/puml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/puml-mode";
           sha256 = "131ghjq6lsbhbx5hdg36swnkqijdb9bx6zg73hg0nw8qk0z742vn";
           name = "puml-mode";
         };
@@ -45403,7 +46026,7 @@
           sha256 = "1bkkgs2agy00wivilljkj3a9fsb2ba935icjmhbk46zjc6yf3y6q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/punctuality-logger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/punctuality-logger";
           sha256 = "0q9s74hkfqvcx67xpq9rlvh38nyjnz230bll6ks7y5yzxvl4qhcm";
           name = "punctuality-logger";
         };
@@ -45424,7 +46047,7 @@
           sha256 = "1viw95y6fha782n1jw7snr7xc00iyf94r4whsm1a2q11vm2d1h21";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pungi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pungi";
           sha256 = "1v9fsd764z5wdcips63z53rcipdz7bha4q6s4pnn114jn3a93ls1";
           name = "pungi";
         };
@@ -45445,7 +46068,7 @@
           sha256 = "11mkf9gvjz63szdvhwlqnd6j2r9ij2fh8l6zkf7hl2zlwyyivcmp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/puppet-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/puppet-mode";
           sha256 = "1s2hap6fs6rg5q80dmzhaf4qqaf5sglhs8p896i3i5hq51w0ciyc";
           name = "puppet-mode";
         };
@@ -45466,7 +46089,7 @@
           sha256 = "0k2plyvd6842yryzrfadbf4h7a9hrjvkcvixclbca2bkvfik3864";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/purescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/purescript-mode";
           sha256 = "00gz752mh7144nsaka5q3q4681jp845kc5vcy2nbfnqp9b24l55m";
           name = "purescript-mode";
         };
@@ -45487,7 +46110,7 @@
           sha256 = "15myw5rkbnnpgzpiipm5xl4cyzymv8hh66x9al4aalb5nf52dckc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/purple-haze-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/purple-haze-theme";
           sha256 = "0ld8k53823786y6f0dqcp0hlqlnmy323vdkanjfs5wg5ib60az1m";
           name = "purple-haze-theme";
         };
@@ -45508,7 +46131,7 @@
           sha256 = "0qm2xv762cz196aqs445crqrmsks8hpwzpaykzn0chlvdk0m5cv1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/purty-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/purty-mode";
           sha256 = "1ackqv95sdphbsjwydbc4dmdzwpaj74v329f55zcwa8hn3li9d5m";
           name = "purty-mode";
         };
@@ -45529,7 +46152,7 @@
           sha256 = "03ivg3ddhy5zh410wgwxa17m98wywqhk62jgijhjd00b6l8i4aym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pushbullet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pushbullet";
           sha256 = "1swzl25rcw7anl7q099qh14yhnwlbn3m20ib9kis0l1rv59kkarl";
           name = "pushbullet";
         };
@@ -45550,7 +46173,7 @@
           sha256 = "10g4imxgpv7a0j40qkx7xf2qnyz80ypd0mv0lf47n9dwln5byln3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/px";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/px";
           sha256 = "0xjmz18m2dslh6yq5z32r43zq3svfxn8mhrfbmihglyv2mkwxw44";
           name = "px";
         };
@@ -45571,7 +46194,7 @@
           sha256 = "1iw94m1bvsmadlj16f8ymwx0q6f9lqysy7by76hkpiwqqhd2i8rv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-autopep8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/py-autopep8";
           sha256 = "1argjdmh0x9c90zkb6cr4z3zkpgjp2mkpsw0dr4v6gg83jcggfpp";
           name = "py-autopep8";
         };
@@ -45592,7 +46215,7 @@
           sha256 = "05803wi7rj73sy9ihkilr6pcn72szfsvgf2dgbdpnqra508rxyb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-gnitset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/py-gnitset";
           sha256 = "0f6ivq4ignb4gfxw2q8qvigvv3fbvvyr87x25wcaz6yipg1lr18r";
           name = "py-gnitset";
         };
@@ -45613,7 +46236,7 @@
           sha256 = "1416hbc64gwn9c8g9lxfx58w60ysi0x8rbps6mfxalavdhbs20sv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-import-check";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/py-import-check";
           sha256 = "1261dki0q44sw9h0g1305i2fj1dg9xgwzry50jbn2idcrqg4xf7k";
           name = "py-import-check";
         };
@@ -45634,7 +46257,7 @@
           sha256 = "0150q6xcnzzrkn9fa9njm973l1d49c48ad8qia71k4jwrxjjj6zr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-isort";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/py-isort";
           sha256 = "0k5gn3bjn5pv6dn6p0m9xghn0sx3m29bj3pfrmyh6gd5ic0l00yb";
           name = "py-isort";
         };
@@ -45655,7 +46278,7 @@
           sha256 = "05gi17n488r2n6x33nj4a23ci89c9smsbanmap4i302dy0mnmwgd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-smart-operator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/py-smart-operator";
           sha256 = "1n0bdr9z2s1ikhmfz642k94gjzb88anwlb61mh27ay8wqdgm74c4";
           name = "py-smart-operator";
         };
@@ -45676,7 +46299,7 @@
           sha256 = "1s39407z3rxz10r5sshv2vj7s23ylkhg59ixasgnpjk82gl4igpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-test";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/py-test";
           sha256 = "1mbwbzg606winf5af7qkg6a1hg79lc7k2miq4d3mwih496l5sinb";
           name = "py-test";
         };
@@ -45697,7 +46320,7 @@
           sha256 = "09z739w4fjg9xnv3mbh7v8j59mnbsfq4ygq616pj4xcw3nsh0rbg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-yapf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/py-yapf";
           sha256 = "1381x0ffpllxwgkr2d8xxbv1nd4k475m1aff8l5qijw7d1fqga2f";
           name = "py-yapf";
         };
@@ -45718,7 +46341,7 @@
           sha256 = "09glwrb9q65qdm4yd0mbi5hwdy2434zm8699ywhs6hqpjacadlmi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pycarddavel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pycarddavel";
           sha256 = "12k2mnzkd8yv17csfhclsnd479vcabawmac23yw6dsw7ic53jf1a";
           name = "pycarddavel";
         };
@@ -45739,7 +46362,7 @@
           sha256 = "1q9fmdrnsqmisykndxzy9bvjl6n1rsmfgvh3h8fkg6b44ypcyyw7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pydoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pydoc";
           sha256 = "0sf52cb80yiridsl1pffdr3wpbgxrn2l8vnq03l70djckild477n";
           name = "pydoc";
         };
@@ -45759,7 +46382,7 @@
           sha256 = "1mzyr6yznkyv99x9q8zx2f270ngjh8s94zvnhcbhidi57inpd1nh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pydoc-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pydoc-info";
           sha256 = "0l80g0rzkk3a1wrw2riiywz9wdyxwr5i64jb2h5r8alp9qq1k7mf";
           name = "pydoc-info";
         };
@@ -45772,15 +46395,15 @@
     pyenv-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, pythonic }:
     melpaBuild {
         pname = "pyenv-mode";
-        version = "20151105.441";
+        version = "20160221.1323";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "pyenv-mode";
-          rev = "93ddeb2c0fabc224496cdf5ff688243a208376c4";
-          sha256 = "0017xk95293sc37127hg9bbbh5glq34sdc1b6bx6ykzny6g49fd3";
+          rev = "560614d47e3b0331f5c0e136763be69ef052048d";
+          sha256 = "049wgwygdaa0p8p4pl37wkc06nam9ph17i9gzcg7w0hfwghjrc5j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pyenv-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pyenv-mode";
           sha256 = "00yqrk92knv9gq1m9xcg78gavv70jsjlwzkllzxl63iva9qrch59";
           name = "pyenv-mode";
         };
@@ -45801,7 +46424,7 @@
           sha256 = "1sclhzv3w9fg54dg4qhlfbc0p1z5clyr8phrckhypvlwfgbar4b4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pyenv-mode-auto";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pyenv-mode-auto";
           sha256 = "1l7h4fas1vshkh4skxzpw7v2a11s1hwnb20n6a81yh701pbikqnd";
           name = "pyenv-mode-auto";
         };
@@ -45822,7 +46445,7 @@
           sha256 = "1rp8zchvclh29rl9a1i82pcqghnhpaqnppaydxc2qx23y9pdgz9i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pyfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pyfmt";
           sha256 = "112kjsp763c2plhqlhydpngrabhc58ya7cszvi4119xqw2s699g6";
           name = "pyfmt";
         };
@@ -45843,7 +46466,7 @@
           sha256 = "05qx1p19dw3nr264shihfn33k579hd0wf4cxki5cqrxi7xzpjgrc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pyimpsort";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pyimpsort";
           sha256 = "0kdk3bmryfzvwf8vshfszbih8mwncf4xlb0n0n0yjn0p1n98q99k";
           name = "pyimpsort";
         };
@@ -45860,11 +46483,11 @@
         src = fetchFromGitHub {
           owner = "PyCQA";
           repo = "pylint";
-          rev = "41f335f5942ba28c7e006d20b62a7a5e68a55a50";
-          sha256 = "1biqzjyrqkb2whscqz1h4x82h6jhvafbzx174apirc6h1vd1jhhq";
+          rev = "b3f6242886a82f5723f584e6743f3c3e188e0c32";
+          sha256 = "0vl60jr7zfv74psngin95qq0ykx0zxxzsdqi78ankarylzzxb0wp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pylint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pylint";
           sha256 = "1138a8dn9y4ypbphs1zfvr8gr4vdjcy0adsl4xfbgsls4kcdwpxx";
           name = "pylint";
         };
@@ -45885,7 +46508,7 @@
           sha256 = "1nlybqvy64lc0c65j9wbk4lx932lz0b8hxw8zm1vgmqppqcyn0p5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pytest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pytest";
           sha256 = "0ssib65wa20h8r6156f392l481vns5fcax6w70hcawmn84nficdh";
           name = "pytest";
         };
@@ -45906,7 +46529,7 @@
           sha256 = "1cnjdgw3x6yb5k06z57xifywlg0kdx9ai4f1ajc0wx9aax8r5gav";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-cell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/python-cell";
           sha256 = "07i3vyci52jvslq28djwkgx1r157wvxd99rvqlxnmmsl5yj4k1jf";
           name = "python-cell";
         };
@@ -45927,7 +46550,7 @@
           sha256 = "1qckn5bi1ib54hgqbym5qqwzvbv70ria1w3c2x543xlr0l7zga6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-django";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/python-django";
           sha256 = "02whx8g8r02mzng7d7bnbkz5n7gyzp5hcnmvd6a3lq106c0h7w9k";
           name = "python-django";
         };
@@ -45940,15 +46563,15 @@
     python-docstring = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-docstring";
-        version = "20150907.1504";
+        version = "20160210.1759";
         src = fetchFromGitHub {
           owner = "glyph";
           repo = "python-docstring-mode";
-          rev = "263879fb339b18ee55d9463697d6f0a73171ee78";
-          sha256 = "1a2019172ycw7sdfjrxpyrg41ky9cp09mx30x6cr2qkc1w9pkyrv";
+          rev = "711d07aef05218495625b696c2a281beac48537c";
+          sha256 = "07nnj2rkpcfad8m9pynai1a3w5k9zazl1xpgm2mldy162snrwpql";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-docstring";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/python-docstring";
           sha256 = "1vi30y71vflsbprp5j4phbp7x1j24vxn9d6sifaddari0g0zxpfw";
           name = "python-docstring";
         };
@@ -45969,7 +46592,7 @@
           sha256 = "0q6bib9nr6xiq6npzbngyfcjk87yyvwzq1zirr3z1h5wadm34lsk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/python-environment";
           sha256 = "1pq16rddw76ic5d02j5bswl9qcydi47hqmhs7r06jk46vsfzxpl7";
           name = "python-environment";
         };
@@ -45990,7 +46613,7 @@
           sha256 = "0zk6014dzfrb3y3nhs890x082xf044w0a8nmy6rlrj375lvhfn99";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/python-info";
           sha256 = "0kvpz1r2si94rs1iajn1ffmx7a5bgyjnzri36ajdgd5gcgh41dhy";
           name = "python-info";
         };
@@ -46003,15 +46626,15 @@
     python-mode = callPackage ({ fetchFromGitLab, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "python-mode";
-        version = "20160131.1407";
+        version = "20160217.708";
         src = fetchFromGitLab {
           owner = "python-mode-devs";
           repo = "python-mode";
-          rev = "ec3d421056af3fd88be31834e73b187c5a92422e";
-          sha256 = "00j0niji9764g933s484k7bz20kzkim3vafwb6cbadhiag74xicv";
+          rev = "3e3ef05f0533647bf21ccd9826b8dc61848c48ff";
+          sha256 = "0mf0w4jx3w91b57q989fi06f0r9km8nypsgbmqx03ljxv5i3pdhi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/python-mode";
           sha256 = "1m7c6c97xpr5mrbyzhcl2cy7ykdz5yjj90mrakd4lknnsbcq205k";
           name = "python-mode";
         };
@@ -46024,15 +46647,15 @@
     python-x = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, folding, lib, melpaBuild, python ? null }:
     melpaBuild {
         pname = "python-x";
-        version = "20151229.1148";
+        version = "20160219.956";
         src = fetchFromGitHub {
           owner = "wavexx";
           repo = "python-x.el";
-          rev = "b158c3925f212336b1bc1a95263700e47753e4ed";
-          sha256 = "1254ng5fgmbfbn62wpjwmsx8y9j4vs3xcxpyqjb8s3npjjmv4kd8";
+          rev = "8b7446fb30c9f217e3e7cca06a20c3dac63b7824";
+          sha256 = "0hzx7v49j1xvn2k1hpql455i63s2rcd6nyjr1ni2ns5vi0pgb6ym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/python-x";
           sha256 = "115mvhqfa0fa8kdk64biba7ri4xjk74qqi6vm1a5z3psam9mjcmn";
           name = "python-x";
         };
@@ -46053,7 +46676,7 @@
           sha256 = "1w29l4zyvcchjdywz2py95qq7bszhldpga2ng75g7p07pq7f2w1p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python3-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/python3-info";
           sha256 = "1hma8sphxk95m25s56adgyk7d4blsc02gq5a7vw1pawwvxm2qlz3";
           name = "python3-info";
         };
@@ -46066,15 +46689,15 @@
     pythonic = callPackage ({ cl-lib ? null, dash, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "pythonic";
-        version = "20160202.245";
+        version = "20160221.1323";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "pythonic";
-          rev = "9377f1c33d7ef21afb571211f60bf90ac7ffc2cd";
-          sha256 = "0p0pz88wf5vcva77vskz4picj8c3drbnz3jzi6yysgp7zw3friwm";
+          rev = "0279cbc8e7fba8900060da0d1be4fae7404109b8";
+          sha256 = "16sp3mg5jzx89lgr3kr61fqw1p9gc5zxq2mi9rpgqi5hkkcpnpgj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pythonic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pythonic";
           sha256 = "1hq0r3vg8vmgw89wfjdqknwm76pimlk0dy56wmh9vffh06gqsb51";
           name = "pythonic";
         };
@@ -46095,7 +46718,7 @@
           sha256 = "1llm8vlmwkhdnr07xgcjx59d4na96kkhmfncww6rqkfc5i6zfarm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pyvenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pyvenv";
           sha256 = "0gai9idss1wvryxyqk3pv854mc2xg9hd0r55r2blql8n5rd2yv8v";
           name = "pyvenv";
         };
@@ -46116,7 +46739,7 @@
           sha256 = "0ggivlaj29rbbhkjpf3bf7vr96xjzffas0sf5m54qh6nyz6nnha5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/qiita";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/qiita";
           sha256 = "1kzk7pc68ks9gxm2l2d28al23gxh56z0cmkl80qwg7sh4gsmhyxl";
           name = "qiita";
         };
@@ -46137,7 +46760,7 @@
           sha256 = "1mlka59gyylj4cabi1b552h11qx54kjqwx3bkmsdngjrd4da222a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/qml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/qml-mode";
           sha256 = "123mlibviplzra558x87da4zx0kpbhsgfigjjgjgp3mdg897084n";
           name = "qml-mode";
         };
@@ -46158,7 +46781,7 @@
           sha256 = "0q7krn16dja0ifnc8h587lh5nilwbixxgsh5179clx5l57naix62";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/quack";
           sha256 = "1l7jw8sx2llbzp3sg5755qdhhyq8jdaggxzzn7icjxxrmj1ji6ii";
           name = "quack";
         };
@@ -46179,7 +46802,7 @@
           sha256 = "09vw8nf9yj3v2ks25n39fbn2qk1fld0hmaq1dpzaqsavsbd4dwc1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quasi-monochrome-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/quasi-monochrome-theme";
           sha256 = "0h5pqrklyga40jg8qc47lwmf8khn0vcs5jx2sdycl2ipy0ikmfs0";
           name = "quasi-monochrome-theme";
         };
@@ -46192,15 +46815,15 @@
     quelpa = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, package-build }:
     melpaBuild {
         pname = "quelpa";
-        version = "20151203.305";
+        version = "20160220.919";
         src = fetchFromGitHub {
           owner = "quelpa";
           repo = "quelpa";
-          rev = "e011b4fa916a8b6057225f3e7ee6befc8928d443";
-          sha256 = "0v5fcbjf7ndmywjsq9di3cwxsh2csv5pj3mqgqb340i2yp77r9wy";
+          rev = "a5349ea2d11c046b1834b7bae29e90b26b2003d2";
+          sha256 = "1gmxyhv47yjyaik7bkxl8ndziz2ls5qpij8nz18ynx7s521hm3hj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quelpa";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/quelpa";
           sha256 = "1g53fcy837hpyn9lnmmri0h4c5va61vszhblz4caadqq265hknvs";
           name = "quelpa";
         };
@@ -46221,7 +46844,7 @@
           sha256 = "00wnvyw2daiwwd1jyq1ag5jsws8k8jxs3lsj73dagbvqnlywmkm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quelpa-use-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/quelpa-use-package";
           sha256 = "0p09w419kldgl913hgqfzyv2pck27vqq2i1xsx7g29biwgnp9hl9";
           name = "quelpa-use-package";
         };
@@ -46242,7 +46865,7 @@
           sha256 = "0kh63nzdzwxksn2ar2i1ds7n96jga2dhhc9gg27p1g2ca66fs6h5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quick-buffer-switch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/quick-buffer-switch";
           sha256 = "1fsnha3x3pgq582libb3dmxb93aagv1avnc0rigpfd7hv6bagj40";
           name = "quick-buffer-switch";
         };
@@ -46263,7 +46886,7 @@
           sha256 = "1cp3z05qjy7qvjjv105ws1j9qykx8sl4s13xff0ijwvjza6ga44c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quick-preview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/quick-preview";
           sha256 = "18janbmhbwb6a46fgc1sxl9ww591v60y3wgh2wqh62vdy4ix3bd9";
           name = "quick-preview";
         };
@@ -46284,7 +46907,7 @@
           sha256 = "1i7qqpqdwifd6vxpyyxyzq0b3wc82r7pqcw07bj0x2lhrjnqrxby";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quickref";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/quickref";
           sha256 = "0jahi84ra9g7h0cvz3c02zkbkknrzgv48zq32n72lkxl958swqn1";
           name = "quickref";
         };
@@ -46297,16 +46920,16 @@
     quickrun = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "quickrun";
-        version = "20160202.2041";
+        version = "20160216.816";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-quickrun";
-          rev = "ffd92ae15d9a4ffd8d0a4379a166c8a8a867bb45";
-          sha256 = "1l0l9rsjw49s1qmw70fm9a66wd1mlhka5cfvggsqpp56if0j8yyc";
+          rev = "fe23f324b0198f8827cc0768e8507a02194eec68";
+          sha256 = "1iypwvdgdh30c9br7jnibgwbdca2mqjy95x2ppsc51sik2mz2db1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quickrun";
-          sha256 = "1szgirakfnkn9ksls16p233sr7x9ck5m1f1kbk6ancj36yja2nki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/quickrun";
+          sha256 = "0f989d6niw6ghf9mq454kqyp0gy7gj34vx5l6krwc52agckyfacy";
           name = "quickrun";
         };
         packageRequires = [ cl-lib emacs ];
@@ -46326,7 +46949,7 @@
           sha256 = "0dhljmdlg4p832w9s7rp8vznkpjkwpg8k9hj95cn2h76c0afwz3j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/r-autoyas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/r-autoyas";
           sha256 = "18zifadsgbwnga205jvpx61wa2dvjxmxs5v7cjqhny45a524nbv4";
           name = "r-autoyas";
         };
@@ -46347,7 +46970,7 @@
           sha256 = "197llsjhxjvk5wp6iz3siyv3911y82r08s9bavma3dgzj2s978s6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/racer";
           sha256 = "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi";
           name = "racer";
         };
@@ -46360,15 +46983,15 @@
     racket-mode = callPackage ({ emacs, faceup, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "racket-mode";
-        version = "20160201.1957";
+        version = "20160213.1104";
         src = fetchFromGitHub {
           owner = "greghendershott";
           repo = "racket-mode";
-          rev = "77473387fb693ece0aebf83d4f8547aace87efd2";
-          sha256 = "1sywpgp6a1syp2rgba0969xj01f5988l7fgf8j07i06i3drydadj";
+          rev = "dbdffd0bdd3d2deec3a6ea213e7f19be23d84112";
+          sha256 = "1clpwjnph2ygmkn4r98wv3nxkvw4hg6nc01xph517lc7n15a3vri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/racket-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/racket-mode";
           sha256 = "04sr55zrgwyi48sj4ssm4rmm327yxs7hvjhxclnkhaaigrmrv7jb";
           name = "racket-mode";
         };
@@ -46389,7 +47012,7 @@
           sha256 = "00x09vjd3jz5f73qkf5v1y402zn8vl8dsyfwlq9z646p18ba7gyh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/railgun";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/railgun";
           sha256 = "1a3fplfipk1nv3py1sy0p2adf3w1h4api01h2j5rjlq2jw06kyr0";
           name = "railgun";
         };
@@ -46410,7 +47033,7 @@
           sha256 = "1fh8wsb0pa2isr1kgh3v9zmmxq1nlmqwqk4z34dw5wpaiyihmk84";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rails-log-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rails-log-mode";
           sha256 = "0h7gfg0c5pwfh18qzg1mx7an9p958ygdfqb54s85mbkv8x3rh1a0";
           name = "rails-log-mode";
         };
@@ -46431,7 +47054,7 @@
           sha256 = "0cqp2vns7gq377bm6q9n5q0ra1d5yy2x2aiw9q1hswk82xpibj9l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rails-new";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rails-new";
           sha256 = "0wgbm6qxqkpsbzj9wccicsphajaii07dl27b8x2vidsyw6ambj5h";
           name = "rails-new";
         };
@@ -46452,7 +47075,7 @@
           sha256 = "021x1l5kzsbm0qj5a3bngxa7ickm4lbwsdz81a2ks9pi1ivmw205";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/railscasts-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/railscasts-theme";
           sha256 = "1z5m8ccx2k18gbzqvg0051mp2myy2qncf4xvv47k80f83pk2hw6r";
           name = "railscasts-theme";
         };
@@ -46473,7 +47096,7 @@
           sha256 = "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rainbow-blocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rainbow-blocks";
           sha256 = "08p41wvrw1j3h7j7lyl8nxk1gcc2id9ikljmiklg0kc6s8ijhng8";
           name = "rainbow-blocks";
         };
@@ -46494,7 +47117,7 @@
           sha256 = "0gxc8j5a14bc9mp43cbcz41ipc0z1yvmypg52dnl8hadirry20gd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rainbow-delimiters";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rainbow-delimiters";
           sha256 = "132nslbnszvbgkl0819z811yar3lms1hp5na4ybi9gkmnb7bg4rg";
           name = "rainbow-delimiters";
         };
@@ -46515,7 +47138,7 @@
           sha256 = "05i0jpmxzsj2lsj48cafn3v93z37l7k5kaza2ik3yirdpjdibyrh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rainbow-identifiers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rainbow-identifiers";
           sha256 = "0lw790ymrgpyh0sxwmzinl2ik5vl5vggbg14cd0cx5yagkw5y3mp";
           name = "rainbow-identifiers";
         };
@@ -46536,7 +47159,7 @@
           sha256 = "1wcs8j8rdls0n3v8zdpk2n5riwzz2yvjf6b70a5bj7p20gyafhj2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rake";
           sha256 = "0cw47g6cjnkh3z4hbwwq1f8f5vrvs84spn06k53bx898brqdh8ns";
           name = "rake";
         };
@@ -46557,7 +47180,7 @@
           sha256 = "0fmajgqf9j21qn7h35sky5di8cnma432g0ki9d5m41byxp9y1bdl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rand-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rand-theme";
           sha256 = "0h0n1lsxnl12mjrjpra62vblrg8kbp1hk7w1v6makj074d037j2h";
           name = "rand-theme";
         };
@@ -46578,7 +47201,7 @@
           sha256 = "1z25xmz8pl3rsfahw6ay8wx5wbnlxabnzr2dq20m0i5jyci8lqll";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/random-splash-image";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/random-splash-image";
           sha256 = "1j454jy4ia2wrgi3fxzjfdqi3z8x13hq8kh62lnb84whs7a1nhik";
           name = "random-splash-image";
         };
@@ -46599,7 +47222,7 @@
           sha256 = "0dm5k0g39dlwag3rqyiq8vzsg2z6ypajicjs7g5lcd88nypjl461";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ranger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ranger";
           sha256 = "14g4r4iaz0nzfsklslrswsik670pvfd0605xfjghvpngn2a8ych4";
           name = "ranger";
         };
@@ -46620,7 +47243,7 @@
           sha256 = "1i16361klpdsxphcjdpxqswab3ing69j1wb9nygws7ghil85h0bx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rase";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rase";
           sha256 = "1g7v2z7l4csl5by64hc3zg4kgrkvv81iq30mfqq4nvy1jc0xa6j0";
           name = "rase";
         };
@@ -46641,7 +47264,7 @@
           sha256 = "0yd0rs6fnc6lsfi7pivw5sivh698055r8ifj9vrxb82dcx2y6v2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rbenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rbenv";
           sha256 = "09nw7sz6rdgs7hdw517qwgzgyrdmxb16sgldfkifk41rhiyqhr65";
           name = "rbenv";
         };
@@ -46662,7 +47285,7 @@
           sha256 = "0q5giixk6pv82cf34a0mxmnzh2gdiyq6dzv4ypkkdpz6wsm2ffhx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rbt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rbt";
           sha256 = "1mrb6v8zybvhh242vvq0kdvg6cvws7gabfhcydrw5g2njhyqkygm";
           name = "rbt";
         };
@@ -46683,7 +47306,7 @@
           sha256 = "0xdyrp0zs2v2glpfwlajmj97wygwi0y492zbp6rp3caa5bj3j4z2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rcirc-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rcirc-alert";
           sha256 = "0lyd3gz1sflp93xb7xbvk1gh69w468ync1p144avyh2pybl40q4a";
           name = "rcirc-alert";
         };
@@ -46704,7 +47327,7 @@
           sha256 = "1mpk5rzsil298q3ppv5v9jrn274v71jffyz0jihrksh1wbjzwhlx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rcirc-alertify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rcirc-alertify";
           sha256 = "13448bykmy0jqcajhn2gjiar3m8cingyr8394vxybp2m1zvv0pws";
           name = "rcirc-alertify";
         };
@@ -46725,7 +47348,7 @@
           sha256 = "173lhi48dwfp9k7jmgivhcc9f38snz5xlciyjhrafpadq1pir497";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rcirc-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rcirc-color";
           sha256 = "1a8qqwdc0gw6m1xsnwrj3xldp05p7pabyj6l4bccpg3vf5wbgkn5";
           name = "rcirc-color";
         };
@@ -46746,7 +47369,7 @@
           sha256 = "0d99x7dfw5xrn62knvs65lvn6xyy7399xwqyy47bs4n81v25aqbh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rcirc-groups";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rcirc-groups";
           sha256 = "1iws3f8vkwrflcj6ni8nmf1wcw1jrlnssm76kzzhag77ry3iswgx";
           name = "rcirc-groups";
         };
@@ -46767,7 +47390,7 @@
           sha256 = "1k4knsrca626pikgaalqbqwy7im4wz1vrmzzhdrdb4lhdz6sq3q3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rcirc-notify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rcirc-notify";
           sha256 = "0mwhzkbzhpq4jws05p7qp0kbay8kcblb9xikznm0i8drpdyc617v";
           name = "rcirc-notify";
         };
@@ -46780,15 +47403,15 @@
     rcirc-styles = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rcirc-styles";
-        version = "20160110.1650";
+        version = "20160206.2050";
         src = fetchFromGitHub {
           owner = "aaron-em";
           repo = "rcirc-styles.el";
-          rev = "d0547eda261d0885951b283e5622345f999d2083";
-          sha256 = "0yhmdkvswnn5rga5xzysfpivbz9wdkzbm49licilc2fp1dgcvd6i";
+          rev = "f313bf6a7470bed314b27c7a40558cb787d7bc67";
+          sha256 = "1kwn33rxaqik5jls66c2indvswhwmxdmd60n7a1h9siqm5qhy9d6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rcirc-styles";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rcirc-styles";
           sha256 = "01dxhnzsnljig769dk9axdi970b3lw2s6p1z3ljf29qlb5j4548r";
           name = "rcirc-styles";
         };
@@ -46809,7 +47432,7 @@
           sha256 = "0r95fzi0x8r18x7r574mp503qaiqyicrq78zlggyz6qihi95pmqj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rdf-prefix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rdf-prefix";
           sha256 = "1vxgn5f2kws17ndfdv1vj5p9ks3rp6sikzpc258j07bhsfpjz5qm";
           name = "rdf-prefix";
         };
@@ -46830,7 +47453,7 @@
           sha256 = "08l96bhghmnckar4i6afj9csqglasmpmby1r7j38ic9bp37z2yqd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rdp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rdp";
           sha256 = "0lj3idwv4fxz8pi8mnxkbhwhzaa1gs6ib4nzly3fc6yiix9ampkz";
           name = "rdp";
         };
@@ -46851,7 +47474,7 @@
           sha256 = "00j0iqa37yzd7xrgd8xcgpgmjcarhn0yx4zpbnr7z7kzmg24ywa7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/react-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/react-snippets";
           sha256 = "0chs0h41nb2fdz02hdsaynz7ma8fg66a8m1q1np0464skrsdaj73";
           name = "react-snippets";
         };
@@ -46872,7 +47495,7 @@
           sha256 = "0kg18ybgwcxhv5fiya5d3wn5w9si4914q946gjannk67d6jcq08g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/readability";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/readability";
           sha256 = "0kg91ma9k3p5ps467jjz2lw13rv1l8ivwc3zpg6c1rl474ds0qqv";
           name = "readability";
         };
@@ -46893,7 +47516,7 @@
           sha256 = "1j5b5xapflwzh8a297gva0l12ralwa9vl5z3bb75c9ksjkhi4nm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/readline-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/readline-complete";
           sha256 = "1qymk5ypv6ljk8x49z4jcifz7c2dqcg5181f4hqh67g1byvj2277";
           name = "readline-complete";
         };
@@ -46914,7 +47537,7 @@
           sha256 = "1kghhps8mqys5l59qwzv3fgy1fvb15cnyaxmk29v818a6khjc5l2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/real-auto-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/real-auto-save";
           sha256 = "03dbbizpyg62v6zbq8hd16ikrifz8m2bdlbb3g67f2834xqmxha8";
           name = "real-auto-save";
         };
@@ -46927,15 +47550,15 @@
     realgud = callPackage ({ fetchFromGitHub, fetchurl, lib, list-utils, load-relative, loc-changes, melpaBuild, test-simple }:
     melpaBuild {
         pname = "realgud";
-        version = "20160110.1640";
+        version = "20160217.2022";
         src = fetchFromGitHub {
           owner = "rocky";
           repo = "emacs-dbgr";
-          rev = "8c8f9f13d6dcfa8c1db9726064ccc6da17ebee55";
-          sha256 = "0v02kf8dcxrl09g72d1s8akn8qifvdwgxgnwrbdc1z6n53pi07z5";
+          rev = "74ee75c3b7b74ae173374592ce82ad3a58b35424";
+          sha256 = "089hyydlhnlawa7wflnf0mph4h96npxvr8czyffsyng88jy46cqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/realgud";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/realgud";
           sha256 = "15vlln4w4wlgrk5i5nhgvjcbardpahgs9kwwayb1vmj10c8a837s";
           name = "realgud";
         };
@@ -46956,7 +47579,7 @@
           sha256 = "1xh9nxqfg9abcl41ni69rnwjfgyfr0pbl55dzyxsbh6sb36r3h8z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rebox2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rebox2";
           sha256 = "06ra50afjqac9ck1s9gaxy0sqxcb612wzd28s4q4imicqpgfxzjw";
           name = "rebox2";
         };
@@ -46974,7 +47597,7 @@
           sha256 = "15kwkphrlxq6nbmqm95sxv4rykl1d35sjm59ncy07ncqm706h33l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/recentf-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/recentf-ext";
           sha256 = "1m54w1n3ci5j7i1jhw6cs7dgzmxrj1hsrrarqlrd1d4iqhixjzbq";
           name = "recentf-ext";
         };
@@ -46995,7 +47618,7 @@
           sha256 = "0wk28blnfks987iby0p3qpd4nxnz6sqn4fx8g59gyddjhav51lri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/recompile-on-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/recompile-on-save";
           sha256 = "0bg2p7pk4jlpqc7lg48mxd6zkwnx15r0r7lmsxgx9dv1ilfwrmgn";
           name = "recompile-on-save";
         };
@@ -47016,7 +47639,7 @@
           sha256 = "114ssmby614xjs7mrpbbsdd4gj5ra6klfh8h6z8iij8xn3kii83q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/recover-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/recover-buffers";
           sha256 = "0g40d7440hzlc9b45v63ng0anvmgip4dhbd9wcm2sn8qjfr4w11b";
           name = "recover-buffers";
         };
@@ -47037,7 +47660,7 @@
           sha256 = "1vpsihrl03hkd6n6b7mrjccm0a023qf3154a8rw4chihikxw27pj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rect+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rect+";
           sha256 = "0vk0jwpl6yp2md9nh0ghp2qn883a8lr3cq8c9mgq0g552dwdiv5m";
           name = "rect-plus";
         };
@@ -47058,7 +47681,7 @@
           sha256 = "14ysbjdndsmcc4j3zhc3nfjxhdm9310jx237mrp98ancxdhsh4q9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rectangle-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rectangle-utils";
           sha256 = "1w5z2gykydsfp30ahqjihpvq04c5v0cfslbrrg429hycys8apws7";
           name = "rectangle-utils";
         };
@@ -47079,7 +47702,7 @@
           sha256 = "1mj7lyadzn3bwig3f9zariq5z4fg6liqnjvfd34yx88xc52nwf33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/recursive-narrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/recursive-narrow";
           sha256 = "1bx8l8wjxrkv949c73dp93knbn1iwnblcm8iw822mq2mgbgwsa7f";
           name = "recursive-narrow";
         };
@@ -47100,7 +47723,7 @@
           sha256 = "1rjpf23a8rggjmmxvm1997d3xz03kz84xams486b9ky0n2v02d57";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/redis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/redis";
           sha256 = "1awnilb8bk0izp6yw0187ybh9slf1hc51014xvvmj90darxby79a";
           name = "redis";
         };
@@ -47118,7 +47741,7 @@
           sha256 = "1jc4n60spzssa57i3jwrqwy20f741hb271vmmx49riycx1ybx3d3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/redo+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/redo+";
           sha256 = "1alfs7k5mydgvzsjmdifcizqgrqjrk2kbh3mabai7nlrwi47w9n2";
           name = "redo-plus";
         };
@@ -47139,7 +47762,7 @@
           sha256 = "0s38mi9w1dm9fzhd3l8xvq9x33rkb5vvd66jibza50dhn9dmakax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/redpen-paragraph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/redpen-paragraph";
           sha256 = "0jr707ik6fhznq0q421l986w85ah0n9b4is91zrgbk1v6miqrhca";
           name = "redpen-paragraph";
         };
@@ -47159,7 +47782,7 @@
           sha256 = "5547c5db0caa147ae2fa0099b9c58a8629b47bf4facb6c5cc72cee45e84be392";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/redshank";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/redshank";
           sha256 = "07s4gja1w8piabkajbzrgq77mkdkxr0jy9bmy2qb9w2svfsyns9b";
           name = "redshank";
         };
@@ -47180,7 +47803,7 @@
           sha256 = "08kzi2jcfqnlanqzvbk5gq1if7k8qc9gmz5bmvd2mvmx6z436398";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/refheap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/refheap";
           sha256 = "0pzark1db9k2pavd5sn89a28gd9j5jlkx3wkhwfzln3y5c1wnvdk";
           name = "refheap";
         };
@@ -47201,7 +47824,7 @@
           sha256 = "1d34jd7is979vfgdy56zkd1m15ng3waiabfpak6dv6ak3cdh5fgx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/regex-dsl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/regex-dsl";
           sha256 = "129sapsmvcqqqgcr9xlmxwszsxvsb4nj9g2fxsl4y6r383840jbr";
           name = "regex-dsl";
         };
@@ -47222,7 +47845,7 @@
           sha256 = "1wr12j16hckvc8bxxgxw280frl12h23cp44sxg28lczl16d9693l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/regex-tool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/regex-tool";
           sha256 = "1nd23vjij5h5gk5l7hbd5ks9ljisn054wp138jx2v6i51izxvh2v";
           name = "regex-tool";
         };
@@ -47243,7 +47866,7 @@
           sha256 = "02kfi3c6ydnr7xw611ck66kfjyl5w86dr9vfjv3wjl6ad9jya4zy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/region-bindings-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/region-bindings-mode";
           sha256 = "141q4x6rilidpnsm9s78qks9i1v6ng0ydhbzqi39xcaccfyyjb69";
           name = "region-bindings-mode";
         };
@@ -47264,7 +47887,7 @@
           sha256 = "0gsh0x1rqxvzrszdyna9d8b8w22mqnd9yqcwzay2prc6rpl26g1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/region-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/region-state";
           sha256 = "1iq2x1w8lqjjiwjja7r3qki6drvydnk171k9fj9g6rk7wslknz8x";
           name = "region-state";
         };
@@ -47285,7 +47908,7 @@
           sha256 = "01k3v4yiilz1k6drv7b2x6zbjx6dlz7cch8rq63mwc7v8kvdnqmi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/register-channel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/register-channel";
           sha256 = "037i2fgxxsfb85vd6xk17wyh7ny6fqfixvb0a18lf8m1hib1gyhr";
           name = "register-channel";
         };
@@ -47298,15 +47921,15 @@
     relative-buffers = callPackage ({ cl-lib ? null, dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "relative-buffers";
-        version = "20150115.1301";
+        version = "20160221.1323";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "relative-buffers";
-          rev = "7e37e118cc231c8581891bef0e4b5bb775920070";
-          sha256 = "023fwcqyy5gg234m772vpws751pharjwn3b0433i2sszna2z6xrf";
+          rev = "88c24259ed62b85adff6850e34bbbe844caddccf";
+          sha256 = "0100maanb1v0hl4pj8ykzlqpr3cvs6ldak5japndm5yngzp6m8ks";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/relative-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/relative-buffers";
           sha256 = "131182yb0pr0d6jibqd8aag4w8hywdyi87ldp77b95gw4bqhr96i";
           name = "relative-buffers";
         };
@@ -47327,7 +47950,7 @@
           sha256 = "1r8fhs7d2vkrbv15ic2bm79i9a8swbc38vk566vnxkhl3rfd5a0a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/relative-line-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/relative-line-numbers";
           sha256 = "0mj1w5a4ax8hwz41vn02bacxlnifd14hvf3p288ljvwchvlf0hn3";
           name = "relative-line-numbers";
         };
@@ -47348,7 +47971,7 @@
           sha256 = "0lqbhwi1f8b4sv9p1rf0gyjllk0l7g6v6mlws496079wxx1n5j66";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/relax";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/relax";
           sha256 = "0gfr4ym6aakawhkfz40ar2n0rfz503hq428yj6rbf7jmq3ajaysk";
           name = "relax";
         };
@@ -47369,7 +47992,7 @@
           sha256 = "0w40cx58c0hmc0yzs8maq1389hwha0qwfbz76pc6kpcx14v1gkhh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/remark-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/remark-mode";
           sha256 = "1zl8k3h4acbgb3hmjs2b4a14g0s0vl3xamrqxrr742zmqpr1h0w0";
           name = "remark-mode";
         };
@@ -47390,7 +48013,7 @@
           sha256 = "007lqahjbig6yygqik6fgbq114784z6l40a3vrc4qs9361zqizck";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/repeatable-motion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/repeatable-motion";
           sha256 = "12z4z8apd8ksf6dfvqm54l71mx68j0yg4hrjypa9p77fpcd6p0zw";
           name = "repeatable-motion";
         };
@@ -47411,7 +48034,7 @@
           sha256 = "12wylmyz54n1f3kaw9clhvs66dg43xvcvll4pl5ii0ibfv6pls1b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/repl-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/repl-toggle";
           sha256 = "1jyaksxgyygfv1wn9c6y8sykb4hicwgs9n5vrdikd2i0iix29zpb";
           name = "repl-toggle";
         };
@@ -47430,7 +48053,7 @@
           sha256 = "1clxkzxqsm91zbzv8nffav224ldr04ww5lppga2l41xjfl6z12qb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/replace-from-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/replace-from-region";
           sha256 = "19q8hz2xiyamhw8hzpahqwd4352k1m9r9wlh9kdh6hbb6sjgllnb";
           name = "replace-from-region";
         };
@@ -47440,6 +48063,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    replace-pairs = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "replace-pairs";
+        version = "20160207.651";
+        src = fetchFromGitHub {
+          owner = "davidshepherd7";
+          repo = "replace-pairs";
+          rev = "ef6f2719aab7714f6cb209fd3dd6d2e720681b3c";
+          sha256 = "169p85rmgashm0g26apkxynmypqk9ndh76kvh572db5kqb8ix0c6";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/replace-pairs";
+          sha256 = "0l9674rba25wh6fskvfwkhv99lwlszb177hsfzx39s6b4hshvlsb";
+          name = "replace-pairs";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/replace-pairs";
+          license = lib.licenses.free;
+        };
+      }) {};
     replace-plus = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "replace-plus";
         version = "20151231.1749";
@@ -47448,7 +48092,7 @@
           sha256 = "1af4sdhkzxknqzdkzc5gpm5j3s5k776j293hqq7cqzk533fdh4iz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/replace+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/replace+";
           sha256 = "1imsgr3v8g2p2mnkzp92ga3nvckr758pblmlha8gh8mb80089krn";
           name = "replace-plus";
         };
@@ -47469,7 +48113,7 @@
           sha256 = "0ks884jhxqkr8j38r9m4s56krm2gpkm0v5d51zzivcfhs30s6nff";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/replace-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/replace-symbol";
           sha256 = "07ljmw6aw9hsqffhwmiq2pvhry27acg6f4vgxgi91vjr8jj3r4ng";
           name = "replace-symbol";
         };
@@ -47490,7 +48134,7 @@
           sha256 = "0hs80g3npgb6qfcaivdfkpsc9mss1kdmyp5j7s922qcy2k4yxmgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/repo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/repo";
           sha256 = "0z4lcswh0c6xnsxlv33bsxh0nh26ydzfl8sv8xabdp5a2gk6bhpb";
           name = "repo";
         };
@@ -47511,7 +48155,7 @@
           sha256 = "05a88r2jp169x99abz9wrr1i8ch0bg3dlmaalxwqfmlzci0lksx2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/req-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/req-package";
           sha256 = "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf";
           name = "req-package";
         };
@@ -47532,7 +48176,7 @@
           sha256 = "1fiyxbd87cdlsdhpm3b3z8ypkrkvya6lamn0qx9hsxl1yv27vx4m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/request";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/request";
           sha256 = "09gxfy34a13wr0agmhn0nldxaiyc72rx9xi56jirsvji4dg5j6mm";
           name = "request";
         };
@@ -47553,7 +48197,7 @@
           sha256 = "1fiyxbd87cdlsdhpm3b3z8ypkrkvya6lamn0qx9hsxl1yv27vx4m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/request-deferred";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/request-deferred";
           sha256 = "19s8q9a01v0g897s9ass1mr5wbzy82rrfcnqpvcvp05q4y787dn9";
           name = "request-deferred";
         };
@@ -47574,7 +48218,7 @@
           sha256 = "1bfj2zjn3x41jal6c136wnwkgmag27bmrwbfwdylafc7qqk6dflv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/requirejs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/requirejs";
           sha256 = "09z6r9wcag3gj075wq215zcslyknl1izap595rn48xvizxi06c6k";
           name = "requirejs";
         };
@@ -47595,7 +48239,7 @@
           sha256 = "02wva5q8mvc0a5kms2wm1gyaag2x3zd6fkkpl4218nrbb0mbficv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/requirejs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/requirejs-mode";
           sha256 = "1sq1kim17bcmh39106vfgm7gq9nj9943lw8by0bpi5qr8xdjsn5r";
           name = "requirejs-mode";
         };
@@ -47616,7 +48260,7 @@
           sha256 = "055km3g4bwl73kca6ky3qzzmy103w0mqcfscj33ppdhg2n7m94n0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/resize-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/resize-window";
           sha256 = "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l";
           name = "resize-window";
         };
@@ -47637,7 +48281,7 @@
           sha256 = "0gbm208hmmmpjyj0x3z0cszphawkgvjqzi5idbdca3gikyiqw80n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/restart-emacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/restart-emacs";
           sha256 = "03aabz7fmy99nwimvjn7qz6pvc94i470hfgiwmjz3348cw02k0n6";
           name = "restart-emacs";
         };
@@ -47658,7 +48302,7 @@
           sha256 = "08j4m70j9xdl731bwa4vh656lji0w0f9mm1aki0qqd5msglw6kvx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/restclient";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/restclient";
           sha256 = "14wxfhb17n2f9wil68lb05abj7m0whwkqvrm3y9dg9mh14lcpbvc";
           name = "restclient";
         };
@@ -47679,7 +48323,7 @@
           sha256 = "1q13cgpz4wzhnqv84ablawy3y2wgdwy46sp7454mmfx9m77jzb2v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/reveal-in-osx-finder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/reveal-in-osx-finder";
           sha256 = "00jgrmh5s3vlpj1jjf8l3c3h4hjk5x781m95sidw6chimizvfmfc";
           name = "reveal-in-osx-finder";
         };
@@ -47697,7 +48341,7 @@
           sha256 = "1h27kg2k8f6smbqxandmvg859qk66jydbbbiwwjmk7316k66w8qa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/reveal-next";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/reveal-next";
           sha256 = "0fp6ssd4fad0s2pbxbw75bnx7fcgasig8xvcx7nls8m9p6zbbmh2";
           name = "reveal-next";
         };
@@ -47718,8 +48362,8 @@
           sha256 = "002ywhjms8ybk7cma2p2i11z3fz6kb0w8mlafysm911rvcq2hg5f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/reverse-theme";
-          sha256 = "1lq8nwhf8n5i280v0kqksndm4b3n6x34wnd5fa5i48ljwr5cinih";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/reverse-theme";
+          sha256 = "163kk5qnz9bk3l2fam79n264s764jfxbwqbiwgid8kw9cmk0v776";
           name = "reverse-theme";
         };
         packageRequires = [];
@@ -47739,7 +48383,7 @@
           sha256 = "0lzsy68k7sm9d3r8lzhzx9alc1f0cgfclry40pa4x0ilkcr7ysch";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/review-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/review-mode";
           sha256 = "0wapicggkngpdzi0yxc0b24s526fs819rc2d6miv6ix3gnw11n0n";
           name = "review-mode";
         };
@@ -47760,7 +48404,7 @@
           sha256 = "037sac5fvz6l2zgzlf8ykk4jf9zhj7ybzyz013jqzjj47a6sn1r1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/revive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/revive";
           sha256 = "1l7c6zq3ga2k1488qb0hgxlk08p3vrcf0sx116c1f8z8nf4c8ny5";
           name = "revive";
         };
@@ -47781,7 +48425,7 @@
           sha256 = "0zmby92mjszh77r5wh8sccqv3a5bb9sfhac8g55nasavw8hfplvj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/reykjavik-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/reykjavik-theme";
           sha256 = "1f0q2gfzkmpd374jryrd1lgg8xj6rwdq181jhppj3rfjizgw4l35";
           name = "reykjavik-theme";
         };
@@ -47799,7 +48443,7 @@
           sha256 = "02i5znln0aphvmvaia3sz75bvjhqwyjq1blf5qkcbprnn95lm3yh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rfringe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rfringe";
           sha256 = "171gzfciz78l6b653acgfailxpwmh8m1dm0dzpg0b1k0ny3aiwf6";
           name = "rfringe";
         };
@@ -47820,7 +48464,7 @@
           sha256 = "1qlpv5lzj4yfyjgdykhm6q9izg6g0z5pf5nmynj42vsx7v8bhy1x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rhtml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rhtml-mode";
           sha256 = "038j5jkcckmhlq3vz4h07s5y2scljh1fdn9r614hiyxwgk48lc35";
           name = "rhtml-mode";
         };
@@ -47841,7 +48485,7 @@
           sha256 = "11hwf9y5ax207w6rwrsmi3pmn7pn7ap6iys0z8hni2f5zzxjrmx3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rich-minority";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rich-minority";
           sha256 = "11xd76w5k3b3q5bxqjb55vi6dsal9drvyc1nh7z83awm59hvgczc";
           name = "rich-minority";
         };
@@ -47862,7 +48506,7 @@
           sha256 = "0p044wg9d4i6f5x7bdshmisgwvw424y16lixac93q6v5bh3xmab5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rigid-tabs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rigid-tabs";
           sha256 = "06n0bcvc3nnp84pcq3lywwga7l92jz8hnkilhbq59kydf5zbjldp";
           name = "rigid-tabs";
         };
@@ -47883,7 +48527,7 @@
           sha256 = "1kg83z10jw4ik0aapv9cjqlvqy31rln2am8vh3f77zh61qha37hx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rinari";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rinari";
           sha256 = "0qknicg3vzl7zbkwsdvp10hrvlng6mbi8hgslx4ir522dflrf9p0";
           name = "rinari";
         };
@@ -47904,7 +48548,7 @@
           sha256 = "0imsc44mcy5abmfin28d13l8mjjvyx6hxcsk81r0i8h12mxlmfkp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rings";
           sha256 = "1ncsb4jip07hbrf1l4j9yzn3l0kb63ylhzzsb4bb2yx6as4a66k7";
           name = "rings";
         };
@@ -47925,7 +48569,7 @@
           sha256 = "1drvyf5asjp3lgpss7llff35q8r89vmh73n1axaj2qp9jx5a5jih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rnc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rnc-mode";
           sha256 = "09ly7ln6qrcmmim9bl7kd50h4axrhy6ig406r352xm4a9zc8n22q";
           name = "rnc-mode";
         };
@@ -47946,7 +48590,7 @@
           sha256 = "01xd3nc7bmf4r4d37x08rw2dlsg6gns8mraahi4rwkg6a9lwl44n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/robe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/robe";
           sha256 = "19py2lwi7maya90kh1mgwqb16j72f7gm05dwla6xrzq1aks18wrk";
           name = "robe";
         };
@@ -47967,7 +48611,7 @@
           sha256 = "0rgv4y9aa5cc2ddz3y5z8d22xmr8kf5c60h0r3g8h91jmcw3rb4z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/roguel-ike";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/roguel-ike";
           sha256 = "1a7sa6nhgi0s4gjh55bhk5cg6q6s7564fk008ibmrm05gfq9wlg8";
           name = "roguel-ike";
         };
@@ -47980,15 +48624,15 @@
     rope-read-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rope-read-mode";
-        version = "20160110.1233";
+        version = "20160208.1710";
         src = fetchFromGitHub {
           owner = "marcowahl";
           repo = "rope-read-mode";
-          rev = "3d8ba4999dbdbf025197ee43dfd7a9ee9c25e78e";
-          sha256 = "0k88zjz4v2qllz9bkrhza91ckw5xx4aimgmcqpzcq3zl5py36h4l";
+          rev = "a763ebdbc9876cddf00794b08566ff6b87364064";
+          sha256 = "07jvk55asxn9lqqzgfl16zxgj2s30jqkygiha067rasbh4hs1ihi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rope-read-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rope-read-mode";
           sha256 = "0grnn5k6rbck0hz4c6cadgj3a4dv62habyingznisg2kx9i3m0dw";
           name = "rope-read-mode";
         };
@@ -48001,15 +48645,15 @@
     rotate = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rotate";
-        version = "20140123.316";
+        version = "20160215.118";
         src = fetchFromGitHub {
           owner = "daic-h";
           repo = "emacs-rotate";
-          rev = "04b64c6e20c465102ecafe0e099986b0808582bf";
-          sha256 = "0spgpq2cmckpl7j2193axy5yqws5dwrhik69d0bv0ylwzxp3npvg";
+          rev = "868122fa807db32762a68defcf69654a28a5a39f";
+          sha256 = "13xrjd5p2zq0r8ifbqbrgjfm0jj09nyxcbhk262jr6f171rf0y2m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rotate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rotate";
           sha256 = "0dygdd24flbgqp049sl4p8rymvv8h881hz9lvz8hnfwq687yyclx";
           name = "rotate";
         };
@@ -48030,7 +48674,7 @@
           sha256 = "04jbnm9is2cis75h40znqzjvyjq27ncr2vfank6zglzi4fhxsl0r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/roy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/roy-mode";
           sha256 = "0ch0hamvw4gsqs2pap0h6w4cj6n73jqa75if0ymh73hk5i3acm8g";
           name = "roy-mode";
         };
@@ -48051,7 +48695,7 @@
           sha256 = "01rb6qfsk4f33nkfdzvvjkw96ip1dv0py8i30l8ix9cqbk07svsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rpm-spec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rpm-spec-mode";
           sha256 = "01vggdv8sac4p0szwk7xgxcglmd5a1hv5q0ylf8zcp1lsyyh8ypd";
           name = "rpm-spec-mode";
         };
@@ -48072,7 +48716,7 @@
           sha256 = "0i5qwbhhdnspgs2y67kkgbk9zq6fx2j509q92mgfzbvjnf54h1r8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rpn-calc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rpn-calc";
           sha256 = "04dj2r4035k0c3x6iyjydshzmq381d60pmscp2hg5m7sp7bqn5xs";
           name = "rpn-calc";
         };
@@ -48093,7 +48737,7 @@
           sha256 = "0xkr1qn8fm3kv5c11janq5acp1q02abvxc463zijvm2qk735yl4d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rsense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rsense";
           sha256 = "1901xqlpc8fg4sl9j58jn40i2djs8s0cdcqcrzrq02lvk8ssfdf5";
           name = "rsense";
         };
@@ -48114,7 +48758,7 @@
           sha256 = "1zbpp9n35l589i7yla4l93nvp5ngwsj9p44glhz9jxzlkjwig9a1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rspec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rspec-mode";
           sha256 = "0nyib9rx9w9cbsgkcjx9n8fp77xkzxg923z0rdm3f9kc7njcn0zx";
           name = "rspec-mode";
         };
@@ -48127,15 +48771,15 @@
     rtags = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rtags";
-        version = "20160204.136";
+        version = "20160221.1307";
         src = fetchFromGitHub {
           owner = "Andersbakken";
           repo = "rtags";
-          rev = "b40a299bbd0b96d25680fe1fe24e3d512afc2673";
-          sha256 = "1bs4ylnkzkj6ckhhhbna2ah3y570zm1wh5wy77m425gji8fgsph6";
+          rev = "9f912e5ca5e1f8bfd53b76031be76c20141f8871";
+          sha256 = "0bkjqqmr3zc4wq2j1afpvnrsdhmp33kl9dbw5169xja6znn4sn92";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rtags";
           sha256 = "08clwydx2b9cl4wv61b0p564jpvq7gzkrlcdkchpi4yz6djbp0lw";
           name = "rtags";
         };
@@ -48156,7 +48800,7 @@
           sha256 = "1gqvp0h5zy2023gdzf7pw28rl27lzml87vpbi1zaw4bmj82zgh3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rtm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rtm";
           sha256 = "1ni2610svxziq1gq6s6igkhqyafvgn02gnw7jbm3ir7ks4w2imzf";
           name = "rtm";
         };
@@ -48177,7 +48821,7 @@
           sha256 = "1y5z0kr4qwd4fyvhk0rhpbbp6dw2jpzrawx62jid5539wrdjcabk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rubocop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rubocop";
           sha256 = "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q";
           name = "rubocop";
         };
@@ -48193,11 +48837,11 @@
         version = "20091002.545";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "53740";
+          rev = "53886";
           sha256 = "0wrjx25qg1dpgw0gih7fd679fv3q78cwaqyrf5dh1kq8g8cr5xhs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-additional";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-additional";
           sha256 = "0h0cxik8lp8g81bvp06mddikkk5bjdlch2wffcvsvi01is408w4w";
           name = "ruby-additional";
         };
@@ -48215,7 +48859,7 @@
           sha256 = "0c4vy9xsw44g6q9nc8aaav5avgp34h24mvgcnww468afiimivdcq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-block";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-block";
           sha256 = "0jfimjq1xpwxkxya452kp27h0fdiy87aj713w3zsm04k7l6i12hm";
           name = "ruby-block";
         };
@@ -48236,7 +48880,7 @@
           sha256 = "1kg83z10jw4ik0aapv9cjqlvqy31rln2am8vh3f77zh61qha37hx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-compilation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-compilation";
           sha256 = "1x1vpkjpx95sfcjhkx4cafypj0nkbd1i0mzxx3lmcrsmg8iv0rjc";
           name = "ruby-compilation";
         };
@@ -48257,7 +48901,7 @@
           sha256 = "1cy5zmdfwsjw8jla8mxjm1cmvrv727fwq1kqhjr5nxj0flwsm4x1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-dev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-dev";
           sha256 = "0mf2ra3p5976qn4ryc2s20vi0nrzwcg3xvsgppsc0bsirjw2l0fh";
           name = "ruby-dev";
         };
@@ -48273,11 +48917,11 @@
         version = "20150424.952";
         src = fetchsvn {
           url = "http://svn.ruby-lang.org/repos/ruby/trunk/misc/";
-          rev = "53740";
+          rev = "53886";
           sha256 = "0wrjx25qg1dpgw0gih7fd679fv3q78cwaqyrf5dh1kq8g8cr5xhs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-electric";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-electric";
           sha256 = "04j04dsknzb7xc8v6alawgcbymdfmh27xnpr98yc8b05nzafw056";
           name = "ruby-electric";
         };
@@ -48298,7 +48942,7 @@
           sha256 = "1x4nvrq5nk50c1l3b5wcr4g1n5nmwafcz1zzc12qzsl5sya7si55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-end";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-end";
           sha256 = "0cx121hji8ws6s3p2xfdgidm363y05g2n880fqrmzyz27cqkljis";
           name = "ruby-end";
         };
@@ -48319,7 +48963,7 @@
           sha256 = "15b2rs6m4d511qqkc2gc8k15mbqzrgv6s3hpypajl8nvqa79xnyd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-factory";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-factory";
           sha256 = "0v8009pad0l41zh9r1wzcx1h6vpzhr5rgpq6rb002prxz2lcbd37";
           name = "ruby-factory";
         };
@@ -48340,7 +48984,7 @@
           sha256 = "080hmrh7pgpaj33w1rkhcqb1yp70w4cap0rq9hsxaaajj0sn47z3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-guard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-guard";
           sha256 = "0hwxhirdvaysw9hxcgfdf0l12wilr6b9f9w91pk1hfwfi1w0lfwr";
           name = "ruby-guard";
         };
@@ -48361,7 +49005,7 @@
           sha256 = "0knl8zrd4pplnzk5z19cf9rqdfr3ymzfssrwp6jhndjzjdwvc2bv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-hash-syntax";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-hash-syntax";
           sha256 = "0bvwyagfh7mn457iibrpv1ay75089gp8pg608gbm24m0ix82xvb5";
           name = "ruby-hash-syntax";
         };
@@ -48382,7 +49026,7 @@
           sha256 = "1r2f5jxi6wnkmr1ssvqgshi97gjvxvf3qqc0njg1s33cy39wpqq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-interpolation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-interpolation";
           sha256 = "07idndxw8vgfrk5zfmjjhmixza35mqxwjhsrbjrq5yy72i5ivznp";
           name = "ruby-interpolation";
         };
@@ -48395,15 +49039,15 @@
     ruby-refactor = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, ruby-mode ? null }:
     melpaBuild {
         pname = "ruby-refactor";
-        version = "20151208.1207";
+        version = "20160214.1050";
         src = fetchFromGitHub {
           owner = "ajvargo";
           repo = "ruby-refactor";
-          rev = "8be821e89dac15fa402dba211a27b843147e4d17";
-          sha256 = "0dk9vkrjncawf4j4y5dky215m0hgl266d9w6mr7g0rgy6m7wfcyq";
+          rev = "e6b7125878a08518bffec6942df0c606f748e9ee";
+          sha256 = "13008ih4hwa80bn2dbgj551knbvgpriz5sb241rkf7mifmlfzgsi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-refactor";
           sha256 = "0nwinnnhy72h1ihjlnjl8k8z3yf4nl2z7hfv085gwiacr6nn2rby";
           name = "ruby-refactor";
         };
@@ -48424,7 +49068,7 @@
           sha256 = "06fhrn04whqb3n40wkzrwmzbzv7b1m48rd18rx8zpgxhbw8v7rdc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-test-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-test-mode";
           sha256 = "113ysf08bfh2ipk55f8h741j05999yrgx57mzh53rim5n63a312w";
           name = "ruby-test-mode";
         };
@@ -48445,7 +49089,7 @@
           sha256 = "0jd9acycpbdd90hallrl0k5055rypp502qv4c6i286p7f9is4kvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-tools";
           sha256 = "1zs2vzcrw11xyj2a7lgqzw4slcha20206jvjbxkm68d57rffpk8y";
           name = "ruby-tools";
         };
@@ -48466,7 +49110,7 @@
           sha256 = "17dzr5w12ai2q15yv81gchk360yjs71w74vsgs2fyy2yznvclpq9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/runner";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/runner";
           sha256 = "09apmk22swj05z77ziij31jj6b3g221qv3mw3mymffzxn5ap2rbx";
           name = "runner";
         };
@@ -48487,7 +49131,7 @@
           sha256 = "18w6gkpxp0g7rzvnrk8vvr267y768dfik447ssq8jpz3jlr5jnq6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/runtests";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/runtests";
           sha256 = "0m9rqjb5c0yqr2wv5dsdiba21knr63b5pxsqgbkbybi15zgxcicb";
           name = "runtests";
         };
@@ -48500,15 +49144,15 @@
     rust-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rust-mode";
-        version = "20160116.1355";
+        version = "20160216.1934";
         src = fetchFromGitHub {
           owner = "rust-lang";
           repo = "rust-mode";
-          rev = "fa5b38feac9c5b4da7427b97832b813e20b8e276";
-          sha256 = "0m8ywaa9hccsss4gp1gr6v8faj503gr8l9a6gsdnvf3m5g9wxm6v";
+          rev = "b1cca0fa73633dcee5704423d9421bfccf12385d";
+          sha256 = "0124w1br75aldnlsavd7r06y7k7q7cc1szmza8f6mwbpfzy038sr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rust-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rust-mode";
           sha256 = "0h4gblg6ls8a2wa43r990lanl6ykx8j7c8yg5i3n151imzic2n33";
           name = "rust-mode";
         };
@@ -48521,15 +49165,15 @@
     rustfmt = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rustfmt";
-        version = "20151124.1311";
+        version = "20160217.742";
         src = fetchFromGitHub {
           owner = "fbergroth";
           repo = "emacs-rustfmt";
-          rev = "b54e77b2287bfc558c0b4dbfa8908b4face48320";
-          sha256 = "0i2r14ifpqjcxcflhl38iayk53920vl616y770lwf77zvhnxrmm9";
+          rev = "45efd68ee602d9ed7a07ff0ef045d78cacd57e89";
+          sha256 = "0c22cxa4f6plz67vxmp1zgaylkfrky313cj0zybn9akrbcxpbc34";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rustfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rustfmt";
           sha256 = "1znav2pbax0rsvdl85mmbgbmxy7gnrm4nx54ij1ff6yd831r5jyl";
           name = "rustfmt";
         };
@@ -48550,7 +49194,7 @@
           sha256 = "0iblk0vagjcg3c8q9hlpwk7426ms7aq0s80izgvascfmyqycv6qm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rvm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rvm";
           sha256 = "08i7cmav2cz73jp88ww0ay2yjhk9dj8146836q4sij1bl1slbaf8";
           name = "rvm";
         };
@@ -48571,7 +49215,7 @@
           sha256 = "08vf62fcrnbmf2ppb759kzznjdz8x72fqdwbc4n8nbswrwgm2ikl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/s";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/s";
           sha256 = "0b2lj6nj08pk5fnxvjkc1d9hvi29rnjjy4n5ns4pq6wxpfnlcw64";
           name = "s";
         };
@@ -48592,7 +49236,7 @@
           sha256 = "06ng960fj2ivnwb0hrn0qic5x8hb0sswjzph01zmwhbfnwykhr85";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/s-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/s-buffer";
           sha256 = "07kivgzv24psjq1240gwj9wkndq4bhvjh38x552k90m9v6jz8l6m";
           name = "s-buffer";
         };
@@ -48613,7 +49257,7 @@
           sha256 = "06gqqbkn85l2p05whmr4wkg9axqyzb7r7sgm3r8wfshm99kgpxvl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sackspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sackspace";
           sha256 = "1m10iw83k6m7v7sg2dxzdy83zxq6svk8h9fh4ankyn3baqrdxg5z";
           name = "sackspace";
         };
@@ -48626,15 +49270,15 @@
     sage-shell-mode = callPackage ({ cl-lib ? null, deferred, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sage-shell-mode";
-        version = "20151024.313";
+        version = "20160220.2028";
         src = fetchFromGitHub {
           owner = "stakemori";
           repo = "sage-shell-mode";
-          rev = "ad78c168c1fb702eebc74f30eba830adc3fe0079";
-          sha256 = "060xvh5qwqbvvb5ykyflwps2p2by9p1mm5dz7gkxla5zq0a73vmx";
+          rev = "30461322fc8530b8be87d873aafff5a7c5044c24";
+          sha256 = "1z171hrm6fscrdw9z1b2wh0br6axg53r853n2mdk33k3yvwyd6z8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sage-shell-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sage-shell-mode";
           sha256 = "18k7yh8rczng0kn2wsawjml70cb5bnc5jr2gj0hini5f7jq449wx";
           name = "sage-shell-mode";
         };
@@ -48655,7 +49299,7 @@
           sha256 = "1hl227bmjch0vq7n47mwydkyxnd6wkbz9klk3c4398qmc2qxm5kn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/salt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/salt-mode";
           sha256 = "1r5k7022vxgj3p5l16y839lff85z0m9hpifq59knij61g9hxadsp";
           name = "salt-mode";
         };
@@ -48676,7 +49320,7 @@
           sha256 = "1r6b6n2bzjznjfimgcm0vnmln4sbyasm4icmdgbpzahdmbkfzq3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sane-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sane-term";
           sha256 = "0iz63b62x5jrz7c23i850634k4bk73kg1h4wj1ravx3wlgvzs8y8";
           name = "sane-term";
         };
@@ -48697,7 +49341,7 @@
           sha256 = "0srz4j7484v5h7hmdlyrcl2k27jhy414689wphbbyj63rvg321cm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sass-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sass-mode";
           sha256 = "1byjk5zpzjlyiwkp780c4kh7s9l56y686sxji89wc59d19rp8800";
           name = "sass-mode";
         };
@@ -48718,7 +49362,7 @@
           sha256 = "0y6a0z2ydc5li3990mfhcgz5mrb89sj8s8dvdgmnv8pgdhn1xmb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sauron";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sauron";
           sha256 = "01fk1xfh7r16fb1xg5ibbs7gci9dja49msdlf7964hiq7pnnhxgb";
           name = "sauron";
         };
@@ -48736,7 +49380,7 @@
           sha256 = "1p8p5b85sdnq45rdjq5wcr3xz7c22mr5bz41a21mkabc4j4fvd3z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/save-load-path";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/save-load-path";
           sha256 = "01hm1rm9x3bqs6vf65l4xv2n4ramh3qwgmrp632fyfz5dlrvbssi";
           name = "save-load-path";
         };
@@ -48746,27 +49390,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    save-sexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "save-sexp";
-        version = "20150731.1046";
-        src = fetchFromGitHub {
-          owner = "tarsius";
-          repo = "save-sexp";
-          rev = "31bd739269e14df70f9519417370ba69a53e540d";
-          sha256 = "0jdsndq9nqqqfn821qy66y5x3yvmxca9zfk9j9q4a9sbbychqc9c";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/save-sexp";
-          sha256 = "12jx47picdpw668q75qsp9gncrnxnlk1slhzvxsk5pvkdwh26h66";
-          name = "save-sexp";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "http://melpa.org/#/save-sexp";
-          license = lib.licenses.free;
-        };
-      }) {};
     save-visited-files = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "save-visited-files";
@@ -48778,7 +49401,7 @@
           sha256 = "00jvl1npc889f3isi7cbdzwvf9x4rq67zgl7br8npxf8jlc2mwhm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/save-visited-files";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/save-visited-files";
           sha256 = "1pmjz27dlp5yrihgsy8q1bwbhkkj3sn7d79ccvljvzxg5jn1grkd";
           name = "save-visited-files";
         };
@@ -48796,7 +49419,7 @@
           sha256 = "1qfq83cb4qixdl15j28rlslkq6g88ig55ydg747jqb3dqyp3qaah";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/savekill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/savekill";
           sha256 = "1l14p6wkzfhlqxnd9fpw123vg9q5k20ld7rciyzbfdb99pk9z02i";
           name = "savekill";
         };
@@ -48809,15 +49432,15 @@
     sbt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, scala-mode2 }:
     melpaBuild {
         pname = "sbt-mode";
-        version = "20160201.1059";
+        version = "20160219.448";
         src = fetchFromGitHub {
           owner = "ensime";
           repo = "emacs-sbt-mode";
-          rev = "cc166f2407ea9dfde5d24273298a73cfdd35d579";
-          sha256 = "1dsdafb6mavdb14qjf8q0723gxdfxra823f0rn31vak2klwq8zdj";
+          rev = "fc4fa63c8f788625030092c4450112ec67ae27ed";
+          sha256 = "16ckzn2pv8lh16xna9wqisiflhrk0f6kj5zgrygbmsl86kc0rk2a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sbt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sbt-mode";
           sha256 = "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8";
           name = "sbt-mode";
         };
@@ -48830,15 +49453,15 @@
     scad-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "scad-mode";
-        version = "20150330.2229";
+        version = "20160205.1243";
         src = fetchFromGitHub {
           owner = "openscad";
           repo = "openscad";
-          rev = "be4fd23dc6b9f4de44c5a4c5cee94894dc139393";
-          sha256 = "0v0gffwcn70kyhpvbgdzrsx7f97ksza1han794wx5v9plxj366ld";
+          rev = "a2fc2044a9302332427315decc4b925e0b0ad310";
+          sha256 = "0ckns5sqpjlw4ndgyl3bij5pidlm6xjc534fxzwz2s2h2bqbz9q8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scad-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scad-mode";
           sha256 = "04b4y9jks8sslgmkx54fds8fba9xv54z0cfab52dy99v1301ms3k";
           name = "scad-mode";
         };
@@ -48851,15 +49474,15 @@
     scad-preview = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, scad-mode }:
     melpaBuild {
         pname = "scad-preview";
-        version = "20150818.824";
+        version = "20160206.736";
         src = fetchFromGitHub {
           owner = "zk-phi";
           repo = "scad-preview";
-          rev = "a444532126bdec3dec9cacf55bc183780decf040";
-          sha256 = "1mx5bg4mbgj828mwjd9nlxli4ibcrgpzn9i6ns2g9zpgm932zlbc";
+          rev = "fee011589671cc8f1296cb6aa81553e5bb699819";
+          sha256 = "13x00dls59zshz69260pnqmx6ydrjg8p2jdjn1rzgf5dsmwfy3sc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scad-preview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scad-preview";
           sha256 = "0wcd2r60ibbc2mzpq8fvyfc1fy172rf9kzdj51p4jyl51r76i86z";
           name = "scad-preview";
         };
@@ -48880,7 +49503,7 @@
           sha256 = "0qd3yi2as30kacr74vbzvyq97684s8sz585z30d47shqcvp6l1a6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scala-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scala-mode";
           sha256 = "1vbgphmvvsj5jl8f78rpsidlmlgyp1kq3nkmziqhwkcq8hfywssm";
           name = "scala-mode";
         };
@@ -48901,7 +49524,7 @@
           sha256 = "07928cll5n3s7xx75nfbil73zilrhdfh19hp4s75c7hh8sdwmig6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scala-mode2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scala-mode2";
           sha256 = "0rnkln6jwwqc968w3qpc6zjjv8ylw0w6c2hsjpq2slja3jn5khch";
           name = "scala-mode2";
         };
@@ -48922,7 +49545,7 @@
           sha256 = "1wf3d5spvi9kr4q2w7f18g1bm10fh2zbh4sdbqkf78afv6sbqzrz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scala-outline-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scala-outline-popup";
           sha256 = "1fq0k6l57wkya1ycm4cc190kg90j2k9clnl0sc70achp4i47qbk7";
           name = "scala-outline-popup";
         };
@@ -48943,7 +49566,7 @@
           sha256 = "0m7hanpc2skmsz783m0212xd10y31gkj5n6w8gx9s989l1y4i1b8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scf-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scf-mode";
           sha256 = "0acbrw94q6cr9b29mz1wcbwi1g90pbm7ly2xbaqb2g8081r5rgg0";
           name = "scf-mode";
         };
@@ -48963,7 +49586,7 @@
           sha256 = "13pym1kwi8ah3h2l557pvbg4lgpp5lhldj3qxyg7gyvgkwr91a7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scheme-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scheme-complete";
           sha256 = "1nam7xzw8hrykz73q9x24szpjv2kpkp48lcmzf02kzj3cg6l76qm";
           name = "scheme-complete";
         };
@@ -48984,7 +49607,7 @@
           sha256 = "09cvrphrnbj8avnlqqv6scjz17cn6zm6mzghjn3vxfr4hql66rir";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scheme-here";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scheme-here";
           sha256 = "137qqfnla3hjm6qcnzpsgrw173px0k5dwq9apns5cdryxx3ahcvv";
           name = "scheme-here";
         };
@@ -49005,7 +49628,7 @@
           sha256 = "0ark720g0nrdqri5bjdpss6kn6k3hz3w3zdvy334wws05mkb17y4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scion";
           sha256 = "17qmc7fpvbamqkzyk8jspp2i0nw93iya4iwddvas7vdpjy7mk81d";
           name = "scion";
         };
@@ -49026,7 +49649,7 @@
           sha256 = "0v36zd8lnsbc7jvnhv5pidfxabq2qqmwg1nm2jdxfj6vvcg3vx0x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sclang-extensions";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sclang-extensions";
           sha256 = "00nirxawsngvlx7bmf5hqg2wk0l1v5pi09r6phzd0q8gyq3kmbbn";
           name = "sclang-extensions";
         };
@@ -49047,7 +49670,7 @@
           sha256 = "0vbcghgapwdf3jgjnjdla17dhf5mkmwapz4a8fmlr7sw1wqvj857";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sclang-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sclang-snippets";
           sha256 = "0q1bh316v737a0hm9afijk1spvg144cgrf45jm0bpd60zhiv7bb2";
           name = "sclang-snippets";
         };
@@ -49068,7 +49691,7 @@
           sha256 = "1jgg116rhhgs5qrngrmqi8ir7yj1h470f57dc7fyijw0ly5mp6ii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scpaste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scpaste";
           sha256 = "02dqmx6v3jxdn5yz1z74624sc6sz2bm4qjyi78w9akhp2jplwlk1";
           name = "scpaste";
         };
@@ -49089,7 +49712,7 @@
           sha256 = "0ykhr24vpx3byn2n346nqqvmwcg34hk22s3lpdx7lpnkrn5z41aq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scratch";
           sha256 = "1c6vxpd9c24d2flzwgvzqz0wr70xzqqs3f59pp897h0f7j91im5d";
           name = "scratch";
         };
@@ -49110,7 +49733,7 @@
           sha256 = "0ng0by647r49mia7vmjqc97gwlwgs8kmaz0lw2y54jdz8m0bbngp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scratch-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scratch-ext";
           sha256 = "031wxz10k1q4bi5hywhcw1vzi41d5pv5hc09x8jk9s5nzyssvc0y";
           name = "scratch-ext";
         };
@@ -49131,7 +49754,7 @@
           sha256 = "030mcq0cmamizvra8jh2x76f71g5apiavwb10c28j62rl0r5bisk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scratch-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scratch-log";
           sha256 = "1yp3p0dzhmqrd0krqii3x79k4zc3p59148cijhk6my4n1xqnhs69";
           name = "scratch-log";
         };
@@ -49152,7 +49775,7 @@
           sha256 = "00b4r8bqlxc29k18vig0164d5c9fp5bp5q26d28lwr4f0s4a71d2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scratch-palette";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scratch-palette";
           sha256 = "0m6hc2amwnnii4y189kkridhapl9jipkmadvrmwvspgy3lxhlafs";
           name = "scratch-palette";
         };
@@ -49173,7 +49796,7 @@
           sha256 = "1yvmfiv1s83r0jcxzbxyrx3b263d73lbap6agansmrhkxp914xr1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scratch-pop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scratch-pop";
           sha256 = "0s7g1fbnc5hgz8gqmp1lynj5g7vvxisj7scxx5wil9qpn2zyggq1";
           name = "scratch-pop";
         };
@@ -49194,7 +49817,7 @@
           sha256 = "10hmy0p4pkrzvvyisk4rjc6hqqyk2sir1rszqgmkhrdywl010vlc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scratches";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scratches";
           sha256 = "0409v1wi10q48rrh8iib6dw9icmswfrpjx9x7xcma994z080d2fy";
           name = "scratches";
         };
@@ -49212,7 +49835,7 @@
           sha256 = "0q7yxaaa0fic4d2xwr0qk28clkinwz4xvw3wf8dv1g322s0xx2cw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/screenshot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/screenshot";
           sha256 = "0aw2343as38y26r2g7wpn1rq1n6xpw4y5c7ir8qh1crkc1y513hs";
           name = "screenshot";
         };
@@ -49233,7 +49856,7 @@
           sha256 = "113pi7nsaksaacy74ngbvrvr6qcl7199xy662nj58bz5307yi9q0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scss-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scss-mode";
           sha256 = "1g27xnp6bjaicxjlb9m0njc6fg962j3hlvvzmxvmyk7gsdgcgpkv";
           name = "scss-mode";
         };
@@ -49254,7 +49877,7 @@
           sha256 = "08yc67a4ji7z8s0zh500wiscziqsxi92i1d33fjla2mcr8sxxn0i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/search-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/search-web";
           sha256 = "0qqx9l8dn1as4gqpq80jfacn6lz0132m91pjzxv0fx6al2iz0m36";
           name = "search-web";
         };
@@ -49275,7 +49898,7 @@
           sha256 = "0zs08vxmjb3y4dnfq6djnrhmkgyhhwd5zylrjisrd4y7f089fyh4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/searchq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/searchq";
           sha256 = "0flsc07v887pm62mslrv7zqnhl62l6348nkm77mizm1592q3kjgr";
           name = "searchq";
         };
@@ -49296,7 +49919,7 @@
           sha256 = "15cjhwjiwmrfzmr74hbw5s92si2qdb8i97nmkbsgkj3444rxg239";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/seclusion-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/seclusion-mode";
           sha256 = "0ff10x6yr37vpp6ffbk1nb027lgmrydwjrb332fskwlf3xmy6v0m";
           name = "seclusion-mode";
         };
@@ -49314,7 +49937,7 @@
           sha256 = "143vg6z3aa0znmsx88r675vv5g2c13giz25dcbzazsp4wcr46wvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/second-sel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/second-sel";
           sha256 = "1nzy5ms5qf5big507kg3z5m6d6zgnsv2fswn359r2j59cval3fvr";
           name = "second-sel";
         };
@@ -49335,7 +49958,7 @@
           sha256 = "19p3zp4cj7ik2gwzc5k6klqc4b8jc2hvm80yhczc5b7k223gp2bv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/seeing-is-believing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/seeing-is-believing";
           sha256 = "05aja5xycb3kpmxyi234l50h98f5m1fil6ll4f2xkpxwv31ba5rb";
           name = "seeing-is-believing";
         };
@@ -49356,7 +49979,7 @@
           sha256 = "0qd462qbqdx53xh3ddf76chiljxf6s43r28v2ix85gsig7nm5pgr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/seethru";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/seethru";
           sha256 = "1lcwslkki9s15xr2dmh2iic4ax8ia0j20hjnjmkv612wv04b806v";
           name = "seethru";
         };
@@ -49377,7 +50000,7 @@
           sha256 = "1as3llcs7jgcw9pafz4mbfml1cqd1fw8yl64bb4467nmhq2p18p7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sekka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sekka";
           sha256 = "1jj4ly9p7m3xvb31nfn171lbpm9y70y8cbf8p24w0fhv665dx0cp";
           name = "sekka";
         };
@@ -49387,6 +50010,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    select-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "select-themes";
+        version = "20160220.1906";
+        src = fetchFromGitHub {
+          owner = "jasonm23";
+          repo = "emacs-select-themes";
+          rev = "236f54287519a3ea6dd7b3992d053e4f4ff5d0fe";
+          sha256 = "1c9yv1kjcd0jrzgw99q9p4kzj980f261mjcsggbcw806wb0iw1xn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/select-themes";
+          sha256 = "18ydv7240vcqppg1i7n8sy18hy0lhpxz17947kxs7mvj4rl4wd84";
+          name = "select-themes";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/select-themes";
+          license = lib.licenses.free;
+        };
+      }) {};
     selectric-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "selectric-mode";
@@ -49398,7 +50042,7 @@
           sha256 = "18xdkisxvdizsk51pnyimp9mwc6k9cpcxqr5hgndkz9q97p5dp79";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/selectric-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/selectric-mode";
           sha256 = "1k4l0lr68rqyi37wvqp1cnfci6jfkz0gvrd1hwbgx04cjgmz56n4";
           name = "selectric-mode";
         };
@@ -49411,15 +50055,15 @@
     semi = callPackage ({ fetchFromGitHub, fetchurl, flim, lib, melpaBuild }:
     melpaBuild {
         pname = "semi";
-        version = "20150525.619";
+        version = "20160211.255";
         src = fetchFromGitHub {
           owner = "wanderlust";
           repo = "semi";
-          rev = "35c9ff77db07ace4b7178189c1fe45118ebf9a65";
-          sha256 = "1s1wjk2ba5spqc0vhj8kmfsm8vzmza06pnjkwal084v8dnwz0zz3";
+          rev = "33289fb506d22d639351e8a867fc7f34a1b86ff0";
+          sha256 = "17w6mf9khcmja7ikl0c895dv7s7g7pqm15svv7spfcb1p30lrh39";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/semi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/semi";
           sha256 = "01wk3lgln5lac65hp6v83d292bdk7544z23xa1v6a756nhybwv25";
           name = "semi";
         };
@@ -49440,7 +50084,7 @@
           sha256 = "0g4jfcc5k26yh192bmmxnim9mqv993v2jjd9g9ssvnd42ihpx1n3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sensitive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sensitive";
           sha256 = "0v988k0x3mdp7ank2ihghphh8sanvv96s4sg6pnszg5hczak1vr3";
           name = "sensitive";
         };
@@ -49459,7 +50103,7 @@
           sha256 = "01qj57zpqpr4rxk9bsx828c7baac1xaa58cz22fncirdx00svn2k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sentence-highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sentence-highlight";
           sha256 = "16kh6567hb9lczh8zpqwbzz5bikg2fsabifhhky8qwxp4dy07v9m";
           name = "sentence-highlight";
         };
@@ -49480,7 +50124,7 @@
           sha256 = "0ikiv12ahndvk5w9pdayqlmafwj8d1vkcshfnqmgy6ykqbcdpqk6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sentence-navigation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sentence-navigation";
           sha256 = "1p3ch1ab06v038h130fsxpbq45d1yadl67i2ih4l4fh3xah5997m";
           name = "sentence-navigation";
         };
@@ -49501,7 +50145,7 @@
           sha256 = "15vmd1qmj8a6a5mmvdcnbav6mi5rhrp39m85idzv02zm0x9x6lyc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/seoul256-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/seoul256-theme";
           sha256 = "0mgyq725x5hmhs3h8v5macv8bfkginjghhwr9kli60vdb4skgjvp";
           name = "seoul256-theme";
         };
@@ -49522,7 +50166,7 @@
           sha256 = "1np6ip28ksms6fig67scwvwj43zgblny50ccvz8aclbl0z8nxswl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sequences";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sequences";
           sha256 = "12wnkywkmxfk2sx40h90k53d5qmc8hiky5vhlyf0ws3n39zvhplh";
           name = "sequences";
         };
@@ -49541,7 +50185,7 @@
           sha256 = "0vg8rqzzi29swznhra2mnf45czr2vb77dpcxn3j0fi7gynx3wcwk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sequential-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sequential-command";
           sha256 = "03qybacgy5fs3lam73x0rds4f68s173mhbah6rr97272nikd50v1";
           name = "sequential-command";
         };
@@ -49562,7 +50206,7 @@
           sha256 = "15lx6qvmq3vp84ys8dzbx1nzxcnzlq41whawc2yhrnd1dbq4mv2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/servant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/servant";
           sha256 = "048xg0gcwnf4l2p56iw4iawi3ywjz7f6icnjfi8qzk1z912iyl9h";
           name = "servant";
         };
@@ -49583,7 +50227,7 @@
           sha256 = "1h58q41wixjlapia1ggf83jxcllq7492k55mc0fq7hbx3hw1q1y2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/serverspec";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/serverspec";
           sha256 = "001d57yd0wmz4d7qmhnanac8g29wls0sqw194003hrgirakg82id";
           name = "serverspec";
         };
@@ -49604,7 +50248,7 @@
           sha256 = "0sp952abz7dkq8b8kkzzmnwnkq5w15zsx5dr3h8lzxb92lnank9v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/session";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/session";
           sha256 = "0fghxbnf1d5iyrx1q8xd0lbw9nvkdgg2v2f89j6apnawisrsbhwx";
           name = "session";
         };
@@ -49625,7 +50269,7 @@
           sha256 = "18igxblmrbxwhd2d68cz1bpj4524djh2dw2rwhxlij76f9v805wn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/seti-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/seti-theme";
           sha256 = "1mwkx3hynabwr0a2rm1bh91h7xf38a11h1fb6ys8s3mnr68csd9z";
           name = "seti-theme";
         };
@@ -49646,7 +50290,7 @@
           sha256 = "11h5z2gmwq07c4gqzj2c9apksvqk3k8kpbb9kg78bbif2xfajr3m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sexp-move";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sexp-move";
           sha256 = "0lcxmr2xqh8z7xinxbv1wyrh786zlahhhj5nnbv83i8m23i3ymmd";
           name = "sexp-move";
         };
@@ -49667,7 +50311,7 @@
           sha256 = "1nfvb2vmbdqfyj25hvwrz7ajb4ilxgrvd3rbf3im3mb3skic1wn9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shackle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shackle";
           sha256 = "159z0cwg7afrmym0xk902d8z093sqv39jig25ds7z4a224yrv5w6";
           name = "shackle";
         };
@@ -49688,7 +50332,7 @@
           sha256 = "0phivbhjdw76gzrx35rp0zybqfb0fdy2hjllf72qf1r0r5gxahl8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shadchen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shadchen";
           sha256 = "1r1mfmv4cdlc8kzjiqz81kpqdrwbnyciwdgg6n5x0yi4apwpvnl4";
           name = "shadchen";
         };
@@ -49709,7 +50353,7 @@
           sha256 = "0l094nrrvan8v6j1xdgb51cbjvwicvxih29b7iyga13adb9dy9j4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shader-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shader-mode";
           sha256 = "12y84fa1wc82js53rpadaysmbshhqf6wb97889qkksx19n3xmb9g";
           name = "shader-mode";
         };
@@ -49719,27 +50363,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    shadow = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "shadow";
-        version = "20110507.224";
-        src = fetchFromGitHub {
-          owner = "mooz";
-          repo = "shadow.el";
-          rev = "eafc93b090895102ac299220a84ec99244f633af";
-          sha256 = "1i1a0jsrrimfxv8xm37cihb3w7fc3l0872c8gnx9gb4876if3sxw";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/553e27a3523ade9dc4951086d9340e8240d5d943/recipes/shadow";
-          sha256 = "0zhy94jpk29k51r7m1gd24jx7h6b68l38vhw27j3wz0ag1h5352k";
-          name = "shadow";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "http://melpa.org/#/shadow";
-          license = lib.licenses.free;
-        };
-      }) {};
     shakespeare-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shakespeare-mode";
@@ -49751,7 +50374,7 @@
           sha256 = "0vkxl3w4y4yacs1s4v0gwggvzrss8g74d3dgk8h3gphl4dlgx496";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shakespeare-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shakespeare-mode";
           sha256 = "1i9fr9l3x7pwph654hqd8s74swy5gmn3wzs85a2ibmpcjq8mz9rd";
           name = "shakespeare-mode";
         };
@@ -49772,7 +50395,7 @@
           sha256 = "15a8gs4lrqxn0jyfw16rc6vm7z1i10pzzlnp30x6nly9a7xra47x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shampoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shampoo";
           sha256 = "01ssgw4cnnx8d86g3r1d5hqcib4qyhmpqvcvx47xs7zh0jscps61";
           name = "shampoo";
         };
@@ -49790,7 +50413,7 @@
           sha256 = "0jr5sbmg4zrx2dfdrajh2didm6dxx9ri5ib9qnwhc1jlppinyi7l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shell-command";
           sha256 = "1jxn721i4s1k5x1qldiynnl5khsl22x9k3whm698nzv8m786spxl";
           name = "shell-command";
         };
@@ -49811,7 +50434,7 @@
           sha256 = "1w42j5cdddr0riz1xjq3wiz5i9f71i9jdzd1l92ir0mlj05wjyic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-current-directory";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shell-current-directory";
           sha256 = "0bj2gs96ivm5x8l7gwvfckyalr1amh4cb1v2dbl323zmrqddhgkd";
           name = "shell-current-directory";
         };
@@ -49832,7 +50455,7 @@
           sha256 = "0z04z07r7p5p05zhaka37s48y82hg2dbk0ynap4inph3frn4yyfl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-here";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shell-here";
           sha256 = "0csi70v89bqdpbsizji6c5z0jmkx4x4vk1zfclkpap4dalmxxcsh";
           name = "shell-here";
         };
@@ -49850,7 +50473,7 @@
           sha256 = "0biqjm0fpd7c7jilgkcwp6c32car05r5akimbcdii3clllavma7r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-history";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shell-history";
           sha256 = "1blad7ggv27qzpai2ib1pmr23ljj8asq880g3d7w8fhqv0p1pjs7";
           name = "shell-history";
         };
@@ -49863,15 +50486,15 @@
     shell-pop = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shell-pop";
-        version = "20151121.830";
+        version = "20160208.348";
         src = fetchFromGitHub {
           owner = "kyagi";
           repo = "shell-pop-el";
-          rev = "4531d234ca471ed80458252cba0ed005a0720b27";
-          sha256 = "0fzywfdaisvvdbcl813n1shz0r8v1k9kcgxgynv5l0i4nkrgkww5";
+          rev = "272ed7dba1a32a900339167e02fbe052513b9a6c";
+          sha256 = "0pnj11cba3g3kmnp0sr0gd085pzqwcpzmg3wyywpbinrr5ilagwp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-pop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shell-pop";
           sha256 = "02s17ln0hbi9gy3di8fksp3mqc7d8ahhf5vwyz4vrc1bg77glxw8";
           name = "shell-pop";
         };
@@ -49892,7 +50515,7 @@
           sha256 = "16srngml5xmpaxb0wzhx91jil0r0dmn673bwai3lzxrkmjnl748l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-split-string";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shell-split-string";
           sha256 = "1yj1h7za4ylxh2nikj7s1qqlilpsk05x9571a2fymfyznm3iq77m";
           name = "shell-split-string";
         };
@@ -49913,7 +50536,7 @@
           sha256 = "1bcrxq43a45alv6x0wms4d4nykiqz2mzk04kwk5lmf5pw3dqm900";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-switcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shell-switcher";
           sha256 = "07g9naiv2jk9jxwjywrbb05dy0pbfdx6g8pkra38rn3vqrjzvhyx";
           name = "shell-switcher";
         };
@@ -49934,7 +50557,7 @@
           sha256 = "0ssaccdacabpja9nqzhr8x8ggfwmlian7y4p0fa6gvr7qsvjpgr9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shell-toggle";
           sha256 = "1ai0ks7smr8b221j9hmsikswpxqraa9b13fpwv4wwagavnlah446";
           name = "shell-toggle";
         };
@@ -49955,7 +50578,7 @@
           sha256 = "1mc7y79h5p9cxqwsl40b1j5la5bm8b70n6fn4rx9wr4bi7rwph5i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shelldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shelldoc";
           sha256 = "1xlp03aaidp7dp8349v8drzhl4lcngvxgdrwwn9cahfqlrvvbbbx";
           name = "shelldoc";
         };
@@ -49976,7 +50599,7 @@
           sha256 = "1ns2w7zhbi96a3gilmzs69187jngqhcvik17ylsjdfrk42hw5s6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shelltest-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shelltest-mode";
           sha256 = "1inb0vq34fbwkr0jg4dv2lljag8djggi8kyssrzhfawri50m81nh";
           name = "shelltest-mode";
         };
@@ -49997,7 +50620,7 @@
           sha256 = "13zsws8gq9a8nfk4yzlvfsvqjh9zbnanmw68rcna93yc5nc634nr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shift-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shift-text";
           sha256 = "1v9zk7ycc8k1qk1cfs2y1knygl686msmlilqy5a7mh0w0z9f3a2i";
           name = "shift-text";
         };
@@ -50018,7 +50641,7 @@
           sha256 = "1lgvdaghzj1fzh8p6ans0f62zg1bfp086icbsqmyvbgpgcxia9cs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shimbun";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shimbun";
           sha256 = "0k54886bh7zxsfnvga3wg3bsij4bixxrah2rrkq1lj0k8ay7nfxh";
           name = "shimbun";
         };
@@ -50031,15 +50654,15 @@
     shm = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "shm";
-        version = "20160204.414";
+        version = "20160211.1354";
         src = fetchFromGitHub {
           owner = "chrisdone";
           repo = "structured-haskell-mode";
-          rev = "e34d4d9b1b6c4fd18e726da1dd5b73f64bb883e9";
-          sha256 = "1xjkcdxyz3q17jr036gc4zjryc497dbhi4g89y4zkfc68c4m89xy";
+          rev = "84c8464232fa49a36c4fe897afd22ad28ab2e196";
+          sha256 = "0xs19xpadxdl1wgapqj6xrscnb4ch6kj1qm3h93kj95x51427afz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shm";
           sha256 = "1qmp8cc83dcz25xbyqd4987i0d8ywvh16wq2wfs4km3ia8a2vi3c";
           name = "shm";
         };
@@ -50060,7 +50683,7 @@
           sha256 = "19p47a4hwl6h2w5ay09hjhl4kf7cydwqp8s2iyrx2i0k58az8i8i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shoulda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shoulda";
           sha256 = "0lmlhx34nwvn636y2wvw3sprhhh6q3mdg7dzgpjj7ybibvhp1lzk";
           name = "shoulda";
         };
@@ -50070,22 +50693,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    show-css = callPackage ({ doom, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    show-css = callPackage ({ doom, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "show-css";
-        version = "20160121.1004";
+        version = "20160210.808";
         src = fetchFromGitHub {
           owner = "smmcg";
           repo = "showcss-mode";
-          rev = "1c0fe0aa8ece480f63d0a516c9d6a35f0406c570";
-          sha256 = "15v2cr1dmk5iha3brikbhxnsfi84b9jdnrbnaqy9xyxbdw7cs0r5";
+          rev = "771daeddd4df7a7c10f66419a837145649bab63b";
+          sha256 = "11kzjm12hbcdzrshq20r20l29k3555np1sva7afqrhgvd239fdq1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/show-css";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/show-css";
           sha256 = "1b3n8h39m85inxsqvzwgb9fqnqn2sgib91hrisn1gpgfyjydzkr7";
           name = "show-css";
         };
-        packageRequires = [ doom ];
+        packageRequires = [ doom s ];
         meta = {
           homepage = "http://melpa.org/#/show-css";
           license = lib.licenses.free;
@@ -50102,7 +50725,7 @@
           sha256 = "15vkk7lnnfwgzkiwpqz1l1qpnz2d10l82m10m0prbw03k1zx22c7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/show-marks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/show-marks";
           sha256 = "1jgxdclj88ca106vcvf1k8zbf7iwamy80c2ad8b3myz0f4zscjzb";
           name = "show-marks";
         };
@@ -50120,7 +50743,7 @@
           sha256 = "0pq88kz5h0hzgfk8fyf3lppxalmadg5czbik824bpykp9l9gnf1m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/showkey";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/showkey";
           sha256 = "1m280ll07i5c6s4w0s227jygdlpvd87dq45039v0sljyxm4bfrsv";
           name = "showkey";
         };
@@ -50138,7 +50761,7 @@
           sha256 = "01ibg36lvmdk7ac1k0f0r6wyds4rq0wb7gzw26nkiwykn14gxaql";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/showtip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/showtip";
           sha256 = "1fdhdmkvyz1dcy3x0im1iab6yhhh8gqvxmm6ccwr6rl1r1m5zwc8";
           name = "showtip";
         };
@@ -50159,7 +50782,7 @@
           sha256 = "1mizhbwvnsxxjz6m94qziibvhghhp8v8db3wxrq3z9gsaqqkcndn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shpec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shpec-mode";
           sha256 = "155hc1nym3fsvflps8d3ixaqw1cafqp97zcaywdppp47n7vj8zjl";
           name = "shpec-mode";
         };
@@ -50180,7 +50803,7 @@
           sha256 = "07zzyfibs2c7w4gpvdh9003frznbg7zdnrx0nv8bvn0b68d3yz0m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shrink-whitespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shrink-whitespace";
           sha256 = "12if0000i3rrxcm732layrv2h464wbb4xflbbfc844c83dbx1jmq";
           name = "shrink-whitespace";
         };
@@ -50201,7 +50824,7 @@
           sha256 = "00c11s664hwj1l1hw7qshygy3wb6wbd0hn6qqnyq1xr0r87nnhjs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shut-up";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shut-up";
           sha256 = "1bcqrnnafnimfcg1s7vrgq4cb4rxi5sgpd92jj7xywvkalr3kh26";
           name = "shut-up";
         };
@@ -50222,7 +50845,7 @@
           sha256 = "0cjqh6qbbmgxd6zgqnikw6bh8wpjydydkkqs5wcmblpi5awqmnb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sibilant-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sibilant-mode";
           sha256 = "0jd6dsk93nvwi5yia3623hfc4v6zz4s2n8m1wx9bw8x6kv3h3qbq";
           name = "sibilant-mode";
         };
@@ -50243,7 +50866,7 @@
           sha256 = "102ssiz4sp7y816s1iy8i98c314jbn3sy0v87b0qgpgjiq913ffq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sicp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sicp";
           sha256 = "1q7pbhjk8qgwvj27ianrdbmj98pwf3xv10gmpchh7bypmbyir4wz";
           name = "sicp";
         };
@@ -50264,7 +50887,7 @@
           sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sift";
           sha256 = "0mv5zk140kjilwvzccj75ym7wlkkqryb532mbsy7i9bs3q7m916d";
           name = "sift";
         };
@@ -50285,7 +50908,7 @@
           sha256 = "1g4rr7hpy9r3y4vdpv48xpmy8kqvs4j64kvnhnj2rw2wv1grw78j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/signature";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/signature";
           sha256 = "11n3id1iiip99lj8c0iffbrf59s2yvmwlhqbf8xzxkhws7vwdl5q";
           name = "signature";
         };
@@ -50295,6 +50918,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    silkworm-theme = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "silkworm-theme";
+        version = "20160217.709";
+        src = fetchFromGitHub {
+          owner = "mswift42";
+          repo = "silkworm-theme";
+          rev = "53e0614660d653d146a4d36ceab169f6e4bb3554";
+          sha256 = "0vzkgrc54j4a3g90jxc7vxkqwqi3047gnn7gng65pfar0i76lzlb";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/silkworm-theme";
+          sha256 = "1zbrjqmhf80qs3i910sixirrv42rxkqdrg2z03gnz1g885gpcn13";
+          name = "silkworm-theme";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/silkworm-theme";
+          license = lib.licenses.free;
+        };
+      }) {};
     simp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "simp";
@@ -50306,7 +50950,7 @@
           sha256 = "1m8azyb4nxxdh6pwik9qb0zqp4z8z4vk3dlpfgklsq9rss8gwbaf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simp";
           sha256 = "0x4lssjkj3fk9fw603f0sggvcj25iw0zbzsm5c949lhl4a3wvc9c";
           name = "simp";
         };
@@ -50327,7 +50971,7 @@
           sha256 = "09blcc1aj1lbqr1jcjm8dlq13s3plrg1qbp9vr3sp4dxyhjpimjj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simple-call-tree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simple-call-tree";
           sha256 = "1cbv4frsrwd8d3rg8r4sylwnc1hl3hgh595qwbpx0zd3dp5na2yl";
           name = "simple-call-tree";
         };
@@ -50348,7 +50992,7 @@
           sha256 = "0jn46fk0ljqs40kz6ngp0sk6hg1334835r2rmagx4qm0mdaqy7p8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simple-httpd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simple-httpd";
           sha256 = "18dharsdiwfkmhd9ibz9f47yfq9c2d78i886pi6gsjh8iwcpzx59";
           name = "simple-httpd";
         };
@@ -50369,7 +51013,7 @@
           sha256 = "1bnc3ykgf727lc0ajxa8qsx616baljdgav78fkz57irm65dqr18q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simple-mpc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simple-mpc";
           sha256 = "05x2xyys5mf6k7ndh0l6ykyiygaznb4f8bx3npbhvihrsz9ilf8r";
           name = "simple-mpc";
         };
@@ -50388,7 +51032,7 @@
           sha256 = "01fdk790jlpxy95y67yv6944ws4zjh7gs6ymnj1yflf19ccsdsnn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simple+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simple+";
           sha256 = "12fsgjk53fq2316j8nm6wvdckpyg9hq3v65j5c52i0g0cwmx62ra";
           name = "simple-plus";
         };
@@ -50409,7 +51053,7 @@
           sha256 = "15y1kxck6gxqs6pv4qxz8rrc61bsk73pzbz6f30f5l0r0750i1rm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simple-rtm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simple-rtm";
           sha256 = "1aadzaf73clhyny2qiryg6z84k34yx3ghy6pyl0px9qhqc1ak271";
           name = "simple-rtm";
         };
@@ -50430,7 +51074,7 @@
           sha256 = "0zf9wgyp0n00i00zl1lxr0d60569zgcjdnmdvgpcibvny5s1fp2i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simple-screen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simple-screen";
           sha256 = "16zvsmqn882w320h26hjjz5lcyl9y0x4amkf2zfps77xxmkmi5n0";
           name = "simple-screen";
         };
@@ -50451,7 +51095,7 @@
           sha256 = "09286h2q9dqghgfj9a4cniz6djw7867vcy3ixs7cn4wghvhyxm8s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simpleclip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simpleclip";
           sha256 = "07qkfwlg8vw5kb097qbsv082hxir047q2bcvc8scbak2dr6pl12s";
           name = "simpleclip";
         };
@@ -50472,7 +51116,7 @@
           sha256 = "0xq4vy3ggdjiycd3aa62k94kd43zcpm8bfdgi8grwkb1lpvwq9i9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simplenote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simplenote";
           sha256 = "0rnvm3q2spfj15kx2c8ic1p8hxg7rwiqgf3x2zg34j1xxayn3h2j";
           name = "simplenote";
         };
@@ -50493,7 +51137,7 @@
           sha256 = "1a0l0f6by1nmnnq0n52la9g3d357bmwak4qgy6p8g66qb9rx6rzv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simplenote2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simplenote2";
           sha256 = "1qdzbwhzmsga65wmrd0mb3rbs71nlyqqb6f4v7kvfxzyis50cswm";
           name = "simplenote2";
         };
@@ -50514,7 +51158,7 @@
           sha256 = "0108q2b5h73rjxg9k2kmc8z6la9kgqdnz9z1x7rn61v3vbxlzqvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simplezen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simplezen";
           sha256 = "13f2anhfsxmx1vdd209gxkhpywsi3nn6pazhc6bkswmn27yiig7j";
           name = "simplezen";
         };
@@ -50535,7 +51179,7 @@
           sha256 = "1v7xn0a1x4036spmzrfi6syhpbm6bg9a22h6ybzmvzmbp90cs25a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sisyphus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sisyphus";
           sha256 = "08400jazj7w63l8g9ypy6w9dj8r0xh4d2yg3nfwqqf5lhfnj9bnj";
           name = "sisyphus";
         };
@@ -50556,7 +51200,7 @@
           sha256 = "0kbgxjfdf88h7hfds1kbdxx84wvkvy773r98ym1fzfm54m2kddvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/skeletor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/skeletor";
           sha256 = "1vfvg5l12dzksr24dxwc6ngawsqzpxjs97drw48qav9dy1vyl10v";
           name = "skeletor";
         };
@@ -50577,7 +51221,7 @@
           sha256 = "16757xz5ank3jsh8xglyly7pwdn5xm0yngampy1n1vgcwsp5080a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/skewer-less";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/skewer-less";
           sha256 = "0fhv5cnp5bgw3krfmb0jl18kw2hzx2p81falj57lg3p8rn23dryl";
           name = "skewer-less";
         };
@@ -50598,7 +51242,7 @@
           sha256 = "0yj7r5f751lra9jj7lg90qp66sgnb7fcjw5v9hfna7r13qdn9f20";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/skewer-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/skewer-mode";
           sha256 = "1zp4myi9f7pw6zkgc0xg12585iihn7khcsf20pvqyc0vn4ajdwqm";
           name = "skewer-mode";
         };
@@ -50619,7 +51263,7 @@
           sha256 = "1q0qc4jc83k7dfhq2y06zy0fg38kvp219gb3icysdhs88zi2v9s3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/skewer-reload-stylesheets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/skewer-reload-stylesheets";
           sha256 = "1rxn0ha2yhvyc195alg31nk1sjghnbha33xrqwc9z3j71w211frm";
           name = "skewer-reload-stylesheets";
         };
@@ -50640,7 +51284,7 @@
           sha256 = "0gzj7cf42nhp3ac1a2gxcfbmn80z1z46zxsfr2f5xil2gjag39fx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/skype";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/skype";
           sha256 = "06p5s5agajbm9vg9xxpzv817xmjw2kmcahiw4iypn5yzwhv1aykl";
           name = "skype";
         };
@@ -50661,7 +51305,7 @@
           sha256 = "184hc4wvm3y33g6ka8m90ysh1s8cdynsnni5abf2lzmgl4jgpcpl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slack";
           sha256 = "0mybjx08yskk9vi06ayiknl5ddyd8h0mnr8c0a3zr61p1x4s6anp";
           name = "slack";
         };
@@ -50682,7 +51326,7 @@
           sha256 = "108zcb7hdaaq3sxjfr9nrwzqxx71q6aygzik7l3ab854xknkjfad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slamhound";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slamhound";
           sha256 = "14zlcw0zw86awd6g98l4h2whav9amz4m8ik877d1wsdjf69g7k9x";
           name = "slamhound";
         };
@@ -50703,7 +51347,7 @@
           sha256 = "11p1pghx55a4gcn45cadw7c594134b21cdim723k2h99z14f89az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slideview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slideview";
           sha256 = "0zr08yrnrz49zds1651ysmgjqgbnhfdcqbg90sbsb086iw89rxl1";
           name = "slideview";
         };
@@ -50724,7 +51368,7 @@
           sha256 = "0vgyc2ny9qmn8f5r149y4g398mh4gnwsp4yim85z4vmdikqg8vi1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slim-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slim-mode";
           sha256 = "1hip0r22irr9sah3b65ky71ic508bhqvj9hj95a81qvy1zi9rcac";
           name = "slim-mode";
         };
@@ -50737,15 +51381,15 @@
     slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
     melpaBuild {
         pname = "slime";
-        version = "20160202.1146";
+        version = "20160219.1320";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "837ffe761f24ab612c0523ff3bb5b17efa2d3b1e";
-          sha256 = "0hik0idwn24mrfgp9ki3wp80w79bdklg5xz2gn08g4bqiavxbrld";
+          rev = "899b5ca7e1ce8173cb8ce4b7609dd88d05a050c9";
+          sha256 = "07gfd8k0gbzylr9y8asp35p9139w79c36pbnixp4y2fimgbfri2c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slime";
           sha256 = "04zcvjg0bbx5mdbsk9yn7rlprakl89dq6jmnq5v2g0n6q0mh6ign";
           name = "slime";
         };
@@ -50766,7 +51410,7 @@
           sha256 = "1wq1gs9jjd5m6iwrv06c2d7i5dvqsfjcljgbspfbc93cg5xahk4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime-annot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slime-annot";
           sha256 = "14x9lzpkgkc96jsbfpahl027qh6y5azwdk0cmk9pbd1xm95kxj6n";
           name = "slime-annot";
         };
@@ -50783,11 +51427,11 @@
         src = fetchFromGitHub {
           owner = "anwyn";
           repo = "slime-company";
-          rev = "cf03a862c3aa2393eb151af9e5bc032aa6b6f154";
-          sha256 = "1yi89hmnawf1pf9nv3f6i8a168wvri3zc40wgbbgnda8hxrcqkjx";
+          rev = "a50e8f02df03f37bee3cbaafae1a6891f02c847b";
+          sha256 = "0cc8xb2p1j2vs00h4sq6x0mwwrxkidqj4l7kg3n3150bj37v55rs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slime-company";
           sha256 = "195s5fi2dl3h2jyy4d45q22jac35sciz81n13b4lgw94mkxx4rq2";
           name = "slime-company";
         };
@@ -50797,6 +51441,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    slime-docker = callPackage ({ cl-lib ? null, docker-tramp, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
+    melpaBuild {
+        pname = "slime-docker";
+        version = "20160221.1715";
+        src = fetchFromGitHub {
+          owner = "daewok";
+          repo = "slime-docker";
+          rev = "61bed969887c8556299ee643d1bab567ef36d926";
+          sha256 = "0jrsilyvzdi3xdmkm6gsniw4zdg9zsxb4i6k3fm5byxvhpbwd3k4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slime-docker";
+          sha256 = "18v62y4f613d7mpqpb8sc8hzvyhcgzrbqrc0k7w9pqf00jnl192h";
+          name = "slime-docker";
+        };
+        packageRequires = [ cl-lib docker-tramp emacs slime ];
+        meta = {
+          homepage = "http://melpa.org/#/slime-docker";
+          license = lib.licenses.free;
+        };
+      }) {};
     slime-ritz = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "slime-ritz";
@@ -50808,7 +51473,7 @@
           sha256 = "0rsh0bbhyx74yz1gjfqyi0bkqq5n3scpyh5mmc3d6dkpv8wa7bwz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime-ritz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slime-ritz";
           sha256 = "1y1439y07l1a0sp9wn110hw4yyxj8n1cnd6h17rmsr549m2qbg1a";
           name = "slime-ritz";
         };
@@ -50829,7 +51494,7 @@
           sha256 = "13rm9pmshgssmydhpirri38s38z3kvkhqama40qdzqq96dsxlnjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slime-theme";
           sha256 = "1b709cplxip48a6qjdnzcn5qcgsy0jq1m05d7vc8p5ywgr1f9a00";
           name = "slime-theme";
         };
@@ -50850,7 +51515,7 @@
           sha256 = "00v4mh04affd8kkw4rn51djpyga2rb8f63mgy86napglqnkz40r3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime-volleyball";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slime-volleyball";
           sha256 = "1dzvj8z3l5l9ixjl3nc3c7zzi23zc2300r7jzw2l3bvg64cfbdg7";
           name = "slime-volleyball";
         };
@@ -50871,7 +51536,7 @@
           sha256 = "0srj0zcvzr0sjcs37zz11xz8w0yv94m69av9ny7mx8ssf4qp0pxa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slirm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slirm";
           sha256 = "061xjj3vjdkkvd979fhp7bc12g5zkxqxywvcz3z9dlkgdks41ld7";
           name = "slirm";
         };
@@ -50892,7 +51557,7 @@
           sha256 = "1y1gay1h91c0690gly4qibx1my0l1zpb6s3x58lks8m21jdwfw28";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slovak-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slovak-holidays";
           sha256 = "1dcw8pa3r9b7n7dc8fgzijz7ywwxb3nlfg7n0by8dnvpjq2c30bg";
           name = "slovak-holidays";
         };
@@ -50905,15 +51570,15 @@
     sly = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "sly";
-        version = "20160122.424";
+        version = "20160218.402";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "sly";
-          rev = "adadc9ca765bf8804a8de93c444a1e83cd1b9212";
-          sha256 = "16h4xkaa1cdnal7ydsv0rdj1ldyb1ax0776x9a3abj5n9zf3pwxm";
+          rev = "ead2144dd581cbabf11b326f5f482a277225110f";
+          sha256 = "0brb6h19j28jypvrdwsi45qkgjrx5ssbvcyj0samwncrlbjfp9rk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sly";
           sha256 = "1pmyqjk8fdlzwvrlx8h6fq0savksfny78fhmr8r7b07pi20y6n9l";
           name = "sly";
         };
@@ -50926,15 +51591,15 @@
     sly-company = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
     melpaBuild {
         pname = "sly-company";
-        version = "20151126.222";
+        version = "20160219.338";
         src = fetchFromGitHub {
           owner = "capitaomorte";
           repo = "sly-company";
-          rev = "21248bd852c9520ec27692f286c5f43b50892b12";
-          sha256 = "0qpw345ch5b9dbznk916f6h9f9dnf03wfyvpgnzdf30ffvf4q01w";
+          rev = "0ad0b12874dae2289c990db20b3d31146d6e80eb";
+          sha256 = "1dga7y06p0j5iq478g857i6xa06j9zpgbjx3a1sqyhk16m1v7ssi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sly-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sly-company";
           sha256 = "1n8bx0qis2bs49c589cbh59xcv06r8sx6y4lxprc9pfpycx7h6v2";
           name = "sly-company";
         };
@@ -50955,7 +51620,7 @@
           sha256 = "1fxsv83fcv5l7cndsysd8salvfwsabvd84sm7zli2ksf678774gp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sly-hello-world";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sly-hello-world";
           sha256 = "03ybjgczp6ssk4hmwd486vshlk7ql27k1lyhmvk26gmrf554z90n";
           name = "sly-hello-world";
         };
@@ -50976,7 +51641,7 @@
           sha256 = "00lw6hkxs71abjyi7nhzi8j6n55jyhzsp81ycn6f2liyp4rmqgi7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sly-macrostep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sly-macrostep";
           sha256 = "1i004mb0bg13j3zhdsjz1795dh0ry8winzvdghr1wardc9np60h7";
           name = "sly-macrostep";
         };
@@ -50997,7 +51662,7 @@
           sha256 = "1xi625pn3mg77mjvr94v6a5pjyvgjavpkdbbh1lqjx1halaa2qb7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sly-named-readtables";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sly-named-readtables";
           sha256 = "11ymzbj1ji7avfjqafj9p5zx0m4y1jfjcmyanpjq1frdcz639ir9";
           name = "sly-named-readtables";
         };
@@ -51007,6 +51672,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    sly-repl-ansi-color = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, sly }:
+    melpaBuild {
+        pname = "sly-repl-ansi-color";
+        version = "20160214.218";
+        src = fetchFromGitHub {
+          owner = "PuercoPop";
+          repo = "sly-repl-ansi-color";
+          rev = "505d162d52219654b57a455e26c9e02c7254a8f2";
+          sha256 = "194bdibpxpqsag86h583b62ybmfqmq4442a0czbijqwngbgjpj3l";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sly-repl-ansi-color";
+          sha256 = "0wz24kfjl6rp4qss0iq2ilav0mkg2spy2ziikypy7v0iqbssmssi";
+          name = "sly-repl-ansi-color";
+        };
+        packageRequires = [ cl-lib sly ];
+        meta = {
+          homepage = "http://melpa.org/#/sly-repl-ansi-color";
+          license = lib.licenses.free;
+        };
+      }) {};
     smart-compile = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "smart-compile";
         version = "20150519.1147";
@@ -51015,7 +51701,7 @@
           sha256 = "0sm4nxynwhwypzw008fz56axai9lrphjczwzfdy7da3akan18rbd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-compile";
           sha256 = "0vgxqyzl7jw2j96rmjw75b5lmjwrvzajrdvfyabss4xmv96dy2r3";
           name = "smart-compile";
         };
@@ -51036,7 +51722,7 @@
           sha256 = "1xbd42q60pmg0hw4bn2fndjwgrfgj6ggm757fyp8m08jqh0zkarn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-cursor-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-cursor-color";
           sha256 = "11875pwlx2rm8d86541na9g3yiq0j472vg63mryqv6pzq3n8q6jx";
           name = "smart-cursor-color";
         };
@@ -51057,7 +51743,7 @@
           sha256 = "19l47xqzjhhm9j3izik0imssip5ygg3lnflb9ixsz1js571aaxha";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-forward";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-forward";
           sha256 = "032yc45c19fl886jmi5q04r6q47xz5rphb040wjvpd4fnb06hr8c";
           name = "smart-forward";
         };
@@ -51078,7 +51764,7 @@
           sha256 = "0q5hxg265ad9gpclv2kzikg6jvbf3zzb1mrykxn0n7mnvdfdlhsi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-indent-rigidly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-indent-rigidly";
           sha256 = "12qggg1m28mlvkdn52dig8bwv58pvipkvn1mlc4r7w569arar44x";
           name = "smart-indent-rigidly";
         };
@@ -51099,7 +51785,7 @@
           sha256 = "0sqvm7iwdjk057fwid4kz6wj71igiqhdarj59s17pzy6xz34afhg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-mark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-mark";
           sha256 = "1vv65sa0pwl407mbxcp653kycgx8jz87n6wshias1dp9lv21pj6v";
           name = "smart-mark";
         };
@@ -51120,7 +51806,7 @@
           sha256 = "0jr0yvaih5d2a5fkwszhf25cyk3q0fqfbgybb3nbrbkcf0mja22q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-mode-line";
           sha256 = "0qmhzlkc6mfqyaw4jaw6195b8sw0wg9pfjcijb4p0mlywf5mh5q6";
           name = "smart-mode-line";
         };
@@ -51141,7 +51827,7 @@
           sha256 = "0jr0yvaih5d2a5fkwszhf25cyk3q0fqfbgybb3nbrbkcf0mja22q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-mode-line-powerline-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-mode-line-powerline-theme";
           sha256 = "0hv3mx39m3l35xhz351zp98321ilr6qq9wzwn1f0ziiv814khcn4";
           name = "smart-mode-line-powerline-theme";
         };
@@ -51162,7 +51848,7 @@
           sha256 = "1q74b0mbhly84g252a0arbyxc720rgs9a3yqf8b8s2fpfkzb95sg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-newline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-newline";
           sha256 = "1kyk865vkgh05vzlggs3ii81v86fcbcxybfkv5rkyl3fyqpkza1w";
           name = "smart-newline";
         };
@@ -51183,7 +51869,7 @@
           sha256 = "0h559cdyln5f4ignx1r86ryi7wizys0gj03dj7lfzaxr7wkd0jaf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-region";
           sha256 = "1bcvxf62bfi5lmhprma9rh670kka9p9ygbkgmv6dg6ajjfsplgwc";
           name = "smart-region";
         };
@@ -51204,7 +51890,7 @@
           sha256 = "0azhfffm1bkgjx4i3p9f6x2gmw8kc3fafzqj4vxxdibhn0nizqk8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-shift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-shift";
           sha256 = "0azahlflnh6sk081k5dcqal6nmwkjnj4dq8pv8ckwf8684zp23d3";
           name = "smart-shift";
         };
@@ -51225,7 +51911,7 @@
           sha256 = "0aighpby8khrljb67m533bwkzlsckyvv7d09cnzr1rfwxiil0ml4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-tab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-tab";
           sha256 = "0qi8jph2c9fdsv2mqgxd7wb3q4dax3g5x2hc53kbgkjxylagjvp5";
           name = "smart-tab";
         };
@@ -51246,7 +51932,7 @@
           sha256 = "1s65hr7b8aggvdd1i6gkkpz6j1kqilggfnf46xvjnvdw9awmwk6b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-tabs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-tabs-mode";
           sha256 = "1fmbi0ypzhsizzb1vm92hfaq23swiyiqvg0pmibavzqyc9lczhhl";
           name = "smart-tabs-mode";
         };
@@ -51267,7 +51953,7 @@
           sha256 = "15834lnh7dq9kz31k06ifpnc0vz86rycz0ryildi5qd2nb7s3lw9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-window";
           sha256 = "1x1ncldl9njil9hhvzj5ac1l5aiyfm0f7j0d7lw8ady7xx2cy26m";
           name = "smart-window";
         };
@@ -51280,15 +51966,15 @@
     smartparens = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smartparens";
-        version = "20160108.1603";
+        version = "20160221.739";
         src = fetchFromGitHub {
           owner = "Fuco1";
           repo = "smartparens";
-          rev = "444c89a555b0ca25ff8d06e74665fbbc3a45a8b7";
-          sha256 = "1h9z7b10ihva6sg0p40xs4kv4dh5apd72zzqayns8jd9zasw4grm";
+          rev = "dc7f7e17eff62c716638ea6a96ffaa60868a3ee9";
+          sha256 = "034rmng04q1ralj16pxygscn13fswz5vm77lgj29hqrgizb72jnl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smartparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smartparens";
           sha256 = "025nfrfw0992024i219jzm4phwf29smc5hib45s6h1s67942mqh6";
           name = "smartparens";
         };
@@ -51309,7 +51995,7 @@
           sha256 = "1sjwqi8w83qxihqmcm7z0vwmrz1az0y266qgj2nwfv39bri6y4i6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smartrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smartrep";
           sha256 = "1ypls52d51lcqhz737rqg73c6jwl6q8b3bwb29z51swyamf37rbn";
           name = "smartrep";
         };
@@ -51330,7 +52016,7 @@
           sha256 = "193cxfnh263yw628ipf9gssvyq3j7mffrdmnjhvzzcsnhd1k145p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smartscan";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smartscan";
           sha256 = "0vghgmx8vnjbvsw7q5zs0qz2wm6dcng9m69b8dq81g2cq9dflbwb";
           name = "smartscan";
         };
@@ -51351,7 +52037,7 @@
           sha256 = "1qfa6i59zhi8d6175py8id8gq7b3hdaqq4naa86r1rb7x8ringff";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smartwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smartwin";
           sha256 = "0rg92j0aa8qxhr91hjj2f4w8vj5w9b4d2nmkggng44nxk8zafdif";
           name = "smartwin";
         };
@@ -51372,7 +52058,7 @@
           sha256 = "1vl3nx0y2skb8sibqxvmc3wrmmd6z88hknbry348d0ik3cbr0ijx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smarty-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smarty-mode";
           sha256 = "06cyr2330asy2dlx81g3h9gq0yhd4pbnmzfvmla7amh4pfnjg14v";
           name = "smarty-mode";
         };
@@ -51393,7 +52079,7 @@
           sha256 = "1smv91ggvaw37597ilvhra8cnj4p71n6v5pfazii8k85kvs6x460";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smeargle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smeargle";
           sha256 = "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd";
           name = "smeargle";
         };
@@ -51414,7 +52100,7 @@
           sha256 = "0xrbkpc3w7yadpjih169cpp75gilsnx4y9akgci5vfcggv4ffm26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smex";
           sha256 = "1rwyi7gdzswafkwpfqd6zkxka1mrf4xz17kld95d2ram6cxl6zda";
           name = "smex";
         };
@@ -51434,7 +52120,7 @@
           sha256 = "1p10q1b5bvc8fvgfxynrq2kf1ygr6gad92x40zhaa5r1ksf6ryk4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sml-modeline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sml-modeline";
           sha256 = "086hslzznv6fmlhkf28mcl8nh4xk802mv6w0a4zwd5px2wyyaysd";
           name = "sml-modeline";
         };
@@ -51455,7 +52141,7 @@
           sha256 = "1kkg7qhb2lmwr4siiazqny9w2z9nk799lzl5i159lfivlxcgixmk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smooth-scroll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smooth-scroll";
           sha256 = "1b0mjpd4dqgk7ij37145ry2jqbn1msf8rrvymn7zyckbccg83zsf";
           name = "smooth-scroll";
         };
@@ -51476,7 +52162,7 @@
           sha256 = "05kf3hb3nb32jzw50a2z9vlf3f0pj40klzxvqj4fxlci777imsvk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smooth-scrolling";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smooth-scrolling";
           sha256 = "0zy2xsmr05l2narslfgril36d7qfb55f52qm2ki6fy1r18lfiyc6";
           name = "smooth-scrolling";
         };
@@ -51497,7 +52183,7 @@
           sha256 = "1a097f1x9l0m4dizvnb742svlqsm6hlif73rk7qjar081sk1gjxx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smotitah";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smotitah";
           sha256 = "1m5qjl3r96riljp48il8k4rb6rwys1xf1pl93d4qjhprwvz57mv2";
           name = "smotitah";
         };
@@ -51510,15 +52196,15 @@
     smtpmail-multi = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smtpmail-multi";
-        version = "20130921.2242";
+        version = "20160218.1749";
         src = fetchFromGitHub {
           owner = "vapniks";
           repo = "smtpmail-multi";
-          rev = "21885f6f7ec46facb64fafc2caa2be01caa4b6db";
-          sha256 = "0rhpnijp72jsl4gzhwz0z387f55vv3fp0zwki0fi5jlkzjamnnqg";
+          rev = "81eabfe56f620ee044ff9dd52fa8b6148d0a9f30";
+          sha256 = "0zknryfpg4791l7d7xv9hn2fx00rmbqw3737lfm75484hr10lymz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smtpmail-multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smtpmail-multi";
           sha256 = "0nc3k8ly4nx7fm3b2apga3p4svz5c9sldnlk86pz2lzra5h3b4ss";
           name = "smtpmail-multi";
         };
@@ -51539,7 +52225,7 @@
           sha256 = "1z2sdnf11wh5hz1rkrbg7fs4ha3zrbj9qnvfzq9005y89d7cs95x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smyx-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smyx-theme";
           sha256 = "1r85yxr864df5akqknl3hsrmzikr4085bqr6ijrbdj27nz00vl61";
           name = "smyx-theme";
         };
@@ -51552,15 +52238,15 @@
     snakemake-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "snakemake-mode";
-        version = "20160117.1551";
+        version = "20160209.2027";
         src = fetchFromGitHub {
           owner = "kyleam";
           repo = "snakemake-mode";
-          rev = "fac9683e73ec1a068ac2bd03269494f137ef9606";
-          sha256 = "01kixhbl2q7qd173zv6prgr81gnmhf95bjyraysw45wza72amkqk";
+          rev = "0ad1db40d996e9ab15b01cbbaf971d508556a4bc";
+          sha256 = "1q3v4izah7j5n0ln44f1g1idl1rwd2jar975d5rza4pcy9c875x8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/snakemake-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/snakemake-mode";
           sha256 = "1xxd3dms5vgvpn18a70wjprka5xvri2pj9cw8qz09s640f5jf3r4";
           name = "snakemake-mode";
         };
@@ -51581,7 +52267,7 @@
           sha256 = "17nbm8692ihrlcikihspdqg8wvp80ryq4h06da34d0awqm0w027m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/snapshot-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/snapshot-timemachine";
           sha256 = "0pvh1ilzv0ambc5cridyhjcxs58wq92bxjkisqv42yar3h3z6f8p";
           name = "snapshot-timemachine";
         };
@@ -51602,7 +52288,7 @@
           sha256 = "1nyrfbjrg74wrqlh8229rf7ym07k2a0wscjm0kbg3sam9ryc546y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/snippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/snippet";
           sha256 = "1lgpw69k5a82y70j7nximdj0bl5nzr4jhjr5fkx1cvz8hhvgdz6j";
           name = "snippet";
         };
@@ -51623,7 +52309,7 @@
           sha256 = "07056pnjgsgw06c67776qp7jci96iqbzlprbavzz2l1j8ywz8cwm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/soft-charcoal-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/soft-charcoal-theme";
           sha256 = "0i29ais1m2h9v4ghcg41zfbnaj8klgm4509nkyfkxm7wqnjd166a";
           name = "soft-charcoal-theme";
         };
@@ -51644,7 +52330,7 @@
           sha256 = "06q82v1hndvznsqg0r6jrxvgxhycg9m65kay4db4yy0gmc66v2xf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/soft-morning-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/soft-morning-theme";
           sha256 = "0lzg478ax6idzh6m5sf2ds4gbv096y0c0gn15dai19f58bs63xzr";
           name = "soft-morning-theme";
         };
@@ -51665,7 +52351,7 @@
           sha256 = "030mf8b0sf9mmzwhg85zh0ccvcg768kckwvbm0yzg7vmq1x46hjl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/soft-stone-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/soft-stone-theme";
           sha256 = "05jjw9z6hqln9yj8ya2xrmjnylp7psfdj9206n30m3lwnlwx399v";
           name = "soft-stone-theme";
         };
@@ -51686,7 +52372,7 @@
           sha256 = "1vkrl8xvr5la8rj5gmafamzlqr0q2l1immyfnmfzf3r4n14kdywk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/solarized-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/solarized-theme";
           sha256 = "15d8k32sj8i11806byvf7r57rivz391ljr0zb4dx8n8vjjkyja12";
           name = "solarized-theme";
         };
@@ -51707,7 +52393,7 @@
           sha256 = "0drb237750lry18arbfx37drf16znwz8fhx5fawxy1q4z7bl7z5n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/solidity-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/solidity-mode";
           sha256 = "1qdzdivrf5yaa80p61b9r1gryw112v5l2m2jkvkc7glhkhrcvwsx";
           name = "solidity-mode";
         };
@@ -51728,7 +52414,7 @@
           sha256 = "1ga35d3rhdf6ffd36q58ay6380gjvkmaiid4vscga3v7ca0dkhl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sonic-pi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sonic-pi";
           sha256 = "07qxm1rkw2cbxf4g2vqk3s7xnqldqkdm2zw1qh2kqjscg5gwpkqp";
           name = "sonic-pi";
         };
@@ -51749,7 +52435,7 @@
           sha256 = "10gh1hvxq9gm29r6qzlnva7vjidd7n4kih4z2ihyvbvy9za20xqw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/soothe-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/soothe-theme";
           sha256 = "000hikpsmqpbb6v13az2dv319d0f7jjpkkpgi4vzv59z6cdlrlp3";
           name = "soothe-theme";
         };
@@ -51770,7 +52456,7 @@
           sha256 = "16x039imyf4p5d4rn92nlqcsvb5vlvdgq1m5g856b9dzwa89x733";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sos";
           sha256 = "1gkd0plx7152s3dj8a9lwlwh8bgs1m006s80l10agclx6aay8rvb";
           name = "sos";
         };
@@ -51791,7 +52477,7 @@
           sha256 = "0wl21pgjf9p6cf4d51cd2z974m6ph1cjspi3vdbf91pd13b72sdq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sotclojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sotclojure";
           sha256 = "12byqjzg0pffqyq958265qq8yxxmf3iyy4m7zib492qcj8ccy090";
           name = "sotclojure";
         };
@@ -51812,7 +52498,7 @@
           sha256 = "027jmqx4240hym2is9q1iyjdws9ijyyck8dnsbm9xc5lhpsdrl69";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sotlisp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sotlisp";
           sha256 = "0zjnn6hhwy6cjvc5rhvhxcq5pmrhcyil14a48fcgwvg4lv7fbljk";
           name = "sotlisp";
         };
@@ -51833,7 +52519,7 @@
           sha256 = "1h6h65gwxb07pscyhhhdn11h3lx3jgyfw8v1kw5m2qfrv5kh6ylq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sound-wav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sound-wav";
           sha256 = "1vrwzk6zqma7r0w5ivbx16shys6hsifj52fwlf5rxs6jg1gqdb4f";
           name = "sound-wav";
         };
@@ -51854,7 +52540,7 @@
           sha256 = "1m8wcm6y80gq5rrm4brd3f20kmk54s6ph26j4lz4cmilxk6gj56v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/soundcloud";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/soundcloud";
           sha256 = "1jl9sk372j4162av9kfcbqp0cc5wpm86nkqg8rskfgmsi4ncp4ph";
           name = "soundcloud";
         };
@@ -51871,22 +52557,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    soundklaus = callPackage ({ cl-lib ? null, dash, deferred, emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
+    soundklaus = callPackage ({ cl-lib ? null, dash, emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild, pkg-info, s }:
     melpaBuild {
         pname = "soundklaus";
-        version = "20150102.1521";
+        version = "20160210.1517";
         src = fetchFromGitHub {
           owner = "r0man";
           repo = "soundklaus.el";
-          rev = "830f2b5f4dd4bd110db23a71494b92bb8fe5b058";
-          sha256 = "1ipg4vvh6vgf0az8p31br1xkb8ndjmd6fybcx11r3c479sg0y6k7";
+          rev = "4e69c5521f3196bd2dac81f683eb91885f614317";
+          sha256 = "1dj48i0s521x81sdm7sg76q2pz04jsdxi63l8j9qbhn0l08q66fz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/soundklaus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/soundklaus";
           sha256 = "0b63sbgwp99ff94dxrqqp2p99j268fjkkzx0g42g726hv80d4fxb";
           name = "soundklaus";
         };
-        packageRequires = [ cl-lib dash deferred emacs emms pkg-info s ];
+        packageRequires = [ cl-lib dash emacs emms pkg-info s ];
         meta = {
           homepage = "http://melpa.org/#/soundklaus";
           license = lib.licenses.free;
@@ -51903,7 +52589,7 @@
           sha256 = "18iv7jhy08smpdksplngj1mxcm2mm9gvbylimgr3211l8jr9gq8r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sourcegraph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sourcegraph";
           sha256 = "0rl6s1d0y2pggbfiq4f4xg9qp7nhkd708himzilfqyfa4jwna8yz";
           name = "sourcegraph";
         };
@@ -51924,7 +52610,7 @@
           sha256 = "1xzwalchl9lnq9848dlvhhbzyh1wkwbciz20d1iw0fsigj5g156c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sourcekit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sourcekit";
           sha256 = "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks";
           name = "sourcekit";
         };
@@ -51945,7 +52631,7 @@
           sha256 = "085xd5fqxgv9bam9k4aa3w0sa9q41cg275i60c8njy3bkbqcalh5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sourcemap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sourcemap";
           sha256 = "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5";
           name = "sourcemap";
         };
@@ -51966,7 +52652,7 @@
           sha256 = "0j4qm1y7rhb95k1zbl3c60a46l9rchzslzq36mayyw61s6yysjnv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sourcetalk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sourcetalk";
           sha256 = "0qaf2q784xgl1s3m88jpwdzghpi4f3nybga3lnr1w7sb7b3yvj3z";
           name = "sourcetalk";
         };
@@ -51987,7 +52673,7 @@
           sha256 = "1a8jp7m9zarvljg5d9c8ydir3qcmwx05c3frs696p9nwvapf6lsb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spacegray-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/spacegray-theme";
           sha256 = "0khiddpsywpv9qvynpfdmybd80lbrhm68j3py6ranxlv7p79j9dx";
           name = "spacegray-theme";
         };
@@ -52008,7 +52694,7 @@
           sha256 = "1ncwv6sqm1ch396qi1c8276dc910rnm0f3m8xjkskplv3cjaq0ai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spaceline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/spaceline";
           sha256 = "0jpcj0i8ckdylrisx9b4l9kam6kkjzhhv1s7mwwi4b744rx942iw";
           name = "spaceline";
         };
@@ -52021,15 +52707,15 @@
     spacemacs-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "spacemacs-theme";
-        version = "20160121.1443";
+        version = "20160219.1206";
         src = fetchFromGitHub {
           owner = "nashamri";
           repo = "spacemacs-theme";
-          rev = "6b49a05e7aed1318f7680984a5d21827026013fa";
-          sha256 = "01ylny2kfdlc73qmyy3xp5pwir459jryg0ci9k1qbzb7vb38v8vj";
+          rev = "3402e5cbeebcabc70ea1ce084f479752140121a3";
+          sha256 = "0dp8zrljwfdkfp3vwx0y902di02893n56bz1l32iah72kapws4xa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spacemacs-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/spacemacs-theme";
           sha256 = "0riiim6qb6x9g5hz0k3qgdymgikynlb9l07mrbfmybkv4919p992";
           name = "spacemacs-theme";
         };
@@ -52050,7 +52736,7 @@
           sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/spaces";
           sha256 = "152x7fzjnjjdk9d9h0hbixdp3haqn5vdx3bq1nfqfrkvzychyr06";
           name = "spaces";
         };
@@ -52071,7 +52757,7 @@
           sha256 = "1fqd3ycywxxmln2kzqwflc69xmqlvi9gwvmf7frn0rfv73w09cvp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sparkline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sparkline";
           sha256 = "081jzaxjb32nydvr1kmyafxqxi610n0yf8lwz9vldm84famf3g7y";
           name = "sparkline";
         };
@@ -52092,7 +52778,7 @@
           sha256 = "1gk2ps7fn9z8n6r923qzn518gz9mrj7mb6j726cz8qb585ndjbij";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sparql-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sparql-mode";
           sha256 = "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d";
           name = "sparql-mode";
         };
@@ -52110,7 +52796,7 @@
           sha256 = "1i2z57aasljia6xd2xn1mryklc2gc9c2q1fad8wn7982sl277d10";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/speck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/speck";
           sha256 = "19h3syk4kjmcy7jy9nlsbq6gyxwl4xsi84dy66a3cpvmknm25kyg";
           name = "speck";
         };
@@ -52131,7 +52817,7 @@
           sha256 = "05qx3wqsqs9lxv5lgpaw1wsd6qb5hh599ggi3c17ig5663q7pjsd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/speech-tagger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/speech-tagger";
           sha256 = "0sqil949ny9qjxq7kpb4zmjd7770r0qvq4sz80agw6a27mqnaajc";
           name = "speech-tagger";
         };
@@ -52151,7 +52837,7 @@
           sha256 = "2c1bff3e5a182b8150c6ba6c3be7e70ab2b733cac0a758521c0b941dff215c32";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/speechd-el";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/speechd-el";
           sha256 = "07g6jwymmwkx26p3as3r370viz1cqq360cagw9ji6i0hvgrr66a0";
           name = "speechd-el";
         };
@@ -52172,7 +52858,7 @@
           sha256 = "102hjyr9ii2rmq8762irbwansbi023s7dg4a8n6lkadcvzfibmag";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/speed-type";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/speed-type";
           sha256 = "14q423an7v5hhfx1x039fizxcn5hcscqf2jfn9rqifg4jpq8bq5g";
           name = "speed-type";
         };
@@ -52193,7 +52879,7 @@
           sha256 = "1wif9wf8hwxk0q09cdnrmyas7zjg8l5b8jd6sjxd40ypn6dmz2ch";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sphinx-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sphinx-doc";
           sha256 = "00h3wx2p5hzbw6sggggdrzv4jrn1wc051iqql5y2m1hsh772ic5z";
           name = "sphinx-doc";
         };
@@ -52214,7 +52900,7 @@
           sha256 = "1mfp4777ppg7zg7zqj755zpfk9lmcq73hxv055ig66pz30m7x5rw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sphinx-frontend";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sphinx-frontend";
           sha256 = "0hdn6zjnhzyka0lzdxqfzbj3lrj767ij406zha9zw8ibbkk7cmag";
           name = "sphinx-frontend";
         };
@@ -52235,7 +52921,7 @@
           sha256 = "1qdy9nc2h7mwxh7zg2p1x7yg96hxkwxqimjp6zb1119jx0s8grjc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/splitjoin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/splitjoin";
           sha256 = "0l1x98fvvia8qx8g125h4d76slv0xnb3h1zxiq9xb5qh7a1h069l";
           name = "splitjoin";
         };
@@ -52256,7 +52942,7 @@
           sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/splitter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/splitter";
           sha256 = "02vdhvipzwnh6mlj25lirzxkc0shfzqfs1p4gn3smkxqx6g7mdb2";
           name = "splitter";
         };
@@ -52277,7 +52963,7 @@
           sha256 = "1f0dl2zzxnqsyic87jl9wbg6lf42d8g61sj4d9fb3yhxy6jf07jv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/spotify";
           sha256 = "0pmsvxi1dsi580wkhhx8iw329agkh5yzk61bqvxzign3cd6fbq6k";
           name = "spotify";
         };
@@ -52298,7 +52984,7 @@
           sha256 = "05knlca2dvpyqp9lw8dc47fl5kh2jb04q57cygkzfjjkzvywdwq8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spotlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/spotlight";
           sha256 = "0mmr1spr21pi8sfy95dsgqcxn8qfsphdkfjm5w5q97lh7496z65p";
           name = "spotlight";
         };
@@ -52319,7 +53005,7 @@
           sha256 = "0fvywcwn0zd06yy4b6cxpasiwfbps17jz9dy3jr0y0mdx5lzfxa9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spray";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/spray";
           sha256 = "11b3wn53309ws60w8sfpfxij7vnibj6kxxsx6w1agglqx9zqngz4";
           name = "spray";
         };
@@ -52340,7 +53026,7 @@
           sha256 = "14py5amh66jzhqyqjz5pxq0g19vzlmqnrr5wij1ix64xwfr3xdy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/springboard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/springboard";
           sha256 = "17rmsidsbb4p08vr07mfn25m17wnpadcwr4nxvp79glp5a0wyyib";
           name = "springboard";
         };
@@ -52361,7 +53047,7 @@
           sha256 = "06rk07h92s5sljprs41y3q31q64cprx9kgs56c2j6v4c8cmsq5h6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sprintly-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sprintly-mode";
           sha256 = "15i3rrv27ccpn12wwj9raaxpj7nlnrrj3lsp8vdfwph6ydvnfza4";
           name = "sprintly-mode";
         };
@@ -52382,7 +53068,7 @@
           sha256 = "11igl9n2zwwar1xg651g5v0r0w6xl0grm8xns9wg80351ijrci7x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sproto-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sproto-mode";
           sha256 = "19l6si3sx2i542r5lyr9axby9hblx76m77f17vnsjf32n3r0qgma";
           name = "sproto-mode";
         };
@@ -52403,7 +53089,7 @@
           sha256 = "17nbcaqx58fq4rz501xcqqcjhmibdlkaavmmzwcfwra7jv8hqljy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sql-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sql-indent";
           sha256 = "13s38zdd9j127p6jxbcj4d4va8mkri5dx5zh39g465mnlzx7fp8g";
           name = "sql-indent";
         };
@@ -52424,7 +53110,7 @@
           sha256 = "0zlrx8sk7gwwr6a23mc22d7iinwf8p9ff16r9krqp86fyzbhnq1d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sqlite";
           sha256 = "1j23rqgq00as90nk6csi489ida6b83h1myl3icxivj2iw1iikgj1";
           name = "sqlite";
         };
@@ -52442,7 +53128,7 @@
           sha256 = "0xixdddcrzx6k0s8w9rp6q7b9qjpdb4l888gmcis42yvawb1i53d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sqlplus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sqlplus";
           sha256 = "1z9pf36b1581flykis9cjv7pynnp94fm4ijzjy6hvqyj81aikxpz";
           name = "sqlplus";
         };
@@ -52463,7 +53149,7 @@
           sha256 = "0p2g4ss3bf2asxcibrd8l70ll04nm47znr99l5xyzzwhyfzi61w4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sqlup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sqlup-mode";
           sha256 = "06a0v2qagpd9p2bh19bfw14a6if8kjjc4yyhm5nwp8a8d2vnl5l7";
           name = "sqlup-mode";
         };
@@ -52481,7 +53167,7 @@
           sha256 = "1ffnm2kfh8cg5rdhrkqmh4krggbxvqg3s6lc1nssv88av1c5cs3i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sr-speedbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sr-speedbar";
           sha256 = "1zq3ysz1vpc98sz2kpq307v1fp1l4ivwgrfh2kdqkkdjm4fkya23";
           name = "sr-speedbar";
         };
@@ -52502,7 +53188,7 @@
           sha256 = "1n5p51iy79z60fnhxklc03pp0jbs5rgyb02z3wndbyzy73bhfh7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/srefactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/srefactor";
           sha256 = "01cd40jm4h00c5q2ix7cskp7klbkcd3n5763y5lqfv59bjxwdqd2";
           name = "srefactor";
         };
@@ -52523,7 +53209,7 @@
           sha256 = "1rdhdkwdhb727rj53xyxk6i00sjr58a48hfig14m12niy1k739vd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ssh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ssh";
           sha256 = "1jywn8wlqzc2mfylp0kbpzxv3kwzak3vxdbjabiawqv1m4bfpk5g";
           name = "ssh";
         };
@@ -52544,7 +53230,7 @@
           sha256 = "0076g1yb8xvn6s8gz5jxiz8mn448fmab574yizgakbxaxd91s1dj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ssh-agency";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ssh-agency";
           sha256 = "0lci3fhl2p9mwilvq1njzy13dkq5cp5ighymf3zs4gzm3w0ih3h8";
           name = "ssh-agency";
         };
@@ -52565,7 +53251,7 @@
           sha256 = "1v6srqiqq5xsjiw4d3kfgp218dks8mm6f9i88ngjri6sb3slpfb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ssh-config-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ssh-config-mode";
           sha256 = "0aihyig6q3pmk9ld519f4n3kychrg3l7r29ijd2dpvs0530md4wb";
           name = "ssh-config-mode";
         };
@@ -52586,7 +53272,7 @@
           sha256 = "10a5havjg4yjshpfzkhgjdwbrvl44narg09ddzynczmyzm4f01wh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ssh-tunnels";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ssh-tunnels";
           sha256 = "0zlf22wg9adkhycsasv6bfim2h0cknsvihyi1q2l2l4pjdp9ypqj";
           name = "ssh-tunnels";
         };
@@ -52607,7 +53293,7 @@
           sha256 = "1f2dxlc3dsf9ay417h1l43fxjkrb0a4gg96zd3asx9v2alpzgcim";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stack-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stack-mode";
           sha256 = "0s0m2lj40php7bc2i3fy9ikd5rmx4v7zbxfkp9vadmlc5s7w25gf";
           name = "stack-mode";
         };
@@ -52628,7 +53314,7 @@
           sha256 = "0nkrpx1rmzg48mi5871mgdizasv80vpald513ycx4nshyln0ymv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stan-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stan-mode";
           sha256 = "17ph5khwwrcpyl96xnp3rsbmnk7mpwmgskxka3cfgkm190qihfqy";
           name = "stan-mode";
         };
@@ -52649,7 +53335,7 @@
           sha256 = "0nkrpx1rmzg48mi5871mgdizasv80vpald513ycx4nshyln0ymv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stan-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stan-snippets";
           sha256 = "021skkvak645483s7haz1hsz98q3zd8hqi9k5zdzaqlabwdjwh85";
           name = "stan-snippets";
         };
@@ -52670,7 +53356,7 @@
           sha256 = "09gjhg923jck35c1nvcdfk4dc0r559myzmfbcd9jvjamzh50ngcr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/standoff-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/standoff-mode";
           sha256 = "127bzpm1cz103f1pb860yqrh7mr0rdaivrm9p6ssd01kchl9nskp";
           name = "standoff-mode";
         };
@@ -52691,7 +53377,7 @@
           sha256 = "1v3rzy842mfzm850vs273ssr4hg00q1wz2rpky8lk3wbbw2qq3f0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/start-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/start-menu";
           sha256 = "1k1lc9i9vcl2am9afq0ksrxwsy6kppl4i0v10h0w2fq5z374rdkv";
           name = "start-menu";
         };
@@ -52712,7 +53398,7 @@
           sha256 = "0cl2y72iagmv87kg72a46a3kap2xigwnrbk2hjgvsbxv2ng5f9cr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stash";
           sha256 = "116k40ispv7sq3jskwc1lvmhmk3jjz4j967r732s07f5h11vk1z9";
           name = "stash";
         };
@@ -52733,7 +53419,7 @@
           sha256 = "1b17v4xghmki0g9yr5855891mlcrrbkr68xc3qyals5xw0dhb3xb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/state";
           sha256 = "19y3n8wnbpgbpz4jxy2p7hjqxykg09arjp7s5v22yz7il3gn48l2";
           name = "state";
         };
@@ -52754,7 +53440,7 @@
           sha256 = "0jpxmzfvg4k5q3h3gn6lrg891wjzlcps2kkij1jbdjk4jkgq386i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/status";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/status";
           sha256 = "0a9lqa7a5nki5711bjrmx214kah5ndqpwh3i240gdd08mcm07ps3";
           name = "status";
         };
@@ -52775,7 +53461,7 @@
           sha256 = "0w1qb8r6nrxi5hbf8l4247yqq754zfbxz64pqqcnw43cxk0qd4j3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stekene-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stekene-theme";
           sha256 = "0v1kwlnrqaygzaz376a5njg9kv4yf5l35k87xga4wdd2mxfwrmf1";
           name = "stekene-theme";
         };
@@ -52796,7 +53482,7 @@
           sha256 = "1xc4v8a35c2vpfhza15j4f89x7vyg9bbgm7xnprij7814k8iy7p0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stem";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stem";
           sha256 = "1625nbi2bmb7vzjz0s7y1cy7dp8lp83dayiib3nr2bfkv76fwkcq";
           name = "stem";
         };
@@ -52815,7 +53501,7 @@
           sha256 = "c5d424f34ca33d2c19e3888a9dc249d0398203e5199bf2b4bdd9e604390b500b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stgit";
           sha256 = "102s9lllrcxsqs0lgbrcljwq1l3s8ri4276wck6rcypck5zgzj89";
           name = "stgit";
         };
@@ -52833,7 +53519,7 @@
           sha256 = "18izyia1j3w2c07qhkp9h6rnvw35m5k1brrrjhm51fpdv2xj65fy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sticky";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sticky";
           sha256 = "1xjkdwphq3m4jrazsfnzrrcrqikfdxzph3jdzkpbzk3grd4af96w";
           name = "sticky";
         };
@@ -52854,7 +53540,7 @@
           sha256 = "16dxjsr5nj20blww4xpd4jzgjprzzh1nwvb810ggdmp9paf4iy0g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stickyfunc-enhance";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stickyfunc-enhance";
           sha256 = "13dh19c3bljs83l847syqlg07g33hz6sapg6j4s4xv4skix8zfks";
           name = "stickyfunc-enhance";
         };
@@ -52875,7 +53561,7 @@
           sha256 = "191sg32z1iagyxmbn49i1lpfihld9g9741cw2kj830s4vag4kinx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stock-ticker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stock-ticker";
           sha256 = "1slcjk2avybr4v9s7gglizmaxbb3yqg6s6gdbg12m3vvj3b72lfi";
           name = "stock-ticker";
         };
@@ -52885,22 +53571,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    strie = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    strie = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "strie";
-        version = "20140109.812";
+        version = "20160211.1622";
         src = fetchFromGitHub {
           owner = "hackscience";
           repo = "strie.el";
-          rev = "066e72c39ed51162d7d7892c7451a6cac28581b7";
-          sha256 = "1xgsdr75p52vg34s1gm16ffkr3s7gdsln56xjxpdirnwr78glbmw";
+          rev = "eb7efb0cccc127c414f6a64db11454869d9c10a8";
+          sha256 = "1kcbkf0wbmqy9slxfqg7wsyw5n2rsaz832ibrxszb642j0l8s7pr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/strie";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/strie";
           sha256 = "0i1bgjlwcc2ks8hzjkyrw924q4k8pcz8335z9935m73js0sq0lxl";
           name = "strie";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "http://melpa.org/#/strie";
           license = lib.licenses.free;
@@ -52917,7 +53603,7 @@
           sha256 = "0nx303bdi8mq18isgf79y8f1cjhqnxv3g3ynm09llrg73qr7r4zw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/string-edit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/string-edit";
           sha256 = "1l1hqsfyi6pp4x4g1rk4s7x9zjc03wfmhy16izia8nkjhzz88fi8";
           name = "string-edit";
         };
@@ -52938,7 +53624,7 @@
           sha256 = "06qs8v2pai3pyg0spmarssmrq06xg9q60wjj46s5xxichlw9pgcf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/string-inflection";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/string-inflection";
           sha256 = "1vrjcg1fa5adw16s4v9dq0fid0gfazxk15z9cawz0kmnpyzz3fg2";
           name = "string-inflection";
         };
@@ -52959,7 +53645,7 @@
           sha256 = "1frdspm1qgksa8cpx5gkj50xk9mgz8202pgp11lqir6l3yjcj3wq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/string-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/string-utils";
           sha256 = "1vsvxc06fd3wardldb83i5hjfibvmiqnxvcgdns7i5i8qlsrsx4v";
           name = "string-utils";
         };
@@ -52977,7 +53663,7 @@
           sha256 = "1sa6wd2z2qkcnjprkkm9b945qz8d0l702sv9w15wl0lngbhw84na";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/strings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/strings";
           sha256 = "0n3239y7biq3rlg74m7nqimhf654w4snnw2zm7z84isgwzz2dphk";
           name = "strings";
         };
@@ -52998,7 +53684,7 @@
           sha256 = "0dxajh72wdcwdb9ydbcm19fmp0p1drmh1niq4r69jnbn8sah0zax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stripe-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stripe-buffer";
           sha256 = "02wkb9y6vykrn6a5nfnimaplj7ig8i8h6m2rvwv08f5ilbccj16a";
           name = "stripe-buffer";
         };
@@ -53018,7 +53704,7 @@
           sha256 = "3547616b9e5694fd09014bbbf29458ee0dea828428b6bf7a6231670aacfb8271";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stumpwm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stumpwm-mode";
           sha256 = "0a77mh7h7033adfbwg2fbx84789962par43q31s9msjlqw15gs86";
           name = "stumpwm-mode";
         };
@@ -53038,7 +53724,7 @@
           sha256 = "242b90e4c403fbcadd40777cd98899c96aab78b84dea88dfa97583b734c9876b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stupid-indent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stupid-indent-mode";
           sha256 = "12y8qxxs04qzy09m734qg0857g4612qdswx2bh9jk7dp886fpd7p";
           name = "stupid-indent-mode";
         };
@@ -53059,7 +53745,7 @@
           sha256 = "1q6wpjb7vhsy92li6fag34pwyil4zvcchbvfjml612aaykiys506";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stylus-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stylus-mode";
           sha256 = "152k74q6qn2xa38v2zyd5y7ya5n26nvai5v7z5fmq7jrcndp27r5";
           name = "stylus-mode";
         };
@@ -53080,7 +53766,7 @@
           sha256 = "1j63rzxnrzzqizh7fpd99dcgsy5hd7w4d2lpwl5armmixlycl5m8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/subatomic-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/subatomic-theme";
           sha256 = "0mqas67qms492n3hn74c5nrkjpsgf9b42lp02s2dh366c075dpqc";
           name = "subatomic-theme";
         };
@@ -53101,7 +53787,7 @@
           sha256 = "1w7mimyqc25phlww20l49wlafnxp6c7dwibvphg3vwl61g0llpq8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/subatomic256-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/subatomic256-theme";
           sha256 = "1whjlkpkkirpnvvjryhlpzwphr1syz5zfyg4pb66i0db03hxwwcy";
           name = "subatomic256-theme";
         };
@@ -53122,7 +53808,7 @@
           sha256 = "10pirwc7g9vii5cyk4vg6m5g5hlap0yg9w4qy257744c67jmaxvg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/subemacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/subemacs";
           sha256 = "0sqh80jhh3v37l5af7w6k9lqvj39bd91pn6a9rwdlfk389hp90zm";
           name = "subemacs";
         };
@@ -53143,7 +53829,7 @@
           sha256 = "0lhbmcpzpxlqvw4mgh79v9y2f0xqjd1m36dbxcvhb67rwq6nrw3r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sublime-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sublime-themes";
           sha256 = "1nahcfcy831c7w3c69i2na0r8jsdgprffgfdvh4c41cnk4rkgdqj";
           name = "sublime-themes";
         };
@@ -53164,7 +53850,7 @@
           sha256 = "1kpq7kpmhgq3vjd62rr4qsc824qcyjxm50m49r7invgnmgd78h4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sublimity";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sublimity";
           sha256 = "1xwggaalad65cxcfvmy30f141bxhpzc3fgvwziwbzi8fygbdv4nw";
           name = "sublimity";
         };
@@ -53182,7 +53868,7 @@
           sha256 = "1xxf8kgxzcwwjm96isj4zg31vw63ahivr6xch5dw8wsvk0mjks9y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/subr+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/subr+";
           sha256 = "1vrv64768f7rk58mqr4pq1fjyi5n5kfqk90hzrwbvblkkrmilmfs";
           name = "subr-plus";
         };
@@ -53203,7 +53889,7 @@
           sha256 = "09izm28jrzfaj469v6yd1xgjgvy6pmxarcy0rzn2ihn3c0z7mdg4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/subshell-proc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/subshell-proc";
           sha256 = "1fnp49yhnhsj7paj0b25vr6r03hr5kpgcrci439ffpbd2c85fkw2";
           name = "subshell-proc";
         };
@@ -53224,7 +53910,7 @@
           sha256 = "1007xz4x1wgvxilv1qwf0a4y7hd7sqnnzwk2bdr12kfk7vq9cw2b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sudden-death";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sudden-death";
           sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh";
           name = "sudden-death";
         };
@@ -53242,7 +53928,7 @@
           sha256 = "0fpz73r52j7sk1w7my0002wg7isrp54w28nnrwk9xb9il4qpxag2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sudo-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sudo-ext";
           sha256 = "1iirrpa4rnz7rm85yjg60vdfca1ipxbk3qkld8lgwwm242pvvkw3";
           name = "sudo-ext";
         };
@@ -53260,7 +53946,7 @@
           sha256 = "0q5m8d6p9aqbfx17zgznkqw2jgh027xix4894wrdz91670zxd3py";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/summarye";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/summarye";
           sha256 = "1znd96ixg1n90yjiny84igb7m8qsbiibn7s6bky8g6n2k7zzmq65";
           name = "summarye";
         };
@@ -53281,7 +53967,7 @@
           sha256 = "0mhyhkjjwszwl5wzkys9pgvgx9sps9r46k1s1hpzzf4s3vi015mc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sunny-day-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sunny-day-theme";
           sha256 = "1wsfnmmbzzyggzip66vr38yyzy27blxp91wx97bafj7jpg5cyhzw";
           name = "sunny-day-theme";
         };
@@ -53302,7 +53988,7 @@
           sha256 = "1x3ivhwyapxw7v3ygam3bn2i9djrsp9mcd5zdn8q84c583ppanll";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sunshine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sunshine";
           sha256 = "1lxiqw7k8cpq0v6p5whgxgzqrbx3sd9174r0d4qlkrpn6rcp44vv";
           name = "sunshine";
         };
@@ -53323,7 +54009,7 @@
           sha256 = "1b637p2cyc8a83qv9vba4yamzhk08f62zykqh5p35jwvym8wkann";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/suomalainen-kalenteri";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/suomalainen-kalenteri";
           sha256 = "1wzijbgcr3jc47ccr7nrdkqha16s6gw0xiccnmdczi48cvnvvlkh";
           name = "suomalainen-kalenteri";
         };
@@ -53336,15 +54022,15 @@
     super-save = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "super-save";
-        version = "20160131.418";
+        version = "20160211.456";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "super-save";
-          rev = "cf7a60afc6173ba59627f920ecaf6e69942071b8";
-          sha256 = "0jbij0wnw6rylchnhihl82harg29275ljpdh3nmcjnjhk6za60vc";
+          rev = "73397501fa5b01c02b9ae94f82a8cb37d1ed105f";
+          sha256 = "0cw3yf2npy2ah00q2whpn52kaybbccw1qvfzsww0x4zshlrwvvvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/super-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/super-save";
           sha256 = "0ikfw7n2rvm3xcgnj1si92ly8w75x26071ki551ims7a8sawh52p";
           name = "super-save";
         };
@@ -53365,7 +54051,7 @@
           sha256 = "0m02snzka243adhwwgriml133n4312lhdia3wdqjcq8y2mlp3331";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/supergenpass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/supergenpass";
           sha256 = "0ldy6j6l6rf72w0hl195rdnrabml2a5k91200s186k0r5aja4b95";
           name = "supergenpass";
         };
@@ -53378,15 +54064,15 @@
     suscolors-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "suscolors-theme";
-        version = "20160201.1004";
+        version = "20160217.1234";
         src = fetchFromGitHub {
           owner = "TheSuspiciousWombat";
           repo = "suscolors-emacs";
-          rev = "d6e7b1a7ac7ee98a9e958702f15bcfb96463aa51";
-          sha256 = "0bwmgmc12rlhcicdy6fhsq96wsvd3hdnz8w545ykiwb5wci52j0m";
+          rev = "f186aab5d21d1cfb8bb0722332388cfdcb45c052";
+          sha256 = "0hwlp1zwfi0qkzzxkqxxjjshgl2h5i5jjn13ky51zb733bazpifx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/suscolors-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/suscolors-theme";
           sha256 = "08sh20lmhqzpxb55nmqwsfv4xd6sjirh592in7s6vl52r3hl0jkh";
           name = "suscolors-theme";
         };
@@ -53407,7 +54093,7 @@
           sha256 = "14h40s0arc2i898r9yysn256z6l8jkrnmqvrdg7p7658c0klz5ic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/svg-mode-line-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/svg-mode-line-themes";
           sha256 = "12lnszcb9bl32n9wir7vf8xiyyv7njw4xg21aj9x4dasmidyx506";
           name = "svg-mode-line-themes";
         };
@@ -53428,7 +54114,7 @@
           sha256 = "1kn70570r6x0h1xfs1vr8as27pjfanyhml140yms60gdjb4ssf9r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swap-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/swap-buffers";
           sha256 = "0ih5dhnqy3c9nlfz9m2zwy4q4jaam09ykbdqhsxx2hnwjk7p35bw";
           name = "swap-buffers";
         };
@@ -53446,7 +54132,7 @@
           sha256 = "1fkicyjvanh8yk2y27sq075sarcyqhsdz0r4xhillpnv34ji98r5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swbuff-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/swbuff-x";
           sha256 = "1wglcxgfr839lynwsl8i7fm70sxxjidy3ib6ibz0kgiwr41rh49y";
           name = "swbuff-x";
         };
@@ -53467,7 +54153,7 @@
           sha256 = "10blwlwg1ry9jznf1a6iss5s0z8sj9gc02ayf5qv92mgxvjhrhdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sweetgreen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sweetgreen";
           sha256 = "1v75wk0gq5fkz8i1r8pl4gqnxbv1d80isyn48w2hxj2fmdn2xhpy";
           name = "sweetgreen";
         };
@@ -53488,7 +54174,7 @@
           sha256 = "08397a8y8hgyzwny4z9f6kgwy8d37h0iypcjps3l6lhnk35mshv0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swift-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/swift-mode";
           sha256 = "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d";
           name = "swift-mode";
         };
@@ -53501,16 +54187,16 @@
     swiper = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "swiper";
-        version = "20160204.837";
+        version = "20160221.235";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "swiper";
-          rev = "00f08f74f1568b6f835abadecff32cd7c9a7a556";
-          sha256 = "0hnqw1mhaa7ybldd6mvz9lyv32yspn3x2bgx3fsrh8rhsmns06qh";
+          rev = "4af5c2e4e83f51da91675b0de7301b09c4b24b2c";
+          sha256 = "0ra5sa0dfrh1bv1q3r81r92i6xzazvw3lzz5n5qfbxcpnf8lygzk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swiper";
-          sha256 = "13lld7kjz1n1ryxvrfsy0iym5l9m9ybrf7bpcmkzsalpp15j3mvm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/swiper";
+          sha256 = "1hsj6vh0vldnvwg2qmszdi0p2ig7l63vgq2kn5nv883239bxpziz";
           name = "swiper";
         };
         packageRequires = [ emacs ];
@@ -53530,7 +54216,7 @@
           sha256 = "1fr9vs0574g93mq88d25nmj93hrx4d4s2d0im6wk156k2yb8ha2b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swiper-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/swiper-helm";
           sha256 = "011ln6vny7z5vw67cpzldxf5n6sk2hjdkllyf7v6sf4m62ws93ph";
           name = "swiper-helm";
         };
@@ -53551,7 +54237,7 @@
           sha256 = "1zpfilcaycj0l2q3zyvpjbwp5j3d9rrkacd5swzlr1n1klvbji48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/switch-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/switch-window";
           sha256 = "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2";
           name = "switch-window";
         };
@@ -53572,7 +54258,7 @@
           sha256 = "10ka6f86n07xlf0z7w35db0mzp2zk4xhr6jd19kjdrn2j0ynlcw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swoop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/swoop";
           sha256 = "0r265rwfbl1iyclnspxpbzf2w1q0w8dnc0wv5mz5g6hhcrr0iv6g";
           name = "swoop";
         };
@@ -53593,7 +54279,7 @@
           sha256 = "1q6wpjb7vhsy92li6fag34pwyil4zvcchbvfjml612aaykiys506";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sws-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sws-mode";
           sha256 = "0b12dsad0piih1qygjj0n7rni0pl8cizbzwqm9h1dr8imy53ak4i";
           name = "sws-mode";
         };
@@ -53614,7 +54300,7 @@
           sha256 = "0d0c2i8hh0wrz8vnhxpxzwj7vlrjx6lrb3cx56pn4ny9qyqfzmw3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sx";
           sha256 = "1ml1rkhhk3hkd16ij2zwng591rxs2yppsfq9gwd4ppk02if4v517";
           name = "sx";
         };
@@ -53635,7 +54321,7 @@
           sha256 = "1mb068vgf0bbj0bdxjhd6c794bwc3wp7r6q1s49w8b24g1pfrjkq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/symon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/symon";
           sha256 = "11llnvngyc3xz8nd6nj86ism0hhs8p54wkscvs4yycbakbyn61lz";
           name = "symon";
         };
@@ -53656,7 +54342,7 @@
           sha256 = "030bglxnvrkf1f9grbhd8n11j4c6sxpabpjdr1ryx522v01fvx8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/symon-lingr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/symon-lingr";
           sha256 = "0kyhmw25cn10b4jv2yx7bvp8zkwcswiidpk4amyaisw25820gkv1";
           name = "symon-lingr";
         };
@@ -53677,7 +54363,7 @@
           sha256 = "00lx6081h1nzwga5jg4cik4h667vfkn128yvnhkd0vw7b5g4ji5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sync-recentf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sync-recentf";
           sha256 = "17aji2vcw6zfd823anzwj8pcgyxamxr87bnni085jvlz0vx6gh9c";
           name = "sync-recentf";
         };
@@ -53698,7 +54384,7 @@
           sha256 = "02xnfkmpvjicckmp9is42fnavy9pd95s99zmf1wylxdji2hhpjxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/synonymous";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/synonymous";
           sha256 = "0vawa9qwvv6z1i7vzhkjdl1l9r1yham48yn5y8w8g1xyhxxp6rs5";
           name = "synonymous";
         };
@@ -53716,7 +54402,7 @@
           sha256 = "01l7z6l9pdxzvh851pbq2fn62r28gzwldibffb69jkdln47bph50";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/synonyms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/synonyms";
           sha256 = "0rnq97jpr047gpkxhw22jj3gw09r45vn6fwkzxnxjzcmsyk492d0";
           name = "synonyms";
         };
@@ -53737,7 +54423,7 @@
           sha256 = "1zz9rnwaclr95fpjyabv5rlhk36n2k8f1lzz6yqh964hv8i9562s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/synosaurus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/synosaurus";
           sha256 = "16i2ag4l824h1kq4cy01zf01zrms4v6ldwlsixwfyb1mh97lqljg";
           name = "synosaurus";
         };
@@ -53758,7 +54444,7 @@
           sha256 = "0zi11540wwcl93xcgd2yf6b72zv01zkaqbf1jfbksg82k9038m2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/syntactic-sugar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/syntactic-sugar";
           sha256 = "12b2vpvz5h4wzxrk8jrbgc8v0w6bzzvxcyfs083fi1791qq1rw7r";
           name = "syntactic-sugar";
         };
@@ -53771,14 +54457,14 @@
     syntax-subword = callPackage ({ fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "syntax-subword";
-        version = "20150415.1426";
+        version = "20160205.1554";
         src = fetchhg {
           url = "https://bitbucket.com/jpkotta/syntax-subword";
-          rev = "a1e0accb754d";
-          sha256 = "1p9bp09nibw7rra3r6nj496zdx09db6k82dxnxs1lfgdiswfdq2h";
+          rev = "88e9bf1d4874";
+          sha256 = "15zvh6dk02rm16zs6c9zvw1w76ycn61g3cpx6jb3456ff9zn6m9m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/syntax-subword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/syntax-subword";
           sha256 = "1as89ffqz2h69fdwybgs5wibnrvskm7hd58vagfjkla9pjlpffpm";
           name = "syntax-subword";
         };
@@ -53799,7 +54485,7 @@
           sha256 = "1sxpda380c9wnnf5d72lrcqm6dkihf48cgsjcckzf706cc00ksf4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/syslog-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/syslog-mode";
           sha256 = "15kh2v8jsw04vyh2lmh1ndpxli3cwp6yq66hl8mwb1i3g429az19";
           name = "syslog-mode";
         };
@@ -53820,7 +54506,7 @@
           sha256 = "1hixilnnybv2v3p1wpn7a0ybwah17grawszs3jycsjgzahpgckv7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/system-specific-settings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/system-specific-settings";
           sha256 = "1ydmxi8aw2lf78wv4m39yswbqkmcadqg0wmzg9s8b5h9bxxwvppp";
           name = "system-specific-settings";
         };
@@ -53841,7 +54527,7 @@
           sha256 = "1z7zi0wcms55x0ar9jv02g7gbzsn4k887aigpgv4xghbdiyp7lp0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/systemd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/systemd";
           sha256 = "1biais0cmidy3d0hf2ifdlr6qv1z8k8c8bczi07bsfk4md3idbir";
           name = "systemd";
         };
@@ -53862,7 +54548,7 @@
           sha256 = "0343ss3y9i40y3i9rr7p7bb4k9dj950zyvdv44q1abw2xrfd2xwd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/systemtap-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/systemtap-mode";
           sha256 = "1l2jx6mvph0q2pdlhq7p4vwfw72rfl8k1rwi504bbkr5n5xwhhhz";
           name = "systemtap-mode";
         };
@@ -53883,7 +54569,7 @@
           sha256 = "054l3imxk9ivq361cr15q1wym07mw3s8xzjkzqlihrfvadsq37ym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ta";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ta";
           sha256 = "0kn2k4n0xfwsrniaqb36v3rxj2pf2sai3bmjksbn1g2kf5g156ll";
           name = "ta";
         };
@@ -53904,7 +54590,7 @@
           sha256 = "0lfvgbgvsm61kv5mcjnhnfjcnr7fy1015y0hndkf9xvdlw4hahr4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tab-group";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tab-group";
           sha256 = "1i5lxpf3wmqnqj9mzgcn4gp1gjxp737awrzl1dml5wnarbbj4fs9";
           name = "tab-group";
         };
@@ -53925,7 +54611,7 @@
           sha256 = "0h7sfbca1nzcjylwl7zp25yj6wxnlx8g8a50zc6sg6jg4rggi2fm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tab-jump-out";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tab-jump-out";
           sha256 = "0nlbyzym8l8g9w2xvykpcl5r449v30gal2k1dnz74rq4y8w4rh7n";
           name = "tab-jump-out";
         };
@@ -53946,7 +54632,7 @@
           sha256 = "0n23nnig1lgjamrzsa91p2aplh7gpj2vkp951i9fpf49c6xpyj3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tabbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tabbar";
           sha256 = "1y376nz1xmchwns4fz8dixbb7hbqh4mln78zvsh7y32il98wzvx9";
           name = "tabbar";
         };
@@ -53959,15 +54645,15 @@
     tabbar-ruler = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, mode-icons, powerline, tabbar }:
     melpaBuild {
         pname = "tabbar-ruler";
-        version = "20160124.2028";
+        version = "20160216.2132";
         src = fetchFromGitHub {
           owner = "mattfidler";
           repo = "tabbar-ruler.el";
-          rev = "605bf3b755f228f7a22e440e54a2224ffc06e2e4";
-          sha256 = "1xb9g1qzpsliprcdazr4bk05kfk9dnjazx5hxiv74h33ph1xg4a6";
+          rev = "5f3bb41436b00298e494c74701f0609569840a58";
+          sha256 = "1d0nf6mf5vkz7mx0iwn6bgrzsf96h55khd04wf3iv39v1x4gwc6p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tabbar-ruler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tabbar-ruler";
           sha256 = "10dwjj6r74g9rzdd650wa1wxhqc0q6dmff4j0qbbhmjsxvsr3y0d";
           name = "tabbar-ruler";
         };
@@ -53988,7 +54674,7 @@
           sha256 = "0gy9hxm7bca0l1hfy2pzn86avpifrz3bs8xzpicj4kxw5wi4ygns";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tablist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tablist";
           sha256 = "0c10g86xjhzpmc2sqjmzcmi393qskyw6d9bydqzjk3ffjzklm45p";
           name = "tablist";
         };
@@ -54009,7 +54695,7 @@
           sha256 = "1dbjfq9a7a5s9c18nrp4kcda64jkg5cp8na31kxw0hjcn98dgqa8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tabula-rasa";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tabula-rasa";
           sha256 = "186lph964swg7rs5gvby3p1d0znq9x3xzsmirfb3cdbazvz6hhxi";
           name = "tabula-rasa";
         };
@@ -54030,7 +54716,7 @@
           sha256 = "00hjc6ax4659ww6vygpzzsb3zzr2ddz2z33mkp5j6hmj2s4g2viy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tagedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tagedit";
           sha256 = "0vfkbrxmrw4fwdz324s734zxdxm2nj3df6i8m6lgb9pizqyp2g6z";
           name = "tagedit";
         };
@@ -54051,7 +54737,7 @@
           sha256 = "13zwlb5805cpv0pbr7fj5b4crlg7lb0ibslvcpszm0cz6rlifcvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/take-off";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/take-off";
           sha256 = "05vlajmirbp62rpbdwa2bimpzyl9xc331gg0lhn2rkivc0hma2ar";
           name = "take-off";
         };
@@ -54071,7 +54757,7 @@
           sha256 = "7342a670559cd296dba4b676607641a05d6203255951b17473ccdda4e35713d3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tango-2-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tango-2-theme";
           sha256 = "1a9qmz99h99gpd0sxqb71c08wr8pm3bzsg3p4cvf3vcirvav9lq6";
           name = "tango-2-theme";
         };
@@ -54092,7 +54778,7 @@
           sha256 = "1gfn1yyyb9p2fi17wra1yf2j96cfjw0sifgk3c0vl63h3vmiyvjf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tango-plus-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tango-plus-theme";
           sha256 = "1bx9qcwvybgd0rg8a9rag8xvb5ljrwfnm5nvq793ncvbdvq6vrh5";
           name = "tango-plus-theme";
         };
@@ -54109,11 +54795,11 @@
         src = fetchFromGitHub {
           owner = "juba";
           repo = "color-theme-tangotango";
-          rev = "92a94756080577c0446b2fc7f06d43d7b76b2005";
-          sha256 = "00v2y2gfb44kmzfdbp6f4nmxlwn8gf6y3hvgqzggmlbqb5m8hg8d";
+          rev = "08c3b9270547970dbce2cb1e35e66f6ae380c8b2";
+          sha256 = "11xb7xpmxvgv7mrjd2vlbjz3h5fa541aydv6bdxngjq6y3qn6wsp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tangotango-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tangotango-theme";
           sha256 = "05cnvyqmh5h5mqys7qs7d9knzxzmi2x0j1avp77x5l5njzzv59s2";
           name = "tangotango-theme";
         };
@@ -54134,7 +54820,7 @@
           sha256 = "1zhr6vrzf511mxrj4fkc9k8wfr1hixn733f5g28j4qzykr4zl2mh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tao-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tao-theme";
           sha256 = "0gl6zzk5ha6vl2xxf5fcnv1k42cw4axdjdcirr1c4r8jwdq3nl3a";
           name = "tao-theme";
         };
@@ -54155,7 +54841,7 @@
           sha256 = "1jp80qywcphql1ngd4fr24lqdfwrw0bw6q9hgq5vmzgjwfxwxwd4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tbx2org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tbx2org";
           sha256 = "1yvkw65la4w12c4w6l9ai73lzng170wv4b8gry99m2bakw3wr8m8";
           name = "tbx2org";
         };
@@ -54176,7 +54862,7 @@
           sha256 = "1xpkrlfqb0np9zyxk41f3pxfkw98ii4q0xh8whq4llv5bmfxynzk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tc";
           sha256 = "13qdnfslnik4f97lz9bxayyhgcp1knh5gaqy00ps863j3vpzjb9s";
           name = "tc";
         };
@@ -54197,7 +54883,7 @@
           sha256 = "1krway6iw62dlr4ak3kj9llqh48xjf3d84nlincap7gkrw886l4q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tco";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tco";
           sha256 = "0hfrzwjlgynk3mydrpmic9mckak37r22fdglrfas6zdihgrg152f";
           name = "tco";
         };
@@ -54218,7 +54904,7 @@
           sha256 = "1jyz6z5bk1gvmknphcnvjvbl329zm8m40yl0a1hfaj8fvhwyzdw5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tdd-status-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tdd-status-mode-line";
           sha256 = "0z1q1aw14xq72nfx7mmvz7pr2x4960l45z02jva35zxzvb1mvsgq";
           name = "tdd-status-mode-line";
         };
@@ -54239,7 +54925,7 @@
           sha256 = "0b4cwkwkc4i8lc4j30xc9d6xskm3gqrc2dij60ya75h92aj0lj40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tea-time";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tea-time";
           sha256 = "18fsbh78c5408zg5bk44gxdynp6kn8253xdg7ap2pr3mjknq9kld";
           name = "tea-time";
         };
@@ -54260,7 +54946,7 @@
           sha256 = "16kr1p4lzi1ysd5r2dh0mxk60zsm5fvwa9345nfyrgdic340yscc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/telepathy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/telepathy";
           sha256 = "0c3d6vk7d6vqzjndlym2kk7d2zm0b15ac4142ir03p6f19rqq9pr";
           name = "telepathy";
         };
@@ -54281,7 +54967,7 @@
           sha256 = "0mg870s60by22ripxhqrgxjx16506n4llj9nnxlqgr4mdsi77cf5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/telephone-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/telephone-line";
           sha256 = "0dyh9h1yk9y0217b6rxsm7m372n910vpfgw5w23lkkrwa8x8qpx3";
           name = "telephone-line";
         };
@@ -54302,7 +54988,7 @@
           sha256 = "0sa3chk16s830lqhcd8d3bwdfmjg239ywb7jm6lhwshydssh34nk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/term-alert";
           sha256 = "0x4rc1y311ivaj6mlks1j8sgzrrwqn8vx171vw7s1kgf1qzk826n";
           name = "term-alert";
         };
@@ -54315,15 +55001,15 @@
     term-cmd = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "term-cmd";
-        version = "20141114.1514";
+        version = "20160221.627";
         src = fetchFromGitHub {
           owner = "CallumCameron";
           repo = "term-cmd";
-          rev = "fc2ae638409af99c4788563ef54847636f2e23e0";
-          sha256 = "11xk11i99d17x5bl7glrwj2dhvl3f54slipj034dbf07dd5b2jih";
+          rev = "f478328fd225d146ca8979245724302e976f4e53";
+          sha256 = "15fcl5amivjdcwprj3dwrkn17z8a0q0zl8smyryjcqpkw66xrb7i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term-cmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/term-cmd";
           sha256 = "0fn4f32zpl0p2lid159q59lzjv4xqmc23a64kcclqp9db8b1m5fy";
           name = "term-cmd";
         };
@@ -54344,7 +55030,7 @@
           sha256 = "1ayr34smxf94c09ssdwl4hyhzgahsmbj7j4h25cdm6wcwii2br86";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/term+";
           sha256 = "12lvfspqmyrapmbz3x997vf160927d325y50kxdx3s6p81r7n2n8";
           name = "term-plus";
         };
@@ -54365,7 +55051,7 @@
           sha256 = "1dql2w8xkdw52zlrc2p9x391zn8wv4dj8a6293p4s08if7gg260w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term+key-intercept";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/term+key-intercept";
           sha256 = "1564a86950xdwsrwinrs118bjsfmbv8gicq0c2dfr827v5b6zrlb";
           name = "term-plus-key-intercept";
         };
@@ -54386,7 +55072,7 @@
           sha256 = "12gfvcf7hl29xhg231cx76q04ll7cvfpvhkb0qs3qn1sqb50fs2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term+mux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/term+mux";
           sha256 = "129kzjpi5nzagqkjfikx9i7k6489dy7d3pd7ggn59p4cnh3r2rhh";
           name = "term-plus-mux";
         };
@@ -54407,7 +55093,7 @@
           sha256 = "149pl3zxg5kriydk5h6j95jyly6i23w4w4g4a99s4zi6ljiny6c6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term-run";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/term-run";
           sha256 = "1bx3s68rgr9slsw9k01gfg7sxd4z7sarg4pi2ivril7108mhg2cs";
           name = "term-run";
         };
@@ -54428,7 +55114,7 @@
           sha256 = "0gfsqpza8phvma5y3ck0n6p197x1i33w39m3c7jmja4ml121n73d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/termbright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/termbright-theme";
           sha256 = "14q88qdbnyzxr8sr8i5glj674sb4150b9y6nag0dqrxs629is6xj";
           name = "termbright-theme";
         };
@@ -54445,11 +55131,11 @@
         src = fetchFromGitHub {
           owner = "marijnh";
           repo = "tern";
-          rev = "5d9d95f976402604db161a40103e34ea90665ef0";
-          sha256 = "1lnfibvs2v7byk6l1vpz7nr8jkg3fbs0ijviwxmfjqpjbaglnksv";
+          rev = "adf9dac372d3521a06d01d35fda254554c154e8b";
+          sha256 = "0fxaibs7kizlxh73vlv7mn4wa8sxbx67gl17rcfhm14lnk63nvcw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tern";
           sha256 = "06bgwizn9dcd8hsvimjvb28j0mpxg7rrv9knhv5kkdapa6gggxif";
           name = "tern";
         };
@@ -54466,11 +55152,11 @@
         src = fetchFromGitHub {
           owner = "marijnh";
           repo = "tern";
-          rev = "5d9d95f976402604db161a40103e34ea90665ef0";
-          sha256 = "1lnfibvs2v7byk6l1vpz7nr8jkg3fbs0ijviwxmfjqpjbaglnksv";
+          rev = "adf9dac372d3521a06d01d35fda254554c154e8b";
+          sha256 = "0fxaibs7kizlxh73vlv7mn4wa8sxbx67gl17rcfhm14lnk63nvcw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tern-auto-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tern-auto-complete";
           sha256 = "0lq924c5f6bhlgyqqzc346n381qf0fp66h50a0zqz2ch66kanni1";
           name = "tern-auto-complete";
         };
@@ -54483,15 +55169,15 @@
     tern-django = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, tern }:
     melpaBuild {
         pname = "tern-django";
-        version = "20150121.1327";
+        version = "20160221.1323";
         src = fetchFromGitHub {
           owner = "proofit404";
           repo = "tern-django";
-          rev = "18cbf415fba5109e311aadb4a6b9d8b12507daa3";
-          sha256 = "061mkj5vhyhl4fav7q0r2yxidh0jcyajznb76slkakk6n2wmv7q0";
+          rev = "856fc98dc5e7cb4c8bc200f99150cc6187c82861";
+          sha256 = "15jzqwfr1958s21qzimvv87kckqyq01bimqgawb51b6xi9ib3biv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tern-django";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tern-django";
           sha256 = "1pjaaffadaw8h2n7yv01ks19gw59dmh8bp8vw51hx1082r3yfvv0";
           name = "tern-django";
         };
@@ -54512,7 +55198,7 @@
           sha256 = "0mz2yl9jaw7chzv9d9hhv7gcvdwwvi676y9wpn7vp85hxpda7xg7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/terraform-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/terraform-mode";
           sha256 = "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn";
           name = "terraform-mode";
         };
@@ -54533,7 +55219,7 @@
           sha256 = "1r3fmb8cshgh9pppdvydfcrzlmb9cgz4m04rgv69c5xv8clwcmbr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/test-case-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/test-case-mode";
           sha256 = "1iba97yvbi5vr7gvc58gq2ah6jg2s7apc9ssq7mdzki823n8z2qi";
           name = "test-case-mode";
         };
@@ -54554,7 +55240,7 @@
           sha256 = "125k13sqgxk963c04zn49jidvzx0hl0s4vvc9jpffgq8aq0mnnmr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/test-kitchen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/test-kitchen";
           sha256 = "1bl3yvj56dq147yplrcwphcxiwvmx5n97y4qpkm9imiv8cnjm1g0";
           name = "test-kitchen";
         };
@@ -54575,7 +55261,7 @@
           sha256 = "0h2g02r1spj8vbwgvjn3dddyj89j1qcqzdf2kdggvyyisssj81s3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/test-simple";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/test-simple";
           sha256 = "1l6y77fqd0l0mh2my23psi66v5ya6pbr2hgvcbsaqjnpmfm90w3g";
           name = "test-simple";
         };
@@ -54596,7 +55282,7 @@
           sha256 = "1qcd7vdg63q80zwz8ziaznllq1x7micmljm72s6sh3720rb5aiz2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/textile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/textile-mode";
           sha256 = "0c1l7ml9b1zipk5fhmhirrh070h0qwwiagdk84i04yvdmmcjw2nf";
           name = "textile-mode";
         };
@@ -54617,7 +55303,7 @@
           sha256 = "1b7xxz1i84azmbz8rqpxdn18avmnqlj87hfrpbngbf6pj5h9jqjh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/textmate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/textmate";
           sha256 = "119w944pwarpqzcr9vys17svy1rkfs9hiln8903q9ff4lnjkpf1v";
           name = "textmate";
         };
@@ -54638,7 +55324,7 @@
           sha256 = "1idhhfp0jhnykyms7dp3lfk6imddg6a315pfklbjpcys4y3fdz89";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/textmate-to-yas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/textmate-to-yas";
           sha256 = "04agz4a41h0givfdw88qjd3c7pd418qyigsij4la5f37j5rh338l";
           name = "textmate-to-yas";
         };
@@ -54656,7 +55342,7 @@
           sha256 = "16byw8ix7bjh5ldr8rymisq2bhc5sh7db6rhpf0x28yd6mmzn73v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tfs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tfs";
           sha256 = "10szb9mni37s2blvhl1spj96narmkrv8zhrryw9q1251z8laq5v0";
           name = "tfs";
         };
@@ -54677,7 +55363,7 @@
           sha256 = "0njmn5dy773v9kmwclw1m79rh52xnxl8mswcaagni2z3dvlvw4m8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/theme-changer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/theme-changer";
           sha256 = "1qbmsghkl5gs728q0gaalc7p8q7nzv3l045jc0jdxxnb7na3gc5w";
           name = "theme-changer";
         };
@@ -54698,7 +55384,7 @@
           sha256 = "1kd4mazrcy5xamkvvrwsmcx63g0gp5w4264kxbk3d25bjqcf8rmj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/theme-looper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/theme-looper";
           sha256 = "02hz9k4ybpp4i8ik2av9rg240sjgicbf6w24zn67dmw4nc4lp9c5";
           name = "theme-looper";
         };
@@ -54719,7 +55405,7 @@
           sha256 = "12kz4alyf3y2i7lkvi26hcxy55v0blsrxv5srx9fv5jhxkdz1vq1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/therapy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/therapy";
           sha256 = "0y040ghb0y6aq0nchqr09vapz6h6112rkwxkqsx0v7xmqrqfjvhh";
           name = "therapy";
         };
@@ -54737,7 +55423,7 @@
           sha256 = "0zcyasdzb7dvmld8418cy2mg8mpdx01bv44cm0sp5950scrypsaq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thesaurus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/thesaurus";
           sha256 = "1nyjk9jr1xvdkil13ylfsgg7q2sx71za05gi8m2v5f45pbmbi50h";
           name = "thesaurus";
         };
@@ -54756,7 +55442,7 @@
           sha256 = "1nclwxb63ffbc4wsga9ngkfcxsw88za0c4663fh9x64rl4db4hn8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thing-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/thing-cmds";
           sha256 = "133bm2cw9ar6m2amj0rrq4wbj9c3zl61gaprx0vlasxj2cyxs7yw";
           name = "thing-cmds";
         };
@@ -54774,7 +55460,7 @@
           sha256 = "0ijz0mj095wycpc3as5fiikrwazljk0c04rh089ch0mzc95g3vqq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thingatpt+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/thingatpt+";
           sha256 = "0w031lzjl5phvzsmbbxn2fpziwkmdyxsn08h6b9lxbss1prhx7aa";
           name = "thingatpt-plus";
         };
@@ -54795,7 +55481,7 @@
           sha256 = "0imzrb3vqnm36illqnpfc6x7rbq9rrrlpcw9n2yzl4n309mqdwr6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thingopt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/thingopt";
           sha256 = "0yvzq1z2nrldr8vhcvxqgzvh4gbrjjwfmprg59p4v5hlxvhxsb1y";
           name = "thingopt";
         };
@@ -54816,7 +55502,7 @@
           sha256 = "0rjcrvw9v2y10ahycra53bwbccpwqxxwn2c21wjj1kfs0kdwhs9p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thread-dump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/thread-dump";
           sha256 = "0dzr86jyf2j49gq40q6qd6lppa57n65n94xzpdjjbs182hxzavp2";
           name = "thread-dump";
         };
@@ -54833,11 +55519,11 @@
         src = fetchFromGitHub {
           owner = "apache";
           repo = "thrift";
-          rev = "c1a78ba6d5ff0c015768a5b0969112895b4e7723";
-          sha256 = "1dq9a26vvv3a9nkdf7yb42a4dklg91g2wpnh3yv1zdcxh8hk2nx5";
+          rev = "33de26cf658450513ef5731ac55b635addb4d43d";
+          sha256 = "1893s2sn6gmyd4s8slzh3hc6rffh6x17wvhlgfm4xlgzk4wyd1rj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thrift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/thrift";
           sha256 = "0p1hxmm7gvhyigz8aylncgqbhk6cyf75rbcqis7x552g605mhiy9";
           name = "thrift";
         };
@@ -54856,7 +55542,7 @@
           sha256 = "0nyp1sp55l3mlhlxw8kyp6hxan3rbgwc4fmfs174n6hlj3zr5vg8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thumb-frm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/thumb-frm";
           sha256 = "1fjjd80drm8banni909lww9zqazr1kk9m40xwwa1ln2zicaf091c";
           name = "thumb-frm";
         };
@@ -54877,7 +55563,7 @@
           sha256 = "0nypcryqwwsdawqxi7hgsv6fp28zqslj9phw7zscqqxzc3svaywn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thumb-through";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/thumb-through";
           sha256 = "1krn7zn2y8p51m8dxai5nbrwbdviz6zrjzz0kykya9cqz4n9dhln";
           name = "thumb-through";
         };
@@ -54890,15 +55576,15 @@
     tide = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, flycheck, lib, melpaBuild, typescript-mode }:
     melpaBuild {
         pname = "tide";
-        version = "20160130.243";
+        version = "20160221.142";
         src = fetchFromGitHub {
           owner = "ananthakumaran";
           repo = "tide";
-          rev = "a68c70c3eebaa15394d96978019186b4d0a6aac2";
-          sha256 = "1qgnmsvslyqip0x8k6yd7cl47c9biyxwqk69hnsvpjjbsv2l3y8j";
+          rev = "20e4748f2fa002b4cd53caf426b52734e51254c1";
+          sha256 = "1g530aq7vflnpigw7cii9z86263kxjv6f78dyiy7zvab6rzc9vyh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tide";
           sha256 = "1z2xr25s23sz6nrzzw2xg1l2j8jvjhxi53qh7nvxmmq6n6jjpwg1";
           name = "tide";
         };
@@ -54916,7 +55602,7 @@
           sha256 = "0psci55a3angwv45z9i8wz8jw634rxg1xawkrb57m878zcxxddwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tidy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tidy";
           sha256 = "09xb2k3k99hp3m725f31s6hlaxgl4fsaa1dylahxvdfddhbh290m";
           name = "tidy";
         };
@@ -54934,7 +55620,7 @@
           sha256 = "0kxgzjwgd979aypjak07k8ss6hnm3x9f96z1rz2zsz2i3vvh6sqv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/time-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/time-ext";
           sha256 = "15b3m1jvr7kg5sc4c8cp0aaiiyivfx8ip1zf7w5m702krv4lfvpk";
           name = "time-ext";
         };
@@ -54955,7 +55641,7 @@
           sha256 = "1hidvbd1xzz9m0fc55wac1mpv4dpcf8qnw1myh3646bfvivj9c2q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/timer-revert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/timer-revert";
           sha256 = "0lvm2irfx9rb5psm1lf53fv2jjx745n1c172xmyqip5xwgmf6msy";
           name = "timer-revert";
         };
@@ -54976,7 +55662,7 @@
           sha256 = "1ghvnmswq6rg17pjnys58mak6crfcvv1vb6q7spagq143y2ar24z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/timesheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/timesheet";
           sha256 = "1gy6bf4wqvp8cw2wjnrr9ijnzwav3p7j46m7qrn6l0517shwl506";
           name = "timesheet";
         };
@@ -54997,7 +55683,7 @@
           sha256 = "0rf177kr0qfhg8g5xrpi405dhp2va1yk170zm3f8hghi2575ciy2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tinkerer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tinkerer";
           sha256 = "0qh6pzjn98jlpxcm9zf25ga0y3d3v53275a9zgswyhz33mafd7pd";
           name = "tinkerer";
         };
@@ -55018,7 +55704,7 @@
           sha256 = "0mmz8b0fzffybc2jws9fif982zfx0l6kn1l4qxc67mf9nafbdca3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tiny";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tiny";
           sha256 = "183qczyb6c8zmdgmsjsj4hddmvnzzq4c7syslm861xcyxia94icy";
           name = "tiny";
         };
@@ -55039,7 +55725,7 @@
           sha256 = "1n8cn6mr26hgmsm2mkbj5gs6dv61d0pap8ija4g0n1vsibfhzd8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tinysegmenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tinysegmenter";
           sha256 = "005yy2f8vghvwdcwakz5sr9n1gzk6cfyglm6d8b74y90d8fng0r6";
           name = "tinysegmenter";
         };
@@ -55056,11 +55742,11 @@
         src = fetchFromGitHub {
           owner = "katspaugh";
           repo = "tj-mode";
-          rev = "8d60bcbe264275c76a2284fbc84ba80e0ac8e767";
-          sha256 = "1wr8m7yivz4z8rsiiqdlvdv3s2i0japvbpsz3x7nxr1y75fax2mz";
+          rev = "361f5b0baa90f9d0b3fd92a3d9d557a1224b4308";
+          sha256 = "1zvykanmn065rlk9hlv85vary1l6y52bsnaa51fkpckpr6dicmcl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tj-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tj-mode";
           sha256 = "1i7dvxgj00p4n2fh8irgdfsjl2dpvfjjnkkv0cw71441f79p79mf";
           name = "tj-mode";
         };
@@ -55073,15 +55759,15 @@
     tldr = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "tldr";
-        version = "20160203.1020";
+        version = "20160221.811";
         src = fetchFromGitHub {
           owner = "kuanyui";
           repo = "tldr.el";
-          rev = "56b0cefcbc0e81f94652f8e17b34b0dfadc8e7c4";
-          sha256 = "1qwd84fmgifs12xw02mlrpkyvmxa58c0xfk0zjsnxb7nldfmbbj7";
+          rev = "79e1e37214d5a8cce829eec3db43154fb78cf2ff";
+          sha256 = "1bkv3wm8nfn1pa6v9s79ckv7pn8g2fdd43vac4mfii94wmvz0zaj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tldr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tldr";
           sha256 = "1f1xsmkbf4j1c876qqr9h8fgx3zxjgdfzvzf6capxlx2svhxzvc9";
           name = "tldr";
         };
@@ -55100,7 +55786,7 @@
           sha256 = "0pq9x73hrp7qwhms7x3dvjfh9imapglba9yd7nkyw68mc0b9wlnl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tmmofl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tmmofl";
           sha256 = "1hqv2xqnhwnbj4sqcbdial4987yj1y3ry7niaaz2hh0f5qzrzwa8";
           name = "tmmofl";
         };
@@ -55121,7 +55807,7 @@
           sha256 = "0gzv45yxjy0bkdnx9kki0svmc7gxrdaarblvi1pyvl7id31ssw70";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/toc-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/toc-org";
           sha256 = "06mx2b0zjck82vp3i4bwbqlrzn05i2rkf8080cn34nkizi59wlbs";
           name = "toc-org";
         };
@@ -55139,7 +55825,7 @@
           sha256 = "0fhlyjl0a3fd25as185j6dmch0wsrf1zc59q29lhjximg9lk3hr5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/todochiku";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/todochiku";
           sha256 = "1iq08s5ji6hd8as80qxqkbavnjbx0kcmmjjvhjchmvv93vsn1f96";
           name = "todochiku";
         };
@@ -55160,7 +55846,7 @@
           sha256 = "0ms4mapjg9mbpmcmpn68r0mhwaibwfr4v25sin74b2281h4q7gal";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/todotxt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/todotxt";
           sha256 = "13jcbkasvcczf7qnrh89ncqp6az6hm1s0ycrv7msva145n5bk1kr";
           name = "todotxt";
         };
@@ -55181,7 +55867,7 @@
           sha256 = "1k9ywi7cdgb6i600wr04r2l00423l6vr7k93qa7i7svv856nbbc7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/todotxt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/todotxt-mode";
           sha256 = "1bs4air13ifx3xkhcfi80z29alsd63r436gnyvjyxlph2ip37v7k";
           name = "todotxt-mode";
         };
@@ -55202,7 +55888,7 @@
           sha256 = "1falf86mm2206szkkwiwa5yk65y12asv84j1pdbcy6n8y6hha796";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/togetherly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/togetherly";
           sha256 = "01ks160dfmgh05lx0lmyg020hba8nw49mj51dp1afcsmx4dkis2f";
           name = "togetherly";
         };
@@ -55223,7 +55909,7 @@
           sha256 = "109il2s5ynfam510yli4xmi5zgw7xhr5gv096li24idqdp0gpf9n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/toggle";
           sha256 = "08lk8h2dk5s8k93j5vmxdlgg453pif8wbcx2w3xkjlh43dw1vdfq";
           name = "toggle";
         };
@@ -55244,7 +55930,7 @@
           sha256 = "1w1lmqgzn9bp59h9y9plv80y53k6qhjgfmnnlqyyqfl45z3si7kg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/toggle-quotes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/toggle-quotes";
           sha256 = "16w453v4g7ww93bydim62p785x7w4vssp9l5liy0h3ppfmgvmxhp";
           name = "toggle-quotes";
         };
@@ -55265,7 +55951,7 @@
           sha256 = "0sgaslqxj806byidh06h5pqmqz8jzjfz9ky8jvkif3cq3a479jby";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/toggle-test";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/toggle-test";
           sha256 = "0n8m325jcjhz8g75ysb9whsd12gpxw8598y5065j7c7gxjzv45l1";
           name = "toggle-test";
         };
@@ -55286,7 +55972,7 @@
           sha256 = "0f86aij1glmvgpbhmfpi441zy0r37zblb0q3ycgq0dp92x8yny5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/toggle-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/toggle-window";
           sha256 = "1z080jywqj99xiwbvfclr6gjkc6spr3dqjb9kq1g4971vx4w8n9g";
           name = "toggle-window";
         };
@@ -55307,7 +55993,7 @@
           sha256 = "0a3zvhy3jxs88zk4nhdc7lzybz4qji9baw5gm88sxlgcjgn7ip6n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tomatinho";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tomatinho";
           sha256 = "1ad3kr73v75vjrc09mdvb7a3ws834k5y5xha3v0ldah38cl1pmjz";
           name = "tomatinho";
         };
@@ -55328,7 +56014,7 @@
           sha256 = "1b3bkla6i5nvanifxchph6ab6ldrskdf240hy4d27dkmmnr3pban";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/toml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/toml";
           sha256 = "0kqv6zkywa7kqh8kg1dzcgkbi91lwx335przdakndm1lfai38i9b";
           name = "toml";
         };
@@ -55349,7 +56035,7 @@
           sha256 = "1w9vkh6c4g80zykcy77k3r0bdc99mq8yh58bqkyd6gsr7pnp16gj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/toml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/toml-mode";
           sha256 = "0yghf2ixl3dkcaxnkr4qzxfa9k1rrac7w5qpw1jx2bvic0cfs40l";
           name = "toml-mode";
         };
@@ -55370,7 +56056,7 @@
           sha256 = "0pwbd5gzmpr6js20438870w605671930291070nhmhswvxfcdvay";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tommyh-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tommyh-theme";
           sha256 = "0nb9r407h08yxxdihxqx0c645bcz6qywbh2l654s3zfzdsqi1aj4";
           name = "tommyh-theme";
         };
@@ -55388,7 +56074,7 @@
           sha256 = "1sqflxj3hzxdlwn5qmpqm4dwik5vsyp7lypkvshcghdplxymb38a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tool-bar+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tool-bar+";
           sha256 = "07nsas600w5kxx7yzg52ax9avry8kq429mqlrs38jg5ycf3b1l6d";
           name = "tool-bar-plus";
         };
@@ -55406,7 +56092,7 @@
           sha256 = "0a5rl1cgznycqwx4r48mh69lgm8ixbnlfzbqdyvclgm8fldbannn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/top-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/top-mode";
           sha256 = "0hrjlbiz827v9yf4086wlghw64rhvvlsbzv8lzs6pprdwbpr9pdx";
           name = "top-mode";
         };
@@ -55427,7 +56113,7 @@
           sha256 = "0wv49gn1daylnjmnallpqsqy7630ynrp45agpiwi6kwyyqk1kdvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tornado-template-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tornado-template-mode";
           sha256 = "1sdv9rlhnabydws2sppsjcgqr0lg6bjapv753ksq5aaq21qsps0h";
           name = "tornado-template-mode";
         };
@@ -55448,7 +56134,7 @@
           sha256 = "188cdgic25wrb4jdgdcj070a0pxsh3m0rd9d2r6i1s1n1nalrs6g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/totd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/totd";
           sha256 = "1bp07xl9yh9x6bi6cn8wz11x90jhv1rhxaig540iydjn5b0ny9m0";
           name = "totd";
         };
@@ -55469,7 +56155,7 @@
           sha256 = "16217i8rjhgaa5kv8iq0s14b42v5rs8m2qlr60a0x6qzy65chq39";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tox";
           sha256 = "1z81x8fs5q6r19hpqphsilk8wdwwnfr8w78x5x298x74s9mcsywl";
           name = "tox";
         };
@@ -55489,7 +56175,7 @@
           sha256 = "0hfzbrw9ik3yxdwmgsm80k0n045z6az6pgvxc1nqcjmiwh80h9mk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/toxi-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/toxi-theme";
           sha256 = "032m3qbxfd0qp81qwayd5g9k7vz55g4yhw0d35qkxzf4qf58x9sd";
           name = "toxi-theme";
         };
@@ -55510,7 +56196,7 @@
           sha256 = "1yh9dxf986dl74sgn71qxwxsg67lr0yg1z7b9h2254lmxq0mgni6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/traad";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/traad";
           sha256 = "08gxh5c01xfbbj9g4992jah494rw3d3bbs8j79r3mpqxllkp2znf";
           name = "traad";
         };
@@ -55533,11 +56219,11 @@
         src = fetchFromGitHub {
           owner = "jorgenschaefer";
           repo = "circe";
-          rev = "35618a1e890dfff7bc3c879e4f0e23868d00bf85";
-          sha256 = "1qw8ax3a1v1053qh9i41ci93hc4034ghlcwq8hldr3amsz344fhj";
+          rev = "ca3e957f41e47afa05f73962c1ad72f401666384";
+          sha256 = "0gwkm8c9g501g80rvqlzmn24q4ylkb94bklsf173yiinqmz1jhkc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tracking";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tracking";
           sha256 = "096h5bl7jcwz5hpbm2139bf8a784hijfy40vzf42y1c9794al46z";
           name = "tracking";
         };
@@ -55558,7 +56244,7 @@
           sha256 = "1m25l1lyff4h0h4vjrcsziwbf8svqg2llvvgl8i2b4jbh7k7pk5f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tracwiki-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tracwiki-mode";
           sha256 = "1k983f0lj42rxr5szpq9l9harykfn8jr13y3y6fav86zzd1fb8j0";
           name = "tracwiki-mode";
         };
@@ -55579,7 +56265,7 @@
           sha256 = "057a3z42j4s0npl35p5rl6n767s2wq0a3c49wii3f1w8p40fh7qc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tramp-hdfs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tramp-hdfs";
           sha256 = "1l7s2z8yk3cbnffig9fds75jkjlkng76qglx5ankzva61dz1kf2b";
           name = "tramp-hdfs";
         };
@@ -55600,7 +56286,7 @@
           sha256 = "0cgx6h9a49qj7x6bgsnsa20hi1yj5k080x4x0jpn6l9bj5nqiaip";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tramp-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tramp-term";
           sha256 = "1vbdwj8q66j6h5ijqzxhyaqf8wf9rbs03x8ppfijxl5qd2bhc1dy";
           name = "tramp-term";
         };
@@ -55613,15 +56299,15 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "20160202.1601";
+        version = "20160215.2255";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "ee474457b249b0ec86cb3c222ae9368887bbf483";
-          sha256 = "1fqcqbs4pdbbn8ldn4rsc9akgd9sr8ckqkin2vr7dzhxm8ds5b9k";
+          rev = "1c6f3ca3f07d8364f7514e27f5808d97cf984854";
+          sha256 = "05cq0gbhfrd91fd625hq2qyk5dpjzc1jgph80slm7b6c45vdll4l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/transmission";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/transmission";
           sha256 = "0w0hlr4y4xpcrpvclqqqasggkgrwnzrdib51mhkh3f3mqyiw8gs9";
           name = "transmission";
         };
@@ -55639,7 +56325,7 @@
           sha256 = "1f67yksgw9s6j0033hmqzaxx2a93jm11sd5ys7cc3li5gfh680m4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/transpose-frame";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/transpose-frame";
           sha256 = "0bqip7vckic3kfq3d31ifs1zics1djxwj2jadafj6f1agv02sdz5";
           name = "transpose-frame";
         };
@@ -55660,7 +56346,7 @@
           sha256 = "03wc50vn1kmrgnzzhs06pwpap2p2rx84wwzxw0hawsg1f1l35m2x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/transpose-mark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/transpose-mark";
           sha256 = "1q1icp1szm1bxz9ywwyrfbsm1wmx0h4cvzywrh9q0fj1fq387qvv";
           name = "transpose-mark";
         };
@@ -55681,7 +56367,7 @@
           sha256 = "1jd7xsvs4m55fscp62a9lk59ip4sgifv4kazl55b7543nz1i31bz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/travis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/travis";
           sha256 = "1km496cq1vni9gy2d3z4c9524q62750ywz745rjz4r7178ip9mix";
           name = "travis";
         };
@@ -55699,7 +56385,7 @@
           sha256 = "0hffnzvzbvmzf23z9z7n7y53l5i7kza9hgfl39qqcnw4njg48llx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tree-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tree-mode";
           sha256 = "0xwyhlc5lagj46nd70l81rvb43hs08pic96grk62zknig8354c24";
           name = "tree-mode";
         };
@@ -55720,7 +56406,7 @@
           sha256 = "08484fhc69rk16g52f9bzc1kzpif61ddfchxjbj1qqqammbx11ym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/trident-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/trident-mode";
           sha256 = "0l81hs7bp46jlk41b9fk1lkvlp17fqc5hcz8k8kkal7rh7ari1fd";
           name = "trident-mode";
         };
@@ -55741,7 +56427,7 @@
           sha256 = "06wm3qwxjhzwjn9nnrqm5wwj1z5gfghg9d2qbg8w3zyqzva5dmvm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tronesque-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tronesque-theme";
           sha256 = "1bk73zawl1922aq739r3rz30flxd6nq87k8ahzbix139g7gxf19j";
           name = "tronesque-theme";
         };
@@ -55762,7 +56448,7 @@
           sha256 = "1mm6rrprsmx4hc622qmllm7c81yhwbqmdr0n6020krq92zmilmlm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/truthy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/truthy";
           sha256 = "1a56zmqars9fd03bkqzwpvgblq5fvq19n4jw04c4hpga92sq8wqg";
           name = "truthy";
         };
@@ -55783,7 +56469,7 @@
           sha256 = "1i2bw3d834ibk3aj16rcs8g81r7n5qa37g8k7lgpl255mfpyfzlq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/try";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/try";
           sha256 = "0dv0i77agva215bf1gj1x1k7f7g3pvccyyd7vslapf9z8brccn7n";
           name = "try";
         };
@@ -55804,7 +56490,7 @@
           sha256 = "1bk5v9dffs65qsay0dp336s2ly065nd0cg572zz058ikwxd44zd3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tss";
           sha256 = "0d16x5r2xfy6mrwy0mqzpr9b3inqmyyxgawrxlfh83j1xb903dhm";
           name = "tss";
         };
@@ -55825,7 +56511,7 @@
           sha256 = "1gvqxk67cf779szyg907815i4m9jzrpmn5cnsmnwd62k3r3z4nxm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tt-mode";
           sha256 = "02dzyycn5znbibbz50b243bh1kcccp8xwknjqwljk00gpf196vzf";
           name = "tt-mode";
         };
@@ -55846,7 +56532,7 @@
           sha256 = "0a8f9p1im6k7mnp2bq733rfx2x246gfwpvi5ccym1y5lakx37fil";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ttrss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ttrss";
           sha256 = "08921cssvwpq33w87v08dafi2rz2rl1b3bhbhijn4bwjqgxi9w7z";
           name = "ttrss";
         };
@@ -55867,7 +56553,7 @@
           sha256 = "0knp7nbzhzahkn97zs2aw0ly7x40cbh8m5xb4rk1ynw0n09zq3d0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tuareg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tuareg";
           sha256 = "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q";
           name = "tuareg";
         };
@@ -55888,7 +56574,7 @@
           sha256 = "1xdkgvr1pnlg3nrjmma4ra80ysr8xbslvczg7cq1x1mqw6gn9xq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tumble";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tumble";
           sha256 = "1c9ybq0mb2a0pw15fmm13vfwcnr2h9fb1xsm5nrff1cg7913pgv9";
           name = "tumble";
         };
@@ -55909,7 +56595,7 @@
           sha256 = "1g7y7czan7mcs5lwc5r6cllgksrj3b9lpn1bj7khwkd1ll391jc2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tumblesocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tumblesocks";
           sha256 = "11ky69icsnxwsinv2j3f4c0764wm6i9g9mlvwsdrd6w1lchq1dg9";
           name = "tumblesocks";
         };
@@ -55930,7 +56616,7 @@
           sha256 = "0y1b9zvwbw3vp41siyzj04bis939fgz3j27hc5ljjzy92kd39nzm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tup-mode";
           sha256 = "0pzpn1ljfcc2dl9fg7jc8lmjwz2baays4axjqk1qsbj0kqbc8j0l";
           name = "tup-mode";
         };
@@ -55951,7 +56637,7 @@
           sha256 = "0khl4q22x6vdn87xdqqg5f535d4dqpnfbhk6qhlh187p1w7qaiq4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/turnip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/turnip";
           sha256 = "1vfqv71j47fn53klz3jl8r8hscywd01kkl4w96a308sac3lhbrps";
           name = "turnip";
         };
@@ -55972,7 +56658,7 @@
           sha256 = "0wvmih2y3hy7casxx2y1w8csmzfnfgbb5ivpggr94sc86p6bg8sa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/twig-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/twig-mode";
           sha256 = "1m3xjgmkqg8aj536wcg2f2hf4y6whscbsh7z7448hl4b5qjwii4n";
           name = "twig-mode";
         };
@@ -55993,7 +56679,7 @@
           sha256 = "1bj2mpiklqcangjzbnz5wz7klsfvp0x397lidvf42awn7s2aax0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/twilight-anti-bright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/twilight-anti-bright-theme";
           sha256 = "1qfybk5akaxdahmjffqaw712v8d7kk4jqkj3hzp96kys2zv1r6f9";
           name = "twilight-anti-bright-theme";
         };
@@ -56014,7 +56700,7 @@
           sha256 = "1awqc4rvg8693myynb1d4y4dfdaxkd5blnixxs3mdv81l07zyn8c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/twilight-bright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/twilight-bright-theme";
           sha256 = "074cqs55gwy5jlaay3m9bpdpdfb45nmlijvapz96nibl64pyk83d";
           name = "twilight-bright-theme";
         };
@@ -56035,7 +56721,7 @@
           sha256 = "0d7vd1h0rwwgrh7f9kmdgy2ni0p20da9c8ylwlg33nsb26345wfs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/twilight-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/twilight-theme";
           sha256 = "1wkca66q4k94h9njsy15n83wjzn90rcbmv44x0hdwqj92yxjf3y7";
           name = "twilight-theme";
         };
@@ -56048,15 +56734,15 @@
     twittering-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "twittering-mode";
-        version = "20150906.1203";
+        version = "20160207.356";
         src = fetchFromGitHub {
           owner = "hayamiz";
           repo = "twittering-mode";
-          rev = "97197cdd3cc005000dc2599f67c754d74fab5972";
-          sha256 = "02c9z229ayqnmlvja5a2fz3vk8914v9v8akin57q8a0gyzn2bli5";
+          rev = "17c2c0dacea31c81b03d1f27bce6aa6f0d327cca";
+          sha256 = "0kg27nl9lg6zrx18glkwbgfxbclzw5fmvhldkkbs388ghp53mxar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/twittering-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/twittering-mode";
           sha256 = "0v9ijxw5jazh2hc0qab48y71za2l9ryff0mpkxhr3f79irlqy0a1";
           name = "twittering-mode";
         };
@@ -56077,7 +56763,7 @@
           sha256 = "1i826xq77nh4s7qlj63r2iznbn319l1l3fzpbjb2nj0m00bwvxl6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/typed-clojure-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/typed-clojure-mode";
           sha256 = "1579zkhk2lwl5ij7dm9n2drggs5fmhpljrshc4ghhvig7nlyqjy3";
           name = "typed-clojure-mode";
         };
@@ -56098,7 +56784,7 @@
           sha256 = "17q7f433x8i484scwdbfsd0vh8lshzkwjlarhqw6ic53mzakgjiq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/typescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/typescript-mode";
           sha256 = "01jyqy44ir59n9c2f6gh4xzwfmzdpnys1lw4lnsy6kirqgbsq9ha";
           name = "typescript-mode";
         };
@@ -56116,7 +56802,7 @@
           sha256 = "0mgvpdp3vlvjy32d163h2mzsf9j2ij2f542sdr3rsy8l80n6nx31";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/typing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/typing";
           sha256 = "0b72lbzji105wzvsi58l6pjc08qcwrm5ddf42irdxi956081pzp3";
           name = "typing";
         };
@@ -56137,7 +56823,7 @@
           sha256 = "0i5pipciwsl6cj3inxiz6ybkv5jglacjwhcyqdfzi4mrbic7g848";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/typing-game";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/typing-game";
           sha256 = "0k85j9bcqp0gbzdh44q5a9wlkv5mc0g0m42ziq1bzmp6993wkmy2";
           name = "typing-game";
         };
@@ -56158,7 +56844,7 @@
           sha256 = "0bn1bvs334wb64bli9h613zf1vzjyi0pz8bgyq1wy12qmbwwmfwk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/typo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/typo";
           sha256 = "07hmqrnbxbrhcbxdls8i4786lkqmfr3hv6va41xih1lxj0mk60bx";
           name = "typo";
         };
@@ -56179,7 +56865,7 @@
           sha256 = "1v8d1pc0vjc7wz0prr5w5vp2qb19f3gcyl6jx5130plajbvv23rc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ubuntu-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ubuntu-theme";
           sha256 = "160z59aaxb2v6c24nki6bn7pjm9r4jl1mgxs4h4sivzxkaw811s2";
           name = "ubuntu-theme";
         };
@@ -56197,7 +56883,7 @@
           sha256 = "0qy211rxrmzhwl9qfrcmfnwayysvb5rghjginbvx3wf2s6hrbpya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ucs-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ucs-cmds";
           sha256 = "1n0f0qf8w8ark78fs67aaxnqpk0km97hy59pnxwfyahgjl2qz6d1";
           name = "ucs-cmds";
         };
@@ -56218,7 +56904,7 @@
           sha256 = "0qw9vwl1p0pjw1xmshxar1a8kn6gmin5rdvvnnly8b5z9hpkjf3m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ucs-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ucs-utils";
           sha256 = "111fwg2cqqzpa79rcqxidppb12c8g12zszppph2ydfvkgkryb6z2";
           name = "ucs-utils";
         };
@@ -56239,7 +56925,7 @@
           sha256 = "19qvn1vzal5k86pqn6a4ins869qmp2i586qqbl97z84szn8mn7j3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/uimage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/uimage";
           sha256 = "0i6qpk6v4pmpk3zswygdy0dd7rxy8kl7qn8a1xanpi4aqg7wlbmd";
           name = "uimage";
         };
@@ -56260,7 +56946,7 @@
           sha256 = "0cryprvns1qdnp2qif2g187lj15810w472m7nwrfiwgvqv4v3p1l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ujelly-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ujelly-theme";
           sha256 = "0b7zgmpsdn5p3jx4kif7phxz8pb85snmmfr3yz98xf6p7h6w60gw";
           name = "ujelly-theme";
         };
@@ -56281,7 +56967,7 @@
           sha256 = "033v4ck979lhkpwblci5clacfc1xnkq03p5d1m566wff8dp5flwz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ukrainian-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ukrainian-holidays";
           sha256 = "0kbfj2l1rcv74c88nabkwkcl7k9pkim835l24q61zv3i6wf9sykf";
           name = "ukrainian-holidays";
         };
@@ -56299,7 +56985,7 @@
           sha256 = "0i5km1naxprd4lj20097ph50mjs2364xwxcdw0j3g5569mk5nc06";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unbound";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unbound";
           sha256 = "1ys6pgb3lhx4ihhv8i28vrchp1ad37md7lnana40macf5n72d77x";
           name = "unbound";
         };
@@ -56320,7 +57006,7 @@
           sha256 = "0366h4jfi0c7yda9wcrz4zxgf2qqdd08b8z2dr8c1rkvkdd67iam";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/uncrustify-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/uncrustify-mode";
           sha256 = "0amdxdfc8i99zjrw4iqmxzb47h0airs60fwmc32bc8b0ds66c3kd";
           name = "uncrustify-mode";
         };
@@ -56333,15 +57019,15 @@
     undercover = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, shut-up }:
     melpaBuild {
         pname = "undercover";
-        version = "20150817.1210";
+        version = "20160221.304";
         src = fetchFromGitHub {
           owner = "sviridov";
           repo = "undercover.el";
-          rev = "7b38281c21a0ed9f7260d58aca6b4b2471672cfd";
-          sha256 = "1qm6fzgmrdzhkajd60l4l890dlbxll96x41kx36wm97h4gz7aiyw";
+          rev = "e72b8c924272f65d7cc6e884478e26d0b1e1e4e8";
+          sha256 = "06qcvbp5rd0kh3ibrxj5p6r578lwsrgd7yj5c6slwmkdmna2fj33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/undercover";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/undercover";
           sha256 = "1s30c3i6y4r3mgrrs3lda3rrwmy9ff11ihdmshyziv9v5879sdjf";
           name = "undercover";
         };
@@ -56362,7 +57048,7 @@
           sha256 = "1ypxpv5vw2ls757iwrq3zld6k0s29q3kg3spcsl5ks4aqpnkxpva";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/underwater-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/underwater-theme";
           sha256 = "0ab2bcqfdi9ml3z9d511pbfwcbp8hkkd36xxp61k36gkyi3acvlr";
           name = "underwater-theme";
         };
@@ -56382,7 +57068,7 @@
           sha256 = "1ef5db7cf476dd37348fd1f11dd199613a89a2351dc583a42afd9d35a53d8ae2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/undo-tree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/undo-tree";
           sha256 = "0vrjxprpk854989wcp4wjb07jhhxqi25p6c758gz264z3xa8g9cr";
           name = "undo-tree";
         };
@@ -56403,7 +57089,7 @@
           sha256 = "1c0daw246ky7b1x5b8h55x79pl1pjqk1k348l487bdd8zdj4w9wx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/undohist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/undohist";
           sha256 = "0zzfzh8sf2dkz8h3kidv7zmwz2c2qq9n9qz2mab2lk0y44njzwhn";
           name = "undohist";
         };
@@ -56424,7 +57110,7 @@
           sha256 = "0fd9k5m1yw2274m2w9rkrg7vqagzf0rjbybglqi7d200b3hmjin3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unfill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unfill";
           sha256 = "0b21dk45vbz4vqdbdx0n6wx30rm38w1jjqbsxfj7b96p3i5shwqv";
           name = "unfill";
         };
@@ -56445,7 +57131,7 @@
           sha256 = "015gjf8chd6h9azhyarmskk41cm0cmg981jif7q81hakl9av6rhh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-emoticons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unicode-emoticons";
           sha256 = "15s6qjhrrqrhm87vmvd6akdclzba19613im85kfkhc24p6nxyhbn";
           name = "unicode-emoticons";
         };
@@ -56466,7 +57152,7 @@
           sha256 = "0936dqxyp72if9wvn2dcci670yp1gqrmpnll9xq00skp85yq9zs5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-enbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unicode-enbox";
           sha256 = "1phb2qq3pg6z6bl96kl9yfq4jxhgardjpaa4lhgqbxymmqdm7gzv";
           name = "unicode-enbox";
         };
@@ -56493,7 +57179,7 @@
           sha256 = "0fbwncna6gxlynq9196djpkjhayzk8kxlsxg0gasdgqx1nyxl0mk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-fonts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unicode-fonts";
           sha256 = "0plipwb30qqay8691qzqdyg6smpbs9dsxxi49psb8sq0xnxl84q3";
           name = "unicode-fonts";
         };
@@ -56519,7 +57205,7 @@
           sha256 = "0kzcg1wxi1z424jdn7pibk9zyfyi85kligav08sl1c2hdldzya4l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-input";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unicode-input";
           sha256 = "17sf3xnl8yyx4ln4mrjlrvfinb8dvabh81l3qyr9pkn5skpgqgj8";
           name = "unicode-input";
         };
@@ -56540,7 +57226,7 @@
           sha256 = "16jgm70ldsngxldiagjkw3ragypalpiidnf82g5hss9ciybkd3j4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-progress-reporter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unicode-progress-reporter";
           sha256 = "03z7p27470fqy3gd356l9cpp44a35sfrxz94dxmx388rzlygk7y7";
           name = "unicode-progress-reporter";
         };
@@ -56561,7 +57247,7 @@
           sha256 = "0ny260mr1h810fvqsfj2hpd3zql4g309m60qj4vk6kmd83p5b60f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-troll-stopper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unicode-troll-stopper";
           sha256 = "0a10lq0xsfyp052iw4xjbhsdkbyg25x2gk68gys4k7p6l92la0k5";
           name = "unicode-troll-stopper";
         };
@@ -56582,7 +57268,7 @@
           sha256 = "1ayb15nd5vqr0xaghrnp55kqw7bblrjipmfrag6bqpn7jk9bvbdz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-whitespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unicode-whitespace";
           sha256 = "1b3jgha8va42b89pdp41sab2w9wllp7dicqg4lxl67bg6wn147wy";
           name = "unicode-whitespace";
         };
@@ -56603,7 +57289,7 @@
           sha256 = "1jvr1k8zd40m1rvwmxzidz1dvr4j8cbh78nqgc3vfb410fj619gw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unidecode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unidecode";
           sha256 = "0h058mvb6x53zywpwg85dzhaynlgq577yyqhrn5qqyqjg1n8lhc1";
           name = "unidecode";
         };
@@ -56624,7 +57310,7 @@
           sha256 = "1vbx10s2zmhpxjg26ik947bcg9f7w3g2w45wmm0shjp743fsdq8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unify-opening";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unify-opening";
           sha256 = "1gpmklbdbmv8va8d3yr94r1ydkcyvdzcgxv56rp0bxwbcgmk0as8";
           name = "unify-opening";
         };
@@ -56645,7 +57331,7 @@
           sha256 = "1wl9rzys1zr2c41h5i57y6hxsavix1b26f453l2izmb6r0b1dvh0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unipoint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unipoint";
           sha256 = "1nym2wlr50wk62cbagq1qyjczzf56nb6i9dfzcwikdck8p4p2dr7";
           name = "unipoint";
         };
@@ -56666,7 +57352,7 @@
           sha256 = "0l8h084xkbjvx2vbg67hxmg4hb9175k858z3k3c93d2b6x2kh7ni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unison-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unison-mode";
           sha256 = "03kyr1h5pm51vn4bykj13rm4ybln266rpnxh65y2ygw8f8md88gl";
           name = "unison-mode";
         };
@@ -56687,7 +57373,7 @@
           sha256 = "0xpaifmrvq5bbzpjhbzbxaac8kymmvqgg7lb2q1s7b5qf47fhqac";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unkillable-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unkillable-scratch";
           sha256 = "0ghbpa9pf7k6vd2mjxkpqg2qfl4sd40ir6mrk1rxr1rv8s0afkf7";
           name = "unkillable-scratch";
         };
@@ -56708,7 +57394,7 @@
           sha256 = "118c23dsfgkhwhv65dx3wbg2dn7qyrd80d78cykl732c68d6wvi0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/url-shortener";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/url-shortener";
           sha256 = "12r01dyk55bs01jk0ab9f24lfvm63h8kvix223pii5y9890dr6ys";
           name = "url-shortener";
         };
@@ -56729,7 +57415,7 @@
           sha256 = "0xwr0v4f64d7hi5ldig4r5yjn8h3f8by49g5820187lsp7ng2nw4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/urlenc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/urlenc";
           sha256 = "0n6shh95m11162zsnf62zy1ljswdjznjilxx2dbqyqdrn7qr2dgh";
           name = "urlenc";
         };
@@ -56747,7 +57433,7 @@
           sha256 = "00g1zj5fjykdi6gh2wkswpwx132xa6jmwfnrgfg5r96zwb8pib4i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/usage-memo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/usage-memo";
           sha256 = "05n50adjnavl7ag24wfjwlnbv5x55qlhmplgsm8j57gjig01nd95";
           name = "usage-memo";
         };
@@ -56760,15 +57446,15 @@
     use-package = callPackage ({ bind-key, diminish, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "use-package";
-        version = "20160204.1300";
+        version = "20160209.1833";
         src = fetchFromGitHub {
           owner = "jwiegley";
           repo = "use-package";
-          rev = "a29e0328c0076cc927e5fd3d8db1878c0f978ace";
-          sha256 = "0s4qmqgym12gk8kiz90ck5yi7icz8dydyks0psfam1nza89cbfys";
+          rev = "6b1956813f0f0e553a7eb6923ff846f9c3556146";
+          sha256 = "13yzxlxkykv3qkaaifn3pf0y94dgqysxz5p7vh71jpqxi6d7jmgr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/use-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/use-package";
           sha256 = "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8";
           name = "use-package";
         };
@@ -56789,7 +57475,7 @@
           sha256 = "05lhxbrgwbyz0nkb19yln9a46jh91ic685943hd58cn91lxsw3al";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/use-package-chords";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/use-package-chords";
           sha256 = "18av8gkz3nzyqigyd88ajvylsz2nswsfywxrk2w8d0ykc3p37ass";
           name = "use-package-chords";
         };
@@ -56806,11 +57492,11 @@
         src = fetchFromGitHub {
           owner = "diml";
           repo = "utop";
-          rev = "fd7c663264c29438249d7f6cdad9494f57086e69";
-          sha256 = "1kf8aa4m8622nm52n6nrsa7zhlnfwi9ldvpj9fjvypbm07ai6i03";
+          rev = "2f48c9f512c36e195dfe26c57ff3373fc6463507";
+          sha256 = "1fzs9y0k1cl6jda0vhra1v20cmdf9z8cp6yha6iv7f2d1l2srggd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/utop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/utop";
           sha256 = "0lv16kl29gc9hdcpn04l85pf7x93vkl41s4mgqp678cllzyr0cq7";
           name = "utop";
         };
@@ -56831,7 +57517,7 @@
           sha256 = "0r74gw8gcbrr62rvj4anz0c3n6kwi1xpb42d3pkzlh4igblhi5zj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/uuid";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/uuid";
           sha256 = "13xjnawir9i83j2abxxkl12gz3wapgbk56cps3qyfgql02bfk2rw";
           name = "uuid";
         };
@@ -56852,7 +57538,7 @@
           sha256 = "19bf6vpc2b9hfjkjanji96fflvk1lbillasnpwcb6zzyq0cs47bw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/uuidgen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/uuidgen";
           sha256 = "1qaz7hg0wsdkl0jb7v7vrkjs554i2zgpxl8xq2f8q7m4bs2m5k48";
           name = "uuidgen";
         };
@@ -56873,7 +57559,7 @@
           sha256 = "0fx18m688wfflbzwv8h3051439fwql69v1ip5q6xn958rdq4pi3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/uzumaki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/uzumaki";
           sha256 = "1fvhzz2qpyc819rjvzyf42jmb70hlg7a9ybqwi81w7rydpabg61q";
           name = "uzumaki";
         };
@@ -56894,7 +57580,7 @@
           sha256 = "04r73s3fhvdcryv0l57awkpg1hi3kg6zcqxbxb03jc89h0f9vdlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vagrant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vagrant";
           sha256 = "0g6sqzsx3lixcn09fkxhhcfp45qnqgf1ms0l7nkzyljavb7151cf";
           name = "vagrant";
         };
@@ -56915,7 +57601,7 @@
           sha256 = "1xslw0whxmqsd79jwxgz1k7h55shffq3985im96pdzf4iivkr3ln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vagrant-tramp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vagrant-tramp";
           sha256 = "0ij7k27zj22sl7inx141l4dg0ymywnvyabjvaqzc0xjdj0cky5c5";
           name = "vagrant-tramp";
         };
@@ -56936,7 +57622,7 @@
           sha256 = "10vs4d8csww781j1ps3f6dczy5zzza36z7a8zqk40fg4x57ikw44";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vala-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vala-mode";
           sha256 = "164dhlsiflhpdymk3q5x0bv8gpbwfp34lnkhm2x90kdakfzqf91p";
           name = "vala-mode";
         };
@@ -56957,7 +57643,7 @@
           sha256 = "0iscaz8lm4fk6w13f68ysqk8ppng2wj9fkkkq1rfqz77ws66f8nq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vala-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vala-snippets";
           sha256 = "14hmmic0px3z38dm2dg0kis6cz1p3p1hj7xaqnqjmv02dkx2mmcy";
           name = "vala-snippets";
         };
@@ -56978,7 +57664,7 @@
           sha256 = "19j5q2f6pybvjq3ryjcyihzlw348hqyjhfcy3qflry6w786dqcgn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vbasense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vbasense";
           sha256 = "1440q2bi4arpl5lbqh7zscg7v3884clqx54p2fdfcfkz47ky4z9n";
           name = "vbasense";
         };
@@ -56999,7 +57685,7 @@
           sha256 = "09h7yg44hbxv3pyazfypkvk8j3drlwz0zn8x1wj0kbsviksl1wxk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vc-auto-commit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vc-auto-commit";
           sha256 = "1xpp7vbld3jgcr249m5h7il919kfg7d5ap3zs64i27axzdhv26zk";
           name = "vc-auto-commit";
         };
@@ -57020,7 +57706,7 @@
           sha256 = "0icc4kqfpimxlja4jgcy9gjj4myc8y84vbvacyf79lxixygpaxi1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vc-check-status";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vc-check-status";
           sha256 = "1kwnxa0ndfj8b211xy5d47sxkwmsay0kk8q7azfm5ag5dkg56zgi";
           name = "vc-check-status";
         };
@@ -57030,6 +57716,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    vc-darcs = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "vc-darcs";
+        version = "20151225.1428";
+        src = fetchFromGitHub {
+          owner = "velkyel";
+          repo = "vc-darcs";
+          rev = "f9b4cd89ed7eff91009ce27d9e1d2fb555a5efff";
+          sha256 = "1zpvinbc3nrnjm931fgzrlkl31xcsg9ikh041s1fkfjkhfq0h82h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vc-darcs";
+          sha256 = "1xskl9wjxkbdpi0fm769ymbvya70vssi944x5252w2d3layibm6m";
+          name = "vc-darcs";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/vc-darcs";
+          license = lib.licenses.free;
+        };
+      }) {};
     vc-osc = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "vc-osc";
@@ -57041,7 +57748,7 @@
           sha256 = "0whzfzg0m03wbmqsxml8hislnbfvawcniq83hj66lbrnbivxsqj4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vc-osc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vc-osc";
           sha256 = "0rp33945xk5d986brganqnn55psmlkj6glbimxakhgv9a1r85sxz";
           name = "vc-osc";
         };
@@ -57062,7 +57769,7 @@
           sha256 = "1jfis26lmghl30ydzq1xdkrrj3d85q7g44ns6kmfg119ccapllbj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vcl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vcl-mode";
           sha256 = "1h0a1briinp9ka7ga3ipdhyf7yfinwvf7babv36myi720900wcq5";
           name = "vcl-mode";
         };
@@ -57083,7 +57790,7 @@
           sha256 = "0fzz26c1pdaz3i58ndhzd2520mhny487daqs21yajxi9x2m00zrl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vcomp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vcomp";
           sha256 = "02cj2nlyxvgvl2rjfgacljvcsnfm9crmmkhcm2pznj9xw10y8pq0";
           name = "vcomp";
         };
@@ -57104,7 +57811,7 @@
           sha256 = "1lh8nv0ayl9ipl2aqc8npzz84g5q7w6v60l14v61mmk34fc23lnc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vdirel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vdirel";
           sha256 = "11cc7bw7x5h3bwnlsjyhw6k5fh2fk7wffarrcny562v4cmr013cj";
           name = "vdirel";
         };
@@ -57125,7 +57832,7 @@
           sha256 = "1wa03gb98x650q798aqshm43kh6gfxaz1rlyrmvka5dxgf48whmf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vector-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vector-utils";
           sha256 = "07armr23pq5pd47lqhir6a59r86c84zikbc51d8vfcaw8y71yr5n";
           name = "vector-utils";
         };
@@ -57146,7 +57853,7 @@
           sha256 = "0vlkg77a0h5z36f370phl2xdzykz9h9in3vng68zn1pfhx2allyx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/verify-url";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/verify-url";
           sha256 = "1gd83rb1q0kywchd0345p5axqj1sv4f5kadympx5pbp4n5p1dqb2";
           name = "verify-url";
         };
@@ -57167,7 +57874,7 @@
           sha256 = "1mp71axs3vdrdwlhgywfldvnr6a1g2qbxiywmpfmcv59n5n58p1j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vertica";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vertica";
           sha256 = "1ljjk6zrbr2k0s0iaqd9iq3j45cavijcx0rqdidliswnfllav4ng";
           name = "vertica";
         };
@@ -57188,7 +57895,7 @@
           sha256 = "0v884gbqq5vrx5gwg9dqn97kaqgnzhrqv8kam8dy9g7hx4fm6b2l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vertigo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vertigo";
           sha256 = "0x0wy1z601sk1x96bl2xx18qm4avd77iybq1a3ss8x8ykwqlgf83";
           name = "vertigo";
         };
@@ -57209,7 +57916,7 @@
           sha256 = "0ba22j368w6jac94hwmy27bhm3h1r7kpiwdzy8ggfxfzwn0sd4dy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vhdl-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vhdl-tools";
           sha256 = "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw";
           name = "vhdl-tools";
         };
@@ -57230,7 +57937,7 @@
           sha256 = "0wdm8k49zl6i6wnh7vjkswdh5m9lix56jv37xvc90inipwgs402z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vi-tilde-fringe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vi-tilde-fringe";
           sha256 = "0jhwv46gjwjbs1ai65nm6k15y0q4yl9m5mawgp3n4f45dh02cawp";
           name = "vi-tilde-fringe";
         };
@@ -57248,7 +57955,7 @@
           sha256 = "0lns0ic3zjz1km02674d9hxgnp6wlhk168wyr6h4vhpr8a71x9mb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/viewer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/viewer";
           sha256 = "0aqwkymq5f0qfgs1hmcg1jb1rd0vcnlqwiyjrjjkfff2xlbpagqf";
           name = "viewer";
         };
@@ -57265,11 +57972,11 @@
         src = fetchFromGitHub {
           owner = "jmickelin";
           repo = "vim-empty-lines-mode";
-          rev = "442a29b0ba1635a3b352c9dd1faf9ce99656d048";
-          sha256 = "09x857vbx35rpyc5x1322ajby613gva090x4vawaczk22idq65h4";
+          rev = "d4a5034ca8ea0c962ad6e92c86c0fa2a74d2964b";
+          sha256 = "11qh6fpf6269j9syf06v5wnkgi65wnn7dbyjwb6yz72rvq7ihhcz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vim-empty-lines-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vim-empty-lines-mode";
           sha256 = "17bl1g4ais73ws596mha0l8dgckfqhx9k2v9m9k0gw7kg7dcjhnb";
           name = "vim-empty-lines-mode";
         };
@@ -57290,7 +57997,7 @@
           sha256 = "13g2hin100c8h5bd7hzhyqzj02ab9c35giyv963l7y044v7sbwig";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vim-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vim-region";
           sha256 = "1dcnx799lpjsdnnjxqzgskkfj2nx7f4kwf0xjhbg35ny4nyn81dx";
           name = "vim-region";
         };
@@ -57311,7 +58018,7 @@
           sha256 = "1i407ilhmk2qrk66ygbvizq964bdk502x7lvrzs4wxwfr5y8ciyj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vimgolf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vimgolf";
           sha256 = "1hvw2pfa5a984hm6wd33bf6zz6hmlprc6qs3g789dfx91qm890vn";
           name = "vimgolf";
         };
@@ -57332,7 +58039,7 @@
           sha256 = "0rl9pcw1dcqpivmcrwpbsd11ym643zccp4sh5k11rmal77gb36sl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vimish-fold";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vimish-fold";
           sha256 = "017by9w53d8pqlsazfycmhdv16yylks308p5vxp1rcw2qacpc5m3";
           name = "vimish-fold";
         };
@@ -57353,7 +58060,7 @@
           sha256 = "000fs2h5zcv8aq8an16r6zwwf9x1qnfs7xxn39iahiwfzvnljqp0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vimrc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vimrc-mode";
           sha256 = "06hisgsn0czvzbq8m4dz86h4q75j54a0gxkg5shnr8s654d450bp";
           name = "vimrc-mode";
         };
@@ -57374,7 +58081,7 @@
           sha256 = "0rd7hyv66278dj32yva5q9z1749y84c6fwl2iqrns512j1l4kl8q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/virtualenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/virtualenv";
           sha256 = "1djqzzlbwsp9xyjqjbjwdck73wzikbpq19irzamybk90nc98wirl";
           name = "virtualenv";
         };
@@ -57391,11 +58098,11 @@
         src = fetchFromGitHub {
           owner = "porterjamesj";
           repo = "virtualenvwrapper.el";
-          rev = "f95094dc7a6e6c0aa6f80fd897dbf380382f35f2";
-          sha256 = "1a0x4dsyavqcl7xibn3g90fxvh1fnb6k0mpjm5mjvzc168p939kc";
+          rev = "e6b78e56c204ba6aea17c934e0a0a86b14bac832";
+          sha256 = "0gywi1irsmgrhxb76k5nnycb66l6xpkql195w4h90x1q4lx34dk1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/virtualenvwrapper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/virtualenvwrapper";
           sha256 = "0rn5vwncx8z69xp8hspr06nzkf28l9flchpb2936c2nalmhx6m8i";
           name = "virtualenvwrapper";
         };
@@ -57416,7 +58123,7 @@
           sha256 = "15zdbvv6c114mv6hdq375l7ax70sss06p9d7m86hgssc3kiv9vsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/visible-mark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/visible-mark";
           sha256 = "1rp0gnz28m1drwb1hhsf0mwxzdppdi88hscf788qw8cw65gckv80";
           name = "visible-mark";
         };
@@ -57437,7 +58144,7 @@
           sha256 = "1cv8mf3l92a9p8qmkfiphk3r81f2ihg2gyw2r4jbbd5ppwbxkl0n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/visual-ascii-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/visual-ascii-mode";
           sha256 = "1h0143h39dq61afswlzlgpknk0gv574x91ar6klqmnaf1snab59g";
           name = "visual-ascii-mode";
         };
@@ -57458,7 +58165,7 @@
           sha256 = "126qm63ik1n1agvcp4mgk1gr7dnnyjif8zbw0l336q74d5cy6h6w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/visual-fill-column";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/visual-fill-column";
           sha256 = "19y0pwaybjal2rc7migdbnafpi4dfbxvrzgfqr8dlvd9q68v08y5";
           name = "visual-fill-column";
         };
@@ -57479,7 +58186,7 @@
           sha256 = "04wds01yzhia508852gm18rp7dkg0838j0w8cr1l1qmc8p0jjsz9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/visual-regexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/visual-regexp";
           sha256 = "16bdqq2j7pnjq3j6qa4rhxzidqdhyg80c7nazd93smis8rcv5d0z";
           name = "visual-regexp";
         };
@@ -57500,7 +58207,7 @@
           sha256 = "03jggsnz5j0c36inxqa16vrdwlzn3wrniyl2i9b8c5bx7az7210m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/visual-regexp-steroids";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/visual-regexp-steroids";
           sha256 = "1xkrzyyll8wmb67m75lfm9k8qcm068km8r1k8hcsadpkd01bx1lr";
           name = "visual-regexp-steroids";
         };
@@ -57521,7 +58228,7 @@
           sha256 = "0hb845pnh2yska6alca8hbbxh65x7g81pr7852h8fddm0qd1agkd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vkill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vkill";
           sha256 = "09siqsip6d2h3jrxbdbhylkqm42dx3d2dqlkkdw3a81c7ga9lpwm";
           name = "vkill";
         };
@@ -57542,7 +58249,7 @@
           sha256 = "0vl0hwxzzvgna8sysf517qq08fi1zsff3dmcgwvsgzhc47sq8mng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vlf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vlf";
           sha256 = "1ipkv5kmda0l39xwbf7ns9p0mx3kb781mxsm9vmbkhr5x577s2j8";
           name = "vlf";
         };
@@ -57560,7 +58267,7 @@
           sha256 = "1ys6928fgk8mswa4gv10cxggir8acck27g78cw1z3pdz5gakbgnj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vline";
           sha256 = "0p59xhyrv7fmcn3qi51sp8v9v2y71ray2s756zbhzgzg63h3nbjp";
           name = "vline";
         };
@@ -57581,7 +58288,7 @@
           sha256 = "183pvfp5nnqpgdmfxm84qrnid0lijgk79l5lhwzmnznzkrb7bgxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/voca-builder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/voca-builder";
           sha256 = "0mbw87mpbb8rw7xzhmg6yjla2c80x9820kw4q00x00ny5rbhm76y";
           name = "voca-builder";
         };
@@ -57594,15 +58301,15 @@
     volatile-highlights = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "volatile-highlights";
-        version = "20141005.40";
+        version = "20160221.412";
         src = fetchFromGitHub {
           owner = "k-talo";
           repo = "volatile-highlights.el";
-          rev = "fb2abc2d4d4051a9a6b7c8de2fe7564161f01f24";
-          sha256 = "1v0chqj5jir4685jd8ahw86g9zdmi6xd05wmzhyw20rbk924fcqf";
+          rev = "a5dccb026232733f72c98ce394d836b2e5cd42ac";
+          sha256 = "1yrpqlpxnw7jckhhc18i058vcpi12y687181h0azcwb0wq9p2c26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/volatile-highlights";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/volatile-highlights";
           sha256 = "1r6in919aqdziv6bgzp4k7jqa87bd287pacq615sd5m1nzva1a4d";
           name = "volatile-highlights";
         };
@@ -57623,7 +58330,7 @@
           sha256 = "0ymibjq6iwab5ia1fglhz4gm5cnbi792018fmrabcqkisj2zsjb7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/volume";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/volume";
           sha256 = "1r01v453bpyh561j8ja36609hy60gc30arvmz4z3c1cybhv8sk1i";
           name = "volume";
         };
@@ -57641,7 +58348,7 @@
           sha256 = "0vb5ss30mz0kqq8cscjckw647vqn6xprp2sfjcbpg2fx59z4agma";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/w32-browser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/w32-browser";
           sha256 = "14vc2cipwlwwc0b5ld4x0zvydkg8nbjmp0z2x6ca0nmxw8sfsnc6";
           name = "w32-browser";
         };
@@ -57660,7 +58367,7 @@
           sha256 = "0nyara81bnd0rvgyljqrrbvjvndkngdc7qzf6scl5iz3vlglfgy7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/w32browser-dlgopen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/w32browser-dlgopen";
           sha256 = "0dnvsnahnbnvjlhfmb0q6agzikv9d42fbnfrwsz6hni92937gz39";
           name = "w32browser-dlgopen";
         };
@@ -57681,7 +58388,7 @@
           sha256 = "1lgvdaghzj1fzh8p6ans0f62zg1bfp086icbsqmyvbgpgcxia9cs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/w3m";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/w3m";
           sha256 = "0vh882b44vxnij3l01sig87c1jmbymgirf6s98mvag1p9rm8agxw";
           name = "w3m";
         };
@@ -57702,7 +58409,7 @@
           sha256 = "0nvlni3iy2sq76z8d4kj5492m0w7qv96shjqkynvlj0avf528hv4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wacspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wacspace";
           sha256 = "1xy0mprvyi37zmgj1yrlh5ni08j47lpag1jm3a76cgghgmlfjxrl";
           name = "wacspace";
         };
@@ -57723,7 +58430,7 @@
           sha256 = "0w59ix8cbbcyhh882c8vkrbh84i8d03h9w7dchr3qy233b8wcxlc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/waher-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/waher-theme";
           sha256 = "091kipkb6z6x9ic4chprim9rvnmx4yj4419ijmvpn70w69aspnb5";
           name = "waher-theme";
         };
@@ -57744,7 +58451,7 @@
           sha256 = "1bcdvk5bg5yi0qq0wd3w9wl38s0brrafz52bzsracj3wffswjg1n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wakatime-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wakatime-mode";
           sha256 = "1rhy2bwkqlha4bj3zmb0iassiglch7yb2kbas0bbpl3d0hdki2i8";
           name = "wakatime-mode";
         };
@@ -57765,7 +58472,7 @@
           sha256 = "09gqsssc2sk0vwfg0h4zxq9a779sdjdgvxsw7p6n2k0g4wk0phri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wand";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wand";
           sha256 = "052zq5dp800hynd9fb6c645kjb9rp3bpkz41ifazjnx4h4864r0l";
           name = "wand";
         };
@@ -57786,7 +58493,7 @@
           sha256 = "114f7sqwq6whbdsidg6wlzjayy6dla06h7fmg1gjkhkbdqq4h94d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wandbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wandbox";
           sha256 = "0myyln82nx462bj79acvqxwvmblxild4vbygcrzw5chcwy6crvlz";
           name = "wandbox";
         };
@@ -57799,15 +58506,15 @@
     wanderlust = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, semi }:
     melpaBuild {
         pname = "wanderlust";
-        version = "20160116.733";
+        version = "20160129.1736";
         src = fetchFromGitHub {
           owner = "wanderlust";
           repo = "wanderlust";
-          rev = "5dba92992d54ae5403b19b7143ab3f7770cacec8";
-          sha256 = "0q1a2ihrz7g08sqv55dx9ki3qb75rrg2dnzdy7kyv60cdz4gcz33";
+          rev = "154d38e6a7d2355483087f6ddd2ce075a6cfe3a1";
+          sha256 = "0pa7657zzd0hpf9wsrmvh396nyfp8458s6gh4852ajiyj5pfpvdp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wanderlust";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wanderlust";
           sha256 = "0lq7fvqc0isv49lcm7ql6prc3hpcj5cx4kf8f4gcnfv5k8159cq9";
           name = "wanderlust";
         };
@@ -57828,7 +58535,7 @@
           sha256 = "1x472s5qr6wvla7nj5i9mas8z9qhkj4zj5qghfwn5chb9igvfkif";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/warm-night-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/warm-night-theme";
           sha256 = "1nrjkrr64rry6fjya22b0lcs0f8a2ijvr87192z311y9mw5rvb29";
           name = "warm-night-theme";
         };
@@ -57849,7 +58556,7 @@
           sha256 = "0i84ndnxma8s07kf5ixqyhv5f89mzc4iymgazj5inmxhvbc7s7r2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/watch-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/watch-buffer";
           sha256 = "18sxgihmqmkrbgs66qgnrsjqbp90l93531hns31fbnif10bkx2j5";
           name = "watch-buffer";
         };
@@ -57870,7 +58577,7 @@
           sha256 = "0zw8z2r82986likz0b0zy37bywicrvz9dizzw9p52gs1lx0is1fy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wavefront-obj-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wavefront-obj-mode";
           sha256 = "0qqismh6g2fvi45q2q52lq0n9nrh95wgamlsy5j4rx4syfgzxbrk";
           name = "wavefront-obj-mode";
         };
@@ -57891,7 +58598,7 @@
           sha256 = "0p7j4hvcxfyjf0na9s3xv29dvmwq82s56lincfasd0ydcpz4fbwc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wc-goal-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wc-goal-mode";
           sha256 = "0l3gh96njjldp7n13jn1zjrp17h7ivjak102j6wwspgg6v2h5419";
           name = "wc-goal-mode";
         };
@@ -57909,7 +58616,7 @@
           sha256 = "15wz0c0rsn02zl6yr8mpwzy2hvp2146krhdbjpq63l75w4i98w4d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wc-mode";
           sha256 = "0n9hc22rp18dxx33l2l1xla78m5zjybgh3mmsp91fbdiq92b446s";
           name = "wc-mode";
         };
@@ -57922,15 +58629,15 @@
     wcheck-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wcheck-mode";
-        version = "20160130.1221";
+        version = "20160208.1336";
         src = fetchFromGitHub {
           owner = "tlikonen";
           repo = "wcheck-mode";
-          rev = "adb9dd9f39cb0bd0000d140d6e778c4864dfde08";
-          sha256 = "113prlamr2j6y6n0w43asffawwa4qiq63mgwm85v04h6pr8bd90l";
+          rev = "e07dd1d0c3e034360d08c3856471496273a340da";
+          sha256 = "0irw76inj3gdmi88hiayplv6fzjjjsvvvmr121ahh3p73mb14cjd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wcheck-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wcheck-mode";
           sha256 = "0cmdvhgax6r5svn3wkwll4j271qj70g8182c58riwnkhiajxmn3k";
           name = "wcheck-mode";
         };
@@ -57951,7 +58658,7 @@
           sha256 = "05gfc67724b0mwg8kvk3dsazx3dld50b9xjq8h1nc6jvdz3zxb9z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/weather-metno";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/weather-metno";
           sha256 = "0h7p4l8y75h27pgk45f0mk3gjd43jk8q97gjf85a9b0afd63d3f6";
           name = "weather-metno";
         };
@@ -57972,7 +58679,7 @@
           sha256 = "03xcadplw1hg5hxw6bfrhw5xkkxk3i4105f114c6m3d2525jq4y5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/web";
           sha256 = "0ynnmqw0vsf7wyhp9m5a05dfb19vkj8dnj5glhjdzjvg30dhjp3a";
           name = "web";
         };
@@ -57993,7 +58700,7 @@
           sha256 = "0ky2rg16xrbnsvqc6gcfhgi69fdzbx6jlsq73n8hr0n4562czhzl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/web-beautify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/web-beautify";
           sha256 = "06ky2svhca8hjgmvxrg3h6ya7prl72q1r88x967yc6b0qq3r7g0f";
           name = "web-beautify";
         };
@@ -58014,7 +58721,7 @@
           sha256 = "12j8ql9v9mrg8hlsminpm3ydcacc2fbdjsfw7l604sc3qvgza1lm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/web-completion-data";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/web-completion-data";
           sha256 = "1zzdmhyn6bjaidk808s4pdk25a5rn4287949ps5vbpyniaf6gny9";
           name = "web-completion-data";
         };
@@ -58027,15 +58734,15 @@
     web-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "web-mode";
-        version = "20160202.117";
+        version = "20160212.738";
         src = fetchFromGitHub {
           owner = "fxbois";
           repo = "web-mode";
-          rev = "594f00bf31815d39caefef75ae2ee11356afed58";
-          sha256 = "0psk1k1jryljkw4vj04d7ay424fwq212729fmqsziqzmjfjvsl0l";
+          rev = "e82d71b4bf21da2f00120c4e00dddab9d741f35a";
+          sha256 = "1ai3chja063my6lh2q5gfsphdxhwp41jjgpsqnqh0p5dy2f1kvhx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/web-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/web-mode";
           sha256 = "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i";
           name = "web-mode";
         };
@@ -58056,7 +58763,7 @@
           sha256 = "0mbhyk7sgisx0l0xiz2xgy4jfbgwazlnxjvajsh4nysyig5rys05";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/web-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/web-server";
           sha256 = "1f0iyvwq1kq3zfxx2v596cmah7jfk2a04g2rjllbgxxnzwms29z3";
           name = "web-server";
         };
@@ -58076,7 +58783,7 @@
           sha256 = "1z7ld9d0crwdh778fyaapx75vpnlnslsh9nf07ywkylhz4w68yyv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/weblogger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/weblogger";
           sha256 = "189zs1321rybgi4zihps7d2jll5z13726jsg5mi7iycg85nkv2fk";
           name = "weblogger";
         };
@@ -58097,7 +58804,7 @@
           sha256 = "1vj10jcraxpwk896zyscpmgd55r1czzlqj1gz29skbq2zan1l042";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/websocket";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/websocket";
           sha256 = "1v8jlpahp30lihz7mdznwl6pyrbsdbqznli2wb5gfblnlxil04lg";
           name = "websocket";
         };
@@ -58118,7 +58825,7 @@
           sha256 = "19hgb5knqqc4rb8yl8s604xql8ar6m9r4d379cfakn15jvwqnl98";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wedge-ws";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wedge-ws";
           sha256 = "07i2dr807np4fwq3ryxlw11vbc1sik1iv7x5740q258jyc9zfgll";
           name = "wedge-ws";
         };
@@ -58139,7 +58846,7 @@
           sha256 = "03xsh3fc7if6rkdp2s8lmrzpqm3pjakgqi3faap44y9i84q6mc6k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/weechat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/weechat";
           sha256 = "0sxrms5024bi4irv8x8s8j1zcyd62cpqm0zv4dgpm65wnpc7xc46";
           name = "weechat";
         };
@@ -58160,7 +58867,7 @@
           sha256 = "0hc5iyjpcik996ns84akrl28scndmn0gd1zfdf1nnqq6n2m5zvgh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/weibo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/weibo";
           sha256 = "1ndgfqqb0gvy8p2fisi57s9bsa2nrnv80smg78m89i4cwagbz6yd";
           name = "weibo";
         };
@@ -58181,7 +58888,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wgrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wgrep";
           sha256 = "09xs420lvbsmz5z28rf6f1iwa0ixkk0w24qbj6zhl9hidh4mv9y4";
           name = "wgrep";
         };
@@ -58202,7 +58909,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wgrep-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wgrep-ack";
           sha256 = "03l1a681cwnn06m77xg0a547892gy8mh415v9rg3h6lkxwcld8wh";
           name = "wgrep-ack";
         };
@@ -58223,7 +58930,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wgrep-ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wgrep-ag";
           sha256 = "1b2mj06kws29ha7g16l5d1s3p3nwyw8rprbpaiijdk9nxqcm0a8a";
           name = "wgrep-ag";
         };
@@ -58244,7 +58951,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wgrep-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wgrep-helm";
           sha256 = "1hh7isc9xifkrdfw88jw0z0xmfazrbcis6d355bcaxlnjy6fzm8b";
           name = "wgrep-helm";
         };
@@ -58265,7 +58972,7 @@
           sha256 = "075z0glain0dp56d0cp468y5y88wn82ab26aapsrdzq8hmlshwn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wgrep-pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wgrep-pt";
           sha256 = "1gphdf85spsywj3s3ypb7dwrqh0zd70n2vrbgjqkbnfbwqjp9qbg";
           name = "wgrep-pt";
         };
@@ -58286,7 +58993,7 @@
           sha256 = "04w62davpqqqvympkr52bg54c2i45p09q9bs70p9ff5jvc6i3g76";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/what-the-commit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/what-the-commit";
           sha256 = "0nnyb6hq6r21wf1x3q41ab48b3dmcz5lyli771a59dk1gs8qpgak";
           name = "what-the-commit";
         };
@@ -58299,15 +59006,15 @@
     which-key = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "which-key";
-        version = "20160203.1414";
+        version = "20160213.854";
         src = fetchFromGitHub {
           owner = "justbur";
           repo = "emacs-which-key";
-          rev = "e7a9ebf15f30b2e8763152af4e939bfc87b9fc42";
-          sha256 = "1gf2gg1n6f3fqflpav8szfkrb3g1ivx4vlxlylkgr46km826aqin";
+          rev = "69a1435dffc88af1b6e1e974945102b340798141";
+          sha256 = "18bq95k6zah7nn0cyjv0siyw1hrm0vpjnhh9gjmcnd2h3k8g95cc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/which-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/which-key";
           sha256 = "0vqbhfzcv9m58w41zdhpiymhgl38n15c6d7ffd99narxlkckcj59";
           name = "which-key";
         };
@@ -58328,7 +59035,7 @@
           sha256 = "1y75cylvqgn54h8yqahz4wi1qj5yhbs66i7x23jmbmah3q0rycab";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/whitaker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/whitaker";
           sha256 = "17fnvb3jh6fi4wddn5qnp6i6ndidg8jf9ac69q9j032c2msr07nj";
           name = "whitaker";
         };
@@ -58349,7 +59056,7 @@
           sha256 = "0sh92g5vd518f80klvljqkjpw4ji909439dpc3sfaccf5jiwn9xn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/white-sand-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/white-sand-theme";
           sha256 = "19qsiic6yf7g60ygjmw7kg1i28nqpm3zja8cmdh33ny2bbkwxsz5";
           name = "white-sand-theme";
         };
@@ -58370,7 +59077,7 @@
           sha256 = "15yhbyyr0ksd9ziinlylyddny2szlj35x2548awj9ijnqqgjd23r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/whitespace-cleanup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/whitespace-cleanup-mode";
           sha256 = "1fhdjrxxyfx4xsgfjqq9p7vhj98wmqf2r00mv8k27vdaxwsnm5p3";
           name = "whitespace-cleanup-mode";
         };
@@ -58391,7 +59098,7 @@
           sha256 = "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/whole-line-or-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/whole-line-or-region";
           sha256 = "1vs2i4cy1zc6nj660i9h36jbfgc3kvqivjnzlq5zwlxk5hcibqa1";
           name = "whole-line-or-region";
         };
@@ -58409,7 +59116,7 @@
           sha256 = "18bnwwjk8jj4ns08sxhnznj0d8n1bxm2kj43r06nwyibh6ajpl7f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wid-edit+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wid-edit+";
           sha256 = "1wwrsk14hc0wrvy7hm94aw6zg50n2smlqwr6frwpi7yp8y394wiv";
           name = "wid-edit-plus";
         };
@@ -58429,7 +59136,7 @@
           sha256 = "0pq9x73hrp7qwhms7x3dvjfh9imapglba9yd7nkyw68mc0b9wlnl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wide-column";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wide-column";
           sha256 = "1r9mh7756jgf1hdnprci988z07xxh2jvh8d0c1h5rmxmldlbx8az";
           name = "wide-column";
         };
@@ -58450,7 +59157,7 @@
           sha256 = "0036alzp66k7w3z45lj8qzh3plxv9vwcw17wibkz90mlb27vy6yz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/widget-mvc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/widget-mvc";
           sha256 = "0njzvdlxb7z480r6dvmksgivhz7rvnil517aj86qx0jbc5mr3l2f";
           name = "widget-mvc";
         };
@@ -58471,7 +59178,7 @@
           sha256 = "06qjvybf65ffrcnhhbqs333lg51fawaxnva3jvdg7zbrsv4m9acl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wiki-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wiki-nav";
           sha256 = "19mabz0y3fcqsm68ijwwbbqylxgp71anc0a31zgc1blha9jivvwy";
           name = "wiki-nav";
         };
@@ -58492,7 +59199,7 @@
           sha256 = "02bczc1mb1cs1aryz5pw6cmpydjmxja2zj91893cz8rnfn1r031i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wiki-summary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wiki-summary";
           sha256 = "1hiyi3w6rvins8hfxd96bgpihxarmv192q96sadqcwshcqi14zmw";
           name = "wiki-summary";
         };
@@ -58513,7 +59220,7 @@
           sha256 = "1n45m8xn65a2lg8ff7m6hbqnp2j49n9sfyr924laljvhjbi37knd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wilt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wilt";
           sha256 = "0nw6zr06zq60j72qfjmbqrxyz022fnisb0bsh6xmlnd1k1kqlrz6";
           name = "wilt";
         };
@@ -58531,7 +59238,7 @@
           sha256 = "142ql6886h418f73h3wjblhnd16qvbap7mfr4g2yv4xybh88d4x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wimpy-del";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wimpy-del";
           sha256 = "10qw5lfq2392fr5sdz5a9bc6rvsg0j4dkrwvdhip1kqvajznw49x";
           name = "wimpy-del";
         };
@@ -58552,7 +59259,7 @@
           sha256 = "0ib20zl8l1fs69ca9rry27qz69sgf6ws1ca5nhm5llvpkjcgv53i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/win-switch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/win-switch";
           sha256 = "1s6inp5kf763rngn58r02fd7n7z3dd55j6hb7s9dgvc856d5z3my";
           name = "win-switch";
         };
@@ -58570,7 +59277,7 @@
           sha256 = "0dcbnqcqw7jzwwdn0rxxlixga1zw1x3a2zbpxvd90xp7zig4f0yz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/windata";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/windata";
           sha256 = "0xq51rdanq5as6kfyi97hsqmig5g35w7xv8c96bhzyflranw7jw5";
           name = "windata";
         };
@@ -58591,7 +59298,7 @@
           sha256 = "0g69r64gyz4p3k6n8l0i1837mszycbrp23acnp0iy0y3mg67x3pn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-end-visible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/window-end-visible";
           sha256 = "1p78n7yysj18404cdc6vahfrzwn5pixyfnja8ch48rj4fm4jbxwq";
           name = "window-end-visible";
         };
@@ -58612,7 +59319,7 @@
           sha256 = "069aqyqzjp5ljqfzm7lxkh8j8firk7041wc2jwzqha8jn9zpvbxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-jump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/window-jump";
           sha256 = "1gmqb7j5fb3q3krgx7arrln5nvyg9vcpph6wlxj6py679wfa3lwr";
           name = "window-jump";
         };
@@ -58633,7 +59340,7 @@
           sha256 = "08chi9b4bap78n069aavvx3850kabk2jflrgymy4jxv08ybqikdg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-layout";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/window-layout";
           sha256 = "1n4a6z00lxsffirjrmbaaw432w798b9vv34qawgn1k17y9l7gb85";
           name = "window-layout";
         };
@@ -58651,7 +59358,7 @@
           sha256 = "1as3qbvj6d171qp2s8ycqqi16bgqm47vfk3fbxrl9szjzaxh9nw6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/window-number";
           sha256 = "1qhlsdhs40cyly87pj3f1n6ckr7z5pmhqndgay5jyxwxxdpknpap";
           name = "window-number";
         };
@@ -58672,7 +59379,7 @@
           sha256 = "1f4c6q4larifm745fr8f3w8sxs1sbs77vna29rw120jz8rnlz0jy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-numbering";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/window-numbering";
           sha256 = "0x3n0ni16q69lfpyjz61spqghmhvc3cwa4aj80ihii3pk80f769x";
           name = "window-numbering";
         };
@@ -58690,7 +59397,7 @@
           sha256 = "0mqdcgk6mdxgl9if7jzgg16zqdwnsp8icrdhnygphw5m9h2dqcnm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/window+";
           sha256 = "0fhzb0ay9g9qgcaxpb2qaw15dh0lfmv3x4akyipi3zx11446d06j";
           name = "window-plus";
         };
@@ -58703,15 +59410,15 @@
     window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "window-purpose";
-        version = "20160203.1103";
+        version = "20160217.1132";
         src = fetchFromGitHub {
           owner = "bmag";
           repo = "emacs-purpose";
-          rev = "38fda8c9e4c0ad4fb0068b6b45ed0744f8d602a7";
-          sha256 = "0lm16hi6v4mg9jwqk3npzzpy2gaqz1kl47rdazlgdz4yl8x133c8";
+          rev = "3820ff87df683a1880f5c81427d656e51b0e2865";
+          sha256 = "1m3879zr8dc73vn5l6lsmbvnz3lhial2gai4jbldjc1br9jsq1q2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-purpose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/window-purpose";
           sha256 = "1ib5ia7armghvmcw8qywcil4nxzwwakmfsp7ybawb0xr53h1w96d";
           name = "window-purpose";
         };
@@ -58732,7 +59439,7 @@
           sha256 = "0hijf56ahbc5inn7n39nj96d948c4d05n9d5ci3g3vbl5hsyb121";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/windsize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/windsize";
           sha256 = "1xhfw77168942rcn246qndii0hv0q6vkgzj67jg4mxh8n46m50m9";
           name = "windsize";
         };
@@ -58753,7 +59460,7 @@
           sha256 = "1qrbvidnmgg7jyasb28bc0z1x4a4ayzq5jmv38dsx0qs080s85wy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/winpoint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/winpoint";
           sha256 = "10ji7xd9ipmy6c2qxljqdxgqf5sb8h7lwz43mr6ixbn7v1b7pp6w";
           name = "winpoint";
         };
@@ -58773,7 +59480,7 @@
           sha256 = "16711d1ds508nmjw81jm2cfdpqzc55gc175fkhayk0f5swlvd11m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wisp-mode";
           sha256 = "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc";
           name = "wisp-mode";
         };
@@ -58794,7 +59501,7 @@
           sha256 = "188h1sy4mxzrkwi3zgiw108c5f71rkj5agdkf9yy9v8c1bkawm4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wispjs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wispjs-mode";
           sha256 = "0qzm0dcvjndasnbqpkdc56f1qv66gxv8dfgfcwq5l1bp5wyx813p";
           name = "wispjs-mode";
         };
@@ -58815,7 +59522,7 @@
           sha256 = "0dymhkbkzicjw0379bdzbb594x5xcjbgbn428a30i2i0jwv66pfz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/with-editor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/with-editor";
           sha256 = "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb";
           name = "with-editor";
         };
@@ -58836,7 +59543,7 @@
           sha256 = "1c7g8f3jr7bb0xxprammfg433gd63in5iiiaq8rjmc94h6hdcys3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/with-namespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/with-namespace";
           sha256 = "1199k1xvvv7ald6ywrh2sfpw2v42ckpcsw6mcj617bg3b5m7770i";
           name = "with-namespace";
         };
@@ -58857,7 +59564,7 @@
           sha256 = "12rfpkyjkhikjh0mihhp5h5pzbm4br68nwf8k1ja9djl77vfzv36";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wn-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wn-mode";
           sha256 = "1qy1pkfdnm4pska4cnff9cx2c812ilymajhpmsfc9jdbvhzwrwg3";
           name = "wn-mode";
         };
@@ -58878,7 +59585,7 @@
           sha256 = "1xna0cjgi9m87pws2h0cza67qbpdhjmdi5h4wv6v4g14nr26hi3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wolfram-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wolfram-mode";
           sha256 = "1bq95lamzz45macpklnq1kxw9ak4x4f41kx16f472dn650ff0zlf";
           name = "wolfram-mode";
         };
@@ -58899,7 +59606,7 @@
           sha256 = "0hacc8ha5w44cgwkipa3nwh1q5gdrcxhjkmw2gnvb1l01crgnack";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wonderland";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wonderland";
           sha256 = "1b4p49mbzqffm2b2y8sbbi56vnkxap2jscsmla9l6l8brybqjppi";
           name = "wonderland";
         };
@@ -58920,7 +59627,7 @@
           sha256 = "1b9pya342ikyxnlyxp86wx8xk6zcdws7jsqs7a9xk027prwkfngj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wordnut";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wordnut";
           sha256 = "1gqmjb2f9izra0x9ds1jyk7h204qsll6viwkvdnmxczyyc0wx44n";
           name = "wordnut";
         };
@@ -58941,7 +59648,7 @@
           sha256 = "0d2byl3si2r0zh5ih6xpsgcd9r114ry0lzg5vcf31rr2gqf0j06h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wordsmith-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wordsmith-mode";
           sha256 = "1570h1sjjaks6bnhd4xrbx6nna4v7hz6dmrzwjq37rwvallasg1n";
           name = "wordsmith-mode";
         };
@@ -58954,15 +59661,15 @@
     worf = callPackage ({ ace-link, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild, swiper }:
     melpaBuild {
         pname = "worf";
-        version = "20160121.638";
+        version = "20160207.848";
         src = fetchFromGitHub {
           owner = "abo-abo";
           repo = "worf";
-          rev = "51fa0f71e49ad8b8d9c87156c724007e58d87a02";
-          sha256 = "15nc9zw12jd9jb4s02sa8a3c0i2s91ijy0bn43d36qc5i48c01zs";
+          rev = "f36755447b588b739b2bf6ab0fb5eb5f4d8db3df";
+          sha256 = "0l2n3vwk251ba06xdrs9z0bp4ligfdjd259a84ap2z3sqdfa98x4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/worf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/worf";
           sha256 = "1fkb2ddl684dijsb0cqgmfbg1nz4xv43rb7g5rah05rchy5sgkpi";
           name = "worf";
         };
@@ -58983,7 +59690,7 @@
           sha256 = "0q32z54qafj8ap3ybx82i3fm1msmzwvpxgmkaglzhi8nccgzbn2n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/workgroups";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/workgroups";
           sha256 = "1v01yr3lk6l0qn80i3r8fq3di0a8bmqjyhwx19hcgiap57xl80h8";
           name = "workgroups";
         };
@@ -59004,7 +59711,7 @@
           sha256 = "0prj2b33h6rya7y9ff91r72bva1y6hg0sv9l11bn1gikmc6lc18n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/workgroups2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/workgroups2";
           sha256 = "0vhj6mb3iflli0l3rjlvlbxz5yk6z3ii5r71gx0m4vp4lhxncy3v";
           name = "workgroups2";
         };
@@ -59025,7 +59732,7 @@
           sha256 = "0i00xm4rynbp2v3gm6h46ajgj8h8nxnsjh6db1659b0hbpnah0ji";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/world-time-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/world-time-mode";
           sha256 = "10gdlz4l9iqw1zdlk5i3knysn36iqxdh3xabjq8kq04jkl7i36dl";
           name = "world-time-mode";
         };
@@ -59046,7 +59753,7 @@
           sha256 = "09fzbbrdgq19c3gylj4i0c5g070k65w943wz28mzis8b403vzh3n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wrap-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wrap-region";
           sha256 = "0mby3m49vm2pw127divspgivqam27zd4r70wx5ra05xwfxywaibq";
           name = "wrap-region";
         };
@@ -59067,7 +59774,7 @@
           sha256 = "1nnjn1r669hvvzfycllwap4w04m8rfsk4nzcg8057m1f263kj31b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/writegood-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/writegood-mode";
           sha256 = "1lxammisaj04g5vr5lwms64ywf39w8knrq72x4i94wwzwx5ywi1d";
           name = "writegood-mode";
         };
@@ -59088,7 +59795,7 @@
           sha256 = "0an36zra25r0l482irxbwrq90fd3rik53yqw3gccjkgdf3lpkc4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/writeroom-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/writeroom-mode";
           sha256 = "1kpsrp3agw8bg3qbf5rf5k1a7ww30q5xsa8z5ywxajsaywjzx1bk";
           name = "writeroom-mode";
         };
@@ -59109,7 +59816,7 @@
           sha256 = "1x2ybnv0h52i24vd1n95s4vglc6p79cyxh91a20cwza34svhz152";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ws-butler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ws-butler";
           sha256 = "072k67z2lx0ampwzdiszi64xs0w6frp4nbmrd2r0wpx0pd211vbn";
           name = "ws-butler";
         };
@@ -59122,15 +59829,15 @@
     wsd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wsd-mode";
-        version = "20160201.1551";
+        version = "20160213.1417";
         src = fetchFromGitHub {
           owner = "josteink";
           repo = "wsd-mode";
-          rev = "d604ee487ad426b19287bcf802c85f9026276956";
-          sha256 = "09c3vhg62ppxfznpir3b33k5k9y1m8v2w41czi2f57987f64f5pz";
+          rev = "6909b4ea3b82e36819f6cd42ac2330af6c8e54e6";
+          sha256 = "1jxpcfslball488lcfjl5qlipwdcfbniz531i6nc87vqp9rf7q1q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wsd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wsd-mode";
           sha256 = "07vclmnj18wx9wlrcnsl99f9jlk3sb9g6pcdv8x1smk84gccpakc";
           name = "wsd-mode";
         };
@@ -59151,7 +59858,7 @@
           sha256 = "0ba193ilqmp7l35hhzfym4kvbnj9h57m8mwsxdj6rdj2cwrifx8r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wwtime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wwtime";
           sha256 = "0n37k23lkjgaj9wxnr41yk3mwvy62mc9im5l86czqmw5gy4l63ic";
           name = "wwtime";
         };
@@ -59172,7 +59879,7 @@
           sha256 = "0i7bgbhk4lvdkdjh6z4xs69mbdi49985j82cjikzyyskjcqd2klq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/x-dict";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/x-dict";
           sha256 = "1w51xhiaxk50wlch262dxs2ybjvjj8qzx01xlgiimvggb8h5arlc";
           name = "x-dict";
         };
@@ -59193,7 +59900,7 @@
           sha256 = "0lssri13f3c7drkirh3cyxzxm3lix5myfrqb9iy178nybrifgf8l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/x86-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/x86-lookup";
           sha256 = "1clv1npvdkzsy0a08xrb880yflwzl4d5cc2c5xrs7b837mqpj8hd";
           name = "x86-lookup";
         };
@@ -59206,15 +59913,15 @@
     xah-elisp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-elisp-mode";
-        version = "20160111.1954";
+        version = "20160211.1510";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-elisp-mode";
-          rev = "f7bf8463b1d553c6c960f37ca44e64071261839e";
-          sha256 = "1birxxr28iv70x2h9war7ibhgan6pmbghdj11jnndvxl140jclmq";
+          rev = "c52e643ed1b7991211191ba4eab390019530860a";
+          sha256 = "0rb4cshfcicazd35dph3lws22yfvnp6cxww2hy7yl9878m53jxak";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xah-elisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xah-elisp-mode";
           sha256 = "0cl07hw1hd3hj7wrzkh20m8vcs7mqsajxjmnlbnk2yg927yyijij";
           name = "xah-elisp-mode";
         };
@@ -59227,15 +59934,15 @@
     xah-find = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-find";
-        version = "20151214.1257";
+        version = "20160210.2102";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-find";
-          rev = "e25eb9343fca71523ea6bf76741e6c5aab8004a4";
-          sha256 = "05dvmvh81n30l56gvlgzj0bwqd2fv1d6xvhvj5ywax6kqr9piwqv";
+          rev = "38471ba72684ab80d0fcb62c8fef1a79543738c5";
+          sha256 = "00ydkpkdgnj9v6dkf4pw9wj5skbq2v5y71xsr37d1fqmdzsb03g7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xah-find";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xah-find";
           sha256 = "1d3x9yhm7my3yhvgqnjxr2v28g5w1h4ri40sy6dqcx09bjf3jhyq";
           name = "xah-find";
         };
@@ -59248,15 +59955,15 @@
     xah-fly-keys = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xah-fly-keys";
-        version = "20160130.126";
+        version = "20160214.205";
         src = fetchFromGitHub {
           owner = "xahlee";
           repo = "xah-fly-keys";
-          rev = "9a000ae40235c960b29423bde0331df3d445a154";
-          sha256 = "1kdzs5dhlrp42sgpgmybfzydr3m792ws11kn06c1d3mdfvrlkm9v";
+          rev = "0300a8f05b39c61083797c504f79a454c9559202";
+          sha256 = "0d6byc87bkadw8yssjpkw7mp7lm4bc290vh5skihgk5mphn8mc9i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xah-fly-keys";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xah-fly-keys";
           sha256 = "0bzfz8q7yd1jai0pgngxwjp82nsfx5ivn24cb20vc5r8hhzj17cs";
           name = "xah-fly-keys";
         };
@@ -59277,7 +59984,7 @@
           sha256 = "0abknznp2si80zq5pc0hqr3w3pca2vrv3msm6jz1s8l8zi2hwx72";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xah-get-thing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xah-get-thing";
           sha256 = "0m61bmfgqy19h4ivw655mqj547ga8hrpaswcp48hx00hx8mqzcvg";
           name = "xah-get-thing";
         };
@@ -59298,7 +60005,7 @@
           sha256 = "1adyww9jbjvcn9p3z9ggs3gijdmnab275a81ch8sir1xp59pfm3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xah-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xah-lookup";
           sha256 = "0z0h1myw6wmybyd0z2lw4l59vgm6q6kh492q77kf3s0fssc0facc";
           name = "xah-lookup";
         };
@@ -59319,7 +60026,7 @@
           sha256 = "1wsdnqpfgk7f1dbz90k6sf13hjh0x3xjjgappfkmhcy36g7sshl7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xah-math-input";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xah-math-input";
           sha256 = "1afikjk46sjf97fb5fc8h63h7b9af010wxhsbpnmabsb4j72rx5a";
           name = "xah-math-input";
         };
@@ -59340,7 +60047,7 @@
           sha256 = "18msj947w6msma6zm23slk2v0h92n5ych5j12zbzkzzir49sffql";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xah-replace-pairs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xah-replace-pairs";
           sha256 = "0r4aq9davh3ypzcjixr3aw9g659dhiblwbmcyhm8iqhkavcpqr1x";
           name = "xah-replace-pairs";
         };
@@ -59361,7 +60068,7 @@
           sha256 = "0dc74kqwi0hpihdbb9a9lrqb7823w6j96mah47zyd9d4rd3vx850";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xahk-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xahk-mode";
           sha256 = "1bs12z7lnqlhm44hq0l98d0ka1bjgvm2yv97yivaj9akd53znca9";
           name = "xahk-mode";
         };
@@ -59382,7 +60089,7 @@
           sha256 = "08hzsqf4gawcr9q2h3rxrf1igvdja84aaa821657k04kdq4dpcbj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xbm-life";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xbm-life";
           sha256 = "1pglxjd4cs630sayx17ai1xflpbyj3hry3156682bgwhqs1vw68q";
           name = "xbm-life";
         };
@@ -59403,7 +60110,7 @@
           sha256 = "0p8cs5mh6ab6m0ff6ljs2vd1g8xx0jgc9ybh0j4aj2zcp22avz2n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xcscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xcscope";
           sha256 = "06xh29cm5v3b5xwj32y0i0h0kvvy995840db4hvab2wn9jw68m8w";
           name = "xcscope";
         };
@@ -59424,7 +60131,7 @@
           sha256 = "0gd7ag7cqzkfk8y9rbkrjpnyjnwad5bx86a30vxamd1ql8xp57ap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xkcd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xkcd";
           sha256 = "1r88yhs8vnkak8xl16vw3xdpm7ncz4ydkml8932bqk8xix8l8f0w";
           name = "xkcd";
         };
@@ -59437,15 +60144,15 @@
     xml-plus = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "xml-plus";
-        version = "20160203.2325";
+        version = "20160210.2142";
         src = fetchFromGitHub {
           owner = "bddean";
           repo = "xml-plus";
-          rev = "ec9b2af03a195e3a96ffc173fb3aa48b89676b2e";
-          sha256 = "1m7hpjfvpzichml8iarsqf9dv34sx7jcyh9mhj7dlka3za91snpb";
+          rev = "1b728dda31dd13506aa4e1220f925bb43c93847b";
+          sha256 = "0c30xh7qxg3y2p5jqkbssz5z53rx0yp64qqyy9f87qzgkcd2jd8k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xml+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xml+";
           sha256 = "0xgqyfdn6kkp89zj4h54r009a44sbff0nrhh582zw5rlklypwdz1";
           name = "xml-plus";
         };
@@ -59466,7 +60173,7 @@
           sha256 = "0z3yd3dzcsd7584jchv9q55fx04ig4yjzp8ay2pa112lykv4jxxd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xml-quotes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xml-quotes";
           sha256 = "1lmafa695xkhd90k6yiv8a57ch1jx33l1zpm39z0kj546mn6y8aq";
           name = "xml-quotes";
         };
@@ -59487,7 +60194,7 @@
           sha256 = "0kkjfg1l2wg3d5wrgkwnww4d3fca0xpd3k5z9j9gwmjnkxqd95ca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xml-rpc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xml-rpc";
           sha256 = "14r6xgnpqsb2jlv52vgrhqf3qw8a6gmdyap3ylhilyxw71lxf1js";
           name = "xml-rpc";
         };
@@ -59508,7 +60215,7 @@
           sha256 = "1nk50iwb6az01r1s2l9wwdqrz3k4ywr00q0zmd9vvi3y9v4cjah0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xmlgen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xmlgen";
           sha256 = "1mvnjqb9zxf9ml605w10v4cbbajwv9if93apr4xrh79l00scj383";
           name = "xmlgen";
         };
@@ -59529,7 +60236,7 @@
           sha256 = "1k5zilvq64xjhy9lrwf9ss0y7j0v9ppg10xzcrj1hy6jbx54nn8j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xmlunicode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xmlunicode";
           sha256 = "1ylpvx2p5l863r9qv9jdsm9rbv989c8xn0zpjl8zkcfxqxix4h4p";
           name = "xmlunicode";
         };
@@ -59550,7 +60257,7 @@
           sha256 = "09fpxr55b2adqmca8xhpy8z5cify5091fjdjyxjd1jh5wdp1658v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xquery-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xquery-mode";
           sha256 = "0b5k2ihbjm5drv4lf64ap31yj873x1fcq85y6yq1ayahn6s52rql";
           name = "xquery-mode";
         };
@@ -59571,7 +60278,7 @@
           sha256 = "1yy759qc4njc8bqh8hmgc0mq5vk5spz5syxgflqhjijk8nrvyfgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xquery-tool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xquery-tool";
           sha256 = "069injmvv9zzcbqbms94qx5wjj740jnik6sf3b4xjhln7z1yskp0";
           name = "xquery-tool";
         };
@@ -59592,7 +60299,7 @@
           sha256 = "1n3biybylvq5c1lpf7zsjsgdrg7mzrhkaw251fp8qmsss0s3sv4g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xresources-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xresources-theme";
           sha256 = "0spqa3xn3p2lmvlc5hdn7prq4vb70nkyrryx1kavha9igzhlyaga";
           name = "xresources-theme";
         };
@@ -59613,7 +60320,7 @@
           sha256 = "064fpjcj1sp8m5x106dw6zgy0p0rfd5fxcx57h533q263l7z00ny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xterm-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xterm-color";
           sha256 = "0bvzi1mkxgm4vbq2va1sr0k9h3fdmppq79hkvbizc2xgk72sazpj";
           name = "xterm-color";
         };
@@ -59634,7 +60341,7 @@
           sha256 = "10dsf2lgjjqvjzzyc5kwggfk511v8ypmx173bixry3djcc15dsf3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xterm-frobs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xterm-frobs";
           sha256 = "02v8kh2g6a2fpxy911630zsg985hyakvqbd6v2xyfbz0vnd6i1lf";
           name = "xterm-frobs";
         };
@@ -59655,7 +60362,7 @@
           sha256 = "1jwimgglhqgp259wjqmpp1wi9j51qxcl1l356jlhjnfp1zh1ihmg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xterm-keybinder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xterm-keybinder";
           sha256 = "1n0zp1mc7x7z0671lf7p9r4qxic90bkf5q3zwz4vinpiw2qh88lz";
           name = "xterm-keybinder";
         };
@@ -59676,7 +60383,7 @@
           sha256 = "06cbr7y3wp7j8lnbys57g6md4fdx9xhlnxl73pj7xpfa5i2x9ifl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xterm-title";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xterm-title";
           sha256 = "08z8qg9x6vjpybbhxa8x46qnp3951miz1264fivg776y76cg3ck6";
           name = "xterm-title";
         };
@@ -59697,7 +60404,7 @@
           sha256 = "09mn8s7gzzxgs7kskld8l68zjrcgnvml3fqj69wrfq7b1g62hhxy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xtest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xtest";
           sha256 = "1vbs4sb4frzg8d3l96ip9cc6lc86nbj50vpdfqazvxmdfd1sg4i7";
           name = "xtest";
         };
@@ -59718,7 +60425,7 @@
           sha256 = "0f6pvwzhncycw8gnjy24h6q1qglfgvdjfs5dzqx9s43j3yg63lzm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yabin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yabin";
           sha256 = "1kmpm2rbb43c9cgp44qwd24d90mj48k3gyiir3vb6zf6k3syrc17";
           name = "yabin";
         };
@@ -59739,7 +60446,7 @@
           sha256 = "0b252m7vb5kg5bjhpgag6nhm32cac8dhlmy4pr0kpa860lh2xlz7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yafolding";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yafolding";
           sha256 = "1z70ismfwmh9a83a7h5lbhw7iywfib5fis7y8gx8020wfjq9g2yq";
           name = "yafolding";
         };
@@ -59760,7 +60467,7 @@
           sha256 = "0sqwz37y6mpc378pp8p6bq9fmhgwfr6rlbngiwgvsp30iq6vjsn4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yagist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yagist";
           sha256 = "1mz86fq0pb4w54c66vd19m2492mkrzq2qi6ssnn2xwmn8vv02wdd";
           name = "yagist";
         };
@@ -59781,7 +60488,7 @@
           sha256 = "030dcp5iq0jvr2m6lb5ar7bqzp1l7f835yl7d7fa8zp46fc3a6d5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yahoo-weather";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yahoo-weather";
           sha256 = "1kzi6yp186wfcqh5q1v9vw6b1h8x89sba6wlnacfpjbarwapfif0";
           name = "yahoo-weather";
         };
@@ -59802,7 +60509,7 @@
           sha256 = "12dd4ahg9f1493982d49g7sxx0n6ss4xcfhxwzyaqxckwzfranp0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yalinum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yalinum";
           sha256 = "0jzsvkcvy2mkfmri4bzgrlgw2y0z3hxz44md83s5zmw09mshkahf";
           name = "yalinum";
         };
@@ -59815,15 +60522,15 @@
     yaml-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "yaml-mode";
-        version = "20160101.1121";
+        version = "20160220.540";
         src = fetchFromGitHub {
           owner = "yoshiki";
           repo = "yaml-mode";
-          rev = "49668547e1891cb68d2bbbc650acbfa208012f2b";
-          sha256 = "1cngxwn7m3qxn0dm7l9vd4lb5sw5i4aqn5rkr7pacskl0giikhfb";
+          rev = "c7573962216f79e93642b91e7aa8552f7be46b41";
+          sha256 = "1l60zz9yii5z6aqhysjccmsdw0zaxpdwxlz57mkrggh54p1jnazv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yaml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yaml-mode";
           sha256 = "0afp83xcr8h153cayyaszwkgpap0iyk351dlykmv6bv9d2m774mc";
           name = "yaml-mode";
         };
@@ -59844,7 +60551,7 @@
           sha256 = "1xgqqgg4q3hrhiap8gmr8iifdr1mg4dl0j236b6alhrgmykbhimy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yaml-tomato";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yaml-tomato";
           sha256 = "0bja213l6mvh8ap5d04x8dik1z9px5jr52zpw1py7shw5asvp5s2";
           name = "yaml-tomato";
         };
@@ -59865,7 +60572,7 @@
           sha256 = "17ymdqi19bs9xn0pxylzv7m99f7cn14hx73xljm6bg0qfb8m53f3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yandex-weather";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yandex-weather";
           sha256 = "11hspadm520cjlv1wk2bdpzg7hg2g0chbh26qijj9jgvca26x0md";
           name = "yandex-weather";
         };
@@ -59883,7 +60590,7 @@
           sha256 = "0svy6zp5f22z7mblap4psh7h4i52d1qasi9yk22l39przhsrjar4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yaoddmuse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yaoddmuse";
           sha256 = "07sqcsad3k23agwwws7hxnc46cp9mkc9qinzva7qvjgs8pa9dh54";
           name = "yaoddmuse";
         };
@@ -59904,7 +60611,7 @@
           sha256 = "06mjjxa0blgxd8dbahgyni3b1rscbwjpxby5abrgfbb0fvs2bnfa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yard-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yard-mode";
           sha256 = "0jmlcba8qapjwaaliz9gzs99if3wglkhmlpjzcdy3icx18sw8kzx";
           name = "yard-mode";
         };
@@ -59925,7 +60632,7 @@
           sha256 = "0w9a6j0ndpfwaz1g974vv5jqgbzxw26l19kq51j3ah73063cavpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yari";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yari";
           sha256 = "0sch9x899mzwdacg55w5j583k2r4vn71ish7gqpghd7cj13ii66h";
           name = "yari";
         };
@@ -59946,7 +60653,7 @@
           sha256 = "08wa97hsfy1rc8ify3rz2ncfij4z6l16p4s20naygqccjv3ir6z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yascroll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yascroll";
           sha256 = "11g7wn4hgdwnx3n7ra0sh8gk6rykwvrg9g2cihvcv7mjbqgcv53f";
           name = "yascroll";
         };
@@ -59967,7 +60674,7 @@
           sha256 = "0vpsicap1sk2i78y4ysszhksinh6qvic709n3gbzaz2d4mm0bsya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yasnippet";
           sha256 = "1j6hcpzxljz1axh0xfbwr4ysbixkwgxawsvsgicls8r8kl2xvjvf";
           name = "yasnippet";
         };
@@ -59988,7 +60695,7 @@
           sha256 = "1gxn302kwjfq6s6rxxvy0jpp37r2vh4ry899giqbdfr0cc1qnw0c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yatemplate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yatemplate";
           sha256 = "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q";
           name = "yatemplate";
         };
@@ -60007,7 +60714,7 @@
           sha256 = "08iwfpsjs36pqr2l85avxhsjx8z0sdfw8cqwwf3brn7i4x67f7z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yatex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yatex";
           sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6";
           name = "yatex";
         };
@@ -60028,7 +60735,7 @@
           sha256 = "0nqyn1b01v1qxv7rcf46qypca61lmpm8d7kqv63jazw3n05qdnj8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yaxception";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yaxception";
           sha256 = "18n2kjbgfhkhcwigxmv8dk72jp57vsqqd20lc26v5amx6mrhgh58";
           name = "yaxception";
         };
@@ -60049,7 +60756,7 @@
           sha256 = "0znchya89zzk30mwl4qfm0q9sfa5m3jspapb892ydj0mck5n4nyj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ycm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ycm";
           sha256 = "16ahgvi85ddjlrjxld14zm2vvam0m89mwskizjd5clcz0snk51sc";
           name = "ycm";
         };
@@ -60059,22 +60766,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ycmd = callPackage ({ dash, deferred, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
+    ycmd = callPackage ({ cl-lib ? null, dash, deferred, emacs, f, fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "ycmd";
-        version = "20160202.235";
+        version = "20160215.144";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-ycmd";
-          rev = "c64684df763411249985159ee33b10d948b9fc91";
-          sha256 = "12jwqhzqskdp2l6h60rich19rddzjcl94zaf72ljnq8h0mqc3xy0";
+          rev = "61601543ca9b70f6a92a87fb9057af6143ba5ed1";
+          sha256 = "10j8zv5m36400wwkwbncqnsm616v59ww0bbkhrxcf6mn56iq8162";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ycmd";
           sha256 = "06psmcr5132vn72l0amzj14dy43aradnbmlvvms55srvici6r60q";
           name = "ycmd";
         };
-        packageRequires = [ dash deferred emacs f popup ];
+        packageRequires = [ cl-lib dash deferred emacs f popup ];
         meta = {
           homepage = "http://melpa.org/#/ycmd";
           license = lib.licenses.free;
@@ -60091,7 +60798,7 @@
           sha256 = "1fyvvkx6pa41bcr9cyh4yclwdzc5bs742s9fxr6wb4a5scq3hg9m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yesql-ghosts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yesql-ghosts";
           sha256 = "1hxzbnfd15f0ifdqjbw9nhxd0z46x705v2bc0xl71nav78fgpswf";
           name = "yesql-ghosts";
         };
@@ -60112,7 +60819,7 @@
           sha256 = "0016qff7hdnd0xkyhxakfzzscwlwkpzppvc4wxfw0iacpjkz1fnr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/youdao-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/youdao-dictionary";
           sha256 = "1qfk7s18br9jask1bpida0cjxks098qpz0ssmw8misi3bjax0fym";
           name = "youdao-dictionary";
         };
@@ -60133,7 +60840,7 @@
           sha256 = "1k7m3xk5ksbr2s3ypz5yqafz9sfav1m0qk2jz1xyi3fdaw2j0w2z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/z3-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/z3-mode";
           sha256 = "183lzhgjj480ca2939za3rlnsbfn24mgi501n66h5wim950v7vgd";
           name = "z3-mode";
         };
@@ -60154,7 +60861,7 @@
           sha256 = "16k8hha798hrs0qfdwqdr6n7y13ffgm6jj3msrk0zl8117jhaany";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zeal-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zeal-at-point";
           sha256 = "1cz53plk5bax5azm13y7xz530qcfh0scm0cgrkrgwja2wwlxirnw";
           name = "zeal-at-point";
         };
@@ -60174,7 +60881,7 @@
           sha256 = "0f80fxh0y9lfa08fnic7ln0jn8vngfbiygy6sizdmrcxz67559vc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zeitgeist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zeitgeist";
           sha256 = "0gzmiwxmzcrl5mf0s7vs09p2wl7slq8xbl6ynl76iwzwjxjizahk";
           name = "zeitgeist";
         };
@@ -60195,7 +60902,7 @@
           sha256 = "0dnaxhsw549k54j0mgydm7qbl4pizgipfyzc15f9afsxa107rpnl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zen-and-art-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zen-and-art-theme";
           sha256 = "0b2lflji955z90xl9iz2y1vm04yljghbw4948gh5vv5p7mwibgf2";
           name = "zen-and-art-theme";
         };
@@ -60216,7 +60923,7 @@
           sha256 = "0xihq1bpgckv9jcs6xdnhn8l4hbxywh1krk8ydv099l56r4w1269";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zenburn-theme";
           sha256 = "1kb371j9aissj0vy07jw4ydfn554blc8b2rbi0x1dvfksr2rhsn9";
           name = "zenburn-theme";
         };
@@ -60237,7 +60944,7 @@
           sha256 = "1y3wj15kfbgskl29glmba6lzq43rcm141p4i5s180aqcw7ydp5vr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zencoding-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zencoding-mode";
           sha256 = "1fclad1dyngyg9ncfkcqfxybvy8482i2bd409cgxi9y4h1wc7ws7";
           name = "zencoding-mode";
         };
@@ -60250,15 +60957,15 @@
     zerodark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zerodark-theme";
-        version = "20160115.1710";
+        version = "20160216.911";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "d89e721dcda9a36670759bad433a02d0eb89f935";
-          sha256 = "1byzw9k8g7inwr5icci9i1iar0y6w9zgs91nj04431j003l10xfs";
+          rev = "4d5cc77642164c925f5d0f46bb9c2ef2dafc578f";
+          sha256 = "11ym5kx4rkm7ylyx51dlxh165mj350kfxm1qikavy3bqysh7cqrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zerodark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zerodark-theme";
           sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9";
           name = "zerodark-theme";
         };
@@ -60279,7 +60986,7 @@
           sha256 = "1gb51bqdf87yibs1zngk6q090p05293cpwlwbwzhnih9sl6wkq8x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zlc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zlc";
           sha256 = "0qw0qf14l09mcnw7h0ccbw17psfpra76qfawkc10zpdb5a2167d0";
           name = "zlc";
         };
@@ -60300,7 +61007,7 @@
           sha256 = "1xsxmvbh3xm3zh9yc6q28h48nar6pwyd51xw04b1x7amwkp8qdnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/znc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/znc";
           sha256 = "1z2kzbapgh55wwr5jp7v1wz5kpz4l7n3k94mkh3s068xag9xs6zz";
           name = "znc";
         };
@@ -60321,7 +61028,7 @@
           sha256 = "1gm3ly6czbw4vrxcslm50jy6nxf2qsl656cjwbyhw251wppn75cg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zombie";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zombie";
           sha256 = "0ji3nsxwbxmmygd6plpbc1lkw6i5zw4y6x3r5n2ah3ds4vjr7cnv";
           name = "zombie";
         };
@@ -60342,7 +61049,7 @@
           sha256 = "04m53hzk5n9vxh0gxi8jzpdhsdjlxnvz7hmsisr3bs99v603ha01";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zombie-trellys-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zombie-trellys-mode";
           sha256 = "19xzvppw7f35s82hm0y7sga8dyjjyy0dxy6vji4hxdpjziz7lggv";
           name = "zombie-trellys-mode";
         };
@@ -60363,7 +61070,7 @@
           sha256 = "1zg8fiv62bz7zmalczmfkbgjc6km7n66pzvidivc0p9b9sfxslkp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zone-nyan";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zone-nyan";
           sha256 = "165sgjaahz038isii971m02hr2g5iqhbhiwf5kdn8c739cjaa17b";
           name = "zone-nyan";
         };
@@ -60384,7 +61091,7 @@
           sha256 = "0w550l9im3mhxhja1b7cr9phdcbvx5lprw551lj0d1lv7qvjasz0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zone-rainbow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zone-rainbow";
           sha256 = "0l51fmhvx9vsxbs62cbjgqphb691397f651nqin7cj3dfvchzh4j";
           name = "zone-rainbow";
         };
@@ -60405,7 +61112,7 @@
           sha256 = "17mrzf85ym0x5ih4l6sjdjlcmviabf8c8rpvpkd90gp9qxd8pyx1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zone-select";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zone-select";
           sha256 = "05kc211invmy4ajwf71vgr2b7bdgn99c4a26m95gcjqgy3sh5xzz";
           name = "zone-select";
         };
@@ -60426,7 +61133,7 @@
           sha256 = "0m1q45pza61j0fp8cxkgmds5fyjrk0nqpwhg8m91610m3pvyc3ap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zone-sl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zone-sl";
           sha256 = "04rwd6vj3abk3bzhq3swxwcq5da2n9cldrcmvnqgjr975np4cgs3";
           name = "zone-sl";
         };
@@ -60438,13 +61145,13 @@
       }) {};
     zones = callPackage ({ fetchurl, lib, melpaBuild }: melpaBuild {
         pname = "zones";
-        version = "20151231.1825";
+        version = "20160209.1120";
         src = fetchurl {
           url = "http://www.emacswiki.org/emacs/download/zones.el";
-          sha256 = "1dgadarqz1fvijf9cch24ngkn223jjp08njsfa52qk16k8pdpc12";
+          sha256 = "1g6dpyihwaz28ppndhkw3jzmph6pmcnfhaff926j0zr1j701sqdd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zones";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zones";
           sha256 = "08sl7i7cy22nd1jijc5l7lp75k9z83gfr8q41n72l0vxrpdasc9w";
           name = "zones";
         };
@@ -60465,7 +61172,7 @@
           sha256 = "0ls9x2r12z9ki2fy3cbf05mp28x4ws2gk3knacvw7gvvg4sjdq5w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zonokai-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zonokai-theme";
           sha256 = "1hrpgh03mp7yynqamgzkw7fa70c5pmyjfmfblkfhspnsif8j4v29";
           name = "zonokai-theme";
         };
@@ -60484,7 +61191,7 @@
           sha256 = "1whpd97yjby5zbcr4fcn0nxhqvn6k3jn8k2d15i6ss579kziwdqn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zoom-frm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zoom-frm";
           sha256 = "111lr29zhj8w8j7dbzl58iisqxjhccxpw4spfxx08zxh4623g5mk";
           name = "zoom-frm";
         };
@@ -60505,7 +61212,7 @@
           sha256 = "1kl01dlggsrffvakmwixw9j8cncdmlsw805wvzls6l1711r1zjwj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zoom-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zoom-window";
           sha256 = "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3";
           name = "zoom-window";
         };
@@ -60518,15 +61225,15 @@
     zop-to-char = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zop-to-char";
-        version = "20160117.444";
+        version = "20160212.308";
         src = fetchFromGitHub {
           owner = "thierryvolpiatto";
           repo = "zop-to-char";
-          rev = "d2b89c72777b3ece880b50ac52f5228d7f36c34a";
-          sha256 = "0ybmvn5wriyhpgxqv8xarviyxgy255vbp3yz9d330y29jhdih6zd";
+          rev = "883cb9dbd12a08fba4164f16d7badf7f846c3eff";
+          sha256 = "1hq5ycnj0kwqs25z5rm095d55r768458vc5h5dpjhka5n6c099p1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zop-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zop-to-char";
           sha256 = "0jnspvqqvnaplld083j7cqqxw122qazh88ab7hymci36m3ka9hga";
           name = "zop-to-char";
         };
@@ -60547,7 +61254,7 @@
           sha256 = "0fgwxw7r3zfv0b7xi8bx7kxff2r5hdw9gxf16kwq04fnh18nhi39";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zossima";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zossima";
           sha256 = "11kmnbqv4s8arindg7cxcdhbvfxsckks332wn7aiyb3bjhcgzwjb";
           name = "zossima";
         };
@@ -60568,7 +61275,7 @@
           sha256 = "1335z1v4889njnm98pz2sjk6n7r3vncsz83bk3z6gj5i0ig7wjap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zotelo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zotelo";
           sha256 = "0ai516lqj9yw7ymvfm4n5inv53sp6mg90wy56lr1laflizwxzg8z";
           name = "zotelo";
         };
@@ -60589,7 +61296,7 @@
           sha256 = "015xgsisgsv4w5h6r68f7iw3vwrqvc0az1gcdkd5dfr3nl1h4yzl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zotxt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zotxt";
           sha256 = "18jla05g2k8zfrmp7q9kpr1mpw6smxzdyn8nfghm306wvv9ff8y5";
           name = "zotxt";
         };
@@ -60610,7 +61317,7 @@
           sha256 = "1sxjpbgi7ydmrlv34l16n40qpg969wfcb6kknndrh3fgjjc3p41b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ztree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ztree";
           sha256 = "1fk5xz8qq3azc66f954x5qvym94xnv4fg6wy83ihdfwycsas7j20";
           name = "ztree";
         };
@@ -60631,7 +61338,7 @@
           sha256 = "0v73fgb0gf81vlihiicy32v6x86rr2hv0bxlpw7d3pk4ng1a0l3z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zygospore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zygospore";
           sha256 = "03mmxqbliwd1g73cxd9kqkngdy4jdavcs6j12b4wp27xmhgaj40z";
           name = "zygospore";
         };
@@ -60652,7 +61359,7 @@
           sha256 = "0y0hhar3krkvbpb5y9k197mb0wfpz8cl6fmxazq8msjml7hkk339";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zzz-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zzz-to-char";
           sha256 = "16vwp0krshmn5x3ry1j512g4kydx39znjqzri4j7wgg49bz1n7vh";
           name = "zzz-to-char";
         };

From f5d705aa5804923974f3d066486ed81e199e945f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 21 Feb 2016 04:01:42 +0100
Subject: [PATCH 1638/2285] pinentry: 0.9.6 -> 0.9.7

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

diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix
index 8ccf1ba7ccd1..97e66a250d7c 100644
--- a/pkgs/tools/security/pinentry/default.nix
+++ b/pkgs/tools/security/pinentry/default.nix
@@ -10,11 +10,11 @@ let
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "pinentry-0.9.6";
+  name = "pinentry-0.9.7";
 
   src = fetchurl {
     url = "mirror://gnupg/pinentry/${name}.tar.bz2";
-    sha256 = "0rhyw1vk28kgasjp22myf7m2q8kycw82d65pr9kgh93z17lj849a";
+    sha256 = "1cp7wjqr6nx31mdclr61s2h84ijqjl0ph99kgj4vyawpjj1j1633";
   };
 
   buildInputs = [ libgpgerror libassuan libcap gtk2 ncurses qt4 ];

From 5e0105af9b5c06307c1cc015925fd86043fce4ff Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 20 Feb 2016 05:46:04 +0100
Subject: [PATCH 1639/2285] linux: 4.4.1 -> 4.4.2

---
 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 18bc11926214..dff91095549c 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.1";
+  version = "4.4.2";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0mwaqvl7dkasidciah1al57a1djnsk46ha5mjy4psq2inj71klky";
+    sha256 = "09l6y0nb8yv7l16arfwhy4i5h9pkxcbd7hlbw0015n7gm4i2mzc2";
   };
 
   kernelPatches = args.kernelPatches;

From 06e37e9008c66c0aac2e41bcf8af5c8f2949e157 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 8 Feb 2016 02:19:10 +0100
Subject: [PATCH 1640/2285] youtube-dl: 2016.01.01 -> 2016.02.13

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

diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix
index 8baa5cc91740..526bd6f84aef 100644
--- a/pkgs/tools/misc/youtube-dl/default.nix
+++ b/pkgs/tools/misc/youtube-dl/default.nix
@@ -12,11 +12,11 @@
 buildPythonPackage rec {
 
   name = "youtube-dl-${version}";
-  version = "2016.01.01";
+  version = "2016.02.13";
 
   src = fetchurl {
     url = "http://yt-dl.org/downloads/${stdenv.lib.getVersion name}/${name}.tar.gz";
-    sha256 = "0b0pk8h2iswdiyf65c0zcwcad9dm2hid67fnfafj7d3ikp4kfbvk";
+    sha256 = "0d6ml6nas0pnp6is73fn326ayxkdmxvarzyr96qd6gyjm9icpdcb";
   };
 
   buildInputs = [ makeWrapper zip pandoc ];

From c3c5622817ea593804272b5110c27c8456d53a62 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 18 Feb 2016 03:40:15 +0100
Subject: [PATCH 1641/2285] gajim: Add python-axolotl for OMEMO plugin

---
 .../applications/networking/instant-messengers/gajim/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index fa61876bf161..b1dfee8fa902 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -59,6 +59,7 @@ stdenv.mkDerivation rec {
     pythonPackages.pyxdg
     pythonPackages.nbxmpp
     pythonPackages.pyopenssl pythonDBus
+    pythonPackages.python-axolotl
   ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ]
     ++ optional enableE2E pythonPackages.pycrypto
     ++ optional enableRST pythonPackages.docutils

From d31f58c6889574bd2ab4b7ea3c8670d6e66f0d99 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 18 Dec 2015 11:39:45 +0100
Subject: [PATCH 1642/2285] tinc_pre: 2015-11-07 -> 2016-01-27

Also fixes `--version` parameter in exectuables.
---
 pkgs/tools/networking/tinc/pre.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix
index b8a58db2d1e3..5473a637b6a3 100644
--- a/pkgs/tools/networking/tinc/pre.nix
+++ b/pkgs/tools/networking/tinc/pre.nix
@@ -1,17 +1,23 @@
 { stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "tinc-1.1pre-2015-11-07";
+  name = "tinc-${version}";
+  rev = "d8ca00fe40ff4b6d87e7e64c273f536fab462356";
+  version = "1.1pre-2016-01-28-${builtins.substring 0 7 rev}";
 
   src = fetchgit {
+    inherit rev;
     url = "git://tinc-vpn.org/tinc";
-    rev = "bdd84660c756437cf3bc8f64adf612055acc84ea";
-    sha256 = "1vkpdn3gjlrrm0rfpbhz410mpcq16xy0ilvgkxsgifc9xgdgflmn";
+    sha256 = "0wqgzbqlafbkmj71vhfrqwmp61g95amzd43py47kq3fn5aiybcqf";
   };
 
   nativeBuildInputs = [ autoreconfHook texinfo ];
   buildInputs = [ ncurses readline zlib lzo openssl ];
 
+  prePatch = ''
+    substituteInPlace configure.ac --replace UNKNOWN ${version}
+  '';
+
   configureFlags = [
     "--sysconfdir=/etc"
     "--localstatedir=/var"
@@ -28,6 +34,6 @@ stdenv.mkDerivation rec {
     homepage="http://www.tinc-vpn.org/";
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ wkennington ];
+    maintainers = with maintainers; [ wkennington fpletz ];
   };
 }

From 9c0121be81fa8c5e6b5f7bd23326dd76d22e5d0b Mon Sep 17 00:00:00 2001
From: Mathnerd314 <mathnerd314.gph+hs@gmail.com>
Date: Mon, 19 Oct 2015 09:11:12 -0600
Subject: [PATCH 1643/2285] all-packages: Rewrite packageOverrides to use
 fix'/extends

This way is cleaner, slightly faster (as shown by
some quick tests) and causes no rebuilds.

It could cause some evaluation errors though.
---
 pkgs/top-level/all-packages.nix | 96 +++++++++++++++------------------
 1 file changed, 42 insertions(+), 54 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 476bdb0b9de5..6f20f70855fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -64,7 +64,7 @@ let
       # { /* the config */ } and
       # { pkgs, ... } : { /* the config */ }
       if builtins.isFunction configExpr
-        then configExpr { inherit pkgs; }
+        then configExpr { pkgs = pkgsFinal; }
         else configExpr;
 
   # Allow setting the platform in the config file. Otherwise, let's use a reasonable default (pc)
@@ -83,51 +83,38 @@ let
   platform = if platform_ != null then platform_
     else config.platform or platformAuto;
 
-  # Helper functions that are exported through `pkgs'.
-  helperFunctions =
-    stdenvAdapters //
-    (import ../build-support/trivial-builders.nix { inherit lib; inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; });
+  # The complete set of packages, after applying the overrides
+  pkgsFinal = lib.fix' (lib.extends configOverrides (lib.extends stdenvOverrides pkgsFun));
 
-  stdenvAdapters =
-    import ../stdenv/adapters.nix pkgs;
+  stdenvOverrides =
+    # We don't want stdenv overrides in the case of cross-building,
+    # or otherwise the basic overrided packages will not be built
+    # with the crossStdenv adapter.
+    if crossSystem == null
+      then self: super: lib.optionalAttrs (super.stdenv ? overrides) (super.stdenv.overrides super)
+      else self: super: {};
 
-
-  # Allow packages to be overriden globally via the `packageOverrides'
+  # Packages can be overriden globally via the `packageOverrides'
   # configuration option, which must be a function that takes `pkgs'
   # as an argument and returns a set of new or overriden packages.
-  # The `packageOverrides' function is called with the *original*
-  # (un-overriden) set of packages, allowing packageOverrides
-  # attributes to refer to the original attributes (e.g. "foo =
-  # ... pkgs.foo ...").
-  pkgs = applyGlobalOverrides (config.packageOverrides or (pkgs: {}));
-
-  mkOverrides = pkgsOrig: overrides: overrides //
-        (lib.optionalAttrs (pkgsOrig.stdenv ? overrides && crossSystem == null) (pkgsOrig.stdenv.overrides pkgsOrig));
-
-  # Return the complete set of packages, after applying the overrides
-  # returned by the `overrider' function (see above).  Warning: this
-  # function is very expensive!
-  applyGlobalOverrides = overrider:
-    let
-      # Call the overrider function.  We don't want stdenv overrides
-      # in the case of cross-building, or otherwise the basic
-      # overrided packages will not be built with the crossStdenv
-      # adapter.
-      overrides = mkOverrides pkgsOrig (overrider pkgsOrig);
-
-      # The un-overriden packages, passed to `overrider'.
-      pkgsOrig = pkgsFun pkgs {};
-
-      # The overriden, final packages.
-      pkgs = pkgsFun pkgs overrides;
-    in pkgs;
-
+  # The recommended usage follows this snippet:
+  #   packageOverrides = super: let self = super.pkgs in ...
+  # `super' is the *original* (un-overriden) set of packages,
+  # while `self' refers to the final (overriden) set of packages.
+  configOverrides =
+      if config ? packageOverrides && bootStdenv == null # don't apply config overrides in stdenv boot
+        then self: config.packageOverrides
+        else self: super: {};
 
   # The package compositions.  Yes, this isn't properly indented.
-  pkgsFun = pkgs: overrides:
-    with helperFunctions;
-    let defaultScope = pkgs // pkgs.xorg; self = self_ // overrides;
-    self_ = with self; helperFunctions // {
+  pkgsFun = pkgs:
+    let defaultScope = pkgs // pkgs.xorg;
+        helperFunctions = pkgs_.stdenvAdapters // pkgs_.trivial-builders;
+        pkgsRet = helperFunctions // pkgs_;
+        pkgs_ = with pkgs; {
+  # Helper functions that are exported through `pkgs'.
+  trivial-builders = import ../build-support/trivial-builders.nix { inherit lib; inherit stdenv; inherit (xorg) lndir; };
+  stdenvAdapters = import ../stdenv/adapters.nix pkgs;
 
   # Make some arguments passed to all-packages.nix available
   inherit system platform;
@@ -157,11 +144,7 @@ let
   #
   # The result is `pkgs' where all the derivations depending on `foo'
   # will use the new version.
-  overridePackages = f:
-    let
-      newpkgs = pkgsFun newpkgs overrides;
-      overrides = mkOverrides pkgs (f newpkgs pkgs);
-    in newpkgs;
+  overridePackages = f: lib.fix' (lib.extends f pkgs.__unfix__);
 
   # Override system. This is useful to build i686 packages on x86_64-linux.
   forceSystem = system: kernel: (import ./all-packages.nix) {
@@ -183,7 +166,7 @@ let
 
 
   ### Helper functions.
-  inherit lib config stdenvAdapters;
+  inherit lib config;
 
   inherit (lib) lowPrio hiPrio appendToName makeOverridable;
   inherit (misc) versionedDerivation;
@@ -214,7 +197,8 @@ let
     allPackages = args: import ./all-packages.nix ({ inherit config system; } // args);
   };
 
-  defaultStdenv = allStdenvs.stdenv // { inherit platform; };
+  # We use pkgs_ because accessing pkgs would lead to an infinite recursion in stdenvOverrides
+  defaultStdenv = pkgs_.allStdenvs.stdenv // { inherit platform; };
 
   stdenvCross = lowPrio (makeStdenvCross defaultStdenv crossSystem binutilsCross gccCrossStageFinal);
 
@@ -234,7 +218,7 @@ let
             };
           }
       else
-        defaultStdenv;
+        pkgs_.defaultStdenv;
 
   forceNativeDrv = drv : if crossSystem == null then drv else
     (drv // { crossDrv = drv.nativeDrv; });
@@ -5927,8 +5911,8 @@ let
   gotty = goPackages.gotty.bin // { outputs = [ "bin" ]; };
 
   gradleGen = callPackage ../development/tools/build-managers/gradle { };
-  gradle = self.gradleGen.gradleLatest;
-  gradle25 = self.gradleGen.gradle25;
+  gradle = gradleGen.gradleLatest;
+  gradle25 = gradleGen.gradle25;
 
   gperf = callPackage ../development/tools/misc/gperf { };
 
@@ -11761,7 +11745,7 @@ let
       AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
       ImageCaptureCore GSS ImageIO;
   });
-  emacs24Macport = self.emacs24Macport_24_5;
+  emacs24Macport = emacs24Macport_24_5;
 
   emacs25pre = lowPrio (callPackage ../applications/editors/emacs-25 {
     # use override to enable additional features
@@ -16103,12 +16087,13 @@ let
 
   mg = callPackage ../applications/editors/mg { };
 
-}; # self_ =
+};
+# end pkgs_ =
 
 
   ### Deprecated aliases - for backward compatibility
 
-aliases = with self; rec {
+aliases = with pkgs; {
   accounts-qt = qt5.accounts-qt;  # added 2015-12-19
   adobeReader = adobe-reader;
   arduino_core = arduino-core;  # added 2015-02-04
@@ -16195,4 +16180,7 @@ tweakAlias = _n: alias: with lib;
     removeAttrs alias ["recurseForDerivations"]
   else alias;
 
-in lib.mapAttrs tweakAlias aliases // self; in pkgs
+in lib.mapAttrs tweakAlias aliases // pkgsRet;
+# end pkgsFun
+
+in pkgsFinal

From 491007d0a1c8332f6595cd5892541a3e1f6cddf3 Mon Sep 17 00:00:00 2001
From: Allan Espinosa <allan.espinosa@outlook.com>
Date: Mon, 22 Feb 2016 00:37:07 -0600
Subject: [PATCH 1644/2285] jenkins: 1.647 -> 1.649

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index 1427e25fb939..c2473ce754c3 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "1.647";
+  version = "1.649";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "03r0wic5y8yhpa353s5px7l6m63p7jkb56sh6k4k5dacsc4qcxsj";
+    sha256 = "10lvrdd6mfgkz0rdc41hg9fai44vzxy6qlayfvkjg29xgqm0n9ya";
   };
   meta = with stdenv.lib; {
     description = "An extendable open source continuous integration server";

From 4ec4666762ba1fdc16a9935fdf072598ed905527 Mon Sep 17 00:00:00 2001
From: Brian McKenna <bmckenna@atlassian.com>
Date: Mon, 22 Feb 2016 17:55:03 +1100
Subject: [PATCH 1645/2285] playerctl: init at 0.4.2

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

diff --git a/pkgs/tools/audio/playerctl/default.nix b/pkgs/tools/audio/playerctl/default.nix
new file mode 100644
index 000000000000..0e2b11a1f06d
--- /dev/null
+++ b/pkgs/tools/audio/playerctl/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchFromGitHub, autoconf, automake, libtool, which, gnome, glib,
+  pkgconfig, gobjectIntrospection }:
+
+stdenv.mkDerivation rec {
+  name = "playerctl";
+  version = "0.4.2";
+
+  src = fetchFromGitHub {
+    owner = "acrisci";
+    repo = "playerctl";
+    rev = "v${version}";
+    sha256 = "0dy6wc7qr00p53hlhpbg9x40w4ag95r2i7r1nsyb4ym3wzrvskzh";
+  };
+
+  buildInputs = [
+    which autoconf automake libtool gnome.gtkdoc glib pkgconfig
+    gobjectIntrospection
+  ];
+
+  preConfigure = "./autogen.sh";
+
+  meta = with stdenv.lib; {
+    description = "Command-line utility and library for controlling media players that implement MPRIS";
+    homepage = https://github.com/acrisci/playerctl;
+    license = licenses.lgpl3;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ puffnfresh ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c19682986579..14de089b1608 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -929,6 +929,8 @@ let
     pynotify = pythonPackages.notify;
   };
 
+  playerctl = callPackage ../tools/audio/playerctl { };
+
   syscall_limiter = callPackage ../os-specific/linux/syscall_limiter {};
 
   syslogng = callPackage ../tools/system/syslog-ng { };

From e713765b53c930fd6ec5e3fbdeb4efe6f14335af Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 15 Feb 2016 19:08:37 +0100
Subject: [PATCH 1646/2285] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20151217-10-ga610b1b using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/096bee7aef8258ca1d62544c2ddd9f82008af9e8
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/735e006a185b5a0b998e33eb7deab87cd71ef8df
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/bbcada892fe77b0f4cdb3efca602c85a872e888b
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/b41dbc58b210ff13eccf71b04d9ed7055aa07df3
---
 .../haskell-modules/configuration-lts-0.0.nix |   18 +
 .../haskell-modules/configuration-lts-0.1.nix |   18 +
 .../haskell-modules/configuration-lts-0.2.nix |   18 +
 .../haskell-modules/configuration-lts-0.3.nix |   18 +
 .../haskell-modules/configuration-lts-0.4.nix |   18 +
 .../haskell-modules/configuration-lts-0.5.nix |   18 +
 .../haskell-modules/configuration-lts-0.6.nix |   19 +
 .../haskell-modules/configuration-lts-0.7.nix |   19 +
 .../haskell-modules/configuration-lts-1.0.nix |   19 +
 .../haskell-modules/configuration-lts-1.1.nix |   19 +
 .../configuration-lts-1.10.nix                |   19 +
 .../configuration-lts-1.11.nix                |   19 +
 .../configuration-lts-1.12.nix                |   19 +
 .../configuration-lts-1.13.nix                |   19 +
 .../configuration-lts-1.14.nix                |   19 +
 .../configuration-lts-1.15.nix                |   19 +
 .../haskell-modules/configuration-lts-1.2.nix |   19 +
 .../haskell-modules/configuration-lts-1.4.nix |   19 +
 .../haskell-modules/configuration-lts-1.5.nix |   19 +
 .../haskell-modules/configuration-lts-1.7.nix |   19 +
 .../haskell-modules/configuration-lts-1.8.nix |   19 +
 .../haskell-modules/configuration-lts-1.9.nix |   19 +
 .../haskell-modules/configuration-lts-2.0.nix |   21 +
 .../haskell-modules/configuration-lts-2.1.nix |   21 +
 .../configuration-lts-2.10.nix                |   26 +
 .../configuration-lts-2.11.nix                |   26 +
 .../configuration-lts-2.12.nix                |   26 +
 .../configuration-lts-2.13.nix                |   26 +
 .../configuration-lts-2.14.nix                |   26 +
 .../configuration-lts-2.15.nix                |   27 +
 .../configuration-lts-2.16.nix                |   27 +
 .../configuration-lts-2.17.nix                |   27 +
 .../configuration-lts-2.18.nix                |   28 +
 .../configuration-lts-2.19.nix                |   28 +
 .../haskell-modules/configuration-lts-2.2.nix |   21 +
 .../configuration-lts-2.20.nix                |   28 +
 .../configuration-lts-2.21.nix                |   28 +
 .../configuration-lts-2.22.nix                |   28 +
 .../haskell-modules/configuration-lts-2.3.nix |   21 +
 .../haskell-modules/configuration-lts-2.4.nix |   22 +
 .../haskell-modules/configuration-lts-2.5.nix |   23 +
 .../haskell-modules/configuration-lts-2.6.nix |   23 +
 .../haskell-modules/configuration-lts-2.7.nix |   23 +
 .../haskell-modules/configuration-lts-2.8.nix |   23 +
 .../haskell-modules/configuration-lts-2.9.nix |   25 +
 .../haskell-modules/configuration-lts-3.0.nix |   31 +
 .../haskell-modules/configuration-lts-3.1.nix |   31 +
 .../configuration-lts-3.10.nix                |   40 +
 .../configuration-lts-3.11.nix                |   40 +
 .../configuration-lts-3.12.nix                |   40 +
 .../configuration-lts-3.13.nix                |   40 +
 .../configuration-lts-3.14.nix                |   43 +
 .../configuration-lts-3.15.nix                |   43 +
 .../configuration-lts-3.16.nix                |   43 +
 .../configuration-lts-3.17.nix                |   45 +
 .../configuration-lts-3.18.nix                |   45 +
 .../configuration-lts-3.19.nix                |   45 +
 .../haskell-modules/configuration-lts-3.2.nix |   32 +
 .../configuration-lts-3.20.nix                |   45 +
 .../configuration-lts-3.21.nix                |   47 +
 .../configuration-lts-3.22.nix                |   47 +
 .../haskell-modules/configuration-lts-3.3.nix |   33 +
 .../haskell-modules/configuration-lts-3.4.nix |   33 +
 .../haskell-modules/configuration-lts-3.5.nix |   34 +
 .../haskell-modules/configuration-lts-3.6.nix |   36 +
 .../haskell-modules/configuration-lts-3.7.nix |   38 +
 .../haskell-modules/configuration-lts-3.8.nix |   39 +
 .../haskell-modules/configuration-lts-3.9.nix |   39 +
 .../haskell-modules/configuration-lts-4.0.nix |   61 +
 .../haskell-modules/configuration-lts-4.1.nix |   62 +
 .../haskell-modules/configuration-lts-4.2.nix |   68 +
 .../haskell-modules/configuration-lts-5.0.nix |   80 +
 .../haskell-modules/configuration-lts-5.1.nix |   83 +
 .../haskell-modules/configuration-lts-5.2.nix |   83 +
 .../haskell-modules/configuration-lts-5.3.nix | 7725 +++++++++++++++++
 .../haskell-modules/hackage-packages.nix      | 2502 ++++--
 76 files changed, 11949 insertions(+), 610 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/configuration-lts-5.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 64ea9e9b6f79..7ac9c0a12832 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -734,6 +734,7 @@ self: super: {
   "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";
@@ -2685,6 +2686,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = dontDistribute super."diagrams-rasterific";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_3";
@@ -3719,6 +3721,7 @@ self: super: {
   "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";
@@ -3773,6 +3776,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3932,6 +3936,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4495,6 +4500,7 @@ self: super: {
   "hpc-coveralls" = dontDistribute super."hpc-coveralls";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4909,6 +4915,7 @@ self: super: {
   "imagemagick" = dontDistribute super."imagemagick";
   "imagepaste" = dontDistribute super."imagepaste";
   "imagesize-conduit" = doDistribute super."imagesize-conduit_1_0_0_4";
+  "imap" = dontDistribute super."imap";
   "imapget" = dontDistribute super."imapget";
   "imbib" = dontDistribute super."imbib";
   "imgurder" = dontDistribute super."imgurder";
@@ -5149,6 +5156,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_1_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5533,6 +5541,7 @@ self: super: {
   "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";
@@ -5540,6 +5549,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5893,6 +5903,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -6768,6 +6779,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7280,6 +7292,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7357,6 +7370,7 @@ self: super: {
   "servant-client" = dontDistribute super."servant-client";
   "servant-docs" = dontDistribute super."servant-docs";
   "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-jquery" = dontDistribute super."servant-jquery";
@@ -7827,6 +7841,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_7_3";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7892,6 +7907,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -8014,6 +8030,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8489,6 +8506,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index b2bf2ceecbbc..56f08b2f1e15 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -734,6 +734,7 @@ self: super: {
   "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";
@@ -2685,6 +2686,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = dontDistribute super."diagrams-rasterific";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_3";
@@ -3719,6 +3721,7 @@ self: super: {
   "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";
@@ -3773,6 +3776,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3932,6 +3936,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4495,6 +4500,7 @@ self: super: {
   "hpc-coveralls" = dontDistribute super."hpc-coveralls";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4909,6 +4915,7 @@ self: super: {
   "imagemagick" = dontDistribute super."imagemagick";
   "imagepaste" = dontDistribute super."imagepaste";
   "imagesize-conduit" = doDistribute super."imagesize-conduit_1_0_0_4";
+  "imap" = dontDistribute super."imap";
   "imapget" = dontDistribute super."imapget";
   "imbib" = dontDistribute super."imbib";
   "imgurder" = dontDistribute super."imgurder";
@@ -5149,6 +5156,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_1_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5533,6 +5541,7 @@ self: super: {
   "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";
@@ -5540,6 +5549,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5893,6 +5903,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -6768,6 +6779,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7280,6 +7292,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7357,6 +7370,7 @@ self: super: {
   "servant-client" = dontDistribute super."servant-client";
   "servant-docs" = dontDistribute super."servant-docs";
   "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-jquery" = dontDistribute super."servant-jquery";
@@ -7827,6 +7841,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_7_3";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7892,6 +7907,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -8014,6 +8030,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8489,6 +8506,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 67982120f408..3d4c59742e30 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -734,6 +734,7 @@ self: super: {
   "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";
@@ -2685,6 +2686,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = dontDistribute super."diagrams-rasterific";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_3";
@@ -3719,6 +3721,7 @@ self: super: {
   "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";
@@ -3773,6 +3776,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3932,6 +3936,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4495,6 +4500,7 @@ self: super: {
   "hpc-coveralls" = dontDistribute super."hpc-coveralls";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4909,6 +4915,7 @@ self: super: {
   "imagemagick" = dontDistribute super."imagemagick";
   "imagepaste" = dontDistribute super."imagepaste";
   "imagesize-conduit" = doDistribute super."imagesize-conduit_1_0_0_4";
+  "imap" = dontDistribute super."imap";
   "imapget" = dontDistribute super."imapget";
   "imbib" = dontDistribute super."imbib";
   "imgurder" = dontDistribute super."imgurder";
@@ -5149,6 +5156,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_1_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5533,6 +5541,7 @@ self: super: {
   "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";
@@ -5540,6 +5549,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5893,6 +5903,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -6768,6 +6779,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7280,6 +7292,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7357,6 +7370,7 @@ self: super: {
   "servant-client" = dontDistribute super."servant-client";
   "servant-docs" = dontDistribute super."servant-docs";
   "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-jquery" = dontDistribute super."servant-jquery";
@@ -7827,6 +7841,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_7_3";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7892,6 +7907,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -8014,6 +8030,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8489,6 +8506,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index b8965141bec3..52ce8fe742d8 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -734,6 +734,7 @@ self: super: {
   "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";
@@ -2685,6 +2686,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = dontDistribute super."diagrams-rasterific";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_3";
@@ -3719,6 +3721,7 @@ self: super: {
   "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";
@@ -3773,6 +3776,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3932,6 +3936,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4495,6 +4500,7 @@ self: super: {
   "hpc-coveralls" = dontDistribute super."hpc-coveralls";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4909,6 +4915,7 @@ self: super: {
   "imagemagick" = dontDistribute super."imagemagick";
   "imagepaste" = dontDistribute super."imagepaste";
   "imagesize-conduit" = doDistribute super."imagesize-conduit_1_0_0_4";
+  "imap" = dontDistribute super."imap";
   "imapget" = dontDistribute super."imapget";
   "imbib" = dontDistribute super."imbib";
   "imgurder" = dontDistribute super."imgurder";
@@ -5149,6 +5156,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_1_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5533,6 +5541,7 @@ self: super: {
   "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";
@@ -5540,6 +5549,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5893,6 +5903,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -6768,6 +6779,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7280,6 +7292,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7357,6 +7370,7 @@ self: super: {
   "servant-client" = dontDistribute super."servant-client";
   "servant-docs" = dontDistribute super."servant-docs";
   "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-jquery" = dontDistribute super."servant-jquery";
@@ -7827,6 +7841,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_7_3";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7892,6 +7907,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -8014,6 +8030,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8489,6 +8506,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index 03bf57f3aa21..c5b407f3039a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -734,6 +734,7 @@ self: super: {
   "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";
@@ -2684,6 +2685,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = dontDistribute super."diagrams-rasterific";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_3";
@@ -3718,6 +3720,7 @@ self: super: {
   "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";
@@ -3772,6 +3775,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3929,6 +3933,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4492,6 +4497,7 @@ self: super: {
   "hpc-coveralls" = dontDistribute super."hpc-coveralls";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4906,6 +4912,7 @@ self: super: {
   "imagemagick" = dontDistribute super."imagemagick";
   "imagepaste" = dontDistribute super."imagepaste";
   "imagesize-conduit" = doDistribute super."imagesize-conduit_1_0_0_4";
+  "imap" = dontDistribute super."imap";
   "imapget" = dontDistribute super."imapget";
   "imbib" = dontDistribute super."imbib";
   "imgurder" = dontDistribute super."imgurder";
@@ -5146,6 +5153,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_1_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5530,6 +5538,7 @@ self: super: {
   "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";
@@ -5537,6 +5546,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5890,6 +5900,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -6765,6 +6776,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7276,6 +7288,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7353,6 +7366,7 @@ self: super: {
   "servant-client" = dontDistribute super."servant-client";
   "servant-docs" = dontDistribute super."servant-docs";
   "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-jquery" = dontDistribute super."servant-jquery";
@@ -7823,6 +7837,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_8";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7888,6 +7903,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -8010,6 +8026,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8485,6 +8502,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index 9e0026afb0b5..75fe2a262491 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -734,6 +734,7 @@ self: super: {
   "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";
@@ -2684,6 +2685,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = dontDistribute super."diagrams-rasterific";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_3";
@@ -3718,6 +3720,7 @@ self: super: {
   "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";
@@ -3772,6 +3775,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3929,6 +3933,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4492,6 +4497,7 @@ self: super: {
   "hpc-coveralls" = dontDistribute super."hpc-coveralls";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4906,6 +4912,7 @@ self: super: {
   "imagemagick" = dontDistribute super."imagemagick";
   "imagepaste" = dontDistribute super."imagepaste";
   "imagesize-conduit" = doDistribute super."imagesize-conduit_1_0_0_4";
+  "imap" = dontDistribute super."imap";
   "imapget" = dontDistribute super."imapget";
   "imbib" = dontDistribute super."imbib";
   "imgurder" = dontDistribute super."imgurder";
@@ -5146,6 +5153,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_1_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5530,6 +5538,7 @@ self: super: {
   "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";
@@ -5537,6 +5546,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5890,6 +5900,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -6765,6 +6776,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7276,6 +7288,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7353,6 +7366,7 @@ self: super: {
   "servant-client" = dontDistribute super."servant-client";
   "servant-docs" = dontDistribute super."servant-docs";
   "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-jquery" = dontDistribute super."servant-jquery";
@@ -7823,6 +7837,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_8";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7888,6 +7903,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -8010,6 +8026,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8485,6 +8502,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index 24208bf0d225..69ebdb8e3abb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -733,6 +733,7 @@ self: super: {
   "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";
@@ -2683,6 +2684,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = dontDistribute super."diagrams-rasterific";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_3";
@@ -3717,6 +3719,7 @@ self: super: {
   "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";
@@ -3771,6 +3774,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3928,6 +3932,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4490,6 +4495,7 @@ self: super: {
   "hpc-coveralls" = dontDistribute super."hpc-coveralls";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4904,6 +4910,7 @@ self: super: {
   "imagemagick" = dontDistribute super."imagemagick";
   "imagepaste" = dontDistribute super."imagepaste";
   "imagesize-conduit" = doDistribute super."imagesize-conduit_1_0_0_4";
+  "imap" = dontDistribute super."imap";
   "imapget" = dontDistribute super."imapget";
   "imbib" = dontDistribute super."imbib";
   "imgurder" = dontDistribute super."imgurder";
@@ -5144,6 +5151,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_1_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5528,6 +5536,7 @@ self: super: {
   "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";
@@ -5535,6 +5544,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5888,6 +5898,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -6100,6 +6111,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri" = doDistribute super."network-uri_2_5_0_0";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -6762,6 +6774,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7272,6 +7285,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7349,6 +7363,7 @@ self: super: {
   "servant-client" = dontDistribute super."servant-client";
   "servant-docs" = dontDistribute super."servant-docs";
   "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-jquery" = dontDistribute super."servant-jquery";
@@ -7819,6 +7834,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_8";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7884,6 +7900,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -8006,6 +8023,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8481,6 +8499,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index 5ca65df38d5d..223d20571bde 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -733,6 +733,7 @@ self: super: {
   "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";
@@ -2683,6 +2684,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = dontDistribute super."diagrams-rasterific";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_3";
@@ -3717,6 +3719,7 @@ self: super: {
   "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";
@@ -3771,6 +3774,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3928,6 +3932,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4490,6 +4495,7 @@ self: super: {
   "hpc-coveralls" = dontDistribute super."hpc-coveralls";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4904,6 +4910,7 @@ self: super: {
   "imagemagick" = dontDistribute super."imagemagick";
   "imagepaste" = dontDistribute super."imagepaste";
   "imagesize-conduit" = doDistribute super."imagesize-conduit_1_0_0_4";
+  "imap" = dontDistribute super."imap";
   "imapget" = dontDistribute super."imapget";
   "imbib" = dontDistribute super."imbib";
   "imgurder" = dontDistribute super."imgurder";
@@ -5144,6 +5151,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_1_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5528,6 +5536,7 @@ self: super: {
   "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";
@@ -5535,6 +5544,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5888,6 +5898,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -6100,6 +6111,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri" = doDistribute super."network-uri_2_5_0_0";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -6762,6 +6774,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7272,6 +7285,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7349,6 +7363,7 @@ self: super: {
   "servant-client" = dontDistribute super."servant-client";
   "servant-docs" = dontDistribute super."servant-docs";
   "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-jquery" = dontDistribute super."servant-jquery";
@@ -7819,6 +7834,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_8";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7884,6 +7900,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -8006,6 +8023,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8481,6 +8499,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index 1cbd61fe493b..c88b0e0759cc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -730,6 +730,7 @@ self: super: {
   "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";
@@ -2675,6 +2676,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = dontDistribute super."diagrams-rasterific";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_3";
@@ -3707,6 +3709,7 @@ self: super: {
   "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";
@@ -3761,6 +3764,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3918,6 +3922,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4480,6 +4485,7 @@ self: super: {
   "hpc-coveralls" = dontDistribute super."hpc-coveralls";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4893,6 +4899,7 @@ self: super: {
   "imagemagick" = dontDistribute super."imagemagick";
   "imagepaste" = dontDistribute super."imagepaste";
   "imagesize-conduit" = doDistribute super."imagesize-conduit_1_0_0_4";
+  "imap" = dontDistribute super."imap";
   "imapget" = dontDistribute super."imapget";
   "imbib" = dontDistribute super."imbib";
   "imgurder" = dontDistribute super."imgurder";
@@ -5133,6 +5140,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5517,6 +5525,7 @@ self: super: {
   "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";
@@ -5524,6 +5533,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5877,6 +5887,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -6089,6 +6100,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri" = doDistribute super."network-uri_2_6_0_1";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -6751,6 +6763,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7260,6 +7273,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7337,6 +7351,7 @@ self: super: {
   "servant-client" = dontDistribute super."servant-client";
   "servant-docs" = dontDistribute super."servant-docs";
   "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-jquery" = dontDistribute super."servant-jquery";
@@ -7806,6 +7821,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_8";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7871,6 +7887,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7993,6 +8010,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8467,6 +8485,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index e983e46a408c..28189cb09cf1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -730,6 +730,7 @@ self: super: {
   "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";
@@ -2673,6 +2674,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = dontDistribute super."diagrams-rasterific";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_3";
@@ -3704,6 +3706,7 @@ self: super: {
   "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";
@@ -3758,6 +3761,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3915,6 +3919,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4474,6 +4479,7 @@ self: super: {
   "hpc-coveralls" = dontDistribute super."hpc-coveralls";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4887,6 +4893,7 @@ self: super: {
   "imagemagick" = dontDistribute super."imagemagick";
   "imagepaste" = dontDistribute super."imagepaste";
   "imagesize-conduit" = doDistribute super."imagesize-conduit_1_0_0_4";
+  "imap" = dontDistribute super."imap";
   "imapget" = dontDistribute super."imapget";
   "imbib" = dontDistribute super."imbib";
   "imgurder" = dontDistribute super."imgurder";
@@ -5127,6 +5134,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5511,6 +5519,7 @@ self: super: {
   "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";
@@ -5518,6 +5527,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5870,6 +5880,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -6082,6 +6093,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri" = doDistribute super."network-uri_2_6_0_1";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -6744,6 +6756,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7253,6 +7266,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7330,6 +7344,7 @@ self: super: {
   "servant-client" = dontDistribute super."servant-client";
   "servant-docs" = dontDistribute super."servant-docs";
   "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-jquery" = dontDistribute super."servant-jquery";
@@ -7797,6 +7812,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_8_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7862,6 +7878,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7984,6 +8001,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8454,6 +8472,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index c22d8e43cb7e..c1b5f626abfe 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -729,6 +729,7 @@ self: super: {
   "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";
@@ -2669,6 +2670,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = dontDistribute super."diagrams-rasterific";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4";
@@ -3695,6 +3697,7 @@ self: super: {
   "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";
@@ -3749,6 +3752,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3905,6 +3909,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4463,6 +4468,7 @@ self: super: {
   "hpc-coveralls" = dontDistribute super."hpc-coveralls";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4871,6 +4877,7 @@ self: super: {
   "imagemagick" = dontDistribute super."imagemagick";
   "imagepaste" = dontDistribute super."imagepaste";
   "imagesize-conduit" = doDistribute super."imagesize-conduit_1_0_0_4";
+  "imap" = dontDistribute super."imap";
   "imapget" = dontDistribute super."imapget";
   "imbib" = dontDistribute super."imbib";
   "imgurder" = dontDistribute super."imgurder";
@@ -5111,6 +5118,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5494,6 +5502,7 @@ self: super: {
   "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";
@@ -5501,6 +5510,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5853,6 +5863,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -6063,6 +6074,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri" = doDistribute super."network-uri_2_6_0_1";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -6724,6 +6736,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7232,6 +7245,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7308,6 +7322,7 @@ self: super: {
   "servant-client" = dontDistribute super."servant-client";
   "servant-docs" = dontDistribute super."servant-docs";
   "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-jquery" = dontDistribute super."servant-jquery";
@@ -7774,6 +7789,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7839,6 +7855,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7959,6 +7976,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8427,6 +8445,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index 0f85aa6e7aae..34bf08330929 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -729,6 +729,7 @@ self: super: {
   "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";
@@ -2669,6 +2670,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = dontDistribute super."diagrams-rasterific";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4";
@@ -3694,6 +3696,7 @@ self: super: {
   "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";
@@ -3748,6 +3751,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3904,6 +3908,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4462,6 +4467,7 @@ self: super: {
   "hpc-coveralls" = dontDistribute super."hpc-coveralls";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4869,6 +4875,7 @@ self: super: {
   "imagemagick" = dontDistribute super."imagemagick";
   "imagepaste" = dontDistribute super."imagepaste";
   "imagesize-conduit" = doDistribute super."imagesize-conduit_1_0_0_4";
+  "imap" = dontDistribute super."imap";
   "imapget" = dontDistribute super."imapget";
   "imbib" = dontDistribute super."imbib";
   "imgurder" = dontDistribute super."imgurder";
@@ -5108,6 +5115,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5490,6 +5498,7 @@ self: super: {
   "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";
@@ -5497,6 +5506,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5849,6 +5859,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -6059,6 +6070,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri" = doDistribute super."network-uri_2_6_0_1";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -6720,6 +6732,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7228,6 +7241,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7304,6 +7318,7 @@ self: super: {
   "servant-client" = dontDistribute super."servant-client";
   "servant-docs" = dontDistribute super."servant-docs";
   "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-jquery" = dontDistribute super."servant-jquery";
@@ -7770,6 +7785,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7835,6 +7851,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7955,6 +7972,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8423,6 +8441,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index ace1963e3391..4960dfb11423 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -729,6 +729,7 @@ self: super: {
   "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";
@@ -2669,6 +2670,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = dontDistribute super."diagrams-rasterific";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4";
@@ -3694,6 +3696,7 @@ self: super: {
   "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";
@@ -3748,6 +3751,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3904,6 +3908,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4461,6 +4466,7 @@ self: super: {
   "hpc-coveralls" = dontDistribute super."hpc-coveralls";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4868,6 +4874,7 @@ self: super: {
   "imagemagick" = dontDistribute super."imagemagick";
   "imagepaste" = dontDistribute super."imagepaste";
   "imagesize-conduit" = doDistribute super."imagesize-conduit_1_0_0_4";
+  "imap" = dontDistribute super."imap";
   "imapget" = dontDistribute super."imapget";
   "imbib" = dontDistribute super."imbib";
   "imgurder" = dontDistribute super."imgurder";
@@ -5107,6 +5114,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5489,6 +5497,7 @@ self: super: {
   "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";
@@ -5496,6 +5505,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5848,6 +5858,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -6058,6 +6069,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri" = doDistribute super."network-uri_2_6_0_1";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -6719,6 +6731,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7227,6 +7240,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7303,6 +7317,7 @@ self: super: {
   "servant-client" = dontDistribute super."servant-client";
   "servant-docs" = dontDistribute super."servant-docs";
   "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-jquery" = dontDistribute super."servant-jquery";
@@ -7769,6 +7784,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7834,6 +7850,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7954,6 +7971,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8421,6 +8439,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 5f1e148e5e1c..700792e04d34 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -729,6 +729,7 @@ self: super: {
   "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";
@@ -2669,6 +2670,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = dontDistribute super."diagrams-rasterific";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4";
@@ -3694,6 +3696,7 @@ self: super: {
   "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";
@@ -3748,6 +3751,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3903,6 +3907,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4460,6 +4465,7 @@ self: super: {
   "hpc-coveralls" = dontDistribute super."hpc-coveralls";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4867,6 +4873,7 @@ self: super: {
   "imagemagick" = dontDistribute super."imagemagick";
   "imagepaste" = dontDistribute super."imagepaste";
   "imagesize-conduit" = doDistribute super."imagesize-conduit_1_0_0_4";
+  "imap" = dontDistribute super."imap";
   "imapget" = dontDistribute super."imapget";
   "imbib" = dontDistribute super."imbib";
   "imgurder" = dontDistribute super."imgurder";
@@ -5106,6 +5113,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5488,6 +5496,7 @@ self: super: {
   "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";
@@ -5495,6 +5504,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5847,6 +5857,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -6057,6 +6068,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri" = doDistribute super."network-uri_2_6_0_1";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -6718,6 +6730,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7226,6 +7239,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7302,6 +7316,7 @@ self: super: {
   "servant-client" = dontDistribute super."servant-client";
   "servant-docs" = dontDistribute super."servant-docs";
   "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-jquery" = dontDistribute super."servant-jquery";
@@ -7768,6 +7783,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7833,6 +7849,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7952,6 +7969,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8419,6 +8437,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 6829db657723..68c3439efa02 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -728,6 +728,7 @@ self: super: {
   "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";
@@ -2666,6 +2667,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = dontDistribute super."diagrams-rasterific";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4";
@@ -3691,6 +3693,7 @@ self: super: {
   "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";
@@ -3745,6 +3748,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3900,6 +3904,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4456,6 +4461,7 @@ self: super: {
   "hpc-coveralls" = dontDistribute super."hpc-coveralls";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4863,6 +4869,7 @@ self: super: {
   "imagemagick" = dontDistribute super."imagemagick";
   "imagepaste" = dontDistribute super."imagepaste";
   "imagesize-conduit" = doDistribute super."imagesize-conduit_1_0_0_4";
+  "imap" = dontDistribute super."imap";
   "imapget" = dontDistribute super."imapget";
   "imbib" = dontDistribute super."imbib";
   "imgurder" = dontDistribute super."imgurder";
@@ -5102,6 +5109,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5483,6 +5491,7 @@ self: super: {
   "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";
@@ -5490,6 +5499,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5841,6 +5851,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -6051,6 +6062,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri" = doDistribute super."network-uri_2_6_0_1";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -6712,6 +6724,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7219,6 +7232,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7295,6 +7309,7 @@ self: super: {
   "servant-client" = dontDistribute super."servant-client";
   "servant-docs" = dontDistribute super."servant-docs";
   "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-jquery" = dontDistribute super."servant-jquery";
@@ -7761,6 +7776,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7826,6 +7842,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7945,6 +7962,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8412,6 +8430,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index c69012197af1..4a3bcbb31e2b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -728,6 +728,7 @@ self: super: {
   "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";
@@ -2663,6 +2664,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = dontDistribute super."diagrams-rasterific";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4";
@@ -3687,6 +3689,7 @@ self: super: {
   "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";
@@ -3741,6 +3744,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3896,6 +3900,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4452,6 +4457,7 @@ self: super: {
   "hpc-coveralls" = dontDistribute super."hpc-coveralls";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4859,6 +4865,7 @@ self: super: {
   "imagemagick" = dontDistribute super."imagemagick";
   "imagepaste" = dontDistribute super."imagepaste";
   "imagesize-conduit" = doDistribute super."imagesize-conduit_1_0_0_4";
+  "imap" = dontDistribute super."imap";
   "imapget" = dontDistribute super."imapget";
   "imbib" = dontDistribute super."imbib";
   "imgurder" = dontDistribute super."imgurder";
@@ -5098,6 +5105,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5479,6 +5487,7 @@ self: super: {
   "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";
@@ -5486,6 +5495,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5837,6 +5847,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -6045,6 +6056,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri" = doDistribute super."network-uri_2_6_0_1";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -6706,6 +6718,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7212,6 +7225,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7288,6 +7302,7 @@ self: super: {
   "servant-client" = dontDistribute super."servant-client";
   "servant-docs" = dontDistribute super."servant-docs";
   "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-jquery" = dontDistribute super."servant-jquery";
@@ -7753,6 +7768,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7817,6 +7833,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7936,6 +7953,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8403,6 +8421,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index 6d1a27525b12..cac7ea84e5a7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -730,6 +730,7 @@ self: super: {
   "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";
@@ -2671,6 +2672,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = dontDistribute super."diagrams-rasterific";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4";
@@ -3701,6 +3703,7 @@ self: super: {
   "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";
@@ -3755,6 +3758,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3912,6 +3916,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4471,6 +4476,7 @@ self: super: {
   "hpc-coveralls" = dontDistribute super."hpc-coveralls";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4884,6 +4890,7 @@ self: super: {
   "imagemagick" = dontDistribute super."imagemagick";
   "imagepaste" = dontDistribute super."imagepaste";
   "imagesize-conduit" = doDistribute super."imagesize-conduit_1_0_0_4";
+  "imap" = dontDistribute super."imap";
   "imapget" = dontDistribute super."imapget";
   "imbib" = dontDistribute super."imbib";
   "imgurder" = dontDistribute super."imgurder";
@@ -5124,6 +5131,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5508,6 +5516,7 @@ self: super: {
   "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";
@@ -5515,6 +5524,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5867,6 +5877,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -6079,6 +6090,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri" = doDistribute super."network-uri_2_6_0_1";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -6740,6 +6752,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7248,6 +7261,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7324,6 +7338,7 @@ self: super: {
   "servant-client" = dontDistribute super."servant-client";
   "servant-docs" = dontDistribute super."servant-docs";
   "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-jquery" = dontDistribute super."servant-jquery";
@@ -7791,6 +7806,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_9_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7856,6 +7872,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7978,6 +7995,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8448,6 +8466,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index 1832969011f7..a2057dcca1d5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -729,6 +729,7 @@ self: super: {
   "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";
@@ -2670,6 +2671,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = dontDistribute super."diagrams-rasterific";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4";
@@ -3699,6 +3701,7 @@ self: super: {
   "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";
@@ -3753,6 +3756,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3910,6 +3914,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4468,6 +4473,7 @@ self: super: {
   "hpc-coveralls" = dontDistribute super."hpc-coveralls";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4881,6 +4887,7 @@ self: super: {
   "imagemagick" = dontDistribute super."imagemagick";
   "imagepaste" = dontDistribute super."imagepaste";
   "imagesize-conduit" = doDistribute super."imagesize-conduit_1_0_0_4";
+  "imap" = dontDistribute super."imap";
   "imapget" = dontDistribute super."imapget";
   "imbib" = dontDistribute super."imbib";
   "imgurder" = dontDistribute super."imgurder";
@@ -5121,6 +5128,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5505,6 +5513,7 @@ self: super: {
   "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";
@@ -5512,6 +5521,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5864,6 +5874,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -6075,6 +6086,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri" = doDistribute super."network-uri_2_6_0_1";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -6736,6 +6748,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7244,6 +7257,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7320,6 +7334,7 @@ self: super: {
   "servant-client" = dontDistribute super."servant-client";
   "servant-docs" = dontDistribute super."servant-docs";
   "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-jquery" = dontDistribute super."servant-jquery";
@@ -7787,6 +7802,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_9_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7852,6 +7868,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7973,6 +7990,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8443,6 +8461,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index 09660ebe9636..ea9f668b711d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -729,6 +729,7 @@ self: super: {
   "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";
@@ -2669,6 +2670,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = dontDistribute super."diagrams-rasterific";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4";
@@ -3698,6 +3700,7 @@ self: super: {
   "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";
@@ -3752,6 +3755,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3909,6 +3913,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4467,6 +4472,7 @@ self: super: {
   "hpc-coveralls" = dontDistribute super."hpc-coveralls";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4880,6 +4886,7 @@ self: super: {
   "imagemagick" = dontDistribute super."imagemagick";
   "imagepaste" = dontDistribute super."imagepaste";
   "imagesize-conduit" = doDistribute super."imagesize-conduit_1_0_0_4";
+  "imap" = dontDistribute super."imap";
   "imapget" = dontDistribute super."imapget";
   "imbib" = dontDistribute super."imbib";
   "imgurder" = dontDistribute super."imgurder";
@@ -5120,6 +5127,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5504,6 +5512,7 @@ self: super: {
   "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";
@@ -5511,6 +5520,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5863,6 +5873,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -6074,6 +6085,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri" = doDistribute super."network-uri_2_6_0_1";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -6735,6 +6747,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7243,6 +7256,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7319,6 +7333,7 @@ self: super: {
   "servant-client" = dontDistribute super."servant-client";
   "servant-docs" = dontDistribute super."servant-docs";
   "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-jquery" = dontDistribute super."servant-jquery";
@@ -7786,6 +7801,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_9_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7851,6 +7867,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7972,6 +7989,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8441,6 +8459,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index 58ffd1eb7a1e..0f17f0281f86 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -729,6 +729,7 @@ self: super: {
   "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";
@@ -2669,6 +2670,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = dontDistribute super."diagrams-rasterific";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4";
@@ -3698,6 +3700,7 @@ self: super: {
   "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";
@@ -3752,6 +3755,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3909,6 +3913,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4467,6 +4472,7 @@ self: super: {
   "hpc-coveralls" = dontDistribute super."hpc-coveralls";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4875,6 +4881,7 @@ self: super: {
   "imagemagick" = dontDistribute super."imagemagick";
   "imagepaste" = dontDistribute super."imagepaste";
   "imagesize-conduit" = doDistribute super."imagesize-conduit_1_0_0_4";
+  "imap" = dontDistribute super."imap";
   "imapget" = dontDistribute super."imapget";
   "imbib" = dontDistribute super."imbib";
   "imgurder" = dontDistribute super."imgurder";
@@ -5115,6 +5122,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5499,6 +5507,7 @@ self: super: {
   "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";
@@ -5506,6 +5515,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5858,6 +5868,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -6069,6 +6080,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri" = doDistribute super."network-uri_2_6_0_1";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -6730,6 +6742,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7238,6 +7251,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7314,6 +7328,7 @@ self: super: {
   "servant-client" = dontDistribute super."servant-client";
   "servant-docs" = dontDistribute super."servant-docs";
   "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-jquery" = dontDistribute super."servant-jquery";
@@ -7781,6 +7796,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_9_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7846,6 +7862,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7967,6 +7984,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8436,6 +8454,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index ce5855c7aae8..47ef6d937c47 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -729,6 +729,7 @@ self: super: {
   "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";
@@ -2669,6 +2670,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = dontDistribute super."diagrams-rasterific";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4";
@@ -3696,6 +3698,7 @@ self: super: {
   "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";
@@ -3750,6 +3753,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3906,6 +3910,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4464,6 +4469,7 @@ self: super: {
   "hpc-coveralls" = dontDistribute super."hpc-coveralls";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4872,6 +4878,7 @@ self: super: {
   "imagemagick" = dontDistribute super."imagemagick";
   "imagepaste" = dontDistribute super."imagepaste";
   "imagesize-conduit" = doDistribute super."imagesize-conduit_1_0_0_4";
+  "imap" = dontDistribute super."imap";
   "imapget" = dontDistribute super."imapget";
   "imbib" = dontDistribute super."imbib";
   "imgurder" = dontDistribute super."imgurder";
@@ -5112,6 +5119,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5495,6 +5503,7 @@ self: super: {
   "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";
@@ -5502,6 +5511,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5854,6 +5864,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -6065,6 +6076,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri" = doDistribute super."network-uri_2_6_0_1";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -6726,6 +6738,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7234,6 +7247,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7310,6 +7324,7 @@ self: super: {
   "servant-client" = dontDistribute super."servant-client";
   "servant-docs" = dontDistribute super."servant-docs";
   "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-jquery" = dontDistribute super."servant-jquery";
@@ -7777,6 +7792,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_9_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7842,6 +7858,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7963,6 +7980,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8431,6 +8449,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index b6eb55cd0a89..371c2dadf427 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -729,6 +729,7 @@ self: super: {
   "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";
@@ -2669,6 +2670,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = dontDistribute super."diagrams-rasterific";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4";
@@ -3695,6 +3697,7 @@ self: super: {
   "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";
@@ -3749,6 +3752,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3905,6 +3909,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4463,6 +4468,7 @@ self: super: {
   "hpc-coveralls" = dontDistribute super."hpc-coveralls";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4871,6 +4877,7 @@ self: super: {
   "imagemagick" = dontDistribute super."imagemagick";
   "imagepaste" = dontDistribute super."imagepaste";
   "imagesize-conduit" = doDistribute super."imagesize-conduit_1_0_0_4";
+  "imap" = dontDistribute super."imap";
   "imapget" = dontDistribute super."imapget";
   "imbib" = dontDistribute super."imbib";
   "imgurder" = dontDistribute super."imgurder";
@@ -5111,6 +5118,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5494,6 +5502,7 @@ self: super: {
   "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";
@@ -5501,6 +5510,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5853,6 +5863,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -6064,6 +6075,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri" = doDistribute super."network-uri_2_6_0_1";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -6725,6 +6737,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7233,6 +7246,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7309,6 +7323,7 @@ self: super: {
   "servant-client" = dontDistribute super."servant-client";
   "servant-docs" = dontDistribute super."servant-docs";
   "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-jquery" = dontDistribute super."servant-jquery";
@@ -7776,6 +7791,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_9_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7841,6 +7857,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = dontDistribute super."svg-tree";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7962,6 +7979,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8430,6 +8448,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index 7a6eb2e704b5..e48c6649f9d7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -480,6 +480,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_12_2_4";
@@ -723,6 +724,7 @@ self: super: {
   "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";
@@ -2648,6 +2650,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_4";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_0_1_0_7";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_4";
@@ -3669,6 +3672,7 @@ self: super: {
   "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";
@@ -3722,6 +3726,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3877,6 +3882,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4430,6 +4436,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4831,6 +4838,7 @@ self: super: {
   "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";
@@ -5068,6 +5076,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5444,6 +5453,7 @@ self: super: {
   "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";
@@ -5451,6 +5461,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5796,6 +5807,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5999,6 +6011,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri" = doDistribute super."network-uri_2_6_0_1";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -6657,6 +6670,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7163,6 +7177,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7238,6 +7253,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_2_2";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "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-jquery" = doDistribute super."servant-jquery_0_2_2_1";
@@ -7665,6 +7681,7 @@ self: super: {
   "stm-chans" = doDistribute super."stm-chans_3_0_0_3";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-delay" = dontDistribute super."stm-delay";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
@@ -7698,6 +7715,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7762,6 +7780,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_0_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7879,6 +7898,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8345,6 +8365,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 01c494fd0dfe..786d58cac8b9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -480,6 +480,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_12_2_4";
@@ -723,6 +724,7 @@ self: super: {
   "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";
@@ -2647,6 +2649,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_0_1_0_8";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5";
@@ -3668,6 +3671,7 @@ self: super: {
   "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";
@@ -3721,6 +3725,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3876,6 +3881,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4429,6 +4435,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4830,6 +4837,7 @@ self: super: {
   "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";
@@ -5067,6 +5075,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5443,6 +5452,7 @@ self: super: {
   "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";
@@ -5450,6 +5460,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5795,6 +5806,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5998,6 +6010,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri" = doDistribute super."network-uri_2_6_0_1";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -6656,6 +6669,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7162,6 +7176,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7237,6 +7252,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_2_2";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "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-jquery" = doDistribute super."servant-jquery_0_2_2_1";
@@ -7664,6 +7680,7 @@ self: super: {
   "stm-chans" = doDistribute super."stm-chans_3_0_0_3";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-delay" = dontDistribute super."stm-delay";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
@@ -7697,6 +7714,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7761,6 +7779,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_0_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7878,6 +7897,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8344,6 +8364,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index 231b1da6747f..36a315c5180b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_12_2_4";
@@ -721,6 +722,7 @@ self: super: {
   "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";
@@ -1941,6 +1943,7 @@ self: super: {
   "case-conversion" = dontDistribute super."case-conversion";
   "case-insensitive" = doDistribute super."case-insensitive_1_2_0_4";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2100,6 +2103,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2632,6 +2636,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_0_1_0_8";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5";
@@ -3649,6 +3654,7 @@ self: super: {
   "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";
@@ -3702,6 +3708,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3855,6 +3862,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4407,6 +4415,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4805,6 +4814,7 @@ self: super: {
   "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";
@@ -5040,6 +5050,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5355,6 +5366,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5414,6 +5426,7 @@ self: super: {
   "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";
@@ -5421,6 +5434,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5762,6 +5776,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5965,6 +5980,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -6178,6 +6194,7 @@ self: super: {
   "pager" = dontDistribute super."pager";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_1";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6618,6 +6635,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7121,6 +7139,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7196,6 +7215,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_2_2";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "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-jquery" = doDistribute super."servant-jquery_0_2_2_1";
@@ -7617,6 +7637,7 @@ self: super: {
   "stm-chans" = doDistribute super."stm-chans_3_0_0_3";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-delay" = dontDistribute super."stm-delay";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
@@ -7650,6 +7671,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7714,6 +7736,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7829,6 +7852,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8293,6 +8317,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8909,6 +8934,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 2662bfe65136..ef4c7ce282dc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_12_2_4";
@@ -721,6 +722,7 @@ self: super: {
   "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";
@@ -1940,6 +1942,7 @@ self: super: {
   "case-conversion" = dontDistribute super."case-conversion";
   "case-insensitive" = doDistribute super."case-insensitive_1_2_0_4";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2099,6 +2102,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2631,6 +2635,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_0_1_0_8";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5";
@@ -3647,6 +3652,7 @@ self: super: {
   "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";
@@ -3700,6 +3706,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3853,6 +3860,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4404,6 +4412,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4802,6 +4811,7 @@ self: super: {
   "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";
@@ -5036,6 +5046,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5351,6 +5362,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5410,6 +5422,7 @@ self: super: {
   "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";
@@ -5417,6 +5430,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5757,6 +5771,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5960,6 +5975,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -6172,6 +6188,7 @@ self: super: {
   "pager" = dontDistribute super."pager";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_1";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6612,6 +6629,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7114,6 +7132,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7189,6 +7208,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_2_2";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "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-jquery" = doDistribute super."servant-jquery_0_2_2_1";
@@ -7609,6 +7629,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-delay" = dontDistribute super."stm-delay";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
@@ -7642,6 +7663,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7706,6 +7728,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7820,6 +7843,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8284,6 +8308,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8900,6 +8925,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 87bad704729d..8303aacfd804 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_12_2_4";
@@ -721,6 +722,7 @@ self: super: {
   "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";
@@ -1940,6 +1942,7 @@ self: super: {
   "case-conversion" = dontDistribute super."case-conversion";
   "case-insensitive" = doDistribute super."case-insensitive_1_2_0_4";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2099,6 +2102,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2631,6 +2635,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_0_1_0_8";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5";
@@ -3647,6 +3652,7 @@ self: super: {
   "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";
@@ -3700,6 +3706,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3853,6 +3860,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4404,6 +4412,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4802,6 +4811,7 @@ self: super: {
   "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";
@@ -5036,6 +5046,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5351,6 +5362,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5410,6 +5422,7 @@ self: super: {
   "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";
@@ -5417,6 +5430,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5757,6 +5771,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5960,6 +5975,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -6172,6 +6188,7 @@ self: super: {
   "pager" = dontDistribute super."pager";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_1";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6612,6 +6629,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7114,6 +7132,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7188,6 +7207,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_2_2";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "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-jquery" = doDistribute super."servant-jquery_0_2_2_1";
@@ -7608,6 +7628,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-delay" = dontDistribute super."stm-delay";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
@@ -7641,6 +7662,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7705,6 +7727,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7819,6 +7842,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8283,6 +8307,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8899,6 +8924,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index a22d472fb36c..52cec4732baf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_12_2_4";
@@ -721,6 +722,7 @@ self: super: {
   "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";
@@ -1940,6 +1942,7 @@ self: super: {
   "case-conversion" = dontDistribute super."case-conversion";
   "case-insensitive" = doDistribute super."case-insensitive_1_2_0_4";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2099,6 +2102,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2631,6 +2635,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_0_1_0_8";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5";
@@ -3647,6 +3652,7 @@ self: super: {
   "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";
@@ -3700,6 +3706,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3852,6 +3859,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4403,6 +4411,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4800,6 +4809,7 @@ self: super: {
   "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";
@@ -5034,6 +5044,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5349,6 +5360,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5408,6 +5420,7 @@ self: super: {
   "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";
@@ -5415,6 +5428,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5755,6 +5769,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5958,6 +5973,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -6170,6 +6186,7 @@ self: super: {
   "pager" = dontDistribute super."pager";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_1";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6610,6 +6627,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7112,6 +7130,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7186,6 +7205,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_2_2";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "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-jquery" = doDistribute super."servant-jquery_0_2_2_1";
@@ -7606,6 +7626,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-delay" = dontDistribute super."stm-delay";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
@@ -7639,6 +7660,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7703,6 +7725,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7817,6 +7840,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8281,6 +8305,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8897,6 +8922,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 0ba5ae883bb3..8ae1bed9f3cb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_12_2_4";
@@ -721,6 +722,7 @@ self: super: {
   "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";
@@ -1939,6 +1941,7 @@ self: super: {
   "case-conversion" = dontDistribute super."case-conversion";
   "case-insensitive" = doDistribute super."case-insensitive_1_2_0_4";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2098,6 +2101,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2630,6 +2634,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_0_1_0_8";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5";
@@ -3645,6 +3650,7 @@ self: super: {
   "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";
@@ -3698,6 +3704,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3850,6 +3857,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4401,6 +4409,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4797,6 +4806,7 @@ self: super: {
   "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";
@@ -5031,6 +5041,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5346,6 +5357,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5405,6 +5417,7 @@ self: super: {
   "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";
@@ -5412,6 +5425,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5752,6 +5766,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5955,6 +5970,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -6167,6 +6183,7 @@ self: super: {
   "pager" = dontDistribute super."pager";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_1";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6607,6 +6624,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7109,6 +7127,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7183,6 +7202,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_2_2";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "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-jquery" = doDistribute super."servant-jquery_0_2_2_1";
@@ -7602,6 +7622,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-delay" = dontDistribute super."stm-delay";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
@@ -7635,6 +7656,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7699,6 +7721,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7813,6 +7836,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8277,6 +8301,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8891,6 +8916,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index 53940a40de87..cc1588571cee 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_12_2_4";
@@ -721,6 +722,7 @@ self: super: {
   "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";
@@ -1939,6 +1941,7 @@ self: super: {
   "case-conversion" = dontDistribute super."case-conversion";
   "case-insensitive" = doDistribute super."case-insensitive_1_2_0_4";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2098,6 +2101,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2630,6 +2634,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_0_1_0_8";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5";
@@ -3644,6 +3649,7 @@ self: super: {
   "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";
@@ -3697,6 +3703,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3849,6 +3856,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4400,6 +4408,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4796,6 +4805,7 @@ self: super: {
   "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";
@@ -5030,6 +5040,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5345,6 +5356,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5404,6 +5416,7 @@ self: super: {
   "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";
@@ -5411,6 +5424,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5750,6 +5764,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5948,9 +5963,11 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -6163,6 +6180,7 @@ self: super: {
   "pager" = dontDistribute super."pager";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_1";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6603,6 +6621,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7105,6 +7124,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7179,6 +7199,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_2_2";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "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-jquery" = doDistribute super."servant-jquery_0_2_2_1";
@@ -7597,6 +7618,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-delay" = dontDistribute super."stm-delay";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
@@ -7630,6 +7652,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7694,6 +7717,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7808,6 +7832,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8272,6 +8297,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8885,6 +8911,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index 77cf4fa6807a..ab44df6f4f79 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_12_2_4";
@@ -721,6 +722,7 @@ self: super: {
   "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";
@@ -1939,6 +1941,7 @@ self: super: {
   "case-conversion" = dontDistribute super."case-conversion";
   "case-insensitive" = doDistribute super."case-insensitive_1_2_0_4";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2097,6 +2100,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2627,6 +2631,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_0_1_0_8";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5";
@@ -3640,6 +3645,7 @@ self: super: {
   "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";
@@ -3693,6 +3699,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3845,6 +3852,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4396,6 +4404,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4792,6 +4801,7 @@ self: super: {
   "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";
@@ -5026,6 +5036,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5340,6 +5351,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5399,6 +5411,7 @@ self: super: {
   "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";
@@ -5406,6 +5419,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5745,6 +5759,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5943,9 +5958,11 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -6158,6 +6175,7 @@ self: super: {
   "pager" = dontDistribute super."pager";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_2";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6598,6 +6616,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7100,6 +7119,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7174,6 +7194,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_2_2";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "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-jquery" = doDistribute super."servant-jquery_0_2_2_1";
@@ -7592,6 +7613,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-delay" = dontDistribute super."stm-delay";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
@@ -7625,6 +7647,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7689,6 +7712,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7803,6 +7827,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8267,6 +8292,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8879,6 +8905,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index 67b1f9a3f571..04df96c30c8a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_12_2_4";
@@ -721,6 +722,7 @@ self: super: {
   "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";
@@ -1937,6 +1939,7 @@ self: super: {
   "case-conversion" = dontDistribute super."case-conversion";
   "case-insensitive" = doDistribute super."case-insensitive_1_2_0_4";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2095,6 +2098,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2625,6 +2629,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_0_1_0_8";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5";
@@ -3635,6 +3640,7 @@ self: super: {
   "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";
@@ -3688,6 +3694,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3840,6 +3847,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4391,6 +4399,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4787,6 +4796,7 @@ self: super: {
   "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";
@@ -5021,6 +5031,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5335,6 +5346,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5394,6 +5406,7 @@ self: super: {
   "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";
@@ -5401,6 +5414,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5740,6 +5754,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5938,9 +5953,11 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -6152,6 +6169,7 @@ self: super: {
   "pager" = dontDistribute super."pager";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_2";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6592,6 +6610,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7094,6 +7113,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7168,6 +7188,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_2_2";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "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-jquery" = doDistribute super."servant-jquery_0_2_2_1";
@@ -7586,6 +7607,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-delay" = dontDistribute super."stm-delay";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
@@ -7619,6 +7641,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7683,6 +7706,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7797,6 +7821,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8261,6 +8286,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8873,6 +8899,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index 774b372c451b..0bae504f61a1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_12_2_4";
@@ -721,6 +722,7 @@ self: super: {
   "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";
@@ -1936,6 +1938,7 @@ self: super: {
   "case-conversion" = dontDistribute super."case-conversion";
   "case-insensitive" = doDistribute super."case-insensitive_1_2_0_4";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2094,6 +2097,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2624,6 +2628,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_0_1_0_8";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5";
@@ -3633,6 +3638,7 @@ self: super: {
   "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";
@@ -3686,6 +3692,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3838,6 +3845,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4388,6 +4396,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4784,6 +4793,7 @@ self: super: {
   "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";
@@ -5018,6 +5028,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5332,6 +5343,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5391,6 +5403,7 @@ self: super: {
   "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";
@@ -5398,6 +5411,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5737,6 +5751,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5934,9 +5949,11 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -6148,6 +6165,7 @@ self: super: {
   "pager" = dontDistribute super."pager";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_2";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6359,6 +6377,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-safe" = doDistribute super."pipes-safe_2_2_2";
@@ -6587,6 +6606,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7089,6 +7109,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7163,6 +7184,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_2_2";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "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-jquery" = doDistribute super."servant-jquery_0_2_2_1";
@@ -7581,6 +7603,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-delay" = dontDistribute super."stm-delay";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
@@ -7614,6 +7637,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7677,6 +7701,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7791,6 +7816,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8255,6 +8281,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8866,6 +8893,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index 5cfa6de7a571..d213048219ca 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_12_2_4";
@@ -721,6 +722,7 @@ self: super: {
   "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";
@@ -1936,6 +1938,7 @@ self: super: {
   "case-conversion" = dontDistribute super."case-conversion";
   "case-insensitive" = doDistribute super."case-insensitive_1_2_0_4";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2094,6 +2097,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2624,6 +2628,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_0_1_0_8";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5";
@@ -3632,6 +3637,7 @@ self: super: {
   "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";
@@ -3685,6 +3691,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3837,6 +3844,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4387,6 +4395,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4783,6 +4792,7 @@ self: super: {
   "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";
@@ -5017,6 +5027,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5331,6 +5342,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5390,6 +5402,7 @@ self: super: {
   "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";
@@ -5397,6 +5410,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5735,6 +5749,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5932,9 +5947,11 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -6146,6 +6163,7 @@ self: super: {
   "pager" = dontDistribute super."pager";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_2";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6357,6 +6375,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-safe" = doDistribute super."pipes-safe_2_2_2";
@@ -6585,6 +6604,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7087,6 +7107,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7161,6 +7182,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_2_2";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "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-jquery" = doDistribute super."servant-jquery_0_2_2_1";
@@ -7577,6 +7599,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-delay" = dontDistribute super."stm-delay";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
@@ -7610,6 +7633,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7673,6 +7697,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7787,6 +7812,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8251,6 +8277,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8861,6 +8888,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index 90433b651fcd..55f13118e3f2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -480,6 +480,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_12_2_4";
@@ -723,6 +724,7 @@ self: super: {
   "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";
@@ -2644,6 +2646,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_0_1_0_8";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5";
@@ -3665,6 +3668,7 @@ self: super: {
   "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";
@@ -3718,6 +3722,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3873,6 +3878,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4426,6 +4432,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4827,6 +4834,7 @@ self: super: {
   "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";
@@ -5064,6 +5072,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5440,6 +5449,7 @@ self: super: {
   "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";
@@ -5447,6 +5457,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5792,6 +5803,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5995,6 +6007,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri" = doDistribute super."network-uri_2_6_0_1";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -6653,6 +6666,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7159,6 +7173,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7234,6 +7249,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_2_2";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "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-jquery" = doDistribute super."servant-jquery_0_2_2_1";
@@ -7661,6 +7677,7 @@ self: super: {
   "stm-chans" = doDistribute super."stm-chans_3_0_0_3";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-delay" = dontDistribute super."stm-delay";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
@@ -7694,6 +7711,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_10_0";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7758,6 +7776,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7875,6 +7894,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8341,6 +8361,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index a073695f433c..ebfd30a5cedc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_12_2_4";
@@ -721,6 +722,7 @@ self: super: {
   "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";
@@ -1936,6 +1938,7 @@ self: super: {
   "case-conversion" = dontDistribute super."case-conversion";
   "case-insensitive" = doDistribute super."case-insensitive_1_2_0_4";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2094,6 +2097,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2623,6 +2627,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_0_1_0_8";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5";
@@ -3631,6 +3636,7 @@ self: super: {
   "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";
@@ -3684,6 +3690,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3836,6 +3843,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4386,6 +4394,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4782,6 +4791,7 @@ self: super: {
   "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";
@@ -5016,6 +5026,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5330,6 +5341,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5389,6 +5401,7 @@ self: super: {
   "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";
@@ -5396,6 +5409,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5734,6 +5748,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5931,9 +5946,11 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -6145,6 +6162,7 @@ self: super: {
   "pager" = dontDistribute super."pager";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_2";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6356,6 +6374,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6583,6 +6602,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7085,6 +7105,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7159,6 +7180,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_2_2";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "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-jquery" = doDistribute super."servant-jquery_0_2_2_1";
@@ -7574,6 +7596,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-delay" = dontDistribute super."stm-delay";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
@@ -7607,6 +7630,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7670,6 +7694,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7784,6 +7809,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8248,6 +8274,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8858,6 +8885,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index 544d71f16bf0..3fce33ab764d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_12_2_4";
@@ -721,6 +722,7 @@ self: super: {
   "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";
@@ -1936,6 +1938,7 @@ self: super: {
   "case-conversion" = dontDistribute super."case-conversion";
   "case-insensitive" = doDistribute super."case-insensitive_1_2_0_4";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2094,6 +2097,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2623,6 +2627,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_0_1_0_8";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5";
@@ -3631,6 +3636,7 @@ self: super: {
   "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";
@@ -3684,6 +3690,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3836,6 +3843,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4386,6 +4394,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4782,6 +4791,7 @@ self: super: {
   "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";
@@ -5016,6 +5026,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5329,6 +5340,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5388,6 +5400,7 @@ self: super: {
   "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";
@@ -5395,6 +5408,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5733,6 +5747,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5930,9 +5945,11 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -6144,6 +6161,7 @@ self: super: {
   "pager" = dontDistribute super."pager";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_2";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6355,6 +6373,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6581,6 +6600,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7083,6 +7103,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7157,6 +7178,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_2_2";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "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-jquery" = doDistribute super."servant-jquery_0_2_2_1";
@@ -7572,6 +7594,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-delay" = dontDistribute super."stm-delay";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
@@ -7605,6 +7628,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7668,6 +7692,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7782,6 +7807,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8246,6 +8272,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8853,6 +8880,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 98e2c96e724f..87a4bc9f864e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_12_2_4";
@@ -721,6 +722,7 @@ self: super: {
   "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";
@@ -1936,6 +1938,7 @@ self: super: {
   "case-conversion" = dontDistribute super."case-conversion";
   "case-insensitive" = doDistribute super."case-insensitive_1_2_0_4";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2094,6 +2097,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2623,6 +2627,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_0_1_0_8";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5";
@@ -3631,6 +3636,7 @@ self: super: {
   "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";
@@ -3684,6 +3690,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3836,6 +3843,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4385,6 +4393,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4781,6 +4790,7 @@ self: super: {
   "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";
@@ -5015,6 +5025,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5328,6 +5339,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5387,6 +5399,7 @@ self: super: {
   "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";
@@ -5394,6 +5407,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5731,6 +5745,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5928,9 +5943,11 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -6142,6 +6159,7 @@ self: super: {
   "pager" = dontDistribute super."pager";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_2";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6353,6 +6371,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6579,6 +6598,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7081,6 +7101,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7155,6 +7176,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_2_2";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "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-jquery" = doDistribute super."servant-jquery_0_2_2_1";
@@ -7570,6 +7592,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-delay" = dontDistribute super."stm-delay";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
@@ -7603,6 +7626,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7666,6 +7690,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7780,6 +7805,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8244,6 +8270,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8851,6 +8878,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index d5f060387ce5..485e45cc6e22 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -480,6 +480,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_12_2_4";
@@ -723,6 +724,7 @@ self: super: {
   "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";
@@ -2644,6 +2646,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_0_1_0_8";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5";
@@ -3664,6 +3667,7 @@ self: super: {
   "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";
@@ -3717,6 +3721,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3872,6 +3877,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4425,6 +4431,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4825,6 +4832,7 @@ self: super: {
   "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";
@@ -5062,6 +5070,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5438,6 +5447,7 @@ self: super: {
   "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";
@@ -5445,6 +5455,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5790,6 +5801,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5993,6 +6005,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri" = doDistribute super."network-uri_2_6_0_1";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -6651,6 +6664,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7157,6 +7171,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7232,6 +7247,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_2_2";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "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-jquery" = doDistribute super."servant-jquery_0_2_2_1";
@@ -7659,6 +7675,7 @@ self: super: {
   "stm-chans" = doDistribute super."stm-chans_3_0_0_3";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-delay" = dontDistribute super."stm-delay";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
@@ -7692,6 +7709,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_11";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7756,6 +7774,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7873,6 +7892,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8339,6 +8359,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index e595d238aeb9..8a4a70c5298e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -480,6 +480,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_12_2_4";
@@ -723,6 +724,7 @@ self: super: {
   "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";
@@ -2643,6 +2645,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_0_1_0_8";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5";
@@ -3663,6 +3666,7 @@ self: super: {
   "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";
@@ -3716,6 +3720,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3871,6 +3876,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4424,6 +4430,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4824,6 +4831,7 @@ self: super: {
   "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";
@@ -5061,6 +5069,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5437,6 +5446,7 @@ self: super: {
   "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";
@@ -5444,6 +5454,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5788,6 +5799,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5991,6 +6003,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri" = doDistribute super."network-uri_2_6_0_1";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -6205,6 +6218,7 @@ self: super: {
   "pager" = dontDistribute super."pager";
   "pagerduty" = doDistribute super."pagerduty_0_0_3";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6647,6 +6661,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7152,6 +7167,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7227,6 +7243,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_2_2";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "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-jquery" = doDistribute super."servant-jquery_0_2_2_1";
@@ -7654,6 +7671,7 @@ self: super: {
   "stm-chans" = doDistribute super."stm-chans_3_0_0_3";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-delay" = dontDistribute super."stm-delay";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
@@ -7687,6 +7705,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7751,6 +7770,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7868,6 +7888,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8334,6 +8355,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 35a9871f7cd5..4233d8fc4544 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -480,6 +480,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_12_2_4";
@@ -723,6 +724,7 @@ self: super: {
   "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";
@@ -2642,6 +2644,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_0_1_0_8";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5";
@@ -3662,6 +3665,7 @@ self: super: {
   "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";
@@ -3715,6 +3719,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3870,6 +3875,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4423,6 +4429,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4823,6 +4830,7 @@ self: super: {
   "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";
@@ -5060,6 +5068,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5376,6 +5385,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5435,6 +5445,7 @@ self: super: {
   "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";
@@ -5442,6 +5453,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5786,6 +5798,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5989,6 +6002,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri" = doDistribute super."network-uri_2_6_0_1";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -6203,6 +6217,7 @@ self: super: {
   "pager" = dontDistribute super."pager";
   "pagerduty" = doDistribute super."pagerduty_0_0_3";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6645,6 +6660,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7150,6 +7166,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7225,6 +7242,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_2_2";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "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-jquery" = doDistribute super."servant-jquery_0_2_2_1";
@@ -7652,6 +7670,7 @@ self: super: {
   "stm-chans" = doDistribute super."stm-chans_3_0_0_3";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-delay" = dontDistribute super."stm-delay";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
@@ -7685,6 +7704,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7749,6 +7769,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7866,6 +7887,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8332,6 +8354,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index 838a0d81ae38..ec0401314e0f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -480,6 +480,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_12_2_4";
@@ -723,6 +724,7 @@ self: super: {
   "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";
@@ -2639,6 +2641,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_0_1_0_8";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5";
@@ -3659,6 +3662,7 @@ self: super: {
   "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";
@@ -3712,6 +3716,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3865,6 +3870,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4418,6 +4424,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4818,6 +4825,7 @@ self: super: {
   "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";
@@ -5055,6 +5063,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5371,6 +5380,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5430,6 +5440,7 @@ self: super: {
   "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";
@@ -5437,6 +5448,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5781,6 +5793,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5983,6 +5996,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri" = doDistribute super."network-uri_2_6_0_2";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -6197,6 +6211,7 @@ self: super: {
   "pager" = dontDistribute super."pager";
   "pagerduty" = doDistribute super."pagerduty_0_0_3";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6639,6 +6654,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7144,6 +7160,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7219,6 +7236,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_2_2";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "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-jquery" = doDistribute super."servant-jquery_0_2_2_1";
@@ -7646,6 +7664,7 @@ self: super: {
   "stm-chans" = doDistribute super."stm-chans_3_0_0_3";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-delay" = dontDistribute super."stm-delay";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
@@ -7679,6 +7698,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7743,6 +7763,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7860,6 +7881,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8324,6 +8346,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index e2658c39b016..72a550021b78 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_12_2_4";
@@ -722,6 +723,7 @@ self: super: {
   "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";
@@ -2638,6 +2640,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_0_1_0_8";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5";
@@ -3658,6 +3661,7 @@ self: super: {
   "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";
@@ -3711,6 +3715,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3864,6 +3869,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4417,6 +4423,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4817,6 +4824,7 @@ self: super: {
   "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";
@@ -5054,6 +5062,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5370,6 +5379,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5429,6 +5439,7 @@ self: super: {
   "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";
@@ -5436,6 +5447,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5780,6 +5792,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5983,6 +5996,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -6196,6 +6210,7 @@ self: super: {
   "pager" = dontDistribute super."pager";
   "pagerduty" = doDistribute super."pagerduty_0_0_3";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6638,6 +6653,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7143,6 +7159,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7218,6 +7235,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_2_2";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "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-jquery" = doDistribute super."servant-jquery_0_2_2_1";
@@ -7645,6 +7663,7 @@ self: super: {
   "stm-chans" = doDistribute super."stm-chans_3_0_0_3";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-delay" = dontDistribute super."stm-delay";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
@@ -7678,6 +7697,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7742,6 +7762,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7859,6 +7880,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8323,6 +8345,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index fe475625a7d7..f8c03a26d703 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_12_2_4";
@@ -721,6 +722,7 @@ self: super: {
   "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";
@@ -2637,6 +2639,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_0_1_0_8";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5";
@@ -3656,6 +3659,7 @@ self: super: {
   "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";
@@ -3709,6 +3713,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3862,6 +3867,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4415,6 +4421,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4815,6 +4822,7 @@ self: super: {
   "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";
@@ -5052,6 +5060,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_1";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5368,6 +5377,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5427,6 +5437,7 @@ self: super: {
   "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";
@@ -5434,6 +5445,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5778,6 +5790,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5981,6 +5994,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -6194,6 +6208,7 @@ self: super: {
   "pager" = dontDistribute super."pager";
   "pagerduty" = doDistribute super."pagerduty_0_0_3";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6636,6 +6651,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7140,6 +7156,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7215,6 +7232,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_2_2";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "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-jquery" = doDistribute super."servant-jquery_0_2_2_1";
@@ -7639,6 +7657,7 @@ self: super: {
   "stm-chans" = doDistribute super."stm-chans_3_0_0_3";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-delay" = dontDistribute super."stm-delay";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
@@ -7672,6 +7691,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7736,6 +7756,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7853,6 +7874,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8317,6 +8339,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index ff2118946cfe..0b803aceaa70 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -479,6 +479,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_12_2_4";
@@ -721,6 +722,7 @@ self: super: {
   "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";
@@ -1941,6 +1943,7 @@ self: super: {
   "case-conversion" = dontDistribute super."case-conversion";
   "case-insensitive" = doDistribute super."case-insensitive_1_2_0_4";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2634,6 +2637,7 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_1_0_5";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_0_1_0_8";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
   "diagrams-solve" = dontDistribute super."diagrams-solve";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_1_0_5";
@@ -3651,6 +3655,7 @@ self: super: {
   "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";
@@ -3704,6 +3709,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3857,6 +3863,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4410,6 +4417,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4808,6 +4816,7 @@ self: super: {
   "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";
@@ -5045,6 +5054,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = doDistribute super."kansas-comet_0_3_1";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5360,6 +5370,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5419,6 +5430,7 @@ self: super: {
   "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";
@@ -5426,6 +5438,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5769,6 +5782,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5972,6 +5986,7 @@ self: super: {
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
   "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_1";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -6185,6 +6200,7 @@ self: super: {
   "pager" = dontDistribute super."pager";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_1";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6626,6 +6642,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -7130,6 +7147,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -7205,6 +7223,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_2_2";
   "servant-docs" = doDistribute super."servant-docs_0_3_1";
   "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-jquery" = doDistribute super."servant-jquery_0_2_2_1";
@@ -7627,6 +7646,7 @@ self: super: {
   "stm-chans" = doDistribute super."stm-chans_3_0_0_3";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_5_4";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-delay" = dontDistribute super."stm-delay";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
@@ -7660,6 +7680,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7724,6 +7745,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_1_1";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7839,6 +7861,7 @@ self: super: {
   "tasty-silver" = dontDistribute super."tasty-silver";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8303,6 +8326,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8919,6 +8943,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index a6b2efe0c383..a4dcc621a82e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_13_0_0";
@@ -709,6 +710,7 @@ self: super: {
   "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";
@@ -1357,6 +1359,7 @@ self: super: {
   "ascii-progress" = dontDistribute super."ascii-progress";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1879,6 +1882,7 @@ self: super: {
   "case-conversion" = dontDistribute super."case-conversion";
   "case-insensitive" = doDistribute super."case-insensitive_1_2_0_4";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2033,6 +2037,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2537,6 +2542,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_1_1";
   "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_3";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
@@ -2554,7 +2560,9 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_2";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_3";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
@@ -3537,6 +3545,7 @@ self: super: {
   "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";
@@ -3589,6 +3598,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3737,6 +3747,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4280,6 +4291,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4662,6 +4674,7 @@ self: super: {
   "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";
@@ -4888,6 +4901,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5182,6 +5196,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5240,6 +5255,7 @@ self: super: {
   "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";
@@ -5247,6 +5263,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5574,6 +5591,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5763,6 +5781,7 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
@@ -5971,6 +5990,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_2";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6172,6 +6192,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6395,6 +6416,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6897,6 +6919,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6969,6 +6992,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_4_4";
   "servant-docs" = doDistribute super."servant-docs_0_4_4";
   "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-jquery" = doDistribute super."servant-jquery_0_4_4";
@@ -7129,6 +7153,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -7371,6 +7396,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -7403,6 +7429,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7464,6 +7491,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_1";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7577,6 +7605,7 @@ self: super: {
   "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8029,6 +8058,7 @@ self: super: {
   "unix-time" = doDistribute super."unix-time_0_3_5";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8619,6 +8649,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index 2bed2cd269e2..da4b30b8f9c9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTF" = doDistribute super."HTF_0_13_0_0";
@@ -709,6 +710,7 @@ self: super: {
   "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";
@@ -1356,6 +1358,7 @@ self: super: {
   "ascii-progress" = dontDistribute super."ascii-progress";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1878,6 +1881,7 @@ self: super: {
   "case-conversion" = dontDistribute super."case-conversion";
   "case-insensitive" = doDistribute super."case-insensitive_1_2_0_4";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2032,6 +2036,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2536,6 +2541,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_1_1";
   "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_3";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
@@ -2553,7 +2559,9 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_2";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_3";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
@@ -3534,6 +3542,7 @@ self: super: {
   "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";
@@ -3586,6 +3595,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3734,6 +3744,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4277,6 +4288,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4659,6 +4671,7 @@ self: super: {
   "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";
@@ -4885,6 +4898,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5179,6 +5193,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5237,6 +5252,7 @@ self: super: {
   "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";
@@ -5244,6 +5260,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5570,6 +5587,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5758,6 +5776,7 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
@@ -5966,6 +5985,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_2";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6166,6 +6186,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6389,6 +6410,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6890,6 +6912,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6962,6 +6985,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_4_4";
   "servant-docs" = doDistribute super."servant-docs_0_4_4";
   "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-jquery" = doDistribute super."servant-jquery_0_4_4";
@@ -7122,6 +7146,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -7364,6 +7389,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -7396,6 +7422,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7457,6 +7484,7 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
   "svg-tree" = doDistribute super."svg-tree_0_3_1";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
@@ -7570,6 +7598,7 @@ self: super: {
   "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8022,6 +8051,7 @@ self: super: {
   "unix-time" = doDistribute super."unix-time_0_3_5";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8611,6 +8641,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index 3550262d4d12..3b608d17c163 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -468,6 +468,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_2_20";
@@ -704,6 +705,7 @@ self: super: {
   "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";
@@ -1348,6 +1350,7 @@ self: super: {
   "ascii-progress" = dontDistribute super."ascii-progress";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1863,6 +1866,7 @@ self: super: {
   "cascading" = dontDistribute super."cascading";
   "case-conversion" = dontDistribute super."case-conversion";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2017,6 +2021,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2208,6 +2213,7 @@ self: super: {
   "count" = dontDistribute super."count";
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2518,6 +2524,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7";
@@ -2532,7 +2539,9 @@ self: super: {
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_6";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
@@ -3502,6 +3511,7 @@ self: super: {
   "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";
@@ -3554,6 +3564,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3702,6 +3713,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_2_1";
@@ -3826,6 +3838,7 @@ self: super: {
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
+  "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
   "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
   "haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -4241,6 +4254,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4620,6 +4634,7 @@ self: super: {
   "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";
@@ -4844,6 +4859,7 @@ self: super: {
   "kademlia" = dontDistribute super."kademlia";
   "kafka-client" = dontDistribute super."kafka-client";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5134,6 +5150,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5192,6 +5209,7 @@ self: super: {
   "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";
@@ -5199,6 +5217,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5522,6 +5541,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5707,6 +5727,7 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
@@ -5914,6 +5935,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_2";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6092,6 +6114,7 @@ self: super: {
   "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6111,6 +6134,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6328,6 +6352,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6427,6 +6452,7 @@ self: super: {
   "rados-haskell" = dontDistribute super."rados-haskell";
   "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
   "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
   "rake" = dontDistribute super."rake";
   "rakhana" = dontDistribute super."rakhana";
   "ralist" = dontDistribute super."ralist";
@@ -6452,6 +6478,7 @@ self: super: {
   "ranges" = dontDistribute super."ranges";
   "rank1dynamic" = dontDistribute super."rank1dynamic";
   "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
@@ -6825,6 +6852,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6897,6 +6925,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_4_4_5";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "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-jquery" = doDistribute super."servant-jquery_0_4_4_5";
@@ -7055,6 +7084,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -7293,6 +7323,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -7325,6 +7356,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_14_2";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7386,6 +7418,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -7494,6 +7528,7 @@ self: super: {
   "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7810,6 +7845,7 @@ self: super: {
   "twitter" = dontDistribute super."twitter";
   "twitter-conduit" = dontDistribute super."twitter-conduit";
   "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-feed" = doDistribute super."twitter-feed_0_2_0_4";
   "twitter-types" = dontDistribute super."twitter-types";
   "twitter-types-lens" = dontDistribute super."twitter-types-lens";
   "tx" = dontDistribute super."tx";
@@ -7942,6 +7978,7 @@ self: super: {
   "unix-pty-light" = dontDistribute super."unix-pty-light";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8061,6 +8098,7 @@ self: super: {
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_3";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -8142,6 +8180,7 @@ self: super: {
   "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1";
   "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-predicates" = doDistribute super."wai-predicates_0_8_5";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-route" = doDistribute super."wai-route_0_3";
@@ -8516,6 +8555,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index b420c0559803..71295c733a22 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -468,6 +468,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_2_20";
@@ -704,6 +705,7 @@ self: super: {
   "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";
@@ -1348,6 +1350,7 @@ self: super: {
   "ascii-progress" = dontDistribute super."ascii-progress";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1862,6 +1865,7 @@ self: super: {
   "cascading" = dontDistribute super."cascading";
   "case-conversion" = dontDistribute super."case-conversion";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2016,6 +2020,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2207,6 +2212,7 @@ self: super: {
   "count" = dontDistribute super."count";
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2517,6 +2523,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7";
@@ -2531,7 +2538,9 @@ self: super: {
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_6";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
@@ -3500,6 +3509,7 @@ self: super: {
   "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";
@@ -3552,6 +3562,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3700,6 +3711,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_2_1";
@@ -3824,6 +3836,7 @@ self: super: {
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
+  "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
   "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
   "haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -4239,6 +4252,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4618,6 +4632,7 @@ self: super: {
   "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";
@@ -4842,6 +4857,7 @@ self: super: {
   "kademlia" = dontDistribute super."kademlia";
   "kafka-client" = dontDistribute super."kafka-client";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5132,6 +5148,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5190,6 +5207,7 @@ self: super: {
   "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";
@@ -5197,6 +5215,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5520,6 +5539,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5705,6 +5725,7 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
@@ -5912,6 +5933,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_2";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6089,6 +6111,7 @@ self: super: {
   "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6108,6 +6131,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6325,6 +6349,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6424,6 +6449,7 @@ self: super: {
   "rados-haskell" = dontDistribute super."rados-haskell";
   "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
   "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
   "rake" = dontDistribute super."rake";
   "rakhana" = dontDistribute super."rakhana";
   "ralist" = dontDistribute super."ralist";
@@ -6449,6 +6475,7 @@ self: super: {
   "ranges" = dontDistribute super."ranges";
   "rank1dynamic" = dontDistribute super."rank1dynamic";
   "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
@@ -6822,6 +6849,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6894,6 +6922,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_4_4_5";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "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-jquery" = doDistribute super."servant-jquery_0_4_4_5";
@@ -7051,6 +7080,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -7289,6 +7319,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -7321,6 +7352,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_14_2";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7382,6 +7414,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -7490,6 +7524,7 @@ self: super: {
   "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7806,6 +7841,7 @@ self: super: {
   "twitter" = dontDistribute super."twitter";
   "twitter-conduit" = dontDistribute super."twitter-conduit";
   "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-feed" = doDistribute super."twitter-feed_0_2_0_4";
   "twitter-types" = dontDistribute super."twitter-types";
   "twitter-types-lens" = dontDistribute super."twitter-types-lens";
   "tx" = dontDistribute super."tx";
@@ -7938,6 +7974,7 @@ self: super: {
   "unix-pty-light" = dontDistribute super."unix-pty-light";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8057,6 +8094,7 @@ self: super: {
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_3";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -8138,6 +8176,7 @@ self: super: {
   "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1";
   "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-predicates" = doDistribute super."wai-predicates_0_8_5";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-route" = doDistribute super."wai-route_0_3";
@@ -8512,6 +8551,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index 534196a30ac7..cd3a21a04243 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -467,6 +467,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_2_20";
@@ -703,6 +704,7 @@ self: super: {
   "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";
@@ -1347,6 +1349,7 @@ self: super: {
   "ascii-progress" = dontDistribute super."ascii-progress";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1861,6 +1864,7 @@ self: super: {
   "cascading" = dontDistribute super."cascading";
   "case-conversion" = dontDistribute super."case-conversion";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2012,6 +2016,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2203,6 +2208,7 @@ self: super: {
   "count" = dontDistribute super."count";
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2513,6 +2519,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7";
@@ -2527,7 +2534,9 @@ self: super: {
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_6";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
@@ -3495,6 +3504,7 @@ self: super: {
   "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";
@@ -3547,6 +3557,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3695,6 +3706,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_2_1";
@@ -3819,6 +3831,7 @@ self: super: {
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
+  "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
   "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
   "haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -4234,6 +4247,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4613,6 +4627,7 @@ self: super: {
   "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";
@@ -4837,6 +4852,7 @@ self: super: {
   "kademlia" = dontDistribute super."kademlia";
   "kafka-client" = dontDistribute super."kafka-client";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5127,6 +5143,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5185,6 +5202,7 @@ self: super: {
   "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";
@@ -5192,6 +5210,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5515,6 +5534,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5700,6 +5720,7 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
@@ -5907,6 +5928,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_3";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6083,6 +6105,7 @@ self: super: {
   "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6102,6 +6125,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6319,6 +6343,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6418,6 +6443,7 @@ self: super: {
   "rados-haskell" = dontDistribute super."rados-haskell";
   "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
   "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
   "rake" = dontDistribute super."rake";
   "rakhana" = dontDistribute super."rakhana";
   "ralist" = dontDistribute super."ralist";
@@ -6443,6 +6469,7 @@ self: super: {
   "ranges" = dontDistribute super."ranges";
   "rank1dynamic" = dontDistribute super."rank1dynamic";
   "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
@@ -6816,6 +6843,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6888,6 +6916,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_4_4_5";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "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-jquery" = doDistribute super."servant-jquery_0_4_4_5";
@@ -7045,6 +7074,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -7283,6 +7313,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -7315,6 +7346,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_14_2";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7376,6 +7408,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -7484,6 +7518,7 @@ self: super: {
   "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7798,6 +7833,7 @@ self: super: {
   "twitter" = dontDistribute super."twitter";
   "twitter-conduit" = dontDistribute super."twitter-conduit";
   "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-feed" = doDistribute super."twitter-feed_0_2_0_4";
   "twitter-types" = dontDistribute super."twitter-types";
   "twitter-types-lens" = dontDistribute super."twitter-types-lens";
   "tx" = dontDistribute super."tx";
@@ -7930,6 +7966,7 @@ self: super: {
   "unix-pty-light" = dontDistribute super."unix-pty-light";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8049,6 +8086,7 @@ self: super: {
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_3";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -8130,6 +8168,7 @@ self: super: {
   "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1";
   "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-predicates" = doDistribute super."wai-predicates_0_8_5";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-route" = doDistribute super."wai-route_0_3";
@@ -8502,6 +8541,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index 29a139a9e4d4..eb17f7e72a80 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -467,6 +467,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_2_20";
@@ -703,6 +704,7 @@ self: super: {
   "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";
@@ -1347,6 +1349,7 @@ self: super: {
   "ascii-progress" = dontDistribute super."ascii-progress";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1861,6 +1864,7 @@ self: super: {
   "cascading" = dontDistribute super."cascading";
   "case-conversion" = dontDistribute super."case-conversion";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2012,6 +2016,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2203,6 +2208,7 @@ self: super: {
   "count" = dontDistribute super."count";
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2513,6 +2519,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7";
@@ -2527,7 +2534,9 @@ self: super: {
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_6";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
@@ -3495,6 +3504,7 @@ self: super: {
   "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";
@@ -3547,6 +3557,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3695,6 +3706,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_2_1";
@@ -3819,6 +3831,7 @@ self: super: {
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
+  "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
   "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
   "haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -4233,6 +4246,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4612,6 +4626,7 @@ self: super: {
   "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";
@@ -4836,6 +4851,7 @@ self: super: {
   "kademlia" = dontDistribute super."kademlia";
   "kafka-client" = dontDistribute super."kafka-client";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5125,6 +5141,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5183,6 +5200,7 @@ self: super: {
   "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";
@@ -5190,6 +5208,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5513,6 +5532,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5698,6 +5718,7 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
@@ -5905,6 +5926,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_3";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6080,6 +6102,7 @@ self: super: {
   "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6099,6 +6122,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6316,6 +6340,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6415,6 +6440,7 @@ self: super: {
   "rados-haskell" = dontDistribute super."rados-haskell";
   "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
   "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
   "rake" = dontDistribute super."rake";
   "rakhana" = dontDistribute super."rakhana";
   "ralist" = dontDistribute super."ralist";
@@ -6440,6 +6466,7 @@ self: super: {
   "ranges" = dontDistribute super."ranges";
   "rank1dynamic" = dontDistribute super."rank1dynamic";
   "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
@@ -6813,6 +6840,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6885,6 +6913,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_4_4_5";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "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-jquery" = doDistribute super."servant-jquery_0_4_4_5";
@@ -7042,6 +7071,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -7280,6 +7310,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -7312,6 +7343,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_14_2";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7373,6 +7405,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -7481,6 +7515,7 @@ self: super: {
   "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7795,6 +7830,7 @@ self: super: {
   "twitter" = dontDistribute super."twitter";
   "twitter-conduit" = dontDistribute super."twitter-conduit";
   "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-feed" = doDistribute super."twitter-feed_0_2_0_4";
   "twitter-types" = dontDistribute super."twitter-types";
   "twitter-types-lens" = dontDistribute super."twitter-types-lens";
   "tx" = dontDistribute super."tx";
@@ -7927,6 +7963,7 @@ self: super: {
   "unix-pty-light" = dontDistribute super."unix-pty-light";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8046,6 +8083,7 @@ self: super: {
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_3";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -8126,6 +8164,7 @@ self: super: {
   "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1";
   "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-predicates" = doDistribute super."wai-predicates_0_8_5";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-route" = doDistribute super."wai-route_0_3";
@@ -8498,6 +8537,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index b406a70ae068..4977ead89e3d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -467,6 +467,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_2_20";
@@ -703,6 +704,7 @@ self: super: {
   "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";
@@ -1345,6 +1347,7 @@ self: super: {
   "ascii-progress" = dontDistribute super."ascii-progress";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1858,6 +1861,7 @@ self: super: {
   "cascading" = dontDistribute super."cascading";
   "case-conversion" = dontDistribute super."case-conversion";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2009,6 +2013,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2200,6 +2205,7 @@ self: super: {
   "count" = dontDistribute super."count";
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2509,6 +2515,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
@@ -2521,7 +2528,9 @@ self: super: {
   "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-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_7";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
@@ -2664,6 +2673,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3488,6 +3498,7 @@ self: super: {
   "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";
@@ -3540,6 +3551,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3688,6 +3700,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_2_1";
@@ -3812,6 +3825,7 @@ self: super: {
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
+  "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
   "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
   "haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -4226,6 +4240,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4604,6 +4619,7 @@ self: super: {
   "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";
@@ -4828,6 +4844,7 @@ self: super: {
   "kademlia" = dontDistribute super."kademlia";
   "kafka-client" = dontDistribute super."kafka-client";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5117,6 +5134,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5175,6 +5193,7 @@ self: super: {
   "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";
@@ -5182,6 +5201,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5485,6 +5505,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_3";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -5503,6 +5524,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5688,6 +5710,7 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
@@ -5895,6 +5918,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_3";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6070,6 +6094,7 @@ self: super: {
   "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6089,6 +6114,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6306,6 +6332,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6405,6 +6432,7 @@ self: super: {
   "rados-haskell" = dontDistribute super."rados-haskell";
   "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
   "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
   "rake" = dontDistribute super."rake";
   "rakhana" = dontDistribute super."rakhana";
   "ralist" = dontDistribute super."ralist";
@@ -6430,6 +6458,7 @@ self: super: {
   "ranges" = dontDistribute super."ranges";
   "rank1dynamic" = dontDistribute super."rank1dynamic";
   "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
@@ -6803,6 +6832,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6875,6 +6905,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_4_4_5";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "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-jquery" = doDistribute super."servant-jquery_0_4_4_5";
@@ -7032,6 +7063,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -7270,6 +7302,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -7302,6 +7335,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_14_2";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7363,6 +7397,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -7471,6 +7507,7 @@ self: super: {
   "tasty-silver" = doDistribute super."tasty-silver_3_1_8";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7785,6 +7822,7 @@ self: super: {
   "twitter" = dontDistribute super."twitter";
   "twitter-conduit" = dontDistribute super."twitter-conduit";
   "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-feed" = doDistribute super."twitter-feed_0_2_0_4";
   "twitter-types" = dontDistribute super."twitter-types";
   "twitter-types-lens" = dontDistribute super."twitter-types-lens";
   "tx" = dontDistribute super."tx";
@@ -7917,6 +7955,7 @@ self: super: {
   "unix-pty-light" = dontDistribute super."unix-pty-light";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8036,6 +8075,7 @@ self: super: {
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_3";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -8116,11 +8156,13 @@ self: super: {
   "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1";
   "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-predicates" = doDistribute super."wai-predicates_0_8_5";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
+  "wai-routing" = doDistribute super."wai-routing_0_12_2";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
   "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
   "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
@@ -8486,6 +8528,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 7df0af1bb2a5..69adc7bd0e43 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -467,6 +467,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_2_20";
@@ -703,6 +704,7 @@ self: super: {
   "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";
@@ -1345,6 +1347,7 @@ self: super: {
   "ascii-progress" = dontDistribute super."ascii-progress";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1858,6 +1861,7 @@ self: super: {
   "cascading" = dontDistribute super."cascading";
   "case-conversion" = dontDistribute super."case-conversion";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2009,6 +2013,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2200,6 +2205,7 @@ self: super: {
   "count" = dontDistribute super."count";
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2509,6 +2515,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
@@ -2521,7 +2528,9 @@ self: super: {
   "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-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_7";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
@@ -2664,6 +2673,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3487,6 +3497,7 @@ self: super: {
   "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";
@@ -3539,6 +3550,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3687,6 +3699,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_2_1";
@@ -3810,6 +3823,7 @@ self: super: {
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
+  "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
   "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
   "haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -4223,6 +4237,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4600,6 +4615,7 @@ self: super: {
   "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";
@@ -4824,6 +4840,7 @@ self: super: {
   "kademlia" = dontDistribute super."kademlia";
   "kafka-client" = dontDistribute super."kafka-client";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5113,6 +5130,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5171,6 +5189,7 @@ self: super: {
   "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";
@@ -5178,6 +5197,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5481,6 +5501,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_3";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -5499,6 +5520,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5684,6 +5706,7 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
@@ -5891,6 +5914,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_3";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6066,6 +6090,7 @@ self: super: {
   "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6085,6 +6110,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6302,6 +6328,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6401,6 +6428,7 @@ self: super: {
   "rados-haskell" = dontDistribute super."rados-haskell";
   "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
   "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
   "rake" = dontDistribute super."rake";
   "rakhana" = dontDistribute super."rakhana";
   "ralist" = dontDistribute super."ralist";
@@ -6426,6 +6454,7 @@ self: super: {
   "ranges" = dontDistribute super."ranges";
   "rank1dynamic" = dontDistribute super."rank1dynamic";
   "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
@@ -6799,6 +6828,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6871,6 +6901,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_4_4_5";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "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-jquery" = doDistribute super."servant-jquery_0_4_4_5";
@@ -7027,6 +7058,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -7265,6 +7297,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -7297,6 +7330,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_14_2";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7358,6 +7392,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -7466,6 +7502,7 @@ self: super: {
   "tasty-silver" = doDistribute super."tasty-silver_3_1_8";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7780,6 +7817,7 @@ self: super: {
   "twitter" = dontDistribute super."twitter";
   "twitter-conduit" = dontDistribute super."twitter-conduit";
   "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-feed" = doDistribute super."twitter-feed_0_2_0_4";
   "twitter-types" = dontDistribute super."twitter-types";
   "twitter-types-lens" = dontDistribute super."twitter-types-lens";
   "tx" = dontDistribute super."tx";
@@ -7912,6 +7950,7 @@ self: super: {
   "unix-pty-light" = dontDistribute super."unix-pty-light";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8031,6 +8070,7 @@ self: super: {
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_3";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -8111,11 +8151,13 @@ self: super: {
   "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1";
   "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-predicates" = doDistribute super."wai-predicates_0_8_5";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
+  "wai-routing" = doDistribute super."wai-routing_0_12_2";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
   "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
   "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
@@ -8481,6 +8523,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index fe271aec27a0..fb176346a7b1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -467,6 +467,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_2_21";
@@ -702,6 +703,7 @@ self: super: {
   "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";
@@ -1344,6 +1346,7 @@ self: super: {
   "ascii-progress" = dontDistribute super."ascii-progress";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1857,6 +1860,7 @@ self: super: {
   "cascading" = dontDistribute super."cascading";
   "case-conversion" = dontDistribute super."case-conversion";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2008,6 +2012,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2199,6 +2204,7 @@ self: super: {
   "count" = dontDistribute super."count";
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2508,6 +2514,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
@@ -2520,7 +2527,9 @@ self: super: {
   "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-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_7";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
@@ -2663,6 +2672,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3485,6 +3495,7 @@ self: super: {
   "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";
@@ -3537,6 +3548,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3684,6 +3696,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_2_1";
@@ -3807,6 +3820,7 @@ self: super: {
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
+  "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
   "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
   "haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -4220,6 +4234,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4597,6 +4612,7 @@ self: super: {
   "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";
@@ -4821,6 +4837,7 @@ self: super: {
   "kademlia" = dontDistribute super."kademlia";
   "kafka-client" = dontDistribute super."kafka-client";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5109,6 +5126,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5167,6 +5185,7 @@ self: super: {
   "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";
@@ -5174,6 +5193,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5476,6 +5496,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_3";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -5494,6 +5515,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5679,6 +5701,7 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
@@ -5886,6 +5909,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_3";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6060,6 +6084,7 @@ self: super: {
   "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6079,6 +6104,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6295,6 +6321,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6394,6 +6421,7 @@ self: super: {
   "rados-haskell" = dontDistribute super."rados-haskell";
   "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
   "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
   "rake" = dontDistribute super."rake";
   "rakhana" = dontDistribute super."rakhana";
   "ralist" = dontDistribute super."ralist";
@@ -6419,6 +6447,7 @@ self: super: {
   "ranges" = dontDistribute super."ranges";
   "rank1dynamic" = dontDistribute super."rank1dynamic";
   "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
@@ -6790,6 +6819,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6862,6 +6892,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_4_4_5";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "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-jquery" = doDistribute super."servant-jquery_0_4_4_5";
@@ -7018,6 +7049,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -7256,6 +7288,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -7288,6 +7321,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7349,6 +7383,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -7455,6 +7491,7 @@ self: super: {
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-silver" = doDistribute super."tasty-silver_3_1_8";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7768,6 +7805,7 @@ self: super: {
   "twitter" = dontDistribute super."twitter";
   "twitter-conduit" = dontDistribute super."twitter-conduit";
   "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-feed" = doDistribute super."twitter-feed_0_2_0_4";
   "twitter-types" = dontDistribute super."twitter-types";
   "twitter-types-lens" = dontDistribute super."twitter-types-lens";
   "tx" = dontDistribute super."tx";
@@ -7900,6 +7938,7 @@ self: super: {
   "unix-pty-light" = dontDistribute super."unix-pty-light";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8019,6 +8058,7 @@ self: super: {
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_3";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -8099,11 +8139,13 @@ self: super: {
   "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1";
   "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-predicates" = doDistribute super."wai-predicates_0_8_5";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
+  "wai-routing" = doDistribute super."wai-routing_0_12_2";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
   "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
   "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
@@ -8469,6 +8511,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index dc618d2f2b56..d3db8afa3005 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -467,6 +467,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_2_22";
@@ -702,6 +703,7 @@ self: super: {
   "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";
@@ -1343,6 +1345,7 @@ self: super: {
   "ascii-progress" = dontDistribute super."ascii-progress";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1856,6 +1859,7 @@ self: super: {
   "cascading" = dontDistribute super."cascading";
   "case-conversion" = dontDistribute super."case-conversion";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2006,6 +2010,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2110,6 +2115,7 @@ self: super: {
   "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
   "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
+  "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
@@ -2196,6 +2202,7 @@ self: super: {
   "count" = dontDistribute super."count";
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2505,6 +2512,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_1";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
@@ -2517,7 +2525,9 @@ self: super: {
   "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-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_7";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
@@ -2660,6 +2670,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3482,6 +3493,7 @@ self: super: {
   "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";
@@ -3534,6 +3546,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3680,6 +3693,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_2_1";
@@ -3803,6 +3817,7 @@ self: super: {
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
+  "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
   "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
   "haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -4216,6 +4231,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4593,6 +4609,7 @@ self: super: {
   "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";
@@ -4816,6 +4833,7 @@ self: super: {
   "kademlia" = dontDistribute super."kademlia";
   "kafka-client" = dontDistribute super."kafka-client";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5104,6 +5122,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5161,6 +5180,7 @@ self: super: {
   "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";
@@ -5168,6 +5188,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5469,6 +5490,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_3";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -5487,6 +5509,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5672,6 +5695,7 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
@@ -5879,6 +5903,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_3";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6053,6 +6078,7 @@ self: super: {
   "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6072,6 +6098,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6288,6 +6315,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6387,6 +6415,7 @@ self: super: {
   "rados-haskell" = dontDistribute super."rados-haskell";
   "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
   "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
   "rake" = dontDistribute super."rake";
   "rakhana" = dontDistribute super."rakhana";
   "ralist" = dontDistribute super."ralist";
@@ -6412,6 +6441,7 @@ self: super: {
   "ranges" = dontDistribute super."ranges";
   "rank1dynamic" = dontDistribute super."rank1dynamic";
   "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
@@ -6783,6 +6813,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6855,6 +6886,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_4_4_5";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "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-jquery" = doDistribute super."servant-jquery_0_4_4_5";
@@ -7011,6 +7043,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -7249,6 +7282,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -7281,6 +7315,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7342,6 +7377,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -7448,6 +7485,7 @@ self: super: {
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-silver" = doDistribute super."tasty-silver_3_1_8";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7761,6 +7799,7 @@ self: super: {
   "twitter" = dontDistribute super."twitter";
   "twitter-conduit" = dontDistribute super."twitter-conduit";
   "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-feed" = doDistribute super."twitter-feed_0_2_0_4";
   "twitter-types" = dontDistribute super."twitter-types";
   "twitter-types-lens" = dontDistribute super."twitter-types-lens";
   "tx" = dontDistribute super."tx";
@@ -7893,6 +7932,7 @@ self: super: {
   "unix-pty-light" = dontDistribute super."unix-pty-light";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -7980,6 +8020,7 @@ self: super: {
   "variable-precision" = dontDistribute super."variable-precision";
   "variables" = dontDistribute super."variables";
   "varying" = dontDistribute super."varying";
+  "vault" = doDistribute super."vault_0_3_0_5";
   "vaultaire-common" = dontDistribute super."vaultaire-common";
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
@@ -8011,6 +8052,7 @@ self: super: {
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_3";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -8091,11 +8133,13 @@ self: super: {
   "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1";
   "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-predicates" = doDistribute super."wai-predicates_0_8_5";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
+  "wai-routing" = doDistribute super."wai-routing_0_12_2";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
   "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
   "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
@@ -8460,6 +8504,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index 8f92e45e6ca1..35eb440d7566 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -467,6 +467,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_2_22";
@@ -702,6 +703,7 @@ self: super: {
   "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";
@@ -1343,6 +1345,7 @@ self: super: {
   "ascii-progress" = dontDistribute super."ascii-progress";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1855,6 +1858,7 @@ self: super: {
   "cascading" = dontDistribute super."cascading";
   "case-conversion" = dontDistribute super."case-conversion";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2005,6 +2009,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2109,6 +2114,7 @@ self: super: {
   "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
   "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
+  "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
@@ -2195,6 +2201,7 @@ self: super: {
   "count" = dontDistribute super."count";
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2504,6 +2511,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_1";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
@@ -2516,7 +2524,9 @@ self: super: {
   "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-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_7";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
@@ -2659,6 +2669,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3479,6 +3490,7 @@ self: super: {
   "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";
@@ -3531,6 +3543,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3676,6 +3689,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_2_2";
@@ -3799,6 +3813,7 @@ self: super: {
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
+  "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
   "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
   "haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -4210,6 +4225,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4584,6 +4600,7 @@ self: super: {
   "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";
@@ -4807,6 +4824,7 @@ self: super: {
   "kademlia" = dontDistribute super."kademlia";
   "kafka-client" = dontDistribute super."kafka-client";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5095,6 +5113,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5152,6 +5171,7 @@ self: super: {
   "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";
@@ -5159,6 +5179,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5460,6 +5481,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_3";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -5478,6 +5500,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5663,6 +5686,7 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
@@ -5870,6 +5894,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_3";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6043,6 +6068,7 @@ self: super: {
   "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6062,6 +6088,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6276,6 +6303,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6375,6 +6403,7 @@ self: super: {
   "rados-haskell" = dontDistribute super."rados-haskell";
   "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
   "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
   "rake" = dontDistribute super."rake";
   "rakhana" = dontDistribute super."rakhana";
   "ralist" = dontDistribute super."ralist";
@@ -6400,6 +6429,7 @@ self: super: {
   "ranges" = dontDistribute super."ranges";
   "rank1dynamic" = dontDistribute super."rank1dynamic";
   "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
@@ -6771,6 +6801,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6843,6 +6874,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_4_4_5";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "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-jquery" = doDistribute super."servant-jquery_0_4_4_5";
@@ -6998,6 +7030,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -7236,6 +7269,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -7268,6 +7302,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7329,6 +7364,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -7435,6 +7472,7 @@ self: super: {
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-silver" = doDistribute super."tasty-silver_3_1_8";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7748,6 +7786,7 @@ self: super: {
   "twitter" = dontDistribute super."twitter";
   "twitter-conduit" = dontDistribute super."twitter-conduit";
   "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-feed" = doDistribute super."twitter-feed_0_2_0_4";
   "twitter-types" = dontDistribute super."twitter-types";
   "twitter-types-lens" = dontDistribute super."twitter-types-lens";
   "tx" = dontDistribute super."tx";
@@ -7880,6 +7919,7 @@ self: super: {
   "unix-pty-light" = dontDistribute super."unix-pty-light";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -7966,6 +8006,7 @@ self: super: {
   "variable-precision" = dontDistribute super."variable-precision";
   "variables" = dontDistribute super."variables";
   "varying" = dontDistribute super."varying";
+  "vault" = doDistribute super."vault_0_3_0_5";
   "vaultaire-common" = dontDistribute super."vaultaire-common";
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
@@ -7997,6 +8038,7 @@ self: super: {
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_3";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -8077,11 +8119,13 @@ self: super: {
   "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1";
   "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-predicates" = doDistribute super."wai-predicates_0_8_5";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
+  "wai-routing" = doDistribute super."wai-routing_0_12_2";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
   "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
   "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
@@ -8446,6 +8490,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index b38924fbbf25..ce8ecc398529 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -466,6 +466,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_2_22";
@@ -701,6 +702,7 @@ self: super: {
   "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";
@@ -1342,6 +1344,7 @@ self: super: {
   "ascii-progress" = dontDistribute super."ascii-progress";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1850,6 +1853,7 @@ self: super: {
   "cascading" = dontDistribute super."cascading";
   "case-conversion" = dontDistribute super."case-conversion";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2000,6 +2004,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2103,6 +2108,7 @@ self: super: {
   "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
   "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
+  "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
@@ -2189,6 +2195,7 @@ self: super: {
   "count" = dontDistribute super."count";
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2498,6 +2505,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_1";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
@@ -2510,7 +2518,9 @@ self: super: {
   "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-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_7";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
@@ -2653,6 +2663,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3473,6 +3484,7 @@ self: super: {
   "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";
@@ -3525,6 +3537,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3670,6 +3683,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_2_2";
@@ -3793,6 +3807,7 @@ self: super: {
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
+  "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
   "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
   "haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -4202,6 +4217,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4575,6 +4591,7 @@ self: super: {
   "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";
@@ -4797,6 +4814,7 @@ self: super: {
   "kademlia" = dontDistribute super."kademlia";
   "kafka-client" = dontDistribute super."kafka-client";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5084,6 +5102,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5141,6 +5160,7 @@ self: super: {
   "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";
@@ -5148,6 +5168,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5449,6 +5470,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_3";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -5467,6 +5489,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5651,6 +5674,7 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
@@ -5858,6 +5882,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_3";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6029,6 +6054,7 @@ self: super: {
   "pipes" = doDistribute super."pipes_4_1_7";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6048,6 +6074,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6262,6 +6289,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6361,6 +6389,7 @@ self: super: {
   "rados-haskell" = dontDistribute super."rados-haskell";
   "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
   "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
   "rake" = dontDistribute super."rake";
   "rakhana" = dontDistribute super."rakhana";
   "ralist" = dontDistribute super."ralist";
@@ -6386,6 +6415,7 @@ self: super: {
   "ranges" = dontDistribute super."ranges";
   "rank1dynamic" = dontDistribute super."rank1dynamic";
   "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
@@ -6757,6 +6787,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6829,6 +6860,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_4_4_5";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "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-jquery" = doDistribute super."servant-jquery_0_4_4_5";
@@ -6984,6 +7016,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -7221,6 +7254,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -7253,6 +7287,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7314,6 +7349,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -7420,6 +7457,7 @@ self: super: {
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-silver" = doDistribute super."tasty-silver_3_1_8";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7733,6 +7771,7 @@ self: super: {
   "twitter" = dontDistribute super."twitter";
   "twitter-conduit" = dontDistribute super."twitter-conduit";
   "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-feed" = doDistribute super."twitter-feed_0_2_0_4";
   "twitter-types" = dontDistribute super."twitter-types";
   "twitter-types-lens" = dontDistribute super."twitter-types-lens";
   "tx" = dontDistribute super."tx";
@@ -7865,6 +7904,7 @@ self: super: {
   "unix-pty-light" = dontDistribute super."unix-pty-light";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -7951,6 +7991,7 @@ self: super: {
   "variable-precision" = dontDistribute super."variable-precision";
   "variables" = dontDistribute super."variables";
   "varying" = dontDistribute super."varying";
+  "vault" = doDistribute super."vault_0_3_0_5";
   "vaultaire-common" = dontDistribute super."vaultaire-common";
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
@@ -7982,6 +8023,7 @@ self: super: {
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_3";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -8062,11 +8104,13 @@ self: super: {
   "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1";
   "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-predicates" = doDistribute super."wai-predicates_0_8_5";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
+  "wai-routing" = doDistribute super."wai-routing_0_12_2";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
   "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
   "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
@@ -8430,6 +8474,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index ab3660227dcd..ba9460ae8c0d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_2_20";
@@ -708,6 +709,7 @@ self: super: {
   "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";
@@ -1354,6 +1356,7 @@ self: super: {
   "ascii-progress" = dontDistribute super."ascii-progress";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1876,6 +1879,7 @@ self: super: {
   "case-conversion" = dontDistribute super."case-conversion";
   "case-insensitive" = doDistribute super."case-insensitive_1_2_0_4";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2030,6 +2034,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2534,6 +2539,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_1_1";
   "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_3";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
@@ -2551,7 +2557,9 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_2";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_3";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
@@ -3530,6 +3538,7 @@ self: super: {
   "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";
@@ -3582,6 +3591,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3730,6 +3740,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4273,6 +4284,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4655,6 +4667,7 @@ self: super: {
   "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";
@@ -4881,6 +4894,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5173,6 +5187,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5231,6 +5246,7 @@ self: super: {
   "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";
@@ -5238,6 +5254,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5564,6 +5581,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5752,6 +5770,7 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
@@ -5960,6 +5979,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_2";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6159,6 +6179,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6382,6 +6403,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6882,6 +6904,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6954,6 +6977,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_4_4";
   "servant-docs" = doDistribute super."servant-docs_0_4_4";
   "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-jquery" = doDistribute super."servant-jquery_0_4_4";
@@ -7113,6 +7137,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -7354,6 +7379,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -7386,6 +7412,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7447,6 +7474,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -7559,6 +7588,7 @@ self: super: {
   "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8011,6 +8041,7 @@ self: super: {
   "unix-time" = doDistribute super."unix-time_0_3_5";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8599,6 +8630,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index bb320bd6d3bd..444c6627aeea 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -465,6 +465,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_2_22";
@@ -700,6 +701,7 @@ self: super: {
   "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";
@@ -1341,6 +1343,7 @@ self: super: {
   "ascii-progress" = dontDistribute super."ascii-progress";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1849,6 +1852,7 @@ self: super: {
   "cascading" = dontDistribute super."cascading";
   "case-conversion" = dontDistribute super."case-conversion";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -1999,6 +2003,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2102,6 +2107,7 @@ self: super: {
   "conduit-audio-sndfile" = dontDistribute super."conduit-audio-sndfile";
   "conduit-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
+  "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
@@ -2188,6 +2194,7 @@ self: super: {
   "count" = dontDistribute super."count";
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2497,6 +2504,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_1";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
@@ -2509,7 +2517,9 @@ self: super: {
   "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-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_7";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
@@ -2652,6 +2662,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3472,6 +3483,7 @@ self: super: {
   "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";
@@ -3524,6 +3536,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3669,6 +3682,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_2_2";
@@ -3792,6 +3806,7 @@ self: super: {
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
+  "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
   "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
   "haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -4201,6 +4216,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4574,6 +4590,7 @@ self: super: {
   "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";
@@ -4796,6 +4813,7 @@ self: super: {
   "kademlia" = dontDistribute super."kademlia";
   "kafka-client" = dontDistribute super."kafka-client";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5082,6 +5100,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5139,6 +5158,7 @@ self: super: {
   "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";
@@ -5146,6 +5166,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5447,6 +5468,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_3";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -5465,6 +5487,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5649,6 +5672,7 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
@@ -5856,6 +5880,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_3";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6026,6 +6051,7 @@ self: super: {
   "pipes" = doDistribute super."pipes_4_1_7";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6045,6 +6071,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6259,6 +6286,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6358,6 +6386,7 @@ self: super: {
   "rados-haskell" = dontDistribute super."rados-haskell";
   "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
   "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
   "rake" = dontDistribute super."rake";
   "rakhana" = dontDistribute super."rakhana";
   "ralist" = dontDistribute super."ralist";
@@ -6383,6 +6412,7 @@ self: super: {
   "ranges" = dontDistribute super."ranges";
   "rank1dynamic" = dontDistribute super."rank1dynamic";
   "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
@@ -6753,6 +6783,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6825,6 +6856,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_4_4_5";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_5";
   "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-jquery" = doDistribute super."servant-jquery_0_4_4_5";
@@ -6980,6 +7012,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -7216,6 +7249,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -7248,6 +7282,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7309,6 +7344,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -7415,6 +7452,7 @@ self: super: {
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-silver" = doDistribute super."tasty-silver_3_1_8";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7727,6 +7765,7 @@ self: super: {
   "twitter" = dontDistribute super."twitter";
   "twitter-conduit" = dontDistribute super."twitter-conduit";
   "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-feed" = doDistribute super."twitter-feed_0_2_0_4";
   "twitter-types" = dontDistribute super."twitter-types";
   "twitter-types-lens" = dontDistribute super."twitter-types-lens";
   "tx" = dontDistribute super."tx";
@@ -7859,6 +7898,7 @@ self: super: {
   "unix-pty-light" = dontDistribute super."unix-pty-light";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -7945,6 +7985,7 @@ self: super: {
   "variable-precision" = dontDistribute super."variable-precision";
   "variables" = dontDistribute super."variables";
   "varying" = dontDistribute super."varying";
+  "vault" = doDistribute super."vault_0_3_0_5";
   "vaultaire-common" = dontDistribute super."vaultaire-common";
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
@@ -7976,6 +8017,7 @@ self: super: {
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_3";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -8056,11 +8098,13 @@ self: super: {
   "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1";
   "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-predicates" = doDistribute super."wai-predicates_0_8_5";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-route" = doDistribute super."wai-route_0_3";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
+  "wai-routing" = doDistribute super."wai-routing_0_12_2";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
   "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
   "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
@@ -8423,6 +8467,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index 53ba6103f2c7..5d00ab1621bb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -465,6 +465,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_2_23";
@@ -700,6 +701,7 @@ self: super: {
   "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";
@@ -1341,6 +1343,7 @@ self: super: {
   "ascii-progress" = dontDistribute super."ascii-progress";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1469,6 +1472,7 @@ self: super: {
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
   "base-orphans" = doDistribute super."base-orphans_0_4_5";
+  "base-prelude" = doDistribute super."base-prelude_0_1_21";
   "base32-bytestring" = dontDistribute super."base32-bytestring";
   "base58-bytestring" = dontDistribute super."base58-bytestring";
   "base58address" = dontDistribute super."base58address";
@@ -1848,6 +1852,7 @@ self: super: {
   "cascading" = dontDistribute super."cascading";
   "case-conversion" = dontDistribute super."case-conversion";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -1998,6 +2003,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2093,12 +2099,14 @@ self: super: {
   "conductive-clock" = dontDistribute super."conductive-clock";
   "conductive-hsc3" = dontDistribute super."conductive-hsc3";
   "conductive-song" = dontDistribute super."conductive-song";
+  "conduit" = doDistribute super."conduit_1_2_6_1";
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
+  "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
@@ -2185,6 +2193,7 @@ self: super: {
   "count" = dontDistribute super."count";
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2494,6 +2503,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_1";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
@@ -2506,7 +2516,9 @@ self: super: {
   "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-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_7";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
@@ -2649,6 +2661,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3467,6 +3480,7 @@ self: super: {
   "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";
@@ -3519,6 +3533,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3663,6 +3678,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_2_2";
@@ -3786,6 +3802,7 @@ self: super: {
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
+  "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
   "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
   "haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -4195,6 +4212,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4566,6 +4584,7 @@ self: super: {
   "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";
@@ -4788,6 +4807,7 @@ self: super: {
   "kademlia" = dontDistribute super."kademlia";
   "kafka-client" = dontDistribute super."kafka-client";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5074,6 +5094,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5131,6 +5152,7 @@ self: super: {
   "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";
@@ -5138,6 +5160,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5438,6 +5461,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_3";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -5456,6 +5480,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5640,6 +5665,7 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
@@ -5847,6 +5873,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_3";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6016,6 +6043,7 @@ self: super: {
   "pipes" = doDistribute super."pipes_4_1_7";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6034,6 +6062,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6248,6 +6277,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6347,6 +6377,7 @@ self: super: {
   "rados-haskell" = dontDistribute super."rados-haskell";
   "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
   "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
   "rake" = dontDistribute super."rake";
   "rakhana" = dontDistribute super."rakhana";
   "ralist" = dontDistribute super."ralist";
@@ -6372,6 +6403,7 @@ self: super: {
   "ranges" = dontDistribute super."ranges";
   "rank1dynamic" = dontDistribute super."rank1dynamic";
   "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
@@ -6739,6 +6771,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6808,6 +6841,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "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-lucid" = dontDistribute super."servant-lucid";
@@ -6957,6 +6991,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -7193,6 +7228,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -7225,6 +7261,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7286,6 +7323,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -7392,6 +7431,7 @@ self: super: {
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-silver" = doDistribute super."tasty-silver_3_1_8";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7703,6 +7743,7 @@ self: super: {
   "twitter" = dontDistribute super."twitter";
   "twitter-conduit" = dontDistribute super."twitter-conduit";
   "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-feed" = doDistribute super."twitter-feed_0_2_0_4";
   "twitter-types" = dontDistribute super."twitter-types";
   "twitter-types-lens" = dontDistribute super."twitter-types-lens";
   "tx" = dontDistribute super."tx";
@@ -7835,6 +7876,7 @@ self: super: {
   "unix-pty-light" = dontDistribute super."unix-pty-light";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -7921,6 +7963,7 @@ self: super: {
   "variable-precision" = dontDistribute super."variable-precision";
   "variables" = dontDistribute super."variables";
   "varying" = dontDistribute super."varying";
+  "vault" = doDistribute super."vault_0_3_0_5";
   "vaultaire-common" = dontDistribute super."vaultaire-common";
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
@@ -7952,6 +7995,7 @@ self: super: {
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_3";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -8029,10 +8073,12 @@ self: super: {
   "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1";
   "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-predicates" = doDistribute super."wai-predicates_0_8_5";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
+  "wai-routing" = doDistribute super."wai-routing_0_12_2";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
   "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
   "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
@@ -8393,6 +8439,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
index ac439cb6a017..3c00b7054b46 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -465,6 +465,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_2_23";
@@ -700,6 +701,7 @@ self: super: {
   "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";
@@ -1341,6 +1343,7 @@ self: super: {
   "ascii-progress" = dontDistribute super."ascii-progress";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1469,6 +1472,7 @@ self: super: {
   "base-io-access" = dontDistribute super."base-io-access";
   "base-noprelude" = dontDistribute super."base-noprelude";
   "base-orphans" = doDistribute super."base-orphans_0_4_5";
+  "base-prelude" = doDistribute super."base-prelude_0_1_21";
   "base32-bytestring" = dontDistribute super."base32-bytestring";
   "base58-bytestring" = dontDistribute super."base58-bytestring";
   "base58address" = dontDistribute super."base58address";
@@ -1848,6 +1852,7 @@ self: super: {
   "cascading" = dontDistribute super."cascading";
   "case-conversion" = dontDistribute super."case-conversion";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -1998,6 +2003,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2093,12 +2099,14 @@ self: super: {
   "conductive-clock" = dontDistribute super."conductive-clock";
   "conductive-hsc3" = dontDistribute super."conductive-hsc3";
   "conductive-song" = dontDistribute super."conductive-song";
+  "conduit" = doDistribute super."conduit_1_2_6_1";
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
   "conduit-connection" = dontDistribute super."conduit-connection";
+  "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2";
   "conduit-iconv" = dontDistribute super."conduit-iconv";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-parse" = dontDistribute super."conduit-parse";
@@ -2185,6 +2193,7 @@ self: super: {
   "count" = dontDistribute super."count";
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2494,6 +2503,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_1";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
@@ -2506,7 +2516,9 @@ self: super: {
   "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-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_7";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
@@ -2649,6 +2661,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -3465,6 +3478,7 @@ self: super: {
   "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";
@@ -3517,6 +3531,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3661,6 +3676,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_2_2";
@@ -3784,6 +3800,7 @@ self: super: {
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
+  "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
   "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
   "haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -4192,6 +4209,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4562,6 +4580,7 @@ self: super: {
   "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";
@@ -4782,6 +4801,7 @@ self: super: {
   "kademlia" = dontDistribute super."kademlia";
   "kafka-client" = dontDistribute super."kafka-client";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5068,6 +5088,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5125,6 +5146,7 @@ self: super: {
   "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";
@@ -5132,6 +5154,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5432,6 +5455,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_9_3";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_3";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -5450,6 +5474,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5634,6 +5659,7 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
@@ -5841,6 +5867,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_3";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6010,6 +6037,7 @@ self: super: {
   "pipes" = doDistribute super."pipes_4_1_7";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6028,6 +6056,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6242,6 +6271,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6341,6 +6371,7 @@ self: super: {
   "rados-haskell" = dontDistribute super."rados-haskell";
   "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
   "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
   "rake" = dontDistribute super."rake";
   "rakhana" = dontDistribute super."rakhana";
   "ralist" = dontDistribute super."ralist";
@@ -6366,6 +6397,7 @@ self: super: {
   "ranges" = dontDistribute super."ranges";
   "rank1dynamic" = dontDistribute super."rank1dynamic";
   "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
@@ -6733,6 +6765,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6802,6 +6835,7 @@ self: super: {
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "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-lucid" = dontDistribute super."servant-lucid";
@@ -6951,6 +6985,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -7187,6 +7222,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -7219,6 +7255,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7280,6 +7317,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -7386,6 +7425,7 @@ self: super: {
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-silver" = doDistribute super."tasty-silver_3_1_8";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7697,6 +7737,7 @@ self: super: {
   "twitter" = dontDistribute super."twitter";
   "twitter-conduit" = dontDistribute super."twitter-conduit";
   "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-feed" = doDistribute super."twitter-feed_0_2_0_4";
   "twitter-types" = dontDistribute super."twitter-types";
   "twitter-types-lens" = dontDistribute super."twitter-types-lens";
   "tx" = dontDistribute super."tx";
@@ -7829,6 +7870,7 @@ self: super: {
   "unix-pty-light" = dontDistribute super."unix-pty-light";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -7915,6 +7957,7 @@ self: super: {
   "variable-precision" = dontDistribute super."variable-precision";
   "variables" = dontDistribute super."variables";
   "varying" = dontDistribute super."varying";
+  "vault" = doDistribute super."vault_0_3_0_5";
   "vaultaire-common" = dontDistribute super."vaultaire-common";
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
@@ -7946,6 +7989,7 @@ self: super: {
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_3";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -8023,10 +8067,12 @@ self: super: {
   "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1";
   "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-predicates" = doDistribute super."wai-predicates_0_8_5";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_7_3";
+  "wai-routing" = doDistribute super."wai-routing_0_12_2";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
   "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
   "wai-session-postgresql" = dontDistribute super."wai-session-postgresql";
@@ -8387,6 +8433,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index 42ec1ca85207..f42c314bfbcf 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_2_20";
@@ -708,6 +709,7 @@ self: super: {
   "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";
@@ -1353,6 +1355,7 @@ self: super: {
   "ascii-progress" = dontDistribute super."ascii-progress";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1875,6 +1878,7 @@ self: super: {
   "case-conversion" = dontDistribute super."case-conversion";
   "case-insensitive" = doDistribute super."case-insensitive_1_2_0_4";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2029,6 +2033,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2221,6 +2226,7 @@ self: super: {
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
   "country-codes" = doDistribute super."country-codes_0_1_2";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2531,6 +2537,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_1_1";
   "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_3";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
@@ -2548,7 +2555,9 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_2";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_3";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
@@ -3526,6 +3535,7 @@ self: super: {
   "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";
@@ -3578,6 +3588,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3726,6 +3737,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4268,6 +4280,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4650,6 +4663,7 @@ self: super: {
   "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";
@@ -4876,6 +4890,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5168,6 +5183,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5226,6 +5242,7 @@ self: super: {
   "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";
@@ -5233,6 +5250,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5559,6 +5577,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5747,6 +5766,7 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
@@ -5955,6 +5975,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_2";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6154,6 +6175,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6377,6 +6399,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6876,6 +6899,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6948,6 +6972,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_4_4_2";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_2";
   "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-jquery" = doDistribute super."servant-jquery_0_4_4_2";
@@ -7107,6 +7132,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -7347,6 +7373,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -7379,6 +7406,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7440,6 +7468,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -7551,6 +7581,7 @@ self: super: {
   "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8003,6 +8034,7 @@ self: super: {
   "unix-time" = doDistribute super."unix-time_0_3_5";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8589,6 +8621,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index a1b98e0c86ff..43c7b1f735f1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_2_20";
@@ -708,6 +709,7 @@ self: super: {
   "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";
@@ -1353,6 +1355,7 @@ self: super: {
   "ascii-progress" = dontDistribute super."ascii-progress";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1875,6 +1878,7 @@ self: super: {
   "case-conversion" = dontDistribute super."case-conversion";
   "case-insensitive" = doDistribute super."case-insensitive_1_2_0_4";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2029,6 +2033,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2221,6 +2226,7 @@ self: super: {
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
   "country-codes" = doDistribute super."country-codes_0_1_2";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2531,6 +2537,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_1_1";
   "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_3";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
@@ -2548,7 +2555,9 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_2";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_3";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
@@ -3526,6 +3535,7 @@ self: super: {
   "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";
@@ -3578,6 +3588,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3726,6 +3737,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -4268,6 +4280,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4650,6 +4663,7 @@ self: super: {
   "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";
@@ -4876,6 +4890,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5168,6 +5183,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5226,6 +5242,7 @@ self: super: {
   "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";
@@ -5233,6 +5250,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5559,6 +5577,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5747,6 +5766,7 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
@@ -5955,6 +5975,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_2";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6154,6 +6175,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6377,6 +6399,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6876,6 +6899,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6948,6 +6972,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_4_4_2";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_2";
   "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-jquery" = doDistribute super."servant-jquery_0_4_4_2";
@@ -7107,6 +7132,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -7346,6 +7372,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -7378,6 +7405,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_12_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7439,6 +7467,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -7550,6 +7580,7 @@ self: super: {
   "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -8002,6 +8033,7 @@ self: super: {
   "unix-time" = doDistribute super."unix-time_0_3_5";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8587,6 +8619,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index 7741253ff12f..7ec796dda7bc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_2_20";
@@ -708,6 +709,7 @@ self: super: {
   "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";
@@ -1352,6 +1354,7 @@ self: super: {
   "ascii-progress" = dontDistribute super."ascii-progress";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1874,6 +1877,7 @@ self: super: {
   "case-conversion" = dontDistribute super."case-conversion";
   "case-insensitive" = doDistribute super."case-insensitive_1_2_0_4";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2028,6 +2032,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2220,6 +2225,7 @@ self: super: {
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
   "country-codes" = doDistribute super."country-codes_0_1_2";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2530,6 +2536,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_1_1";
   "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_3";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
@@ -2547,7 +2554,9 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_2";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_3";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
@@ -3524,6 +3533,7 @@ self: super: {
   "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";
@@ -3576,6 +3586,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3724,6 +3735,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_0_1";
@@ -3848,6 +3860,7 @@ self: super: {
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
+  "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
   "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
   "haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -4264,6 +4277,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4643,6 +4657,7 @@ self: super: {
   "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";
@@ -4869,6 +4884,7 @@ self: super: {
   "kafka-client" = dontDistribute super."kafka-client";
   "kan-extensions" = doDistribute super."kan-extensions_4_2_2";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5161,6 +5177,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5219,6 +5236,7 @@ self: super: {
   "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";
@@ -5226,6 +5244,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5552,6 +5571,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5739,6 +5759,7 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
@@ -5947,6 +5968,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_2";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6145,6 +6167,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6367,6 +6390,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6866,6 +6890,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6938,6 +6963,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_4_4_2";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_2";
   "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-jquery" = doDistribute super."servant-jquery_0_4_4_2";
@@ -7097,6 +7123,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -7336,6 +7363,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -7368,6 +7396,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_13";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7429,6 +7458,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -7538,6 +7569,7 @@ self: super: {
   "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7989,6 +8021,7 @@ self: super: {
   "unix-time" = doDistribute super."unix-time_0_3_5";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8571,6 +8604,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index 52de97dd05a3..a112ab1e4221 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_2_20";
@@ -708,6 +709,7 @@ self: super: {
   "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";
@@ -1352,6 +1354,7 @@ self: super: {
   "ascii-progress" = dontDistribute super."ascii-progress";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1874,6 +1877,7 @@ self: super: {
   "case-conversion" = dontDistribute super."case-conversion";
   "case-insensitive" = doDistribute super."case-insensitive_1_2_0_4";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2028,6 +2032,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2220,6 +2225,7 @@ self: super: {
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
   "country-codes" = doDistribute super."country-codes_0_1_2";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2530,6 +2536,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_1_1";
   "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_4";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
@@ -2547,7 +2554,9 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_2";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_3";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_4";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
@@ -3521,6 +3530,7 @@ self: super: {
   "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";
@@ -3573,6 +3583,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3721,6 +3732,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_2_1";
@@ -3845,6 +3857,7 @@ self: super: {
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
+  "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
   "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
   "haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -4261,6 +4274,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4640,6 +4654,7 @@ self: super: {
   "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";
@@ -4865,6 +4880,7 @@ self: super: {
   "kademlia" = dontDistribute super."kademlia";
   "kafka-client" = dontDistribute super."kafka-client";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5155,6 +5171,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5213,6 +5230,7 @@ self: super: {
   "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";
@@ -5220,6 +5238,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5545,6 +5564,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5732,6 +5752,7 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
@@ -5940,6 +5961,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_2";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6118,6 +6140,7 @@ self: super: {
   "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6137,6 +6160,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6359,6 +6383,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6858,6 +6883,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6930,6 +6956,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_4_4_2";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_2";
   "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-jquery" = doDistribute super."servant-jquery_0_4_4_2";
@@ -7089,6 +7116,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -7328,6 +7356,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -7360,6 +7389,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_13";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7421,6 +7451,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -7530,6 +7562,7 @@ self: super: {
   "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7980,6 +8013,7 @@ self: super: {
   "unix-time" = doDistribute super."unix-time_0_3_5";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8181,6 +8215,7 @@ self: super: {
   "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1";
   "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-predicates" = doDistribute super."wai-predicates_0_8_5";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-route" = doDistribute super."wai-route_0_3";
@@ -8560,6 +8595,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index a04a9953c14d..65572393d10a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_2_20";
@@ -708,6 +709,7 @@ self: super: {
   "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";
@@ -1352,6 +1354,7 @@ self: super: {
   "ascii-progress" = dontDistribute super."ascii-progress";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1872,6 +1875,7 @@ self: super: {
   "case-conversion" = dontDistribute super."case-conversion";
   "case-insensitive" = doDistribute super."case-insensitive_1_2_0_4";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2026,6 +2030,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2217,6 +2222,7 @@ self: super: {
   "count" = dontDistribute super."count";
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2527,6 +2533,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0";
   "diagrams-cairo" = doDistribute super."diagrams-cairo_1_3_0_4";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
@@ -2544,7 +2551,9 @@ self: super: {
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
   "diagrams-rasterific" = doDistribute super."diagrams-rasterific_1_3_1_4";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_5";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
@@ -3518,6 +3527,7 @@ self: super: {
   "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";
@@ -3570,6 +3580,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3718,6 +3729,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_2_1";
@@ -3842,6 +3854,7 @@ self: super: {
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
+  "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
   "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
   "haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -4257,6 +4270,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4636,6 +4650,7 @@ self: super: {
   "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";
@@ -4860,6 +4875,7 @@ self: super: {
   "kademlia" = dontDistribute super."kademlia";
   "kafka-client" = dontDistribute super."kafka-client";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5150,6 +5166,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5208,6 +5225,7 @@ self: super: {
   "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";
@@ -5215,6 +5233,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5540,6 +5559,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5727,6 +5747,7 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
@@ -5935,6 +5956,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_2";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6113,6 +6135,7 @@ self: super: {
   "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6132,6 +6155,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6352,6 +6376,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6451,6 +6476,7 @@ self: super: {
   "rados-haskell" = dontDistribute super."rados-haskell";
   "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
   "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
   "rake" = dontDistribute super."rake";
   "rakhana" = dontDistribute super."rakhana";
   "ralist" = dontDistribute super."ralist";
@@ -6850,6 +6876,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6922,6 +6949,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_4_4_4";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_4";
   "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-jquery" = doDistribute super."servant-jquery_0_4_4_4";
@@ -7081,6 +7109,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -7319,6 +7348,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -7351,6 +7381,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_14_1";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7412,6 +7443,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -7521,6 +7554,7 @@ self: super: {
   "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7837,6 +7871,7 @@ self: super: {
   "twitter" = dontDistribute super."twitter";
   "twitter-conduit" = dontDistribute super."twitter-conduit";
   "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-feed" = doDistribute super."twitter-feed_0_2_0_4";
   "twitter-types" = dontDistribute super."twitter-types";
   "twitter-types-lens" = dontDistribute super."twitter-types-lens";
   "tx" = dontDistribute super."tx";
@@ -7970,6 +8005,7 @@ self: super: {
   "unix-time" = doDistribute super."unix-time_0_3_5";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8171,6 +8207,7 @@ self: super: {
   "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1";
   "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-predicates" = doDistribute super."wai-predicates_0_8_5";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-route" = doDistribute super."wai-route_0_3";
@@ -8548,6 +8585,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 737c3db5c651..5620e12acfbb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_2_20";
@@ -708,6 +709,7 @@ self: super: {
   "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";
@@ -1352,6 +1354,7 @@ self: super: {
   "ascii-progress" = dontDistribute super."ascii-progress";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1869,6 +1872,7 @@ self: super: {
   "cascading" = dontDistribute super."cascading";
   "case-conversion" = dontDistribute super."case-conversion";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2023,6 +2027,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2214,6 +2219,7 @@ self: super: {
   "count" = dontDistribute super."count";
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2524,6 +2530,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7";
@@ -2538,7 +2545,9 @@ self: super: {
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_6";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
@@ -3511,6 +3520,7 @@ self: super: {
   "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";
@@ -3563,6 +3573,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3711,6 +3722,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_2_1";
@@ -3835,6 +3847,7 @@ self: super: {
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
+  "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
   "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
   "haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -4250,6 +4263,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4629,6 +4643,7 @@ self: super: {
   "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";
@@ -4853,6 +4868,7 @@ self: super: {
   "kademlia" = dontDistribute super."kademlia";
   "kafka-client" = dontDistribute super."kafka-client";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5143,6 +5159,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5201,6 +5218,7 @@ self: super: {
   "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";
@@ -5208,6 +5226,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5531,6 +5550,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5718,6 +5738,7 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
@@ -5926,6 +5947,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_2";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6104,6 +6126,7 @@ self: super: {
   "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6123,6 +6146,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6341,6 +6365,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6440,6 +6465,7 @@ self: super: {
   "rados-haskell" = dontDistribute super."rados-haskell";
   "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
   "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
   "rake" = dontDistribute super."rake";
   "rakhana" = dontDistribute super."rakhana";
   "ralist" = dontDistribute super."ralist";
@@ -6465,6 +6491,7 @@ self: super: {
   "ranges" = dontDistribute super."ranges";
   "rank1dynamic" = dontDistribute super."rank1dynamic";
   "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
@@ -6838,6 +6865,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6910,6 +6938,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_4_4_4";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_4";
   "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-jquery" = doDistribute super."servant-jquery_0_4_4_4";
@@ -7069,6 +7098,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -7307,6 +7337,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -7339,6 +7370,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_14_2";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7400,6 +7432,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -7508,6 +7542,7 @@ self: super: {
   "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7824,6 +7859,7 @@ self: super: {
   "twitter" = dontDistribute super."twitter";
   "twitter-conduit" = dontDistribute super."twitter-conduit";
   "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-feed" = doDistribute super."twitter-feed_0_2_0_4";
   "twitter-types" = dontDistribute super."twitter-types";
   "twitter-types-lens" = dontDistribute super."twitter-types-lens";
   "tx" = dontDistribute super."tx";
@@ -7957,6 +7993,7 @@ self: super: {
   "unix-time" = doDistribute super."unix-time_0_3_5";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8158,6 +8195,7 @@ self: super: {
   "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1";
   "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-predicates" = doDistribute super."wai-predicates_0_8_5";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-route" = doDistribute super."wai-route_0_3";
@@ -8535,6 +8573,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 96dd3a372880..6be418c5b6e9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -470,6 +470,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_2_20";
@@ -706,6 +707,7 @@ self: super: {
   "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";
@@ -1350,6 +1352,7 @@ self: super: {
   "ascii-progress" = dontDistribute super."ascii-progress";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1866,6 +1869,7 @@ self: super: {
   "cascading" = dontDistribute super."cascading";
   "case-conversion" = dontDistribute super."case-conversion";
   "cased" = dontDistribute super."cased";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -2020,6 +2024,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -2211,6 +2216,7 @@ self: super: {
   "count" = dontDistribute super."count";
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2521,6 +2527,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_0";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-contrib" = doDistribute super."diagrams-contrib_1_3_0_7";
@@ -2535,7 +2542,9 @@ self: super: {
   "diagrams-pgf" = dontDistribute super."diagrams-pgf";
   "diagrams-postscript" = doDistribute super."diagrams-postscript_1_3_0_3";
   "diagrams-qrcode" = dontDistribute super."diagrams-qrcode";
+  "diagrams-reflex" = dontDistribute super."diagrams-reflex";
   "diagrams-rubiks-cube" = dontDistribute super."diagrams-rubiks-cube";
+  "diagrams-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-svg" = doDistribute super."diagrams-svg_1_3_1_6";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
@@ -3506,6 +3515,7 @@ self: super: {
   "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";
@@ -3558,6 +3568,7 @@ self: super: {
   "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";
   "groom" = dontDistribute super."groom";
@@ -3706,6 +3717,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_2_1";
@@ -3830,6 +3842,7 @@ self: super: {
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = doDistribute super."haskell-names_0_5_3";
+  "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
   "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
   "haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -4245,6 +4258,7 @@ self: super: {
   "hpc-coveralls" = doDistribute super."hpc-coveralls_0_9_0";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4624,6 +4638,7 @@ self: super: {
   "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";
@@ -4848,6 +4863,7 @@ self: super: {
   "kademlia" = dontDistribute super."kademlia";
   "kafka-client" = dontDistribute super."kafka-client";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -5138,6 +5154,7 @@ self: super: {
   "list-mux" = dontDistribute super."list-mux";
   "list-prompt" = dontDistribute super."list-prompt";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -5196,6 +5213,7 @@ self: super: {
   "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";
@@ -5203,6 +5221,7 @@ self: super: {
   "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" = doDistribute super."loop_0_2_0";
@@ -5526,6 +5545,7 @@ self: super: {
   "morte" = dontDistribute super."morte";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5713,6 +5733,7 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
@@ -5920,6 +5941,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_3_2";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -6098,6 +6120,7 @@ self: super: {
   "pipes-aeson" = doDistribute super."pipes-aeson_0_4_1_4";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6117,6 +6140,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -6335,6 +6359,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = dontDistribute super."psc-ide";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6434,6 +6459,7 @@ self: super: {
   "rados-haskell" = dontDistribute super."rados-haskell";
   "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
   "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
   "rake" = dontDistribute super."rake";
   "rakhana" = dontDistribute super."rakhana";
   "ralist" = dontDistribute super."ralist";
@@ -6459,6 +6485,7 @@ self: super: {
   "ranges" = dontDistribute super."ranges";
   "rank1dynamic" = dontDistribute super."rank1dynamic";
   "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
@@ -6832,6 +6859,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6904,6 +6932,7 @@ self: super: {
   "servant-client" = doDistribute super."servant-client_0_4_4_4";
   "servant-docs" = doDistribute super."servant-docs_0_4_4_4";
   "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-jquery" = doDistribute super."servant-jquery_0_4_4_4";
@@ -7063,6 +7092,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -7301,6 +7331,7 @@ self: super: {
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
   "stm-conduit" = doDistribute super."stm-conduit_2_6_1";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -7333,6 +7364,7 @@ self: super: {
   "streaming-bytestring" = dontDistribute super."streaming-bytestring";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_14_2";
   "streaming-histogram" = dontDistribute super."streaming-histogram";
+  "streaming-png" = dontDistribute super."streaming-png";
   "streaming-utils" = dontDistribute super."streaming-utils";
   "streaming-wai" = dontDistribute super."streaming-wai";
   "streamproc" = dontDistribute super."streamproc";
@@ -7394,6 +7426,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -7502,6 +7536,7 @@ self: super: {
   "tasty-silver" = doDistribute super."tasty-silver_3_1_7";
   "tasty-smallcheck" = doDistribute super."tasty-smallcheck_0_8_0_1";
   "tasty-tap" = dontDistribute super."tasty-tap";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7818,6 +7853,7 @@ self: super: {
   "twitter" = dontDistribute super."twitter";
   "twitter-conduit" = dontDistribute super."twitter-conduit";
   "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-feed" = doDistribute super."twitter-feed_0_2_0_4";
   "twitter-types" = dontDistribute super."twitter-types";
   "twitter-types-lens" = dontDistribute super."twitter-types-lens";
   "tx" = dontDistribute super."tx";
@@ -7951,6 +7987,7 @@ self: super: {
   "unix-time" = doDistribute super."unix-time_0_3_5";
   "unlit" = dontDistribute super."unlit";
   "unm-hip" = dontDistribute super."unm-hip";
+  "unordered-containers" = doDistribute super."unordered-containers_0_2_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -8152,6 +8189,7 @@ self: super: {
   "wai-middleware-static" = doDistribute super."wai-middleware-static_0_7_0_1";
   "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-predicates" = doDistribute super."wai-predicates_0_8_5";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-route" = doDistribute super."wai-route_0_3";
@@ -8529,6 +8567,7 @@ self: super: {
   "zippo" = dontDistribute super."zippo";
   "zlib" = doDistribute super."zlib_0_5_4_2";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index f92b9d4175e3..ab83739308c0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -454,6 +454,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_2_23";
@@ -682,6 +683,7 @@ self: super: {
   "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";
@@ -781,6 +783,7 @@ self: super: {
   "RNAFoldProgs" = dontDistribute super."RNAFoldProgs";
   "RNAdesign" = dontDistribute super."RNAdesign";
   "RNAdraw" = dontDistribute super."RNAdraw";
+  "RNAlien" = doDistribute super."RNAlien_1_0_0";
   "RNAwolf" = dontDistribute super."RNAwolf";
   "Raincat" = dontDistribute super."Raincat";
   "Random123" = dontDistribute super."Random123";
@@ -946,6 +949,7 @@ self: super: {
   "VecN" = dontDistribute super."VecN";
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "ViennaRNAParser" = doDistribute super."ViennaRNAParser_1_2_7";
   "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
@@ -1248,6 +1252,7 @@ self: super: {
   "ascii" = dontDistribute super."ascii";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1371,6 +1376,7 @@ self: super: {
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-orphans" = doDistribute super."base-orphans_0_4_5";
+  "base-prelude" = doDistribute super."base-prelude_0_1_21";
   "base32-bytestring" = dontDistribute super."base32-bytestring";
   "base58-bytestring" = dontDistribute super."base58-bytestring";
   "base58address" = dontDistribute super."base58address";
@@ -1733,6 +1739,7 @@ self: super: {
   "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface";
   "cascading" = dontDistribute super."cascading";
   "case-conversion" = dontDistribute super."case-conversion";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -1875,6 +1882,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -1967,11 +1975,13 @@ self: super: {
   "conductive-clock" = dontDistribute super."conductive-clock";
   "conductive-hsc3" = dontDistribute super."conductive-hsc3";
   "conductive-song" = dontDistribute super."conductive-song";
+  "conduit" = doDistribute super."conduit_1_2_6_1";
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
+  "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
@@ -2008,6 +2018,7 @@ self: super: {
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
   "contravariant" = doDistribute super."contravariant_1_3_3";
+  "contravariant-extras" = doDistribute super."contravariant-extras_0_3";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
   "control-monad-exception" = dontDistribute super."control-monad-exception";
@@ -2054,6 +2065,7 @@ self: super: {
   "count" = dontDistribute super."count";
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2101,6 +2113,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptol" = doDistribute super."cryptol_2_2_6";
+  "cryptonite" = doDistribute super."cryptonite_0_10";
   "cryptsy-api" = dontDistribute super."cryptsy-api";
   "crystalfontz" = dontDistribute super."crystalfontz";
   "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin";
@@ -2266,6 +2279,7 @@ self: super: {
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
+  "dbmigrations" = doDistribute super."dbmigrations_1_0";
   "dbus" = doDistribute super."dbus_0_10_11";
   "dbus-client" = dontDistribute super."dbus-client";
   "dbus-core" = dontDistribute super."dbus-core";
@@ -2351,6 +2365,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_1";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
@@ -2362,7 +2377,9 @@ self: super: {
   "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-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
@@ -2413,6 +2430,7 @@ self: super: {
   "disjoint-sets-st" = dontDistribute super."disjoint-sets-st";
   "dist-upload" = dontDistribute super."dist-upload";
   "distributed-closure" = dontDistribute super."distributed-closure";
+  "distributed-process" = doDistribute super."distributed-process_0_5_5_1";
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
@@ -2428,6 +2446,7 @@ self: super: {
   "distributed-process-task" = dontDistribute super."distributed-process-task";
   "distributed-process-tests" = dontDistribute super."distributed-process-tests";
   "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
+  "distributed-static" = doDistribute super."distributed-static_0_3_3_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
   "distributive" = doDistribute super."distributive_0_4_4";
@@ -2497,6 +2516,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -2517,6 +2537,7 @@ self: super: {
   "dynamic-object" = dontDistribute super."dynamic-object";
   "dynamic-plot" = dontDistribute super."dynamic-plot";
   "dynamic-pp" = dontDistribute super."dynamic-pp";
+  "dynamic-state" = doDistribute super."dynamic-state_0_2_0_0";
   "dynobud" = dontDistribute super."dynobud";
   "dywapitchtrack" = dontDistribute super."dywapitchtrack";
   "dzen-utils" = dontDistribute super."dzen-utils";
@@ -2774,6 +2795,7 @@ self: super: {
   "fficxx-runtime" = dontDistribute super."fficxx-runtime";
   "ffmpeg-light" = dontDistribute super."ffmpeg-light";
   "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials";
+  "fft" = doDistribute super."fft_0_1_8_2";
   "fftwRaw" = dontDistribute super."fftwRaw";
   "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions";
   "fgl-visualize" = dontDistribute super."fgl-visualize";
@@ -3067,6 +3089,7 @@ self: super: {
   "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib";
   "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph";
   "ghc-server" = dontDistribute super."ghc-server";
+  "ghc-session" = doDistribute super."ghc-session_0_1_2_0";
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
@@ -3293,6 +3316,7 @@ self: super: {
   "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";
@@ -3344,6 +3368,7 @@ self: super: {
   "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-inspector" = dontDistribute super."groundhog-inspector";
@@ -3485,6 +3510,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_2_2";
@@ -3601,6 +3627,7 @@ self: super: {
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = dontDistribute super."haskell-names";
+  "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
   "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
   "haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -3995,6 +4022,7 @@ self: super: {
   "hpasteit" = dontDistribute super."hpasteit";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4338,6 +4366,7 @@ self: super: {
   "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";
@@ -4547,6 +4576,7 @@ self: super: {
   "kademlia" = dontDistribute super."kademlia";
   "kafka-client" = dontDistribute super."kafka-client";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -4833,6 +4863,7 @@ self: super: {
   "list-grouping" = dontDistribute super."list-grouping";
   "list-mux" = dontDistribute super."list-mux";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -4890,6 +4921,7 @@ self: super: {
   "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";
@@ -4897,6 +4929,7 @@ self: super: {
   "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";
@@ -5184,6 +5217,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_10_0_1";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_3";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -5201,6 +5235,7 @@ self: super: {
   "morfeusz" = dontDistribute super."morfeusz";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5319,6 +5354,7 @@ self: super: {
   "nc-indicators" = dontDistribute super."nc-indicators";
   "ncurses" = dontDistribute super."ncurses";
   "neat" = dontDistribute super."neat";
+  "neat-interpolation" = doDistribute super."neat-interpolation_0_3";
   "needle" = dontDistribute super."needle";
   "neet" = dontDistribute super."neet";
   "nehe-tuts" = dontDistribute super."nehe-tuts";
@@ -5378,8 +5414,10 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -5575,6 +5613,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -5734,6 +5773,7 @@ self: super: {
   "pipes" = doDistribute super."pipes_4_1_7";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
   "pipes-cereal" = dontDistribute super."pipes-cereal";
@@ -5750,6 +5790,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -5953,6 +5994,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = doDistribute super."psc-ide_0_5_0";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6049,6 +6091,7 @@ self: super: {
   "rados-haskell" = dontDistribute super."rados-haskell";
   "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
   "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
   "rake" = dontDistribute super."rake";
   "rakhana" = dontDistribute super."rakhana";
   "ralist" = dontDistribute super."ralist";
@@ -6074,6 +6117,7 @@ self: super: {
   "ranges" = dontDistribute super."ranges";
   "rank1dynamic" = doDistribute super."rank1dynamic_0_3_1_0";
   "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
@@ -6420,6 +6464,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6445,6 +6490,7 @@ self: super: {
   "sec" = dontDistribute super."sec";
   "secdh" = dontDistribute super."secdh";
   "seclib" = dontDistribute super."seclib";
+  "second-transfer" = doDistribute super."second-transfer_0_7_1_0";
   "secp256k1" = dontDistribute super."secp256k1";
   "secret-santa" = dontDistribute super."secret-santa";
   "secret-sharing" = dontDistribute super."secret-sharing";
@@ -6485,6 +6531,7 @@ self: super: {
   "serv" = dontDistribute super."serv";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "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-lucid" = dontDistribute super."servant-lucid";
@@ -6629,6 +6676,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -6853,6 +6901,7 @@ self: super: {
   "stitch" = dontDistribute super."stitch";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -6883,6 +6932,7 @@ self: super: {
   "streamed" = dontDistribute super."streamed";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "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-base-types" = doDistribute super."strict-base-types_0_4_0";
@@ -6942,6 +6992,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -7039,6 +7091,7 @@ self: super: {
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-silver" = doDistribute super."tasty-silver_3_1_8";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7340,6 +7393,7 @@ self: super: {
   "twitter" = dontDistribute super."twitter";
   "twitter-conduit" = dontDistribute super."twitter-conduit";
   "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-feed" = doDistribute super."twitter-feed_0_2_0_4";
   "twitter-types" = dontDistribute super."twitter-types";
   "twitter-types-lens" = dontDistribute super."twitter-types-lens";
   "tx" = dontDistribute super."tx";
@@ -7460,6 +7514,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -7495,6 +7550,7 @@ self: super: {
   "usb-id-database" = dontDistribute super."usb-id-database";
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
+  "userid" = doDistribute super."userid_0_1_2_3";
   "users" = doDistribute super."users_0_3_0_0";
   "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
   "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
@@ -7541,6 +7597,7 @@ self: super: {
   "variable-precision" = dontDistribute super."variable-precision";
   "variables" = dontDistribute super."variables";
   "varying" = dontDistribute super."varying";
+  "vault" = doDistribute super."vault_0_3_0_5";
   "vaultaire-common" = dontDistribute super."vaultaire-common";
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
@@ -7570,6 +7627,7 @@ self: super: {
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_3";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -7639,10 +7697,12 @@ self: super: {
   "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-predicates" = doDistribute super."wai-predicates_0_8_5";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_9_4";
+  "wai-routing" = doDistribute super."wai-routing_0_12_2";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
   "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
   "wai-session-postgresql" = doDistribute super."wai-session-postgresql_0_2_0_3";
@@ -7977,6 +8037,7 @@ self: super: {
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index 1a3e3e25530c..82a17df02062 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -454,6 +454,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_2_23";
@@ -682,6 +683,7 @@ self: super: {
   "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";
@@ -781,6 +783,7 @@ self: super: {
   "RNAFoldProgs" = dontDistribute super."RNAFoldProgs";
   "RNAdesign" = dontDistribute super."RNAdesign";
   "RNAdraw" = dontDistribute super."RNAdraw";
+  "RNAlien" = doDistribute super."RNAlien_1_0_0";
   "RNAwolf" = dontDistribute super."RNAwolf";
   "Raincat" = dontDistribute super."Raincat";
   "Random123" = dontDistribute super."Random123";
@@ -946,6 +949,7 @@ self: super: {
   "VecN" = dontDistribute super."VecN";
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "ViennaRNAParser" = doDistribute super."ViennaRNAParser_1_2_7";
   "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
@@ -1246,6 +1250,7 @@ self: super: {
   "ascii" = dontDistribute super."ascii";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1369,6 +1374,7 @@ self: super: {
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-orphans" = doDistribute super."base-orphans_0_4_5";
+  "base-prelude" = doDistribute super."base-prelude_0_1_21";
   "base32-bytestring" = dontDistribute super."base32-bytestring";
   "base58-bytestring" = dontDistribute super."base58-bytestring";
   "base58address" = dontDistribute super."base58address";
@@ -1731,6 +1737,7 @@ self: super: {
   "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface";
   "cascading" = dontDistribute super."cascading";
   "case-conversion" = dontDistribute super."case-conversion";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -1873,6 +1880,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -1965,11 +1973,13 @@ self: super: {
   "conductive-clock" = dontDistribute super."conductive-clock";
   "conductive-hsc3" = dontDistribute super."conductive-hsc3";
   "conductive-song" = dontDistribute super."conductive-song";
+  "conduit" = doDistribute super."conduit_1_2_6_1";
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
+  "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
@@ -2006,6 +2016,7 @@ self: super: {
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
   "contravariant" = doDistribute super."contravariant_1_3_3";
+  "contravariant-extras" = doDistribute super."contravariant-extras_0_3";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
   "control-monad-exception" = dontDistribute super."control-monad-exception";
@@ -2052,6 +2063,7 @@ self: super: {
   "count" = dontDistribute super."count";
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2099,6 +2111,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptol" = doDistribute super."cryptol_2_2_6";
+  "cryptonite" = doDistribute super."cryptonite_0_10";
   "cryptsy-api" = dontDistribute super."cryptsy-api";
   "crystalfontz" = dontDistribute super."crystalfontz";
   "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin";
@@ -2264,6 +2277,7 @@ self: super: {
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
+  "dbmigrations" = doDistribute super."dbmigrations_1_0";
   "dbus" = doDistribute super."dbus_0_10_11";
   "dbus-client" = dontDistribute super."dbus-client";
   "dbus-core" = dontDistribute super."dbus-core";
@@ -2349,6 +2363,7 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-builder" = doDistribute super."diagrams-builder_0_7_2_1";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
   "diagrams-core" = doDistribute super."diagrams-core_1_3_0_4";
@@ -2360,7 +2375,9 @@ self: super: {
   "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-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
@@ -2411,6 +2428,7 @@ self: super: {
   "disjoint-sets-st" = dontDistribute super."disjoint-sets-st";
   "dist-upload" = dontDistribute super."dist-upload";
   "distributed-closure" = dontDistribute super."distributed-closure";
+  "distributed-process" = doDistribute super."distributed-process_0_5_5_1";
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
@@ -2426,6 +2444,7 @@ self: super: {
   "distributed-process-task" = dontDistribute super."distributed-process-task";
   "distributed-process-tests" = dontDistribute super."distributed-process-tests";
   "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
+  "distributed-static" = doDistribute super."distributed-static_0_3_3_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
   "distributive" = doDistribute super."distributive_0_4_4";
@@ -2495,6 +2514,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -2515,6 +2535,7 @@ self: super: {
   "dynamic-object" = dontDistribute super."dynamic-object";
   "dynamic-plot" = dontDistribute super."dynamic-plot";
   "dynamic-pp" = dontDistribute super."dynamic-pp";
+  "dynamic-state" = doDistribute super."dynamic-state_0_2_0_0";
   "dynobud" = dontDistribute super."dynobud";
   "dywapitchtrack" = dontDistribute super."dywapitchtrack";
   "dzen-utils" = dontDistribute super."dzen-utils";
@@ -2768,6 +2789,7 @@ self: super: {
   "fficxx-runtime" = dontDistribute super."fficxx-runtime";
   "ffmpeg-light" = dontDistribute super."ffmpeg-light";
   "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials";
+  "fft" = doDistribute super."fft_0_1_8_2";
   "fftwRaw" = dontDistribute super."fftwRaw";
   "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions";
   "fgl-visualize" = dontDistribute super."fgl-visualize";
@@ -3061,6 +3083,7 @@ self: super: {
   "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib";
   "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph";
   "ghc-server" = dontDistribute super."ghc-server";
+  "ghc-session" = doDistribute super."ghc-session_0_1_2_0";
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
@@ -3287,6 +3310,7 @@ self: super: {
   "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";
@@ -3338,6 +3362,7 @@ self: super: {
   "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-inspector" = dontDistribute super."groundhog-inspector";
@@ -3479,6 +3504,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "half" = doDistribute super."half_0_2_2_2";
@@ -3595,6 +3621,7 @@ self: super: {
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = dontDistribute super."haskell-names";
+  "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
   "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
   "haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -3988,6 +4015,7 @@ self: super: {
   "hpasteit" = dontDistribute super."hpasteit";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4328,6 +4356,7 @@ self: super: {
   "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";
@@ -4535,6 +4564,7 @@ self: super: {
   "kademlia" = dontDistribute super."kademlia";
   "kafka-client" = dontDistribute super."kafka-client";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -4818,6 +4848,7 @@ self: super: {
   "list-grouping" = dontDistribute super."list-grouping";
   "list-mux" = dontDistribute super."list-mux";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -4875,6 +4906,7 @@ self: super: {
   "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";
@@ -4882,6 +4914,7 @@ self: super: {
   "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";
@@ -5169,6 +5202,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_10_0_1";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_3";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -5186,6 +5220,7 @@ self: super: {
   "morfeusz" = dontDistribute super."morfeusz";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5304,6 +5339,7 @@ self: super: {
   "nc-indicators" = dontDistribute super."nc-indicators";
   "ncurses" = dontDistribute super."ncurses";
   "neat" = dontDistribute super."neat";
+  "neat-interpolation" = doDistribute super."neat-interpolation_0_3";
   "needle" = dontDistribute super."needle";
   "neet" = dontDistribute super."neet";
   "nehe-tuts" = dontDistribute super."nehe-tuts";
@@ -5363,8 +5399,10 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -5560,6 +5598,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -5718,6 +5757,7 @@ self: super: {
   "pipes" = doDistribute super."pipes_4_1_7";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
   "pipes-cereal" = dontDistribute super."pipes-cereal";
@@ -5733,6 +5773,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -5936,6 +5977,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = doDistribute super."psc-ide_0_5_0";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -6032,6 +6074,7 @@ self: super: {
   "rados-haskell" = dontDistribute super."rados-haskell";
   "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
   "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
   "rake" = dontDistribute super."rake";
   "rakhana" = dontDistribute super."rakhana";
   "ralist" = dontDistribute super."ralist";
@@ -6057,6 +6100,7 @@ self: super: {
   "ranges" = dontDistribute super."ranges";
   "rank1dynamic" = doDistribute super."rank1dynamic_0_3_1_0";
   "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
@@ -6125,6 +6169,7 @@ self: super: {
   "references" = dontDistribute super."references";
   "refh" = dontDistribute super."refh";
   "refined" = dontDistribute super."refined";
+  "reflection" = doDistribute super."reflection_2_1_1_1";
   "reflection-extras" = dontDistribute super."reflection-extras";
   "reflection-without-remorse" = dontDistribute super."reflection-without-remorse";
   "reflex" = dontDistribute super."reflex";
@@ -6402,6 +6447,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6427,6 +6473,7 @@ self: super: {
   "sec" = dontDistribute super."sec";
   "secdh" = dontDistribute super."secdh";
   "seclib" = dontDistribute super."seclib";
+  "second-transfer" = doDistribute super."second-transfer_0_7_1_0";
   "secp256k1" = dontDistribute super."secp256k1";
   "secret-santa" = dontDistribute super."secret-santa";
   "secret-sharing" = dontDistribute super."secret-sharing";
@@ -6467,6 +6514,7 @@ self: super: {
   "serv" = dontDistribute super."serv";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "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-lucid" = dontDistribute super."servant-lucid";
@@ -6611,6 +6659,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -6835,6 +6884,7 @@ self: super: {
   "stitch" = dontDistribute super."stitch";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -6865,6 +6915,7 @@ self: super: {
   "streamed" = dontDistribute super."streamed";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "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-base-types" = doDistribute super."strict-base-types_0_4_0";
@@ -6924,6 +6975,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -7021,6 +7074,7 @@ self: super: {
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-silver" = doDistribute super."tasty-silver_3_1_8";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7321,6 +7375,7 @@ self: super: {
   "twitter" = dontDistribute super."twitter";
   "twitter-conduit" = dontDistribute super."twitter-conduit";
   "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-feed" = doDistribute super."twitter-feed_0_2_0_4";
   "twitter-types" = dontDistribute super."twitter-types";
   "twitter-types-lens" = dontDistribute super."twitter-types-lens";
   "tx" = dontDistribute super."tx";
@@ -7441,6 +7496,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -7476,6 +7532,7 @@ self: super: {
   "usb-id-database" = dontDistribute super."usb-id-database";
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
+  "userid" = doDistribute super."userid_0_1_2_3";
   "users" = doDistribute super."users_0_3_0_0";
   "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
   "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
@@ -7522,6 +7579,7 @@ self: super: {
   "variable-precision" = dontDistribute super."variable-precision";
   "variables" = dontDistribute super."variables";
   "varying" = dontDistribute super."varying";
+  "vault" = doDistribute super."vault_0_3_0_5";
   "vaultaire-common" = dontDistribute super."vaultaire-common";
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
@@ -7551,6 +7609,7 @@ self: super: {
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_3";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -7620,10 +7679,12 @@ self: super: {
   "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-predicates" = doDistribute super."wai-predicates_0_8_5";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_9_4";
+  "wai-routing" = doDistribute super."wai-routing_0_12_2";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
   "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
   "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
@@ -7957,6 +8018,7 @@ self: super: {
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
index 6d29972d4ea5..d0be0c20d0b2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
@@ -452,6 +452,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_2_23";
@@ -680,6 +681,7 @@ self: super: {
   "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";
@@ -778,6 +780,7 @@ self: super: {
   "RNAFoldProgs" = dontDistribute super."RNAFoldProgs";
   "RNAdesign" = dontDistribute super."RNAdesign";
   "RNAdraw" = dontDistribute super."RNAdraw";
+  "RNAlien" = doDistribute super."RNAlien_1_0_0";
   "RNAwolf" = dontDistribute super."RNAwolf";
   "Raincat" = dontDistribute super."Raincat";
   "Random123" = dontDistribute super."Random123";
@@ -942,6 +945,7 @@ self: super: {
   "VecN" = dontDistribute super."VecN";
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "ViennaRNAParser" = doDistribute super."ViennaRNAParser_1_2_7";
   "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
@@ -1241,6 +1245,7 @@ self: super: {
   "ascii" = dontDistribute super."ascii";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1364,6 +1369,7 @@ self: super: {
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-orphans" = doDistribute super."base-orphans_0_4_5";
+  "base-prelude" = doDistribute super."base-prelude_0_1_21";
   "base32-bytestring" = dontDistribute super."base32-bytestring";
   "base58-bytestring" = dontDistribute super."base58-bytestring";
   "base58address" = dontDistribute super."base58address";
@@ -1723,6 +1729,7 @@ self: super: {
   "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface";
   "cascading" = dontDistribute super."cascading";
   "case-conversion" = dontDistribute super."case-conversion";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -1864,6 +1871,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -1954,11 +1962,13 @@ self: super: {
   "conductive-clock" = dontDistribute super."conductive-clock";
   "conductive-hsc3" = dontDistribute super."conductive-hsc3";
   "conductive-song" = dontDistribute super."conductive-song";
+  "conduit" = doDistribute super."conduit_1_2_6_1";
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
+  "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
@@ -1995,6 +2005,7 @@ self: super: {
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
   "contravariant" = doDistribute super."contravariant_1_3_3";
+  "contravariant-extras" = doDistribute super."contravariant-extras_0_3";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
   "control-monad-exception" = dontDistribute super."control-monad-exception";
@@ -2041,6 +2052,7 @@ self: super: {
   "count" = dontDistribute super."count";
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2088,6 +2100,7 @@ self: super: {
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
   "cryptol" = doDistribute super."cryptol_2_2_6";
+  "cryptonite" = doDistribute super."cryptonite_0_10";
   "cryptsy-api" = dontDistribute super."cryptsy-api";
   "crystalfontz" = dontDistribute super."crystalfontz";
   "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin";
@@ -2253,6 +2266,7 @@ self: super: {
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
+  "dbmigrations" = doDistribute super."dbmigrations_1_0";
   "dbus-client" = dontDistribute super."dbus-client";
   "dbus-core" = dontDistribute super."dbus-core";
   "dbus-qq" = dontDistribute super."dbus-qq";
@@ -2337,15 +2351,20 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
   "diagrams-canvas" = dontDistribute super."diagrams-canvas";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_5";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-gtk" = dontDistribute super."diagrams-gtk";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_9";
   "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-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
@@ -2396,6 +2415,7 @@ self: super: {
   "disjoint-sets-st" = dontDistribute super."disjoint-sets-st";
   "dist-upload" = dontDistribute super."dist-upload";
   "distributed-closure" = dontDistribute super."distributed-closure";
+  "distributed-process" = doDistribute super."distributed-process_0_5_5_1";
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
@@ -2411,6 +2431,7 @@ self: super: {
   "distributed-process-task" = dontDistribute super."distributed-process-task";
   "distributed-process-tests" = dontDistribute super."distributed-process-tests";
   "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
+  "distributed-static" = doDistribute super."distributed-static_0_3_3_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
   "distributive" = doDistribute super."distributive_0_4_4";
@@ -2480,6 +2501,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -2500,6 +2522,7 @@ self: super: {
   "dynamic-object" = dontDistribute super."dynamic-object";
   "dynamic-plot" = dontDistribute super."dynamic-plot";
   "dynamic-pp" = dontDistribute super."dynamic-pp";
+  "dynamic-state" = doDistribute super."dynamic-state_0_2_0_0";
   "dynobud" = dontDistribute super."dynobud";
   "dywapitchtrack" = dontDistribute super."dywapitchtrack";
   "dzen-utils" = dontDistribute super."dzen-utils";
@@ -2630,6 +2653,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_2";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2748,6 +2772,7 @@ self: super: {
   "fficxx-runtime" = dontDistribute super."fficxx-runtime";
   "ffmpeg-light" = dontDistribute super."ffmpeg-light";
   "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials";
+  "fft" = doDistribute super."fft_0_1_8_2";
   "fftwRaw" = dontDistribute super."fftwRaw";
   "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions";
   "fgl-visualize" = dontDistribute super."fgl-visualize";
@@ -3039,6 +3064,7 @@ self: super: {
   "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib";
   "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph";
   "ghc-server" = dontDistribute super."ghc-server";
+  "ghc-session" = doDistribute super."ghc-session_0_1_2_0";
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
@@ -3264,6 +3290,7 @@ self: super: {
   "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";
@@ -3315,6 +3342,7 @@ self: super: {
   "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-inspector" = dontDistribute super."groundhog-inspector";
@@ -3455,6 +3483,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "halfs" = dontDistribute super."halfs";
@@ -3485,6 +3514,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_3";
   "happstack-contrib" = dontDistribute super."happstack-contrib";
   "happstack-data" = dontDistribute super."happstack-data";
   "happstack-dlg" = dontDistribute super."happstack-dlg";
@@ -3567,6 +3597,7 @@ self: super: {
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = dontDistribute super."haskell-names";
+  "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
   "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
   "haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -3956,6 +3987,7 @@ self: super: {
   "hpasteit" = dontDistribute super."hpasteit";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4291,6 +4323,7 @@ self: super: {
   "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";
@@ -4495,6 +4528,7 @@ self: super: {
   "kademlia" = dontDistribute super."kademlia";
   "kafka-client" = dontDistribute super."kafka-client";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-comet" = dontDistribute super."kansas-comet";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
@@ -4778,6 +4812,7 @@ self: super: {
   "list-grouping" = dontDistribute super."list-grouping";
   "list-mux" = dontDistribute super."list-mux";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -4835,6 +4870,7 @@ self: super: {
   "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";
@@ -4842,6 +4878,7 @@ self: super: {
   "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";
@@ -4871,6 +4908,8 @@ self: super: {
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
   "luka" = dontDistribute super."luka";
+  "luminance" = doDistribute super."luminance_0_9_1_2";
+  "luminance-samples" = doDistribute super."luminance-samples_0_9_1";
   "lushtags" = dontDistribute super."lushtags";
   "luthor" = dontDistribute super."luthor";
   "lvish" = dontDistribute super."lvish";
@@ -5124,6 +5163,7 @@ self: super: {
   "mono-foldable" = dontDistribute super."mono-foldable";
   "mono-traversable" = doDistribute super."mono-traversable_0_10_0_1";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_3";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -5141,6 +5181,7 @@ self: super: {
   "morfeusz" = dontDistribute super."morfeusz";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5258,6 +5299,7 @@ self: super: {
   "nc-indicators" = dontDistribute super."nc-indicators";
   "ncurses" = dontDistribute super."ncurses";
   "neat" = dontDistribute super."neat";
+  "neat-interpolation" = doDistribute super."neat-interpolation_0_3";
   "needle" = dontDistribute super."needle";
   "neet" = dontDistribute super."neet";
   "nehe-tuts" = dontDistribute super."nehe-tuts";
@@ -5317,8 +5359,10 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -5514,6 +5558,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = dontDistribute super."pagerduty";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -5672,6 +5717,7 @@ self: super: {
   "pipes" = doDistribute super."pipes_4_1_7";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
   "pipes-cereal" = dontDistribute super."pipes-cereal";
@@ -5687,6 +5733,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -5887,6 +5934,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = doDistribute super."psc-ide_0_5_0";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -5983,6 +6031,7 @@ self: super: {
   "rados-haskell" = dontDistribute super."rados-haskell";
   "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
   "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
   "rake" = dontDistribute super."rake";
   "rakhana" = dontDistribute super."rakhana";
   "ralist" = dontDistribute super."ralist";
@@ -6008,6 +6057,7 @@ self: super: {
   "ranges" = dontDistribute super."ranges";
   "rank1dynamic" = doDistribute super."rank1dynamic_0_3_1_0";
   "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
@@ -6075,6 +6125,7 @@ self: super: {
   "references" = dontDistribute super."references";
   "refh" = dontDistribute super."refh";
   "refined" = dontDistribute super."refined";
+  "reflection" = doDistribute super."reflection_2_1_1_1";
   "reflection-extras" = dontDistribute super."reflection-extras";
   "reflection-without-remorse" = dontDistribute super."reflection-without-remorse";
   "reflex" = dontDistribute super."reflex";
@@ -6349,6 +6400,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6374,6 +6426,7 @@ self: super: {
   "sec" = dontDistribute super."sec";
   "secdh" = dontDistribute super."secdh";
   "seclib" = dontDistribute super."seclib";
+  "second-transfer" = doDistribute super."second-transfer_0_7_1_0";
   "secp256k1" = dontDistribute super."secp256k1";
   "secret-santa" = dontDistribute super."secret-santa";
   "secret-sharing" = dontDistribute super."secret-sharing";
@@ -6413,6 +6466,7 @@ self: super: {
   "serv" = dontDistribute super."serv";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "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-lucid" = dontDistribute super."servant-lucid";
@@ -6553,6 +6607,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -6775,6 +6830,7 @@ self: super: {
   "stitch" = dontDistribute super."stitch";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -6805,6 +6861,7 @@ self: super: {
   "streamed" = dontDistribute super."streamed";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "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-base-types" = doDistribute super."strict-base-types_0_4_0";
@@ -6864,6 +6921,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -6960,6 +7019,7 @@ self: super: {
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
   "tasty-silver" = doDistribute super."tasty-silver_3_1_8";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7259,6 +7319,7 @@ self: super: {
   "twitter" = dontDistribute super."twitter";
   "twitter-conduit" = dontDistribute super."twitter-conduit";
   "twitter-enumerator" = dontDistribute super."twitter-enumerator";
+  "twitter-feed" = doDistribute super."twitter-feed_0_2_0_4";
   "twitter-types" = dontDistribute super."twitter-types";
   "twitter-types-lens" = dontDistribute super."twitter-types-lens";
   "tx" = dontDistribute super."tx";
@@ -7379,6 +7440,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -7414,6 +7476,7 @@ self: super: {
   "usb-id-database" = dontDistribute super."usb-id-database";
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
+  "userid" = doDistribute super."userid_0_1_2_3";
   "users" = doDistribute super."users_0_3_0_0";
   "users-persistent" = doDistribute super."users-persistent_0_3_0_0";
   "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_3_0_0";
@@ -7460,6 +7523,7 @@ self: super: {
   "variable-precision" = dontDistribute super."variable-precision";
   "variables" = dontDistribute super."variables";
   "varying" = dontDistribute super."varying";
+  "vault" = doDistribute super."vault_0_3_0_5";
   "vaultaire-common" = dontDistribute super."vaultaire-common";
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
@@ -7489,6 +7553,7 @@ self: super: {
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_3";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -7555,10 +7620,12 @@ self: super: {
   "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-predicates" = doDistribute super."wai-predicates_0_8_5";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-router" = dontDistribute super."wai-router";
   "wai-routes" = doDistribute super."wai-routes_0_9_5";
+  "wai-routing" = doDistribute super."wai-routing_0_12_2";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
   "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
   "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
@@ -7890,6 +7957,7 @@ self: super: {
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
index b7073d46b4d0..222090f32d07 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
@@ -447,6 +447,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_3_2";
@@ -670,6 +671,7 @@ self: super: {
   "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";
@@ -767,6 +769,7 @@ self: super: {
   "RNAFoldProgs" = dontDistribute super."RNAFoldProgs";
   "RNAdesign" = dontDistribute super."RNAdesign";
   "RNAdraw" = dontDistribute super."RNAdraw";
+  "RNAlien" = doDistribute super."RNAlien_1_0_0";
   "RNAwolf" = dontDistribute super."RNAwolf";
   "Raincat" = dontDistribute super."Raincat";
   "Random123" = dontDistribute super."Random123";
@@ -930,6 +933,7 @@ self: super: {
   "VecN" = dontDistribute super."VecN";
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "ViennaRNAParser" = doDistribute super."ViennaRNAParser_1_2_7";
   "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
@@ -1227,6 +1231,7 @@ self: super: {
   "ascii" = dontDistribute super."ascii";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1347,6 +1352,7 @@ self: super: {
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-orphans" = doDistribute super."base-orphans_0_5_0";
+  "base-prelude" = doDistribute super."base-prelude_0_1_21";
   "base32-bytestring" = dontDistribute super."base32-bytestring";
   "base58-bytestring" = dontDistribute super."base58-bytestring";
   "base58address" = dontDistribute super."base58address";
@@ -1697,6 +1703,7 @@ self: super: {
   "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface";
   "cascading" = dontDistribute super."cascading";
   "case-conversion" = dontDistribute super."case-conversion";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -1834,6 +1841,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -1924,11 +1932,13 @@ self: super: {
   "conductive-clock" = dontDistribute super."conductive-clock";
   "conductive-hsc3" = dontDistribute super."conductive-hsc3";
   "conductive-song" = dontDistribute super."conductive-song";
+  "conduit" = doDistribute super."conduit_1_2_6_1";
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
+  "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
@@ -1962,6 +1972,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant-extras" = doDistribute super."contravariant-extras_0_3";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
   "control-monad-exception" = dontDistribute super."control-monad-exception";
@@ -2008,6 +2019,7 @@ self: super: {
   "count" = dontDistribute super."count";
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2053,6 +2065,7 @@ self: super: {
   "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh";
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
+  "cryptonite" = doDistribute super."cryptonite_0_10";
   "cryptsy-api" = dontDistribute super."cryptsy-api";
   "crystalfontz" = dontDistribute super."crystalfontz";
   "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin";
@@ -2215,6 +2228,7 @@ self: super: {
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
+  "dbmigrations" = doDistribute super."dbmigrations_1_0";
   "dbus-client" = dontDistribute super."dbus-client";
   "dbus-core" = dontDistribute super."dbus-core";
   "dbus-qq" = dontDistribute super."dbus-qq";
@@ -2299,13 +2313,18 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_5";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_9";
   "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-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
@@ -2356,6 +2375,7 @@ self: super: {
   "disjoint-sets-st" = dontDistribute super."disjoint-sets-st";
   "dist-upload" = dontDistribute super."dist-upload";
   "distributed-closure" = dontDistribute super."distributed-closure";
+  "distributed-process" = doDistribute super."distributed-process_0_5_5_1";
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
@@ -2371,6 +2391,7 @@ self: super: {
   "distributed-process-task" = dontDistribute super."distributed-process-task";
   "distributed-process-tests" = dontDistribute super."distributed-process-tests";
   "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
+  "distributed-static" = doDistribute super."distributed-static_0_3_3_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
   "djembe" = dontDistribute super."djembe";
@@ -2434,6 +2455,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -2454,6 +2476,7 @@ self: super: {
   "dynamic-object" = dontDistribute super."dynamic-object";
   "dynamic-plot" = dontDistribute super."dynamic-plot";
   "dynamic-pp" = dontDistribute super."dynamic-pp";
+  "dynamic-state" = doDistribute super."dynamic-state_0_2_0_0";
   "dynobud" = dontDistribute super."dynobud";
   "dywapitchtrack" = dontDistribute super."dywapitchtrack";
   "dzen-utils" = dontDistribute super."dzen-utils";
@@ -2510,6 +2533,7 @@ self: super: {
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
   "elision" = dontDistribute super."elision";
+  "elm-bridge" = doDistribute super."elm-bridge_0_2_1_0";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-get" = dontDistribute super."elm-get";
@@ -2581,6 +2605,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_2";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2674,6 +2699,7 @@ self: super: {
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_4";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
@@ -2696,6 +2722,7 @@ self: super: {
   "fficxx-runtime" = dontDistribute super."fficxx-runtime";
   "ffmpeg-light" = dontDistribute super."ffmpeg-light";
   "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials";
+  "fft" = doDistribute super."fft_0_1_8_2";
   "fftwRaw" = dontDistribute super."fftwRaw";
   "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions";
   "fgl-visualize" = dontDistribute super."fgl-visualize";
@@ -2979,6 +3006,7 @@ self: super: {
   "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib";
   "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph";
   "ghc-server" = dontDistribute super."ghc-server";
+  "ghc-session" = doDistribute super."ghc-session_0_1_2_0";
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
@@ -3200,6 +3228,7 @@ self: super: {
   "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";
@@ -3250,6 +3279,7 @@ self: super: {
   "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-inspector" = dontDistribute super."groundhog-inspector";
@@ -3388,6 +3418,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "halfs" = dontDistribute super."halfs";
@@ -3418,6 +3449,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_3";
   "happstack-contrib" = dontDistribute super."happstack-contrib";
   "happstack-data" = dontDistribute super."happstack-data";
   "happstack-dlg" = dontDistribute super."happstack-dlg";
@@ -3500,6 +3532,7 @@ self: super: {
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = dontDistribute super."haskell-names";
+  "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
   "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
   "haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -3819,6 +3852,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_5_2";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -3887,6 +3921,7 @@ self: super: {
   "hpasteit" = dontDistribute super."hpasteit";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4025,6 +4060,7 @@ self: super: {
   "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_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
@@ -4218,6 +4254,7 @@ self: super: {
   "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";
@@ -4420,6 +4457,7 @@ self: super: {
   "kademlia" = dontDistribute super."kademlia";
   "kafka-client" = dontDistribute super."kafka-client";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
   "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
@@ -4699,6 +4737,7 @@ self: super: {
   "list-grouping" = dontDistribute super."list-grouping";
   "list-mux" = dontDistribute super."list-mux";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -4756,6 +4795,7 @@ self: super: {
   "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";
@@ -4763,6 +4803,7 @@ self: super: {
   "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";
@@ -4792,6 +4833,8 @@ self: super: {
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
   "luka" = dontDistribute super."luka";
+  "luminance" = doDistribute super."luminance_0_9_1_2";
+  "luminance-samples" = doDistribute super."luminance-samples_0_9_1";
   "lushtags" = dontDistribute super."lushtags";
   "luthor" = dontDistribute super."luthor";
   "lvish" = dontDistribute super."lvish";
@@ -4921,8 +4964,12 @@ self: super: {
   "mi" = dontDistribute super."mi";
   "microbench" = dontDistribute super."microbench";
   "microformats2-types" = dontDistribute super."microformats2-types";
+  "microlens" = doDistribute super."microlens_0_4_1_0";
   "microlens-aeson" = doDistribute super."microlens-aeson_2_1_0";
   "microlens-each" = dontDistribute super."microlens-each";
+  "microlens-ghc" = doDistribute super."microlens-ghc_0_4_1_0";
+  "microlens-platform" = doDistribute super."microlens-platform_0_2_2_0";
+  "microlens-th" = doDistribute super."microlens-th_0_3_0_0";
   "microtimer" = dontDistribute super."microtimer";
   "mida" = dontDistribute super."mida";
   "midi" = dontDistribute super."midi";
@@ -5032,7 +5079,9 @@ self: super: {
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
   "mono-foldable" = dontDistribute super."mono-foldable";
+  "mono-traversable" = doDistribute super."mono-traversable_0_10_1";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_3";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -5050,6 +5099,7 @@ self: super: {
   "morfeusz" = dontDistribute super."morfeusz";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5166,6 +5216,7 @@ self: super: {
   "nc-indicators" = dontDistribute super."nc-indicators";
   "ncurses" = dontDistribute super."ncurses";
   "neat" = dontDistribute super."neat";
+  "neat-interpolation" = doDistribute super."neat-interpolation_0_3";
   "needle" = dontDistribute super."needle";
   "neet" = dontDistribute super."neet";
   "nehe-tuts" = dontDistribute super."nehe-tuts";
@@ -5224,8 +5275,10 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
   "network-websocket" = dontDistribute super."network-websocket";
@@ -5419,6 +5472,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_4";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -5572,6 +5626,7 @@ self: super: {
   "pipeclip" = dontDistribute super."pipeclip";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
   "pipes-cereal" = dontDistribute super."pipes-cereal";
@@ -5586,6 +5641,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -5782,6 +5838,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = doDistribute super."psc-ide_0_5_0";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -5877,6 +5934,7 @@ self: super: {
   "rados-haskell" = dontDistribute super."rados-haskell";
   "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
   "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
   "rake" = dontDistribute super."rake";
   "rakhana" = dontDistribute super."rakhana";
   "ralist" = dontDistribute super."ralist";
@@ -5899,7 +5957,9 @@ self: super: {
   "range-space" = dontDistribute super."range-space";
   "rangemin" = dontDistribute super."rangemin";
   "ranges" = dontDistribute super."ranges";
+  "rank1dynamic" = doDistribute super."rank1dynamic_0_3_1_1";
   "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
@@ -5966,6 +6026,7 @@ self: super: {
   "references" = dontDistribute super."references";
   "refh" = dontDistribute super."refh";
   "refined" = dontDistribute super."refined";
+  "reflection" = doDistribute super."reflection_2_1_1_1";
   "reflection-extras" = dontDistribute super."reflection-extras";
   "reflection-without-remorse" = dontDistribute super."reflection-without-remorse";
   "reflex" = dontDistribute super."reflex";
@@ -6236,6 +6297,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6260,6 +6322,7 @@ self: super: {
   "sec" = dontDistribute super."sec";
   "secdh" = dontDistribute super."secdh";
   "seclib" = dontDistribute super."seclib";
+  "second-transfer" = doDistribute super."second-transfer_0_7_1_0";
   "secp256k1" = dontDistribute super."secp256k1";
   "secret-santa" = dontDistribute super."secret-santa";
   "secret-sharing" = dontDistribute super."secret-sharing";
@@ -6299,6 +6362,7 @@ self: super: {
   "serv" = dontDistribute super."serv";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "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-lucid" = dontDistribute super."servant-lucid";
@@ -6437,6 +6501,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -6654,6 +6719,7 @@ self: super: {
   "stitch" = dontDistribute super."stitch";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -6684,6 +6750,7 @@ self: super: {
   "streamed" = dontDistribute super."streamed";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "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-base-types" = doDistribute super."strict-base-types_0_4_0";
@@ -6740,6 +6807,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -6834,6 +6903,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7125,6 +7195,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_4";
   "tx" = dontDistribute super."tx";
   "txt-sushi" = dontDistribute super."txt-sushi";
   "txt2rtf" = dontDistribute super."txt2rtf";
@@ -7240,6 +7311,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -7275,6 +7347,7 @@ self: super: {
   "usb-id-database" = dontDistribute super."usb-id-database";
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
+  "userid" = doDistribute super."userid_0_1_2_3";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
@@ -7316,6 +7389,7 @@ self: super: {
   "variable-precision" = dontDistribute super."variable-precision";
   "variables" = dontDistribute super."variables";
   "varying" = dontDistribute super."varying";
+  "vault" = doDistribute super."vault_0_3_0_5";
   "vaultaire-common" = dontDistribute super."vaultaire-common";
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
@@ -7346,6 +7420,7 @@ self: super: {
   "vector-space-points" = dontDistribute super."vector-space-points";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_3";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -7412,9 +7487,12 @@ self: super: {
   "wai-middleware-route" = dontDistribute super."wai-middleware-route";
   "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-predicates" = doDistribute super."wai-predicates_0_8_5";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-router" = dontDistribute super."wai-router";
+  "wai-routes" = doDistribute super."wai-routes_0_9_6";
+  "wai-routing" = doDistribute super."wai-routing_0_12_2";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
   "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
   "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
@@ -7613,6 +7691,7 @@ self: super: {
   "yajl-enumerator" = dontDistribute super."yajl-enumerator";
   "yall" = dontDistribute super."yall";
   "yamemo" = dontDistribute super."yamemo";
+  "yaml" = doDistribute super."yaml_0_8_15_3";
   "yaml-config" = dontDistribute super."yaml-config";
   "yaml-light-lens" = dontDistribute super."yaml-light-lens";
   "yaml-rpc" = dontDistribute super."yaml-rpc";
@@ -7739,6 +7818,7 @@ self: super: {
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
index c25861c65c80..2cf782f7032b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
@@ -445,6 +445,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_3_2";
@@ -668,6 +669,7 @@ self: super: {
   "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";
@@ -765,6 +767,7 @@ self: super: {
   "RNAFoldProgs" = dontDistribute super."RNAFoldProgs";
   "RNAdesign" = dontDistribute super."RNAdesign";
   "RNAdraw" = dontDistribute super."RNAdraw";
+  "RNAlien" = doDistribute super."RNAlien_1_0_0";
   "RNAwolf" = dontDistribute super."RNAwolf";
   "Raincat" = dontDistribute super."Raincat";
   "Random123" = dontDistribute super."Random123";
@@ -928,6 +931,7 @@ self: super: {
   "VecN" = dontDistribute super."VecN";
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "ViennaRNAParser" = doDistribute super."ViennaRNAParser_1_2_7";
   "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
@@ -1070,6 +1074,7 @@ self: super: {
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-compat" = doDistribute super."aeson-compat_0_3_0_0";
   "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_3_1_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
@@ -1223,6 +1228,7 @@ self: super: {
   "ascii" = dontDistribute super."ascii";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1340,6 +1346,7 @@ self: super: {
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
   "base-orphans" = doDistribute super."base-orphans_0_5_0";
+  "base-prelude" = doDistribute super."base-prelude_0_1_21";
   "base32-bytestring" = dontDistribute super."base32-bytestring";
   "base58-bytestring" = dontDistribute super."base58-bytestring";
   "base58address" = dontDistribute super."base58address";
@@ -1399,6 +1406,7 @@ self: super: {
   "binary-generic" = dontDistribute super."binary-generic";
   "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
   "binary-literal-qq" = dontDistribute super."binary-literal-qq";
+  "binary-parser" = doDistribute super."binary-parser_0_5_1";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
   "binary-shared" = dontDistribute super."binary-shared";
@@ -1687,6 +1695,7 @@ self: super: {
   "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface";
   "cascading" = dontDistribute super."cascading";
   "case-conversion" = dontDistribute super."case-conversion";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -1821,6 +1830,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -1911,11 +1921,13 @@ self: super: {
   "conductive-clock" = dontDistribute super."conductive-clock";
   "conductive-hsc3" = dontDistribute super."conductive-hsc3";
   "conductive-song" = dontDistribute super."conductive-song";
+  "conduit" = doDistribute super."conduit_1_2_6_1";
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
+  "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
@@ -1949,6 +1961,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant-extras" = doDistribute super."contravariant-extras_0_3";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
   "control-monad-exception" = dontDistribute super."control-monad-exception";
@@ -1995,6 +2008,7 @@ self: super: {
   "count" = dontDistribute super."count";
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2040,6 +2054,7 @@ self: super: {
   "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh";
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
+  "cryptonite" = doDistribute super."cryptonite_0_10";
   "cryptsy-api" = dontDistribute super."cryptsy-api";
   "crystalfontz" = dontDistribute super."crystalfontz";
   "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin";
@@ -2201,6 +2216,7 @@ self: super: {
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
+  "dbmigrations" = doDistribute super."dbmigrations_1_0";
   "dbus-client" = dontDistribute super."dbus-client";
   "dbus-core" = dontDistribute super."dbus-core";
   "dbus-qq" = dontDistribute super."dbus-qq";
@@ -2285,13 +2301,18 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_5";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_9";
   "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-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
@@ -2342,6 +2363,7 @@ self: super: {
   "disjoint-sets-st" = dontDistribute super."disjoint-sets-st";
   "dist-upload" = dontDistribute super."dist-upload";
   "distributed-closure" = dontDistribute super."distributed-closure";
+  "distributed-process" = doDistribute super."distributed-process_0_5_5_1";
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
@@ -2357,6 +2379,7 @@ self: super: {
   "distributed-process-task" = dontDistribute super."distributed-process-task";
   "distributed-process-tests" = dontDistribute super."distributed-process-tests";
   "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
+  "distributed-static" = doDistribute super."distributed-static_0_3_3_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
   "djembe" = dontDistribute super."djembe";
@@ -2420,6 +2443,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -2440,6 +2464,7 @@ self: super: {
   "dynamic-object" = dontDistribute super."dynamic-object";
   "dynamic-plot" = dontDistribute super."dynamic-plot";
   "dynamic-pp" = dontDistribute super."dynamic-pp";
+  "dynamic-state" = doDistribute super."dynamic-state_0_2_0_0";
   "dynobud" = dontDistribute super."dynobud";
   "dywapitchtrack" = dontDistribute super."dywapitchtrack";
   "dzen-utils" = dontDistribute super."dzen-utils";
@@ -2496,6 +2521,7 @@ self: super: {
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
   "elision" = dontDistribute super."elision";
+  "elm-bridge" = doDistribute super."elm-bridge_0_2_1_0";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-get" = dontDistribute super."elm-get";
@@ -2567,6 +2593,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_2";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2660,6 +2687,7 @@ self: super: {
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_4";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
@@ -2682,6 +2710,7 @@ self: super: {
   "fficxx-runtime" = dontDistribute super."fficxx-runtime";
   "ffmpeg-light" = dontDistribute super."ffmpeg-light";
   "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials";
+  "fft" = doDistribute super."fft_0_1_8_2";
   "fftwRaw" = dontDistribute super."fftwRaw";
   "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions";
   "fgl-visualize" = dontDistribute super."fgl-visualize";
@@ -2965,6 +2994,7 @@ self: super: {
   "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib";
   "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph";
   "ghc-server" = dontDistribute super."ghc-server";
+  "ghc-session" = doDistribute super."ghc-session_0_1_2_0";
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
@@ -3186,6 +3216,7 @@ self: super: {
   "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";
@@ -3236,6 +3267,7 @@ self: super: {
   "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-inspector" = dontDistribute super."groundhog-inspector";
@@ -3374,6 +3406,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "halfs" = dontDistribute super."halfs";
@@ -3404,6 +3437,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_3";
   "happstack-contrib" = dontDistribute super."happstack-contrib";
   "happstack-data" = dontDistribute super."happstack-data";
   "happstack-dlg" = dontDistribute super."happstack-dlg";
@@ -3485,6 +3519,7 @@ self: super: {
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = dontDistribute super."haskell-names";
+  "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
   "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
   "haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -3804,6 +3839,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_5_2";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -3872,6 +3908,7 @@ self: super: {
   "hpasteit" = dontDistribute super."hpasteit";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -4010,6 +4047,7 @@ self: super: {
   "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_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
@@ -4202,6 +4240,7 @@ self: super: {
   "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";
@@ -4404,6 +4443,7 @@ self: super: {
   "kademlia" = dontDistribute super."kademlia";
   "kafka-client" = dontDistribute super."kafka-client";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
   "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
@@ -4681,6 +4721,7 @@ self: super: {
   "list-grouping" = dontDistribute super."list-grouping";
   "list-mux" = dontDistribute super."list-mux";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -4738,6 +4779,7 @@ self: super: {
   "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";
@@ -4745,6 +4787,7 @@ self: super: {
   "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";
@@ -4774,6 +4817,8 @@ self: super: {
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
   "luka" = dontDistribute super."luka";
+  "luminance" = doDistribute super."luminance_0_9_1_2";
+  "luminance-samples" = doDistribute super."luminance-samples_0_9_1";
   "lushtags" = dontDistribute super."lushtags";
   "luthor" = dontDistribute super."luthor";
   "lvish" = dontDistribute super."lvish";
@@ -4903,8 +4948,12 @@ self: super: {
   "mi" = dontDistribute super."mi";
   "microbench" = dontDistribute super."microbench";
   "microformats2-types" = dontDistribute super."microformats2-types";
+  "microlens" = doDistribute super."microlens_0_4_1_0";
   "microlens-aeson" = doDistribute super."microlens-aeson_2_1_0";
   "microlens-each" = dontDistribute super."microlens-each";
+  "microlens-ghc" = doDistribute super."microlens-ghc_0_4_1_0";
+  "microlens-platform" = doDistribute super."microlens-platform_0_2_2_0";
+  "microlens-th" = doDistribute super."microlens-th_0_3_0_0";
   "microtimer" = dontDistribute super."microtimer";
   "mida" = dontDistribute super."mida";
   "midi" = dontDistribute super."midi";
@@ -5012,7 +5061,9 @@ self: super: {
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
   "mono-foldable" = dontDistribute super."mono-foldable";
+  "mono-traversable" = doDistribute super."mono-traversable_0_10_1";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_3";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -5030,6 +5081,7 @@ self: super: {
   "morfeusz" = dontDistribute super."morfeusz";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5146,6 +5198,7 @@ self: super: {
   "nc-indicators" = dontDistribute super."nc-indicators";
   "ncurses" = dontDistribute super."ncurses";
   "neat" = dontDistribute super."neat";
+  "neat-interpolation" = doDistribute super."neat-interpolation_0_3";
   "needle" = dontDistribute super."needle";
   "neet" = dontDistribute super."neet";
   "nehe-tuts" = dontDistribute super."nehe-tuts";
@@ -5204,8 +5257,10 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
   "network-websocket" = dontDistribute super."network-websocket";
@@ -5399,6 +5454,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_4";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -5552,6 +5608,7 @@ self: super: {
   "pipeclip" = dontDistribute super."pipeclip";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
   "pipes-cereal" = dontDistribute super."pipes-cereal";
@@ -5566,6 +5623,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -5762,6 +5820,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = doDistribute super."psc-ide_0_5_0";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -5857,6 +5916,7 @@ self: super: {
   "rados-haskell" = dontDistribute super."rados-haskell";
   "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
   "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
   "rake" = dontDistribute super."rake";
   "rakhana" = dontDistribute super."rakhana";
   "ralist" = dontDistribute super."ralist";
@@ -5879,7 +5939,9 @@ self: super: {
   "range-space" = dontDistribute super."range-space";
   "rangemin" = dontDistribute super."rangemin";
   "ranges" = dontDistribute super."ranges";
+  "rank1dynamic" = doDistribute super."rank1dynamic_0_3_1_1";
   "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
@@ -5945,6 +6007,7 @@ self: super: {
   "references" = dontDistribute super."references";
   "refh" = dontDistribute super."refh";
   "refined" = dontDistribute super."refined";
+  "reflection" = doDistribute super."reflection_2_1_1_1";
   "reflection-extras" = dontDistribute super."reflection-extras";
   "reflection-without-remorse" = dontDistribute super."reflection-without-remorse";
   "reflex" = dontDistribute super."reflex";
@@ -6042,6 +6105,7 @@ self: super: {
   "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
+  "resourcet" = doDistribute super."resourcet_1_1_7_1";
   "respond" = dontDistribute super."respond";
   "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
@@ -6214,6 +6278,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6238,6 +6303,7 @@ self: super: {
   "sec" = dontDistribute super."sec";
   "secdh" = dontDistribute super."secdh";
   "seclib" = dontDistribute super."seclib";
+  "second-transfer" = doDistribute super."second-transfer_0_7_1_0";
   "secp256k1" = dontDistribute super."secp256k1";
   "secret-santa" = dontDistribute super."secret-santa";
   "secret-sharing" = dontDistribute super."secret-sharing";
@@ -6276,6 +6342,7 @@ self: super: {
   "serv" = dontDistribute super."serv";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "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-lucid" = dontDistribute super."servant-lucid";
@@ -6414,6 +6481,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -6631,6 +6699,7 @@ self: super: {
   "stitch" = dontDistribute super."stitch";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -6661,6 +6730,7 @@ self: super: {
   "streamed" = dontDistribute super."streamed";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "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-base-types" = doDistribute super."strict-base-types_0_4_0";
@@ -6717,6 +6787,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -6810,6 +6882,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7101,6 +7174,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_4";
   "tx" = dontDistribute super."tx";
   "txt-sushi" = dontDistribute super."txt-sushi";
   "txt2rtf" = dontDistribute super."txt2rtf";
@@ -7216,6 +7290,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -7251,6 +7326,7 @@ self: super: {
   "usb-id-database" = dontDistribute super."usb-id-database";
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
+  "userid" = doDistribute super."userid_0_1_2_3";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
@@ -7292,6 +7368,7 @@ self: super: {
   "variable-precision" = dontDistribute super."variable-precision";
   "variables" = dontDistribute super."variables";
   "varying" = dontDistribute super."varying";
+  "vault" = doDistribute super."vault_0_3_0_5";
   "vaultaire-common" = dontDistribute super."vaultaire-common";
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
@@ -7321,6 +7398,7 @@ self: super: {
   "vector-space-points" = dontDistribute super."vector-space-points";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_3";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -7387,9 +7465,12 @@ self: super: {
   "wai-middleware-route" = dontDistribute super."wai-middleware-route";
   "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-predicates" = doDistribute super."wai-predicates_0_8_5";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-router" = dontDistribute super."wai-router";
+  "wai-routes" = doDistribute super."wai-routes_0_9_6";
+  "wai-routing" = doDistribute super."wai-routing_0_12_2";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
   "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
   "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
@@ -7588,6 +7669,7 @@ self: super: {
   "yajl-enumerator" = dontDistribute super."yajl-enumerator";
   "yall" = dontDistribute super."yall";
   "yamemo" = dontDistribute super."yamemo";
+  "yaml" = doDistribute super."yaml_0_8_15_3";
   "yaml-config" = dontDistribute super."yaml-config";
   "yaml-light-lens" = dontDistribute super."yaml-light-lens";
   "yaml-rpc" = dontDistribute super."yaml-rpc";
@@ -7713,6 +7795,7 @@ self: super: {
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.2.nix b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
index 32256ef75b12..8f8760d1ad2a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
@@ -445,6 +445,7 @@ self: super: {
   "HSlippyMap" = dontDistribute super."HSlippyMap";
   "HSmarty" = dontDistribute super."HSmarty";
   "HSoundFile" = dontDistribute super."HSoundFile";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
   "HStringTemplateHelpers" = dontDistribute super."HStringTemplateHelpers";
   "HSvm" = dontDistribute super."HSvm";
   "HTTP" = doDistribute super."HTTP_4000_3_2";
@@ -667,6 +668,7 @@ self: super: {
   "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";
@@ -764,6 +766,7 @@ self: super: {
   "RNAFoldProgs" = dontDistribute super."RNAFoldProgs";
   "RNAdesign" = dontDistribute super."RNAdesign";
   "RNAdraw" = dontDistribute super."RNAdraw";
+  "RNAlien" = doDistribute super."RNAlien_1_0_0";
   "RNAwolf" = dontDistribute super."RNAwolf";
   "Raincat" = dontDistribute super."Raincat";
   "Random123" = dontDistribute super."Random123";
@@ -927,6 +930,7 @@ self: super: {
   "VecN" = dontDistribute super."VecN";
   "Verba" = dontDistribute super."Verba";
   "ViennaRNA-bindings" = dontDistribute super."ViennaRNA-bindings";
+  "ViennaRNAParser" = doDistribute super."ViennaRNAParser_1_2_7";
   "Vulkan" = dontDistribute super."Vulkan";
   "WAVE" = dontDistribute super."WAVE";
   "WL500gPControl" = dontDistribute super."WL500gPControl";
@@ -1069,6 +1073,7 @@ self: super: {
   "aeson-bson" = dontDistribute super."aeson-bson";
   "aeson-compat" = doDistribute super."aeson-compat_0_3_0_0";
   "aeson-diff" = dontDistribute super."aeson-diff";
+  "aeson-extra" = doDistribute super."aeson-extra_0_3_1_0";
   "aeson-filthy" = dontDistribute super."aeson-filthy";
   "aeson-iproute" = dontDistribute super."aeson-iproute";
   "aeson-lens" = dontDistribute super."aeson-lens";
@@ -1222,6 +1227,7 @@ self: super: {
   "ascii" = dontDistribute super."ascii";
   "ascii-vector-avc" = dontDistribute super."ascii-vector-avc";
   "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
   "asic" = dontDistribute super."asic";
   "asil" = dontDistribute super."asil";
   "asn1-data" = dontDistribute super."asn1-data";
@@ -1337,6 +1343,7 @@ self: super: {
   "barrier-monad" = dontDistribute super."barrier-monad";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
+  "base-prelude" = doDistribute super."base-prelude_0_1_21";
   "base32-bytestring" = dontDistribute super."base32-bytestring";
   "base58-bytestring" = dontDistribute super."base58-bytestring";
   "base58address" = dontDistribute super."base58address";
@@ -1396,6 +1403,7 @@ self: super: {
   "binary-generic" = dontDistribute super."binary-generic";
   "binary-indexed-tree" = dontDistribute super."binary-indexed-tree";
   "binary-literal-qq" = dontDistribute super."binary-literal-qq";
+  "binary-parser" = doDistribute super."binary-parser_0_5_1";
   "binary-protocol" = dontDistribute super."binary-protocol";
   "binary-protocol-zmq" = dontDistribute super."binary-protocol-zmq";
   "binary-shared" = dontDistribute super."binary-shared";
@@ -1683,6 +1691,7 @@ self: super: {
   "casadi-bindings-snopt-interface" = dontDistribute super."casadi-bindings-snopt-interface";
   "cascading" = dontDistribute super."cascading";
   "case-conversion" = dontDistribute super."case-conversion";
+  "cases" = doDistribute super."cases_0_1_2_1";
   "cash" = dontDistribute super."cash";
   "casing" = dontDistribute super."casing";
   "cassandra-cql" = dontDistribute super."cassandra-cql";
@@ -1817,6 +1826,7 @@ self: super: {
   "cmath" = dontDistribute super."cmath";
   "cmathml3" = dontDistribute super."cmathml3";
   "cmd-item" = dontDistribute super."cmd-item";
+  "cmdargs" = doDistribute super."cmdargs_0_10_13";
   "cmdargs-browser" = dontDistribute super."cmdargs-browser";
   "cmdlib" = dontDistribute super."cmdlib";
   "cmdtheline" = dontDistribute super."cmdtheline";
@@ -1907,11 +1917,13 @@ self: super: {
   "conductive-clock" = dontDistribute super."conductive-clock";
   "conductive-hsc3" = dontDistribute super."conductive-hsc3";
   "conductive-song" = dontDistribute super."conductive-song";
+  "conduit" = doDistribute super."conduit_1_2_6_1";
   "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-combinators" = doDistribute super."conduit-combinators_1_0_3";
+  "conduit-extra" = doDistribute super."conduit-extra_1_1_9_2";
   "conduit-network-stream" = dontDistribute super."conduit-network-stream";
   "conduit-resumablesink" = dontDistribute super."conduit-resumablesink";
   "conduit-tokenize-attoparsec" = dontDistribute super."conduit-tokenize-attoparsec";
@@ -1945,6 +1957,7 @@ self: super: {
   "continued-fractions" = dontDistribute super."continued-fractions";
   "continuum" = dontDistribute super."continuum";
   "continuum-client" = dontDistribute super."continuum-client";
+  "contravariant-extras" = doDistribute super."contravariant-extras_0_3";
   "control-event" = dontDistribute super."control-event";
   "control-monad-attempt" = dontDistribute super."control-monad-attempt";
   "control-monad-exception" = dontDistribute super."control-monad-exception";
@@ -1991,6 +2004,7 @@ self: super: {
   "count" = dontDistribute super."count";
   "countable" = dontDistribute super."countable";
   "counter" = dontDistribute super."counter";
+  "courier" = doDistribute super."courier_0_1_1_1";
   "court" = dontDistribute super."court";
   "coverage" = dontDistribute super."coverage";
   "cpio-conduit" = dontDistribute super."cpio-conduit";
@@ -2036,6 +2050,7 @@ self: super: {
   "crypto-pubkey-openssh" = dontDistribute super."crypto-pubkey-openssh";
   "crypto-random-effect" = dontDistribute super."crypto-random-effect";
   "crypto-totp" = dontDistribute super."crypto-totp";
+  "cryptonite" = doDistribute super."cryptonite_0_10";
   "cryptsy-api" = dontDistribute super."cryptsy-api";
   "crystalfontz" = dontDistribute super."crystalfontz";
   "cse-ghc-plugin" = dontDistribute super."cse-ghc-plugin";
@@ -2197,6 +2212,7 @@ self: super: {
   "dbcleaner" = dontDistribute super."dbcleaner";
   "dbf" = dontDistribute super."dbf";
   "dbjava" = dontDistribute super."dbjava";
+  "dbmigrations" = doDistribute super."dbmigrations_1_0";
   "dbus-client" = dontDistribute super."dbus-client";
   "dbus-core" = dontDistribute super."dbus-core";
   "dbus-qq" = dontDistribute super."dbus-qq";
@@ -2281,13 +2297,18 @@ self: super: {
   "dgs" = dontDistribute super."dgs";
   "dia-base" = dontDistribute super."dia-base";
   "dia-functions" = dontDistribute super."dia-functions";
+  "diagrams" = doDistribute super."diagrams_1_3";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_5";
   "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
   "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_9";
   "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-solve" = doDistribute super."diagrams-solve_0_1";
   "diagrams-tikz" = dontDistribute super."diagrams-tikz";
   "dialog" = dontDistribute super."dialog";
   "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
@@ -2337,6 +2358,7 @@ self: super: {
   "disjoint-sets-st" = dontDistribute super."disjoint-sets-st";
   "dist-upload" = dontDistribute super."dist-upload";
   "distributed-closure" = dontDistribute super."distributed-closure";
+  "distributed-process" = doDistribute super."distributed-process_0_5_5_1";
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
@@ -2352,6 +2374,7 @@ self: super: {
   "distributed-process-task" = dontDistribute super."distributed-process-task";
   "distributed-process-tests" = dontDistribute super."distributed-process-tests";
   "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
+  "distributed-static" = doDistribute super."distributed-static_0_3_3_0";
   "distribution" = dontDistribute super."distribution";
   "distribution-plot" = dontDistribute super."distribution-plot";
   "djembe" = dontDistribute super."djembe";
@@ -2415,6 +2438,7 @@ self: super: {
   "dtd-types" = dontDistribute super."dtd-types";
   "dtrace" = dontDistribute super."dtrace";
   "dtw" = dontDistribute super."dtw";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
   "dump" = dontDistribute super."dump";
   "duplo" = dontDistribute super."duplo";
   "dvda" = dontDistribute super."dvda";
@@ -2435,6 +2459,7 @@ self: super: {
   "dynamic-object" = dontDistribute super."dynamic-object";
   "dynamic-plot" = dontDistribute super."dynamic-plot";
   "dynamic-pp" = dontDistribute super."dynamic-pp";
+  "dynamic-state" = doDistribute super."dynamic-state_0_2_0_0";
   "dynobud" = dontDistribute super."dynobud";
   "dywapitchtrack" = dontDistribute super."dywapitchtrack";
   "dzen-utils" = dontDistribute super."dzen-utils";
@@ -2491,6 +2516,7 @@ self: super: {
   "elevator" = dontDistribute super."elevator";
   "elf" = dontDistribute super."elf";
   "elision" = dontDistribute super."elision";
+  "elm-bridge" = doDistribute super."elm-bridge_0_2_1_0";
   "elm-build-lib" = dontDistribute super."elm-build-lib";
   "elm-compiler" = dontDistribute super."elm-compiler";
   "elm-get" = dontDistribute super."elm-get";
@@ -2561,6 +2587,7 @@ self: super: {
   "ersatz-toysat" = dontDistribute super."ersatz-toysat";
   "ert" = dontDistribute super."ert";
   "esotericbot" = dontDistribute super."esotericbot";
+  "esqueleto" = doDistribute super."esqueleto_2_4_2";
   "ess" = dontDistribute super."ess";
   "estimator" = dontDistribute super."estimator";
   "estimators" = dontDistribute super."estimators";
@@ -2652,6 +2679,7 @@ self: super: {
   "fcache" = dontDistribute super."fcache";
   "fcd" = dontDistribute super."fcd";
   "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_4";
   "fclabels-monadlib" = dontDistribute super."fclabels-monadlib";
   "fdo-trash" = dontDistribute super."fdo-trash";
   "fec" = dontDistribute super."fec";
@@ -2674,6 +2702,7 @@ self: super: {
   "fficxx-runtime" = dontDistribute super."fficxx-runtime";
   "ffmpeg-light" = dontDistribute super."ffmpeg-light";
   "ffmpeg-tutorials" = dontDistribute super."ffmpeg-tutorials";
+  "fft" = doDistribute super."fft_0_1_8_2";
   "fftwRaw" = dontDistribute super."fftwRaw";
   "fgl-extras-decompositions" = dontDistribute super."fgl-extras-decompositions";
   "fgl-visualize" = dontDistribute super."fgl-visualize";
@@ -2957,6 +2986,7 @@ self: super: {
   "ghc-pkg-lib" = dontDistribute super."ghc-pkg-lib";
   "ghc-prof-flamegraph" = dontDistribute super."ghc-prof-flamegraph";
   "ghc-server" = dontDistribute super."ghc-server";
+  "ghc-session" = doDistribute super."ghc-session_0_1_2_0";
   "ghc-simple" = dontDistribute super."ghc-simple";
   "ghc-srcspan-plugin" = dontDistribute super."ghc-srcspan-plugin";
   "ghc-syb" = dontDistribute super."ghc-syb";
@@ -3176,6 +3206,7 @@ self: super: {
   "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";
@@ -3226,6 +3257,7 @@ self: super: {
   "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-inspector" = dontDistribute super."groundhog-inspector";
@@ -3363,6 +3395,7 @@ self: super: {
   "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";
   "hakyll-sass" = dontDistribute super."hakyll-sass";
   "halberd" = dontDistribute super."halberd";
   "halfs" = dontDistribute super."halfs";
@@ -3393,6 +3426,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_3";
   "happstack-contrib" = dontDistribute super."happstack-contrib";
   "happstack-data" = dontDistribute super."happstack-data";
   "happstack-dlg" = dontDistribute super."happstack-dlg";
@@ -3474,6 +3508,7 @@ self: super: {
   "haskell-mpfr" = dontDistribute super."haskell-mpfr";
   "haskell-mpi" = dontDistribute super."haskell-mpi";
   "haskell-names" = dontDistribute super."haskell-names";
+  "haskell-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
   "haskell-openflow" = dontDistribute super."haskell-openflow";
   "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
   "haskell-platform-test" = dontDistribute super."haskell-platform-test";
@@ -3791,6 +3826,7 @@ self: super: {
   "hnop" = dontDistribute super."hnop";
   "ho-rewriting" = dontDistribute super."ho-rewriting";
   "hoauth" = dontDistribute super."hoauth";
+  "hoauth2" = doDistribute super."hoauth2_0_5_2";
   "hob" = dontDistribute super."hob";
   "hobbes" = dontDistribute super."hobbes";
   "hobbits" = dontDistribute super."hobbits";
@@ -3859,6 +3895,7 @@ self: super: {
   "hpasteit" = dontDistribute super."hpasteit";
   "hpc-strobe" = dontDistribute super."hpc-strobe";
   "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
   "hplayground" = dontDistribute super."hplayground";
   "hplaylist" = dontDistribute super."hplaylist";
   "hpodder" = dontDistribute super."hpodder";
@@ -3997,6 +4034,7 @@ self: super: {
   "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_0";
   "hspec-monad-control" = dontDistribute super."hspec-monad-control";
   "hspec-server" = dontDistribute super."hspec-server";
   "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
@@ -4188,6 +4226,7 @@ self: super: {
   "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";
@@ -4389,6 +4428,7 @@ self: super: {
   "kademlia" = dontDistribute super."kademlia";
   "kafka-client" = dontDistribute super."kafka-client";
   "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
   "kansas-lava" = dontDistribute super."kansas-lava";
   "kansas-lava-cores" = dontDistribute super."kansas-lava-cores";
   "kansas-lava-papilio" = dontDistribute super."kansas-lava-papilio";
@@ -4666,6 +4706,7 @@ self: super: {
   "list-grouping" = dontDistribute super."list-grouping";
   "list-mux" = dontDistribute super."list-mux";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_5_1";
   "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";
@@ -4723,6 +4764,7 @@ self: super: {
   "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";
@@ -4730,6 +4772,7 @@ self: super: {
   "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";
@@ -4759,6 +4802,8 @@ self: super: {
   "luhn" = dontDistribute super."luhn";
   "lui" = dontDistribute super."lui";
   "luka" = dontDistribute super."luka";
+  "luminance" = doDistribute super."luminance_0_9_1_2";
+  "luminance-samples" = doDistribute super."luminance-samples_0_9_1";
   "lushtags" = dontDistribute super."lushtags";
   "luthor" = dontDistribute super."luthor";
   "lvish" = dontDistribute super."lvish";
@@ -4888,8 +4933,12 @@ self: super: {
   "mi" = dontDistribute super."mi";
   "microbench" = dontDistribute super."microbench";
   "microformats2-types" = dontDistribute super."microformats2-types";
+  "microlens" = doDistribute super."microlens_0_4_1_0";
   "microlens-aeson" = doDistribute super."microlens-aeson_2_1_0";
   "microlens-each" = dontDistribute super."microlens-each";
+  "microlens-ghc" = doDistribute super."microlens-ghc_0_4_1_0";
+  "microlens-platform" = doDistribute super."microlens-platform_0_2_2_0";
+  "microlens-th" = doDistribute super."microlens-th_0_3_0_0";
   "microtimer" = dontDistribute super."microtimer";
   "mida" = dontDistribute super."mida";
   "midi" = dontDistribute super."midi";
@@ -4992,7 +5041,9 @@ self: super: {
   "mongrel2-handler" = dontDistribute super."mongrel2-handler";
   "monitor" = dontDistribute super."monitor";
   "mono-foldable" = dontDistribute super."mono-foldable";
+  "mono-traversable" = doDistribute super."mono-traversable_0_10_1";
   "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_3";
   "monoid-owns" = dontDistribute super."monoid-owns";
   "monoid-record" = dontDistribute super."monoid-record";
   "monoid-statistics" = dontDistribute super."monoid-statistics";
@@ -5009,6 +5060,7 @@ self: super: {
   "morfeusz" = dontDistribute super."morfeusz";
   "mosaico-lib" = dontDistribute super."mosaico-lib";
   "mount" = dontDistribute super."mount";
+  "mountpoints" = dontDistribute super."mountpoints";
   "mp" = dontDistribute super."mp";
   "mp3decoder" = dontDistribute super."mp3decoder";
   "mpdmate" = dontDistribute super."mpdmate";
@@ -5125,6 +5177,7 @@ self: super: {
   "nc-indicators" = dontDistribute super."nc-indicators";
   "ncurses" = dontDistribute super."ncurses";
   "neat" = dontDistribute super."neat";
+  "neat-interpolation" = doDistribute super."neat-interpolation_0_3";
   "needle" = dontDistribute super."needle";
   "neet" = dontDistribute super."neet";
   "nehe-tuts" = dontDistribute super."nehe-tuts";
@@ -5183,8 +5236,10 @@ self: super: {
   "network-socket-options" = dontDistribute super."network-socket-options";
   "network-stream" = dontDistribute super."network-stream";
   "network-topic-models" = dontDistribute super."network-topic-models";
+  "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
   "network-websocket" = dontDistribute super."network-websocket";
@@ -5378,6 +5433,7 @@ self: super: {
   "pagarme" = dontDistribute super."pagarme";
   "pagerduty" = doDistribute super."pagerduty_0_0_4";
   "pagure-hook-receiver" = dontDistribute super."pagure-hook-receiver";
+  "palette" = doDistribute super."palette_0_1_0_2";
   "palindromes" = dontDistribute super."palindromes";
   "pam" = dontDistribute super."pam";
   "panda" = dontDistribute super."panda";
@@ -5528,6 +5584,7 @@ self: super: {
   "pipeclip" = dontDistribute super."pipeclip";
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
+  "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
   "pipes-cereal" = dontDistribute super."pipes-cereal";
@@ -5542,6 +5599,7 @@ self: super: {
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
+  "pipes-parse" = doDistribute super."pipes-parse_3_0_3";
   "pipes-postgresql-simple" = dontDistribute super."pipes-postgresql-simple";
   "pipes-rt" = dontDistribute super."pipes-rt";
   "pipes-shell" = dontDistribute super."pipes-shell";
@@ -5737,6 +5795,7 @@ self: super: {
   "proton-haskell" = dontDistribute super."proton-haskell";
   "prototype" = dontDistribute super."prototype";
   "prove-everywhere-server" = dontDistribute super."prove-everywhere-server";
+  "proxied" = dontDistribute super."proxied";
   "proxy-kindness" = dontDistribute super."proxy-kindness";
   "psc-ide" = doDistribute super."psc-ide_0_5_0";
   "pseudo-boolean" = dontDistribute super."pseudo-boolean";
@@ -5830,6 +5889,7 @@ self: super: {
   "rados-haskell" = dontDistribute super."rados-haskell";
   "rail-compiler-editor" = dontDistribute super."rail-compiler-editor";
   "rainbow-tests" = dontDistribute super."rainbow-tests";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
   "rake" = dontDistribute super."rake";
   "rakhana" = dontDistribute super."rakhana";
   "ralist" = dontDistribute super."ralist";
@@ -5852,7 +5912,9 @@ self: super: {
   "range-space" = dontDistribute super."range-space";
   "rangemin" = dontDistribute super."rangemin";
   "ranges" = dontDistribute super."ranges";
+  "rank1dynamic" = doDistribute super."rank1dynamic_0_3_1_1";
   "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
@@ -5918,6 +5980,7 @@ self: super: {
   "references" = dontDistribute super."references";
   "refh" = dontDistribute super."refh";
   "refined" = dontDistribute super."refined";
+  "reflection" = doDistribute super."reflection_2_1_1_1";
   "reflection-extras" = dontDistribute super."reflection-extras";
   "reflection-without-remorse" = dontDistribute super."reflection-without-remorse";
   "reflex" = dontDistribute super."reflex";
@@ -6015,6 +6078,7 @@ self: super: {
   "resource-pool-catchio" = dontDistribute super."resource-pool-catchio";
   "resource-pool-monad" = dontDistribute super."resource-pool-monad";
   "resource-simple" = dontDistribute super."resource-simple";
+  "resourcet" = doDistribute super."resourcet_1_1_7_1";
   "respond" = dontDistribute super."respond";
   "rest-core" = doDistribute super."rest-core_0_37";
   "rest-example" = dontDistribute super."rest-example";
@@ -6186,6 +6250,7 @@ self: super: {
   "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-rest" = dontDistribute super."scotty-rest";
   "scotty-session" = dontDistribute super."scotty-session";
   "scotty-tls" = dontDistribute super."scotty-tls";
@@ -6210,6 +6275,7 @@ self: super: {
   "sec" = dontDistribute super."sec";
   "secdh" = dontDistribute super."secdh";
   "seclib" = dontDistribute super."seclib";
+  "second-transfer" = doDistribute super."second-transfer_0_7_1_0";
   "secp256k1" = dontDistribute super."secp256k1";
   "secret-santa" = dontDistribute super."secret-santa";
   "secret-sharing" = dontDistribute super."secret-sharing";
@@ -6248,6 +6314,7 @@ self: super: {
   "serv" = dontDistribute super."serv";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "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-lucid" = dontDistribute super."servant-lucid";
@@ -6386,6 +6453,7 @@ self: super: {
   "slack" = dontDistribute super."slack";
   "slack-api" = dontDistribute super."slack-api";
   "slack-notify-haskell" = dontDistribute super."slack-notify-haskell";
+  "slave-thread" = doDistribute super."slave-thread_1_0_0_0";
   "slice-cpp-gen" = dontDistribute super."slice-cpp-gen";
   "slidemews" = dontDistribute super."slidemews";
   "sloane" = dontDistribute super."sloane";
@@ -6603,6 +6671,7 @@ self: super: {
   "stitch" = dontDistribute super."stitch";
   "stm-channelize" = dontDistribute super."stm-channelize";
   "stm-chunked-queues" = dontDistribute super."stm-chunked-queues";
+  "stm-containers" = doDistribute super."stm-containers_0_2_9";
   "stm-firehose" = dontDistribute super."stm-firehose";
   "stm-io-hooks" = dontDistribute super."stm-io-hooks";
   "stm-lifted" = dontDistribute super."stm-lifted";
@@ -6633,6 +6702,7 @@ self: super: {
   "streamed" = dontDistribute super."streamed";
   "streaming-commons" = doDistribute super."streaming-commons_0_1_15";
   "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-base-types" = doDistribute super."strict-base-types_0_4_0";
@@ -6687,6 +6757,8 @@ self: super: {
   "supero" = dontDistribute super."supero";
   "supervisor" = dontDistribute super."supervisor";
   "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
   "svg2q" = dontDistribute super."svg2q";
   "svgcairo" = dontDistribute super."svgcairo";
   "svgutils" = dontDistribute super."svgutils";
@@ -6780,6 +6852,7 @@ self: super: {
   "tasty-laws" = dontDistribute super."tasty-laws";
   "tasty-lens" = dontDistribute super."tasty-lens";
   "tasty-program" = dontDistribute super."tasty-program";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
   "tateti-tateti" = dontDistribute super."tateti-tateti";
   "tau" = dontDistribute super."tau";
   "tbox" = dontDistribute super."tbox";
@@ -7071,6 +7144,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_4";
   "tx" = dontDistribute super."tx";
   "txt-sushi" = dontDistribute super."txt-sushi";
   "txt2rtf" = dontDistribute super."txt2rtf";
@@ -7186,6 +7260,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_5_1";
   "unordered-containers-rematch" = dontDistribute super."unordered-containers-rematch";
   "unordered-graphs" = dontDistribute super."unordered-graphs";
   "unpack-funcs" = dontDistribute super."unpack-funcs";
@@ -7221,6 +7296,7 @@ self: super: {
   "usb-id-database" = dontDistribute super."usb-id-database";
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
+  "userid" = doDistribute super."userid_0_1_2_3";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
@@ -7262,6 +7338,7 @@ self: super: {
   "variable-precision" = dontDistribute super."variable-precision";
   "variables" = dontDistribute super."variables";
   "varying" = dontDistribute super."varying";
+  "vault" = doDistribute super."vault_0_3_0_5";
   "vaultaire-common" = dontDistribute super."vaultaire-common";
   "vcache" = dontDistribute super."vcache";
   "vcache-trie" = dontDistribute super."vcache-trie";
@@ -7290,6 +7367,7 @@ self: super: {
   "vector-space-points" = dontDistribute super."vector-space-points";
   "vector-static" = dontDistribute super."vector-static";
   "vector-strategies" = dontDistribute super."vector-strategies";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_3";
   "verbalexpressions" = dontDistribute super."verbalexpressions";
   "verbosity" = dontDistribute super."verbosity";
   "verdict" = dontDistribute super."verdict";
@@ -7356,9 +7434,12 @@ self: super: {
   "wai-middleware-route" = dontDistribute super."wai-middleware-route";
   "wai-middleware-static-caching" = dontDistribute super."wai-middleware-static-caching";
   "wai-middleware-verbs" = dontDistribute super."wai-middleware-verbs";
+  "wai-predicates" = doDistribute super."wai-predicates_0_8_5";
   "wai-request-spec" = dontDistribute super."wai-request-spec";
   "wai-responsible" = dontDistribute super."wai-responsible";
   "wai-router" = dontDistribute super."wai-router";
+  "wai-routes" = doDistribute super."wai-routes_0_9_6";
+  "wai-routing" = doDistribute super."wai-routing_0_12_2";
   "wai-session-alt" = dontDistribute super."wai-session-alt";
   "wai-session-clientsession" = dontDistribute super."wai-session-clientsession";
   "wai-session-tokyocabinet" = dontDistribute super."wai-session-tokyocabinet";
@@ -7556,6 +7637,7 @@ self: super: {
   "yajl-enumerator" = dontDistribute super."yajl-enumerator";
   "yall" = dontDistribute super."yall";
   "yamemo" = dontDistribute super."yamemo";
+  "yaml" = doDistribute super."yaml_0_8_15_3";
   "yaml-config" = dontDistribute super."yaml-config";
   "yaml-light-lens" = dontDistribute super."yaml-light-lens";
   "yaml-rpc" = dontDistribute super."yaml-rpc";
@@ -7681,6 +7763,7 @@ self: super: {
   "zippers" = dontDistribute super."zippers";
   "zippo" = dontDistribute super."zippo";
   "zlib-conduit" = dontDistribute super."zlib-conduit";
+  "zlib-lens" = doDistribute super."zlib-lens_0_1_2";
   "zmcat" = dontDistribute super."zmcat";
   "zmidi-core" = dontDistribute super."zmidi-core";
   "zmidi-score" = dontDistribute super."zmidi-score";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.3.nix b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
new file mode 100644
index 000000000000..dd5823102ac9
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
@@ -0,0 +1,7725 @@
+{ 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-5.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";
+  "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";
+  "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";
+  "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";
+  "ChannelT" = dontDistribute super."ChannelT";
+  "Chart-diagrams" = dontDistribute super."Chart-diagrams";
+  "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";
+  "DescriptiveKeys" = dontDistribute super."DescriptiveKeys";
+  "Dflow" = dontDistribute super."Dflow";
+  "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" = dontDistribute super."EdisonAPI";
+  "EdisonCore" = dontDistribute super."EdisonCore";
+  "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";
+  "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";
+  "HDBC-session" = dontDistribute super."HDBC-session";
+  "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";
+  "HStringTemplate" = doDistribute super."HStringTemplate_0_8_3";
+  "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";
+  "Hclip" = dontDistribute super."Hclip";
+  "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";
+  "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";
+  "LDAP" = dontDistribute super."LDAP";
+  "LRU" = dontDistribute super."LRU";
+  "LTree" = dontDistribute super."LTree";
+  "LambdaCalculator" = dontDistribute super."LambdaCalculator";
+  "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";
+  "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";
+  "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";
+  "NoTrace" = dontDistribute super."NoTrace";
+  "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";
+  "OneTuple" = dontDistribute super."OneTuple";
+  "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";
+  "PortMidi" = dontDistribute super."PortMidi";
+  "PostgreSQL" = dontDistribute super."PostgreSQL";
+  "PrimitiveArray" = dontDistribute super."PrimitiveArray";
+  "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";
+  "QuadEdge" = dontDistribute super."QuadEdge";
+  "QuadTree" = dontDistribute super."QuadTree";
+  "Quelea" = dontDistribute super."Quelea";
+  "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
+  "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";
+  "RNAlien" = doDistribute super."RNAlien_1_0_0";
+  "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";
+  "SVGFonts" = dontDistribute super."SVGFonts";
+  "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";
+  "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-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";
+  "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-utility" = dontDistribute super."accelerate-utility";
+  "accentuateus" = dontDistribute super."accentuateus";
+  "access-time" = dontDistribute super."access-time";
+  "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-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-extra" = doDistribute super."aeson-extra_0_3_1_0";
+  "aeson-filthy" = dontDistribute super."aeson-filthy";
+  "aeson-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-lens" = dontDistribute super."aeson-lens";
+  "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
+  "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";
+  "agda-snippets" = dontDistribute super."agda-snippets";
+  "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
+  "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";
+  "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
+  "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-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";
+  "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";
+  "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-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";
+  "apply-refact" = doDistribute super."apply-refact_0_1_0_0";
+  "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";
+  "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "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";
+  "arithmoi" = dontDistribute super."arithmoi";
+  "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-vector-avc" = dontDistribute super."ascii-vector-avc";
+  "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
+  "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-conduit" = dontDistribute super."atom-conduit";
+  "atom-msp430" = dontDistribute super."atom-msp430";
+  "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign";
+  "atomic-primops-vector" = dontDistribute super."atomic-primops-vector";
+  "atomic-write" = dontDistribute super."atomic-write";
+  "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";
+  "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-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-prelude" = doDistribute super."base-prelude_0_1_21";
+  "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";
+  "bdd" = dontDistribute super."bdd";
+  "bdelta" = dontDistribute super."bdelta";
+  "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
+  "beamable" = dontDistribute super."beamable";
+  "beautifHOL" = dontDistribute super."beautifHOL";
+  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
+  "bein" = dontDistribute super."bein";
+  "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";
+  "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-bits" = dontDistribute super."binary-bits";
+  "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-shared" = dontDistribute super."binary-shared";
+  "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-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-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";
+  "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-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-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" = dontDistribute super."bloodhound";
+  "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";
+  "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";
+  "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-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";
+  "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder";
+  "bytestringparser" = dontDistribute super."bytestringparser";
+  "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
+  "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "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-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
+  "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-info" = dontDistribute super."cabal-info";
+  "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";
+  "cached-io" = dontDistribute super."cached-io";
+  "cached-traversable" = dontDistribute super."cached-traversable";
+  "caf" = dontDistribute super."caf";
+  "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
+  "caffegraph" = dontDistribute super."caffegraph";
+  "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";
+  "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";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "clumpiness" = dontDistribute super."clumpiness";
+  "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" = doDistribute super."cmdargs_0_10_13";
+  "cmdargs-browser" = dontDistribute super."cmdargs-browser";
+  "cmdlib" = dontDistribute super."cmdlib";
+  "cmdtheline" = dontDistribute super."cmdtheline";
+  "cml" = dontDistribute super."cml";
+  "cmonad" = dontDistribute super."cmonad";
+  "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";
+  "codo-notation" = dontDistribute super."codo-notation";
+  "cofunctor" = dontDistribute super."cofunctor";
+  "cognimeta-utils" = dontDistribute super."cognimeta-utils";
+  "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";
+  "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";
+  "commodities" = dontDistribute super."commodities";
+  "commsec" = dontDistribute super."commsec";
+  "commsec-keyexchange" = dontDistribute super."commsec-keyexchange";
+  "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";
+  "conceit" = dontDistribute super."conceit";
+  "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-extra" = dontDistribute super."concurrent-extra";
+  "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "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" = doDistribute super."conduit_1_2_6_1";
+  "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-extra" = doDistribute super."conduit-extra_1_1_9_2";
+  "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-select" = dontDistribute super."config-select";
+  "config-value" = dontDistribute super."config-value";
+  "configifier" = dontDistribute super."configifier";
+  "configuration" = dontDistribute super."configuration";
+  "configuration-tools" = dontDistribute super."configuration-tools";
+  "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";
+  "constructible" = dontDistribute super."constructible";
+  "constructive-algebra" = dontDistribute super."constructive-algebra";
+  "consumers" = dontDistribute super."consumers";
+  "container" = dontDistribute super."container";
+  "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";
+  "continued-fractions" = dontDistribute super."continued-fractions";
+  "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-omega" = dontDistribute super."control-monad-omega";
+  "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";
+  "converge" = dontDistribute super."converge";
+  "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";
+  "courier" = doDistribute super."courier_0_1_1_1";
+  "court" = dontDistribute super."court";
+  "coverage" = dontDistribute super."coverage";
+  "cpio-conduit" = dontDistribute super."cpio-conduit";
+  "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";
+  "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";
+  "cryptonite" = doDistribute super."cryptonite_0_10";
+  "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-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";
+  "d3js" = dontDistribute super."d3js";
+  "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
+  "daemons" = dontDistribute super."daemons";
+  "dag" = dontDistribute super."dag";
+  "damnpacket" = dontDistribute super."damnpacket";
+  "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-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-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-or" = dontDistribute super."data-or";
+  "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";
+  "dataenc" = dontDistribute super."dataenc";
+  "dataflow" = dontDistribute super."dataflow";
+  "datalog" = dontDistribute super."datalog";
+  "datapacker" = dontDistribute super."datapacker";
+  "dataurl" = dontDistribute super."dataurl";
+  "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";
+  "dbmigrations" = doDistribute super."dbmigrations_1_0";
+  "dbus-client" = dontDistribute super."dbus-client";
+  "dbus-core" = dontDistribute super."dbus-core";
+  "dbus-qq" = dontDistribute super."dbus-qq";
+  "dbus-th" = dontDistribute super."dbus-th";
+  "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-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";
+  "debian-build" = dontDistribute super."debian-build";
+  "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
+  "decepticons" = dontDistribute super."decepticons";
+  "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-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";
+  "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";
+  "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";
+  "deriving-compat" = dontDistribute super."deriving-compat";
+  "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" = doDistribute super."diagrams_1_3";
+  "diagrams-core" = doDistribute super."diagrams-core_1_3_0_5";
+  "diagrams-graphviz" = dontDistribute super."diagrams-graphviz";
+  "diagrams-hsqml" = dontDistribute super."diagrams-hsqml";
+  "diagrams-lib" = doDistribute super."diagrams-lib_1_3_0_9";
+  "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-solve" = doDistribute super."diagrams-solve_0_1";
+  "diagrams-tikz" = dontDistribute super."diagrams-tikz";
+  "dialog" = dontDistribute super."dialog";
+  "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
+  "dicom" = dontDistribute super."dicom";
+  "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";
+  "dirfiles" = dontDistribute super."dirfiles";
+  "dirstream" = dontDistribute super."dirstream";
+  "disassembler" = dontDistribute super."disassembler";
+  "discordian-calendar" = dontDistribute super."discordian-calendar";
+  "discount" = dontDistribute super."discount";
+  "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-closure" = dontDistribute super."distributed-closure";
+  "distributed-process" = doDistribute super."distributed-process_0_5_5_1";
+  "distributed-process-async" = dontDistribute super."distributed-process-async";
+  "distributed-process-azure" = dontDistribute super."distributed-process-azure";
+  "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-execution" = dontDistribute super."distributed-process-execution";
+  "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "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-registry" = dontDistribute super."distributed-process-registry";
+  "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet";
+  "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor";
+  "distributed-process-task" = dontDistribute super."distributed-process-task";
+  "distributed-process-tests" = dontDistribute super."distributed-process-tests";
+  "distributed-process-zookeeper" = dontDistribute super."distributed-process-zookeeper";
+  "distributed-static" = doDistribute super."distributed-static_0_3_3_0";
+  "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" = dontDistribute super."doctest-discover";
+  "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
+  "doctest-prop" = dontDistribute super."doctest-prop";
+  "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" = dontDistribute super."download";
+  "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";
+  "drClickOn" = dontDistribute super."drClickOn";
+  "draw-poker" = dontDistribute super."draw-poker";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "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";
+  "dual-tree" = doDistribute super."dual-tree_0_2_0_8";
+  "dump" = dontDistribute super."dump";
+  "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";
+  "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";
+  "ekg-statsd" = dontDistribute super."ekg-statsd";
+  "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-bridge" = doDistribute super."elm-bridge_0_2_1_0";
+  "elm-build-lib" = dontDistribute super."elm-build-lib";
+  "elm-compiler" = dontDistribute super."elm-compiler";
+  "elm-get" = dontDistribute super."elm-get";
+  "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-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";
+  "ether" = doDistribute super."ether_0_3_1_1";
+  "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";
+  "every-bit-counts" = dontDistribute super."every-bit-counts";
+  "ewe" = dontDistribute super."ewe";
+  "ex-pool" = dontDistribute super."ex-pool";
+  "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "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";
+  "exception-mtl" = dontDistribute super."exception-mtl";
+  "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";
+  "failable-list" = dontDistribute super."failable-list";
+  "failure" = dontDistribute super."failure";
+  "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";
+  "fca" = dontDistribute super."fca";
+  "fcache" = dontDistribute super."fcache";
+  "fcd" = dontDistribute super."fcd";
+  "fckeditor" = dontDistribute super."fckeditor";
+  "fclabels" = doDistribute super."fclabels_2_0_2_4";
+  "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-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-clumpiness" = dontDistribute super."find-clumpiness";
+  "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-mcmc" = dontDistribute super."flat-mcmc";
+  "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";
+  "flow2dot" = dontDistribute super."flow2dot";
+  "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-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";
+  "fold-debounce" = dontDistribute super."fold-debounce";
+  "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "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";
+  "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";
+  "free-vl" = dontDistribute super."free-vl";
+  "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";
+  "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";
+  "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";
+  "gamma" = dontDistribute super."gamma";
+  "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-deriving" = doDistribute super."generic-deriving_1_9_0";
+  "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
+  "generic-maybe" = dontDistribute super."generic-maybe";
+  "generic-pretty" = dontDistribute super."generic-pretty";
+  "generic-server" = dontDistribute super."generic-server";
+  "generic-storable" = dontDistribute super."generic-storable";
+  "generic-tree" = dontDistribute super."generic-tree";
+  "generic-xml" = dontDistribute super."generic-xml";
+  "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";
+  "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-imported-from" = dontDistribute super."ghc-imported-from";
+  "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-session" = doDistribute super."ghc-session_0_1_2_0";
+  "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-codemirror" = dontDistribute super."ghcjs-codemirror";
+  "ghcjs-dom" = dontDistribute super."ghcjs-dom";
+  "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
+  "ghcjs-websockets" = dontDistribute super."ghcjs-websockets";
+  "ghclive" = dontDistribute super."ghclive";
+  "ghczdecode" = dontDistribute super."ghczdecode";
+  "ght" = dontDistribute super."ght";
+  "gi-atk" = dontDistribute super."gi-atk";
+  "gi-cairo" = dontDistribute super."gi-cairo";
+  "gi-gdk" = dontDistribute super."gi-gdk";
+  "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
+  "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
+  "gi-glib" = dontDistribute super."gi-glib";
+  "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gtk" = dontDistribute super."gi-gtk";
+  "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
+  "gi-notify" = dontDistribute super."gi-notify";
+  "gi-pango" = dontDistribute super."gi-pango";
+  "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";
+  "gist" = dontDistribute super."gist";
+  "git-all" = dontDistribute super."git-all";
+  "git-annex" = doDistribute super."git-annex_6_20160114";
+  "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-backup" = dontDistribute super."github-backup";
+  "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";
+  "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";
+  "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";
+  "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";
+  "gpolyline" = dontDistribute super."gpolyline";
+  "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-core" = doDistribute super."graph-core_0_2_2_0";
+  "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-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-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-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-mac-integration" = dontDistribute super."gtk3-mac-integration";
+  "gtkglext" = dontDistribute super."gtkglext";
+  "gtkimageview" = dontDistribute super."gtkimageview";
+  "gtkrsync" = dontDistribute super."gtkrsync";
+  "gtksourceview2" = dontDistribute super."gtksourceview2";
+  "gtksourceview3" = dontDistribute super."gtksourceview3";
+  "guarded-rewriting" = dontDistribute super."guarded-rewriting";
+  "guess-combinator" = dontDistribute super."guess-combinator";
+  "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";
+  "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";
+  "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-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-leksah" = dontDistribute super."haddock-leksah";
+  "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-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";
+  "hakyll-sass" = dontDistribute super."hakyll-sass";
+  "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-authenticate" = doDistribute super."happstack-authenticate_2_3_3";
+  "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";
+  "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";
+  "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";
+  "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_2";
+  "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-formatter" = dontDistribute super."haskell-formatter";
+  "haskell-ftp" = dontDistribute super."haskell-ftp";
+  "haskell-generate" = dontDistribute super."haskell-generate";
+  "haskell-gi" = dontDistribute super."haskell-gi";
+  "haskell-gi-base" = dontDistribute super."haskell-gi-base";
+  "haskell-import-graph" = dontDistribute super."haskell-import-graph";
+  "haskell-in-space" = dontDistribute super."haskell-in-space";
+  "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-neo4j-client" = doDistribute super."haskell-neo4j-client_0_3_2_0";
+  "haskell-openflow" = dontDistribute super."haskell-openflow";
+  "haskell-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
+  "haskell-platform-test" = dontDistribute super."haskell-platform-test";
+  "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" = doDistribute super."hasql_0_19_6";
+  "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-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-amazonka" = dontDistribute super."haxl-amazonka";
+  "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";
+  "hbayes" = dontDistribute super."hbayes";
+  "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";
+  "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-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";
+  "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";
+  "hesql" = dontDistribute super."hesql";
+  "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";
+  "hformat" = dontDistribute super."hformat";
+  "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";
+  "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";
+  "hinquire" = dontDistribute super."hinquire";
+  "hinstaller" = dontDistribute super."hinstaller";
+  "hint-server" = dontDistribute super."hint-server";
+  "hinvaders" = dontDistribute super."hinvaders";
+  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hipbot" = dontDistribute super."hipbot";
+  "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";
+  "hjcase" = dontDistribute super."hjcase";
+  "hjpath" = dontDistribute super."hjpath";
+  "hjs" = dontDistribute super."hjs";
+  "hjson" = dontDistribute super."hjson";
+  "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-chart" = dontDistribute super."hledger-chart";
+  "hledger-diff" = dontDistribute super."hledger-diff";
+  "hledger-irr" = dontDistribute super."hledger-irr";
+  "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" = dontDistribute super."hmt";
+  "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";
+  "hoauth2" = doDistribute super."hoauth2_0_5_2";
+  "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";
+  "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" = dontDistribute super."hosc";
+  "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";
+  "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";
+  "hpack" = dontDistribute super."hpack";
+  "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";
+  "hpc-strobe" = dontDistribute super."hpc-strobe";
+  "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
+  "hplayground" = dontDistribute super."hplayground";
+  "hplaylist" = dontDistribute super."hplaylist";
+  "hpodder" = dontDistribute super."hpodder";
+  "hpp" = dontDistribute super."hpp";
+  "hpqtypes" = dontDistribute super."hpqtypes";
+  "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-GeoIP" = dontDistribute super."hs-GeoIP";
+  "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";
+  "hsb2hs" = dontDistribute super."hsb2hs";
+  "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";
+  "hscolour" = doDistribute super."hscolour_1_23";
+  "hscope" = dontDistribute super."hscope";
+  "hscrtmpl" = dontDistribute super."hscrtmpl";
+  "hscuid" = dontDistribute super."hscuid";
+  "hscurses" = dontDistribute super."hscurses";
+  "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex";
+  "hsdev" = dontDistribute super."hsdev";
+  "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_0";
+  "hspec-monad-control" = dontDistribute super."hspec-monad-control";
+  "hspec-server" = dontDistribute super."hspec-server";
+  "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "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";
+  "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-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";
+  "htoml" = dontDistribute super."htoml";
+  "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-streams" = dontDistribute super."http-client-streams";
+  "http-conduit-browser" = dontDistribute super."http-conduit-browser";
+  "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "http-encodings" = dontDistribute super."http-encodings";
+  "http-enumerator" = dontDistribute super."http-enumerator";
+  "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-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";
+  "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";
+  "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";
+  "identifiers" = dontDistribute super."identifiers";
+  "idiii" = dontDistribute super."idiii";
+  "idna" = dontDistribute super."idna";
+  "idna2008" = dontDistribute super."idna2008";
+  "idris" = dontDistribute super."idris";
+  "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-inline-r" = dontDistribute super."ihaskell-inline-r";
+  "ihaskell-parsec" = dontDistribute super."ihaskell-parsec";
+  "ihaskell-plot" = dontDistribute super."ihaskell-plot";
+  "ihaskell-widgets" = dontDistribute super."ihaskell-widgets";
+  "ihttp" = dontDistribute super."ihttp";
+  "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-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-sat-solver" = dontDistribute super."incremental-sat-solver";
+  "increments" = dontDistribute super."increments";
+  "indentation" = dontDistribute super."indentation";
+  "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";
+  "inquire" = dontDistribute super."inquire";
+  "inserts" = dontDistribute super."inserts";
+  "inspection-proxy" = dontDistribute super."inspection-proxy";
+  "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";
+  "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";
+  "intern" = dontDistribute super."intern";
+  "internetmarke" = dontDistribute super."internetmarke";
+  "interpol" = dontDistribute super."interpol";
+  "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
+  "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
+  "interpolation" = dontDistribute super."interpolation";
+  "intricacy" = dontDistribute super."intricacy";
+  "intset" = dontDistribute super."intset";
+  "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-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-colors" = dontDistribute super."irc-colors";
+  "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";
+  "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";
+  "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-backend-c" = dontDistribute super."ivory-backend-c";
+  "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "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-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";
+  "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";
+  "jose" = dontDistribute super."jose";
+  "jpeg" = dontDistribute super."jpeg";
+  "js-good-parts" = dontDistribute super."js-good-parts";
+  "jsaddle" = dontDistribute super."jsaddle";
+  "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-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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "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";
+  "judy" = dontDistribute super."judy";
+  "jukebox" = dontDistribute super."jukebox";
+  "jumpthefive" = dontDistribute super."jumpthefive";
+  "jvm-parser" = dontDistribute super."jvm-parser";
+  "kademlia" = dontDistribute super."kademlia";
+  "kafka-client" = dontDistribute super."kafka-client";
+  "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
+  "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";
+  "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";
+  "lackey" = dontDistribute super."lackey";
+  "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-compiler" = dontDistribute super."lambdacube-compiler";
+  "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
+  "lambdacube-samples" = dontDistribute super."lambdacube-samples";
+  "lambdatex" = dontDistribute super."lambdatex";
+  "lambdatwit" = dontDistribute super."lambdatwit";
+  "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-c-quote" = dontDistribute super."language-c-quote";
+  "language-cil" = dontDistribute super."language-cil";
+  "language-css" = dontDistribute super."language-css";
+  "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_7_0_1";
+  "language-typescript" = dontDistribute super."language-typescript";
+  "language-vhdl" = dontDistribute super."language-vhdl";
+  "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";
+  "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";
+  "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";
+  "leksah-server" = dontDistribute super."leksah-server";
+  "lendingclub" = dontDistribute super."lendingclub";
+  "lens-datetime" = dontDistribute super."lens-datetime";
+  "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";
+  "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";
+  "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";
+  "libxml" = dontDistribute super."libxml";
+  "libxml-enumerator" = dontDistribute super."libxml-enumerator";
+  "libxslt" = dontDistribute super."libxslt";
+  "life" = dontDistribute super."life";
+  "lift-generics" = dontDistribute super."lift-generics";
+  "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";
+  "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-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";
+  "logfloat" = dontDistribute super."logfloat";
+  "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";
+  "ltk" = dontDistribute super."ltk";
+  "ltl" = dontDistribute super."ltl";
+  "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";
+  "luka" = dontDistribute super."luka";
+  "luminance" = doDistribute super."luminance_0_9_1_2";
+  "luminance-samples" = doDistribute super."luminance-samples_0_9_1";
+  "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";
+  "maccatcher" = dontDistribute super."maccatcher";
+  "machinecell" = dontDistribute super."machinecell";
+  "machines-binary" = dontDistribute super."machines-binary";
+  "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";
+  "mainland-pretty" = dontDistribute super."mainland-pretty";
+  "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";
+  "manifold-random" = dontDistribute super."manifold-random";
+  "manifolds" = dontDistribute super."manifolds";
+  "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";
+  "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";
+  "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";
+  "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" = doDistribute super."microlens_0_4_1_0";
+  "microlens-each" = dontDistribute super."microlens-each";
+  "microlens-ghc" = doDistribute super."microlens-ghc_0_4_1_0";
+  "microlens-platform" = doDistribute super."microlens-platform_0_2_2_0";
+  "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";
+  "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-exception" = dontDistribute super."monad-exception";
+  "monad-fork" = dontDistribute super."monad-fork";
+  "monad-gen" = dontDistribute super."monad-gen";
+  "monad-interleave" = dontDistribute super."monad-interleave";
+  "monad-levels" = dontDistribute super."monad-levels";
+  "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-stlike-io" = dontDistribute super."monad-stlike-io";
+  "monad-stlike-stm" = dontDistribute super."monad-stlike-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";
+  "monadplus" = dontDistribute super."monadplus";
+  "monads-fd" = dontDistribute super."monads-fd";
+  "monadtransform" = dontDistribute super."monadtransform";
+  "monarch" = dontDistribute super."monarch";
+  "mongodb-queue" = dontDistribute super."mongodb-queue";
+  "mongrel2-handler" = dontDistribute super."mongrel2-handler";
+  "monitor" = dontDistribute super."monitor";
+  "mono-foldable" = dontDistribute super."mono-foldable";
+  "mono-traversable" = doDistribute super."mono-traversable_0_10_1";
+  "monoid-absorbing" = dontDistribute super."monoid-absorbing";
+  "monoid-extras" = doDistribute super."monoid-extras_0_4_0_3";
+  "monoid-owns" = dontDistribute super."monoid-owns";
+  "monoid-record" = dontDistribute super."monoid-record";
+  "monoid-statistics" = dontDistribute super."monoid-statistics";
+  "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";
+  "mountpoints" = dontDistribute super."mountpoints";
+  "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";
+  "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";
+  "multiset-comb" = dontDistribute super."multiset-comb";
+  "multisetrewrite" = dontDistribute super."multisetrewrite";
+  "multistate" = dontDistribute super."multistate";
+  "muon" = dontDistribute super."muon";
+  "murder" = dontDistribute super."murder";
+  "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-probability" = doDistribute super."mwc-probability_1_0_3";
+  "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";
+  "names-th" = dontDistribute super."names-th";
+  "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
+  "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";
+  "nanq" = dontDistribute super."nanq";
+  "narc" = dontDistribute super."narc";
+  "nat" = dontDistribute super."nat";
+  "nats-queue" = dontDistribute super."nats-queue";
+  "natural-number" = dontDistribute super."natural-number";
+  "natural-numbers" = dontDistribute super."natural-numbers";
+  "natural-transformation" = dontDistribute super."natural-transformation";
+  "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";
+  "neat-interpolation" = doDistribute super."neat-interpolation_0_3_1";
+  "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" = dontDistribute super."nested-routes";
+  "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-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" = doDistribute super."network-transport_0_4_2_0";
+  "network-transport-amqp" = dontDistribute super."network-transport-amqp";
+  "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
+  "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";
+  "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";
+  "niagra" = dontDistribute super."niagra";
+  "nibblestring" = dontDistribute super."nibblestring";
+  "nicify" = dontDistribute super."nicify";
+  "nicify-lib" = dontDistribute super."nicify-lib";
+  "nicovideo-translator" = dontDistribute super."nicovideo-translator";
+  "nikepub" = dontDistribute super."nikepub";
+  "nimber" = dontDistribute super."nimber";
+  "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";
+  "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";
+  "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" = dontDistribute super."octane";
+  "octohat" = dontDistribute super."octohat";
+  "octopus" = dontDistribute super."octopus";
+  "oculus" = dontDistribute super."oculus";
+  "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-classy" = dontDistribute super."opaleye-classy";
+  "opaleye-sqlite" = dontDistribute super."opaleye-sqlite";
+  "opaleye-trans" = dontDistribute super."opaleye-trans";
+  "open-haddock" = dontDistribute super."open-haddock";
+  "open-pandoc" = dontDistribute super."open-pandoc";
+  "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-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";
+  "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";
+  "overture" = dontDistribute super."overture";
+  "pack" = dontDistribute super."pack";
+  "package-o-tron" = dontDistribute super."package-o-tron";
+  "package-vt" = dontDistribute super."package-vt";
+  "packdeps" = dontDistribute super."packdeps";
+  "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";
+  "palette" = doDistribute super."palette_0_1_0_2";
+  "palindromes" = dontDistribute super."palindromes";
+  "pam" = dontDistribute super."pam";
+  "panda" = dontDistribute super."panda";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "path-io" = doDistribute super."path-io_0_2_0";
+  "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";
+  "period" = dontDistribute super."period";
+  "perm" = dontDistribute super."perm";
+  "permutation" = dontDistribute super."permutation";
+  "permute" = dontDistribute super."permute";
+  "persist2er" = dontDistribute super."persist2er";
+  "persistable-record" = dontDistribute super."persistable-record";
+  "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-cereal" = dontDistribute super."persistent-cereal";
+  "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-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-protobuf" = dontDistribute super."persistent-protobuf";
+  "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
+  "persistent-redis" = dontDistribute super."persistent-redis";
+  "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";
+  "pgdl" = dontDistribute super."pgdl";
+  "pgm" = dontDistribute super."pgm";
+  "pgsql-simple" = dontDistribute super."pgsql-simple";
+  "pgstream" = dontDistribute super."pgstream";
+  "phasechange" = dontDistribute super."phasechange";
+  "phizzle" = dontDistribute super."phizzle";
+  "phoityne" = dontDistribute super."phoityne";
+  "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";
+  "pinchot" = doDistribute super."pinchot_0_6_0_0";
+  "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-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "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-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-shell" = dontDistribute super."pipes-shell";
+  "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-transduce" = dontDistribute super."pipes-transduce";
+  "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";
+  "plan-b" = dontDistribute super."plan-b";
+  "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";
+  "pointfree" = dontDistribute super."pointfree";
+  "pointful" = dontDistribute super."pointful";
+  "pointless-fun" = dontDistribute super."pointless-fun";
+  "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";
+  "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
+  "polyseq" = dontDistribute super."polyseq";
+  "polysoup" = dontDistribute super."polysoup";
+  "polytypeable" = dontDistribute super."polytypeable";
+  "polytypeable-utils" = dontDistribute super."polytypeable-utils";
+  "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-binary" = doDistribute super."postgresql-binary_0_7_9";
+  "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-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-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-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-generalize" = dontDistribute super."prelude-generalize";
+  "prelude-plus" = dontDistribute super."prelude-plus";
+  "prelude-prime" = dontDistribute super."prelude-prime";
+  "prelude-safeenum" = dontDistribute super."prelude-safeenum";
+  "preprocess-haskell" = dontDistribute super."preprocess-haskell";
+  "preprocessor-tools" = dontDistribute super."preprocessor-tools";
+  "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-hex" = dontDistribute super."pretty-hex";
+  "pretty-ncols" = dontDistribute super."pretty-ncols";
+  "pretty-sop" = dontDistribute super."pretty-sop";
+  "pretty-tree" = dontDistribute super."pretty-tree";
+  "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
+  "primula-board" = dontDistribute super."primula-board";
+  "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
+  "printf-mauke" = dontDistribute super."printf-mauke";
+  "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_7";
+  "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";
+  "process-streaming" = dontDistribute super."process-streaming";
+  "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";
+  "profiteur" = dontDistribute super."profiteur";
+  "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";
+  "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-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";
+  "proxied" = dontDistribute super."proxied";
+  "proxy-kindness" = dontDistribute super."proxy-kindness";
+  "psc-ide" = doDistribute super."psc-ide_0_5_0";
+  "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_20151212";
+  "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-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_7_6_1";
+  "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "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";
+  "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";
+  "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-simple" = dontDistribute super."quickcheck-simple";
+  "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver";
+  "quicklz" = dontDistribute super."quicklz";
+  "quickpull" = dontDistribute super."quickpull";
+  "quickset" = dontDistribute super."quickset";
+  "quickspec" = dontDistribute super."quickspec";
+  "quicktest" = dontDistribute super."quicktest";
+  "quickwebapp" = dontDistribute super."quickwebapp";
+  "quiver" = dontDistribute super."quiver";
+  "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-http" = dontDistribute super."quiver-http";
+  "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";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
+  "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-tree" = dontDistribute super."random-tree";
+  "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";
+  "rank1dynamic" = doDistribute super."rank1dynamic_0_3_1_1";
+  "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
+  "rate-limit" = dontDistribute super."rate-limit";
+  "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";
+  "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";
+  "reactor" = dontDistribute super."reactor";
+  "read-bounded" = dontDistribute super."read-bounded";
+  "readline-statevar" = dontDistribute super."readline-statevar";
+  "readpyc" = dontDistribute super."readpyc";
+  "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";
+  "reedsolomon" = dontDistribute super."reedsolomon";
+  "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-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
+  "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-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";
+  "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-query" = dontDistribute super."relational-query";
+  "relational-query-HDBC" = dontDistribute super."relational-query-HDBC";
+  "relational-record" = dontDistribute super."relational-record";
+  "relational-record-examples" = dontDistribute super."relational-record-examples";
+  "relational-schemas" = dontDistribute super."relational-schemas";
+  "relative-date" = dontDistribute super."relative-date";
+  "relit" = dontDistribute super."relit";
+  "rematch" = dontDistribute super."rematch";
+  "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";
+  "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";
+  "resourcet" = doDistribute super."resourcet_1_1_7_1";
+  "respond" = dontDistribute super."respond";
+  "rest-core" = doDistribute super."rest-core_0_37";
+  "rest-example" = dontDistribute super."rest-example";
+  "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "restful-snap" = dontDistribute super."restful-snap";
+  "restricted-workers" = dontDistribute super."restricted-workers";
+  "restyle" = dontDistribute super."restyle";
+  "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "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-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";
+  "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";
+  "rmonad" = dontDistribute super."rmonad";
+  "rncryptor" = dontDistribute super."rncryptor";
+  "rng-utils" = dontDistribute super."rng-utils";
+  "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";
+  "rotating-log" = dontDistribute super."rotating-log";
+  "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";
+  "sampling" = dontDistribute super."sampling";
+  "samtools" = dontDistribute super."samtools";
+  "samtools-conduit" = dontDistribute super."samtools-conduit";
+  "samtools-enumerator" = dontDistribute super."samtools-enumerator";
+  "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandlib" = dontDistribute super."sandlib";
+  "sarasvati" = dontDistribute super."sarasvati";
+  "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";
+  "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";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
+  "scan" = dontDistribute super."scan";
+  "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "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" = doDistribute super."scotty_0_10_2";
+  "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-rest" = dontDistribute super."scotty-rest";
+  "scotty-session" = dontDistribute super."scotty-session";
+  "scotty-tls" = dontDistribute super."scotty-tls";
+  "scp-streams" = dontDistribute super."scp-streams";
+  "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "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" = doDistribute super."second-transfer_0_7_1_0";
+  "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";
+  "semiring-simple" = dontDistribute super."semiring-simple";
+  "semver-range" = dontDistribute super."semver-range";
+  "sendgrid-haskell" = dontDistribute super."sendgrid-haskell";
+  "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";
+  "serialport" = dontDistribute super."serialport";
+  "serv" = dontDistribute super."serv";
+  "servant-cassava" = dontDistribute super."servant-cassava";
+  "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-lucid" = dontDistribute super."servant-lucid";
+  "servant-mock" = dontDistribute super."servant-mock";
+  "servant-pandoc" = dontDistribute super."servant-pandoc";
+  "servant-pool" = dontDistribute super."servant-pool";
+  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-response" = dontDistribute super."servant-response";
+  "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
+  "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-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";
+  "shelly-extra" = dontDistribute super."shelly-extra";
+  "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" = dontDistribute super."simple-log";
+  "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" = dontDistribute super."simpleirc";
+  "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";
+  "sink" = dontDistribute super."sink";
+  "sirkel" = dontDistribute super."sirkel";
+  "sitemap" = dontDistribute super."sitemap";
+  "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";
+  "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";
+  "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";
+  "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-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-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";
+  "soegtk" = dontDistribute super."soegtk";
+  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
+  "sophia" = dontDistribute super."sophia";
+  "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
+  "sorted" = dontDistribute super."sorted";
+  "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";
+  "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";
+  "spool" = dontDistribute super."spool";
+  "spoonutil" = dontDistribute super."spoonutil";
+  "spoty" = dontDistribute super."spoty";
+  "spreadsheet" = dontDistribute super."spreadsheet";
+  "spritz" = dontDistribute super."spritz";
+  "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";
+  "sql-words" = dontDistribute super."sql-words";
+  "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";
+  "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-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";
+  "stopwatch" = dontDistribute super."stopwatch";
+  "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";
+  "str" = dontDistribute super."str";
+  "stratum-tool" = dontDistribute super."stratum-tool";
+  "stream-fusion" = dontDistribute super."stream-fusion";
+  "stream-monad" = dontDistribute super."stream-monad";
+  "streamed" = dontDistribute super."streamed";
+  "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-base-types" = doDistribute super."strict-base-types_0_4_0";
+  "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-conv" = dontDistribute super."string-conv";
+  "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";
+  "strive" = dontDistribute super."strive";
+  "strptime" = dontDistribute super."strptime";
+  "structs" = dontDistribute super."structs";
+  "structural-induction" = dontDistribute super."structural-induction";
+  "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";
+  "suffixarray" = dontDistribute super."suffixarray";
+  "suffixtree" = dontDistribute super."suffixtree";
+  "sugarhaskell" = dontDistribute super."sugarhaskell";
+  "suitable" = dontDistribute super."suitable";
+  "sump" = dontDistribute super."sump";
+  "sundown" = dontDistribute super."sundown";
+  "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";
+  "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
+  "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_1_2_1";
+  "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";
+  "symbol" = dontDistribute super."symbol";
+  "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-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";
+  "ta" = dontDistribute super."ta";
+  "table" = dontDistribute super."table";
+  "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-transformer" = dontDistribute super."tagged-transformer";
+  "tagging" = dontDistribute super."tagging";
+  "taggy" = dontDistribute super."taggy";
+  "taggy-lens" = dontDistribute super."taggy-lens";
+  "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";
+  "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";
+  "taskpool" = dontDistribute super."taskpool";
+  "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";
+  "tasty-th" = doDistribute super."tasty-th_0_1_3";
+  "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";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "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";
+  "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-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-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";
+  "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-and-plots" = dontDistribute super."text-and-plots";
+  "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-ldap" = dontDistribute super."text-ldap";
+  "text-locale-encoding" = dontDistribute super."text-locale-encoding";
+  "text-normal" = dontDistribute super."text-normal";
+  "text-position" = dontDistribute super."text-position";
+  "text-postgresql" = dontDistribute super."text-postgresql";
+  "text-printer" = dontDistribute super."text-printer";
+  "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
+  "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-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-lift-instances" = dontDistribute super."th-lift-instances";
+  "th-printf" = dontDistribute super."th-printf";
+  "th-sccs" = dontDistribute super."th-sccs";
+  "th-traced" = dontDistribute super."th-traced";
+  "th-typegraph" = dontDistribute super."th-typegraph";
+  "themoviedb" = dontDistribute super."themoviedb";
+  "themplate" = dontDistribute super."themplate";
+  "theoremquest" = dontDistribute super."theoremquest";
+  "theoremquest-client" = dontDistribute super."theoremquest-client";
+  "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";
+  "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" = dontDistribute super."tidal";
+  "tidal-midi" = dontDistribute super."tidal-midi";
+  "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-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-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-time" = dontDistribute super."timelike-time";
+  "timemap" = dontDistribute super."timemap";
+  "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";
+  "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-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";
+  "tracker" = dontDistribute super."tracker";
+  "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-free" = dontDistribute super."transformers-free";
+  "transformers-runnable" = dontDistribute super."transformers-runnable";
+  "transformers-supply" = dontDistribute super."transformers-supply";
+  "transient" = dontDistribute super."transient";
+  "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-fun" = dontDistribute super."tree-fun";
+  "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";
+  "tslogger" = dontDistribute super."tslogger";
+  "tsp-viz" = dontDistribute super."tsp-viz";
+  "tsparse" = dontDistribute super."tsparse";
+  "tst" = dontDistribute super."tst";
+  "tsvsql" = dontDistribute super."tsvsql";
+  "tttool" = doDistribute super."tttool_1_5_1";
+  "tubes" = dontDistribute super."tubes";
+  "tuntap" = dontDistribute super."tuntap";
+  "tup-functor" = dontDistribute super."tup-functor";
+  "tuple" = dontDistribute super."tuple";
+  "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";
+  "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
+  "turni" = dontDistribute super."turni";
+  "tweak" = dontDistribute super."tweak";
+  "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";
+  "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";
+  "twitter-feed" = doDistribute super."twitter-feed_0_2_0_4";
+  "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-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";
+  "typography-geometry" = dontDistribute super."typography-geometry";
+  "uAgda" = dontDistribute super."uAgda";
+  "ua-parser" = dontDistribute super."ua-parser";
+  "uacpid" = dontDistribute super."uacpid";
+  "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";
+  "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";
+  "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-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" = doDistribute super."unordered-containers_0_2_5_1";
+  "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";
+  "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";
+  "userid" = doDistribute super."userid_0_1_2_3";
+  "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";
+  "vado" = dontDistribute super."vado";
+  "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";
+  "vcd" = dontDistribute super."vcd";
+  "vcs-revision" = dontDistribute super."vcs-revision";
+  "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
+  "vcsgui" = dontDistribute super."vcsgui";
+  "vcswrapper" = dontDistribute super."vcswrapper";
+  "vect" = dontDistribute super."vect";
+  "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-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";
+  "vector-th-unbox" = doDistribute super."vector-th-unbox_0_2_1_3";
+  "verbalexpressions" = dontDistribute super."verbalexpressions";
+  "verbosity" = dontDistribute super."verbosity";
+  "verdict" = dontDistribute super."verdict";
+  "verdict-json" = dontDistribute super."verdict-json";
+  "verilog" = dontDistribute super."verilog";
+  "versions" = dontDistribute super."versions";
+  "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-utils" = dontDistribute super."vinyl-utils";
+  "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";
+  "vivid" = dontDistribute super."vivid";
+  "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";
+  "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-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-content-type" = dontDistribute super."wai-middleware-content-type";
+  "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" = dontDistribute super."wai-middleware-verbs";
+  "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-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";
+  "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" = dontDistribute super."webkitgtk3";
+  "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "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" = dontDistribute super."werewolf";
+  "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";
+  "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";
+  "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";
+  "wuss" = dontDistribute super."wuss";
+  "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-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";
+  "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" = doDistribute super."yaml_0_8_15_3";
+  "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";
+  "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-json" = dontDistribute super."yesod-json";
+  "yesod-links" = dontDistribute super."yesod-links";
+  "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-markdown" = dontDistribute super."yesod-markdown";
+  "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5";
+  "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";
+  "yjtools" = dontDistribute super."yjtools";
+  "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-conduit" = dontDistribute super."zip-conduit";
+  "zipedit" = dontDistribute super."zipedit";
+  "zipkin" = dontDistribute super."zipkin";
+  "zipper" = dontDistribute super."zipper";
+  "zippers" = dontDistribute super."zippers";
+  "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";
+  "zot" = dontDistribute super."zot";
+  "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 1dbe2174e50c..93f620a798df 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -791,6 +791,7 @@ self: {
        libraryToolDepends = [ alex cpphs happy ];
        executableHaskellDepends = [ base directory filepath process ];
        executableToolDepends = [ emacs ];
+       jailbreak = true;
        postInstall = ''
          $out/bin/agda -c --no-main $(find $out/share -name Primitive.agda)
          $out/bin/agda-mode compile
@@ -8930,7 +8931,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "HStringTemplate" = callPackage
+  "HStringTemplate_0_8_3" = callPackage
     ({ mkDerivation, array, base, blaze-builder, bytestring, containers
      , deepseq, directory, filepath, mtl, old-locale, parsec, pretty
      , syb, template-haskell, text, time, void
@@ -8948,6 +8949,25 @@ self: {
        ];
        description = "StringTemplate implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "HStringTemplate" = callPackage
+    ({ mkDerivation, array, base, blaze-builder, bytestring, containers
+     , deepseq, directory, filepath, mtl, old-locale, parsec, pretty
+     , syb, template-haskell, text, time, void
+     }:
+     mkDerivation {
+       pname = "HStringTemplate";
+       version = "0.8.5";
+       sha256 = "e02b3043f1a5f72db3a1a1075e7b641f266329b954ea7f2f6bd20266295b35ff";
+       libraryHaskellDepends = [
+         array base blaze-builder bytestring containers deepseq directory
+         filepath mtl old-locale parsec pretty syb template-haskell text
+         time void
+       ];
+       description = "StringTemplate implementation in Haskell";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "HStringTemplateHelpers" = callPackage
@@ -12707,6 +12727,7 @@ self: {
          array base bytestring containers dlist fmlist HUnit QuickCheck
          random text vector
        ];
+       doCheck = false;
        homepage = "http://software.complete.org/listlike";
        description = "Generic support for list-like structures";
        license = stdenv.lib.licenses.bsd3;
@@ -14492,6 +14513,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "NumberTheory" = callPackage
+    ({ mkDerivation, base, containers, HUnit, primes }:
+     mkDerivation {
+       pname = "NumberTheory";
+       version = "0.1.0.1";
+       sha256 = "e0cc1d5500b4d719b846c3e96ef4e4b04e620b40acc5e4b5c942495537ee1da9";
+       libraryHaskellDepends = [ base containers primes ];
+       testHaskellDepends = [ base containers HUnit primes ];
+       description = "A library for number theoretic computations, written in Haskell";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "Numbers" = callPackage
     ({ mkDerivation, base, random }:
      mkDerivation {
@@ -15642,8 +15675,8 @@ self: {
      }:
      mkDerivation {
        pname = "Plot-ho-matic";
-       version = "0.9.0.2";
-       sha256 = "f67856090d2ed0c5869d57cd50da4f32c9eb8c4e654e0c0bf232765f81aea072";
+       version = "0.9.0.4";
+       sha256 = "8f452a320c84cbb6f09670307b57af41c0ec30414440bd4f7155d13d0c28215a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -16145,19 +16178,19 @@ self: {
      }) {};
 
   "QuickPlot" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, bytestring, colour
+    ({ mkDerivation, aeson, attoparsec, base, bytestring
      , haskell-src-meta, parsec, scientific, snap, snap-core
      , template-haskell, text, vector, websockets, websockets-snap
      }:
      mkDerivation {
        pname = "QuickPlot";
-       version = "0.1.0.0";
-       sha256 = "f83747c013815d9a0f780a4839f6a7381d0fd867eaf8b92f8ae0333c34afef37";
+       version = "0.1.0.1";
+       sha256 = "02864cb2f1abcea25b5956421cfdd596c3b4d3ceafcd54d3aad26f443ba53fb5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson attoparsec base bytestring colour haskell-src-meta parsec
-         scientific snap snap-core template-haskell text vector websockets
+         aeson attoparsec base bytestring haskell-src-meta parsec scientific
+         snap snap-core template-haskell text vector websockets
          websockets-snap
        ];
        homepage = "http://github.com/tepf/QuickPlot#readme";
@@ -16394,7 +16427,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "RNAlien" = callPackage
+  "RNAlien_1_0_0" = callPackage
     ({ mkDerivation, base, biocore, biofasta, BlastHTTP, blastxml
      , bytestring, cassava, ClustalParser, cmdargs, containers
      , directory, edit-distance, either-unwrap, EntrezHTTP, filepath
@@ -16420,9 +16453,10 @@ self: {
        ];
        description = "Unsupervized construction of RNA family models";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "RNAlien_1_1_0" = callPackage
+  "RNAlien" = callPackage
     ({ mkDerivation, aeson, base, biocore, biofasta, BlastHTTP
      , blastxml, bytestring, cassava, ClustalParser, cmdargs, containers
      , directory, edit-distance, either-unwrap, EntrezHTTP, filepath
@@ -16448,10 +16482,8 @@ self: {
          directory either-unwrap filepath process random split time vector
          ViennaRNAParser
        ];
-       jailbreak = true;
        description = "Unsupervized construction of RNA family models";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RNAwolf" = callPackage
@@ -19075,8 +19107,8 @@ self: {
        pname = "TestExplode";
        version = "0.1.0.0";
        sha256 = "4133d9f69e7df366ac374ccb42bd9801ae66c0cd29f9f20ab849d1d8f8e79664";
-       revision = "2";
-       editedCabalFile = "87da94054ca27c85fc15cf5408bc1afb0354b9ed016348faf005ad44ae0917a2";
+       revision = "3";
+       editedCabalFile = "8c288eba01903e9c55bb60350b9a607f88b6a8537c2156bdbed5aa9be071a804";
        libraryHaskellDepends = [
          base containers directory fgl graphviz interpolatedstring-perl6 mtl
          process text
@@ -19812,7 +19844,7 @@ self: {
        license = "unknown";
      }) {};
 
-  "ViennaRNAParser" = callPackage
+  "ViennaRNAParser_1_2_7" = callPackage
     ({ mkDerivation, base, hspec, parsec, process, transformers }:
      mkDerivation {
        pname = "ViennaRNAParser";
@@ -19822,9 +19854,10 @@ self: {
        testHaskellDepends = [ base hspec parsec ];
        description = "Libary for parsing ViennaRNA package output";
        license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "ViennaRNAParser_1_2_8" = callPackage
+  "ViennaRNAParser" = callPackage
     ({ mkDerivation, base, hspec, parsec, process, transformers }:
      mkDerivation {
        pname = "ViennaRNAParser";
@@ -19834,7 +19867,6 @@ self: {
        testHaskellDepends = [ base hspec parsec ];
        description = "Libary for parsing ViennaRNA package output";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Vulkan" = callPackage
@@ -20330,6 +20362,7 @@ self: {
          base QuickCheck test-framework test-framework-quickcheck2
          test-framework-th
        ];
+       jailbreak = true;
        homepage = "https://github.com/choener/WordAlignment";
        description = "Bigram word pair alignments";
        license = stdenv.lib.licenses.gpl3;
@@ -23115,7 +23148,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "aeson-extra" = callPackage
+  "aeson-extra_0_3_1_0" = callPackage
     ({ mkDerivation, aeson, aeson-compat, base, base-compat, bytestring
      , containers, exceptions, hashable, parsec, quickcheck-instances
      , recursion-schemes, scientific, tasty, tasty-hunit
@@ -23144,6 +23177,35 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "aeson-extra" = callPackage
+    ({ mkDerivation, aeson, aeson-compat, base, base-compat, bytestring
+     , containers, exceptions, hashable, parsec, quickcheck-instances
+     , recursion-schemes, scientific, tasty, tasty-hunit
+     , tasty-quickcheck, template-haskell, text, these, time
+     , time-parsers, transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "aeson-extra";
+       version = "0.3.1.1";
+       sha256 = "0fe646bdb96820ddef55a26b730f4b65a213b748229e3ba9758335a72d258fec";
+       libraryHaskellDepends = [
+         aeson aeson-compat base base-compat bytestring containers
+         exceptions hashable parsec recursion-schemes scientific
+         template-haskell text time time-parsers transformers
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson aeson-compat base base-compat bytestring containers
+         exceptions hashable parsec quickcheck-instances scientific tasty
+         tasty-hunit tasty-quickcheck template-haskell text these time
+         time-parsers unordered-containers vector
+       ];
+       homepage = "https://github.com/phadej/aeson-extra#readme";
+       description = "Extra goodies for aeson";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "aeson-filthy" = callPackage
     ({ mkDerivation, aeson, base, bytestring, doctest, text
      , unordered-containers
@@ -23533,12 +23595,13 @@ self: {
      }:
      mkDerivation {
        pname = "aeson-value-parser";
-       version = "0.11.1";
-       sha256 = "933a2111c21cc0f6e9869d6c4927b8201882a03c01de693e68d821f5d4484d49";
+       version = "0.11.2";
+       sha256 = "a0e64e5c4eb8e75e4ba27c6ea26276f508da407883fb1527102e07a20ed0d454";
        libraryHaskellDepends = [
          aeson base-prelude mtl-prelude scientific success text
          unordered-containers vector
        ];
+       jailbreak = true;
        homepage = "https://github.com/sannsyn/aeson-value-parser";
        description = "An API for parsing \"aeson\" JSON tree into Haskell types";
        license = stdenv.lib.licenses.mit;
@@ -30716,7 +30779,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "asciidiagram" = callPackage
+  "asciidiagram_1_1_1_1" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, filepath
      , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative
      , rasterific-svg, svg-tree, text, vector
@@ -30735,6 +30798,31 @@ self: {
          base bytestring directory filepath FontyFruity JuicyPixels
          optparse-applicative rasterific-svg svg-tree text
        ];
+       jailbreak = true;
+       description = "Pretty rendering of Ascii diagram into svg or png";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "asciidiagram" = callPackage
+    ({ mkDerivation, base, bytestring, containers, directory, filepath
+     , FontyFruity, JuicyPixels, lens, linear, mtl, optparse-applicative
+     , rasterific-svg, svg-tree, text, vector
+     }:
+     mkDerivation {
+       pname = "asciidiagram";
+       version = "1.2";
+       sha256 = "5ea87f5932463b8cb62873a0551fdbbf17525b45819ffb54ebcf5de400e8d098";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers FontyFruity JuicyPixels lens linear mtl
+         rasterific-svg svg-tree text vector
+       ];
+       executableHaskellDepends = [
+         base bytestring directory filepath FontyFruity JuicyPixels
+         optparse-applicative rasterific-svg svg-tree text
+       ];
        description = "Pretty rendering of Ascii diagram into svg or png";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -31315,8 +31403,8 @@ self: {
      }:
      mkDerivation {
        pname = "atlassian-connect-descriptor";
-       version = "0.4.3.0";
-       sha256 = "f4c2c8e42c64eae90b4daf9f0cb4432701129ed782490283278613986cddc69b";
+       version = "0.4.3.1";
+       sha256 = "9e7ebc206c9625dd511cc20ade5952b972091c1aafa617086578fd9f33099b84";
        libraryHaskellDepends = [
          aeson base cases network network-uri text time-units
          unordered-containers
@@ -34388,7 +34476,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base-prelude" = callPackage
+  "base-prelude_0_1_21" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "base-prelude";
@@ -34399,9 +34487,10 @@ self: {
        homepage = "https://github.com/nikita-volkov/base-prelude";
        description = "The most complete prelude formed from only the \"base\" package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base-prelude_1" = callPackage
+  "base-prelude" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "base-prelude";
@@ -34411,7 +34500,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/base-prelude";
        description = "The most complete prelude formed from only the \"base\" package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base-unicode-symbols" = callPackage
@@ -36035,13 +36123,14 @@ self: {
        libraryHaskellDepends = [
          base-prelude bytestring success text transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/binary-parser";
        description = "A highly-efficient but limited parser API specialised for bytestrings";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "binary-parser" = callPackage
+  "binary-parser_0_5_1" = callPackage
     ({ mkDerivation, base-prelude, bytestring, success, text
      , transformers
      }:
@@ -36052,12 +36141,14 @@ self: {
        libraryHaskellDepends = [
          base-prelude bytestring success text transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/binary-parser";
        description = "A highly-efficient but limited parser API specialised for bytestrings";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "binary-parser_0_5_2" = callPackage
+  "binary-parser" = callPackage
     ({ mkDerivation, base-prelude, bytestring, success, text
      , transformers
      }:
@@ -36071,7 +36162,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/binary-parser";
        description = "A highly-efficient but limited parser API specialised for bytestrings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-protocol" = callPackage
@@ -38284,17 +38374,17 @@ self: {
      }) {};
 
   "blatex" = callPackage
-    ({ mkDerivation, base, blaze-html, directory, HaTeX, process, split
-     , tagsoup, text
+    ({ mkDerivation, base, blaze-html, dates, directory, HaTeX, process
+     , split, tagsoup, text
      }:
      mkDerivation {
        pname = "blatex";
-       version = "0.1.0.4";
-       sha256 = "cbf1adfa07407c66a1dc071fca663a709e2b7cd7787f07a82276b6c58451f236";
+       version = "0.1.0.5";
+       sha256 = "8c421e5c355d374463793a6bd3815185fcd8d0e8134d72b7d6e7a916f5932479";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base blaze-html directory HaTeX process split tagsoup text
+         base blaze-html dates directory HaTeX process split tagsoup text
        ];
        jailbreak = true;
        homepage = "https://github.com/2016rshah/BlaTeX";
@@ -41543,8 +41633,8 @@ self: {
      }:
      mkDerivation {
        pname = "cab";
-       version = "0.2.15";
-       sha256 = "8925fa275d5aec64ec2627e57e131a9f8bc7a9060e4693a0507bf569af4f5f3c";
+       version = "0.2.16";
+       sha256 = "f9f9f9c178ad486ff29186b519d6993a8429c3fa34a43d8ed42525c20df5585f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -44196,7 +44286,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cases" = callPackage
+  "cases_0_1_2_1" = callPackage
     ({ mkDerivation, attoparsec, base, base-prelude, HTF, HUnit
      , loch-th, placeholders, QuickCheck, text
      }:
@@ -44213,9 +44303,10 @@ self: {
        homepage = "https://github.com/nikita-volkov/cases";
        description = "A converter for spinal, snake and camel cases";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cases_0_1_3" = callPackage
+  "cases" = callPackage
     ({ mkDerivation, attoparsec, base, base-prelude, HTF, HUnit
      , loch-th, placeholders, QuickCheck, text
      }:
@@ -44228,10 +44319,10 @@ self: {
          base HTF HUnit loch-th placeholders QuickCheck text
        ];
        jailbreak = true;
+       doCheck = false;
        homepage = "https://github.com/nikita-volkov/cases";
        description = "A converter for spinal, snake and camel cases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cash" = callPackage
@@ -48753,8 +48844,8 @@ self: {
      }:
      mkDerivation {
        pname = "cli";
-       version = "0.1.1";
-       sha256 = "a348c51e5ad1c134a39145cd3e2de5aa2ca5fca1f88262d26012df07aaf68edd";
+       version = "0.1.2";
+       sha256 = "580a31fc25eb988dbb5ad3aebfb72d49f089cbee9693edf78dae722b2fde4acb";
        libraryHaskellDepends = [ base mtl terminfo transformers ];
        testHaskellDepends = [
          base directory QuickCheck tasty tasty-quickcheck transformers
@@ -49354,7 +49445,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cmdargs" = callPackage
+  "cmdargs_0_10_13" = callPackage
     ({ mkDerivation, base, filepath, process, template-haskell
      , transformers
      }:
@@ -49370,6 +49461,25 @@ self: {
        homepage = "http://community.haskell.org/~ndm/cmdargs/";
        description = "Command line argument processing";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "cmdargs" = callPackage
+    ({ mkDerivation, base, filepath, process, template-haskell
+     , transformers
+     }:
+     mkDerivation {
+       pname = "cmdargs";
+       version = "0.10.14";
+       sha256 = "38b60053c11394a1876d2744950eece66ca9e4364298c1383f247894044bce58";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base filepath process template-haskell transformers
+       ];
+       homepage = "https://github.com/ndmitchell/cmdargs#readme";
+       description = "Command line argument processing";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "cmdargs-browser" = callPackage
@@ -51277,8 +51387,8 @@ self: {
      }:
      mkDerivation {
        pname = "concurrent-machines";
-       version = "0.2.0";
-       sha256 = "85c6050bc86f0a421e39ca6c7a9ac71fa2601d6b8be7792ac57d43fdddd95e4c";
+       version = "0.2.1";
+       sha256 = "8c22ce94dfbc20214a1a5ced0cfcb7de0c2eae509a250d144c8af51a8f27507f";
        libraryHaskellDepends = [
          async base containers lifted-async machines monad-control
          semigroups time transformers transformers-base
@@ -51286,7 +51396,6 @@ self: {
        testHaskellDepends = [
          base machines tasty tasty-hunit time transformers
        ];
-       jailbreak = true;
        description = "Concurrent networked stream transducers";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -51678,7 +51787,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "conduit" = callPackage
+  "conduit_1_2_6_1" = callPackage
     ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
      , mmorph, mtl, QuickCheck, resourcet, safe, transformers
      , transformers-base
@@ -51698,6 +51807,29 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Streaming data processing library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "conduit" = callPackage
+    ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
+     , mmorph, mtl, QuickCheck, resourcet, safe, transformers
+     , transformers-base
+     }:
+     mkDerivation {
+       pname = "conduit";
+       version = "1.2.6.2";
+       sha256 = "f9a6322b9150e85c7cc33e2eafafecc0b35ed991781a2952c274d82627c9f41e";
+       libraryHaskellDepends = [
+         base exceptions lifted-base mmorph mtl resourcet transformers
+         transformers-base
+       ];
+       testHaskellDepends = [
+         base containers exceptions hspec mtl QuickCheck resourcet safe
+         transformers
+       ];
+       homepage = "http://github.com/snoyberg/conduit";
+       description = "Streaming data processing library";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "conduit-audio" = callPackage
@@ -52263,7 +52395,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "conduit-extra" = callPackage
+  "conduit-extra_1_1_9_2" = callPackage
     ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
      , bytestring-builder, conduit, directory, exceptions, filepath
      , hspec, monad-control, network, primitive, process, resourcet, stm
@@ -52286,6 +52418,32 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Batteries included conduit: adapters for common libraries";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "conduit-extra" = callPackage
+    ({ mkDerivation, async, attoparsec, base, blaze-builder, bytestring
+     , bytestring-builder, conduit, directory, exceptions, filepath
+     , hspec, monad-control, network, primitive, process, resourcet, stm
+     , streaming-commons, text, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "conduit-extra";
+       version = "1.1.10.1";
+       sha256 = "693eeea93dd2f68c1bc4a7b42ff20fdad7556c12c45ef705beaa256de422002a";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder bytestring conduit directory filepath
+         monad-control network primitive process resourcet stm
+         streaming-commons text transformers transformers-base
+       ];
+       testHaskellDepends = [
+         async attoparsec base blaze-builder bytestring bytestring-builder
+         conduit exceptions hspec process resourcet stm streaming-commons
+         text transformers transformers-base
+       ];
+       homepage = "http://github.com/snoyberg/conduit";
+       description = "Batteries included conduit: adapters for common libraries";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "conduit-iconv" = callPackage
@@ -53365,7 +53523,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "contravariant-extras" = callPackage
+  "contravariant-extras_0_3" = callPackage
     ({ mkDerivation, base, base-prelude, contravariant
      , template-haskell, tuple-th
      }:
@@ -53376,12 +53534,14 @@ self: {
        libraryHaskellDepends = [
          base base-prelude contravariant template-haskell tuple-th
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/contravariant-extras";
        description = "Extras for the \"contravariant\" package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "contravariant-extras_0_3_1" = callPackage
+  "contravariant-extras" = callPackage
     ({ mkDerivation, base, base-prelude, contravariant
      , template-haskell, tuple-th
      }:
@@ -53395,7 +53555,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/contravariant-extras";
        description = "Extras for the \"contravariant\" package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "control-bool" = callPackage
@@ -53655,6 +53814,7 @@ self: {
        version = "1.2";
        sha256 = "d5f8b437aaa61bd414247a5a4f947eb6ee41929c1725b4874af30252fea022a9";
        libraryHaskellDepends = [ base-prelude ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/conversion";
        description = "Universal converter between values of different types";
        license = stdenv.lib.licenses.mit;
@@ -53667,6 +53827,7 @@ self: {
        version = "1.0.0.1";
        sha256 = "7e4c4264a8a9aa4fc3809411146257989404d50dfe4943bdddf063546e754bbf";
        libraryHaskellDepends = [ base-prelude bytestring conversion ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/conversion-bytestring";
        description = "\"Conversion\" instances for the \"bytestring\" library";
        license = stdenv.lib.licenses.mit;
@@ -53695,6 +53856,7 @@ self: {
        libraryHaskellDepends = [
          base-prelude bytestring conversion conversion-bytestring text
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/conversion-text";
        description = "\"Conversion\" instances for the \"text\" library";
        license = stdenv.lib.licenses.mit;
@@ -54364,7 +54526,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "courier" = callPackage
+  "courier_0_1_1_1" = callPackage
     ({ mkDerivation, async, base, bytestring, cereal, containers
      , directory, hslogger, HUnit, network, stm, test-framework
      , test-framework-hunit, text, uuid
@@ -54387,6 +54549,32 @@ self: {
        homepage = "http://github.com/hargettp/courier";
        description = "A message-passing library for simplifying network applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "courier" = callPackage
+    ({ mkDerivation, async, base, bytestring, cereal, containers
+     , directory, hslogger, HUnit, network, stm, test-framework
+     , test-framework-hunit, text, uuid
+     }:
+     mkDerivation {
+       pname = "courier";
+       version = "0.1.1.2";
+       sha256 = "1b15696197ab61fb8a675541923cbe23ee75950e43657161b2460f1897b75330";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         async base bytestring cereal containers hslogger network stm text
+         uuid
+       ];
+       executableHaskellDepends = [ base cereal ];
+       testHaskellDepends = [
+         async base cereal containers directory hslogger HUnit network stm
+         test-framework test-framework-hunit
+       ];
+       homepage = "http://github.com/hargettp/courier";
+       description = "A message-passing library for simplifying network applications";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "court" = callPackage
@@ -54414,8 +54602,8 @@ self: {
     ({ mkDerivation, base, hspec, HUnit, QuickCheck }:
      mkDerivation {
        pname = "coverage";
-       version = "0.1.0.3";
-       sha256 = "2ea9ea4f529fb99fde5d47814cf0ccf0450c70e03bbfb8275ce30a51f9f72830";
+       version = "0.1.0.4";
+       sha256 = "d9b7499e5f806d4f841b52230faa752de383fa4e4129054d52ebabb4f7e782da";
        libraryHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec HUnit QuickCheck ];
        jailbreak = true;
@@ -56189,7 +56377,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cryptonite" = callPackage
+  "cryptonite_0_10" = callPackage
     ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim
      , integer-gmp, memory, tasty, tasty-hunit, tasty-kat
      , tasty-quickcheck
@@ -56208,17 +56396,18 @@ self: {
        homepage = "https://github.com/haskell-crypto/cryptonite";
        description = "Cryptography Primitives sink";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "cryptonite_0_11" = callPackage
+  "cryptonite" = callPackage
     ({ mkDerivation, base, byteable, bytestring, deepseq, ghc-prim
      , integer-gmp, memory, tasty, tasty-hunit, tasty-kat
      , tasty-quickcheck
      }:
      mkDerivation {
        pname = "cryptonite";
-       version = "0.11";
-       sha256 = "4dedc69d6aae086fe9edd7ac3b3bdb0eef5842985eece9189e578c4c1f71676c";
+       version = "0.12";
+       sha256 = "8ab0570f6f0864004d6bdce012aaafbf365a45b1721061c7d35554b92f1ababd";
        libraryHaskellDepends = [
          base bytestring deepseq ghc-prim integer-gmp memory
        ];
@@ -56229,7 +56418,6 @@ self: {
        homepage = "https://github.com/haskell-crypto/cryptonite";
        description = "Cryptography Primitives sink";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cryptsy-api" = callPackage
@@ -59363,7 +59551,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "dbmigrations" = callPackage
+  "dbmigrations_1_0" = callPackage
     ({ mkDerivation, base, bytestring, configurator, containers
      , directory, fgl, filepath, HDBC, HDBC-postgresql, HDBC-sqlite3
      , HUnit, MissingH, mtl, process, random, template-haskell, text
@@ -59389,9 +59577,10 @@ self: {
        doCheck = false;
        description = "An implementation of relational database \"migrations\"";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "dbmigrations_1_1" = callPackage
+  "dbmigrations" = callPackage
     ({ mkDerivation, base, bytestring, configurator, containers
      , directory, fgl, filepath, HDBC, HDBC-postgresql, HDBC-sqlite3
      , HUnit, MissingH, mtl, mysql, mysql-simple, process, random, split
@@ -59414,9 +59603,9 @@ self: {
          HDBC-postgresql HDBC-sqlite3 HUnit MissingH mtl mysql mysql-simple
          process split template-haskell text time yaml-light
        ];
+       doCheck = false;
        description = "An implementation of relational database \"migrations\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dbus_0_10_10" = callPackage
@@ -61397,7 +61586,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams" = callPackage
+  "diagrams_1_3" = callPackage
     ({ mkDerivation, diagrams-contrib, diagrams-core, diagrams-lib
      , diagrams-svg
      }:
@@ -61412,6 +61601,24 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative vector graphics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "diagrams" = callPackage
+    ({ mkDerivation, diagrams-contrib, diagrams-core, diagrams-lib
+     , diagrams-svg
+     }:
+     mkDerivation {
+       pname = "diagrams";
+       version = "1.3.0.1";
+       sha256 = "ee8abf5c262955a6a535ddc297bdf829ccd17bc179f61faf953371118ec4e4a7";
+       libraryHaskellDepends = [
+         diagrams-contrib diagrams-core diagrams-lib diagrams-svg
+       ];
+       doHaddock = false;
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "Embedded domain-specific language for declarative vector graphics";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "diagrams-builder_0_6_0_2" = callPackage
@@ -62158,6 +62365,27 @@ self: {
          adjunctions base containers distributive dual-tree lens linear
          monoid-extras mtl semigroups unordered-containers
        ];
+       jailbreak = true;
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "Core libraries for diagrams EDSL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "diagrams-core_1_3_0_5" = callPackage
+    ({ mkDerivation, adjunctions, base, containers, distributive
+     , dual-tree, lens, linear, monoid-extras, mtl, semigroups
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "diagrams-core";
+       version = "1.3.0.5";
+       sha256 = "e898afe6cb88fb8caf9555b700a22021e84783d2cbe825d16cbb8cee461fae8c";
+       libraryHaskellDepends = [
+         adjunctions base containers distributive dual-tree lens linear
+         monoid-extras mtl semigroups unordered-containers
+       ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "Core libraries for diagrams EDSL";
        license = stdenv.lib.licenses.bsd3;
@@ -62171,8 +62399,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-core";
-       version = "1.3.0.5";
-       sha256 = "e898afe6cb88fb8caf9555b700a22021e84783d2cbe825d16cbb8cee461fae8c";
+       version = "1.3.0.6";
+       sha256 = "33c6079b2ec235c3fbbcb8ea7103335ccec1d1d53c27549c549f3b9ca692b9d3";
        libraryHaskellDepends = [
          adjunctions base containers distributive dual-tree lens linear
          monoid-extras mtl semigroups unordered-containers
@@ -62582,13 +62810,14 @@ self: {
          JuicyPixels lens linear monoid-extras mtl optparse-applicative
          process semigroups tagged text transformers unordered-containers
        ];
+       jailbreak = true;
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative graphics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "diagrams-lib" = callPackage
+  "diagrams-lib_1_3_0_9" = callPackage
     ({ mkDerivation, active, adjunctions, array, base, colour
      , containers, data-default-class, diagrams-core, diagrams-solve
      , directory, distributive, dual-tree, exceptions, filepath
@@ -62607,6 +62836,34 @@ self: {
          JuicyPixels lens linear monoid-extras mtl optparse-applicative
          process semigroups tagged text transformers unordered-containers
        ];
+       jailbreak = true;
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "Embedded domain-specific language for declarative graphics";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "diagrams-lib" = callPackage
+    ({ mkDerivation, active, adjunctions, array, base, colour
+     , containers, data-default-class, diagrams-core, diagrams-solve
+     , directory, distributive, dual-tree, exceptions, filepath
+     , fingertree, fsnotify, hashable, intervals, JuicyPixels, lens
+     , linear, monoid-extras, mtl, optparse-applicative, process
+     , semigroups, tagged, tasty, tasty-hunit, text, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "diagrams-lib";
+       version = "1.3.1.1";
+       sha256 = "02f2760a413f36fb73a726c1fdc2bfc4100476cbc0850bfe17f90de9ed713e69";
+       libraryHaskellDepends = [
+         active adjunctions array base colour containers data-default-class
+         diagrams-core diagrams-solve directory distributive dual-tree
+         exceptions filepath fingertree fsnotify hashable intervals
+         JuicyPixels lens linear monoid-extras mtl optparse-applicative
+         process semigroups tagged text transformers unordered-containers
+       ];
+       testHaskellDepends = [ base tasty tasty-hunit ];
        homepage = "http://projects.haskell.org/diagrams";
        description = "Embedded domain-specific language for declarative graphics";
        license = stdenv.lib.licenses.bsd3;
@@ -62926,6 +63183,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diagrams-reflex" = callPackage
+    ({ mkDerivation, base, colour, containers, diagrams-core
+     , diagrams-lib, lens, monoid-extras, mtl, reflex, reflex-dom
+     , reflex-dom-contrib
+     }:
+     mkDerivation {
+       pname = "diagrams-reflex";
+       version = "0.1";
+       sha256 = "9dd7316c3a65c9f99254f12bd832e72da8af39277ced9ad16e53ee782afad73e";
+       libraryHaskellDepends = [
+         base colour containers diagrams-core diagrams-lib lens
+         monoid-extras mtl reflex reflex-dom reflex-dom-contrib
+       ];
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "reflex backend for diagrams drawing EDSL";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "diagrams-rubiks-cube" = callPackage
     ({ mkDerivation, base, data-default-class, diagrams-lib, lens }:
      mkDerivation {
@@ -62940,7 +63215,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "diagrams-solve" = callPackage
+  "diagrams-solve_0_1" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "diagrams-solve";
@@ -62950,6 +63225,19 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Pure Haskell solver routines used by diagrams";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "diagrams-solve" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "diagrams-solve";
+       version = "0.1.0.1";
+       sha256 = "71e53a4c8c2794719d057e6bf52b996b13d52ac9d62191df134ba05062453bde";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "Pure Haskell solver routines used by diagrams";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "diagrams-svg_1_1_0_3" = callPackage
@@ -63141,6 +63429,29 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "diagrams-svg_1_4" = callPackage
+    ({ mkDerivation, base, base64-bytestring, bytestring, colour
+     , containers, diagrams-core, diagrams-lib, directory, filepath
+     , hashable, JuicyPixels, lens, monoid-extras, mtl, old-time
+     , optparse-applicative, process, semigroups, split, svg-builder
+     , text, time
+     }:
+     mkDerivation {
+       pname = "diagrams-svg";
+       version = "1.4";
+       sha256 = "9845b2f999f3fb61bf36c064977d36aea9ad8c5532c2ce80e5e3a85f5f9df900";
+       libraryHaskellDepends = [
+         base base64-bytestring bytestring colour containers diagrams-core
+         diagrams-lib directory filepath hashable JuicyPixels lens
+         monoid-extras mtl old-time optparse-applicative process semigroups
+         split svg-builder text time
+       ];
+       homepage = "http://projects.haskell.org/diagrams/";
+       description = "SVG backend for diagrams drawing EDSL";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "diagrams-tikz" = callPackage
     ({ mkDerivation, base, diagrams-core, diagrams-lib, dlist, mtl }:
      mkDerivation {
@@ -64158,14 +64469,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "directory_1_2_5_0" = callPackage
+  "directory_1_2_5_1" = callPackage
     ({ mkDerivation, base, filepath, time, unix }:
      mkDerivation {
        pname = "directory";
-       version = "1.2.5.0";
-       sha256 = "ac9d7fdd402c3281fab7ffad004229671f0ecfb7ddd70fd58b90b0a48c1ddef7";
-       revision = "1";
-       editedCabalFile = "1ae6631d1a4234329263792b1809c156f9f85a05753379e69fd6b2e93c61c6a0";
+       version = "1.2.5.1";
+       sha256 = "15f6d6c403755196617933ed165e6abd82340fcf172582577bb7ced86700ed7d";
        libraryHaskellDepends = [ base filepath time unix ];
        testHaskellDepends = [ base filepath time unix ];
        description = "Platform-agnostic library for filesystem operations";
@@ -64468,7 +64777,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "distributed-process" = callPackage
+  "distributed-process_0_5_5_1" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers
      , data-accessor, deepseq, distributed-static, ghc-prim, hashable
      , mtl, network-transport, random, rank1dynamic, stm, syb
@@ -64487,6 +64796,28 @@ self: {
        homepage = "http://haskell-distributed.github.com/";
        description = "Cloud Haskell: Erlang-style concurrency in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "distributed-process" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers
+     , data-accessor, deepseq, distributed-static, ghc-prim, hashable
+     , mtl, network-transport, random, rank1dynamic, stm, syb
+     , template-haskell, time, transformers
+     }:
+     mkDerivation {
+       pname = "distributed-process";
+       version = "0.6.0";
+       sha256 = "d79f7e24e7b2896681f9f4b798da0e987742caab4c34917a0d04f40f9aef6b5b";
+       libraryHaskellDepends = [
+         base binary bytestring containers data-accessor deepseq
+         distributed-static ghc-prim hashable mtl network-transport random
+         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;
      }) {};
 
   "distributed-process-async_0_2_1" = callPackage
@@ -64530,8 +64861,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-async";
-       version = "0.2.2";
-       sha256 = "b1bfc3ee24be9c2ab1d45563f4d4bd46a05f61a8af4fe5c1ffeb4925bbc50feb";
+       version = "0.2.3";
+       sha256 = "d3031457c36bb3c35496031c185354417b54ce253e1878f35072d04e8161ad95";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-extras fingertree hashable mtl stm time
@@ -64617,8 +64948,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-client-server";
-       version = "0.1.3.1";
-       sha256 = "3659dcf407af66485cc01294af61655aef48fd6758191788596b1461eed41438";
+       version = "0.1.3.2";
+       sha256 = "2c905624d5486b7bc8bd1a4763b139e7eb364b20467c9abddd553f9afbd3601f";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-async distributed-process-extras fingertree
@@ -64687,8 +65018,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-execution";
-       version = "0.1.2.1";
-       sha256 = "2e450d510586384d325479d008a64254ad5c9883f8af6bfd99e7edc9ae26a68e";
+       version = "0.1.2.2";
+       sha256 = "9fbfca6b394e52af462586127a0edc2efc2a160ae8f69a9d34234a71e3dbf7b5";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-client-server distributed-process-extras
@@ -64754,8 +65085,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-extras";
-       version = "0.2.1.1";
-       sha256 = "32213a9077c0fc3b835b7b94d7d5e04262208e2ce0192675af8b5bf9efe8f911";
+       version = "0.2.1.2";
+       sha256 = "c1a4e1a5e3ec30089251db40fd479b19c5fd74c9dd8ca50f8eb32aaf9747a048";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          fingertree hashable mtl stm time transformers unordered-containers
@@ -64783,8 +65114,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-lifted";
-       version = "0.1.0.0";
-       sha256 = "638112333b5bc20117396d673d46cc3786719fd545a7a76f9fb80957ee1a5a4e";
+       version = "0.2.0.0";
+       sha256 = "c0c323de903c6f6770c9e95e4c3dbbfc9295f55ad309220fd64710dae3a5e27f";
        libraryHaskellDepends = [
          base deepseq distributed-process distributed-process-monad-control
          lifted-base monad-control mtl network-transport transformers
@@ -64795,6 +65126,7 @@ self: {
          network-transport network-transport-tcp rematch test-framework
          test-framework-hunit transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/jeremyjh/distributed-process-lifted";
        description = "monad-control style typeclass and transformer instances for Process monad";
        license = stdenv.lib.licenses.bsd3;
@@ -64812,6 +65144,7 @@ self: {
          base distributed-process monad-control transformers
          transformers-base
        ];
+       jailbreak = true;
        homepage = "http://haskell-distributed.github.io";
        description = "Orphan instances for MonadBase and MonadBaseControl";
        license = stdenv.lib.licenses.bsd3;
@@ -64883,8 +65216,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-registry";
-       version = "0.1.0.1";
-       sha256 = "9571f9870fb0591a09b8260e4b8b096547bf253a502a4a9347c9c30f19788931";
+       version = "0.1.0.2";
+       sha256 = "ae2e6ec9de83344cbf33db09073343faba2f8e990e20e98dfebe80a9560875d2";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-client-server distributed-process-extras
@@ -64958,8 +65291,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-simplelocalnet";
-       version = "0.2.3.1";
-       sha256 = "0efd9566945f5927eff128d928baa094720ef29ceec213fd3799e36ae3bcf1b5";
+       version = "0.2.3.2";
+       sha256 = "c3351cf8a782dda756689b3747ede1e3879dcb913a07065eb4ec0052a963825f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -65017,8 +65350,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-supervisor";
-       version = "0.1.3.1";
-       sha256 = "2e404f040d1a835b6dd77b4888b5d884f45dfda309dcdc04fcaa6988bf1a4786";
+       version = "0.1.3.2";
+       sha256 = "3e9b9c940afb67d41bb3ec50229ea972ffd386a2e424007b9cbacc361f053df4";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-client-server distributed-process-extras
@@ -65089,8 +65422,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-task";
-       version = "0.1.2.1";
-       sha256 = "f8dc728ba039c85feae5fd795d22d51aa2c1b7031ad99a772facccad22ae5619";
+       version = "0.1.2.2";
+       sha256 = "ec25caf01b9185d166433246210be688a9733e73f54b03f91a910eaf2cd05c23";
        libraryHaskellDepends = [
          base binary containers data-accessor deepseq distributed-process
          distributed-process-async distributed-process-client-server
@@ -65116,20 +65449,21 @@ self: {
   "distributed-process-tests" = callPackage
     ({ mkDerivation, ansi-terminal, base, binary, bytestring
      , distributed-process, distributed-static, HUnit, network
-     , network-transport, network-transport-tcp, random, rematch, stm
-     , test-framework, test-framework-hunit
+     , network-transport, network-transport-inmemory, random, rematch
+     , setenv, stm, test-framework, test-framework-hunit
      }:
      mkDerivation {
        pname = "distributed-process-tests";
-       version = "0.4.3.3";
-       sha256 = "fecfbae4d57eb8329486f4e1bfa01c5cbdaff7fed99a0533348f903830609678";
+       version = "0.4.4";
+       sha256 = "e53f39304100179bbd4e6944348578fe252940170f5ae20ab2ae1c63f8a69169";
        libraryHaskellDepends = [
          ansi-terminal base binary bytestring distributed-process
          distributed-static HUnit network network-transport random rematch
-         stm test-framework test-framework-hunit
+         setenv stm test-framework test-framework-hunit
        ];
        testHaskellDepends = [
-         base network network-transport network-transport-tcp test-framework
+         base network network-transport network-transport-inmemory
+         test-framework
        ];
        homepage = "http://github.com/haskell-distributed/distributed-process-tests";
        description = "Tests and test support tools for distributed-process";
@@ -65200,7 +65534,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "distributed-static" = callPackage
+  "distributed-static_0_3_3_0" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, deepseq
      , rank1dynamic
      }:
@@ -65214,6 +65548,23 @@ self: {
        homepage = "http://haskell-distributed.github.com";
        description = "Compositional, type-safe, polymorphic static values and closures";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "distributed-static" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, deepseq
+     , rank1dynamic
+     }:
+     mkDerivation {
+       pname = "distributed-static";
+       version = "0.3.4.0";
+       sha256 = "f3d522537946c2e89382f8549674b7abe7adc9aab22acafdf89570f44c508d51";
+       libraryHaskellDepends = [
+         base binary bytestring containers deepseq rank1dynamic
+       ];
+       homepage = "http://haskell-distributed.github.com";
+       description = "Compositional, type-safe, polymorphic static values and closures";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "distribution" = callPackage
@@ -66038,6 +66389,8 @@ self: {
        pname = "dom-parser";
        version = "0.0.1";
        sha256 = "5ade4315c5e59bfbaf1e078a1171c6f3109d4f3bd3c394d7ef923140e253f86b";
+       revision = "1";
+       editedCabalFile = "1157c5f603c43f5a4bd0ea7f45da822b989db065324bbecb2e14659473eb766f";
        libraryHaskellDepends = [
          base lens mtl semigroups shakespeare text transformers xml-conduit
        ];
@@ -66971,7 +67324,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "dual-tree" = callPackage
+  "dual-tree_0_2_0_8" = callPackage
     ({ mkDerivation, base, monoid-extras, newtype, semigroups }:
      mkDerivation {
        pname = "dual-tree";
@@ -66980,6 +67333,18 @@ self: {
        libraryHaskellDepends = [ base monoid-extras newtype semigroups ];
        description = "Rose trees with cached and accumulating monoidal annotations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "dual-tree" = callPackage
+    ({ mkDerivation, base, monoid-extras, newtype, semigroups }:
+     mkDerivation {
+       pname = "dual-tree";
+       version = "0.2.0.9";
+       sha256 = "5e7d0abb471962df00c5adc53fa9a48f70c9695d5fdf225deecfa040116576a4";
+       libraryHaskellDepends = [ base monoid-extras newtype semigroups ];
+       description = "Rose trees with cached and accumulating monoidal annotations";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "dump" = callPackage
@@ -67334,7 +67699,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "dynamic-state" = callPackage
+  "dynamic-state_0_2_0_0" = callPackage
     ({ mkDerivation, base, binary, bytestring, hashable
      , unordered-containers
      }:
@@ -67349,6 +67714,22 @@ self: {
        ];
        description = "Optionally serializable dynamic state keyed by type";
        license = stdenv.lib.licenses.gpl2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "dynamic-state" = callPackage
+    ({ mkDerivation, base, binary, bytestring, hashable
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "dynamic-state";
+       version = "0.2.1.0";
+       sha256 = "16094496ec20cddadce64491196000483e757d9011ce756447584a85adf1de05";
+       libraryHaskellDepends = [
+         base binary bytestring hashable unordered-containers
+       ];
+       description = "Optionally serializable dynamic state keyed by type";
+       license = stdenv.lib.licenses.gpl2;
      }) {};
 
   "dynobud" = callPackage
@@ -67670,6 +68051,8 @@ self: {
        pname = "ed25519";
        version = "0.0.5.0";
        sha256 = "d8a5958ebfa9309790efade64275dc5c441b568645c45ceed1b0c6ff36d6156d";
+       revision = "1";
+       editedCabalFile = "4e8742cc8e8bf5d078c68c9f550b06566c7a94df3ff3070cfe4c91cbee664f06";
        libraryHaskellDepends = [ base bytestring ghc-prim ];
        testHaskellDepends = [
          base bytestring directory doctest filepath hlint QuickCheck
@@ -68766,8 +69149,8 @@ self: {
     ({ mkDerivation, base, profunctors }:
      mkDerivation {
        pname = "elision";
-       version = "0.1.2.0";
-       sha256 = "2730a52a00c063e3386b0cca50905f3676a740c97aec8149d56e0def29d583e0";
+       version = "0.1.3.2";
+       sha256 = "5e40a0b20effd90f65817391b5eefed1450f90794af3a2a2048c46ef1ad00791";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base profunctors ];
@@ -68793,7 +69176,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "elm-bridge" = callPackage
+  "elm-bridge_0_2_1_0" = callPackage
     ({ mkDerivation, aeson, base, containers, hspec, QuickCheck
      , template-haskell, text
      }:
@@ -68808,6 +69191,24 @@ self: {
        homepage = "http://github.com/agrafix/elm-bridge";
        description = "Derive Elm types from Haskell types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "elm-bridge" = callPackage
+    ({ mkDerivation, aeson, base, containers, hspec, QuickCheck
+     , template-haskell, text
+     }:
+     mkDerivation {
+       pname = "elm-bridge";
+       version = "0.2.1.1";
+       sha256 = "caafa2706908f371004810cba472dabdfca4360b31fa6ba43414aacc433b6737";
+       libraryHaskellDepends = [ aeson base template-haskell ];
+       testHaskellDepends = [
+         aeson base containers hspec QuickCheck text
+       ];
+       homepage = "http://github.com/agrafix/elm-bridge";
+       description = "Derive Elm types from Haskell types";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "elm-build-lib" = callPackage
@@ -68998,15 +69399,14 @@ self: {
      }:
      mkDerivation {
        pname = "elm-init";
-       version = "1.0.3";
-       sha256 = "cf185ec4ce23944dcd33ac7f364cb549182f53acfa79fc843789ca0bd7b38f8b";
+       version = "1.0.4";
+       sha256 = "39f8ec1e64c1a5025f4568ff59b52470e846d777f3cd343176b7a25d672989d3";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
          aeson aeson-pretty base base-unicode-symbols bytestring containers
          directory file-embed filepath process text time
        ];
-       jailbreak = true;
        description = "Set up basic structure for an elm project";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -70267,8 +70667,8 @@ self: {
      }:
      mkDerivation {
        pname = "erlang";
-       version = "0.2";
-       sha256 = "90c5c2081472ec2fdf7d7b1ac3d89169479590af7679a071a05dd7cbf6a14250";
+       version = "0.2.1";
+       sha256 = "7322f24dcc10cfde8a2f9afa6835893b93b7b4c3e20f7514a24ca6d169b7f334";
        libraryHaskellDepends = [
          base binary bytestring directory filepath MissingH network random
        ];
@@ -70821,7 +71221,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "esqueleto" = callPackage
+  "esqueleto_2_4_2" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
      , hspec, HUnit, monad-control, monad-logger, persistent
      , persistent-sqlite, persistent-template, QuickCheck, resourcet
@@ -70843,9 +71243,10 @@ self: {
        homepage = "https://github.com/prowdsponsor/esqueleto";
        description = "Type-safe EDSL for SQL queries on persistent backends";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "esqueleto_2_4_3" = callPackage
+  "esqueleto" = callPackage
     ({ mkDerivation, base, blaze-html, bytestring, conduit, containers
      , hspec, HUnit, monad-control, monad-logger, persistent
      , persistent-sqlite, persistent-template, QuickCheck, resourcet
@@ -70867,7 +71268,6 @@ self: {
        homepage = "https://github.com/prowdsponsor/esqueleto";
        description = "Type-safe EDSL for SQL queries on persistent backends";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ess" = callPackage
@@ -72688,6 +73088,7 @@ self: {
        sha256 = "3ce6a7298e92c836272d71fb9f604cb37d2c90a2394720c6b67c1b6f21063c54";
        libraryHaskellDepends = [ base base-prelude split X11 ];
        librarySystemDepends = [ libXtst ];
+       jailbreak = true;
        homepage = "http://github.com/aelve/fake-type";
        description = "A crossplatform library to simulate keyboard input";
        license = stdenv.lib.licenses.bsd3;
@@ -73984,7 +74385,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "fclabels" = callPackage
+  "fclabels_2_0_2_4" = callPackage
     ({ mkDerivation, base, HUnit, mtl, template-haskell, transformers
      }:
      mkDerivation {
@@ -73998,6 +74399,23 @@ self: {
        homepage = "https://github.com/sebastiaanvisser/fclabels";
        description = "First class accessor labels implemented as lenses";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "fclabels" = callPackage
+    ({ mkDerivation, base, HUnit, mtl, template-haskell, transformers
+     }:
+     mkDerivation {
+       pname = "fclabels";
+       version = "2.0.3";
+       sha256 = "b43e4dcc9000be435145b13b97e0997ec1fb8291ec0af8f18cf2a2b696d9ce43";
+       libraryHaskellDepends = [ base mtl template-haskell transformers ];
+       testHaskellDepends = [
+         base HUnit mtl template-haskell transformers
+       ];
+       homepage = "https://github.com/sebastiaanvisser/fclabels";
+       description = "First class accessor labels implemented as lenses";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "fclabels-monadlib" = callPackage
@@ -74269,8 +74687,8 @@ self: {
      }:
      mkDerivation {
        pname = "feed-collect";
-       version = "0.2.0.1";
-       sha256 = "8a3c57faec9f0e3df17fe9ad7ebf64e09973f1e485906378365b4f6c5395b81b";
+       version = "0.2.0.2";
+       sha256 = "87671ac61228d4b40337c5128528550511e05bc84484dabb8188fa16d5cb9b35";
        libraryHaskellDepends = [
          base data-default-class feed http-client http-client-tls time
          time-interval time-units timerep transformers utf8-string
@@ -74591,7 +75009,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "fft" = callPackage
+  "fft_0_1_8_2" = callPackage
     ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable
      , QuickCheck, storable-complex, syb, transformers
      }:
@@ -74607,9 +75025,10 @@ self: {
        doCheck = false;
        description = "Bindings to the FFTW library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;};
 
-  "fft_0_1_8_3" = callPackage
+  "fft" = callPackage
     ({ mkDerivation, array, base, carray, fftw, fftwFloat, ix-shapable
      , QuickCheck, storable-complex, syb, transformers
      }:
@@ -74622,9 +75041,9 @@ self: {
        ];
        libraryPkgconfigDepends = [ fftw fftwFloat ];
        testHaskellDepends = [ base carray QuickCheck storable-complex ];
+       doCheck = false;
        description = "Bindings to the FFTW library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) fftw; inherit (pkgs) fftwFloat;};
 
   "fftwRaw" = callPackage
@@ -75303,12 +75722,12 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "filtrable";
-       version = "0.1.0.2";
-       sha256 = "85ae076585fa58f4ec546287e74e8327e599c1ff686d15839294138e2f02dc35";
+       version = "0.1.0.4";
+       sha256 = "85285317f86c6e4e7329d74bf6b2116ab203f810ac2b5ebde251f920c3098d53";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/strake/filtrable.hs";
        description = "Class of filtrable containers";
-       license = "unknown";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "final" = callPackage
@@ -75908,15 +76327,15 @@ self: {
   "fixfile" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
      , directory, exceptions, filepath, hashable, hashtables, lens, mtl
-     , QuickCheck, tasty, tasty-quickcheck, temporary
+     , QuickCheck, tasty, tasty-quickcheck, temporary, vector
      }:
      mkDerivation {
        pname = "fixfile";
-       version = "0.1.0.0";
-       sha256 = "f52739e9ecd4b018fa1744890a3fb185da003b08c1244b748719ea657c36321a";
+       version = "0.2.0.0";
+       sha256 = "7cc1313702089f3b559a9e167ff83ea1ab91406f57500c567d69672c3f85ecfe";
        libraryHaskellDepends = [
          array base binary bytestring containers directory filepath hashable
-         hashtables lens mtl temporary
+         hashtables lens mtl temporary vector
        ];
        testHaskellDepends = [
          base binary bytestring directory exceptions lens mtl QuickCheck
@@ -76975,8 +77394,8 @@ self: {
      }:
      mkDerivation {
        pname = "foldl-transduce";
-       version = "0.5.1.0";
-       sha256 = "05dd7d6cc6fd8bd925346d631a287fbef24e04dd25be0228ad7a723666d33160";
+       version = "0.5.2.0";
+       sha256 = "c3d8e0ec48ab53c60dac03c7784b508b82da23a6e746b4f856415dbfe359a9b7";
        libraryHaskellDepends = [
          base bifunctors bytestring comonad containers foldl free
          monoid-subclasses profunctors semigroupoids semigroups split text
@@ -78377,20 +78796,23 @@ self: {
      }) {};
 
   "freesound" = callPackage
-    ({ mkDerivation, base, bytestring, curl, data-accessor
-     , data-accessor-template, directory, mtl, xml
+    ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers
+     , data-default, filepath, hspec, hspec-core, http-types, lens, mtl
+     , network, network-uri, old-locale, text, time, transformers, wreq
      }:
      mkDerivation {
        pname = "freesound";
-       version = "0.1.0";
-       sha256 = "9ebdb823d8bf3979cfc1904a31b167f51d01ad481f8fec702983492d0cc36428";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.3.0";
+       sha256 = "be22e47c2e0ff3d72b243003ad21b1817d24e310ea8cdd94818ed5763db43e0f";
        libraryHaskellDepends = [
-         base bytestring curl data-accessor data-accessor-template directory
-         mtl xml
+         aeson base blaze-builder bytestring data-default filepath
+         http-types lens mtl network network-uri old-locale text time
+         transformers wreq
        ];
-       homepage = "http://code.haskell.org/~StefanKersten/code/freesound";
+       testHaskellDepends = [
+         aeson base bytestring containers data-default hspec hspec-core
+       ];
+       homepage = "https://github.com/kaoskorobase/freesound";
        description = "Access the Freesound Project database";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -80127,8 +80549,8 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "generic-deriving";
-       version = "1.10.0";
-       sha256 = "8378c23213efdba77c3ebbe95e679f64a1e57c511475e69d9b31dda8420d7ae4";
+       version = "1.10.2";
+       sha256 = "ac5c16be3ff2484bdc5b0051b5af8ed6e31fee8ede2977904a1535ad56b8d9b8";
        libraryHaskellDepends = [
          base containers ghc-prim template-haskell
        ];
@@ -81546,7 +81968,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "ghc-session" = callPackage
+  "ghc-session_0_1_2_0" = callPackage
     ({ mkDerivation, base, exceptions, ghc, ghc-mtl, ghc-paths
      , transformers, transformers-compat
      }:
@@ -81564,6 +81986,27 @@ self: {
        homepage = "http://github.com/pmlodawski/ghc-session";
        description = "Simplified GHC API";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "ghc-session" = callPackage
+    ({ mkDerivation, base, exceptions, ghc, ghc-mtl, ghc-paths
+     , transformers, transformers-compat
+     }:
+     mkDerivation {
+       pname = "ghc-session";
+       version = "0.1.2.1";
+       sha256 = "c1e517fa3fe4fc12ce2d371a8a8b1e50fd1ec22edc94203f0566b23f501e6d0b";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base exceptions ghc ghc-mtl ghc-paths transformers
+         transformers-compat
+       ];
+       executableHaskellDepends = [ base transformers ];
+       homepage = "http://github.com/pmlodawski/ghc-session";
+       description = "Simplified GHC API";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "ghc-simple" = callPackage
@@ -81769,15 +82212,15 @@ self: {
 
   "ghc-vis" = callPackage
     ({ mkDerivation, base, cairo, containers, deepseq, fgl
-     , ghc-heap-view, graphviz, gtk, mtl, svgcairo, text, transformers
+     , ghc-heap-view, graphviz, gtk3, mtl, svgcairo, text, transformers
      , xdot
      }:
      mkDerivation {
        pname = "ghc-vis";
-       version = "0.7.2.9";
-       sha256 = "e0ea3da85c0e32b446f682114de92df548fc230c24a33683c339f110632043ae";
+       version = "0.8";
+       sha256 = "e8e808c0155396ba391da1f3289df042088aa7af432ae554964ea4896e1c870d";
        libraryHaskellDepends = [
-         base cairo containers deepseq fgl ghc-heap-view graphviz gtk mtl
+         base cairo containers deepseq fgl ghc-heap-view graphviz gtk3 mtl
          svgcairo text transformers xdot
        ];
        homepage = "http://felsin9.de/nnis/ghc-vis";
@@ -81841,8 +82284,8 @@ self: {
        pname = "ghci-ng";
        version = "10.0.0";
        sha256 = "a78909a528b79ec14649c528bb47bbec02c535b75b654978a97359e7c9bd39dd";
-       revision = "1";
-       editedCabalFile = "257b623b74af9d15e3b9539156fe411d3b13fb8da9fe6c6d8f84c1f7645d114f";
+       revision = "3";
+       editedCabalFile = "0deaf1cd57dd29c65fe31d4679d171336a07382cede88770f36e6d24cb3568cc";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -82466,18 +82909,19 @@ self: {
 
   "ginger" = callPackage
     ({ mkDerivation, aeson, base, bytestring, data-default, filepath
-     , mtl, parsec, safe, scientific, text, transformers
-     , unordered-containers, vector
+     , http-types, mtl, parsec, safe, scientific, text, transformers
+     , unordered-containers, utf8-string, vector
      }:
      mkDerivation {
        pname = "ginger";
-       version = "0.1.0.0";
-       sha256 = "9b8f513b92c8e4ae179c75fe7f4fb675cf870dc53d3a02df51b5ec9336a39331";
+       version = "0.1.2.0";
+       sha256 = "ab23b63975f0e6ea9819c303b73bb4633840ecf8fbcd9c4bd6746fed7c61e613";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring data-default filepath mtl parsec safe
-         scientific text transformers unordered-containers vector
+         aeson base bytestring data-default filepath http-types mtl parsec
+         safe scientific text transformers unordered-containers utf8-string
+         vector
        ];
        executableHaskellDepends = [
          aeson base bytestring data-default text transformers
@@ -82938,71 +83382,6 @@ self: {
          inherit (pkgs) which;};
 
   "git-annex" = callPackage
-    ({ mkDerivation, aeson, async, aws, base, blaze-builder
-     , bloomfilter, bup, byteable, bytestring, case-insensitive
-     , clientsession, concurrent-output, conduit, conduit-extra
-     , containers, crypto-api, cryptonite, curl, data-default, DAV, dbus
-     , directory, dlist, dns, edit-distance, esqueleto, exceptions
-     , fdo-notify, feed, filepath, git, gnupg, gnutls, hinotify
-     , hslogger, http-client, http-conduit, http-types, IfElse, json
-     , lsof, MissingH, monad-control, monad-logger, mtl, network
-     , network-info, network-multicast, network-protocol-xmpp
-     , network-uri, old-locale, openssh, optparse-applicative
-     , path-pieces, perl, persistent, persistent-sqlite
-     , persistent-template, process, QuickCheck, random, regex-tdfa
-     , resourcet, rsync, SafeSemaphore, sandi, securemem, shakespeare
-     , stm, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun
-     , template-haskell, text, time, torrent, transformers, unix
-     , unix-compat, utf8-string, uuid, wai, wai-extra, warp, warp-tls
-     , wget, which, xml-types, yesod, yesod-core, yesod-default
-     , yesod-form, yesod-static
-     }:
-     mkDerivation {
-       pname = "git-annex";
-       version = "6.20160126";
-       sha256 = "dc59f670a3d0bdb90db8fc6cadba8003708219bb0dc3d56867a9246d825c0d11";
-       configureFlags = [
-         "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
-         "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
-         "-ftahoe" "-ftdfa" "-ftestsuite" "-ftorrentparser" "-fwebapp"
-         "-fwebapp-secure" "-fwebdav" "-fxmpp"
-       ];
-       isLibrary = false;
-       isExecutable = true;
-       executableHaskellDepends = [
-         aeson async aws base blaze-builder bloomfilter byteable bytestring
-         case-insensitive clientsession concurrent-output conduit
-         conduit-extra containers crypto-api cryptonite data-default DAV
-         dbus directory dlist dns edit-distance esqueleto exceptions
-         fdo-notify feed filepath gnutls hinotify hslogger http-client
-         http-conduit http-types IfElse json MissingH monad-control
-         monad-logger mtl network network-info network-multicast
-         network-protocol-xmpp network-uri old-locale optparse-applicative
-         path-pieces persistent persistent-sqlite persistent-template
-         process QuickCheck random regex-tdfa resourcet SafeSemaphore sandi
-         securemem shakespeare stm tasty tasty-hunit tasty-quickcheck
-         tasty-rerun template-haskell text time torrent transformers unix
-         unix-compat utf8-string uuid wai wai-extra warp warp-tls xml-types
-         yesod yesod-core yesod-default yesod-form yesod-static
-       ];
-       executableSystemDepends = [
-         bup curl git gnupg lsof openssh perl rsync wget which
-       ];
-       preConfigure = "export HOME=$TEMPDIR; patchShebangs .";
-       postBuild = "ln -sf dist/build/git-annex/git-annex git-annex";
-       installPhase = "make PREFIX=$out CABAL=./Setup BUILDER=./Setup install";
-       checkPhase = "./git-annex test";
-       enableSharedExecutables = false;
-       homepage = "http://git-annex.branchable.com/";
-       description = "manage files with git, without checking their contents into git";
-       license = stdenv.lib.licenses.gpl3;
-       maintainers = with stdenv.lib.maintainers; [ simons ];
-     }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
-         inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
-         inherit (pkgs) perl; inherit (pkgs) rsync; inherit (pkgs) wget; 
-         inherit (pkgs) which;};
-
-  "git-annex_6_20160211" = callPackage
     ({ mkDerivation, aeson, async, aws, base, blaze-builder
      , bloomfilter, bup, byteable, bytestring, case-insensitive
      , clientsession, concurrent-output, conduit, conduit-extra
@@ -83061,7 +83440,6 @@ self: {
        homepage = "http://git-annex.branchable.com/";
        description = "manage files with git, without checking their contents into git";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {inherit (pkgs) bup; inherit (pkgs) curl; inherit (pkgs) git; 
          inherit (pkgs) gnupg; inherit (pkgs) lsof; inherit (pkgs) openssh; 
@@ -83577,8 +83955,8 @@ self: {
      }:
      mkDerivation {
        pname = "gitit";
-       version = "0.12.0.1";
-       sha256 = "552996f2624ed08cd21a73303d666292f08a1294416d2811f9d57293c9e89506";
+       version = "0.12.1";
+       sha256 = "c2cf094e7553e1ad6eefe59b4b7d924fe42f31dd51545193b56bcd0596f57d73";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -83594,7 +83972,6 @@ self: {
          base bytestring directory filepath hslogger HTTP mtl network
          network-uri syb url utf8-string
        ];
-       jailbreak = true;
        homepage = "http://gitit.net";
        description = "Wiki using happstack, git or darcs, and pandoc";
        license = "GPL";
@@ -86528,15 +86905,16 @@ self: {
 
   "gore-and-ash-actor" = callPackage
     ({ mkDerivation, base, containers, deepseq, exceptions
-     , gore-and-ash, hashable, mtl, unordered-containers
+     , gore-and-ash, hashable, mtl, resourcet, transformers
+     , transformers-base, unordered-containers
      }:
      mkDerivation {
        pname = "gore-and-ash-actor";
-       version = "1.1.1.0";
-       sha256 = "2f2f9a7bd5b485e1b55e7aa89537c458fbeab66bbd259d8599f19cbf7b94bbd2";
+       version = "1.2.1.0";
+       sha256 = "7769718f402328fb3ae3ea268d8da5398f897cd7c3702372b8a9a1f560cc9360";
        libraryHaskellDepends = [
          base containers deepseq exceptions gore-and-ash hashable mtl
-         unordered-containers
+         resourcet transformers transformers-base unordered-containers
        ];
        homepage = "https://github.com/Teaspot-Studio/gore-and-ash-actor";
        description = "Gore&Ash engine extension that implements actor style of programming";
@@ -86545,16 +86923,17 @@ self: {
 
   "gore-and-ash-async" = callPackage
     ({ mkDerivation, async, base, containers, deepseq, exceptions
-     , gore-and-ash, hashable, HUnit, mtl, test-framework
-     , test-framework-hunit, transformers, unordered-containers
+     , gore-and-ash, hashable, HUnit, mtl, resourcet, test-framework
+     , test-framework-hunit, transformers, transformers-base
+     , unordered-containers
      }:
      mkDerivation {
        pname = "gore-and-ash-async";
-       version = "1.0.1.0";
-       sha256 = "5e9ca4486c074d3bd9de0cb03cb830e6bb6edaba3809ef4ddb8f00b95e628abc";
+       version = "1.1.0.0";
+       sha256 = "8ed161f2d598e3f84c1ee3a2abe2ed0b8d41f4bcb526467bfbe00ba3cf6edf74";
        libraryHaskellDepends = [
          async base containers deepseq exceptions gore-and-ash hashable mtl
-         transformers unordered-containers
+         resourcet transformers transformers-base unordered-containers
        ];
        testHaskellDepends = [
          base containers deepseq exceptions gore-and-ash HUnit mtl
@@ -86591,17 +86970,35 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "gore-and-ash-glfw" = callPackage
+    ({ mkDerivation, base, deepseq, exceptions, extra, GLFW-b
+     , gore-and-ash, hashable, mtl, transformers, unordered-containers
+     }:
+     mkDerivation {
+       pname = "gore-and-ash-glfw";
+       version = "1.1.0.0";
+       sha256 = "e953449a6d07626dddcd347e52d20610b82a89e3ff0eb6e70166dc3e098bb504";
+       libraryHaskellDepends = [
+         base deepseq exceptions extra GLFW-b gore-and-ash hashable mtl
+         transformers unordered-containers
+       ];
+       homepage = "https://github.com/Teaspot-Studio/gore-and-ash-glfw";
+       description = "Core module for Gore&Ash engine for GLFW input events";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "gore-and-ash-logging" = callPackage
     ({ mkDerivation, base, containers, deepseq, exceptions
-     , gore-and-ash, mtl, text, text-show, transformers
+     , gore-and-ash, mtl, resourcet, text, text-show, transformers
+     , transformers-base
      }:
      mkDerivation {
        pname = "gore-and-ash-logging";
-       version = "1.1.1.0";
-       sha256 = "c35b4523e7eaaf601684b8c4054b33a787732524d8437c0c6d18abb2ff012fdd";
+       version = "1.2.1.0";
+       sha256 = "e036991edeaf1ba9eefa57a8668d1793a63bba816ffbf856a001fb5674881293";
        libraryHaskellDepends = [
-         base containers deepseq exceptions gore-and-ash mtl text text-show
-         transformers
+         base containers deepseq exceptions gore-and-ash mtl resourcet text
+         text-show transformers transformers-base
        ];
        homepage = "https://github.com/Teaspot-Studio/gore-and-ash-logging";
        description = "Core module for gore-and-ash with logging utilities";
@@ -86611,17 +87008,19 @@ self: {
   "gore-and-ash-network" = callPackage
     ({ mkDerivation, base, bytestring, containers, deepseq, exceptions
      , extra, ghc-prim, gore-and-ash, gore-and-ash-logging, hashable
-     , integer-gmp, mtl, network, text, text-show, typesafe-endian
+     , integer-gmp, mtl, network, resourcet, text, text-show
+     , transformers, transformers-base, typesafe-endian
      , unordered-containers
      }:
      mkDerivation {
        pname = "gore-and-ash-network";
-       version = "1.2.2.0";
-       sha256 = "29e057aa8fefad346800af73419310024cf363641012a538d3e4f9bd68eec9c7";
+       version = "1.3.2.0";
+       sha256 = "7093854a9ceb887bd7b58cad8d79d46ed632609f54bdfb2c7a2dcefe7296f4d2";
        libraryHaskellDepends = [
          base bytestring containers deepseq exceptions extra ghc-prim
          gore-and-ash gore-and-ash-logging hashable integer-gmp mtl network
-         text text-show typesafe-endian unordered-containers
+         resourcet text text-show transformers transformers-base
+         typesafe-endian unordered-containers
        ];
        homepage = "https://github.com/Teaspot-Studio/gore-and-ash-network";
        description = "Core module for Gore&Ash engine with low level network API";
@@ -86630,16 +87029,17 @@ self: {
 
   "gore-and-ash-sdl" = callPackage
     ({ mkDerivation, base, containers, deepseq, exceptions
-     , gore-and-ash, lens, linear, mtl, sdl2, text, transformers
-     , unordered-containers
+     , gore-and-ash, lens, linear, mtl, resourcet, sdl2, text
+     , transformers, transformers-base, unordered-containers
      }:
      mkDerivation {
        pname = "gore-and-ash-sdl";
-       version = "2.0.0.0";
-       sha256 = "0a351f7be59a61ea6f9b1c535c259c94ef4420a45d09fd6b79515948cd7636ec";
+       version = "2.1.0.0";
+       sha256 = "2c8ec109e234cbaef34ac6b72a7a5182437a0f0473006d033cd51102d868294d";
        libraryHaskellDepends = [
          base containers deepseq exceptions gore-and-ash lens linear mtl
-         sdl2 text transformers unordered-containers
+         resourcet sdl2 text transformers transformers-base
+         unordered-containers
        ];
        homepage = "git@github.com:Teaspot-Studio/gore-and-ash-sdl.git";
        description = "Gore&Ash core module for integration with SDL library";
@@ -86649,17 +87049,19 @@ self: {
   "gore-and-ash-sync" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, deepseq
      , exceptions, gore-and-ash, gore-and-ash-actor
-     , gore-and-ash-logging, gore-and-ash-network, hashable, mtl, text
+     , gore-and-ash-logging, gore-and-ash-network, hashable, mtl
+     , resourcet, text, transformers, transformers-base
      , unordered-containers
      }:
      mkDerivation {
        pname = "gore-and-ash-sync";
-       version = "1.1.1.0";
-       sha256 = "2b83fd24a3c4d671f513a3e229289fc548f2ad6c5cee8a0f08fde6383ff33411";
+       version = "1.2.0.0";
+       sha256 = "719827da28924991b85d8d3aca1ca5fe1ebdb77d3d32154bdfc1790928015769";
        libraryHaskellDepends = [
          base bytestring cereal containers deepseq exceptions gore-and-ash
          gore-and-ash-actor gore-and-ash-logging gore-and-ash-network
-         hashable mtl text unordered-containers
+         hashable mtl resourcet text transformers transformers-base
+         unordered-containers
        ];
        homepage = "https://github.com/Teaspot-Studio/gore-and-ash-sync";
        description = "Gore&Ash module for high level network synchronization";
@@ -87345,17 +87747,17 @@ self: {
      }) {};
 
   "graphmod" = callPackage
-    ({ mkDerivation, base, containers, directory, dotgen, filepath
-     , haskell-lexer
+    ({ mkDerivation, base, Cabal, containers, directory, dotgen
+     , filepath, haskell-lexer
      }:
      mkDerivation {
        pname = "graphmod";
-       version = "1.2.8";
-       sha256 = "e4fe1c418f8c975581cbfaf2ada04ad69d6f70cc0ded8c3603e2179d03d3c2fc";
+       version = "1.2.9";
+       sha256 = "2e9af4e92a2cad0fc4132060bcf61bdbed28bde50b3ca5d1cadb9db37d1493d9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         base containers directory dotgen filepath haskell-lexer
+         base Cabal containers directory dotgen filepath haskell-lexer
        ];
        homepage = "http://github.com/yav/graphmod/wiki";
        description = "Present the module dependencies of a program as a \"dot\" graph";
@@ -87521,6 +87923,7 @@ self: {
        testHaskellDepends = [
          base containers fgl fgl-arbitrary filepath QuickCheck text
        ];
+       doCheck = false;
        homepage = "http://projects.haskell.org/graphviz/";
        description = "Bindings to Graphviz for graph visualisation";
        license = stdenv.lib.licenses.bsd3;
@@ -87709,19 +88112,36 @@ self: {
      }:
      mkDerivation {
        pname = "grid";
-       version = "7.8.4";
-       sha256 = "53ac474ffa42149d2a34ef40ff69b934d95fc03f2d920219c5611a1a521091c9";
+       version = "7.8.5";
+       sha256 = "dc5841ddffcc2dacd6667031fc78d2c0df86a7c8e112b76ba134831e84741fb8";
        libraryHaskellDepends = [ base cereal containers ];
        testHaskellDepends = [
          base containers QuickCheck test-framework
          test-framework-quickcheck2
        ];
-       jailbreak = true;
        homepage = "https://github.com/mhwombat/grid";
        description = "Tools for working with regular grids (graphs, lattices)";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "gridfs" = callPackage
+    ({ mkDerivation, base, bson, bytestring, conduit, conduit-extra
+     , monad-control, mongoDB, mtl, pureMD5, resourcet, tagged, text
+     , time, transformers
+     }:
+     mkDerivation {
+       pname = "gridfs";
+       version = "0.1.0.2";
+       sha256 = "e5230fd91b586e3760f56e7f94ab334886784302395cf392246d452ce3c248c5";
+       libraryHaskellDepends = [
+         base bson bytestring conduit conduit-extra monad-control mongoDB
+         mtl pureMD5 resourcet tagged text time transformers
+       ];
+       homepage = "http://github.com/btubbs/haskell-gridfs#readme";
+       description = "GridFS (MongoDB file storage) implementation";
+       license = "unknown";
+     }) {};
+
   "gridland" = callPackage
     ({ mkDerivation, array, astar, base, containers, grid, htiled, mtl
      , random, safe, SDL, SDL-gfx, SDL-image, SDL-mixer, tuple, vector
@@ -91946,6 +92366,21 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hakyll-filestore" = callPackage
+    ({ mkDerivation, base, filestore, hakyll, time, time-locale-compat
+     }:
+     mkDerivation {
+       pname = "hakyll-filestore";
+       version = "0.1.0";
+       sha256 = "3e7c848197a12c83af870000a78ffa89e77eb55b13f957c2a4cc8491d9351b60";
+       libraryHaskellDepends = [
+         base filestore hakyll time time-locale-compat
+       ];
+       homepage = "https://gitlab.com/aergus/hakyll-filestore";
+       description = "FileStore utilities for Hakyll";
+       license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
   "hakyll-sass" = callPackage
     ({ mkDerivation, base, data-default-class, filepath, hakyll, hsass
      }:
@@ -92632,7 +93067,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "happstack-authenticate" = callPackage
+  "happstack-authenticate_2_3_3" = callPackage
     ({ mkDerivation, acid-state, aeson, authenticate, base
      , base64-bytestring, boomerang, bytestring, containers
      , data-default, email-validate, filepath, happstack-hsp
@@ -92659,6 +93094,36 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "Happstack Authentication Library";
        license = stdenv.lib.licenses.bsd3;
+       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";
+       sha256 = "e844770a331e5a9fcd64e62ccaaf5c6509afed01ed871306e6da630b48b8be43";
+       libraryHaskellDepends = [
+         acid-state aeson authenticate base base64-bytestring boomerang
+         bytestring containers data-default email-validate filepath
+         happstack-hsp happstack-jmacro happstack-server hsp hsx-jmacro
+         hsx2hs http-conduit http-types ixset-typed jmacro jwt lens
+         mime-mail mtl pwstore-purehaskell random safecopy shakespeare text
+         time unordered-containers userid web-routes web-routes-boomerang
+         web-routes-happstack web-routes-hsp web-routes-th
+       ];
+       homepage = "http://www.happstack.com/";
+       description = "Happstack Authentication Library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "happstack-clientsession" = callPackage
@@ -94920,7 +95385,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "haskell-neo4j-client" = callPackage
+  "haskell-neo4j-client_0_3_2_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, Cabal, containers
      , data-default, hashable, HTTP, http-client, http-conduit
      , http-types, HUnit, lifted-base, mtl, network-uri, QuickCheck
@@ -94950,6 +95415,39 @@ self: {
        homepage = "https://github.com/asilvestre/haskell-neo4j-rest-client";
        description = "A Haskell neo4j client";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "haskell-neo4j-client" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, Cabal, containers
+     , data-default, hashable, HTTP, http-client, http-conduit
+     , http-types, HUnit, lifted-base, mtl, network-uri, QuickCheck
+     , resourcet, scientific, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, test-framework-th, text, transformers
+     , transformers-base, transformers-compat, unordered-containers
+     , vector
+     }:
+     mkDerivation {
+       pname = "haskell-neo4j-client";
+       version = "0.3.2.1";
+       sha256 = "9485f69dee0c77ca08d51108188440a2696ef2ba08e7b45237fb38c523623d73";
+       libraryHaskellDepends = [
+         aeson base bytestring containers data-default hashable HTTP
+         http-client http-conduit http-types lifted-base mtl network-uri
+         resourcet scientific text transformers transformers-base
+         transformers-compat unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring Cabal data-default hashable HTTP http-client
+         http-conduit http-types HUnit lifted-base mtl network-uri
+         QuickCheck resourcet scientific test-framework test-framework-hunit
+         test-framework-quickcheck2 test-framework-th text transformers
+         transformers-base transformers-compat unordered-containers vector
+       ];
+       doCheck = false;
+       homepage = "https://github.com/asilvestre/haskell-neo4j-rest-client";
+       description = "A Haskell neo4j client";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "haskell-openflow" = callPackage
@@ -97033,8 +97531,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql";
-       version = "0.19.7";
-       sha256 = "d7fd13c5b31de9e0df8531915de9e50087dd97560b1e9d8a82b8279e1763c239";
+       version = "0.19.8";
+       sha256 = "34eaaa18216ba49621f7cf4ae5202299c8e2b57b460ac45a8dc161a159a564d1";
        libraryHaskellDepends = [
          aeson attoparsec base base-prelude bytestring contravariant
          contravariant-extras data-default-class dlist either hashable
@@ -97054,38 +97552,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hasql_0_19_8" = callPackage
-    ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
-     , contravariant, contravariant-extras, data-default-class, dlist
-     , either, hashable, hashtables, loch-th, mtl, placeholders
-     , postgresql-binary, postgresql-libpq, profunctors, QuickCheck
-     , quickcheck-instances, scientific, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, text, time, transformers
-     , uuid, vector
-     }:
-     mkDerivation {
-       pname = "hasql";
-       version = "0.19.8";
-       sha256 = "34eaaa18216ba49621f7cf4ae5202299c8e2b57b460ac45a8dc161a159a564d1";
-       libraryHaskellDepends = [
-         aeson attoparsec base base-prelude bytestring contravariant
-         contravariant-extras data-default-class dlist either hashable
-         hashtables loch-th mtl placeholders postgresql-binary
-         postgresql-libpq profunctors scientific text time transformers uuid
-         vector
-       ];
-       testHaskellDepends = [
-         base base-prelude bytestring contravariant contravariant-extras
-         data-default-class dlist either hashable profunctors QuickCheck
-         quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
-         tasty-smallcheck text time transformers uuid vector
-       ];
-       homepage = "https://github.com/nikita-volkov/hasql";
-       description = "A very efficient PostgreSQL driver and a flexible mapping API";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "hasql-backend_0_2_1" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, list-t, text
      , vector
@@ -97195,6 +97661,7 @@ self: {
        libraryHaskellDepends = [
          base-prelude bytestring either free list-t text transformers vector
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/nikita-volkov/hasql-backend";
        description = "API for backends of \"hasql\"";
@@ -97212,6 +97679,7 @@ self: {
        libraryHaskellDepends = [
          base-prelude hasql hasql-pool optparse-applicative
        ];
+       jailbreak = true;
        homepage = "https://github.com/sannsyn/hasql-optparse-applicative";
        description = "\"optparse-applicative\" parsers for \"hasql\"";
        license = stdenv.lib.licenses.mit;
@@ -97224,6 +97692,7 @@ self: {
        version = "0.4";
        sha256 = "6bb18b7f41a471e0260a60ecd0a4495ccef111e3151d0b3e55ae5e3865c3850e";
        libraryHaskellDepends = [ base-prelude hasql resource-pool time ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/hasql-pool";
        description = "A pool of connections for Hasql";
        license = stdenv.lib.licenses.mit;
@@ -97562,6 +98031,7 @@ self: {
        libraryHaskellDepends = [
          base-prelude hasql-postgres optparse-applicative
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/hasql-postgres-options";
        description = "An \"optparse-applicative\" parser for \"hasql-postgres\"";
        license = stdenv.lib.licenses.mit;
@@ -97578,6 +98048,7 @@ self: {
        libraryHaskellDepends = [
          base-prelude bytestring template-haskell text
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/hasql-th";
        description = "Template Haskell utilities for Hasql";
        license = stdenv.lib.licenses.mit;
@@ -97598,6 +98069,7 @@ self: {
          contravariant-extras either hasql mtl postgresql-error-codes
          transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/hasql-transaction";
        description = "A composable abstraction over the retryable transactions for Hasql";
        license = stdenv.lib.licenses.mit;
@@ -98521,19 +98993,20 @@ self: {
      }) {};
 
   "hcoap" = callPackage
-    ({ mkDerivation, async, base, binary, bytestring, HUnit, mtl
-     , network, QuickCheck, random, stm, time
+    ({ mkDerivation, async, base, binary, bytestring, dns, HUnit
+     , iproute, mtl, network, network-uri, QuickCheck, random, stm, time
      }:
      mkDerivation {
        pname = "hcoap";
-       version = "0.1.1.0";
-       sha256 = "95cbfdd22d8e41da208f5bc8aafcc252e215b56df5db4163401f0f8c71504d8d";
+       version = "0.1.2.1";
+       sha256 = "eb7c7d22922b758708c4789d53f237b251718a64d163e13807787ad8213782d6";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         async base binary bytestring mtl network random stm time
+         async base binary bytestring dns iproute mtl network network-uri
+         random stm time
        ];
-       executableHaskellDepends = [ base bytestring network ];
+       executableHaskellDepends = [ base bytestring network network-uri ];
        testHaskellDepends = [
          async base bytestring HUnit network QuickCheck random
        ];
@@ -100746,6 +101219,7 @@ self: {
          base binary bytestring monad-control mtl network resource-pool
          transformers transformers-base unordered-containers
        ];
+       jailbreak = true;
        description = "A Gearman client for Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -101441,8 +101915,8 @@ self: {
      }:
      mkDerivation {
        pname = "hills";
-       version = "0.1.2";
-       sha256 = "819b990d61f1a42d7d7033950f785412a6dcdb8e62cb5ed1fbf82ff0428f746c";
+       version = "0.1.2.1";
+       sha256 = "cf5e5c6a00e48b70c099e2259b4af0f4340f07feb1e3cbe08e3c2e0045f40ca1";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -102508,21 +102982,24 @@ self: {
      }) {};
 
   "hjsonpointer" = callPackage
-    ({ mkDerivation, aeson, base, http-types, HUnit, test-framework
-     , test-framework-hunit, text, unordered-containers, vector
+    ({ mkDerivation, aeson, base, http-types, HUnit, QuickCheck
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , text, unordered-containers, vector
      }:
      mkDerivation {
        pname = "hjsonpointer";
-       version = "0.2.0.4";
-       sha256 = "8ac317938cc885b01d1165f15671def24e6ceac971413bd494195e77fe0e45b0";
+       version = "0.3.0.0";
+       sha256 = "9d6ae61f5be1e538a50e1f386b45af3dfb20b0199c61c2b2a643f592f0c78915";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         aeson base text unordered-containers vector
+         aeson base QuickCheck text unordered-containers vector
        ];
+       executableHaskellDepends = [ aeson base ];
        testHaskellDepends = [
          aeson base http-types HUnit test-framework test-framework-hunit
-         text unordered-containers vector
+         test-framework-quickcheck2 text unordered-containers vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/seagreen/hjsonpointer";
        description = "JSON Pointer library";
        license = stdenv.lib.licenses.mit;
@@ -102553,6 +103030,7 @@ self: {
          aeson async base bytestring directory filepath HUnit test-framework
          test-framework-hunit text vector wai-app-static warp
        ];
+       jailbreak = true;
        homepage = "https://github.com/seagreen/hjsonschema";
        description = "JSON Schema library";
        license = stdenv.lib.licenses.mit;
@@ -104597,7 +105075,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hoauth2" = callPackage
+  "hoauth2_0_5_2" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, http-conduit
      , http-types, text, wai, warp
      }:
@@ -104617,6 +105095,29 @@ self: {
        homepage = "https://github.com/freizl/hoauth2";
        description = "Haskell OAuth2 authentication client";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hoauth2" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, http-conduit
+     , http-types, text, wai, warp
+     }:
+     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;
      }) {};
 
   "hob" = callPackage
@@ -106324,13 +106825,13 @@ self: {
 
   "hpack" = callPackage
     ({ mkDerivation, aeson, aeson-qq, base, base-compat, deepseq
-     , directory, filepath, Glob, hspec, interpolate, mockery, text
-     , unordered-containers, yaml
+     , directory, filepath, Glob, hspec, interpolate, mockery, temporary
+     , text, unordered-containers, yaml
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.8.0";
-       sha256 = "cd5f5cac842cfedb187f25b8932020e6f9e7c287d0477393330050af0d8e20db";
+       version = "0.9.0";
+       sha256 = "8f8f40556c84e949895c50253c2d84c758ac8d452921a6e3ddd5dd6daeadc8a2";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -106343,8 +106844,9 @@ self: {
        ];
        testHaskellDepends = [
          aeson aeson-qq base base-compat deepseq directory filepath Glob
-         hspec interpolate mockery text unordered-containers yaml
+         hspec interpolate mockery temporary text unordered-containers yaml
        ];
+       jailbreak = true;
        homepage = "https://github.com/sol/hpack#readme";
        description = "An alternative format for Haskell packages";
        license = stdenv.lib.licenses.mit;
@@ -106575,6 +107077,22 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hpdft" = callPackage
+    ({ mkDerivation, base, bytestring, directory, parsec, text
+     , utf8-string, zlib
+     }:
+     mkDerivation {
+       pname = "hpdft";
+       version = "0.1.0.1";
+       sha256 = "eef161524fb320b84fa9183c804a08bf2a3442308f226790f5b3f9c16055b5be";
+       libraryHaskellDepends = [
+         base bytestring directory parsec text utf8-string zlib
+       ];
+       homepage = "https://github.com/k16shikano/hpdft";
+       description = "tools to poke pdf using haskell";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hplayground" = callPackage
     ({ mkDerivation, base, containers, data-default, haste-compiler
      , haste-perch, monads-tf, transformers
@@ -108535,8 +109053,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.1.6.0";
-       sha256 = "93a1bd6462f45d9abf39cba0479f519f562c62d4bc30a3df3153314b7d300345";
+       version = "0.1.6.3";
+       sha256 = "57e43ec24f607dee63ebf9655b30ceafe4c80967b88a5739da806a37633221ab";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -110342,7 +110860,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "hspec-megaparsec" = callPackage
+  "hspec-megaparsec_0_1_0" = callPackage
     ({ mkDerivation, base, hspec, hspec-expectations, megaparsec }:
      mkDerivation {
        pname = "hspec-megaparsec";
@@ -110353,6 +110871,20 @@ self: {
        homepage = "https://github.com/mrkkrp/hspec-megaparsec";
        description = "Utility functions for testing Megaparsec parsers with Hspec";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hspec-megaparsec" = callPackage
+    ({ mkDerivation, base, hspec, hspec-expectations, megaparsec }:
+     mkDerivation {
+       pname = "hspec-megaparsec";
+       version = "0.1.1";
+       sha256 = "4ff4683bdff9a3b0ba8a6ee1adfce01f30f8515f9db487b062e5e00e5a2795c5";
+       libraryHaskellDepends = [ base hspec-expectations megaparsec ];
+       testHaskellDepends = [ base hspec hspec-expectations megaparsec ];
+       homepage = "https://github.com/mrkkrp/hspec-megaparsec";
+       description = "Utility functions for testing Megaparsec parsers with Hspec";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hspec-meta_2_0_0" = callPackage
@@ -111820,6 +112352,7 @@ self: {
        testHaskellDepends = [
          base base-prelude directory doctest filepath
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/html-tokenizer";
        description = "An \"attoparsec\"-based HTML tokenizer";
        license = stdenv.lib.licenses.mit;
@@ -113338,12 +113871,11 @@ self: {
        pname = "http-encodings";
        version = "0.9.3";
        sha256 = "76dbd6c38d885cc6d260b59945cc0cd6c6087bb078a01be5384a2e2f14fe492c";
-       revision = "2";
-       editedCabalFile = "0370852e7250c2c2bb1575155286442cbfcdd03a7e494dcaa73305d4e84a6c76";
+       revision = "3";
+       editedCabalFile = "5d6088d3d3691cec6febb92f81d5034a69bcf6d319230d5a478d79cb79b0e6f9";
        libraryHaskellDepends = [
          base bytestring HTTP iconv mime mtl parsec text utf8-string zlib
        ];
-       jailbreak = true;
        homepage = "http://github.com/achudnov/http-encodings";
        description = "A library for encoding and decoding bodies of HTTP messages";
        license = stdenv.lib.licenses.bsd3;
@@ -117690,6 +118222,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "imap" = callPackage
+    ({ mkDerivation, attoparsec, base, bytestring, connection
+     , data-default, derive, either, exceptions, hslogger, HUnit, list-t
+     , monadIO, mtl, QuickCheck, random, rolling-queue, stm, stm-delay
+     , tasty, tasty-hunit, tasty-quickcheck, text, transformers, word8
+     }:
+     mkDerivation {
+       pname = "imap";
+       version = "0.2.0.3";
+       sha256 = "912e050ba15043cbc05782bd5a6069d249402f86a41d17e0761fd6153a5a5f88";
+       libraryHaskellDepends = [
+         attoparsec base bytestring connection data-default derive either
+         exceptions hslogger list-t monadIO random rolling-queue stm
+         stm-delay text transformers word8
+       ];
+       testHaskellDepends = [
+         attoparsec base bytestring connection data-default derive either
+         exceptions hslogger HUnit list-t monadIO mtl QuickCheck random
+         rolling-queue stm stm-delay tasty tasty-hunit tasty-quickcheck text
+         transformers word8
+       ];
+       description = "An efficient IMAP client library, with SSL and streaming";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "imapget" = callPackage
     ({ mkDerivation, base, bytestring, directory, HaskellNet, HsOpenSSL
      , network, text
@@ -118297,12 +118854,13 @@ self: {
      }) {};
 
   "inf-interval" = callPackage
-    ({ mkDerivation, array, base, deepseq, vector }:
+    ({ mkDerivation, array, base, deepseq, QuickCheck, text, vector }:
      mkDerivation {
        pname = "inf-interval";
-       version = "0.1.0.0";
-       sha256 = "817494d30f229c50dd47b501bfa832bf873f1b90ccdeba844cc50445f0c8791b";
+       version = "0.1.0.1";
+       sha256 = "7a636cd2a8ba6394fa104f24215b0dc59da0377b47d2d1296b477737e34cb59c";
        libraryHaskellDepends = [ array base deepseq vector ];
+       testHaskellDepends = [ array base deepseq QuickCheck text vector ];
        jailbreak = true;
        homepage = "https://github.com/RaminHAL9001/inf-interval";
        description = "Non-contiguous interval data types with potentially infinite ranges";
@@ -121796,22 +122354,22 @@ self: {
      }) {};
 
   "jsaddle" = callPackage
-    ({ mkDerivation, base, glib, gtk3, hslogger, lens, template-haskell
-     , text, transformers, webkitgtk3, webkitgtk3-javascriptcore
+    ({ mkDerivation, base, doctest, glib, gtk3, lens, QuickCheck
+     , template-haskell, text, transformers, vector, webkitgtk3
+     , webkitgtk3-javascriptcore
      }:
      mkDerivation {
        pname = "jsaddle";
-       version = "0.2.1.0";
-       sha256 = "3aebcb9422803265598a027f1e8a63f0f41176a0efdb436bf502d61102754513";
+       version = "0.3.0.1";
+       sha256 = "91511d9b4df73285f0f060418697028bc5384022da93d6dd9b5573214020aaaf";
        libraryHaskellDepends = [
-         base lens template-haskell text transformers webkitgtk3
+         base glib gtk3 lens template-haskell text transformers webkitgtk3
          webkitgtk3-javascriptcore
        ];
        testHaskellDepends = [
-         base glib gtk3 hslogger lens template-haskell text transformers
-         webkitgtk3 webkitgtk3-javascriptcore
+         base doctest glib gtk3 QuickCheck text vector webkitgtk3
+         webkitgtk3-javascriptcore
        ];
-       jailbreak = true;
        description = "High level interface for webkit-javascriptcore";
        license = stdenv.lib.licenses.mit;
      }) {};
@@ -122191,6 +122749,7 @@ self: {
          base-prelude bytestring bytestring-tree-builder contravariant
          contravariant-extras scientific semigroups text
        ];
+       jailbreak = true;
        homepage = "https://github.com/sannsyn/json-encoder";
        description = "A direct-to-bytes single-pass JSON encoder with a declarative DSL";
        license = stdenv.lib.licenses.mit;
@@ -122274,9 +122833,10 @@ self: {
     ({ mkDerivation, attoparsec, base-prelude, text }:
      mkDerivation {
        pname = "json-pointer";
-       version = "0.1";
-       sha256 = "2ed39be2da3f9f552fd0897028230236ca82c302c23c087d528b52550bba23c4";
+       version = "0.1.1";
+       sha256 = "443221a71faa40a5eddf8865a3219b5f48086a4c62efcdea9d468ae934410ee3";
        libraryHaskellDepends = [ attoparsec base-prelude text ];
+       jailbreak = true;
        homepage = "https://github.com/sannsyn/json-pointer";
        description = "JSON Pointer parsing and interpretation utilities";
        license = stdenv.lib.licenses.mit;
@@ -122951,8 +123511,8 @@ self: {
      }:
      mkDerivation {
        pname = "judy";
-       version = "0.2.3";
-       sha256 = "5032d97c798d038ab1991d8bb239c9c1c71ae88bcc396ad8944252b0c5019ca9";
+       version = "0.3.0";
+       sha256 = "f483c31bcab0383a9db31ec41b527b3125e12ea302e126ec3ce45d2bb6a2cb9d";
        libraryHaskellDepends = [ base bytestring ghc-prim ];
        librarySystemDepends = [ Judy ];
        testHaskellDepends = [ base hspec QuickCheck ];
@@ -123036,6 +123596,7 @@ self: {
          QuickCheck scientific semigroups tasty tasty-hunit tasty-quickcheck
          tasty-th text time unordered-containers vector
        ];
+       doCheck = false;
        homepage = "https://bitbucket.org/ssaasen/haskell-jwt";
        description = "JSON Web Token (JWT) decoding and encoding";
        license = stdenv.lib.licenses.mit;
@@ -123221,6 +123782,20 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "kanji" = callPackage
+    ({ mkDerivation, base, bytestring, containers, microlens, text }:
+     mkDerivation {
+       pname = "kanji";
+       version = "1.0.0";
+       sha256 = "fbee1da853ed627eed6236a1c33086a8ce4ae541fe070aa5ca4c3847928d0c2a";
+       libraryHaskellDepends = [
+         base bytestring containers microlens text
+       ];
+       homepage = "https://github.com/fosskers/nanq";
+       description = "Perform 漢字検定 (National Kanji Exam) level analysis on Japanese Kanji";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "kansas-comet_0_3_1" = callPackage
     ({ mkDerivation, aeson, base, containers, data-default, scotty, stm
      , text, time, transformers, unordered-containers
@@ -123248,8 +123823,8 @@ self: {
        pname = "kansas-comet";
        version = "0.4";
        sha256 = "1f1a4565f2e955b8947bafcb9611789b0ccdf9efdfed8aaa2a2aa162a07339e1";
-       revision = "3";
-       editedCabalFile = "94126550ee61faf694feaf83218fb9ff4a15dbe08d66403f2833167378842115";
+       revision = "5";
+       editedCabalFile = "4f00c7ffbc136b1d6176804ddd8214e169e13419ff6c81816e128784ef501cbd";
        libraryHaskellDepends = [
          aeson base containers data-default-class scotty stm text time
          transformers unordered-containers
@@ -124390,8 +124965,8 @@ self: {
      }:
      mkDerivation {
        pname = "kicad-data";
-       version = "0.2.0.0";
-       sha256 = "436e0187e8df0a0aae2ba5827c0b607334237f9719475ea1fad626f9aea55e06";
+       version = "0.3.0.0";
+       sha256 = "6270a5f62dad9920ca169c1c8867f6ba0d2d36e64299cada90d526b4c73d3ee7";
        libraryHaskellDepends = [
          base ieee754 lens-family parsec parsec-numbers pretty-compact
        ];
@@ -125493,8 +126068,8 @@ self: {
      }:
      mkDerivation {
        pname = "lambdacube-compiler";
-       version = "0.4.0.0";
-       sha256 = "745a5593e7a8bf9af194c747a62ad32e16076156841863093b6aefb032b5ac74";
+       version = "0.4.0.1";
+       sha256 = "4487798702474096e80a7b0582dc9e2feceef4f82155d65226da474e40f7e4b3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -125507,7 +126082,7 @@ self: {
          optparse-applicative parsec pretty-compact QuickCheck tasty
          tasty-quickcheck text time vector
        ];
-       jailbreak = true;
+       doHaddock = false;
        homepage = "http://lambdacube3d.com";
        description = "LambdaCube 3D is a DSL to program GPUs";
        license = stdenv.lib.licenses.bsd3;
@@ -125598,6 +126173,7 @@ self: {
          base bytestring containers JuicyPixels lambdacube-ir mtl OpenGLRaw
          vector vector-algorithms
        ];
+       doHaddock = false;
        homepage = "http://lambdacube3d.com";
        description = "OpenGL 3.3 Core Profile backend for LambdaCube 3D";
        license = stdenv.lib.licenses.bsd3;
@@ -130952,7 +131528,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "list-t" = callPackage
+  "list-t_0_4_5_1" = callPackage
     ({ mkDerivation, base-prelude, HTF, mmorph, monad-control, mtl
      , mtl-prelude, transformers, transformers-base
      }:
@@ -130970,9 +131546,10 @@ self: {
        homepage = "https://github.com/nikita-volkov/list-t";
        description = "ListT done right";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "list-t_0_4_6" = callPackage
+  "list-t" = callPackage
     ({ mkDerivation, base-prelude, HTF, mmorph, monad-control, mtl
      , mtl-prelude, transformers, transformers-base
      }:
@@ -130985,10 +131562,10 @@ self: {
          transformers-base
        ];
        testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
+       doCheck = false;
        homepage = "https://github.com/nikita-volkov/list-t";
        description = "ListT done right";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "list-t-attoparsec" = callPackage
@@ -131048,6 +131625,7 @@ self: {
        libraryHaskellDepends = [
          base-prelude bytestring http-client list-t mtl-prelude
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/list-t-http-client";
        description = "A streaming HTTP client";
        license = stdenv.lib.licenses.mit;
@@ -131065,6 +131643,7 @@ self: {
          base base-prelude bytestring curlhs either list-t mtl-prelude
          resource-pool stm
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/list-t-libcurl";
        description = "A \"libcurl\"-based streaming HTTP client";
        license = stdenv.lib.licenses.mit;
@@ -132289,6 +132868,18 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "logict-state" = callPackage
+    ({ mkDerivation, base, logict, mtl, transformers }:
+     mkDerivation {
+       pname = "logict-state";
+       version = "0.1.0.0";
+       sha256 = "8b4ac063ffada947bfb853c5a4f9e144ad7aba0dbc1e3be3d662a83c19450ad8";
+       libraryHaskellDepends = [ base logict mtl transformers ];
+       homepage = "https://github.com/atzedijkstra/logict-state";
+       description = "Library for logic programming based on haskell package logict";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "logplex-parse" = callPackage
     ({ mkDerivation, base, hspec, iso8601-time, parsec, text, time }:
      mkDerivation {
@@ -132384,36 +132975,57 @@ self: {
      }) {};
 
   "lol" = callPackage
-    ({ mkDerivation, arithmoi, base, constraints, containers
-     , data-default, deepseq, MonadRandom, mtl, numeric-prelude
-     , QuickCheck, random, reflection, repa, singletons, storable-record
-     , storable-tuple, tagged-transformer, test-framework
-     , test-framework-quickcheck2, th-desugar, time, transformers
-     , type-natural, vector, vector-th-unbox
+    ({ 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
      }:
      mkDerivation {
        pname = "lol";
-       version = "0.1.0.0";
-       sha256 = "be1a72e80ca1f3471b1b630f0407fa6e152ce6410ea7aee86fabda002dff12d0";
-       revision = "1";
-       editedCabalFile = "f70d927711c82b11f9d38d398bf8d450788482693cdbde540331ca50674b8e68";
+       version = "0.2.0.0";
+       sha256 = "8787dde0e356a8d436fc6dcea548098bb9e92237fc138701582e2f5eabbce564";
        libraryHaskellDepends = [
-         arithmoi base constraints containers data-default deepseq
-         MonadRandom mtl numeric-prelude QuickCheck random reflection repa
-         singletons storable-record storable-tuple tagged-transformer
-         th-desugar transformers type-natural vector vector-th-unbox
+         arithmoi base binary bytestring constraints containers crypto-api
+         data-default deepseq MonadRandom mtl numeric-prelude QuickCheck
+         random reflection repa singletons storable-record
+         tagged-transformer template-haskell th-desugar transformers vector
+         vector-th-unbox
        ];
        testHaskellDepends = [
-         base constraints MonadRandom QuickCheck repa test-framework
-         test-framework-quickcheck2 time type-natural vector
+         base constraints deepseq DRBG MonadRandom mtl QuickCheck random
+         repa singletons test-framework test-framework-quickcheck2 vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/cpeikert/Lol";
        description = "A library for lattice cryptography";
        license = stdenv.lib.licenses.gpl2;
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
+  "lol-apps" = callPackage
+    ({ mkDerivation, 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 = "1";
+       editedCabalFile = "60383b773f8b931df96fac94a014194fcbc8f7f31025471e49e39ffc2b991907";
+       libraryHaskellDepends = [
+         base deepseq lol MonadRandom numeric-prelude
+       ];
+       testHaskellDepends = [
+         base constraints deepseq DRBG lol MonadRandom mtl QuickCheck random
+         repa singletons test-framework test-framework-quickcheck2 vector
+       ];
+       homepage = "https://github.com/cpeikert/Lol";
+       description = "Lattice-based cryptographic applications using Lol";
+       license = stdenv.lib.licenses.gpl2;
+     }) {};
+
   "loli" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-default, hack
      , hack-contrib, mps, mtl, template, utf8-string
@@ -133148,7 +133760,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "luminance" = callPackage
+  "luminance_0_9_1_2" = callPackage
     ({ mkDerivation, base, containers, contravariant, dlist, gl, linear
      , mtl, resourcet, semigroups, transformers, vector, void
      }:
@@ -133163,6 +133775,24 @@ self: {
        homepage = "https://github.com/phaazon/luminance";
        description = "Type-safe, type-level and stateless graphics framework";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "luminance" = callPackage
+    ({ mkDerivation, base, containers, contravariant, dlist, gl, linear
+     , mtl, resourcet, semigroups, transformers, vector, void
+     }:
+     mkDerivation {
+       pname = "luminance";
+       version = "0.10.0.2";
+       sha256 = "1892608cde96e81a748c608118f380e8b125f3653af1d743a9ee6ee9a8adb46e";
+       libraryHaskellDepends = [
+         base containers contravariant dlist gl linear mtl resourcet
+         semigroups transformers vector void
+       ];
+       homepage = "https://github.com/phaazon/luminance";
+       description = "Type-safe, type-level and stateless graphics framework";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "luminance-samples_0_9" = callPackage
@@ -133186,7 +133816,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "luminance-samples" = callPackage
+  "luminance-samples_0_9_1" = callPackage
     ({ mkDerivation, base, contravariant, GLFW-b, JuicyPixels, linear
      , luminance, mtl, resourcet, transformers
      }:
@@ -133200,6 +133830,27 @@ self: {
          base contravariant GLFW-b JuicyPixels linear luminance mtl
          resourcet transformers
        ];
+       jailbreak = true;
+       homepage = "https://github.com/phaazon/luminance-samples";
+       description = "Luminance samples";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "luminance-samples" = callPackage
+    ({ mkDerivation, base, contravariant, GLFW-b, JuicyPixels, linear
+     , luminance, mtl, resourcet, transformers
+     }:
+     mkDerivation {
+       pname = "luminance-samples";
+       version = "0.10";
+       sha256 = "c3f0fec69567be8d32c7a913c4dd9241908666447bfc492cdd24810d4b245d2a";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base contravariant GLFW-b JuicyPixels linear luminance mtl
+         resourcet transformers
+       ];
        homepage = "https://github.com/phaazon/luminance-samples";
        description = "Luminance samples";
        license = stdenv.lib.licenses.bsd3;
@@ -134989,8 +135640,8 @@ self: {
      }:
      mkDerivation {
        pname = "mappy";
-       version = "0.1.3.0";
-       sha256 = "6446e847c2663f752184b81c9e4f541bc7ada3fc0a8bcde9435a20363a3b72cb";
+       version = "0.1.3.1";
+       sha256 = "91ddbde2da1c972ec53a92f25d43e5db052b029a77f7b029b3389cae1b938645";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -135865,6 +136516,8 @@ self: {
        pname = "mbox";
        version = "0.3.1";
        sha256 = "d172b9d4c57b1138fb27931281deb7562e98312698b5bd784f6c71800434188e";
+       revision = "1";
+       editedCabalFile = "3d9d819d61351a5adfac1a1224ac81049fa7d809f101070477e28e58d488abb3";
        libraryHaskellDepends = [ base safe text time time-locale-compat ];
        description = "Read and write standard mailbox files";
        license = stdenv.lib.licenses.bsd3;
@@ -136212,6 +136865,29 @@ self: {
        license = stdenv.lib.licenses.bsd2;
      }) {};
 
+  "megaparsec_4_4_0" = callPackage
+    ({ mkDerivation, base, bytestring, fail, HUnit, mtl, QuickCheck
+     , semigroups, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, transformers
+     }:
+     mkDerivation {
+       pname = "megaparsec";
+       version = "4.4.0";
+       sha256 = "93addf2a1cf14cb88fd67ea9951d8dd76bcb75960936a517b13787ed0e26f310";
+       libraryHaskellDepends = [
+         base bytestring fail mtl semigroups text transformers
+       ];
+       testHaskellDepends = [
+         base HUnit mtl QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 transformers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/mrkkrp/megaparsec";
+       description = "Monadic parser combinators";
+       license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "meldable-heap" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -136585,6 +137261,7 @@ self: {
          base bytestring cereal containers QuickCheck test-framework
          test-framework-quickcheck2 test-framework-th
        ];
+       doCheck = false;
        homepage = "https://github.com/rodrigosetti/messagepack";
        description = "Serialize instance for Message Pack Object";
        license = stdenv.lib.licenses.mit;
@@ -136958,7 +137635,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "microlens" = callPackage
+  "microlens_0_4_1_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "microlens";
@@ -136968,6 +137645,19 @@ self: {
        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.2.0";
+       sha256 = "db38765f93e58074475ed50b1e8e941d1fe3396566fd69f809ae954b5d43640c";
+       libraryHaskellDepends = [ base ];
+       homepage = "http://github.com/aelve/microlens";
+       description = "A tiny part of the lens library with no dependencies";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "microlens-aeson_2_1_0" = callPackage
@@ -137073,7 +137763,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "microlens-ghc" = callPackage
+  "microlens-ghc_0_4_1_0" = callPackage
     ({ mkDerivation, array, base, bytestring, containers, microlens
      , transformers
      }:
@@ -137084,6 +137774,24 @@ self: {
        libraryHaskellDepends = [
          array base bytestring containers microlens transformers
        ];
+       jailbreak = true;
+       homepage = "http://github.com/aelve/microlens";
+       description = "microlens + array, bytestring, containers, transformers";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "microlens-ghc" = callPackage
+    ({ mkDerivation, array, base, bytestring, containers, microlens
+     , transformers
+     }:
+     mkDerivation {
+       pname = "microlens-ghc";
+       version = "0.4.2.0";
+       sha256 = "65c98674708c55de5a0b9c0913b903f906e4313184b798652817a4205f25b35e";
+       libraryHaskellDepends = [
+         array base bytestring containers microlens transformers
+       ];
        homepage = "http://github.com/aelve/microlens";
        description = "microlens + array, bytestring, containers, transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -137178,7 +137886,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "microlens-platform" = callPackage
+  "microlens-platform_0_2_2_0" = callPackage
     ({ mkDerivation, base, hashable, microlens, microlens-ghc
      , microlens-mtl, microlens-th, text, unordered-containers, vector
      }:
@@ -137190,6 +137898,25 @@ self: {
          base hashable microlens microlens-ghc microlens-mtl microlens-th
          text unordered-containers vector
        ];
+       jailbreak = true;
+       homepage = "http://github.com/aelve/microlens";
+       description = "Feature-complete microlens";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "microlens-platform" = callPackage
+    ({ mkDerivation, base, hashable, microlens, microlens-ghc
+     , microlens-mtl, microlens-th, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "microlens-platform";
+       version = "0.2.3.0";
+       sha256 = "94ad65919ed029a46884a941ba854a836047d059aee6372f6f3915b0d2c86799";
+       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;
@@ -137245,7 +137972,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "microlens-th" = callPackage
+  "microlens-th_0_3_0_0" = callPackage
     ({ mkDerivation, base, containers, microlens, template-haskell }:
      mkDerivation {
        pname = "microlens-th";
@@ -137259,9 +137986,10 @@ self: {
        homepage = "http://github.com/aelve/microlens";
        description = "Automatic generation of record lenses for microlens";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "microlens-th_0_3_0_1" = callPackage
+  "microlens-th" = callPackage
     ({ mkDerivation, base, containers, microlens, template-haskell }:
      mkDerivation {
        pname = "microlens-th";
@@ -137273,7 +138001,6 @@ self: {
        homepage = "http://github.com/aelve/microlens";
        description = "Automatic generation of record lenses for microlens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microtimer" = callPackage
@@ -137289,16 +138016,16 @@ self: {
      }) {};
 
   "mida" = callPackage
-    ({ mkDerivation, base, containers, directory, exceptions, filepath
-     , formatting, haskeline, HCodecs, megaparsec, mtl
-     , optparse-applicative, path, process, QuickCheck, random
-     , temporary, test-framework, test-framework-quickcheck2, text
-     , tf-random, transformers
+    ({ mkDerivation, aeson, base, containers, data-default, exceptions
+     , filepath, formatting, haskeline, HCodecs, megaparsec, mtl
+     , optparse-applicative, path, path-io, process, QuickCheck, random
+     , test-framework, test-framework-quickcheck2, text, tf-random
+     , transformers, yaml
      }:
      mkDerivation {
        pname = "mida";
-       version = "0.4.6";
-       sha256 = "453d24262084fbd34e5400599a739ae539f2601cefb9cd1aba0c462e9bf81838";
+       version = "1.0.0";
+       sha256 = "3fff0b1ce7fcbe948b7ec3f20868cdd7f8737c7eec1355355e0a13bb2fb340e4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -137306,9 +138033,9 @@ self: {
          text tf-random transformers
        ];
        executableHaskellDepends = [
-         base containers directory exceptions filepath formatting haskeline
-         HCodecs megaparsec mtl optparse-applicative path process random
-         temporary text tf-random transformers
+         aeson base containers data-default exceptions filepath formatting
+         haskeline HCodecs megaparsec mtl optparse-applicative path path-io
+         process random text tf-random transformers yaml
        ];
        testHaskellDepends = [
          base containers HCodecs megaparsec mtl QuickCheck random
@@ -137928,12 +138655,16 @@ self: {
      }) {};
 
   "minilens" = callPackage
-    ({ mkDerivation, array, base, containers, mtl, transformers }:
+    ({ mkDerivation, array, base, bytestring, containers, mtl
+     , semigroups, text, transformers
+     }:
      mkDerivation {
        pname = "minilens";
-       version = "0.1.1.1";
-       sha256 = "99586ecf220ec1a16c71b03df6da0439b4c711e4ae6b8510cea85473aa12da80";
-       libraryHaskellDepends = [ array base containers mtl transformers ];
+       version = "1.0.0.1";
+       sha256 = "581cd335de2ff83e384c7e250db208b884ac7c44163afacc731f855e2e8d06ce";
+       libraryHaskellDepends = [
+         array base bytestring containers mtl semigroups text transformers
+       ];
        jailbreak = true;
        homepage = "https://github.com/RaminHAL9001/minilens";
        description = "A minimalistic lens library, providing only the simplest, most basic lens functionality";
@@ -140530,8 +141261,8 @@ self: {
        pname = "mono-traversable";
        version = "0.6.3";
        sha256 = "79d2d0e50a71b0be4455b29a37f5416ee7e5ff7c88a6b5e1d6145113458cd808";
-       revision = "1";
-       editedCabalFile = "e576e7529ec57922cc6356c288f2ce5b80dbe7323e134fc5c268644c85385513";
+       revision = "2";
+       editedCabalFile = "b6d1d0b8f48138ce8d38b01862c556fa30e72198061f689bd020f8f1fe71d96e";
        libraryHaskellDepends = [
          base bytestring comonad containers dlist dlist-instances hashable
          semigroupoids semigroups text transformers unordered-containers
@@ -140557,8 +141288,8 @@ self: {
        pname = "mono-traversable";
        version = "0.7.0";
        sha256 = "2402b614158f72c2c7aff654d64036cebb223d2cb261813104064ce4f1d5a404";
-       revision = "1";
-       editedCabalFile = "0ee31ed93d111cf08f6b5323cd94f6f3a48388c53093ddc0731aeb8f0dad17ec";
+       revision = "2";
+       editedCabalFile = "e5ecd3bfd2c391001beaa042d93002c06b0e2ba676ee93cacd3de9143edd025c";
        libraryHaskellDepends = [
          base bytestring comonad containers dlist dlist-instances hashable
          semigroupoids semigroups text transformers unordered-containers
@@ -140584,8 +141315,8 @@ self: {
        pname = "mono-traversable";
        version = "0.9.1";
        sha256 = "ec7700a38f9838daa19a2828673620b6a57bffe4d5cf3b70ae6e4e1a1ba5f843";
-       revision = "1";
-       editedCabalFile = "28392123a8b245f7bc2c13bb63f5c3008118ed38e107cf0534be37461fb64daf";
+       revision = "2";
+       editedCabalFile = "94220a010929ffa4b669d797531cbd5b67ae4bbb7432a5b1b3b02f09065bc0c3";
        libraryHaskellDepends = [
          base bytestring comonad containers dlist dlist-instances hashable
          semigroupoids semigroups text transformers unordered-containers
@@ -140611,8 +141342,8 @@ self: {
        pname = "mono-traversable";
        version = "0.9.2.1";
        sha256 = "34c3827b49e47e83bdbed647ae6ca27e049be8887904007b57b03dc006b542ef";
-       revision = "1";
-       editedCabalFile = "ab0be6e2bbdc22be03cf722277972a7bd3c11732567fe33f7f12af56a09f533e";
+       revision = "2";
+       editedCabalFile = "4c2e3ae2b7520b1128c6c467a29bf4113f5e5d966a588a52179190df6637ce40";
        libraryHaskellDepends = [
          base bytestring comonad containers dlist dlist-instances hashable
          semigroupoids semigroups text transformers unordered-containers
@@ -140638,8 +141369,8 @@ self: {
        pname = "mono-traversable";
        version = "0.9.3";
        sha256 = "d73b495b65cdc3951e2407d07e46b3cb5b3ab074b474c0742687b616f4e7e4db";
-       revision = "1";
-       editedCabalFile = "021ce075d81cc8dbadfa395895ba0511fc35230f12e1ba409a553eded8c96d1f";
+       revision = "2";
+       editedCabalFile = "b9de7890b4bb32d2e6e41c6ef1d69e45b721a528350bf8d46acea645d627c9f5";
        libraryHaskellDepends = [
          base bytestring comonad containers dlist dlist-instances hashable
          semigroupoids semigroups split text transformers
@@ -140665,8 +141396,35 @@ self: {
        pname = "mono-traversable";
        version = "0.10.0.1";
        sha256 = "2e25c24ed3cf644cd4818cfb6d4e122cffcac2a375f0edb544b6814f871af45d";
+       revision = "2";
+       editedCabalFile = "00a92bc7f9dc2205d1a467ed3b9752787bc45793800eaf77a91f6bd9eee50584";
+       libraryHaskellDepends = [
+         base bytestring comonad containers dlist dlist-instances hashable
+         semigroupoids semigroups split text transformers
+         unordered-containers vector vector-algorithms vector-instances
+       ];
+       testHaskellDepends = [
+         base bytestring containers foldl hspec HUnit QuickCheck semigroups
+         text transformers unordered-containers vector
+       ];
+       homepage = "https://github.com/snoyberg/mono-traversable";
+       description = "Type classes for mapping, folding, and traversing monomorphic containers";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "mono-traversable_0_10_1" = callPackage
+    ({ mkDerivation, base, bytestring, comonad, containers, dlist
+     , dlist-instances, foldl, hashable, hspec, HUnit, QuickCheck
+     , semigroupoids, semigroups, split, text, transformers
+     , unordered-containers, vector, vector-algorithms, vector-instances
+     }:
+     mkDerivation {
+       pname = "mono-traversable";
+       version = "0.10.1";
+       sha256 = "a82e63352ed854319bca7d33e3aa13a42a18648e47d01109f8c306ee54b9418b";
        revision = "1";
-       editedCabalFile = "49283811dc1e565bdc4a3e7cfd2e3744866906e1267ffb018f3e271c05e2d169";
+       editedCabalFile = "9e3d9071851b695eeaa944b8ccecc3f0cad59961a4edb05fa15b4e37eed75235";
        libraryHaskellDepends = [
          base bytestring comonad containers dlist dlist-instances hashable
          semigroupoids semigroups split text transformers
@@ -140690,8 +141448,8 @@ self: {
      }:
      mkDerivation {
        pname = "mono-traversable";
-       version = "0.10.1";
-       sha256 = "a82e63352ed854319bca7d33e3aa13a42a18648e47d01109f8c306ee54b9418b";
+       version = "0.10.1.1";
+       sha256 = "a15fe3e4c92a6293a8959f77a6054ae85f5a1be049b2f7b07997245d6e6b574b";
        libraryHaskellDepends = [
          base bytestring comonad containers dlist dlist-instances hashable
          semigroupoids semigroups split text transformers
@@ -140757,7 +141515,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "monoid-extras" = callPackage
+  "monoid-extras_0_4_0_3" = callPackage
     ({ mkDerivation, base, groups, semigroupoids, semigroups }:
      mkDerivation {
        pname = "monoid-extras";
@@ -140766,6 +141524,18 @@ 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" = callPackage
+    ({ mkDerivation, base, groups, semigroupoids, semigroups }:
+     mkDerivation {
+       pname = "monoid-extras";
+       version = "0.4.0.4";
+       sha256 = "0032553ec9f06f62adc55d46a3b422497769e127cf74a427193bea1626c3b1e9";
+       libraryHaskellDepends = [ base groups semigroupoids semigroups ];
+       description = "Various extra monoid-related definitions and utilities";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "monoid-owns" = callPackage
@@ -141213,6 +141983,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "mountpoints" = callPackage
+    ({ mkDerivation, base }:
+     mkDerivation {
+       pname = "mountpoints";
+       version = "1.0.1";
+       sha256 = "744abbbda305c0765e15500f9ebf0ad2185fdea1733f43525488acb21b871c80";
+       libraryHaskellDepends = [ base ];
+       description = "list mount points";
+       license = "LGPL";
+     }) {};
+
   "mp" = callPackage
     ({ mkDerivation, base, binary, bytestring, ConfigFile, daemons
      , directory, filepath, glib, gstreamer, hgettext, MissingH, mtl
@@ -141952,15 +142733,17 @@ self: {
      }) {};
 
   "multiaddr" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, cereal, errors
-     , hashable, tasty, tasty-hunit, tasty-quickcheck, text
+    ({ mkDerivation, attoparsec, base, base58-bytestring, bytestring
+     , cereal, errors, hashable, tasty, tasty-hunit, tasty-quickcheck
+     , text
      }:
      mkDerivation {
        pname = "multiaddr";
-       version = "0.1.0";
-       sha256 = "704a76498f4b0e7078151771124ddb1f4facc6e6f3d2d068c2d2f4cc9ac96b8e";
+       version = "0.2.0";
+       sha256 = "fd8537d3598b92cd662efe6a41554aa88e8bb8f74fff6c1be1df65745d66c46d";
        libraryHaskellDepends = [
-         attoparsec base bytestring cereal errors hashable text
+         attoparsec base base58-bytestring bytestring cereal errors hashable
+         text
        ];
        testHaskellDepends = [
          base tasty tasty-hunit tasty-quickcheck text
@@ -142255,14 +143038,20 @@ self: {
      }) {};
 
   "multistate" = callPackage
-    ({ mkDerivation, base, hspec, mtl, tagged, transformers }:
+    ({ mkDerivation, base, hspec, monad-control, mtl, tagged
+     , transformers, transformers-base
+     }:
      mkDerivation {
        pname = "multistate";
-       version = "0.6.2.0";
-       sha256 = "72ffe698f15b9eb3d678f488f1f62cc8addb6bf4e5b23d9a26e28831d6031d69";
+       version = "0.7.0.0";
+       sha256 = "012cefe6afa33be2285c47538e6d79ba54bcb15328865751209cadbea2a38b75";
+       revision = "1";
+       editedCabalFile = "c0546d74f2bc0c476714677432693161d63956a2a23fc88a30f7c61239672a9b";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base mtl tagged transformers ];
+       libraryHaskellDepends = [
+         base monad-control mtl tagged transformers transformers-base
+       ];
        testHaskellDepends = [ base hspec transformers ];
        homepage = "https://github.com/lspitzner/multistate";
        description = "like mtl's ReaderT / WriterT / StateT, but more than one contained value/type";
@@ -142886,7 +143675,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mwc-probability" = callPackage
+  "mwc-probability_1_0_3" = callPackage
     ({ mkDerivation, base, mwc-random, primitive, transformers }:
      mkDerivation {
        pname = "mwc-probability";
@@ -142896,9 +143685,10 @@ self: {
        homepage = "http://github.com/jtobin/mwc-probability";
        description = "Sampling function-based probability distributions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mwc-probability_1_1_3" = callPackage
+  "mwc-probability" = callPackage
     ({ mkDerivation, base, mwc-random, primitive, transformers }:
      mkDerivation {
        pname = "mwc-probability";
@@ -142908,7 +143698,6 @@ self: {
        homepage = "http://github.com/jtobin/mwc-probability";
        description = "Sampling function-based probability distributions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mwc-random_0_13_2_2" = callPackage
@@ -142976,6 +143765,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "mwc-random_0_13_4_0" = callPackage
+    ({ mkDerivation, base, HUnit, primitive, QuickCheck, statistics
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , 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
+       ];
+       homepage = "https://github.com/bos/mwc-random";
+       description = "Fast, high quality pseudo random number generation";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "mwc-random-monad" = callPackage
     ({ mkDerivation, base, monad-primitive, mwc-random, primitive
      , transformers, vector
@@ -143537,21 +144346,18 @@ self: {
 
   "nanq" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers
-     , extensible-effects, microlens, microlens-aeson
+     , extensible-effects, kanji, microlens, microlens-aeson
      , optparse-applicative, text
      }:
      mkDerivation {
        pname = "nanq";
-       version = "2.0.0";
-       sha256 = "6ff8ecc49b4d98c22fcde78f9895f60e2144efaf9c5323d4f2352fe94b43638c";
-       isLibrary = true;
+       version = "3.0.0";
+       sha256 = "fd0ce6e40e6995521a97c0cbe13bd0260adfa21a76230f07cc17e299ca9c131c";
+       isLibrary = false;
        isExecutable = true;
-       libraryHaskellDepends = [
-         base bytestring containers microlens text
-       ];
        executableHaskellDepends = [
          aeson aeson-pretty base bytestring containers extensible-effects
-         microlens microlens-aeson optparse-applicative text
+         kanji microlens microlens-aeson optparse-applicative text
        ];
        homepage = "https://github.com/fosskers/nanq";
        description = "Performs 漢字検定 (National Kanji Exam) level analysis on given Kanji";
@@ -143968,6 +144774,7 @@ self: {
          base base-prelude parsec template-haskell
        ];
        testHaskellDepends = [ base-prelude HTF ];
+       jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/nikita-volkov/neat-interpolation";
        description = "A quasiquoter for neat and simple multiline text interpolation";
@@ -143975,7 +144782,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "neat-interpolation" = callPackage
+  "neat-interpolation_0_3" = callPackage
     ({ mkDerivation, base, base-prelude, HTF, parsec, template-haskell
      , text
      }:
@@ -143987,9 +144794,11 @@ self: {
          base base-prelude parsec template-haskell text
        ];
        testHaskellDepends = [ base-prelude HTF ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/neat-interpolation";
        description = "A quasiquoter for neat and simple multiline text interpolation";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "neat-interpolation_0_3_1" = callPackage
@@ -144010,6 +144819,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "neat-interpolation" = callPackage
+    ({ mkDerivation, base, base-prelude, HTF, parsec, template-haskell
+     , text
+     }:
+     mkDerivation {
+       pname = "neat-interpolation";
+       version = "0.3.1.1";
+       sha256 = "051a3ee1f9389e2ff1d05dc8f78fc3aae0e50be90ddee1868561ecac095469c9";
+       libraryHaskellDepends = [
+         base base-prelude parsec template-haskell text
+       ];
+       testHaskellDepends = [ base-prelude HTF ];
+       homepage = "https://github.com/nikita-volkov/neat-interpolation";
+       description = "A quasiquoter for neat and simple multiline text interpolation";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "needle" = callPackage
     ({ mkDerivation, base, containers, haskell-src-meta, mtl, parsec
      , parsec-extra, template-haskell, text, vector
@@ -145644,7 +146470,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "network-transport" = callPackage
+  "network-transport_0_4_2_0" = callPackage
     ({ mkDerivation, base, binary, bytestring, deepseq, hashable
      , transformers
      }:
@@ -145658,6 +146484,23 @@ self: {
        homepage = "http://haskell-distributed.github.com";
        description = "Network abstraction layer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "network-transport" = callPackage
+    ({ mkDerivation, base, binary, bytestring, deepseq, hashable
+     , transformers
+     }:
+     mkDerivation {
+       pname = "network-transport";
+       version = "0.4.3.1";
+       sha256 = "77fd80f672d6cabed4b60cc728f89543500080203cd91b76e07f814baabbd836";
+       libraryHaskellDepends = [
+         base binary bytestring deepseq hashable transformers
+       ];
+       homepage = "http://haskell-distributed.github.com";
+       description = "Network abstraction layer";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "network-transport-amqp" = callPackage
@@ -145762,6 +146605,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "network-transport-tcp_0_5_1" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-accessor
+     , network, network-transport, network-transport-tests
+     }:
+     mkDerivation {
+       pname = "network-transport-tcp";
+       version = "0.5.1";
+       sha256 = "c4c3d67d08f8213ebc99d369cfeb8813f9dd03def464d6097bed533bfbec7beb";
+       libraryHaskellDepends = [
+         base bytestring containers data-accessor network network-transport
+       ];
+       testHaskellDepends = [
+         base network network-transport network-transport-tests
+       ];
+       homepage = "http://haskell-distributed.github.com";
+       description = "TCP instantiation of Network.Transport";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "network-transport-tests_0_2_1_0" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, containers, mtl
      , network-transport, random
@@ -145781,7 +146644,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "network-transport-tests" = callPackage
+  "network-transport-tests_0_2_2_0" = callPackage
     ({ mkDerivation, ansi-terminal, base, bytestring, containers, mtl
      , network-transport, random
      }:
@@ -145796,6 +146659,24 @@ self: {
        homepage = "http://haskell-distributed.github.com";
        description = "Unit tests for Network.Transport implementations";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "network-transport-tests" = callPackage
+    ({ mkDerivation, ansi-terminal, base, bytestring, containers, mtl
+     , network-transport, random
+     }:
+     mkDerivation {
+       pname = "network-transport-tests";
+       version = "0.2.3.0";
+       sha256 = "8277bd97eb7d719891aa6494673506d0d3c7e135c4098f49e17f06b281f53b6c";
+       libraryHaskellDepends = [
+         ansi-terminal base bytestring containers mtl network-transport
+         random
+       ];
+       homepage = "http://haskell-distributed.github.com";
+       description = "Unit tests for Network.Transport implementations";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "network-transport-zeromq" = callPackage
@@ -146046,6 +146927,7 @@ self: {
          base base-prelude monad-control template-haskell transformers
          transformers-base
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/newtype-deriving";
        description = "Instance derivers for newtype wrappers";
        license = stdenv.lib.licenses.mit;
@@ -146658,8 +147540,8 @@ self: {
      }:
      mkDerivation {
        pname = "not-gloss";
-       version = "0.7.6.3";
-       sha256 = "8be10e835c2c6a3b55d52ae7f58ebb56eb2d71348c38f2a141eb61c21753108f";
+       version = "0.7.6.4";
+       sha256 = "a43d0b18834237da91b9ffb44ce23a6fe764b962ed0b3bca56ea01903603534e";
        libraryHaskellDepends = [
          base binary bmp bytestring cereal GLUT OpenGL OpenGLRaw
          spatial-math time vector vector-binary-instances
@@ -147706,16 +148588,17 @@ self: {
      }) {};
 
   "oi" = callPackage
-    ({ mkDerivation, base, comonad, directory, filepath, parallel
-     , SafeSemaphore
-     }:
+    ({ mkDerivation, base, comonad, directory, filepath, parallel }:
      mkDerivation {
        pname = "oi";
-       version = "0.3.1";
-       sha256 = "57d8bf024deb1a4a46c580b89eaa80a394bc4c58fe33e898448c897caeaa0893";
+       version = "0.4.0";
+       sha256 = "2757014767b21d1938d8acaa4742514457482aa52c47b5fea4ba9e72ea810e32";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         base comonad directory filepath parallel SafeSemaphore
+         base comonad directory filepath parallel
        ];
+       executableHaskellDepends = [ base directory filepath parallel ];
        description = "Library for purely functional lazy interactions with the outer world";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150219,7 +151102,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "palette" = callPackage
+  "palette_0_1_0_2" = callPackage
     ({ mkDerivation, array, base, colour, containers }:
      mkDerivation {
        pname = "palette";
@@ -150229,6 +151112,19 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "Utilities for choosing and creating color schemes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "palette" = callPackage
+    ({ mkDerivation, array, base, colour, containers }:
+     mkDerivation {
+       pname = "palette";
+       version = "0.1.0.3";
+       sha256 = "f75a713245af54d86cd34ce79f2b6d2d8c35aa7d56c28c07e33465227cdedea1";
+       libraryHaskellDepends = [ array base colour containers ];
+       homepage = "http://projects.haskell.org/diagrams";
+       description = "Utilities for choosing and creating color schemes";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "palindromes" = callPackage
@@ -156014,17 +156910,17 @@ self: {
   "pinboard" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, either
      , http-client, http-client-tls, http-types, mtl, network
-     , old-locale, random, text, time, transformers
+     , old-locale, profunctors, random, text, time, transformers
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "pinboard";
-       version = "0.9.2";
-       sha256 = "a009de2327af08a929503482ffe60700348422807df3e22f2a7e6f98ac0aabda";
+       version = "0.9.3";
+       sha256 = "82d5200e79ea18df196a5d8543d32f1dcf7e3ff43579590dcba80e78c712c288";
        libraryHaskellDepends = [
          aeson base bytestring containers either http-client http-client-tls
-         http-types mtl network old-locale random text time transformers
-         unordered-containers vector
+         http-types mtl network old-locale profunctors random text time
+         transformers unordered-containers vector
        ];
        homepage = "https://github.com/jonschoning/pinboard";
        description = "Access to the Pinboard API";
@@ -156408,7 +157304,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pipes-binary" = callPackage
+  "pipes-binary_0_4_0_5" = callPackage
     ({ mkDerivation, base, binary, bytestring, ghc-prim
      , lens-family-core, pipes, pipes-bytestring, pipes-parse
      , smallcheck, tasty, tasty-hunit, tasty-smallcheck, transformers
@@ -156428,6 +157324,29 @@ self: {
        homepage = "https://github.com/k0001/pipes-binary";
        description = "Encode and decode binary streams using the pipes and binary libraries";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "pipes-binary" = callPackage
+    ({ mkDerivation, base, binary, bytestring, ghc-prim
+     , lens-family-core, pipes, pipes-bytestring, pipes-parse
+     , smallcheck, tasty, tasty-hunit, tasty-smallcheck, transformers
+     }:
+     mkDerivation {
+       pname = "pipes-binary";
+       version = "0.4.1";
+       sha256 = "1b6e79748f2579285ba416c02c1461fee394309f79b94f9d5c874bbf6f79d637";
+       libraryHaskellDepends = [
+         base binary bytestring ghc-prim pipes pipes-bytestring pipes-parse
+         transformers
+       ];
+       testHaskellDepends = [
+         base binary bytestring ghc-prim lens-family-core pipes pipes-parse
+         smallcheck tasty tasty-hunit tasty-smallcheck transformers
+       ];
+       homepage = "https://github.com/k0001/pipes-binary";
+       description = "Encode and decode binary streams using the pipes and binary libraries";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "pipes-bytestring" = callPackage
@@ -156937,7 +157856,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "pipes-parse" = callPackage
+  "pipes-parse_3_0_3" = callPackage
     ({ mkDerivation, base, pipes, transformers }:
      mkDerivation {
        pname = "pipes-parse";
@@ -156946,6 +157865,18 @@ self: {
        libraryHaskellDepends = [ base pipes transformers ];
        description = "Parsing infrastructure for the pipes ecosystem";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "pipes-parse" = callPackage
+    ({ mkDerivation, base, pipes, transformers }:
+     mkDerivation {
+       pname = "pipes-parse";
+       version = "3.0.4";
+       sha256 = "be1d15fc1fd4b3a8631f3202967fbdcd916f8567eedcf7ee17801296830c3705";
+       libraryHaskellDepends = [ base pipes transformers ];
+       description = "Parsing infrastructure for the pipes ecosystem";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "pipes-postgresql-simple" = callPackage
@@ -157103,17 +158034,17 @@ self: {
 
   "pipes-transduce" = callPackage
     ({ mkDerivation, base, bifunctors, bytestring, conceit, doctest
-     , foldl, free, lens-family-core, pipes, pipes-bytestring
-     , pipes-concurrency, pipes-group, pipes-parse, pipes-safe
-     , pipes-text, tasty, tasty-hunit, text, transformers, void
+     , foldl, free, pipes, pipes-bytestring, pipes-concurrency
+     , pipes-group, pipes-parse, pipes-safe, pipes-text, tasty
+     , tasty-hunit, text, transformers, void
      }:
      mkDerivation {
        pname = "pipes-transduce";
-       version = "0.3.3.0";
-       sha256 = "af40b285eb0e55f8ba17223890b09b4b9cc9b9774d55c7539d878e1d3d68c49b";
+       version = "0.3.4.0";
+       sha256 = "82c850ba718f4467e2742418249a584b1d3521815083a87cbe51543bc3486833";
        libraryHaskellDepends = [
-         base bifunctors bytestring conceit foldl free lens-family-core
-         pipes pipes-bytestring pipes-concurrency pipes-group pipes-parse
+         base bifunctors bytestring conceit foldl free pipes
+         pipes-bytestring pipes-concurrency pipes-group pipes-parse
          pipes-safe pipes-text text transformers void
        ];
        testHaskellDepends = [
@@ -159122,6 +160053,7 @@ self: {
          tasty-quickcheck tasty-smallcheck text time transformers uuid
          vector
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/nikita-volkov/postgresql-binary";
        description = "Encoders and decoders for the PostgreSQL's binary format";
@@ -159201,8 +160133,8 @@ self: {
      }:
      mkDerivation {
        pname = "postgresql-binary";
-       version = "0.8";
-       sha256 = "401fe41d1bbf31ec0c5cf61ef6370cc56c61ae5f49a92a5f464981bc535c09c2";
+       version = "0.8.1";
+       sha256 = "e5745c009806fb10705f1f5f23c2af4028b47a7178e1ea09e102cf697cc2581b";
        libraryHaskellDepends = [
          aeson base base-prelude binary-parser bytestring foldl loch-th
          placeholders scientific text time transformers uuid vector
@@ -159220,35 +160152,6 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "postgresql-binary_0_8_1" = callPackage
-    ({ mkDerivation, aeson, base, base-prelude, binary-parser
-     , bytestring, conversion, conversion-bytestring, conversion-text
-     , either, foldl, json-ast, loch-th, placeholders, postgresql-libpq
-     , QuickCheck, quickcheck-instances, rebase, scientific, tasty
-     , tasty-hunit, tasty-quickcheck, tasty-smallcheck, text, time
-     , transformers, uuid, vector
-     }:
-     mkDerivation {
-       pname = "postgresql-binary";
-       version = "0.8.1";
-       sha256 = "e5745c009806fb10705f1f5f23c2af4028b47a7178e1ea09e102cf697cc2581b";
-       libraryHaskellDepends = [
-         aeson base base-prelude binary-parser bytestring foldl loch-th
-         placeholders scientific text time transformers uuid vector
-       ];
-       testHaskellDepends = [
-         aeson base bytestring conversion conversion-bytestring
-         conversion-text either json-ast loch-th placeholders
-         postgresql-libpq QuickCheck quickcheck-instances rebase scientific
-         tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time
-         transformers uuid vector
-       ];
-       homepage = "https://github.com/nikita-volkov/postgresql-binary";
-       description = "Encoders and decoders for the PostgreSQL's binary format";
-       license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
-     }) {};
-
   "postgresql-config" = callPackage
     ({ mkDerivation, aeson, base, bytestring, monad-control, mtl
      , postgresql-simple, resource-pool, time
@@ -160740,8 +161643,8 @@ self: {
     ({ mkDerivation, base, split }:
      mkDerivation {
        pname = "print-debugger";
-       version = "1.1.7";
-       sha256 = "3e0333a2ded92a164a8c6e33f84ee8014efb0474b8a55011c16194fabf8d6d6c";
+       version = "1.1.9";
+       sha256 = "e89a0e2d8bc5bf67ca3c079ad690b48602241afb0de557fa6abefc099c6e8481";
        libraryHaskellDepends = [ base split ];
        homepage = "https://github.com/JohnReedLOL/HaskellPrintDebugger";
        description = "Debug print formatting library";
@@ -162273,6 +163176,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "proxied" = callPackage
+    ({ mkDerivation, base, generic-deriving, tagged }:
+     mkDerivation {
+       pname = "proxied";
+       version = "0.1.1";
+       sha256 = "dc4f7f3553dfcc2ff40dd967d5c04bed58ac3d8d210b77a62df45623b36be087";
+       libraryHaskellDepends = [ base generic-deriving tagged ];
+       homepage = "https://github.com/RyanGlScott/proxied";
+       description = "Make functions consume Proxy instead of undefined";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "proxy-kindness" = callPackage
     ({ mkDerivation, base, tagged }:
      mkDerivation {
@@ -164536,13 +165451,12 @@ self: {
      }:
      mkDerivation {
        pname = "radium";
-       version = "0.4.2";
-       sha256 = "7a582411a33481d23b518dbf581acc71d00eb8bfcd086aa4658dcbbbf1d98bcf";
+       version = "0.5";
+       sha256 = "17572031f5bf539dc9c73670f06375c797262e233a553ca0c008d12c8fef0aee";
        libraryHaskellDepends = [ base containers parsec ];
        testHaskellDepends = [
          base Cabal containers hspec parsec QuickCheck
        ];
-       jailbreak = true;
        homepage = "https://github.com/klangner/radium";
        description = "Chemistry";
        license = stdenv.lib.licenses.bsd3;
@@ -164713,7 +165627,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rainbox" = callPackage
+  "rainbox_0_18_0_4" = callPackage
     ({ mkDerivation, base, bytestring, containers, lens, QuickCheck
      , rainbow, tasty, tasty-quickcheck, text
      }:
@@ -164728,13 +165642,13 @@ self: {
          base bytestring containers lens QuickCheck rainbow tasty
          tasty-quickcheck text
        ];
-       doCheck = false;
        homepage = "http://www.github.com/massysett/rainbox";
        description = "Two-dimensional box pretty printing, with colors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rainbox_0_18_0_6" = callPackage
+  "rainbox" = callPackage
     ({ mkDerivation, base, bytestring, containers, lens, QuickCheck
      , rainbow, tasty, tasty-quickcheck, text
      }:
@@ -164752,7 +165666,6 @@ self: {
        homepage = "http://www.github.com/massysett/rainbox";
        description = "Two-dimensional box pretty printing, with colors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rake" = callPackage
@@ -165246,7 +166159,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rank1dynamic" = callPackage
+  "rank1dynamic_0_3_1_1" = callPackage
     ({ mkDerivation, base, binary, ghc-prim, HUnit, test-framework
      , test-framework-hunit
      }:
@@ -165262,6 +166175,24 @@ self: {
        homepage = "http://haskell-distributed.github.com";
        description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "rank1dynamic" = callPackage
+    ({ mkDerivation, base, binary, HUnit, test-framework
+     , test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "rank1dynamic";
+       version = "0.3.2.0";
+       sha256 = "e2ddd96d1908a61bd244e13884a041b64837ac25370198934b0dbd4a449e1deb";
+       libraryHaskellDepends = [ base binary ];
+       testHaskellDepends = [
+         base HUnit test-framework test-framework-hunit
+       ];
+       homepage = "http://haskell-distributed.github.com";
+       description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "rascal" = callPackage
@@ -165348,7 +166279,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "rasterific-svg" = callPackage
+  "rasterific-svg_0_2_3_2" = callPackage
     ({ mkDerivation, base, binary, bytestring, containers, directory
      , filepath, FontyFruity, JuicyPixels, lens, linear, mtl
      , optparse-applicative, Rasterific, scientific, svg-tree, text
@@ -165369,6 +166300,33 @@ self: {
          base directory filepath FontyFruity JuicyPixels
          optparse-applicative Rasterific svg-tree
        ];
+       jailbreak = true;
+       description = "SVG renderer based on Rasterific";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "rasterific-svg" = callPackage
+    ({ mkDerivation, base, binary, bytestring, containers, directory
+     , filepath, FontyFruity, JuicyPixels, lens, linear, mtl
+     , optparse-applicative, Rasterific, scientific, svg-tree, text
+     , transformers, vector
+     }:
+     mkDerivation {
+       pname = "rasterific-svg";
+       version = "0.3";
+       sha256 = "909c07e2db1ecd9f67aaa4728386d7b17932e53f3c68c7afef45726142eb9425";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary bytestring containers directory filepath FontyFruity
+         JuicyPixels lens linear mtl Rasterific scientific svg-tree text
+         transformers vector
+       ];
+       executableHaskellDepends = [
+         base directory filepath FontyFruity JuicyPixels
+         optparse-applicative Rasterific svg-tree
+       ];
        description = "SVG renderer based on Rasterific";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -166070,8 +167028,8 @@ self: {
      }:
      mkDerivation {
        pname = "rebase";
-       version = "0.4.2";
-       sha256 = "185cb219a41c323be3b850efae9b8a95f9b5b4abe3934cad85238c5f0023c8c7";
+       version = "0.4.3";
+       sha256 = "375e6cb300a7d93b8c64bad5edd69464b787d5d5b22ac80e3705ad2c0f07bde5";
        libraryHaskellDepends = [
          base base-prelude bifunctors bytestring containers contravariant
          contravariant-extras deepseq dlist either hashable mtl profunctors
@@ -166106,6 +167064,7 @@ self: {
        libraryHaskellDepends = [
          base base-prelude basic-lens template-haskell transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/record";
        description = "Anonymous records";
        license = stdenv.lib.licenses.mit;
@@ -166168,6 +167127,7 @@ self: {
          base base-prelude conversion conversion-text record-syntax text
        ];
        doHaddock = false;
+       jailbreak = true;
        homepage = "https://github.com/nikita-volkov/record-preprocessor";
        description = "Compiler preprocessor introducing a syntactic extension for anonymous records";
        license = stdenv.lib.licenses.mit;
@@ -166834,7 +167794,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "reflection" = callPackage
+  "reflection_2_1_1_1" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "reflection";
@@ -166844,9 +167804,10 @@ self: {
        homepage = "http://github.com/ekmett/reflection";
        description = "Reifies arbitrary terms into types that can be reflected back into terms";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "reflection_2_1_2" = callPackage
+  "reflection" = callPackage
     ({ mkDerivation, base, template-haskell }:
      mkDerivation {
        pname = "reflection";
@@ -166856,7 +167817,6 @@ self: {
        homepage = "http://github.com/ekmett/reflection";
        description = "Reifies arbitrary terms into types that can be reflected back into terms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflection-extras" = callPackage
@@ -166963,14 +167923,13 @@ self: {
      }:
      mkDerivation {
        pname = "reflex-dom-contrib";
-       version = "0.4";
-       sha256 = "7bceed2b8347bdb8618e21d860a787d53187236a2253c83ab02bd51608a9236e";
+       version = "0.4.1";
+       sha256 = "e0c075de9b5b5c145ad7cd70fc214d1d2f8e76a0e640fde2e6202a9172573ed5";
        libraryHaskellDepends = [
          aeson base bifunctors bytestring containers data-default ghcjs-dom
          http-types lens mtl random readable reflex reflex-dom safe
          string-conv text time transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/reflex-frp/reflex-dom-contrib";
        description = "A playground for experimenting with infrastructure and common code for reflex applications";
        license = stdenv.lib.licenses.bsd3;
@@ -167949,15 +168908,15 @@ self: {
   "relational-postgresql8" = callPackage
     ({ mkDerivation, base, containers, HDBC, names-th
      , persistable-record, relational-query, relational-query-HDBC
-     , template-haskell, time
+     , template-haskell, time, transformers
      }:
      mkDerivation {
        pname = "relational-postgresql8";
-       version = "0.1.0.0";
-       sha256 = "0efd30853afa6bab8138317dbd0166638f152d76a6175fa32ed92fb6f059afba";
+       version = "0.2.0.0";
+       sha256 = "3fff0abc19ae8e6edb2c51430fc77326f57835d329355ccb253f8001e6e237a2";
        libraryHaskellDepends = [
          base containers HDBC names-th persistable-record relational-query
-         relational-query-HDBC template-haskell time
+         relational-query-HDBC template-haskell time transformers
        ];
        homepage = "https://github.com/yuga/haskell-relational-record-driver-postgresql8";
        description = "PostgreSQL v8.x driver for haskell-relational-record";
@@ -168161,6 +169120,7 @@ self: {
          QuickCheck quickcheck-instances random scientific tasty
          tasty-quickcheck text
        ];
+       jailbreak = true;
        description = "Remote Monad implementation of the JSON RPC protocol";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -169300,7 +170260,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "resourcet" = callPackage
+  "resourcet_1_1_7_1" = callPackage
     ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
      , mmorph, monad-control, mtl, transformers, transformers-base
      , transformers-compat
@@ -169317,6 +170277,26 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Deterministic allocation and freeing of scarce resources";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "resourcet" = callPackage
+    ({ mkDerivation, base, containers, exceptions, hspec, lifted-base
+     , mmorph, monad-control, mtl, transformers, transformers-base
+     , transformers-compat
+     }:
+     mkDerivation {
+       pname = "resourcet";
+       version = "1.1.7.2";
+       sha256 = "c1c71985d3f0fcc511a10dec89f8abfe31e0caa6355b8697e8d1ae3d6d14de86";
+       libraryHaskellDepends = [
+         base containers exceptions lifted-base mmorph monad-control mtl
+         transformers transformers-base transformers-compat
+       ];
+       testHaskellDepends = [ base hspec lifted-base transformers ];
+       homepage = "http://github.com/snoyberg/conduit";
+       description = "Deterministic allocation and freeing of scarce resources";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "respond" = callPackage
@@ -171169,25 +172149,31 @@ self: {
      }) {};
 
   "riemann" = callPackage
-    ({ mkDerivation, base, cereal, containers, data-default, either
-     , errors, HUnit, lens, network, protobuf, QuickCheck
-     , test-framework, test-framework-hunit, test-framework-quickcheck2
-     , text, time, transformers
+    ({ mkDerivation, base, bytestring, cereal, containers, data-default
+     , directory, doctest, errors, filepath, http-client, HUnit, lens
+     , mtl, network, protobuf, QuickCheck, test-framework
+     , test-framework-hunit, test-framework-quickcheck2, text, time
+     , transformers, wreq
      }:
      mkDerivation {
        pname = "riemann";
-       version = "0.1.0.2";
-       sha256 = "7399d2b85839ef9c44aab66ad3b2f3a35e6a893fd8f5ab1aa1626a0f04128708";
+       version = "0.1.1.0";
+       sha256 = "8905d4997974028b71cf57f15cd6c4939d871f90fbd5130b0c09705f3e6d10c0";
+       isLibrary = true;
+       isExecutable = true;
        libraryHaskellDepends = [
-         base cereal containers data-default either errors lens network
-         protobuf text time transformers
+         base bytestring cereal containers data-default errors lens mtl
+         network protobuf text time transformers
+       ];
+       executableHaskellDepends = [
+         base bytestring cereal containers data-default errors http-client
+         lens mtl network protobuf text time transformers wreq
        ];
        testHaskellDepends = [
-         base either errors HUnit QuickCheck test-framework
-         test-framework-hunit test-framework-quickcheck2 transformers
+         base directory doctest filepath HUnit QuickCheck test-framework
+         test-framework-hunit test-framework-quickcheck2
        ];
-       jailbreak = true;
-       homepage = "https://github.com/telser/riemann-hs";
+       homepage = "https://github.com/tel/riemann-hs";
        description = "A Riemann client for Haskell";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -171755,8 +172741,8 @@ self: {
      }:
      mkDerivation {
        pname = "rose-trie";
-       version = "0.1.0.0";
-       sha256 = "f22b4fa41ff69462fbeb551a4bbc92faf26a1ab3910768a9fe75889d4f01ef69";
+       version = "1.0.0.1";
+       sha256 = "669269bdf1cdbec5f3023954fa6c4aee3676253db82fe69e785128afb4ed2805";
        libraryHaskellDepends = [
          base containers deepseq minilens mtl transformers
        ];
@@ -174543,6 +175529,23 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "scotty-params-parser" = callPackage
+    ({ mkDerivation, base-prelude, scotty, success, text, transformers
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "scotty-params-parser";
+       version = "0.4";
+       sha256 = "e334daaa407a407e4ececb0cd6d79b4037949abbc912d0d96641f007f041b631";
+       libraryHaskellDepends = [
+         base-prelude scotty success text transformers unordered-containers
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/sannsyn/scotty-params-parser";
+       description = "HTTP-request's query parameters parser abstraction for \"scotty\"";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "scotty-rest" = callPackage
     ({ mkDerivation, base, base-prelude, bytestring, convertible
      , data-default-class, hspec, hspec-wai, http-date, http-media
@@ -175124,7 +176127,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
-  "second-transfer" = callPackage
+  "second-transfer_0_7_1_0" = callPackage
     ({ mkDerivation, attoparsec, base, base16-bytestring, binary
      , bytestring, clock, conduit, containers, cpphs, deepseq
      , exceptions, hashable, hashtables, hslogger, http2, HUnit, lens
@@ -175154,8 +176157,38 @@ self: {
        homepage = "https://www.httptwo.com/second-transfer/";
        description = "Second Transfer HTTP/2 web server";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
+  "second-transfer" = callPackage
+    ({ mkDerivation, attoparsec, base, base16-bytestring, binary
+     , BoundedChan, bytestring, clock, conduit, containers, cpphs
+     , deepseq, exceptions, hashable, hashtables, http2, HUnit, lens
+     , mmorph, network, network-uri, pqueue, resourcet, stm, text, time
+     , transformers, unordered-containers, vector, vector-algorithms
+     }:
+     mkDerivation {
+       pname = "second-transfer";
+       version = "0.10.0.2";
+       sha256 = "9a0a8851a4d12e2d7b1f84bb7af19a9118c206c24b65d06500f10ea718e88828";
+       libraryHaskellDepends = [
+         attoparsec base base16-bytestring binary BoundedChan bytestring
+         clock conduit containers deepseq exceptions hashable hashtables
+         http2 lens mmorph network network-uri pqueue resourcet stm text
+         time transformers vector vector-algorithms
+       ];
+       libraryToolDepends = [ cpphs ];
+       testHaskellDepends = [
+         base binary bytestring conduit containers hashtables http2 HUnit
+         lens network network-uri stm text transformers unordered-containers
+       ];
+       testToolDepends = [ cpphs ];
+       doCheck = false;
+       homepage = "https://www.httptwo.com/second-transfer/";
+       description = "Second Transfer HTTP/2 web server";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "secp256k1" = callPackage
     ({ mkDerivation, base, base16-bytestring, binary, bytestring
      , cryptohash, entropy, HUnit, largeword, mtl, QuickCheck
@@ -175164,8 +176197,8 @@ self: {
      }:
      mkDerivation {
        pname = "secp256k1";
-       version = "0.4.3";
-       sha256 = "fb4d0187d3e6189a933b95b5f884c9545b06c26c637af239ca9ceff98b2335a5";
+       version = "0.4.4";
+       sha256 = "33532973312cafa00b12f5fe21ed65bd89810bd8e19be95b29c5d5aa0b9946d2";
        libraryHaskellDepends = [
          base base16-bytestring binary bytestring entropy largeword mtl
          QuickCheck string-conversions
@@ -176285,6 +177318,8 @@ self: {
        pname = "servant";
        version = "0.4.4";
        sha256 = "d2b95b9f9b8173fe83d08166707d564b2cb60526493fc7b4099e09f9480a16ec";
+       revision = "1";
+       editedCabalFile = "8744311d3ae2ecbd905ab71e1b4c568b02d5179346c3d085bdd19d8632b98dc5";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring bytestring-conversion
          case-insensitive http-media http-types network-uri
@@ -176313,6 +177348,8 @@ self: {
        pname = "servant";
        version = "0.4.4.2";
        sha256 = "fc5c80822fef28b63d8a63bd63efd0bdd86c7d13f06d1cc6e9b0768c4efe61aa";
+       revision = "1";
+       editedCabalFile = "230a38d3c063c561c11a5570bb725f715bff776e507a734a62dac5aa463b5c08";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring bytestring-conversion
          case-insensitive http-media http-types network-uri
@@ -176341,6 +177378,8 @@ self: {
        pname = "servant";
        version = "0.4.4.4";
        sha256 = "182842071c4905a3429c1ccbff020af255b6abfd1e7a6473253713c0da80f280";
+       revision = "1";
+       editedCabalFile = "5bcd8a6a295b2e58c802750441e3ffac259cfa6e12037b7ccd176b1ef8381288";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring bytestring-conversion
          case-insensitive http-media http-types network-uri
@@ -176369,6 +177408,8 @@ self: {
        pname = "servant";
        version = "0.4.4.5";
        sha256 = "b82abafe5bd1357c64c36c344ab38dc8fa8ad8f40126b86323da9bfc4047f544";
+       revision = "1";
+       editedCabalFile = "a6c733d905643e01e57adeb803dc15951eca7c7f4d7f09abac650b1c3efcc89c";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring bytestring-conversion
          case-insensitive http-media http-types network-uri
@@ -176396,6 +177437,8 @@ self: {
        pname = "servant";
        version = "0.4.4.6";
        sha256 = "6adeba12f74f809c3bd9846d2563e1bffb9826d8731084bcea17bce7a145ee6a";
+       revision = "1";
+       editedCabalFile = "821919911076b83763ba559388851ea582c40c2171ae38b95006ee2fb717ac6b";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring bytestring-conversion
          case-insensitive http-media http-types network-uri
@@ -176830,6 +177873,27 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "servant-elm" = callPackage
+    ({ mkDerivation, aeson, base, data-default, elm-export, hspec, lens
+     , servant, servant-foreign, text
+     }:
+     mkDerivation {
+       pname = "servant-elm";
+       version = "0.1.0.1";
+       sha256 = "8e44d664e4484135c4b19d2477131b1f75863c999ff747a6b69052ac12f6d15d";
+       libraryHaskellDepends = [
+         base elm-export lens servant servant-foreign text
+       ];
+       testHaskellDepends = [
+         aeson base data-default elm-export hspec servant
+       ];
+       jailbreak = true;
+       homepage = "http://github.com/mattjbray/servant-elm#readme";
+       description = "Automatically derive Elm functions to query servant webservices";
+       license = stdenv.lib.licenses.bsd3;
+       broken = true;
+     }) {elm-export = null; servant-foreign = null;};
+
   "servant-examples" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, either
      , http-types, js-jquery, lucid, random, servant, servant-client
@@ -181419,7 +182483,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "slave-thread" = callPackage
+  "slave-thread_1_0_0_0" = callPackage
     ({ mkDerivation, base, base-prelude, HTF, list-t, mmorph
      , partial-handler, QuickCheck, quickcheck-instances, SafeSemaphore
      , stm-containers, transformers
@@ -181440,9 +182504,10 @@ self: {
        homepage = "https://github.com/nikita-volkov/slave-thread";
        description = "A principal solution to ghost threads and silent exceptions";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "slave-thread_1_0_1" = callPackage
+  "slave-thread" = callPackage
     ({ mkDerivation, base, base-prelude, HTF, list-t, mmorph
      , partial-handler, QuickCheck, quickcheck-instances, SafeSemaphore
      , stm-containers, transformers
@@ -181458,10 +182523,10 @@ self: {
        testHaskellDepends = [
          base base-prelude HTF QuickCheck quickcheck-instances SafeSemaphore
        ];
+       doCheck = false;
        homepage = "https://github.com/nikita-volkov/slave-thread";
        description = "A principal solution to ghost threads and silent exceptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "slice-cpp-gen" = callPackage
@@ -185000,10 +186065,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "spir-v";
-       version = "0.0.0.2";
-       sha256 = "6933c99a6e0ce0bb540884c76542b9f2d3095ca43718a0ca9475502f33f9262a";
-       revision = "1";
-       editedCabalFile = "71fa7971fad8f2ce6d0eab96c2e817235822e5e0e048a844ac1288d35dee278f";
+       version = "0.0.1.0";
+       sha256 = "59d7b176ddafbb73aff8dd4b1a8f9557f748728e4f5262a9575108ff6e62d6ca";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/expipiplus1/spir-v";
        description = "Some utilities for reading and writing SPIR-V files";
@@ -186578,6 +187641,71 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
+  "stack_1_0_4" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, base
+     , base16-bytestring, base64-bytestring, binary, binary-tagged
+     , blaze-builder, byteable, bytestring, Cabal, conduit
+     , conduit-extra, containers, cryptohash, cryptohash-conduit
+     , deepseq, directory, edit-distance, either, enclosed-exceptions
+     , errors, exceptions, extra, fast-logger, filelock, filepath
+     , fsnotify, gitrev, hashable, hastache, hpack, hpc, hspec
+     , http-client, http-client-tls, http-conduit, http-types
+     , lifted-base, monad-control, monad-logger, mtl
+     , optparse-applicative, optparse-simple, path, path-io, persistent
+     , persistent-sqlite, persistent-template, pretty, process
+     , project-template, QuickCheck, resourcet, retry, safe, semigroups
+     , split, stm, streaming-commons, tar, template-haskell, temporary
+     , text, text-binary, time, transformers, transformers-base, unix
+     , unix-compat, unordered-containers, uuid, vector
+     , vector-binary-instances, yaml, zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "stack";
+       version = "1.0.4";
+       sha256 = "f252c2f916b48d4b32722e2a4f3069ef55ac80454552316ce2dde0c5d486d85f";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson ansi-terminal async attoparsec base base16-bytestring
+         base64-bytestring binary binary-tagged blaze-builder byteable
+         bytestring Cabal conduit conduit-extra containers cryptohash
+         cryptohash-conduit deepseq directory edit-distance either
+         enclosed-exceptions errors exceptions extra fast-logger filelock
+         filepath fsnotify hashable hastache hpack hpc http-client
+         http-client-tls http-conduit http-types lifted-base monad-control
+         monad-logger mtl optparse-applicative path path-io persistent
+         persistent-sqlite persistent-template pretty process
+         project-template resourcet retry safe semigroups split stm
+         streaming-commons tar template-haskell temporary text text-binary
+         time transformers transformers-base unix unix-compat
+         unordered-containers uuid vector vector-binary-instances yaml
+         zip-archive zlib
+       ];
+       executableHaskellDepends = [
+         base bytestring Cabal containers directory filelock filepath gitrev
+         http-client lifted-base monad-control monad-logger mtl
+         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
+       ];
+       jailbreak = true;
+       enableSharedExecutables = false;
+       postInstall = ''
+         exe=$out/bin/stack
+         mkdir -p $out/share/bash-completion/completions
+         $exe --bash-completion-script $exe >$out/share/bash-completion/completions/stack
+       '';
+       homepage = "http://haskellstack.org";
+       description = "The Haskell Tool Stack";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
+     }) {};
+
   "stack-hpc-coveralls" = callPackage
     ({ mkDerivation, aeson, base, bytestring, containers, deepseq
      , docopt, filepath, hlint, hpc, hspec, hspec-contrib, http-client
@@ -188408,7 +189536,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stm-containers" = callPackage
+  "stm-containers_0_2_9" = callPackage
     ({ mkDerivation, base-prelude, focus, free, hashable, HTF, list-t
      , loch-th, mtl, mtl-prelude, placeholders, primitive, QuickCheck
      , transformers, unordered-containers
@@ -188430,9 +189558,10 @@ self: {
        homepage = "https://github.com/nikita-volkov/stm-containers";
        description = "Containers for STM";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stm-containers_0_2_10" = callPackage
+  "stm-containers" = callPackage
     ({ mkDerivation, base-prelude, focus, free, hashable, HTF, list-t
      , loch-th, mtl, mtl-prelude, placeholders, primitive, QuickCheck
      , transformers, unordered-containers
@@ -188449,10 +189578,10 @@ self: {
          base-prelude focus free hashable HTF list-t loch-th mtl mtl-prelude
          placeholders primitive QuickCheck transformers unordered-containers
        ];
+       doCheck = false;
        homepage = "https://github.com/nikita-volkov/stm-containers";
        description = "Containers for STM";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stm-delay" = callPackage
@@ -189292,6 +190421,27 @@ self: {
        license = stdenv.lib.licenses.asl20;
      }) {};
 
+  "streaming-png" = callPackage
+    ({ mkDerivation, base, bytestring, cereal, exceptions, JuicyPixels
+     , mmorph, mtl, resourcet, streaming, streaming-bytestring
+     , streaming-commons, transformers, vector
+     }:
+     mkDerivation {
+       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
+         vector
+       ];
+       homepage = "http://github.com/bch29/streaming-png#readme";
+       description = "Perfectly streaming PNG image decoding";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "streaming-utils" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, bytestring, http-client
      , http-client-tls, json-stream, mtl, pipes, resourcet, streaming
@@ -190794,6 +191944,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "svg-builder" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, hashable, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "svg-builder";
+       version = "0.1.0.1";
+       sha256 = "91c1a879e4b656355e9c843f29761a46dba6fd6c96c38a073dbb61b101923c9d";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring hashable text unordered-containers
+       ];
+       homepage = "http://github.com/jeffreyrosenbluth/svg-builder.git";
+       description = "DSL for building SVG";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "svg-tree_0_1_0_2" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , JuicyPixels, lens, linear, mtl, scientific, text, transformers
@@ -190850,7 +192016,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "svg-tree" = callPackage
+  "svg-tree_0_3_2" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , JuicyPixels, lens, linear, mtl, scientific, text, transformers
      , vector, xml
@@ -190865,24 +192031,24 @@ self: {
        ];
        description = "SVG file loader and serializer";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "svg-tree_0_3_2_2" = callPackage
+  "svg-tree" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, containers
      , JuicyPixels, lens, linear, mtl, scientific, text, transformers
      , vector, xml
      }:
      mkDerivation {
        pname = "svg-tree";
-       version = "0.3.2.2";
-       sha256 = "f1dfee9879672dc9ad3a4de3850ce9d120e45f33ca02642da5cc15bd5d9dc85a";
+       version = "0.4.1";
+       sha256 = "eacdf66bad077c31d05979d82090dac7839a909d43e50876698d6c61eb0f7fe5";
        libraryHaskellDepends = [
          attoparsec base bytestring containers JuicyPixels lens linear mtl
          scientific text transformers vector xml
        ];
        description = "SVG file loader and serializer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "svg2q" = callPackage
@@ -194019,7 +195185,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "tasty-th" = callPackage
+  "tasty-th_0_1_3" = callPackage
     ({ mkDerivation, base, language-haskell-extract, tasty
      , template-haskell
      }:
@@ -194033,6 +195199,19 @@ self: {
        homepage = "http://github.com/bennofs/tasty-th";
        description = "Automagically generate the HUnit- and Quickcheck-bulk-code using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "tasty-th" = callPackage
+    ({ mkDerivation, base, tasty, template-haskell }:
+     mkDerivation {
+       pname = "tasty-th";
+       version = "0.1.4";
+       sha256 = "18a14d693e709046eba3bb1a4e9febfce09d04059342728f06178788a24ece35";
+       libraryHaskellDepends = [ base tasty template-haskell ];
+       homepage = "http://github.com/bennofs/tasty-th";
+       description = "Automatic tasty test case discovery using TH";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "tateti-tateti" = callPackage
@@ -196152,8 +197331,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-postgresql";
-       version = "0.0.1.0";
-       sha256 = "632eafe17cc8ea54571dbae82e85e14ded973f28772c82432e5025f68b4dde5f";
+       version = "0.0.2.0";
+       sha256 = "abd84b2f205694f58be46ca9f8a2a98f1d407e74da27092aebaba1e26d48dc54";
        libraryHaskellDepends = [ base dlist transformers ];
        testHaskellDepends = [ base QuickCheck quickcheck-simple ];
        homepage = "http://khibino.github.io/haskell-relational-record/";
@@ -196313,8 +197492,8 @@ self: {
      }:
      mkDerivation {
        pname = "text-show";
-       version = "3";
-       sha256 = "49e8110e4bd5f67fa6dbe4ce07614633fc2e65bd3dae14b0759df10e3f1b98b2";
+       version = "3.0.1";
+       sha256 = "39806d6d3098f099ede1a740f6fb55e84144a34442496145063b408262b899ca";
        libraryHaskellDepends = [
          array base base-compat bifunctors bytestring bytestring-builder
          containers generic-deriving ghc-prim integer-gmp nats semigroups
@@ -196325,9 +197504,8 @@ self: {
          array base base-compat base-orphans bifunctors bytestring
          bytestring-builder containers generic-deriving ghc-prim hspec
          integer-gmp nats QuickCheck quickcheck-instances semigroups tagged
-         template-haskell text transformers transformers-compat void
+         template-haskell text th-lift transformers transformers-compat void
        ];
-       doHaddock = false;
        homepage = "https://github.com/RyanGlScott/text-show";
        description = "Efficient conversion of values into Text";
        license = stdenv.lib.licenses.bsd3;
@@ -197824,17 +199002,18 @@ self: {
 
   "tidal" = callPackage
     ({ mkDerivation, base, binary, bytestring, colour, containers
-     , hashable, hmt, hosc, mersenne-random-pure64, mtl, parsec, process
-     , text, time, transformers, websockets
+     , hashable, hmt, hosc, mersenne-random-pure64, mtl, parsec
+     , PortMidi, process, serialport, text, time, transformers
+     , websockets
      }:
      mkDerivation {
        pname = "tidal";
-       version = "0.6";
-       sha256 = "c82a1b123f9fb831d086642f10ecd06b57e29eab4597077de8d1b82766012b67";
+       version = "0.7";
+       sha256 = "740fed95c4eacdf2abea0965d81f2d6e747a303868adf0d9472b7413952a5aa1";
        libraryHaskellDepends = [
          base binary bytestring colour containers hashable hmt hosc
-         mersenne-random-pure64 mtl parsec process text time transformers
-         websockets
+         mersenne-random-pure64 mtl parsec PortMidi process serialport text
+         time transformers websockets
        ];
        homepage = "http://tidal.lurk.org/";
        description = "Pattern language for improvised music";
@@ -199806,12 +200985,12 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "transformers_0_5_1_0" = callPackage
+  "transformers_0_5_2_0" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "transformers";
-       version = "0.5.1.0";
-       sha256 = "d1bd8fefc1bb73ac3bad35ade9af0919bed2be6d6734cdf959d9a31ba1e70cdd";
+       version = "0.5.2.0";
+       sha256 = "6c408713a8ba7dd7a6573a4644e0c17fe11747f5bf259eab958421a7358a70e2";
        libraryHaskellDepends = [ base ];
        description = "Concrete functor and monad transformers";
        license = stdenv.lib.licenses.bsd3;
@@ -201567,7 +202746,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "twitter-feed" = callPackage
+  "twitter-feed_0_2_0_4" = callPackage
     ({ mkDerivation, aeson, authenticate-oauth, base, bytestring
      , containers, http-conduit, HUnit, test-framework
      , test-framework-hunit
@@ -201585,6 +202764,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.5";
+       sha256 = "faf8a79a0c423d2aef9a88fab34084c0264f19efcebe721c71786e8fcd971773";
+       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" = callPackage
@@ -202732,10 +203932,8 @@ self: {
      }:
      mkDerivation {
        pname = "uhc-light";
-       version = "1.1.9.2";
-       sha256 = "f77b28c6e49fd36bb5369714283d72d37b8dc2f90b444e5789a5503e864d0ee7";
-       revision = "1";
-       editedCabalFile = "9281e38cd36593fbdd779caa5c3e678b4d4f967f496b5d3df5d55b1cd5a8a85f";
+       version = "1.1.9.3";
+       sha256 = "e1c4868e38987c2938c6c9379bb3d8b1bfcfbfc95541862e118e8ca9439343f3";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -202748,7 +203946,6 @@ self: {
          hashable mtl network old-locale primitive process syb transformers
          uhc-util uulib vector
        ];
-       jailbreak = true;
        homepage = "https://github.com/UU-ComputerScience/uhc";
        description = "Part of UHC packaged as cabal/hackage installable library";
        license = stdenv.lib.licenses.bsd3;
@@ -202757,20 +203954,17 @@ self: {
 
   "uhc-util" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, containers
-     , directory, fclabels, fgl, hashable, mtl, process, syb, time
-     , time-compat, uulib
+     , directory, fclabels, fgl, hashable, logict-state, mtl, process
+     , syb, time, time-compat, uulib
      }:
      mkDerivation {
        pname = "uhc-util";
-       version = "0.1.6.3";
-       sha256 = "6d64396e186a2a05a5f3a0ace58b768e83e9655b22ab3fde42d0154152358046";
-       revision = "1";
-       editedCabalFile = "eedc35cfdb41a84edc0a70661797a7ea98684f7b30a506309d40975370f55c0a";
+       version = "0.1.6.5";
+       sha256 = "a296ebd71c34353f69ad42b6b8979dbdc5e2bb5fb117b5e8953ff77ccbc378fc";
        libraryHaskellDepends = [
          array base binary bytestring containers directory fclabels fgl
-         hashable mtl process syb time time-compat uulib
+         hashable logict-state mtl process syb time time-compat uulib
        ];
-       jailbreak = true;
        homepage = "https://github.com/UU-ComputerScience/uhc-util";
        description = "UHC utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -203391,8 +204585,8 @@ self: {
     ({ mkDerivation, base, deepseq, ShowF }:
      mkDerivation {
        pname = "uniform-pair";
-       version = "0.1.9";
-       sha256 = "10670c5aa26cf1c1555aa0c8f21e3edf1eca7577c9bc205c159dbf7edd6063fa";
+       version = "0.1.10";
+       sha256 = "f27805fca8cd9574d0b7c535693c9dda9c9d945af1a50fc36abeb80fb332a2ff";
        libraryHaskellDepends = [ base deepseq ShowF ];
        homepage = "https://github.com/conal/uniform-pair/";
        description = "Uniform pairs with class instances";
@@ -203785,6 +204979,8 @@ self: {
        pname = "unix-compat";
        version = "0.4.1.4";
        sha256 = "fafa1a9eefc93287c028cc61f17a91f886f164b3f64392f1756f8a7f8b3cb34b";
+       revision = "1";
+       editedCabalFile = "401047ed04906f81b78929274ebe1b3f321e2c61a52124a034da7bacccd3b03c";
        libraryHaskellDepends = [ base unix ];
        homepage = "http://github.com/jystic/unix-compat";
        description = "Portable POSIX-compatibility layer";
@@ -203979,7 +205175,7 @@ self: {
        license = "GPL";
      }) {};
 
-  "unordered-containers" = callPackage
+  "unordered-containers_0_2_5_1" = callPackage
     ({ mkDerivation, base, ChasingBottoms, containers, deepseq
      , hashable, HUnit, QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2
@@ -203998,17 +205194,18 @@ 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_6_0" = callPackage
+  "unordered-containers" = callPackage
     ({ mkDerivation, base, ChasingBottoms, containers, deepseq
      , hashable, HUnit, QuickCheck, test-framework, test-framework-hunit
      , test-framework-quickcheck2
      }:
      mkDerivation {
        pname = "unordered-containers";
-       version = "0.2.6.0";
-       sha256 = "5f9fbba5f616344bd3b1b633d45f820cf9c840ad101e1110e698abc77d9de3f3";
+       version = "0.2.7.0";
+       sha256 = "6503226d24069698bbb454c15c53a7f9f245aba228e142c6b6ab2d31cecc5ef6";
        libraryHaskellDepends = [ base deepseq hashable ];
        testHaskellDepends = [
          base ChasingBottoms containers hashable HUnit QuickCheck
@@ -204017,7 +205214,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
@@ -204843,7 +206039,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "userid" = callPackage
+  "userid_0_1_2_3" = callPackage
     ({ mkDerivation, aeson, base, boomerang, lens, safecopy, web-routes
      , web-routes-th
      }:
@@ -204857,6 +206053,23 @@ self: {
        homepage = "http://www.github.com/Happstack/userid";
        description = "The UserId type and useful instances for web development";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "userid" = callPackage
+    ({ mkDerivation, aeson, base, boomerang, lens, safecopy, web-routes
+     , web-routes-th
+     }:
+     mkDerivation {
+       pname = "userid";
+       version = "0.1.2.4";
+       sha256 = "f4f0e89d43046408b0083a18030af0fb33a23603874efa0763caf1cf28ce6b5b";
+       libraryHaskellDepends = [
+         aeson base boomerang lens safecopy web-routes web-routes-th
+       ];
+       homepage = "http://www.github.com/Happstack/userid";
+       description = "The UserId type and useful instances for web development";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "users_0_1_0_0" = callPackage
@@ -206105,7 +207318,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "vault" = callPackage
+  "vault_0_3_0_5" = callPackage
     ({ mkDerivation, base, containers, hashable, unordered-containers
      }:
      mkDerivation {
@@ -206118,9 +207331,10 @@ self: {
        homepage = "https://github.com/HeinrichApfelmus/vault";
        description = "a persistent store for values of arbitrary types";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "vault_0_3_0_6" = callPackage
+  "vault" = callPackage
     ({ mkDerivation, base, containers, hashable, unordered-containers
      }:
      mkDerivation {
@@ -206133,7 +207347,6 @@ self: {
        homepage = "https://github.com/HeinrichApfelmus/vault";
        description = "a persistent store for values of arbitrary types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vaultaire-common" = callPackage
@@ -206817,13 +208030,13 @@ self: {
      }) {};
 
   "vector-space-map" = callPackage
-    ({ mkDerivation, base, containers, vector-space }:
+    ({ mkDerivation, base, containers, doctest, vector-space }:
      mkDerivation {
        pname = "vector-space-map";
-       version = "0.1.0.1";
-       sha256 = "0be56ed053c67ed18583f581585392aeb5161fce5b318ced882af045db81b0e8";
+       version = "0.2.0";
+       sha256 = "ceec244a880e7abba75dd9c3324f6a6421a085ff270b30480455a30883c95424";
        libraryHaskellDepends = [ base containers vector-space ];
-       jailbreak = true;
+       testHaskellDepends = [ base doctest ];
        homepage = "https://github.com/conklech/vector-space-map";
        description = "vector-space operations for finite maps using Data.Map";
        license = stdenv.lib.licenses.mit;
@@ -206940,7 +208153,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "vector-th-unbox" = callPackage
+  "vector-th-unbox_0_2_1_3" = callPackage
     ({ mkDerivation, base, data-default, template-haskell, vector }:
      mkDerivation {
        pname = "vector-th-unbox";
@@ -206952,6 +208165,19 @@ self: {
        testHaskellDepends = [ base data-default vector ];
        description = "Deriver for Data.Vector.Unboxed using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "vector-th-unbox" = callPackage
+    ({ mkDerivation, base, data-default, template-haskell, vector }:
+     mkDerivation {
+       pname = "vector-th-unbox";
+       version = "0.2.1.4";
+       sha256 = "a765f8a679d2c59d0ab73d8c158cb020a362ab9e825c845f8202cd11ba660551";
+       libraryHaskellDepends = [ base template-haskell vector ];
+       testHaskellDepends = [ base data-default vector ];
+       description = "Deriver for Data.Vector.Unboxed using Template Haskell";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "verbalexpressions" = callPackage
@@ -208444,34 +209670,28 @@ self: {
      , Cabal-ide-backend, directory, file-embed, filepath, fsnotify, ghc
      , Glob, hspec, http-client, http-conduit, http-reverse-proxy
      , http-types, ide-backend, MissingH, network, optparse-applicative
-     , process, shakespeare, stm, streaming-commons, system-filepath
-     , text, time, transformers, wai, warp, websockets
+     , process, shakespeare, split, stm, streaming-commons
+     , system-filepath, text, time, transformers, wai, warp, websockets
      }:
      mkDerivation {
        pname = "wai-devel";
-       version = "0.0.0.2";
-       sha256 = "2783d78ed3b5b76000182b1f51f9d2772de0460e09e02eb6be6d69127081cf9d";
+       version = "0.0.0.3";
+       sha256 = "3ff4291b31a24e02b859f44b2aba55dcce7dc55850c29a9802570b2431fdf646";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          array base blaze-html bytestring Cabal-ide-backend directory
          file-embed filepath fsnotify ghc Glob http-client http-conduit
          http-reverse-proxy http-types ide-backend MissingH network
-         optparse-applicative process shakespeare stm streaming-commons
-         system-filepath text time transformers wai warp websockets
-       ];
-       executableHaskellDepends = [
-         base blaze-html bytestring Cabal-ide-backend directory file-embed
-         filepath fsnotify ghc Glob http-client http-conduit
-         http-reverse-proxy http-types ide-backend MissingH network
-         optparse-applicative process shakespeare stm streaming-commons
-         system-filepath text time transformers wai warp websockets
+         optparse-applicative process shakespeare split stm
+         streaming-commons system-filepath text time transformers wai warp
+         websockets
        ];
+       executableHaskellDepends = [ base ];
        testHaskellDepends = [ base hspec stm ];
-       jailbreak = true;
        homepage = "https://github.com/urbanslug/wai-devel";
        description = "A web server for the development of WAI compliant web applications";
-       license = stdenv.lib.licenses.gpl3;
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "wai-digestive-functors" = callPackage
@@ -210026,6 +211246,7 @@ self: {
          base bytestring hlint hspec http-types HUnit stm transformers wai
          wai-extra
        ];
+       doCheck = false;
        description = "WAI Middleware for Request Throttling";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -210080,7 +211301,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-predicates" = callPackage
+  "wai-predicates_0_8_5" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
      , bytestring-conversion, case-insensitive, cookie, http-types
      , singletons, tasty, tasty-hunit, tasty-quickcheck, transformers
@@ -210101,9 +211322,10 @@ self: {
        homepage = "https://github.com/twittner/wai-predicates/";
        description = "WAI request predicates";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-predicates_0_8_6" = callPackage
+  "wai-predicates" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
      , bytestring-conversion, case-insensitive, cookie, http-types
      , singletons, tasty, tasty-hunit, tasty-quickcheck, transformers
@@ -210124,7 +211346,6 @@ self: {
        homepage = "https://gitlab.com/twittner/wai-predicates/";
        description = "WAI request predicates";
        license = stdenv.lib.licenses.mpl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-request-spec" = callPackage
@@ -210281,7 +211502,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-routes" = callPackage
+  "wai-routes_0_9_6" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring
      , case-insensitive, containers, cookie, data-default-class
      , filepath, hspec, hspec-wai, hspec-wai-json, http-types
@@ -210304,9 +211525,10 @@ self: {
        homepage = "https://ajnsit.github.io/wai-routes/";
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-routes_0_9_7" = callPackage
+  "wai-routes" = callPackage
     ({ mkDerivation, aeson, base, blaze-builder, bytestring
      , case-insensitive, containers, cookie, data-default-class
      , filepath, hspec, hspec-wai, hspec-wai-json, http-types
@@ -210329,7 +211551,6 @@ self: {
        homepage = "https://ajnsit.github.io/wai-routes/";
        description = "Typesafe URLs for Wai applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-routing_0_12_1" = callPackage
@@ -210357,7 +211578,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-routing" = callPackage
+  "wai-routing_0_12_2" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
      , bytestring-conversion, case-insensitive, containers, cookie
      , http-types, tasty, tasty-hunit, tasty-quickcheck, transformers
@@ -210379,6 +211600,31 @@ self: {
        homepage = "https://github.com/twittner/wai-routing/";
        description = "Declarative routing for WAI";
        license = stdenv.lib.licenses.mpl20;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-routing" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
+     , bytestring-conversion, case-insensitive, containers, cookie
+     , http-types, tasty, tasty-hunit, tasty-quickcheck, transformers
+     , wai, wai-predicates, wai-route
+     }:
+     mkDerivation {
+       pname = "wai-routing";
+       version = "0.12.3";
+       sha256 = "9ce8d30b45ac65162589236b33f4ea417f784c70a1cc10b564880819d2620b0b";
+       libraryHaskellDepends = [
+         attoparsec base bytestring bytestring-conversion case-insensitive
+         cookie http-types transformers wai wai-predicates wai-route
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring bytestring-conversion
+         case-insensitive containers http-types tasty tasty-hunit
+         tasty-quickcheck wai wai-predicates
+       ];
+       homepage = "https://gitlab.com/twittner/wai-routing/";
+       description = "Declarative routing for WAI";
+       license = stdenv.lib.licenses.mpl20;
      }) {};
 
   "wai-session" = callPackage
@@ -213422,8 +214668,8 @@ self: {
      }:
      mkDerivation {
        pname = "werewolf";
-       version = "0.4.4.0";
-       sha256 = "247a99b23a409c11344a70f4fbfc3b939eda436e0e52bd7363c376615644dad8";
+       version = "0.4.6.0";
+       sha256 = "9ee65c21f4310c81dbde660482680bb73a5d8423436b844d9c4402aa511f2118";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -213431,8 +214677,8 @@ self: {
          random-shuffle text transformers
        ];
        executableHaskellDepends = [
-         aeson base directory extra filepath lens mtl optparse-applicative
-         text transformers
+         aeson base directory extra filepath lens MonadRandom mtl
+         optparse-applicative random-shuffle text transformers
        ];
        testHaskellDepends = [
          base containers extra lens mtl QuickCheck tasty tasty-quickcheck
@@ -215483,18 +216729,21 @@ self: {
      }) {};
 
   "xdot" = callPackage
-    ({ mkDerivation, base, cairo, graphviz, gtk, mtl, polyparse, text
+    ({ mkDerivation, base, cairo, graphviz, gtk3, mtl, polyparse, text
+     , transformers
      }:
      mkDerivation {
        pname = "xdot";
-       version = "0.2.4.9";
-       sha256 = "a2ace6970b425d1721b06b054422eef097837e31555579deee3fe532c11a0cda";
+       version = "0.3";
+       sha256 = "27f87b5a772d9a86ffc1866fc7f1b76a2ae14fdfaf791a5fcbedd32c5b15e104";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base cairo graphviz gtk mtl polyparse text
+         base cairo graphviz gtk3 mtl polyparse text
+       ];
+       executableHaskellDepends = [
+         base cairo graphviz gtk3 text transformers
        ];
-       executableHaskellDepends = [ base cairo graphviz gtk text ];
        description = "Parse Graphviz xdot files and interactively view them using GTK and Cairo";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -216596,6 +217845,7 @@ self: {
        version = "0.9.0.2";
        sha256 = "008d596529cffde397c55026c10c8a20951272959e2a6e35cfdfef499719ec7b";
        libraryHaskellDepends = [ base-prelude free text ];
+       jailbreak = true;
        homepage = "https://github.com/sannsyn/xml-query";
        description = "A parser-agnostic declarative API for querying XML-documents";
        license = stdenv.lib.licenses.mit;
@@ -216613,6 +217863,7 @@ self: {
          base-prelude text xml-conduit xml-query xml-query-xml-types
          xml-types
        ];
+       jailbreak = true;
        homepage = "https://github.com/sannsyn/xml-query-xml-conduit";
        description = "A binding for the \"xml-query\" and \"xml-conduit\" libraries";
        license = stdenv.lib.licenses.mit;
@@ -216638,6 +217889,7 @@ self: {
          quickcheck-instances tasty tasty-hunit tasty-quickcheck
          tasty-smallcheck text xml-conduit xml-query xml-types
        ];
+       jailbreak = true;
        homepage = "https://github.com/sannsyn/xml-query-xml-types";
        description = "An interpreter of \"xml-query\" queries for the \"xml-types\" documents";
        license = stdenv.lib.licenses.mit;
@@ -217942,7 +219194,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libyaml;};
 
-  "yaml" = callPackage
+  "yaml_0_8_15_3" = callPackage
     ({ mkDerivation, aeson, aeson-qq, attoparsec, base, base-compat
      , bytestring, conduit, containers, directory, enclosed-exceptions
      , filepath, hspec, HUnit, libyaml, mockery, resourcet, scientific
@@ -217969,6 +219221,36 @@ 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" = 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.16";
+       sha256 = "d68ad3dd16e4b8ba943d0f58666d1f53be24923088df15f46be44bbbaf85c529";
+       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;
      }) {inherit (pkgs) libyaml;};
 
   "yaml-config" = callPackage
@@ -224876,7 +226158,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "zlib-lens" = callPackage
+  "zlib-lens_0_1_2" = callPackage
     ({ mkDerivation, base, bytestring, profunctors, zlib }:
      mkDerivation {
        pname = "zlib-lens";
@@ -224888,9 +226170,10 @@ self: {
        homepage = "http://lens.github.io/";
        description = "Lenses for zlib";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "zlib-lens_0_1_2_1" = callPackage
+  "zlib-lens" = callPackage
     ({ mkDerivation, base, bytestring, profunctors, zlib }:
      mkDerivation {
        pname = "zlib-lens";
@@ -224900,7 +226183,6 @@ self: {
        homepage = "http://lens.github.io/";
        description = "Lenses for zlib";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zmcat" = callPackage

From 2191fb106cf1cc5f0487fb3ce4031de9d9d0a34b Mon Sep 17 00:00:00 2001
From: desiderius <didier@devroye.name>
Date: Wed, 17 Feb 2016 12:27:47 +0100
Subject: [PATCH 1647/2285] pythonPackages.pyrsistent: init at 0.11.12

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cfb92eb5b8a7..46dcc852280a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16629,6 +16629,28 @@ in modules // {
     };
   });
 
+  pyrsistent = buildPythonPackage (rec {
+    name = "pyrsistent-0.11.12";
+
+    src = pkgs.fetchurl {
+      url = "http://pypi.python.org/packages/source/p/pyrsistent/${name}.tar.gz";
+      sha256 = "0jgyhkkq36wn36rymn4jiyqh2vdslmradq4a2mjkxfbk2cz6wpi5";
+    };
+
+    buildInputs = with self; [ six pytest hypothesis ] ++ optional (!isPy3k) modules.sqlite3;
+
+    checkPhase = ''
+      py.test
+    '';
+
+    meta = {
+      homepage = http://github.com/tobgu/pyrsistent/;
+      description = "Persistent/Functional/Immutable data structures";
+      license = licenses.mit;
+      maintainers = with maintainers; [ desiderius ];
+    };
+  });
+
   pyrss2gen = buildPythonPackage (rec {
     name = "PyRSS2Gen-1.0.0";
 

From 312494180d4644acba05ec133217748dec1f392b Mon Sep 17 00:00:00 2001
From: Michel Kuhlmann <michel@kuhlmanns.info>
Date: Mon, 22 Feb 2016 08:52:22 +0100
Subject: [PATCH 1648/2285] nixpkgs manual: add basic R documentation, fixes
 #13362

also fixes #13243
---
 doc/default.nix                      |  5 ++-
 doc/languages-frameworks/index.xml   |  1 +
 pkgs/development/r-modules/README.md | 55 ++++++++++++++++++++++++++++
 3 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/r-modules/README.md

diff --git a/doc/default.nix b/doc/default.nix
index 65e12254f78d..196b9e445390 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -56,8 +56,11 @@ stdenv.mkDerivation {
       inputFile = ./../pkgs/development/idris-modules/README.md;
       outputFile = "languages-frameworks/idris.xml";
     }
+  + toDocbook {
+      inputFile = ./../pkgs/development/r-modules/README.md;
+      outputFile = "languages-frameworks/r.xml";
+    }
   + ''
-    cat languages-frameworks/idris.xml
     echo ${nixpkgsVersion} > .version
 
     xmllint --noout --nonet --xinclude --noxincludenode \
diff --git a/doc/languages-frameworks/index.xml b/doc/languages-frameworks/index.xml
index 743a1b70be7c..e63ff3ab1407 100644
--- a/doc/languages-frameworks/index.xml
+++ b/doc/languages-frameworks/index.xml
@@ -21,6 +21,7 @@ such as Perl or Haskell.  These are described in this chapter.</para>
 <xi:include href="lua.xml" />
 <xi:include href="coq.xml" />
 <xi:include href="idris.xml" /> <!-- generated from ../../pkgs/development/idris-modules/README.md  -->
+<xi:include href="r.xml" /> <!-- generated from ../../pkgs/development/r-modules/README.md  -->
 <xi:include href="qt.xml" />
 
 
diff --git a/pkgs/development/r-modules/README.md b/pkgs/development/r-modules/README.md
new file mode 100644
index 000000000000..3a88f45b4ccb
--- /dev/null
+++ b/pkgs/development/r-modules/README.md
@@ -0,0 +1,55 @@
+R packages
+==========
+
+## Installation
+
+Define an environment for R that contains all the libraries that you'd like to
+use by adding the following snippet to your $HOME/.nixpkgs/config.nix file:
+
+```nix
+{
+    packageOverrides = super: let self = super.pkgs; in
+    {
+
+        rEnv = super.rWrapper.override {
+            packages = with self.rPackages; [ 
+                devtools
+                ggplot2
+                reshape2
+                yaml
+                optparse
+                ];
+        };
+    };
+}
+```
+
+Then you can use `nix-env -f "<nixpkgs>" -iA rEnv` to install it into your user
+profile. The set of available libraries can be discovered by running the
+command `nix-env -f "<nixpkgs>" -qaP -A rPackages`. The first column from that
+output is the name that has to be passed to rWrapper in the code snipped above.
+
+## Updating the package set
+
+```bash
+Rscript generate-r-packages.R cran  > cran-packages.nix.new
+mv cran-packages.nix.new cran-packages.nix
+
+Rscript generate-r-packages.R bioc  > bioc-packages.nix.new
+mv bioc-packages.nix.new bioc-packages.nix
+
+Rscript generate-r-packages.R irkernel  > irkernel-packages.nix.new
+mv irkernel-packages.nix.new irkernel-packages.nix
+```
+
+`generate-r-packages.R <repo>` reads  `<repo>-packages.nix`, therefor the renaming.
+
+
+## Testing if the Nix-expression could be evaluated
+
+```bash
+nix-build test-evaluation.nix --dry-run
+```
+
+If this exits fine, the expression is ok. If not, you have to edit `default.nix`
+

From 9b99fd78fb4a52c7141def7eeb51ae01427b997f Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Mon, 22 Feb 2016 10:33:13 +0100
Subject: [PATCH 1649/2285] pythonPackages.github-cli: init at 1.0.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1b125b6c938b..f3905760b957 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2737,6 +2737,19 @@ in modules // {
     };
   };
 
+  github-cli = buildPythonPackage rec {
+    name = "github-cli-1.0.0";
+
+    propagatedBuildInputs = with self; [ simplejson ];
+    doCheck = false;
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/g/github-cli/${name}.tar.gz";
+      sha256 = "0csr8q208a0nixxs8mx6nbak19sylcpjcng50c2i6qldsxfbh1af";
+    };
+    meta.maintainers = with maintainers; [ garbas ];
+  };
+
   cassandra-driver = buildPythonPackage rec {
     name = "cassandra-driver-2.6.0c2";
 

From 1a025a4a9649bbe581a6d6da68bb61cdf7109c81 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 13 Jan 2016 19:46:41 +0300
Subject: [PATCH 1650/2285] cups: 2.0.4 -> 2.1.3

Also enable parallel building and don't install rc.d scripts.
---
 pkgs/misc/cups/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 82fd1d65baf5..437300650419 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -5,7 +5,7 @@
 
 ### IMPORTANT: before updating cups, make sure the nixos/tests/printing.nix test
 ### works at least for your platform.
-let version = "2.0.4"; in
+let version = "2.1.3"; in
 
 with stdenv.lib;
 stdenv.mkDerivation {
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2";
-    sha256 = "1gaakz24k6x5nc09rmpiq0xq20j1qdjc3szag8qwmyi4ky6ydmg1";
+    sha256 = "1lyl3z01xhg9xb9c8m42398c6h9kw8qr6jwiv8bjdsjab11hv9rn";
   };
 
   buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb gnutls libpaper ]
@@ -53,7 +53,6 @@ stdenv.mkDerivation {
       # Idem for /etc.
       "PAMDIR=$(out)/etc/pam.d"
       "DBUSDIR=$(out)/etc/dbus-1"
-      "INITDIR=$(out)/etc/rc.d"
       "XINETD=$(out)/etc/xinetd.d"
       "SERVERROOT=$(out)/etc/cups"
       # Idem for /usr.
@@ -63,6 +62,8 @@ stdenv.mkDerivation {
       "CUPS_PRIMARY_SYSTEM_GROUP=root"
     ];
 
+  enableParallelBuilding = true;
+
   postInstall = ''
       # Delete obsolete stuff that conflicts with cups-filters.
       rm -rf $out/share/cups/banners $out/share/cups/data/testprint

From 8b124b752179a5e28dc75bf4adbfd6f49bb85cdb Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 22 Feb 2016 12:22:29 +0300
Subject: [PATCH 1651/2285] nixos.tests.printing: fix for new CUPS version

It looks like now queue is not immediately cleared from cancelled jobs.
Instead, files like "c00001" are left alongside "d00001-001", and
cleanup happens at some later point of time. Also, all new jobs are
assigned consecutive numbers now (00002, 00003 etc.). So when
original d00001 file is finally cleaned, it breaks the test. Fixed
by checking for any "d*" file inside the queue and cleaning it by
ourselves to ensure that each job works correctly.
---
 nixos/tests/printing.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/printing.nix b/nixos/tests/printing.nix
index 02980cee2fbd..10d69b446cd7 100644
--- a/nixos/tests/printing.nix
+++ b/nixos/tests/printing.nix
@@ -78,7 +78,7 @@ import ./make-test.nix ({pkgs, ... }: {
               # (showing that the right filters have been applied).  Of
               # course, since there is no actual USB printer attached, the
               # file will stay in the queue forever.
-              $server->waitForFile("/var/spool/cups/d00001-001");
+              $server->waitForFile("/var/spool/cups/d*-001");
               $server->sleep(10);
               $server->succeed("lpq -a") =~ /$fn/ or die;
 
@@ -90,6 +90,9 @@ import ./make-test.nix ({pkgs, ... }: {
               Machine::retry sub {
                 return 1 if $server->succeed("lpq -a") =~ /no entries/;
               };
+              # The queue is empty already, so this should be safe.
+              # Otherwise, pairs of "c*"-"d*-001" files might persist.
+              $server->execute("rm /var/spool/cups/*");
           };
       }
     '';

From 04ef62d557ac31e734942d5ddffc4a3bee426672 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 22 Feb 2016 11:01:17 +0100
Subject: [PATCH 1652/2285] pythonPackages.flask_sqlalchemy: init at 2.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f3905760b957..11fcde3f5d9d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8833,6 +8833,24 @@ in modules // {
     };
   };
 
+  flask_sqlalchemy = buildPythonPackage rec {
+    name = "Flask-SQLAlchemy-${version}";
+    version = "2.1";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/F/Flask-SQLAlchemy/${name}.tar.gz";
+      sha256 = "1i9ps5d5snih9xlqhrvmi3qfiygkmqzxh92n25kj4pf89kj4s965";
+    };
+
+    propagatedBuildInputs = with self ; [ flask sqlalchemy_1_0 ];
+
+    meta = {
+      description = "SQLAlchemy extension for Flask";
+      homepage = http://flask-sqlalchemy.pocoo.org/;
+      license = licenses.bsd3;
+    };
+  };
+
   wtforms = buildPythonPackage rec {
     version = "2.0.2";
     name = "wtforms-${version}";

From 1053cfa4d5e2fff51c399fcbbdca0c19a6727e10 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Mon, 22 Feb 2016 11:01:40 +0100
Subject: [PATCH 1653/2285] pythonPackages.flask_migrate: init at 1.7.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 11fcde3f5d9d..cc7bf8328ced 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8774,6 +8774,31 @@ in modules // {
     };
   };
 
+  flask_migrate = buildPythonPackage rec {
+    name = "Flask-Migrate-${version}";
+    version = "1.7.0";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/F/Flask-Migrate/Flask-Migrate-1.7.0.tar.gz";
+      sha256 = "16d7vnaj9xmxvb3qbcmhahm3ldfdhzzi6y221h62x4v1v1jayx7v";
+    };
+
+    # When tests run with python3*, tests should run commands as "python3 <args>",
+    # not "python <args>"
+    patchPhase = ''
+      substituteInPlace tests/test_migrate.py --replace "python" "${python.executable}"
+      substituteInPlace tests/test_multidb_migrate.py --replace "python" "${python.executable}"
+    '';
+
+    propagatedBuildInputs = with self ; [ flask flask_sqlalchemy flask_script alembic ];
+
+    meta = {
+      description = "SQLAlchemy database migrations for Flask applications using Alembic";
+      license = licenses.mit;
+      homepage = https://github.com/miguelgrinberg/Flask-Migrate;
+    };
+  };
+
   flask_principal = buildPythonPackage rec {
     name = "Flask-Principal-${version}";
     version = "0.4.0";

From 389d04cbe7e346e3f0e628a22d5dc5e7286d1843 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 22 Feb 2016 11:41:21 +0100
Subject: [PATCH 1654/2285] curl: 7.47.0 -> 7.47.1

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

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index 910d86066d9a..c75cceb46a57 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -18,11 +18,11 @@ assert scpSupport -> libssh2 != null;
 assert c-aresSupport -> c-ares != null;
 
 stdenv.mkDerivation rec {
-  name = "curl-7.47.0";
+  name = "curl-7.47.1";
 
   src = fetchurl {
     url = "http://ngcobalt13.uxnr.de/mirror/curl/${name}.tar.bz2";
-    sha256 = "0riz70pjg82gbcfi2ndvsksb2dv55g31ir8piph2p6zvhy9ny29b";
+    sha256 = "13z9gba3q2ybp50z0gdkzhwcx9m0i7qkvm278yz4pql2jfml7inx";
   };
 
   nativeBuildInputs = [ pkgconfig perl ];

From ac9ab2c3f5d3bfb22c86945293e82ffca324ee23 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Thu, 18 Feb 2016 19:26:17 +0300
Subject: [PATCH 1655/2285] PULL_REQUEST_TEMPLATE: init

---
 .github/PULL_REQUEST_TEMPLATE.md | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000000..787524c75758
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,15 @@
+###### Things done:
+- [ ] Tested via `nix.useChroot`.
+- [ ] Built on platform(s): .
+- [ ] Tested compilation of all pkgs that depend on this change.
+- [ ] Tested execution of binary products.
+- [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).
+
+###### Extra
+Fixes # .
+
+cc @ .
+
+---
+
+_Please note, that points are not mandatory._

From 32e3475e93f9193dbf47961cf43e0440b936331b Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Mon, 22 Feb 2016 12:27:34 +0100
Subject: [PATCH 1656/2285] pythonPackages.github-cli: enable tests

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f3905760b957..7a667a81359d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2738,15 +2738,22 @@ in modules // {
   };
 
   github-cli = buildPythonPackage rec {
-    name = "github-cli-1.0.0";
-
-    propagatedBuildInputs = with self; [ simplejson ];
-    doCheck = false;
-
-    src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/g/github-cli/${name}.tar.gz";
-      sha256 = "0csr8q208a0nixxs8mx6nbak19sylcpjcng50c2i6qldsxfbh1af";
+    version = "1.0.0";
+    name = "github-cli-${version}";
+    src = pkgs.fetchFromGitHub {
+      owner = "jsmits";
+      repo = "github-cli";
+      rev = version;
+      sha256 = "16bwn42wqd76zs97v8p6mqk79p5i2mb06ljk67lf8gy6kvqc1x8y";
     };
+
+    buildInputs = with self; [ nose pkgs.git ];
+    propagatedBuildInputs = with self; [ simplejson ];
+
+    # skipping test_issues_cli.py since it requires access to the github.com
+    patchPhase = "rm tests/test_issues_cli.py";
+    checkPhase = "nosetests tests/";
+
     meta.maintainers = with maintainers; [ garbas ];
   };
 

From 0918c6f08f2f6e9794afc7a1111a32e47e7dd06c Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 22 Feb 2016 12:43:53 +0100
Subject: [PATCH 1657/2285] Add LTS Haskell 5.3. Also add aliases that point to
 the respective latest LTS version.

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

diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 2eadcbeefef3..404d0968d40e 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -154,6 +154,7 @@ rec {
     lts-0_7 = packages.ghc783.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-0.7.nix { };
     };
+    lts-0 = packages.lts-0_7;
 
     lts-1_0 = packages.ghc784.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.0.nix { };
@@ -197,6 +198,7 @@ rec {
     lts-1_15 =packages.ghc784.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-1.15.nix { };
     };
+    lts-1 = packages.lts-1_15;
 
     lts-2_0 = packages.ghc784.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.0.nix { };
@@ -267,6 +269,7 @@ rec {
     lts-2_22 = packages.ghc784.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-2.22.nix { };
     };
+    lts-2 = packages.lts-2_22;
 
     lts-3_0 = packages.ghc7102.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.0.nix { };
@@ -331,6 +334,7 @@ rec {
     lts-3_20 = packages.ghc7102.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-3.20.nix { };
     };
+    lts-3 = packages.lts-3_20;
 
     lts-4_0 = packages.ghc7103.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-4.0.nix { };
@@ -341,6 +345,7 @@ rec {
     lts-4_2 = packages.ghc7103.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-4.2.nix { };
     };
+    lts-4 = packages.lts-4_2;
 
     lts-5_0 = packages.ghc7103.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.0.nix { };
@@ -351,6 +356,11 @@ rec {
     lts-5_2 = packages.ghc7103.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.2.nix { };
     };
+    lts-5_3 = packages.ghc7103.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.3.nix { };
+    };
+    lts-5 = packages.lts-5_3;
 
+    lts = packages.lts-5;
   };
 }

From 5f772ebf5546f3ec5e8633ff54cf0c8581cf5463 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 22 Feb 2016 06:18:27 -0600
Subject: [PATCH 1658/2285] melpaStablePackages 2016-02-22

---
 .../emacs-modes/melpa-stable-generated.nix    | 3338 +++++++++--------
 1 file changed, 1838 insertions(+), 1500 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix b/pkgs/applications/editors/emacs-modes/melpa-stable-generated.nix
index b682fdb830c9..559418bd05cb 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 = "13f4l9xzx4xm5m80kkb49zh31w0bn0kw9m5ca28rrx4aysqmwryv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/abc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/abc-mode";
           sha256 = "0qf5lbszyscmagiqhc0d05vzkhdky7ini4w33z1h3j5417sscrcx";
           name = "abc-mode";
         };
@@ -31,7 +31,7 @@
           sha256 = "0a8widshsm39cbala17pmnk1sazazhhyqppwalysli170whk49c5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-alchemist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-alchemist";
           sha256 = "02ll3hcixgdb8zyszn78714gy1h2q0vkhpbnwap9302mr2racwl0";
           name = "ac-alchemist";
         };
@@ -52,7 +52,7 @@
           sha256 = "0vrd6g9cl02jjxrjxpshq4pd748b5xszhpmakywrw8s08nh8jf44";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-anaconda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-anaconda";
           sha256 = "124nvigk6y3iw0lj2r7div88rrx8vz59xwqph1063jsrc29x8rjf";
           name = "ac-anaconda";
         };
@@ -73,7 +73,7 @@
           sha256 = "12z8nq797hjy0bq5vzpcm7z7bdn0ixc3ma4cj3v51xnwmgknzk6c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-cake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-cake";
           sha256 = "0s2pgf0m98ixgadsnn201vm5gnawanpvxv56sf599f33krqnxzkl";
           name = "ac-cake";
         };
@@ -94,7 +94,7 @@
           sha256 = "0mlmhdl9s28z981y8bnpj8jpfzm6bgfiyl0zmpgvhyqw1wzqywwv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-cake2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-cake2";
           sha256 = "0qxilldx23wqf8ilif2nin119bvd0l7b6f6wifixx28a6kl1vsgy";
           name = "ac-cake2";
         };
@@ -115,7 +115,7 @@
           sha256 = "0nyq34yq4jcp3p30ygma3iz1h0q551p33792byj76pa5ps09g1da";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-capf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-capf";
           sha256 = "1drgk5iz2wp3rxzd39pj0n4cfmm5z8zqlp50jw5z7ffbbg35qxbm";
           name = "ac-capf";
         };
@@ -136,7 +136,7 @@
           sha256 = "1vpj0lxbvlxffj2z29l109w70hcphiavyvglsw524agxql3c8yf9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-cider";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-cider";
           sha256 = "1dszpb706h34miq2bxqyq1ycbran5ax36vcniwp8vvhgcjsw5sz6";
           name = "ac-cider";
         };
@@ -157,7 +157,7 @@
           sha256 = "1sdgpyq5p824dnxv6r7djwvhyhdmnis8k6992klr8iz7anhxzdam";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-clang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-clang";
           sha256 = "070s06xhkzaqfc3j8c4i44rks6gn8z66lwd54j17p8d91x3qjpr4";
           name = "ac-clang";
         };
@@ -178,7 +178,7 @@
           sha256 = "0a3s880nswc2s6yh2v5zsmws550q917i7av8nrxc5sp1d03xqwmn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-dcd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-dcd";
           sha256 = "086jp9c6bilc361n1hscza3pbhgvqlq944z7cil2jm1kicsf8s7r";
           name = "ac-dcd";
         };
@@ -199,7 +199,7 @@
           sha256 = "0cc3jpc4pihbyznyzvf6i3xwc2x78gb5m36ba9gkvxhabsljnlfg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-emoji";
           sha256 = "0msh3dh89jzk6hxva34gp9d5pazchgdknxjbi72z26rss9bkp1mw";
           name = "ac-emoji";
         };
@@ -220,7 +220,7 @@
           sha256 = "0ijni3qgd68jhznhirhgcl59cr7hwfvbwgf6z120x56jmp8h01d2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-etags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-etags";
           sha256 = "0ag49k9izrs4ikzac9lifvvwhcn5n89lr2vb20pngsvg1czdyhzb";
           name = "ac-etags";
         };
@@ -241,7 +241,7 @@
           sha256 = "02ifz25rq64z0ifxs52aqdz0iz4mi6xvj88hcn3aakkmsj749vvn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-geiser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-geiser";
           sha256 = "0v558qz1mp8b1bgk8kgdk5sx5mpd353mw77n5b0pw4b2ikzpz2mx";
           name = "ac-geiser";
         };
@@ -262,7 +262,7 @@
           sha256 = "0m33v9iy3y37sicfmpx7kvmn8v1a8k6cs7d0v9v5k93p4d5ila41";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-haskell-process";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-haskell-process";
           sha256 = "0kv4z850kv03wiax1flnrp6sgqja25j23l719w7rkr7ck110q8rw";
           name = "ac-haskell-process";
         };
@@ -283,7 +283,7 @@
           sha256 = "1gw38phyaslpql7szvlpwgyfngdgd21f6lq406vq0gjwwmxgig34";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-helm";
           sha256 = "16ajxlhcah5zbvywpc6l4l1arr308gjpgvdx6l1nrv2zvpckhlwq";
           name = "ac-helm";
         };
@@ -304,7 +304,7 @@
           sha256 = "19v9515ixg22m7h7riix8w3vyhzax1m2pbwdirp59v532xn9b0cz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-html";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-html";
           sha256 = "0qf8f75b6dvy844dq8vh8d9c6k599rh1ynjcif9bwvdpf6pxwvqa";
           name = "ac-html";
         };
@@ -325,7 +325,7 @@
           sha256 = "1zmjqnlbfchnb7n2v7ms7q06xma1lmf9ry3v6f4pfnwlmz5lsf3a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-html-bootstrap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-html-bootstrap";
           sha256 = "0z71m6xws0k9smhsswaivpikr64mv0wh6klnmi5cwhwcqas6kdi1";
           name = "ac-html-bootstrap";
         };
@@ -346,7 +346,7 @@
           sha256 = "0p18wxyyc1jmcwx9y5i77s25v4jszv7cmm4bkwm4dzhkxd33kh1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-html-csswatcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-html-csswatcher";
           sha256 = "0jb9dnm2lxadrxssf0rjqw8yvvskcq4hys8c21shjyj3gkvwbfqn";
           name = "ac-html-csswatcher";
         };
@@ -367,7 +367,7 @@
           sha256 = "1acm13n59sdgvvzicscxzrr5j1x5sa5x4rc4cnkbwb28nw5a5ysm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-inf-ruby";
           sha256 = "04jclf0yxz78x1fsaf5sh1p466947nqrcx337kyhqn0nkj3hplqr";
           name = "ac-inf-ruby";
         };
@@ -388,7 +388,7 @@
           sha256 = "16qsj3wni4xhcrjx2rnxdzq6jb7jrl4bngi4an37vgdlrx3w8m6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-ispell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-ispell";
           sha256 = "1vsy2qjh60n5lavivpqhhcpg5pk8zz2r0wy1sb65capn841zdi67";
           name = "ac-ispell";
         };
@@ -409,7 +409,7 @@
           sha256 = "19cb8kq8gmrplkxil22ahvbyq5cng1l2vh2lrfiyqpjsap7zfjz5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-mozc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-mozc";
           sha256 = "1v3iiid8cq50i076q98ycks9m827xzncgxqwqs2rqhab0ncy3h0f";
           name = "ac-mozc";
         };
@@ -430,7 +430,7 @@
           sha256 = "16f8hvdz6y8nsfj7094yrvw194ag3w1jvz81h287vcgcvmyb7wdf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-octave";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-octave";
           sha256 = "1g5s4dk1rcgkjn17jfw6g201pw0vfhqcx1nhigmnizpnzy0man9z";
           name = "ac-octave";
         };
@@ -451,7 +451,7 @@
           sha256 = "0qz8q9qzr7nqdhyjf01p50949bkps62nckampahv9bli4w92xckz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-php";
           sha256 = "0p9qq8nszp5jb71s35cxnmcxp50b62y2jv1ha7vvqfz5p8miallk";
           name = "ac-php";
         };
@@ -483,7 +483,7 @@
           sha256 = "0g7xbfsfqpmcay56y8xbmif52ccz430s3rjxf5bgl9ahkk7zgkzl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-racer";
           sha256 = "1vkvh8y3ckvzvqxj4i2k6jqri94121wbfjziybli74qba8dca4yp";
           name = "ac-racer";
         };
@@ -504,7 +504,7 @@
           sha256 = "13yghv7p6c91fn8mrxbwrb6ldk5n3b6nj6a7pwsvks1q73i1pl88";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ac-slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ac-slime";
           sha256 = "0mk3k1lcbqa16xvsbgk28x09vzqyaidqaqpq934xdbrwhdgwgckg";
           name = "ac-slime";
         };
@@ -525,7 +525,7 @@
           sha256 = "1pzh5l8dybrrmglj55nbff6065pxlbx14501p3a1qx1wvf24g1sv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-flyspell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-flyspell";
           sha256 = "0f24qrpcvyg7h6ylyggn4zrbydci537iigshac1d8yywsr0j47gd";
           name = "ace-flyspell";
         };
@@ -546,7 +546,7 @@
           sha256 = "0233ai62zhsy5yhv72016clygwp2pcg80y6kr4cjm2k1k2wwy7m9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-isearch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-isearch";
           sha256 = "0n8qf08z9n8c2sp5ks29nxcfks5mil1jj6wq348apda8safk36hm";
           name = "ace-isearch";
         };
@@ -567,7 +567,7 @@
           sha256 = "1z82a0lrb61msamqpsy7rxcgs2nfhhckkk4zw0aw49l248p2nrgs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-jump-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-jump-buffer";
           sha256 = "0hkxa0ps0v1hwmjafqbnyr6rc4s0w95igk8y3w53asl7f5sj5mpi";
           name = "ace-jump-buffer";
         };
@@ -580,15 +580,15 @@
     ace-jump-helm-line = callPackage ({ avy, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "ace-jump-helm-line";
-        version = "0.3.3";
+        version = "0.4.0";
         src = fetchFromGitHub {
           owner = "cute-jumper";
           repo = "ace-jump-helm-line";
-          rev = "8259c2bd34486c3929c3425f3354d70cdb478c69";
-          sha256 = "0rrdh7jq23dyplq5rsf6f3a8v5f8smrzi85dgvqagasv74d19jbv";
+          rev = "0f9a440f0d263a5f99c2a978e5b41310bf73d7ea";
+          sha256 = "1hsnsncarhvkhl2r6cg1x23vgfqzrwcbmdfkwasfgs7pgnd722m7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-jump-helm-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-jump-helm-line";
           sha256 = "04q8wh6jskvbiq6y2xsp2ir23vgz5zw09rm127sgiqrmn0jc61b9";
           name = "ace-jump-helm-line";
         };
@@ -609,7 +609,7 @@
           sha256 = "1bwvzh056ls2v7y26a0s4j5mj582dmds04lx4x6iqihs04ss74bb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-jump-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-jump-mode";
           sha256 = "0yk0kppjyblr5wamncrjm3ym3n8jcl0r0g0cbnwni89smvpngij6";
           name = "ace-jump-mode";
         };
@@ -630,7 +630,7 @@
           sha256 = "0yng6qayzqadk4cdviri84ghld4can35q134hm3n3j3vprhpbmca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-jump-zap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-jump-zap";
           sha256 = "07bkmly3lvlbby2m13nj3m1q0gcnwy5sas7d6ws6vr9jh0d36byb";
           name = "ace-jump-zap";
         };
@@ -651,7 +651,7 @@
           sha256 = "1v127ld04gn16bgismbcz91kfjk71f3g8yf10r4scfp603y41zgz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-link";
           sha256 = "1jl805r2s3wa0xyhss1q28rcy6y2fngf0yfcrcd9wf8kamhpajk5";
           name = "ace-link";
         };
@@ -672,7 +672,7 @@
           sha256 = "1614xypwiv8xri7w921w7gj26zx7pvwk3212k71qn0capq7hs32g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-pinyin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-pinyin";
           sha256 = "18gmj71zd0i6yx8ifjxsqz2v81jx0j37f5kxllf31w7fj32ymbkc";
           name = "ace-pinyin";
         };
@@ -693,7 +693,7 @@
           sha256 = "1qiiivkwa95bhyym8ly7fnwwglc9dcifkyr314bsq8m4rp1mgry4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-popup-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-popup-menu";
           sha256 = "1cq1mpv7v98bqrpsm598krq1741b6rwih71cx3yjifpbagrv4m5s";
           name = "ace-popup-menu";
         };
@@ -714,7 +714,7 @@
           sha256 = "07mcdzjmgrqdvjs94f2n5bkrf5vrq2fwzz256wbm3wzqxqkfy1q6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ace-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ace-window";
           sha256 = "1k0x8m1phmvgdxb5aj841iai9q96a5lfq8i4b5vnlbc3w888n3xa";
           name = "ace-window";
         };
@@ -735,7 +735,7 @@
           sha256 = "0hib4a8385q2czi1yqs0hwnva2xi7kw0bdfnrgha1hrl30rilp2f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ack-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ack-menu";
           sha256 = "1d2kw04ndxji2qjcm1b65qnxpp08zx8gbia8bl6x6mnjb2isc2d9";
           name = "ack-menu";
         };
@@ -756,7 +756,7 @@
           sha256 = "0zybch8hz3mj63i0pxynb4d76ywqcy7b4fsa4hh71c2kb0bnczb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/actionscript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/actionscript-mode";
           sha256 = "1dkiay9jmizvslji5kzab4dxm1dq0jm8ps7sjq6710g7a5aqdvwq";
           name = "actionscript-mode";
         };
@@ -777,7 +777,7 @@
           sha256 = "1mb7dlyd5w161xagwn6w5h4q660dppkd50m71vz0w3zmxsc9a0vq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/adoc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/adoc-mode";
           sha256 = "0wgagcsh0fkb51fy17ilrs20z2vzdpmz97vpwijcfy2b9rypxq15";
           name = "adoc-mode";
         };
@@ -798,7 +798,7 @@
           sha256 = "1y9bw2vkl952pha2dsi18swyr94mihgwlcg5m8hg4d5bfg2fzcb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aes";
           sha256 = "11vl9x3ldrv7q7rd29xk4xmlvfxs0m6iys84f6mlgf00190l5r5v";
           name = "aes";
         };
@@ -819,7 +819,7 @@
           sha256 = "0hpsv2zyhhfm53hrd2lzvc9gpvfn6g5dpwmzxfl8l1sqjisips2a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ag";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ag";
           sha256 = "1r4ai09vdckkg4h4i7dp781qqmm4kky53p4q8azp3n2c78i1vz6g";
           name = "ag";
         };
@@ -832,15 +832,15 @@
     aggressive-indent = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "aggressive-indent";
-        version = "1.4.2";
+        version = "1.5";
         src = fetchFromGitHub {
           owner = "Malabarba";
           repo = "aggressive-indent-mode";
-          rev = "970c5e3bd4519deed8b8b604a5a96269166bf697";
-          sha256 = "0nss26rz8qly0q00iq7i7q4ss3xvs4s5ndjjmfxhybmnb71a8y9k";
+          rev = "1b831d21ac9688e3f31703f0b492202f6d24a75b";
+          sha256 = "0g8mhfab55a4jvb00kcv9f8cyx4l4d5qyfvp7sf7z12qnkik7b6w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aggressive-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aggressive-indent";
           sha256 = "1qi8jbr28gax35siim3hnnkiy8pa2vcrzqzc6axr98wzny46x0i2";
           name = "aggressive-indent";
         };
@@ -861,7 +861,7 @@
           sha256 = "1qqrf9ncc3blkv4p2bhh9q6y41pp9p4wr667mm80vb5j8rkpsaa8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ahk-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ahk-mode";
           sha256 = "066l4hsb49wbyv381qgn9k4hn8gxlzi20h3qaim9grngjj5ljbni";
           name = "ahk-mode";
         };
@@ -882,7 +882,7 @@
           sha256 = "0blrpqn8wy9pwzikgzb0v6x4hk7axv93j4byfci62fh1905zfkkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/airline-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/airline-themes";
           sha256 = "0jkhb6nigyjmwqny7g59h4ssfy64vl3qnwcw46wnx5k9i73cjyih";
           name = "airline-themes";
         };
@@ -903,7 +903,7 @@
           sha256 = "0m05wxvvygc4rpkgnnmk6zrp3d8fylzzjz5ag7lh0jk5al4gfay5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/alchemist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/alchemist";
           sha256 = "18jxw0zb7y34qbm4bcpfpb2656f0h9grmrbfskgp4ra4q5q3n369";
           name = "alchemist";
         };
@@ -924,7 +924,7 @@
           sha256 = "1pk5dgjqrynap85700wdivq41bdqvwd5hkfimgmcd48l5lhj9pbj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/alect-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/alect-themes";
           sha256 = "04fq65qnxlvl5nc2q037c6yb4nf422dfw2913gv6zfh9rdmxsks8";
           name = "alect-themes";
         };
@@ -945,7 +945,7 @@
           sha256 = "1vpc3q40m6dcrslki4bg725j4kv6c6xfxwjjl1ilg7la49fwwf26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/alert";
           sha256 = "0x3cvczq09jvshz435jw2fjm69457x2wxdvvbbjq46nfnybhi118";
           name = "alert";
         };
@@ -966,7 +966,7 @@
           sha256 = "00kfnkr0rclzbir2xxzr9wf2g0hf1alc004v8i9mqf3ab6dgdqiy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/amd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/amd-mode";
           sha256 = "17ry6vm5xlmdfs0mykdyn05cik38yswq5axdgn8hxrvvb6f58d06";
           name = "amd-mode";
         };
@@ -987,7 +987,7 @@
           sha256 = "0sj6cr2bghy80dnwgl7rg61abdlvgfzi0jjc7jrxz7fdzwkcq714";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anaconda-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anaconda-mode";
           sha256 = "0gz16aam4zrm3s9ms13h4qcdflf55506kgkpyncq3bi54cvv8n1r";
           name = "anaconda-mode";
         };
@@ -1008,7 +1008,7 @@
           sha256 = "0fnxxvw81c34zhmiyr5awl92wr5941n4gklvzjc4jphaf2nhkg4w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anaphora";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anaphora";
           sha256 = "1wb7fb3pc4gxvpjlm6gjbyx0rbhjiwd93qwc4vfw6p865ikl19y2";
           name = "anaphora";
         };
@@ -1029,7 +1029,7 @@
           sha256 = "0gjynmzqlqz0d57fb4np6xrklqdn11y4vjbm18rlpvmk92bgw740";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/android-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/android-mode";
           sha256 = "1nqrvq411yg4b9xb5cvc7ai7lfalwc2rfhclzprvymc4vxh6k4cc";
           name = "android-mode";
         };
@@ -1050,7 +1050,7 @@
           sha256 = "1798nv4djhxzbin68zf6w7dbfm9sc39d0kygky52ii36arg5r1zp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/angular-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/angular-mode";
           sha256 = "1bwfmjldnxki0lqi3ys6r2a3nlhbwm1dibsg2dvzirq8qql02w1i";
           name = "angular-mode";
         };
@@ -1071,7 +1071,7 @@
           sha256 = "0h9i0iimanbvhbqy0cj9na335rs961pvhxjj4k8y53qc73xm102a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/angular-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/angular-snippets";
           sha256 = "057phgizn1c6njvdfigb23ljs31knq247gr0rcpqfrdaxsnnzm5c";
           name = "angular-snippets";
         };
@@ -1092,7 +1092,7 @@
           sha256 = "18ninv1z8zdqpqnablbds4zgxgk4c1nmznlfdicj6qs738c5c30s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/annotate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/annotate";
           sha256 = "1ajykgara2m713blj2kfmdz12fzm8jw7klyakkyi6i3c3a9m44jy";
           name = "annotate";
         };
@@ -1113,7 +1113,7 @@
           sha256 = "1ppq3kszzj2fgr7mwj565bjs8bs285ymy384cnnw7paddgcr9z02";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/annoying-arrows-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/annoying-arrows-mode";
           sha256 = "13bwqv3mv7kgi1gms58f5g03q5g7q98n4vv6n28zqmppxm5z33s7";
           name = "annoying-arrows-mode";
         };
@@ -1134,7 +1134,7 @@
           sha256 = "1hbddxarr40ygvaw4pwaivq2l4f0brszw73w1r50lkjlggb7bl3g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ansi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ansi";
           sha256 = "04n0kvaqq8214prdk20bplqyzlsnlzfzsg23ifkrzjgqjjpdcyi1";
           name = "ansi";
         };
@@ -1155,7 +1155,7 @@
           sha256 = "03d240jngxw51ybrsjw8kdxygrr0ymdckzwga2jr1bqf26v559j2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ansible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ansible";
           sha256 = "1xdc05fdglqfbizra6s1zl6knnvaq526dkxqnw9g7w269j8f4z8g";
           name = "ansible";
         };
@@ -1176,7 +1176,7 @@
           sha256 = "05z379k6a7xq9d2zapf687x3f37jpmh6kfghpgxdd18v0hzca8ds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ansible-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ansible-doc";
           sha256 = "03idvnn79fr9id81aivkm7g7cmlsg0c520wcq4da8g013xvi342w";
           name = "ansible-doc";
         };
@@ -1197,7 +1197,7 @@
           sha256 = "1i1xb04g17f6029w0n8fp55gklgr9kh6c24m9dfrkn5q3dlvd26p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anti-zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anti-zenburn-theme";
           sha256 = "1sp9p6m2jy4m9fdn1hz25cmasy0mwwgn46qmvm92i56f5x6jlzzk";
           name = "anti-zenburn-theme";
         };
@@ -1218,7 +1218,7 @@
           sha256 = "1z6l72dn98icqsmxb3rrj6l63ijc3xgfa3vdl19yqa2rfy6ya721";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anyins";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anyins";
           sha256 = "0ncf3kn8rackcidkgda2zs60km3hx87rwr9daj7ksmbb6am09s7c";
           name = "anyins";
         };
@@ -1238,7 +1238,7 @@
           sha256 = "86b90766ccb31a492998299092a3d0b892a8ac0bdb8e1833ef75fa6d79c7c721";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything";
           sha256 = "13pmks0bsby57v3vp6jcvvzwb771d4qq62djgvrw4ykxqzkcb8fj";
           name = "anything";
         };
@@ -1259,7 +1259,7 @@
           sha256 = "01lw9159axg5w9bpdy55m4zc902zmsqvk213ky1nmgnln0fvq3rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-exuberant-ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything-exuberant-ctags";
           sha256 = "0p0jq2ggdgaxv2gd9m5iza0y3mjjc82xmgp899yr15pfffa4wihk";
           name = "anything-exuberant-ctags";
         };
@@ -1280,7 +1280,7 @@
           sha256 = "1834yj2vgs4dasdfnppc8iw8ll3yif948biq9hj0sbpsa2d8y44k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-replace-string";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything-replace-string";
           sha256 = "1fagi6cn88p6sf1yhx1qsi7nw9zpyx9hdfl66iyskqwddfvywp71";
           name = "anything-replace-string";
         };
@@ -1301,7 +1301,7 @@
           sha256 = "1bcvin2694ypqgiw0mqk82riq7gw6ra10vbkzng1yp9jp2qr6wmm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anything-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anything-sage";
           sha256 = "1878vj8hzrwfyd2yvxcm0f1vm9m0ndwnj0pcq7j8zm9lxj0w48p3";
           name = "anything-sage";
         };
@@ -1322,7 +1322,7 @@
           sha256 = "1dxaf68przg0hh0p1zhxsq2dysp3ln178yxhbqalxw67bjy8ikny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/anzu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/anzu";
           sha256 = "0i2ia0jisj31vc2pjx9bhv8jccbp24q7c406x3nhh9hxjzs1f41i";
           name = "anzu";
         };
@@ -1343,7 +1343,7 @@
           sha256 = "13j2r4nx2x6j3qx50d5rdnqd8nl5idxdkhizsk7ccz3v2607fbyy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/apples-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/apples-mode";
           sha256 = "05ssnxs9ybc26jhr69xl9jpb41bz1688minmlc9msq2nvyfnj97s";
           name = "apples-mode";
         };
@@ -1364,7 +1364,7 @@
           sha256 = "1wyz8jvdy4m0cn75mm3zvxagm2gl10q51479f91gnqv14b4rndfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aproject";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aproject";
           sha256 = "0v3gx2mff2s7knm69y253pm1yr4svy8w00pqbn1chrvymb62jhp2";
           name = "aproject";
         };
@@ -1385,7 +1385,7 @@
           sha256 = "133c1n4ra7z3vb6y47400y71a6ac19pyji0bgd4kr9fcbx0flx91";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/artbollocks-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/artbollocks-mode";
           sha256 = "0dlnxicn6nzyiz44y92pbl4nzr9jxfb9a99wacjrwq2ahdrwhhjp";
           name = "artbollocks-mode";
         };
@@ -1406,7 +1406,7 @@
           sha256 = "1s973vzivibaqjb8acn4ylrdasxh17jcfmmvqp4wm05nwhg75597";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/asilea";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/asilea";
           sha256 = "1lb8nr6r6yy06m4pxg8w9ja4zv8k5xwhl95v2wv95y1qwhgnwg3j";
           name = "asilea";
         };
@@ -1427,7 +1427,7 @@
           sha256 = "0z91alzf4ajj3r7pnwazynvp81cg67csy9kf87fk98024xldpkdp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/async";
           sha256 = "063ci4f35x1zm9ixy110i5ds0vsrcafpixrz3xkvpnfqdn29si3f";
           name = "async";
         };
@@ -1448,7 +1448,7 @@
           sha256 = "01ig5v5f2xya7hyq678nd8j8x972yfbni813c0imxkkba996a2k7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aurel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aurel";
           sha256 = "13zyi55ksv426pcksbm3l9s6bmp102w7j1xbry46bc48al6i2nnl";
           name = "aurel";
         };
@@ -1469,7 +1469,7 @@
           sha256 = "0ns1xhpk1awbj3kv946dv11a99p84dhm54vjk72kslxwx42nia28";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/aurora-config-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/aurora-config-mode";
           sha256 = "0yqmpwj1vp0d5w9zw1hbyxzsbvw165dsgk1v1dxizkqwn7b1v7jm";
           name = "aurora-config-mode";
         };
@@ -1490,7 +1490,7 @@
           sha256 = "0gi65n1np63zi2ylc4y1licwvk97jl92s1v98fv5y61kppi1d8sq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auth-password-store";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auth-password-store";
           sha256 = "118ll12dhhxmlsp2mxmy5cd91166a1qsk406yhap5zw1qvyg58w5";
           name = "auth-password-store";
         };
@@ -1511,7 +1511,7 @@
           sha256 = "07vnk8az4lcxncqn01jvks38b4hpdmg43nbby2b39zy50agqnwsg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-compile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-compile";
           sha256 = "1cdv41hg71mi5ixxi4kiizyg03xai2gyhk0vz7gw59d9a7482yks";
           name = "auto-compile";
         };
@@ -1532,7 +1532,7 @@
           sha256 = "0q880dksf3bj1hixa4zhj3ybvrqf1wcnjnmb37i49qwdy6p1ma06";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete";
           sha256 = "1c4ij5bnclg94jdzhkqvq2vxwv6wvs051mbki1ibjm5f2hlacvh3";
           name = "auto-complete";
         };
@@ -1553,7 +1553,7 @@
           sha256 = "1kp2l1cgzlg2g3wllz4gl1ssn4lnx2sn26xqigfrpr8y5rj2bsfj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-clang-async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-clang-async";
           sha256 = "1jj0jn1v3070g7g0j5gvpybv145kki8nsjxqb8fjf9qag8ilfkjh";
           name = "auto-complete-clang-async";
         };
@@ -1574,7 +1574,7 @@
           sha256 = "1fqgyg986fg1dzac5wa97bx82mfddqb6qrfnpr3zksmw3vgykxr0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-exuberant-ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-exuberant-ctags";
           sha256 = "1i2s3ycc8jafkzdsz3kbvx1hh95ydi5s6rq6n0wzw1kyy3km35gd";
           name = "auto-complete-exuberant-ctags";
         };
@@ -1595,7 +1595,7 @@
           sha256 = "18bf1kw85mab0zp7rn85cm1nxjxg5c1dmiv0j0mjwzsv8an4px5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-nxml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-nxml";
           sha256 = "0viscr5k1carn9vhflry16kgihr6fvh6h36b049pgnk6ww085k6a";
           name = "auto-complete-nxml";
         };
@@ -1616,7 +1616,7 @@
           sha256 = "1hf2f903hy9afahrgy2fx9smgn631drs6733188zgqi3nkyizj26";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-pcmp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-pcmp";
           sha256 = "1mpgkwj8jwpvxphlm6iaprwjrldmihbgg97jav0fbm1kjnm4azna";
           name = "auto-complete-pcmp";
         };
@@ -1637,7 +1637,7 @@
           sha256 = "0l49ciic7g30vklxq6l1ny3mz87l5p8qc30rmkjvkzvg8r52ksn3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-complete-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-complete-sage";
           sha256 = "02sxbir3arvmnkvxgndlkln9y05jnlv6i8czd6a0wcxk4nj43lq1";
           name = "auto-complete-sage";
         };
@@ -1658,7 +1658,7 @@
           sha256 = "191294k92qp8gmfypf0q8j8qrym96aqikzvyb9p03wqvbr3r1dsk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-dictionary";
           sha256 = "1va485a8lxvb3507kr83cr6wpssxnf8y4l42mamn9daa8sjx3q16";
           name = "auto-dictionary";
         };
@@ -1679,7 +1679,7 @@
           sha256 = "1hlsgsdxpx42kmqkjgy9b9ldz5i4dbi879v87pjd2qbkj8iywb6y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-indent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-indent-mode";
           sha256 = "1nk78p8lqs8cx90asfs8iaqnwwyy8fi5bafaprm9c0nrxz299ibz";
           name = "auto-indent-mode";
         };
@@ -1700,7 +1700,7 @@
           sha256 = "05llpa6g4nb4qswmcn7j3bs7hnmkrkax7hsk7wvklr0wrljyg9a2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-package-update";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-package-update";
           sha256 = "0fdcniq5mrwbc7yvma4088r0frdfvc2ydfil0s003faz0nrjcp8k";
           name = "auto-package-update";
         };
@@ -1721,7 +1721,7 @@
           sha256 = "1h8zsgw30axprs7a5kkygbhvilillzazxgqz01ng36il65fi28s6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-shell-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-shell-command";
           sha256 = "1i78fh72i8yv91rnabf0vs78r43qrjkr36hndmn5ya2xs3b1g41j";
           name = "auto-shell-command";
         };
@@ -1742,7 +1742,7 @@
           sha256 = "0n3r7j83csby2s7284hy5pycynazyrkljxkn6xqn08gvxbbbdpdq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/auto-yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/auto-yasnippet";
           sha256 = "02281gyy07cy72a29fjsixg9byqq3izb9m1jxv98ni8pcy3bpsqa";
           name = "auto-yasnippet";
         };
@@ -1763,7 +1763,7 @@
           sha256 = "1pf2mwnicj5x2kksxwmrzz2vfxj9y9r6rzgc1fl8028mfrmrmg8s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autodisass-java-bytecode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/autodisass-java-bytecode";
           sha256 = "1k19nkbxnysm3qkpdhz4gv2x9nnrp94xl40x84q8n84s6xaan4dc";
           name = "autodisass-java-bytecode";
         };
@@ -1784,7 +1784,7 @@
           sha256 = "1hyp49bidwc53cr25wwwyzcd0cbbqzxkfcpnccimphv24qfsai85";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autodisass-llvm-bitcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/autodisass-llvm-bitcode";
           sha256 = "0bh73nzll9jp7kiqfnb5dwkipw85p3c3cyq58s0nghig02z63j01";
           name = "autodisass-llvm-bitcode";
         };
@@ -1805,7 +1805,7 @@
           sha256 = "0g6kd1r0wizamw26bhp5jkvpsd98rcybkfchc622b9v5b89a07nq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/autopair";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/autopair";
           sha256 = "161qhk8rc1ldj9hpg0k9phka0gflz9vny7gc8rnylk90p6asmr28";
           name = "autopair";
         };
@@ -1826,7 +1826,7 @@
           sha256 = "0rq9ab264565z83cly743nbhrd9m967apmnlhqr1gy8dm4hcy7nm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/avy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/avy";
           sha256 = "0gjq79f8jagbngp0shkcqmwhisc3hpgwfk34kq30nb929nbnlmag";
           name = "avy";
         };
@@ -1847,7 +1847,7 @@
           sha256 = "1564yv9330vjymw3xnikc2lz20f65n40fbl8m1zs1gp4nlgzkk38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/avy-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/avy-menu";
           sha256 = "1g2bsm0jpig51jwn9f9mx6z5glb0bn4s21194xam768qin0rf4iw";
           name = "avy-menu";
         };
@@ -1860,15 +1860,15 @@
     avy-migemo = callPackage ({ avy, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, migemo }:
     melpaBuild {
         pname = "avy-migemo";
-        version = "0.2.11";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "avy-migemo";
-          rev = "f2498ed4a476a554c84716f5a8131f9b78a45185";
-          sha256 = "098bkqb2cndjx93jacj6p54xfy14m1iknvpv1y5rffy9p4l2cbd3";
+          rev = "d95d0485f2fc580a918c4769f669d273c7a6c334";
+          sha256 = "0n1c5xvr782zgvby38w6wxrqac1lx35n0m7rl4ki325c6dchkgsx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/avy-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/avy-migemo";
           sha256 = "1zvgkhma445gj1zjl8j25prw95bdpjbvfy8yr0r5liay6g2hf296";
           name = "avy-migemo";
         };
@@ -1889,7 +1889,7 @@
           sha256 = "0lmv34pi9qdh76fi3w4lrfyfhzr824nsiif4nyjvpnmrabxgk309";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/avy-zap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/avy-zap";
           sha256 = "1zbkf21ggrmg1w0xaw40i3swgc1g4fz0j8p0r9djm9j120d94zkx";
           name = "avy-zap";
         };
@@ -1910,7 +1910,7 @@
           sha256 = "0px1xggk6qyrwkma1p3d7b4z2id2gbrsxkliw3nwc1q4zndg1zr7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/babel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/babel";
           sha256 = "0sdpp4iym61ni32zv75n48ylj4jib8ca6n9hyqwj1b7nqg76mm1c";
           name = "babel";
         };
@@ -1931,7 +1931,7 @@
           sha256 = "0hmn3jlsqgpc602lbcs9wzw0hgr5qpjdcxi2hjlc1cp27ilyscnf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/back-button";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/back-button";
           sha256 = "0vyhvm445d0rs14j5xi419akk5nd88d4hvm4251z62fmnvs50j85";
           name = "back-button";
         };
@@ -1958,7 +1958,7 @@
           sha256 = "1plh7i4zhs5p7qkv7p7lnfrmkszn8b3znwvbxgp7wpxay5safc5j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/badwolf-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/badwolf-theme";
           sha256 = "03plkzpmlh0pgfp1c9padsh4w2g23clsznym8x4jabxnk0ynhq41";
           name = "badwolf-theme";
         };
@@ -1979,7 +1979,7 @@
           sha256 = "11rlmrjdpa3vnf0h9vcd75946q9jyf1mpbm7h12hmpj6g2pavgdd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bash-completion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bash-completion";
           sha256 = "0l41yj0sb87i27hw6dh35l32hg4qkka6r3bpkckjnfm0xifrd9hj";
           name = "bash-completion";
         };
@@ -2000,7 +2000,7 @@
           sha256 = "1xvxz9sk9l57a4kiiavxxdp0v241mfgiy2lg5ilacq1cd6xrrhky";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbcode-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbcode-mode";
           sha256 = "0ixxavmilr6na56yc148prbh3nlhcwir6rxqvh332cr8vr9gmp89";
           name = "bbcode-mode";
         };
@@ -2021,7 +2021,7 @@
           sha256 = "17nbnkg0zn6p89r27mk9hl6qhv6xscwdsq8iyikdw03svpr16lnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbdb-";
           sha256 = "1vzbalcchay4pxl9f1sxg0zclgc095f59dlj15pj0bqq61sbl9jf";
           name = "bbdb-";
         };
@@ -2042,7 +2042,7 @@
           sha256 = "0fg72qnb40djyciy4gzj359lqlcbbrq0indbkzd0dj09zipkx0df";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb-vcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbdb-vcard";
           sha256 = "1kn98b7mh9a28933r4yl8qfl9p92rpix4vkp71sar9cka0m71ilj";
           name = "bbdb-vcard";
         };
@@ -2063,7 +2063,7 @@
           sha256 = "1zkh7dcas80wwjvigl27wj8sp4b5z6lh3qj7zkziinwamwnxbdbs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bbdb2erc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bbdb2erc";
           sha256 = "0k1f6mq9xd3568vg01dqqvcdbdshbdsi4ivkjyxis6dqfnqhlfdd";
           name = "bbdb2erc";
         };
@@ -2084,7 +2084,7 @@
           sha256 = "01d10algmi9a4xd7mzf7n3zxfs2qf5as66wx17mff5cd8dahxj1q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/beeminder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/beeminder";
           sha256 = "0aj7ix7nrsl89f9c449kik8fbzhfk9li50wrh50cdwgfh8gda0fx";
           name = "beeminder";
         };
@@ -2105,7 +2105,7 @@
           sha256 = "1agrci37bni1vfkxg171l53fvsnjdryhf05v54wj07jngnwf3cw9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/beginend";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/beginend";
           sha256 = "1y81kr9q0zrsr3c3s14rm6l86y5wf1a0kia6d98112fy4fwdm7kq";
           name = "beginend";
         };
@@ -2126,7 +2126,7 @@
           sha256 = "1rxznx2l0cdpiz8mad8s6q17m1fngpgb1cki7ch6yh18r3qz8ysr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/better-defaults";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/better-defaults";
           sha256 = "13bqcmx2gagm2ykg921ik3awp8zvw5d4lb69rr6gkpjlqp7nq2cm";
           name = "better-defaults";
         };
@@ -2147,7 +2147,7 @@
           sha256 = "07vwg0bg719gb8ln1n5a33103903vvrphnkbvvfn43904pkrf14w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bind-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bind-key";
           sha256 = "1qw2c27016d3yfg0w10is1v72y2jvzhq07ca4h6v17yi94ahj5xm";
           name = "bind-key";
         };
@@ -2168,7 +2168,7 @@
           sha256 = "0pmpg54faq0l886f2cmnmwm28d2yfg8adk7gp7623gx0ifggn332";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bing-dict";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bing-dict";
           sha256 = "0s5pd08rcnvmgi1hw17xbzvswlv0yni6h2h2gccrjmf6izi8whh1";
           name = "bing-dict";
         };
@@ -2189,7 +2189,7 @@
           sha256 = "1r3f5d67x257g8kvdbdsl4w3y1dvc1d6s9x8bygbkvyahfi5m5hn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/birds-of-paradise-plus-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/birds-of-paradise-plus-theme";
           sha256 = "0vdv2siy30kf1qhzrc39sygjk17lwm3ix58pcs3shwkg1y5amj3m";
           name = "birds-of-paradise-plus-theme";
         };
@@ -2210,7 +2210,7 @@
           sha256 = "1j2ar9sinbrraqvymqmjray48xbr1arhpigzgkgnhkc2zzqv8dwb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bog";
           sha256 = "1ci8xxca7dclmi5v37y5k45qlmzs6a9hi6m7czgiwxii902w5pkl";
           name = "bog";
         };
@@ -2231,7 +2231,7 @@
           sha256 = "1q3ws2vn062dh7ci6jn2k2bcn7szh3ap64sgwkzdd6f1pas37fnr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bongo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bongo";
           sha256 = "07i9gw067r2igp6s2g2iakm1ybvw04q6zznna2cfdf08nax64ghv";
           name = "bongo";
         };
@@ -2252,7 +2252,7 @@
           sha256 = "1apxgj14hgfpz6hjp3384yjf2zrkv4pcncf2zklijs668igvaskq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/boon";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/boon";
           sha256 = "0gryw7x97jd46jgrm93cjagj4p7w93cjc36i2ps9ajf0d8m4gajb";
           name = "boon";
         };
@@ -2273,7 +2273,7 @@
           sha256 = "0235l4f1cxj7nysfnay4fz52mg0c13pzqxbhw65vdpfzz1gl1p73";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/boxquote";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/boxquote";
           sha256 = "0s6cxb8y1y8w9vxxhj1izs8d0gzk4z2zm0cm9gkw1h7k2kyggx6s";
           name = "boxquote";
         };
@@ -2294,7 +2294,7 @@
           sha256 = "0y9m6cv70pzcm0v2v8nwmyh1xx40831chx72m85h5ic5db03gy7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/browse-kill-ring";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/browse-kill-ring";
           sha256 = "1d97ap0vrg5ymp96z7y6si98fspxzy02jh1i4clvw5lggjfibhq4";
           name = "browse-kill-ring";
         };
@@ -2315,7 +2315,7 @@
           sha256 = "08qz9l0gb7fvknzkp67srhldzkk8cylnbn0qwkflxgcs6ndfk95y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/browse-url-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/browse-url-dwim";
           sha256 = "13bv2ka5pp9k4kwrxfqfawwxzsqlakvpi9a32gxgx7qfi0dcb1rf";
           name = "browse-url-dwim";
         };
@@ -2336,7 +2336,7 @@
           sha256 = "0s43cvkr1za5sd2cvl55ig34wbp8xyjf85snmf67ps04swyyk92q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buffer-flip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/buffer-flip";
           sha256 = "0ka9ynj528yp1p31hbhm89627v6dpwspybly806n92vxavxrn098";
           name = "buffer-flip";
         };
@@ -2357,7 +2357,7 @@
           sha256 = "0xdks4jfqyhkh34y48iq3gz8swp0f526kwnaai5mhgvazvs4za8c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buffer-move";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/buffer-move";
           sha256 = "0wysywff2bggrha7lpl83c8x6ln7zgdj9gsqmjva6gramqb260fg";
           name = "buffer-move";
         };
@@ -2378,7 +2378,7 @@
           sha256 = "0rp9hiysy13c4in7b420r7yjza2knlmvphj7l01xbxphbilplqk5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buffer-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/buffer-utils";
           sha256 = "0cfipdn4fc4fvz513mwiaihvbdi05mza3z5z1379wlljw6r539z2";
           name = "buffer-utils";
         };
@@ -2399,7 +2399,7 @@
           sha256 = "0x9q4amsmawi8jqj9xxg81khvb3gyyf9hjvb0w6vhrgjwpxiq8sy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bufshow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bufshow";
           sha256 = "027cd0jzb8yxm66q1bhyi75f2m9f2pq3aswgav1d18na3ybwg65h";
           name = "bufshow";
         };
@@ -2420,7 +2420,7 @@
           sha256 = "07jzg58a3jxs4mmsgb35f5f8awazlvzak9wrhif6xb60jq1wrp0v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bug-reference-github";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bug-reference-github";
           sha256 = "18yzxwanbrxsab6ba75z1196x0m6dapdhbvy6df5b5x5viz99cf6";
           name = "bug-reference-github";
         };
@@ -2441,7 +2441,7 @@
           sha256 = "18d74nwcpk1i8adxzfwz1lgqqcxsc4wkrb490v64pph79dxsi80h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bundler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bundler";
           sha256 = "0i5ybc6i8ackxpaa75kwrg44zdq3jkvy48c42vaaafpddjwjnsy4";
           name = "bundler";
         };
@@ -2462,7 +2462,7 @@
           sha256 = "03hab3iw2jjckal20zwsw7cm38nf7pan0m96d8ab4i75phy6liyw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/bury-successful-compilation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/bury-successful-compilation";
           sha256 = "1gkq4r1573m6m57fp7x69k7kcpqchpcqfcz3792v0wxr22zhkwr3";
           name = "bury-successful-compilation";
         };
@@ -2483,7 +2483,7 @@
           sha256 = "1pii9dw4skq7nr4na6qxqasl36av8cwjp71bf1fgppqpcd9z8skj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/butler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/butler";
           sha256 = "1jv74l9jy55qpwf5np9nlj6a1wqsm3xirm7wm89d1h2mbsfcr0mq";
           name = "butler";
         };
@@ -2504,7 +2504,7 @@
           sha256 = "0lpfx7q0qrclxii4ffrrjffb678bsx908za91nsy7mc2g0cxcapb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/buttercup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/buttercup";
           sha256 = "1grrrdk5pl9l1jvnwzl8g0102gipvxb5qn6k2nmv28jpl57v8dkb";
           name = "buttercup";
         };
@@ -2525,7 +2525,7 @@
           sha256 = "1kqcc1d56jz107bswlzvdng6ny6qwp93yck2i2j921msn62qvbb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/button-lock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/button-lock";
           sha256 = "1arrdmb3nm570hgs18y9sz3z9v0wlkr3vwa2zgfnc15lmf0y34mp";
           name = "button-lock";
         };
@@ -2546,7 +2546,7 @@
           sha256 = "1k2hmc87ifww95k3m8ksiswkk2z0y8grssba7381g8dnlp6jgprx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cacoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cacoo";
           sha256 = "0kri4vi6dpsf0zk24psm16f3aa27cq5b54ga7zygmr02csq24a6z";
           name = "cacoo";
         };
@@ -2567,7 +2567,7 @@
           sha256 = "0bvrwzjx93qyx97qqw0imvnkkx4w91yk99rnhcmk029zj1fy0kzg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cake";
           sha256 = "06qlqrazz2jr08g44q73hx9vpp6xnjvkpd6ky108g0xc5p9q2hcr";
           name = "cake";
         };
@@ -2588,7 +2588,7 @@
           sha256 = "1w7yq35gzzwyf480d8gc5r6jbnawg09l6663q068ir6zr9pp4far";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cake-inflector";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cake-inflector";
           sha256 = "04mrqcm1igb638skaq2b3nr5yzxnck2vwhln61rnh7lkfxq7wbwf";
           name = "cake-inflector";
         };
@@ -2609,7 +2609,7 @@
           sha256 = "15w21r0gqblbn9wlvb4wlm3706wf01r38mp465snjzi839f6sazb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cake2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cake2";
           sha256 = "03q8vqqjlhahgnyy976c46x52splwdjpmb9ngrj5c2z7d8n9145x";
           name = "cake2";
         };
@@ -2630,7 +2630,7 @@
           sha256 = "1rv6slk3a7ca2q16isjlkmgxbxmbqx4lx2ip7z33fvnq10r5h60n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/calfw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/calfw";
           sha256 = "1lyb0jzpx19mx50d8xjv9sx201518vkvskxbglykaqpjm9ik2ai8";
           name = "calfw";
         };
@@ -2651,7 +2651,7 @@
           sha256 = "0v927m3l5cf0j0rs0nfk5whwqmmxs941d8qalxi19j1ihspjz8d6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/camcorder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/camcorder";
           sha256 = "1kbnpz3kn8ycpy8nlp8bsnnd1k1h7m02h7w5f7raw97sk4cnpvbi";
           name = "camcorder";
         };
@@ -2672,7 +2672,7 @@
           sha256 = "152d5ym4bqnlnp6rafgy8fafx8246n78ymlcx9k2nyfar4c0lir2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cargo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cargo";
           sha256 = "06zq657cxfk5l4867qqsvhskcqc9wswyl030wj27a43idj8n41jx";
           name = "cargo";
         };
@@ -2693,7 +2693,7 @@
           sha256 = "0mg49rpz362ipn5qzqhyfs3d6fpb51rfa73kna3gxdw0wxq2sa7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/caseformat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/caseformat";
           sha256 = "1qwyr74jbx4jpfcw8sccg47q1vdg094rr06m111gsz2yaj9m0gfk";
           name = "caseformat";
         };
@@ -2714,7 +2714,7 @@
           sha256 = "1hvm6r6a8rgjwnn2mcamwqrmhz424vlr4mbvbri3wmn0ikbk510l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cask";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cask";
           sha256 = "11nr6my3vlb1xiyai7qwii3nszda2mnkhkjlbh3d0699h0yw7dk5";
           name = "cask";
         };
@@ -2735,7 +2735,7 @@
           sha256 = "0padb1zfjkmx9kbqnqh744qvpd3ln0khwxifxld9cpcpdp5k04vc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cask-package-toolset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cask-package-toolset";
           sha256 = "13ix093c0a58rjqj7zfp3914xj3hvj276gb2d8zhvrx9vvs1345g";
           name = "cask-package-toolset";
         };
@@ -2756,7 +2756,7 @@
           sha256 = "1j1lw5zifp7q1ykm6si0nzxfp7n3z2lzla2njkkxmc2s6m7w4x1a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/caskxy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/caskxy";
           sha256 = "0x4s3c8m75zxsvqpgfc5xwll0489zzdnngmnq048z9gkgcd7pd2s";
           name = "caskxy";
         };
@@ -2777,7 +2777,7 @@
           sha256 = "125d5i7ycdn2hgffc1l3jqcfzvk70m1ciywj4h53qakkl15r9m38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cbm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cbm";
           sha256 = "02ch0gdw610c8dfxxjxs7ijsc9lzbhklj7hqgwfwksnyc36zcjmn";
           name = "cbm";
         };
@@ -2798,7 +2798,7 @@
           sha256 = "1jj9vmhc4s3ych08bjm1c2xwi81z1p20rj7bvxrgvb5aga2ghi9d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cdlatex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cdlatex";
           sha256 = "1jsfmzl13fykbg7l4wv9si7z11ai5lzvkndzbxh9cyqlvznq0m64";
           name = "cdlatex";
         };
@@ -2819,7 +2819,7 @@
           sha256 = "07h5g905i1jglsryl0dnqxz8yya5kkyjjggzbk4nl3rcj41lyas7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/celery";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/celery";
           sha256 = "0m3hmvp6xz2m7z1kbb0ii0j3c95zi19652gfixq5a5x23kz8y59h";
           name = "celery";
         };
@@ -2840,7 +2840,7 @@
           sha256 = "08hqgsjvs62l1cfzshbpj80xd8365qmx2b5r5jq20d5cj68s36wl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cerbere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cerbere";
           sha256 = "1g3svmh5dlh5mvyag3hmiy90dfkk6f7ppd9qpwckxqyll9vl7r06";
           name = "cerbere";
         };
@@ -2861,7 +2861,7 @@
           sha256 = "190gr30bscl80awilcjflwy9n7nvlz0hzmzmpx1wsa3wj3zf89yy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cfengine-code-style";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cfengine-code-style";
           sha256 = "1ny8xvdnz740qmw9m81xnwd0gh0a516arpvl3nfimglaai5bfc9a";
           name = "cfengine-code-style";
         };
@@ -2882,7 +2882,7 @@
           sha256 = "0vb03k10i8vwy5wv65xl15kcsh9zz4y2xhpgndih87ssckdnhhlw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/char-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/char-menu";
           sha256 = "11jkwghrmmvpv7piznkpa0wilwjdsps9rix3950pfabhlllw268l";
           name = "char-menu";
         };
@@ -2903,7 +2903,7 @@
           sha256 = "0crnd64cnsnaj5mcy55q0sc1rnamxa1xbpwpmirhyhxz780klww6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/charmap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/charmap";
           sha256 = "1j7762d2i17ysn9ys8j7wfv989avmax8iylml2hc26mwbpyfpm84";
           name = "charmap";
         };
@@ -2924,7 +2924,7 @@
           sha256 = "09ypxhfad3v1pz0xhw4xgxvfj7ad2kb3ff9zy1mnw7fzsa7gw6nj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/checkbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/checkbox";
           sha256 = "17gw6w1m6bs3sfx8nqa8nzdq26m8w85a0fca5qw3bmd18bcmknqa";
           name = "checkbox";
         };
@@ -2945,7 +2945,7 @@
           sha256 = "1jsy43avingxxccs0zw2qm5ysx8g76xhhh1mnyypxskl9m60qb4j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/chinese-word-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/chinese-word-at-point";
           sha256 = "0pjs4ckncv84qrdj0pyibrbiy86f1gmjla9n2cgh10xbc7j9y0c4";
           name = "chinese-word-at-point";
         };
@@ -2966,7 +2966,7 @@
           sha256 = "1bk7h7h6sqf1qb5lpmmigx7aviyw65dnj3724q55ld6pgpy5q6vz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cider";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cider";
           sha256 = "1a6hb728a3ir18c2dn9zfd3jn79fi5xjn5gqr7ljy6qb063xd4qx";
           name = "cider";
         };
@@ -2987,7 +2987,7 @@
           sha256 = "1rkd76561h93si4lpisz3qnaj48dx8x01nd59a3lgpqsbbibnccf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cider-eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cider-eval-sexp-fu";
           sha256 = "1n4sgv042qd9560pllabysx0c5snly6i22bk126y8f8rn0zj58iq";
           name = "cider-eval-sexp-fu";
         };
@@ -3008,7 +3008,7 @@
           sha256 = "1w0ya0446rqsg1j59fd1mp4wavv2f3h1k3mw9svm5glymdirw4d1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cil-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cil-mode";
           sha256 = "1h18r086bqspyn5n252yzw8x2zgyaqzdd8pbcf5gqlh1w8kapq4y";
           name = "cil-mode";
         };
@@ -3029,7 +3029,7 @@
           sha256 = "0q3rv6lk37yybkbswmn4pgzca0nfhvf4h3ac395fr16k5ixybc5q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/circe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/circe";
           sha256 = "1f54d8490gfx0r0cdvgmcjdxqpni43msy0k2mgqd1qz88a4b5l07";
           name = "circe";
         };
@@ -3050,7 +3050,7 @@
           sha256 = "12vgi5dicx3lxzngjcg9g3nflrhfy9wdw6ldm72zarp1h96jy5cw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cl-lib-highlight";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cl-lib-highlight";
           sha256 = "13qdrvpxq928p27b1xdcbsscyhqk042rwfa17037gp9h02fd42j8";
           name = "cl-lib-highlight";
         };
@@ -3060,18 +3060,39 @@
           license = lib.licenses.free;
         };
       }) {};
+    click-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "click-mode";
+        version = "0.0.3";
+        src = fetchFromGitHub {
+          owner = "bmalehorn";
+          repo = "click-mode";
+          rev = "4e39ef28e65124671f53fb5eaef8c7b87c4deab8";
+          sha256 = "1n8114h0azjyavq4bzny2nasl4wsz8k7li002gqjvi0snw16yypn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/click-mode";
+          sha256 = "1p5dz4a74w5zxdlw17h5z9dglapia4p29880liw3bif2c7dzkg0r";
+          name = "click-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/click-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     cliphist = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, popup }:
     melpaBuild {
         pname = "cliphist";
-        version = "0.1.1";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "cliphist";
-          rev = "c0db2da95fa3d3a58160f465c636989bb4b251d5";
-          sha256 = "11c0zpk8gg70d4xiiyjc7v13knwb2ihbrxnlaxzh3rdg2c12676q";
+          rev = "413af96bbd0dfc8b264f5b8e3920c319af065c50";
+          sha256 = "07q8naxhag2q0m5cb9c2n5js6j5qdrjyyiqbcpxmq598b8mw8kzd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cliphist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cliphist";
           sha256 = "0mg6pznijba3kvp3r57pi54v6mgih2vfwj2kg6qmcy1abrc0xq29";
           name = "cliphist";
         };
@@ -3092,7 +3113,7 @@
           sha256 = "0i6sj5rs4b9v8aqq9l6wr15080qb101hdxspx6innhijhajgmssd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clips-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clips-mode";
           sha256 = "083wrhjn04rg8vr6j0ziffdbdhbfn63wzl4q7yzpkf8qckh6mxhf";
           name = "clips-mode";
         };
@@ -3102,18 +3123,18 @@
           license = lib.licenses.free;
         };
       }) {};
-    clj-refactor = callPackage ({ cider, dash, edn, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }:
+    clj-refactor = callPackage ({ cider, dash, edn, emacs, fetchFromGitHub, fetchurl, hydra, inflections, lib, melpaBuild, multiple-cursors, paredit, s, yasnippet }:
     melpaBuild {
         pname = "clj-refactor";
-        version = "1.1.0";
+        version = "2.0.0";
         src = fetchFromGitHub {
           owner = "clojure-emacs";
           repo = "clj-refactor.el";
-          rev = "a0a35b6fb0a2f31973d5e5b711f0aac0314d7168";
-          sha256 = "1w0lv2d916wxfakcy11avmn9f6nsmxff02dpyih5kx6ncgqv1bnd";
+          rev = "9c628f2ca9ba6dfdfb1e24d804accc71d873fae0";
+          sha256 = "1prqdyr36sqf3dzxriv9lb3p6021nlacf2xgn5xxj7k7hp3z8d85";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clj-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clj-refactor";
           sha256 = "1qvds6dylazvrzz1ji2z2ldw72pa2nxqacb9d04gasmkqc32ipvz";
           name = "clj-refactor";
         };
@@ -3122,6 +3143,8 @@
           dash
           edn
           emacs
+          hydra
+          inflections
           multiple-cursors
           paredit
           s
@@ -3143,7 +3166,7 @@
           sha256 = "18gv8vmmpiyq16cq4nr9nk2bmc5y2rsv21wjl4ji29rc7566shha";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cljr-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cljr-helm";
           sha256 = "108a1xgnc6qy088vs41j3npwk25a5vny0xx4r3yh76jsmpdpcgnc";
           name = "cljr-helm";
         };
@@ -3164,7 +3187,7 @@
           sha256 = "0hz6a7gj0zfsdaifkhwf965c96rkjc3kivvqlf50zllsw0ysbnn0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clocker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clocker";
           sha256 = "0cckrk40k1labiqjh7ghzpx5zi136xz70j3ipp117x52qf24k10k";
           name = "clocker";
         };
@@ -3185,7 +3208,7 @@
           sha256 = "1x1kfycf3023z0r3v7xqci59k8jv5wn2vqc9y0nx7k5qgifmswrx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-cheatsheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clojure-cheatsheet";
           sha256 = "05sw3bkdcadslpsk64ds0ciavmdgqk7fr5q3z505vvafmszfnaqv";
           name = "clojure-cheatsheet";
         };
@@ -3206,7 +3229,7 @@
           sha256 = "1bhgvj4w8k4ycndnxgfnifc065jbxq8vsxfz3s6w64qx54biqxj3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clojure-mode";
           sha256 = "11n0rjhs1mmlzdqy711g432an5ybdka5xj0ipsk8dx6xcyab70np";
           name = "clojure-mode";
         };
@@ -3227,7 +3250,7 @@
           sha256 = "1bhgvj4w8k4ycndnxgfnifc065jbxq8vsxfz3s6w64qx54biqxj3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-mode-extra-font-locking";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clojure-mode-extra-font-locking";
           sha256 = "00nff9mkj61i76dj21x87vhz0bbkzgvkx1ypkxcv6yf3pfhq7r8n";
           name = "clojure-mode-extra-font-locking";
         };
@@ -3248,7 +3271,7 @@
           sha256 = "0sw34yjp8934xd2n76lbwyvxkbyz5pxszj6gkflas8lfjvms9z7d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-quick-repls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clojure-quick-repls";
           sha256 = "10glzyd4y3918pwp048pc1y7y7fa34fkqckn1nbys841dbssmay0";
           name = "clojure-quick-repls";
         };
@@ -3269,7 +3292,7 @@
           sha256 = "1p0w83m9j4a6va4g68a4gcfbdkp8nic0q8cm28l8nr7czd5s0yl6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/clojure-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/clojure-snippets";
           sha256 = "15622mdd6b3fpwp22d32p78yap08pyscs2vc83sv1xz4338i0lij";
           name = "clojure-snippets";
         };
@@ -3290,7 +3313,7 @@
           sha256 = "1bhnlcsvl1qsi36a5kz8i857spzybprsbsywpqrmjpndn74n8690";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cm-mode";
           sha256 = "1rgfpxbnp8wiq9j8aywm2n07rxzkhqljigwynrkyvrnsgxlq2a9x";
           name = "cm-mode";
         };
@@ -3311,7 +3334,7 @@
           sha256 = "14z5izpgby7lak6hzjwsph31awg5126hcjzld21ihknhlg09sw7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmake-ide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cmake-ide";
           sha256 = "0xvy7l80zw67jgvk1rkhwzjvsqjqckmd8zj6s67rgbm56z6ypmcg";
           name = "cmake-ide";
         };
@@ -3324,15 +3347,15 @@
     cmake-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cmake-mode";
-        version = "3.5.0pre1";
+        version = "3.5.0pre3";
         src = fetchFromGitHub {
           owner = "Kitware";
           repo = "CMake";
-          rev = "8a8d22cf1e5d20b7c3b32c1ec9b5f06b339c2a50";
-          sha256 = "1yppsh0sh2m8m4x34abdiq1d2k7g4gjhf24m9av0h5kg8kd46f2b";
+          rev = "d203761520f5dd21a9cc4de5c4ca0d0e4e188e34";
+          sha256 = "0caxmqbx6lq9xarra1zxm2yvcf699fgk9fawp3mrg587yb3w0961";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmake-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cmake-mode";
           sha256 = "0zbn8syb5lw5xp1qcy3qcl75zfiyik30xvqyl38gdqddm9h7qmz7";
           name = "cmake-mode";
         };
@@ -3353,7 +3376,7 @@
           sha256 = "10xlny2agxjknvnjdnw41cyb3d361yy0wvpc8l1d0xwnmmfh3bxk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cmake-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cmake-project";
           sha256 = "13n6j9ljvzjzkknbm9zkhxljcn12avl39gxqq95hah44dr11rns3";
           name = "cmake-project";
         };
@@ -3374,7 +3397,7 @@
           sha256 = "14jcxrs3b02pbppvdsabr7c74i3c6d1lmd6l1p9dj8gv413pghsz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/codic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/codic";
           sha256 = "0fq2qfqhkd6injgl66vcpd61j67shl9xj260aj6cgb2nriq0jxgn";
           name = "codic";
         };
@@ -3395,7 +3418,7 @@
           sha256 = "1axp9hixp4vgaqjd3ii9xwb32jhb964zclmpg3zpsl4rp8b9bdz5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/coffee-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/coffee-mode";
           sha256 = "1px50hs0x30psa5ljndpcc22c0qwcaxslpjf28cfgxinawnp74g1";
           name = "coffee-mode";
         };
@@ -3416,7 +3439,7 @@
           sha256 = "0q9ss11i31iiv0vn8238922fkic7j6d02f9ykbip04sm46p5k6kj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-modern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/color-theme-modern";
           sha256 = "0f662ham430fgxpqw96zcl1whcm28cv710g6wvg4fma60sblaxcm";
           name = "color-theme-modern";
         };
@@ -3437,7 +3460,7 @@
           sha256 = "13jmg05skv409z8pg5m9rzkajj9knyln0ff8a3i1pbpyrnpngmmc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-sanityinc-solarized";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/color-theme-sanityinc-solarized";
           sha256 = "0xg79hgb893f1nqx6q4q6hp4w6rvgp1aah1v2r3scg2jk057qxkf";
           name = "color-theme-sanityinc-solarized";
         };
@@ -3458,7 +3481,7 @@
           sha256 = "0w99ypq048xldl1mrgc7qr4n2770dm48aknhp7q0176l43nvxnqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/color-theme-sanityinc-tomorrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/color-theme-sanityinc-tomorrow";
           sha256 = "1k8iwjc7iidq5sxybs47rnswa6c5dwqfdzfw7w0by2h1id2z6nqd";
           name = "color-theme-sanityinc-tomorrow";
         };
@@ -3479,7 +3502,7 @@
           sha256 = "18hzm7yzwlfjlbkx46rgdl31p9xyfqnxlvg8337h2bicpks7kjia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/colorsarenice-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/colorsarenice-theme";
           sha256 = "09zlglldjbjr97clwyzyz7c0k8hswclnk2zbkm03nnn9n9yyg2qi";
           name = "colorsarenice-theme";
         };
@@ -3500,7 +3523,7 @@
           sha256 = "1j6hhyzww7wfwk6bllbb5mk4hw4qs8hsgfbfdifsam9c6i4spm45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/commander";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/commander";
           sha256 = "17y0hg6a90hflgwn24ww23qmvc1alzivpipca8zvpf0nih4fl393";
           name = "commander";
         };
@@ -3521,7 +3544,7 @@
           sha256 = "0kzlv2my0cc7d3nki2rlm32nmb2nyjb38inmvlf13z0m2kybg2ps";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/comment-dwim-2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/comment-dwim-2";
           sha256 = "1w9w2a72ygsj5w47vjqcljajmmbz0mi8dhz5gjnpwxjwsr6fn6lj";
           name = "comment-dwim-2";
         };
@@ -3534,15 +3557,15 @@
     commenter = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "commenter";
-        version = "0.5.1";
+        version = "0.5.2";
         src = fetchFromGitHub {
           owner = "yuutayamada";
           repo = "commenter";
-          rev = "eec3bf91a57ff3aa3b93c36611e136572f031571";
-          sha256 = "1jvjwk776p9qrbr3j0368nqv8ydp8k0s6c66nfpcqf33rz4w1h1g";
+          rev = "6d1885419434ba779270c6fda0e30d390bb074bd";
+          sha256 = "1jwd3whag39qhzhbsfivzdlcr6vj37dv5ychkhmilw8v6dfdnpdb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/commenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/commenter";
           sha256 = "01bm8jbj6xw23nls4fps6zwjkgvcsjhmn3l3ncqd764kwhxdx8q3";
           name = "commenter";
         };
@@ -3563,7 +3586,7 @@
           sha256 = "1cc9ak9193m92g6l4mrfxbkkmvljl3c51d0xzdidwww978q3x6ad";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/common-lisp-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/common-lisp-snippets";
           sha256 = "0ig8cz00cbfx0jckqk1xhsvm18ivl2mjvcn65s941nblsywfvxjl";
           name = "common-lisp-snippets";
         };
@@ -3584,7 +3607,7 @@
           sha256 = "08rrjfp2amgya1hswjz3vd5ja6lg2nfmm7454p0h1naz00hlmmw0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company";
           sha256 = "0v4x038ly970lkzb0n8fbqssfqwx1p46xldr7nss32jiqvavr4m4";
           name = "company";
         };
@@ -3605,7 +3628,7 @@
           sha256 = "1i6788qfinh47c5crgr57ykgbp6bvk1afcl00c8gywxsf8srvnvy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-anaconda";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-anaconda";
           sha256 = "1s7y47ghy7q35qpfqavh4p9wr91i6r579mdbpvv6h5by856yn4gl";
           name = "company-anaconda";
         };
@@ -3626,7 +3649,7 @@
           sha256 = "1dds3fynbd6yb0874aw6g4qk5zmq3pgl3jmcp38md027qalgqmym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-ansible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-ansible";
           sha256 = "084l9dr2hvm00952y4m3jhchzxjhcd61sfn5ywj9b9a1d4sr110d";
           name = "company-ansible";
         };
@@ -3647,7 +3670,7 @@
           sha256 = "1pja44g15d11kl47abzykrp28j782nkbmb0db0ilpc96xf1fjlsw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-cabal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-cabal";
           sha256 = "0pbjidj88c9qri6xw8023yqwnczad5ig224cbsz6vsmdla2nlxra";
           name = "company-cabal";
         };
@@ -3668,7 +3691,7 @@
           sha256 = "1f8sjjms9kxni153pia6b45p2ih2mhm2r07d0j3fmxmz3q2jdldd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-emoji";
           sha256 = "1mflqqw9gnfcqjb6g8ivdfl7s4mdyjg7j0457hamgyvgvpxsh8x3";
           name = "company-emoji";
         };
@@ -3689,7 +3712,7 @@
           sha256 = "0y9i0q37xjbnlnlxq7xjvnpn6ykzbd55g6nbw10z1wg0m2v7f96r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-ghc";
           sha256 = "07adykza4dqs64bk8vjmgryr54khxmcy28hms5z8i1qpsk9vmvnn";
           name = "company-ghc";
         };
@@ -3710,7 +3733,7 @@
           sha256 = "03snnra31b5j6iy94gql240vhkynbjql9b4b5j8bsqp9inmbsia3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-go";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-go";
           sha256 = "1ncy5wlg3ywr17zrxb1d1bap4gdvwr35w9a8b0crz5h3l3y4cp29";
           name = "company-go";
         };
@@ -3731,7 +3754,7 @@
           sha256 = "1gdsaa8zcs3layivn3ndbd5z1zflblmbxl251ld67bq763ga49cz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-irony";
           sha256 = "15adamk1b9y1i6k06i5ahf1wn70cgwlhgk0x6fk8pl5izg05z1km";
           name = "company-irony";
         };
@@ -3752,7 +3775,7 @@
           sha256 = "1ihqapp4dv92794rsgyq0rmhwika60cmradqd4bn9b72ss6plxs1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-jedi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-jedi";
           sha256 = "1krrgrjq967c3j02y0i345yx6w4crisnj1k3bhih6j849fvy3fvj";
           name = "company-jedi";
         };
@@ -3773,7 +3796,7 @@
           sha256 = "009f0p0sggfn0yz7sivkcv8zygvv4ssbwqykbxgdxh9n6zk4hjky";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-math";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-math";
           sha256 = "0chig8k8l65bnd0a6734fiy0ikl20k9v2wlndh3ckz5a8h963g87";
           name = "company-math";
         };
@@ -3794,7 +3817,7 @@
           sha256 = "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-nixos-options";
           sha256 = "1yrqqdadmf7qfxpqp8wwb325zjnwwjmn2hhnl7i3j0ckg6hqyqf0";
           name = "company-nixos-options";
         };
@@ -3807,15 +3830,15 @@
     company-quickhelp = callPackage ({ company, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, pos-tip }:
     melpaBuild {
         pname = "company-quickhelp";
-        version = "1.2.0";
+        version = "1.3.0";
         src = fetchFromGitHub {
           owner = "expez";
           repo = "company-quickhelp";
-          rev = "05e0ee9b854f90ff2b007b3e19446a02513f43dc";
-          sha256 = "0hg3wrfhz3qlfb6zv6j5a4xzmm4jk25pkv8h3ryg7sl7h602idgl";
+          rev = "39e206f7797962992aa1e555c293b6d872d6718b";
+          sha256 = "1b2v84ss5k43nnbsnvabgvb19ardsacbs1prn2h9i1k2d5mb8icw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-quickhelp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-quickhelp";
           sha256 = "042bwv0wd4hksbm528zb7pbllzk83p8qjq5f8z46p84c8mmxfp9g";
           name = "company-quickhelp";
         };
@@ -3836,7 +3859,7 @@
           sha256 = "0i1fh5lvqwlgn3g3fzh0xacxyljx6gkryipn133vfkv4jbns51n4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-restclient";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-restclient";
           sha256 = "1md0n4k4wmbh9rmbwqh3kg2fj0c34rzqfd56jsq8lcdg14k0kdcb";
           name = "company-restclient";
         };
@@ -3863,7 +3886,7 @@
           sha256 = "1l9xrw88wq32wm3qx922ihdb9mlv9rrdalwvz9i2790fmw7y84vz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-sourcekit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-sourcekit";
           sha256 = "0hr5j1ginf43h4qf3fvsh3z53z0c7w5a9lhrvdwmlzj396qhqmzs";
           name = "company-sourcekit";
         };
@@ -3884,7 +3907,7 @@
           sha256 = "11cinjsyf24d4a682ikniprxd1vkwn6mynsp5dzab6yzq09np78i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-tern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-tern";
           sha256 = "17pw4jx3f1hymj6sc0ri18jz9ngggj4a41kxx14fnmmm8adqn6wh";
           name = "company-tern";
         };
@@ -3905,7 +3928,7 @@
           sha256 = "0b0k75rg43h48dbcqiid947nspqiqxkiqcmvph9aqpxlfr67bz5r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-web";
           sha256 = "0dj0m6wcc8cyvblp9b5b3am95gc18j9y4va44hvljxv1h7l5hhvy";
           name = "company-web";
         };
@@ -3926,7 +3949,7 @@
           sha256 = "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/company-ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/company-ycmd";
           sha256 = "0fqmkb0q8ai605jzn2kwd585b2alwxbmnb3yqnn9fgkcvyc9f0pk";
           name = "company-ycmd";
         };
@@ -3947,7 +3970,7 @@
           sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/concurrent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/concurrent";
           sha256 = "09wjw69bqrr3424h0mpb2kr5ixh96syjjsqrcyd7z2lsas5ldpnf";
           name = "concurrent";
         };
@@ -3968,7 +3991,7 @@
           sha256 = "0sz3qx1bn0lwjhka2l6wfl4b5486ji9dklgjs7fdlkg3dgpp1ahx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/conkeror-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/conkeror-minor-mode";
           sha256 = "1ch108f20k7xbf79azsp31hh4wmw7iycsxddcszgxkbm7pj11933";
           name = "conkeror-minor-mode";
         };
@@ -3989,7 +4012,7 @@
           sha256 = "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/connection";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/connection";
           sha256 = "1y68d2kay8p5vapailxhrc5dl7b8k8nkvp7pa54md3fsivwp1d0q";
           name = "connection";
         };
@@ -4010,7 +4033,7 @@
           sha256 = "0s4b7dkndhnh8q3plvg2whjx8zd7ffz4hnbn3xh86xd3k7sch7av";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/contextual";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/contextual";
           sha256 = "0vribs0fa1xf5kwkmvzjwhiawni0p3v56c5l4dkz8d7wn2g6wfdx";
           name = "contextual";
         };
@@ -4031,7 +4054,7 @@
           sha256 = "0gpckp12b0hllgn821q3rqfxh5h7ny5gfhhvfdbvszb7kwl1f6cx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/corral";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/corral";
           sha256 = "1drccqk4qzkgvkgkzlrrfd1dcgj8ziqriijrjihrzjgjsbpzv6da";
           name = "corral";
         };
@@ -4052,7 +4075,7 @@
           sha256 = "1kahl3h18vsjkbqvd84fb2w45s4srsiydn6jiv49vvg1yaxzxcbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/counsel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/counsel";
           sha256 = "0y8cb2q4mqvzan5n8ws5pjpm7bkjcghg5q19mzc3gqrq9vrvyzi6";
           name = "counsel";
         };
@@ -4062,18 +4085,39 @@
           license = lib.licenses.free;
         };
       }) {};
+    coverage = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, ov }:
+    melpaBuild {
+        pname = "coverage";
+        version = "0.2";
+        src = fetchFromGitHub {
+          owner = "trezona-lecomte";
+          repo = "coverage";
+          rev = "f7e78bb9502d3893ef876274c992743f49c0a1a7";
+          sha256 = "01545iy2gaxyd4i8gawgxqi9gbkrjk20djhvc59finnjrblzccn3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/coverage";
+          sha256 = "0ja7wsx2sj0h01sk1l3c0aidbs1ld4gj3kiwq6brs7r018sz45pm";
+          name = "coverage";
+        };
+        packageRequires = [ cl-lib ov ];
+        meta = {
+          homepage = "http://melpa.org/#/coverage";
+          license = lib.licenses.free;
+        };
+      }) {};
     cpputils-cmake = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "cpputils-cmake";
-        version = "0.5.2";
+        version = "0.5.4";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "cpputils-cmake";
-          rev = "d11e5496a0bf885900e7d0d004decc66f95dda3f";
-          sha256 = "03nzbrvvs31xgaqhxmrj9bypywsg42q06k4z4z1fpjssg9az0j4p";
+          rev = "f18c96750b1b2f4e1537fac7df2818524ccda665";
+          sha256 = "0ky59gz5pvi4m5b9rh13ywfmclrmiwalynpqw652rmc6yfzv0fnz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cpputils-cmake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cpputils-cmake";
           sha256 = "0fswmmmrjv897n51nidmn8gs8yp00595g35vwjafsq6rzfg58j60";
           name = "cpputils-cmake";
         };
@@ -4094,7 +4138,7 @@
           sha256 = "169ai0xkh3988racnhaapxw0v1pbxvcaq470x1qacdzdpka4a7bs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/creds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/creds";
           sha256 = "0n11xxaf93bbc9ih25wj09zzw4sj32wb99qig4zcy8bpkl5y3llk";
           name = "creds";
         };
@@ -4115,7 +4159,7 @@
           sha256 = "1kl6blr4dlz40gfc845071nhfms4fm59284ja2177bhghy3wmw6r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/crm-custom";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/crm-custom";
           sha256 = "14w15skxr44p9ilhpswlgdbqfw8jghxi69l37yk4m449m7g9694c";
           name = "crm-custom";
         };
@@ -4128,15 +4172,15 @@
     crux = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "crux";
-        version = "0.1.0";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "crux";
-          rev = "7d4e425af79c5756c243f74e86884680e671c2e1";
-          sha256 = "1way14a4rhrqkby40wr21q6yxhl4qi0a0x89jzf21jdzsbykvaik";
+          rev = "1e591c5a1ecfa99fcd67105a58b2e7d782abf969";
+          sha256 = "13kkpilijr0q455srgn8yhzqikxask11z8d3rji7cc1yw7kf6y0i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/crux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/crux";
           sha256 = "10lim1sngqbdqqwyq6ksqjjqpkm97aj1jk550sgwj28338lnw73c";
           name = "crux";
         };
@@ -4157,7 +4201,7 @@
           sha256 = "00wgbcw09xn9xi52swi4wyi9dj9p9hyin7i431xi6zkhxysw4q7w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cryptol-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cryptol-mode";
           sha256 = "08iq69gqmps8cckybhj9065b8a2a49p0rpzgx883qxnypsmjfmf2";
           name = "cryptol-mode";
         };
@@ -4178,7 +4222,7 @@
           sha256 = "0dqih7cy57sciqn5vz5fiwynpld96qldyl7jcgn9qpwnzb401ayx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/csharp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/csharp-mode";
           sha256 = "17j84qrprq492dsn103dji8mvh29mbdlqlpsszbgfdgnpvfr1rv0";
           name = "csharp-mode";
         };
@@ -4199,7 +4243,7 @@
           sha256 = "13zq8kym1y6bzrpxbcdz32323a6azy5px4ridff6xh8bfprwlay3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ctable";
           sha256 = "040qmlgfvjc1f908n52m5ll2fizbrhjzbd0kgrsw37bvm3029rx1";
           name = "ctable";
         };
@@ -4218,7 +4262,7 @@
           sha256 = "1xgrb4ivgz7gmingfafmclqqflxdvkarmfkqqv1zjk6yrjhlcvwf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ctags";
           sha256 = "11fp8l99rj4fmi0vd3hkffgpfhk1l82ggglzb74jr3qfzv3dcn6y";
           name = "ctags";
         };
@@ -4239,7 +4283,7 @@
           sha256 = "05vhryqcydvcfm18fwby344931kzzh47x4l5ixy95xkcjkzrj8c7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctags-update";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ctags-update";
           sha256 = "1k43l667mvr2y33nblachdlvdqvn256gysc1iwv5zgv7gj9i65qf";
           name = "ctags-update";
         };
@@ -4260,7 +4304,7 @@
           sha256 = "1jlr2miwqsg06hk2clvsrw9fa98m2n76qfq8qv5svrb8dpil04wb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ctxmenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ctxmenu";
           sha256 = "03g9px858mg19wapqszwav3599slljdyam8bvn1ri85fpa5ydvdp";
           name = "ctxmenu";
         };
@@ -4281,7 +4325,7 @@
           sha256 = "1y685qfdkjyl7dwyvivlgc2lwp102vy6hvcb9zynw84c49f726sn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cuda-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cuda-mode";
           sha256 = "0ip4vax93x72bjrh6prik6ddmrvszpsmgm0fxfz772rp24smc300";
           name = "cuda-mode";
         };
@@ -4302,7 +4346,7 @@
           sha256 = "1yhizh8j745hv5ancpvijds9dasvsr2scwjscksp2x3krnd26ssp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cyberpunk-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cyberpunk-theme";
           sha256 = "0l2bwb5afkkhrbh99v2gns1vil9s5911hbnlq5w35nmg1wvbmbc9";
           name = "cyberpunk-theme";
         };
@@ -4323,7 +4367,7 @@
           sha256 = "1vkwm1n0amf0y0jdyvqskp00b6aijqhd7wclzkzrq7glrvj2z1xw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cyphejor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cyphejor";
           sha256 = "18l5km4xm5j3vv19k3fxs8i3rg4qnhrvx7b62vmyfcqmpiasrh6g";
           name = "cyphejor";
         };
@@ -4344,7 +4388,7 @@
           sha256 = "0kbk2gp2avp0da32mr003ziigmi98zi0fvwia4knylllmrkl3pvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/cython-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/cython-mode";
           sha256 = "0asai1f1pncrfxx296fn6ky09hj1qam5j0dpxxkzhy0a34xz0k2i";
           name = "cython-mode";
         };
@@ -4365,7 +4409,7 @@
           sha256 = "0apg6cpwjhp8spqq8yyfp56y3pn991sfc85kfnifyhz6v3y6vwv6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/d-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/d-mode";
           sha256 = "060k9ndjx0n5vlpzfxlv5zxnizx72d7y9vk7gz7gdvpm6w2ha0a2";
           name = "d-mode";
         };
@@ -4386,7 +4430,7 @@
           sha256 = "1gdh4izwhyly6dyrmh7lfpd12gnb8hpnafj8br51ksijsssrf21f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/darcula-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/darcula-theme";
           sha256 = "13d21gwzv66ibn0gs56ff3sn76sa2mkjvjmpd2ncxq3mcgxajnjg";
           name = "darcula-theme";
         };
@@ -4407,7 +4451,7 @@
           sha256 = "1p7ih9fmcxnnxkj2mz56xa403m828wyyqvliabf5amklzjlhb3z9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/darktooth-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/darktooth-theme";
           sha256 = "1vss0mg1vz4wvsal1r0ya8lid2c18ig11ip5v9nc80b5slbixzvs";
           name = "darktooth-theme";
         };
@@ -4428,7 +4472,7 @@
           sha256 = "1vkn95dyc0pppnflyqlrlx32g9zc7wdcgc9fgf1hgvqp313ydfcs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dart-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dart-mode";
           sha256 = "0wxfh8v716dhrmx1klhpnsrlsj66llk8brmwryjg2h7c391sb5ff";
           name = "dart-mode";
         };
@@ -4449,7 +4493,7 @@
           sha256 = "1njv5adcm96kdch0jb941l8pm51yfdx7mlz83y0pq6jlzjs9mwaa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dash";
           sha256 = "0azm47900bk2frpjsgy108fr3p1jk4h9kmp4b5j5pibgsm26azgz";
           name = "dash";
         };
@@ -4470,7 +4514,7 @@
           sha256 = "1njv5adcm96kdch0jb941l8pm51yfdx7mlz83y0pq6jlzjs9mwaa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dash-functional";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dash-functional";
           sha256 = "0hx36hs12mf4nmskaaqrqpcgwrfjdqj6qcxn6bwb0s5m2jf9hs8p";
           name = "dash-functional";
         };
@@ -4491,7 +4535,7 @@
           sha256 = "06aprbhhxb6bbzmf0r5yq2ry6x7708vp4d94ja3ir6zcwc96wn0k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/date-at-point";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/date-at-point";
           sha256 = "0r26df6px6q5jlxj29nhl3qbp6kzy9hs5vd72kpiirgn4wlmagp0";
           name = "date-at-point";
         };
@@ -4512,7 +4556,7 @@
           sha256 = "1lmwnj2fnvijj9qp4rjggl7c4x91vnpb47rqaam6m2wmr5wbrx3w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/date-field";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/date-field";
           sha256 = "0fmw13sa4ajs1xkrkdpcjpbp0jl9d81cgvwh93myg8yjjn7wbmvk";
           name = "date-field";
         };
@@ -4533,7 +4577,7 @@
           sha256 = "0pba9s0h37sxyqh733vi6k5raa4cs7aradipf3826inw36jcw414";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dedicated";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dedicated";
           sha256 = "1ka8n02r3nd2ksbid23g2qd6707c7xsjx7lbbdi6pcmwam5mglw9";
           name = "dedicated";
         };
@@ -4554,7 +4598,7 @@
           sha256 = "031f8ls1q80j717cg6b4pjd37wk7vrl5hcycsn8ca7yssmqa8q81";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/default-text-scale";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/default-text-scale";
           sha256 = "18r90ic38fnlsbg4gi3r962vban398x2bf3rqhrc6z4jk4aiv3mi";
           name = "default-text-scale";
         };
@@ -4575,7 +4619,7 @@
           sha256 = "1br4yys803x3ng4vzhhvblhkqabs46lx8a3ajycqy555q20zqzrf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/deferred";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/deferred";
           sha256 = "0axbvxrdjgxk4d1bd9ar4r5nnacsi8r0d6649x7mnhqk12940mnr";
           name = "deferred";
         };
@@ -4596,7 +4640,7 @@
           sha256 = "1lyqd9cgj7cb2lasf6ycw5j8wnsx2nrfm8ra4sg3dgcspm01a89g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/define-word";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/define-word";
           sha256 = "035fdfwnxw0mir1dyvrimygx2gafcgnvlcsmwmry1rsfh39n5b9a";
           name = "define-word";
         };
@@ -4615,7 +4659,7 @@
           sha256 = "eb5c178337c0bd6a001114aac685bb0d23167050970274203d93c1c0caece1e8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/deft";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/deft";
           sha256 = "1c9kps0lw97nl567ynlzk4w719a86a18q697rcmrbrg5imdx4y5p";
           name = "deft";
         };
@@ -4636,7 +4680,7 @@
           sha256 = "13jfhc9gavvb9dxmgi3k7ivp5iwh4yw4m11r2s8wpwn6p056bmfl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/demangle-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/demangle-mode";
           sha256 = "0ky0bb6rc99vrdli4lhs656qjndnla9b7inc2ji9l4n1zki5qxzk";
           name = "demangle-mode";
         };
@@ -4657,7 +4701,7 @@
           sha256 = "13fasbhdjwc4jh3cy25gm5sbbg56hq8la271098qpx6dhqm2wycq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/describe-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/describe-number";
           sha256 = "0gvriailni2ppz69g0bwnb1ik1ghjkj341k45vllz30j0frp9iji";
           name = "describe-number";
         };
@@ -4678,7 +4722,7 @@
           sha256 = "184zi5fv7ranghfx1hpx7j2wnk6kim8ysliyw2c5c1294sxxq3f3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/desktop+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/desktop+";
           sha256 = "0w7i6k4814hwb19l7ly9yq59674xiw57ylrwxq7yprwx52sgs2r8";
           name = "desktop-plus";
         };
@@ -4698,7 +4742,7 @@
           sha256 = "7c7727dd1d63be98e428700bfe340f2c4e7ff713fcc9b2b743a3366d786ae02d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/desktop-registry";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/desktop-registry";
           sha256 = "02mj0nlawx6vpksqsvp1q7l8rd6b1bs8f9c8c2rmda46jaf5npyr";
           name = "desktop-registry";
         };
@@ -4719,7 +4763,7 @@
           sha256 = "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dictionary";
           sha256 = "0zr9sm5rmr0frxdr0za72wiffip9391fn9dm5y5x0aj1z4c1n28w";
           name = "dictionary";
         };
@@ -4740,7 +4784,7 @@
           sha256 = "0sjwpvzd4x9c1b9iv66b33llvp96ryyzyp8pn1rnhvxfvjv43cnz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/diff-hl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/diff-hl";
           sha256 = "0kw0v9xcqidhf26qzrqwdlav2zhq32xx91k7akd2536jpji5pbn6";
           name = "diff-hl";
         };
@@ -4761,7 +4805,7 @@
           sha256 = "1ci2gmyl0i736b2sxh77fyg4hs2pkn6rn9z7v2hzv6xlgqd6j3z6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/diffview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/diffview";
           sha256 = "0vlzmykvxjwjww313brl1nr13kz41jypsk0s3l8q3rbsnkpfic5k";
           name = "diffview";
         };
@@ -4782,7 +4826,7 @@
           sha256 = "0jzwaivsqh66py9hd3dg1ys5rc3p6pn8ndpwpvgyivk4pg6zhhj6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/digistar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/digistar-mode";
           sha256 = "0khzxlrm09h31i1nqz6rnzhrdssb3kppc4klpxza612l306fih0s";
           name = "digistar-mode";
         };
@@ -4803,7 +4847,7 @@
           sha256 = "1vrd74vmm60gb69a4in412mjncnhkjbfpakpaa6w9rj7w4kyfiz1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dim";
           sha256 = "0gsyily47g3g55qmhp1wzfz319l1pkgjz4lbigafjzlzqxyclz52";
           name = "dim";
         };
@@ -4824,7 +4868,7 @@
           sha256 = "0bw1gkaycbbv2glnaa36gwzkl1l6lsq7i2i7jinka92b27zvrans";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dim-autoload";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dim-autoload";
           sha256 = "0lhzzjrgfvbqnzwhjywrk3skdb7x10xdq7d21q6kdk3h5r0np9f9";
           name = "dim-autoload";
         };
@@ -4845,7 +4889,7 @@
           sha256 = "0qpgfgp8hrzz4vdifxq8h25n0a0jlzgf7aa1fpy6r0080v5rqbb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/diminish";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/diminish";
           sha256 = "1h6a31jllypk47akjflz89xk6h47na96pim17d6g4rpqcafc2k43";
           name = "diminish";
         };
@@ -4866,7 +4910,7 @@
           sha256 = "1xg9cschjd2m0zal296q54ifk5i4s1s3azwfdkbgshxxgvxaky0w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dionysos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dionysos";
           sha256 = "1wjgj74dnlwd79gc3l7ymbx75jka8rw9smzbb10dsfppw3rrzfmz";
           name = "dionysos";
         };
@@ -4879,15 +4923,15 @@
     dired-atool = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dired-atool";
-        version = "0.1.0";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "HKey";
           repo = "dired-atool";
-          rev = "608675ead3bd57c180e6ef493aef04d9ac4035a3";
-          sha256 = "0k4grfphl2ap8npnfrc8q3xv7nm3jc1lgblgxb1v8jm585ycb7fd";
+          rev = "a2470f805c8cfbeee459b000edaaa5474bac35f9";
+          sha256 = "1d813b4wiamif48v0za5invnss52mn7yw3hzrlxd4918gy5y2r74";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-atool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-atool";
           sha256 = "0qljx6fmz1hal9r2smjyc957wcvcpg16vp5mv65ip6d26k5qsj0w";
           name = "dired-atool";
         };
@@ -4908,7 +4952,7 @@
           sha256 = "1m0nx8wd6q56qbp5mbp9n466kyglrz34nflwvgd1qnmi08jwswgv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-efap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-efap";
           sha256 = "01j5v6584qi8ia7zmk03kx3i3kmm6hn6ycfgqlh5va6lp2h9sr00";
           name = "dired-efap";
         };
@@ -4929,7 +4973,7 @@
           sha256 = "0lrc4082ghg77x5jl26hj8c7cp48yjvqhv4g3j0pznpzb4qyfnq0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-fdclone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-fdclone";
           sha256 = "11aikq2q3m9h4zpgl24f8npvpwd98jgh8ygjwy2x5q8as8i89vf9";
           name = "dired-fdclone";
         };
@@ -4950,7 +4994,7 @@
           sha256 = "088h9yn6wndq4pq6f7q4iz17f9f4ci29z9nh595idljp3vwr7qid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-imenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-imenu";
           sha256 = "09yix4fkr03jq6j2rmvyg6gkmcnraw49a8m9649r3m525qdnhxs1";
           name = "dired-imenu";
         };
@@ -4971,7 +5015,7 @@
           sha256 = "0rpln6m3j4xbhrmmz18hby6xpzpzbf1c5hr7bxvna265cb0i5rn7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-k";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-k";
           sha256 = "0lghdmy9qcjykscfxvfrz8cpp87qc0vfd03vw8nfpvwcs2sd28i8";
           name = "dired-k";
         };
@@ -4992,7 +5036,7 @@
           sha256 = "0mfvyjbx7l7a1sfq47m6rb507xxw92nykkkpzmi2mpwv30f1c22j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dired-single";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dired-single";
           sha256 = "13h8dsn7bkz8ji2rrb7vyrqb2znxarpiynqi65mfli7dn5k086vf";
           name = "dired-single";
         };
@@ -5013,7 +5057,7 @@
           sha256 = "0p8c2hjgr81idm1psv3i3v5hr5rv0875ig8app2yqjwzvl0nn73f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/direx";
           sha256 = "1x3rnrhhyrrvgry9n7kc0734la1zp4gc4bpy50f2qpfd452jwqdm";
           name = "direx";
         };
@@ -5034,7 +5078,7 @@
           sha256 = "0swdh0qynpijsv6a2d308i42hfa0jwqsnmf4sm8vrhaf3vv25f5h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/direx-grep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/direx-grep";
           sha256 = "0y2wrzq06prm55akwgaqjg56znknyvbayav13asirqzg258skvm2";
           name = "direx-grep";
         };
@@ -5055,7 +5099,7 @@
           sha256 = "0qxw30zrlcxhxb0alrgyiclrk44dysal8xsbz2mvgrb6jli8wg18";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/discover";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/discover";
           sha256 = "1hf57p90jn1zzhjl63zv9ascbgkcbr0p0zmd3fvzpjsw84235dga";
           name = "discover";
         };
@@ -5076,7 +5120,7 @@
           sha256 = "1wlqyl03hhnflbyay3qlvdzqzvv5rbybcjpfddggda7ias9h0pr4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/discover-my-major";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/discover-my-major";
           sha256 = "0ch2y4grdjp7pvw2kxqnqdl7jd3q609n3pm3r0gn6k0xmcw85fgg";
           name = "discover-my-major";
         };
@@ -5097,7 +5141,7 @@
           sha256 = "1b1a1bwc6nv6wkd8jg1cqmjb9m9pxi5i2wbrz97fgii23dwfmlnl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dispass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dispass";
           sha256 = "08c1s4zgl4rha10mva48cfkxzrqnpdhy03pxq51ihw94v6vxzg3z";
           name = "dispass";
         };
@@ -5118,7 +5162,7 @@
           sha256 = "06vb6r1k9ml799h44fm9jhf3amldzhawxnm0lnr501hrmj4bz36x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/docker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/docker";
           sha256 = "10x05vli7lg1w3fdbkrl34y4mwbhp2c7nqdwnbdy53i81jisw2lk";
           name = "docker";
         };
@@ -5139,7 +5183,7 @@
           sha256 = "1cmh8pwwa6dhl4w66wy8s5yqxs326mnaalg1ig2yhl4bjk8gi4m2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dockerfile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dockerfile-mode";
           sha256 = "1dxvzn35a9qd3x8pjvrvb2g71yf84404g6vz81y0p353rf2zknpa";
           name = "dockerfile-mode";
         };
@@ -5160,7 +5204,7 @@
           sha256 = "04h1hlsc83w4dppw9m44jq7mkcpy0bblvnzrhvsh06pibjywdd73";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/doom";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/doom";
           sha256 = "098q77lix7kwpmarv26yndyk1yy1h4k3l9kaf3g7sg6ji6k7d3wl";
           name = "doom";
         };
@@ -5181,7 +5225,7 @@
           sha256 = "13czcxmmvy4g9ysfjr6lb91c0fqv1xv8ppd27wbfsrgxm3aaqimb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/downplay-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/downplay-mode";
           sha256 = "1v6nga101ljzza8qj3lkmkzzl0vvzj4lsh1m69698s8prnczxr9b";
           name = "downplay-mode";
         };
@@ -5202,7 +5246,7 @@
           sha256 = "1x7hyj5qi9f222zwhwjqr98zzcvqjqfwxlglph8nsbadkv4s8c3v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dracula-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dracula-theme";
           sha256 = "0ayv00wvajia8kbfrqkrkpb3qp3k70qcnqkav7am16p5kbvzp10r";
           name = "dracula-theme";
         };
@@ -5223,7 +5267,7 @@
           sha256 = "0z3w58zplm5ks195zfsaq8kwbc944p3kbzs702jgz02wcrm4c28y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/draft-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/draft-mode";
           sha256 = "1wg9cx39f4dhrykb4zx4fh0x5cfrh5aicwwfh1h3yzpc4zlr7xfh";
           name = "draft-mode";
         };
@@ -5244,7 +5288,7 @@
           sha256 = "0wncdlc45flggn6sq5a95y7k6q11hy7zxp0ddhsjqccl30mdwax5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/drag-stuff";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/drag-stuff";
           sha256 = "0hzbh58ijv1akamav8r0zs76pwda2zd9mjaj31ffalzhhsm5jnyc";
           name = "drag-stuff";
         };
@@ -5265,7 +5309,7 @@
           sha256 = "12lxqrcfv5salmcslw3kggymcwwc0lzq1b6iqd7x4zizp0sjf09s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/drupal-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/drupal-mode";
           sha256 = "14jvk4phq3wcff3yvhygix0c9cpbphh0dvm961i93jpsx7g9awgn";
           name = "drupal-mode";
         };
@@ -5286,7 +5330,7 @@
           sha256 = "156cscpavrp695lp8pgjg5jnq3b8n9c2h8qg8w89dd4vfkc3iikd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/drupal-spell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/drupal-spell";
           sha256 = "117rr2bfnc99g3qsr127grxwaqp54cxjaj3nl2nr6z78nja0fij3";
           name = "drupal-spell";
         };
@@ -5307,7 +5351,7 @@
           sha256 = "17yldk76mxakhb90bma7r4z9jgx02wankgk17r2di196mc04bj7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ducpel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ducpel";
           sha256 = "1cqrkgg7n9bhjswnpl7yc6w6yjs4gfbliaqsimmf9z43wk2ml4pc";
           name = "ducpel";
         };
@@ -5317,6 +5361,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    dumb-jump = callPackage ({ dash, f, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
+    melpaBuild {
+        pname = "dumb-jump";
+        version = "0.2.5";
+        src = fetchFromGitHub {
+          owner = "jacktasia";
+          repo = "dumb-jump";
+          rev = "e1135a2bf8685726c9c083f444a9aa49d3ca56f5";
+          sha256 = "1hrlsyrqd0kpapw119mic5ilksb7y5ddmmc62hzbaqs7xmhzp52j";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dumb-jump";
+          sha256 = "1pgbs2k1g8w7gr65w50fazrmcky6w37c9rvyxqfmh06yx90nj4kc";
+          name = "dumb-jump";
+        };
+        packageRequires = [ dash f s ];
+        meta = {
+          homepage = "http://melpa.org/#/dumb-jump";
+          license = lib.licenses.free;
+        };
+      }) {};
     dyalog-mode = callPackage ({ cl-lib ? null, fetchhg, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "dyalog-mode";
@@ -5327,7 +5392,7 @@
           sha256 = "0ghxnzi2iy1g633fshl9wdpg2asrcl0v5rkk61gqd6axm7fjaxcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dyalog-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dyalog-mode";
           sha256 = "1y17nd2xd8b3mhaybws8dr7yanzwqij9gzfywisy65ckflm9kfyq";
           name = "dyalog-mode";
         };
@@ -5348,7 +5413,7 @@
           sha256 = "1ppwlill1z4vqd566h9zi6zx5jb7hggmnmqrga84j5n7fwqvgz7f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dynamic-fonts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dynamic-fonts";
           sha256 = "0a210ca41maa755lv1n7hhpxp0f7lfxrxbi0x34icbkfkmijhl6q";
           name = "dynamic-fonts";
         };
@@ -5369,7 +5434,7 @@
           sha256 = "05z7gshrn7wp0qkb9ns6rgmcp375yllmkwhdsm4amg0dk3j2slbr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/dynamic-ruler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/dynamic-ruler";
           sha256 = "13jc3xbsyc3apkdfy0iafmsfvgqs0zfa5w8jxp7zj4dhb7pxpnmc";
           name = "dynamic-ruler";
         };
@@ -5390,7 +5455,7 @@
           sha256 = "0g0cz5a0vf31w27ljq5sn52mq15ynadl6cfbb97ja5zj1zxsxgjl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm";
           sha256 = "0dp360jr3fgxqywkp7g88cp02g37kw2hdsc0f70hjak9n3sy03la";
           name = "e2wm";
         };
@@ -5411,7 +5476,7 @@
           sha256 = "1yf081rac0chvkjha9z9xi1p983gmhjph0hai6ppsz5hzf2vikpp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-R";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm-R";
           sha256 = "09v4fz178lch4d6m801ipclfxm2qrap5601aysnzyvc2apvyr3sh";
           name = "e2wm-R";
         };
@@ -5432,7 +5497,7 @@
           sha256 = "09i7d2rc9zd4s3nqrhd3ggs1ykdpxf0pyhxixxw2xy0q6nbswjia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm-direx";
           sha256 = "0nv8aciq0swxi9ahwc2pvk9c7i3rmlp7vrzqcan58ml0i3nm17wg";
           name = "e2wm-direx";
         };
@@ -5453,7 +5518,7 @@
           sha256 = "1vrlfzy1wynm7x4m7pl8vim7ykqd6qkcilwz7sjc1lbckz11ig0d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-pkgex4pl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm-pkgex4pl";
           sha256 = "0hgdbqfw3015fr929m36kfiqqzsid6afs3222iqq0apg7gfj7jil";
           name = "e2wm-pkgex4pl";
         };
@@ -5474,7 +5539,7 @@
           sha256 = "0mz43mwcgyc1c9p9b7nflnjxdxjm2nxbhl0scj6llzphikicr35g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-sww";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm-sww";
           sha256 = "0x45j62cjivf9v7jp1b41yya3f9akp92md6cbv0v7bwz98g2vsk8";
           name = "e2wm-sww";
         };
@@ -5495,7 +5560,7 @@
           sha256 = "0qv3kh6q3q7vgfsd8x25x8agi3fp96dkpjnxdidkwk6k8h9n0jzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/e2wm-term";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/e2wm-term";
           sha256 = "0wrq06yap80a96l9l0hs7x7rng7sx6vi1hz778kknb6il4f2f45g";
           name = "e2wm-term";
         };
@@ -5516,7 +5581,7 @@
           sha256 = "0r56nqrj6iaz57ys6hqdq5qkyliv7dj6dv274l228r7x0axrwd9m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/easy-kill";
           sha256 = "10jcv7a4vcnaj3wkabip2xwzcwlmvdlqkl409a9lnzfasxcpf32i";
           name = "easy-kill";
         };
@@ -5537,7 +5602,7 @@
           sha256 = "18fdlxz9k961k8wafdw0gq0y514bvrfvx6qc1lmm4pk3gdcfbbi0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-kill-extras";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/easy-kill-extras";
           sha256 = "0xzlzv57nvrc142saydwfib51fyqcdzjccc1hj6xvgcdbwadlnjy";
           name = "easy-kill-extras";
         };
@@ -5558,7 +5623,7 @@
           sha256 = "18bm5ns1qrxq0rrz9sylshr62wkymh1m6b7ch2y74f8rcwdwjgnq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/easy-repeat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/easy-repeat";
           sha256 = "1vx57gpw0nbxh976s18va4ali1nqxqffhaxv1c5rhf4pwlk2fa06";
           name = "easy-repeat";
         };
@@ -5579,7 +5644,7 @@
           sha256 = "0ysym38xaqyx1wc7xd3fvjm62dmiq4727dnjvyxv7hs4czff1gcb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ebal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ebal";
           sha256 = "1kqnlp5n1aig1qbqdq9q50wgqkzd1l6h9wi1gv43cif8qa1kxhwg";
           name = "ebal";
         };
@@ -5589,6 +5654,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    ebf = callPackage ({ cl-lib ? null, dash, dash-functional, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "ebf";
+        version = "1.0.0";
+        src = fetchFromGitHub {
+          owner = "rexim";
+          repo = "ebf";
+          rev = "d0bd4fe1abbe327e7d9228eff09927fec57e8378";
+          sha256 = "16hiwz8a1hyyiflzn53v97704v783pg18yxapn7pqk90fbcf7czw";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ebf";
+          sha256 = "072w1hczzb4z0dadvqy8px9zfnfd2z0w8nwa7q2qm5njg30rrqpb";
+          name = "ebf";
+        };
+        packageRequires = [ cl-lib dash dash-functional ];
+        meta = {
+          homepage = "http://melpa.org/#/ebf";
+          license = lib.licenses.free;
+        };
+      }) {};
     ebib = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, parsebib }:
     melpaBuild {
         pname = "ebib";
@@ -5600,7 +5686,7 @@
           sha256 = "159w19hx3gmhv8n2amkm6i999vdrz5132bjwk28qpiq37v1v7dd5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ebib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ebib";
           sha256 = "1kdqf5nk9l6mr3698nqngrkw5dicgf7d24krir5wrcfbrsqrfmid";
           name = "ebib";
         };
@@ -5621,7 +5707,7 @@
           sha256 = "1s9r1qj7cjsjvvphdpyjff6y598xpbrm9qjv5ncq15w6ac7yxzvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ecb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ecb";
           sha256 = "097hdskhfh255znrqamcssx4ns1sgkxchlbc7pjqwzpflsi0fx89";
           name = "ecb";
         };
@@ -5642,7 +5728,7 @@
           sha256 = "1r5hlcspznvfm111l1z0r4isd582qj64sa8cqk6hyi3y1hyp1xxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ecukes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ecukes";
           sha256 = "0ava8hrc7r1mzv6xgbrb84qak5xrf6fj8g9qr4i4g0cr7843nrw0";
           name = "ecukes";
         };
@@ -5663,7 +5749,7 @@
           sha256 = "0xy3q68i47a3s81jwr0rdvc1722bp78ng56xm53pri05g1z0db9s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edbi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edbi";
           sha256 = "0qq0j16n8lyvkqqlcsrq1m7r7f0in6b92d74mpx5c6siv6z2vxlr";
           name = "edbi";
         };
@@ -5684,7 +5770,7 @@
           sha256 = "10c84aad1lnr7z9f75k5ylgchykr3srcdmn88hlcx2n2c4jfbkds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-indirect";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edit-indirect";
           sha256 = "0q5jjmrvx5kaajllmhaxihsab2kr1vmcsfqrhxdhw3x3nf41s439";
           name = "edit-indirect";
         };
@@ -5705,7 +5791,7 @@
           sha256 = "0981hy1n50yizc3k06vbxqrpfml817a67kab1hkgkw5v6ymm1hc9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edit-list";
           sha256 = "0mi12jfgx06i0yr8k5nk80xryqszjv0xykdnri505862rb90xakv";
           name = "edit-list";
         };
@@ -5726,7 +5812,7 @@
           sha256 = "12dp1xj09jrp0kxp9xb6cak9dn6zkyis1wfn4fnhzmxxnrd8c5rn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edit-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edit-server";
           sha256 = "0ffxcgmnz0f2c1i3vfwm8vlm6jyd7ibf4kq5z8c6n50zkwfdmns0";
           name = "edit-server";
         };
@@ -5739,15 +5825,15 @@
     editorconfig = callPackage ({ editorconfig-core, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig";
-        version = "0.7.2";
+        version = "0.7.3";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "460be7416529ceecd3647f7e15d1d20a202f12b7";
-          sha256 = "03vgcvxpp8inlhmxkd2cpp7ywjbl0ccz0lq7s46212dpk99fbd91";
+          rev = "a327a42f3fdc2ab6d0e8226b3a22f4bab7e536bb";
+          sha256 = "0x6kb6zwkacw344zp8lprfmhm1mz2x7arn9ddgm53x410sbs71kx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/editorconfig";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/editorconfig";
           sha256 = "0na5lfi9bs4k1q73pph3ff0v8k8vzrfpzh47chyzk8nxsmvklw35";
           name = "editorconfig";
         };
@@ -5760,15 +5846,15 @@
     editorconfig-core = callPackage ({ cl-lib ? null, editorconfig-fnmatch, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig-core";
-        version = "0.7.2";
+        version = "0.7.3";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "460be7416529ceecd3647f7e15d1d20a202f12b7";
-          sha256 = "03vgcvxpp8inlhmxkd2cpp7ywjbl0ccz0lq7s46212dpk99fbd91";
+          rev = "a327a42f3fdc2ab6d0e8226b3a22f4bab7e536bb";
+          sha256 = "0x6kb6zwkacw344zp8lprfmhm1mz2x7arn9ddgm53x410sbs71kx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/editorconfig-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/editorconfig-core";
           sha256 = "18d7byqkxn6lyw3nqsvqs5vyj9alh9wjd2mim44a3zcc9r2j061r";
           name = "editorconfig-core";
         };
@@ -5781,15 +5867,15 @@
     editorconfig-fnmatch = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "editorconfig-fnmatch";
-        version = "0.7.2";
+        version = "0.7.3";
         src = fetchFromGitHub {
           owner = "editorconfig";
           repo = "editorconfig-emacs";
-          rev = "460be7416529ceecd3647f7e15d1d20a202f12b7";
-          sha256 = "03vgcvxpp8inlhmxkd2cpp7ywjbl0ccz0lq7s46212dpk99fbd91";
+          rev = "a327a42f3fdc2ab6d0e8226b3a22f4bab7e536bb";
+          sha256 = "0x6kb6zwkacw344zp8lprfmhm1mz2x7arn9ddgm53x410sbs71kx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/editorconfig-fnmatch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/editorconfig-fnmatch";
           sha256 = "0ji243vrw527jc3alsgmqi9rdnslxyq48zzx33rbpkqcjssm11iv";
           name = "editorconfig-fnmatch";
         };
@@ -5810,7 +5896,7 @@
           sha256 = "06v34l9dkykrrdfpnm3zi5wjm0fdvy76pbkfnk92wqkjp8fqimhd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edn";
           sha256 = "00cy8axhy2p3zalzl8k2083l5a7s3aswb9qfk9wsmf678m8pqwqg";
           name = "edn";
         };
@@ -5831,7 +5917,7 @@
           sha256 = "1a1apa48n24yisd2zw5k4lfkngx3016x6y11qi80hg75vrnmg7f1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/edts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/edts";
           sha256 = "0f0rbd0mqqwn743qmr1g5mmi1sbmlcglclww8jxvbvb61jq8vspr";
           name = "edts";
         };
@@ -5852,7 +5938,7 @@
           sha256 = "1ryb7smvf66hk307yazkjn9bqzbwzbyyb5db200fq6j2zdjwsmaj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/egg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/egg";
           sha256 = "144g1fvs2cmn3px0a98nvxl5cz70kx30v936k5ppyi8gvbj0md5i";
           name = "egg";
         };
@@ -5873,7 +5959,7 @@
           sha256 = "16m7h477z10bmaymmgpj2id6l98iyrsp5wf69wd56534kh6qcajg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/egison-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/egison-mode";
           sha256 = "0x11fhv8kkx34h831k2q70y5qfz7wnfia4ka5mbmps7mpr68zcwi";
           name = "egison-mode";
         };
@@ -5892,7 +5978,7 @@
           sha256 = "3f41ade3332a3f1dc5cfb0b33077396feb7b683b2cf2c235b7a5f07f0b2e3271";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eide";
           sha256 = "16cf32n2l4wy1px7fm6x4vxx7pbqdp7zh2jn3bymg0b40i2321sz";
           name = "eide";
         };
@@ -5913,7 +5999,7 @@
           sha256 = "1si9zk4iwgkfn5p9x48hy1laz8r5m5vbyahy1andxrfxnb9fi0kj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ein";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ein";
           sha256 = "1nksj1cpf4d9brr3rb80bgp2x05qdq9xmlp8mwbic1s27mw80bpp";
           name = "ein";
         };
@@ -5934,7 +6020,7 @@
           sha256 = "0dbp2zz993cm7mrd58c4iflbzqwg50wzgn2cpwfivk14w1mznh4n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-autoyas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-autoyas";
           sha256 = "0hh5j79f3z82nmb3kqry8k8lgc1qswk6ni3g9jg60pasc3wkbh6c";
           name = "el-autoyas";
         };
@@ -5955,7 +6041,7 @@
           sha256 = "1awyh9ffd6a4cia239s89asb88ddqlnrv757d76vcb701pq412bz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-get";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-get";
           sha256 = "1438v2sw5n67q404c93y2py226v469nagqwp4w9l6yyy40h4myhz";
           name = "el-get";
         };
@@ -5976,7 +6062,7 @@
           sha256 = "1mzla7ijmq1mgzr6bf16mjdycbf8ylsf4zdk4j6fh5kw5n4k6c5n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-init";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-init";
           sha256 = "121n6z8p9kzi7axp4i2kyi621gw20635w4j81i1bryblaqrv5kl5";
           name = "el-init";
         };
@@ -5997,7 +6083,7 @@
           sha256 = "1488wv0f9ihzzf9fl8cki044k61b0kva604hdwpb2qk9gnjr4g1l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-init-viewer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-init-viewer";
           sha256 = "0kkmsml9xf2n8nlrcicfg2l78s3dlhd6ssx0s62v77v4wdpl297m";
           name = "el-init-viewer";
         };
@@ -6018,7 +6104,7 @@
           sha256 = "13mv1rhgkwiww2wh5w926jz7idppp492wir1vdl245c5x50dh4f7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-mock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-mock";
           sha256 = "07m7w7n202nijnxidy0j0r4nbcvlnbkm9b0n8qb2bwi3d4cfp77l";
           name = "el-mock";
         };
@@ -6039,7 +6125,7 @@
           sha256 = "0390pfgfgj7hwfmkwikwhip0hmwkgx784l529cqvalc31jchi94i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-spice";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-spice";
           sha256 = "0i0l3y9w1q9pf5zhvmsq4h427imix67jgcfwq21b6j82dzg5l4hg";
           name = "el-spice";
         };
@@ -6060,7 +6146,7 @@
           sha256 = "1i6j44ssxm1xdg0mf91nh1lnprwsaxsx8vsrf720nan7mfr283h5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/el-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/el-x";
           sha256 = "1721d9mljlcbdwb5b9934q7a48y30x6706pp4bjvgys0r64dml5g";
           name = "el-x";
         };
@@ -6081,7 +6167,7 @@
           sha256 = "0hlj6jn9gmi00sqghxswkxpgk65c4gy2k7010vpkr2257rd4f3gq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elang";
           sha256 = "0frhn3hm8351qzljicpzars28af1fghgv45717ml79rwb4vi6yiy";
           name = "elang";
         };
@@ -6102,7 +6188,7 @@
           sha256 = "1fh9dx669czkwy4msylcg64azz3az27akx55ipnazb5ghmsi7ivk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eldoc-eval";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eldoc-eval";
           sha256 = "0z4scgi2xgrgd47aqqmyv1ww8alh43s0qny5qmh3f1nnppz3nd7c";
           name = "eldoc-eval";
         };
@@ -6123,7 +6209,7 @@
           sha256 = "1bqdg5sr4hkiqndr4hcdjscfdyj56jb4wr1kqgwy1hy4ccr9mkrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/electric-operator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/electric-operator";
           sha256 = "043bkpvvk42lmkll5jnz4q8i0m44y4wdxvkz6hiqhqcp1rv03nw2";
           name = "electric-operator";
         };
@@ -6144,7 +6230,7 @@
           sha256 = "1ln0wprk8m2d33z804ld73jwv9x51xkwl9xfsywbh09w3x2zb51j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elfeed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elfeed";
           sha256 = "1psga7fcjk2b8xjg10fndp9l0ib72l5ggf43gxp62i4lxixzv8f9";
           name = "elfeed";
         };
@@ -6165,7 +6251,7 @@
           sha256 = "1ln0wprk8m2d33z804ld73jwv9x51xkwl9xfsywbh09w3x2zb51j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elfeed-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elfeed-web";
           sha256 = "14ydwvjjc6wbhkj4g4xdh0c3nh4asqsz8ln7my5vjib881vmaq1n";
           name = "elfeed-web";
         };
@@ -6186,7 +6272,7 @@
           sha256 = "1k7kprdknqm18dc0nwl7gachm0rivcpa8ng7p7ximalja3nsg2j1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elisp-slime-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elisp-slime-nav";
           sha256 = "009zgp68i4naprpjr8lcp06lh3i5ickn0nh0lgvrqs0niprnzh8c";
           name = "elisp-slime-nav";
         };
@@ -6207,7 +6293,7 @@
           sha256 = "07kgzdla31nc146xya21rn4hyr76h5lyabla8yh4qjsvnknb7cbj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elixir-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elixir-mode";
           sha256 = "1dba3jfg210i2rw8qy866396xn2xjgmbcyl006d6fibpr3j4lxaf";
           name = "elixir-mode";
         };
@@ -6228,7 +6314,7 @@
           sha256 = "0dx5h3sfccc2bp1jxnqqki95x5hp1skw8n5n4lnh703yjga5gkrz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elixir-yasnippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elixir-yasnippets";
           sha256 = "0927znqd9j91wc51hdwcl2rxb66i1h549nyr1h39r13353gbwk3a";
           name = "elixir-yasnippets";
         };
@@ -6241,15 +6327,15 @@
     elm-mode = callPackage ({ emacs, f, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild, s }:
     melpaBuild {
         pname = "elm-mode";
-        version = "0.9.3";
+        version = "0.9.5";
         src = fetchFromGitHub {
           owner = "jcollard";
           repo = "elm-mode";
-          rev = "61671af42d2162b06ee06b4857bc4a63bf82a57b";
-          sha256 = "0cjxvmsfjki8zal31zbf4ynf7i0gy5vykpq6858qpa68vkd1p0iz";
+          rev = "47ea2e8d06e9f39be4e1d5a79b6cc634f9d46e58";
+          sha256 = "0qiwzcpwiwlkjy89pxvss3gvjvbp4d6qpaxnbm50va1gbn21n72v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elm-mode";
           sha256 = "1gw9szkyr1spcx7qijddhxlm36h0hmfd53b4yzp1336yx44mlnd1";
           name = "elm-mode";
         };
@@ -6270,7 +6356,7 @@
           sha256 = "0l2iincskpks9yvj3y9zh1b48xli1q39wybr5n96rys5gv0drc9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elmacro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elmacro";
           sha256 = "0644rgwawivrq1shsjx1x2p53z7jgr6bxqgn2smzql8pp6azy7xz";
           name = "elmacro";
         };
@@ -6291,7 +6377,7 @@
           sha256 = "080nnw6ddsczbm7gk50x4dkahi77fsybfiki5iyp39fjpa7lfzq3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elmine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elmine";
           sha256 = "1gi94dyz9x50swkvryd4vj36rqgz4s58nrb4h4vwwviiiqmc8fvz";
           name = "elmine";
         };
@@ -6312,7 +6398,7 @@
           sha256 = "1q4krfrc2dy0vr7q148msfpkcwj55mlsrn4n5xjnya4xj0134ib7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elpa-audit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elpa-audit";
           sha256 = "0l8har14zrlh9kdkh9vlmkmzg49vb0r8j1wnznryaidalvk84a52";
           name = "elpa-audit";
         };
@@ -6333,7 +6419,7 @@
           sha256 = "1hjmvn3kls63alh0ihb5c8gf90lrfvq1hxrlf4162qiaa0s15f8a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elpa-mirror";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elpa-mirror";
           sha256 = "1jnviav2ybr13cgllg26kfjrwrl25adggnqiiwyjwgbbzxfycah8";
           name = "elpa-mirror";
         };
@@ -6354,7 +6440,7 @@
           sha256 = "1xjm9b32a9nfzvphj6vm0dqcr4i072zcx29kcgiyyni8zbgbwmwv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elpy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elpy";
           sha256 = "051irp7k0cp1hqp3hzrmapllf2iim7cq0iz38489g4fkh2ybk709";
           name = "elpy";
         };
@@ -6381,7 +6467,7 @@
           sha256 = "091dxsb73bhqmrddwnmvblmfpwa7v7fa0ha18daxc8j0lrhzdhlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elscreen-mew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elscreen-mew";
           sha256 = "06g4wcfjs036nn64ac0zsvr08cfmak2hyj83y7a0r35yxr1853w4";
           name = "elscreen-mew";
         };
@@ -6402,7 +6488,7 @@
           sha256 = "06g7fl2c7cvwsrgi462wf6j13ny56y6zvgkizz9f256xjjq77ymf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elscreen-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elscreen-persist";
           sha256 = "1rjfvpsx0y5l9b76wa1ilj5lx39jd0m78nb1a4bqn81z0rkfpl4k";
           name = "elscreen-persist";
         };
@@ -6423,7 +6509,7 @@
           sha256 = "1k7npf93xbmrsq607x8zlgrpzqvplgia3ixz5w1lr1jlv1m2m8x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elwm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elwm";
           sha256 = "0rf663ih3lfg4n4pj4dpp133967zha5m1wr46riaxpha7xr59al9";
           name = "elwm";
         };
@@ -6444,7 +6530,7 @@
           sha256 = "12svv24qclkcdb5sniq0xbbsj34hq835s2v636xkb07dpmy644lg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/elx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/elx";
           sha256 = "02nq66c0sds61k2p8cn2l0p2l8ysb38ibr038qn41l9hg1dq065x";
           name = "elx";
         };
@@ -6465,7 +6551,7 @@
           sha256 = "0b9hr3xg53nap6sik9d2cwqi8vfwzv8yqjcin4hab6rg2fkr5mra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacs-eclim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacs-eclim";
           sha256 = "1l55jhz5mb3bqw90cbf4jhcqgwj962br706qhm2wn5i2a1mg8xlv";
           name = "emacs-eclim";
         };
@@ -6486,7 +6572,7 @@
           sha256 = "15l3ab11vcmzqibkd6h5zqw5a83k8dmgcp4n26px29c0gv6bkpy8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacs-setup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacs-setup";
           sha256 = "1x4rh8vx6fsb2d6dz2g9j6jamin1vmpppwy3yzbl1dnf7w4hx4kh";
           name = "emacs-setup";
         };
@@ -6507,7 +6593,7 @@
           sha256 = "0ciqxyahlzaxq854jm25zbrbmrhcaj5csdhxa0az9crwha8wkmw2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsagist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsagist";
           sha256 = "1cyz7nf0zxa21979jf5kdmkgwiyd17vsmpcmrw1af37ly27l8l64";
           name = "emacsagist";
         };
@@ -6528,7 +6614,7 @@
           sha256 = "1r6cpb7fck5znb7q7zrxcsjn7d3xiqhq8dp1ar1rsd6k4h05by4j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsc";
           sha256 = "1fbf9al3yds0il18jz6hbpj1fsjlpb1kgp450gb6r09lc46x77mk";
           name = "emacsc";
         };
@@ -6549,7 +6635,7 @@
           sha256 = "0ph0462shk00rhrkpvwgsr4biykimky2d89pvkbg377951jdga7i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsql";
           sha256 = "1x4rn8dmgz871dhz878i2mqci576zccf9i2xmq2ishxgqm0hp8ax";
           name = "emacsql";
         };
@@ -6570,7 +6656,7 @@
           sha256 = "0ph0462shk00rhrkpvwgsr4biykimky2d89pvkbg377951jdga7i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsql-mysql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsql-mysql";
           sha256 = "1c20zhpdzfqjds6kcjhiq1m5ch53fsx6n1xk30i35kkg1wxaaqzy";
           name = "emacsql-mysql";
         };
@@ -6591,7 +6677,7 @@
           sha256 = "0ph0462shk00rhrkpvwgsr4biykimky2d89pvkbg377951jdga7i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsql-psql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsql-psql";
           sha256 = "1aa1g9jyjmz6w0lmi2cf67926ad3xvs0qsg7lrccnllr9k0flly3";
           name = "emacsql-psql";
         };
@@ -6612,7 +6698,7 @@
           sha256 = "0ph0462shk00rhrkpvwgsr4biykimky2d89pvkbg377951jdga7i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emacsql-sqlite";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emacsql-sqlite";
           sha256 = "1vywq3ypcs61s60y7x0ac8rdm9yj43iwzxh8gk9zdyrcn9qpis0i";
           name = "emacsql-sqlite";
         };
@@ -6633,7 +6719,7 @@
           sha256 = "1a9925n0jcgxcgiz2kmh9zbb1rg9039rlrbr9fr80by9znfwmy67";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emamux";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emamux";
           sha256 = "1pg0gzi8rn0yafssrsiqdyj5dbfy984srq1r4dpp8p3bi3n0fkfz";
           name = "emamux";
         };
@@ -6654,7 +6740,7 @@
           sha256 = "1dsa85bk33j90h1ypaz1ylqh9yp2xvlga237h3kwa5y3sb0d5ydi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emmet-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emmet-mode";
           sha256 = "0w5nnhha70mndpk2a58raaxqanv868z05mfy1a8prgapm56mm819";
           name = "emmet-mode";
         };
@@ -6667,15 +6753,15 @@
     emms-mode-line-cycle = callPackage ({ emacs, emms, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "emms-mode-line-cycle";
-        version = "0.2.4";
+        version = "0.2.5";
         src = fetchFromGitHub {
           owner = "momomo5717";
           repo = "emms-mode-line-cycle";
-          rev = "0488de1f9b4d0be6aa7dfe2fe0231cfd9b4d4295";
-          sha256 = "1pz2xvv5hzfg4a8s6xnbr14mpwnr94cwsa1bpk83i7x15hmxj938";
+          rev = "2c2f395e484a1d345050ddd61ff5fab71a92a6bc";
+          sha256 = "0q80f0plch6k4lhs8c9qm3mfycfbp3kn5sjrk9zxgxwnn901y9mp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-mode-line-cycle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emms-mode-line-cycle";
           sha256 = "1jdmfh1i9v84iy7bj2dbc3s2wfzkrby3pabd99gnqzd9gn1cn8ca";
           name = "emms-mode-line-cycle";
         };
@@ -6696,7 +6782,7 @@
           sha256 = "1yy4dmjp53l2df5qix31g4vizhv80wm88vjqq6qqa9p822732n0m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-player-mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emms-player-mpv";
           sha256 = "175rmqx3bgys4chw8ylyf9rk07sg0llwbs9ivrv2d3ayhcz1lg9y";
           name = "emms-player-mpv";
         };
@@ -6717,7 +6803,7 @@
           sha256 = "15bb8fp2lwr5brfrsjwa47yvja5g2wyaac5a4sh5rn734s64x2sq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emms-player-simple-mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emms-player-simple-mpv";
           sha256 = "15aljprjd74ha7wpzsmv3d873i6fy3x1jwhzm03hvw0sw18m25i1";
           name = "emms-player-simple-mpv";
         };
@@ -6738,7 +6824,7 @@
           sha256 = "1rk7am0xvpnv98yi7a62wlyh576md4n2ddj7nm201bjd4wdl2yxk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emoji-cheat-sheet-plus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emoji-cheat-sheet-plus";
           sha256 = "1ciwlbw0ihm0p5gnnl3safcj7dxwiy53bkj8cmw3i334al0gjnnv";
           name = "emoji-cheat-sheet-plus";
         };
@@ -6759,7 +6845,7 @@
           sha256 = "0qi7p1grann3mhaq8kc0yc27cp9fm983g2gaqddljchn7lmgagrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emoji-fontset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emoji-fontset";
           sha256 = "19affsvlm1rzrzdh1k6xsv79icdkzx4izxivrd2ia6y2wcg9wc5d";
           name = "emoji-fontset";
         };
@@ -6780,7 +6866,7 @@
           sha256 = "0nrf6p4h66i17nz850kpdrnk5h5ra4l3icjjrq34sxvmsssp6zhp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emojify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emojify";
           sha256 = "15v2h5jfksfc208qphiczplg56yka07qv4w4482c10yzwq76zp17";
           name = "emojify";
         };
@@ -6801,7 +6887,7 @@
           sha256 = "0pl7i2a0mf2s33qpsc14dcvqbl6jm5xrvcnrhfr7visvnih29cy4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/emr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/emr";
           sha256 = "05vpfxg6lviclnms2zyrza8dc87m60mimlwd11ihvsbngi9gcw8x";
           name = "emr";
         };
@@ -6832,7 +6918,7 @@
           sha256 = "1dsa3r39ip20ddbw0m9vq8z3r4ahrxvb37adyqi4mbdgyr6fq6sw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/engine-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/engine-mode";
           sha256 = "1gg7i93163m7k7lr3pnal1svymnhzwrfpfcdc0798d7ybv26gg8c";
           name = "engine-mode";
         };
@@ -6853,7 +6939,7 @@
           sha256 = "08j6b79vy8ry4ad1abk3hvxjbb4ylrhkvrbrnq1gcikl4h1p2v63";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/enlive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/enlive";
           sha256 = "1dyayk37zik12qfh8zbjmhsch64yqsx3acrlm7hcnavx465hmhnz";
           name = "enlive";
         };
@@ -6874,7 +6960,7 @@
           sha256 = "1in4wbwkxn8qfcsfjbczzk73z74w4ixlml61wk666dw0kpscgbs5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/enotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/enotify";
           sha256 = "0mii6m6zw9y8njgzi79rcf1n251iw7qz3yqjjij3c19rk3zpm5qi";
           name = "enotify";
         };
@@ -6884,6 +6970,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    eopengrok = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, magit, melpaBuild, s }:
+    melpaBuild {
+        pname = "eopengrok";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "youngker";
+          repo = "eopengrok.el";
+          rev = "30154a083b2fd8cbb9336d0d2134f790efd4163b";
+          sha256 = "1yn9jn6jl6rmknj50g18z5yvpa1d8mzzx3j1pfdwfn36ak4nc9ba";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eopengrok";
+          sha256 = "0756x78113286hwk1i1m5s8xq04gh7zxb4fkmw58lg2ssff8q6av";
+          name = "eopengrok";
+        };
+        packageRequires = [ cl-lib dash magit s ];
+        meta = {
+          homepage = "http://melpa.org/#/eopengrok";
+          license = lib.licenses.free;
+        };
+      }) {};
     epc = callPackage ({ concurrent, ctable, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "epc";
@@ -6895,7 +7002,7 @@
           sha256 = "05r2m7zghbdrgscg0x78jnhk1g6fq8iylar4cx699zm6pzvlq98z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/epc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/epc";
           sha256 = "1l9rcx07pa4b9z5654gyw6b64c95lcigzg15amphwr56v2g3rbzx";
           name = "epc";
         };
@@ -6916,7 +7023,7 @@
           sha256 = "0sjxd5y5hxhrbgfkpwx6m724r3841b53hgc61a0g5zwispw5pmrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/epl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/epl";
           sha256 = "0zr3r2hn9jaxscrl83hyixznb8l5dzfr6fsac76aa8x12xgsc5hn";
           name = "epl";
         };
@@ -6937,7 +7044,7 @@
           sha256 = "1xw56sir6gkr0p9g4s6p4qc0rajnl6ifbzrky07j28y9vsa59nsz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-crypt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-crypt";
           sha256 = "1mzzqcxjnll4d9r9n5z80zfb3ywkd8jx6b49g02vwf1iak9h7hv3";
           name = "erc-crypt";
         };
@@ -6947,6 +7054,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    erc-hipchatify = callPackage ({ alert, emacs, fetchhg, fetchurl, lib, melpaBuild, request, s }:
+    melpaBuild {
+        pname = "erc-hipchatify";
+        version = "0.1";
+        src = fetchhg {
+          url = "https://bitbucket.com/seanfarley/erc-hipchatify";
+          rev = "a1a163004d98";
+          sha256 = "0bk4vr26abhbiwkmpns4hdlg23pxa25lca78fhz1900jkv4imk0f";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-hipchatify";
+          sha256 = "1a4gl05i757vvap0rzrfwms7mhw80sa84gvbwafrvj3x11rja24x";
+          name = "erc-hipchatify";
+        };
+        packageRequires = [ alert emacs request s ];
+        meta = {
+          homepage = "http://melpa.org/#/erc-hipchatify";
+          license = lib.licenses.free;
+        };
+      }) {};
     erc-hl-nicks = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "erc-hl-nicks";
@@ -6958,7 +7085,7 @@
           sha256 = "1k0g3bwp3w0dd6zwdv6k2wpqs2krjayilrzsr1hli649ljcx55d7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-hl-nicks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-hl-nicks";
           sha256 = "1lhw77n2nrjnb5yhnpm6yhbcp022xxjcmdgqf21z9rd0igss9mja";
           name = "erc-hl-nicks";
         };
@@ -6979,7 +7106,7 @@
           sha256 = "0p1j08rrdsqmkb8zz8h8ba24hr59nx3xh2m044ry468hfd2bp6vd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erc-youtube";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erc-youtube";
           sha256 = "12ylxkskkgfv5x7vlkib963ichb3rlmdzkf4zh8a39cgl8wsmacx";
           name = "erc-youtube";
         };
@@ -7000,7 +7127,7 @@
           sha256 = "19jninbf0dhdw3kn4d38bxmklg0v7sh3m9dwj6z69w99r5pcw480";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ercn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ercn";
           sha256 = "0yvis02bypw6v1zv7i326y8s6j0id558n0bdri52hr5pw85imnlp";
           name = "ercn";
         };
@@ -7021,7 +7148,7 @@
           sha256 = "17i567nfm0rykimh6bpcc5f2l7wsf8zcdy2jzd7sgrl54dvb0g9i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erefactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erefactor";
           sha256 = "0ma9sbrq4n8y5w7vvbhhgmw25aiykbq5yhxzm0knj32bgpviprw7";
           name = "erefactor";
         };
@@ -7042,7 +7169,7 @@
           sha256 = "19m6chwc2awbsk5z03q1yhq84m481pff2609a8bxymcvm6yaamvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ergoemacs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ergoemacs-mode";
           sha256 = "0h99m0n3q41lw5fm33pc1405lrxyc8rzghnc6c7j4a6gr1d82s62";
           name = "ergoemacs-mode";
         };
@@ -7063,7 +7190,7 @@
           sha256 = "1g7grv3zs5lydkxhwzdc3caqym11m20mx43m3hd5jgc96smg0433";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/erlang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/erlang";
           sha256 = "1gmrdkfanivb9l5lmkl0853snlhl62w34537r82w11z2fbk9lxhc";
           name = "erlang";
         };
@@ -7084,7 +7211,7 @@
           sha256 = "0hn9i405nfhjd1h9vnwj43nxbbz00khrwkjq0acfyxjaz1shfac9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ert-async";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ert-async";
           sha256 = "004798ckri5j72j0xvzkyciss1iz4lw9gya2749hkjxlamg14cn5";
           name = "ert-async";
         };
@@ -7104,7 +7231,7 @@
           sha256 = "63a8fb532260f56569ce20f911788054624a7a29f149ed6036d9f997ae0457c3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ert-junit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ert-junit";
           sha256 = "0bv22mhh1ahbjwi6s1csxkh11dmy0srabkddjd33l4havykxlg6g";
           name = "ert-junit";
         };
@@ -7125,7 +7252,7 @@
           sha256 = "0rdgdslspzb4s0n4a68hnwfm8vm8baasa8nzrdinf0nryn7rrhbf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ert-runner";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ert-runner";
           sha256 = "0fnb8rmjr5lvc3dq0fnyxhws8ync1lj5xp8ycs63z4ax6gmdqr48";
           name = "ert-runner";
         };
@@ -7146,7 +7273,7 @@
           sha256 = "0jq4yp80wiphlpsc0429rg8n50g8l4lf78q0l3nywz2p93smjy9b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/es-lib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/es-lib";
           sha256 = "0mwvgf5385qsp91zsdw75ipif1h90xy277xdmrpwixsxd7abbn0n";
           name = "es-lib";
         };
@@ -7156,22 +7283,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    es-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    es-mode = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "es-mode";
-        version = "4.1.0";
+        version = "4.1.1";
         src = fetchFromGitHub {
           owner = "dakrone";
           repo = "es-mode";
-          rev = "c8674924e566416ead90d837d3f3b00127d4a0e1";
-          sha256 = "1vd5kry46bi3rg4l4330bdkh5slk821a6w4vzzphdqwk61fir81b";
+          rev = "b3f67ca152fb55d2625468afd6983f54507f43aa";
+          sha256 = "0avvkfmqsa1ld5f6cx98sliidzi42iax1c78059r4k5z5kz24x37";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/es-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/es-mode";
           sha256 = "1541c7d8gbi4mgxwk886hgsxhq7bfx8is7hjjg80sfn40z6kdwcp";
           name = "es-mode";
         };
-        packageRequires = [ dash ];
+        packageRequires = [ cl-lib dash ];
         meta = {
           homepage = "http://melpa.org/#/es-mode";
           license = lib.licenses.free;
@@ -7188,7 +7315,7 @@
           sha256 = "0cjchwrhk7bw87bg10zgcwkga50rvs0jn5v2jf6bbsxbcqx2nfc9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/es-windows";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/es-windows";
           sha256 = "112ngkan0hv3y7m71479f46x5gwdmf0vhbqrzs5kcjwlacqlrahx";
           name = "es-windows";
         };
@@ -7209,7 +7336,7 @@
           sha256 = "0nkmwwx224r50y2xnrz3v26l3ngqshvy5hs861gy4zagwllqfmvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eshell-autojump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eshell-autojump";
           sha256 = "09l2680hknmdbwr4cncv1v4b0adik0c3sm5i9m3qbwyyxm8m41i5";
           name = "eshell-autojump";
         };
@@ -7230,7 +7357,7 @@
           sha256 = "179xqh0rs8w3d03gygg9sy4qp5xqgfgl4c0ycrknip9zrnbmph4i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eshell-z";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eshell-z";
           sha256 = "14ixazj0nscyqsdv7brqnfr0q8llir1pwb91yhl9jdqypmadpm6d";
           name = "eshell-z";
         };
@@ -7251,7 +7378,7 @@
           sha256 = "16r4j27j9yfdiy841w9q5ykkc6n3wrm7hvfacagb32mydk821ijg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/espuds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/espuds";
           sha256 = "16yzw9l64ahf5v92jzb7vyb4zqxxplq6qh0y9rkfmvm59s4nhk6c";
           name = "espuds";
         };
@@ -7272,7 +7399,7 @@
           sha256 = "0lvr14xlxsdad4ihywkpbwwj9lyal0w4p616ska5rk7gg5i8v74p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ess";
           sha256 = "02kz4fjxr0vrj5mg13cq758nzykizq4dmsijraxv46snvh337v5i";
           name = "ess";
         };
@@ -7293,7 +7420,7 @@
           sha256 = "1ya2ay52gkrd31pmw45ban8kkxgnzhhwkzkypwdhjfccq3ys835x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess-R-data-view";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ess-R-data-view";
           sha256 = "0r2fzwayf3yb7fqk6f31x4xfqiiczwik8qw4rrvkqx2h3s1kz7i0";
           name = "ess-R-data-view";
         };
@@ -7314,7 +7441,7 @@
           sha256 = "0q8pbaa6wahli6fh0kng5zmnypsxi1fr2bzs2mfk3h8vf4nikpv0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess-R-object-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ess-R-object-popup";
           sha256 = "1dxwgahfki6d6ywh85ifk3kq6f2a1114kkd8xcv4lcpzqykp93zj";
           name = "ess-R-object-popup";
         };
@@ -7335,7 +7462,7 @@
           sha256 = "1avb6dng4xgw3bp7bw0j60wl6s4y26alfys9vwwj29rlzvjrlh74";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ess-smart-underscore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ess-smart-underscore";
           sha256 = "01pki1xa8zpgvldcbjwg6vmslj7ddf44hsx976xipc95vrdk15r2";
           name = "ess-smart-underscore";
         };
@@ -7356,7 +7483,7 @@
           sha256 = "1pzbd2ka6h5ipiivfwfgq1hq80ww59xvyldmx406mdd5vn7yqk5z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/esup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/esup";
           sha256 = "0cv3zc2zzm38ki3kxq58g9sp4gsk3dffa398wky6z83a3zc02zs0";
           name = "esup";
         };
@@ -7377,7 +7504,7 @@
           sha256 = "0k4vqlbk3h2snfiriraxhnjpdxgs49vcaazl191p9s2f799msd8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/esxml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/esxml";
           sha256 = "0nn074abkxz7p4w59l1za586p5ya392xhl3sx92yys8a3194n6hz";
           name = "esxml";
         };
@@ -7398,7 +7525,7 @@
           sha256 = "1a33yy455yx2188vxnhylgzg4zc0hhrw52dmpc4svxs7h1229pwg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eval-in-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eval-in-repl";
           sha256 = "10h5vy9wdiqf9dgk1d1bsvp93y8sfcxghzg8zbhhn7m5cqg2wh63";
           name = "eval-in-repl";
         };
@@ -7419,7 +7546,7 @@
           sha256 = "0lwpl9akdxml9f51pgsv0g7k7mr8dvqm94l01i7vq8jl6vd6v6i5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eval-sexp-fu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eval-sexp-fu";
           sha256 = "17cazf81z4cszflnfp66zyq2cclw5sp9539pxskdf267cf7r0ycs";
           name = "eval-sexp-fu";
         };
@@ -7440,7 +7567,7 @@
           sha256 = "1a3y69s7lb24zdivxcpsjh9l6adxyjqxbpgradnj0q1n6kdyq679";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evalator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evalator";
           sha256 = "0k6alxwg89gc4v5m2bxmzmj7l6kywhbh4036xgz19q28xnlbr9xk";
           name = "evalator";
         };
@@ -7456,11 +7583,11 @@
         version = "1.2.10";
         src = fetchhg {
           url = "https://bitbucket.com/lyro/evil";
-          rev = "5c0114702ea3";
-          sha256 = "1sysqcvzdnzg5qvawv3c0rwfyacjb80mvfdhdmc07vr4pyma6vcj";
+          rev = "70005dd4c11e";
+          sha256 = "0hdysszfc3796d19nyw1f4cqzisspih1if0hh9hp2xjgxh3vj0mw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil";
           sha256 = "09qrhy7l229w0qk3ba1i2xg4vqz8525v8scrbm031lqp30jp54hc";
           name = "evil";
         };
@@ -7481,7 +7608,7 @@
           sha256 = "0lw7fg4gqwj30r0l6k2ni36sxqkf65zf0d0z3rxnpwbxlf8dlkrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-anzu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-anzu";
           sha256 = "19cmc61l370mm4h2m6jw5pdcsvj4wcv9zpa8z7k1fjg57mwmmn70";
           name = "evil-anzu";
         };
@@ -7502,7 +7629,7 @@
           sha256 = "1nh7wa4ynr7ln42x32znzqsmh7ijzy5ymd7rszf49l8677alvazq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-args";
           sha256 = "1bwdvf1i3jc77bw2as1wr1djm8z3a7wms60694xkyqh0m909hs2w";
           name = "evil-args";
         };
@@ -7515,15 +7642,15 @@
     evil-commentary = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-commentary";
-        version = "1.2.1";
+        version = "2.0.0";
         src = fetchFromGitHub {
           owner = "linktohack";
           repo = "evil-commentary";
-          rev = "122880a6721fcf16479f406c78c6e490a25efab0";
-          sha256 = "1qiym8f56a18j5swrxx5is48nz7z76531k8cw2c7czr6611l8l5a";
+          rev = "6d9079894da0bdda8a317c03c90481b8754635c7";
+          sha256 = "183fdg7rmnnbps0knnj2kmhf1hxk0q91wbqx1flhciq6wq4rilni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-commentary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-commentary";
           sha256 = "151iiimmkpn58pl9zn40qssfahbrqy83axyl9dcd6kx2ywv5gcxz";
           name = "evil-commentary";
         };
@@ -7544,7 +7671,7 @@
           sha256 = "0cj17gk7cxia2p9xzqnlnmqqbw2afd3x61gfw9fpf65j9wik5hbz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-escape";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-escape";
           sha256 = "0rlwnnshcvsb5kn7db5qy39s89qmqlllvg2z8cnxyri8bsssks4k";
           name = "evil-escape";
         };
@@ -7565,7 +7692,7 @@
           sha256 = "0r2367lbzcdhglvjjcamrzn5fmqy0jalcws8r0yc2al1vbsrn0fr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-iedit-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-iedit-state";
           sha256 = "1dihyh7vqcp7kvfic613k7v33czr93hz04d635awrsyzgy8savhl";
           name = "evil-iedit-state";
         };
@@ -7586,7 +7713,7 @@
           sha256 = "1yrd9zvp23xwmxvw9hrhfwhwfczh4lxxk65mcvy69q6wwd03z5vn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-jumper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-jumper";
           sha256 = "0zwsk7slzvcgvgh8fjrwangylishrwc1w0glxcr71sybxph2g46x";
           name = "evil-jumper";
         };
@@ -7607,7 +7734,7 @@
           sha256 = "1k2zinchs0jjllp8zkpggckyy63dkyi5yig3p46vh4w45jdzysk5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-leader";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-leader";
           sha256 = "154s2nb170hzksmc87wnzlwg3ic3w3ravgsfvwkyfi2q285vmra6";
           name = "evil-leader";
         };
@@ -7628,7 +7755,7 @@
           sha256 = "12l3gnhirq8jz0dqyj9m02l1fg5rh78fdyskslprxp5vfa4ngzkh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-lisp-state";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-lisp-state";
           sha256 = "117irac05fs73n7sgja3zd7yh4nz9h0gw5b1b57lfkav6y3ndgcy";
           name = "evil-lisp-state";
         };
@@ -7649,7 +7776,7 @@
           sha256 = "01hccc49xxb6lnzr0lwkkwndbk4sv0jyyz3khbcxsgkpzjiydihv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-mark-replace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-mark-replace";
           sha256 = "03cq43vlv1b53w4kw7mjvk026i8rzhhryfb27ddn6ipgc6xh68a0";
           name = "evil-mark-replace";
         };
@@ -7670,7 +7797,7 @@
           sha256 = "0kf4m1ghpxfalqx2zwm1d8xav4d6l6bpk79g5cvssk5jz5913fbi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-matchit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-matchit";
           sha256 = "01z69n20qs4gngd28ry4kn825cax5km9hn96i87yrvq7nfa64swq";
           name = "evil-matchit";
         };
@@ -7691,7 +7818,7 @@
           sha256 = "16wn74690572n3xpxvnvka524fzswxxni3dy98bwpvsqj6yx2ds5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-nerd-commenter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-nerd-commenter";
           sha256 = "1pa5gh065hqn5mhs47qvjllwdwwafl0clk555mb6w7svq58r6i8d";
           name = "evil-nerd-commenter";
         };
@@ -7712,7 +7839,7 @@
           sha256 = "13jg2xbh4p02x1nj77b6csb93hh56c1nv8kslcq2hjj3caipk4m8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-numbers";
           sha256 = "1lpmkklwjdf7ayhv99g9zh3l9hzrwm0hr0ijvbc7yz3n398zn1b2";
           name = "evil-numbers";
         };
@@ -7733,7 +7860,7 @@
           sha256 = "09l0ph9rc941kr718zq0dw27fq6l7rb0h2003ihw7q0a5yr8fpk7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-org";
           sha256 = "18w07fbafry3wb87f55kd8y0yra3s18a52f3m5kkdlcz5zwagi1c";
           name = "evil-org";
         };
@@ -7754,7 +7881,7 @@
           sha256 = "1ja9ggj70wf0nmma4xnc1zdzg2crq9h1cv3cj7cgwjmllflgkfq7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-quickscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-quickscope";
           sha256 = "0xym1mh4p68i00l1lshywf5fdg1vw3szxp3fk9fwfcg04z6vd489";
           name = "evil-quickscope";
         };
@@ -7767,15 +7894,15 @@
     evil-rsi = callPackage ({ evil, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "evil-rsi";
-        version = "1.1.1";
+        version = "2.0.0";
         src = fetchFromGitHub {
           owner = "linktohack";
           repo = "evil-rsi";
-          rev = "4e0cb07d0e1c2a5e463ea1ea146f019c47a29e61";
-          sha256 = "1ygrpffa847144i74z2yy5r5vcvd334gad5mg18ffydacddcyqmq";
+          rev = "236bf6ed1e2285698db808463e5f2f69f5f5e7c0";
+          sha256 = "1xz629qv1ss1fap397k48piawcwl8lrybraq5449bw1vvn1a4d9f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-rsi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-rsi";
           sha256 = "0mc39n72420n36kwyf9zpw1pgyih0aigfnmkbywb0yxgj7myc345";
           name = "evil-rsi";
         };
@@ -7796,7 +7923,7 @@
           sha256 = "1jfi2k9dm0cc9bx8klppm965ydhdw17a2n664199vhxrap6g27yk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-search-highlight-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-search-highlight-persist";
           sha256 = "0iia136js364iygi1mydyzwvizhic6w5z9pbwmhva4654pq8dzqy";
           name = "evil-search-highlight-persist";
         };
@@ -7817,7 +7944,7 @@
           sha256 = "0j2m3rsszivyjhv8bjid5fdqaf1vwp8rf55b27y4vc2489wrw415";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-smartparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-smartparens";
           sha256 = "1viwrd6gfqmwhlil80pk68dikn3cjf9ddsy0z781z3qfx0j35qza";
           name = "evil-smartparens";
         };
@@ -7838,7 +7965,7 @@
           sha256 = "143lgpvbjrddbgnyh9dfdhjj0gp69slv4fkiq53czz85ffwli5ig";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-snipe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-snipe";
           sha256 = "0gcmpjw3iw7rjk86b2k6clfigp48vakfjd1a9n8qramhnc85rgkn";
           name = "evil-snipe";
         };
@@ -7859,7 +7986,7 @@
           sha256 = "1rchanv0vq9rx6x69608dlpdybvkn8a9ymx8wzm7gqpz9qh6xqrk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-space";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-space";
           sha256 = "1asvh873r1xgffvz3nr653yn8h5ifaphnafp6wf1b1mja6as7f23";
           name = "evil-space";
         };
@@ -7880,7 +8007,7 @@
           sha256 = "0vsf7yzlb2j7c5c7cnk81y1979psy6a9v7klg6c2j9lkcn3cqpvj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-textobj-anyblock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-textobj-anyblock";
           sha256 = "03vk30s2wkcszcjxmh5ww39rihnag9cp678wdzq4bnqy0c6rnjwa";
           name = "evil-textobj-anyblock";
         };
@@ -7901,7 +8028,7 @@
           sha256 = "1rskvkmz30xyy8xfjf2i35f3dxh663gb3plfy3f0j6z17i086jl2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-tutor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-tutor";
           sha256 = "1hvc2w5ykrgh62n4sxqqqcdk5sd7nmh6xzv4mir5vf9y2dgqcvsn";
           name = "evil-tutor";
         };
@@ -7922,7 +8049,7 @@
           sha256 = "07cmql8zsqz1qchq2mp3qybbay499dk1yglisig6jfddcmrbbggz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-visual-mark-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-visual-mark-mode";
           sha256 = "1qgr2dfhfz6imnlznicl7lplajd1s8wny7mlxs1bkms3xjcjfi48";
           name = "evil-visual-mark-mode";
         };
@@ -7943,7 +8070,7 @@
           sha256 = "11y2jrwbsw4fcx77zkhj1cn2hl1zcdqy00bv3mpbcrs03jywssrk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evil-visualstar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evil-visualstar";
           sha256 = "135l9hjfbpn0a6p53picnpydi9qs5vrk2rfn64gxa5ag2apcyycy";
           name = "evil-visualstar";
         };
@@ -7964,7 +8091,7 @@
           sha256 = "0739v0m9vj70a55z0canslyqgafzys815i7a0r6bxj2f9iwq6rhb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/evm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/evm";
           sha256 = "19l6cs5schbnph0pwhhj66gkxsswd4bmjpy79l9kxzpjf107wc03";
           name = "evm";
         };
@@ -7985,7 +8112,7 @@
           sha256 = "0gs6bi3s2sszc6v2b26929azmn5513kvyin99n4d0ark1jdbjmv2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eww-lnum";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eww-lnum";
           sha256 = "1y745z4wa90snizq2g0amdwwgjafd6hkrayn93ca50f1wghdbk79";
           name = "eww-lnum";
         };
@@ -8006,7 +8133,7 @@
           sha256 = "0nhc3m88i6rl2y426ksmjbbaqwfrjnwbzqq1bvd6r0bkcwgfwfml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/exec-path-from-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/exec-path-from-shell";
           sha256 = "1j6f52qs1m43878ikl6nplgb72pdbxfznkfn66wyzcfiz2hrvvm9";
           name = "exec-path-from-shell";
         };
@@ -8027,7 +8154,7 @@
           sha256 = "0rvkhjfkhamr3ys9iarblfwvwq7n4wishdjgnwj1lx7m80h1hzbg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/expand-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/expand-region";
           sha256 = "1c7f1nqsqdc75h22fxxnyg0m4yxj6l23sirk3c71fqj14paxqnwg";
           name = "expand-region";
         };
@@ -8048,7 +8175,7 @@
           sha256 = "106yh793scbyharsk1dvrirkj3c6666w8jqilpkaz78vwyw3zs5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/express";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/express";
           sha256 = "0lhisy4ds96bwpc7k8w9ws1zi1qh0d36nhxsp36bqzfi09ig0nb9";
           name = "express";
         };
@@ -8069,7 +8196,7 @@
           sha256 = "1k2j8szavyq2wy5c0skvs03a88cr9njy7y63b7knh2m92nw4830d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/extend-dnd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/extend-dnd";
           sha256 = "0rknpvp8yw051pg3blvmjpp3c9a82jw7f10mq67ggbz98w227417";
           name = "extend-dnd";
         };
@@ -8090,7 +8217,7 @@
           sha256 = "0jc5wv2hkc89yh5ypa324xlfqdna20msr63g30njxq4g2vd0iqa7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/eyebrowse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/eyebrowse";
           sha256 = "09fkzm8z8nkr4s9fbmfcjc80h50051f48v6n14l76xicglr5p861";
           name = "eyebrowse";
         };
@@ -8111,7 +8238,7 @@
           sha256 = "0lzqfr5xgc3qvpbs6vf63yiw7pc2mybfvsrhczf9ghlmlawqa6k1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/f";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/f";
           sha256 = "0s7fqav0dc9g4y5kqjjyqjs90gi34cahaxyx2s0kf9fwcgn23ja2";
           name = "f";
         };
@@ -8132,7 +8259,7 @@
           sha256 = "0crhkdbxz1ldbrvppi95g005ni5zg99z1271rkrnk5i6cvc4hlq5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fabric";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fabric";
           sha256 = "1mkblsakdhvi10b67bv3j0jsf7hr8lf9sibmprvx8smqsih7l88m";
           name = "fabric";
         };
@@ -8153,7 +8280,7 @@
           sha256 = "01l8dlfpyy97b17djbza46rq11xlbkhd5kn2r26r2xac8klj4pka";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/factlog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/factlog";
           sha256 = "163482vfpa52b5ya5xps4qnclbaql1x0q54gqdwwmm04as8qbfz7";
           name = "factlog";
         };
@@ -8174,7 +8301,7 @@
           sha256 = "05lwcwf412m717yhwpjrswqkm8c3i7391rmiwv2k8xc1vk6dpp4g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fancy-battery";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fancy-battery";
           sha256 = "03rkfdkrzyal9abdiv8c73w10sm974hxf3xg5015hibfi6kzg8ii";
           name = "fancy-battery";
         };
@@ -8195,7 +8322,7 @@
           sha256 = "10ds6nlzm1s5xsp53a52qlzrnph7in6gib67qhgnwpj33wp8gs91";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fancy-narrow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fancy-narrow";
           sha256 = "15i86jz6rdpva1az7gqp1wbm8kispcfc8h6v9fqsbag9sbzvgcyv";
           name = "fancy-narrow";
         };
@@ -8216,7 +8343,7 @@
           sha256 = "0h32w63vv451797zi6206j529fd4j8l3fp7rqip3s8xn8d4728x1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fastnav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fastnav";
           sha256 = "08hg256w8k9f5nzgpyl1jykbf28vmvv09kkhzs0s2zhwbl2158a5";
           name = "fastnav";
         };
@@ -8237,7 +8364,7 @@
           sha256 = "03w68zbgprly45i6ps7iviwvjf3acbc7f7acvjpzj2plf0g5i19z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fcitx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fcitx";
           sha256 = "0a8wd588c26p3czfp5hn2n46f2vwyg5v301sv0y07b55b1i3ynmx";
           name = "fcitx";
         };
@@ -8258,7 +8385,7 @@
           sha256 = "1cxjygg05v8s96c8z6plk3hl34jaiwg7s7dl7dsk20rj5f54kgw7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/feature-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/feature-mode";
           sha256 = "0ryinmpqb3c91qcna6gbijcmqv3skxdc947dlr5s1w623z9nxgqg";
           name = "feature-mode";
         };
@@ -8279,7 +8406,7 @@
           sha256 = "0fghhy5xqsdwal4fwlr6hxr5kpnfw71q79mxpp9db59ldnj9f5y9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fill-column-indicator";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fill-column-indicator";
           sha256 = "0w8cmijv7ihij9yyncz6lixb6awzzl7n9qpjj2bks1d5rx46blma";
           name = "fill-column-indicator";
         };
@@ -8300,7 +8427,7 @@
           sha256 = "1r9y9zschavi28c5ysrlh56vxszjfyhh5r36fhn74i0b5iiy15rx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/finalize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/finalize";
           sha256 = "1n0w4kdzc4hv4pprv13lr88gh46slpxdvsc162nqm5mrqp9giqqq";
           name = "finalize";
         };
@@ -8321,7 +8448,7 @@
           sha256 = "1xjb66pydm3yf0jxnm2mri98pxq3b26xvwjkaj1488qgj27i05jr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-by-pinyin-dired";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/find-by-pinyin-dired";
           sha256 = "150hvih3mdd1dqffgdcv3nn4qhy86s4lhjkfq0cfzgngfwif8qqq";
           name = "find-by-pinyin-dired";
         };
@@ -8342,7 +8469,7 @@
           sha256 = "0bf32nhpmjvvgnr6g9xqh8pqnhr3dl24y3g40lsv4pc8ffs70ydm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-file-in-project";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/find-file-in-project";
           sha256 = "0aznnv82xhnilc9j4cdmcgh6ksv7bhjjm3pa76hynnyrfn7kq7wy";
           name = "find-file-in-project";
         };
@@ -8363,7 +8490,7 @@
           sha256 = "0wbmmrd7brf4498pdyilz17rzv7221cj8sd4h11gac2r72f1q2md";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/find-file-in-repository";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/find-file-in-repository";
           sha256 = "0q1ym06w2yn3nzpj018dj6h68f7rmkxczyl061mirjp8z9c6a9q6";
           name = "find-file-in-repository";
         };
@@ -8384,7 +8511,7 @@
           sha256 = "0lwgbd9zwdv7qs39c3fp4hrc17d9wrwwjgba7a14zwrhb27m7j07";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fiplr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fiplr";
           sha256 = "0l68rl5cy2maynny6iq6c4qr6c99y44i0i1z613k9rk08z7h0k5i";
           name = "fiplr";
         };
@@ -8405,7 +8532,7 @@
           sha256 = "1rz56n2gmw11w2yxlhn0i8xmig9m8lxihgaikg65xmy9nqa5j7bj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/firefox-controller";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/firefox-controller";
           sha256 = "03y96b3l75w9al8ylijnlb8pcfkwddyfnh8xwig1b6k08zxfgal6";
           name = "firefox-controller";
         };
@@ -8426,7 +8553,7 @@
           sha256 = "174x0qyrwswppc9p1q1nn4424r3zg7g49zk329k5aq18vyjz52d7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fireplace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fireplace";
           sha256 = "1apcypznq23fc7xgy4xy1c5hvfvjx1xhyq3aaq1lf59v99zchciw";
           name = "fireplace";
         };
@@ -8447,7 +8574,7 @@
           sha256 = "0s8rml5xbskvnjpi8qp7vqflxhh5yis6zr6ay2bxmd2chjlhli55";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/firestarter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/firestarter";
           sha256 = "1cpx664hyrdnpb1jps1x6lm7idwlfjblkfygj48cjz9pzd6ld5mp";
           name = "firestarter";
         };
@@ -8468,7 +8595,7 @@
           sha256 = "17djaz79spms9il71m4xdfjhm58dzswb6fpncngkgx8kxvcy9y24";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fish-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fish-mode";
           sha256 = "0l6k06bs0qdhj3h8vf5fv8c3rbhiqfwszrpb0v2cgnb6xhwzmq14";
           name = "fish-mode";
         };
@@ -8489,7 +8616,7 @@
           sha256 = "16rd23ygh76fs4i7rni94k8gwa9n360h40qmhm65snp31kqnpr1p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fix-input";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fix-input";
           sha256 = "03xpr7rlv0xq1d9126j1fk0c2j7ssf366n0yc8yzm9vq32n9pp4p";
           name = "fix-input";
         };
@@ -8510,7 +8637,7 @@
           sha256 = "1hj5jp4vbkcmnc8l2hqsvjc76f7c9zcsq8znwcwv2nv9xj9hlbkr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fix-word";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fix-word";
           sha256 = "0a8w09cx8p5pkkd4533nd199axkhdhs2a7blp7syfn40bkscx6xc";
           name = "fix-word";
         };
@@ -8531,7 +8658,7 @@
           sha256 = "1hnxdmzqmnp3dr7mpr58pjmigykb3cxwphxzia013kfi37ipf5a0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fixmee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fixmee";
           sha256 = "0wnp6h8f547fsi1lkk4ajny7g21dnr76qfhxl82n0l5h1ps4w8mp";
           name = "fixmee";
         };
@@ -8559,7 +8686,7 @@
           sha256 = "12b1b7avjdbfm184mcg3bh3s6k0ygfz1sraz8q7qnrsyw4170893";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/floobits";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/floobits";
           sha256 = "1jpk0q4mkf9ag1rqyai993nz5ngzfvxq9n9avmaaq59gkk9cjraf";
           name = "floobits";
         };
@@ -8580,7 +8707,7 @@
           sha256 = "0sjybrcnb2sl33swy3q664vqrparajcl0m455gciiih2j87hwadc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flx";
           sha256 = "04plfhrnw7jx2jaxhbhw4ypydfcb8v0x2m5hyacvrli1mca2iyf9";
           name = "flx";
         };
@@ -8601,7 +8728,7 @@
           sha256 = "0sjybrcnb2sl33swy3q664vqrparajcl0m455gciiih2j87hwadc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flx-ido";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flx-ido";
           sha256 = "00wcwbvfjbcx8kyap7rl1b6nsgqdwjzlpv6al2cdpdd19rm1vgdc";
           name = "flx-ido";
         };
@@ -8622,7 +8749,7 @@
           sha256 = "19mnx2zm71qrf7qf3mk5kriv5vgq0nl67lj029n63wqd8jcjb5fi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck";
           sha256 = "045k214dq8bmrai13da6gwdz97a2i998gggxqswqs4g52l1h6hvr";
           name = "flycheck";
         };
@@ -8643,7 +8770,7 @@
           sha256 = "1c3igqfd42dm42kfjm2q2xgr673vws10n9jn2jjlsk4g33brc7h4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-cask";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-cask";
           sha256 = "1lq559nyhkpnagncj68h84i3cq85vhdikr534kj018n2zcilsyw7";
           name = "flycheck-cask";
         };
@@ -8664,7 +8791,7 @@
           sha256 = "18nhfj0vx8rg2236nb9475s27rhyb34m81i7l6zkhifqba6rb0bb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-checkbashisms";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-checkbashisms";
           sha256 = "1rq0ymlr1dl39v0sfyjmdv4pq3q9116cz9wvgpvfgalq8759q5sz";
           name = "flycheck-checkbashisms";
         };
@@ -8685,7 +8812,7 @@
           sha256 = "1i824iyjsg4d786kx5chsb64wlqd8vn2vsrhq6rmdx2x3gzdfcsx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-clojure";
           sha256 = "1b20gcs6fvq9pm4nl2qwsf34sg6wxngdql921q2pyh5n1xsxhm28";
           name = "flycheck-clojure";
         };
@@ -8706,7 +8833,7 @@
           sha256 = "11xc08xld758xx9myqjsiqz8vk3gh4d9c4yswswvky6mrx34c0y5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-color-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-color-mode-line";
           sha256 = "0hw19nsh5h2l8qbp7brqmml2fhs8a0x850vlvq3qfd7z248gvhrq";
           name = "flycheck-color-mode-line";
         };
@@ -8727,7 +8854,7 @@
           sha256 = "1ap5hgvaccmf2xkfvyp7rqcfjwmiy6mhr6ccgahxm2z0vm51kpyh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-dmd-dub";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-dmd-dub";
           sha256 = "0pg3sf7h6xqv65yqclhlb7fx1mp2w0m3qk4vji6m438kxy6fhzqm";
           name = "flycheck-dmd-dub";
         };
@@ -8748,7 +8875,7 @@
           sha256 = "0j2mvf3zjznwkm8dykcgs1v5sz0i882mrivghxqr3h6n3ni4wag4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-gometalinter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-gometalinter";
           sha256 = "1bnvj5kwgbh0dv989rsjcvmcij1ahwcz0vpr6a8f2p6wwvksw1h2";
           name = "flycheck-gometalinter";
         };
@@ -8769,7 +8896,7 @@
           sha256 = "0143lcn6g46g7skm4r6lqq09s8mr3268rikbzlh65qg80rpg9frj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-haskell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-haskell";
           sha256 = "12lgirz3j6n5ns2ikq4n41z0d33qp1lb5lfz1q11qvpbpn9d0jn7";
           name = "flycheck-haskell";
         };
@@ -8790,7 +8917,7 @@
           sha256 = "136mdg21a8sqxhijsjsvpli7r7sb40nmf80p6gmgb1ghwmhlm8k3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-hdevtools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-hdevtools";
           sha256 = "0ahvai1q4x59ryiyccvqvjisgqbaiahx4gk8ssaxhblhj0sqga93";
           name = "flycheck-hdevtools";
         };
@@ -8811,7 +8938,7 @@
           sha256 = "1pdssw5k88ym5fczllfjv26sp4brlyrywnlzq5baha5pq91h9cb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-ledger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-ledger";
           sha256 = "0807pd2km4r60wgd6jakscbx63ab22d9kvf1cml0ad8wynsap7jl";
           name = "flycheck-ledger";
         };
@@ -8832,7 +8959,7 @@
           sha256 = "1phfarws2aajkgcl96hqa4ydmb1yncg10q2ldzf8ff6yd6mvk51l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-ocaml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-ocaml";
           sha256 = "1cv2bb66aql2kj1y1gsl4xji8yrzrq6rd8hxxs5vpfsk47052lf7";
           name = "flycheck-ocaml";
         };
@@ -8853,7 +8980,7 @@
           sha256 = "0aa8cnh9f0f2zr2kkba2kf9djzjnsd51fzj8l578pbj016zdarwd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-package";
           sha256 = "0068kpia17rsgjdmzsjnw0n6x5z9jvfxggxlzkszvwsx73mvcs2d";
           name = "flycheck-package";
         };
@@ -8874,7 +9001,7 @@
           sha256 = "0v23yc8znzjp44lrpfzqb4hc3psad14hsnvqcp8f1yyhgvdx35n8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-pos-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-pos-tip";
           sha256 = "09i2jmwj8b915fhyczwdb1j7c551ggbva33avis77ga1s9v3nsf9";
           name = "flycheck-pos-tip";
         };
@@ -8887,15 +9014,15 @@
     flycheck-status-emoji = callPackage ({ emacs, fetchFromGitHub, fetchurl, flycheck, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "flycheck-status-emoji";
-        version = "1.1";
+        version = "1.2.1";
         src = fetchFromGitHub {
           owner = "liblit";
           repo = "flycheck-status-emoji";
-          rev = "37ed04b76b7338afd2237d3a11487bef3970ff0f";
-          sha256 = "0yi2xmk0bxzqmjf9sy3r3gacqw7z1jrf6hwn05zaqqgn7y78z37i";
+          rev = "1c67e62562a5c30b3a184ef5090bbe50bab4d681";
+          sha256 = "1xxvri9ax5cjrkxhjqhs7zqbch9cx8kvrn7sg611frl68qawkjsm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-status-emoji";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-status-emoji";
           sha256 = "0p42424b1fsmfcjyl252vhblppmpjwd6br2yqh10fi60wmprvn2p";
           name = "flycheck-status-emoji";
         };
@@ -8916,7 +9043,7 @@
           sha256 = "0azjr5mfb3hnb66m1b2319i035mn5i9qz24y7fj5crhnc9vp8w3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-tip";
           sha256 = "0zab1zknrnsw5xh5pwzzcpz7p40bbywkf9zx99sgsd6b5j1jz656";
           name = "flycheck-tip";
         };
@@ -8937,7 +9064,7 @@
           sha256 = "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flycheck-ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flycheck-ycmd";
           sha256 = "0m99ssynrqxgzf32d35n17iqyh1lyc6948inxpnwgcb98rfamchv";
           name = "flycheck-ycmd";
         };
@@ -8958,7 +9085,7 @@
           sha256 = "1svj5n7mmzhq03azlv4n33rz0nyqb00qr8ihdbc8hh2xnp63j5rc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-coffee";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-coffee";
           sha256 = "1aig1d4fgjdg31vrg8k43z5hbqiydgfvxi45p1695s3kbdm8pr2d";
           name = "flymake-coffee";
         };
@@ -8979,7 +9106,7 @@
           sha256 = "054ws88fcfz3hf3cha7dvndm52v5n4jc4vzif1lif44xq0iggwqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-css";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-css";
           sha256 = "0kqm3wn9symqc9ivnh11gqgq8ql2bhpqvxfm86d8vwm082hd92c5";
           name = "flymake-css";
         };
@@ -9000,7 +9127,7 @@
           sha256 = "1j35k52na02b59yglfb48w6m5qzydvzqfsylb8ax5ks0f287yf0c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-easy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-easy";
           sha256 = "19p6s9fllgvs35v167xf624k5dn16l9fnvaqcj9ks162gl9vymn7";
           name = "flymake-easy";
         };
@@ -9021,7 +9148,7 @@
           sha256 = "002s01cymgx4z4l3j2pqirg7899pljdx2hmbz8k6cksdxlymzmkd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-gjshint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-gjshint";
           sha256 = "19jcd5z4883z3fzlrdn4fzmsvn16f4hfnhgw4vbs5b0ma6a8ka44";
           name = "flymake-gjshint";
         };
@@ -9042,7 +9169,7 @@
           sha256 = "1b3lf5jwan03k7rb97g4bb982dacdwsfdddnwc0inx9gs3qq1zni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-haml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-haml";
           sha256 = "0dmdhh12h4xrx6mc0qrwavngk2sx0l4pfqkjjyavabsgcs9wlgp1";
           name = "flymake-haml";
         };
@@ -9063,7 +9190,7 @@
           sha256 = "0k1qc0r0gr7f9l5if2a67cv4k73z5yxd6vxd6l1bqw500y0aajxz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-haskell-multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-haskell-multi";
           sha256 = "0cyzmmghwkkv6020s6n436lwymi6dr49i7gkci5n0hw5pdywcaij";
           name = "flymake-haskell-multi";
         };
@@ -9084,7 +9211,7 @@
           sha256 = "1ygg51r4ym4x7h4svizwllsvr72x9np6jvjqpk8ayv3w2fpb9l31";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-hlint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-hlint";
           sha256 = "0wq1ijhn3ypy31yk8jywl5hnz0r0vlhcxjyznzccwqbdc5vf7b2x";
           name = "flymake-hlint";
         };
@@ -9105,7 +9232,7 @@
           sha256 = "00zkm3wqlss386qd6jiq0siga7c48n5ykh0vf9q5v83rmpd79yri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-jslint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-jslint";
           sha256 = "1cq8fni4p0qhigx0qh34ypmcsbnilra1ixgnrn9mgg8x3cvcm4cm";
           name = "flymake-jslint";
         };
@@ -9126,7 +9253,7 @@
           sha256 = "0rzlw80mi39147yqnpzcvw9wvr5svksd3kn6s3w8191f2kc6xzzv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-json";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-json";
           sha256 = "1p5kajiycpqy2id664bs0fb1mbf73a43qqfdi4c57n6j9x7fxp4d";
           name = "flymake-json";
         };
@@ -9147,7 +9274,7 @@
           sha256 = "0ggvmsjj6p6a7cwr2bzhlcf8ab4v6a2bz5djsscd2ryy570p367z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-less";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-less";
           sha256 = "05k5daphxy94164c73ia7f4l1gv2cmlw8xzs8xnddg7ly22gjhi0";
           name = "flymake-less";
         };
@@ -9168,7 +9295,7 @@
           sha256 = "11r982h5fhjkmm9ld8wfdip0ghinw523nm1w4fmy830g0bbkgkrq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-perlcritic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-perlcritic";
           sha256 = "0hibnh463wzhvpix7gygpgs04gi6salwjrsjc6d43lxlsn3y1im8";
           name = "flymake-perlcritic";
         };
@@ -9189,7 +9316,7 @@
           sha256 = "0dzyid0av9icp77wv0zcsygpw46z24qibq1ra0iwnkzl3kqvkyzh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-php";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-php";
           sha256 = "12ds2l5kvs7fz38syp4amasbjkpqd36rlpajnb3xxll0hbk6vffk";
           name = "flymake-php";
         };
@@ -9210,7 +9337,7 @@
           sha256 = "0l8qpcbzfi32h3vy7iwydx3hg2w60x9l3v3rabzjx412m5d00gsh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-python-pyflakes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-python-pyflakes";
           sha256 = "0asbjxv03zkbcjayanv13qzbv4z7b6fi0z1j6yv7fl6q9mgvm497";
           name = "flymake-python-pyflakes";
         };
@@ -9231,7 +9358,7 @@
           sha256 = "0d2vmpgr5c2cbpxcqm5x1ckfysbpwcbaa9frcnp2yfp8scvkvqj0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-ruby";
           sha256 = "1shr6d03vx85nmyxnysglzlc1pz0zy3n28nrcmxqgdm02g197bzr";
           name = "flymake-ruby";
         };
@@ -9252,7 +9379,7 @@
           sha256 = "0c74qdgy9c4hv3nyjnbqdzypbg9399vq3p5ngp5lasc7iz6vi0h8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-sass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-sass";
           sha256 = "0sz6n5r9pdphgvvaljg9zdwj3dqayaxzxmb4s8x4b05c8yx3ba0d";
           name = "flymake-sass";
         };
@@ -9273,7 +9400,7 @@
           sha256 = "0c2lz1p91yhprmlbmp0756d96yiy0w92zf0c9vlp0i9abvd0cvkc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flymake-shell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flymake-shell";
           sha256 = "13ff4r0k29yqgx8ybxz7hh50cjsadcjb7pd0075s9xcrzia5x63i";
           name = "flymake-shell";
         };
@@ -9294,7 +9421,7 @@
           sha256 = "1g09s57b773nm9xqslzbin5i2h18k55nx00s5nnkvx1qg0n0mzkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flyspell-lazy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flyspell-lazy";
           sha256 = "0lzazrhsfh5m7n57dzx0v46d5mg87wpwwkjzf5j9gpv1mc1xfg1y";
           name = "flyspell-lazy";
         };
@@ -9315,7 +9442,7 @@
           sha256 = "1rk7fsill0salrhb4anbf698nd21nxj8pni35brbmv64nj9fhfic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/flyspell-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/flyspell-popup";
           sha256 = "0wp15ra1ry6xpwal6mb53ixh3f0s4nps0rdyfli7hhaiwbr9bhql";
           name = "flyspell-popup";
         };
@@ -9336,7 +9463,7 @@
           sha256 = "0r2j238iyxnww60xpbxggjmz6y2waayw4m51f0l39hszbhags2cv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fm";
           sha256 = "118d8fbhlv6i2rsyfqdhi841p96j7q4fab5qdg95ip40wq02dg4f";
           name = "fm";
         };
@@ -9357,7 +9484,7 @@
           sha256 = "0aj5qxzlfxxp7z27fiw9bvir5yi2zj0xzj5kbh17ix4wnhi03bhc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/focus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/focus";
           sha256 = "0jw26j8npyl3dgsrs7ap2djxmkafn2hl6gfqvi7v76bccs4jkyv8";
           name = "focus";
         };
@@ -9378,7 +9505,7 @@
           sha256 = "1k8z30imlxvqm7lv12kgqdfgc5znxyvl9jxi8j2ymmwlgy11f726";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fold-dwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fold-dwim";
           sha256 = "0c9yxx45zlhb1h4ldgkjv7bndwlagpyingaaqn9dcsxidrvp3p5x";
           name = "fold-dwim";
         };
@@ -9399,7 +9526,7 @@
           sha256 = "14jvbkahwvv4wb0s9vp8gqmlpv1d4269j5rsjxn79q5pawjzslxw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fold-dwim-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fold-dwim-org";
           sha256 = "0812p351rzvqcfn00k92nfhlg3y772y4z4b9f0xqnpa935y6harn";
           name = "fold-dwim-org";
         };
@@ -9420,7 +9547,7 @@
           sha256 = "1cbabpyp66nl5j8yhyj2jih4mhaljxvjh9ij05clai71z4598ahn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fold-this";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fold-this";
           sha256 = "1iri4a6ixw3q7qr803cj2ik7rvmww1b6ybj5q2pvkf1v25r8655d";
           name = "fold-this";
         };
@@ -9441,7 +9568,7 @@
           sha256 = "1k90w8v5rpswqb8fn1cc8sq5w12gf4sn6say5dhvqd63512b0055";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/font-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/font-utils";
           sha256 = "0k33jdchjkj7j211a23kfp5axg74cfsrrq4axsb1pfp124swh2n5";
           name = "font-utils";
         };
@@ -9462,7 +9589,7 @@
           sha256 = "0qq13jhn9i2ls6n3fbay4i2r0hfs426pkmmif43b87gjxb510irc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fontawesome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fontawesome";
           sha256 = "07hn4s929xklc74j8s6pd61rxmxw3911dq47wql77vb5pijv6dr3";
           name = "fontawesome";
         };
@@ -9475,15 +9602,15 @@
     forecast = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "forecast";
-        version = "0.1.9";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "cadadr";
           repo = "forecast.el";
-          rev = "51526906140700f076bd329753abe7ae31b6da90";
-          sha256 = "1jw888nqmbi9kcd9ycl2fqrmrnqxnmkx72n0b3nf3hp7j956yb21";
+          rev = "e96252759d23fda2ffb254685309b0c5b8a17a95";
+          sha256 = "12135l9crjkans3w40by3qflj07awdqs5qm855jkngb3ri9xsfvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/forecast";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/forecast";
           sha256 = "0whag2n1120384w304g0w4bqr7svdxxncdhnz4rznfpxlgiw2rsc";
           name = "forecast";
         };
@@ -9504,7 +9631,7 @@
           sha256 = "199kybf2bvywqfnwr5w893km82829k1j7sp079y6s2601hq8ylw9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/foreman-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/foreman-mode";
           sha256 = "0p3kwbld05wf3dwcv0k6ynz727fiy0ik2srx4js9wvagy57x98kv";
           name = "foreman-mode";
         };
@@ -9525,7 +9652,7 @@
           sha256 = "171jna631b2iqcimfsik9c66gii8nc0zdb58m077w00rn7rcxbh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/form-feed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/form-feed";
           sha256 = "1abwjkzi3irw0jwpv3f584zc72my9n8iq8zp5s0354xk6iwrl1rh";
           name = "form-feed";
         };
@@ -9546,7 +9673,7 @@
           sha256 = "0mikksamljps1czacgqavlnzzhgs8s3f8q4jza6v3csf8kgp5zd0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/format-sql";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/format-sql";
           sha256 = "0684xqzs933vj9d3n3lv7afk4gii41kaqykbb05cribaswapsanj";
           name = "format-sql";
         };
@@ -9559,15 +9686,15 @@
     fountain-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, s }:
     melpaBuild {
         pname = "fountain-mode";
-        version = "1.5.1";
+        version = "2.0.1";
         src = fetchFromGitHub {
           owner = "rnkn";
           repo = "fountain-mode";
-          rev = "a7ba3d78dcffe92105701efbf2630089a068b3da";
-          sha256 = "1187kbw06sv6yirrldbqwi44nfsg4a0rxa8c79p6ld82kcp16kns";
+          rev = "4627868e70408b9608a47980d6cfda10024221d5";
+          sha256 = "1zy45s1m1injwr4d1qvpnvfvv4nkkv9mricshxjannsjfbz09ra7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fountain-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fountain-mode";
           sha256 = "1i55gcjy8ycr1ww2fh1a2j0bchx1bsfs0zd6v4cv5zdgy7vw6840";
           name = "fountain-mode";
         };
@@ -9588,7 +9715,7 @@
           sha256 = "1vznkbly0lyh5kri9lcgy309ws96q3d5m1lghck9l8ain8hphhqz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/frame-restore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/frame-restore";
           sha256 = "0b321iyf57nkrm6xv8d1aydivrdapdgng35zcnrg298ws2naysvm";
           name = "frame-restore";
         };
@@ -9609,7 +9736,7 @@
           sha256 = "1c3yx9j3q8fkfiay4nzcabsq9i4ydqf6vxk8vv80h78gg9afrzrj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fringe-helper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fringe-helper";
           sha256 = "1vki5jd8jfrlrjcfd12gisgk12y20q3943i2qjgg4qvcj9k28cbv";
           name = "fringe-helper";
         };
@@ -9630,7 +9757,7 @@
           sha256 = "115xl18nsg2j9sbp3qqzrjfpnzczk1zmrwrfrpqjq3jmv21ilsv3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fsharp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fsharp-mode";
           sha256 = "07pkj30cawh0diqhrp3jkshgsd0i3y34rdnjb4af8mr7dsbsxb6z";
           name = "fsharp-mode";
         };
@@ -9649,7 +9776,7 @@
           sha256 = "b348e285923e480fe696f888783c95becb392a6e05abc553d8be649987c7d190";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fuel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fuel";
           sha256 = "0m24p2788r4xzm56hm9kmpzcskwh82vgbs3hqfb9xygpl4isp756";
           name = "fuel";
         };
@@ -9670,7 +9797,7 @@
           sha256 = "0c3w3xs2jbdqgsqw0qmdbwii6p395qfznird4gg0hfr7lby2kmjq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/full-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/full-ack";
           sha256 = "09ikhyhpvkcl6yl6pa4abnw6i7yfsx5jkmzypib94w7khikvb309";
           name = "full-ack";
         };
@@ -9683,15 +9810,15 @@
     fullframe = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "fullframe";
-        version = "0.3.0";
+        version = "0.4.0";
         src = fetchFromGitHub {
           owner = "tomterl";
           repo = "fullframe";
-          rev = "684f28fcb306d0232c2a7840f3fe4c933382729c";
-          sha256 = "1cjplkcsq4wlw1ixsfxih2xcx43wgzvmznxmkynqsgvn2f4w4g1f";
+          rev = "3c046dd4c27a5c96d9dc3bc50a44eb1e7fd68912";
+          sha256 = "1narmlcd8ycwkmsrgk64l7q0ljsbq2fsikl8hjbrsc20nma032m4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fullframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fullframe";
           sha256 = "08sh8lmb6g8asv28fcb36ilcn0ka4fc6ka0pnslid0h4c32fxp2a";
           name = "fullframe";
         };
@@ -9712,7 +9839,7 @@
           sha256 = "0m7fcw0cswypiwi5abg6vhw7a3agx9vhp10flbbbji6lblb0fya8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/function-args";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/function-args";
           sha256 = "13yfscr993pll5yg019v9dwy71g123a166w114n2m78h0rbnzdak";
           name = "function-args";
         };
@@ -9733,7 +9860,7 @@
           sha256 = "1g7my9ha5cnwg3pjwa86wncg5gphv18xpnpmj3xc3vg7z5m45rss";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fuzzy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fuzzy";
           sha256 = "1hwdh9bx4g4vzzyc20vdwxsii611za37kc9ik40kwjjk62qmll8h";
           name = "fuzzy";
         };
@@ -9754,7 +9881,7 @@
           sha256 = "0c3g0yfclczdh6nxmg9lljjf288zibqy51bhh1b1cgdmxcbpg8bv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fvwm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fvwm-mode";
           sha256 = "07y32cnp4qfhncp7s24gmlxljdrj5miicinfaf4gc7hihb4bkrkb";
           name = "fvwm-mode";
         };
@@ -9775,7 +9902,7 @@
           sha256 = "08qnyr945938hwjg1ypkf2x4mfxbh3bbf1xrgz1rk2ddrfv7hmkm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fwb-cmds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fwb-cmds";
           sha256 = "0wnjvi0v0l2h1mhwlsk2d8ggwh3nk7pks48l55gp18nmj00jxycx";
           name = "fwb-cmds";
         };
@@ -9796,7 +9923,7 @@
           sha256 = "1sk2z71xfi4wqb7ap8jvad8cbzdbilwzqx9vy45zmgx1jh7g4ba9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fxrd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fxrd-mode";
           sha256 = "17zimg64lqc1yh9gnp5izshkvviz996aym7q6n9p61a4kqq37z4r";
           name = "fxrd-mode";
         };
@@ -9817,7 +9944,7 @@
           sha256 = "0rjn4z7ssl1jy0brvsci44mhpig3zkdbcj8gcylzznhz0qfk1ljj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/fzf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/fzf";
           sha256 = "0jjzm1gq85fx1gmj6nqaijnjws9bm8hmk40ws3x7fmsp41qq5py0";
           name = "fzf";
         };
@@ -9838,7 +9965,7 @@
           sha256 = "1q9bz294bc6bplwfrfzsczh444v9152wv7zm2l1pcpwv8n8581p6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gather";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gather";
           sha256 = "1f0cqqp1a7w8g1pfvzxxb0hjrxq4m79a4n85dncqj2xhjxrkm0xk";
           name = "gather";
         };
@@ -9859,7 +9986,7 @@
           sha256 = "1667zln7bav0bdhrc4b5z36n8rn36xvwh4y9ffgns67zfgwi64kk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/geiser";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/geiser";
           sha256 = "067rrjvyn5sz60w9h7qn542d9iycm2q4ryvx3n6xlard0dky5596";
           name = "geiser";
         };
@@ -9880,7 +10007,7 @@
           sha256 = "08cw1fa25kbhbq2sp1cpn90bz38i9hjfdj93xf6wvki55b52s0nn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/genrnc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/genrnc";
           sha256 = "1nwbdscl0yh9j1n421can93m6s8j9dkyb3xmpampr6x528g6z0lm";
           name = "genrnc";
         };
@@ -9901,7 +10028,7 @@
           sha256 = "0344w4sbd6wlgl13j163v0hzjw9nwhvpr5s7658xsdd90wp4i701";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/german-holidays";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/german-holidays";
           sha256 = "0fgrxdgyl6va6axjc5l4sp90pyqaz5zha1g73xyhbxblshm5dwxn";
           name = "german-holidays";
         };
@@ -9922,7 +10049,7 @@
           sha256 = "1m9ra9qp7bgf6anfqyn56n3xa9a25ran10k9wd355qknd5skq1zz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ggo-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ggo-mode";
           sha256 = "1403x530n90jlfz3lq2vfiqx84cxsrhgs6hhmniq960cjj31q35p";
           name = "ggo-mode";
         };
@@ -9943,7 +10070,7 @@
           sha256 = "1qjh7av046ax4240iw40hv5fc0k23c36my9hili7fp4y2ak99l8n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ggtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ggtags";
           sha256 = "1cmry4knxbx9257ivhfxsd09z07z3g3wjihi99nrwmhb9h4mpqyw";
           name = "ggtags";
         };
@@ -9964,7 +10091,7 @@
           sha256 = "0a5v91k9gm9vv15d3m8czicv8n39f0hvqhcr6lfw0w82n26xwsms";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gh";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gh";
           sha256 = "1141l8pas3m755yzby4zsan7p81nbnlch3kj1zh69qzjpgqp30c0";
           name = "gh";
         };
@@ -9985,7 +10112,7 @@
           sha256 = "1m5q2s9nxm0m18njaxzryjly8rl3m598r94nn53xpazd4i5ln8cg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ghc";
           sha256 = "0xqriwggd1ahla5aff7k0j4admx6q18rmqsx3ipn4nfk86wrhb8g";
           name = "ghc";
         };
@@ -10006,7 +10133,7 @@
           sha256 = "1ywwyc2kz1c1s26c412nmzh55cinh84cfiazyyi3jsy5zzwhrbhi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ghc-imported-from";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ghc-imported-from";
           sha256 = "10cxz4c341lknyz4ns63bri00mya39278xav12c73if03llsyzy5";
           name = "ghc-imported-from";
         };
@@ -10027,7 +10154,7 @@
           sha256 = "0q3ps5f6mr9hyf6nq1wshcm1z6a5yhskqd7dbbwq5dm78552z6z8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gist";
           sha256 = "053fl8aw0ram9wsabzvmlm5w2klwd2pgcn2w9r1yqfs4xqja5sd3";
           name = "gist";
         };
@@ -10048,7 +10175,7 @@
           sha256 = "06ws3x5qa92drmn6rcp502jk2yil6q9gkzdmb2gww9gb2g695wl5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git";
           sha256 = "1nd2yvfgin13m368gjn7xah99glspnam4g4fh348x4makxcaw8w5";
           name = "git";
         };
@@ -10069,7 +10196,7 @@
           sha256 = "0psmr7749nzxln4b500sl3vrf24x3qijp12ir0i5z4x25k72hrlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-auto-commit-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-auto-commit-mode";
           sha256 = "0nf4n63xnzcsizjk1yl8qvqj9wjdqy57kvn6r736xvsxwzd44xgl";
           name = "git-auto-commit-mode";
         };
@@ -10090,7 +10217,7 @@
           sha256 = "0a3ws852ypi34ash39srkwzkfish4n3c5lma10d9xzddjrwapgj9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-command";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-command";
           sha256 = "1hsxak63y6648n0jkzl5ajxg45w84qq8vljvjh0bmwfrbb67kwbg";
           name = "git-command";
         };
@@ -10111,7 +10238,7 @@
           sha256 = "0dydm0gj6jbybi5nkqrpi5bic5yxhz0p5k5gayqzqzmnb1fhl247";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-commit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-commit";
           sha256 = "1i7122fydqga68cilgzir80xfq77hnrw75zrvn52mjymfli6aza2";
           name = "git-commit";
         };
@@ -10132,8 +10259,8 @@
           sha256 = "0n02nss7gp0m898g7zw4rkj2kzrdiwp6mli0753p1fqph28j0gvm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-gutter";
-          sha256 = "12yjl9hsd72dwzl42hdcmjfdbxyi356jcq0kz8k7jvcsn57z4p2k";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-gutter";
+          sha256 = "19s344i95piixlzq4mjgmgjw7cy8af02z6hg89jjjdbxrfl4i2fg";
           name = "git-gutter";
         };
         packageRequires = [ cl-lib emacs ];
@@ -10153,8 +10280,8 @@
           sha256 = "1cw5x1w14lxy8mqpxdrd9brgps0nig2prjjjda4a19wfsvy3clmv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-gutter-fringe";
-          sha256 = "14wyiyyi2rram2sz3habvmygy5a5m2jfi6x9fqcyfr3vpcjn1k4i";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-gutter-fringe";
+          sha256 = "10k07dzmkxsxzwc70vpv05rxjyps9494y6k7yhlv8d46x7xjyp0z";
           name = "git-gutter-fringe";
         };
         packageRequires = [ cl-lib emacs fringe-helper git-gutter ];
@@ -10174,7 +10301,7 @@
           sha256 = "1c7ijbpa7xw831k55cdm2gl8r597rxnp22jcmqnfpwqkqmk48ln9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-gutter-fringe+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-gutter-fringe+";
           sha256 = "1zkjb8p08cq2nqskn79rjszlhp9mrblplgamgi66yskz8qb1bgcc";
           name = "git-gutter-fringe-plus";
         };
@@ -10195,7 +10322,7 @@
           sha256 = "101hracd77mici778x3ixwrcicd6fqkcr9z76kapkr0dq5z42yjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-gutter+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-gutter+";
           sha256 = "1w78p5cz6kyl9kmndgvwnfrs80ha707s8952hycrihgfb6lixmp0";
           name = "git-gutter-plus";
         };
@@ -10216,7 +10343,7 @@
           sha256 = "02p73q0kl9z44b9a2bhqg03mkqx6gf61n88qlwwg4420dxrf7sbc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-lens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-lens";
           sha256 = "1vv3s89vk5ncinqh2f724z0qbbzp8g4y5y670ryy56w1l6v2acfb";
           name = "git-lens";
         };
@@ -10237,7 +10364,7 @@
           sha256 = "171w8vx1r2v9yclnlk3mwbfaxhg0kbvk575jvi6vr9shpjqnrb0z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-link";
           sha256 = "1vqabnmdw8pxd84c15ghh1rnglwb5i4zxicvpkg1ci8xalayn1c7";
           name = "git-link";
         };
@@ -10258,7 +10385,7 @@
           sha256 = "139yivbxdpmv8j6qz406769b040nbmj3j8r28n9gqy54zlwblgv8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-messenger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-messenger";
           sha256 = "1rnqsv389why13cy6462vyq12qc2zk58p01m3hsazp1gpfw2hfzn";
           name = "git-messenger";
         };
@@ -10279,7 +10406,7 @@
           sha256 = "1hyq3il03cm6apfawps60r4km8r6pw0vphzba30smsqfk50z3ya3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-ps1-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-ps1-mode";
           sha256 = "15gswi9s0m3hrsl1qqyjnjgbglsai95klbdp51h3pcq7zj22wkn6";
           name = "git-ps1-mode";
         };
@@ -10300,7 +10427,7 @@
           sha256 = "1brz9dc7ngywndlxbqbi3pbjbjydgqc9bjzf05lgx0pzr1ppc3w3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-timemachine";
           sha256 = "0nhl3g31r4a8j7rp5kbh17ixi16w32h80bc92vvjj3dlmk996nzq";
           name = "git-timemachine";
         };
@@ -10321,7 +10448,7 @@
           sha256 = "0igawn43i81icshimj5agv33ab120hd6182knlrn3i46p7lcs3lx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/git-wip-timemachine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/git-wip-timemachine";
           sha256 = "02fi51k6l23cgnwjp507ylkiwb8azmnhc0fips68nwn9dghzp6dw";
           name = "git-wip-timemachine";
         };
@@ -10342,7 +10469,7 @@
           sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitattributes-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gitattributes-mode";
           sha256 = "1gjs0pjh6ap0h54savamzx94lq6vqrg58jxqaq5n5qplrbg15a6x";
           name = "gitattributes-mode";
         };
@@ -10363,7 +10490,7 @@
           sha256 = "0j0w6ywhiapmx7dk20yw3zgf8803kmccnjsr664am3g85kbb644v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitconfig";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gitconfig";
           sha256 = "126znl1c4vwgskj7ka9id8v2bdrdn5nkyx3mmc6cz9ylc27ainm7";
           name = "gitconfig";
         };
@@ -10384,7 +10511,7 @@
           sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitconfig-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gitconfig-mode";
           sha256 = "0hqky40kcgxdnghnf56gpi0xp7ik45ssia1x84v0mvfwqc50dgn1";
           name = "gitconfig-mode";
         };
@@ -10405,7 +10532,7 @@
           sha256 = "07vgnmfn0kbg3h3vhf3xk443yi1b55761x881xlmw9sr9nraa578";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/github-browse-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/github-browse-file";
           sha256 = "03xvgxlw7wmfby898din7dfcg87ihahkhlav1n7qklw6qi7skjcr";
           name = "github-browse-file";
         };
@@ -10426,7 +10553,7 @@
           sha256 = "18c169nxvdl7iv18pyqx690ldg6pkc8njaxdg1cww6ykqzqnfxh7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/github-clone";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/github-clone";
           sha256 = "0ffrm4lmcj3d9kx3g2d5xbiih7hn4frs0prjrvcjq8acvsbc50q9";
           name = "github-clone";
         };
@@ -10447,7 +10574,7 @@
           sha256 = "1ipr51v7nhbbgxbbz0fp3i78ypp73kyxgc4ni8nnr7yirjhsksfd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitignore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gitignore-mode";
           sha256 = "1i98ribmnxr4hwphd95f9hcfm5wfwgdbcxw3g0w17ws7z0ir61mn";
           name = "gitignore-mode";
         };
@@ -10468,7 +10595,7 @@
           sha256 = "1hc7j3gwljb1wk2727f66m3f7ga4icbklp54vlm0vf2bmii1ynil";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gitlab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gitlab";
           sha256 = "0vxsqfnipgapnd2ijvdnkspk68dlnki3pkpkzg2h6hyazmzrsqnq";
           name = "gitlab";
         };
@@ -10489,7 +10616,7 @@
           sha256 = "0j3pay3gd1wdnpc853gy5j68hbavrwy6cc2bgmd12ag29xki3hcg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gmail-message-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gmail-message-mode";
           sha256 = "0py0i7b893ihb8l1hmk3jfl0xil450znadcd18q7svr3zl2m0gkk";
           name = "gmail-message-mode";
         };
@@ -10510,7 +10637,7 @@
           sha256 = "0p6n52m3y56nx7chwvmnslrnwc0xmh4fmmlkbkfz9n58hlmw8x1x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gmail2bbdb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gmail2bbdb";
           sha256 = "03jhrk4vpjim3ybzjxy7s9r1cgjysj9vlc4criz5k0w7vqz3r28j";
           name = "gmail2bbdb";
         };
@@ -10531,7 +10658,7 @@
           sha256 = "0x0a94bfkk72kqyr5m6arx450qsg1axmp5r0c4r9m84z8j08r4v1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gmpl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gmpl-mode";
           sha256 = "1f60xim8h85jmqpvgfg402ff8mjd66gla8fa0cwi7l18ijnjblpz";
           name = "gmpl-mode";
         };
@@ -10552,7 +10679,7 @@
           sha256 = "160qm8xf0yghygb52p8cykhb5vpg9ww3gjprcdkcxplr4b230nnc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnome-calendar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnome-calendar";
           sha256 = "00clamlm5b42zqggxywdqrf6s2dnsxir5rpd8mjpyc502kqmsfn6";
           name = "gnome-calendar";
         };
@@ -10573,7 +10700,7 @@
           sha256 = "1nvyjjjydrimpxy4cpg90si7sr8lmldbhlcm2mx8npklp9pn5y3a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gntp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gntp";
           sha256 = "1ywj3p082g54dcpy8q4jnkqfr12npikx8yz14r0njxdlr0janh4f";
           name = "gntp";
         };
@@ -10594,7 +10721,7 @@
           sha256 = "0bwri3cvm2vr27kyqkrddm28fs08axnd4nm9amfgp54xp20bn4yn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnuplot";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnuplot";
           sha256 = "06c5gqf02fkra8c52xck1lqvf4yg45zfibyf9zqmnbwk7p2jxrds";
           name = "gnuplot";
         };
@@ -10615,7 +10742,7 @@
           sha256 = "08j8x0iaz5s9q0b68d8h3153w0z6vak5l8qgw3dd1drz5p9xnvyw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnus-desktop-notify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnus-desktop-notify";
           sha256 = "0hf2dszk5d7vn80bm0msaqv7iji384n85dxgw8ng64c0f9f6752b";
           name = "gnus-desktop-notify";
         };
@@ -10636,7 +10763,7 @@
           sha256 = "1i3f67x2l9l5c5agspbkxr2mmh3rpq3009d8yzh6r1lih0b4hril";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gnus-x-gm-raw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gnus-x-gm-raw";
           sha256 = "1a5iccghzqmcndql2bppvr48535sf6jbvc83iypr1031z1b5k4wg";
           name = "gnus-x-gm-raw";
         };
@@ -10657,7 +10784,7 @@
           sha256 = "03snnra31b5j6iy94gql240vhkynbjql9b4b5j8bsqp9inmbsia3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-autocomplete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-autocomplete";
           sha256 = "1ldsq81a167dk2r2mvzyp3v3j2mxc4l9p6b12i7pv8zrjlkhma5a";
           name = "go-autocomplete";
         };
@@ -10678,7 +10805,7 @@
           sha256 = "05yc0nylg3457an5j7yp3x23157j0hbi21qhcpgsa01144mwnwln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-direx";
           sha256 = "0dq5d7fsld4hww8fl68c18qp6fl3781dqqwd98cg68bihw2wwni7";
           name = "go-direx";
         };
@@ -10699,7 +10826,7 @@
           sha256 = "0ha07nhd2g43l84r1r5dz6c8m3fmmn4bx5mhvi6as33achhip7bn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-eldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-eldoc";
           sha256 = "1k115dirfqxdnb6hdzlw41xdy2dxp38g3vq5wlvslqggha7gzhkk";
           name = "go-eldoc";
         };
@@ -10720,7 +10847,7 @@
           sha256 = "1fm6xd3vsi8mqh0idddjpfxlsmz1ljmjppw3qkxl1vr0qz3598k3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-errcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-errcheck";
           sha256 = "11a75h32cd5h5xjv30x83k60s49k9fhgis31358q46y2gbvqp5bs";
           name = "go-errcheck";
         };
@@ -10741,7 +10868,7 @@
           sha256 = "1qqsck11v3ki18qld7hrb7dis60c2ylmq15s7srsppzwil8wm3fx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-mode";
           sha256 = "1852zjxandmq0cpbf7m56ar3rbdi7bx613gdgsf1bg8hsdvkgzfx";
           name = "go-mode";
         };
@@ -10762,7 +10889,7 @@
           sha256 = "1a6vg2vwgnafb61pwrd837fwlq5gs80wawbzjsnykawnmcaag8pm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/go-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/go-scratch";
           sha256 = "11ahvmxbh67wa39cymymxmcpkq0kcn5jz0rrvazjy2p1hx3x1ma5";
           name = "go-scratch";
         };
@@ -10783,7 +10910,7 @@
           sha256 = "00igv83hiyx7x3pf2grmjpd379brn33fm85f05k104mkkrhg99nm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/golden-ratio";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/golden-ratio";
           sha256 = "15fkrv0sgpzmnw2h4fp2gb83d8s42khkfq1h76l241njjayk1f81";
           name = "golden-ratio";
         };
@@ -10804,7 +10931,7 @@
           sha256 = "0j31062zfqmcd0zsbp19f3h7gq7dn78sg4xf2x838sr9421x6w8x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/google-this";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/google-this";
           sha256 = "0hg9y1b03aiamyn3mam3hyxmxy21wygxrnrww91zcbwlzgp4dd2c";
           name = "google-this";
         };
@@ -10825,7 +10952,7 @@
           sha256 = "0hvxyqkxv5hfsa9sv71m7d98g25a1xc962r961nw6vmbvsf64z6b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/google-translate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/google-translate";
           sha256 = "1crgzdd32mk6hrawdypg496dwh51wzwfb5wqw4a2j5l8y958xf47";
           name = "google-translate";
         };
@@ -10846,7 +10973,7 @@
           sha256 = "0vf42j9jpa75879pxb1h7qgflcrrg78dgq5lg8v0sbpy7z86zaxr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gotest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gotest";
           sha256 = "1kan3gykhci33jgg67jjiiz7rqlz5mpxp8sh6mb0n6kpfmgb4ly9";
           name = "gotest";
         };
@@ -10867,7 +10994,7 @@
           sha256 = "0pxzi56lw9ry91f70hjnvrsbyhcaqknlwicjjbhf6rhv57fplw8h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gotham-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gotham-theme";
           sha256 = "0jars6rvf7hkyf71vq06mqki1r840i1dvv43dissqjg5i4lr79cl";
           name = "gotham-theme";
         };
@@ -10888,7 +11015,7 @@
           sha256 = "188q7jr1y872as3w32m8lf6vwl2by1ibgdk6zk7dhpcjwd0ik7x7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/goto-gem";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/goto-gem";
           sha256 = "06vy9m01qccvahxr5xn0plzw9knl5ig7gi5q5r1smfx92bmzkg3a";
           name = "goto-gem";
         };
@@ -10909,7 +11036,7 @@
           sha256 = "1f0zlvva7d7iza1v79yjp0bm7vd011q4cy14g1saryll32z115z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/goto-last-change";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/goto-last-change";
           sha256 = "1yl9p95ls04bkmf4d6az72pycp27bv7q7wxxzvj8sj97bgwvwajx";
           name = "goto-last-change";
         };
@@ -10930,7 +11057,7 @@
           sha256 = "0k86lrb55d701nj6pvlw3kjp1dcd3lzfya0hv6q56c529y69d782";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gradle-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gradle-mode";
           sha256 = "0lx9qi93wmiy9pxjxqp68scbcb4bx88b6jiqk3y8jg5cajizh24g";
           name = "gradle-mode";
         };
@@ -10951,7 +11078,7 @@
           sha256 = "1rv6klh59y70shc7kwdzlksdzmy0881ss49c0h5m93cn5pd6aj1l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grails-projectile-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grails-projectile-mode";
           sha256 = "0dy8v2mila7ccvb7j5jlfkhfjsjfk3bm3rcy84m0rgbqjai67amn";
           name = "grails-projectile-mode";
         };
@@ -10972,7 +11099,7 @@
           sha256 = "1202fwwwdr74q6s5jv1n0mvmq4n9mra85l14hdhwh2kks513s6vs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grandshell-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grandshell-theme";
           sha256 = "1mnnjsw1kx40b6ws8wmk25fz9rq8rd70xia9cjpwdfkg7kh8xvsa";
           name = "grandshell-theme";
         };
@@ -10993,7 +11120,7 @@
           sha256 = "1f34bhjxmbf2jjrkpdvqg2gwp83ka6d5vrxmsxdl3r57yc6rbrwa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/graphene";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/graphene";
           sha256 = "1wz3rvd8b7gx5d0k7yi4dd69ax5bybcm10vdc7xp4yn296lmyl9k";
           name = "graphene";
         };
@@ -11026,7 +11153,7 @@
           sha256 = "1bidfn4x5lb6dylhadyf05g4l2k7jg83mi058cmv76av1glawk17";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/graphene-meta-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/graphene-meta-theme";
           sha256 = "1cqdr93lccdpxkzgap3r3qc92dh8vqgdlnxvqkw7lrcbs31fvf3q";
           name = "graphene-meta-theme";
         };
@@ -11047,7 +11174,7 @@
           sha256 = "1zk664ilyz14p11csmqgzs73gx08hy32h3pnyymzqkavmgb6h3s0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/graphviz-dot-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/graphviz-dot-mode";
           sha256 = "04rkynsrsk6w4sxn1pc0b9b6pij1p7yraywbrk7qvv05fv69kri2";
           name = "graphviz-dot-mode";
         };
@@ -11068,7 +11195,7 @@
           sha256 = "0xcj1kqzgxifhrhpl9j2nfpnkd6213ix5z7f97269v3inpzaiyf5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grapnel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grapnel";
           sha256 = "019cdx1wdx8sc2ibqwgp1akgckzxxvrayyp2sv806gha0kn6yf6r";
           name = "grapnel";
         };
@@ -11088,7 +11215,7 @@
           sha256 = "0djv2ps2ahw9b1b5i45hgy7l7cch7cgh7rzq601c0r6vi7gm2ac5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grass-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grass-mode";
           sha256 = "1lq6bk4bwgcy4ra3d9rlca3fk87ydg7xnnqcqjg0pw4m9xnr3f7v";
           name = "grass-mode";
         };
@@ -11107,7 +11234,7 @@
           sha256 = "0rqpgc50z86j4waijfm6kw4zjmzqfii6nnvyix4rkd4y3ryny1x2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grin";
           sha256 = "0mvzwmws5pi6hpzgkc43fjxs98ngkr0jvqbclza2jbbqawifzzbk";
           name = "grin";
         };
@@ -11128,7 +11255,7 @@
           sha256 = "1bq73kcx744xnlm2yvccrzlbyx91c492sg7blx2a9z643v3gg1zs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grizzl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grizzl";
           sha256 = "1klds0w9qrsgfppq105qr69c26zi91y575db2hxr6h9vypf2rq24";
           name = "grizzl";
         };
@@ -11149,7 +11276,7 @@
           sha256 = "14h0rcd3nkw3pmx8jwip20p6rzl9qdkip5g52gfjjbqfvaffsrkd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gruber-darker-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gruber-darker-theme";
           sha256 = "0vn4msixb77xj6p5mlfchjyyjhzah0lcmp0z82s8849zd194fxqi";
           name = "gruber-darker-theme";
         };
@@ -11170,7 +11297,7 @@
           sha256 = "0zpmhjwj64s72iv3dgsy07pfh20f25ngsy3pszmlrfkxk0926d8k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/grunt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/grunt";
           sha256 = "1qdzqcrff9x97kyy0d4j636d5i751qja10liw8i0lf4lk6n0lywz";
           name = "grunt";
         };
@@ -11191,7 +11318,7 @@
           sha256 = "1dfd22629gz0c8r4wplvbn0n7bm20549mg5chq289s826ca0kxqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/gscholar-bibtex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/gscholar-bibtex";
           sha256 = "0d41gr9amf9vdn9pl9lamhp2swqllxslv9r3wsgzqvjl7zayd1az";
           name = "gscholar-bibtex";
         };
@@ -11212,7 +11339,7 @@
           sha256 = "1bmcvn8a7g9ahpv2fww673hx9pa7nnrj9kpljq65azf61vq2an2g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/guide-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/guide-key";
           sha256 = "0zjrdvppcg8b2k6hfdj45rswc1ks9xgimcr2yvgpc8prrwk1yjsf";
           name = "guide-key";
         };
@@ -11233,7 +11360,7 @@
           sha256 = "040mcfhj2gggp8w1pgip7rxb1bnb23rxlm02wl6x1qv5i0q7g5x3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/guide-key-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/guide-key-tip";
           sha256 = "0h2vkkbxq361dkn6irm1v19qj7bkhxcjljiksd5wwlq5zsq6bd06";
           name = "guide-key-tip";
         };
@@ -11254,7 +11381,7 @@
           sha256 = "1y46qd9cgkfb0wp2cvksjncyp77hd2jnr4bm4zafqirc3qhbysx0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/guru-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/guru-mode";
           sha256 = "0j25nxs3ndybq1ik36qyqdprmhav4ba8ny7v2z61s23id8hz3xjs";
           name = "guru-mode";
         };
@@ -11275,7 +11402,7 @@
           sha256 = "1ffk39lnmg9gfffkaj595p768d1p99q6sqym5g5ch6fmi6cx3a84";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hackernews";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hackernews";
           sha256 = "1x1jf5gkhmpiby5rmy0sziywh6c1f1n0p4f6dlz6ifbwns7har6a";
           name = "hackernews";
         };
@@ -11296,7 +11423,7 @@
           sha256 = "0d3xmagl18pas19zbpg27j0lmdiry23df48z4vkjsrcllqg25v5g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ham-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ham-mode";
           sha256 = "000qrdby7d6zmp5066vs4gjlc9ik0ybrgcwzcbfgxb16w1g9xpmz";
           name = "ham-mode";
         };
@@ -11317,7 +11444,7 @@
           sha256 = "0fmr7ji8x5ki9fzybpbg3xbhzws6n7ffk7d0zf9jl1x3jd8d6988";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haml-mode";
           sha256 = "0ih0m7zr6kgn6zd45zbp1jgs1ydc5i5gmq6l080wma83v5w1436f";
           name = "haml-mode";
         };
@@ -11338,7 +11465,7 @@
           sha256 = "08l6p9n2ggg4filad1k663qc2gjgfbia4knnnif4sw7h92yb31jl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hardcore-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hardcore-mode";
           sha256 = "1bgi1acpw4z7i03d0i8mrd2hpjn6hyvkdsk0ks9q380yp9mqmiwd";
           name = "hardcore-mode";
         };
@@ -11359,7 +11486,7 @@
           sha256 = "0mbdnsm903s380ajjgjjqa0m4mxsddzqfjdafrngy0pxgs16iv1f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hardhat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hardhat";
           sha256 = "16pdbpm647ag9cadmdm75nwwyzrqsd9y1b4zgkl3pg669mi5vl5z";
           name = "hardhat";
         };
@@ -11380,7 +11507,7 @@
           sha256 = "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-emacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haskell-emacs";
           sha256 = "1wkh7qws35c32hha0p9rpjz5pls2844920nh919lvp2wmq9l6jd6";
           name = "haskell-emacs";
         };
@@ -11401,7 +11528,7 @@
           sha256 = "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-emacs-base";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haskell-emacs-base";
           sha256 = "1fwkds6qyhbxxdgxfzmgd7dlcxr08ynrrg5jdp9r7f924pd536vb";
           name = "haskell-emacs-base";
         };
@@ -11422,7 +11549,7 @@
           sha256 = "1qgqsy7wnqyzkc3b0wixxb8mapmgpi36dignvf8w2raw9ma3q2n0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-emacs-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haskell-emacs-text";
           sha256 = "1j18fhhra6lv32xrq8jc6l8i56fgn68da81wymcimpmpbp0hl5fy";
           name = "haskell-emacs-text";
         };
@@ -11443,7 +11570,7 @@
           sha256 = "0433ay8azn1q9fk7rc5aw4klc9r2p7s44xzd87i0pgpdp154h52g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haskell-mode";
           sha256 = "0wijvcpfdbl17iwzy47vf8brkj2djarfr8y28rw0wqvbs381zzwp";
           name = "haskell-mode";
         };
@@ -11464,7 +11591,7 @@
           sha256 = "0b3d7rvqvvcsp51aqfhl0zg9zg8j0p6vlfvga6jp9xc7626vh6f6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haskell-snippets";
           sha256 = "10bvv7q694fahcpm83v8lpqihg1gvfzrp1hdzwiffxydfvdbalh2";
           name = "haskell-snippets";
         };
@@ -11484,7 +11611,7 @@
           sha256 = "02786f437bbbbb221c9c810a8d110bb4af172b986733ac35c932b18b38af7201";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haskell-tab-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haskell-tab-indent";
           sha256 = "0vdfmy56w5yi202nbd28v1bzj97v1wxnfnb5z3dh9687p2abgnr7";
           name = "haskell-tab-indent";
         };
@@ -11505,7 +11632,7 @@
           sha256 = "14m8z13nvfqqgx40vzzbn0z9crwi3hhacmk1zfbv9cmhs95dwy6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/haxor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/haxor-mode";
           sha256 = "1y4m058whdqnkkf9s6hzi0h6w0fc8ajfawhpjj0wqjam4adnfkq5";
           name = "haxor-mode";
         };
@@ -11526,7 +11653,7 @@
           sha256 = "15h1wkl1d9f2xfhm0nffqicg31rw7z2q0sizjphys9ljgxm43is4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hcl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hcl-mode";
           sha256 = "1wrs9kj6ahsdnbn3fdaqhclq1ia6w4x726hjvl6pyk01sb0spnin";
           name = "hcl-mode";
         };
@@ -11547,7 +11674,7 @@
           sha256 = "0cylf0mnfj0m1wm9mxpxrkiinrlvpax99mdnsc6zfj3zrn1qghnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm";
           sha256 = "0xsf4rg7kn0m5wjlbwhd1mc38lg2822037dyd0h66h6x2gbs3fd9";
           name = "helm";
         };
@@ -11568,7 +11695,7 @@
           sha256 = "0ps86zpyywibjwcm9drmamla979ad61fyqr8d6bv71fr56k9ak21";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ack";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ack";
           sha256 = "1a8sc5gd2g57dl9g18wyydfmihy74yniwhjr27h7vxylnf2g3pni";
           name = "helm-ack";
         };
@@ -11589,8 +11716,8 @@
           sha256 = "0ksx48n3g5n7ny2ny65bp3xx3p5g464dwxq30aji2b40yivaj0sz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ag";
-          sha256 = "023zvgmi5b5b2qga3jqd7jrq9ap8n3rhvl6jrv9fsi565sg1fv43";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ag";
+          sha256 = "050qh5xqh8lwkgmz3jxm8gql5nd7bq8sp9q6mzm2z7367qy4qqyf";
           name = "helm-ag";
         };
         packageRequires = [ emacs helm ];
@@ -11610,7 +11737,7 @@
           sha256 = "015p5sszd54x81qm96gx6xwjkvbi4f3j9i2nhcvlkk75s95w1ijv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-aws";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-aws";
           sha256 = "0sjgdjpznjxsf6nlv2ah45fw17j8j5apdphd1fp43rjv1lskkgc5";
           name = "helm-aws";
         };
@@ -11631,7 +11758,7 @@
           sha256 = "0d6h4gbb69abxxgm85pdi5rsaf9h72yryg72ykd5633i1g4s8a76";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-backup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-backup";
           sha256 = "182jbm36yzayxi9y3vhpyn25ivrgay37sncqvah35vbw52lnjcn3";
           name = "helm-backup";
         };
@@ -11652,7 +11779,7 @@
           sha256 = "1j9xmlidipsfbz0kfxwz0c6hi9xsbk36h6i30wqdd0ls0zw5xm30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-bundle-show";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-bundle-show";
           sha256 = "1af5g233kjf04m2fryizk51a1s2mcmj36zip5nyb8skcsfl4riq7";
           name = "helm-bundle-show";
         };
@@ -11673,7 +11800,7 @@
           sha256 = "108584bmadgidqkdfvf333zkyb5v9f84pasz5h01fkh57ks8by9f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-c-yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-c-yasnippet";
           sha256 = "0jwj4giv6lxb3h7vqqb2alkwq5kp0shy2nraik33956p4l8dfs90";
           name = "helm-c-yasnippet";
         };
@@ -11686,15 +11813,15 @@
     helm-circe = callPackage ({ circe, cl-lib ? null, emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-circe";
-        version = "0.3";
+        version = "0.4";
         src = fetchFromGitHub {
           owner = "lesharris";
           repo = "helm-circe";
-          rev = "0b7ecf5380971ee7b6291fca6a2805c320638238";
-          sha256 = "1iqjc15pz5qr8zjxaxz1b2vys2689ri76jacmipxvgjk0y7vc5f0";
+          rev = "9091651d9fdd8d49d8ff6f9dcf3a2ae416c9f15a";
+          sha256 = "1gwg299s8ps0q97iw6p515gwn73rjk1icgl3j7cj1s143njjg122";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-circe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-circe";
           sha256 = "12jfzg03573lih2aapvv5h2mi3pwqc9nrmv538ivjywix5117k3v";
           name = "helm-circe";
         };
@@ -11715,7 +11842,7 @@
           sha256 = "1l61csd1gqz7kg5zjx60cfy824g42p682z7pk0rqzlrz8498wvkh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-commandlinefu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-commandlinefu";
           sha256 = "150nqib0sr4n35vdj1xrxcja8gkv3chzhdbgkjxqgkz2yq10xxnd";
           name = "helm-commandlinefu";
         };
@@ -11736,7 +11863,7 @@
           sha256 = "0cylf0mnfj0m1wm9mxpxrkiinrlvpax99mdnsc6zfj3zrn1qghnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-core";
           sha256 = "1dyv8rv1728vwsp6vfdq954sp878jbp3srbfxl9gsgjnv1l6vjda";
           name = "helm-core";
         };
@@ -11757,7 +11884,7 @@
           sha256 = "0xnqkc4z22m41v5lgf87dd8xc4gmf932zbnbdhf9xic1gal1779c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-cscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-cscope";
           sha256 = "13a76wc1ia4c0v701dxqc9ycbb43d5k09m5pfsvs8mccisfzk9y4";
           name = "helm-cscope";
         };
@@ -11778,7 +11905,7 @@
           sha256 = "0s503q56acv70i5qahrdgk3nhvdpb3wa22a8jh1kvb7lykaw74ai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-dash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-dash";
           sha256 = "1cnxssj2ilszq94v5cc4ixblar1nlilv9askqjp9gfnkj2z1n9cy";
           name = "helm-dash";
         };
@@ -11799,7 +11926,7 @@
           sha256 = "1cm2vaw0j1x2w2m45k6iqbzm7nydfdx1x89673vsvb90whdgvjbp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-descbinds";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-descbinds";
           sha256 = "1890ss4pimjxskzzllf57fg07xbs8zqcrp6r8r6x989llrfvd1h7";
           name = "helm-descbinds";
         };
@@ -11820,7 +11947,7 @@
           sha256 = "0vmlpj6zfif5f3wzgq8lkfqprl3z5gjsqj86347krblgfzhqlz30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-firefox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-firefox";
           sha256 = "0677nj0zsk11vvp3q3xl9nk8dhz3ki9yl3kfb57wgnmprp109wgs";
           name = "helm-firefox";
         };
@@ -11841,7 +11968,7 @@
           sha256 = "00ls9v3jdpz3wka90crd193z3ipwnf1b0slmldn4vb9ivrndh6wn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ghc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ghc";
           sha256 = "1q5ia8sgpflv2hhvw7hjpkfb25vmrjwlrqz1f9qj2qgmki5mix2d";
           name = "helm-ghc";
         };
@@ -11862,7 +11989,7 @@
           sha256 = "0y379qap3mssz9nslb08vfzq5ihqcm156fbx0dszgz9d6xgkpdhw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ghq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ghq";
           sha256 = "14f3cbsj7jhlhrp561d8pasllnx1cmi7jk6v2fja7ghzj76dnvq6";
           name = "helm-ghq";
         };
@@ -11883,7 +12010,7 @@
           sha256 = "1sbhh3dmb47sy3r2iw6vmvbq5bpjac4xdg8i5a0m0c392a38nfqn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-github-stars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-github-stars";
           sha256 = "1r4mc4v71171sq9rbbhm346s92fb7jnvvl91y2q52jqmrnzzl9zy";
           name = "helm-github-stars";
         };
@@ -11904,7 +12031,7 @@
           sha256 = "1hc7j3gwljb1wk2727f66m3f7ga4icbklp54vlm0vf2bmii1ynil";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-gitlab";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-gitlab";
           sha256 = "010ihx3yddhb8j3jqcssc49qnf3i7xlz0s380mpgrdxgz6yahsmd";
           name = "helm-gitlab";
         };
@@ -11925,8 +12052,8 @@
           sha256 = "1hqmwbdcjssvvl7prdykhlgbfrf4qylkvqp0nnnxp8r1wy6h6aws";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-gtags";
-          sha256 = "0snx0b8b4yc507q3i4fzvrd68xgzqxly8kn5cwp26ik6cv840y29";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-gtags";
+          sha256 = "1kbpfqhhbxmp3f70h91x2fws9mhx87zx4nzjjl29lpl93vf8xckl";
           name = "helm-gtags";
         };
         packageRequires = [ emacs helm ];
@@ -11946,7 +12073,7 @@
           sha256 = "189dv3qqqmfyhsqa1n52cgcn1xv7k49f92ndn43y2v20234nhl9f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-hatena-bookmark";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-hatena-bookmark";
           sha256 = "14091zrp4vj7752rb5s3pkyvrrsdl7iaj3q9ys8rjmbsjwcv30id";
           name = "helm-hatena-bookmark";
         };
@@ -11967,7 +12094,7 @@
           sha256 = "1imfzz6cfdq7fgrcgrafy2nln929mgh31vybk9frm7a9jpamqdxp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-hayoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-hayoo";
           sha256 = "0xdvl6q2rpfsma4hx8m4snbd05s4z0bi8psdalixywlp5s4vzr32";
           name = "helm-hayoo";
         };
@@ -11988,7 +12115,7 @@
           sha256 = "0bz2ngw816jvpw1a10j31y5hf1knz0mzz60l073h33qci11jbwid";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ispell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ispell";
           sha256 = "0qyj6whgb2p0v231wn6pvx4awvl1wxppppqqbx5255j8r1f3l1b0";
           name = "helm-ispell";
         };
@@ -12009,7 +12136,7 @@
           sha256 = "1nd562lffc41r3y5x7y46f37ra97avllk2m95w23f9g42h47f1ar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-lobsters";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-lobsters";
           sha256 = "0dkb78n373kywxj8zba2s5a2g85vx19rdswv9i78xjwv1lqh8cpp";
           name = "helm-lobsters";
         };
@@ -12030,7 +12157,7 @@
           sha256 = "0azs971d7pqd4ddxzy7bfs52cmrjbafwrcnf57afw39d772rzpdf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ls-git";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ls-git";
           sha256 = "08rsy9479nk03kinjfkxddrq6wi4sx2a0wrz37cl2q517qi7sibj";
           name = "helm-ls-git";
         };
@@ -12051,7 +12178,7 @@
           sha256 = "1hma79i69l8ilkr3l4b8zqk3ny62vqr1ym2blymia4ibwk4zqbda";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-ls-hg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-ls-hg";
           sha256 = "0ca0xn7n8bagxb504xgkcv04rpm1vxhx2m77biqrx5886pwl25bh";
           name = "helm-ls-hg";
         };
@@ -12072,7 +12199,7 @@
           sha256 = "17ls0bplnja2qvg3129x2irgsgs7l4bjj0qi7b9z16i6knjkwfya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-make";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-make";
           sha256 = "1r6jjy1rlsii6p6pinbz7h6gcw4vmcycd3vj338bfbnqp5rrf2mc";
           name = "helm-make";
         };
@@ -12093,7 +12220,7 @@
           sha256 = "03588hanfa20pjp9w1bqy8wsf5x6az0vfq0bmcnr4xvlf6fhkyxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-migemo";
           sha256 = "1cjvb1lm1fsg5ky63fvrphwl5a7r7xf6qzb4mvl06ikj8hv2h33x";
           name = "helm-migemo";
         };
@@ -12114,7 +12241,7 @@
           sha256 = "1srx5f0s9x7zan7ayqd6scxfhcvr3nkd4yzs96hphd87rb18apzk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-mode-manager";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-mode-manager";
           sha256 = "1w9svq1kyyj8mmljardhbdvykb334nq1y18s956g4rvqyas2ciyd";
           name = "helm-mode-manager";
         };
@@ -12135,7 +12262,7 @@
           sha256 = "0gknncyhr2392xkvghgy5mh6gdv6qzvswidx2wy04ypb4s0vxgq2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-mt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-mt";
           sha256 = "04hx8cg8wmm2w8g942nc9mvm12ammmjnx4k61ljrq76smd8s3x2a";
           name = "helm-mt";
         };
@@ -12156,7 +12283,7 @@
           sha256 = "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-nixos-options";
           sha256 = "1nsi4hfw53iwn29fp33dkri1c6w8kdyn4sa0yn2fi6144ilmq933";
           name = "helm-nixos-options";
         };
@@ -12177,8 +12304,8 @@
           sha256 = "1hq1nnmgkx0a8sv6g8k4v9f0102qg7jga0hcjnr8lcji51nqrcya";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-open-github";
-          sha256 = "121sszwvihbv688nq5lhdclvsjj8759glh42h82r4pcw30lxggxb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-open-github";
+          sha256 = "1wqlwg21s9pjgcrwr8kdrppinmjn235nadkp4003g0md1d64zxpx";
           name = "helm-open-github";
         };
         packageRequires = [ cl-lib gh helm-core ];
@@ -12198,7 +12325,7 @@
           sha256 = "1zyjxrrda7nxxjqczv2p3sfimxy2pq734kf51j6v2y0biclc4bk3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-orgcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-orgcard";
           sha256 = "1a56y8fny7qxxidc357n7l3yi7h66hidhvwhkam8y5wk6k61460p";
           name = "helm-orgcard";
         };
@@ -12219,7 +12346,7 @@
           sha256 = "14ad0b9d07chabjclffjyvnmrasar1di9wmpzf78bw5yg99cbisw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-package";
           sha256 = "1qab2abx52xcqrnxzl0m3533ngp8m1cqmm3hgpzgx7yfrkanyi4y";
           name = "helm-package";
         };
@@ -12240,7 +12367,7 @@
           sha256 = "1r2ndmrw5ivawb940j8jnmqzxv46qrzd3cqh9fvxx5yicf020fjf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-pages";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-pages";
           sha256 = "1v3w8100invb5wsmm3dyl41pjs7s889s3b1rlr6vlcspa1ncv3wj";
           name = "helm-pages";
         };
@@ -12261,8 +12388,8 @@
           sha256 = "01cj2897hqz02mfz32nxlyyp59iwm0gz1zj11s8ll7pwy9q3r90g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-perldoc";
-          sha256 = "0b0cl2xj5w1r71zrjhnqhrzsnz1296jv21qx5adzslra6lk55q2r";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-perldoc";
+          sha256 = "1qx0g81qcqanjiz5fxysagjhsxaj31g6nsi2hhdgq4x4nqrlmrhb";
           name = "helm-perldoc";
         };
         packageRequires = [ cl-lib deferred helm ];
@@ -12282,7 +12409,7 @@
           sha256 = "0y0a18bj2k459fk51z7svnnasqkl78bx61y5ha1yv3sqnppgdw2h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-proc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-proc";
           sha256 = "1bq60giy2bs9m3hlbc5nwvy51702a98s0vqass3b290hdgki4bnx";
           name = "helm-proc";
         };
@@ -12303,7 +12430,7 @@
           sha256 = "1q7hfj8ldwivhjp9ns5pvsn0ds6pyvl2zhl366c22s6q8jmbr8ik";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-project-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-project-persist";
           sha256 = "1n87kn1n3453mpdj6amyrgivslskmnzdafpspvkz7b0smf9mv2ld";
           name = "helm-project-persist";
         };
@@ -12324,7 +12451,7 @@
           sha256 = "0jm6nnnjyd4kmm1knh0mq3xhnw2hvs3linwlynj8yaliqvlv6brv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-pt";
           sha256 = "1imhy0bsm9aldv0pvf88280qdya01lznxpx5gi5wffhrz17yh4pi";
           name = "helm-pt";
         };
@@ -12334,6 +12461,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    helm-purpose = callPackage ({ emacs, fetchFromGitHub, fetchurl, helm, lib, melpaBuild, window-purpose }:
+    melpaBuild {
+        pname = "helm-purpose";
+        version = "0.1";
+        src = fetchFromGitHub {
+          owner = "bmag";
+          repo = "helm-purpose";
+          rev = "115a9d612aa07bb6f7f7b18f42b34918699660b9";
+          sha256 = "1jy9l4an2aqynj86pw2qxpzw446xm376n2ykiz17qlimqbxhwkgz";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-purpose";
+          sha256 = "0am8fy7ihk4hv07a6bnk9mwy986h6i6qxwpdmfhajzga71ixchg6";
+          name = "helm-purpose";
+        };
+        packageRequires = [ emacs helm window-purpose ];
+        meta = {
+          homepage = "http://melpa.org/#/helm-purpose";
+          license = lib.licenses.free;
+        };
+      }) {};
     helm-pydoc = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, helm-core, lib, melpaBuild }:
     melpaBuild {
         pname = "helm-pydoc";
@@ -12345,8 +12493,8 @@
           sha256 = "1ik0vllakh73kc2zbgii4sm33n9pj388gaz69j4drz2mik307zvs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-pydoc";
-          sha256 = "0cnbhjw951f8sci63cvzcc65d0ffdx3rb8l1g38qql5rzkam48fn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-pydoc";
+          sha256 = "1sh7gqqiwk85kx89l1sihlkb8ff1g9n460nwj1y1bsrpfl6if4j7";
           name = "helm-pydoc";
         };
         packageRequires = [ cl-lib helm-core ];
@@ -12366,7 +12514,7 @@
           sha256 = "1f1ijna97dn190if3nwk5s5rldlpryfb7wvgg0imwqyp25h4all7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-recoll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-recoll";
           sha256 = "0pr2pllplml55k1xx9inr3dm90ichg2wb62dvgvmbq2sqdf4606b";
           name = "helm-recoll";
         };
@@ -12387,7 +12535,7 @@
           sha256 = "163ljqar3vvbavzc8sk6rnf8awyc2rhh2g117fglswich3c8lnqg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-robe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-robe";
           sha256 = "1gi4nkm9xvnxv0frmhiiw8dkmnmhfpr9n0b6jpidlvr8xr4s5kyw";
           name = "helm-robe";
         };
@@ -12408,7 +12556,7 @@
           sha256 = "1sff8kagyhmwcxf9062il1077d4slvr2kq76abj496610gpb75i0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-rubygems-org";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-rubygems-org";
           sha256 = "04ni03ak53z3rggdgf68qh7ksgcf3s0f2cv6skwjqw7v8qhph6qs";
           name = "helm-rubygems-org";
         };
@@ -12429,7 +12577,7 @@
           sha256 = "1s6aw1viyzhhrfiazzi82n7bkvshp7clwi6539660m72lfwc5zdl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-sage";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-sage";
           sha256 = "1vnq15fjaap0ai7dadi64sm4415xssmahk2j7kx45sasy4qaxlbj";
           name = "helm-sage";
         };
@@ -12450,7 +12598,7 @@
           sha256 = "0kz0vfp43n7f9l53rji2pb8v6ylg63i37q0bmidmjjvsinimwj44";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-spaces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-spaces";
           sha256 = "0hdvkk173k98iycvii5xpbiblx044125pl7jyz4kb8r1vvwcv791";
           name = "helm-spaces";
         };
@@ -12471,7 +12619,7 @@
           sha256 = "1lkjrz9ma2bxr8vskdm3sgrmsyiic798q3271dw38d453bhv4bl1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-swoop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-swoop";
           sha256 = "1fqbhj75hcmy7c2vdd0m7fk3m34njmv5s6k1i9y94djpbd13i3d8";
           name = "helm-swoop";
         };
@@ -12492,8 +12640,8 @@
           sha256 = "0rzbdrs5d5a0icpxrqik2iaz8i5bacw6nm2caf75s9w9j0j6s9li";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-themes";
-          sha256 = "1j64w6dnxmq0rfycci9wfy2z5lbddsggf486pknxfgwwqgvns90l";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-themes";
+          sha256 = "0r7kyd0i0spwi7xkjrpm2kyphrsl3hqm5pw96nd3ia0jiwp8550j";
           name = "helm-themes";
         };
         packageRequires = [ helm ];
@@ -12513,7 +12661,7 @@
           sha256 = "14lbdvs9xdnipsn3lywbvgsqwqnbm8fxm6d1ilq0cj5z6zkxkya0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-unicode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-unicode";
           sha256 = "052xqzvcfzpsbl75ylqb1khqndvc2dqdymqlwivs0darlds0w8y4";
           name = "helm-unicode";
         };
@@ -12534,7 +12682,7 @@
           sha256 = "0s8zp3kx2kxlfyd26yr3lphwcybhbm8qa9vzmxr3kaylwy6jpz5q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-w32-launcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-w32-launcher";
           sha256 = "0bzn2vhspn6lla815qxwsl9gwfyiwgwmnysr6rjpyacmi17d73ri";
           name = "helm-w32-launcher";
         };
@@ -12555,7 +12703,7 @@
           sha256 = "1j6ssbjbm5ym3pg0icpfp735y4dfhlky9qhl9hwp2n3wmba5g9h1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/helm-zhihu-daily";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/helm-zhihu-daily";
           sha256 = "0hkgail60s9qhxl0pskqxjvfz93iq1qh1kcmcq0x5kq7d08b911r";
           name = "helm-zhihu-daily";
         };
@@ -12576,7 +12724,7 @@
           sha256 = "1s08sgbh5v59lqskd0s1dscs6dy7z5mkqqkabs3gd35agbfvbmlf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hi2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hi2";
           sha256 = "1wxkjg1jnw05lqzggi20jy2jl20d8brvv76vmrf6lnz62g6jv9h2";
           name = "hi2";
         };
@@ -12597,7 +12745,7 @@
           sha256 = "0c65jk00j88qxfki2g88hy9g6n92rzskwcn1fbmwcw3qgaz4b6w5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-blocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-blocks";
           sha256 = "1a32iv5kgf6g6ygbs559w156dh578k45m860czazfx0d6ap3k5m1";
           name = "highlight-blocks";
         };
@@ -12618,7 +12766,7 @@
           sha256 = "08czwa165rnd5z0dwwdddn7zi5w63sdk31l47bj0598kbly01n7r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-defined";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-defined";
           sha256 = "1vjxm35wf4c2qphpkjh57hf03a5qdssdlmfj0n0gwxsdw1q5rpms";
           name = "highlight-defined";
         };
@@ -12639,7 +12787,7 @@
           sha256 = "00l54k75qk24a0znzl4ij3s3nrnr2wy9ha3za8apphzlm98m907k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-indentation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-indentation";
           sha256 = "0iblrrbssjwfn71n8xxjcl98pjv1qw1igf3hlz6mh8740fsca3d6";
           name = "highlight-indentation";
         };
@@ -12660,7 +12808,7 @@
           sha256 = "0ffhc5s0h34064bix4qyiiyx30m4hpv0phmxwcrwiyvanj9ggfai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-numbers";
           sha256 = "1bywrjv9ybr65mwkrxggb52jdqn16z8acgs5vqm0faq43an8i5yv";
           name = "highlight-numbers";
         };
@@ -12681,7 +12829,7 @@
           sha256 = "08ld4wjrkd77cghmrf1n2hn2yzid7bdqwz6b1rzzqaiwxl138iy9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-parentheses";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-parentheses";
           sha256 = "1b0n9mz4a6baljvvgb881w53391smm35c9pwd45g861hk1qvrk5k";
           name = "highlight-parentheses";
         };
@@ -12702,7 +12850,7 @@
           sha256 = "1ahg9qzss67jpw0wp2izys6lyss4nqjy9320fpa4vdx39msdmjjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-quoted";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-quoted";
           sha256 = "0x6gxi0jfxvpx7r1fm43ikxlxilnbk2xbhdy9xivhgmmdyqiqqkl";
           name = "highlight-quoted";
         };
@@ -12723,7 +12871,7 @@
           sha256 = "09z13kv2g21kjjkkm3iyaz93sdjmdy2d563r8n7r7ng94acrn7f6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/highlight-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/highlight-symbol";
           sha256 = "0gw8ffr64s58qdbvm034s1b9xz1hynzvbk8ld67j06fxpc98qaj4";
           name = "highlight-symbol";
         };
@@ -12744,7 +12892,7 @@
           sha256 = "0hb74j5137yj3rm2si16xzwmcvkiwx8ywh1qrlnrzv5gl4viyjzb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hindent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hindent";
           sha256 = "1f3vzgnqigwbwvglxv0ziz3kyp5dxjraw3vlghkpw39f57mky4xz";
           name = "hindent";
         };
@@ -12765,7 +12913,7 @@
           sha256 = "0mzk4agkcaaw7gryi0wrxv0blqndqsjf1ivdvr2nrnqi798sdhbr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hippie-expand-slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hippie-expand-slime";
           sha256 = "0kxyv1lpkg33qgfv1jfqx03640py7525bcnc9dk98w6y6y92zf4m";
           name = "hippie-expand-slime";
         };
@@ -12786,7 +12934,7 @@
           sha256 = "0nfr8ad0klqwi97fjchvwx9mfc672lhv3ll166sr8vn6jlh7rkv0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hippie-namespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hippie-namespace";
           sha256 = "1bzjhq116ci9c9f0aw121fn3drmg2pw5ny1w6wcasa4p30syxxf0";
           name = "hippie-namespace";
         };
@@ -12807,7 +12955,7 @@
           sha256 = "0dy98sg92xvnr4algm2v2bnjcdwzv0b0vqk0312b0ziinkzisas1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/history";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/history";
           sha256 = "0s8pcz53bk1w4h5847204vb6j838vr8za66ni1b2y4pas76zjr5g";
           name = "history";
         };
@@ -12828,7 +12976,7 @@
           sha256 = "1mxicha6m61qxz1mv9z76x4g9fpqk4ch9i6jf7nnpxd6x4xz3f7z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/historyf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/historyf";
           sha256 = "15pcaqfjpkfwcy46yqqw10q8kpw7aamcg0gr4frbdgzbv0yld08s";
           name = "historyf";
         };
@@ -12849,7 +12997,7 @@
           sha256 = "12ab825dldiqymy4md8ssfnbbhrgczkwdiwd3llsdq6sayar16as";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-anything";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hl-anything";
           sha256 = "15n998nhirvg3f719b7x9s7jpqv6gzkr22kp4zbbq99lbx2wfc1k";
           name = "hl-anything";
         };
@@ -12870,7 +13018,7 @@
           sha256 = "1hgigbgppdhmr7rc901r95kyydjk05dck8mwbryh7kpglns365fa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-sentence";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hl-sentence";
           sha256 = "16sjfs0nnpwzj1cqfna9vhmxgznwwhb2qdmjci25hlgrdxwwyahs";
           name = "hl-sentence";
         };
@@ -12891,7 +13039,7 @@
           sha256 = "1fsyj9cmqcz5nfxsfcyvpq2vqrhgl99xvq7ligviawl3x77376kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-sexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hl-sexp";
           sha256 = "0kg0m20i9ylphf4w0qcvii8yp65abdl2q5flyphilk0jahwbj9jy";
           name = "hl-sexp";
         };
@@ -12912,7 +13060,7 @@
           sha256 = "07irwpg794fdzsixmcbi1lnafj5gynhrdam7frcpmvb26a0l8fxq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hl-todo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hl-todo";
           sha256 = "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4";
           name = "hl-todo";
         };
@@ -12933,7 +13081,7 @@
           sha256 = "1wg6vc9swwspi6s6jpig3my83i2pq8vkq2cy1q3an87rczacmfzp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hoa-pp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hoa-pp-mode";
           sha256 = "01ijfn0hd645j6j88rids5dsanmzwmky37slf50yqffnv69jwvla";
           name = "hoa-pp-mode";
         };
@@ -12954,7 +13102,7 @@
           sha256 = "1n8r4jrk71dg25ca6bsw11ky0dszdj4pvqwsmy3msqlji1ckvqyn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/homebrew-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/homebrew-mode";
           sha256 = "088wc5fq4r5yj1nbh7mriyqf0xwqmbxvblj9d2wwrkkdm5flc8mj";
           name = "homebrew-mode";
         };
@@ -12975,7 +13123,7 @@
           sha256 = "1yvz9d5h7npxhsdf6s9fgxpmqk5ixx91iwivbhzcz935gs2886hc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hookify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hookify";
           sha256 = "0prls539ifk2fsqklcxmbrwmgbm9hya50z486d7sw426lh648qmy";
           name = "hookify";
         };
@@ -12996,7 +13144,7 @@
           sha256 = "0k09n66jar0prq9aal2h3izp1y67jibdx0gjr0g4jx1p1yxig1dg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ht";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ht";
           sha256 = "16vmxksannn2wyn8r44jbkdp19jvz1bg57ggbs1vn0yi7nkanwbd";
           name = "ht";
         };
@@ -13017,7 +13165,7 @@
           sha256 = "0c648dl5zwjrqx9n6zr6nyzx2zcnv05d5i4hvhjpl9q3y011ncns";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/html-to-markdown";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/html-to-markdown";
           sha256 = "1gjh9ndqsb3nfb7w5h7carjckkgy6qh63b4mg141j19dsyx9rrjv";
           name = "html-to-markdown";
         };
@@ -13038,7 +13186,7 @@
           sha256 = "1h9n388fi17nbyfciqywgrq3n165kpiildbimx59qyk2ac3v7rqk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/httpcode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/httpcode";
           sha256 = "05k1al1j119x6zf03p7jn2r9qql33859583nbf85k41bhicknpgh";
           name = "httpcode";
         };
@@ -13059,7 +13207,7 @@
           sha256 = "0dd257988bdar9hl2711ch5qshx9jc11fqxcvbrd7rc1va5cshs9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/httprepl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/httprepl";
           sha256 = "0899qb1yfnsyf04hhvnk47qnq4d1f4vd5ghj43x4743wd2b9qawh";
           name = "httprepl";
         };
@@ -13080,7 +13228,7 @@
           sha256 = "1b8992vzq5bh01pjlj181nzqjrqs4fbjpwvv8h7gjq42sf8w59sm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hyai";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hyai";
           sha256 = "00ns7q5b11c5amwkq11fs4p5vrmdfmjljfrcxbwb39gc12yrhn7s";
           name = "hyai";
         };
@@ -13101,7 +13249,7 @@
           sha256 = "0nwsmc4c3v0wbfy917ik9k7yz8yclfac695p7p9sh9y354k3maw4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hyde";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hyde";
           sha256 = "18kjcxm7qmv9bfh4crw37zgax8khjqs9zkp4lrb490zlad2asbs3";
           name = "hyde";
         };
@@ -13122,7 +13270,7 @@
           sha256 = "08iw95lyizcyf6cjl37fm8wvay0vsk9758pk9gq9f2xiafcchl7f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/hydra";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/hydra";
           sha256 = "1c59l43p39ins3dn9690gm6llwm4b9p0pk78lip0dwlx736drdbw";
           name = "hydra";
         };
@@ -13143,7 +13291,7 @@
           sha256 = "1zcnp61c9cp2kvns3v499hifk072rxm4rhw4pvdv2mm966vcxzvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ibuffer-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ibuffer-projectile";
           sha256 = "1qh4krggmsc6lx5mg60n8aakmi3f6ppl1gw094vfcsni96jl34fk";
           name = "ibuffer-projectile";
         };
@@ -13164,7 +13312,7 @@
           sha256 = "0bqdi5w120256g74k0j4jj81x804x1gcg4dxa74w3mb6fl5xlvs8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ibuffer-vc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ibuffer-vc";
           sha256 = "0bn5qyiq07cgzci10xl57ss5wsk7bfhi3hjq2v6yvpy9v704dvla";
           name = "ibuffer-vc";
         };
@@ -13185,7 +13333,7 @@
           sha256 = "047gzycr49cs8wlmm9j4ry7b7jxmfhmbayx6rbbxs49lba8dgwlk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/identica-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/identica-mode";
           sha256 = "1r69ylykjap305g23cry4wajiqhpgw08nw3b5d9i1y3mwx0j253q";
           name = "identica-mode";
         };
@@ -13206,7 +13354,7 @@
           sha256 = "0x4w1ksrw7dicl84zpf4d4scg672dyan9g95jkn6zvri0lr8xciv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/idle-highlight-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/idle-highlight-mode";
           sha256 = "1i5ky61bq0dpk71yasfpjhsrv29mmp9nly9f5xxin7gz3x0f36fc";
           name = "idle-highlight-mode";
         };
@@ -13227,7 +13375,7 @@
           sha256 = "1ffmsmi31jc0gqnbdxrd8ipsy790bn6hgq3rmayylavmdpg3qfd5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-complete-space-or-hyphen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-complete-space-or-hyphen";
           sha256 = "1wk0cq5gjnprmpyvhh80ksz3fash42hckvmx8m95crbzjg9j0gbc";
           name = "ido-complete-space-or-hyphen";
         };
@@ -13240,15 +13388,15 @@
     ido-completing-read-plus = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-completing-read-plus";
-        version = "3.10";
+        version = "3.12";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "1a97a38f2d1a51371853e44da659caa6baf78cbe";
-          sha256 = "0byairx5nxbzgdyiw658p7yiysfr7r1bd3b2prawq72bslb1c5cn";
+          rev = "a491b106d9da87bfe45121078563389a77f8788c";
+          sha256 = "1ddy590xgv982zsgs1civqy0ch0a88z98qhq0bqqjivf9gq3v0pf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-completing-read+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-completing-read+";
           sha256 = "034j1q47d57ia5bwbf1w66gw6c7aqbhscpy3dg2a71lwjzfmshwh";
           name = "ido-completing-read-plus";
         };
@@ -13269,7 +13417,7 @@
           sha256 = "0055dda1la7yah33xsi19j4hcdmqp17ily2dvkipm4y6d3ww8yqa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-describe-bindings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-describe-bindings";
           sha256 = "1lsa09h025vd908r9q571iq2ia0zdpnq04mlihb3crpp5v9n9ws2";
           name = "ido-describe-bindings";
         };
@@ -13290,7 +13438,7 @@
           sha256 = "0f1p6cnl0arcc2y1h99nqcflp7byvyf6hj6fmv5xqggs66qc72lb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-grid-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-grid-mode";
           sha256 = "1wl1yclcxmkbfnvp0il23csdf6gprzf7fkcknpivk784fhl19acr";
           name = "ido-grid-mode";
         };
@@ -13311,7 +13459,7 @@
           sha256 = "1z7az7h90v72llxvdclcywvf1qd0nhkfa45bp99xi7cy7sqsqssf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-load-library";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-load-library";
           sha256 = "13f83gqh39p3yjy7r7qc7kzgdcmqh4b5c07zl7rwzb8y9rz59lhj";
           name = "ido-load-library";
         };
@@ -13332,7 +13480,7 @@
           sha256 = "0j12li001yq08vzwh1b25qyq09llizrkgaay9k07g9pvfxlx6zb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-occur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-occur";
           sha256 = "058l2pklg12wkvyyshk8va6shphpbc508fv9a8x25pw857a28pji";
           name = "ido-occur";
         };
@@ -13342,22 +13490,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild, s }:
+    ido-ubiquitous = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-ubiquitous";
-        version = "3.10";
+        version = "3.12";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-ubiquitous";
-          rev = "1a97a38f2d1a51371853e44da659caa6baf78cbe";
-          sha256 = "0byairx5nxbzgdyiw658p7yiysfr7r1bd3b2prawq72bslb1c5cn";
+          rev = "a491b106d9da87bfe45121078563389a77f8788c";
+          sha256 = "1ddy590xgv982zsgs1civqy0ch0a88z98qhq0bqqjivf9gq3v0pf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-ubiquitous";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-ubiquitous";
           sha256 = "143pzpix9aqpzjy8akrxfsxmwlzc9bmaqzp9fyhjgzrhq7zchjsp";
           name = "ido-ubiquitous";
         };
-        packageRequires = [ cl-lib emacs ido-completing-read-plus s ];
+        packageRequires = [ cl-lib emacs ido-completing-read-plus ];
         meta = {
           homepage = "http://melpa.org/#/ido-ubiquitous";
           license = lib.licenses.free;
@@ -13374,7 +13522,7 @@
           sha256 = "1lv82q639xjnmvby56nwqn23ijh6f163bk675s33dkingm8csj8k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-vertical-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-vertical-mode";
           sha256 = "1vg5s6nd6v2g8ychz1q9cdqvsdw6vag7d9w68sn7blpmlr0nqhfm";
           name = "ido-vertical-mode";
         };
@@ -13384,22 +13532,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    ido-yes-or-no = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    ido-yes-or-no = callPackage ({ fetchFromGitHub, fetchurl, ido-completing-read-plus, lib, melpaBuild }:
     melpaBuild {
         pname = "ido-yes-or-no";
-        version = "1.2";
+        version = "1.4";
         src = fetchFromGitHub {
           owner = "DarwinAwardWinner";
           repo = "ido-yes-or-no";
-          rev = "ff9d28ca86c8cbfe2fbeb3ee1a60e3983aa776e4";
-          sha256 = "0i3s80ws3qbhb3vsvf09mbq661c5140v4phgbl4cz6z545ha2bj7";
+          rev = "9ddee9e878ad62d58c9f4b3a7685f22b8e36e420";
+          sha256 = "046ns1nqisz830f6xwlly1qgmi4v2ikw6vmj0f93jprv4vkjylpq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ido-yes-or-no";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ido-yes-or-no";
           sha256 = "0glag4yb9xyf1lxxbdhph2nq6s1vg44i6f2z1ii8bkxpambz2ana";
           name = "ido-yes-or-no";
         };
-        packageRequires = [];
+        packageRequires = [ ido-completing-read-plus ];
         meta = {
           homepage = "http://melpa.org/#/ido-yes-or-no";
           license = lib.licenses.free;
@@ -13416,7 +13564,7 @@
           sha256 = "0bq0kx0889rdy8aasxbpmb0a4awpk2b24zv6x1dmhacmc5rj11i0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/idomenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/idomenu";
           sha256 = "0mg601ak9mhp2fg5n13npcfzphgyms4vkqd18ldmv098z2z1412h";
           name = "idomenu";
         };
@@ -13437,7 +13585,7 @@
           sha256 = "0iwgbaq2797k1f7ql86i2pjfa67cha4s2v0mgmrd0qcgqkxsdq92";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/idris-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/idris-mode";
           sha256 = "0hiiizz976hz3z3ciwg1gs9y10qhxbs8givhz89kvyn4s4861a1s";
           name = "idris-mode";
         };
@@ -13458,7 +13606,7 @@
           sha256 = "06qv95bgcb6n3zcjs2i1q80v9040z7m9pb9xbhxmqzcx68vpbpdm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/iedit";
           sha256 = "02gjshvkcvyr58yf6vlg3s2pzls5sd54xpxggdmqajfg8xmpkq04";
           name = "iedit";
         };
@@ -13479,7 +13627,7 @@
           sha256 = "18rlyjsn9w0zbs0c002s84qzark3rrcmjn9vq4nap7i6zpaq8hki";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iflipb";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/iflipb";
           sha256 = "1nfrrxgi9nlhn477z8ay7jxycpcghhhmmg9dagdhrlrr20fx697d";
           name = "iflipb";
         };
@@ -13500,7 +13648,7 @@
           sha256 = "1j40ldvgd7nr7pabi8mhzdvi0ml9n62m8mfjlh9nrbnkcsifs9rk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ignoramus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ignoramus";
           sha256 = "1czqdmlrds1l5afi8ldg7nrxcwav86538z2w1npad3dz8xk67da9";
           name = "ignoramus";
         };
@@ -13521,7 +13669,7 @@
           sha256 = "0imvxzcja91cd19zm2frqfpxm8j0bc89w9s7q0pkpvyjz44kjbq8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/image-archive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/image-archive";
           sha256 = "0x0lv5dr1gc9bnr3dn26bc9s1ccq2rp8c4a1licbi929f0jyxxfp";
           name = "image-archive";
         };
@@ -13542,7 +13690,7 @@
           sha256 = "1n2ya9s0ld257a8iryjd0dz0z2zs1xhzfiwsdkq4l4azwxl54m29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/image-dired+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/image-dired+";
           sha256 = "0hhwqfn490n7p12n7ij4xbjh15gfvicmn21fvwbnrmfqc343pcdy";
           name = "image-dired-plus";
         };
@@ -13563,7 +13711,7 @@
           sha256 = "0k69xbih0273xvmj035vcmm67l6hgjb99pb1jbva5x0pnszb1vdv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/image+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/image+";
           sha256 = "1a9dxswnqn6cvx28180kclpjc0vc6fimzp7n91gpdwnmy123x6hg";
           name = "image-plus";
         };
@@ -13584,7 +13732,7 @@
           sha256 = "0qc96p5f7paxaxzv73w072cba8jb6ibdbhml7n7cm85b0rz1wf16";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imenu-anywhere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/imenu-anywhere";
           sha256 = "0p93g7ay9n4nhf1qk24mbax0w9sr06xd2kjmrz00gbg75sr9r2s8";
           name = "imenu-anywhere";
         };
@@ -13597,15 +13745,15 @@
     imenu-list = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "imenu-list";
-        version = "0.4";
+        version = "0.5";
         src = fetchFromGitHub {
           owner = "bmag";
           repo = "imenu-list";
-          rev = "1324cffd571df5e35113efc57e1cdc8490068f9c";
-          sha256 = "192i3iaykw5a9fb9xaivfjj2pbziqdnadlrvqbxbl9h5wi52qq9c";
+          rev = "a68d596b437ce1c125d8bd5414467ca1ff55bdcc";
+          sha256 = "1j0p0zkk89lg5xk5qzdnj9nxxiaxhff2y9iv9lw456kvb3lsyvjk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imenu-list";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/imenu-list";
           sha256 = "092fsn7hnbfabcyakbqyk20pk62sr8xrs45aimkv1l91681np98s";
           name = "imenu-list";
         };
@@ -13626,7 +13774,7 @@
           sha256 = "18nx5z2vn0ikv4gxjprsqr63pcgf9s02gc3f769h8dji560kqxd4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imenus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/imenus";
           sha256 = "1q0j6r2n5vjlbgchkz9zdglmmbpd8agawzcg61knqrgzpc4lk82r";
           name = "imenus";
         };
@@ -13647,7 +13795,7 @@
           sha256 = "19jqcbiwqknlpij9q63m1p69k4zb3v1qdx0858drprc2rl1p55cd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/imgix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/imgix";
           sha256 = "0dh7qsz5c9mflldcw60vc8mrxrw76n2ydd7blv6jfmsnr19ila4q";
           name = "imgix";
         };
@@ -13668,7 +13816,7 @@
           sha256 = "1pf7pqh8yzyvh4gzvp5npfq8kcfjcbzra0kkw7zmz769xxc8v84x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/immutant-server";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/immutant-server";
           sha256 = "15vcxag1ni41ja4b3q0444sq5ysrisis59la7li6h3617wy8r02i";
           name = "immutant-server";
         };
@@ -13689,7 +13837,7 @@
           sha256 = "00gpyz63lqb2ydvjxjagf2cpja8gw6xbyw82cdj64k53mn86cyvl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/import-js";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/import-js";
           sha256 = "1grvzy378qj14wlbmhb3j7fx2zkl9wp65b5g0brjimav08nz7bls";
           name = "import-js";
         };
@@ -13710,7 +13858,7 @@
           sha256 = "0ycsdwwfb27g85aby4jix1aj41a4vq6bf541iwla0xh3wsyxb01w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/import-popwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/import-popwin";
           sha256 = "0vkw6y09m68bvvn1wzah4gzm69z099xnqhn359xfns2ljm74bvgy";
           name = "import-popwin";
         };
@@ -13731,7 +13879,7 @@
           sha256 = "1dmr1arqy2vs9jdjha513mvw3yfwgkn4zs728q83asjy91sfcz7k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inf-clojure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inf-clojure";
           sha256 = "0n8w0vx1dnbfz88j45a57z9bsmkxr2zyh6ld72ady8asanf17zhl";
           name = "inf-clojure";
         };
@@ -13752,7 +13900,7 @@
           sha256 = "11zsprv5ycnfqi358dd4cx70dbn6a8hccd4prf28lln7vhldbmjz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inf-ruby";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inf-ruby";
           sha256 = "02f01vwzr6j9iqcdns4l579bhia99sw8hwdqfwqjs9gk3xampfpp";
           name = "inf-ruby";
         };
@@ -13773,7 +13921,7 @@
           sha256 = "1fm69g4mrmdchvxr062bk7n1jvs2rrscddb02cldb5bgdrcw8g6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inflections";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inflections";
           sha256 = "0f02bhm2a5xiaxnf2c2hlpa4p121xfyyj3c59fy0yldipdxhvw70";
           name = "inflections";
         };
@@ -13794,7 +13942,7 @@
           sha256 = "031vb7ndz68x0119v4pyizz0ykd341ywcp5s7i4z35zx1vcqj8az";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/init-loader";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/init-loader";
           sha256 = "0rq7759abp0ml0l8dycvdl0j5wsxw9z5y9pyx68973a4ssbx2i0r";
           name = "init-loader";
         };
@@ -13815,7 +13963,7 @@
           sha256 = "06w1vnfhjy8g62z6xajin5akgh30pa0kk56am61kv6mi5ia8fc96";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/init-open-recentf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/init-open-recentf";
           sha256 = "0xlmfxhxb2car8vfx7krxmxb3d56x0r3zzkj8ds7yqvr65z85x2r";
           name = "init-open-recentf";
         };
@@ -13836,7 +13984,7 @@
           sha256 = "1rfw38a63bvzglqx7mb8wlnzjvlmkhkn35hn66snqqgvnmnvi54g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/initsplit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/initsplit";
           sha256 = "0n9dk3x62vgxfn39jkmdg8wxsik0xqkprifgvqzyvn8xcx1blyyq";
           name = "initsplit";
         };
@@ -13857,7 +14005,7 @@
           sha256 = "0jipds844432a8m4d5gxbbkk2h1rsq9fg748g6bxy2q066kyzfz6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inline-crypt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inline-crypt";
           sha256 = "04mcyyqa9h6g6wrzphzqalpqxsndmzxpavlpdc24z4a2c5s3yz8n";
           name = "inline-crypt";
         };
@@ -13878,7 +14026,7 @@
           sha256 = "15nasjknmzy57ilj1gaz3w5sj8b3ijcpgwcd6w2r9xhgcl86m40q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/inlineR";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/inlineR";
           sha256 = "1fflq2gkpfn3jkv4a6yywzmxsq6qszfid1ri85ass1ppw6scdvzw";
           name = "inlineR";
         };
@@ -13899,7 +14047,7 @@
           sha256 = "1mqnz40zirnyn3wa71wzzjph3a0sbgvzcywcr7xnzqpl6sp7g93f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/insert-shebang";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/insert-shebang";
           sha256 = "0z88l1q925v9lwzr6nas9qjy0f57qxilg6smgpx9wj6lll3f7p5v";
           name = "insert-shebang";
         };
@@ -13919,7 +14067,7 @@
           sha256 = "0krscid3yz2b7kv75gd9fs92zgfl7pnl77dbp5gycv5rmw5mivp8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/instapaper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/instapaper";
           sha256 = "1yibdpj3lx6vr33s75s1y415lxqljrk7pqc901f8nfa01kca7axn";
           name = "instapaper";
         };
@@ -13932,15 +14080,15 @@
     interleave = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "interleave";
-        version = "1.0.0";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "rudolfochrist";
           repo = "interleave";
-          rev = "d7bfe03dfdfbdd2abd0a96174cacd2ef1ecd2041";
-          sha256 = "1bidhc4pgszx2gqsm125nw7i5ysy0mzc1ifcfkfgns1cpjr74rpn";
+          rev = "6b28363eac939227c6cdc8a73a1d3ea5b002442d";
+          sha256 = "1qs6j9cz152wfy54c5d1a558l0df6wxv3djlvfl2mx58wf0sk73h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/interleave";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/interleave";
           sha256 = "18b3fpxn07y5abkcnaw9is9ihdhik7xjdj6kzl1pz958lk9f4hfy";
           name = "interleave";
         };
@@ -13961,7 +14109,7 @@
           sha256 = "043dnij48zdyg081sa7y64lm35z7zvrv8gcymv3l3a98r1yhy3v6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/iplayer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/iplayer";
           sha256 = "0wnxvdlnvlmspqsaqx0ldw8j03qjckkqzvx3cbpc2yfs55pm3p7r";
           name = "iplayer";
         };
@@ -13982,7 +14130,7 @@
           sha256 = "036q933yw7pimnnq43ydaqqfccgf4iwvjhjmsavp7l6y1w16rvmy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ir-black-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ir-black-theme";
           sha256 = "1qpq9zbv63ywzk5mlr8x53g3rn37k0mdv6x1l1hcd90gka7vga9v";
           name = "ir-black-theme";
         };
@@ -14003,7 +14151,7 @@
           sha256 = "1wsh72dzm54srxdnlhnmbi8llc30syhbckycj5wmsamw8b89p7c2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/irony";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/irony";
           sha256 = "1xcxrdrs7imi31nxpszgpaywq4ivni75hrdl4zzrf103xslqpl8a";
           name = "irony";
         };
@@ -14024,7 +14172,7 @@
           sha256 = "09hx28lmldm7z3x22a0qx34id09fdp3z61pdr61flgny213q1ach";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/isgd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/isgd";
           sha256 = "0yc9mkjzj3w64f48flnjvd193mk9gndrrqbxz3cvmvq3vgahhzyi";
           name = "isgd";
         };
@@ -14045,7 +14193,7 @@
           sha256 = "0rpxh1jv98dl9b5ldjkljk70z4hkl61kcmvy1lhpj3lxn8ysv87a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ix";
           sha256 = "1fl76dk8vgw3mrh5iz99lrsllwya6ij9d1lj3szcrs4qnj0b5ql3";
           name = "ix";
         };
@@ -14066,7 +14214,7 @@
           sha256 = "07kbicf760nw4qlb2lkf1ns8yzqy0r5jqqwqjbsnqxx4sm52hml9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/j-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/j-mode";
           sha256 = "0f9lsr9hjhdvmzx565ivlncfzb4iq4rjjn6a41053cjy50bl066i";
           name = "j-mode";
         };
@@ -14085,7 +14233,7 @@
           sha256 = "af89d7052e555c7b5efb0c21387a50699056659fb83698691b70e75c88e4cd34";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jabber";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jabber";
           sha256 = "1g5pc80n3cd5pzs3hmpbnmxbldwakd72pdn3vvb0h26j9v073pa8";
           name = "jabber";
         };
@@ -14106,7 +14254,7 @@
           sha256 = "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jade-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jade-mode";
           sha256 = "156j0d9wx6hrhph0nsjsi1jha4h65rcbrbff1j2yr8vdsszjrs94";
           name = "jade-mode";
         };
@@ -14127,7 +14275,7 @@
           sha256 = "0x0vz7m9kn7b2aiqvrdqx8qh84ynbpzy2asz2b18l47bcwa7r5bh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jammer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jammer";
           sha256 = "01c4bii7gswhp6z9dgx4bhvsywiwbbdv7mg1zj6vp1530l74zx6z";
           name = "jammer";
         };
@@ -14148,7 +14296,7 @@
           sha256 = "08gkxxaw789g1r0dql11skz6i8bdrrz4wp87fzs9f5rgx99xxr6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/japanlaw";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/japanlaw";
           sha256 = "1pxss1mjk5660k80r1xqgslnbrsr6r4apgp9abjwjfxpg4f6d0sa";
           name = "japanlaw";
         };
@@ -14169,7 +14317,7 @@
           sha256 = "1bngn6v6w60qb3zz7s3px7v3wk99a3hfvzrg9l06dz1q7xgyvsi1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/java-imports";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/java-imports";
           sha256 = "1waz6skyrm1n8wpc0pwa652l11wz8qz1m89mqxk27k3lwyd84n98";
           name = "java-imports";
         };
@@ -14182,15 +14330,15 @@
     javadoc-lookup = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "javadoc-lookup";
-        version = "1.0.0";
+        version = "1.1.0";
         src = fetchFromGitHub {
           owner = "skeeto";
           repo = "javadoc-lookup";
-          rev = "0d5316407c9ec183040ca5c6ab71091b9444276f";
-          sha256 = "0ljpqgp2w3lr61n2vr748n3wyshlqnnbin0643jffa319l99z35r";
+          rev = "507a2dd443d60b537b8f779c1847e2cd0ccd1382";
+          sha256 = "16gywcma1s8kslwznlxwlx0xj0gs5g31637kb74vfdplk48f04zj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/javadoc-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/javadoc-lookup";
           sha256 = "1fffs0iqkk9rg5vbxifvn09j4i2751p81bzcvy5fslr3r1r2nv79";
           name = "javadoc-lookup";
         };
@@ -14211,7 +14359,7 @@
           sha256 = "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jedi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jedi";
           sha256 = "1777060q25k9n2g6h1lm5lkki900pmjqkxq72mrk3j19jr4pk9m4";
           name = "jedi";
         };
@@ -14232,7 +14380,7 @@
           sha256 = "0xbp9fcxgbf298w05hvf52z41kk7r52975ailgdn8sg60xc98fa7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jedi-core";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jedi-core";
           sha256 = "0pzi32zdb4g9n4kvpmkdflmqypa7nckmnjq60a3ngym4wlzbb32f";
           name = "jedi-core";
         };
@@ -14242,18 +14390,39 @@
           license = lib.licenses.free;
         };
       }) {};
+    jq-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "jq-mode";
+        version = "0.1.0";
+        src = fetchFromGitHub {
+          owner = "ljos";
+          repo = "jq-mode";
+          rev = "7f03354a4c1e26796482c39ce543d1d1f075a18d";
+          sha256 = "0ws0297v6sairvsk665wrfzymfi599g5ljshfnpmi81qnnnbwjgf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jq-mode";
+          sha256 = "1xvh641pdkvbppb2nzwn1ljdk7sv6laq29kdv09kxaqd89vm0vin";
+          name = "jq-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/jq-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     js-comint = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, nvm }:
     melpaBuild {
         pname = "js-comint";
-        version = "0.0.3";
+        version = "0.0.4";
         src = fetchFromGitHub {
           owner = "redguardtoo";
           repo = "js-comint";
-          rev = "69c8475573f1ef1f59331027a0fe445161b51000";
-          sha256 = "1gf6ir4viy8zr9fwmjz4s7zkr3m7947sa8mai56bnv83r2k3s9ir";
+          rev = "c4114b41db94ef17720b67cb2b714d670f453cc4";
+          sha256 = "1f1zad423q5adycbbh62094m622gl8ncwbr8vxad1a6zcga70cgi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js-comint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js-comint";
           sha256 = "0jvkjb0rmh87mf20v6rjapi2j6qv8klixy0y0kmh3shylkni3an1";
           name = "js-comint";
         };
@@ -14274,7 +14443,7 @@
           sha256 = "0d2hqlgm09rw0azha5dxmq63b56sa8b9qj7gd7invibl6nnyjh4a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js2-closure";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js2-closure";
           sha256 = "19732bf98lk2ah2ssgkr1ngxx7rz3nhsiw84lsfmydb0vvm4fpk7";
           name = "js2-closure";
         };
@@ -14295,7 +14464,7 @@
           sha256 = "0r2szaxr3q0gvxqd9asn03q8jf3nclxv4mqdsjn96s98n45x388l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js2-highlight-vars";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js2-highlight-vars";
           sha256 = "07bq393g2jy8ydvaqyqn6vdyfvyminvgi239yvwzg5g9a1xjc475";
           name = "js2-highlight-vars";
         };
@@ -14316,7 +14485,7 @@
           sha256 = "0xj87grvg7pbhh4d239gaqai5gl72klhpp9yksaqn77qnm98q4fn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js2-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js2-mode";
           sha256 = "0f9cj3n55qnlifxwk1yp8n1kfd319jf7qysnkk28xpvglzw24yjv";
           name = "js2-mode";
         };
@@ -14337,7 +14506,7 @@
           sha256 = "08wxsz90x5zhma3q8kqfd01avhzxjmcrjc95s757l5xaynsc2bly";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js2-refactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js2-refactor";
           sha256 = "09dcfwpxxyw0ffgjjjaaxbsj0x2nwfrmxy1a05h8ba3r3jl4kl1r";
           name = "js2-refactor";
         };
@@ -14358,7 +14527,7 @@
           sha256 = "17d0nf1kz7mgv5qz57q6khy4w5vrmsliqirggahk9s6nnsx1j56n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/js3-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/js3-mode";
           sha256 = "12s5qf6zfcv4m5kqxvh9b4zgwf433x39a210d957gjjp5mywbb1r";
           name = "js3-mode";
         };
@@ -14379,7 +14548,7 @@
           sha256 = "0pjmslxwmlb9cb3j5qfsyxq1lg1ywzw1p9dvj330c2m7nla1j70x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jsfmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jsfmt";
           sha256 = "1syy32sv2d57b3gja0ly65h36mfnyq6hzf5lnnl3r58yvbdzngqd";
           name = "jsfmt";
         };
@@ -14400,7 +14569,7 @@
           sha256 = "0sxkp9m68rvff8dbr8jlsx85w5ngifn19lwhcydysm7grbwzrdi3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/json-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/json-mode";
           sha256 = "014j10wgxsqy6d6aksnkz2dr5cmpsi8c7v4a825si1vgb4622a70";
           name = "json-mode";
         };
@@ -14421,7 +14590,7 @@
           sha256 = "0qp4n2k6s69jj4gwwimkpadjv245y54wk3bxb1x96f034gkp81vs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/json-reformat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/json-reformat";
           sha256 = "1m5p895w9qdgb8f67xykhzriribgmp20a1lvj64iap4aam6wp8na";
           name = "json-reformat";
         };
@@ -14442,7 +14611,7 @@
           sha256 = "05zsgnk7grgw9jzwl80h5sxfpifxlr37b4mkbvx7mjq4z14xc2jw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/json-snatcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/json-snatcher";
           sha256 = "0f6j9g3c5fz3wlqa88706cbzinrs3dnfpgsr2d3h3117gic4iwp4";
           name = "json-snatcher";
         };
@@ -14463,7 +14632,7 @@
           sha256 = "1wx28rr5dk238yz07xn95v88qmv10c1gz9pcxard2kszpnmrn6dx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jsx-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jsx-mode";
           sha256 = "1lnjnyn8qf3biqr92z443z6b58dly7glksp1g986vgqzdprq3n1b";
           name = "jsx-mode";
         };
@@ -14484,7 +14653,7 @@
           sha256 = "0kvk1qiy2cj0iw2c0mx0dyr3jjvhyj1gwym6l43n7clp5kqcij1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/julia-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/julia-mode";
           sha256 = "0c5bdgh98hw7484s2is84af7hznd8c4z5vlzfd98s8qxi7bldqjm";
           name = "julia-mode";
         };
@@ -14505,7 +14674,7 @@
           sha256 = "1fm69g4mrmdchvxr062bk7n1jvs2rrscddb02cldb5bgdrcw8g6j";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jump";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jump";
           sha256 = "18g0fa9g8m9jscsm6pn7jwdq94l4aj0dfhrv2hqapq1q1x537364";
           name = "jump";
         };
@@ -14526,7 +14695,7 @@
           sha256 = "1s9plmg323m1p625xqnks0yqz0zlsjacdj7pv8f783r0d9jmfq3s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jump-to-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jump-to-line";
           sha256 = "09ifhsggl5mrb6l8nqnl38yph0v26v30y98ic8hl23i455hqkkdr";
           name = "jump-to-line";
         };
@@ -14547,7 +14716,7 @@
           sha256 = "1785nsv61m51lpykai2wxrv6zmwbm5654v937fgw177p37054s83";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/jvm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/jvm-mode";
           sha256 = "1r283b4s0pzq4hgwcz5cnhlvdvq4gy0x51g3vp0762s8qx969a5w";
           name = "jvm-mode";
         };
@@ -14568,7 +14737,7 @@
           sha256 = "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kaesar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kaesar";
           sha256 = "0zhi1dv1ay1azh7afq4x6bdg91clwpsr13nrzy7539yrn9sglj5l";
           name = "kaesar";
         };
@@ -14589,7 +14758,7 @@
           sha256 = "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kaesar-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kaesar-file";
           sha256 = "0dcizg82maad98mbqqw5lamwz7n2lpai09jsrc66x3wy8k784alc";
           name = "kaesar-file";
         };
@@ -14610,7 +14779,7 @@
           sha256 = "03l9w238a5kyfin3v1fy1q2pl0gvmb87j0v89g6nk114s7m4y3r8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kaesar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kaesar-mode";
           sha256 = "0yqnlchbpmhsqc8j531n08vybwa32cy0v9sy4f9fgxa90rfqczry";
           name = "kaesar-mode";
         };
@@ -14631,7 +14800,7 @@
           sha256 = "0b6af8hnrn0v4z1xpahjfpw5iga2bmgd3qwfn3is2rygsn5rkm40";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kakapo-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kakapo-mode";
           sha256 = "0a99cqflpzasl4wcmmf99aj8xgywkym37j7mvnsajrsk5wawdlss";
           name = "kakapo-mode";
         };
@@ -14652,7 +14821,7 @@
           sha256 = "0avcg307r4navvgj3hjkggk4gr7mzs4mljhxh223r8g69l9bm6m8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/karma";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/karma";
           sha256 = "19wl7js7wmw7jv2q3l4r5zl718lhy2a0jhl79k57ihwhxdc58fwc";
           name = "karma";
         };
@@ -14673,7 +14842,7 @@
           sha256 = "14ijniyvcfmj4y77yhiplsclincng2r3jbdnmmdnwzliv65f7l6q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/key-combo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/key-combo";
           sha256 = "1v8saw92jphvjkyy7j9jx7cxzgisl4zpf4wjzdjfw3la5lz11waf";
           name = "key-combo";
         };
@@ -14694,7 +14863,7 @@
           sha256 = "05vpydcgiaya35b62cdjxna9y02vnwzzg6p8jh0dkr9k44h4iy3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/key-seq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/key-seq";
           sha256 = "166k6hl9vvsnnksvhrv5cbhv9bdiclnbfv7qf67q4c1an9xzqi74";
           name = "key-seq";
         };
@@ -14715,7 +14884,7 @@
           sha256 = "07h6s1wdc83cqf08vqm4gh2r7bihbar4a31wr0140fn4rbhicwdw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keychain-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/keychain-environment";
           sha256 = "1w77cg00bwx68h0d6k6r1fzwdwz97q12ch2hmpzjnblqs0i4sv8v";
           name = "keychain-environment";
         };
@@ -14736,7 +14905,7 @@
           sha256 = "0dkc51bmix4b8czs2wg6vz8vk32qlll1b9fjmx6xshrxm85cyhvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keydef";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/keydef";
           sha256 = "0yb2vgj7abyg8j7qmv74nsanv50lf350q1m58rjv8wm31yykg992";
           name = "keydef";
         };
@@ -14757,7 +14926,7 @@
           sha256 = "0ways4ksb9pk2kkpgclsxgc0ycfwcr8vghlbv5ic4y0c4ycmlb2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keyfreq";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/keyfreq";
           sha256 = "1rw6hzmw7h5ngvndy7aa41pq911y2hr9kqc9w4gdd5v2p4ln1qh7";
           name = "keyfreq";
         };
@@ -14778,7 +14947,7 @@
           sha256 = "06ajkqxv71hcrwc707ybzwfw4yzbsp6basnbs493ryr41gnvmnzs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keymap-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/keymap-utils";
           sha256 = "0nbcwz4nls0pva79lbx91bpzkl38g98yavwkvg2rxbhn9vjbhzs9";
           name = "keymap-utils";
         };
@@ -14799,7 +14968,7 @@
           sha256 = "0z6sgz8nywsd00zaayafwy5hfi7kzxfifjkfr5cn1l7wlypyksfv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/keyset";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/keyset";
           sha256 = "1kfw0pfb6qm2ji1v0kb8xgz8q2yd2k9kxmaz5vxcdixdlax3xiqg";
           name = "keyset";
         };
@@ -14820,7 +14989,7 @@
           sha256 = "0ky167xh1hrmqsldybzjhyqjizgjzs1grn5mf8sm2j9qwcvjw2zv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kibit-helper";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kibit-helper";
           sha256 = "15viybjqksylvm5ash2kzsil0cpdka56wj1rryixa8y1bwlj8y4s";
           name = "kibit-helper";
         };
@@ -14841,7 +15010,7 @@
           sha256 = "1c5al7cyfnb0p5ya2aa5afadzbrrc079jx3r6zpkr64psskrhdv5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kill-or-bury-alive";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kill-or-bury-alive";
           sha256 = "0mm0m8hpy5v98cap4f0s38dcviirm7s6ra4l94mknyvnx0f73lz8";
           name = "kill-or-bury-alive";
         };
@@ -14862,7 +15031,7 @@
           sha256 = "0axvhikhg4fikiz4ifg0p4a5ygphbpjs0wd0gcbx29n0y54d1i93";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kill-ring-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kill-ring-search";
           sha256 = "1pg4j1rrji64rrdv2xpwz33vlyk8r0hz4j4fikzwpbcbmni3skan";
           name = "kill-ring-search";
         };
@@ -14883,7 +15052,7 @@
           sha256 = "0imylcaiwpzvvb3g8kpsna1vk7v7bwdjfcsa98i41m1rv9yla86l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/killer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/killer";
           sha256 = "10z4vqwrpss7mk0gq8xdsbsl0qibpp7s1g0l8wlmrsgn6kjkr2ma";
           name = "killer";
         };
@@ -14904,7 +15073,7 @@
           sha256 = "0rzzjzkzgpiadm9awkj7wrh2hg97lhgwxg74gvdis3fc1xg2hyri";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kivy-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kivy-mode";
           sha256 = "02l230rwivr7rbiqm4vg70458z35f9v9w3mdapcrqd5d07y5mvi1";
           name = "kivy-mode";
         };
@@ -14917,15 +15086,15 @@
     know-your-http-well = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "know-your-http-well";
-        version = "0.4.0";
+        version = "0.5.0";
         src = fetchFromGitHub {
           owner = "for-GET";
           repo = "know-your-http-well";
-          rev = "e208d856ce1b036d2dc1454813c6fc81f0269def";
-          sha256 = "08q43k4450kgygyvqv18gwcmmb7y9x445401048lbixc4cp6p3cg";
+          rev = "c381a9735f3ea86ebc9667e35cdfeab0b67fefb7";
+          sha256 = "1lppggnii2r9fvlhh33gbdrwb50za8lnalavlq9s86ngndn4n94k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/know-your-http-well";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/know-your-http-well";
           sha256 = "0k2x0ajxkivim8nfpli716y7f4ssrmvwi56r94y34x4j3ib3px3q";
           name = "know-your-http-well";
         };
@@ -14946,7 +15115,7 @@
           sha256 = "0da4y9pf6vq0i6w7bmvrszg9bji3ylhr44hmyrmxvah28pigb2fz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/kurecolor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/kurecolor";
           sha256 = "0q0q0dfv376h7j3sgwxqwfpxy1qjbvb6i5clsxz9xp4ly89w4d4f";
           name = "kurecolor";
         };
@@ -14967,7 +15136,7 @@
           sha256 = "1i8wbhc6i88plpq48ccka0avdj2x5rcxm81j93dmwp70ld0zws8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/langtool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/langtool";
           sha256 = "1xq70jyhzg0qmvialy015crbdk9rdibhwpl36khab9hi2999wxyw";
           name = "langtool";
         };
@@ -14988,7 +15157,7 @@
           sha256 = "1rr6cgx70avqf1b19la7g8cav926676a76cflkkw18c1bsw83ss3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/latex-extra";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/latex-extra";
           sha256 = "1w98ngxymafigjpfalybhs12jcf4916wk4nlxflfjcx8ryd9wjcj";
           name = "latex-extra";
         };
@@ -15009,7 +15178,7 @@
           sha256 = "118xrgrnwsmsysmframf6bmb0gkrdrm3jbkgivzxs41cw92fhbzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/latex-math-preview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/latex-math-preview";
           sha256 = "14bn0q5czrrkb1vjdkwx6f2x4zwjkxgrc0bcncv23l13qls1gkmr";
           name = "latex-math-preview";
         };
@@ -15019,6 +15188,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    latex-unicode-math-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "latex-unicode-math-mode";
+        version = "0.2.3";
+        src = fetchFromGitHub {
+          owner = "Christoph-D";
+          repo = "latex-unicode-math-mode";
+          rev = "71da85b55870aa870be722ced9d1f7df54b17f97";
+          sha256 = "165qhh6cfrr24yg0qvpq4vk64a70z30nchkbbhhwg4f6ib7v5f5h";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/latex-unicode-math-mode";
+          sha256 = "1p9gpp28vylibv1s95bzfgscznw146ybgk6f3qdbbnafrcrmifcr";
+          name = "latex-unicode-math-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/latex-unicode-math-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     ledger-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "ledger-mode";
@@ -15026,11 +15216,11 @@
         src = fetchFromGitHub {
           owner = "ledger";
           repo = "ledger";
-          rev = "9b49ade03a3e5d9089ee031bdf733004cee8a36e";
-          sha256 = "0cp5ywmk48sd7c8s8d5a0sv0ng4fl0hybss2z8fwhw6z47iypzmi";
+          rev = "b7f84d69001f75a18807772dee514f5918e3a926";
+          sha256 = "0vm32jv36s6kprmqbij5rpjg9djj3qsla4gpbpm8nycfg73bgylw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ledger-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ledger-mode";
           sha256 = "0hi9waxmw1bbg88brlr3816vhdi0jj05wcwvrvfc1agvrvzyqq8s";
           name = "ledger-mode";
         };
@@ -15051,7 +15241,7 @@
           sha256 = "04h6vk7w25yp4kzkwqnsmc59bm0182qqkyk5nxm3a1lv1v1590lf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lentic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lentic";
           sha256 = "0y94y1qwj23kqp491b1fzqsrjak96k1dmmzmakbl7q8vc9bncl5m";
           name = "lentic";
         };
@@ -15072,7 +15262,7 @@
           sha256 = "1w6mbk4gc63sh2p9rsy851x2kid0dp2ja4ai5badkr5prxkcpfdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/less-css-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/less-css-mode";
           sha256 = "188iplnwwhawq3dby3388kimy0jh1k9r8v9nxz52hy9rhh9hykf8";
           name = "less-css-mode";
         };
@@ -15093,7 +15283,7 @@
           sha256 = "1l9qjmyb4a3f6i2iimpmjczbx890cd1p24n941s13sg67xfbm7hn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/letcheck";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/letcheck";
           sha256 = "1sjwi1ldg6b1qvj9cvfwxq3qlkfas6pm8zasf43baljmnz38mxh2";
           name = "letcheck";
         };
@@ -15114,7 +15304,7 @@
           sha256 = "1w9n5v4g4w34gii6nk2aan4w230dmm0dhml4s9q1fzmvk1ngld6k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lfe-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lfe-mode";
           sha256 = "06b382ncgk4zz3q8akyzfy55j86a53r97gf0l92qvlca7fbs8jjx";
           name = "lfe-mode";
         };
@@ -15135,7 +15325,7 @@
           sha256 = "0hi8s20vw4a5i5n5jlm5dzgsl1qpfyqbpskqszjls1xrrf3dd4zl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lice";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lice";
           sha256 = "1hv2hz3153x0gk7f2js18dbx5pyprfdf2pfxb658fj16vxpp7y6x";
           name = "lice";
         };
@@ -15156,7 +15346,7 @@
           sha256 = "11sw43z5b0vypmhi0yysf2bxjy8fqpzl61y503jb7nhcfywmfkys";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lingr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lingr";
           sha256 = "1445bxiirsxl9kgm0j86xc9d0pbaa5f07c1i66pw2vl40bvhrjff";
           name = "lingr";
         };
@@ -15177,7 +15367,7 @@
           sha256 = "05xfgn9sabi1ykk8zbk2vza1g8pdrg08j5cb58f50nda3q8ndf4s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/link";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/link";
           sha256 = "17jpsg3f2954b740vyj37ikygrg5gmp0bjhbid8bh8vbz7xx9zy8";
           name = "link";
         };
@@ -15198,7 +15388,7 @@
           sha256 = "1v4fadxv7ym6lc09nd2xpz2k5vrikjv7annw99ii5cqrwhqa5838";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/link-hint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/link-hint";
           sha256 = "12fb2zm9jnh92fc2nzmzmwjlhi64rhakwbh9lsydx9svsvkgcs89";
           name = "link-hint";
         };
@@ -15219,7 +15409,7 @@
           sha256 = "1m4g4b96cxs05pfln7kdi6gvrdbv76f8dk806py5lq0gq7da2csc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/linum-relative";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/linum-relative";
           sha256 = "0s1lc3lppazv0481dxknm6qrxhvkv0r9hw8xmdrpjc282l91whkj";
           name = "linum-relative";
         };
@@ -15240,7 +15430,7 @@
           sha256 = "05iqhnhj61f30yk4ih63rimmyp134gyq18frc8qgrnwym64dsm6l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lispy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lispy";
           sha256 = "12qk2gpwzz7chfz7x3wds39r4iiipvcw2rjqncir46b6zzlb1q0g";
           name = "lispy";
         };
@@ -15268,7 +15458,7 @@
           sha256 = "0qyj04p63fdh3iasp5cna1z5fhibmfyl9lvwyh22ajzsfbr3nhnk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lispyscript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lispyscript-mode";
           sha256 = "02biai45l5xl2m9l1drphrlj6r01msmadhyg774ijdk1x4gm5nhr";
           name = "lispyscript-mode";
         };
@@ -15289,7 +15479,7 @@
           sha256 = "197cqkiwxgamhfwbc8h492cmjll3fypkwzcphj26dfnr22v63kwq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-packages-ext";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/list-packages-ext";
           sha256 = "15m4888fm5xv697y7jspghg1ra49fyrny4y2x7h8ivcbslvpglvk";
           name = "list-packages-ext";
         };
@@ -15310,7 +15500,7 @@
           sha256 = "05nn4db8s8h4mn3fxhwsa111ayvlq1raf6bifh7jciyw7a2c3aww";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-unicode-display";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/list-unicode-display";
           sha256 = "01x9i5k5vhjscmkx0l6r27w1cdp9n6xk1pdjf98z3y88dnsmyfha";
           name = "list-unicode-display";
         };
@@ -15331,7 +15521,7 @@
           sha256 = "0dmcmvf3dxmp1f71nq5xwsdrnyb04qr14ay4ckpaca2bmi7q0x5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/list-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/list-utils";
           sha256 = "0bknprr4jb1d20i9lj2aa17vpg1kqwdyzzwmy1kfydnkpf5scnr3";
           name = "list-utils";
         };
@@ -15352,7 +15542,7 @@
           sha256 = "0mr0king5dj20vdycpszxnfs9ch808fhcz3q7svxfngj3d3671wd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lit-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lit-mode";
           sha256 = "05rf7ki060nqnvircn0dkpdrg7xbh7phb8bqgsab89ycc7l9vv59";
           name = "lit-mode";
         };
@@ -15373,7 +15563,7 @@
           sha256 = "1fh9wrw5irn0g3dy8gkk63csdcxgi3w2038mxx3sk6ki3r2bmhw8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/literate-coffee-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/literate-coffee-mode";
           sha256 = "1bll1y9q3kcg3v250asjvx2k9kb314qadaq1iwanwgdlp3qvvs40";
           name = "literate-coffee-mode";
         };
@@ -15394,7 +15584,7 @@
           sha256 = "1cwydbhhbs5v9y2s872zxc5lflqmfrdvnc8xz0qars52d7lg4br5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/live-code-talks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/live-code-talks";
           sha256 = "173mjmxanva13vk2f3a06s4dy62x271kynsa7pbhdg4fd72hdjma";
           name = "live-code-talks";
         };
@@ -15404,22 +15594,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    live-py-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    live-py-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "live-py-mode";
-        version = "2.8.1";
+        version = "2.9.0";
         src = fetchFromGitHub {
           owner = "donkirkby";
           repo = "live-py-plugin";
-          rev = "75c27e0110257e3138e24dc2de2a19244635a0bf";
-          sha256 = "1y81qqsjj2sa319xkwhvq7bl3f5gma4cs7w8x2w510ms32fgqa8x";
+          rev = "d7e8f86e615186afb514c1fdeb6eb9e62babd10a";
+          sha256 = "0bkrs12b6zprkia9p41r5sd2n6y66bgxa6fmbz16v1gjpzzqdayq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/live-py-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/live-py-mode";
           sha256 = "0yn1a0gf9yn068xifpv8p77d917mnalc56pll800zlpsdk8ljicq";
           name = "live-py-mode";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "http://melpa.org/#/live-py-mode";
           license = lib.licenses.free;
@@ -15436,7 +15626,7 @@
           sha256 = "1089sbx20r30sis39vwy29fxhb2n3hh35rdv09lpzdxdq01s8wwp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/loc-changes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/loc-changes";
           sha256 = "1akgij61b2ixpkchrriabwvx68cg4v5r5w9ncjrjh91hskjprfxh";
           name = "loc-changes";
         };
@@ -15457,7 +15647,7 @@
           sha256 = "1l28n7a0v2zkknc70i1wn6qb5i21dkhfizzk8wcj28v44cgzk022";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/log4e";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/log4e";
           sha256 = "1klj59dv8k4r0hily489dp12ra5hq1jnsdc0wcakh6zirmakhs34";
           name = "log4e";
         };
@@ -15499,7 +15689,7 @@
           sha256 = "0g5vq9xy9lwczs77lr91c1srhhfmasnnnmjvgc55hbl6iwmbizbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/logalimacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/logalimacs";
           sha256 = "0ai7a01bdi3a0amgi63pwgdp8wgcgx10an4nhc627wgb1cqxb7p6";
           name = "logalimacs";
         };
@@ -15520,7 +15710,7 @@
           sha256 = "0jpyd2f33pk984kg0q9hxdl4615jb7sxsggnb30mpz7a2ws479xr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/logito";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/logito";
           sha256 = "0bk4qnz66kvhzsk88lw45209778y53kg17iih70ix4ma1x6a3v5l";
           name = "logito";
         };
@@ -15541,7 +15731,7 @@
           sha256 = "1yacic778ranlqblrcdhyf5igbrcin8aj30vjdm4klpmqb73hf1s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/logview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/logview";
           sha256 = "0gks3j5avx8k3427a36lv7gr95id3cylaamgn5qwbg14s54y0vsh";
           name = "logview";
         };
@@ -15562,7 +15752,7 @@
           sha256 = "1rpvw0dvym559vb4nrfy74jq06nbsz2b0n60lcykagcir8mpcidk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/loop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/loop";
           sha256 = "0pav16kinzljmzx84vfz63fvi39af4628vk1jw79jk0pyg9rjbar";
           name = "loop";
         };
@@ -15583,7 +15773,7 @@
           sha256 = "11y5jyq4xg9zlm1qi2y97nh05vhva9pai9yyr4x2pr41xz3s8fpk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/love-minor-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/love-minor-mode";
           sha256 = "1skg039h2hn8dh47ww6n9l776s2yda8ariab4v9f56kb21bncr4m";
           name = "love-minor-mode";
         };
@@ -15604,7 +15794,7 @@
           sha256 = "1psk4202rmkkfy1ir1ax4x4djfngd5pfry7x30ybq2ifqzymb9qb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/lua-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/lua-mode";
           sha256 = "0gyi7w2h192h3pmrhq39lxwlwd9qyqs303lnp2655pikdzk9js94";
           name = "lua-mode";
         };
@@ -15625,7 +15815,7 @@
           sha256 = "01847f8xmjfxvvi7hf73l7ypkdazwg8ciinm117zp4jkgnv0apz0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/m-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/m-buffer";
           sha256 = "0l2rayglv48pcwnr1ggmn8c0az0mffgv02ivnzr9jcfs55ki07fc";
           name = "m-buffer";
         };
@@ -15646,7 +15836,7 @@
           sha256 = "0dgsl1x6r8m9vvff1ia0kmz21h0dji2jl5cqlpx1m947zh45dahj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/macro-math";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/macro-math";
           sha256 = "1r7splwq5kdrdhbmw5zn81vxymsrllgil48g8dl0r60293384h00";
           name = "macro-math";
         };
@@ -15667,7 +15857,7 @@
           sha256 = "0dkigxa39f3cmndxw79mgadwsj7w3bphns6l2hzhv6w0wdllpifp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/macrostep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/macrostep";
           sha256 = "1wjibxbdsp5qfhq8xy0mcf3ms0q74qhdrhqndprn6jh3kcn5q63c";
           name = "macrostep";
         };
@@ -15688,7 +15878,7 @@
           sha256 = "0i38942lr4b7d624313hgydyy0ynmd6psjkz8xcvbb7gw0kcc436";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magic-filetype";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magic-filetype";
           sha256 = "0gcys45cqn5ghppkn0rmyvfybprlfz1x6hqr21yv93mf79h75zhg";
           name = "magic-filetype";
         };
@@ -15709,7 +15899,7 @@
           sha256 = "0dydm0gj6jbybi5nkqrpi5bic5yxhz0p5k5gayqzqzmnb1fhl247";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit";
           sha256 = "0518ax2y7y2ji4jp7yghy84yxm0zgb059aqfa4v17grm4kr8p16q";
           name = "magit";
         };
@@ -15737,7 +15927,7 @@
           sha256 = "0d7dick96g1vj6c9wh10rgwhwv5j3ixgw1m3z45szszswlrp1bih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-annex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-annex";
           sha256 = "1ri58s1ly416ksmb7mql6vnmx7hq59lmhi7qijknjarw7qs3bqys";
           name = "magit-annex";
         };
@@ -15758,7 +15948,7 @@
           sha256 = "1vn6x53kpwv3zf2b5xjswyz6v853r8b9dg88qhwd2h480hrx6kal";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-filenotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-filenotify";
           sha256 = "00a77czdi24n3zkx6jwaj2asablzpxq16iqd8s84kkqxcfiiahn7";
           name = "magit-filenotify";
         };
@@ -15779,7 +15969,7 @@
           sha256 = "1jlww053s580d7rlvmr1dl79wxasa0hhh2jnwb1ra353d6h3a73w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-find-file";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-find-file";
           sha256 = "1d5flydyhwhvhlhi541zcnz2b03bi07zrp21bfz5sm069bf2c96b";
           name = "magit-find-file";
         };
@@ -15800,7 +15990,7 @@
           sha256 = "0ym24gjd6c04zry08abcb09zvjbgj8nc1j12q0r51fhzzadxcxbb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-gerrit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-gerrit";
           sha256 = "1iwvg10ly6dlf8llz9f8d4qfdbvd3s28wf48qgn1wjlxpka6zrd4";
           name = "magit-gerrit";
         };
@@ -15821,7 +16011,7 @@
           sha256 = "19iqa2kzarpa75xy34hqvpy1y7dzx84pj540wwkj04dnpb4fwj2z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-gh-pulls";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-gh-pulls";
           sha256 = "0qn9vjxi33pya9s8v3g95scmhwrn2yf5pjm7d24frq766wigjv8d";
           name = "magit-gh-pulls";
         };
@@ -15831,22 +16021,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, melpaBuild }:
+    magit-gitflow = callPackage ({ fetchFromGitHub, fetchurl, lib, magit, magit-popup, melpaBuild }:
     melpaBuild {
         pname = "magit-gitflow";
-        version = "2.0.0";
+        version = "2.0.1";
         src = fetchFromGitHub {
           owner = "jtatarik";
           repo = "magit-gitflow";
-          rev = "58c0f83b0fd02db0f6f4a0cb6101a710029caaeb";
-          sha256 = "00711dgbzmplqrfww8xf261ymz3jmhisnv9x1rhcw0ywmlfkbckz";
+          rev = "46dc3f20b6f6d5e91e9765da372c909e9cc7b355";
+          sha256 = "1ar9gdp4svymibr9arrlxil1xm1x41gxinlifdb8lgpmawb62d9w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-gitflow";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-gitflow";
           sha256 = "0wsqq3xpqqfak4aqwsh5sxjb1m62z3z0ysgdmnrch3qsh480r8vf";
           name = "magit-gitflow";
         };
-        packageRequires = [ magit ];
+        packageRequires = [ magit magit-popup ];
         meta = {
           homepage = "http://melpa.org/#/magit-gitflow";
           license = lib.licenses.free;
@@ -15863,7 +16053,7 @@
           sha256 = "0dydm0gj6jbybi5nkqrpi5bic5yxhz0p5k5gayqzqzmnb1fhl247";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-popup";
           sha256 = "0w6m384bbmp3bd4qbss5h1jvcfp4qnpqvzlfykhdgjwpv2b2a2fj";
           name = "magit-popup";
         };
@@ -15884,7 +16074,7 @@
           sha256 = "1pqbrrp4366kwfk1d32h2lb70id32ynfc03i7m2832w97f1xp16c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-rockstar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-rockstar";
           sha256 = "1i4fmraiypyd3q6vvibkg9xqfxiq83kcz64b1dr3wmwn30j7986n";
           name = "magit-rockstar";
         };
@@ -15905,7 +16095,7 @@
           sha256 = "1mk8g8rr9vf8jm0mmsj33p8gc71nhlv3847hvqywy6z40nhcjnyb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-stgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-stgit";
           sha256 = "12wg1ig2jzy2np76brpwxdix9pwv75chviq3c24qyv4y80pd11sv";
           name = "magit-stgit";
         };
@@ -15926,7 +16116,7 @@
           sha256 = "1g8zq0s38di96wlhljp370kyj4a0ir1z3vb94k66v2m5nj83ap68";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-svn";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-svn";
           sha256 = "02n732z06f0bhxqkxzlvm36bpqr40pas09zbzpfdk4pb6f9f80s0";
           name = "magit-svn";
         };
@@ -15947,7 +16137,7 @@
           sha256 = "0dj183vphnvz9k2amga0ydcb4gkjxr28qz67055mxrf89q1qjq33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/magit-topgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/magit-topgit";
           sha256 = "1ngrgf40n1g6ncd5nqgr0zgxwlkmv9k4fik96dgzysgwincx683i";
           name = "magit-topgit";
         };
@@ -15968,7 +16158,7 @@
           sha256 = "0fp5gbin1sgsdz39spk74vadkzig3ydwhpzx9vg7f231kk5f6wzx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/make-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/make-color";
           sha256 = "0mrv8b67lpid5m8rfbhcik76bvnjlw4xmcrd2c2iinyl02y07r5k";
           name = "make-color";
         };
@@ -15989,7 +16179,7 @@
           sha256 = "1rr7vpm3xxzcaam3m8xni3ajy8ycyljix07n2jzczayri9sd8csy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/makey";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/makey";
           sha256 = "06xgrlkqvg288yd4lyhx4vi80jlfarhblxk5m5zzs5as7n08cvk4";
           name = "makey";
         };
@@ -16010,7 +16200,7 @@
           sha256 = "0z0ml7l1a45ych61qfc5fvkybl9hh37pgl6lzkaz6mcif1sl8gn1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/malabar-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/malabar-mode";
           sha256 = "026ing7v22rz1pfzs2j9z09pm6dajpys992n45gzhwirz5f0q1rk";
           name = "malabar-mode";
         };
@@ -16031,7 +16221,7 @@
           sha256 = "0hwxwwjzjxv2mmkxmalr2hp3x8apwcyvn2bz4d4yd4wrzcscay97";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/malinka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/malinka";
           sha256 = "1245mpxsxwnnpdsf0pd28mddgdfhh7x32a2l3sxfq0dyg2xlgvrp";
           name = "malinka";
         };
@@ -16052,7 +16242,7 @@
           sha256 = "1272fsjzsza9dxm8s64b7x2jzr3ks8wjpwvgcxha2dnsjzklcdcj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mallard-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mallard-mode";
           sha256 = "0y2ikjgy107kb85pz50vv7ywslqgbrrkcfsrd8gsk1jky4qn8izd";
           name = "mallard-mode";
         };
@@ -16073,7 +16263,7 @@
           sha256 = "1fkijm0gikbwmxa9hf7s1rcwb0ipzjygd1mlicsm78rxvdd8k877";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/map-progress";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/map-progress";
           sha256 = "0zc5vii72gbfwbb35w8m30c8r9zck971hwgcn1a4wjczgn4vkln7";
           name = "map-progress";
         };
@@ -16094,7 +16284,7 @@
           sha256 = "0kk1sk3cr4dbmgq4wzml8kdf14dn9jbyq4bwmvk0i7dic9vwn21c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/map-regexp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/map-regexp";
           sha256 = "0yiif0033lhaqggywzfizfia3siggwcz7yv4z7przhnr04akdmbj";
           name = "map-regexp";
         };
@@ -16115,7 +16305,7 @@
           sha256 = "0y4b69r2l6kvh7g8f1y9v1pdall3n668ci24lp04lcms6rxcrsnh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/marcopolo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/marcopolo";
           sha256 = "1nbck1m7lhync7n474578d2g1zc72c841hi236xjbdd2lnxz3zz0";
           name = "marcopolo";
         };
@@ -16136,7 +16326,7 @@
           sha256 = "0fcyspz7n97n84d9203mxgn8ar4rn52qa49s3vayfrbkn038j5qw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mark-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mark-tools";
           sha256 = "1688y7lnzhwdva2ildjabzi10i87klfsgvs947i7gfgxl7jwhisq";
           name = "mark-tools";
         };
@@ -16146,18 +16336,19 @@
           license = lib.licenses.free;
         };
       }) {};
-    markdown-mode = callPackage ({ cl-lib ? null, fetchgit, fetchurl, lib, melpaBuild }:
+    markdown-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "markdown-mode";
         version = "2.1";
-        src = fetchgit {
-          url = "git://jblevins.org/git/markdown-mode.git";
+        src = fetchFromGitHub {
+          owner = "jrblevin";
+          repo = "markdown-mode";
           rev = "c6eb56eff31f7961c9a00a5d18eaf939c2c40b7d";
-          sha256 = "8091933b49e8dfe57aa10377bd434b7c9b5807e9b78aa7a301885a44db1f7481";
+          sha256 = "098lf4n4rpx00sm07sy8dwp683a4sb7x0p15mrfp268apir3kkxb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-mode";
-          sha256 = "02lmhihv495drv9cb40h6l0xsbx7yglbvsdzc4r0vf78j87rs33f";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/markdown-mode";
+          sha256 = "0gfb3hp87kpcrvxax3m5hsaclwwk1qmxc73cg26smzd1kjfwgz14";
           name = "markdown-mode";
         };
         packageRequires = [ cl-lib ];
@@ -16177,7 +16368,7 @@
           sha256 = "1adl36fj506kgfw40gpagzsd7aypfdvy60141raggd5844i6y96r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-mode+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/markdown-mode+";
           sha256 = "1535kcj9nmcgmk2448jxc0jmnqy7f50cw2ngffjq5w8bfhgf7q00";
           name = "markdown-mode-plus";
         };
@@ -16190,15 +16381,15 @@
     markdown-preview-mode = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, markdown-mode, melpaBuild, websocket }:
     melpaBuild {
         pname = "markdown-preview-mode";
-        version = "0.2";
+        version = "0.3";
         src = fetchFromGitHub {
           owner = "ancane";
           repo = "markdown-preview-mode";
-          rev = "97d9276210465f4e9492169f3c0ed831a57cedf4";
-          sha256 = "10h5zh03c3v0c6pqcxvlns6l70k2l916nqvza53ikjpldmc4mln2";
+          rev = "ff75e31a57f62156441d66d5c4033ad204d49a87";
+          sha256 = "1yi5hsgf8hr7v1wyn3bw650g3ysbglwn5qfrmb6yl3s08lvi1vlf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-preview-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/markdown-preview-mode";
           sha256 = "0i0mld45d8y96nkqn2r77nvbyw6wgsf8r54d3c2jrv04mnaxs7pg";
           name = "markdown-preview-mode";
         };
@@ -16219,7 +16410,7 @@
           sha256 = "0jgr327qlh7acwi6sld27xdsvr89parspk6wmfklwszvy1v13633";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markdown-toc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/markdown-toc";
           sha256 = "0slky735yzmbfi4ld264vw64b4a4nllhywp19ya0sljbsfycbihv";
           name = "markdown-toc";
         };
@@ -16240,7 +16431,7 @@
           sha256 = "0nk2rm14ccwrh1aaxzm80rllsz8g38h9w52m0pf3nnwh6sa757nk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/markup-faces";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/markup-faces";
           sha256 = "12z92j9f0mpn7w2qkiwg54wh743q3inx56q3f8qcpfzyks546grq";
           name = "markup-faces";
         };
@@ -16261,7 +16452,7 @@
           sha256 = "0pbli67wia8pximvgd68x6i9acdgsk51g9hjpqfm49rqg5nqalh9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/marmalade";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/marmalade";
           sha256 = "0ppa2s1fma1lc01byanfxpxfrjqk2snxbsmdbkcipjdi5dpb0a9s";
           name = "marmalade";
         };
@@ -16282,7 +16473,7 @@
           sha256 = "0sriyjjhgis7fgq276j5mw6n84jdwxf8lq0iqqiaqwmc66l985mv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/marshal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/marshal";
           sha256 = "17ikd8f1k42f28d4v5dn83zb44bsx7g336db60q068w6z8d4jbgl";
           name = "marshal";
         };
@@ -16302,7 +16493,7 @@
           sha256 = "34e1f7bd0c4ab21b2b0ca6d2a6ba83c9a1a5591e9de9ceb1c5f8fe06a4738acb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/matrix-client";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/matrix-client";
           sha256 = "09mgxk0xngw8j46vz6f5nwkb01iq96bf9m51w2q61wxivypnsyr6";
           name = "matrix-client";
         };
@@ -16323,7 +16514,7 @@
           sha256 = "0x92b1qrhyrdh0z0xriyjc12h0wpk16x4yawj5i828ca6mz0qh5g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/maven-test-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/maven-test-mode";
           sha256 = "1k9w51rh003p67yalzq1w8am40nnr2khyyb5y4bwxgpms8z391fm";
           name = "maven-test-mode";
         };
@@ -16344,7 +16535,7 @@
           sha256 = "08gbkd8wln89j9yxp0zzd539hbwy1db31gca3vxxrpszixx8280y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/maxframe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/maxframe";
           sha256 = "10cwy3gi3xb3pfdh6xiafxp3vvssawci3y26jda6550d0w5vardj";
           name = "maxframe";
         };
@@ -16365,7 +16556,7 @@
           sha256 = "1si2givpzihjb1szbcdm3iy9kkm7bj0hq10s0h2dfm8axdnlirm5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mb-url";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mb-url";
           sha256 = "1nf8ssan00qsn3d4dc6h6qzdwqzh977qb5d2m33kiwi6qb98988h";
           name = "mb-url";
         };
@@ -16386,7 +16577,7 @@
           sha256 = "00gwd2jf5ncgyay5w2jc2mhv18jf4ydnzpfkxaxw9zjbdxg4ym2i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mbe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mbe";
           sha256 = "0h18mbcjy8nh4gl12kg2v8x6ps320yk7sbgq5alqnx2shp80kri3";
           name = "mbe";
         };
@@ -16407,7 +16598,7 @@
           sha256 = "0252wdq4sd6jhzfy0pn3gdm6aq2h13nnp8hvrn1mpml9x473a5n1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mc-extras";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mc-extras";
           sha256 = "0b110x6ygc95v5pb9lk1i731x5s6dagl5afzv37l1qchys36xrym";
           name = "mc-extras";
         };
@@ -16428,7 +16619,7 @@
           sha256 = "1vsla0a5x4kfyj3ca4r1v8cspp12dadi0frpailclaxfmpmpl5d3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mediawiki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mediawiki";
           sha256 = "17cbrzfdp6jbbf74mn2fi1cwv7d1hvdbw9j84p43jzscnaa5ikx6";
           name = "mediawiki";
         };
@@ -16449,7 +16640,7 @@
           sha256 = "12cp56ppmwpdgf5afx7hd2qb8d1qq8z27191fbbf5zqw8cq5zkpd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/melpa-upstream-visit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/melpa-upstream-visit";
           sha256 = "0j4afy9ipzr7pwkij8ab207mabd7srganlyyif9h1hvclj9svdmf";
           name = "melpa-upstream-visit";
         };
@@ -16470,7 +16661,7 @@
           sha256 = "1y4ra5z3ayw3w7dszzlkk3qz3nv2jg1vvx8cf0y5j1pqpx8vy3jf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mentor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mentor";
           sha256 = "0nkf7f90m2qf11l97zwvb114yrpbqk1xxr2bh2nvbx8m1c8nad9s";
           name = "mentor";
         };
@@ -16487,12 +16678,12 @@
         src = fetchFromGitHub {
           owner = "the-lambda-church";
           repo = "merlin";
-          rev = "6f9915e0d87bf721ea2859ffa17d3fbeeabcfb9d";
-          sha256 = "192jamcc7rmvadlqqsjkzsl6hlgwhg9my1qc89fxh1lmd4qdsrpn";
+          rev = "a532512e15b10d04ffd8281ac5406160f2764005";
+          sha256 = "1amb375dpy5al1ddh2ln9l1lw6xqfjigld6y5k7vvh730zild824";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/merlin";
-          sha256 = "0wnh7512sknagdk56j6gd8vamh9ns3vnggm56s73pik0m009w0xr";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/merlin";
+          sha256 = "177cy9xcrjckxv8gvi1zhg2ndfr8cmsr37inyvpi5dxqy6d6alhp";
           name = "merlin";
         };
         packageRequires = [];
@@ -16512,7 +16703,7 @@
           sha256 = "0zxal6alf99a2zfzizckibp5iwdk9kklfhml2r0r3wfvswb0rb3z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/metafmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/metafmt";
           sha256 = "0vx1xrjr10nd90cr6ppgd3kc3c8bhkg3m4clnb50zagkpfqsy9ma";
           name = "metafmt";
         };
@@ -16533,7 +16724,7 @@
           sha256 = "06mbdb4zb07skq1jpv05hr45k5x96d9hgkb358jiq0kfsqlrbbb4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/metaweblog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/metaweblog";
           sha256 = "11y5x3a8iv0hjj7ppi2sa7vawn7r475qfsh1jg415j4y4fzwpk6y";
           name = "metaweblog";
         };
@@ -16554,7 +16745,7 @@
           sha256 = "1dhws4a298zrm88cdn66sikdk06n0p60d32cxsgybakkhg5c5wgr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mew";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mew";
           sha256 = "0423xxn3cw6jmsd7vrw30hx9phga5chxzi6x7cvpswg1mhcyn9fk";
           name = "mew";
         };
@@ -16575,7 +16766,7 @@
           sha256 = "1bp4xqklf422n0zwwyj0ag3a4nndg8klazrga6rlvpy01hgg3drl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mhc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mhc";
           sha256 = "02ikn9hx0kcfc2xrx4f38zpkfi6vgz7chcxk6q5d0vcsp93b4lql";
           name = "mhc";
         };
@@ -16596,7 +16787,7 @@
           sha256 = "1ckb5hymwj4wmsxakalsky4mkzn9vxhxr6416b2cr6r5jxj4xgsl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/migemo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/migemo";
           sha256 = "0y49imdwygv5zd7cyh9ngda4gyb2mld2a4s7zh4yzlh7z5ha9qkr";
           name = "migemo";
         };
@@ -16617,7 +16808,7 @@
           sha256 = "1qg64mxsm2cswk52mlj7sx7k6gfnrsdwnf68i7cachri0i8aq4ap";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/milkode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/milkode";
           sha256 = "07v6xgalx7vcw5sghckwvz584746cba05ql8flv8n556glm7hibh";
           name = "milkode";
         };
@@ -16638,7 +16829,7 @@
           sha256 = "1zyb6c3xwdzk7dpn7xi0mvbcjdfxvzz1a0zlbs053pfar8iim5fk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minibuffer-complete-cycle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minibuffer-complete-cycle";
           sha256 = "0y1mxs6q9a8lzprrlb22qff6x5mvkw4gp2l6p2js2r0j9jzyffq2";
           name = "minibuffer-complete-cycle";
         };
@@ -16659,7 +16850,7 @@
           sha256 = "07nbn2pwlp33kr136xsm6lzddhjs538xkz0fbays89psblmy4kwj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minibuffer-cua";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minibuffer-cua";
           sha256 = "1ragvr73ykbvpgynnq3z0z4yzrlfhfqlwc1vbxclb8x2xmxq7pzw";
           name = "minibuffer-cua";
         };
@@ -16680,7 +16871,7 @@
           sha256 = "1850z96gly0jnr50472idqz1drzqarr0n23bbasslrc501xkg0bq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/miniedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/miniedit";
           sha256 = "10s407q7igdi2hsaaahbw8vckalrl7z3s6l9cflf51q16xh2ih87";
           name = "miniedit";
         };
@@ -16701,7 +16892,7 @@
           sha256 = "0kjhn48sf2ps3k5pv06gqmqc4hlk6di9ld3ssw6vwfh8313x1fc5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minimal-session-saver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minimal-session-saver";
           sha256 = "1ay7wvriga28bdmarpfwagqzmmk93ri9f3idhr6z6iivwggwyy2i";
           name = "minimal-session-saver";
         };
@@ -16722,7 +16913,7 @@
           sha256 = "0nd0jl5r5drnh98wdpqj2i7pgs7zvcizsh4qbvh8n0iw0c3f0pwh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/minitest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/minitest";
           sha256 = "0x6nd4kkhiw8hh79r69861pf41j8p1y39kzf2rl61zlmyjz9zpmw";
           name = "minitest";
         };
@@ -16742,7 +16933,7 @@
           sha256 = "0rpp748ym79sxccp9pyrwri14m7624zzb80srfgjfdpysrrs0jrr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mmm-mako";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mmm-mako";
           sha256 = "0a4af5q9wxafrid8visp30cz6073ig0c961b78vmmgqrwvvxd3kn";
           name = "mmm-mako";
         };
@@ -16763,7 +16954,7 @@
           sha256 = "097s4xnwfy8d1wzmz65g2f8bnjjjlj67w1yzwn4d3yasb171nbv8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mmm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mmm-mode";
           sha256 = "10vkqaf4684cm5yds1xfinvgc3v7871fb203sfl9dbkcgnd5dcjw";
           name = "mmm-mode";
         };
@@ -16784,7 +16975,7 @@
           sha256 = "05nmcx3f63ds31cj3qwwp03ksflkfwlcn3z2xyxbny83r0dxbgvc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mmt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mmt";
           sha256 = "0hal3qcw6x9658xpdaw6q9l2rr2z107pvg5bdzshf67p1b3lf9dq";
           name = "mmt";
         };
@@ -16805,7 +16996,7 @@
           sha256 = "1v915yy920yrwrrnw9bxggm1zvlm9ndjwv9ydln3r07b0a1mkka2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mocha";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mocha";
           sha256 = "0kjgrl5iy7cd3b9csgpjg3y0wp0q6c7c8cvf0mx8gdbsj7296kyx";
           name = "mocha";
         };
@@ -16826,7 +17017,7 @@
           sha256 = "1lav7am41v63xgavq8pr88y828jmd1cxd4prjq7jlbxm6nvrwxh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mocker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mocker";
           sha256 = "1g90jp1czrrzrmn7n4linby3q4fb4gcflzv2amjv0sdimw1ln1w3";
           name = "mocker";
         };
@@ -16847,7 +17038,7 @@
           sha256 = "0r24186d1q9436h3qhqz1z8q978d01an0dvpvzirf4x9ickrib3k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/modalka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/modalka";
           sha256 = "0bkjykvl6sw797h7j76dzn1viy598asly98gcl5wrq13n4w1md4c";
           name = "modalka";
         };
@@ -16857,21 +17048,21 @@
           license = lib.licenses.free;
         };
       }) {};
-    mode-icons = callPackage ({ fetchgit, fetchurl, lib, melpaBuild }:
+    mode-icons = callPackage ({ cl-lib ? null, emacs, fetchgit, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "mode-icons";
-        version = "0.1.0";
+        version = "0.3.0";
         src = fetchgit {
           url = "git://ryuslash.org/mode-icons.git";
-          rev = "cbf412d0c47dfdbeac7587a0c12c96f58f546467";
-          sha256 = "b7afff1d8fb0b3f044d266af479df51fbb6021ff433628a9dc669695c1ddae40";
+          rev = "d2c9926a8e79e13ef9942fe96b8109add24a9978";
+          sha256 = "cb98bc1e199688337efd03bbd18a340514740257f9ede19089f01f5ad6e69b74";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mode-icons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mode-icons";
           sha256 = "18w221zjrrsfcymprv5x75i3qv04zy4bxl9mqjv0ys7qcc8xf1dp";
           name = "mode-icons";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib emacs ];
         meta = {
           homepage = "http://melpa.org/#/mode-icons";
           license = lib.licenses.free;
@@ -16888,7 +17079,7 @@
           sha256 = "1lkw9nnlns6v7r6nx915f85whq1ri4w8lccwyxrvam40hfvq60s1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mode-line-debug";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mode-line-debug";
           sha256 = "0ppj14bm3rx3xgg4mfxa5zcm2r129jgmsx817wq3h7akjngcbfkd";
           name = "mode-line-debug";
         };
@@ -16909,7 +17100,7 @@
           sha256 = "02w7k4s4698p4adjy4a36na28sb1s2zw4xsjs7p2hv9iiw9kmyvz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/monokai-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/monokai-theme";
           sha256 = "13mv4vgsmdbf3v748lqi7b42hvr3yp86n97rb6792bcgd3kbdx7a";
           name = "monokai-theme";
         };
@@ -16930,7 +17121,7 @@
           sha256 = "1a0pv8fkv1cjdb0k5bmjd67a273bzcmxjwzgy4jpb3ng1qbb2xnm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/monroe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/monroe";
           sha256 = "04rhninxppvilk7s90g0wwa0g9vfcg7mk8mrb2m2c7cb9vj6wyig";
           name = "monroe";
         };
@@ -16951,7 +17142,7 @@
           sha256 = "1ndgw4799d816pkn2bwja5kmigydpmj9znn8cax4dxsd9fg2hzjy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/morlock";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/morlock";
           sha256 = "0693jr1k8mzd7hwp52azkl62c1g1p5yinarjcmdksfyqblqq5jna";
           name = "morlock";
         };
@@ -16972,7 +17163,7 @@
           sha256 = "01mdy7sps0xryz5gfpl083rv7ixkxs2rkz5yaqjlam2rypdcsyy2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/move-dup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/move-dup";
           sha256 = "0b0lmiisl9yckblwf7619if88qsmbka3bl4qiaqam7fka7psxs7f";
           name = "move-dup";
         };
@@ -16993,7 +17184,7 @@
           sha256 = "1mg7arw4wbbm84frq3sws5937fh901qn0xnjk9jcp3pvc4d0sxwd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mowedline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mowedline";
           sha256 = "0c2hvvwa7s5iyz517jaskshdcq9zs15zr6xsvrcb3biahrh4bmfb";
           name = "mowedline";
         };
@@ -17014,7 +17205,7 @@
           sha256 = "13bf5jn1kgqg59j5czlzvajq2fw1rz4h5jqfc7x8w1a067nymf2c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/moz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/moz";
           sha256 = "0ar2xgsi7csjj6fgiamrjwjc58j942dm32j3f3lz21yn2c4pnyxi";
           name = "moz";
         };
@@ -17035,7 +17226,7 @@
           sha256 = "1w1i1clkjg9mj1g4i2y3xw3hyj8s7h9gr04qgyb9c1q8vh11z8d0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/moz-controller";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/moz-controller";
           sha256 = "18gca1csl9dfi9995mky8cbgi3xzf1if8pzdjiz5404gzcqk0rfd";
           name = "moz-controller";
         };
@@ -17056,7 +17247,7 @@
           sha256 = "1pjhch8vah0kf73fl2fk6khhrx1kflggd3zlxrf7w4fxr0qn8la3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mpv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mpv";
           sha256 = "1vq308ac6jj1h8qa2b2sypisb38hbvwjimqndhpfir06fghkw94l";
           name = "mpv";
         };
@@ -17077,7 +17268,7 @@
           sha256 = "1draiwbwb8zfi6rdr5irv8091xv2pmnifq7pzi3rrvjb8swb28z3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/msvc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/msvc";
           sha256 = "04gq2klana557qvsi3bv6416l0319jsqb6bdfs7y6729qd94hlq3";
           name = "msvc";
         };
@@ -17098,7 +17289,7 @@
           sha256 = "0wrg6f7czn61f9wmrk27dzcdskznm5i1pwwjck5h768j0y9dfv6a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mu4e-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mu4e-alert";
           sha256 = "15nwj09iyrvjsc9lrxla6qa0s8izcllxghw5gx3ffncfcrx2l8qm";
           name = "mu4e-alert";
         };
@@ -17119,7 +17310,7 @@
           sha256 = "1lyd8pcawn106zwlbq6gdq05i2zhry1qh9cdyjiw61nvgbbfi0yx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mu4e-maildirs-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mu4e-maildirs-extension";
           sha256 = "1xz19dxrj1grnl7wy9qglh08xb3dr509232l3xizpkxgqqk8pwbi";
           name = "mu4e-maildirs-extension";
         };
@@ -17140,7 +17331,7 @@
           sha256 = "11zabs7qpdhri6n90ck7pgwcbz46d813nyl73h5m1i8jvz1wzx7v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multi";
           sha256 = "1c240d1c1g8wb2ld944344zklnv86d9rycmya4z53b2ai10642ig";
           name = "multi";
         };
@@ -17161,7 +17352,7 @@
           sha256 = "1d9y3dw27pgzgv6wk575d5ign55xdqgbl3ycyq1z7sji1477lz6b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multi-web-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multi-web-mode";
           sha256 = "0vi4yvahr10aqpcz4127c8pcqpr5srwc1yhgipnbnm86qnh34ql5";
           name = "multi-web-mode";
         };
@@ -17182,7 +17373,7 @@
           sha256 = "10k4c9vl0bfidrry0msyqamijizjghg54g26yaqbr2vi0mbbz22k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/multiple-cursors";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/multiple-cursors";
           sha256 = "0mky5p9wpd3270wr5vfna8rkk2ff81wk7vicyxli39195m0qgg0x";
           name = "multiple-cursors";
         };
@@ -17203,7 +17394,7 @@
           sha256 = "15gw4d0hp15rglsj8hzd290li4p0kadj2dsz0dgfcxld7hnimihk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mustache-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mustache-mode";
           sha256 = "076ar57qhwcpl4n634ma827r2rh61670778wqr5za2444a6ax1gs";
           name = "mustache-mode";
         };
@@ -17224,7 +17415,7 @@
           sha256 = "0hvq6z754niqjyv79jzb833wrwbspc7npfg85scwdv8vzwassjx4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mwim";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mwim";
           sha256 = "0bsibwplvyv96y5i5svm2b0jwzs5a7jr2aara7v7xnpj0nqaxm8k";
           name = "mwim";
         };
@@ -17245,7 +17436,7 @@
           sha256 = "0550k0rfm0zai306642v689mcpsw9pbd5vs0il82cihwvrxjifc5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/mykie";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/mykie";
           sha256 = "12ram39fp3m9ar6q184rsnpkxb14y0ajibng7ia2ck54ck7n36cj";
           name = "mykie";
         };
@@ -17266,7 +17457,7 @@
           sha256 = "0amhw630hgc0j8wr8m6aav399ixi3vbwrck79hhlr3pmyh91vv7n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/name-this-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/name-this-color";
           sha256 = "12nrk1ww766jb4gb4iz6w485nimh2iv8wni2jq4l38v8ndh490zb";
           name = "name-this-color";
         };
@@ -17287,7 +17478,7 @@
           sha256 = "0m82g27gwf9mvicivmcilqghz5b24ijmnw0jf0wl2skfbbg0sydh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/names";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/names";
           sha256 = "1q784606jlakw1z6sx2g2x8hz8c8arywrm2r626wj0v105v510vg";
           name = "names";
         };
@@ -17308,7 +17499,7 @@
           sha256 = "10yn215xb4s6kshk108y75im1xbdp0vwc9kah5bbaflp9234i0zh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/narrow-reindent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/narrow-reindent";
           sha256 = "0fybal70kk62zlra63x4jb72694m0mzv4cx746prx9anvq1ss2i0";
           name = "narrow-reindent";
         };
@@ -17329,7 +17520,7 @@
           sha256 = "0ydxj6dc10knambma2hpimqrhfz216nbj96w1dcwgjixs4cd4nax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/narrowed-page-navigation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/narrowed-page-navigation";
           sha256 = "1yrmih60dd69qnin505jlmfidm2svzpdrz46286r7nm6pk7s4pb7";
           name = "narrowed-page-navigation";
         };
@@ -17350,7 +17541,7 @@
           sha256 = "1l7asqwi5gcvb2mn8608025lwypf2vqzrkc3a9phdfjp0qn2apdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nasm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nasm-mode";
           sha256 = "1626yf9mmqlsw8w01vzqsyb5ipa56259d4kl6w871k7rvhxwff17";
           name = "nasm-mode";
         };
@@ -17371,7 +17562,7 @@
           sha256 = "119hy8rs83f17d6zizdaxn2ck3sylxbyz7adszbznjc8zrbaw0ic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nav-flash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nav-flash";
           sha256 = "0936kr0s6zxxmjwaqm7ywdw2im4dxai1xb7j6xa2gp7c70qvvsx3";
           name = "nav-flash";
         };
@@ -17392,7 +17583,7 @@
           sha256 = "15jh1lsgqfnpbmrikm8kdh5bj60yb96f2as2anppjjsgl6w96glh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/navi-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/navi-mode";
           sha256 = "0f5db983w9kxq8mcjr22zfrm7cpxydml4viac62lvab2kwbpbrmi";
           name = "navi-mode";
         };
@@ -17413,7 +17604,7 @@
           sha256 = "09cb07f98aclgq8jf5419305zydkk1hz4nvzrwqz7syrlpvx8xi5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/navorski";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/navorski";
           sha256 = "0dnzpsm0ya8rbcik5wp378hc9k7gjb3gwmkqqj889c38q5cdwsx7";
           name = "navorski";
         };
@@ -17434,7 +17625,7 @@
           sha256 = "16i1k1zr6ng1dlxb1b73mxjf25f4kvf3x5vfffsi3qnfm960bg3q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ncl-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ncl-mode";
           sha256 = "0hmd606xgapzbc79px9l1q6pphrhdzip495yprvg20xsdpmjlfw9";
           name = "ncl-mode";
         };
@@ -17455,7 +17646,7 @@
           sha256 = "19xxg4ya6vndk2ljdnl284zs8qf9dkq4ghr7pmsclp9n7zh46v48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nemerle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nemerle";
           sha256 = "0698hbgk80w7wp0ssx9pl13aapm7rc6l3y2zydfkyqdfwy5y71v6";
           name = "nemerle";
         };
@@ -17476,7 +17667,7 @@
           sha256 = "1gmi0xxwkh33w5gxc8488m1vv6ycizqhlw1kpn81zhqdzzq3s06n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/neotree";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/neotree";
           sha256 = "05smm1xsn866lsrak0inn2qw6dvzy24lz6h7rvinlhk5w27xva06";
           name = "neotree";
         };
@@ -17497,7 +17688,7 @@
           sha256 = "08bpyk0brx0x2l0y8hn8zpkaxb2ndmxz22kzxxypj6hdz303wf38";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nginx-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nginx-mode";
           sha256 = "07k17m64zhv6gik8v4n73d8l1k6fsp4qp8cl94r384ny0187y65c";
           name = "nginx-mode";
         };
@@ -17518,7 +17709,7 @@
           sha256 = "1wc0cvmfhpvfzdy127d1n812q93dd9sp3mmqnc8jzy8i3frqqqq6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ninja-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ninja-mode";
           sha256 = "1m7f25sbkz8k343giczrnw2ah5i3mk4c7csi8kk9x5y16030asik";
           name = "ninja-mode";
         };
@@ -17531,15 +17722,15 @@
     nix-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "nix-mode";
-        version = "1.11.1";
+        version = "1.11.2";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "da4495eb1747a5ab8fe4a8e6ccd1c28fba684a0a";
-          sha256 = "1rxj9rg3rg7yx874nsj65kam26s1bn96cnmys60dp0zh20gc1r1s";
+          rev = "437d3cdc7ac2f75d51b1c9980f6720e071d785e2";
+          sha256 = "1rvi30xyj2vj3gmzagy51smrhb1xwlsfgnyg30hblj88yn0wh5sz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nix-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nix-mode";
           sha256 = "00rqawi8zs2x79c91gmk0anfyqbwalvfwmpak20i11lfzmdsza1s";
           name = "nix-mode";
         };
@@ -17560,7 +17751,7 @@
           sha256 = "1lm7rkgf7q5g4ji6v1masfbhxdpwni8d77dapsy5k9p73cr2aqld";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nixos-options";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nixos-options";
           sha256 = "1m3jipidk10zj68rzjbacgjlal31jf80gqjxlgj4qs8lm671gxmm";
           name = "nixos-options";
         };
@@ -17581,7 +17772,7 @@
           sha256 = "0wk86gm0by9c8mfbvydz5va07qd30n6wx067inqfa7wjffaq0xr7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/noccur";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/noccur";
           sha256 = "0a8l50v09bgap7rsls808k9wyjpjbcxaffsvz7hh9rw9s7m5fz5g";
           name = "noccur";
         };
@@ -17602,7 +17793,7 @@
           sha256 = "03vcs458rcn1hgfvmgmijadjvri7zlh2z4lxgaplzfnga13mapym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nodejs-repl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nodejs-repl";
           sha256 = "0rvhhrsw87kfrwdhm8glq6b3nr0v90ivm7fcc0da4yc2jmcyk907";
           name = "nodejs-repl";
         };
@@ -17621,7 +17812,7 @@
           sha256 = "07bhzddaxdjd591xmg59yd657a1is0q515291jd83mjsmgq258bm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nose";
           sha256 = "0l77hsmn3qk934ppdav1gy9sq48g0v1dzc5qy0rp9vv4yz2jx2jk";
           name = "nose";
         };
@@ -17640,7 +17831,7 @@
           sha256 = "fd2669401c276af12b6c9b739e835ee76b7910bba34bf850e4909c00e79adbd4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/notmuch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/notmuch";
           sha256 = "1sy9k6xbfl035qhnp8sdq9cb3xvgw3lkmdczyd6fw6yrzm5n0g1r";
           name = "notmuch";
         };
@@ -17661,7 +17852,7 @@
           sha256 = "1ss87vlp7625lnn2iah3rc1xfxcbpx4kmiww9n16jx073fs2rj18";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/notmuch-labeler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/notmuch-labeler";
           sha256 = "1c0cbkk5k8ps01xl63a0xa2adkqaj0znw8qs8ca4ai8v1420bpl0";
           name = "notmuch-labeler";
         };
@@ -17682,7 +17873,7 @@
           sha256 = "1l07nrlfd5qj8jnqacjba7mb6prapg8d8h3881l3kb66sn02ahgy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nrepl-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nrepl-sync";
           sha256 = "01b504b4d8rrhlf3sfq3kk9i222fch6jd5jbm02kqw20fgv6q3jd";
           name = "nrepl-sync";
         };
@@ -17703,7 +17894,7 @@
           sha256 = "0c4qfbb345yna5c30czq8nhcx283z1fnpp6h16p7vjqs6y37czsl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nsis-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nsis-mode";
           sha256 = "0pc047ryw906sz5mv0awvl67kh20prsgx6fbh0j1qm0cali2792l";
           name = "nsis-mode";
         };
@@ -17724,7 +17915,7 @@
           sha256 = "1624jj922l0bbav1v8szdr0lpyx0ng959fg3sspg1j15kgkir8kf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nvm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nvm";
           sha256 = "03gy7wavc2q02lnr9pmp3l1pn0lzbdq0kwnmg9fvklmq6r6n3x34";
           name = "nvm";
         };
@@ -17745,7 +17936,7 @@
           sha256 = "14vd0f4y5l470hx7kg54sx3352459mhjnrh7jl822gkl8c904lmw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nyan-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nyan-mode";
           sha256 = "1z2wnsbjllqa533g1ab5cgbv3d9hjix7fsd7z9c45nqh5cmadmyv";
           name = "nyan-mode";
         };
@@ -17766,7 +17957,7 @@
           sha256 = "0bgspjy8h3d7v12sfjnd2ghj4183pdf0z48g5xs129jwd3nycykp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/nyan-prompt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/nyan-prompt";
           sha256 = "1s0qyhpfpncsv9qfxy07rbp4gv8pp5xzb48rbd3r14nkjlnylnfb";
           name = "nyan-prompt";
         };
@@ -17787,7 +17978,7 @@
           sha256 = "0r12023yy8j96bp8z2ml6ffyr2c9rcd5abkh6vqnkwsdxkzx6wrs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/o-blog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/o-blog";
           sha256 = "08grkyvg27wd5232q3y8p0v7higfq7bmsdzmvhja96v6qy2xsbja";
           name = "o-blog";
         };
@@ -17808,7 +17999,7 @@
           sha256 = "1zbqiqilms8vxqlvzb3gjh8gh2cl7cpmh3yiqsj94jx69w8dy4xl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-http";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-http";
           sha256 = "0b7ghz9pqbyn3b52cpmnwa2wnd4svj23p6gc48ybwzwiid42wiss";
           name = "ob-http";
         };
@@ -17829,7 +18020,7 @@
           sha256 = "1xx6hyq3gk4bavcx6i9bhipbn4mn5rv2ga9lryq09qgq2l9znclk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-sml";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-sml";
           sha256 = "04qvzhwjr8ipvq3znnhn0wbl4pbb1rwxi90iidavzk3phbkpaskn";
           name = "ob-sml";
         };
@@ -17850,7 +18041,7 @@
           sha256 = "10hm20dzhkxk61ass3bd5gdn1bs2l60y3zjnpkxinzn7m6aaniia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ob-translate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ob-translate";
           sha256 = "1hi0rxbyxvk9sbk2fy3kqw7l4lgri921vya1mn4i1q2i1979r2gz";
           name = "ob-translate";
         };
@@ -17871,7 +18062,7 @@
           sha256 = "05ay599nc6jdw2fjss4izz1ynv2wc4svff932n8j9hvrhygipb2w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ocodo-svg-modelines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ocodo-svg-modelines";
           sha256 = "0fa88ns70wsr9i9gf4zx3fvmn1a32mrjsda105n0cx6c965kfmay";
           name = "ocodo-svg-modelines";
         };
@@ -17892,7 +18083,7 @@
           sha256 = "0ynv2yhm7akpvqp72pdabhddwr352s1k85q8m1khsvspgg1mkiqz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ocp-indent";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ocp-indent";
           sha256 = "0wc4z9dsnnyr24n3vg1npvc3rm53av8bpbvrl8kldxxdiwgnbkjw";
           name = "ocp-indent";
         };
@@ -17913,7 +18104,7 @@
           sha256 = "19fg6r7aiirfsbp2h1a824476sn1ln4nz8kvpdzkzvyf1hzx68gw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/octicons";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/octicons";
           sha256 = "02f37bvnc5qvkvfbyx5wp54nz71bqm747mq1p5361sx091lllkxk";
           name = "octicons";
         };
@@ -17934,7 +18125,7 @@
           sha256 = "0az4llfgva4wvpljyc5s2m7ggfnj06ssp32x8bncr5fzksha3r7b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/offlineimap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/offlineimap";
           sha256 = "0nza7lrz7cn06njcblwh9hy3050j8ja4awbxx7jzv6nazjg7201b";
           name = "offlineimap";
         };
@@ -17955,7 +18146,7 @@
           sha256 = "1rj97yg2n9fi80qlb4z6iahqid3yinlhx9mrbh6gi1niz58ws69h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/olivetti";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/olivetti";
           sha256 = "0fkvw2y8r4ww2ar9505xls44j0rcrxc884p5srf1q47011v69mhd";
           name = "olivetti";
         };
@@ -17976,7 +18167,7 @@
           sha256 = "07grj81alrr6qgs3jmqkjzphkvi26w6jm5hf1f5wyx7h6q293ady";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-kill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omni-kill";
           sha256 = "03kydl16rd9mnc1rnan2byqa6f70891fhcj16wkavl2r68rfj75k";
           name = "omni-kill";
         };
@@ -17997,7 +18188,7 @@
           sha256 = "030f983n19n64f8irif102nncvam04xpx020vfgja9886wlj40pk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-log";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omni-log";
           sha256 = "0c29243zq8r89ax4rxlmb8imag12icnldcb0q0xsnhjccw8lyw1r";
           name = "omni-log";
         };
@@ -18018,7 +18209,7 @@
           sha256 = "1rfs6z56pnacy6m7yvm2hrb0ykfvaiyichivcmb9ssdgqp92cbxx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omni-scratch";
           sha256 = "190dkqcw8xywzrq8a99w4rqi0y1h2aj23s84g2ln1sf7jaf6d6n9";
           name = "omni-scratch";
         };
@@ -18039,7 +18230,7 @@
           sha256 = "0c34rci5793hd674x2srhqvnj46llrbkrw1xpzf73s4ib5zhh7xi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omni-tags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omni-tags";
           sha256 = "133ww1jf14jbw02ssbx2a46mp52j18a2wwzb6x77azb0akmf1lzl";
           name = "omni-tags";
         };
@@ -18060,7 +18251,7 @@
           sha256 = "1iq8yzjv7wb0jfi3lqqyx4n7whvb7xf8ls0q0w7pgsrsslrxbwcm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/omnisharp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/omnisharp";
           sha256 = "0dwya22y92k7x2s223az1g8hmrpfmk1sgwbr9z47raaa8kd52iad";
           name = "omnisharp";
         };
@@ -18090,7 +18281,7 @@
           sha256 = "119pk7gg4fw5bdvir8077ra603b5nbqvd7ph9cqrwxa056jzvry8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/opam";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/opam";
           sha256 = "004r93nn1ranvxkcc0y5m3p8gh4axgghgnsvim38nc1sqda5h6xa";
           name = "opam";
         };
@@ -18100,6 +18291,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    opencl-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "opencl-mode";
+        version = "1.0";
+        src = fetchFromGitHub {
+          owner = "salmanebah";
+          repo = "opencl-mode";
+          rev = "14109a4bb56105a9c052ae49ad4c638b4cc210b2";
+          sha256 = "0n64l1jrrk60g192nn0240qcv2p9r138mi9gb38qq5k65wffbc21";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/opencl-mode";
+          sha256 = "1g351wiaycwmg1bnf4s2mdnc3lb2ml5l54g19184xqssfqlx7y79";
+          name = "opencl-mode";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/opencl-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     operate-on-number = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "operate-on-number";
@@ -18111,7 +18323,7 @@
           sha256 = "12q09kdcgv6hl1hmgarl73j4g9gi4h7sj865655mdja0ns9n1pdb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/operate-on-number";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/operate-on-number";
           sha256 = "1rw3fqbzfizgcbz3yaf99rr2546msna4z7dyfa8dbi8h7yzl4fhk";
           name = "operate-on-number";
         };
@@ -18132,7 +18344,7 @@
           sha256 = "1xckin2d6s40kgr2293g72ipc57f8gp6y63303kmqcv3qm8q13ca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-ac";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-ac";
           sha256 = "059jr3v3558cgw626zbqfwmwwv5f4637ai26h7b6psqh0x9sf3mr";
           name = "org-ac";
         };
@@ -18153,7 +18365,7 @@
           sha256 = "0gkxxzdk8bd1yi5x9217pkq9d01ccq8znxc7h8qcw0p1336rigfc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-agenda-property";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-agenda-property";
           sha256 = "0zsjzjw52asl609q7a2s4jcsm478p4cxzhnd3azyr9ypxydjf6qk";
           name = "org-agenda-property";
         };
@@ -18174,7 +18386,7 @@
           sha256 = "0j6fqgzvbmvvdh0dgwsxq004wxys2zwnq9wa3idm087ynp2a2ani";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-autolist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-autolist";
           sha256 = "1jvspxhxlvd7h1srk9dbk1v5dykmf8jsjaqicpll7ial6i0qgikj";
           name = "org-autolist";
         };
@@ -18195,7 +18407,7 @@
           sha256 = "10nr4sjffnqbllv6gmak6pviyynrb7pi5nvrq331h5alm3xcpq0w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-bullets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-bullets";
           sha256 = "1kxhlabaqi1g6pz215afp65d9cp324s8mvabjh7q1h7ari32an75";
           name = "org-bullets";
         };
@@ -18205,6 +18417,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-dp = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-dp";
+        version = "1";
+        src = fetchFromGitHub {
+          owner = "tj64";
+          repo = "org-dp";
+          rev = "d740c2065120f71762c48877da1a31dea881e98e";
+          sha256 = "0cxccxz17pj67wgmyxr74n381mknqgqkyav3jkxs4ghg59g5nygl";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-dp";
+          sha256 = "0fnrzpgw8l0g862j20yy4mw1wfcm2i04r6dxi4yd7yay8bw2i4yq";
+          name = "org-dp";
+        };
+        packageRequires = [ cl-lib ];
+        meta = {
+          homepage = "http://melpa.org/#/org-dp";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-elisp-help = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild, org }:
     melpaBuild {
         pname = "org-elisp-help";
@@ -18216,7 +18449,7 @@
           sha256 = "18x8c6jcqkfam79z4hskr8h1lvzvd5rlfgymmj1ps6p6hd3j4ihl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-elisp-help";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-elisp-help";
           sha256 = "0a4wvz52hkcw5nrml3h1yp8w97vg5jw22wnpfbb827zh7iwb259h";
           name = "org-elisp-help";
         };
@@ -18237,7 +18470,7 @@
           sha256 = "1pxfcyf447h18220izi8qlnwdr8rlwn5kds8gr5i1v90s6hpa498";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-gcal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-gcal";
           sha256 = "1mp6cm0rhd4r9pfvsjjp86sdqxjbbg7gk41zx0zf0s772smddy3q";
           name = "org-gcal";
         };
@@ -18258,7 +18491,7 @@
           sha256 = "0b57ik05iax2h3nrj96kysbk4hxmxlaabd0n6lv1xsayrlli3sj1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-gnome";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-gnome";
           sha256 = "0c37gfs6xs0jbvg6ypd4z5ip1khm26wr5lxgmv1dzcc383ynzg0v";
           name = "org-gnome";
         };
@@ -18279,7 +18512,7 @@
           sha256 = "1iyqv34b7q2k73srshcnpvfzcadq47w4rzkqp6m1d3ajk8x2vypq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-if";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-if";
           sha256 = "0h0jdyawz2j4mp33w85z8q77l37qid8palvw5n4z379qa0wr5h96";
           name = "org-if";
         };
@@ -18300,7 +18533,7 @@
           sha256 = "0980scx1dzslbdzmhv720branc4jd4bdkyji34gahinx4w9brj79";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-journal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-journal";
           sha256 = "078z9b9hxbvmmxib6098f49rn7n3d0v4x37p7xxb0v8cv4izlb4s";
           name = "org-journal";
         };
@@ -18321,7 +18554,7 @@
           sha256 = "1797pd264zn19zk93nifyw6pwk2a7wrpfir373qclk601yv2g5h8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-link-travis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-link-travis";
           sha256 = "0hj4x7cw7a3ry8xislkz9bnavy77z4cpmnvns02yi3gnib53mlfs";
           name = "org-link-travis";
         };
@@ -18342,7 +18575,7 @@
           sha256 = "1bggz782ci0z6aw76v51ykbmfzh5g6cxh43w798as1152sn7im3p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-linkany";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-linkany";
           sha256 = "0arjj3c23yqm1ljvbnl7v9cqvd9lbz4381g8f3jyqbafs25bdc3c";
           name = "org-linkany";
         };
@@ -18362,7 +18595,7 @@
           sha256 = "5cb84c3c4bf3f7c3e0c9ab869dababb785d44198b1e1072dc9c0937fc483aa14";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-mac-iCal";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-mac-iCal";
           sha256 = "1ilzvmw1x5incagp1vf8d9v9mz0krlv7bpv428gg3gpqzpm6kksw";
           name = "org-mac-iCal";
         };
@@ -18383,7 +18616,7 @@
           sha256 = "0yxfhzygiki8sha1dddac4g72r51yi4jnga2scmk51f9jgwqbihp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-multiple-keymap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-multiple-keymap";
           sha256 = "16iv5575634asvn1b2k535ml8g4lqgy8z5w6ykma5f9phq5idb9f";
           name = "org-multiple-keymap";
         };
@@ -18404,7 +18637,7 @@
           sha256 = "15fy6xpz6mk4j3nkrhiqal2dp77rhxmk8a7xiw037xr1jgq9sd9a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-outlook";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-outlook";
           sha256 = "0cn8h6yy67jr5h1yxsfqmr8q7ii4f99pgghfp821m01pj55qyjx9";
           name = "org-outlook";
         };
@@ -18425,7 +18658,7 @@
           sha256 = "0zc20m63a1iz9aziid5jsvcbl86k9dg9js4k3almchh55az4a0i3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-page";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-page";
           sha256 = "1326m3w7vz22zk7rx40z28fddsccy5fl1qhbb7clci8l69blcc2v";
           name = "org-page";
         };
@@ -18446,7 +18679,7 @@
           sha256 = "14lshgyrlzjcrqdfsn17llm70ijbs86cv9mccy87vlr01rbsz6lj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-pdfview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-pdfview";
           sha256 = "1z4gb5lw7ngphixw06b5484kwlxbc098w2xshzml5sywr16a4iab";
           name = "org-pdfview";
         };
@@ -18467,7 +18700,7 @@
           sha256 = "1fjdza723615bhdm5x6gbd03vi7ywzpbjn8p59saimczqngfdpmw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-pomodoro";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-pomodoro";
           sha256 = "1vdi07hrhniyhhvg0hcr5mlixy6bjynvwm89z2lvfyvnnxpx0r27";
           name = "org-pomodoro";
         };
@@ -18488,7 +18721,7 @@
           sha256 = "16aq5p65q5a0an14q9xzsnkaa5bzkrwhm9cv5ljajjfcjsjcvmb6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-projectile";
           sha256 = "078s77wms1n1b29mrn6x25sksfjad0yns51gmahzd7hlgp5d56dm";
           name = "org-projectile";
         };
@@ -18509,7 +18742,7 @@
           sha256 = "1cxjzj955rvp0ijbp7ifpmkxdhimz8hqjw5c9gv6zwjqb5iih9ry";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-protocol-jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-protocol-jekyll";
           sha256 = "18wg489n2d1sx9jk00ki6p2rxkqz67kqwnmy2kb1ga1rmb6x9wfs";
           name = "org-protocol-jekyll";
         };
@@ -18519,6 +18752,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    org-random-todo = callPackage ({ alert, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "org-random-todo";
+        version = "0.4.1";
+        src = fetchFromGitHub {
+          owner = "unhammer";
+          repo = "org-random-todo";
+          rev = "7398b8dff09bef54f579d158ce47b0090f00201e";
+          sha256 = "1bi09hd5m994rkqcx0a045h20419b6n4vvwiiggzsi0723dd9fb9";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-random-todo";
+          sha256 = "0yflppdbkfn2phd21zkjdlidzasfm846mzniay83v3akz0qx31lr";
+          name = "org-random-todo";
+        };
+        packageRequires = [ alert emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/org-random-todo";
+          license = lib.licenses.free;
+        };
+      }) {};
     org-readme = callPackage ({ fetchFromGitHub, fetchurl, header2, http-post-simple, lib, lib-requires, melpaBuild, yaoddmuse }:
     melpaBuild {
         pname = "org-readme";
@@ -18530,7 +18784,7 @@
           sha256 = "0hhgfw0sqvl9jmmslwxn6v3dii99v09yz2h0ia5np9lzyxsc207a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-readme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-readme";
           sha256 = "1qqbsgspd006gy0kc614w7bg6na0ygmflvqkmw47899pbgj81hxh";
           name = "org-readme";
         };
@@ -18551,7 +18805,7 @@
           sha256 = "03c88jzwvl95dl39703mknkvnk3cmw4gss5c1y2k9py2rgh6bpr9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-repo-todo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-repo-todo";
           sha256 = "0l5ns1hs3i4dhrpmvzl34zc9zysgjkfa7j8apbda59n9jdvml5v1";
           name = "org-repo-todo";
         };
@@ -18572,7 +18826,7 @@
           sha256 = "0zx9gpvm5gy9k45lbhaks9s935id727lszsh40gmpdp5zxf3rjk1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-sync";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-sync";
           sha256 = "0n8fz2d1vg9r8dszgasbnb6pgaxr2i8mqrp953prf1nhmfpjpxad";
           name = "org-sync";
         };
@@ -18593,7 +18847,7 @@
           sha256 = "1qx3kd02sxs9k7adlvdlbmyhkc5kr7ni5lw4gxjw3nphnc536bkb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-table-comment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-table-comment";
           sha256 = "1d40vl8aa1x27z4gwnkzxgrqp7vd3ln2pc445ijjxp1wr8bjxvdz";
           name = "org-table-comment";
         };
@@ -18614,7 +18868,7 @@
           sha256 = "1x241jaw726zjsplwf6svbvr8af09k6kqj7icpvcbyayivkbhxy2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-tfl";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-tfl";
           sha256 = "1rqmmw0222vbxfn5wxq9ni2j813x92lpv99jjszqjvgnf2rkhjhf";
           name = "org-tfl";
         };
@@ -18635,7 +18889,7 @@
           sha256 = "12fksqi9flf84h1lbmbcjnqxa7dairp50wvlwfhbp1hbb8l9z63a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-themis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-themis";
           sha256 = "08rajz5y7h88fh94s2ad0f66va4vi31k9hwdv8p212bs276rp7ln";
           name = "org-themis";
         };
@@ -18656,7 +18910,7 @@
           sha256 = "09iw2jffb2qrx5r07zd1j8sk5wafamjkc2khqyfwc5kx6xyp1f46";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-time-budgets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-time-budgets";
           sha256 = "0r8km586n6xdnjha7xnzlh03nw1dp066hydaz8kxfmhvygl9cpah";
           name = "org-time-budgets";
         };
@@ -18677,7 +18931,7 @@
           sha256 = "0qqa62fsmra6v4061kpki8wbhfcwkgnb2gzxwvnaqlcmhivksg6v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-toodledo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-toodledo";
           sha256 = "0c7qr0jsc4iyrwkc22xp9nmk6984v7q1k0rvpd62m07lb5gvbiq3";
           name = "org-toodledo";
         };
@@ -18698,7 +18952,7 @@
           sha256 = "053wf36lq9piyzq7rv2lid34zanj6l9fvawp3r3nsniy5nlfckqx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-tracktable";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-tracktable";
           sha256 = "0mngf9q2ffxq32cgng0xl30661mj15wmr9y4hr3xddj626kxrp00";
           name = "org-tracktable";
         };
@@ -18719,7 +18973,7 @@
           sha256 = "1h15fr16kgbyrxambmk4hsmha6hx4c4yqkccb82g3wlvzmnqj5x3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-transform-tree-table";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-transform-tree-table";
           sha256 = "0n68cw769nk90ms6w1w6cc1nxjwn1navkz56mf11bsiqvsk3km7r";
           name = "org-transform-tree-table";
         };
@@ -18740,7 +18994,7 @@
           sha256 = "0aacxxwhwjzby0f9r4q0lra5lqcrw5snnm1yc63jrs6c0ifakk45";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-tree-slide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-tree-slide";
           sha256 = "0v857zplv0wdbg4li667v2p5pn5zcf9fgbqcwa75x8babilkl6jn";
           name = "org-tree-slide";
         };
@@ -18753,16 +19007,16 @@
     org-trello = callPackage ({ dash, dash-functional, deferred, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, request-deferred, s }:
     melpaBuild {
         pname = "org-trello";
-        version = "0.7.5";
+        version = "0.7.6";
         src = fetchFromGitHub {
           owner = "org-trello";
           repo = "org-trello";
-          rev = "3718ed704094e5e5a491749f1f722d76ba4b7d73";
-          sha256 = "1561nxjva8892via0l8315y3fih4r4q9gzycmvh33db8gqzq4l86";
+          rev = "1ecb8f4f1dd41c8f41073c13a9557c0c583d7c88";
+          sha256 = "0pinp7485mwi99f8qx8xhcdymn5yyd7irxh514j3f23n4b90hk4l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-trello";
-          sha256 = "1rm91xccvdsqghdnrnjvyp8xfvrw5ac677vzzz24rz9dssh2mz9b";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-trello";
+          sha256 = "14lq8nn1x6qb3jx518zaaz5582m4npd593w056igqhahkfm0qp8i";
           name = "org-trello";
         };
         packageRequires = [
@@ -18789,7 +19043,7 @@
           sha256 = "1qf4pqsg12y1qx7di0y5dp0f4slyp69h2q6y21hldzknhwxx4yy4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org-vcard";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org-vcard";
           sha256 = "0l6azshvzl1wws582njqr3qx4h73gwrdqwa3jcic1qbs9hg2l4yl";
           name = "org-vcard";
         };
@@ -18810,7 +19064,7 @@
           sha256 = "0av1477jn3s4s5kymd7sbb0av437vb5mnfc6rpfgzwji7b8mfr7l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org2blog";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org2blog";
           sha256 = "0ancvn4ji4552k4nfd2ijclsd027am93ngg241ll8f6h6k0wpmzq";
           name = "org2blog";
         };
@@ -18831,7 +19085,7 @@
           sha256 = "064kw64w9snm0lbshxn8d6yd9xvyislhg37fmhq1w7vy8lm61xvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/org2jekyll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/org2jekyll";
           sha256 = "1j9d6xf5nsakifxwd4zmjc29lbj46ffn3z109k2y2yhz7q3r9hzv";
           name = "org2jekyll";
         };
@@ -18852,7 +19106,7 @@
           sha256 = "02mxp17p7bj4xamg0m6zk832hmpqcgzc7bjbjcnvbvrawhc255hy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orgbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/orgbox";
           sha256 = "12wfqlpjh9nr7zgqs4h8kmfsk825n68qcbn8z2fw2mpshg3nj7l8";
           name = "orgbox";
         };
@@ -18873,7 +19127,7 @@
           sha256 = "1wxxdx3c5qacsii4kysk438cjr1hnmpir78kp6xgk9xw5g9snlnj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/orgit";
           sha256 = "0askccb3h98v8gmylwxaph3gbyv5b1sp4slws76aqz1kq9x0jy7w";
           name = "orgit";
         };
@@ -18894,7 +19148,7 @@
           sha256 = "00vhzblzscp3mkl6x1nz116i4isjwcc5gkpdksym3mr5nqvqhd97";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/orglink";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/orglink";
           sha256 = "0ldrvvqs3hlazj0dch162gsbnbxcg6fgrxid8p7w9gj19vbcl52b";
           name = "orglink";
         };
@@ -18915,7 +19169,7 @@
           sha256 = "0g1xhh88a65vcq6rlh7ii16pra4pv519ajcws0h93ldbbjiy7p0m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-browse";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-browse";
           sha256 = "06rfzq2hxhzg6jh2zs28r7ffxwlq40nz954j13ly8403c7rmbrfm";
           name = "osx-browse";
         };
@@ -18936,7 +19190,7 @@
           sha256 = "1vywqzw8hydi944q4ghgxbbvvmwfpa9wj5nmrnixfcw8h4mfcxvv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-dictionary";
           sha256 = "13033fxc5vjd1f7mm6znmprcp3mwxbvblb2d25shr8d4imqqhv82";
           name = "osx-dictionary";
         };
@@ -18957,7 +19211,7 @@
           sha256 = "1csnxpsfnv9lv07kgvc60qx5c33sshmnz60p3qjz7ym7rnjy9b5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-location";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-location";
           sha256 = "1p12mmrw70p3b04zlprkdxdfnb7m3vkm6gci3fwhr5zyfvwxvn0c";
           name = "osx-location";
         };
@@ -18978,7 +19232,7 @@
           sha256 = "0830kkmvc3ss7ygqfwz3j75s7mhxfxyadaksrp0v2cc4y6wn6nfv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-plist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-plist";
           sha256 = "0zaqmhf5nm6jflwgxnknhi8zn97vhsia2xv8jm677l0h23pk2va8";
           name = "osx-plist";
         };
@@ -18999,7 +19253,7 @@
           sha256 = "1pn6xvq41di1jb5d3i8wgs54w0m2414cq3f1vk0xpibshkq7sr4a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/osx-trash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/osx-trash";
           sha256 = "1f6pi53mhp2pvrfjm8544lqqj36gzpzxq245lzvv91lvqkxr9ysj";
           name = "osx-trash";
         };
@@ -19020,7 +19274,7 @@
           sha256 = "1v9kx5xr7xcr6i664h2g6j8824yjsjdn5pvgmawvxrrplbjmiqnp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/outorg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/outorg";
           sha256 = "04swss84p33a9baa4swqc1a9lfp6wziqrwa7vcyi3y0yzllx36cx";
           name = "outorg";
         };
@@ -19041,7 +19295,7 @@
           sha256 = "1v04iyx57w8scw3iqrivii7q0sh8sa7xacswdhd18mw9kvjrbj98";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/outshine";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/outshine";
           sha256 = "1i8c3q6n9hpfbpg2f8n8brwgaq36af1jn3g5js88yiyyb5dknxq4";
           name = "outshine";
         };
@@ -19062,7 +19316,7 @@
           sha256 = "0qxk2rf84j86syxi8xknsq252irwg7sz396v3bb4wqz4prpj0kzc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ov";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ov";
           sha256 = "0d71mpv74cfxcnwixbrl90nr22cw4kv5sdgpny5wycvh6cgmd6qb";
           name = "ov";
         };
@@ -19083,7 +19337,7 @@
           sha256 = "0jz8p6bwpfncxwi6ssmi6ngx8sjjica565i6ln0gsr5i11zfb7nx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/overseer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/overseer";
           sha256 = "04wfwcal051jrnmm5dga6vl4c9j10pm416586yxb8smi6fxws2jg";
           name = "overseer";
         };
@@ -19104,7 +19358,7 @@
           sha256 = "0f2psx4lq98l3q3fnibsfqxp2hvvwk7b30zjvjlry3bffg3l7pfk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/owdriver";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/owdriver";
           sha256 = "0j8z7ynan0zj581x50gsi9lljkbi6bwmzpfyha3i6q8ch5qkdxfd";
           name = "owdriver";
         };
@@ -19125,7 +19379,7 @@
           sha256 = "047fcvpvwzaqisw4q3p6hxgjyqsi2n9nms1qx9w4znvxrnjq8jz3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-ioslide";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-ioslide";
           sha256 = "0z0qnvpw64wxbgz8203rphswlh9hd2i11pz2mlay8l3bzz4gx4vc";
           name = "ox-ioslide";
         };
@@ -19146,7 +19400,7 @@
           sha256 = "0h49pfl97vl796sm7r62rpv3slj0z5krm4zrqkgz0q6zlyrjay29";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-pandoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-pandoc";
           sha256 = "0wy6yvwd4vyq6xalkrshnfjjxlh1p24y52z49894nz5fl63b74xc";
           name = "ox-pandoc";
         };
@@ -19167,7 +19421,7 @@
           sha256 = "026g48sgqwnqs5zmrabhiv3l8052l4c1vsbsf6bdxv4a6yp0l654";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ox-twbs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ox-twbs";
           sha256 = "15csgnph5wh2dvcc2dnvrlm7whh428rq8smqji1509ib7aw9y5mx";
           name = "ox-twbs";
         };
@@ -19188,7 +19442,7 @@
           sha256 = "073qpa223ja673p63mhvy4l6yyv3k7z05ifwvn7bmq4b5fq42hw6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pabbrev";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pabbrev";
           sha256 = "1mbfa40pbzbi00sp155zm43sj6nw221mcayc2rk3ppin9ps95hx3";
           name = "pabbrev";
         };
@@ -19209,7 +19463,7 @@
           sha256 = "1xv0ra130qg0ksgqi4npspnv0ckq77k7f5kcibavj030h578kj97";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/package+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/package+";
           sha256 = "1mbsxr4llz8ny7n7w3lykld9yvbaywlfqnvr9l0aiv9rvmdv03bn";
           name = "package-plus";
         };
@@ -19230,7 +19484,7 @@
           sha256 = "1pdv6d6bm5jmpgjqf9ycvzasxz1205zdi0zjrmkr33c03azwz7rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/package-safe-delete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/package-safe-delete";
           sha256 = "12ss5yjhnyxsif4vlbgxamn5jfa0wxkkphffxnv6drhvmpq226jw";
           name = "package-safe-delete";
         };
@@ -19251,7 +19505,7 @@
           sha256 = "138l07qmxj4fkvf43f1hdn4skadxb50c023bc5101l3njzmf74wa";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/package-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/package-utils";
           sha256 = "02hgh7wg68ysfhw5hckrpshzv4vm1vnm395d34x6vpgl4ccx7v9r";
           name = "package-utils";
         };
@@ -19261,22 +19515,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    packed = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    packed = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "packed";
-        version = "0.5.0";
+        version = "0.5.3";
         src = fetchFromGitHub {
           owner = "tarsius";
           repo = "packed";
-          rev = "478613da38b0a47f4419acc50017ac871433b13c";
-          sha256 = "0k5l0l4vjw38r911zd9c9cv015vpw2y8abp82s2s9pm8nqc3bnci";
+          rev = "8ab8332a6078a1279d80830e397faf52e12eb283";
+          sha256 = "1czjja6npjxm8vmv74796zxhd5gaqjk477cl0fnmm45dny1h7sr7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/packed";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/packed";
           sha256 = "0sw7d2l17bq471i4isrf2xf0z85nqqiciw25whw0c0chdzwzai6z";
           name = "packed";
         };
-        packageRequires = [ cl-lib dash ];
+        packageRequires = [ dash emacs ];
         meta = {
           homepage = "http://melpa.org/#/packed";
           license = lib.licenses.free;
@@ -19293,7 +19547,7 @@
           sha256 = "1acz3w2zdcds0h6p2k9h3lmjsk519asqrxjw7f3pyrcq7x2qbhc4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/page-break-lines";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/page-break-lines";
           sha256 = "0q1166z190dxznzgf2f29klj2jkaqlic483p4h3bylihkqp93ij7";
           name = "page-break-lines";
         };
@@ -19314,7 +19568,7 @@
           sha256 = "03mlg6dmpjw8fq2s3c4gpqj20kjhzldz3m51bf6s0mxq9bclx2xw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pallet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pallet";
           sha256 = "0q50cdwnn2w1n5h4bappncjjyi5yaixxannwgy23fngdrz1mxwd7";
           name = "pallet";
         };
@@ -19327,15 +19581,15 @@
     pandoc-mode = callPackage ({ dash, fetchFromGitHub, fetchurl, hydra, lib, melpaBuild }:
     melpaBuild {
         pname = "pandoc-mode";
-        version = "2.14";
+        version = "2.15";
         src = fetchFromGitHub {
           owner = "joostkremers";
           repo = "pandoc-mode";
-          rev = "ebf43f8a62beea6b66c9999e660b0fc82854ac08";
-          sha256 = "1i5mh8bilg7vplb1ps81s5r6zjf2k6yjcmklrql4w7vw9jrvy566";
+          rev = "60d3abea189467e04b5ce7dbe38d8b76ce5686cf";
+          sha256 = "0g2iab5fmz85z532102lqn2wp1wgqy07bxkca95azi2gkbg0kbmj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pandoc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pandoc-mode";
           sha256 = "0qvc6cf87h1jqf590kd68jfg25snxaxayfds634wj4z6gp70l781";
           name = "pandoc-mode";
         };
@@ -19356,7 +19610,7 @@
           sha256 = "0gmdzagyg0p7q1gyj2a3aqp2g4asljpib3n67nikr0v99c2mki5y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pangu-spacing";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pangu-spacing";
           sha256 = "082qh26vlk7kifz1800lyai17yvngwjygrfrsh1dsd8dxhk6l9j8";
           name = "pangu-spacing";
         };
@@ -19377,7 +19631,7 @@
           sha256 = "1xh614czldjvfl66vhkyaai5k4qsg1l3mz6wd5b1w6kd45qrc54i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paper-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paper-theme";
           sha256 = "04diqm2c9fm29zyms3hplkzb4kb7b2kyrxdsy0jxyjj5kabypd50";
           name = "paper-theme";
         };
@@ -19398,7 +19652,7 @@
           sha256 = "1vc59n9jmsn5d15v2m9xl64564h3q0c78pv4a4n3dhd1iz797l3x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paradox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paradox";
           sha256 = "1xq14nfvprsq18464qr4mhphq7cl1f570lji5n8z6j9vpfm9a4p2";
           name = "paradox";
         };
@@ -19417,7 +19671,7 @@
           sha256 = "7587cd2cf6e5b245678bbca8cbad07db8576ff976a504cd8d6e52fa85cf99f8f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paredit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paredit";
           sha256 = "1rp859y4qyqdfvp261l8mmbd62p1pw0dypm1mng6838b6q6ycakr";
           name = "paredit";
         };
@@ -19438,7 +19692,7 @@
           sha256 = "0jbjwjl92pf0kih3p2x20ms2kpyzzam8fir661nimpmk802ahgkj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paredit-everywhere";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paredit-everywhere";
           sha256 = "0gbkwk8mrbjr2l8pz3q4y6j8q4m12zmzl31c88ngs1k5d86wav36";
           name = "paredit-everywhere";
         };
@@ -19459,7 +19713,7 @@
           sha256 = "033gdya7f6p4kkapnmnbxlm88g4rbsmym4cc4jkcmp91idh63syq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paren-face";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paren-face";
           sha256 = "0dmzk66m3rd8x0rb925pyrfpc2qsvayks4kmhpb2ccdrx68pg8gf";
           name = "paren-face";
         };
@@ -19480,7 +19734,7 @@
           sha256 = "0i5bc7lyyrx6swqlrp9l5x72yzwi53qn6ldrfs99gh08b3yvsnni";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/parent-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/parent-mode";
           sha256 = "1ndn6m6aasmk9yrml9xqj8141100nw7qi1bhnlsss3v8b6njwwig";
           name = "parent-mode";
         };
@@ -19501,7 +19755,7 @@
           sha256 = "0n91whyjnrdhb9bqfif01ygmwv5biwpz2pvjv5w5y1d4g0k1x9ml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/parsebib";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/parsebib";
           sha256 = "07br2x68scsxykdk2ajc4mfqhdb7vjkcfgz3vnpy91sirxzgfjdd";
           name = "parsebib";
         };
@@ -19522,7 +19776,7 @@
           sha256 = "18m0973l670cjbzpa1vfv06gymhsa2f1pjcp329s0npb735x5whj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pass";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pass";
           sha256 = "1vvyvnqf6k7wm0p45scwi6ny86slkrcbr36lnxdlkf96cqyrqzfr";
           name = "pass";
         };
@@ -19543,7 +19797,7 @@
           sha256 = "1g0mvg9i8f2qccb4b0m4d74zkjx9gjfv47x57by6cdaf9yywqryi";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/passthword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/passthword";
           sha256 = "076jayziipjx260yk3p37pf5k0qsagalidah3y6hiflrlq4sfgjn";
           name = "passthword";
         };
@@ -19563,7 +19817,7 @@
           sha256 = "f71d0b36570983c35e08b6672c186b5c308b57536a96a747f09665bab794be30";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/password-store";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/password-store";
           sha256 = "1jh24737l4hccr1k0b9fnq45ag2dsk84fnfs86hcgsadl94d6kss";
           name = "password-store";
         };
@@ -19584,7 +19838,7 @@
           sha256 = "0m6qjsq6qfwwszm95lj8c58l75vbmx9r5hm9bfywyympfgy0fa1n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pastehub";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pastehub";
           sha256 = "1slvqn5ay6gkbi0ai1gy1wmc02h4g3n6srrh4fqn72y7b9nv5i0v";
           name = "pastehub";
         };
@@ -19605,7 +19859,7 @@
           sha256 = "1v5mpjb8kavbqhvg4rizwg8cypgmi6ngdiy8qp9pimmkb56y42ly";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pastelmac-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pastelmac-theme";
           sha256 = "168zzqhp2dbfcnknwfqxk68rgmibfw71ksghvi6h2j2c1m08l23f";
           name = "pastelmac-theme";
         };
@@ -19626,7 +19880,7 @@
           sha256 = "0kkgqaxyrv65rfg2ng1vmmmrc9bm98yqpsv2pcb760287dn0l27m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/paxedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/paxedit";
           sha256 = "06ymilr0zrwfpyzql7dcpg48lhkx73f2jlaw3caxgsjaz7x3n4ic";
           name = "paxedit";
         };
@@ -19647,7 +19901,7 @@
           sha256 = "0xbbq8ddlirhvv921nrf7bwazh0i98bk0a9xzyx8iqpyg66vbfa8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcache";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pcache";
           sha256 = "1q2wlbc58lyf3dxfs9ppdxvdsp81jmkq874zbd7f39wvc5ckbz0l";
           name = "pcache";
         };
@@ -19668,7 +19922,7 @@
           sha256 = "0h0p4c08z0dqxmg55fzch1d2f38rywfk1j0an2f4sc94lj7ckbm6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcomplete-extension";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pcomplete-extension";
           sha256 = "0m0c9ir44p21rj93fkisvpvi08936717ljmzsr4qdf69b3i54cwc";
           name = "pcomplete-extension";
         };
@@ -19689,7 +19943,7 @@
           sha256 = "03k3xhrim4s3yvbnl8g8ci5g7chlffycdw7d6a1pz3077mxf1f1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pcsv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pcsv";
           sha256 = "1zphndkbva59g1fd319a240yvq8fjk315b1fyrb8zvmqpgk9n0dl";
           name = "pcsv";
         };
@@ -19710,7 +19964,7 @@
           sha256 = "19sy49r3ijh36m7hl4vspw5c4i8pnfqdn4ldm2sqchxigkw56ayl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pdf-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pdf-tools";
           sha256 = "1hnc8cci00mw78h7d7gs8smzrgihqz871sdc9hfvamb7iglmdlxw";
           name = "pdf-tools";
         };
@@ -19731,7 +19985,7 @@
           sha256 = "0kjz7ch4bn0m4v9zgqyqcrsasnqc5c5drv2hp22j7rnbb7ny0q3n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/peg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/peg";
           sha256 = "0nxy9xn99myz0p36m4jflfj48qxhhn1sspbfx8d90030xg3cc2gm";
           name = "peg";
         };
@@ -19751,7 +20005,7 @@
           sha256 = "1rh87jf0a15q35a8h00bx6k5wa931rb6gh600zbs7j4r3y8qsylf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/per-buffer-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/per-buffer-theme";
           sha256 = "1czcaybpfmx4mwff7hs07iayyvgvlhifkickccap6kpd0cp4n6hn";
           name = "per-buffer-theme";
         };
@@ -19772,7 +20026,7 @@
           sha256 = "0h05j55y3csq91a5m2fg99y4rzsh7zca7hnifb6kic5zb3nahi00";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/persistent-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/persistent-scratch";
           sha256 = "0iai65lsg3zxj07hdb9201w3rwrvdb3wffr6k2jdl8hzg5idghn1";
           name = "persistent-scratch";
         };
@@ -19793,7 +20047,7 @@
           sha256 = "14p20br8vzxs39d4hswzrrkgwql5nnmn5j17cpbabzjvck42rixc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/persistent-soft";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/persistent-soft";
           sha256 = "0a4xiwpgyyynjf69s8p183mqd3z53absv544ggvhb2gkpm6jravc";
           name = "persistent-soft";
         };
@@ -19806,15 +20060,15 @@
     persp-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "persp-mode";
-        version = "1.1.7";
+        version = "1.2.6";
         src = fetchFromGitHub {
           owner = "Bad-ptr";
           repo = "persp-mode.el";
-          rev = "00e5f345f13b2b9e615082ac9ccbfd076592cc22";
-          sha256 = "129cl5az4rr5j7krpyyi5khhbl8klw7ji9ysarz0s7ivy096jq7b";
+          rev = "7d46178b260cb600d378e9e3b746253cc9cb8a46";
+          sha256 = "090b73969namf3h7pbf8xc969dygj3frzlkf0h2x29wl1fmag5kr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/persp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/persp-mode";
           sha256 = "1bgni7y5xsn4a21494npr90w3320snfzw1hvql30xrr57pw3765w";
           name = "persp-mode";
         };
@@ -19835,7 +20089,7 @@
           sha256 = "12c2rrhysrcl2arc6hpzv6lxbb1r3bzlvdp23hnp9sci6yc10k3q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/perspective";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/perspective";
           sha256 = "150dxcsd0ylvfi9mmfpcki1wd3nl8q9mbszd3dgqfnm40yncklml";
           name = "perspective";
         };
@@ -19856,7 +20110,7 @@
           sha256 = "1qxsc5wyk8l9gkgmqy3mzwxdhji1ljqw9s1jfxkax7fyv4d1v31p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ph";
           sha256 = "0azx4cpfdn01yrqyn0q1gg9z7w0h0rn7zl39v3dx6yidd76ysh0l";
           name = "ph";
         };
@@ -19877,7 +20131,7 @@
           sha256 = "0r6cl1ng41s6wsy5syjlkaip0mp8h491diipdc1psbhnpk4vabsv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phi-search-mc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phi-search-mc";
           sha256 = "07hd80rbyzr5n3yd7hv1j51nl6pvcxmln20g6xvw8gh5yfl9k0m8";
           name = "phi-search-mc";
         };
@@ -19898,7 +20152,7 @@
           sha256 = "0zs11811kx6x1zgc1icd8gw420saa7z6zshpzmrddnbznya4qql6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php-auto-yasnippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/php-auto-yasnippets";
           sha256 = "1hhddvpc80b6wvjpbpibsf24rp5a5p45m0bg7m0c8mx181h9mqgn";
           name = "php-auto-yasnippets";
         };
@@ -19919,7 +20173,7 @@
           sha256 = "0pwhw59ki19f9rkgvvnjzhby67s0y9hpsrg6cwqxakjlm66w96q3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/php-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/php-mode";
           sha256 = "1lc4d3fgxhanqr3b8zr99z0la6cpzs2rksj806lnsfw38klvi89y";
           name = "php-mode";
         };
@@ -19940,7 +20194,7 @@
           sha256 = "09rinyx0621d7613xmbyvrrlav6d4ia332wkgg0m9dn265g3h56z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phpcbf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phpcbf";
           sha256 = "1hf88ys4grffpqgavrbc72dn3m7crafgid2ygzx9c5j55syh8mfv";
           name = "phpcbf";
         };
@@ -19961,7 +20215,7 @@
           sha256 = "1s4a0ygm79shv6f0rghrkq9jb7jc7sh9cjxzlzj0c8zpvsxl0hlz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/phpunit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/phpunit";
           sha256 = "0nj8ss1yjkcqnbnn4jgbp0403ljjk2xhipzikdrl3dbxlf14i4f8";
           name = "phpunit";
         };
@@ -19982,7 +20236,7 @@
           sha256 = "12jhdkgfck2a6d5jj65l9d98dm34gsyi0ya4h21dbbvz35zivz70";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pinyin-search";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pinyin-search";
           sha256 = "1si693nmmxgg0kp5mxvj5nq946kfc5cv3wfsl4znbqzps8qb2b7z";
           name = "pinyin-search";
         };
@@ -20003,7 +20257,7 @@
           sha256 = "1dsg49156mfhkd8ip4ny03sc06zchxr1qpbcx48f5sn4m9j5d3vs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pip-requirements";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pip-requirements";
           sha256 = "1wsjfyqga7pzp8gsm5x53qrkn40srairbjpifyrqbi2fpzmwhrnz";
           name = "pip-requirements";
         };
@@ -20024,7 +20278,7 @@
           sha256 = "1wg8pcwd70ixn2bxh01934zl12ry4pgx3l9dccpbjdi40gira00d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pixiv-novel-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pixiv-novel-mode";
           sha256 = "0f1rxvf9nrw984122i6dzsgik9axfjv6yscmg203s065n9lz17px";
           name = "pixiv-novel-mode";
         };
@@ -20045,7 +20299,7 @@
           sha256 = "0nk12dcppdyhav6m6yf7abpywyd7amxd4237zsfd32w4zxsx39k1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pkg-info";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pkg-info";
           sha256 = "0whcvralk76mfmvbvwn57va5dkb1irj7iwffgddi7r0ima49iszx";
           name = "pkg-info";
         };
@@ -20066,7 +20320,7 @@
           sha256 = "0a8qb1ldk6bjs7fpxgxrf90md7q46fhl71gmay8yafdkh6hn0kqr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pkgbuild-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pkgbuild-mode";
           sha256 = "1lp7frjahcpr4xnzxz77qj5hbpxbxm2g28apkixrnc1xjha66v3x";
           name = "pkgbuild-mode";
         };
@@ -20087,7 +20341,7 @@
           sha256 = "1k3bqv5y2xp1jl2hpf8qhs11yzhcl8k40fxqjzv7mvc0ysq9y6wb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/platformio-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/platformio-mode";
           sha256 = "022l20sfyfkvp6kmmqxr7gcmcdx6b1dgsakjjnx8fknrpxr5kyps";
           name = "platformio-mode";
         };
@@ -20108,7 +20362,7 @@
           sha256 = "11cbpgjsnw8fiqf1s12hbm9qxgjcw6y2zxx7wz4wg7idmi7m0b7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/plenv";
           sha256 = "0dw9fy5wd9wm76ag6yyw3f9jnlj7rcdcxgdjm30h514qfi9hxbw4";
           name = "plenv";
         };
@@ -20129,7 +20383,7 @@
           sha256 = "0f00dv5jwbhs99j4jc6lvr5n0mv1y80yg7zpp6yrmhww6829l5rg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plsense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/plsense";
           sha256 = "1ka06r4ashhjkfyzql9mfvs3gj7n684h4gaycj29w4nfqrhcw9va";
           name = "plsense";
         };
@@ -20150,7 +20404,7 @@
           sha256 = "0s34nbqqy6aqi113xj452pbmqp43046wfbfbbfv1xwhybgq0c1j1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/plsense-direx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/plsense-direx";
           sha256 = "0qd4b7gkmn5ydadhp70995rap3643s1aa8gfi5izgllzhg0i864j";
           name = "plsense-direx";
         };
@@ -20171,7 +20425,7 @@
           sha256 = "0xjvxfkrl6wl31s7rvbv9zczn6d6i9vf20waqlr3c2ff3zy55ygy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pony-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pony-snippets";
           sha256 = "06rrzfg20kzpscnqr2lin9jvrcydq4wnrv7nj1d0lm6988qz88jx";
           name = "pony-snippets";
         };
@@ -20192,7 +20446,7 @@
           sha256 = "0jlycv0ck5kbszwc0v2gbka6k5h39nz8763ws0v8jada7zzmyvxm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ponylang-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ponylang-mode";
           sha256 = "02fq0qp7f4bzmynzszrwskfs78nzsmf413qjxqndrh3hamixzpi1";
           name = "ponylang-mode";
         };
@@ -20213,7 +20467,7 @@
           sha256 = "18i0kivn6prh5pwdr7b4pxfxqsc8l4mks1h6cfs7iwnfn15g5k19";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pophint";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pophint";
           sha256 = "1chq2j79hg095jxw5z3pz4qicqrccw0gj4sxrin0a55hnprzzp72";
           name = "pophint";
         };
@@ -20234,7 +20488,7 @@
           sha256 = "1y538siabcf1n00wr4iz5gbxfndw661kx2mn9w1g4lg7yi4n0h0h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/popup";
           sha256 = "151g00h9rkid76qf6c53n8bncsfaikmhj8fqcb3r3a6mbngcd5k2";
           name = "popup";
         };
@@ -20255,7 +20509,7 @@
           sha256 = "084hb3zn1aiabbyxgaalszb2qjf9z64z960ks5fvz8nh7n6y7ny4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popup-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/popup-complete";
           sha256 = "04bpm31zx87j390r2xi1yl4kyqgalmyqc48xarsm67zfww9fw9c1";
           name = "popup-complete";
         };
@@ -20276,7 +20530,7 @@
           sha256 = "083q5q53j1dcv4m2jdamh28bdk6ajzcypmyb3xr52dnqdm3bw6im";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popup-imenu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/popup-imenu";
           sha256 = "0lxwfaa9vhdn55dj3idp8c3fg1g26qsqq46y5bimfd0s89bjbaxn";
           name = "popup-imenu";
         };
@@ -20297,7 +20551,7 @@
           sha256 = "0nips9npm4zmz3f37vvb4s0g1ci0p9cl6w0z4sc6agg4rybjhpdp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/popwin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/popwin";
           sha256 = "1zp54nv8rh0b3g8y5aj4793miiw2r1ijwbzq31lkwmbdr09mixmf";
           name = "popwin";
         };
@@ -20318,7 +20572,7 @@
           sha256 = "0w8bnspnk871qndp18hs0wk4x9x31xr9rwbvf5dc8mcbnj29ch33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pos-tip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pos-tip";
           sha256 = "13qjz112qlrnq34lr70087gshzq8m44knfl6694hfprzjgix84vh";
           name = "pos-tip";
         };
@@ -20339,7 +20593,7 @@
           sha256 = "1nx3b24i26kgm52xw21x4m15qjkxw3sg5r6qyvck0fyhj0gw69gr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/powerline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/powerline";
           sha256 = "0gsffr6ilmckrzifsmhwd42vr85vs42pc26f1205pbxb7ma34dhx";
           name = "powerline";
         };
@@ -20360,7 +20614,7 @@
           sha256 = "010b151wblgxlfpy590yanbl2r8qhpbqgi02v0pyir340frm9ngn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/powershell";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/powershell";
           sha256 = "162k8y9k2n48whaq93sqk86zy3p9qvsfxgyfv9n1nvk4l5wn70wk";
           name = "powershell";
         };
@@ -20381,7 +20635,7 @@
           sha256 = "0pv671j8g09pn61kkfb3pa9axfa9zd2jdrkgr81rm2gqb2vh1hsq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ppd-sr-speedbar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ppd-sr-speedbar";
           sha256 = "1m2918hqvb9c6rgb5szs95ds99gdjdxggcbdfqzmbb5sz2936av8";
           name = "ppd-sr-speedbar";
         };
@@ -20402,7 +20656,7 @@
           sha256 = "013fig9i4fyx16krp2vfv953p3rwdzr38zs6i50af4pqz4vrcfvh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pretty-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pretty-mode";
           sha256 = "1zxi4nj7vnchiiz1ndx17b719a1wipiqniykzn4pa1w7dsnqg21f";
           name = "pretty-mode";
         };
@@ -20423,7 +20677,7 @@
           sha256 = "08ljf39jfmfpdk36nws2dnwpm7y8252zsdprsc85hr1h1ig5xy15";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/processing-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/processing-mode";
           sha256 = "184yg9z14ighz9djg53ji5dgnb98dnxkkwx55m8f0f879x31i89m";
           name = "processing-mode";
         };
@@ -20444,7 +20698,7 @@
           sha256 = "08ljf39jfmfpdk36nws2dnwpm7y8252zsdprsc85hr1h1ig5xy15";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/processing-snippets";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/processing-snippets";
           sha256 = "09vkm9asmjz1in0f63s7bf4amifspsqf5w9pxiy5y0qvmn28fr2r";
           name = "processing-snippets";
         };
@@ -20465,7 +20719,7 @@
           sha256 = "0r32rjfsbna0g2376gdv0c0im1lzw1cwbp9690rgqjj95ls4saa3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/prodigy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/prodigy";
           sha256 = "032868bgy2wmb2ws48lfibs4118inpna7mmml8m7i4m4y9ll6g85";
           name = "prodigy";
         };
@@ -20486,7 +20740,7 @@
           sha256 = "1hv8ifrpwn434sm41vkgbwni21ma5kfybkwasi6zp0f2b5i9ziw7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-explorer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/project-explorer";
           sha256 = "076lzmyi1n7yrgdgyh9qinq271qk6k64x0msbzarihr3p4psrn8m";
           name = "project-explorer";
         };
@@ -20507,7 +20761,7 @@
           sha256 = "1x7hwda1w59b8hvzxyk996wdz6phs6rchh3f1ydf0ab6x7m7xvjr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-persist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/project-persist";
           sha256 = "0csjwj0qaw0hz2qrj8kxgxlixh2hi3aqib98vm19sr3f1b8qab24";
           name = "project-persist";
         };
@@ -20528,7 +20782,7 @@
           sha256 = "1nq320ph8fs9a197ji4mnw2xa24dld0r1nka476yvkg4azmcc9x8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-persist-drawer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/project-persist-drawer";
           sha256 = "1jv2y2hcqakyvfibclzm7g4diw0bvsv3a8fa43yf19wb64jm8hdb";
           name = "project-persist-drawer";
         };
@@ -20548,7 +20802,7 @@
           sha256 = "08dd2y6hdsj1rxcqa2hnjypnn9c2z43y7z2hz0fi4vny547qybz8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/project-root";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/project-root";
           sha256 = "0xjir204zk254y2x70k9vqwirx2ljmrikpsgn5kn170d1bxvhwmb";
           name = "project-root";
         };
@@ -20569,7 +20823,7 @@
           sha256 = "1rl6n6v9f4m7m969frx8b51a4lzfix2bxx6rfcfbh6kzhc00qnxf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projectile";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/projectile";
           sha256 = "1kf8hql59nwiy13q0p6p6rf5agjvah43f0sflflfqsrxbihshvdn";
           name = "projectile";
         };
@@ -20590,7 +20844,7 @@
           sha256 = "0f0siz230xsv20h8wmwa1i8wdsp964y6qmb2i3l485yh03bz1x95";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projectile-rails";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/projectile-rails";
           sha256 = "0fgvignqdqh0ma91z9385782l89mvwfn77rp1gmy8cbkwi3b7fkq";
           name = "projectile-rails";
         };
@@ -20611,7 +20865,7 @@
           sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projectile-sift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/projectile-sift";
           sha256 = "1wbgpwq9yy3v7hqidaczrvvsw5ajj7m3n4gsy3b169xv5h673a0i";
           name = "projectile-sift";
         };
@@ -20632,7 +20886,7 @@
           sha256 = "1rw55w2fpb3rw7j136kclkhppz21f7d7di4cvlv7zj5zpdl5zz88";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/projekt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/projekt";
           sha256 = "1bhb24701flihl54w8xrj6yxhynpq4dk0fp5ciac7k28n4930lw8";
           name = "projekt";
         };
@@ -20653,7 +20907,7 @@
           sha256 = "1hq8426i8rpb3qzkd5akv3i08pa4jsp9lwsskn38bfgp71pwild2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/prompt-text";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/prompt-text";
           sha256 = "1b9sj9kzx5ydq2zsfmkwsx78pzg0vsvrn92397js6b2cm24vrwwc";
           name = "prompt-text";
         };
@@ -20674,7 +20928,7 @@
           sha256 = "18ap2liz5r5a8ja2zz9182fnfm47jnsbyblpq859zks356k37iwc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/prop-menu";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/prop-menu";
           sha256 = "0dhy52fxxpa058mhhx0slw3sly3dlxm9vkax6fd1sap6f6v00p5i";
           name = "prop-menu";
         };
@@ -20695,7 +20949,7 @@
           sha256 = "03df8zvx2sry3jz2x4pi3l32qyfqa7w8kj8jdbz30nzy0h7aa070";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/protobuf-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/protobuf-mode";
           sha256 = "1hh0w93fg6mfwsbb9wvp335ry8kflj50k8hybchpjcn6f4x39xsj";
           name = "protobuf-mode";
         };
@@ -20716,7 +20970,7 @@
           sha256 = "0wgxrwl7dpy084sc76wiwpixycb171g7xwc66m5gnlrv79qyac73";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/psci";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/psci";
           sha256 = "0sgrz8byz2pcsad2pydinp4hh2xb48pdb03r93wg2vvyy8p15j9g";
           name = "psci";
         };
@@ -20737,7 +20991,7 @@
           sha256 = "0msa8c29djhy5h3zpdvx25f4y1c50rgsk8iz6r127psrxdlfrvg8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/psession";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/psession";
           sha256 = "18va6kvpia5an74vkzccs72z02vg4vq9mjzr5ih7xbcqxna7yv3a";
           name = "psession";
         };
@@ -20758,7 +21012,7 @@
           sha256 = "1p0k770h96iw8bxm8ssi0a91m050s615q036870lrlsz35mzc5kw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pt";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pt";
           sha256 = "0zmz1hcr4ajc2ydvpdxhy1dlhp7hvlkv6y6w1b79ffvq6acdd5mj";
           name = "pt";
         };
@@ -20779,7 +21033,7 @@
           sha256 = "15c2p5ffvkp80v6fvxa3bgrk8mj18famngqkz2dammxnbppvnvvz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/puml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/puml-mode";
           sha256 = "131ghjq6lsbhbx5hdg36swnkqijdb9bx6zg73hg0nw8qk0z742vn";
           name = "puml-mode";
         };
@@ -20800,7 +21054,7 @@
           sha256 = "1v48i37iqrrwbyy3bscicfq66vbbml4sg0f0n950bnk0qagjx8py";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/punctuality-logger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/punctuality-logger";
           sha256 = "0q9s74hkfqvcx67xpq9rlvh38nyjnz230bll6ks7y5yzxvl4qhcm";
           name = "punctuality-logger";
         };
@@ -20821,7 +21075,7 @@
           sha256 = "012lv7hrwlhvins81vw3yjkhdwbpi6g1dx55i101qyrpzv5ifngm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pungi";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pungi";
           sha256 = "1v9fsd764z5wdcips63z53rcipdz7bha4q6s4pnn114jn3a93ls1";
           name = "pungi";
         };
@@ -20842,7 +21096,7 @@
           sha256 = "0xr3s56p6fbm6wgw17galsl3kqvv8c7l1l1qvbhbay39yzs4ff14";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/puppet-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/puppet-mode";
           sha256 = "1s2hap6fs6rg5q80dmzhaf4qqaf5sglhs8p896i3i5hq51w0ciyc";
           name = "puppet-mode";
         };
@@ -20863,7 +21117,7 @@
           sha256 = "1wk319akv0scvyyjsd48pisi2i1gkahhsan9hfszrs6xx3anvfd9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/purescript-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/purescript-mode";
           sha256 = "00gz752mh7144nsaka5q3q4681jp845kc5vcy2nbfnqp9b24l55m";
           name = "purescript-mode";
         };
@@ -20884,7 +21138,7 @@
           sha256 = "03ivg3ddhy5zh410wgwxa17m98wywqhk62jgijhjd00b6l8i4aym";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pushbullet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pushbullet";
           sha256 = "1swzl25rcw7anl7q099qh14yhnwlbn3m20ib9kis0l1rv59kkarl";
           name = "pushbullet";
         };
@@ -20905,7 +21159,7 @@
           sha256 = "06xdq2slwhkcqlbv7x86zmv55drzif9cwjlj543cwhncphl2x9rd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-autopep8";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/py-autopep8";
           sha256 = "1argjdmh0x9c90zkb6cr4z3zkpgjp2mkpsw0dr4v6gg83jcggfpp";
           name = "py-autopep8";
         };
@@ -20926,7 +21180,7 @@
           sha256 = "0150q6xcnzzrkn9fa9njm973l1d49c48ad8qia71k4jwrxjjj6zr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-isort";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/py-isort";
           sha256 = "0k5gn3bjn5pv6dn6p0m9xghn0sx3m29bj3pfrmyh6gd5ic0l00yb";
           name = "py-isort";
         };
@@ -20947,7 +21201,7 @@
           sha256 = "09z739w4fjg9xnv3mbh7v8j59mnbsfq4ygq616pj4xcw3nsh0rbg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/py-yapf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/py-yapf";
           sha256 = "1381x0ffpllxwgkr2d8xxbv1nd4k475m1aff8l5qijw7d1fqga2f";
           name = "py-yapf";
         };
@@ -20968,7 +21222,7 @@
           sha256 = "0qg1kjzsv2mcvlsivqy8ys3djbs5yala37r9h2zcxdicl88q0l11";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pycarddavel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pycarddavel";
           sha256 = "12k2mnzkd8yv17csfhclsnd479vcabawmac23yw6dsw7ic53jf1a";
           name = "pycarddavel";
         };
@@ -20989,7 +21243,7 @@
           sha256 = "1y3q1k195wp2kgp00a1y34i20zm80wdv2kxigh6gbn2r6qzkqrar";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pyenv-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pyenv-mode";
           sha256 = "00yqrk92knv9gq1m9xcg78gavv70jsjlwzkllzxl63iva9qrch59";
           name = "pyenv-mode";
         };
@@ -21010,7 +21264,7 @@
           sha256 = "0q6bib9nr6xiq6npzbngyfcjk87yyvwzq1zirr3z1h5wadm34lsk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-environment";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/python-environment";
           sha256 = "1pq16rddw76ic5d02j5bswl9qcydi47hqmhs7r06jk46vsfzxpl7";
           name = "python-environment";
         };
@@ -21031,7 +21285,7 @@
           sha256 = "00i7cc4r7275l22k3708xi4hqw2j44yivdb1madzrpf314v3kabr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/python-x";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/python-x";
           sha256 = "115mvhqfa0fa8kdk64biba7ri4xjk74qqi6vm1a5z3psam9mjcmn";
           name = "python-x";
         };
@@ -21052,7 +21306,7 @@
           sha256 = "1af9cd8l5ac58mj92xc7a3diy995cv29abnbb3fl6x4208l4xs3c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pythonic";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pythonic";
           sha256 = "1hq0r3vg8vmgw89wfjdqknwm76pimlk0dy56wmh9vffh06gqsb51";
           name = "pythonic";
         };
@@ -21073,7 +21327,7 @@
           sha256 = "0jidmc608amd0chs4598zkj0nvyll0al093121hkczsbpgbllq9z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/pyvenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/pyvenv";
           sha256 = "0gai9idss1wvryxyqk3pv854mc2xg9hd0r55r2blql8n5rd2yv8v";
           name = "pyvenv";
         };
@@ -21094,7 +21348,7 @@
           sha256 = "110z27n3h7p2yalicfhnv832ikfcf7p0hrf5qkryz1sdmz79wb3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/qiita";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/qiita";
           sha256 = "1kzk7pc68ks9gxm2l2d28al23gxh56z0cmkl80qwg7sh4gsmhyxl";
           name = "qiita";
         };
@@ -21115,7 +21369,7 @@
           sha256 = "1mlka59gyylj4cabi1b552h11qx54kjqwx3bkmsdngjrd4da222a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/qml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/qml-mode";
           sha256 = "123mlibviplzra558x87da4zx0kpbhsgfigjjgjgp3mdg897084n";
           name = "qml-mode";
         };
@@ -21136,7 +21390,7 @@
           sha256 = "0lfmdlb626b3gbmlvacwn84vpqam6gk9lp29wk0hcraw69vaw1v8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quasi-monochrome-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/quasi-monochrome-theme";
           sha256 = "0h5pqrklyga40jg8qc47lwmf8khn0vcs5jx2sdycl2ipy0ikmfs0";
           name = "quasi-monochrome-theme";
         };
@@ -21149,16 +21403,16 @@
     quickrun = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "quickrun";
-        version = "2.2.6";
+        version = "2.2.7";
         src = fetchFromGitHub {
           owner = "syohex";
           repo = "emacs-quickrun";
-          rev = "31c61de338c7b689bbb78e0aa691bd68f7c20941";
-          sha256 = "09sdv5lf5k347415r9fzljm374rb29gq6kldx2awd164fkdnm8ds";
+          rev = "fe23f324b0198f8827cc0768e8507a02194eec68";
+          sha256 = "1iypwvdgdh30c9br7jnibgwbdca2mqjy95x2ppsc51sik2mz2db1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/quickrun";
-          sha256 = "1szgirakfnkn9ksls16p233sr7x9ck5m1f1kbk6ancj36yja2nki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/quickrun";
+          sha256 = "0f989d6niw6ghf9mq454kqyp0gy7gj34vx5l6krwc52agckyfacy";
           name = "quickrun";
         };
         packageRequires = [ cl-lib emacs ];
@@ -21178,7 +21432,7 @@
           sha256 = "02bddznlqys37fnhdpp2g9xa9m7kfgrj1vl0hc5kr42hggk9wwmg";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/r-autoyas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/r-autoyas";
           sha256 = "18zifadsgbwnga205jvpx61wa2dvjxmxs5v7cjqhny45a524nbv4";
           name = "r-autoyas";
         };
@@ -21199,7 +21453,7 @@
           sha256 = "0pbswxzgfqcp6vjlwhvnablj91kxq588j2fmcjzhf0aigkj7dxfb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/racer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/racer";
           sha256 = "1091y5pisbf73i6zg5d7yny2d5yckkjg0z6fpjpmz5qjs3xcm9wi";
           name = "racer";
         };
@@ -21220,7 +21474,7 @@
           sha256 = "02x5ciyafqwak06yk813kl8p92hq03wjsk1882q8axr9q231100c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rainbow-blocks";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rainbow-blocks";
           sha256 = "08p41wvrw1j3h7j7lyl8nxk1gcc2id9ikljmiklg0kc6s8ijhng8";
           name = "rainbow-blocks";
         };
@@ -21241,7 +21495,7 @@
           sha256 = "0gxc8j5a14bc9mp43cbcz41ipc0z1yvmypg52dnl8hadirry20gd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rainbow-delimiters";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rainbow-delimiters";
           sha256 = "132nslbnszvbgkl0819z811yar3lms1hp5na4ybi9gkmnb7bg4rg";
           name = "rainbow-delimiters";
         };
@@ -21262,7 +21516,7 @@
           sha256 = "05i0jpmxzsj2lsj48cafn3v93z37l7k5kaza2ik3yirdpjdibyrh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rainbow-identifiers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rainbow-identifiers";
           sha256 = "0lw790ymrgpyh0sxwmzinl2ik5vl5vggbg14cd0cx5yagkw5y3mp";
           name = "rainbow-identifiers";
         };
@@ -21283,7 +21537,7 @@
           sha256 = "1q65jj6bghvzhlqmpg61a7vn8izc01wp2fjiqx013zxpg9awvzmq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rake";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rake";
           sha256 = "0cw47g6cjnkh3z4hbwwq1f8f5vrvs84spn06k53bx898brqdh8ns";
           name = "rake";
         };
@@ -21304,7 +21558,7 @@
           sha256 = "0fkj89p0rb0r472p1rk8xpx8c74pg968pc2mmw3838y4fpc8i198";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ranger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ranger";
           sha256 = "14g4r4iaz0nzfsklslrswsik670pvfd0605xfjghvpngn2a8ych4";
           name = "ranger";
         };
@@ -21325,7 +21579,7 @@
           sha256 = "1i16361klpdsxphcjdpxqswab3ing69j1wb9nygws7ghil85h0bx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rase";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rase";
           sha256 = "1g7v2z7l4csl5by64hc3zg4kgrkvv81iq30mfqq4nvy1jc0xa6j0";
           name = "rase";
         };
@@ -21346,7 +21600,7 @@
           sha256 = "09c6v4lnv6vm2cckbdpx2fdi9xkz9l68qvhx35vaawxhrkgvypzp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rbenv";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rbenv";
           sha256 = "09nw7sz6rdgs7hdw517qwgzgyrdmxb16sgldfkifk41rhiyqhr65";
           name = "rbenv";
         };
@@ -21359,15 +21613,15 @@
     rcirc-styles = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "rcirc-styles";
-        version = "1.3.1";
+        version = "1.3.2";
         src = fetchFromGitHub {
           owner = "aaron-em";
           repo = "rcirc-styles.el";
-          rev = "d0547eda261d0885951b283e5622345f999d2083";
-          sha256 = "0yhmdkvswnn5rga5xzysfpivbz9wdkzbm49licilc2fp1dgcvd6i";
+          rev = "f313bf6a7470bed314b27c7a40558cb787d7bc67";
+          sha256 = "1kwn33rxaqik5jls66c2indvswhwmxdmd60n7a1h9siqm5qhy9d6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rcirc-styles";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rcirc-styles";
           sha256 = "01dxhnzsnljig769dk9axdi970b3lw2s6p1z3ljf29qlb5j4548r";
           name = "rcirc-styles";
         };
@@ -21388,7 +21642,7 @@
           sha256 = "0r95fzi0x8r18x7r574mp503qaiqyicrq78zlggyz6qihi95pmqj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rdf-prefix";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rdf-prefix";
           sha256 = "1vxgn5f2kws17ndfdv1vj5p9ks3rp6sikzpc258j07bhsfpjz5qm";
           name = "rdf-prefix";
         };
@@ -21409,7 +21663,7 @@
           sha256 = "1ka5q2q18hgh7wl5yn04489121bq4nx369rz8nb7dr5l14cas0xm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/real-auto-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/real-auto-save";
           sha256 = "03dbbizpyg62v6zbq8hd16ikrifz8m2bdlbb3g67f2834xqmxha8";
           name = "real-auto-save";
         };
@@ -21430,7 +21684,7 @@
           sha256 = "07j1grdbqv3iv5ghmgsjw678bxjajcxi27clz4krcz3ys5b1h70v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/realgud";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/realgud";
           sha256 = "15vlln4w4wlgrk5i5nhgvjcbardpahgs9kwwayb1vmj10c8a837s";
           name = "realgud";
         };
@@ -21451,7 +21705,7 @@
           sha256 = "114ssmby614xjs7mrpbbsdd4gj5ra6klfh8h6z8iij8xn3kii83q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/recover-buffers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/recover-buffers";
           sha256 = "0g40d7440hzlc9b45v63ng0anvmgip4dhbd9wcm2sn8qjfr4w11b";
           name = "recover-buffers";
         };
@@ -21472,7 +21726,7 @@
           sha256 = "1vpsihrl03hkd6n6b7mrjccm0a023qf3154a8rw4chihikxw27pj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rect+";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rect+";
           sha256 = "0vk0jwpl6yp2md9nh0ghp2qn883a8lr3cq8c9mgq0g552dwdiv5m";
           name = "rect-plus";
         };
@@ -21493,7 +21747,7 @@
           sha256 = "048pjrd04w6w4v6r56yblbqgkjh01xib7k1i6rjc6288jh5vr1vm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rectangle-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rectangle-utils";
           sha256 = "1w5z2gykydsfp30ahqjihpvq04c5v0cfslbrrg429hycys8apws7";
           name = "rectangle-utils";
         };
@@ -21514,7 +21768,7 @@
           sha256 = "19c5rkb4nn6fs85lixrgrv8gagr69h430inig31dvm4fip9xdjp9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/redpen-paragraph";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/redpen-paragraph";
           sha256 = "0jr707ik6fhznq0q421l986w85ah0n9b4is91zrgbk1v6miqrhca";
           name = "redpen-paragraph";
         };
@@ -21535,7 +21789,7 @@
           sha256 = "1r8fhs7d2vkrbv15ic2bm79i9a8swbc38vk566vnxkhl3rfd5a0a";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/relative-line-numbers";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/relative-line-numbers";
           sha256 = "0mj1w5a4ax8hwz41vn02bacxlnifd14hvf3p288ljvwchvlf0hn3";
           name = "relative-line-numbers";
         };
@@ -21556,7 +21810,7 @@
           sha256 = "0lqbhwi1f8b4sv9p1rf0gyjllk0l7g6v6mlws496079wxx1n5j66";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/relax";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/relax";
           sha256 = "0gfr4ym6aakawhkfz40ar2n0rfz503hq428yj6rbf7jmq3ajaysk";
           name = "relax";
         };
@@ -21577,7 +21831,7 @@
           sha256 = "007lqahjbig6yygqik6fgbq114784z6l40a3vrc4qs9361zqizck";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/repeatable-motion";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/repeatable-motion";
           sha256 = "12z4z8apd8ksf6dfvqm54l71mx68j0yg4hrjypa9p77fpcd6p0zw";
           name = "repeatable-motion";
         };
@@ -21598,7 +21852,7 @@
           sha256 = "12wylmyz54n1f3kaw9clhvs66dg43xvcvll4pl5ii0ibfv6pls1b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/repl-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/repl-toggle";
           sha256 = "1jyaksxgyygfv1wn9c6y8sykb4hicwgs9n5vrdikd2i0iix29zpb";
           name = "repl-toggle";
         };
@@ -21619,7 +21873,7 @@
           sha256 = "1pxvwiqhv2nmsxkdwn9jx7na1vgk9dg9yxidglxpmvpid6fy4qdk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/replace-symbol";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/replace-symbol";
           sha256 = "07ljmw6aw9hsqffhwmiq2pvhry27acg6f4vgxgi91vjr8jj3r4ng";
           name = "replace-symbol";
         };
@@ -21640,7 +21894,7 @@
           sha256 = "0hs80g3npgb6qfcaivdfkpsc9mss1kdmyp5j7s922qcy2k4yxmgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/repo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/repo";
           sha256 = "0z4lcswh0c6xnsxlv33bsxh0nh26ydzfl8sv8xabdp5a2gk6bhpb";
           name = "repo";
         };
@@ -21661,7 +21915,7 @@
           sha256 = "1xzp2hnkr9lsjx50cxlpki9mvyhjsv0vyc77480jrlnpspakj7qs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/req-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/req-package";
           sha256 = "1438f60dnmc3a2dh6hd0wslrh25nd3af797aif70kv6qc71h87vf";
           name = "req-package";
         };
@@ -21671,43 +21925,43 @@
           license = lib.licenses.free;
         };
       }) {};
-    request = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    request = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "request";
-        version = "0.1.0";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-request";
-          rev = "b548f8bd9c4372232cb3d3633b9fcfffb2f535ff";
-          sha256 = "0j7nakxj750rhdnm0nk075s7rx38rc9npbb55kg7r9vb2qilnvmr";
+          rev = "48a35969f7c41810d550e6cdf784cb86c5a05a20";
+          sha256 = "1fiyxbd87cdlsdhpm3b3z8ypkrkvya6lamn0qx9hsxl1yv27vx4m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/request";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/request";
           sha256 = "09gxfy34a13wr0agmhn0nldxaiyc72rx9xi56jirsvji4dg5j6mm";
           name = "request";
         };
-        packageRequires = [];
+        packageRequires = [ cl-lib ];
         meta = {
           homepage = "http://melpa.org/#/request";
           license = lib.licenses.free;
         };
       }) {};
-    request-deferred = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    request-deferred = callPackage ({ deferred, fetchFromGitHub, fetchurl, lib, melpaBuild, request }:
     melpaBuild {
         pname = "request-deferred";
-        version = "0.1.0";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "abingham";
           repo = "emacs-request";
-          rev = "b548f8bd9c4372232cb3d3633b9fcfffb2f535ff";
-          sha256 = "0j7nakxj750rhdnm0nk075s7rx38rc9npbb55kg7r9vb2qilnvmr";
+          rev = "48a35969f7c41810d550e6cdf784cb86c5a05a20";
+          sha256 = "1fiyxbd87cdlsdhpm3b3z8ypkrkvya6lamn0qx9hsxl1yv27vx4m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/request-deferred";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/request-deferred";
           sha256 = "19s8q9a01v0g897s9ass1mr5wbzy82rrfcnqpvcvp05q4y787dn9";
           name = "request-deferred";
         };
-        packageRequires = [];
+        packageRequires = [ deferred request ];
         meta = {
           homepage = "http://melpa.org/#/request-deferred";
           license = lib.licenses.free;
@@ -21724,7 +21978,7 @@
           sha256 = "1b832r7779rmr6rhzj7klc0l5xzwc4rids87g2hczpb5dhqnchca";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/requirejs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/requirejs";
           sha256 = "09z6r9wcag3gj075wq215zcslyknl1izap595rn48xvizxi06c6k";
           name = "requirejs";
         };
@@ -21745,7 +21999,7 @@
           sha256 = "1ywcnrrr4wp6c951mqfscvdgcmwyvxy80p40vi27nzbl977lb1xv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/resize-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/resize-window";
           sha256 = "0h1hlj50hc97wxqpnmvg6w3qhdd9nbnb8r8v39ylv87zqjcmlp8l";
           name = "resize-window";
         };
@@ -21766,7 +22020,7 @@
           sha256 = "0y4ga1lj2x2f0r535ivs09m2l0q76iz72w42wknhsw9lmdsyl5nz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/restart-emacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/restart-emacs";
           sha256 = "03aabz7fmy99nwimvjn7qz6pvc94i470hfgiwmjz3348cw02k0n6";
           name = "restart-emacs";
         };
@@ -21787,7 +22041,7 @@
           sha256 = "1q13cgpz4wzhnqv84ablawy3y2wgdwy46sp7454mmfx9m77jzb2v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/reveal-in-osx-finder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/reveal-in-osx-finder";
           sha256 = "00jgrmh5s3vlpj1jjf8l3c3h4hjk5x781m95sidw6chimizvfmfc";
           name = "reveal-in-osx-finder";
         };
@@ -21808,8 +22062,8 @@
           sha256 = "15xnz4fi22wsximimwmirlz11v4ksfj8nilyjfw6acd92yrhzg6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/reverse-theme";
-          sha256 = "1lq8nwhf8n5i280v0kqksndm4b3n6x34wnd5fa5i48ljwr5cinih";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/reverse-theme";
+          sha256 = "163kk5qnz9bk3l2fam79n264s764jfxbwqbiwgid8kw9cmk0v776";
           name = "reverse-theme";
         };
         packageRequires = [];
@@ -21829,7 +22083,7 @@
           sha256 = "11hwf9y5ax207w6rwrsmi3pmn7pn7ap6iys0z8hni2f5zzxjrmx3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rich-minority";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rich-minority";
           sha256 = "11xd76w5k3b3q5bxqjb55vi6dsal9drvyc1nh7z83awm59hvgczc";
           name = "rich-minority";
         };
@@ -21850,7 +22104,7 @@
           sha256 = "0p044wg9d4i6f5x7bdshmisgwvw424y16lixac93q6v5bh3xmab5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rigid-tabs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rigid-tabs";
           sha256 = "06n0bcvc3nnp84pcq3lywwga7l92jz8hnkilhbq59kydf5zbjldp";
           name = "rigid-tabs";
         };
@@ -21871,7 +22125,7 @@
           sha256 = "1wqhqv2fc5h10igv1php51bayx0s7qw4m9gzx9by80dab8lwa0vk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rinari";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rinari";
           sha256 = "0qknicg3vzl7zbkwsdvp10hrvlng6mbi8hgslx4ir522dflrf9p0";
           name = "rinari";
         };
@@ -21892,7 +22146,7 @@
           sha256 = "1drvyf5asjp3lgpss7llff35q8r89vmh73n1axaj2qp9jx5a5jih";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rnc-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rnc-mode";
           sha256 = "09ly7ln6qrcmmim9bl7kd50h4axrhy6ig406r352xm4a9zc8n22q";
           name = "rnc-mode";
         };
@@ -21913,7 +22167,7 @@
           sha256 = "01xd3nc7bmf4r4d37x08rw2dlsg6gns8mraahi4rwkg6a9lwl44n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/robe";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/robe";
           sha256 = "19py2lwi7maya90kh1mgwqb16j72f7gm05dwla6xrzq1aks18wrk";
           name = "robe";
         };
@@ -21934,7 +22188,7 @@
           sha256 = "0rgv4y9aa5cc2ddz3y5z8d22xmr8kf5c60h0r3g8h91jmcw3rb4z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/roguel-ike";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/roguel-ike";
           sha256 = "1a7sa6nhgi0s4gjh55bhk5cg6q6s7564fk008ibmrm05gfq9wlg8";
           name = "roguel-ike";
         };
@@ -21955,7 +22209,7 @@
           sha256 = "133ficdghshlmwq5dn42cg3h51jdg4lcwqr4cd2s2s52rz8plw9h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rope-read-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rope-read-mode";
           sha256 = "0grnn5k6rbck0hz4c6cadgj3a4dv62habyingznisg2kx9i3m0dw";
           name = "rope-read-mode";
         };
@@ -21976,7 +22230,7 @@
           sha256 = "0mfkq8n28lal4lqwp6v0ilz8wrwgg61sbm0jggznwisjqqy3lzrh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rsense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rsense";
           sha256 = "1901xqlpc8fg4sl9j58jn40i2djs8s0cdcqcrzrq02lvk8ssfdf5";
           name = "rsense";
         };
@@ -21997,7 +22251,7 @@
           sha256 = "0hrn5n7aaymwimk511kjij44vqaxbmhly1gwmlmsrnbvvma7f2mp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rspec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rspec-mode";
           sha256 = "0nyib9rx9w9cbsgkcjx9n8fp77xkzxg923z0rdm3f9kc7njcn0zx";
           name = "rspec-mode";
         };
@@ -22018,7 +22272,7 @@
           sha256 = "0shzxxx7qajmfrxqipmlak899hgmxkqf9zkbmr0g04wamxmyfs65";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rtags";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rtags";
           sha256 = "08clwydx2b9cl4wv61b0p564jpvq7gzkrlcdkchpi4yz6djbp0lw";
           name = "rtags";
         };
@@ -22039,7 +22293,7 @@
           sha256 = "10djjp1520xc05qkciaiaiiciscaln6c74h7ymba40mvzlf67y9q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rubocop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rubocop";
           sha256 = "114azl0fasmnq0fxxyiif3363mpg8qz3ynx91in5acqzh902fa3q";
           name = "rubocop";
         };
@@ -22060,7 +22314,7 @@
           sha256 = "1wqhqv2fc5h10igv1php51bayx0s7qw4m9gzx9by80dab8lwa0vk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-compilation";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-compilation";
           sha256 = "1x1vpkjpx95sfcjhkx4cafypj0nkbd1i0mzxx3lmcrsmg8iv0rjc";
           name = "ruby-compilation";
         };
@@ -22081,7 +22335,7 @@
           sha256 = "1cpz9vkp57nk682c5xm20g7bfj5g2aq5ahpk4nhgx7pvd3xvr1ds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-end";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-end";
           sha256 = "0cx121hji8ws6s3p2xfdgidm363y05g2n880fqrmzyz27cqkljis";
           name = "ruby-end";
         };
@@ -22102,7 +22356,7 @@
           sha256 = "01n9j7sag49m4bdl6065jklnxnc5kck51izg884s1is459qgy86k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-hash-syntax";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-hash-syntax";
           sha256 = "0bvwyagfh7mn457iibrpv1ay75089gp8pg608gbm24m0ix82xvb5";
           name = "ruby-hash-syntax";
         };
@@ -22123,7 +22377,7 @@
           sha256 = "008zj9rg2cmh0xd7g6kgx6snm5sspxs4jmfa8hd43wx5y9pmlb8f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-test-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-test-mode";
           sha256 = "113ysf08bfh2ipk55f8h741j05999yrgx57mzh53rim5n63a312w";
           name = "ruby-test-mode";
         };
@@ -22144,7 +22398,7 @@
           sha256 = "1zvhq9l717rjgkm7bxz5gqkmh5i49cshwzlimb3h78kpjw3hxl2k";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ruby-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ruby-tools";
           sha256 = "1zs2vzcrw11xyj2a7lgqzw4slcha20206jvjbxkm68d57rffpk8y";
           name = "ruby-tools";
         };
@@ -22165,7 +22419,7 @@
           sha256 = "0iblk0vagjcg3c8q9hlpwk7426ms7aq0s80izgvascfmyqycv6qm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/rvm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/rvm";
           sha256 = "08i7cmav2cz73jp88ww0ay2yjhk9dj8146836q4sij1bl1slbaf8";
           name = "rvm";
         };
@@ -22186,7 +22440,7 @@
           sha256 = "08vf62fcrnbmf2ppb759kzznjdz8x72fqdwbc4n8nbswrwgm2ikl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/s";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/s";
           sha256 = "0b2lj6nj08pk5fnxvjkc1d9hvi29rnjjy4n5ns4pq6wxpfnlcw64";
           name = "s";
         };
@@ -22207,7 +22461,7 @@
           sha256 = "06gqqbkn85l2p05whmr4wkg9axqyzb7r7sgm3r8wfshm99kgpxvl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sackspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sackspace";
           sha256 = "1m10iw83k6m7v7sg2dxzdy83zxq6svk8h9fh4ankyn3baqrdxg5z";
           name = "sackspace";
         };
@@ -22228,7 +22482,7 @@
           sha256 = "0aw95qkql6apyn79la0jbpr0nlixhl9zvi9miry2h5y5pawb3yvf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sage-shell-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sage-shell-mode";
           sha256 = "18k7yh8rczng0kn2wsawjml70cb5bnc5jr2gj0hini5f7jq449wx";
           name = "sage-shell-mode";
         };
@@ -22249,7 +22503,7 @@
           sha256 = "0lxrq3mzabkwj5bv0mgd7fnx3dsx8vxd5kjgb79rjfra0m7pfgln";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sass-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sass-mode";
           sha256 = "1byjk5zpzjlyiwkp780c4kh7s9l56y686sxji89wc59d19rp8800";
           name = "sass-mode";
         };
@@ -22270,7 +22524,7 @@
           sha256 = "1mcag7qad1npjn096byakb8pmmi2g64nlf2vcc12irzmwia85fml";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sauron";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sauron";
           sha256 = "01fk1xfh7r16fb1xg5ibbs7gci9dja49msdlf7964hiq7pnnhxgb";
           name = "sauron";
         };
@@ -22280,27 +22534,6 @@
           license = lib.licenses.free;
         };
       }) {};
-    save-sexp = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
-    melpaBuild {
-        pname = "save-sexp";
-        version = "0.2.0";
-        src = fetchFromGitHub {
-          owner = "tarsius";
-          repo = "save-sexp";
-          rev = "dce78d8630af6b2e29e3ec83b819a3d688d37dfc";
-          sha256 = "1gh97rc528cpam3jsncc03cyf4pps71b8blmdikml71lks07lgwb";
-        };
-        recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/save-sexp";
-          sha256 = "12jx47picdpw668q75qsp9gncrnxnlk1slhzvxsk5pvkdwh26h66";
-          name = "save-sexp";
-        };
-        packageRequires = [];
-        meta = {
-          homepage = "http://melpa.org/#/save-sexp";
-          license = lib.licenses.free;
-        };
-      }) {};
     sbt-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild, scala-mode2 }:
     melpaBuild {
         pname = "sbt-mode";
@@ -22312,7 +22545,7 @@
           sha256 = "0y846zmcz5x2jn5bndm0mfi18jc5cd1fkidgc4wvqmm0w30gyx4q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sbt-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sbt-mode";
           sha256 = "0v0n70czgkdijnw5jd4na41vlrmqcshvr8gdpv0bv55ilqhiihc8";
           name = "sbt-mode";
         };
@@ -22333,7 +22566,7 @@
           sha256 = "1gfhk595vnf6565nv6m1v8dc4a3a9z34jj1qdh02lk8azg5ylk89";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scala-mode2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scala-mode2";
           sha256 = "0rnkln6jwwqc968w3qpc6zjjv8ylw0w6c2hsjpq2slja3jn5khch";
           name = "scala-mode2";
         };
@@ -22354,7 +22587,7 @@
           sha256 = "0hhsgyil8aqdkkip5325yrdq89gnijglcbf1dsvl4wvnmq7a1rik";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scala-outline-popup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scala-outline-popup";
           sha256 = "1fq0k6l57wkya1ycm4cc190kg90j2k9clnl0sc70achp4i47qbk7";
           name = "scala-outline-popup";
         };
@@ -22375,7 +22608,7 @@
           sha256 = "13s8hp16wxd9fb8gf05dn0xr692kkgiqg7v49fgr00gas4xgpfpm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scpaste";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scpaste";
           sha256 = "02dqmx6v3jxdn5yz1z74624sc6sz2bm4qjyi78w9akhp2jplwlk1";
           name = "scpaste";
         };
@@ -22396,7 +22629,7 @@
           sha256 = "0zpjf9cp8g4rgnwgmhlpwnanf9lzqm3rm1mkihf0gk5qzxvwsdh9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/scss-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/scss-mode";
           sha256 = "1g27xnp6bjaicxjlb9m0njc6fg962j3hlvvzmxvmyk7gsdgcgpkv";
           name = "scss-mode";
         };
@@ -22417,7 +22650,7 @@
           sha256 = "08yc67a4ji7z8s0zh500wiscziqsxi92i1d33fjla2mcr8sxxn0i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/search-web";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/search-web";
           sha256 = "0qqx9l8dn1as4gqpq80jfacn6lz0132m91pjzxv0fx6al2iz0m36";
           name = "search-web";
         };
@@ -22438,7 +22671,7 @@
           sha256 = "0nsm7z056rh32sq7abgdwyaz4dbz8v9pgbha5jvpk7y0zmnabrgs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sekka";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sekka";
           sha256 = "1jj4ly9p7m3xvb31nfn171lbpm9y70y8cbf8p24w0fhv665dx0cp";
           name = "sekka";
         };
@@ -22448,6 +22681,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    select-themes = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "select-themes";
+        version = "0.1.4";
+        src = fetchFromGitHub {
+          owner = "jasonm23";
+          repo = "emacs-select-themes";
+          rev = "236f54287519a3ea6dd7b3992d053e4f4ff5d0fe";
+          sha256 = "1c9yv1kjcd0jrzgw99q9p4kzj980f261mjcsggbcw806wb0iw1xn";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/select-themes";
+          sha256 = "18ydv7240vcqppg1i7n8sy18hy0lhpxz17947kxs7mvj4rl4wd84";
+          name = "select-themes";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/select-themes";
+          license = lib.licenses.free;
+        };
+      }) {};
     selectric-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "selectric-mode";
@@ -22459,7 +22713,7 @@
           sha256 = "18xdkisxvdizsk51pnyimp9mwc6k9cpcxqr5hgndkz9q97p5dp79";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/selectric-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/selectric-mode";
           sha256 = "1k4l0lr68rqyi37wvqp1cnfci6jfkz0gvrd1hwbgx04cjgmz56n4";
           name = "selectric-mode";
         };
@@ -22480,7 +22734,7 @@
           sha256 = "15lx6qvmq3vp84ys8dzbx1nzxcnzlq41whawc2yhrnd1dbq4mv2d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/servant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/servant";
           sha256 = "048xg0gcwnf4l2p56iw4iawi3ywjz7f6icnjfi8qzk1z912iyl9h";
           name = "servant";
         };
@@ -22501,7 +22755,7 @@
           sha256 = "1h58q41wixjlapia1ggf83jxcllq7492k55mc0fq7hbx3hw1q1y2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/serverspec";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/serverspec";
           sha256 = "001d57yd0wmz4d7qmhnanac8g29wls0sqw194003hrgirakg82id";
           name = "serverspec";
         };
@@ -22522,7 +22776,7 @@
           sha256 = "0sp952abz7dkq8b8kkzzmnwnkq5w15zsx5dr3h8lzxb92lnank9v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/session";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/session";
           sha256 = "0fghxbnf1d5iyrx1q8xd0lbw9nvkdgg2v2f89j6apnawisrsbhwx";
           name = "session";
         };
@@ -22543,7 +22797,7 @@
           sha256 = "11h5z2gmwq07c4gqzj2c9apksvqk3k8kpbb9kg78bbif2xfajr3m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sexp-move";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sexp-move";
           sha256 = "0lcxmr2xqh8z7xinxbv1wyrh786zlahhhj5nnbv83i8m23i3ymmd";
           name = "sexp-move";
         };
@@ -22564,7 +22818,7 @@
           sha256 = "0yy162sz7vwj0i9w687a5x1c2fq31vc3i6gqhbywspviczdp4q1y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shackle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shackle";
           sha256 = "159z0cwg7afrmym0xk902d8z093sqv39jig25ds7z4a224yrv5w6";
           name = "shackle";
         };
@@ -22585,7 +22839,7 @@
           sha256 = "11g9lsgakq8nf689k49p9l536ffi62g3bh11mh9ix1l058xamqw2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shampoo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shampoo";
           sha256 = "01ssgw4cnnx8d86g3r1d5hqcib4qyhmpqvcvx47xs7zh0jscps61";
           name = "shampoo";
         };
@@ -22606,7 +22860,7 @@
           sha256 = "0fzywfdaisvvdbcl813n1shz0r8v1k9kcgxgynv5l0i4nkrgkww5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-pop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shell-pop";
           sha256 = "02s17ln0hbi9gy3di8fksp3mqc7d8ahhf5vwyz4vrc1bg77glxw8";
           name = "shell-pop";
         };
@@ -22627,7 +22881,7 @@
           sha256 = "0mcxp74sk9bn36gbhhimgns07iqa4dgbq2pvpqy41igqwb84w306";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-split-string";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shell-split-string";
           sha256 = "1yj1h7za4ylxh2nikj7s1qqlilpsk05x9571a2fymfyznm3iq77m";
           name = "shell-split-string";
         };
@@ -22648,7 +22902,7 @@
           sha256 = "0ia7sdip4hl27avckv3qpqgm3k4ynvp3xxq1cy53bqfzzx0gcria";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-switcher";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shell-switcher";
           sha256 = "07g9naiv2jk9jxwjywrbb05dy0pbfdx6g8pkra38rn3vqrjzvhyx";
           name = "shell-switcher";
         };
@@ -22669,7 +22923,7 @@
           sha256 = "0wvaa5nrbblayjvzjyj6cd942ywg7xz5d8fqaffxcvwlcdihvm7q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shell-toggle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shell-toggle";
           sha256 = "1ai0ks7smr8b221j9hmsikswpxqraa9b13fpwv4wwagavnlah446";
           name = "shell-toggle";
         };
@@ -22690,7 +22944,7 @@
           sha256 = "1nli26llyfkj1cz2dwn18c5pz1pnpz3866hapfibvdmwrg4z6cax";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shelldoc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shelldoc";
           sha256 = "1xlp03aaidp7dp8349v8drzhl4lcngvxgdrwwn9cahfqlrvvbbbx";
           name = "shelldoc";
         };
@@ -22711,7 +22965,7 @@
           sha256 = "0mn7bwvj1yv75a2531jp929j6ypckdfqdg6b5ig0kkbcrrwb7kxs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shelltest-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shelltest-mode";
           sha256 = "1inb0vq34fbwkr0jg4dv2lljag8djggi8kyssrzhfawri50m81nh";
           name = "shelltest-mode";
         };
@@ -22732,7 +22986,7 @@
           sha256 = "1vf766ja8f4xp1f5pmwgz6a85km0nxvc5dn571lwidfrrdbr9rkk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shm";
           sha256 = "1qmp8cc83dcz25xbyqd4987i0d8ywvh16wq2wfs4km3ia8a2vi3c";
           name = "shm";
         };
@@ -22753,7 +23007,7 @@
           sha256 = "09454mcjd8n1090pjc5mk1dc6bn3bgh60ddpnv9hkajkzpcjxx4h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shpec-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shpec-mode";
           sha256 = "155hc1nym3fsvflps8d3ixaqw1cafqp97zcaywdppp47n7vj8zjl";
           name = "shpec-mode";
         };
@@ -22774,7 +23028,7 @@
           sha256 = "050gmxdk88zlfjwi07jsj2mvsfcv5imhzcpa6ip3cqkzpmw3pl32";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shrink-whitespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shrink-whitespace";
           sha256 = "12if0000i3rrxcm732layrv2h464wbb4xflbbfc844c83dbx1jmq";
           name = "shrink-whitespace";
         };
@@ -22795,7 +23049,7 @@
           sha256 = "103yvfgkj78i4bnv1fwk76izsa8h4wyj3vwj1vq7xggj607hkxzq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/shut-up";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/shut-up";
           sha256 = "1bcqrnnafnimfcg1s7vrgq4cb4rxi5sgpd92jj7xywvkalr3kh26";
           name = "shut-up";
         };
@@ -22816,7 +23070,7 @@
           sha256 = "1ma6djvhvjai07v1g9a36lfa3nw8zsy6x5vliwcdnkf44gs287ra";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sift";
           sha256 = "0mv5zk140kjilwvzccj75ym7wlkkqryb532mbsy7i9bs3q7m916d";
           name = "sift";
         };
@@ -22837,7 +23091,7 @@
           sha256 = "1qmkc0w28l53zzf5yd2grrk1sq222g5qnsm35ph25s1cfvc1qb2g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simple-httpd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simple-httpd";
           sha256 = "18dharsdiwfkmhd9ibz9f47yfq9c2d78i886pi6gsjh8iwcpzx59";
           name = "simple-httpd";
         };
@@ -22858,7 +23112,7 @@
           sha256 = "0v0vmkix9f0hb2183irr6xra8mwi47g6rn843sas7jy2ycaqd91v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simpleclip";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simpleclip";
           sha256 = "07qkfwlg8vw5kb097qbsv082hxir047q2bcvc8scbak2dr6pl12s";
           name = "simpleclip";
         };
@@ -22879,7 +23133,7 @@
           sha256 = "04giklbd1fsw2zysr7aqg17h6cpyn4i9jbknm4d4v6581f2pcl93";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simplenote2";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simplenote2";
           sha256 = "1qdzbwhzmsga65wmrd0mb3rbs71nlyqqb6f4v7kvfxzyis50cswm";
           name = "simplenote2";
         };
@@ -22900,7 +23154,7 @@
           sha256 = "1p1771qm3jndnf4rdhb1bri5cjiksvxizagi7vfb7mjmsmx18w61";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/simplezen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/simplezen";
           sha256 = "13f2anhfsxmx1vdd209gxkhpywsi3nn6pazhc6bkswmn27yiig7j";
           name = "simplezen";
         };
@@ -22921,7 +23175,7 @@
           sha256 = "0jy08kj7cy744lbdyil0j50b08vm76bzxwmzd99v4sz12s3qcd2s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sisyphus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sisyphus";
           sha256 = "08400jazj7w63l8g9ypy6w9dj8r0xh4d2yg3nfwqqf5lhfnj9bnj";
           name = "sisyphus";
         };
@@ -22942,7 +23196,7 @@
           sha256 = "101xn4glqi7b5vhdqqahj2ib4pm30pzq8sad7zagxw9csihcri3q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/skeletor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/skeletor";
           sha256 = "1vfvg5l12dzksr24dxwc6ngawsqzpxjs97drw48qav9dy1vyl10v";
           name = "skeletor";
         };
@@ -22963,7 +23217,7 @@
           sha256 = "0g5sapd76pjnfhxlw149zj0fpn6l3pz3l8qlcn2c237vm8vn6qv3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/skewer-less";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/skewer-less";
           sha256 = "0fhv5cnp5bgw3krfmb0jl18kw2hzx2p81falj57lg3p8rn23dryl";
           name = "skewer-less";
         };
@@ -22984,7 +23238,7 @@
           sha256 = "05jndz0c26q60s416vqgvr66axdmxb7qsr2g70fvl5iqavnayhpv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/skewer-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/skewer-mode";
           sha256 = "1zp4myi9f7pw6zkgc0xg12585iihn7khcsf20pvqyc0vn4ajdwqm";
           name = "skewer-mode";
         };
@@ -23005,7 +23259,7 @@
           sha256 = "09ccdgg2wgw3xmlkpjsaqmnmf7f8rhjy4g6ypsn1sk5rgbgk8aj8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slamhound";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slamhound";
           sha256 = "14zlcw0zw86awd6g98l4h2whav9amz4m8ik877d1wsdjf69g7k9x";
           name = "slamhound";
         };
@@ -23026,7 +23280,7 @@
           sha256 = "0rk12am1dq52khwkwrmg70zarhni2avj4sy44jqckb4x7sv7djfk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slideview";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slideview";
           sha256 = "0zr08yrnrz49zds1651ysmgjqgbnhfdcqbg90sbsb086iw89rxl1";
           name = "slideview";
         };
@@ -23047,7 +23301,7 @@
           sha256 = "1cl8amk1kc7a953l1khjms04j40mfkpnbsjz3qa123msgachrsg7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slim-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slim-mode";
           sha256 = "1hip0r22irr9sah3b65ky71ic508bhqvj9hj95a81qvy1zi9rcac";
           name = "slim-mode";
         };
@@ -23057,22 +23311,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    slime = callPackage ({ cl-lib ? null, fetchFromGitHub, fetchurl, lib, macrostep, melpaBuild }:
     melpaBuild {
         pname = "slime";
-        version = "2.16";
+        version = "2.17";
         src = fetchFromGitHub {
           owner = "slime";
           repo = "slime";
-          rev = "0d8c192c12a0a3d055f9bf4cc554083fc931995c";
-          sha256 = "1sx7g0g2j3pz9gqj76773asv1912c0p4zmh3jbssnyy2vp942h27";
+          rev = "899b5ca7e1ce8173cb8ce4b7609dd88d05a050c9";
+          sha256 = "07gfd8k0gbzylr9y8asp35p9139w79c36pbnixp4y2fimgbfri2c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slime";
           sha256 = "04zcvjg0bbx5mdbsk9yn7rlprakl89dq6jmnq5v2g0n6q0mh6ign";
           name = "slime";
         };
-        packageRequires = [ cl-lib ];
+        packageRequires = [ cl-lib macrostep ];
         meta = {
           homepage = "http://melpa.org/#/slime";
           license = lib.licenses.free;
@@ -23089,7 +23343,7 @@
           sha256 = "0rdhd6kymbzhkc96dxy3nr21ajrkc7iy6zvq1va22r90f96jj9x4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slime-company";
           sha256 = "195s5fi2dl3h2jyy4d45q22jac35sciz81n13b4lgw94mkxx4rq2";
           name = "slime-company";
         };
@@ -23099,6 +23353,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    slime-docker = callPackage ({ cl-lib ? null, docker-tramp, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, slime }:
+    melpaBuild {
+        pname = "slime-docker";
+        version = "0.4";
+        src = fetchFromGitHub {
+          owner = "daewok";
+          repo = "slime-docker";
+          rev = "61bed969887c8556299ee643d1bab567ef36d926";
+          sha256 = "0jrsilyvzdi3xdmkm6gsniw4zdg9zsxb4i6k3fm5byxvhpbwd3k4";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slime-docker";
+          sha256 = "18v62y4f613d7mpqpb8sc8hzvyhcgzrbqrc0k7w9pqf00jnl192h";
+          name = "slime-docker";
+        };
+        packageRequires = [ cl-lib docker-tramp emacs slime ];
+        meta = {
+          homepage = "http://melpa.org/#/slime-docker";
+          license = lib.licenses.free;
+        };
+      }) {};
     slime-ritz = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "slime-ritz";
@@ -23110,7 +23385,7 @@
           sha256 = "0lp584k35asqlvbhglv124jazdgp3h7pzl0akfwbdmby9zayqk96";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime-ritz";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slime-ritz";
           sha256 = "1y1439y07l1a0sp9wn110hw4yyxj8n1cnd6h17rmsr549m2qbg1a";
           name = "slime-ritz";
         };
@@ -23131,7 +23406,7 @@
           sha256 = "00v4mh04affd8kkw4rn51djpyga2rb8f63mgy86napglqnkz40r3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/slime-volleyball";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/slime-volleyball";
           sha256 = "1dzvj8z3l5l9ixjl3nc3c7zzi23zc2300r7jzw2l3bvg64cfbdg7";
           name = "slime-volleyball";
         };
@@ -23152,7 +23427,7 @@
           sha256 = "1aihr5pbdqjb5j6xsghi7qbrmp46kddv76xmyx5z98m93n70wzqf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sly";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sly";
           sha256 = "1pmyqjk8fdlzwvrlx8h6fq0savksfny78fhmr8r7b07pi20y6n9l";
           name = "sly";
         };
@@ -23173,7 +23448,7 @@
           sha256 = "11p89pz6zmnjng5177w31ilcmifvnhv9mfjy79ic7amg01h09hsr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sly-company";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sly-company";
           sha256 = "1n8bx0qis2bs49c589cbh59xcv06r8sx6y4lxprc9pfpycx7h6v2";
           name = "sly-company";
         };
@@ -23194,7 +23469,7 @@
           sha256 = "0yvlmwnhdph5qj1998jz0idcl7901j6fxa9hivr7kic57j8kbq71";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-mode-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-mode-line";
           sha256 = "0qmhzlkc6mfqyaw4jaw6195b8sw0wg9pfjcijb4p0mlywf5mh5q6";
           name = "smart-mode-line";
         };
@@ -23215,7 +23490,7 @@
           sha256 = "0yvlmwnhdph5qj1998jz0idcl7901j6fxa9hivr7kic57j8kbq71";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-mode-line-powerline-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-mode-line-powerline-theme";
           sha256 = "0hv3mx39m3l35xhz351zp98321ilr6qq9wzwn1f0ziiv814khcn4";
           name = "smart-mode-line-powerline-theme";
         };
@@ -23236,7 +23511,7 @@
           sha256 = "1kfihh4s8578cwqyzn5kp3iib7f9vvg6rfc3klqzgads187ryd4z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smart-tabs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smart-tabs-mode";
           sha256 = "1fmbi0ypzhsizzb1vm92hfaq23swiyiqvg0pmibavzqyc9lczhhl";
           name = "smart-tabs-mode";
         };
@@ -23257,7 +23532,7 @@
           sha256 = "1mx4hdbrk6v52y5r47fbd6kgqyk3lvqgq8lw3hkww0pqfwwp4x6h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smartparens";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smartparens";
           sha256 = "025nfrfw0992024i219jzm4phwf29smc5hib45s6h1s67942mqh6";
           name = "smartparens";
         };
@@ -23278,7 +23553,7 @@
           sha256 = "0j5lg9gryl8vbzw8d3r2fl0c9wxa0c193mcvdfidd25b98wccc3f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smartrep";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smartrep";
           sha256 = "1ypls52d51lcqhz737rqg73c6jwl6q8b3bwb29z51swyamf37rbn";
           name = "smartrep";
         };
@@ -23299,7 +23574,7 @@
           sha256 = "1sd7dh9114mvr4xnp43xx4b7qmwkaj1a1fv7pwc28fhiy89d2md4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smartscan";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smartscan";
           sha256 = "0vghgmx8vnjbvsw7q5zs0qz2wm6dcng9m69b8dq81g2cq9dflbwb";
           name = "smartscan";
         };
@@ -23320,7 +23595,7 @@
           sha256 = "1pcpg3lalbrc24z3vwcaysps8dbdzmncdgqdd5ig6yk2a9wyj9ng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smeargle";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smeargle";
           sha256 = "1dy87ah1w21csvrkq5icnx7g7g7nxqkcyggxyazqwwxvh2silibd";
           name = "smeargle";
         };
@@ -23341,7 +23616,7 @@
           sha256 = "1hcjh577xz3inx28r8wb4g2b1424ccw8pffvgdmpf80xp1llldj5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smex";
           sha256 = "1rwyi7gdzswafkwpfqd6zkxka1mrf4xz17kld95d2ram6cxl6zda";
           name = "smex";
         };
@@ -23351,6 +23626,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    smooth-scroll = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "smooth-scroll";
+        version = "1.2";
+        src = fetchFromGitHub {
+          owner = "k-talo";
+          repo = "smooth-scroll.el";
+          rev = "02320f28abb5cae28b3a18f6b9ce93129bdbfc45";
+          sha256 = "1kkg7qhb2lmwr4siiazqny9w2z9nk799lzl5i159lfivlxcgixmk";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smooth-scroll";
+          sha256 = "1b0mjpd4dqgk7ij37145ry2jqbn1msf8rrvymn7zyckbccg83zsf";
+          name = "smooth-scroll";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/smooth-scroll";
+          license = lib.licenses.free;
+        };
+      }) {};
     smooth-scrolling = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "smooth-scrolling";
@@ -23362,7 +23658,7 @@
           sha256 = "05kf3hb3nb32jzw50a2z9vlf3f0pj40klzxvqj4fxlci777imsvk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/smooth-scrolling";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/smooth-scrolling";
           sha256 = "0zy2xsmr05l2narslfgril36d7qfb55f52qm2ki6fy1r18lfiyc6";
           name = "smooth-scrolling";
         };
@@ -23372,6 +23668,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    snakemake-mode = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "snakemake-mode";
+        version = "0.3.0";
+        src = fetchFromGitHub {
+          owner = "kyleam";
+          repo = "snakemake-mode";
+          rev = "0f1857cacfcc36c3641d63c72a38224661d3b9a6";
+          sha256 = "0pl7vxaha79v9199j4s1fjxxca3fq9fdhbdaz5wppg3b851a7mx3";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/snakemake-mode";
+          sha256 = "1xxd3dms5vgvpn18a70wjprka5xvri2pj9cw8qz09s640f5jf3r4";
+          name = "snakemake-mode";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://melpa.org/#/snakemake-mode";
+          license = lib.licenses.free;
+        };
+      }) {};
     solarized-theme = callPackage ({ dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "solarized-theme";
@@ -23383,7 +23700,7 @@
           sha256 = "0zcj9jf8nlsj9vms888z2vs76q54n8g8r9sh381xad3x8d6lrlb3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/solarized-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/solarized-theme";
           sha256 = "15d8k32sj8i11806byvf7r57rivz391ljr0zb4dx8n8vjjkyja12";
           name = "solarized-theme";
         };
@@ -23404,7 +23721,7 @@
           sha256 = "0b5w3vdr8llg3hqd22gnc6b6y089lq6vfk0ajkws6gfldz2gg2v1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sos";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sos";
           sha256 = "1gkd0plx7152s3dj8a9lwlwh8bgs1m006s80l10agclx6aay8rvb";
           name = "sos";
         };
@@ -23425,7 +23742,7 @@
           sha256 = "1wbd7v5bnd4qgqk8rrgllal0i949n8xzvb3yhf0vnxr06wdzy0a4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sotlisp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sotlisp";
           sha256 = "0zjnn6hhwy6cjvc5rhvhxcq5pmrhcyil14a48fcgwvg4lv7fbljk";
           name = "sotlisp";
         };
@@ -23446,7 +23763,7 @@
           sha256 = "0q2ragq4hw89d3w48ykwljb19n2nhz8z6bsmb10shimaf203652g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sound-wav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sound-wav";
           sha256 = "1vrwzk6zqma7r0w5ivbx16shys6hsifj52fwlf5rxs6jg1gqdb4f";
           name = "sound-wav";
         };
@@ -23467,7 +23784,7 @@
           sha256 = "1l9xrw88wq32wm3qx922ihdb9mlv9rrdalwvz9i2790fmw7y84vz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sourcekit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sourcekit";
           sha256 = "1lvk3m86awlinivpg89h6zvrwrdqa5ljdp563k3i4h9384w82pks";
           name = "sourcekit";
         };
@@ -23488,7 +23805,7 @@
           sha256 = "1k2gfw4dydzqxbfdmcghajbb2lyg1j4wgdhp8chlql3dax1f503d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sourcemap";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sourcemap";
           sha256 = "0cjg90y6a0l59a9v7d7p12pgmr21gwd7x5msil3h6xkm15f0qcc5";
           name = "sourcemap";
         };
@@ -23509,7 +23826,7 @@
           sha256 = "0j4qm1y7rhb95k1zbl3c60a46l9rchzslzq36mayyw61s6yysjnv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sourcetalk";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sourcetalk";
           sha256 = "0qaf2q784xgl1s3m88jpwdzghpi4f3nybga3lnr1w7sb7b3yvj3z";
           name = "sourcetalk";
         };
@@ -23530,7 +23847,7 @@
           sha256 = "1ncwv6sqm1ch396qi1c8276dc910rnm0f3m8xjkskplv3cjaq0ai";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spaceline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/spaceline";
           sha256 = "0jpcj0i8ckdylrisx9b4l9kam6kkjzhhv1s7mwwi4b744rx942iw";
           name = "spaceline";
         };
@@ -23551,7 +23868,7 @@
           sha256 = "1gmmmkzxxlpz2ml6qk24vndlrbyl55r5cba76jn342zrxvb357ny";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sparkline";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sparkline";
           sha256 = "081jzaxjb32nydvr1kmyafxqxi610n0yf8lwz9vldm84famf3g7y";
           name = "sparkline";
         };
@@ -23572,7 +23889,7 @@
           sha256 = "1gk2ps7fn9z8n6r923qzn518gz9mrj7mb6j726cz8qb585ndjbij";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sparql-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sparql-mode";
           sha256 = "1xicrfmgxpb31lz30qj450w8v7dl4ipjp7b2wz54s4kn88nsfj7d";
           name = "sparql-mode";
         };
@@ -23593,7 +23910,7 @@
           sha256 = "1k6c7450v0ln6l9b8z1hib2s2b4rmjbskynvwwyilgdnvginfhi3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/speech-tagger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/speech-tagger";
           sha256 = "0sqil949ny9qjxq7kpb4zmjd7770r0qvq4sz80agw6a27mqnaajc";
           name = "speech-tagger";
         };
@@ -23614,7 +23931,7 @@
           sha256 = "1q6v0xfdxm57lyj4zxyqv6n5ik5w9drk7yf9w8spb5r22jg0dg8c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sphinx-doc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sphinx-doc";
           sha256 = "00h3wx2p5hzbw6sggggdrzv4jrn1wc051iqql5y2m1hsh772ic5z";
           name = "sphinx-doc";
         };
@@ -23635,7 +23952,7 @@
           sha256 = "17qsmjsbk8aq3azjxid6h9fzz77bils74scp21sqn8vdnijx8991";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/splitjoin";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/splitjoin";
           sha256 = "0l1x98fvvia8qx8g125h4d76slv0xnb3h1zxiq9xb5qh7a1h069l";
           name = "splitjoin";
         };
@@ -23656,7 +23973,7 @@
           sha256 = "05y8xv6zapspwr5bii41lgirslas22wsbm0kgb4dm79qbk9j1kzw";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/spotify";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/spotify";
           sha256 = "0pmsvxi1dsi580wkhhx8iw329agkh5yzk61bqvxzign3cd6fbq6k";
           name = "spotify";
         };
@@ -23677,7 +23994,7 @@
           sha256 = "06rk07h92s5sljprs41y3q31q64cprx9kgs56c2j6v4c8cmsq5h6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sprintly-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sprintly-mode";
           sha256 = "15i3rrv27ccpn12wwj9raaxpj7nlnrrj3lsp8vdfwph6ydvnfza4";
           name = "sprintly-mode";
         };
@@ -23698,7 +24015,7 @@
           sha256 = "1dcb18fq84vlfgb038i2x6vy7mhin2q6jn4jl9fh256n12cx4nrn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sqlup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sqlup-mode";
           sha256 = "06a0v2qagpd9p2bh19bfw14a6if8kjjc4yyhm5nwp8a8d2vnl5l7";
           name = "sqlup-mode";
         };
@@ -23719,7 +24036,7 @@
           sha256 = "0wx8l8gkh8rbf2g149f35gpnmkk45s9x4r844aqw5by4zkvix4rc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/srefactor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/srefactor";
           sha256 = "01cd40jm4h00c5q2ix7cskp7klbkcd3n5763y5lqfv59bjxwdqd2";
           name = "srefactor";
         };
@@ -23740,7 +24057,7 @@
           sha256 = "0igqifws73cayvjnhhrsqpy14sr27avymfhaqzrpj76m2fsh6fj4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stash";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stash";
           sha256 = "116k40ispv7sq3jskwc1lvmhmk3jjz4j967r732s07f5h11vk1z9";
           name = "stash";
         };
@@ -23761,7 +24078,7 @@
           sha256 = "0jpxmzfvg4k5q3h3gn6lrg891wjzlcps2kkij1jbdjk4jkgq386i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/status";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/status";
           sha256 = "0a9lqa7a5nki5711bjrmx214kah5ndqpwh3i240gdd08mcm07ps3";
           name = "status";
         };
@@ -23782,7 +24099,7 @@
           sha256 = "0pik6mq8syhxk9l9ns8wgvg5312qkckm3cilb3irwdm1dvnl5hpf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stekene-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stekene-theme";
           sha256 = "0v1kwlnrqaygzaz376a5njg9kv4yf5l35k87xga4wdd2mxfwrmf1";
           name = "stekene-theme";
         };
@@ -23801,7 +24118,7 @@
           sha256 = "12c5df549d653c8ec3476ed271a4e9a4065a61a467229c070bb2e6295e285e16";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stgit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stgit";
           sha256 = "102s9lllrcxsqs0lgbrcljwq1l3s8ri4276wck6rcypck5zgzj89";
           name = "stgit";
         };
@@ -23822,7 +24139,7 @@
           sha256 = "15gdcpbba3h84s7xnpk69nav6bixdixnirdh5n1rly010q0m5s5x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/string-edit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/string-edit";
           sha256 = "1l1hqsfyi6pp4x4g1rk4s7x9zjc03wfmhy16izia8nkjhzz88fi8";
           name = "string-edit";
         };
@@ -23843,7 +24160,7 @@
           sha256 = "03azfs6z0jg66ppalijcxl973vdbhj4c3g84sm5dm8xv6rnxrv2s";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/string-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/string-utils";
           sha256 = "1vsvxc06fd3wardldb83i5hjfibvmiqnxvcgdns7i5i8qlsrsx4v";
           name = "string-utils";
         };
@@ -23864,7 +24181,7 @@
           sha256 = "035ym1c1vzg6hjsnd258z4dkrfc11lj4c0y4gpgybhk54dq3w9dk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stripe-buffer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stripe-buffer";
           sha256 = "02wkb9y6vykrn6a5nfnimaplj7ig8i8h6m2rvwv08f5ilbccj16a";
           name = "stripe-buffer";
         };
@@ -23884,7 +24201,7 @@
           sha256 = "f5e3b0fdbdb1c747c40f7b6746de195e37bd4caccdcc05c6aa14124f29e71428";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stumpwm-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stumpwm-mode";
           sha256 = "0a77mh7h7033adfbwg2fbx84789962par43q31s9msjlqw15gs86";
           name = "stumpwm-mode";
         };
@@ -23905,7 +24222,7 @@
           sha256 = "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/stylus-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/stylus-mode";
           sha256 = "152k74q6qn2xa38v2zyd5y7ya5n26nvai5v7z5fmq7jrcndp27r5";
           name = "stylus-mode";
         };
@@ -23926,7 +24243,7 @@
           sha256 = "1j63rzxnrzzqizh7fpd99dcgsy5hd7w4d2lpwl5armmixlycl5m8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/subatomic-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/subatomic-theme";
           sha256 = "0mqas67qms492n3hn74c5nrkjpsgf9b42lp02s2dh366c075dpqc";
           name = "subatomic-theme";
         };
@@ -23947,7 +24264,7 @@
           sha256 = "189547d0g9ax0nr221bkdchlfcj60dsy8lgbbrvq3n3xrmlvl362";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/subemacs";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/subemacs";
           sha256 = "0sqh80jhh3v37l5af7w6k9lqvj39bd91pn6a9rwdlfk389hp90zm";
           name = "subemacs";
         };
@@ -23968,7 +24285,7 @@
           sha256 = "0mx892vn4a32df30iqmf2vsz1gdl3i557fw0194g6a66n9w2q7xf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/subshell-proc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/subshell-proc";
           sha256 = "1fnp49yhnhsj7paj0b25vr6r03hr5kpgcrci439ffpbd2c85fkw2";
           name = "subshell-proc";
         };
@@ -23989,7 +24306,7 @@
           sha256 = "1kmyivsyxr6gb2k36ssyr779rpk8qsrb27q5rjsir9fgc95qhvjb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sudden-death";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sudden-death";
           sha256 = "1wrhb3d27j07i64hvjggyajm752w4mhrhq09lfvyhz6ykp1ly3fh";
           name = "sudden-death";
         };
@@ -24010,7 +24327,7 @@
           sha256 = "1b637p2cyc8a83qv9vba4yamzhk08f62zykqh5p35jwvym8wkann";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/suomalainen-kalenteri";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/suomalainen-kalenteri";
           sha256 = "1wzijbgcr3jc47ccr7nrdkqha16s6gw0xiccnmdczi48cvnvvlkh";
           name = "suomalainen-kalenteri";
         };
@@ -24020,22 +24337,22 @@
           license = lib.licenses.free;
         };
       }) {};
-    super-save = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    super-save = callPackage ({ emacs, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "super-save";
-        version = "0.1.0";
+        version = "0.2.0";
         src = fetchFromGitHub {
           owner = "bbatsov";
           repo = "super-save";
-          rev = "4eb8aef705237d706b30cf722c5ad4909ea3acf1";
-          sha256 = "1pq71simdb4pcbzzavlxdfbgh548m15f493h821k04n67ydzlmj3";
+          rev = "73397501fa5b01c02b9ae94f82a8cb37d1ed105f";
+          sha256 = "0cw3yf2npy2ah00q2whpn52kaybbccw1qvfzsww0x4zshlrwvvvq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/super-save";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/super-save";
           sha256 = "0ikfw7n2rvm3xcgnj1si92ly8w75x26071ki551ims7a8sawh52p";
           name = "super-save";
         };
-        packageRequires = [];
+        packageRequires = [ emacs ];
         meta = {
           homepage = "http://melpa.org/#/super-save";
           license = lib.licenses.free;
@@ -24052,7 +24369,7 @@
           sha256 = "14h40s0arc2i898r9yysn256z6l8jkrnmqvrdg7p7658c0klz5ic";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/svg-mode-line-themes";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/svg-mode-line-themes";
           sha256 = "12lnszcb9bl32n9wir7vf8xiyyv7njw4xg21aj9x4dasmidyx506";
           name = "svg-mode-line-themes";
         };
@@ -24073,7 +24390,7 @@
           sha256 = "1h56qkbx5abz1l94wrdpbzspiz24mfgkppzfalvbvx5qwl079cvs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sweetgreen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sweetgreen";
           sha256 = "1v75wk0gq5fkz8i1r8pl4gqnxbv1d80isyn48w2hxj2fmdn2xhpy";
           name = "sweetgreen";
         };
@@ -24094,7 +24411,7 @@
           sha256 = "07xrcg33vsw19kz692hm7blzvnf7b6isllsz79fvs8q3l5c9mfjx";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swift-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/swift-mode";
           sha256 = "1imr53f8agfza9zxs1h1mwyhg7yaywqqffd1lsvm1m84nvxvri2d";
           name = "swift-mode";
         };
@@ -24115,8 +24432,8 @@
           sha256 = "1kahl3h18vsjkbqvd84fb2w45s4srsiydn6jiv49vvg1yaxzxcbm";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swiper";
-          sha256 = "13lld7kjz1n1ryxvrfsy0iym5l9m9ybrf7bpcmkzsalpp15j3mvm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/swiper";
+          sha256 = "1hsj6vh0vldnvwg2qmszdi0p2ig7l63vgq2kn5nv883239bxpziz";
           name = "swiper";
         };
         packageRequires = [ emacs ];
@@ -24136,7 +24453,7 @@
           sha256 = "1y2dbd3ikdpjvi8xz10jkrx2773h7cgr6jxm5b2bldm81lvi8x64";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/swiper-helm";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/swiper-helm";
           sha256 = "011ln6vny7z5vw67cpzldxf5n6sk2hjdkllyf7v6sf4m62ws93ph";
           name = "swiper-helm";
         };
@@ -24157,7 +24474,7 @@
           sha256 = "1zpfilcaycj0l2q3zyvpjbwp5j3d9rrkacd5swzlr1n1klvbji48";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/switch-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/switch-window";
           sha256 = "02f0zjvlzms66w1ryhk1cbr4rqwklzvgcjfiicj0lcnqqx61m2k2";
           name = "switch-window";
         };
@@ -24178,7 +24495,7 @@
           sha256 = "0krbd1qa2408a97pqhl7fv0x8x1n2l3qq33zzj4w4vv0c55jk43n";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sws-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sws-mode";
           sha256 = "0b12dsad0piih1qygjj0n7rni0pl8cizbzwqm9h1dr8imy53ak4i";
           name = "sws-mode";
         };
@@ -24199,7 +24516,7 @@
           sha256 = "02f63k8rzb3bcch6vj6w5c5ncccqg83siqnc8hyi0lhy1bfx240p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/sx";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/sx";
           sha256 = "1ml1rkhhk3hkd16ij2zwng591rxs2yppsfq9gwd4ppk02if4v517";
           name = "sx";
         };
@@ -24220,7 +24537,7 @@
           sha256 = "0hi2jflrlpp7xkbj852vp9hcl8bfmf04jqw1hawxrw4bxdp95jh2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/synosaurus";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/synosaurus";
           sha256 = "16i2ag4l824h1kq4cy01zf01zrms4v6ldwlsixwfyb1mh97lqljg";
           name = "synosaurus";
         };
@@ -24241,7 +24558,7 @@
           sha256 = "1pn69f4w48jdj3wd1myj6qq2mhvygmlzbq2dws2qkjlp3kbwa6da";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/syntactic-sugar";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/syntactic-sugar";
           sha256 = "12b2vpvz5h4wzxrk8jrbgc8v0w6bzzvxcyfs083fi1791qq1rw7r";
           name = "syntactic-sugar";
         };
@@ -24257,11 +24574,11 @@
         version = "0.2";
         src = fetchhg {
           url = "https://bitbucket.com/jpkotta/syntax-subword";
-          rev = "a1e0accb754d";
-          sha256 = "1p9bp09nibw7rra3r6nj496zdx09db6k82dxnxs1lfgdiswfdq2h";
+          rev = "88e9bf1d4874";
+          sha256 = "15zvh6dk02rm16zs6c9zvw1w76ycn61g3cpx6jb3456ff9zn6m9m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/syntax-subword";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/syntax-subword";
           sha256 = "1as89ffqz2h69fdwybgs5wibnrvskm7hd58vagfjkla9pjlpffpm";
           name = "syntax-subword";
         };
@@ -24282,7 +24599,7 @@
           sha256 = "1hixilnnybv2v3p1wpn7a0ybwah17grawszs3jycsjgzahpgckv7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/system-specific-settings";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/system-specific-settings";
           sha256 = "1ydmxi8aw2lf78wv4m39yswbqkmcadqg0wmzg9s8b5h9bxxwvppp";
           name = "system-specific-settings";
         };
@@ -24303,7 +24620,7 @@
           sha256 = "0axskr4q0kw8pmnl1pv2z3n6x3pn6v28qcgz3qf745lqgmsgbng9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/systemd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/systemd";
           sha256 = "1biais0cmidy3d0hf2ifdlr6qv1z8k8c8bczi07bsfk4md3idbir";
           name = "systemd";
         };
@@ -24324,7 +24641,7 @@
           sha256 = "09nndx83ws5v2i9x0dzk6l1a0lq29ffzh3y05n0n64nf5j0a7zvk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ta";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ta";
           sha256 = "0kn2k4n0xfwsrniaqb36v3rxj2pf2sai3bmjksbn1g2kf5g156ll";
           name = "ta";
         };
@@ -24345,7 +24662,7 @@
           sha256 = "1xd67s92gyr49v73j7r7cbhsc40bkw8aqh21whgbypdgzpyc7azc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tabbar-ruler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tabbar-ruler";
           sha256 = "10dwjj6r74g9rzdd650wa1wxhqc0q6dmff4j0qbbhmjsxvsr3y0d";
           name = "tabbar-ruler";
         };
@@ -24366,7 +24683,7 @@
           sha256 = "0gy9hxm7bca0l1hfy2pzn86avpifrz3bs8xzpicj4kxw5wi4ygns";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tablist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tablist";
           sha256 = "0c10g86xjhzpmc2sqjmzcmi393qskyw6d9bydqzjk3ffjzklm45p";
           name = "tablist";
         };
@@ -24387,7 +24704,7 @@
           sha256 = "0kq40g46s8kgiafrhdq99h79rz9h5fvgz59k7ralmf86bl4sdmdb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tagedit";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tagedit";
           sha256 = "0vfkbrxmrw4fwdz324s734zxdxm2nj3df6i8m6lgb9pizqyp2g6z";
           name = "tagedit";
         };
@@ -24408,7 +24725,7 @@
           sha256 = "16kr1p4lzi1ysd5r2dh0mxk60zsm5fvwa9345nfyrgdic340yscc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/telepathy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/telepathy";
           sha256 = "0c3d6vk7d6vqzjndlym2kk7d2zm0b15ac4142ir03p6f19rqq9pr";
           name = "telepathy";
         };
@@ -24429,7 +24746,7 @@
           sha256 = "0smdlzrcbmip6c6c3rd0871wv5xyagavwsxhhgvki6ybyzdj9a19";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/telephone-line";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/telephone-line";
           sha256 = "0dyh9h1yk9y0217b6rxsm7m372n910vpfgw5w23lkkrwa8x8qpx3";
           name = "telephone-line";
         };
@@ -24450,7 +24767,7 @@
           sha256 = "1d1hrnxhi7h5d5i4198hx5lj7fbc280lpkxmk2nb8z6j7z0aki7g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term-alert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/term-alert";
           sha256 = "0x4rc1y311ivaj6mlks1j8sgzrrwqn8vx171vw7s1kgf1qzk826n";
           name = "term-alert";
         };
@@ -24471,7 +24788,7 @@
           sha256 = "1idz9c38q47lll55w1znya00hlkwa42029ys70sb14inc51cml51";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term-cmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/term-cmd";
           sha256 = "0fn4f32zpl0p2lid159q59lzjv4xqmc23a64kcclqp9db8b1m5fy";
           name = "term-cmd";
         };
@@ -24492,7 +24809,7 @@
           sha256 = "149pl3zxg5kriydk5h6j95jyly6i23w4w4g4a99s4zi6ljiny6c6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/term-run";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/term-run";
           sha256 = "1bx3s68rgr9slsw9k01gfg7sxd4z7sarg4pi2ivril7108mhg2cs";
           name = "term-run";
         };
@@ -24513,7 +24830,7 @@
           sha256 = "0gfsqpza8phvma5y3ck0n6p197x1i33w39m3c7jmja4ml121n73d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/termbright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/termbright-theme";
           sha256 = "14q88qdbnyzxr8sr8i5glj674sb4150b9y6nag0dqrxs629is6xj";
           name = "termbright-theme";
         };
@@ -24534,7 +24851,7 @@
           sha256 = "1n4z5hgpv1f0360zgdxz1q4gmhjjrxm7ygxh1g4zjy6kbhgylmxb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tern";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tern";
           sha256 = "06bgwizn9dcd8hsvimjvb28j0mpxg7rrv9knhv5kkdapa6gggxif";
           name = "tern";
         };
@@ -24555,7 +24872,7 @@
           sha256 = "1n4z5hgpv1f0360zgdxz1q4gmhjjrxm7ygxh1g4zjy6kbhgylmxb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tern-auto-complete";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tern-auto-complete";
           sha256 = "0lq924c5f6bhlgyqqzc346n381qf0fp66h50a0zqz2ch66kanni1";
           name = "tern-auto-complete";
         };
@@ -24576,7 +24893,7 @@
           sha256 = "0l63lzm96gg3ihgc4l671i342qxigwdbn4xfkbxnarb0206gnb5p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tern-django";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tern-django";
           sha256 = "1pjaaffadaw8h2n7yv01ks19gw59dmh8bp8vw51hx1082r3yfvv0";
           name = "tern-django";
         };
@@ -24597,7 +24914,7 @@
           sha256 = "0mz2yl9jaw7chzv9d9hhv7gcvdwwvi676y9wpn7vp85hxpda7xg7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/terraform-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/terraform-mode";
           sha256 = "1m3s390mn4pba7zk17xfk045dqr4rrpv5gw63jm18fyqipsi6scn";
           name = "terraform-mode";
         };
@@ -24618,7 +24935,7 @@
           sha256 = "108csr1d7w0105rb6brzgbksb9wmq1p573vxbq0miv5k894j447f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/test-case-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/test-case-mode";
           sha256 = "1iba97yvbi5vr7gvc58gq2ah6jg2s7apc9ssq7mdzki823n8z2qi";
           name = "test-case-mode";
         };
@@ -24639,7 +24956,7 @@
           sha256 = "02vp4m3aw7rs4gxn91v6j3y8pr04hpydrg05ck3ivv46snkfagdn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/test-kitchen";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/test-kitchen";
           sha256 = "1bl3yvj56dq147yplrcwphcxiwvmx5n97y4qpkm9imiv8cnjm1g0";
           name = "test-kitchen";
         };
@@ -24660,7 +24977,7 @@
           sha256 = "08g7fan1y3wi4w7cdij14awadqss6prqg3k7qzf0wrnbm13dzhmk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/test-simple";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/test-simple";
           sha256 = "1l6y77fqd0l0mh2my23psi66v5ya6pbr2hgvcbsaqjnpmfm90w3g";
           name = "test-simple";
         };
@@ -24681,7 +24998,7 @@
           sha256 = "1a0fzn66gv421by0x6wj3z6bvzv274a9p8c2aaax0dskncl5lgk1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/textmate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/textmate";
           sha256 = "119w944pwarpqzcr9vys17svy1rkfs9hiln8903q9ff4lnjkpf1v";
           name = "textmate";
         };
@@ -24702,7 +25019,7 @@
           sha256 = "0fjapb7naysf34g4ac5gsa90b2s2ss7qgpyd9mfv3mdqrsp2dyw7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/textmate-to-yas";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/textmate-to-yas";
           sha256 = "04agz4a41h0givfdw88qjd3c7pd418qyigsij4la5f37j5rh338l";
           name = "textmate-to-yas";
         };
@@ -24723,7 +25040,7 @@
           sha256 = "09vf3qs949n4iqzd14iq2kgvypwdwdv8ii8l5jcqfppgspd8m8yd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/theme-changer";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/theme-changer";
           sha256 = "1qbmsghkl5gs728q0gaalc7p8q7nzv3l045jc0jdxxnb7na3gc5w";
           name = "theme-changer";
         };
@@ -24744,7 +25061,7 @@
           sha256 = "1srylw9wwkyq92f9v6ds9zp9z8sl800wbxjbir80g1lwv4hghaii";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/thrift";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/thrift";
           sha256 = "0p1hxmm7gvhyigz8aylncgqbhk6cyf75rbcqis7x552g605mhiy9";
           name = "thrift";
         };
@@ -24765,7 +25082,7 @@
           sha256 = "1vq5yp6pyjam2csz22mcp353a4d5r7f9m6bsjizfmgr2ld7bwhx7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/timer-revert";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/timer-revert";
           sha256 = "0lvm2irfx9rb5psm1lf53fv2jjx745n1c172xmyqip5xwgmf6msy";
           name = "timer-revert";
         };
@@ -24786,7 +25103,7 @@
           sha256 = "0p7piqbhwxp2idslqnzl5x4y9aqgba9ryxrjy3d0avky5z9kappl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/timesheet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/timesheet";
           sha256 = "1gy6bf4wqvp8cw2wjnrr9ijnzwav3p7j46m7qrn6l0517shwl506";
           name = "timesheet";
         };
@@ -24807,7 +25124,7 @@
           sha256 = "16217i8rjhgaa5kv8iq0s14b42v5rs8m2qlr60a0x6qzy65chq39";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tox";
           sha256 = "1z81x8fs5q6r19hpqphsilk8wdwwnfr8w78x5x298x74s9mcsywl";
           name = "tox";
         };
@@ -24828,7 +25145,7 @@
           sha256 = "0q3rv6lk37yybkbswmn4pgzca0nfhvf4h3ac395fr16k5ixybc5q";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tracking";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tracking";
           sha256 = "096h5bl7jcwz5hpbm2139bf8a784hijfy40vzf42y1c9794al46z";
           name = "tracking";
         };
@@ -24841,15 +25158,15 @@
     transmission = callPackage ({ emacs, fetchFromGitHub, fetchurl, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "transmission";
-        version = "0.7";
+        version = "0.8";
         src = fetchFromGitHub {
           owner = "holomorph";
           repo = "transmission";
-          rev = "2769c9b17fa464e0634ac03046be74cefdb28880";
-          sha256 = "14fzgpafry3v072f22krap81jfpdc17bpimp16hv7f20sny29a5v";
+          rev = "dbdc6e1b7de7cca57a5a1cf990bbc33553a823aa";
+          sha256 = "14vcd5ixqbyx2zr0w79pbk5sdncxzk6mz6rw7yxq81m3hgspz050";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/transmission";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/transmission";
           sha256 = "0w0hlr4y4xpcrpvclqqqasggkgrwnzrdib51mhkh3f3mqyiw8gs9";
           name = "transmission";
         };
@@ -24870,7 +25187,7 @@
           sha256 = "1jd7xsvs4m55fscp62a9lk59ip4sgifv4kazl55b7543nz1i31bz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/travis";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/travis";
           sha256 = "1km496cq1vni9gy2d3z4c9524q62750ywz745rjz4r7178ip9mix";
           name = "travis";
         };
@@ -24891,7 +25208,7 @@
           sha256 = "18na22fhwqz80qinmnpsvp6ghc9irva1scixi6s4q6plmgr4m397";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/truthy";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/truthy";
           sha256 = "1a56zmqars9fd03bkqzwpvgblq5fvq19n4jw04c4hpga92sq8wqg";
           name = "truthy";
         };
@@ -24912,7 +25229,7 @@
           sha256 = "1ma3k9bbw427cj1n2gjajbqii482jhs2lgjggz9clpc21bn5wqfb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tss";
           sha256 = "0d16x5r2xfy6mrwy0mqzpr9b3inqmyyxgawrxlfh83j1xb903dhm";
           name = "tss";
         };
@@ -24933,7 +25250,7 @@
           sha256 = "060jksd9aamqx1n4l0bb9v4icsf7cr8jkyw0mbhgyz32nmxh3v6g";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ttrss";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ttrss";
           sha256 = "08921cssvwpq33w87v08dafi2rz2rl1b3bhbhijn4bwjqgxi9w7z";
           name = "ttrss";
         };
@@ -24954,7 +25271,7 @@
           sha256 = "0jpcjy2a77mywba2vm61knj26pgylsmv5a21cdp80q40bac4i6bb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tuareg";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tuareg";
           sha256 = "0wx723dmjlpm86xdabl9n8p22zbbxpapyfn6ifz0b0pvhh49ip7q";
           name = "tuareg";
         };
@@ -24975,7 +25292,7 @@
           sha256 = "0ihjjw5wxz5ybl3600k937pszw3442cijs4gbqqip9vhd5y9m8gy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tumble";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tumble";
           sha256 = "1c9ybq0mb2a0pw15fmm13vfwcnr2h9fb1xsm5nrff1cg7913pgv9";
           name = "tumble";
         };
@@ -24996,7 +25313,7 @@
           sha256 = "0asd024n5v23wdsg1959sszq568wg3a1bp4jrk0cllfji1z0n78y";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/tup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/tup-mode";
           sha256 = "0pzpn1ljfcc2dl9fg7jc8lmjwz2baays4axjqk1qsbj0kqbc8j0l";
           name = "tup-mode";
         };
@@ -25017,7 +25334,7 @@
           sha256 = "0glw5lns7hwp8jznnfm6dyjw454sv2n84gy07ma7s1q3yczhq5bc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/twilight-anti-bright-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/twilight-anti-bright-theme";
           sha256 = "1qfybk5akaxdahmjffqaw712v8d7kk4jqkj3hzp96kys2zv1r6f9";
           name = "twilight-anti-bright-theme";
         };
@@ -25038,7 +25355,7 @@
           sha256 = "193v98i84xybm3n0f30jin5q10i87vbcnbdhl4zqi7jij9p5v98z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/twittering-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/twittering-mode";
           sha256 = "0v9ijxw5jazh2hc0qab48y71za2l9ryff0mpkxhr3f79irlqy0a1";
           name = "twittering-mode";
         };
@@ -25059,7 +25376,7 @@
           sha256 = "1risfbsaafh760vnl4ryys91g4k78g0fxj2zlcndpxxv34gwkhy7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/typed-clojure-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/typed-clojure-mode";
           sha256 = "1579zkhk2lwl5ij7dm9n2drggs5fmhpljrshc4ghhvig7nlyqjy3";
           name = "typed-clojure-mode";
         };
@@ -25080,7 +25397,7 @@
           sha256 = "1jhd4grch5iz12gyxwfbsgh4dmz5hj4bg4gnvphccg8dsnni05k2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/typo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/typo";
           sha256 = "07hmqrnbxbrhcbxdls8i4786lkqmfr3hv6va41xih1lxj0mk60bx";
           name = "typo";
         };
@@ -25101,7 +25418,7 @@
           sha256 = "0k41hwb6jgv3hngfrphlyhmfhvy4k05mvn0brm64xk7lj56y8q2c";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ubuntu-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ubuntu-theme";
           sha256 = "160z59aaxb2v6c24nki6bn7pjm9r4jl1mgxs4h4sivzxkaw811s2";
           name = "ubuntu-theme";
         };
@@ -25122,7 +25439,7 @@
           sha256 = "0qw9vwl1p0pjw1xmshxar1a8kn6gmin5rdvvnnly8b5z9hpkjf3m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ucs-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ucs-utils";
           sha256 = "111fwg2cqqzpa79rcqxidppb12c8g12zszppph2ydfvkgkryb6z2";
           name = "ucs-utils";
         };
@@ -25135,15 +25452,15 @@
     undercover = callPackage ({ dash, emacs, fetchFromGitHub, fetchurl, lib, melpaBuild, shut-up }:
     melpaBuild {
         pname = "undercover";
-        version = "0.5.0";
+        version = "0.6.0";
         src = fetchFromGitHub {
           owner = "sviridov";
           repo = "undercover.el";
-          rev = "068d39745304a06152c3e68a0b6772394c9e6d39";
-          sha256 = "0dmkn8qlnyvgaj7dqh82mqj1fik59zfi2yxcic9i6q9walxc3cas";
+          rev = "e72b8c924272f65d7cc6e884478e26d0b1e1e4e8";
+          sha256 = "06qcvbp5rd0kh3ibrxj5p6r578lwsrgd7yj5c6slwmkdmna2fj33";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/undercover";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/undercover";
           sha256 = "1s30c3i6y4r3mgrrs3lda3rrwmy9ff11ihdmshyziv9v5879sdjf";
           name = "undercover";
         };
@@ -25164,7 +25481,7 @@
           sha256 = "1g1ldyz42q3i2xlgvhd4s93cvkh0fm8m3l344zjcw8rvqaisyphj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/underwater-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/underwater-theme";
           sha256 = "0ab2bcqfdi9ml3z9d511pbfwcbp8hkkd36xxp61k36gkyi3acvlr";
           name = "underwater-theme";
         };
@@ -25185,7 +25502,7 @@
           sha256 = "1qy0q1fp7cmvmxynqrb086dkb727lmk5h1k98y14j75b94ilpy0w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unfill";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unfill";
           sha256 = "0b21dk45vbz4vqdbdx0n6wx30rm38w1jjqbsxfj7b96p3i5shwqv";
           name = "unfill";
         };
@@ -25206,7 +25523,7 @@
           sha256 = "0n06dvf6r7qblz8vz38qc37xrn29wa1c0jyzis1qw9zzf6hmmzj7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-enbox";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unicode-enbox";
           sha256 = "1phb2qq3pg6z6bl96kl9yfq4jxhgardjpaa4lhgqbxymmqdm7gzv";
           name = "unicode-enbox";
         };
@@ -25227,7 +25544,7 @@
           sha256 = "0fbwncna6gxlynq9196djpkjhayzk8kxlsxg0gasdgqx1nyxl0mk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-fonts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unicode-fonts";
           sha256 = "0plipwb30qqay8691qzqdyg6smpbs9dsxxi49psb8sq0xnxl84q3";
           name = "unicode-fonts";
         };
@@ -25254,7 +25571,7 @@
           sha256 = "0qy1hla7vf674ynqdzsaw2cnk92nhpcimww5q94rc0a95pzw64wd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-progress-reporter";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unicode-progress-reporter";
           sha256 = "03z7p27470fqy3gd356l9cpp44a35sfrxz94dxmx388rzlygk7y7";
           name = "unicode-progress-reporter";
         };
@@ -25275,7 +25592,7 @@
           sha256 = "0q7cbl89yg3fjxaxsqsksxhw7ibdslbb004z5y1m579n7zgcrljy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unicode-whitespace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unicode-whitespace";
           sha256 = "1b3jgha8va42b89pdp41sab2w9wllp7dicqg4lxl67bg6wn147wy";
           name = "unicode-whitespace";
         };
@@ -25296,7 +25613,7 @@
           sha256 = "1vbx10s2zmhpxjg26ik947bcg9f7w3g2w45wmm0shjp743fsdq8p";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unify-opening";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unify-opening";
           sha256 = "1gpmklbdbmv8va8d3yr94r1ydkcyvdzcgxv56rp0bxwbcgmk0as8";
           name = "unify-opening";
         };
@@ -25317,7 +25634,7 @@
           sha256 = "1w2w0gmyr0nbq8kv3ldj30h9xma76gi1khbdia1y30kss677rr8m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/unkillable-scratch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/unkillable-scratch";
           sha256 = "0ghbpa9pf7k6vd2mjxkpqg2qfl4sd40ir6mrk1rxr1rv8s0afkf7";
           name = "unkillable-scratch";
         };
@@ -25338,7 +25655,7 @@
           sha256 = "07vwg0bg719gb8ln1n5a33103903vvrphnkbvvfn43904pkrf14w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/use-package";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/use-package";
           sha256 = "0z7k77yfvsndql719qy4vypnwvi9izal8k8vhdx0pw8msaz4xqd8";
           name = "use-package";
         };
@@ -25359,7 +25676,7 @@
           sha256 = "1azv6grd5h2r1spy996nv6q1c5l6qawv6k0dc2i5k96szl0r668r";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/utop";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/utop";
           sha256 = "0lv16kl29gc9hdcpn04l85pf7x93vkl41s4mgqp678cllzyr0cq7";
           name = "utop";
         };
@@ -25380,7 +25697,7 @@
           sha256 = "0z53n9qsglp87f6q1pa3sixrjni9k46j31zg15gcwrmflmfrw8ds";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/uzumaki";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/uzumaki";
           sha256 = "1fvhzz2qpyc819rjvzyf42jmb70hlg7a9ybqwi81w7rydpabg61q";
           name = "uzumaki";
         };
@@ -25401,7 +25718,7 @@
           sha256 = "04r73s3fhvdcryv0l57awkpg1hi3kg6zcqxbxb03jc89h0f9vdlh";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vagrant";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vagrant";
           sha256 = "0g6sqzsx3lixcn09fkxhhcfp45qnqgf1ms0l7nkzyljavb7151cf";
           name = "vagrant";
         };
@@ -25422,7 +25739,7 @@
           sha256 = "19j5q2f6pybvjq3ryjcyihzlw348hqyjhfcy3qflry6w786dqcgn";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vbasense";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vbasense";
           sha256 = "1440q2bi4arpl5lbqh7zscg7v3884clqx54p2fdfcfkz47ky4z9n";
           name = "vbasense";
         };
@@ -25443,7 +25760,7 @@
           sha256 = "07dx3dyvkwcin0gb6j4jx0ldfxs4rqhygl56a8i81yy05adkaq2x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vcomp";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vcomp";
           sha256 = "02cj2nlyxvgvl2rjfgacljvcsnfm9crmmkhcm2pznj9xw10y8pq0";
           name = "vcomp";
         };
@@ -25464,7 +25781,7 @@
           sha256 = "034475m2d2vlrlc2l88gdx0ga3krsdh08wkjxwnbb2dfyz3p8r9v";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vdirel";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vdirel";
           sha256 = "11cc7bw7x5h3bwnlsjyhw6k5fh2fk7wffarrcny562v4cmr013cj";
           name = "vdirel";
         };
@@ -25485,7 +25802,7 @@
           sha256 = "0lzq31zqnk32vfp3kicnvgfr3nkv8amjzxmk9nrz1kwgmq7gvkjk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vector-utils";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vector-utils";
           sha256 = "07armr23pq5pd47lqhir6a59r86c84zikbc51d8vfcaw8y71yr5n";
           name = "vector-utils";
         };
@@ -25506,7 +25823,7 @@
           sha256 = "0k8wbylvws4yxh2jzxkz0fw5kwgblxvmagz54igbjj5mfm45pgsp";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vhdl-tools";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vhdl-tools";
           sha256 = "006d9xv60a90xalagczkziiimwsr1np9nn25zvnc4nlbf8j3fbbw";
           name = "vhdl-tools";
         };
@@ -25527,7 +25844,7 @@
           sha256 = "1750gx65ymibam8ahx5blfv5jc26f3mzbklk1jrmfwpsalyghdd9";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vim-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vim-region";
           sha256 = "1dcnx799lpjsdnnjxqzgskkfj2nx7f4kwf0xjhbg35ny4nyn81dx";
           name = "vim-region";
         };
@@ -25548,7 +25865,7 @@
           sha256 = "1f94qx8rbnn21cl0grxqa9gzkbrz68vmqsihv8vvi8qf1c1dmd0i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vimgolf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vimgolf";
           sha256 = "1hvw2pfa5a984hm6wd33bf6zz6hmlprc6qs3g789dfx91qm890vn";
           name = "vimgolf";
         };
@@ -25569,7 +25886,7 @@
           sha256 = "082qrbljlahkq1fz2dfl434f1xv47jc1v9k0srh7lrm14616dzq3";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vimish-fold";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vimish-fold";
           sha256 = "017by9w53d8pqlsazfycmhdv16yylks308p5vxp1rcw2qacpc5m3";
           name = "vimish-fold";
         };
@@ -25590,7 +25907,7 @@
           sha256 = "100w8rxdqln4xiwi0df15pvyaiyhjlwcjdh8nb0j95qpwji41vmf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/visual-fill-column";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/visual-fill-column";
           sha256 = "19y0pwaybjal2rc7migdbnafpi4dfbxvrzgfqr8dlvd9q68v08y5";
           name = "visual-fill-column";
         };
@@ -25611,7 +25928,7 @@
           sha256 = "0vl0hwxzzvgna8sysf517qq08fi1zsff3dmcgwvsgzhc47sq8mng";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/vlf";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/vlf";
           sha256 = "1ipkv5kmda0l39xwbf7ns9p0mx3kb781mxsm9vmbkhr5x577s2j8";
           name = "vlf";
         };
@@ -25632,7 +25949,7 @@
           sha256 = "0q1rwqjwqcnsr57s531pwlm464q8wx5vvdm5rj2xy9b3yi6phis1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/voca-builder";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/voca-builder";
           sha256 = "0mbw87mpbb8rw7xzhmg6yjla2c80x9820kw4q00x00ny5rbhm76y";
           name = "voca-builder";
         };
@@ -25642,6 +25959,27 @@
           license = lib.licenses.free;
         };
       }) {};
+    volatile-highlights = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
+    melpaBuild {
+        pname = "volatile-highlights";
+        version = "1.11";
+        src = fetchFromGitHub {
+          owner = "k-talo";
+          repo = "volatile-highlights.el";
+          rev = "fb2abc2d4d4051a9a6b7c8de2fe7564161f01f24";
+          sha256 = "1v0chqj5jir4685jd8ahw86g9zdmi6xd05wmzhyw20rbk924fcqf";
+        };
+        recipeFile = fetchurl {
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/volatile-highlights";
+          sha256 = "1r6in919aqdziv6bgzp4k7jqa87bd287pacq615sd5m1nzva1a4d";
+          name = "volatile-highlights";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://melpa.org/#/volatile-highlights";
+          license = lib.licenses.free;
+        };
+      }) {};
     wacspace = callPackage ({ cl-lib ? null, dash, fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wacspace";
@@ -25653,7 +25991,7 @@
           sha256 = "0jl3n79wmbxnrbf83qjq0v5pzhvv67i9r5sp2zj8nc86hh7dvjsd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wacspace";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wacspace";
           sha256 = "1xy0mprvyi37zmgj1yrlh5ni08j47lpag1jm3a76cgghgmlfjxrl";
           name = "wacspace";
         };
@@ -25674,7 +26012,7 @@
           sha256 = "0mnfk2ys8axjh696cq5msr5cdr91icl1i3mi0dd2y00lvh6sbm7w";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wc-goal-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wc-goal-mode";
           sha256 = "0l3gh96njjldp7n13jn1zjrp17h7ivjak102j6wwspgg6v2h5419";
           name = "wc-goal-mode";
         };
@@ -25695,7 +26033,7 @@
           sha256 = "113prlamr2j6y6n0w43asffawwa4qiq63mgwm85v04h6pr8bd90l";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wcheck-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wcheck-mode";
           sha256 = "0cmdvhgax6r5svn3wkwll4j271qj70g8182c58riwnkhiajxmn3k";
           name = "wcheck-mode";
         };
@@ -25716,7 +26054,7 @@
           sha256 = "0qx92jqzsimjk92pql2h8pzhq66mqijwqgjqwp7rmq5b6k0nvx1z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/weather-metno";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/weather-metno";
           sha256 = "0h7p4l8y75h27pgk45f0mk3gjd43jk8q97gjf85a9b0afd63d3f6";
           name = "weather-metno";
         };
@@ -25737,7 +26075,7 @@
           sha256 = "1w7jnsc6lzlrlkj0nrlfnyca78lw53144hrf9k43b0g0zl8n9zqj";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/web-completion-data";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/web-completion-data";
           sha256 = "1zzdmhyn6bjaidk808s4pdk25a5rn4287949ps5vbpyniaf6gny9";
           name = "web-completion-data";
         };
@@ -25758,7 +26096,7 @@
           sha256 = "00fzzjqa1v2dzlpgjxb2qj3nn6iizg177mk7vjvcv4814g4dhcal";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/web-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/web-mode";
           sha256 = "1vyhyc5nf4yj2m63inpwmcqvlsihaqw8nn8xvfdg44nhl6vjz97i";
           name = "web-mode";
         };
@@ -25778,7 +26116,7 @@
           sha256 = "1z7ld9d0crwdh778fyaapx75vpnlnslsh9nf07ywkylhz4w68yyv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/weblogger";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/weblogger";
           sha256 = "189zs1321rybgi4zihps7d2jll5z13726jsg5mi7iycg85nkv2fk";
           name = "weblogger";
         };
@@ -25799,7 +26137,7 @@
           sha256 = "0f90m2s40jish4wjwfpmbgw024r7n2l5b9q9wr6rd3vdcwks3mcl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/weechat";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/weechat";
           sha256 = "0sxrms5024bi4irv8x8s8j1zcyd62cpqm0zv4dgpm65wnpc7xc46";
           name = "weechat";
         };
@@ -25820,7 +26158,7 @@
           sha256 = "14vmgfz45wmpjfhfx3pfjn3bak8qvj1zk1w4xc5w1cfl6vnij6hv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/weibo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/weibo";
           sha256 = "1ndgfqqb0gvy8p2fisi57s9bsa2nrnv80smg78m89i4cwagbz6yd";
           name = "weibo";
         };
@@ -25841,7 +26179,7 @@
           sha256 = "11mi23djk690n4984hk3pv61rrkdnxpkmywsqibi3xki27v2al36";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/which-key";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/which-key";
           sha256 = "0vqbhfzcv9m58w41zdhpiymhgl38n15c6d7ffd99narxlkckcj59";
           name = "which-key";
         };
@@ -25862,7 +26200,7 @@
           sha256 = "01fwhrfi92pcrwc4yn03pflc9wj07mhzj0a0i5amar4f9bj6m5b4";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/whitaker";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/whitaker";
           sha256 = "17fnvb3jh6fi4wddn5qnp6i6ndidg8jf9ac69q9j032c2msr07nj";
           name = "whitaker";
         };
@@ -25883,7 +26221,7 @@
           sha256 = "0xmwhybb8x6wwfr55ym5xg4dhy1aqx1abxy9qskn7h3zf1z4pgg2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/whitespace-cleanup-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/whitespace-cleanup-mode";
           sha256 = "1fhdjrxxyfx4xsgfjqq9p7vhj98wmqf2r00mv8k27vdaxwsnm5p3";
           name = "whitespace-cleanup-mode";
         };
@@ -25904,7 +26242,7 @@
           sha256 = "0ip0vkqb4dm88xqzgwc9yaxzf4sc4x006m6z73a3lbfmrncy2c1d";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/whole-line-or-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/whole-line-or-region";
           sha256 = "1vs2i4cy1zc6nj660i9h36jbfgc3kvqivjnzlq5zwlxk5hcibqa1";
           name = "whole-line-or-region";
         };
@@ -25925,7 +26263,7 @@
           sha256 = "0fqv63m8z5m5ghh4j8ccdnmgcdkvi4jqpg9z7lp17g4p9pq3xfjf";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/widget-mvc";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/widget-mvc";
           sha256 = "0njzvdlxb7z480r6dvmksgivhz7rvnil517aj86qx0jbc5mr3l2f";
           name = "widget-mvc";
         };
@@ -25946,7 +26284,7 @@
           sha256 = "1kqcc1d56jz107bswlzvdng6ny6qwp93yck2i2j921msn62qvbb2";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wiki-nav";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wiki-nav";
           sha256 = "19mabz0y3fcqsm68ijwwbbqylxgp71anc0a31zgc1blha9jivvwy";
           name = "wiki-nav";
         };
@@ -25967,7 +26305,7 @@
           sha256 = "0ib20zl8l1fs69ca9rry27qz69sgf6ws1ca5nhm5llvpkjcgv53i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/win-switch";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/win-switch";
           sha256 = "1s6inp5kf763rngn58r02fd7n7z3dd55j6hb7s9dgvc856d5z3my";
           name = "win-switch";
         };
@@ -25988,7 +26326,7 @@
           sha256 = "049bwa5g0z1b9nrsc1vc4511aqcq9fvl16xg493wj651g6q9qigb";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-end-visible";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/window-end-visible";
           sha256 = "1p78n7yysj18404cdc6vahfrzwn5pixyfnja8ch48rj4fm4jbxwq";
           name = "window-end-visible";
         };
@@ -26009,7 +26347,7 @@
           sha256 = "0jyymmbz03zj2ydca1rv6ra0b2brjl7pyl4897zd00j5kvqjdyif";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-layout";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/window-layout";
           sha256 = "1n4a6z00lxsffirjrmbaaw432w798b9vv34qawgn1k17y9l7gb85";
           name = "window-layout";
         };
@@ -26030,7 +26368,7 @@
           sha256 = "1rz2a1l3apavsknlfy0faaivqgpj4x9jz3hbysbg9pydpcwqgf64";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-numbering";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/window-numbering";
           sha256 = "0x3n0ni16q69lfpyjz61spqghmhvc3cwa4aj80ihii3pk80f769x";
           name = "window-numbering";
         };
@@ -26043,15 +26381,15 @@
     window-purpose = callPackage ({ cl-lib ? null, emacs, fetchFromGitHub, fetchurl, imenu-list, let-alist, lib, melpaBuild }:
     melpaBuild {
         pname = "window-purpose";
-        version = "1.4";
+        version = "1.5";
         src = fetchFromGitHub {
           owner = "bmag";
           repo = "emacs-purpose";
-          rev = "7e492cbdd4259a177625a3f47001d7281f295349";
-          sha256 = "08j0akwjp4arkw3zm0lazb13f6dq0m8y9k9nmypd7xk0m77byymd";
+          rev = "48943e2fb9886367df013119c323b2adcd57a82e";
+          sha256 = "1xjs51wm5ydcqdwvg3c42c5z4j92q75lmk895qkka7ayy5spxxf7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/window-purpose";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/window-purpose";
           sha256 = "1ib5ia7armghvmcw8qywcil4nxzwwakmfsp7ybawb0xr53h1w96d";
           name = "window-purpose";
         };
@@ -26072,7 +26410,7 @@
           sha256 = "1f4v0xd341qs4kfnjqhgf8j26valvg6pz4rwcz0zj0s23niy2yil";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/windsize";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/windsize";
           sha256 = "1xhfw77168942rcn246qndii0hv0q6vkgzj67jg4mxh8n46m50m9";
           name = "windsize";
         };
@@ -26092,7 +26430,7 @@
           sha256 = "16711d1ds508nmjw81jm2cfdpqzc55gc175fkhayk0f5swlvd11m";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wisp-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wisp-mode";
           sha256 = "10zkp1qbvl8dmxij7zz4p1fixs3891xr1nr57vyb3llar9fgzglc";
           name = "wisp-mode";
         };
@@ -26113,7 +26451,7 @@
           sha256 = "188h1sy4mxzrkwi3zgiw108c5f71rkj5agdkf9yy9v8c1bkawm4x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wispjs-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wispjs-mode";
           sha256 = "0qzm0dcvjndasnbqpkdc56f1qv66gxv8dfgfcwq5l1bp5wyx813p";
           name = "wispjs-mode";
         };
@@ -26134,7 +26472,7 @@
           sha256 = "0dymhkbkzicjw0379bdzbb594x5xcjbgbn428a30i2i0jwv66pfz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/with-editor";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/with-editor";
           sha256 = "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb";
           name = "with-editor";
         };
@@ -26155,7 +26493,7 @@
           sha256 = "0nmzh6dynbm8vglp4pqz81s2z68jbnasvamvi1x1iawf8g9zfyix";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wn-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wn-mode";
           sha256 = "1qy1pkfdnm4pska4cnff9cx2c812ilymajhpmsfc9jdbvhzwrwg3";
           name = "wn-mode";
         };
@@ -26176,7 +26514,7 @@
           sha256 = "018r35dz8z03wcrx9s28pjisayy21549i232mp6wy9mxkrkxbzpc";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wonderland";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wonderland";
           sha256 = "1b4p49mbzqffm2b2y8sbbi56vnkxap2jscsmla9l6l8brybqjppi";
           name = "wonderland";
         };
@@ -26197,7 +26535,7 @@
           sha256 = "0s3mjmfjiidn3spklndw0dvcwbb9x034xyphp60aad8vjaflbchs";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wordsmith-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wordsmith-mode";
           sha256 = "1570h1sjjaks6bnhd4xrbx6nna4v7hz6dmrzwjq37rwvallasg1n";
           name = "wordsmith-mode";
         };
@@ -26218,7 +26556,7 @@
           sha256 = "03hjwm51sngkh7jjiwnqhflllqq6i99ib47rm2ja9ii0qyhj1qa0";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wrap-region";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wrap-region";
           sha256 = "0mby3m49vm2pw127divspgivqam27zd4r70wx5ra05xwfxywaibq";
           name = "wrap-region";
         };
@@ -26239,7 +26577,7 @@
           sha256 = "1nnjn1r669hvvzfycllwap4w04m8rfsk4nzcg8057m1f263kj31b";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/writegood-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/writegood-mode";
           sha256 = "1lxammisaj04g5vr5lwms64ywf39w8knrq72x4i94wwzwx5ywi1d";
           name = "writegood-mode";
         };
@@ -26260,7 +26598,7 @@
           sha256 = "0f554h834p12255mhwjnxbh1ls65476k60cwddqyl844ph75w8jv";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/writeroom-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/writeroom-mode";
           sha256 = "1kpsrp3agw8bg3qbf5rf5k1a7ww30q5xsa8z5ywxajsaywjzx1bk";
           name = "writeroom-mode";
         };
@@ -26281,7 +26619,7 @@
           sha256 = "1lv0l27lrp6xyl0c5yhlnyjwx872izq02z8x34da9jv3walxpk8f";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ws-butler";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ws-butler";
           sha256 = "072k67z2lx0ampwzdiszi64xs0w6frp4nbmrd2r0wpx0pd211vbn";
           name = "ws-butler";
         };
@@ -26294,15 +26632,15 @@
     wsd-mode = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "wsd-mode";
-        version = "0.4.2";
+        version = "0.5.0";
         src = fetchFromGitHub {
           owner = "josteink";
           repo = "wsd-mode";
-          rev = "a6f58e1c47587cb8f0bd8d1fc280cf8605732883";
-          sha256 = "0qfbf9xmln60yd0na1508xmxkvnx0pis4dvbf16cjv0i41dq6i87";
+          rev = "b5e8ea0daeaa52f2ea6349e09902bd3216e96258";
+          sha256 = "1ibvcc54y2w72d3yvcczvzywribiwmkhlb1b08g4pyb1arclw393";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/wsd-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/wsd-mode";
           sha256 = "07vclmnj18wx9wlrcnsl99f9jlk3sb9g6pcdv8x1smk84gccpakc";
           name = "wsd-mode";
         };
@@ -26323,7 +26661,7 @@
           sha256 = "13id1vf590gc0kwkhh6mgq2gj2bra2kycxjlvql7v0s7cdvamjhq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/x86-lookup";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/x86-lookup";
           sha256 = "1clv1npvdkzsy0a08xrb880yflwzl4d5cc2c5xrs7b837mqpj8hd";
           name = "x86-lookup";
         };
@@ -26344,7 +26682,7 @@
           sha256 = "154xnfcmil9xjjmq4cyrfpir4ga4mgcmmbd7dja1m7rpk1734xk6";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xbm-life";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xbm-life";
           sha256 = "1pglxjd4cs630sayx17ai1xflpbyj3hry3156682bgwhqs1vw68q";
           name = "xbm-life";
         };
@@ -26365,7 +26703,7 @@
           sha256 = "1n1msmqap4a2qnjwrchf9cjkzcl20hbrx0vsc4lkbvq3p5riv5p7";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xcscope";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xcscope";
           sha256 = "06xh29cm5v3b5xwj32y0i0h0kvvy995840db4hvab2wn9jw68m8w";
           name = "xcscope";
         };
@@ -26386,7 +26724,7 @@
           sha256 = "1yy759qc4njc8bqh8hmgc0mq5vk5spz5syxgflqhjijk8nrvyfgl";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xquery-tool";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xquery-tool";
           sha256 = "069injmvv9zzcbqbms94qx5wjj740jnik6sf3b4xjhln7z1yskp0";
           name = "xquery-tool";
         };
@@ -26407,7 +26745,7 @@
           sha256 = "1zdj4664gvwc4kyx7fx5232l3c5anm0xyrrnrw596q604q6xxj2x";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xterm-color";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xterm-color";
           sha256 = "0bvzi1mkxgm4vbq2va1sr0k9h3fdmppq79hkvbizc2xgk72sazpj";
           name = "xterm-color";
         };
@@ -26428,7 +26766,7 @@
           sha256 = "1wqx6hlqcmqiljydih5fx89dw06g8w728pyn4iqsap8jwgjngb09";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/xtest";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/xtest";
           sha256 = "1vbs4sb4frzg8d3l96ip9cc6lc86nbj50vpdfqazvxmdfd1sg4i7";
           name = "xtest";
         };
@@ -26449,7 +26787,7 @@
           sha256 = "1rplafm6mldsirj7xg66vsx03n263yii3il3fkws69xmv7sx1a6i";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yafolding";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yafolding";
           sha256 = "1z70ismfwmh9a83a7h5lbhw7iywfib5fis7y8gx8020wfjq9g2yq";
           name = "yafolding";
         };
@@ -26470,7 +26808,7 @@
           sha256 = "0l9b888wv72j4hhkcfzsh09iqjxp2qjbjcjcfmvfhxf7il11pv8h";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yagist";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yagist";
           sha256 = "1mz86fq0pb4w54c66vd19m2492mkrzq2qi6ssnn2xwmn8vv02wdd";
           name = "yagist";
         };
@@ -26491,7 +26829,7 @@
           sha256 = "1mj1gwrflpdlmc7wl1axygn1jqlrjys1dh3cpdh27zrgsjvhd6c1";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yaml-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yaml-mode";
           sha256 = "0afp83xcr8h153cayyaszwkgpap0iyk351dlykmv6bv9d2m774mc";
           name = "yaml-mode";
         };
@@ -26512,7 +26850,7 @@
           sha256 = "007837w6gd7k253h7g2in6l3ihcbwv733yiffs26pnymgk21xdqz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yascroll";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yascroll";
           sha256 = "11g7wn4hgdwnx3n7ra0sh8gk6rykwvrg9g2cihvcv7mjbqgcv53f";
           name = "yascroll";
         };
@@ -26533,7 +26871,7 @@
           sha256 = "0m6y2m2nsg6camwh0hjv9jcw6p5a0b4dwig1d58s2g15n3hca3dy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yasnippet";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yasnippet";
           sha256 = "1j6hcpzxljz1axh0xfbwr4ysbixkwgxawsvsgicls8r8kl2xvjvf";
           name = "yasnippet";
         };
@@ -26554,7 +26892,7 @@
           sha256 = "1yplaj7pry43qps8hvqxj9983ah4jvaiq94l171a7f8qi28386s8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yatemplate";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yatemplate";
           sha256 = "05gd9sxdiqpw2p1kdagwgxd94wiw1fmmcsp9v4p74i9sqmf6qn6q";
           name = "yatemplate";
         };
@@ -26573,7 +26911,7 @@
           sha256 = "08iwfpsjs36pqr2l85avxhsjx8z0sdfw8cqwwf3brn7i4x67f7z5";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yatex";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yatex";
           sha256 = "17np4am7yan1bh4706azf8in60c41158h3z591478j5b1w13y5a6";
           name = "yatex";
         };
@@ -26594,7 +26932,7 @@
           sha256 = "0nqyn1b01v1qxv7rcf46qypca61lmpm8d7kqv63jazw3n05qdnj8";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yaxception";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yaxception";
           sha256 = "18n2kjbgfhkhcwigxmv8dk72jp57vsqqd20lc26v5amx6mrhgh58";
           name = "yaxception";
         };
@@ -26615,7 +26953,7 @@
           sha256 = "094alkjrh285qy3sds8dkvxsbnaxnppz1ab0i5r575lyhli9lxia";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/ycmd";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/ycmd";
           sha256 = "06psmcr5132vn72l0amzj14dy43aradnbmlvvms55srvici6r60q";
           name = "ycmd";
         };
@@ -26636,7 +26974,7 @@
           sha256 = "0yvz7lmid4jcikb9jmc7h2lcry3fdyy809k25nyasj2bk41xqqsd";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/yesql-ghosts";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/yesql-ghosts";
           sha256 = "1hxzbnfd15f0ifdqjbw9nhxd0z46x705v2bc0xl71nav78fgpswf";
           name = "yesql-ghosts";
         };
@@ -26657,7 +26995,7 @@
           sha256 = "0016qff7hdnd0xkyhxakfzzscwlwkpzppvc4wxfw0iacpjkz1fnr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/youdao-dictionary";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/youdao-dictionary";
           sha256 = "1qfk7s18br9jask1bpida0cjxks098qpz0ssmw8misi3bjax0fym";
           name = "youdao-dictionary";
         };
@@ -26678,7 +27016,7 @@
           sha256 = "0bgq34k7p9qkxhrg7dvmkfpi1r47czyw12l0cm93z3m817z5hjrk";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zenburn-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zenburn-theme";
           sha256 = "1kb371j9aissj0vy07jw4ydfn554blc8b2rbi0x1dvfksr2rhsn9";
           name = "zenburn-theme";
         };
@@ -26691,15 +27029,15 @@
     zerodark-theme = callPackage ({ fetchFromGitHub, fetchurl, lib, melpaBuild }:
     melpaBuild {
         pname = "zerodark-theme";
-        version = "1.0";
+        version = "1.1";
         src = fetchFromGitHub {
           owner = "NicolasPetton";
           repo = "zerodark-theme";
-          rev = "5f7e16b35b2b42e4a286ca0cece4766a69cd7321";
-          sha256 = "1pxy6ia7di3i5kigybkz78f7fgbsyr1js9asrfbbx3kkpxpm2vfc";
+          rev = "c948c6e1467a61b0592b0c0ca08a4895fb353a4c";
+          sha256 = "1w1g81wy2l67b5dknphrigpxx5slfgrl2qyba4b93gcx68zaj4bq";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zerodark-theme";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zerodark-theme";
           sha256 = "1nqzswmnq6h0av4rivqm237h7ghp7asa2nvls7nz4ma467p9qhp9";
           name = "zerodark-theme";
         };
@@ -26720,7 +27058,7 @@
           sha256 = "1ksjd3askc3k1l0b3nia5mzkxa74bidh2x0xlrj4qs4im5445vnz";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zombie-trellys-mode";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zombie-trellys-mode";
           sha256 = "19xzvppw7f35s82hm0y7sga8dyjjyy0dxy6vji4hxdpjziz7lggv";
           name = "zombie-trellys-mode";
         };
@@ -26741,7 +27079,7 @@
           sha256 = "1lrgirfvcvbir7csshkhhwj99jj1x5aprhw7xfiicv7nan9m6gjy";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zone-nyan";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zone-nyan";
           sha256 = "165sgjaahz038isii971m02hr2g5iqhbhiwf5kdn8c739cjaa17b";
           name = "zone-nyan";
         };
@@ -26762,7 +27100,7 @@
           sha256 = "1dwf3980rnwc85s73j8accwgpcdhsa6fqdrppbrqb8f7c05q8303";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zoom-window";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zoom-window";
           sha256 = "0l9683nk2bdm49likk9c55c23qfy6f1pn04drqwd1vhpanz4l4b3";
           name = "zoom-window";
         };
@@ -26783,7 +27121,7 @@
           sha256 = "0j6x3az8vpq2ggafjxdl8x3ln7lhh58c27z72mwywp4a2ca1g496";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zop-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zop-to-char";
           sha256 = "0jnspvqqvnaplld083j7cqqxw122qazh88ab7hymci36m3ka9hga";
           name = "zop-to-char";
         };
@@ -26804,7 +27142,7 @@
           sha256 = "0qwdbzfi8mddmchdd9ab9ms1ynlc8dx08i6g2mf3za1sbcivdqsr";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zotelo";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zotelo";
           sha256 = "0ai516lqj9yw7ymvfm4n5inv53sp6mg90wy56lr1laflizwxzg8z";
           name = "zotelo";
         };
@@ -26825,7 +27163,7 @@
           sha256 = "0v73fgb0gf81vlihiicy32v6x86rr2hv0bxlpw7d3pk4ng1a0l3z";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zygospore";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zygospore";
           sha256 = "03mmxqbliwd1g73cxd9kqkngdy4jdavcs6j12b4wp27xmhgaj40z";
           name = "zygospore";
         };
@@ -26846,7 +27184,7 @@
           sha256 = "0y0hhar3krkvbpb5y9k197mb0wfpz8cl6fmxazq8msjml7hkk339";
         };
         recipeFile = fetchurl {
-          url = "https://raw.githubusercontent.com/milkypostman/melpa/0fe7b0857828a041ee06b30edd2cd488cc3394c7/recipes/zzz-to-char";
+          url = "https://raw.githubusercontent.com/milkypostman/melpa/fdd35b0df7b71661561c155a8f7ba7c2236f3e30/recipes/zzz-to-char";
           sha256 = "16vwp0krshmn5x3ry1j512g4kydx39znjqzri4j7wgg49bz1n7vh";
           name = "zzz-to-char";
         };

From a5356d09e6fd06cf83dc4e9508aa17605a6a41e7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Mon, 22 Feb 2016 06:21:20 -0600
Subject: [PATCH 1659/2285] elpaPackages 2016-02-22

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

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index a9737e744ed6..fbb7955a1d67 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -81,10 +81,10 @@
     aggressive-indent = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "aggressive-indent";
-        version = "1.4";
+        version = "1.5";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/aggressive-indent-1.4.el";
-          sha256 = "0qdpvdzmw4hq2g8krx93fbb352nkg731p7v82zhqw76y79khdpka";
+          url = "http://elpa.gnu.org/packages/aggressive-indent-1.5.el";
+          sha256 = "00ddfni659rl19ybzrywj3b444akvil6n06k8lf5jyaqb53mkc5d";
         };
         packageRequires = [ cl-lib emacs ];
         meta = {
@@ -95,10 +95,10 @@
     ahungry-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "ahungry-theme";
-        version = "1.0.12";
+        version = "1.1.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/ahungry-theme-1.0.12.tar";
-          sha256 = "0a6mlxka1b7vja4wxd8gvfhfk5i1jdj3a851c7dn34hz1lkgvnx8";
+          url = "http://elpa.gnu.org/packages/ahungry-theme-1.1.0.tar";
+          sha256 = "1jy2h4r72fr26yavs0s8dy1xnkxvaf2hsrlm63f6sng81njj9dgx";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -119,6 +119,19 @@
           license = lib.licenses.free;
         };
       }) {};
+    ampc = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "ampc";
+        version = "0.2";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/ampc-0.2.el";
+          sha256 = "1pdy5mvi6h8m7qjnxiy217fgcp9w91375hq29bacfgh7bix56jlr";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/ampc.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     ascii-art-to-unicode = callPackage ({ elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "ascii-art-to-unicode";
@@ -201,10 +214,10 @@
       }) {};
     beacon = callPackage ({ elpaBuild, fetchurl, lib, seq }: elpaBuild {
         pname = "beacon";
-        version = "0.6.1";
+        version = "1.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/beacon-0.6.1.el";
-          sha256 = "0zg3gzfx06f3pj7mipfdmhmafvcil0idha3wdi068cza7akmyiwb";
+          url = "http://elpa.gnu.org/packages/beacon-1.0.el";
+          sha256 = "1rdvdn50kb7kplvi8x199cm15mn4pxidn17p84l8q5wk3arj9c09";
         };
         packageRequires = [ seq ];
         meta = {
@@ -215,10 +228,10 @@
     bug-hunter = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, seq }:
     elpaBuild {
         pname = "bug-hunter";
-        version = "1.0.1";
+        version = "1.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/bug-hunter-1.0.1.el";
-          sha256 = "0c0pg542y09c1k25dxk2062pj3cj12i73kqxbpq0m6af0qm7wy9d";
+          url = "http://elpa.gnu.org/packages/bug-hunter-1.1.el";
+          sha256 = "07j455hizqiicpigy8ybpqk0v87iqa57jvpirg5yb2g8j5ipwygs";
         };
         packageRequires = [ cl-lib seq ];
         meta = {
@@ -617,10 +630,10 @@
       }) {};
     exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild {
         pname = "exwm";
-        version = "0.1";
+        version = "0.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/exwm-0.1.tar";
-          sha256 = "18w9a37v8lyyjj8ll2f5mw8fw14g54b887cflzv5d576k5f606f5";
+          url = "http://elpa.gnu.org/packages/exwm-0.2.tar";
+          sha256 = "0z96zz6h5r880nbhclbxs2r0zfkg771lg0fjghigqxz8ai0hh1ll";
         };
         packageRequires = [ xelb ];
         meta = {
@@ -1044,10 +1057,10 @@
       }) {};
     multishell = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "multishell";
-        version = "1.1.2";
+        version = "1.1.5";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/multishell-1.1.2.tar";
-          sha256 = "1y0b6ri0kgxj0jw1cyb796lsy3ipzb7syvmj7pqpx9myzpvd3hz3";
+          url = "http://elpa.gnu.org/packages/multishell-1.1.5.tar";
+          sha256 = "0g38p5biyxqkjdkmxlikvhkhkmafyy3ibd012q83skaf8fi4cv1y";
         };
         packageRequires = [];
         meta = {
@@ -1202,10 +1215,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20160201";
+        version = "20160215";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/org-20160201.tar";
-          sha256 = "1lyvfpksl88c9d7k2w4k3iswgjah51k9f8fdi3jbfwivd814m9nb";
+          url = "http://elpa.gnu.org/packages/org-20160215.tar";
+          sha256 = "0w2686rza4xdknq3sy87s04zvlmjxyr6wrj9y9ydcv8hbzws3bhd";
         };
         packageRequires = [];
         meta = {
@@ -1492,10 +1505,10 @@
       }) {};
     spinner = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "spinner";
-        version = "1.4";
+        version = "1.7";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/spinner-1.4.el";
-          sha256 = "0j4x8hbnhda83yyb31mm9b014pfb81gdfsr026rhn8ls3y163dbf";
+          url = "http://elpa.gnu.org/packages/spinner-1.7.el";
+          sha256 = "1y78kr26mi74xf0qh32dvhk7w3bkj6d9i2iw1mypsr0h5phg8ahf";
         };
         packageRequires = [];
         meta = {
@@ -1532,10 +1545,10 @@
     svg-clock = callPackage ({ elpaBuild, emacs, fetchurl, lib, svg }:
     elpaBuild {
         pname = "svg-clock";
-        version = "0.5";
+        version = "1.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/svg-clock-0.5.el";
-          sha256 = "1i77c7nyqcwc6b6n7vdh95xbmwv5kpdds6j7pklp4c9vbvm8axgp";
+          url = "http://elpa.gnu.org/packages/svg-clock-1.0.el";
+          sha256 = "0j6zk7fsv72af12phqdw8axbn2y8y4rfgxiab1p3pxq3y7k47jid";
         };
         packageRequires = [ emacs svg ];
         meta = {
@@ -1623,6 +1636,19 @@
           license = lib.licenses.free;
         };
       }) {};
+    tramp-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
+        pname = "tramp-theme";
+        version = "0.1.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/tramp-theme-0.1.1.el";
+          sha256 = "0l8i625h9sc6h59qfj847blmfwfhf9bvfsbmwfb56qzs535fby3y";
+        };
+        packageRequires = [ emacs ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/tramp-theme.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     transcribe = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "transcribe";
         version = "1.0.2";
@@ -1675,6 +1701,20 @@
           license = lib.licenses.free;
         };
       }) {};
+    url-http-ntlm = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, ntlm ? null }:
+    elpaBuild {
+        pname = "url-http-ntlm";
+        version = "2.0.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/url-http-ntlm-2.0.1.tar";
+          sha256 = "0h6xsm1x7v69kb4shyvv1p4f6sxgcqs5ap6ylqydz10mbcx7aq0w";
+        };
+        packageRequires = [ cl-lib ntlm ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/url-http-ntlm.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     vlf = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "vlf";
         version = "1.7";
@@ -1809,10 +1849,10 @@
     xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "xelb";
-        version = "0.4";
+        version = "0.5";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/xelb-0.4.tar";
-          sha256 = "1m3wmlzcnbv1akncdaakfy4xmxyjnfb6yl1nfahwf4lfxlsvnwzd";
+          url = "http://elpa.gnu.org/packages/xelb-0.5.tar";
+          sha256 = "1wypffg492r2a3h136c6mphsbgimxcipsarm971z56kpy3lwi4sb";
         };
         packageRequires = [ cl-generic emacs ];
         meta = {

From 2dd51275eb6794e0a588165fc9f9f041c385c9e5 Mon Sep 17 00:00:00 2001
From: Allan Espinosa <allan.espinosa@outlook.com>
Date: Sun, 21 Feb 2016 20:56:51 -0600
Subject: [PATCH 1660/2285] dpic: init at 2016.01.12

---
 lib/maintainers.nix                  |  1 +
 pkgs/tools/graphics/dpic/default.nix | 29 ++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix      |  2 ++
 3 files changed, 32 insertions(+)
 create mode 100644 pkgs/tools/graphics/dpic/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 39d91df04987..06257b1ca731 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -12,6 +12,7 @@
   abaldeau = "Andreas Baldeau <andreas@baldeau.net>";
   abbradar = "Nikolay Amiantov <ab@fmap.me>";
   adev	   = "Adrien Devresse <adev@adev.name>";
+  aespinosa = "Allan Espinosa <allan.espinosa@outlook.com>";
   aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
   aflatter = "Alexander Flatter <flatter@fastmail.fm>";
   aherrmann = "Andreas Herrmann <andreash87@gmx.ch>";
diff --git a/pkgs/tools/graphics/dpic/default.nix b/pkgs/tools/graphics/dpic/default.nix
new file mode 100644
index 000000000000..ea73a0e95b9d
--- /dev/null
+++ b/pkgs/tools/graphics/dpic/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "dpic-${version}";
+  version = "2016.01.12";
+
+  src = fetchurl {
+    url = "https://ece.uwaterloo.ca/~aplevich/dpic/${name}.tar.gz";
+    sha256 = "0iwwf8shgm8n4drz8mndvk7jga93yy8plnyby3lgk8376g5ps6cz";
+  };
+
+  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
+
+  makeFlags = "CC=${stdenv.cc.outPath}/bin/cc";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp -fv dpic $out/bin
+  '';
+
+  meta = {
+    homepage = "https://ece.uwaterloo.ca/~aplevich/dpic/";
+    description = "An implementation of the pic little language for creating drawings";
+    license = stdenv.lib.licenses.bsd2;
+    maintainers = [ stdenv.lib.maintainers.aespinosa ];
+    platforms = stdenv.lib.platforms.all;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c19682986579..7e75601eecb0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -866,6 +866,8 @@ let
 
   dlx = callPackage ../misc/emulators/dlx { };
 
+  dpic = callPackage ../tools/graphics/dpic { };
+
   dragon-drop = callPackage ../tools/X11/dragon-drop {
     gtk = gtk3;
   };

From 2960ea5292de0d0cb978e74f5b94d533f904eedd Mon Sep 17 00:00:00 2001
From: "Bruno Bzeznik Bruno.Bzeznik@imag.fr" <Bruno.Bzeznik@imag.fr>
Date: Mon, 22 Feb 2016 14:53:34 +0100
Subject: [PATCH 1661/2285] nco: init at 4.5.5

---
 lib/maintainers.nix                        |  1 +
 pkgs/development/libraries/nco/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 3 files changed, 24 insertions(+)
 create mode 100644 pkgs/development/libraries/nco/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index c0b6804f0985..1fda2d1be0f9 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -58,6 +58,7 @@
   bosu = "Boris Sukholitko <boriss@gmail.com>";
   bramd = "Bram Duvigneau <bram@bramd.nl>";
   bstrik = "Berno Strik <dutchman55@gmx.com>";
+  bzizou = "Bruno Bzeznik <Bruno@bzizou.net>";
   c0dehero = "CodeHero <codehero@nerdpol.ch>";
   calrama = "Moritz Maxeiner <moritz@ucworks.org>";
   campadrenalin = "Philip Horger <campadrenalin@gmail.com>";
diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix
new file mode 100644
index 000000000000..0a284722e029
--- /dev/null
+++ b/pkgs/development/libraries/nco/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl }:
+
+stdenv.mkDerivation rec {
+  version = "4.5.5";
+  name = "nco";
+
+  buildInputs = [ netcdf netcdfcxx4 gsl udunits antlr which curl ];
+
+  src = fetchurl {
+    url = "https://github.com/nco/nco/archive/${version}.tar.gz";
+    sha256 = "bc6f5b976fdfbdec51f2ebefa158fa54672442c2fd5f042ba884f9f32c2ad666";
+  };
+
+  meta = { 
+    description = "The NCO (netCDF Operator) toolkit manipulates and analyzes data stored in netCDF-accessible formats, including DAP, HDF4, and HDF5";
+    homepage = http://nco.sourceforge.net/;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.bzizou ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df56303c7742..a90b8b4b9a50 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2426,6 +2426,8 @@ let
 
   netcdfcxx4 = callPackage ../development/libraries/netcdf-cxx4 { };
 
+  nco = callPackage ../development/libraries/nco { };
+
   nc6 = callPackage ../tools/networking/nc6 { };
 
   ncat = callPackage ../tools/networking/ncat { };

From 60f354dfb8ba7b4ac0f4ddc7bf22bf9c7dd1f40a Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 22 Feb 2016 10:50:27 -0600
Subject: [PATCH 1662/2285] nix-prefetch-git: output base32 hash so output
 matches nix-build errors

It turns out hashFormat has never been set.
---
 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 2c5852c646e4..97096aa29806 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -326,7 +326,7 @@ else
         clone_user_rev "$tmpFile" "$url" "$rev"
 
         # Compute the hash.
-        hash=$(nix-hash --type $hashType $hashFormat $tmpFile)
+        hash=$(nix-hash --type $hashType --base32 $tmpFile)
         if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi
 
         # Add the downloaded file to the Nix store.

From f57c049e0b114c156b6adb61738e7c5308a161d4 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sun, 21 Feb 2016 14:26:07 -0600
Subject: [PATCH 1663/2285] nixos-manual: Accept numbers for ttyNumber, closes
 #3608

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

diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 3e1f53e79f3e..79943a21224b 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -72,7 +72,8 @@ in
     };
 
     services.nixosManual.ttyNumber = mkOption {
-      default = "8";
+      type = types.int;
+      default = 8;
       description = ''
         Virtual console on which to show the manual.
       '';
@@ -96,7 +97,7 @@ in
       [ manual.manual help ]
       ++ optional config.programs.man.enable manual.manpages;
 
-    boot.extraTTYs = mkIf cfg.showManual ["tty${cfg.ttyNumber}"];
+    boot.extraTTYs = mkIf cfg.showManual ["tty${toString cfg.ttyNumber}"];
 
     systemd.services = optionalAttrs cfg.showManual
       { "nixos-manual" =
@@ -106,7 +107,7 @@ in
             { ExecStart = "${cfg.browser} ${entry}";
               StandardInput = "tty";
               StandardOutput = "tty";
-              TTYPath = "/dev/tty${cfg.ttyNumber}";
+              TTYPath = "/dev/tty${toString cfg.ttyNumber}";
               TTYReset = true;
               TTYVTDisallocate = true;
               Restart = "always";

From 81032a4722f3a37c51702b76c5424f509af5c0a5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 22 Feb 2016 02:05:24 +0300
Subject: [PATCH 1664/2285] octoprint-plugins.m3d-fio: 0.26 -> 0.27

---
 ...nnection-several-times-if-printer-is.patch | 57 -------------------
 pkgs/applications/misc/octoprint/plugins.nix  |  5 +-
 2 files changed, 2 insertions(+), 60 deletions(-)
 delete mode 100644 pkgs/applications/misc/octoprint/0002-Try-to-create-connection-several-times-if-printer-is.patch

diff --git a/pkgs/applications/misc/octoprint/0002-Try-to-create-connection-several-times-if-printer-is.patch b/pkgs/applications/misc/octoprint/0002-Try-to-create-connection-several-times-if-printer-is.patch
deleted file mode 100644
index 63495fd6db9c..000000000000
--- a/pkgs/applications/misc/octoprint/0002-Try-to-create-connection-several-times-if-printer-is.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From b99fc3fd012765c5b3d8ac7a3f64762af5121b4a Mon Sep 17 00:00:00 2001
-From: Nikolay Amiantov <ab@fmap.me>
-Date: Wed, 17 Feb 2016 15:47:34 +0300
-Subject: [PATCH 2/2] Try to create connection several times if printer is not
- yet available
-
----
- octoprint_m3dfio/__init__.py | 25 ++++++++++++++++++++++---
- 1 file changed, 22 insertions(+), 3 deletions(-)
-
-diff --git a/octoprint_m3dfio/__init__.py b/octoprint_m3dfio/__init__.py
-index 9f59768..e7d97eb 100644
---- a/octoprint_m3dfio/__init__.py
-+++ b/octoprint_m3dfio/__init__.py
-@@ -3421,8 +3421,16 @@ class M3DFioPlugin(
- 						# Set updated port
- 						currentPort = self.getPort()
- 					
--						# Re-connect
--						connection = serial.Serial(currentPort, currentBaudrate)
-+						# Re-connect; wait for the device to be available
-+                                                connection = None
-+                                                for i in range(1, 5):
-+						        try:
-+                                                                connection = serial.Serial(currentPort, currentBaudrate)
-+                                                                break
-+                                                        except OSError:
-+                                                                time.sleep(1)
-+                                                if connection is None:
-+                                                        raise Exception("Couldn't reconnect to the printer")
- 				
- 					# Check if getting EEPROM was successful
- 					if self.getEeprom(connection) :
-@@ -6799,8 +6807,19 @@ class M3DFioPlugin(
- 		# Set state to connecting
- 		comm_instance._log("Connecting to: " + str(port))
- 		
-+                # Create a connection
-+                connection = None
-+                for i in range(1, 5):
-+                        try:
-+                                connection = serial.Serial(str(port), baudrate)
-+                        # If printer has just power-cycled it may not yet be ready
-+                        except OSError:
-+                                time.sleep(1)
-+                if connection is None:
-+                        raise Exception("Couldn't reconnect to the printer")
-+
- 		# Return connection
--		return serial.Serial(str(port), baudrate)
-+		return connection
- 	
- 	# Disable sleep
- 	def disableSleep(self) :
--- 
-2.7.0
-
diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 801be43220d9..33f4561598a2 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -8,18 +8,17 @@ in {
 
   m3d-fio = buildPlugin rec {
     name = "M3D-Fio-${version}";
-    version = "0.26";
+    version = "0.27";
 
     src = fetchFromGitHub {
       owner = "donovan6000";
       repo = "M3D-Fio";
       rev = "V${version}";
-      sha256 = "1dl8m0cxp2vzla2a729r3jrq5ahxkj10pygp7m9bblj5nn2s0rll";
+      sha256 = "14zva61dhnsyapapw8q2qadfq5hzv5ykb7qxlz8a3x5j6wfhjn6h";
     };
 
     patches = [
       ./0001-Don-t-use-static-library.patch
-      ./0002-Try-to-create-connection-several-times-if-printer-is.patch
     ];
 
     postInstall = ''

From 0022f639f31161766b8f2604388015e8b05c4a0d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 22 Feb 2016 02:15:41 +0300
Subject: [PATCH 1665/2285] octoprint-plugins.titlestatus: 0.0.2 -> 0.0.4

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

diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 33f4561598a2..a0c458baa967 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -41,13 +41,13 @@ in {
 
   titlestatus = buildPlugin rec {
     name = "OctoPrint-TitleStatus-${version}";
-    version = "0.0.2";
+    version = "0.0.4";
 
     src = fetchFromGitHub {
       owner = "MoonshineSG";
       repo = "OctoPrint-TitleStatus";
       rev = version;
-      sha256 = "0rfbpxbcmadyihcrynh6bjywy3yqnzsnjn3yiwifisbrjgpm6sfw";
+      sha256 = "1l78xrabn5hcly2mgxwi17nwgnp2s6jxi9iy4wnw8k8icv74ag7k";
     };
 
     meta = with stdenv.lib; {

From a9e8c742fb975d7c43e4c62ef93617b76c5f9d51 Mon Sep 17 00:00:00 2001
From: Josef Knedl <josef.kemetmueller@aon.at>
Date: Mon, 22 Feb 2016 19:05:17 +0100
Subject: [PATCH 1666/2285] proj: Add platforms.darwin and enable doCheck.

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

diff --git a/pkgs/development/libraries/proj/default.nix b/pkgs/development/libraries/proj/default.nix
index 14f459cc6fec..bc9178f6367a 100644
--- a/pkgs/development/libraries/proj/default.nix
+++ b/pkgs/development/libraries/proj/default.nix
@@ -8,11 +8,13 @@ stdenv.mkDerivation {
     sha256 = "15kpcmz3qjxfrs6vq48mgyvb4vxscmwgkzrdcn71a60wxp8rmgv0";
   };
 
+  doCheck = true;
+
   meta = with stdenv.lib; {
     description = "Cartographic Projections Library";
     homepage = http://trac.osgeo.org/proj/;
     license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     maintainers = with maintainers; [ vbgl ];
   };
 }

From 64974687623a3803a2801ed08bd8228b0666a4b6 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 16 Feb 2016 16:38:59 +0100
Subject: [PATCH 1667/2285] dosemu-fonts: use versioned `name`

This also happens to solve a hash mismatch for me, but that might be
a coincidence.
---
 pkgs/data/fonts/dosemu-fonts/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/dosemu-fonts/default.nix b/pkgs/data/fonts/dosemu-fonts/default.nix
index 6f325b4ea4fd..97fb0b82c744 100644
--- a/pkgs/data/fonts/dosemu-fonts/default.nix
+++ b/pkgs/data/fonts/dosemu-fonts/default.nix
@@ -1,10 +1,11 @@
 {stdenv, fetchurl, bdftopcf, mkfontdir, mkfontscale}:
 
-stdenv.mkDerivation {
-  name = "dosemu-fonts";
+stdenv.mkDerivation rec {
+  version = "1.4.0";
+  name = "dosemu-fonts-${version}";
 
   src = fetchurl {
-    url = mirror://sourceforge/dosemu/dosemu-1.4.0.tgz;
+    url = "mirror://sourceforge/dosemu/dosemu-${version}.tgz";
     sha256 = "0l1zwmw42mpakjrzmbygshcg2qzq9mv8lx42738rz3j9hrqzg4pw";
   };
 

From 3675366f811fa9bf64c6dbccf8d84d90e7ad15ae Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 17 Feb 2016 21:09:51 +0100
Subject: [PATCH 1668/2285] miniupnpd: 1.9.20160212 -> 1.9.20160216

Changes:
- minor changes to follow UDA 1.1 more closely.
- more argument checking in Soap methods.

Log: https://github.com/miniupnp/miniupnp/blob/master/miniupnpd/Changelog.txt
---
 pkgs/tools/networking/miniupnpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index 8eb96913bcab..d93b429ea4fc 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "miniupnpd-1.9.20160212";
+  name = "miniupnpd-1.9.20160216";
 
   src = fetchurl {
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "1fsl46f7lrhpb597m0a905nwijpf188cchgg6pz39fx2mgjjjk9l";
+    sha256 = "001f9qc8zzrqbmjvpgwvpmi85sgb5ncl6gi9djxjr5n95a92r0g3";
     name = "${name}.tar.gz";
   };
 

From 9135aea76f449294d52e86b78f2d1fa4416ff548 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 17 Feb 2016 22:50:52 +0100
Subject: [PATCH 1669/2285] sane-backends-git: 2016-01-25 -> 2016-02-19

---
 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 bb5e787ede66..ad1302c9913d 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-01-25";
+  version = "2016-02-19";
   src = fetchgit {
-    sha256 = "db1fecd671bd8b3a777138bb4815285b4364ee3ad01ab05424b4aa0c20ed9919";
-    rev = "056f590f2d147099554d97a89dd5e0ddfa8d6dda";
+    sha256 = "d50971c106c8e0071d71daad7235776ac9a07a5ab0adb1e0eae5536b3021dd5f";
+    rev = "d74d3bcd887d2a3d59ee96e04eb68f15c0a3b882";
     url = "git://alioth.debian.org/git/sane/sane-backends.git";
   };
 })

From 74acc3ad936104ccabbcc8114f1fa85566f8bd1e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 18 Feb 2016 16:43:55 +0100
Subject: [PATCH 1670/2285] zstd: 0.5.0 -> 0.5.1

Changes:
- New: Optimal parsing => Very high compression modes, thanks to @inikep
- Changed: Dictionary builder integrated into libzstd and zstd cli
- Changed (!): zstd cli now uses "multiple input files" as default mode. See zstd -h.
- Fix: high compression modes for big-endian platforms (#123)
- New: zstd cli : -t | --test command
---
 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 e095b2d4e073..0d5ad10efcf9 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.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
-    sha256 = "18jwhvzj3kv8lpr6fgild7a574lsak93fc1z8nvhcdbc1b1n2dsj";
+    sha256 = "18mfrq5fqd7gkkqrgc32rlb98vw45rq1vsbrg44bprg3mv6ca3ls";
     rev = "v${version}";
     repo = "zstd";
     owner = "Cyan4973";

From 2919200db320b8d34f074bf5426e4cddddc515a5 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 18 Feb 2016 17:51:25 +0100
Subject: [PATCH 1671/2285] libpsl: 2016-02-09 -> 2016-02-16

---
 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 535c5cfeb65b..c53c4792a6f6 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -3,10 +3,10 @@
 
 let
 
-  listVersion = "2016-02-09";
+  listVersion = "2016-02-16";
   listSources = fetchFromGitHub {
-    sha256 = "17jxkwdd2l6aycg2q5img8gad3pb9k6fgikf87dybl3ydn0bpdja";
-    rev = "73668f743df8125477d38690807e3a9a1e1e9f19";
+    sha256 = "0f27nynm4skn1mnv7kgyyl7cy599n6al7x3alvqn0nw9s25cfmkc";
+    rev = "5bece2d9de4bb67274fd8e5928d6b449e7ff7674";
     repo = "list";
     owner = "publicsuffix";
   };

From e31c8922e00165f00bc148c14a4f5c260f50789e Mon Sep 17 00:00:00 2001
From: Thomas Bereknyei <tomberek@gmail.com>
Date: Mon, 22 Feb 2016 13:47:37 -0500
Subject: [PATCH 1672/2285] kippo: revert twisted dependency

---
 nixos/modules/services/networking/kippo.nix | 6 +++---
 pkgs/servers/kippo/default.nix              | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/kippo.nix b/nixos/modules/services/networking/kippo.nix
index 7d70a3d05fa7..5f3efcd133a1 100644
--- a/nixos/modules/services/networking/kippo.nix
+++ b/nixos/modules/services/networking/kippo.nix
@@ -54,7 +54,7 @@ rec {
   };
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs.pythonPackages; [
-      python twisted pycrypto pyasn1 ];
+      python twisted_11 pycrypto pyasn1 ];
 
     environment.etc."kippo.cfg".text = ''
         # Automatically generated by NixOS.
@@ -84,7 +84,7 @@ rec {
       description = "Kippo Web Server";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      environment.PYTHONPATH = "${pkgs.kippo}/src/:${pkgs.pythonPackages.pycrypto}/lib/python2.7/site-packages/:${pkgs.pythonPackages.pyasn1}/lib/python2.7/site-packages/:${pkgs.pythonPackages.python}/lib/python2.7/site-packages/:${pkgs.pythonPackages.twisted}/lib/python2.7/site-packages/:.";
+      environment.PYTHONPATH = "${pkgs.kippo}/src/:${pkgs.pythonPackages.pycrypto}/lib/python2.7/site-packages/:${pkgs.pythonPackages.pyasn1}/lib/python2.7/site-packages/:${pkgs.pythonPackages.python}/lib/python2.7/site-packages/:${pkgs.pythonPackages.twisted_11}/lib/python2.7/site-packages/:.";
       preStart = ''
         if [ ! -d ${cfg.varPath}/ ] ; then
             mkdir -p ${cfg.logPath}/tty
@@ -107,7 +107,7 @@ rec {
         fi
       '';
 
-      serviceConfig.ExecStart = "${pkgs.pythonPackages.twisted}/bin/twistd -y ${pkgs.kippo}/src/kippo.tac --syslog --rundir=${cfg.varPath}/ --pidfile=${cfg.pidPath}/kippo.pid --prefix=kippo -n";
+      serviceConfig.ExecStart = "${pkgs.pythonPackages.twisted_11}/bin/twistd -y ${pkgs.kippo}/src/kippo.tac --syslog --rundir=${cfg.varPath}/ --pidfile=${cfg.pidPath}/kippo.pid --prefix=kippo -n";
       serviceConfig.PermissionsStartOnly = true;
       serviceConfig.User = "kippo"; 
       serviceConfig.Group = "kippo"; 
diff --git a/pkgs/servers/kippo/default.nix b/pkgs/servers/kippo/default.nix
index 30d3fc3ab180..51630b4231ce 100644
--- a/pkgs/servers/kippo/default.nix
+++ b/pkgs/servers/kippo/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       url = "https://kippo.googlecode.com/files/kippo-${version}.tar.gz";
       sha1 = "f57a5cf88171cb005afe44a4b33cb16f825c33d6";
     };
-    buildInputs = with pkgs.pythonPackages; [ pycrypto pyasn1 twisted ];
+    buildInputs = with pkgs.pythonPackages; [ pycrypto pyasn1 twisted_11 ];
     installPhase = ''
         substituteInPlace ./kippo.tac --replace "kippo.cfg" "$out/src/kippo.cfg"
         substituteInPlace ./kippo.cfg --replace "log_path = log" "log_path = /var/log/kippo" \

From 058c768892e5b7687528f612040e6e850642de4b Mon Sep 17 00:00:00 2001
From: Edgar Aroutiounian <edgar.factorial@gmail.com>
Date: Tue, 16 Feb 2016 08:09:53 +0000
Subject: [PATCH 1673/2285] ios-cross-compile: init at 9.2

---
 lib/maintainers.nix                           |   1 +
 .../compilers/ios-cross-compile/9.2.nix       |  64 ++++++
 .../ios-cross-compile/9.2_builder.sh          | 153 +++++++++++++
 .../compilers/ios-cross-compile/alt_wrapper.c | 212 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 5 files changed, 432 insertions(+)
 create mode 100644 pkgs/development/compilers/ios-cross-compile/9.2.nix
 create mode 100644 pkgs/development/compilers/ios-cross-compile/9.2_builder.sh
 create mode 100644 pkgs/development/compilers/ios-cross-compile/alt_wrapper.c

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 7426e18a61b9..c3ee7f08d5cd 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -122,6 +122,7 @@
   ftrvxmtrx = "Siarhei Zirukin <ftrvxmtrx@gmail.com>";
   funfunctor = "Edward O'Callaghan <eocallaghan@alterapraxis.com>";
   fuuzetsu = "Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>";
+  fxfactorial = "Edgar Aroutiounian <edgar.factorial@gmail.com>";
   gal_bolle = "Florent Becker <florent.becker@ens-lyon.org>";
   garbas = "Rok Garbas <rok@garbas.si>";
   garrison = "Jim Garrison <jim@garrison.cc>";
diff --git a/pkgs/development/compilers/ios-cross-compile/9.2.nix b/pkgs/development/compilers/ios-cross-compile/9.2.nix
new file mode 100644
index 000000000000..5ec24e01617a
--- /dev/null
+++ b/pkgs/development/compilers/ios-cross-compile/9.2.nix
@@ -0,0 +1,64 @@
+{ stdenv, git, clang,
+  fetchFromGitHub, requireFile,
+  openssl, xz, gnutar, gcc,
+  automake, autoconf, libtool, clangStdenv } :
+
+clangStdenv.mkDerivation rec {
+  name = "ios-cross-compile-${version}";
+  version = "9.2";
+  sdk = "iPhoneOS9.2.sdk";
+  cctools_port = fetchFromGitHub {
+    owner = "tpoechtrager";
+    repo = "cctools-port";
+    rev = "7d405492b09fa27546caaa989b8493829365deab";
+    sha256 = "0nj1q5bqdx5jm68dispybxc7wnkb6p8p2igpnap9q6qyv2r9p07w";
+  };
+  ldid = fetchFromGitHub {
+    owner = "tpoechtrager";
+    repo = "ldid";
+    rev = "3064ed628108da4b9a52cfbe5d4c1a5817811400";
+    sha256 = "1a6zaz8fgbi239l5zqx9xi3hsrv3jmfh8dkiy5gmnjs6v4gcf6sf";
+  };
+  src = requireFile rec {
+    name = "iPhoneOS9.2.sdk.tar.xz";
+    sha256 = "1l2h3cic9psrq3nmfv9aaxkdk8y2pvr0iq6apj87mb3ms9a4cqrq";
+    message = ''
+      You need to do the following steps to get a prepared
+      ios tarball.
+
+      1) Download an XCode dmg, specifically XCode_7.2.dmg
+      2) Install darling-dmg, available via: nix-env -i darling-dmg
+      3) Follow this shell history:
+
+      $ cd ~/
+      $ mkdir xcode
+      $ darling-dmg Xcode_7.2dmg xcode
+      $ cd xcode/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs
+      $ mktemp -d
+        /tmp/gar/tmp.4ZZ8kqyfqp/
+      $ mkdir /tmp/gar/tmp.4ZZ8kqyfqp/iPhoneOS9.2.sdk
+      $ cp -r iPhoneOS.sdk/* /tmp/gar/tmp.4ZZ8kqyfqp/iPhoneOS9.2.sdk
+      $ cp -r ../../../../Toolchains/XcodeDefault.xctoolchain/usr/include/c++/* \
+        /tmp/gar/tmp.4ZZ8kqyfqp/iPhoneOS9.2.sdk/usr/include/c++
+      $ tar -cf - * | xz -9 -c - > iPhoneOS9.2.sdk.tar.xz
+      $ cd ~/
+      $ fusermount -u xcode
+
+      Then do:
+
+      nix-prefetch-url file:///path/to/${name}
+
+      and run this installation again.
+   '';
+  };
+  buildInputs = [ git xz gnutar openssl automake autoconf libtool clang ];
+  alt_wrapper = ./alt_wrapper.c;
+  builder = ./9.2_builder.sh;
+  meta = {
+    description =
+    "Provides an iOS cross compiler from 7.1 up to iOS-${version} and ldid";
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ fxfactorial ];
+    license = stdenv.lib.licenses.gpl2;
+  };
+}
diff --git a/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh b/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh
new file mode 100644
index 000000000000..4604b1fdea72
--- /dev/null
+++ b/pkgs/development/compilers/ios-cross-compile/9.2_builder.sh
@@ -0,0 +1,153 @@
+# -*- shell-script -*-
+source $stdenv/setup
+
+function extract
+{
+    printf "extracting $(basename $1) ...\n"
+    local tarflags="xf"
+
+    case "$1" in
+        *.tar.xz)
+	    xz -dc $1 | tar "$tarflags" - ;;
+	*)
+	    printf "Make sure you give a iPhoneOS9.2.sdk.tar.xz file \n" ;;
+    esac
+}
+
+function verify_arch {
+    case "$1" in
+	# Our good arches.
+	armv7|arm64) ;;
+	*)
+	    local
+	    acc="armv7 | arm64"
+	    error_message=$(
+		printf '%s is not an acceptable arch. Try one of %s' "$1" "$acc"
+			 )
+	    printf "$error_message\n"
+	    exit
+    esac
+}
+
+function verify_sdk_version {
+    sdk_version=$(basename "$1" | grep -P -o "[0-9].[0-9]+")
+    case "$sdk_version" in
+	# Make sure the SDK is correct.
+	[5-9].[0-9]) ;;
+	*)
+	    printf 'No iPhone SDK version in file name\n'
+    esac
+}
+
+function do_build {
+
+    if [ $# -lt 2 ]; then
+	printf "usage: $0 iPhoneOS.sdk.tar* <target cpu>\n" 1>&2
+	printf "i.e. $0 /path/to/iPhoneOS.sdk.tar.xz armv7\n" 1>&2
+	exit 1
+    fi
+
+    mkdir -p $out
+
+    chmod -R 755 "$cctools_port"
+
+    pushd "$cctools_port"/usage_examples/ios_toolchain &> /dev/null
+
+    export LC_ALL=C
+    
+    local
+    triple='%s-apple-darwin11'
+    target_dir="$PWD/target"
+    sdk_dir="$target_dir/SDK"
+    platform="$(uname -s)"
+    # Will be mutated by verify_sdk_version
+    sdk_version=
+
+    mkdir -p "$target_dir"
+    mkdir -p "$target_dir/bin"
+    mkdir -p "$sdk_dir"
+
+    verify_arch "$2"
+    verify_sdk_version "$1"
+
+    triple="$(printf "$triple" "$2")"
+    pushd "$sdk_dir" &>/dev/null
+    extract "$1"
+
+    local sys_lib=$(
+    	find $sdk_dir -name libSystem.dylib -o -name libSystem.tbd | head -n1
+    	  )
+
+    if [ -z "$sys_lib" ]; then
+    	printf "SDK should contain libSystem{.dylib,.tbd}\n" 1>&2
+    	exit 1
+    fi
+
+    local sys_root=$(readlink -f "$(dirname $sys_lib)/../..")
+
+    local sdk_unboxed=$(basename $sys_root)
+
+    mv -f "$sys_root"/* "$sdk_dir" || true
+
+    popd &>/dev/null
+
+    printf "\nbuilding wrapper\n"
+
+    printf "int main(){return 0;}" | clang -xc -O2 -o "$target_dir"/bin/dsymutil -
+
+    clang -O2 -std=c99 $alt_wrapper \
+    	  -DTARGET_CPU=$(printf '"%s"' "$2") \
+    	  -DNIX_APPLE_HDRS=$(
+    	printf '"%s"' "-I$out/$sdk/usr/include"
+    	  ) \
+    	  -DNIX_APPLE_FRAMEWORKS=$(
+    	printf '"%s"' "$out/$sdk/System/Library/Frameworks"
+    	  ) \
+    	  -DNIX_APPLE_PRIV_FRAMEWORKS=$(
+    	printf '"%s"' "$out/$sdk/System/Library/PrivateFrameworks"
+    	  ) \
+    	  -DOS_VER_MIN=$(printf '"%s"' "7.1") \
+    	  -o "$target_dir/bin/$triple-clang"
+
+    pushd "$target_dir"/bin &>/dev/null
+
+    cp "$triple"-clang "$triple"-clang++
+
+    popd &>/dev/null
+
+    printf "\nbuilding ldid\n"
+
+    mkdir -p tmp
+    pushd tmp &>/dev/null
+    pushd "$ldid" &>/dev/null
+
+    chmod -R 755 "$ldid"
+
+    make INSTALLPREFIX="$target_dir" -j4 install
+    popd &>/dev/null
+    popd &>/dev/null
+
+    printf "\nbuilding cctools / ld64\n"
+
+    pushd ../../cctools &>/dev/null
+    git clean -fdx . &>/dev/null || true
+    ./autogen.sh
+    ./configure --target="$triple" --prefix="$target_dir"
+    make -j4
+    make install &>/dev/null
+
+    popd &>/dev/null
+
+    local me=`whoami`
+
+    for d in bin libexec SDK; do
+    	chown -R $me:$me target/$d
+    	cp -R target/$d $out
+    done
+
+    # Crucial piece
+    rm -rf $out/$sdk
+    mv $out/SDK $out/$sdk
+}
+
+do_build $src armv7
diff --git a/pkgs/development/compilers/ios-cross-compile/alt_wrapper.c b/pkgs/development/compilers/ios-cross-compile/alt_wrapper.c
new file mode 100644
index 000000000000..928b64e6fd9d
--- /dev/null
+++ b/pkgs/development/compilers/ios-cross-compile/alt_wrapper.c
@@ -0,0 +1,212 @@
+/*
+  This and the shell builder was originally written by
+  https://github.com/tpoechtrager but I had to modify both so that
+  they played nicely and were reproducible with nixpkgs. Much thanks
+  to MixRank for letting me work on this.
+  Edgar Aroutiounian <edgar.factorial@gmail.com>
+ */
+
+#ifndef TARGET_CPU
+#define TARGET_CPU "armv7"
+#endif
+
+#ifndef OS_VER_MIN
+#define OS_VER_MIN "4.2"
+#endif
+
+#ifndef NIX_APPLE_HDRS
+#define NIX_APPLE_HDRS ""
+#endif
+
+#ifndef NIX_APPLE_FRAMEWORKS
+#define NIX_APPLE_FRAMEWORKS ""
+#endif
+
+#ifndef NIX_APPLE_PRIV_FRAMEWORKS
+#define NIX_APPLE_PRIV_FRAMEWORKS ""
+#endif
+
+#define _GNU_SOURCE
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <limits.h>
+
+#ifdef __APPLE__
+#include <mach-o/dyld.h>
+#endif
+
+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__DragonFly__)
+#include <sys/sysctl.h>
+#endif
+
+#ifdef __OpenBSD__
+#include <sys/types.h>
+#include <sys/user.h>
+#include <sys/stat.h>
+#endif
+
+char *get_executable_path(char *epath, size_t buflen)
+{
+  char *p;
+#ifdef __APPLE__
+  unsigned int l = buflen;
+  if (_NSGetExecutablePath(epath, &l) != 0) return NULL;
+#elif defined(__FreeBSD__) || defined(__DragonFly__)
+  int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PATHNAME, -1 };
+  size_t l = buflen;
+  if (sysctl(mib, 4, epath, &l, NULL, 0) != 0) return NULL;
+#elif defined(__OpenBSD__)
+  int mib[4];
+  char **argv;
+  size_t len;
+  size_t l;
+  const char *comm;
+  int ok = 0;
+  mib[0] = CTL_KERN;
+  mib[1] = KERN_PROC_ARGS;
+  mib[2] = getpid();
+  mib[3] = KERN_PROC_ARGV;
+  if (sysctl(mib, 4, NULL, &len, NULL, 0) < 0)
+    abort();
+  if (!(argv = malloc(len)))
+    abort();
+  if (sysctl(mib, 4, argv, &len, NULL, 0) < 0)
+    abort();
+  comm = argv[0];
+  if (*comm == '/' || *comm == '.') {
+    char *rpath;
+    if ((rpath = realpath(comm, NULL))) {
+      strlcpy(epath, rpath, buflen);
+      free(rpath);
+      ok = 1;
+    }
+  } else {
+    char *sp;
+    char *xpath = strdup(getenv("PATH"));
+    char *path = strtok_r(xpath, ":", &sp);
+    struct stat st;
+    if (!xpath)
+      abort();
+    while (path) {
+      snprintf(epath, buflen, "%s/%s", path, comm);
+      if (!stat(epath, &st) && (st.st_mode & S_IXUSR)) {
+	ok = 1;
+	break;
+      }
+      path = strtok_r(NULL, ":", &sp);
+    }
+    free(xpath);
+  }
+  free(argv);
+  if (!ok) return NULL;
+  l = strlen(epath);
+#else
+  ssize_t l = readlink("/proc/self/exe", epath, buflen);
+#endif
+  if (l <= 0) return NULL;
+  epath[buflen - 1] = '\0';
+  p = strrchr(epath, '/');
+  if (p) *p = '\0';
+  return epath;
+}
+
+char *get_filename(char *str)
+{
+  char *p = strrchr(str, '/');
+  return p ? &p[1] : str;
+}
+
+void target_info(char *argv[], char **triple, char **compiler)
+{
+  char *p = get_filename(argv[0]);
+  char *x = strrchr(p, '-');
+  if (!x) abort();
+  *compiler = &x[1];
+  *x = '\0';
+  *triple = p;
+}
+
+void env(char **p, const char *name, char *fallback)
+{
+  char *ev = getenv(name);
+  if (ev) { *p = ev; return; }
+  *p = fallback;
+}
+
+int main(int argc, char *argv[])
+{
+  char **args = alloca(sizeof(char*) * (argc + 17));
+  int i, j;
+
+  char execpath[PATH_MAX+1];
+  char sdkpath[PATH_MAX+1];
+  char codesign_allocate[64];
+  char osvermin[64];
+
+  char *compiler, *target, *sdk, *cpu, *osmin;
+
+  target_info(argv, &target, &compiler);
+
+  if (!get_executable_path(execpath, sizeof(execpath))) abort();
+  snprintf(sdkpath, sizeof(sdkpath), "%s/../SDK", execpath);
+
+  snprintf(codesign_allocate, sizeof(codesign_allocate),
+	   "%s-codesign_allocate", target);
+
+  setenv("CODESIGN_ALLOCATE", codesign_allocate, 1);
+  setenv("IOS_FAKE_CODE_SIGN", "1", 1);
+
+  env(&sdk, "IOS_SDK_SYSROOT", sdkpath);
+  env(&cpu, "IOS_TARGET_CPU", TARGET_CPU);
+
+  env(&osmin, "IPHONEOS_DEPLOYMENT_TARGET", OS_VER_MIN);
+  unsetenv("IPHONEOS_DEPLOYMENT_TARGET");
+
+  snprintf(osvermin, sizeof(osvermin), "-miphoneos-version-min=%s", osmin);
+
+  for (i = 1; i < argc; ++i) {
+    if (!strcmp(argv[i], "-arch")) {
+      cpu = NULL;
+      break;
+    }
+  }
+
+  i = 0;
+
+  args[i++] = compiler;
+  args[i++] = "-target";
+  args[i++] = target;
+  args[i++] = "-isysroot";
+  args[i++] = sdk;
+  args[i++] = NIX_APPLE_HDRS;
+  args[i++] = "-F";
+  args[i++] = NIX_APPLE_FRAMEWORKS;
+  args[i++] = "-F";
+  args[i++] = NIX_APPLE_PRIV_FRAMEWORKS;
+
+  if (cpu) {
+    args[i++] = "-arch";
+    args[i++] = cpu;
+  }
+
+  args[i++] = osvermin;
+  args[i++] = "-mlinker-version=253.3";
+
+  for (j = 1; j < argc; ++i, ++j) args[i] = argv[j];
+
+  args[i] = NULL;
+
+  setenv("COMPILER_PATH", execpath, 1);
+  /* int k; */
+  /* for (k = 0; k < i; k++) */
+  /*   printf("Compiler option: %s\n", args[k]); */
+  /* printf("End of Compiler args\n"); */
+  execvp(compiler, args);
+
+  fprintf(stderr, "cannot invoke compiler, this is a serious bug\n");
+  return 1;
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a219658881a7..6c7b09ad147b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7048,6 +7048,8 @@ let
 
   intltool = callPackage ../development/tools/misc/intltool { };
 
+  ios-cross-compile = callPackage ../development/compilers/ios-cross-compile/9.2.nix {};
+
   ip2location-c = callPackage ../development/libraries/ip2location-c { };
 
   irrlicht = callPackage ../development/libraries/irrlicht { };

From 59a1dc4be22ccaec5a3c9d8d732cf89fe36dc96e Mon Sep 17 00:00:00 2001
From: "Bruno Bzeznik Bruno.Bzeznik@imag.fr" <Bruno.Bzeznik@imag.fr>
Date: Mon, 22 Feb 2016 15:13:34 +0100
Subject: [PATCH 1674/2285] libdap: init at 3.15.1

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

diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix
new file mode 100644
index 000000000000..adb57f1ee778
--- /dev/null
+++ b/pkgs/development/libraries/libdap/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl, bison, libuuid, curl, libxml2, flex }:
+
+stdenv.mkDerivation rec {
+  version = "3.15.1";
+  name = "libdap";
+
+  buildInputs = [ bison libuuid curl libxml2 flex ];
+
+  src = fetchurl {
+    url = "http://www.opendap.org/pub/source/${name}-${version}.tar.gz";
+    sha256 = "6ee13cc69ae0b5e7552ddfd17013ebb385859bba66f42a2cfba3b3be7aa4ef0f";
+  };
+
+  meta = { 
+    description = "A C++ SDK which contains an implementation of DAP";
+    homepage = http://www.opendap.org/download/libdap;
+    license = stdenv.lib.licenses.lgpl2;
+    maintainers = [ stdenv.lib.maintainers.bzizou ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 52376012402c..c985074d3be7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7308,6 +7308,8 @@ let
 
   libdaemon = callPackage ../development/libraries/libdaemon { };
 
+  libdap = callPackage ../development/libraries/libdap { };
+
   libdbi = callPackage ../development/libraries/libdbi { };
 
   libdbiDriversBase = callPackage ../development/libraries/libdbi-drivers {

From 53b9ac0d13a2147a852e0019598dc8fcbb55fa1b Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Mon, 22 Feb 2016 23:22:27 +0100
Subject: [PATCH 1675/2285] wine-unstable: 1.9.3 -> 1.9.4

winetricks: 20160109 -> 20160219
gecko: 2.40 -> 2.44
---
 pkgs/misc/emulators/wine/sources.nix | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/misc/emulators/wine/sources.nix b/pkgs/misc/emulators/wine/sources.nix
index b44693502d73..cd877403d3a0 100644
--- a/pkgs/misc/emulators/wine/sources.nix
+++ b/pkgs/misc/emulators/wine/sources.nix
@@ -30,23 +30,33 @@ in rec {
   };
 
   unstable = fetchurl rec {
-    version = "1.9.3";
+    version = "1.9.4";
     url = "mirror://sourceforge/wine/wine-${version}.tar.bz2";
-    sha256 = "0389xbs943iwdgv3a6pvcy2gxrwqzf20vrsbpd2yrj1lan2m8ps7";
-    inherit (stable) gecko32 gecko64 mono;
+    sha256 = "1f5v1gns0xs512a6ym785cn29j8dxdbnxnvkg8v0p1w0p6vfmhbm";
+    inherit (stable) mono;
+    gecko32 = fetchurl rec {
+      version = "2.44";
+      url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86.msi";
+      sha256 = "0fbd8pxkihhfxs5mcx8n0rcygdx43qdrp2x8hq1s1cvifp8lm9kp";
+    };
+    gecko64 = fetchurl rec {
+      version = "2.44";
+      url = "http://dl.winehq.org/wine/wine-gecko/${version}/wine_gecko-${version}-x86_64.msi";
+      sha256 = "0qb6zx4ycj37q26y2zn73w49bxifdvh9n4riy39cn1kl7c6mm3k2";
+    };
   };
 
   staging = fetchFromGitHub rec {
     inherit (unstable) version;
-    sha256 = "0r932caxlkdw36f36f8y4h2r3anpl61fmqr9payb83fj55gsiq4d";
+    sha256 = "0xjxbip0ab1lqgxrww08082ndsb8b5wjfwlf51zlr3f59c9bx9y5";
     owner = "wine-compholio";
     repo = "wine-staging";
     rev = "v${version}";
   };
 
   winetricks = fetchFromGitHub rec {
-    version = "20160109";
-    sha256 = "0pnl5362g5q7py368vj07swbdp1fqbpvpq4jv4l5ddyclps8ajg8";
+    version = "20160219";
+    sha256 = "1wqsbdh2qa5xxswilniki9wzbhlmkl6jqmryjd9f5smirr7ryy2r";
     owner = "Winetricks";
     repo = "winetricks";
     rev = version;

From 05d4959251f48ab37a6cc94e99d413efafe60d2a Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 20 Feb 2016 21:06:13 +0000
Subject: [PATCH 1676/2285] gettext: expand all gettext.sh paths

---
 pkgs/development/libraries/gettext/absolute-paths.diff | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gettext/absolute-paths.diff b/pkgs/development/libraries/gettext/absolute-paths.diff
index 6d5cf1c1ba24..af37f61a9a41 100644
--- a/pkgs/development/libraries/gettext/absolute-paths.diff
+++ b/pkgs/development/libraries/gettext/absolute-paths.diff
@@ -7,7 +7,7 @@ index 1dfa3bb..d6ef8a8 100644
  # result.
  eval_gettext () {
 -  gettext "$1" | (export PATH `envsubst --variables "$1"`; envsubst "$1")
-+  @out@/bin/gettext "$1" | (export PATH `envsubst --variables "$1"`; envsubst "$1")
++  @out@/bin/gettext "$1" | (export PATH `@out@/bin/envsubst --variables "$1"`; @out@/bin/envsubst "$1")
  }
  
  # eval_ngettext MSGID MSGID-PLURAL COUNT
@@ -15,7 +15,7 @@ index 1dfa3bb..d6ef8a8 100644
  # shell variables in the result.
  eval_ngettext () {
 -  ngettext "$1" "$2" "$3" | (export PATH `envsubst --variables "$1 $2"`; envsubst "$1 $2")
-+  @out@/bin/ngettext "$1" "$2" "$3" | (export PATH `envsubst --variables "$1 $2"`; envsubst "$1 $2")
++  @out@/bin/ngettext "$1" "$2" "$3" | (export PATH `@out@/bin/envsubst --variables "$1 $2"`; @out@/bin/envsubst "$1 $2")
  }
  
  # Note: This use of envsubst is much safer than using the shell built-in 'eval'

From f05bc0444aac0fe5643254a07b15e7141b5e3146 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 21 Feb 2016 13:22:44 +0000
Subject: [PATCH 1677/2285] gettext: 0.19.6 -> 0.19.7

expat is replaced by a bundled version of libxml2
---
 .../development/libraries/gettext/default.nix | 35 ++++++++++---------
 pkgs/development/libraries/gettext/expat.nix  | 10 ------
 pkgs/top-level/all-packages.nix               | 11 ++----
 3 files changed, 20 insertions(+), 36 deletions(-)
 delete mode 100644 pkgs/development/libraries/gettext/expat.nix

diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix
index 1443626124e1..c96d241ee903 100644
--- a/pkgs/development/libraries/gettext/default.nix
+++ b/pkgs/development/libraries/gettext/default.nix
@@ -1,11 +1,12 @@
-{ stdenv, fetchurl, libiconv, xz }:
+{ stdenv, lib, fetchurl, libiconv, xz }:
 
-stdenv.mkDerivation (rec {
-  name = "gettext-0.19.6";
+stdenv.mkDerivation rec {
+  name = "gettext-${version}";
+  version = "0.19.7";
 
   src = fetchurl {
     url = "mirror://gnu/gettext/${name}.tar.gz";
-    sha256 = "0pb9vp4ifymvdmc31ks3xxcnfqgzj8shll39czmk8c1splclqjzd";
+    sha256 = "0gy2b2aydj8r0sapadnjw8cmb8j2rynj28d5qs1mfa800njd51jk";
   };
   patches = [ ./absolute-paths.diff ];
 
@@ -14,20 +15,20 @@ stdenv.mkDerivation (rec {
   LDFLAGS = if stdenv.isSunOS then "-lm -lmd -lmp -luutil -lnvpair -lnsl -lidmap -lavl -lsec" else "";
 
   configureFlags = [ "--disable-csharp" "--with-xz" ]
-     ++ (stdenv.lib.optionals stdenv.isCygwin
-          [ "--disable-java"
+     ++ lib.optionals stdenv.isCygwin [
+            "--disable-java"
             "--disable-native-java"
             # Share the cache among the various `configure' runs.
             "--config-cache"
             "--with-included-gettext"
             "--with-included-glib"
             "--with-included-libcroco"
-          ])
+        ]
      # avoid retaining reference to CF during stdenv bootstrap
-     ++ (stdenv.lib.optionals stdenv.isDarwin [
-        "gt_cv_func_CFPreferencesCopyAppValue=no"
-        "gt_cv_func_CFLocaleCopyCurrent=no"
-      ]);
+     ++ lib.optionals stdenv.isDarwin [
+            "gt_cv_func_CFPreferencesCopyAppValue=no"
+            "gt_cv_func_CFLocaleCopyCurrent=no"
+        ];
 
   postPatch = ''
    substituteAllInPlace gettext-runtime/src/gettext.sh.in
@@ -45,16 +46,16 @@ stdenv.mkDerivation (rec {
       echo gl_cv_func_wcwidth_works=yes > cachefile
       configureFlags="$configureFlags --cache-file=`pwd`/cachefile"
     fi
-  '' + stdenv.lib.optionalString stdenv.isCygwin ''
+  '' + lib.optionalString stdenv.isCygwin ''
     sed -i -e "s/\(am_libgettextlib_la_OBJECTS = \)error.lo/\\1/" gettext-tools/gnulib-lib/Makefile.in
   '';
 
-  buildInputs = [ xz ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
+  buildInputs = [ xz ] ++ lib.optional (!stdenv.isLinux) libiconv;
 
   enableParallelBuilding = true;
 
   crossAttrs = {
-    buildInputs = stdenv.lib.optional (stdenv ? ccCross && stdenv.ccCross.libc ? libiconv)
+    buildInputs = lib.optional (stdenv ? ccCross && stdenv.ccCross.libc ? libiconv)
       stdenv.ccCross.libc.libiconv.crossDrv;
     # Gettext fails to guess the cross compiler
     configureFlags = "CXX=${stdenv.cross.config}-g++";
@@ -84,8 +85,8 @@ stdenv.mkDerivation (rec {
 
     homepage = http://www.gnu.org/software/gettext/;
 
-    maintainers = [ ];
-    platforms = stdenv.lib.platforms.all;
+    maintainers = with lib.maintainers; [ zimbatm ];
+    platforms = lib.platforms.all;
   };
 }
 
@@ -102,4 +103,4 @@ stdenv.mkDerivation (rec {
    sed -i gettext-tools/gnulib-lib/Makefile.in \
           -e 's/am_libgettextlib_la_OBJECTS =/am_libgettextlib_la_OBJECTS = error.lo/g'
    '';
-})
+}
diff --git a/pkgs/development/libraries/gettext/expat.nix b/pkgs/development/libraries/gettext/expat.nix
deleted file mode 100644
index fc6116b39160..000000000000
--- a/pkgs/development/libraries/gettext/expat.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ runCommand, gettext, expat, makeWrapper }:
-
-runCommand "gettext-expat-${gettext.name}" { buildInputs = [ makeWrapper ]; } ''
-  mkdir $out
-  cp -rf ${gettext}/* $out/
-  chmod a+w $out/bin
-  for p in $out/bin/*; do
-    wrapProgram $p --prefix LD_LIBRARY_PATH : ${expat}/lib
-  done
-''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 605d39b6ac9f..2b1c5a781b50 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6675,12 +6675,6 @@ let
 
   gettext = callPackage ../development/libraries/gettext { };
 
-  gettextWithExpat = if stdenv.isDarwin
-    then gettext.overrideDerivation (drv: {
-      configureFlags = drv.configureFlags ++ [ "--with-libexpat-prefix=${expat}" ];
-    })
-    else callPackage ../development/libraries/gettext/expat.nix { };
-
   gd = callPackage ../development/libraries/gd { };
 
   gdal = callPackage ../development/libraries/gdal { };
@@ -6913,9 +6907,7 @@ let
     cupsSupport = config.gtk2.cups or stdenv.isLinux;
   };
 
-  gtk3 = callPackage ../development/libraries/gtk+/3.x.nix {
-    gettext = gettextWithExpat;
-  };
+  gtk3 = callPackage ../development/libraries/gtk+/3.x.nix { };
 
   gtk = pkgs.gtk2;
 
@@ -16065,6 +16057,7 @@ aliases = with self; rec {
   firefox-wrapper = firefox;          # 2016-01
   firefox-esr-wrapper = firefox-esr;  # 2016-01
   fuse_exfat = exfat;                   # 2015-09-11
+  gettextWithExpat = gettext; # 2016-02-19
   grantlee5 = qt5.grantlee;  # added 2015-12-19
   gupnptools = gupnp-tools;  # added 2015-12-19
   htmlTidy = html-tidy;  # added 2014-12-06

From 82ac1d952e8f650b44f83c5a8adcc9b46abbd567 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 23 Feb 2016 00:36:43 +0100
Subject: [PATCH 1678/2285] Revert "gajim: Add python-axolotl for OMEMO plugin"

This reverts commit c3c5622817ea593804272b5110c27c8456d53a62.
---
 .../applications/networking/instant-messengers/gajim/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix
index b1dfee8fa902..fa61876bf161 100644
--- a/pkgs/applications/networking/instant-messengers/gajim/default.nix
+++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix
@@ -59,7 +59,6 @@ stdenv.mkDerivation rec {
     pythonPackages.pyxdg
     pythonPackages.nbxmpp
     pythonPackages.pyopenssl pythonDBus
-    pythonPackages.python-axolotl
   ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ]
     ++ optional enableE2E pythonPackages.pycrypto
     ++ optional enableRST pythonPackages.docutils

From 960b11e7e8d9085054711d2a51a27b6beaab1cce Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <bstaffin@fitbit.com>
Date: Mon, 22 Feb 2016 18:20:02 -0800
Subject: [PATCH 1679/2285] jsonnet: 0.8.5 -> 0.8.6

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

diff --git a/pkgs/development/compilers/jsonnet/default.nix b/pkgs/development/compilers/jsonnet/default.nix
index a91b038ef2d4..73bdccb24f70 100644
--- a/pkgs/development/compilers/jsonnet/default.nix
+++ b/pkgs/development/compilers/jsonnet/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, emscripten }:
 
-let version = "0.8.5"; in
+let version = "0.8.6"; in
 
 stdenv.mkDerivation {
   name = "jsonnet-${version}";
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
     rev = "v${version}";
     owner = "google";
     repo = "jsonnet";
-    sha256 = "14raml69zfr38r4qghdgy129vdq2vq1ivl3a2y02isfpijxcajxn";
+    sha256 = "1dkvm81gi1j02zs00mqshn9i71bcnqbxsm5hh3wwa2y0sffvgkwh";
   };
 
   buildInputs = [ emscripten ];

From f0061cb03997efbc84da787fd5d0b488c9d2a53a Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Mon, 22 Feb 2016 20:21:11 -0800
Subject: [PATCH 1680/2285] plexpass: 0.9.15.4.1679 -> 0.9.15.5.1712

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

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 29a1b2d47da1..aa27f6dd5324 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -5,9 +5,9 @@
 
 let
   plexpkg = if enablePlexPass then {
-    version = "0.9.15.4.1679";
-    vsnHash = "e4df231";
-    sha256 = "1l6kw5dkqam1fyihp02p4slxq3yy232dqp0m5dcg1vi146s911dh";
+    version = "0.9.15.5.1712";
+    vsnHash = "ba5070a";
+    sha256 = "0nwcjlfbs8dacp6wzmga75hkx16ngyaqrmdhcx8vqvgwm8l31rxs";
   } else {
     version = "0.9.15.3.1674";
     vsnHash = "f46e7e6";

From 142f65e07a7f3c8d37eb150443140213d80a7046 Mon Sep 17 00:00:00 2001
From: Roger Qiu <roger.qiu@polycademy.com>
Date: Mon, 22 Feb 2016 16:42:24 +1100
Subject: [PATCH 1681/2285] nixos/stage-1: Added boot.initrd.logCommands

---
 nixos/modules/system/boot/stage-1-init.sh | 26 +++++++++++++++++++++++
 nixos/modules/system/boot/stage-1.nix     | 12 +++++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 95df0ace1ca4..94cecdf1fd79 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -71,6 +71,24 @@ mount -t devtmpfs -o "size=@devSize@" devtmpfs /dev
 mkdir -p /run
 mount -t tmpfs -o "mode=0755,size=@runSize@" tmpfs /run
 
+# Optionally log the script output to /dev/kmsg or /run/log/stage-1-init.log 
+if test -n "@logCommands@"; then
+    mkdir -p /tmp
+    mkfifo /tmp/stage-1-init.log.fifo
+    logOutFd=8 && logErrFd=9
+    eval "exec $logOutFd>&1 $logErrFd>&2"
+    if test -w /dev/kmsg; then
+        tee -i < /tmp/stage-1-init.log.fifo /proc/self/fd/"$logOutFd" | while read line; do
+            if test -n "$line"; then
+                echo "stage-1-init: $line" > /dev/kmsg
+            fi
+        done &
+    else
+        mkdir -p /run/log
+        tee -i < /tmp/stage-1-init.log.fifo /run/log/stage-1-init.log &
+    fi
+    exec > /tmp/stage-1-init.log.fifo 2>&1
+fi
 
 # Process the kernel command line.
 export stage2Init=/init
@@ -415,6 +433,14 @@ fi
 # Stop udevd.
 udevadm control --exit
 
+# Reset the logging file descriptors.
+# Do this just before pkill, which will kill the tee process.
+if test -n "@logCommands@"
+then
+    exec 1>&$logOutFd 2>&$logErrFd
+    eval "exec $logOutFd>&- $logErrFd>&-"
+fi
+
 # Kill any remaining processes, just to be sure we're not taking any
 # with us into stage 2. But keep storage daemons like unionfs-fuse.
 pkill -9 -v -f '@'
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index f31620df1d85..45652b355c80 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -200,8 +200,8 @@ let
 
     inherit (config.boot) resumeDevice devSize runSize;
 
-    inherit (config.boot.initrd) checkJournalingFS
-      preLVMCommands preDeviceCommands postDeviceCommands postMountCommands kernelModules;
+    inherit (config.boot.initrd) checkJournalingFS 
+      logCommands preLVMCommands preDeviceCommands postDeviceCommands postMountCommands kernelModules;
 
     resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}")
                     (filter (sd: (sd ? label || hasPrefix "/dev/" sd.device) && !sd.randomEncryption) config.swapDevices);
@@ -269,6 +269,14 @@ in
       '';
     };
 
+    boot.initrd.logCommands = mkOption {
+      default = false;
+      type = types.bool;
+      description = ''
+        Whether to replicate command output of stage-1 booting to <filename>/dev/kmsg</filename> or <filename>/run/log/stage-1-init.log</filename> if <filename>/dev/kmsg</filename> is not writable.
+      '';
+    };
+
     boot.initrd.prepend = mkOption {
       default = [ ];
       type = types.listOf types.str;

From 474d5a7bd00e4d3cf3e15e4f0c80a5f46b96cbde Mon Sep 17 00:00:00 2001
From: Roger Qiu <roger.qiu@polycademy.com>
Date: Mon, 22 Feb 2016 16:42:51 +1100
Subject: [PATCH 1682/2285] nixos/stage-2: Added boot.logCommands

---
 nixos/modules/system/boot/stage-2-init.sh | 24 +++++++++++++++++++++++
 nixos/modules/system/boot/stage-2.nix     | 10 +++++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index a73070ab332f..17b24e1678be 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -155,6 +155,23 @@ mkdir -m 0755 -p /var/setuid-wrappers
 mount -t tmpfs -o "mode=0755" tmpfs /var/setuid-wrappers
 
 
+# Optionally log the script output to /dev/kmsg or /run/log/stage-2-init.log.
+# Only at this point are all the necessary prerequisites ready for these commands.
+if test -n "@logCommands@"; then
+    exec {logOutFd}>&1 {logErrFd}>&2
+    if test -w /dev/kmsg; then
+        exec > >(tee -i /proc/self/fd/"$logOutFd" | while read line; do
+            if test -n "$line"; then
+                echo "stage-2-init: $line" > /dev/kmsg
+            fi
+        done) 2>&1
+    else
+        mkdir -p /run/log
+        exec > >(tee -i /run/log/stage-2-init.log) 2>&1
+    fi
+fi
+
+
 # Run the script that performs all configuration activation that does
 # not have to be done at boot time.
 echo "running activation script..."
@@ -182,6 +199,13 @@ ln -sfn /run/booted-system /nix/var/nix/gcroots/booted-system
 @shell@ @postBootCommands@
 
 
+# Reset the logging file descriptors
+if test -n "@logCommands@"; then
+    exec 1>&$logOutFd 2>&$logErrFd
+    exec {logOutFd}>&- {logErrFd}>&-
+fi 
+
+
 # Start systemd.
 echo "starting systemd..."
 PATH=/run/current-system/systemd/lib/systemd \
diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix
index c0ef4e02d1ff..32281e63af24 100644
--- a/nixos/modules/system/boot/stage-2.nix
+++ b/nixos/modules/system/boot/stage-2.nix
@@ -17,7 +17,7 @@ let
     src = ./stage-2-init.sh;
     shellDebug = "${pkgs.bashInteractive}/bin/bash";
     isExecutable = true;
-    inherit (config.boot) devShmSize runSize;
+    inherit (config.boot) logCommands devShmSize runSize;
     inherit (config.nix) readOnlyStore;
     inherit (config.networking) useHostResolvConf;
     ttyGid = config.ids.gids.tty;
@@ -40,6 +40,14 @@ in
 
     boot = {
 
+      logCommands = mkOption {
+        default = false;
+        type = types.bool;
+        description = ''
+          Whether to replicate command output of stage-1 booting to <filename>/dev/kmsg</filename> or <filename>/run/log/stage-2-init.log</filename> if <filename>/dev/kmsg</filename> is not writable.
+        '';
+      };
+
       postBootCommands = mkOption {
         default = "";
         example = "rm -f /var/log/messages";

From 806b27a2977e9b87af9aa5e8d23a9415fb1095d3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Feb 2016 11:51:19 +0100
Subject: [PATCH 1683/2285] qemu-guest.nix: Disable rngd

This gets rid of a zillion "rngd[N]: read error" messages during boot.
---
 nixos/modules/profiles/qemu-guest.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/profiles/qemu-guest.nix b/nixos/modules/profiles/qemu-guest.nix
index 759fdb7f8e5f..987eb051b98c 100644
--- a/nixos/modules/profiles/qemu-guest.nix
+++ b/nixos/modules/profiles/qemu-guest.nix
@@ -14,4 +14,6 @@
       # to the *boot time* of the host).
       hwclock -s
     '';
+
+  security.rngd.enable = false;
 }

From 6f6e2c430fbe51ccb6b803134236af0d9aa85e55 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Feb 2016 11:53:08 +0100
Subject: [PATCH 1684/2285] test-instrumentation.nix: Only clear $PAGER in the
 backdoor shell

---
 nixos/modules/testing/test-instrumentation.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix
index c233beb63ca7..f0f56b17f20f 100644
--- a/nixos/modules/testing/test-instrumentation.nix
+++ b/nixos/modules/testing/test-instrumentation.nix
@@ -20,7 +20,15 @@ let kernel = config.boot.kernelPackages.kernel; in
             export USER=root
             export HOME=/root
             export DISPLAY=:0.0
+
             source /etc/profile
+
+            # Don't use a pager when executing backdoor
+            # actions. Because we use a tty, commands like systemctl
+            # or nix-store get confused into thinking they're running
+            # interactively.
+            export PAGER=
+
             cd /tmp
             exec < /dev/hvc0 > /dev/hvc0
             while ! exec 2> /dev/ttyS0; do sleep 0.1; done
@@ -38,11 +46,6 @@ let kernel = config.boot.kernelPackages.kernel; in
     systemd.services."serial-getty@ttyS0".enable = false;
     systemd.services."serial-getty@hvc0".enable = false;
 
-    # Don't use a pager when executing backdoor actions. Because we
-    # use a tty, commands like systemctl or nix-store get confused
-    # into thinking they're running interactively.
-    environment.variables.PAGER = "";
-
     boot.initrd.preDeviceCommands =
       ''
         echo 600 > /proc/sys/kernel/hung_task_timeout_secs

From deae4eff7b837a51699a10e499c3dc7311fd3ef1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Feb 2016 11:53:37 +0100
Subject: [PATCH 1685/2285] Make stage-1/2 logging unconditional, and drop log
 level to "debug"

Using "debug" level prevents spamming the console with messages twice
(once directly and once via kmsg).
---
 nixos/modules/system/boot/stage-1-init.sh | 34 +++++++++++------------
 nixos/modules/system/boot/stage-1.nix     | 12 ++------
 nixos/modules/system/boot/stage-2-init.sh | 30 +++++++++-----------
 nixos/modules/system/boot/stage-2.nix     | 10 +------
 4 files changed, 33 insertions(+), 53 deletions(-)

diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 94cecdf1fd79..7a4c93e8a0fa 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -71,24 +71,24 @@ mount -t devtmpfs -o "size=@devSize@" devtmpfs /dev
 mkdir -p /run
 mount -t tmpfs -o "mode=0755,size=@runSize@" tmpfs /run
 
-# Optionally log the script output to /dev/kmsg or /run/log/stage-1-init.log 
-if test -n "@logCommands@"; then
-    mkdir -p /tmp
-    mkfifo /tmp/stage-1-init.log.fifo
-    logOutFd=8 && logErrFd=9
-    eval "exec $logOutFd>&1 $logErrFd>&2"
-    if test -w /dev/kmsg; then
-        tee -i < /tmp/stage-1-init.log.fifo /proc/self/fd/"$logOutFd" | while read line; do
-            if test -n "$line"; then
-                echo "stage-1-init: $line" > /dev/kmsg
-            fi
-        done &
-    else
-        mkdir -p /run/log
-        tee -i < /tmp/stage-1-init.log.fifo /run/log/stage-1-init.log &
-    fi
-    exec > /tmp/stage-1-init.log.fifo 2>&1
+
+# Optionally log the script output to /dev/kmsg or /run/log/stage-1-init.log.
+mkdir -p /tmp
+mkfifo /tmp/stage-1-init.log.fifo
+logOutFd=8 && logErrFd=9
+eval "exec $logOutFd>&1 $logErrFd>&2"
+if test -w /dev/kmsg; then
+    tee -i < /tmp/stage-1-init.log.fifo /proc/self/fd/"$logOutFd" | while read line; do
+        if test -n "$line"; then
+            echo "<7>stage-1-init: $line" > /dev/kmsg
+        fi
+    done &
+else
+    mkdir -p /run/log
+    tee -i < /tmp/stage-1-init.log.fifo /run/log/stage-1-init.log &
 fi
+exec > /tmp/stage-1-init.log.fifo 2>&1
+
 
 # Process the kernel command line.
 export stage2Init=/init
diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 45652b355c80..f31620df1d85 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -200,8 +200,8 @@ let
 
     inherit (config.boot) resumeDevice devSize runSize;
 
-    inherit (config.boot.initrd) checkJournalingFS 
-      logCommands preLVMCommands preDeviceCommands postDeviceCommands postMountCommands kernelModules;
+    inherit (config.boot.initrd) checkJournalingFS
+      preLVMCommands preDeviceCommands postDeviceCommands postMountCommands kernelModules;
 
     resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}")
                     (filter (sd: (sd ? label || hasPrefix "/dev/" sd.device) && !sd.randomEncryption) config.swapDevices);
@@ -269,14 +269,6 @@ in
       '';
     };
 
-    boot.initrd.logCommands = mkOption {
-      default = false;
-      type = types.bool;
-      description = ''
-        Whether to replicate command output of stage-1 booting to <filename>/dev/kmsg</filename> or <filename>/run/log/stage-1-init.log</filename> if <filename>/dev/kmsg</filename> is not writable.
-      '';
-    };
-
     boot.initrd.prepend = mkOption {
       default = [ ];
       type = types.listOf types.str;
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index 17b24e1678be..9b34d24bdbc5 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -157,18 +157,16 @@ mount -t tmpfs -o "mode=0755" tmpfs /var/setuid-wrappers
 
 # Optionally log the script output to /dev/kmsg or /run/log/stage-2-init.log.
 # Only at this point are all the necessary prerequisites ready for these commands.
-if test -n "@logCommands@"; then
-    exec {logOutFd}>&1 {logErrFd}>&2
-    if test -w /dev/kmsg; then
-        exec > >(tee -i /proc/self/fd/"$logOutFd" | while read line; do
-            if test -n "$line"; then
-                echo "stage-2-init: $line" > /dev/kmsg
-            fi
-        done) 2>&1
-    else
-        mkdir -p /run/log
-        exec > >(tee -i /run/log/stage-2-init.log) 2>&1
-    fi
+exec {logOutFd}>&1 {logErrFd}>&2
+if test -w /dev/kmsg; then
+    exec > >(tee -i /proc/self/fd/"$logOutFd" | while read line; do
+        if test -n "$line"; then
+            echo "<7>stage-2-init: $line" > /dev/kmsg
+        fi
+    done) 2>&1
+else
+    mkdir -p /run/log
+    exec > >(tee -i /run/log/stage-2-init.log) 2>&1
 fi
 
 
@@ -199,11 +197,9 @@ ln -sfn /run/booted-system /nix/var/nix/gcroots/booted-system
 @shell@ @postBootCommands@
 
 
-# Reset the logging file descriptors
-if test -n "@logCommands@"; then
-    exec 1>&$logOutFd 2>&$logErrFd
-    exec {logOutFd}>&- {logErrFd}>&-
-fi 
+# Reset the logging file descriptors.
+exec 1>&$logOutFd 2>&$logErrFd
+exec {logOutFd}>&- {logErrFd}>&-
 
 
 # Start systemd.
diff --git a/nixos/modules/system/boot/stage-2.nix b/nixos/modules/system/boot/stage-2.nix
index 32281e63af24..c0ef4e02d1ff 100644
--- a/nixos/modules/system/boot/stage-2.nix
+++ b/nixos/modules/system/boot/stage-2.nix
@@ -17,7 +17,7 @@ let
     src = ./stage-2-init.sh;
     shellDebug = "${pkgs.bashInteractive}/bin/bash";
     isExecutable = true;
-    inherit (config.boot) logCommands devShmSize runSize;
+    inherit (config.boot) devShmSize runSize;
     inherit (config.nix) readOnlyStore;
     inherit (config.networking) useHostResolvConf;
     ttyGid = config.ids.gids.tty;
@@ -40,14 +40,6 @@ in
 
     boot = {
 
-      logCommands = mkOption {
-        default = false;
-        type = types.bool;
-        description = ''
-          Whether to replicate command output of stage-1 booting to <filename>/dev/kmsg</filename> or <filename>/run/log/stage-2-init.log</filename> if <filename>/dev/kmsg</filename> is not writable.
-        '';
-      };
-
       postBootCommands = mkOption {
         default = "";
         example = "rm -f /var/log/messages";

From 4ba3c96431727d2c3a1a3a2783e35241ebd6b78b Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 22 Feb 2016 22:46:01 +0000
Subject: [PATCH 1686/2285] .github/ISSUE_TEMPLATE.md - get more information

The goal is to get all the necessary information from the reporter upfront.
Too many times the issues submits and we need to do a round of asking before
we can get close to a solution.
---
 .github/ISSUE_TEMPLATE.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 000000000000..57439ddd4d35
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,17 @@
+## Basic info
+
+To make sure that we are on the same page:
+
+* Kernel: (run `uname -a`)
+* System: (NixOS: `nixos-version`, Ubuntu/Fedora: `lsb_release -a`, ...)
+* Nix version: (run `nix-env --version`)
+* Channel: (run `nix-instantiate --eval '<nixpkgs>' -A lib.nixpkgsVersion`)
+
+## Describe your issue here
+
+### Expected result
+
+### Actual result
+
+### Steps to reproduce
+

From 32df5ed4c2a5d01d3a1d3233ccdf6779e5402de6 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 17 Feb 2016 04:55:26 +0300
Subject: [PATCH 1687/2285] udev service: make local rules apply after all
 others

---
 nixos/doc/manual/release-notes/rl-unstable.xml | 7 +++++++
 nixos/modules/services/hardware/udev.nix       | 8 ++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index c814d61bcf4c..b5b9e145e2ca 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -172,6 +172,13 @@ fileSystems."/example" = {
     </para>
   </listitem>
 
+  <listitem>
+    <para><literal>services.udev.extraRules</literal> option now writes rules
+    to <filename>99-local.rules</filename> instead of <filename>10-local.rules</filename>.
+    This makes all the user rules apply after others, so their results wouldn't be
+    overriden by anything else.</para>
+  </listitem>
+
 </itemizedlist>
 
 
diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 2d6630389b2b..e267aeee030c 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -13,13 +13,13 @@ let
   extraUdevRules = pkgs.writeTextFile {
     name = "extra-udev-rules";
     text = cfg.extraRules;
-    destination = "/etc/udev/rules.d/10-local.rules";
+    destination = "/etc/udev/rules.d/99-local.rules";
   };
 
   extraHwdbFile = pkgs.writeTextFile {
     name = "extra-hwdb-file";
     text = cfg.extraHwdb;
-    destination = "/etc/udev/hwdb.d/10-local.hwdb";
+    destination = "/etc/udev/hwdb.d/99-local.hwdb";
   };
 
   nixosRules = ''
@@ -212,8 +212,8 @@ in
         type = types.lines;
         description = ''
           Additional <command>udev</command> rules. They'll be written
-          into file <filename>10-local.rules</filename>. Thus they are
-          read before all other rules.
+          into file <filename>99-local.rules</filename>. Thus they are
+          read and applied after all other rules.
         '';
       };
 

From 151fd89ba03397e2a65baaaee285878b41e7ab71 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Tue, 23 Feb 2016 14:19:04 +0100
Subject: [PATCH 1688/2285] polyml: 5.5.2 -> 5.6

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

diff --git a/pkgs/development/compilers/polyml/default.nix b/pkgs/development/compilers/polyml/default.nix
index 276065ad3503..8b5d14e7f5fb 100644
--- a/pkgs/development/compilers/polyml/default.nix
+++ b/pkgs/development/compilers/polyml/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, autoreconfHook}:
 
 let
-  version = "5.5.2";
+  version = "5.6";
 in
 
 stdenv.mkDerivation {
@@ -15,7 +15,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "mirror://sourceforge/polyml/polyml.${version}.tar.gz";
-    sha256 = "10m680qdad6bd50bav9xjsgmsxw8yxg55vr7grbg0gvykzl2pzbk";
+    sha256 = "05d6l2a5m9jf32a8kahwg2p2ph4x9rjf1nsl83331q3gwn5bkmr0";
   };
 
   meta = {

From 87b0a41ac5b0a59f8080b97e33d601f56d8558e0 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Tue, 23 Feb 2016 14:19:13 +0100
Subject: [PATCH 1689/2285] isabelle: 2015 -> 2016

---
 .../science/logic/isabelle/default.nix        | 27 +++++++++----------
 pkgs/top-level/all-packages.nix               |  1 -
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix
index 98b71b7f5007..6c51fb5192d4 100644
--- a/pkgs/applications/science/logic/isabelle/default.nix
+++ b/pkgs/applications/science/logic/isabelle/default.nix
@@ -1,23 +1,23 @@
-{ stdenv, fetchurl, perl, nettools, java, polyml, proofgeneral }:
+{ stdenv, fetchurl, perl, nettools, java, polyml }:
 # nettools needed for hostname
 
 let
-  dirname = "Isabelle2015";
+  dirname = "Isabelle2016";
   theories = ["HOL" "FOL" "ZF"];
 in
 
 stdenv.mkDerivation {
-  name = "isabelle-2015";
+  name = "isabelle-2016";
   inherit dirname theories;
 
   src = if stdenv.isDarwin
     then fetchurl {
-      url = http://isabelle.in.tum.de/dist/Isabelle2015.dmg;
-      sha256 = "1vhm10qc1rn3wy9r12clrl33p64h3q1aj41mcnxkbnsyg2bx03im";
+      url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}.dmg";
+      sha256 = "0wawf0cjc52h8hif1867p33qhlh6qz0fy5i2kr1gbf7psickd6iw";
     }
     else fetchurl {
-      url = http://isabelle.in.tum.de/dist/Isabelle2015_linux.tar.gz;
-      sha256 = "13kqm458d8mw7il1zg5bdb1nfbb869p331d75xzlm2v9xgjxx862";
+      url = "http://isabelle.in.tum.de/website-${dirname}/dist/${dirname}_linux.tar.gz";
+      sha256 = "0jh1qrsyib13fycymwvw7dq7xfy4iyplwq0s65ash842cdzkbxb4";
     };
 
   buildInputs = [ perl polyml ]
@@ -34,17 +34,14 @@ stdenv.mkDerivation {
       --replace /usr/bin/env $ENV
     sed -i 's|isabelle_java java|${java}/bin/java|g' lib/Tools/java
     substituteInPlace etc/settings \
-      --subst-var-by ML_HOME "${polyml}/bin" \
-      --subst-var-by PROOFGENERAL_HOME "${proofgeneral}/share/emacs/site-lisp/ProofGeneral"
+      --subst-var-by ML_HOME "${polyml}/bin"
     substituteInPlace contrib/jdk/etc/settings \
       --replace ISABELLE_JDK_HOME= '#ISABELLE_JDK_HOME='
     substituteInPlace contrib/polyml-*/etc/settings \
-      --replace 'ML_HOME="$POLYML_HOME/$ML_PLATFORM"' \
-                "ML_HOME=\"${polyml}/bin\""
-  '';
-
-  buildPhase = ''
-    ISABELLE_JDK_HOME=${java} ./bin/isabelle build -s $theories
+      --replace '$POLYML_HOME/$ML_PLATFORM' ${polyml}/bin \
+      --replace '$POLYML_HOME/$PLATFORM/polyml' ${polyml}/bin/poly
+    substituteInPlace lib/scripts/run-polyml* lib/scripts/polyml-version \
+      --replace '$ML_HOME/poly' ${polyml}/bin/poly
   '';
 
   installPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 424cb2670198..210b74c232fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15384,7 +15384,6 @@ let
   tini = callPackage ../applications/virtualization/tini {};
 
   isabelle = callPackage ../applications/science/logic/isabelle {
-    inherit (pkgs.emacs24Packages) proofgeneral;
     java = if stdenv.isLinux then jre else jdk;
   };
 

From d53fa9884b46caa1c9f90be6a28525b494a2e3ad Mon Sep 17 00:00:00 2001
From: Michael Raitza <spacefrogg-github@meterriblecrew.net>
Date: Tue, 23 Feb 2016 13:47:43 +0000
Subject: [PATCH 1690/2285] CONTRIBUTING.md: Fix link to COPYING

---
 .github/CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
index c20d540a25a8..0ddf93dbec4f 100644
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -1,7 +1,7 @@
 # How to contribute
 
 Note: contributing implies licensing those contributions
-under the terms of [COPYING](./COPYING), which is an MIT-like license.
+under the terms of [COPYING](../COPYING), which is an MIT-like license.
 
 ## Opening issues
 

From fb8c4fafb96c4e5e78b148f0d9b4ecc33cf204d1 Mon Sep 17 00:00:00 2001
From: "Bruno Bzeznik Bruno.Bzeznik@imag.fr" <Bruno.Bzeznik@imag.fr>
Date: Tue, 23 Feb 2016 15:07:18 +0100
Subject: [PATCH 1691/2285] nco: fixed the pkg name (version missing)

Also fixed too long description
---
 pkgs/development/libraries/nco/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix
index 0a284722e029..f801e25d91fb 100644
--- a/pkgs/development/libraries/nco/default.nix
+++ b/pkgs/development/libraries/nco/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version = "4.5.5";
-  name = "nco";
+  name = "nco-${version}";
 
   buildInputs = [ netcdf netcdfcxx4 gsl udunits antlr which curl ];
 
@@ -12,7 +12,8 @@ stdenv.mkDerivation rec {
   };
 
   meta = { 
-    description = "The NCO (netCDF Operator) toolkit manipulates and analyzes data stored in netCDF-accessible formats, including DAP, HDF4, and HDF5";
+    description = "NetCDF Operator toolkit";
+    longDescription = "The NCO (netCDF Operator) toolkit manipulates and analyzes data stored in netCDF-accessible formats, including DAP, HDF4, and HDF5";
     homepage = http://nco.sourceforge.net/;
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.bzizou ];

From a60df02d02bf77ee88d4124885f763d3eeb142d1 Mon Sep 17 00:00:00 2001
From: "Bruno Bzeznik Bruno.Bzeznik@imag.fr" <Bruno.Bzeznik@imag.fr>
Date: Tue, 23 Feb 2016 15:19:25 +0100
Subject: [PATCH 1692/2285] libdap: fixed pkg name (version missing)

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

diff --git a/pkgs/development/libraries/libdap/default.nix b/pkgs/development/libraries/libdap/default.nix
index adb57f1ee778..2e76c510bdda 100644
--- a/pkgs/development/libraries/libdap/default.nix
+++ b/pkgs/development/libraries/libdap/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   version = "3.15.1";
-  name = "libdap";
+  name = "libdap-${version}";
 
   buildInputs = [ bison libuuid curl libxml2 flex ];
 
   src = fetchurl {
-    url = "http://www.opendap.org/pub/source/${name}-${version}.tar.gz";
+    url = "http://www.opendap.org/pub/source/${name}.tar.gz";
     sha256 = "6ee13cc69ae0b5e7552ddfd17013ebb385859bba66f42a2cfba3b3be7aa4ef0f";
   };
 

From c4ea54f6a19d98edb2be44295a4c1d49aebeed71 Mon Sep 17 00:00:00 2001
From: Michael Raitza <spacefrogg-github@meterriblecrew.net>
Date: Tue, 23 Feb 2016 14:38:48 +0000
Subject: [PATCH 1693/2285] gnome-encfs-manager: 1.8.15 -> 1.8.16

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

diff --git a/pkgs/tools/security/gencfsm/default.nix b/pkgs/tools/security/gencfsm/default.nix
index ff55411f32a5..fb9030036200 100644
--- a/pkgs/tools/security/gencfsm/default.nix
+++ b/pkgs/tools/security/gencfsm/default.nix
@@ -2,12 +2,12 @@
 , glib , gnome3, gtk3, libgnome_keyring, vala, wrapGAppsHook, xorg }:
 
 stdenv.mkDerivation rec {
-  version = "1.8.15";
+  version = "1.8.16";
   name = "gnome-encfs-manager-${version}";
 
   src = fetchurl {
     url = "https://launchpad.net/gencfsm/trunk/1.8/+download/gnome-encfs-manager_${version}.tar.gz";
-    sha256 = "1iryli6fgw6a45abkrjacfac7dwjhbrhw652rqf0s183373db0mx";
+    sha256 = "06sz6zcmvxkqww5gx4brcqs4hlpy9d8sal9nmw0pdsvh8k5vmpgn";
   };
 
   buildInputs = [ autoconf automake intltool libtool pkgconfig vala glib encfs

From af6c86751253168942767c3b0b758236fb6d74cf Mon Sep 17 00:00:00 2001
From: Michael Raitza <spacefrogg-github@meterriblecrew.net>
Date: Tue, 23 Feb 2016 14:51:28 +0000
Subject: [PATCH 1694/2285] dialog: 1.2-20150920 -> 1.3-20160209

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

diff --git a/pkgs/development/tools/misc/dialog/default.nix b/pkgs/development/tools/misc/dialog/default.nix
index f33ac04fdea6..76d34bfd5640 100644
--- a/pkgs/development/tools/misc/dialog/default.nix
+++ b/pkgs/development/tools/misc/dialog/default.nix
@@ -13,11 +13,11 @@ assert unicodeSupport -> ncurses.unicode && ncurses != null;
 
 stdenv.mkDerivation rec {
   name = "dialog-${version}";
-  version = "1.2-20150920";
+  version = "1.3-20160209";
 
   src = fetchurl {
     url = "ftp://invisible-island.net/dialog/${name}.tgz";
-    sha256 = "01ccd585c241nkj02n0zdbx8jqhylgcfpcmmshynh0c7fv2ixrn4";
+    sha256 = "11rzh14xy9s99gxdi5i7fgmgihjqsv0ls0ksavkmip2y37rgf503";
   };
 
   buildInputs = [ ncurses ];

From 861fae01fd7ffb2719ff1547bd7200f35c288739 Mon Sep 17 00:00:00 2001
From: Pallav Agarwal <pallavagarwal07@gmail.com>
Date: Tue, 23 Feb 2016 21:06:54 +0530
Subject: [PATCH 1695/2285] wpsoffice: Add new package

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

diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix
new file mode 100644
index 000000000000..093c2cd59bb0
--- /dev/null
+++ b/pkgs/applications/office/wpsoffice/default.nix
@@ -0,0 +1,52 @@
+{stdenv, fetchurl, unzip, libX11, libcxxabi, glib, xorg, qt4, fontconfig, phonon, freetype, zlib, libpng12, libICE, libXrender, cups, lib}:
+
+stdenv.mkDerivation rec{
+  name = "wpsoffice-${version}";
+  version = "10.1.0.5503";
+
+  src = fetchurl {
+    name = "${name}.tar.gz";
+    url = "http://kdl.cc.ksosoft.com/wps-community/download/a20/wps-office_10.1.0.5503~a20p2_x86_64.tar.xz";
+    sha256 = "0h9f8s7zkpd056ibrj978mr04imv631sp1wljplh99l5ncns6hws";
+  };
+  
+  meta = {
+    description = "Office program originally named Kingsoft Office";
+    homepage = http://wps-community.org/;
+    platforms = [ "x86_64-linux" ];
+    # Binary for i686 is also available if someone can package it
+    license = lib.licenses.unfree-redistributable;
+  };
+
+  libPath = stdenv.lib.makeLibraryPath [
+    libX11
+    libcxxabi
+    libpng12
+    glib
+    xorg.libSM
+    xorg.libXext
+    fontconfig
+    phonon
+    zlib
+    freetype
+    libICE
+    cups
+    libXrender
+  ];
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    cp -r . "$out"
+    chmod +x "$out/office6/wpp"
+    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --force-rpath --set-rpath "$out/office6:$libPath" "$out/office6/wpp"
+    chmod +x "$out/office6/wps"
+    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --force-rpath --set-rpath "$out/office6:$libPath" "$out/office6/wps"
+    chmod +x "$out/office6/et"
+    patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --force-rpath --set-rpath "$out/office6:$libPath" "$out/office6/et"
+    mkdir -p "$out/bin/"
+    ln -s "$out/office6/wpp" "$out/bin/wpspresentation"
+    ln -s "$out/office6/wps" "$out/bin/wpswriter"
+    ln -s "$out/office6/et" "$out/bin/wpsspreadsheets"
+  '';
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d395e08e1af..bc9cf17a5e54 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13901,6 +13901,8 @@ let
     inherit (python27Packages) cheetah;
   };
 
+  wpsoffice = callPackage ../applications/office/wpsoffice {};
+
   wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { };
 
   retroArchCores =

From 830c2d638911b35ca8a844d630481d5179bfa050 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Feb 2016 17:06:55 +0100
Subject: [PATCH 1696/2285] ISSUE_TEMPLATE.md: Tweak

---
 .github/ISSUE_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 57439ddd4d35..327959fe7a3c 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -5,7 +5,7 @@ To make sure that we are on the same page:
 * Kernel: (run `uname -a`)
 * System: (NixOS: `nixos-version`, Ubuntu/Fedora: `lsb_release -a`, ...)
 * Nix version: (run `nix-env --version`)
-* Channel: (run `nix-instantiate --eval '<nixpkgs>' -A lib.nixpkgsVersion`)
+* Nixpkgs version: (run `nix-instantiate --eval '<nixpkgs>' -A lib.nixpkgsVersion`)
 
 ## Describe your issue here
 

From d9d6a92d5eb6957b6987ee22e957f1b725966653 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 23 Feb 2016 18:03:33 +0100
Subject: [PATCH 1697/2285] sshd.nix: Ensure global config goes before user
 Match blocks

Hopefully fixes #13393.
---
 nixos/modules/services/networking/ssh/sshd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index ba3efc8c0c2a..20a1777f3ccb 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -304,7 +304,7 @@ in
     services.openssh.authorizedKeysFiles =
       [ ".ssh/authorized_keys" ".ssh/authorized_keys2" "/etc/ssh/authorized_keys.d/%u" ];
 
-    services.openssh.extraConfig =
+    services.openssh.extraConfig = mkOrder 0
       ''
         PidFile /run/sshd.pid
 

From 719a065e01355b8407af3d6b03e89ace28e8e2a0 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Tue, 23 Feb 2016 10:10:21 -0800
Subject: [PATCH 1698/2285] libinput: 1.1.6 -> 1.2.0

---
 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 ce5614a46ff5..013ebd9b9627 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.1.6";
+  name = "libinput-1.2.0";
 
   src = fetchurl {
     url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz";
-    sha256 = "0qqw988ippn8mihw9hy2ifzc77zdyhn5chzilp7pa9wlqh15wvzj";
+    sha256 = "0b3f67xsy1s84cvzw22mjfkbcv6pj4p4yns4h3m0fmb7zqbvjm0p";
   };
 
   configureFlags = [

From c49c384e202fce876c2aa73f479c168d7fa63a24 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 11 Nov 2015 17:51:50 -0500
Subject: [PATCH 1699/2285] libminc: init at 2.3.00

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

diff --git a/pkgs/development/libraries/libminc/default.nix b/pkgs/development/libraries/libminc/default.nix
new file mode 100644
index 000000000000..217ce20c6cfb
--- /dev/null
+++ b/pkgs/development/libraries/libminc/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, cmake, zlib, netcdf, hdf5 }:
+
+stdenv.mkDerivation rec {
+  _name = "libminc";
+  name  = "${_name}-2.3.00";
+
+  src = fetchurl {
+    url = "https://github.com/BIC-MNI/${_name}/archive/${_name}-2-3-00.tar.gz";
+    sha256 = "04ngqx4wkssxs9qqcgq2bvfs1cldcycmpcx587wy3b3m6lwf004c";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ zlib netcdf hdf5 ];
+
+  cmakeFlags = [ "-DBUILD_TESTING=${if doCheck then "ON" else "OFF"}"
+                 "-DLIBMINC_MINC1_SUPPORT=ON" ];
+
+  checkPhase = "ctest";
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/BIC-MNI/libminc;
+    description = "Medical imaging library based on HDF5";
+    maintainers = with maintainers; [ bcdarwin ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd7d2b607808..c7af2126a864 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7668,6 +7668,8 @@ let
 
   libmilter = callPackage ../development/libraries/libmilter { };
 
+  libminc = callPackage ../development/libraries/libminc { };
+
   libmkv = callPackage ../development/libraries/libmkv { };
 
   libmms = callPackage ../development/libraries/libmms { };

From 69c628e1ffb54503b425d5fea4c69cba72f81ef6 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 11 Nov 2015 19:31:45 -0500
Subject: [PATCH 1700/2285] minc-tools: init at 2.3.00

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

diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix
new file mode 100644
index 000000000000..41813dcda149
--- /dev/null
+++ b/pkgs/applications/science/biology/minc-tools/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchurl, perl, cmake, flex, bison, libminc }:
+
+stdenv.mkDerivation rec {
+  _name = "minc-tools";
+  name  = "${_name}-2.3.00";
+
+  src = fetchurl {
+    url = "https://github.com/BIC-MNI/${_name}/archive/${_name}-2-3-00.tar.gz";
+    sha256 = "1d457vrwy2fl6ga2axnwn1cchkx2rmgixfzyb1zjxb06cxkfj1dm";
+  };
+
+  nativeBuildInputs = [ cmake flex bison ] ++ (if doCheck then [ perl ] else [ ]);
+  buildInputs = [ libminc ];
+
+  cmakeFlags = [ "-DLIBMINC_DIR=${libminc}/lib/" ];
+
+  checkPhase = "ctest";
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/BIC-MNI/minc-tools;
+    description = "Command-line utilities for working with MINC files";
+    maintainers = with maintainers; [ bcdarwin ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c7af2126a864..ffc27d76da5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15181,6 +15181,8 @@ let
 
   mrbayes = callPackage ../applications/science/biology/mrbayes { };
 
+  minc_tools = callPackage ../applications/science/biology/minc-tools { };
+
   ncbi_tools = callPackage ../applications/science/biology/ncbi-tools { };
 
   paml = callPackage ../applications/science/biology/paml { };

From ea242619fb0028f830238a0fa1b19277d14508ff Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 23 Feb 2016 22:24:44 +0100
Subject: [PATCH 1701/2285] wpsoffice: unfree-redistributable not in
 lib.licenses

The attribute is called unfreeRedistributable.
---
 pkgs/applications/office/wpsoffice/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/wpsoffice/default.nix b/pkgs/applications/office/wpsoffice/default.nix
index 093c2cd59bb0..ed37cedde37f 100644
--- a/pkgs/applications/office/wpsoffice/default.nix
+++ b/pkgs/applications/office/wpsoffice/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec{
     homepage = http://wps-community.org/;
     platforms = [ "x86_64-linux" ];
     # Binary for i686 is also available if someone can package it
-    license = lib.licenses.unfree-redistributable;
+    license = lib.licenses.unfreeRedistributable;
   };
 
   libPath = stdenv.lib.makeLibraryPath [

From f456111c50aeb876c1e5f51bc5cb25bfbf6ce9ab Mon Sep 17 00:00:00 2001
From: Johannes Bornhold <johannes@rhodecode.com>
Date: Tue, 23 Feb 2016 23:57:23 +0100
Subject: [PATCH 1702/2285] hovercraft 2.0b1 -> 2.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 42eac4716b2b..1275d0f082ce 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5777,11 +5777,11 @@ in modules // {
   hovercraft = buildPythonPackage rec {
     disabled = ! isPy3k;
     name = "hovercraft-${version}";
-    version = "2.0b1";
+    version = "2.0";
 
     src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/h/hovercraft/${name}.zip";
-      sha256 = "1l88xp563miwwkahil1sxn4kz9khjcx6z85j8d6mq8gjc8rxz3j6";
+      url = "https://pypi.python.org/packages/source/h/hovercraft/${name}.tar.gz";
+      sha256 = "0lqxr816lymgnywln8bbv9nrmkyahjjcjkm9kjyny9bflayz4f1g";
     };
 
     propagatedBuildInputs = with self; [ docutils lxml manuel pygments svg-path watchdog ];

From 733619157483860d4f970559616fe30171c37022 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 23 Feb 2016 12:59:19 -0800
Subject: [PATCH 1703/2285] fix fetch-cargo SSL error

---
 pkgs/build-support/rust/fetch-cargo-deps | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps
index 5074e26848ed..1f6afd60d31b 100755
--- a/pkgs/build-support/rust/fetch-cargo-deps
+++ b/pkgs/build-support/rust/fetch-cargo-deps
@@ -43,6 +43,9 @@ set -u
 # Do any possible 'cargo update -p <pkgName> --precise <version>' ad-hoc updates
 eval "$cargoUpdateHook"
 
+# stdenv setup sets SSL_CERT_FILE to a nonexistent path; cargo doesn't like that
+unset SSL_CERT_FILE
+
 # Do the fetch
 cargo fetch --verbose
 

From beea8537f7ebac9805cf526538f51e170353647e Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 23 Feb 2016 12:59:36 -0800
Subject: [PATCH 1704/2285] clean up usage of procps in rustc

---
 pkgs/development/compilers/rustc/generic.nix | 6 ++++--
 pkgs/top-level/all-packages.nix              | 6 +-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/compilers/rustc/generic.nix b/pkgs/development/compilers/rustc/generic.nix
index d578facad698..8be2ec05f07e 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
-, llvmPackages_37, jemalloc, ncurses
+, llvmPackages_37, jemalloc, ncurses, darwin
 
 , shortVersion, isRelease
 , forceBundledLLVM ? false
@@ -10,7 +10,7 @@
 , configureFlags ? []
 
 , patches
-}:
+} @ args:
 
 assert !stdenv.isFreeBSD;
 
@@ -37,6 +37,8 @@ let version = if isRelease then
 
     name = "rustc-${version}";
 
+    procps = if stdenv.isDarwin then darwin.ps else args.procps;
+
     llvmShared = llvmPackages_37.llvm.override { enableSharedLibraries = true; };
 
     platform = if stdenv.system == "i686-linux"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 471c83538b33..a05cf918ffac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5062,11 +5062,7 @@ let
   rtags = callPackage ../development/tools/rtags/default.nix {};
 
   rustcMaster = callPackage ../development/compilers/rustc/head.nix {};
-  rustc = callPackage ../development/compilers/rustc {
-    callPackage = newScope ({
-      procps = if stdenv.isDarwin then darwin.ps else procps;
-    });
-  };
+  rustc = callPackage ../development/compilers/rustc {};
 
   rustPlatform = rustStable;
 

From 45ea4956d8144ce3dc46617b6c982ead57fe4f96 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 23 Feb 2016 12:59:51 -0800
Subject: [PATCH 1705/2285] fix library dependencies for cargo on darwin

---
 pkgs/development/tools/build-managers/cargo/common.nix |  3 ++-
 .../tools/build-managers/cargo/snapshot.nix            | 10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/tools/build-managers/cargo/common.nix b/pkgs/development/tools/build-managers/cargo/common.nix
index 941fe8073075..110956ebf85d 100644
--- a/pkgs/development/tools/build-managers/cargo/common.nix
+++ b/pkgs/development/tools/build-managers/cargo/common.nix
@@ -12,7 +12,8 @@
        "$out/lib/rustlib/uninstall.sh" \
        "$out/lib/rustlib/manifest-cargo"
 
-     wrapProgram "$out/bin/cargo" --suffix PATH : "${rustc}/bin"
+     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"
diff --git a/pkgs/development/tools/build-managers/cargo/snapshot.nix b/pkgs/development/tools/build-managers/cargo/snapshot.nix
index ad07148815bb..6dbe1e727d31 100644
--- a/pkgs/development/tools/build-managers/cargo/snapshot.nix
+++ b/pkgs/development/tools/build-managers/cargo/snapshot.nix
@@ -34,6 +34,16 @@ stdenv.mkDerivation {
 
   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"

From 7f7ebe5bf6ecb6fcb3c5d603c8f2e5b927ad0750 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 24 Feb 2016 01:37:40 +0100
Subject: [PATCH 1706/2285] nixpkgs manual: Fix license strings docs

The wrong usage of unfree-redistributable fixed in
ea242619fb0028f830238a0fa1b19277d14508ff can be explaind by unclear
documention, specifically the section in the nixpkgs manual describing
generic licenses it is written to use attributes from `stdenv.lib.licenses`
but in the list the strings form was documented without quotation marks.

This confuses people because the package builds fine locally but failes
the tests on travis-ci.
---
 doc/meta.xml | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/doc/meta.xml b/doc/meta.xml
index 5266d83aea68..b1ffd0502b2b 100644
--- a/doc/meta.xml
+++ b/doc/meta.xml
@@ -258,45 +258,54 @@ a value from <varname>stdenv.lib.licenses</varname> defined in
 <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/lib/licenses.nix">
 <filename>nixpkgs/lib/licenses.nix</filename></link>,
 or in-place license description of the same format if the license is
-unlikely to be useful in another expression.
+unlikely to be useful in another expression.</para>
+
+<para>Although it's typically better to indicate the specific license,
+a few generic options are available:
 
-A few generic options are available, although it's typically better
-to indicate the specific license:
 <variablelist>
 
   <varlistentry>
-    <term><varname>free</varname></term>
+    <term><varname>stdenv.lib.licenses.free</varname>,
+    <varname>"free"</varname></term>
+
     <listitem><para>Catch-all for free software licenses not listed
     above.</para></listitem>
   </varlistentry>
 
   <varlistentry>
-    <term><varname>unfree-redistributable</varname></term>
+    <term><varname>stdenv.lib.licenses.unfreeRedistributable</varname>,
+    <varname>"unfree-redistributable"</varname></term>
+
     <listitem><para>Unfree package that can be redistributed in binary
-    form.  That is, it’s legal to redistribute the
+    form. That is, it’s legal to redistribute the
     <emphasis>output</emphasis> of the derivation.  This means that
     the package can be included in the Nixpkgs
     channel.</para>
 
     <para>Sometimes proprietary software can only be redistributed
-    unmodified.  Make sure the builder doesn’t actually modify the
+    unmodified. Make sure the builder doesn’t actually modify the
     original binaries; otherwise we’re breaking the license.  For
     instance, the NVIDIA X11 drivers can be redistributed unmodified,
     but our builder applies <command>patchelf</command> to make them
-    work.  Thus, its license is <varname>unfree</varname> and it
+    work. Thus, its license is <varname>"unfree"</varname> and it
     cannot be included in the Nixpkgs channel.</para></listitem>
   </varlistentry>
 
   <varlistentry>
-    <term><varname>unfree</varname></term>
-    <listitem><para>Unfree package that cannot be redistributed.  You
+    <term><varname>stdenv.lib.licenses.unfree</varname>,
+    <varname>"unfree"</varname></term>
+
+    <listitem><para>Unfree package that cannot be redistributed. You
     can build it yourself, but you cannot redistribute the output of
-    the derivation.  Thus it cannot be included in the Nixpkgs
+    the derivation. Thus it cannot be included in the Nixpkgs
     channel.</para></listitem>
   </varlistentry>
 
   <varlistentry>
-    <term><varname>unfree-redistributable-firmware</varname></term>
+    <term><varname>stdenv.lib.licenses.unfreeRedistributableFirmware</varname>,
+    <varname>"unfree-redistributable-firmware"</varname></term>
+
     <listitem><para>This package supplies unfree, redistributable
     firmware.  This is a separate value from
     <varname>unfree-redistributable</varname> because not everybody

From e559c3a72a06d4a92cb252ef077add1443f1a9d0 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 23 Feb 2016 19:16:29 -0600
Subject: [PATCH 1707/2285] ibus-table-others: use mktemp for temporary
 directory

---
 .../inputmethods/ibus-engines/ibus-table-others/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
index 13d9df5de081..f3e3973a2c3f 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-others/default.nix
@@ -12,11 +12,11 @@ stdenv.mkDerivation rec {
   buildInputs = [ ibus ibus-table pkgconfig python3 ];
 
   preBuild = ''
-    export HOME=/tmp/ibus-table-others
+    export HOME=$(mktemp -d)/ibus-table-others
   '';
 
   postFixup = ''
-    rm -rf /tmp/ibus-table-others
+    rm -rf $HOME
   '';
 
   meta = with stdenv.lib; {

From bc7f99cd2f36bd6745e3e96d381ed42bf3028d04 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 23 Feb 2016 19:22:28 -0600
Subject: [PATCH 1708/2285] ibus-table-others: import ibus-table properly

---
 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 a05cf918ffac..37f1098a823c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1192,7 +1192,9 @@ let
 
     table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { };
 
-    table-others = callPackage ../tools/inputmethods/ibus-engines/ibus-table-others { };
+    table-others = callPackage ../tools/inputmethods/ibus-engines/ibus-table-others {
+      ibus-table = ibus-engines.table;
+    };
 
   };
 

From a2b19cdb0464eb71757b7584579cf0154c1d3771 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 23 Feb 2016 18:31:40 -0800
Subject: [PATCH 1709/2285] revert fetch-cargo-deps change

---
 pkgs/build-support/rust/fetch-cargo-deps | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps
index 1f6afd60d31b..5074e26848ed 100755
--- a/pkgs/build-support/rust/fetch-cargo-deps
+++ b/pkgs/build-support/rust/fetch-cargo-deps
@@ -43,9 +43,6 @@ set -u
 # Do any possible 'cargo update -p <pkgName> --precise <version>' ad-hoc updates
 eval "$cargoUpdateHook"
 
-# stdenv setup sets SSL_CERT_FILE to a nonexistent path; cargo doesn't like that
-unset SSL_CERT_FILE
-
 # Do the fetch
 cargo fetch --verbose
 

From a2bd90650d319bf86a601a778388476daa9883f2 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 24 Feb 2016 00:41:46 +0000
Subject: [PATCH 1710/2285] linux_4_3: 4.3.5 -> 4.3.6 (close #13408)

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

diff --git a/pkgs/os-specific/linux/kernel/linux-4.3.nix b/pkgs/os-specific/linux/kernel/linux-4.3.nix
index 20573ee5cebe..0bdc2d08d8a4 100644
--- a/pkgs/os-specific/linux/kernel/linux-4.3.nix
+++ b/pkgs/os-specific/linux/kernel/linux-4.3.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.3.5";
+  version = "4.3.6";
 
   extraMeta.branch = "4.3";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "0g656q51nzb61n0kb2k8br9shvz51yh8kyrsblbjmhi4dbcpizr8";
+    sha256 = "0wdd8z4ykjz1rkizlv9dm70vjd87fly4km4bs7av4p5w5xfp98z0";
   };
 
   features.iwlwifi = true;

From 08cf57204f83cac4454b6b67946f0dd039aae94d Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 24 Feb 2016 00:35:01 +0000
Subject: [PATCH 1711/2285] linux_3_14: 3.14.60 -> 3.14.61 (close #13407)

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index 9ad5a336de3b..80cb4bf89dc9 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.14.60";
+  version = "3.14.61";
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1zwq0j4slqg33z4yyk5s35hdzrq0g7jk1bd2kvgvkyqn1dkkvh0j";
+    sha256 = "06lrz2z3lskajk87kq1qi8q6rbdczhsz6sbp5cba4i0nw7sg1nbg";
   };
 
   kernelPatches = args.kernelPatches;

From 642517fbda94d7c7fcd77ad910812d6d42a40760 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 24 Feb 2016 00:30:03 +0000
Subject: [PATCH 1712/2285] linux_3_12: 3.12.53 -> 3.12.54 (close #13406)

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 378a2b854f9e..636ff9e7d29a 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.53";
+  version = "3.12.54";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "1f2h4z8lk1s0h5lw7n3yb47dhpbr7gzma7ifsslwhyjg7s44cb27";
+    sha256 = "0a6wv72257nasc1qrw966ajd60z24cjpc83hnbblsjkfl0b3zrrn";
   };
 
   kernelPatches = args.kernelPatches;

From 3ef63227dd580d97cd6052bb03ec05a878fd6e93 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 24 Feb 2016 00:15:47 +0000
Subject: [PATCH 1713/2285] linux-testing: 4.5-rc4 -> 4.5-rc5 (close #13403)

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 5b2034d21915..4b5cd20e831b 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.5-rc4";
-  modDirVersion = "4.5.0-rc4";
+  version = "4.5-rc5";
+  modDirVersion = "4.5.0-rc5";
   extraMeta.branch = "4.5";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "02kzcz2gblbjr0ixjdbwdbk4yix8wyd0xjpqk5mk78132pgj3w0a";
+    sha256 = "06qlypnrlkckxhf3clq6l2d3kps7rwfw811sxapjbnhzjd75fcx8";
   };
 
   features.iwlwifi = true;

From 5cf823e1f48296b666eaa116dd153bd2fd10184c Mon Sep 17 00:00:00 2001
From: Roger Qiu <roger.qiu@polycademy.com>
Date: Wed, 24 Feb 2016 18:54:25 +1100
Subject: [PATCH 1714/2285] nixos/stage-1/2: Added -r option to read so that
 read interprets backslashes literally, and corrected the comment about
 optional logging.

---
 nixos/modules/system/boot/stage-1-init.sh | 5 ++---
 nixos/modules/system/boot/stage-2-init.sh | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh
index 7a4c93e8a0fa..c0c2b6a94164 100644
--- a/nixos/modules/system/boot/stage-1-init.sh
+++ b/nixos/modules/system/boot/stage-1-init.sh
@@ -71,14 +71,13 @@ mount -t devtmpfs -o "size=@devSize@" devtmpfs /dev
 mkdir -p /run
 mount -t tmpfs -o "mode=0755,size=@runSize@" tmpfs /run
 
-
-# Optionally log the script output to /dev/kmsg or /run/log/stage-1-init.log.
+# Log the script output to /dev/kmsg or /run/log/stage-1-init.log.
 mkdir -p /tmp
 mkfifo /tmp/stage-1-init.log.fifo
 logOutFd=8 && logErrFd=9
 eval "exec $logOutFd>&1 $logErrFd>&2"
 if test -w /dev/kmsg; then
-    tee -i < /tmp/stage-1-init.log.fifo /proc/self/fd/"$logOutFd" | while read line; do
+    tee -i < /tmp/stage-1-init.log.fifo /proc/self/fd/"$logOutFd" | while read -r line; do
         if test -n "$line"; then
             echo "<7>stage-1-init: $line" > /dev/kmsg
         fi
diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh
index 9b34d24bdbc5..1b5b22c2005a 100644
--- a/nixos/modules/system/boot/stage-2-init.sh
+++ b/nixos/modules/system/boot/stage-2-init.sh
@@ -155,11 +155,11 @@ mkdir -m 0755 -p /var/setuid-wrappers
 mount -t tmpfs -o "mode=0755" tmpfs /var/setuid-wrappers
 
 
-# Optionally log the script output to /dev/kmsg or /run/log/stage-2-init.log.
+# Log the script output to /dev/kmsg or /run/log/stage-2-init.log.
 # Only at this point are all the necessary prerequisites ready for these commands.
 exec {logOutFd}>&1 {logErrFd}>&2
 if test -w /dev/kmsg; then
-    exec > >(tee -i /proc/self/fd/"$logOutFd" | while read line; do
+    exec > >(tee -i /proc/self/fd/"$logOutFd" | while read -r line; do
         if test -n "$line"; then
             echo "<7>stage-2-init: $line" > /dev/kmsg
         fi

From 14f3b8e6cc92fea319e6d5fc72953e7bae518b38 Mon Sep 17 00:00:00 2001
From: "Bruno Bzeznik Bruno.Bzeznik@imag.fr" <Bruno.Bzeznik@imag.fr>
Date: Wed, 24 Feb 2016 10:34:22 +0100
Subject: [PATCH 1715/2285] gromacs: 4.6.5 -> 4.6.7 + MPI support

---
 .../molecular-dynamics/gromacs/default.nix     | 18 +++++++++++++-----
 pkgs/top-level/all-packages.nix                | 16 ++++++++++++++++
 2 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
index 43ef4337d573..5724db9f3069 100644
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -1,22 +1,30 @@
 
 { stdenv, fetchurl, cmake,
   singlePrec ? true,
-  fftw
+  mpiEnabled ? false,
+  fftw,
+  openmpi
 }:
 
 
 stdenv.mkDerivation {
-  name = "gromacs-4.6.5";
+  name = "gromacs-4.6.7";
 
   src = fetchurl {
-    url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.5.tar.gz";
-    sha256 = "02ggrplh8fppqib86y3rfk4qm08yddlrb1yjgzl138b3b4qjy957";
+    url = "ftp://ftp.gromacs.org/pub/gromacs/gromacs-4.6.7.tar.gz";
+    sha256 = "6afb1837e363192043de34b188ca3cf83db6bd189601f2001a1fc5b0b2a214d9";
   };
 
-  buildInputs = [cmake fftw];
+  buildInputs = [cmake fftw]
+  ++ (stdenv.lib.optionals mpiEnabled [ openmpi ]);
 
   cmakeFlags = ''
     ${if singlePrec then "-DGMX_DOUBLE=OFF" else "-DGMX_DOUBLE=ON -DGMX_DEFAULT_SUFFIX=OFF"}
+    ${if mpiEnabled then "-DGMX_MPI:BOOL=TRUE 
+                          -DGMX_CPU_ACCELERATION:STRING=SSE4.1 
+                          -DGMX_OPENMP:BOOL=TRUE
+                          -DGMX_THREAD_MPI:BOOL=FALSE"
+                     else "-DGMX_MPI:BOOL=FALSE" }
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df56303c7742..cb03da1b65d5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15085,12 +15085,28 @@ let
 
   gromacs = callPackage ../applications/science/molecular-dynamics/gromacs {
     singlePrec = true;
+    mpiEnabled = false;
     fftw = fftwSinglePrec;
     cmake = cmakeCurses;
   };
 
+  gromacsMpi = lowPrio (callPackage ../applications/science/molecular-dynamics/gromacs {
+    singlePrec = true;
+    mpiEnabled = true;
+    fftw = fftwSinglePrec;
+    cmake = cmakeCurses;
+  });
+
   gromacsDouble = lowPrio (callPackage ../applications/science/molecular-dynamics/gromacs {
     singlePrec = false;
+    mpiEnabled = false;
+    fftw = fftw;
+    cmake = cmakeCurses;
+  });
+
+  gromacsDoubleMpi = lowPrio (callPackage ../applications/science/molecular-dynamics/gromacs {
+    singlePrec = false;
+    mpiEnabled = true;
     fftw = fftw;
     cmake = cmakeCurses;
   });

From 3845649b89c7a24a360c4d988c6eb0c37cd28f5a Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 24 Feb 2016 10:37:34 +0100
Subject: [PATCH 1716/2285] vanity counter: update Github name search

---
 maintainers/scripts/vanity.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/vanity.sh b/maintainers/scripts/vanity.sh
index c5665ab862aa..1f6fdaff6dd9 100755
--- a/maintainers/scripts/vanity.sh
+++ b/maintainers/scripts/vanity.sh
@@ -28,7 +28,7 @@ fetchGithubName () {
     )"
     userid="$(
         curl https://github.com/NixOS/nixpkgs/commit/"$commitid" 2>/dev/null |
-        grep authored -B10 | grep 'href="/' |
+        grep committed -B10 | grep 'href="/' |
         sed -re 's@.* href="/@@; s@".*@@' |
 	grep -v "/commit/"
     )";

From c4644c8b437683a49b0445075ea3bb225a6005a7 Mon Sep 17 00:00:00 2001
From: "Bruno Bzeznik Bruno.Bzeznik@imag.fr" <Bruno.Bzeznik@imag.fr>
Date: Fri, 19 Feb 2016 16:35:19 +0100
Subject: [PATCH 1717/2285] gdal: 2.0.1 -> 2.0.2 + netCDF format support

may be disabled by netcdfSupport=false
---
 pkgs/development/libraries/gdal/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix
index 8cf84eb08c3d..1607387160d2 100644
--- a/pkgs/development/libraries/gdal/default.nix
+++ b/pkgs/development/libraries/gdal/default.nix
@@ -1,18 +1,22 @@
 { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib
 , postgresql, mysql, libgeotiff, pythonPackages, proj, geos, openssl
-, libpng }:
+, libpng
+, netcdf, hdf5 , curl
+, netcdfSupport ? true
+ }:
 
 composableDerivation.composableDerivation {} (fixed: rec {
-  version = "2.0.1";
+  version = "2.0.2";
   name = "gdal-${version}";
 
   src = fetchurl {
     url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz";
-    sha256 = "b55f794768e104a2fd0304eaa61bb8bda3dc7c4e14f2c9d0913baca3e55b83ab";
+    sha256 = "db7722caf8d9dd798ec18012b9cacf40a518918466126a88b9fd277bd7d40cc4";
   };
 
   buildInputs = [ unzip libjpeg libtiff libpng proj openssl ]
-  ++ (with pythonPackages; [ python numpy wrapPython ]);
+  ++ (with pythonPackages; [ python numpy wrapPython ])
+  ++ (stdenv.lib.optionals netcdfSupport [ netcdf hdf5 curl ]);
 
   patches = [
     # This ensures that the python package is installed into gdal's prefix,
@@ -36,6 +40,7 @@ composableDerivation.composableDerivation {} (fixed: rec {
     "--with-python"               # optional
     "--with-static-proj4=${proj}" # optional
     "--with-geos=${geos}/bin/geos-config"# optional
+    (if netcdfSupport then "--with-netcdf=${netcdf}" else "")
   ];
 
   # Prevent this:

From 2f050b5d13784d6ab4b63405db495b7a8485f61a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 24 Feb 2016 11:01:11 +0100
Subject: [PATCH 1718/2285] stdenvLinux: Use bash instead of sh from
 bootstrapTools

"sh" is also bash, but invoking it as "sh" disables certain features
like process substitution.

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

diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index ac7d8f5c706c..cd49d4a5a742 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -78,7 +78,7 @@ rec {
             dontPatchShebangs=1
             ${commonPreHook}
           '';
-        shell = "${bootstrapTools}/bin/sh";
+        shell = "${bootstrapTools}/bin/bash";
         initialPath = [bootstrapTools];
         fetchurlBoot = import ../../build-support/fetchurl {
           stdenv = stage0.stdenv;

From 11a474e81b8457dc77c912cf2e53099e37f2ffed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Czy=C5=BC?= <tomasz.czyz@gmail.com>
Date: Tue, 5 Jan 2016 22:57:36 +0000
Subject: [PATCH 1719/2285] idea.android-studio: 1.5.0.4 -> 2.0.0.0

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

diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix
index 7d02bd480ddc..751e66cca070 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -148,14 +148,14 @@ in
 
   android-studio = buildAndroidStudio rec {
     name = "android-studio-${version}";
-    version = "1.5.1.0";
-    build = "141.2456560";
+    version = "2.0.0.0";
+    build = "143.2443734";
     description = "Android development environment based on IntelliJ IDEA";
     license = stdenv.lib.licenses.asl20;
     src = fetchurl {
       url = "https://dl.google.com/dl/android/studio/ide-zips/${version}" +
             "/android-studio-ide-${build}-linux.zip";
-      sha256 = "0p6h21jd0xx3xzdrfv9530n1ssyc3xigr3fg33r8ain4k6n02vj6";
+      sha256 = "0j6bi87hb5jxjwfhfya64s673vdkdslsqc6sqa4zl97sabvafk2w";
     };
   };
 

From aff0451c1059db83acb77125f79b76075261dabd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 24 Feb 2016 11:13:36 +0100
Subject: [PATCH 1720/2285] patchELF: Use correct directory

Borrowed from https://github.com/NixOS/nixpkgs/pull/13395.
---
 pkgs/development/tools/misc/patchelf/setup-hook.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/patchelf/setup-hook.sh b/pkgs/development/tools/misc/patchelf/setup-hook.sh
index 03b6f362a779..563ef57fce11 100644
--- a/pkgs/development/tools/misc/patchelf/setup-hook.sh
+++ b/pkgs/development/tools/misc/patchelf/setup-hook.sh
@@ -5,7 +5,8 @@
 fixupOutputHooks+=('if [ -z "$dontPatchELF" ]; then patchELF "$prefix"; fi')
 
 patchELF() {
-    header "shrinking RPATHs of ELF executables and libraries in $prefix"
+    local dir="$1"
+    header "shrinking RPATHs of ELF executables and libraries in $dir"
 
     local i
     while IFS= read -r -d $'\0' i; do
@@ -13,7 +14,7 @@ patchELF() {
         if ! isELF "$i"; then continue; fi
         echo "shrinking $i"
         patchelf --shrink-rpath "$i" || true
-    done < <(find "$prefix" -type f -print0)
+    done < <(find "$dir" -type f -print0)
 
     stopNest
 }

From 17a759f346066ab2cb0e3f557117234e55d45c0e Mon Sep 17 00:00:00 2001
From: Wout Mertens <Wout.Mertens@gmail.com>
Date: Wed, 24 Feb 2016 11:22:59 +0100
Subject: [PATCH 1721/2285] Watchman: 4.3.0 => 4.5.0

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

diff --git a/pkgs/development/tools/watchman/default.nix b/pkgs/development/tools/watchman/default.nix
index 2f02a7a4a1f8..9c09277deb78 100644
--- a/pkgs/development/tools/watchman/default.nix
+++ b/pkgs/development/tools/watchman/default.nix
@@ -5,13 +5,13 @@
 stdenv.mkDerivation rec {
   name = "watchman-${version}";
 
-  version = "4.3.0";
+  version = "4.5.0";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "watchman";
     rev = "v${version}";
-    sha256 = "0dcaklw4d42z8hndy9zsdqqv1q8r18wnwldgdgjvp5c9vijvgyrd";
+    sha256 = "0hyj7nbsm5mv8zq2fldd06f92a3wamavha20311518qv7q5jj72v";
   };
 
   buildInputs = [ autoconf automake pcre ];

From 7d91ee54c90edf9663d2a9370b4823208e996b87 Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@brianmckenna.org>
Date: Wed, 24 Feb 2016 22:54:08 +1100
Subject: [PATCH 1722/2285] openbox: fix copy/paste typo in config

---
 nixos/modules/services/x11/window-managers/openbox.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/window-managers/openbox.nix b/nixos/modules/services/x11/window-managers/openbox.nix
index 091b533b28be..07ef77151e95 100644
--- a/nixos/modules/services/x11/window-managers/openbox.nix
+++ b/nixos/modules/services/x11/window-managers/openbox.nix
@@ -8,7 +8,7 @@ in
 
 {
   options = {
-    services.xserver.windowManager.openbox.enable = mkEnableOption "oroborus";
+    services.xserver.windowManager.openbox.enable = mkEnableOption "openbox";
   };
 
   config = mkIf cfg.enable {

From 29809666cba687d248cfaf1054182bb16e70646c Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Wed, 24 Feb 2016 12:56:15 +0100
Subject: [PATCH 1723/2285] aria2: 1.19.3 -> 1.20.0

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

diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 09e4531d9259..8cb6172d87b6 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "aria2-${version}";
-  version = "1.19.3";
+  version = "1.20.0";
 
   src = fetchurl {
     url = "https://github.com/tatsuhiro-t/aria2/releases/download/release-${version}/${name}.tar.xz";
-    sha256 = "1qwr4al6wlh5f558r0mr1hvdnf7d8ss6qwqn2361k99phk1cdg3a";
+    sha256 = "1l4gzz3yr0cl6a9xdy7843c5sb7afyq0i80wi2hasfpfdx5k95mz";
   };
 
   nativeBuildInputs = [ pkgconfig ];

From 2552fa4bf4578fb4980ef64d189f0a3a2ca9cbce Mon Sep 17 00:00:00 2001
From: = <=>
Date: Wed, 24 Feb 2016 13:21:53 +0100
Subject: [PATCH 1724/2285] bitcoin: 0.11.0 -> 0.12.0

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

diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix
index 91432f2f5a8a..1a5746357113 100644
--- a/pkgs/applications/altcoins/bitcoin.nix
+++ b/pkgs/applications/altcoins/bitcoin.nix
@@ -1,23 +1,23 @@
 { stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost
-, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode
+, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, libevent
 , withGui }:
 
 with stdenv.lib;
 stdenv.mkDerivation rec{
 
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version;
-  core_version = "0.11.0";
+  core_version = "0.12.0";
   version = core_version;
 
   src = fetchurl {
     urls = [ "https://bitcoin.org/bin/bitcoin-core-${core_version}/bitcoin-${version}.tar.gz"
              "mirror://sourceforge/bitcoin/Bitcoin/bitcoin-${core_version}/bitcoin-${version}.tar.gz"
            ];
-    sha256 = "51ba1756addfa71567559e3f22331c1d908a63571891287689fff7113035d09f";
+    sha256 = "0f1cda66c841a548a07cc37e80b0727354b1236d9f374c7d44362acdb85eb3e1";
   };
 
   buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib
-                  miniupnpc protobuf ]
+                  miniupnpc protobuf libevent]
                   ++ optionals stdenv.isLinux [ utillinux ]
                   ++ optionals withGui [ qt4 qrencode ];
 

From c1504c5a94d70c38ed780f2b1eccb93ee74a5dd6 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Wed, 24 Feb 2016 13:47:23 +0100
Subject: [PATCH 1725/2285] git: 2.7.0 -> 2.7.1

---
 .../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 49ecce0456b2..47669538fcca 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -9,7 +9,7 @@
 }:
 
 let
-  version = "2.7.0";
+  version = "2.7.1";
   svn = subversionClient.override { perlBindings = true; };
 in
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "03bvb8s5j8i54qbi3yayl42bv0wf2fpgnh1a2lkhbj79zi7b77zs";
+    sha256 = "1zkbdmh5gvxalr8l1cwnirqq5raijmp2d0s36s6qabrlvqvq2yj7";
   };
 
   patches = [

From 551f0ca898122f0ea65efb82edea8e118f3832d7 Mon Sep 17 00:00:00 2001
From: Tim Williams <info@timphilipwilliams.com>
Date: Wed, 24 Feb 2016 12:49:49 +0000
Subject: [PATCH 1726/2285] mendeley: 1.15.3 -> 1.16

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

diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix
index d9505c17e8de..4f641d1ee50b 100644
--- a/pkgs/applications/office/mendeley/default.nix
+++ b/pkgs/applications/office/mendeley/default.nix
@@ -12,14 +12,14 @@ let
     then "i386"
     else "amd64";
 
-  shortVersion = "1.15.3-stable";
+  shortVersion = "1.16-stable";
 
   version = "${shortVersion}_${arch}";
 
   url = "http://desktop-download.mendeley.com/download/apt/pool/main/m/mendeleydesktop/mendeleydesktop_${version}.deb";
   sha256 = if stdenv.system == arch32
-    then "7d0737eb28cb4238fafdd6cf973ad899dd6a7622bc1a5c44f32a9c1790eaf6af"
-    else "0hvvyvbkbz8hg8s532rrrcv7jf07zh4axjzk18bvr6p9cgcdirl8";
+    then "da56abe0e0e86d868d305119f06cf6d14273d2f65e5c135fc2d190ca599b3cb6"
+    else "e9c2f026fd267db34396ff5f24bce9c6a4beba530bd8b40265a792d417282fba";
 
   deps = [
     gcc.cc

From ef86e9506d5d6ed82ed8af5369b296aa2f3431a2 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 24 Feb 2016 14:01:20 +0100
Subject: [PATCH 1727/2285] Untested fix for #13401

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

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 6300068f09fe..98e168f310d0 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -21,7 +21,9 @@ let
     patches =
       [ ./use-etc-ssl-certs.patch ]
       ++ optional stdenv.isCygwin ./1.0.1-cygwin64.patch
-      ++ optional (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem")) ./darwin-arch.patch;
+      ++ optional
+           (versionOlder version "1.0.2" && (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem")))
+           ./darwin-arch.patch;
 
     nativeBuildInputs = [ perl ];
     buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;
@@ -102,9 +104,9 @@ in {
     sha256 = "0iik7a3b0mrfrxzngdf7ywfscg9inbw77y0jp2ccw0gdap9xhjvq";
   };
 
-  openssl_1_0_2 = common {
+  openssl_1_0_2 = lowPrio (common {
     version = "1.0.2f";
     sha256 = "932b4ee4def2b434f85435d9e3e19ca8ba99ce9a065a61524b429a9d5e9b2e9c";
-  };
+  });
 
 }

From 301d1d9e76d4ec470a60761f61019e63d1c59ee7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 24 Feb 2016 14:23:48 +0100
Subject: [PATCH 1728/2285] hedgewars: 0.9.21 -> 0.9.22, fix build failure

cc @kragniz
---
 ...5b79072b147d0a9b7fafca98501e7056c834.patch | 36 -------------------
 pkgs/games/hedgewars/default.nix              |  8 ++---
 2 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch

diff --git a/pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch b/pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch
deleted file mode 100644
index 1de99542bdbf..000000000000
--- a/pkgs/games/hedgewars/21eb5b79072b147d0a9b7fafca98501e7056c834.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 21eb5b79072b147d0a9b7fafca98501e7056c834 Mon Sep 17 00:00:00 2001
-From: koda <vittorio.giovara@gmail.com>
-Date: Tue, 2 Jun 2015 19:51:04 +0100
-Subject: [PATCH] Fix building hedgewars-server
-
----
- gameServer/CoreTypes.hs           | 2 +-
- gameServer/hedgewars-server.cabal | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gameServer/CoreTypes.hs b/gameServer/CoreTypes.hs
-index 553e722..2c75153 100644
---- a/gameServer/CoreTypes.hs
-+++ b/gameServer/CoreTypes.hs
-@@ -38,7 +38,7 @@ import RoomsAndClients
- instance NFData B.ByteString
- #endif
- 
--instance NFData (Chan a)
-+instance NFData (Chan a) where rnf a  = ()
- 
- instance NFData Action where
-     rnf (AnswerClients chans msg) = chans `deepseq` msg `deepseq` ()
-diff --git a/gameServer/hedgewars-server.cabal b/gameServer/hedgewars-server.cabal
-index 122f2ef..f36a190 100644
---- a/gameServer/hedgewars-server.cabal
-+++ b/gameServer/hedgewars-server.cabal
-@@ -33,7 +33,7 @@ Executable hedgewars-server
-     utf8-string,
-     SHA,
-     entropy,
--    zlib
-+    zlib >= 0.5.3 && < 0.6
- 
-   if !os(windows)
-     build-depends: unix
diff --git a/pkgs/games/hedgewars/default.nix b/pkgs/games/hedgewars/default.nix
index f5d4627c5c08..8d601e29d0b0 100644
--- a/pkgs/games/hedgewars/default.nix
+++ b/pkgs/games/hedgewars/default.nix
@@ -5,15 +5,15 @@
 
 let
   ghc = ghcWithPackages (pkgs: with pkgs; [
-          network vector utf8-string bytestring-show random hslogger dataenc SHA entropy zlib
+          network vector utf8-string bytestring-show random hslogger dataenc SHA entropy zlib_0_5_4_2
         ]);
 in
 stdenv.mkDerivation rec {
-  version = "0.9.21";
+  version = "0.9.22";
   name = "hedgewars-${version}";
   src = fetchurl {
     url = "http://download.gna.org/hedgewars/hedgewars-src-${version}.tar.bz2";
-    sha256 = "0abnzpyq6sxlfcz5b0kh6r7n1692dwrgsdsr4s216xhh9n19xm0w";
+    sha256 = "14i1wvqbqib9h9092z10g4g0y14r5sp2fdaksvnw687l3ybwi6dn";
   };
 
   buildInputs = [
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
     qt4 ghc ffmpeg freeglut makeWrapper physfs
   ];
 
-  patches = [ ./21eb5b79072b147d0a9b7fafca98501e7056c834.patch ];
-
   preBuild = ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL_image}/lib
                                      -rpath ${SDL_mixer}/lib

From 501a1d92f09bf18973056e648dd2a0540343da7c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Wed, 24 Feb 2016 13:57:20 +0100
Subject: [PATCH 1729/2285] lmms: 1.1.3 -> 1.1.90

cc @goibhniu
---
 pkgs/applications/audio/lmms/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix
index 783b506c4d72..5bd8068cd4cb 100644
--- a/pkgs/applications/audio/lmms/default.nix
+++ b/pkgs/applications/audio/lmms/default.nix
@@ -1,19 +1,21 @@
-{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, fluidsynth
+{ stdenv, fetchFromGitHub, SDL, alsaLib, cmake, fftwSinglePrec, fluidsynth
 , fltk13, libjack2, libvorbis , libsamplerate, libsndfile, pkgconfig
-, libpulseaudio, qt4, freetype
+, libpulseaudio, qt4, freetype, libgig
 }:
 
-stdenv.mkDerivation  rec {
+stdenv.mkDerivation rec {
   name = "lmms-${version}";
-  version = "1.1.3";
+  version = "1.1.90";
 
-  src = fetchurl {
-    url = "https://github.com/LMMS/lmms/archive/v${version}.tar.gz";
-    sha256 = "1g76z7ha3hd53vbqaq9n1qg6s3lw8zzaw51iny6y2bz0j1xqwcsr";
+  src = fetchFromGitHub {
+    owner = "LMMS";
+    repo = "lmms";
+    rev = "v${version}";
+    sha256 = "0njiarndwqamqiinr1wbwkzjn87yzr1z5k9cfwk0jdkbalgakkq3";
   };
 
   buildInputs = [
-    SDL alsaLib cmake fftwSinglePrec fltk13 fluidsynth libjack2
+    SDL alsaLib cmake fftwSinglePrec fltk13 fluidsynth libjack2 libgig
     libsamplerate libsndfile libvorbis pkgconfig libpulseaudio qt4
   ];
 

From 0ee46ddffbd3b8afb585021cd724bc93a9adca04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Wed, 24 Feb 2016 15:02:19 +0100
Subject: [PATCH 1730/2285] libssh: security update 0.7.2 -> 0.7.3

It's supposed to fix CVE-2016-0739: weak secret with diffie-hellman.
---
 pkgs/development/libraries/libssh/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix
index 3f6eeac892b1..17538a6c3803 100644
--- a/pkgs/development/libraries/libssh/default.nix
+++ b/pkgs/development/libraries/libssh/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, cmake, zlib, openssl, libsodium }:
 
 stdenv.mkDerivation rec {
-  name = "libssh-0.7.2";
+  name = "libssh-0.7.3";
 
   src = fetchurl {
-    url = "https://red.libssh.org/attachments/download/177/${name}.tar.xz";
-    sha256 = "0qmfxgx88dbzcbyvh40gddn0fcg9adyyskg8pnsclha1cywlab53";
+    url = "https://red.libssh.org/attachments/download/195/${name}.tar.xz";
+    sha256 = "165g49i4kmm3bfsjm0n8hm21kadv79g9yjqyq09138jxanz4dvr6";
   };
 
   postPatch = ''

From 25b1fab48532aa48f588d99a1ccab0400ec3c27c Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Wed, 24 Feb 2016 14:55:57 +0100
Subject: [PATCH 1731/2285] weboob: 1.0 -> 1.1

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 42eac4716b2b..4e05f575eac1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6530,6 +6530,26 @@ in modules // {
     };
   };
 
+  pdfminer = buildPythonPackage rec {
+    version = "20140328";
+    name = "pdfminer-${version}";
+
+    disabled = ! isPy27;
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/pdfminer/pdfminer-${version}.tar.gz";
+      sha256 = "0qpjv4b776dwvpf5a7v19g41qsz97bv0qqsyvm7a31k50n9pn65s";
+    };
+
+    propagatedBuildInputs = with self; [  ];
+
+    meta = {
+      description = "Tool for extracting information from PDF documents";
+      homepage = http://euske.github.io/pdfminer/index.html;
+      license = licenses.mit;
+      maintainers = with maintainers; [ DamienCassou ];
+    };
+  };
 
   peppercorn = buildPythonPackage rec {
     name = "peppercorn-0.5";
@@ -23937,17 +23957,17 @@ in modules // {
   };
 
   weboob = buildPythonPackage rec {
-    name = "weboob-1.0";
+    name = "weboob-1.1";
     disabled = ! isPy27;
 
     src = pkgs.fetchurl {
-      url = "https://symlink.me/attachments/download/289/${name}.tar.gz";
-      md5 = "38f832f1b8654441adafe8558faa7109";
+      url = "https://symlink.me/attachments/download/324/${name}.tar.gz";
+      sha256 = "0736c5wsck2abxlwvx8i4496kafk9xchkkzhg4dcfbj0isldih6b";
     };
 
     setupPyBuildFlags = ["--qt" "--xdg"];
 
-    propagatedBuildInputs = with self; [ pillow prettytable pyyaml dateutil gdata requests2 mechanize feedparser lxml pkgs.gnupg pyqt4 pkgs.libyaml simplejson cssselect futures ];
+    propagatedBuildInputs = with self; [ pillow prettytable pyyaml dateutil gdata requests2 mechanize feedparser lxml pkgs.gnupg pyqt4 pkgs.libyaml simplejson cssselect futures pdfminer termcolor ];
 
     meta = {
       homepage = http://weboob.org;

From de8213bd287b80d564ab9fc62c9c9c20c15bdacb Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 24 Feb 2016 14:35:34 +0000
Subject: [PATCH 1732/2285] curl: disable http2 support on Darwin

Should fix https://hydra.nixos.org/build/32265403/nixlog/12
---
 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 37f1098a823c..15b9862e390c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1270,6 +1270,7 @@ let
 
   curl = callPackage ../tools/networking/curl rec {
     fetchurl = fetchurlBoot;
+    http2Support = !stdenv.isDarwin;
     zlibSupport = true;
     sslSupport = zlibSupport;
     scpSupport = zlibSupport && !stdenv.isSunOS && !stdenv.isCygwin;

From d7cb5f47d3db6aa3c14a0d9f2ba0ff0f288ee3d3 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Wed, 24 Feb 2016 15:45:44 +0100
Subject: [PATCH 1733/2285] gdb: 7.10 -> 7.11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

See announcement here :
http://lists.gnu.org/archive/html/info-gnu/2016-02/msg00010.html
---
 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 cdef2ee58ca9..472bb4de58b9 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.10.1";
+  basename = "gdb-7.11";
 
   # 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 = "1mfnjcwnwm5cg4rc9pncs9v356a0bz6ymjyac56mbj6784yjzir5";
+    sha256 = "1hg5kwwdvi9b9nxzxfjnx8fx3gip75fqyvkp82xpf3b3rcb42hvs";
   };
 
   nativeBuildInputs = [ pkgconfig texinfo perl ]

From d4193c82c13e190b516ccaa9930544d4cdeaa98c Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Wed, 24 Feb 2016 16:39:03 +0100
Subject: [PATCH 1734/2285] mercurial: 3.5.1 -> 3.7.1

---
 pkgs/applications/version-management/mercurial/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix
index d69291293204..b99727b2c9b6 100644
--- a/pkgs/applications/version-management/mercurial/default.nix
+++ b/pkgs/applications/version-management/mercurial/default.nix
@@ -3,7 +3,7 @@
 , ApplicationServices, cf-private }:
 
 let
-  version = "3.5.1";
+  version = "3.7.1";
   name = "mercurial-${version}";
 in
 
@@ -12,7 +12,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://mercurial.selenic.com/release/${name}.tar.gz";
-    sha256 = "1795ia6ghbqwfp4d6bz0qwlvzymh76zdgk2viikrkqq3ldfs8zcr";
+    sha256 = "1vfgqlb8z2k1vcx2nvcianxmml79cqqqncchw6aj40sa8hgpvlwn";
   };
 
   inherit python; # pass it so that the same version can be used in hg2git

From a2b8cc0aaf74f4a98b820925f96a33123fbcd1c4 Mon Sep 17 00:00:00 2001
From: Jordan Mulcahey <snhjordy@gmail.com>
Date: Thu, 13 Aug 2015 22:05:03 -0700
Subject: [PATCH 1735/2285] netatalk: 3.1.0 -> 3.1.7, new service module

---
 nixos/modules/module-list.nix                 |   1 +
 .../services/network-filesystems/netatalk.nix | 150 ++++++++++++++++++
 pkgs/tools/filesystems/netatalk/default.nix   |  16 +-
 .../netatalk/omitLocalstatedirCreation.patch  |  35 ++++
 4 files changed, 196 insertions(+), 6 deletions(-)
 create mode 100644 nixos/modules/services/network-filesystems/netatalk.nix
 create mode 100644 pkgs/tools/filesystems/netatalk/omitLocalstatedirCreation.patch

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 30e716c2ef4b..585da96c32e0 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -275,6 +275,7 @@
   ./services/monitoring/zabbix-agent.nix
   ./services/monitoring/zabbix-server.nix
   ./services/network-filesystems/drbd.nix
+  ./services/network-filesystems/netatalk.nix
   ./services/network-filesystems/nfsd.nix
   ./services/network-filesystems/openafs-client/default.nix
   ./services/network-filesystems/rsyncd.nix
diff --git a/nixos/modules/services/network-filesystems/netatalk.nix b/nixos/modules/services/network-filesystems/netatalk.nix
new file mode 100644
index 000000000000..bff54406a2b0
--- /dev/null
+++ b/nixos/modules/services/network-filesystems/netatalk.nix
@@ -0,0 +1,150 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.netatalk;
+
+  extmapFile = pkgs.writeText "extmap.conf" cfg.extmap;
+
+  afpToString = x: if builtins.typeOf x == "bool"
+                   then (if x then "true" else "false")
+                   else toString x;
+
+  volumeConfig = name:
+    let vol = getAttr name cfg.volumes; in
+    "[${name}]\n " + (toString (
+       map
+         (key: "${key} = ${afpToString (getAttr key vol)}\n")
+         (attrNames vol)
+    ));
+
+  afpConf = ''[Global]
+    extmap file = ${extmapFile}
+    afp port = ${toString cfg.port}
+
+    ${cfg.extraConfig}
+
+    ${if cfg.homes.enable then ''[Homes]
+    ${optionalString (cfg.homes.path != "") "path = ${cfg.homes.path}"}
+    basedir regex = ${cfg.homes.basedirRegex}
+    ${cfg.homes.extraConfig}
+    '' else ""}
+
+     ${toString (map volumeConfig (attrNames cfg.volumes))}
+  '';
+
+  afpConfFile = pkgs.writeText "afp.conf" afpConf;
+
+in
+
+{
+  options = {
+    services.netatalk = {
+
+      enable = mkOption {
+          default = false;
+          description = "Whether to enable the Netatalk AFP fileserver.";
+        };
+
+      port = mkOption {
+        default = 548;
+        description = "TCP port to be used for AFP.";
+      };
+
+      extraConfig = mkOption {
+        type = types.lines;
+        default = "";
+        example = "uam list = uams_guest.so";
+        description = ''
+          Lines of configuration to add to the <literal>[Global]</literal> section.
+          See <literal>man apf.conf</literal> for more information.
+        '';
+      };
+
+      homes = {
+        enable = mkOption {
+          default = false;
+          description = "Enable sharing of the UNIX server user home directories.";
+        };
+
+        path = mkOption {
+          default = "";
+          example = "afp-data";
+          description = "Share not the whole user home but this subdirectory path.";
+        };
+
+        basedirRegex = mkOption {
+          example = "/home";
+          description = "Regex which matches the parent directory of the user homes.";
+        };
+
+        extraConfig = mkOption {
+          type = types.lines;
+          default = "";
+          description = ''
+            Lines of configuration to add to the <literal>[Homes]</literal> section.
+            See <literal>man apf.conf</literal> for more information.
+          '';
+         };
+      };
+
+      volumes = mkOption {
+        default = { };
+        type = types.attrsOf (types.attrsOf types.unspecified);
+        description =
+          ''
+            Set of AFP volumes to export.
+            See <literal>man apf.conf</literal> for more information.
+          '';
+        example =
+          { srv =
+             { path = "/srv";
+               "read only" = true;
+               "hosts allow" = "10.1.0.0/16 10.2.1.100 2001:0db8:1234::/48";
+             };
+          };
+      };
+
+      extmap = mkOption {
+        type = types.lines;
+	default = "";
+	description = ''
+	  File name extension mappings.
+	  See <literal>man extmap.conf</literal> for more information.
+        '';
+      };
+
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    systemd.services.netatalk = {
+      description = "Netatalk AFP fileserver for Macintosh clients";
+      unitConfig.Documentation = "man:afp.conf(5) man:netatalk(8) man:afpd(8) man:cnid_metad(8) man:cnid_dbd(8)";
+      after = [ "network.target" "avahi-daemon.service" ];
+      wantedBy = [ "multi-user.target" ];
+
+      path = [ pkgs.netatalk ];
+
+      serviceConfig = {
+        Type = "forking";
+        GuessMainPID = "no";
+        PIDFile = "/run/lock/netatalk";
+	ExecStartPre = "${pkgs.coreutils}/bin/mkdir -m 0755 -p /var/lib/netatalk/CNID";
+        ExecStart  = "${pkgs.netatalk}/sbin/netatalk -F ${afpConfFile}";
+        ExecReload = "${pkgs.coreutils}/bin/kill -HUP  $MAINPID";
+	ExecStop   = "${pkgs.coreutils}/bin/kill -TERM $MAINPID";
+        Restart = "always";
+        RestartSec = 1;
+      };
+
+    };
+
+    security.pam.services.netatalk.unixAuth = true;
+
+  };
+
+}
diff --git a/pkgs/tools/filesystems/netatalk/default.nix b/pkgs/tools/filesystems/netatalk/default.nix
index d5a0cbbc4190..7e4ea032bb39 100644
--- a/pkgs/tools/filesystems/netatalk/default.nix
+++ b/pkgs/tools/filesystems/netatalk/default.nix
@@ -1,24 +1,28 @@
-{ fetchurl, stdenv, pkgconfig, db, libgcrypt, avahi, libiconv, pam, openssl }:
+{ fetchurl, stdenv, pkgconfig, db, libgcrypt, avahi, libiconv, pam, openssl, acl }:
 
-stdenv.mkDerivation rec {
-  name = "netatalk-3.1.0";
+stdenv.mkDerivation rec{
+  name = "netatalk-3.1.7";
 
   src = fetchurl {
     url = "mirror://sourceforge/netatalk/netatalk/${name}.tar.bz2";
-    sha256 = "1d8dc8ysslkis4yl1xab1w9p0pz7a1kg0i6fds4wxsp4fhb6wqhq";
+    sha256 = "0wf09fyqzza024qr1s26z5x7rsvh9zb4pv598gw7gm77wjcr6174";
   };
 
-  buildInputs = [ pkgconfig db libgcrypt avahi pam openssl libiconv ];
+  buildInputs = [ pkgconfig db libgcrypt avahi libiconv pam openssl acl ];
+
+  patches = ./omitLocalstatedirCreation.patch;
 
   configureFlags = [
     "--with-bdb=${db}"
     "--with-openssl=${openssl}"
+    "--with-lockfile=/run/lock/netatalk"
+    "--localstatedir=/var/lib"
   ];
 
   enableParallelBuild = true;
 
   meta = {
-    description = "Apple File Protocl Server";
+    description = "Apple Filing Protocol Server";
     homepage = http://netatalk.sourceforge.net/;
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/tools/filesystems/netatalk/omitLocalstatedirCreation.patch b/pkgs/tools/filesystems/netatalk/omitLocalstatedirCreation.patch
new file mode 100644
index 000000000000..d1a9dcb0b3bf
--- /dev/null
+++ b/pkgs/tools/filesystems/netatalk/omitLocalstatedirCreation.patch
@@ -0,0 +1,35 @@
+diff -ur netatalk-3.1.7-old/config/Makefile.in netatalk-3.1.7-new/config/Makefile.in 
+--- netatalk-3.1.7-old/config/Makefile.in	2014-08-29 03:33:35.000000000 -0700
++++ netatalk-3.1.7-new/config/Makefile.in	2015-08-13 20:52:35.000000000 -0700
+@@ -699,7 +699,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-data-local install-dbusserviceDATA
++install-data-am: install-dbusserviceDATA
+ 
+ install-dvi: install-dvi-recursive
+ 
+@@ -754,7 +754,7 @@
+ 	cscopelist cscopelist-recursive ctags ctags-recursive \
+ 	distclean distclean-generic distclean-libtool distclean-tags \
+ 	distdir dvi dvi-am html html-am info info-am install \
+-	install-am install-data install-data-am install-data-local \
++	install-am install-data install-data-am \
+ 	install-dbusserviceDATA install-dvi install-dvi-am \
+ 	install-exec install-exec-am install-html install-html-am \
+ 	install-info install-info-am install-man install-pdf \
+@@ -782,12 +782,6 @@
+ # install configuration files
+ #
+ 
+-install-data-local: install-config-files
+-	mkdir -pm 0755 $(DESTDIR)$(localstatedir)/netatalk/
+-	mkdir -pm 0755 $(DESTDIR)$(localstatedir)/netatalk/CNID/
+-	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(localstatedir)/netatalk/
+-	$(INSTALL_DATA) $(srcdir)/README $(DESTDIR)$(localstatedir)/netatalk/CNID/
+-
+ uninstall-local:
+ 	@for f in $(CONFFILES) $(GENFILES); do \
+ 		echo rm -f $(DESTDIR)$(pkgconfdir)/$$f; \
+

From 2d5d0df8f10cee45cc92176cb13da2d32c05d075 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Wed, 24 Feb 2016 19:47:28 +0100
Subject: [PATCH 1736/2285] kde5.kile: 2016-02-12 -> 2016-02-14

Fixes building (poppler-qt5 could not be found)
---
 pkgs/applications/editors/kile/frameworks.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/kile/frameworks.nix b/pkgs/applications/editors/kile/frameworks.nix
index ff8bc371cf34..422c132b649a 100644
--- a/pkgs/applications/editors/kile/frameworks.nix
+++ b/pkgs/applications/editors/kile/frameworks.nix
@@ -21,12 +21,12 @@
 
 stdenv.mkDerivation rec {
   name = "kile-${version}";
-  version = "2016-02-12";
+  version = "2016-02-14";
 
   src = fetchgit {
     url = git://anongit.kde.org/kile.git;
-    rev = "c586532031872319ae5102fb13ab6de8d80da065";
-    sha256 = "7d5ef8b8c1254a5988a1028e415c9139fbd20a9e6771413c38fa58345a744a7b";
+    rev = "7b238c42580abc936816d4ea0df61d0cbbefecc4";
+    sha256 = "f37d531489a84911b47664697bb3bddc0ba5591854749c17fb0c6b1e71dbc6ee";
 
   };
 

From 8ee44708b21635588cdf7670e389197a9b835f35 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <emery@vfemail.net>
Date: Wed, 24 Feb 2016 20:24:01 +0100
Subject: [PATCH 1737/2285] hdapsd: initial package at version 20141203

---
 pkgs/os-specific/linux/hdapsd/default.nix | 19 +++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  2 ++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/os-specific/linux/hdapsd/default.nix

diff --git a/pkgs/os-specific/linux/hdapsd/default.nix b/pkgs/os-specific/linux/hdapsd/default.nix
new file mode 100644
index 000000000000..9f39cb56bf52
--- /dev/null
+++ b/pkgs/os-specific/linux/hdapsd/default.nix
@@ -0,0 +1,19 @@
+{ stdenv, fetchurl }:
+
+let version = "20141203"; in
+stdenv.mkDerivation rec {
+  name = "ldapsd-"+version;
+
+  src = fetchurl {
+    url = "https://github.com/evgeni/hdapsd/releases/download/${version}/hdapsd-${version}.tar.gz";
+    sha256 = "0ppgrfabd0ivx9hyny3c3rv4rphjyxcdsd5svx5pgfai49mxnl36";
+  };
+
+  meta = with stdenv.lib;
+    { description = "Hard Drive Active Protection System Daemon";
+      hompage = "http://hdaps.sf.net/";
+      license = licenses.gpl2;
+      platforms = platforms.linux;
+      maintainers = [ maintainers.ehmry ];
+    };
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ed02f71e5c7..b2a8876d9d96 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1936,6 +1936,8 @@ let
 
   halibut = callPackage ../tools/typesetting/halibut { };
 
+  hdapsd = callPackage ../os-specific/linux/hdapsd { };
+
   hddtemp = callPackage ../tools/misc/hddtemp { };
 
   hdf5 = callPackage ../tools/misc/hdf5 {

From eb46cd3ab0ffbb5db0953094deb2e4bb0ace2537 Mon Sep 17 00:00:00 2001
From: Igor Sharonov <igor.sharonov@gmail.com>
Date: Tue, 23 Feb 2016 23:03:44 +0300
Subject: [PATCH 1738/2285] pyelftools: init at 0.23

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1a35c4935659..1ea9cd2d2ba9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16265,6 +16265,32 @@ in modules // {
     };
   });
 
+  pyelftools = buildPythonPackage rec {
+    pname = "pyelftools";
+    version = "0.23";
+    name = "${pname}-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/p/${pname}/${name}.tar.gz";
+      sha256 = "1pi1mdzfffgl5qcz0prsa7hlbriycy7mgagi0fdrp3vf17fslmzw";
+    };
+
+    checkPhase = ''
+      ${python.interpreter} test/all_tests.py
+    '';
+    # Tests cannot pass against system-wide readelf
+    # https://github.com/eliben/pyelftools/issues/65
+    doCheck = false;
+
+    meta = {
+      description = "A library for analyzing ELF files and DWARF debugging information";
+      homepage = https://github.com/eliben/pyelftools;
+      license = licenses.publicDomain;
+      platforms = platforms.all;
+      maintainers = maintainers.igsha;
+    };
+  };
+
   pyenchant = buildPythonPackage rec {
     name = "pyenchant-1.6.6";
 

From b16dc8dcc53d1910092d8dc2f30851eef2060c16 Mon Sep 17 00:00:00 2001
From: Emery <emery@v36.space>
Date: Wed, 24 Feb 2016 21:43:38 +0100
Subject: [PATCH 1739/2285] New hdapsd module

---
 nixos/modules/module-list.nix                |  1 +
 nixos/modules/services/monitoring/hdaps.nix  | 22 ++++++++++++++++++++
 pkgs/os-specific/linux/hdapsd/default.nix    |  6 ++++--
 pkgs/os-specific/linux/hdapsd/postInstall.sh |  7 +++++++
 4 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 nixos/modules/services/monitoring/hdaps.nix
 create mode 100644 pkgs/os-specific/linux/hdapsd/postInstall.sh

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 585da96c32e0..c2bcc361c447 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -257,6 +257,7 @@
   ./services/monitoring/dd-agent.nix
   ./services/monitoring/grafana.nix
   ./services/monitoring/graphite.nix
+  ./services/monitoring/hdaps.nix
   ./services/monitoring/heapster.nix
   ./services/monitoring/longview.nix
   ./services/monitoring/monit.nix
diff --git a/nixos/modules/services/monitoring/hdaps.nix b/nixos/modules/services/monitoring/hdaps.nix
new file mode 100644
index 000000000000..be26c44e78d1
--- /dev/null
+++ b/nixos/modules/services/monitoring/hdaps.nix
@@ -0,0 +1,22 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.hdapsd;
+  hdapsd = [ pkgs.hdapsd ];
+in
+{
+  options = {
+    services.hdapsd.enable = mkEnableOption
+      ''
+        Hard Drive Active Protection System Daemon,
+        devices are detected and managed automatically by udev and systemd
+      '';
+  };
+
+  config = mkIf cfg.enable {
+    services.udev.packages = hdapsd;
+    systemd.packages = hdapsd;
+  };
+}
diff --git a/pkgs/os-specific/linux/hdapsd/default.nix b/pkgs/os-specific/linux/hdapsd/default.nix
index 9f39cb56bf52..61c0c7b495df 100644
--- a/pkgs/os-specific/linux/hdapsd/default.nix
+++ b/pkgs/os-specific/linux/hdapsd/default.nix
@@ -2,13 +2,15 @@
 
 let version = "20141203"; in
 stdenv.mkDerivation rec {
-  name = "ldapsd-"+version;
+  name = "hdapsd-"+version;
 
   src = fetchurl {
     url = "https://github.com/evgeni/hdapsd/releases/download/${version}/hdapsd-${version}.tar.gz";
     sha256 = "0ppgrfabd0ivx9hyny3c3rv4rphjyxcdsd5svx5pgfai49mxnl36";
   };
 
+  postInstall = builtins.readFile ./postInstall.sh;
+
   meta = with stdenv.lib;
     { description = "Hard Drive Active Protection System Daemon";
       hompage = "http://hdaps.sf.net/";
@@ -16,4 +18,4 @@ stdenv.mkDerivation rec {
       platforms = platforms.linux;
       maintainers = [ maintainers.ehmry ];
     };
-}
\ No newline at end of file
+}
diff --git a/pkgs/os-specific/linux/hdapsd/postInstall.sh b/pkgs/os-specific/linux/hdapsd/postInstall.sh
new file mode 100644
index 000000000000..37867817bf63
--- /dev/null
+++ b/pkgs/os-specific/linux/hdapsd/postInstall.sh
@@ -0,0 +1,7 @@
+mkdir -p $out/lib/udev/rules.d $out/lib/systemd/system
+cp misc/hdapsd.rules $out/lib/udev/rules.d
+SBIN_REWRITE="s|@sbindir@|$out/bin|g"
+for i in misc/*.service.in
+do sed $SBIN_REWRITE "$i" > "$out/lib/systemd/system/$(basename ${i%.in})"
+done
+

From a5ed58445fb5a4a21f02fad57020ac90e2eb649b Mon Sep 17 00:00:00 2001
From: = <anothersms@gmail.com>
Date: Fri, 19 Feb 2016 18:01:32 +0100
Subject: [PATCH 1740/2285] yarp (+ libace): init at 2.3.64

---
 lib/licenses.nix                              |  5 +++
 .../science/misc/yarp/default.nix             | 26 ++++++++++++++
 pkgs/development/libraries/ace/default.nix    | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 +++
 4 files changed, 71 insertions(+)
 create mode 100644 pkgs/applications/science/misc/yarp/default.nix
 create mode 100644 pkgs/development/libraries/ace/default.nix

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 4703587ed565..64ba63b146a2 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -155,6 +155,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec {
     fullName = "Common Public License 1.0";
   };
 
+  doc = spdx {
+    spdxId = "DOC";
+    fullName = "DOC License";
+  };
+
   efl10 = spdx {
     spdxId = "EFL-1.0";
     fullName = "Eiffel Forum License v1.0";
diff --git a/pkgs/applications/science/misc/yarp/default.nix b/pkgs/applications/science/misc/yarp/default.nix
new file mode 100644
index 000000000000..2daf5a4b5c7d
--- /dev/null
+++ b/pkgs/applications/science/misc/yarp/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, pkgconfig, cmake, ace
+}:
+
+stdenv.mkDerivation rec {
+  name = "yarp-${version}";
+  version = "2.3.64";
+  src = fetchFromGitHub {
+    owner = "robotology";
+    repo = "yarp";
+    rev = "v2.3.64";
+    sha256 = "0x9sdc8d6rppzf1kx53w0yjlnmz7h75qv62yd3ls09w3cy7nb5x7";
+  };
+
+  buildInputs = [ cmake ace ];
+
+  enableParallelBuilding = true;
+
+  meta = {
+    description = "Yet Another Robot Platform";
+    homepage = http://yarp.it;
+    license = stdenv.lib.licenses.lgpl21;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.nico202 ];
+  };
+}
+
diff --git a/pkgs/development/libraries/ace/default.nix b/pkgs/development/libraries/ace/default.nix
new file mode 100644
index 000000000000..10ba217175c3
--- /dev/null
+++ b/pkgs/development/libraries/ace/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, fetchurl, pkgconfig, libtool, perl
+}:
+
+stdenv.mkDerivation rec {
+  name = "ace-${version}";
+  version = "6.3.3";
+  src = fetchurl {
+    url=http://download.dre.vanderbilt.edu/previous_versions/ACE-6.3.3.tar.bz2;
+    sha256 = "124qk205v8rx8p7rfigsargrpxjx3mh4nr99nlyk9csdc9gy8qpk";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ pkgconfig libtool perl ];
+
+  patchPhase = ''substituteInPlace ./MPC/prj_install.pl \
+    --replace /usr/bin/perl "${perl}/bin/perl"'';
+  
+  preConfigure = ''
+    export INSTALL_PREFIX=$out
+    export ACE_ROOT=$(pwd)
+    export LD_LIBRARY_PATH="$ACE_ROOT/ace:$ACE_ROOT/lib"
+    echo '#include "ace/config-linux.h"' > ace/config.h
+    echo 'include $(ACE_ROOT)/include/makeinclude/platform_linux.GNU'\
+    > include/makeinclude/platform_macros.GNU
+  '';
+
+meta = {
+    description = "ADAPTIVE Communication Environment";
+    homepage = http://www.dre.vanderbilt.edu/~schmidt/ACE.html;
+    license = stdenv.lib.licenses.doc;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.nico202 ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 44c42e012a40..07793c2619c4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6889,6 +6889,8 @@ let
 
   glib_networking = callPackage ../development/libraries/glib-networking {};
 
+  ace = callPackage ../development/libraries/ace { };
+
   atk = callPackage ../development/libraries/atk { };
   atkmm = callPackage ../development/libraries/atkmm { };
 
@@ -14138,6 +14140,8 @@ let
 
   pahole = callPackage ../development/tools/misc/pahole {};
 
+  yarp = callPackage ../applications/science/misc/yarp {};
+
   yed = callPackage ../applications/graphics/yed {};
 
   ykpers = callPackage ../applications/misc/ykpers {};

From 55720db388a2c2cf767c2770db7cb6da2806678c Mon Sep 17 00:00:00 2001
From: Ryan Trinkle <ryan.trinkle@gmail.com>
Date: Wed, 24 Feb 2016 16:27:03 -0500
Subject: [PATCH 1741/2285] ghcjs: Make ghcjs-boot source code overridable

---
 pkgs/development/compilers/ghcjs/default.nix    | 11 ++++++++++-
 pkgs/development/compilers/ghcjs/ghcjs-boot.nix | 12 +-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 722c3eab10ae..808768f74b86 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -38,7 +38,16 @@
 , coreutils
 , libiconv
 
-, ghcjsBoot ? import ./ghcjs-boot.nix { inherit fetchgit runCommand; }
+, ghcjsBootSrc ? fetchgit {
+    url = git://github.com/ghcjs/ghcjs-boot.git;
+    rev = "97dea5c4145bf80a1e7cffeb1ecd4d0ecacd5a2f";
+    sha256 = "1cgjzm595l2dx6fibzbkyv23bp1857qia0hb9d8aghf006al558j";
+    fetchSubmodules = true;
+  }
+, ghcjsBoot ? import ./ghcjs-boot.nix {
+    inherit runCommand;
+    src = ghcjsBootSrc;
+  }
 , shims ? import ./shims.nix { inherit fetchFromGitHub; }
 }:
 let
diff --git a/pkgs/development/compilers/ghcjs/ghcjs-boot.nix b/pkgs/development/compilers/ghcjs/ghcjs-boot.nix
index add39a35242b..c00e13a92404 100644
--- a/pkgs/development/compilers/ghcjs/ghcjs-boot.nix
+++ b/pkgs/development/compilers/ghcjs/ghcjs-boot.nix
@@ -1,14 +1,4 @@
-{ runCommand, fetchgit }:
-
-let
-  src = fetchgit {
-    url = git://github.com/ghcjs/ghcjs-boot.git;
-    rev = "97dea5c4145bf80a1e7cffeb1ecd4d0ecacd5a2f";
-    sha256 = "1cgjzm595l2dx6fibzbkyv23bp1857qia0hb9d8aghf006al558j";
-    fetchSubmodules = true;
-  };
-
-in
+{ runCommand, src }:
 
 # we remove the patches so ghcjs-boot doesn't try to apply them again.
 runCommand "${src.name}-patched" {} ''

From b6ff8f9314359df78a7e846dec3cb0319983d0f9 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Wed, 24 Feb 2016 13:32:58 -0800
Subject: [PATCH 1742/2285] disable darwin-arch.patch on openssl >= 1.0.2

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

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 6300068f09fe..db17e0cd73ae 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -21,7 +21,7 @@ let
     patches =
       [ ./use-etc-ssl-certs.patch ]
       ++ optional stdenv.isCygwin ./1.0.1-cygwin64.patch
-      ++ optional (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem")) ./darwin-arch.patch;
+      ++ optional (stdenv.lib.versionOlder version "1.0.2" && (stdenv.isDarwin || (stdenv ? cross && stdenv.cross.libc == "libSystem"))) ./darwin-arch.patch;
 
     nativeBuildInputs = [ perl ];
     buildInputs = stdenv.lib.optional withCryptodev cryptodevHeaders;

From bd9f128cc2a150a53ff3b63eba485f940d02d61a Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Wed, 24 Feb 2016 13:33:07 -0800
Subject: [PATCH 1743/2285] add darwin.libiconv to ghcjs packages

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

diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index ac7a30d4cfb0..5c14fe788f7a 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -19,8 +19,12 @@ self: super:
     postPatch = ''
       ${pkgs.autoconf}/bin/autoreconf --install --force --verbose
     '';
+    buildTools = pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.libiconv;
   });
 
+  network = addBuildTools super.network (pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.libiconv);
+  zlib = addBuildTools super.zlib (pkgs.lib.optional pkgs.stdenv.isDarwin pkgs.darwin.libiconv);
+
   # LLVM is not supported on this GHC; use the latest one.
   inherit (pkgs) llvmPackages;
 

From 1fb998f6c69aa2fcbd412fae2e83b26fa7bf4b23 Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Wed, 24 Feb 2016 22:47:21 +0100
Subject: [PATCH 1744/2285] calc: init at 2.12.5.3

---
 .../science/math/calc/default.nix             | 45 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/applications/science/math/calc/default.nix

diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix
new file mode 100644
index 000000000000..8673d7debd9d
--- /dev/null
+++ b/pkgs/applications/science/math/calc/default.nix
@@ -0,0 +1,45 @@
+{ stdenv, fetchurl, makeWrapper, glibc, readline, ncurses, groff, utillinux }:
+
+with stdenv.lib;
+let
+  makeFlags = ''
+    INCDIR=${glibc}/include \
+    BINDIR=$out/bin LIBDIR=$out/lib CALC_INCDIR=$out/include/calc CALC_SHAREDIR=$out/share/calc MANDIR=$out/share/man/man1 \
+    USE_READLINE=-DUSE_READLINE READLINE_LIB=-lreadline READLINE_EXTRAS='-lhistory -lncurses' \
+    TERMCONTROL=-DUSE_TERMIOS \
+    NROFF=groff
+  '';
+in
+stdenv.mkDerivation rec {
+
+  name = "calc-${version}";
+  version = "2.12.5.3";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/calc/${name}.tar.bz2";
+    sha256 = "14mnz6smhi3a0rgmwvddk9w3vdisi8khq67i8nqsl47vgs8n1kqg";
+  };
+
+  buildInputs = [ makeWrapper readline ncurses groff utillinux ];
+
+  configurePhase = ''
+    sed -i 's/all: check_include/all:/' Makefile
+  '';
+
+  buildPhase = ''
+    make ${makeFlags}
+  '';
+
+  installPhase = ''
+    make install ${makeFlags}
+    wrapProgram $out/bin/calc --prefix LD_LIBRARY_PATH : $out/lib
+  '';
+
+  meta = {
+    description = "C-style arbitrary precision calculator";
+    homepage = http://www.isthe.com/chongo/tech/comp/calc/;
+    license = licenses.lgpl21;
+    maintainers = [ ];
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b2a8876d9d96..f8ceea6ea121 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15525,6 +15525,8 @@ let
 
   pari = callPackage ../applications/science/math/pari {};
 
+  calc = callPackage ../applications/science/math/calc { };
+
   pcalc = callPackage ../applications/science/math/pcalc { };
 
   pspp = callPackage ../applications/science/math/pssp {

From a2d1cbd019d17728d57325198f8a1a0f2d890c5c Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Fri, 22 Jan 2016 04:45:27 -0600
Subject: [PATCH 1745/2285] nixpkgs: bittorrentSync20 2.2.7 -> 2.3.0

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/networking/bittorrentsync/2.0.x.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/bittorrentsync/2.0.x.nix b/pkgs/applications/networking/bittorrentsync/2.0.x.nix
index 1ae3041b4da9..8ecfb476a189 100644
--- a/pkgs/applications/networking/bittorrentsync/2.0.x.nix
+++ b/pkgs/applications/networking/bittorrentsync/2.0.x.nix
@@ -5,15 +5,15 @@ let
     else if stdenv.system == "i686-linux" then "i386"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
-  sha256 = if stdenv.system == "x86_64-linux" then "1ldhi0ydpxdbpd0ak5c3zv93wif5sqsgfj4ggav2b0djm76al2gb"
-    else if stdenv.system == "i686-linux" then "1fhki13isw3g7785b5jdl4warayg94ihah6wsr5h9gljjjghgi1c"
+  sha256 = if stdenv.system == "x86_64-linux" then "1fzwqi3vjv5shmw02pz2lgdi6b138vj042hn92szc49c9wd1vdgq"
+    else if stdenv.system == "i686-linux" then "1x47jc5i37r0cwrrgi5ylfb14zwj7qyf1xhgl7g724bm1cgdc00n"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
   libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
 in
 stdenv.mkDerivation rec {
   name = "btsync-${version}";
-  version = "2.2.7";
+  version = "2.3.0";
 
   src  = fetchurl {
     url  = "https://download-cdn.getsyncapp.com/${version}/linux-${arch}/BitTorrent-Sync_${arch}.tar.gz";

From 4da1711988df18a5544a945b2e8aaab4835cfe04 Mon Sep 17 00:00:00 2001
From: Austin Seipp <aseipp@pobox.com>
Date: Wed, 24 Feb 2016 22:28:16 -0600
Subject: [PATCH 1746/2285] nixpkgs: bittorrentSync20 2.3.0 -> 2.3.3

Signed-off-by: Austin Seipp <aseipp@pobox.com>
---
 pkgs/applications/networking/bittorrentsync/2.0.x.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/bittorrentsync/2.0.x.nix b/pkgs/applications/networking/bittorrentsync/2.0.x.nix
index 8ecfb476a189..4f9c7ebf3332 100644
--- a/pkgs/applications/networking/bittorrentsync/2.0.x.nix
+++ b/pkgs/applications/networking/bittorrentsync/2.0.x.nix
@@ -5,15 +5,15 @@ let
     else if stdenv.system == "i686-linux" then "i386"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
-  sha256 = if stdenv.system == "x86_64-linux" then "1fzwqi3vjv5shmw02pz2lgdi6b138vj042hn92szc49c9wd1vdgq"
-    else if stdenv.system == "i686-linux" then "1x47jc5i37r0cwrrgi5ylfb14zwj7qyf1xhgl7g724bm1cgdc00n"
+  sha256 = if stdenv.system == "x86_64-linux" then "0l6z2fyd7i3i3cr95gkihbf6fwa7mk1b2m1jpf2nq5ispg0qf74n"
+    else if stdenv.system == "i686-linux" then "06x8f75dh58saqrz2k2xgcilh27v0jmql4k4rs7g361aad9v3pnr"
     else throw "Bittorrent Sync for: ${stdenv.system} not supported!";
 
   libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ];
 in
 stdenv.mkDerivation rec {
   name = "btsync-${version}";
-  version = "2.3.0";
+  version = "2.3.3";
 
   src  = fetchurl {
     url  = "https://download-cdn.getsyncapp.com/${version}/linux-${arch}/BitTorrent-Sync_${arch}.tar.gz";

From 06ee2eb7b6b7ad72c0d8ff1ee65d6c3a450d4592 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 25 Feb 2016 07:58:05 +0100
Subject: [PATCH 1747/2285] pyelftools: fix meta evaluation

---
 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 1ea9cd2d2ba9..ffcd6c4229d3 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16287,7 +16287,7 @@ in modules // {
       homepage = https://github.com/eliben/pyelftools;
       license = licenses.publicDomain;
       platforms = platforms.all;
-      maintainers = maintainers.igsha;
+      maintainers = [ maintainers.igsha ];
     };
   };
 

From e053971d81498526d0cdfdfdc0f03fc6d6050142 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 25 Feb 2016 08:29:57 +0100
Subject: [PATCH 1748/2285] tarball: fix the job

Find-tarballs was failing on some `requireFile` that was fixed-output
but didn't specify `outputHashMode`. Apparently, nix is fine with that
and uses the "flat" default, although that's undocumented.
---
 maintainers/scripts/find-tarballs.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/maintainers/scripts/find-tarballs.nix b/maintainers/scripts/find-tarballs.nix
index e989c0e2a9e4..006594596602 100644
--- a/maintainers/scripts/find-tarballs.nix
+++ b/maintainers/scripts/find-tarballs.nix
@@ -18,7 +18,8 @@ let
 
   fetchurlDependencies =
     filter
-      (drv: drv.outputHash or "" != "" && drv.outputHashMode == "flat" && drv.postFetch or "" == "" && drv ? urls)
+      (drv: drv.outputHash or "" != "" && drv.outputHashMode or "flat" == "flat"
+          && drv.postFetch or "" == "" && drv ? urls)
       dependencies;
 
   dependencies = map (x: x.value) (genericClosure {

From eead3bc5365522720e0162b403895497c8817cd6 Mon Sep 17 00:00:00 2001
From: Kevin Cox <kevincox@kevincox.ca>
Date: Fri, 12 Feb 2016 08:26:46 -0500
Subject: [PATCH 1749/2285] util-linux: create -Minimal and utillinux (full)

Close #12952. Now the full version is used by default,
supporting systemd and curses.
---
 pkgs/desktops/e19/efl.nix                     |  4 ++--
 pkgs/os-specific/linux/systemd/default.nix    | 12 ++++++------
 pkgs/os-specific/linux/util-linux/default.nix |  9 ++++++++-
 pkgs/top-level/all-packages.nix               | 15 +++++++--------
 pkgs/top-level/release-small.nix              |  2 +-
 5 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix
index aa662f1ed873..853bee31cc8e 100644
--- a/pkgs/desktops/e19/efl.nix
+++ b/pkgs/desktops/e19/efl.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, libwebp, curl, libinput }:
+{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio, libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, libwebp, curl, libinput }:
 
 
 stdenv.mkDerivation rec {
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa
     giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base
     gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto
-    xorg.libX11 udev utillinuxCurses ];
+    xorg.libX11 udev utillinux ];
 
   propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xorg.libXcomposite
     xorg.libXdamage xorg.libXinerama xorg.libXp xorg.libXtst xorg.libXi xorg.libXext
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index ec5a85ef4ada..cb1521a4005e 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchFromGitHub, pkgconfig, intltool, gperf, libcap, dbus, kmod
-, xz, pam, acl, cryptsetup, libuuid, m4, utillinux
+, xz, pam, acl, cryptsetup, libuuid, m4, utillinuxMinimal
 , glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libapparmor, audit, lz4
 , kexectools, libmicrohttpd, linuxHeaders, libseccomp
 , autoreconfHook, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45
@@ -75,13 +75,13 @@ stdenv.mkDerivation rec {
         test -e $i
         substituteInPlace $i \
           --replace /usr/bin/getent ${stdenv.glibc}/bin/getent \
-          --replace /bin/mount ${utillinux}/bin/mount \
-          --replace /bin/umount ${utillinux}/bin/umount \
-          --replace /sbin/swapon ${utillinux}/sbin/swapon \
-          --replace /sbin/swapoff ${utillinux}/sbin/swapoff \
+          --replace /bin/mount ${utillinuxMinimal}/bin/mount \
+          --replace /bin/umount ${utillinuxMinimal}/bin/umount \
+          --replace /sbin/swapon ${utillinuxMinimal}/sbin/swapon \
+          --replace /sbin/swapoff ${utillinuxMinimal}/sbin/swapoff \
           --replace /bin/echo ${coreutils}/bin/echo \
           --replace /bin/cat ${coreutils}/bin/cat \
-          --replace /sbin/sulogin ${utillinux}/sbin/sulogin \
+          --replace /sbin/sulogin ${utillinuxMinimal}/sbin/sulogin \
           --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck
       done
 
diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix
index bcd9aa58bccf..a84740b1a30b 100644
--- a/pkgs/os-specific/linux/util-linux/default.nix
+++ b/pkgs/os-specific/linux/util-linux/default.nix
@@ -1,4 +1,6 @@
-{ stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }:
+{ stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam, systemd ? null
+, pkgconfig
+}:
 
 stdenv.mkDerivation rec {
   name = "util-linux-2.27.1";
@@ -38,11 +40,16 @@ stdenv.mkDerivation rec {
     --disable-use-tty-group
     --enable-fs-paths-default=/var/setuid-wrappers:/var/run/current-system/sw/bin:/sbin
     ${if ncurses == null then "--without-ncurses" else ""}
+    ${if systemd == null then "" else ''
+      --with-systemd
+      --with-systemdsystemunitdir=$out/lib/systemd/system/
+    ''}
   '';
 
   buildInputs =
     [ zlib pam ]
     ++ stdenv.lib.optional (ncurses != null) ncurses
+    ++ stdenv.lib.optional (systemd != null) [ systemd pkgconfig ]
     ++ stdenv.lib.optional (perl != null) perl;
 
   postInstall = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f6125fbdfd86..9563feeb2924 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10021,8 +10021,8 @@ let
 
   libuuid =
     if crossSystem != null && crossSystem.config == "i586-pc-gnu"
-    then (utillinux // {
-      crossDrv = lib.overrideDerivation utillinux.crossDrv (args: {
+    then (utillinuxMinimal // {
+      crossDrv = lib.overrideDerivation utillinuxMinimal.crossDrv (args: {
         # `libblkid' fails to build on GNU/Hurd.
         configureFlags = args.configureFlags
           + " --disable-libblkid --disable-mount --disable-libmount"
@@ -10035,7 +10035,7 @@ let
       });
     })
     else if stdenv.isLinux
-    then utillinux
+    then utillinuxMinimal
     else null;
 
   light = callPackage ../os-specific/linux/light { };
@@ -10809,13 +10809,12 @@ let
 
   usermount = callPackage ../os-specific/linux/usermount { };
 
-  utillinux = callPackage ../os-specific/linux/util-linux {
+  utillinux = callPackage ../os-specific/linux/util-linux { };
+
+  utillinuxMinimal = appendToName "minimal" (utillinux.override {
     ncurses = null;
     perl = null;
-  };
-
-  utillinuxCurses = appendToName "curses" (utillinux.override {
-    inherit ncurses perl;
+    systemd = null;
   });
 
   v4l_utils = callPackage ../os-specific/linux/v4l-utils {
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index fc428a73743b..017865919739 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -169,7 +169,7 @@ with import ./release-lib.nix { inherit supportedSystems; };
   upstart = linux;
   usbutils = linux;
   utillinux = linux;
-  utillinuxCurses = linux;
+  utillinuxMinimal = linux;
   w3m = all;
   webkit = linux;
   wget = all;

From 21917bc8e23f5dd8b237b261523aebd665276926 Mon Sep 17 00:00:00 2001
From: Allan Espinosa <allan.espinosa@outlook.com>
Date: Thu, 25 Feb 2016 02:16:35 -0600
Subject: [PATCH 1750/2285] jenkins: 1.649 -> 1.650

---
 .../tools/continuous-integration/jenkins/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix
index c2473ce754c3..f416345028f9 100644
--- a/pkgs/development/tools/continuous-integration/jenkins/default.nix
+++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "jenkins-${version}";
-  version = "1.649";
+  version = "1.650";
 
   src = fetchurl {
     url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war";
-    sha256 = "10lvrdd6mfgkz0rdc41hg9fai44vzxy6qlayfvkjg29xgqm0n9ya";
+    sha256 = "0iypkyjcsfj36j683a6yis4q0wil6m8l065fx8v2p7ba4j2ql00n";
   };
   meta = with stdenv.lib; {
     description = "An extendable open source continuous integration server";

From f930b3949f0eb85930497b9238ad1afe86cf06a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 25 Feb 2016 09:57:51 +0100
Subject: [PATCH 1751/2285] kde4: use older ruby to fix qtruby build

/cc maintainer @ttuegel. Discussion:
https://github.com/NixOS/nixpkgs/pull/12610#issuecomment-188666473

I'm personally not certain that building bindings against a non-default
ruby version is a good thing, but it's likely better than a build failure.
---
 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 b2a8876d9d96..c8390ee8fb5f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14845,6 +14845,7 @@ let
           perlBindings = true;
           pythonBindings = true;
         };
+        ruby = ruby_2_2; # see https://github.com/NixOS/nixpkgs/pull/12610#issuecomment-188666473
       }
       ../desktops/kde-4.14;
 

From d2d0f19b57e4a7abb9d88556f04a526473404aaf Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Thu, 25 Feb 2016 12:17:06 +0300
Subject: [PATCH 1752/2285] vimPlugins: update 2016-02-25

---
 pkgs/misc/vim-plugins/default.nix             | 453 +++++++++---------
 pkgs/misc/vim-plugins/vim-plugin-names        |   2 +-
 .../vim2nix/additional-nix-code/racer         |   4 -
 3 files changed, 226 insertions(+), 233 deletions(-)
 delete mode 100644 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/racer

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 84386efeb3af..6c9f8d665e15 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -101,7 +101,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/godlygeek/csapprox";
       rev = "7981dac51d8b6776985aa08cb7b5ee98ea7f2ddd";
-      sha256 = "8ccb47eb79c7ab63109d32158388812bdca340985527af4f2a5489ff8683389f";
+      sha256 = "17rqhf3gz2al597sy9smk10a7p1bh648659jkl867ay7g7mlgjwc";
     };
     dependencies = [];
 
@@ -112,7 +112,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/chrisbra/CheckAttach";
       rev = "a1d86be7e69b25b41ce1a7fe2d2844330f783b68";
-      sha256 = "b8921c826f5a122e9b128301c620b8b3d3fd88a15a2b0634fdea01062fba2c1f";
+      sha256 = "07rcp8phc0gazls0cassl64gvlxkp0hcc0c32adjw4jsdy11r4mq";
     };
     dependencies = [];
 
@@ -123,7 +123,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/mattn/gist-vim";
       rev = "88c331e2e07765090112a396e5e119b39b5aa754";
-      sha256 = "0da7e356b4a50921c1a67edcf066785ed637750094f42ac1bc61ae82a2f7f9c5";
+      sha256 = "1igryyi85bk1pk0jmx4l01skgmjyg1kg1p3ylv0j22d5nibf79qd";
     };
     dependencies = [];
 
@@ -134,7 +134,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/Twinside/vim-hoogle";
       rev = "a5db36f048ac16ab9774fc86f36cd4ae9a444932";
-      sha256 = "31cb37f9fa38e15a52bc35c050e173afc2af5fe8b3d6e5f2026cd5a89bb1a5a0";
+      sha256 = "1855n6dsimbc0brfbmmkx1gszhmgfghm1h1mpi95mq9qzbwkgjri";
     };
     dependencies = [];
 
@@ -145,7 +145,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/altercation/vim-colors-solarized";
       rev = "528a59f26d12278698bb946f8fb82a63711eec21";
-      sha256 = "a1b2ef696eee94dafa76431c31ee260acdd13a7cf87939f27eca431d5aa5a315";
+      sha256 = "05d3lmd1shyagvr3jygqghxd3k8a4vp32723fvxdm57fdrlyzcm1";
     };
     dependencies = [];
 
@@ -156,18 +156,18 @@ rec {
     src = fetchgit {
       url = "git://github.com/ervandew/supertab";
       rev = "66511772a430a5eaad7f7d03dbb02e8f33c4a641";
-      sha256 = "fd49314e9f3ca3262e40b67f05311de94f50d03c946fc53e25b3bd61e33eb418";
+      sha256 = "065l7vin3gdk4lzcavwl7k850kz93lqhazxn80p2d8rwkx732jgx";
     };
     dependencies = [];
 
   };
 
   Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "Syntastic-2016-01-18";
+    name = "Syntastic-2016-02-20";
     src = fetchgit {
       url = "git://github.com/scrooloose/syntastic";
-      rev = "d1a179d750bd1d136d7f38e69f2c5b8439886de7";
-      sha256 = "e2cfa0fa27b0249b1e5d783883f4c72a13a167a869218d73ae1b2cad631c3a28";
+      rev = "8f97e64c78e9ade6cf09fc5d5446f5d2a8deaa35";
+      sha256 = "1xxmcr5r0cf2nyp2c2dfxm38x4c19dmax1g2m4clnys5dak7lsdd";
     };
     dependencies = [];
 
@@ -178,7 +178,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/godlygeek/tabular";
       rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb";
-      sha256 = "28c860ad621587f2c3213fae47d1a3997746527c17d51e9ab94c209eb7bfeb0f";
+      sha256 = "03zbpyvrw82cp6d1xm8pgi94cxwrlg8lgbiz471z51qmcann1j18";
     };
     dependencies = [];
 
@@ -189,7 +189,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/majutsushi/tagbar";
       rev = "7b36c46d17d57db34fdb0adac9ba6382d0bb5e66";
-      sha256 = "346773e772772d1c68318effd8e6c8c8b36f61cfd9c72a85c0bfcec9843f13c7";
+      sha256 = "1iqk7y2ckkmzq22jmiyrrxhnzcy8r3kdizwf65l1qbbpfbkp6rrl";
     };
     dependencies = [];
 
@@ -200,7 +200,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdcommenter";
       rev = "1f4bfd59920c101a30a74a07b824608a6e65f3fe";
-      sha256 = "4ef10aafc54bcb3e119cac7f4b0065d8dc09d43d92dc069a499e96e935afb83d";
+      sha256 = "0gdqmwsyk5ly96d0dp4j7pa0kp6qcl04nzxckh8kxjsbqnphmwaf";
     };
     dependencies = [];
 
@@ -211,18 +211,18 @@ rec {
     src = fetchgit {
       url = "git://github.com/scrooloose/nerdtree";
       rev = "4ebbb533c3faf2c480211db2b547972bb3b60f2b";
-      sha256 = "f730aa7347d6e710451514137985265338f8f60c4ab7f98e2a0eed65071e08ed";
+      sha256 = "1v883q3nbv8f5a7gkdsa1kvghf2k4s2pj4ql2m2i1ryn8xrslc7p";
     };
     dependencies = [];
 
   };
 
   UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "UltiSnips-2016-01-20";
+    name = "UltiSnips-2016-02-13";
     src = fetchgit {
       url = "git://github.com/SirVer/ultisnips";
-      rev = "3f2c591c3b547e7d7b80d15897ac7a9e3bf85ec8";
-      sha256 = "6644e8603202adc1ade58a972164e5e6470248ca1d2c40cd949b8f35e67b8019";
+      rev = "25882e95cd8981308c4b2d87dcc2c2d6ecd73a6d";
+      sha256 = "0bz1qywavysyqb2ni7s9k96pfwdldvhfz79xp5qcw352d1ii7s9n";
     };
     dependencies = [];
 
@@ -233,18 +233,18 @@ rec {
     src = fetchgit {
       url = "git://github.com/vimoutliner/vimoutliner";
       rev = "cb41cfd6d636e1243e7e9c46b35fc5cb50588069";
-      sha256 = "6faf7e34f4793b2445dd9c3facbf19cd6c1c9ab39b83dfb3d89626314ef1850f";
+      sha256 = "03w5y57329lnv2rxz0wvnfd1qv6d36zsqgwwvm2j8fvryhs7xbvg";
     };
     dependencies = [];
 
   };
 
   WebAPI = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "WebAPI-2015-10-05";
+    name = "WebAPI-2016-01-25";
     src = fetchgit {
       url = "git://github.com/mattn/webapi-vim";
-      rev = "dfc60635e610f9200646a84d11887af9e3d50b10";
-      sha256 = "7bc85fe344854e02377f4ac931a015ef1ffd6de14f1d0d8fca04785beabe584b";
+      rev = "5726e8270e2a774c7200ca79868b4128c0c57ad7";
+      sha256 = "0gfzhny2i6jwkcw5ayhinq0ia3jb086h7bvmxy55lgr0a7ykhvh1";
     };
     dependencies = [];
 
@@ -267,11 +267,11 @@ rec {
   };
 
   commentary = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "commentary-2015-09-12";
+    name = "commentary-2016-02-15";
     src = fetchgit {
       url = "git://github.com/tpope/vim-commentary";
-      rev = "e0f4850d78137a35b9461c530078bd77f39e4dce";
-      sha256 = "64896579a5c682e7da2cce7292cba16c4186a42ff68d0e92143fa7345d28cf0d";
+      rev = "4dcfc318e0b02fdbb0c2d9ff77cf3562b46eea25";
+      sha256 = "1l5krnkx7bx3xry0nj0amwgg6bhqw8ir0jzj75ibvklkg5lmqbxl";
     };
     dependencies = [];
 
@@ -282,7 +282,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/FelikZ/ctrlp-py-matcher";
       rev = "8a803267a741cff3d6147650745f83c8f2125578";
-      sha256 = "27fc887bdad36bd33a0e8645465e287c20158533408b241f46141528313baa34";
+      sha256 = "0d5a7cqjh58l8qgj92s06f2ia83w51g4cic61qxd6sykv9xqiz17";
     };
     dependencies = [];
 
@@ -293,7 +293,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/amiorin/ctrlp-z";
       rev = "d1a69ec623ce24b9a30fc8fe3cd468c322b03026";
-      sha256 = "d40ba49edba53805779706633ec3ee0056dd88835cc6b2e88fbe628a5e90da9a";
+      sha256 = "16nsj1g8lqmyizlb5ijwhf4dsmh0xv1kwqq6jxvhaf55vfga82yl";
     };
     dependencies = [];
 
@@ -304,29 +304,29 @@ rec {
     src = fetchgit {
       url = "git://github.com/int3/vim-extradite";
       rev = "52326f6d333cdbb9e9c6d6772af87f4f39c00526";
-      sha256 = "91f744ee73faad92adb67a698b58a14cfa0fbb65f6d483a96a1c5b139ee1cdf1";
+      sha256 = "1wfdw6g16nqwdalq7m7ncnxhzyjcl5c8nsbsnsnr5bgsfgp49xwi";
     };
     dependencies = [];
 
   };
 
   fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "fugitive-2016-01-08";
+    name = "fugitive-2016-02-24";
     src = fetchgit {
       url = "git://github.com/tpope/vim-fugitive";
-      rev = "fd36aa9c61e06d71befdbe8931f97137c489b065";
-      sha256 = "ef87be5ad469368f11185db32a8acc14ac08f1b151d0c58492042b0a9314c87e";
+      rev = "008b9570860f552534109b4f618cf2ddd145eeb4";
+      sha256 = "0nj6airs00q3f1ly29k0nk3ypznzsylqm8n0wakllg86qic4xjlr";
     };
     dependencies = [];
 
   };
 
   ghcmod = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "ghcmod-2016-01-20";
+    name = "ghcmod-2016-01-25";
     src = fetchgit {
       url = "git://github.com/eagletmt/ghcmod-vim";
-      rev = "a7c76b979918889fa6de02a3f712925931f62cb8";
-      sha256 = "2ad76948c97e9141eca81423a8d27d092e0f5c62818c66f08679d9cae70268f6";
+      rev = "815616e8b7d64677d6092e95bc6a3e83d2e035d4";
+      sha256 = "1s0wxccmxi0w7ywhwyxggv5n8lcjgh68rhbpp2zrv5n5sg0das73";
     };
     dependencies = [];
 
@@ -337,7 +337,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/LnL7/vim-nix";
       rev = "f0b7bd4bce5ed0f12fb4d26115c84fb3edcd1e12";
-      sha256 = "52dbdd4d5bc12988eb62d9022109dbd8b1c5716c27753ce187db6c2fb6737664";
+      sha256 = "0r3nffv2yv6vhzhkqx97diqwbcfqvc4j20nrcbmqhaf1bd6xvnsj";
     };
     dependencies = [];
 
@@ -348,18 +348,18 @@ rec {
     src = fetchgit {
       url = "git://github.com/ap/vim-css-color";
       rev = "7ad79c7b77bd83296d7a10e596860d9269070207";
-      sha256 = "bd6ad1ddad9d520c018083bab8eb53575f99572f3e079abad452db0bf8871708";
+      sha256 = "020phzw0pnsjsjx9l1ry5xbrjpspagmvifl3h00hqllxmpfx2smx";
     };
     dependencies = [];
 
   };
 
   neomake = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neomake-2016-01-21";
+    name = "neomake-2016-02-20";
     src = fetchgit {
       url = "git://github.com/benekastah/neomake";
-      rev = "e0fa23401c1231bd942779c79c5c71d08f28e440";
-      sha256 = "0d0536188127538cacedda77a81e0749d6207fa882ca1f34f36852d009aa73f9";
+      rev = "645c433b73f527badaac5e315f1ea16e7d34ef99";
+      sha256 = "0vprly61xhl7pqqp8nfr8vanl6ddq7kf5asqz4kpfdpgnbdxrdlc";
     };
     dependencies = [];
 
@@ -370,7 +370,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/bitc/vim-hdevtools";
       rev = "474947c52ff9c93dd36f3c49de90bd9a78f0baa1";
-      sha256 = "bf5f096b665c51ce611c6c1bfddc3267c4b2f94af84b04482b07272a6a5a92f3";
+      sha256 = "1wwjb9m2l9q75d408jzq9bwv5i376bfgs6vc3ihwwlawcrmhjpxz";
     };
     dependencies = [];
 
@@ -381,7 +381,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/christoomey/vim-tmux-navigator";
       rev = "1298b71c420f1d0abceba3f35cc710131f84d73b";
-      sha256 = "bde962fe1441cd6f030d9704e6e71117fb43d827b8952d3e1d44009c297b4eb5";
+      sha256 = "1dafgclrq0243lz2v5dq4zc47yqp27kyc14p1l1nzka12kz65sdx";
     };
     dependencies = [];
 
@@ -392,29 +392,29 @@ rec {
     src = fetchgit {
       url = "git://github.com/ctrlpvim/ctrlp.vim";
       rev = "7f74368d85bb521951dd58123349ce66b947d058";
-      sha256 = "fecd1137845ccfe72a1d2e3e1660f8e2264dc46cc34dfa9f1037f14f84115f33";
+      sha256 = "0csz2624zw9p22gzlkf3dk24s9p2z1h1cgif3lmfgkswhhvi3kgy";
     };
     dependencies = [];
 
   };
 
   vim-jade = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-jade-2016-01-21";
+    name = "vim-jade-2016-02-11";
     src = fetchgit {
       url = "git://github.com/digitaltoad/vim-jade";
-      rev = "319cba1ee5313e8b50fd912d10dfe40a171f0312";
-      sha256 = "280ef32d862793b42685aba4802f919928b52b93328d0cef35584a83baf884d0";
+      rev = "0a7ec2edaa3f7fbe353f8fd5bf06d3c043d70c81";
+      sha256 = "0qlwbywnx6sl2xacdialpmg1d2wmjkdsdklz97k8086glkairs10";
     };
     dependencies = [];
 
   };
 
   neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neco-ghc-2016-01-20";
+    name = "neco-ghc-2016-02-13";
     src = fetchgit {
       url = "git://github.com/eagletmt/neco-ghc";
-      rev = "26515b4219c04448d37d6cb4a3c54f2d3080b056";
-      sha256 = "265ee24be8f9bf6d067213a751fd54ddcb53570831e7520af41c3eb7f5184fcd";
+      rev = "a7b3dc018dff0cbe033c4c3939e1bd777f023083";
+      sha256 = "0f48y8fnh9wp1iyq8w7sqzsw3vqm348vqs4p81nwnmwnhgpzxfri";
     };
     dependencies = [];
 
@@ -425,18 +425,18 @@ rec {
     src = fetchgit {
       url = "git://github.com/esneider/YUNOcommit.vim";
       rev = "981082055a73ef076d7e27477874d2303153a448";
-      sha256 = "4bfd80720c353884e5c373b5457397a63e5e2e4ab4a97d6ce86c1740ac3b4c56";
+      sha256 = "0mjc7fn405vcx1n7vadl98p5wgm6jxrlbdbkqgjq8f1m1ir81zab";
     };
     dependencies = [];
 
   };
 
   vim-go = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-go-2016-01-22";
+    name = "vim-go-2016-02-25";
     src = fetchgit {
       url = "git://github.com/fatih/vim-go";
-      rev = "1beac4aadccb921b3cb264a8e254b75c8a326c21";
-      sha256 = "02e92ab38a667c0355a4e5c48e1fc53a7ad416208e9151ff4a9cbd7d477c0fc6";
+      rev = "c264aec72eac21f868fdfff2aef67b9ca21aab74";
+      sha256 = "1yld56l4bl17r9s1rn72fqfkrjpm96n4wx3qv9hk5vd0yn0nw7y1";
     };
     dependencies = [];
 
@@ -447,18 +447,18 @@ rec {
     src = fetchgit {
       url = "git://github.com/flazz/vim-colorschemes";
       rev = "28a989b28457e38df620e4c7ab23e224aff70efe";
-      sha256 = "5308c874a34dc03256ece2e54ab7b92c8384ebb4137436582fd4aa6c38ad36e5";
+      sha256 = "1r9nmlw6ranl5xc3cx0knkmq90rcp6vlmrg2xib35h2dldsch22k";
     };
     dependencies = [];
 
   };
 
   idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "idris-vim-2016-01-14";
+    name = "idris-vim-2016-01-29";
     src = fetchgit {
       url = "git://github.com/idris-hackers/idris-vim";
-      rev = "09772ea37a83f8633890fc5cd9221bcf6e22c157";
-      sha256 = "28eab2793950781a416e76657dfdcb58601c31ffafb336e3beb9790eef6a268d";
+      rev = "e1711749f5078f5a9fa53cd15a37627ea9d239f2";
+      sha256 = "0mbywk1mwbx3hjzrv7ypp5m800xjj08hxlfmd0piljg41xwkgk5q";
     };
     dependencies = [];
 
@@ -469,18 +469,18 @@ rec {
     src = fetchgit {
       url = "git://github.com/itchyny/calendar.vim";
       rev = "2a6c13ee8056fe5b82ce6529f426ed63096dc6bc";
-      sha256 = "8228b6e97c42254eb8e8e35e391f24a7fc2f55753af913fe1605b9ade0ff9d98";
+      sha256 = "164xzzhavf852vz17y9sfmajzz574hgkjpp3x2w4w9a2gklvca42";
     };
     dependencies = [];
 
   };
 
   thumbnail-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "thumbnail-vim-2016-01-14";
+    name = "thumbnail-vim-2016-02-16";
     src = fetchgit {
       url = "git://github.com/itchyny/thumbnail.vim";
-      rev = "cf4463dc31722ab116bc61779c515a4b7a1e9af1";
-      sha256 = "7037916b16f72ea2aaff666e4fa3e1f9546995c0d6fb4634d2dbfac5b184bb26";
+      rev = "3d404c89c7ea783c8386c2e1f03086373f764387";
+      sha256 = "02wz7832kyrmwsfpniahpn3b1q1nw5h29zq0l3kj7n19xh5ighm1";
     };
     dependencies = [];
 
@@ -491,7 +491,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/ivanov/vim-ipython";
       rev = "42499f094b805b90b683afa5009cee99abd0bb75";
-      sha256 = "7f59c3edde4c2b8555d703c96e855ca36665aacdca5a30d1e9e21c31bc252f2d";
+      sha256 = "0b9g4ny32772x78k0nnarnm6arm3bj2nxj83sxaqaascvvnw6nbz";
     };
     dependencies = [];
 
@@ -502,7 +502,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/jceb/vim-hier";
       rev = "0b8c365263551a67404ebd7e528c55e17c1d3de7";
-      sha256 = "f62836545abfe379f9c5410da28409947407cd282ef784b2db89aed0756a1785";
+      sha256 = "118pd9sx1bl9vfr89xrf536hfx4l162a43a1qpwpkqxzb9a3ca7n";
     };
     dependencies = [];
     buildInputs = [ vim ];
@@ -513,7 +513,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/jeetsukumaran/vim-buffergator";
       rev = "9a6a946a41bcf492dfe8da5eee4cc2ee3d55c77f";
-      sha256 = "6df3d1bffb42f7a96b3136ed80534380ba9e2f508b14dbd665260ffe240ccfee";
+      sha256 = "1vng1hjgw3r6cpbdn54ba0prxfl08d9q1v9n65mskxs2zfzx3wvd";
     };
     dependencies = [];
 
@@ -524,7 +524,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/jgdavey/tslime.vim";
       rev = "4a8091956e331d7b1d4187a2883b720dfec7e9dd";
-      sha256 = "e63113f80c056484c462f6d1eb4634cbe4c6c29170f76f4c992adc17b3539a25";
+      sha256 = "09csafrigp1ak566zxvhj71cdr6b6i3fplgncb288r051kw16cg6";
     };
     dependencies = [];
 
@@ -535,18 +535,18 @@ rec {
     src = fetchgit {
       url = "git://github.com/jistr/vim-nerdtree-tabs";
       rev = "0decec122e9bb3e9328b01fa20a9650e79cc6ca7";
-      sha256 = "ac4bfc3ae18e8a62ef8e20d0dd0a0f7c172d0ebd5fed58c533ccccec3ae7bdc2";
+      sha256 = "1hmxwwxfrk6c6g2mivazpl72s5vw1w5dvl10ivpn52lfw4xgqjxc";
     };
     dependencies = [];
 
   };
 
   vim-colorstepper = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-colorstepper-2015-08-04";
+    name = "vim-colorstepper-2016-01-28";
     src = fetchgit {
       url = "git://github.com/jonbri/vim-colorstepper";
-      rev = "5783c2567a193e7604780353d6f8ce445b2ab191";
-      sha256 = "a9ab0c724a827eba9c74d93dda118863656d27df7d5d26b971e0ac71c87f7e59";
+      rev = "f23ba0d995d41508a2dc9471cf31d3d01a4b5f05";
+      sha256 = "05ykxn0gmh8liz0zv5hb8df1ajggxp88izq3825m0yb3ma3k1jqs";
     };
     dependencies = [];
 
@@ -557,7 +557,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/joonty/vim-xdebug";
       rev = "a4980fa65f7f159780593ee37c178281691ba2c4";
-      sha256 = "1ccb0e63eaf68548feb1c37b09c07c84b6bea9b350c4257549f091aa414601e2";
+      sha256 = "1qh18r0sm4gh95sjbi2hnflvxdl4gk00jyy3n7z4i1gnx9ihxjqw";
     };
     dependencies = [];
     postInstall = false;
@@ -568,7 +568,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/junegunn/limelight.vim";
       rev = "153e3f7b78484eb4f5d69833ebf628f44b94996d";
-      sha256 = "85a5188dfd51a170b88e1df5ad4f5ae1cfb2e5c54dfbb734d7f4d85cf28eb5fd";
+      sha256 = "1zdmivr5rn7lswsbgysdqpjv5kz1b97svx8xisw718aizn6ii9c5";
     };
     dependencies = [];
 
@@ -579,7 +579,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/junegunn/vim-peekaboo";
       rev = "b14a7496897bb0a520bed4f519ca79a683bafeec";
-      sha256 = "926f42ee4271395ad8a3526e7b0f1077482cec2f557595d3365ac86eb88ae8c3";
+      sha256 = "1hz8iaw6xj2s6v9raxam5zn2qj3p207pnvjjlgc5lfbi8bp44vwj";
     };
     dependencies = [];
 
@@ -590,7 +590,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/justincampbell/vim-eighties";
       rev = "62a9719df45fddd0456bf47420fc4768f9c8f5a5";
-      sha256 = "b3386d1c40650e5c0ebda2105d1404cfb2aab74153e13bace4a73bc667d91e81";
+      sha256 = "108yv5kwcfx7wjn3pqak86vsmcng0ha5s452pl75q3k580f6sf5k";
     };
     dependencies = [];
 
@@ -601,7 +601,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/latex-box-team/latex-box";
       rev = "3c2901e12cb78bfb2be58ba4c62a488612550fe1";
-      sha256 = "8af2c45209c39438da8481183a1f14885891db73454bb4b16d24799453184e81";
+      sha256 = "10af319r8y94dnqv8js5fgdr2n482hgkl641hkd3i563159c9wla";
     };
     dependencies = [];
 
@@ -612,40 +612,40 @@ rec {
     src = fetchgit {
       url = "git://github.com/lepture/vim-jinja";
       rev = "4412484b410b15caecd71f2e52758b2a90ea124d";
-      sha256 = "650c7f23688e8982f30be3f7d45b73d9c1d283f10a6829e518e2583b4a52befc";
+      sha256 = "1z5ya953nn7233jjjs0ay61x5hfrfddx9xz31grq52cfd0ipy335";
     };
     dependencies = [];
 
   };
 
   vimtex = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimtex-2016-01-15";
+    name = "vimtex-2016-02-23";
     src = fetchgit {
       url = "git://github.com/lervag/vimtex";
-      rev = "1aedd5a7464c93af5af86fec2f4cfce97d5f2947";
-      sha256 = "5fcc46c0dcfd41e15dfdbc66417834e1b933cfb7ae3de9e16cfd3975bc196ba1";
+      rev = "ec5e0df3607de6bf6562e60d4fe2759519e9f9a7";
+      sha256 = "0ld27rr5lnqzlhqpjrkgvrgs7h1hdsrwswkg7whynw83vilal8bd";
     };
     dependencies = [];
 
   };
 
   vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easymotion-2016-01-22";
+    name = "vim-easymotion-2016-02-15";
     src = fetchgit {
       url = "git://github.com/lokaltog/vim-easymotion";
-      rev = "799491e007515890aff363b6eac5dbc9c5aa7f80";
-      sha256 = "037ee34adc0811571c536cdd37fcfa2d483dd76276380c8858dfe134893bf5e7";
+      rev = "649120e90e92bc2ae5361693fa1e4dd2d02c1822";
+      sha256 = "1anh1yflahbsmw3zmgm9xzvpz3c4jh1crk695a6p2sjvf3rr68av";
     };
     dependencies = [];
 
   };
 
   vim-xkbswitch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-xkbswitch-2016-01-12";
+    name = "vim-xkbswitch-2016-01-31";
     src = fetchgit {
       url = "git://github.com/lyokha/vim-xkbswitch";
-      rev = "46858cbe11a8d1a2abc94de8c817465d0020d6f6";
-      sha256 = "36f89ca04c4fa15f4b792620660fefc48f31233351dcc0387d2c4ee0f3c50bbf";
+      rev = "89fa3fc16251f2e97281d29ade3ee022ba285003";
+      sha256 = "16wahaz9d6jyqlvmsn764xqircrwaap3pn4fbgmly7vfmdvq4p8b";
     };
     dependencies = [];
     patchPhase = ''
@@ -656,11 +656,11 @@ rec {
   };
 
   vim-startify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-startify-2016-01-12";
+    name = "vim-startify-2016-02-15";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-startify";
-      rev = "8545f6f553640dc0318582c9749c893f2be3345e";
-      sha256 = "cf98c35c106998d7432df572501f7e3d9e452e8104eec3726e9fa6c94c592029";
+      rev = "23e043cc828b76524edc09f7dd091753dd1c7f12";
+      sha256 = "0cplcpl9a2nhnmnh1h13pxf3hg823frhjmdxssyk35snf6ycgm24";
     };
     dependencies = [];
 
@@ -671,7 +671,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/mkasa/lushtags";
       rev = "3d7229b07b47ab2fc188d7db63b33dfcd63a1802";
-      sha256 = "f5b6eb7b53a5202d0e55c57d6f4fd7b274dfb4224d8d94c91b708096b4fc07b9";
+      sha256 = "1f87zjs9d03h3g4r93ad4asdyx5jsx7nyzf5al72s855adxypdpm";
     };
     dependencies = [];
 
@@ -682,7 +682,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/nbouscal/vim-stylish-haskell";
       rev = "c664376ba814de3f87cb7641f90b2c6a9dd53671";
-      sha256 = "12a9aad40112200060c3ee86f96589a264db287bdfeb3eb6fdf0f22a6656a5f6";
+      sha256 = "1xm5ark2mwphznv3xsyzgcldnr52i5jzk1pfqdh0080j07aama8j";
     };
     dependencies = [];
 
@@ -693,7 +693,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/osyo-manga/shabadou.vim";
       rev = "c5af30bb0c028d53cfd89e00cab636c844034a9a";
-      sha256 = "392efa8a5e725219e478b571d9a30ddba88d47662467ed3123a168e8b55c4de6";
+      sha256 = "1rjdbjsyhs514cqysrr4cr3qva6v1nixjwdmg3j1jlkjbs5glbir";
     };
     dependencies = [];
 
@@ -704,76 +704,73 @@ rec {
     src = fetchgit {
       url = "git://github.com/osyo-manga/vim-watchdogs";
       rev = "ebcf3df39007aa5d65910f44eb20c9caea9007df";
-      sha256 = "3261d098ae472ec29159b724cf4851d6304d7798e3da6daa4d34be8d308b1a2c";
+      sha256 = "0b0sicq8vgil9nm6vnp3k1vlsc6na54cy95pb68w4bj7mscd0q9j";
     };
     dependencies = [];
 
   };
 
-  racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "racer-2016-01-22";
+  vim-racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-racer-2016-02-02";
     src = fetchgit {
-      url = "git://github.com/phildawes/racer";
-      rev = "1021df4b42436673f0124a62cad09e62d181635d";
-      sha256 = "cef501a639da79bce31532b5f06570bd9c255a3d29ac97c6a4b67d640758bddb";
+      url = "git://github.com/racer-rust/vim-racer";
+      rev = "ec26ab4ca71a5a805339e1243a691c9f6472eeaa";
+      sha256 = "0c70s1dymvp4ji81z2302j2dzl7z8sndvzpf2dwwl14fwlar52db";
     };
     dependencies = [];
-    buildPhase = ''
-      find . -type f -not -name 'racer.vim' -exec rm -rf {} \;
-      rm -rf editors images src
-    '';
+
   };
 
   neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neocomplete-vim-2016-01-22";
+    name = "neocomplete-vim-2016-02-20";
     src = fetchgit {
       url = "git://github.com/shougo/neocomplete.vim";
-      rev = "1606b89be1c4718115503156a657344bb3c62593";
-      sha256 = "18c11d7f2aab440d895a742d63c58df5aa7d6353cbbf396ff31d1c85c617295a";
+      rev = "fe8aa93a8a6030af3d208f2ecc92096cb3d52693";
+      sha256 = "12lxb64jnjgppadli4g388cmf3mg5addkml03xmb94vpyf65cprx";
     };
     dependencies = [];
 
   };
 
   neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-snippets-2016-01-22";
+    name = "neosnippet-snippets-2016-02-15";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet-snippets";
-      rev = "ac866f64a507f8a9c7e2691d947e5eaea679e50b";
-      sha256 = "b1493c4b26ec68fab5e994f462c71f8db0341a2d4b8e42c4ee4f2604562b1247";
+      rev = "4e7b0a3962742eccaae298100e23e599d384ea67";
+      sha256 = "1299wjmwc82x9z6jcy8332lk6jwnjhizgqzg9jf57704n312py8v";
     };
     dependencies = [];
 
   };
 
   neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "neosnippet-vim-2016-01-20";
+    name = "neosnippet-vim-2016-02-24";
     src = fetchgit {
       url = "git://github.com/shougo/neosnippet.vim";
-      rev = "52f8a2948957018572760837c165113dbb450e2b";
-      sha256 = "a3451afd1896c0198fa9a3f3fd354efd2d0c7f1b59c15b43adf5db1b6c5e276b";
+      rev = "e908126f402c4c0f4ff6b21c9dd0e5349f39e585";
+      sha256 = "09r0b199fk4m5zvc1f1x2lwyapxhaws1lvvm69jjwp1x4vhfdvjv";
     };
     dependencies = [];
 
   };
 
   unite-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "unite-vim-2016-01-17";
+    name = "unite-vim-2016-02-25";
     src = fetchgit {
       url = "git://github.com/shougo/unite.vim";
-      rev = "c9ce3b13c19352e3b791db227aa373c0b028d656";
-      sha256 = "34319f371b11d97ca3b08b367c919f534bff13a8ab10cf532207e1bf62092f72";
+      rev = "65dffd7a27d9cbb0e026621c59d4ccc6073202bf";
+      sha256 = "0m57f4kb8vh8z804qsahn94d3rcaqianpxfb3d0cd2d7v1cbgm71";
     };
     dependencies = [];
 
   };
 
   vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimproc-vim-2016-01-06";
+    name = "vimproc-vim-2016-02-16";
     src = fetchgit {
       url = "git://github.com/shougo/vimproc.vim";
-      rev = "aa075b9b56839e1adb08421d2e9837f90e59acad";
-      sha256 = "bc587f1cca4dfe8f22af5eecf290a624cbebfdb989906cc02d5471325464b301";
+      rev = "78cbb5c683026085de133f160929ccc56a6b203a";
+      sha256 = "0hw6ghldrg9zvnkh3j9r9ldi1lzhda71gd630zj09wlaz70x60nj";
     };
     dependencies = [];
     buildInputs = [ which ];
@@ -788,11 +785,11 @@ rec {
   };
 
   vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vimshell-vim-2015-12-23";
+    name = "vimshell-vim-2016-02-18";
     src = fetchgit {
       url = "git://github.com/shougo/vimshell.vim";
-      rev = "a5b3d99ba84e76cf94195c37ab762aef5f7b6e25";
-      sha256 = "9a58b00cca9b2cf7ef73cdef2174ab69b7fb427130e5b125b96c6b385dec1947";
+      rev = "f51ad1e3b4a897f32bb7ca0382f8fb25519e0d11";
+      sha256 = "17zk2sm9n7cyhf92613vpqgaq74z4x61p4pxvvl25fc44bsddndf";
     };
     dependencies = [ "vimproc-vim" ];
   };
@@ -802,29 +799,29 @@ rec {
     src = fetchgit {
       url = "git://github.com/sjl/gundo.vim";
       rev = "e7fe41024ace9047eee610f23311d44fd9d917c0";
-      sha256 = "30955656dd2cb6017e14658a3a5e98c79ec87ff1264b70cd6f628a4f3216bfcd";
+      sha256 = "1kdz2qr4z2k2dz6p0jr6y5zwi7n7k1g3m2k52iz03dicvmb5d59h";
     };
     dependencies = [];
 
   };
 
   vim-hardtime = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-hardtime-2014-10-21";
+    name = "vim-hardtime-2016-02-17";
     src = fetchgit {
       url = "git://github.com/takac/vim-hardtime";
-      rev = "b401c72528d1c23e4cc9bc9585fda4361d0199bf";
-      sha256 = "65e4bda7531076147fc46f496c8e56c740d1fcf8fe85c18cb2d2070d0c3803cd";
+      rev = "7c6a6ec70a1f8a1f8c3ccd21041f84375eb4c160";
+      sha256 = "129pwjb3sjz4bffa5cysmk4gy5xd22na4i84ackwx77sw7n6y9kv";
     };
     dependencies = [];
 
   };
 
   vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-quickrun-2015-12-28";
+    name = "vim-quickrun-2016-01-27";
     src = fetchgit {
       url = "git://github.com/thinca/vim-quickrun";
-      rev = "da5328d0aec495e4dc25232fd769a8a2e56d8f7d";
-      sha256 = "a70e2ffa05a2cc2306483e3ecc09972bcdf2d11bfafcfbf3f8195e23475e7102";
+      rev = "ac9f4be0698dffb30ebdf284f8ba5abbaab5eaca";
+      sha256 = "1g8s4h2a9iiq7d0j99ajqkl562m1w0vwa73riiz7axdmjz34vjwl";
     };
     dependencies = [];
 
@@ -835,18 +832,18 @@ rec {
     src = fetchgit {
       url = "git://github.com/tomasr/molokai";
       rev = "c67bdfcdb31415aa0ade7f8c003261700a885476";
-      sha256 = "3a0cd4eef9b4e3a4fd826c66a8edec44a087d04f500217981a84fb59b2fc3ade";
+      sha256 = "1piszjr5kyw43ac1f0jh9z88g824xknshrkchbys9qxlz7pd831s";
     };
     dependencies = [];
 
   };
 
   vim-eunuch = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-eunuch-2015-06-30";
+    name = "vim-eunuch-2016-02-07";
     src = fetchgit {
       url = "git://github.com/tpope/vim-eunuch";
-      rev = "eb8b2d54fb537ee93f762f6331265057a3f69727";
-      sha256 = "ec9194bf2ec97ae3c0f5818fb8a7a9edaf4ea93ca790df7c4d6a4e2486218fe6";
+      rev = "d02b2d0404134e6cae2708069d6888110d3c2272";
+      sha256 = "07xbrx5wrcrv19yaxmnbl7h2qz80f04kmlsz60pag84pyqlina0h";
     };
     dependencies = [];
 
@@ -857,7 +854,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/travitch/hasksyn";
       rev = "c434040bf13a17ca20a551223021b3ace7e453b9";
-      sha256 = "b1a735928aeca7011b83133959d59b9c95ab8535fd00ce9968fae4c3b1381931";
+      sha256 = "0c8r72qw7r7sd2cww07x6n2sp5cwkgamjf8khcdh39zcia93b9xi";
     };
     dependencies = [];
 
@@ -868,18 +865,18 @@ rec {
     src = fetchgit {
       url = "git://github.com/twinside/vim-haskellconceal";
       rev = "f73c5dd660b7009a050b131783d7c17b4954e4d9";
-      sha256 = "1ebf98b170642d342207eb8c16551f9969f884b3be975b8755f1018947053ba8";
+      sha256 = "1a1v0m3qj0gian3mp5xynf2ghscr3xaid37b0wi38bb4f2qrigqy";
     };
     dependencies = [];
 
   };
 
   youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "youcompleteme-2016-01-20";
+    name = "youcompleteme-2016-02-25";
     src = fetchgit {
       url = "git://github.com/valloric/youcompleteme";
-      rev = "d05bf551a677ac70d5b6de707a7174a97dccd4dd";
-      sha256 = "28478612ddd2b917170e88d069687b65778fcb71a31f4aca7c26aa478b09a849";
+      rev = "35f6090b7661989518d64451ea4effa376fcb795";
+      sha256 = "1n8wzsbw4saawpjmacw7kvk5mhcxckik0sw8zdpbp885812ly5wi";
     };
     dependencies = [];
     buildInputs = [
@@ -911,22 +908,22 @@ rec {
   };
 
   vim-pandoc = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-2015-10-20";
+    name = "vim-pandoc-2016-02-12";
     src = fetchgit {
       url = "git://github.com/vim-pandoc/vim-pandoc";
-      rev = "7d7fdeabb83808f669f4cab37d7950b1bed8adbe";
-      sha256 = "451e520ca62cf1207da0f22c2c23f4502f81c0b5a662cd9bfb898e1f53301c41";
+      rev = "ff604abdf48e98dd4bd0c441429b9f8f9413134c";
+      sha256 = "1c9m1p9zyxqxcrmpn24lkhx1jr6mx51qdvp5wj1vkqwbs811ps26";
     };
     dependencies = [];
 
   };
 
   vim-pandoc-syntax = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-pandoc-syntax-2015-11-05";
+    name = "vim-pandoc-syntax-2016-02-22";
     src = fetchgit {
       url = "git://github.com/vim-pandoc/vim-pandoc-syntax";
-      rev = "40c65141bc8c771f270ce8251a99ccdda1ab102c";
-      sha256 = "c1be96f358b211d8a5126fdb541a6500c9016e829527d57766b1ec18a4d8ad0e";
+      rev = "c9f4eb129881fa48b82c181c84a77ec5ceacb6f6";
+      sha256 = "117zl8fpzd34895f0i05zc8zx0jsdald0j2wb12yrhsxiw97fwlq";
     };
     dependencies = [];
 
@@ -937,7 +934,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/vim-scripts/Colour-Sampler-Pack";
       rev = "05cded87b2ef29aaa9e930230bb88e23abff4441";
-      sha256 = "e3dd18f9fd36543e0c87257b7eaa999a82d75cbfa6dce4dfea403fa751c8620f";
+      sha256 = "03v2r18sfgs0xbgy9p56pxfdg0lsk6m7wyr5hw63wm1nzpwiipg3";
     };
     dependencies = [];
 
@@ -948,7 +945,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/vim-scripts/a.vim";
       rev = "2cbe946206ec622d9d8cf2c99317f204c4d41885";
-      sha256 = "ca0982873ed81e7f6545a6623b735104c574fe580d5f21b0aa3dc1557edac240";
+      sha256 = "0h62v9z5bh9xmaq22pqdb3z79i84a5rknqm68mjpy7nq7s3q42fa";
     };
     dependencies = [];
 
@@ -959,7 +956,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/vim-scripts/align";
       rev = "787662fe90cd057942bc5b682fd70c87e1a9dd77";
-      sha256 = "f7b5764357370f03546556bd45558837f3790b0e86afadb63cd04d714a668a29";
+      sha256 = "0acacr572kfh7jvavbw61q5pkwrpi1albgancma063rpax1pddgp";
     };
     dependencies = [];
 
@@ -970,7 +967,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/vim-scripts/changeColorScheme.vim";
       rev = "b041d49f828629d72f2232531a230d1ec5de2405";
-      sha256 = "094ccc132dc3991a30feb31bbdd777755294957e843517491345a4999e86cb5f";
+      sha256 = "0pybhsg9k9252d4ifdc4gsar8lkmfzbvs6xkzqq1m6f35l9wqk09";
     };
     dependencies = [];
 
@@ -981,7 +978,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/vim-scripts/random.vim";
       rev = "b2d85eb24a38074eab37a5acf2a295e1f2ad8989";
-      sha256 = "571f4ed0a2d8c66d1c15029fb812a84b55228d07cd2e4bbbc73a33493013fed3";
+      sha256 = "1lzy2cq4jcrsqyxlnbnd0y6j4mabm09bi7q22lf6vinqlb84w7sp";
     };
     dependencies = [];
 
@@ -992,7 +989,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/vim-scripts/tabmerge";
       rev = "074e5f06f26e7108a0570071a0f938a821768c06";
-      sha256 = "b84501b0fc5cd51bbb58f12f4c2b3a7c97b03fe2a76446b56a2c111bd4f7335f";
+      sha256 = "0prkyza1n49cdaslcr57w8zv15vw78mlqbzib2xipmawzjq02idq";
     };
     dependencies = [];
 
@@ -1003,7 +1000,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/vim-scripts/wombat256.vim";
       rev = "8734ba45dcf5e38c4d2686b35c94f9fcb30427e2";
-      sha256 = "2feb7d57ab0a9f2ea44ccd606e540db64ab3285956398a50ecc562d7b8dbcd05";
+      sha256 = "01fdvfwdfqn5xi88lfanb4lb6jmn1ma6wq6d9jj2x7qamdbpvsrg";
     };
     dependencies = [];
 
@@ -1014,18 +1011,18 @@ rec {
     src = fetchgit {
       url = "git://github.com/wakatime/vim-wakatime";
       rev = "91262cb3c04fe4d98ecdffe8da2197537c66359c";
-      sha256 = "992e41ba32d575bb0bced8b2616cf08aab73f9980292fbc58c94c7f99f914540";
+      sha256 = "0h25j6gzkiwlik2zp4h2k3wp7away1n63cnqrq5vnxfm6ax42blr";
     };
     dependencies = [];
     buildInputs = [ python ];
   };
 
   command-t = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "command-t-2016-01-19";
+    name = "command-t-2016-02-09";
     src = fetchgit {
       url = "git://github.com/wincent/command-t";
-      rev = "b772049e7e92a354702a9400ad185070ac7e7646";
-      sha256 = "425f50d0c21c7f95bdd29532f487d00c7bccb97fb2e372a87a6a5bf2fd11a916";
+      rev = "4c7f02c5a9020bbbd498f643abfb059048388707";
+      sha256 = "1ij3zkc29zn03kw82c6zv8sbhx3ma3m39fgy9c29419brspzg1r5";
     };
     dependencies = [];
     buildInputs = [ perl ruby ];
@@ -1038,11 +1035,11 @@ rec {
   };
 
   goyo = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "goyo-2015-11-15";
+    name = "goyo-2016-02-15";
     src = fetchgit {
       url = "git://github.com/junegunn/goyo.vim";
-      rev = "630f5d80861beb36ae2dfa0c587ec6b51982cff5";
-      sha256 = "28e74ab067ce55d0dd964b5214601e851046149ccf98b377861c56225f36dc44";
+      rev = "cb697998cce4d5a50fb1749310147ae16b0d70e6";
+      sha256 = "0sbyk5byfsf10n93dk043ysyxfm43rabiw766pb1gkng5hdqypd0";
     };
     dependencies = [];
 
@@ -1071,11 +1068,11 @@ rec {
   };
 
   pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "pathogen-2016-01-19";
+    name = "pathogen-2016-01-26";
     src = fetchgit {
       url = "git://github.com/tpope/vim-pathogen";
-      rev = "b4f20ff0acc8267875ca7a3841756fe18d55db15";
-      sha256 = "649bdbc573fff16bf4bbb2f50f87978576a86af6fd836bef4f64e1e7996fdfe2";
+      rev = "8c91196cfd9c8fe619f35fac6f2ac81be10677f8";
+      sha256 = "17d1903spczg2rk0qzg94vvq41dwhmnxwajqgzcx4lmf606cfspi";
     };
     dependencies = [];
 
@@ -1086,7 +1083,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/dannyob/quickfixstatus";
       rev = "fd3875b914fc51bbefefa8c4995588c088163053";
-      sha256 = "7b6831d5da1c23d95f3158c67e4376d32c2f62ab2e30d02d3f3e14dcfd867d9b";
+      sha256 = "16vxhvyxq51y7wnx0c1fmdi2yb6kfr1pxijq65gxj8qwvbak2s3v";
     };
     dependencies = [];
 
@@ -1097,7 +1094,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/kien/rainbow_parentheses.vim";
       rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695";
-      sha256 = "47975a426d06f41811882691d8a51f32bc72f590477ed52b298660486b2488e3";
+      sha256 = "1qw84imlhq4654mxazj7j3sp5g1j3yjxi496i08iix06dm15m5s7";
     };
     dependencies = [];
 
@@ -1108,18 +1105,18 @@ rec {
     src = fetchgit {
       url = "git://github.com/wting/rust.vim";
       rev = "2450ecf3091cc7c2711ca9f00eae8e3bedd04376";
-      sha256 = "9d2e8b2c06d6100f9a1e76644313d457a2ff955241d8f712de6fddd0b7f5c4ee";
+      sha256 = "1vn4ynvx1pbgvq9ggn21aaazz8jpsh9l6r3n3sd0y46n0qn8nblx";
     };
     dependencies = [];
 
   };
 
   sensible = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "sensible-2015-12-26";
+    name = "sensible-2016-02-09";
     src = fetchgit {
       url = "git://github.com/tpope/vim-sensible";
-      rev = "680a5c693213daa158c816f068fffa895d961dc9";
-      sha256 = "959b55a97974d85374eccb58379c3f69c0ec43459d4df2484e42a437c61e34bc";
+      rev = "2fb074e84169e177045e8bdb6ceb7eded3a80e8f";
+      sha256 = "067ccar0adk2rx96ci26ykdi6bk0p4wnsd10la088lxdfva00m90";
     };
     dependencies = [];
 
@@ -1130,7 +1127,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/tpope/vim-sleuth";
       rev = "a17462708aa40a7fc0afd4effa559087d8a2c908";
-      sha256 = "72f4b7c5e60c942592e624806960736e71b9f109fbbfa3a5a2a37970b90f6025";
+      sha256 = "09b01ywp0yd3lajs7gzv17qvjwbffdh6k014ws92b50cwv2vgx3j";
     };
     dependencies = [];
 
@@ -1141,7 +1138,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/garbas/vim-snipmate";
       rev = "7f91de39088138491e40a35a855adb70677b02d3";
-      sha256 = "e8c70bbad496fc1306814fbb078736a93d4f418d16f7692f4e37dbcc00ec6633";
+      sha256 = "0cv6xh0crnrp9qpnkxqnim0lygd96s3hgfsgh4317z4nsjx0piz8";
     };
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
@@ -1152,7 +1149,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/chikatoike/sourcemap.vim";
       rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1";
-      sha256 = "a08c77aea39be4a0a980d62673d1d17fecc518a8aeb9101210e453aaacb78fbd";
+      sha256 = "1gcgnynallz420911fdfm0ccbv3zs78p69nnh2ls1r4vlfp7g350";
     };
     dependencies = [];
 
@@ -1163,7 +1160,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/tpope/vim-surround";
       rev = "2d05440ad23f97a7874ebd9b5de3a0e65d25d85c";
-      sha256 = "e5372cbb384e747181e3dfe4a53f042da18bd0d6af7a01184850ecb084ddb350";
+      sha256 = "0l5kvn2b1v2h90c02ymgsv88p89d0hzsbr6zwf0p2x2f72xjqdz5";
     };
     dependencies = [];
 
@@ -1174,7 +1171,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/dhruvasagar/vim-table-mode";
       rev = "2ab64777a5b81e240810999eb6e7dc65e1de5461";
-      sha256 = "64aff63c0aeb696f087cf41021867e1576e4fe8d392d36ec2ca46ddec104a8e1";
+      sha256 = "1qd80k0xwvd45kn3cb9ripzf8xhmgs32247lgh46ysgb18ygdbv4";
     };
     dependencies = [];
 
@@ -1202,22 +1199,22 @@ rec {
   };
 
   tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "tlib-2016-01-21";
+    name = "tlib-2016-01-26";
     src = fetchgit {
       url = "git://github.com/tomtom/tlib_vim";
-      rev = "3232708995e0e61d8e39af40e7a92598e30b84e8";
-      sha256 = "525c31d4fdef8c44709b8d0b77d8ef70acf77b2375df40837088aeb0d4368747";
+      rev = "9734d8d9e4f7b7b91272123463a62759aef31556";
+      sha256 = "19dqzxy1v3wg1n8b93wjds311w3lw70g49svv59sr070s7bwl6z9";
     };
     dependencies = [];
 
   };
 
   undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "undotree-2015-12-16";
+    name = "undotree-2016-02-23";
     src = fetchgit {
       url = "git://github.com/mbbill/undotree";
-      rev = "39e5cf0fc241c64e920f91d52299b444475d54df";
-      sha256 = "767c84917392d1b370ef542c218c0f7bd642e59a7176735bbdd80c8a8f8b04ca";
+      rev = "e5a01b2eb94afd256a96cac07ba2981a55dd9665";
+      sha256 = "1dga7yhk5gh980w2qlf764i9f2mba4ij9habd86i9mlsh3wdqnrm";
     };
     dependencies = [];
 
@@ -1228,7 +1225,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-actions";
       rev = "a5d20500fb8812958540cf17862bd73e7af64936";
-      sha256 = "d2c3eb7a1f29e7233c6fcf3b02d07efebe8252d404ee593419ad399a5fdf6383";
+      sha256 = "10v3vxgrlfdd34s5kvh4si985gpygv804fygdwy27rr93xxfphyj";
     };
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
@@ -1239,7 +1236,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-async";
       rev = "dadc96e188f1cdacbac62129eb29a1eacfed792c";
-      sha256 = "27f941e21a8ca5940bd20914e2a9e3809e554f3ef2c27b3bafb9a153107a5d07";
+      sha256 = "01sxg88578drmwxpphpj7r7mb7l0wfly4509s85r99cc3bi43y97";
     };
     dependencies = ["vim-addon-signs"];
 
@@ -1250,7 +1247,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-background-cmd";
       rev = "abf2abf339652d2bc79da81f9d131edfe2755f5a";
-      sha256 = "06223ebaa157e17434cc09dae474324c105374e4e05d85695a05c7d0a2761c20";
+      sha256 = "080wfsid1iq5b9lqapg0wis5642c69sf9nh9rhs79qapl6x3w8h6";
     };
     dependencies = ["vim-addon-mw-utils"];
 
@@ -1261,7 +1258,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-commenting";
       rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b";
-      sha256 = "4ad7d5f6669f0a1b4a24c9ce3649c030d7d3fc8588de4d4d6c3269140fbe9b3e";
+      sha256 = "0glvpq7i8s9jdi6lvpl8hpyd7mrhq14kdkn94i51n2lzcvvdbmsa";
     };
     dependencies = [];
 
@@ -1272,7 +1269,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-completion";
       rev = "021c449a5ce1ce4ac0af5955e05b0279c1cc0e75";
-      sha256 = "969a474749edf7e4443d2540eaf12e891cc0a3f5533e62e081d32408f403a0ea";
+      sha256 = "1sm00gs0h96kh7h64gjkyniw07495vqylh157m2f9xzd953lg6ln";
     };
     dependencies = ["tlib"];
 
@@ -1283,7 +1280,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-errorformats";
       rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28";
-      sha256 = "a1260206545d5ae17f2e6b3319f5cf1808b74e792979b1c6667d75974cc53f95";
+      sha256 = "159zqm69fxbxcv3b2y99g57bf20qrzsijcvb5rzy2njxah3049m1";
     };
     dependencies = [];
 
@@ -1294,7 +1291,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-goto-thing-at-cursor";
       rev = "f052e094bdb351829bf72ae3435af9042e09a6e4";
-      sha256 = "34658ac99d9a630db9c544b3dfcd2c3df69afa5209e27558cc022b7afc2078ea";
+      sha256 = "1skq43y7laq2ric7bqh9abx9mxix5k6xzcs4qnwhsqwskp4qlr9l";
     };
     dependencies = ["tlib"];
 
@@ -1305,18 +1302,18 @@ rec {
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-local-vimrc";
       rev = "6a27f95b35befa70cd0d049329cd0920566c764b";
-      sha256 = "f0687e08f380ff085b6fa3e708d1631049571706f55d796e22612aff02e51459";
+      sha256 = "0n8lwl1gyak149p7jpgm0qbmfj8hcg8hirx3dxdhizw0yc47ws7h";
     };
     dependencies = [];
 
   };
 
   vim-addon-manager = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-addon-manager-2014-12-03";
+    name = "vim-addon-manager-2016-02-07";
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-manager";
-      rev = "fda9d2f4522024aa8bd8b8305e6a71c4a4a28c07";
-      sha256 = "a3b5da9bcc01c6f0fb0a5e13a6f9efb58471339ed32c480fde96856bb9e1e7be";
+      rev = "872f9302cf0eb8e9cb6259ea4f329d2265f9e32d";
+      sha256 = "0rl6sy1gfjsfr1hg2ilhhxppifvjfqn815kh27b3ikcy82rp7sb0";
     };
     dependencies = [];
     buildInputs = stdenv.lib.optional stdenv.isDarwin Cocoa;
@@ -1327,7 +1324,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-mru";
       rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb";
-      sha256 = "15b70f796f28cbd999060fea7f47408fa8a6cb176cd4915b9cc3dc6c53eed960";
+      sha256 = "0q6rxr9nrp63kidr3m3c2z5sda4g813pzshg0scxkjr8dxwhzdqm";
     };
     dependencies = ["vim-addon-other" "vim-addon-mw-utils"];
 
@@ -1338,7 +1335,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-mw-utils";
       rev = "0c5612fa31ee434ba055e21c76f456244b3b5109";
-      sha256 = "4e1b6d1b59050f1063e58ef4bee9e9603616ad184cd9ef7466d0ec3d8e22b91c";
+      sha256 = "075r4a73vv6hcrsfznac32nicdk0x7lvxx4fwmii03q5b4dns6sf";
     };
     dependencies = [];
 
@@ -1349,7 +1346,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-nix";
       rev = "2aed79ba5d8c5e6abd102de77e55e242f61b17f1";
-      sha256 = "0e326e2c6cb6597ca533a64a845ef9dd946cd249250375ef9775d974ecef37e2";
+      sha256 = "1qipxzn79nbmjzppa0r59796r56xz5g88jm66fjpqndndhn6wchf";
     };
     dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"];
 
@@ -1360,7 +1357,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-other";
       rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b";
-      sha256 = "43f027e4b7576031072515c23c2b09f7f2c8bba7ee43a1e2041a4371bd954d1b";
+      sha256 = "06sdjnyp2hqs0kia2hzflyxwiwpp14mkrhhm4l3k2q2pnzj2gw23";
     };
     dependencies = ["vim-addon-actions" "vim-addon-mw-utils"];
 
@@ -1371,7 +1368,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-php-manual";
       rev = "5f9810dd1f6e9f36a45f637ae6260ccff09256ff";
-      sha256 = "3942eb6a7191c308beab240e91c99ee4e2c52e2d672503d46f98312e823b86cd";
+      sha256 = "1kc67f12wccqdza069b75lpcbqp4kv4r23i4mfz0ihwif5mfnhir";
     };
     dependencies = [];
 
@@ -1382,7 +1379,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-signs";
       rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae";
-      sha256 = "a9c03a32e758d51106741605188cb7f00db314c73a26cae75c0c9843509a8fb8";
+      sha256 = "1f4gk984760cbkkwl9isqwab63ghny61h18nfh313maqwwr3mh59";
     };
     dependencies = [];
 
@@ -1393,7 +1390,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-sql";
       rev = "05b8a0c211f1ae4c515c64e91dec555cdf20d90b";
-      sha256 = "a1334ae694e0a03229bacc8ba7e08e7223df240244c7378e3f1bd91d74e957c2";
+      sha256 = "1hjpx5s1vn8v7y73gis408jdy8vjivhag2ycp8lk5870jkk4lcx1";
     };
     dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"];
 
@@ -1404,7 +1401,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-syntax-checker";
       rev = "8eb7217e636ca717d4de5cd03cc0180c5b66ae77";
-      sha256 = "aef048e664653b5007df71ac24ed34ec55d8938c763d3f80885a122e445a9b3d";
+      sha256 = "0gcvb922w4jsi203ygbnij9xhmgc6knj9b3ivw3m0fv5ckk4iw5f";
     };
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
@@ -1415,7 +1412,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-toggle-buffer";
       rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b";
-      sha256 = "672166ecfe0599177afb56b444366f587f77e9659c256ac4e41ee45cb2df6055";
+      sha256 = "0mb0vyr5rr0ywk26l9cwcplpfzsqdwv49d2nzdx1g685zvn6c8b7";
     };
     dependencies = ["vim-addon-mw-utils" "tlib"];
 
@@ -1426,18 +1423,18 @@ rec {
     src = fetchgit {
       url = "git://github.com/MarcWeber/vim-addon-xdebug";
       rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172";
-      sha256 = "0a7bf2caf36772c94bd25bfbf46bf628623809c9cfab447ff788eb74149464ef";
+      sha256 = "1vv4jha79sw8yxzl9aygr44khqi8yrmz9ysvs95wjwk7yg5g4yqa";
     };
     dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"];
 
   };
 
   vim-airline = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-airline-2016-01-22";
+    name = "vim-airline-2016-02-25";
     src = fetchgit {
       url = "git://github.com/bling/vim-airline";
-      rev = "fb255b570de5582af13563e243fba743dfd0edc9";
-      sha256 = "2dbd61c157ba58213bdccb595bfa13951f4e1db8fa4fbce8ddf94aa3a87c938c";
+      rev = "5cf193fa28d0c6f0f93fd1b481ba4845eac9a1ac";
+      sha256 = "1dgh9xs4rhziayl18nrknvgjnx8ll5pw4xcy43wrcr7icnmddgrw";
     };
     dependencies = [];
 
@@ -1448,40 +1445,40 @@ rec {
     src = fetchgit {
       url = "git://github.com/kchmck/vim-coffee-script";
       rev = "32fe889b8cafd3a4921ef8e6485156453ff58c42";
-      sha256 = "d7162b2546c9949c96811d7a72c17ae2db9871697ee65ed0b1a8f0287d278690";
+      sha256 = "14464xyjiw58n785xrkyd5qrinz2gb0p4yhxh6b9r5698qjjn5np";
     };
     dependencies = [];
 
   };
 
   vim-easy-align = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-easy-align-2015-10-09";
+    name = "vim-easy-align-2016-02-05";
     src = fetchgit {
       url = "git://github.com/junegunn/vim-easy-align";
-      rev = "7cb559eb70600bbd81afbb2d7f60d98334f631e2";
-      sha256 = "2ea40064f64a8a4f0f1e405ea5db5a3e79424cdec44d033c3d65cc40a2a19b18";
+      rev = "dd98d0a8957b7d43ac84be3318bbc950bc9ed467";
+      sha256 = "1hdfcg07p4xvd5aa7hqmjg2zf6cmlrp4maid7qc4l0xcfx6wx4j1";
     };
     dependencies = [];
 
   };
 
   vim-gista = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gista-2016-01-23";
+    name = "vim-gista-2016-02-22";
     src = fetchgit {
       url = "git://github.com/lambdalisue/vim-gista";
-      rev = "2021858d9cada2289a866387ba728dd025093aa1";
-      sha256 = "1e3e925cdb6a9296f20c2261efb96eac0792e12c3b7a4f6a1637ac0a96255eb4";
+      rev = "d4da4b6f53a93ebadc7c1dcc4e82836f96c706c9";
+      sha256 = "19786fr2m44krq7l62j3h39ayl6a04474s2mkbv8szkg8jb4syzq";
     };
     dependencies = [];
 
   };
 
   vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-gitgutter-2016-01-19";
+    name = "vim-gitgutter-2016-02-21";
     src = fetchgit {
       url = "git://github.com/airblade/vim-gitgutter";
-      rev = "4510e9b33506b4b09168c99934c42ee1ce89bba2";
-      sha256 = "77d97922e8970fcdb037272a53c2ab4209d804aced7ae654f6aeb4501705bcd8";
+      rev = "0af9f2a3ab029054d279f69364351e95e107008a";
+      sha256 = "0kqj50sha1i1jsm9mirx6jn7kpdm0zl60n0zc3rh8z1zsjic0mqr";
     };
     dependencies = [];
 
@@ -1492,7 +1489,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/noc7c9/vim-iced-coffee-script";
       rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2";
-      sha256 = "c7859591975a51a1736f99a433d7ca3e7638b417340a0472a63995e16d8ece93";
+      sha256 = "14yfirny359rlrr082il2ys3hxiyrbbk794rdxrs2lasjy8rb1f7";
     };
     dependencies = [];
 
@@ -1503,62 +1500,62 @@ rec {
     src = fetchgit {
       url = "git://github.com/xuhdev/vim-latex-live-preview";
       rev = "7695dd4ebddb735bec632d468e2202d070029cb8";
-      sha256 = "3551e2a84a98b07f5edce6e35bad5cd2a78da1ef60dd94202c623e238b05bfc8";
+      sha256 = "1j5z0n5j6gk25hh99pb0xyhqv9yjbjnmpqz6vig7zc4q9alf4l9m";
     };
     dependencies = [];
 
   };
 
   vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-multiple-cursors-2016-01-14";
+    name = "vim-multiple-cursors-2016-01-28";
     src = fetchgit {
       url = "git://github.com/terryma/vim-multiple-cursors";
-      rev = "e543fc86f0c6a8981c9679beceb06482778c3531";
-      sha256 = "d10506c2196b32d389027a359f382d41c7c972f615a6745b9ee41c17741e062a";
+      rev = "47c9e3fb11a202a9a2fa1d591ec990a41e4221c4";
+      sha256 = "006wj5jikdkz9zilhy9q55hr50v6x34z27jpn0dv9shgaj8xf62s";
     };
     dependencies = [];
 
   };
 
   vim-signature = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signature-2015-11-11";
+    name = "vim-signature-2016-02-22";
     src = fetchgit {
       url = "git://github.com/kshenoy/vim-signature";
-      rev = "7cabfb5a3d3b45e739eb1d7e198782fb4a5a23da";
-      sha256 = "18a8ab7ba9e74d2f65c64c0c316ef824e48f21196520dfd292522c1eb8c87cb3";
+      rev = "8b7b40041f938092d3cb5c5db33fec54c41a1854";
+      sha256 = "0qqc785r84g1ckxyds0zmf881wslsfa1cmpcx35jwcyjwdaya0a6";
     };
     dependencies = [];
 
   };
 
   vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-signify-2016-01-15";
+    name = "vim-signify-2016-02-25";
     src = fetchgit {
       url = "git://github.com/mhinz/vim-signify";
-      rev = "4f69c11c7cd7b75bb23cf7565f278af918816546";
-      sha256 = "816f7472f04043139f216b91fc36612a9d73cddd86ca6c1cf86a7d48ca2d20e3";
+      rev = "051dc1a853cb86231497c58a5c06dc82a17837ca";
+      sha256 = "0iy03qxv9m301pqa495ydacx072pa1jwdqgk50dpd1z6711cdh44";
     };
     dependencies = [];
 
   };
 
   vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-snippets-2016-01-17";
+    name = "vim-snippets-2016-02-19";
     src = fetchgit {
       url = "git://github.com/honza/vim-snippets";
-      rev = "0fc7fd1181f33b26c015d0f306d149b756f9d679";
-      sha256 = "d67ccdcfa42e8e713e7a5bee34b5b150fb955a81fdddfe9c956a1f652f1235b6";
+      rev = "732978ab1622c8d6fdf0384cd3b524e3fe7ba5f3";
+      sha256 = "0i7jr48vwazdy3bm9y2wa0y5ay1rhp91dpi5kqgs06na85qvhsiz";
     };
     dependencies = [];
 
   };
 
   vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vim-webdevicons-2015-12-21";
+    name = "vim-webdevicons-2016-02-08";
     src = fetchgit {
       url = "git://github.com/ryanoasis/vim-devicons";
-      rev = "8ac3e02537d32648c3f9738c711639f8b940460c";
-      sha256 = "9d4ee89a551ab9e1ec3938e1eba1fd138bbee975ce3b247b5f56eb2613daefbc";
+      rev = "d0111ec77c3d7e3e3072e576bb26055643e64a2f";
+      sha256 = "1lhycam07licxkf8isl641mwd64i2x8kjqqvzxndhr26incs9pv2";
     };
     dependencies = [];
 
@@ -1569,7 +1566,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/dag/vim2hs";
       rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664";
-      sha256 = "485fc58595bb4e50f2239bec5a4cbb0d8f5662aa3f744e42c110cd1d66b7e5b0";
+      sha256 = "1c75nxk1vk8hq514wx1zm9i5d3qdpd65mv4v4gr50kmvjn2waps8";
     };
     dependencies = [];
 
@@ -1580,7 +1577,7 @@ rec {
     src = fetchgit {
       url = "git://github.com/vimwiki/vimwiki";
       rev = "3bd3d9b86036b21aecd69f0a1e572643d626c280";
-      sha256 = "7a10ae3881af0d17a041ffd766680ceedf706411abbbedccf64e9e777fabd5c8";
+      sha256 = "1j6mmdzpg7jfyv6fvfxb25j71pzf1il6dmzz86h1f3dgh4waw43s";
     };
     dependencies = [];
 
@@ -1591,18 +1588,18 @@ rec {
     src = fetchgit {
       url = "git://github.com/tpope/vim-vinegar";
       rev = "75fc3824bc09053f22735d6726c5cfd614c15642";
-      sha256 = "19fc1487169f1d8941ffddda1ffadd842ef4a773de2d32536eae52cf494154a6";
+      sha256 = "19jl854wylmfdr9k4bfyffkz8bl4vpx1znnxzx0qj7cz2s3i9z0r";
     };
     dependencies = [];
 
   };
 
   vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation
-    name = "vundle-2015-11-04";
+    name = "vundle-2016-02-21";
     src = fetchgit {
       url = "git://github.com/gmarik/vundle";
-      rev = "5f70ae6025e951f0154e3940d123138adffa4c88";
-      sha256 = "c063cabca479449a3330c14e879536473d4fdb0ca4b384c9c8be18c198a929fa";
+      rev = "8a054139a3623739321303cf06c09b0f9874dc0d";
+      sha256 = "0hhjnp9i0glfa5fdfg9n9286zdfvfmdx1ln9ayfr8kmm9nwy24gp";
     };
     dependencies = [];
 
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index a4dca009cdd9..2feb3049c6f1 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -54,7 +54,7 @@
 "github:nbouscal/vim-stylish-haskell"
 "github:osyo-manga/shabadou.vim"
 "github:osyo-manga/vim-watchdogs"
-"github:phildawes/racer"
+"github:racer-rust/vim-racer"
 "github:shougo/neocomplete.vim"
 "github:shougo/neosnippet-snippets"
 "github:shougo/neosnippet.vim"
diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/racer b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/racer
deleted file mode 100644
index 57000b870645..000000000000
--- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/racer
+++ /dev/null
@@ -1,4 +0,0 @@
-    buildPhase = ''
-      find . -type f -not -name 'racer.vim' -exec rm -rf {} \;
-      rm -rf editors images src
-    '';

From e695d73d8f18038ff8b2bb082ef15304e63a68e3 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Thu, 25 Feb 2016 12:22:44 +0300
Subject: [PATCH 1753/2285] vimPlugins.vim-autoformat: init at 2016-02-24

---
 pkgs/misc/vim-plugins/default.nix      | 11 +++++++++++
 pkgs/misc/vim-plugins/vim-plugin-names |  7 ++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 6c9f8d665e15..5e6e73419d2e 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -343,6 +343,17 @@ rec {
 
   };
 
+  vim-autoformat = buildVimPluginFrom2Nix { # created by nix#NixDerivation
+    name = "vim-autoformat-2016-02-24";
+    src = fetchgit {
+      url = "git://github.com/Chiel92/vim-autoformat";
+      rev = "a2f9b88bcd66fe47a44ae8b5e1002c2d8e6f4ad4";
+      sha256 = "1fahm3dzcmpr7f9rrhzhyrj6fz95fblxal57gajcc3g136bizbnj";
+    };
+    dependencies = [];
+
+  };
+
   vim-css-color = buildVimPluginFrom2Nix { # created by nix#NixDerivation
     name = "vim-css-color-2015-10-03";
     src = fetchgit {
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index 2feb3049c6f1..87420a7a4ca5 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -1,7 +1,6 @@
 "CSApprox"
 "CheckAttach"
 "Gist"
-"github:sjl/gundo.vim"
 "Hoogle"
 "Solarized"
 "Supertab"
@@ -20,6 +19,8 @@
 "extradite"
 "fugitive"
 "ghcmod"
+"github:Chiel92/vim-autoformat"
+"github:LnL7/vim-nix"
 "github:ap/vim-css-color"
 "github:benekastah/neomake"
 "github:bitc/vim-hdevtools"
@@ -46,7 +47,6 @@
 "github:latex-box-team/latex-box"
 "github:lepture/vim-jinja"
 "github:lervag/vimtex"
-"github:LnL7/vim-nix"
 "github:lokaltog/vim-easymotion"
 "github:lyokha/vim-xkbswitch"
 "github:mhinz/vim-startify"
@@ -61,10 +61,11 @@
 "github:shougo/unite.vim"
 "github:shougo/vimproc.vim"
 "github:shougo/vimshell.vim"
+"github:sjl/gundo.vim"
 "github:takac/vim-hardtime"
 "github:thinca/vim-quickrun"
-"github:tpope/vim-eunuch"
 "github:tomasr/molokai"
+"github:tpope/vim-eunuch"
 "github:travitch/hasksyn"
 "github:twinside/vim-haskellconceal"
 "github:valloric/youcompleteme"

From 4304419443532ad8da4edd9ebae58f6b47123ce4 Mon Sep 17 00:00:00 2001
From: Tobias Pflug <tobias.pflug@holidaycheck.com>
Date: Thu, 25 Feb 2016 10:25:31 +0100
Subject: [PATCH 1754/2285] galen init at 2.2.1

---
 pkgs/development/tools/galen/default.nix | 35 ++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 pkgs/development/tools/galen/default.nix

diff --git a/pkgs/development/tools/galen/default.nix b/pkgs/development/tools/galen/default.nix
new file mode 100644
index 000000000000..169c8fdd68a0
--- /dev/null
+++ b/pkgs/development/tools/galen/default.nix
@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, jdk, unzip }:
+
+stdenv.mkDerivation rec {
+  pname = "galen";
+  version = "2.2.1";
+  name = "${pname}-${version}";
+
+  inherit jdk;
+
+  src = fetchurl {
+    url = "https://github.com/galenframework/galen/releases/download/galen-2.2.1/galen-bin-${version}.zip";
+    sha256 = "0zwrh3bxcgkwip6z9lvy3hn53kfr99cdij64c57ff8d95xilclhb";
+  };
+
+  buildInputs = [ unzip ];
+  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
+
+  buildPhase = ''
+  mkdir -p $out/bin
+  '';
+
+  installPhase = ''
+  cat galen | sed -e "s,java,$jdk/bin/java," > $out/bin/galen
+  chmod +x $out/bin/galen
+  cp galen.jar $out/bin
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://galenframework.com;
+    description = "Automated layout testing for websites";
+    license = licenses.asl20;
+    maintainers = [ ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}

From e054644c2f63ad254a4a107110aaed14fc184289 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Thu, 25 Feb 2016 12:33:17 +0300
Subject: [PATCH 1755/2285] rustRegistry: 2016-02-02 -> 2016-02-25

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

diff --git a/pkgs/top-level/rust-packages.nix b/pkgs/top-level/rust-packages.nix
index fc3e8fcb98cc..765eb43e8456 100644
--- a/pkgs/top-level/rust-packages.nix
+++ b/pkgs/top-level/rust-packages.nix
@@ -7,15 +7,15 @@
 { runCommand, fetchFromGitHub, git }:
 
 let
-  version = "2016-02-15";
-  rev = "af2c6a768083a66a898a07f5f3b7ec62871dbc3c";
+  version = "2016-02-25";
+  rev = "a43392dd266a3e5c982f6bee3451187fc35ebfa8";
 
   src = fetchFromGitHub {
       inherit rev;
 
       owner = "rust-lang";
       repo = "crates.io-index";
-      sha256 = "f2da91b1a11146eed04c4b4ad7599f1bd3dc2bca4e011b3377ba16365b3124aa";
+      sha256 = "45ad457fb1d13f1c0d0b09d36d5ea3e44baffc7884b82dfcbdff5ae7ab350bbd";
   };
 
 in

From 03c9a7727530bef878a87034a1d3d2f13bee2175 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 25 Feb 2016 11:29:03 +0100
Subject: [PATCH 1756/2285] helm: 2015-09-11 -> 0.6.1

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

diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix
index 7be510a64183..b4cf02886726 100644
--- a/pkgs/applications/audio/helm/default.nix
+++ b/pkgs/applications/audio/helm/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchgit, xorg, freetype, alsaLib, libjack2
-, lv2, pkgconfig, mesa }:
+  { stdenv, fetchurl, xorg, freetype, alsaLib, libjack2
+  , lv2, pkgconfig, mesa }:
 
-stdenv.mkDerivation rec {
-  name = "helm-git-2015-09-11";
+  stdenv.mkDerivation rec {
+  version = "0.6.1";
+  name = "helm-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/mtytel/helm/archive/v${version}.tar.gz";
+    sha256 = "18d7zx6r7har47zj6x1f2z91x796mxnix7w3x1yilmqnyqc56r3w";
+    };
 
-  src = fetchgit {
-    url = "https://github.com/mtytel/helm.git";
-    rev = "ad798d4a0a2e7db52e1a7451176ff198a393cdb4";
-    sha256 = "0ic4xjikq7s2p53507ykv89844j6sqcd9mh3y59a6wnslr5wq1cw";
-  };
 
   buildInputs = [
     xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext

From 26c2f7113192cfd14a00dced980bf24e832f0af8 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Mon, 22 Feb 2016 14:08:07 -0600
Subject: [PATCH 1757/2285] rustUnstable.rustc: 2015-08-09 -> 2016-02-22

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

diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix
index 4d2039669598..66730cf855a3 100644
--- a/pkgs/development/compilers/rustc/head.nix
+++ b/pkgs/development/compilers/rustc/head.nix
@@ -2,11 +2,11 @@
 { stdenv, callPackage }:
 
 callPackage ./generic.nix {
-  shortVersion = "2016-02-01";
+  shortVersion = "2016-02-22";
   isRelease = false;
   forceBundledLLVM = true;
-  srcRev = "094c5b0d6";
-  srcSha = "0908xzxb4q8vqwmzi5c2vzrhfsrw7d18r4n7mq3ir5671y9cqpvz";
+  srcRev = "d1f422ec280b881b8236c5d173103bc799e1590e";
+  srcSha = "b0753045ae438c0869d37f429fe84451dcacc4b2ab9413d34bf29fde94fde462";
 
   /* Rust is bootstrapped from an earlier built version. We need
   to fetch these earlier versions, which vary per platform.

From 34023d867dae6bbb60b867de605fb61853679249 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 24 Feb 2016 23:27:02 +0300
Subject: [PATCH 1758/2285] fetchcargo: set CA bundle path

---
 pkgs/build-support/rust/fetchcargo.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index 7910887ba640..a77540c396f2 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -9,6 +9,7 @@ stdenv.mkDerivation {
   phases = "unpackPhase installPhase";
 
   installPhase = ''
+    export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
     bash ${./fetch-cargo-deps} . "$out"
   '';
 

From 39609a0c9414b398330e42f872e7358e30e133dd Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 25 Feb 2016 13:53:03 +0300
Subject: [PATCH 1759/2285] stdenv: set SSL_CERT_FILE only if it isn't already

---
 pkgs/stdenv/generic/setup.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh
index 8081b69bffd3..b49846fa050c 100644
--- a/pkgs/stdenv/generic/setup.sh
+++ b/pkgs/stdenv/generic/setup.sh
@@ -384,7 +384,9 @@ paxmark() { true; }
 
 # Prevent OpenSSL-based applications from using certificates in
 # /etc/ssl.
-export SSL_CERT_FILE=/no-cert-file.crt
+if [ -z "$SSL_CERT_FILE" ]; then
+  export SSL_CERT_FILE=/no-cert-file.crt
+fi
 
 
 ######################################################################

From 93aea6eccd95bd5048030e02f8a06cd3db4a2def Mon Sep 17 00:00:00 2001
From: Tobias Pflug <tobias.pflug@holidaycheck.com>
Date: Thu, 25 Feb 2016 11:25:06 +0100
Subject: [PATCH 1760/2285] sauce-connect: 4.3.6 -> 4.3.13

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

diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix
index 7f925da376b8..cc904153baf8 100644
--- a/pkgs/development/tools/sauce-connect/default.nix
+++ b/pkgs/development/tools/sauce-connect/default.nix
@@ -1,21 +1,27 @@
-{ stdenv, lib, fetchurl, zlib }:
+{ stdenv, lib, fetchurl, zlib, unzip }:
 
 with lib;
 
 stdenv.mkDerivation rec {
   name = "sauce-connect-${version}";
-  version = "4.3.6";
+  version = "4.3.13";
 
   src = fetchurl (
     if stdenv.system == "x86_64-linux" then {
       url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz";
       sha1 = "0d7d2dc12766ac137e62a3e4dad3025b590f9782";
-    } else {
+    } else if stdenv.system == "i686-linux" then {
       url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz";
       sha1 = "ee2c3002eae3b29df801a2ac1db77bb5f1c97bcc";
+    } else {
+      url = "https://saucelabs.com/downloads/sc-${version}-osx.zip";
+      sha1 = "ihr4ynnyi464pafgqyl5xkhfi13yi76j";
     }
   );
 
+  buildInputs = [ unzip ];
+  phases = "unpackPhase installPhase" + (if stdenv.system == "x86_64-darwin" then "" else "patchPhase");
+
   patchPhase = ''
     patchelf \
       --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
@@ -35,6 +41,6 @@ stdenv.mkDerivation rec {
     license = licenses.unfree;
     homepage = https://docs.saucelabs.com/reference/sauce-connect/;
     maintainers = with maintainers; [offline];
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
   };
 }

From 4f74a4aacb29b5d4d7fee4cf71e79b0fae681624 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 25 Feb 2016 14:05:14 +0300
Subject: [PATCH 1761/2285] fetch-cargo-deps: factor into fetchCargoDeps
 function

---
 pkgs/build-support/rust/fetch-cargo-deps | 284 +++++++++++------------
 pkgs/build-support/rust/fetchcargo.nix   |   5 +-
 2 files changed, 143 insertions(+), 146 deletions(-)

diff --git a/pkgs/build-support/rust/fetch-cargo-deps b/pkgs/build-support/rust/fetch-cargo-deps
index 5074e26848ed..4fbc53d1039e 100755
--- a/pkgs/build-support/rust/fetch-cargo-deps
+++ b/pkgs/build-support/rust/fetch-cargo-deps
@@ -1,183 +1,177 @@
-source $stdenv/setup
+fetchCargoDeps() {
+    src=$(realpath $1)
+    out=$(realpath $2)
 
-set -euo pipefail
+    echo "Fetching $src to $out"
 
-src=$(realpath $1)
-out=$(realpath $2)
+    mkdir $out
 
-echo "Fetching $src to $out"
+    # Configure cargo to fetch from a local copy of the crates.io registry
 
-mkdir $out
+    echo "Using rust registry from $rustRegistry"
 
-# Configure cargo to fetch from a local copy of the crates.io registry
-
-echo "Using rust registry from $rustRegistry"
-
-cat <<EOF > $out/config
+    cat <<EOF > $out/config
 [registry]
 index = "file://$rustRegistry"
 EOF
 
-export CARGO_HOME=$out
-cd $src
+    export CARGO_HOME=$out
+    cd $src
 
-if [[ ! -f Cargo.lock ]]; then
-    echo
-    echo "ERROR: The Cargo.lock file doesn't exist"
-    echo
-    echo "Cargo.lock is needed to make sure that depsSha256 doesn't change"
-    echo "when the registry is updated."
-    echo
+    if [[ ! -f Cargo.lock ]]; then
+        echo
+        echo "ERROR: The Cargo.lock file doesn't exist"
+        echo
+        echo "Cargo.lock is needed to make sure that depsSha256 doesn't change"
+        echo "when the registry is updated."
+        echo
 
-    exit 1
-fi
+        exit 1
+    fi
 
-# We need to do the following string replacement so that 'cargo fetch'
-# doesn't ignore the versions specified in Cargo.lock
-set +u
-substituteInPlace Cargo.lock \
-    --replace "registry+https://github.com/rust-lang/crates.io-index" \
-              "registry+file://$rustRegistry"
-set -u
+    # We need to do the following string replacement so that 'cargo fetch'
+    # doesn't ignore the versions specified in Cargo.lock
+    substituteInPlace Cargo.lock \
+        --replace "registry+https://github.com/rust-lang/crates.io-index" \
+                  "registry+file://$rustRegistry"
 
-# Do any possible 'cargo update -p <pkgName> --precise <version>' ad-hoc updates
-eval "$cargoUpdateHook"
+    # Do any possible 'cargo update -p <pkgName> --precise <version>' ad-hoc updates
+    eval "$cargoUpdateHook"
 
-# Do the fetch
-cargo fetch --verbose
+    # Do the fetch
+    cargo fetch --verbose
 
-# Now that we have fetched everything, let's make the output deterministic
+    # Now that we have fetched everything, let's make the output deterministic
 
-# Cargo uses the following directory structure for fetched data, where
-# $indexHash is a hash of the registry index URL:
-#
-#
-# /config:
-#
-#     Cargo config file. We'll delete this because it's not deterministic,
-#     and instead recreate it just before running 'cargo build'.
-#
-# /registry/cache/$indexHash/:
-#
-#     This is where tarballs of registry package dependencies are kept
-#     We'll need to keep this, but make sure $indexHash is a fixed name.
-#
-# /registry/index/$indexHash/:
-#
-#     A copy of the registry index is kept here. We can delete this, and
-#     instead, just before running 'cargo build', we'll symlink this
-#     directory to our static copy of the registry in the Nix store.
-#
-# /registry/src/$indexHash/{pkgName-pkgVersion}/:
-#
-#     Here cargo keeps extracted sources of the cached tarballs.
-#     We'll just delete this because cargo will re-populate them from the
-#     tarballs.
-#
-# /git/db/{domain-hash}/:
-#
-#     Here cargo keeps the `.git` directories of git dependencies.
-#     We'll need to keep these, but make them deterministic.
-#
-# /git/checkouts/{domain-hash}/{branchName}/:
-#
-#     Here cargo keeps checked-out sources of the git dependencies.
-#     We can delete this, because cargo will re-populate them from the above
-#     `.git` directories.
-#
-# Let's start
+    # Cargo uses the following directory structure for fetched data, where
+    # $indexHash is a hash of the registry index URL:
+    #
+    #
+    # /config:
+    #
+    #     Cargo config file. We'll delete this because it's not deterministic,
+    #     and instead recreate it just before running 'cargo build'.
+    #
+    # /registry/cache/$indexHash/:
+    #
+    #     This is where tarballs of registry package dependencies are kept
+    #     We'll need to keep this, but make sure $indexHash is a fixed name.
+    #
+    # /registry/index/$indexHash/:
+    #
+    #     A copy of the registry index is kept here. We can delete this, and
+    #     instead, just before running 'cargo build', we'll symlink this
+    #     directory to our static copy of the registry in the Nix store.
+    #
+    # /registry/src/$indexHash/{pkgName-pkgVersion}/:
+    #
+    #     Here cargo keeps extracted sources of the cached tarballs.
+    #     We'll just delete this because cargo will re-populate them from the
+    #     tarballs.
+    #
+    # /git/db/{domain-hash}/:
+    #
+    #     Here cargo keeps the `.git` directories of git dependencies.
+    #     We'll need to keep these, but make them deterministic.
+    #
+    # /git/checkouts/{domain-hash}/{branchName}/:
+    #
+    #     Here cargo keeps checked-out sources of the git dependencies.
+    #     We can delete this, because cargo will re-populate them from the above
+    #     `.git` directories.
+    #
+    # Let's start
 
-# Remove cargo config file, which points to the ever-changing registry
-rm $out/config
+    # Remove cargo config file, which points to the ever-changing registry
+    rm $out/config
 
-# Save the Cargo.lock file into the output, so that we don't have to do another
-# 'cargo update' during the build (which would try to access the network) for
-# any ad-hoc package updates (through $cargoUpdateHook).
-#
-# We need to replace the rustRegistry URL with something deterministic.
-# Since the URL won't actually be accessed anymore, it's fine to use /dev/null.
+    # Save the Cargo.lock file into the output, so that we don't have to do another
+    # 'cargo update' during the build (which would try to access the network) for
+    # any ad-hoc package updates (through $cargoUpdateHook).
+    #
+    # We need to replace the rustRegistry URL with something deterministic.
+    # Since the URL won't actually be accessed anymore, it's fine to use /dev/null.
 
-set +u
-substituteInPlace Cargo.lock \
-    --replace "registry+file://$rustRegistry" \
-              "registry+file:///dev/null"
-set -u
-mv Cargo.lock $out/
+    substituteInPlace Cargo.lock \
+        --replace "registry+file://$rustRegistry" \
+                  "registry+file:///dev/null"
+    mv Cargo.lock $out/
 
 
-# Let's replace $indexHash with something more deterministic
-mv $out/registry/cache/* $out/registry/cache/HASH
+    # Let's replace $indexHash with something more deterministic
+    mv $out/registry/cache/* $out/registry/cache/HASH
 
-# The registry index changes all the time, so it's not deterministic
-# We'll symlink it before running 'cargo build'
-rm -rf $out/registry/index/*
+    # The registry index changes all the time, so it's not deterministic
+    # We'll symlink it before running 'cargo build'
+    rm -rf $out/registry/index/*
 
-# Make git DBs deterministic
-# TODO: test with git submodules
-[[ ! -d $out/git/checkouts ]] || (cd $out/git/checkouts && for name in *; do
-    revs=""
-    cd "$out/git/checkouts/$name"
-    while read dir; do
-        # extract substring: [dir = "./xxx/yyy/.git"] => [branch = "xxx/yyy"]
-        branch="${dir:2:$((${#dir}-7))}"
+    # Make git DBs deterministic
+    # TODO: test with git submodules
+    [[ ! -d $out/git/checkouts ]] || (cd $out/git/checkouts && for name in *; do
+        revs=""
+        cd "$out/git/checkouts/$name"
+        while read dir; do
+            # extract substring: [dir = "./xxx/yyy/.git"] => [branch = "xxx/yyy"]
+            branch="${dir:2:$((${#dir}-7))}"
 
-        cd "$out/git/checkouts/$name/$branch"
-        rev="$(git rev-parse HEAD)"
-        revs="$revs $rev"
-    done < <(find . -type d -name .git -print)
+            cd "$out/git/checkouts/$name/$branch"
+            rev="$(git rev-parse HEAD)"
+            revs="$revs $rev"
+        done < <(find . -type d -name .git -print)
 
-    echo "List of revs to keep for git db $name: $revs"
+        echo "List of revs to keep for git db $name: $revs"
 
-    (
-        # The following code was adapted from nix-prefetch-git
+        (
+            # The following code was adapted from nix-prefetch-git
 
-        cd "$out/git/db/$name"
+            cd "$out/git/db/$name"
 
-        export GIT_DIR=.
+            export GIT_DIR=.
 
-        # Remove all remote branches
-        git branch -r | while read branch; do
-            git branch -rD "$branch" >&2
-        done
+            # Remove all remote branches
+            git branch -r | while read branch; do
+                git branch -rD "$branch" >&2
+            done
 
-        # Remove all tags
-        git tag | while read tag; do
-            git tag -d "$tag" >&2
-        done
+            # Remove all tags
+            git tag | while read tag; do
+                git tag -d "$tag" >&2
+            done
 
-        # Remove all local branches
-        branchrefs=()
-        eval "$(git for-each-ref --shell --format='branchrefs+=(%(refname))' refs/heads/)"
+            # Remove all local branches
+            branchrefs=()
+            eval "$(git for-each-ref --shell --format='branchrefs+=(%(refname))' refs/heads/)"
 
-        for branchref in "${branchrefs[@]}"; do
-            git update-ref -d "$branchref" >&2
-        done
+            for branchref in "${branchrefs[@]}"; do
+                git update-ref -d "$branchref" >&2
+            done
 
-        # Create ad-hoc branches for the revs we need
-        echo "$revs" | while read rev; do
-            echo "Creating git branch b_$rev $rev"
-            git branch b_$rev $rev
-        done
+            # Create ad-hoc branches for the revs we need
+            echo "$revs" | while read rev; do
+                echo "Creating git branch b_$rev $rev"
+                git branch b_$rev $rev
+            done
 
-        # Remove files that have timestamps or otherwise have non-deterministic
-        # properties.
-        rm -rf logs/ hooks/ index FETCH_HEAD ORIG_HEAD refs/remotes/origin/HEAD config
+            # Remove files that have timestamps or otherwise have non-deterministic
+            # properties.
+            rm -rf logs/ hooks/ index FETCH_HEAD ORIG_HEAD refs/remotes/origin/HEAD config
 
-        # Do a full repack. Must run single-threaded, or else we lose determinism.
-        git config pack.threads 1
-        git repack -A -d -f
-        rm -f config
+            # Do a full repack. Must run single-threaded, or else we lose determinism.
+            git config pack.threads 1
+            git repack -A -d -f
+            rm -f config
 
-        # Garbage collect unreferenced objects.
-        git gc --prune=all
-    )
-done)
+            # Garbage collect unreferenced objects.
+            git gc --prune=all
+        )
+    done)
 
-# Remove unneeded outputs
-[[ ! -d $out/registry/src ]] || rm -rf $out/registry/src
-[[ ! -d $out/git/checkouts ]] || rm -rf $out/git/checkouts
+    # Remove unneeded outputs
+    [[ ! -d $out/registry/src ]] || rm -rf $out/registry/src
+    [[ ! -d $out/git/checkouts ]] || rm -rf $out/git/checkouts
 
-# XXX: provide some debugging output to see find out why we are seeing
-# sporadic hash mismatches
-find $out ! -type f
-find $out -type f -exec sha256sum {} +
+    # XXX: provide some debugging output to see find out why we are seeing
+    # sporadic hash mismatches
+    find $out ! -type f
+    find $out -type f -exec sha256sum {} +
+}
diff --git a/pkgs/build-support/rust/fetchcargo.nix b/pkgs/build-support/rust/fetchcargo.nix
index a77540c396f2..518420002622 100644
--- a/pkgs/build-support/rust/fetchcargo.nix
+++ b/pkgs/build-support/rust/fetchcargo.nix
@@ -9,8 +9,11 @@ stdenv.mkDerivation {
   phases = "unpackPhase installPhase";
 
   installPhase = ''
+    source ${./fetch-cargo-deps}
+
     export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt
-    bash ${./fetch-cargo-deps} . "$out"
+
+    fetchCargoDeps . "$out"
   '';
 
   outputHashAlgo = "sha256";

From 770f66b2ce50e3020139d9662acaa4da0411a14a Mon Sep 17 00:00:00 2001
From: Kamil Chmielewski <kamil.chm@gmail.com>
Date: Thu, 21 Jan 2016 09:51:21 +0100
Subject: [PATCH 1762/2285] nimble: init at 0.7.2

---
 pkgs/development/tools/nimble/default.nix | 43 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  1 +
 2 files changed, 44 insertions(+)
 create mode 100644 pkgs/development/tools/nimble/default.nix

diff --git a/pkgs/development/tools/nimble/default.nix b/pkgs/development/tools/nimble/default.nix
new file mode 100644
index 000000000000..10a19d9e0963
--- /dev/null
+++ b/pkgs/development/tools/nimble/default.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchFromGitHub, nim }:
+
+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;
+
+  buildInputs = [ nim ];
+
+  postUnpack = ''
+    mkdir -p $sourceRoot/vendor
+    ln -s ${srcs.nim} $sourceRoot/vendor/nim
+  '';
+  buildPhase   = ''
+    nim c src/nimble
+  '';
+  installPhase = "installBin src/nimble";
+
+  meta = with stdenv.lib; {
+    description = "Package manager for the Nim programming language";
+    homepage = https://github.com/nim-lang/nimble;
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ kamilchm ];
+    platforms = platforms.linux ++ platforms.darwin;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8390ee8fb5f..18cfb42324b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4548,6 +4548,7 @@ let
   mozart = mozart-binary;
 
   nim = callPackage ../development/compilers/nim { };
+  nimble = callPackage ../development/tools/nimble { };
 
   neko = callPackage ../development/compilers/neko { };
 

From a4902ff1fa8ef4218168f8191104b9f5fe49dd00 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 25 Feb 2016 14:21:46 +0300
Subject: [PATCH 1763/2285] rustUnstable.cargo: 2016-01-10 -> 2016-02-25

---
 pkgs/development/tools/build-managers/cargo/head.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/tools/build-managers/cargo/head.nix b/pkgs/development/tools/build-managers/cargo/head.nix
index d5a2dce66828..298177296a6c 100644
--- a/pkgs/development/tools/build-managers/cargo/head.nix
+++ b/pkgs/development/tools/build-managers/cargo/head.nix
@@ -5,7 +5,7 @@ with rustPlatform;
 
 with ((import ./common.nix) {
   inherit stdenv rustc;
-  version = "2016-01-10";
+  version = "2016-02-25";
 });
 
 buildRustPackage rec {
@@ -14,11 +14,11 @@ buildRustPackage rec {
   # Needs to use fetchgit instead of fetchFromGitHub to fetch submodules
   src = fetchgit {
     url = "git://github.com/rust-lang/cargo";
-    rev = "ca373452de159491354cf38279dbc19308c91e72";
-    sha256 = "0fx88b3ndvzhfwq159xavs0z5c7jww231kd65cbzyih9g0ab9x65";
+    rev = "e7212896dc1b182493a0252a2a126db8be067153";
+    sha256 = "1qbic7gp7cpihi40kfv3kagja8zsngica8sq9jcm9czb6ba44dsa";
   };
 
-  depsSha256 = "0csagk2dnwg5z0vbxilz1kzcygd4llw7s81ka0xn1g05x30jqrnn";
+  depsSha256 = "1xfpj1233p4314j6jmip0jjl5m3kj2wbac1ll3yvh7383zb83i1s";
 
   buildInputs = [ file curl pkgconfig python openssl cmake zlib makeWrapper ];
 

From a68eae786646e3a66b204d6c2f63a3793a2fee49 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Thu, 25 Feb 2016 13:05:52 +0300
Subject: [PATCH 1764/2285] rustfmt: 2015-12-23 -> 2016-02-15

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

diff --git a/pkgs/development/tools/rust/rustfmt/default.nix b/pkgs/development/tools/rust/rustfmt/default.nix
index f67b1f00a0f8..28c88d6c15a2 100644
--- a/pkgs/development/tools/rust/rustfmt/default.nix
+++ b/pkgs/development/tools/rust/rustfmt/default.nix
@@ -3,15 +3,15 @@
 with rustPlatform;
 
 buildRustPackage rec {
-  name = "rustfmt-git-2015-12-23";
+  name = "rustfmt-git-2016-02-15";
   src = fetchFromGitHub {
     owner = "rust-lang-nursery";
     repo = "rustfmt";
-    rev = "c0b7de7c521dc65b2ad2b5a3c81fb56030f4af22";
-    sha256 = "1axnp8w26c3dwlx7bby3qi6385n301rlk1ndh5yaz7vkbpn4w9km";
+    rev = "65bc5c242de86f0651b34fd913ca338a880696e8";
+    sha256 = "02rdim0y5zg1r2zkfy6kj53idlbdybf3ckardbjsvdna5idc1hpz";
   };
 
-  depsSha256 = "1s2as7qc7jbksc16gj5cxxm52zw8h4nfgka66dmwwjlv9679wj9f";
+  depsSha256 = "1297vy5sgiq4xqdm27pa8f99qiwrl15hb2r1dydzgk7n4iqyir6c";
 
   meta = with stdenv.lib; {
     description = "A tool for formatting Rust code according to style guidelines";

From d09c7986de7d0d4ece340838b9e40eb496486b9f Mon Sep 17 00:00:00 2001
From: Michael Raitza <spacefrogg-github@meterriblecrew.net>
Date: Wed, 24 Feb 2016 21:41:02 +0000
Subject: [PATCH 1765/2285] config.security.oath: new module

Add a module to make options to pam_oath module configurable.
These are:
 - enable - enable the OATH pam module
 - window - number of OTPs to check
 - digits - length of the OTP (adds support for two-factor auth)
 - usersFile - filename to store OATH credentials in
---
 nixos/modules/module-list.nix   |  1 +
 nixos/modules/security/oath.nix | 50 +++++++++++++++++++++++++++++++++
 nixos/modules/security/pam.nix  | 17 +++--------
 3 files changed, 55 insertions(+), 13 deletions(-)
 create mode 100644 nixos/modules/security/oath.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index c2bcc361c447..f41e17189a42 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -93,6 +93,7 @@
   ./security/ca.nix
   ./security/duosec.nix
   ./security/grsecurity.nix
+  ./security/oath.nix
   ./security/pam.nix
   ./security/pam_usb.nix
   ./security/pam_mount.nix
diff --git a/nixos/modules/security/oath.nix b/nixos/modules/security/oath.nix
new file mode 100644
index 000000000000..20f3e2dd9f83
--- /dev/null
+++ b/nixos/modules/security/oath.nix
@@ -0,0 +1,50 @@
+# This module provides configuration for the OATH PAM modules.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  options = {
+
+    security.pam.oath = {
+      enable = mkOption {
+        type = types.bool;
+        default = false;
+        description = ''
+          Enable the OATH (one-time password) PAM module.
+        '';
+      };
+
+      digits = mkOption {
+        type = types.enum [ 6 7 8 ];
+        default = 6;
+        description = ''
+          Specify the length of the one-time password in number of
+          digits.
+        '';
+      };
+
+      window = mkOption {
+        type = types.int;
+        default = 5;
+        description = ''
+          Specify the number of one-time passwords to check in order
+          to accommodate for situations where the system and the
+          client are slightly out of sync (iteration for HOTP or time
+          steps for TOTP).
+        '';
+      };
+
+      usersFile = mkOption {
+        type = types.path;
+        default = "/etc/users.oath";
+        description = ''
+          Set the path to file where the user's credentials are
+          stored. This file must not be world readable!
+        '';
+      };
+    };
+
+  };
+}
diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix
index 2ee8a803d2fe..021c561af759 100644
--- a/nixos/modules/security/pam.nix
+++ b/nixos/modules/security/pam.nix
@@ -75,7 +75,7 @@ let
       };
 
       oathAuth = mkOption {
-        default = config.security.pam.enableOATH;
+        default = config.security.pam.oath.enable;
         type = types.bool;
         description = ''
           If set, the OATH Toolkit will be used.
@@ -259,8 +259,8 @@ let
               "auth sufficient pam_unix.so ${optionalString cfg.allowNullPassword "nullok"} likeauth try_first_pass"}
           ${optionalString cfg.otpwAuth
               "auth sufficient ${pkgs.otpw}/lib/security/pam_otpw.so"}
-          ${optionalString cfg.oathAuth
-              "auth sufficient ${pkgs.oathToolkit}/lib/security/pam_oath.so window=5 usersfile=/etc/users.oath"}
+          ${let oath = config.security.pam.oath; in optionalString cfg.oathAuth
+              "auth sufficient ${pkgs.oathToolkit}/lib/security/pam_oath.so window=${toString oath.window} usersfile=${toString oath.usersFile} digits=${toString oath.digits}"}
           ${optionalString config.users.ldap.enable
               "auth sufficient ${pam_ldap}/lib/security/pam_ldap.so use_first_pass"}
           ${optionalString config.krb5.enable ''
@@ -302,8 +302,6 @@ let
               "session optional ${pam_krb5}/lib/security/pam_krb5.so"}
           ${optionalString cfg.otpwAuth
               "session optional ${pkgs.otpw}/lib/security/pam_otpw.so"}
-          ${optionalString cfg.oathAuth
-              "session optional ${pkgs.oathToolkit}/lib/security/pam_oath.so window=5 usersfile=/etc/users.oath"}
           ${optionalString cfg.startSession
               "session optional ${pkgs.systemd}/lib/security/pam_systemd.so"}
           ${optionalString cfg.forwardXAuth
@@ -405,13 +403,6 @@ in
       '';
     };
 
-    security.pam.enableOATH = mkOption {
-      default = false;
-      description = ''
-        Enable the OATH (one-time password) PAM module.
-      '';
-    };
-
     security.pam.enableU2F = mkOption {
       default = false;
       description = ''
@@ -446,7 +437,7 @@ in
       ++ optional config.users.ldap.enable pam_ldap
       ++ optionals config.krb5.enable [pam_krb5 pam_ccreds]
       ++ optionals config.security.pam.enableOTPW [ pkgs.otpw ]
-      ++ optionals config.security.pam.enableOATH [ pkgs.oathToolkit ]
+      ++ optionals config.security.pam.oath.enable [ pkgs.oathToolkit ]
       ++ optionals config.security.pam.enableU2F [ pkgs.pam_u2f ]
       ++ optionals config.security.pam.enableEcryptfs [ pkgs.ecryptfs ];
 

From 159c8f92845bfaf6bbff7071d3fa6980f55b5ea4 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Thu, 25 Feb 2016 15:49:37 +0100
Subject: [PATCH 1766/2285] taskwarrior: 2.5.0 -> 2.5.1

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

diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix
index 97acc18211e9..5590e4179db0 100644
--- a/pkgs/applications/misc/taskwarrior/default.nix
+++ b/pkgs/applications/misc/taskwarrior/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "taskwarrior-${version}";
-  version = "2.5.0";
+  version = "2.5.1";
 
   enableParallelBuilding = true;
 
   src = fetchurl {
     url = "http://www.taskwarrior.org/download/task-${version}.tar.gz";
-    sha256 = "0dj66c4pwdmfnzdlm1r23gqim6banycyzvmq266114v9b90ng3jd";
+    sha256 = "059a9yc58wcicc6xxsjh1ph7k2yrag0spsahp1wqmsq6h7jwwyyq";
   };
 
   nativeBuildInputs = [ cmake libuuid gnutls ];

From 84a4d9e0e1133d971bd30590770370c666262b6c Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 25 Feb 2016 15:15:00 +0000
Subject: [PATCH 1767/2285] cide: add missing git runtime dependency

`git` is being used during `cide package`
---
 .../development/tools/continuous-integration/cide/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/cide/default.nix b/pkgs/development/tools/continuous-integration/cide/default.nix
index 1dc8f8def337..c8c35330e30e 100644
--- a/pkgs/development/tools/continuous-integration/cide/default.nix
+++ b/pkgs/development/tools/continuous-integration/cide/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, bundlerEnv, makeWrapper, docker }:
+{ stdenv, lib, bundlerEnv, makeWrapper, docker, git }:
 
 stdenv.mkDerivation rec {
   name = "cide-${version}";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     makeWrapper ${env}/bin/cide $out/bin/cide \
-      --set PATH ${docker}/bin
+      --set PATH ${docker}/bin:${git}/bin
   '';
 
   meta = with lib; {

From d3d193e263d3d42b52986fccc0615849028b1c45 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 25 Feb 2016 17:57:58 +0300
Subject: [PATCH 1768/2285] octoprint-plugins.m3d-fio: 0.27 -> 0.27.1

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

diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 9b5a9ef15012..39384e15a369 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -8,13 +8,13 @@ in {
 
   m3d-fio = buildPlugin rec {
     name = "M3D-Fio-${version}";
-    version = "0.27";
+    version = "0.27.1";
 
     src = fetchFromGitHub {
       owner = "donovan6000";
       repo = "M3D-Fio";
       rev = "V${version}";
-      sha256 = "14zva61dhnsyapapw8q2qadfq5hzv5ykb7qxlz8a3x5j6wfhjn6h";
+      sha256 = "0jfb417wgdq6fzpxwq6xrrlpkndjwq69h4cdm0ixbyqkp7a3kcm2";
     };
 
     patches = [

From 9b3296017fdc7c1e2347c28b6985bae6d56dc9fd Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 22 Feb 2016 21:28:04 +0100
Subject: [PATCH 1769/2285] mcelog: 131 -> 132

Add CPU_ATOM to Intel CPU list.
---
 pkgs/os-specific/linux/mcelog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index c185d69c5540..9b347a8da54b 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "mcelog-${version}";
-  version = "131";
+  version = "132";
 
   src = fetchFromGitHub {
-    sha256 = "1hqb06gdx5bw4jh6xix0z5qhi4956asykf43zk1m1mjsj8lkzaps";
+    sha256 = "0qr0rdkva8a8wzsdmk0dm9zhpdnwp1lmla324xnayf0afyym3zj8";
     rev = "v${version}";
     repo = "mcelog";
     owner = "andikleen";

From 759f48ab072426a0145f7a1833285f29882bf80a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 23 Feb 2016 01:22:32 +0100
Subject: [PATCH 1770/2285] sane-backends-git: 2016-02-19 -> 2016-02-22

---
 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 ad1302c9913d..12dd739c29bf 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-02-19";
+  version = "2016-02-22";
   src = fetchgit {
-    sha256 = "d50971c106c8e0071d71daad7235776ac9a07a5ab0adb1e0eae5536b3021dd5f";
-    rev = "d74d3bcd887d2a3d59ee96e04eb68f15c0a3b882";
+    sha256 = "476abced4a9ccc95eb0796ef1d2e1d9be76c0db14adc248a9feaae3c8a61645e";
+    rev = "a74ebe551daf8750821b1ab57324e54141a84461";
     url = "git://alioth.debian.org/git/sane/sane-backends.git";
   };
 })

From 818263ce46dad548ab27790db58caeb281065e63 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 23 Feb 2016 01:26:38 +0100
Subject: [PATCH 1771/2285] miniupnpd: 1.9.20160216 -> 1.9.20160222

- set IPv6 Hop limit to 10
- fix HOST: header of event notifications in IPv6
- be more compliant on 64bit machines : ui4 in [0;2^32-1]
---
 pkgs/tools/networking/miniupnpd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index d93b429ea4fc..d2bc7b4e7725 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "miniupnpd-1.9.20160216";
+  name = "miniupnpd-1.9.20160222";
 
   src = fetchurl {
     url = "http://miniupnp.free.fr/files/download.php?file=${name}.tar.gz";
-    sha256 = "001f9qc8zzrqbmjvpgwvpmi85sgb5ncl6gi9djxjr5n95a92r0g3";
+    sha256 = "0q694dla4v36qsc0x50xqg2jjhwdi9pl7r2gl10yvhkahxqx1ng7";
     name = "${name}.tar.gz";
   };
 

From e82a080303c32ec0ce7a4de0c6ccc6591be8d12e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Tue, 23 Feb 2016 01:41:20 +0100
Subject: [PATCH 1772/2285] pythonPackages.click: 6.2 -> 6.3

Bugfix release; released on February 22 2016:
- Fix argument checks for interpreter invoke with `-m` and `-c`
  on Windows.
- Fixed a bug that cased locale detection to error out on Python 3.

Re-builds many Python packages, but no new failures on x86-64.
---
 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 ffcd6c4229d3..25ba60f69bf5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2956,11 +2956,11 @@ in modules // {
   };
 
   click = buildPythonPackage rec {
-    name = "click-6.2";
+    name = "click-6.3";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/c/click/${name}.tar.gz";
-      sha256 = "10kavbisnk9m93jl2wi34pw7ryr2qbxshh2cysxwxd7bymqgz87v";
+      sha256 = "076cr1xbhfyfrzkvflz1i0950jgjn2161hp3f5xji4z1mgxdj85p";
     };
 
     buildInputs = with self; [ pytest ];

From ebc9ba92d26ac1f9c1fa8237ba2ad5f352f9fc3f Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 25 Feb 2016 02:22:43 +0100
Subject: [PATCH 1773/2285] proot: generate and install manual page

---
 pkgs/tools/system/proot/default.nix | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix
index be3cffb47eb3..a5d90bae932d 100644
--- a/pkgs/tools/system/proot/default.nix
+++ b/pkgs/tools/system/proot/default.nix
@@ -1,4 +1,5 @@
-{ stdenv, fetchgit, talloc, enableStatic ? false }:
+{ stdenv, fetchgit, talloc, docutils
+, enableStatic ? false }:
 
 stdenv.mkDerivation rec {
   name = "proot-${version}";
@@ -11,14 +12,25 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [ talloc ];
+  nativeBuildInputs = [ docutils ];
+
+  enableParallelBuilding = true;
 
   preBuild = stdenv.lib.optionalString enableStatic ''
     export LDFLAGS="-static -L${talloc}/lib"
-  '' + ''
-    substituteInPlace GNUmakefile --replace "/usr/local" "$out"
   '';
 
-  sourceRoot = "proot/src";
+  makeFlags = [ "-C src" ];
+
+  postBuild = ''
+    make -C doc proot/man.1
+  '';
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  postInstall = ''
+    install -Dm644 doc/proot/man.1 $out/share/man/man1/proot.1
+  '';
 
   meta = with stdenv.lib; {
     homepage = http://proot.me;

From d9f5e94bae088234791ae28f0d813a9fad5b8163 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 25 Feb 2016 02:28:33 +0100
Subject: [PATCH 1774/2285] proot: 4.0.3 -> 5.1.0

New features
------------
* Processes under PRoot now appear with their real names, that is,
  they are not renamed ld-linux.so or prooted-... anymore.
* Own ELF loader.

Fixes
-----
* Most bugs related to shebang support -- ie. #! at the beginning of
  a program -- were fixed.
* It is now possible to use GDB against multi-threaded programs under
  PRoot x86_64 and x86.
* It is possible to execute x86_64 programs from x86 programs again.
* It is possible to use x86 ptrace-based programs (strace, gdb, ...)
  under PRoot x86_64 again.
* The loader is now built with the build-id linker option explicitly
  disabled.  This special section might interfere with loaded
  programs.
* The loader can now load relocatable objects that have a predefined
  base address.
---
 pkgs/tools/system/proot/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix
index a5d90bae932d..aecab9c35d08 100644
--- a/pkgs/tools/system/proot/default.nix
+++ b/pkgs/tools/system/proot/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchgit, talloc, docutils
+{ stdenv, fetchFromGitHub, talloc, docutils
 , enableStatic ? false }:
 
 stdenv.mkDerivation rec {
   name = "proot-${version}";
-  version = "4.0.3";
+  version = "5.1.0";
 
-  src = fetchgit {
-    url = "git://github.com/cedric-vincent/proot.git";
-    rev = "refs/tags/v${version}";
-    sha256 = "95a52b2fa47b2891eb2c6b6b0e14d42f6d48f6fd5181e359b007831f1a046e84";
+  src = fetchFromGitHub {
+    sha256 = "0azsqis99gxldmbcg43girch85ysg4hwzf0h1b44bmapnsm89fbz";
+    rev = "v${version}";
+    repo = "proot";
+    owner = "cedric-vincent";
   };
 
   buildInputs = [ talloc ];
@@ -37,7 +38,7 @@ stdenv.mkDerivation rec {
     description = "User-space implementation of chroot, mount --bind and binfmt_misc";
     platforms = platforms.linux;
     license = licenses.gpl2;
-    maintainers = [ maintainers.ianwookim ];
+    maintainers = with maintainers; [ ianwookim nckx ];
   };
 }
 

From 69932f905ac5026edb3dc6dadaa39a2652cbcda1 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 25 Feb 2016 17:58:09 +0300
Subject: [PATCH 1775/2285] blueman: fix networking, settings

---
 pkgs/tools/bluetooth/blueman/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 82d9f085f78e..428c751571cf 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -1,9 +1,9 @@
 { stdenv, lib, fetchurl, intltool, pkgconfig, pythonPackages, bluez, polkit, gtk3
-, obex_data_server, xdg_utils, libnotify, dconf
+, obex_data_server, xdg_utils, libnotify, dconf, gsettings_desktop_schemas, dnsmasq, dhcp
 , withPulseAudio ? true, libpulseaudio }:
 
 let
-  binPath = lib.makeBinPath [ xdg_utils ];
+  binPath = lib.makeBinPath [ xdg_utils dnsmasq dhcp ];
 
 in stdenv.mkDerivation rec {
   name = "blueman-${version}";
@@ -16,7 +16,7 @@ in stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ intltool pkgconfig pythonPackages.wrapPython pythonPackages.cython ];
 
-  buildInputs = [ bluez gtk3 pythonPackages.python libnotify dconf ]
+  buildInputs = [ bluez gtk3 pythonPackages.python libnotify dconf gsettings_desktop_schemas ]
                 ++ pythonPath
                 ++ lib.optional withPulseAudio libpulseaudio;
 
@@ -26,7 +26,7 @@ in stdenv.mkDerivation rec {
 
   pythonPath = with pythonPackages; [ dbus pygobject3 ];
 
-  propagatedUserEnvPkgs = [ obex_data_server ];
+  propagatedUserEnvPkgs = [ obex_data_server dconf ];
 
   configureFlags = [ (lib.enableFeature withPulseAudio "pulseaudio") ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d18c582ead40..a2ad53c5a33a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1031,7 +1031,7 @@ let
   bittornado = callPackage ../tools/networking/p2p/bit-tornado { };
 
   blueman = callPackage ../tools/bluetooth/blueman {
-    inherit (gnome3) dconf;
+    inherit (gnome3) dconf gsettings_desktop_schemas;
     withPulseAudio = config.pulseaudio or true;
   };
 

From a2c8bee109084a6a7c6e479f28d453d8d82808a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 25 Feb 2016 15:54:31 +0000
Subject: [PATCH 1776/2285] linuxPackages: set to 4.4 (latests LTS) fixes
 #13394

---
 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 a2ad53c5a33a..702d4c2ab175 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10538,7 +10538,7 @@ let
   };
 
   # The current default kernel / kernel modules.
-  linuxPackages = linuxPackages_4_1;
+  linuxPackages = linuxPackages_4_4;
   linux = linuxPackages.kernel;
 
   # Update this when adding the newest kernel major version!

From 6a27fc57b73bf569d2caec6364d75bc55e409910 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 25 Feb 2016 16:50:37 +0100
Subject: [PATCH 1777/2285] radvd: 2.11 -> 2.12

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

diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix
index 63f82f12787d..84db01dc4ba1 100644
--- a/pkgs/tools/networking/radvd/default.nix
+++ b/pkgs/tools/networking/radvd/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }:
 
 stdenv.mkDerivation rec {
-  name = "radvd-2.11";
-  
+  name = "radvd-2.12";
+
   src = fetchurl {
     url = "http://www.litech.org/radvd/dist/${name}.tar.xz";
-    sha256 = "1k2sbfs4w2lkgz2mh4zh66fgahjrn2hvxcpfc091bykrzj464qq4";
+    sha256 = "0yvlzzdxz2h5fm7grbf1xfs8008bzcdjpficm2cf52g771rffw5h";
   };
 
   buildInputs = [ pkgconfig libdaemon bison flex check ];
@@ -15,6 +15,6 @@ stdenv.mkDerivation rec {
     description = "IPv6 Router Advertisement Daemon";
     platforms = platforms.linux;
     license = licenses.bsdOriginal;
-    maintainers = with maintainers; [ wkennington ];
+    maintainers = with maintainers; [ wkennington fpletz ];
   };
 }

From c459ba8f858fbe229139579d1a8c024353ddf52f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Thu, 25 Feb 2016 16:48:55 +0100
Subject: [PATCH 1778/2285] ratools: init at 0.6.2

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

diff --git a/pkgs/tools/networking/ratools/default.nix b/pkgs/tools/networking/ratools/default.nix
new file mode 100644
index 000000000000..423c58450c56
--- /dev/null
+++ b/pkgs/tools/networking/ratools/default.nix
@@ -0,0 +1,32 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "ratools-${version}";
+  version = "0.6.2";
+
+  src = fetchFromGitHub {
+    owner = "danrl";
+    repo = "ratools";
+    rev = "v${version}";
+    sha256 = "07m45bn9lzgbfihmxic23wqp73nxg5ihrvkigr450jq6gzvgwawq";
+  };
+
+  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
+
+  makeFlags = "-C src";
+
+  installPhase = ''
+    mkdir -p $out/{bin,sbin,share/man/man8}
+    cp bin/ractl $out/bin
+    cp bin/rad $out/sbin
+    cp man/* $out/share/man/man8
+  '';
+
+  meta = with stdenv.lib; {
+    description = "a fast, dynamic, multi-threading framework for IPv6 Router Advertisements";
+    homepage = https://github.com/danrl/ratools;
+    license = licenses.asl20;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.fpletz ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 702d4c2ab175..0f756a175ac9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3018,6 +3018,8 @@ let
 
   rarcrack = callPackage ../tools/security/rarcrack { };
 
+  ratools = callPackage ../tools/networking/ratools { };
+
   rawdog = callPackage ../applications/networking/feedreaders/rawdog { };
 
   read-edid = callPackage ../os-specific/linux/read-edid { };

From 05730a9bf83ad32f6c3b6edfc8e28066c02d2ffa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 25 Feb 2016 15:59:35 +0000
Subject: [PATCH 1779/2285] travis-ci: enable tarball job again (now we have
 more memory)

---
 maintainers/scripts/travis-nox-review-pr.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh
index 545499557479..e0d1952d543d 100755
--- a/maintainers/scripts/travis-nox-review-pr.sh
+++ b/maintainers/scripts/travis-nox-review-pr.sh
@@ -27,6 +27,9 @@ elif [[ $1 == nox ]]; then
 elif [[ $1 == build ]]; then
     source $HOME/.nix-profile/etc/profile.d/nix.sh
 
+    echo "=== Checking tarball creation"
+    nix-build pkgs/top-level/release.nix -A tarball
+
     if [[ $TRAVIS_PULL_REQUEST == false ]]; then
         echo "=== Not a pull request"
     else
@@ -41,8 +44,6 @@ elif [[ $1 == build ]]; then
             exit 1
         fi
     fi
-    # echo "=== Checking tarball creation"
-    # nix-build pkgs/top-level/release.nix -A tarball
 else
     echo "$0: Unknown option $1" >&2
     false

From 77d11ec577810c827f4ee9053d01320c031abe66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Thu, 25 Feb 2016 17:48:07 +0100
Subject: [PATCH 1780/2285] idea.idea-{community,ultimate}: 15.0.3 -> 15.0.4

---
 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 751e66cca070..e9d25720f346 100644
--- a/pkgs/applications/editors/idea/default.nix
+++ b/pkgs/applications/editors/idea/default.nix
@@ -185,25 +185,25 @@ in
 
   idea-community = buildIdea rec {
     name = "idea-community-${version}";
-    version = "15.0.3";
-    build = "IC-143.1821";
+    version = "15.0.4";
+    build = "IC-143.2287";
     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 = "15hj4kqlpg3b4xp2v4f4iidascrc8s97mq8022nvbcs879gpajqa";
+      sha256 = "05kah5cx7x3rlaaxkvbbm7g8jvy9hc38q4jv7j5r9rkxd38fslvn";
     };
   };
 
   idea-ultimate = buildIdea rec {
     name = "idea-ultimate-${version}";
-    version = "15.0.3";
-    build = "IU-143.1821";
+    version = "15.0.4";
+    build = "IU-143.2287";
     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 = "02v8v2a7p620l4mlk7jqw9sl2455a1nya1dy84y23h9vq20aihlh";
+      sha256 = "0416y7krrak1q5pb8axskdamy06nfxmn4hj7421j8jaz0nc50dn4";
     };
   };
 

From 5e1da18b6dc3305912ccd1a54c7b0337d1cafc17 Mon Sep 17 00:00:00 2001
From: Josef Knedl <josef.kemetmueller@aon.at>
Date: Wed, 24 Feb 2016 01:01:46 +0100
Subject: [PATCH 1781/2285] tk: Fixes NixOS/nixpkgs#13377 (bad install_name)

Patch is based on: https://trac.macports.org/changeset/100816
of bug report: https://trac.macports.org/ticket/37395
---
 pkgs/development/libraries/tk/8.6.nix         |  4 +--
 ...-bad-install_name-for-libtk8.6.dylib.patch | 29 +++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/tk/Fix-bad-install_name-for-libtk8.6.dylib.patch

diff --git a/pkgs/development/libraries/tk/8.6.nix b/pkgs/development/libraries/tk/8.6.nix
index 110151227bdd..c10771c9109d 100644
--- a/pkgs/development/libraries/tk/8.6.nix
+++ b/pkgs/development/libraries/tk/8.6.nix
@@ -1,4 +1,4 @@
-{ callPackage, fetchurl, tcl, ... } @ args:
+{ callPackage, fetchurl, tcl, stdenv, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
 
@@ -7,7 +7,7 @@ callPackage ./generic.nix (args // rec {
     sha256 = "1h96vp15zl5xz0d4qp6wjyrchqmrmdm3q5k22wkw9jaxbvw9vy88";
   };
 
-  patches = [ ./different-prefix-with-tcl.patch ];
+  patches = [ ./different-prefix-with-tcl.patch ] ++ stdenv.lib.optionals stdenv.isDarwin [ ./Fix-bad-install_name-for-libtk8.6.dylib.patch ];
 
 })
 
diff --git a/pkgs/development/libraries/tk/Fix-bad-install_name-for-libtk8.6.dylib.patch b/pkgs/development/libraries/tk/Fix-bad-install_name-for-libtk8.6.dylib.patch
new file mode 100644
index 000000000000..528a75e1c91f
--- /dev/null
+++ b/pkgs/development/libraries/tk/Fix-bad-install_name-for-libtk8.6.dylib.patch
@@ -0,0 +1,29 @@
+From f90278dac42135acd55200b7d2153f44d72fec53 Mon Sep 17 00:00:00 2001
+From: Josef Knedl <josef.kemetmueller@aon.at>
+Date: Wed, 24 Feb 2016 00:37:40 +0100
+Subject: [PATCH] Fix bad install_name for libtk8.6.dylib
+
+This follows: https://trac.macports.org/ticket/37395
+and https://trac.macports.org/changeset/100816
+Alternative would be to use Quartz build instead:
+https://sourceforge.net/p/tktoolkit/bugs/3048/
+---
+ unix/Makefile.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/unix/Makefile.in b/unix/Makefile.in
+index f21fdbb..1b89256 100644
+--- a/unix/Makefile.in
++++ b/unix/Makefile.in
+@@ -283,7 +283,7 @@ CC_SEARCH_FLAGS	= @CC_SEARCH_FLAGS@
+ LD_SEARCH_FLAGS	= @LD_SEARCH_FLAGS@
+ 
+ # support for embedded libraries on Darwin / Mac OS X
+-DYLIB_INSTALL_DIR	= ${LIB_RUNTIME_DIR}
++DYLIB_INSTALL_DIR	= $(libdir)
+ 
+ # support for building the Aqua resource file
+ TK_RSRC_FILE		= @TK_RSRC_FILE@
+-- 
+2.7.1
+

From f91c979f8aaa329de089d3d4e0dd56a6bb9d922a Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 25 Feb 2016 11:25:00 -0600
Subject: [PATCH 1782/2285] xerces-c: 3.1.1 -> 3.1.3

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

diff --git a/pkgs/development/libraries/xercesc/default.nix b/pkgs/development/libraries/xercesc/default.nix
index 1c1426d969e8..5020ab3f2df5 100644
--- a/pkgs/development/libraries/xercesc/default.nix
+++ b/pkgs/development/libraries/xercesc/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "xerces-c-${version}";
-  version = "3.1.1";
+  version = "3.1.3";
 
   src = fetchurl {
     url = "mirror://apache/xerces/c/3/sources/${name}.tar.gz";
-    sha256 = "0dl7jr26vlh5p3hps86xrwyafq6f21schc9q4zyxb48b3vvqa9x4";
+    sha256 = "0jav1cbwcyq4miy790dd62yrypf7n0j98vdin9ny30f9nwyzgm7k";
   };
 
   meta = {

From 3234ca49d1441305777f1b4c77e3e741ef9f59d0 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Thu, 25 Feb 2016 17:32:08 +0100
Subject: [PATCH 1783/2285] gti: init at 2015-05-21 (edaac79)

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

diff --git a/pkgs/tools/misc/gti/default.nix b/pkgs/tools/misc/gti/default.nix
new file mode 100644
index 000000000000..39e28073abce
--- /dev/null
+++ b/pkgs/tools/misc/gti/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub }:
+
+stdenv.mkDerivation rec {
+  name = "gti-${version}";
+  version = "2015-05-21";
+
+  src = fetchFromGitHub {
+    owner = "rwos";
+    repo = "gti";
+    rev = "edaac795b0b0ff01f2347789f96c740c764bf376";
+    sha256 = "1wki7d61kcmv9s3xayky9cz84qa773x3y1z88y768hq8ifwadcbn";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin $out/share/man/man6
+    cp gti $out/bin
+    cp gti.6 $out/share/man/man6
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://r-wos.org/hacks/gti;
+    license = licenses.mit;
+    description = "Humorous typo-based git runner; drives a car over the terminal";
+    maintainers = with maintainers; [ fadenb ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f756a175ac9..7d9fe308afac 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -904,6 +904,8 @@ let
 
   gmic = callPackage ../tools/graphics/gmic { };
 
+  gti = callPackage ../tools/misc/gti { };
+
   heatseeker = callPackage ../tools/misc/heatseeker { };
 
   interlock = goPackages.interlock.bin // { outputs = [ "bin" ]; };

From 712d59225e52c7636e315cb2cce35e357114b183 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 25 Feb 2016 12:00:12 -0600
Subject: [PATCH 1784/2285] chromium{,Beta,Dev}: 48.0.2564.97 -> 48.0.2564.116

From the debian security mailing list:

Several vulnerabilities have been discovered in the chromium web browser.

CVE-2016-1622

    It was discovered that a maliciously crafted extension could bypass
    the Same Origin Policy.

CVE-2016-1623

    Mariusz Mlynski discovered a way to bypass the Same Origin Policy.

CVE-2016-1624

    lukezli discovered a buffer overflow issue in the Brotli library.

CVE-2016-1625

    Jann Horn discovered a way to cause the Chrome Instant feature to
    navigate to unintended destinations.

CVE-2016-1626

    An out-of-bounds read issue was discovered in the openjpeg library.

CVE-2016-1627

    It was discovered that the Developer Tools did not validate URLs.

CVE-2016-1628

    An out-of-bounds read issue was discovered in the pdfium library.

CVE-2016-1629

    A way to bypass the Same Origin Policy was discovered in Blink/WebKit,
    along with a way to escape the chromium sandbox.
---
 .../browsers/chromium/source/sources.nix      | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index 1a19210fd3dc..14d555722545 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,21 +1,17 @@
 # This file is autogenerated from update.sh in the parent directory.
 {
   dev = {
-    version = "49.0.2593.0";
-    sha256 = "1krkf8dg10xnvxs4zfvy2rkp0v3gxg55418b11kmfywsxjfi09hv";
-    sha256bin32 = "0sarfj8r6x28pbmcpd5facm6liifazj744c9qn6ci6xg7f8jlnxi";
-    sha256bin64 = "1l5s504mmr4v5y67fsla9hyrk7dm155yc790ld87s1ya03h455gr";
+    version = "50.0.2657.0";
+    sha256 = "1xc66zsjd5snydf60di2k2vzwwcqs1p16yn4jbpj2khm9cmxmkmf";
   };
   beta = {
-    version = "49.0.2623.28";
-    sha256 = "1cpgfcw6kgw70k14wa1m5qzj4rnvkzrw1am30d34516mbwlmmqc8";
-    sha256bin32 = "0nwhjav1x325h1drqknrjl5glivn4fdpahs1nlaqfk8kbjh1q113";
-    sha256bin64 = "0wj6j0v3rngsclzbb8rc8l90wdi98j2sb60r2ypfihaxq2gd138y";
+    version = "49.0.2623.63";
+    sha256 = "07i4vqswkijnl7wi6r1a0n1jq54ackm01yf8h3hwcik8q10i1aq5";
   };
   stable = {
-    version = "48.0.2564.97";
-    sha256 = "1nsjn8zlqljizy5dmg2rxwkw4k5j4yi15ywxi9ca3acv68dbhd3p";
-    sha256bin32 = "0gdd9krsfsixw5b03msm7nf7zl7xh4chzkh9srb19c1kzygl2j2l";
-    sha256bin64 = "1wmw17gdq1j6vxfdc8s94jc8z30pza8nipk4dh590xnb7faihr52";
+    version = "48.0.2564.116";
+    sha256 = "03sdm09cnwq8a056rfljql7mz0s17fngfnm5q3p5xwakr2sbj7ka";
+    sha256bin32 = "157m88nafb8svpkv11rzpcfvak6486wx43rmbssg52x2k0vas0bl";
+    sha256bin64 = "036pcma8qczja803h9r1nlm0ypm4zblmy6q7pkwlgmn3r4r3n7i0";
   };
 }

From 00d32bb99ffc3b0080d0c320653a6ceadb6750f4 Mon Sep 17 00:00:00 2001
From: Igor Sharonov <igor.sharonov@gmail.com>
Date: Wed, 24 Feb 2016 22:33:21 +0300
Subject: [PATCH 1785/2285] i3pystatus: 3.33 -> 3.34

---
 .../window-managers/i3/pystatus.nix           | 41 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 pkgs/top-level/python-packages.nix            | 35 ----------------
 3 files changed, 43 insertions(+), 35 deletions(-)
 create mode 100644 pkgs/applications/window-managers/i3/pystatus.nix

diff --git a/pkgs/applications/window-managers/i3/pystatus.nix b/pkgs/applications/window-managers/i3/pystatus.nix
new file mode 100644
index 000000000000..eac2d9ab9c97
--- /dev/null
+++ b/pkgs/applications/window-managers/i3/pystatus.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, libpulseaudio, python3Packages, extraLibs ? [] }:
+
+python3Packages.buildPythonApplication rec {
+  name = "${pname}-${version}";
+  version = "3.34";
+  pname = "i3pystatus";
+  disabled = !python3Packages.isPy3k;
+
+  src = fetchurl {
+    url = "https://pypi.python.org/packages/source/i/${pname}/${name}.tar.gz";
+    sha256 = "1bpkkf9q4zqq7fh65zynbv26nq24rfznmw71jjvda7g8kjrwjdk5";
+  };
+
+  propagatedBuildInputs = with python3Packages; [ keyring colour netifaces praw psutil basiciw ] ++
+    [ libpulseaudio ] ++ extraLibs;
+
+  ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${libpulseaudio}/lib\"";
+  makeWrapperArgs = [ ldWrapperSuffix ]; # libpulseaudio.so is loaded manually
+
+  postInstall = ''
+    makeWrapper ${python3Packages.python.interpreter} $out/bin/${pname}-python-interpreter \
+      --prefix PYTHONPATH : "$PYTHONPATH" \
+      ${ldWrapperSuffix}
+  '';
+
+  # no tests in tarball
+  doCheck = false;
+
+  meta = with stdenv.lib; {
+    homepage = https://github.com/enkore/i3pystatus;
+    description = "A complete replacement for i3status";
+    longDescription = ''
+      i3pystatus is a growing collection of python scripts for status output compatible
+      to i3status / i3bar of the i3 window manager.
+    '';
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.igsha ];
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3ed02f71e5c7..6dec9ef47fa3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12467,6 +12467,8 @@ let
 
   i3minator = callPackage ../tools/misc/i3minator { };
 
+  i3pystatus = callPackage ../applications/window-managers/i3/pystatus.nix { };
+
   i3status = callPackage ../applications/window-managers/i3/status.nix { };
 
   i810switch = callPackage ../os-specific/linux/i810switch { };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1a35c4935659..e4517f6c42f4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5973,41 +5973,6 @@ in modules // {
     };
   };
 
-  i3pystatus = buildPythonPackage rec {
-    name = "${pname}-${version}";
-    version = "3.33";
-    pname = "i3pystatus";
-    namePrefix = "";
-    disabled = !isPy3k;
-
-    src = pkgs.fetchurl {
-      url = "https://pypi.python.org/packages/source/i/${pname}/${name}.tar.gz";
-      sha256 = "1fs2nlzm9in8bwg8cm3567ayiha0v7k8pn793pm5fb7lywaalasy";
-    };
-
-    propagatedBuildInputs = with self; [ keyring colour netifaces praw psutil
-      basiciw pkgs.libpulseaudio ];
-    ldWrapperSuffix = "--suffix LD_LIBRARY_PATH : \"${pkgs.libpulseaudio}/lib\"";
-    makeWrapperArgs = [ ldWrapperSuffix ]; # libpulseaudio.so is loaded manually
-
-    postInstall = ''
-      makeWrapper ${python.interpreter} $out/bin/${pname}-python-interpreter \
-        --prefix PYTHONPATH : "$PYTHONPATH" \
-        ${ldWrapperSuffix}
-    '';
-
-    meta = {
-      homepage = https://github.com/enkore/i3pystatus;
-      description = "A complete replacement for i3status";
-      longDescription = ''
-        i3pystatus is a growing collection of python scripts for status output compatible
-        to i3status / i3bar of the i3 window manager.
-      '';
-      license = licenses.mit;
-      platforms = platforms.linux;
-    };
-  };
-
   jdcal = buildPythonPackage rec {
     version = "1.0";
     name = "jdcal-${version}";

From 8106d61c120355a93f3d7cd20263d7372ddec12d Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Thu, 25 Feb 2016 19:56:32 +0100
Subject: [PATCH 1786/2285] libfilezilla: 0.3.1 -> 0.4.0

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

diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index 74ca0a30892b..120b707af1e3 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libfilezilla-${version}";
-  version = "0.3.1";
+  version = "0.4.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/filezilla/libfilezilla/${version}/${name}.tar.bz2";
-    sha256 = "1vshy00bz9l5nzphkxpd35plcfcrz2wha5qiic7mx5yywafdxbd4";
+    sha256 = "1l7rih17nzy75zf5h8mx5x38jbl9kxyxpr0ib6nn2615fw92xxgj";
   };
 
   meta = with stdenv.lib; {

From 93a0306e7955bc8086b6fb8a95fa2227e760c8a7 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 21 Feb 2016 19:55:39 +0000
Subject: [PATCH 1787/2285] sane module: add more documentation

Imported from https://nixos.org/wiki/Scanners
---
 nixos/modules/services/hardware/sane.nix | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/hardware/sane.nix b/nixos/modules/services/hardware/sane.nix
index 56504cd2361d..a34037403123 100644
--- a/nixos/modules/services/hardware/sane.nix
+++ b/nixos/modules/services/hardware/sane.nix
@@ -21,7 +21,13 @@ in
     hardware.sane.enable = mkOption {
       type = types.bool;
       default = false;
-      description = "Enable support for SANE scanners.";
+      description = ''
+        Enable support for SANE scanners.
+
+        <note><para>
+          Users in the "scanner" group will gain access to the scanner.
+        </para></note>
+      '';
     };
 
     hardware.sane.snapshot = mkOption {
@@ -33,7 +39,14 @@ in
     hardware.sane.extraBackends = mkOption {
       type = types.listOf types.path;
       default = [];
-      description = "Packages providing extra SANE backends to enable.";
+      description = ''
+        Packages providing extra SANE backends to enable.
+
+        <note><para>
+          The example contains the package for HP scanners.
+        </para></note>
+      '';
+      example = literalExample "[ pkgs.hplipWithPlugin ]";
     };
 
     hardware.sane.configDir = mkOption {

From dc314aad12ea639f2d1f36ee1ac826d9411133c5 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 21 Feb 2016 19:37:05 +0000
Subject: [PATCH 1788/2285] samba module: add more description

Fixes #13281
---
 .../services/network-filesystems/samba.nix    | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix
index 576e5c9e87a3..a186982ec9c0 100644
--- a/nixos/modules/services/network-filesystems/samba.nix
+++ b/nixos/modules/services/network-filesystems/samba.nix
@@ -79,6 +79,14 @@ in
         description = ''
           Whether to enable Samba, which provides file and print
           services to Windows clients through the SMB/CIFS protocol.
+
+          <note>
+            <para>If you use the firewall consider adding the following:</para>
+            <programlisting>
+              networking.firewall.allowedTCPPorts = [ 139 445 ];
+              networking.firewall.allowedUDPPorts = [ 137 138 ];
+            </programlisting>
+          </note>
         '';
       };
 
@@ -86,7 +94,7 @@ in
         type = types.package;
         default = pkgs.samba;
         defaultText = "pkgs.samba";
-        example = literalExample "pkgs.samba4";
+        example = literalExample "pkgs.samba3";
         description = ''
           Defines which package should be used for the samba server.
         '';
@@ -118,6 +126,10 @@ in
         description = ''
           Additional global section and extra section lines go in here.
         '';
+        example = ''
+          guest account = nobody
+          map to guest = bad user
+        '';
       };
 
       configText = mkOption {
@@ -154,9 +166,11 @@ in
         '';
         type = types.attrsOf (types.attrsOf types.unspecified);
         example =
-          { srv =
-             { path = "/srv";
+          { public =
+             { path = "/srv/public";
                "read only" = true;
+               browseable = "yes";
+               "guest ok" = "yes";
                 comment = "Public samba share.";
              };
           };

From 1eb8139100da1f6d8876d1f21b9923eaf27b3091 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 25 Feb 2016 16:29:58 +0100
Subject: [PATCH 1789/2285] libpsl: 2016-02-16 -> 2016-02-25

---
 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 c53c4792a6f6..d1da2bbf3aac 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -3,10 +3,10 @@
 
 let
 
-  listVersion = "2016-02-16";
+  listVersion = "2016-02-25";
   listSources = fetchFromGitHub {
-    sha256 = "0f27nynm4skn1mnv7kgyyl7cy599n6al7x3alvqn0nw9s25cfmkc";
-    rev = "5bece2d9de4bb67274fd8e5928d6b449e7ff7674";
+    sha256 = "0i9aa0bl3x50z0ba4n06pajpfncw8n780hhql13b1vppgfc6s4i7";
+    rev = "84fd7e2a090f53ba4378f2a0e08cdaaa882ce3e5";
     repo = "list";
     owner = "publicsuffix";
   };

From 500132ab5c4f914c7c40a49de9733806126cf6f3 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 25 Feb 2016 19:52:39 +0100
Subject: [PATCH 1790/2285] sane-backends-git -> 2016-02-25

---
 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 12dd739c29bf..0e4d7ae1b83f 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-02-22";
+  version = "2016-02-25";
   src = fetchgit {
-    sha256 = "476abced4a9ccc95eb0796ef1d2e1d9be76c0db14adc248a9feaae3c8a61645e";
-    rev = "a74ebe551daf8750821b1ab57324e54141a84461";
+    sha256 = "842b1186d38de14221be514a58f77c23d9f83979ea45f846440cf9cbb1f26c1f";
+    rev = "c5117ed0f1b522eab10fd2248f140b2acad2a708";
     url = "git://alioth.debian.org/git/sane/sane-backends.git";
   };
 })

From 2179b1d4918476a629a60d398b3e41228ae5c94e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Thu, 25 Feb 2016 20:54:39 +0100
Subject: [PATCH 1791/2285] geolite-legacy 2016-02-08 -> 2016-02-25

---
 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 2be23b0f35c7..59ae72d863cd 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-02-08";
+  version = "2016-02-25";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
     "0fnlznn04lpkkd7sy9r9kdl3fcp8ix7msdrncwgz26dh537ml32z";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "0ib93p2fwayqsxwph98rkgln7xpjrwhzzc06sc74876jpaq3g8g5";
+    "0gli3glr2w58qw2b4lwlp8cqbpfy27c3ryih3qi2bbilqy0r3ibl";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "1izlxqcvdag66sny5zjjwkmjhai0c9m77b96j117n0x0awrrk4h9";
+    "1k7a9b8hsman64jjk6y3nkhms89gkq1vk26n2xklw710f15jzcsf";
 
   meta = with stdenv.lib; {
     description = "GeoLite Legacy IP geolocation databases";

From 359ff7d230aee86fc4a38796f9c84457d626e92c Mon Sep 17 00:00:00 2001
From: Antoine Eiche <lewo@abesis.fr>
Date: Thu, 25 Feb 2016 20:05:34 +0100
Subject: [PATCH 1792/2285] ledger-autosync: fix ofxclient propagation

Closes #13411
---
 pkgs/top-level/python-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ffcd6c4229d3..f1bc4dc87e3c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6118,8 +6118,9 @@ in modules // {
       sha256 = "f19fa66e656309825887171d84a462e64676b1cc36b62e4dd8679ff63926a469";
     };
 
+    propagatedBuildInputs = with self; [ ofxclient ];
+
     buildInputs = with self; [
-      ofxclient
       mock
       nose
       # Used at runtime to translate ofx entries to the ledger

From b2298b02cfefb5642364af7ab8b4d047b7a5fc86 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 25 Feb 2016 17:09:54 +0100
Subject: [PATCH 1793/2285] kde5.filelight: init at 15.12 (close #13456)

vcunat also added himself to maintainers,
as filelight has been extremely helpful on closure-size branch.
---
 pkgs/applications/kde-apps-15.12/default.nix  |  1 +
 .../applications/kde-apps-15.12/filelight.nix | 35 +++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/kde-apps-15.12/filelight.nix

diff --git a/pkgs/applications/kde-apps-15.12/default.nix b/pkgs/applications/kde-apps-15.12/default.nix
index 15982cb5d64c..e9894eaad722 100644
--- a/pkgs/applications/kde-apps-15.12/default.nix
+++ b/pkgs/applications/kde-apps-15.12/default.nix
@@ -35,6 +35,7 @@ let
     dolphin = callPackage ./dolphin.nix {};
     dolphin-plugins = callPackage ./dolphin-plugins.nix {};
     ffmpegthumbs = callPackage ./ffmpegthumbs.nix {};
+    filelight = callPackage ./filelight.nix {};
     gpgmepp = callPackage ./gpgmepp.nix {};
     gwenview = callPackage ./gwenview.nix {};
     kate = callPackage ./kate.nix {};
diff --git a/pkgs/applications/kde-apps-15.12/filelight.nix b/pkgs/applications/kde-apps-15.12/filelight.nix
new file mode 100644
index 000000000000..df5e097a540e
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.12/filelight.nix
@@ -0,0 +1,35 @@
+{ kdeApp
+, lib
+, extra-cmake-modules
+, kdoctools
+, makeQtWrapper
+, qtscript
+, kio
+, solid
+, kxmlgui
+, kparts
+}:
+
+kdeApp {
+  name = "filelight";
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+    makeQtWrapper
+  ];
+  buildInputs = [
+    kio
+    kparts
+    qtscript
+    solid
+    kxmlgui
+  ];
+
+  postInstall = ''
+    wrapQtProgram "$out/bin/filelight"
+  '';
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = with lib.maintainers; [ fridh vcunat ];
+  };
+}

From 05608d50f44773bf001c0e193be3f939d0126a50 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 25 Feb 2016 20:12:53 +0100
Subject: [PATCH 1794/2285] kde5.kcalc: init at 15.12

---
 pkgs/applications/kde-apps-15.12/default.nix |  1 +
 pkgs/applications/kde-apps-15.12/kcalc.nix   | 38 ++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/applications/kde-apps-15.12/kcalc.nix

diff --git a/pkgs/applications/kde-apps-15.12/default.nix b/pkgs/applications/kde-apps-15.12/default.nix
index 15982cb5d64c..71527ba855e1 100644
--- a/pkgs/applications/kde-apps-15.12/default.nix
+++ b/pkgs/applications/kde-apps-15.12/default.nix
@@ -38,6 +38,7 @@ let
     gpgmepp = callPackage ./gpgmepp.nix {};
     gwenview = callPackage ./gwenview.nix {};
     kate = callPackage ./kate.nix {};
+    kcalc = callPackage ./kcalc.nix {};
     kdegraphics-thumbnailers = callPackage ./kdegraphics-thumbnailers.nix {};
     kdenetwork-filesharing = callPackage ./kdenetwork-filesharing.nix {};
     kgpg = callPackage ./kgpg.nix { inherit (pkgs.kde4) kdepimlibs; };
diff --git a/pkgs/applications/kde-apps-15.12/kcalc.nix b/pkgs/applications/kde-apps-15.12/kcalc.nix
new file mode 100644
index 000000000000..a1f0316825da
--- /dev/null
+++ b/pkgs/applications/kde-apps-15.12/kcalc.nix
@@ -0,0 +1,38 @@
+{ kdeApp
+, lib
+, extra-cmake-modules
+, kdoctools
+, makeQtWrapper
+, kconfig
+, kconfigwidgets
+, kguiaddons
+, kinit
+, knotifications
+
+}:
+
+kdeApp {
+  name = "kcalc";
+
+  nativeBuildInputs = [
+    extra-cmake-modules
+    kdoctools
+  ];
+
+  buildInputs = [
+    kconfig
+    kconfigwidgets
+    kguiaddons
+    kinit
+    knotifications
+  ];
+
+  postInstall = ''
+    wrapQtProgram "$out/bin/kcalc"
+  '';
+
+  meta = {
+    license = with lib.licenses; [ gpl2 ];
+    maintainers = [ lib.maintainers.fridh ];
+  };
+}

From 4a4c432f06c872dc618ab655b9968a062430db01 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Thu, 25 Feb 2016 22:32:40 +0100
Subject: [PATCH 1795/2285] pythonPackages.ipykernel: 4.2.2 -> 4.3.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bd1c18fede9e..8604c2d852f8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10254,12 +10254,12 @@ in modules // {
   };
 
   ipykernel = buildPythonPackage rec {
-    version = "4.2.2";
+    version = "4.3.0";
     name = "ipykernel-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/i/ipykernel/${name}.tar.gz";
-      sha256 = "a876da43e01acec2c305abdd8e6aa55f052bab1196171ccf1cb9a6aa230298b0";
+      sha256 = "1av769gbzfm1zy9p94wicwwwxmyc7s7zk1ginq16x0wc69hwc57j";
     };
 
     buildInputs = with self; [ nose ] ++ optionals isPy27 [mock];
@@ -10268,6 +10268,7 @@ in modules // {
       jupyter_client
       pexpect
       traitlets
+      tornado
     ];
 
     # Tests require backends.

From fdd11c2c2b95e721c134c7cd5f6d2e92da62aff5 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Thu, 25 Feb 2016 23:22:12 +0200
Subject: [PATCH 1796/2285] gimp: Use http link as gimp-gap sources

---
 pkgs/applications/graphics/gimp/plugins/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 702911fee744..739614653a16 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -52,7 +52,7 @@ rec {
     name = "gap-2.6.0";
     buildInputs = [ gimp pkgconfig glib pkgs.intltool gimp.gtk ] ++ gimp.nativeBuildInputs;
     src = fetchurl {
-      url = ftp://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2;
+      url = http://ftp.gimp.org/pub/gimp/plug-ins/v2.6/gap/gimp-gap-2.6.0.tar.bz2;
       sha256 = "1jic7ixcmsn4kx2cn32nc5087rk6g8xsrz022xy11yfmgvhzb0ql";
     };
     patchPhase = ''

From 0649c8bde74d5e0e2036a66f0cab72b9de777617 Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avn@avnik.info>
Date: Thu, 25 Feb 2016 23:24:45 +0200
Subject: [PATCH 1797/2285] gimp: add gimp-with-plugin derivation

By default all plugins from pkgs.gimpPlugins set are enabled.

Default location of plugins changed from $out/${gimp.name} to
$out/lib/gimp/${majorVersion}. Resulting derivation for gimp+plugins
is set as search path for plugins by default (additional tweaking in
gimprc done for old plugin scheme should be removed)
---
 pkgs/applications/graphics/gimp/2.8.nix       |  6 ++++
 .../graphics/gimp/plugins/default.nix         |  4 +--
 pkgs/applications/graphics/gimp/wrapper.nix   | 33 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  5 +++
 4 files changed, 45 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/applications/graphics/gimp/wrapper.nix

diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix
index 96d6dbd52857..55e85fc5ec6b 100644
--- a/pkgs/applications/graphics/gimp/2.8.nix
+++ b/pkgs/applications/graphics/gimp/2.8.nix
@@ -6,6 +6,12 @@
 stdenv.mkDerivation rec {
   name = "gimp-2.8.16";
 
+  # This declarations for `gimp-with-plugins` wrapper,
+  # (used for determining $out/lib/gimp/${majorVersion}/ paths)
+  majorVersion = "2.0";
+  targetPluginDir = "$out/lib/gimp/${majorVersion}/plug-ins";
+  targetScriptDir = "$out/lib/gimp/${majorVersion}/scripts";
+
   src = fetchurl {
     url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2";
     sha256 = "1dsgazia9hmab8cw3iis7s69dvqyfj5wga7ds7w2q5mms1xqbqwm";
diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix
index 739614653a16..4084018d1d53 100644
--- a/pkgs/applications/graphics/gimp/plugins/default.nix
+++ b/pkgs/applications/graphics/gimp/plugins/default.nix
@@ -6,9 +6,7 @@
 { pkgs, gimp }:
 let
   inherit (pkgs) stdenv fetchurl pkgconfig glib;
-  targetPluginDir = "$out/${gimp.name}-plugins";
-  targetScriptDir = "$out/${gimp.name}-scripts";
-  prefix = "plugin-gimp-";
+  inherit (gimp) targetPluginDir targetScriptDir;
 
   pluginDerivation = a: stdenv.mkDerivation ({
     prePhases = "extraLib";
diff --git a/pkgs/applications/graphics/gimp/wrapper.nix b/pkgs/applications/graphics/gimp/wrapper.nix
new file mode 100644
index 000000000000..53067dc39c9a
--- /dev/null
+++ b/pkgs/applications/graphics/gimp/wrapper.nix
@@ -0,0 +1,33 @@
+{ stdenv, lib, buildEnv, gimp, makeWrapper, gimpPlugins, plugins ? null}:
+
+let
+allPlugins = lib.filter (pkg: builtins.isAttrs pkg && pkg.type == "derivation") (lib.attrValues gimpPlugins);
+selectedPlugins = if plugins == null then allPlugins else plugins;
+extraArgs = map (x: x.wrapArgs or "") selectedPlugins;
+
+drv = buildEnv {
+  name = "gimp-with-plugins-" + (builtins.parseDrvName gimp.name).version;
+
+  paths = [ gimp ] ++ selectedPlugins;
+
+  postBuild = ''
+    # TODO: This could be avoided if buildEnv could be forced to create all directories
+    if [ -L $out/bin ]; then
+      rm $out/bin
+      mkdir $out/bin
+      for i in ${gimp}/bin/*; do
+        ln -s $i $out/bin
+      done
+    fi
+    for each in gimp-2.8 gimp-console-2.8; do
+      wrapProgram $out/bin/$each \
+        --set GIMP2_PLUGINDIR "$out/lib/gimp/2.0" \
+        ${toString extraArgs}
+    done
+    set +x
+    for each in gimp gimp-console; do
+      ln -sf "$each-2.8" $out/bin/$each
+    done
+  '';
+  };
+in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 37f1098a823c..1bce67dbec5a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12225,6 +12225,11 @@ let
 
   gimp = gimp_2_8;
 
+  gimp-with-plugins = callPackage ../applications/graphics/gimp/wrapper.nix {
+    gimp = gimp_2_8;
+    plugins = null; # All packaged plugins enabled, if not explicit plugin list supplied
+  };
+
   gimpPlugins = recurseIntoAttrs (callPackage ../applications/graphics/gimp/plugins {});
 
   gitAndTools = recurseIntoAttrs (callPackage ../applications/version-management/git-and-tools {});

From 0e1319f03ffe5b9b365d056c1bc5d18e1a5b75ea Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Thu, 25 Feb 2016 23:07:47 +0100
Subject: [PATCH 1798/2285] linux-3.10: fixup config by a slightly hacky way

For explanation see:
https://github.com/NixOS/nixpkgs/pull/13405#issuecomment-188357637
---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index fc54715ea7b8..4de27fd3000d 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -362,7 +362,7 @@ with stdenv.lib;
   X86_MCE y
 
   # PCI-Expresscard hotplug support
-  HOTPLUG_PCI_PCIE y
+  ${optionalString (versionAtLeast version "3.12") "HOTPLUG_PCI_PCIE y"}
 
   # Linux containers.
   NAMESPACES? y #  Required by 'unshare' used by 'nixos-install'

From 7506c58d74553d7801c3f09be34f05015d70e53b Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Wed, 24 Feb 2016 00:23:44 +0000
Subject: [PATCH 1799/2285] linux_3_10: 3.10.96 -> 3.10.97 (close #13405)

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index afca9b9c35e4..cd7e6f1af74f 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.96";
+  version = "3.10.97";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0wnlvbyg92q48kz5cn3bznjkkzpsik8z51dqhcxdpddy1k6iqb3k";
+    sha256 = "0z66nbnbhmzjjbvrd7sbg4351x92grk8xja58rxxbb28cj3sy9r9";
   };
 
   kernelPatches = args.kernelPatches;

From f1df89f902c60017d284c7e83c597246f5a6aff0 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 25 Feb 2016 21:53:40 +0000
Subject: [PATCH 1800/2285] termite: 10 -> 11

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

diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix
index d37f2c947c95..fe22e1c66643 100644
--- a/pkgs/applications/misc/termite/default.nix
+++ b/pkgs/applications/misc/termite/default.nix
@@ -2,15 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "termite-${version}";
-  version = "10";
+  version = "11";
 
   src = fetchgit {
     url = "https://github.com/thestinger/termite";
     rev = "refs/tags/v${version}";
-    sha256 = "107v59x8q2m1cx1x3i5ciibw4nl1qbq7p58bfw0irkhp7sl7kjk2";
+    sha256 = "1k91nw19c0p5ghqhs00mn9npa91idfkyiwik3ng6hb4jbnblp5ph";
   };
 
-  makeFlags = [ "VERSION=v${version}" "PREFIX=$(out)" ];
+  makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ];
 
   buildInputs = [ pkgconfig vte gtk3 ncurses ];
 

From 3f3599f6be768d31e7718eb58d57822f7cc1875e Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 25 Feb 2016 21:52:13 +0000
Subject: [PATCH 1801/2285] termite: split terminfo into it's own output

Fixes #6141
---
 pkgs/applications/misc/termite/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix
index fe22e1c66643..683e5db2d13e 100644
--- a/pkgs/applications/misc/termite/default.nix
+++ b/pkgs/applications/misc/termite/default.nix
@@ -14,6 +14,16 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig vte gtk3 ncurses ];
 
+  outputs = [ "out" "terminfo" ];
+
+  postInstall = ''
+    mkdir -p $terminfo/share
+    mv $out/share/terminfo $terminfo/share/terminfo
+
+    mkdir -p $out/nix-support
+    echo "$terminfo" >> $out/nix-support/propagated-user-env-packages
+  '';
+
   meta = with stdenv.lib; {
     description = "A simple VTE-based terminal";
     license = licenses.lgpl2Plus;

From ca5f24369724acfc4324dd09e5866d8da3e5fe5c Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <bstaffin@fitbit.com>
Date: Thu, 25 Feb 2016 14:23:34 -0800
Subject: [PATCH 1802/2285] git-and-tools: alphabetize attributes before it
 gets too huge

---
 .../git-and-tools/default.nix                 | 97 ++++++++++---------
 1 file changed, 49 insertions(+), 48 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix
index 0aea48cb0562..c38e34bf450d 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -10,9 +10,9 @@ let
       asciidoc xmlto docbook2x docbook_xsl docbook_xml_dtd_45 libxslt cpio tcl
       tk makeWrapper subversionClient gzip libiconv;
     texinfo = texinfo5;
-    svnSupport = false;		# for git-svn support
-    guiSupport = false;		# requires tcl/tk
-    sendEmailSupport = false;	# requires plenty of perl libraries
+    svnSupport = false;         # for git-svn support
+    guiSupport = false;         # requires tcl/tk
+    sendEmailSupport = false;   # requires plenty of perl libraries
     perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey];
     smtpPerlLibs = [
       perlPackages.NetSMTP perlPackages.NetSMTPSSL
@@ -24,17 +24,12 @@ let
 
 in
 rec {
+  # Try to keep this generally alphabetized
 
-  # support for bugzilla
-  git-bz = callPackage ./git-bz { };
+  darcsToGit = callPackage ./darcs-to-git { };
 
   git = appendToName "minimal" gitBase;
 
-  # Git with SVN support, but without GUI.
-  gitSVN = lowPrio (appendToName "with-svn" (gitBase.override {
-    svnSupport = true;
-  }));
-
   # The full-featured Git.
   gitFull = gitBase.override {
     svnSupport = true;
@@ -42,11 +37,49 @@ rec {
     sendEmailSupport = !stdenv.isDarwin;
   };
 
+  # Git with SVN support, but without GUI.
+  gitSVN = lowPrio (appendToName "with-svn" (gitBase.override {
+    svnSupport = true;
+  }));
+
   git-annex = pkgs.haskellPackages.git-annex-with-assistant;
   gitAnnex = git-annex;
 
   git-annex-remote-b2 = pkgs.goPackages.git-annex-remote-b2;
 
+  # support for bugzilla
+  git-bz = callPackage ./git-bz { };
+
+  git-cola = callPackage ./git-cola { };
+
+  git-crypt = callPackage ./git-crypt { };
+
+  git-extras = callPackage ./git-extras { };
+
+  git-imerge = callPackage ./git-imerge { };
+
+  git-radar = callPackage ./git-radar { };
+
+  git-remote-hg = callPackage ./git-remote-hg { };
+
+  git2cl = import ./git2cl {
+    inherit fetchgit stdenv perl;
+  };
+
+  gitFastExport = import ./fast-export {
+    inherit fetchgit stdenv mercurial coreutils git makeWrapper subversion;
+  };
+
+  gitRemoteGcrypt = callPackage ./git-remote-gcrypt { };
+
+  gitflow = callPackage ./gitflow { };
+
+  hub = import ./hub {
+    inherit go;
+    inherit stdenv fetchgit;
+    inherit (darwin) Security;
+  };
+
   qgit = import ./qgit {
     inherit fetchurl stdenv;
     inherit (xorg) libXext libX11;
@@ -63,27 +96,7 @@ rec {
     inherit fetchurl stdenv python git;
   };
 
-  topGit = lib.makeOverridable (import ./topgit) {
-    inherit stdenv fetchurl;
-  };
-
-  tig = callPackage ./tig { };
-
-  transcrypt = callPackage ./transcrypt { };
-
-  hub = import ./hub {
-    inherit go;
-    inherit stdenv fetchgit;
-    inherit (darwin) Security;
-  };
-
-  gitFastExport = import ./fast-export {
-    inherit fetchgit stdenv mercurial coreutils git makeWrapper subversion;
-  };
-
-  git2cl = import ./git2cl {
-    inherit fetchgit stdenv perl;
-  };
+  subgit = callPackage ./subgit { };
 
   svn2git = import ./svn2git {
     inherit stdenv fetchurl ruby makeWrapper;
@@ -92,23 +105,11 @@ rec {
 
   svn2git_kde = callPackage ./svn2git-kde { };
 
-  subgit = callPackage ./subgit { };
+  tig = callPackage ./tig { };
 
-  darcsToGit = callPackage ./darcs-to-git { };
+  topGit = lib.makeOverridable (import ./topgit) {
+    inherit stdenv fetchurl;
+  };
 
-  gitflow = callPackage ./gitflow { };
-
-  git-radar = callPackage ./git-radar { };
-
-  git-remote-hg = callPackage ./git-remote-hg { };
-
-  gitRemoteGcrypt = callPackage ./git-remote-gcrypt { };
-
-  git-extras = callPackage ./git-extras { };
-
-  git-cola = callPackage ./git-cola { };
-
-  git-imerge = callPackage ./git-imerge { };
-
-  git-crypt = callPackage ./git-crypt { };
+  transcrypt = callPackage ./transcrypt { };
 }

From fe6ad9e91268dba10f04f0dc983dfc8361475303 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <bstaffin@fitbit.com>
Date: Thu, 25 Feb 2016 14:45:05 -0800
Subject: [PATCH 1803/2285] git-stree: init at 0.4.5

---
 .../git-and-tools/default.nix                 |  2 ++
 .../git-and-tools/git-stree/default.nix       | 26 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/applications/version-management/git-and-tools/git-stree/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 c38e34bf450d..584c880566ac 100644
--- a/pkgs/applications/version-management/git-and-tools/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/default.nix
@@ -62,6 +62,8 @@ rec {
 
   git-remote-hg = callPackage ./git-remote-hg { };
 
+  git-stree = callPackage ./git-stree { };
+
   git2cl = import ./git2cl {
     inherit fetchgit stdenv perl;
   };
diff --git a/pkgs/applications/version-management/git-and-tools/git-stree/default.nix b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix
new file mode 100644
index 000000000000..ef33b82e5c65
--- /dev/null
+++ b/pkgs/applications/version-management/git-and-tools/git-stree/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, lib, fetchFromGitHub, ... }:
+
+stdenv.mkDerivation rec {
+  name = "git-stree-${version}";
+  version = "0.4.5";
+
+  src = fetchFromGitHub {
+    owner = "tdd";
+    repo = "git-stree";
+    rev = "0.4.5";
+    sha256 = "0y5h44n38w6rhy9m591dvibxpfggj3q950ll7y4h49bhpks4m0l9";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin $out/etc/bash_completion.d
+    install -m 0755 git-stree $out/bin/
+    install -m 0644 git-stree-completion.bash $out/etc/bash_completion.d/
+  '';
+
+  meta = with lib; {
+    description = "A better Git subtree helper command";
+    homepage = http://deliciousinsights.github.io/git-stree;
+    license = licenses.mit;
+    maintainers = [ maintainers.benley ];
+  };
+}

From 629a89343eb52469d3edb1ef7f586e4cad0275c3 Mon Sep 17 00:00:00 2001
From: "tg(x)" <*@tg-x.net>
Date: Fri, 26 Feb 2016 01:31:58 +0100
Subject: [PATCH 1804/2285] simp_le: external_pem.sh plugin is now called
 external.sh

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

diff --git a/nixos/modules/security/acme.nix b/nixos/modules/security/acme.nix
index 3d25e811e670..c5cd0fb60ee9 100644
--- a/nixos/modules/security/acme.nix
+++ b/nixos/modules/security/acme.nix
@@ -56,7 +56,7 @@ let
 
       plugins = mkOption {
         type = types.listOf (types.enum [
-          "cert.der" "cert.pem" "chain.pem" "external_pem.sh"
+          "cert.der" "cert.pem" "chain.pem" "external.sh"
           "fullchain.pem" "full.pem" "key.der" "key.pem" "account_key.json"
         ]);
         default = [ "fullchain.pem" "key.pem" "account_key.json" ];

From 4e5ef470a7131cd825850b67bea6b148c08359c2 Mon Sep 17 00:00:00 2001
From: Tanner Doshier <git@doshitan.com>
Date: Fri, 19 Feb 2016 11:49:31 -0600
Subject: [PATCH 1805/2285] ec2-data: ensure providing a SSH host key is
 actually optional

27016659046a8f8e7b4fd61ecbceaf9f5e306258 broke this.
---
 nixos/modules/virtualisation/ec2-data.nix | 24 ++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/virtualisation/ec2-data.nix b/nixos/modules/virtualisation/ec2-data.nix
index bee262612680..db3dd9949c12 100644
--- a/nixos/modules/virtualisation/ec2-data.nix
+++ b/nixos/modules/virtualisation/ec2-data.nix
@@ -43,18 +43,20 @@ with lib;
 
             mkdir -m 0755 -p /etc/ssh
 
-            key="$(sed 's/|/\n/g; s/SSH_HOST_DSA_KEY://; t; d' $userData)"
-            key_pub="$(sed 's/SSH_HOST_DSA_KEY_PUB://; t; d' $userData)"
-            if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_dsa_key ]; then
-                (umask 077; echo "$key" > /etc/ssh/ssh_host_dsa_key)
-                echo "$key_pub" > /etc/ssh/ssh_host_dsa_key.pub
-            fi
+            if [ -s "$userData" ]; then
+              key="$(sed 's/|/\n/g; s/SSH_HOST_DSA_KEY://; t; d' $userData)"
+              key_pub="$(sed 's/SSH_HOST_DSA_KEY_PUB://; t; d' $userData)"
+              if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_dsa_key ]; then
+                  (umask 077; echo "$key" > /etc/ssh/ssh_host_dsa_key)
+                  echo "$key_pub" > /etc/ssh/ssh_host_dsa_key.pub
+              fi
 
-            key="$(sed 's/|/\n/g; s/SSH_HOST_ED25519_KEY://; t; d' $userData)"
-            key_pub="$(sed 's/SSH_HOST_ED25519_KEY_PUB://; t; d' $userData)"
-            if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_ed25519_key ]; then
-                (umask 077; echo "$key" > /etc/ssh/ssh_host_ed25519_key)
-                echo "$key_pub" > /etc/ssh/ssh_host_ed25519_key.pub
+              key="$(sed 's/|/\n/g; s/SSH_HOST_ED25519_KEY://; t; d' $userData)"
+              key_pub="$(sed 's/SSH_HOST_ED25519_KEY_PUB://; t; d' $userData)"
+              if [ -n "$key" -a -n "$key_pub" -a ! -e /etc/ssh/ssh_host_ed25519_key ]; then
+                  (umask 077; echo "$key" > /etc/ssh/ssh_host_ed25519_key)
+                  echo "$key_pub" > /etc/ssh/ssh_host_ed25519_key.pub
+              fi
             fi
           '';
 

From 70c02402c8cefa163db39adb2e676196e0aa5dcf Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Fri, 26 Feb 2016 03:28:56 +0100
Subject: [PATCH 1806/2285] networkmanager: fix link-local ip addresses

NetworkManager needs an additional avahi-user to use link-local
IPv4 (and probably IPv6) addresses. avahi-autoipd also needs to be
patched to the right path.
---
 nixos/modules/misc/ids.nix                           | 1 +
 nixos/modules/services/networking/networkmanager.nix | 5 +++++
 pkgs/tools/networking/network-manager/default.nix    | 2 ++
 3 files changed, 8 insertions(+)

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index f3883ff56d34..6ae37f273df0 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -252,6 +252,7 @@
       gammu-smsd = 228;
       pdnsd = 229;
       octoprint = 230;
+      avahi-autoipd = 231;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index 01c05fb4a245..eb2b9d692f8d 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -228,6 +228,11 @@ in {
     users.extraUsers = [{
       name = "nm-openvpn";
       uid = config.ids.uids.nm-openvpn;
+    }
+    {
+      # to enable link-local connections
+      name = "avahi-autoipd";
+      uid = config.ids.uids.avahi-autoipd;
     }];
 
     systemd.packages = cfg.packages;
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix
index c86b59d48354..c23b818e048f 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
       --replace /bin/sh ${stdenv.shell} \
       --replace /usr/sbin/ethtool ${ethtool}/sbin/ethtool \
       --replace /bin/sed ${gnused}/bin/sed
+    # to enable link-local connections
+    substituteInPlace src/devices/nm-device.c --replace '("avahi-autoipd", NULL, NULL)' '("avahi-autoipd", &"${avahi}/sbin/avahi-autoipd", NULL)'
     configureFlags="$configureFlags --with-udev-dir=$out/lib/udev"
   '';
 

From 737e808913be98d674c280711cdd2304e0c79a50 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Thu, 25 Feb 2016 22:06:19 -0600
Subject: [PATCH 1807/2285] libssh2: 1.6.0 -> 1.7.0

    This release includes the following changes:
      o libssh2_session_set_last_error: Add function
      o mac: Add support for HMAC-SHA-256 and HMAC-SHA-512
      o WinCNG: support for SHA256/512 HMAC
      o kex: Added diffie-hellman-group-exchange-sha256 support
      o OS/400 crypto library QC3 support
    This release includes the following security advisory:
      o diffie_hellman_sha256: convert bytes to bits
        CVE-2016-0787: http://www.libssh2.org/adv_20160223.html
    This release includes the following bugfixes:
      o SFTP: Increase speed and datasize in SFTP read
      o openssl: make libssh2_sha1 return error code
      o openssl: fix memleak in _libssh2_dsa_sha1_verify()
      o cmake: include CMake files in the release tarballs
      o Fix builds with Visual Studio 2015
      o hostkey.c: Fix compiling error when OPENSSL_NO_MD5 is defined
      o GNUmakefile: add support for LIBSSH2_LDFLAG_EXTRAS
      o GNUmakefile: add -m64 CFLAGS when targeting mingw64
      o kex: free server host key before allocating it (again)
      o SCP: add libssh2_scp_recv2 to support large (> 2GB) files on windows
      o channel: Detect bad usage of libssh2_channel_process_startup
      o userauth: Fix off by one error when reading public key file
      o kex: removed dupe entry from libssh2_kex_methods
      o _libssh2_error: Support allocating the error message
      o hostkey: fix invalid memory access if libssh2_dsa_new fails
      o hostkey: align code path of ssh_rsa_init to ssh_dss_init
      o libssh2.pc.in: fix the output of pkg-config --libs
      o wincng: fixed possible memory leak in _libssh2_wincng_hash
      o wincng: fixed _libssh2_wincng_hash_final return value
      o add OpenSSL 1.1.0-pre2 compatibility
      o agent_disconnect_unix: unset the agent fd after closing it
      o sftp: stop reading when buffer is full
      o sftp: Send at least one read request before reading
      o sftp: Don't return EAGAIN if data was written to buffer
      o sftp: Check read packet file offset
      o configure: build "silent" if possible
      o openssl: add OpenSSL 1.1.0-pre3-dev compatibility
      o GNUmakefile: list system libs after user libs
---
 pkgs/development/libraries/libssh2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libssh2/default.nix b/pkgs/development/libraries/libssh2/default.nix
index 5e12ea734c18..326817843351 100644
--- a/pkgs/development/libraries/libssh2/default.nix
+++ b/pkgs/development/libraries/libssh2/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurlBoot, openssl, zlib, windows}:
 
 stdenv.mkDerivation rec {
-  name = "libssh2-1.6.0";
+  name = "libssh2-1.7.0";
 
   src = fetchurlBoot {
     url = "${meta.homepage}/download/${name}.tar.gz";
-    sha256 = "05c2is69c50lyikkh29nk6zhghjk4i7hjx0zqfhq47aald1jj82s";
+    sha256 = "116mh112w48vv9k3f15ggp5kxw5sj4b88dzb5j69llsh7ba1ymp4";
   };
 
   buildInputs = [ openssl zlib ];

From e08dd09c254cb31216c4e3bc946a8c5b73ab5645 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Fri, 26 Feb 2016 00:29:07 -0500
Subject: [PATCH 1808/2285] emacs: add optional support for 24-bit color ttys

---
 .../applications/editors/emacs-24/default.nix |  11 +-
 .../editors/emacs-24/tty-true-color.patch     | 428 ++++++++++++++++++
 2 files changed, 437 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/applications/editors/emacs-24/tty-true-color.patch

diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index 1db56577278c..35fcaecb1120 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -1,10 +1,11 @@
-{ stdenv, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
+{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
 , pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
 , libtiff, librsvg, texinfo, gconf, libxml2, imagemagick, gnutls
 , alsaLib, cairo, acl, gpm, AppKit, CoreWLAN, Kerberos, GSS, ImageIO
 , withX ? !stdenv.isDarwin
 , withGTK3 ? false, gtk3 ? null
 , withGTK2 ? true, gtk2
+, enableTTYTrueColor ? false
 }:
 
 assert (libXft != null) -> libpng != null;      # probably a bug
@@ -31,8 +32,14 @@ stdenv.mkDerivation rec {
     sha256 = "0kn3rzm91qiswi0cql89kbv6mqn27rwsyjfb8xmwy9m5s8fxfiyx";
   };
 
-  patches = stdenv.lib.optionals stdenv.isDarwin [
+  patches = lib.optionals stdenv.isDarwin [
     ./at-fdcwd.patch
+  ] ++ lib.optionals enableTTYTrueColor [
+    # Modified TTY True Color patch from: https://gist.github.com/choppsv1/36aacdd696d505566088
+    # To use, pass --color=true-color, which will default to using ';'
+    # as the separator.
+    # Alternatively, set $EMACS_TRUE_COLOR_SEPARATOR to ';' or ':'.
+    ./tty-true-color.patch
   ];
 
   postPatch = ''
diff --git a/pkgs/applications/editors/emacs-24/tty-true-color.patch b/pkgs/applications/editors/emacs-24/tty-true-color.patch
new file mode 100644
index 000000000000..09ceeb658abb
--- /dev/null
+++ b/pkgs/applications/editors/emacs-24/tty-true-color.patch
@@ -0,0 +1,428 @@
+diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el
+index 98108ce..21814a9 100644
+--- a/lisp/term/tty-colors.el
++++ b/lisp/term/tty-colors.el
+@@ -764,7 +764,8 @@
+     (auto . 0)
+     (ansi8 . 8)
+     (always . 8)
+-    (yes . 8))
++    (yes . 8)
++    (true-color . 16777216))
+   "An alist of supported standard tty color modes and their aliases.")
+ 
+ (defun tty-color-alist (&optional _frame)
+diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
+index c673749..244cf7f 100644
+--- a/lisp/term/xterm.el
++++ b/lisp/term/xterm.el
+@@ -674,6 +674,15 @@ versions of xterm."
+     ;; are more colors to support, compute them now.
+     (when (> ncolors 0)
+       (cond
++       ((= (display-color-cells (selected-frame)) 16777216)	; 24-bit xterm
++        (let ((idx (length xterm-standard-colors)))
++          ;; Insert standard X colors after the standard xterm ones
++          (mapc (lambda (color)
++                       (if (not (assoc (car color) xterm-standard-colors))
++                           (progn
++                             (tty-color-define (car color) idx (cdr color))
++                             (setq idx (1+ idx)))))
++                color-name-rgb-alist)))
+        ((= ncolors 240)	; 256-color xterm
+ 	;; 216 non-gray colors first
+ 	(let ((r 0) (g 0) (b 0))
+diff --git a/src/dispextern.h b/src/dispextern.h
+index 239c442..5760b84 100644
+--- a/src/dispextern.h
++++ b/src/dispextern.h
+@@ -1739,9 +1739,15 @@ struct face
+ INLINE bool
+ face_tty_specified_color (unsigned long color)
+ {
+-  return color < FACE_TTY_DEFAULT_BG_COLOR;
++  return (color < FACE_TTY_DEFAULT_BG_COLOR);
+ }
+ 
++INLINE bool
++face_tty_specified_24_bit_color (unsigned long color)
++{
++  /* 24 bit colors have 24th but not 25th bit set */
++  return ((color & (0x03 << 24)) == (0x01 << 24));
++}
+ /* Non-zero if FACE was realized for unibyte use.  */
+ 
+ #define FACE_UNIBYTE_P(FACE) ((FACE)->charset < 0)
+diff --git a/src/term.c b/src/term.c
+index 8312491..b14aded 100644
+--- a/src/term.c
++++ b/src/term.c
+@@ -1915,18 +1915,40 @@ turn_on_face (struct frame *f, int face_id)
+       const char *ts;
+       char *p;
+ 
+-      ts = tty->standout_mode ? tty->TS_set_background : tty->TS_set_foreground;
++      if (face_tty_specified_24_bit_color(fg))
++        ts = tty->standout_mode ? tty->TS_set_rgb_background : tty->TS_set_rgb_foreground;
++      else
++        ts = tty->standout_mode ? tty->TS_set_background : tty->TS_set_foreground;
+       if (face_tty_specified_color (fg) && ts)
+ 	{
+-          p = tparam (ts, NULL, 0, fg, 0, 0, 0);
++          if (!face_tty_specified_24_bit_color(fg))
++            p = tparam (ts, NULL, 0, fg, 0, 0, 0);
++          else
++            {
++              const unsigned char r = (fg >> 16) & 0xFF,
++                g = (fg >> 8) & 0xFF,
++                b = fg & 0xFF;
++              p = tparam (ts, NULL, 0, (int)r, (int)g, (int)b, 0);
++            }
+ 	  OUTPUT (tty, p);
+ 	  xfree (p);
+ 	}
+ 
+-      ts = tty->standout_mode ? tty->TS_set_foreground : tty->TS_set_background;
++      if (face_tty_specified_24_bit_color(bg))
++        ts = tty->standout_mode ? tty->TS_set_rgb_foreground : tty->TS_set_rgb_background;
++      else
++        ts = tty->standout_mode ? tty->TS_set_foreground : tty->TS_set_background;
+       if (face_tty_specified_color (bg) && ts)
+ 	{
+-          p = tparam (ts, NULL, 0, bg, 0, 0, 0);
++          if (!face_tty_specified_24_bit_color(bg))
++            p = tparam (ts, NULL, 0, bg, 0, 0, 0);
++          else
++            {
++              const unsigned char r = (bg >> 16) & 0xFF,
++                g = (bg >> 8) & 0xFF,
++                b = bg & 0xFF;
++              p = tparam (ts, NULL, 0, (int)r, (int)g, (int)b, 0);
++          }
+ 	  OUTPUT (tty, p);
+ 	  xfree (p);
+ 	}
+@@ -2028,6 +2050,8 @@ TERMINAL does not refer to a text terminal.  */)
+   struct terminal *t = get_tty_terminal (terminal, 0);
+   if (!t)
+     return make_number (0);
++  else if (t->display_info.tty->TS_set_rgb_foreground)
++    return make_number (16777216); /* 24 bit True Color */
+   else
+     return make_number (t->display_info.tty->TN_max_colors);
+ }
+@@ -2043,6 +2067,8 @@ static int default_no_color_video;
+ static char *default_orig_pair;
+ static char *default_set_foreground;
+ static char *default_set_background;
++static char *default_set_rgb_foreground;
++static char *default_set_rgb_background;
+ 
+ /* Save or restore the default color-related capabilities of this
+    terminal.  */
+@@ -2055,6 +2081,8 @@ tty_default_color_capabilities (struct tty_display_info *tty, bool save)
+       dupstring (&default_orig_pair, tty->TS_orig_pair);
+       dupstring (&default_set_foreground, tty->TS_set_foreground);
+       dupstring (&default_set_background, tty->TS_set_background);
++      dupstring (&default_set_rgb_foreground, tty->TS_set_rgb_foreground);
++      dupstring (&default_set_rgb_background, tty->TS_set_rgb_background);
+       default_max_colors = tty->TN_max_colors;
+       default_max_pairs = tty->TN_max_pairs;
+       default_no_color_video = tty->TN_no_color_video;
+@@ -2064,6 +2092,8 @@ tty_default_color_capabilities (struct tty_display_info *tty, bool save)
+       tty->TS_orig_pair = default_orig_pair;
+       tty->TS_set_foreground = default_set_foreground;
+       tty->TS_set_background = default_set_background;
++      tty->TS_set_rgb_foreground = default_set_rgb_foreground;
++      tty->TS_set_rgb_background = default_set_rgb_background;
+       tty->TN_max_colors = default_max_colors;
+       tty->TN_max_pairs = default_max_pairs;
+       tty->TN_no_color_video = default_no_color_video;
+@@ -2088,6 +2118,7 @@ tty_setup_colors (struct tty_display_info *tty, int mode)
+ 	tty->TN_max_pairs = 0;
+ 	tty->TN_no_color_video = 0;
+ 	tty->TS_set_foreground = tty->TS_set_background = tty->TS_orig_pair = NULL;
++        tty->TS_set_rgb_foreground = tty->TS_set_rgb_background = NULL;
+ 	break;
+       case 0:	 /* default colors, if any */
+       default:
+@@ -2102,10 +2133,45 @@ tty_setup_colors (struct tty_display_info *tty, int mode)
+ 	tty->TS_set_foreground = "\033[3%dm";
+ 	tty->TS_set_background = "\033[4%dm";
+ #endif
++        tty->TS_set_rgb_foreground = NULL;
++        tty->TS_set_rgb_background = NULL;
+ 	tty->TN_max_colors = 8;
+ 	tty->TN_max_pairs = 64;
+ 	tty->TN_no_color_video = 0;
+ 	break;
++      case 16777216: /* RGB colors */
++        tty->TS_orig_pair = "\033[0m";
++
++        /* if the user hasn't explicitly chosen the ":" separator, use ";". */
++        char * true_color_separator = getenv ("EMACS_TRUE_COLOR_SEPARATOR");
++        if (true_color_separator && strcmp (true_color_separator, ":") == 0)
++        {
++          /* XXX chopps use ITU T.421 ':' separator */
++          /* TODO This should be extracted from terminfo/termcap. */
++#ifdef TERMINFO
++          tty->TS_set_rgb_foreground = "\033[38:2:%p1%d:%p2%d:%p3%dm";
++          tty->TS_set_rgb_background = "\033[48:2:%p1%d:%p2%d:%p3%dm";
++#else
++          tty->TS_set_rgb_foreground = "\033[38:2:%d:%d:%dm";
++          tty->TS_set_rgb_background = "\033[48:2:%d:%d:%dm";
++#endif
++        }
++        else
++        {
++          /* TODO This should be extracted from terminfo/termcap. */
++#ifdef TERMINFO
++          tty->TS_set_rgb_foreground = "\033[38;2;%p1%d;%p2%d;%p3%dm";
++          tty->TS_set_rgb_background = "\033[48;2;%p1%d;%p2%d;%p3%dm";
++#else
++          tty->TS_set_rgb_foreground = "\033[38;2;%d;%d;%dm";
++          tty->TS_set_rgb_background = "\033[48;2;%d;%d;%dm";
++#endif
++        }
++
++        tty->TN_max_colors = 16777216;
++        /*tty->TN_max_pairs = 64; TODO */
++        tty->TN_no_color_video = 0;
++        break;
+     }
+ }
+ 
+@@ -4201,6 +4267,38 @@ use the Bourne shell command `TERM=... export TERM' (C-shell:\n\
+       tty->TN_no_color_video = tgetnum ("NC");
+       if (tty->TN_no_color_video == -1)
+         tty->TN_no_color_video = 0;
++
++
++      /* Allow the user to opt-in to True Color support. */
++      char * true_color_separator = getenv ("EMACS_TRUE_COLOR_SEPARATOR");
++      if (true_color_separator && strcmp (true_color_separator, ";") == 0)
++        {
++          /* TODO This should be extracted from terminfo/termcap. */
++#ifdef TERMINFO
++          tty->TS_set_rgb_foreground = "\033[38;2;%p1%d;%p2%d;%p3%dm";
++          tty->TS_set_rgb_background = "\033[48;2;%p1%d;%p2%d;%p3%dm";
++#else
++          tty->TS_set_rgb_foreground = "\033[38;2;%d;%d;%dm";
++          tty->TS_set_rgb_background = "\033[48;2;%d;%d;%dm";
++#endif
++        }
++      else if (true_color_separator && strcmp (true_color_separator, ":") == 0)
++        {
++          /* XXX chopps use ITU T.421 ':' separator */
++          /* TODO This should be extracted from terminfo/termcap. */
++#ifdef TERMINFO
++          tty->TS_set_rgb_foreground = "\033[38:2:%p1%d:%p2%d:%p3%dm";
++          tty->TS_set_rgb_background = "\033[48:2:%p1%d:%p2%d:%p3%dm";
++#else
++          tty->TS_set_rgb_foreground = "\033[38:2:%d:%d:%dm";
++          tty->TS_set_rgb_background = "\033[48:2:%d:%d:%dm";
++#endif
++        }
++      else
++        {
++          tty->TS_set_rgb_foreground = NULL;
++          tty->TS_set_rgb_background = NULL;
++        }
+     }
+ 
+   tty_default_color_capabilities (tty, 1);
+diff --git a/src/termchar.h b/src/termchar.h
+index d8066d7..e48d583 100644
+--- a/src/termchar.h
++++ b/src/termchar.h
+@@ -157,6 +157,10 @@ struct tty_display_info
+   const char *TS_set_foreground;
+   const char *TS_set_background;
+ 
++  /* Support for 24bit RGB color terminals. */
++  const char *TS_set_rgb_foreground;
++  const char *TS_set_rgb_background;
++
+   int TF_hazeltine;             /* termcap hz flag. */
+   int TF_insmode_motion;        /* termcap mi flag: can move while in insert mode. */
+   int TF_standout_motion;       /* termcap mi flag: can move while in standout mode. */
+diff --git a/src/xfaces.c b/src/xfaces.c
+index 29c91f7..347ebf8 100644
+--- a/src/xfaces.c
++++ b/src/xfaces.c
+@@ -382,7 +382,7 @@ static ptrdiff_t lface_id_to_name_size;
+ 
+ /* TTY color-related functions (defined in tty-colors.el).  */
+ 
+-static Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values;
++static Lisp_Object Qtty_color_desc, Qtty_color_by_index, Qtty_color_standard_values, Qtty_color_canonicalize;
+ 
+ /* The name of the function used to compute colors on TTYs.  */
+ 
+@@ -943,54 +943,80 @@ tty_lookup_color (struct frame *f, Lisp_Object color, XColor *tty_color,
+   if (!STRINGP (color) || NILP (Ffboundp (Qtty_color_desc)))
+     return 0;
+ 
+-  XSETFRAME (frame, f);
+-
+-  color_desc = call2 (Qtty_color_desc, color, frame);
+-  if (CONSP (color_desc) && CONSP (XCDR (color_desc)))
++  if (f->output_method == output_termcap
++      && f->output_data.tty->display_info->TS_set_rgb_foreground
++      && !NILP (Ffboundp (Qtty_color_standard_values)))
+     {
+-      Lisp_Object rgb;
+-
+-      if (! INTEGERP (XCAR (XCDR (color_desc))))
+-	return 0;
++      /* Terminal supports 3 byte RGB colors. */
++      if (!NILP (Ffboundp (Qtty_color_canonicalize)))
++        color = call1(Qtty_color_canonicalize, color);
+ 
+-      tty_color->pixel = XINT (XCAR (XCDR (color_desc)));
++      color_desc = call1 (Qtty_color_standard_values, color);
++      if (! parse_rgb_list (color_desc, tty_color))
++        return 0;
+ 
+-      rgb = XCDR (XCDR (color_desc));
+-      if (! parse_rgb_list (rgb, tty_color))
+-	return 0;
++      /* Map XColor to 3 byte values. */
++      tty_color->pixel = 1 << 24 /* Set bit 24 to mark RGB values. */
++        | (tty_color->red / 256) << 16
++        | (tty_color->green / 256) << 8
++        | (tty_color->blue / 256);
+ 
+-      /* Should we fill in STD_COLOR too?  */
+       if (std_color)
+-	{
+-	  /* Default STD_COLOR to the same as TTY_COLOR.  */
+-	  *std_color = *tty_color;
+-
+-	  /* Do a quick check to see if the returned descriptor is
+-	     actually _exactly_ equal to COLOR, otherwise we have to
+-	     lookup STD_COLOR separately.  If it's impossible to lookup
+-	     a standard color, we just give up and use TTY_COLOR.  */
+-	  if ((!STRINGP (XCAR (color_desc))
+-	       || NILP (Fstring_equal (color, XCAR (color_desc))))
+-	      && !NILP (Ffboundp (Qtty_color_standard_values)))
+-	    {
+-	      /* Look up STD_COLOR separately.  */
+-	      rgb = call1 (Qtty_color_standard_values, color);
+-	      if (! parse_rgb_list (rgb, std_color))
+-		return 0;
+-	    }
+-	}
++        *std_color = *tty_color;
+ 
+       return 1;
+     }
+-  else if (NILP (Fsymbol_value (intern ("tty-defined-color-alist"))))
+-    /* We were called early during startup, and the colors are not
+-       yet set up in tty-defined-color-alist.  Don't return a failure
+-       indication, since this produces the annoying "Unable to
+-       load color" messages in the *Messages* buffer.  */
+-    return 1;
+   else
+-    /* tty-color-desc seems to have returned a bad value.  */
+-    return 0;
++    {
++      XSETFRAME (frame, f);
++
++      color_desc = call2 (Qtty_color_desc, color, frame);
++      if (CONSP (color_desc) && CONSP (XCDR (color_desc)))
++        {
++          Lisp_Object rgb;
++
++          if (! INTEGERP (XCAR (XCDR (color_desc))))
++            return 0;
++
++          tty_color->pixel = XINT (XCAR (XCDR (color_desc)));
++
++          rgb = XCDR (XCDR (color_desc));
++          if (! parse_rgb_list (rgb, tty_color))
++            return 0;
++
++          /* Should we fill in STD_COLOR too?  */
++          if (std_color)
++            {
++              /* Default STD_COLOR to the same as TTY_COLOR.  */
++              *std_color = *tty_color;
++
++              /* Do a quick check to see if the returned descriptor is
++                 actually _exactly_ equal to COLOR, otherwise we have to
++                 lookup STD_COLOR separately.  If it's impossible to lookup
++                 a standard color, we just give up and use TTY_COLOR.  */
++              if ((!STRINGP (XCAR (color_desc))
++                   || NILP (Fstring_equal (color, XCAR (color_desc))))
++                  && !NILP (Ffboundp (Qtty_color_standard_values)))
++                {
++                  /* Look up STD_COLOR separately.  */
++                  rgb = call1 (Qtty_color_standard_values, color);
++                  if (! parse_rgb_list (rgb, std_color))
++                    return 0;
++                }
++            }
++
++          return 1;
++        }
++      else if (NILP (Fsymbol_value (intern ("tty-defined-color-alist"))))
++        /* We were called early during startup, and the colors are not
++           yet set up in tty-defined-color-alist.  Don't return a failure
++           indication, since this produces the annoying "Unable to
++           load color" messages in the *Messages* buffer.  */
++        return 1;
++      else
++        /* tty-color-desc seems to have returned a bad value.  */
++        return 0;
++    }
+ }
+ 
+ /* A version of defined_color for non-X frames.  */
+@@ -1008,7 +1034,9 @@ tty_defined_color (struct frame *f, const char *color_name,
+   color_def->green = 0;
+ 
+   if (*color_name)
+-    status = tty_lookup_color (f, build_string (color_name), color_def, NULL);
++    {
++      status = tty_lookup_color (f, build_string (color_name), color_def, NULL);
++    }
+ 
+   if (color_def->pixel == FACE_TTY_DEFAULT_COLOR && *color_name)
+     {
+@@ -5780,6 +5808,7 @@ map_tty_color (struct frame *f, struct face *face,
+   unsigned long default_pixel =
+     foreground_p ? FACE_TTY_DEFAULT_FG_COLOR : FACE_TTY_DEFAULT_BG_COLOR;
+   unsigned long pixel = default_pixel;
++  XColor true_color;
+ #ifdef MSDOS
+   unsigned long default_other_pixel =
+     foreground_p ? FACE_TTY_DEFAULT_BG_COLOR : FACE_TTY_DEFAULT_FG_COLOR;
+@@ -5798,7 +5827,18 @@ map_tty_color (struct frame *f, struct face *face,
+     {
+       /* Associations in tty-defined-color-alist are of the form
+ 	 (NAME INDEX R G B).  We need the INDEX part.  */
+-      pixel = XINT (XCAR (XCDR (def)));
++      if (f->output_method == output_termcap
++          && f->output_data.tty->display_info->TS_set_rgb_foreground
++          && parse_rgb_list (XCDR (XCDR(def)), &true_color))
++        {
++          /* Map XColor to 3 byte values. */
++          pixel = 1 << 24 /* Set bit 24 to mark RGB values. */
++            | (true_color.red / 256) << 16
++            | (true_color.green / 256) << 8
++            | (true_color.blue / 256);
++        }
++       else
++         pixel = XINT (XCAR (XCDR (def)));
+     }
+ 
+   if (pixel == default_pixel && STRINGP (color))
+@@ -6460,6 +6500,7 @@ syms_of_xfaces (void)
+   DEFSYM (Qwindow_divider, "window-divider");
+   DEFSYM (Qwindow_divider_first_pixel, "window-divider-first-pixel");
+   DEFSYM (Qwindow_divider_last_pixel, "window-divider-last-pixel");
++  DEFSYM (Qtty_color_canonicalize, "tty-color-canonicalize");
+   DEFSYM (Qtty_color_desc, "tty-color-desc");
+   DEFSYM (Qtty_color_standard_values, "tty-color-standard-values");
+   DEFSYM (Qtty_color_by_index, "tty-color-by-index");

From ce7aa7188045e2e646d199b7ea6e3dd64d056865 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Thu, 25 Feb 2016 19:07:46 -0500
Subject: [PATCH 1809/2285] vte-ng: 0.42.1.a -> 0.42.4.a

---
 pkgs/desktops/gnome-3/3.18/core/vte/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.18/core/vte/default.nix b/pkgs/desktops/gnome-3/3.18/core/vte/default.nix
index 86dfd953b48f..334718403a0d 100644
--- a/pkgs/desktops/gnome-3/3.18/core/vte/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/vte/default.nix
@@ -43,12 +43,12 @@ let baseAttrs = rec {
 in stdenv.mkDerivation ( baseAttrs
   // stdenv.lib.optionalAttrs selectTextPatch rec {
       name = "vte-ng-${version}";
-      version = "0.42.1.a";
+      version = "0.42.4.a";
       src = fetchFromGitHub {
         owner = "thestinger";
         repo = "vte-ng";
         rev = version;
-        sha256 = "1296rvngixi6l31mhhaks6vr1xyqw8h6n5hwknadrlk95nknrpxm";
+        sha256 = "1w91lz30j5lrskp9ds5j3nn27m5mpdpn7nlcvf5y1w63mpmjg8k1";
       };
       # slightly hacky; I couldn't make it work with autoreconfHook
       configureScript = "./autogen.sh";

From bcfa59bf822dc696e963d7abccfdff2e58e70525 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 30 Jan 2016 14:47:04 +0100
Subject: [PATCH 1810/2285] gitlab: 8.0.5 -> 8.5.0, service improvements

Updates gitlab to the current stable version and fixes a lot of features that
were broken, at least with the current version and our configuration.

Quite a lot of sweat and tears has gone into testing nearly all features and
reading/patching the Gitlab source as we're about to deploy gitlab for our
whole company.

Things to note:

 * The gitlab config is now written as a nix attribute set and will be
   converted to JSON. Gitlab uses YAML but JSON is a subset of YAML.
   The `extraConfig` opition is also an attribute set that will be merged
   with the default config. This way *all* Gitlab options are supported.

 * Some paths like uploads and configs are hardcoded in rails  (at least
   after my study of the Gitlab source). This is why they are linked from
   the Gitlab root to /run/gitlab and then linked to the  configurable
   `statePath`.

 * Backup & restore should work out of the box from another Gitlab instance.

 * gitlab-git-http-server has been replaced by gitlab-workhorse upstream.
   Push & pull over HTTPS works perfectly. Communication to gitlab is done
   over unix sockets. An HTTP server is required to proxy requests to
   gitlab-workhorse over another unix socket at
   `/run/gitlab/gitlab-workhorse.socket`.

 * The user & group running gitlab are now configurable. These can even be
   changed for live instances.

 * The initial email address & password of the root user can be configured.

Fixes #8598.
---
 nixos/modules/rename.nix                      |    3 +
 nixos/modules/services/misc/gitlab.nix        |  359 +-
 .../gitlab-git-http-server/default.nix        |   23 -
 .../gitlab-shell/default.nix                  |   15 +-
 .../remove-hardcoded-locations.patch          |   13 +
 .../gitlab-workhorse/default.nix              |   26 +
 .../remove-hardcoded-paths.patch              |   12 +
 .../version-management/gitlab/Gemfile         |  187 +-
 .../version-management/gitlab/Gemfile.lock    |  746 ++-
 .../version-management/gitlab/default.nix     |   34 +-
 .../version-management/gitlab/gemset.nix      | 5697 ++++++++---------
 .../gitlab/nulladapter.patch                  |   29 +
 .../gitlab/remove-hardcoded-locations.patch   |  169 +-
 pkgs/top-level/all-packages.nix               |    6 +-
 14 files changed, 3741 insertions(+), 3578 deletions(-)
 delete mode 100644 pkgs/applications/version-management/gitlab-git-http-server/default.nix
 create mode 100644 pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
 create mode 100644 pkgs/applications/version-management/gitlab-workhorse/default.nix
 create mode 100644 pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch
 create mode 100644 pkgs/applications/version-management/gitlab/nulladapter.patch

diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 6d5ee6fc84e9..85435884b199 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -28,6 +28,9 @@ with lib;
     (mkRenamedOptionModule [ "services" "subsonic" "host" ] [ "services" "subsonic" "listenAddress" ])
     (mkRenamedOptionModule [ "jobs" ] [ "systemd" "services" ])
 
+    (mkRenamedOptionModule [ "services" "gitlab" "stateDir" ] [ "services" "gitlab" "statePath" ])
+    (mkRemovedOptionModule [ "services" "gitlab" "satelliteDir" ])
+
     # Old Grub-related options.
     (mkRenamedOptionModule [ "boot" "initrd" "extraKernelModules" ] [ "boot" "initrd" "kernelModules" ])
     (mkRenamedOptionModule [ "boot" "extraKernelParams" ] [ "boot" "kernelParams" ])
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 949357ab20f4..074f1a040b8b 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -21,14 +21,15 @@ let
       username: ${cfg.databaseUsername}
       encoding: utf8
   '';
+
   gitlabShellYml = ''
-    user: gitlab
-    gitlab_url: "http://${cfg.host}:${toString cfg.port}/"
+    user: ${cfg.user}
+    gitlab_url: "http://localhost:8080/"
     http_settings:
       self_signed_cert: false
-    repos_path: "${cfg.stateDir}/repositories"
-    secret_file: "${cfg.stateDir}/config/gitlab_shell_secret"
-    log_file: "${cfg.stateDir}/log/gitlab-shell.log"
+    repos_path: "${cfg.statePath}/repositories"
+    secret_file: "${cfg.statePath}/config/gitlab_shell_secret"
+    log_file: "${cfg.statePath}/log/gitlab-shell.log"
     redis:
       bin: ${pkgs.redis}/bin/redis-cli
       host: 127.0.0.1
@@ -37,33 +38,101 @@ let
       namespace: resque:gitlab
   '';
 
+  gitlabConfig = {
+    production = flip recursiveUpdate cfg.extraConfig {
+      gitlab = {
+        host = cfg.host;
+        port = cfg.port;
+        https = cfg.https;
+        user = cfg.user;
+        email_enabled = true;
+        email_display_name = "GitLab";
+        email_reply_to = "noreply@localhost";
+        default_theme = 2;
+        default_projects_features = {
+          issues = true;
+          merge_requests = true;
+          wiki = false;
+          snippets = false;
+          builds = true;
+        };
+      };
+      artifacts = {
+        enabled = true;
+      };
+      lfs = {
+        enabled = true;
+      };
+      gravatar = {
+        enabled = true;
+      };
+      cron_jobs = {
+        stuck_ci_builds_worker = {
+          cron = "0 0 * * *";
+        };
+      };
+      gitlab_ci = {
+        builds_path = "${cfg.statePath}/builds";
+      };
+      ldap = {
+        enabled = false;
+      };
+      omniauth = {
+        enabled = false;
+      };
+      shared = {
+        path = "${cfg.statePath}/shared";
+      };
+      backup = {
+        path = "${cfg.backupPath}";
+      };
+      gitlab_shell = {
+        path = "${pkgs.gitlab-shell}";
+        repos_path = "${cfg.statePath}/repositories";
+        hooks_path = "${cfg.statePath}/shell/hooks";
+        secret_file = "${cfg.statePath}/config/gitlab_shell_secret";
+        upload_pack = true;
+        receive_pack = true;
+      };
+      git = {
+        bin_path = "git";
+        max_size = 20971520; # 20MB
+        timeout = 10;
+      };
+      extra = {};
+    };
+  };
+
+  gitlabEnv = {
+    HOME = "${cfg.statePath}/home";
+    GEM_HOME = gemHome;
+    BUNDLE_GEMFILE = "${pkgs.gitlab}/share/gitlab/Gemfile";
+    UNICORN_PATH = "${cfg.statePath}/";
+    GITLAB_PATH = "${pkgs.gitlab}/share/gitlab/";
+    GITLAB_STATE_PATH = "${cfg.statePath}";
+    GITLAB_UPLOADS_PATH = "${cfg.statePath}/uploads";
+    GITLAB_LOG_PATH = "${cfg.statePath}/log";
+    GITLAB_SHELL_PATH = "${pkgs.gitlab-shell}";
+    GITLAB_SHELL_CONFIG_PATH = "${cfg.statePath}/shell/config.yml";
+    GITLAB_SHELL_SECRET_PATH = "${cfg.statePath}/config/gitlab_shell_secret";
+    GITLAB_SHELL_HOOKS_PATH = "${cfg.statePath}/shell/hooks";
+    RAILS_ENV = "production";
+  };
+
   unicornConfig = builtins.readFile ./defaultUnicornConfig.rb;
 
   gitlab-runner = pkgs.stdenv.mkDerivation rec {
     name = "gitlab-runner";
-    buildInputs = [ pkgs.gitlab pkgs.bundler pkgs.makeWrapper ];
+    buildInputs = with pkgs; [ gitlab bundler makeWrapper ];
     phases = "installPhase fixupPhase";
     buildPhase = "";
     installPhase = ''
       mkdir -p $out/bin
-      makeWrapper ${bundler}/bin/bundle $out/bin/gitlab-runner\
-          --set RAKEOPT '"-f ${pkgs.gitlab}/share/gitlab/Rakefile"'\
-          --set GEM_HOME '${gemHome}'\
-          --set UNICORN_PATH "${cfg.stateDir}/"\
-          --set GITLAB_PATH "${pkgs.gitlab}/share/gitlab/"\
-          --set GITLAB_APPLICATION_LOG_PATH "${cfg.stateDir}/log/application.log"\
-          --set GITLAB_SATELLITES_PATH "${cfg.stateDir}/satellites"\
-          --set GITLAB_SHELL_PATH "${pkgs.gitlab-shell}"\
-          --set GITLAB_REPOSITORIES_PATH "${cfg.stateDir}/repositories"\
-          --set GITLAB_SHELL_HOOKS_PATH "${cfg.stateDir}/shell/hooks"\
-          --set BUNDLE_GEMFILE "${pkgs.gitlab}/share/gitlab/Gemfile"\
-          --set GITLAB_EMAIL_FROM "${cfg.emailFrom}"\
-          --set GITLAB_SHELL_CONFIG_PATH "${cfg.stateDir}/shell/config.yml"\
-          --set GITLAB_SHELL_SECRET_PATH "${cfg.stateDir}/config/gitlab_shell_secret"\
-          --set GITLAB_HOST "${cfg.host}"\
-          --set GITLAB_PORT "${toString cfg.port}"\
-          --set GITLAB_BACKUP_PATH "${cfg.backupPath}"\
-          --set RAILS_ENV "production"
+      makeWrapper ${bundler}/bin/bundle $out/bin/gitlab-runner \
+          ${concatStrings (mapAttrsToList (name: value: "--set ${name} '\"${value}\"' ") gitlabEnv)} \
+          --set GITLAB_CONFIG_PATH '"${cfg.statePath}/config"' \
+          --set PATH '"${pkgs.nodejs}/bin:${pkgs.gzip}/bin:${config.services.postgresql.package}/bin:$PATH"' \
+          --set RAKEOPT '"-f ${pkgs.gitlab}/share/gitlab/Rakefile"'
     '';
   };
 
@@ -79,13 +148,7 @@ in {
         '';
       };
 
-      satelliteDir = mkOption {
-        type = types.str;
-        default = "/var/gitlab/git-satellites";
-        description = "Gitlab directory to store checked out git trees requires for operation.";
-      };
-
-      stateDir = mkOption {
+      statePath = mkOption {
         type = types.str;
         default = "/var/gitlab/state";
         description = "Gitlab state directory, logs are stored here.";
@@ -93,7 +156,7 @@ in {
 
       backupPath = mkOption {
         type = types.str;
-        default = cfg.stateDir + "/backup";
+        default = cfg.statePath + "/backup";
         description = "Gitlab path for backups.";
       };
 
@@ -136,7 +199,60 @@ in {
       port = mkOption {
         type = types.int;
         default = 8080;
-        description = "Gitlab server listening port.";
+        description = ''
+          Gitlab server port for copy-paste URLs, e.g. 80 or 443 if you're
+          service over https.
+        '';
+      };
+
+      https = mkOption {
+        type = types.bool;
+        default = false;
+        description = "Whether gitlab prints URLs with https as scheme.";
+      };
+
+      user = mkOption {
+        type = types.str;
+        default = "gitlab";
+        description = "User to run gitlab and all related services.";
+      };
+
+      group = mkOption {
+        type = types.str;
+        default = "gitlab";
+        description = "Group to run gitlab and all related services.";
+      };
+
+      initialRootEmail = mkOption {
+        type = types.str;
+        default = "admin@local.host";
+        description = ''
+          Initial email address of the root account if this is a new install.
+        '';
+      };
+
+      initialRootPassword = mkOption {
+        type = types.str;
+        default = "UseNixOS!";
+        description = ''
+          Initial password of the root account if this is a new install.
+        '';
+      };
+
+      extraConfig = mkOption {
+        type = types.attrs;
+        default = "";
+        example = {
+          gitlab = {
+            default_projects_features = {
+              builds = false;
+            };
+          };
+        };
+        description = ''
+          Extra options to be merged into config/gitlab.yml as nix
+          attribute set.
+        '';
       };
     };
   };
@@ -159,39 +275,24 @@ in {
     services.postfix.enable = mkDefault true;
 
     users.extraUsers = [
-      { name = "gitlab";
-        group = "gitlab";
-        home = "${cfg.stateDir}/home";
+      { name = cfg.user;
+        group = cfg.group;
+        home = "${cfg.statePath}/home";
         shell = "${pkgs.bash}/bin/bash";
         uid = config.ids.uids.gitlab;
-      } ];
+      }
+    ];
 
     users.extraGroups = [
-      { name = "gitlab";
+      { name = cfg.group;
         gid = config.ids.gids.gitlab;
-      } ];
+      }
+    ];
 
     systemd.services.gitlab-sidekiq = {
       after = [ "network.target" "redis.service" ];
       wantedBy = [ "multi-user.target" ];
-      environment.HOME = "${cfg.stateDir}/home";
-      environment.GEM_HOME = gemHome;
-      environment.UNICORN_PATH = "${cfg.stateDir}/";
-      environment.GITLAB_PATH = "${pkgs.gitlab}/share/gitlab/";
-      environment.GITLAB_APPLICATION_LOG_PATH = "${cfg.stateDir}/log/application.log";
-      environment.GITLAB_SATELLITES_PATH = "${cfg.stateDir}/satellites";
-      environment.GITLAB_SHELL_PATH = "${pkgs.gitlab-shell}";
-      environment.GITLAB_REPOSITORIES_PATH = "${cfg.stateDir}/repositories";
-      environment.GITLAB_SHELL_HOOKS_PATH = "${cfg.stateDir}/shell/hooks";
-      environment.BUNDLE_GEMFILE = "${pkgs.gitlab}/share/gitlab/Gemfile";
-      environment.GITLAB_EMAIL_FROM = "${cfg.emailFrom}";
-      environment.GITLAB_SHELL_CONFIG_PATH = "${cfg.stateDir}/shell/config.yml";
-      environment.GITLAB_SHELL_SECRET_PATH = "${cfg.stateDir}/config/gitlab_shell_secret";
-      environment.GITLAB_HOST = "${cfg.host}";
-      environment.GITLAB_PORT = "${toString cfg.port}";
-      environment.GITLAB_DATABASE_HOST = "${cfg.databaseHost}";
-      environment.GITLAB_DATABASE_PASSWORD = "${cfg.databasePassword}";
-      environment.RAILS_ENV = "production";
+      environment = gitlabEnv;
       path = with pkgs; [
         config.services.postgresql.package
         gitAndTools.git
@@ -201,116 +302,132 @@ in {
       ];
       serviceConfig = {
         Type = "simple";
-        User = "gitlab";
-        Group = "gitlab";
+        User = cfg.user;
+        Group = cfg.group;
         TimeoutSec = "300";
         WorkingDirectory = "${pkgs.gitlab}/share/gitlab";
-        ExecStart="${bundler}/bin/bundle exec \"sidekiq -q post_receive -q mailer -q system_hook -q project_web_hook -q gitlab_shell -q common -q default -e production -P ${cfg.stateDir}/tmp/sidekiq.pid\"";
+        ExecStart="${bundler}/bin/bundle exec \"sidekiq -q post_receive -q mailer -q system_hook -q project_web_hook -q gitlab_shell -q common -q default -e production -P ${cfg.statePath}/tmp/sidekiq.pid\"";
       };
     };
 
-    systemd.services.gitlab-git-http-server = {
+    systemd.services.gitlab-workhorse = {
       after = [ "network.target" "gitlab.service" ];
       wantedBy = [ "multi-user.target" ];
-      environment.HOME = "${cfg.stateDir}/home";
+      environment.HOME = gitlabEnv.HOME;
+      environment.GITLAB_SHELL_CONFIG_PATH = gitlabEnv.GITLAB_SHELL_CONFIG_PATH;
       path = with pkgs; [
         gitAndTools.git
         openssh
       ];
+      preStart = ''
+        mkdir -p /run/gitlab
+        chown ${cfg.user}:${cfg.group} /run/gitlab
+      '';
       serviceConfig = {
+        PermissionsStartOnly = true; # preStart must be run as root
         Type = "simple";
-        User = "gitlab";
-        Group = "gitlab";
+        User = cfg.user;
+        Group = cfg.group;
         TimeoutSec = "300";
-        ExecStart = "${pkgs.gitlab-git-http-server}/bin/gitlab-git-http-server -listenUmask 0 -listenNetwork unix -listenAddr ${cfg.stateDir}/tmp/sockets/gitlab-git-http-server.socket -authBackend http://localhost:8080 ${cfg.stateDir}/repositories";
+        ExecStart =
+          "${pkgs.gitlab-workhorse}/bin/gitlab-workhorse "
+          + "-listenUmask 0 "
+          + "-listenNetwork unix "
+          + "-listenAddr /run/gitlab/gitlab-workhorse.socket "
+          + "-authSocket ${cfg.statePath}/tmp/sockets/gitlab.socket "
+          + "-documentRoot ${pkgs.gitlab}/share/gitlab/public";
       };
     };
 
     systemd.services.gitlab = {
       after = [ "network.target" "postgresql.service" "redis.service" ];
       wantedBy = [ "multi-user.target" ];
-      environment.HOME = "${cfg.stateDir}/home";
-      environment.GEM_HOME = gemHome;
-      environment.UNICORN_PATH = "${cfg.stateDir}/";
-      environment.GITLAB_PATH = "${pkgs.gitlab}/share/gitlab/";
-      environment.GITLAB_APPLICATION_LOG_PATH = "${cfg.stateDir}/log/application.log";
-      environment.GITLAB_SATELLITES_PATH = "${cfg.stateDir}/satellites";
-      environment.GITLAB_SHELL_PATH = "${pkgs.gitlab-shell}";
-      environment.GITLAB_SHELL_CONFIG_PATH = "${cfg.stateDir}/shell/config.yml";
-      environment.GITLAB_SHELL_SECRET_PATH = "${cfg.stateDir}/config/gitlab_shell_secret";
-      environment.GITLAB_REPOSITORIES_PATH = "${cfg.stateDir}/repositories";
-      environment.GITLAB_SHELL_HOOKS_PATH = "${cfg.stateDir}/shell/hooks";
-      environment.BUNDLE_GEMFILE = "${pkgs.gitlab}/share/gitlab/Gemfile";
-      environment.GITLAB_EMAIL_FROM = "${cfg.emailFrom}";
-      environment.GITLAB_HOST = "${cfg.host}";
-      environment.GITLAB_PORT = "${toString cfg.port}";
-      environment.GITLAB_DATABASE_HOST = "${cfg.databaseHost}";
-      environment.GITLAB_DATABASE_PASSWORD = "${cfg.databasePassword}";
-      environment.RAILS_ENV = "production";
+      environment = gitlabEnv;
       path = with pkgs; [
         config.services.postgresql.package
         gitAndTools.git
-        ruby
         openssh
         nodejs
+        sudo
       ];
       preStart = ''
-        # TODO: use env vars
-        mkdir -p ${cfg.stateDir}
-        mkdir -p ${cfg.stateDir}/log
-        mkdir -p ${cfg.stateDir}/satellites
-        mkdir -p ${cfg.stateDir}/repositories
-        mkdir -p ${cfg.stateDir}/shell/hooks
-        mkdir -p ${cfg.stateDir}/tmp/pids
-        mkdir -p ${cfg.stateDir}/tmp/sockets
-        rm -rf ${cfg.stateDir}/config
-        mkdir -p ${cfg.stateDir}/config
+        mkdir -p ${cfg.backupPath}
+        mkdir -p ${cfg.statePath}/builds
+        mkdir -p ${cfg.statePath}/repositories
+        mkdir -p ${gitlabConfig.production.shared.path}/artifacts
+        mkdir -p ${gitlabConfig.production.shared.path}/lfs-objects
+        mkdir -p ${cfg.statePath}/log
+        mkdir -p ${cfg.statePath}/shell
+        mkdir -p ${cfg.statePath}/tmp/pids
+        mkdir -p ${cfg.statePath}/tmp/sockets
+
+        rm -rf ${cfg.statePath}/config ${cfg.statePath}/shell/hooks
+        mkdir -p ${cfg.statePath}/config ${cfg.statePath}/shell
+
         # TODO: What exactly is gitlab-shell doing with the secret?
-        tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c 20 > ${cfg.stateDir}/config/gitlab_shell_secret
-        mkdir -p ${cfg.stateDir}/home/.ssh
-        touch ${cfg.stateDir}/home/.ssh/authorized_keys
+        tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c 20 > ${cfg.statePath}/config/gitlab_shell_secret
 
-        cp -rf ${pkgs.gitlab}/share/gitlab/config ${cfg.stateDir}/
-        cp ${pkgs.gitlab}/share/gitlab/VERSION ${cfg.stateDir}/VERSION
+        # The uploads directory is hardcoded somewhere deep in rails. It is
+        # symlinked in the gitlab package to /run/gitlab/uploads to make it
+        # configurable
+        mkdir -p /run/gitlab
+        mkdir -p ${cfg.statePath}/uploads
+        ln -sf ${cfg.statePath}/uploads /run/gitlab/uploads
+        chown -R ${cfg.user}:${cfg.group} /run/gitlab
 
-        ln -fs ${pkgs.writeText "database.yml" databaseYml} ${cfg.stateDir}/config/database.yml
-        ln -fs ${pkgs.writeText "unicorn.rb" unicornConfig} ${cfg.stateDir}/config/unicorn.rb
+        # Prepare home directory
+        mkdir -p ${gitlabEnv.HOME}/.ssh
+        touch ${gitlabEnv.HOME}/.ssh/authorized_keys
+        chown -R ${cfg.user}:${cfg.group} ${gitlabEnv.HOME}/
+        chmod -R u+rwX,go-rwx+X ${gitlabEnv.HOME}/
 
-        chown -R gitlab:gitlab ${cfg.stateDir}/
-        chmod -R 755 ${cfg.stateDir}/
+        cp -rf ${pkgs.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
+        ln -sf ${cfg.statePath}/config /run/gitlab/config
+        cp ${pkgs.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION
+
+        # JSON is a subset of YAML
+        ln -fs ${pkgs.writeText "gitlab.yml" (builtins.toJSON gitlabConfig)} ${cfg.statePath}/config/gitlab.yml
+        ln -fs ${pkgs.writeText "database.yml" databaseYml} ${cfg.statePath}/config/database.yml
+        ln -fs ${pkgs.writeText "unicorn.rb" unicornConfig} ${cfg.statePath}/config/unicorn.rb
+
+        chown -R ${cfg.user}:${cfg.group} ${cfg.statePath}/
+        chmod -R ug+rwX,o-rwx+X ${cfg.statePath}/
+
+        # Install the shell required to push repositories
+        ln -fs ${pkgs.writeText "config.yml" gitlabShellYml} "$GITLAB_SHELL_CONFIG_PATH"
+        ln -fs ${pkgs.gitlab-shell}/hooks "$GITLAB_SHELL_HOOKS_PATH"
+        ${pkgs.gitlab-shell}/bin/install
 
         if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then
-          if ! test -e "${cfg.stateDir}/db-created"; then
-            psql postgres -c "CREATE ROLE gitlab WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'"
+          if ! test -e "${cfg.statePath}/db-created"; then
+            psql postgres -c "CREATE ROLE gitlab WITH LOGIN CREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'"
             ${config.services.postgresql.package}/bin/createdb --owner gitlab gitlab || true
-            touch "${cfg.stateDir}/db-created"
+            touch "${cfg.statePath}/db-created"
 
-            # force=yes disables the manual-interaction yes/no prompt
-            # which breaks without an stdin.
-            force=yes ${bundler}/bin/bundle exec rake -f ${pkgs.gitlab}/share/gitlab/Rakefile gitlab:setup RAILS_ENV=production
+            # The gitlab:setup task is horribly broken somehow, these two tasks will do the same for setting up the initial database
+            ${gitlab-runner}/bin/gitlab-runner exec rake db:migrate RAILS_ENV=production
+            ${gitlab-runner}/bin/gitlab-runner exec rake db:seed_fu RAILS_ENV=production \
+              GITLAB_ROOT_PASSWORD="${cfg.initialRootPassword}" GITLAB_ROOT_EMAIL="${cfg.initialRootEmail}";
           fi
         fi
 
-      ${bundler}/bin/bundle exec rake -f ${pkgs.gitlab}/share/gitlab/Rakefile db:migrate RAILS_ENV=production
-      # Install the shell required to push repositories
-      ln -fs ${pkgs.writeText "config.yml" gitlabShellYml} ${cfg.stateDir}/shell/config.yml
-      export GITLAB_SHELL_CONFIG_PATH=""${cfg.stateDir}/shell/config.yml
-      ${pkgs.gitlab-shell}/bin/install
+        # Always do the db migrations just to be sure the database is up-to-date
+        ${gitlab-runner}/bin/gitlab-runner exec rake db:migrate RAILS_ENV=production
 
-      # Change permissions in the last step because some of the
-      # intermediary scripts like to create directories as root.
-      chown -R gitlab:gitlab ${cfg.stateDir}/
-      chmod -R 755 ${cfg.stateDir}/
+        # Change permissions in the last step because some of the
+        # intermediary scripts like to create directories as root.
+        chown -R ${cfg.user}:${cfg.group} ${cfg.statePath}
+        chmod -R u+rwX,go-rwx+X ${cfg.statePath}
       '';
 
       serviceConfig = {
         PermissionsStartOnly = true; # preStart must be run as root
         Type = "simple";
-        User = "gitlab";
-        Group = "gitlab";
+        User = cfg.user;
+        Group = cfg.group;
         TimeoutSec = "300";
         WorkingDirectory = "${pkgs.gitlab}/share/gitlab";
-        ExecStart="${bundler}/bin/bundle exec \"unicorn -c ${cfg.stateDir}/config/unicorn.rb -E production\"";
+        ExecStart="${bundler}/bin/bundle exec \"unicorn -c ${cfg.statePath}/config/unicorn.rb -E production\"";
       };
 
     };
diff --git a/pkgs/applications/version-management/gitlab-git-http-server/default.nix b/pkgs/applications/version-management/gitlab-git-http-server/default.nix
deleted file mode 100644
index 98b14d2ce86a..000000000000
--- a/pkgs/applications/version-management/gitlab-git-http-server/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ stdenv, fetchgit, git, go }:
-
-stdenv.mkDerivation rec {
-  version = "0.2.14";
-  name = "gitlab-git-http-server-${version}";
-
-  srcs = fetchgit {
-    url = "https://gitlab.com/gitlab-org/gitlab-git-http-server.git";
-    rev = "7c63f08f7051348e56b903fc0bbefcfed398fc1c";
-    sha256 = "557d63a90c61371598b971a06bc056993610b58c2ef5762d9ef145ec2fdada78";
-  };
-
-  buildInputs = [ git go ];
-
-  buildPhase = ''
-    make PREFIX=$out
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    make install PREFIX=$out
-  '';
-}
diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix
index 5ee59c1e2550..c2e746630da5 100644
--- a/pkgs/applications/version-management/gitlab-shell/default.nix
+++ b/pkgs/applications/version-management/gitlab-shell/default.nix
@@ -1,19 +1,22 @@
-{ stdenv, ruby, bundler, fetchgit }:
+{ stdenv, ruby, bundler, fetchFromGitLab }:
 
 stdenv.mkDerivation rec {
-  version = "2.1.0";
+  version = "2.6.10";
   name = "gitlab-shell-${version}";
 
-  srcs = fetchgit {
-    url = "https://gitlab.com/gitlab-org/gitlab-shell.git";
-    rev = "ebbb9d80811c23d49a7d1b75d7a7d2b8ffe7437b";
-    sha256 = "fe69ab85d75a3871b4afa11ebc17f43008d135bbdbd6c581f6bebee2a4a3c75d";
+  srcs = fetchFromGitLab {
+    owner = "gitlab-org";
+    repo = "gitlab-shell";
+    rev = "v${version}";
+    sha256 = "1f1ma49xpkan2iksnw9amzjdw6i0bxnzdbsk0329m7if4987vcqd";
   };
 
   buildInputs = [
     ruby bundler
   ];
 
+  patches = [ ./remove-hardcoded-locations.patch ];
+
   installPhase = ''
     mkdir -p $out/
     cp -R . $out/
diff --git a/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
new file mode 100644
index 000000000000..e1c924cdeefd
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab-shell/remove-hardcoded-locations.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/gitlab_projects.rb b/lib/gitlab_projects.rb
+index c1d175a..7f7fd2f 100644
+--- a/lib/gitlab_projects.rb
++++ b/lib/gitlab_projects.rb
+@@ -5,7 +5,7 @@ require_relative 'gitlab_config'
+ require_relative 'gitlab_logger'
+ 
+ class GitlabProjects
+-  GLOBAL_HOOKS_DIRECTORY = File.join(ROOT_PATH, 'hooks')
++  GLOBAL_HOOKS_DIRECTORY = ENV['GITLAB_SHELL_HOOKS_PATH'] || File.join(ROOT_PATH, 'hooks')
+ 
+   # Project name is a directory name for repository with .git at the end
+   # It may be namespaced or not. Like repo.git or gitlab/repo.git
diff --git a/pkgs/applications/version-management/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab-workhorse/default.nix
new file mode 100644
index 000000000000..06c05d9f3b3b
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab-workhorse/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitLab, git, go }:
+
+stdenv.mkDerivation rec {
+  version = "0.6.4";
+  name = "gitlab-workhorse-${version}";
+
+  srcs = fetchFromGitLab {
+    owner = "gitlab-org";
+    repo = "gitlab-workhorse";
+    rev = version;
+    sha256 = "09bs3kdmqi6avdak2nqma141y4fhfv050zwqqx7qh9a9hgkgwjxw";
+  };
+
+  buildInputs = [ git go ];
+
+  patches = [ ./remove-hardcoded-paths.patch ];
+
+  buildPhase = ''
+    make PREFIX=$out
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    make install PREFIX=$out
+  '';
+}
diff --git a/pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch b/pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch
new file mode 100644
index 000000000000..37f3d2deef54
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab-workhorse/remove-hardcoded-paths.patch
@@ -0,0 +1,12 @@
+diff --git a/internal/git/command.go b/internal/git/command.go
+index 0e5496c..5778294 100644
+--- a/internal/git/command.go
++++ b/internal/git/command.go
+@@ -16,6 +16,7 @@ func gitCommand(gl_id string, name string, args ...string) *exec.Cmd {
+ 	cmd.Env = []string{
+ 		fmt.Sprintf("HOME=%s", os.Getenv("HOME")),
+ 		fmt.Sprintf("PATH=%s", os.Getenv("PATH")),
++		fmt.Sprintf("GITLAB_SHELL_CONFIG_PATH=%s", os.Getenv("GITLAB_SHELL_CONFIG_PATH")),
+ 		fmt.Sprintf("LD_LIBRARY_PATH=%s", os.Getenv("LD_LIBRARY_PATH")),
+ 		fmt.Sprintf("GL_ID=%s", gl_id),
+ 	}
diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile
index 66261426c014..ec40f2463945 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@@ -1,14 +1,10 @@
 source "https://rubygems.org"
 
-def darwin_only(require_as)
-  RUBY_PLATFORM.include?('darwin') && require_as
-end
+gem 'rails', '4.2.5.1'
+gem 'rails-deprecated_sanitizer', '~> 1.0.3'
 
-def linux_only(require_as)
-  RUBY_PLATFORM.include?('linux') && require_as
-end
-
-gem 'rails', '4.1.12'
+# Responders respond_to and respond_with
+gem 'responders', '~> 2.0'
 
 # Specify a sprockets version due to security issue
 # See https://groups.google.com/forum/#!topic/rubyonrails-security/doAVp0YaTqY
@@ -22,20 +18,27 @@ gem "mysql2", '~> 0.3.16', group: :mysql
 gem "pg", '~> 0.18.2', group: :postgres
 
 # Authentication libraries
-gem "devise", '~> 3.5.2'
-gem "devise-async", '~> 0.9.0'
-gem 'omniauth', "~> 1.2.2"
-gem 'omniauth-google-oauth2', '~> 0.2.5'
-gem 'omniauth-twitter', '~> 1.0.1'
-gem 'omniauth-github', '~> 1.1.1'
-gem 'omniauth-shibboleth', '~> 1.1.1'
-gem 'omniauth-kerberos', '~> 0.2.0', group: :kerberos
-gem 'omniauth-gitlab', '~> 1.0.0'
-gem 'omniauth-bitbucket', '~> 0.0.2'
-gem 'omniauth-saml', '~> 1.4.0'
-gem 'doorkeeper', '~> 2.1.3'
-gem 'omniauth_crowd'
-gem "rack-oauth2", "~> 1.0.5"
+gem 'devise',                 '~> 3.5.4'
+gem 'devise-async',           '~> 0.9.0'
+gem 'doorkeeper',             '~> 2.2.0'
+gem 'omniauth',               '~> 1.3.1'
+gem 'omniauth-azure-oauth2',  '~> 0.0.6'
+gem 'omniauth-bitbucket',     '~> 0.0.2'
+gem 'omniauth-cas3',          '~> 1.1.2'
+gem 'omniauth-facebook',      '~> 3.0.0'
+gem 'omniauth-github',        '~> 1.1.1'
+gem 'omniauth-gitlab',        '~> 1.0.0'
+gem 'omniauth-google-oauth2', '~> 0.2.0'
+gem 'omniauth-kerberos',      '~> 0.3.0', group: :kerberos
+gem 'omniauth-saml',          '~> 1.4.2'
+gem 'omniauth-shibboleth',    '~> 1.2.0'
+gem 'omniauth-twitter',       '~> 1.2.0'
+gem 'omniauth_crowd',         '~> 2.2.0'
+gem 'rack-oauth2',            '~> 1.2.1'
+
+# Spam and anti-bot protection
+gem 'recaptcha', require: 'recaptcha/rails'
+gem 'akismet', '~> 2.0'
 
 # Two-factor authentication
 gem 'devise-two-factor', '~> 2.0.0'
@@ -47,7 +50,7 @@ gem "browser", '~> 1.0.0'
 
 # Extracting information from a git repository
 # Provide access to Gitlab::Git library
-gem "gitlab_git", '~> 7.2.15'
+gem "gitlab_git", '~> 8.2'
 
 # LDAP Auth
 # GitLab fork with several improvements to original library. For full list of changes
@@ -55,32 +58,21 @@ gem "gitlab_git", '~> 7.2.15'
 gem 'gitlab_omniauth-ldap', '~> 1.2.1', require: "omniauth-ldap"
 
 # Git Wiki
-gem 'gollum-lib', '~> 4.0.2'
+gem 'gollum-lib', '~> 4.1.0'
 
 # Language detection
-# GitLab fork of linguist does not require pygments/python dependency.
-# New version of original gem also dropped pygments support but it has strict
-# dependency to unstable rugged version. We have internal issue for replacing
-# fork with original gem when we meet on same rugged version - https://dev.gitlab.org/gitlab/gitlabhq/issues/2052.
-gem "gitlab-linguist", "~> 3.0.1", require: "linguist"
+gem "github-linguist", "~> 4.7.0", require: "linguist"
 
 # API
-gem "grape", "~> 0.6.1"
-gem "grape-entity", "~> 0.4.2"
-gem 'rack-cors', '~> 0.2.9', require: 'rack/cors'
-
-# Format dates and times
-# based on human-friendly examples
-gem "stamp", '~> 0.5.0'
-
-# Enumeration fields
-gem 'enumerize', '~> 0.7.0'
+gem 'grape',        '~> 0.13.0'
+gem 'grape-entity', '~> 0.4.2'
+gem 'rack-cors',    '~> 0.4.0', require: 'rack/cors'
 
 # Pagination
-gem "kaminari", "~> 0.15.1"
+gem "kaminari", "~> 0.16.3"
 
 # HAML
-gem "haml-rails", '~> 0.5.3'
+gem "haml-rails", '~> 0.9.0'
 
 # Files attachments
 gem "carrierwave", '~> 0.9.0'
@@ -89,7 +81,7 @@ gem "carrierwave", '~> 0.9.0'
 gem 'dropzonejs-rails', '~> 0.7.1'
 
 # for aws storage
-gem "fog", "~> 1.25.0"
+gem "fog", "~> 1.36.0"
 gem "unf", '~> 0.1.4'
 
 # Authorization
@@ -102,13 +94,18 @@ gem "seed-fu", '~> 2.3.5'
 gem 'html-pipeline', '~> 1.11.0'
 gem 'task_list',     '~> 1.0.2', require: 'task_list/railtie'
 gem 'github-markup', '~> 1.3.1'
-gem 'redcarpet',     '~> 3.3.2'
+gem 'redcarpet',     '~> 3.3.3'
 gem 'RedCloth',      '~> 4.2.9'
 gem 'rdoc',          '~>3.6'
 gem 'org-ruby',      '~> 0.9.12'
-gem 'creole',        '~>0.3.6'
+gem 'creole',        '~> 0.5.0'
 gem 'wikicloth',     '0.8.1'
 gem 'asciidoctor',   '~> 1.5.2'
+gem 'rouge',         '~> 1.10.1'
+
+# See https://groups.google.com/forum/#!topic/ruby-security-ann/aSbgDiwb24s
+# and https://groups.google.com/forum/#!topic/ruby-security-ann/Dy7YiKb_pMM
+gem 'nokogiri', '~> 1.6.7', '>= 1.6.7.2'
 
 # Diffs
 gem 'diffy', '~> 3.0.3'
@@ -120,7 +117,7 @@ group :unicorn do
 end
 
 # State machine
-gem "state_machine", '~> 1.2.0'
+gem "state_machines-activerecord", '~> 0.3.0'
 # Run events after state machine commits
 gem 'after_commit_queue'
 
@@ -128,17 +125,16 @@ gem 'after_commit_queue'
 gem 'acts-as-taggable-on', '~> 3.4'
 
 # Background jobs
-gem 'slim', '~> 2.0.2'
 gem 'sinatra', '~> 1.4.4', require: nil
-gem 'sidekiq', '3.3.0'
-gem 'sidetiq', '~> 0.6.3'
+gem 'sidekiq', '~> 4.0'
+gem 'sidekiq-cron', '~> 0.4.0'
+gem 'redis-namespace'
 
 # HTTP requests
 gem "httparty", '~> 0.13.3'
 
 # Colored output to console
-gem "colored", '~> 1.2'
-gem "colorize", '~> 0.5.8'
+gem "colorize", '~> 0.7.0'
 
 # GitLab settings
 gem 'settingslogic', '~> 2.0.9'
@@ -151,7 +147,7 @@ gem 'version_sorter', '~> 2.0.0'
 gem "redis-rails", '~> 4.0.0'
 
 # Campfire integration
-gem 'tinder', '~> 1.9.2'
+gem 'tinder', '~> 1.10.0'
 
 # HipChat integration
 gem 'hipchat', '~> 1.5.0'
@@ -163,28 +159,32 @@ gem "gitlab-flowdock-git-hook", "~> 1.0.1"
 gem "gemnasium-gitlab-service", "~> 0.2"
 
 # Slack integration
-gem "slack-notifier", "~> 1.0.0"
+gem "slack-notifier", "~> 1.2.0"
 
 # Asana integration
-gem 'asana', '~> 0.0.6'
+gem 'asana', '~> 0.4.0'
 
 # FogBugz integration
 gem 'ruby-fogbugz', '~> 0.2.1'
 
 # d3
-gem 'd3_rails', '~> 3.5.5'
+gem 'd3_rails', '~> 3.5.0'
 
 #cal-heatmap
-gem "cal-heatmap-rails", "~> 0.0.1"
+gem 'cal-heatmap-rails', '~> 3.5.0'
 
 # underscore-rails
-gem "underscore-rails", "~> 1.4.4"
+gem "underscore-rails", "~> 1.8.0"
 
 # Sanitize user input
 gem "sanitize", '~> 2.0'
+gem 'babosa', '~> 1.0.2'
+
+# Sanitizes SVG input
+gem "loofah", "~> 2.0.3"
 
 # Protect against bruteforcing
-gem "rack-attack", '~> 4.3.0'
+gem "rack-attack", '~> 4.3.1'
 
 # Ace editor
 gem 'ace-rails-ap', '~> 2.0.1'
@@ -193,38 +193,52 @@ gem 'ace-rails-ap', '~> 2.0.1'
 gem 'mousetrap-rails', '~> 1.4.6'
 
 # Detect and convert string character encoding
-gem 'charlock_holmes', '~> 0.6.9.4'
+gem 'charlock_holmes', '~> 0.7.3'
 
-gem "sass-rails", '~> 4.0.5'
+gem "sass-rails", '~> 5.0.0'
 gem "coffee-rails", '~> 4.1.0'
-gem "uglifier", '~> 2.3.2'
+gem "uglifier", '~> 2.7.2'
 gem 'turbolinks', '~> 2.5.0'
-gem 'jquery-turbolinks', '~> 2.0.1'
+gem 'jquery-turbolinks', '~> 2.1.0'
 
 gem 'addressable',        '~> 2.3.8'
-gem 'bootstrap-sass',     '~> 3.0'
+gem 'bootstrap-sass',     '~> 3.3.0'
 gem 'font-awesome-rails', '~> 4.2'
-gem 'gitlab_emoji',       '~> 0.1'
-gem 'gon',                '~> 5.0.0'
-gem 'jquery-atwho-rails', '~> 1.0.0'
-gem 'jquery-rails',       '~> 3.1.3'
+gem 'gitlab_emoji',       '~> 0.3.0'
+gem 'gon',                '~> 6.0.1'
+gem 'jquery-atwho-rails', '~> 1.3.2'
+gem 'jquery-rails',       '~> 4.0.0'
 gem 'jquery-scrollto-rails', '~> 1.4.3'
-gem 'jquery-ui-rails',    '~> 4.2.1'
-gem 'nprogress-rails',    '~> 0.1.2.3'
+gem 'jquery-ui-rails',    '~> 5.0.0'
+gem 'nprogress-rails',    '~> 0.1.6.7'
 gem 'raphael-rails',      '~> 2.1.2'
 gem 'request_store',      '~> 1.2.0'
 gem 'select2-rails',      '~> 3.5.9'
 gem 'virtus',             '~> 1.0.1'
+gem 'net-ssh',            '~> 3.0.1'
+
+# Sentry integration
+gem 'sentry-raven'
+
+# Metrics
+group :metrics do
+  gem 'allocations', '~> 1.0', require: false, platform: :mri
+  gem 'method_source', '~> 0.8', require: false
+  gem 'influxdb', '~> 0.2', require: false
+  gem 'connection_pool', '~> 2.0', require: false
+end
 
 group :development do
   gem "foreman"
-  gem 'brakeman', '3.0.1', require: false
+  gem 'brakeman', '~> 3.1.0', require: false
 
   gem "annotate", "~> 2.6.0"
   gem "letter_opener", '~> 1.1.2'
   gem 'quiet_assets', '~> 1.0.2'
-  gem 'rack-mini-profiler', '~> 0.9.0', require: false
-  gem 'rerun', '~> 0.10.0'
+  gem 'rerun', '~> 0.11.0'
+  gem 'bullet', require: false
+  gem 'rblineprof', platform: :mri, require: false
+  gem 'web-console', '~> 2.0'
 
   # Better errors handler
   gem 'better_errors', '~> 1.0.1'
@@ -241,7 +255,7 @@ group :development, :test do
   gem 'byebug', platform: :mri
   gem 'pry-rails'
 
-  gem 'awesome_print', '~> 1.2.0'
+  gem 'awesome_print', '~> 1.2.0', require: false
   gem 'fuubar', '~> 2.0.0'
 
   gem 'database_cleaner', '~> 1.4.0'
@@ -257,7 +271,7 @@ group :development, :test do
 
   gem 'capybara',            '~> 2.4.0'
   gem 'capybara-screenshot', '~> 1.0.0'
-  gem 'poltergeist',         '~> 1.6.0'
+  gem 'poltergeist',         '~> 1.8.1'
 
   gem 'teaspoon', '~> 1.0.0'
   gem 'teaspoon-jasmine', '~> 2.2.0'
@@ -267,16 +281,21 @@ group :development, :test do
   gem 'spring-commands-spinach',  '~> 1.0.0'
   gem 'spring-commands-teaspoon', '~> 0.0.2'
 
-  gem 'rubocop',  '~> 0.28.0',  require: false
+  gem 'rubocop', '~> 0.35.0', require: false
   gem 'coveralls',  '~> 0.8.2', require: false
   gem 'simplecov', '~> 0.10.0', require: false
+  gem 'flog', require: false
+  gem 'flay', require: false
+  gem 'bundler-audit', require: false
+
+  gem 'benchmark-ips', require: false
 end
 
 group :test do
   gem 'shoulda-matchers', '~> 2.8.0', require: false
   gem 'email_spec', '~> 1.6.0'
   gem 'webmock', '~> 1.21.0'
-  gem 'test_after_commit', '~> 0.2.2'
+  gem 'test_after_commit', '~> 0.4.2'
   gem 'sham_rack'
 end
 
@@ -284,12 +303,9 @@ group :production do
   gem "gitlab_meta", '7.0'
 end
 
-gem "newrelic_rpm", '~> 3.9.4.245'
-gem 'newrelic-grape'
+gem 'octokit', '~> 3.8.0'
 
-gem 'octokit', '~> 3.7.0'
-
-gem "mail_room", "~> 0.5.2"
+gem "mail_room", "~> 0.6.1"
 
 gem 'email_reply_parser', '~> 0.5.8'
 
@@ -298,19 +314,10 @@ gem 'activerecord-deprecated_finders', '~> 1.0.3'
 gem 'activerecord-session_store', '~> 0.1.0'
 gem "nested_form", '~> 0.3.2'
 
-# Scheduled
-gem 'whenever', '~> 0.8.4', require: false
-
 # OAuth
 gem 'oauth2', '~> 1.0.0'
 
 # Soft deletion
 gem "paranoia", "~> 2.0"
 
-group :development, :test do
-  gem 'guard-rspec', '~> 4.2.0'
-
-  gem 'rb-fsevent', require: darwin_only('rb-fsevent')
-  gem 'growl',      require: darwin_only('growl')
-  gem 'rb-inotify', require: linux_only('rb-inotify')
-end
+gem "activerecord-nulldb-adapter"
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index 56db3f619850..ff16e6284fab 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -1,63 +1,75 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (2.3.1)
+    CFPropertyList (2.3.2)
     RedCloth (4.2.9)
     ace-rails-ap (2.0.1)
-    actionmailer (4.1.12)
-      actionpack (= 4.1.12)
-      actionview (= 4.1.12)
+    actionmailer (4.2.5.1)
+      actionpack (= 4.2.5.1)
+      actionview (= 4.2.5.1)
+      activejob (= 4.2.5.1)
       mail (~> 2.5, >= 2.5.4)
-    actionpack (4.1.12)
-      actionview (= 4.1.12)
-      activesupport (= 4.1.12)
-      rack (~> 1.5.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+    actionpack (4.2.5.1)
+      actionview (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
-    actionview (4.1.12)
-      activesupport (= 4.1.12)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.5.1)
+      activesupport (= 4.2.5.1)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    activemodel (4.1.12)
-      activesupport (= 4.1.12)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.5.1)
+      activesupport (= 4.2.5.1)
+      globalid (>= 0.3.0)
+    activemodel (4.2.5.1)
+      activesupport (= 4.2.5.1)
       builder (~> 3.1)
-    activerecord (4.1.12)
-      activemodel (= 4.1.12)
-      activesupport (= 4.1.12)
-      arel (~> 5.0.0)
+    activerecord (4.2.5.1)
+      activemodel (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
+      arel (~> 6.0)
     activerecord-deprecated_finders (1.0.4)
-    activerecord-session_store (0.1.1)
+    activerecord-nulldb-adapter (0.3.2)
+      activerecord (>= 2.0.0)
+    activerecord-session_store (0.1.2)
       actionpack (>= 4.0.0, < 5)
       activerecord (>= 4.0.0, < 5)
       railties (>= 4.0.0, < 5)
-    activeresource (4.0.0)
-      activemodel (~> 4.0)
-      activesupport (~> 4.0)
-      rails-observers (~> 0.1.1)
-    activesupport (4.1.12)
-      i18n (~> 0.6, >= 0.6.9)
+    activesupport (4.2.5.1)
+      i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
-      thread_safe (~> 0.1)
+      thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     acts-as-taggable-on (3.5.0)
       activerecord (>= 3.2, < 5)
     addressable (2.3.8)
-    after_commit_queue (1.1.0)
-      rails (>= 3.0)
+    after_commit_queue (1.3.0)
+      activerecord (>= 3.0)
+    akismet (2.0.0)
+    allocations (1.0.4)
     annotate (2.6.10)
       activerecord (>= 3.2, <= 4.3)
       rake (~> 10.4)
-    arel (5.0.1.20140414130214)
-    asana (0.0.6)
-      activeresource (>= 3.2.3)
-    asciidoctor (1.5.2)
+    arel (6.0.3)
+    asana (0.4.0)
+      faraday (~> 0.9)
+      faraday_middleware (~> 0.9)
+      faraday_middleware-multi_json (~> 0.0)
+      oauth2 (~> 1.0)
+    asciidoctor (1.5.3)
     ast (2.1.0)
     astrolabe (1.3.1)
       parser (~> 2.2)
     attr_encrypted (1.3.4)
       encryptor (>= 1.3.0)
     attr_required (1.0.0)
-    autoprefixer-rails (5.2.1.2)
+    autoprefixer-rails (6.2.3)
       execjs
       json
     awesome_print (1.2.0)
@@ -65,29 +77,39 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
+    babosa (1.0.2)
     bcrypt (3.1.10)
+    benchmark-ips (2.3.0)
     better_errors (1.0.1)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
     binding_of_caller (0.7.2)
       debug_inspector (>= 0.0.1)
-    bootstrap-sass (3.3.5)
-      autoprefixer-rails (>= 5.0.0.1)
-      sass (>= 3.2.19)
-    brakeman (3.0.1)
+    bootstrap-sass (3.3.6)
+      autoprefixer-rails (>= 5.2.1)
+      sass (>= 3.3.4)
+    brakeman (3.1.4)
       erubis (~> 2.6)
       fastercsv (~> 1.5)
       haml (>= 3.0, < 5.0)
-      highline (~> 1.6.20)
+      highline (>= 1.6.20, < 2.0)
       multi_json (~> 1.2)
-      ruby2ruby (~> 2.1.1)
-      ruby_parser (~> 3.5.0)
+      ruby2ruby (>= 2.1.1, < 2.3.0)
+      ruby_parser (~> 3.7.0)
+      safe_yaml (>= 1.0)
       sass (~> 3.0)
+      slim (>= 1.3.6, < 4.0)
       terminal-table (~> 1.4)
-    browser (1.0.0)
+    browser (1.0.1)
     builder (3.2.2)
-    byebug (6.0.2)
-    cal-heatmap-rails (0.0.1)
+    bullet (4.14.10)
+      activesupport (>= 3.0.0)
+      uniform_notifier (~> 1.9.0)
+    bundler-audit (0.4.0)
+      bundler (~> 1.2)
+      thor (~> 0.18)
+    byebug (8.2.1)
+    cal-heatmap-rails (3.5.1)
     capybara (2.4.4)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -101,11 +123,9 @@ GEM
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       json (>= 1.7)
-    celluloid (0.16.0)
-      timers (~> 4.0.0)
-    charlock_holmes (0.6.9.4)
-    chronic (0.10.2)
-    chunky_png (1.3.4)
+    cause (0.1)
+    charlock_holmes (0.7.3)
+    chunky_png (1.3.5)
     cliver (0.3.2)
     coderay (1.1.0)
     coercible (1.0.0)
@@ -116,29 +136,31 @@ GEM
     coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.9.1.1)
-    colored (1.2)
-    colorize (0.5.8)
+    coffee-script-source (1.10.0)
+    colorize (0.7.7)
+    concurrent-ruby (1.0.0)
     connection_pool (2.2.0)
-    coveralls (0.8.2)
+    coveralls (0.8.9)
       json (~> 1.8)
       rest-client (>= 1.6.8, < 2)
       simplecov (~> 0.10.0)
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
-    crack (0.4.2)
+      tins (~> 1.6.0)
+    crack (0.4.3)
       safe_yaml (~> 1.0.0)
-    creole (0.3.8)
-    d3_rails (3.5.6)
+    creole (0.5.0)
+    d3_rails (3.5.11)
       railties (>= 3.1.0)
     daemons (1.2.3)
     database_cleaner (1.4.1)
     debug_inspector (0.0.2)
+    debugger-ruby_core_source (1.3.8)
     default_value_for (3.0.1)
       activerecord (>= 3.2.0, < 5.0)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (3.5.2)
+    devise (3.5.4)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -147,7 +169,7 @@ GEM
       warden (~> 1.2.3)
     devise-async (0.9.0)
       devise (~> 3.2)
-    devise-two-factor (2.0.0)
+    devise-two-factor (2.0.1)
       activesupport
       attr_encrypted (~> 1.3.2)
       devise (~> 3.5.0)
@@ -156,22 +178,20 @@ GEM
     diff-lcs (1.2.5)
     diffy (3.0.7)
     docile (1.1.5)
-    domain_name (0.5.24)
+    domain_name (0.5.25)
       unf (>= 0.0.5, < 1.0.0)
-    doorkeeper (2.1.4)
+    doorkeeper (2.2.2)
       railties (>= 3.2)
-    dropzonejs-rails (0.7.1)
+    dropzonejs-rails (0.7.2)
       rails (> 3.1)
     email_reply_parser (0.5.8)
     email_spec (1.6.0)
       launchy (~> 2.1)
       mail (~> 2.2)
     encryptor (1.3.0)
-    enumerize (0.7.0)
-      activesupport (>= 3.2)
     equalizer (0.0.11)
     erubis (2.7.0)
-    escape_utils (0.2.4)
+    escape_utils (1.1.0)
     eventmachine (1.0.8)
     excon (0.45.4)
     execjs (2.6.0)
@@ -181,59 +201,116 @@ GEM
     factory_girl_rails (4.3.0)
       factory_girl (~> 4.3.0)
       railties (>= 3.0.0)
-    faraday (0.8.10)
-      multipart-post (~> 1.2.0)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
     faraday_middleware (0.10.0)
       faraday (>= 0.7.4, < 0.10)
+    faraday_middleware-multi_json (0.0.6)
+      faraday_middleware
+      multi_json
     fastercsv (1.5.5)
     ffaker (2.0.0)
     ffi (1.9.10)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
-    flowdock (0.7.0)
+    flay (2.6.1)
+      ruby_parser (~> 3.0)
+      sexp_processor (~> 4.0)
+    flog (4.3.2)
+      ruby_parser (~> 3.1, > 3.1.0)
+      sexp_processor (~> 4.4)
+    flowdock (0.7.1)
       httparty (~> 0.7)
       multi_json
-    fog (1.25.0)
+    fog (1.36.0)
+      fog-aliyun (>= 0.1.0)
+      fog-atmos
+      fog-aws (>= 0.6.0)
       fog-brightbox (~> 0.4)
-      fog-core (~> 1.25)
+      fog-core (~> 1.32)
+      fog-dynect (~> 0.0.2)
+      fog-ecloud (~> 0.1)
+      fog-google (<= 0.1.0)
       fog-json
+      fog-local
+      fog-powerdns (>= 0.1.1)
       fog-profitbricks
       fog-radosgw (>= 0.0.2)
+      fog-riakcs
       fog-sakuracloud (>= 0.0.4)
+      fog-serverlove
       fog-softlayer
+      fog-storm_on_demand
       fog-terremark
       fog-vmfusion
       fog-voxel
+      fog-xenserver
       fog-xml (~> 0.1.1)
       ipaddress (~> 0.5)
       nokogiri (~> 1.5, >= 1.5.11)
-      opennebula
-    fog-brightbox (0.9.0)
+    fog-aliyun (0.1.0)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      ipaddress (~> 0.8)
+      xml-simple (~> 1.1)
+    fog-atmos (0.1.0)
+      fog-core
+      fog-xml
+    fog-aws (0.8.1)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-brightbox (0.10.1)
       fog-core (~> 1.22)
       fog-json
       inflecto (~> 0.0.2)
-    fog-core (1.32.1)
+    fog-core (1.35.0)
       builder
       excon (~> 0.45)
       formatador (~> 0.2)
-      mime-types
-      net-scp (~> 1.1)
-      net-ssh (>= 2.1.3)
+    fog-dynect (0.0.2)
+      fog-core
+      fog-json
+      fog-xml
+    fog-ecloud (0.3.0)
+      fog-core
+      fog-xml
+    fog-google (0.1.0)
+      fog-core
+      fog-json
+      fog-xml
     fog-json (1.0.2)
       fog-core (~> 1.0)
       multi_json (~> 1.10)
+    fog-local (0.2.1)
+      fog-core (~> 1.27)
+    fog-powerdns (0.1.1)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
     fog-profitbricks (0.0.5)
       fog-core
       fog-xml
       nokogiri
-    fog-radosgw (0.0.4)
+    fog-radosgw (0.0.5)
       fog-core (>= 1.21.0)
       fog-json
       fog-xml (>= 0.0.1)
-    fog-sakuracloud (1.0.1)
+    fog-riakcs (0.1.0)
       fog-core
       fog-json
-    fog-softlayer (0.4.7)
+      fog-xml
+    fog-sakuracloud (1.7.5)
+      fog-core
+      fog-json
+    fog-serverlove (0.1.2)
+      fog-core
+      fog-json
+    fog-softlayer (1.0.3)
+      fog-core
+      fog-json
+    fog-storm_on_demand (0.1.1)
       fog-core
       fog-json
     fog-terremark (0.1.0)
@@ -245,10 +322,13 @@ GEM
     fog-voxel (0.1.0)
       fog-core
       fog-xml
+    fog-xenserver (0.2.2)
+      fog-core
+      fog-xml
     fog-xml (0.1.2)
       fog-core
       nokogiri (~> 1.5, >= 1.5.11)
-    font-awesome-rails (4.4.0.0)
+    font-awesome-rails (4.5.0.0)
       railties (>= 3.2, < 5.0)
     foreman (0.78.0)
       thor (~> 0.19.1)
@@ -258,10 +338,15 @@ GEM
       ruby-progressbar (~> 1.4)
     gemnasium-gitlab-service (0.2.6)
       rugged (~> 0.21)
-    gemojione (2.0.1)
+    gemojione (2.2.1)
       json
     get_process_mem (0.2.0)
     gherkin-ruby (0.3.2)
+    github-linguist (4.7.5)
+      charlock_holmes (~> 0.7.3)
+      escape_utils (~> 1.1.0)
+      mime-types (>= 1.19)
+      rugged (>= 0.23.0b)
     github-markup (1.3.3)
     gitlab-flowdock-git-hook (1.0.1)
       flowdock (~> 0.7)
@@ -272,39 +357,39 @@ GEM
       diff-lcs (~> 1.1)
       mime-types (~> 1.15)
       posix-spawn (~> 0.3)
-    gitlab-linguist (3.0.1)
-      charlock_holmes (~> 0.6.6)
-      escape_utils (~> 0.2.4)
-      mime-types (~> 1.19)
-    gitlab_emoji (0.1.1)
-      gemojione (~> 2.0)
-    gitlab_git (7.2.15)
+    gitlab_emoji (0.3.1)
+      gemojione (~> 2.2, >= 2.2.1)
+    gitlab_git (8.2.0)
       activesupport (~> 4.0)
-      charlock_holmes (~> 0.6)
-      gitlab-linguist (~> 3.0)
-      rugged (~> 0.22.2)
+      charlock_holmes (~> 0.7.3)
+      github-linguist (~> 4.7.0)
+      rugged (~> 0.24.0b13)
     gitlab_meta (7.0)
     gitlab_omniauth-ldap (1.2.1)
       net-ldap (~> 0.9)
       omniauth (~> 1.0)
       pyu-ruby-sasl (~> 0.0.3.1)
       rubyntlm (~> 0.3)
+    globalid (0.3.6)
+      activesupport (>= 4.1.0)
     gollum-grit_adapter (1.0.0)
       gitlab-grit (~> 2.7, >= 2.7.1)
-    gollum-lib (4.0.3)
+    gollum-lib (4.1.0)
       github-markup (~> 1.3.3)
       gollum-grit_adapter (~> 1.0)
       nokogiri (~> 1.6.4)
-      rouge (~> 1.10.1)
+      rouge (~> 1.9)
       sanitize (~> 2.1.0)
       stringex (~> 2.5.1)
-    gon (5.0.4)
-      actionpack (>= 2.3.0)
+    gon (6.0.1)
+      actionpack (>= 3.0)
       json
-    grape (0.6.1)
+      multi_json
+      request_store (>= 1.0)
+    grape (0.13.0)
       activesupport
       builder
-      hashie (>= 1.2.0)
+      hashie (>= 2.1.0)
       multi_json (>= 1.3.2)
       multi_xml (>= 0.5.2)
       rack (>= 1.3.0)
@@ -314,106 +399,91 @@ GEM
     grape-entity (0.4.8)
       activesupport
       multi_json (>= 1.3.2)
-    growl (1.0.3)
-    guard (2.13.0)
-      formatador (>= 0.2.4)
-      listen (>= 2.7, <= 4.0)
-      lumberjack (~> 1.0)
-      nenv (~> 0.1)
-      notiffany (~> 0.0)
-      pry (>= 0.9.12)
-      shellany (~> 0.0)
-      thor (>= 0.18.1)
-    guard-rspec (4.2.10)
-      guard (~> 2.1)
-      rspec (>= 2.14, < 4.0)
     haml (4.0.7)
       tilt
-    haml-rails (0.5.3)
+    haml-rails (0.9.0)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
-      haml (>= 3.1, < 5.0)
+      haml (>= 4.0.6, < 5.0)
+      html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    hashie (2.1.2)
-    highline (1.6.21)
+    hashie (3.4.3)
+    highline (1.7.8)
     hike (1.2.3)
     hipchat (1.5.2)
       httparty
       mimemagic
-    hitimes (1.2.3)
     html-pipeline (1.11.0)
       activesupport (>= 2)
       nokogiri (~> 1.4)
+    html2haml (2.0.0)
+      erubis (~> 2.7.0)
+      haml (~> 4.0.0)
+      nokogiri (~> 1.6.0)
+      ruby_parser (~> 3.5)
     http-cookie (1.0.2)
       domain_name (~> 0.5)
     http_parser.rb (0.5.3)
-    httparty (0.13.5)
+    httparty (0.13.7)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
-    httpclient (2.6.0.1)
+    httpclient (2.7.0.1)
     i18n (0.7.0)
-    ice_cube (0.11.1)
     ice_nine (0.11.1)
     inflecto (0.0.2)
-    ipaddress (0.8.0)
-    jquery-atwho-rails (1.0.1)
-    jquery-rails (3.1.3)
-      railties (>= 3.0, < 5.0)
+    influxdb (0.2.3)
+      cause
+      json
+    ipaddress (0.8.2)
+    jquery-atwho-rails (1.3.2)
+    jquery-rails (4.0.5)
+      rails-dom-testing (~> 1.0)
+      railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
     jquery-scrollto-rails (1.4.3)
       railties (> 3.1, < 5.0)
-    jquery-turbolinks (2.0.2)
+    jquery-turbolinks (2.1.0)
       railties (>= 3.1.0)
       turbolinks
-    jquery-ui-rails (4.2.1)
+    jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
     json (1.8.3)
-    jwt (1.5.1)
-    kaminari (0.15.1)
+    jwt (1.5.2)
+    kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    kgio (2.9.3)
+    kgio (2.10.0)
     launchy (2.4.3)
       addressable (~> 2.3)
     letter_opener (1.1.2)
       launchy (~> 2.2)
-    listen (2.10.1)
-      celluloid (~> 0.16.0)
+    listen (3.0.5)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
-    lumberjack (1.0.9)
+    loofah (2.0.3)
+      nokogiri (>= 1.5.9)
     macaddr (1.7.1)
       systemu (~> 2.6.2)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mail_room (0.5.2)
+    mail_room (0.6.1)
     method_source (0.8.2)
     mime-types (1.25.1)
     mimemagic (0.3.0)
-    mini_portile (0.6.2)
+    mini_portile2 (2.0.0)
     minitest (5.7.0)
     mousetrap-rails (1.4.6)
     multi_json (1.11.2)
     multi_xml (0.5.5)
-    multipart-post (1.2.0)
+    multipart-post (2.0.0)
     mysql2 (0.3.20)
-    nenv (0.2.0)
     nested_form (0.3.2)
-    net-ldap (0.11)
-    net-scp (1.2.1)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.9.2)
-    netrc (0.10.3)
-    newrelic-grape (2.0.0)
-      grape
-      newrelic_rpm
-    newrelic_rpm (3.9.4.245)
-    nokogiri (1.6.6.2)
-      mini_portile (~> 0.6.0)
-    notiffany (0.0.7)
-      nenv (~> 0.1)
-      shellany (~> 0.0)
-    nprogress-rails (0.1.2.3)
+    net-ldap (0.12.1)
+    net-ssh (3.0.1)
+    netrc (0.11.0)
+    nokogiri (1.6.7.2)
+      mini_portile2 (~> 2.0.0.rc2)
+    nprogress-rails (0.1.6.7)
     oauth (0.4.7)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
@@ -421,25 +491,38 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    octokit (3.7.1)
+    octokit (3.8.0)
       sawyer (~> 0.6.0, >= 0.5.3)
-    omniauth (1.2.2)
+    omniauth (1.3.1)
       hashie (>= 1.2, < 4)
-      rack (~> 1.0)
+      rack (>= 1.0, < 3)
+    omniauth-azure-oauth2 (0.0.6)
+      jwt (~> 1.0)
+      omniauth (~> 1.0)
+      omniauth-oauth2 (~> 1.1)
     omniauth-bitbucket (0.0.2)
       multi_json (~> 1.7)
       omniauth (~> 1.1)
       omniauth-oauth (~> 1.0)
+    omniauth-cas3 (1.1.3)
+      addressable (~> 2.3)
+      nokogiri (~> 1.6.6)
+      omniauth (~> 1.2)
+    omniauth-facebook (3.0.0)
+      omniauth-oauth2 (~> 1.2)
     omniauth-github (1.1.2)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.1)
-    omniauth-gitlab (1.0.0)
+    omniauth-gitlab (1.0.1)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.0)
-    omniauth-google-oauth2 (0.2.6)
-      omniauth (> 1.0)
-      omniauth-oauth2 (~> 1.1)
-    omniauth-kerberos (0.2.0)
+    omniauth-google-oauth2 (0.2.10)
+      addressable (~> 2.3)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      omniauth (>= 1.1.1)
+      omniauth-oauth2 (~> 1.3.1)
+    omniauth-kerberos (0.3.0)
       omniauth-multipassword
       timfel-krb5-auth (~> 0.8)
     omniauth-multipassword (0.4.2)
@@ -450,38 +533,34 @@ GEM
     omniauth-oauth2 (1.3.1)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
-    omniauth-saml (1.4.1)
+    omniauth-saml (1.4.2)
       omniauth (~> 1.1)
-      ruby-saml (~> 1.0.0)
-    omniauth-shibboleth (1.1.2)
+      ruby-saml (~> 1.1, >= 1.1.1)
+    omniauth-shibboleth (1.2.1)
       omniauth (>= 1.0.0)
-    omniauth-twitter (1.0.1)
-      multi_json (~> 1.3)
-      omniauth-oauth (~> 1.0)
+    omniauth-twitter (1.2.1)
+      json (~> 1.3)
+      omniauth-oauth (~> 1.1)
     omniauth_crowd (2.2.3)
       activesupport
       nokogiri (>= 1.4.4)
       omniauth (~> 1.0)
-    opennebula (4.12.1)
-      json
-      nokogiri
-      rbvmomi
     org-ruby (0.9.12)
       rubypants (~> 0.2)
     orm_adapter (0.5.0)
-    paranoia (2.1.3)
+    paranoia (2.1.4)
       activerecord (~> 4.0)
-    parser (2.2.2.6)
+    parser (2.2.3.0)
       ast (>= 1.1, < 3.0)
-    pg (0.18.2)
-    poltergeist (1.6.0)
+    pg (0.18.4)
+    poltergeist (1.8.1)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
     posix-spawn (0.3.11)
-    powerpack (0.0.9)
-    pry (0.10.1)
+    powerpack (0.1.1)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -490,17 +569,15 @@ GEM
     pyu-ruby-sasl (0.0.3.3)
     quiet_assets (1.0.3)
       railties (>= 3.1, < 5.0)
-    rack (1.5.5)
+    rack (1.6.4)
     rack-accept (0.4.5)
       rack (>= 0.4)
-    rack-attack (4.3.0)
+    rack-attack (4.3.1)
       rack
-    rack-cors (0.2.9)
-    rack-mini-profiler (0.9.7)
-      rack (>= 1.1.3)
+    rack-cors (0.4.0)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
-    rack-oauth2 (1.0.10)
+    rack-oauth2 (1.2.1)
       activesupport (>= 2.3)
       attr_required (>= 0.0.5)
       httpclient (>= 2.4)
@@ -510,44 +587,51 @@ GEM
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.1.12)
-      actionmailer (= 4.1.12)
-      actionpack (= 4.1.12)
-      actionview (= 4.1.12)
-      activemodel (= 4.1.12)
-      activerecord (= 4.1.12)
-      activesupport (= 4.1.12)
+    rails (4.2.5.1)
+      actionmailer (= 4.2.5.1)
+      actionpack (= 4.2.5.1)
+      actionview (= 4.2.5.1)
+      activejob (= 4.2.5.1)
+      activemodel (= 4.2.5.1)
+      activerecord (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.1.12)
-      sprockets-rails (~> 2.0)
-    rails-observers (0.1.2)
-      activemodel (~> 4.0)
-    railties (4.1.12)
-      actionpack (= 4.1.12)
-      activesupport (= 4.1.12)
+      railties (= 4.2.5.1)
+      sprockets-rails
+    rails-deprecated_sanitizer (1.0.3)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.7)
+      activesupport (>= 4.2.0.beta, < 5.0)
+      nokogiri (~> 1.6.0)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.0.3)
+      loofah (~> 2.0)
+    railties (4.2.5.1)
+      actionpack (= 4.2.5.1)
+      activesupport (= 4.2.5.1)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rainbow (2.0.0)
     raindrops (0.15.0)
-    rake (10.4.2)
+    rake (10.5.0)
     raphael-rails (2.1.2)
-    rb-fsevent (0.9.5)
+    rb-fsevent (0.9.6)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rbvmomi (1.8.2)
-      builder
-      nokogiri (>= 1.4.1)
-      trollop
+    rblineprof (0.3.6)
+      debugger-ruby_core_source (~> 1.3)
     rdoc (3.12.2)
       json (~> 1.4)
-    redcarpet (3.3.2)
-    redis (3.2.1)
-    redis-actionpack (4.0.0)
+    recaptcha (1.0.2)
+      json
+    redcarpet (3.3.3)
+    redis (3.2.2)
+    redis-actionpack (4.0.1)
       actionpack (~> 4)
       redis-rack (~> 1.5.0)
       redis-store (~> 1.1.0)
-    redis-activesupport (4.1.1)
-      activesupport (~> 4)
+    redis-activesupport (4.1.5)
+      activesupport (>= 3, < 5)
       redis-store (~> 1.1.0)
     redis-namespace (1.5.2)
       redis (~> 3.0, >= 3.0.4)
@@ -558,13 +642,13 @@ GEM
       redis-actionpack (~> 4)
       redis-activesupport (~> 4)
       redis-store (~> 1.1.0)
-    redis-store (1.1.6)
+    redis-store (1.1.7)
       redis (>= 2.2)
-    request_store (1.2.0)
-    rerun (0.10.0)
-      listen (~> 2.7, >= 2.7.3)
-    responders (1.1.2)
-      railties (>= 3.2, < 4.2)
+    request_store (1.2.1)
+    rerun (0.11.0)
+      listen (~> 3.0)
+    responders (2.1.1)
+      railties (>= 4.2.0, < 5.1)
     rest-client (1.8.0)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 3.0)
@@ -597,35 +681,38 @@ GEM
       rspec-mocks (~> 3.3.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
-    rubocop (0.28.0)
+    rubocop (0.35.1)
       astrolabe (~> 1.3)
-      parser (>= 2.2.0.pre.7, < 3.0)
-      powerpack (~> 0.0.6)
+      parser (>= 2.2.3.0, < 3.0)
+      powerpack (~> 0.1)
       rainbow (>= 1.99.1, < 3.0)
-      ruby-progressbar (~> 1.4)
+      ruby-progressbar (~> 1.7)
+      tins (<= 1.6.0)
     ruby-fogbugz (0.2.1)
       crack (~> 0.4)
     ruby-progressbar (1.7.5)
-    ruby-saml (1.0.0)
+    ruby-saml (1.1.1)
       nokogiri (>= 1.5.10)
       uuid (~> 2.3)
-    ruby2ruby (2.1.4)
+    ruby2ruby (2.2.0)
       ruby_parser (~> 3.1)
       sexp_processor (~> 4.0)
-    ruby_parser (3.5.0)
+    ruby_parser (3.7.2)
       sexp_processor (~> 4.1)
     rubyntlm (0.5.2)
     rubypants (0.2.0)
-    rugged (0.22.2)
+    rufus-scheduler (3.1.10)
+    rugged (0.24.0b13)
     safe_yaml (1.0.4)
     sanitize (2.1.0)
       nokogiri (>= 1.4.4)
-    sass (3.2.19)
-    sass-rails (4.0.5)
+    sass (3.4.20)
+    sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.2)
-      sprockets (~> 2.8, < 3.0)
-      sprockets-rails (~> 2.0)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
     sawyer (0.6.0)
       addressable (~> 2.3.5)
       faraday (~> 0.8, < 0.10)
@@ -637,23 +724,23 @@ GEM
       activesupport (>= 3.1, < 4.3)
     select2-rails (3.5.9.3)
       thor (~> 0.14)
+    sentry-raven (0.15.4)
+      faraday (>= 0.7.6)
     settingslogic (2.0.9)
     sexp_processor (4.6.0)
     sham_rack (1.3.6)
       rack
-    shellany (0.0.1)
     shoulda-matchers (2.8.0)
       activesupport (>= 3.0.0)
-    sidekiq (3.3.0)
-      celluloid (>= 0.16.0)
-      connection_pool (>= 2.0.0)
-      json
-      redis (>= 3.0.6)
-      redis-namespace (>= 1.3.1)
-    sidetiq (0.6.3)
-      celluloid (>= 0.14.1)
-      ice_cube (= 0.11.1)
-      sidekiq (>= 3.0.0)
+    sidekiq (4.0.1)
+      concurrent-ruby (~> 1.0)
+      connection_pool (~> 2.2, >= 2.2.0)
+      json (~> 1.0)
+      redis (~> 3.2, >= 3.2.1)
+    sidekiq-cron (0.4.0)
+      redis-namespace (>= 1.5.2)
+      rufus-scheduler (>= 2.0.24)
+      sidekiq (>= 4.0.0)
     simple_oauth (0.1.9)
     simplecov (0.10.0)
       docile (~> 1.1.0)
@@ -665,9 +752,9 @@ GEM
       rack-protection (~> 1.4)
       tilt (>= 1.3, < 3)
     six (0.2.0)
-    slack-notifier (1.0.0)
-    slim (2.0.3)
-      temple (~> 0.6.6)
+    slack-notifier (1.2.1)
+    slim (3.0.6)
+      temple (~> 0.7.3)
       tilt (>= 1.3.3, < 2.1)
     slop (3.6.0)
     spinach (0.8.10)
@@ -690,12 +777,17 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.3.2)
+    sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    stamp (0.5.0)
-    state_machine (1.2.0)
+    state_machines (0.4.0)
+    state_machines-activemodel (0.3.0)
+      activemodel (~> 4.1)
+      state_machines (>= 0.4.0)
+    state_machines-activerecord (0.3.0)
+      activerecord (~> 4.1)
+      state_machines-activemodel (>= 0.3.0)
     stringex (2.5.2)
     systemu (2.6.5)
     task_list (1.0.2)
@@ -704,33 +796,30 @@ GEM
       railties (>= 3.2.5, < 5)
     teaspoon-jasmine (2.2.0)
       teaspoon (>= 1.0.0)
-    temple (0.6.10)
+    temple (0.7.6)
     term-ansicolor (1.3.2)
       tins (~> 1.0)
     terminal-table (1.5.2)
-    test_after_commit (0.2.7)
+    test_after_commit (0.4.2)
       activerecord (>= 3.2)
-    thin (1.6.3)
+    thin (1.6.4)
       daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0)
+      eventmachine (~> 1.0, >= 1.0.4)
       rack (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
-    timers (4.0.4)
-      hitimes
     timfel-krb5-auth (0.8.3)
-    tinder (1.9.4)
+    tinder (1.10.1)
       eventmachine (~> 1.0)
-      faraday (~> 0.8.9)
+      faraday (~> 0.9.0)
       faraday_middleware (~> 0.9)
-      hashie (>= 1.0, < 3)
+      hashie (>= 1.0)
       json (~> 1.8.0)
-      mime-types (~> 1.19)
+      mime-types
       multi_json (~> 1.7)
       twitter-stream (~> 0.1)
     tins (1.6.0)
-    trollop (2.1.2)
     turbolinks (2.5.3)
       coffee-rails
     twitter-stream (0.1.16)
@@ -739,10 +828,10 @@ GEM
       simple_oauth (~> 0.1.4)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    uglifier (2.3.3)
+    uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    underscore-rails (1.4.4)
+    underscore-rails (1.8.3)
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.1)
@@ -750,9 +839,10 @@ GEM
       kgio (~> 2.6)
       rack
       raindrops (~> 0.7)
-    unicorn-worker-killer (0.4.3)
+    unicorn-worker-killer (0.4.4)
       get_process_mem (~> 0)
-      unicorn (~> 4)
+      unicorn (>= 4, < 6)
+    uniform_notifier (1.9.0)
     uuid (2.3.8)
       macaddr (~> 1.0)
     version_sorter (2.0.0)
@@ -761,21 +851,24 @@ GEM
       coercible (~> 1.0)
       descendants_tracker (~> 0.0, >= 0.0.3)
       equalizer (~> 0.0, >= 0.0.9)
-    warden (1.2.3)
+    warden (1.2.4)
       rack (>= 1.0)
+    web-console (2.2.1)
+      activemodel (>= 4.0)
+      binding_of_caller (>= 0.7.2)
+      railties (>= 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
     webmock (1.21.0)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-    websocket-driver (0.6.2)
+    websocket-driver (0.6.3)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
-    whenever (0.8.4)
-      activesupport (>= 2.3.4)
-      chronic (>= 0.6.3)
     wikicloth (0.8.1)
       builder
       expression_parser
       rinku
+    xml-simple (1.1.5)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -786,154 +879,171 @@ DEPENDENCIES
   RedCloth (~> 4.2.9)
   ace-rails-ap (~> 2.0.1)
   activerecord-deprecated_finders (~> 1.0.3)
+  activerecord-nulldb-adapter
   activerecord-session_store (~> 0.1.0)
   acts-as-taggable-on (~> 3.4)
   addressable (~> 2.3.8)
   after_commit_queue
+  akismet (~> 2.0)
+  allocations (~> 1.0)
   annotate (~> 2.6.0)
-  asana (~> 0.0.6)
+  asana (~> 0.4.0)
   asciidoctor (~> 1.5.2)
   attr_encrypted (~> 1.3.4)
   awesome_print (~> 1.2.0)
+  babosa (~> 1.0.2)
+  benchmark-ips
   better_errors (~> 1.0.1)
   binding_of_caller (~> 0.7.2)
-  bootstrap-sass (~> 3.0)
-  brakeman (= 3.0.1)
+  bootstrap-sass (~> 3.3.0)
+  brakeman (~> 3.1.0)
   browser (~> 1.0.0)
+  bullet
+  bundler-audit
   byebug
-  cal-heatmap-rails (~> 0.0.1)
+  cal-heatmap-rails (~> 3.5.0)
   capybara (~> 2.4.0)
   capybara-screenshot (~> 1.0.0)
   carrierwave (~> 0.9.0)
-  charlock_holmes (~> 0.6.9.4)
+  charlock_holmes (~> 0.7.3)
   coffee-rails (~> 4.1.0)
-  colored (~> 1.2)
-  colorize (~> 0.5.8)
+  colorize (~> 0.7.0)
+  connection_pool (~> 2.0)
   coveralls (~> 0.8.2)
-  creole (~> 0.3.6)
-  d3_rails (~> 3.5.5)
+  creole (~> 0.5.0)
+  d3_rails (~> 3.5.0)
   database_cleaner (~> 1.4.0)
   default_value_for (~> 3.0.0)
-  devise (~> 3.5.2)
+  devise (~> 3.5.4)
   devise-async (~> 0.9.0)
   devise-two-factor (~> 2.0.0)
   diffy (~> 3.0.3)
-  doorkeeper (~> 2.1.3)
+  doorkeeper (~> 2.2.0)
   dropzonejs-rails (~> 0.7.1)
   email_reply_parser (~> 0.5.8)
   email_spec (~> 1.6.0)
-  enumerize (~> 0.7.0)
   factory_girl_rails (~> 4.3.0)
   ffaker (~> 2.0.0)
-  fog (~> 1.25.0)
+  flay
+  flog
+  fog (~> 1.36.0)
   font-awesome-rails (~> 4.2)
   foreman
   fuubar (~> 2.0.0)
   gemnasium-gitlab-service (~> 0.2)
+  github-linguist (~> 4.7.0)
   github-markup (~> 1.3.1)
   gitlab-flowdock-git-hook (~> 1.0.1)
-  gitlab-linguist (~> 3.0.1)
-  gitlab_emoji (~> 0.1)
-  gitlab_git (~> 7.2.15)
+  gitlab_emoji (~> 0.3.0)
+  gitlab_git (~> 8.2)
   gitlab_meta (= 7.0)
   gitlab_omniauth-ldap (~> 1.2.1)
-  gollum-lib (~> 4.0.2)
-  gon (~> 5.0.0)
-  grape (~> 0.6.1)
+  gollum-lib (~> 4.1.0)
+  gon (~> 6.0.1)
+  grape (~> 0.13.0)
   grape-entity (~> 0.4.2)
-  growl
-  guard-rspec (~> 4.2.0)
-  haml-rails (~> 0.5.3)
+  haml-rails (~> 0.9.0)
   hipchat (~> 1.5.0)
   html-pipeline (~> 1.11.0)
   httparty (~> 0.13.3)
-  jquery-atwho-rails (~> 1.0.0)
-  jquery-rails (~> 3.1.3)
+  influxdb (~> 0.2)
+  jquery-atwho-rails (~> 1.3.2)
+  jquery-rails (~> 4.0.0)
   jquery-scrollto-rails (~> 1.4.3)
-  jquery-turbolinks (~> 2.0.1)
-  jquery-ui-rails (~> 4.2.1)
-  kaminari (~> 0.15.1)
+  jquery-turbolinks (~> 2.1.0)
+  jquery-ui-rails (~> 5.0.0)
+  kaminari (~> 0.16.3)
   letter_opener (~> 1.1.2)
-  mail_room (~> 0.5.2)
+  loofah (~> 2.0.3)
+  mail_room (~> 0.6.1)
+  method_source (~> 0.8)
   minitest (~> 5.7.0)
   mousetrap-rails (~> 1.4.6)
   mysql2 (~> 0.3.16)
   nested_form (~> 0.3.2)
-  newrelic-grape
-  newrelic_rpm (~> 3.9.4.245)
-  nprogress-rails (~> 0.1.2.3)
+  net-ssh (~> 3.0.1)
+  nokogiri (~> 1.6.7, >= 1.6.7.2)
+  nprogress-rails (~> 0.1.6.7)
   oauth2 (~> 1.0.0)
-  octokit (~> 3.7.0)
-  omniauth (~> 1.2.2)
+  octokit (~> 3.8.0)
+  omniauth (~> 1.3.1)
+  omniauth-azure-oauth2 (~> 0.0.6)
   omniauth-bitbucket (~> 0.0.2)
+  omniauth-cas3 (~> 1.1.2)
+  omniauth-facebook (~> 3.0.0)
   omniauth-github (~> 1.1.1)
   omniauth-gitlab (~> 1.0.0)
-  omniauth-google-oauth2 (~> 0.2.5)
-  omniauth-kerberos (~> 0.2.0)
-  omniauth-saml (~> 1.4.0)
-  omniauth-shibboleth (~> 1.1.1)
-  omniauth-twitter (~> 1.0.1)
-  omniauth_crowd
+  omniauth-google-oauth2 (~> 0.2.0)
+  omniauth-kerberos (~> 0.3.0)
+  omniauth-saml (~> 1.4.2)
+  omniauth-shibboleth (~> 1.2.0)
+  omniauth-twitter (~> 1.2.0)
+  omniauth_crowd (~> 2.2.0)
   org-ruby (~> 0.9.12)
   paranoia (~> 2.0)
   pg (~> 0.18.2)
-  poltergeist (~> 1.6.0)
+  poltergeist (~> 1.8.1)
   pry-rails
   quiet_assets (~> 1.0.2)
-  rack-attack (~> 4.3.0)
-  rack-cors (~> 0.2.9)
-  rack-mini-profiler (~> 0.9.0)
-  rack-oauth2 (~> 1.0.5)
-  rails (= 4.1.12)
+  rack-attack (~> 4.3.1)
+  rack-cors (~> 0.4.0)
+  rack-oauth2 (~> 1.2.1)
+  rails (= 4.2.5.1)
+  rails-deprecated_sanitizer (~> 1.0.3)
   raphael-rails (~> 2.1.2)
-  rb-fsevent
-  rb-inotify
+  rblineprof
   rdoc (~> 3.6)
-  redcarpet (~> 3.3.2)
+  recaptcha
+  redcarpet (~> 3.3.3)
+  redis-namespace
   redis-rails (~> 4.0.0)
   request_store (~> 1.2.0)
-  rerun (~> 0.10.0)
+  rerun (~> 0.11.0)
+  responders (~> 2.0)
+  rouge (~> 1.10.1)
   rqrcode-rails3 (~> 0.1.7)
   rspec-rails (~> 3.3.0)
-  rubocop (~> 0.28.0)
+  rubocop (~> 0.35.0)
   ruby-fogbugz (~> 0.2.1)
   sanitize (~> 2.0)
-  sass-rails (~> 4.0.5)
+  sass-rails (~> 5.0.0)
   sdoc (~> 0.3.20)
   seed-fu (~> 2.3.5)
   select2-rails (~> 3.5.9)
+  sentry-raven
   settingslogic (~> 2.0.9)
   sham_rack
   shoulda-matchers (~> 2.8.0)
-  sidekiq (= 3.3.0)
-  sidetiq (~> 0.6.3)
+  sidekiq (~> 4.0)
+  sidekiq-cron (~> 0.4.0)
   simplecov (~> 0.10.0)
   sinatra (~> 1.4.4)
   six (~> 0.2.0)
-  slack-notifier (~> 1.0.0)
-  slim (~> 2.0.2)
+  slack-notifier (~> 1.2.0)
   spinach-rails (~> 0.2.1)
   spring (~> 1.3.6)
   spring-commands-rspec (~> 1.0.4)
   spring-commands-spinach (~> 1.0.0)
   spring-commands-teaspoon (~> 0.0.2)
   sprockets (~> 2.12.3)
-  stamp (~> 0.5.0)
-  state_machine (~> 1.2.0)
+  state_machines-activerecord (~> 0.3.0)
   task_list (~> 1.0.2)
   teaspoon (~> 1.0.0)
   teaspoon-jasmine (~> 2.2.0)
-  test_after_commit (~> 0.2.2)
+  test_after_commit (~> 0.4.2)
   thin (~> 1.6.1)
-  tinder (~> 1.9.2)
+  tinder (~> 1.10.0)
   turbolinks (~> 2.5.0)
-  uglifier (~> 2.3.2)
-  underscore-rails (~> 1.4.4)
+  uglifier (~> 2.7.2)
+  underscore-rails (~> 1.8.0)
   unf (~> 0.1.4)
   unicorn (~> 4.8.2)
   unicorn-worker-killer (~> 0.4.2)
   version_sorter (~> 2.0.0)
   virtus (~> 1.0.1)
+  web-console (~> 2.0)
   webmock (~> 1.21.0)
-  whenever (~> 0.8.4)
   wikicloth (= 0.8.1)
+
+BUNDLED WITH
+   1.11.2
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 8af64ce78e92..4e86768e0dd2 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -1,7 +1,10 @@
-{ stdenv, lib, bundler, fetchgit, bundlerEnv, defaultGemConfig, libiconv, ruby
+{ stdenv, lib, bundler, fetchFromGitHub, bundlerEnv, defaultGemConfig, libiconv, ruby
 , tzdata, git, nodejs, procps
 }:
 
+/* When updating the Gemfile add `gem "activerecord-nulldb-adapter"`
+   to allow building the assets without a database */
+
 let
   env = bundlerEnv {
     name = "gitlab";
@@ -21,19 +24,23 @@ in
 
 stdenv.mkDerivation rec {
   name = "gitlab-${version}";
-  version = "8.0.5";
+  version = "8.5.0";
+
   buildInputs = [ ruby bundler tzdata git nodejs procps ];
-  src = fetchgit {
-    url = "https://github.com/gitlabhq/gitlabhq.git";
-    rev = "2866c501b5a5abb69d101cc07261a1d684b4bd4c";
-    fetchSubmodules = false;
-    sha256 = "edc6bedd5e79940189355d8cb343d20b0781b69fcef56ccae5906fa5e81ed521";
+
+  src = fetchFromGitHub {
+    owner = "gitlabhq";
+    repo = "gitlabhq";
+    rev = "v${version}";
+    sha256 = "1rhl906xnvpxkw3ngwfzi80cl3daihx5vizy04b9b39adyd3i5hl";
   };
 
   patches = [
     ./remove-hardcoded-locations.patch
     ./disable-dump-schema-after-migration.patch
+    ./nulladapter.patch
   ];
+
   postPatch = ''
     # For reasons I don't understand "bundle exec" ignores the
     # RAILS_ENV causing tests to be executed that fail because we're
@@ -41,7 +48,6 @@ stdenv.mkDerivation rec {
     # tests works though.:
     rm lib/tasks/test.rake
 
-    mv config/gitlab.yml.example config/gitlab.yml
     rm config/initializers/gitlab_shell_secret_token.rb
 
     substituteInPlace app/controllers/admin/background_jobs_controller.rb \
@@ -50,7 +56,7 @@ stdenv.mkDerivation rec {
     # required for some gems:
     cat > config/database.yml <<EOF
       production:
-        adapter: postgresql
+        adapter: <%= ENV["GITLAB_DATABASE_ADAPTER"] || sqlite %>
         database: gitlab
         host: <%= ENV["GITLAB_DATABASE_HOST"] || "127.0.0.1" %>
         password: <%= ENV["GITLAB_DATABASE_PASSWORD"] || "blerg" %>
@@ -58,14 +64,22 @@ stdenv.mkDerivation rec {
         encoding: utf8
     EOF
   '';
+
   buildPhase = ''
     export GEM_HOME=${env}/${ruby.gemPath}
-    bundle exec rake assets:precompile RAILS_ENV=production
+    mv config/gitlab.yml.example config/gitlab.yml
+    GITLAB_DATABASE_ADAPTER=nulldb bundle exec rake assets:precompile RAILS_ENV=production
+    mv config/gitlab.yml config/gitlab.yml.example
+    mv config config.dist
   '';
+
   installPhase = ''
     mkdir -p $out/share
     cp -r . $out/share/gitlab
+    ln -sf /run/gitlab/uploads $out/share/gitlab/public/uploads
+    ln -sf /run/gitlab/config $out/share/gitlab/config
   '';
+
   passthru = {
     inherit env;
     inherit ruby;
diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix
index c5e10dd166ad..95905fb7dfc2 100644
--- a/pkgs/applications/version-management/gitlab/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@@ -1,3150 +1,3009 @@
 {
-  "CFPropertyList" = {
-    version = "2.3.1";
+  xpath = {
+    dependencies = ["nokogiri"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04kcr127l34p7221z13blyl0dvh0bmxwx326j72idayri36a394w";
       type = "gem";
-      sha256 = "1wnk3gxnhfafbhgp0ic7qhzlx3lhv04v8nws2s31ii5s8135hs6k";
     };
+    version = "2.0.0";
   };
-  "RedCloth" = {
-    version = "4.2.9";
+  xml-simple = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xlqplda3fix5pcykzsyzwgnbamb3qrqkgbrhhfz2a2fxhrkvhw8";
       type = "gem";
-      sha256 = "06pahxyrckhgb7alsxwhhlx1ib2xsx33793finj01jk8i054bkxl";
     };
+    version = "1.1.5";
   };
-  "ace-rails-ap" = {
-    version = "2.0.1";
+  wikicloth = {
+    dependencies = ["builder" "expression_parser" "rinku"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jp6c2yzyqbap8jdiw8yz6l08sradky1llhyhmrg934l1b5akj3s";
       type = "gem";
-      sha256 = "082n12rkd9j7d89030nhmi4fx1gqaf13knps6cknsyvwix7fryvv";
     };
+    version = "0.8.1";
   };
-  "actionmailer" = {
-    version = "4.1.12";
+  websocket-extensions = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07qnsafl6203a2zclxl20hy4jq11c471cgvd0bj5r9fx1qqw06br";
       type = "gem";
-      sha256 = "0p1hydjf5vb4na4fs29v7cdknfq3d6qvmld2vbafbh78kkclxi2m";
     };
-    dependencies = [
-      "actionpack"
-      "actionview"
-      "mail"
-    ];
+    version = "0.1.2";
   };
-  "actionpack" = {
-    version = "4.1.12";
+  websocket-driver = {
+    dependencies = ["websocket-extensions"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1v39w1ig6ps8g55xhz6x1w53apl17ii6kpy0jg9249akgpdvb0k9";
       type = "gem";
-      sha256 = "19bryymqlapsvn9df6q2ba4hvw9dwpp4fjc7i6lwffkadc4snkjy";
     };
-    dependencies = [
-      "actionview"
-      "activesupport"
-      "rack"
-      "rack-test"
-    ];
+    version = "0.6.3";
   };
-  "actionview" = {
-    version = "4.1.12";
+  webmock = {
+    dependencies = ["addressable" "crack"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1p7hqdxk5359xwp59pcx841fhbnqx01ra98rnwhdyz61nrc6piv3";
       type = "gem";
-      sha256 = "1bv8qifaqa514z64zgfw3r4i120h2swwgpfk79xlrac21q6ps70n";
     };
-    dependencies = [
-      "activesupport"
-      "builder"
-      "erubis"
-    ];
+    version = "1.21.0";
   };
-  "activemodel" = {
-    version = "4.1.12";
+  web-console = {
+    dependencies = ["activemodel" "binding_of_caller" "railties" "sprockets-rails"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13rwps8m76j45iqhggm810j78i8bg4nqzgi8k7amxplik2zm5blf";
       type = "gem";
-      sha256 = "16429dg04s64g834svi7ghq486adr32gxr5p9kac2z6mjp8ggjr3";
     };
-    dependencies = [
-      "activesupport"
-      "builder"
-    ];
+    version = "2.2.1";
   };
-  "activerecord" = {
-    version = "4.1.12";
+  warden = {
+    dependencies = ["rack"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1iyxw1ms3930dh7vcrfyi4ifpdbkfsr8k7fzjryva0r7k3c71gb7";
       type = "gem";
-      sha256 = "1w3dbmbdk4whm5p1l6d2ky3xpl59lfcr9p3hwd41dz77ynpi5dr5";
     };
-    dependencies = [
-      "activemodel"
-      "activesupport"
-      "arel"
-    ];
+    version = "1.2.4";
   };
-  "activerecord-deprecated_finders" = {
-    version = "1.0.4";
+  virtus = {
+    dependencies = ["axiom-types" "coercible" "descendants_tracker" "equalizer"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06iphwi3c4f7y9i2rvhvaizfswqbaflilziz4dxqngrdysgkn1fk";
       type = "gem";
-      sha256 = "03xplckz7v3nm6inqkwdd44h6gpbpql0v02jc1rz46a38rd6cj6m";
     };
+    version = "1.0.5";
   };
-  "activerecord-session_store" = {
-    version = "0.1.1";
+  version_sorter = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lad9c43w2xfzmva57ia6glpmhyivyk1m79jli42canshvan5v6y";
       type = "gem";
-      sha256 = "15dgx7jjp8iqqzjq2q3a6fsmnhvjwspbsz1s1gd6zp744k6xbrjh";
     };
-    dependencies = [
-      "actionpack"
-      "activerecord"
-      "railties"
-    ];
+    version = "2.0.0";
   };
-  "activeresource" = {
-    version = "4.0.0";
+  uuid = {
+    dependencies = ["macaddr"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gr2mxg27l380wpiy66mgv9wq02myj6m4gmp6c4g1vsbzkh0213v";
       type = "gem";
-      sha256 = "0fc5igjijyjzsl9q5kybkdzhc92zv8wsv0ifb0y90i632jx6d4jq";
     };
-    dependencies = [
-      "activemodel"
-      "activesupport"
-      "rails-observers"
-    ];
-  };
-  "activesupport" = {
-    version = "4.1.12";
-    source = {
-      type = "gem";
-      sha256 = "166jvrmdwayacnrd4z3rs2d6y0av3xnc18k6120ah13c2ipw69hn";
-    };
-    dependencies = [
-      "i18n"
-      "json"
-      "minitest"
-      "thread_safe"
-      "tzinfo"
-    ];
-  };
-  "acts-as-taggable-on" = {
-    version = "3.5.0";
-    source = {
-      type = "gem";
-      sha256 = "0bz0z8dlp3fjzah9y9b6rr9mkidsav9l4hdm51fnq1gd05yv3pr7";
-    };
-    dependencies = [
-      "activerecord"
-    ];
-  };
-  "addressable" = {
     version = "2.3.8";
-    source = {
-      type = "gem";
-      sha256 = "1533axm85gpz267km9gnfarf9c78g2scrysd6b8yw33vmhkz2km6";
-    };
   };
-  "after_commit_queue" = {
-    version = "1.1.0";
+  uniform_notifier = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "009z60qx01am7klmrca8pcladrynljra3a9smifn9f81r4dc7q63";
       type = "gem";
-      sha256 = "0m7qwbzvxb2xqramf38pzg8ld91s4cy2v0fs26dnmnqr1jf11z4y";
     };
-    dependencies = [
-      "rails"
-    ];
+    version = "1.9.0";
   };
-  "annotate" = {
-    version = "2.6.10";
+  unicorn-worker-killer = {
+    dependencies = ["get_process_mem" "unicorn"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rrdxpwdsapx47axjin8ymxb4f685qlpx8a26bql4ay1559c3gva";
       type = "gem";
-      sha256 = "1wdw9phsv2dndgid3pd8h0hl4zycwy11jc9iz6prwza0xax0i7hg";
     };
-    dependencies = [
-      "activerecord"
-      "rake"
-    ];
+    version = "0.4.4";
   };
-  "arel" = {
-    version = "5.0.1.20140414130214";
+  unicorn = {
+    dependencies = ["kgio" "rack" "raindrops"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kpg2vikx2hxdyrl45bqcr89a0w59hfw7yn7xh87bmlczi34xds4";
       type = "gem";
-      sha256 = "0dhnc20h1v8ml3nmkxq92rr7qxxpk6ixhwvwhgl2dbw9mmxz0hf9";
     };
+    version = "4.8.3";
   };
-  "asana" = {
-    version = "0.0.6";
+  unf_ext = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ly2ms6c3irmbr1575ldyh52bz2v0lzzr2gagf0p526k12ld2n5b";
       type = "gem";
-      sha256 = "1x325pywh3d91qrg916gh8i5g13h4qzgi03zc93x6v4m4rj79dcp";
     };
-    dependencies = [
-      "activeresource"
-    ];
+    version = "0.0.7.1";
   };
-  "asciidoctor" = {
+  unf = {
+    dependencies = ["unf_ext"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
+      type = "gem";
+    };
+    version = "0.1.4";
+  };
+  underscore-rails = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0iyspb7s49wpi9cc314gvlkyn45iyfivzxhdw0kql1zrgllhlzfk";
+      type = "gem";
+    };
+    version = "1.8.3";
+  };
+  uglifier = {
+    dependencies = ["execjs" "json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mzs64z3m1b98rh6ssxpqfz9sc87f6ml6906b0m57vydzfgrh1cz";
+      type = "gem";
+    };
+    version = "2.7.2";
+  };
+  tzinfo = {
+    dependencies = ["thread_safe"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx";
+      type = "gem";
+    };
+    version = "1.2.2";
+  };
+  twitter-stream = {
+    dependencies = ["eventmachine" "http_parser.rb" "simple_oauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0is81g3xvnjk64sqiaqlh2ziwfryzwvk1yvaniryg0zhppgsyriq";
+      type = "gem";
+    };
+    version = "0.1.16";
+  };
+  turbolinks = {
+    dependencies = ["coffee-rails"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ddrx25vvvqxlz4h59lrmjhc2bfwxf4bpicvyhgbpjd48ckj81jn";
+      type = "gem";
+    };
+    version = "2.5.3";
+  };
+  tins = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02qarvy17nbwvslfgqam8y6y7479cwmb1a6di9z18hzka4cf90hz";
+      type = "gem";
+    };
+    version = "1.6.0";
+  };
+  tinder = {
+    dependencies = ["eventmachine" "faraday" "faraday_middleware" "hashie" "json" "mime-types" "multi_json" "twitter-stream"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kwj0wd540wb2ws86d3jdva175dx00w2j8lyrvbb6qli3g27byd7";
+      type = "gem";
+    };
+    version = "1.10.1";
+  };
+  timfel-krb5-auth = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "105vajc0jkqgcx1wbp0ad262sdry4l1irk7jpaawv8vzfjfqqf5b";
+      type = "gem";
+    };
+    version = "0.8.3";
+  };
+  tilt = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir";
+      type = "gem";
+    };
+    version = "1.4.1";
+  };
+  thread_safe = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr";
+      type = "gem";
+    };
+    version = "0.3.5";
+  };
+  thor = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
+      type = "gem";
+    };
+    version = "0.19.1";
+  };
+  thin = {
+    dependencies = ["daemons" "eventmachine" "rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pyc602sa8fqwjyssn9yvf3fqrr14jk7hj9hsjlan1mq4zvim1lf";
+      type = "gem";
+    };
+    version = "1.6.4";
+  };
+  test_after_commit = {
+    dependencies = ["activerecord"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fzg8qan6f0n0ynr594bld2k0rwwxj99yzhiga2f3pkj9ina1abb";
+      type = "gem";
+    };
+    version = "0.4.2";
+  };
+  terminal-table = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1s6qyj9ir1agbbi32li9c0c34dcl0klyxqif6mxy0dbvq7kqfp8f";
+      type = "gem";
+    };
     version = "1.5.2";
-    source = {
-      type = "gem";
-      sha256 = "0hs99bjvnf1nw49nwq62mi5x65x2jlvwqa0xllsi3zfikafsm1y9";
-    };
   };
-  "ast" = {
+  term-ansicolor = {
+    dependencies = ["tins"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ydbbyjmk5p7fsi55ffnkq79jnfqx65c3nj8d9rpgl6sw85ahyys";
+      type = "gem";
+    };
+    version = "1.3.2";
+  };
+  temple = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ysraljv7lkb04z5vdyrkijab7j1jzj1mgz4bj82744dp7d0rhb0";
+      type = "gem";
+    };
+    version = "0.7.6";
+  };
+  teaspoon-jasmine = {
+    dependencies = ["teaspoon"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00wygrv1jm4aj15p1ab9d5fdrj6y83kv26xgp52mx4lp78h2ms9q";
+      type = "gem";
+    };
+    version = "2.2.0";
+  };
+  teaspoon = {
+    dependencies = ["railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cprz18vgf0jgcggcxf4pwx8jcwbiyj1p0dnck5aavlvaxaic58s";
+      type = "gem";
+    };
+    version = "1.0.2";
+  };
+  task_list = {
+    dependencies = ["html-pipeline"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1iv1fizb04463c4mp4gxd8v0414fhvmiwvwvjby5b9qq79d8zwab";
+      type = "gem";
+    };
+    version = "1.0.2";
+  };
+  systemu = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gmkbakhfci5wnmbfx5i54f25j9zsvbw858yg3jjhfs5n4ad1xq1";
+      type = "gem";
+    };
+    version = "2.6.5";
+  };
+  stringex = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "150adm7rfh6r9b5ra6vk75mswf9m3wwyslcf8f235a08m29fxa17";
+      type = "gem";
+    };
+    version = "2.5.2";
+  };
+  state_machines-activerecord = {
+    dependencies = ["activerecord" "state_machines-activemodel"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10dplkn4cm49xby8s0sn7wxww4hnxi4dgikfsmhp1rbsa24d76vx";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+  state_machines-activemodel = {
+    dependencies = ["activemodel" "state_machines"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bshcm53v2vfpapvhws1h0dq1h4f3p6bvpdkjpydb52a3m0w2z0y";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+  state_machines = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xg84kdglz0k1pshf2q604zybjpribzcz2b651sc1j27kd86w787";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
+  sprockets-rails = {
+    dependencies = ["actionpack" "activesupport" "sprockets"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vsl6ryxdjpp97nl4ghhk1v6p50zh3sx9qv81bhmlffc234r91wn";
+      type = "gem";
+    };
+    version = "2.3.3";
+  };
+  sprockets = {
+    dependencies = ["hike" "multi_json" "rack" "tilt"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15818683yz27w4hgywccf27n91azy9a4nmb5qkklzb08k8jw9gp3";
+      type = "gem";
+    };
+    version = "2.12.4";
+  };
+  spring-commands-teaspoon = {
+    dependencies = ["spring"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g7n4m2s9d0frh7y1xibzpphqajfnx4fvgfc66nh545dd91w2nqz";
+      type = "gem";
+    };
+    version = "0.0.2";
+  };
+  spring-commands-spinach = {
+    dependencies = ["spring"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "138jardqyj96wz68njdgy55qjbpl2d0g8bxbkz97ndaz3c2bykv9";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  spring-commands-rspec = {
+    dependencies = ["spring"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0b0svpq3md1pjz5drpa5pxwg8nk48wrshq8lckim4x3nli7ya0k2";
+      type = "gem";
+    };
+    version = "1.0.4";
+  };
+  spring = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xvz2x6nvza5i53p7mddnf11j2wshqmbaphi6ngd6nar8v35y0k1";
+      type = "gem";
+    };
+    version = "1.3.6";
+  };
+  spinach-rails = {
+    dependencies = ["capybara" "railties" "spinach"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nfacfylkncfgi59g2wga6m4nzdcjqb8s50cax4nbx362ap4bl70";
+      type = "gem";
+    };
+    version = "0.2.1";
+  };
+  spinach = {
+    dependencies = ["colorize" "gherkin-ruby" "json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0phfjs4iw2iqxdaljzwk6qxmi2x86pl3hirmpgw2pgfx76wfx688";
+      type = "gem";
+    };
+    version = "0.8.10";
+  };
+  slop = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n";
+      type = "gem";
+    };
+    version = "3.6.0";
+  };
+  slim = {
+    dependencies = ["temple" "tilt"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1szs71hh0msm5gj6qbcxw44m3hqnwybx4yh02scwixnwg576058k";
+      type = "gem";
+    };
+    version = "3.0.6";
+  };
+  slack-notifier = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08z6fv186yw1nrpl6zwp3lwqksin145aa1jv6jf00bnv3sicliiz";
+      type = "gem";
+    };
+    version = "1.2.1";
+  };
+  six = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bhapiyjh5r5qjpclfw8i65plvy6k2q4azr5xir63xqglr53viw3";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  sinatra = {
+    dependencies = ["rack" "rack-protection" "tilt"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hhmwqc81ram7lfwwziv0z70jh92sj1m7h7s9fr0cn2xq8mmn8l7";
+      type = "gem";
+    };
+    version = "1.4.6";
+  };
+  simplecov-html = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1qni8g0xxglkx25w54qcfbi4wjkpvmb28cb7rj5zk3iqynjcdrqf";
+      type = "gem";
+    };
+    version = "0.10.0";
+  };
+  simplecov = {
+    dependencies = ["docile" "json" "simplecov-html"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1q2iq2vgrdvvla5y907gkmqx6ry2qvnvc7a90hlcbwgp1w0sv6z4";
+      type = "gem";
+    };
+    version = "0.10.0";
+  };
+  simple_oauth = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bb06p88xsdw4fxll1ikv5i5k58sl6y323ss0wp1hqjm3xw1jgvj";
+      type = "gem";
+    };
+    version = "0.1.9";
+  };
+  sidekiq-cron = {
+    dependencies = ["redis-namespace" "rufus-scheduler" "sidekiq"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xnbvh8kjv6954vsiwfcpp7bn8sgpwvnyapnq7b94w8h7kj3ykqy";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
+  sidekiq = {
+    dependencies = ["concurrent-ruby" "connection_pool" "json" "redis"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1x7jfc2va0x6fcfffdf0wdiyk4krjw8053jzwffa63wkqr5jvg3y";
+      type = "gem";
+    };
+    version = "4.0.1";
+  };
+  shoulda-matchers = {
+    dependencies = ["activesupport"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0d3ryqcsk1n9y35bx5wxnqbgw4m8b3c79isazdjnnbg8crdp72d0";
+      type = "gem";
+    };
+    version = "2.8.0";
+  };
+  sham_rack = {
+    dependencies = ["rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zs6hpgg87x5jrykjxgfp2i7m5aja53s5kamdhxam16wki1hid3i";
+      type = "gem";
+    };
+    version = "1.3.6";
+  };
+  sexp_processor = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gxlcpg81wfjf5gpggf8h6l2dbq3ikgavbrr2yfw3m2vqy88yjg2";
+      type = "gem";
+    };
+    version = "4.6.0";
+  };
+  settingslogic = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ria5zcrk1nf0b9yia15mdpzw0dqr6wjpbj8dsdbbps81lfsj9ar";
+      type = "gem";
+    };
+    version = "2.0.9";
+  };
+  sentry-raven = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1h0w2ip02zcd3krpddn54vssd7asnbj823r4mlzzqpp28q3r3mcm";
+      type = "gem";
+    };
+    version = "0.15.4";
+  };
+  select2-rails = {
+    dependencies = ["thor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ni2k74n73y3gv56gs37gkjlh912szjf6k9j483wz41m3xvlz7fj";
+      type = "gem";
+    };
+    version = "3.5.9.3";
+  };
+  seed-fu = {
+    dependencies = ["activerecord" "activesupport"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11xja82yxir1kwccrzng29h7w911i9j0xj2y7y949yqnw91v12vw";
+      type = "gem";
+    };
+    version = "2.3.5";
+  };
+  sdoc = {
+    dependencies = ["json" "rdoc"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17l8qk0ld47z4h5avcnylvds8nc6dp25zc64w23z8li2hs341xf2";
+      type = "gem";
+    };
+    version = "0.3.20";
+  };
+  sawyer = {
+    dependencies = ["addressable" "faraday"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fk43bzwn816qj1ksiicm2i1kmzv5675cmnvk57kmfmi4rfsyjpy";
+      type = "gem";
+    };
+    version = "0.6.0";
+  };
+  sass-rails = {
+    dependencies = ["railties" "sass" "sprockets" "sprockets-rails" "tilt"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1f6357vw944w2ayayqmz8ai9myl6xbnry06sx5b5ms4r9lny8hj8";
+      type = "gem";
+    };
+    version = "5.0.4";
+  };
+  sass = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04rpdcp258arh2wgdk9shbqnzd6cbbbpi3wpi9a0wby8awgpxmyf";
+      type = "gem";
+    };
+    version = "3.4.20";
+  };
+  sanitize = {
+    dependencies = ["nokogiri"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3";
+      type = "gem";
+    };
     version = "2.1.0";
+  };
+  safe_yaml = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
+      type = "gem";
+    };
+    version = "1.0.4";
+  };
+  rugged = {
+    version = "0.24.0b13";
     source = {
       type = "gem";
-      sha256 = "102bywfxrv0w3n4s6lg25d7xxshd344sc7ijslqmganj5bany1pk";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0v0cvdw8cgy1hf5h3cx796zpxhbad8d5cm50nykyhwjc00q80zrr";
     };
   };
-  "astrolabe" = {
+  rufus-scheduler = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04bmvvvri7ni7dvlq3gi1y553f6rp6bw2kmdfp9ny5bh3l7qayrh";
+      type = "gem";
+    };
+    version = "3.1.10";
+  };
+  rubypants = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vpdkrc4c8qhrxph41wqwswl28q5h5h994gy4c1mlrckqzm3hzph";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  rubyntlm = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04l8686hl0829x4acsnbz0licf8n6794p7shz8iyahin1jnqg3d7";
+      type = "gem";
+    };
+    version = "0.5.2";
+  };
+  ruby_parser = {
+    dependencies = ["sexp_processor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rip6075b4k5a7s8w2klwc3jaqx31h69k004ac5nhl8y0ja92qvz";
+      type = "gem";
+    };
+    version = "3.7.2";
+  };
+  ruby2ruby = {
+    dependencies = ["ruby_parser" "sexp_processor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kmc0503s9mqnjyypx51wsi6zz9zj550ch43rag23wpj4qd6i6pm";
+      type = "gem";
+    };
+    version = "2.2.0";
+  };
+  ruby-saml = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "151jbak16y87dbj3ma2nc03rh37z7lixcwgaqahncq80rgnv45a8";
+      type = "gem";
+    };
+    version = "1.1.1";
+  };
+  ruby-progressbar = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hynaavnqzld17qdx9r7hfw00y16ybldwq730zrqfszjwgi59ivi";
+      type = "gem";
+    };
+    version = "1.7.5";
+  };
+  ruby-fogbugz = {
+    dependencies = ["crack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jj0gpkycbrivkh2q3429vj6mbgx6axxisg69slj3c4mgvzfgchm";
+      type = "gem";
+    };
+    version = "0.2.1";
+  };
+  rubocop = {
+    dependencies = ["astrolabe" "parser" "powerpack" "rainbow" "ruby-progressbar" "tins"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1grqda2fdknm43zyagh8gcmnhjkypyfw98q92hmvprprwghkq2sg";
+      type = "gem";
+    };
+    version = "0.35.1";
+  };
+  rspec-support = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1cyagig8slxjas8mbg5f8bl240b8zgr8mnjsvrznag1fwpkh4h27";
+      type = "gem";
+    };
+    version = "3.3.0";
+  };
+  rspec-rails = {
+    dependencies = ["actionpack" "activesupport" "railties" "rspec-core" "rspec-expectations" "rspec-mocks" "rspec-support"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m66n9p3a7d3fmrzkbh8312prb6dhrgmp53g1amck308ranasv2a";
+      type = "gem";
+    };
+    version = "3.3.3";
+  };
+  rspec-mocks = {
+    dependencies = ["diff-lcs" "rspec-support"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lfbzscmpyixlbapxmhy2s69596vs1z00lv590l51hgdw70z92vg";
+      type = "gem";
+    };
+    version = "3.3.2";
+  };
+  rspec-expectations = {
+    dependencies = ["diff-lcs" "rspec-support"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1d0b5hpkxlr9f3xpsbhvl3irnk4smmycx2xnmc8qv3pqaa7mb7ah";
+      type = "gem";
+    };
+    version = "3.3.1";
+  };
+  rspec-core = {
+    dependencies = ["rspec-support"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xw5qi936j6nz9fixi2mwy03f406761cd72bzyvd61pr854d7hy1";
+      type = "gem";
+    };
+    version = "3.3.2";
+  };
+  rspec = {
+    dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1bn5zs71agc0zyns2r3c8myi5bxw3q7xnzp7f3v5b7hbil1qym4r";
+      type = "gem";
+    };
+    version = "3.3.0";
+  };
+  rqrcode-rails3 = {
+    dependencies = ["rqrcode"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1i28rwmj24ssk91chn0g7qsnvn003y3s5a7jsrg3w4l5ckr841bg";
+      type = "gem";
+    };
+    version = "0.1.7";
+  };
+  rqrcode = {
+    dependencies = ["chunky_png"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "188n1mvc7klrlw30bai16sdg4yannmy7cz0sg0nvm6f1kjx5qflb";
+      type = "gem";
+    };
+    version = "0.7.0";
+  };
+  rouge = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0wp8as9ypdy18kdj9h70kny1rdfq71mr8cj2bpahr9vxjjvjasqz";
+      type = "gem";
+    };
+    version = "1.10.1";
+  };
+  rotp = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nzsc9hfxijnyzjbv728ln9dm80bc608chaihjdk63i2wi4m529g";
+      type = "gem";
+    };
+    version = "2.1.1";
+  };
+  rinku = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jh6nys332brph55i6x6cil6swm086kxjw34wq131nl6mwryqp7b";
+      type = "gem";
+    };
+    version = "1.7.3";
+  };
+  rest-client = {
+    dependencies = ["http-cookie" "mime-types" "netrc"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1m8z0c4yf6w47iqz6j2p7x1ip4qnnzvhdph9d5fgx081cvjly3p7";
+      type = "gem";
+    };
+    version = "1.8.0";
+  };
+  responders = {
+    dependencies = ["railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1i00bxp8fa67rzl50wfiaw16w21j5d5gwjjkdiwr0sw9q6ixmpz1";
+      type = "gem";
+    };
+    version = "2.1.1";
+  };
+  rerun = {
+    dependencies = ["listen"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0av239bpmy55fdx4qaw9n71aapjy2myr51h5plzjxsyr0fdwn1xq";
+      type = "gem";
+    };
+    version = "0.11.0";
+  };
+  request_store = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01rxi2hw84y133z0r91jns4aaywd8d83wjq0xgb42iaicf0a90p9";
+      type = "gem";
+    };
+    version = "1.2.1";
+  };
+  redis-store = {
+    dependencies = ["redis"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gf462p0wx4hn7m1m8ghs701n6xx0ijzm5cff9xfagd2s6va145m";
+      type = "gem";
+    };
+    version = "1.1.7";
+  };
+  redis-rails = {
+    dependencies = ["redis-actionpack" "redis-activesupport" "redis-store"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0igww7hb58aq74mh50dli3zjg78b54y8nhd0h1h9vz4vgjd4q8m7";
+      type = "gem";
+    };
+    version = "4.0.0";
+  };
+  redis-rack = {
+    dependencies = ["rack" "redis-store"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1y1mxx8gn0krdrpwllv7fqsbvki1qjnb2dz8b4q9gwc326829gk8";
+      type = "gem";
+    };
+    version = "1.5.0";
+  };
+  redis-namespace = {
+    dependencies = ["redis"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rp8gfkznfxqzxk9s976k71jnljkh0clkrhnp6vgx46s5yhj9g25";
+      type = "gem";
+    };
+    version = "1.5.2";
+  };
+  redis-activesupport = {
+    dependencies = ["activesupport" "redis-store"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10y3kybz21n2z11478sf0cp4xzclvxf0b428787brmgpc6i7p7zg";
+      type = "gem";
+    };
+    version = "4.1.5";
+  };
+  redis-actionpack = {
+    dependencies = ["actionpack" "redis-rack" "redis-store"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jjl6dhhpdapdaywq5iqz7z36mwbw0cn0m30wcc5wcbv7xmiiygw";
+      type = "gem";
+    };
+    version = "4.0.1";
+  };
+  redis = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0255w9izzs04hw9wivn05yqiwi34w28ylxs0xvpmwc1vrh18fwcl";
+      type = "gem";
+    };
+    version = "3.2.2";
+  };
+  redcarpet = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14i3wypp97bpk20679d1csy88q4hsgfqbnqw6mryl77m2g0d09pk";
+      type = "gem";
+    };
+    version = "3.3.3";
+  };
+  recaptcha = {
+    dependencies = ["json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "190qqklirmi31s6ih7png4h9xmx1p5h2n5fi45z90y8hsp5w1sh1";
+      type = "gem";
+    };
+    version = "1.0.2";
+  };
+  rdoc = {
+    dependencies = ["json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1v9k4sp5yzj2bshngckdvivj6bszciskk1nd2r3wri2ygs7vgqm8";
+      type = "gem";
+    };
+    version = "3.12.2";
+  };
+  rblineprof = {
+    dependencies = ["debugger-ruby_core_source"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m58kdjgncwf0h1qry3qk5h4bg8sj0idykqqijqcrr09mxfd9yc6";
+      type = "gem";
+    };
+    version = "0.3.6";
+  };
+  rb-inotify = {
+    dependencies = ["ffi"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9";
+      type = "gem";
+    };
+    version = "0.9.5";
+  };
+  rb-fsevent = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hq57by28iv0ijz8pk9ynih0xdg7vnl1010xjcijfklrcv89a1j2";
+      type = "gem";
+    };
+    version = "0.9.6";
+  };
+  raphael-rails = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sjiaymvfn4al5dr1pza5i142byan0fxnj4rymziyql2bzvdm2bc";
+      type = "gem";
+    };
+    version = "2.1.2";
+  };
+  rake = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jcabbgnjc788chx31sihc5pgbqnlc1c75wakmqlbjdm8jns2m9b";
+      type = "gem";
+    };
+    version = "10.5.0";
+  };
+  raindrops = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hv0xhr762axywr937czi92fs0x3zk7k22vg6f4i7rr8d05sp560";
+      type = "gem";
+    };
+    version = "0.15.0";
+  };
+  rainbow = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0dsnzfjiih2w8npsjab3yx1ssmmvmgjkbxny0i9yzrdy7whfw7b4";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  railties = {
+    dependencies = ["actionpack" "activesupport" "rake" "thor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07vmyrppa1x80whdjxhjij93qh9wvnmnxpsgn6fr9x2lqmzdyq5l";
+      type = "gem";
+    };
+    version = "4.2.5.1";
+  };
+  rails-html-sanitizer = {
+    dependencies = ["loofah"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "138fd86kv073zqfx0xifm646w6bgw2lr8snk16lknrrfrss8xnm7";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  rails-dom-testing = {
+    dependencies = ["activesupport" "nokogiri" "rails-deprecated_sanitizer"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1v8jl6803mbqpxh4hn0szj081q1a3ap0nb8ni0qswi7z4la844v8";
+      type = "gem";
+    };
+    version = "1.0.7";
+  };
+  rails-deprecated_sanitizer = {
+    dependencies = ["activesupport"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qxymchzdxww8bjsxj05kbf86hsmrjx40r41ksj0xsixr2gmhbbj";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  rails = {
+    dependencies = ["actionmailer" "actionpack" "actionview" "activejob" "activemodel" "activerecord" "activesupport" "railties" "sprockets-rails"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03j6hfsqdl0bay59m4qjj2081s4vnhqagpl14qpm4wfrqrgpkcqb";
+      type = "gem";
+    };
+    version = "4.2.5.1";
+  };
+  rack-test = {
+    dependencies = ["rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z";
+      type = "gem";
+    };
+    version = "0.6.3";
+  };
+  rack-protection = {
+    dependencies = ["rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
+      type = "gem";
+    };
+    version = "1.5.3";
+  };
+  rack-oauth2 = {
+    dependencies = ["activesupport" "attr_required" "httpclient" "multi_json" "rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1szfnb74p5s7k0glpmiv16rfl4wx9mnrr7riapgpbcx163zzkxad";
+      type = "gem";
+    };
+    version = "1.2.1";
+  };
+  rack-mount = {
+    dependencies = ["rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09a1qfaxxsll1kbgz7z0q0nr48sfmfm7akzaviis5bjpa5r00ld2";
+      type = "gem";
+    };
+    version = "0.8.3";
+  };
+  rack-cors = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1sz9d9gjmv2vjl3hddzk269hb1k215k8sp37gicphx82h3chk1kw";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
+  rack-attack = {
+    dependencies = ["rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ihic8ar2ddfv15p5gia8nqzsl3y7iayg5v4rmg72jlvikgsabls";
+      type = "gem";
+    };
+    version = "4.3.1";
+  };
+  rack-accept = {
+    dependencies = ["rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18jdipx17b4ki33cfqvliapd31sbfvs4mv727awynr6v95a7n936";
+      type = "gem";
+    };
+    version = "0.4.5";
+  };
+  rack = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09bs295yq6csjnkzj7ncj50i6chfxrhmzg1pk6p0vd2lb9ac8pj5";
+      type = "gem";
+    };
+    version = "1.6.4";
+  };
+  quiet_assets = {
+    dependencies = ["railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1q4azw4j1xsgd7qwcig110mfdn1fm0y34y87zw9j9v187xr401b1";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  pyu-ruby-sasl = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rcpjiz9lrvyb3rd8k8qni0v4ps08psympffyldmmnrqayyad0sn";
+      type = "gem";
+    };
+    version = "0.0.3.3";
+  };
+  pry-rails = {
+    dependencies = ["pry"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0a2iinvabis2xmv0z7z7jmh7bbkkngxj2qixfdg5m6qj9x8k1kx6";
+      type = "gem";
+    };
+    version = "0.3.4";
+  };
+  pry = {
+    dependencies = ["coderay" "method_source" "slop"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1x78rvp69ws37kwig18a8hr79qn36vh8g1fn75p485y3b3yiqszg";
+      type = "gem";
+    };
+    version = "0.10.3";
+  };
+  powerpack = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fnn3fli5wkzyjl4ryh0k90316shqjfnhydmc7f8lqpi0q21va43";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  posix-spawn = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "052lnxbkvlnwfjw4qd7vn2xrlaaqiav6f5x5bcjin97bsrfq6cmr";
+      type = "gem";
+    };
+    version = "0.3.11";
+  };
+  poltergeist = {
+    dependencies = ["capybara" "cliver" "multi_json" "websocket-driver"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ppm4isvbxm739508yjhvisq1iwp1q6h8dx4hkndj2krskavz4i9";
+      type = "gem";
+    };
+    version = "1.8.1";
+  };
+  pg = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "07dv4ma9xd75xpsnnwwg1yrpwpji7ydy0q1d9dl0yfqbzpidrw32";
+      type = "gem";
+    };
+    version = "0.18.4";
+  };
+  parser = {
+    dependencies = ["ast"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14db0gam24j04iprqz4m3hxygkb8h0plnbm0yk4k3lzq6j5wzcac";
+      type = "gem";
+    };
+    version = "2.2.3.0";
+  };
+  paranoia = {
+    dependencies = ["activerecord"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0z2smnnghjhcs4l5fkz9scs1kj0bvj2n8xmzcvw4rg9yprdnlxr0";
+      type = "gem";
+    };
+    version = "2.1.4";
+  };
+  orm_adapter = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fg9jpjlzf5y49qs9mlpdrgs5rpcyihq1s4k79nv9js0spjhnpda";
+      type = "gem";
+    };
+    version = "0.5.0";
+  };
+  org-ruby = {
+    dependencies = ["rubypants"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0x69s7aysfiwlcpd9hkvksfyld34d8kxr62adb59vjvh8hxfrjwk";
+      type = "gem";
+    };
+    version = "0.9.12";
+  };
+  omniauth_crowd = {
+    dependencies = ["activesupport" "nokogiri" "omniauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12g5ck05h6kr9mnp870x8pkxsadg81ca70hg8n3k8xx007lfw2q7";
+      type = "gem";
+    };
+    version = "2.2.3";
+  };
+  omniauth-twitter = {
+    dependencies = ["json" "omniauth-oauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hqjpb1zx0pp3s12c83pkpk4kkx41f001jc5n8qz0h3wll0ld833";
+      type = "gem";
+    };
+    version = "1.2.1";
+  };
+  omniauth-shibboleth = {
+    dependencies = ["omniauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0a8pwy23aybxhn545357zdjy0hnpfgldwqk5snmz9kxingpq12jl";
+      type = "gem";
+    };
+    version = "1.2.1";
+  };
+  omniauth-saml = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0c7pypskq9y6wbl7c8gnp48j256snph11br3csgwvy9whjfisx65";
+      type = "gem";
+    };
+    version = "1.4.2";
+  };
+  omniauth-oauth2 = {
+    dependencies = ["oauth2" "omniauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mskwlw5ibx9mz7ywqji6mm56ikf7mglbnfc02qhg6ry527jsxdm";
+      type = "gem";
+    };
+    version = "1.3.1";
+  };
+  omniauth-oauth = {
+    dependencies = ["oauth" "omniauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1n5vk4by7hkyc09d9blrw2argry5awpw4gbw1l4n2s9b3j4qz037";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  omniauth-multipassword = {
+    dependencies = ["omniauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qykp76hw80lkgb39hyzrv68hkbivc8cv0vbvrnycjh9fwfp1lv8";
+      type = "gem";
+    };
+    version = "0.4.2";
+  };
+  omniauth-kerberos = {
+    dependencies = ["omniauth-multipassword" "timfel-krb5-auth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05xsv76qjxcxzrvabaar2bchv7435y8l2j0wk4zgchh3yv85kiq7";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+  omniauth-google-oauth2 = {
+    dependencies = ["addressable" "jwt" "multi_json" "omniauth" "omniauth-oauth2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lm4fk6ig9vwzv7398qd861325g678sfr1iv2mm60xswl69964fi";
+      type = "gem";
+    };
+    version = "0.2.10";
+  };
+  omniauth-gitlab = {
+    dependencies = ["omniauth" "omniauth-oauth2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "083yyc8612kq8ygd8y7s8lxg2d51jcsakbs4pa19aww67gcm72iz";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  omniauth-github = {
+    dependencies = ["omniauth" "omniauth-oauth2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1mbx3c8m1llhdxrqdciq8jh428bxj1nvf4yhziv2xqmqpjcqz617";
+      type = "gem";
+    };
+    version = "1.1.2";
+  };
+  omniauth-facebook = {
+    dependencies = ["omniauth-oauth2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0plj56sna4b6c71k03jsng6gq3r5yxhj7h26ndahc9caasgk869c";
+      type = "gem";
+    };
+    version = "3.0.0";
+  };
+  omniauth-cas3 = {
+    dependencies = ["addressable" "nokogiri" "omniauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13swm2hi2z63nvb2bps6g41kki8kr9b5c7014rk8259bxlpflrk7";
+      type = "gem";
+    };
+    version = "1.1.3";
+  };
+  omniauth-bitbucket = {
+    dependencies = ["multi_json" "omniauth" "omniauth-oauth"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lals2z1yixffrc97zh7zn1jpz9l6vpb3alcp13im42dq9q0g845";
+      type = "gem";
+    };
+    version = "0.0.2";
+  };
+  omniauth-azure-oauth2 = {
+    dependencies = ["jwt" "omniauth" "omniauth-oauth2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qay454zvyas8xfnfkycqpjkafaq5pw4gaji176cdfw0blhviz0s";
+      type = "gem";
+    };
+    version = "0.0.6";
+  };
+  omniauth = {
     version = "1.3.1";
     source = {
       type = "gem";
-      sha256 = "0ybbmjxaf529vvhrj4y8d4jpf87f3hgczydzywyg1d04gggjx7l7";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vsqxgzkcfi10b7k6vpv3shmlphbs8grc29hznwl9s0i16n8962p";
     };
-    dependencies = [
-      "parser"
-    ];
   };
-  "attr_encrypted" = {
-    version = "1.3.4";
+  octokit = {
+    version = "3.8.0";
     source = {
       type = "gem";
-      sha256 = "1hm2844qm37kflqq5v0x2irwasbhcblhp40qk10m3wlkj4m9wp8p";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vmknh0vz1g734q32kgpxv0qwz9ifmnw2jfpd2w5rrk6xwq1k7a8";
     };
-    dependencies = [
-      "encryptor"
-    ];
   };
-  "attr_required" = {
+  oauth2 = {
+    dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zaa7qnvizv363apmxx9vxa8f6c6xy70z0jm0ydx38xvhxr8898r";
+      type = "gem";
+    };
     version = "1.0.0";
-    source = {
-      type = "gem";
-      sha256 = "0pawa2i7gw9ppj6fq6y288da1ncjpzsmc6kx7z63mjjvypa5q3dc";
-    };
-  };
-  "autoprefixer-rails" = {
-    version = "5.2.1.2";
-    source = {
-      type = "gem";
-      sha256 = "129kr8hiyzcnj4x3n14nnp7f7scps9v3d690i7fjzpq8i4n9gz8g";
-    };
-    dependencies = [
-      "execjs"
-      "json"
-    ];
-  };
-  "awesome_print" = {
-    version = "1.2.0";
-    source = {
-      type = "gem";
-      sha256 = "1k85hckprq0s9pakgadf42k1d5s07q23m3y6cs977i6xmwdivyzr";
-    };
-  };
-  "axiom-types" = {
-    version = "0.1.1";
-    source = {
-      type = "gem";
-      sha256 = "10q3k04pll041mkgy0m5fn2b1lazm6ly1drdbcczl5p57lzi3zy1";
-    };
-    dependencies = [
-      "descendants_tracker"
-      "ice_nine"
-      "thread_safe"
-    ];
-  };
-  "bcrypt" = {
-    version = "3.1.10";
-    source = {
-      type = "gem";
-      sha256 = "15cf7zzlj9b0xcx12jf8fmnpc8g1b0yhxal1yr5p7ny3mrz5pll6";
-    };
-  };
-  "better_errors" = {
-    version = "1.0.1";
-    source = {
-      type = "gem";
-      sha256 = "0v0q8bdkqqlcsfqbk4wvc3qnz8an44mgz720v5f11a4nr413mjgf";
-    };
-    dependencies = [
-      "coderay"
-      "erubis"
-    ];
-  };
-  "binding_of_caller" = {
-    version = "0.7.2";
-    source = {
-      type = "gem";
-      sha256 = "15jg6dkaq2nzcd602d7ppqbdxw3aji961942w93crs6qw4n6h9yk";
-    };
-    dependencies = [
-      "debug_inspector"
-    ];
-  };
-  "bootstrap-sass" = {
-    version = "3.3.5";
-    source = {
-      type = "gem";
-      sha256 = "0gnbl3jfi7x491kb5b2brhqr981wzg6r9sc907anhq9y727d96iv";
-    };
-    dependencies = [
-      "autoprefixer-rails"
-      "sass"
-    ];
-  };
-  "brakeman" = {
-    version = "3.0.1";
-    source = {
-      type = "gem";
-      sha256 = "0c3pwqhan5qpkmymmp4zpr6j1v3xrvvla9adsd0z9nx1dbc7llry";
-    };
-    dependencies = [
-      "erubis"
-      "fastercsv"
-      "haml"
-      "highline"
-      "multi_json"
-      "ruby2ruby"
-      "ruby_parser"
-      "sass"
-      "terminal-table"
-    ];
-  };
-  "browser" = {
-    version = "1.0.0";
-    source = {
-      type = "gem";
-      sha256 = "03pmj759wngl03lacn8mdhjn6mc5f8zn08mz6k5hq8czgwcwhjxi";
-    };
-  };
-  "builder" = {
-    version = "3.2.2";
-    source = {
-      type = "gem";
-      sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2";
-    };
-  };
-  "byebug" = {
-    version = "6.0.2";
-    source = {
-      type = "gem";
-      sha256 = "0537h9qbhr6csahmzyn4lk1g5b2lcligbzd21gfy93nx9lbfdnzc";
-    };
-  };
-  "cal-heatmap-rails" = {
-    version = "0.0.1";
-    source = {
-      type = "gem";
-      sha256 = "07qp74hi1612xgmkfvk1dmc4n79lc7dfkcgqjprnlwb6nkqa940m";
-    };
-  };
-  "capybara" = {
-    version = "2.4.4";
-    source = {
-      type = "gem";
-      sha256 = "114k4xi4nfbp3jfbxgwa3fksbwsyibx74gbdqpcgg3dxpmzkaa4f";
-    };
-    dependencies = [
-      "mime-types"
-      "nokogiri"
-      "rack"
-      "rack-test"
-      "xpath"
-    ];
-  };
-  "capybara-screenshot" = {
-    version = "1.0.11";
-    source = {
-      type = "gem";
-      sha256 = "17v1wihr3aqrxhrwswkdpdklj1xsfcaksblh1y8hixvm9bqfyz3y";
-    };
-    dependencies = [
-      "capybara"
-      "launchy"
-    ];
-  };
-  "carrierwave" = {
-    version = "0.9.0";
-    source = {
-      type = "gem";
-      sha256 = "1b1av1ancby6brhmypl5k8xwrasd8bd3kqp9ri8kbq7z8nj6k445";
-    };
-    dependencies = [
-      "activemodel"
-      "activesupport"
-      "json"
-    ];
-  };
-  "celluloid" = {
-    version = "0.16.0";
-    source = {
-      type = "gem";
-      sha256 = "044xk0y7i1xjafzv7blzj5r56s7zr8nzb619arkrl390mf19jxv3";
-    };
-    dependencies = [
-      "timers"
-    ];
-  };
-  "charlock_holmes" = {
-    version = "0.6.9.4";
-    source = {
-      type = "gem";
-      sha256 = "1vyzsr3r2bwig9knyhay1m7i828w9x5zhma44iajyrbs1ypvfbg5";
-    };
-  };
-  "chronic" = {
-    version = "0.10.2";
-    source = {
-      type = "gem";
-      sha256 = "1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn";
-    };
-  };
-  "chunky_png" = {
-    version = "1.3.4";
-    source = {
-      type = "gem";
-      sha256 = "0n5xhkj3vffihl3h9s8yjzazqaqcm4p1nyxa1w2dk3fkpzvb0wfw";
-    };
-  };
-  "cliver" = {
-    version = "0.3.2";
-    source = {
-      type = "gem";
-      sha256 = "096f4rj7virwvqxhkavy0v55rax10r4jqf8cymbvn4n631948xc7";
-    };
-  };
-  "coderay" = {
-    version = "1.1.0";
-    source = {
-      type = "gem";
-      sha256 = "059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s";
-    };
-  };
-  "coercible" = {
-    version = "1.0.0";
-    source = {
-      type = "gem";
-      sha256 = "1p5azydlsz0nkxmcq0i1gzmcfq02lgxc4as7wmf47j1c6ljav0ah";
-    };
-    dependencies = [
-      "descendants_tracker"
-    ];
-  };
-  "coffee-rails" = {
-    version = "4.1.0";
-    source = {
-      type = "gem";
-      sha256 = "0p3zhs44gsy1p90nmghihzfyl7bsk8kv6j3q7rj3bn74wg8w7nqs";
-    };
-    dependencies = [
-      "coffee-script"
-      "railties"
-    ];
-  };
-  "coffee-script" = {
-    version = "2.4.1";
-    source = {
-      type = "gem";
-      sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2";
-    };
-    dependencies = [
-      "coffee-script-source"
-      "execjs"
-    ];
-  };
-  "coffee-script-source" = {
-    version = "1.9.1.1";
-    source = {
-      type = "gem";
-      sha256 = "1arfrwyzw4sn7nnaq8jji5sv855rp4c5pvmzkabbdgca0w1cxfq5";
-    };
-  };
-  "colored" = {
-    version = "1.2";
-    source = {
-      type = "gem";
-      sha256 = "0b0x5jmsyi0z69bm6sij1k89z7h0laag3cb4mdn7zkl9qmxb90lx";
-    };
-  };
-  "colorize" = {
-    version = "0.5.8";
-    source = {
-      type = "gem";
-      sha256 = "1rfzvscnk2js87zzwjgg2lk6h6mrv9448z5vx3b8vnm9yrb2qg8g";
-    };
-  };
-  "connection_pool" = {
-    version = "2.2.0";
-    source = {
-      type = "gem";
-      sha256 = "1b2bb3k39ni5mzcnqlv9y4yjkbin20s7dkwzp0jw2jf1rmzcgrmy";
-    };
-  };
-  "coveralls" = {
-    version = "0.8.2";
-    source = {
-      type = "gem";
-      sha256 = "0ds63q3g8zp23813hsvjjqpjglwr76ld4zqbbdhc9ads9l988axz";
-    };
-    dependencies = [
-      "json"
-      "rest-client"
-      "simplecov"
-      "term-ansicolor"
-      "thor"
-    ];
-  };
-  "crack" = {
-    version = "0.4.2";
-    source = {
-      type = "gem";
-      sha256 = "1il94m92sz32nw5i6hdq14f1a2c3s9hza9zn6l95fvqhabq38k7a";
-    };
-    dependencies = [
-      "safe_yaml"
-    ];
-  };
-  "creole" = {
-    version = "0.3.8";
-    source = {
-      type = "gem";
-      sha256 = "1wwqk5ij4r5rhzbzhnpqwbn9ck56qgyjs02pjmi2wh46gs8dmkl8";
-    };
-  };
-  "d3_rails" = {
-    version = "3.5.6";
-    source = {
-      type = "gem";
-      sha256 = "0faz49chi08zxqwwdzzcb468gmcfmpv1s58y4c431kpa6kyh8qsm";
-    };
-    dependencies = [
-      "railties"
-    ];
-  };
-  "daemons" = {
-    version = "1.2.3";
-    source = {
-      type = "gem";
-      sha256 = "0b839hryy9sg7x3knsa1d6vfiyvn0mlsnhsb6an8zsalyrz1zgqg";
-    };
-  };
-  "database_cleaner" = {
-    version = "1.4.1";
-    source = {
-      type = "gem";
-      sha256 = "0n5r7kvsmknk876v3scdphfnvllr9157fa5q7j5fczg8j5qm6kf0";
-    };
-  };
-  "debug_inspector" = {
-    version = "0.0.2";
-    source = {
-      type = "gem";
-      sha256 = "109761g00dbrw5q0dfnbqg8blfm699z4jj70l4zrgf9mzn7ii50m";
-    };
-  };
-  "default_value_for" = {
-    version = "3.0.1";
-    source = {
-      type = "gem";
-      sha256 = "1z4lrba4y1c3y0rxw8321qbwsb3nr6c2igrpksfvz93yhc9m6xm0";
-    };
-    dependencies = [
-      "activerecord"
-    ];
-  };
-  "descendants_tracker" = {
-    version = "0.0.4";
-    source = {
-      type = "gem";
-      sha256 = "15q8g3fcqyb41qixn6cky0k3p86291y7xsh1jfd851dvrza1vi79";
-    };
-    dependencies = [
-      "thread_safe"
-    ];
-  };
-  "devise" = {
-    version = "3.5.2";
-    source = {
-      type = "gem";
-      sha256 = "1wj88i2hyhcnifj606vzgf2q68yhcpyrsx7bc11h93cma51z59c3";
-    };
-    dependencies = [
-      "bcrypt"
-      "orm_adapter"
-      "railties"
-      "responders"
-      "thread_safe"
-      "warden"
-    ];
-  };
-  "devise-async" = {
-    version = "0.9.0";
-    source = {
-      type = "gem";
-      sha256 = "11llg7ggzpmg4lb9gh4sx55spvp98sal5r803gjzamps9crfq6mm";
-    };
-    dependencies = [
-      "devise"
-    ];
-  };
-  "devise-two-factor" = {
-    version = "2.0.0";
-    source = {
-      type = "gem";
-      sha256 = "1xzaagz6fr9cbq7cj8g7sahx6sxxsc1jyja462caa0gjang9yrhr";
-    };
-    dependencies = [
-      "activesupport"
-      "attr_encrypted"
-      "devise"
-      "railties"
-      "rotp"
-    ];
-  };
-  "diff-lcs" = {
-    version = "1.2.5";
-    source = {
-      type = "gem";
-      sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1";
-    };
-  };
-  "diffy" = {
-    version = "3.0.7";
-    source = {
-      type = "gem";
-      sha256 = "0il0ri511g9rm88qbvncbzgwc6wk6265hmnf7grcczmrs1z49vl0";
-    };
-  };
-  "docile" = {
-    version = "1.1.5";
-    source = {
-      type = "gem";
-      sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx";
-    };
-  };
-  "domain_name" = {
-    version = "0.5.24";
-    source = {
-      type = "gem";
-      sha256 = "1xjm5arwc35wryn0hbfldx2pfhwx5qilkv7yms4kz0jri3m6mgcc";
-    };
-    dependencies = [
-      "unf"
-    ];
-  };
-  "doorkeeper" = {
-    version = "2.1.4";
-    source = {
-      type = "gem";
-      sha256 = "00akgshmz85kxvf35qsag80qbxzjvmkmksjy96zx44ckianxwahl";
-    };
-    dependencies = [
-      "railties"
-    ];
-  };
-  "dropzonejs-rails" = {
-    version = "0.7.1";
-    source = {
-      type = "gem";
-      sha256 = "0spfjkji6v98996bc320sx3ar3sflkpbjpzwg6cvbycwfn29fjfy";
-    };
-    dependencies = [
-      "rails"
-    ];
-  };
-  "email_reply_parser" = {
-    version = "0.5.8";
-    source = {
-      type = "gem";
-      sha256 = "0k2p229mv7xn7q627zwmvhrcvba4b9m70pw2jfjm6iimg2vmf22r";
-    };
-  };
-  "email_spec" = {
-    version = "1.6.0";
-    source = {
-      type = "gem";
-      sha256 = "00p1cc69ncrgg7m45va43pszip8anx5735w1lsb7p5ygkyw8nnpv";
-    };
-    dependencies = [
-      "launchy"
-      "mail"
-    ];
-  };
-  "encryptor" = {
-    version = "1.3.0";
-    source = {
-      type = "gem";
-      sha256 = "04wqqda081h7hmhwjjx1yqxprxjk8s5jgv837xqv1bpxiv7f4v1y";
-    };
-  };
-  "enumerize" = {
-    version = "0.7.0";
-    source = {
-      type = "gem";
-      sha256 = "0rg6bm3xv7p4i5gs4796v8gc49mzakphwv4kdbhn0wjm690h6226";
-    };
-    dependencies = [
-      "activesupport"
-    ];
-  };
-  "equalizer" = {
-    version = "0.0.11";
-    source = {
-      type = "gem";
-      sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4";
-    };
-  };
-  "erubis" = {
-    version = "2.7.0";
-    source = {
-      type = "gem";
-      sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
-    };
-  };
-  "escape_utils" = {
-    version = "0.2.4";
-    source = {
-      type = "gem";
-      sha256 = "0mg5pgaa02w1bxh0166d367f2ll6fizyrs5dsirrcnw4g17ba54g";
-    };
-  };
-  "eventmachine" = {
-    version = "1.0.8";
-    source = {
-      type = "gem";
-      sha256 = "1frvpk3p73xc64qkn0ymll3flvn4xcycq5yx8a43zd3gyzc1ifjp";
-    };
   };
-  "excon" = {
-    version = "0.45.4";
+  oauth = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1k5j09p3al3clpjl6lax62qmhy43f3j3g7i6f9l4dbs6r5vpv95w";
       type = "gem";
-      sha256 = "1shb4g3dhsfkywgjv6123yrvp2c8bvi8hqmq47iqa5lp72sn4b4w";
     };
-  };
-  "execjs" = {
-    version = "2.6.0";
-    source = {
-      type = "gem";
-      sha256 = "0grlxwiccbnflxs30r3h7g23xnps5knav1jyqkk3anvm8363ifjw";
-    };
-  };
-  "expression_parser" = {
-    version = "0.9.0";
-    source = {
-      type = "gem";
-      sha256 = "1938z3wmmdabqxlh5d5c56xfg1jc6z15p7zjyhvk7364zwydnmib";
-    };
-  };
-  "factory_girl" = {
-    version = "4.3.0";
-    source = {
-      type = "gem";
-      sha256 = "13z20a4b7z1c8vbz0qz5ranssdprldwvwlgjmn38x311sfjmp9dz";
-    };
-    dependencies = [
-      "activesupport"
-    ];
-  };
-  "factory_girl_rails" = {
-    version = "4.3.0";
-    source = {
-      type = "gem";
-      sha256 = "1jj0yl6mfildb4g79dwgc1q5pv2pa65k9b1ml43mi8mg62j8mrhz";
-    };
-    dependencies = [
-      "factory_girl"
-      "railties"
-    ];
-  };
-  "faraday" = {
-    version = "0.8.10";
-    source = {
-      type = "gem";
-      sha256 = "093hrmrx3jn9969q6c9cjms2k73aqwhs03kij378kg1d5izr4r6f";
-    };
-    dependencies = [
-      "multipart-post"
-    ];
-  };
-  "faraday_middleware" = {
-    version = "0.10.0";
-    source = {
-      type = "gem";
-      sha256 = "0nxia26xzy8i56qfyz1bg8dg9yb26swpgci8n5jry8mh4bnx5r5h";
-    };
-    dependencies = [
-      "faraday"
-    ];
-  };
-  "fastercsv" = {
-    version = "1.5.5";
-    source = {
-      type = "gem";
-      sha256 = "1df3vfgw5wg0s405z0pj0rfcvnl9q6wak7ka8gn0xqg4cag1k66h";
-    };
-  };
-  "ffaker" = {
-    version = "2.0.0";
-    source = {
-      type = "gem";
-      sha256 = "19fnbbsw87asyb1hvkr870l2yldah2jcjb8074pgyrma5lynwmn0";
-    };
-  };
-  "ffi" = {
-    version = "1.9.10";
-    source = {
-      type = "gem";
-      sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj";
-    };
-  };
-  "fission" = {
-    version = "0.5.0";
-    source = {
-      type = "gem";
-      sha256 = "09pmp1j1rr8r3pcmbn2na2ls7s1j9ijbxj99xi3a8r6v5xhjdjzh";
-    };
-    dependencies = [
-      "CFPropertyList"
-    ];
-  };
-  "flowdock" = {
-    version = "0.7.0";
-    source = {
-      type = "gem";
-      sha256 = "0wzqj35mn2x2gcy88y00h3jz57ldkkidkwy63jxvmqdlz759pds5";
-    };
-    dependencies = [
-      "httparty"
-      "multi_json"
-    ];
-  };
-  "fog" = {
-    version = "1.25.0";
-    source = {
-      type = "gem";
-      sha256 = "0zncds3qj5n3i780y6y6sy5h1gg0kwiyiirxyisbd8p0ywwr8bc3";
-    };
-    dependencies = [
-      "fog-brightbox"
-      "fog-core"
-      "fog-json"
-      "fog-profitbricks"
-      "fog-radosgw"
-      "fog-sakuracloud"
-      "fog-softlayer"
-      "fog-terremark"
-      "fog-vmfusion"
-      "fog-voxel"
-      "fog-xml"
-      "ipaddress"
-      "nokogiri"
-      "opennebula"
-    ];
-  };
-  "fog-brightbox" = {
-    version = "0.9.0";
-    source = {
-      type = "gem";
-      sha256 = "01a6ydv7y02zbid8s9mqcxpc0k0hig39ap7mrwj9vp6z7mm9dydv";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-      "inflecto"
-    ];
-  };
-  "fog-core" = {
-    version = "1.32.1";
-    source = {
-      type = "gem";
-      sha256 = "0pnm3glgha2hxmhjvgp7f088vzdgv08q8c6w8y9c2cys3b4fx83m";
-    };
-    dependencies = [
-      "builder"
-      "excon"
-      "formatador"
-      "mime-types"
-      "net-scp"
-      "net-ssh"
-    ];
-  };
-  "fog-json" = {
-    version = "1.0.2";
-    source = {
-      type = "gem";
-      sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r";
-    };
-    dependencies = [
-      "fog-core"
-      "multi_json"
-    ];
-  };
-  "fog-profitbricks" = {
-    version = "0.0.5";
-    source = {
-      type = "gem";
-      sha256 = "154sqs2dcmvg21v4m3fj8f09z5i70sq8a485v6rdygsffs8xrycn";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-xml"
-      "nokogiri"
-    ];
-  };
-  "fog-radosgw" = {
-    version = "0.0.4";
-    source = {
-      type = "gem";
-      sha256 = "1pxbvmr4dsqx4x2klwnciyhki4r5ryr9y0hi6xmm3n6fdv4ii7k3";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-      "fog-xml"
-    ];
-  };
-  "fog-sakuracloud" = {
-    version = "1.0.1";
-    source = {
-      type = "gem";
-      sha256 = "1s16b48kh7y03hjv74ccmlfwhqqq7j7m4k6cywrgbyip8n3258n8";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-    ];
-  };
-  "fog-softlayer" = {
     version = "0.4.7";
-    source = {
-      type = "gem";
-      sha256 = "0fgfbhqnyp8ywymvflflhvbns54d1432x57pgpnfy8k1cxvhv9b8";
-    };
-    dependencies = [
-      "fog-core"
-      "fog-json"
-    ];
   };
-  "fog-terremark" = {
-    version = "0.1.0";
+  nprogress-rails = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ylq2208i95661ba0p1ng2i38z4978ddwiidvpb614amfdq5pqvn";
       type = "gem";
-      sha256 = "01lfkh9jppj0iknlklmwyb7ym3bfhkq58m3absb6rf5a5mcwi3lf";
     };
-    dependencies = [
-      "fog-core"
-      "fog-xml"
-    ];
+    version = "0.1.6.7";
   };
-  "fog-vmfusion" = {
-    version = "0.1.0";
+  nokogiri = {
+    dependencies = ["mini_portile2"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11sbmpy60ynak6s3794q32lc99hs448msjy8rkp84ay7mq7zqspv";
       type = "gem";
-      sha256 = "0g0l0k9ylxk1h9pzqr6h2ba98fl47lpp3j19lqv4jxw0iw1rqxn4";
     };
-    dependencies = [
-      "fission"
-      "fog-core"
-    ];
+    version = "1.6.7.2";
   };
-  "fog-voxel" = {
-    version = "0.1.0";
+  netrc = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y";
       type = "gem";
-      sha256 = "10skdnj59yf4jpvq769njjrvh2l0wzaa7liva8n78qq003mvmfgx";
     };
-    dependencies = [
-      "fog-core"
-      "fog-xml"
-    ];
+    version = "0.11.0";
   };
-  "fog-xml" = {
-    version = "0.1.2";
+  net-ssh = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1dzqkgwi9xm6mbfk1rkk17rzmz8m5xakqi21w1b97ybng6kkw0hf";
       type = "gem";
-      sha256 = "1576sbzza47z48p0k9h1wg3rhgcvcvdd1dfz3xx1cgahwr564fqa";
     };
-    dependencies = [
-      "fog-core"
-      "nokogiri"
-    ];
-  };
-  "font-awesome-rails" = {
-    version = "4.4.0.0";
-    source = {
-      type = "gem";
-      sha256 = "0igrwlkgpggpfdy3f4kzsz22m14rxx5xnvz3if16czqjlkq4kbbx";
-    };
-    dependencies = [
-      "railties"
-    ];
-  };
-  "foreman" = {
-    version = "0.78.0";
-    source = {
-      type = "gem";
-      sha256 = "1caz8mi7gq1hs4l1flcyyw1iw1bdvdbhppsvy12akr01k3s17xaq";
-    };
-    dependencies = [
-      "thor"
-    ];
-  };
-  "formatador" = {
-    version = "0.2.5";
-    source = {
-      type = "gem";
-      sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0";
-    };
-  };
-  "fuubar" = {
-    version = "2.0.0";
-    source = {
-      type = "gem";
-      sha256 = "0xwqs24y8s73aayh39si17kccsmr0bjgmi6jrjyfp7gkjb6iyhpv";
-    };
-    dependencies = [
-      "rspec"
-      "ruby-progressbar"
-    ];
-  };
-  "gemnasium-gitlab-service" = {
-    version = "0.2.6";
-    source = {
-      type = "gem";
-      sha256 = "1qv7fkahmqkah3770ycrxd0x2ais4z41hb43a0r8q8wcdklns3m3";
-    };
-    dependencies = [
-      "rugged"
-    ];
-  };
-  "gemojione" = {
-    version = "2.0.1";
-    source = {
-      type = "gem";
-      sha256 = "0655l0vgs0hbz11s2nlpwwj7df66cxlvv94iz7mhf04qrr5mi26q";
-    };
-    dependencies = [
-      "json"
-    ];
-  };
-  "get_process_mem" = {
-    version = "0.2.0";
-    source = {
-      type = "gem";
-      sha256 = "025f7v6bpbgsa2nr0hzv2riggj8qmzbwcyxfgjidpmwh5grh7j29";
-    };
-  };
-  "gherkin-ruby" = {
-    version = "0.3.2";
-    source = {
-      type = "gem";
-      sha256 = "18ay7yiibf4sl9n94k7mbi4k5zj2igl4j71qcmkswv69znyx0sn1";
-    };
-  };
-  "github-markup" = {
-    version = "1.3.3";
-    source = {
-      type = "gem";
-      sha256 = "01r901wcgn0gs0n9h684gs5n90y1vaj9lxnx4z5ig611jwa43ivq";
-    };
-  };
-  "gitlab-flowdock-git-hook" = {
-    version = "1.0.1";
-    source = {
-      type = "gem";
-      sha256 = "1s3a10cdbh4xy732b92zcsm5zyc1lhi5v29d76j8mwbqmj11a2p8";
-    };
-    dependencies = [
-      "flowdock"
-      "gitlab-grit"
-      "multi_json"
-    ];
-  };
-  "gitlab-grit" = {
-    version = "2.7.3";
-    source = {
-      type = "gem";
-      sha256 = "0nv8shx7w7fww8lf5a2rbvf7bq173rllm381m6x7g1i0qqc68q1b";
-    };
-    dependencies = [
-      "charlock_holmes"
-      "diff-lcs"
-      "mime-types"
-      "posix-spawn"
-    ];
-  };
-  "gitlab-linguist" = {
     version = "3.0.1";
-    source = {
-      type = "gem";
-      sha256 = "14ydmxmdm7j56nwlcf4ai08mpc7d3mbfhida52p1zljshbvda5ib";
-    };
-    dependencies = [
-      "charlock_holmes"
-      "escape_utils"
-      "mime-types"
-    ];
   };
-  "gitlab_emoji" = {
-    version = "0.1.1";
+  net-ldap = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0z1j0zklbbx3vi91zcd2v0fnkfgkvq3plisa6hxaid8sqndyak46";
       type = "gem";
-      sha256 = "13jj6ah88x8y6cr5c82j78a4mi5g88a7vpqf617zpcdiabmr0gl6";
     };
-    dependencies = [
-      "gemojione"
-    ];
+    version = "0.12.1";
   };
-  "gitlab_git" = {
-    version = "7.2.15";
+  nested_form = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0f053j4zfagxyym28msxj56hrpvmyv4lzxy2c5c270f7xbbnii5i";
       type = "gem";
-      sha256 = "1afa645sj322sfy4h6hksi78m87qgvslmf8rgzlqsa4b6zf4w4x2";
     };
-    dependencies = [
-      "activesupport"
-      "charlock_holmes"
-      "gitlab-linguist"
-      "rugged"
-    ];
+    version = "0.3.2";
   };
-  "gitlab_meta" = {
-    version = "7.0";
+  mysql2 = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0n075x14n9kziv0qdxqlzhf3j1abi1w6smpakfpsg4jbr8hnn5ip";
       type = "gem";
-      sha256 = "14vahv7gblcypbvip845sg3lvawf3kij61mkxz5vyfcv23niqvp9";
     };
+    version = "0.3.20";
   };
-  "gitlab_omniauth-ldap" = {
-    version = "1.2.1";
+  multipart-post = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x";
       type = "gem";
-      sha256 = "1vbdyi57vvlrigyfhmqrnkw801x57fwa3gxvj1rj2bn9ig5186ri";
     };
-    dependencies = [
-      "net-ldap"
-      "omniauth"
-      "pyu-ruby-sasl"
-      "rubyntlm"
-    ];
+    version = "2.0.0";
   };
-  "gollum-grit_adapter" = {
-    version = "1.0.0";
+  multi_xml = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0i8r7dsz4z79z3j023l8swan7qpbgxbwwz11g38y2vjqjk16v4q8";
       type = "gem";
-      sha256 = "02c5qfq0s0kx2ifnpbnbgz6258fl7rchzzzc7vpx72shi8gbpac7";
     };
-    dependencies = [
-      "gitlab-grit"
-    ];
+    version = "0.5.5";
   };
-  "gollum-lib" = {
-    version = "4.0.3";
+  multi_json = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rf3l4j3i11lybqzgq2jhszq7fh7gpmafjzd14ymp9cjfxqg596r";
       type = "gem";
-      sha256 = "1f8jzxza1ckpyzyk137rqd212vfk2ac2mn1pp1wi880s4ynahyky";
     };
-    dependencies = [
-      "github-markup"
-      "gollum-grit_adapter"
-      "nokogiri"
-      "rouge"
-      "sanitize"
-      "stringex"
-    ];
+    version = "1.11.2";
   };
-  "gon" = {
-    version = "5.0.4";
+  mousetrap-rails = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00n13r5pwrk4vq018128vcfh021dw0fa2bk4pzsv0fslfm8ayp2m";
       type = "gem";
-      sha256 = "0gdl6zhj5k8ma3mwm00kjfa12w0l6br9kyyxvfj90cw9irfi049r";
     };
-    dependencies = [
-      "actionpack"
-      "json"
-    ];
+    version = "1.4.6";
   };
-  "grape" = {
+  minitest = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rxqfakp629mp3vwda7zpgb57lcns5znkskikbfd0kriwv8i1vq8";
+      type = "gem";
+    };
+    version = "5.7.0";
+  };
+  mini_portile2 = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "056drbn5m4khdxly1asmiik14nyllswr6sh3wallvsywwdiryz8l";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  mimemagic = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "101lq4bnjs7ywdcicpw3vbz9amg5gbb4va1626fybd2hawgdx8d9";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+  mime-types = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8";
+      type = "gem";
+    };
+    version = "1.25.1";
+  };
+  method_source = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2";
+      type = "gem";
+    };
+    version = "0.8.2";
+  };
+  mail_room = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jpybhgw9yi50g422qvnwadn5jnj563vh70qaml5cxzdqxbd7fj1";
+      type = "gem";
+    };
     version = "0.6.1";
-    source = {
-      type = "gem";
-      sha256 = "1sjlk0pmgqbb3piz8yb0xjcm7liimrr17y5xflm40amv36pg2gz8";
-    };
-    dependencies = [
-      "activesupport"
-      "builder"
-      "hashie"
-      "multi_json"
-      "multi_xml"
-      "rack"
-      "rack-accept"
-      "rack-mount"
-      "virtus"
-    ];
   };
-  "grape-entity" = {
-    version = "0.4.8";
+  mail = {
+    dependencies = ["mime-types"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp";
       type = "gem";
-      sha256 = "0hxghs2p9ncvdwhp6dwr1a74g552c49dd0jzy0szp4pg2xjbgjk8";
     };
-    dependencies = [
-      "activesupport"
-      "multi_json"
-    ];
+    version = "2.6.3";
   };
-  "growl" = {
-    version = "1.0.3";
+  macaddr = {
+    dependencies = ["systemu"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1clii8mvhmh5lmnm95ljnjygyiyhdpja85c5vy487rhxn52scn0b";
       type = "gem";
-      sha256 = "0s0y7maljnalpbv2q1j5j5hvb4wcc31y9af0n7x1q2l0fzxgc9n9";
     };
+    version = "1.7.1";
   };
-  "guard" = {
-    version = "2.13.0";
+  loofah = {
+    dependencies = ["nokogiri"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "109ps521p0sr3kgc460d58b4pr1z4mqggan2jbsf0aajy9s6xis8";
       type = "gem";
-      sha256 = "0p3ndfmi6sdw55c7j19pyb2ymlby1vyxlp0k47366im1vi70b7gf";
     };
-    dependencies = [
-      "formatador"
-      "listen"
-      "lumberjack"
-      "nenv"
-      "notiffany"
-      "pry"
-      "shellany"
-      "thor"
-    ];
+    version = "2.0.3";
   };
-  "guard-rspec" = {
-    version = "4.2.10";
+  listen = {
+    dependencies = ["rb-fsevent" "rb-inotify"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "182wd2pkf690ll19lx6zbk01a3rqkk5lwsyin6kwydl7lqxj5z3g";
       type = "gem";
-      sha256 = "1mm03i1knmhmdqs4ni03nda7jy3s34c2nxf5sjq1cmywk9c0bn0r";
     };
-    dependencies = [
-      "guard"
-      "rspec"
-    ];
+    version = "3.0.5";
   };
-  "haml" = {
-    version = "4.0.7";
+  letter_opener = {
+    dependencies = ["launchy"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kzbmc686hfh4jznyckq6g40kn14nhb71znsjjm0rc13nb3n0c5l";
       type = "gem";
-      sha256 = "0mrzjgkygvfii66bbylj2j93na8i89998yi01fin3whwqbvx0m1p";
     };
-    dependencies = [
-      "tilt"
-    ];
+    version = "1.1.2";
   };
-  "haml-rails" = {
-    version = "0.5.3";
+  launchy = {
+    dependencies = ["addressable"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2";
       type = "gem";
-      sha256 = "0fg4dh1gb7f4h2571wm5qxli02mgg3r8ikp5vwkww12a431vk625";
     };
-    dependencies = [
-      "actionpack"
-      "activesupport"
-      "haml"
-      "railties"
-    ];
+    version = "2.4.3";
   };
-  "hashie" = {
-    version = "2.1.2";
+  kgio = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1y6wl3vpp82rdv5g340zjgkmy6fny61wib7xylyg0d09k5f26118";
       type = "gem";
-      sha256 = "08w9ask37zh5w989b6igair3zf8gwllyzix97rlabxglif9f9qd9";
     };
+    version = "2.10.0";
   };
-  "highline" = {
-    version = "1.6.21";
+  kaminari = {
+    dependencies = ["actionpack" "activesupport"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14vx3kgssl4lv2kn6grr5v2whsynx5rbl1j9aqiq8nc3d7j74l67";
       type = "gem";
-      sha256 = "06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1";
     };
+    version = "0.16.3";
   };
-  "hike" = {
-    version = "1.2.3";
+  jwt = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0is8973si98rsry5igqdag2jb1knj6jhmfkr9r4mc5n0yvgr5n2q";
       type = "gem";
-      sha256 = "0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm";
     };
-  };
-  "hipchat" = {
     version = "1.5.2";
-    source = {
-      type = "gem";
-      sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k";
-    };
-    dependencies = [
-      "httparty"
-      "mimemagic"
-    ];
   };
-  "hitimes" = {
-    version = "1.2.3";
+  json = {
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc";
       type = "gem";
-      sha256 = "1fr9raz7652bnnx09dllyjdlnwdxsnl0ig5hq9s4s8vackvmckv4";
     };
+    version = "1.8.3";
   };
-  "html-pipeline" = {
-    version = "1.11.0";
+  jquery-ui-rails = {
+    dependencies = ["railties"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1gfygrv4bjpjd2c377lw7xzk1b77rxjyy3w6wl4bq1gkqvyrkx77";
       type = "gem";
-      sha256 = "1yckdlrn4v5d7bgl8mbffax16640pgg9ny693kqi4j7g17vx2q9l";
     };
-    dependencies = [
-      "activesupport"
-      "nokogiri"
-    ];
+    version = "5.0.5";
   };
-  "http-cookie" = {
-    version = "1.0.2";
+  jquery-turbolinks = {
+    dependencies = ["railties" "turbolinks"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1d23mnl3lgamk9ziw4yyv2ixck6d8s8xp4f9pmwimk0by0jq7xhc";
       type = "gem";
-      sha256 = "0cz2fdkngs3jc5w32a6xcl511hy03a7zdiy988jk1sf3bf5v3hdw";
     };
-    dependencies = [
-      "domain_name"
-    ];
+    version = "2.1.0";
+  };
+  jquery-scrollto-rails = {
+    dependencies = ["railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12ic0zxw60ryglm1qjq5ralqd6k4jawmjj7kqnp1nkqds2nvinvp";
+      type = "gem";
+    };
+    version = "1.4.3";
+  };
+  jquery-rails = {
+    dependencies = ["rails-dom-testing" "railties" "thor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "028dv2n0r2r8qj1bqcbzmih0hwzh5km6cvscn2808v5gd44z48r1";
+      type = "gem";
+    };
+    version = "4.0.5";
+  };
+  jquery-atwho-rails = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0g8239cddyi48i5n0hq2acg9k7n7jilhby9g36zd19mwqyia16w9";
+      type = "gem";
+    };
+    version = "1.3.2";
+  };
+  ipaddress = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0sl0ldvhd6j0qbwhz18w24qy65mdj448b2vhgh2cwn7xrkksmv9l";
+      type = "gem";
+    };
+    version = "0.8.2";
+  };
+  influxdb = {
+    dependencies = ["cause" "json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vhg5nd88nwvfa76lqcczld916nljswwq6clsixrzi3js8ym9y1w";
+      type = "gem";
+    };
+    version = "0.2.3";
+  };
+  inflecto = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "085l5axmvqw59mw5jg454a3m3gr67ckq9405a075isdsn7bm3sp4";
+      type = "gem";
+    };
+    version = "0.0.2";
+  };
+  ice_nine = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0i674zq0hl6rd0wcd12ni38linfja4k0y3mk5barjb4a6f7rcmkd";
+      type = "gem";
+    };
+    version = "0.11.1";
+  };
+  i18n = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758";
+      type = "gem";
+    };
+    version = "0.7.0";
+  };
+  httpclient = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0k6bqsaqq6c824vrbfb5pkz8bpk565zikd10w85rzj2dy809ik6c";
+      type = "gem";
+    };
+    version = "2.7.0.1";
+  };
+  httparty = {
+    dependencies = ["json" "multi_xml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0c9gvg6dqw2h3qyaxhrq1pzm6r69zfcmfh038wyhisqsd39g9hr2";
+      type = "gem";
+    };
+    version = "0.13.7";
   };
   "http_parser.rb" = {
-    version = "0.5.3";
     source = {
-      type = "gem";
+      remotes = ["https://rubygems.org"];
       sha256 = "0fwf5d573j1sw52kz057dw0nx2wlivczmx6ybf6mk065n5g54kyn";
-    };
-  };
-  "httparty" = {
-    version = "0.13.5";
-    source = {
-      type = "gem";
-      sha256 = "1m93fbpwydzzwhc2zf2qkj6lrbcabpy7xhx7wb2mnbmgh0fs7ff9";
-    };
-    dependencies = [
-      "json"
-      "multi_xml"
-    ];
-  };
-  "httpclient" = {
-    version = "2.6.0.1";
-    source = {
-      type = "gem";
-      sha256 = "0haz4s9xnzr73mkfpgabspj43bhfm9znmpmgdk74n6gih1xlrx1l";
-    };
-  };
-  "i18n" = {
-    version = "0.7.0";
-    source = {
-      type = "gem";
-      sha256 = "1i5z1ykl8zhszsxcs8mzl8d0dxgs3ylz8qlzrw74jb0gplkx6758";
-    };
-  };
-  "ice_cube" = {
-    version = "0.11.1";
-    source = {
-      type = "gem";
-      sha256 = "12y23nczfrgslpfqam90076x603xhlpv3fyh8mv49gks4qn2wk20";
-    };
-  };
-  "ice_nine" = {
-    version = "0.11.1";
-    source = {
-      type = "gem";
-      sha256 = "0i674zq0hl6rd0wcd12ni38linfja4k0y3mk5barjb4a6f7rcmkd";
-    };
-  };
-  "inflecto" = {
-    version = "0.0.2";
-    source = {
-      type = "gem";
-      sha256 = "085l5axmvqw59mw5jg454a3m3gr67ckq9405a075isdsn7bm3sp4";
-    };
-  };
-  "ipaddress" = {
-    version = "0.8.0";
-    source = {
-      type = "gem";
-      sha256 = "0cwy4pyd9nl2y2apazp3hvi12gccj5a3ify8mi8k3knvxi5wk2ir";
-    };
-  };
-  "jquery-atwho-rails" = {
-    version = "1.0.1";
-    source = {
-      type = "gem";
-      sha256 = "0fdy4dxfvnzrjbfm45yrnwfczszvnd7psqhnkby0j3qjg8k9xhzw";
-    };
-  };
-  "jquery-rails" = {
-    version = "3.1.3";
-    source = {
-      type = "gem";
-      sha256 = "1n07rj1x7l61wygbjdpknv5nxhbg2iybfgkpdgca2kj6c1nb1d87";
-    };
-    dependencies = [
-      "railties"
-      "thor"
-    ];
-  };
-  "jquery-scrollto-rails" = {
-    version = "1.4.3";
-    source = {
-      type = "gem";
-      sha256 = "12ic0zxw60ryglm1qjq5ralqd6k4jawmjj7kqnp1nkqds2nvinvp";
-    };
-    dependencies = [
-      "railties"
-    ];
-  };
-  "jquery-turbolinks" = {
-    version = "2.0.2";
-    source = {
-      type = "gem";
-      sha256 = "1plip56znrkq3na5bjys5q2zvlbyj8p8i29kaayzfpi2c4ixxaq3";
-    };
-    dependencies = [
-      "railties"
-      "turbolinks"
-    ];
-  };
-  "jquery-ui-rails" = {
-    version = "4.2.1";
-    source = {
-      type = "gem";
-      sha256 = "1garrnqwh35acj2pp4sp6fpm2g881h23y644lzbic2qmcrq9wd2v";
-    };
-    dependencies = [
-      "railties"
-    ];
-  };
-  "json" = {
-    version = "1.8.3";
-    source = {
-      type = "gem";
-      sha256 = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc";
-    };
-  };
-  "jwt" = {
-    version = "1.5.1";
-    source = {
-      type = "gem";
-      sha256 = "13b5ccknrmxnb6dk7vlmnb05za1xxyqd8dzb6lpqq503wpfrmlyk";
-    };
-  };
-  "kaminari" = {
-    version = "0.15.1";
-    source = {
-      type = "gem";
-      sha256 = "1m67ghp55hr16k1njhd00f225qys67n60qa3jz69kzqvrp6qg33d";
-    };
-    dependencies = [
-      "actionpack"
-      "activesupport"
-    ];
-  };
-  "kgio" = {
-    version = "2.9.3";
-    source = {
-      type = "gem";
-      sha256 = "07gl0drxwckj7kbq5nla2lf81lrrrvirvvdcrykjgivysfg6yp5v";
-    };
-  };
-  "launchy" = {
-    version = "2.4.3";
-    source = {
-      type = "gem";
-      sha256 = "190lfbiy1vwxhbgn4nl4dcbzxvm049jwc158r2x7kq3g5khjrxa2";
-    };
-    dependencies = [
-      "addressable"
-    ];
-  };
-  "letter_opener" = {
-    version = "1.1.2";
-    source = {
-      type = "gem";
-      sha256 = "1kzbmc686hfh4jznyckq6g40kn14nhb71znsjjm0rc13nb3n0c5l";
-    };
-    dependencies = [
-      "launchy"
-    ];
-  };
-  "listen" = {
-    version = "2.10.1";
-    source = {
-      type = "gem";
-      sha256 = "1ipainbx21ni7xakdbksxjim6nixvzfjkifb2d3v45a50dp3diqg";
-    };
-    dependencies = [
-      "celluloid"
-      "rb-fsevent"
-      "rb-inotify"
-    ];
-  };
-  "lumberjack" = {
-    version = "1.0.9";
-    source = {
-      type = "gem";
-      sha256 = "162frm2bwy58pj8ccsdqa4a6i0csrhb9h5l3inhkl1ivgfc8814l";
-    };
-  };
-  "macaddr" = {
-    version = "1.7.1";
-    source = {
-      type = "gem";
-      sha256 = "1clii8mvhmh5lmnm95ljnjygyiyhdpja85c5vy487rhxn52scn0b";
-    };
-    dependencies = [
-      "systemu"
-    ];
-  };
-  "mail" = {
-    version = "2.6.3";
-    source = {
-      type = "gem";
-      sha256 = "1nbg60h3cpnys45h7zydxwrl200p7ksvmrbxnwwbpaaf9vnf3znp";
-    };
-    dependencies = [
-      "mime-types"
-    ];
-  };
-  "mail_room" = {
-    version = "0.5.2";
-    source = {
-      type = "gem";
-      sha256 = "1l8ncfwqiiv3nd7i0237xd5ymshgyfxfv4w2bj0lj67ys3l4qwh3";
-    };
-  };
-  "method_source" = {
-    version = "0.8.2";
-    source = {
-      type = "gem";
-      sha256 = "1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2";
-    };
-  };
-  "mime-types" = {
-    version = "1.25.1";
-    source = {
-      type = "gem";
-      sha256 = "0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8";
-    };
-  };
-  "mimemagic" = {
-    version = "0.3.0";
-    source = {
-      type = "gem";
-      sha256 = "101lq4bnjs7ywdcicpw3vbz9amg5gbb4va1626fybd2hawgdx8d9";
-    };
-  };
-  "mini_portile" = {
-    version = "0.6.2";
-    source = {
-      type = "gem";
-      sha256 = "0h3xinmacscrnkczq44s6pnhrp4nqma7k056x5wv5xixvf2wsq2w";
-    };
-  };
-  "minitest" = {
-    version = "5.7.0";
-    source = {
-      type = "gem";
-      sha256 = "0rxqfakp629mp3vwda7zpgb57lcns5znkskikbfd0kriwv8i1vq8";
-    };
-  };
-  "mousetrap-rails" = {
-    version = "1.4.6";
-    source = {
-      type = "gem";
-      sha256 = "00n13r5pwrk4vq018128vcfh021dw0fa2bk4pzsv0fslfm8ayp2m";
-    };
-  };
-  "multi_json" = {
-    version = "1.11.2";
-    source = {
-      type = "gem";
-      sha256 = "1rf3l4j3i11lybqzgq2jhszq7fh7gpmafjzd14ymp9cjfxqg596r";
-    };
-  };
-  "multi_xml" = {
-    version = "0.5.5";
-    source = {
-      type = "gem";
-      sha256 = "0i8r7dsz4z79z3j023l8swan7qpbgxbwwz11g38y2vjqjk16v4q8";
-    };
-  };
-  "multipart-post" = {
-    version = "1.2.0";
-    source = {
-      type = "gem";
-      sha256 = "12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc";
-    };
-  };
-  "mysql2" = {
-    version = "0.3.20";
-    source = {
-      type = "gem";
-      sha256 = "0n075x14n9kziv0qdxqlzhf3j1abi1w6smpakfpsg4jbr8hnn5ip";
-    };
-  };
-  "nenv" = {
-    version = "0.2.0";
-    source = {
-      type = "gem";
-      sha256 = "152wxwri0afwgnxdf93gi6wjl9rr5z7vwp8ln0gpa3rddbfc27s6";
-    };
-  };
-  "nested_form" = {
-    version = "0.3.2";
-    source = {
-      type = "gem";
-      sha256 = "0f053j4zfagxyym28msxj56hrpvmyv4lzxy2c5c270f7xbbnii5i";
-    };
-  };
-  "net-ldap" = {
-    version = "0.11";
-    source = {
-      type = "gem";
-      sha256 = "1xfq94lmc5mcc5giipxn9bmrsm9ny1xc1rp0xpm2pgqwr2q8fm7w";
-    };
-  };
-  "net-scp" = {
-    version = "1.2.1";
-    source = {
-      type = "gem";
-      sha256 = "0b0jqrcsp4bbi4n4mzyf70cp2ysyp6x07j8k8cqgxnvb4i3a134j";
-    };
-    dependencies = [
-      "net-ssh"
-    ];
-  };
-  "net-ssh" = {
-    version = "2.9.2";
-    source = {
-      type = "gem";
-      sha256 = "1p0bj41zrmw5lhnxlm1pqb55zfz9y4p9fkrr9a79nrdmzrk1ph8r";
-    };
-  };
-  "netrc" = {
-    version = "0.10.3";
-    source = {
-      type = "gem";
-      sha256 = "1r6cmg1nvxspl24yrqn77vx7xjqigpypialblpcv5qj6xmc4b8lg";
-    };
-  };
-  "newrelic-grape" = {
-    version = "2.0.0";
-    source = {
-      type = "gem";
-      sha256 = "1j8cdlc8lvbh2c2drdq0kfrjbw9bkgqx3qiiizzaxv6yj70vq58a";
-    };
-    dependencies = [
-      "grape"
-      "newrelic_rpm"
-    ];
-  };
-  "newrelic_rpm" = {
-    version = "3.9.4.245";
-    source = {
-      type = "gem";
-      sha256 = "0r1x16wwmiqsf1gj2a1lgc0fq1v0x4yv40k5wgb00gs439vgzyin";
-    };
-  };
-  "nokogiri" = {
-    version = "1.6.6.2";
-    source = {
-      type = "gem";
-      sha256 = "1j4qv32qjh67dcrc1yy1h8sqjnny8siyy4s44awla8d6jk361h30";
-    };
-    dependencies = [
-      "mini_portile"
-    ];
-  };
-  "notiffany" = {
-    version = "0.0.7";
-    source = {
-      type = "gem";
-      sha256 = "1v5x1w59qq85r6dpv3y9ga34dfd7hka1qxyiykaw7gm0i6kggbhi";
-    };
-    dependencies = [
-      "nenv"
-      "shellany"
-    ];
-  };
-  "nprogress-rails" = {
-    version = "0.1.2.3";
-    source = {
-      type = "gem";
-      sha256 = "16gqajynqzfvzcyc8b9bjn8xf6j7y80li00ajicxwvb6my2ag304";
-    };
-  };
-  "oauth" = {
-    version = "0.4.7";
-    source = {
-      type = "gem";
-      sha256 = "1k5j09p3al3clpjl6lax62qmhy43f3j3g7i6f9l4dbs6r5vpv95w";
-    };
-  };
-  "oauth2" = {
-    version = "1.0.0";
-    source = {
-      type = "gem";
-      sha256 = "0zaa7qnvizv363apmxx9vxa8f6c6xy70z0jm0ydx38xvhxr8898r";
-    };
-    dependencies = [
-      "faraday"
-      "jwt"
-      "multi_json"
-      "multi_xml"
-      "rack"
-    ];
-  };
-  "octokit" = {
-    version = "3.7.1";
-    source = {
-      type = "gem";
-      sha256 = "1sd6cammv5m96640vdb8yp3kfpzn52s8y7d77dgsfb25bc1jg4xl";
-    };
-    dependencies = [
-      "sawyer"
-    ];
-  };
-  "omniauth" = {
-    version = "1.2.2";
-    source = {
-      type = "gem";
-      sha256 = "1f0hd9ngfb6f8wz8h2r5n8lr99jqjaghn0h2mljdc6fw031ap7lk";
-    };
-    dependencies = [
-      "hashie"
-      "rack"
-    ];
-  };
-  "omniauth-bitbucket" = {
-    version = "0.0.2";
-    source = {
-      type = "gem";
-      sha256 = "1lals2z1yixffrc97zh7zn1jpz9l6vpb3alcp13im42dq9q0g845";
-    };
-    dependencies = [
-      "multi_json"
-      "omniauth"
-      "omniauth-oauth"
-    ];
-  };
-  "omniauth-github" = {
-    version = "1.1.2";
-    source = {
-      type = "gem";
-      sha256 = "1mbx3c8m1llhdxrqdciq8jh428bxj1nvf4yhziv2xqmqpjcqz617";
-    };
-    dependencies = [
-      "omniauth"
-      "omniauth-oauth2"
-    ];
-  };
-  "omniauth-gitlab" = {
-    version = "1.0.0";
-    source = {
-      type = "gem";
-      sha256 = "1amg3y0ivfakamfwiljgla1vff59b116nd0i6khmaj4jsa4s81hw";
-    };
-    dependencies = [
-      "omniauth"
-      "omniauth-oauth2"
-    ];
-  };
-  "omniauth-google-oauth2" = {
-    version = "0.2.6";
-    source = {
-      type = "gem";
-      sha256 = "1nba1iy6w2wj79pvnp9r5bw7jhks0287lw748vkxl9xmwccldnhj";
-    };
-    dependencies = [
-      "omniauth"
-      "omniauth-oauth2"
-    ];
-  };
-  "omniauth-kerberos" = {
-    version = "0.2.0";
-    source = {
-      type = "gem";
-      sha256 = "1s626nxzq8i6gy67pkh04h8hlmmx4vwpc36sbdsgm1xwyj3hrn1b";
-    };
-    dependencies = [
-      "omniauth-multipassword"
-      "timfel-krb5-auth"
-    ];
-  };
-  "omniauth-multipassword" = {
-    version = "0.4.2";
-    source = {
-      type = "gem";
-      sha256 = "0qykp76hw80lkgb39hyzrv68hkbivc8cv0vbvrnycjh9fwfp1lv8";
-    };
-    dependencies = [
-      "omniauth"
-    ];
-  };
-  "omniauth-oauth" = {
-    version = "1.1.0";
-    source = {
-      type = "gem";
-      sha256 = "1n5vk4by7hkyc09d9blrw2argry5awpw4gbw1l4n2s9b3j4qz037";
-    };
-    dependencies = [
-      "oauth"
-      "omniauth"
-    ];
-  };
-  "omniauth-oauth2" = {
-    version = "1.3.1";
-    source = {
-      type = "gem";
-      sha256 = "0mskwlw5ibx9mz7ywqji6mm56ikf7mglbnfc02qhg6ry527jsxdm";
-    };
-    dependencies = [
-      "oauth2"
-      "omniauth"
-    ];
-  };
-  "omniauth-saml" = {
-    version = "1.4.1";
-    source = {
-      type = "gem";
-      sha256 = "12jkjdrkc3k2k1y53vfxyicdq2j0djhln6apwzmc10h9jhq23nrq";
-    };
-    dependencies = [
-      "omniauth"
-      "ruby-saml"
-    ];
-  };
-  "omniauth-shibboleth" = {
-    version = "1.1.2";
-    source = {
-      type = "gem";
-      sha256 = "0wy24hwsipjx8iswdbrncgv15qxv7ibg07rv2n6byi037mrnhnhw";
-    };
-    dependencies = [
-      "omniauth"
-    ];
-  };
-  "omniauth-twitter" = {
-    version = "1.0.1";
-    source = {
-      type = "gem";
-      sha256 = "060gnfc9im786llgi7vlrfhar1b7jlk19bjjc5d50lwrah0hh4fd";
-    };
-    dependencies = [
-      "multi_json"
-      "omniauth-oauth"
-    ];
-  };
-  "omniauth_crowd" = {
-    version = "2.2.3";
-    source = {
-      type = "gem";
-      sha256 = "12g5ck05h6kr9mnp870x8pkxsadg81ca70hg8n3k8xx007lfw2q7";
-    };
-    dependencies = [
-      "activesupport"
-      "nokogiri"
-      "omniauth"
-    ];
-  };
-  "opennebula" = {
-    version = "4.12.1";
-    source = {
-      type = "gem";
-      sha256 = "1y2k706mcxf69cviy415icnhdz7ll5nld9iksqdg4asp60gybq3k";
-    };
-    dependencies = [
-      "json"
-      "nokogiri"
-      "rbvmomi"
-    ];
-  };
-  "org-ruby" = {
-    version = "0.9.12";
-    source = {
-      type = "gem";
-      sha256 = "0x69s7aysfiwlcpd9hkvksfyld34d8kxr62adb59vjvh8hxfrjwk";
-    };
-    dependencies = [
-      "rubypants"
-    ];
-  };
-  "orm_adapter" = {
-    version = "0.5.0";
-    source = {
-      type = "gem";
-      sha256 = "1fg9jpjlzf5y49qs9mlpdrgs5rpcyihq1s4k79nv9js0spjhnpda";
-    };
-  };
-  "paranoia" = {
-    version = "2.1.3";
-    source = {
-      type = "gem";
-      sha256 = "1v6izkdf8npwcblzn9zl9ysagih75584d8hpjzhiv0ijz6cw3l92";
-    };
-    dependencies = [
-      "activerecord"
-    ];
-  };
-  "parser" = {
-    version = "2.2.2.6";
-    source = {
-      type = "gem";
-      sha256 = "0rmh4yr5qh87wqgwzbs6vy8wyf248k09m2vfjf9br6jdb5zgj5hh";
-    };
-    dependencies = [
-      "ast"
-    ];
-  };
-  "pg" = {
-    version = "0.18.2";
-    source = {
-      type = "gem";
-      sha256 = "1axxbf6ij1iqi3i1r3asvjc80b0py5bz0m2wy5kdi5xkrpr82kpf";
-    };
-  };
-  "poltergeist" = {
-    version = "1.6.0";
-    source = {
-      type = "gem";
-      sha256 = "0mpy2yhn0bhm2s78h8wy22j6378vvsdkj5pcvhr2zfhdjf46g41d";
-    };
-    dependencies = [
-      "capybara"
-      "cliver"
-      "multi_json"
-      "websocket-driver"
-    ];
-  };
-  "posix-spawn" = {
-    version = "0.3.11";
-    source = {
-      type = "gem";
-      sha256 = "052lnxbkvlnwfjw4qd7vn2xrlaaqiav6f5x5bcjin97bsrfq6cmr";
-    };
-  };
-  "powerpack" = {
-    version = "0.0.9";
-    source = {
-      type = "gem";
-      sha256 = "0gflp6d2dc4jz3kgg8v4pdzm3qr2bbdygr83dbsi69pxm2gy5536";
-    };
-  };
-  "pry" = {
-    version = "0.10.1";
-    source = {
-      type = "gem";
-      sha256 = "1j0r5fm0wvdwzbh6d6apnp7c0n150hpm9zxpm5xvcgfqr36jaj8z";
-    };
-    dependencies = [
-      "coderay"
-      "method_source"
-      "slop"
-    ];
-  };
-  "pry-rails" = {
-    version = "0.3.4";
-    source = {
-      type = "gem";
-      sha256 = "0a2iinvabis2xmv0z7z7jmh7bbkkngxj2qixfdg5m6qj9x8k1kx6";
-    };
-    dependencies = [
-      "pry"
-    ];
-  };
-  "pyu-ruby-sasl" = {
-    version = "0.0.3.3";
-    source = {
-      type = "gem";
-      sha256 = "1rcpjiz9lrvyb3rd8k8qni0v4ps08psympffyldmmnrqayyad0sn";
-    };
-  };
-  "quiet_assets" = {
-    version = "1.0.3";
-    source = {
-      type = "gem";
-      sha256 = "1q4azw4j1xsgd7qwcig110mfdn1fm0y34y87zw9j9v187xr401b1";
-    };
-    dependencies = [
-      "railties"
-    ];
-  };
-  "rack" = {
-    version = "1.5.5";
-    source = {
-      type = "gem";
-      sha256 = "1ds3gh8m5gy0d2k4g12k67qid7magg1ia186872yq22ham7sgr2a";
-    };
-  };
-  "rack-accept" = {
-    version = "0.4.5";
-    source = {
-      type = "gem";
-      sha256 = "18jdipx17b4ki33cfqvliapd31sbfvs4mv727awynr6v95a7n936";
-    };
-    dependencies = [
-      "rack"
-    ];
-  };
-  "rack-attack" = {
-    version = "4.3.0";
-    source = {
-      type = "gem";
-      sha256 = "06v5xvp33aysf8hkl9lwl1yjkc82jdlvcm2361y7ckjgykf8ixfr";
-    };
-    dependencies = [
-      "rack"
-    ];
-  };
-  "rack-cors" = {
-    version = "0.2.9";
-    source = {
-      type = "gem";
-      sha256 = "0z88pbbasr86z6h0965cny0gvrnj7zwv31s506xbpivk4vd6n9as";
-    };
-  };
-  "rack-mini-profiler" = {
-    version = "0.9.7";
-    source = {
-      type = "gem";
-      sha256 = "03lz6x1s8rbrccfsxl2rq677zqkmkvzv7whbmwzdp71zzyvvm14j";
-    };
-    dependencies = [
-      "rack"
-    ];
-  };
-  "rack-mount" = {
-    version = "0.8.3";
-    source = {
-      type = "gem";
-      sha256 = "09a1qfaxxsll1kbgz7z0q0nr48sfmfm7akzaviis5bjpa5r00ld2";
-    };
-    dependencies = [
-      "rack"
-    ];
-  };
-  "rack-oauth2" = {
-    version = "1.0.10";
-    source = {
-      type = "gem";
-      sha256 = "1srg4hdnyn6bwx225snyq7flb0cn96ppdvicwls6qvp6i4n91k36";
-    };
-    dependencies = [
-      "activesupport"
-      "attr_required"
-      "httpclient"
-      "multi_json"
-      "rack"
-    ];
-  };
-  "rack-protection" = {
-    version = "1.5.3";
-    source = {
-      type = "gem";
-      sha256 = "0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r";
-    };
-    dependencies = [
-      "rack"
-    ];
-  };
-  "rack-test" = {
-    version = "0.6.3";
-    source = {
-      type = "gem";
-      sha256 = "0h6x5jq24makgv2fq5qqgjlrk74dxfy62jif9blk43llw8ib2q7z";
-    };
-    dependencies = [
-      "rack"
-    ];
-  };
-  "rails" = {
-    version = "4.1.12";
-    source = {
-      type = "gem";
-      sha256 = "0k2n6y92gmysk8y6j1hy6av53f07hhzkhw41qfqwr2hgqc6q8idv";
-    };
-    dependencies = [
-      "actionmailer"
-      "actionpack"
-      "actionview"
-      "activemodel"
-      "activerecord"
-      "activesupport"
-      "railties"
-      "sprockets-rails"
-    ];
-  };
-  "rails-observers" = {
-    version = "0.1.2";
-    source = {
-      type = "gem";
-      sha256 = "1lsw19jzmvipvrfy2z04hi7r29dvkfc43h43vs67x6lsj9rxwwcy";
-    };
-    dependencies = [
-      "activemodel"
-    ];
-  };
-  "railties" = {
-    version = "4.1.12";
-    source = {
-      type = "gem";
-      sha256 = "0v16grd6ip3ijiz1v36myiirqx9fx004lfvnsmh28b2ddjxcci4q";
-    };
-    dependencies = [
-      "actionpack"
-      "activesupport"
-      "rake"
-      "thor"
-    ];
-  };
-  "rainbow" = {
-    version = "2.0.0";
-    source = {
-      type = "gem";
-      sha256 = "0dsnzfjiih2w8npsjab3yx1ssmmvmgjkbxny0i9yzrdy7whfw7b4";
-    };
-  };
-  "raindrops" = {
-    version = "0.15.0";
-    source = {
-      type = "gem";
-      sha256 = "1hv0xhr762axywr937czi92fs0x3zk7k22vg6f4i7rr8d05sp560";
-    };
-  };
-  "rake" = {
-    version = "10.4.2";
-    source = {
-      type = "gem";
-      sha256 = "1rn03rqlf1iv6n87a78hkda2yqparhhaivfjpizblmxvlw2hk5r8";
-    };
-  };
-  "raphael-rails" = {
-    version = "2.1.2";
-    source = {
-      type = "gem";
-      sha256 = "0sjiaymvfn4al5dr1pza5i142byan0fxnj4rymziyql2bzvdm2bc";
-    };
-  };
-  "rb-fsevent" = {
-    version = "0.9.5";
-    source = {
-      type = "gem";
-      sha256 = "1p4rz4qqarl7xg2aldpra54h81yal93cbxdy02lmb9kf6f7y2fz4";
-    };
-  };
-  "rb-inotify" = {
-    version = "0.9.5";
-    source = {
-      type = "gem";
-      sha256 = "0kddx2ia0qylw3r52nhg83irkaclvrncgy2m1ywpbhlhsz1rymb9";
-    };
-    dependencies = [
-      "ffi"
-    ];
-  };
-  "rbvmomi" = {
-    version = "1.8.2";
-    source = {
-      type = "gem";
-      sha256 = "0gjbfazl2q42m1m51nvv14q7y5lbya272flmvhpqvg5z10nbxanj";
-    };
-    dependencies = [
-      "builder"
-      "nokogiri"
-      "trollop"
-    ];
-  };
-  "rdoc" = {
-    version = "3.12.2";
-    source = {
-      type = "gem";
-      sha256 = "1v9k4sp5yzj2bshngckdvivj6bszciskk1nd2r3wri2ygs7vgqm8";
-    };
-    dependencies = [
-      "json"
-    ];
-  };
-  "redcarpet" = {
-    version = "3.3.2";
-    source = {
-      type = "gem";
-      sha256 = "1xf95nrc8jgv9hjzjnbf3ljwmp29rqxdamyj9crza2czl4k63rnm";
-    };
-  };
-  "redis" = {
-    version = "3.2.1";
-    source = {
-      type = "gem";
-      sha256 = "16jzlqp80qiqg5cdc9l144n6k3c5qj9if4pgij87sscn8ahi993k";
-    };
-  };
-  "redis-actionpack" = {
-    version = "4.0.0";
-    source = {
-      type = "gem";
-      sha256 = "0mad0v3qanw3xi9zs03f4w8sn1qb3x501k3235ck8m5i8vgjk474";
-    };
-    dependencies = [
-      "actionpack"
-      "redis-rack"
-      "redis-store"
-    ];
-  };
-  "redis-activesupport" = {
-    version = "4.1.1";
-    source = {
-      type = "gem";
-      sha256 = "1xciffiqbhksy534sysdd8pgn2hlvyrs1qb4x1kbcx9f3f83y551";
-    };
-    dependencies = [
-      "activesupport"
-      "redis-store"
-    ];
-  };
-  "redis-namespace" = {
-    version = "1.5.2";
-    source = {
-      type = "gem";
-      sha256 = "0rp8gfkznfxqzxk9s976k71jnljkh0clkrhnp6vgx46s5yhj9g25";
-    };
-    dependencies = [
-      "redis"
-    ];
-  };
-  "redis-rack" = {
-    version = "1.5.0";
-    source = {
-      type = "gem";
-      sha256 = "1y1mxx8gn0krdrpwllv7fqsbvki1qjnb2dz8b4q9gwc326829gk8";
-    };
-    dependencies = [
-      "rack"
-      "redis-store"
-    ];
-  };
-  "redis-rails" = {
-    version = "4.0.0";
-    source = {
-      type = "gem";
-      sha256 = "0igww7hb58aq74mh50dli3zjg78b54y8nhd0h1h9vz4vgjd4q8m7";
-    };
-    dependencies = [
-      "redis-actionpack"
-      "redis-activesupport"
-      "redis-store"
-    ];
-  };
-  "redis-store" = {
-    version = "1.1.6";
-    source = {
-      type = "gem";
-      sha256 = "1x8pfpd6c3xxb3l9nyggi9qpgxcp9k9rkdwwl80m95lhynwaxcds";
-    };
-    dependencies = [
-      "redis"
-    ];
-  };
-  "request_store" = {
-    version = "1.2.0";
-    source = {
-      type = "gem";
-      sha256 = "1s7lk5klbg2qfh8hgqymjrlwgpmjmfx03x1hniq16shd1cjwch45";
-    };
-  };
-  "rerun" = {
-    version = "0.10.0";
-    source = {
-      type = "gem";
-      sha256 = "0hsw0q0wriz4h55hkm9yd313hqixgsgnp4wrl8v4k4zwz41j76xk";
-    };
-    dependencies = [
-      "listen"
-    ];
-  };
-  "responders" = {
-    version = "1.1.2";
-    source = {
-      type = "gem";
-      sha256 = "178279kf1kaah917r6zwzw5kk9swj28yxmg6aqffna7789kjhy3f";
-    };
-    dependencies = [
-      "railties"
-    ];
-  };
-  "rest-client" = {
-    version = "1.8.0";
-    source = {
-      type = "gem";
-      sha256 = "1m8z0c4yf6w47iqz6j2p7x1ip4qnnzvhdph9d5fgx081cvjly3p7";
-    };
-    dependencies = [
-      "http-cookie"
-      "mime-types"
-      "netrc"
-    ];
-  };
-  "rinku" = {
-    version = "1.7.3";
-    source = {
-      type = "gem";
-      sha256 = "1jh6nys332brph55i6x6cil6swm086kxjw34wq131nl6mwryqp7b";
-    };
-  };
-  "rotp" = {
-    version = "2.1.1";
-    source = {
-      type = "gem";
-      sha256 = "1nzsc9hfxijnyzjbv728ln9dm80bc608chaihjdk63i2wi4m529g";
-    };
-  };
-  "rouge" = {
-    version = "1.10.1";
-    source = {
-      type = "gem";
-      sha256 = "0wp8as9ypdy18kdj9h70kny1rdfq71mr8cj2bpahr9vxjjvjasqz";
-    };
-  };
-  "rqrcode" = {
-    version = "0.7.0";
-    source = {
-      type = "gem";
-      sha256 = "188n1mvc7klrlw30bai16sdg4yannmy7cz0sg0nvm6f1kjx5qflb";
-    };
-    dependencies = [
-      "chunky_png"
-    ];
-  };
-  "rqrcode-rails3" = {
-    version = "0.1.7";
-    source = {
-      type = "gem";
-      sha256 = "1i28rwmj24ssk91chn0g7qsnvn003y3s5a7jsrg3w4l5ckr841bg";
-    };
-    dependencies = [
-      "rqrcode"
-    ];
-  };
-  "rspec" = {
-    version = "3.3.0";
-    source = {
-      type = "gem";
-      sha256 = "1bn5zs71agc0zyns2r3c8myi5bxw3q7xnzp7f3v5b7hbil1qym4r";
-    };
-    dependencies = [
-      "rspec-core"
-      "rspec-expectations"
-      "rspec-mocks"
-    ];
-  };
-  "rspec-core" = {
-    version = "3.3.2";
-    source = {
-      type = "gem";
-      sha256 = "0xw5qi936j6nz9fixi2mwy03f406761cd72bzyvd61pr854d7hy1";
-    };
-    dependencies = [
-      "rspec-support"
-    ];
-  };
-  "rspec-expectations" = {
-    version = "3.3.1";
-    source = {
-      type = "gem";
-      sha256 = "1d0b5hpkxlr9f3xpsbhvl3irnk4smmycx2xnmc8qv3pqaa7mb7ah";
-    };
-    dependencies = [
-      "diff-lcs"
-      "rspec-support"
-    ];
-  };
-  "rspec-mocks" = {
-    version = "3.3.2";
-    source = {
-      type = "gem";
-      sha256 = "1lfbzscmpyixlbapxmhy2s69596vs1z00lv590l51hgdw70z92vg";
-    };
-    dependencies = [
-      "diff-lcs"
-      "rspec-support"
-    ];
-  };
-  "rspec-rails" = {
-    version = "3.3.3";
-    source = {
-      type = "gem";
-      sha256 = "0m66n9p3a7d3fmrzkbh8312prb6dhrgmp53g1amck308ranasv2a";
-    };
-    dependencies = [
-      "actionpack"
-      "activesupport"
-      "railties"
-      "rspec-core"
-      "rspec-expectations"
-      "rspec-mocks"
-      "rspec-support"
-    ];
-  };
-  "rspec-support" = {
-    version = "3.3.0";
-    source = {
-      type = "gem";
-      sha256 = "1cyagig8slxjas8mbg5f8bl240b8zgr8mnjsvrznag1fwpkh4h27";
-    };
-  };
-  "rubocop" = {
-    version = "0.28.0";
-    source = {
-      type = "gem";
-      sha256 = "07n4gha1dp1n15np5v8p58980lsiys3wa9h39lrvnzxgq18m3c4d";
-    };
-    dependencies = [
-      "astrolabe"
-      "parser"
-      "powerpack"
-      "rainbow"
-      "ruby-progressbar"
-    ];
-  };
-  "ruby-fogbugz" = {
-    version = "0.2.1";
-    source = {
-      type = "gem";
-      sha256 = "1jj0gpkycbrivkh2q3429vj6mbgx6axxisg69slj3c4mgvzfgchm";
-    };
-    dependencies = [
-      "crack"
-    ];
-  };
-  "ruby-progressbar" = {
-    version = "1.7.5";
-    source = {
-      type = "gem";
-      sha256 = "0hynaavnqzld17qdx9r7hfw00y16ybldwq730zrqfszjwgi59ivi";
-    };
-  };
-  "ruby-saml" = {
-    version = "1.0.0";
-    source = {
-      type = "gem";
-      sha256 = "0hqn49ca2ln5ybc77vpm1vs0szk3pyrz3hnbkbqrkp864mniisi4";
-    };
-    dependencies = [
-      "nokogiri"
-      "uuid"
-    ];
-  };
-  "ruby2ruby" = {
-    version = "2.1.4";
-    source = {
-      type = "gem";
-      sha256 = "1h0bwjivcsazfd9j9phs640xxqwgvggj9kmafin88ahf7j77spim";
-    };
-    dependencies = [
-      "ruby_parser"
-      "sexp_processor"
-    ];
-  };
-  "ruby_parser" = {
-    version = "3.5.0";
-    source = {
-      type = "gem";
-      sha256 = "1l1lzbn5ywfsg8m8cvxwb415p1816ikvjqnsh5as9h4g1vcknw3y";
-    };
-    dependencies = [
-      "sexp_processor"
-    ];
-  };
-  "rubyntlm" = {
-    version = "0.5.2";
-    source = {
-      type = "gem";
-      sha256 = "04l8686hl0829x4acsnbz0licf8n6794p7shz8iyahin1jnqg3d7";
-    };
-  };
-  "rubypants" = {
-    version = "0.2.0";
-    source = {
-      type = "gem";
-      sha256 = "1vpdkrc4c8qhrxph41wqwswl28q5h5h994gy4c1mlrckqzm3hzph";
-    };
-  };
-  "rugged" = {
-    version = "0.22.2";
-    source = {
-      type = "gem";
-      sha256 = "179pnnvlsrwd96csmhwhy45y4f5p7qh3xcbg6v3hdv5m9qqcirpp";
-    };
-  };
-  "safe_yaml" = {
-    version = "1.0.4";
-    source = {
-      type = "gem";
-      sha256 = "1hly915584hyi9q9vgd968x2nsi5yag9jyf5kq60lwzi5scr7094";
-    };
-  };
-  "sanitize" = {
-    version = "2.1.0";
-    source = {
-      type = "gem";
-      sha256 = "0xsv6xqrlz91rd8wifjknadbl3z5h6qphmxy0hjb189qbdghggn3";
-    };
-    dependencies = [
-      "nokogiri"
-    ];
-  };
-  "sass" = {
-    version = "3.2.19";
-    source = {
-      type = "gem";
-      sha256 = "1b5z55pmban9ry7k572ghmpcz9h04nbrdhdfpcz8zaldv5v7vkfx";
-    };
-  };
-  "sass-rails" = {
-    version = "4.0.5";
-    source = {
-      type = "gem";
-      sha256 = "1nw78ijbxpaf0pdr6c0jx63nna1l9m8s1mmb4m3g2clx0i0xm4wb";
-    };
-    dependencies = [
-      "railties"
-      "sass"
-      "sprockets"
-      "sprockets-rails"
-    ];
-  };
-  "sawyer" = {
-    version = "0.6.0";
-    source = {
-      type = "gem";
-      sha256 = "0fk43bzwn816qj1ksiicm2i1kmzv5675cmnvk57kmfmi4rfsyjpy";
-    };
-    dependencies = [
-      "addressable"
-      "faraday"
-    ];
-  };
-  "sdoc" = {
-    version = "0.3.20";
-    source = {
-      type = "gem";
-      sha256 = "17l8qk0ld47z4h5avcnylvds8nc6dp25zc64w23z8li2hs341xf2";
-    };
-    dependencies = [
-      "json"
-      "rdoc"
-    ];
-  };
-  "seed-fu" = {
-    version = "2.3.5";
-    source = {
-      type = "gem";
-      sha256 = "11xja82yxir1kwccrzng29h7w911i9j0xj2y7y949yqnw91v12vw";
-    };
-    dependencies = [
-      "activerecord"
-      "activesupport"
-    ];
-  };
-  "select2-rails" = {
-    version = "3.5.9.3";
-    source = {
-      type = "gem";
-      sha256 = "0ni2k74n73y3gv56gs37gkjlh912szjf6k9j483wz41m3xvlz7fj";
-    };
-    dependencies = [
-      "thor"
-    ];
-  };
-  "settingslogic" = {
-    version = "2.0.9";
-    source = {
-      type = "gem";
-      sha256 = "1ria5zcrk1nf0b9yia15mdpzw0dqr6wjpbj8dsdbbps81lfsj9ar";
-    };
-  };
-  "sexp_processor" = {
-    version = "4.6.0";
-    source = {
-      type = "gem";
-      sha256 = "0gxlcpg81wfjf5gpggf8h6l2dbq3ikgavbrr2yfw3m2vqy88yjg2";
-    };
-  };
-  "sham_rack" = {
-    version = "1.3.6";
-    source = {
-      type = "gem";
-      sha256 = "0zs6hpgg87x5jrykjxgfp2i7m5aja53s5kamdhxam16wki1hid3i";
-    };
-    dependencies = [
-      "rack"
-    ];
-  };
-  "shellany" = {
-    version = "0.0.1";
-    source = {
-      type = "gem";
-      sha256 = "1ryyzrj1kxmnpdzhlv4ys3dnl2r5r3d2rs2jwzbnd1v96a8pl4hf";
-    };
-  };
-  "shoulda-matchers" = {
-    version = "2.8.0";
-    source = {
-      type = "gem";
-      sha256 = "0d3ryqcsk1n9y35bx5wxnqbgw4m8b3c79isazdjnnbg8crdp72d0";
-    };
-    dependencies = [
-      "activesupport"
-    ];
-  };
-  "sidekiq" = {
-    version = "3.3.0";
-    source = {
-      type = "gem";
-      sha256 = "0xwy2n4jaja82gw11q1qsqc2jp7hp2asxhfr0gkfb58wj7k5y32l";
-    };
-    dependencies = [
-      "celluloid"
-      "connection_pool"
-      "json"
-      "redis"
-      "redis-namespace"
-    ];
-  };
-  "sidetiq" = {
-    version = "0.6.3";
-    source = {
-      type = "gem";
-      sha256 = "1sylv1nyrn7w3782fh0f5svjqricr53vacf4kkvx3l2azzymc2am";
-    };
-    dependencies = [
-      "celluloid"
-      "ice_cube"
-      "sidekiq"
-    ];
-  };
-  "simple_oauth" = {
-    version = "0.1.9";
-    source = {
-      type = "gem";
-      sha256 = "0bb06p88xsdw4fxll1ikv5i5k58sl6y323ss0wp1hqjm3xw1jgvj";
-    };
-  };
-  "simplecov" = {
-    version = "0.10.0";
-    source = {
-      type = "gem";
-      sha256 = "1q2iq2vgrdvvla5y907gkmqx6ry2qvnvc7a90hlcbwgp1w0sv6z4";
-    };
-    dependencies = [
-      "docile"
-      "json"
-      "simplecov-html"
-    ];
-  };
-  "simplecov-html" = {
-    version = "0.10.0";
-    source = {
-      type = "gem";
-      sha256 = "1qni8g0xxglkx25w54qcfbi4wjkpvmb28cb7rj5zk3iqynjcdrqf";
-    };
-  };
-  "sinatra" = {
-    version = "1.4.6";
-    source = {
-      type = "gem";
-      sha256 = "1hhmwqc81ram7lfwwziv0z70jh92sj1m7h7s9fr0cn2xq8mmn8l7";
-    };
-    dependencies = [
-      "rack"
-      "rack-protection"
-      "tilt"
-    ];
-  };
-  "six" = {
-    version = "0.2.0";
-    source = {
-      type = "gem";
-      sha256 = "1bhapiyjh5r5qjpclfw8i65plvy6k2q4azr5xir63xqglr53viw3";
-    };
-  };
-  "slack-notifier" = {
-    version = "1.0.0";
-    source = {
-      type = "gem";
-      sha256 = "0v4kd0l83shmk17qb35lighxjq9j7g3slnkrsyiy36kaqcfrjm97";
-    };
-  };
-  "slim" = {
-    version = "2.0.3";
-    source = {
-      type = "gem";
-      sha256 = "1z279vis4z2xsjzf568pxcl2gd1az760ij13d6qzx400mgn7nqxs";
-    };
-    dependencies = [
-      "temple"
-      "tilt"
-    ];
-  };
-  "slop" = {
-    version = "3.6.0";
-    source = {
-      type = "gem";
-      sha256 = "00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n";
-    };
-  };
-  "spinach" = {
-    version = "0.8.10";
-    source = {
-      type = "gem";
-      sha256 = "0phfjs4iw2iqxdaljzwk6qxmi2x86pl3hirmpgw2pgfx76wfx688";
-    };
-    dependencies = [
-      "colorize"
-      "gherkin-ruby"
-      "json"
-    ];
-  };
-  "spinach-rails" = {
-    version = "0.2.1";
-    source = {
-      type = "gem";
-      sha256 = "1nfacfylkncfgi59g2wga6m4nzdcjqb8s50cax4nbx362ap4bl70";
-    };
-    dependencies = [
-      "capybara"
-      "railties"
-      "spinach"
-    ];
-  };
-  "spring" = {
-    version = "1.3.6";
-    source = {
-      type = "gem";
-      sha256 = "0xvz2x6nvza5i53p7mddnf11j2wshqmbaphi6ngd6nar8v35y0k1";
-    };
-  };
-  "spring-commands-rspec" = {
-    version = "1.0.4";
-    source = {
-      type = "gem";
-      sha256 = "0b0svpq3md1pjz5drpa5pxwg8nk48wrshq8lckim4x3nli7ya0k2";
-    };
-    dependencies = [
-      "spring"
-    ];
-  };
-  "spring-commands-spinach" = {
-    version = "1.0.0";
-    source = {
-      type = "gem";
-      sha256 = "138jardqyj96wz68njdgy55qjbpl2d0g8bxbkz97ndaz3c2bykv9";
-    };
-    dependencies = [
-      "spring"
-    ];
-  };
-  "spring-commands-teaspoon" = {
-    version = "0.0.2";
-    source = {
-      type = "gem";
-      sha256 = "1g7n4m2s9d0frh7y1xibzpphqajfnx4fvgfc66nh545dd91w2nqz";
-    };
-    dependencies = [
-      "spring"
-    ];
-  };
-  "sprockets" = {
-    version = "2.12.4";
-    source = {
-      type = "gem";
-      sha256 = "15818683yz27w4hgywccf27n91azy9a4nmb5qkklzb08k8jw9gp3";
-    };
-    dependencies = [
-      "hike"
-      "multi_json"
-      "rack"
-      "tilt"
-    ];
-  };
-  "sprockets-rails" = {
-    version = "2.3.2";
-    source = {
-      type = "gem";
-      sha256 = "1pk2a69cxirg2dkkpl5cr3fvrj1qgifw1fmpz1ggkcziwxajyg6d";
-    };
-    dependencies = [
-      "actionpack"
-      "activesupport"
-      "sprockets"
-    ];
-  };
-  "stamp" = {
-    version = "0.5.0";
-    source = {
-      type = "gem";
-      sha256 = "1w54kxm4sd4za9rhrkl5lqjbsalhziq95sr3nnwr1lqc00nn5mhs";
-    };
-  };
-  "state_machine" = {
-    version = "1.2.0";
-    source = {
-      type = "gem";
-      sha256 = "1vf25h443b1s98d2lhd1w3rgam86pjsjhz632f3yrfkn374xvz40";
-    };
-  };
-  "stringex" = {
-    version = "2.5.2";
-    source = {
       type = "gem";
-      sha256 = "150adm7rfh6r9b5ra6vk75mswf9m3wwyslcf8f235a08m29fxa17";
     };
+    version = "0.5.3";
   };
-  "systemu" = {
-    version = "2.6.5";
+  http-cookie = {
+    dependencies = ["domain_name"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0cz2fdkngs3jc5w32a6xcl511hy03a7zdiy988jk1sf3bf5v3hdw";
       type = "gem";
-      sha256 = "0gmkbakhfci5wnmbfx5i54f25j9zsvbw858yg3jjhfs5n4ad1xq1";
     };
-  };
-  "task_list" = {
     version = "1.0.2";
-    source = {
-      type = "gem";
-      sha256 = "1iv1fizb04463c4mp4gxd8v0414fhvmiwvwvjby5b9qq79d8zwab";
-    };
-    dependencies = [
-      "html-pipeline"
-    ];
   };
-  "teaspoon" = {
-    version = "1.0.2";
+  html2haml = {
+    dependencies = ["erubis" "haml" "nokogiri" "ruby_parser"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "069zcy8lr010hn4qmbi8g5srdf69brk8nbgx4zcqcgbgsl4m8d4i";
       type = "gem";
-      sha256 = "0cprz18vgf0jgcggcxf4pwx8jcwbiyj1p0dnck5aavlvaxaic58s";
     };
-    dependencies = [
-      "railties"
-    ];
-  };
-  "teaspoon-jasmine" = {
-    version = "2.2.0";
-    source = {
-      type = "gem";
-      sha256 = "00wygrv1jm4aj15p1ab9d5fdrj6y83kv26xgp52mx4lp78h2ms9q";
-    };
-    dependencies = [
-      "teaspoon"
-    ];
-  };
-  "temple" = {
-    version = "0.6.10";
-    source = {
-      type = "gem";
-      sha256 = "1lzz4bisg97725m1q62jhmcxklfhky7g326d0b7p2q0kjx262q81";
-    };
-  };
-  "term-ansicolor" = {
-    version = "1.3.2";
-    source = {
-      type = "gem";
-      sha256 = "0ydbbyjmk5p7fsi55ffnkq79jnfqx65c3nj8d9rpgl6sw85ahyys";
-    };
-    dependencies = [
-      "tins"
-    ];
-  };
-  "terminal-table" = {
-    version = "1.5.2";
-    source = {
-      type = "gem";
-      sha256 = "1s6qyj9ir1agbbi32li9c0c34dcl0klyxqif6mxy0dbvq7kqfp8f";
-    };
-  };
-  "test_after_commit" = {
-    version = "0.2.7";
-    source = {
-      type = "gem";
-      sha256 = "179dgdpsmn9lcxxkyrxxvmyj4x3xi9sdq80l3zfqcgprnbxavbp7";
-    };
-    dependencies = [
-      "activerecord"
-    ];
-  };
-  "thin" = {
-    version = "1.6.3";
-    source = {
-      type = "gem";
-      sha256 = "1m56aygh5rh8ncp3s2gnn8ghn5ibkk0bg6s3clmh1vzaasw2lj4i";
-    };
-    dependencies = [
-      "daemons"
-      "eventmachine"
-      "rack"
-    ];
-  };
-  "thor" = {
-    version = "0.19.1";
-    source = {
-      type = "gem";
-      sha256 = "08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z";
-    };
-  };
-  "thread_safe" = {
-    version = "0.3.5";
-    source = {
-      type = "gem";
-      sha256 = "1hq46wqsyylx5afkp6jmcihdpv4ynzzq9ygb6z2pb1cbz5js0gcr";
-    };
-  };
-  "tilt" = {
-    version = "1.4.1";
-    source = {
-      type = "gem";
-      sha256 = "00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir";
-    };
-  };
-  "timers" = {
-    version = "4.0.4";
-    source = {
-      type = "gem";
-      sha256 = "1jx4wb0x182gmbcs90vz0wzfyp8afi1mpl9w5ippfncyk4kffvrz";
-    };
-    dependencies = [
-      "hitimes"
-    ];
-  };
-  "timfel-krb5-auth" = {
-    version = "0.8.3";
-    source = {
-      type = "gem";
-      sha256 = "105vajc0jkqgcx1wbp0ad262sdry4l1irk7jpaawv8vzfjfqqf5b";
-    };
-  };
-  "tinder" = {
-    version = "1.9.4";
-    source = {
-      type = "gem";
-      sha256 = "0gl5kln3dgybgarksk2ly4y0wy2lljsh59idfllwzynap8hx9jar";
-    };
-    dependencies = [
-      "eventmachine"
-      "faraday"
-      "faraday_middleware"
-      "hashie"
-      "json"
-      "mime-types"
-      "multi_json"
-      "twitter-stream"
-    ];
-  };
-  "tins" = {
-    version = "1.6.0";
-    source = {
-      type = "gem";
-      sha256 = "02qarvy17nbwvslfgqam8y6y7479cwmb1a6di9z18hzka4cf90hz";
-    };
-  };
-  "trollop" = {
-    version = "2.1.2";
-    source = {
-      type = "gem";
-      sha256 = "0415y63df86sqj43c0l82and65ia5h64if7n0znkbrmi6y0jwhl8";
-    };
-  };
-  "turbolinks" = {
-    version = "2.5.3";
-    source = {
-      type = "gem";
-      sha256 = "1ddrx25vvvqxlz4h59lrmjhc2bfwxf4bpicvyhgbpjd48ckj81jn";
-    };
-    dependencies = [
-      "coffee-rails"
-    ];
-  };
-  "twitter-stream" = {
-    version = "0.1.16";
-    source = {
-      type = "gem";
-      sha256 = "0is81g3xvnjk64sqiaqlh2ziwfryzwvk1yvaniryg0zhppgsyriq";
-    };
-    dependencies = [
-      "eventmachine"
-      "http_parser.rb"
-      "simple_oauth"
-    ];
-  };
-  "tzinfo" = {
-    version = "1.2.2";
-    source = {
-      type = "gem";
-      sha256 = "1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx";
-    };
-    dependencies = [
-      "thread_safe"
-    ];
-  };
-  "uglifier" = {
-    version = "2.3.3";
-    source = {
-      type = "gem";
-      sha256 = "0v45v2hccmadxpqrlk8gj9sgyak4d6838014wizdvzkh8sy23nvr";
-    };
-    dependencies = [
-      "execjs"
-      "json"
-    ];
-  };
-  "underscore-rails" = {
-    version = "1.4.4";
-    source = {
-      type = "gem";
-      sha256 = "1xg3dfym38gj5zsjxpf1v5cz4j6gysirv9bgc5ls37krixkajag2";
-    };
-  };
-  "unf" = {
-    version = "0.1.4";
-    source = {
-      type = "gem";
-      sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9";
-    };
-    dependencies = [
-      "unf_ext"
-    ];
-  };
-  "unf_ext" = {
-    version = "0.0.7.1";
-    source = {
-      type = "gem";
-      sha256 = "0ly2ms6c3irmbr1575ldyh52bz2v0lzzr2gagf0p526k12ld2n5b";
-    };
-  };
-  "unicorn" = {
-    version = "4.8.3";
-    source = {
-      type = "gem";
-      sha256 = "1kpg2vikx2hxdyrl45bqcr89a0w59hfw7yn7xh87bmlczi34xds4";
-    };
-    dependencies = [
-      "kgio"
-      "rack"
-      "raindrops"
-    ];
-  };
-  "unicorn-worker-killer" = {
-    version = "0.4.3";
-    source = {
-      type = "gem";
-      sha256 = "0hhss1bwammh7nhplcj90455h79yq10c30npz4lpcsgw7vcpls00";
-    };
-    dependencies = [
-      "get_process_mem"
-      "unicorn"
-    ];
-  };
-  "uuid" = {
-    version = "2.3.8";
-    source = {
-      type = "gem";
-      sha256 = "0gr2mxg27l380wpiy66mgv9wq02myj6m4gmp6c4g1vsbzkh0213v";
-    };
-    dependencies = [
-      "macaddr"
-    ];
-  };
-  "version_sorter" = {
     version = "2.0.0";
-    source = {
-      type = "gem";
-      sha256 = "1lad9c43w2xfzmva57ia6glpmhyivyk1m79jli42canshvan5v6y";
-    };
   };
-  "virtus" = {
-    version = "1.0.5";
+  html-pipeline = {
+    dependencies = ["activesupport" "nokogiri"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1yckdlrn4v5d7bgl8mbffax16640pgg9ny693kqi4j7g17vx2q9l";
       type = "gem";
-      sha256 = "06iphwi3c4f7y9i2rvhvaizfswqbaflilziz4dxqngrdysgkn1fk";
     };
-    dependencies = [
-      "axiom-types"
-      "coercible"
-      "descendants_tracker"
-      "equalizer"
-    ];
+    version = "1.11.0";
   };
-  "warden" = {
+  hipchat = {
+    dependencies = ["httparty" "mimemagic"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hgy5jav479vbzzk53lazhpjj094dcsqw6w1d6zjn52p72bwq60k";
+      type = "gem";
+    };
+    version = "1.5.2";
+  };
+  hike = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm";
+      type = "gem";
+    };
     version = "1.2.3";
+  };
+  highline = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nf5lgdn6ni2lpfdn4gk3gi47fmnca2bdirabbjbz1fk9w4p8lkr";
+      type = "gem";
+    };
+    version = "1.7.8";
+  };
+  hashie = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1iv5hd0zcryprx9lbcm615r3afc0d6rhc27clywmhhgpx68k8899";
+      type = "gem";
+    };
+    version = "3.4.3";
+  };
+  haml-rails = {
+    dependencies = ["actionpack" "activesupport" "haml" "html2haml" "railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hbfznkxab663hxp1v6gpsa7sv6w1fnw9r8b3flixwylnwh3c5dz";
+      type = "gem";
+    };
+    version = "0.9.0";
+  };
+  haml = {
+    dependencies = ["tilt"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mrzjgkygvfii66bbylj2j93na8i89998yi01fin3whwqbvx0m1p";
+      type = "gem";
+    };
+    version = "4.0.7";
+  };
+  grape-entity = {
+    dependencies = ["activesupport" "multi_json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hxghs2p9ncvdwhp6dwr1a74g552c49dd0jzy0szp4pg2xjbgjk8";
+      type = "gem";
+    };
+    version = "0.4.8";
+  };
+  grape = {
+    dependencies = ["activesupport" "builder" "hashie" "multi_json" "multi_xml" "rack" "rack-accept" "rack-mount" "virtus"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1dxfal5jspxq612jjkqbd7xgp5dswdyllbbfq6fj2m7s21pismmh";
+      type = "gem";
+    };
+    version = "0.13.0";
+  };
+  gon = {
+    dependencies = ["actionpack" "json" "multi_json" "request_store"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1f359cd9zsa4nrng35bij5skvjrj5ywn2dhmlg41b97vmza26bxr";
+      type = "gem";
+    };
+    version = "6.0.1";
+  };
+  gollum-lib = {
+    dependencies = ["github-markup" "gollum-grit_adapter" "nokogiri" "rouge" "sanitize" "stringex"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01s8pgzhc3cgcmsy6hh79wrcbn5vbadniq2a7d4qw87kpq7mzfdm";
+      type = "gem";
+    };
+    version = "4.1.0";
+  };
+  gollum-grit_adapter = {
+    dependencies = ["gitlab-grit"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02c5qfq0s0kx2ifnpbnbgz6258fl7rchzzzc7vpx72shi8gbpac7";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  globalid = {
+    dependencies = ["activesupport"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "145xrpsfx1qqjy33r6qa588wb16dvdhxzj2aysh755vhg6hgm291";
+      type = "gem";
+    };
+    version = "0.3.6";
+  };
+  gitlab_omniauth-ldap = {
+    dependencies = ["net-ldap" "omniauth" "pyu-ruby-sasl" "rubyntlm"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vbdyi57vvlrigyfhmqrnkw801x57fwa3gxvj1rj2bn9ig5186ri";
+      type = "gem";
+    };
+    version = "1.2.1";
+  };
+  gitlab_meta = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14vahv7gblcypbvip845sg3lvawf3kij61mkxz5vyfcv23niqvp9";
+      type = "gem";
+    };
+    version = "7.0";
+  };
+  gitlab_git = {
+    version = "8.2.0";
     source = {
       type = "gem";
-      sha256 = "0ykzsgwml0pdqn6vdjjaix12gpcgn8b126z9fx7yq3r3bmdrwxlp";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0311dl4vh6h7k8xarmpr61fndrhbmfskzjzkkj1rr8321gn8znfv";
     };
-    dependencies = [
-      "rack"
-    ];
   };
-  "webmock" = {
-    version = "1.21.0";
+  gitlab_emoji = {
+    version = "0.3.1";
     source = {
       type = "gem";
-      sha256 = "1p7hqdxk5359xwp59pcx841fhbnqx01ra98rnwhdyz61nrc6piv3";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1dy746icdmyc548mb5xkavvkn37pk7vv3gznx0p6hff325pan8dj";
     };
-    dependencies = [
-      "addressable"
-      "crack"
-    ];
   };
-  "websocket-driver" = {
-    version = "0.6.2";
+  gitlab-grit = {
+    dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nv8shx7w7fww8lf5a2rbvf7bq173rllm381m6x7g1i0qqc68q1b";
+      type = "gem";
+    };
+    version = "2.7.3";
+  };
+  gitlab-flowdock-git-hook = {
+    dependencies = ["flowdock" "gitlab-grit" "multi_json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1s3a10cdbh4xy732b92zcsm5zyc1lhi5v29d76j8mwbqmj11a2p8";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  github-markup = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01r901wcgn0gs0n9h684gs5n90y1vaj9lxnx4z5ig611jwa43ivq";
+      type = "gem";
+    };
+    version = "1.3.3";
+  };
+  github-linguist = {
+    version = "4.7.5";
     source = {
       type = "gem";
-      sha256 = "0y4kc2q2g69i4xdcn85bn7v7g6ia3znr687aivakmlzcanyiz7in";
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xxm2lbabkc1xmx2myv56a4fkw3wwg9n8w2bzwrl4s33kf6x62ag";
     };
-    dependencies = [
-      "websocket-extensions"
-    ];
   };
-  "websocket-extensions" = {
+  gherkin-ruby = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18ay7yiibf4sl9n94k7mbi4k5zj2igl4j71qcmkswv69znyx0sn1";
+      type = "gem";
+    };
+    version = "0.3.2";
+  };
+  get_process_mem = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "025f7v6bpbgsa2nr0hzv2riggj8qmzbwcyxfgjidpmwh5grh7j29";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
+  gemojione = {
+    version = "2.2.1";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0av60lajn64z1csmkzfaf5wvpd3x48lcshiknkqr8m0zx3sg7w3h";
+    };
+  };
+  gemnasium-gitlab-service = {
+    dependencies = ["rugged"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1qv7fkahmqkah3770ycrxd0x2ais4z41hb43a0r8q8wcdklns3m3";
+      type = "gem";
+    };
+    version = "0.2.6";
+  };
+  fuubar = {
+    dependencies = ["rspec" "ruby-progressbar"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0xwqs24y8s73aayh39si17kccsmr0bjgmi6jrjyfp7gkjb6iyhpv";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  formatador = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1gc26phrwlmlqrmz4bagq1wd5b7g64avpx0ghxr9xdxcvmlii0l0";
+      type = "gem";
+    };
+    version = "0.2.5";
+  };
+  foreman = {
+    dependencies = ["thor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1caz8mi7gq1hs4l1flcyyw1iw1bdvdbhppsvy12akr01k3s17xaq";
+      type = "gem";
+    };
+    version = "0.78.0";
+  };
+  font-awesome-rails = {
+    dependencies = ["railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09x1bg98sp2v1lsg9h2bal915q811xq84h9d74p1f3378ga63c1x";
+      type = "gem";
+    };
+    version = "4.5.0.0";
+  };
+  fog-xml = {
+    dependencies = ["fog-core" "nokogiri"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1576sbzza47z48p0k9h1wg3rhgcvcvdd1dfz3xx1cgahwr564fqa";
+      type = "gem";
+    };
     version = "0.1.2";
-    source = {
-      type = "gem";
-      sha256 = "07qnsafl6203a2zclxl20hy4jq11c471cgvd0bj5r9fx1qqw06br";
-    };
   };
-  "whenever" = {
-    version = "0.8.4";
+  fog-xenserver = {
+    dependencies = ["fog-core" "fog-xml"];
     source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ngw8hh8ljk7wi0cp8n4b4jcy2acx0yqzjk7851m3mp0kji5dlgl";
       type = "gem";
-      sha256 = "1bs602cf5rmmj03chn8vwidx0z1psyfyabq6gs3mqna524pnj9h2";
     };
-    dependencies = [
-      "activesupport"
-      "chronic"
-    ];
+    version = "0.2.2";
   };
-  "wikicloth" = {
+  fog-voxel = {
+    dependencies = ["fog-core" "fog-xml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10skdnj59yf4jpvq769njjrvh2l0wzaa7liva8n78qq003mvmfgx";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  fog-vmfusion = {
+    dependencies = ["fission" "fog-core"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0g0l0k9ylxk1h9pzqr6h2ba98fl47lpp3j19lqv4jxw0iw1rqxn4";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  fog-terremark = {
+    dependencies = ["fog-core" "fog-xml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01lfkh9jppj0iknlklmwyb7ym3bfhkq58m3absb6rf5a5mcwi3lf";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  fog-storm_on_demand = {
+    dependencies = ["fog-core" "fog-json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0fif1x8ci095b2yyilf65n7x6iyvn448azrsnmwsdkriy8vxxv3y";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  fog-softlayer = {
+    dependencies = ["fog-core" "fog-json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zax2wws0q8pm787jnlxd2xlj23f2acz0s6jl5nzczyxjgll571r";
+      type = "gem";
+    };
+    version = "1.0.3";
+  };
+  fog-serverlove = {
+    dependencies = ["fog-core" "fog-json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hxgmwzygrw25rbsy05i6nzsyr0xl7xj5j2sjpkb9n9wli5sagci";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
+  fog-sakuracloud = {
+    dependencies = ["fog-core" "fog-json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08krsn9sk5sx0aza812g31r169bd0zanb8pq5am3a64j6azarimd";
+      type = "gem";
+    };
+    version = "1.7.5";
+  };
+  fog-riakcs = {
+    dependencies = ["fog-core" "fog-json" "fog-xml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1nbxc4dky3agfwrmgm1aqmi59p6vnvfnfbhhg7xpg4c2cf41whxm";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  fog-radosgw = {
+    dependencies = ["fog-core" "fog-json" "fog-xml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nslgv8yp5qkiryj3zsm91gs7s6i626igj61kwxjjwk2yv6swyr6";
+      type = "gem";
+    };
+    version = "0.0.5";
+  };
+  fog-profitbricks = {
+    dependencies = ["fog-core" "fog-xml" "nokogiri"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "154sqs2dcmvg21v4m3fj8f09z5i70sq8a485v6rdygsffs8xrycn";
+      type = "gem";
+    };
+    version = "0.0.5";
+  };
+  fog-powerdns = {
+    dependencies = ["fog-core" "fog-json" "fog-xml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "08zavzwfkk344gz83phz4sy9nsjznsdjsmn1ifp6ja17bvydlhh7";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  fog-local = {
+    dependencies = ["fog-core"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0i5hxwzmc2ag3z9nlligsaf679kp2pz39cd8n2s9cmxaamnlh2s3";
+      type = "gem";
+    };
+    version = "0.2.1";
+  };
+  fog-json = {
+    dependencies = ["fog-core" "multi_json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0advkkdjajkym77r3c0bg2rlahl2akj0vl4p5r273k2qmi16n00r";
+      type = "gem";
+    };
+    version = "1.0.2";
+  };
+  fog-google = {
+    dependencies = ["fog-core" "fog-json" "fog-xml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0z4vmswpqwph04c0wqzrscns1d1wdm8kbxx457bv156mawzrhfj3";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  fog-ecloud = {
+    dependencies = ["fog-core" "fog-xml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18rb4qjad9xwwqvvpj8r2h0hi9svy71pm4d3fc28cdcnfarmdi06";
+      type = "gem";
+    };
+    version = "0.3.0";
+  };
+  fog-dynect = {
+    dependencies = ["fog-core" "fog-json" "fog-xml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "18lqmdkm22254z86jh3aa9v9vqk8bgbd3d1m0w7az3ij47ak7kch";
+      type = "gem";
+    };
+    version = "0.0.2";
+  };
+  fog-core = {
+    dependencies = ["builder" "excon" "formatador"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "02z91r3f5a64hlalm6h39v0778yl2kk3qvva0zvplpp9hpwbwzhl";
+      type = "gem";
+    };
+    version = "1.35.0";
+  };
+  fog-brightbox = {
+    dependencies = ["fog-core" "fog-json" "inflecto"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0p7rbx587hb1d1am90dcr3zdp6y50c2zddh97yfgl62vji0pbkkd";
+      type = "gem";
+    };
+    version = "0.10.1";
+  };
+  fog-aws = {
+    dependencies = ["fog-core" "fog-json" "fog-xml" "ipaddress"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1pzfahq8h3alfflb5dr8lm02q27x81vm96qn5zyfdlx86yy7bq96";
+      type = "gem";
+    };
     version = "0.8.1";
+  };
+  fog-atmos = {
+    dependencies = ["fog-core" "fog-xml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1aaxgnw9zy96gsh4h73kszypc32sx497s6bslvhfqh32q9d1y8c9";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  fog-aliyun = {
+    dependencies = ["fog-core" "fog-json" "ipaddress" "xml-simple"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1i76g8sdskyfc0gcnd6n9i757s7dmwg3wf6spcr2xh8wzyxkm1pj";
+      type = "gem";
+    };
+    version = "0.1.0";
+  };
+  fog = {
+    dependencies = ["fog-aliyun" "fog-atmos" "fog-aws" "fog-brightbox" "fog-core" "fog-dynect" "fog-ecloud" "fog-google" "fog-json" "fog-local" "fog-powerdns" "fog-profitbricks" "fog-radosgw" "fog-riakcs" "fog-sakuracloud" "fog-serverlove" "fog-softlayer" "fog-storm_on_demand" "fog-terremark" "fog-vmfusion" "fog-voxel" "fog-xenserver" "fog-xml" "ipaddress" "nokogiri"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ml31jdycqdm8w7w3l9pbyrgbnmrrnhmkppa2x4bwi9as1n1jmwq";
+      type = "gem";
+    };
+    version = "1.36.0";
+  };
+  flowdock = {
+    dependencies = ["httparty" "multi_json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04nrvg4gzgabf5mnnhccl8bwrkvn3y4pm7a1dqzqhpvfr4m5pafg";
+      type = "gem";
+    };
+    version = "0.7.1";
+  };
+  flog = {
+    dependencies = ["ruby_parser" "sexp_processor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1asrcdj6gh5mxcimqak94jjyyi5cxnqn904lc8pmrljg1nv1bxpm";
+      type = "gem";
+    };
+    version = "4.3.2";
+  };
+  flay = {
+    dependencies = ["ruby_parser" "sexp_processor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0zcp9nmnfqixdcqa2dzwwjy5np4n2n16bj25gw7bbzbjp9hqzhn6";
+      type = "gem";
+    };
+    version = "2.6.1";
+  };
+  fission = {
+    dependencies = ["CFPropertyList"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "09pmp1j1rr8r3pcmbn2na2ls7s1j9ijbxj99xi3a8r6v5xhjdjzh";
+      type = "gem";
+    };
+    version = "0.5.0";
+  };
+  ffi = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1m5mprppw0xcrv2mkim5zsk70v089ajzqiq5hpyb0xg96fcyzyxj";
+      type = "gem";
+    };
+    version = "1.9.10";
+  };
+  ffaker = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "19fnbbsw87asyb1hvkr870l2yldah2jcjb8074pgyrma5lynwmn0";
+      type = "gem";
+    };
+    version = "2.0.0";
+  };
+  fastercsv = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1df3vfgw5wg0s405z0pj0rfcvnl9q6wak7ka8gn0xqg4cag1k66h";
+      type = "gem";
+    };
+    version = "1.5.5";
+  };
+  faraday_middleware-multi_json = {
+    dependencies = ["faraday_middleware" "multi_json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0651sxhzbq9xfq3hbpmrp0nbybxnm9ja3m97k386m4bqgamlvz1q";
+      type = "gem";
+    };
+    version = "0.0.6";
+  };
+  faraday_middleware = {
+    dependencies = ["faraday"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0nxia26xzy8i56qfyz1bg8dg9yb26swpgci8n5jry8mh4bnx5r5h";
+      type = "gem";
+    };
+    version = "0.10.0";
+  };
+  faraday = {
+    dependencies = ["multipart-post"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kplqkpn2s2yl3lxdf6h7sfldqvkbkpxwwxhyk7mdhjplb5faqh6";
+      type = "gem";
+    };
+    version = "0.9.2";
+  };
+  factory_girl_rails = {
+    dependencies = ["factory_girl" "railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jj0yl6mfildb4g79dwgc1q5pv2pa65k9b1ml43mi8mg62j8mrhz";
+      type = "gem";
+    };
+    version = "4.3.0";
+  };
+  factory_girl = {
+    dependencies = ["activesupport"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13z20a4b7z1c8vbz0qz5ranssdprldwvwlgjmn38x311sfjmp9dz";
+      type = "gem";
+    };
+    version = "4.3.0";
+  };
+  expression_parser = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1938z3wmmdabqxlh5d5c56xfg1jc6z15p7zjyhvk7364zwydnmib";
+      type = "gem";
+    };
+    version = "0.9.0";
+  };
+  execjs = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0grlxwiccbnflxs30r3h7g23xnps5knav1jyqkk3anvm8363ifjw";
+      type = "gem";
+    };
+    version = "2.6.0";
+  };
+  excon = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1shb4g3dhsfkywgjv6123yrvp2c8bvi8hqmq47iqa5lp72sn4b4w";
+      type = "gem";
+    };
+    version = "0.45.4";
+  };
+  eventmachine = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1frvpk3p73xc64qkn0ymll3flvn4xcycq5yx8a43zd3gyzc1ifjp";
+      type = "gem";
+    };
+    version = "1.0.8";
+  };
+  escape_utils = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hb8nmrgmd9n5dhih86fp91sf26mmw14sdn5vswg5g20svrqxc7x";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  erubis = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3";
+      type = "gem";
+    };
+    version = "2.7.0";
+  };
+  equalizer = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1kjmx3fygx8njxfrwcmn7clfhjhb6bvv3scy2lyyi0wqyi3brra4";
+      type = "gem";
+    };
+    version = "0.0.11";
+  };
+  encryptor = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "04wqqda081h7hmhwjjx1yqxprxjk8s5jgv837xqv1bpxiv7f4v1y";
+      type = "gem";
+    };
+    version = "1.3.0";
+  };
+  email_spec = {
+    dependencies = ["launchy" "mail"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00p1cc69ncrgg7m45va43pszip8anx5735w1lsb7p5ygkyw8nnpv";
+      type = "gem";
+    };
+    version = "1.6.0";
+  };
+  email_reply_parser = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0k2p229mv7xn7q627zwmvhrcvba4b9m70pw2jfjm6iimg2vmf22r";
+      type = "gem";
+    };
+    version = "0.5.8";
+  };
+  dropzonejs-rails = {
+    dependencies = ["rails"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vqqxzv6qdqy47m2q28adnmccfvc17p2bmkkaqjvrczrhvkkha64";
+      type = "gem";
+    };
+    version = "0.7.2";
+  };
+  doorkeeper = {
+    dependencies = ["railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0wim84wkvx758cfb8q92w3hhvnfbwr990x1mmfv1ss1ivjz8fmm0";
+      type = "gem";
+    };
+    version = "2.2.2";
+  };
+  domain_name = {
+    dependencies = ["unf"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "16qvfrmcwlzz073aas55mpw2nhyhjcn96s524w0g1wlml242hjav";
+      type = "gem";
+    };
+    version = "0.5.25";
+  };
+  docile = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m8j31whq7bm5ljgmsrlfkiqvacrw6iz9wq10r3gwrv5785y8gjx";
+      type = "gem";
+    };
+    version = "1.1.5";
+  };
+  diffy = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0il0ri511g9rm88qbvncbzgwc6wk6265hmnf7grcczmrs1z49vl0";
+      type = "gem";
+    };
+    version = "3.0.7";
+  };
+  diff-lcs = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1";
+      type = "gem";
+    };
+    version = "1.2.5";
+  };
+  devise-two-factor = {
+    dependencies = ["activesupport" "attr_encrypted" "devise" "railties" "rotp"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1v2wva971ds48af47rj4ywavlmz7qzbmf1jpf1l3xn3mscz52hln";
+      type = "gem";
+    };
+    version = "2.0.1";
+  };
+  devise-async = {
+    dependencies = ["devise"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "11llg7ggzpmg4lb9gh4sx55spvp98sal5r803gjzamps9crfq6mm";
+      type = "gem";
+    };
+    version = "0.9.0";
+  };
+  devise = {
+    dependencies = ["bcrypt" "orm_adapter" "railties" "responders" "thread_safe" "warden"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00h0xdl4a8pjpb0gbgy4w6q9j2mpczkmj23195zmjrg2b1gl8f2q";
+      type = "gem";
+    };
+    version = "3.5.4";
+  };
+  descendants_tracker = {
+    dependencies = ["thread_safe"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15q8g3fcqyb41qixn6cky0k3p86291y7xsh1jfd851dvrza1vi79";
+      type = "gem";
+    };
+    version = "0.0.4";
+  };
+  default_value_for = {
+    dependencies = ["activerecord"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1z4lrba4y1c3y0rxw8321qbwsb3nr6c2igrpksfvz93yhc9m6xm0";
+      type = "gem";
+    };
+    version = "3.0.1";
+  };
+  debugger-ruby_core_source = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1lp5dmm8a8dpwymv6r1y6yr24wxsj0gvgb2b8i7qq9rcv414snwd";
+      type = "gem";
+    };
+    version = "1.3.8";
+  };
+  debug_inspector = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "109761g00dbrw5q0dfnbqg8blfm699z4jj70l4zrgf9mzn7ii50m";
+      type = "gem";
+    };
+    version = "0.0.2";
+  };
+  database_cleaner = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0n5r7kvsmknk876v3scdphfnvllr9157fa5q7j5fczg8j5qm6kf0";
+      type = "gem";
+    };
+    version = "1.4.1";
+  };
+  daemons = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0b839hryy9sg7x3knsa1d6vfiyvn0mlsnhsb6an8zsalyrz1zgqg";
+      type = "gem";
+    };
+    version = "1.2.3";
+  };
+  d3_rails = {
+    dependencies = ["railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12vxiiflnnkcxak2wmbajyf5wzmcv9wkl4drsp0am72azl8a6g9x";
+      type = "gem";
+    };
+    version = "3.5.11";
+  };
+  creole = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "00rcscz16idp6dx0dk5yi5i0fz593i3r6anbn5bg2q07v3i025wm";
+      type = "gem";
+    };
+    version = "0.5.0";
+  };
+  crack = {
+    dependencies = ["safe_yaml"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0abb0fvgw00akyik1zxnq7yv391va148151qxdghnzngv66bl62k";
+      type = "gem";
+    };
+    version = "0.4.3";
+  };
+  coveralls = {
+    dependencies = ["json" "rest-client" "simplecov" "term-ansicolor" "thor" "tins"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03vnvcw1fdmkp3405blcxpsjf89jxd2061474a32fchsmv2das9y";
+      type = "gem";
+    };
+    version = "0.8.9";
+  };
+  connection_pool = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1b2bb3k39ni5mzcnqlv9y4yjkbin20s7dkwzp0jw2jf1rmzcgrmy";
+      type = "gem";
+    };
+    version = "2.2.0";
+  };
+  concurrent-ruby = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0qqdgcfkzv90nznrpsvg3cgg5xiqz4c8hnv7va5gm4fp4lf4k85v";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  colorize = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "16bsjcqb6pg3k94dh1l5g3hhx5g2g4g8rlr76dnc78yyzjjrbayn";
+      type = "gem";
+    };
+    version = "0.7.7";
+  };
+  coffee-script-source = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1k4fg39rrkl3bpgchfj94fbl9s4ysaz16w8dkqncf2vyf79l3qz0";
+      type = "gem";
+    };
+    version = "1.10.0";
+  };
+  coffee-script = {
+    dependencies = ["coffee-script-source" "execjs"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0rc7scyk7mnpfxqv5yy4y5q1hx3i7q3ahplcp4bq2g5r24g2izl2";
+      type = "gem";
+    };
+    version = "2.4.1";
+  };
+  coffee-rails = {
+    dependencies = ["coffee-script" "railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0p3zhs44gsy1p90nmghihzfyl7bsk8kv6j3q7rj3bn74wg8w7nqs";
+      type = "gem";
+    };
+    version = "4.1.0";
+  };
+  coercible = {
+    dependencies = ["descendants_tracker"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1p5azydlsz0nkxmcq0i1gzmcfq02lgxc4as7wmf47j1c6ljav0ah";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  coderay = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
+  cliver = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "096f4rj7virwvqxhkavy0v55rax10r4jqf8cymbvn4n631948xc7";
+      type = "gem";
+    };
+    version = "0.3.2";
+  };
+  chunky_png = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0vf0axgrm95bs3y0x5gdb76xawfh210yxplj7jbwr6z7n88i1axn";
+      type = "gem";
+    };
+    version = "1.3.5";
+  };
+  charlock_holmes = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0jsl6k27wjmssxbwv9wpf7hgp9r0nvizcf6qpjnr7qs2nia53lf7";
+      type = "gem";
+    };
+    version = "0.7.3";
+  };
+  cause = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0digirxqlwdg79mkbn70yc7i9i1qnclm2wjbrc47kqv6236bpj00";
+      type = "gem";
+    };
+    version = "0.1";
+  };
+  carrierwave = {
+    dependencies = ["activemodel" "activesupport" "json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1b1av1ancby6brhmypl5k8xwrasd8bd3kqp9ri8kbq7z8nj6k445";
+      type = "gem";
+    };
+    version = "0.9.0";
+  };
+  capybara-screenshot = {
+    dependencies = ["capybara" "launchy"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "17v1wihr3aqrxhrwswkdpdklj1xsfcaksblh1y8hixvm9bqfyz3y";
+      type = "gem";
+    };
+    version = "1.0.11";
+  };
+  capybara = {
+    dependencies = ["mime-types" "nokogiri" "rack" "rack-test" "xpath"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "114k4xi4nfbp3jfbxgwa3fksbwsyibx74gbdqpcgg3dxpmzkaa4f";
+      type = "gem";
+    };
+    version = "2.4.4";
+  };
+  cal-heatmap-rails = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0lrmcyj3iixkprqi9fb9vcn97wpp779sl5hxxgx57r3rb7l4d20w";
+      type = "gem";
+    };
+    version = "3.5.1";
+  };
+  byebug = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1yx89b7vh5mbvxyi8n7zl25ia1bqdj71995m4daj6d41rnkmrpnc";
+      type = "gem";
+    };
+    version = "8.2.1";
+  };
+  bundler-audit = {
+    dependencies = ["thor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0msv3k2277y7al5lbnw7q9lmb5fnrscpkmsb36wpn189pdq0akfv";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
+  bullet = {
+    dependencies = ["activesupport" "uniform_notifier"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1h3iaflcz5a1xr32bdb8sk4nx06yhh5d8y7w294w49xigfv4hzj3";
+      type = "gem";
+    };
+    version = "4.14.10";
+  };
+  builder = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2";
+      type = "gem";
+    };
+    version = "3.2.2";
+  };
+  browser = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "01bkb64w2ld2q5r3chc4f6spbjrmginyg8wlzg130zmx2z4jia2h";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  brakeman = {
+    dependencies = ["erubis" "fastercsv" "haml" "highline" "multi_json" "ruby2ruby" "ruby_parser" "safe_yaml" "sass" "slim" "terminal-table"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15v13yizpvp1rm86raqggmsmm51v6p8fqw3pfgi6xpvx1ba06cfm";
+      type = "gem";
+    };
+    version = "3.1.4";
+  };
+  bootstrap-sass = {
+    dependencies = ["autoprefixer-rails" "sass"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "12hhw42hk9clwfj6yz5v0c5p35wrn5yjnji7bnzsfs99vi2q00ld";
+      type = "gem";
+    };
+    version = "3.3.6";
+  };
+  binding_of_caller = {
+    dependencies = ["debug_inspector"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15jg6dkaq2nzcd602d7ppqbdxw3aji961942w93crs6qw4n6h9yk";
+      type = "gem";
+    };
+    version = "0.7.2";
+  };
+  better_errors = {
+    dependencies = ["coderay" "erubis"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0v0q8bdkqqlcsfqbk4wvc3qnz8an44mgz720v5f11a4nr413mjgf";
+      type = "gem";
+    };
+    version = "1.0.1";
+  };
+  benchmark-ips = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bh681m54qdsdyvpvflj1wpnj3ybspbpjkr4cnlrl4nk4yikli0j";
+      type = "gem";
+    };
+    version = "2.3.0";
+  };
+  bcrypt = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "15cf7zzlj9b0xcx12jf8fmnpc8g1b0yhxal1yr5p7ny3mrz5pll6";
+      type = "gem";
+    };
+    version = "3.1.10";
+  };
+  babosa = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "05rgxg4pz4bc4xk34w5grv0yp1j94wf571w84lf3xgqcbs42ip2f";
+      type = "gem";
+    };
+    version = "1.0.2";
+  };
+  axiom-types = {
+    dependencies = ["descendants_tracker" "ice_nine" "thread_safe"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "10q3k04pll041mkgy0m5fn2b1lazm6ly1drdbcczl5p57lzi3zy1";
+      type = "gem";
+    };
+    version = "0.1.1";
+  };
+  awesome_print = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1k85hckprq0s9pakgadf42k1d5s07q23m3y6cs977i6xmwdivyzr";
+      type = "gem";
+    };
+    version = "1.2.0";
+  };
+  autoprefixer-rails = {
+    dependencies = ["execjs" "json"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0m1w42ncz0p48r5hbyglayxkzrnplw18r99dc1ia2cb3nizkwllx";
+      type = "gem";
+    };
+    version = "6.2.3";
+  };
+  attr_required = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0pawa2i7gw9ppj6fq6y288da1ncjpzsmc6kx7z63mjjvypa5q3dc";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  attr_encrypted = {
+    dependencies = ["encryptor"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1hm2844qm37kflqq5v0x2irwasbhcblhp40qk10m3wlkj4m9wp8p";
+      type = "gem";
+    };
+    version = "1.3.4";
+  };
+  astrolabe = {
+    dependencies = ["parser"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0ybbmjxaf529vvhrj4y8d4jpf87f3hgczydzywyg1d04gggjx7l7";
+      type = "gem";
+    };
+    version = "1.3.1";
+  };
+  ast = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "102bywfxrv0w3n4s6lg25d7xxshd344sc7ijslqmganj5bany1pk";
+      type = "gem";
+    };
+    version = "2.1.0";
+  };
+  asciidoctor = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0q9yhan2mkk1lh15zcfd9g2fn6faix9yrf5skg23dp1y77jv7vm0";
+      type = "gem";
+    };
+    version = "1.5.3";
+  };
+  asana = {
+    dependencies = ["faraday" "faraday_middleware" "faraday_middleware-multi_json" "oauth2"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1560p13g57pl4xqkmhwn1vpqhm7mw9fwmmswk38k3i2r7g0b5y9z";
+      type = "gem";
+    };
+    version = "0.4.0";
+  };
+  arel = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1a270mlajhrmpqbhxcqjqypnvgrq4pgixpv3w9gwp1wrrapnwrzk";
+      type = "gem";
+    };
+    version = "6.0.3";
+  };
+  annotate = {
+    dependencies = ["activerecord" "rake"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1wdw9phsv2dndgid3pd8h0hl4zycwy11jc9iz6prwza0xax0i7hg";
+      type = "gem";
+    };
+    version = "2.6.10";
+  };
+  allocations = {
+    version = "1.0.4";
     source = {
       type = "gem";
-      sha256 = "1jp6c2yzyqbap8jdiw8yz6l08sradky1llhyhmrg934l1b5akj3s";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0iynf7gkbnbr5mgl2wgbgvxmjdiawh7ywwbnyjm94bj3pkybzgkc";
     };
-    dependencies = [
-      "builder"
-      "expression_parser"
-      "rinku"
-    ];
   };
-  "xpath" = {
+  akismet = {
     version = "2.0.0";
     source = {
       type = "gem";
-      sha256 = "04kcr127l34p7221z13blyl0dvh0bmxwx326j72idayri36a394w";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0hqpn25iyypkwkrqaibjm5nss5jmlkrddhia7frmz94prvyjr02w";
     };
-    dependencies = [
-      "nokogiri"
-    ];
+  };
+  after_commit_queue = {
+    dependencies = ["activerecord"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1jrhvj4335dsrj0xndbf7a7m2inbwbx1knc0bwgvmkk1w47l43s0";
+      type = "gem";
+    };
+    version = "1.3.0";
+  };
+  addressable = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1533axm85gpz267km9gnfarf9c78g2scrysd6b8yw33vmhkz2km6";
+      type = "gem";
+    };
+    version = "2.3.8";
+  };
+  acts-as-taggable-on = {
+    dependencies = ["activerecord"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0bz0z8dlp3fjzah9y9b6rr9mkidsav9l4hdm51fnq1gd05yv3pr7";
+      type = "gem";
+    };
+    version = "3.5.0";
+  };
+  activesupport = {
+    dependencies = ["i18n" "json" "minitest" "thread_safe" "tzinfo"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "16zgsvzwwf4hx3ywi2lz0dcm6d1ljsy6zr5k2q41amd7g62d886d";
+      type = "gem";
+    };
+    version = "4.2.5.1";
+  };
+  activerecord-session_store = {
+    dependencies = ["actionpack" "activerecord" "railties"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1rp5q0q5i5syfgw7qpiq3a42x13p7myyv1c5hmnczpdlh57axs3p";
+      type = "gem";
+    };
+    version = "0.1.2";
+  };
+  activerecord-nulldb-adapter = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1ym3paxp5lqr2kr4hkqj6xxqvgl57fv8jqhvgjfxb9lk7k5jlfmp";
+      type = "gem";
+    };
+    version = "0.3.2";
+  };
+  activerecord-deprecated_finders = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "03xplckz7v3nm6inqkwdd44h6gpbpql0v02jc1rz46a38rd6cj6m";
+      type = "gem";
+    };
+    version = "1.0.4";
+  };
+  activerecord = {
+    dependencies = ["activemodel" "activesupport" "arel"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1qj5ii36yn9kb0ljnl05xgpgvs7j9l20yg2phsssy0j31g1ymmc5";
+      type = "gem";
+    };
+    version = "4.2.5.1";
+  };
+  activemodel = {
+    dependencies = ["activesupport" "builder"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1zr83avw82infmzdzpilk6xpv5r9fr8pxgf5ql16b3vysp6va57p";
+      type = "gem";
+    };
+    version = "4.2.5.1";
+  };
+  activejob = {
+    dependencies = ["activesupport" "globalid"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1xfj7lwp1v3k9zscavzq87wbbn6y825angz4zpx4xsvlwf3dn7jc";
+      type = "gem";
+    };
+    version = "4.2.5.1";
+  };
+  actionview = {
+    dependencies = ["activesupport" "builder" "erubis" "rails-dom-testing" "rails-html-sanitizer"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1dp1gqh0yxpyydza1ada0jjbpww97qhnkj9c9pm9rg5jbmpzg12m";
+      type = "gem";
+    };
+    version = "4.2.5.1";
+  };
+  actionpack = {
+    dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "13shdiwjfyqvfb11k0wqhcd7p7ix168fxd5l8m2pnn0bzskpswxv";
+      type = "gem";
+    };
+    version = "4.2.5.1";
+  };
+  actionmailer = {
+    dependencies = ["actionpack" "actionview" "activejob" "mail" "rails-dom-testing"];
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "1fxn8f53nnpgan5xl9i5lszl1m8yk4q6ayc33d9xfzsnvhavpl4n";
+      type = "gem";
+    };
+    version = "4.2.5.1";
+  };
+  ace-rails-ap = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "082n12rkd9j7d89030nhmi4fx1gqaf13knps6cknsyvwix7fryvv";
+      type = "gem";
+    };
+    version = "2.0.1";
+  };
+  RedCloth = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "06pahxyrckhgb7alsxwhhlx1ib2xsx33793finj01jk8i054bkxl";
+      type = "gem";
+    };
+    version = "4.2.9";
+  };
+  CFPropertyList = {
+    source = {
+      remotes = ["https://rubygems.org"];
+      sha256 = "0mjb46368z4hiax3fcsgxk14fxrhwnvcmakc2f5sx8nz0wvvkwg2";
+      type = "gem";
+    };
+    version = "2.3.2";
   };
 }
\ No newline at end of file
diff --git a/pkgs/applications/version-management/gitlab/nulladapter.patch b/pkgs/applications/version-management/gitlab/nulladapter.patch
new file mode 100644
index 000000000000..0d5c1749e83f
--- /dev/null
+++ b/pkgs/applications/version-management/gitlab/nulladapter.patch
@@ -0,0 +1,29 @@
+index acd1874..f493451 100644
+--- a/Gemfile
++++ b/Gemfile
+@@ -318,3 +318,5 @@ gem 'oauth2', '~> 1.0.0'
+ 
+ # Soft deletion
+ gem "paranoia", "~> 2.0"
++
++gem "activerecord-nulldb-adapter"
+index 14d2c76..7a010f0 100644
+--- a/Gemfile.lock
++++ b/Gemfile.lock
+@@ -34,6 +34,8 @@ GEM
+       activesupport (= 4.2.5.1)
+       arel (~> 6.0)
+     activerecord-deprecated_finders (1.0.4)
++    activerecord-nulldb-adapter (0.3.2)
++      activerecord (>= 2.0.0)
+     activerecord-session_store (0.1.2)
+       actionpack (>= 4.0.0, < 5)
+       activerecord (>= 4.0.0, < 5)
+@@ -880,6 +882,7 @@ DEPENDENCIES
+   RedCloth (~> 4.2.9)
+   ace-rails-ap (~> 2.0.1)
+   activerecord-deprecated_finders (~> 1.0.3)
++  activerecord-nulldb-adapter
+   activerecord-session_store (~> 0.1.0)
+   acts-as-taggable-on (~> 3.4)
+   addressable (~> 2.3.8)
diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
index 1df5226c82fd..d188070296ca 100644
--- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
@@ -1,8 +1,8 @@
 diff --git a/config/environments/production.rb b/config/environments/production.rb
-index 3316ece..c34dec0 100644
+index 9095266..694a4c5 100644
 --- a/config/environments/production.rb
 +++ b/config/environments/production.rb
-@@ -67,10 +67,10 @@ Gitlab::Application.configure do
+@@ -67,10 +67,10 @@ Rails.application.configure do
  
    config.action_mailer.delivery_method = :sendmail
    # Defaults to:
@@ -18,74 +18,10 @@ index 3316ece..c34dec0 100644
    config.action_mailer.raise_delivery_errors = true
  
 diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
-index 15930fc..bdb423c 100644
+index 05f127d..1daef74 100644
 --- a/config/gitlab.yml.example
 +++ b/config/gitlab.yml.example
-@@ -29,8 +29,8 @@ production: &base
-   ## GitLab settings
-   gitlab:
-     ## Web server settings (note: host is the FQDN, do not include http://)
--    host: localhost
--    port: 80 # Set to 443 if using HTTPS, see installation.md#using-https for additional HTTPS configuration details
-+    host: <%= ENV['GITLAB_HOST'] || 'localhost' %>
-+    port: <%= ENV['GITLAB_PORT'] || 80 %>
-     https: false # Set to true if using HTTPS, see installation.md#using-https for additional HTTPS configuration details
- 
-     # Uncommment this line below if your ssh host is different from HTTP/HTTPS one
-@@ -43,7 +43,7 @@ production: &base
-     # relative_url_root: /gitlab
- 
-     # Uncomment and customize if you can't use the default user to run GitLab (default: 'git')
--    # user: git
-+    user: gitlab
- 
-     ## Date & Time settings
-     # Uncomment and customize if you want to change the default time zone of GitLab application.
-@@ -54,7 +54,7 @@ production: &base
-     # Uncomment and set to false if you need to disable email sending from GitLab (default: true)
-     # email_enabled: true
-     # Email address used in the "From" field in mails sent by GitLab
--    email_from: example@example.com
-+    email_from: <%= ENV['GITLAB_EMAIL_FROM'] %>
-     email_display_name: GitLab
-     email_reply_to: noreply@example.com
- 
-@@ -298,12 +298,12 @@ production: &base
-   # GitLab Satellites
-   satellites:
-     # Relative paths are relative to Rails.root (default: tmp/repo_satellites/)
--    path: /home/git/gitlab-satellites/
-+    path: <%= ENV['GITLAB_SATELLITES_PATH'] %>
-     timeout: 30
- 
-   ## Backup settings
-   backup:
--    path: "tmp/backups"   # Relative paths are relative to Rails.root (default: tmp/backups/)
-+    path: <%= ENV['GITLAB_BACKUP_PATH'] %>
-     # archive_permissions: 0640 # Permissions for the resulting backup.tar file (default: 0600)
-     # keep_time: 604800   # default: 0 (forever) (in seconds)
-     # pg_schema: public     # default: nil, it means that all schemas will be backed up
-@@ -322,15 +322,15 @@ production: &base
- 
-   ## GitLab Shell settings
-   gitlab_shell:
--    path: /home/git/gitlab-shell/
-+    path: <%= ENV['GITLAB_SHELL_PATH'] %>
- 
-     # REPOS_PATH MUST NOT BE A SYMLINK!!!
--    repos_path: /home/git/repositories/
--    hooks_path: /home/git/gitlab-shell/hooks/
-+    repos_path: <%= ENV['GITLAB_REPOSITORIES_PATH'] %>
-+    hooks_path: <%= ENV['GITLAB_SHELL_HOOKS_PATH'] %>
- 
-     # File that contains the secret key for verifying access for gitlab-shell.
-     # Default is '.gitlab_shell_secret' relative to Rails.root (i.e. root of the GitLab app).
--    # secret_file: /home/git/gitlab/.gitlab_shell_secret
-+    secret_file: <%= ENV['GITLAB_SHELL_SECRET_PATH'] %>
- 
-     # Git over HTTP
-     upload_pack: true
-@@ -343,7 +343,7 @@ production: &base
+@@ -423,7 +422,7 @@ production: &base
    # CAUTION!
    # Use the default values unless you really know what you are doing
    git:
@@ -94,25 +30,82 @@ index 15930fc..bdb423c 100644
      # The next value is the maximum memory size grit can use
      # Given in number of bytes per git object (e.g. a commit)
      # This value can be increased if you have very large commits
-@@ -388,7 +388,7 @@ test:
-   gravatar:
-     enabled: true
-   gitlab:
--    host: localhost
-+    host: <%= ENV['GITLAB_HOST'] %>
-     port: 80
- 
-     # When you run tests we clone and setup gitlab-shell
-diff --git a/lib/gitlab/app_logger.rb b/lib/gitlab/app_logger.rb
-index dddcb25..d61f10a 100644
---- a/lib/gitlab/app_logger.rb
-+++ b/lib/gitlab/app_logger.rb
-@@ -1,7 +1,7 @@
- module Gitlab
-   class AppLogger < Gitlab::Logger
-     def self.file_name_noext
--      'application'
-+      ENV["GITLAB_APPLICATION_LOG_PATH"]
+
+diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb
+index 59b2114..4f4a39a 100644
+--- a/lib/gitlab/logger.rb
++++ b/lib/gitlab/logger.rb
+@@ -13,20 +13,20 @@ module Gitlab
      end
  
-     def format_message(severity, timestamp, progname, msg)
+     def self.read_latest
+-      path = Rails.root.join("log", file_name)
++      path = File.join(ENV["GITLAB_LOG_PATH"], file_name)
+       self.build unless File.exist?(path)
+       tail_output, _ = Gitlab::Popen.popen(%W(tail -n 2000 #{path}))
+       tail_output.split("\n")
+     end
+ 
+     def self.read_latest_for(filename)
+-      path = Rails.root.join("log", filename)
++      path = File.join(ENV["GITLAB_LOG_PATH"], filename)
+       tail_output, _ = Gitlab::Popen.popen(%W(tail -n 2000 #{path}))
+       tail_output.split("\n")
+     end
+ 
+     def self.build
+-      new(Rails.root.join("log", file_name))
++      new(File.join(ENV["GITLAB_LOG_PATH"], file_name))
+     end
+   end
+ end
+diff --git a/lib/gitlab/uploads_transfer.rb b/lib/gitlab/uploads_transfer.rb
+index be8fcc7..7642d74 100644
+--- a/lib/gitlab/uploads_transfer.rb
++++ b/lib/gitlab/uploads_transfer.rb
+@@ -29,7 +29,7 @@ module Gitlab
+     end
+ 
+     def root_dir
+-      File.join(Rails.root, "public", "uploads")
++      ENV['GITLAB_UPLOADS_PATH'] || File.join(Rails.root, "public", "uploads")
+     end
+   end
+ end
+diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
+index 81099cb..a40b1ad 100644
+--- a/lib/tasks/gitlab/check.rake
++++ b/lib/tasks/gitlab/check.rake
+@@ -223,7 +223,7 @@ namespace :gitlab do
+     def check_log_writable
+       print "Log directory writable? ... "
+ 
+-      log_path = Rails.root.join("log")
++      log_path = ENV["GITLAB_LOG_PATH"]
+ 
+       if File.writable?(log_path)
+         puts "yes".green
+@@ -263,10 +263,12 @@ namespace :gitlab do
+     def check_uploads
+       print "Uploads directory setup correctly? ... "
+ 
+-      unless File.directory?(Rails.root.join('public/uploads'))
++      uploads_dir = ENV['GITLAB_UPLOADS_PATH'] || Rails.root.join('public/uploads')
++
++      unless File.directory?(uploads_dir)
+         puts "no".red
+         try_fixing_it(
+-          "sudo -u #{gitlab_user} mkdir -m 750 #{Rails.root}/public/uploads"
++          "sudo -u #{gitlab_user} mkdir -m 750 #{uploads_dir}"
+         )
+         for_more_information(
+           see_installation_guide_section "GitLab"
+@@ -275,7 +277,7 @@ namespace :gitlab do
+         return
+       end
+ 
+-      upload_path = File.realpath(Rails.root.join('public/uploads'))
++      upload_path = File.realpath(Rails.root.join(uploads_dir))
+       upload_path_tmp = File.join(upload_path, 'tmp')
+ 
+       if File.stat(upload_path).mode == 040750
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f9d921d645b3..af321c93a54d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1719,14 +1719,14 @@ let
   gitinspector = callPackage ../applications/version-management/gitinspector { };
 
   gitlab = callPackage ../applications/version-management/gitlab {
-    ruby = ruby_2_2_2;
+    ruby = ruby_2_2;
   };
 
   gitlab-shell = callPackage ../applications/version-management/gitlab-shell {
-    ruby = ruby_2_2_2;
+    ruby = ruby_2_2;
   };
 
-  gitlab-git-http-server = callPackage ../applications/version-management/gitlab-git-http-server { };
+  gitlab-workhorse = callPackage ../applications/version-management/gitlab-workhorse { };
 
   git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { };
 

From 3fd51a9ab20660ef4153436ece24b23dc65bccc0 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 23 Feb 2016 22:55:35 +0100
Subject: [PATCH 1811/2285] fixup! gitlab: 8.0.5 -> 8.5.0, service improvements

Some debugging and development leftovers.
---
 nixos/modules/services/misc/gitlab.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 074f1a040b8b..eef23a0ae42c 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -39,6 +39,7 @@ let
   '';
 
   gitlabConfig = {
+    # These are the default settings from config/gitlab.example.yml
     production = flip recursiveUpdate cfg.extraConfig {
       gitlab = {
         host = cfg.host;
@@ -52,7 +53,7 @@ let
         default_projects_features = {
           issues = true;
           merge_requests = true;
-          wiki = false;
+          wiki = true;
           snippets = false;
           builds = true;
         };
@@ -241,7 +242,7 @@ in {
 
       extraConfig = mkOption {
         type = types.attrs;
-        default = "";
+        default = {};
         example = {
           gitlab = {
             default_projects_features = {
@@ -348,7 +349,6 @@ in {
         gitAndTools.git
         openssh
         nodejs
-        sudo
       ];
       preStart = ''
         mkdir -p ${cfg.backupPath}
@@ -400,7 +400,7 @@ in {
 
         if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then
           if ! test -e "${cfg.statePath}/db-created"; then
-            psql postgres -c "CREATE ROLE gitlab WITH LOGIN CREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'"
+            psql postgres -c "CREATE ROLE gitlab WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'"
             ${config.services.postgresql.package}/bin/createdb --owner gitlab gitlab || true
             touch "${cfg.statePath}/db-created"
 

From 44a4592a1ca763780ad189cfa8ecd20bc1209e3d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 26 Feb 2016 07:06:07 +0100
Subject: [PATCH 1812/2285] fixup! gitlab: 8.0.5 -> 8.5.0, service improvements

gitlab-shell is now talking over the unix socket to gitlab, so the TCP
port isn't needed anymore.
---
 nixos/modules/services/misc/defaultUnicornConfig.rb | 1 -
 nixos/modules/services/misc/gitlab.nix              | 7 +++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/misc/defaultUnicornConfig.rb b/nixos/modules/services/misc/defaultUnicornConfig.rb
index 81abaf336dc0..84622622db70 100644
--- a/nixos/modules/services/misc/defaultUnicornConfig.rb
+++ b/nixos/modules/services/misc/defaultUnicornConfig.rb
@@ -187,7 +187,6 @@ working_directory ENV["GITLAB_PATH"]
 pid ENV["UNICORN_PATH"] + "/tmp/pids/unicorn.pid"
 
 listen ENV["UNICORN_PATH"] + "/tmp/sockets/gitlab.socket", :backlog => 1024
-listen "127.0.0.1:8080", :tcp_nopush => true
 
 timeout 60
 
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index eef23a0ae42c..132b4348854f 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -12,6 +12,9 @@ let
 
   gemHome = "${pkgs.gitlab.env}/${ruby.gemPath}";
 
+  gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket";
+  pathUrlQuote = url: replaceStrings ["/"] ["%2F"] url;
+
   databaseYml = ''
     production:
       adapter: postgresql
@@ -24,7 +27,7 @@ let
 
   gitlabShellYml = ''
     user: ${cfg.user}
-    gitlab_url: "http://localhost:8080/"
+    gitlab_url: "http+unix://${pathUrlQuote gitlabSocket}"
     http_settings:
       self_signed_cert: false
     repos_path: "${cfg.statePath}/repositories"
@@ -335,7 +338,7 @@ in {
           + "-listenUmask 0 "
           + "-listenNetwork unix "
           + "-listenAddr /run/gitlab/gitlab-workhorse.socket "
-          + "-authSocket ${cfg.statePath}/tmp/sockets/gitlab.socket "
+          + "-authSocket ${gitlabSocket} "
           + "-documentRoot ${pkgs.gitlab}/share/gitlab/public";
       };
     };

From c2412bd700a0481786deb1ccd2f46bc0972ae7ee Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 26 Feb 2016 07:07:08 +0100
Subject: [PATCH 1813/2285] fixup! gitlab: 8.0.5 -> 8.5.0, service improvements

8.5.0 -> 8.5.1
---
 .../version-management/gitlab/Gemfile         |  4 +-
 .../version-management/gitlab/Gemfile.lock    |  5 +-
 .../version-management/gitlab/default.nix     |  4 +-
 .../version-management/gitlab/gemset.nix      | 50 +++++++++++--------
 .../gitlab/remove-hardcoded-locations.patch   | 13 +++--
 5 files changed, 44 insertions(+), 32 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/Gemfile b/pkgs/applications/version-management/gitlab/Gemfile
index ec40f2463945..fc7ad47919d4 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile
+++ b/pkgs/applications/version-management/gitlab/Gemfile
@@ -218,7 +218,7 @@ gem 'virtus',             '~> 1.0.1'
 gem 'net-ssh',            '~> 3.0.1'
 
 # Sentry integration
-gem 'sentry-raven'
+gem 'sentry-raven', '~> 0.15'
 
 # Metrics
 group :metrics do
@@ -303,6 +303,8 @@ group :production do
   gem "gitlab_meta", '7.0'
 end
 
+gem "newrelic_rpm", '~> 3.14'
+
 gem 'octokit', '~> 3.8.0'
 
 gem "mail_room", "~> 0.6.1"
diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock
index ff16e6284fab..2934988f8367 100644
--- a/pkgs/applications/version-management/gitlab/Gemfile.lock
+++ b/pkgs/applications/version-management/gitlab/Gemfile.lock
@@ -481,6 +481,7 @@ GEM
     net-ldap (0.12.1)
     net-ssh (3.0.1)
     netrc (0.11.0)
+    newrelic_rpm (3.14.1.311)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
     nprogress-rails (0.1.6.7)
@@ -724,7 +725,7 @@ GEM
       activesupport (>= 3.1, < 4.3)
     select2-rails (3.5.9.3)
       thor (~> 0.14)
-    sentry-raven (0.15.4)
+    sentry-raven (0.15.6)
       faraday (>= 0.7.6)
     settingslogic (2.0.9)
     sexp_processor (4.6.0)
@@ -963,6 +964,7 @@ DEPENDENCIES
   nested_form (~> 0.3.2)
   net-ssh (~> 3.0.1)
   nokogiri (~> 1.6.7, >= 1.6.7.2)
+  newrelic_rpm (~> 3.14)
   nprogress-rails (~> 0.1.6.7)
   oauth2 (~> 1.0.0)
   octokit (~> 3.8.0)
@@ -1010,6 +1012,7 @@ DEPENDENCIES
   sdoc (~> 0.3.20)
   seed-fu (~> 2.3.5)
   select2-rails (~> 3.5.9)
+  sentry-raven (~> 0.15)
   sentry-raven
   settingslogic (~> 2.0.9)
   sham_rack
diff --git a/pkgs/applications/version-management/gitlab/default.nix b/pkgs/applications/version-management/gitlab/default.nix
index 4e86768e0dd2..5f9983674308 100644
--- a/pkgs/applications/version-management/gitlab/default.nix
+++ b/pkgs/applications/version-management/gitlab/default.nix
@@ -24,7 +24,7 @@ in
 
 stdenv.mkDerivation rec {
   name = "gitlab-${version}";
-  version = "8.5.0";
+  version = "8.5.1";
 
   buildInputs = [ ruby bundler tzdata git nodejs procps ];
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     owner = "gitlabhq";
     repo = "gitlabhq";
     rev = "v${version}";
-    sha256 = "1rhl906xnvpxkw3ngwfzi80cl3daihx5vizy04b9b39adyd3i5hl";
+    sha256 = "1pn5r4axzjkgdjr59y3wgxsd2n83zfd5bry1g2w4c2qw0wcw7zqb";
   };
 
   patches = [
diff --git a/pkgs/applications/version-management/gitlab/gemset.nix b/pkgs/applications/version-management/gitlab/gemset.nix
index 95905fb7dfc2..f63a356a1f6d 100644
--- a/pkgs/applications/version-management/gitlab/gemset.nix
+++ b/pkgs/applications/version-management/gitlab/gemset.nix
@@ -534,12 +534,12 @@
     version = "2.0.9";
   };
   sentry-raven = {
+    version = "0.15.6";
     source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "1h0w2ip02zcd3krpddn54vssd7asnbj823r4mlzzqpp28q3r3mcm";
       type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "0iqnwfmf6rnpgrvl3c8gh2gkix91nhm21j5qf389g4mi2rkc0ky8";
     };
-    version = "0.15.4";
   };
   select2-rails = {
     dependencies = ["thor"];
@@ -612,12 +612,12 @@
     version = "1.0.4";
   };
   rugged = {
-    version = "0.24.0b13";
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
       sha256 = "0v0cvdw8cgy1hf5h3cx796zpxhbad8d5cm50nykyhwjc00q80zrr";
+      type = "gem";
     };
+    version = "0.24.0b13";
   };
   rufus-scheduler = {
     source = {
@@ -1324,20 +1324,20 @@
     version = "0.0.6";
   };
   omniauth = {
-    version = "1.3.1";
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
       sha256 = "0vsqxgzkcfi10b7k6vpv3shmlphbs8grc29hznwl9s0i16n8962p";
+      type = "gem";
     };
+    version = "1.3.1";
   };
   octokit = {
-    version = "3.8.0";
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
       sha256 = "0vmknh0vz1g734q32kgpxv0qwz9ifmnw2jfpd2w5rrk6xwq1k7a8";
+      type = "gem";
     };
+    version = "3.8.0";
   };
   oauth2 = {
     dependencies = ["faraday" "jwt" "multi_json" "multi_xml" "rack"];
@@ -1373,6 +1373,14 @@
     };
     version = "1.6.7.2";
   };
+  newrelic_rpm = {
+    version = "3.14.1.311";
+    source = {
+      type = "gem";
+      remotes = ["https://rubygems.org"];
+      sha256 = "155aj845rxn8ikcs15gphr8svnsrki8wzps794ddbi90h0ypr319";
+    };
+  };
   netrc = {
     source = {
       remotes = ["https://rubygems.org"];
@@ -1840,20 +1848,20 @@
     version = "7.0";
   };
   gitlab_git = {
-    version = "8.2.0";
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
       sha256 = "0311dl4vh6h7k8xarmpr61fndrhbmfskzjzkkj1rr8321gn8znfv";
+      type = "gem";
     };
+    version = "8.2.0";
   };
   gitlab_emoji = {
-    version = "0.3.1";
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
       sha256 = "1dy746icdmyc548mb5xkavvkn37pk7vv3gznx0p6hff325pan8dj";
+      type = "gem";
     };
+    version = "0.3.1";
   };
   gitlab-grit = {
     dependencies = ["charlock_holmes" "diff-lcs" "mime-types" "posix-spawn"];
@@ -1882,12 +1890,12 @@
     version = "1.3.3";
   };
   github-linguist = {
-    version = "4.7.5";
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
       sha256 = "1xxm2lbabkc1xmx2myv56a4fkw3wwg9n8w2bzwrl4s33kf6x62ag";
+      type = "gem";
     };
+    version = "4.7.5";
   };
   gherkin-ruby = {
     source = {
@@ -1906,12 +1914,12 @@
     version = "0.2.0";
   };
   gemojione = {
-    version = "2.2.1";
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
       sha256 = "0av60lajn64z1csmkzfaf5wvpd3x48lcshiknkqr8m0zx3sg7w3h";
+      type = "gem";
     };
+    version = "2.2.1";
   };
   gemnasium-gitlab-service = {
     dependencies = ["rugged"];
@@ -2853,20 +2861,20 @@
     version = "2.6.10";
   };
   allocations = {
-    version = "1.0.4";
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
       sha256 = "0iynf7gkbnbr5mgl2wgbgvxmjdiawh7ywwbnyjm94bj3pkybzgkc";
+      type = "gem";
     };
+    version = "1.0.4";
   };
   akismet = {
-    version = "2.0.0";
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
       sha256 = "0hqpn25iyypkwkrqaibjm5nss5jmlkrddhia7frmz94prvyjr02w";
+      type = "gem";
     };
+    version = "2.0.0";
   };
   after_commit_queue = {
     dependencies = ["activerecord"];
diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
index d188070296ca..fbf5a05fc4e6 100644
--- a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
+++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch
@@ -18,10 +18,10 @@ index 9095266..694a4c5 100644
    config.action_mailer.raise_delivery_errors = true
  
 diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
-index 05f127d..1daef74 100644
+index 05f127d..6a4ae68 100644
 --- a/config/gitlab.yml.example
 +++ b/config/gitlab.yml.example
-@@ -423,7 +422,7 @@ production: &base
+@@ -423,7 +423,7 @@ production: &base
    # CAUTION!
    # Use the default values unless you really know what you are doing
    git:
@@ -30,7 +30,6 @@ index 05f127d..1daef74 100644
      # The next value is the maximum memory size grit can use
      # Given in number of bytes per git object (e.g. a commit)
      # This value can be increased if you have very large commits
-
 diff --git a/lib/gitlab/logger.rb b/lib/gitlab/logger.rb
 index 59b2114..4f4a39a 100644
 --- a/lib/gitlab/logger.rb
@@ -73,7 +72,7 @@ index be8fcc7..7642d74 100644
    end
  end
 diff --git a/lib/tasks/gitlab/check.rake b/lib/tasks/gitlab/check.rake
-index 81099cb..a40b1ad 100644
+index d59872d..0b8007f 100644
 --- a/lib/tasks/gitlab/check.rake
 +++ b/lib/tasks/gitlab/check.rake
 @@ -223,7 +223,7 @@ namespace :gitlab do
@@ -95,8 +94,8 @@ index 81099cb..a40b1ad 100644
 +      unless File.directory?(uploads_dir)
          puts "no".red
          try_fixing_it(
--          "sudo -u #{gitlab_user} mkdir -m 750 #{Rails.root}/public/uploads"
-+          "sudo -u #{gitlab_user} mkdir -m 750 #{uploads_dir}"
+-          "sudo -u #{gitlab_user} mkdir #{Rails.root}/public/uploads"
++          "sudo -u #{gitlab_user} mkdir #{uploads_dir}"
          )
          for_more_information(
            see_installation_guide_section "GitLab"
@@ -108,4 +107,4 @@ index 81099cb..a40b1ad 100644
 +      upload_path = File.realpath(Rails.root.join(uploads_dir))
        upload_path_tmp = File.join(upload_path, 'tmp')
  
-       if File.stat(upload_path).mode == 040750
+       if File.stat(upload_path).mode == 040700

From e9393bd42607d1a6c7c10a835398437b906c008a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 26 Feb 2016 08:55:25 +0100
Subject: [PATCH 1814/2285] fixup! gitlab: 8.0.5 -> 8.5.0, service improvements

Make the gitlab packages and components overrideable.
---
 nixos/modules/services/misc/gitlab.nix | 52 +++++++++++++++++---------
 1 file changed, 35 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 132b4348854f..cc50bfbea531 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -7,10 +7,10 @@ with lib;
 let
   cfg = config.services.gitlab;
 
-  ruby = pkgs.gitlab.ruby;
+  ruby = cfg.packages.gitlab.ruby;
   bundler = pkgs.bundler;
 
-  gemHome = "${pkgs.gitlab.env}/${ruby.gemPath}";
+  gemHome = "${cfg.packages.gitlab.env}/${ruby.gemPath}";
 
   gitlabSocket = "${cfg.statePath}/tmp/sockets/gitlab.socket";
   pathUrlQuote = url: replaceStrings ["/"] ["%2F"] url;
@@ -91,7 +91,7 @@ let
         path = "${cfg.backupPath}";
       };
       gitlab_shell = {
-        path = "${pkgs.gitlab-shell}";
+        path = "${cfg.packages.gitlab-shell}";
         repos_path = "${cfg.statePath}/repositories";
         hooks_path = "${cfg.statePath}/shell/hooks";
         secret_file = "${cfg.statePath}/config/gitlab_shell_secret";
@@ -110,13 +110,13 @@ let
   gitlabEnv = {
     HOME = "${cfg.statePath}/home";
     GEM_HOME = gemHome;
-    BUNDLE_GEMFILE = "${pkgs.gitlab}/share/gitlab/Gemfile";
+    BUNDLE_GEMFILE = "${cfg.packages.gitlab}/share/gitlab/Gemfile";
     UNICORN_PATH = "${cfg.statePath}/";
-    GITLAB_PATH = "${pkgs.gitlab}/share/gitlab/";
+    GITLAB_PATH = "${cfg.packages.gitlab}/share/gitlab/";
     GITLAB_STATE_PATH = "${cfg.statePath}";
     GITLAB_UPLOADS_PATH = "${cfg.statePath}/uploads";
     GITLAB_LOG_PATH = "${cfg.statePath}/log";
-    GITLAB_SHELL_PATH = "${pkgs.gitlab-shell}";
+    GITLAB_SHELL_PATH = "${cfg.packages.gitlab-shell}";
     GITLAB_SHELL_CONFIG_PATH = "${cfg.statePath}/shell/config.yml";
     GITLAB_SHELL_SECRET_PATH = "${cfg.statePath}/config/gitlab_shell_secret";
     GITLAB_SHELL_HOOKS_PATH = "${cfg.statePath}/shell/hooks";
@@ -127,7 +127,7 @@ let
 
   gitlab-runner = pkgs.stdenv.mkDerivation rec {
     name = "gitlab-runner";
-    buildInputs = with pkgs; [ gitlab bundler makeWrapper ];
+    buildInputs = [ cfg.packages.gitlab bundler pkgs.makeWrapper ];
     phases = "installPhase fixupPhase";
     buildPhase = "";
     installPhase = ''
@@ -136,7 +136,7 @@ let
           ${concatStrings (mapAttrsToList (name: value: "--set ${name} '\"${value}\"' ") gitlabEnv)} \
           --set GITLAB_CONFIG_PATH '"${cfg.statePath}/config"' \
           --set PATH '"${pkgs.nodejs}/bin:${pkgs.gzip}/bin:${config.services.postgresql.package}/bin:$PATH"' \
-          --set RAKEOPT '"-f ${pkgs.gitlab}/share/gitlab/Rakefile"'
+          --set RAKEOPT '"-f ${cfg.packages.gitlab}/share/gitlab/Rakefile"'
     '';
   };
 
@@ -152,6 +152,24 @@ in {
         '';
       };
 
+      packages.gitlab = mkOption {
+        type = types.package;
+        default = pkgs.gitlab;
+        description = "Reference to the gitlab package";
+      };
+
+      packages.gitlab-shell = mkOption {
+        type = types.package;
+        default = pkgs.gitlab-shell;
+        description = "Reference to the gitlab-shell package";
+      };
+
+      packages.gitlab-workhorse = mkOption {
+        type = types.package;
+        default = pkgs.gitlab-workhorse;
+        description = "Reference to the gitlab-workhorse package";
+      };
+
       statePath = mkOption {
         type = types.str;
         default = "/var/gitlab/state";
@@ -263,7 +281,7 @@ in {
 
   config = mkIf cfg.enable {
 
-    environment.systemPackages = [ pkgs.git gitlab-runner pkgs.gitlab-shell ];
+    environment.systemPackages = [ pkgs.git gitlab-runner cfg.packages.gitlab-shell ];
 
     assertions = [
       { assertion = cfg.databasePassword != "";
@@ -309,7 +327,7 @@ in {
         User = cfg.user;
         Group = cfg.group;
         TimeoutSec = "300";
-        WorkingDirectory = "${pkgs.gitlab}/share/gitlab";
+        WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab";
         ExecStart="${bundler}/bin/bundle exec \"sidekiq -q post_receive -q mailer -q system_hook -q project_web_hook -q gitlab_shell -q common -q default -e production -P ${cfg.statePath}/tmp/sidekiq.pid\"";
       };
     };
@@ -334,12 +352,12 @@ in {
         Group = cfg.group;
         TimeoutSec = "300";
         ExecStart =
-          "${pkgs.gitlab-workhorse}/bin/gitlab-workhorse "
+          "${cfg.packages.gitlab-workhorse}/bin/gitlab-workhorse "
           + "-listenUmask 0 "
           + "-listenNetwork unix "
           + "-listenAddr /run/gitlab/gitlab-workhorse.socket "
           + "-authSocket ${gitlabSocket} "
-          + "-documentRoot ${pkgs.gitlab}/share/gitlab/public";
+          + "-documentRoot ${cfg.packages.gitlab}/share/gitlab/public";
       };
     };
 
@@ -384,9 +402,9 @@ in {
         chown -R ${cfg.user}:${cfg.group} ${gitlabEnv.HOME}/
         chmod -R u+rwX,go-rwx+X ${gitlabEnv.HOME}/
 
-        cp -rf ${pkgs.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
+        cp -rf ${cfg.packages.gitlab}/share/gitlab/config.dist/* ${cfg.statePath}/config
         ln -sf ${cfg.statePath}/config /run/gitlab/config
-        cp ${pkgs.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION
+        cp ${cfg.packages.gitlab}/share/gitlab/VERSION ${cfg.statePath}/VERSION
 
         # JSON is a subset of YAML
         ln -fs ${pkgs.writeText "gitlab.yml" (builtins.toJSON gitlabConfig)} ${cfg.statePath}/config/gitlab.yml
@@ -398,8 +416,8 @@ in {
 
         # Install the shell required to push repositories
         ln -fs ${pkgs.writeText "config.yml" gitlabShellYml} "$GITLAB_SHELL_CONFIG_PATH"
-        ln -fs ${pkgs.gitlab-shell}/hooks "$GITLAB_SHELL_HOOKS_PATH"
-        ${pkgs.gitlab-shell}/bin/install
+        ln -fs ${cfg.packages.gitlab-shell}/hooks "$GITLAB_SHELL_HOOKS_PATH"
+        ${cfg.packages.gitlab-shell}/bin/install
 
         if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then
           if ! test -e "${cfg.statePath}/db-created"; then
@@ -429,7 +447,7 @@ in {
         User = cfg.user;
         Group = cfg.group;
         TimeoutSec = "300";
-        WorkingDirectory = "${pkgs.gitlab}/share/gitlab";
+        WorkingDirectory = "${cfg.packages.gitlab}/share/gitlab";
         ExecStart="${bundler}/bin/bundle exec \"unicorn -c ${cfg.statePath}/config/unicorn.rb -E production\"";
       };
 

From cd0f14f23e9dd4eb36465c341cdc856457ac5bf0 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 26 Feb 2016 08:31:58 +0100
Subject: [PATCH 1815/2285] gitlab: Add documentation

Fixes #13303.
---
 .../manual/configuration/configuration.xml    |   1 +
 nixos/doc/manual/default.nix                  |   1 +
 .../doc/manual/release-notes/rl-unstable.xml  |   8 ++
 nixos/modules/services/misc/gitlab.xml        | 103 ++++++++++++++++++
 4 files changed, 113 insertions(+)
 create mode 100644 nixos/modules/services/misc/gitlab.xml

diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml
index 1e488b59343e..ff00c4feb31a 100644
--- a/nixos/doc/manual/configuration/configuration.xml
+++ b/nixos/doc/manual/configuration/configuration.xml
@@ -26,6 +26,7 @@ effect after you run <command>nixos-rebuild</command>.</para>
 
 <!-- FIXME: auto-include NixOS module docs -->
 <xi:include href="postgresql.xml" />
+<xi:include href="gitlab.xml" />
 <xi:include href="acme.xml" />
 <xi:include href="nixos.xml" />
 
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index b4eb3cde81bf..4eda7f94ab4a 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -56,6 +56,7 @@ let
       cp -prd $sources/* . # */
       chmod -R u+w .
       cp ${../../modules/services/databases/postgresql.xml} configuration/postgresql.xml
+      cp ${../../modules/services/misc/gitlab.xml} configuration/gitlab.xml
       cp ${../../modules/security/acme.xml} configuration/acme.xml
       cp ${../../modules/misc/nixos.xml} configuration/nixos.xml
       ln -s ${optionsDocBook} options-db.xml
diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 22e605718e33..5bad7f63b61e 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -231,6 +231,14 @@ programs.ibus.plugins = with pkgs; [ ibus-anthy mozc ];
     overriden by anything else.</para>
   </listitem>
 
+  <listitem>
+    <para>Large parts of the <literal>services.gitlab</literal> module has been
+    been rewritten. There are new configuration options available. The
+    <literal>stateDir</literal> option was renamned to
+    <literal>statePath</literal> and the <literal>satellitesDir</literal> option
+    was removed. Please review the currently available options.</para>
+  </listitem>
+
 </itemizedlist>
 
 
diff --git a/nixos/modules/services/misc/gitlab.xml b/nixos/modules/services/misc/gitlab.xml
new file mode 100644
index 000000000000..b630fe421130
--- /dev/null
+++ b/nixos/modules/services/misc/gitlab.xml
@@ -0,0 +1,103 @@
+<chapter xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xmlns:xi="http://www.w3.org/2001/XInclude"
+         version="5.0"
+         xml:id="module-services-gitlab">
+
+<title>Gitlab</title>
+
+<para>Gitlab is a feature-rich git hosting service.</para>
+
+<section><title>Prerequisites</title>
+
+<para>The gitlab service exposes only an Unix socket at
+<literal>/run/gitlab/gitlab-workhorse.socket</literal>. You need to configure a
+webserver to proxy HTTP requests to the socket.</para>
+
+<para>For instance, this could be used for Nginx:
+
+<programlisting>
+services.nginx.httpConfig = ''
+  server {
+    server_name git.example.com;
+    listen 443 ssl spdy;
+    listen [::]:443 ssl spdy;
+
+    ssl_certificate /var/lib/acme/git.example.com/fullchain.pem;
+    ssl_certificate_key /var/lib/acme/git.example.com/key.pem;
+
+    location / {
+      proxy_http_version 1.1;
+      proxy_set_header    Host                $http_host;
+      proxy_set_header    X-Real-IP           $remote_addr;
+      proxy_set_header    X-Forwarded-Ssl     on;
+      proxy_set_header    X-Forwarded-For     $proxy_add_x_forwarded_for;
+      proxy_set_header    X-Forwarded-Proto   $scheme;
+
+      proxy_pass http://unix:/run/gitlab/gitlab-workhorse.socket;
+    }
+  }
+'';
+</programlisting>
+</para>
+
+</section>
+
+<section><title>Configuring</title>
+
+<para>Gitlab depends on both PostgreSQL and Redis and will automatically enable
+both services. In the case of PostgreSQL, a database and a role will be created.
+</para>
+
+<para>The default state dir is /var/gitlab/state. This is where all data like
+the repositories and uploads will be stored.</para>
+
+<para>A basic configuration could look like this:
+
+<programlisting>
+services.gitlab = {
+  enable = true;
+  databasePassword = "eXaMpl3";
+  initialRootPassword = "UseNixOS!";
+  https = true;
+  host = "git.example.com";
+  port = 443;
+  user = "git";
+  group = "git";
+  extraConfig = {
+    gitlab = {
+      default_projects_features = { builds = false; };
+    };
+  };
+};
+</programlisting>
+</para>
+
+<para>Refer to <xref linkend="ch-options" /> for all available configuration
+options for the <literal>services.gitlab</literal> module.</para>
+
+</section>
+
+<section><title>Maintenance</title>
+
+<para>You can run all Gitlab related commands like rake tasks with
+<literal>gitlab-runner</literal> which will be available on the system
+when gitlab is enabled. You will have to run the commands as the user that
+you configured to run gitlab.</para>
+
+<para>For instance, to backup a Gitlab instance:
+
+<programlisting>
+$ sudo -u git -H gitlab-runner exec rake gitlab:backup:create
+</programlisting>
+
+A list of all availabe rake tasks can be obtained by running:
+
+<programlisting>
+$ sudo -u git -H gitlab-runner exec rake -T
+</programlisting>
+</para>
+
+</section>
+
+</chapter>

From bd5e2d723c773da0f0828f20e56d46ffdadf3c5b Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Fri, 26 Feb 2016 10:21:31 +0100
Subject: [PATCH 1816/2285] pcsx2: init at 1.4.0

---
 pkgs/misc/emulators/pcsx2/default.nix | 71 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 +
 2 files changed, 73 insertions(+)
 create mode 100644 pkgs/misc/emulators/pcsx2/default.nix

diff --git a/pkgs/misc/emulators/pcsx2/default.nix b/pkgs/misc/emulators/pcsx2/default.nix
new file mode 100644
index 000000000000..63b221c9a3dc
--- /dev/null
+++ b/pkgs/misc/emulators/pcsx2/default.nix
@@ -0,0 +1,71 @@
+{ alsaLib, cmake, fetchFromGitHub, glib, gtk2, gettext, libaio, libpng
+, makeWrapper, perl, pkgconfig, portaudio, SDL2, soundtouch, stdenv
+, wxGTK30, zlib }:
+
+assert stdenv.isi686;
+
+stdenv.mkDerivation rec {
+  name = "pcsx2-${version}";
+  version = "1.4.0";
+
+  src = fetchFromGitHub {
+    owner = "PCSX2";
+    repo = "pcsx2";
+    rev = "v${version}";
+    sha256 = "0s7mxq2cgzwjfsq0vhpz6ljk7wr725nxg48128iyirf85585l691";
+  };
+
+  configurePhase = ''
+    mkdir -p build
+    cd build
+
+    cmake \
+      -DBIN_DIR="$out/bin" \
+      -DCMAKE_BUILD_PO=TRUE \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DCMAKE_INSTALL_PREFIX="$out" \
+      -DDISABLE_PCSX2_WRAPPER=TRUE \
+      -DDOC_DIR="$out/share/doc/pcsx2" \
+      -DGAMEINDEX_DIR="$out/share/pcsx2" \
+      -DGLSL_SHADER_DIR="$out/share/pcsx2" \
+      -DGTK2_GLIBCONFIG_INCLUDE_DIR='${glib}/lib/glib-2.0/include' \
+      -DGTK2_GDKCONFIG_INCLUDE_DIR='${gtk2}/lib/gtk-2.0/include' \
+      -DGTK2_INCLUDE_DIRS='${gtk2}/include/gtk-2.0' \
+      -DPACKAGE_MODE=TRUE \
+      -DPLUGIN_DIR="$out/lib/pcsx2" \
+      -DREBUILD_SHADER=TRUE \
+      ..
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/PCSX2 \
+      --set __GL_THREADED_OPTIMIZATIONS 1
+  '';
+
+  nativeBuildInputs = [ cmake perl pkgconfig ];
+
+  buildInputs = [
+    alsaLib glib gettext gtk2 libaio libpng makeWrapper portaudio SDL2
+    soundtouch wxGTK30 zlib
+  ];
+
+  meta = with stdenv.lib; {
+    description = "Playstation 2 emulator";
+    longDescription= ''
+      PCSX2 is an open-source PlayStation 2 (AKA PS2) emulator. Its purpose
+      is to emulate the PS2 hardware, using a combination of MIPS CPU
+      Interpreters, Recompilers and a Virtual Machine which manages hardware
+      states and PS2 system memory. This allows you to play PS2 games on your
+      PC, with many additional features and benefits.
+    '';
+    homepage = http://pcsx2.net;
+    maintainers = with maintainers; [ hrdinka ];
+
+    # PCSX2's source code is released under LGPLv3+. It However ships
+    # additional data files and code that are licensed differently.
+    # This might be solved in future, for now we should stick with
+    # license.free
+    license = licenses.free;
+    platforms = platforms.i686;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ec1c1c0e788..7d18cc291306 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13154,6 +13154,8 @@ let
 
   paraview = callPackage ../applications/graphics/paraview { };
 
+  pcsx2 = callPackage_i686 ../misc/emulators/pcsx2 { };
+
   pencil = callPackage ../applications/graphics/pencil { };
 
   perseus = callPackage ../applications/science/math/perseus {};

From ef11f77c8f5f5b91f0a35c425554836b9ce52a2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 21 Feb 2016 12:20:10 -0300
Subject: [PATCH 1817/2285] eclipse-plugins-cup: fix plugin file names

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

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 40aa6b8385ec..40585f95013a 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -240,7 +240,8 @@ rec {
       mkdir -p $dropinDir/features
       unzip ${srcFeature} -d $dropinDir/features/
       mkdir -p $dropinDir/plugins
-      cp -v ${srcPlugin1} ${srcPlugin2} $dropinDir/plugins/
+      cp -v ${srcPlugin1} $dropinDir/plugins/''${srcPlugin1#*-}
+      cp -v ${srcPlugin2} $dropinDir/plugins/''${srcPlugin2#*-}
     '';
 
     meta = with stdenv.lib; {

From 205398c42792d89d7127a635207f38744c4e854b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 25 Feb 2016 17:51:45 -0300
Subject: [PATCH 1818/2285] eclipse-plugin-zest: init at 3.9.101

eclipse-plugins-cup: remove plugins.nix.orig that was wrongly added.
---
 pkgs/applications/editors/eclipse/plugins.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 40585f95013a..ee484e557786 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -396,4 +396,21 @@ rec {
     };
   };
 
+  zest = buildEclipseUpdateSite rec {
+    name = "zest-${version}";
+    version = "3.9.101";
+
+    src = fetchurl {
+      url = "http://archive.eclipse.org/tools/gef/downloads/drops/${version}/R201408150207/GEF-${name}.zip";
+      sha256 = "01scn7cmcrjcp387spjm8ifgwrwwi77ypildandbisfvhj3qqs7m";
+    };
+
+    meta = with stdenv.lib; {
+      homepage = https://www.eclipse.org/gef/zest/;
+      description = "The Eclipse Visualization Toolkit";
+      platforms = platforms.all;
+      maintainers = [ maintainers.romildo ];
+    };
+  };
+
 }

From 0e94a1be40bb4475b5fbdda73ddef76bb2e07444 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 26 Feb 2016 06:36:14 -0300
Subject: [PATCH 1819/2285] eclipse-plugins-cup: add dependency on the zest
 plugin

---
 pkgs/applications/editors/eclipse/plugins.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index ee484e557786..50975d061eb8 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -233,6 +233,8 @@ rec {
 
     srcs = [ srcFeature srcPlugin1 srcPlugin2 ];
 
+    propagatedBuildInputs = [ zest ];
+
     phases = [ "installPhase" ];
 
     installPhase = ''

From 459642b8de0ec77ed545786b1c63fbd8a66e38a7 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 26 Feb 2016 10:47:04 +0100
Subject: [PATCH 1820/2285] chromium/updater: Allow a single plugin arch

Until now, if we have a failure to fetch either the 32bit Debian package
or the 64bit Debian package, neither of these will be put into
sources.nix.

Unfortunately the beta/dev channels do not have a 32bit Debian package,
so even though there is a 64bit Debian package available we don't get
plugins *at* *all*.

This also introduces a nicer error message rather than just failing with
an assertion in fetchurl because we did not provide url/urls.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../browsers/chromium/source/update.nix       | 32 ++++++++++++-------
 .../networking/browsers/chromium/update.sh    |  5 +--
 2 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/source/update.nix b/pkgs/applications/networking/browsers/chromium/source/update.nix
index 49864cf1c7b0..77ebb9488e2e 100644
--- a/pkgs/applications/networking/browsers/chromium/source/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/update.nix
@@ -62,14 +62,18 @@ in rec {
       pname = if channel == "dev"
               then "google-chrome-unstable"
               else "google-chrome-${channel}";
-      arch = if stdenv.is64bit then "amd64" else "i386";
-      relpath = "${pname}/${pname}_${chanAttrs.version}-1_${arch}.deb";
-    in lib.optionalAttrs (chanAttrs ? sha256bin64) {
-      urls = map (url: "${url}/${relpath}") ([ debURL ] ++ debMirrors);
-      sha256 = if stdenv.is64bit
-               then chanAttrs.sha256bin64
-               else chanAttrs.sha256bin32;
-    };
+
+      mkUrls = arch: let
+        relpath = "${pname}/${pname}_${chanAttrs.version}-1_${arch}.deb";
+      in map (url: "${url}/${relpath}") ([ debURL ] ++ debMirrors);
+
+    in if stdenv.is64bit && chanAttrs ? sha256bin64 then {
+      urls = mkUrls "amd64";
+      sha256 = chanAttrs.sha256bin64;
+    } else if stdenv.is32bit && chanAttrs ? sha256bin32 then {
+      urls = mkUrls "i386";
+      sha256 = chanAttrs.sha256bin64;
+    } else throw "No Chrome plugins are available for your architecture.";
   };
 
   updateHelpers = writeText "update-helpers.sh" ''
@@ -91,11 +95,15 @@ in rec {
 
       deb_pre="${debURL}/$pname/$pname";
 
-      deb32=$(nix-prefetch-url "''${deb_pre}_$version-1_i386.deb");
-      deb64=$(nix-prefetch-url "''${deb_pre}_$version-1_amd64.deb");
+      deb32="$(nix-prefetch-url "''${deb_pre}_$version-1_i386.deb")" || :
+      deb64="$(nix-prefetch-url "''${deb_pre}_$version-1_amd64.deb")" || :
 
-      echo "$deb32.$deb64";
-      return 0;
+      if [ -n "$deb32" -o -n "$deb64" ]; then
+        echo "$deb32.$deb64";
+        return 0
+      else
+        return 1
+      fi
     }
 
     prefetch_sha()
diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh
index e079762420be..975e141e6685 100755
--- a/pkgs/applications/networking/browsers/chromium/update.sh
+++ b/pkgs/applications/networking/browsers/chromium/update.sh
@@ -77,9 +77,10 @@ get_channel_exprs()
         echo "  $channel = {";
         echo "    version = \"$version\";";
         echo "    sha256 = \"$main\";";
-        if [ "x${deb#*[a-z0-9].[a-z0-9]}" != "x$deb" ];
-        then
+        if [ "x${deb#[a-z0-9]}" != "x$deb" ]; then
             echo "    sha256bin32 = \"$deb32\";";
+        fi;
+        if [ "x${deb#*.[a-z0-9]}" != "x$deb" ]; then
             echo "    sha256bin64 = \"$deb64\";";
         fi;
         echo "  };";

From 716b79d3a5f3ee438942f59bfd879f46e66204ac Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 26 Feb 2016 10:53:52 +0100
Subject: [PATCH 1821/2285] chromium: Provide SHA256s for beta/dev plugins

As stated in the parent commit, the 32bit Chrome package is not
available upstream, so let's at least provide the SHA256 hash for the
64bit package.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/source/sources.nix             | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index 14d555722545..ff3df5923b18 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -3,10 +3,12 @@
   dev = {
     version = "50.0.2657.0";
     sha256 = "1xc66zsjd5snydf60di2k2vzwwcqs1p16yn4jbpj2khm9cmxmkmf";
+    sha256bin64 = "06v7r76pbc979f7ahmln0hmxzd8ipirh4128i0ygidj71xmg51mm";
   };
   beta = {
     version = "49.0.2623.63";
     sha256 = "07i4vqswkijnl7wi6r1a0n1jq54ackm01yf8h3hwcik8q10i1aq5";
+    sha256bin64 = "16pwimg672qaqb89zdvsr8dr7bz50mz7zf6cl0cf45kz7sn8wwlh";
   };
   stable = {
     version = "48.0.2564.116";

From d5a2c4cb05bd4274794fac2c268b2adb1901a749 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Fri, 26 Feb 2016 11:03:28 +0100
Subject: [PATCH 1822/2285] libinput: Add libwacom dependency

Fixes #13476 & #13147.
---
 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 013ebd9b9627..4db3913bdd2f 100644
--- a/pkgs/development/libraries/libinput/default.nix
+++ b/pkgs/development/libraries/libinput/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig
-, libevdev, mtdev, udev
+, libevdev, mtdev, udev, libwacom
 , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation
 , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support
 , testsSupport ? false, check ? null, valgrind ? null
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ pkgconfig ];
 
-  buildInputs = [ libevdev mtdev udev ]
+  buildInputs = [ libevdev mtdev udev libwacom ]
     ++ optionals eventGUISupport [ cairo glib gtk3 ]
     ++ optionals documentationSupport [ doxygen graphviz ]
     ++ optionals testsSupport [ check valgrind ];

From fbd857ab7235676731370f92c31e380b0a6aedff Mon Sep 17 00:00:00 2001
From: Philipp Hausmann <ph_git@314.ch>
Date: Fri, 26 Feb 2016 08:54:33 +0100
Subject: [PATCH 1823/2285] uhc: 1.1.9.2 -> 1.1.9.3

---
 pkgs/development/compilers/uhc/default.nix | 25 ++++++----------------
 pkgs/top-level/haskell-packages.nix        |  5 +----
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/compilers/uhc/default.nix b/pkgs/development/compilers/uhc/default.nix
index 93aa7811449a..df79b0ba70ee 100644
--- a/pkgs/development/compilers/uhc/default.nix
+++ b/pkgs/development/compilers/uhc/default.nix
@@ -1,23 +1,17 @@
 # Note: The Haskell package set used for building UHC is
 # determined in the file top-level/haskell-packages.nix.
-# We are using Stackage LTS to avoid constant breakage.
-# Bump the Stackage LTS release to the last release if possible
-# when a new UHC version is released.
-{ stdenv, coreutils, fetchgit, m4, libtool, clang, ghcWithPackages }:
+{ stdenv, coreutils, m4, libtool, clang, ghcWithPackages, fetchFromGitHub }:
 
 let wrappedGhc = ghcWithPackages (hpkgs: with hpkgs; [fgl vector syb uulib network binary hashable uhc-util mtl transformers directory containers array process filepath shuffle uuagc] );
 in stdenv.mkDerivation rec {
-  # Important:
-  # The commits "Fixate/tag v..." are the released versions.
-  # Ignore the "bumped version to ...." commits, they do not
-  # correspond to releases.
-  version = "1.1.9.2";
+  version = "1.1.9.3";
   name = "uhc-${version}";
 
-  src = fetchgit {
-    url = "https://github.com/UU-ComputerScience/uhc.git";
-    rev = "292d259113b98c32154a5be336875751caa5edbc";
-    sha256 = "1f462xq9ilkp9mnxm8hxhh1cdwps5d0hxysyibxryk32l7hh53cz";
+  src = fetchFromGitHub {
+    owner = "UU-ComputerScience";
+    repo = "uhc";
+    rev = "v${version}";
+    sha256 = "1r3mja77dqj2ncgp1d9nnc7dhp3gzrb1b1qvml3rq2321mn3m2ad";
   };
 
   postUnpack = "sourceRoot=\${sourceRoot}/EHC";
@@ -55,10 +49,5 @@ in stdenv.mkDerivation rec {
     # On Darwin, the GNU libtool is used, which does not
     # support the -static flag and thus breaks the build.
     platforms = ["x86_64-linux"];
-    # Hydra currently doesn't build the Stackage LTS package set,
-    # and we don't want to build all our haskell dependencies
-    # from scratch just to build UHC.
-    hydraPlatforms = stdenv.lib.platforms.none;
-
   };
 }
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 404d0968d40e..86628cc503fd 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -65,10 +65,7 @@ rec {
 
     uhc = callPackage ../development/compilers/uhc/default.nix ({
       stdenv = pkgs.clangStdenv;
-      # UHC 1.1.9.2 is incompatible with hashable 1.2.4.0,
-      # latest LTS with a compatible hashable is LTS 4.1
-      # See also https://github.com/UU-ComputerScience/uhc/issues/69
-      inherit (pkgs.haskell.packages.lts-4_1) ghcWithPackages;
+      inherit (pkgs.haskellPackages) ghcWithPackages;
     });
 
   };

From 13f0bb7a53d57f145118057fb28dbd38ebd7ce8e Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Fri, 26 Feb 2016 11:18:02 +0100
Subject: [PATCH 1824/2285] libretro-mame: init at git-2016-02-10

---
 pkgs/misc/emulators/retroarch/cores.nix | 17 +++++++++++++++--
 pkgs/top-level/all-packages.nix         |  1 +
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix
index 07d665503791..332357e317e3 100644
--- a/pkgs/misc/emulators/retroarch/cores.nix
+++ b/pkgs/misc/emulators/retroarch/cores.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchgit, pkgconfig, makeWrapper, python27, retroarch
-, fluidsynth, mesa, SDL, ffmpeg, libpng, libjpeg, libvorbis, zlib }:
+, alsaLib, fluidsynth, mesa, portaudio, SDL, ffmpeg, libpng, libjpeg
+, libvorbis, zlib }:
 
 let
 
@@ -33,7 +34,7 @@ let
       inherit description;
       homepage = "http://www.libretro.com/";
       license = licenses.gpl3Plus;
-      maintainers = with maintainers; [ edwtjo MP2E ];
+      maintainers = with maintainers; [ edwtjo hrdinka MP2E ];
       platforms = platforms.linux;
     };
   } // a);
@@ -133,6 +134,18 @@ in
     description = "Enhanced Genesis Plus libretro port";
   };
 
+  mame = mkLibRetroCore {
+    core = "mame";
+    src = fetchRetro {
+      repo = "mame";
+      rev = "8da2303292bb8530f9f4ffad8bf1df95ee4cab74";
+      sha256 = "0rzy5klp8vf9vc8fylbdnp2qcvl1nkgw5a55ljqc5vich4as5alq";
+    };
+    description = "Port of MAME to libretro";
+
+    extraBuildInputs = [ alsaLib portaudio python27 ];
+  };
+
   mednafen-pce-fast = (mkLibRetroCore rec {
     core = "mednafen-pce-fast";
     src = fetchRetro {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ec1c1c0e788..3cd8770b5849 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14013,6 +14013,7 @@ let
       ++ optional (cfg.enableFceumm or false) fceumm
       ++ optional (cfg.enableGambatte or false) gambatte
       ++ optional (cfg.enableGenesisPlusGX or false) genesis-plus-gx
+      ++ optional (cfg.enableMAME or false) mame
       ++ optional (cfg.enableMednafenPCEFast or false) mednafen-pce-fast
       ++ optional (cfg.enableMupen64Plus or false) mupen64plus
       ++ optional (cfg.enableNestopia or false) nestopia

From 66febbdfa79b228e188cd2580a98e9240018dcc5 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 26 Feb 2016 16:26:26 +0100
Subject: [PATCH 1825/2285] Temporarily revert LibreOffice update

---
 .../office/libreoffice/default.nix            | 32 ++++++++-----------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 7c73e7b808c7..30a4a47896ab 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip
 , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd
 , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
-, bison, flex, zip, unzip, gtk3, gtk, libmspack, getopt, file, cairo, which
+, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, cups, xorg, libcmis
 , openssl, gperf, cppunit, GConf, ORBit2, poppler
 , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw
@@ -11,7 +11,7 @@
 , fontsConf, pkgconfig, libzip, bluez5, libtool, maven
 , libatomic_ops, graphite2, harfbuzz, libodfgen
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
-, gdb, commonsLogging, librdf_rasqal
+, gdb, commonsLogging
 , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ]
 , withHelp ? true
 }:
@@ -19,9 +19,9 @@
 let
   langsSpaces = stdenv.lib.concatStringsSep " " langs;
   major = "5";
-  minor = "1";
-  patch = "0";
-  tweak = "3";
+  minor = "0";
+  patch = "4";
+  tweak = "2";
   subdir = "${major}.${minor}.${patch}";
   version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
 
@@ -47,14 +47,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "1qqffq7646yh7rskzd1wvy0zgkdnkpdbyhvsny424lxqjglyw3px";
+      sha256 = "1kdrs49agqhb2b687hqh6sq7328z2sf04dmhb3xv5zy4rjvv5pha";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "0ixlq6yzn6z8hsih24l934sa05vvz2vk3p03nalpqqrhm7vdzsf2";
+      sha256 = "005jwny8xmsnvvh0xkk9csnqv2jkaslr2n9xm82bqalcg81j0g2x";
     };
 
   };
@@ -63,17 +63,12 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "1csphxpbpc7bxrwnl5i9nvm3bh3p0j7r3h9ivsdl7cys13q066xl";
+    sha256 = "1j3dmk5xifcgmd6dgqqifzh8wmc7daqfbkvk6cxa94611yvl0x34";
   };
 
   # Openoffice will open libcups dynamically, so we link it directly
   # to make its dlopen work.
-  # It also seems not to mention libdl explicitly in some places.
-  NIX_LDFLAGS = "-lcups -ldl";
-
-  # For some reason librdf_redland sometimes refers to rasqal.h instead 
-  # of rasqal/rasqal.h
-  NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal";
+  NIX_LDFLAGS = "-lcups";
 
   # If we call 'configure', 'make' will then call configure again without parameters.
   # It's their system.
@@ -117,8 +112,6 @@ in stdenv.mkDerivation rec {
     # http://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html
     echo > ./sd/CppunitTest_sd_tiledrendering.mk
     sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk
-    # one more fragile test?
-    sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
   '';
 
   makeFlags = "SHELL=${bash}/bin/bash";
@@ -188,6 +181,7 @@ in stdenv.mkDerivation rec {
 
     # I imagine this helps. Copied from go-oo.
     # Modified on every upgrade, though
+    "--disable-kde"
     "--disable-odk"
     "--disable-postgresql-sdbc"
     "--disable-firebird-sdbc"
@@ -219,18 +213,18 @@ in stdenv.mkDerivation rec {
   buildInputs = with xorg;
     [ ant ArchiveZip autoconf automake bison boost cairo clucene_core
       CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig
-      freetype GConf getopt gnome_vfs gperf gtk3 gtk
+      freetype GConf getopt gnome_vfs gperf gtk
       hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg
       libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
       libXaw libXext libXi libXinerama libxml2 libxslt libXtst
       libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
       gst_all_1.gst-plugins-base
-      neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
+      neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler
       python3 sablotron sane-backends tcsh unzip vigra which zip zlib
       mdds bluez5 glibc libcmis libwps libabw
       libxshmfence libatomic_ops graphite2 harfbuzz
       librevenge libe-book libmwaw glm glew
-      libodfgen CoinMP librdf_rasqal
+      libodfgen CoinMP
     ];
 
   meta = with stdenv.lib; {

From d9c10d6f56ab07c9387efe74a6202c19bb744f6c Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 26 Feb 2016 17:14:21 +0300
Subject: [PATCH 1826/2285] gutenprint: fix cups and gimp paths

Also disable GIMP support by default to reduce closure
---
 pkgs/misc/drivers/gutenprint/default.nix | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/drivers/gutenprint/default.nix b/pkgs/misc/drivers/gutenprint/default.nix
index 5be7f5ecff4d..e53ddf7143b3 100644
--- a/pkgs/misc/drivers/gutenprint/default.nix
+++ b/pkgs/misc/drivers/gutenprint/default.nix
@@ -1,7 +1,7 @@
 # this package was called gimp-print in the past
 { stdenv, lib, fetchurl, pkgconfig
 , ijs, makeWrapper
-, gimp2Support ? true, gimp
+, gimp2Support ? false, gimp
 , cupsSupport ? true, cups, libusb, perl
 }:
 
@@ -23,15 +23,25 @@ stdenv.mkDerivation rec {
     "--disable-static-genppd" # should be harmless on NixOS
   ];
 
+  # FIXME: hacky because we modify generated configure, but I haven't found a better way.
+  # makeFlags doesn't change this everywhere (e.g. in cups-genppdupdate).
+  preConfigure = lib.optionalString cupsSupport ''
+    sed -i \
+      -e "s,cups_conf_datadir=.*,cups_conf_datadir=\"$out/share/cups\",g" \
+      -e "s,cups_conf_serverbin=.*,cups_conf_serverbin=\"$out/lib/cups\",g" \
+      -e "s,cups_conf_serverroot=.*,cups_conf_serverroot=\"$out/etc/cups\",g" \
+      configure
+  '' + lib.optionalString gimp2Support ''
+    sed -i \
+      -e "s,gimp2_plug_indir=.*,gimp2_plug_indir=\"$out/lib/gimp/${gimp.majorVersion}\",g" \
+      configure
+  '';
+
   enableParallelBuilding = true;
 
   # Testing is very, very long.
   # doCheck = true;
 
-  installFlags =
-    lib.optionals cupsSupport [ "cups_conf_datadir=$(out)/share/cups" "cups_conf_serverbin=$(out)/lib/cups" "cups_conf_serverroot=$(out)/etc/cups" ]
-    ++ lib.optionals gimp2Support [ "gimp2_plug_indir=$(out)/${gimp.name}-plugins" ];
-
   meta = with stdenv.lib; {
     description = "Ghostscript and cups printer drivers";
     homepage = http://sourceforge.net/projects/gimp-print/;

From c88a06a860c9e2ee6a54824626d5a1041ddaf8d7 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 26 Feb 2016 17:40:52 +0300
Subject: [PATCH 1827/2285] cups service: set path for cups-genppdupdate

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

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index 98fb33e3256c..80d11565e47d 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -310,7 +310,7 @@ in
               [ ! -e "/var/lib/cups/$i" ] && ln -s "${rootdir}/etc/cups/$i" "/var/lib/cups/$i"
             done
             ${optionalString cfg.gutenprint ''
-              ${gutenprint}/bin/cups-genppdupdate
+              ${gutenprint}/bin/cups-genppdupdate -p /etc/cups/ppd
             ''}
           '';
       };

From 32e954db64c0c0118fbc1c542374a20ba57fccca Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 26 Feb 2016 16:28:00 +0100
Subject: [PATCH 1828/2285] Reverting dependency src for revert

---
 .../office/libreoffice/libreoffice-srcs.nix   | 117 +++++++++---------
 1 file changed, 56 insertions(+), 61 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index 21a16a5fc69e..a70d5a7c77c3 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -4,6 +4,21 @@
   md5 = "7a3815b506d064313ba309617b6f5a0b";
   brief = true;
 }
+{
+  name = "commons-codec-1.6-src.tar.gz";
+  md5 = "2e482c7567908d334785ce7d69ddfff7";
+  brief = false;
+}
+{
+  name = "commons-httpclient-3.1-src.tar.gz";
+  md5 = "2c9b0f83ed5890af02c0df1c1776f39b";
+  brief = false;
+}
+{
+  name = "commons-lang-2.4-src.tar.gz";
+  md5 = "625ff5f2f968dd908bca43c9469d6e6b";
+  brief = false;
+}
 {
   name = "commons-logging-1.2-src.tar.gz";
   md5 = "ce977548f1cbf46918e93cd38ac35163";
@@ -20,28 +35,23 @@
   brief = true;
 }
 {
-  name = "boost_1_59_0.tar.bz2";
-  md5 = "6aa9a5c6a4ca1016edd0ed1178e3cb87";
-  brief = true;
+  name = "boost_1_55_0.tar.bz2";
+  md5 = "d6eef4b4cacb2183f2bf265a5a03a354";
+  brief = false;
 }
 {
   name = "bsh-2.0b5-src.zip";
   md5 = "ec1941a74d3ef513c4ce57a9092b74e1";
   brief = false;
 }
-{
-  name = "bzip2-1.0.6.tar.gz";
-  md5 = "00b516f4704d4a7cb50a1d97e6e8e15b";
-  brief = false;
-}
 {
   name = "cairo-1.10.2.tar.gz";
   md5 = "f101a9e88b783337b20b2e26dfd26d5f";
   brief = false;
 }
 {
-  name = "libcdr-0.1.2.tar.bz2";
-  md5 = "6e3062b55b149d7b3c6aedb3bb5b86e2";
+  name = "libcdr-0.1.1.tar.bz2";
+  md5 = "b33fd0be3befdd1b37777e08ce058bd9";
   brief = true;
 }
 {
@@ -90,8 +100,8 @@
   brief = false;
 }
 {
-  name = "libetonyek-0.1.6.tar.bz2";
-  md5 = "77ff46936dcc83670557274e7dd2aa33";
+  name = "libetonyek-0.1.3.tar.bz2";
+  md5 = "e5947373dd7834f27e93f1636faa419f";
   brief = true;
 }
 {
@@ -100,8 +110,8 @@
   brief = false;
 }
 {
-  name = "Firebird-2.5.4.26856-0.tar.bz2";
-  md5 = "7a17ec9889424b98baa29e001a054434";
+  name = "Firebird-2.5.2.26540-0.tar.bz2";
+  md5 = "21154d2004e025c8a3666625b0357bb5";
   brief = true;
 }
 {
@@ -120,8 +130,8 @@
   brief = false;
 }
 {
-  name = "dejavu-fonts-ttf-2.35.zip";
-  md5 = "d8b5214d35bcd2bfcb2cffa7795b351d";
+  name = "dejavu-fonts-ttf-2.34.zip";
+  md5 = "a4e565e220b5de082c23995e256e3c12";
   brief = false;
 }
 {
@@ -175,8 +185,8 @@
   brief = false;
 }
 {
-  name = "glew-1.12.0.zip";
-  md5 = "3941e9cab2f4f9d8faee3e8d57ae7664";
+  name = "glew-1.10.0.zip";
+  md5 = "594eb47b4b1210e25438d51825404d5a";
   brief = false;
 }
 {
@@ -185,14 +195,9 @@
   brief = false;
 }
 {
-  name = "glyphy-0.2.0.tar.bz2";
-  md5 = "5d303fb955beb9bf112267316ca9d021";
-  brief = false;
-}
-{
-  name = "graphite2-minimal-1.3.4.tgz";
-  md5 = "5c0c9ac0996fbb4a0e17780ff5441959";
-  brief = false;
+  name = "graphite2-1.2.4.tgz";
+  md5 = "2ef839348fe28e3b923bf8cced440227";
+  brief = true;
 }
 {
   name = "harfbuzz-0.9.40.tar.bz2";
@@ -215,8 +220,8 @@
   brief = false;
 }
 {
-  name = "icu4c-56_1-src.tgz";
-  md5 = "c4a2d71ff56aec5ebfab2a3f059be99d";
+  name = "icu4c-54_1-src.tgz";
+  md5 = "e844caed8f2ca24c088505b0d6271bc0";
   brief = false;
 }
 {
@@ -280,8 +285,8 @@
   brief = true;
 }
 {
-  name = "libjpeg-turbo-1.4.2.tar.gz";
-  md5 = "86b0d5f7507c2e6c21c00219162c3c44";
+  name = "libjpeg-turbo-1.3.1.tar.gz";
+  md5 = "2c3a68129dac443a72815ff5bb374b05";
   brief = true;
 }
 {
@@ -321,8 +326,8 @@
   subDir = "libgltf/";
 }
 {
-  name = "liblangtag-0.5.8.tar.bz2";
-  md5 = "aa899eff126216dafe721149fbdb511b";
+  name = "liblangtag-0.5.1.tar.bz2";
+  md5 = "36271d3fa0d9dec1632029b6d7aac925";
   brief = false;
 }
 {
@@ -361,8 +366,8 @@
   brief = true;
 }
 {
-  name = "libmwaw-0.3.7.tar.bz2";
-  md5 = "4a8a53a9d997cf0e2bd208178797dbfb";
+  name = "libmwaw-0.3.5.tar.bz2";
+  md5 = "bdc58bbf89aaaf6d29b3516d96830a06";
   brief = true;
 }
 {
@@ -386,8 +391,8 @@
   brief = false;
 }
 {
-  name = "libodfgen-0.1.6.tar.bz2";
-  md5 = "32572ea48d9021bbd6fa317ddb697abc";
+  name = "libodfgen-0.1.4.tar.bz2";
+  md5 = "8716be5c22ae8353f9aaa380d74840dc";
   brief = true;
 }
 {
@@ -406,14 +411,9 @@
   brief = true;
 }
 {
-  name = "liborcus-0.9.2.tar.gz";
-  md5 = "e6efcbe50a5fd4d50d513c9a7a4139b0";
-  brief = true;
-}
-{
-  name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
-  md5 = "593f0aa47bf2efc0efda2d28fae063b2";
-  brief = true;
+  name = "liborcus-0.7.0.tar.bz2";
+  md5 = "7681383be6ce489d84c1c74f4e7f9643";
+  brief = false;
 }
 {
   name = "libpagemaker-0.0.2.tar.bz2";
@@ -426,8 +426,8 @@
   brief = false;
 }
 {
-  name = "libpng-1.6.19.tar.gz";
-  md5 = "3121bdc77c365a87e054b9f859f421fe";
+  name = "libpng-1.5.24.tar.gz";
+  md5 = "6652e428d1d3fc3c6cb1362159b1cf3b";
   brief = true;
 }
 {
@@ -445,11 +445,6 @@
   md5 = "803a75927f8f241ca78633890c798021";
   brief = true;
 }
-{
-  name = "Python-3.5.0.tgz";
-  md5 = "a56c0c0b45d75a0ec9c6dee933c41c36";
-  brief = true;
-}
 {
   name = "raptor2-2.0.9.tar.gz";
   md5 = "4ceb9316488b0ea01acf011023cf7fff";
@@ -466,8 +461,8 @@
   brief = false;
 }
 {
-  name = "librevenge-0.0.4.tar.bz2";
-  md5 = "5b9ac52ec77d4d19157cf5962ebc0aea";
+  name = "librevenge-0.0.2.tar.bz2";
+  md5 = "2d4183bf17aea1a71842468a71a68c47";
   brief = true;
 }
 {
@@ -496,23 +491,23 @@
   brief = false;
 }
 {
-  name = "libvisio-0.1.5.tar.bz2";
-  md5 = "cbee198a78b842b2087f32d33c522818";
+  name = "libvisio-0.1.1.tar.bz2";
+  md5 = "726c1f5be65eb7d649e0d48b63d920e7";
   brief = true;
 }
 {
-  name = "libwpd-0.10.1.tar.bz2";
-  md5 = "79b56bcc349264d686a67994506ad199";
+  name = "libwpd-0.10.0.tar.bz2";
+  md5 = "0773d79a1f240ef9f4f20242b13c5bb7";
   brief = true;
 }
 {
-  name = "libwpg-0.3.1.tar.bz2";
-  md5 = "dfd066658ec9d2fb2262417039a8a1c3";
+  name = "libwpg-0.3.0.tar.bz2";
+  md5 = "17da9770cb8b317b7633f9807b32b71a";
   brief = true;
 }
 {
-  name = "libwps-0.4.2.tar.bz2";
-  md5 = "8a6c55542ce80203dd6d3b1cba99d4e5";
+  name = "libwps-0.4.0.tar.bz2";
+  md5 = "e9162d2566421d9d71b3ad2377a68fd5";
   brief = true;
 }
 {

From 53ea7dee75b90181683c59869940db85cabc2d78 Mon Sep 17 00:00:00 2001
From: Charles Strahan <charles.c.strahan@gmail.com>
Date: Fri, 26 Feb 2016 12:27:04 -0500
Subject: [PATCH 1829/2285] emacs: fix priority for ctags

This fixes the previous attempt (in commit 46d1dd5) to make ctags' ctags
override emacs' ctags. The higher the value of the priority attribute,
the higher the priority (see the definition of `buildEnv`).
---
 pkgs/applications/editors/emacs-24/default.nix | 3 ---
 pkgs/development/tools/misc/ctags/default.nix  | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/emacs-24/default.nix b/pkgs/applications/editors/emacs-24/default.nix
index 35fcaecb1120..ffa280d360c5 100644
--- a/pkgs/applications/editors/emacs-24/default.nix
+++ b/pkgs/applications/editors/emacs-24/default.nix
@@ -86,9 +86,6 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ chaoflow lovek323 simons the-kenny jwiegley ];
     platforms   = platforms.all;
 
-    # So that Exuberant ctags is preferred
-    priority = 1;
-
     longDescription = ''
       GNU Emacs is an extensible, customizable text editor—and more.  At its
       core is an interpreter for Emacs Lisp, a dialect of the Lisp
diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix
index 26b186c11eab..584095c904d5 100644
--- a/pkgs/development/tools/misc/ctags/default.nix
+++ b/pkgs/development/tools/misc/ctags/default.nix
@@ -29,6 +29,9 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ simons ];
     platforms = platforms.unix;
+
+    # So that Exuberant ctags is preferred over emacs's ctags
+    priority = 1;
   };
 
 }

From 58dbaf69b7abd7a3483d47bd4eede02d68fcdc78 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 20 Feb 2016 00:19:49 +0000
Subject: [PATCH 1830/2285] go: remove ssl certs patches

Those are not needed since we now use a standard location to store our
bundles.

See bfebc7342e42ebe7a57c9e21b11ab19579189bfd
---
 pkgs/development/compilers/go/1.4.nix          |  1 -
 pkgs/development/compilers/go/1.5.nix          |  1 -
 pkgs/development/compilers/go/cacert-1.4.patch | 14 --------------
 pkgs/development/compilers/go/cacert-1.5.patch |  8 --------
 4 files changed, 24 deletions(-)
 delete mode 100644 pkgs/development/compilers/go/cacert-1.4.patch
 delete mode 100644 pkgs/development/compilers/go/cacert-1.5.patch

diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index d25001697443..77349a810845 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -84,7 +84,6 @@ stdenv.mkDerivation rec {
   '';
 
   patches = [
-    ./cacert-1.4.patch
     ./remove-tools-1.4.patch
   ];
 
diff --git a/pkgs/development/compilers/go/1.5.nix b/pkgs/development/compilers/go/1.5.nix
index 54c8cf219d5f..b5bfac850280 100644
--- a/pkgs/development/compilers/go/1.5.nix
+++ b/pkgs/development/compilers/go/1.5.nix
@@ -89,7 +89,6 @@ stdenv.mkDerivation rec {
   '';
 
   patches = [
-    ./cacert-1.5.patch
     ./remove-tools-1.5.patch
   ]
   # -ldflags=-s is required to compile on Darwin, see
diff --git a/pkgs/development/compilers/go/cacert-1.4.patch b/pkgs/development/compilers/go/cacert-1.4.patch
deleted file mode 100644
index 5346d3f39505..000000000000
--- a/pkgs/development/compilers/go/cacert-1.4.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Go comes with hardcoded cacert. We add the usual in NixOS,
-for easier NixOS life.
-
-diff -r 14854533dcc7 src/crypto/x509/root_unix.go
---- a/src/crypto/x509/root_unix.go	Thu Dec 11 11:27:56 2014 +1100
-+++ b/src/crypto/x509/root_unix.go	Tue Jan 06 00:41:31 2015 -0600
-@@ -17,6 +17,7 @@
- 	"/usr/local/share/certs/ca-root-nss.crt", // FreeBSD/DragonFly
- 	"/etc/pki/tls/cacert.pem",                // OpenELEC
- 	"/etc/certs/ca-certificates.crt",         // Solaris 11.2+
-+	"/etc/ssl/certs/ca-bundle.crt",           // NixOS
- }
- 
- // Possible directories with certificate files; stop after successfully
diff --git a/pkgs/development/compilers/go/cacert-1.5.patch b/pkgs/development/compilers/go/cacert-1.5.patch
deleted file mode 100644
index 32c322a104e6..000000000000
--- a/pkgs/development/compilers/go/cacert-1.5.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/src/crypto/x509/root_linux.go	2015-08-19 23:06:11.115133174 +0200
-+++ b/src/crypto/x509/root_linux.go	2015-08-19 23:07:04.238507161 +0200
-@@ -10,4 +10,5 @@
- 	"/etc/pki/tls/certs/ca-bundle.crt",   // Fedora/RHEL
- 	"/etc/ssl/ca-bundle.pem",             // OpenSUSE
- 	"/etc/pki/tls/cacert.pem",            // OpenELEC
-+	"/etc/ssl/certs/ca-bundle.crt",       // NixOS
- }

From accc1f1484ad6721d03063d148ea46c85dc76a68 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 20 Feb 2016 01:04:42 +0000
Subject: [PATCH 1831/2285] go: 1.4: disable failing test in sandbox

---
 pkgs/development/compilers/go/1.4.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/go/1.4.nix b/pkgs/development/compilers/go/1.4.nix
index 77349a810845..9c6bbba24d5d 100644
--- a/pkgs/development/compilers/go/1.4.nix
+++ b/pkgs/development/compilers/go/1.4.nix
@@ -46,6 +46,8 @@ stdenv.mkDerivation rec {
     sed -i 's,/bin/pwd,'"`type -P pwd`", src/os/os_test.go
     # Disable the unix socket test
     sed -i '/TestShutdownUnix/areturn' src/net/net_test.go
+    # Disable network timeout test
+    sed -i '/TestDialTimeout/areturn' src/net/dial_test.go
     # Disable the hostname test
     sed -i '/TestHostname/areturn' src/os/os_test.go
     # ParseInLocation fails the test

From 7e8faf022f343901301c912c5f0c7fa1d830a08d Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 26 Feb 2016 00:22:12 +0000
Subject: [PATCH 1832/2285] rubygems: 2.4.8 -> 2.5.2

Closes #11950
---
 pkgs/development/interpreters/ruby/rubygems.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/rubygems.nix b/pkgs/development/interpreters/ruby/rubygems.nix
index fb210ceff4bf..a08790a15ce5 100644
--- a/pkgs/development/interpreters/ruby/rubygems.nix
+++ b/pkgs/development/interpreters/ruby/rubygems.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "rubygems-${version}";
-  version = "2.4.8";
+  version = "2.5.2";
   src = fetchurl {
     url = "http://production.cf.rubygems.org/rubygems/${name}.tgz";
-    sha256 = "0pl4civyf0vhqsqbqaivvxrb3fsg8sid9a8jv5vfnk4hypz3ahss";
+    sha256 = "1jpcmvjfpj2m0jh23371ghfj95gh4jliihzrj5ln0x2cl1pwwwai";
   };
 
   patches = [ ./gem_hook.patch ];

From 8104b8ff1d4d35b2a1b3aa747e9a39d4728aa7f4 Mon Sep 17 00:00:00 2001
From: Benjamin Staffin <bstaffin@fitbit.com>
Date: Sun, 3 Jan 2016 16:54:22 -0800
Subject: [PATCH 1833/2285] letsencrypt: 0.1.0 -> 0.4.0

Closes #12123
---
 pkgs/tools/admin/letsencrypt/default.nix | 28 ++++++++++++-----
 pkgs/top-level/python-packages.nix       | 39 +++++++++++++++++++++++-
 2 files changed, 59 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/admin/letsencrypt/default.nix b/pkgs/tools/admin/letsencrypt/default.nix
index 516fc20c5a74..be314a567313 100644
--- a/pkgs/tools/admin/letsencrypt/default.nix
+++ b/pkgs/tools/admin/letsencrypt/default.nix
@@ -1,22 +1,36 @@
-{ stdenv, pythonPackages, fetchurl, dialog }:
+{ stdenv, pythonPackages, fetchFromGitHub, dialog }:
 
 pythonPackages.buildPythonApplication rec {
-  version = "0.1.0";
   name = "letsencrypt-${version}";
+  version = "0.4.0";
 
-  src = fetchurl {
-    url = "https://github.com/letsencrypt/letsencrypt/archive/v${version}.tar.gz";
-    sha256 = "056y5bsmpc4ya5xxals4ypzsm927j6n5kwby3bjc03sy3sscf6hw";
+  src = fetchFromGitHub {
+    owner = "letsencrypt";
+    repo = "letsencrypt";
+    rev = "v${version}";
+    sha256 = "0r2wis48w5nailzp2d5brkh2f40al6sbz816xx0akh3ll0rl1hbv";
   };
 
   propagatedBuildInputs = with pythonPackages; [
-    zope_interface zope_component six requests2 pytz pyopenssl psutil mock acme
-    cryptography configobj pyRFC3339 python2-pythondialog parsedatetime ConfigArgParse
+    ConfigArgParse
+    acme
+    configobj
+    cryptography
+    parsedatetime
+    psutil
+    pyRFC3339
+    pyopenssl
+    python2-pythondialog
+    pytz
+    six
+    zope_component
+    zope_interface
   ];
   buildInputs = with pythonPackages; [ nose dialog ];
 
   patchPhase = ''
     substituteInPlace letsencrypt/notify.py --replace "/usr/sbin/sendmail" "/var/setuid-wrappers/sendmail"
+    substituteInPlace letsencrypt/le_util.py --replace "sw_vers" "/usr/bin/sw_vers"
   '';
 
   postInstall = ''
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 25ba60f69bf5..cb8df3afd360 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -260,7 +260,44 @@ in modules // {
 
     buildInputs = with self; [ nose ];
 
-    sourceRoot = "letsencrypt-${version}/acme";
+    sourceRoot = "letsencrypt-v${version}-src/acme";
+  };
+
+  acme-tiny = buildPythonPackage rec {
+    name = "acme-tiny-${version}";
+    version = "20151229";
+    rev = "f61f72c212cea27f388eb4a26ede0d65035bdb53";
+
+    src = pkgs.fetchgit {
+      inherit rev;
+      url = "https://github.com/diafygi/acme-tiny.git";
+      sha256 = "dde59354e483bdff3dfd06717c094889ae673efb568e40b150b4695b0c539649";
+    };
+
+    # source doesn't have any python "packaging" as such
+    configurePhase = " ";
+    buildPhase = " ";
+    # the tests are... complex
+    doCheck = false;
+
+    patchPhase = ''
+      substituteInPlace acme_tiny.py --replace "openssl" "${pkgs.openssl}/bin/openssl"
+      substituteInPlace letsencrypt/le_util.py --replace '"sw_vers"' '"/usr/bin/sw_vers"'
+    '';
+
+    installPhase = ''
+      mkdir -p $out/${python.sitePackages}/
+      cp acme_tiny.py $out/${python.sitePackages}/
+      mkdir -p $out/bin
+      ln -s $out/${python.sitePackages}/acme_tiny.py $out/bin/acme_tiny
+      chmod +x $out/bin/acme_tiny
+    '';
+
+    meta = {
+      description = "A tiny script to issue and renew TLS certs from Let's Encrypt";
+      homepage = https://github.com/diafygi/acme-tiny;
+      license = licenses.mit;
+    };
   };
 
   acme-tiny = buildPythonPackage rec {

From 8132a5ae76106dc8425a58d8a611e0cc804b3070 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 26 Feb 2016 12:32:33 -0600
Subject: [PATCH 1834/2285] go-1.6: remove the cacert 1.5 patch

Removed in https://github.com/NixOS/nixpkgs/commit/58dbaf69b7abd7a3483d47bd4eede02d68fcdc78
---
 pkgs/development/compilers/go/1.6.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/compilers/go/1.6.nix b/pkgs/development/compilers/go/1.6.nix
index cb1d396f50a1..122f0d336f71 100644
--- a/pkgs/development/compilers/go/1.6.nix
+++ b/pkgs/development/compilers/go/1.6.nix
@@ -90,7 +90,6 @@ stdenv.mkDerivation rec {
   '';
 
   patches = [
-    ./cacert-1.5.patch
     ./remove-tools-1.5.patch
   ]
   # -ldflags=-s is required to compile on Darwin, see

From f6c3b13c7c4468f1064ccf3b7e98935bd9c9b662 Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Fri, 26 Feb 2016 11:27:41 -0800
Subject: [PATCH 1835/2285] ghcjs: pull in ghcjsi branch

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

diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 808768f74b86..7401a23ddaee 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -60,8 +60,8 @@ in mkDerivation (rec {
   src = fetchFromGitHub {
     owner = "ghcjs";
     repo = "ghcjs";
-    rev = "561365ba1667053b5dc5846e2a8edb33eaa3f6dd";
-    sha256 = "1vfa7j0ql3sng29m944iznjw9hcmyl57nfkgxa33dvi2ival8dl2";
+    rev = "13a99c6da40e3700e070e430d4c0f2ea96217b24";
+    sha256 = "01yg6babmhn2bfbmgkddisfj9ai7fc4r08s6acd49s9amcw7g5ld";
   };
   isLibrary = true;
   isExecutable = true;

From 28b289efa642261d7a5078cfa3a05ef1d6fa2826 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 26 Feb 2016 20:02:41 +0100
Subject: [PATCH 1836/2285] chromium: Refactor updater entirely in Nix

The update.sh shell script now is only a call to nix-build, which does
all the hard work of updating the Chromium source channels and the
plugins. It results in a store path with the new sources.nix that
replaces the already existing sources.nix.

Along the way, this has led to a quite massive workaround, which abuses
MD5 collisions to detect whether an URL is existing, because something
like builtins.tryEval (builtins.fetchurl url) unfortunately doesn't
work. Further explanations and implementation details are documented in
the actual implementation.

The drawback of this is that we don't have nice status messages anymore,
but on the upside we have a more robust generation of the sources.nix
file, which now also should work properly on missing upstream
sources/binaries.

This also makes it much easier to implement fetching non-GNU/Linux
versions of Chromium and we have all values from omahaproxy available as
an attribute set (see the csv2nix and channels attributes in the update
attribute).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../browsers/chromium/source/update.nix       | 255 ++++++++++++------
 .../networking/browsers/chromium/update.sh    | 104 +------
 2 files changed, 180 insertions(+), 179 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/source/update.nix b/pkgs/applications/networking/browsers/chromium/source/update.nix
index 77ebb9488e2e..3c489b7523e6 100644
--- a/pkgs/applications/networking/browsers/chromium/source/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/update.nix
@@ -3,17 +3,24 @@
 let
   inherit (import ../../../../../../. {
     inherit system;
-  }) lib writeText stdenv;
+  }) lib runCommand writeText stdenv curl cacert nix;
 
   sources = if builtins.pathExists ./sources.nix
             then import ./sources.nix
-            else null;
+            else {};
 
   bucketURL = "https://commondatastorage.googleapis.com/"
             + "chromium-browser-official";
 
+  mkVerURL = version: "${bucketURL}/chromium-${version}.tar.xz";
+
   debURL = "https://dl.google.com/linux/chrome/deb/pool/main/g";
 
+  getDebURL = channelName: version: arch: mirror: let
+    packageSuffix = if channelName == "dev" then "unstable" else channelName;
+    packageName = "google-chrome-${packageSuffix}";
+  in "${mirror}/${packageName}/${packageName}_${version}-1_${arch}.deb";
+
   # Untrusted mirrors, don't try to update from them!
   debMirrors = [
     "http://95.31.35.30/chrome/pool/main/g"
@@ -21,32 +28,6 @@ let
     "http://repo.fdzh.org/chrome/deb/pool/main/g"
   ];
 
-  tryChannel = channel: let
-    chan = builtins.getAttr channel sources;
-  in if sources != null then ''
-    oldver="${chan.version}";
-    echo -n "Checking if $oldver ($channel) is up to date..." >&2;
-    if [ "x$(get_newest_ver "$version" "$oldver")" != "x$oldver" ];
-    then
-      echo " no, getting sha256 for new version $version:" >&2;
-      sha256="$(prefetch_sha "$channel" "$version")" || return 1;
-    else
-      echo " yes, keeping old sha256." >&2;
-      sha256="${chan.sha256}";
-      ${if (chan ? sha256bin32 && chan ? sha256bin64) then ''
-        sha256="$sha256.${chan.sha256bin32}.${chan.sha256bin64}";
-      '' else ''
-        sha256="$sha256.$(prefetch_deb_sha "$channel" "$version")";
-      ''}
-    fi;
-  '' else ''
-    sha256="$(prefetch_sha "$channel" "$version")" || return 1;
-  '';
-
-  caseChannel = channel: ''
-    ${channel}) ${tryChannel channel};;
-  '';
-
 in rec {
   getChannel = channel: let
     chanAttrs = builtins.getAttr channel sources;
@@ -54,78 +35,196 @@ in rec {
     inherit (chanAttrs) version;
 
     main = {
-      url = "${bucketURL}/chromium-${chanAttrs.version}.tar.xz";
+      url = mkVerURL chanAttrs.version;
       inherit (chanAttrs) sha256;
     };
 
     binary = let
-      pname = if channel == "dev"
-              then "google-chrome-unstable"
-              else "google-chrome-${channel}";
-
       mkUrls = arch: let
-        relpath = "${pname}/${pname}_${chanAttrs.version}-1_${arch}.deb";
-      in map (url: "${url}/${relpath}") ([ debURL ] ++ debMirrors);
-
+        mkURLForMirror = getDebURL channel chanAttrs.version arch;
+      in map mkURLForMirror ([ debURL ] ++ debMirrors);
     in if stdenv.is64bit && chanAttrs ? sha256bin64 then {
       urls = mkUrls "amd64";
       sha256 = chanAttrs.sha256bin64;
     } else if stdenv.is32bit && chanAttrs ? sha256bin32 then {
       urls = mkUrls "i386";
-      sha256 = chanAttrs.sha256bin64;
+      sha256 = chanAttrs.sha256bin32;
     } else throw "No Chrome plugins are available for your architecture.";
   };
 
-  updateHelpers = writeText "update-helpers.sh" ''
+  update = let
+    csv2nix = name: src: import (runCommand "${name}.nix" {
+      src = builtins.fetchurl src;
+    } ''
+      esc() { echo "\"$(echo "$1" | sed -e 's/"\\$/\\&/')\""; }
+      IFS=, read -r -a headings <<< "$(head -n1 "$src")"
+      echo "[" > "$out"
+      tail -n +2 "$src" | while IFS=, read -r -a line; do
+        echo "  {"
+        for idx in "''${!headings[@]}"; do
+          echo "    $(esc "''${headings[idx]}") = $(esc ''${line[$idx]});"
+        done
+        echo "  }"
+      done >> "$out"
+      echo "]" >> "$out"
+    '');
 
-    prefetch_main_sha()
-    {
-      nix-prefetch-url "${bucketURL}/chromium-$2.tar.xz";
-    }
+    channels = lib.fold lib.recursiveUpdate {} (map (attrs: {
+      ${attrs.os}.${attrs.channel} = attrs // {
+        history = let
+          drvName = "omahaproxy-${attrs.os}.${attrs.channel}-info";
+          history = csv2nix drvName "http://omahaproxy.appspot.com/history";
+          cond = h: attrs.os == h.os && attrs.channel == h.channel
+                 && lib.versionOlder h.version attrs.current_version;
+          # Note that this is a *reverse* sort!
+          sorter = a: b: lib.versionOlder b.version a.version;
+          sorted = builtins.sort sorter (lib.filter cond history);
+        in map (lib.flip removeAttrs ["os" "channel"]) sorted;
+        version = attrs.current_version;
+      };
+    }) (csv2nix "omahaproxy-info" "http://omahaproxy.appspot.com/all?csv=1"));
 
-    prefetch_deb_sha()
-    {
-      channel="$1";
-      version="$2";
+    /*
+      XXX: This is essentially the same as:
 
-      case "$1" in
-        dev) pname="google-chrome-unstable";;
-        *)   pname="google-chrome-$channel";;
-      esac;
+        builtins.tryEval (builtins.fetchurl url)
 
-      deb_pre="${debURL}/$pname/$pname";
+      ... except that tryEval on fetchurl isn't working and doesn't catch errors
+      for fetchurl, so we go for a different approach.
 
-      deb32="$(nix-prefetch-url "''${deb_pre}_$version-1_i386.deb")" || :
-      deb64="$(nix-prefetch-url "''${deb_pre}_$version-1_amd64.deb")" || :
+      We only have fixed-output derivations that can have networking access, so
+      we abuse MD5 and its weaknesses to forge a fixed-output derivation which
+      is not so fixed, because it emits different contents that have the same
+      MD5 hash.
 
-      if [ -n "$deb32" -o -n "$deb64" ]; then
-        echo "$deb32.$deb64";
-        return 0
-      else
-        return 1
-      fi
-    }
+      Using this method, we can distinguish whether the URL is available or
+      whether it's not based on the actual content.
 
-    prefetch_sha()
-    {
-      main_sha="$(prefetch_main_sha "$@")" || return 1;
-      deb_sha="$(prefetch_deb_sha "$@")" || return 1;
-      echo "$main_sha.$deb_sha";
-      return 0;
-    }
+      So let's use tryEval as soon as it's working with fetchurl in Nix.
+    */
+    tryFetch = url: let
+      mkBin = b: runCommand "binary-blurb" { inherit b; } ''
+        h="$(echo "$b" | sed -e ':r;N;$!br;s/[^ \n][^ \n]/\\x&/g;s/[ \n]//g')"
+        echo -ne "$h" > "$out"
+      '';
 
-    get_sha256()
-    {
-      channel="$1";
-      version="$2";
+      # Both MD5 hash collision examples are from:
+      # https://en.wikipedia.org/wiki/MD5#Collision_vulnerabilities
+      hashCollTrue = mkBin ''
+        d131dd02c5e6eec4 693d9a0698aff95c 2fcab58712467eab 4004583eb8fb7f89
+        55ad340609f4b302 83e488832571415a 085125e8f7cdc99f d91dbdf280373c5b
+        d8823e3156348f5b ae6dacd436c919c6 dd53e2b487da03fd 02396306d248cda0
+        e99f33420f577ee8 ce54b67080a80d1e c69821bcb6a88393 96f9652b6ff72a70
+      '';
 
-      case "$channel" in
-        ${lib.concatMapStrings caseChannel [ "stable" "dev" "beta" ]}
-      esac;
+      hashCollFalse = mkBin ''
+        d131dd02c5e6eec4 693d9a0698aff95c 2fcab50712467eab 4004583eb8fb7f89
+        55ad340609f4b302 83e4888325f1415a 085125e8f7cdc99f d91dbd7280373c5b
+        d8823e3156348f5b ae6dacd436c919c6 dd53e23487da03fd 02396306d248cda0
+        e99f33420f577ee8 ce54b67080280d1e c69821bcb6a88393 96f965ab6ff72a70
+      '';
 
-      sha_insert "$version" "$sha256";
-      echo "$sha256";
-      return 0;
-    }
+      cacheVal = let
+        urlHash = builtins.hashString "sha256" url;
+        timeSlice = builtins.currentTime / 600;
+      in "${urlHash}-${toString timeSlice}";
+
+      successBin = stdenv.mkDerivation {
+        name = "tryfetch-${cacheVal}";
+        inherit url;
+
+        outputHash = "79054025255fb1a26e4bc422aef54eb4";
+        outputHashMode = "flat";
+        outputHashAlgo = "md5";
+
+        buildInputs = [ curl ];
+        preferLocalBuild = true;
+
+        buildCommand = ''
+          if SSL_CERT_FILE="${cacert}/etc/ssl/certs/ca-bundle.crt" \
+             curl -s -L -f -I "$url" > /dev/null; then
+            cat "${hashCollTrue}" > "$out"
+          else
+            cat "${hashCollFalse}" > "$out"
+          fi
+        '';
+
+        impureEnvVars = [
+          "http_proxy" "https_proxy" "ftp_proxy" "all_proxy" "no_proxy"
+        ];
+      };
+
+    in {
+      success = builtins.readFile successBin == builtins.readFile hashCollTrue;
+      value = builtins.fetchurl url;
+    };
+
+    fetchLatest = channel: let
+      result = tryFetch (mkVerURL channel.version);
+    in if result.success then result.value else fetchLatest (channel // {
+      version = if channel.history != []
+                then (lib.head channel.history).version
+                else throw "Unfortunately there's no older version than " +
+                           "${channel.version} available for channel " +
+                           "${channel.channel} on ${channel.os}.";
+      history = lib.tail channel.history;
+    });
+
+    getHash = path: import (runCommand "gethash.nix" {
+      inherit path;
+      buildInputs = [ nix ];
+    } ''
+      sha256="$(nix-hash --flat --base32 --type sha256 "$path")"
+      echo "\"$sha256\"" > "$out"
+    '');
+
+    isLatest = channel: version: let
+      ourVersion = sources.${channel}.version or null;
+    in if ourVersion == null then false
+       else lib.versionAtLeast version sources.${channel}.version;
+
+    # We only support GNU/Linux right now.
+    linuxChannels = let
+      genLatest = channelName: channel: let
+        newUpstream = {
+          inherit (channel) version;
+          sha256 = getHash (fetchLatest channel);
+        };
+        keepOld = let
+          oldChannel = sources.${channelName};
+        in {
+          inherit (oldChannel) version sha256;
+        } // lib.optionalAttrs (oldChannel ? sha256bin32) {
+          inherit (oldChannel) sha256bin32;
+        } // lib.optionalAttrs (oldChannel ? sha256bin64) {
+          inherit (oldChannel) sha256bin64;
+        };
+      in if isLatest channelName channel.version then keepOld else newUpstream;
+    in lib.mapAttrs genLatest channels.linux;
+
+    getLinuxFlash = channelName: channel: let
+      inherit (channel) version;
+      fetchArch = arch: tryFetch (getDebURL channelName version arch debURL);
+      packages = lib.genAttrs ["i386" "amd64"] fetchArch;
+      isNew = arch: attr: !(builtins.hasAttr attr channel)
+                       && packages.${arch}.success;
+    in channel // lib.optionalAttrs (isNew "i386" "sha256bin32") {
+      sha256bin32 = getHash (packages.i386.value);
+    } // lib.optionalAttrs (isNew "amd64" "sha256bin64") {
+      sha256bin64 = getHash (packages.amd64.value);
+    };
+
+    newChannels = lib.mapAttrs getLinuxFlash linuxChannels;
+
+    dumpAttrs = indent: attrs: let
+      mkVal = val: if lib.isAttrs val then dumpAttrs (indent + 1) val
+                   else "\"${lib.escape ["$" "\\" "\""] (toString val)}\"";
+      mkIndent = level: lib.concatStrings (builtins.genList (_: "  ") level);
+      mkAttr = key: val: "${mkIndent (indent + 1)}${key} = ${mkVal val};\n";
+      attrLines = lib.mapAttrsToList mkAttr attrs;
+    in "{\n" + (lib.concatStrings attrLines) + (mkIndent indent) + "}";
+  in writeText "chromium-new-sources.nix" ''
+    # This file is autogenerated from update.sh in the parent directory.
+    ${dumpAttrs 0 newChannels}
   '';
 }
diff --git a/pkgs/applications/networking/browsers/chromium/update.sh b/pkgs/applications/networking/browsers/chromium/update.sh
index 975e141e6685..05cc671d31ce 100755
--- a/pkgs/applications/networking/browsers/chromium/update.sh
+++ b/pkgs/applications/networking/browsers/chromium/update.sh
@@ -1,101 +1,3 @@
-#!/bin/sh
-
-channels_url="http://omahaproxy.appspot.com/all?csv=1";
-history_url="http://omahaproxy.appspot.com/history";
-bucket_url="http://commondatastorage.googleapis.com/chromium-browser-official/";
-base_path="$(cd "$(dirname "$0")" && pwd)/source";
-
-source "$(nix-build --no-out-link "$base_path/update.nix" -A updateHelpers)";
-
-### poor mans key/value-store :-) ###
-
-ver_sha_table=""; # list of version:sha256
-
-sha_insert()
-{
-    version="$1";
-    sha256="$2";
-
-    ver_sha_table="$ver_sha_table $version:$sha256";
-}
-
-get_newest_ver()
-{
-    versions="$(for v in $@; do echo "$v"; done)";
-    if oldest="$(echo "$versions" | sort -V 2> /dev/null | tail -n1)";
-    then
-        echo "$oldest";
-    else
-        echo "$versions" | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n | tail -n1;
-    fi;
-}
-
-fetch_filtered_history()
-{
-    curl -s "$history_url" | sed -nr 's/^'"linux,$1"',([^,]+).*$/\1/p';
-}
-
-get_prev_sha256()
-{
-    channel="$1";
-    current_version="$2";
-
-    for version in $(fetch_filtered_history "$channel");
-    do
-        [ "x$version" = "x$current_version" ] && continue;
-        sha256="$(get_sha256 "$channel" "$version")" || continue;
-        echo "$sha256:$version";
-        return 0;
-    done;
-}
-
-get_channel_exprs()
-{
-    for chline in $1;
-    do
-        channel="${chline%%,*}";
-        version="${chline##*,}";
-
-        sha256="$(get_sha256 "$channel" "$version")";
-        if [ $? -ne 0 ];
-        then
-            echo "Whoops, failed to fetch $version, trying previous" \
-                 "versions:" >&2;
-
-            sha_ver="$(get_prev_sha256 "$channel" "$version")";
-            sha256="${sha_ver%:*}";
-            version="${sha_ver#*:}";
-        fi;
-
-        sha_insert "$version" "$sha256";
-
-        main="${sha256%%.*}";
-        deb="${sha256#*.}";
-        deb32="${deb%.*}";
-        deb64="${deb#*.}";
-
-        echo "  $channel = {";
-        echo "    version = \"$version\";";
-        echo "    sha256 = \"$main\";";
-        if [ "x${deb#[a-z0-9]}" != "x$deb" ]; then
-            echo "    sha256bin32 = \"$deb32\";";
-        fi;
-        if [ "x${deb#*.[a-z0-9]}" != "x$deb" ]; then
-            echo "    sha256bin64 = \"$deb64\";";
-        fi;
-        echo "  };";
-    done;
-}
-
-cd "$(dirname "$0")";
-
-omaha="$(curl -s "$channels_url")";
-versions="$(echo "$omaha" | sed -nr -e 's/^linux,([^,]+,[^,]+).*$/\1/p')";
-channel_exprs="$(get_channel_exprs "$versions")";
-
-cat > "$base_path/sources.nix" <<-EOF
-# This file is autogenerated from update.sh in the parent directory.
-{
-$channel_exprs
-}
-EOF
+#!/bin/sh -e
+sp="$(nix-build -Q --no-out-link source/update.nix -A update)"
+cat "$sp" > source/sources.nix

From 54b49125664adb1f7cf054bbf8a09aeecc88b574 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Fri, 26 Feb 2016 20:53:26 +0100
Subject: [PATCH 1837/2285] chromium: Regenerate sources.nix with new updater

No changes in functionality, but to make future source updates a bit
easier on the eyes when viewing the diff.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../browsers/chromium/source/sources.nix           | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index ff3df5923b18..ffb9ff110686 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,19 +1,19 @@
 # This file is autogenerated from update.sh in the parent directory.
 {
-  dev = {
-    version = "50.0.2657.0";
-    sha256 = "1xc66zsjd5snydf60di2k2vzwwcqs1p16yn4jbpj2khm9cmxmkmf";
-    sha256bin64 = "06v7r76pbc979f7ahmln0hmxzd8ipirh4128i0ygidj71xmg51mm";
-  };
   beta = {
-    version = "49.0.2623.63";
     sha256 = "07i4vqswkijnl7wi6r1a0n1jq54ackm01yf8h3hwcik8q10i1aq5";
     sha256bin64 = "16pwimg672qaqb89zdvsr8dr7bz50mz7zf6cl0cf45kz7sn8wwlh";
+    version = "49.0.2623.63";
+  };
+  dev = {
+    sha256 = "1xc66zsjd5snydf60di2k2vzwwcqs1p16yn4jbpj2khm9cmxmkmf";
+    sha256bin64 = "06v7r76pbc979f7ahmln0hmxzd8ipirh4128i0ygidj71xmg51mm";
+    version = "50.0.2657.0";
   };
   stable = {
-    version = "48.0.2564.116";
     sha256 = "03sdm09cnwq8a056rfljql7mz0s17fngfnm5q3p5xwakr2sbj7ka";
     sha256bin32 = "157m88nafb8svpkv11rzpcfvak6486wx43rmbssg52x2k0vas0bl";
     sha256bin64 = "036pcma8qczja803h9r1nlm0ypm4zblmy6q7pkwlgmn3r4r3n7i0";
+    version = "48.0.2564.116";
   };
 }

From 3386d73d0618a00a6aca32c45f06646f39dae976 Mon Sep 17 00:00:00 2001
From: Tobias Pflug <tobias.pflug@holidaycheck.com>
Date: Fri, 26 Feb 2016 21:01:41 +0100
Subject: [PATCH 1838/2285] Add galen to all-packages.nix

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98405112dde2..8c6484520563 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1659,6 +1659,8 @@ let
     gtk = gtk3;
   };
 
+  galen = callPackage ../development/tools/galen {};
+
   garmin-plugin = callPackage ../applications/misc/garmin-plugin {};
 
   garmintools = callPackage ../development/libraries/garmintools {};
@@ -3346,7 +3348,7 @@ let
   stricat = callPackage ../tools/security/stricat { };
 
   staruml = callPackage ../tools/misc/staruml { inherit (gnome) GConf; libgcrypt = libgcrypt_1_5; };
-  
+
   privoxy = callPackage ../tools/networking/privoxy {
     w3m = w3m-batch;
   };
@@ -6574,8 +6576,8 @@ let
   eigen = callPackage ../development/libraries/eigen {};
 
   eigen2 = callPackage ../development/libraries/eigen/2.0.nix {};
-  
-  vmmlib = callPackage ../development/libraries/vmmlib {};  
+
+  vmmlib = callPackage ../development/libraries/vmmlib {};
 
   enchant = callPackage ../development/libraries/enchant { };
 

From 728b1ce55766778b996cf3d5a8ff8b3161cfbda9 Mon Sep 17 00:00:00 2001
From: = <anothersms@gmail.com>
Date: Fri, 26 Feb 2016 12:32:11 +0100
Subject: [PATCH 1839/2285] qnotero: init at 1.0.0

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

diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/applications/office/qnotero/default.nix
new file mode 100644
index 000000000000..695db93d4de1
--- /dev/null
+++ b/pkgs/applications/office/qnotero/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchFromGitHub, buildPythonPackage, python3, python3Packages
+}:
+
+python3Packages.buildPythonPackage rec {
+  name = "qnotero-${version}";
+
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "smathot";
+    repo = "qnotero";
+    rev = "release/${version}";
+    name = "qnotero-${version}-src";
+    sha256 = "1d5a9k1llzn9q1qv1bfwc7gfflabh4riplz9jj0hf04b279y1bj0";
+  };
+
+  propagatedBuildInputs = [ python3 python3Packages.pyqt4 ];
+
+  patchPhase = ''
+      substituteInPlace ./setup.py \
+        --replace "/usr/share" "$out/usr/share"
+
+      substituteInPlace ./libqnotero/_themes/default.py \
+        --replace "/usr/share" "$out/usr/share"
+  '';
+
+  postInstall = ''
+      mkdir -p "$out/usr/share/qnotero"
+      mv resources "$out/usr/share/qnotero"
+  '';
+
+  meta = {
+    description = "Quick access to Zotero references";
+    homepage = http://www.cogsci.nl/software/qnotero;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.nico202 ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ec1c1c0e788..50884cde0289 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13299,6 +13299,8 @@ let
 
   qmmp = callPackage ../applications/audio/qmmp { };
 
+  qnotero = callPackage ../applications/office/qnotero { };
+
   qrcode = callPackage ../tools/graphics/qrcode {};
 
   qsampler = callPackage ../applications/audio/qsampler { };

From 4806cddda30a840f7add609d54d692b2e4d813f1 Mon Sep 17 00:00:00 2001
From: Tony White <white.tw.tw@gmail.com>
Date: Fri, 26 Feb 2016 21:32:00 +0000
Subject: [PATCH 1840/2285] fetchurl: use kernel.org cdn by default

- use http://cdn.kernel.org/pub/ as the default mirror
for kernel source requests.
Discovered by browsing :
 https://www.kernel.org/introducing-fastly-cdn.html
---
 pkgs/build-support/fetchurl/mirrors.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix
index c5107781c333..148a72f5d842 100644
--- a/pkgs/build-support/fetchurl/mirrors.nix
+++ b/pkgs/build-support/fetchurl/mirrors.nix
@@ -61,6 +61,7 @@ rec {
 
   # kernel.org's /pub (/pub/{linux,software}) tree.
   kernel = [
+    http://cdn.kernel.org/pub/
     http://www.all.kernel.org/pub/
     http://ramses.wh2.tu-dresden.de/pub/mirrors/kernel.org/
     http://linux-kernel.uio.no/pub/

From 483a130f894505917c00cb6d4eca50225fde4c38 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 26 Feb 2016 09:50:24 -0600
Subject: [PATCH 1841/2285] cpio: patch CVE-2016-2037, out of bounds write
 (close #13489)

---
 .../CVE-2016-2037-out-of-bounds-write.patch   | 29 +++++++++++++++++++
 pkgs/tools/archivers/cpio/default.nix         |  4 +++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/tools/archivers/cpio/CVE-2016-2037-out-of-bounds-write.patch

diff --git a/pkgs/tools/archivers/cpio/CVE-2016-2037-out-of-bounds-write.patch b/pkgs/tools/archivers/cpio/CVE-2016-2037-out-of-bounds-write.patch
new file mode 100644
index 000000000000..90ddeff9790e
--- /dev/null
+++ b/pkgs/tools/archivers/cpio/CVE-2016-2037-out-of-bounds-write.patch
@@ -0,0 +1,29 @@
+diff --git a/src/copyin.c b/src/copyin.c
+index cde911e..032d35f 100644
+--- a/src/copyin.c
++++ b/src/copyin.c
+@@ -1385,6 +1385,8 @@ process_copy_in ()
+          break;
+        }
+
++      if (file_hdr.c_namesize <= 1)
++        file_hdr.c_name = xrealloc(file_hdr.c_name, 2);
+       cpio_safer_name_suffix (file_hdr.c_name, false, !no_abs_paths_flag,
+                              false);
+
+diff --git a/src/util.c b/src/util.c
+index 6ff6032..2763ac1 100644
+--- a/src/util.c
++++ b/src/util.c
+@@ -1411,7 +1411,10 @@ set_file_times (int fd,
+ }
+
+ /* Do we have to ignore absolute paths, and if so, does the filename
+-   have an absolute path?  */
++   have an absolute path?
++   Before calling this function make sure that the allocated NAME buffer has
++   capacity at least 2 bytes to allow us to store the "." string inside.  */
++
+ void
+ cpio_safer_name_suffix (char *name, bool link_target, bool absolute_names,
+                        bool strip_leading_dots)
diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix
index 570f1904ee21..2313f27f2e54 100644
--- a/pkgs/tools/archivers/cpio/default.nix
+++ b/pkgs/tools/archivers/cpio/default.nix
@@ -19,6 +19,10 @@ in stdenv.mkDerivation {
         + "CVE-2015-1197-cpio-2.12.patch";
       sha256 = "0ph43m4lavwkc4gnl5h9p3da4kb1pnhwk5l2qsky70dqri8pcr8v";
     })
+
+    # Report: http://www.openwall.com/lists/oss-security/2016/01/19/4
+    # Patch from https://lists.gnu.org/archive/html/bug-cpio/2016-01/msg00005.html
+    ./CVE-2016-2037-out-of-bounds-write.patch
   ];
 
   preConfigure = if stdenv.isCygwin then ''

From a94e43393658fd6048e36956dd84a2686c72d1f1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 26 Feb 2016 22:57:49 +0100
Subject: [PATCH 1842/2285] libreoffice: 5.0.4.2 -> 5.1.0.3 (a new attempt);
 set XDG_DATA_DIRS for access to GSettings schemas

---
 .../office/libreoffice/default.nix            |  41 +++---
 .../office/libreoffice/libreoffice-srcs.nix   | 117 +++++++++---------
 pkgs/top-level/all-packages.nix               |   7 +-
 3 files changed, 92 insertions(+), 73 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 30a4a47896ab..43c5e0fb627f 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pam, python3, tcsh, libxslt, perl, ArchiveZip
 , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd
 , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon
-, bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
+, bison, flex, zip, unzip, gtk3, gtk, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, cups, xorg, libcmis
 , openssl, gperf, cppunit, GConf, ORBit2, poppler
 , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw
@@ -11,7 +11,8 @@
 , fontsConf, pkgconfig, libzip, bluez5, libtool, maven
 , libatomic_ops, graphite2, harfbuzz, libodfgen
 , librevenge, libe-book, libmwaw, glm, glew, gst_all_1
-, gdb, commonsLogging
+, gdb, commonsLogging, librdf_rasqal, makeWrapper, gsettings_desktop_schemas
+, defaultIconTheme, glib
 , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ]
 , withHelp ? true
 }:
@@ -19,9 +20,9 @@
 let
   langsSpaces = stdenv.lib.concatStringsSep " " langs;
   major = "5";
-  minor = "0";
-  patch = "4";
-  tweak = "2";
+  minor = "1";
+  patch = "0";
+  tweak = "3";
   subdir = "${major}.${minor}.${patch}";
   version = "${subdir}${if tweak == "" then "" else "."}${tweak}";
 
@@ -47,14 +48,14 @@ let
 
     translations = fetchSrc {
       name = "translations";
-      sha256 = "1kdrs49agqhb2b687hqh6sq7328z2sf04dmhb3xv5zy4rjvv5pha";
+      sha256 = "1qqffq7646yh7rskzd1wvy0zgkdnkpdbyhvsny424lxqjglyw3px";
     };
 
     # TODO: dictionaries
 
     help = fetchSrc {
       name = "help";
-      sha256 = "005jwny8xmsnvvh0xkk9csnqv2jkaslr2n9xm82bqalcg81j0g2x";
+      sha256 = "0ixlq6yzn6z8hsih24l934sa05vvz2vk3p03nalpqqrhm7vdzsf2";
     };
 
   };
@@ -63,12 +64,17 @@ in stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz";
-    sha256 = "1j3dmk5xifcgmd6dgqqifzh8wmc7daqfbkvk6cxa94611yvl0x34";
+    sha256 = "1csphxpbpc7bxrwnl5i9nvm3bh3p0j7r3h9ivsdl7cys13q066xl";
   };
 
   # Openoffice will open libcups dynamically, so we link it directly
   # to make its dlopen work.
-  NIX_LDFLAGS = "-lcups";
+  # It also seems not to mention libdl explicitly in some places.
+  NIX_LDFLAGS = "-lcups -ldl";
+
+  # For some reason librdf_redland sometimes refers to rasqal.h instead 
+  # of rasqal/rasqal.h
+  NIX_CFLAGS_COMPILE="-I${librdf_rasqal}/include/rasqal";
 
   # If we call 'configure', 'make' will then call configure again without parameters.
   # It's their system.
@@ -112,6 +118,8 @@ in stdenv.mkDerivation rec {
     # http://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html
     echo > ./sd/CppunitTest_sd_tiledrendering.mk
     sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk
+    # one more fragile test?
+    sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx
   '';
 
   makeFlags = "SHELL=${bash}/bin/bash";
@@ -134,8 +142,14 @@ in stdenv.mkDerivation rec {
   postInstall = ''
     mkdir -p $out/bin $out/share/desktop
 
+    mkdir -p "$out/share/gsettings-schemas/collected-for-libreoffice/glib-2.0/schemas/"
+
     for a in sbase scalc sdraw smath swriter spadmin simpress soffice; do
       ln -s $out/lib/libreoffice/program/$a $out/bin/$a
+      wrapProgram "$out/bin/$a" \
+         --prefix XDG_DATA_DIRS : \
+         "$out/share:$GSETTINGS_SCHEMAS_PATH" \
+         ;
     done
 
     ln -s $out/bin/soffice $out/bin/libreoffice
@@ -181,7 +195,6 @@ in stdenv.mkDerivation rec {
 
     # I imagine this helps. Copied from go-oo.
     # Modified on every upgrade, though
-    "--disable-kde"
     "--disable-odk"
     "--disable-postgresql-sdbc"
     "--disable-firebird-sdbc"
@@ -213,18 +226,18 @@ in stdenv.mkDerivation rec {
   buildInputs = with xorg;
     [ ant ArchiveZip autoconf automake bison boost cairo clucene_core
       CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig
-      freetype GConf getopt gnome_vfs gperf gtk
+      freetype GConf getopt gnome_vfs gperf gtk3 gtk
       hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg
       libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
       libXaw libXext libXi libXinerama libxml2 libxslt libXtst
       libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
-      gst_all_1.gst-plugins-base
-      neon nspr nss openldap openssl ORBit2 pam perl pkgconfigUpstream poppler
+      gst_all_1.gst-plugins-base gsettings_desktop_schemas glib
+      neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler
       python3 sablotron sane-backends tcsh unzip vigra which zip zlib
       mdds bluez5 glibc libcmis libwps libabw
       libxshmfence libatomic_ops graphite2 harfbuzz
       librevenge libe-book libmwaw glm glew
-      libodfgen CoinMP
+      libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
     ];
 
   meta = with stdenv.lib; {
diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
index a70d5a7c77c3..21a16a5fc69e 100644
--- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
+++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix
@@ -4,21 +4,6 @@
   md5 = "7a3815b506d064313ba309617b6f5a0b";
   brief = true;
 }
-{
-  name = "commons-codec-1.6-src.tar.gz";
-  md5 = "2e482c7567908d334785ce7d69ddfff7";
-  brief = false;
-}
-{
-  name = "commons-httpclient-3.1-src.tar.gz";
-  md5 = "2c9b0f83ed5890af02c0df1c1776f39b";
-  brief = false;
-}
-{
-  name = "commons-lang-2.4-src.tar.gz";
-  md5 = "625ff5f2f968dd908bca43c9469d6e6b";
-  brief = false;
-}
 {
   name = "commons-logging-1.2-src.tar.gz";
   md5 = "ce977548f1cbf46918e93cd38ac35163";
@@ -35,23 +20,28 @@
   brief = true;
 }
 {
-  name = "boost_1_55_0.tar.bz2";
-  md5 = "d6eef4b4cacb2183f2bf265a5a03a354";
-  brief = false;
+  name = "boost_1_59_0.tar.bz2";
+  md5 = "6aa9a5c6a4ca1016edd0ed1178e3cb87";
+  brief = true;
 }
 {
   name = "bsh-2.0b5-src.zip";
   md5 = "ec1941a74d3ef513c4ce57a9092b74e1";
   brief = false;
 }
+{
+  name = "bzip2-1.0.6.tar.gz";
+  md5 = "00b516f4704d4a7cb50a1d97e6e8e15b";
+  brief = false;
+}
 {
   name = "cairo-1.10.2.tar.gz";
   md5 = "f101a9e88b783337b20b2e26dfd26d5f";
   brief = false;
 }
 {
-  name = "libcdr-0.1.1.tar.bz2";
-  md5 = "b33fd0be3befdd1b37777e08ce058bd9";
+  name = "libcdr-0.1.2.tar.bz2";
+  md5 = "6e3062b55b149d7b3c6aedb3bb5b86e2";
   brief = true;
 }
 {
@@ -100,8 +90,8 @@
   brief = false;
 }
 {
-  name = "libetonyek-0.1.3.tar.bz2";
-  md5 = "e5947373dd7834f27e93f1636faa419f";
+  name = "libetonyek-0.1.6.tar.bz2";
+  md5 = "77ff46936dcc83670557274e7dd2aa33";
   brief = true;
 }
 {
@@ -110,8 +100,8 @@
   brief = false;
 }
 {
-  name = "Firebird-2.5.2.26540-0.tar.bz2";
-  md5 = "21154d2004e025c8a3666625b0357bb5";
+  name = "Firebird-2.5.4.26856-0.tar.bz2";
+  md5 = "7a17ec9889424b98baa29e001a054434";
   brief = true;
 }
 {
@@ -130,8 +120,8 @@
   brief = false;
 }
 {
-  name = "dejavu-fonts-ttf-2.34.zip";
-  md5 = "a4e565e220b5de082c23995e256e3c12";
+  name = "dejavu-fonts-ttf-2.35.zip";
+  md5 = "d8b5214d35bcd2bfcb2cffa7795b351d";
   brief = false;
 }
 {
@@ -185,8 +175,8 @@
   brief = false;
 }
 {
-  name = "glew-1.10.0.zip";
-  md5 = "594eb47b4b1210e25438d51825404d5a";
+  name = "glew-1.12.0.zip";
+  md5 = "3941e9cab2f4f9d8faee3e8d57ae7664";
   brief = false;
 }
 {
@@ -195,9 +185,14 @@
   brief = false;
 }
 {
-  name = "graphite2-1.2.4.tgz";
-  md5 = "2ef839348fe28e3b923bf8cced440227";
-  brief = true;
+  name = "glyphy-0.2.0.tar.bz2";
+  md5 = "5d303fb955beb9bf112267316ca9d021";
+  brief = false;
+}
+{
+  name = "graphite2-minimal-1.3.4.tgz";
+  md5 = "5c0c9ac0996fbb4a0e17780ff5441959";
+  brief = false;
 }
 {
   name = "harfbuzz-0.9.40.tar.bz2";
@@ -220,8 +215,8 @@
   brief = false;
 }
 {
-  name = "icu4c-54_1-src.tgz";
-  md5 = "e844caed8f2ca24c088505b0d6271bc0";
+  name = "icu4c-56_1-src.tgz";
+  md5 = "c4a2d71ff56aec5ebfab2a3f059be99d";
   brief = false;
 }
 {
@@ -285,8 +280,8 @@
   brief = true;
 }
 {
-  name = "libjpeg-turbo-1.3.1.tar.gz";
-  md5 = "2c3a68129dac443a72815ff5bb374b05";
+  name = "libjpeg-turbo-1.4.2.tar.gz";
+  md5 = "86b0d5f7507c2e6c21c00219162c3c44";
   brief = true;
 }
 {
@@ -326,8 +321,8 @@
   subDir = "libgltf/";
 }
 {
-  name = "liblangtag-0.5.1.tar.bz2";
-  md5 = "36271d3fa0d9dec1632029b6d7aac925";
+  name = "liblangtag-0.5.8.tar.bz2";
+  md5 = "aa899eff126216dafe721149fbdb511b";
   brief = false;
 }
 {
@@ -366,8 +361,8 @@
   brief = true;
 }
 {
-  name = "libmwaw-0.3.5.tar.bz2";
-  md5 = "bdc58bbf89aaaf6d29b3516d96830a06";
+  name = "libmwaw-0.3.7.tar.bz2";
+  md5 = "4a8a53a9d997cf0e2bd208178797dbfb";
   brief = true;
 }
 {
@@ -391,8 +386,8 @@
   brief = false;
 }
 {
-  name = "libodfgen-0.1.4.tar.bz2";
-  md5 = "8716be5c22ae8353f9aaa380d74840dc";
+  name = "libodfgen-0.1.6.tar.bz2";
+  md5 = "32572ea48d9021bbd6fa317ddb697abc";
   brief = true;
 }
 {
@@ -411,9 +406,14 @@
   brief = true;
 }
 {
-  name = "liborcus-0.7.0.tar.bz2";
-  md5 = "7681383be6ce489d84c1c74f4e7f9643";
-  brief = false;
+  name = "liborcus-0.9.2.tar.gz";
+  md5 = "e6efcbe50a5fd4d50d513c9a7a4139b0";
+  brief = true;
+}
+{
+  name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz";
+  md5 = "593f0aa47bf2efc0efda2d28fae063b2";
+  brief = true;
 }
 {
   name = "libpagemaker-0.0.2.tar.bz2";
@@ -426,8 +426,8 @@
   brief = false;
 }
 {
-  name = "libpng-1.5.24.tar.gz";
-  md5 = "6652e428d1d3fc3c6cb1362159b1cf3b";
+  name = "libpng-1.6.19.tar.gz";
+  md5 = "3121bdc77c365a87e054b9f859f421fe";
   brief = true;
 }
 {
@@ -445,6 +445,11 @@
   md5 = "803a75927f8f241ca78633890c798021";
   brief = true;
 }
+{
+  name = "Python-3.5.0.tgz";
+  md5 = "a56c0c0b45d75a0ec9c6dee933c41c36";
+  brief = true;
+}
 {
   name = "raptor2-2.0.9.tar.gz";
   md5 = "4ceb9316488b0ea01acf011023cf7fff";
@@ -461,8 +466,8 @@
   brief = false;
 }
 {
-  name = "librevenge-0.0.2.tar.bz2";
-  md5 = "2d4183bf17aea1a71842468a71a68c47";
+  name = "librevenge-0.0.4.tar.bz2";
+  md5 = "5b9ac52ec77d4d19157cf5962ebc0aea";
   brief = true;
 }
 {
@@ -491,23 +496,23 @@
   brief = false;
 }
 {
-  name = "libvisio-0.1.1.tar.bz2";
-  md5 = "726c1f5be65eb7d649e0d48b63d920e7";
+  name = "libvisio-0.1.5.tar.bz2";
+  md5 = "cbee198a78b842b2087f32d33c522818";
   brief = true;
 }
 {
-  name = "libwpd-0.10.0.tar.bz2";
-  md5 = "0773d79a1f240ef9f4f20242b13c5bb7";
+  name = "libwpd-0.10.1.tar.bz2";
+  md5 = "79b56bcc349264d686a67994506ad199";
   brief = true;
 }
 {
-  name = "libwpg-0.3.0.tar.bz2";
-  md5 = "17da9770cb8b317b7633f9807b32b71a";
+  name = "libwpg-0.3.1.tar.bz2";
+  md5 = "dfd066658ec9d2fb2262417039a8a1c3";
   brief = true;
 }
 {
-  name = "libwps-0.4.0.tar.bz2";
-  md5 = "e9162d2566421d9d71b3ad2377a68fd5";
+  name = "libwps-0.4.2.tar.bz2";
+  md5 = "8a6c55542ce80203dd6d3b1cba99d4e5";
   brief = true;
 }
 {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 91454a07b47d..26f38aaf9651 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1705,14 +1705,14 @@ let
   gitinspector = callPackage ../applications/version-management/gitinspector { };
 
   gitlab = callPackage ../applications/version-management/gitlab {
-    ruby = ruby_2_2;
+    ruby = ruby_2_2_2;
   };
 
   gitlab-shell = callPackage ../applications/version-management/gitlab-shell {
-    ruby = ruby_2_2;
+    ruby = ruby_2_2_2;
   };
 
-  gitlab-workhorse = callPackage ../applications/version-management/gitlab-workhorse { };
+  gitlab-git-http-server = callPackage ../applications/version-management/gitlab-git-http-server { };
 
   git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { };
 
@@ -12692,6 +12692,7 @@ let
   libreoffice = callPackage ../applications/office/libreoffice {
     inherit (perlPackages) ArchiveZip CompressZlib;
     inherit (gnome) GConf ORBit2 gnome_vfs;
+    inherit (gnome3) gsettings_desktop_schemas defaultIconTheme;
     zip = zip.override { enableNLS = false; };
     #glm = glm_0954;
     bluez5 = bluez5_28;

From 89f0e251899850109f25391836472ba6892b7d15 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 26 Feb 2016 15:03:53 +0000
Subject: [PATCH 1843/2285] vim: provide a default vimrc

Minimal sane defaults imported from ArchLinux.

This is basically `set :nocompatible` with some other small changes.
---
 pkgs/applications/editors/vim/default.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index a09eb846e500..1249b0b95641 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -1,5 +1,10 @@
-{ stdenv, fetchFromGitHub, ncurses, gettext, pkgconfig
-
+{ stdenv, fetchFromGitHub, fetchurl, ncurses, gettext, pkgconfig
+# default vimrc
+, vimrc ? fetchurl {
+    name = "default-vimrc";
+    url = https://projects.archlinux.org/svntogit/packages.git/plain/trunk/archlinux.vim?h=packages/vim?id=68f6d131750aa778807119e03eed70286a17b1cb;
+    sha256 = "18ifhv5q9prd175q3vxbqf6qyvkk6bc7d2lhqdk0q78i68kv9y0c";
+  }
 # apple frameworks
 , Carbon, Cocoa }:
 
@@ -25,7 +30,11 @@ stdenv.mkDerivation rec {
     "--enable-nls"
   ];
 
-  postInstall = "ln -s $out/bin/vim $out/bin/vi";
+  postInstall = ''
+    ln -s $out/bin/vim $out/bin/vi
+    mkdir -p $out/share/vim
+    cp "${vimrc}" $out/share/vim/vimrc
+  '';
 
   crossAttrs = {
     configureFlags = [

From 73a9cd8aee12e32b2317ff223217ec27bcc372a0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 26 Feb 2016 23:12:01 +0100
Subject: [PATCH 1844/2285] Revert accidental revert of all-packages.nix gitlab
 changes during revert of revert of libreoffice update

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26f38aaf9651..c8848c922ee2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1705,14 +1705,14 @@ let
   gitinspector = callPackage ../applications/version-management/gitinspector { };
 
   gitlab = callPackage ../applications/version-management/gitlab {
-    ruby = ruby_2_2_2;
+    ruby = ruby_2_2;
   };
 
   gitlab-shell = callPackage ../applications/version-management/gitlab-shell {
-    ruby = ruby_2_2_2;
+    ruby = ruby_2_2;
   };
 
-  gitlab-git-http-server = callPackage ../applications/version-management/gitlab-git-http-server { };
+  gitlab-workhorse = callPackage ../applications/version-management/gitlab-workhorse { };
 
   git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { };
 

From dea3279593753f0dee2966cd3f0f1f84be5bfbe2 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 26 Feb 2016 18:52:37 +0000
Subject: [PATCH 1845/2285] lib.maintainers: alphabetize

---
 lib/maintainers.nix | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 226c41d48061..a512b48c54db 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -7,14 +7,14 @@
      so it's easy to ping a package @maintainer.
   */
 
-  aaronschif = "Aaron Schif <aaronschif@gmail.com>";
   a1russell = "Adam Russell <adamlr6+pub@gmail.com>";
+  aaronschif = "Aaron Schif <aaronschif@gmail.com>";
   abaldeau = "Andreas Baldeau <andreas@baldeau.net>";
   abbradar = "Nikolay Amiantov <ab@fmap.me>";
-  adev	   = "Adrien Devresse <adev@adev.name>";
+  adev = "Adrien Devresse <adev@adev.name>";
   aespinosa = "Allan Espinosa <allan.espinosa@outlook.com>";
-  aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
   aflatter = "Alexander Flatter <flatter@fastmail.fm>";
+  aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
   aherrmann = "Andreas Herrmann <andreash87@gmx.ch>";
   ak = "Alexander Kjeldaas <ak@formalprivacy.com>";
   akaWolf = "Artjom Vejsel <akawolf0@gmail.com>";
@@ -46,8 +46,8 @@
   bcarrell = "Brandon Carrell <brandoncarrell@gmail.com>";
   bcdarwin = "Ben Darwin <bcdarwin@gmail.com>";
   bdimcheff = "Brandon Dimcheff <brandon@dimcheff.com>";
-  bennofs = "Benno Fünfstück <benno.fuenfstueck@gmail.com>";
   benley = "Benjamin Staffin <benley@gmail.com>";
+  bennofs = "Benno Fünfstück <benno.fuenfstueck@gmail.com>";
   berdario = "Dario Bertini <berdario@gmail.com>";
   bergey = "Daniel Bergey <bergey@teallabs.org>";
   bjg = "Brian Gough <bjg@gnu.org>";
@@ -82,9 +82,9 @@
   davidak = "David Kleuker <post@davidak.de>";
   davidrusu = "David Rusu <davidrusu.me@gmail.com>";
   dbohdan = "Danyil Bohdan <danyil.bohdan@gmail.com>";
-  DerGuteMoritz = "Moritz Heidkamp <moritz@twoticketsplease.de>";
   deepfire = "Kosyrev Serge <_deepfire@feelingofgreen.ru>";
   demin-dmitriy = "Dmitriy Demin <demindf@gmail.com>";
+  DerGuteMoritz = "Moritz Heidkamp <moritz@twoticketsplease.de>";
   desiderius = "Didier J. Devroye <didier@devroye.name>";
   devhell = "devhell <\"^\"@regexmail.net>";
   dezgeg = "Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>";
@@ -135,6 +135,7 @@
   gleber = "Gleb Peregud <gleber.p@gmail.com>";
   globin = "Robin Gloster <mail@glob.in>";
   goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>";
+  Gonzih = "Max Gonzih <gonzih@gmail.com>";
   gridaphobe = "Eric Seidel <eric@seidel.io>";
   guibert = "David Guibert <david.guibert@gmail.com>";
   havvy = "Ryan Scheel <ryan.havvy@gmail.com>";
@@ -191,9 +192,9 @@
   lowfatcomputing = "Andreas Wagner <andreas.wagner@lowfatcomputing.org>";
   lsix = "Lancelot SIX <lsix@lancelotsix.com>";
   ludo = "Ludovic Courtès <ludo@gnu.org>";
+  luispedro = "Luis Pedro Coelho <luis@luispedro.org>";
   lukasepple = "Lukas Epple <post@lukasepple.de>";
   lukego = "Luke Gorrie <luke@snabb.co>";
-  luispedro = "Luis Pedro Coelho <luis@luispedro.org>";
   lw = "Sergey Sofeychuk <lw@fmap.me>";
   madjar = "Georges Dubus <georges.dubus@compiletoi.net>";
   magnetophon = "Bart Brouns <bart@magnetophon.nl>";
@@ -203,25 +204,25 @@
   manveru = "Michael Fellinger <m.fellinger@gmail.com>";
   marcweber = "Marc Weber <marco-oweber@gmx.de>";
   markWot = "Markus Wotringer <markus@wotringer.de>";
-  maurer = "Matthew Maurer <matthew.r.maurer+nix@gmail.com>";
   matejc = "Matej Cotman <cotman.matej@gmail.com>";
   mathnerd314 = "Mathnerd314 <mathnerd314.gph+hs@gmail.com>";
   matthiasbeyer = "Matthias Beyer <mail@beyermatthias.de>";
+  maurer = "Matthew Maurer <matthew.r.maurer+nix@gmail.com>";
   mbakke = "Marius Bakke <ymse@tuta.io>";
   mbe = "Brandon Edens <brandonedens@gmail.com>";
   mcmtroffaes = "Matthias C. M. Troffaes <matthias.troffaes@gmail.com>";
   meditans = "Carlo Nucera <meditans@gmail.com>";
   meisternu = "Matt Miemiec <meister@krutt.org>";
-  michelk = "Michel Kuhlmann <michel@kuhlmanns.info>";
   michaelpj = "Michael Peyton Jones <michaelpj@gmail.com>";
+  michelk = "Michel Kuhlmann <michel@kuhlmanns.info>";
   mingchuan = "Ming Chuan <ming@culpring.com>";
   mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>";
-  mschristiansen = "Mikkel Christiansen <mikkel@rheosystems.com>";
   modulistic = "Pablo Costa <modulistic@gmail.com>";
   mog = "Matthew O'Gorman <mog-lists@rldn.net>";
   mornfall = "Petr Ročkai <me@mornfall.net>";
   MP2E = "Cray Elliott <MP2E@archlinux.us>";
   msackman = "Matthew Sackman <matthew@wellquite.org>";
+  mschristiansen = "Mikkel Christiansen <mikkel@rheosystems.com>";
   msteen = "Matthijs Steen <emailmatthijs@gmail.com>";
   mtreskin = "Max Treskin <zerthurd@gmail.com>";
   mudri = "James Wood <lamudri@gmail.com>";
@@ -248,8 +249,9 @@
   palo = "Ingolf Wanger <palipalo9@googlemail.com>";
   pashev = "Igor Pashev <pashev.igor@gmail.com>";
   pesterhazy = "Paulus Esterhazy <pesterhazy@gmail.com>";
-  phile314 = "Philipp Hausmann <nix@314.ch>";
   philandstuff = "Philip Potter <philip.g.potter@gmail.com>";
+  phile314 = "Philipp Hausmann <nix@314.ch>";
+  Phlogistique = "Noé Rubinstein <noe.rubinstein@gmail.com>";
   phreedom = "Evgeny Egorochkin <phreedom@yandex.ru>";
   phunehehe = "Hoang Xuan Phu <phunehehe@gmail.com>";
   pierron = "Nicolas B. Pierron <nixos@nbp.name>";
@@ -258,7 +260,6 @@
   pjones = "Peter Jones <pjones@devalot.com>";
   pkmx = "Chih-Mao Chen <pkmx.tw@gmail.com>";
   plcplc = "Philip Lykke Carlsen <plcplc@gmail.com>";
-  Phlogistique = "Noé Rubinstein <noe.rubinstein@gmail.com>";
   pmahoney = "Patrick Mahoney <pat@polycrystal.org>";
   pmiddend = "Philipp Middendorf <pmidden@secure.mailbox.org>";
   prikhi = "Pavan Rikhi <pavan.rikhi@gmail.com>";
@@ -350,9 +351,9 @@
   winden = "Antonio Vargas Gonzalez <windenntw@gmail.com>";
   wizeman = "Ricardo M. Correia <rcorreia@wizy.org>";
   wjlroe = "William Roe <willroe@gmail.com>";
-  womfoo = "Kranium Gikos Mendoza <kranium@gikos.net>";
   wkennington = "William A. Kennington III <william@wkennington.com>";
   wmertens = "Wout Mertens <Wout.Mertens@gmail.com>";
+  womfoo = "Kranium Gikos Mendoza <kranium@gikos.net>";
   wscott = "Wayne Scott <wsc9tt@gmail.com>";
   wyvie = "Elijah Rum <elijahrum@gmail.com>";
   yarr = "Dmitry V. <savraz@gmail.com>";
@@ -362,5 +363,4 @@
   zimbatm = "zimbatm <zimbatm@zimbatm.com>";
   zohl = "Al Zohali <zohl@fmap.me>";
   zoomulator = "Kim Simmons <zoomulator@gmail.com>";
-  Gonzih = "Max Gonzih <gonzih@gmail.com>";
 }

From 6e5a748224009c5f9ccf2be4f48ee2bf06b67fdc Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 26 Feb 2016 18:53:03 +0000
Subject: [PATCH 1846/2285] lib.platforms: alphabetize

---
 lib/platforms.nix | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/lib/platforms.nix b/lib/platforms.nix
index 5ac0b5287145..b068d080e752 100644
--- a/lib/platforms.nix
+++ b/lib/platforms.nix
@@ -1,21 +1,24 @@
 let lists = import ./lists.nix; in
 
 rec {
-  gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */
-  linux = ["i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "mips64el-linux"];
+  all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos;
+  allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all;
+  none = [];
+
+  arm = ["armv5tel-linux" "armv6l-linux" "armv7l-linux" ];
+  i686 = ["i686-linux" "i686-freebsd" "i686-netbsd" "i686-cygwin"];
+  mips = [ "mips64el-linux" ];
+  x86_64 = ["x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin"];
+
+  cygwin = ["i686-cygwin" "x86_64-cygwin"];
   darwin = ["x86_64-darwin"];
   freebsd = ["i686-freebsd" "x86_64-freebsd"];
-  openbsd = ["i686-openbsd" "x86_64-openbsd"];
-  netbsd = ["i686-netbsd" "x86_64-netbsd"];
-  cygwin = ["i686-cygwin" "x86_64-cygwin"];
+  gnu = linux; /* ++ hurd ++ kfreebsd ++ ... */
   illumos = ["x86_64-solaris"];
+  linux = ["i686-linux" "x86_64-linux" "armv5tel-linux" "armv6l-linux" "armv7l-linux" "mips64el-linux"];
+  netbsd = ["i686-netbsd" "x86_64-netbsd"];
+  openbsd = ["i686-openbsd" "x86_64-openbsd"];
   unix = linux ++ darwin ++ freebsd ++ openbsd ++ netbsd ++ illumos;
-  all = linux ++ darwin ++ cygwin ++ freebsd ++ openbsd ++ netbsd ++ illumos;
-  none = [];
-  allBut = platforms: lists.filter (x: !(builtins.elem x platforms)) all;
+
   mesaPlatforms = ["i686-linux" "x86_64-linux" "x86_64-darwin" "armv5tel-linux" "armv6l-linux" "armv7l-linux"];
-  x86_64 = ["x86_64-linux" "x86_64-darwin" "x86_64-freebsd" "x86_64-openbsd" "x86_64-netbsd" "x86_64-cygwin"];
-  i686 = ["i686-linux" "i686-freebsd" "i686-netbsd" "i686-cygwin"];
-  arm = ["armv5tel-linux" "armv6l-linux" "armv7l-linux" ];
-  mips = [ "mips64el-linux" ];
 }

From 07b1f78b948e3a3504ea8ac4107a8490d8ff97df Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 26 Feb 2016 18:53:47 +0000
Subject: [PATCH 1847/2285] lib: alphabetize things

---
 lib/systems.nix       |  6 +++---
 lib/tests/release.nix | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/systems.nix b/lib/systems.nix
index 25a83e9d14fa..92d8bdf892b4 100644
--- a/lib/systems.nix
+++ b/lib/systems.nix
@@ -84,10 +84,10 @@ rec {
   };
 
 
-  isDarwin = matchAttrs { kernel = kernels.darwin; };
-  isLinux = matchAttrs { kernel = kernels.linux; };
-  isi686 = matchAttrs { cpu = cpuTypes.i686; };
   is64Bit = matchAttrs { cpu = { bits = 64; }; };
+  isDarwin = matchAttrs { kernel = kernels.darwin; };
+  isi686 = matchAttrs { cpu = cpuTypes.i686; };
+  isLinux = matchAttrs { kernel = kernels.linux; };
 
 
   # This should revert the job done by config.guess from the gcc compiler.
diff --git a/lib/tests/release.nix b/lib/tests/release.nix
index e7fb52f67665..093e9bcbf104 100644
--- a/lib/tests/release.nix
+++ b/lib/tests/release.nix
@@ -11,14 +11,14 @@ stdenv.mkDerivation {
   buildCommand = ''
     datadir="${nix}/share"
     export TEST_ROOT=$(pwd)/test-tmp
-    export NIX_STORE_DIR=$TEST_ROOT/store
+    export NIX_BUILD_HOOK=
+    export NIX_CONF_DIR=$TEST_ROOT/etc
+    export NIX_DB_DIR=$TEST_ROOT/db
     export NIX_LOCALSTATE_DIR=$TEST_ROOT/var
     export NIX_LOG_DIR=$TEST_ROOT/var/log/nix
-    export NIX_STATE_DIR=$TEST_ROOT/var/nix
-    export NIX_DB_DIR=$TEST_ROOT/db
-    export NIX_CONF_DIR=$TEST_ROOT/etc
     export NIX_MANIFESTS_DIR=$TEST_ROOT/var/nix/manifests
-    export NIX_BUILD_HOOK=
+    export NIX_STATE_DIR=$TEST_ROOT/var/nix
+    export NIX_STORE_DIR=$TEST_ROOT/store
     export PAGER=cat
     cacheDir=$TEST_ROOT/binary-cache
     nix-store --init

From 9f57b24b0101b5ebcdc33a92fa9ac80201cd95b0 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 26 Feb 2016 18:54:22 +0000
Subject: [PATCH 1848/2285] all-packages: alphabetize deprecated packages

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 98405112dde2..cadcb7a2ff31 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16175,11 +16175,13 @@ let
 aliases = with pkgs; {
   accounts-qt = qt5.accounts-qt;  # added 2015-12-19
   adobeReader = adobe-reader;
+  aircrackng = aircrack-ng; # added 2016-01-14
   arduino_core = arduino-core;  # added 2015-02-04
   asciidocFull = asciidoc-full;  # added 2014-06-22
   bar = lemonbar;  # added 2015-01-16
   bar-xft = lemonbar-xft;  # added 2015-01-16
   bridge_utils = bridge-utils;  # added 2015-02-20
+  btrfsProgs = btrfs-progs; # added 2016-01-03
   buildbotSlave = buildbot-slave;  # added 2014-12-09
   cheetahTemplate = pythonPackages.cheetah; # 2015-06-15
   clangAnalyzer = clang-analyzer;  # added 2015-02-20
@@ -16187,12 +16189,13 @@ aliases = with pkgs; {
   cool-old-term = cool-retro-term; # added 2015-01-31
   cupsBjnp = cups-bjnp; # added 2016-01-02
   cv = progress; # added 2015-09-06
+  dwarf_fortress = dwarf-fortress; # added 2016-01-23
   dwbWrapper = dwb; # added 2015-01
   enblendenfuse = enblend-enfuse; # 2015-09-30
   exfat-utils = exfat;                  # 2015-09-11
-  firefoxWrapper = firefox;           # 2015-09
-  firefox-wrapper = firefox;          # 2016-01
   firefox-esr-wrapper = firefox-esr;  # 2016-01
+  firefox-wrapper = firefox;          # 2016-01
+  firefoxWrapper = firefox;           # 2015-09
   fuse_exfat = exfat;                   # 2015-09-11
   grantlee5 = qt5.grantlee;  # added 2015-12-19
   gupnptools = gupnp-tools;  # added 2015-12-19
@@ -16205,53 +16208,50 @@ aliases = with pkgs; {
   links = links2; # added 2016-01-31
   lttngTools = lttng-tools;  # added 2014-07-31
   lttngUst = lttng-ust;  # added 2014-07-31
+  manpages = man-pages; # added 2015-12-06
   midoriWrapper = midori; # added 2015-01
   mlt-qt5 = qt5.mlt;  # added 2015-12-19
+  mssys = ms-sys; # added 2015-12-13
   multipath_tools = multipath-tools;  # added 2016-01-21
   mupen64plus1_5 = mupen64plus; # added 2016-02-12
   ncat = nmap;  # added 2016-01-26
   nfsUtils = nfs-utils;  # added 2014-12-06
   phonon_qt5 = qt5.phonon;  # added 2015-12-19
   phonon_qt5_backend_gstreamer = qt5.phonon-backend-gstreamer;  # added 2015-12-19
+  pidginlatexSF = pidginlatex; # added 2014-11-02
   poppler_qt5 = qt5.poppler;  # added 2015-12-19
   qca-qt5 = qt5.qca-qt5;  # added 2015-12-19
   qtcreator = qt5.qtcreator;  # added 2015-12-19
+  quake3game = ioquake3; # added 2016-01-14
+  quassel_kf5 = kde5.quassel; # added 2015-09-30
   quassel_qt5 = kde5.quassel_qt5; # added 2015-09-30
+  quasselClient_kf5 = kde5.quasselClient; # added 2015-09-30
   quasselClient_qt5 = kde5.quasselClient_qt5; # added 2015-09-30
   quasselDaemon_qt5 = kde5.quasselDaemon; # added 2015-09-30
-  quassel_kf5 = kde5.quassel; # added 2015-09-30
-  quasselClient_kf5 = kde5.quasselClient; # added 2015-09-30
   qwt6 = qt5.qwt;  # added 2015-12-19
   rdiff_backup = rdiff-backup;  # added 2014-11-23
   rekonqWrapper = rekonq; # added 2015-01
   rssglx = rss-glx; #added 2015-03-25
   rxvt_unicode_with-plugins = rxvt_unicode-with-plugins; # added 2015-04-02
+  samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25
+  saneBackends = sane-backends; # added 2016-01-02
+  saneBackendsGit = sane-backends-git; # added 2016-01-02
+  saneFrontends = sane-frontends; # added 2016-01-02
+  scim = sc-im; # added 2016-01-22
   signon = qt5.signon;  # added 2015-12-19
   speedtest_cli = speedtest-cli;  # added 2015-02-17
   sqliteInteractive = sqlite-interactive;  # added 2014-12-06
   system_config_printer = system-config-printer;  # added 2016-01-03
   telepathy_qt5 = qt5.telepathy;  # added 2015-12-19
+  tftp_hpa = tftp-hpa; # added 2015-04-03
+  vimbWrapper = vimb; # added 2015-01
+  vimprobable2Wrapper = vimprobable2; # added 2015-01
+  virtviewer = virt-viewer; # added 2015-12-24
+  vorbisTools = vorbis-tools; # added 2016-01-26
   x11 = xlibsWrapper; # added 2015-09
   xf86_video_nouveau = xorg.xf86videonouveau; # added 2015-09
   xlibs = xorg; # added 2015-09
   youtubeDL = youtube-dl;  # added 2014-10-26
-  vimbWrapper = vimb; # added 2015-01
-  vimprobable2Wrapper = vimprobable2; # added 2015-01
-  pidginlatexSF = pidginlatex; # added 2014-11-02
-  tftp_hpa = tftp-hpa; # added 2015-04-03
-  manpages = man-pages; # added 2015-12-06
-  mssys = ms-sys; # added 2015-12-13
-  virtviewer = virt-viewer; # added 2015-12-24
-  saneBackends = sane-backends; # added 2016-01-02
-  saneBackendsGit = sane-backends-git; # added 2016-01-02
-  saneFrontends = sane-frontends; # added 2016-01-02
-  btrfsProgs = btrfs-progs; # added 2016-01-03
-  aircrackng = aircrack-ng; # added 2016-01-14
-  quake3game = ioquake3; # added 2016-01-14
-  scim = sc-im; # added 2016-01-22
-  dwarf_fortress = dwarf-fortress; # added 2016-01-23
-  samsungUnifiedLinuxDriver = samsung-unified-linux-driver; # added 2016-01-25
-  vorbisTools = vorbis-tools; # added 2016-01-26
 };
 
 tweakAlias = _n: alias: with lib;

From c3ed0a249401b6006768bfd62cbb628121d2209e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Fri, 26 Feb 2016 23:09:50 +0100
Subject: [PATCH 1849/2285] btrfs-progs: 4.4 -> 4.4.1

Bugfix release. Changes:
https://btrfs.wiki.kernel.org/index.php/Changelog#By_version_.28btrfs-progs.29
---
 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 536cc26779b9..3435a8c14329 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.4"; in
+let version = "4.4.1"; 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 = "0jssv1ys4nw2jf7mkp58c19yspaa8ybf48fxsrhhp0683mzpr73p";
+    sha256 = "1z5882zx9jx02vyg067siws0irsl8pg37myx17hr4imn9ypf6r4r";
   };
 
   buildInputs = [

From 6d111b353f9fd0f4a504988a3da57ee42808c201 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 27 Feb 2016 00:17:18 +0100
Subject: [PATCH 1850/2285] Make explicit that maintainers should use a real
 name

---
 lib/maintainers.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index a512b48c54db..3d9fc00ea55d 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -1,12 +1,11 @@
-/* -*- coding: utf-8; -*- */
+/* List of NixOS maintainers. The format is:
 
+    handle = "Real Name <address@example.org>";
+
+  where <handle> is preferred to be your GitHub username (so it's easy
+  to ping a package @<handle>), and <Real Name> is your real name, not
+  a pseudonym. Please keep the list alphabetically sorted. */
 {
-  /* Add your name and email address here.
-     Keep the list alphabetically sorted.
-     Prefer the same attrname as your github username, please,
-     so it's easy to ping a package @maintainer.
-  */
-
   a1russell = "Adam Russell <adamlr6+pub@gmail.com>";
   aaronschif = "Aaron Schif <aaronschif@gmail.com>";
   abaldeau = "Andreas Baldeau <andreas@baldeau.net>";

From 10e3664c97e8de4b1719db38c2cd9db2500bd1af Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 26 Feb 2016 17:30:01 -0600
Subject: [PATCH 1851/2285] ibus: 1.5.11 -> 1.5.13

---
 pkgs/tools/inputmethods/ibus/default.nix | 67 +++++++++++++++++-------
 pkgs/top-level/all-packages.nix          |  5 +-
 2 files changed, 52 insertions(+), 20 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus/default.nix b/pkgs/tools/inputmethods/ibus/default.nix
index 3e17e721f7be..8b830c257f07 100644
--- a/pkgs/tools/inputmethods/ibus/default.nix
+++ b/pkgs/tools/inputmethods/ibus/default.nix
@@ -1,42 +1,71 @@
-{ stdenv, fetchurl, makeWrapper, python, intltool, pkgconfig
-, gnome3, atk, pygobject3, dbus, libnotify, isocodes, gobjectIntrospection, wayland }:
+{ stdenv, fetchurl, makeWrapper
+, intltool, isocodes, pkgconfig
+, python3, pygobject3
+, gtk2, gtk3, atk, dconf, glib
+, dbus, libnotify, gobjectIntrospection, wayland
+}:
 
 stdenv.mkDerivation rec {
   name = "ibus-${version}";
-  version = "1.5.11";
+  version = "1.5.13";
 
   src = fetchurl {
     url = "https://github.com/ibus/ibus/releases/download/${version}/${name}.tar.gz";
-    sha256 = "1g26llizd26h9sfz4xdq8krhz19hn08pirvfbkk3g89ri8lmm6a9";
+    sha256 = "1wd5azlsgdih8qw6gi15rv130s6d90846n3r1ccwmp6z882xhwzd";
   };
 
-  configureFlags = "--disable-gconf --enable-dconf --disable-memconf --enable-ui --enable-python-library";
+  postPatch = ''
+    # These paths will be set in the wrapper.
+    sed -e "/export IBUS_DATAROOTDIR/ s/^.*$//" \
+        -e "/export IBUS_LIBEXECDIR/ s/^.*$//" \
+        -e "/export IBUS_LOCALEDIR/ s/^.*$//" \
+        -e "/export IBUS_PREFIX/ s/^.*$//" \
+        -i "setup/ibus-setup.in"
+  '';
 
-  buildInputs = [
-    makeWrapper python gnome3.glib wayland
-    intltool pkgconfig gnome3.gtk2
-    gnome3.gtk3 dbus gnome3.dconf gnome3.gconf
-    libnotify isocodes gobjectIntrospection
+  configureFlags = [
+    "--disable-gconf"
+    "--enable-dconf"
+    "--disable-memconf"
+    "--enable-ui"
+    "--enable-python-library"
   ];
 
+  buildInputs = [
+    python3 pygobject3
+    intltool isocodes pkgconfig
+    gtk2 gtk3 dconf glib
+    dbus libnotify gobjectIntrospection wayland
+  ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
   preConfigure = ''
+    # Fix hard-coded installation paths, so make does not try to overwrite our
+    # Python installation.
+    sed -e "/py2overridesdir=/ s|=.*$|=$out/lib/${python3.libPrefix}|" \
+        -e "/pyoverridesdir=/ s|=.*$|=$out/lib/${python3.libPrefix}|" \
+        -e "/PYTHON2_LIBDIR/ s|=.*|=$out/lib/${python3.libPrefix}|" \
+        -i configure
+
+    # Don't try to generate a system-wide dconf database; it wouldn't work.
     substituteInPlace data/dconf/Makefile.in --replace "dconf update" "echo"
-    sed -i "s|PYTHON2_LIBDIR=.*|PYTHON2_LIBDIR=$out/lib/${python.libPrefix}|" configure
   '';
 
   preFixup = ''
-    for f in "$out"/bin/*; do
-      wrapProgram "$f" --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
-                       --prefix PYTHONPATH : "$(toPythonPath ${pygobject3})" \
-                       --prefix LD_LIBRARY_PATH : "${gnome3.gtk3}/lib:${atk}/lib:$out/lib" \
-                       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
-                       --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
+    for f in "$out/bin"/*; do #*/
+      wrapProgram "$f" \
+        --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
+        --prefix PYTHONPATH : "$PYTHONPATH" \
+        --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
+        --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
     done
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://github.com/ibus/ibus;
     description = "Intelligent Input Bus for Linux / Unix OS";
-    platforms = stdenv.lib.platforms.linux;
+    platforms = platforms.linux;
+    maintainers = [ maintainers.ttuegel ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 71695b6b28be..29bb2dd1306e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1162,7 +1162,10 @@ let
 
   m17n_lib = callPackage ../tools/inputmethods/m17n-lib { };
 
-  ibus = callPackage ../tools/inputmethods/ibus { };
+  ibus = callPackage ../tools/inputmethods/ibus {
+    inherit (python3Packages) pygobject3;
+    inherit (gnome3) dconf glib;
+  };
 
   ibus-qt = callPackage ../tools/inputmethods/ibus/ibus-qt.nix { };
 

From f058f1c1d3a265766cf5e74678758f253d2c6f15 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 26 Feb 2016 17:30:20 -0600
Subject: [PATCH 1852/2285] ibus-with-plugins: rewrite wrapper

---
 pkgs/tools/inputmethods/ibus/wrapper.nix | 52 +++++++++++++++---------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix
index 270a2db7412c..3bccad1cc0c9 100644
--- a/pkgs/tools/inputmethods/ibus/wrapper.nix
+++ b/pkgs/tools/inputmethods/ibus/wrapper.nix
@@ -1,24 +1,36 @@
-{ stdenv, buildEnv, ibus, makeWrapper, plugins, hicolor_icon_theme }:
+{ stdenv, runCommand, ibus, lndir, makeWrapper, plugins, hicolor_icon_theme }:
 
 let
-drv = buildEnv {
   name = "ibus-with-plugins-" + (builtins.parseDrvName ibus.name).version;
-
-  paths = [ ibus hicolor_icon_theme ] ++ plugins;
-
-  postBuild = ''
-    # TODO: This could be avoided if buildEnv could be forced to create all directories
-    if [ -L $out/bin ]; then
-      rm $out/bin
-      mkdir $out/bin
-      for i in ${ibus}/bin/*; do
-        ln -s $i $out/bin
-      done
-    fi
-    wrapProgram $out/bin/ibus \
-      --set IBUS_COMPONENT_PATH "$out/share/ibus/component/"
-    wrapProgram $out/bin/ibus-daemon \
-      --set IBUS_COMPONENT_PATH "$out/share/ibus/component/"
-  '';
+  env = {
+    nativeBuildInputs = [ lndir makeWrapper ];
+    propagatedUserEnvPackages = [ hicolor_icon_theme ];
+    paths = [ ibus ] ++ plugins;
   };
-in stdenv.lib.overrideDerivation drv (x : { buildInputs = x.buildInputs ++ [ makeWrapper ]; })
+  command = ''
+    for dir in bin etc lib libexec share; do
+        mkdir -p "$out/$dir"
+        for pkg in $paths; do
+            if [ -d "$pkg/$dir" ]; then
+                lndir -silent "$pkg/$dir" "$out/$dir"
+            fi
+        done
+    done
+
+    for prog in ibus ibus-daemon ibus-setup; do
+        wrapProgram "$out/bin/$prog" \
+          --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" \
+          --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \
+          --set IBUS_DATAROOTDIR "$out/share" \
+          --set IBUS_LIBEXECDIR "$out/libexec" \
+          --set IBUS_LOCALEDIR "$out/share/locale" \
+          --set IBUS_PREFIX "$out" \
+          --set IBUS_TABLE_BIN_PATH "$out/bin" \
+          --set IBUS_TABLE_DATA_DIR "$out/share" \
+          --set IBUS_TABLE_LIB_LOCATION "$out/libexec" \
+          --set IBUS_TABLE_LOCATION "$out/share/ibus-table" \
+          --set IBUS_TABLE_DEBUG_LEVEL 1
+    done
+  '';
+in
+  runCommand name env command

From 6c85f72a915ef8579e8efb5f7520bd3f25d20c4f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 26 Feb 2016 17:30:32 -0600
Subject: [PATCH 1853/2285] ibus-table: 1.9.6 -> 1.9.11

---
 .../ibus-engines/ibus-table/default.nix       | 46 +++++++++++++++++--
 pkgs/top-level/all-packages.nix               |  5 +-
 2 files changed, 46 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index 244169cf46b6..3d78a8ec69e7 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -1,15 +1,53 @@
-{ stdenv, fetchurl, ibus, pkgconfig, python3, pythonPackages }:
+{ stdenv, fetchurl, makeWrapper, ibus, pkgconfig, python3, pygobject3
+, gtk3, atk, dconf, gobjectIntrospection }:
 
 stdenv.mkDerivation rec {
   name = "ibus-table-${version}";
-  version = "1.9.6";
+  version = "1.9.11";
 
   src = fetchurl {
     url = "https://github.com/kaio/ibus-table/releases/download/${version}/${name}.tar.gz";
-    sha256 = "0xygfscmsx0x80c4d4v40k9bc7831kgdsc74mc84ljxbjg9p9lcf";
+    sha256 = "14sb89z1inbbhcrbsm5nww8la04ncy2lk32mxfqpi4ghl22ixxqd";
   };
 
-  buildInputs = [ ibus pkgconfig python3 pythonPackages.pygobject3 ];
+  postPatch = ''
+    # Data paths will be set at run-time.
+    sed -e "/export IBUS_TABLE_LIB_LOCATION=/ s/^.*$//" \
+        -e "/export IBUS_TABLE_LOCATION=/ s/^.*$//" \
+        -i "engine/ibus-engine-table.in"
+    sed -e "/export IBUS_TABLE_BIN_PATH=/ s/^.*$//" \
+        -e "/export IBUS_TABLE_DATA_DIR=/ s/^.*$//" \
+        -i "engine/ibus-table-createdb.in"
+    sed -e "/export IBUS_PREFIX=/ s/^.*$//" \
+        -e "/export IBUS_DATAROOTDIR=/ s/^.$//" \
+        -e "/export IBUS_LOCALEDIR=/ s/^.$//" \
+        -i "setup/ibus-setup-table.in"
+  '';
+
+  buildInputs = [
+    gtk3 dconf gobjectIntrospection
+    ibus
+    pkgconfig
+    python3 pygobject3
+  ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  preFixup = ''
+    for prog in "$out/bin"/*; do #*/
+      wrapProgram "$prog" \
+        --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
+        --prefix PYTHONPATH : "$PYTHONPATH" \
+        --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
+        --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
+    done
+
+    for prog in "$out/libexec"/*; do #*/
+      wrapProgram "$prog" \
+        --prefix PYTHONPATH : "$PYTHONPATH" \
+        --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0"
+    done
+  '';
 
   meta = with stdenv.lib; {
     isIbusEngine = true;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 29bb2dd1306e..8ec3fe3d5adb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1181,7 +1181,10 @@ let
       inherit (pythonPackages) gyp;
     };
 
-    table = callPackage ../tools/inputmethods/ibus-engines/ibus-table { };
+    table = callPackage ../tools/inputmethods/ibus-engines/ibus-table {
+      inherit (python3Packages) pygobject3;
+      inherit (gnome3) dconf;
+    };
 
     table-others = callPackage ../tools/inputmethods/ibus-engines/ibus-table-others {
       ibus-table = ibus-engines.table;

From f7f965baaa65c35858a9ab2e65b74dc1d6f2617a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 26 Feb 2016 17:30:59 -0600
Subject: [PATCH 1854/2285] ibus-hangul: download release from GitHub

---
 .../ibus-engines/ibus-hangul/default.nix      | 22 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  4 +++-
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
index b682196d5d08..ffffeefa9b60 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
@@ -1,24 +1,20 @@
-{ stdenv, gnome, fetchFromGitHub, ibus, libhangul, autoconf, automake, gettext, libtool, librsvg,
-  intltool, pkgconfig, pythonPackages, makeWrapper, gtk3, python }:
+{ stdenv, fetchurl, makeWrapper
+, intltool, pkgconfig
+, gtk3, ibus, libhangul, librsvg, python3, pygobject3
+}:
 
 stdenv.mkDerivation rec {
   name = "ibus-hangul-${version}";
   version = "1.5.0";
 
-  src = fetchFromGitHub {
-    owner  = "choehwanjin";
-    repo   = "ibus-hangul";
-    rev    = version;
-    sha256 = "12l2spr32biqdbz01bzkamgq5gskbi6cd7ai343wqyy1ibjlkmp8";
+  src = fetchurl {
+    url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${name}.tar.gz";
+    sha256 = null;
   };
 
-  buildInputs = [ ibus libhangul autoconf gettext automake libtool
-    intltool pkgconfig python pythonPackages.pygobject3 gtk3 makeWrapper ];
+  buildInputs = [ gtk3 ibus libhangul python3 pygobject3 ];
 
-  preConfigure = ''
-    autoreconf --verbose --force --install
-    intltoolize --automake --force --copy
-  '';
+  nativeBuildInputs = [ intltool makeWrapper pkgconfig ];
 
   postInstall = ''
     wrapProgram $out/bin/ibus-setup-hangul \
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8ec3fe3d5adb..657d82db3f41 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1173,7 +1173,9 @@ let
 
     anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { };
 
-    hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { };
+    hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul {
+      inherit (python3Packages) pygobject3;
+    };
 
     m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { };
 

From cb10990fdc2f1b671390a2f1b1b11b3362dd9f1d Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 26 Feb 2016 17:31:14 -0600
Subject: [PATCH 1855/2285] ibus-anthy: upgrade to Python 3

---
 .../ibus-engines/ibus-anthy/default.nix            | 14 +++++++++-----
 pkgs/top-level/all-packages.nix                    |  4 +++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
index 89039745fd99..2494c75a06c6 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchFromGitHub, makeWrapper, ibus, anthy, intltool, pkgconfig, glib, gobjectIntrospection,
-  python, pythonPackages, gtk3, libtool, automake, autoconf }:
+{ stdenv, fetchFromGitHub, makeWrapper, ibus, anthy, intltool
+, pkgconfig, glib, gobjectIntrospection
+, python3, pygobject3, gtk3, libtool, automake, autoconf
+}:
 
 stdenv.mkDerivation rec {
   name = "ibus-anthy-${version}";
@@ -18,12 +20,14 @@ stdenv.mkDerivation rec {
 
   configureFlags = "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t";
 
-  buildInputs = [ makeWrapper ibus anthy intltool pkgconfig glib gobjectIntrospection
-    python pythonPackages.pygobject3 gtk3 libtool automake autoconf ];
+  buildInputs = [
+    makeWrapper ibus anthy intltool pkgconfig glib gobjectIntrospection
+    python3 pygobject3 gtk3 libtool automake autoconf
+  ];
 
   postFixup = ''
     substituteInPlace $out/share/ibus/component/anthy.xml --replace \$\{exec_prefix\} $out
-    for file in "$out"/libexec/*; do
+    for file in "$out"/libexec/*; do # */
       wrapProgram "$file" \
         --prefix PYTHONPATH : $PYTHONPATH \
         --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH:$out/lib/girepository-1.0
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 657d82db3f41..3babc7e424db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1171,7 +1171,9 @@ let
 
   ibus-engines = {
 
-    anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy { };
+    anthy = callPackage ../tools/inputmethods/ibus-engines/ibus-anthy {
+      inherit (python3Packages) pygobject3;
+    };
 
     hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul {
       inherit (python3Packages) pygobject3;

From d30a1284677ebf2d74e00591811fb2a1b74f13d4 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 26 Feb 2016 18:07:29 -0600
Subject: [PATCH 1856/2285] ibus: rewrite NixOS module

---
 nixos/modules/i18n/inputMethod/ibus.nix | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/i18n/inputMethod/ibus.nix b/nixos/modules/i18n/inputMethod/ibus.nix
index 86059751a3d2..5d01311c91bd 100644
--- a/nixos/modules/i18n/inputMethod/ibus.nix
+++ b/nixos/modules/i18n/inputMethod/ibus.nix
@@ -9,6 +9,17 @@ let
     name  = "ibus-engine";
     check = x: (lib.types.package.check x) && (attrByPath ["meta" "isIbusEngine"] false x);
   };
+
+  ibusAutostart = pkgs.writeTextFile {
+    name = "autostart-ibus-daemon";
+    destination = "/etc/xdg/autostart/ibus-daemon.desktop";
+    text = ''
+      [Desktop Entry]
+      Name=IBus
+      Type=Application
+      Exec=${ibusPackage}/bin/ibus-daemon -dx
+    '';
+  };
 in
 {
   options = {
@@ -27,17 +38,14 @@ in
 
   config = mkIf (config.i18n.inputMethod.enabled == "ibus") {
     # Without dconf enabled it is impossible to use IBus
-    environment.systemPackages = [ ibusPackage pkgs.gnome3.dconf ];
-
-    gtkPlugins = [ pkgs.ibus ];
-    qtPlugins  = [ pkgs.ibus-qt ];
+    environment.systemPackages = with pkgs; [
+      ibusPackage ibus-qt gnome3.dconf ibusAutostart
+    ];
 
     environment.variables = {
       GTK_IM_MODULE = "ibus";
       QT_IM_MODULE = "ibus";
       XMODIFIERS = "@im=ibus";
     };
-
-    services.xserver.displayManager.sessionCommands = "${ibusPackage}/bin/ibus-daemon --daemonize --xim --cache=none";
   };
 }

From c267f5b71122453268d55ef665f20262be7f53d9 Mon Sep 17 00:00:00 2001
From: Adam Bell <agbell@gmail.com>
Date: Fri, 26 Feb 2016 19:37:57 -0500
Subject: [PATCH 1857/2285] Updating to postgis 2.2.1

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

diff --git a/pkgs/development/libraries/postgis/default.nix b/pkgs/development/libraries/postgis/default.nix
index 7c247dd6c1d1..5f41eb61c29b 100644
--- a/pkgs/development/libraries/postgis/default.nix
+++ b/pkgs/development/libraries/postgis/default.nix
@@ -5,7 +5,7 @@ args@{fetchurl, composableDerivation, stdenv, perl, libxml2, postgresql, geos, p
   ### NixOS - usage:
   ==================
 
-    services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql94; }).v_2_1_4 ];
+    services.postgresql.extraPlugins = [ (pkgs.postgis.override { postgresql = pkgs.postgresql95; }).v_2_2_1 ];
 
 
   ### important Postgis implementation details:
@@ -84,9 +84,9 @@ let
 
 in rec {
 
-  v_2_1_4 = pgDerivationBaseNewer.merge ( fix : {
-    version = "2.1.4";
-    sha256 = "1z00n5654r7l38ydkn2grbwl5gg0mravjwxfdipp7j18hjiw4wyd";
+  v_2_2_1 = pgDerivationBaseNewer.merge ( fix : {
+    version = "2.2.1";
+    sha256 = "02gsi1cm63kf0r7881444lrkzdjqhhpz9a5zav3al0q24nq01r8g";
     sql_srcs = ["postgis.sql" "spatial_ref_sys.sql"];
     builtInputs = [gdal json_c pkgconfig];
     dontDisableStatic = true;

From 2383a708f69a3b2eca50521808c4233ef7bb515a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 26 Feb 2016 18:43:41 -0600
Subject: [PATCH 1858/2285] ibus: refresh cache at startup

---
 nixos/modules/i18n/inputMethod/ibus.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/i18n/inputMethod/ibus.nix b/nixos/modules/i18n/inputMethod/ibus.nix
index 5d01311c91bd..581a0451990b 100644
--- a/nixos/modules/i18n/inputMethod/ibus.nix
+++ b/nixos/modules/i18n/inputMethod/ibus.nix
@@ -17,7 +17,7 @@ let
       [Desktop Entry]
       Name=IBus
       Type=Application
-      Exec=${ibusPackage}/bin/ibus-daemon -dx
+      Exec=${ibusPackage}/bin/ibus-daemon --daemonize --xim --cache=refresh
     '';
   };
 in

From 639c6b91a920b1129af298a598abc1ebc2d6c794 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 26 Feb 2016 18:43:54 -0600
Subject: [PATCH 1859/2285] ibus: add engine list to module description

---
 nixos/modules/i18n/inputMethod/ibus.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/i18n/inputMethod/ibus.nix b/nixos/modules/i18n/inputMethod/ibus.nix
index 581a0451990b..bb80f43634d3 100644
--- a/nixos/modules/i18n/inputMethod/ibus.nix
+++ b/nixos/modules/i18n/inputMethod/ibus.nix
@@ -28,10 +28,14 @@ in
         type    = with types; listOf ibusEngine;
         default = [];
         example = literalExample "with pkgs.ibus-engines; [ mozc hangul ]";
-        description = ''
-          Enabled IBus engines.
-          Available engines can be found by running `nix-env "&lt;nixpkgs&gt;" . -qaP -A ibus-engines`.
-        '';
+        description =
+          let
+            engines =
+              lib.concatStringsSep ", "
+              (map (name: "<literal>${name}</literal>")
+               (lib.attrNames pkgs.ibus-engines));
+          in
+            "Enabled IBus engines. Available engines are: ${engines}.";
       };
     };
   };

From ac94a5d86c81d17669875564f3c3e957fbfe5313 Mon Sep 17 00:00:00 2001
From: Rhys <rimmington@gmail.com>
Date: Fri, 26 Feb 2016 13:44:41 +1100
Subject: [PATCH 1860/2285] collectd: allow mysql to be null

---
 pkgs/tools/system/collectd/default.nix | 4 ++--
 pkgs/top-level/all-packages.nix        | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix
index ff64b54b9857..a1d676d708df 100644
--- a/pkgs/tools/system/collectd/default.nix
+++ b/pkgs/tools/system/collectd/default.nix
@@ -19,7 +19,7 @@
 , libtool ? null
 , lm_sensors ? null
 , lvm2 ? null
-, mysql ? null
+, libmysql ? null
 , postgresql ? null
 , protobufc ? null
 , python ? null
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     pkgconfig curl iptables libatasmart libcredis libdbi libgcrypt libmemcached
     cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt
-    lm_sensors libxml2 lvm2 mysql.lib postgresql protobufc rabbitmq-c rrdtool
+    lm_sensors libxml2 lvm2 libmysql postgresql protobufc rabbitmq-c rrdtool
     varnish yajl jdk libtool python udev
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 662905129e51..d91fa816f62f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1130,6 +1130,7 @@ let
 
   collectd = callPackage ../tools/system/collectd {
     rabbitmq-c = rabbitmq-c_0_4;
+    libmysql = mysql.lib;
   };
 
   colormake = callPackage ../development/tools/build-managers/colormake { };

From 456cbb29d9ba0cd518e82d2c2dc68e665629595e Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Sun, 13 Dec 2015 11:27:03 +1100
Subject: [PATCH 1861/2285] nix-prefetch-git: add --quiet flag and minor
 cleanup

---
 pkgs/build-support/fetchgit/nix-prefetch-git | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 97096aa29806..f81b896e33b0 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -52,6 +52,7 @@ for arg; do
             --hash) argfun=set_hashType;;
             --branch-name) argfun=set_branchName;;
             --deepClone) deepClone=true;;
+            --quiet) QUIET=true;;
             --no-deepClone) deepClone=false;;
             --leave-dotGit) leaveDotGit=true;;
             --fetch-submodules) fetchSubmodules=true;;
@@ -281,9 +282,9 @@ clone_user_rev() {
     eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK"
     if test -z "$leaveDotGit"; then
         echo "removing \`.git'..." >&2
-        find $dir -name .git\* | xargs rm -rf
+        find "$dir" -name .git\* -print0 | xargs -0 rm -rf
     else
-        find $dir -name .git | while read gitdir; do
+        find "$dir" -name .git | while read gitdir; do
             make_deterministic_repo "$(readlink -f "$gitdir/..")"
         done
     fi

From e361cdd5c39d98c5371c1bb0b7982c597b583adf Mon Sep 17 00:00:00 2001
From: Robert Klotzner <robert.klotzner@gmx.at>
Date: Sat, 27 Feb 2016 07:24:47 +0100
Subject: [PATCH 1862/2285] nixos: libinput use mkEnableOption

---
 nixos/modules/services/x11/hardware/libinput.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/nixos/modules/services/x11/hardware/libinput.nix b/nixos/modules/services/x11/hardware/libinput.nix
index fb9e24160e9f..12cc1e7e6460 100644
--- a/nixos/modules/services/x11/hardware/libinput.nix
+++ b/nixos/modules/services/x11/hardware/libinput.nix
@@ -10,12 +10,7 @@ in {
 
     services.xserver.libinput = {
 
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        example = true;
-        description = "Whether to enable libinput support.";
-      };
+      enable = mkEnableOption "libinput";
 
       dev = mkOption {
         type = types.nullOr types.str;

From b9853c0b9b8ef4fd20307a60d5defa0722bbf663 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 27 Feb 2016 08:13:37 +0100
Subject: [PATCH 1863/2285] ecl: fix source URL

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

diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix
index f863565ab072..172283b19dee 100644
--- a/pkgs/development/compilers/ecl/default.nix
+++ b/pkgs/development/compilers/ecl/default.nix
@@ -10,7 +10,7 @@ let
     version="16.0.0";
     name="${baseName}-${version}";
     hash="0czh78z9i5b7jc241mq1h1gdscvdw5fbhfb0g9sn4rchwk1x8gil";
-    url="https://common-lisp.net/project/ecl/files/ecl-16.0.0.tgz";
+    url="https://common-lisp.net/project/ecl/files/release/16.0.0/ecl-16.0.0.tgz";
     sha256="0czh78z9i5b7jc241mq1h1gdscvdw5fbhfb0g9sn4rchwk1x8gil";
   };
   buildInputs = [

From a519416a92f64ffd7c8ac598b79ded90c58c8c11 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sat, 27 Feb 2016 09:10:50 +0100
Subject: [PATCH 1864/2285] libreoffice: Taking a fix from BLFS for using Glibc
 2.23 (isnan is not std::isnan)

---
 pkgs/applications/office/libreoffice/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 43c5e0fb627f..1a5cf987fd8c 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -106,6 +106,9 @@ in stdenv.mkDerivation rec {
     patchShebangs .
     # It is used only as an indicator of the proper current directory
     touch solenv/inc/target.mk
+
+    # BLFS patch for Glibc 2.23 renaming isnan
+    sed -ire "s@isnan@std::&@g" xmloff/source/draw/ximp3dscene.cxx
   '';
 
   # fetch_Download_item tries to interpret the name as a variable name

From 8a3308d5da95d5f1f4a8e2b6b2c4b1095a822967 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Thu, 4 Feb 2016 23:00:07 +0000
Subject: [PATCH 1865/2285] goPackages.liner: git 2016-01-24

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index dc8e71af323f..71d9d17897f5 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2052,10 +2052,10 @@ let
   };
 
   liner = buildFromGitHub {
-    rev    = "1bb0d1c1a25ed393d8feb09bab039b2b1b1fbced";
+    rev    = "ad1edfd30321d8f006ccf05f1e0524adeb943060";
     owner  = "peterh";
     repo   = "liner";
-    sha256 = "05ihxpmp6x3hw71xzvjdgxnyvyx2s4lf23xqnfjj16s4j4qidc48";
+    sha256 = "0c24d9j1gnq7r982h1l2isp3d37379qw155hr8ihx9i2mhpfz317";
   };
 
   odeke-em.log = buildFromGitHub {

From a8b44c74d351a60c7b6c7e30d8b62b85aaa00f94 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Thu, 4 Feb 2016 23:04:30 +0000
Subject: [PATCH 1866/2285] goPackages.oh: 2015-11-21 -> 2016-02-23

---
 pkgs/top-level/all-packages.nix | 2 ++
 pkgs/top-level/go-packages.nix  | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f0aa65b9667..22dbfc41f438 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3931,6 +3931,8 @@ let
 
   mksh = callPackage ../shells/mksh { };
 
+  oh = goPackages.oh.bin // { outputs = [ "bin" ]; };
+
   pash = callPackage ../shells/pash { };
 
   tcsh = callPackage ../shells/tcsh { };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 71d9d17897f5..7d4c2d6331a9 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2458,11 +2458,11 @@ let
   };
 
   oh = buildFromGitHub {
-    rev = "a99b5f1128247014fb2a83a775fa1813be14b67d";
-    date = "2015-11-21";
+    rev = "f3e482f664e76dcf98d5f94dd93c216da300b78e";
+    date = "2016-02-23";
     owner = "michaelmacinnis";
     repo = "oh";
-    sha256 = "1srl3d1flqlh2k9q9pjss72rxw82msys108x22milfylmr75v03m";
+    sha256 = "1j5g37jjl1kxri44ihb1bsrzx4al07dvl4s5dglb2m7bjia6iqs2";
     goPackageAliases = [ "github.com/michaelmacinnis/oh" ];
     buildInputs = [ adapted liner ];
     disabled = isGo14;

From 3e326efffcf962a3d60d169bf18e0ad515fe7dee Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Sat, 4 Jul 2015 18:48:27 +1200
Subject: [PATCH 1867/2285] nixos/vpnc: fix formatting of example

---
 nixos/modules/config/vpnc.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/config/vpnc.nix b/nixos/modules/config/vpnc.nix
index 68d755232ebe..c7ac1b3530e1 100644
--- a/nixos/modules/config/vpnc.nix
+++ b/nixos/modules/config/vpnc.nix
@@ -17,16 +17,16 @@ in
       services = mkOption {
        type = types.attrsOf types.str;
        default = {};
-       example = {
-         test = 
-          ''
-           IPSec gateway 192.168.1.1 
-           IPSec ID someID
-           IPSec secret secretKey
-           Xauth username name
-           Xauth password pass
-          '';
-       };
+       example = literalExample ''
+         { test = '''
+             IPSec gateway 192.168.1.1
+             IPSec ID someID
+             IPSec secret secretKey
+             Xauth username name
+             Xauth password pass
+           ''';
+         }
+       '';
        description = 
          ''
            The names of cisco VPNs and their associated definitions

From 3fc6470515902a60f7f0684e2106a203c3478653 Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Sat, 4 Jul 2015 18:49:05 +1200
Subject: [PATCH 1868/2285] nixos/freetds: fix formatting of example

---
 nixos/modules/programs/freetds.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/programs/freetds.nix b/nixos/modules/programs/freetds.nix
index 398fd104363b..e0860a242b74 100644
--- a/nixos/modules/programs/freetds.nix
+++ b/nixos/modules/programs/freetds.nix
@@ -17,14 +17,14 @@ in
     environment.freetds = mkOption {
       type = types.attrsOf types.str;
       default = {};
-      example = {
-        MYDATABASE = 
-          ''
-          host = 10.0.2.100
-          port = 1433
-          tds version = 7.2
-          '';
-      };
+      example = literalExample ''
+        { MYDATABASE = '''
+            host = 10.0.2.100
+            port = 1433
+            tds version = 7.2
+          ''';
+        }
+      '';
       description = 
         ''
         Configure freetds database entries. Each attribute denotes

From 24d5d28820d3d85a393dea61bb362ca0e6a2c849 Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Sat, 4 Jul 2015 18:49:32 +1200
Subject: [PATCH 1869/2285] cacert: fix formatting of example

---
 nixos/modules/security/ca.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/security/ca.nix b/nixos/modules/security/ca.nix
index 8bd634b10a51..849530238e7e 100644
--- a/nixos/modules/security/ca.nix
+++ b/nixos/modules/security/ca.nix
@@ -35,14 +35,17 @@ in
     security.pki.certificates = mkOption {
       type = types.listOf types.str;
       default = [];
-      example = singleton ''
-        NixOS.org
-        =========
-        -----BEGIN CERTIFICATE-----
-        MIIGUDCCBTigAwIBAgIDD8KWMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
-        TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
-        ...
-        -----END CERTIFICATE-----
+      example = literalExample ''
+        [ '''
+            NixOS.org
+            =========
+            -----BEGIN CERTIFICATE-----
+            MIIGUDCCBTigAwIBAgIDD8KWMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
+            TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
+            ...
+            -----END CERTIFICATE-----
+          '''
+        ]
       '';
       description = ''
         A list of trusted root certificates in PEM format.

From f6f892e2d64445b7eeab56bec9715ba0ffbae10d Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Sat, 4 Jul 2015 18:50:27 +1200
Subject: [PATCH 1870/2285] nsd service: fix formatting of example

---
 nixos/modules/services/networking/nsd.nix | 53 ++++++++++++-----------
 1 file changed, 28 insertions(+), 25 deletions(-)

diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index e85f26811257..10566310041e 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -621,34 +621,37 @@ in
       zones = mkOption {
         type        = types.attrsOf zoneOptions;
         default     = {};
-        example     = {
-          "serverGroup1" = {
-            provideXFR = [ "10.1.2.3 NOKEY" ];
-            children = {
-              "example.com." = {
-                data = ''
-                  $ORIGIN example.com.
-                  $TTL    86400
-                  @ IN SOA a.ns.example.com. admin.example.com. (
-                  ...
-                '';
-              };
-              "example.org." = {
-                data = ''
-                  $ORIGIN example.org.
-                  $TTL    86400
-                  @ IN SOA a.ns.example.com. admin.example.com. (
-                  ...
-                '';
+        example     = literalExample ''
+          { "serverGroup1" = {
+              provideXFR = [ "10.1.2.3 NOKEY" ];
+              children = {
+                "example.com." = {
+                  data = '''
+                    $ORIGIN example.com.
+                    $TTL    86400
+                    @ IN SOA a.ns.example.com. admin.example.com. (
+                    ...
+                  ''';
+                };
+                "example.org." = {
+                  data = '''
+                    $ORIGIN example.org.
+                    $TTL    86400
+                    @ IN SOA a.ns.example.com. admin.example.com. (
+                    ...
+                  ''';
+                };
               };
             };
-          };
 
-          "example.net." = {
-            provideXFR = [ "10.3.2.1 NOKEY" ];
-            data = ''...'';
-          };
-        };
+            "example.net." = {
+              provideXFR = [ "10.3.2.1 NOKEY" ];
+              data = '''
+                ...
+              ''';
+            };
+          }
+        '';
         description = ''
           Define your zones here. Zones can cascade other zones and therefore
           inherit settings from parent zones. Look at the definition of

From eb90705d456d1bdd64f8e35f07e4acc34d153f5d Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Sat, 4 Jul 2015 18:51:04 +1200
Subject: [PATCH 1871/2285] fail2ban service: fix formatting of example

---
 nixos/modules/services/security/fail2ban.nix | 28 ++++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/nixos/modules/services/security/fail2ban.nix b/nixos/modules/services/security/fail2ban.nix
index 1d3e18dcab25..afbd81be91f2 100644
--- a/nixos/modules/services/security/fail2ban.nix
+++ b/nixos/modules/services/security/fail2ban.nix
@@ -50,20 +50,20 @@ in
 
       jails = mkOption {
         default = { };
-        example =
-          { "apache-nohome-iptables" =
-              ''
-                # Block an IP address if it accesses a non-existent
-                # home directory more than 5 times in 10 minutes,
-                # since that indicates that it's scanning.
-                filter   = apache-nohome
-                action   = iptables-multiport[name=HTTP, port="http,https"]
-                logpath  = /var/log/httpd/error_log*
-                findtime = 600
-                bantime  = 600
-                maxretry = 5
-              '';
-          };
+        example = literalExample ''
+          { apache-nohome-iptables = '''
+              # Block an IP address if it accesses a non-existent
+              # home directory more than 5 times in 10 minutes,
+              # since that indicates that it's scanning.
+              filter   = apache-nohome
+              action   = iptables-multiport[name=HTTP, port="http,https"]
+              logpath  = /var/log/httpd/error_log*
+              findtime = 600
+              bantime  = 600
+              maxretry = 5
+            ''';
+          }
+        '';
         type = types.attrsOf types.lines;
         description =
           ''

From 25fd9e31a2bbbc2f907e1cae466fec347fce0f34 Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Sat, 4 Jul 2015 18:51:38 +1200
Subject: [PATCH 1872/2285] phpfpm service: fix formatting of example

---
 nixos/modules/services/web-servers/phpfpm.nix | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/web-servers/phpfpm.nix b/nixos/modules/services/web-servers/phpfpm.nix
index bdd41ed702b5..1b1f3b8d5d0e 100644
--- a/nixos/modules/services/web-servers/phpfpm.nix
+++ b/nixos/modules/services/web-servers/phpfpm.nix
@@ -52,18 +52,19 @@ in {
       poolConfigs = mkOption {
         type = types.attrsOf types.lines;
         default = {};
-        example = {
-          mypool = ''
-            listen = /run/phpfpm/mypool
-            user = nobody
-            pm = dynamic
-            pm.max_children = 75
-            pm.start_servers = 10
-            pm.min_spare_servers = 5
-            pm.max_spare_servers = 20
-            pm.max_requests = 500
-          '';
-        };
+        example = literalExample ''
+          { mypool = '''
+              listen = /run/phpfpm/mypool
+              user = nobody
+              pm = dynamic
+              pm.max_children = 75
+              pm.start_servers = 10
+              pm.min_spare_servers = 5
+              pm.max_spare_servers = 20
+              pm.max_requests = 500
+            ''';
+          }
+        '';
         description = ''
           A mapping between PHP FPM pool names and their configurations.
           See the documentation on <literal>php-fpm.conf</literal> for

From c1e674c4ca28a4f8871a57efa0dde36852e51cbb Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Sat, 4 Jul 2015 18:52:50 +1200
Subject: [PATCH 1873/2285] xserver service: fix formatting of example

---
 nixos/modules/services/x11/xserver.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index 653c97d7e6fa..cfe5e7f960c7 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -156,13 +156,16 @@ in
       inputClassSections = mkOption {
         type = types.listOf types.lines;
         default = [];
-        example = [ ''
-           Identifier      "Trackpoint Wheel Emulation"
-           MatchProduct    "ThinkPad USB Keyboard with TrackPoint"
-           Option          "EmulateWheel"          "true
-           Option          "EmulateWheelButton"    "2"
-           Option          "Emulate3Buttons"       "false"
-          '' ];
+        example = literalExample ''
+          [ '''
+              Identifier      "Trackpoint Wheel Emulation"
+              MatchProduct    "ThinkPad USB Keyboard with TrackPoint"
+              Option          "EmulateWheel"          "true
+              Option          "EmulateWheelButton"    "2"
+              Option          "Emulate3Buttons"       "false"
+            '''
+          ]
+        '';
         description = "Content of additional InputClass sections of the X server configuration file.";
       };
 

From 392ca77d4c0c5e05ad23378de370ea964c29848f Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Sat, 4 Jul 2015 18:53:26 +1200
Subject: [PATCH 1874/2285] nixos/activation-script: fix formatting of example

---
 .../system/activation/activation-script.nix   | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix
index d78ec0d7bf3d..854fa2f40b69 100644
--- a/nixos/modules/system/activation/activation-script.nix
+++ b/nixos/modules/system/activation/activation-script.nix
@@ -30,18 +30,19 @@ in
     system.activationScripts = mkOption {
       default = {};
 
-      example = {
-        stdio = {
-          text = ''
-            # Needed by some programs.
-            ln -sfn /proc/self/fd /dev/fd
-            ln -sfn /proc/self/fd/0 /dev/stdin
-            ln -sfn /proc/self/fd/1 /dev/stdout
-            ln -sfn /proc/self/fd/2 /dev/stderr
-          '';
-          deps = [];
-        };
-      };
+      example = literalExample ''
+        { stdio = {
+            text = '''
+              # Needed by some programs.
+              ln -sfn /proc/self/fd /dev/fd
+              ln -sfn /proc/self/fd/0 /dev/stdin
+              ln -sfn /proc/self/fd/1 /dev/stdout
+              ln -sfn /proc/self/fd/2 /dev/stderr
+            ''';
+            deps = [];
+          };
+        }
+      '';
 
       description = ''
         A set of shell script fragments that are executed when a NixOS

From 13afef0d8ec6058e8d42f3ea8cb1f0932bef0c2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 27 Feb 2016 11:07:04 +0100
Subject: [PATCH 1875/2285] webkitgtk: fix build with glibc-2.23

... by a patch accepted upstream.
2.4 seems to build fine without patching.
---
 pkgs/development/libraries/webkitgtk/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 4df1ba71c11f..fc40e7749e91 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, perl, python, ruby, bison, gperf, cmake
+{ stdenv, fetchurl, fetchpatch, perl, python, ruby, bison, gperf, cmake
 , pkgconfig, gettext, gobjectIntrospection, libnotify
 , gtk2, gtk3, wayland, libwebp, enchant
 , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs
@@ -28,7 +28,14 @@ stdenv.mkDerivation rec {
     sha256 = "0mghsbfnmmf6nsf7cb3ah76s77aigkzf3k6kw96wgh6all6jdy6v";
   };
 
-  patches = [ ./finding-harfbuzz-icu.patch ];
+  patches = [ ./finding-harfbuzz-icu.patch
+    (fetchpatch {
+      name = "glibc-isnan.patch";
+      url = "http://trac.webkit.org/changeset/194518/trunk/Source/JavaScriptCore"
+        + "/runtime/Options.cpp?format=diff&new=194518";
+      sha256 = "0pzdv1zmlym751n9d310cx3yp752yzsc49cysbvgnrib4dh68nbm";
+    })
+  ];
 
   cmakeFlags = [ "-DPORT=GTK" "-DUSE_LIBHYPHEN=0" ];
 

From 21547a61ba99cc6a78ff9772a11073fc2e9e4f63 Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Sun, 13 Dec 2015 11:27:49 +1100
Subject: [PATCH 1876/2285] nix-prefetch-git: print out valid nix expression;
 make --quiet very quiet

---
 pkgs/build-support/fetchgit/nix-prefetch-git | 60 ++++++++++++++++----
 1 file changed, 50 insertions(+), 10 deletions(-)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index f81b896e33b0..22a241d5e0e8 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -12,6 +12,11 @@ fetchSubmodules=
 builder=
 branchName=$NIX_PREFETCH_GIT_BRANCH_NAME
 
+# populated by clone_user_rev()
+fullRev=
+humanReadableRev=
+commitDate=
+
 if test -n "$deepClone"; then
     deepClone=true
 else
@@ -255,7 +260,7 @@ make_deterministic_repo(){
 }
 
 
-clone_user_rev() {
+_clone_user_rev() {
     local dir="$1"
     local url="$2"
     local rev="${3:-HEAD}"
@@ -273,10 +278,9 @@ clone_user_rev() {
             fi;;
     esac
 
-    local full_revision=$(cd $dir && (git rev-parse $rev 2> /dev/null || git rev-parse refs/heads/$branchName) | tail -n1)
-    echo "git revision is $full_revision"
-    echo "git human-readable version is $(cd $dir && (git describe $full_revision 2> /dev/null || git describe --tags $full_revision 2> /dev/null || echo -- none --))" >&2
-    echo "Commit date is $(cd $dir && git show --no-patch --pretty=%ci $full_revision)"
+    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"
@@ -290,6 +294,44 @@ clone_user_rev() {
     fi
 }
 
+clone_user_rev() {
+    if ! test -n "$QUIET"; then
+        _clone_user_rev "$@"
+    else
+        errfile="$(mktemp "${TMPDIR:-/tmp}/git-checkout-err-XXXXXXXX")"
+        trap "rm -rf \"$errfile\"" EXIT
+        _clone_user_rev "$@" 2> "$errfile" || (
+            status="$?"
+            cat "$errfile" >&2
+            exit "$status"
+        )
+    fi
+}
+
+
+print_results() {
+    hash="$1"
+    if ! test -n "$QUIET"; then
+        echo "" >&2
+        echo "git revision is $fullRev" >&2
+        if test -n "$finalPath"; then
+            echo "path is $finalPath" >&2
+        fi
+        echo "git human-readable version is $humanReadableRev" >&2
+        echo "Commit date is $commitDate" >&2
+        if test -n "$hash"; then
+            echo "hash is $hash" >&2
+        fi
+    fi
+    if test -n "$hash"; then
+        echo "{"
+        echo "  url = \"$url\";"
+        echo "  rev = \"$fullRev\";"
+        echo "  $hashType = \"$hash\";"
+        echo "}"
+    fi
+}
+
 if test -z "$branchName"; then
     branchName=fetchgit
 fi
@@ -328,20 +370,18 @@ else
 
         # Compute the hash.
         hash=$(nix-hash --type $hashType --base32 $tmpFile)
-        if ! test -n "$QUIET"; then echo "hash is $hash" >&2; fi
 
         # Add the downloaded file to the Nix store.
         finalPath=$(nix-store --add-fixed --recursive "$hashType" "$tmpFile")
 
         if test -n "$expHash" -a "$expHash" != "$hash"; then
-            echo "hash mismatch for URL \`$url'"
+            print_metadata
+            echo "hash mismatch for URL \`$url'" >&2
             exit 1
         fi
     fi
 
-    if ! test -n "$QUIET"; then echo "path is $finalPath" >&2; fi
-
-    echo $hash
+    print_results "$hash"
 
     if test -n "$PRINT_PATH"; then
         echo $finalPath

From 0467a17858d9567967c37ec3fa97211e14a1069e Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Thu, 25 Feb 2016 15:02:38 +0100
Subject: [PATCH 1877/2285] pythonPackages.sqlalchemy: follows upstream,
 sqlalchemy7 for lecagy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This makes pythonPackages.sqlalchemy the most up to date revision (it
was called sqlalchemy_1_0 before), and maintains the various “legacy”
versions available as pythonPackages.sqlalchemyX for X in {7,8,9}.

All derivations that required `sqlalchemy_1_0` now require `sqlalchemy`
while those that required `sqlalchemy` now require `sqlalchemy7`.

The derivations are not changed, only the attribute names they are
bound to.
---
 .../virtualization/openstack/glance.nix       |  2 +-
 .../virtualization/openstack/keystone.nix     |  2 +-
 .../virtualization/openstack/neutron.nix      |  2 +-
 .../virtualization/openstack/nova.nix         |  2 +-
 .../virtualization/virtinst/default.nix       |  2 +-
 .../tools/build-managers/buildbot/default.nix |  2 +-
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            | 83 +++++++++++++++----
 8 files changed, 72 insertions(+), 25 deletions(-)

diff --git a/pkgs/applications/virtualization/openstack/glance.nix b/pkgs/applications/virtualization/openstack/glance.nix
index 0aacbeed0550..3cfe8dc527c9 100644
--- a/pkgs/applications/virtualization/openstack/glance.nix
+++ b/pkgs/applications/virtualization/openstack/glance.nix
@@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec {
 
   # https://github.com/openstack/glance/blob/stable/liberty/requirements.txt
   propagatedBuildInputs = with pythonPackages; [
-     pbr sqlalchemy_1_0 anyjson eventlet PasteDeploy routes webob sqlalchemy_migrate
+     pbr sqlalchemy anyjson eventlet PasteDeploy routes webob sqlalchemy_migrate
      httplib2 pycrypto iso8601 stevedore futurist keystonemiddleware paste
      jsonschema keystoneclient pyopenssl six retrying semantic-version qpid-python
      WSME osprofiler glance_store castellan taskflow cryptography xattr pysendfile
diff --git a/pkgs/applications/virtualization/openstack/keystone.nix b/pkgs/applications/virtualization/openstack/keystone.nix
index 956f3b28152d..61a366f7ab08 100644
--- a/pkgs/applications/virtualization/openstack/keystone.nix
+++ b/pkgs/applications/virtualization/openstack/keystone.nix
@@ -18,7 +18,7 @@ pythonPackages.buildPythonApplication rec {
   # https://github.com/openstack/keystone/blob/stable/liberty/requirements.txt
   propagatedBuildInputs = with pythonPackages; [
     pbr webob eventlet greenlet PasteDeploy paste routes cryptography six
-    sqlalchemy_1_0 sqlalchemy_migrate stevedore passlib keystoneclient memcached
+    sqlalchemy sqlalchemy_migrate stevedore passlib keystoneclient memcached
     keystonemiddleware oauthlib pysaml2 dogpile_cache jsonschema pycadf msgpack
     xmlsec MySQL_python
 
diff --git a/pkgs/applications/virtualization/openstack/neutron.nix b/pkgs/applications/virtualization/openstack/neutron.nix
index 0520fcfc027e..3371eb428e62 100644
--- a/pkgs/applications/virtualization/openstack/neutron.nix
+++ b/pkgs/applications/virtualization/openstack/neutron.nix
@@ -15,7 +15,7 @@ pythonPackages.buildPythonApplication rec {
   # https://github.com/openstack/neutron/blob/stable/liberty/requirements.txt
   propagatedBuildInputs = with pythonPackages; [
    pbr paste PasteDeploy routes debtcollector eventlet greenlet httplib2 requests2
-   jinja2 keystonemiddleware netaddr retrying sqlalchemy_1_0 webob alembic six
+   jinja2 keystonemiddleware netaddr retrying sqlalchemy webob alembic six
    stevedore pecan ryu networking-hyperv MySQL_python
 
    # clients
diff --git a/pkgs/applications/virtualization/openstack/nova.nix b/pkgs/applications/virtualization/openstack/nova.nix
index 20e250bf05cc..618eb7666923 100644
--- a/pkgs/applications/virtualization/openstack/nova.nix
+++ b/pkgs/applications/virtualization/openstack/nova.nix
@@ -19,7 +19,7 @@ pythonPackages.buildPythonApplication rec {
 
   # https://github.com/openstack/nova/blob/stable/liberty/requirements.txt
   propagatedBuildInputs = with pythonPackages; [
-    pbr sqlalchemy_1_0 boto decorator eventlet jinja2 lxml routes cryptography
+    pbr sqlalchemy boto decorator eventlet jinja2 lxml routes cryptography
     webob greenlet PasteDeploy paste prettytable sqlalchemy_migrate netaddr
     netifaces paramiko Babel iso8601 jsonschema keystoneclient requests2 six
     stevedore websockify rfc3986 os-brick psutil_1 alembic psycopg2 pymysql
diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix
index 62b5bea47fa3..c9a62ce5f92b 100644
--- a/pkgs/applications/virtualization/virtinst/default.nix
+++ b/pkgs/applications/virtualization/virtinst/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   pythonPath = with pythonPackages;
-    [ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes
+    [ setuptools eventlet greenlet gflags netaddr sqlalchemy7 carrot routes
       PasteDeploy m2crypto ipy twisted sqlalchemy_migrate
       distutils_extra simplejson readline glanceclient cheetah lockfile httplib2
       # !!! should libvirt be a build-time dependency?  Note that
diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix
index 99c1352b4fb6..a246044d6f1e 100644
--- a/pkgs/development/tools/build-managers/buildbot/default.nix
+++ b/pkgs/development/tools/build-managers/buildbot/default.nix
@@ -1,5 +1,5 @@
 { stdenv, buildPythonApplication, fetchurl, twisted, dateutil, jinja2
-, sqlalchemy , sqlalchemy_migrate_0_7
+, sqlalchemy_migrate_0_7
 , enableDebugClient ? false, pygobject ? null, pyGtkGlade ? null
 }:
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8390ee8fb5f..7aa15facb7e1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5724,7 +5724,7 @@ let
   };
 
   buildbot = callPackage ../development/tools/build-managers/buildbot {
-    inherit (pythonPackages) twisted jinja2 sqlalchemy sqlalchemy_migrate_0_7;
+    inherit (pythonPackages) twisted jinja2 sqlalchemy_migrate_0_7;
     dateutil = pythonPackages.dateutil_1_5;
   };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ffcd6c4229d3..44186bf07613 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -235,7 +235,7 @@ in modules // {
       sha256 = "1ywimbisgb5g7xl9nrfwcm7dv3j8fsrjfp7bxb3l58zbsrzj6z2s";
     };
 
-    propagatedBuildInputs = with self; [ appdirs colorama dateutil requests2 requests_toolbelt sqlalchemy ];
+    propagatedBuildInputs = with self; [ appdirs colorama dateutil requests2 requests_toolbelt sqlalchemy7 ];
 
     makeWrapperArgs = [ "--prefix LIBFUSE_PATH : ${pkgs.fuse}/lib/libfuse.so" ];
 
@@ -457,7 +457,7 @@ in modules // {
     };
 
     buildInputs = with self; [ pytest pytestcov mock coverage ];
-    propagatedBuildInputs = with self; [ Mako sqlalchemy_1_0 python-editor ];
+    propagatedBuildInputs = with self; [ Mako sqlalchemy python-editor ];
 
     meta = {
       homepage = http://bitbucket.org/zzzeek/alembic;
@@ -1575,7 +1575,7 @@ in modules // {
     };
 
     buildInputs =
-      [ self.sqlalchemy
+      [ self.sqlalchemy7
         self.pycryptopp
         self.nose
         self.mock
@@ -2101,7 +2101,7 @@ in modules // {
       pymongo
       pyyaml
       requests2
-      sqlalchemy_1_0
+      sqlalchemy
       tables
       toolz
     ];
@@ -3188,7 +3188,7 @@ in modules // {
       sed -i '/distribute/d' setup.py
     '';
 
-    buildInputs = with self; [ self.coverage self.sqlalchemy ];
+    buildInputs = with self; [ self.coverage self.sqlalchemy7 ];
 
     # ValueError: Could not parse auth file:
     # /tmp/nix-build-.../CoilMQ-0.6.1/coilmq/tests/resources/auth.ini
@@ -7087,7 +7087,7 @@ in modules // {
     propagatedBuildInputs = with self; [
       flup
       ldap
-      sqlalchemy
+      sqlalchemy7
     ];
 
     doCheck = true;
@@ -8894,7 +8894,7 @@ in modules // {
       sha256 = "1i9ps5d5snih9xlqhrvmi3qfiygkmqzxh92n25kj4pf89kj4s965";
     };
 
-    propagatedBuildInputs = with self ; [ flask sqlalchemy_1_0 ];
+    propagatedBuildInputs = with self ; [ flask sqlalchemy ];
 
     meta = {
       description = "SQLAlchemy extension for Flask";
@@ -13699,7 +13699,7 @@ in modules // {
     };
 
     propagatedBuildInputs = with self; [
-      six stevedore sqlalchemy_migrate sqlalchemy_1_0 oslo-utils oslo-context
+      six stevedore sqlalchemy_migrate sqlalchemy oslo-utils oslo-context
       oslo-config oslo-i18n iso8601 Babel alembic pbr psycopg2
     ];
     buildInputs = with self; [
@@ -13844,7 +13844,7 @@ in modules // {
       singledispatch logutils
     ];
     buildInputs = with self; [
-      webtest Mako genshi Kajiki sqlalchemy_1_0 gunicorn jinja2 virtualenv
+      webtest Mako genshi Kajiki sqlalchemy gunicorn jinja2 virtualenv
     ];
 
     meta = with stdenv.lib; {
@@ -14567,7 +14567,7 @@ in modules // {
       pytz
       xlrd
       bottleneck
-      sqlalchemy_1_0
+      sqlalchemy
       lxml
       # Disabling this because an upstream dependency, pep8, is broken on v3.5.
       (if isPy35 then null else html5lib)
@@ -20132,7 +20132,7 @@ in modules // {
     rope = if isPy3k then null else self.rope;
   };
 
-  sqlalchemy = self.sqlalchemy9.override rec {
+  sqlalchemy7 = buildPythonPackage rec {
     name = "SQLAlchemy-0.7.10";
     disabled = isPy34 || isPy35;
     doCheck = !isPyPy;
@@ -20141,17 +20141,32 @@ in modules // {
       url = "http://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
       sha256 = "0rhxgr85xdhjn467qfs0dkyj8x46zxcv6ad3dfx3w14xbkb3kakp";
     };
+
     patches = [
       # see https://groups.google.com/forum/#!searchin/sqlalchemy/module$20logging$20handlers/sqlalchemy/ukuGhmQ2p6g/2_dOpBEYdDYJ
       # waiting for 0.7.11 release
       ../development/python-modules/sqlalchemy-0.7.10-test-failures.patch
     ];
+
     preConfigure = optionalString isPy3k ''
       python3 sa2to3.py --no-diffs -w lib test examples
     '';
+
+    buildInputs = with self; [ nose mock ]
+      ++ stdenv.lib.optional doCheck pysqlite;
+    propagatedBuildInputs = with self; [ modules.sqlite3 ];
+
+    checkPhase = ''
+      ${python.executable} sqla_nose.py
+    '';
+
+    meta = {
+      homepage = http://www.sqlalchemy.org/;
+      description = "A Python SQL toolkit and Object Relational Mapper";
+    };
   };
 
-  sqlalchemy8 = self.sqlalchemy9.override rec {
+  sqlalchemy8 = buildPythonPackage rec {
     name = "SQLAlchemy-0.8.7";
     disabled = isPy34 || isPy35;
     doCheck = !isPyPy;
@@ -20160,9 +20175,23 @@ in modules // {
       url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
       md5 = "4f3377306309e46739696721b1785335";
     };
+
     preConfigure = optionalString isPy3k ''
       python3 sa2to3.py --no-diffs -w lib test examples
     '';
+
+    buildInputs = with self; [ nose mock ]
+      ++ stdenv.lib.optional doCheck pysqlite;
+    propagatedBuildInputs = with self; [ modules.sqlite3 ];
+
+    checkPhase = ''
+      ${python.executable} sqla_nose.py
+    '';
+
+    meta = {
+      homepage = http://www.sqlalchemy.org/;
+      description = "A Python SQL toolkit and Object Relational Mapper";
+    };
   };
 
   sqlalchemy9 = buildPythonPackage rec {
@@ -20191,14 +20220,32 @@ in modules // {
     };
   };
 
-  sqlalchemy_1_0 = self.sqlalchemy9.override rec {
-    name = "SQLAlchemy-1.0.10";
-    doCheck = !isPyPy;  # lots of tests fail
+  sqlalchemy = buildPythonPackage rec {
+    name = "SQLAlchemy-${version}";
+    version = "1.0.10";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz";
       sha256 = "963415bf4ea4fa13698893464bc6917d291331e0e8202dddd0ebfed2864ef7e3";
     };
+
+    buildInputs = with self; [ nose mock ]
+      ++ stdenv.lib.optional doCheck pysqlite;
+    propagatedBuildInputs = with self; [ modules.sqlite3 ];
+
+    # Test-only dependency pysqlite doesn't build on Python 3. This isn't an
+    # acceptable reason to make all dependents unavailable on Python 3 as well
+    doCheck = !(isPyPy || isPy3k);
+
+    checkPhase = ''
+      ${python.executable} sqla_nose.py
+    '';
+
+    meta = {
+      homepage = http://www.sqlalchemy.org/;
+      description = "A Python SQL toolkit and Object Relational Mapper";
+      license = licenses.mit;
+    };
   };
 
   sqlalchemy_imageattach = buildPythonPackage rec {
@@ -20261,8 +20308,8 @@ in modules // {
     };
   };
 
-  sqlalchemy_migrate = self.sqlalchemy_migrate_func self.sqlalchemy_1_0;
-  sqlalchemy_migrate_0_7 = self.sqlalchemy_migrate_func self.sqlalchemy;
+  sqlalchemy_migrate = self.sqlalchemy_migrate_func self.sqlalchemy;
+  sqlalchemy_migrate_0_7 = self.sqlalchemy_migrate_func self.sqlalchemy7;
 
   sqlparse = buildPythonPackage rec {
     name = "sqlparse-${version}";
@@ -24810,7 +24857,7 @@ in modules // {
         thrift
         beautifulsoup4
         markdown2
-        sqlalchemy
+        sqlalchemy7
         html2text
         evernote
     ];

From b6a8348a4b5bd7eca2695d7646c5fb2ceee2c0c5 Mon Sep 17 00:00:00 2001
From: Sheena Artrip <sheena.artrip@gmail.com>
Date: Fri, 26 Feb 2016 04:05:55 -0500
Subject: [PATCH 1878/2285] clamav: 0.98.7 -> 0.99

---
 pkgs/tools/security/clamav/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 1f36d54ff50a..efb727833919 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl
-, libmilter }:
+, libmilter, pcre }:
 stdenv.mkDerivation rec {
   name = "clamav-${version}";
-  version = "0.98.7";
+  version = "0.99";
 
   src = fetchurl {
     url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz";
-    sha256 = "0wp2ad8km4cqmlndni5ljv7q3lfxm6y4r3giv0yf23bl0yvif918";
+    sha256 = "1abyg349yr31z764jcgx67q5v098jrkrj88bqkzmys6xza62qyfj";
   };
 
-  buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter ];
+  buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl libiconv libmilter pcre ];
 
   configureFlags = [
     "--with-zlib=${zlib}"
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
     "--with-openssl=${openssl}"
     "--with-libncurses-prefix=${ncurses}"
     "--with-libcurl=${curl}"
+    "--with-pcre=${pcre}"
     "--enable-milter"
     "--disable-clamav"
   ];

From d18a8904c0f4a0b915fd72798a0a14c108fa279c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 27 Feb 2016 13:21:20 +0100
Subject: [PATCH 1879/2285] kde5.libksysguard: fix build with glibc-2.23

... using an upstream patch.
---
 pkgs/desktops/plasma-5.5/libksysguard/default.nix | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/plasma-5.5/libksysguard/default.nix b/pkgs/desktops/plasma-5.5/libksysguard/default.nix
index 373221b2b305..402b3ce3beee 100644
--- a/pkgs/desktops/plasma-5.5/libksysguard/default.nix
+++ b/pkgs/desktops/plasma-5.5/libksysguard/default.nix
@@ -1,4 +1,4 @@
-{ plasmaPackage, extra-cmake-modules, kauth, kcompletion
+{ fetchpatch, plasmaPackage, extra-cmake-modules, kauth, kcompletion
 , kconfigwidgets, kcoreaddons, kservice, kwidgetsaddons
 , kwindowsystem, plasma-framework, qtscript, qtwebkit, qtx11extras
 , kconfig, ki18n, kiconthemes
@@ -6,7 +6,14 @@
 
 plasmaPackage {
   name = "libksysguard";
-  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
+  patches = [
+    ./0001-qdiriterator-follow-symlinks.patch
+    (fetchpatch { # should be included on update
+      name = "glibc-2.23-isnan.patch";
+      url = https://github.com/KDE/libksysguard/commit/b0578798eb3.patch;
+      sha256 = "1my5nqp58c5azyi265j261a10wh047zxakprrnpl85mlg7bwskdh";
+    })
+  ];
   nativeBuildInputs = [
     extra-cmake-modules
   ];

From 98a0484471a481408f1d189b7055ab77e7626649 Mon Sep 17 00:00:00 2001
From: Matt McHenry <github@matt.mchenryfamily.org>
Date: Thu, 4 Feb 2016 15:15:48 -0500
Subject: [PATCH 1880/2285] eclipse: run with the jdk, not the jre

This is necessary so that tools like native2ascii are available to
maven eclipse integration (m2e).
---
 pkgs/applications/editors/eclipse/build-eclipse.nix | 4 ++--
 pkgs/applications/editors/eclipse/default.nix       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/build-eclipse.nix b/pkgs/applications/editors/eclipse/build-eclipse.nix
index 558c9fa3de5f..074a622667fa 100644
--- a/pkgs/applications/editors/eclipse/build-eclipse.nix
+++ b/pkgs/applications/editors/eclipse/build-eclipse.nix
@@ -1,4 +1,4 @@
-{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jre, glib, gtk, libXtst, webkitgtk2, makeWrapper, ... }:
+{ stdenv, makeDesktopItem, freetype, fontconfig, libX11, libXrender, zlib, jdk, glib, gtk, libXtst, webkitgtk2, makeWrapper, ... }:
 
 { name, src ? builtins.getAttr stdenv.system sources, sources ? null, description }:
 
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     productVersion=$(sed 's/version=//; t; d' $out/eclipse/.eclipseproduct)
 
     makeWrapper $out/eclipse/eclipse $out/bin/eclipse \
-      --prefix PATH : ${jre}/bin \
+      --prefix PATH : ${jdk}/bin \
       --prefix LD_LIBRARY_PATH : ${glib}/lib:${gtk}/lib:${libXtst}/lib${stdenv.lib.optionalString (webkitgtk2 != null) ":${webkitgtk2}/lib"} \
       --add-flags "-configuration \$HOME/.eclipse/''${productId}_$productVersion/configuration"
 
diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 815e092c9d5b..62271998060f 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchurl, makeDesktopItem, makeWrapper
 , freetype, fontconfig, libX11, libXext, libXrender, zlib
-, glib, gtk, libXtst, jre
+, glib, gtk, libXtst, jdk
 , webkitgtk2 ? null  # for internal web browser
 , buildEnv, writeText, runCommand
 , callPackage

From 127edf11945817cee0c65af26fb3c47cb54e0d97 Mon Sep 17 00:00:00 2001
From: Jeffrey David Johnson <jefdaj@gmail.com>
Date: Sat, 27 Feb 2016 13:42:36 +0100
Subject: [PATCH 1881/2285] bitcoin-xt: update 0.11A -> 0.11D

From #12706, commits re-split by vcunat.
---
 pkgs/applications/altcoins/bitcoin-xt.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix
index e6c95729c6ec..9b86bf2b3d5a 100644
--- a/pkgs/applications/altcoins/bitcoin-xt.nix
+++ b/pkgs/applications/altcoins/bitcoin-xt.nix
@@ -6,12 +6,11 @@ with stdenv.lib;
 stdenv.mkDerivation rec{
 
   name = "bitcoin" + (toString (optional (!withGui) "d")) + "-xt-" + version;
-  xt_version = "0.11A";
-  version = xt_version;
+  version = "0.11D";
 
   src = fetchurl {
-    url = "https://github.com/bitcoinxt/bitcoinxt/archive/v0.11A.tar.gz";
-    sha256 = "129cbqf6bln6rhdk70c6nfwdjk6afvsaaw4xdyp0pnfand8idz7n";
+    url = "https://github.com/bitcoinxt/bitcoinxt/archive/v${version}.tar.gz";
+    sha256 = "09r2i88wzqaj6mh66l3ngyfkm1a0dhwm5ibalj6y55wbxm9bvd36";
   };
 
   buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib
@@ -24,12 +23,17 @@ stdenv.mkDerivation rec{
   ] ++ optionals withGui [ "--with-gui=qt4" ];
 
   meta = {
-    description = "Peer-to-peer electronic cash system";
+    description = "Peer-to-peer electronic cash system (XT client)";
     longDescription= ''
-       Bitcoin XT is an implementation of a Bitcoin full node, based upon the
-       source code of Bitcoin Core. It is built by taking the latest stable
-       Core release, applying a series of patches, and then doing deterministic
-       builds so anyone can check the downloads correspond to the source code. 
+      Bitcoin is a free open source peer-to-peer electronic cash system that is
+      completely decentralized, without the need for a central server or trusted
+      parties. Users hold the crypto keys to their own money and transact directly
+      with each other, with the help of a P2P network to check for double-spending.
+
+      Bitcoin XT is an implementation of a Bitcoin full node, based upon the
+      source code of Bitcoin Core. It is built by taking the latest stable
+      Core release, applying a series of patches, and then doing deterministic
+      builds so anyone can check the downloads correspond to the source code. 
     '';
     homepage = "https://bitcoinxt.software/";
     maintainers = with maintainers; [ jefdaj ];

From bbf113f24ab1cdd82325a5cc27f83d369958f424 Mon Sep 17 00:00:00 2001
From: Jeffrey David Johnson <jefdaj@gmail.com>
Date: Sat, 27 Feb 2016 13:44:45 +0100
Subject: [PATCH 1882/2285] bitcoin-classic: init at 0.11.2.cl1.b1

From #12706, commits re-split by vcunat.
---
 .../applications/altcoins/bitcoin-classic.nix | 43 +++++++++++++++++++
 pkgs/applications/altcoins/default.nix        |  3 ++
 2 files changed, 46 insertions(+)
 create mode 100644 pkgs/applications/altcoins/bitcoin-classic.nix

diff --git a/pkgs/applications/altcoins/bitcoin-classic.nix b/pkgs/applications/altcoins/bitcoin-classic.nix
new file mode 100644
index 000000000000..62fe41979294
--- /dev/null
+++ b/pkgs/applications/altcoins/bitcoin-classic.nix
@@ -0,0 +1,43 @@
+{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost
+, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode
+, withGui }:
+
+with stdenv.lib;
+stdenv.mkDerivation rec {
+
+  name = "bitcoin" + (toString (optional (!withGui) "d")) + "-classic-" + version;
+  version = "0.11.2.cl1.b1";
+
+  src = fetchurl {
+    url = "https://github.com/bitcoinclassic/bitcoinclassic/archive/v${version}.tar.gz";
+    sha256 = "1szsnx5aijk3hx7qkqzbqsr0basg8ydwp20mh3bhnf4ljryy2049";
+  };
+
+  buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib
+                  miniupnpc utillinux protobuf ]
+                  ++ optionals withGui [ qt4 qrencode ];
+
+  configureFlags = [ "--with-boost-libdir=${boost.lib}/lib" ]
+                     ++ optionals withGui [ "--with-gui=qt4" ];
+
+  meta = {
+    description = "Peer-to-peer electronic cash system (Classic client)";
+    longDescription= ''
+      Bitcoin is a free open source peer-to-peer electronic cash system that is
+      completely decentralized, without the need for a central server or trusted
+      parties. Users hold the crypto keys to their own money and transact directly
+      with each other, with the help of a P2P network to check for double-spending.
+
+      We call our code repository Bitcoin Classic. It starts as a one-feature patch
+      to bitcoin-core that increases the blocksize limit to 2 MB. We will have
+      ports for master and 0.11.2, so that miners and businesses can upgrade to 2 MB
+      blocks from any recent bitcoin software version they run. In the future we will
+      continue to release updates that are in line with Satoshi’s whitepaper &
+      vision, and are agreed upon by the community.
+    '';
+    homepage = "https://bitcoinclassic.com/";
+    maintainers = with maintainers; [ jefdaj ];
+    license = licenses.mit;
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix
index a7daaf3a9eab..0b0e42699edf 100644
--- a/pkgs/applications/altcoins/default.nix
+++ b/pkgs/applications/altcoins/default.nix
@@ -5,6 +5,9 @@ rec {
   bitcoin  = callPackage ./bitcoin.nix { withGui = true; };
   bitcoind = callPackage ./bitcoin.nix { withGui = false; };
 
+  bitcoin-classic  = callPackage ./bitcoin-classic.nix { withGui = true; };
+  bitcoind-classic = callPackage ./bitcoin-classic.nix { withGui = false; };
+
   bitcoin-xt  = callPackage ./bitcoin-xt.nix { withGui = true; };
   bitcoind-xt = callPackage ./bitcoin-xt.nix { withGui = false; };
 

From c59c1f9fe027df49a248aea5692b45f9ea598537 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 27 Feb 2016 13:51:57 +0100
Subject: [PATCH 1883/2285] e19.efl: remove the openjpeg override

/cc #12599, discussed on:
https://github.com/NixOS/nixpkgs/pull/12599/files#r50664194
---
 pkgs/desktops/e19/default.nix | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/pkgs/desktops/e19/default.nix b/pkgs/desktops/e19/default.nix
index 4f319159bcc9..b285498be9dc 100644
--- a/pkgs/desktops/e19/default.nix
+++ b/pkgs/desktops/e19/default.nix
@@ -1,16 +1,7 @@
 { callPackage, pkgs }:
-let
-  openjpeg_1 = with pkgs; lib.overrideDerivation openjpeg (oldAttrs: rec {
-         name = "openjpeg-1.5.2";
-         src = fetchurl {
-           url = "mirror://sourceforge/openjpeg.mirror/${name}.tar.gz";
-           sha1 = "lahbqvjpsfdxsrm0wsy3pdrp3pzrjvj9";
-         };
-     });
-in
 rec {
   #### CORE EFL
-  efl = callPackage ./efl.nix { openjpeg=openjpeg_1; };
+  efl = callPackage ./efl.nix { openjpeg = pkgs.openjpeg_1; };
   evas = callPackage ./evas.nix { };
   emotion = callPackage ./emotion.nix { };
   elementary = callPackage ./elementary.nix { };

From 9d092e324cbf972e6f76368156e054e9ccc2b68c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sat, 27 Feb 2016 14:30:58 +0100
Subject: [PATCH 1884/2285] xfce.gvfs: don't depend on samba

It seems a better fit for Xfce now.
https://github.com/NixOS/nixpkgs/commit/ca3690d426dce3
---
 pkgs/desktops/xfce/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/xfce/default.nix b/pkgs/desktops/xfce/default.nix
index 944e9ba013de..9453e85d2532 100644
--- a/pkgs/desktops/xfce/default.nix
+++ b/pkgs/desktops/xfce/default.nix
@@ -14,7 +14,7 @@ xfce_self = rec { # the lines are very long but it seems better than the even-od
 
   #### NixOS support
 
-  inherit (pkgs) gvfs;
+  gvfs = pkgs.gvfs.override { samba = null; }; # samba is a rather heavy dependency
   xinitrc = "${xfce4session}/etc/xdg/xfce4/xinitrc";
 
   #### CORE                 from "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"

From d1c35db920eba34a9fefe18f8f5dc27a40aed9f6 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Sat, 27 Feb 2016 15:40:50 +0100
Subject: [PATCH 1885/2285] retrofe: init at 0.6.169

---
 pkgs/misc/emulators/retrofe/default.nix       | 79 +++++++++++++++++++
 .../emulators/retrofe/include-paths.patch     | 11 +++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 92 insertions(+)
 create mode 100644 pkgs/misc/emulators/retrofe/default.nix
 create mode 100644 pkgs/misc/emulators/retrofe/include-paths.patch

diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix
new file mode 100644
index 000000000000..bf3091d1d706
--- /dev/null
+++ b/pkgs/misc/emulators/retrofe/default.nix
@@ -0,0 +1,79 @@
+{ stdenv, fetchhg, cmake, dos2unix, glib, gst_all_1, makeWrapper, pkgconfig
+, python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib
+}:
+
+let
+  gstPlugins = with gst_all_1; [ gst-libav gst-plugins-base gst-plugins-good ];
+  GST_PLUGIN_PATH = stdenv.lib.makeSearchPath "lib/gstreamer-1.0" gstPlugins;
+
+in stdenv.mkDerivation rec {
+  name = "retrofe-${version}";
+  version = "0.6.169";
+
+  src = fetchhg {
+    url = https://bitbucket.org/teamretro/retrofe;
+    rev = "8793e03";
+    sha256 = "0cvsg07ff0fdqh5zgiv2fs7s6c98hn150kpxmpw5fn6jilaszwkm";
+  };
+
+  nativeBuildInputs = [ cmake makeWrapper pkgconfig python ];
+
+  buildInputs = [
+    glib gst_all_1.gstreamer SDL2 SDL2_image SDL2_mixer SDL2_ttf sqlite zlib
+  ] ++ gstPlugins;
+
+  patches = [ ./include-paths.patch ];
+
+  configurePhase = ''
+    cmake RetroFE/Source -BRetroFE/Build -DCMAKE_BUILD_TYPE=Release \
+      -DVERSION_MAJOR=0 -DVERSION_MINOR=0 -DVERSION_BUILD=0 \
+      -DGSTREAMER_BASE_INCLUDE_DIRS='${gst_all_1.gst-plugins-base}/include/gstreamer-1.0'
+  '';
+
+  buildPhase = ''
+    cmake --build RetroFE/Build
+    python Scripts/Package.py --os=linux --build=full
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/retrofe
+    cp -r Artifacts/linux/RetroFE $out/share/retrofe/example
+    mv $out/share/retrofe/example/retrofe $out/bin/
+
+    cat > $out/bin/retrofe-init << EOF
+    #!/bin/sh
+
+    echo "This will install retrofe's example files into this directory"
+    echo "Example files location: $out/share/retrofe/example/"
+
+    while true; do
+        read -p "Do you want to proceed? [yn] " yn
+        case \$yn in
+            [Yy]* ) cp -r --no-preserve=all $out/share/retrofe/example/* .; break;;
+            [Nn]* ) exit;;
+            * ) echo "Please answer with yes or no.";;
+        esac
+    done
+    EOF
+
+    chmod +x $out/bin/retrofe-init
+  '';
+
+  # retrofe will look for config files in its install path ($out/bin).
+  # When set it will use $RETROFE_PATH instead. Sadly this behaviour isn't
+  # documented well. To make it behave more like as expected it's set to
+  # $PWD by default here.
+  fixupPhase = ''
+    wrapProgram "$out/bin/retrofe" \
+      --prefix GST_PLUGIN_PATH : '${GST_PLUGIN_PATH}/lib/gstreamer-1.0' \
+      --set    RETROFE_PATH      "\''${RETROFE_PATH:-\$PWD}"
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A frontend for arcade cabinets and media PCs";
+    license = licenses.gpl3Plus;
+    homepage = http://retrofe.com;
+    maintainers = with maintainers; [ hrdinka ];
+  };
+}
diff --git a/pkgs/misc/emulators/retrofe/include-paths.patch b/pkgs/misc/emulators/retrofe/include-paths.patch
new file mode 100644
index 000000000000..02eef2594ea6
--- /dev/null
+++ b/pkgs/misc/emulators/retrofe/include-paths.patch
@@ -0,0 +1,11 @@
+diff -ur RetroFE.1/RetroFE/Source/CMakeLists.txt RetroFE.2/RetroFE/Source/CMakeLists.txt
+--- RetroFE.1/RetroFE/Source/CMakeLists.txt	2016-02-21 14:52:36.726070602 +0100
++++ RetroFE.2/RetroFE/Source/CMakeLists.txt	2016-02-21 14:38:43.036249029 +0100
+@@ -59,6 +59,7 @@
+ set(RETROFE_INCLUDE_DIRS
+ 	"${GLIB2_INCLUDE_DIRS}"
+ 	"${GSTREAMER_INCLUDE_DIRS}"
++	"${GSTREAMER_BASE_INCLUDE_DIRS}"
+ 	"${SDL2_INCLUDE_DIRS}"
+ 	"${SDL2_IMAGE_INCLUDE_DIRS}"
+ 	"${SDL2_MIXER_INCLUDE_DIRS}"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22dbfc41f438..b25da232aab1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15903,6 +15903,8 @@ let
     retroarch = retroarchBare;
   });
 
+  retrofe = callPackage ../misc/emulators/retrofe { };
+
   rss-glx = callPackage ../misc/screensavers/rss-glx { };
 
   runit = callPackage ../tools/system/runit { };

From ebe78569834dbe7f549a1923568ff4241a2d4b51 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Sat, 27 Feb 2016 13:33:20 +0100
Subject: [PATCH 1886/2285] mrrescue: init at 1.02

---
 pkgs/games/mrrescue/default.nix | 59 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/games/mrrescue/default.nix

diff --git a/pkgs/games/mrrescue/default.nix b/pkgs/games/mrrescue/default.nix
new file mode 100644
index 000000000000..a693c79e8cec
--- /dev/null
+++ b/pkgs/games/mrrescue/default.nix
@@ -0,0 +1,59 @@
+{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }:
+
+let
+  pname = "mrrescue";
+  version = "1.02d";
+
+  icon = fetchurl {
+    url = "http://tangramgames.dk/img/thumb/mrrescue.png";
+    sha256 = "1y5ahf0m01i1ch03axhvp2kqc6lc1yvh59zgvgxw4w7y3jryw20k";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "mrrescue";
+    exec = "${pname}";
+    icon = "${icon}";
+    comment = "Arcade-style fire fighting game"; 
+    desktopName = "Mr. Rescue";
+    genericName = "mrrescue";
+    categories = "Game;";
+  };
+
+in 
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/SimonLarsen/${pname}/releases/download/v${version}/${pname}-${version}.love";
+    sha256 = "0kzahxrgpb4vsk9yavy7f8nc34d62d1jqjrpsxslmy9ywax4yfpi";
+  };
+
+  nativeBuildInputs = [ lua love ];
+  buildInputs = [ makeWrapper ];
+
+  phases = "installPhase";
+
+  installPhase =
+  ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/games/lovegames
+
+    cp -v $src $out/share/${pname}.love
+
+    makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love
+
+    chmod +x $out/bin/${pname}
+    mkdir -p $out/share/applications
+    ln -s ${desktopItem}/share/applications/* $out/share/applications/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Arcade-style fire fighting game";
+    maintainers = with maintainers; [ ];
+    platforms = platforms.linux;
+    license = licenses.zlib;
+    downloadPage = http://tangramgames.dk/games/mrrescue;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22dbfc41f438..9c814636b88e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14529,6 +14529,8 @@ let
 
   mnemosyne = callPackage ../games/mnemosyne { };
 
+  mrrescue = callPackage ../games/mrrescue { };
+
   mudlet = qt5.callPackage ../games/mudlet {
     inherit (lua51Packages) luafilesystem lrexlib luazip luasqlite3;
   };

From 6ae6016d157ad81ddd43f798c585e82cb66f3330 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 27 Feb 2016 16:18:06 +0100
Subject: [PATCH 1887/2285] libxmp: 4.3.8 -> 4.3.11 (security release)

https://lwn.net/Alerts/676256/
---
 pkgs/development/libraries/libxmp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libxmp/default.nix b/pkgs/development/libraries/libxmp/default.nix
index 4bc9e8ed1c4a..8aa8bf600a80 100644
--- a/pkgs/development/libraries/libxmp/default.nix
+++ b/pkgs/development/libraries/libxmp/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libxmp-4.3.8";
+  name = "libxmp-4.3.11";
 
   meta = with stdenv.lib; {
     description = "Extended module player library";
@@ -18,6 +18,6 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/xmp/libxmp/${name}.tar.gz";
-    sha256 = "0h06091hlpgc6ds4pjmfq8sx4snw7av3nhny180q4pwfyasjb6ny";
+    sha256 = "0r9qhps2a8nc850bislkgjzlamwl671r1sag1mi8k1a9gxq4n9kx";
   };
 }

From 571f5b74edd9a99b0f52d20621b49735b64fa3db Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 27 Feb 2016 16:23:41 +0100
Subject: [PATCH 1888/2285] ffmpeg: 2.8.5 -> 2.8.6 (CVE-2016-2329)

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

diff --git a/pkgs/development/libraries/ffmpeg/2.8.nix b/pkgs/development/libraries/ffmpeg/2.8.nix
index 2f911b26ca19..af51571baaa3 100644
--- a/pkgs/development/libraries/ffmpeg/2.8.nix
+++ b/pkgs/development/libraries/ffmpeg/2.8.nix
@@ -1,7 +1,7 @@
 { callPackage, ... } @ args:
 
 callPackage ./generic.nix (args // rec {
-  version = "${branch}.5";
+  version = "${branch}.6";
   branch = "2.8";
-  sha256 = "0nk1j3i7qc1k3dygpq74pxq382vqg9kaf2hxl9jfw8rkad8rjv9v";
+  sha256 = "0qlfinkyrz4s9z50fmqzx601zf9i7h1yn7cgdwn5jm63kcr1wqa0";
 })

From c691b6a8586f01869cf7fef59cead01c4a7e3029 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 27 Feb 2016 16:29:48 +0100
Subject: [PATCH 1889/2285] ntp: 4.2.8p4 -> 4.2.8p6 (multiple CVEs)

http://support.ntp.org/bin/view/Main/SecurityNotice#Recent_Vulnerabilities
---
 pkgs/tools/networking/ntp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix
index 8a23eeb60f4f..0e7c23fd3a6c 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/pkgs/tools/networking/ntp/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux -> libcap != null;
 
 stdenv.mkDerivation rec {
-  name = "ntp-4.2.8p4";
+  name = "ntp-4.2.8p6";
 
   src = fetchurl {
     url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz";
-    sha256 = "1fgxbhv0wyiivi6kh5zpzrd0yqmc48z7d3zmjspw9lj84mbn2s8d";
+    sha256 = "0j509gd0snj8dq15rhfv2v4wisfaabya1gmgqslk1kisawf0wgaq";
   };
 
   configureFlags = [

From 73e0c261c299bacfb625c16e574474f6d461d9c5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 27 Feb 2016 16:18:52 +0100
Subject: [PATCH 1890/2285] linux: 4.4.2 -> 4.4.3

---
 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 dff91095549c..56f660a248a8 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.2";
+  version = "4.4.3";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "09l6y0nb8yv7l16arfwhy4i5h9pkxcbd7hlbw0015n7gm4i2mzc2";
+    sha256 = "1pcichd5hp3hzb3hwh5737jwqmfv4ylhw04sbby3hzmxkfqrqdqb";
   };
 
   kernelPatches = args.kernelPatches;

From 3030dec0d70edf4dc29633e68c82954023229f60 Mon Sep 17 00:00:00 2001
From: Arseniy Seroka <ars.seroka@gmail.com>
Date: Sat, 27 Feb 2016 18:39:42 +0300
Subject: [PATCH 1891/2285] yandex-disk: 0.1.5.940 -> 0.1.5.948

---
 pkgs/tools/filesystems/yandex-disk/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix
index 42308947c07b..f32f180f1d6e 100644
--- a/pkgs/tools/filesystems/yandex-disk/default.nix
+++ b/pkgs/tools/filesystems/yandex-disk/default.nix
@@ -6,18 +6,18 @@ let
   p = if stdenv.is64bit then {
       arch = "x86_64";
       gcclib = "${stdenv.cc.cc}/lib64";
-      sha256 = "1dr976z0zgg5jk477hrnfmpcx4llh5xi1493k0pkp28m6ypbxy2q";
+      sha256 = "0k05ybvnv0zx4vfx55jyhia38qqysaj68mapq0gwgf74k3a943g2";
     }
     else {
       arch = "i386";
       gcclib = "${stdenv.cc.cc}/lib";
-      sha256 = "01v0caf194y6yb0zc0d3ywx3y0rwb7sxkav4ickd4l968jpi8p91";
+      sha256 = "09z9idmp7idcq0alwkla9kal9h82dx11jqh678lc4rviqggxzxhp";
     };
 in 
 stdenv.mkDerivation rec {
 
   name = "yandex-disk-${version}";
-  version = "0.1.5.940";
+  version = "0.1.5.948";
 
   src = fetchurl {
     url = "http://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm";

From c6b1f48e31724069b5d8057725c21f9f2929fab0 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 27 Feb 2016 16:39:25 +0100
Subject: [PATCH 1892/2285] libgcrypt: 1.6.4 -> 1.6.5 (CVE-2015-7511)

https://www.cs.tau.ac.il/~tromer/ecdh/
---
 pkgs/development/libraries/libgcrypt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix
index cc23d47e2bf2..835d6f0f5c29 100644
--- a/pkgs/development/libraries/libgcrypt/default.nix
+++ b/pkgs/development/libraries/libgcrypt/default.nix
@@ -3,11 +3,11 @@
 assert enableCapabilities -> stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "libgcrypt-1.6.4";
+  name = "libgcrypt-1.6.5";
 
   src = fetchurl {
     url = "mirror://gnupg/libgcrypt/${name}.tar.bz2";
-    sha256 = "09k06gs27gxfha07sa9rpf4xh6mvphj9sky7n09ymx75w9zjrg69";
+    sha256 = "0959mwfzsxhallxdqlw359xg180ll2skxwyy35qawmfl89cbr7pl";
   };
 
   buildInputs =

From 3673c5bf52046bdcf842ba086e881549d27d0ad0 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 27 Feb 2016 17:03:08 +0100
Subject: [PATCH 1893/2285] nodejs: 0.10.41 -> 0.10.42 (CVE-2016-2086,
 CVE-2016-2216)

https://nodejs.org/en/blog/vulnerability/february-2016-security-releases/
---
 pkgs/development/web/nodejs/v0_10.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v0_10.nix b/pkgs/development/web/nodejs/v0_10.nix
index bef89da4f8f1..3196153b6047 100644
--- a/pkgs/development/web/nodejs/v0_10.nix
+++ b/pkgs/development/web/nodejs/v0_10.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "0.10.41";
+  version = "0.10.42";
 
   # !!! Should we also do shared libuv?
   deps = {
@@ -32,7 +32,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "15f9n9pydfb3f6gbbxnh6qqmkmwr0j3gcs8cbnvl69f4lpi99xkr";
+    sha256 = "01g19mq8b3b828f59x7bv79973w5sw4133ll1dxml37qk0vdbhgb";
   };
 
   configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++

From 6fd20ad747fce772fbdadf6ead9788800279359f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 27 Feb 2016 17:04:01 +0100
Subject: [PATCH 1894/2285] nodejs: 4.2.3 -> 4.3.0 (CVE-2016-2086,
 CVE-2016-2216)

https://nodejs.org/en/blog/vulnerability/february-2016-security-releases/
---
 pkgs/development/web/nodejs/v4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix
index 4d2db8c666cd..04dbd1b1a27b 100644
--- a/pkgs/development/web/nodejs/v4.nix
+++ b/pkgs/development/web/nodejs/v4.nix
@@ -7,7 +7,7 @@
 assert stdenv.system != "armv5tel-linux";
 
 let
-  version = "4.2.3";
+  version = "4.3.0";
 
   deps = {
     inherit openssl zlib libuv;
@@ -31,7 +31,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "0ksmbln5qhrr7qhdz3npwmyz44y1vpznpxk3j7sqkc5lzvjss22h";
+    sha256 = "1f86jy71mi01g4xd411l5w8pi80nlk6sz7d2c0ghdk83v734ll0q";
   };
 
   configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];

From e3ecee8b135364ff8743e221c8b8f5b08a8fc27f Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 27 Feb 2016 17:04:26 +0100
Subject: [PATCH 1895/2285] nodejs: 5.5.0 -> 5.6.0 (CVE-2016-2086,
 CVE-2016-2216)

https://nodejs.org/en/blog/vulnerability/february-2016-security-releases/
---
 pkgs/development/web/nodejs/v5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix
index ef91e95a630f..948c4d10b309 100644
--- a/pkgs/development/web/nodejs/v5.nix
+++ b/pkgs/development/web/nodejs/v5.nix
@@ -7,7 +7,7 @@
 assert stdenv.system != "armv5tel-linux";
 
 let
-  version = "5.5.0";
+  version = "5.6.0";
 
   deps = {
     inherit openssl zlib libuv;
@@ -31,7 +31,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "0cmlk13skwag9gn1198h0ql64rv1jwwqbysq911kb6k94361i6yn";
+    sha256 = "0zy2pq2xpw170lycs0518jjldy1d5vm5y1pjb4zcibvhb5gcrwis";
   };
 
   configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];

From e5bd913ea5a6ec30df3af58e677954a05d2785f1 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 27 Feb 2016 16:51:30 +0100
Subject: [PATCH 1896/2285] pixman: 0.32.8 -> 0.34.0 (security release)

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

diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix
index 30cceb59c00a..681e54a781b2 100644
--- a/pkgs/development/libraries/pixman/default.nix
+++ b/pkgs/development/libraries/pixman/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, pkgconfig, libpng, glib /*just passthru*/ }:
 
 stdenv.mkDerivation rec {
-  name = "pixman-0.32.8";
+  name = "pixman-0.34.0";
 
   src = fetchurl {
     url = "mirror://xorg/individual/lib/${name}.tar.bz2";
-    sha1 = "5c57045622265b877c9bf02d531973eadf942140";
+    sha256 = "184lazwdpv67zrlxxswpxrdap85wminh1gmq1i5lcz6iycw39fir";
   };
 
   patches = stdenv.lib.optional stdenv.isDarwin ./fix-clang36.patch;

From 7dc5ad835a51e2e2dab80cc0cae32ec95a5a1ed8 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 27 Feb 2016 17:26:17 +0100
Subject: [PATCH 1897/2285] http-parser: 2.5.0 -> 2.6.1 (CVE-2016-2086,
 CVE-2016-2216)

Fixes build of nodejs-0_10 and nodejs-4_x.
---
 pkgs/development/libraries/http-parser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/http-parser/default.nix b/pkgs/development/libraries/http-parser/default.nix
index e2f06cab5cf7..6dd8efddaa65 100644
--- a/pkgs/development/libraries/http-parser/default.nix
+++ b/pkgs/development/libraries/http-parser/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, gyp, utillinux, python, fixDarwinDylibNames }:
 
 let
-  version = "2.5.0";
+  version = "2.6.1";
 in stdenv.mkDerivation {
   name = "http-parser-${version}";
 
   src = fetchurl {
     url = "https://github.com/joyent/http-parser/archive/v${version}.tar.gz";
-    sha256 = "108lh05pl4i5w7hmkw07k9wklk5pbh705pw1qyz5zvp6yicbmd73";
+    sha256 = "1b9ahv77zryx1z6j7sax2asx0gj209wh2244q9crj7hj14h8bkj8";
   };
 
   patches = [ ./build-shared.patch ];

From ca2611650a69290ebfe00e2a1b13a49dfc84356a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 27 Feb 2016 17:37:47 +0100
Subject: [PATCH 1898/2285] nghttp2: 1.3.4 -> 1.7.1 (CVE-2016-1544)

https://lwn.net/Vulnerabilities/675696/
---
 pkgs/development/libraries/nghttp2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/nghttp2/default.nix b/pkgs/development/libraries/nghttp2/default.nix
index 5cd5f0cb6297..01248e3e27a7 100644
--- a/pkgs/development/libraries/nghttp2/default.nix
+++ b/pkgs/development/libraries/nghttp2/default.nix
@@ -34,12 +34,12 @@ let
 in
 stdenv.mkDerivation rec {
   name = "${prefix}nghttp2-${version}";
-  version = "1.3.4";
+  version = "1.7.1";
 
   # Don't use fetchFromGitHub since this needs a bootstrap curl
   src = fetchurl {
-    url = "http://pub.wak.io/nixos/tarballs/nghttp2-${version}.tar.bz2";
-    sha256 = "63c1d70e50f0c8514e261be88b66720df095269791aa008d76c09e0c3a4c085f";
+    url = "http://http.debian.net/debian/pool/main/n/nghttp2/nghttp2_${version}.orig.tar.bz2";
+    sha256 = "0nbrww5gyjn4il33wz5b4sql5nifi12y2jbkmfbvxwlxlywm48kf";
   };
 
   # Configure script searches for a symbol which does not exist in jemalloc on Darwin

From 6b20b7c4d7d9ab22194e30f713dee34f2ae3b26b Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 27 Feb 2016 17:52:30 +0100
Subject: [PATCH 1899/2285] qemu: 2.4.1 -> 2.5.0 (multiple CVEs)

https://lwn.net/Vulnerabilities/666755/
---
 pkgs/applications/virtualization/qemu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 77903aa95897..9301f886472c 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -11,7 +11,7 @@
 
 with stdenv.lib;
 let
-  version = "2.4.1";
+  version = "2.5.0";
   audio = optionalString (hasSuffix "linux" stdenv.system) "alsa,"
     + optionalString pulseSupport "pa,"
     + optionalString sdlSupport "sdl,";
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "http://wiki.qemu.org/download/qemu-${version}.tar.bz2";
-    sha256 = "0xx1wc7lj5m3r2ab7f0axlfknszvbd8rlclpqz4jk48zid6czmg3";
+    sha256 = "1m3j6xl7msrniidkvr5pw9d44yba5m7hm42xz8xy77v105s8hhrl";
   };
 
   buildInputs =

From 158ff99ae41ff8f00a3b1efcdac56926304c6a14 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 27 Feb 2016 18:00:07 +0100
Subject: [PATCH 1900/2285] chrony: 2.2 -> 2.3

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

diff --git a/pkgs/tools/networking/chrony/default.nix b/pkgs/tools/networking/chrony/default.nix
index dca92c565af9..38839c4b6acd 100644
--- a/pkgs/tools/networking/chrony/default.nix
+++ b/pkgs/tools/networking/chrony/default.nix
@@ -5,11 +5,11 @@ assert stdenv.isLinux -> libcap != null;
 stdenv.mkDerivation rec {
   name = "chrony-${version}";
 
-  version = "2.2";
+  version = "2.3";
 
   src = fetchurl {
     url = "http://download.tuxfamily.org/chrony/${name}.tar.gz";
-    sha256 = "1194maargy4hpl2a3vy5mbrrswzajjdn92p4w17gbb9vlq7q5zfk";
+    sha256 = "1cncjapm98hv1nyrqlanjpz8k5ny6rp4vnf0gjl0zyqj619gpgsq";
   };
 
   buildInputs = [ readline texinfo nss nspr ] ++ stdenv.lib.optional stdenv.isLinux libcap;

From 0fc6de6c3a9e889642807e9aff36f076126805bc Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 27 Feb 2016 19:30:17 +0200
Subject: [PATCH 1901/2285] U-Boot: Fix ubootTools

Oops, I forgot to test build this...
---
 pkgs/misc/uboot/default.nix     | 1 +
 pkgs/top-level/all-packages.nix | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 4d1d3d73990e..605208a757b4 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -54,6 +54,7 @@ in rec {
   inherit buildUBoot;
 
   ubootTools = buildUBoot rec {
+    defconfig = "allnoconfig";
     installDir = "$out/bin";
     buildFlags = "tools NO_SDL=1";
     dontStrip = false;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a981e846acd..7491eb99b51c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10868,6 +10868,7 @@ let
   # Upstream U-Boots:
   inherit (callPackage ../misc/uboot {})
     buildUBoot
+    ubootTools
     ubootBananaPi
     ubootJetsonTK1
     ubootPcduino3Nano

From 17348dc094e53f52fd48ad26443093662dd08212 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 27 Feb 2016 17:24:00 +0000
Subject: [PATCH 1902/2285] Remove all dots at end of descriptions

Specially crafted for @JagaJaga

    find pkgs -name "*.nix" -exec \
      sed -e 's|\(description.*\)\.";|\1";|g' -i {} \;
---
 pkgs/applications/audio/bitmeter/default.nix  |   2 +-
 pkgs/applications/misc/chirp/default.nix      |   2 +-
 pkgs/applications/misc/devilspie2/default.nix |   2 +-
 pkgs/applications/misc/direwolf/default.nix   |   2 +-
 pkgs/applications/misc/jp2a/default.nix       |   2 +-
 .../applications/misc/multimon-ng/default.nix |   2 +-
 .../science/math/lp_solve/default.nix         |   2 +-
 .../git-and-tools/git-radar/default.nix       |   2 +-
 .../window-managers/i3/blocks.nix             |   2 +-
 pkgs/data/icons/vanilla-dmz/default.nix       |   2 +-
 .../xfce4-whiskermenu-plugin.nix              |   2 +-
 .../development/compilers/coreclr/default.nix |   2 +-
 .../compilers/elm/packages/elm-compiler.nix   |   2 +-
 .../compilers/gcc/gfortran-darwin.nix         |   2 +-
 .../erlang-modules/hex-packages.nix           |  20 +-
 .../haskell-modules/hackage-packages.nix      | 364 +++++++++---------
 .../interpreters/picolisp/default.nix         |   2 +-
 .../development/libraries/htmlcxx/default.nix |   2 +-
 .../development/libraries/wolfssl/default.nix |   2 +-
 .../mobile/titaniumenv/cli/registry.nix       |  60 +--
 .../ocaml-modules/bitstring/2.0.4.nix         |   2 +-
 .../ocaml-modules/piqi-ocaml/default.nix      |   2 +-
 .../ocaml-modules/piqi/default.nix            |   2 +-
 .../ocaml-modules/uuidm/default.nix           |   2 +-
 .../tools/backblaze-b2/default.nix            |   2 +-
 .../tools/build-managers/rebar3/default.nix   |   2 +-
 pkgs/development/tools/compass/default.nix    |   2 +-
 pkgs/development/tools/dcadec/default.nix     |   2 +-
 pkgs/development/tools/omniorb/default.nix    |   2 +-
 pkgs/games/factorio/default.nix               |   2 +-
 pkgs/games/lgogdownloader/default.nix         |   2 +-
 pkgs/games/pioneer/default.nix                |   2 +-
 pkgs/games/zandronum/bin.nix                  |   2 +-
 pkgs/games/zandronum/default.nix              |   2 +-
 pkgs/os-specific/linux/rtl8812au/default.nix  |   2 +-
 .../certificate-transparency/default.nix      |   2 +-
 pkgs/servers/monitoring/longview/default.nix  |   2 +-
 pkgs/servers/ums/default.nix                  |   2 +-
 .../graphics/imgur-screenshot/default.nix     |   2 +-
 .../ibus-engines/ibus-hangul/default.nix      |   2 +-
 .../ibus-engines/ibus-m17n/default.nix        |   2 +-
 pkgs/tools/misc/entr/default.nix              |   2 +-
 pkgs/tools/misc/homesick/default.nix          |   2 +-
 pkgs/tools/misc/logstash/default.nix          |   2 +-
 pkgs/tools/networking/driftnet/default.nix    |   2 +-
 pkgs/tools/security/pamtester/default.nix     |   2 +-
 pkgs/tools/text/popfile/default.nix           |   2 +-
 pkgs/top-level/dotnet-packages.nix            |   4 +-
 pkgs/top-level/emacs-packages.nix             |   6 +-
 pkgs/top-level/go-packages.nix                |   2 +-
 pkgs/top-level/perl-packages.nix              |   2 +-
 pkgs/top-level/python-packages.nix            |  42 +-
 52 files changed, 294 insertions(+), 294 deletions(-)

diff --git a/pkgs/applications/audio/bitmeter/default.nix b/pkgs/applications/audio/bitmeter/default.nix
index 0ca3d99ddc61..ca3148f0e0a4 100644
--- a/pkgs/applications/audio/bitmeter/default.nix
+++ b/pkgs/applications/audio/bitmeter/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://devel.tlrmx.org/audio/bitmeter/;
-    description = "Also known as jack bitscope. Useful to detect denormals.";
+    description = "Also known as jack bitscope. Useful to detect denormals";
     license = licenses.gpl2;
     maintainers = [ maintainers.magnetophon ];
     platforms = platforms.linux;
diff --git a/pkgs/applications/misc/chirp/default.nix b/pkgs/applications/misc/chirp/default.nix
index 2b92dc8d19e9..e77dd0e8c8a4 100644
--- a/pkgs/applications/misc/chirp/default.nix
+++ b/pkgs/applications/misc/chirp/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "A free, open-source tool for programming your amateur radio.";
+    description = "A free, open-source tool for programming your amateur radio";
     homepage = http://chirp.danplanet.com/;
     license = licenses.gpl3;
     platforms = platforms.linux;
diff --git a/pkgs/applications/misc/devilspie2/default.nix b/pkgs/applications/misc/devilspie2/default.nix
index 50ae2b2d15f6..96b429691155 100644
--- a/pkgs/applications/misc/devilspie2/default.nix
+++ b/pkgs/applications/misc/devilspie2/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Devilspie2 is a window matching utility.";
+    description = "Devilspie2 is a window matching utility";
     longDescription = ''
       Devilspie2 is a window matching utility, allowing the user to
       perform scripted actions on windows as they are created. For
diff --git a/pkgs/applications/misc/direwolf/default.nix b/pkgs/applications/misc/direwolf/default.nix
index 51a48db34e91..0341ffc64af8 100644
--- a/pkgs/applications/misc/direwolf/default.nix
+++ b/pkgs/applications/misc/direwolf/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway.";
+    description = "A Soundcard Packet TNC, APRS Digipeater, IGate, APRStt gateway";
     # On the page: This page will be disappearing on October 8, 2015.
     homepage = https://home.comcast.net/~wb2osz/site/;
     license = licenses.gpl2;
diff --git a/pkgs/applications/misc/jp2a/default.nix b/pkgs/applications/misc/jp2a/default.nix
index 1a46b7c7afb2..e03d4b397daa 100644
--- a/pkgs/applications/misc/jp2a/default.nix
+++ b/pkgs/applications/misc/jp2a/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://csl.name/jp2a/;
-    description = "A small utility that converts JPG images to ASCII.";
+    description = "A small utility that converts JPG images to ASCII";
     license = licenses.gpl2;
   };
 }
diff --git a/pkgs/applications/misc/multimon-ng/default.nix b/pkgs/applications/misc/multimon-ng/default.nix
index 794746653f75..f9aa567ed4b5 100644
--- a/pkgs/applications/misc/multimon-ng/default.nix
+++ b/pkgs/applications/misc/multimon-ng/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation {
   '';
 
   meta = with stdenv.lib; {
-    description = "Multimon is a digital baseband audio protocol decoder.";
+    description = "Multimon is a digital baseband audio protocol decoder";
     longDescription = ''
       multimon-ng a fork of multimon, a digital baseband audio
       protocol decoder for common signaling modes in commercial and
diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix
index 09af2d708c96..7726793fcaf8 100644
--- a/pkgs/applications/science/math/lp_solve/default.nix
+++ b/pkgs/applications/science/math/lp_solve/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "lp_solve is a Mixed Integer Linear Programming (MILP) solver.";
+    description = "lp_solve is a Mixed Integer Linear Programming (MILP) solver";
     homepage    = "http://lpsolve.sourceforge.net";
     license     = licenses.gpl2Plus;
     maintainers = with maintainers; [ smironov ];
diff --git a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
index 5cca8ebef3c7..f61f9fe6d2af 100644
--- a/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-radar/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     homepage = https://github.com/michaeldfallen/git-radar;
     license = licenses.mit;
-    description = "Git-radar is a tool you can add to your prompt to provide at-a-glance information on your git repo.";
+    description = "Git-radar is a tool you can add to your prompt to provide at-a-glance information on your git repo";
     platforms = with platforms; linux ++ darwin;
     maintainers = with maintainers; [ kamilchm ];
   };
diff --git a/pkgs/applications/window-managers/i3/blocks.nix b/pkgs/applications/window-managers/i3/blocks.nix
index 466c5b7ec6fb..c3880b92bdf8 100644
--- a/pkgs/applications/window-managers/i3/blocks.nix
+++ b/pkgs/applications/window-managers/i3/blocks.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   installFlags = "PREFIX=\${out} VERSION=${version}";
 
   meta = with stdenv.lib; {
-    description = "A flexible scheduler for your i3bar blocks.";
+    description = "A flexible scheduler for your i3bar blocks";
     homepage = https://github.com/vivien/i3blocks;
     license = licenses.gpl3;
     maintainers = [ "MindTooth" ];
diff --git a/pkgs/data/icons/vanilla-dmz/default.nix b/pkgs/data/icons/vanilla-dmz/default.nix
index 3b80781f4145..cf78a9f9901a 100644
--- a/pkgs/data/icons/vanilla-dmz/default.nix
+++ b/pkgs/data/icons/vanilla-dmz/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
   meta = with lib; {
     homepage = "http://jimmac.musichall.cz";
-    description = "A style neutral scalable cursor theme.";
+    description = "A style neutral scalable cursor theme";
     platforms = platforms.all;
     license = licenses.cc-by-nc-sa-30;
     maintainers = with maintainers; [ cstrahan ];
diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
index 3c76a87cbe3a..ff4e89a23cf3 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-whiskermenu-plugin.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = "http://goodies.xfce.org/projects/panel-plugins/${p_name}";
-    description = "Whisker Menu is an alternate application launcher for Xfce.";
+    description = "Whisker Menu is an alternate application launcher for Xfce";
     platforms = platforms.linux;
     maintainers = [ maintainers.pjbarnoy ];
   };
diff --git a/pkgs/development/compilers/coreclr/default.nix b/pkgs/development/compilers/coreclr/default.nix
index 629d981893d9..cf2833c5c6cb 100644
--- a/pkgs/development/compilers/coreclr/default.nix
+++ b/pkgs/development/compilers/coreclr/default.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://dotnet.github.io/core/;
-    description = ".NET is a general purpose development platform.";
+    description = ".NET is a general purpose development platform";
     platforms = [ "x86_64-linux" ];
     maintainers = with stdenv.lib.maintainers; [ obadz ];
     license = stdenv.lib.licenses.mit;
diff --git a/pkgs/development/compilers/elm/packages/elm-compiler.nix b/pkgs/development/compilers/elm/packages/elm-compiler.nix
index d602193f226c..38913e501b05 100644
--- a/pkgs/development/compilers/elm/packages/elm-compiler.nix
+++ b/pkgs/development/compilers/elm/packages/elm-compiler.nix
@@ -33,6 +33,6 @@ mkDerivation {
   ];
   jailbreak = true;
   homepage = "http://elm-lang.org";
-  description = "Values to help with elm-package, elm-make, and elm-lang.org.";
+  description = "Values to help with elm-package, elm-make, and elm-lang.org";
   license = stdenv.lib.licenses.bsd3;
 }
diff --git a/pkgs/development/compilers/gcc/gfortran-darwin.nix b/pkgs/development/compilers/gcc/gfortran-darwin.nix
index ee405c6fb655..66f273482cfb 100644
--- a/pkgs/development/compilers/gcc/gfortran-darwin.nix
+++ b/pkgs/development/compilers/gcc/gfortran-darwin.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
   makeFlags = ["CC=clang"];
   passthru.cc = stdenv.cc.cc;
   meta = with stdenv.lib; {
-    description = "GNU Fortran compiler, part of the GNU Compiler Collection.";
+    description = "GNU Fortran compiler, part of the GNU Compiler Collection";
     homepage    = "https://gcc.gnu.org/fortran/";
     license     = licenses.gpl3Plus;
     platforms   = platforms.darwin;
diff --git a/pkgs/development/erlang-modules/hex-packages.nix b/pkgs/development/erlang-modules/hex-packages.nix
index 81fc1308e1e6..0d1127b6c799 100644
--- a/pkgs/development/erlang-modules/hex-packages.nix
+++ b/pkgs/development/erlang-modules/hex-packages.nix
@@ -388,7 +388,7 @@ let
 	      "4dacd60356177ec8cf93dbff399de17435b613f3318202614d3d5acbccee1474";
 	      
 	    meta = {
-	      description = "Support library for manipulating Web protocols.";
+	      description = "Support library for manipulating Web protocols";
 	      license = stdenv.lib.licenses.isc;
 	      homepage = "https://github.com/ninenines/cowlib";
 	    };
@@ -405,7 +405,7 @@ let
 	      "db622da03aa039e6366ab953e31186cc8190d32905e33788a1acb22744e6abd2";
 	      
 	    meta = {
-	      description = "Support library for manipulating Web protocols.";
+	      description = "Support library for manipulating Web protocols";
 	      license = stdenv.lib.licenses.isc;
 	      homepage = "https://github.com/ninenines/cowlib";
 	    };
@@ -422,7 +422,7 @@ let
 	      "2b1ac020ec92e7a59cb7322779870c2d3adc7c904ecb3b9fa406f04dc9816b73";
 	      
 	    meta = {
-	      description = "Support library for manipulating Web protocols.";
+	      description = "Support library for manipulating Web protocols";
 	      license = stdenv.lib.licenses.isc;
 	      homepage = "https://github.com/ninenines/cowlib";
 	    };
@@ -599,7 +599,7 @@ let
 	      "6d7365a7854cd724e8d1fd005f5faa4444eae6a87eb6df9b789b6e7f6f09110a";
 	      
 	    meta = {
-	      description = "Markdown generated from Edoc.";
+	      description = "Markdown generated from Edoc";
 	      license = stdenv.lib.licenses.free;
 	      homepage = "https://github.com/uwiger/edown";
 	    };
@@ -1500,7 +1500,7 @@ let
 	    compilePorts = true;
 	     
 	    meta = {
-	      description = "JSON Decoder/Encoder.";
+	      description = "JSON Decoder/Encoder";
 	      license = with stdenv.lib.licenses; [ mit bsd3 ];
 	      homepage = "https://github.com/davisp/jiffy";
 	    };
@@ -1792,7 +1792,7 @@ let
 	      "53e70ea9031f7583331a9f9bdbb29da933e591e5c4cce521b4bf85c68e7f3385";
 	      
 	    meta = {
-	      description = "Lasse: Server-Sent Event handler for Cowboy.";
+	      description = "Lasse: Server-Sent Event handler for Cowboy";
 	      license = stdenv.lib.licenses.asl20;
 	      homepage = "https://github.com/inaka/lasse";
 	    };
@@ -2196,7 +2196,7 @@ let
 	    erlangDeps  = [ getopt_0_8_2 ];
 	    
 	    meta = {
-	      description = "Providers provider.";
+	      description = "Providers provider";
 	      license = stdenv.lib.licenses.mit;
 	      homepage = "https://github.com/tsloughter/providers";
 	    };
@@ -2296,7 +2296,7 @@ let
 	      "98ade939e63e6567da5dec5bc5bd93cbdc53d53f8b1aa998adec60dc4057f048";
 	      
 	    meta = {
-	      description = "Socket acceptor pool for TCP protocols.";
+	      description = "Socket acceptor pool for TCP protocols";
 	      license = stdenv.lib.licenses.isc;
 	      homepage = "https://github.com/ninenines/ranch";
 	    };
@@ -2313,7 +2313,7 @@ let
 	      "82bbb48cdad151000f7ad600d7a29afd972df409fde600bbc9b1ed4fdc08c399";
 	      
 	    meta = {
-	      description = "Socket acceptor pool for TCP protocols.";
+	      description = "Socket acceptor pool for TCP protocols";
 	      license = stdenv.lib.licenses.isc;
 	      homepage = "https://github.com/ninenines/ranch";
 	    };
@@ -2933,7 +2933,7 @@ let
 	      "742c45b3c99e207dd0aeccb818edd2ace4af10699c96fbcee0ce2f692dc5fe12";
 	      
 	    meta = {
-	      description = "weber - is Elixir MVC web framework.";
+	      description = "weber - is Elixir MVC web framework";
 	      license = stdenv.lib.licenses.mit;
 	      homepage = "https://github.com/elixir-web/weber";
 	    };
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 93f620a798df..da1c1fb01b9b 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -1655,7 +1655,7 @@ self: {
        sha256 = "31aba41c4abbbc003b685e3110b518e1202486551d935ceec6805d63cd7bb5de";
        libraryHaskellDepends = [ base HTTP json2 ];
        homepage = "http://bitbucket.org/jetxee/hs-bitly/";
-       description = "A library to access bit.ly URL shortener.";
+       description = "A library to access bit.ly URL shortener";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -2705,7 +2705,7 @@ self: {
        version = "0.2";
        sha256 = "b619bc5eee6c495bb047bdf34abfb739caba7710114013778f1a01ba0b017705";
        libraryHaskellDepends = [ base containers mtl ];
-       description = "Measure container capacity. Use it to safely change container.";
+       description = "Measure container capacity. Use it to safely change container";
        license = "LGPL";
      }) {};
 
@@ -9823,7 +9823,7 @@ self: {
          haskell-src-exts mtl parsec
        ];
        jailbreak = true;
-       description = "This package is deprecated. From version 3, HaTeX does not need this anymore.";
+       description = "This package is deprecated. From version 3, HaTeX does not need this anymore";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -12174,7 +12174,7 @@ self: {
        version = "0.0.4";
        sha256 = "d4f78a0d7a526398301c5e959ae61151acc2325bdcf86e7a4b909cb3ba36ee38";
        libraryHaskellDepends = [ base ];
-       description = "Variants of Control.Arrow functions, specialised to kleislis.";
+       description = "Variants of Control.Arrow functions, specialised to kleislis";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -15119,7 +15119,7 @@ self: {
        libraryHaskellDepends = [ base OpenGLRaw ];
        jailbreak = true;
        homepage = "http://code.google.com/p/copperbox/";
-       description = "Raw binding to OpenVG (ShivaVG-0.2.1 implementation).";
+       description = "Raw binding to OpenVG (ShivaVG-0.2.1 implementation)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -16525,7 +16525,7 @@ self: {
          base binary bytestring crypto-api crypto-pubkey-types DRBG pureMD5
          QuickCheck SHA tagged test-framework test-framework-quickcheck2
        ];
-       description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
+       description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -16546,7 +16546,7 @@ self: {
          base binary bytestring crypto-api crypto-pubkey-types DRBG pureMD5
          QuickCheck SHA tagged test-framework test-framework-quickcheck2
        ];
-       description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
+       description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -16567,7 +16567,7 @@ self: {
          base binary bytestring crypto-api crypto-pubkey-types DRBG pureMD5
          QuickCheck SHA tagged test-framework test-framework-quickcheck2
        ];
-       description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
+       description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -19689,7 +19689,7 @@ self: {
        libraryHaskellDepends = [ base cgi MaybeT mtl ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/UrlDisp";
-       description = "Url dispatcher. Helps to retain friendly URLs in web applications.";
+       description = "Url dispatcher. Helps to retain friendly URLs in web applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -21560,7 +21560,7 @@ self: {
        libraryHaskellDepends = [ base bytestring HTTP json network text ];
        jailbreak = true;
        homepage = "http://accentuate.us/";
-       description = "A Haskell implementation of the Accentuate.us API.";
+       description = "A Haskell implementation of the Accentuate.us API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -24125,7 +24125,7 @@ self: {
        libraryPkgconfigDepends = [ openal ];
        libraryToolDepends = [ c2hs ];
        homepage = "http://github.com/phaazon/al";
-       description = "OpenAL 1.1 raw API.";
+       description = "OpenAL 1.1 raw API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openal;};
@@ -30413,7 +30413,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://bitbucket.org/dafis/arithmoi";
-       description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";
+       description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -30432,7 +30432,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/cartazio/arithmoi";
-       description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";
+       description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -30451,7 +30451,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/cartazio/arithmoi";
-       description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";
+       description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
@@ -31506,7 +31506,7 @@ self: {
          tasty-hunit tasty-quickcheck text time uri-bytestring xml-conduit
          xml-conduit-parse xml-types
        ];
-       description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287).";
+       description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -32609,7 +32609,7 @@ self: {
        sha256 = "cf5edb7500a02aaba7400f3baab984680898dbedc0cf5b09ded2ca40568e6e57";
        libraryHaskellDepends = [ base ];
        homepage = "https://notabug.org/koz.ross/awesome-prelude";
-       description = "A prelude which I can be happy with. Based on base-prelude.";
+       description = "A prelude which I can be happy with. Based on base-prelude";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
@@ -34217,7 +34217,7 @@ self: {
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/HaskellZhangSong/base-generics";
-       description = "This library provides some instances for extra GHC.Generic typeclass such as Int8, Word16 and some unboxed types as well.";
+       description = "This library provides some instances for extra GHC.Generic typeclass such as Int8, Word16 and some unboxed types as well";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -35301,7 +35301,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/Noeda/bet/";
-       description = "Betfair API bindings. Bet on sports on betting exchanges.";
+       description = "Betfair API bindings. Bet on sports on betting exchanges";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -35319,7 +35319,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck smallcheck ];
        jailbreak = true;
-       description = "A codec for beta code (http://en.wikipedia.org/wiki/Beta_Code).";
+       description = "A codec for beta code (http://en.wikipedia.org/wiki/Beta_Code)";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -35939,7 +35939,7 @@ self: {
        version = "0.1";
        sha256 = "8dd0f54f68c36f107dfbc35412e873c4bbf057d16629417df38e3996f9ac4bb3";
        libraryHaskellDepends = [ array base ];
-       description = "Binary Indexed Trees (a.k.a. Fenwick Trees).";
+       description = "Binary Indexed Trees (a.k.a. Fenwick Trees)";
        license = "LGPL";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -36248,7 +36248,7 @@ self: {
        version = "0.1.1";
        sha256 = "f44da50068bf57b2bea5dc7ef70aa4bb6fb14272bde724fc887c57417dc7631b";
        libraryHaskellDepends = [ base binary bytestring containers mtl ];
-       description = "Simple wrapper around Data.Binary, which adds StateT to Get/Put monads.";
+       description = "Simple wrapper around Data.Binary, which adds StateT to Get/Put monads";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -36717,7 +36717,7 @@ self: {
        version = "1.3.4";
        sha256 = "8b55c6b28a4d7df6854d8b94933f58ca246e917b96080fa0f1ea92dbcb4675fd";
        libraryHaskellDepends = [ base ];
-       description = "This package is obsolete. Look for bindings-DSL instead.";
+       description = "This package is obsolete. Look for bindings-DSL instead";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -37856,7 +37856,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://bitbucket.org/jetxee/hs-bitly/";
-       description = "A command line tool to access bit.ly URL shortener.";
+       description = "A command line tool to access bit.ly URL shortener";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -37881,7 +37881,7 @@ self: {
        sha256 = "fba6d684213fbf56f8ca1109ec4087433dfe9f1a780ae8ef03e5b8b837b801f3";
        libraryHaskellDepends = [ base bitmap OpenGL ];
        homepage = "http://code.haskell.org/~bkomuves/";
-       description = "OpenGL support for Data.Bitmap.";
+       description = "OpenGL support for Data.Bitmap";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
@@ -38944,7 +38944,7 @@ self: {
        version = "0.1.0.0";
        sha256 = "0c0dedca6cee4a5547a73f3a825925ca447bc8a86d8cf8ac41aa9fdfa91ffd0d";
        libraryHaskellDepends = [ base blaze-html blaze-markup ];
-       description = "...";
+       description = "..";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -41665,7 +41665,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/joelteon/cabal-audit.git";
-       description = "Check how up-to-date your .cabal dependencies are.";
+       description = "Check how up-to-date your .cabal dependencies are";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -45258,7 +45258,7 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal vector ];
        testHaskellDepends = [ base cereal QuickCheck vector ];
        homepage = "https://github.com/acfoltzer/cereal-vector";
-       description = "Serialize instances for Data.Vector types.";
+       description = "Serialize instances for Data.Vector types";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -45573,7 +45573,7 @@ self: {
        sha256 = "2c2f2f9e90d5ee0e283eeae7e3ff727763165476ea1d0983d16f18e158cffbd7";
        libraryHaskellDepends = [ base stm ];
        homepage = "http://brandon.si/code/module-chan-split-released/";
-       description = "Concurrent Chans as read/write pairs. Also provides generic Chan pair class.";
+       description = "Concurrent Chans as read/write pairs. Also provides generic Chan pair class";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -48870,7 +48870,7 @@ self: {
          transformers
        ];
        jailbreak = true;
-       description = "Toy game (tetris on billiard board). Hipmunk in action.";
+       description = "Toy game (tetris on billiard board). Hipmunk in action";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -49702,7 +49702,7 @@ self: {
        ];
        testHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/guillaume-nargeot/codecov-haskell";
-       description = "Codecov.io support for Haskell.";
+       description = "Codecov.io support for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -49738,7 +49738,7 @@ self: {
        libraryHaskellDepends = [ base curl mtl network tagsoup ];
        jailbreak = true;
        homepage = "http://github.com/chrisdone/codepad";
-       description = "Submit and retrieve paste output from CodePad.org.";
+       description = "Submit and retrieve paste output from CodePad.org";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -49902,7 +49902,7 @@ self: {
          transformers
        ];
        homepage = "https://github.com/Cognimeta/cognimeta-utils";
-       description = "Utilities for Cognimeta products (such as perdure). API may change often.";
+       description = "Utilities for Cognimeta products (such as perdure). API may change often";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -49987,7 +49987,7 @@ self: {
          pipes-attoparsec pipes-network text transformers
        ];
        jailbreak = true;
-       description = "Rudimentary JSON-RPC 2.0 client over raw TCP.";
+       description = "Rudimentary JSON-RPC 2.0 client over raw TCP";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -52089,7 +52089,7 @@ self: {
          test-framework test-framework-hunit transformers
        ];
        homepage = "https://github.com/sdroege/conduit-connection";
-       description = "Conduit source and sink for Network.Connection.";
+       description = "Conduit source and sink for Network.Connection";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -53875,7 +53875,7 @@ self: {
          template-haskell text time
        ];
        homepage = "https://github.com/wdanilo/convert";
-       description = "Safe and unsafe data conversion utilities with strong type-level operation. checking.";
+       description = "Safe and unsafe data conversion utilities with strong type-level operation. checking";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -54278,7 +54278,7 @@ self: {
          yesod
        ];
        homepage = "http://github.com/coreyoconnor/corebot-bliki";
-       description = "A bliki written using yesod. Uses pandoc to process files stored in git.";
+       description = "A bliki written using yesod. Uses pandoc to process files stored in git";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -55179,7 +55179,7 @@ self: {
        sha256 = "68ec6f54afe655e764691f30c844778913957ad9f617e3f5587032307629276e";
        libraryHaskellDepends = [ base ];
        doHaddock = false;
-       description = "Command-Query Responsibility Segregation. Modules for the basic types.";
+       description = "Command-Query Responsibility Segregation. Modules for the basic types";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -57699,7 +57699,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://hackage.haskell.org/package/darcsden";
-       description = "Darcs repository UI and hosting/collaboration app (hub.darcs.net branch).";
+       description = "Darcs repository UI and hosting/collaboration app (hub.darcs.net branch)";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -58639,7 +58639,7 @@ self: {
        sha256 = "3c11be8dc0da7f4cb080023e2d0ae9f58ad202e193c6f1aea015b7b7873a936d";
        libraryHaskellDepends = [ base convert data-construction lens ];
        homepage = "https://github.com/wdanilo/layer";
-       description = "Data layering utilities. Layer is a data-type which wrapps other one, but keeping additional information. If you want to access content of simple newtype object, use Lens.Wrapper instead.";
+       description = "Data layering utilities. Layer is a data-type which wrapps other one, but keeping additional information. If you want to access content of simple newtype object, use Lens.Wrapper instead";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -58651,7 +58651,7 @@ self: {
        sha256 = "a5070520bcb6c3d8e7dcc969d94ac35c8bc5894abf45b65155b58571f82619f1";
        libraryHaskellDepends = [ base bytestring vector ];
        homepage = "http://github.com/jystic/data-layout";
-       description = "Read/write arbitrary binary layouts to a \"Data.Vector.Storable\".";
+       description = "Read/write arbitrary binary layouts to a \"Data.Vector.Storable\"";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -58972,7 +58972,7 @@ self: {
        version = "0.0.3";
        sha256 = "59186a2290a630d53fb2d796d9cca1260dbd70fa414814778e1cab0aeeba4e6e";
        libraryHaskellDepends = [ base containers data-reify ];
-       description = "Common Sub-Expression Elimination for graphs generated by Data.Reify.";
+       description = "Common Sub-Expression Elimination for graphs generated by Data.Reify";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -59033,7 +59033,7 @@ self: {
        sha256 = "4e2824b8d23d5eafce4c5f86a90fb58d97f461b45a287006f37cf8f2bd09fb05";
        libraryHaskellDepends = [ base lens typelevel ];
        homepage = "https://github.com/wdanilo/rtuple";
-       description = "Recursive tuple data structure. It is very usefull when implementing some lo-level operations, allowing to traverse different elements using Haskell's type classes.";
+       description = "Recursive tuple data structure. It is very usefull when implementing some lo-level operations, allowing to traverse different elements using Haskell's type classes";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -59059,7 +59059,7 @@ self: {
        libraryHaskellDepends = [ base vector-space ];
        jailbreak = true;
        homepage = "http://code.haskell.org/data-spacepart";
-       description = "Deprecated. Now called \"spacepart\". Space partitioning data structures.";
+       description = "Deprecated. Now called \"spacepart\". Space partitioning data structures";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -59278,7 +59278,7 @@ self: {
          monad-control network old-locale text time transformers-base
        ];
        homepage = "https://github.com/iand675/datadog";
-       description = "Datadog client for Haskell. Currently only StatsD supported, other support forthcoming.";
+       description = "Datadog client for Haskell. Currently only StatsD supported, other support forthcoming";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
@@ -59447,7 +59447,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2 time
        ];
        homepage = "http://github.com/stackbuilders/datetime";
-       description = "Utilities to make Data.Time.* easier to use.";
+       description = "Utilities to make Data.Time.* easier to use";
        license = "GPL";
      }) {};
 
@@ -59771,7 +59771,7 @@ self: {
          test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
-       description = "This packge is deprecated. See the the \"LIO.DCLabel\" in the \"lio\" package.";
+       description = "This packge is deprecated. See the the \"LIO.DCLabel\" in the \"lio\" package";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -60918,7 +60918,7 @@ self: {
        sha256 = "093aa20845a345c1d44e3d0258eadd6f8c38e3596cd6486be64879d0b60e7467";
        libraryHaskellDepends = [ base lens mtl prologue ];
        homepage = "https://github.com/wdanilo/dependent-state";
-       description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types.";
+       description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -64391,7 +64391,7 @@ self: {
          base base16-bytestring bytestring directory HUnit text
        ];
        homepage = "https://github.com/IreneKnapp/direct-sqlite";
-       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
+       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -64409,7 +64409,7 @@ self: {
          base base16-bytestring bytestring directory HUnit text
        ];
        homepage = "https://github.com/IreneKnapp/direct-sqlite";
-       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
+       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -64428,7 +64428,7 @@ self: {
        ];
        doCheck = false;
        homepage = "https://github.com/IreneKnapp/direct-sqlite";
-       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
+       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -64447,7 +64447,7 @@ self: {
        ];
        doCheck = false;
        homepage = "https://github.com/IreneKnapp/direct-sqlite";
-       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
+       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -64640,7 +64640,7 @@ self: {
          base containers HUnit mtl QuickCheck transformers
        ];
        homepage = "https://github.com/maxwellsayles/disjoint-set";
-       description = "Persistent disjoint-sets, a.k.a union-find.";
+       description = "Persistent disjoint-sets, a.k.a union-find";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -65597,7 +65597,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/redelmann/haskell-distribution-plot";
-       description = "Easily plot distributions from the distribution package..";
+       description = "Easily plot distributions from the distribution package.";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -65837,7 +65837,7 @@ self: {
        libraryHaskellDepends = [
          async base containers djinn-lib ghc mtl transformers
        ];
-       description = "Generate Haskell code from a type. Bridge from Djinn to GHC API.";
+       description = "Generate Haskell code from a type. Bridge from Djinn to GHC API";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -65853,7 +65853,7 @@ self: {
        libraryHaskellDepends = [
          async base containers djinn-lib ghc mtl transformers
        ];
-       description = "Generate Haskell code from a type. Bridge from Djinn to GHC API.";
+       description = "Generate Haskell code from a type. Bridge from Djinn to GHC API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -65865,7 +65865,7 @@ self: {
        sha256 = "c0fe10b7aa5cb39f828e933925fc5bbf86c290bb7661021e4d9250ae8ed01011";
        libraryHaskellDepends = [ base containers mtl pretty ];
        homepage = "http://www.augustsson.net/Darcs/Djinn/";
-       description = "Generate Haskell code from a type. Library extracted from djinn package.";
+       description = "Generate Haskell code from a type. Library extracted from djinn package";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -66562,7 +66562,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base ];
        homepage = "https://github.com/ku-fpg/dotgen";
-       description = "A simple interface for building .dot graph files.";
+       description = "A simple interface for building .dot graph files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -67040,7 +67040,7 @@ self: {
          time
        ];
        jailbreak = true;
-       description = "A command line tool for resolving dropbox conflicts. Deprecated! Please use confsolve.";
+       description = "A command line tool for resolving dropbox conflicts. Deprecated! Please use confsolve";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -68441,7 +68441,7 @@ self: {
          base hspec hspec-discover HUnit QuickCheck
        ];
        homepage = "https://github.com/edofic/effect-handlers";
-       description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers.";
+       description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -68459,7 +68459,7 @@ self: {
          base hspec hspec-discover HUnit QuickCheck
        ];
        homepage = "https://github.com/edofic/effect-handlers";
-       description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers.";
+       description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -69264,7 +69264,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://elm-lang.org";
-       description = "Values to help with elm-package, elm-make, and elm-lang.org.";
+       description = "Values to help with elm-package, elm-make, and elm-lang.org";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -69304,7 +69304,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://elm-lang.org";
-       description = "Values to help with elm-package, elm-make, and elm-lang.org.";
+       description = "Values to help with elm-package, elm-make, and elm-lang.org";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -69345,7 +69345,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://elm-lang.org";
-       description = "Values to help with elm-package, elm-make, and elm-lang.org.";
+       description = "Values to help with elm-package, elm-make, and elm-lang.org";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -71720,7 +71720,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "-";
-       description = "A different take on an IO system. Based on Amanda's IO loop, this eventloop takes a function that maps input events to output events. It can easily be extended by modules that represent IO devices or join multiple modules together.";
+       description = "A different take on an IO system. Based on Amanda's IO loop, this eventloop takes a function that maps input events to output events. It can easily be extended by modules that represent IO devices or join multiple modules together";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -72767,7 +72767,7 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring EdisonAPI EdisonCore
        ];
-       description = "Sort large arrays on your hard drive. Kind of like the unix util sort.";
+       description = "Sort large arrays on your hard drive. Kind of like the unix util sort";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -74529,7 +74529,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/bergmark/feed";
-       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -74551,7 +74551,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/bergmark/feed";
-       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -74572,7 +74572,7 @@ self: {
          time time-locale-compat utf8-string xml
        ];
        homepage = "https://github.com/bergmark/feed";
-       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -74593,7 +74593,7 @@ self: {
          time time-locale-compat utf8-string xml
        ];
        homepage = "https://github.com/bergmark/feed";
-       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -74614,7 +74614,7 @@ self: {
          time time-locale-compat utf8-string xml
        ];
        homepage = "https://github.com/bergmark/feed";
-       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -74635,7 +74635,7 @@ self: {
          time time-locale-compat utf8-string xml
        ];
        homepage = "https://github.com/bergmark/feed";
-       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -74656,7 +74656,7 @@ self: {
          time time-locale-compat utf8-string xml
        ];
        homepage = "https://github.com/bergmark/feed";
-       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -76201,7 +76201,7 @@ self: {
        sha256 = "f00a020ce3792737089cd7d544e0b35728c8c4d6f3b815fb6929742cb680656d";
        libraryHaskellDepends = [ array base tagged ];
        jailbreak = true;
-       description = "Fixed-size wrapper for StorableArray, providing a Storable instance. Deprecated - use storable-static-array instead.";
+       description = "Fixed-size wrapper for StorableArray, providing a Storable instance. Deprecated - use storable-static-array instead";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -76534,7 +76534,7 @@ self: {
        libraryHaskellDepends = [ base bytestring unix-time ];
        jailbreak = true;
        homepage = "https://github.com/tattsun/flexible-time";
-       description = "simple extension of Data.UnixTime.";
+       description = "simple extension of Data.UnixTime";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -76928,7 +76928,7 @@ self: {
          base bytestring directory fltkhs process stm
        ];
        homepage = "http://github.com/deech/fltkhs-demos";
-       description = "FLTKHS demos. Please scroll to the bottom for more information.";
+       description = "FLTKHS demos. Please scroll to the bottom for more information";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -77704,7 +77704,7 @@ self: {
        sha256 = "7ed54091d063fdf9ffca57c05a24769345b88a9e5bbb6c1f4037e01f70c69a9f";
        libraryHaskellDepends = [ aeson base text ];
        homepage = "https://github.com/stormont/forecast-io";
-       description = "A Haskell library for working with forecast.io data.";
+       description = "A Haskell library for working with forecast.io data";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -77727,7 +77727,7 @@ self: {
        sha256 = "afd0ea51c6f8b012259411858c966d34dbcbd7c128b044313fc6843743d6f0dc";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/chrisdone/foreign-store";
-       description = "Store a stable pointer in a foreign context to be retrieved later. Persists through GHCi reloads.";
+       description = "Store a stable pointer in a foreign context to be retrieved later. Persists through GHCi reloads";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -79554,7 +79554,7 @@ self: {
        sha256 = "fe01131dcef76a6a1e66424f12757e66724f24bed4c353d4beadf3890a0ef3c2";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/fmap/functor-infix";
-       description = "Infix operators for mapping over compositions of functors. Lots of them.";
+       description = "Infix operators for mapping over compositions of functors. Lots of them";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -79578,7 +79578,7 @@ self: {
        sha256 = "a054cbd84686777774b9e2c36c1b5ceaf8ca415a9755e922ff52137eb9ac36ba";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/wdanilo/functor-utils";
-       description = "Collection of functor utilities, providing handy operators, like generalization of (.).";
+       description = "Collection of functor utilities, providing handy operators, like generalization of (.)";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -79602,7 +79602,7 @@ self: {
        sha256 = "e6b96554d59b924f9960677137f2d4bc2417bac29b87083390d0020b6397d659";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/aristidb/functors";
-       description = "(.:) and friends, syntax for Functor and Applicative.";
+       description = "(.:) and friends, syntax for Functor and Applicative";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -79766,7 +79766,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/tlaitinen/fuzzy-timings";
-       description = "Translates high-level definitions of \"fuzzily\" scheduled objects (e.g. play this commercial 10 times per hour between 9:00-13:00) to a list of accurately scheduled objects using glpk-hs.";
+       description = "Translates high-level definitions of \"fuzzily\" scheduled objects (e.g. play this commercial 10 times per hour between 9:00-13:00) to a list of accurately scheduled objects using glpk-hs";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -80471,7 +80471,7 @@ self: {
        sha256 = "49c00e6cbe0d54fe72db40fedd92978833e78f5a0d0e26eb192194c14cd1ddc0";
        libraryHaskellDepends = [ base binary bytestring ghc-prim ];
        jailbreak = true;
-       description = "Generic Data.Binary derivation using GHC generics.";
+       description = "Generic Data.Binary derivation using GHC generics";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -81301,7 +81301,7 @@ self: {
        sha256 = "f79efd9bef4e4f0ce678fdaaf99ca3f1f70f2dc815c16439d9f97e399805c4dd";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://bitbucket.org/dpwiz/getopt-simple";
-       description = "A \"System.Console.GetOpt\" wrapper to make simple use case easy.";
+       description = "A \"System.Console.GetOpt\" wrapper to make simple use case easy";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -81350,7 +81350,7 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers parsec ];
        homepage = "http://a319-101.ipm.edu.mo/~wke/ggts/impl/";
-       description = "A type checker and runtime system of rCOS/g (impl. of ggts-FCS).";
+       description = "A type checker and runtime system of rCOS/g (impl. of ggts-FCS)";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -81953,7 +81953,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
-       description = "Generates data to be used with flamegraph.pl from .prof files.";
+       description = "Generates data to be used with flamegraph.pl from .prof files";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -83939,7 +83939,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/relrod/gitignore";
-       description = "Apply GitHub .gitignore templates to already existing repositories.";
+       description = "Apply GitHub .gitignore templates to already existing repositories";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -88506,7 +88506,7 @@ self: {
        libraryHaskellDepends = [ base containers deepseq pointed ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
-       description = "Grouped lists. Equal consecutive elements are grouped.";
+       description = "Grouped lists. Equal consecutive elements are grouped";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -88522,7 +88522,7 @@ self: {
        libraryHaskellDepends = [ base containers deepseq pointed ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
-       description = "Grouped lists. Equal consecutive elements are grouped.";
+       description = "Grouped lists. Equal consecutive elements are grouped";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -92994,7 +92994,7 @@ self: {
          syb
        ];
        jailbreak = true;
-       description = "A Happstack Tutorial that is its own web 2.0-type demo.";
+       description = "A Happstack Tutorial that is its own web 2.0-type demo";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -94394,7 +94394,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/wowus/hashable-generics";
-       description = "Automatically generates Hashable instances with GHC.Generics.";
+       description = "Automatically generates Hashable instances with GHC.Generics";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -97136,7 +97136,7 @@ self: {
          base convertible gtk haslo lenses mtl old-time QuickCheck time wtk
          wtk-gtk
        ];
-       description = "Loan calculator Gtk GUI. Based on haslo (Haskell Loan) library.";
+       description = "Loan calculator Gtk GUI. Based on haslo (Haskell Loan) library";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -98395,7 +98395,7 @@ self: {
          regex-tdfa SHA time utf8-string
        ];
        homepage = "http://d.hatena.ne.jp/xanxys/20100321/1269137834";
-       description = "A twitter client for GTK+. Beta version.";
+       description = "A twitter client for GTK+. Beta version";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -100273,7 +100273,7 @@ self: {
          uuid
        ];
        homepage = "https://github.com/helpdotcom/help-esb.hs";
-       description = "A Haskell client for the Help.com team's ESB.";
+       description = "A Haskell client for the Help.com team's ESB";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -101967,7 +101967,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://github.com/Fuuzetsu/himg";
-       description = "Simple gtk2hs image viewer. Point it at an image and fire away.";
+       description = "Simple gtk2hs image viewer. Point it at an image and fire away";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -104928,7 +104928,7 @@ self: {
          base binary bytestring crypto-pubkey-types curl dataenc entropy mtl
          old-locale random RSA SHA time utf8-string
        ];
-       description = "A Haskell implementation of OAuth 1.0a protocol.";
+       description = "A Haskell implementation of OAuth 1.0a protocol";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -106604,7 +106604,7 @@ self: {
        version = "1.0.0";
        sha256 = "7fafb1e0cfe19d453030754962e74cdb8f3e791ec5b974623cbf26872779c857";
        libraryHaskellDepends = [ attoparsec base bytestring ];
-       description = "Validate hostnames e.g. localhost or foo.co.uk.";
+       description = "Validate hostnames e.g. localhost or foo.co.uk";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -107016,7 +107016,7 @@ self: {
        testHaskellDepends = [ base HUnit ];
        jailbreak = true;
        homepage = "https://github.com/guillaume-nargeot/hpc-coveralls";
-       description = "Coveralls.io support for Haskell.";
+       description = "Coveralls.io support for Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -107043,7 +107043,7 @@ self: {
        ];
        testHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/guillaume-nargeot/hpc-coveralls";
-       description = "Coveralls.io support for Haskell.";
+       description = "Coveralls.io support for Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -114540,7 +114540,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/fmap/https-everywhere-rules-raw";
-       description = "Low-level (i.e. XML) access to HTTPS Everywhere rulesets.";
+       description = "Low-level (i.e. XML) access to HTTPS Everywhere rulesets";
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
@@ -116565,7 +116565,7 @@ self: {
        version = "0.0.1";
        sha256 = "f7c8ed3664c44f8fce891addc48051d181c0a4d47f1796a4e724855af681303d";
        libraryHaskellDepends = [ base interleavableIO mtl ];
-       description = "Version of Control.Exception using InterleavableIO.";
+       description = "Version of Control.Exception using InterleavableIO";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -118443,7 +118443,7 @@ self: {
          unordered-containers vector-space
        ];
        homepage = "https://github.com/colah/ImplicitCAD";
-       description = "Math-inspired programmatic 2&3D CAD: CSG, bevels, and shells; gcode export..";
+       description = "Math-inspired programmatic 2&3D CAD: CSG, bevels, and shells; gcode export.";
        license = "GPL";
      }) {};
 
@@ -118480,7 +118480,7 @@ self: {
        sha256 = "7f4f8d20bea5ee0c125218276d6e252d85c748808fc7f8ec5d6990aa84e277e2";
        libraryHaskellDepends = [ base lens ];
        homepage = "https://github.com/wdanilo/impossible";
-       description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable.";
+       description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -119206,7 +119206,7 @@ self: {
          raw-strings-qq regex-posix template-haskell transformers
          unordered-containers vector
        ];
-       description = "Write Haskell source files including C code inline. No FFI required.";
+       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;};
@@ -119235,7 +119235,7 @@ self: {
          raw-strings-qq regex-posix template-haskell transformers
          unordered-containers vector
        ];
-       description = "Write Haskell source files including C code inline. No FFI required.";
+       description = "Write Haskell source files including C code inline. No FFI required";
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) gsl; gslcblas = null;};
 
@@ -119295,7 +119295,7 @@ self: {
          tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck
          template-haskell temporary text unix vector
        ];
-       description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
+       description = "Seamlessly call R from Haskell and vice versa. No FFI required";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) R;};
@@ -119738,7 +119738,7 @@ self: {
          base haskell-src-meta-mwotton template-haskell
        ];
        jailbreak = true;
-       description = "DO NOT USE THIS. interpolatedstring-qq works now.";
+       description = "DO NOT USE THIS. interpolatedstring-qq works now";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -121660,7 +121660,7 @@ self: {
          test-framework-quickcheck2
        ];
        homepage = "https://github.com/cgo/jalla";
-       description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE.";
+       description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) blas; cblas = null; lapacke = null;};
@@ -122825,7 +122825,7 @@ self: {
        testHaskellDepends = [ base hspec json QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/jonathankochems/json-litobj";
-       description = "Extends Text.JSON to handle literal JS objects.";
+       description = "Extends Text.JSON to handle literal JS objects";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -122943,7 +122943,7 @@ self: {
          test-framework-quickcheck2 text unordered-containers vector
        ];
        homepage = "https://github.com/grayjay/json-rpc-client";
-       description = "JSON-RPC 2.0 on the client side.";
+       description = "JSON-RPC 2.0 on the client side";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -122966,7 +122966,7 @@ self: {
          text unordered-containers vector
        ];
        homepage = "https://github.com/grayjay/json-rpc-server";
-       description = "JSON-RPC 2.0 on the server side.";
+       description = "JSON-RPC 2.0 on the server side";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -123419,7 +123419,7 @@ self: {
        testHaskellDepends = [
          aeson base bytestring conduit conduit-extra hspec text
        ];
-       description = "JSON-RPC 2.0 server over a Conduit.";
+       description = "JSON-RPC 2.0 server over a Conduit";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
@@ -123641,7 +123641,7 @@ self: {
          process QuickCheck temporary time
        ];
        homepage = "https://github.com/abhinav/kafka-client";
-       description = "Low-level Haskell client library for Apache Kafka 0.7.";
+       description = "Low-level Haskell client library for Apache Kafka 0.7";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
@@ -125746,7 +125746,7 @@ self: {
        executableHaskellDepends = [
          base bytestring haskeline lambdaBase mtl network
        ];
-       description = "...";
+       description = "..";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -126257,7 +126257,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://github.com/ashyisme/lambdatwit";
-       description = "Lambdabot running as a twitter bot. Similar to the @fsibot f# bot.";
+       description = "Lambdabot running as a twitter bot. Similar to the @fsibot f# bot";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -138852,7 +138852,7 @@ self: {
        testHaskellDepends = [ base binary directory hspec vector ];
        jailbreak = true;
        homepage = "https://github.com/kryoxide/minst-idx/";
-       description = "Read and write IDX data that is used in e.g. the MINST database.";
+       description = "Read and write IDX data that is used in e.g. the MINST database";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
@@ -138964,7 +138964,7 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath haskell98 ];
-       description = "Makes an OS X .app bundle from a binary.";
+       description = "Makes an OS X .app bundle from a binary";
        license = "GPL";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -142982,7 +142982,7 @@ self: {
        sha256 = "fa57bbf7fd5159713520772307af960e2c79d9c24e045ef23680f18ea5cb41b2";
        libraryHaskellDepends = [ base binary multirec ];
        jailbreak = true;
-       description = "Generic Data.Binary instances using MultiRec.";
+       description = "Generic Data.Binary instances using MultiRec";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -143836,7 +143836,7 @@ self: {
        libraryHaskellDepends = [
          base cgi curl directory mtl process split
        ];
-       description = "Binding to mybitcoin.com's Shopping Cart Interface.";
+       description = "Binding to mybitcoin.com's Shopping Cart Interface";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
@@ -146960,7 +146960,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://github.com/mgsloan/newtype-th";
-       description = "A template haskell deriver to create Control.Newtype instances.";
+       description = "A template haskell deriver to create Control.Newtype instances";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -149438,7 +149438,7 @@ self: {
          base bytestring containers HsOpenSSL HTTP monadLib network time xml
        ];
        homepage = "http://github.com/elliottt/hsopenid";
-       description = "An implementation of the OpenID-2.0 spec.";
+       description = "An implementation of the OpenID-2.0 spec";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -149908,7 +149908,7 @@ self: {
          uri-bytestring xml-conduit-parse
        ];
        homepage = "https://github.com/k0ral/opml-conduit";
-       description = "Streaming parser/renderer for the OPML 2.0 format.";
+       description = "Streaming parser/renderer for the OPML 2.0 format";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -149940,7 +149940,7 @@ self: {
          uri-bytestring xml-conduit-parse
        ];
        homepage = "https://github.com/k0ral/opml-conduit";
-       description = "Streaming parser/renderer for the OPML 2.0 format.";
+       description = "Streaming parser/renderer for the OPML 2.0 format";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -150292,7 +150292,7 @@ self: {
          wreq
        ];
        jailbreak = true;
-       description = "An API client for http://orchestrate.io/.";
+       description = "An API client for http://orchestrate.io/";
        license = stdenv.lib.licenses.asl20;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -152665,7 +152665,7 @@ self: {
        sha256 = "b187eebf9d24bf66a2d5dbf66cf83442eb68bf316519985a2c738e04f87ecd79";
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base parsec QuickCheck ];
-       description = "Applicative permutation parser for Parsec intended as a replacement for Text.Parsec.Perm.";
+       description = "Applicative permutation parser for Parsec intended as a replacement for Text.Parsec.Perm";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -156486,7 +156486,7 @@ self: {
        version = "0.2.0.2";
        sha256 = "d536663dbfc4c0039e2d964ae1a52339f0c8ab30de0b8b78d4524d9b8e04cf11";
        libraryHaskellDepends = [ base transformers ];
-       description = "Phantom State Transformer. Like State Monad, but without values.";
+       description = "Phantom State Transformer. Like State Monad, but without values";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -158617,7 +158617,7 @@ self: {
        sha256 = "63f09f22e05a1d9119baaecfd5c9db9580b756430d050953fe348d6e28a80fcb";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base tasty tasty-hunit ];
-       description = "Plotter-like fonts i.e. a series of straight lines which make letter shapes.";
+       description = "Plotter-like fonts i.e. a series of straight lines which make letter shapes";
        license = "GPL";
      }) {};
 
@@ -162061,7 +162061,7 @@ self: {
          transformers
        ];
        jailbreak = true;
-       description = "Web graphic applications with processing.js.";
+       description = "Web graphic applications with processing.js";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -162617,7 +162617,7 @@ self: {
          QuickCheck random-shuffle stm time transformers utf8-string
        ];
        homepage = "https://github.com/fimad/prometheus-haskell";
-       description = "Haskell client library for http://prometheus.io.";
+       description = "Haskell client library for http://prometheus.io";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -163691,7 +163691,7 @@ self: {
          mtl text
        ];
        homepage = "http://lpuppet.banquise.net";
-       description = "A program that displays the puppet resources associated to a node given .pp files.";
+       description = "A program that displays the puppet resources associated to a node given .pp files";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -164162,7 +164162,7 @@ self: {
          unordered-containers xml-conduit yesod
        ];
        homepage = "http://gsoc2013cwithmobiledevices.blogspot.com.ar/";
-       description = "A general library for sending/receiving push notif. through dif. services.";
+       description = "A general library for sending/receiving push notif. through dif. services";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -166351,7 +166351,7 @@ self: {
        sha256 = "efe86052c5979261d9aa6861c6297205ee0b60e1b36de191d20485e823c9781a";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/RaphaelJ/ratio-int";
-       description = "Fast specialisation of Data.Ratio for Int.";
+       description = "Fast specialisation of Data.Ratio for Int";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -166975,7 +166975,7 @@ self: {
        executableHaskellDepends = [ base bliplib parseargs ];
        jailbreak = true;
        homepage = "https://github.com/bjpop/blip";
-       description = "Read and pretty print Python bytecode (.pyc) files.";
+       description = "Read and pretty print Python bytecode (.pyc) files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -167001,7 +167001,7 @@ self: {
        sha256 = "5575f5ee0cff708aeb37ea79cc9fae555e62e55053656f252653e33e631a8245";
        libraryHaskellDepends = [ base mtl split template-haskell ];
        homepage = "https://github.com/tokiwoousaka/reasonable-lens";
-       description = "Lens implementation. It is more small but adequately.";
+       description = "Lens implementation. It is more small but adequately";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -168333,7 +168333,7 @@ self: {
          parsec regex-base
        ];
        homepage = "http://code.google.com/p/xhaskell-library/";
-       description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Antimirov's partial derivatives.";
+       description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Antimirov's partial derivatives";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -172521,7 +172521,7 @@ self: {
          base bytestring directory filepath old-time process
        ];
        homepage = "http://roguestar.downstairspeople.org/";
-       description = "Sci-fi roguelike game. Client application.";
+       description = "Sci-fi roguelike game. Client application";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -172544,7 +172544,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://roguestar.downstairspeople.org/";
-       description = "Sci-fi roguelike game. Backend.";
+       description = "Sci-fi roguelike game. Backend";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -172564,7 +172564,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://roguestar.downstairspeople.org/";
-       description = "Sci-fi roguelike game. Client library.";
+       description = "Sci-fi roguelike game. Client library";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -172580,7 +172580,7 @@ self: {
        executableHaskellDepends = [ base GLUT roguestar-gl rsagl ];
        jailbreak = true;
        homepage = "http://roguestar.downstairspeople.org/";
-       description = "Sci-fi roguelike game. GLUT front-end.";
+       description = "Sci-fi roguelike game. GLUT front-end";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -172748,7 +172748,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/RaminHAL9001/rose-trie";
-       description = "Provides \"Data.Tree.RoseTrie\": trees with polymorphic paths to nodes, combining properties of Rose Tree data structures and Trie data structures.";
+       description = "Provides \"Data.Tree.RoseTrie\": trees with polymorphic paths to nodes, combining properties of Rose Tree data structures and Trie data structures";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
@@ -173131,7 +173131,7 @@ self: {
          base HaXml network network-uri old-locale time
        ];
        homepage = "https://github.com/basvandijk/rss";
-       description = "A library for generating RSS 2.0 feeds.";
+       description = "A library for generating RSS 2.0 feeds";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
@@ -173280,7 +173280,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/filib/ruby-marshal";
-       description = "Parse a subset of Ruby objects serialised with Marshal.dump.";
+       description = "Parse a subset of Ruby objects serialised with Marshal.dump";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -175839,7 +175839,7 @@ self: {
        ];
        librarySystemDepends = [ SDL2 ];
        libraryPkgconfigDepends = [ SDL2 ];
-       description = "Both high- and low-level bindings to the SDL library (version 2.0.3).";
+       description = "Both high- and low-level bindings to the SDL library (version 2.0.3)";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL2;};
@@ -175853,7 +175853,7 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base cairo linear mtl random sdl2 time ];
-       description = "Render with Cairo on SDL textures. Includes optional convenience drawing API.";
+       description = "Render with Cairo on SDL textures. Includes optional convenience drawing API";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
@@ -178882,7 +178882,7 @@ self: {
        sha256 = "f7842446f8961a29de96fa14423d8e23978cfef3db6ec0324358536d6bf8dd53";
        libraryHaskellDepends = [ base containers mtl syb ];
        homepage = "https://github.com/ddssff/set-extra";
-       description = "Functions that could be added to Data.Set.";
+       description = "Functions that could be added to Data.Set";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -180123,7 +180123,7 @@ self: {
        sha256 = "cbdedf5c24664d362be1b4a285c4c0021c17126e9a9562c17f23eb174249184d";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/anton-k/sharc";
-       description = "Sandell Harmonic Archive. A collection of stable phases for all instruments in the orchestra.";
+       description = "Sandell Harmonic Archive. A collection of stable phases for all instruments in the orchestra";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -182165,7 +182165,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/meteficha/skein";
-       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
+       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -182188,7 +182188,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/meteficha/skein";
-       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
+       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -182209,7 +182209,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/meteficha/skein";
-       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
+       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -182230,7 +182230,7 @@ self: {
        ];
        doCheck = false;
        homepage = "https://github.com/meteficha/skein";
-       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
+       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -182306,7 +182306,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/nyorem/skemmtun";
-       description = "A MyAnimeList.net client.";
+       description = "A MyAnimeList.net client";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -184600,7 +184600,7 @@ self: {
          sednaDBXML snap
        ];
        jailbreak = true;
-       description = "Snaplet for Sedna Bindings. Essentailly a rip of snaplet-hdbc.";
+       description = "Snaplet for Sedna Bindings. Essentailly a rip of snaplet-hdbc";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -184960,7 +184960,7 @@ self: {
        version = "0.1.1.1";
        sha256 = "f156ca321ae17033fe1cbe7e676fea403136198e1c3a132924a080cd3145cddd";
        libraryHaskellDepends = [ base time ];
-       description = "A loose port of Twitter Snowflake to Haskell. Generates arbitrary precision, unique, time-sortable identifiers.";
+       description = "A loose port of Twitter Snowflake to Haskell. Generates arbitrary precision, unique, time-sortable identifiers";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -185579,7 +185579,7 @@ self: {
        libraryHaskellDepends = [ base vector-space ];
        jailbreak = true;
        homepage = "http://code.haskell.org/data-spacepart";
-       description = "Space partition data structures. Currently only a QuadTree.";
+       description = "Space partition data structures. Currently only a QuadTree";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -185916,7 +185916,7 @@ self: {
        libraryHaskellDepends = [ speculation ];
        doHaddock = false;
        homepage = "http://github.com/ekmett/speculation/";
-       description = "Merged into 'speculation'. Use that instead.";
+       description = "Merged into 'speculation'. Use that instead";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -186209,7 +186209,7 @@ self: {
        version = "0.2.0.1";
        sha256 = "53ed4e9f68972b1d6db98b040b10e512a194d45c7734802adcaef9e2827c5a70";
        libraryHaskellDepends = [ base ];
-       description = "Control.Concurrent.Chan split into sending and receiving halves.";
+       description = "Control.Concurrent.Chan split into sending and receiving halves";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -186320,7 +186320,7 @@ self: {
          base directory extensible-exceptions filepath parsec
        ];
        homepage = "http://github.com/elginer/SpoonUtilities";
-       description = "Spoon's utilities. Simple testing and nice looking error reporting.";
+       description = "Spoon's utilities. Simple testing and nice looking error reporting";
        license = stdenv.lib.licenses.gpl3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -188830,7 +188830,7 @@ self: {
          base directory hslogger HUnit MissingH mtl old-time syb
          test-framework test-framework-hunit test-framework-quickcheck2 time
        ];
-       description = "JavaScript and Css files concat for http optimization. Now with LESS support.";
+       description = "JavaScript and Css files concat for http optimization. Now with LESS support";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -192856,7 +192856,7 @@ self: {
        libraryHaskellDepends = [
          base haskell-src-exts hint mtl template-haskell uniplate
        ];
-       description = "Convert between different Haskell syntax trees. Bairyn's fork.";
+       description = "Convert between different Haskell syntax trees. Bairyn's fork";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -193087,7 +193087,7 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/NICTA/sys-process";
-       description = "A replacement for System.Exit and System.Process.";
+       description = "A replacement for System.Exit and System.Process";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -194368,7 +194368,7 @@ self: {
          base bytestring directory filepath old-time time
        ];
        jailbreak = true;
-       description = "Reading, writing and manipulating \".tar\" archive files.";
+       description = "Reading, writing and manipulating \".tar\" archive files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -194382,7 +194382,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring directory filepath time
        ];
-       description = "Reading, writing and manipulating \".tar\" archive files.";
+       description = "Reading, writing and manipulating \".tar\" archive files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -194405,7 +194405,7 @@ self: {
          tasty-quickcheck time
        ];
        jailbreak = true;
-       description = "Reading, writing and manipulating \".tar\" archive files.";
+       description = "Reading, writing and manipulating \".tar\" archive files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -194429,7 +194429,7 @@ self: {
          QuickCheck tasty tasty-quickcheck time
        ];
        doCheck = false;
-       description = "Reading, writing and manipulating \".tar\" archive files.";
+       description = "Reading, writing and manipulating \".tar\" archive files";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -194450,7 +194450,7 @@ self: {
          array base bytestring bytestring-handle containers deepseq
          directory filepath QuickCheck tasty tasty-quickcheck time
        ];
-       description = "Reading, writing and manipulating \".tar\" archive files.";
+       description = "Reading, writing and manipulating \".tar\" archive files";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -197072,7 +197072,7 @@ self: {
          unordered-containers
        ];
        homepage = "https://github.com/andersjel/haskell-text-and-plots";
-       description = "EDSL to create HTML documents with plots based on the C3.js library.";
+       description = "EDSL to create HTML documents with plots based on the C3.js library";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -197602,7 +197602,7 @@ self: {
        sha256 = "a56515d6c2ea2e94ef3f0ee4cdf6f387d0b5367d3879f25c982b213b888d210c";
        libraryHaskellDepends = [ base parsec template-haskell xml ];
        homepage = "http://www.github.com/finnsson/text-xml-qq";
-       description = "Quasiquoter for xml. XML DSL in Haskell.";
+       description = "Quasiquoter for xml. XML DSL in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -197631,7 +197631,7 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/NICTA/text1";
-       description = "Non-empty values of `Data.Text`.";
+       description = "Non-empty values of `Data.Text`";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -201056,7 +201056,7 @@ self: {
        jailbreak = true;
        doCheck = false;
        homepage = "http://github.com/ekmett/transformers-compat/";
-       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
+       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -201070,7 +201070,7 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/transformers-compat/";
-       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
+       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -201084,7 +201084,7 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        doHaddock = false;
        homepage = "http://github.com/ekmett/transformers-compat/";
-       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
+       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -201097,7 +201097,7 @@ self: {
        sha256 = "d881ef4ec164b631591b222efe7ff555af6d5397c9d86475b309ba9402a8ca9f";
        libraryHaskellDepends = [ base ghc-prim transformers ];
        homepage = "http://github.com/ekmett/transformers-compat/";
-       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
+       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -202430,7 +202430,7 @@ self: {
          network random SHA text
        ];
        jailbreak = true;
-       description = "A fork of the popular websockets package. It is used for the practical assignments of the University of Twente. A sensible and clean way to write WebSocket-capable servers in Haskell.";
+       description = "A fork of the popular websockets package. It is used for the practical assignments of the University of Twente. A sensible and clean way to write WebSocket-capable servers in Haskell";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -202958,7 +202958,7 @@ self: {
          base containers lens lens-utils template-haskell
        ];
        homepage = "https://github.com/wdanilo/type-cache";
-       description = "Utilities for caching type families results. Sometimes complex type families take long time to compile, so it is proficient to cache them and use the final result without the need of re-computation.";
+       description = "Utilities for caching type families results. Sometimes complex type families take long time to compile, so it is proficient to cache them and use the final result without the need of re-computation";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -203340,7 +203340,7 @@ self: {
        sha256 = "30d24fa550e380ea4a76367d261362532c0cee703a5356497a612b204328eff9";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "http://code.atnnn.com/projects/type-prelude";
-       description = "Partial port of prelude to the type level. Requires GHC 7.6.1.";
+       description = "Partial port of prelude to the type level. Requires GHC 7.6.1";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -203651,7 +203651,7 @@ self: {
        editedCabalFile = "8fbb17ec66d4bf5f2fffdb2327647b44292253822c9623a06b489ff547a71041";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/philopon/types-compat";
-       description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy.";
+       description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -203695,7 +203695,7 @@ self: {
        version = "0.0.1";
        sha256 = "98c0f7dd56285e4dde732aa0d49ea12dd1233adceae101b2a58bc1752faf8637";
        libraryHaskellDepends = [ base ];
-       description = "Type level numbers, vectors, list. This lib needs to be extended.";
+       description = "Type level numbers, vectors, list. This lib needs to be extended";
        license = "GPL";
      }) {};
 
@@ -211099,7 +211099,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest prometheus-client ];
        homepage = "https://github.com/fimad/prometheus-haskell";
-       description = "WAI middlware for exposing http://prometheus.io metrics.";
+       description = "WAI middlware for exposing http://prometheus.io metrics";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -220459,7 +220459,7 @@ self: {
          yesod-auth yesod-core
        ];
        homepage = "https://github.com/prowdsponsor/yesod-auth-deskcom";
-       description = "Desk.com remote authentication support for Yesod apps.";
+       description = "Desk.com remote authentication support for Yesod apps";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -220727,7 +220727,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://github.com/scan/yesod-auth-oauth2";
-       description = "Library to authenticate with OAuth 2.0 for Yesod web applications.";
+       description = "Library to authenticate with OAuth 2.0 for Yesod web applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -220748,7 +220748,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://github.com/scan/yesod-auth-oauth2";
-       description = "Library to authenticate with OAuth 2.0 for Yesod web applications.";
+       description = "Library to authenticate with OAuth 2.0 for Yesod web applications";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -224729,7 +224729,7 @@ self: {
          yesod-form yesod-persistent
        ];
        jailbreak = true;
-       description = "Yesod support for Text.Markdown.";
+       description = "Yesod support for Text.Markdown";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -224746,7 +224746,7 @@ self: {
          aeson base markdown persistent shakespeare text yesod-core
          yesod-form yesod-persistent
        ];
-       description = "Yesod support for Text.Markdown.";
+       description = "Yesod support for Text.Markdown";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
diff --git a/pkgs/development/interpreters/picolisp/default.nix b/pkgs/development/interpreters/picolisp/default.nix
index 0e003af3aff1..5832bbea9b7d 100644
--- a/pkgs/development/interpreters/picolisp/default.nix
+++ b/pkgs/development/interpreters/picolisp/default.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "A simple Lisp with an integrated database.";
+    description = "A simple Lisp with an integrated database";
     homepage = http://picolisp.com/;
     license = licenses.mit;
     platform = platforms.all;
diff --git a/pkgs/development/libraries/htmlcxx/default.nix b/pkgs/development/libraries/htmlcxx/default.nix
index 63cc74773855..6557d8f80410 100644
--- a/pkgs/development/libraries/htmlcxx/default.nix
+++ b/pkgs/development/libraries/htmlcxx/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://htmlcxx.sourceforge.net/;
-    description = "htmlcxx is a simple non-validating css1 and html parser for C++.";
+    description = "htmlcxx is a simple non-validating css1 and html parser for C++";
     license = stdenv.lib.licenses.lgpl2;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index 3a6f8873b84f..5bb63c915e61 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "A small, fast, portable implementation of TLS/SSL for embedded devices.";
+    description = "A small, fast, portable implementation of TLS/SSL for embedded devices";
     homepage    = "https://www.wolfssl.com/";
     platforms   = platforms.all;
     maintainers = with maintainers; [ mcmtroffaes ];
diff --git a/pkgs/development/mobile/titaniumenv/cli/registry.nix b/pkgs/development/mobile/titaniumenv/cli/registry.nix
index b5bb23a836ca..045f619087e4 100644
--- a/pkgs/development/mobile/titaniumenv/cli/registry.nix
+++ b/pkgs/development/mobile/titaniumenv/cli/registry.nix
@@ -439,7 +439,7 @@ let
       };
       dependencies = {};
       meta = {
-        description = "A javascript text diff implementation.";
+        description = "A javascript text diff implementation";
         homepage = "https://github.com/kpdecker/jsdiff#readme";
         license = "BSD-3-Clause";
       };
@@ -454,7 +454,7 @@ let
         sha1 = "319bb7a56e7cb63f00b5c0cd7851cd4b4ddf1df9";
       };
       meta = {
-        description = "Rigorous implementation of RFC4122 (v1 and v4) UUIDs.";
+        description = "Rigorous implementation of RFC4122 (v1 and v4) UUIDs";
         homepage = https://github.com/broofa/node-uuid;
       };
       production = true;
@@ -482,7 +482,7 @@ let
         };
       };
       meta = {
-        description = "Light-weight option parsing with an argv hash. No optstrings attached.";
+        description = "Light-weight option parsing with an argv hash. No optstrings attached";
         homepage = https://github.com/substack/node-optimist;
         license = "MIT/X11";
       };
@@ -497,7 +497,7 @@ let
         sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107";
       };
       meta = {
-        description = "Wrap those words. Show them at what columns to start and stop.";
+        description = "Wrap those words. Show them at what columns to start and stop";
         homepage = "https://github.com/substack/node-wordwrap#readme";
         license = "MIT";
       };
@@ -645,7 +645,7 @@ let
         };
       };
       meta = {
-        description = "Simplified HTTP request client.";
+        description = "Simplified HTTP request client";
         homepage = "https://github.com/request/request#readme";
         license = "Apache-2.0";
       };
@@ -736,7 +736,7 @@ let
         sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7";
       };
       meta = {
-        description = "The `util.is*` functions introduced in Node v0.12.";
+        description = "The `util.is*` functions introduced in Node v0.12";
         homepage = "https://github.com/isaacs/core-util-is#readme";
         license = "MIT";
       };
@@ -834,7 +834,7 @@ let
         sha1 = "715b96ea9841593cc33067923f5ec60ebda4f7d7";
       };
       meta = {
-        description = "Caseless object set/get/has, very useful when working with HTTP headers.";
+        description = "Caseless object set/get/has, very useful when working with HTTP headers";
         homepage = "https://github.com/mikeal/caseless#readme";
         license = "Apache-2.0";
       };
@@ -868,7 +868,7 @@ let
       };
       dependencies = {};
       meta = {
-        description = "HTTP Agent that keeps socket connections alive between keep-alive requests. Formerly part of mikeal/request, now a standalone module.";
+        description = "HTTP Agent that keeps socket connections alive between keep-alive requests. Formerly part of mikeal/request, now a standalone module";
         homepage = https://github.com/mikeal/forever-agent;
         license = "Apache-2.0";
       };
@@ -904,7 +904,7 @@ let
         };
       };
       meta = {
-        description = "A library to create readable \"multipart/form-data\" streams. Can be used to submit forms and file uploads to other web applications.";
+        description = "A library to create readable \"multipart/form-data\" streams. Can be used to submit forms and file uploads to other web applications";
         homepage = "https://github.com/form-data/form-data#readme";
         license = "MIT";
       };
@@ -943,7 +943,7 @@ let
         };
       };
       meta = {
-        description = "A stream that emits multiple other streams one after another.";
+        description = "A stream that emits multiple other streams one after another";
         homepage = https://github.com/felixge/node-combined-stream;
         license = "MIT";
       };
@@ -959,7 +959,7 @@ let
       };
       dependencies = {};
       meta = {
-        description = "Buffers events from a stream until you are ready to handle them.";
+        description = "Buffers events from a stream until you are ready to handle them";
         homepage = https://github.com/felixge/node-delayed-stream;
         license = "MIT";
       };
@@ -984,7 +984,7 @@ let
         };
       };
       meta = {
-        description = "The ultimate javascript content-type utility.";
+        description = "The ultimate javascript content-type utility";
         homepage = https://github.com/jshttp/mime-types;
         license = "MIT";
       };
@@ -1017,7 +1017,7 @@ let
         sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb";
       };
       meta = {
-        description = "Like JSON.stringify, but doesn't blow up on circular refs.";
+        description = "Like JSON.stringify, but doesn't blow up on circular refs";
         homepage = https://github.com/isaacs/json-stringify-safe;
         license = "ISC";
       };
@@ -1035,7 +1035,7 @@ let
       };
       dependencies = {};
       meta = {
-        description = "Rigorous implementation of RFC4122 (v1 and v4) UUIDs.";
+        description = "Rigorous implementation of RFC4122 (v1 and v4) UUIDs";
         homepage = https://github.com/broofa/node-uuid;
       };
       production = true;
@@ -1068,7 +1068,7 @@ let
       };
       dependencies = {};
       meta = {
-        description = "HTTP proxy tunneling agent. Formerly part of mikeal/request, now a standalone module.";
+        description = "HTTP proxy tunneling agent. Formerly part of mikeal/request, now a standalone module";
         homepage = "https://github.com/mikeal/tunnel-agent#readme";
         license = "Apache-2.0";
       };
@@ -1120,7 +1120,7 @@ let
         };
       };
       meta = {
-        description = "Reference implementation of Joyent's HTTP Signature scheme.";
+        description = "Reference implementation of Joyent's HTTP Signature scheme";
         homepage = https://github.com/joyent/node-http-signature/;
         license = "MIT";
       };
@@ -1180,7 +1180,7 @@ let
       };
       dependencies = {};
       meta = {
-        description = "OAuth 1 signing. Formerly a vendor lib in mikeal/request, now a standalone module.";
+        description = "OAuth 1 signing. Formerly a vendor lib in mikeal/request, now a standalone module";
         homepage = "https://github.com/mikeal/oauth-sign#readme";
         license = "Apache-2.0";
       };
@@ -1327,7 +1327,7 @@ let
       };
       dependencies = {};
       meta = {
-        description = "AWS signing. Originally pulled from LearnBoost/knox, maintained as vendor in request, now a standalone module.";
+        description = "AWS signing. Originally pulled from LearnBoost/knox, maintained as vendor in request, now a standalone module";
       };
       production = true;
       linkDependencies = false;
@@ -1463,7 +1463,7 @@ let
         };
       };
       meta = {
-        description = "Terminal string styling done right. Much color.";
+        description = "Terminal string styling done right. Much color";
         homepage = "https://github.com/chalk/chalk#readme";
         license = "MIT";
       };
@@ -1729,7 +1729,7 @@ let
         sha1 = "3af1dd20fe85463910d469a385e33017d2a030d9";
       };
       meta = {
-        description = "Simple JSON Addressing.";
+        description = "Simple JSON Addressing";
         homepage = "https://github.com/janl/node-jsonpointer#readme";
         license = "MIT";
       };
@@ -1763,7 +1763,7 @@ let
         sha1 = "9fb3f4004f900d83c47968fe42f7583e05832cc9";
       };
       meta = {
-        description = "The semantic version parser used by npm.";
+        description = "The semantic version parser used by npm";
         homepage = "https://github.com/npm/node-semver#readme";
         license = "ISC";
       };
@@ -1843,7 +1843,7 @@ let
       };
       dependencies = {};
       meta = {
-        description = "Recursive filesystem (and other) operations that Node *should* have.";
+        description = "Recursive filesystem (and other) operations that Node *should* have";
         homepage = https://github.com/ryanmcgrath/wrench-js;
       };
       production = true;
@@ -1935,7 +1935,7 @@ let
       };
       dependencies = {};
       meta = {
-        description = "A transform to make UglifyJS work in browserify.";
+        description = "A transform to make UglifyJS work in browserify";
         homepage = https://github.com/ForbesLindesay/uglify-to-browserify;
         license = "MIT";
       };
@@ -1977,7 +1977,7 @@ let
         };
       };
       meta = {
-        description = "Light-weight option parsing with an argv hash. No optstrings attached.";
+        description = "Light-weight option parsing with an argv hash. No optstrings attached";
         homepage = https://github.com/bcoe/yargs;
         license = "MIT/X11";
       };
@@ -2033,7 +2033,7 @@ let
         sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d";
       };
       meta = {
-        description = "Reliable way to to get the height and width of the terminal/console in a node.js environment.";
+        description = "Reliable way to to get the height and width of the terminal/console in a node.js environment";
         homepage = https://github.com/jonschlinkert/window-size;
       };
       production = true;
@@ -2048,7 +2048,7 @@ let
       };
       dependencies = {};
       meta = {
-        description = "Wrap those words. Show them at what columns to start and stop.";
+        description = "Wrap those words. Show them at what columns to start and stop";
         license = "MIT/X11";
       };
       production = true;
@@ -2064,7 +2064,7 @@ let
       };
       dependencies = {};
       meta = {
-        description = "A W3C Standard XML DOM(Level2 CORE) implementation and parser(DOMParser/XMLSerializer).";
+        description = "A W3C Standard XML DOM(Level2 CORE) implementation and parser(DOMParser/XMLSerializer)";
         homepage = https://github.com/jindw/xmldom;
       };
       production = true;
@@ -2194,7 +2194,7 @@ let
         };
       };
       meta = {
-        description = "Simplified HTTP request client.";
+        description = "Simplified HTTP request client";
         homepage = "https://github.com/request/request#readme";
         license = "Apache-2.0";
       };
@@ -2226,7 +2226,7 @@ let
         sha1 = "77466de589cd5d3c95f138aa78bc569a3cb5d27a";
       };
       meta = {
-        description = "The semantic version parser used by npm.";
+        description = "The semantic version parser used by npm";
         homepage = "https://github.com/npm/node-semver#readme";
         license = "ISC";
       };
@@ -2379,7 +2379,7 @@ let
       };
       dependencies = {};
       meta = {
-        description = "Get v8 stack traces as an array of CallSite objects.";
+        description = "Get v8 stack traces as an array of CallSite objects";
         homepage = https://github.com/felixge/node-stack-trace;
       };
       production = true;
diff --git a/pkgs/development/ocaml-modules/bitstring/2.0.4.nix b/pkgs/development/ocaml-modules/bitstring/2.0.4.nix
index beaf2fc7fd18..68ce28c40bd5 100644
--- a/pkgs/development/ocaml-modules/bitstring/2.0.4.nix
+++ b/pkgs/development/ocaml-modules/bitstring/2.0.4.nix
@@ -17,7 +17,7 @@ buildOcaml rec {
   hasSharedObjects = true;
 
   meta = with stdenv.lib; {
-    description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml.";
+    description = "This library adds Erlang-style bitstrings and matching over bitstrings as a syntax extension and library for OCaml";
     homepage = http://code.google.com/p/bitstring/;
     license = licenses.lgpl21Plus;
     maintainers = [ maintainers.maurer ];
diff --git a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
index fea1ee150446..2d94272e6eb3 100644
--- a/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/piqi-ocaml/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://piqi.org;
-    description = "Universal schema language and a collection of tools built around it. These are the ocaml bindings.";
+    description = "Universal schema language and a collection of tools built around it. These are the ocaml bindings";
     license = licenses.asl20;
     maintainers = [ maintainers.maurer ];
   };
diff --git a/pkgs/development/ocaml-modules/piqi/default.nix b/pkgs/development/ocaml-modules/piqi/default.nix
index 7cca68c4f795..20ce994c0a48 100644
--- a/pkgs/development/ocaml-modules/piqi/default.nix
+++ b/pkgs/development/ocaml-modules/piqi/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://piqi.org;
-    description = "Universal schema language and a collection of tools built around it.";
+    description = "Universal schema language and a collection of tools built around it";
     license = licenses.asl20;
     maintainers = [ maintainers.maurer ];
   };
diff --git a/pkgs/development/ocaml-modules/uuidm/default.nix b/pkgs/development/ocaml-modules/uuidm/default.nix
index 0473f64bcdf9..78869f2f1306 100644
--- a/pkgs/development/ocaml-modules/uuidm/default.nix
+++ b/pkgs/development/ocaml-modules/uuidm/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   createFindlibDestdir = true;
 
   meta = with stdenv.lib; {
-    description = "An OCaml module implementing 128 bits universally unique identifiers version 3, 5 (name based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122.";
+    description = "An OCaml module implementing 128 bits universally unique identifiers version 3, 5 (name based with MD5, SHA-1 hashing) and 4 (random based) according to RFC 4122";
     homepage = http://erratique.ch/software/uuidm;
     license = licenses.bsd3;
     platforms = ocaml.meta.platforms;
diff --git a/pkgs/development/tools/backblaze-b2/default.nix b/pkgs/development/tools/backblaze-b2/default.nix
index 433aadebb6ce..3c7d69bc1b40 100644
--- a/pkgs/development/tools/backblaze-b2/default.nix
+++ b/pkgs/development/tools/backblaze-b2/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Command-line tool for accessing the Backblaze B2 storage service.";
+    description = "Command-line tool for accessing the Backblaze B2 storage service";
     homepage    = https://github.com/Backblaze/B2_Command_Line_Tool;
     license     = licenses.mit;
     maintainers = with maintainers; [ kevincox ];
diff --git a/pkgs/development/tools/build-managers/rebar3/default.nix b/pkgs/development/tools/build-managers/rebar3/default.nix
index 35a5b1b4d405..ac3a5ac9e402 100644
--- a/pkgs/development/tools/build-managers/rebar3/default.nix
+++ b/pkgs/development/tools/build-managers/rebar3/default.nix
@@ -120,7 +120,7 @@ stdenv.mkDerivation {
 
   meta = {
     homepage = "https://github.com/rebar/rebar3";
-    description = "rebar 3.0 is an Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases.";
+    description = "rebar 3.0 is an Erlang build tool that makes it easy to compile and test Erlang applications, port drivers and releases";
 
     longDescription = ''
       rebar is a self-contained Erlang script, so it's easy to distribute or
diff --git a/pkgs/development/tools/compass/default.nix b/pkgs/development/tools/compass/default.nix
index 2b0a5aaf90a0..9b21ec48c1c6 100644
--- a/pkgs/development/tools/compass/default.nix
+++ b/pkgs/development/tools/compass/default.nix
@@ -9,7 +9,7 @@ bundlerEnv {
   gemset = ./gemset.nix;
 
   meta = with lib; {
-    description = "Stylesheet Authoring Environment that makes your website design simpler to implement and easier to maintain.";
+    description = "Stylesheet Authoring Environment that makes your website design simpler to implement and easier to maintain";
     homepage    = https://github.com/Compass/compass;
     license     = with licenses; mit;
     maintainers = with maintainers; [ offline ];
diff --git a/pkgs/development/tools/dcadec/default.nix b/pkgs/development/tools/dcadec/default.nix
index ba2c13fbc3b2..439e224c4550 100644
--- a/pkgs/development/tools/dcadec/default.nix
+++ b/pkgs/development/tools/dcadec/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   installPhase = "make PREFIX=/ DESTDIR=$out install";
 
   meta = with stdenv.lib; {
-    description = "DTS Coherent Acoustics decoder with support for HD extensions.";
+    description = "DTS Coherent Acoustics decoder with support for HD extensions";
     maintainers = with maintainers; [ edwtjo ];
     homepage = http://github.com/foo86/dcadec;
     license = licenses.lgpl21;
diff --git a/pkgs/development/tools/omniorb/default.nix b/pkgs/development/tools/omniorb/default.nix
index 180e714b81e0..0fe4b191e503 100644
--- a/pkgs/development/tools/omniorb/default.nix
+++ b/pkgs/development/tools/omniorb/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ python ];
 
   meta = with stdenv.lib; {
-    description = "omniORB is a robust high performance CORBA ORB for C++ and Python. It is freely available under the terms of the GNU Lesser General Public License (for the libraries), and GNU General Public License (for the tools). omniORB is largely CORBA 2.6 compliant.";
+    description = "omniORB is a robust high performance CORBA ORB for C++ and Python. It is freely available under the terms of the GNU Lesser General Public License (for the libraries), and GNU General Public License (for the tools). omniORB is largely CORBA 2.6 compliant";
     homepage    = "http://omniorb.sourceforge.net/";
     license     = licenses.gpl2Plus;
     maintainers = with maintainers; [ smironov ];
diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix
index b08f977cda6b..c9517b22a33b 100644
--- a/pkgs/games/factorio/default.nix
+++ b/pkgs/games/factorio/default.nix
@@ -79,7 +79,7 @@ EOF
   '';
 
   meta = {
-    description = "A game in which you build and maintain factories.";
+    description = "A game in which you build and maintain factories";
     longDescription = ''
       Factorio is a game in which you build and maintain factories.
 
diff --git a/pkgs/games/lgogdownloader/default.nix b/pkgs/games/lgogdownloader/default.nix
index e4f802337be1..2f15f3245812 100644
--- a/pkgs/games/lgogdownloader/default.nix
+++ b/pkgs/games/lgogdownloader/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = https://github.com/Sude-/lgogdownloader;
-    description = "Unofficial downloader to GOG.com for Linux users. It uses the same API as the official GOGDownloader.";
+    description = "Unofficial downloader to GOG.com for Linux users. It uses the same API as the official GOGDownloader";
     license = stdenv.lib.licenses.wtfpl;
     platforms = stdenv.lib.platforms.linux;
   };
diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix
index fc5bfbb4b705..38597f8df070 100644
--- a/pkgs/games/pioneer/default.nix
+++ b/pkgs/games/pioneer/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Pioneer is a space adventure game set in the Milky Way galaxy at the turn of the 31st century.";
+    description = "Pioneer is a space adventure game set in the Milky Way galaxy at the turn of the 31st century";
     homepage = "http://pioneerspacesim.net";
     license = with licenses; [
         gpl3 cc-by-sa-30
diff --git a/pkgs/games/zandronum/bin.nix b/pkgs/games/zandronum/bin.nix
index ae6ab99dad29..6ac61571d4cb 100644
--- a/pkgs/games/zandronum/bin.nix
+++ b/pkgs/games/zandronum/bin.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://zandronum.com/;
-    description = "multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software. Binary version for online play.";
+    description = "multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software. Binary version for online play";
     maintainers = [ stdenv.lib.maintainers.lassulus ];
     # Binary version has different version string than source code version.
     license = stdenv.lib.licenses.unfreeRedistributable;
diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix
index 479a6abe9a47..27ba69ad82b0 100644
--- a/pkgs/games/zandronum/default.nix
+++ b/pkgs/games/zandronum/default.nix
@@ -53,7 +53,7 @@ in stdenv.mkDerivation {
 
   meta = with stdenv.lib; {
     homepage = http://zandronum.com/;
-    description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software.";
+    description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software";
     maintainers = with maintainers; [ lassulus ];
     platforms = platforms.linux;
     license = licenses.bsdOriginal;
diff --git a/pkgs/os-specific/linux/rtl8812au/default.nix b/pkgs/os-specific/linux/rtl8812au/default.nix
index a16e102bc088..6279deac60ab 100644
--- a/pkgs/os-specific/linux/rtl8812au/default.nix
+++ b/pkgs/os-specific/linux/rtl8812au/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   '';
    
   meta = {
-    description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod.";
+    description = "Driver for Realtek 802.11ac, rtl8812au, provides the 8812au mod";
     homepage = "https://github.com/csssuf/rtl8812au";
     license = stdenv.lib.licenses.gpl2;
     platforms = [ "x86_64-linux" "i686-linux" ];
diff --git a/pkgs/servers/certificate-transparency/default.nix b/pkgs/servers/certificate-transparency/default.nix
index 80fae89c76d8..292ca6bc0e37 100644
--- a/pkgs/servers/certificate-transparency/default.nix
+++ b/pkgs/servers/certificate-transparency/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://www.certificate-transparency.org/;
-    description = "Auditing for TLS certificates.";
+    description = "Auditing for TLS certificates";
     license = licenses.asl20;
     platforms = platforms.unix;
     maintainers = with maintainers; [ philandstuff ];
diff --git a/pkgs/servers/monitoring/longview/default.nix b/pkgs/servers/monitoring/longview/default.nix
index 3c08f48e4101..9436f4bf300f 100644
--- a/pkgs/servers/monitoring/longview/default.nix
+++ b/pkgs/servers/monitoring/longview/default.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = https://www.linode.com/longview;
-    description = "Longview collects all of your system-level metrics and sends them to Linode.";
+    description = "Longview collects all of your system-level metrics and sends them to Linode";
     license = licenses.gpl2Plus;
     maintainers = [ maintainers.rvl ];
     inherit version;
diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix
index 15d9d90f7cc3..12816702c8f5 100644
--- a/pkgs/servers/ums/default.nix
+++ b/pkgs/servers/ums/default.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-      description = "Universal Media Server: a DLNA-compliant UPnP Media Server.";
+      description = "Universal Media Server: a DLNA-compliant UPnP Media Server";
       license = stdenv.lib.licenses.gpl2;
       platforms = stdenv.lib.platforms.linux;
       maintainers = [ stdenv.lib.maintainers.thall ];
diff --git a/pkgs/tools/graphics/imgur-screenshot/default.nix b/pkgs/tools/graphics/imgur-screenshot/default.nix
index d1badc735095..777139d47fee 100644
--- a/pkgs/tools/graphics/imgur-screenshot/default.nix
+++ b/pkgs/tools/graphics/imgur-screenshot/default.nix
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "A tool for easy screencapping and uploading to imgur.";
+    description = "A tool for easy screencapping and uploading to imgur";
     homepage = "https://https://github.com/jomo/imgur-screenshot/";
     platforms = platforms.linux;
     license = licenses.mit;
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
index ffffeefa9b60..a5732f2a88bd 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     isIbusEngine = true;
-    description  = "Ibus Hangul engine.";
+    description  = "Ibus Hangul engine";
     homepage     = https://github.com/choehwanjin/ibus-hangul;
     license      = licenses.gpl2;
     platforms    = platforms.linux;
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
index 30329c4306f2..c6c43d058982 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     isIbusEngine = true;
-    description  = "m17n engine for ibus.";
+    description  = "m17n engine for ibus";
     homepage     = https://github.com.com/ibus/ibus-m17n;
     license      = licenses.gpl2;
     platforms    = platforms.linux;
diff --git a/pkgs/tools/misc/entr/default.nix b/pkgs/tools/misc/entr/default.nix
index 8770a5858875..7097ecfae747 100644
--- a/pkgs/tools/misc/entr/default.nix
+++ b/pkgs/tools/misc/entr/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://entrproject.org/;
-    description = "Run arbitrary commands when files change.";
+    description = "Run arbitrary commands when files change";
 
     license = stdenv.lib.licenses.isc;
 
diff --git a/pkgs/tools/misc/homesick/default.nix b/pkgs/tools/misc/homesick/default.nix
index 9ea54f1f0b32..da167026ade5 100644
--- a/pkgs/tools/misc/homesick/default.nix
+++ b/pkgs/tools/misc/homesick/default.nix
@@ -13,7 +13,7 @@ bundlerEnv {
   '';
 
   meta = with lib; {
-    description = "Your home directory is your castle. Don't leave your dotfiles behind.";
+    description = "Your home directory is your castle. Don't leave your dotfiles behind";
     long_description =
       ''
         Homesick is sorta like rip, but for dotfiles. It uses git to clone a repository containing
diff --git a/pkgs/tools/misc/logstash/default.nix b/pkgs/tools/misc/logstash/default.nix
index 15bb44a0e479..289d57f88c06 100644
--- a/pkgs/tools/misc/logstash/default.nix
+++ b/pkgs/tools/misc/logstash/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems.";
+    description = "Logstash is a data pipeline that helps you process logs and other event data from a variety of systems";
     homepage    = https://www.elastic.co/products/logstash;
     license     = licenses.asl20;
     platforms   = platforms.unix;
diff --git a/pkgs/tools/networking/driftnet/default.nix b/pkgs/tools/networking/driftnet/default.nix
index 6666612419d9..7c8a30971f72 100644
--- a/pkgs/tools/networking/driftnet/default.nix
+++ b/pkgs/tools/networking/driftnet/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   };
 
   meta = {
-    description = "Driftnet watches network traffic, and picks out and displays JPEG and GIF images for display.";
+    description = "Driftnet watches network traffic, and picks out and displays JPEG and GIF images for display";
     homepage = https://github.com/deiv/driftnet;
     maintainers = with maintainers; [ offline ];
     platforms = platforms.linux;
diff --git a/pkgs/tools/security/pamtester/default.nix b/pkgs/tools/security/pamtester/default.nix
index cdafed534085..21f58ef517ee 100644
--- a/pkgs/tools/security/pamtester/default.nix
+++ b/pkgs/tools/security/pamtester/default.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ pam ];
 
   meta = with stdenv.lib; {
-    description = "Utility program to test the PAM facility.";
+    description = "Utility program to test the PAM facility";
     homepage = http://pamtester.sourceforge.net/;
     license = licenses.bsd3;
     platforms = platforms.linux;
diff --git a/pkgs/tools/text/popfile/default.nix b/pkgs/tools/text/popfile/default.nix
index 3310c1a2fe4a..4048093a3958 100644
--- a/pkgs/tools/text/popfile/default.nix
+++ b/pkgs/tools/text/popfile/default.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "An email classification system that automatically sorts messages and fights spam.";
+    description = "An email classification system that automatically sorts messages and fights spam";
     homepage = http://getpopfile.org;
     license = stdenv.lib.licenses.gpl2;
 
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index a775630410b8..ea1840aefed7 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -395,7 +395,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
   #   outputFiles = [ "build/*" ];
   #
   #   meta = {
-  #     description = "FSharpx.Extras is a collection of libraries and tools for use with F#.";
+  #     description = "FSharpx.Extras is a collection of libraries and tools for use with F#";
   #     homepage = "http://fsprojects.github.io/FSharpx.Extras/";
   #     license = stdenv.lib.licenses.asl20;
   #     maintainers = with stdenv.lib.maintainers; [ obadz ];
@@ -419,7 +419,7 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; {
     outputFiles = [ "out/lib/Net40/*" "src/FSharp/MathNet.Numerics.fsx" "src/FSharp/MathNet.Numerics.IfSharp.fsx" ];
 
     meta = {
-      description = "Math.NET Numerics is an opensource numerical library for .Net, Silverlight and Mono.";
+      description = "Math.NET Numerics is an opensource numerical library for .Net, Silverlight and Mono";
       homepage = http://numerics.mathdotnet.com/;
       license = stdenv.lib.licenses.mit;
       maintainers = with stdenv.lib.maintainers; [ obadz ];
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index ea4a2d4a4291..49a4c6ffb1e0 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -408,7 +408,7 @@ let
     packageRequires = [ dash ];
     files = [ "dash-functional.el" ];
     meta = {
-      description = "Collection of useful combinators for Emacs Lisp.";
+      description = "Collection of useful combinators for Emacs Lisp";
       license = gpl3Plus;
     };
   };
@@ -1525,7 +1525,7 @@ let
     };
     packageRequires = [ dash ];
     meta = {
-      description = "Hiding and/or highlighting the list of minor modes in the Emacs mode-line.";
+      description = "Hiding and/or highlighting the list of minor modes in the Emacs mode-line";
       license = gpl3Plus;
     };
   };
@@ -1541,7 +1541,7 @@ let
       sha256 = "1wvjisi26lb4g5rjq80kq9jmf1r2m3isy47nwrnahfzxk886qfbq";
       };
     meta = {
-      description = "A major mode for editing rust code.";
+      description = "A major mode for editing rust code";
       license = asl20;
     };
   };
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 7d4c2d6331a9..ddf18dd3b8ff 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -818,7 +818,7 @@ let
 
     meta = with stdenv.lib; {
       homepage    = "https://github.com/martingallagher/gawp";
-      description = "A simple, configurable, file watching, job execution tool implemented in Go.";
+      description = "A simple, configurable, file watching, job execution tool implemented in Go";
       maintainers = with maintainers; [ kamilchm ];
       license     = licenses.asl20 ;
       platforms   = platforms.all;
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index b03290cf8e9e..6c1c23f34540 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6900,7 +6900,7 @@ let self = _self // overrides; _self = with self; {
     };
     propagatedBuildInputs = [ IOLockedFile ];
     meta = {
-      description = "Helps us create simple logs for our application.";
+      description = "Helps us create simple logs for our application";
       license = "perl";
     };
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d9b111a535ce..19c4ce2baabe 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1213,7 +1213,7 @@ in modules // {
 
     meta = {
       homepage = https://github.com/awslabs/aws-shell;
-      description = "An integrated shell for working with the AWS CLI.";
+      description = "An integrated shell for working with the AWS CLI";
       license = licenses.asl20;
       maintainers = [ ];
     };
@@ -3838,7 +3838,7 @@ in modules // {
     meta = {
       homepage = https://pypi.python.org/pypi/pkginfo;
       license = licenses.mit;
-      description = "Query metadatdata from sdists / bdists / installed packages.";
+      description = "Query metadatdata from sdists / bdists / installed packages";
 
       longDescription = ''
         This package provides an API for querying the distutils metadata
@@ -3970,7 +3970,7 @@ in modules // {
     propagatedBuildInputs = with self; [ pyparsing decorator six ];
 
     meta = {
-      description = "Allows to declare constraints on function parameters and return values.";
+      description = "Allows to declare constraints on function parameters and return values";
       homepage = https://pypi.python.org/pypi/PyContracts;
       license = licenses.lgpl2;
     };
@@ -5520,7 +5520,7 @@ in modules // {
     '';
 
     meta = {
-      description = "Command-line tool for interacting with Google Compute Engine.";
+      description = "Command-line tool for interacting with Google Compute Engine";
       homepage = "https://cloud.google.com/compute/docs/gcutil/";
       license = licenses.asl20;
       maintainers = with maintainers; [ phreedom ];
@@ -5784,7 +5784,7 @@ in modules // {
     ];
 
     meta = {
-      description = "A python client library for Google Play Services OAuth.";
+      description = "A python client library for Google Play Services OAuth";
       homepage = "https://github.com/simon-weber/gpsoauth";
       license = licenses.mit;
       maintainers = with maintainers; [ jgillich ];
@@ -6891,7 +6891,7 @@ in modules // {
 
     meta = {
       homepage = https://launchpad.net/pypolicyd-spf/;
-      description = "Postfix policy engine for Sender Policy Framework (SPF) checking.";
+      description = "Postfix policy engine for Sender Policy Framework (SPF) checking";
       maintainers = with maintainers; [ abbradar ];
       license = licenses.asl20;
       platform = platforms.all;
@@ -8241,7 +8241,7 @@ in modules // {
     propagatedBuildInputs = with self; [ django_1_6 futures ];
 
     meta = with stdenv.lib; {
-      description = "Pipeline is an asset packaging library for Django.";
+      description = "Pipeline is an asset packaging library for Django";
       homepage = https://github.com/cyberdelia/django-pipeline;
       license = stdenv.lib.licenses.mit;
     };
@@ -8305,7 +8305,7 @@ in modules // {
     doCheck = false;
 
     meta = with stdenv.lib; {
-      description = "An HTTP handler for `urllib2` that supports HTTP 1.1 and keepalive.";
+      description = "An HTTP handler for `urllib2` that supports HTTP 1.1 and keepalive";
       homepage = "https://github.com/wikier/keepalive";
     };
   };
@@ -8330,7 +8330,7 @@ in modules // {
     ];
 
     meta = with stdenv.lib; {
-      description = "This is a wrapper around a SPARQL service. It helps in creating the query URI and, possibly, convert the result into a more manageable format.";
+      description = "This is a wrapper around a SPARQL service. It helps in creating the query URI and, possibly, convert the result into a more manageable format";
       homepage = "http://rdflib.github.io/sparqlwrapper";
     };
   };
@@ -10223,7 +10223,7 @@ in modules // {
     };
 
     meta = {
-      description = "An intelligent grader that allows secured and automated testing of code made by students.";
+      description = "An intelligent grader that allows secured and automated testing of code made by students";
       homepage = "https://github.com/UCL-INGI/INGInious";
       license = licenses.agpl3;
       maintainers = with maintainers; [ layus ];
@@ -13241,7 +13241,7 @@ in modules // {
     };
 
     meta = {
-      description = "A drop-in substitute for Py2.7's new collections.OrderedDict that works in Python 2.4-2.6.";
+      description = "A drop-in substitute for Py2.7's new collections.OrderedDict that works in Python 2.4-2.6";
       license = licenses.bsd3;
       maintainers = with maintainers; [ garbas ];
     };
@@ -13715,7 +13715,7 @@ in modules // {
     ];
 
     meta = with stdenv.lib; {
-      description = "Enhancements for standard library's cmd module.";
+      description = "Enhancements for standard library's cmd module";
       homepage = "http://packages.python.org/cmd2/";
     };
   };
@@ -14211,7 +14211,7 @@ in modules // {
     '';
 
     meta = with stdenv.lib; {
-      description = "FormEncode validates and converts nested structures.";
+      description = "FormEncode validates and converts nested structures";
       homepage = "http://formencode.org";
     };
   };
@@ -16303,7 +16303,7 @@ in modules // {
     buildInputs = with self; [ nose mock ];
 
     meta = {
-      description = "A clean, future-proof, high-scale API to elasticsearch.";
+      description = "A clean, future-proof, high-scale API to elasticsearch";
       homepage = https://pyelasticsearch.readthedocs.org;
       license = licenses.bsd3;
     };
@@ -17268,7 +17268,7 @@ in modules // {
       sha256 = "1r50lm6n59jzdwpp53n0c0hp3aj1jxn304bk5gh830226gsaf2hn";
     };
     meta = {
-      description = "Test classes and test cases using decorators, execute test cases by command line, and get clear reports.";
+      description = "Test classes and test cases using decorators, execute test cases by command line, and get clear reports";
       homepage = https://pypi.python.org/pypi/ptest;
       license = licenses.asl20;
     };
@@ -19257,7 +19257,7 @@ in modules // {
     buildInputs = with self; [pep8];
 
     meta = {
-      description = "A generator library for concise, unambiguous and URL-safe UUIDs.";
+      description = "A generator library for concise, unambiguous and URL-safe UUIDs";
       homepage = https://github.com/stochastic-technologies/shortuuid/;
       license = licenses.bsd3;
       maintainers = with maintainers; [ zagy ];
@@ -20527,7 +20527,7 @@ in modules // {
     propagatedBuildInputs = with self; [ pyparsing ];
 
     meta = {
-      description = "A Python library to create SVG drawings.";
+      description = "A Python library to create SVG drawings";
       homepage = http://bitbucket.org/mozman/svgwrite;
       license = licenses.mit;
     };
@@ -21511,7 +21511,7 @@ in modules // {
     doCheck = false;
 
     meta = {
-      description = "A backport of traceback to older supported Pythons.";
+      description = "A backport of traceback to older supported Pythons";
       homepage = https://pypi.python.org/pypi/traceback2/;
     };
   };
@@ -21530,7 +21530,7 @@ in modules // {
     doCheck = false;
 
     meta = with stdenv.lib; {
-      description = "A backport of linecache to older supported Pythons.";
+      description = "A backport of linecache to older supported Pythons";
       homepage = "https://github.com/testing-cabal/linecache2";
     };
   };
@@ -25006,7 +25006,7 @@ in modules // {
     LC_ALL="en_US.UTF-8";
 
     meta = {
-      description = "Copy your docs directly to the gh-pages branch.";
+      description = "Copy your docs directly to the gh-pages branch";
       homepage = "http://github.com/davisp/ghp-import";
       license = "Tumbolia Public License";
       maintainers = with maintainers; [ garbas ];
@@ -25096,7 +25096,7 @@ in modules // {
     ];
 
     meta = {
-      description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git.";
+      description = "Jenkins Job Builder is a system for configuring Jenkins jobs using simple YAML files stored in Git";
       homepage = "http://docs.openstack.org/infra/system-config/jjb.html";
       license = licenses.asl20;
       maintainers = with maintainers; [ garbas ];

From 6ea526462b1a1adf9ab49e81739287435be19070 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sat, 27 Feb 2016 17:33:17 +0000
Subject: [PATCH 1903/2285] splix: cleanup

* remove commented code
* remove unused patch
* fix package naming
---
 pkgs/misc/cups/drivers/splix/default.nix      | 21 +++++--------------
 .../drivers/splix/splix-2.0.0-gcc45.patch     | 18 ----------------
 2 files changed, 5 insertions(+), 34 deletions(-)
 delete mode 100644 pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch

diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix
index 8c58d41f0fa3..ab6bcfba6a1d 100644
--- a/pkgs/misc/cups/drivers/splix/default.nix
+++ b/pkgs/misc/cups/drivers/splix/default.nix
@@ -1,13 +1,12 @@
 { stdenv, fetchsvn, fetchurl, cups, zlib }:
-let rev = "r315"; in
-stdenv.mkDerivation (rec {
+let rev = "315"; in
+stdenv.mkDerivation rec {
   name = "splix-svn-${rev}";
   src = fetchsvn {
     # We build this from svn, because splix hasn't been in released in several years
-    # although the community has been adding some new printer models
-    # if you are having problems, please try the stable version below and report back
+    # although the community has been adding some new printer models.
     url = "svn://svn.code.sf.net/p/splix/code/splix";
-    inherit rev;
+    rev = "r${rev}";
     sha256 = "16wbm4xnz35ca3mw2iggf5f4jaxpyna718ia190ka6y4ah932jxl";
   };
 
@@ -22,14 +21,4 @@ stdenv.mkDerivation (rec {
     platforms = stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.simons ];
   };
-
-} /* // { # uncomment to build the stable version
-
-  name = "splix-2.0.0";
-  patches = [ ./splix-2.0.0-gcc45.patch ];
-  src = fetchurl {
-    url = "mirror://sourceforge/splix/${name}.tar.bz2";
-    sha256 = "0bwivrwwvh6hzvnycpzqs7a0capgycahc4s3v9ihx552fgy07xwp";
-  };  
-
-} */)
+}
diff --git a/pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch b/pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch
deleted file mode 100644
index 5ccdcb2514c5..000000000000
--- a/pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Fixing build with gcc 4.5
-
-http://bugs.gentoo.org/show_bug.cgi?id=318581
-
-downloaded from
-http://gentoo-overlays.zugaina.org/gentoo/portage/net-print/splix/files/splix-2.0.0-gcc45.patch
-
---- splix-old/src/ppdfile.cpp
-+++ splix-new/src/ppdfile.cpp
-@@ -282,7 +282,7 @@
-  * Opérateur d'assignation
-  * Assignment operator
-  */
--void PPDFile::Value::operator = (const PPDFile::Value::Value &val)
-+void PPDFile::Value::operator = (const PPDFile::Value &val)
- {
-     if (_preformatted)
-         delete[] _preformatted;

From 58f0071a9ea0977cf42b2d85629b4da12c7d0d99 Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 27 Feb 2016 19:56:18 +0200
Subject: [PATCH 1904/2285] renoise: Don't use builtins.currentSystem

stdenv.system should be almost always used instead of builtins.currentSystem
or cross-evaluation (e.g. evaluating a i686 NixOS system on a 64-bit nix)
will be subtly broken.
---
 pkgs/applications/audio/renoise/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/renoise/default.nix b/pkgs/applications/audio/renoise/default.nix
index f98f7862475f..39c0d579e814 100644
--- a/pkgs/applications/audio/renoise/default.nix
+++ b/pkgs/applications/audio/renoise/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ libX11 libXext libXcursor libXrandr alsaLib libjack2 ];
 
   src =
-    if builtins.currentSystem == "x86_64-linux" then
+    if stdenv.system == "x86_64-linux" then
         if demo then
         fetchurl {
             url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86_64.tar.bz2";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
             name = "rns_3_0_1_linux_x86_64.tar.gz";
             sha256 = "1yb5w5jrg9dk9fg5rfvfk6p0rxn4r4i32vxp2l9lzhbs02pv15wd";
         }
-    else if builtins.currentSystem == "i686-linux" then
+    else if stdenv.system == "i686-linux" then
         if demo then
         fetchurl {
             url = "http://files.renoise.com/demo/Renoise_3_0_1_Demo_x86.tar.bz2";

From 88d1564985f342399537e57338f661de4a130156 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 27 Feb 2016 19:09:19 +0100
Subject: [PATCH 1905/2285] socat: 1.7.3.0 -> 1.7.3.1 (CVE-2016-2217)

https://lwn.net/Vulnerabilities/674840/

http://www.dest-unreach.org/socat/contrib/socat-secadv7.html
http://www.dest-unreach.org/socat/contrib/socat-secadv8.html
---
 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 c672801262be..f57af20739d6 100644
--- a/pkgs/tools/networking/socat/default.nix
+++ b/pkgs/tools/networking/socat/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "socat-1.7.3.0";
+  name = "socat-1.7.3.1";
 
   src = fetchurl {
     url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2";
-    sha256 = "011ydc0x8camplf8l6mshs3v5fswarld8v0wf7grz6rjq18fhrq7";
+    sha256 = "1apvi7sahcl44arnq1ad2y6lbfqnmvx7nhz9i3rkk0f382anbnnj";
   };
 
   buildInputs = [ openssl ];

From 0a9076b5f8f7ddea0a090a09315d7697c6bd9b28 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 27 Feb 2016 19:10:06 +0100
Subject: [PATCH 1906/2285] socat: 2.0.0-b8 -> 2.0.0-b9 (CVE-2016-2217)

https://lwn.net/Vulnerabilities/674840/

http://www.dest-unreach.org/socat/contrib/socat-secadv7.html
http://www.dest-unreach.org/socat/contrib/socat-secadv8.html
---
 pkgs/tools/networking/socat/2.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/socat/2.x.nix b/pkgs/tools/networking/socat/2.x.nix
index a1cea0348367..1f25e002159f 100644
--- a/pkgs/tools/networking/socat/2.x.nix
+++ b/pkgs/tools/networking/socat/2.x.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, openssl }:
 
 stdenv.mkDerivation rec {
-  name = "socat-2.0.0-b8";
+  name = "socat-2.0.0-b9";
 
   src = fetchurl {
     url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2";
-    sha256 = "1slkv1hhcp9a6c88h6yl5cs0z9g60fp2ja6865s6kywqp6fmf168";
+    sha256 = "1ll395xjv4byvv0k2zjbxk8vp3mg3y2w5paa05wv553bqsjv1vs9";
   };
 
   buildInputs = [ openssl ];

From 6f8db5b12ee721e921cd8791773b3b1806a9fe57 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sat, 27 Feb 2016 20:26:20 +0100
Subject: [PATCH 1907/2285] ardour: 4.4-> 4.7

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

diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix
index f44f1a2b78a0..3d44dd872c78 100644
--- a/pkgs/applications/audio/ardour/default.nix
+++ b/pkgs/applications/audio/ardour/default.nix
@@ -15,7 +15,7 @@ let
   # "git describe" when _not_ on an annotated tag(!): MAJOR.MINOR-REV-HASH.
 
   # Version to build.
-  tag = "4.4";
+  tag = "4.7";
 
 in
 
@@ -25,8 +25,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Ardour";
     repo = "ardour";
-    rev = "b00d75adf63db155ef2873bd9d259dc8ca256be6";
-    sha256 = "1gnrcnq2ksnh7fsa301v1c4p5dqrbqpjylf02rg3za3ab58wxi7l";
+    rev = "d84a8222f2b6dab5028b2586f798535a8766670e";
+    sha256 = "149gswphz77m3pkzsn2nqbm6yvcfa3fva560bcvjzlgb73f64q5l";
   };
 
   buildInputs =
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     ];
 
   # ardour's wscript has a "tarball" target but that required the git revision
-  # be available. Since this is an unzipped tarball fetched from github we 
+  # be available. Since this is an unzipped tarball fetched from github we
   # have to do that ourself.
   patchPhase = ''
     printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = \"${tag}-${builtins.substring 0 8 src.rev}\"; }\n' > libs/ardour/revision.cc

From e6f61b4cf33887a9231a12e8c766404139a277d8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 27 Feb 2016 20:27:24 +0100
Subject: [PATCH 1908/2285] fetchurlBoot: Use Nix's builtin fetchurl function

This removes the need for curl in bootstrapTools, and enables https
for bootstrap tarballs.
---
 pkgs/build-support/fetchurl/boot.nix       | 20 ++++++++++++++++++++
 pkgs/stdenv/linux/default.nix              |  7 +++----
 pkgs/stdenv/linux/make-bootstrap-tools.nix |  9 ---------
 3 files changed, 23 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/build-support/fetchurl/boot.nix

diff --git a/pkgs/build-support/fetchurl/boot.nix b/pkgs/build-support/fetchurl/boot.nix
new file mode 100644
index 000000000000..c007281e87b0
--- /dev/null
+++ b/pkgs/build-support/fetchurl/boot.nix
@@ -0,0 +1,20 @@
+let mirrors = import ./mirrors.nix; in
+
+{ system }:
+
+{ url ? builtins.head urls
+, urls ? []
+, sha256
+}:
+
+import <nix/fetchurl.nix> {
+  inherit system sha256;
+
+  url =
+    # Handle mirror:// URIs. Since <nix/fetchurl.nix> currently
+    # supports only one URI, use the first listed mirror.
+    let m = builtins.match "mirror://([a-z]+)/(.*)" url; in
+    if m == null then url
+    else builtins.head (mirrors.${builtins.elemAt m 0}) + (builtins.elemAt m 1);
+
+}
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix
index cd49d4a5a742..965188a0cdd8 100644
--- a/pkgs/stdenv/linux/default.nix
+++ b/pkgs/stdenv/linux/default.nix
@@ -80,9 +80,9 @@ rec {
           '';
         shell = "${bootstrapTools}/bin/bash";
         initialPath = [bootstrapTools];
-        fetchurlBoot = import ../../build-support/fetchurl {
-          stdenv = stage0.stdenv;
-          curl = bootstrapTools;
+
+        fetchurlBoot = import ../../build-support/fetchurl/boot.nix {
+          inherit system;
         };
 
         cc = if isNull gccPlain
@@ -333,7 +333,6 @@ rec {
       awk --version
       grep --version
       gcc --version
-      curl --version
 
       ldlinux=$(echo ${bootstrapTools}/lib/ld-linux*.so.?)
       export CPP="cpp -idirafter ${bootstrapTools}/include-glibc -B${bootstrapTools}"
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index 7f7f4c6a2bd1..ef651f643684 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -10,13 +10,6 @@ rec {
     aclSupport = false;
   });
 
-  curlMinimal = curl.override {
-    http2Support = false;
-    zlibSupport = false;
-    sslSupport = false;
-    scpSupport = false;
-  };
-
   busyboxMinimal = busybox.override {
     useMusl = true;
     enableStatic = true;
@@ -84,8 +77,6 @@ rec {
         cp -d ${gnumake}/bin/* $out/bin
         cp -d ${patch}/bin/* $out/bin
         cp ${patchelf}/bin/* $out/bin
-        cp ${curlMinimal}/bin/curl $out/bin
-        cp -d ${curlMinimal}/lib/libcurl* $out/lib
 
         cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep
 

From 4deefc15ef943d257ef322882680e09dcc7a1ca7 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sat, 27 Feb 2016 20:29:44 +0100
Subject: [PATCH 1909/2285] yoshimi: 1.3.7.1 -> 1.3.8.2

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

diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix
index 5d60824c3b0d..9cc7f3f1fc85 100644
--- a/pkgs/applications/audio/yoshimi/default.nix
+++ b/pkgs/applications/audio/yoshimi/default.nix
@@ -1,20 +1,20 @@
 { stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk
-, libjack2, libsndfile, readline, lv2, mesa, minixml, pkgconfig, zlib, xorg
+, libjack2, libsndfile, libXdmcp, readline, lv2, mesa, minixml, pkgconfig, zlib, xorg
 }:
 
 assert stdenv ? glibc;
 
 stdenv.mkDerivation  rec {
   name = "yoshimi-${version}";
-  version = "1.3.7.1";
+  version = "1.3.8.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/yoshimi/${name}.tar.bz2";
-    sha256 = "13xc1x8jrr2rn26jx4dini692ww3771d5j5xf7f56ixqr7mmdhvz";
+    sha256 = "0wl4ln6v1nkkx56kfah23chyrhga2vi93i82g0s200c4s4184xr8";
   };
 
   buildInputs = [
-    alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile readline lv2 mesa
+    alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 mesa
     minixml zlib xorg.libpthreadstubs
   ];
 

From d4636fa2548a1980b3541dd386b6977c56218964 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 27 Feb 2016 20:42:55 +0100
Subject: [PATCH 1910/2285] Revert "Add a way to pin a NixOS version within the
 module system."

This reverts commit a5992ad61b314104aff7e28a41ce101a1b0e7c35. Motivation:

https://github.com/NixOS/nixpkgs/commit/a5992ad61b314104aff7e28a41ce101a1b0e7c35#commitcomment-14986820
---
 nixos/default.nix                             | 16 +---
 .../manual/configuration/configuration.xml    |  1 -
 nixos/doc/manual/default.nix                  |  1 -
 .../doc/manual/release-notes/rl-unstable.xml  | 13 ---
 nixos/modules/misc/nixos.nix                  | 82 ------------------
 nixos/modules/misc/nixos.xml                  | 84 -------------------
 nixos/modules/module-list.nix                 |  1 -
 nixos/release.nix                             |  1 -
 nixos/tests/nixos-pin-version.nix             | 57 -------------
 9 files changed, 4 insertions(+), 252 deletions(-)
 delete mode 100644 nixos/modules/misc/nixos.nix
 delete mode 100644 nixos/modules/misc/nixos.xml
 delete mode 100644 nixos/tests/nixos-pin-version.nix

diff --git a/nixos/default.nix b/nixos/default.nix
index 6359d10c8805..5d69b79e13a6 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -1,20 +1,12 @@
 { configuration ? import ./lib/from-env.nix "NIXOS_CONFIG" <nixos-config>
 , system ? builtins.currentSystem
-, extraModules ? []
-  # This attribute is used to specify a different nixos version, a different
-  # system or additional modules which might be set conditionally.
-, reEnter ? false
 }:
 
 let
-  reEnterModule = {
-    config.nixos.path = with (import ../lib); mkIf reEnter (mkForce null);
-    config.nixos.configuration = configuration;
-  };
 
   eval = import ./lib/eval-config.nix {
     inherit system;
-    modules = [ configuration reEnterModule ] ++ extraModules;
+    modules = [ configuration ];
   };
 
   inherit (eval) pkgs;
@@ -22,14 +14,14 @@ let
   # This is for `nixos-rebuild build-vm'.
   vmConfig = (import ./lib/eval-config.nix {
     inherit system;
-    modules = [ configuration reEnterModule ./modules/virtualisation/qemu-vm.nix ] ++ extraModules;
+    modules = [ configuration ./modules/virtualisation/qemu-vm.nix ];
   }).config;
 
   # This is for `nixos-rebuild build-vm-with-bootloader'.
   vmWithBootLoaderConfig = (import ./lib/eval-config.nix {
     inherit system;
     modules =
-      [ configuration reEnterModule
+      [ configuration
         ./modules/virtualisation/qemu-vm.nix
         { virtualisation.useBootLoader = true; }
       ];
@@ -38,7 +30,7 @@ let
 in
 
 {
-  inherit (eval.config.nixos.reflect) config options;
+  inherit (eval) config options;
 
   system = eval.config.system.build.toplevel;
 
diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml
index ff00c4feb31a..caba8fb1f4ad 100644
--- a/nixos/doc/manual/configuration/configuration.xml
+++ b/nixos/doc/manual/configuration/configuration.xml
@@ -28,7 +28,6 @@ effect after you run <command>nixos-rebuild</command>.</para>
 <xi:include href="postgresql.xml" />
 <xi:include href="gitlab.xml" />
 <xi:include href="acme.xml" />
-<xi:include href="nixos.xml" />
 
 <!-- Apache; libvirtd virtualisation -->
 
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 4eda7f94ab4a..4ce6ea1c1118 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -58,7 +58,6 @@ let
       cp ${../../modules/services/databases/postgresql.xml} configuration/postgresql.xml
       cp ${../../modules/services/misc/gitlab.xml} configuration/gitlab.xml
       cp ${../../modules/security/acme.xml} configuration/acme.xml
-      cp ${../../modules/misc/nixos.xml} configuration/nixos.xml
       ln -s ${optionsDocBook} options-db.xml
       echo "${version}" > version
     '';
diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index 5bad7f63b61e..ddbd80a8a00d 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -11,19 +11,6 @@ has the following highlights:</para>
 
 <itemizedlist>
 
-  <listitem>
-    <para>You can now pin a specific version of NixOS in your <filename>configuration.nix</filename>
-    by setting:
-
-<programlisting>
-nixos.path = ./nixpkgs-unstable-2015-12-06/nixos;
-</programlisting>
-
-    This will make NixOS re-evaluate your configuration with the modules of
-    the specified NixOS version at the given path.  For more details, see
-    <xref linkend="module-misc-nixos" /></para>
-  </listitem>
-
   <listitem>
     <para>Firefox and similar browsers are now <emphasis>wrapped by default</emphasis>.
     The package and attribute names are plain <literal>firefox</literal>
diff --git a/nixos/modules/misc/nixos.nix b/nixos/modules/misc/nixos.nix
deleted file mode 100644
index 84365b640a48..000000000000
--- a/nixos/modules/misc/nixos.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{ config, options, lib, ... }:
-
-# This modules is used to inject a different NixOS version as well as its
-# argument such that one can pin a specific version with the versionning
-# system of the configuration.
-let
-  nixosReentry = import config.nixos.path {
-    inherit (config.nixos) configuration extraModules;
-    inherit (config.nixpkgs) system;
-    reEnter = true;
-  };
-in
-
-with lib;
-
-{
-  options = {
-    nixos.path = mkOption {
-      default = null;
-      example = literalExample "./nixpkgs-15.09/nixos";
-      type = types.nullOr types.path;
-      description = ''
-        This option give the ability to evaluate the current set of modules
-        with a different version of NixOS. This option can be used version
-        the version of NixOS with the configuration without relying on the
-        <literal>NIX_PATH</literal> environment variable.
-      '';
-    };
-
-    nixos.system = mkOption {
-      example = "i686-linux";
-      type = types.uniq types.str;
-      description = ''
-        Name of the system used to compile NixOS.
-      '';
-    };
-
-    nixos.extraModules = mkOption {
-      default = [];
-      example = literalExample "[ ./sshd-config.nix ]";
-      type = types.listOf (types.either (types.submodule ({...}:{options={};})) types.path);
-      description = ''
-        Define additional modules which would be loaded to evaluate the
-        configuration.
-      '';
-    };
-
-    nixos.configuration = mkOption {
-      type = types.unspecified;
-      internal = true;
-      description = ''
-        Option used by <filename>nixos/default.nix</filename> to re-inject
-        the same configuration module as the one used for the current
-        execution.
-      '';
-    };
-
-    nixos.reflect = mkOption {
-      default = { inherit config options; };
-      type = types.unspecified;
-      internal = true;
-      description = ''
-        Provides <literal>config</literal> and <literal>options</literal>
-        computed by the module system and given as argument to all
-        modules. These are used for introspection of options and
-        configuration by tools such as <literal>nixos-option</literal>.
-      '';
-    };
-  };
-
-  config = mkMerge [
-    (mkIf (config.nixos.path != null) (mkForce {
-      system.build.toplevel = nixosReentry.system;
-      system.build.vm = nixosReentry.vm;
-      nixos.reflect = { inherit (nixosReentry) config options; };
-    }))
-
-    { meta.maintainers = singleton lib.maintainers.pierron;
-      meta.doc = ./nixos.xml;
-    }
-  ];
-}
diff --git a/nixos/modules/misc/nixos.xml b/nixos/modules/misc/nixos.xml
deleted file mode 100644
index 064bdd80b3c9..000000000000
--- a/nixos/modules/misc/nixos.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xmlns:xi="http://www.w3.org/2001/XInclude"
-         version="5.0"
-         xml:id="module-misc-nixos">
-
-<title>NixOS Reentry</title>
-
-<!-- FIXME: render nicely -->
-
-<!-- FIXME: source can be added automatically -->
-<para><emphasis>Source:</emphasis> <filename>modules/misc/nixos.nix</filename></para>
-
-<!-- FIXME: more stuff, like maintainer? -->
-
-<para>NixOS reentry can be used for both pinning the evaluation to a
-specific version of NixOS, and to dynamically add additional modules into
-the Module evaluation.</para>
-
-<section><title>NixOS Version Pinning</title>
-
-<para>To pin a specific version of NixOS, you need a version that you can
-either clone localy, or that you can fetch remotely.</para>
-
-<para>If you already have a cloned version of NixOS in the directory
-<filename>/etc/nixos/nixpkgs-16-03</filename>, then you can specify the
-<option>nixos.path</option> with either the path or the relative path of
-your NixOS clone. For example, you can add the following to your
-<filename>/etc/nixos/configuration.nix</filename> file:
-
-<programlisting>
-nixos.path = ./nixpkgs-16-03/nixos;
-</programlisting>
-</para>
-
-<para>Another option is to fetch a specific version of NixOS, with either
-the <literal>fetchTarball</literal> builtin, or the
-<literal>pkgs.fetchFromGitHub</literal> function and use the result as an
-input.
-
-<programlisting>
-nixos.path = "${builtins.fetchTarball https://github.com/NixOS/nixpkgs/archive/1f27976e03c15183191d1b4aa1a40d1f14666cd2.tar.gz}/nixos";
-</programlisting>
-</para>
-
-</section>
-
-
-<section><title>Adding Module Dynamically</title>
-
-<para>To add additional module, the recommended way is to use statically
-known modules in the list of imported arguments as described in <xref
-linkend="sec-modularity" />.  Unfortunately, this recommended method has
-limitation, such that the list of imported files cannot be selected based on
-the content of the configuration.
-
-Fortunately, NixOS reentry system can be used as an alternative to register
-new imported modules based on the content of the configuration. To do so,
-one should define both <option>nixos.path</option> and
-<option>nixos.extraModules</option> options.
-
-<programlisting>
-nixos.path = &lt;nixos&gt;;
-nixos.extraModules =
-  if config.networking.hostName == "server" then
-    [ ./server.nix ] else [ ./client.nix ];
-</programlisting>
-
-Also note, that the above can be reimplemented in a different way which is
-not as expensive, by using <literal>mkIf</literal> at the top each
-configuration if both modules are present on the file system (see <xref
-linkend="sec-option-definitions" />) and by always inmporting both
-modules.</para>
-
-</section>
-
-<section><title>Options</title>
-
-<para>FIXME: auto-generated list of module options.</para>
-
-</section>
-
-
-</chapter>
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f41e17189a42..a50b17068f66 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -58,7 +58,6 @@
   ./misc/lib.nix
   ./misc/locate.nix
   ./misc/meta.nix
-  ./misc/nixos.nix
   ./misc/nixpkgs.nix
   ./misc/passthru.nix
   ./misc/version.nix
diff --git a/nixos/release.nix b/nixos/release.nix
index d9f3e46b27c0..cfe152cc163d 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -284,7 +284,6 @@ in rec {
   tests.networkingProxy = callTest tests/networking-proxy.nix {};
   tests.nfs3 = callTest tests/nfs.nix { version = 3; };
   tests.nfs4 = callTest tests/nfs.nix { version = 4; };
-  tests.nixosPinVersion = callTest tests/nixos-pin-version.nix {};
   tests.nsd = callTest tests/nsd.nix {};
   tests.openssh = callTest tests/openssh.nix {};
   tests.panamax = hydraJob (import tests/panamax.nix { system = "x86_64-linux"; });
diff --git a/nixos/tests/nixos-pin-version.nix b/nixos/tests/nixos-pin-version.nix
deleted file mode 100644
index 91fba2e759d2..000000000000
--- a/nixos/tests/nixos-pin-version.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ system ? builtins.currentSystem }:
-
-with import ../lib/testing.nix { inherit system; };
-let
-in
-
-pkgs.stdenv.mkDerivation rec {
-  name = "nixos-pin-version";
-  src = ../..;
-  buildInputs = with pkgs; [ nix gnugrep ];
-
-    withoutPath = pkgs.writeText "configuration.nix" ''
-    {
-      nixos.extraModules = [ ({lib, ...}: { system.nixosRevision = lib.mkForce "ABCDEF"; }) ];
-    }
-  '';
-
-  withPath = pkgs.writeText "configuration.nix" ''
-    {
-      nixos.path = ${src}/nixos ;
-      nixos.extraModules = [ ({lib, ...}: { system.nixosRevision = lib.mkForce "ABCDEF"; }) ];
-    }
-  '';
-
-  phases = "buildPhase";
-  buildPhase = ''
-    datadir="${pkgs.nix}/share"
-    export TEST_ROOT=$(pwd)/test-tmp
-    export NIX_STORE_DIR=$TEST_ROOT/store
-    export NIX_LOCALSTATE_DIR=$TEST_ROOT/var
-    export NIX_LOG_DIR=$TEST_ROOT/var/log/nix
-    export NIX_STATE_DIR=$TEST_ROOT/var/nix
-    export NIX_DB_DIR=$TEST_ROOT/db
-    export NIX_CONF_DIR=$TEST_ROOT/etc
-    export NIX_MANIFESTS_DIR=$TEST_ROOT/var/nix/manifests
-    export NIX_BUILD_HOOK=
-    export PAGER=cat
-    cacheDir=$TEST_ROOT/binary-cache
-    nix-store --init
-
-    export NIX_PATH="nixpkgs=$src:nixos=$src/nixos:nixos-config=${withoutPath}" ;
-    if test $(nix-instantiate $src/nixos -A config.system.nixosRevision --eval-only) != '"ABCDEF"' ; then :;
-    else
-      echo "Unexpected re-entry without the nixos.path option defined.";
-      exit 1;
-    fi;
-
-    export NIX_PATH="nixpkgs=$src:nixos=$src/nixos:nixos-config=${withPath}" ;
-    if test $(nix-instantiate $src/nixos -A config.system.nixosRevision --eval-only) = '"ABCDEF"' ; then :;
-    else
-      echo "Expected a re-entry when the nixos.path option is defined.";
-      exit 1;
-    fi;
-
-    touch $out;
-  '';
-}

From bf9c57fc4953f751ea36e16f6c672347cd43df99 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 27 Feb 2016 20:47:10 +0100
Subject: [PATCH 1911/2285] Improve services.locate.period deprecation message

---
 nixos/modules/misc/locate.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index 318b81ca07c2..5b560cedc623 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -67,7 +67,9 @@ in {
   };
 
   config = {
-    warnings = let opt = options.services.locate.period; in optional opt.isDefined "The `period` definition in ${showFiles opt.files} has been removed; please replace it with `interval`, using the new systemd.time interval specifier.";
+    warnings =
+      let opt = options.services.locate.period; in
+      optional opt.isDefined "The ‘services.locate.period’ option in ${showFiles opt.files} has been removed; please replace it with ‘services.locate.interval’, using the systemd.time(7) calendar event format.";
 
     systemd.services.update-locatedb =
       { description = "Update Locate Database";

From 3e1b8935c07ae44455af893e93f28b4ccc46dbf0 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 27 Feb 2016 14:16:17 -0600
Subject: [PATCH 1912/2285] mbedtls: 1.3.14 -> 1.3.16 for CVE-2015-8036

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

diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index 7c7b82d9eeff..ef0caed69d7e 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, perl }:
 
 stdenv.mkDerivation rec {
-  name = "mbedtls-1.3.14";
+  name = "mbedtls-1.3.16";
 
   src = fetchurl {
     url = "https://polarssl.org/download/${name}-gpl.tgz";
-    sha256 = "1y3gr3kfai3d13j08r4pv42sh47nbfm4nqi9jq8c9d06qidr2xmy";
+    sha256 = "f413146c177c52d4ad8f48015e2fb21dd3a029ca30a2ea000cbc4f9bd092c933";
   };
 
   nativeBuildInputs = [ perl ];

From a1b69275afca5ec06e930c4605d55778ee6de4b8 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 27 Feb 2016 14:32:56 -0600
Subject: [PATCH 1913/2285] libbsd: 0.7.0 -> 0.8.2 for CVE-2016-2090

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

diff --git a/pkgs/development/libraries/libbsd/default.nix b/pkgs/development/libraries/libbsd/default.nix
index bc88d8dc12cd..541f70cabb84 100644
--- a/pkgs/development/libraries/libbsd/default.nix
+++ b/pkgs/development/libraries/libbsd/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
-let name = "libbsd-0.7.0";
+let name = "libbsd-0.8.2";
 in stdenv.mkDerivation {
   inherit name;
 
   src = fetchurl {
     url = "http://libbsd.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "1fqhbi0vd6xjxazf633x388cc8qyn58l78704s0h6k63wlbhwfqg";
+    sha256 = "02i5brb2007sxq3mn862mr7yxxm0g6nj172417hjyvjax7549xmj";
   };
 
   patchPhase = ''
@@ -15,7 +15,7 @@ in stdenv.mkDerivation {
       --replace "{exec_prefix}" "{prefix}"
   '';
 
-  meta = { 
+  meta = {
     description = "Common functions found on BSD systems";
     homepage = http://libbsd.freedesktop.org/;
     license = stdenv.lib.licenses.bsd3;

From 77134ea4a536226e1d4d6495705b6a3777f8bf15 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 27 Feb 2016 14:48:29 -0600
Subject: [PATCH 1914/2285] jasper: patch for CVE-2016-1867

---
 pkgs/development/libraries/jasper/default.nix         |  3 ++-
 .../libraries/jasper/jasper-CVE-2016-1867.diff        | 11 +++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/jasper/jasper-CVE-2016-1867.diff

diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix
index 2fa9cf7dbf95..40d54ed400a3 100644
--- a/pkgs/development/libraries/jasper/default.nix
+++ b/pkgs/development/libraries/jasper/default.nix
@@ -9,6 +9,7 @@ stdenv.mkDerivation rec {
   };
 
   patches = [
+    ./jasper-CVE-2016-1867.diff
     ./jasper-CVE-2014-8137-variant2.diff
     ./jasper-CVE-2014-8137-noabort.diff
     ./jasper-CVE-2014-8138.diff
@@ -21,7 +22,7 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ libjpeg ];
 
   configureFlags = "--enable-shared";
-  
+
   meta = {
     homepage = https://www.ece.uvic.ca/~frodo/jasper/;
     description = "JPEG2000 Library";
diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2016-1867.diff b/pkgs/development/libraries/jasper/jasper-CVE-2016-1867.diff
new file mode 100644
index 000000000000..b2dce8d8e70d
--- /dev/null
+++ b/pkgs/development/libraries/jasper/jasper-CVE-2016-1867.diff
@@ -0,0 +1,11 @@
+--- jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c	2007-01-19 22:43:07.000000000 +0100
++++ jasper-1.900.1/src/libjasper/jpc/jpc_t2cod.c	2016-01-14 14:22:24.569056412 +0100
+@@ -429,7 +429,7 @@
+ 	}
+
+ 	for (pi->compno = pchg->compnostart, pi->picomp =
+-	  &pi->picomps[pi->compno]; pi->compno < JAS_CAST(int, pchg->compnoend); ++pi->compno,
++	  &pi->picomps[pi->compno]; pi->compno < JAS_CAST(int, pchg->compnoend) && pi->compno < pi->numcomps; ++pi->compno,
+ 	  ++pi->picomp) {
+ 		pirlvl = pi->picomp->pirlvls;
+ 		pi->xstep = pi->picomp->hsamp * (1 << (pirlvl->prcwidthexpn +
\ No newline at end of file

From 41d00c436dd914a2d7f62bdffd5270b28331312d Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Sat, 27 Feb 2016 14:20:12 +0100
Subject: [PATCH 1915/2285] sienna: init at 1.0c

---
 pkgs/games/sienna/default.nix   | 59 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/games/sienna/default.nix

diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix
new file mode 100644
index 000000000000..2636bc9e7990
--- /dev/null
+++ b/pkgs/games/sienna/default.nix
@@ -0,0 +1,59 @@
+{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }:
+
+let
+  pname = "sienna";
+  version = "1.0c";
+
+  icon = fetchurl {
+    url = "http://tangramgames.dk/img/thumb/sienna.png";
+    sha256 = "12q2rhk39dmb6ir50zafn8dylaad5gns8z3y21mfjabc5l5g02nn";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "sienna";
+    exec = "${pname}";
+    icon = "${icon}";
+    comment = "Fast-paced one button platformer"; 
+    desktopName = "Sienna";
+    genericName = "sienna";
+    categories = "Game;";
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/SimonLarsen/${pname}/releases/download/v${version}/${pname}-${version}.love";
+    sha256 = "1x15276fhqspgrrv8fzkp032i2qa8piywc0yy061x59mxhdndzj6";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ lua love ];
+
+  phases = "installPhase";
+
+  installPhase =
+  ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/games/lovegames
+
+    cp -v $src $out/share/games/lovegames/${pname}.love
+
+    makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love
+
+    chmod +x $out/bin/${pname}
+    mkdir -p $out/share/applications
+    ln -s ${desktopItem}/share/applications/* $out/share/applications/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Fast-paced one button platformer";
+    maintainers = with maintainers; [ leenaars ];
+    platforms = platforms.linux;
+    license = licenses.free;
+    downloadPage = http://tangramgames.dk/games/sienna;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22dbfc41f438..5c6c79887568 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14633,6 +14633,8 @@ let
 
   sgtpuzzles = callPackage (callPackage ../games/sgt-puzzles) { };
 
+  sienna = callPackage ../games/sienna { love = love_0_10; };
+
   simutrans = callPackage ../games/simutrans { };
   # get binaries without data built by Hydra
   simutrans_binaries = lowPrio simutrans.binaries;

From 7281144f4b9dbaa687cc3c4946124408549a9987 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Sat, 27 Feb 2016 14:31:28 +0100
Subject: [PATCH 1916/2285] 90secondportraits: init at 1.01b

---
 pkgs/games/90secondportraits/default.nix | 59 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 +
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/games/90secondportraits/default.nix

diff --git a/pkgs/games/90secondportraits/default.nix b/pkgs/games/90secondportraits/default.nix
new file mode 100644
index 000000000000..0ada8d64685d
--- /dev/null
+++ b/pkgs/games/90secondportraits/default.nix
@@ -0,0 +1,59 @@
+{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }:
+
+let
+  pname = "90secondportraits";
+  version = "1.01b";
+
+  icon = fetchurl {
+    url = "http://tangramgames.dk/img/thumb/90secondportraits.png";
+    sha256 = "13k6cq8s7jw77j81xfa5ri41445m778q6iqbfplhwdpja03c6faw";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "90secondportraits";
+    exec = "${pname}";
+    icon = "${icon}";
+    comment = "A silly speed painting game";
+    desktopName = "90 Second Portraits";
+    genericName = "90secondportraits";
+    categories = "Game;";
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/SimonLarsen/90-Second-Portraits/releases/download/${version}/${pname}-${version}.love";
+    sha256 = "0jj3k953r6vb02212gqcgqpb4ima87gnqgls43jmylxq2mcm33h5";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ lua love ];
+
+  phases = "installPhase";
+
+  installPhase =
+  ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/games/lovegames
+
+    cp -v $src $out/share/games/lovegames/${pname}.love
+
+    makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love
+
+    chmod +x $out/bin/${pname}
+    mkdir -p $out/share/applications
+    ln -s ${desktopItem}/share/applications/* $out/share/applications/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "A silly speed painting game";
+    maintainers = with maintainers; [ leenaars ];
+    platforms = platforms.linux;
+    license = licenses.free;
+    downloadPage = http://tangramgames.dk/games/90secondportraits;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22dbfc41f438..1b023e4d99ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14307,6 +14307,8 @@ let
 
   "2048-in-terminal" = callPackage ../games/2048-in-terminal { };
 
+  "90secondportraits" = callPackage ../games/90secondportraits { love = love_0_10; };
+
   adom = callPackage ../games/adom { };
 
   airstrike = callPackage ../games/airstrike { };

From 6c916515d6de5ebc7d24f08a60018ba097a9d766 Mon Sep 17 00:00:00 2001
From: leenaars <michiel.ml@nlnet.nl>
Date: Sat, 27 Feb 2016 21:44:43 +0100
Subject: [PATCH 1917/2285] lib.maintainers: add Michiel Leenaars (close
 #13516)

As suggested in https://github.com/NixOS/nixpkgs/pull/13504 by @hrdinka.
---
 lib/maintainers.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 3d9fc00ea55d..df5dfced4b43 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -179,6 +179,7 @@
   lassulus = "Lassulus <lassulus@gmail.com>";
   layus = "Guillaume Maudoux <layus.on@gmail.com>";
   lebastr = "Alexander Lebedev <lebastr@gmail.com>";
+  leenaars = "Michiel Leenaars <ml.software@leenaa.rs>";
   leonardoce = "Leonardo Cecchi <leonardo.cecchi@gmail.com>";
   lethalman = "Luca Bruno <lucabru@src.gnome.org>";
   lewo = "Antoine Eiche <lewo@abesis.fr>";

From 7627bf6f3f8b27b44109d39ebab08c511cf2251d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 27 Feb 2016 22:04:47 +0100
Subject: [PATCH 1918/2285] perl: Unify 5.20 and 5.22 expressions

---
 .../interpreters/perl/5.20/default.nix        | 114 --------
 .../interpreters/perl/5.22/cpp-precomp.patch  |  11 -
 .../interpreters/perl/5.22/default.nix        | 113 --------
 .../interpreters/perl/5.22/ld-shared.patch    |  24 --
 .../interpreters/perl/5.22/no-sys-dirs.patch  | 250 ------------------
 .../interpreters/perl/5.22/setup-hook.sh      |   5 -
 .../perl/{5.20 => }/cpp-precomp.patch         |   0
 .../development/interpreters/perl/default.nix | 129 +++++++++
 .../perl/{5.20 => }/ld-shared.patch           |   0
 .../perl/{5.20 => }/no-sys-dirs.patch         |   0
 .../perl/{5.20 => }/setup-hook.sh             |   0
 pkgs/top-level/all-packages.nix               |  10 +-
 12 files changed, 130 insertions(+), 526 deletions(-)
 delete mode 100644 pkgs/development/interpreters/perl/5.20/default.nix
 delete mode 100644 pkgs/development/interpreters/perl/5.22/cpp-precomp.patch
 delete mode 100644 pkgs/development/interpreters/perl/5.22/default.nix
 delete mode 100644 pkgs/development/interpreters/perl/5.22/ld-shared.patch
 delete mode 100644 pkgs/development/interpreters/perl/5.22/no-sys-dirs.patch
 delete mode 100644 pkgs/development/interpreters/perl/5.22/setup-hook.sh
 rename pkgs/development/interpreters/perl/{5.20 => }/cpp-precomp.patch (100%)
 create mode 100644 pkgs/development/interpreters/perl/default.nix
 rename pkgs/development/interpreters/perl/{5.20 => }/ld-shared.patch (100%)
 rename pkgs/development/interpreters/perl/{5.20 => }/no-sys-dirs.patch (100%)
 rename pkgs/development/interpreters/perl/{5.20 => }/setup-hook.sh (100%)

diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix
deleted file mode 100644
index c91a43963d49..000000000000
--- a/pkgs/development/interpreters/perl/5.20/default.nix
+++ /dev/null
@@ -1,114 +0,0 @@
-{ stdenv, fetchurl, enableThreading ? stdenv ? glibc }:
-
-# We can only compile perl with threading on platforms where we have a
-# real glibc in the stdenv.
-#
-# Instead of silently building an unthreaded perl if this is not the
-# case, we force callers to disableThreading explicitly, therefore
-# documenting the platforms where the perl is not threaded.
-#
-# In the case of stdenv linux boot stage1 it's not possible to use
-# threading because of the simpleness of the bootstrap glibc, so we
-# use enableThreading = false there.
-assert enableThreading -> (stdenv ? glibc);
-
-let
-
-  libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr";
-
-in
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
-  name = "perl-5.20.3";
-
-  src = fetchurl {
-    url = "mirror://cpan/authors/id/S/SH/SHAY/${name}.tar.gz";
-    sha256 = "0jlvpd5l5nk7lzfd4akdg1sw6vinbkj6izclyyr0lrbidfky691m";
-  };
-
-  outputs = [ "out" "man" ];
-
-  patches =
-    [ # Do not look in /usr etc. for dependencies.
-      ./no-sys-dirs.patch
-    ]
-    ++ optional stdenv.isSunOS ./ld-shared.patch
-    ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ];
-
-  # There's an annoying bug on sandboxed Darwin in Perl's Cwd.pm where it looks for pwd
-  # in /bin/pwd and /usr/bin/pwd and then falls back on just "pwd" if it can't get them
-  # while at the same time erasing the PATH environment variable so it unconditionally
-  # fails. The code in question is guarded by a check for Mac OS, but the patch below
-  # doesn't have any runtime effect on other platforms.
-  postPatch = stdenv.lib.optional stdenv.isDarwin ''
-    pwd="$(type -P pwd)"
-    substituteInPlace dist/PathTools/Cwd.pm \
-      --replace "/bin/pwd" "$pwd"
-  '';
-
-  sandboxProfile = stdenv.lib.sandbox.allow "ipc-sysv-sem";
-
-  # Build a thread-safe Perl with a dynamic libperls.o.  We need the
-  # "installstyle" option to ensure that modules are put under
-  # $out/lib/perl5 - this is the general default, but because $out
-  # contains the string "perl", Configure would select $out/lib.
-  # Miniperl needs -lm. perl needs -lrt.
-  configureFlags =
-    [ "-de"
-      "-Dcc=cc"
-      "-Uinstallusrbinperl"
-      "-Dinstallstyle=lib/perl5"
-      "-Duseshrplib"
-      "-Dlocincpth=${libc}/include"
-      "-Dloclibpth=${libc}/lib"
-    ]
-    ++ optional stdenv.isSunOS "-Dcc=gcc"
-    ++ optional enableThreading "-Dusethreads";
-
-  configureScript = "${stdenv.shell} ./Configure";
-
-  dontAddPrefix = true;
-
-  enableParallelBuilding = true;
-
-  preConfigure =
-    ''
-      configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"
-
-      ${optionalString stdenv.isArm ''
-        configureFlagsArray=(-Dldflags="-lm -lrt")
-      ''}
-    '' + optionalString stdenv.isDarwin ''
-      substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" ""
-    '' + optionalString (!enableThreading) ''
-      # We need to do this because the bootstrap doesn't have a static libpthread
-      sed -i 's,\(libswanted.*\)pthread,\1,g' Configure
-    '';
-
-  preBuild = optionalString (!(stdenv ? cc && stdenv.cc.nativeTools))
-    ''
-      # Make Cwd work on NixOS (where we don't have a /bin/pwd).
-      substituteInPlace dist/PathTools/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"
-    '';
-
-  # Inspired by nuke-references, which I can't depend on because it uses perl. Perhaps it should just use sed :)
-  postInstall = ''
-    self=$(echo $out | sed -n "s|^$NIX_STORE/\\([a-z0-9]\{32\}\\)-.*|\1|p")
-
-    sed -i "/$self/b; s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" "$out"/lib/perl5/*/*/Config.pm
-    sed -i "/$self/b; s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" "$out"/lib/perl5/*/*/Config_heavy.pl
-  '';
-
-  setupHook = ./setup-hook.sh;
-
-  passthru.libPrefix = "lib/perl5/site_perl";
-
-  meta = {
-    homepage = https://www.perl.org/;
-    description = "The standard implementation of the Perl 5 programmming language";
-    maintainers = [ maintainers.eelco ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/development/interpreters/perl/5.22/cpp-precomp.patch b/pkgs/development/interpreters/perl/5.22/cpp-precomp.patch
deleted file mode 100644
index 231853fe51a6..000000000000
--- a/pkgs/development/interpreters/perl/5.22/cpp-precomp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/hints/darwin.sh	2013-05-08 11:13:45.000000000 -0600
-+++ b/hints/darwin.sh	2013-05-08 11:15:04.000000000 -0600
-@@ -129,7 +129,7 @@
- 
- # Avoid Apple's cpp precompiler, better for extensions
- if [ "X`echo | ${cc} -no-cpp-precomp -E - 2>&1 >/dev/null`" = "X" ]; then
--    cppflags="${cppflags} -no-cpp-precomp"
-+    #cppflags="${cppflags} -no-cpp-precomp"
- 
-     # This is necessary because perl's build system doesn't
-     # apply cppflags to cc compile lines as it should.
diff --git a/pkgs/development/interpreters/perl/5.22/default.nix b/pkgs/development/interpreters/perl/5.22/default.nix
deleted file mode 100644
index 34a26023adf9..000000000000
--- a/pkgs/development/interpreters/perl/5.22/default.nix
+++ /dev/null
@@ -1,113 +0,0 @@
-{ stdenv, fetchurl, enableThreading ? stdenv ? glibc }:
-
-# We can only compile perl with threading on platforms where we have a
-# real glibc in the stdenv.
-#
-# Instead of silently building an unthreaded perl if this is not the
-# case, we force callers to disableThreading explicitly, therefore
-# documenting the platforms where the perl is not threaded.
-#
-# In the case of stdenv linux boot stage1 it's not possible to use
-# threading because of the simpleness of the bootstrap glibc, so we
-# use enableThreading = false there.
-assert enableThreading -> (stdenv ? glibc);
-
-let
-
-  libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr";
-
-in
-
-with stdenv.lib;
-
-stdenv.mkDerivation rec {
-  name = "perl-5.22.0";
-
-  src = fetchurl {
-    url = "mirror://cpan/src/5.0/${name}.tar.gz";
-    sha256 = "0g5bl8sdpzx9gx2g5jq3py4bj07z2ylk7s1qn0fvsss2yl3hhs8c";
-  };
-
-  outputs = [ "out" "man" ];
-
-  patches =
-    [ # Do not look in /usr etc. for dependencies.
-      ./no-sys-dirs.patch
-    ]
-    ++ optional stdenv.isSunOS ./ld-shared.patch
-    ++ stdenv.lib.optional stdenv.isDarwin [ ./cpp-precomp.patch ];
-
-  # Build a thread-safe Perl with a dynamic libperls.o.  We need the
-  # "installstyle" option to ensure that modules are put under
-  # $out/lib/perl5 - this is the general default, but because $out
-  # contains the string "perl", Configure would select $out/lib.
-  # Miniperl needs -lm. perl needs -lrt.
-  configureFlags =
-    [ "-de"
-      "-Dcc=cc"
-      "-Uinstallusrbinperl"
-      "-Dinstallstyle=lib/perl5"
-      "-Duseshrplib"
-      "-Dlocincpth=${libc}/include"
-      "-Dloclibpth=${libc}/lib"
-    ]
-    ++ optional stdenv.isSunOS "-Dcc=gcc"
-    ++ optional enableThreading "-Dusethreads";
-
-  configureScript = "${stdenv.shell} ./Configure";
-
-  dontAddPrefix = true;
-
-  enableParallelBuilding = true;
-
-  postPatch = ''
-    pwd="$(type -P pwd)"
-    substituteInPlace dist/PathTools/Cwd.pm \
-      --replace "pwd_cmd = 'pwd'" "pwd_cmd = '$pwd'"
-  '';
-
-  preConfigure =
-    ''
-      configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"
-
-      ${optionalString stdenv.isArm ''
-        configureFlagsArray=(-Dldflags="-lm -lrt")
-      ''}
-    '' + optionalString stdenv.isDarwin ''
-      substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" ""
-    '' + optionalString (!enableThreading) ''
-      # We need to do this because the bootstrap doesn't have a static libpthread
-      sed -i 's,\(libswanted.*\)pthread,\1,g' Configure
-    '';
-
-  preBuild = optionalString (!(stdenv ? cc && stdenv.cc.nativeTools))
-    ''
-      # Make Cwd work on NixOS (where we don't have a /bin/pwd).
-      substituteInPlace dist/PathTools/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"
-    '';
-
-  setupHook = ./setup-hook.sh;
-
-  passthru.libPrefix = "lib/perl5/site_perl";
-
-  preCheck = ''
-    # Try and setup a local hosts file
-    if [ -f "${libc}/lib/libnss_files.so" ]; then
-      mkdir $TMPDIR/fakelib
-      cp "${libc}/lib/libnss_files.so" $TMPDIR/fakelib
-      sed -i 's,/etc/hosts,/dev/fd/3,g' $TMPDIR/fakelib/libnss_files.so
-      export LD_LIBRARY_PATH=$TMPDIR/fakelib
-    fi
-  '';
-
-  postCheck = ''
-    unset LD_LIBRARY_PATH
-  '';
-
-  meta = {
-    homepage = https://www.perl.org/;
-    description = "The standard implementation of the Perl 5 programmming language";
-    maintainers = [ maintainers.eelco ];
-    platforms = platforms.all;
-  };
-}
diff --git a/pkgs/development/interpreters/perl/5.22/ld-shared.patch b/pkgs/development/interpreters/perl/5.22/ld-shared.patch
deleted file mode 100644
index 140af9af40ed..000000000000
--- a/pkgs/development/interpreters/perl/5.22/ld-shared.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-hints_solaris__2.sh,v 1.2 2015/10/27 09:10:44 jperkin Exp $
-
-Redo PR pkg/44999.
-
---- perl-5.22.0/hints/solaris_2.sh.orig	2015-05-13 20:19:29.000000000 +0000
-+++ perl-5.22.0/hints/solaris_2.sh
-@@ -585,7 +585,7 @@ EOM
- 		fi
- 	    fi
- 	    case "${cc:-cc} -v 2>/dev/null" in
--	    *gcc*)
-+	    *gcc*|clang*)
- 		echo 'int main() { return 0; }' > try.c
- 		case "`${cc:-cc} $ccflags -mcpu=v9 -m64 -S try.c 2>&1 | grep 'm64 is not supported by this configuration'`" in
- 		*"m64 is not supported"*)
-@@ -622,7 +622,7 @@ EOM
- 		# use that with Solaris 11 and later, but keep
- 		# the old behavior for older Solaris versions.
- 		case "$osvers" in
--			2.?|2.10) lddlflags="$lddlflags -G -m64" ;;
-+			2.?|2.10) lddlflags="$lddlflags -shared -m64" ;;
- 			*) lddlflags="$lddlflags -shared -m64" ;;
- 		esac
- 		;;
diff --git a/pkgs/development/interpreters/perl/5.22/no-sys-dirs.patch b/pkgs/development/interpreters/perl/5.22/no-sys-dirs.patch
deleted file mode 100644
index 1793273a76f9..000000000000
--- a/pkgs/development/interpreters/perl/5.22/no-sys-dirs.patch
+++ /dev/null
@@ -1,250 +0,0 @@
-diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/Configure perl-5.20.0/Configure
---- perl-5.20.0-orig/Configure	2014-05-26 15:34:18.000000000 +0200
-+++ perl-5.20.0/Configure	2014-06-25 10:43:35.368285986 +0200
-@@ -106,15 +106,7 @@
- fi
- 
- : Proper PATH setting
--paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin'
--paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin"
--paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin"
--paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin"
--paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb"
--paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin"
--paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib"
--paths="$paths /sbin /usr/sbin /usr/libexec"
--paths="$paths /system/gnu_library/bin"
-+paths=''
- 
- for p in $paths
- do
-@@ -1337,8 +1329,7 @@
- archname=''
- : Possible local include directories to search.
- : Set locincpth to "" in a hint file to defeat local include searches.
--locincpth="/usr/local/include /opt/local/include /usr/gnu/include"
--locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include"
-+locincpth=""
- :
- : no include file wanted by default
- inclwanted=''
-@@ -1349,17 +1340,12 @@
- 
- libnames=''
- : change the next line if compiling for Xenix/286 on Xenix/386
--xlibpth='/usr/lib/386 /lib/386'
-+xlibpth=''
- : Possible local library directories to search.
--loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib"
--loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib"
-+loclibpth=""
- 
- : general looking path for locating libraries
--glibpth="/lib /usr/lib $xlibpth"
--glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib"
--test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth"
--test -f /shlib/libc.so     && glibpth="/shlib $glibpth"
--test -d /usr/lib64         && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64"
-+glibpth=""
- 
- : Private path used by Configure to find libraries.  Its value
- : is prepended to libpth. This variable takes care of special
-@@ -1391,8 +1377,6 @@
- libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD"
- : We probably want to search /usr/shlib before most other libraries.
- : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist.
--glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'`
--glibpth="/usr/shlib $glibpth"
- : Do not use vfork unless overridden by a hint file.
- usevfork=false
- 
-@@ -2446,7 +2430,6 @@
- zip
- "
- pth=`echo $PATH | sed -e "s/$p_/ /g"`
--pth="$pth $sysroot/lib $sysroot/usr/lib"
- for file in $loclist; do
- 	eval xxx=\$$file
- 	case "$xxx" in
-@@ -4936,7 +4919,7 @@
- : Set private lib path
- case "$plibpth" in
- '') if ./mips; then
--	plibpth="$incpath/usr/lib $sysroot/usr/local/lib $sysroot/usr/ccs/lib"
-+	plibpth="$incpath/usr/lib"
-     fi;;
- esac
- case "$libpth" in
-@@ -8600,13 +8583,8 @@
- echo " "
- case "$sysman" in
- '')
--	syspath='/usr/share/man/man1 /usr/man/man1'
--	syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1"
--	syspath="$syspath /usr/man/u_man/man1"
--	syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1"
--	syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1"
--	syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1"
--	sysman=`./loc . /usr/man/man1 $syspath`
-+	syspath=''
-+	sysman=''
- 	;;
- esac
- if $test -d "$sysman"; then
-@@ -19900,9 +19878,10 @@
- case "$full_ar" in
- '') full_ar=$ar ;;
- esac
-+full_ar=ar
- 
- : Store the full pathname to the sed program for use in the C program
--full_sed=$sed
-+full_sed=sed
- 
- : see what type gids are declared as in the kernel
- echo " "
-Only in perl-5.20.0/: Configure.orig
-diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/ext/Errno/Errno_pm.PL perl-5.20.0/ext/Errno/Errno_pm.PL
---- perl-5.20.0-orig/ext/Errno/Errno_pm.PL	2014-05-26 15:34:20.000000000 +0200
-+++ perl-5.20.0/ext/Errno/Errno_pm.PL	2014-06-25 10:31:24.317970047 +0200
-@@ -126,11 +126,7 @@
- 	if ($dep =~ /(\S+errno\.h)/) {
- 	     $file{$1} = 1;
- 	}
--    } elsif ($^O eq 'linux' &&
--	      $Config{gccversion} ne '' && 
--	      $Config{gccversion} !~ /intel/i
--	      # might be using, say, Intel's icc
--	     ) {
-+    } elsif (0) {
-     # When cross-compiling we may store a path for gcc's "sysroot" option:
-     my $sysroot = $Config{sysroot} || '';
- 	# Some Linuxes have weird errno.hs which generate
-Only in perl-5.20.0/ext/Errno: Errno_pm.PL.orig
-diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/freebsd.sh perl-5.20.0/hints/freebsd.sh
---- perl-5.20.0-orig/hints/freebsd.sh	2014-01-31 22:55:51.000000000 +0100
-+++ perl-5.20.0/hints/freebsd.sh	2014-06-25 10:25:53.263964680 +0200
-@@ -119,21 +119,21 @@
-         objformat=`/usr/bin/objformat`
-         if [ x$objformat = xaout ]; then
-             if [ -e /usr/lib/aout ]; then
--                libpth="/usr/lib/aout /usr/local/lib /usr/lib"
--                glibpth="/usr/lib/aout /usr/local/lib /usr/lib"
-+                libpth=""
-+                glibpth=""
-             fi
-             lddlflags='-Bshareable'
-         else
--            libpth="/usr/lib /usr/local/lib"
--            glibpth="/usr/lib /usr/local/lib"
-+            libpth=""
-+            glibpth=""
-             ldflags="-Wl,-E "
-             lddlflags="-shared "
-         fi
-         cccdlflags='-DPIC -fPIC'
-         ;;
- *)
--       libpth="/usr/lib /usr/local/lib"
--       glibpth="/usr/lib /usr/local/lib"
-+       libpth=""
-+       glibpth=""
-        ldflags="-Wl,-E "
-         lddlflags="-shared "
-         cccdlflags='-DPIC -fPIC'
-diff -ru -x '*~' -x '*.rej' perl-5.20.0-orig/hints/linux.sh perl-5.20.0/hints/linux.sh
---- perl-5.20.0-orig/hints/linux.sh	2014-05-26 15:34:20.000000000 +0200
-+++ perl-5.20.0/hints/linux.sh	2014-06-25 10:33:47.354883843 +0200
-@@ -150,25 +150,6 @@
-     ;;
- esac
- 
--# Ubuntu 11.04 (and later, presumably) doesn't keep most libraries
--# (such as -lm) in /lib or /usr/lib.  So we have to ask gcc to tell us
--# where to look.  We don't want gcc's own libraries, however, so we
--# filter those out.
--# This could be conditional on Unbuntu, but other distributions may
--# follow suit, and this scheme seems to work even on rather old gcc's.
--# This unconditionally uses gcc because even if the user is using another
--# compiler, we still need to find the math library and friends, and I don't
--# know how other compilers will cope with that situation.
--# Morever, if the user has their own gcc earlier in $PATH than the system gcc,
--# we don't want its libraries. So we try to prefer the system gcc
--# Still, as an escape hatch, allow Configure command line overrides to
--# plibpth to bypass this check.
--if [ -x /usr/bin/gcc ] ; then
--    gcc=/usr/bin/gcc
--else
--    gcc=gcc
--fi
--
- case "$plibpth" in
- '') plibpth=`LANG=C LC_ALL=C $gcc $ccflags $ldflags -print-search-dirs | grep libraries |
- 	cut -f2- -d= | tr ':' $trnl | grep -v 'gcc' | sed -e 's:/$::'`
-@@ -178,32 +159,6 @@
-     ;;
- esac
- 
--case "$libc" in
--'')
--# If you have glibc, then report the version for ./myconfig bug reporting.
--# (Configure doesn't need to know the specific version since it just uses
--# gcc to load the library for all tests.)
--# We don't use __GLIBC__ and  __GLIBC_MINOR__ because they
--# are insufficiently precise to distinguish things like
--# libc-2.0.6 and libc-2.0.7.
--    for p in $plibpth
--    do
--        for trylib in libc.so.6 libc.so
--        do
--            if $test -e $p/$trylib; then
--                libc=`ls -l $p/$trylib | awk '{print $NF}'`
--                if $test "X$libc" != X; then
--                    break
--                fi
--            fi
--        done
--        if $test "X$libc" != X; then
--            break
--        fi
--    done
--    ;;
--esac
--
- # Are we using ELF?  Thanks to Kenneth Albanowski <kjahds@kjahds.com>
- # for this test.
- cat >try.c <<'EOM'
-@@ -367,33 +322,6 @@
- 	;;
- esac
- 
--# SuSE8.2 has /usr/lib/libndbm* which are ld scripts rather than
--# true libraries. The scripts cause binding against static
--# version of -lgdbm which is a bad idea. So if we have 'nm'
--# make sure it can read the file
--# NI-S 2003/08/07
--case "$nm" in
--    '') ;;
--    *)
--    for p in $plibpth
--    do
--        if $test -r $p/libndbm.so; then
--            if $nm $p/libndbm.so >/dev/null 2>&1 ; then
--                echo 'Your shared -lndbm seems to be a real library.'
--                _libndbm_real=1
--                break
--            fi
--        fi
--    done
--    if $test "X$_libndbm_real" = X; then
--        echo 'Your shared -lndbm is not a real library.'
--        set `echo X "$libswanted "| sed -e 's/ ndbm / /'`
--        shift
--        libswanted="$*"
--    fi
--    ;;
--esac
--
- # Linux on Synology.
- if [ -f /etc/synoinfo.conf -a -d /usr/syno ]; then
-     # Tested on Synology DS213 and DS413
diff --git a/pkgs/development/interpreters/perl/5.22/setup-hook.sh b/pkgs/development/interpreters/perl/5.22/setup-hook.sh
deleted file mode 100644
index a8656b8531db..000000000000
--- a/pkgs/development/interpreters/perl/5.22/setup-hook.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-addPerlLibPath () {
-    addToSearchPath PERL5LIB $1/lib/perl5/site_perl
-}
-
-envHooks+=(addPerlLibPath)
diff --git a/pkgs/development/interpreters/perl/5.20/cpp-precomp.patch b/pkgs/development/interpreters/perl/cpp-precomp.patch
similarity index 100%
rename from pkgs/development/interpreters/perl/5.20/cpp-precomp.patch
rename to pkgs/development/interpreters/perl/cpp-precomp.patch
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
new file mode 100644
index 000000000000..558c26396e1c
--- /dev/null
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -0,0 +1,129 @@
+{ lib, stdenv, fetchurlBoot, enableThreading ? stdenv ? glibc }:
+
+with lib;
+
+# We can only compile perl with threading on platforms where we have a
+# real glibc in the stdenv.
+#
+# Instead of silently building an unthreaded perl if this is not the
+# case, we force callers to disableThreading explicitly, therefore
+# documenting the platforms where the perl is not threaded.
+#
+# In the case of stdenv linux boot stage1 it's not possible to use
+# threading because of the simpleness of the bootstrap glibc, so we
+# use enableThreading = false there.
+assert enableThreading -> (stdenv ? glibc);
+
+let
+
+  libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr";
+
+  common = { version, sha256 }: stdenv.mkDerivation rec {
+    name = "perl-${version}";
+
+    src = fetchurlBoot {
+      url = "mirror://cpan/src/5.0/${name}.tar.gz";
+      inherit sha256;
+    };
+
+    outputs = [ "out" "man" ];
+
+    patches =
+      [ # Do not look in /usr etc. for dependencies.
+        ./no-sys-dirs.patch
+      ]
+      ++ optional stdenv.isSunOS ./ld-shared.patch
+      ++ optional stdenv.isDarwin [ ./cpp-precomp.patch ];
+
+    # There's an annoying bug on sandboxed Darwin in Perl's Cwd.pm where it looks for pwd
+    # in /bin/pwd and /usr/bin/pwd and then falls back on just "pwd" if it can't get them
+    # while at the same time erasing the PATH environment variable so it unconditionally
+    # fails. The code in question is guarded by a check for Mac OS, but the patch below
+    # doesn't have any runtime effect on other platforms.
+    postPatch = optional stdenv.isDarwin ''
+      pwd="$(type -P pwd)"
+      substituteInPlace dist/PathTools/Cwd.pm \
+        --replace "/bin/pwd" "$pwd"
+    '';
+
+    sandboxProfile = sandbox.allow "ipc-sysv-sem";
+
+    # Build a thread-safe Perl with a dynamic libperls.o.  We need the
+    # "installstyle" option to ensure that modules are put under
+    # $out/lib/perl5 - this is the general default, but because $out
+    # contains the string "perl", Configure would select $out/lib.
+    # Miniperl needs -lm. perl needs -lrt.
+    configureFlags =
+      [ "-de"
+        "-Dcc=cc"
+        "-Uinstallusrbinperl"
+        "-Dinstallstyle=lib/perl5"
+        "-Duseshrplib"
+        "-Dlocincpth=${libc}/include"
+        "-Dloclibpth=${libc}/lib"
+      ]
+      ++ optional stdenv.isSunOS "-Dcc=gcc"
+      ++ optional enableThreading "-Dusethreads";
+
+    configureScript = "${stdenv.shell} ./Configure";
+
+    dontAddPrefix = true;
+
+    enableParallelBuilding = true;
+
+    preConfigure =
+      ''
+        configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"
+
+        ${optionalString stdenv.isArm ''
+          configureFlagsArray=(-Dldflags="-lm -lrt")
+        ''}
+      '' + optionalString stdenv.isDarwin ''
+        substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" ""
+      '' + optionalString (!enableThreading) ''
+        # We need to do this because the bootstrap doesn't have a static libpthread
+        sed -i 's,\(libswanted.*\)pthread,\1,g' Configure
+      '';
+
+    preBuild = optionalString (!(stdenv ? cc && stdenv.cc.nativeTools))
+      ''
+        # Make Cwd work on NixOS (where we don't have a /bin/pwd).
+        substituteInPlace dist/PathTools/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"
+      '';
+
+    # Inspired by nuke-references, which I can't depend on because it uses perl. Perhaps it should just use sed :)
+    postInstall = ''
+      self=$(echo $out | sed -n "s|^$NIX_STORE/\\([a-z0-9]\{32\}\\)-.*|\1|p")
+
+      sed -i "/$self/b; s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" "$out"/lib/perl5/*/*/Config.pm
+      sed -i "/$self/b; s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" "$out"/lib/perl5/*/*/Config_heavy.pl
+    '';
+
+    setupHook = ./setup-hook.sh;
+
+    passthru.libPrefix = "lib/perl5/site_perl";
+
+    meta = {
+      homepage = https://www.perl.org/;
+      description = "The standard implementation of the Perl 5 programmming language";
+      maintainers = [ maintainers.eelco ];
+      platforms = platforms.all;
+    };
+  };
+
+in rec {
+
+  perl = perl520;
+
+  perl520 = common {
+    version = "5.20.3";
+    sha256 = "0jlvpd5l5nk7lzfd4akdg1sw6vinbkj6izclyyr0lrbidfky691m";
+
+  };
+
+  perl522 = common {
+    version = "5.22.0";
+    sha256 = "0g5bl8sdpzx9gx2g5jq3py4bj07z2ylk7s1qn0fvsss2yl3hhs8c";
+  };
+
+}
diff --git a/pkgs/development/interpreters/perl/5.20/ld-shared.patch b/pkgs/development/interpreters/perl/ld-shared.patch
similarity index 100%
rename from pkgs/development/interpreters/perl/5.20/ld-shared.patch
rename to pkgs/development/interpreters/perl/ld-shared.patch
diff --git a/pkgs/development/interpreters/perl/5.20/no-sys-dirs.patch b/pkgs/development/interpreters/perl/no-sys-dirs.patch
similarity index 100%
rename from pkgs/development/interpreters/perl/5.20/no-sys-dirs.patch
rename to pkgs/development/interpreters/perl/no-sys-dirs.patch
diff --git a/pkgs/development/interpreters/perl/5.20/setup-hook.sh b/pkgs/development/interpreters/perl/setup-hook.sh
similarity index 100%
rename from pkgs/development/interpreters/perl/5.20/setup-hook.sh
rename to pkgs/development/interpreters/perl/setup-hook.sh
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7491eb99b51c..2eddc9a38911 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5404,15 +5404,7 @@ let
 
   ocropus = callPackage ../applications/misc/ocropus { };
 
-  perl520 = callPackage ../development/interpreters/perl/5.20 {
-    fetchurl = fetchurlBoot;
-  };
-
-  perl522 = callPackage ../development/interpreters/perl/5.22 {
-    fetchurl = fetchurlBoot;
-  };
-
-  perl = perl520;
+  inherit (callPackages ../development/interpreters/perl {}) perl perl520 perl522;
 
   php = php56;
 

From be4ebe0046ae3820dac2a14043818507c342cb59 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 27 Feb 2016 22:19:39 +0100
Subject: [PATCH 1919/2285] perl: 5.22.0 -> 5.22.1

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

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index 558c26396e1c..d9158ad55ab5 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -122,8 +122,8 @@ in rec {
   };
 
   perl522 = common {
-    version = "5.22.0";
-    sha256 = "0g5bl8sdpzx9gx2g5jq3py4bj07z2ylk7s1qn0fvsss2yl3hhs8c";
+    version = "5.22.1";
+    sha256 = "09wg24w5syyafyv87l6z8pxwz4bjgcdj996bx5844k6m9445sirb";
   };
 
 }

From 8726c6d50638fea25808e99192ed546657200d87 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 27 Feb 2016 22:29:24 +0100
Subject: [PATCH 1920/2285] webkitgtk: Disable Hydra build

This package takes an excessive amount of time to build (e.g., right
now Hydra is showing eight concurrent builds of webkitgtk, some of
them running for more than 6 hours). This may also delay channel
updates.
---
 pkgs/development/libraries/webkitgtk/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index fc40e7749e91..29e3206da0f1 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -18,6 +18,7 @@ stdenv.mkDerivation rec {
     homepage = "http://webkitgtk.org/";
     license = licenses.bsd2;
     platforms = platforms.linux;
+    hydraPlatforms = [];
     maintainers = with maintainers; [ iyzsong koral ];
   };
 

From 0a2c3ec971fd47267b0f6411fdabeb163c105f91 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 27 Feb 2016 15:31:52 -0600
Subject: [PATCH 1921/2285] mysql: 5.5.45 -> 5.5.48 for multiple CVEs:
 CVE-2015-4792 CVE-2015-4802 CVE-2015-4815 CVE-2015-4816 CVE-2015-4819
 CVE-2015-4826 CVE-2015-4830 CVE-2015-4836 CVE-2015-4858 CVE-2015-4861
 CVE-2015-4870 CVE-2015-4879 CVE-2015-4913

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

diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix
index dbbb9223ee46..8c288e54cd48 100644
--- a/pkgs/servers/sql/mysql/5.5.x.nix
+++ b/pkgs/servers/sql/mysql/5.5.x.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "mysql-${version}";
-  version = "5.5.45";
+  version = "5.5.48";
 
   src = fetchurl {
     url = "mirror://mysql/MySQL-5.5/${name}.tar.gz";
-    sha256 = "0clkr3r44j8nsgmjzv6r09pb0vjangn5hpyjxgg5ynr674ygskkl";
+    sha256 = "10fpzvf6hxvqgaq8paiz8fvhcbbs4qnzqw0svq40bvlyhx2qfgyc";
   };
 
   patches = if stdenv.isCygwin then [

From 73f64108511fc8978599fca14df053c49889e2f5 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 27 Feb 2016 15:35:19 -0600
Subject: [PATCH 1922/2285] cgit: 0.11.2 -> 0.12 for CVE-2016-1899
 CVE-2016-1900 CVE-2016-1901

---
 .../version-management/git-and-tools/cgit/default.nix     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/cgit/default.nix b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
index 6cde64b30900..49e1734fe02d 100644
--- a/pkgs/applications/version-management/git-and-tools/cgit/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/cgit/default.nix
@@ -5,11 +5,11 @@
 
 stdenv.mkDerivation rec {
   name = "cgit-${version}";
-  version = "0.11.2";
+  version = "0.12";
 
   src = fetchurl {
     url = "http://git.zx2c4.com/cgit/snapshot/${name}.tar.xz";
-    sha256 = "0fryh56kyah7v9a8zzhbhwlyy2j116w87sxmgrn2kmwk0rvnw4if";
+    sha256 = "1dx54hgfyabmg9nm5qp6d01f54nlbqbbdwhwl0llb9imjf237qif";
   };
 
   # cgit is tightly coupled with git and needs a git source tree to build.
@@ -18,8 +18,8 @@ stdenv.mkDerivation rec {
   # NOTE: as of 0.10.1, the git version is compatible from 1.9.0 to
   # 1.9.2 (see the repository history)
   gitSrc = fetchurl {
-    url    = "mirror://kernel/software/scm/git/git-2.3.2.tar.xz";
-    sha256 = "09gqijsjfnxlbsxbxzlvllg37bfs9f4jwa2plqsanmba09i89sqq";
+    url    = "mirror://kernel/software/scm/git/git-2.7.0.tar.xz";
+    sha256 = "03bvb8s5j8i54qbi3yayl42bv0wf2fpgnh1a2lkhbj79zi7b77zs";
   };
 
   buildInputs = [

From 62c3ad1dde1304d97ca0c32c4f3965075e3e4526 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Sat, 27 Feb 2016 22:31:29 +0100
Subject: [PATCH 1923/2285] love: fix broken 0.8 + added version 0.72

---
 pkgs/development/interpreters/love/0.7.nix | 51 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  3 +-
 2 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/interpreters/love/0.7.nix

diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix
new file mode 100644
index 000000000000..65f38ae1613d
--- /dev/null
+++ b/pkgs/development/interpreters/love/0.7.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, pkgconfig
+, SDL, mesa, openal, lua
+, libdevil, freetype, physfs
+, libmodplug, mpg123, libvorbis, libogg
+}:
+
+stdenv.mkDerivation rec {
+  name = "love-0.7.2";
+  src = fetchurl {
+    url = "https://bitbucket.org/rude/love/downloads/${name}-linux-src.tar.gz";
+    sha256 = "0s7jywkvydlshlgy11ilzngrnybmq5xlgzp2v2dhlffwrfqdqym5";
+  };
+
+  buildInputs = [
+    pkgconfig SDL mesa openal lua
+    libdevil freetype physfs libmodplug mpg123 libvorbis libogg
+  ];
+
+  preConfigure = ''
+    luaoptions="${"''"} lua luajit "
+    for i in lua luajit-; do
+      for j in 5 5.0 5.1 5.2 5.3 5.4; do
+        luaoptions="$luaoptions $i$j "
+      done
+    done
+    luaso="$(echo "${lua}/lib/"lib*.so.*)"
+    luaso="''${luaso##*/lib}"
+    luaso="''${luaso%%.so*}"
+    luaoptions="$luaoptions $luaso"
+    sed -e "s/${"''"} lua lua.*;/$luaoptions;/" -i configure
+
+    luaincdir="$(echo "${lua}/include"/*/ )"
+    test -d "$luaincdir" && {
+      export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I$luaincdir"
+    } || true
+  '';
+
+  NIX_CFLAGS_COMPILE = ''
+    -I${SDL}/include/SDL
+    -I${freetype}include/freetype2
+  '';
+
+  meta = {
+    homepage = "http://love2d.org";
+    description = "A Lua-based 2D game engine/scripting language";
+    license = stdenv.lib.licenses.zlib;
+
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.raskin ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7491eb99b51c..35858a1cdcc2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5318,7 +5318,8 @@ let
 
   lolcode = callPackage ../development/interpreters/lolcode { };
 
-  love_0_8 = callPackage ../development/interpreters/love/0.8.nix { };
+  love_0_7 = callPackage ../development/interpreters/love/0.7.nix { lua=lua5_1; };
+  love_0_8 = callPackage ../development/interpreters/love/0.8.nix { lua=lua5_1; };
   love_0_9 = callPackage ../development/interpreters/love/0.9.nix { };
   love_0_10 = callPackage ../development/interpreters/love/0.10.nix { };
   love = love_0_10;

From 4a54794d18683db41d2a4203f14c5debf628883c Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 27 Feb 2016 16:13:47 -0600
Subject: [PATCH 1924/2285] xara: broken due to patch-tracker.debian.org being
 missing.

---
 pkgs/applications/graphics/xara/default.nix                   | 4 +++-
 .../networking/mailreaders/thunderbird/default.nix            | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/xara/default.nix b/pkgs/applications/graphics/xara/default.nix
index cd3a09887d0f..cc456465ba63 100644
--- a/pkgs/applications/graphics/xara/default.nix
+++ b/pkgs/applications/graphics/xara/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     url = http://downloads2.xara.com/opensource/XaraLX-0.7r1785.tar.bz2;
     sha256 = "05xbzq1i1vw2mdsv7zjqfpxfv3g1j0g5kks0gq6sh373xd6y8lyh";
   };
-    
+
   nativeBuildInputs = [ automake pkgconfig gettext perl zip ];
   buildInputs = [ wxGTK gtk libxml2 freetype pango ];
 
@@ -17,4 +17,6 @@ stdenv.mkDerivation {
   patches = map fetchurl (import ./debian-patches.nix);
 
   prePatch = "patchShebangs Scripts";
+
+  meta.broken = true;
 }
diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
index 32f77cfa2c22..093e7a22b921 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix
@@ -13,7 +13,7 @@
   enableOfficialBranding ? false
 }:
 
-let version = "38.3.0"; in
+let version = "38.6.0"; in
 let verName = "${version}"; in
 
 stdenv.mkDerivation rec {

From 1aed3948d7584ff594daf35dd8200e1a74f62213 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 27 Feb 2016 16:50:13 -0600
Subject: [PATCH 1925/2285] pythonmagick: 0.9.11 -> 0.9.12

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

diff --git a/pkgs/applications/graphics/PythonMagick/default.nix b/pkgs/applications/graphics/PythonMagick/default.nix
index 17bf7d546709..5ab7d4d8a694 100644
--- a/pkgs/applications/graphics/PythonMagick/default.nix
+++ b/pkgs/applications/graphics/PythonMagick/default.nix
@@ -2,7 +2,7 @@
 
 let
 
-  version = "0.9.11";
+  version = "0.9.12";
 
 in
 
@@ -10,8 +10,8 @@ stdenv.mkDerivation rec {
   name = "pythonmagick-${version}";
 
   src = fetchurl {
-    url = "http://www.imagemagick.org/download/python/releases/PythonMagick-${version}.tar.gz";
-    sha256 = "01z01mlqkk0lvrh2jsmf84qjw29sq4rpj0653x7nqy7mrszwwp2v";
+    url = "http://www.imagemagick.org/download/python/releases/PythonMagick-${version}.tar.xz";
+    sha256 = "1l1kr3d7l40fkxgs6mrlxj65alv2jizm9hhgg9i9g90a8qj8642b";
   };
 
   buildInputs = [python boost pkgconfig imagemagick];

From 7df907b27278abc3c3b716473c188cbff5996f84 Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Sat, 27 Feb 2016 16:54:04 -0600
Subject: [PATCH 1926/2285] moodle: 2.8.5 -> 2.8.10 for CVE-2016-0724
 CVE-2016-0725

---
 .../services/web-servers/apache-httpd/moodle.nix       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/moodle.nix b/nixos/modules/services/web-servers/apache-httpd/moodle.nix
index 84c8281ecd8d..87b1fba5aa10 100644
--- a/nixos/modules/services/web-servers/apache-httpd/moodle.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/moodle.nix
@@ -46,16 +46,16 @@ let
     '';
   # Unpack Moodle and put the config file in its root directory.
   moodleRoot = pkgs.stdenv.mkDerivation rec {
-    name= "moodle-2.8.5";
+    name= "moodle-2.8.10";
 
     src = pkgs.fetchurl {
       url = "https://download.moodle.org/stable28/${name}.tgz";
-      sha256 = "1a159a193010cddedce10ee009184502e6f732e4d7c85167d8597fe5dff9e190";
+      sha256 = "0c3r5081ipcwc9s6shakllnrkd589y2ln5z5m1q09l4h6a7cy4z2";
     };
 
     buildPhase =
       ''
-      ''; 
+      '';
 
     installPhase =
       ''
@@ -132,7 +132,7 @@ in
         cleartext in the Nix store!
       '';
     };
-    
+
     dbPrefix = mkOption {
       default = "mdl_";
       example = "my_other_mdl_";
@@ -158,7 +158,7 @@ in
       type = types.path;
       };
 
-    
+
     extraConfig = mkOption {
       default = "";
       example =

From 3f7c6006664bb203d8dffe74ccb97c5ab35b749c Mon Sep 17 00:00:00 2001
From: makefu <makefu@syntax-fehler.de>
Date: Sun, 28 Feb 2016 01:35:56 +0100
Subject: [PATCH 1927/2285] services.bepasty: buildEnv for creating PYTHONPATH

Fixes 'You need gevent installed to use this worker.' as well as missing Flask deps.
---
 nixos/modules/services/misc/bepasty.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/bepasty.nix b/nixos/modules/services/misc/bepasty.nix
index 12671cb1b6cd..5bda73ab64f0 100644
--- a/nixos/modules/services/misc/bepasty.nix
+++ b/nixos/modules/services/misc/bepasty.nix
@@ -103,9 +103,13 @@ in
           after = [ "network.target" ];
           restartIfChanged = true;
 
-          environment = {
+          environment = let
+            penv = python.buildEnv.override {
+              extraLibs = [ bepasty gevent ];
+            };
+          in {
             BEPASTY_CONFIG = "${server.workDir}/bepasty-${name}.conf";
-            PYTHONPATH= "${bepasty}/lib/${python.libPrefix}/site-packages:${gevent}/lib/${python.libPrefix}/site-packages";
+            PYTHONPATH= "${penv}/${python.sitePackages}/";
           };
 
           serviceConfig = {

From bd737b105c6f257ed602a939cd3adfb1601d08f4 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Sun, 28 Feb 2016 02:39:05 +0100
Subject: [PATCH 1928/2285] btfs: 2.7 -> 2.8

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

diff --git a/pkgs/os-specific/linux/btfs/default.nix b/pkgs/os-specific/linux/btfs/default.nix
index 46b015cd08ac..0470110fc4bf 100644
--- a/pkgs/os-specific/linux/btfs/default.nix
+++ b/pkgs/os-specific/linux/btfs/default.nix
@@ -3,13 +3,13 @@
 
 stdenv.mkDerivation rec {
   name = "btfs-${version}";
-  version = "2.7";
+  version = "2.8";
 
   src = fetchFromGitHub {
     owner = "johang";
     repo = "btfs";
-    rev = "e816b4718bd5c9d88a99805d19d2ad91971b2338";
-    sha256 = "1mac2dwg0pzpmg0x503a8d8gx3ridi4m1qx4jk6ssvl4g9v6p7fl";
+    rev = "0567010e553b290eaa50b1afaa717dd7656c82de";
+    sha256 = "1x3x1v7fhcfcpffprf63sb720nxci2ap2cq92jy1xd68kmshdmwd";
   };
   
   buildInputs = [
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   preConfigure = ''
     autoreconf -i
     substituteInPlace scripts/btplay \
-      --replace /usr/bin/python ${python}/bin/python
+      --replace "/usr/bin/env python" "${python}/bin/python"
   '';
 
   meta = with stdenv.lib; {

From 838379f11786226ad43d35ecc10192ae6addc435 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Sun, 28 Feb 2016 02:56:22 +0100
Subject: [PATCH 1929/2285] bdf2psf: 1.134 -> 1.137

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

diff --git a/pkgs/tools/misc/bdf2psf/default.nix b/pkgs/tools/misc/bdf2psf/default.nix
index 192aed7489d3..c6591927657c 100644
--- a/pkgs/tools/misc/bdf2psf/default.nix
+++ b/pkgs/tools/misc/bdf2psf/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "bdf2psf-${version}";
-  version = "1.134";
+  version = "1.137";
 
   src = fetchurl {
     url = "mirror://debian/pool/main/c/console-setup/bdf2psf_${version}_all.deb";
-    sha256 = "1am5ka5qrbh60jjihzqac03ii3ydprvqm3w54dc55a0zwl61njsz";
+    sha256 = "08pgpwg0ccf0j4r8dbaadh1yr4h4fnvkfb5ym49kwvm2p2vxdq32";
   };
 
   buildInputs = [ dpkg ];

From 1c380842d10c7e0a5f385be3d095cddee8ab9da9 Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Mon, 16 Nov 2015 20:53:39 +0100
Subject: [PATCH 1930/2285] pixie: init at 0-1333

This is the pixie language, a clojure-like lisp, utilizing the pypy vm
toolkit for JIT, GC and C bindings.
---
 .../interpreters/pixie/default.nix            | 79 +++++++++++++++++++
 .../interpreters/pixie/load_paths.patch       | 25 ++++++
 pkgs/top-level/all-packages.nix               |  2 +
 3 files changed, 106 insertions(+)
 create mode 100644 pkgs/development/interpreters/pixie/default.nix
 create mode 100644 pkgs/development/interpreters/pixie/load_paths.patch

diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix
new file mode 100644
index 000000000000..85af751809c6
--- /dev/null
+++ b/pkgs/development/interpreters/pixie/default.nix
@@ -0,0 +1,79 @@
+{ stdenv, fetchgit, fetchurl, python, makeWrapper, pkgconfig, gcc,
+  pypy, libffi, libedit, libuv, boost, zlib,
+  variant ? "jit", buildWithPypy ? false }:
+
+let
+  commit-count = "1333";
+  common-flags = "--thread --gcrootfinder=shadowstack --continuation";
+  variants = {
+    jit = { flags = "--opt=jit"; target = "target.py"; };
+    jit-preload = { flags = "--opt=jit"; target = "target_preload.py"; };
+    no-jit = { flags = ""; target = "target.py"; };
+    no-jit-preload = { flags = ""; target = "target_preload.py"; };
+  };
+  pixie-src = fetchgit {
+    url = "https://github.com/pixie-lang/pixie.git";
+    rev = "36ce07e1cd85ca82eedadf366bef3bb57a627a2a";
+    sha256 = "1b3v99c0is33w029r15qvd0mkrc5n1mrvjjmfpcd9yvhvqb2vcjs";
+  };
+  pypy-tag = "81254";
+  pypy-src = fetchurl {
+    name = "pypy-src-${pypy-tag}";
+    url = "https://bitbucket.org/pypy/pypy/get/${pypy-tag}.tar.bz2";
+    sha256 = "1cs9xqs1rmzdcnwxxkbvy064s5cbp6vvzhn2jmyzh5kg4di1r3bn";
+  };
+  libs = [ libffi libedit libuv boost.dev boost.lib zlib ];
+  include-path = stdenv.lib.concatStringsSep ":"
+                   (map (p: "${p}/include") libs);
+  library-path = stdenv.lib.concatStringsSep ":"
+                   (map (p: "${p}/lib") libs);
+  bin-path = stdenv.lib.concatStringsSep ":"
+               (map (p: "${p}/bin") [ gcc ]);
+  build = {flags, target}: stdenv.mkDerivation rec {
+    name = "pixie-${version}";
+    version = "0-r${commit-count}-${variant}";
+    nativeBuildInputs = libs;
+    buildInputs = [ pkgconfig makeWrapper ];
+    PYTHON = if buildWithPypy
+      then "${pypy}/pypy-c/.pypy-c-wrapped"
+      else "${python}/bin/python";
+    unpackPhase = ''
+      cp -R ${pixie-src} pixie-src
+      mkdir pypy-src
+      (cd pypy-src
+       tar --strip-components=1 -xjf ${pypy-src})
+      chmod -R +w pypy-src pixie-src
+    '';
+    patchPhase = ''
+      (cd pixie-src
+       patch -p1 < ${./load_paths.patch}
+       libraryPaths='["${libuv}" "${libedit}" "${libffi}" "${boost.dev}" "${boost.lib}" "${zlib}"]'
+       export libraryPaths
+       substituteAllInPlace ./pixie/ffi-infer.pxi)
+    '';
+    buildPhase = ''(
+      PYTHONPATH="`pwd`/pypy-src:$PYTHONPATH";
+      RPYTHON="`pwd`/pypy-src/rpython/bin/rpython";
+      cd pixie-src
+      $PYTHON $RPYTHON ${common-flags} ${target}
+      export LD_LIBRARY_PATH="${library-path}:$LD_LIBRARY_PATH"
+      find pixie -name "*.pxi" -exec ./pixie-vm -c {} \;
+    )'';
+    installPhase = ''
+      mkdir -p $out/share $out/bin
+      cp pixie-src/pixie-vm $out/share/pixie-vm
+      cp -R pixie-src/pixie $out/share/pixie
+      makeWrapper $out/share/pixie-vm $out/bin/pxi \
+        --prefix LD_LIBRARY_PATH : ${library-path} \
+        --prefix C_INCLUDE_PATH : ${include-path} \
+        --prefix LIBRARY_PATH : ${library-path} \
+        --prefix PATH : ${bin-path}
+    '';
+    meta = {
+      description = "Pixie is a clojure-like lisp, built with the pypy vm toolkit.";
+      homepage = "https://github.com/pixie-lang/pixie";
+      license = stdenv.lib.licenses.lgpl3;
+      platforms = stdenv.lib.platforms.linux;
+    };
+  };
+in build (builtins.getAttr variant variants)
diff --git a/pkgs/development/interpreters/pixie/load_paths.patch b/pkgs/development/interpreters/pixie/load_paths.patch
new file mode 100644
index 000000000000..a36d280c5867
--- /dev/null
+++ b/pkgs/development/interpreters/pixie/load_paths.patch
@@ -0,0 +1,25 @@
+diff --git a/pixie/ffi-infer.pxi b/pixie/ffi-infer.pxi
+index 9f13ac7..74301c2 100644
+--- a/pixie/ffi-infer.pxi
++++ b/pixie/ffi-infer.pxi
+@@ -1,15 +1,12 @@
+ (ns pixie.ffi-infer
+   (:require [pixie.io-blocking :as io]))
+ 
++(defn -add-library-path [p]
++  (swap! load-paths conj (str p "/include"))
++  (swap! load-paths conj (str p "/lib")))
+ 
+-(defn -add-rel-path [rel]
+-  (swap! load-paths conj (str (first @load-paths) "/" rel)))
+-
+-(-add-rel-path "lib")
+-(-add-rel-path "include")
+-(-add-rel-path "../lib")
+-(-add-rel-path "../include")
+-
++(doseq [lp @libraryPaths@]
++  (-add-library-path lp))
+ 
+ (def *config* nil)
+ (set-dynamic! (var *config*))
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f756a175ac9..74bba53647cd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5507,6 +5507,8 @@ let
     wrapPython = pythonPackages.wrapPython;
   };
 
+  pixie = callPackage ../development/interpreters/pixie { };
+
   bundix = callPackage ../development/interpreters/ruby/bundix {
     ruby = ruby_2_1_3;
   };

From 110dfca98896cda1599eb873aef623c7bd9c92de Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <daniel.fullmer@yale.edu>
Date: Sat, 27 Feb 2016 22:13:30 -0500
Subject: [PATCH 1931/2285] zerotierone: hardcoded path fix

New code in zerotier broke the previous substitution where we refer to
the correct path for "ip".
---
 pkgs/tools/networking/zerotierone/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix
index e2ba2102d76b..9f5f777a239b 100644
--- a/pkgs/tools/networking/zerotierone/default.nix
+++ b/pkgs/tools/networking/zerotierone/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       substituteInPlace ./make-linux.mk \
           --replace 'CXX=$(shell which clang++ g++ c++ 2>/dev/null | head -n 1)' "CC=${gcc}/bin/g++";
       substituteInPlace ./osdep/LinuxEthernetTap.cpp \
-          --replace '/sbin/ip' "${iproute}/bin/ip"
+          --replace 'execlp("ip",' 'execlp("${iproute}/bin/ip",'
   '';
 
   buildInputs = [ openssl lzo zlib gcc iproute ];

From 8fa1fb492064c18f7591845ac845e1b4d0e8e2f1 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 28 Feb 2016 04:51:07 +0100
Subject: [PATCH 1932/2285] connman-dmenu: init at git-29-9-2015

fix indentation
---
 .../networking/connman_dmenu/default.nix      | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/networking/connman_dmenu/default.nix

diff --git a/pkgs/tools/networking/connman_dmenu/default.nix b/pkgs/tools/networking/connman_dmenu/default.nix
new file mode 100644
index 000000000000..42ef7f4f4da7
--- /dev/null
+++ b/pkgs/tools/networking/connman_dmenu/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, connman, dmenu }:
+stdenv.mkDerivation rec {
+  name = "connman_dmenu-${version}";
+  version = "git-29-9-2015";
+
+  src = fetchFromGitHub {
+    owner = "march-linux";
+    repo = "connman_dmenu";
+    rev = "cc89fec40b574b0d234afeb70ea3c94626ca3f5c";
+    sha256 = "061fi83pai4n19l9d7wq6wwj2d7cixwkhkh742c5ibmw1wb274yk";
+  };
+
+  buildInputs = [ connman dmenu ];
+
+  phases = "unpackPhase patchPhase installPhase fixupPhase";
+
+  # remove root requirement, see: https://github.com/march-linux/connman_dmenu/issues/3
+  patchPhase = ''
+    sed -i '89,92d' connman_dmenu
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp connman_dmenu $out/bin/
+  '';
+
+  meta = {
+    description  = "A dmenu wrapper for connmann";
+    homepage     = https://github.com/march-linux/connman_dmenu;
+    license      = stdenv.lib.licenses.free;
+    maintainers  = [ stdenv.lib.maintainers.magnetophon ];
+    platforms    = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7491eb99b51c..0fdd1dbf4518 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1134,6 +1134,8 @@ let
 
   connmanui = callPackage ../tools/networking/connmanui { };
 
+  connman_dmenu = callPackage ../tools/networking/connman_dmenu  { };
+
   convertlit = callPackage ../tools/text/convertlit { };
 
   collectd = callPackage ../tools/system/collectd {

From a0753c7cb2a7b11629fd0a217085659afa8d5fea Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Sun, 13 Dec 2015 16:13:01 +0100
Subject: [PATCH 1933/2285] nsd: 4.1.6 -> 4.1.7

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

diff --git a/pkgs/servers/dns/nsd/default.nix b/pkgs/servers/dns/nsd/default.nix
index 2bd755d03246..d11ef186c319 100644
--- a/pkgs/servers/dns/nsd/default.nix
+++ b/pkgs/servers/dns/nsd/default.nix
@@ -13,11 +13,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nsd-4.1.6";
+  name = "nsd-4.1.7";
 
   src = fetchurl {
     url = "http://www.nlnetlabs.nl/downloads/nsd/${name}.tar.gz";
-    sha256 = "0pvpsxhil60m21h3pqlzs0l5m8qd3l6j8fkjyfg8plwmbh2j5xl8";
+    sha256 = "12hskfgfbkvcgpa1xxkqd8lnc6xvln1amn97x6avfnj9kfrbxa3v";
   };
 
   buildInputs = [ libevent openssl ];
@@ -41,7 +41,6 @@ stdenv.mkDerivation rec {
     homepage = http://www.nlnetlabs.nl;
     description = "Authoritative only, high performance, simple and open source name server";
     license = licenses.bsd3;
-
     platforms = platforms.unix;
     maintainers = [ maintainers.hrdinka ];
   };

From 8442a7d12c399cc8bbe6cd6c4092b0df9f55dbac Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 19 Jan 2016 10:34:58 +0100
Subject: [PATCH 1934/2285] nsd service: code cleanup

Puts everything in alphanumeric order and removes unnecessary spaces to better
match NixOS coding style.
---
 nixos/modules/services/networking/nsd.nix | 856 +++++++++++-----------
 1 file changed, 432 insertions(+), 424 deletions(-)

diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index 10566310041e..4d67703d279c 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -7,14 +7,14 @@ let
 
   username = "nsd";
   stateDir = "/var/lib/nsd";
-  pidFile  = stateDir + "/var/nsd.pid";
+  pidFile = stateDir + "/var/nsd.pid";
 
   nsdPkg = pkgs.nsd.override {
     bind8Stats = cfg.bind8Stats;
-    ipv6       = cfg.ipv6;
-    ratelimit  = cfg.ratelimit.enable;
+    ipv6 = cfg.ipv6;
+    ratelimit = cfg.ratelimit.enable;
     rootServer = cfg.rootServer;
-    zoneStats  = length (collect (x: (x.zoneStats or null) != null) cfg.zones) > 0;
+    zoneStats = length (collect (x: (x.zoneStats or null) != null) cfg.zones) > 0;
   };
 
   zoneFiles = pkgs.stdenv.mkDerivation {
@@ -30,59 +30,60 @@ let
       ];
   };
 
+  # options are ordered alphanumerically by the nixos option name
   configFile = pkgs.writeText "nsd.conf" ''
     server:
-      username: ${username}
       chroot:   "${stateDir}"
+      username: ${username}
 
       # The directory for zonefile: files. The daemon chdirs here.
       zonesdir: "${stateDir}"
 
       # the list of dynamically added zones.
-      zonelistfile: "${stateDir}/var/zone.list"
       database:     "${stateDir}/var/nsd.db"
       pidfile:      "${pidFile}"
       xfrdfile:     "${stateDir}/var/xfrd.state"
       xfrdir:       "${stateDir}/tmp"
+      zonelistfile: "${stateDir}/var/zone.list"
 
       # interfaces
     ${forEach "  ip-address: " cfg.interfaces}
 
-      server-count:        ${toString cfg.serverCount}
-      ip-transparent:      ${yesOrNo  cfg.ipTransparent}
-      do-ip4:              ${yesOrNo  cfg.ipv4}
-      do-ip6:              ${yesOrNo  cfg.ipv6}
-      port:                ${toString cfg.port}
-      verbosity:           ${toString cfg.verbosity}
       hide-version:        ${yesOrNo  cfg.hideVersion}
       identity:            "${cfg.identity}"
+      ip-transparent:      ${yesOrNo  cfg.ipTransparent}
+      do-ip4:              ${yesOrNo  cfg.ipv4}
+      ipv4-edns-size:      ${toString cfg.ipv4EDNSSize}
+      do-ip6:              ${yesOrNo  cfg.ipv6}
+      ipv6-edns-size:      ${toString cfg.ipv6EDNSSize}
       ${maybeString "nsid: " cfg.nsid}
+      port:                ${toString cfg.port}
+      server-count:        ${toString cfg.serverCount}
+      ${if cfg.statistics == null then "" else "statistics:          ${toString cfg.statistics}"}
       tcp-count:           ${toString cfg.tcpCount}
       tcp-query-count:     ${toString cfg.tcpQueryCount}
       tcp-timeout:         ${toString cfg.tcpTimeout}
-      ipv4-edns-size:      ${toString cfg.ipv4EDNSSize}
-      ipv6-edns-size:      ${toString cfg.ipv6EDNSSize}
-      ${if cfg.statistics == null then "" else "statistics:          ${toString cfg.statistics}"}
+      verbosity:           ${toString cfg.verbosity}
       xfrd-reload-timeout: ${toString cfg.xfrdReloadTimeout}
       zonefiles-check:     ${yesOrNo  cfg.zonefilesCheck}
 
-      rrl-size:                ${toString cfg.ratelimit.size}
-      rrl-ratelimit:           ${toString cfg.ratelimit.ratelimit}
-      rrl-whitelist-ratelimit: ${toString cfg.ratelimit.whitelistRatelimit}
-      ${maybeString "rrl-slip: "               cfg.ratelimit.slip}
       ${maybeString "rrl-ipv4-prefix-length: " cfg.ratelimit.ipv4PrefixLength}
       ${maybeString "rrl-ipv6-prefix-length: " cfg.ratelimit.ipv6PrefixLength}
+      rrl-ratelimit:           ${toString cfg.ratelimit.ratelimit}
+      ${maybeString "rrl-slip: "               cfg.ratelimit.slip}
+      rrl-size:                ${toString cfg.ratelimit.size}
+      rrl-whitelist-ratelimit: ${toString cfg.ratelimit.whitelistRatelimit}
 
     ${keyConfigFile}
 
     remote-control:
       control-enable:    ${yesOrNo  cfg.remoteControl.enable}
-    ${forEach "  control-interface: " cfg.remoteControl.interfaces}
-      control-port:      ${toString cfg.port}
-      server-key-file:   "${cfg.remoteControl.serverKeyFile}"
-      server-cert-file:  "${cfg.remoteControl.serverCertFile}"
       control-key-file:  "${cfg.remoteControl.controlKeyFile}"
       control-cert-file: "${cfg.remoteControl.controlCertFile}"
+    ${forEach "  control-interface: " cfg.remoteControl.interfaces}
+      control-port:      ${toString cfg.remoteControl.port}
+      server-key-file:   "${cfg.remoteControl.serverKeyFile}"
+      server-cert-file:  "${cfg.remoteControl.serverCertFile}"
 
     # zone files reside in "${zoneFiles}" linked to "${stateDir}/zones"
     ${concatStrings (mapAttrsToList zoneConfigFile zoneConfigs)}
@@ -90,9 +91,9 @@ let
     ${cfg.extraConfig}
   '';
 
-  yesOrNo     = b: if b then "yes" else "no";
+  yesOrNo = b: if b then "yes" else "no";
   maybeString = pre: s: if s == null then "" else ''${pre} "${s}"'';
-  forEach     = pre: l: concatMapStrings (x: pre + x + "\n") l;
+  forEach = pre: l: concatMapStrings (x: pre + x + "\n") l;
 
 
   keyConfigFile = concatStrings (mapAttrsToList (keyName: keyOptions: ''
@@ -111,17 +112,18 @@ let
   '') cfg.keys);
 
 
+  # options are ordered alphanumerically by the nixos option name
   zoneConfigFile = name: zone: ''
     zone:
       name:         "${name}"
       zonefile:     "${stateDir}/zones/${name}"
-      ${maybeString "zonestats: "          zone.zoneStats}
       ${maybeString "outgoing-interface: " zone.outgoingInterface}
     ${forEach     "  rrl-whitelist: "      zone.rrlWhitelist}
+      ${maybeString "zonestats: "          zone.zoneStats}
 
+      allow-axfr-fallback: ${yesOrNo       zone.allowAXFRFallback}
     ${forEach     "  allow-notify: "       zone.allowNotify}
     ${forEach     "  request-xfr: "        zone.requestXFR}
-      allow-axfr-fallback: ${yesOrNo       zone.allowAXFRFallback}
 
     ${forEach     "  notify: "             zone.notify}
       notify-retry:                        ${toString zone.notifyRetry}
@@ -142,7 +144,7 @@ let
       );
 
   # fighting infinite recursion
-  zoneOptions  = zoneOptionsRaw // childConfig zoneOptions1 true;
+  zoneOptions = zoneOptionsRaw // childConfig zoneOptions1 true;
   zoneOptions1 = zoneOptionsRaw // childConfig zoneOptions2 false;
   zoneOptions2 = zoneOptionsRaw // childConfig zoneOptions3 false;
   zoneOptions3 = zoneOptionsRaw // childConfig zoneOptions4 false;
@@ -152,26 +154,25 @@ let
 
   childConfig = x: v: { options.children = { type = types.attrsOf x; visible = v; }; };
 
+  # options are ordered alphanumerically
   zoneOptionsRaw = types.submodule {
     options = {
-      children = mkOption {
-        default     = {};
+
+      allowAXFRFallback = mkOption {
+        type = types.bool;
+        default = true;
         description = ''
-          Children zones inherit all options of their parents. Attributes
-          defined in a child will overwrite the ones of its parent. Only
-          leaf zones will be actually served. This way it's possible to
-          define maybe zones which share most attributes without
-          duplicating everything. This mechanism replaces nsd's patterns
-          in a save and functional way.
+          If NSD as secondary server should be allowed to AXFR if the primary
+          server does not allow IXFR.
         '';
       };
 
       allowNotify = mkOption {
-        type        = types.listOf types.str;
-        default     = [ ];
-        example     = [ "192.0.2.0/24 NOKEY" "10.0.0.1-10.0.0.5 my_tsig_key_name"
-                        "10.0.3.4&255.255.0.0 BLOCKED"
-                      ];
+        type = types.listOf types.str;
+        default = [ ];
+        example = [ "192.0.2.0/24 NOKEY" "10.0.0.1-10.0.0.5 my_tsig_key_name"
+                    "10.0.3.4&255.255.0.0 BLOCKED"
+                  ];
         description = ''
           Listed primary servers are allowed to notify this secondary server.
           <screen><![CDATA[
@@ -193,28 +194,32 @@ let
         '';
       };
 
-      requestXFR = mkOption {
-        type        = types.listOf types.str;
-        default     = [];
-        example     = [];
+      children = mkOption {
+        default = {};
         description = ''
-          Format: <code>[AXFR|UDP] &lt;ip-address&gt; &lt;key-name | NOKEY&gt;</code>
+          Children zones inherit all options of their parents. Attributes
+          defined in a child will overwrite the ones of its parent. Only
+          leaf zones will be actually served. This way it's possible to
+          define maybe zones which share most attributes without
+          duplicating everything. This mechanism replaces nsd's patterns
+          in a save and functional way.
         '';
       };
 
-      allowAXFRFallback = mkOption {
-        type        = types.bool;
-        default     = true;
+      data = mkOption {
+        type = types.str;
+        default = "";
+        example = "";
         description = ''
-          If NSD as secondary server should be allowed to AXFR if the primary
-          server does not allow IXFR.
+          The actual zone data. This is the content of your zone file.
+          Use imports or pkgs.lib.readFile if you don't want this data in your config file.
         '';
       };
 
       notify = mkOption {
-        type        = types.listOf types.str;
-        default     = [];
-        example     = [ "10.0.0.1@3721 my_key" "::5 NOKEY" ];
+        type = types.listOf types.str;
+        default = [];
+        example = [ "10.0.0.1@3721 my_key" "::5 NOKEY" ];
         description = ''
           This primary server will notify all given secondary servers about
           zone changes.
@@ -231,27 +236,17 @@ let
       };
 
       notifyRetry = mkOption {
-        type        = types.int;
-        default     = 5;
+        type = types.int;
+        default = 5;
         description = ''
           Specifies the number of retries for failed notifies. Set this along with notify.
         '';
       };
 
-      provideXFR = mkOption {
-        type        = types.listOf types.str;
-        default     = [];
-        example     = [ "192.0.2.0/24 NOKEY" "192.0.2.0/24 my_tsig_key_name" ];
-        description = ''
-          Allow these IPs and TSIG to transfer zones, addr TSIG|NOKEY|BLOCKED
-          address range 192.0.2.0/24, 1.2.3.4&amp;255.255.0.0, 3.0.2.20-3.0.2.40
-        '';
-      };
-
       outgoingInterface = mkOption {
-        type        = types.nullOr types.str;
-        default     = null;
-        example     = "2000::1@1234";
+        type = types.nullOr types.str;
+        default = null;
+        example = "2000::1@1234";
         description = ''
           This address will be used for zone-transfere requests if configured
           as a secondary server or notifications in case of a primary server.
@@ -260,9 +255,28 @@ let
         '';
       };
 
+      provideXFR = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [ "192.0.2.0/24 NOKEY" "192.0.2.0/24 my_tsig_key_name" ];
+        description = ''
+          Allow these IPs and TSIG to transfer zones, addr TSIG|NOKEY|BLOCKED
+          address range 192.0.2.0/24, 1.2.3.4&amp;255.255.0.0, 3.0.2.20-3.0.2.40
+        '';
+      };
+
+      requestXFR = mkOption {
+        type = types.listOf types.str;
+        default = [];
+        example = [];
+        description = ''
+          Format: <code>[AXFR|UDP] &lt;ip-address&gt; &lt;key-name | NOKEY&gt;</code>
+        '';
+      };
+
       rrlWhitelist = mkOption {
-        type        = types.listOf types.str;
-        default     = [];
+        type = types.listOf types.str;
+        default = [];
         description = ''
           Whitelists the given rrl-types.
           The RRL classification types are:  nxdomain,  error, referral, any,
@@ -270,20 +284,10 @@ let
         '';
       };
 
-      data = mkOption {
-        type        = types.str;
-        default     = "";
-        example     = "";
-        description = ''
-          The actual zone data. This is the content of your zone file.
-          Use imports or pkgs.lib.readFile if you don't want this data in your config file.
-        '';
-      };
-
       zoneStats = mkOption {
-        type        = types.nullOr types.str;
-        default     = null;
-        example     = "%s";
+        type = types.nullOr types.str;
+        default = null;
+        example = "%s";
         description = ''
           When set to something distinct to null NSD is able to collect
           statistics per zone. All statistics of this zone(s) will be added
@@ -292,403 +296,407 @@ let
           and stats_noreset.
         '';
       };
+
     };
   };
 
 in
 {
-  options = {
-    services.nsd = {
+  # options are ordered alphanumerically
+  options.services.nsd = {
 
-      enable = mkEnableOption "NSD authoritative DNS server";
-      bind8Stats = mkEnableOption "BIND8 like statistics";
+    enable = mkEnableOption "NSD authoritative DNS server";
 
-      rootServer = mkOption {
-        type        = types.bool;
-        default     = false;
-        description = ''
-          Wheter if this server will be a root server (a DNS root server, you
-          usually don't want that).
-        '';
-      };
+    bind8Stats = mkEnableOption "BIND8 like statistics";
 
-      interfaces = mkOption {
-        type        = types.listOf types.str;
-        default     = [ "127.0.0.0" "::1" ];
-        description = ''
-          What addresses the server should listen to.
-        '';
-      };
+    extraConfig = mkOption {
+      type = types.str;
+      default = "";
+      description = ''
+        Extra nsd config.
+      '';
+    };
 
-      serverCount = mkOption {
-        type        = types.int;
-        default     = 1;
-        description = ''
-          Number of NSD servers to fork. Put the number of CPUs to use here.
-        '';
-      };
+    hideVersion = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Wheter NSD should answer VERSION.BIND and VERSION.SERVER CHAOS class queries.
+      '';
+    };
 
-      ipTransparent = mkOption {
-        type        = types.bool;
-        default     = false;
-        description = ''
-          Allow binding to non local addresses.
-        '';
-      };
+    identity = mkOption {
+      type = types.str;
+      default = "unidentified server";
+      description = ''
+        Identify the server (CH TXT ID.SERVER entry).
+      '';
+    };
 
-      ipv4 = mkOption {
-        type        = types.bool;
-        default     = true;
-        description = ''
-          Wheter to listen on IPv4 connections.
-        '';
-      };
+    interfaces = mkOption {
+      type = types.listOf types.str;
+      default = [ "127.0.0.0" "::1" ];
+      description = ''
+        What addresses the server should listen to.
+      '';
+    };
 
-      ipv6 = mkOption {
-        type        = types.bool;
-        default     = true;
-        description = ''
-          Wheter to listen on IPv6 connections.
-        '';
-      };
+    ipTransparent = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Allow binding to non local addresses.
+      '';
+    };
 
-      port = mkOption {
-        type        = types.int;
-        default     = 53;
-        description = ''
-          Port the service should bind do.
-        '';
-      };
+    ipv4 = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Wheter to listen on IPv4 connections.
+      '';
+    };
 
-      verbosity = mkOption {
-        type        = types.int;
-        default     = 0;
-        description = ''
-          Verbosity level.
-        '';
-      };
+    ipv4EDNSSize = mkOption {
+      type = types.int;
+      default = 4096;
+      description = ''
+        Preferred EDNS buffer size for IPv4.
+      '';
+    };
 
-      hideVersion = mkOption {
-        type        = types.bool;
-        default     = true;
-        description = ''
-          Wheter NSD should answer VERSION.BIND and VERSION.SERVER CHAOS class queries.
-        '';
-      };
+    ipv6 = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Wheter to listen on IPv6 connections.
+      '';
+    };
 
-      identity = mkOption {
-        type        = types.str;
-        default     = "unidentified server";
-        description = ''
-          Identify the server (CH TXT ID.SERVER entry).
-        '';
-      };
+    ipv6EDNSSize = mkOption {
+      type = types.int;
+      default = 4096;
+      description = ''
+        Preferred EDNS buffer size for IPv6.
+      '';
+    };
 
-      nsid = mkOption {
-        type        = types.nullOr types.str;
-        default     = null;
-        description = ''
-          NSID identity (hex string, or "ascii_somestring").
-        '';
-      };
+    nsid = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        NSID identity (hex string, or "ascii_somestring").
+      '';
+    };
 
-      tcpCount = mkOption {
-        type        = types.int;
-        default     = 100;
-        description = ''
-          Maximum number of concurrent TCP connections per server.
-        '';
-      };
+    port = mkOption {
+      type = types.int;
+      default = 53;
+      description = ''
+        Port the service should bind do.
+      '';
+    };
 
-      tcpQueryCount = mkOption {
-        type        = types.int;
-        default     = 0;
-        description = ''
-          Maximum number of queries served on a single TCP connection.
-          0 means no maximum.
-        '';
-      };
+    rootServer = mkOption {
+      type = types.bool;
+      default = false;
+      description = ''
+        Wheter if this server will be a root server (a DNS root server, you
+        usually don't want that).
+      '';
+    };
 
-      tcpTimeout = mkOption {
-        type        = types.int;
-        default     = 120;
-        description = ''
-          TCP timeout in seconds.
-        '';
-      };
+    serverCount = mkOption {
+      type = types.int;
+      default = 1;
+      description = ''
+        Number of NSD servers to fork. Put the number of CPUs to use here.
+      '';
+    };
 
-      ipv4EDNSSize = mkOption {
-        type        = types.int;
-        default     = 4096;
-        description = ''
-          Preferred EDNS buffer size for IPv4.
-        '';
-      };
+    statistics = mkOption {
+      type = types.nullOr types.int;
+      default = null;
+      description = ''
+        Statistics are produced every number of seconds. Prints to log.
+        If null no statistics are logged.
+      '';
+    };
 
-      ipv6EDNSSize = mkOption {
-        type        = types.int;
-        default     = 4096;
-        description = ''
-          Preferred EDNS buffer size for IPv6.
-        '';
-      };
+    tcpCount = mkOption {
+      type = types.int;
+      default = 100;
+      description = ''
+        Maximum number of concurrent TCP connections per server.
+      '';
+    };
 
-      statistics = mkOption {
-        type        = types.nullOr types.int;
-        default     = null;
-        description = ''
-          Statistics are produced every number of seconds. Prints to log.
-          If null no statistics are logged.
-        '';
-      };
+    tcpQueryCount = mkOption {
+      type = types.int;
+      default = 0;
+      description = ''
+        Maximum number of queries served on a single TCP connection.
+        0 means no maximum.
+      '';
+    };
 
-      xfrdReloadTimeout = mkOption {
-        type        = types.int;
-        default     = 1;
-        description = ''
-          Number of seconds between reloads triggered by xfrd.
-        '';
-      };
+    tcpTimeout = mkOption {
+      type = types.int;
+      default = 120;
+      description = ''
+        TCP timeout in seconds.
+      '';
+    };
 
-      zonefilesCheck = mkOption {
-        type        = types.bool;
-        default     = true;
-        description = ''
-          Wheter to check mtime of all zone files on start and sighup.
-        '';
-      };
+    verbosity = mkOption {
+      type = types.int;
+      default = 0;
+      description = ''
+        Verbosity level.
+      '';
+    };
+
+    xfrdReloadTimeout = mkOption {
+      type = types.int;
+      default = 1;
+      description = ''
+        Number of seconds between reloads triggered by xfrd.
+      '';
+    };
+
+    zonefilesCheck = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Wheter to check mtime of all zone files on start and sighup.
+      '';
+    };
 
 
-      extraConfig = mkOption {
-        type        = types.str;
-        default     = "";
-        description = ''
-          Extra nsd config.
-        '';
-      };
+    keys = mkOption {
+      type = types.attrsOf (types.submodule {
+        options = {
 
-
-      ratelimit = {
-        enable = mkEnableOption "ratelimit capabilities";
-
-        size = mkOption {
-          type        = types.int;
-          default     = 1000000;
-          description = ''
-            Size of the hashtable. More buckets use more memory but lower
-            the chance of hash hash collisions.
-          '';
-        };
-
-        ratelimit = mkOption {
-          type        = types.int;
-          default     = 200;
-          description = ''
-            Max qps allowed from any query source.
-            0 means unlimited. With an verbosity of 2 blocked and
-            unblocked subnets will be logged.
-          '';
-        };
-
-        whitelistRatelimit = mkOption {
-          type        = types.int;
-          default     = 2000;
-          description = ''
-            Max qps allowed from whitelisted sources.
-            0 means unlimited. Set the rrl-whitelist option for specific
-            queries to apply this limit instead of the default to them.
-          '';
-        };
-
-        slip = mkOption {
-          type        = types.nullOr types.int;
-          default     = null;
-          description = ''
-            Number of packets that get discarded before replying a SLIP response.
-            0 disables SLIP responses. 1 will make every response a SLIP response.
-          '';
-        };
-
-        ipv4PrefixLength = mkOption {
-          type        = types.nullOr types.int;
-          default     = null;
-          description = ''
-            IPv4 prefix length. Addresses are grouped by netblock.
-          '';
-        };
-
-        ipv6PrefixLength = mkOption {
-          type        = types.nullOr types.int;
-          default     = null;
-          description = ''
-            IPv6 prefix length. Addresses are grouped by netblock.
-          '';
-        };
-      };
-
-
-      remoteControl = {
-        enable = mkEnableOption "remote control via nsd-control";
-
-        interfaces = mkOption {
-          type        = types.listOf types.str;
-          default     = [ "127.0.0.1" "::1" ];
-          description = ''
-            Which interfaces NSD should bind to for remote control.
-          '';
-        };
-
-        port = mkOption {
-          type        = types.int;
-          default     = 8952;
-          description = ''
-            Port number for remote control operations (uses TLS over TCP).
-          '';
-        };
-
-        serverKeyFile = mkOption {
-          type        = types.path;
-          default     = "/etc/nsd/nsd_server.key";
-          description = ''
-            Path to the server private key, which is used by the server
-            but not by nsd-control. This file is generated by nsd-control-setup.
-          '';
-        };
-
-        serverCertFile = mkOption {
-          type        = types.path;
-          default     = "/etc/nsd/nsd_server.pem";
-          description = ''
-            Path to the server self signed certificate, which is used by the server
-            but and by nsd-control. This file is generated by nsd-control-setup.
-          '';
-        };
-
-        controlKeyFile = mkOption {
-          type        = types.path;
-          default     = "/etc/nsd/nsd_control.key";
-          description = ''
-            Path to the client private key, which is used by nsd-control
-            but not by the server. This file is generated by nsd-control-setup.
-          '';
-        };
-
-        controlCertFile = mkOption {
-          type        = types.path;
-          default     = "/etc/nsd/nsd_control.pem";
-          description = ''
-            Path to the client certificate signed with the server certificate.
-            This file is used by nsd-control and generated by nsd-control-setup.
-          '';
-        };
-      };
-
-
-      keys = mkOption {
-        type = types.attrsOf (types.submodule {
-          options = {
-            algorithm = mkOption {
-              type        = types.str;
-              default     = "hmac-sha256";
-              description = ''
-                Authentication algorithm for this key.
-              '';
-            };
-
-            keyFile = mkOption {
-              type        = types.path;
-              description = ''
-                Path to the file which contains the actual base64 encoded
-                key. The key will be copied into "${stateDir}/private" before
-                NSD starts. The copied file is only accessibly by the NSD
-                user.
-              '';
-            };
+          algorithm = mkOption {
+            type = types.str;
+            default = "hmac-sha256";
+            description = ''
+              Authentication algorithm for this key.
+            '';
           };
-        });
-        default = {};
-        example = {
-          "tsig.example.org" = {
-            algorithm = "hmac-md5";
-            secret    = "aaaaaabbbbbbccccccdddddd";
+
+          keyFile = mkOption {
+            type = types.path;
+            description = ''
+              Path to the file which contains the actual base64 encoded
+              key. The key will be copied into "${stateDir}/private" before
+              NSD starts. The copied file is only accessibly by the NSD
+              user.
+            '';
           };
+
         };
+      });
+      default = {};
+      example = {
+        "tsig.example.org" = {
+          algorithm = "hmac-md5";
+          secret = "aaaaaabbbbbbccccccdddddd";
+        };
+      };
+      description = ''
+        Define your TSIG keys here.
+      '';
+    };
+
+
+    ratelimit = {
+
+      enable = mkEnableOption "ratelimit capabilities";
+
+      ipv4PrefixLength = mkOption {
+        type = types.nullOr types.int;
+        default = null;
         description = ''
-          Define your TSIG keys here.
+          IPv4 prefix length. Addresses are grouped by netblock.
         '';
       };
 
-      zones = mkOption {
-        type        = types.attrsOf zoneOptions;
-        default     = {};
-        example     = literalExample ''
-          { "serverGroup1" = {
-              provideXFR = [ "10.1.2.3 NOKEY" ];
-              children = {
-                "example.com." = {
-                  data = '''
-                    $ORIGIN example.com.
-                    $TTL    86400
-                    @ IN SOA a.ns.example.com. admin.example.com. (
-                    ...
-                  ''';
-                };
-                "example.org." = {
-                  data = '''
-                    $ORIGIN example.org.
-                    $TTL    86400
-                    @ IN SOA a.ns.example.com. admin.example.com. (
-                    ...
-                  ''';
-                };
-              };
-            };
-
-            "example.net." = {
-              provideXFR = [ "10.3.2.1 NOKEY" ];
-              data = '''
-                ...
-              ''';
-            };
-          }
-        '';
+      ipv6PrefixLength = mkOption {
+        type = types.nullOr types.int;
+        default = null;
         description = ''
-          Define your zones here. Zones can cascade other zones and therefore
-          inherit settings from parent zones. Look at the definition of
-          children to learn about inheritance and child zones.
-          The given example will define 3 zones (example.(com|org|net).). Both
-          example.com. and example.org. inherit their configuration from
-          serverGroup1.
+          IPv6 prefix length. Addresses are grouped by netblock.
+        '';
+      };
+
+      ratelimit = mkOption {
+        type = types.int;
+        default = 200;
+        description = ''
+          Max qps allowed from any query source.
+          0 means unlimited. With an verbosity of 2 blocked and
+          unblocked subnets will be logged.
+        '';
+      };
+
+      slip = mkOption {
+        type = types.nullOr types.int;
+        default = null;
+        description = ''
+          Number of packets that get discarded before replying a SLIP response.
+          0 disables SLIP responses. 1 will make every response a SLIP response.
+        '';
+      };
+
+      size = mkOption {
+        type = types.int;
+        default = 1000000;
+        description = ''
+          Size of the hashtable. More buckets use more memory but lower
+          the chance of hash hash collisions.
+        '';
+      };
+
+      whitelistRatelimit = mkOption {
+        type = types.int;
+        default = 2000;
+        description = ''
+          Max qps allowed from whitelisted sources.
+          0 means unlimited. Set the rrl-whitelist option for specific
+          queries to apply this limit instead of the default to them.
         '';
       };
 
     };
+
+
+    remoteControl = {
+
+      enable = mkEnableOption "remote control via nsd-control";
+
+      controlCertFile = mkOption {
+        type = types.path;
+        default = "/etc/nsd/nsd_control.pem";
+        description = ''
+          Path to the client certificate signed with the server certificate.
+          This file is used by nsd-control and generated by nsd-control-setup.
+        '';
+      };
+
+      controlKeyFile = mkOption {
+        type = types.path;
+        default = "/etc/nsd/nsd_control.key";
+        description = ''
+          Path to the client private key, which is used by nsd-control
+          but not by the server. This file is generated by nsd-control-setup.
+        '';
+      };
+
+      interfaces = mkOption {
+        type = types.listOf types.str;
+        default = [ "127.0.0.1" "::1" ];
+        description = ''
+          Which interfaces NSD should bind to for remote control.
+        '';
+      };
+
+      port = mkOption {
+        type = types.int;
+        default = 8952;
+        description = ''
+          Port number for remote control operations (uses TLS over TCP).
+        '';
+      };
+
+      serverCertFile = mkOption {
+        type = types.path;
+        default = "/etc/nsd/nsd_server.pem";
+        description = ''
+          Path to the server self signed certificate, which is used by the server
+          but and by nsd-control. This file is generated by nsd-control-setup.
+        '';
+      };
+
+      serverKeyFile = mkOption {
+        type = types.path;
+        default = "/etc/nsd/nsd_server.key";
+        description = ''
+          Path to the server private key, which is used by the server
+          but not by nsd-control. This file is generated by nsd-control-setup.
+        '';
+      };
+
+    };
+
+
+    zones = mkOption {
+      type = types.attrsOf zoneOptions;
+      default = {};
+      example = {
+        "serverGroup1" = {
+          provideXFR = [ "10.1.2.3 NOKEY" ];
+          children = {
+            "example.com." = {
+              data = ''
+                $ORIGIN example.com.
+                $TTL    86400
+                @ IN SOA a.ns.example.com. admin.example.com. (
+                ...
+              '';
+            };
+            "example.org." = {
+              data = ''
+                $ORIGIN example.org.
+                $TTL    86400
+                @ IN SOA a.ns.example.com. admin.example.com. (
+                ...
+              '';
+            };
+          };
+        };
+
+        "example.net." = {
+          provideXFR = [ "10.3.2.1 NOKEY" ];
+          data = ''...'';
+        };
+      };
+      description = ''
+        Define your zones here. Zones can cascade other zones and therefore
+        inherit settings from parent zones. Look at the definition of
+        children to learn about inheritance and child zones.
+        The given example will define 3 zones (example.(com|org|net).). Both
+        example.com. and example.org. inherit their configuration from
+        serverGroup1.
+      '';
+    };
+
   };
 
   config = mkIf cfg.enable {
 
     users.extraGroups = singleton {
       name = username;
-      gid  = config.ids.gids.nsd;
+      gid = config.ids.gids.nsd;
     };
 
     users.extraUsers = singleton {
-      name        = username;
+      name = username;
       description = "NSD service user";
-      home        = stateDir;
+      home = stateDir;
       createHome  = true;
-      uid         = config.ids.uids.nsd;
-      group       = username;
+      uid = config.ids.uids.nsd;
+      group = username;
     };
 
     systemd.services.nsd = {
       description = "NSD authoritative only domain name service";
-      wantedBy    = [ "multi-user.target" ];
-      after       = [ "network.target" ];
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
 
       serviceConfig = {
-        PIDFile   = pidFile;
-        Restart   = "always";
+        PIDFile = pidFile;
+        Restart = "always";
         ExecStart = "${nsdPkg}/sbin/nsd -d -c ${configFile}";
       };
 

From 6a096504cc8d661dc12957dbf79b6209a69d72af Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 19 Jan 2016 11:03:57 +0100
Subject: [PATCH 1935/2285] nsd service: add missing options

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

diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index 4d67703d279c..b822a29423a6 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -56,14 +56,18 @@ let
       ipv4-edns-size:      ${toString cfg.ipv4EDNSSize}
       do-ip6:              ${yesOrNo  cfg.ipv6}
       ipv6-edns-size:      ${toString cfg.ipv6EDNSSize}
+      log-time-asci:       ${yesOrNo  cfg.logTimeAscii}
       ${maybeString "nsid: " cfg.nsid}
       port:                ${toString cfg.port}
+      reuseport:           ${yesOrNo  cfg.reuseport}
+      round-robin:         ${yesOrNo  cfg.roundRobin}
       server-count:        ${toString cfg.serverCount}
       ${if cfg.statistics == null then "" else "statistics:          ${toString cfg.statistics}"}
       tcp-count:           ${toString cfg.tcpCount}
       tcp-query-count:     ${toString cfg.tcpQueryCount}
       tcp-timeout:         ${toString cfg.tcpTimeout}
       verbosity:           ${toString cfg.verbosity}
+      ${maybeString "version: " cfg.version}
       xfrd-reload-timeout: ${toString cfg.xfrdReloadTimeout}
       zonefiles-check:     ${yesOrNo  cfg.zonefilesCheck}
 
@@ -381,6 +385,14 @@ in
       '';
     };
 
+    logTimeAscii = mkOption {
+      type = types.bool;
+      default = true;
+      description = ''
+        Log time in ascii, if false then in unix epoch seconds.
+      '';
+    };
+
     nsid = mkOption {
       type = types.nullOr types.str;
       default = null;
@@ -397,6 +409,17 @@ in
       '';
     };
 
+    reuseport = mkOption {
+      type = types.bool;
+      default = pkgs.stdenv.isLinux;
+      description = ''
+        Wheter to enable SO_REUSEPORT on all used sockets. This lets multiple
+        processes bind to the same port. This speeds up operation especially
+        if the server count is greater than one and makes fast restarts less
+        prone to fail
+      '';
+    };
+
     rootServer = mkOption {
       type = types.bool;
       default = false;
@@ -406,6 +429,8 @@ in
       '';
     };
 
+    roundRobin = mkEnableOption "round robin rotation of records";
+
     serverCount = mkOption {
       type = types.int;
       default = 1;
@@ -456,6 +481,16 @@ in
       '';
     };
 
+    version = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = ''
+        The version string replied for CH TXT version.server and version.bind
+        queries. Will use the compiled package version on null.
+        See hideVersion for enabling/disabling this responses.
+      '';
+    };
+
     xfrdReloadTimeout = mkOption {
       type = types.int;
       default = 1;

From c4c9019105f790252a3b996c6dad4c33393e7977 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 19 Jan 2016 11:10:09 +0100
Subject: [PATCH 1936/2285] nsd service: make use of literalExample

---
 nixos/modules/services/networking/nsd.nix | 62 ++++++++++++-----------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index b822a29423a6..5a7bc7f748e4 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -533,12 +533,13 @@ in
         };
       });
       default = {};
-      example = {
-        "tsig.example.org" = {
-          algorithm = "hmac-md5";
-          secret = "aaaaaabbbbbbccccccdddddd";
+      example = literalExample ''
+        { "tsig.example.org" = {
+            algorithm = "hmac-md5";
+            keyFile = "/path/to/my/key";
+          };
         };
-      };
+      '';
       description = ''
         Define your TSIG keys here.
       '';
@@ -668,34 +669,37 @@ in
     zones = mkOption {
       type = types.attrsOf zoneOptions;
       default = {};
-      example = {
-        "serverGroup1" = {
-          provideXFR = [ "10.1.2.3 NOKEY" ];
-          children = {
-            "example.com." = {
-              data = ''
-                $ORIGIN example.com.
-                $TTL    86400
-                @ IN SOA a.ns.example.com. admin.example.com. (
-                ...
-              '';
-            };
-            "example.org." = {
-              data = ''
-                $ORIGIN example.org.
-                $TTL    86400
-                @ IN SOA a.ns.example.com. admin.example.com. (
-                ...
-              '';
+      example = literalExample ''
+        { "serverGroup1" = {
+            provideXFR = [ "10.1.2.3 NOKEY" ];
+            children = {
+              "example.com." = {
+                data = '''
+                  $ORIGIN example.com.
+                  $TTL    86400
+                  @ IN SOA a.ns.example.com. admin.example.com. (
+                  ...
+                ''';
+              };
+              "example.org." = {
+                data = '''
+                  $ORIGIN example.org.
+                  $TTL    86400
+                  @ IN SOA a.ns.example.com. admin.example.com. (
+                  ...
+                ''';
+              };
             };
           };
-        };
 
-        "example.net." = {
-          provideXFR = [ "10.3.2.1 NOKEY" ];
-          data = ''...'';
+          "example.net." = {
+            provideXFR = [ "10.3.2.1 NOKEY" ];
+            data = '''
+              ...
+            ''';
+          };
         };
-      };
+      '';
       description = ''
         Define your zones here. Zones can cascade other zones and therefore
         inherit settings from parent zones. Look at the definition of

From 73630b89862222daacd67a3acd0b41cb4e41071a Mon Sep 17 00:00:00 2001
From: "Nicolas B. Pierron" <nicolas.b.pierron@gmail.com>
Date: Sun, 23 Aug 2015 16:39:13 +0200
Subject: [PATCH 1937/2285] nsd service: add non-backward compatible release
 note entry

---
 .../doc/manual/release-notes/rl-unstable.xml  | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-unstable.xml
index ddbd80a8a00d..5c2938794b95 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-unstable.xml
@@ -226,6 +226,27 @@ programs.ibus.plugins = with pkgs; [ ibus-anthy mozc ];
     was removed. Please review the currently available options.</para>
   </listitem>
 
+  <listitem>
+    <para>
+    The option <option>services.nsd.zones.&lt;name&gt;.data</option> no
+    longer interpret the dollar sign ($) as a shell variable, as such it
+    should not be escaped anymore.  Thus the following zone data:
+    </para>
+    <programlisting>
+\$ORIGIN example.com.
+\$TTL 1800
+@       IN      SOA     ns1.vpn.nbp.name.      admin.example.com. (
+    </programlisting>
+    <para>
+    Should modified to look like the actual file expected by nsd:
+    </para>
+    <programlisting>
+$ORIGIN example.com.
+$TTL 1800
+@       IN      SOA     ns1.vpn.nbp.name.      admin.example.com. (
+    </programlisting>
+  </listitem>
+
 </itemizedlist>
 
 

From fd46f18cf6cb0edcc5a775e7be95a71297f0c54e Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Tue, 19 Jan 2016 21:53:16 +0100
Subject: [PATCH 1938/2285] nsd service: add build time config validation

---
 nixos/modules/services/networking/nsd.nix | 86 +++++++++++++++--------
 1 file changed, 58 insertions(+), 28 deletions(-)

diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index 5a7bc7f748e4..b3f2730e672f 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -9,6 +9,7 @@ let
   stateDir = "/var/lib/nsd";
   pidFile = stateDir + "/var/nsd.pid";
 
+  # build nsd with the options needed for the given config
   nsdPkg = pkgs.nsd.override {
     bind8Stats = cfg.bind8Stats;
     ipv6 = cfg.ipv6;
@@ -17,21 +18,42 @@ let
     zoneStats = length (collect (x: (x.zoneStats or null) != null) cfg.zones) > 0;
   };
 
-  zoneFiles = pkgs.stdenv.mkDerivation {
-    preferLocalBuild = true;
+
+  nsdEnv = pkgs.buildEnv {
     name = "nsd-env";
-    buildCommand = concatStringsSep "\n"
-      [ "mkdir -p $out"
-        (concatStrings (mapAttrsToList (zoneName: zoneOptions: ''
-          cat > "$out/${zoneName}" <<_EOF_
-          ${zoneOptions.data}
-          _EOF_
-        '') zoneConfigs))
-      ];
+
+    paths = [ configFile ]
+      ++ mapAttrsToList (name: zone: writeZoneData name zone.data) zoneConfigs;
+
+    postBuild = ''
+      echo "checking zone files"
+      cd $out/zones
+
+      for zoneFile in *; do
+        ${nsdPkg}/sbin/nsd-checkzone "$zoneFile" "$zoneFile" || {
+          if grep -q \\\\\\$ "$zoneFile"; then
+            echo zone "$zoneFile" contains escaped dollar signes \\\$
+            echo Escaping them is not needed any more. Please make shure \
+                 to unescape them where they prefix a variable name
+          fi
+
+          exit 1
+        }
+      done
+
+      echo "checking configuration file"
+      ${nsdPkg}/sbin/nsd-checkconf $out/nsd.conf
+    '';
   };
 
+  writeZoneData = name: text: pkgs.writeTextFile {
+    inherit name text;
+    destination = "/zones/${name}";
+  };
+
+
   # options are ordered alphanumerically by the nixos option name
-  configFile = pkgs.writeText "nsd.conf" ''
+  configFile = pkgs.writeTextDir "nsd.conf" ''
     server:
       chroot:   "${stateDir}"
       username: ${username}
@@ -56,7 +78,7 @@ let
       ipv4-edns-size:      ${toString cfg.ipv4EDNSSize}
       do-ip6:              ${yesOrNo  cfg.ipv6}
       ipv6-edns-size:      ${toString cfg.ipv6EDNSSize}
-      log-time-asci:       ${yesOrNo  cfg.logTimeAscii}
+      log-time-ascii:      ${yesOrNo  cfg.logTimeAscii}
       ${maybeString "nsid: " cfg.nsid}
       port:                ${toString cfg.port}
       reuseport:           ${yesOrNo  cfg.reuseport}
@@ -89,7 +111,6 @@ let
       server-key-file:   "${cfg.remoteControl.serverKeyFile}"
       server-cert-file:  "${cfg.remoteControl.serverCertFile}"
 
-    # zone files reside in "${zoneFiles}" linked to "${stateDir}/zones"
     ${concatStrings (mapAttrsToList zoneConfigFile zoneConfigs)}
 
     ${cfg.extraConfig}
@@ -111,8 +132,8 @@ let
     secret=$(cat "${keyOptions.keyFile}")
     dest="${stateDir}/private/${keyName}"
     echo "  secret: \"$secret\"" > "$dest"
-    ${pkgs.coreutils}/bin/chown ${username}:${username} "$dest"
-    ${pkgs.coreutils}/bin/chmod 0400 "$dest"
+    chown ${username}:${username} "$dest"
+    chmod 0400 "$dest"
   '') cfg.keys);
 
 
@@ -730,31 +751,40 @@ in
 
     systemd.services.nsd = {
       description = "NSD authoritative only domain name service";
+
+      after = [ "keys.target" "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
+      wants = [ "keys.target" ];
 
       serviceConfig = {
+        ExecStart = "${nsdPkg}/sbin/nsd -d -c ${nsdEnv}/nsd.conf";
         PIDFile = pidFile;
         Restart = "always";
-        ExecStart = "${nsdPkg}/sbin/nsd -d -c ${configFile}";
+        RestartSec = "4s";
+        StartLimitBurst = 4;
+        StartLimitInterval = "5min";
       };
 
       preStart = ''
-        ${pkgs.coreutils}/bin/mkdir -m 0700 -p "${stateDir}/private"
-        ${pkgs.coreutils}/bin/mkdir -m 0700 -p "${stateDir}/tmp"
-        ${pkgs.coreutils}/bin/mkdir -m 0700 -p "${stateDir}/var"
+        rm -Rf "${stateDir}/private/"
+        rm -Rf "${stateDir}/tmp/"
 
-        ${pkgs.coreutils}/bin/touch "${stateDir}/don't touch anything in here"
+        mkdir -m 0700 -p "${stateDir}/private"
+        mkdir -m 0700 -p "${stateDir}/tmp"
+        mkdir -m 0700 -p "${stateDir}/var"
 
-        ${pkgs.coreutils}/bin/rm -f "${stateDir}/private/"*
-        ${pkgs.coreutils}/bin/rm -f "${stateDir}/tmp/"*
+        cat > "${stateDir}/don't touch anything in here" << EOF
+        Everything in this directory except NSD's state in var is
+        automatically generated and will be purged and redeployed
+        by the nsd.service pre-start script.
+        EOF
 
-        ${pkgs.coreutils}/bin/chown nsd:nsd -R "${stateDir}/private"
-        ${pkgs.coreutils}/bin/chown nsd:nsd -R "${stateDir}/tmp"
-        ${pkgs.coreutils}/bin/chown nsd:nsd -R "${stateDir}/var"
+        chown ${username}:${username} -R "${stateDir}/private"
+        chown ${username}:${username} -R "${stateDir}/tmp"
+        chown ${username}:${username} -R "${stateDir}/var"
 
-        ${pkgs.coreutils}/bin/rm -rf "${stateDir}/zones"
-        ${pkgs.coreutils}/bin/cp -r  "${zoneFiles}" "${stateDir}/zones"
+        rm -rf "${stateDir}/zones"
+        cp -rL "${nsdEnv}/zones" "${stateDir}/zones"
 
         ${copyKeys}
       '';

From 6bb016101fc20e8af54c2fc92b4cd44232bb7f74 Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Sun, 28 Feb 2016 16:19:18 +0800
Subject: [PATCH 1939/2285] postfix: use relative symlinks for mailq and
 newaliases

---
 pkgs/servers/mail/postfix/3.0.nix                 |  7 ++++++-
 pkgs/servers/mail/postfix/relative-symlinks.patch | 13 +++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/servers/mail/postfix/relative-symlinks.patch

diff --git a/pkgs/servers/mail/postfix/3.0.nix b/pkgs/servers/mail/postfix/3.0.nix
index 9ea151e597bb..52327090e441 100644
--- a/pkgs/servers/mail/postfix/3.0.nix
+++ b/pkgs/servers/mail/postfix/3.0.nix
@@ -35,7 +35,12 @@ in stdenv.mkDerivation rec {
                 ++ lib.optional withMySQL libmysql
                 ++ lib.optional withSQLite sqlite;
 
-  patches = [ ./postfix-script-shell.patch ./postfix-3.0-no-warnings.patch ./post-install-script.patch ];
+  patches = [
+    ./postfix-script-shell.patch
+    ./postfix-3.0-no-warnings.patch
+    ./post-install-script.patch
+    ./relative-symlinks.patch
+  ];
 
   preBuild = ''
     sed -e '/^PATH=/d' -i postfix-install
diff --git a/pkgs/servers/mail/postfix/relative-symlinks.patch b/pkgs/servers/mail/postfix/relative-symlinks.patch
new file mode 100644
index 000000000000..f7a2078c0343
--- /dev/null
+++ b/pkgs/servers/mail/postfix/relative-symlinks.patch
@@ -0,0 +1,13 @@
+diff --git a/postfix-install b/postfix/postfix-install
+index 1662c3d..0f20ec0 100644
+--- a/postfix-install
++++ b/postfix-install
+@@ -336,7 +336,7 @@ compare_or_symlink() {
+ 	# 2) we cannot use mv to replace a symlink-to-directory;
+ 	# 3) "ln -n" is not in POSIX, therefore it's not portable.
+ 	# rm+ln is less atomic but this affects compatibility symlinks only.
+-	rm -f $2 && ln -sf $link $2 || exit 1
++	rm -f $2 && ln -rsf $link $2 || exit 1
+     }
+ }
+ 

From 3069cab2e70ca782c0ce1cb7f74e46bf191523d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 28 Feb 2016 08:25:08 +0000
Subject: [PATCH 1940/2285] travis-ci: stop abusing hydra now that it pushes
 directly to cache

---
 maintainers/scripts/travis-nox-review-pr.sh | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh
index e0d1952d543d..99cf769fcd73 100755
--- a/maintainers/scripts/travis-nox-review-pr.sh
+++ b/maintainers/scripts/travis-nox-review-pr.sh
@@ -11,11 +11,7 @@ if [[ $1 == nix ]]; then
 
     # Make sure we can use hydra's binary cache
     sudo mkdir /etc/nix
-    sudo tee /etc/nix/nix.conf <<EOF >/dev/null
-binary-caches = http://cache.nixos.org http://hydra.nixos.org
-trusted-binary-caches = http://hydra.nixos.org
-build-max-jobs = 4
-EOF
+    sudo echo "build-max-jobs = 4" > /etc/nix/nix.conf
 
     # Verify evaluation
     echo "=== Verifying that nixpkgs evaluates..."

From 8b2be11b137dd86449554ba1d033744c44385049 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 28 Feb 2016 08:33:14 +0000
Subject: [PATCH 1941/2285] note the desktopManagerHandlesLidAndPower removal

---
 nixos/modules/services/x11/display-managers/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index 8d7593e8e546..b7eee446d396 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -289,6 +289,10 @@ in
 
     services.xserver.displayManager.xserverBin = "${xorg.xorgserver}/bin/X";
 
+    imports = [
+     (mkRemovedOptionModule [ "services" "xserver" "displayManager" "desktopManagerHandlesLidAndPower" ])
+    ];
+
   };
 
 }

From cf463bbd1ab63235d15996f3b46452f50d63ae24 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 16 Feb 2016 16:18:05 +0100
Subject: [PATCH 1942/2285] perl-DBIx-Class: 0.082820 -> 0.082821

Also remove patches for issues that have been resolved upstream.
---
 ...ndency-tests-to-work-on-newer-libsql.patch | 95 -------------------
 .../perl-modules/dbix-class-fix-52leaks.patch | 23 -----
 pkgs/top-level/perl-packages.nix              |  9 +-
 3 files changed, 2 insertions(+), 125 deletions(-)
 delete mode 100644 pkgs/development/perl-modules/DBIx-Class-0.082820-Adjust-view-dependency-tests-to-work-on-newer-libsql.patch
 delete mode 100644 pkgs/development/perl-modules/dbix-class-fix-52leaks.patch

diff --git a/pkgs/development/perl-modules/DBIx-Class-0.082820-Adjust-view-dependency-tests-to-work-on-newer-libsql.patch b/pkgs/development/perl-modules/DBIx-Class-0.082820-Adjust-view-dependency-tests-to-work-on-newer-libsql.patch
deleted file mode 100644
index b080771b17dc..000000000000
--- a/pkgs/development/perl-modules/DBIx-Class-0.082820-Adjust-view-dependency-tests-to-work-on-newer-libsql.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 5de3b12e4eecd4efb47e1896dc1d5432bc532568 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Tue, 3 Nov 2015 15:22:54 +0100
-Subject: [PATCH] Adjust view-dependency tests to work on newer libsqlite
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Port upstream fix for SQLite-3.9.0 to 0.082820:
-
-commit 26c663f123032941cb3f61d6cd11869b86716d6d
-Author: Peter Rabbitson <ribasushi@cpan.org>
-Date:   Tue Nov 3 14:35:35 2015 +0100
-
-    Adjust view-dependency tests to work on newer libsqlite
-
-    The test and mechanism behind it is largely useless in these cases, but old
-    sqlite installations will lurk around for ever, so keep the check while moving
-    it to xt/
-
-The original fix makes the tests author's tests, so they are not run
-at all. Let's keep the test running by default until upstream releases
-new version.
-
-CPAN RT#107852
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- t/105view_deps.t | 29 ++++++++++++++++-------------
- 1 file changed, 16 insertions(+), 13 deletions(-)
-
-diff --git a/t/105view_deps.t b/t/105view_deps.t
-index 21aa92b..39bb632 100644
---- a/t/105view_deps.t
-+++ b/t/105view_deps.t
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl
-+use DBIx::Class::Optional::Dependencies -skip_all_without => 'deploy';
-
- use strict;
- use warnings;
-@@ -11,15 +11,6 @@ use DBICTest;
- use ViewDeps;
- use ViewDepsBad;
-
--BEGIN {
--    require DBIx::Class;
--    plan skip_all => 'Test needs ' .
--        DBIx::Class::Optional::Dependencies->req_missing_for('deploy')
--      unless DBIx::Class::Optional::Dependencies->req_ok_for('deploy');
--}
--
--use_ok('DBIx::Class::ResultSource::View');
--
- #################### SANITY
-
- my $view = DBIx::Class::ResultSource::View->new;
-@@ -73,10 +64,16 @@ can_ok( $view, $_ ) for qw/new from deploy_depends_on/;
-     = ViewDepsBad->connect( DBICTest->_database ( quote_char => '"') );
-   ok( $schema2, 'Connected to ViewDepsBad schema OK' );
-
-+  my $lazy_view_validity = !(
-+    $schema2->storage->_server_info->{normalized_dbms_version}
-+      <
-+    3.009
-+  );
-+
- #################### DEPLOY2
-
-   warnings_exist { $schema2->deploy }
--    [qr/no such table: main.aba_name_artists/],
-+    [ $lazy_view_validity ? () : qr/no such table: main.aba_name_artists/ ],
-     "Deploying the bad schema produces a warning: aba_name_artists was not created.";
-
- #################### DOES ORDERING WORK 2?
-@@ -106,9 +103,15 @@ can_ok( $view, $_ ) for qw/new from deploy_depends_on/;
-     } grep { !/AbaNameArtistsAnd2010CDsWithManyTracks/ }
-     @{ [ $schema2->sources ] };
-
-+  $schema2->storage->dbh->do(q( DROP VIEW "aba_name_artists" ))
-+    if $lazy_view_validity;
-+
-   throws_ok { $schema2->resultset('AbaNameArtistsAnd2010CDsWithManyTracks')->next }
--    qr/no such table: aba_name_artists_and_2010_cds_with_many_tracks/,
--    "Query on AbaNameArtistsAnd2010CDsWithManyTracks throws, because the table does not exist"
-+    qr/no such table: (?:main\.)?aba_name_artists/,
-+    sprintf(
-+      "Query on AbaNameArtistsAnd2010CDsWithManyTracks throws, because the%s view does not exist",
-+      $lazy_view_validity ? ' underlying' : ''
-+    )
-   ;
- }
-
---
-2.4.3
diff --git a/pkgs/development/perl-modules/dbix-class-fix-52leaks.patch b/pkgs/development/perl-modules/dbix-class-fix-52leaks.patch
deleted file mode 100644
index 84af4a5acf1c..000000000000
--- a/pkgs/development/perl-modules/dbix-class-fix-52leaks.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From e9d552de92cde6552f35cd45a3572df1e25609cc Mon Sep 17 00:00:00 2001
-From: Peter Rabbitson <ribasushi@cpan.org>
-Date: Tue, 19 May 2015 05:49:48 +0200
-Subject: [PATCH] Make sure tests pass without a compiler present (another step
- to RT#74706)
-
---- a/t/52leaks.t
-+++ b/t/52leaks.t
-@@ -446,6 +446,14 @@ for my $addr (keys %$weak_registry) {
-     delete $weak_registry->{$addr}
-       unless $cleared->{hash_merge_singleton}{$weak_registry->{$addr}{weakref}{behavior}}++;
-   }
-+  elsif ($names =~ /^B::Hooks::EndOfScope::PP::_TieHintHashFieldHash/m) {
-+    # there is one tied lexical which stays alive until GC time
-+    # https://metacpan.org/source/ETHER/B-Hooks-EndOfScope-0.15/lib/B/Hooks/EndOfScope/PP/FieldHash.pm#L24
-+    # simply ignore it here, instead of teaching the leaktracer to examine ties
-+    # the latter is possible yet terrible: https://github.com/dbsrgits/dbix-class/blob/v0.082820/t/lib/DBICTest/Util/LeakTracer.pm#L113-L117
-+    delete $weak_registry->{$addr}
-+      unless $cleared->{bheos_pptiehinthashfieldhash}++;
-+  }
-   elsif ($names =~ /^DateTime::TimeZone::UTC/m) {
-     # DT is going through a refactor it seems - let it leak zones for now
-     delete $weak_registry->{$addr};
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 6c1c23f34540..73dec8b1925c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3339,18 +3339,13 @@ let self = _self // overrides; _self = with self; {
   };
 
   DBIxClass = buildPerlPackage rec {
-    name = "DBIx-Class-0.082820";
+    name = "DBIx-Class-0.082821";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz";
-      sha256 = "7b6083a1273d474d785aa93581dc1da334bbe5d83c741574ee2e3942559daeb9";
+      sha256 = "1picibywz5sdpaa1pmbv7xfw52nbz6fh32afb1p2qwsgzbkhqvnw";
     };
     buildInputs = [ DBDSQLite PackageStash SQLTranslator TestDeep TestException TestWarn ];
     propagatedBuildInputs = [ ClassAccessorGrouped ClassC3Componentised ClassInspector ConfigAny ContextPreserve DBI DataDumperConcise DataPage DevelGlobalDestruction HashMerge MROCompat ModuleFind Moo PathClass SQLAbstract ScopeGuard SubName namespaceclean ];
-    patches = [
-      # Fix test error inside t/52leaks.t
-      ../development/perl-modules/dbix-class-fix-52leaks.patch
-      ../development/perl-modules/DBIx-Class-0.082820-Adjust-view-dependency-tests-to-work-on-newer-libsql.patch
-    ];
     meta = {
       homepage = http://www.dbix-class.org/;
       description = "Extensible and flexible object <-> relational mapper";

From 98625b331b8435c0788e18120f611fd73cc16c85 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 16 Feb 2016 16:20:28 +0100
Subject: [PATCH 1943/2285] perl-DateTime-Format-MySQL: 0.05 -> 0.06

---
 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 73dec8b1925c..2b9d3e452599 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -3060,10 +3060,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   DateTimeFormatMySQL = buildPerlPackage rec {
-    name = "DateTime-Format-MySQL-0.05";
+    name = "DateTime-Format-MySQL-0.06";
     src = fetchurl {
       url = "mirror://cpan/authors/id/X/XM/XMIKEW/${name}.tar.gz";
-      sha256 = "26d0348a930aa34d3b33ec1b2a9d9629f2ee78234e224ca74d594703922ca2e9";
+      sha256 = "07cgz60gxvrv7xqvngyll60pa8cx93h3jyx9kc9wdkn95qbd864q";
     };
     propagatedBuildInputs = [ DateTime DateTimeFormatBuilder ];
     meta = {

From 13a6b7e623abf1bed1cf787c2c74e954912f8620 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 16 Feb 2016 16:21:52 +0100
Subject: [PATCH 1944/2285] perl-CGI: 4.25 -> 4.26

---
 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 2b9d3e452599..2b8bcdb96e0d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1416,10 +1416,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   "CGI" = buildPerlPackage rec {
-    name = "CGI-4.25";
+    name = "CGI-4.26";
     src = fetchurl {
       url = "mirror://cpan/authors/id/L/LE/LEEJO/${name}.tar.gz";
-      sha256 = "efb3e5235ada6a91f97ca2905399a686bedea60f6b525e52f4a147baff4f131a";
+      sha256 = "0k8rcmgl9ysk6h4racd5sximida5ypn8fdzi7q34rpq4l7xqcm2n";
     };
     buildInputs = [ TestDeep TestWarn ];
     propagatedBuildInputs = [ HTMLParser self."if" ];

From affb8938316e60bf8f326f14b461e0f1073a188e Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 16 Feb 2016 16:25:22 +0100
Subject: [PATCH 1945/2285] perl-Log-Any: 1.032 -> 1.038

---
 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 2b8bcdb96e0d..fe94021c3212 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6764,10 +6764,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   LogAny = buildPerlPackage rec {
-    name = "Log-Any-1.032";
+    name = "Log-Any-1.038";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz";
-      sha256 = "808558fa42aa96365ed0af773973a5618b4ad50511d81fc7548f67133efdb956";
+      sha256 = "0872jkdbaymyq4sx3i2smv7j57yihxia4bkf14aa3vwpnylpv809";
     };
     meta = {
       homepage = https://github.com/dagolden/Log-Any;

From ae385fb25c5d261abd0a7cb2a70d19a7f9964a64 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 16 Feb 2016 16:26:03 +0100
Subject: [PATCH 1946/2285] perl-Redis: 1.981 -> 1.982

---
 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 fe94021c3212..b6827f4cb62f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9875,10 +9875,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Redis = buildPerlPackage rec {
-    name = "Redis-1.981";
+    name = "Redis-1.982";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DA/DAMS/${name}.tar.gz";
-      sha256 = "5eb65fb6fdfc43f143c7095ec9500f829724274a295eb43d3882ff8798fa3793";
+      sha256 = "1ig6sg1sgdz1dq8gpafin9m4nk0n9k1hzs9c45fl6wslpyim864z";
     };
     buildInputs = [ IOString ModuleBuildTiny PodCoverageTrustPod TestCPANMeta TestDeep TestFatal TestSharedFork TestTCP ];
     propagatedBuildInputs = [ IOSocketTimeout ];

From d9e0cd9302e0f165305db471d86df13f3d60bdcb Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 16 Feb 2016 16:48:21 +0100
Subject: [PATCH 1947/2285] perl-URI: 1.69 -> 1.71

---
 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 b6827f4cb62f..0e2581b6a293 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -13002,11 +13002,11 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  URI = buildPerlPackage {
-    name = "URI-1.69";
+  "URI" = buildPerlPackage rec {
+    name = "URI-1.71";
     src = fetchurl {
-      url = mirror://cpan/authors/id/E/ET/ETHER/URI-1.69.tar.gz;
-      sha256 = "0bdlk1cn7ipy4kdylrn73yz9i2k39ikm1cqvh9hq0vvbcbm1cjxp";
+      url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
+      sha256 = "9c8eca0d7f39e74bbc14706293e653b699238eeb1a7690cc9c136fb8c2644115";
     };
     meta = {
       description = "Uniform Resource Identifiers (absolute and relative)";

From 3a9842c7c5cf8685420fbc7d2d3632feed8dd166 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sat, 27 Feb 2016 17:13:49 +0100
Subject: [PATCH 1948/2285] perl-LWP: 6.13 -> 6.15

Also remove no longer needed patch.
---
 .../lwp-test-with-localhost.patch             | 75 -------------------
 pkgs/top-level/perl-packages.nix              |  7 +-
 2 files changed, 3 insertions(+), 79 deletions(-)
 delete mode 100644 pkgs/development/perl-modules/lwp-test-with-localhost.patch

diff --git a/pkgs/development/perl-modules/lwp-test-with-localhost.patch b/pkgs/development/perl-modules/lwp-test-with-localhost.patch
deleted file mode 100644
index 25b96796d234..000000000000
--- a/pkgs/development/perl-modules/lwp-test-with-localhost.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 2d7a479b39bb20a0d61f067ba6c2df92117fcb8c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
-Date: Wed, 23 Apr 2014 12:45:38 +0200
-Subject: [PATCH] Connect to localhost instead of hostname
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The hostname does not have to be resolvable nor reachable. It's just
-a machine name.
-
-Signed-off-by: Petr Písař <ppisar@redhat.com>
----
- t/local/http.t   | 2 +-
- t/robot/ua-get.t | 2 +-
- t/robot/ua.t     | 2 +-
- talk-to-ourself  | 3 +--
- 4 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/t/local/http.t b/t/local/http.t
-index 779cc21..534b4c8 100644
---- a/t/local/http.t
-+++ b/t/local/http.t
-@@ -20,7 +20,7 @@ if ($D eq 'daemon') {
- 
-     require HTTP::Daemon;
- 
--    my $d = HTTP::Daemon->new(Timeout => 10);
-+    my $d = HTTP::Daemon->new(Timeout => 10, LocalAddr => 'localhost');
- 
-     print "Please to meet you at: <URL:", $d->url, ">\n";
-     open(STDOUT, $^O eq 'VMS'? ">nl: " : ">/dev/null");
-diff --git a/t/robot/ua-get.t b/t/robot/ua-get.t
-index 5754c4b..bf24589 100644
---- a/t/robot/ua-get.t
-+++ b/t/robot/ua-get.t
-@@ -19,7 +19,7 @@ if ($D eq 'daemon') {
- 
-     require HTTP::Daemon;
- 
--    my $d = new HTTP::Daemon Timeout => 10;
-+    my $d = new HTTP::Daemon Timeout => 10, LocalAddr => 'localhost';
- 
-     print "Please to meet you at: <URL:", $d->url, ">\n";
-     open(STDOUT, $^O eq 'MSWin32' ?  ">nul" : $^O eq 'VMS' ? ">NL:"  : ">/dev/null");
-diff --git a/t/robot/ua.t b/t/robot/ua.t
-index 21ad5c8..11fafa8 100644
---- a/t/robot/ua.t
-+++ b/t/robot/ua.t
-@@ -19,7 +19,7 @@ if ($D eq 'daemon') {
- 
-     require HTTP::Daemon;
- 
--    my $d = new HTTP::Daemon Timeout => 10;
-+    my $d = new HTTP::Daemon Timeout => 10, LocalAddr => 'localhost';
- 
-     print "Please to meet you at: <URL:", $d->url, ">\n";
-     open(STDOUT, $^O eq 'MSWin32' ?  ">nul" : $^O eq 'VMS' ? ">NL:"  : ">/dev/null");
-diff --git a/talk-to-ourself b/talk-to-ourself
-index 6c0257a..b4acda2 100644
---- a/talk-to-ourself
-+++ b/talk-to-ourself
-@@ -9,8 +9,7 @@ require IO::Socket;
- 
- if (@ARGV >= 2 && $ARGV[0] eq "--port") {
-     my $port = $ARGV[1];
--    require Sys::Hostname;
--    my $host = Sys::Hostname::hostname();
-+    my $host = 'localhost';
-     if (my $socket = IO::Socket::INET->new(PeerAddr => "$host:$port", Timeout => 5)) {
- 	require IO::Select;
- 	if (IO::Select->new($socket)->can_read(1)) {
--- 
-1.9.0
-
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 0e2581b6a293..89fad8071a68 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6900,13 +6900,12 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  LWP = buildPerlPackage rec {
-    name = "libwww-perl-6.13";
+  "LWP" = buildPerlPackage rec {
+    name = "libwww-perl-6.15";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
-      sha256 = "1cpqjl59viw50bnbdyn8xzrwzg7g54b2rszw0fifacqrppp17gaz";
+      sha256 = "6f349d45c21b1ec0501c4437dfcb70570940e6c3d5bff783bd91d4cddead8322";
     };
-    patches = [ ../development/perl-modules/lwp-test-with-localhost.patch ];
     propagatedBuildInputs = [ EncodeLocale FileListing HTMLParser HTTPCookies HTTPDaemon HTTPDate HTTPMessage HTTPNegotiate LWPMediaTypes NetHTTP URI WWWRobotRules ];
     meta = with stdenv.lib; {
       description = "The World-Wide Web library for Perl";

From 033fd6ad4484d2bc4f5f2491d215baffd8e55e30 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 28 Feb 2016 00:46:23 +0100
Subject: [PATCH 1949/2285] perl-Log-Any: 1.038 -> 1.040

---
 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 89fad8071a68..7be8bd550915 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6764,10 +6764,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   LogAny = buildPerlPackage rec {
-    name = "Log-Any-1.038";
+    name = "Log-Any-1.040";
     src = fetchurl {
       url = "mirror://cpan/authors/id/D/DA/DAGOLDEN/${name}.tar.gz";
-      sha256 = "0872jkdbaymyq4sx3i2smv7j57yihxia4bkf14aa3vwpnylpv809";
+      sha256 = "9759211bfc28055e4617894cf96c3b419e0c3c6afb4bdbfe2382f247193b3864";
     };
     meta = {
       homepage = https://github.com/dagolden/Log-Any;

From 762678d6af35a5751d33d72fdbabd954f50f702a Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 28 Feb 2016 00:46:51 +0100
Subject: [PATCH 1950/2285] perl-Readonly: 2.00 -> 2.01

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7be8bd550915..7cae676f8297 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -9851,11 +9851,12 @@ let self = _self // overrides; _self = with self; {
   };
 
   Readonly = buildPerlModule rec {
-    name = "Readonly-2.00";
+    name = "Readonly-2.01";
     src = fetchurl {
       url = "mirror://cpan/authors/id/S/SA/SANKO/${name}.tar.gz";
-      sha256 = "9bd0156e958842fdfd6c3bb27a23b47232d4737a407d81fabc4dc64b9363bf98";
+      sha256 = "ec7076c6851b6d3338e959645cd995343241f5b20000ffc29519faf28f6b482e";
     };
+    buildInputs = [ ModuleBuildTiny ];
     meta = {
       homepage = https://github.com/sanko/readonly;
       description = "Facility for creating read-only scalars, arrays, hashes";

From 3c84ae406d80ba01f96a6da27de954b61f0e735b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 28 Feb 2016 08:49:55 +0000
Subject: [PATCH 1951/2285] PULL_REQUEST_TEMPLATE.md: clarify a few things

---
 .github/PULL_REQUEST_TEMPLATE.md | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 787524c75758..64904c2908ba 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,15 +1,17 @@
 ###### Things done:
-- [ ] Tested via `nix.useChroot`.
-- [ ] Built on platform(s): .
-- [ ] Tested compilation of all pkgs that depend on this change.
-- [ ] Tested execution of binary products.
+- [ ] Tested using sandboxing (`nix-build --option build-use-chroot true` or [nix.useChroot](http://nixos.org/nixos/manual/options.html#opt-nix.useChroot) on NixOS)
+- [ ] Built on platform(s): NixOS + OSX + Linux
+- [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"`
+- [ ] Tested execution of all binary files (usually in `./result/bin/`)
 - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).
 
-###### Extra
-Fixes # .
+###### More
+
+Fixes issue #<insert id>
+
+cc @<maintainer>
 
-cc @ .
 
 ---
 
-_Please note, that points are not mandatory._
+_Please note, that points are not mandatory, but ._

From ad23ac715e6bcd30885362ee5b0fa1a7876e2f6c Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Sat, 27 Feb 2016 16:09:18 +0100
Subject: [PATCH 1952/2285] duckmarines: init at 1.0b

---
 pkgs/games/duckmarines/default.nix | 59 ++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix    |  2 +
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/games/duckmarines/default.nix

diff --git a/pkgs/games/duckmarines/default.nix b/pkgs/games/duckmarines/default.nix
new file mode 100644
index 000000000000..fc4a006a6a9d
--- /dev/null
+++ b/pkgs/games/duckmarines/default.nix
@@ -0,0 +1,59 @@
+{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }:
+
+let
+  pname = "duckmarines";
+  version = "1.0b";
+
+  icon = fetchurl {
+    url = "http://tangramgames.dk/img/thumb/duckmarines.png";
+    sha256 = "07ypbwqcgqc5f117yxy9icix76wlybp1cmykc8f3ivdps66hl0k5";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "duckmarines";
+    exec = "${pname}";
+    icon = "${icon}";
+    comment = "Duck-themed action puzzle video game";
+    desktopName = "Duck Marines";
+    genericName = "duckmarines";
+    categories = "Game;";
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "https://github.com/SimonLarsen/${pname}/releases/download/v${version}/${pname}-1.0-love.zip";
+    sha256 = "0fpzbsgrhbwm1lff9gyzh6c9jigw328ngddvrj5w7qmjcm2lv6lv";
+  };
+
+  nativeBuildInputs = [ makeWrapper unzip ];
+  buildInputs = [ lua love ];
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase =
+  ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/games/lovegames
+
+    cp -v ./${pname}-1.0.love $out/share/games/lovegames/${pname}.love
+
+    makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love
+
+    chmod +x $out/bin/${pname}
+    mkdir -p $out/share/applications
+    ln -s ${desktopItem}/share/applications/* $out/share/applications/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Duck-themed action puzzle video game";
+    maintainers = with maintainers; [ leenaars ];
+    platforms = platforms.linux;
+    license = licenses.free;
+    downloadPage = http://tangramgames.dk/games/duckmarines;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 22dbfc41f438..3417a36a6f7c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14396,6 +14396,8 @@ let
 
   drumkv1 = callPackage ../applications/audio/drumkv1 { };
 
+  duckmarines = callPackage ../games/duckmarines { love = love_0_9; };
+
   dwarf-fortress-packages = callPackage ../games/dwarf-fortress { };
 
   dwarf-fortress = dwarf-fortress-packages.dwarf-fortress.override { };

From f8516a0717569f496653821d5fa286da59854550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 28 Feb 2016 10:06:27 +0100
Subject: [PATCH 1953/2285] nixos copySystemConfiguration: fix when chrooted

Fixes #7974. Also makes the description more informative.
---
 nixos/modules/system/activation/top-level.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix
index d66580b7b9be..2d1b0ffb54ce 100644
--- a/nixos/modules/system/activation/top-level.nix
+++ b/nixos/modules/system/activation/top-level.nix
@@ -178,9 +178,10 @@ in
       default = false;
       description = ''
         If enabled, copies the NixOS configuration file
-        <literal>$NIXOS_CONFIG</literal> (usually
-        <filename>/etc/nixos/configuration.nix</filename>)
-        to the system store path.
+        (usually <filename>/etc/nixos/configuration.nix</filename>)
+        and links it from the resulting system
+        (getting to <filename>/run/current-system/configuration.nix</filename>).
+        Note that only this single file is copied, even if it imports others.
       '';
     };
 
@@ -238,7 +239,9 @@ in
     system.extraSystemBuilderCmds =
       optionalString
         config.system.copySystemConfiguration
-        "cp ${maybeEnv "NIXOS_CONFIG" "/etc/nixos/configuration.nix"} $out";
+        ''ln -s '${import ../../../lib/from-env.nix "NIXOS_CONFIG" <nixos-config>}' \
+            "$out/configuration.nix"
+        '';
 
     system.build.toplevel = system;
 

From 2af46e43935c735efb65b51c67edead62dae44ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 28 Feb 2016 09:26:21 +0000
Subject: [PATCH 1954/2285] PULL_REQUEST_TEMPLATE: fix issues raised in
 3c84ae406

---
 .github/PULL_REQUEST_TEMPLATE.md | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 64904c2908ba..6ef9a4d21e8d 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,7 @@
 ###### Things done:
+
 - [ ] Tested using sandboxing (`nix-build --option build-use-chroot true` or [nix.useChroot](http://nixos.org/nixos/manual/options.html#opt-nix.useChroot) on NixOS)
-- [ ] Built on platform(s): NixOS + OSX + Linux
+- [ ] Built on platform(s): NixOS / OSX / Linux
 - [ ] Tested compilation of all pkgs that depend on this change using `nix-shell -p nox --run "nox-review wip"`
 - [ ] Tested execution of all binary files (usually in `./result/bin/`)
 - [ ] Fits [CONTRIBUTING.md](https://github.com/NixOS/nixpkgs/blob/master/.github/CONTRIBUTING.md).
@@ -14,4 +15,4 @@ cc @<maintainer>
 
 ---
 
-_Please note, that points are not mandatory, but ._
+_Please note, that points are not mandatory, but rather desired._

From a08c8b12f02cbe261e6f2675675776b9c4edbc89 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 28 Feb 2016 10:39:20 +0100
Subject: [PATCH 1955/2285] Add Apache Jena Fuseki instead of obsolete and
 unavailable Jena Joseki

---
 pkgs/servers/http/joseki/default.nix          | 112 ------------------
 pkgs/servers/nosql/apache-jena/binary.nix     |   2 +-
 .../nosql/apache-jena/fuseki-binary.nix       |  41 +++++++
 .../nosql/apache-jena/fuseki-binary.upstream  |   4 +
 pkgs/top-level/all-packages.nix               |   9 +-
 5 files changed, 53 insertions(+), 115 deletions(-)
 delete mode 100644 pkgs/servers/http/joseki/default.nix
 create mode 100644 pkgs/servers/nosql/apache-jena/fuseki-binary.nix
 create mode 100644 pkgs/servers/nosql/apache-jena/fuseki-binary.upstream

diff --git a/pkgs/servers/http/joseki/default.nix b/pkgs/servers/http/joseki/default.nix
deleted file mode 100644
index 59f9fd8624d1..000000000000
--- a/pkgs/servers/http/joseki/default.nix
+++ /dev/null
@@ -1,112 +0,0 @@
-x@{builderDefsPackage
-  , unzip
-  , ...}:
-builderDefsPackage
-(a :
-let
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
-    [];
-
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-  sourceInfo = rec {
-    baseName="jena-joseki";
-    version="3.4.3-201103";
-    name="${baseName}-${version}";
-  };
-in
-rec {
-  inherit (sourceInfo) name version;
-  inherit buildInputs;
-
-  tarballs = {
-    jenaBin = a.fetchurl {
-      url = "mirror://sourceforge/project/jena/Jena/Jena-2.6.4/jena-2.6.4.zip";
-      sha256 = "ec23a24eee9148b1ddb366ab035a48eacd43c2b50c534a7bdd9cf31c6f8a9e7c";
-    };
-    josekiBin = a.fetchurl {
-      url = "mirror://sourceforge/project/joseki/Joseki-SPARQL/Joseki-3.4.3/joseki-3.4.3.zip";
-      sha256 = "cde1138e7bafcc2db7800dcde08f268237accd76c0a3e4b4c95cc96eacdcad12";
-    };
-    tdbBin = a.fetchurl {
-      url = "mirror://sourceforge/project/jena/TDB/TDB-0.8.9/tdb-0.8.9.zip";
-      sha256 = "78fd4b6cea5a6e412f1d58ba8a9e1fc72315becdf06f3675e4e604cd4435779e";
-    };
-    arqBin = a.fetchurl {
-      url = "mirror://sourceforge/project/jena/ARQ/ARQ-2.8.7/arq-2.8.7.zip";
-      sha256 = "66990e92514a85a9596a7efaf128041002cd098e063964dd5d2264cfcdd26070";
-    };
-    jettyBin = a.fetchurl {
-      url = "http://dist.codehaus.org/jetty/jetty-6.1.26/jetty-6.1.26.zip";
-      sha256 = "96c08eb87ec3772dccc2b3dba54fea85ccc3f804faf7429eecfba3ed55648187";
-    };
-  };
-  tarballFiles = map (x: builtins.getAttr x tarballs) (builtins.attrNames tarballs);
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doDeploy" "fixScripts"];
-
-  fixScripts = a.doPatchShebangs ''$TARGET/bin'';
-
-  doDeploy = a.fullDepEntry (''
-    ${a.lib.concatStringsSep ";" (map (y : "unzip ${y}") tarballFiles)}
-    for i in */; do cp -rTf $i merged; done
-    cd merged
-
-    for i in "lib/"jsp-*/*.jar; do
-      ln -s "''${i#lib/}" "lib" || true
-    done
-
-    cp [Cc]opyright* doc
-    mkdir lib/obsolete
-    (
-      ls "lib/"log4j-[0-9]*.jar | sort | tac | tail -n +2 ;
-      ls "lib/"slf4j-api-[0-9]*.jar | sort | tac | tail -n +2 ;
-      ls "lib/"xercesImpl-[0-9]*.jar | sort | tac | tail -n +2 ;
-      ls "lib/"arq-[0-9]*.jar | sort | tac | tail -n +2
-      ls "lib/"tdb-[0-9]*.jar | sort | tac | tail -n +2
-      ls "lib/"jetty-[0-9]*.jar | sort | tac | tail -n +2
-      ls "lib/"jetty-util-[0-9]*.jar | sort | tac | tail -n +2
-    ) |
-      xargs -I @@ mv @@  lib/obsolete
-
-    mv lib/slf4j-simple-*.jar lib/obsolete
-
-    mkdir -p "$out/share"
-    TARGET="$out/share/${name}-dist"
-    cp -r . "$TARGET"
-    ln -s  "$TARGET/lib" "$out/lib"
-    chmod a+x "$TARGET/bin/"*
-    mkdir -p "$out/bin"
-
-    sed -e 's/\r//g' -i "$TARGET/bin"/*
-
-    echo -e '#! ${a.stdenv.shell}\nls "'"$TARGET"'"/bin' > "$out/bin/jena-list-commands"
-    echo '#! ${a.stdenv.shell}' >> "$out/bin/jena-command"
-    echo 'export JENAROOT="'"$TARGET"'"' >> "$out/bin/jena-command"
-    echo 'export JOSEKIROOT="'"$TARGET"'"' >> "$out/bin/jena-command"
-    echo 'export TDBROOT="'"$TARGET"'"' >> "$out/bin/jena-command"
-    echo 'export ARQROOT="'"$TARGET"'"' >> "$out/bin/jena-command"
-    echo 'sh "'"$TARGET"'"/bin/"$@"' >> "$out/bin/jena-command"
-
-    chmod a+x "$out/bin/"*
-  '') ["defEnsureDir" "minInit" "addInputs"];
-
-  trimVersions = a.fullDepEntry (''
-  '') ["doDeploy" "minInit"];
-
-  passthru = {
-    inherit tarballs;
-  };
-
-  meta = {
-    description = "An RDF database with SparQL interface over HTTP";
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    hydraPlatforms = []; # Builder is just unpacking/mixing what is needed
-    license = a.lib.licenses.free; # mix of packages under different licenses
-    homepage = "http://openjena.org/";
-  };
-}) x
diff --git a/pkgs/servers/nosql/apache-jena/binary.nix b/pkgs/servers/nosql/apache-jena/binary.nix
index 22c9fc06972c..84937467b0ca 100644
--- a/pkgs/servers/nosql/apache-jena/binary.nix
+++ b/pkgs/servers/nosql/apache-jena/binary.nix
@@ -33,6 +33,6 @@ stdenv.mkDerivation {
     homepage = "http://jena.apache.org";
     downloadPage = "http://archive.apache.org/dist/jena/binaries/";
     updateWalker = true;
-    downloadURLRegex = "apache-jena-.*[.]tar[.]gz\$";
+    downloadURLRegexp = "apache-jena-.*[.]tar[.]gz\$";
   };
 }
diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.nix b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
new file mode 100644
index 000000000000..bbc7bb496fe5
--- /dev/null
+++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.nix
@@ -0,0 +1,41 @@
+{stdenv, fetchurl, java, makeWrapper}:
+let
+  s = # Generated upstream information
+  rec {
+    baseName="apache-jena-fuseki";
+    version = "2.3.1";
+    name="${baseName}-${version}";
+    url="http://archive.apache.org/dist/jena/binaries/apache-jena-fuseki-${version}.tar.gz";
+    sha256 = "1c5330kwnby1vqcia1vm6z17j8hzyyajvvv46rf478l7wkzmyvlp";
+  };
+  buildInputs = [
+    makeWrapper
+  ];
+in
+stdenv.mkDerivation {
+  inherit (s) name version;
+  inherit buildInputs;
+  src = fetchurl {
+    inherit (s) url sha256;
+  };
+  installPhase = ''
+    cp -r . "$out"
+    ln -s "$out"/{fuseki-server,fuseki} "$out/bin"
+    for i in "$out"/bin/*; do
+      wrapProgram "$i" \
+        --prefix "PATH" : "${java}/bin/" \
+        --set "FUSEKI_HOME" '"''${FUSEKI_HOME:-'"$out"'}"' \
+        ;
+    done
+  '';
+  meta = {
+    inherit (s) version;
+    description = ''SPARQL server'';
+    license = stdenv.lib.licenses.asl20;
+    maintainers = [stdenv.lib.maintainers.raskin];
+    platforms = stdenv.lib.platforms.linux;
+    homepage = "http://jena.apache.org";
+    downloadPage = "http://archive.apache.org/dist/jena/binaries/";
+    downloadURLRegexp = "apache-jena-fuseki-.*[.]tar[.]gz\$";
+  };
+}
diff --git a/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream b/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream
new file mode 100644
index 000000000000..a18675347d58
--- /dev/null
+++ b/pkgs/servers/nosql/apache-jena/fuseki-binary.upstream
@@ -0,0 +1,4 @@
+name apache-jena-fuseki
+attribute apache-jena-fuseki
+target fuseki-binary.nix
+minimize_overwrite
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f57fb8815ba4..2a4af60e13d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9426,6 +9426,12 @@ let
     java = jdk;
   };
 
+  apache-jena-fuseki = callPackage ../servers/nosql/apache-jena/fuseki-binary.nix {
+    java = jdk;
+  };
+
+  fuseki = apache-jena-fuseki;
+
   apcupsd = callPackage ../servers/apcupsd { };
 
   asterisk = callPackage ../servers/asterisk { };
@@ -9544,8 +9550,6 @@ let
 
   jetty92 = callPackage ../servers/http/jetty/9.2.nix { };
 
-  joseki = callPackage ../servers/http/joseki {};
-
   rdkafka = callPackage ../development/libraries/rdkafka { };
 
   leafnode = callPackage ../servers/news/leafnode { };
@@ -16215,6 +16219,7 @@ aliases = with pkgs; {
   htmlTidy = html-tidy;  # added 2014-12-06
   inherit (haskell.compiler) jhc uhc;   # 2015-05-15
   inotifyTools = inotify-tools;
+  joseki = apache-jena-fuseki; # added 2016-02-28
   jquery_ui = jquery-ui;  # added 2014-09-07
   libdbusmenu_qt5 = qt5.libdbusmenu;  # added 2015-12-19
   libtidy = html-tidy;  # added 2014-12-21

From 02c7d65bf9030147150e593edad5f3213c1886cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 28 Feb 2016 09:35:43 +0000
Subject: [PATCH 1956/2285] fix NixOS eval

---
 .../modules/services/x11/display-managers/default.nix  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix
index b7eee446d396..533b03aff08d 100644
--- a/nixos/modules/services/x11/display-managers/default.nix
+++ b/nixos/modules/services/x11/display-managers/default.nix
@@ -286,13 +286,11 @@ in
   };
 
   config = {
-
     services.xserver.displayManager.xserverBin = "${xorg.xorgserver}/bin/X";
-
-    imports = [
-     (mkRemovedOptionModule [ "services" "xserver" "displayManager" "desktopManagerHandlesLidAndPower" ])
-    ];
-
   };
 
+  imports = [
+   (mkRemovedOptionModule [ "services" "xserver" "displayManager" "desktopManagerHandlesLidAndPower" ])
+  ];
+
 }

From 82560aefd705e0a382f0daac7227404a8f58a457 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 27 Feb 2016 23:18:31 +0300
Subject: [PATCH 1957/2285] samba: reduce closure size

---
 pkgs/servers/samba/4.x.nix      | 19 ++++++++-----------
 pkgs/top-level/all-packages.nix |  1 -
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix
index 8fcc1a4a9731..4ef47122c289 100644
--- a/pkgs/servers/samba/4.x.nix
+++ b/pkgs/servers/samba/4.x.nix
@@ -5,7 +5,6 @@
 , gnutls, libgcrypt, libgpgerror
 , ncurses, libunwind, libibverbs, librdmacm, systemd
 
-, enableKerberos ? false
 , enableInfiniband ? false
 , enableLDAP ? false
 , enablePrinting ? false
@@ -34,10 +33,9 @@ stdenv.mkDerivation rec {
   buildInputs =
     [ python pkgconfig perl libxslt docbook_xsl docbook_xml_dtd_42 /*
       docbook_xml_dtd_45 */ readline talloc ntdb tdb tevent ldb popt iniparser
-      libbsd libarchive zlib acl fam libiconv gettext libunwind
+      libbsd libarchive zlib acl fam libiconv gettext libunwind kerberos
     ]
     ++ optionals stdenv.isLinux [ libaio pam systemd ]
-    ++ optional enableKerberos kerberos
     ++ optionals (enableInfiniband && stdenv.isLinux) [ libibverbs librdmacm ]
     ++ optional enableLDAP openldap
     ++ optional (enablePrinting && stdenv.isLinux) cups
@@ -58,23 +56,22 @@ stdenv.mkDerivation rec {
   configureFlags =
     [ "--with-static-modules=NONE"
       "--with-shared-modules=ALL"
+      "--with-system-mitkrb5"
       "--enable-fhs"
       "--sysconfdir=/etc"
       "--localstatedir=/var"
-      "--bundled-libraries=${if enableKerberos && kerberos != null &&
-        kerberos.implementation == "heimdal" then "NONE" else "com_err"}"
+      "--bundled-libraries=NONE"
       "--private-libraries=NONE"
-      "--builtin-libraries=replace"
+      "--builtin-libraries=NONE"
     ]
-    ++ optional (enableKerberos && kerberos != null &&
-      kerberos.implementation == "krb5") "--with-system-mitkrb5"
     ++ optional (!enableDomainController) "--without-ad-dc"
     ++ optionals (!enableLDAP) [ "--without-ldap" "--without-ads" ];
 
   enableParallelBuilding = true;
 
-  stripAllList = [ "bin" "sbin" ];
-
+  # Some libraries don't have /lib/samba in RPATH but need it.
+  # Use find -type f -executable -exec echo {} \; -exec sh -c 'ldd {} | grep "not found"' \;
+  # Looks like a bug in installer scripts.
   postFixup = ''
     export SAMBA_LIBS="$(find $out -type f -name \*.so -exec dirname {} \; | sort | uniq)"
     read -r -d "" SCRIPT << EOF || true
@@ -85,7 +82,7 @@ stdenv.mkDerivation rec {
     patchelf --set-rpath "\$ALL_LIBS" "\$BIN" 2>/dev/null || exit $?;
     patchelf --shrink-rpath "\$BIN";
     EOF
-    find $out -type f -exec $SHELL -c "$SCRIPT" \;
+    find $out -type f -name \*.so -exec $SHELL -c "$SCRIPT" \;
   '';
 
   meta = with stdenv.lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f756a175ac9..6558f04d22eb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9819,7 +9819,6 @@ let
 
   samba4 = callPackage ../servers/samba/4.x.nix {
     python = python2;
-    kerberos = null;  # Bundle kerberos because samba uses internal, non-stable functions
     # enableLDAP
   };
 

From d589391202aefed3df385e9fce7b3b825cdd7406 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 28 Feb 2016 11:01:25 +0100
Subject: [PATCH 1958/2285] gitinspector: 0.4.1 -> 0.4.4

---
 pkgs/applications/version-management/gitinspector/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/gitinspector/default.nix b/pkgs/applications/version-management/gitinspector/default.nix
index 4e440d4bc6ab..56d8b334e8e9 100644
--- a/pkgs/applications/version-management/gitinspector/default.nix
+++ b/pkgs/applications/version-management/gitinspector/default.nix
@@ -2,12 +2,12 @@
 
 buildPythonApplication rec {
   name = "gitinspector-${version}";
-  version = "0.4.1";
+  version = "0.4.4";
   namePrefix = "";
 
   src = fetchzip {
     url = "https://github.com/ejwa/gitinspector/archive/v${version}.tar.gz";
-    sha256 = "07kjvf9cj6g6gvjgnnas5facm3nhxppf0l0fcxyd4vq6xhdb3swp";
+    sha256 = "1pfsw6xldm6jigs3nhysvqaxk8a0zf8zczgfkrp920as9sya3c7m";
     name = name + "-src";
   };
 

From 6dd798f67fc3773967994069bad21b593c67aa08 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 22 Feb 2016 08:28:42 +0100
Subject: [PATCH 1959/2285] hackage-packages.nix: update Haskell package set

This update was generated by hackage2nix v20151217-12-g567601b using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/82be4306aef14f3d97c4bf6bebcb875bf046b12e
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/300be01a1038afe0c7b12f3737b8c06f2103e855
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/45f9a3dc1607fcbd0be11ab4c185c0cb9baf9d99
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/18441cd11a18cd8f47f2e1efe89e02049b9e292f
---
 .../haskell-modules/configuration-lts-0.0.nix |   22 +
 .../haskell-modules/configuration-lts-0.1.nix |   22 +
 .../haskell-modules/configuration-lts-0.2.nix |   22 +
 .../haskell-modules/configuration-lts-0.3.nix |   22 +
 .../haskell-modules/configuration-lts-0.4.nix |   22 +
 .../haskell-modules/configuration-lts-0.5.nix |   22 +
 .../haskell-modules/configuration-lts-0.6.nix |   22 +
 .../haskell-modules/configuration-lts-0.7.nix |   22 +
 .../haskell-modules/configuration-lts-1.0.nix |   22 +
 .../haskell-modules/configuration-lts-1.1.nix |   22 +
 .../configuration-lts-1.10.nix                |   22 +
 .../configuration-lts-1.11.nix                |   22 +
 .../configuration-lts-1.12.nix                |   22 +
 .../configuration-lts-1.13.nix                |   22 +
 .../configuration-lts-1.14.nix                |   22 +
 .../configuration-lts-1.15.nix                |   22 +
 .../haskell-modules/configuration-lts-1.2.nix |   22 +
 .../haskell-modules/configuration-lts-1.4.nix |   22 +
 .../haskell-modules/configuration-lts-1.5.nix |   22 +
 .../haskell-modules/configuration-lts-1.7.nix |   22 +
 .../haskell-modules/configuration-lts-1.8.nix |   22 +
 .../haskell-modules/configuration-lts-1.9.nix |   22 +
 .../haskell-modules/configuration-lts-2.0.nix |   24 +
 .../haskell-modules/configuration-lts-2.1.nix |   24 +
 .../configuration-lts-2.10.nix                |   24 +
 .../configuration-lts-2.11.nix                |   24 +
 .../configuration-lts-2.12.nix                |   24 +
 .../configuration-lts-2.13.nix                |   24 +
 .../configuration-lts-2.14.nix                |   24 +
 .../configuration-lts-2.15.nix                |   25 +
 .../configuration-lts-2.16.nix                |   25 +
 .../configuration-lts-2.17.nix                |   25 +
 .../configuration-lts-2.18.nix                |   25 +
 .../configuration-lts-2.19.nix                |   25 +
 .../haskell-modules/configuration-lts-2.2.nix |   24 +
 .../configuration-lts-2.20.nix                |   25 +
 .../configuration-lts-2.21.nix                |   25 +
 .../configuration-lts-2.22.nix                |   25 +
 .../haskell-modules/configuration-lts-2.3.nix |   24 +
 .../haskell-modules/configuration-lts-2.4.nix |   24 +
 .../haskell-modules/configuration-lts-2.5.nix |   24 +
 .../haskell-modules/configuration-lts-2.6.nix |   24 +
 .../haskell-modules/configuration-lts-2.7.nix |   24 +
 .../haskell-modules/configuration-lts-2.8.nix |   24 +
 .../haskell-modules/configuration-lts-2.9.nix |   24 +
 .../haskell-modules/configuration-lts-3.0.nix |   27 +
 .../haskell-modules/configuration-lts-3.1.nix |   27 +
 .../configuration-lts-3.10.nix                |   28 +
 .../configuration-lts-3.11.nix                |   28 +
 .../configuration-lts-3.12.nix                |   28 +
 .../configuration-lts-3.13.nix                |   28 +
 .../configuration-lts-3.14.nix                |   28 +
 .../configuration-lts-3.15.nix                |   28 +
 .../configuration-lts-3.16.nix                |   28 +
 .../configuration-lts-3.17.nix                |   28 +
 .../configuration-lts-3.18.nix                |   29 +
 .../configuration-lts-3.19.nix                |   29 +
 .../haskell-modules/configuration-lts-3.2.nix |   27 +
 .../configuration-lts-3.20.nix                |   29 +
 .../configuration-lts-3.21.nix                |   29 +
 .../configuration-lts-3.22.nix                |   29 +
 .../haskell-modules/configuration-lts-3.3.nix |   27 +
 .../haskell-modules/configuration-lts-3.4.nix |   27 +
 .../haskell-modules/configuration-lts-3.5.nix |   27 +
 .../haskell-modules/configuration-lts-3.6.nix |   27 +
 .../haskell-modules/configuration-lts-3.7.nix |   27 +
 .../haskell-modules/configuration-lts-3.8.nix |   28 +
 .../haskell-modules/configuration-lts-3.9.nix |   28 +
 .../haskell-modules/configuration-lts-4.0.nix |   36 +
 .../haskell-modules/configuration-lts-4.1.nix |   36 +
 .../haskell-modules/configuration-lts-4.2.nix |   36 +
 .../haskell-modules/configuration-lts-5.0.nix |   44 +
 .../haskell-modules/configuration-lts-5.1.nix |   46 +
 .../haskell-modules/configuration-lts-5.2.nix |   50 +
 .../haskell-modules/configuration-lts-5.3.nix |   53 +
 .../haskell-modules/configuration-lts-5.4.nix | 7739 +++++++++++++++++
 .../haskell-modules/hackage-packages.nix      | 1800 +++-
 77 files changed, 11214 insertions(+), 311 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/configuration-lts-5.4.nix

diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index 7ac9c0a12832..6137adecf0ca 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -655,6 +655,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1489,6 +1490,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1982,6 +1984,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_0";
@@ -1996,6 +1999,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2737,6 +2741,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_14";
   "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";
@@ -2753,6 +2758,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3246,6 +3252,7 @@ self: super: {
   "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";
@@ -4057,6 +4064,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4255,6 +4263,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4753,6 +4762,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5415,6 +5425,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6140,6 +6151,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6215,6 +6227,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6293,6 +6306,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6524,6 +6538,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6544,6 +6559,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6912,6 +6928,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7363,6 +7381,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7654,6 +7673,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "sodium" = doDistribute super."sodium_0_11_0_2";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@@ -8346,6 +8366,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8676,6 +8697,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index 56f08b2f1e15..b01ec9391bf7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -655,6 +655,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1489,6 +1490,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1982,6 +1984,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_0";
@@ -1996,6 +1999,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2737,6 +2741,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_14";
   "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";
@@ -2753,6 +2758,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3246,6 +3252,7 @@ self: super: {
   "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";
@@ -4057,6 +4064,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4255,6 +4263,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4753,6 +4762,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5415,6 +5425,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6140,6 +6151,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6215,6 +6227,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6293,6 +6306,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6524,6 +6538,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6544,6 +6559,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6912,6 +6928,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7363,6 +7381,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7654,6 +7673,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "sodium" = doDistribute super."sodium_0_11_0_2";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@@ -8346,6 +8366,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8676,6 +8697,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index 3d4c59742e30..a960665bd201 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -655,6 +655,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1489,6 +1490,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1982,6 +1984,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_0";
@@ -1996,6 +1999,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2737,6 +2741,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_14";
   "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";
@@ -2753,6 +2758,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3246,6 +3252,7 @@ self: super: {
   "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";
@@ -4057,6 +4064,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4255,6 +4263,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4753,6 +4762,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5415,6 +5425,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6140,6 +6151,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6215,6 +6227,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6293,6 +6306,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6524,6 +6538,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6544,6 +6559,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6912,6 +6928,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7363,6 +7381,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7654,6 +7673,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "sodium" = doDistribute super."sodium_0_11_0_2";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@@ -8346,6 +8366,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8676,6 +8697,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index 52ce8fe742d8..bd8ec9285b53 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -655,6 +655,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1489,6 +1490,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1982,6 +1984,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_0";
@@ -1996,6 +1999,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2737,6 +2741,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_14";
   "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";
@@ -2753,6 +2758,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3246,6 +3252,7 @@ self: super: {
   "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";
@@ -4057,6 +4064,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4255,6 +4263,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4753,6 +4762,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5415,6 +5425,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6140,6 +6151,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6215,6 +6227,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6293,6 +6306,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6524,6 +6538,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6544,6 +6559,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6912,6 +6928,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7363,6 +7381,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7654,6 +7673,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "sodium" = doDistribute super."sodium_0_11_0_2";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@@ -8346,6 +8366,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8676,6 +8697,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index c5b407f3039a..03c9cbf1302a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -655,6 +655,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1489,6 +1490,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1982,6 +1984,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_0";
@@ -1996,6 +1999,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2736,6 +2740,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_14";
   "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";
@@ -2752,6 +2757,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3245,6 +3251,7 @@ self: super: {
   "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";
@@ -4054,6 +4061,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4252,6 +4260,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4750,6 +4759,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5412,6 +5422,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6137,6 +6148,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6212,6 +6224,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6290,6 +6303,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6521,6 +6535,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6541,6 +6556,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6909,6 +6925,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7359,6 +7377,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7650,6 +7669,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "sodium" = doDistribute super."sodium_0_11_0_2";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@@ -8342,6 +8362,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8672,6 +8693,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index 75fe2a262491..8ad110b26272 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -655,6 +655,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1489,6 +1490,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1982,6 +1984,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_0";
@@ -1996,6 +1999,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2736,6 +2740,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_14";
   "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";
@@ -2752,6 +2757,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3245,6 +3251,7 @@ self: super: {
   "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";
@@ -4054,6 +4061,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4252,6 +4260,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4750,6 +4759,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5412,6 +5422,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6137,6 +6148,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6212,6 +6224,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6290,6 +6303,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6521,6 +6535,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6541,6 +6556,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6909,6 +6925,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7359,6 +7377,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7650,6 +7669,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "sodium" = doDistribute super."sodium_0_11_0_2";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@@ -8342,6 +8362,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8672,6 +8693,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index 69ebdb8e3abb..a68ffba5febe 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -655,6 +655,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1488,6 +1489,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1981,6 +1983,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_1";
@@ -1995,6 +1998,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2735,6 +2739,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_14";
   "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";
@@ -2751,6 +2756,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3244,6 +3250,7 @@ self: super: {
   "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";
@@ -4053,6 +4060,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4250,6 +4258,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4748,6 +4757,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5410,6 +5420,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6135,6 +6146,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6210,6 +6222,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6288,6 +6301,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6519,6 +6533,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6539,6 +6554,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6907,6 +6923,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7356,6 +7374,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7647,6 +7666,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "sodium" = doDistribute super."sodium_0_11_0_2";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@@ -8339,6 +8359,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8669,6 +8690,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_1";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index 223d20571bde..e84e33b8b6fb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -655,6 +655,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1488,6 +1489,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1981,6 +1983,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_1";
@@ -1995,6 +1998,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2735,6 +2739,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_14";
   "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";
@@ -2751,6 +2756,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3244,6 +3250,7 @@ self: super: {
   "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";
@@ -4053,6 +4060,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4250,6 +4258,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4748,6 +4757,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5410,6 +5420,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6135,6 +6146,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6210,6 +6222,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6288,6 +6301,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6519,6 +6533,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6539,6 +6554,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6907,6 +6923,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7356,6 +7374,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7647,6 +7666,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "sodium" = doDistribute super."sodium_0_11_0_2";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
@@ -8339,6 +8359,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8669,6 +8690,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_1";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index c88b0e0759cc..8fcb4a7b14bc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -652,6 +652,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1484,6 +1485,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1974,6 +1976,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_1";
@@ -1988,6 +1991,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2727,6 +2731,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_14";
   "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";
@@ -2743,6 +2748,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3235,6 +3241,7 @@ self: super: {
   "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";
@@ -4044,6 +4051,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4241,6 +4249,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4737,6 +4746,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5399,6 +5409,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6124,6 +6135,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6199,6 +6211,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6277,6 +6290,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6508,6 +6522,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6528,6 +6543,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6896,6 +6912,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7344,6 +7362,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7635,6 +7654,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8326,6 +8346,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8655,6 +8676,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_1";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index 28189cb09cf1..d2c2eb366c8d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -652,6 +652,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1484,6 +1485,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1973,6 +1975,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_1";
@@ -1987,6 +1990,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2725,6 +2729,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_14";
   "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";
@@ -2741,6 +2746,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3232,6 +3238,7 @@ self: super: {
   "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";
@@ -4040,6 +4047,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4237,6 +4245,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4731,6 +4740,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5393,6 +5403,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6117,6 +6128,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6192,6 +6204,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6270,6 +6283,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6501,6 +6515,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6521,6 +6536,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6889,6 +6905,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7337,6 +7355,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7627,6 +7646,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8314,6 +8334,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8642,6 +8663,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_1";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index c1b5f626abfe..79508ed479d4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -651,6 +651,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1483,6 +1484,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1971,6 +1973,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_1";
@@ -1985,6 +1988,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2721,6 +2725,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2737,6 +2742,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3225,6 +3231,7 @@ self: super: {
   "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";
@@ -4030,6 +4037,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4226,6 +4234,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4720,6 +4729,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_5";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5377,6 +5387,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6098,6 +6109,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6173,6 +6185,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6250,6 +6263,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6481,6 +6495,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6501,6 +6516,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6868,6 +6884,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7315,6 +7333,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7604,6 +7623,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8287,6 +8307,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8614,6 +8635,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index 34bf08330929..d49b03d721ef 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -651,6 +651,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1483,6 +1484,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1971,6 +1973,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_1";
@@ -1985,6 +1988,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2721,6 +2725,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2737,6 +2742,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3224,6 +3230,7 @@ self: super: {
   "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";
@@ -4029,6 +4036,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4225,6 +4233,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4719,6 +4728,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_5";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5373,6 +5383,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6094,6 +6105,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6169,6 +6181,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6246,6 +6259,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6477,6 +6491,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6497,6 +6512,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6864,6 +6880,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7311,6 +7329,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7600,6 +7619,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8283,6 +8303,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8610,6 +8631,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 4960dfb11423..07203ef2701a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -651,6 +651,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1483,6 +1484,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1971,6 +1973,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_2";
@@ -1985,6 +1988,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2721,6 +2725,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2737,6 +2742,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3224,6 +3230,7 @@ self: super: {
   "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";
@@ -4029,6 +4036,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4224,6 +4232,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4718,6 +4727,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_5";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5372,6 +5382,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6093,6 +6104,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6168,6 +6180,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6245,6 +6258,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6476,6 +6490,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6496,6 +6511,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6863,6 +6879,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7310,6 +7328,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7599,6 +7618,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8281,6 +8301,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8608,6 +8629,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 700792e04d34..9e9c3094ada7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -651,6 +651,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1483,6 +1484,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1971,6 +1973,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_2";
@@ -1985,6 +1988,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2721,6 +2725,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2737,6 +2742,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3224,6 +3230,7 @@ self: super: {
   "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";
@@ -4028,6 +4035,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4223,6 +4231,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4717,6 +4726,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_5";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5371,6 +5381,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6092,6 +6103,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6167,6 +6179,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6244,6 +6257,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6475,6 +6489,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6495,6 +6510,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6862,6 +6878,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7309,6 +7327,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7598,6 +7617,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8279,6 +8299,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8606,6 +8627,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 68c3439efa02..05194bba331f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -650,6 +650,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1482,6 +1483,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1969,6 +1971,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_2";
@@ -1983,6 +1986,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2718,6 +2722,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2734,6 +2739,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3221,6 +3227,7 @@ self: super: {
   "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";
@@ -4025,6 +4032,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4219,6 +4227,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4713,6 +4722,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_6";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5366,6 +5376,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6086,6 +6097,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6161,6 +6173,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6238,6 +6251,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6469,6 +6483,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6489,6 +6504,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6855,6 +6871,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7302,6 +7320,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7591,6 +7610,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8272,6 +8292,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8599,6 +8620,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index 4a3bcbb31e2b..356c8b4652d9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -650,6 +650,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1481,6 +1482,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1968,6 +1970,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_2";
@@ -1982,6 +1985,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2715,6 +2719,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2731,6 +2736,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3217,6 +3223,7 @@ self: super: {
   "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";
@@ -4021,6 +4028,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4215,6 +4223,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4709,6 +4718,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_6";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5362,6 +5372,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6080,6 +6091,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6155,6 +6167,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6232,6 +6245,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6463,6 +6477,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6483,6 +6498,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6848,6 +6864,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7295,6 +7313,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7584,6 +7603,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8263,6 +8283,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8590,6 +8611,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index cac7ea84e5a7..db969111d4eb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -652,6 +652,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1484,6 +1485,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1973,6 +1975,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_1";
@@ -1987,6 +1990,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2723,6 +2727,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_14";
   "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";
@@ -2739,6 +2744,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3230,6 +3236,7 @@ self: super: {
   "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";
@@ -4037,6 +4044,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4234,6 +4242,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4728,6 +4737,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5390,6 +5400,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6114,6 +6125,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6189,6 +6201,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6266,6 +6279,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6497,6 +6511,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6517,6 +6532,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6884,6 +6900,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7331,6 +7349,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7621,6 +7640,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8308,6 +8328,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8636,6 +8657,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index a2057dcca1d5..29c93121b18b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -651,6 +651,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1483,6 +1484,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1972,6 +1974,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_1";
@@ -1986,6 +1989,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2722,6 +2726,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2738,6 +2743,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3228,6 +3234,7 @@ self: super: {
   "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";
@@ -4035,6 +4042,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4231,6 +4239,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4725,6 +4734,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5387,6 +5397,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6110,6 +6121,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6185,6 +6197,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6262,6 +6275,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6493,6 +6507,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6513,6 +6528,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6880,6 +6896,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7327,6 +7345,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7617,6 +7636,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8303,6 +8323,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8631,6 +8652,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index ea9f668b711d..adf9213f2c28 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -651,6 +651,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1483,6 +1484,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1971,6 +1973,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_1";
@@ -1985,6 +1988,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2721,6 +2725,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2737,6 +2742,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3227,6 +3233,7 @@ self: super: {
   "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";
@@ -4034,6 +4041,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4230,6 +4238,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4724,6 +4733,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5386,6 +5396,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6109,6 +6120,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6184,6 +6196,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6261,6 +6274,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6492,6 +6506,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6512,6 +6527,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6879,6 +6895,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7326,6 +7344,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7616,6 +7635,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8301,6 +8321,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8628,6 +8649,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index 0f17f0281f86..0bb90638d108 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -651,6 +651,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1483,6 +1484,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1971,6 +1973,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_1";
@@ -1985,6 +1988,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2721,6 +2725,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2737,6 +2742,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3227,6 +3233,7 @@ self: super: {
   "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";
@@ -4034,6 +4041,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4230,6 +4238,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4724,6 +4733,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5381,6 +5391,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6104,6 +6115,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6179,6 +6191,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6256,6 +6269,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6487,6 +6501,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6507,6 +6522,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6874,6 +6890,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7321,6 +7339,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7611,6 +7630,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8296,6 +8316,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8623,6 +8644,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index 47ef6d937c47..1fe763664aaa 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -651,6 +651,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1483,6 +1484,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1971,6 +1973,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_1";
@@ -1985,6 +1988,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2721,6 +2725,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2737,6 +2742,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3225,6 +3231,7 @@ self: super: {
   "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";
@@ -4031,6 +4038,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4227,6 +4235,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4721,6 +4730,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_4";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5378,6 +5388,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6100,6 +6111,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6175,6 +6187,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6252,6 +6265,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_1";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6483,6 +6497,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6503,6 +6518,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6870,6 +6886,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7317,6 +7335,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7607,6 +7626,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8291,6 +8311,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8618,6 +8639,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index 371c2dadf427..efbe3f49269b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -651,6 +651,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1483,6 +1484,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1971,6 +1973,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_1";
@@ -1985,6 +1988,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2721,6 +2725,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2737,6 +2742,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3225,6 +3231,7 @@ self: super: {
   "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";
@@ -4030,6 +4037,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4226,6 +4234,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4720,6 +4729,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_5";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5377,6 +5387,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -6099,6 +6110,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6174,6 +6186,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6251,6 +6264,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6482,6 +6496,7 @@ self: super: {
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = dontDistribute super."pipes-binary";
   "pipes-bytestring" = dontDistribute super."pipes-bytestring";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6502,6 +6517,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network" = dontDistribute super."pipes-network";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
@@ -6869,6 +6885,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = dontDistribute super."rasterific-svg";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7316,6 +7334,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = dontDistribute super."servant";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7606,6 +7625,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8290,6 +8310,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = dontDistribute super."turtle";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8617,6 +8638,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index e48c6649f9d7..cc0205433b20 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -646,6 +646,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1473,6 +1474,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1958,6 +1960,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_3";
@@ -1972,6 +1975,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2701,6 +2705,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2717,6 +2722,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3203,6 +3209,7 @@ self: super: {
   "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";
@@ -4003,6 +4010,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4197,6 +4205,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4420,6 +4429,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4687,6 +4697,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_6";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5328,6 +5339,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5891,6 +5903,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -6035,6 +6048,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6110,6 +6124,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6187,6 +6202,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6416,6 +6432,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6436,6 +6453,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6800,6 +6818,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7246,6 +7266,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7531,6 +7552,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8208,6 +8230,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8533,6 +8556,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 786d58cac8b9..83feb1b2f3da 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -646,6 +646,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1473,6 +1474,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1957,6 +1959,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_3";
@@ -1971,6 +1974,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2700,6 +2704,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2716,6 +2721,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3202,6 +3208,7 @@ self: super: {
   "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";
@@ -4002,6 +4009,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4196,6 +4204,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4419,6 +4428,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4686,6 +4696,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_6";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5327,6 +5338,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5890,6 +5902,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -6034,6 +6047,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6109,6 +6123,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6186,6 +6201,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6415,6 +6431,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6435,6 +6452,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6799,6 +6817,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7245,6 +7265,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7530,6 +7551,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8207,6 +8229,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8531,6 +8554,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index 36a315c5180b..67d34a156944 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1466,6 +1467,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1946,6 +1948,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_2_4";
@@ -1960,6 +1963,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2687,6 +2691,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2703,6 +2708,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3185,6 +3191,7 @@ self: super: {
   "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";
@@ -3983,6 +3990,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4177,6 +4185,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4399,6 +4408,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4664,6 +4674,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5301,6 +5312,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5861,6 +5873,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -6003,6 +6016,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6078,6 +6092,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6155,6 +6170,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = doDistribute super."optparse-simple_0_0_2";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6382,6 +6398,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6402,6 +6419,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6764,6 +6782,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7208,6 +7228,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7492,6 +7513,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8160,6 +8182,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8484,6 +8507,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index ef4c7ce282dc..8f2db34a72cc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1465,6 +1466,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1945,6 +1947,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_2_4";
@@ -1959,6 +1962,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2686,6 +2690,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2702,6 +2707,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3184,6 +3190,7 @@ self: super: {
   "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";
@@ -3981,6 +3988,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4174,6 +4182,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4396,6 +4405,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4661,6 +4671,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5297,6 +5308,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5856,6 +5868,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5998,6 +6011,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6073,6 +6087,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6150,6 +6165,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6376,6 +6392,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6396,6 +6413,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6758,6 +6776,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7201,6 +7221,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7485,6 +7506,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8151,6 +8173,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8475,6 +8498,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 8303aacfd804..4888317d87ef 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1465,6 +1466,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1945,6 +1947,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_2_4";
@@ -1959,6 +1962,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2686,6 +2690,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2702,6 +2707,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3184,6 +3190,7 @@ self: super: {
   "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";
@@ -3981,6 +3988,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4174,6 +4182,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4396,6 +4405,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4661,6 +4671,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5297,6 +5308,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5856,6 +5868,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5998,6 +6011,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6073,6 +6087,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6150,6 +6165,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6376,6 +6392,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6396,6 +6413,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6758,6 +6776,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7200,6 +7220,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7484,6 +7505,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8150,6 +8172,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8474,6 +8497,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index 52cec4732baf..6ac434b71266 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1465,6 +1466,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1945,6 +1947,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_3_0";
@@ -1959,6 +1962,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2686,6 +2690,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2702,6 +2707,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3184,6 +3190,7 @@ self: super: {
   "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";
@@ -3980,6 +3987,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4173,6 +4181,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4395,6 +4404,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4660,6 +4670,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5295,6 +5306,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5854,6 +5866,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5996,6 +6009,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6071,6 +6085,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6148,6 +6163,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6374,6 +6390,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6394,6 +6411,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6756,6 +6774,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7198,6 +7218,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7482,6 +7503,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8148,6 +8170,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8472,6 +8495,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 8ae1bed9f3cb..55462d75497c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1464,6 +1465,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1944,6 +1946,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_3_0";
@@ -1958,6 +1961,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2685,6 +2689,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2701,6 +2706,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3182,6 +3188,7 @@ self: super: {
   "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";
@@ -3978,6 +3985,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4171,6 +4179,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4393,6 +4402,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4657,6 +4667,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5292,6 +5303,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5851,6 +5863,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5993,6 +6006,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6068,6 +6082,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6145,6 +6160,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6371,6 +6387,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6391,6 +6408,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6753,6 +6771,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7195,6 +7215,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7478,6 +7499,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8144,6 +8166,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8468,6 +8491,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index cc1588571cee..2327163b9f8c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1464,6 +1465,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1944,6 +1946,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_3_0";
@@ -1958,6 +1961,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2685,6 +2689,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2701,6 +2706,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3181,6 +3187,7 @@ self: super: {
   "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";
@@ -3977,6 +3984,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4170,6 +4178,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4392,6 +4401,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4656,6 +4666,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5291,6 +5302,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5849,6 +5861,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5967,6 +5980,7 @@ self: super: {
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -5990,6 +6004,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6065,6 +6080,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6142,6 +6158,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6368,6 +6385,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6388,6 +6406,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6750,6 +6769,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7192,6 +7213,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7475,6 +7497,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8140,6 +8163,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8464,6 +8488,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index ab44df6f4f79..c0bdb9c075f4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1464,6 +1465,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1944,6 +1946,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_3_0";
@@ -1958,6 +1961,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2682,6 +2686,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2698,6 +2703,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3177,6 +3183,7 @@ self: super: {
   "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";
@@ -3973,6 +3980,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4166,6 +4174,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4388,6 +4397,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4652,6 +4662,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5286,6 +5297,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5844,6 +5856,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5962,6 +5975,7 @@ self: super: {
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -5985,6 +5999,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6060,6 +6075,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6137,6 +6153,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6363,6 +6380,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6383,6 +6401,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6745,6 +6764,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7187,6 +7208,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7470,6 +7492,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8135,6 +8158,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8459,6 +8483,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index 04df96c30c8a..f7d9f4e79386 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1463,6 +1464,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1942,6 +1944,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_3_0";
@@ -1956,6 +1959,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2680,6 +2684,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2696,6 +2701,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3173,6 +3179,7 @@ self: super: {
   "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";
@@ -3968,6 +3975,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4161,6 +4169,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4383,6 +4392,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4647,6 +4657,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5281,6 +5292,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5839,6 +5851,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5957,6 +5970,7 @@ self: super: {
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -5980,6 +5994,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6054,6 +6069,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6131,6 +6147,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6357,6 +6374,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6377,6 +6395,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6739,6 +6758,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7181,6 +7202,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7464,6 +7486,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8129,6 +8152,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8453,6 +8477,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index 0bae504f61a1..625bb751dd70 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1463,6 +1464,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1941,6 +1943,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_3_0";
@@ -1955,6 +1958,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2679,6 +2683,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2695,6 +2700,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3171,6 +3177,7 @@ self: super: {
   "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";
@@ -3966,6 +3973,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4158,6 +4166,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4380,6 +4389,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4644,6 +4654,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5278,6 +5289,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5836,6 +5848,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5953,6 +5966,7 @@ self: super: {
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -5976,6 +5990,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6050,6 +6065,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6127,6 +6143,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6353,6 +6370,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6373,6 +6391,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6735,6 +6754,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7177,6 +7198,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7460,6 +7482,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8124,6 +8147,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8448,6 +8472,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index d213048219ca..a86e275379d2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1463,6 +1464,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1941,6 +1943,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_3_1";
@@ -1955,6 +1958,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2679,6 +2683,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2695,6 +2700,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3171,6 +3177,7 @@ self: super: {
   "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";
@@ -3965,6 +3972,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4157,6 +4165,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4379,6 +4388,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4643,6 +4653,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5277,6 +5288,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5834,6 +5846,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5951,6 +5964,7 @@ self: super: {
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -5974,6 +5988,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6048,6 +6063,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6125,6 +6141,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6351,6 +6368,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6371,6 +6389,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6733,6 +6752,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7175,6 +7196,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7456,6 +7478,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8120,6 +8143,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8444,6 +8468,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index 55f13118e3f2..5bd503e257bd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -646,6 +646,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1472,6 +1473,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1954,6 +1956,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_3";
@@ -1968,6 +1971,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2697,6 +2701,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2713,6 +2718,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3199,6 +3205,7 @@ self: super: {
   "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";
@@ -3999,6 +4006,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4193,6 +4201,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4416,6 +4425,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4683,6 +4693,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_6";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5324,6 +5335,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5887,6 +5899,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -6031,6 +6044,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6106,6 +6120,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6183,6 +6198,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6412,6 +6428,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6432,6 +6449,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6796,6 +6814,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7242,6 +7262,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7527,6 +7548,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8204,6 +8226,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8528,6 +8551,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index ebfd30a5cedc..d214cf62b668 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1463,6 +1464,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1941,6 +1943,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_3_1";
@@ -1955,6 +1958,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2678,6 +2682,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2694,6 +2699,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3170,6 +3176,7 @@ self: super: {
   "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";
@@ -3964,6 +3971,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4156,6 +4164,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4378,6 +4387,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4642,6 +4652,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5276,6 +5287,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5833,6 +5845,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5950,6 +5963,7 @@ self: super: {
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -5973,6 +5987,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6047,6 +6062,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6124,6 +6140,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6350,6 +6367,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6370,6 +6388,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6731,6 +6750,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7173,6 +7194,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7453,6 +7475,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8117,6 +8140,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8441,6 +8465,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index 3fce33ab764d..a23e5cebefb3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1463,6 +1464,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1941,6 +1943,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_3_1";
@@ -1955,6 +1958,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2678,6 +2682,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2694,6 +2699,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3170,6 +3176,7 @@ self: super: {
   "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";
@@ -3964,6 +3971,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4156,6 +4164,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4378,6 +4387,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4642,6 +4652,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5275,6 +5286,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5832,6 +5844,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5949,6 +5962,7 @@ self: super: {
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -5972,6 +5986,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6046,6 +6061,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6123,6 +6139,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6349,6 +6366,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6369,6 +6387,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6729,6 +6748,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7171,6 +7192,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7451,6 +7473,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8115,6 +8138,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8437,6 +8461,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 87a4bc9f864e..159429c59152 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1463,6 +1464,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1941,6 +1943,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_3_1";
@@ -1955,6 +1958,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2678,6 +2682,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2694,6 +2699,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3170,6 +3176,7 @@ self: super: {
   "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";
@@ -3964,6 +3971,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4156,6 +4164,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4377,6 +4386,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4641,6 +4651,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5274,6 +5285,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5830,6 +5842,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5947,6 +5960,7 @@ self: super: {
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-composed" = dontDistribute super."network-transport-composed";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -5970,6 +5984,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6044,6 +6059,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6121,6 +6137,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6347,6 +6364,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6367,6 +6385,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6727,6 +6746,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7169,6 +7190,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7449,6 +7471,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8113,6 +8136,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8435,6 +8459,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index 485e45cc6e22..22cb853d62cd 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -646,6 +646,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1472,6 +1473,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1954,6 +1956,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_3";
@@ -1968,6 +1971,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2697,6 +2701,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2713,6 +2718,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3198,6 +3204,7 @@ self: super: {
   "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";
@@ -3998,6 +4005,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4192,6 +4200,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4415,6 +4424,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4682,6 +4692,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_6";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5322,6 +5333,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5885,6 +5897,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -6029,6 +6042,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6104,6 +6118,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6181,6 +6196,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6410,6 +6426,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6430,6 +6447,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6794,6 +6812,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7240,6 +7260,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7525,6 +7546,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8202,6 +8224,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8526,6 +8549,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 8a4a70c5298e..0b54e10bcf1a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -646,6 +646,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1472,6 +1473,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1953,6 +1955,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_3";
@@ -1967,6 +1970,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2696,6 +2700,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2712,6 +2717,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3197,6 +3203,7 @@ self: super: {
   "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";
@@ -3997,6 +4004,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4191,6 +4199,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4414,6 +4423,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4681,6 +4691,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_6";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5321,6 +5332,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5883,6 +5895,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -6027,6 +6040,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6102,6 +6116,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6179,6 +6194,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6407,6 +6423,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6427,6 +6444,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6791,6 +6809,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7236,6 +7256,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7521,6 +7542,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8198,6 +8220,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8522,6 +8545,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 4233d8fc4544..21ce9326946d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -646,6 +646,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1472,6 +1473,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1953,6 +1955,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_3";
@@ -1967,6 +1970,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2695,6 +2699,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2711,6 +2716,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3196,6 +3202,7 @@ self: super: {
   "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";
@@ -3996,6 +4003,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4190,6 +4198,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4413,6 +4422,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4680,6 +4690,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_6";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5320,6 +5331,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5882,6 +5894,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -6026,6 +6039,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6101,6 +6115,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6178,6 +6193,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6406,6 +6422,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6426,6 +6443,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6790,6 +6808,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7235,6 +7255,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7520,6 +7541,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8197,6 +8219,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8521,6 +8544,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index ec0401314e0f..5f281520fe19 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -646,6 +646,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1470,6 +1471,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1950,6 +1952,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_3";
@@ -1964,6 +1967,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2692,6 +2696,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2708,6 +2713,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3193,6 +3199,7 @@ self: super: {
   "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";
@@ -3991,6 +3998,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4185,6 +4193,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4408,6 +4417,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4675,6 +4685,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_6";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5315,6 +5326,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5877,6 +5889,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -6020,6 +6033,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6095,6 +6109,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6172,6 +6187,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6400,6 +6416,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6420,6 +6437,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6784,6 +6802,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7229,6 +7249,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7514,6 +7535,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8189,6 +8211,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8513,6 +8536,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 72a550021b78..71801ba1ac69 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1469,6 +1470,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1949,6 +1951,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_3";
@@ -1963,6 +1966,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2691,6 +2695,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2707,6 +2712,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3192,6 +3198,7 @@ self: super: {
   "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";
@@ -3990,6 +3997,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4184,6 +4192,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4407,6 +4416,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4674,6 +4684,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_6";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5314,6 +5325,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5877,6 +5889,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -6019,6 +6032,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6094,6 +6108,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6171,6 +6186,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = dontDistribute super."optparse-simple";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6399,6 +6415,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6419,6 +6436,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6783,6 +6801,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7228,6 +7248,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7513,6 +7534,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8188,6 +8210,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8512,6 +8535,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index f8c03a26d703..03512c1024f0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1468,6 +1469,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1948,6 +1950,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2";
   "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" = doDistribute super."cassava_0_4_2_3";
@@ -1962,6 +1965,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2690,6 +2694,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2706,6 +2711,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3190,6 +3196,7 @@ self: super: {
   "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";
@@ -3988,6 +3995,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4182,6 +4190,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4405,6 +4414,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4672,6 +4682,7 @@ self: super: {
   "http-date" = doDistribute super."http-date_0_0_6";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5312,6 +5323,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5875,6 +5887,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -6017,6 +6030,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6092,6 +6106,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6169,6 +6184,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = doDistribute super."optparse-simple_0_0_2";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6397,6 +6413,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6417,6 +6434,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6781,6 +6799,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7225,6 +7245,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7509,6 +7530,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8182,6 +8204,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8506,6 +8529,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index 0b803aceaa70..85897a41255f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -645,6 +645,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = doDistribute super."MFlow_0_4_5_9";
   "MHask" = dontDistribute super."MHask";
@@ -1466,6 +1467,7 @@ self: super: {
   "authoring" = dontDistribute super."authoring";
   "auto" = dontDistribute super."auto";
   "auto-update" = doDistribute super."auto-update_0_1_2_1";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1946,6 +1948,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_2_4";
@@ -1960,6 +1963,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cautious-file" = dontDistribute super."cautious-file";
   "cayley-client" = dontDistribute super."cayley-client";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
@@ -2688,6 +2692,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2704,6 +2709,7 @@ self: super: {
   "distributed-process-async" = doDistribute super."distributed-process-async_0_2_1";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = doDistribute super."distributed-process-client-server_0_1_2";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = doDistribute super."distributed-process-execution_0_1_1";
   "distributed-process-extras" = doDistribute super."distributed-process-extras_0_2_0";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3186,6 +3192,7 @@ self: super: {
   "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";
@@ -3984,6 +3991,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4178,6 +4186,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4401,6 +4410,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4666,6 +4676,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5305,6 +5316,7 @@ self: super: {
   "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";
   "libxml-sax" = dontDistribute super."libxml-sax";
@@ -5867,6 +5879,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -6009,6 +6022,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -6084,6 +6098,7 @@ self: super: {
   "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";
   "ofx" = dontDistribute super."ofx";
@@ -6161,6 +6176,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "optparse-simple" = doDistribute super."optparse-simple_0_0_2";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
@@ -6388,6 +6404,7 @@ self: super: {
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-bgzf" = dontDistribute super."pipes-bgzf";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6408,6 +6425,7 @@ self: super: {
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-illumina" = dontDistribute super."pipes-illumina";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6772,6 +6790,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_1_0_3";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -7216,6 +7236,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_2_2";
   "servant-JuicyPixels" = dontDistribute super."servant-JuicyPixels";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7500,6 +7521,7 @@ self: super: {
   "socket-io" = dontDistribute super."socket-io";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -8169,6 +8191,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_0_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8493,6 +8516,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index a4dcc621a82e..e2c72b96b624 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -633,6 +633,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1425,6 +1426,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1737,6 +1739,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1885,6 +1888,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_3_1";
@@ -1899,6 +1903,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_3_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2607,6 +2612,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2622,6 +2628,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3082,6 +3089,7 @@ self: super: {
   "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";
@@ -3868,6 +3876,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4057,6 +4066,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4275,6 +4285,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4534,6 +4545,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5134,6 +5146,7 @@ self: super: {
   "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";
@@ -5251,6 +5264,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5670,6 +5684,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5808,6 +5823,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5880,6 +5896,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5953,6 +5970,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6172,6 +6190,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6188,6 +6207,7 @@ self: super: {
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6545,6 +6565,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_1";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6985,6 +7007,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7014,6 +7037,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7260,6 +7284,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_3";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7903,6 +7928,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_1";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8219,6 +8245,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index da4b30b8f9c9..42ad5e82e7ed 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -633,6 +633,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1424,6 +1425,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1736,6 +1738,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1884,6 +1887,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_3_1";
@@ -1898,6 +1902,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_3_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2606,6 +2611,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2621,6 +2627,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3079,6 +3086,7 @@ self: super: {
   "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";
@@ -3865,6 +3873,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4054,6 +4063,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4272,6 +4282,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4531,6 +4542,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5131,6 +5143,7 @@ self: super: {
   "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";
@@ -5248,6 +5261,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5665,6 +5679,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5803,6 +5818,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5875,6 +5891,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5948,6 +5965,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6166,6 +6184,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6182,6 +6201,7 @@ self: super: {
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-group" = doDistribute super."pipes-group_1_0_2";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6539,6 +6559,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_1";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6978,6 +7000,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -7007,6 +7030,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7253,6 +7277,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_3";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7896,6 +7921,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_1";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8211,6 +8237,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index 3b608d17c163..c36daa1f5e9c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -628,6 +628,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1413,6 +1414,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1722,6 +1724,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1869,6 +1872,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_4_0";
@@ -1883,6 +1887,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2585,6 +2590,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "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";
@@ -2600,6 +2606,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3052,6 +3059,7 @@ self: super: {
   "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";
@@ -3834,6 +3842,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4022,6 +4031,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4238,6 +4248,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4496,6 +4507,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5088,6 +5100,7 @@ self: super: {
   "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";
@@ -5205,6 +5218,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5618,6 +5632,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5754,6 +5769,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5826,6 +5842,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5898,6 +5915,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6115,6 +6133,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6130,6 +6149,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6317,6 +6337,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6480,6 +6501,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6918,6 +6941,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6947,6 +6971,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7189,6 +7214,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7824,6 +7850,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8136,6 +8163,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index 71295c733a22..25a29c1d60a6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -628,6 +628,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1413,6 +1414,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1722,6 +1724,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1868,6 +1871,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_4_0";
@@ -1882,6 +1886,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2584,6 +2589,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "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";
@@ -2599,6 +2605,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3050,6 +3057,7 @@ self: super: {
   "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";
@@ -3832,6 +3840,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4020,6 +4029,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4236,6 +4246,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4494,6 +4505,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5086,6 +5098,7 @@ self: super: {
   "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";
@@ -5203,6 +5216,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5616,6 +5630,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5752,6 +5767,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5824,6 +5840,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5896,6 +5913,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6112,6 +6130,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6127,6 +6146,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6314,6 +6334,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6477,6 +6498,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6915,6 +6938,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6944,6 +6968,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7185,6 +7210,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7820,6 +7846,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8132,6 +8159,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index cd3a21a04243..28327fc0dd2e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -627,6 +627,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1412,6 +1413,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1721,6 +1723,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1867,6 +1870,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_4_0";
@@ -1881,6 +1885,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2580,6 +2585,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "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";
@@ -2595,6 +2601,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3046,6 +3053,7 @@ self: super: {
   "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";
@@ -3827,6 +3835,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4015,6 +4024,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4231,6 +4241,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4489,6 +4500,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5081,6 +5093,7 @@ self: super: {
   "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";
@@ -5198,6 +5211,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5611,6 +5625,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5747,6 +5762,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5819,6 +5835,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5891,6 +5908,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6106,6 +6124,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6121,6 +6140,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6308,6 +6328,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6471,6 +6492,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6909,6 +6932,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6938,6 +6962,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7179,6 +7204,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7812,6 +7838,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8124,6 +8151,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index eb17f7e72a80..0127a5f93309 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -627,6 +627,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1412,6 +1413,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1721,6 +1723,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1867,6 +1870,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_4_0";
@@ -1881,6 +1885,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2580,6 +2585,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "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";
@@ -2595,6 +2601,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3046,6 +3053,7 @@ self: super: {
   "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";
@@ -3827,6 +3835,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4015,6 +4024,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4230,6 +4240,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4488,6 +4499,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5079,6 +5091,7 @@ self: super: {
   "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";
@@ -5196,6 +5209,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5609,6 +5623,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5745,6 +5760,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5817,6 +5833,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5889,6 +5906,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6103,6 +6121,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6118,6 +6137,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6305,6 +6325,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6468,6 +6489,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6906,6 +6929,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6935,6 +6959,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7176,6 +7201,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7809,6 +7835,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8121,6 +8148,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index 4977ead89e3d..b7422753928d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -627,6 +627,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1410,6 +1411,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1718,6 +1720,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1864,6 +1867,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_4_0";
@@ -1878,6 +1882,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2574,6 +2579,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "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";
@@ -2589,6 +2595,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3040,6 +3047,7 @@ self: super: {
   "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";
@@ -3821,6 +3829,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4009,6 +4018,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4224,6 +4234,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4481,6 +4492,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5072,6 +5084,7 @@ self: super: {
   "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";
@@ -5189,6 +5202,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5601,6 +5615,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5737,6 +5752,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5809,6 +5825,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5881,6 +5898,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6095,6 +6113,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6110,6 +6129,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6297,6 +6317,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6460,6 +6481,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6898,6 +6921,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6927,6 +6951,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7168,6 +7193,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7801,6 +7827,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_3";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8113,6 +8140,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 69adc7bd0e43..93f64e0297e2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -627,6 +627,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1410,6 +1411,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1718,6 +1720,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1864,6 +1867,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_4_0";
@@ -1878,6 +1882,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2574,6 +2579,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "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";
@@ -2589,6 +2595,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3040,6 +3047,7 @@ self: super: {
   "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";
@@ -3819,6 +3827,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4007,6 +4016,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4221,6 +4231,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4478,6 +4489,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5068,6 +5080,7 @@ self: super: {
   "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";
@@ -5185,6 +5198,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5597,6 +5611,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5733,6 +5748,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5805,6 +5821,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5877,6 +5894,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6091,6 +6109,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6106,6 +6125,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6293,6 +6313,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6456,6 +6477,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6894,6 +6917,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6922,6 +6946,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7163,6 +7188,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7796,6 +7822,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_3";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8108,6 +8135,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index fb176346a7b1..547e69051d1d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -627,6 +627,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1409,6 +1410,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1717,6 +1719,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1863,6 +1866,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_4_0";
@@ -1877,6 +1881,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2573,6 +2578,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "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";
@@ -2588,6 +2594,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3038,6 +3045,7 @@ self: super: {
   "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";
@@ -3816,6 +3824,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4004,6 +4013,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4218,6 +4228,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4475,6 +4486,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5064,6 +5076,7 @@ self: super: {
   "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";
@@ -5181,6 +5194,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5592,6 +5606,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5728,6 +5743,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5800,6 +5816,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5872,6 +5889,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6085,6 +6103,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6100,6 +6119,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6286,6 +6306,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6449,6 +6470,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6885,6 +6908,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6913,6 +6937,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7154,6 +7179,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7784,6 +7810,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_3";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8096,6 +8123,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index d3db8afa3005..bc49a4c4d8b0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -627,6 +627,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1408,6 +1409,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1716,6 +1718,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1862,6 +1865,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_4_0";
@@ -1876,6 +1880,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2571,6 +2576,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "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";
@@ -2586,6 +2592,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3036,6 +3043,7 @@ self: super: {
   "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";
@@ -3813,6 +3821,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4001,6 +4010,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4215,6 +4225,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4472,6 +4483,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5060,6 +5072,7 @@ self: super: {
   "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";
@@ -5176,6 +5189,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5586,6 +5600,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5722,6 +5737,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5794,6 +5810,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5866,6 +5883,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6079,6 +6097,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6094,6 +6113,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6280,6 +6300,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6443,6 +6464,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6879,6 +6902,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6907,6 +6931,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7148,6 +7173,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7778,6 +7804,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_3";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8090,6 +8117,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index 35eb440d7566..9fcfa0c19a11 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -627,6 +627,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1408,6 +1409,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1716,6 +1718,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1861,6 +1864,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_4_0";
@@ -1875,6 +1879,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2570,6 +2575,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "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";
@@ -2585,6 +2591,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3035,6 +3042,7 @@ self: super: {
   "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";
@@ -3809,6 +3817,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -3996,6 +4005,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4209,6 +4219,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4463,6 +4474,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5051,6 +5063,7 @@ self: super: {
   "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";
@@ -5167,6 +5180,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5577,6 +5591,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5713,6 +5728,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5785,6 +5801,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5857,6 +5874,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6069,6 +6087,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6084,6 +6103,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6270,6 +6290,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6431,6 +6452,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6867,6 +6890,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6895,6 +6919,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7135,6 +7160,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7765,6 +7791,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_3";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -7938,6 +7965,7 @@ self: super: {
   "ureader" = dontDistribute super."ureader";
   "urembed" = dontDistribute super."urembed";
   "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
@@ -8076,6 +8104,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index ce8ecc398529..5b282ac41e01 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -626,6 +626,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1405,6 +1406,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1712,6 +1714,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
@@ -1856,6 +1859,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_4_0";
@@ -1870,6 +1874,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2564,6 +2569,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "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";
@@ -2579,6 +2585,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3029,6 +3036,7 @@ self: super: {
   "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";
@@ -3803,6 +3811,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -3990,6 +3999,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4201,6 +4211,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4454,6 +4465,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5041,6 +5053,7 @@ self: super: {
   "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";
@@ -5156,6 +5169,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5566,6 +5580,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5701,6 +5716,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5773,6 +5789,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5845,6 +5862,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6055,6 +6073,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6070,6 +6089,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6256,6 +6276,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6417,6 +6438,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6853,6 +6876,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6881,6 +6905,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7120,6 +7145,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7750,6 +7776,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_4";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -7923,6 +7950,7 @@ self: super: {
   "ureader" = dontDistribute super."ureader";
   "urembed" = dontDistribute super."urembed";
   "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
@@ -8061,6 +8089,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index ba9460ae8c0d..1ebe77d959a4 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -632,6 +632,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1422,6 +1423,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1734,6 +1736,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1882,6 +1885,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_3_1";
@@ -1896,6 +1900,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_3_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2604,6 +2609,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2619,6 +2625,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3076,6 +3083,7 @@ self: super: {
   "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";
@@ -3861,6 +3869,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4050,6 +4059,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4268,6 +4278,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4527,6 +4538,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5125,6 +5137,7 @@ self: super: {
   "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";
@@ -5242,6 +5255,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5659,6 +5673,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5797,6 +5812,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5869,6 +5885,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5942,6 +5959,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6160,6 +6178,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6175,6 +6194,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6531,6 +6551,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_1";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6970,6 +6992,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6999,6 +7022,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7243,6 +7267,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_3";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7886,6 +7911,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_1";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8201,6 +8227,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index 444c6627aeea..76dc6b166816 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -625,6 +625,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1404,6 +1405,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1711,6 +1713,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
@@ -1855,6 +1858,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_4_0";
@@ -1869,6 +1873,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2563,6 +2568,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "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";
@@ -2578,6 +2584,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3028,6 +3035,7 @@ self: super: {
   "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";
@@ -3802,6 +3810,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -3989,6 +3998,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4200,6 +4210,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4453,6 +4464,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5039,6 +5051,7 @@ self: super: {
   "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";
@@ -5154,6 +5167,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5564,6 +5578,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5699,6 +5714,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5771,6 +5787,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5843,6 +5860,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6052,6 +6070,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6067,6 +6086,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6253,6 +6273,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6414,6 +6435,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6849,6 +6872,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_5";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6877,6 +6901,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7116,6 +7141,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7744,6 +7770,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_4";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -7917,6 +7944,7 @@ self: super: {
   "ureader" = dontDistribute super."ureader";
   "urembed" = dontDistribute super."urembed";
   "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
@@ -8055,6 +8083,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index 5d00ab1621bb..3cfb0693f210 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -625,6 +625,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1404,6 +1405,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1711,6 +1713,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
@@ -1855,6 +1858,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_4_0";
@@ -1869,6 +1873,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2562,6 +2567,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "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";
@@ -2577,6 +2583,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3025,6 +3032,7 @@ self: super: {
   "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";
@@ -3798,6 +3806,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -3985,6 +3994,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4196,6 +4206,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4449,6 +4460,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5033,6 +5045,7 @@ self: super: {
   "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";
@@ -5148,6 +5161,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5557,6 +5571,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5692,6 +5707,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5764,6 +5780,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5836,6 +5853,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6044,6 +6062,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6058,6 +6077,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6244,6 +6264,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6405,6 +6426,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6837,6 +6860,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
@@ -6857,6 +6881,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7095,6 +7120,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7722,6 +7748,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -7895,6 +7922,7 @@ self: super: {
   "ureader" = dontDistribute super."ureader";
   "urembed" = dontDistribute super."urembed";
   "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
@@ -8033,6 +8061,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
index 3c00b7054b46..bf031881d65c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -625,6 +625,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1404,6 +1405,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1711,6 +1713,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
@@ -1855,6 +1858,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_4_0";
@@ -1869,6 +1873,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2562,6 +2567,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "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";
@@ -2577,6 +2583,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3023,6 +3030,7 @@ self: super: {
   "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";
@@ -3796,6 +3804,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -3982,6 +3991,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4193,6 +4203,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4446,6 +4457,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5027,6 +5039,7 @@ self: super: {
   "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";
@@ -5142,6 +5155,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5551,6 +5565,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5686,6 +5701,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5758,6 +5774,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5830,6 +5847,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6038,6 +6056,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6052,6 +6071,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6238,6 +6258,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6399,6 +6420,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6831,6 +6854,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
   "servant-cassava" = dontDistribute super."servant-cassava";
@@ -6851,6 +6875,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7089,6 +7114,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7716,6 +7742,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -7889,6 +7916,7 @@ self: super: {
   "ureader" = dontDistribute super."ureader";
   "urembed" = dontDistribute super."urembed";
   "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
@@ -8027,6 +8055,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index f42c314bfbcf..faad5bb99d4f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -632,6 +632,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1421,6 +1422,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1733,6 +1735,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1881,6 +1884,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_3_1";
@@ -1895,6 +1899,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_3_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2602,6 +2607,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2617,6 +2623,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3073,6 +3080,7 @@ self: super: {
   "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";
@@ -3858,6 +3866,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4047,6 +4056,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4264,6 +4274,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4523,6 +4534,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5121,6 +5133,7 @@ self: super: {
   "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";
@@ -5238,6 +5251,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5655,6 +5669,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5793,6 +5808,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5865,6 +5881,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5938,6 +5955,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6156,6 +6174,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6171,6 +6190,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6527,6 +6547,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_1";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6965,6 +6987,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_2";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6994,6 +7017,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7237,6 +7261,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_3";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7879,6 +7904,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_1";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8193,6 +8219,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index 43c7b1f735f1..76d1fc195f9a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -632,6 +632,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1421,6 +1422,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1733,6 +1735,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1881,6 +1884,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_4_0";
@@ -1895,6 +1899,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_3_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2602,6 +2607,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2617,6 +2623,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3073,6 +3080,7 @@ self: super: {
   "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";
@@ -3858,6 +3866,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4047,6 +4056,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4264,6 +4274,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4523,6 +4534,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5121,6 +5133,7 @@ self: super: {
   "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";
@@ -5238,6 +5251,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5655,6 +5669,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5793,6 +5808,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5865,6 +5881,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5938,6 +5955,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6156,6 +6174,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6171,6 +6190,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6527,6 +6547,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_1";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6965,6 +6987,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_2";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6994,6 +7017,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7237,6 +7261,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_3";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7878,6 +7903,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_1";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8192,6 +8218,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index 7ec796dda7bc..cd190f6fec13 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -632,6 +632,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1420,6 +1421,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1732,6 +1734,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1880,6 +1883,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_4_0";
@@ -1894,6 +1898,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_3_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2601,6 +2606,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2616,6 +2622,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3071,6 +3078,7 @@ self: super: {
   "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";
@@ -3856,6 +3864,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4045,6 +4054,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4261,6 +4271,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4519,6 +4530,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5115,6 +5127,7 @@ self: super: {
   "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";
@@ -5232,6 +5245,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5648,6 +5662,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5786,6 +5801,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5858,6 +5874,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5931,6 +5948,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6148,6 +6166,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_4";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6163,6 +6182,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6518,6 +6538,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_1";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6956,6 +6978,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_2";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6985,6 +7008,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7228,6 +7252,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_3";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7866,6 +7891,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_1";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8180,6 +8206,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index a112ab1e4221..aeea6d22b6d1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -632,6 +632,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1420,6 +1421,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1732,6 +1734,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1880,6 +1883,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_4_0";
@@ -1894,6 +1898,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2601,6 +2606,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_15";
   "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";
@@ -2616,6 +2622,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3071,6 +3078,7 @@ self: super: {
   "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";
@@ -3853,6 +3861,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4042,6 +4051,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4258,6 +4268,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4516,6 +4527,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5109,6 +5121,7 @@ self: super: {
   "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";
@@ -5226,6 +5239,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5641,6 +5655,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5779,6 +5794,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5851,6 +5867,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5924,6 +5941,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6141,6 +6159,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6156,6 +6175,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6511,6 +6531,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_1";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6949,6 +6971,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_2";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6978,6 +7001,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7221,6 +7245,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_3";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7858,6 +7883,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_1";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8171,6 +8197,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 65572393d10a..53311a3df47f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -632,6 +632,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1418,6 +1419,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1730,6 +1732,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1878,6 +1881,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_4_0";
@@ -1892,6 +1896,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2598,6 +2603,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "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";
@@ -2613,6 +2619,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3068,6 +3075,7 @@ self: super: {
   "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";
@@ -3850,6 +3858,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4038,6 +4047,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4254,6 +4264,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4512,6 +4523,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5104,6 +5116,7 @@ self: super: {
   "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";
@@ -5221,6 +5234,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5636,6 +5650,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5774,6 +5789,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5846,6 +5862,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5919,6 +5936,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6136,6 +6154,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6151,6 +6170,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6504,6 +6524,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_1";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6942,6 +6964,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_4";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6971,6 +6994,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7214,6 +7238,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_3";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7850,6 +7875,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_1";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8163,6 +8189,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 5620e12acfbb..4226be5db23f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -632,6 +632,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1418,6 +1419,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1728,6 +1730,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1875,6 +1878,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_4_0";
@@ -1889,6 +1893,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2591,6 +2596,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "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";
@@ -2606,6 +2612,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3061,6 +3068,7 @@ self: super: {
   "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";
@@ -3843,6 +3851,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4031,6 +4040,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4247,6 +4257,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4505,6 +4516,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5097,6 +5109,7 @@ self: super: {
   "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";
@@ -5214,6 +5227,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5627,6 +5641,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5765,6 +5780,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5837,6 +5853,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5910,6 +5927,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6127,6 +6145,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6142,6 +6161,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6330,6 +6350,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6493,6 +6514,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6931,6 +6954,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_4";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6960,6 +6984,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7203,6 +7228,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_3";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7838,6 +7864,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8151,6 +8178,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index 6be418c5b6e9..a973edbf42f9 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -630,6 +630,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MFlow" = dontDistribute super."MFlow";
   "MHask" = dontDistribute super."MHask";
@@ -1416,6 +1417,7 @@ self: super: {
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
   "auto-update" = doDistribute super."auto-update_0_1_2_2";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1725,6 +1727,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder" = doDistribute super."buffer-builder_0_2_4_0";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
@@ -1872,6 +1875,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_4_0";
@@ -1886,6 +1890,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -2588,6 +2593,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "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";
@@ -2603,6 +2609,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -3056,6 +3063,7 @@ self: super: {
   "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";
@@ -3838,6 +3846,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -4026,6 +4035,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4242,6 +4252,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4500,6 +4511,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-link-header" = dontDistribute super."http-link-header";
   "http-listen" = dontDistribute super."http-listen";
@@ -5092,6 +5104,7 @@ self: super: {
   "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";
@@ -5209,6 +5222,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5622,6 +5636,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = dontDistribute super."mwc-probability";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5760,6 +5775,7 @@ self: super: {
   "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";
   "nix-paths" = dontDistribute super."nix-paths";
@@ -5832,6 +5848,7 @@ self: super: {
   "octohat" = dontDistribute super."octohat";
   "octopus" = dontDistribute super."octopus";
   "oculus" = dontDistribute super."oculus";
+  "oden-go-packages" = dontDistribute super."oden-go-packages";
   "off-simple" = dontDistribute super."off-simple";
   "ofx" = dontDistribute super."ofx";
   "ohloh-hs" = dontDistribute super."ohloh-hs";
@@ -5904,6 +5921,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_11_0_2";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -6121,6 +6139,7 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
   "pipes-cacophony" = dontDistribute super."pipes-cacophony";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
@@ -6136,6 +6155,7 @@ self: super: {
   "pipes-extras" = dontDistribute super."pipes-extras";
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-mongodb" = dontDistribute super."pipes-mongodb";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
@@ -6324,6 +6344,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6487,6 +6508,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6925,6 +6948,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant" = doDistribute super."servant_0_4_4_4";
   "servant-JuicyPixels" = doDistribute super."servant-JuicyPixels_0_1_0_0";
   "servant-blaze" = dontDistribute super."servant-blaze";
@@ -6954,6 +6978,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -7197,6 +7222,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_3";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7832,6 +7858,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_2";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -8145,6 +8172,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index ab83739308c0..eff8ca3cc61f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -609,6 +609,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MHask" = dontDistribute super."MHask";
   "MSQueue" = dontDistribute super."MSQueue";
@@ -1311,6 +1312,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1603,6 +1605,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
@@ -1698,6 +1701,7 @@ self: super: {
   "cabocha" = dontDistribute super."cabocha";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = doDistribute super."cacophony_0_4_0";
   "caf" = dontDistribute super."caf";
   "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
   "caffegraph" = dontDistribute super."caffegraph";
@@ -1742,6 +1746,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_4_0";
@@ -1756,6 +1761,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -1847,9 +1853,11 @@ self: super: {
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
   "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
+  "clckwrks" = doDistribute super."clckwrks_0_23_13";
   "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-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";
   "cld2" = dontDistribute super."cld2";
@@ -2419,6 +2427,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "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";
@@ -2434,6 +2443,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -2873,6 +2883,7 @@ self: super: {
   "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";
@@ -3623,6 +3634,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -3807,6 +3819,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4007,6 +4020,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4241,6 +4255,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-media" = doDistribute super."http-media_0_6_2";
@@ -4803,6 +4818,7 @@ self: super: {
   "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";
@@ -4917,6 +4933,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5312,6 +5329,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = doDistribute super."mwc-probability_1_0_2";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5417,6 +5435,7 @@ self: super: {
   "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -5439,6 +5458,7 @@ self: super: {
   "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";
@@ -5509,6 +5529,7 @@ self: super: {
   "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";
@@ -5577,6 +5598,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_12_0_0";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -5774,6 +5796,8 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
+  "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
   "pipes-cereal" = dontDistribute super."pipes-cereal";
@@ -5787,6 +5811,7 @@ self: super: {
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
@@ -5963,6 +5988,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6119,6 +6145,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6529,6 +6557,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6545,6 +6574,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -6774,6 +6804,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7372,6 +7403,7 @@ self: super: {
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
   "turtle" = doDistribute super."turtle_1_2_4";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -7533,6 +7565,7 @@ self: super: {
   "ureader" = dontDistribute super."ureader";
   "urembed" = dontDistribute super."urembed";
   "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
@@ -7640,6 +7673,7 @@ self: super: {
   "vimeta" = dontDistribute super."vimeta";
   "vimus" = dontDistribute super."vimus";
   "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl" = doDistribute super."vinyl_0_5_1";
   "vinyl-gl" = dontDistribute super."vinyl-gl";
   "vinyl-json" = dontDistribute super."vinyl-json";
   "vinyl-utils" = dontDistribute super."vinyl-utils";
@@ -7663,6 +7697,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -7846,6 +7881,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_0";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index 82a17df02062..612919ac2c94 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -609,6 +609,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MHask" = dontDistribute super."MHask";
   "MSQueue" = dontDistribute super."MSQueue";
@@ -1309,6 +1310,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1601,6 +1603,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
@@ -1696,6 +1699,7 @@ self: super: {
   "cabocha" = dontDistribute super."cabocha";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = doDistribute super."cacophony_0_4_0";
   "caf" = dontDistribute super."caf";
   "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
   "caffegraph" = dontDistribute super."caffegraph";
@@ -1740,6 +1744,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_4_0";
@@ -1754,6 +1759,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-client" = doDistribute super."cayley-client_0_1_4_0";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
@@ -1845,9 +1851,11 @@ self: super: {
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
   "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
+  "clckwrks" = doDistribute super."clckwrks_0_23_13";
   "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-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";
   "cld2" = dontDistribute super."cld2";
@@ -2417,6 +2425,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "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";
@@ -2432,6 +2441,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -2867,6 +2877,7 @@ self: super: {
   "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";
@@ -3617,6 +3628,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -3800,6 +3812,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -4000,6 +4013,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4234,6 +4248,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-media" = doDistribute super."http-media_0_6_2";
@@ -4788,6 +4803,7 @@ self: super: {
   "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";
@@ -4902,6 +4918,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5297,6 +5314,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = doDistribute super."mwc-probability_1_0_2";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5402,6 +5420,7 @@ self: super: {
   "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -5424,6 +5443,7 @@ self: super: {
   "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";
@@ -5494,6 +5514,7 @@ self: super: {
   "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";
@@ -5562,6 +5583,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_12_0_0";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -5758,6 +5780,8 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
+  "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
   "pipes-cereal" = dontDistribute super."pipes-cereal";
@@ -5770,6 +5794,7 @@ self: super: {
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
@@ -5946,6 +5971,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6102,6 +6128,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6512,6 +6540,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6528,6 +6557,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -6757,6 +6787,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7354,6 +7385,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -7515,6 +7547,7 @@ self: super: {
   "ureader" = dontDistribute super."ureader";
   "urembed" = dontDistribute super."urembed";
   "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
@@ -7622,6 +7655,7 @@ self: super: {
   "vimeta" = dontDistribute super."vimeta";
   "vimus" = dontDistribute super."vimus";
   "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl" = doDistribute super."vinyl_0_5_1";
   "vinyl-gl" = dontDistribute super."vinyl-gl";
   "vinyl-json" = dontDistribute super."vinyl-json";
   "vinyl-utils" = dontDistribute super."vinyl-utils";
@@ -7645,6 +7679,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -7827,6 +7862,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_0";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
index d0be0c20d0b2..f103942113df 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
@@ -607,6 +607,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MHask" = dontDistribute super."MHask";
   "MSQueue" = dontDistribute super."MSQueue";
@@ -1304,6 +1305,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1596,6 +1598,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
@@ -1689,6 +1692,7 @@ self: super: {
   "cabocha" = dontDistribute super."cabocha";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = doDistribute super."cacophony_0_4_0";
   "caf" = dontDistribute super."caf";
   "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
   "caffegraph" = dontDistribute super."caffegraph";
@@ -1732,6 +1736,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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" = doDistribute super."cassava_0_4_4_0";
@@ -1746,6 +1751,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -1836,9 +1842,11 @@ self: super: {
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
   "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
+  "clckwrks" = doDistribute super."clckwrks_0_23_13";
   "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-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";
   "cld2" = dontDistribute super."cld2";
@@ -2404,6 +2412,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "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";
@@ -2419,6 +2428,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -2850,6 +2860,7 @@ self: super: {
   "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";
@@ -3593,6 +3604,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -3773,6 +3785,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -3972,6 +3985,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4202,6 +4216,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-media" = doDistribute super."http-media_0_6_2";
@@ -4752,6 +4767,7 @@ self: super: {
   "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";
@@ -4866,6 +4882,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -5257,6 +5274,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = doDistribute super."mwc-probability_1_0_2";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5362,6 +5380,7 @@ self: super: {
   "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-transport-zeromq" = dontDistribute super."network-transport-zeromq";
   "network-uri-static" = dontDistribute super."network-uri-static";
@@ -5384,6 +5403,7 @@ self: super: {
   "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";
@@ -5454,6 +5474,7 @@ self: super: {
   "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";
@@ -5522,6 +5543,7 @@ self: super: {
   "options-time" = dontDistribute super."options-time";
   "optparse-applicative" = doDistribute super."optparse-applicative_0_12_0_0";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -5718,6 +5740,8 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
+  "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
   "pipes-cereal" = dontDistribute super."pipes-cereal";
@@ -5730,6 +5754,7 @@ self: super: {
   "pipes-files" = dontDistribute super."pipes-files";
   "pipes-http" = dontDistribute super."pipes-http";
   "pipes-interleave" = dontDistribute super."pipes-interleave";
+  "pipes-key-value-csv" = dontDistribute super."pipes-key-value-csv";
   "pipes-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
@@ -5903,6 +5928,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -6059,6 +6085,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6464,6 +6492,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6480,6 +6509,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -6705,6 +6735,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7298,6 +7329,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -7459,6 +7491,7 @@ self: super: {
   "ureader" = dontDistribute super."ureader";
   "urembed" = dontDistribute super."urembed";
   "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
@@ -7566,6 +7599,7 @@ self: super: {
   "vimeta" = dontDistribute super."vimeta";
   "vimus" = dontDistribute super."vimus";
   "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl" = doDistribute super."vinyl_0_5_1";
   "vinyl-gl" = dontDistribute super."vinyl-gl";
   "vinyl-json" = dontDistribute super."vinyl-json";
   "vinyl-utils" = dontDistribute super."vinyl-utils";
@@ -7589,6 +7623,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -7767,6 +7802,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_0";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
index 222090f32d07..75dc1fec6714 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
@@ -598,6 +598,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MHask" = dontDistribute super."MHask";
   "MSQueue" = dontDistribute super."MSQueue";
@@ -1288,6 +1289,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1574,6 +1576,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
@@ -1663,6 +1666,7 @@ self: super: {
   "cabocha" = dontDistribute super."cabocha";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = doDistribute super."cacophony_0_4_0";
   "caf" = dontDistribute super."caf";
   "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
   "caffegraph" = dontDistribute super."caffegraph";
@@ -1706,6 +1710,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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";
@@ -1719,6 +1724,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -1807,9 +1813,11 @@ self: super: {
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
   "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
+  "clckwrks" = doDistribute super."clckwrks_0_23_13";
   "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-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";
   "cld2" = dontDistribute super."cld2";
@@ -2364,6 +2372,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "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";
@@ -2379,6 +2388,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -2798,6 +2808,7 @@ self: super: {
   "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";
@@ -3528,6 +3539,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -3708,6 +3720,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -3906,6 +3919,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4135,6 +4149,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-media" = doDistribute super."http-media_0_6_2";
@@ -4414,6 +4429,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_0";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -4679,6 +4695,7 @@ self: super: {
   "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";
@@ -4791,6 +4808,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -4937,6 +4955,7 @@ self: super: {
   "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
   "meep" = dontDistribute super."meep";
   "mega-sdist" = dontDistribute super."mega-sdist";
+  "megaparsec" = doDistribute super."megaparsec_4_3_0";
   "meldable-heap" = dontDistribute super."meldable-heap";
   "melody" = dontDistribute super."melody";
   "memcache" = dontDistribute super."memcache";
@@ -5174,6 +5193,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = doDistribute super."mwc-probability_1_0_2";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5278,6 +5298,7 @@ self: super: {
   "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -5299,6 +5320,7 @@ self: super: {
   "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";
@@ -5369,6 +5391,7 @@ self: super: {
   "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";
@@ -5436,6 +5459,7 @@ self: super: {
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -5627,6 +5651,8 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
+  "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
   "pipes-cereal" = dontDistribute super."pipes-cereal";
@@ -5638,6 +5664,7 @@ self: super: {
   "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-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
@@ -5809,6 +5836,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -5961,6 +5989,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6360,6 +6390,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6376,6 +6407,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -6598,6 +6630,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7175,6 +7208,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -7330,6 +7364,7 @@ self: super: {
   "ureader" = dontDistribute super."ureader";
   "urembed" = dontDistribute super."urembed";
   "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
@@ -7348,6 +7383,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = doDistribute super."userid_0_1_2_3";
+  "users" = doDistribute super."users_0_4_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_4_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_4_0_0";
+  "users-test" = doDistribute super."users-test_0_4_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
@@ -7433,6 +7472,7 @@ self: super: {
   "vimeta" = dontDistribute super."vimeta";
   "vimus" = dontDistribute super."vimus";
   "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl" = doDistribute super."vinyl_0_5_1";
   "vinyl-gl" = dontDistribute super."vinyl-gl";
   "vinyl-json" = dontDistribute super."vinyl-json";
   "vinyl-utils" = dontDistribute super."vinyl-utils";
@@ -7456,6 +7496,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
@@ -7504,8 +7545,10 @@ self: super: {
   "wait-handle" = dontDistribute super."wait-handle";
   "waitfree" = dontDistribute super."waitfree";
   "warc" = dontDistribute super."warc";
+  "warp" = doDistribute super."warp_3_2_2";
   "warp-dynamic" = dontDistribute super."warp-dynamic";
   "warp-static" = dontDistribute super."warp-static";
+  "warp-tls" = doDistribute super."warp-tls_3_2_0";
   "warp-tls-uid" = dontDistribute super."warp-tls-uid";
   "watchdog" = dontDistribute super."watchdog";
   "watcher" = dontDistribute super."watcher";
@@ -7630,6 +7673,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_0";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
index 2cf782f7032b..1c901164f841 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
@@ -596,6 +596,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MHask" = dontDistribute super."MHask";
   "MSQueue" = dontDistribute super."MSQueue";
@@ -1285,6 +1286,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1567,6 +1569,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
@@ -1655,6 +1658,7 @@ self: super: {
   "cabocha" = dontDistribute super."cabocha";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = doDistribute super."cacophony_0_4_0";
   "caf" = dontDistribute super."caf";
   "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
   "caffegraph" = dontDistribute super."caffegraph";
@@ -1698,6 +1702,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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";
@@ -1711,6 +1716,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -1796,9 +1802,11 @@ self: super: {
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
   "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
+  "clckwrks" = doDistribute super."clckwrks_0_23_13";
   "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-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";
   "cld2" = dontDistribute super."cld2";
@@ -2352,6 +2360,7 @@ self: super: {
   "direct-sqlite" = doDistribute super."direct-sqlite_2_3_16";
   "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";
@@ -2367,6 +2376,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -2786,6 +2796,7 @@ self: super: {
   "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";
@@ -3454,6 +3465,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_6";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
   "happstack-static-routing" = dontDistribute super."happstack-static-routing";
@@ -3515,6 +3527,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -3695,6 +3708,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -3893,6 +3907,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4122,6 +4137,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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-media" = doDistribute super."http-media_0_6_2";
@@ -4400,6 +4416,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_0";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -4623,6 +4640,7 @@ self: super: {
   "lens-utils" = dontDistribute super."lens-utils";
   "lenses" = dontDistribute super."lenses";
   "lensref" = dontDistribute super."lensref";
+  "lentil" = doDistribute super."lentil_0_1_9_0";
   "lenz" = dontDistribute super."lenz";
   "lenz-template" = dontDistribute super."lenz-template";
   "level-monad" = dontDistribute super."level-monad";
@@ -4663,6 +4681,7 @@ self: super: {
   "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";
@@ -4775,6 +4794,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -4921,6 +4941,7 @@ self: super: {
   "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
   "meep" = dontDistribute super."meep";
   "mega-sdist" = dontDistribute super."mega-sdist";
+  "megaparsec" = doDistribute super."megaparsec_4_3_0";
   "meldable-heap" = dontDistribute super."meldable-heap";
   "melody" = dontDistribute super."melody";
   "memcache" = dontDistribute super."memcache";
@@ -5156,6 +5177,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = doDistribute super."mwc-probability_1_0_2";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5260,6 +5282,7 @@ self: super: {
   "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -5281,6 +5304,7 @@ self: super: {
   "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";
@@ -5351,6 +5375,7 @@ self: super: {
   "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";
@@ -5418,6 +5443,7 @@ self: super: {
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -5609,6 +5635,8 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
+  "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
   "pipes-cereal" = dontDistribute super."pipes-cereal";
@@ -5620,6 +5648,7 @@ self: super: {
   "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-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
@@ -5791,6 +5820,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -5943,6 +5973,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6340,6 +6372,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6356,6 +6389,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -6578,6 +6612,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7154,6 +7189,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -7309,6 +7345,7 @@ self: super: {
   "ureader" = dontDistribute super."ureader";
   "urembed" = dontDistribute super."urembed";
   "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
@@ -7327,6 +7364,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = doDistribute super."userid_0_1_2_3";
+  "users" = doDistribute super."users_0_4_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_4_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_4_0_0";
+  "users-test" = doDistribute super."users-test_0_4_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
@@ -7411,6 +7452,7 @@ self: super: {
   "vimeta" = dontDistribute super."vimeta";
   "vimus" = dontDistribute super."vimus";
   "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl" = doDistribute super."vinyl_0_5_1";
   "vinyl-gl" = dontDistribute super."vinyl-gl";
   "vinyl-json" = dontDistribute super."vinyl-json";
   "vinyl-utils" = dontDistribute super."vinyl-utils";
@@ -7434,6 +7476,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
@@ -7482,8 +7525,10 @@ self: super: {
   "wait-handle" = dontDistribute super."wait-handle";
   "waitfree" = dontDistribute super."waitfree";
   "warc" = dontDistribute super."warc";
+  "warp" = doDistribute super."warp_3_2_2";
   "warp-dynamic" = dontDistribute super."warp-dynamic";
   "warp-static" = dontDistribute super."warp-static";
+  "warp-tls" = doDistribute super."warp-tls_3_2_0";
   "warp-tls-uid" = dontDistribute super."warp-tls-uid";
   "watchdog" = dontDistribute super."watchdog";
   "watcher" = dontDistribute super."watcher";
@@ -7608,6 +7653,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_0";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.2.nix b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
index 8f8760d1ad2a..e42fbcebc2a6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
@@ -595,6 +595,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MHask" = dontDistribute super."MHask";
   "MSQueue" = dontDistribute super."MSQueue";
@@ -1284,6 +1285,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1319,6 +1321,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_17";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1343,6 +1346,7 @@ self: super: {
   "barrier-monad" = dontDistribute super."barrier-monad";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
+  "base-orphans" = doDistribute super."base-orphans_0_5_1";
   "base-prelude" = doDistribute super."base-prelude_0_1_21";
   "base32-bytestring" = dontDistribute super."base32-bytestring";
   "base58-bytestring" = dontDistribute super."base58-bytestring";
@@ -1564,6 +1568,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
@@ -1651,6 +1656,7 @@ self: super: {
   "cabocha" = dontDistribute super."cabocha";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = doDistribute super."cacophony_0_4_0";
   "caf" = dontDistribute super."caf";
   "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
   "caffegraph" = dontDistribute super."caffegraph";
@@ -1694,6 +1700,7 @@ self: super: {
   "cases" = doDistribute super."cases_0_1_2_1";
   "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";
@@ -1707,6 +1714,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -1792,9 +1800,11 @@ self: super: {
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
   "classy-prelude" = doDistribute super."classy-prelude_0_12_5";
+  "clckwrks" = doDistribute super."clckwrks_0_23_13";
   "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-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";
   "cld2" = dontDistribute super."cld2";
@@ -2347,6 +2357,7 @@ self: super: {
   "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";
@@ -2362,6 +2373,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -2778,6 +2790,7 @@ self: super: {
   "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";
@@ -3443,6 +3456,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_6";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
   "happstack-static-routing" = dontDistribute super."happstack-static-routing";
@@ -3504,6 +3518,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -3684,6 +3699,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -3772,6 +3788,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_2";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -3788,6 +3805,7 @@ self: super: {
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_28";
   "hlogger" = dontDistribute super."hlogger";
   "hlongurl" = dontDistribute super."hlongurl";
   "hls" = dontDistribute super."hls";
@@ -3880,6 +3898,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4109,6 +4128,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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";
@@ -4385,6 +4405,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_0";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -4608,6 +4629,7 @@ self: super: {
   "lens-utils" = dontDistribute super."lens-utils";
   "lenses" = dontDistribute super."lenses";
   "lensref" = dontDistribute super."lensref";
+  "lentil" = doDistribute super."lentil_0_1_9_0";
   "lenz" = dontDistribute super."lenz";
   "lenz-template" = dontDistribute super."lenz-template";
   "level-monad" = dontDistribute super."level-monad";
@@ -4648,6 +4670,7 @@ self: super: {
   "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";
@@ -4760,6 +4783,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -4906,6 +4930,7 @@ self: super: {
   "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
   "meep" = dontDistribute super."meep";
   "mega-sdist" = dontDistribute super."mega-sdist";
+  "megaparsec" = doDistribute super."megaparsec_4_3_0";
   "meldable-heap" = dontDistribute super."meldable-heap";
   "melody" = dontDistribute super."melody";
   "memcache" = dontDistribute super."memcache";
@@ -5135,6 +5160,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = doDistribute super."mwc-probability_1_0_2";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5239,6 +5265,7 @@ self: super: {
   "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -5260,6 +5287,7 @@ self: super: {
   "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";
@@ -5330,6 +5358,7 @@ self: super: {
   "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";
@@ -5397,6 +5426,7 @@ self: super: {
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -5585,6 +5615,8 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
+  "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
   "pipes-cereal" = dontDistribute super."pipes-cereal";
@@ -5596,6 +5628,7 @@ self: super: {
   "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-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
@@ -5766,6 +5799,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -5916,6 +5950,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6312,6 +6348,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6328,6 +6365,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -6550,6 +6588,7 @@ self: super: {
   "socket-io" = doDistribute super."socket-io_1_3_4";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7124,6 +7163,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -7279,6 +7319,7 @@ self: super: {
   "ureader" = dontDistribute super."ureader";
   "urembed" = dontDistribute super."urembed";
   "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
@@ -7297,6 +7338,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = doDistribute super."userid_0_1_2_3";
+  "users" = doDistribute super."users_0_4_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_4_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_4_0_0";
+  "users-test" = doDistribute super."users-test_0_4_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
@@ -7380,6 +7425,7 @@ self: super: {
   "vimeta" = dontDistribute super."vimeta";
   "vimus" = dontDistribute super."vimus";
   "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl" = doDistribute super."vinyl_0_5_1";
   "vinyl-gl" = dontDistribute super."vinyl-gl";
   "vinyl-json" = dontDistribute super."vinyl-json";
   "vinyl-utils" = dontDistribute super."vinyl-utils";
@@ -7403,6 +7449,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
@@ -7451,8 +7498,10 @@ self: super: {
   "wait-handle" = dontDistribute super."wait-handle";
   "waitfree" = dontDistribute super."waitfree";
   "warc" = dontDistribute super."warc";
+  "warp" = doDistribute super."warp_3_2_2";
   "warp-dynamic" = dontDistribute super."warp-dynamic";
   "warp-static" = dontDistribute super."warp-static";
+  "warp-tls" = doDistribute super."warp-tls_3_2_0";
   "warp-tls-uid" = dontDistribute super."warp-tls-uid";
   "watchdog" = dontDistribute super."watchdog";
   "watcher" = dontDistribute super."watcher";
@@ -7577,6 +7626,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_0";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.3.nix b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
index dd5823102ac9..9b45729c2ff0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
@@ -592,6 +592,7 @@ self: super: {
   "LogicGrowsOnTrees-processes" = dontDistribute super."LogicGrowsOnTrees-processes";
   "LslPlus" = dontDistribute super."LslPlus";
   "Lucu" = dontDistribute super."Lucu";
+  "MASMGen" = dontDistribute super."MASMGen";
   "MC-Fold-DP" = dontDistribute super."MC-Fold-DP";
   "MHask" = dontDistribute super."MHask";
   "MSQueue" = dontDistribute super."MSQueue";
@@ -1278,6 +1279,7 @@ self: super: {
   "authenticate-ldap" = dontDistribute super."authenticate-ldap";
   "authinfo-hs" = dontDistribute super."authinfo-hs";
   "authoring" = dontDistribute super."authoring";
+  "autoexporter" = dontDistribute super."autoexporter";
   "autonix-deps" = dontDistribute super."autonix-deps";
   "autonix-deps-kf5" = dontDistribute super."autonix-deps-kf5";
   "autoproc" = dontDistribute super."autoproc";
@@ -1313,6 +1315,7 @@ self: super: {
   "azure-servicebus" = dontDistribute super."azure-servicebus";
   "azurify" = dontDistribute super."azurify";
   "b-tree" = dontDistribute super."b-tree";
+  "b9" = doDistribute super."b9_0_5_17";
   "babylon" = dontDistribute super."babylon";
   "backdropper" = dontDistribute super."backdropper";
   "backtracking-exceptions" = dontDistribute super."backtracking-exceptions";
@@ -1337,6 +1340,7 @@ self: super: {
   "barrier-monad" = dontDistribute super."barrier-monad";
   "base-generics" = dontDistribute super."base-generics";
   "base-io-access" = dontDistribute super."base-io-access";
+  "base-orphans" = doDistribute super."base-orphans_0_5_1";
   "base-prelude" = doDistribute super."base-prelude_0_1_21";
   "base32-bytestring" = dontDistribute super."base32-bytestring";
   "base58-bytestring" = dontDistribute super."base58-bytestring";
@@ -1556,6 +1560,7 @@ self: super: {
   "bspack" = dontDistribute super."bspack";
   "bsparse" = dontDistribute super."bsparse";
   "btree-concurrent" = dontDistribute super."btree-concurrent";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
   "buffer-builder-aeson" = dontDistribute super."buffer-builder-aeson";
   "buffer-pipe" = dontDistribute super."buffer-pipe";
   "buffon" = dontDistribute super."buffon";
@@ -1643,6 +1648,7 @@ self: super: {
   "cabocha" = dontDistribute super."cabocha";
   "cached-io" = dontDistribute super."cached-io";
   "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = doDistribute super."cacophony_0_4_0";
   "caf" = dontDistribute super."caf";
   "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
   "caffegraph" = dontDistribute super."caffegraph";
@@ -1685,6 +1691,7 @@ self: super: {
   "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";
@@ -1698,6 +1705,7 @@ self: super: {
   "categorical-algebra" = dontDistribute super."categorical-algebra";
   "categories" = dontDistribute super."categories";
   "category-extras" = dontDistribute super."category-extras";
+  "category-traced" = dontDistribute super."category-traced";
   "cayley-dickson" = dontDistribute super."cayley-dickson";
   "cblrepo" = dontDistribute super."cblrepo";
   "cci" = dontDistribute super."cci";
@@ -1778,9 +1786,11 @@ self: super: {
   "clash-prelude-quickcheck" = dontDistribute super."clash-prelude-quickcheck";
   "classify" = dontDistribute super."classify";
   "classy-parallel" = dontDistribute super."classy-parallel";
+  "clckwrks" = doDistribute super."clckwrks_0_23_13";
   "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-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";
   "cld2" = dontDistribute super."cld2";
@@ -2329,6 +2339,7 @@ self: super: {
   "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";
@@ -2344,6 +2355,7 @@ self: super: {
   "distributed-process-async" = dontDistribute super."distributed-process-async";
   "distributed-process-azure" = dontDistribute super."distributed-process-azure";
   "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
   "distributed-process-execution" = dontDistribute super."distributed-process-execution";
   "distributed-process-extras" = dontDistribute super."distributed-process-extras";
   "distributed-process-lifted" = dontDistribute super."distributed-process-lifted";
@@ -2752,6 +2764,7 @@ self: super: {
   "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";
@@ -3415,6 +3428,7 @@ self: super: {
   "happstack-lite" = dontDistribute super."happstack-lite";
   "happstack-monad-peel" = dontDistribute super."happstack-monad-peel";
   "happstack-plugins" = dontDistribute super."happstack-plugins";
+  "happstack-server" = doDistribute super."happstack-server_7_4_6";
   "happstack-server-tls-cryptonite" = dontDistribute super."happstack-server-tls-cryptonite";
   "happstack-state" = dontDistribute super."happstack-state";
   "happstack-static-routing" = dontDistribute super."happstack-static-routing";
@@ -3476,6 +3490,7 @@ self: super: {
   "haskell-gi-base" = dontDistribute super."haskell-gi-base";
   "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";
@@ -3656,6 +3671,7 @@ self: super: {
   "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-map" = dontDistribute super."hetero-map";
   "hetris" = dontDistribute super."hetris";
@@ -3744,6 +3760,7 @@ self: super: {
   "hjcase" = dontDistribute super."hjcase";
   "hjpath" = dontDistribute super."hjpath";
   "hjs" = dontDistribute super."hjs";
+  "hjsmin" = doDistribute super."hjsmin_0_1_5_2";
   "hjson" = dontDistribute super."hjson";
   "hjson-query" = dontDistribute super."hjson-query";
   "hjsonpointer" = dontDistribute super."hjsonpointer";
@@ -3760,6 +3777,7 @@ self: super: {
   "hlibBladeRF" = dontDistribute super."hlibBladeRF";
   "hlibev" = dontDistribute super."hlibev";
   "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_28";
   "hlogger" = dontDistribute super."hlogger";
   "hlongurl" = dontDistribute super."hlongurl";
   "hls" = dontDistribute super."hls";
@@ -3852,6 +3870,7 @@ self: super: {
   "hosts-server" = dontDistribute super."hosts-server";
   "hothasktags" = dontDistribute super."hothasktags";
   "hotswap" = dontDistribute super."hotswap";
+  "hourglass" = doDistribute super."hourglass_0_2_9";
   "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
   "hp2any-core" = dontDistribute super."hp2any-core";
   "hp2any-graph" = dontDistribute super."hp2any-graph";
@@ -4081,6 +4100,7 @@ self: super: {
   "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
   "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";
@@ -4090,6 +4110,7 @@ self: super: {
   "http-shed" = dontDistribute super."http-shed";
   "http-test" = dontDistribute super."http-test";
   "http-wget" = dontDistribute super."http-wget";
+  "http2" = doDistribute super."http2_1_4_5";
   "https-everywhere-rules" = dontDistribute super."https-everywhere-rules";
   "https-everywhere-rules-raw" = dontDistribute super."https-everywhere-rules-raw";
   "httpspec" = dontDistribute super."httpspec";
@@ -4355,6 +4376,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_0";
   "jsaddle" = dontDistribute super."jsaddle";
   "jsaddle-hello" = dontDistribute super."jsaddle-hello";
   "jsc" = dontDistribute super."jsc";
@@ -4578,6 +4600,7 @@ self: super: {
   "lens-utils" = dontDistribute super."lens-utils";
   "lenses" = dontDistribute super."lenses";
   "lensref" = dontDistribute super."lensref";
+  "lentil" = doDistribute super."lentil_0_1_9_0";
   "lenz" = dontDistribute super."lenz";
   "lenz-template" = dontDistribute super."lenz-template";
   "level-monad" = dontDistribute super."level-monad";
@@ -4618,6 +4641,7 @@ self: super: {
   "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";
@@ -4676,6 +4700,7 @@ self: super: {
   "list-grouping" = dontDistribute super."list-grouping";
   "list-mux" = dontDistribute super."list-mux";
   "list-remote-forwards" = dontDistribute super."list-remote-forwards";
+  "list-t" = doDistribute super."list-t_0_4_6";
   "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";
@@ -4728,6 +4753,7 @@ self: super: {
   "logger" = dontDistribute super."logger";
   "logging" = dontDistribute super."logging";
   "logging-effect" = dontDistribute super."logging-effect";
+  "logging-facade" = doDistribute super."logging-facade_0_1_0";
   "logging-facade-journald" = dontDistribute super."logging-facade-journald";
   "logic-TPTP" = dontDistribute super."logic-TPTP";
   "logic-classes" = dontDistribute super."logic-classes";
@@ -4873,6 +4899,7 @@ self: super: {
   "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
   "meep" = dontDistribute super."meep";
   "mega-sdist" = dontDistribute super."mega-sdist";
+  "megaparsec" = doDistribute super."megaparsec_4_3_0";
   "meldable-heap" = dontDistribute super."meldable-heap";
   "melody" = dontDistribute super."melody";
   "memcache" = dontDistribute super."memcache";
@@ -5100,6 +5127,7 @@ self: super: {
   "mvc-updates" = dontDistribute super."mvc-updates";
   "mvclient" = dontDistribute super."mvclient";
   "mwc-probability" = doDistribute super."mwc-probability_1_0_3";
+  "mwc-random" = doDistribute super."mwc-random_0_13_3_2";
   "mwc-random-monad" = dontDistribute super."mwc-random-monad";
   "myTestlll" = dontDistribute super."myTestlll";
   "mybitcoin-sci" = dontDistribute super."mybitcoin-sci";
@@ -5204,6 +5232,7 @@ self: super: {
   "network-transport" = doDistribute super."network-transport_0_4_2_0";
   "network-transport-amqp" = dontDistribute super."network-transport-amqp";
   "network-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
   "network-transport-tests" = doDistribute super."network-transport-tests_0_2_2_0";
   "network-uri-static" = dontDistribute super."network-uri-static";
   "network-wai-router" = dontDistribute super."network-wai-router";
@@ -5225,6 +5254,7 @@ self: super: {
   "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";
@@ -5295,6 +5325,7 @@ self: super: {
   "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";
@@ -5353,6 +5384,7 @@ self: super: {
   "operational-alacarte" = dontDistribute super."operational-alacarte";
   "operational-extra" = dontDistribute super."operational-extra";
   "opml" = dontDistribute super."opml";
+  "opml-conduit" = doDistribute super."opml-conduit_0_4_0_1";
   "opn" = dontDistribute super."opn";
   "optimal-blocks" = dontDistribute super."optimal-blocks";
   "optimization" = dontDistribute super."optimization";
@@ -5361,6 +5393,7 @@ self: super: {
   "optional" = dontDistribute super."optional";
   "options-time" = dontDistribute super."options-time";
   "optparse-declarative" = dontDistribute super."optparse-declarative";
+  "optparse-generic" = dontDistribute super."optparse-generic";
   "orc" = dontDistribute super."orc";
   "orchestrate" = dontDistribute super."orchestrate";
   "orchid" = dontDistribute super."orchid";
@@ -5547,6 +5580,8 @@ self: super: {
   "pipes-async" = dontDistribute super."pipes-async";
   "pipes-attoparsec-streaming" = dontDistribute super."pipes-attoparsec-streaming";
   "pipes-binary" = doDistribute super."pipes-binary_0_4_0_5";
+  "pipes-bzip" = dontDistribute super."pipes-bzip";
+  "pipes-cacophony" = doDistribute super."pipes-cacophony_0_1_3";
   "pipes-cellular" = dontDistribute super."pipes-cellular";
   "pipes-cellular-csv" = dontDistribute super."pipes-cellular-csv";
   "pipes-cereal" = dontDistribute super."pipes-cereal";
@@ -5558,6 +5593,7 @@ self: super: {
   "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-network-tls" = dontDistribute super."pipes-network-tls";
   "pipes-p2p" = dontDistribute super."pipes-p2p";
   "pipes-p2p-examples" = dontDistribute super."pipes-p2p-examples";
@@ -5727,6 +5763,7 @@ self: super: {
   "procrastinating-variable" = dontDistribute super."procrastinating-variable";
   "procstat" = dontDistribute super."procstat";
   "proctest" = dontDistribute super."proctest";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
   "prof2dot" = dontDistribute super."prof2dot";
   "prof2pretty" = dontDistribute super."prof2pretty";
   "profiteur" = dontDistribute super."profiteur";
@@ -5876,6 +5913,8 @@ self: super: {
   "rascal" = dontDistribute super."rascal";
   "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
   "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
   "ratio-int" = dontDistribute super."ratio-int";
   "raven-haskell" = dontDistribute super."raven-haskell";
   "raven-haskell-scotty" = dontDistribute super."raven-haskell-scotty";
@@ -6269,6 +6308,7 @@ self: super: {
   "serial-test-generators" = dontDistribute super."serial-test-generators";
   "serialport" = dontDistribute super."serialport";
   "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
   "servant-cassava" = dontDistribute super."servant-cassava";
   "servant-ede" = dontDistribute super."servant-ede";
   "servant-elm" = dontDistribute super."servant-elm";
@@ -6285,6 +6325,7 @@ self: super: {
   "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
   "sessions" = dontDistribute super."sessions";
   "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
   "set-with" = dontDistribute super."set-with";
   "setdown" = dontDistribute super."setdown";
   "setgame" = dontDistribute super."setgame";
@@ -6504,6 +6545,7 @@ self: super: {
   "socket-activation" = dontDistribute super."socket-activation";
   "socket-sctp" = dontDistribute super."socket-sctp";
   "socketio" = dontDistribute super."socketio";
+  "socketson" = dontDistribute super."socketson";
   "soegtk" = dontDistribute super."soegtk";
   "sonic-visualiser" = dontDistribute super."sonic-visualiser";
   "sophia" = dontDistribute super."sophia";
@@ -7074,6 +7116,7 @@ self: super: {
   "turing-music" = dontDistribute super."turing-music";
   "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
   "turni" = dontDistribute super."turni";
+  "turtle-options" = dontDistribute super."turtle-options";
   "tweak" = dontDistribute super."tweak";
   "twentefp" = dontDistribute super."twentefp";
   "twentefp-eventloop-graphics" = dontDistribute super."twentefp-eventloop-graphics";
@@ -7229,6 +7272,7 @@ self: super: {
   "ureader" = dontDistribute super."ureader";
   "urembed" = dontDistribute super."urembed";
   "uri" = dontDistribute super."uri";
+  "uri-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
   "uri-conduit" = dontDistribute super."uri-conduit";
   "uri-enumerator" = dontDistribute super."uri-enumerator";
   "uri-enumerator-file" = dontDistribute super."uri-enumerator-file";
@@ -7247,6 +7291,10 @@ self: super: {
   "usb-iteratee" = dontDistribute super."usb-iteratee";
   "usb-safe" = dontDistribute super."usb-safe";
   "userid" = doDistribute super."userid_0_1_2_3";
+  "users" = doDistribute super."users_0_4_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_4_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_4_0_0";
+  "users-test" = doDistribute super."users-test_0_4_0_0";
   "utc" = dontDistribute super."utc";
   "utf8-env" = dontDistribute super."utf8-env";
   "utf8-prelude" = dontDistribute super."utf8-prelude";
@@ -7329,6 +7377,7 @@ self: super: {
   "vimeta" = dontDistribute super."vimeta";
   "vimus" = dontDistribute super."vimus";
   "vintage-basic" = dontDistribute super."vintage-basic";
+  "vinyl" = doDistribute super."vinyl_0_5_1";
   "vinyl-gl" = dontDistribute super."vinyl-gl";
   "vinyl-json" = dontDistribute super."vinyl-json";
   "vinyl-utils" = dontDistribute super."vinyl-utils";
@@ -7352,6 +7401,7 @@ self: super: {
   "vty-menu" = dontDistribute super."vty-menu";
   "vty-ui" = dontDistribute super."vty-ui";
   "vty-ui-extras" = dontDistribute super."vty-ui-extras";
+  "vulkan" = dontDistribute super."vulkan";
   "waddle" = dontDistribute super."waddle";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
   "wai-app-file-cgi" = dontDistribute super."wai-app-file-cgi";
@@ -7397,8 +7447,10 @@ self: super: {
   "wait-handle" = dontDistribute super."wait-handle";
   "waitfree" = dontDistribute super."waitfree";
   "warc" = dontDistribute super."warc";
+  "warp" = doDistribute super."warp_3_2_2";
   "warp-dynamic" = dontDistribute super."warp-dynamic";
   "warp-static" = dontDistribute super."warp-static";
+  "warp-tls" = doDistribute super."warp-tls_3_2_0";
   "warp-tls-uid" = dontDistribute super."warp-tls-uid";
   "watchdog" = dontDistribute super."watchdog";
   "watcher" = dontDistribute super."watcher";
@@ -7523,6 +7575,7 @@ self: super: {
   "xinput-conduit" = dontDistribute super."xinput-conduit";
   "xkbcommon" = dontDistribute super."xkbcommon";
   "xkcd" = dontDistribute super."xkcd";
+  "xlsx" = doDistribute super."xlsx_0_2_0";
   "xlsx-templater" = dontDistribute super."xlsx-templater";
   "xml-basic" = dontDistribute super."xml-basic";
   "xml-catalog" = dontDistribute super."xml-catalog";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.4.nix b/pkgs/development/haskell-modules/configuration-lts-5.4.nix
new file mode 100644
index 000000000000..7c553d410e3a
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-lts-5.4.nix
@@ -0,0 +1,7739 @@
+{ 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-5.4 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";
+  "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";
+  "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";
+  "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";
+  "ChannelT" = dontDistribute super."ChannelT";
+  "Chart-diagrams" = dontDistribute super."Chart-diagrams";
+  "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";
+  "DescriptiveKeys" = dontDistribute super."DescriptiveKeys";
+  "Dflow" = dontDistribute super."Dflow";
+  "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" = dontDistribute super."EdisonAPI";
+  "EdisonCore" = dontDistribute super."EdisonCore";
+  "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";
+  "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";
+  "HDBC-session" = dontDistribute super."HDBC-session";
+  "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";
+  "Hclip" = dontDistribute super."Hclip";
+  "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";
+  "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";
+  "LDAP" = dontDistribute super."LDAP";
+  "LRU" = dontDistribute super."LRU";
+  "LTree" = dontDistribute super."LTree";
+  "LambdaCalculator" = dontDistribute super."LambdaCalculator";
+  "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";
+  "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";
+  "MASMGen" = dontDistribute super."MASMGen";
+  "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";
+  "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";
+  "NoTrace" = dontDistribute super."NoTrace";
+  "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";
+  "OneTuple" = dontDistribute super."OneTuple";
+  "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";
+  "PortMidi" = dontDistribute super."PortMidi";
+  "PostgreSQL" = dontDistribute super."PostgreSQL";
+  "PrimitiveArray" = dontDistribute super."PrimitiveArray";
+  "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";
+  "QuadEdge" = dontDistribute super."QuadEdge";
+  "QuadTree" = dontDistribute super."QuadTree";
+  "Quelea" = dontDistribute super."Quelea";
+  "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
+  "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";
+  "RNAlien" = doDistribute super."RNAlien_1_0_0";
+  "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";
+  "SVGFonts" = dontDistribute super."SVGFonts";
+  "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";
+  "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-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";
+  "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-utility" = dontDistribute super."accelerate-utility";
+  "accentuateus" = dontDistribute super."accentuateus";
+  "access-time" = dontDistribute super."access-time";
+  "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-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-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-lens" = dontDistribute super."aeson-lens";
+  "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
+  "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";
+  "agda-snippets" = dontDistribute super."agda-snippets";
+  "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
+  "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";
+  "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
+  "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-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";
+  "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";
+  "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-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";
+  "apply-refact" = doDistribute super."apply-refact_0_1_0_0";
+  "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";
+  "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "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";
+  "arithmoi" = dontDistribute super."arithmoi";
+  "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-vector-avc" = dontDistribute super."ascii-vector-avc";
+  "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
+  "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-conduit" = dontDistribute super."atom-conduit";
+  "atom-msp430" = dontDistribute super."atom-msp430";
+  "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign";
+  "atomic-primops-vector" = dontDistribute super."atomic-primops-vector";
+  "atomic-write" = dontDistribute super."atomic-write";
+  "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";
+  "autoexporter" = dontDistribute super."autoexporter";
+  "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-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";
+  "b9" = doDistribute super."b9_0_5_17";
+  "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-orphans" = doDistribute super."base-orphans_0_5_1";
+  "base-prelude" = doDistribute super."base-prelude_0_1_21";
+  "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";
+  "bdd" = dontDistribute super."bdd";
+  "bdelta" = dontDistribute super."bdelta";
+  "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
+  "beamable" = dontDistribute super."beamable";
+  "beautifHOL" = dontDistribute super."beautifHOL";
+  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
+  "bein" = dontDistribute super."bein";
+  "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";
+  "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-bits" = dontDistribute super."binary-bits";
+  "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-shared" = dontDistribute super."binary-shared";
+  "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-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-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";
+  "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-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-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" = dontDistribute super."bloodhound";
+  "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";
+  "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";
+  "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";
+  "btrfs" = doDistribute super."btrfs_0_1_1_1";
+  "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-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";
+  "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder";
+  "bytestringparser" = dontDistribute super."bytestringparser";
+  "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
+  "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "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-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
+  "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-info" = dontDistribute super."cabal-info";
+  "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";
+  "cached-io" = dontDistribute super."cached-io";
+  "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = doDistribute super."cacophony_0_4_0";
+  "caf" = dontDistribute super."caf";
+  "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
+  "caffegraph" = dontDistribute super."caffegraph";
+  "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";
+  "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";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
+  "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-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";
+  "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";
+  "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" = doDistribute super."clckwrks_0_23_13";
+  "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-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";
+  "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";
+  "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";
+  "clumpiness" = dontDistribute super."clumpiness";
+  "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";
+  "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";
+  "codo-notation" = dontDistribute super."codo-notation";
+  "cofunctor" = dontDistribute super."cofunctor";
+  "cognimeta-utils" = dontDistribute super."cognimeta-utils";
+  "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";
+  "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";
+  "commodities" = dontDistribute super."commodities";
+  "commsec" = dontDistribute super."commsec";
+  "commsec-keyexchange" = dontDistribute super."commsec-keyexchange";
+  "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";
+  "conceit" = dontDistribute super."conceit";
+  "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-extra" = dontDistribute super."concurrent-extra";
+  "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "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-select" = dontDistribute super."config-select";
+  "config-value" = dontDistribute super."config-value";
+  "configifier" = dontDistribute super."configifier";
+  "configuration" = dontDistribute super."configuration";
+  "configuration-tools" = dontDistribute super."configuration-tools";
+  "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";
+  "constructible" = dontDistribute super."constructible";
+  "constructive-algebra" = dontDistribute super."constructive-algebra";
+  "consumers" = dontDistribute super."consumers";
+  "container" = dontDistribute super."container";
+  "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";
+  "continued-fractions" = dontDistribute super."continued-fractions";
+  "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-omega" = dontDistribute super."control-monad-omega";
+  "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";
+  "converge" = dontDistribute super."converge";
+  "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";
+  "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";
+  "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";
+  "cryptonite" = doDistribute super."cryptonite_0_10";
+  "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-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";
+  "d3js" = dontDistribute super."d3js";
+  "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
+  "daemons" = dontDistribute super."daemons";
+  "dag" = dontDistribute super."dag";
+  "damnpacket" = dontDistribute super."damnpacket";
+  "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-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-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-or" = dontDistribute super."data-or";
+  "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";
+  "dataenc" = dontDistribute super."dataenc";
+  "dataflow" = dontDistribute super."dataflow";
+  "datalog" = dontDistribute super."datalog";
+  "datapacker" = dontDistribute super."datapacker";
+  "dataurl" = dontDistribute super."dataurl";
+  "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";
+  "dbmigrations" = doDistribute super."dbmigrations_1_0";
+  "dbus-client" = dontDistribute super."dbus-client";
+  "dbus-core" = dontDistribute super."dbus-core";
+  "dbus-qq" = dontDistribute super."dbus-qq";
+  "dbus-th" = dontDistribute super."dbus-th";
+  "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-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";
+  "debian-build" = dontDistribute super."debian-build";
+  "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
+  "decepticons" = dontDistribute super."decepticons";
+  "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-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";
+  "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";
+  "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";
+  "deriving-compat" = dontDistribute super."deriving-compat";
+  "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-tikz" = dontDistribute super."diagrams-tikz";
+  "dialog" = dontDistribute super."dialog";
+  "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
+  "dicom" = dontDistribute super."dicom";
+  "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";
+  "discordian-calendar" = dontDistribute super."discordian-calendar";
+  "discount" = dontDistribute super."discount";
+  "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-closure" = dontDistribute super."distributed-closure";
+  "distributed-process" = doDistribute super."distributed-process_0_5_5_1";
+  "distributed-process-async" = dontDistribute super."distributed-process-async";
+  "distributed-process-azure" = dontDistribute super."distributed-process-azure";
+  "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
+  "distributed-process-execution" = dontDistribute super."distributed-process-execution";
+  "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "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-registry" = dontDistribute super."distributed-process-registry";
+  "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet";
+  "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor";
+  "distributed-process-task" = dontDistribute super."distributed-process-task";
+  "distributed-process-tests" = dontDistribute super."distributed-process-tests";
+  "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" = dontDistribute super."doctest-discover";
+  "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
+  "doctest-prop" = dontDistribute super."doctest-prop";
+  "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" = dontDistribute super."download";
+  "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";
+  "drClickOn" = dontDistribute super."drClickOn";
+  "draw-poker" = dontDistribute super."draw-poker";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "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";
+  "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";
+  "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";
+  "ekg-statsd" = dontDistribute super."ekg-statsd";
+  "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-get" = dontDistribute super."elm-get";
+  "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-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";
+  "ether" = doDistribute super."ether_0_3_1_1";
+  "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";
+  "every-bit-counts" = dontDistribute super."every-bit-counts";
+  "ewe" = dontDistribute super."ewe";
+  "ex-pool" = dontDistribute super."ex-pool";
+  "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "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";
+  "exception-mtl" = dontDistribute super."exception-mtl";
+  "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";
+  "failable-list" = dontDistribute super."failable-list";
+  "failure" = dontDistribute super."failure";
+  "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";
+  "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-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-clumpiness" = dontDistribute super."find-clumpiness";
+  "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-mcmc" = dontDistribute super."flat-mcmc";
+  "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";
+  "flow2dot" = dontDistribute super."flow2dot";
+  "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";
+  "fold-debounce" = dontDistribute super."fold-debounce";
+  "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "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";
+  "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";
+  "free-vl" = dontDistribute super."free-vl";
+  "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";
+  "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";
+  "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";
+  "gamma" = dontDistribute super."gamma";
+  "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-deriving" = doDistribute super."generic-deriving_1_9_0";
+  "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
+  "generic-maybe" = dontDistribute super."generic-maybe";
+  "generic-pretty" = dontDistribute super."generic-pretty";
+  "generic-server" = dontDistribute super."generic-server";
+  "generic-storable" = dontDistribute super."generic-storable";
+  "generic-tree" = dontDistribute super."generic-tree";
+  "generic-xml" = dontDistribute super."generic-xml";
+  "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";
+  "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-imported-from" = dontDistribute super."ghc-imported-from";
+  "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-codemirror" = dontDistribute super."ghcjs-codemirror";
+  "ghcjs-dom" = dontDistribute super."ghcjs-dom";
+  "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
+  "ghcjs-websockets" = dontDistribute super."ghcjs-websockets";
+  "ghclive" = dontDistribute super."ghclive";
+  "ghczdecode" = dontDistribute super."ghczdecode";
+  "ght" = dontDistribute super."ght";
+  "gi-atk" = dontDistribute super."gi-atk";
+  "gi-cairo" = dontDistribute super."gi-cairo";
+  "gi-gdk" = dontDistribute super."gi-gdk";
+  "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
+  "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
+  "gi-glib" = dontDistribute super."gi-glib";
+  "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gtk" = dontDistribute super."gi-gtk";
+  "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
+  "gi-notify" = dontDistribute super."gi-notify";
+  "gi-pango" = dontDistribute super."gi-pango";
+  "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";
+  "gist" = dontDistribute super."gist";
+  "git-all" = dontDistribute super."git-all";
+  "git-annex" = doDistribute super."git-annex_6_20160114";
+  "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-backup" = dontDistribute super."github-backup";
+  "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";
+  "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";
+  "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";
+  "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";
+  "gpolyline" = dontDistribute super."gpolyline";
+  "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-core" = doDistribute super."graph-core_0_2_2_0";
+  "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-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-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-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-mac-integration" = dontDistribute super."gtk3-mac-integration";
+  "gtkglext" = dontDistribute super."gtkglext";
+  "gtkimageview" = dontDistribute super."gtkimageview";
+  "gtkrsync" = dontDistribute super."gtkrsync";
+  "gtksourceview2" = dontDistribute super."gtksourceview2";
+  "gtksourceview3" = dontDistribute super."gtksourceview3";
+  "guarded-rewriting" = dontDistribute super."guarded-rewriting";
+  "guess-combinator" = dontDistribute super."guess-combinator";
+  "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";
+  "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";
+  "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-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-leksah" = dontDistribute super."haddock-leksah";
+  "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-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";
+  "hakyll-sass" = dontDistribute super."hakyll-sass";
+  "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" = doDistribute super."happstack-server_7_4_6";
+  "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";
+  "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";
+  "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";
+  "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_2";
+  "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-formatter" = dontDistribute super."haskell-formatter";
+  "haskell-ftp" = dontDistribute super."haskell-ftp";
+  "haskell-generate" = dontDistribute super."haskell-generate";
+  "haskell-gi" = dontDistribute super."haskell-gi";
+  "haskell-gi-base" = dontDistribute super."haskell-gi-base";
+  "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-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
+  "haskell-platform-test" = dontDistribute super."haskell-platform-test";
+  "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" = doDistribute super."hasql_0_19_6";
+  "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-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-amazonka" = dontDistribute super."haxl-amazonka";
+  "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";
+  "hbayes" = dontDistribute super."hbayes";
+  "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";
+  "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-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";
+  "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-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";
+  "hformat" = dontDistribute super."hformat";
+  "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";
+  "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";
+  "hinquire" = dontDistribute super."hinquire";
+  "hinstaller" = dontDistribute super."hinstaller";
+  "hint-server" = dontDistribute super."hint-server";
+  "hinvaders" = dontDistribute super."hinvaders";
+  "hinze-streams" = dontDistribute super."hinze-streams";
+  "hipbot" = dontDistribute super."hipbot";
+  "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";
+  "hjcase" = dontDistribute super."hjcase";
+  "hjpath" = dontDistribute super."hjpath";
+  "hjs" = dontDistribute super."hjs";
+  "hjson" = dontDistribute super."hjson";
+  "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-chart" = dontDistribute super."hledger-chart";
+  "hledger-diff" = dontDistribute super."hledger-diff";
+  "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-vty" = dontDistribute super."hledger-vty";
+  "hlibBladeRF" = dontDistribute super."hlibBladeRF";
+  "hlibev" = dontDistribute super."hlibev";
+  "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_28";
+  "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" = dontDistribute super."hmt";
+  "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";
+  "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" = dontDistribute super."hosc";
+  "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" = doDistribute super."hourglass_0_2_9";
+  "hourglass-fuzzy-parsing" = dontDistribute super."hourglass-fuzzy-parsing";
+  "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";
+  "hpack" = dontDistribute super."hpack";
+  "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";
+  "hpc-strobe" = dontDistribute super."hpc-strobe";
+  "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
+  "hplayground" = dontDistribute super."hplayground";
+  "hplaylist" = dontDistribute super."hplaylist";
+  "hpodder" = dontDistribute super."hpodder";
+  "hpp" = dontDistribute super."hpp";
+  "hpqtypes" = dontDistribute super."hpqtypes";
+  "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-GeoIP" = dontDistribute super."hs-GeoIP";
+  "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";
+  "hsb2hs" = dontDistribute super."hsb2hs";
+  "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";
+  "hscolour" = doDistribute super."hscolour_1_23";
+  "hscope" = dontDistribute super."hscope";
+  "hscrtmpl" = dontDistribute super."hscrtmpl";
+  "hscuid" = dontDistribute super."hscuid";
+  "hscurses" = dontDistribute super."hscurses";
+  "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex";
+  "hsdev" = dontDistribute super."hsdev";
+  "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-monad-control" = dontDistribute super."hspec-monad-control";
+  "hspec-server" = dontDistribute super."hspec-server";
+  "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "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";
+  "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-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";
+  "htoml" = dontDistribute super."htoml";
+  "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-streams" = dontDistribute super."http-client-streams";
+  "http-conduit-browser" = dontDistribute super."http-conduit-browser";
+  "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "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-server" = dontDistribute super."http-server";
+  "http-shed" = dontDistribute super."http-shed";
+  "http-test" = dontDistribute super."http-test";
+  "http-wget" = dontDistribute super."http-wget";
+  "http2" = doDistribute super."http2_1_4_5";
+  "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";
+  "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";
+  "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";
+  "identifiers" = dontDistribute super."identifiers";
+  "idiii" = dontDistribute super."idiii";
+  "idna" = dontDistribute super."idna";
+  "idna2008" = dontDistribute super."idna2008";
+  "idris" = dontDistribute super."idris";
+  "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-inline-r" = dontDistribute super."ihaskell-inline-r";
+  "ihaskell-parsec" = dontDistribute super."ihaskell-parsec";
+  "ihaskell-plot" = dontDistribute super."ihaskell-plot";
+  "ihaskell-widgets" = dontDistribute super."ihaskell-widgets";
+  "ihttp" = dontDistribute super."ihttp";
+  "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-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-sat-solver" = dontDistribute super."incremental-sat-solver";
+  "increments" = dontDistribute super."increments";
+  "indentation" = dontDistribute super."indentation";
+  "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";
+  "inquire" = dontDistribute super."inquire";
+  "inserts" = dontDistribute super."inserts";
+  "inspection-proxy" = dontDistribute super."inspection-proxy";
+  "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";
+  "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";
+  "intern" = dontDistribute super."intern";
+  "internetmarke" = dontDistribute super."internetmarke";
+  "interpol" = dontDistribute super."interpol";
+  "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
+  "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
+  "interpolation" = dontDistribute super."interpolation";
+  "intricacy" = dontDistribute super."intricacy";
+  "intset" = dontDistribute super."intset";
+  "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-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-colors" = dontDistribute super."irc-colors";
+  "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";
+  "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";
+  "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-backend-c" = dontDistribute super."ivory-backend-c";
+  "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "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-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";
+  "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";
+  "jose" = dontDistribute super."jose";
+  "jpeg" = dontDistribute super."jpeg";
+  "js-good-parts" = dontDistribute super."js-good-parts";
+  "js-jquery" = doDistribute super."js-jquery_1_12_0";
+  "jsaddle" = dontDistribute super."jsaddle";
+  "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-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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "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";
+  "judy" = dontDistribute super."judy";
+  "jukebox" = dontDistribute super."jukebox";
+  "jumpthefive" = dontDistribute super."jumpthefive";
+  "jvm-parser" = dontDistribute super."jvm-parser";
+  "kademlia" = dontDistribute super."kademlia";
+  "kafka-client" = dontDistribute super."kafka-client";
+  "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
+  "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";
+  "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";
+  "lackey" = dontDistribute super."lackey";
+  "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-compiler" = dontDistribute super."lambdacube-compiler";
+  "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
+  "lambdacube-samples" = dontDistribute super."lambdacube-samples";
+  "lambdatex" = dontDistribute super."lambdatex";
+  "lambdatwit" = dontDistribute super."lambdatwit";
+  "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-c-quote" = dontDistribute super."language-c-quote";
+  "language-cil" = dontDistribute super."language-cil";
+  "language-css" = dontDistribute super."language-css";
+  "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_7_0_1";
+  "language-typescript" = dontDistribute super."language-typescript";
+  "language-vhdl" = dontDistribute super."language-vhdl";
+  "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";
+  "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";
+  "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";
+  "leksah-server" = dontDistribute super."leksah-server";
+  "lendingclub" = dontDistribute super."lendingclub";
+  "lens-datetime" = dontDistribute super."lens-datetime";
+  "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";
+  "lentil" = doDistribute super."lentil_0_1_9_0";
+  "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";
+  "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";
+  "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";
+  "lift-generics" = dontDistribute super."lift-generics";
+  "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";
+  "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-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";
+  "logfloat" = dontDistribute super."logfloat";
+  "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";
+  "ltk" = dontDistribute super."ltk";
+  "ltl" = dontDistribute super."ltl";
+  "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";
+  "luka" = dontDistribute super."luka";
+  "luminance" = doDistribute super."luminance_0_9_1_2";
+  "luminance-samples" = doDistribute super."luminance-samples_0_9_1";
+  "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";
+  "maccatcher" = dontDistribute super."maccatcher";
+  "machinecell" = dontDistribute super."machinecell";
+  "machines-binary" = dontDistribute super."machines-binary";
+  "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";
+  "mainland-pretty" = dontDistribute super."mainland-pretty";
+  "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";
+  "manifold-random" = dontDistribute super."manifold-random";
+  "manifolds" = dontDistribute super."manifolds";
+  "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";
+  "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";
+  "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_3_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";
+  "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-exception" = dontDistribute super."monad-exception";
+  "monad-fork" = dontDistribute super."monad-fork";
+  "monad-gen" = dontDistribute super."monad-gen";
+  "monad-interleave" = dontDistribute super."monad-interleave";
+  "monad-levels" = dontDistribute super."monad-levels";
+  "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-stlike-io" = dontDistribute super."monad-stlike-io";
+  "monad-stlike-stm" = dontDistribute super."monad-stlike-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";
+  "monadplus" = dontDistribute super."monadplus";
+  "monads-fd" = dontDistribute super."monads-fd";
+  "monadtransform" = dontDistribute super."monadtransform";
+  "monarch" = dontDistribute super."monarch";
+  "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-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";
+  "mountpoints" = dontDistribute super."mountpoints";
+  "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";
+  "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";
+  "multiset-comb" = dontDistribute super."multiset-comb";
+  "multisetrewrite" = dontDistribute super."multisetrewrite";
+  "multistate" = dontDistribute super."multistate";
+  "muon" = dontDistribute super."muon";
+  "murder" = dontDistribute super."murder";
+  "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-probability" = doDistribute super."mwc-probability_1_0_3";
+  "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";
+  "names-th" = dontDistribute super."names-th";
+  "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
+  "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";
+  "nanq" = dontDistribute super."nanq";
+  "narc" = dontDistribute super."narc";
+  "nat" = dontDistribute super."nat";
+  "nats-queue" = dontDistribute super."nats-queue";
+  "natural-number" = dontDistribute super."natural-number";
+  "natural-numbers" = dontDistribute super."natural-numbers";
+  "natural-transformation" = dontDistribute super."natural-transformation";
+  "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" = dontDistribute super."nested-routes";
+  "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-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-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
+  "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";
+  "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";
+  "niagra" = dontDistribute super."niagra";
+  "nibblestring" = dontDistribute super."nibblestring";
+  "nicify" = dontDistribute super."nicify";
+  "nicify-lib" = dontDistribute super."nicify-lib";
+  "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";
+  "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";
+  "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" = dontDistribute super."octane";
+  "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-classy" = dontDistribute super."opaleye-classy";
+  "opaleye-sqlite" = dontDistribute super."opaleye-sqlite";
+  "opaleye-trans" = dontDistribute super."opaleye-trans";
+  "open-haddock" = dontDistribute super."open-haddock";
+  "open-pandoc" = dontDistribute super."open-pandoc";
+  "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";
+  "opml-conduit" = doDistribute super."opml-conduit_0_4_0_1";
+  "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";
+  "optparse-generic" = dontDistribute super."optparse-generic";
+  "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-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";
+  "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";
+  "overture" = dontDistribute super."overture";
+  "pack" = dontDistribute super."pack";
+  "package-o-tron" = dontDistribute super."package-o-tron";
+  "package-vt" = dontDistribute super."package-vt";
+  "packdeps" = dontDistribute super."packdeps";
+  "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-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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "path-io" = doDistribute super."path-io_0_2_0";
+  "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";
+  "period" = dontDistribute super."period";
+  "perm" = dontDistribute super."perm";
+  "permutation" = dontDistribute super."permutation";
+  "permute" = dontDistribute super."permute";
+  "persist2er" = dontDistribute super."persist2er";
+  "persistable-record" = dontDistribute super."persistable-record";
+  "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-cereal" = dontDistribute super."persistent-cereal";
+  "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-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-protobuf" = dontDistribute super."persistent-protobuf";
+  "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
+  "persistent-redis" = dontDistribute super."persistent-redis";
+  "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";
+  "pgdl" = dontDistribute super."pgdl";
+  "pgm" = dontDistribute super."pgm";
+  "pgsql-simple" = dontDistribute super."pgsql-simple";
+  "pgstream" = dontDistribute super."pgstream";
+  "phasechange" = dontDistribute super."phasechange";
+  "phizzle" = dontDistribute super."phizzle";
+  "phoityne" = dontDistribute super."phoityne";
+  "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";
+  "pinchot" = doDistribute super."pinchot_0_6_0_0";
+  "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_1_3";
+  "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-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-shell" = dontDistribute super."pipes-shell";
+  "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-transduce" = dontDistribute super."pipes-transduce";
+  "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";
+  "plan-b" = dontDistribute super."plan-b";
+  "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";
+  "pointfree" = dontDistribute super."pointfree";
+  "pointful" = dontDistribute super."pointful";
+  "pointless-fun" = dontDistribute super."pointless-fun";
+  "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";
+  "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
+  "polyseq" = dontDistribute super."polyseq";
+  "polysoup" = dontDistribute super."polysoup";
+  "polytypeable" = dontDistribute super."polytypeable";
+  "polytypeable-utils" = dontDistribute super."polytypeable-utils";
+  "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-binary" = doDistribute super."postgresql-binary_0_7_9";
+  "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-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-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-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-generalize" = dontDistribute super."prelude-generalize";
+  "prelude-plus" = dontDistribute super."prelude-plus";
+  "prelude-prime" = dontDistribute super."prelude-prime";
+  "prelude-safeenum" = dontDistribute super."prelude-safeenum";
+  "preprocess-haskell" = dontDistribute super."preprocess-haskell";
+  "preprocessor-tools" = dontDistribute super."preprocessor-tools";
+  "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-hex" = dontDistribute super."pretty-hex";
+  "pretty-ncols" = dontDistribute super."pretty-ncols";
+  "pretty-sop" = dontDistribute super."pretty-sop";
+  "pretty-tree" = dontDistribute super."pretty-tree";
+  "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
+  "primula-board" = dontDistribute super."primula-board";
+  "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
+  "printf-mauke" = dontDistribute super."printf-mauke";
+  "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_7";
+  "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";
+  "process-streaming" = dontDistribute super."process-streaming";
+  "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";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
+  "prof2dot" = dontDistribute super."prof2dot";
+  "prof2pretty" = dontDistribute super."prof2pretty";
+  "profiteur" = dontDistribute super."profiteur";
+  "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";
+  "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-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";
+  "proxied" = dontDistribute super."proxied";
+  "proxy-kindness" = dontDistribute super."proxy-kindness";
+  "psc-ide" = doDistribute super."psc-ide_0_5_0";
+  "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_20151212";
+  "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-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_7_6_1";
+  "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "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";
+  "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";
+  "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-simple" = dontDistribute super."quickcheck-simple";
+  "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver";
+  "quicklz" = dontDistribute super."quicklz";
+  "quickpull" = dontDistribute super."quickpull";
+  "quickset" = dontDistribute super."quickset";
+  "quickspec" = dontDistribute super."quickspec";
+  "quicktest" = dontDistribute super."quicktest";
+  "quickwebapp" = dontDistribute super."quickwebapp";
+  "quiver" = dontDistribute super."quiver";
+  "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-http" = dontDistribute super."quiver-http";
+  "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";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
+  "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-tree" = dontDistribute super."random-tree";
+  "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";
+  "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
+  "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
+  "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";
+  "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";
+  "reactor" = dontDistribute super."reactor";
+  "read-bounded" = dontDistribute super."read-bounded";
+  "readline-statevar" = dontDistribute super."readline-statevar";
+  "readpyc" = dontDistribute super."readpyc";
+  "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";
+  "reedsolomon" = dontDistribute super."reedsolomon";
+  "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-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
+  "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-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";
+  "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-query" = dontDistribute super."relational-query";
+  "relational-query-HDBC" = dontDistribute super."relational-query-HDBC";
+  "relational-record" = dontDistribute super."relational-record";
+  "relational-record-examples" = dontDistribute super."relational-record-examples";
+  "relational-schemas" = dontDistribute super."relational-schemas";
+  "relative-date" = dontDistribute super."relative-date";
+  "relit" = dontDistribute super."relit";
+  "rematch" = dontDistribute super."rematch";
+  "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";
+  "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-core" = doDistribute super."rest-core_0_37";
+  "rest-example" = dontDistribute super."rest-example";
+  "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "restful-snap" = dontDistribute super."restful-snap";
+  "restricted-workers" = dontDistribute super."restricted-workers";
+  "restyle" = dontDistribute super."restyle";
+  "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "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-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";
+  "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";
+  "rmonad" = dontDistribute super."rmonad";
+  "rncryptor" = dontDistribute super."rncryptor";
+  "rng-utils" = dontDistribute super."rng-utils";
+  "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";
+  "rotating-log" = dontDistribute super."rotating-log";
+  "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";
+  "sampling" = dontDistribute super."sampling";
+  "samtools" = dontDistribute super."samtools";
+  "samtools-conduit" = dontDistribute super."samtools-conduit";
+  "samtools-enumerator" = dontDistribute super."samtools-enumerator";
+  "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandlib" = dontDistribute super."sandlib";
+  "sarasvati" = dontDistribute super."sarasvati";
+  "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";
+  "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";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
+  "scan" = dontDistribute super."scan";
+  "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "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" = doDistribute super."scotty_0_10_2";
+  "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-rest" = dontDistribute super."scotty-rest";
+  "scotty-session" = dontDistribute super."scotty-session";
+  "scotty-tls" = dontDistribute super."scotty-tls";
+  "scp-streams" = dontDistribute super."scp-streams";
+  "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "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" = doDistribute super."second-transfer_0_7_1_0";
+  "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";
+  "semiring-simple" = dontDistribute super."semiring-simple";
+  "semver-range" = dontDistribute super."semver-range";
+  "sendgrid-haskell" = dontDistribute super."sendgrid-haskell";
+  "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";
+  "serialport" = dontDistribute super."serialport";
+  "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
+  "servant-cassava" = dontDistribute super."servant-cassava";
+  "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-lucid" = dontDistribute super."servant-lucid";
+  "servant-mock" = dontDistribute super."servant-mock";
+  "servant-pandoc" = dontDistribute super."servant-pandoc";
+  "servant-pool" = dontDistribute super."servant-pool";
+  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-response" = dontDistribute super."servant-response";
+  "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
+  "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
+  "sessions" = dontDistribute super."sessions";
+  "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
+  "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-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";
+  "shelly-extra" = dontDistribute super."shelly-extra";
+  "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" = dontDistribute super."simple-log";
+  "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" = dontDistribute super."simpleirc";
+  "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";
+  "sink" = dontDistribute super."sink";
+  "sirkel" = dontDistribute super."sirkel";
+  "sitemap" = dontDistribute super."sitemap";
+  "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";
+  "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";
+  "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";
+  "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-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-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";
+  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
+  "sophia" = dontDistribute super."sophia";
+  "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
+  "sorted" = dontDistribute super."sorted";
+  "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";
+  "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";
+  "spool" = dontDistribute super."spool";
+  "spoonutil" = dontDistribute super."spoonutil";
+  "spoty" = dontDistribute super."spoty";
+  "spreadsheet" = dontDistribute super."spreadsheet";
+  "spritz" = dontDistribute super."spritz";
+  "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";
+  "sql-words" = dontDistribute super."sql-words";
+  "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";
+  "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-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";
+  "stopwatch" = dontDistribute super."stopwatch";
+  "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";
+  "str" = dontDistribute super."str";
+  "stratum-tool" = dontDistribute super."stratum-tool";
+  "stream-fusion" = dontDistribute super."stream-fusion";
+  "stream-monad" = dontDistribute super."stream-monad";
+  "streamed" = dontDistribute super."streamed";
+  "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-base-types" = doDistribute super."strict-base-types_0_4_0";
+  "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-conv" = dontDistribute super."string-conv";
+  "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";
+  "strive" = dontDistribute super."strive";
+  "strptime" = dontDistribute super."strptime";
+  "structs" = dontDistribute super."structs";
+  "structural-induction" = dontDistribute super."structural-induction";
+  "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";
+  "suffixarray" = dontDistribute super."suffixarray";
+  "suffixtree" = dontDistribute super."suffixtree";
+  "sugarhaskell" = dontDistribute super."sugarhaskell";
+  "suitable" = dontDistribute super."suitable";
+  "sump" = dontDistribute super."sump";
+  "sundown" = dontDistribute super."sundown";
+  "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";
+  "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
+  "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_1_2_1";
+  "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";
+  "symbol" = dontDistribute super."symbol";
+  "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-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";
+  "ta" = dontDistribute super."ta";
+  "table" = dontDistribute super."table";
+  "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-transformer" = dontDistribute super."tagged-transformer";
+  "tagging" = dontDistribute super."tagging";
+  "taggy" = dontDistribute super."taggy";
+  "taggy-lens" = dontDistribute super."taggy-lens";
+  "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";
+  "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";
+  "taskpool" = dontDistribute super."taskpool";
+  "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";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "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";
+  "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-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-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";
+  "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-and-plots" = dontDistribute super."text-and-plots";
+  "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-ldap" = dontDistribute super."text-ldap";
+  "text-locale-encoding" = dontDistribute super."text-locale-encoding";
+  "text-normal" = dontDistribute super."text-normal";
+  "text-position" = dontDistribute super."text-position";
+  "text-postgresql" = dontDistribute super."text-postgresql";
+  "text-printer" = dontDistribute super."text-printer";
+  "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
+  "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-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-lift-instances" = dontDistribute super."th-lift-instances";
+  "th-printf" = dontDistribute super."th-printf";
+  "th-sccs" = dontDistribute super."th-sccs";
+  "th-traced" = dontDistribute super."th-traced";
+  "th-typegraph" = dontDistribute super."th-typegraph";
+  "themoviedb" = dontDistribute super."themoviedb";
+  "themplate" = dontDistribute super."themplate";
+  "theoremquest" = dontDistribute super."theoremquest";
+  "theoremquest-client" = dontDistribute super."theoremquest-client";
+  "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";
+  "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" = dontDistribute super."tidal";
+  "tidal-midi" = dontDistribute super."tidal-midi";
+  "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-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-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-time" = dontDistribute super."timelike-time";
+  "timemap" = dontDistribute super."timemap";
+  "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";
+  "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-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";
+  "tracker" = dontDistribute super."tracker";
+  "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-free" = dontDistribute super."transformers-free";
+  "transformers-runnable" = dontDistribute super."transformers-runnable";
+  "transformers-supply" = dontDistribute super."transformers-supply";
+  "transient" = dontDistribute super."transient";
+  "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-fun" = dontDistribute super."tree-fun";
+  "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";
+  "tslogger" = dontDistribute super."tslogger";
+  "tsp-viz" = dontDistribute super."tsp-viz";
+  "tsparse" = dontDistribute super."tsparse";
+  "tst" = dontDistribute super."tst";
+  "tsvsql" = dontDistribute super."tsvsql";
+  "tttool" = doDistribute super."tttool_1_5_1";
+  "tubes" = dontDistribute super."tubes";
+  "tuntap" = dontDistribute super."tuntap";
+  "tup-functor" = dontDistribute super."tup-functor";
+  "tuple" = dontDistribute super."tuple";
+  "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";
+  "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
+  "turni" = dontDistribute super."turni";
+  "turtle-options" = dontDistribute super."turtle-options";
+  "tweak" = dontDistribute super."tweak";
+  "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";
+  "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-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";
+  "typography-geometry" = dontDistribute super."typography-geometry";
+  "uAgda" = dontDistribute super."uAgda";
+  "ua-parser" = dontDistribute super."ua-parser";
+  "uacpid" = dontDistribute super."uacpid";
+  "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";
+  "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";
+  "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-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" = doDistribute super."unordered-containers_0_2_5_1";
+  "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";
+  "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-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
+  "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";
+  "userid" = doDistribute super."userid_0_1_2_4";
+  "users" = doDistribute super."users_0_4_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_4_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_4_0_0";
+  "users-test" = doDistribute super."users-test_0_4_0_0";
+  "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";
+  "vado" = dontDistribute super."vado";
+  "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";
+  "vcd" = dontDistribute super."vcd";
+  "vcs-revision" = dontDistribute super."vcs-revision";
+  "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
+  "vcsgui" = dontDistribute super."vcsgui";
+  "vcswrapper" = dontDistribute super."vcswrapper";
+  "vect" = dontDistribute super."vect";
+  "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-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" = dontDistribute super."versions";
+  "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" = doDistribute super."vinyl_0_5_1";
+  "vinyl-gl" = dontDistribute super."vinyl-gl";
+  "vinyl-json" = dontDistribute super."vinyl-json";
+  "vinyl-utils" = dontDistribute super."vinyl-utils";
+  "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";
+  "vivid" = dontDistribute super."vivid";
+  "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";
+  "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-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-content-type" = dontDistribute super."wai-middleware-content-type";
+  "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" = dontDistribute super."wai-middleware-verbs";
+  "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" = doDistribute super."warp_3_2_2";
+  "warp-dynamic" = dontDistribute super."warp-dynamic";
+  "warp-static" = dontDistribute super."warp-static";
+  "warp-tls" = doDistribute super."warp-tls_3_2_0";
+  "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-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";
+  "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" = dontDistribute super."webkitgtk3";
+  "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "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" = dontDistribute super."werewolf";
+  "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";
+  "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";
+  "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";
+  "wuss" = dontDistribute super."wuss";
+  "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" = doDistribute super."xlsx_0_2_0";
+  "xlsx-templater" = dontDistribute super."xlsx-templater";
+  "xml-basic" = dontDistribute super."xml-basic";
+  "xml-catalog" = dontDistribute super."xml-catalog";
+  "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";
+  "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";
+  "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-json" = dontDistribute super."yesod-json";
+  "yesod-links" = dontDistribute super."yesod-links";
+  "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-markdown" = dontDistribute super."yesod-markdown";
+  "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5";
+  "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";
+  "yjtools" = dontDistribute super."yjtools";
+  "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-conduit" = dontDistribute super."zip-conduit";
+  "zipedit" = dontDistribute super."zipedit";
+  "zipkin" = dontDistribute super."zipkin";
+  "zipper" = dontDistribute super."zipper";
+  "zippers" = dontDistribute super."zippers";
+  "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";
+  "zot" = dontDistribute super."zot";
+  "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 da1c1fb01b9b..b363ca74bfe2 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -12957,6 +12957,18 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "MASMGen" = callPackage
+    ({ mkDerivation, base, containers, mtl }:
+     mkDerivation {
+       pname = "MASMGen";
+       version = "0.4.0.0";
+       sha256 = "9565a4905772c12dfccd9c17c5b3f52601e2aa28c9a7a288e2ab577834ed10e5";
+       libraryHaskellDepends = [ base containers mtl ];
+       testHaskellDepends = [ base containers mtl ];
+       description = "Generate MASM code from haskell";
+       license = stdenv.lib.licenses.gpl3;
+     }) {};
+
   "MC-Fold-DP" = callPackage
     ({ mkDerivation, base, Biobase, cmdargs, PrimitiveArray, split
      , tuple, vector
@@ -13281,6 +13293,7 @@ self: {
        version = "0.1.2";
        sha256 = "9df832cee4d6fa42667b1ee1a985f2366a1771f84409b7b9414d284af78045cf";
        libraryHaskellDepends = [ base hstats ];
+       jailbreak = true;
        homepage = "http://github.com/benhamner/Metrics/";
        description = "Evaluation metrics commonly used in supervised machine learning";
        license = stdenv.lib.licenses.bsd3;
@@ -14042,8 +14055,8 @@ self: {
      }:
      mkDerivation {
        pname = "NXT";
-       version = "0.2.3";
-       sha256 = "23429e3654c48d7b009f5a0fef46af6831919c59aa15c250ef9920ce5b9a41cd";
+       version = "0.2.5";
+       sha256 = "fc644fb66a152bf4642fa08b6e3baf92670b822b433f8793e7a9ea4a0bfa0c13";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -16683,8 +16696,8 @@ self: {
      }:
      mkDerivation {
        pname = "Rasenschach";
-       version = "0.1.3.1";
-       sha256 = "a73c29528685248d266404daa4a92fcd3bd2f1e0442db39982989a213e652079";
+       version = "0.1.3.2";
+       sha256 = "4657bacee6bbdc17481174ee6a444cd77e72775d772e2f7f6db8b9e6a95f64f2";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -20773,18 +20786,24 @@ self: {
 
   "YamlReference" = callPackage
     ({ mkDerivation, base, bytestring, containers, directory, dlist
-     , HUnit, regex-compat
+     , hashmap, HUnit, mtl, regex-compat
      }:
      mkDerivation {
        pname = "YamlReference";
-       version = "0.9.3";
-       sha256 = "cfee41cb2e8f860ceadd6847fddecb5e384ca40151039d3f4c85ec1907ff675a";
+       version = "0.10.0";
+       sha256 = "4d89cd7714f25c82c6a49a99e8d8b1789640222a1b5863da0a7aa3f4566b9205";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base bytestring containers dlist HUnit regex-compat
+         base bytestring containers dlist regex-compat
+       ];
+       executableHaskellDepends = [
+         base bytestring containers dlist regex-compat
+       ];
+       testHaskellDepends = [
+         base bytestring containers directory dlist hashmap HUnit mtl
+         regex-compat
        ];
-       executableHaskellDepends = [ directory ];
        homepage = "http://www.ben-kiki.org/oren/YamlReference";
        description = "YAML reference implementation";
        license = "LGPL";
@@ -22317,12 +22336,13 @@ self: {
     ({ mkDerivation, aeson, base, text, time, unordered-containers }:
      mkDerivation {
        pname = "activitystreams-aeson";
-       version = "0.2.0.1";
-       sha256 = "4fe91f1355c2572661baa932988159123dd8a61e6c9c09a40af98b520291f9ae";
+       version = "0.2.0.2";
+       sha256 = "1252d328e4dad9e18f6bd188961ffc4ce12eefe35a3ecccb693297a057c512ec";
        libraryHaskellDepends = [
          aeson base text time unordered-containers
        ];
        jailbreak = true;
+       homepage = "https://github.com/aisamanra/activitystreams-aeson";
        description = "An interface to the ActivityStreams specification";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -24336,15 +24356,16 @@ self: {
      }) {};
 
   "alga" = callPackage
-    ({ mkDerivation, base, containers, directory, exceptions, filepath
-     , formatting, haskeline, hxt, megaparsec, mtl, optparse-applicative
-     , path, QuickCheck, random, temporary, test-framework
-     , test-framework-quickcheck2, text, tf-random, transformers
+    ({ mkDerivation, aeson, base, containers, data-default, exceptions
+     , filepath, formatting, haskeline, hxt, megaparsec, mtl
+     , optparse-applicative, path, path-io, QuickCheck, random
+     , test-framework, test-framework-quickcheck2, text, tf-random
+     , transformers, yaml
      }:
      mkDerivation {
        pname = "alga";
-       version = "0.1.0";
-       sha256 = "e5a0bccf2817a5fa4446a6ee348de0f43f60e75884b61f12229cde948617f813";
+       version = "0.2.1";
+       sha256 = "157f622f2851da9bcc2a05df9c192c8abb955745d22d4acdfc8d3a89b765d8e7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -24352,9 +24373,9 @@ self: {
          text tf-random transformers
        ];
        executableHaskellDepends = [
-         base containers directory exceptions filepath formatting haskeline
-         hxt megaparsec mtl optparse-applicative path random temporary text
-         tf-random transformers
+         aeson base containers data-default exceptions filepath formatting
+         haskeline hxt megaparsec mtl optparse-applicative path path-io
+         random text tf-random transformers yaml
        ];
        testHaskellDepends = [
          base containers hxt megaparsec mtl QuickCheck random test-framework
@@ -31636,8 +31657,8 @@ self: {
      }:
      mkDerivation {
        pname = "atp-haskell";
-       version = "1.10";
-       sha256 = "a6e9178c6db9de5a2c1ad4a158d1730f2e3e5eb1b20f9a06a7263597fe8a1d32";
+       version = "1.13";
+       sha256 = "9e71ff29922844208afc039bf0541392a58ef4d651f6020e19679a8fa68bb5b0";
        libraryHaskellDepends = [
          applicative-extras base containers HUnit mtl parsec pretty
          template-haskell time
@@ -32342,6 +32363,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "autoexporter" = callPackage
+    ({ mkDerivation, base, directory, filepath }:
+     mkDerivation {
+       pname = "autoexporter";
+       version = "0.1.2";
+       sha256 = "bdc64e16ee42cbadf596cba93ca665cdfd3cf621f636ea5a1f3f8e7248616f2e";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base directory filepath ];
+       executableHaskellDepends = [ base ];
+       description = "Automatically re-export modules";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "autonix-deps" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, base, bytestring, conduit
      , containers, errors, filepath, lens, libarchive-conduit, mtl
@@ -33204,8 +33239,8 @@ self: {
      }:
      mkDerivation {
        pname = "aws-route53";
-       version = "0.1.2.1";
-       sha256 = "b67317d4949a2e6649392bb6fd1e72767c3658670dbd52867ca2169ca7e6b5bc";
+       version = "0.1.2.2";
+       sha256 = "eaddcf6c4903ab17c6a963bbb2228581c016026f2e4d9cc26db2ed527487d05b";
        libraryHaskellDepends = [
          aws base bytestring containers http-conduit http-types old-locale
          resourcet text time xml-conduit xml-hamlet
@@ -33614,7 +33649,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "b9" = callPackage
+  "b9_0_5_17" = callPackage
     ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes
      , bytestring, conduit, conduit-extra, ConfigFile, directory
      , filepath, free, hashable, hspec, hspec-expectations, mtl
@@ -33645,6 +33680,40 @@ self: {
        homepage = "https://github.com/sheyll/b9-vm-image-builder";
        description = "A tool and library for building virtual machine images";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "b9" = callPackage
+    ({ mkDerivation, aeson, async, base, bifunctors, binary, boxes
+     , bytestring, conduit, conduit-extra, ConfigFile, directory
+     , filepath, free, hashable, hspec, hspec-expectations, mtl
+     , optparse-applicative, parallel, parsec, pretty, pretty-show
+     , process, QuickCheck, random, semigroups, syb, template, text
+     , time, transformers, unordered-containers, vector, yaml
+     }:
+     mkDerivation {
+       pname = "b9";
+       version = "0.5.18";
+       sha256 = "978edf4fcb9801716e9095b75eabb248cf9ad68fdeeb360bd3ed75643b9cfedc";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson async base bifunctors binary boxes bytestring conduit
+         conduit-extra ConfigFile directory filepath free hashable mtl
+         parallel parsec pretty pretty-show process QuickCheck random
+         semigroups syb template text time transformers unordered-containers
+         vector yaml
+       ];
+       executableHaskellDepends = [
+         base bytestring directory optparse-applicative
+       ];
+       testHaskellDepends = [
+         aeson base bytestring hspec hspec-expectations QuickCheck
+         semigroups text unordered-containers vector yaml
+       ];
+       homepage = "https://github.com/sheyll/b9-vm-image-builder";
+       description = "A tool and library for building virtual machine images";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "babylon" = callPackage
@@ -34308,7 +34377,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base-orphans" = callPackage
+  "base-orphans_0_5_1" = callPackage
     ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
      mkDerivation {
        pname = "base-orphans";
@@ -34319,6 +34388,20 @@ self: {
        homepage = "https://github.com/haskell-compat/base-orphans#readme";
        description = "Backwards-compatible orphan instances for base";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "base-orphans" = callPackage
+    ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "base-orphans";
+       version = "0.5.2";
+       sha256 = "83de88294742641fe72c92aa3337e575c8f572a7486fad383fd272e857342f1e";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/haskell-compat/base-orphans#readme";
+       description = "Backwards-compatible orphan instances for base";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "base-prelude_0_1_6" = callPackage
@@ -37486,8 +37569,8 @@ self: {
      }:
      mkDerivation {
        pname = "bioinformatics-toolkit";
-       version = "0.1.0";
-       sha256 = "0ce36b2dc686a77804158d70658cc0600056ae62e7d465663b75e784b52950a9";
+       version = "0.1.1";
+       sha256 = "ac95d23555ac96d87ebf90c90fd665587b037ae22d2fd92864efb95a8725863f";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -38103,15 +38186,16 @@ self: {
   "bitx-bitcoin" = callPackage
     ({ mkDerivation, aeson, base, bytestring, directory, doctest, hspec
      , http-client, http-client-tls, http-types, microlens, microlens-th
-     , network, safe, scientific, split, text, time
+     , network, QuickCheck, safe, scientific, split, text, time
      }:
      mkDerivation {
        pname = "bitx-bitcoin";
-       version = "0.6.0.0";
-       sha256 = "f08ac6744d6a1e74060de589603e0ee1355711a54c67501473526735ac6fb834";
+       version = "0.7.0.0";
+       sha256 = "533cad5eb0c66efc407b676b9d2a43259e74b5343b00c35e2ded9382a5a36948";
        libraryHaskellDepends = [
          aeson base bytestring http-client http-client-tls http-types
-         microlens microlens-th network scientific split text time
+         microlens microlens-th network QuickCheck scientific split text
+         time
        ];
        testHaskellDepends = [
          aeson base bytestring directory doctest hspec http-client
@@ -38379,8 +38463,8 @@ self: {
      }:
      mkDerivation {
        pname = "blatex";
-       version = "0.1.0.5";
-       sha256 = "8c421e5c355d374463793a6bd3815185fcd8d0e8134d72b7d6e7a916f5932479";
+       version = "0.1.0.7";
+       sha256 = "1f6979e4bc113132b2dd1e840ccf1642f1649bca8f16708e13a26f2a45310aa8";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -39828,13 +39912,12 @@ self: {
     ({ mkDerivation, array, base }:
      mkDerivation {
        pname = "brainfuck-tut";
-       version = "0.7.0.0";
-       sha256 = "d2f4142ecc30ce39a83e58a144b650a44288e6cf62d47b83cc8ee95ac2aba8a7";
+       version = "0.7.0.1";
+       sha256 = "761ef393826ecc54b9a5ab2d37b0c1af9db169bf6edb02282df67a71e02a1855";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ array base ];
        executableHaskellDepends = [ array base ];
-       jailbreak = true;
        homepage = "https://gitlab.com/cpp.cabrera/brainfuck-tut";
        description = "A simple BF interpreter";
        license = stdenv.lib.licenses.bsd3;
@@ -40205,7 +40288,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "btrfs" = callPackage
+  "btrfs_0_1_1_1" = callPackage
     ({ mkDerivation, base, bytestring, time, unix }:
      mkDerivation {
        pname = "btrfs";
@@ -40219,6 +40302,21 @@ self: {
        homepage = "https://github.com/redneb/hs-btrfs";
        description = "Bindings to the btrfs API";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "btrfs" = callPackage
+    ({ mkDerivation, base, bytestring, time, unix }:
+     mkDerivation {
+       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";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
@@ -43261,7 +43359,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "cacophony" = callPackage
+  "cacophony_0_4_0" = callPackage
     ({ mkDerivation, base, bytestring, cryptonite, directory, doctest
      , filepath, hlint, lens, memory, mtl, QuickCheck, tasty
      , tasty-quickcheck
@@ -43281,6 +43379,29 @@ self: {
        homepage = "https://github.com/centromere/cacophony";
        description = "A library implementing the Noise protocol";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "cacophony" = callPackage
+    ({ mkDerivation, async, base, bytestring, cryptonite, directory
+     , doctest, filepath, free, hlint, lens, memory, mtl, QuickCheck
+     , tasty, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "cacophony";
+       version = "0.5.0";
+       sha256 = "942167185eebb4290e576f2c25816d0ccd52d68b47641dbdf5b5d8fffcd8f750";
+       libraryHaskellDepends = [
+         base bytestring cryptonite free lens memory mtl
+       ];
+       testHaskellDepends = [
+         async base bytestring directory doctest filepath hlint mtl
+         QuickCheck tasty tasty-quickcheck
+       ];
+       doCheck = false;
+       homepage = "https://github.com/centromere/cacophony";
+       description = "A library implementing the Noise protocol";
+       license = stdenv.lib.licenses.publicDomain;
      }) {};
 
   "caf" = callPackage
@@ -44354,6 +44475,23 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "casr-logbook" = callPackage
+    ({ mkDerivation, base, containers, directory, doctest, filepath
+     , QuickCheck, template-haskell
+     }:
+     mkDerivation {
+       pname = "casr-logbook";
+       version = "0.0.3";
+       sha256 = "467e3484e77c94f6d077048fd184ea6b50904afe80291be88114455dd9af4fd5";
+       libraryHaskellDepends = [ base containers ];
+       testHaskellDepends = [
+         base directory doctest filepath QuickCheck template-haskell
+       ];
+       homepage = "https://github.com/tonymorris/casr-61.345";
+       description = "CASR 61.345 Pilot Personal Logbook";
+       license = "unknown";
+     }) {};
+
   "cassandra-cql" = callPackage
     ({ mkDerivation, base, bytestring, cereal, containers, cryptohash
      , Decimal, hslogger, MonadCatchIO-transformers, mtl, network
@@ -44821,6 +44959,17 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "category-traced" = callPackage
+    ({ mkDerivation, base, categories }:
+     mkDerivation {
+       pname = "category-traced";
+       version = "0.1.0.1";
+       sha256 = "20dcb78f02c43f1dab7a7a4cb250404221dc46bbfe1075a3a200e72b77078701";
+       libraryHaskellDepends = [ base categories ];
+       description = "Traced monoidal categories";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "cautious-file" = callPackage
     ({ mkDerivation, base, bytestring, directory, filepath, unix }:
      mkDerivation {
@@ -45477,8 +45626,8 @@ self: {
      }:
      mkDerivation {
        pname = "cgrep";
-       version = "6.6.1";
-       sha256 = "49cfd5695a20c7cdad917704e81ae6cb50e77d7db6a18f7792237bb6c4dbfc38";
+       version = "6.6.2";
+       sha256 = "3c4aa9458da80a7df400479f969a432b331d9e47e57cd1358749a465e728f437";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -48538,7 +48687,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "clckwrks" = callPackage
+  "clckwrks_0_23_13" = callPackage
     ({ mkDerivation, acid-state, aeson, aeson-qq, attoparsec, base
      , blaze-html, bytestring, cereal, containers, directory, filepath
      , happstack-authenticate, happstack-hsp, happstack-jmacro
@@ -48569,6 +48718,40 @@ self: {
        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" = 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.14";
+       sha256 = "17c351be5beeb0cdd9aca04577d99e64f8968e558240f7c1c780f5ab91436ea7";
+       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;
      }) {inherit (pkgs) openssl;};
 
   "clckwrks-cli" = callPackage
@@ -48686,7 +48869,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "clckwrks-plugin-page" = callPackage
+  "clckwrks-plugin-page_0_4_3" = callPackage
     ({ mkDerivation, acid-state, aeson, attoparsec, base, clckwrks
      , containers, directory, filepath, happstack-hsp, happstack-server
      , hsp, hsx2hs, ixset, mtl, old-locale, random, reform
@@ -48708,6 +48891,31 @@ self: {
        homepage = "http://www.clckwrks.com/";
        description = "support for CMS/Blogging in clckwrks";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "clckwrks-plugin-page" = 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.1";
+       sha256 = "2594d8737035bb069147580abf1a284fced822d654b854ea84c466d25c4896b4";
+       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;
      }) {};
 
   "clckwrks-theme-bootstrap" = callPackage
@@ -49606,8 +49814,8 @@ self: {
      }:
      mkDerivation {
        pname = "cndict";
-       version = "0.6.4";
-       sha256 = "087b98003461144617d8d932ff5d6e853e44d599f5b2df1f378f1bb07ddb91da";
+       version = "0.7.1";
+       sha256 = "fa8e41c031e0a60abb73b0b76b18ea1a470e0a1ff8eed357c0b3f424bed9106f";
        libraryHaskellDepends = [
          base binary bytestring cassava containers text vector
        ];
@@ -54841,8 +55049,8 @@ self: {
     ({ mkDerivation, array, base, containers, parallel }:
      mkDerivation {
        pname = "cpsa";
-       version = "2.5.4";
-       sha256 = "d9b1c49aace29dda1189a711888ca39c6af4ab5adb4798e65a1bef489813449e";
+       version = "3.3.0";
+       sha256 = "1ec656f97612b82870000f96a3fa147796e67c305d433efd6958f9b5d794a8c0";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ array base containers parallel ];
@@ -56137,6 +56345,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "cryptohash_0_11_7" = callPackage
+    ({ mkDerivation, base, byteable, bytestring, ghc-prim, HUnit
+     , QuickCheck, tasty, tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "cryptohash";
+       version = "0.11.7";
+       sha256 = "da297489f6b2a029a14e08f53ff841743ca7bd35646ee7c05ebcd0028b9d0e30";
+       libraryHaskellDepends = [ base byteable bytestring ghc-prim ];
+       testHaskellDepends = [
+         base byteable bytestring HUnit QuickCheck tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       homepage = "http://github.com/vincenthz/hs-cryptohash";
+       description = "collection of crypto hashes, fast, pure and practical";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "cryptohash-conduit" = callPackage
     ({ mkDerivation, base, bytestring, conduit, conduit-extra
      , cryptohash, resourcet, transformers
@@ -56406,8 +56633,8 @@ self: {
      }:
      mkDerivation {
        pname = "cryptonite";
-       version = "0.12";
-       sha256 = "8ab0570f6f0864004d6bdce012aaafbf365a45b1721061c7d35554b92f1ababd";
+       version = "0.13";
+       sha256 = "cd8adffda8fa7daf2063d27b502d52a4509e22f5e33cca861ffbf2f32bb32ad4";
        libraryHaskellDepends = [
          base bytestring deepseq ghc-prim integer-gmp memory
        ];
@@ -62876,8 +63103,8 @@ self: {
      }:
      mkDerivation {
        pname = "diagrams-pandoc";
-       version = "0.2";
-       sha256 = "03bc32e95873000bae33d837319367febc2efad073671677afa3fdd59d246459";
+       version = "0.3";
+       sha256 = "7bc3593aa45454aff222f0e23abe2e4277af6cdf96e484a7e967c16e9a48a510";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -62889,7 +63116,7 @@ self: {
          filepath linear optparse-applicative pandoc-types
        ];
        jailbreak = true;
-       description = "A pandoc filter to express diagrams inline using the haskell EDSL _diagrams_";
+       description = "A Pandoc filter to express diagrams inline using the Haskell EDSL _Diagrams_";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -64506,6 +64733,20 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "directory-listing-webpage-parser" = callPackage
+    ({ mkDerivation, base, bytestring, network-uri, tagsoup, text, time
+     }:
+     mkDerivation {
+       pname = "directory-listing-webpage-parser";
+       version = "0.1.0.0";
+       sha256 = "03b5f5d9180784a2d9ba481f09b9cc503b1dfbc10a747e6eebd12e9f6338e4cf";
+       libraryHaskellDepends = [
+         base bytestring network-uri tagsoup text time
+       ];
+       description = "directory listing webpage parser";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "directory-tree" = callPackage
     ({ mkDerivation, base, directory, filepath, process }:
      mkDerivation {
@@ -64809,6 +65050,8 @@ self: {
        pname = "distributed-process";
        version = "0.6.0";
        sha256 = "d79f7e24e7b2896681f9f4b798da0e987742caab4c34917a0d04f40f9aef6b5b";
+       revision = "2";
+       editedCabalFile = "3931f513026c2190a6117df582f6ff72d06898b69fddfafe65c25d2d0460f140";
        libraryHaskellDepends = [
          base binary bytestring containers data-accessor deepseq
          distributed-static ghc-prim hashable mtl network-transport random
@@ -64969,6 +65212,21 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "distributed-process-ekg" = callPackage
+    ({ mkDerivation, base, distributed-process, ekg-core, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "distributed-process-ekg";
+       version = "0.1.0.0";
+       sha256 = "ae61370b9268a2143930eac6cf3d397ed8c15fba5cb32e20f2bb194e3b4e6fdd";
+       libraryHaskellDepends = [
+         base distributed-process ekg-core text unordered-containers
+       ];
+       description = "Collect node stats for EKG";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "distributed-process-execution_0_1_1" = callPackage
     ({ mkDerivation, ansi-terminal, base, binary, bytestring
      , containers, data-accessor, deepseq, distributed-process
@@ -75722,8 +75980,8 @@ self: {
     ({ mkDerivation, base }:
      mkDerivation {
        pname = "filtrable";
-       version = "0.1.0.4";
-       sha256 = "85285317f86c6e4e7329d74bf6b2116ab203f810ac2b5ebde251f920c3098d53";
+       version = "0.1.0.5";
+       sha256 = "6d2a75d6b69f8d0f538e680923e9f68c17ee6feaed505a2d86d9baae4784ce7e";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/strake/filtrable.hs";
        description = "Class of filtrable containers";
@@ -76701,6 +76959,8 @@ self: {
        pname = "flock";
        version = "0.3.1.8";
        sha256 = "9634ce605c3b5579f4f1e53af7d93850ec23ffb2fd5b24e02974626af1712fbc";
+       revision = "2";
+       editedCabalFile = "29ece5230bb5ae45a09939ac9ba85e75bd81cf645634b952e6f89486f9325177";
        libraryHaskellDepends = [
          base lifted-base monad-control transformers unix
        ];
@@ -76903,8 +77163,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.4.0.2";
-       sha256 = "0ce62c0325a1ec7a9c782b0ead40cdfb3c60cc5f98c13f61f72e329214c06d17";
+       version = "0.4.0.5";
+       sha256 = "ba70bc386ff0393e762e29b183fd12d1fcf3c8329343cd81adcab3f1d30aab75";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
@@ -76920,8 +77180,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs-demos";
-       version = "0.0.0.3";
-       sha256 = "c39a9c8378857e4f4c7af7ab98516bb3deffce1e39742eb7f39ce4cf09c1f1b7";
+       version = "0.0.0.7";
+       sha256 = "4e78d6fc7e6983d53ed7a4f4625b6ff89e5c06eda116f64bd38ca360f6d83a7a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -76932,6 +77192,20 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "fltkhs-fluid-demos" = callPackage
+    ({ mkDerivation, base, bytestring, fltkhs }:
+     mkDerivation {
+       pname = "fltkhs-fluid-demos";
+       version = "0.0.0.6";
+       sha256 = "37b6276ba4897bea3520e3bfa72e51225e6f3409e533777d4ef2502a57925052";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [ base bytestring fltkhs ];
+       homepage = "http://github.com/deech/fltkhs-fluid-demos";
+       description = "Fltkhs Fluid Demos";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "fltkhs-fluid-examples" = callPackage
     ({ mkDerivation, base, bytestring, fltkhs }:
      mkDerivation {
@@ -77441,8 +77715,8 @@ self: {
      }:
      mkDerivation {
        pname = "folds";
-       version = "0.7";
-       sha256 = "ec5090f3a11aa18973a239fd8285041e0766df73630864abf5ee3e14ee2ee762";
+       version = "0.7.1";
+       sha256 = "e07adf0c9834b5f78180250d7fec6a56ba84c752cbe4c991d52efc6c60b7d25a";
        configureFlags = [ "-f-test-hlint" ];
        libraryHaskellDepends = [
          adjunctions base bifunctors comonad constraints contravariant
@@ -78760,8 +79034,8 @@ self: {
      }:
      mkDerivation {
        pname = "freer";
-       version = "0.2.2.2";
-       sha256 = "3b5e9bdaeedd66f2a3c8b8128fc01b4e0939d95c3a185c256cc1b3b2729c63f3";
+       version = "0.2.2.4";
+       sha256 = "1af6b91d290eb3eea3e6c3a888e7b32a0a7a864de0ef33ddb7d3b7a169a1777d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base ];
@@ -79183,8 +79457,8 @@ self: {
      }:
      mkDerivation {
        pname = "fswatcher";
-       version = "0.2.0";
-       sha256 = "dcaa449b48c5c767adeb5bce6fd250982dcc65049dfca9dc79bfc059b14d73bc";
+       version = "0.2.1";
+       sha256 = "bf6a6c68bb6bb677d1c079fed88688588fb2536273c2007c530a2509cb49a78a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -80549,8 +80823,8 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "generic-deriving";
-       version = "1.10.2";
-       sha256 = "ac5c16be3ff2484bdc5b0051b5af8ed6e31fee8ede2977904a1535ad56b8d9b8";
+       version = "1.10.3";
+       sha256 = "fc1aed27f229434aaf2cd3d83c201a12108cd9a23023ff6edcb037c0775c0024";
        libraryHaskellDepends = [
          base containers ghc-prim template-haskell
        ];
@@ -82914,8 +83188,8 @@ self: {
      }:
      mkDerivation {
        pname = "ginger";
-       version = "0.1.2.0";
-       sha256 = "ab23b63975f0e6ea9819c303b73bb4633840ecf8fbcd9c4bd6746fed7c61e613";
+       version = "0.1.3.0";
+       sha256 = "445dc1d5e65d36a7e7d0cef19c2787da93910dfeb4db7496e9268af9ef176e9c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -85353,8 +85627,8 @@ self: {
      }:
      mkDerivation {
        pname = "gnss-converters";
-       version = "0.1.4";
-       sha256 = "82aaaade8f41cbe7d2093db80186c7919f1786187739c8cc307864d1f2717987";
+       version = "0.1.5";
+       sha256 = "832993a18cb5561ec396061e6f1beeb206ea5e4b4103a34bef601f29f25cda96";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -86976,8 +87250,8 @@ self: {
      }:
      mkDerivation {
        pname = "gore-and-ash-glfw";
-       version = "1.1.0.0";
-       sha256 = "e953449a6d07626dddcd347e52d20610b82a89e3ff0eb6e70166dc3e098bb504";
+       version = "1.1.1.0";
+       sha256 = "b65482130fba543d369383ceb5b8033d72debba728ea848d07c9af02068d9d4c";
        libraryHaskellDepends = [
          base deepseq exceptions extra GLFW-b gore-and-ash hashable mtl
          transformers unordered-containers
@@ -90995,6 +91269,8 @@ self: {
        pname = "hackage-security";
        version = "0.5.0.2";
        sha256 = "4135221bb74e899fde71ff5e878d0401b8c274af6ade996ca7ac15d2b77dbd98";
+       revision = "1";
+       editedCabalFile = "8b92101ca8da9bb27668763565eaf3c2e461c9c0c429003b196b64dbbd5c0af0";
        libraryHaskellDepends = [
          base base64-bytestring bytestring Cabal containers cryptohash
          directory ed25519 filepath ghc-prim mtl network network-uri parsec
@@ -91464,18 +91740,18 @@ self: {
 
   "hadoop-rpc" = callPackage
     ({ mkDerivation, attoparsec, base, bytestring, cereal, exceptions
-     , hashable, monad-loops, network, protobuf, random, socks, stm
-     , tasty, tasty-hunit, text, transformers, unix
+     , gsasl, hashable, monad-loops, network, protobuf, random, socks
+     , stm, tasty, tasty-hunit, text, transformers, unix
      , unordered-containers, uuid, vector, xmlhtml
      }:
      mkDerivation {
        pname = "hadoop-rpc";
-       version = "1.0.0.1";
-       sha256 = "21d2650d54b2696aed6b96641b896b8f225ab2560a75f4f0d2a7e819d6eba1da";
+       version = "1.1.0.0";
+       sha256 = "81de43a08f3aad3370fead1ac2f576425de3ea02913f0c854319c05c46defcf9";
        libraryHaskellDepends = [
-         attoparsec base bytestring cereal exceptions hashable monad-loops
-         network protobuf random socks stm text transformers unix
-         unordered-containers uuid vector xmlhtml
+         attoparsec base bytestring cereal exceptions gsasl hashable
+         monad-loops network protobuf random socks stm text transformers
+         unix unordered-containers uuid vector xmlhtml
        ];
        testHaskellDepends = [ base protobuf tasty tasty-hunit vector ];
        homepage = "http://github.com/jystic/hadoop-rpc";
@@ -91484,27 +91760,28 @@ self: {
      }) {};
 
   "hadoop-tools" = callPackage
-    ({ mkDerivation, attoparsec, base, boxes, bytestring, configurator
-     , exceptions, filepath, hadoop-rpc, old-locale
+    ({ mkDerivation, attoparsec, base, boxes, bytestring, clock
+     , configurator, exceptions, filepath, hadoop-rpc, old-locale
      , optparse-applicative, protobuf, regex-pcre-builtin, split, stm
      , tasty, tasty-hunit, tasty-quickcheck, text, time, transformers
      , unix, vector
      }:
      mkDerivation {
        pname = "hadoop-tools";
-       version = "0.7.2";
-       sha256 = "bb7448517d18a68c4aceed0e7d0ebc6f8510d206e19dbfbb43af65d58d883c3f";
+       version = "1.0.1";
+       sha256 = "1f911291ab75f3ec970d428c0d8335ec7891a0fffe4bcad6df4ba37f5c45a81b";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
-         attoparsec base boxes bytestring configurator exceptions filepath
-         hadoop-rpc old-locale optparse-applicative protobuf
+         attoparsec base boxes bytestring clock configurator exceptions
+         filepath hadoop-rpc old-locale optparse-applicative protobuf
          regex-pcre-builtin split stm text time transformers unix vector
        ];
        testHaskellDepends = [
          attoparsec base bytestring hadoop-rpc tasty tasty-hunit
          tasty-quickcheck vector
        ];
+       jailbreak = true;
        homepage = "http://github.com/jystic/hadoop-tools";
        description = "Fast command line tools for working with Hadoop";
        license = stdenv.lib.licenses.asl20;
@@ -91572,14 +91849,17 @@ self: {
      }) {};
 
   "hahp" = callPackage
-    ({ mkDerivation, base, containers, hmatrix, parallel, time }:
+    ({ mkDerivation, base, containers, hmatrix, parallel, random, time
+     }:
      mkDerivation {
        pname = "hahp";
-       version = "0.1.2";
-       sha256 = "8c13015c685d5abf70ec6fbb7e6b50304f8689bab332d078d53d815e66f9b7fa";
+       version = "0.1.3";
+       sha256 = "1f09efd95604fa3443a2e611d94f5362f9c8223e3dce77ceadea235ddb4d34cd";
        isLibrary = true;
        isExecutable = true;
-       libraryHaskellDepends = [ base containers hmatrix parallel time ];
+       libraryHaskellDepends = [
+         base containers hmatrix parallel random time
+       ];
        executableHaskellDepends = [ base time ];
        description = "Analytic Hierarchy Process";
        license = stdenv.lib.licenses.agpl3;
@@ -93612,7 +93892,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "happstack-server" = callPackage
+  "happstack-server_7_4_6" = callPackage
     ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring
      , containers, directory, exceptions, extensible-exceptions
      , filepath, hslogger, html, HUnit, monad-control, mtl, network
@@ -93639,6 +93919,36 @@ self: {
        homepage = "http://happstack.com";
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "happstack-server" = callPackage
+    ({ mkDerivation, base, base64-bytestring, blaze-html, bytestring
+     , containers, directory, exceptions, extensible-exceptions
+     , filepath, hslogger, html, HUnit, monad-control, mtl, network
+     , network-uri, old-locale, parsec, process, sendfile, syb
+     , system-filepath, template-haskell, text, threads, time
+     , time-compat, transformers, transformers-base, transformers-compat
+     , unix, utf8-string, xhtml, zlib
+     }:
+     mkDerivation {
+       pname = "happstack-server";
+       version = "7.4.6.1";
+       sha256 = "f4893c48b909b275d25a4061be85c637ebb6c5ee63f890c39b3bfefb8698ab9b";
+       libraryHaskellDepends = [
+         base base64-bytestring blaze-html bytestring containers directory
+         exceptions extensible-exceptions filepath hslogger html
+         monad-control mtl network network-uri old-locale parsec process
+         sendfile syb system-filepath template-haskell text threads time
+         time-compat transformers transformers-base transformers-compat unix
+         utf8-string xhtml zlib
+       ];
+       testHaskellDepends = [
+         base bytestring containers HUnit parsec zlib
+       ];
+       homepage = "http://happstack.com";
+       description = "Web related tools and services";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "happstack-server-tls" = callPackage
@@ -95180,6 +95490,33 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "haskell-kubernetes" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, either
+     , http-types, lens, network-uri, QuickCheck, quickcheck-instances
+     , scientific, servant, servant-client, servant-mock, servant-server
+     , split, text, transformers, unordered-containers, vector, wai
+     , warp
+     }:
+     mkDerivation {
+       pname = "haskell-kubernetes";
+       version = "0.3.2";
+       sha256 = "9b45cedeab51c823a31e868096e889b72ea1f0c2035f52d17d12148892a79591";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers either http-types lens network-uri
+         QuickCheck quickcheck-instances scientific servant servant-client
+         servant-server split text unordered-containers vector wai
+       ];
+       executableHaskellDepends = [
+         base either network-uri QuickCheck servant servant-client
+         servant-mock servant-server split transformers warp
+       ];
+       homepage = "https://github.com/soundcloud/haskell-kubernetes";
+       description = "Haskell bindings to the Kubernetes API (via swagger-codegen)";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "haskell-lexer" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -97522,29 +97859,27 @@ self: {
 
   "hasql" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, base-prelude, bytestring
-     , contravariant, contravariant-extras, data-default-class, dlist
-     , either, hashable, hashtables, loch-th, mtl, placeholders
-     , postgresql-binary, postgresql-libpq, profunctors, QuickCheck
-     , quickcheck-instances, scientific, tasty, tasty-hunit
-     , tasty-quickcheck, tasty-smallcheck, text, time, transformers
-     , uuid, vector
+     , bytestring-tree-builder, contravariant, contravariant-extras
+     , data-default-class, dlist, either, hashable, hashtables, loch-th
+     , mtl, placeholders, postgresql-binary, postgresql-libpq
+     , profunctors, QuickCheck, quickcheck-instances, rebase, scientific
+     , semigroups, tasty, tasty-hunit, tasty-quickcheck
+     , tasty-smallcheck, text, time, transformers, uuid, vector
      }:
      mkDerivation {
        pname = "hasql";
-       version = "0.19.8";
-       sha256 = "34eaaa18216ba49621f7cf4ae5202299c8e2b57b460ac45a8dc161a159a564d1";
+       version = "0.19.9";
+       sha256 = "68543bf70d4a4336b75194402240cfd2b5ce70c2deae07076af3dc98b5b76bf9";
        libraryHaskellDepends = [
-         aeson attoparsec base base-prelude bytestring contravariant
-         contravariant-extras data-default-class dlist either hashable
-         hashtables loch-th mtl placeholders postgresql-binary
-         postgresql-libpq profunctors scientific text time transformers uuid
-         vector
+         aeson attoparsec base base-prelude bytestring
+         bytestring-tree-builder contravariant contravariant-extras
+         data-default-class dlist either hashable hashtables loch-th mtl
+         placeholders postgresql-binary postgresql-libpq profunctors
+         scientific semigroups text time transformers uuid vector
        ];
        testHaskellDepends = [
-         base base-prelude bytestring contravariant contravariant-extras
-         data-default-class dlist either hashable profunctors QuickCheck
-         quickcheck-instances scientific tasty tasty-hunit tasty-quickcheck
-         tasty-smallcheck text time transformers uuid vector
+         data-default-class QuickCheck quickcheck-instances rebase tasty
+         tasty-hunit tasty-quickcheck tasty-smallcheck
        ];
        doCheck = false;
        homepage = "https://github.com/nikita-volkov/hasql";
@@ -98062,8 +98397,8 @@ self: {
      }:
      mkDerivation {
        pname = "hasql-transaction";
-       version = "0.4.2";
-       sha256 = "b8e6e62cae96802c7f74620106d0e7b17b3fdd8ad0b30f58c81f8c8550ddea49";
+       version = "0.4.3";
+       sha256 = "9b6a623cdfb83c648c18ac70d7ce548742115d0a9ce25d41a8ab2ff73f67f95e";
        libraryHaskellDepends = [
          base-prelude bytestring bytestring-tree-builder contravariant
          contravariant-extras either hasql mtl postgresql-error-codes
@@ -99806,13 +100141,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hedis_0_7_1" = callPackage
+    ({ mkDerivation, attoparsec, base, BoundedChan, bytestring
+     , bytestring-lexing, deepseq, HUnit, mtl, network, resource-pool
+     , test-framework, test-framework-hunit, time, vector
+     }:
+     mkDerivation {
+       pname = "hedis";
+       version = "0.7.1";
+       sha256 = "741dce86d4a331c64f7720ad9650e5af77ccb8c0a3301266287ae07093f7a0a0";
+       libraryHaskellDepends = [
+         attoparsec base BoundedChan bytestring bytestring-lexing deepseq
+         mtl network resource-pool time vector
+       ];
+       testHaskellDepends = [
+         base bytestring HUnit mtl test-framework test-framework-hunit time
+       ];
+       homepage = "https://github.com/informatikr/hedis";
+       description = "Client library for the Redis datastore: supports full command set, pipelining";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hedis-config" = callPackage
-    ({ mkDerivation, aeson, base, hedis, scientific, text, time }:
+    ({ mkDerivation, aeson, base, bytestring, hedis, scientific, text
+     , time
+     }:
      mkDerivation {
        pname = "hedis-config";
-       version = "0.0.2";
-       sha256 = "62be34f977587d64588cf78e52390a6960a93655331a16d7f5bab1d71a1055c7";
-       libraryHaskellDepends = [ aeson base hedis scientific text time ];
+       version = "0.0.3";
+       sha256 = "4b5ca50be0cca3ec217d4305c61472944cd97705622d7298eca7a18f037ce858";
+       libraryHaskellDepends = [
+         aeson base bytestring hedis scientific text time
+       ];
        homepage = "https://bitbucket.org/s9gf4ult/hedis-config";
        description = "Easy trivial configuration for Redis";
        license = stdenv.lib.licenses.bsd3;
@@ -100488,26 +100849,30 @@ self: {
      }) {};
 
   "hermit" = callPackage
-    ({ mkDerivation, alex, ansi-terminal, array, base, base-compat
-     , containers, data-default-class, directory, ghc, happy, haskeline
-     , kure, marked-pretty, mtl, process, stm, temporary, terminfo
-     , transformers, transformers-compat
+    ({ mkDerivation, alex, ansi-terminal, array, base, containers
+     , data-default-class, directory, fail, filepath, ghc, ghc-paths
+     , happy, haskeline, kure, marked-pretty, mtl, process, semigroups
+     , stm, tasty, tasty-golden, temporary, terminal-size, transformers
      }:
      mkDerivation {
        pname = "hermit";
-       version = "1.0.0.0";
-       sha256 = "7b66b8d8c9d1f6eb2c7e37dfc932884f299e26e80b6dad163174f428c47d6dd4";
+       version = "1.0.1";
+       sha256 = "3fac7822e9de5b081bf18a087dcd61d2eab26aa7ec6570a785aadd0c3e909249";
        revision = "1";
-       editedCabalFile = "e16afd9af9b41f5d2f1e30625045865bb315f0c8daf469a0f5b491064323060d";
+       editedCabalFile = "113c7ce268a0d0c16da03dc2f160e33bd7fe55c0f4135236477f33e44de3059c";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         ansi-terminal array base base-compat containers data-default-class
-         directory ghc haskeline kure marked-pretty mtl process stm
-         temporary terminfo transformers transformers-compat
+         ansi-terminal array base containers data-default-class directory
+         fail ghc haskeline kure marked-pretty mtl process semigroups stm
+         temporary terminal-size transformers
        ];
        libraryToolDepends = [ alex happy ];
        executableHaskellDepends = [ base ];
+       testHaskellDepends = [
+         base directory filepath ghc ghc-paths process tasty tasty-golden
+         temporary
+       ];
        description = "Haskell Equational Reasoning Model-to-Implementation Tunnel";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -100627,6 +100992,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "hesh" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, Cabal, cartel, cmdtheline
+     , containers, cryptohash, directory, filemanip, filepath
+     , hackage-db, haskell-src-exts, parsec, process, template-haskell
+     , text, time, transformers, uniplate
+     }:
+     mkDerivation {
+       pname = "hesh";
+       version = "1.0.0";
+       sha256 = "22244996bb3bd911aff18e8008454f9407034a8422ebddbe76736248e6955aab";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base filemanip parsec process template-haskell text transformers
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring Cabal cartel cmdtheline containers cryptohash
+         directory filepath hackage-db haskell-src-exts parsec process text
+         time uniplate
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/jekor/hesh";
+       description = "the Haskell Extensible Shell: Haskell for Bash-style scripts";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "hesql" = callPackage
     ({ mkDerivation, base, filepath, haskell-src, HDBC, HDBC-postgresql
      , hssqlppp, parsec
@@ -102931,7 +103322,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hjsmin" = callPackage
+  "hjsmin_0_1_5_2" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
      , HUnit, language-javascript, optparse-applicative, QuickCheck
      , test-framework, test-framework-hunit, text
@@ -102957,6 +103348,35 @@ self: {
        homepage = "http://github.com/erikd/hjsmin";
        description = "Haskell implementation of a javascript minifier";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hjsmin" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, Cabal, containers
+     , HUnit, language-javascript, optparse-applicative, QuickCheck
+     , test-framework, test-framework-hunit, text
+     }:
+     mkDerivation {
+       pname = "hjsmin";
+       version = "0.1.5.3";
+       sha256 = "5d70536206315abc8b1c2af3d32059bc65db16f95a677b8d6df6184b36f4642e";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base blaze-builder bytestring containers language-javascript text
+       ];
+       executableHaskellDepends = [
+         base blaze-builder bytestring containers language-javascript
+         optparse-applicative text
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring Cabal containers HUnit
+         language-javascript QuickCheck test-framework test-framework-hunit
+         text
+       ];
+       homepage = "http://github.com/erikd/hjsmin";
+       description = "Haskell implementation of a javascript minifier";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hjson" = callPackage
@@ -102981,6 +103401,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "hjsonpointer_0_2_0_4" = callPackage
+    ({ mkDerivation, aeson, base, http-types, HUnit, test-framework
+     , test-framework-hunit, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "hjsonpointer";
+       version = "0.2.0.4";
+       sha256 = "8ac317938cc885b01d1165f15671def24e6ceac971413bd494195e77fe0e45b0";
+       libraryHaskellDepends = [
+         aeson base text unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base http-types HUnit test-framework test-framework-hunit
+         text unordered-containers vector
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/seagreen/hjsonpointer";
+       description = "JSON Pointer library";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "hjsonpointer" = callPackage
     ({ mkDerivation, aeson, base, http-types, HUnit, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
@@ -104011,7 +104453,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hlint" = callPackage
+  "hlint_1_9_28" = callPackage
     ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
      , directory, extra, filepath, haskell-src-exts, hscolour, process
      , refact, transformers, uniplate
@@ -104031,6 +104473,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.30";
+       sha256 = "f79ff542e7e92a6972c87431ef425222d4f081a83a5a916dc2750ee83376e35e";
+       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
@@ -106701,7 +107166,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hourglass" = callPackage
+  "hourglass_0_2_9" = callPackage
     ({ mkDerivation, base, deepseq, mtl, old-locale, tasty, tasty-hunit
      , tasty-quickcheck, time
      }:
@@ -106716,6 +107181,24 @@ self: {
        homepage = "https://github.com/vincenthz/hs-hourglass";
        description = "simple performant time related library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hourglass" = callPackage
+    ({ mkDerivation, base, deepseq, mtl, old-locale, tasty, tasty-hunit
+     , tasty-quickcheck, time
+     }:
+     mkDerivation {
+       pname = "hourglass";
+       version = "0.2.10";
+       sha256 = "d553362d7a6f7df60d8ff99304aaad0995be81f9d302725ebe9441829a0f8d80";
+       libraryHaskellDepends = [ base deepseq ];
+       testHaskellDepends = [
+         base deepseq mtl old-locale tasty tasty-hunit tasty-quickcheck time
+       ];
+       homepage = "https://github.com/vincenthz/hs-hourglass";
+       description = "simple performant time related library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hourglass-fuzzy-parsing" = callPackage
@@ -106830,8 +107313,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.9.0";
-       sha256 = "8f8f40556c84e949895c50253c2d84c758ac8d452921a6e3ddd5dd6daeadc8a2";
+       version = "0.9.1";
+       sha256 = "77ebb1ce3b6ab88582a22dcdcb3fd08bd7278e5024042ce909993f2fb033c6ee";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -107083,13 +107566,13 @@ self: {
      }:
      mkDerivation {
        pname = "hpdft";
-       version = "0.1.0.1";
-       sha256 = "eef161524fb320b84fa9183c804a08bf2a3442308f226790f5b3f9c16055b5be";
+       version = "0.1.0.2";
+       sha256 = "fd302bfbb8e8632bb01d20b3232ca87006cda8c2e3ed3c33f9d0874b2f9662b7";
        libraryHaskellDepends = [
          base bytestring directory parsec text utf8-string zlib
        ];
        homepage = "https://github.com/k16shikano/hpdft";
-       description = "tools to poke pdf using haskell";
+       description = "A tool for looking through PDF file using Haskell";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -107795,8 +108278,8 @@ self: {
      }:
      mkDerivation {
        pname = "hs-duktape";
-       version = "0.1.1";
-       sha256 = "0fa193ba3ccd8e603fecf91624a2e02762f5f959370bfea829aecd245f4be906";
+       version = "0.1.2";
+       sha256 = "a735c4fd945bda52c72c2c82fbef3239c02d1897fc9ccc917f2b82917644dd23";
        libraryHaskellDepends = [
          aeson base bytestring text transformers unordered-containers vector
        ];
@@ -109053,8 +109536,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsdev";
-       version = "0.1.6.3";
-       sha256 = "57e43ec24f607dee63ebf9655b30ceafe4c80967b88a5739da806a37633221ab";
+       version = "0.1.6.6";
+       sha256 = "9b4fa60291ad1e6f2d47ec2b90fd254a2df0224a346ad3099bf047d10526d523";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -111513,8 +111996,8 @@ self: {
      }:
      mkDerivation {
        pname = "hsqml";
-       version = "0.3.3.0";
-       sha256 = "bf4eb06cbc76386158786784c4c2e29f976758c8f1cc41372b040b1484400f54";
+       version = "0.3.4.0";
+       sha256 = "12a0e7dd484ee36b793cf20b3bd42efdba67dd85b7918b26917bc6f59c6f5c69";
        libraryHaskellDepends = [
          base containers filepath tagged text transformers
        ];
@@ -111523,7 +112006,6 @@ self: {
        testHaskellDepends = [
          base containers directory QuickCheck tagged text
        ];
-       jailbreak = true;
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "Haskell binding for Qt Quick";
        license = stdenv.lib.licenses.bsd3;
@@ -111604,8 +112086,8 @@ self: {
     ({ mkDerivation, base, hsqml, OpenGL, OpenGLRaw, text }:
      mkDerivation {
        pname = "hsqml-demo-samples";
-       version = "0.3.3.0";
-       sha256 = "4cf95f075e9f2283e4adb0785dc25b0d45d8d33de3ea28ec17194d6ed816531c";
+       version = "0.3.4.0";
+       sha256 = "225fa4100ae9842f014aff0b13b0e03e95947f81e7b5ea30f98c2c47be620279";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base hsqml OpenGL OpenGLRaw text ];
@@ -111760,16 +112242,13 @@ self: {
      }) {};
 
   "hstats" = callPackage
-    ({ mkDerivation, base, haskell98 }:
+    ({ mkDerivation, base }:
      mkDerivation {
        pname = "hstats";
-       version = "0.3";
-       sha256 = "12266f4e5212f72826281346058c1667f28af8fdb5292aab4f115ca2e01b6013";
-       revision = "1";
-       editedCabalFile = "0dcd5745170aeea7a6970ad9042c1043cc073f4fe40403af5795af09f9a062bf";
-       libraryHaskellDepends = [ base haskell98 ];
-       jailbreak = true;
-       homepage = "http://github.com/unmarshal/hstats/";
+       version = "0.3.0.1";
+       sha256 = "3045b303073165a1a90bb369cd530012b625e3b7e4e815c14af9b4beecfa19a8";
+       libraryHaskellDepends = [ base ];
+       homepage = "https://github.com/haas/hstats";
        description = "Statistical Computing in Haskell";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -113908,6 +114387,29 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "http-kinder" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , containers, http-media, http-types, HUnit, QuickCheck, singletons
+     , tasty, tasty-ant-xml, tasty-hunit, tasty-quickcheck, text, time
+     , wai, wai-extra
+     }:
+     mkDerivation {
+       pname = "http-kinder";
+       version = "0.2.0.0";
+       sha256 = "333a6e8bada98a8f027107aa10bff866b838f42bd2a0b10bed3702a17329fe26";
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive containers http-media
+         http-types singletons text time
+       ];
+       testHaskellDepends = [
+         base HUnit QuickCheck tasty tasty-ant-xml tasty-hunit
+         tasty-quickcheck text wai wai-extra
+       ];
+       homepage = "http://github.com/tel/serv#readme";
+       description = "Generic kinds and types for working with HTTP";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "http-kit" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, hspec
      , http-types, QuickCheck, quickcheck-instances
@@ -114460,7 +114962,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "http2" = callPackage
+  "http2_1_4_5" = callPackage
     ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
      , bytestring-builder, containers, directory, doctest, filepath
      , Glob, hex, hspec, psqueues, stm, text, unordered-containers
@@ -114488,6 +114990,37 @@ self: {
        ];
        description = "HTTP/2.0 library including frames and HPACK";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "http2" = callPackage
+    ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring
+     , bytestring-builder, containers, directory, doctest, filepath
+     , Glob, hex, hspec, psqueues, stm, text, unordered-containers
+     , vector, word8
+     }:
+     mkDerivation {
+       pname = "http2";
+       version = "1.5.1";
+       sha256 = "3beba1a59d5c533ef58c715a3b54a069b24f81170e80d662e6267a2ad218eb5d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base bytestring bytestring-builder containers psqueues stm
+       ];
+       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
+         text unordered-containers vector word8
+       ];
+       doCheck = false;
+       description = "HTTP/2.0 library including frames and HPACK";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "httpd-shed" = callPackage
@@ -115577,6 +116110,8 @@ self: {
        pname = "hxt-pickle-utils";
        version = "0.1.0.3";
        sha256 = "9ddba19f27d9d8c155012da4dd9598fb318cab862da10f14ee4bc3eb5321a9c5";
+       revision = "1";
+       editedCabalFile = "6e5b20a313d64274a19307afe4319e236b8547ef8e611ea1da54c945e41db099";
        libraryHaskellDepends = [ base hxt mtl ];
        homepage = "https://github.com/silkapp/hxt-pickle-utils";
        description = "Utility functions for using HXT picklers";
@@ -117449,8 +117984,8 @@ self: {
      }:
      mkDerivation {
        pname = "idris";
-       version = "0.10";
-       sha256 = "5593feca2cdd00ff819f37135da496111b3af06b664f4cd1f4aecba6ac6e6a10";
+       version = "0.10.2";
+       sha256 = "797f848d073b14772e20b13507272a2bf490644e005a978423c4bf057d021d19";
        configureFlags = [ "-fcurses" "-fffi" "-fgmp" ];
        isLibrary = true;
        isExecutable = true;
@@ -117467,7 +118002,10 @@ self: {
        executableHaskellDepends = [
          base directory filepath haskeline transformers
        ];
-       jailbreak = true;
+       testHaskellDepends = [
+         base containers directory filepath haskeline process time
+         transformers
+       ];
        homepage = "http://www.idris-lang.org/";
        description = "Functional Programming Language with Dependent Types";
        license = stdenv.lib.licenses.bsd3;
@@ -119397,8 +119935,8 @@ self: {
        pname = "instant-generics";
        version = "0.5";
        sha256 = "79d7cccead455f00637a182e0639cd7b8e6ef67e054d53098064772981dd8a9c";
-       revision = "1";
-       editedCabalFile = "c69a74fef28272e5e46a0e37711bb980ac07d2f3feeed3513da1cc572a1ab6bc";
+       revision = "2";
+       editedCabalFile = "c4a76fc7f7aebe8c003c9a80a127f627724d9444bd983bcacb2613d993295017";
        libraryHaskellDepends = [ base containers syb template-haskell ];
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics";
        description = "Generic programming library with a sum of products view";
@@ -120658,14 +121196,14 @@ self: {
     ({ mkDerivation, array, attoparsec, base, base64-bytestring
      , bytestring, config-value, connection, containers
      , data-default-class, deepseq, directory, filepath, free
-     , haskell-lexer, lens, network, old-locale, regex-tdfa, split, stm
-     , text, time, tls, transformers, vty, x509, x509-store, x509-system
+     , haskell-lexer, lens, network, regex-tdfa, split, stm, text, time
+     , tls, transformers, vty, x509, x509-store, x509-system
      , x509-validation
      }:
      mkDerivation {
        pname = "irc-core";
-       version = "1.1.3";
-       sha256 = "62385b4372ea61aeb41b7e7bb808a89adf1bbbf4d9c7127a6eb019a8b75e7142";
+       version = "1.1.4";
+       sha256 = "2e2b60ec96966604d38860b58901bb2f652b801c3091c3dfeaf2d8ab745dcaa5";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -120675,8 +121213,8 @@ self: {
        executableHaskellDepends = [
          array base bytestring config-value connection containers
          data-default-class deepseq directory filepath haskell-lexer lens
-         network old-locale regex-tdfa split stm text time tls transformers
-         vty x509 x509-store x509-system x509-validation
+         network regex-tdfa split stm text time tls transformers vty x509
+         x509-store x509-system x509-validation
        ];
        homepage = "https://github.com/glguy/irc-core";
        description = "An IRC client library and text client";
@@ -122339,7 +122877,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "js-jquery" = callPackage
+  "js-jquery_1_12_0" = callPackage
     ({ mkDerivation, base, HTTP }:
      mkDerivation {
        pname = "js-jquery";
@@ -122351,6 +122889,21 @@ 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" = callPackage
+    ({ mkDerivation, base, HTTP }:
+     mkDerivation {
+       pname = "js-jquery";
+       version = "1.12.1";
+       sha256 = "df723585d61ccf2bb00f6aa8942263f96e34c89a879898319314a37239e452a1";
+       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;
      }) {};
 
   "jsaddle" = callPackage
@@ -128326,28 +128879,29 @@ self: {
      }) {};
 
   "leksah" = callPackage
-    ({ mkDerivation, array, base, binary, binary-shared, blaze-html
-     , bytestring, Cabal, conduit, containers, cpphs, deepseq, directory
-     , executable-path, filepath, ghc, ghcjs-codemirror, ghcjs-dom, gio
-     , glib, gtk3, gtksourceview3, haskell-src-exts, hlint, hslogger
-     , jsaddle, leksah-server, lens, ltk, monad-loops, mtl, network
-     , network-uri, old-time, parsec, pretty, pretty-show, QuickCheck
-     , regex-base, regex-tdfa, regex-tdfa-text, shakespeare, stm, strict
-     , text, time, transformers, unix, utf8-string, vado, vcsgui
-     , vcswrapper, webkitgtk3, webkitgtk3-javascriptcore
+    ({ mkDerivation, array, base, base-compat, binary, binary-shared
+     , blaze-html, bytestring, Cabal, conduit, containers, cpphs
+     , deepseq, directory, executable-path, filepath, ghc
+     , ghcjs-codemirror, ghcjs-dom, gio, glib, gtk3, gtksourceview3
+     , haskell-src-exts, hlint, hslogger, jsaddle, leksah-server, lens
+     , ltk, monad-loops, mtl, network, network-uri, old-time, parsec
+     , pretty, pretty-show, QuickCheck, regex-base, regex-tdfa
+     , regex-tdfa-text, shakespeare, stm, strict, text, time
+     , transformers, unix, utf8-string, vado, vcsgui, vcswrapper
+     , webkitgtk3, webkitgtk3-javascriptcore
      }:
      mkDerivation {
        pname = "leksah";
-       version = "0.15.1.4";
-       sha256 = "85f60091febd593f996c90cb9fa0e2f2dd1bff1f18a443244be1111540ea30ad";
+       version = "0.15.2.0";
+       sha256 = "44be854eb7091fb383ddfbf497772d9a9b27c033a4e9ba9994c6a9b36d4e9606";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         array base binary binary-shared blaze-html bytestring Cabal conduit
-         containers cpphs deepseq directory executable-path filepath ghc
-         ghcjs-codemirror gio glib gtk3 gtksourceview3 haskell-src-exts
-         hlint hslogger jsaddle leksah-server lens ltk mtl network
-         network-uri old-time parsec pretty pretty-show QuickCheck
+         array base base-compat binary binary-shared blaze-html bytestring
+         Cabal conduit containers cpphs deepseq directory executable-path
+         filepath ghc ghcjs-codemirror gio glib gtk3 gtksourceview3
+         haskell-src-exts hlint hslogger jsaddle leksah-server lens ltk mtl
+         network network-uri old-time parsec pretty pretty-show QuickCheck
          regex-base regex-tdfa regex-tdfa-text shakespeare stm strict text
          time transformers unix utf8-string vado vcsgui vcswrapper
          webkitgtk3 webkitgtk3-javascriptcore
@@ -128361,45 +128915,43 @@ self: {
          leksah-server ltk monad-loops QuickCheck stm text transformers
          webkitgtk3
        ];
-       jailbreak = true;
        homepage = "http://www.leksah.org";
        description = "Haskell IDE written in Haskell";
        license = "GPL";
      }) {};
 
   "leksah-server" = callPackage
-    ({ mkDerivation, attoparsec, attoparsec-conduit, base
-     , bin-package-db, binary, binary-shared, bytestring, Cabal, conduit
-     , conduit-extra, containers, deepseq, directory, executable-path
-     , filepath, ghc, haddock-api, haddock-library, hslogger, HTTP
-     , HUnit, ltk, network, network-uri, parsec, pretty, process
-     , resourcet, strict, text, time, transformers, unix
+    ({ mkDerivation, attoparsec, base, bin-package-db, binary
+     , binary-shared, bytestring, Cabal, conduit, conduit-extra
+     , containers, deepseq, directory, executable-path, filepath, ghc
+     , haddock-api, haddock-library, hslogger, HTTP, HUnit, ltk, network
+     , network-uri, parsec, pretty, process, resourcet, strict, text
+     , time, transformers, unix
      }:
      mkDerivation {
        pname = "leksah-server";
-       version = "0.15.0.9";
-       sha256 = "78f2ee49b1a06fa12de242a35a9eeaaf3e8b90d7af8bffef3e1b20561826abe5";
+       version = "0.15.2.0";
+       sha256 = "62a6a781f60822273592f34b08da46afba214a337befb92764a08f54e2355241";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         attoparsec attoparsec-conduit base bin-package-db binary
-         binary-shared bytestring Cabal conduit conduit-extra containers
-         deepseq directory executable-path filepath ghc haddock-api
-         haddock-library hslogger HTTP ltk network network-uri parsec pretty
-         process resourcet strict text time transformers unix
+         attoparsec base bin-package-db binary binary-shared bytestring
+         Cabal conduit conduit-extra containers deepseq directory
+         executable-path filepath ghc haddock-api haddock-library hslogger
+         HTTP ltk network network-uri parsec pretty process resourcet strict
+         text time transformers unix
        ];
        executableHaskellDepends = [
-         attoparsec attoparsec-conduit base bin-package-db binary
-         binary-shared bytestring Cabal conduit conduit-extra containers
-         deepseq directory executable-path filepath ghc haddock-api
-         haddock-library hslogger HTTP ltk network network-uri parsec pretty
-         process resourcet strict text time transformers unix
+         attoparsec base bin-package-db binary binary-shared bytestring
+         Cabal conduit conduit-extra containers deepseq directory
+         executable-path filepath ghc haddock-api haddock-library hslogger
+         HTTP ltk network network-uri parsec pretty process resourcet strict
+         text time transformers unix
        ];
        testHaskellDepends = [
          base conduit conduit-extra hslogger HUnit process resourcet
          transformers
        ];
-       jailbreak = true;
        homepage = "http://leksah.org";
        description = "Metadata collection for leksah";
        license = "GPL";
@@ -128573,7 +129125,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lens_4_13_2" = callPackage
+  "lens_4_13_2_1" = callPackage
     ({ mkDerivation, array, base, base-orphans, bifunctors, bytestring
      , comonad, containers, contravariant, deepseq, directory
      , distributive, doctest, exceptions, filepath, free
@@ -128586,8 +129138,8 @@ self: {
      }:
      mkDerivation {
        pname = "lens";
-       version = "4.13.2";
-       sha256 = "814b7b35949cc8a3ad1a35fc39b88fc3b78bbfb339097f3f3438627048155b78";
+       version = "4.13.2.1";
+       sha256 = "d48509a066f864c3c6a8944117e788bab80587d40b1799600c99da389ee249b6";
        libraryHaskellDepends = [
          array base base-orphans bifunctors bytestring comonad containers
          contravariant distributive exceptions filepath free ghc-prim
@@ -128986,7 +129538,7 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "lentil" = callPackage
+  "lentil_0_1_9_0" = callPackage
     ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip
      , filepath, hspec, natural-sort, optparse-applicative, parsec
      , regex-tdfa
@@ -129008,6 +129560,31 @@ self: {
        homepage = "http://www.ariis.it/static/articles/lentil/page.html";
        description = "frugal issue tracker";
        license = stdenv.lib.licenses.gpl3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "lentil" = callPackage
+    ({ mkDerivation, ansi-wl-pprint, base, csv, directory, filemanip
+     , filepath, hspec, natural-sort, optparse-applicative, parsec
+     , regex-tdfa
+     }:
+     mkDerivation {
+       pname = "lentil";
+       version = "0.1.10.0";
+       sha256 = "caa32b2530415588e711df778394ea11f030a9829095013748b282c814cb1a25";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         ansi-wl-pprint base csv directory filemanip filepath natural-sort
+         optparse-applicative parsec regex-tdfa
+       ];
+       testHaskellDepends = [
+         ansi-wl-pprint base csv directory filemanip filepath hspec
+         natural-sort optparse-applicative parsec regex-tdfa
+       ];
+       homepage = "http://www.ariis.it/static/articles/lentil/page.html";
+       description = "frugal issue tracker";
+       license = stdenv.lib.licenses.gpl3;
      }) {};
 
   "lenz" = callPackage
@@ -129541,12 +130118,12 @@ self: {
      }:
      mkDerivation {
        pname = "libjenkins";
-       version = "0.8.2";
-       sha256 = "206f7e82ee6496f408347dc0828aea8018b0e7269cae02fcfa7504c750f79ec9";
+       version = "0.8.3";
+       sha256 = "939379ae30f65d20d524d5735d6b6ec86b91ce295c64e089b1097161da1067cc";
        libraryHaskellDepends = [
          async attoparsec base bytestring conduit containers free
          http-client http-conduit http-types monad-control mtl network
-         network-uri profunctors resourcet text transformers
+         network-uri profunctors resourcet text
        ];
        testHaskellDepends = [
          async attoparsec base bytestring conduit containers directory
@@ -129902,6 +130479,17 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "libxls" = callPackage
+    ({ mkDerivation, base, bindings-DSL }:
+     mkDerivation {
+       pname = "libxls";
+       version = "0.2";
+       sha256 = "c6c1185ffd7981c459cd785b0ff3ad40b868a1d6cbf8eb8bd106ec2374aa740e";
+       libraryHaskellDepends = [ base bindings-DSL ];
+       description = "Bindings to libxls";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "libxml" = callPackage
     ({ mkDerivation, base, bytestring, libxml2, mtl }:
      mkDerivation {
@@ -131549,7 +132137,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "list-t" = callPackage
+  "list-t_0_4_6" = callPackage
     ({ mkDerivation, base-prelude, HTF, mmorph, monad-control, mtl
      , mtl-prelude, transformers, transformers-base
      }:
@@ -131566,6 +132154,26 @@ self: {
        homepage = "https://github.com/nikita-volkov/list-t";
        description = "ListT done right";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "list-t" = callPackage
+    ({ mkDerivation, base-prelude, HTF, mmorph, monad-control, mtl
+     , mtl-prelude, transformers, transformers-base
+     }:
+     mkDerivation {
+       pname = "list-t";
+       version = "0.4.6.1";
+       sha256 = "78c9cc7da0593571d4f0724df197ad23b467677573e1ac2714fd8fc6d7d1c00f";
+       libraryHaskellDepends = [
+         base-prelude mmorph monad-control mtl transformers
+         transformers-base
+       ];
+       testHaskellDepends = [ base-prelude HTF mmorph mtl-prelude ];
+       doCheck = false;
+       homepage = "https://github.com/nikita-volkov/list-t";
+       description = "ListT done right";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "list-t-attoparsec" = callPackage
@@ -132771,7 +133379,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "logging-facade" = callPackage
+  "logging-facade_0_1_0" = callPackage
     ({ mkDerivation, base, hspec, template-haskell, transformers }:
      mkDerivation {
        pname = "logging-facade";
@@ -132781,6 +133389,19 @@ self: {
        testHaskellDepends = [ base hspec ];
        description = "Simple logging abstraction that allows multiple back-ends";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "logging-facade" = callPackage
+    ({ mkDerivation, base, hspec, template-haskell, transformers }:
+     mkDerivation {
+       pname = "logging-facade";
+       version = "0.1.1";
+       sha256 = "60f9f29d54e9756825400f281101872ed87de55271e87571068838a7b3d98da2";
+       libraryHaskellDepends = [ base template-haskell transformers ];
+       testHaskellDepends = [ base hspec ];
+       description = "Simple logging abstraction that allows multiple back-ends";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "logging-facade-journald" = callPackage
@@ -132872,8 +133493,8 @@ self: {
     ({ mkDerivation, base, logict, mtl, transformers }:
      mkDerivation {
        pname = "logict-state";
-       version = "0.1.0.0";
-       sha256 = "8b4ac063ffada947bfb853c5a4f9e144ad7aba0dbc1e3be3d662a83c19450ad8";
+       version = "0.1.0.1";
+       sha256 = "0d312387a11fab6441258732cfcb59bd12ac72471fd1379877f6da1928c60cbe";
        libraryHaskellDepends = [ base logict mtl transformers ];
        homepage = "https://github.com/atzedijkstra/logict-state";
        description = "Library for logic programming based on haskell package logict";
@@ -133436,8 +134057,8 @@ self: {
      }:
      mkDerivation {
        pname = "ltk";
-       version = "0.15.0.4";
-       sha256 = "6d39540a1aa73516d9390d8d49f1f9b8ec5f9cf15bede8cd51a25810ec345193";
+       version = "0.15.0.5";
+       sha256 = "44101ce43336e9746e295c14beda5cae1d2d4a9c67ca7d5ed1d51a90b3d8d1a2";
        libraryHaskellDepends = [
          base Cabal containers filepath ghc glib gtk3 mtl parsec pretty text
          transformers
@@ -133784,8 +134405,8 @@ self: {
      }:
      mkDerivation {
        pname = "luminance";
-       version = "0.10.0.2";
-       sha256 = "1892608cde96e81a748c608118f380e8b125f3653af1d743a9ee6ee9a8adb46e";
+       version = "0.11";
+       sha256 = "d29c8b29daba5fc5f563cac7c1ac32f876338ff62f3012bc18ed966d35a36378";
        libraryHaskellDepends = [
          base containers contravariant dlist gl linear mtl resourcet
          semigroups transformers vector void
@@ -133843,8 +134464,8 @@ self: {
      }:
      mkDerivation {
        pname = "luminance-samples";
-       version = "0.10";
-       sha256 = "c3f0fec69567be8d32c7a913c4dd9241908666447bfc492cdd24810d4b245d2a";
+       version = "0.11";
+       sha256 = "78fbff7bd81b35cbfd8a66d3cb1e88fe3598266cfb3ab9364af6b77f8f2e78f9";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -136844,7 +137465,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "megaparsec" = callPackage
+  "megaparsec_4_3_0" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, mtl, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , text, transformers
@@ -136863,9 +137484,10 @@ self: {
        homepage = "https://github.com/mrkkrp/megaparsec";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "megaparsec_4_4_0" = callPackage
+  "megaparsec" = callPackage
     ({ mkDerivation, base, bytestring, fail, HUnit, mtl, QuickCheck
      , semigroups, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text, transformers
@@ -136881,11 +137503,9 @@ self: {
          base HUnit mtl QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 transformers
        ];
-       jailbreak = true;
        homepage = "https://github.com/mrkkrp/megaparsec";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "meldable-heap" = callPackage
@@ -136929,10 +137549,8 @@ self: {
      }:
      mkDerivation {
        pname = "memcache";
-       version = "0.1.0.0";
-       sha256 = "a592a3c154c8d64fb0e4335d13e8362e75a53fe3bbea8cc44f57802a00e254f4";
-       revision = "1";
-       editedCabalFile = "6e2508fa18aae99fee1c0aa41cc86e97d73ff504647b5265e54adf3566ca81e7";
+       version = "0.1.0.1";
+       sha256 = "d5394f0c6beaa8fff82de230c751d930426cce49a53bff841adc09c6c382140a";
        libraryHaskellDepends = [
          base binary blaze-builder bytestring hashable network resource-pool
          time vector vector-algorithms
@@ -138024,8 +138642,8 @@ self: {
      }:
      mkDerivation {
        pname = "mida";
-       version = "1.0.0";
-       sha256 = "3fff0b1ce7fcbe948b7ec3f20868cdd7f8737c7eec1355355e0a13bb2fb340e4";
+       version = "1.0.1";
+       sha256 = "97e76f04d0bad25eefc19fdb7df6f53ce351918fc52815bf9a163417b730b859";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -142739,8 +143357,8 @@ self: {
      }:
      mkDerivation {
        pname = "multiaddr";
-       version = "0.2.0";
-       sha256 = "fd8537d3598b92cd662efe6a41554aa88e8bb8f74fff6c1be1df65745d66c46d";
+       version = "0.3.0";
+       sha256 = "0ac61e1b1cf1fc03c371f03481952ef5851d7843c9a7a5a0b182f12fc72cca4c";
        libraryHaskellDepends = [
          attoparsec base base58-bytestring bytestring cereal errors hashable
          text
@@ -143717,6 +144335,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2 vector
        ];
        jailbreak = true;
+       doCheck = false;
        homepage = "https://github.com/bos/mwc-random";
        description = "Fast, high quality pseudo random number generation";
        license = stdenv.lib.licenses.bsd3;
@@ -143740,13 +144359,14 @@ self: {
          test-framework-hunit test-framework-quickcheck2 vector
        ];
        jailbreak = true;
+       doCheck = false;
        homepage = "https://github.com/bos/mwc-random";
        description = "Fast, high quality pseudo random number generation";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mwc-random" = callPackage
+  "mwc-random_0_13_3_2" = callPackage
     ({ mkDerivation, base, HUnit, primitive, QuickCheck, statistics
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , time, vector
@@ -143760,12 +144380,14 @@ self: {
          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";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "mwc-random_0_13_4_0" = callPackage
+  "mwc-random" = callPackage
     ({ mkDerivation, base, HUnit, primitive, QuickCheck, statistics
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , time, vector
@@ -143779,10 +144401,10 @@ self: {
          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";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mwc-random-monad" = callPackage
@@ -146578,6 +147200,7 @@ self: {
          base network network-transport network-transport-tests
        ];
        doHaddock = false;
+       jailbreak = true;
        doCheck = false;
        homepage = "http://haskell-distributed.github.com";
        description = "TCP instantiation of Network.Transport";
@@ -146585,7 +147208,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "network-transport-tcp" = callPackage
+  "network-transport-tcp_0_4_2" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-accessor
      , network, network-transport, network-transport-tests
      }:
@@ -146599,13 +147222,15 @@ self: {
        testHaskellDepends = [
          base network network-transport network-transport-tests
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "http://haskell-distributed.github.com";
        description = "TCP instantiation of Network.Transport";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "network-transport-tcp_0_5_1" = callPackage
+  "network-transport-tcp" = callPackage
     ({ mkDerivation, base, bytestring, containers, data-accessor
      , network, network-transport, network-transport-tests
      }:
@@ -146619,10 +147244,10 @@ self: {
        testHaskellDepends = [
          base network network-transport network-transport-tests
        ];
+       doCheck = false;
        homepage = "http://haskell-distributed.github.com";
        description = "TCP instantiation of Network.Transport";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-transport-tests_0_2_1_0" = callPackage
@@ -147141,6 +147766,18 @@ self: {
        hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
+  "nist-beacon" = callPackage
+    ({ mkDerivation, base, bytestring, http-conduit, xml }:
+     mkDerivation {
+       pname = "nist-beacon";
+       version = "0.1.0.1";
+       sha256 = "00aeb52bcda5e0f3cd3519857d96af3697ca45cee87ee3cc7b521a282f4579e4";
+       libraryHaskellDepends = [ base bytestring http-conduit xml ];
+       homepage = "https://github.com/bstamour/haskell-nist-beacon";
+       description = "Haskell interface to the nist random beacon";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "nitro" = callPackage
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
@@ -148424,24 +149061,25 @@ self: {
      }) {};
 
   "octane" = callPackage
-    ({ mkDerivation, base, binary, bytestring, containers
+    ({ mkDerivation, base, binary, binary-bits, bytestring, containers
      , data-binary-ieee754, deepseq, tasty, tasty-hspec, text
      }:
      mkDerivation {
        pname = "octane";
-       version = "0.4.0";
-       sha256 = "577f5a867e6ae3eabf00a77661bba48f5386908734728fc91e24d01e9fdd83d0";
+       version = "0.4.1";
+       sha256 = "52792d83198460ebf8de89cbd2b6d0519708a7358c936b09c0b698886d7e5496";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         base binary bytestring containers data-binary-ieee754 deepseq text
+         base binary binary-bits bytestring containers data-binary-ieee754
+         deepseq text
        ];
        executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         base binary bytestring containers tasty tasty-hspec
+         base binary binary-bits bytestring containers tasty tasty-hspec
        ];
-       homepage = "https://github.com/tfausak/octane";
-       description = "A Rocket League replay parser";
+       homepage = "https://github.com/tfausak/octane#readme";
+       description = "Parse Rocket League replays";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -148520,6 +149158,22 @@ self: {
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXinerama; 
          inherit (pkgs) mesa; ovr = null; inherit (pkgs) systemd;};
 
+  "oden-go-packages" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, text
+     , unordered-containers
+     }:
+     mkDerivation {
+       pname = "oden-go-packages";
+       version = "0.1.0.3";
+       sha256 = "88d777451618822e9d754983da4a93705077a9136aba10187ca4e457e36e1989";
+       libraryHaskellDepends = [
+         aeson base bytestring containers text unordered-containers
+       ];
+       homepage = "http://oden-lang.org";
+       description = "Provides Go package metadata";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "oeis" = callPackage
     ({ mkDerivation, base, HTTP, HUnit, network, network-uri
      , test-framework, test-framework-hunit
@@ -148591,8 +149245,8 @@ self: {
     ({ mkDerivation, base, comonad, directory, filepath, parallel }:
      mkDerivation {
        pname = "oi";
-       version = "0.4.0";
-       sha256 = "2757014767b21d1938d8acaa4742514457482aa52c47b5fea4ba9e72ea810e32";
+       version = "0.4.0.1";
+       sha256 = "b010502da66dbefca57630b05cfe5827363ec2a79c2da634027213bb2b760e3d";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -149098,8 +149752,8 @@ self: {
        pname = "opaleye";
        version = "0.4.2.0";
        sha256 = "b924c4d0fa7151c0dbaee5ddcd89adfa569614204a805392625752ea6dc13c20";
-       revision = "2";
-       editedCabalFile = "bf554e82c1ac3c72f9df13494052197f0e8f131d0f44487073443a180c51395a";
+       revision = "3";
+       editedCabalFile = "2d6a584a46565934f8408c72aaa3cd469d190799b8d071775b7190326c4c9e5e";
        libraryHaskellDepends = [
          aeson attoparsec base base16-bytestring bytestring case-insensitive
          contravariant postgresql-simple pretty product-profunctors
@@ -149179,6 +149833,7 @@ self: {
        executableHaskellDepends = [
          base opaleye postgresql-simple product-profunctors
        ];
+       jailbreak = true;
        homepage = "https://github.com/tomjaguarpaw/haskell-opaleye";
        description = "A monad transformer for Opaleye";
        license = stdenv.lib.licenses.bsd3;
@@ -149913,7 +150568,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "opml-conduit" = callPackage
+  "opml-conduit_0_4_0_1" = callPackage
     ({ mkDerivation, base, bytestring, case-insensitive, conduit
      , conduit-combinators, conduit-parse, containers, data-default
      , exceptions, foldl, hlint, lens-simple, mono-traversable
@@ -149940,6 +150595,38 @@ self: {
          uri-bytestring xml-conduit-parse
        ];
        homepage = "https://github.com/k0ral/opml-conduit";
+       description = "Streaming parser/renderer for the OPML 2.0 format.";
+       license = "unknown";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "opml-conduit" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, conduit
+     , conduit-combinators, conduit-parse, containers, data-default
+     , exceptions, foldl, hlint, lens-simple, mono-traversable
+     , monoid-subclasses, mtl, parsers, QuickCheck, quickcheck-instances
+     , resourcet, semigroups, tasty, tasty-hunit, tasty-quickcheck, text
+     , time, timerep, uri-bytestring, xml-conduit, xml-conduit-parse
+     , xml-types
+     }:
+     mkDerivation {
+       pname = "opml-conduit";
+       version = "0.5.0.0";
+       sha256 = "de0792b940ff5337b0912842a51478a8bdb030bf916d9b97236a1253b89866a9";
+       libraryHaskellDepends = [
+         base case-insensitive conduit conduit-parse containers exceptions
+         foldl lens-simple mono-traversable monoid-subclasses parsers
+         semigroups text time timerep uri-bytestring xml-conduit
+         xml-conduit-parse xml-types
+       ];
+       testHaskellDepends = [
+         base bytestring conduit conduit-combinators conduit-parse
+         containers data-default exceptions hlint lens-simple
+         mono-traversable mtl parsers QuickCheck quickcheck-instances
+         resourcet semigroups tasty tasty-hunit tasty-quickcheck text time
+         uri-bytestring xml-conduit-parse
+       ];
+       homepage = "https://github.com/k0ral/opml-conduit";
        description = "Streaming parser/renderer for the OPML 2.0 format";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
@@ -150222,6 +150909,21 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "optparse-generic" = callPackage
+    ({ mkDerivation, base, optparse-applicative, system-filepath, text
+     , transformers, void
+     }:
+     mkDerivation {
+       pname = "optparse-generic";
+       version = "1.0.0";
+       sha256 = "6e049b88706c35dca3d4b021fae26c664d46ef888a910647f269b851b3a59053";
+       libraryHaskellDepends = [
+         base optparse-applicative system-filepath text transformers void
+       ];
+       description = "Auto-generate a command-line parser for your datatype";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "optparse-simple_0_0_2" = callPackage
     ({ mkDerivation, base, either, gitrev, optparse-applicative
      , template-haskell, transformers
@@ -151842,8 +152544,8 @@ self: {
      }:
      mkDerivation {
        pname = "pandoc-citeproc-preamble";
-       version = "1.0.0";
-       sha256 = "1afb34f7aa93a22ab389ae934259a4bcc408708ee74676001eb6c89d5eef7be9";
+       version = "1.1.0";
+       sha256 = "2200bed5ca32cb6fd74b53dec3e913c0298ada8434154f97c34991a1e9fe568f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -153297,6 +153999,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "path-io_1_0_1" = callPackage
+    ({ mkDerivation, base, directory, exceptions, filepath, hspec, path
+     , temporary, time, transformers
+     }:
+     mkDerivation {
+       pname = "path-io";
+       version = "1.0.1";
+       sha256 = "92e4763c88c21d46d009baedb14eb724699b583bc6675b4513bb35186f421336";
+       libraryHaskellDepends = [
+         base directory exceptions filepath path temporary time transformers
+       ];
+       testHaskellDepends = [ base exceptions hspec path ];
+       jailbreak = true;
+       homepage = "https://github.com/mrkkrp/path-io";
+       description = "Interface to ‘directory’ package for users of ‘path’";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "path-pieces_0_1_4" = callPackage
     ({ mkDerivation, base, hspec, HUnit, QuickCheck, text, time }:
      mkDerivation {
@@ -156974,8 +157695,8 @@ self: {
      }:
      mkDerivation {
        pname = "pinchot";
-       version = "0.10.0.0";
-       sha256 = "59a9e3b5e5eb323b11fba24d90d7f371e22653d46bf7a31b9676220a0e78a797";
+       version = "0.12.0.0";
+       sha256 = "5fbbb77f122dbb51fac0004b607b486e317df08b17dfcaccb8dd7d300f4980de";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -157364,7 +158085,23 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pipes-cacophony" = callPackage
+  "pipes-bzip" = callPackage
+    ({ mkDerivation, base, bytestring, bzlib, pipes, pipes-bytestring
+     }:
+     mkDerivation {
+       pname = "pipes-bzip";
+       version = "0.1.0.0";
+       sha256 = "c294c8bad74a68a4cc31d613c9d6e0fd1ee4e57f6b69567f9760bf2ce1291c0d";
+       libraryHaskellDepends = [
+         base bytestring bzlib pipes pipes-bytestring
+       ];
+       testHaskellDepends = [ base ];
+       homepage = "http://github.com/chemist/pipes-bzip#readme";
+       description = "Bzip2 compression and decompression for Pipes streams";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "pipes-cacophony_0_1_3" = callPackage
     ({ mkDerivation, async, base, bytestring, cacophony, hlint, mtl
      , pipes, QuickCheck, tasty, tasty-quickcheck
      }:
@@ -157382,6 +158119,22 @@ self: {
        homepage = "https://github.com/centromere/pipes-cacophony";
        description = "Pipes for Noise-secured network connections";
        license = stdenv.lib.licenses.publicDomain;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "pipes-cacophony" = callPackage
+    ({ mkDerivation, base, bytestring, cacophony, hlint, pipes }:
+     mkDerivation {
+       pname = "pipes-cacophony";
+       version = "0.2.0";
+       sha256 = "1e6e6469df152cd540c4cee20cb5e82975f6c069a35931a0ebfc4bd3b5fb53be";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base bytestring cacophony pipes ];
+       testHaskellDepends = [ base hlint ];
+       homepage = "https://github.com/centromere/pipes-cacophony";
+       description = "Pipes for Noise-secured network connections";
+       license = stdenv.lib.licenses.publicDomain;
      }) {};
 
   "pipes-cellular" = callPackage
@@ -157753,6 +158506,31 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "pipes-key-value-csv" = callPackage
+    ({ mkDerivation, base, containers, contravariant
+     , data-default-class, lens, mtl, pipes, pipes-bytestring
+     , pipes-group, pipes-parse, pipes-safe, pipes-text, QuickCheck
+     , reflection, text, transformers, validation, vinyl, vinyl-utils
+     }:
+     mkDerivation {
+       pname = "pipes-key-value-csv";
+       version = "0.0.0.0";
+       sha256 = "5a6f09f41031bd66ceca26fed08c51784610b1c586d064a0e76d83cf8dd780c5";
+       libraryHaskellDepends = [
+         base containers data-default-class lens mtl pipes pipes-bytestring
+         pipes-group pipes-parse pipes-safe pipes-text reflection text
+         validation vinyl vinyl-utils
+       ];
+       testHaskellDepends = [
+         base contravariant data-default-class lens pipes pipes-text
+         QuickCheck reflection text transformers validation vinyl
+         vinyl-utils
+       ];
+       homepage = "https://github.com/marcinmrotek/key-value-csv";
+       description = "Streaming processing of CSV files preceded by key-value pairs";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "pipes-mongodb" = callPackage
     ({ mkDerivation, base, monad-control, mongoDB, pipes, text }:
      mkDerivation {
@@ -158362,6 +159140,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "plan-b_0_2_0" = callPackage
+    ({ mkDerivation, base, exceptions, hspec, path, path-io
+     , transformers
+     }:
+     mkDerivation {
+       pname = "plan-b";
+       version = "0.2.0";
+       sha256 = "f1654b249a0ee36a5a6ed1a85d2ab4641405d9b28ebe57ded594b7c65180c769";
+       libraryHaskellDepends = [
+         base exceptions path path-io transformers
+       ];
+       testHaskellDepends = [ base hspec path path-io ];
+       jailbreak = true;
+       homepage = "https://github.com/mrkkrp/plan-b";
+       description = "Failure-tolerant file and directory editing";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "planar-graph" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
      , containers, data-clist, deepseq
@@ -161352,6 +162149,18 @@ self: {
        license = "GPL";
      }) {};
 
+  "pretty-compact_2_0" = callPackage
+    ({ mkDerivation, base, containers }:
+     mkDerivation {
+       pname = "pretty-compact";
+       version = "2.0";
+       sha256 = "13b00817990086961672dc73818aa89bb9690a2ea0866399990f97b088e8de26";
+       libraryHaskellDepends = [ base containers ];
+       description = "Pretty-printing library";
+       license = "GPL";
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "pretty-error" = callPackage
     ({ mkDerivation, base, basic-prelude, bytestring, pretty-show }:
      mkDerivation {
@@ -162198,7 +163007,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "product-profunctors" = callPackage
+  "product-profunctors_0_6_3_1" = callPackage
     ({ mkDerivation, base, contravariant, profunctors, template-haskell
      }:
      mkDerivation {
@@ -162214,6 +163023,23 @@ self: {
        homepage = "https://github.com/tomjaguarpaw/product-profunctors";
        description = "product-profunctors";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "product-profunctors" = callPackage
+    ({ mkDerivation, base, contravariant, profunctors, template-haskell
+     }:
+     mkDerivation {
+       pname = "product-profunctors";
+       version = "0.7.0.2";
+       sha256 = "3b74f8e72f5ed924802fe197e4688c1f96c52d58fb84bf40a31d9a56bd8846c1";
+       libraryHaskellDepends = [
+         base contravariant profunctors template-haskell
+       ];
+       testHaskellDepends = [ base profunctors ];
+       homepage = "https://github.com/tomjaguarpaw/product-profunctors";
+       description = "product-profunctors";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "prof2dot" = callPackage
@@ -162697,8 +163523,8 @@ self: {
      }:
      mkDerivation {
        pname = "propellor";
-       version = "2.15.4";
-       sha256 = "1113810f1cd23c8d84b61bdd783359ec51000d030b6c25892548447f1e0edeb5";
+       version = "2.16.0";
+       sha256 = "d3779d3b521f7cbf015352a974f66d85f67a652a7a5d6c4b8819a6e9d77d5ee7";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -163402,8 +164228,8 @@ self: {
     ({ mkDerivation, base, filepath, hspec, template-haskell }:
      mkDerivation {
        pname = "publicsuffix";
-       version = "0.20160209";
-       sha256 = "60d856fc6d6d82ff96d742e253ecf638f625c4693b7d8be250501e9f334a2246";
+       version = "0.20160223";
+       sha256 = "7e14ff029a010b45aebb8343559df27640ea123ac15fca6d7eff28ef273f9ab0";
        libraryHaskellDepends = [ base filepath template-haskell ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/wereHamster/publicsuffix-haskell/";
@@ -166190,6 +167016,7 @@ self: {
        testHaskellDepends = [
          base HUnit test-framework test-framework-hunit
        ];
+       doCheck = false;
        homepage = "http://haskell-distributed.github.com";
        description = "Like Data.Dynamic/Data.Typeable but with support for rank-1 polymorphic types";
        license = stdenv.lib.licenses.bsd3;
@@ -166343,6 +167170,41 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ratel" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , containers, http-client, http-client-tls, http-types, tasty
+     , tasty-hspec, text, uuid
+     }:
+     mkDerivation {
+       pname = "ratel";
+       version = "0.1.0";
+       sha256 = "f8e5fb6d8cf3840b67bde9ceda4768405f50dcc3c1f60b003ae42332ffc6f735";
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive containers http-client
+         http-client-tls http-types text uuid
+       ];
+       testHaskellDepends = [ base tasty tasty-hspec ];
+       homepage = "https://github.com/tfausak/ratel#readme";
+       description = "Notify Honeybadger about exceptions";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
+  "ratel-wai" = callPackage
+    ({ mkDerivation, base, bytestring, case-insensitive, containers
+     , http-client, ratel, wai
+     }:
+     mkDerivation {
+       pname = "ratel-wai";
+       version = "0.1.0";
+       sha256 = "3047004b1953bd0a7d1132144fd1aa13870ed9736c965ebf1b4f706e3202b429";
+       libraryHaskellDepends = [
+         base bytestring case-insensitive containers http-client ratel wai
+       ];
+       homepage = "https://github.com/tfausak/ratel-wai#readme";
+       description = "Notify Honeybadger about exceptions via a WAI middleware";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "ratio-int" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -168931,8 +169793,8 @@ self: {
      }:
      mkDerivation {
        pname = "relational-query";
-       version = "0.8.0.5";
-       sha256 = "1dae8b11ade66c4be1f1755fdef7483ba569f1eb900176cd96bc48d1f904cbd7";
+       version = "0.8.1.0";
+       sha256 = "9b84f39179751df082ad6706f388aa6cb340f000b6a01f8fae11138f9527fa62";
        libraryHaskellDepends = [
          array base bytestring containers dlist names-th persistable-record
          sql-words template-haskell text time time-locale-compat
@@ -169217,14 +170079,14 @@ self: {
      }) {};
 
   "renderable" = callPackage
-    ({ mkDerivation, base, containers, hashable }:
+    ({ mkDerivation, base, containers, hashable, transformers }:
      mkDerivation {
        pname = "renderable";
-       version = "0.1.0.0";
-       sha256 = "ca6b9f6b724b5e94b3d01d0848dbbbb7e8084ed5e0701a32c38ea08b02b45df5";
-       libraryHaskellDepends = [ base containers hashable ];
-       homepage = "http://zyghost.com";
-       description = "Provides a nice API for rendering data types that change over time";
+       version = "0.2.0.0";
+       sha256 = "8ba7f9e6f0cb9aa0b9b7e38b0280b41191d3f0303c94f44d40d60a6fca0c18f3";
+       libraryHaskellDepends = [ base containers hashable transformers ];
+       homepage = "https://github.com/schell/renderable";
+       description = "An API for managing renderable resources";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -172608,8 +173470,8 @@ self: {
      }:
      mkDerivation {
        pname = "roller";
-       version = "0.1.6";
-       sha256 = "47d5308161cf067474f8e65f73ad7292a777d4749f5132dd92daf3d7fb43bdb3";
+       version = "0.1.7";
+       sha256 = "eab7c05dd749e4953ef50ef12163ad36eba5aa131b7f9a340104de8afb40f193";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -176169,8 +177031,8 @@ self: {
      }:
      mkDerivation {
        pname = "second-transfer";
-       version = "0.10.0.2";
-       sha256 = "9a0a8851a4d12e2d7b1f84bb7af19a9118c206c24b65d06500f10ea718e88828";
+       version = "0.10.0.4";
+       sha256 = "00c5774b711f76530be05bd757249e944e61bda8292d10ee3ec463b9423ef801";
        libraryHaskellDepends = [
          attoparsec base base16-bytestring binary BoundedChan bytestring
          clock conduit containers deepseq exceptions hashable hashtables
@@ -176183,7 +177045,7 @@ self: {
          lens network network-uri stm text transformers unordered-containers
        ];
        testToolDepends = [ cpphs ];
-       doCheck = false;
+       jailbreak = true;
        homepage = "https://www.httptwo.com/second-transfer/";
        description = "Second Transfer HTTP/2 web server";
        license = stdenv.lib.licenses.bsd3;
@@ -177262,28 +178124,41 @@ self: {
      }) {};
 
   "serv" = callPackage
-    ({ mkDerivation, aeson, base, bytestring, case-insensitive
-     , containers, http-media, http-types, HUnit, mtl, QuickCheck
-     , tagged, tasty, tasty-ant-xml, tasty-hunit, tasty-quickcheck, text
-     , time, transformers, wai, wai-extra, warp
-     }:
+    ({ mkDerivation, base, containers, http-kinder, singletons, text }:
      mkDerivation {
        pname = "serv";
-       version = "0.1.0.0";
-       sha256 = "29d8124bcd00ae8ed28a37b6b7bcffa333cf4c30b845c9da725c71153274b371";
-       isLibrary = true;
-       isExecutable = true;
+       version = "0.2.0.0";
+       sha256 = "f2d67e80baba2120a7df88ca40d62705b60798214439a235947bce4c3ce783cf";
        libraryHaskellDepends = [
-         aeson base bytestring case-insensitive containers http-media
-         http-types mtl tagged text time transformers wai
+         base containers http-kinder singletons text
+       ];
+       homepage = "http://github.com/tel/serv#readme";
+       description = "Dependently typed API framework";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "serv-wai" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, case-insensitive
+     , containers, http-kinder, http-media, http-types, HUnit, mmorph
+     , mtl, QuickCheck, serv, singletons, tagged, tasty, tasty-ant-xml
+     , tasty-hunit, tasty-quickcheck, text, time, transformers, vinyl
+     , wai, wai-extra
+     }:
+     mkDerivation {
+       pname = "serv-wai";
+       version = "0.2.0.0";
+       sha256 = "fc3eb3411239e2c88d79e8f2a709081dd6b5568c95233045c24213bb953cc7b2";
+       libraryHaskellDepends = [
+         aeson base bytestring case-insensitive containers http-kinder
+         http-media http-types mmorph mtl serv singletons tagged text time
+         transformers vinyl wai
        ];
-       executableHaskellDepends = [ base text wai warp ];
        testHaskellDepends = [
-         base HUnit QuickCheck tasty tasty-ant-xml tasty-hunit
+         base HUnit QuickCheck serv tasty tasty-ant-xml tasty-hunit
          tasty-quickcheck text wai wai-extra
        ];
        homepage = "http://github.com/tel/serv#readme";
-       description = "Dependently typed API server framework";
+       description = "Dependently typed API servers with Serv";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -178874,7 +179749,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "set-extra" = callPackage
+  "set-extra_1_3_2" = callPackage
     ({ mkDerivation, base, containers, mtl, syb }:
      mkDerivation {
        pname = "set-extra";
@@ -178884,6 +179759,19 @@ self: {
        homepage = "https://github.com/ddssff/set-extra";
        description = "Functions that could be added to Data.Set";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "set-extra" = callPackage
+    ({ mkDerivation, base, containers, mtl, syb }:
+     mkDerivation {
+       pname = "set-extra";
+       version = "1.4";
+       sha256 = "29dbee21b011f259abbe6f3ee7cf65fd58c8b79ff5568bc6b09e613f45bc9733";
+       libraryHaskellDepends = [ base containers mtl syb ];
+       homepage = "https://github.com/ddssff/set-extra";
+       description = "Functions that could be added to Data.Set.";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "set-monad" = callPackage
@@ -185218,6 +186106,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "socketson" = callPackage
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring, cereal
+     , crypto-api, data-default, DRBG, either, errors, http-types
+     , leveldb-haskell, lifted-base, mtl, network, text, transformers
+     , transformers-base, wai, wai-websockets, warp, websockets
+     }:
+     mkDerivation {
+       pname = "socketson";
+       version = "0.1.0.0";
+       sha256 = "7cff6662c11878b3e7a1f6cf7706534aee954a6504fa37da399d7c01ed76293c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base base64-bytestring bytestring cereal crypto-api
+         data-default DRBG either errors http-types leveldb-haskell
+         lifted-base mtl text transformers transformers-base wai
+         wai-websockets warp websockets
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring either network text websockets
+       ];
+       homepage = "https://github.com/aphorisme/socketson";
+       description = "A small websocket backend provider";
+       license = stdenv.lib.licenses.mit;
+     }) {};
+
   "socks" = callPackage
     ({ mkDerivation, base, bytestring, cereal, network }:
      mkDerivation {
@@ -187641,7 +188555,7 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
-  "stack_1_0_4" = callPackage
+  "stack_1_0_4_1" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, async, attoparsec, base
      , base16-bytestring, base64-bytestring, binary, binary-tagged
      , blaze-builder, byteable, bytestring, Cabal, conduit
@@ -187661,8 +188575,8 @@ self: {
      }:
      mkDerivation {
        pname = "stack";
-       version = "1.0.4";
-       sha256 = "f252c2f916b48d4b32722e2a4f3069ef55ac80454552316ce2dde0c5d486d85f";
+       version = "1.0.4.1";
+       sha256 = "660ce0c2126ddf2bb8c88a7b857571781dd09ac1953a3437522e123830dc537a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -198408,16 +199322,17 @@ self: {
   "th-typegraph" = callPackage
     ({ mkDerivation, array, base, base-compat, bytestring, containers
      , data-default, deepseq, ghc-prim, haskell-src-exts, hspec
-     , hspec-core, lens, mtl, mtl-unleashed, set-extra, syb
+     , hspec-core, lens, mtl, mtl-unleashed, pretty, set-extra, syb
      , template-haskell, text, th-desugar, th-orphans, th-reify-many
      }:
      mkDerivation {
        pname = "th-typegraph";
-       version = "0.32";
-       sha256 = "a01b758d99f95fa012c8266bb3c083a77c022a95fc86bdfcde493888e4bea3c5";
+       version = "0.33.1";
+       sha256 = "4b9ba6823398c2ce042728c0358e670533ba146bfd7c5e72019069da1c594080";
        libraryHaskellDepends = [
          base base-compat containers data-default haskell-src-exts lens mtl
-         mtl-unleashed set-extra syb template-haskell th-desugar th-orphans
+         mtl-unleashed pretty set-extra syb template-haskell th-desugar
+         th-orphans
        ];
        testHaskellDepends = [
          array base bytestring containers data-default deepseq ghc-prim
@@ -202311,6 +203226,22 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "turtle-options" = callPackage
+    ({ mkDerivation, base, optional-args, parsec, text, turtle }:
+     mkDerivation {
+       pname = "turtle-options";
+       version = "0.1.0.2";
+       sha256 = "6c1b02d67663d8849aa41c0e54ef824e013abbd6e89c71fb14c34aeb6434c8fd";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base optional-args parsec text turtle ];
+       executableHaskellDepends = [ base turtle ];
+       testHaskellDepends = [ base ];
+       homepage = "http://github.com/githubuser/turtle-options#readme";
+       description = "Collection of command line options and parsers for these options";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "tweak" = callPackage
     ({ mkDerivation, base, containers, lens, stm, transformers }:
      mkDerivation {
@@ -202896,8 +203827,8 @@ self: {
     ({ mkDerivation, base, ghc-prim }:
      mkDerivation {
        pname = "ty";
-       version = "0.1.6";
-       sha256 = "1e4a77501ba2d11491de3c705f0f2e1bc3667f369dfc921f3ebf193792602844";
+       version = "0.1.7";
+       sha256 = "b546372bccf07824e58d71cf0cb3aeae62a1e588ce1f59049fb36e8053a6c95a";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/conal/ty";
        description = "Typed type representations and equality proofs";
@@ -205620,7 +206551,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "uri-bytestring" = callPackage
+  "uri-bytestring_0_1_9_2" = callPackage
     ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
      , derive, HUnit, lens, QuickCheck, quickcheck-instances, semigroups
      , tasty, tasty-hunit, tasty-quickcheck
@@ -205640,6 +206571,29 @@ self: {
        homepage = "https://github.com/Soostone/uri-bytestring";
        description = "Haskell URI parsing as ByteStrings";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "uri-bytestring" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, bytestring
+     , derive, HUnit, lens-simple, QuickCheck, quickcheck-instances
+     , semigroups, tasty, tasty-hunit, tasty-quickcheck
+     }:
+     mkDerivation {
+       pname = "uri-bytestring";
+       version = "0.2.0.0";
+       sha256 = "68089d1a35e60fade81520741b043f1d72b209c57e56a2fc197d31cf87cd5623";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder bytestring
+       ];
+       testHaskellDepends = [
+         attoparsec base blaze-builder bytestring derive HUnit lens-simple
+         QuickCheck quickcheck-instances semigroups tasty tasty-hunit
+         tasty-quickcheck
+       ];
+       homepage = "https://github.com/Soostone/uri-bytestring";
+       description = "Haskell URI parsing as ByteStrings";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "uri-conduit" = callPackage
@@ -206056,7 +207010,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "userid" = callPackage
+  "userid_0_1_2_4" = callPackage
     ({ mkDerivation, aeson, base, boomerang, lens, safecopy, web-routes
      , web-routes-th
      }:
@@ -206070,6 +207024,23 @@ self: {
        homepage = "http://www.github.com/Happstack/userid";
        description = "The UserId type and useful instances for web development";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "userid" = callPackage
+    ({ mkDerivation, aeson, base, boomerang, safecopy, web-routes
+     , web-routes-th
+     }:
+     mkDerivation {
+       pname = "userid";
+       version = "0.1.2.5";
+       sha256 = "1dd22293a0cd3f3ed06ce87b1160647c5bc143ca0b2be5465395eb2c1efca26c";
+       libraryHaskellDepends = [
+         aeson base boomerang safecopy web-routes web-routes-th
+       ];
+       homepage = "http://www.github.com/Happstack/userid";
+       description = "The UserId type and useful instances for web development";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "users_0_1_0_0" = callPackage
@@ -206100,7 +207071,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "users" = callPackage
+  "users_0_4_0_0" = callPackage
     ({ mkDerivation, aeson, base, bcrypt, path-pieces, text, time }:
      mkDerivation {
        pname = "users";
@@ -206112,6 +207083,21 @@ self: {
        homepage = "https://github.com/agrafix/users";
        description = "A library simplifying user management for web applications";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "users" = callPackage
+    ({ mkDerivation, aeson, base, bcrypt, path-pieces, text, time }:
+     mkDerivation {
+       pname = "users";
+       version = "0.5.0.0";
+       sha256 = "6761ac937b0d4c13c5158239a0c51199c394facb72cc734ada90a391f01e53d4";
+       libraryHaskellDepends = [
+         aeson base bcrypt path-pieces text time
+       ];
+       homepage = "https://github.com/agrafix/users";
+       description = "A library simplifying user management for web applications";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "users-persistent_0_3_0_0" = callPackage
@@ -206137,7 +207123,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "users-persistent" = callPackage
+  "users-persistent_0_4_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, monad-logger, mtl
      , persistent, persistent-sqlite, persistent-template, temporary
      , text, time, transformers, users, users-test, uuid
@@ -206157,6 +207143,28 @@ self: {
        homepage = "https://github.com/agrafix/users";
        description = "A persistent backend for the users package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "users-persistent" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, monad-logger, mtl
+     , persistent, persistent-sqlite, persistent-template, temporary
+     , text, time, transformers, users, users-test, uuid
+     }:
+     mkDerivation {
+       pname = "users-persistent";
+       version = "0.5.0.1";
+       sha256 = "59107ccbc443ecc37f8539eca28c0717a45d902bf07f47fddadc704a0c701ba2";
+       libraryHaskellDepends = [
+         base bytestring mtl persistent persistent-template text time
+         transformers users uuid
+       ];
+       testHaskellDepends = [
+         base hspec monad-logger persistent-sqlite temporary text users-test
+       ];
+       homepage = "https://github.com/agrafix/users";
+       description = "A persistent backend for the users package";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "users-postgresql-simple_0_1_0_1" = callPackage
@@ -206197,7 +207205,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "users-postgresql-simple" = callPackage
+  "users-postgresql-simple_0_4_0_0" = callPackage
     ({ mkDerivation, aeson, base, bytestring, hspec, mtl
      , postgresql-simple, text, time, users, users-test, uuid
      }:
@@ -206213,6 +207221,25 @@ self: {
        homepage = "https://github.com/agrafix/users";
        description = "A PostgreSQL backend for the users package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "users-postgresql-simple" = callPackage
+    ({ mkDerivation, base, bytestring, hspec, mtl, postgresql-simple
+     , text, time, users, users-test, uuid
+     }:
+     mkDerivation {
+       pname = "users-postgresql-simple";
+       version = "0.5.0.1";
+       sha256 = "bac279ce4e93c71581e9aa890170d5acea262b1c4fddb8b5c7df5ea9807d9905";
+       libraryHaskellDepends = [
+         base bytestring mtl postgresql-simple text time users uuid
+       ];
+       testHaskellDepends = [ base hspec postgresql-simple users-test ];
+       doCheck = false;
+       homepage = "https://github.com/agrafix/users";
+       description = "A PostgreSQL backend for the users package";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "users-test_0_1_0_0" = callPackage
@@ -206241,7 +207268,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "users-test" = callPackage
+  "users-test_0_4_0_0" = callPackage
     ({ mkDerivation, aeson, base, hspec, text, users }:
      mkDerivation {
        pname = "users-test";
@@ -206251,6 +207278,19 @@ self: {
        homepage = "https://github.com/agrafix/users";
        description = "Library to test backends for the users library";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "users-test" = callPackage
+    ({ mkDerivation, base, hspec, text, users }:
+     mkDerivation {
+       pname = "users-test";
+       version = "0.5.0.0";
+       sha256 = "d3cee7db30b5fe19ca4d822f5f03484eda82090a5060ef6493befe0324d15643";
+       libraryHaskellDepends = [ base hspec text users ];
+       homepage = "https://github.com/agrafix/users";
+       description = "Library to test backends for the users library";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "utc" = callPackage
@@ -208441,7 +209481,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "vinyl" = callPackage
+  "vinyl_0_5_1" = callPackage
     ({ mkDerivation, base, doctest, ghc-prim, lens, singletons }:
      mkDerivation {
        pname = "vinyl";
@@ -208453,6 +209493,19 @@ self: {
        testHaskellDepends = [ base doctest lens singletons ];
        description = "Extensible Records";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "vinyl" = callPackage
+    ({ mkDerivation, base, doctest, ghc-prim, lens, singletons }:
+     mkDerivation {
+       pname = "vinyl";
+       version = "0.5.2";
+       sha256 = "93ac95aada665057df04bd1316c6eb5bef72479420199ebf34715684afe6a70b";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base doctest lens singletons ];
+       description = "Extensible Records";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "vinyl-gl" = callPackage
@@ -208499,10 +209552,9 @@ self: {
     ({ mkDerivation, base, contravariant, transformers, vinyl }:
      mkDerivation {
        pname = "vinyl-utils";
-       version = "0.2.0.2";
-       sha256 = "e38f74e57ef29514c3e655f9ae6415e6005c971a46504c1859b5ba602672297c";
+       version = "0.2.0.3";
+       sha256 = "870e5f5fb312fd3ff37f56eb06d28518571b085a5257852b652cde31e9abc08c";
        libraryHaskellDepends = [ base contravariant transformers vinyl ];
-       jailbreak = true;
        homepage = "https://github.com/marcinmrotek/vinyl-utils";
        description = "Utilities for vinyl";
        license = stdenv.lib.licenses.bsd3;
@@ -208522,6 +209574,7 @@ self: {
          base bytestring constraints data-default primitive template-haskell
          text vector vinyl
        ];
+       jailbreak = true;
        homepage = "http://github.com/andrewthad/vinyl-vectors";
        description = "Vectors for vinyl vectors";
        license = stdenv.lib.licenses.bsd3;
@@ -208927,6 +209980,19 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "vulkan" = callPackage
+    ({ mkDerivation, base, fixed-vector }:
+     mkDerivation {
+       pname = "vulkan";
+       version = "1.0.0.0";
+       sha256 = "9449a0ae1ba4d3d322e35b2948a5dae576bd6e59bdcb75917d79ab1436d432c4";
+       libraryHaskellDepends = [ base fixed-vector ];
+       jailbreak = true;
+       homepage = "http://github.com/expipiplus1/vulkan#readme";
+       description = "Bindings to the Vulkan graphics API";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "waddle" = callPackage
     ({ mkDerivation, base, binary, bytestring, case-insensitive
      , containers, directory, JuicyPixels
@@ -211354,8 +212420,8 @@ self: {
      }:
      mkDerivation {
        pname = "wai-request-spec";
-       version = "0.10.2.0";
-       sha256 = "a5789b5995628b72eec33b5ca462e23f506a01c4dcd8d37116ce76b491753497";
+       version = "0.10.2.1";
+       sha256 = "48b04912b04bb045c6e103adea8f20c50af7705e802e706b9c67249ee6a5f57b";
        libraryHaskellDepends = [
          base bytestring case-insensitive containers http-types text wai
        ];
@@ -212831,7 +213897,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "warp" = callPackage
+  "warp_3_2_2" = callPackage
     ({ mkDerivation, array, async, auto-update, base, blaze-builder
      , bytestring, bytestring-builder, case-insensitive, containers
      , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date
@@ -212857,6 +213923,40 @@ self: {
          streaming-commons text time transformers unix unix-compat vault wai
          word8
        ];
+       jailbreak = true;
+       doCheck = false;
+       homepage = "http://github.com/yesodweb/wai";
+       description = "A fast, light-weight web server for WAI applications";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "warp" = callPackage
+    ({ mkDerivation, array, async, auto-update, base, blaze-builder
+     , bytestring, bytestring-builder, case-insensitive, containers
+     , directory, doctest, ghc-prim, hashable, hspec, HTTP, http-date
+     , http-types, http2, HUnit, iproute, lifted-base, network, process
+     , QuickCheck, simple-sendfile, stm, streaming-commons, text, time
+     , transformers, unix, unix-compat, vault, wai, word8
+     }:
+     mkDerivation {
+       pname = "warp";
+       version = "3.2.3";
+       sha256 = "3a218d436cd77d41a157e67721ac59892e70f09fcd39594fc4707dabec760ee8";
+       libraryHaskellDepends = [
+         array auto-update base blaze-builder bytestring bytestring-builder
+         case-insensitive containers ghc-prim hashable http-date http-types
+         http2 iproute network simple-sendfile stm streaming-commons text
+         unix unix-compat vault wai word8
+       ];
+       testHaskellDepends = [
+         array async auto-update base blaze-builder bytestring
+         bytestring-builder case-insensitive containers directory doctest
+         ghc-prim hashable hspec HTTP http-date http-types http2 HUnit
+         iproute lifted-base network process QuickCheck simple-sendfile stm
+         streaming-commons text time transformers unix unix-compat vault wai
+         word8
+       ];
        doCheck = false;
        homepage = "http://github.com/yesodweb/wai";
        description = "A fast, light-weight web server for WAI applications";
@@ -213208,7 +214308,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "warp-tls" = callPackage
+  "warp-tls_3_2_0" = callPackage
     ({ mkDerivation, base, bytestring, cprng-aes, data-default-class
      , network, streaming-commons, tls, wai, warp
      }:
@@ -213223,6 +214323,24 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "HTTP over TLS support for Warp via the TLS package";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "warp-tls" = callPackage
+    ({ mkDerivation, base, bytestring, data-default-class, network
+     , streaming-commons, tls, wai, warp
+     }:
+     mkDerivation {
+       pname = "warp-tls";
+       version = "3.2.1";
+       sha256 = "aca7dd3d4b0cb996debd501a70bd29e556e9bc5e90c67a5c9626ad96feac483e";
+       libraryHaskellDepends = [
+         base bytestring data-default-class network streaming-commons tls
+         wai warp
+       ];
+       homepage = "http://github.com/yesodweb/wai";
+       description = "HTTP over TLS support for Warp via the TLS package";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "warp-tls-uid" = callPackage
@@ -214668,13 +215786,13 @@ self: {
      }:
      mkDerivation {
        pname = "werewolf";
-       version = "0.4.6.0";
-       sha256 = "9ee65c21f4310c81dbde660482680bb73a5d8423436b844d9c4402aa511f2118";
+       version = "0.4.7.0";
+       sha256 = "83a134b6aa52b80b9b32d5c0c98cd1db4b37f9427926dd29b1555b92853f7994";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base containers directory extra filepath lens MonadRandom mtl
-         random-shuffle text transformers
+         aeson base containers directory extra filepath lens mtl text
+         transformers
        ];
        executableHaskellDepends = [
          aeson base directory extra filepath lens MonadRandom mtl
@@ -217160,7 +218278,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "xlsx" = callPackage
+  "xlsx_0_2_0" = callPackage
     ({ mkDerivation, base, binary-search, bytestring, conduit
      , containers, data-default, digest, HUnit, lens, mtl, old-locale
      , smallcheck, tasty, tasty-hunit, tasty-smallcheck, text, time
@@ -217193,6 +218311,39 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "xlsx" = callPackage
+    ({ mkDerivation, base, binary-search, bytestring, conduit
+     , containers, data-default, digest, HUnit, lens, mtl, old-locale
+     , smallcheck, tasty, tasty-hunit, tasty-smallcheck, text, time
+     , transformers, utf8-string, vector, xml-conduit, xml-types
+     , zip-archive, zlib
+     }:
+     mkDerivation {
+       pname = "xlsx";
+       version = "0.2.1";
+       sha256 = "5026e7654118dc4e86d265b340a668fbcd3610546fd8fb4820c8e4140bf76a78";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base binary-search bytestring conduit containers data-default
+         digest lens mtl old-locale text time transformers utf8-string
+         vector xml-conduit xml-types zip-archive zlib
+       ];
+       executableHaskellDepends = [
+         base binary-search bytestring conduit containers data-default
+         digest lens old-locale text time transformers utf8-string vector
+         xml-conduit xml-types zip-archive zlib
+       ];
+       testHaskellDepends = [
+         base bytestring containers HUnit lens smallcheck tasty tasty-hunit
+         tasty-smallcheck time vector xml-conduit
+       ];
+       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-templater" = callPackage
     ({ mkDerivation, base, bytestring, conduit, containers
      , data-default, parsec, text, time, transformers, xlsx
@@ -225938,6 +227089,32 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {inherit (pkgs) zip;};
 
+  "zip-archive_0_3" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , digest, directory, filepath, HUnit, mtl, old-time, pretty
+     , process, text, time, unix, zip, zlib
+     }:
+     mkDerivation {
+       pname = "zip-archive";
+       version = "0.3";
+       sha256 = "ecbfa2c983094242e17d4dfb7aaabe891345510dd3cfc37743bfc479c794fd8b";
+       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
+       ];
+       testToolDepends = [ zip ];
+       homepage = "http://github.com/jgm/zip-archive";
+       description = "Library for creating and modifying zip archives";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {inherit (pkgs) zip;};
+
   "zip-conduit" = callPackage
     ({ mkDerivation, base, bytestring, cereal, conduit, conduit-extra
      , digest, directory, filepath, hpc, HUnit, mtl, old-time, resourcet
@@ -225948,6 +227125,8 @@ self: {
        pname = "zip-conduit";
        version = "0.2.2.2";
        sha256 = "1b1c83eeae0755fa03744d0ef0c1643259caa0d125862172fe1c335ec332eb6a";
+       revision = "1";
+       editedCabalFile = "bded40e095b3842e349207e728410c3759fb2707ec15b8f9d475f1eff3cefcba";
        libraryHaskellDepends = [
          base bytestring cereal conduit conduit-extra digest directory
          filepath mtl old-time resourcet time transformers utf8-string
@@ -225956,7 +227135,6 @@ self: {
          base bytestring conduit directory filepath hpc HUnit mtl resourcet
          temporary test-framework test-framework-hunit time
        ];
-       jailbreak = true;
        homepage = "https://github.com/tymmym/zip-conduit";
        description = "Working with zip archives via conduits";
        license = stdenv.lib.licenses.bsd3;

From 073dd0c1baa9738652adea52b8ee42f18e12888e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 23 Feb 2016 10:12:15 +0100
Subject: [PATCH 1960/2285] Add LTS Haskell 5.4.

---
 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 86628cc503fd..928541cd9dfa 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -356,7 +356,10 @@ rec {
     lts-5_3 = packages.ghc7103.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.3.nix { };
     };
-    lts-5 = packages.lts-5_3;
+    lts-5_4 = packages.ghc7103.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.4.nix { };
+    };
+    lts-5 = packages.lts-5_4;
 
     lts = packages.lts-5;
   };

From 4ee5a8865d699e619d8e0452802e6be01df1e839 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Tue, 23 Feb 2016 10:01:54 +0100
Subject: [PATCH 1961/2285] mwc-random: drop obsolete overrides

---
 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 998cc151e1cb..2858a63b897a 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -35,9 +35,6 @@ self: super: {
   hspec-expectations = dontCheck super.hspec-expectations;
   hspec = super.hspec.override { stringbuilder = dontCheck super.stringbuilder; };
   HTTP = dontCheck super.HTTP;
-  mwc-random_0_13_2_2 = dontCheck super.mwc-random_0_13_2_2;
-  mwc-random_0_13_3_0 = dontCheck super.mwc-random_0_13_3_0;
-  mwc-random = dontCheck super.mwc-random;
   nanospec_0_2_0 = dontCheck super.nanospec_0_2_0;
   nanospec = dontCheck super.nanospec;
   options_1_2_1 = dontCheck super.options_1_2_1;

From 08a02a84dec0d7456c494db027f3f53a17d15dac Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 25 Feb 2016 06:01:20 -0500
Subject: [PATCH 1962/2285] Make sure an older version of hjsonpointer is
 included

---
 pkgs/development/haskell-modules/configuration-hackage2nix.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 6fd1a0471c2f..7368f639c72d 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -45,6 +45,7 @@ extra-packages:
   - gloss < 1.9.3                       # new versions don't compile with GHC 7.8.x
   - haddock-api < 2.16                  # required on GHC 7.8.x
   - haskell-src-exts < 1.16             # required for structured-haskell-mode-1.0.8
+  - hjsonpointer == 0.2.0.4             # required for hjsonschema-0.8.0.1
   - mtl < 2.2                           # newer versions require transformers > 0.4.x, which we cannot provide in GHC 7.8.x
   - mtl-prelude < 2                     # required for to build postgrest on mtl 2.1.x platforms
   - parallel == 3.2.0.3                 # newer versions don't work with GHC 6.12.3

From 3844206366b9ef9dee7c0eb3d3c057e2f9d2b2d6 Mon Sep 17 00:00:00 2001
From: Michael Alan Dorman <mdorman@ironicdesign.com>
Date: Thu, 25 Feb 2016 06:11:29 -0500
Subject: [PATCH 1963/2285] Make sure we use the older version of hjsonpointer

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

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 2858a63b897a..1b2a82f3dcb7 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -323,7 +323,7 @@ self: super: {
   github-types = dontCheck super.github-types;          # http://hydra.cryp.to/build/1114046/nixlog/1/raw
   hadoop-rpc = dontCheck super.hadoop-rpc;              # http://hydra.cryp.to/build/527461/nixlog/2/raw
   hasql = dontCheck super.hasql;                        # http://hydra.cryp.to/build/502489/nixlog/4/raw
-  hjsonschema = overrideCabal super.hjsonschema (drv: { testTarget = "local"; });
+  hjsonschema = overrideCabal (super.hjsonschema.override { hjsonpointer = pkgs.hjsonpointer_0_2_0_4; }) (drv: { testTarget = "local"; });
   hoogle = overrideCabal super.hoogle (drv: { testTarget = "--test-option=--no-net"; });
   marmalade-upload = dontCheck super.marmalade-upload;  # http://hydra.cryp.to/build/501904/nixlog/1/raw
   network-transport-tcp = dontCheck super.network-transport-tcp;

From b871649530d8bab430066c0fa1cd3fe293837ca5 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 28 Feb 2016 12:09:22 +0100
Subject: [PATCH 1964/2285] quicktun: init at 2.2.4

---
 pkgs/tools/networking/quicktun/default.nix | 34 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/tools/networking/quicktun/default.nix

diff --git a/pkgs/tools/networking/quicktun/default.nix b/pkgs/tools/networking/quicktun/default.nix
new file mode 100644
index 000000000000..f07cfe4d0724
--- /dev/null
+++ b/pkgs/tools/networking/quicktun/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchFromGitHub, libsodium }:
+
+stdenv.mkDerivation rec {
+  name = "quicktun-${version}";
+  version = "2.2.4";
+
+  src = fetchFromGitHub {
+    owner = "UCIS";
+    repo = "QuickTun";
+    rev = "980fe1b8c718d6df82af1d57b56140c0e541dbe0";
+    sha256 = "0m7gvlgs1mhyw3c8s2dg05j7r7hz8kjpb0sk245m61ir9dmwlf8i";
+  };
+
+  CFLAGS = "-fPIE -fPIC -pie -fstack-protector-all -D_FORTIFY_SOURCE=2 -O2 -Wl,-z,relro,-z,now";
+
+  buildInputs = [ libsodium ];
+
+  phases = [ "unpackPhase" "buildPhase" "installPhase" ];
+
+  buildPhase = "bash build.sh";
+
+  installPhase = ''
+    mkdir -p $out/bin
+    rm out/quicktun*tgz
+    cp -v out/quicktun* $out/bin/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Very simple, yet secure VPN software";
+    homepage = "http://wiki.ucis.nl/QuickTun";
+    maintainers = [ maintainers.fpletz ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de648bc16f65..08517163ebc7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3011,6 +3011,8 @@ let
 
   qshowdiff = callPackage ../tools/text/qshowdiff { };
 
+  quicktun = callPackage ../tools/networking/quicktun { };
+
   quilt = callPackage ../development/tools/quilt { };
 
   radamsa = callPackage ../tools/security/radamsa { };

From 69ce5cb656fb9670307e02859e0a8fc5dce11062 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 28 Feb 2016 12:07:42 +0000
Subject: [PATCH 1965/2285] use the sourceforge mirrors everywhere

    find pkgs -name "*.nix" -exec sed -r \
    "s|https?://downloads.sourceforge.net/|mirror://sourceforge/|g" -i {} \;
---
 pkgs/applications/audio/QmidiNet/default.nix           |  2 +-
 pkgs/applications/audio/eq10q/default.nix              |  2 +-
 pkgs/applications/audio/faust/faust1.nix               |  2 +-
 pkgs/applications/audio/faust/faust2.nix               |  2 +-
 pkgs/applications/audio/gjay/default.nix               |  2 +-
 pkgs/applications/audio/kid3/default.nix               |  2 +-
 pkgs/applications/audio/mp3gain/default.nix            |  2 +-
 pkgs/applications/audio/pd-plugins/cyclone/default.nix |  2 +-
 pkgs/applications/audio/pd-plugins/maxlib/default.nix  |  2 +-
 pkgs/applications/editors/bviplus/default.nix          |  2 +-
 pkgs/applications/editors/heme/default.nix             |  2 +-
 pkgs/applications/gis/saga/default.nix                 |  2 +-
 pkgs/applications/misc/galculator/default.nix          |  2 +-
 pkgs/applications/misc/lxappearance/default.nix        |  2 +-
 pkgs/applications/misc/quicksynergy/default.nix        |  2 +-
 pkgs/applications/misc/roxterm/default.nix             |  2 +-
 pkgs/applications/misc/vym/default.nix                 |  2 +-
 pkgs/applications/misc/xiphos/default.nix              |  2 +-
 .../networking/instant-messengers/choqok/default.nix   |  2 +-
 pkgs/applications/video/wxcam/default.nix              |  2 +-
 pkgs/applications/virtualization/bochs/default.nix     |  2 +-
 pkgs/development/libraries/biblesync/default.nix       |  2 +-
 pkgs/development/libraries/cimg/default.nix            |  2 +-
 pkgs/development/libraries/cpptest/default.nix         |  2 +-
 pkgs/development/libraries/gtkspellmm/default.nix      |  2 +-
 pkgs/development/libraries/uriparser/default.nix       |  2 +-
 pkgs/development/ocaml-modules/ocamlsdl/default.nix    |  2 +-
 pkgs/development/ocaml-modules/ssl/default.nix         |  2 +-
 pkgs/development/tools/analysis/coan/default.nix       |  2 +-
 .../tools/literate-programming/eweb/default.nix        |  2 +-
 .../tools/literate-programming/nuweb/default.nix       |  2 +-
 pkgs/development/tools/misc/premake/3.nix              |  2 +-
 pkgs/games/instead/default.nix                         |  2 +-
 pkgs/games/odamex/default.nix                          |  2 +-
 pkgs/games/vassal/default.nix                          |  2 +-
 pkgs/misc/emulators/cdemu/base.nix                     |  2 +-
 pkgs/misc/emulators/cdemu/vhba.nix                     |  2 +-
 pkgs/misc/emulators/desmume/default.nix                |  2 +-
 pkgs/misc/emulators/stella/default.nix                 |  2 +-
 pkgs/servers/dict/dictd-db.nix                         | 10 +++++-----
 pkgs/servers/ums/default.nix                           |  2 +-
 pkgs/tools/bootloaders/refind/default.nix              |  2 +-
 pkgs/tools/networking/traceroute/default.nix           |  2 +-
 pkgs/tools/typesetting/pdfgrep/default.nix             |  2 +-
 pkgs/tools/typesetting/tex/pgf/3.x.nix                 |  2 +-
 45 files changed, 49 insertions(+), 49 deletions(-)

diff --git a/pkgs/applications/audio/QmidiNet/default.nix b/pkgs/applications/audio/QmidiNet/default.nix
index 4e89f125dd9b..d8d8945db928 100644
--- a/pkgs/applications/audio/QmidiNet/default.nix
+++ b/pkgs/applications/audio/QmidiNet/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "qmidinet-${version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/qmidinet/${name}.tar.gz";
+    url = "mirror://sourceforge/qmidinet/${name}.tar.gz";
     sha256 = "1a1pj4w74wj1gcfv4a0vzcglmr5sw0xp0y56w8rk3ig4k11xi8sa";
   };
 
diff --git a/pkgs/applications/audio/eq10q/default.nix b/pkgs/applications/audio/eq10q/default.nix
index 5d5b70a58985..e2adf9e131c7 100644
--- a/pkgs/applications/audio/eq10q/default.nix
+++ b/pkgs/applications/audio/eq10q/default.nix
@@ -3,7 +3,7 @@ stdenv.mkDerivation rec {
   name = "eq10q-2-${version}";
   version = "beta7.1";
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/eq10q/${name}.tar.gz";
+    url = "mirror://sourceforge/project/eq10q/${name}.tar.gz";
     sha256 = "1jmrcx4jlx8kgsy5n4jcxa6qkjqvx7d8l2p7dsmw4hj20s39lgyi";
   };
 
diff --git a/pkgs/applications/audio/faust/faust1.nix b/pkgs/applications/audio/faust/faust1.nix
index 4e03b26c036c..56f7ac50227e 100644
--- a/pkgs/applications/audio/faust/faust1.nix
+++ b/pkgs/applications/audio/faust/faust1.nix
@@ -12,7 +12,7 @@ let
   version = "0.9.73";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/faudiostream/faust-${version}.tgz";
+    url = "mirror://sourceforge/project/faudiostream/faust-${version}.tgz";
     sha256 = "0x2scxkwvvjx7b7smj5xb8kr269qakf49z3fxpasd9g7025q44k5";
   };
 
diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix
index 91e9fb66659e..4759f228e358 100644
--- a/pkgs/applications/audio/faust/faust2.nix
+++ b/pkgs/applications/audio/faust/faust2.nix
@@ -19,7 +19,7 @@ let
   version = "2.0-a41";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/faudiostream/faust-2.0.a41.tgz";
+    url = "mirror://sourceforge/project/faudiostream/faust-2.0.a41.tgz";
     sha256 = "1cq4x1cax0lswrcqv0limx5mjdi3187zlmh7cj2pndr0xq6b96cm";
   };
 
diff --git a/pkgs/applications/audio/gjay/default.nix b/pkgs/applications/audio/gjay/default.nix
index 9f023f34291d..f08de9d080a2 100644
--- a/pkgs/applications/audio/gjay/default.nix
+++ b/pkgs/applications/audio/gjay/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation {
   name = "gjay-0.3.2";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/gjay/gjay-0.3.2.tar.gz";
+    url = "mirror://sourceforge/project/gjay/gjay-0.3.2.tar.gz";
     sha256 = "1a1vv4r0vnxjdyl0jyv7gga3zfd5azxlwjm1l6hjrf71lb228zn8";
   };
 
diff --git a/pkgs/applications/audio/kid3/default.nix b/pkgs/applications/audio/kid3/default.nix
index 0b2e4e7977b8..4d79c3ebecfa 100644
--- a/pkgs/applications/audio/kid3/default.nix
+++ b/pkgs/applications/audio/kid3/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   name = "kid3-${meta.version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/kid3/kid3/${meta.version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/kid3/kid3/${meta.version}/${name}.tar.gz";
     sha256 = "12sa54mg1b3wkagmh5yi20ski8km9d199lk0a1yfxy0ffjfld7js";
   };
 
diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/applications/audio/mp3gain/default.nix
index 3fef8398e9c9..907d4b8be168 100644
--- a/pkgs/applications/audio/mp3gain/default.nix
+++ b/pkgs/applications/audio/mp3gain/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation {
   name = "mp3gain-1.5.2";
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/mp3gain/mp3gain-1_5_2-src.zip";
+    url = "mirror://sourceforge/mp3gain/mp3gain-1_5_2-src.zip";
     sha256 = "1jkgry59m8cnnfq05b9y1h4x4wpy3iq8j68slb9qffwa3ajcgbfv";
   };
 
diff --git a/pkgs/applications/audio/pd-plugins/cyclone/default.nix b/pkgs/applications/audio/pd-plugins/cyclone/default.nix
index b90c6a0ea369..2331944db017 100644
--- a/pkgs/applications/audio/pd-plugins/cyclone/default.nix
+++ b/pkgs/applications/audio/pd-plugins/cyclone/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "0.1-alpha55";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/pure-data/libraries/cyclone/${name}.tar.gz";
+    url = "mirror://sourceforge/project/pure-data/libraries/cyclone/${name}.tar.gz";
     sha256 = "1yys9xrlz09xgnqk2gqdl8vw6xj6l9d7km2lkihidgjql0jx5b5i";
   };
 
diff --git a/pkgs/applications/audio/pd-plugins/maxlib/default.nix b/pkgs/applications/audio/pd-plugins/maxlib/default.nix
index dc4d03759616..c5732387b503 100644
--- a/pkgs/applications/audio/pd-plugins/maxlib/default.nix
+++ b/pkgs/applications/audio/pd-plugins/maxlib/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.5.5";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/pure-data/libraries/maxlib/${name}.tar.gz";
+    url = "mirror://sourceforge/project/pure-data/libraries/maxlib/${name}.tar.gz";
     sha256 = "0vxl9s815dnay5r0067rxsfh8f6jbk61f0nxrydzjydfycza7p1w";
   };
 
diff --git a/pkgs/applications/editors/bviplus/default.nix b/pkgs/applications/editors/bviplus/default.nix
index 0a8d7081b230..5adb0dad26c3 100644
--- a/pkgs/applications/editors/bviplus/default.nix
+++ b/pkgs/applications/editors/bviplus/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "bviplus-${version}";
   version = "0.9.4";
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/bviplus/bviplus/${version}/bviplus-${version}.tgz";
+    url = "mirror://sourceforge/project/bviplus/bviplus/${version}/bviplus-${version}.tgz";
     sha256 = "10x6fbn8v6i0y0m40ja30pwpyqksnn8k2vqd290vxxlvlhzah4zb";
   };
   buildInputs = [
diff --git a/pkgs/applications/editors/heme/default.nix b/pkgs/applications/editors/heme/default.nix
index d377e5cb36f6..69ba674d2d49 100644
--- a/pkgs/applications/editors/heme/default.nix
+++ b/pkgs/applications/editors/heme/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "heme-${version}";
   version = "0.4.2";
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/heme/heme/heme-${version}/heme-${version}.tar.gz";
+    url = "mirror://sourceforge/project/heme/heme/heme-${version}/heme-${version}.tar.gz";
     sha256 = "0wsrnj5mrlazgqs4252k30aw8m86qw0z9dmrsli9zdxl7j4cg99v";
   };
   postPatch = ''
diff --git a/pkgs/applications/gis/saga/default.nix b/pkgs/applications/gis/saga/default.nix
index 200d091b64a0..b7b4d299efcc 100644
--- a/pkgs/applications/gis/saga/default.nix
+++ b/pkgs/applications/gis/saga/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/saga-gis/SAGA%20-%202.2/SAGA%202.2.2/saga-2.2.2.tar.gz";
+    url = "mirror://sourceforge/project/saga-gis/SAGA%20-%202.2/SAGA%202.2.2/saga-2.2.2.tar.gz";
     sha256 = "031cd70b7ec248f32f955a9316aefc7f7ab283c5129c49aa4bd748717d20357e";
   };
 
diff --git a/pkgs/applications/misc/galculator/default.nix b/pkgs/applications/misc/galculator/default.nix
index 5dcee439ef91..5d5f83a2370f 100644
--- a/pkgs/applications/misc/galculator/default.nix
+++ b/pkgs/applications/misc/galculator/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "2.1.3";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/galculator/${name}.tar.gz";
+    url = "mirror://sourceforge/galculator/${name}.tar.gz";
     sha256 = "12m7dldjk10lpkdxk7zpk98n32ci65zmxidghihb7n1m3rhp3q17";
   };
 
diff --git a/pkgs/applications/misc/lxappearance/default.nix b/pkgs/applications/misc/lxappearance/default.nix
index 8db606fd6d59..b6e59613b3cc 100644
--- a/pkgs/applications/misc/lxappearance/default.nix
+++ b/pkgs/applications/misc/lxappearance/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "lxappearance-0.6.1";
   src = fetchurl{
-    url = "http://downloads.sourceforge.net/project/lxde/LXAppearance/${name}.tar.xz";
+    url = "mirror://sourceforge/project/lxde/LXAppearance/${name}.tar.xz";
     sha256 = "1phnv1b2jdj2vlibjyc9z01izcf3k5zxj8glsaf0i3vh77zqmqq9";
   };
   buildInputs = [ intltool libX11 pkgconfig gtk ];
diff --git a/pkgs/applications/misc/quicksynergy/default.nix b/pkgs/applications/misc/quicksynergy/default.nix
index 90737a344ca2..3c9bdcada15d 100644
--- a/pkgs/applications/misc/quicksynergy/default.nix
+++ b/pkgs/applications/misc/quicksynergy/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "quicksynergy-${version}";
   version = "0.9.0";
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/quicksynergy/Linux/${version}/quicksynergy-${version}.tar.gz";
+    url = "mirror://sourceforge/project/quicksynergy/Linux/${version}/quicksynergy-${version}.tar.gz";
     sha256 = "1pi8503bg8q1psw50y6d780i33nnvfjqiy9vnr3v52pdcfip8pix";
   };
   buildInputs = [
diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
index 60322c2b911e..ad7de90cad63 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/pkgs/applications/misc/roxterm/default.nix
@@ -13,7 +13,7 @@ in stdenv.mkDerivation rec {
   name = "roxterm-${version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/roxterm/${name}.tar.bz2";
+    url = "mirror://sourceforge/roxterm/${name}.tar.bz2";
     sha256 = "0djfiwfmnqqp6930kswzr2rss0mh40vglcdybwpxrijcw4n8j21x";
   };
 
diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix
index b1cfbd5d9ac4..62f741f9eeac 100644
--- a/pkgs/applications/misc/vym/default.nix
+++ b/pkgs/applications/misc/vym/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.2.4";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/vym/${version}/${name}.tar.bz2";
+    url = "mirror://sourceforge/project/vym/${version}/${name}.tar.bz2";
     sha256 = "1x4qp6wpszscbbs4czkfvskm7qjglvxm813nqv281bpy4y1hhvgs";
   };
 
diff --git a/pkgs/applications/misc/xiphos/default.nix b/pkgs/applications/misc/xiphos/default.nix
index dbc5e84e67bc..a9f786a2a084 100644
--- a/pkgs/applications/misc/xiphos/default.nix
+++ b/pkgs/applications/misc/xiphos/default.nix
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
   version = "4.0.3-20150806";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/gnomesword/Xiphos/4.0.3/${name}.tar.gz";
+    url = "mirror://sourceforge/project/gnomesword/Xiphos/4.0.3/${name}.tar.gz";
     sha256 = "1xkvhpasdlda2rp0874znz158z4rjh1hpynwy13d96kjxq4npiqv";
   };
 
diff --git a/pkgs/applications/networking/instant-messengers/choqok/default.nix b/pkgs/applications/networking/instant-messengers/choqok/default.nix
index 9b16404b6208..a50779f53dd0 100644
--- a/pkgs/applications/networking/instant-messengers/choqok/default.nix
+++ b/pkgs/applications/networking/instant-messengers/choqok/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   name = "${pn}-${v}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/choqok/Choqok/choqok-1.5.tar.xz";
+    url = "mirror://sourceforge/project/choqok/Choqok/choqok-1.5.tar.xz";
     sha256 = "5cb97ac4cdf9db4699bb7445a9411393073d213fea649ab0713f659f1308efe4";
   };
 
diff --git a/pkgs/applications/video/wxcam/default.nix b/pkgs/applications/video/wxcam/default.nix
index 561ab1516821..24e99d78c486 100644
--- a/pkgs/applications/video/wxcam/default.nix
+++ b/pkgs/applications/video/wxcam/default.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   version = "1.1";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/wxcam/wxcam/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/wxcam/wxcam/${version}/${name}.tar.gz";
     sha256 = "1765bvc65fpzn9ycnnj5hais9xkx9v0sm6a878d35x54bpanr859";
   };
 
diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix
index b876403d6327..9a75a3ddfd40 100644
--- a/pkgs/applications/virtualization/bochs/default.nix
+++ b/pkgs/applications/virtualization/bochs/default.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   version = "2.6.8";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/bochs/bochs/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/bochs/bochs/${version}/${name}.tar.gz";
     sha256 = "1kl5cmbz6qgg33j5vv9898nzdppp1rqgy24r5pv762aaj7q0ww3r";
   };
 
diff --git a/pkgs/development/libraries/biblesync/default.nix b/pkgs/development/libraries/biblesync/default.nix
index 4b7be5ca3d4a..d7b82764fc06 100644
--- a/pkgs/development/libraries/biblesync/default.nix
+++ b/pkgs/development/libraries/biblesync/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec{
   version = "1.1.2";
 
   src = fetchurl{
-    url = "http://downloads.sourceforge.net/project/gnomesword/BibleSync/1.1.2/${name}.tar.gz";
+    url = "mirror://sourceforge/project/gnomesword/BibleSync/1.1.2/${name}.tar.gz";
     sha256 = "0190q2da0ppif2242lahl8xfz01n9sijy60aq1a0545qcp0ilvl8";
   };
 
diff --git a/pkgs/development/libraries/cimg/default.nix b/pkgs/development/libraries/cimg/default.nix
index cd6791836506..dc397adf4915 100644
--- a/pkgs/development/libraries/cimg/default.nix
+++ b/pkgs/development/libraries/cimg/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "1.5.9";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/cimg/CImg-${version}.zip";
+    url = "mirror://sourceforge/project/cimg/CImg-${version}.zip";
     sha256 = "1xn20643gcbl76kvy9ajhwbyjjb73mg65q32ma8mdkwn1qhn7f7c";
   };
 
diff --git a/pkgs/development/libraries/cpptest/default.nix b/pkgs/development/libraries/cpptest/default.nix
index 8bffeebd024f..e5aab4308294 100644
--- a/pkgs/development/libraries/cpptest/default.nix
+++ b/pkgs/development/libraries/cpptest/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "cpptest-1.1.2";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/cpptest/cpptest/${name}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/cpptest/cpptest/${name}/${name}.tar.gz";
     sha256 = "09v070a9dv6zq6hgj4v67i31zsis3s96psrnhlq9g4vhdcaxykwy";
   };
 
diff --git a/pkgs/development/libraries/gtkspellmm/default.nix b/pkgs/development/libraries/gtkspellmm/default.nix
index d24ec46d9053..44bb8051ea66 100644
--- a/pkgs/development/libraries/gtkspellmm/default.nix
+++ b/pkgs/development/libraries/gtkspellmm/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
   name = "gtkspellmm-${version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/gtkspell/gtkspellmm/" +
+    url = "mirror://sourceforge/project/gtkspell/gtkspellmm/" +
           "${name}.tar.gz";
     sha256 = "f9dcc0991621c08e7a972f33487afd6b37491468f0b654f50c741a7e6d810624";
   };
diff --git a/pkgs/development/libraries/uriparser/default.nix b/pkgs/development/libraries/uriparser/default.nix
index 76aec25a7923..9089889f4dd2 100644
--- a/pkgs/development/libraries/uriparser/default.nix
+++ b/pkgs/development/libraries/uriparser/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "uriparser-0.8.2";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/uriparser/Sources/0.8.2/${name}.tar.bz2";
+    url = "mirror://sourceforge/project/uriparser/Sources/0.8.2/${name}.tar.bz2";
     sha256 = "13sh7slys3y5gfscc40g2r3hkjjywjvxlcqr77ifjrazc6q6cvkd";
   };
 
diff --git a/pkgs/development/ocaml-modules/ocamlsdl/default.nix b/pkgs/development/ocaml-modules/ocamlsdl/default.nix
index 51af8d99d69b..8f2ffcaa9bc4 100644
--- a/pkgs/development/ocaml-modules/ocamlsdl/default.nix
+++ b/pkgs/development/ocaml-modules/ocamlsdl/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation {
   name = "${pname}-${version}";
 
   src = fetchurl { 
-    url = "http://downloads.sourceforge.net/project/ocamlsdl/OCamlSDL/ocamlsdl-0.9.1/ocamlsdl-0.9.1.tar.gz";
+    url = "mirror://sourceforge/project/ocamlsdl/OCamlSDL/ocamlsdl-0.9.1/ocamlsdl-0.9.1.tar.gz";
     sha256 = "abfb295b263dc11e97fffdd88ea1a28b46df8cc2b196777093e4fe7f509e4f8f";
   };
 
diff --git a/pkgs/development/ocaml-modules/ssl/default.nix b/pkgs/development/ocaml-modules/ssl/default.nix
index f80675f88d24..6e3ded0b0f27 100644
--- a/pkgs/development/ocaml-modules/ssl/default.nix
+++ b/pkgs/development/ocaml-modules/ssl/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation {
   name = "ocaml-ssl-${version}";
 
   src = fetchurl {
-  url = "http://downloads.sourceforge.net/project/savonet/ocaml-ssl/0.5.2/ocaml-ssl-0.5.2.tar.gz";
+  url = "mirror://sourceforge/project/savonet/ocaml-ssl/0.5.2/ocaml-ssl-0.5.2.tar.gz";
 
     sha256 = "0341rm8aqrckmhag1lrqfnl17v6n4ci8ibda62ahkkn5cxd58cpp";
   };
diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix
index bf749b694a2c..3ce5f23f6457 100644
--- a/pkgs/development/tools/analysis/coan/default.nix
+++ b/pkgs/development/tools/analysis/coan/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   name = "coan-${version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/coan2/v${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/coan2/v${version}/${name}.tar.gz";
     sha256 = "1d041j0nd1hc0562lbj269dydjm4rbzagdgzdnmwdxr98544yw44";
   };
 
diff --git a/pkgs/development/tools/literate-programming/eweb/default.nix b/pkgs/development/tools/literate-programming/eweb/default.nix
index f996c567fcb5..17a7731896ee 100644
--- a/pkgs/development/tools/literate-programming/eweb/default.nix
+++ b/pkgs/development/tools/literate-programming/eweb/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec{
   name = "eweb-${meta.version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/eweb/${name}.tar.bz2";
+    url = "mirror://sourceforge/project/eweb/${name}.tar.bz2";
     sha256 = "1xy7vm2sj5q6s620fm25klmnwnz9xkrxmx4q2f8h6c85ydisayd5";
   };
 
diff --git a/pkgs/development/tools/literate-programming/nuweb/default.nix b/pkgs/development/tools/literate-programming/nuweb/default.nix
index 54c2125a08c1..5930d4789a46 100644
--- a/pkgs/development/tools/literate-programming/nuweb/default.nix
+++ b/pkgs/development/tools/literate-programming/nuweb/default.nix
@@ -6,7 +6,7 @@ stdenv.mkDerivation rec{
   version = "1.58";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/nuweb/${name}.tar.gz";
+    url = "mirror://sourceforge/project/nuweb/${name}.tar.gz";
     sha256 = "0q51i3miy15fv4njjp82yws01qfjxvqx5ly3g3vh8z3h7iq9p47y";
   };
 
diff --git a/pkgs/development/tools/misc/premake/3.nix b/pkgs/development/tools/misc/premake/3.nix
index 94a2880e1348..59ce43bf891d 100644
--- a/pkgs/development/tools/misc/premake/3.nix
+++ b/pkgs/development/tools/misc/premake/3.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
   name = "${baseName}-${version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/sourceforge/premake/${baseName}-src-${version}.zip";
+    url = "mirror://sourceforge/sourceforge/premake/${baseName}-src-${version}.zip";
     sha256 = "b59841a519e75d5b6566848a2c5be2f91455bf0cc6ae4d688fcbd4c40db934d5";
   };
 
diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix
index 194feb58083f..6d55f2a2d5ce 100644
--- a/pkgs/games/instead/default.nix
+++ b/pkgs/games/instead/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   name = "instead-" + version;
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/instead/instead/${version}/instead_${version}.tar.gz";
+    url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz";
     sha256 = "1ldisjkmmcpnmv4vsd25dc1sfiwbr9fcn3hxhl78i4jwlyqgrms8";
   };
 
diff --git a/pkgs/games/odamex/default.nix b/pkgs/games/odamex/default.nix
index f24e6155ec60..abc19adf72ad 100644
--- a/pkgs/games/odamex/default.nix
+++ b/pkgs/games/odamex/default.nix
@@ -3,7 +3,7 @@
 stdenv.mkDerivation rec {
   name = "odamex-0.7.0";
   src = fetchurl {
-    url = http://downloads.sourceforge.net/odamex/odamex-src-0.7.0.tar.bz2;
+    url = mirror://sourceforge/odamex/odamex-src-0.7.0.tar.bz2;
     sha256 = "0cb6p58yv55kdyfj7s9n9xcwpvxrj8nyc6brw9jvwlc5n4y3cd5a";
   };
 
diff --git a/pkgs/games/vassal/default.nix b/pkgs/games/vassal/default.nix
index 319453c80194..8961dfdce3c9 100644
--- a/pkgs/games/vassal/default.nix
+++ b/pkgs/games/vassal/default.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation rec {
   name = "VASSAL-3.2.15";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/vassalengine/${name}-linux.tar.bz2";
+    url = "mirror://sourceforge/vassalengine/${name}-linux.tar.bz2";
     sha256 = "10ng571nxr5zc2nlviyrk5bci8my67kq3qvhfn9bifzkxmjlqmk9";
   };
 
diff --git a/pkgs/misc/emulators/cdemu/base.nix b/pkgs/misc/emulators/cdemu/base.nix
index d7c91169ed3d..cfd2ad37cadf 100644
--- a/pkgs/misc/emulators/cdemu/base.nix
+++ b/pkgs/misc/emulators/cdemu/base.nix
@@ -4,7 +4,7 @@ let name = "${pkgName}-${version}";
 in stdenv.mkDerivation ({
   inherit name buildInputs;
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/cdemu/${name}.tar.bz2";
+    url = "mirror://sourceforge/cdemu/${name}.tar.bz2";
     sha256 = pkgSha256;
   };
   nativeBuildInputs = [ pkgconfig cmake ];
diff --git a/pkgs/misc/emulators/cdemu/vhba.nix b/pkgs/misc/emulators/cdemu/vhba.nix
index d4596be03a69..2e163af1d5eb 100644
--- a/pkgs/misc/emulators/cdemu/vhba.nix
+++ b/pkgs/misc/emulators/cdemu/vhba.nix
@@ -3,7 +3,7 @@ let version = "20140928";
 in stdenv.mkDerivation {
   name = "vhba-${version}";
   src  = fetchurl {
-    url = "http://downloads.sourceforge.net/cdemu/vhba-module-${version}.tar.bz2";
+    url = "mirror://sourceforge/cdemu/vhba-module-${version}.tar.bz2";
     sha256 = "18jmpg2kpx87f32b8aprr1pxla9dlhf901rkj1sp3ammf94nxxa5";
   };
   preBuild = ''
diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix
index f322a96905fb..97cd6a9ca798 100644
--- a/pkgs/misc/emulators/desmume/default.nix
+++ b/pkgs/misc/emulators/desmume/default.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
   version = "0.9.11";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/desmume/desmume/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/desmume/desmume/${version}/${name}.tar.gz";
     sha256 = "15l8wdw3q61fniy3h93d84dnm6s4pyadvh95a0j6d580rjk4pcrs";
   };
 
diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix
index 04976a2bb839..be872250d032 100644
--- a/pkgs/misc/emulators/stella/default.nix
+++ b/pkgs/misc/emulators/stella/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "4.6.1";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/stella/stella/${version}/${name}-src.tar.gz";
+    url = "mirror://sourceforge/project/stella/stella/${version}/${name}-src.tar.gz";
     sha256 = "126jph21b70jlxapzmll8pq36i53lb304hbsiap25160vdqid4n1";
   };
 
diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix
index 5f109c58e6e4..fda81b0ff81d 100644
--- a/pkgs/servers/dict/dictd-db.nix
+++ b/pkgs/servers/dict/dictd-db.nix
@@ -39,23 +39,23 @@ rec {
 		sha256 = "1vhw81pphb64fzsjvpzsnnyr34ka2fxizfwilnxyjcmpn9360h07";
 	}) "nld-eng" "nl_NL";
 	eng2nld =  makeDictdDBFreedict (fetchurl {
-		url = http://downloads.sourceforge.net/freedict/eng-nld.tar.gz;
+		url = mirror://sourceforge/freedict/eng-nld.tar.gz;
 		sha256 = "0rcg28ldykv0w2mpxc6g4rqmfs33q7pbvf68ssy1q9gpf6mz7vcl";
 	}) "eng-nld" "en_UK";
 	eng2rus = makeDictdDBFreedict (fetchurl {
-		url = http://downloads.sourceforge.net/freedict/eng-rus.tar.gz;
+		url = mirror://sourceforge/freedict/eng-rus.tar.gz;
 		sha256 = "15409ivhww1wsfjr05083pv6mg10bak8v5pg1wkiqybk7ck61rry";
 	}) "eng-rus" "en_UK";
 	fra2eng = makeDictdDBFreedict (fetchurl {
-		url = http://downloads.sourceforge.net/freedict/fra-eng.tar.gz;
+		url = mirror://sourceforge/freedict/fra-eng.tar.gz;
 		sha256 = "0sdd88s2zs5whiwdf3hd0s4pzzv75sdsccsrm1wxc87l3hjm85z3";
 	}) "fra-eng" "fr_FR";
 	eng2fra = makeDictdDBFreedict (fetchurl {
-		url = http://downloads.sourceforge.net/freedict/eng-fra.tar.gz;
+		url = mirror://sourceforge/freedict/eng-fra.tar.gz;
 		sha256 = "0fi6rrnbqnhc6lq8d0nmn30zdqkibrah0mxfg27hsn9z7alwbj3m";
 	}) "eng-fra" "en_UK";
 	mueller_eng2rus_pkg = makeDictdDB (fetchurl {
-		url = http://downloads.sourceforge.net/mueller-dict/mueller-dict-3.1.tar.gz;
+		url = mirror://sourceforge/mueller-dict/mueller-dict-3.1.tar.gz;
 		sha256 = "04r5xxznvmcb8hkxqbjgfh2gxvbdd87jnhqn5gmgvxxw53zpwfmq";
 	}) "mueller-eng-rus" "mueller-dict-*/dict" "en_UK";
 	mueller_enru_abbr = {
diff --git a/pkgs/servers/ums/default.nix b/pkgs/servers/ums/default.nix
index 12816702c8f5..c51aadf0d19c 100644
--- a/pkgs/servers/ums/default.nix
+++ b/pkgs/servers/ums/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   version = "5.4.0";
   
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${name}" + "-Java8.tgz";
+    url = "mirror://sourceforge/project/unimediaserver/Official%20Releases/Linux/" + stdenv.lib.toUpper "${name}" + "-Java8.tgz";
     sha256 = "0ryp26h7pyqing8pyg0xjrp1wm77wwgya4a7d00wczh885pk16kq";
     name = "${name}.tgz";
   };
diff --git a/pkgs/tools/bootloaders/refind/default.nix b/pkgs/tools/bootloaders/refind/default.nix
index 7a57225ce8e8..110e00976e83 100644
--- a/pkgs/tools/bootloaders/refind/default.nix
+++ b/pkgs/tools/bootloaders/refind/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
   srcName = "refind-src-${meta.version}";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/refind/${meta.version}/${srcName}.zip";
+    url = "mirror://sourceforge/project/refind/${meta.version}/${srcName}.zip";
     sha256 = "0ai150rzx20sfl92j6y1p6qnyy0wbmazrlp2fg19acs98qyxl8lh";
   };
 
diff --git a/pkgs/tools/networking/traceroute/default.nix b/pkgs/tools/networking/traceroute/default.nix
index 2ce8d1cde3eb..d98c9996882d 100644
--- a/pkgs/tools/networking/traceroute/default.nix
+++ b/pkgs/tools/networking/traceroute/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "2.0.21";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/traceroute/${name}.tar.gz";
+    url = "mirror://sourceforge/traceroute/${name}.tar.gz";
     sha256 = "1q4n9s42nfcc4fmnwmrsiabvqrcaagiagmmqj9r5hfmi63pr7b7p";
   };
 
diff --git a/pkgs/tools/typesetting/pdfgrep/default.nix b/pkgs/tools/typesetting/pdfgrep/default.nix
index ff3bad12bc52..e6c63e029561 100644
--- a/pkgs/tools/typesetting/pdfgrep/default.nix
+++ b/pkgs/tools/typesetting/pdfgrep/default.nix
@@ -5,7 +5,7 @@ stdenv.mkDerivation rec {
   version = "1.3.1";
 
   src = fetchurl {
-    url = "http://downloads.sourceforge.net/project/pdfgrep/${version}/${name}.tar.gz";
+    url = "mirror://sourceforge/project/pdfgrep/${version}/${name}.tar.gz";
     sha256 = "6e8bcaf8b219e1ad733c97257a97286a94124694958c27506b2ea7fc8e532437";
   };
 
diff --git a/pkgs/tools/typesetting/tex/pgf/3.x.nix b/pkgs/tools/typesetting/tex/pgf/3.x.nix
index 5c0c387a340b..32c73c4a43cc 100644
--- a/pkgs/tools/typesetting/tex/pgf/3.x.nix
+++ b/pkgs/tools/typesetting/tex/pgf/3.x.nix
@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "pgf-3.00";
 
   src = fetchurl {
-    url = http://downloads.sourceforge.net/project/pgf/pgf/version%203.0.0/pgf_3.0.0.tds.zip;
+    url = mirror://sourceforge/project/pgf/pgf/version%203.0.0/pgf_3.0.0.tds.zip;
     sha256 = "0kj769hyp4z2zmdv3f8xv443wcfqn5nkkbzxzqgfxjizlz81aav7";
   };
 

From c08f18df639dcd8944f6f3feb808aeb46a528d99 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 26 Feb 2016 14:34:19 +0000
Subject: [PATCH 1966/2285] cide: 0.8.1 -> 0.9.0

---
 .../continuous-integration/cide/Gemfile.lock  |  2 +-
 .../continuous-integration/cide/default.nix   |  6 ++---
 .../continuous-integration/cide/gemset.nix    | 24 +++++++++----------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/cide/Gemfile.lock b/pkgs/development/tools/continuous-integration/cide/Gemfile.lock
index 7db1b9db9b37..736b2bfca1a2 100644
--- a/pkgs/development/tools/continuous-integration/cide/Gemfile.lock
+++ b/pkgs/development/tools/continuous-integration/cide/Gemfile.lock
@@ -11,7 +11,7 @@ GEM
       descendants_tracker (~> 0.0.4)
       ice_nine (~> 0.11.0)
       thread_safe (~> 0.3, >= 0.3.1)
-    cide (0.8.1)
+    cide (0.9.0)
       thor (~> 0.19)
       virtus (~> 1.0)
     coercible (1.0.0)
diff --git a/pkgs/development/tools/continuous-integration/cide/default.nix b/pkgs/development/tools/continuous-integration/cide/default.nix
index c8c35330e30e..4a64d8bf303e 100644
--- a/pkgs/development/tools/continuous-integration/cide/default.nix
+++ b/pkgs/development/tools/continuous-integration/cide/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, lib, bundlerEnv, makeWrapper, docker, git }:
+{ stdenv, lib, bundlerEnv, makeWrapper, docker, git, gnutar, gzip }:
 
 stdenv.mkDerivation rec {
   name = "cide-${version}";
-  version = "0.8.1";
+  version = "0.9.0";
 
   env = bundlerEnv {
     name = "${name}-gems";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     mkdir -p $out/bin
     makeWrapper ${env}/bin/cide $out/bin/cide \
-      --set PATH ${docker}/bin:${git}/bin
+      --set PATH ${docker}/bin:${git}/bin:${gnutar}/bin:${gzip}/bin
   '';
 
   meta = with lib; {
diff --git a/pkgs/development/tools/continuous-integration/cide/gemset.nix b/pkgs/development/tools/continuous-integration/cide/gemset.nix
index 2d5df24bb450..df8f7c9f2088 100644
--- a/pkgs/development/tools/continuous-integration/cide/gemset.nix
+++ b/pkgs/development/tools/continuous-integration/cide/gemset.nix
@@ -22,20 +22,20 @@
     version = "0.19.1";
   };
   jmespath = {
-    version = "1.1.3";
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
       sha256 = "0vpvd61kc60f98jn28kw7x7vi82qrwgglam42nvzh98i43yxwsfb";
+      type = "gem";
     };
+    version = "1.1.3";
   };
   ice_nine = {
-    version = "0.11.2";
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
       sha256 = "1nv35qg1rps9fsis28hz2cq2fx1i96795f91q4nmkm934xynll2x";
+      type = "gem";
     };
+    version = "0.11.2";
   };
   equalizer = {
     source = {
@@ -61,11 +61,11 @@
     version = "1.0.0";
   };
   cide = {
-    version = "0.8.1";
+    version = "0.9.0";
     source = {
       type = "gem";
       remotes = ["https://rubygems.org"];
-      sha256 = "1vsa7smab5dj6mcf0csl9wm18x95h6yphm7x18is53bv5hrzgill";
+      sha256 = "1wykwv0jnrh49jm9zsy1cb5wddv65iw4ixh072hr242wb83dcyl0";
     };
   };
   axiom-types = {
@@ -77,27 +77,27 @@
     version = "0.1.1";
   };
   aws-sdk-resources = {
-    version = "2.2.17";
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
       sha256 = "0vdnpjmil99n9d1fpk1w6ssgvmzx4wfmrqcij8nyd0iqdaacx3fj";
+      type = "gem";
     };
+    version = "2.2.17";
   };
   aws-sdk-core = {
-    version = "2.2.17";
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
       sha256 = "1vq7ny5n3rdfzkdqdm76r48slmp2a5v7565llrl4bw5hb5k4p75z";
+      type = "gem";
     };
+    version = "2.2.17";
   };
   aws-sdk = {
-    version = "2.2.17";
     source = {
-      type = "gem";
       remotes = ["https://rubygems.org"];
       sha256 = "1cwycrdk21blzjzf8fj1wlmdix94rj9aixj6phx6lwbqykn2dzx9";
+      type = "gem";
     };
+    version = "2.2.17";
   };
 }
\ No newline at end of file

From 1af8a3498cdc9c2441b20475e39123855b543cf8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 28 Feb 2016 15:46:39 +0300
Subject: [PATCH 1967/2285] apitrace: add qapitrace and backtracing support

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

diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix
index f54628e0b8de..e130b23a8aaa 100644
--- a/pkgs/applications/graphics/apitrace/default.nix
+++ b/pkgs/applications/graphics/apitrace/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, libX11, procps, python, qtbase }:
+{ stdenv, fetchFromGitHub, cmake, libX11, procps, python, libdwarf, qtbase, qtwebkit }:
 
 stdenv.mkDerivation rec {
   name = "apitrace-${version}";
@@ -11,13 +11,11 @@ stdenv.mkDerivation rec {
     owner = "apitrace";
   };
 
-  buildInputs = [ libX11 procps python qtbase ];
-  nativeBuildInputs = [ cmake ];
+  # LD_PRELOAD wrappers need to be statically linked to work against all kinds
+  # of games -- so it's fine to use e.g. bundled snappy.
+  buildInputs = [ libX11 procps python libdwarf qtbase qtwebkit ];
 
-  buildPhase = ''
-    cmake
-    make
-  '';
+  nativeBuildInputs = [ cmake ];
 
   meta = with stdenv.lib; {
     homepage = https://apitrace.github.io;

From 4e2fe6e5794a78173f415dfb3d2afa3d499065db Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 28 Feb 2016 07:03:49 -0600
Subject: [PATCH 1968/2285] m17n-db: fix path to charmaps

---
 pkgs/tools/inputmethods/m17n-db/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/m17n-db/default.nix b/pkgs/tools/inputmethods/m17n-db/default.nix
index fbe7188ef9ac..944d6de1084a 100644
--- a/pkgs/tools/inputmethods/m17n-db/default.nix
+++ b/pkgs/tools/inputmethods/m17n-db/default.nix
@@ -1,4 +1,4 @@
-{stdenv, fetchurl, gettext}:
+{ stdenv, fetchurl, gettext }:
 
 stdenv.mkDerivation rec {
   name = "m17n-db-1.7.0";
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ gettext ];
 
   configureFlags = stdenv.lib.optional (stdenv ? glibc)
-    "--with-charmaps=${stdenv.glibc}/share/i18n/charmaps"
+    "--with-charmaps=${stdenv.glibc.out}/share/i18n/charmaps"
   ;
 
   meta = {

From a91161aa57f7cfe447a551bafc2d7c6c6bbbe44b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 27 Feb 2016 06:16:42 -0600
Subject: [PATCH 1969/2285] nixos: remove qtPlugins and gtkPlugins

Both Qt and GTK load plugins from the active profiles
automatically, so it is sufficient to install input methods
system-wide. Overriding the plugin paths may interfere with correct
operation of other plugins.
---
 nixos/modules/config/gtk-exe-env.nix     | 41 ------------------------
 nixos/modules/config/qt-plugin-env.nix   | 37 ---------------------
 nixos/modules/i18n/inputMethod/fcitx.nix |  2 --
 nixos/modules/i18n/inputMethod/nabi.nix  |  1 -
 nixos/modules/i18n/inputMethod/uim.nix   |  2 --
 nixos/modules/module-list.nix            |  2 --
 6 files changed, 85 deletions(-)
 delete mode 100644 nixos/modules/config/gtk-exe-env.nix
 delete mode 100644 nixos/modules/config/qt-plugin-env.nix

diff --git a/nixos/modules/config/gtk-exe-env.nix b/nixos/modules/config/gtk-exe-env.nix
deleted file mode 100644
index b565072e3a71..000000000000
--- a/nixos/modules/config/gtk-exe-env.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-  ];
-
-  options = {
-    gtkPlugins = lib.mkOption {
-      type = lib.types.listOf lib.types.path;
-      default = [];
-      description = ''
-        Plugin packages for GTK+ such as input methods.
-      '';
-    };
-  };
-
-  config = {
-    environment.variables = if builtins.length config.gtkPlugins > 0
-      then
-        let
-          paths = [ pkgs.gtk2 pkgs.gtk3 ] ++ config.gtkPlugins;
-          env = pkgs.buildEnv {
-            name = "gtk-exe-env";
-
-            inherit paths;
-
-            postBuild = lib.concatStringsSep "\n"
-              (map (d: d.gtkExeEnvPostBuild or "") paths);
-
-            ignoreCollisions = true;
-          };
-        in {
-          GTK_EXE_PREFIX = builtins.toString env;
-          GTK_PATH = [
-            "${env}/lib/gtk-2.0"
-            "${env}/lib/gtk-3.0"
-          ];
-        }
-      else {};
-  };
-}
diff --git a/nixos/modules/config/qt-plugin-env.nix b/nixos/modules/config/qt-plugin-env.nix
deleted file mode 100644
index c59865604165..000000000000
--- a/nixos/modules/config/qt-plugin-env.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-  ];
-
-  options = {
-    qtPlugins = lib.mkOption {
-      type = lib.types.listOf lib.types.path;
-      default = [];
-      description = ''
-        Plugin packages for Qt such as input methods.
-      '';
-    };
-  };
-
-  config = {
-    environment.variables = if builtins.length config.qtPlugins > 0
-      then
-        let
-          paths = [ pkgs.qt48 ] ++ config.qtPlugins;
-          env = pkgs.buildEnv {
-            name = "qt-plugin-env";
-
-            inherit paths;
-
-            postBuild = lib.concatStringsSep "\n"
-              (map (d: d.qtPluginEnvPostBuild or "") paths);
-
-            ignoreCollisions = true;
-          };
-        in {
-          QT_PLUGIN_PATH = [ (builtins.toString env) ];
-        }
-      else {};
-  };
-}
diff --git a/nixos/modules/i18n/inputMethod/fcitx.nix b/nixos/modules/i18n/inputMethod/fcitx.nix
index f168f4451703..f73554b3edd2 100644
--- a/nixos/modules/i18n/inputMethod/fcitx.nix
+++ b/nixos/modules/i18n/inputMethod/fcitx.nix
@@ -29,8 +29,6 @@ in
 
   config = mkIf (config.i18n.inputMethod.enabled == "fcitx") {
     environment.systemPackages = [ fcitxPackage ];
-    gtkPlugins = [ fcitxPackage ];
-    qtPlugins  = [ fcitxPackage ];
 
     environment.variables = {
       GTK_IM_MODULE = "fcitx";
diff --git a/nixos/modules/i18n/inputMethod/nabi.nix b/nixos/modules/i18n/inputMethod/nabi.nix
index 8c3965955130..c6708365effa 100644
--- a/nixos/modules/i18n/inputMethod/nabi.nix
+++ b/nixos/modules/i18n/inputMethod/nabi.nix
@@ -4,7 +4,6 @@ with lib;
 {
   config = mkIf (config.i18n.inputMethod.enabled == "nabi") {
     environment.systemPackages = [ pkgs.nabi ];
-    qtPlugins  = [ pkgs.nabi ];
 
     environment.variables = {
       GTK_IM_MODULE = "nabi";
diff --git a/nixos/modules/i18n/inputMethod/uim.nix b/nixos/modules/i18n/inputMethod/uim.nix
index 401e1932f70c..f8a3e560656d 100644
--- a/nixos/modules/i18n/inputMethod/uim.nix
+++ b/nixos/modules/i18n/inputMethod/uim.nix
@@ -23,8 +23,6 @@ in
 
   config = mkIf (config.i18n.inputMethod.enabled == "uim") {
     environment.systemPackages = [ pkgs.uim ];
-    gtkPlugins = [ pkgs.uim ];
-    qtPlugins  = [ pkgs.uim ];
 
     environment.variables = {
       GTK_IM_MODULE = "uim";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index a50b17068f66..738b52854de3 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -7,7 +7,6 @@
   ./config/fonts/fonts.nix
   ./config/fonts/ghostscript.nix
   ./config/gnu.nix
-  ./config/gtk-exe-env.nix
   ./config/i18n.nix
   ./config/krb5.nix
   ./config/ldap.nix
@@ -16,7 +15,6 @@
   ./config/nsswitch.nix
   ./config/power-management.nix
   ./config/pulseaudio.nix
-  ./config/qt-plugin-env.nix
   ./config/shells-environment.nix
   ./config/swap.nix
   ./config/sysctl.nix

From efad7bd47d3e2864ba2c28c2fd5ec0bd22dd9200 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 27 Feb 2016 06:20:19 -0600
Subject: [PATCH 1970/2285] fcitx: show available engines in module description

---
 nixos/modules/i18n/inputMethod/fcitx.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/i18n/inputMethod/fcitx.nix b/nixos/modules/i18n/inputMethod/fcitx.nix
index f73554b3edd2..8e31743504f1 100644
--- a/nixos/modules/i18n/inputMethod/fcitx.nix
+++ b/nixos/modules/i18n/inputMethod/fcitx.nix
@@ -18,10 +18,14 @@ in
         type    = with types; listOf fcitxEngine;
         default = [];
         example = literalExample "with pkgs.fcitx-engines; [ mozc hangul ]";
-        description = ''
-          Enabled Fcitx engines.
-          Available engines can be found by running `nix-env "&lt;nixpkgs&gt;" . -qaP -A fcitx-engines`.
-        '';
+        description =
+          let
+            engines =
+              lib.concatStringsSep ", "
+              (map (name: "<literal>${name}</literal>")
+               (lib.attrNames pkgs.fcitx-engines));
+          in
+            "Enabled Fcitx engines. Available engines are: ${engines}.";
       };
     };
 

From 3a8a887cfd4b62e24353e29f173e0272a3ca6f3a Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 27 Feb 2016 06:30:04 -0600
Subject: [PATCH 1971/2285] ibus-with-plugins: replace ibus wrappers

---
 pkgs/tools/inputmethods/ibus/wrapper.nix | 13 ++++++++++---
 pkgs/top-level/all-packages.nix          |  1 +
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix
index 3bccad1cc0c9..72fbaef6604a 100644
--- a/pkgs/tools/inputmethods/ibus/wrapper.nix
+++ b/pkgs/tools/inputmethods/ibus/wrapper.nix
@@ -1,11 +1,15 @@
-{ stdenv, runCommand, ibus, lndir, makeWrapper, plugins, hicolor_icon_theme }:
+{ stdenv, runCommand, makeWrapper, lndir
+, dconf, hicolor_icon_theme, ibus, plugins
+}:
 
 let
   name = "ibus-with-plugins-" + (builtins.parseDrvName ibus.name).version;
   env = {
+    buildInputs = [ ibus ] ++ plugins;
     nativeBuildInputs = [ lndir makeWrapper ];
     propagatedUserEnvPackages = [ hicolor_icon_theme ];
     paths = [ ibus ] ++ plugins;
+    inherit (ibus) meta;
   };
   command = ''
     for dir in bin etc lib libexec share; do
@@ -19,7 +23,8 @@ let
 
     for prog in ibus ibus-daemon ibus-setup; do
         wrapProgram "$out/bin/$prog" \
-          --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share" \
+          --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
+          --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \
           --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \
           --set IBUS_DATAROOTDIR "$out/share" \
           --set IBUS_LIBEXECDIR "$out/libexec" \
@@ -29,7 +34,9 @@ let
           --set IBUS_TABLE_DATA_DIR "$out/share" \
           --set IBUS_TABLE_LIB_LOCATION "$out/libexec" \
           --set IBUS_TABLE_LOCATION "$out/share/ibus-table" \
-          --set IBUS_TABLE_DEBUG_LEVEL 1
+          --prefix PYTHONPATH : "$PYTHONPATH" \
+          --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
+          --suffix XDG_DATA_DIRS : "${hicolor_icon_theme}/share"
     done
   '';
 in
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 08517163ebc7..75565c0f5e02 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1198,6 +1198,7 @@ let
   };
 
   ibus-with-plugins = callPackage ../tools/inputmethods/ibus/wrapper.nix {
+    inherit (gnome3) dconf;
     plugins = [ ];
   };
 

From c62bf00442fa2af30feb50eafd3cf19c10077203 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sat, 27 Feb 2016 07:47:37 -0600
Subject: [PATCH 1972/2285] nixos: remove top-level uim option

---
 nixos/modules/module-list.nix  |  1 -
 nixos/modules/programs/uim.nix | 31 -------------------------------
 2 files changed, 32 deletions(-)
 delete mode 100644 nixos/modules/programs/uim.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 738b52854de3..ad1636e002d8 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -77,7 +77,6 @@
   ./programs/shell.nix
   ./programs/ssh.nix
   ./programs/ssmtp.nix
-  ./programs/uim.nix
   ./programs/venus.nix
   ./programs/wvdial.nix
   ./programs/xfs_quota.nix
diff --git a/nixos/modules/programs/uim.nix b/nixos/modules/programs/uim.nix
deleted file mode 100644
index 4bf2f9a17571..000000000000
--- a/nixos/modules/programs/uim.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.uim;
-in
-{
-  options = {
-
-    uim = {
-      enable = mkOption {
-        type = types.bool;
-        default = false;
-        example = true;
-        description = "Enable UIM input method";
-      };
-    };
-
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = [ pkgs.uim ];
-    gtkPlugins = [ pkgs.uim ];
-    qtPlugins = [ pkgs.uim ];
-    environment.variables.GTK_IM_MODULE = "uim";
-    environment.variables.QT_IM_MODULE = "uim";
-    environment.variables.XMODIFIERS = "@im=uim";
-    services.xserver.displayManager.sessionCommands = "uim-xim &";
-  };
-}

From 41204574bed6a304e41ad61f18338d83df2cdd2f Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 28 Feb 2016 07:10:11 -0600
Subject: [PATCH 1973/2285] ibus-m17n: use Python 3

---
 .../ibus-engines/ibus-m17n/default.nix             | 14 +++++++++-----
 pkgs/top-level/all-packages.nix                    |  4 +++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
index c6c43d058982..81bfffb25464 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-m17n/default.nix
@@ -1,5 +1,7 @@
-{ stdenv, fetchFromGitHub, ibus, m17n_lib, m17n_db, automake, autoconf,
-  gettext, libtool, pkgconfig, python, pythonPackages }:
+{ stdenv, fetchFromGitHub
+, automake, autoconf, libtool, pkgconfig
+, ibus, m17n_lib, m17n_db, gettext, python3, pygobject3
+}:
 
 stdenv.mkDerivation rec {
   name = "ibus-m17n-${version}";
@@ -12,11 +14,13 @@ stdenv.mkDerivation rec {
     sha256 = "1n0bvgc4jyksgvzrw5zs2pxcpxcn3gcc0j2kasbznm34fpv3frsr";
   };
 
-  buildInputs = [ 
-    ibus m17n_lib m17n_db automake autoconf gettext 
-    libtool pkgconfig python pythonPackages.pygobject3 
+  buildInputs = [
+    ibus m17n_lib m17n_db gettext
+    python3 pygobject3
   ];
 
+  nativeBuildInputs = [ automake autoconf libtool pkgconfig ];
+
   preConfigure = ''
     autoreconf --verbose --force --install
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 75565c0f5e02..ef6dc1f6f3b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1180,7 +1180,9 @@ let
       inherit (python3Packages) pygobject3;
     };
 
-    m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n { };
+    m17n = callPackage ../tools/inputmethods/ibus-engines/ibus-m17n {
+      inherit (python3Packages) pygobject3;
+    };
 
     mozc = callPackage ../tools/inputmethods/ibus-engines/ibus-mozc {
       inherit (pythonPackages) gyp;

From fde23a01b4778bd5e044e8e80458ed4dd8c29dca Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sun, 28 Feb 2016 14:54:25 +0100
Subject: [PATCH 1974/2285] nixos/collectd: Fix package option

Commit ed979124cad7596de539188e86664b3784c363ca was missing some code.
---
 nixos/modules/services/monitoring/collectd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/collectd.nix b/nixos/modules/services/monitoring/collectd.nix
index a3280b08bd0c..3c3d83c66ed0 100644
--- a/nixos/modules/services/monitoring/collectd.nix
+++ b/nixos/modules/services/monitoring/collectd.nix
@@ -100,7 +100,7 @@ in {
       wantedBy = [ "multi-user.target" ];
 
       serviceConfig = {
-        ExecStart = "${pkgs.collectd}/sbin/collectd -C ${conf} -P ${cfg.pidFile}";
+        ExecStart = "${cfg.package}/sbin/collectd -C ${conf} -P ${cfg.pidFile}";
         Type = "forking";
         PIDFile = cfg.pidFile;
         User = optional (cfg.user!="root") cfg.user;

From 070dccae7bbb61166fabd7b1cea15c46894ac3aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 28 Feb 2016 13:31:35 +0100
Subject: [PATCH 1975/2285] gitstats: init at 2016-01-08

Upstream does not make releases, using latest commit from master branch.
---
 .../version-management/gitstats/default.nix   | 39 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/applications/version-management/gitstats/default.nix

diff --git a/pkgs/applications/version-management/gitstats/default.nix b/pkgs/applications/version-management/gitstats/default.nix
new file mode 100644
index 000000000000..64b6e2107f6a
--- /dev/null
+++ b/pkgs/applications/version-management/gitstats/default.nix
@@ -0,0 +1,39 @@
+{ stdenv, fetchzip, perl, python, gnuplot, coreutils, gnugrep }:
+
+stdenv.mkDerivation rec {
+  name = "gitstats-${version}";
+  version = "2016-01-08";
+
+  # upstream does not make releases
+  src = fetchzip {
+    url = "https://github.com/hoxu/gitstats/archive/55c5c285558c410bb35ebf421245d320ab9ee9fa.zip";
+    sha256 = "1bfcwhksylrpm88vyp33qjby4js31zcxy7w368dzjv4il3fh2i59";
+    name = name + "-src";
+  };
+
+  buildInputs = [ perl python ];
+
+  postPatch = ''
+    sed -e "s|gnuplot_cmd = .*|gnuplot_cmd = '${gnuplot}/bin/gnuplot'|" \
+        -e "s|\<wc\>|${coreutils}/bin/wc|g" \
+        -e "s|\<grep\>|${gnugrep}/bin/grep|g" \
+        -i gitstats
+  '';
+
+  buildPhase = ''
+    make man VERSION="${version}"
+  '';
+
+  installPhase = ''
+    make install PREFIX="$out" VERSION="${version}"
+    install -Dm644 doc/gitstats.1 "$out"/share/man/man1/gitstats.1
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://gitstats.sourceforge.net/;
+    description = "Git history statistics generator";
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
+    maintainers = [ maintainers.bjornfor ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef6dc1f6f3b4..414fd2ae30ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1730,6 +1730,8 @@ let
 
   gitlab-workhorse = callPackage ../applications/version-management/gitlab-workhorse { };
 
+  gitstats = callPackage ../applications/version-management/gitstats { };
+
   git-latexdiff = callPackage ../tools/typesetting/git-latexdiff { };
 
   glusterfs = callPackage ../tools/filesystems/glusterfs { };

From 75e96d2c30cf0a138e98d5611aa80465d92d9e43 Mon Sep 17 00:00:00 2001
From: Joel Moberg <joel.moberg@gmail.com>
Date: Sun, 28 Feb 2016 16:03:47 +0100
Subject: [PATCH 1976/2285] avahi: fix test

Reflects module changes made by cdd7310a503481e3c40266be45b6b8256d95ecbd
---
 nixos/tests/avahi.nix | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/nixos/tests/avahi.nix b/nixos/tests/avahi.nix
index a8369a6d1f88..976a770e887c 100644
--- a/nixos/tests/avahi.nix
+++ b/nixos/tests/avahi.nix
@@ -5,18 +5,21 @@ import ./make-test.nix ({ pkgs, ... } : {
     maintainers = [ eelco chaoflow ];
   };
 
-  nodes = {
-    one =
-      { config, pkgs, ... }: {
-        services.avahi.enable = true;
-        services.avahi.nssmdns = true;
-      };
-
-    two =
-      { config, pkgs, ... }: {
-        services.avahi.enable = true;
-        services.avahi.nssmdns = true;
+  nodes = let
+    cfg = { config, pkgs, ... }: {
+      services.avahi = {
+        enable = true;
+        nssmdns = true;
+        publish.addresses = true;
+        publish.domain = true;
+        publish.enable = true;
+        publish.userServices = true;
+        publish.workstation = true;
       };
+    };
+  in {
+    one = cfg;
+    two = cfg;
   };
 
   testScript =

From ab746ec90238fe1b0c47054adef199c7a22d28c1 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Sun, 28 Feb 2016 09:30:09 -0600
Subject: [PATCH 1977/2285] ibus: consolidate wrappers

---
 .../ibus-engines/ibus-anthy/default.nix       | 25 ++++++-----------
 .../ibus-engines/ibus-hangul/default.nix      | 15 +++--------
 .../ibus-engines/ibus-table/default.nix       | 27 +++----------------
 pkgs/tools/inputmethods/ibus/wrapper.nix      |  3 ++-
 4 files changed, 17 insertions(+), 53 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
index 2494c75a06c6..50059e9477a9 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-anthy/default.nix
@@ -1,6 +1,5 @@
-{ stdenv, fetchFromGitHub, makeWrapper, ibus, anthy, intltool
-, pkgconfig, glib, gobjectIntrospection
-, python3, pygobject3, gtk3, libtool, automake, autoconf
+{ stdenv, fetchurl, intltool, pkgconfig
+, anthy, ibus, glib, gobjectIntrospection, gtk3, python3, pygobject3
 }:
 
 stdenv.mkDerivation rec {
@@ -16,28 +15,20 @@ stdenv.mkDerivation rec {
     maintainers  = with maintainers; [ gebner ericsagnes ];
   };
 
-  preConfigure = "./autogen.sh --prefix=$out";
-
   configureFlags = "--with-anthy-zipcode=${anthy}/share/anthy/zipcode.t";
 
   buildInputs = [
-    makeWrapper ibus anthy intltool pkgconfig glib gobjectIntrospection
-    python3 pygobject3 gtk3 libtool automake autoconf
+    anthy glib gobjectIntrospection gtk3 ibus python3 pygobject3
   ];
 
+  nativeBuildInputs = [ intltool pkgconfig ];
+
   postFixup = ''
     substituteInPlace $out/share/ibus/component/anthy.xml --replace \$\{exec_prefix\} $out
-    for file in "$out"/libexec/*; do # */
-      wrapProgram "$file" \
-        --prefix PYTHONPATH : $PYTHONPATH \
-        --prefix GI_TYPELIB_PATH : $GI_TYPELIB_PATH:$out/lib/girepository-1.0
-    done
   '';
 
-  src = fetchFromGitHub {
-    owner  = "ibus";
-    repo   = "ibus-anthy";
-    rev    = version;
-    sha256 = "1laxwpnhgihv4dz5cgcz6d0a0880r93n7039ciz1m53hdzapwi4a";
+  src = fetchurl {
+    url = "https://github.com/ibus/ibus-anthy/releases/download/${version}/${name}.tar.gz";
+    sha256 = "1aj7vnfky7izl23xyjky78z3qas3q72l3kr8dnql2lnivsrb8q1y";
   };
 }
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
index a5732f2a88bd..1ada62580dbc 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-hangul/default.nix
@@ -1,5 +1,4 @@
-{ stdenv, fetchurl, makeWrapper
-, intltool, pkgconfig
+{ stdenv, fetchurl, intltool, pkgconfig
 , gtk3, ibus, libhangul, librsvg, python3, pygobject3
 }:
 
@@ -9,20 +8,12 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/choehwanjin/ibus-hangul/releases/download/${version}/${name}.tar.gz";
-    sha256 = null;
+    sha256 = "120p9w7za6hi521hz8q235fkl4i3p1qqr8nqm4a3kxr0pcq40bd2";
   };
 
   buildInputs = [ gtk3 ibus libhangul python3 pygobject3 ];
 
-  nativeBuildInputs = [ intltool makeWrapper pkgconfig ];
-
-  postInstall = ''
-    wrapProgram $out/bin/ibus-setup-hangul \
-      --prefix PYTHONPATH : $PYTHONPATH \
-      --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
-      --prefix GDK_PIXBUF_MODULE_FILE : ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
-      --prefix LD_LIBRARY_PATH : ${libhangul}/lib
-  '';
+  nativeBuildInputs = [ intltool pkgconfig ];
 
   meta = with stdenv.lib; {
     isIbusEngine = true;
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index 3d78a8ec69e7..b44bea9119a2 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, makeWrapper, ibus, pkgconfig, python3, pygobject3
-, gtk3, atk, dconf, gobjectIntrospection }:
+{ stdenv, fetchurl, pkgconfig
+, gtk3, dconf, gobjectIntrospection, ibus, python3, pygobject3 }:
 
 stdenv.mkDerivation rec {
   name = "ibus-table-${version}";
@@ -25,29 +25,10 @@ stdenv.mkDerivation rec {
   '';
 
   buildInputs = [
-    gtk3 dconf gobjectIntrospection
-    ibus
-    pkgconfig
-    python3 pygobject3
+    dconf gtk3 gobjectIntrospection ibus python3 pygobject3
   ];
 
-  nativeBuildInputs = [ makeWrapper ];
-
-  preFixup = ''
-    for prog in "$out/bin"/*; do #*/
-      wrapProgram "$prog" \
-        --prefix XDG_DATA_DIRS : "$out/share:$GSETTINGS_SCHEMAS_PATH" \
-        --prefix PYTHONPATH : "$PYTHONPATH" \
-        --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
-        --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules"
-    done
-
-    for prog in "$out/libexec"/*; do #*/
-      wrapProgram "$prog" \
-        --prefix PYTHONPATH : "$PYTHONPATH" \
-        --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0"
-    done
-  '';
+  nativeBuildInputs = [ pkgconfig ];
 
   meta = with stdenv.lib; {
     isIbusEngine = true;
diff --git a/pkgs/tools/inputmethods/ibus/wrapper.nix b/pkgs/tools/inputmethods/ibus/wrapper.nix
index 72fbaef6604a..632f46f81e94 100644
--- a/pkgs/tools/inputmethods/ibus/wrapper.nix
+++ b/pkgs/tools/inputmethods/ibus/wrapper.nix
@@ -1,5 +1,5 @@
 { stdenv, runCommand, makeWrapper, lndir
-, dconf, hicolor_icon_theme, ibus, plugins
+, dconf, hicolor_icon_theme, ibus, librsvg, plugins
 }:
 
 let
@@ -23,6 +23,7 @@ let
 
     for prog in ibus ibus-daemon ibus-setup; do
         wrapProgram "$out/bin/$prog" \
+          --prefix GDK_PIXBUF_MODULE_FILE : ${librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache \
           --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH:$out/lib/girepository-1.0" \
           --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" \
           --set IBUS_COMPONENT_PATH "$out/share/ibus/component/" \

From 3a6b06f1be55fa7b3ea79c81898921d6c0a5e6bc Mon Sep 17 00:00:00 2001
From: Ozan Sener <ozan@ozansener.com>
Date: Sun, 28 Feb 2016 17:45:53 +0200
Subject: [PATCH 1978/2285] wring: init at 1.0.0

---
 pkgs/tools/text/wring/default.nix        | 26 ++++++++++++++++++++++++
 pkgs/tools/text/wring/node-packages.json |  1 +
 pkgs/tools/text/wring/node-packages.nix  | 24 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 4 files changed, 53 insertions(+)
 create mode 100644 pkgs/tools/text/wring/default.nix
 create mode 100644 pkgs/tools/text/wring/node-packages.json
 create mode 100644 pkgs/tools/text/wring/node-packages.nix

diff --git a/pkgs/tools/text/wring/default.nix b/pkgs/tools/text/wring/default.nix
new file mode 100644
index 000000000000..038456f82c5b
--- /dev/null
+++ b/pkgs/tools/text/wring/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, callPackage, makeWrapper, nodejs, phantomjs2 }:
+
+let
+  self = (
+    callPackage ../../../top-level/node-packages.nix {
+      generated = callPackage ./node-packages.nix { inherit self; };
+      overrides = {
+        "wring" = {
+          buildInputs = [ makeWrapper phantomjs2 ];
+
+          postInstall = ''
+            wrapProgram "$out/bin/wring" \
+              --prefix PATH : ${phantomjs2}/bin
+          '';
+
+          meta = with stdenv.lib; {
+            description = "Command-line tool for extracting content from webpages using CSS Selectors, XPath, and JS expressions";
+            homepage = https://github.com/osener/wring;
+            license = licenses.mit;
+            platforms = platforms.darwin ++ platforms.linux;
+            maintainers = [ maintainers.osener ];
+          };
+        };
+      };
+    });
+in self.wring
diff --git a/pkgs/tools/text/wring/node-packages.json b/pkgs/tools/text/wring/node-packages.json
new file mode 100644
index 000000000000..9c0e17129286
--- /dev/null
+++ b/pkgs/tools/text/wring/node-packages.json
@@ -0,0 +1 @@
+[ "wring" ]
diff --git a/pkgs/tools/text/wring/node-packages.nix b/pkgs/tools/text/wring/node-packages.nix
new file mode 100644
index 000000000000..b3761bd33cb6
--- /dev/null
+++ b/pkgs/tools/text/wring/node-packages.nix
@@ -0,0 +1,24 @@
+{ self, fetchurl, fetchgit ? null, lib }:
+
+{
+  by-spec."wring"."*" =
+    self.by-version."wring"."1.0.0";
+  by-version."wring"."1.0.0" = self.buildNodePackage {
+    name = "wring-1.0.0";
+    version = "1.0.0";
+    bin = true;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/wring/-/wring-1.0.0.tgz";
+      name = "wring-1.0.0.tgz";
+      sha1 = "3d8ebe894545bf0b42946fdc84c61e37ae657ce1";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "wring" = self.by-version."wring"."1.0.0";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 414fd2ae30ab..a91f320949a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3774,6 +3774,8 @@ let
 
   wml = callPackage ../development/web/wml { };
 
+  wring = callPackage ../tools/text/wring { };
+
   wrk = callPackage ../tools/networking/wrk { };
 
   wv = callPackage ../tools/misc/wv { };

From 850a1a332353e73cb624ce5574fa80e424eb6da1 Mon Sep 17 00:00:00 2001
From: Danny Wilson <danny@prime.vc>
Date: Sun, 28 Feb 2016 18:37:51 +0100
Subject: [PATCH 1979/2285] Fix "nix" stdenv (close #13554)

Broken by changes introduced in d96893647de5c519c458c1254f043f2d67d9b29c
---
 pkgs/stdenv/nix/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/stdenv/nix/default.nix b/pkgs/stdenv/nix/default.nix
index 75e1c3814ed0..30ac92837cba 100644
--- a/pkgs/stdenv/nix/default.nix
+++ b/pkgs/stdenv/nix/default.nix
@@ -18,10 +18,9 @@ import ../generic rec {
     nativePrefix = stdenv.lib.optionalString stdenv.isSunOS "/usr";
     nativeLibc = true;
     inherit stdenv;
-    binutils = pkgs.binutils;
+    inherit (pkgs) binutils coreutils gnugrep;
     cc = pkgs.gcc.cc;
     isGNU = true;
-    coreutils = pkgs.coreutils;
     shell = pkgs.bash + "/bin/sh";
   };
 

From 3747aef768dcb5f16351880daa4f086e88998da6 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Sun, 28 Feb 2016 19:11:34 +0000
Subject: [PATCH 1980/2285] linux-testing: 4.5-rc5 -> 4.5-rc6

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 4b5cd20e831b..9b0ec5c355aa 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.5-rc5";
-  modDirVersion = "4.5.0-rc5";
+  version = "4.5-rc6";
+  modDirVersion = "4.5.0-rc6";
   extraMeta.branch = "4.5";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "06qlypnrlkckxhf3clq6l2d3kps7rwfw811sxapjbnhzjd75fcx8";
+    sha256 = "1cpbg6w0mzlxrc6crgqh5n4c8wxxr4yyikmk0bkpgsbr6qk3bydk";
   };
 
   features.iwlwifi = true;

From fe09260465f74ac9d8143b2773f66a89e9e1c9cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 28 Feb 2016 19:17:52 +0000
Subject: [PATCH 1981/2285] travis-ci: fix /etc/nix/nix.conf population

---
 maintainers/scripts/travis-nox-review-pr.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/travis-nox-review-pr.sh b/maintainers/scripts/travis-nox-review-pr.sh
index 99cf769fcd73..157ccc08f625 100755
--- a/maintainers/scripts/travis-nox-review-pr.sh
+++ b/maintainers/scripts/travis-nox-review-pr.sh
@@ -11,7 +11,7 @@ if [[ $1 == nix ]]; then
 
     # Make sure we can use hydra's binary cache
     sudo mkdir /etc/nix
-    sudo echo "build-max-jobs = 4" > /etc/nix/nix.conf
+    sudo sh -c 'echo "build-max-jobs = 4" > /etc/nix/nix.conf'
 
     # Verify evaluation
     echo "=== Verifying that nixpkgs evaluates..."

From 5e5cd7c93c54c92783394c5b720f616113c77a37 Mon Sep 17 00:00:00 2001
From: "Kovacsics Robert (NixOS)" <kovirobi@gmail.com>
Date: Sun, 28 Feb 2016 13:48:54 +0000
Subject: [PATCH 1982/2285] inferno: 645 -> 785

---
 pkgs/applications/inferno/default.nix | 46 +++++++++++----------------
 1 file changed, 19 insertions(+), 27 deletions(-)

diff --git a/pkgs/applications/inferno/default.nix b/pkgs/applications/inferno/default.nix
index a0e2796a3025..1a720f003004 100644
--- a/pkgs/applications/inferno/default.nix
+++ b/pkgs/applications/inferno/default.nix
@@ -1,55 +1,47 @@
-{ fetchurl, fetchhg, stdenv, xorg, gcc46, makeWrapper }:
+{ fetchurl, fetchhg, stdenv, xorg, makeWrapper }:
 
 stdenv.mkDerivation rec {
   # Inferno is a rolling release from a mercurial repository. For the verison number
   # of the package I'm using the mercurial commit number.
-  version = "645";
-  name = "inferno-${version}";
-
-  # The mercurial repository does not contain all the components needed for the
-  # runtime system. The 'base' package contains these. For this package I download
-  # the base, extract the elements required from that, and add them to the source
-  # pulled from the mercurial repository.
-  srcBase = fetchurl {
-    url = "http://www.vitanuova.com/dist/4e/inferno-20100120.tgz";
-    sha256 = "0msvy3iwl4n5k0ry0xiyysjkq0qsawmwn3hvg67hbi5y8g7f7l88";
-  };
+  rev = "785";
+  name = "inferno-${rev}";
+  host = "Linux";
+  objtype = "386";
 
   src = fetchhg {
-    url    = "https://inferno-os.googlecode.com/hg";
-    rev    = "7ab390b860ca";
-    sha256 = "09y0iclb3yy10gw1p0182sddg64xh60q2fx4ai7lxyfb65i76qbh";
+    url    = "https://bitbucket.org/inferno-os/inferno-os";
+    sha256 = "1b428ma9fi5skvfrxp91dr43a62kax89wmx7950ahc1cxyx90k7x";
   };
 
-  # Fails with gcc48 due to inferno triggering an optimisation issue with floating point.
-  buildInputs = [ gcc46 xorg.libX11 xorg.libXpm xorg.libXext xorg.xextproto makeWrapper ];
+  buildInputs = [ makeWrapper ] ++ (with xorg; [ libX11 libXpm libXext xextproto ]);
 
   infernoWrapper = ./inferno;
 
   configurePhase = ''
-    tar --strip-components=1 -xvf $srcBase inferno/fonts inferno/Mkdirs inferno/empties
-    sed -e 's@^ROOT=.*$@ROOT='"$out"'/share/inferno@g' -e 's@^OBJTYPE=.*$@OBJTYPE=386@g' -e 's@^SYSHOST=.*$@SYSHOST=Linux@g' -i mkconfig
-    mkdir prof
-    sh Mkdirs
+    sed -e 's@^ROOT=.*$@ROOT='"$out"'/share/inferno@g' \
+        -e 's@^OBJTYPE=.*$@OBJTYPE=${objtype}@g' \
+        -e 's@^SYSHOST=.*$@SYSHOST=${host}@g' \
+        -i mkconfig
+    # Get rid of an annoying warning
+    sed -e 's/_BSD_SOURCE/_DEFAULT_SOURCE/g' \
+        -i ${host}/${objtype}/include/lib9.h
   '';
 
   buildPhase = ''
-    export PATH=$PATH:$out/share/inferno/Linux/386/bin
     mkdir -p $out/share/inferno
     cp -r . $out/share/inferno
     ./makemk.sh
+    export PATH=$PATH:$out/share/inferno/Linux/386/bin
     mk nuke
     mk
   '';
 
   installPhase = ''
+    # Installs executables in $out/share/inferno/${host}/${objtype}/bin
     mk install
     mkdir -p $out/bin
-    makeWrapper $out/share/inferno/Linux/386/bin/emu $out/bin/emu \
-      --suffix LD_LIBRARY_PATH ':' "${gcc46.cc}/lib" \
-      --suffix PATH ':' "$out/share/inferno/Linux/386/bin"
+    # Install start-up script
     makeWrapper $infernoWrapper $out/bin/inferno \
-      --suffix LD_LIBRARY_PATH ':' "${gcc46.cc}/lib" \
       --suffix PATH ':' "$out/share/inferno/Linux/386/bin" \
       --set INFERNO_ROOT "$out/share/inferno"
   '';
@@ -58,7 +50,7 @@ stdenv.mkDerivation rec {
     description = "A compact distributed operating system for building cross-platform distributed systems";
     homepage = "http://inferno-os.org/";
     license = stdenv.lib.licenses.gpl2;
-    maintainers = [ "Chris Double <chris.double@double.co.nz>" ];
+    maintainers = with stdenv.lib.maintainers; [ doublec kovirobi ];
     platforms = with stdenv.lib.platforms; linux;
   };
 }

From 29852f9d24e9368faad2a6c6709f66c32d706e4f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 28 Feb 2016 23:45:53 +0300
Subject: [PATCH 1983/2285] samba: fix evaluation

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 09c707060b80..d014ba393406 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9848,7 +9848,6 @@ let
   });
 
   samba4Full = lowPrio (samba4.override {
-    enableKerberos  = true;
     enableInfiniband = true;
     enableLDAP = true;
     enablePrinting = true;

From b3faef0d9328446cf819fa897116aff28c10a9f9 Mon Sep 17 00:00:00 2001
From: Michael Ekstrand <md@ekstrandom.net>
Date: Sat, 27 Feb 2016 20:01:34 -0600
Subject: [PATCH 1984/2285] nano: build info manual (close #13527)

Make nano depend use texinfo, so that the built packages include the
info manual, and put it into a separate output.
---
 pkgs/applications/editors/nano/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/nano/default.nix b/pkgs/applications/editors/nano/default.nix
index 9c8238244ff1..61818561f74e 100644
--- a/pkgs/applications/editors/nano/default.nix
+++ b/pkgs/applications/editors/nano/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl
 , ncurses
+, texinfo
 , gettext ? null
 , enableNls ? true
 , enableTiny ? false
@@ -16,7 +17,8 @@ stdenv.mkDerivation rec {
     url = "mirror://gnu/nano/${name}.tar.gz";
     sha256 = "1vl9bim56k1b4zwc3icxp46w6pn6gb042j1h4jlz1jklxxpkwcpz";
   };
-  buildInputs = [ ncurses ] ++ optional enableNls gettext;
+  buildInputs = [ ncurses texinfo ] ++ optional enableNls gettext;
+  outputs = [ "out" "info" ];
   configureFlags = ''
     --sysconfdir=/etc
     ${optionalString (!enableNls) "--disable-nls"}

From a93a2e23609dcc3fc20c84415219a872222d881f Mon Sep 17 00:00:00 2001
From: Scott Olson <scott@solson.me>
Date: Fri, 26 Feb 2016 23:22:34 -0600
Subject: [PATCH 1985/2285] fish: remove kbd dependency on Darwin

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

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 11eeb18661c0..88754fd95a15 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -22,8 +22,10 @@ stdenv.mkDerivation rec {
 
   postInstall = ''
     sed -e "s|expr|${coreutils}/bin/expr|" \
+  '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
         -e "s|if which unicode_start|if true|" \
         -e "s|unicode_start|${kbd}/bin/unicode_start|" \
+  '' + ''
         -i "$out/etc/fish/config.fish"
     sed -e "s|bc|${bc}/bin/bc|" \
         -e "s|/usr/bin/seq|${coreutils}/bin/seq|" \

From da1f465b9472d448ce62ac46fce9f95cfe3f2575 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Mon, 22 Feb 2016 16:25:01 +0100
Subject: [PATCH 1986/2285] fish: fix hidden dependency on utillinux on Linux

---
 pkgs/shells/fish/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 11eeb18661c0..510a9b6f44f9 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ncurses, nettools, python, which, groff, gettext, man_db,
-  bc, libiconv, coreutils, gnused, kbd }:
+  bc, libiconv, coreutils, gnused, kbd, utillinux }:
 
 stdenv.mkDerivation rec {
   name = "fish-${version}";
@@ -43,6 +43,9 @@ stdenv.mkDerivation rec {
            "$out/share/fish/functions/prompt_pwd.fish"
     substituteInPlace "$out/share/fish/functions/fish_default_key_bindings.fish" \
       --replace "clear;" "${ncurses}/bin/clear;"
+  '' + stdenv.lib.optionalString stdenv.isLinux ''
+    substituteInPlace "$out/share/fish/functions/__fish_print_help.fish" \
+      --replace "| ul" "| ${utillinux}/bin/ul" 
   '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
     sed -i "s|(hostname\||(${nettools}/bin/hostname\||" "$out/share/fish/functions/fish_prompt.fish"
     sed -i "s|Popen(\['manpath'|Popen(\['${man_db}/bin/manpath'|" "$out/share/fish/tools/create_manpage_completions.py"

From 010271d47ac86e3a11117c6d5266d2cc77db9b47 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Sun, 28 Feb 2016 22:26:42 +0100
Subject: [PATCH 1987/2285] fish: fix hidden dependency on ${glibc}/bin/getent
 on Linux

---
 pkgs/shells/fish/default.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/shells/fish/default.nix b/pkgs/shells/fish/default.nix
index 510a9b6f44f9..83c8e3c58160 100644
--- a/pkgs/shells/fish/default.nix
+++ b/pkgs/shells/fish/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ncurses, nettools, python, which, groff, gettext, man_db,
-  bc, libiconv, coreutils, gnused, kbd, utillinux }:
+  bc, libiconv, coreutils, gnused, kbd, utillinux, glibc }:
 
 stdenv.mkDerivation rec {
   name = "fish-${version}";
@@ -46,6 +46,10 @@ stdenv.mkDerivation rec {
   '' + stdenv.lib.optionalString stdenv.isLinux ''
     substituteInPlace "$out/share/fish/functions/__fish_print_help.fish" \
       --replace "| ul" "| ${utillinux}/bin/ul" 
+
+    for cur in $out/share/fish/functions/*.fish; do
+      substituteInPlace "$cur" --replace "/usr/bin/getent" "${glibc}/bin/getent" 
+    done
   '' + stdenv.lib.optionalString (!stdenv.isDarwin) ''
     sed -i "s|(hostname\||(${nettools}/bin/hostname\||" "$out/share/fish/functions/fish_prompt.fish"
     sed -i "s|Popen(\['manpath'|Popen(\['${man_db}/bin/manpath'|" "$out/share/fish/tools/create_manpage_completions.py"

From baeedda1a5bef874362af879e0211a225b090670 Mon Sep 17 00:00:00 2001
From: Tom Hunger <tehunger@gmail.com>
Date: Sun, 28 Feb 2016 15:13:23 +0000
Subject: [PATCH 1988/2285] wtforms: Update to 2.1, make work on python3,
 disable tests for now.

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 19c4ce2baabe..23f2affa9c29 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8935,15 +8935,19 @@ in modules // {
   };
 
   wtforms = buildPythonPackage rec {
-    version = "2.0.2";
+    version = "2.1";
     name = "wtforms-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/W/WTForms/WTForms-${version}.zip";
-      md5 = "613cf723ab40537705bec02733c78d95";
+      sha256 = "0vyl26y9cg409cfyj8rhqxazsdnd0jipgjw06civhrd53yyi1pzz";
     };
 
-    propagatedBuildInputs = with self; [ ordereddict Babel ];
+    # Django tests are broken "django.core.exceptions.AppRegistryNotReady: Apps aren't loaded yet."
+    # This is fixed in master I believe but not yet in 2.1;
+    doCheck = false;
+
+    propagatedBuildInputs = with self; ([ Babel ] ++ (optionals isPy26 [ ordereddict ]));
 
     meta = {
       homepage = https://github.com/wtforms/wtforms;

From e1338ad121a636ed45c13a83a74ed5b35fb39b95 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Sun, 28 Feb 2016 14:28:38 -0800
Subject: [PATCH 1989/2285] plexpass: 0.9.15.5.1712 -> 0.9.15.6.1714

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

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index aa27f6dd5324..27cca6653b96 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -5,9 +5,9 @@
 
 let
   plexpkg = if enablePlexPass then {
-    version = "0.9.15.5.1712";
-    vsnHash = "ba5070a";
-    sha256 = "0nwcjlfbs8dacp6wzmga75hkx16ngyaqrmdhcx8vqvgwm8l31rxs";
+    version = "0.9.15.6.1714";
+    vsnHash = "7be11e1";
+    sha256 = "1kyk41qnbm8w5bvnisp3d99cf0r72wvlggfi9h4np7sq4p8ksa0g";
   } else {
     version = "0.9.15.3.1674";
     vsnHash = "f46e7e6";

From f91f3a4c5a7672ead2d9a414acb1415a8bfb8260 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Sun, 28 Feb 2016 14:29:01 -0800
Subject: [PATCH 1990/2285] plex: 0.9.15.3.1674 -> 0.9.15.6.1714

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

diff --git a/pkgs/servers/plex/default.nix b/pkgs/servers/plex/default.nix
index 27cca6653b96..799fea0fe508 100644
--- a/pkgs/servers/plex/default.nix
+++ b/pkgs/servers/plex/default.nix
@@ -9,9 +9,9 @@ let
     vsnHash = "7be11e1";
     sha256 = "1kyk41qnbm8w5bvnisp3d99cf0r72wvlggfi9h4np7sq4p8ksa0g";
   } else {
-    version = "0.9.15.3.1674";
-    vsnHash = "f46e7e6";
-    sha256 = "086njnjcmknmbn90mmvf60ls7q73g2m955yk621jjdngs4ybvm19";
+    version = "0.9.15.6.1714";
+    vsnHash = "7be11e1";
+    sha256 = "1kyk41qnbm8w5bvnisp3d99cf0r72wvlggfi9h4np7sq4p8ksa0g";
   };
 
 in stdenv.mkDerivation rec {

From edb8991a2cbc1339471353531f5e393997491d11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 28 Feb 2016 22:33:43 +0000
Subject: [PATCH 1991/2285] nixos: bump to 16.09

---
 .version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.version b/.version
index 1c1d9713015b..8c9a730caf35 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-16.03
\ No newline at end of file
+16.09

From c483224c82c8e94324c03576e64c5dfbf16bd2f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 28 Feb 2016 23:39:38 +0000
Subject: [PATCH 1992/2285] as always, no newline in .version

---
 .version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.version b/.version
index 8c9a730caf35..18fc8443eecf 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-16.09
+16.09
\ No newline at end of file

From cad8957eabcbf73062226d28366fd446c15c8737 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Sat, 20 Feb 2016 01:47:01 +0100
Subject: [PATCH 1993/2285] Add the tool "nixos-typecheck" that can check an
 option declaration to:

 - Enforce that an option declaration has a "defaultText" if and only if the
   type of the option derives from "package", "packageSet" or "nixpkgsConfig"
   and if a "default" attribute is defined.

 - Enforce that the value of the "example" attribute is wrapped with "literalExample"
   if the type of the option derives from "package", "packageSet" or "nixpkgsConfig".

 - Warn if a "defaultText" is defined in an option declaration if the type of
   the option does not derive from "package", "packageSet" or "nixpkgsConfig".

 - Warn if no "type" is defined in an option declaration.
---
 lib/modules.nix                               |  99 ++++++--
 lib/options.nix                               | 145 ++++++++++--
 lib/types.nix                                 | 221 ++++++++++++++----
 nixos/default.nix                             |   2 +
 nixos/doc/manual/default.nix                  |   6 +-
 .../development/option-declarations.xml       | 106 ++++++++-
 nixos/lib/eval-config.nix                     |  15 +-
 nixos/lib/typechecker.nix                     |  91 ++++++++
 nixos/modules/config/i18n.nix                 |   1 +
 nixos/modules/config/sysctl.nix               |   1 +
 nixos/modules/installer/tools/nixos-option.sh |   4 +-
 .../installer/tools/nixos-typecheck.sh        |  52 +++++
 nixos/modules/installer/tools/tools.nix       |   8 +-
 nixos/modules/misc/meta.nix                   |   1 +
 nixos/modules/misc/nixpkgs.nix                |  51 ++--
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/misc/gitlab.nix        |   3 +
 nixos/modules/services/misc/ihaskell.nix      |   4 +
 nixos/modules/services/misc/nixos-manual.nix  |   5 +-
 .../web-servers/apache-httpd/default.nix      |   3 +-
 .../services/x11/window-managers/xmonad.nix   |   3 +
 nixos/modules/system/boot/kernel.nix          |   1 +
 .../system/boot/systemd-unit-options.nix      |   5 +-
 nixos/release.nix                             |   2 +
 24 files changed, 703 insertions(+), 127 deletions(-)
 create mode 100644 nixos/lib/typechecker.nix
 create mode 100644 nixos/modules/installer/tools/nixos-typecheck.sh

diff --git a/lib/modules.nix b/lib/modules.nix
index 12ec7004d1ee..d08dc9f85a25 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -23,8 +23,6 @@ rec {
                   specialArgs ? {}
                 , # This would be remove in the future, Prefer _module.args option instead.
                   args ? {}
-                , # This would be remove in the future, Prefer _module.check option instead.
-                  check ? true
                 }:
     let
       # This internal module declare internal options under the `_module'
@@ -45,9 +43,22 @@ rec {
           _module.check = mkOption {
             type = types.bool;
             internal = true;
-            default = check;
+            default = true;
             description = "Whether to check whether all option definitions have matching declarations.";
           };
+
+          _module.typeInference = mkOption {
+            type = types.nullOr types.str;
+            internal = true;
+            default = null; # TODO: Move away from 'null' after enough testing.
+            description = ''
+              Mode of type inferencing. Possible values are:
+              null = Disable type inferencing completely. Use 'types.unspecified' for every option without type definition.
+              "silent" = Try to infer type of option without type definition, but do not print anything.
+              "printUnspecified" = Try to infer type of option without type definition and print options for which no full type could be inferred.
+              "printAll" = Try to infer type of option without type definition and print all options without type definition.
+            '';
+          };
         };
 
         config = {
@@ -60,7 +71,7 @@ rec {
       # Note: the list of modules is reversed to maintain backward
       # compatibility with the old module system.  Not sure if this is
       # the most sensible policy.
-      options = mergeModules prefix (reverseList closed);
+      options = mergeModules (config._module) prefix (reverseList closed);
 
       # Traverse options and extract the option values into the final
       # config set.  At the same time, check whether all option
@@ -170,11 +181,11 @@ rec {
      At the same time, for each option declaration, it will merge the
      corresponding option definitions in all machines, returning them
      in the ‘value’ attribute of each option. */
-  mergeModules = prefix: modules:
-    mergeModules' prefix modules
+  mergeModules = _module: prefix: modules:
+    mergeModules' _module prefix modules
       (concatMap (m: map (config: { inherit (m) file; inherit config; }) (pushDownProperties m.config)) modules);
 
-  mergeModules' = prefix: options: configs:
+  mergeModules' = _module: prefix: options: configs:
     listToAttrs (map (name: {
       # We're descending into attribute ‘name’.
       inherit name;
@@ -200,8 +211,8 @@ rec {
             (filter (m: m.config ? ${name}) configs);
         in
           if nrOptions == length decls then
-            let opt = fixupOptionType loc (mergeOptionDecls loc decls);
-            in evalOptionValue loc opt defns'
+            let opt = fixupOptionType _module.typeInference loc (mergeOptionDecls loc decls);
+            in evalOptionValue _module loc opt defns'
           else if nrOptions != 0 then
             let
               firstOption = findFirst (m: isOption m.options) "" decls;
@@ -209,7 +220,7 @@ rec {
             in
               throw "The option `${showOption loc}' in `${firstOption.file}' is a prefix of options in `${firstNonOption.file}'."
           else
-            mergeModules' loc decls defns;
+            mergeModules' _module loc decls defns;
     }) (concatMap (m: attrNames m.options) options))
     // { _definedNames = map (m: { inherit (m) file; names = attrNames m.config; }) configs; };
 
@@ -258,7 +269,7 @@ rec {
 
   /* Merge all the definitions of an option to produce the final
      config value. */
-  evalOptionValue = loc: opt: defs:
+  evalOptionValue = _module: loc: opt: defs:
     let
       # Add in the default value for this option, if any.
       defs' =
@@ -270,7 +281,7 @@ rec {
         if opt.readOnly or false && length defs' > 1 then
           throw "The option `${showOption loc}' is read-only, but it's set multiple times."
         else
-          mergeDefinitions loc opt.type defs';
+          mergeDefinitions _module loc opt.type defs';
 
       # Check whether the option is defined, and apply the ‘apply’
       # function to the merged value.  This allows options to yield a
@@ -291,7 +302,7 @@ rec {
       };
 
   # Merge definitions of a value of a given type.
-  mergeDefinitions = loc: type: defs: rec {
+  mergeDefinitions = _module: loc: type: defs: rec {
     defsFinal =
       let
         # Process mkMerge and mkIf properties.
@@ -314,7 +325,7 @@ rec {
     mergedValue = foldl' (res: def:
       if type.check def.value then res
       else throw "The option value `${showOption loc}' in `${def.file}' is not a ${type.name}.")
-      (type.merge loc defsFinal) defsFinal;
+      (type.merge _module loc defsFinal) defsFinal;
 
     isDefined = defsFinal != [];
 
@@ -412,7 +423,7 @@ rec {
   /* Hack for backward compatibility: convert options of type
      optionSet to options of type submodule.  FIXME: remove
      eventually. */
-  fixupOptionType = loc: opt:
+  fixupOptionType = typeInference: loc: opt:
     let
       options = opt.options or
         (throw "Option `${showOption loc'}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}.");
@@ -424,12 +435,66 @@ rec {
         else if tp.name == "list of option sets" then types.listOf (types.submodule options)
         else if tp.name == "null or option set" then types.nullOr (types.submodule options)
         else tp;
+
     in
       if opt.type.getSubModules or null == null
-      then opt // { type = f (opt.type or types.unspecified); }
+      then opt // { type = f (opt.type or (inferType typeInference loc opt)); }
       else opt // { type = opt.type.substSubModules opt.options; options = []; };
 
 
+  /* Function that tries to infer the type of an option from the default value of the option. */
+  inferType = mode: loc: opt:
+    let
+      doc = x: elemAt x 0;
+      type = x: elemAt x 1;
+      containsUnspecified = x: elemAt x 2;
+      inferType' = def:
+        if isDerivation def then [ "package" types.package false ]
+        else if isBool def then [ "bool" types.bool false ]
+        else if builtins.isString def then [ "str" types.str false ]
+        else if isInt def then [ "int" types.int false ]
+        else if isFunction def then [ "functionTo unspecified" (types.functionTo types.unspecified) true ]
+        else if isList def then
+                let nestedType = if (length def > 0) && (all (x: (type (inferType' x)) == (type (inferType' (head def)))) def)
+                                 then inferType' (head def)
+                                 else [ "unspecified" types.unspecified true ];
+                in [ "listOf ${doc nestedType}" (types.listOf (type nestedType)) (containsUnspecified nestedType) ]
+        else if isAttrs def then
+                let list = mapAttrsToList (_: v: v) (removeAttrs def ["_args"]);
+                    nestedType = if (length list > 0) && (all (x: (type (inferType' x)) == (type (inferType' (head list)))) list)
+                                 then inferType' (head list)
+                                 else [ "unspecified" types.unspecified true ];
+                in [ "attrsOf ${doc nestedType}" (types.attrsOf (type nestedType)) (containsUnspecified nestedType) ]
+        else [ "unspecified" types.unspecified true ];
+
+      inferDoc = x: ''
+        Inferring the type of "${showOption loc}" to "${doc x}".
+        Please verify the inferred type and define the type explicitely in ${showFiles opt.declarations}!
+      '';
+
+      inferredType = printMode:
+        let inferred = inferType' opt.default;
+        in if printMode == "silent" then type inferred
+           else if printMode == "printAll" then builtins.trace (inferDoc inferred) (type inferred)
+           else if printMode == "printUnspecified" && (containsUnspecified inferred) then builtins.trace (inferDoc inferred) (type inferred)
+           else type inferred;
+
+      noInferDoc = ''
+        Could not infer a type for "${showOption loc}", using "unspecified" instead.
+        Please define the type explicitely in ${showFiles opt.declarations}!
+      '';
+
+      hasDefault = (opt ? default) && !(opt ? defaultText);
+      isExternalVisible = (opt.visible or true) && !(opt.internal or false);
+    in
+
+    if isNull mode || !isExternalVisible
+    then types.unspecified
+    else if hasDefault
+         then inferredType mode /* Set to 'true' to see every type that is being inferred, not just those types that result in 'unspecified'. */
+         else if mode != "silent" then builtins.trace noInferDoc types.unspecified else types.unspecified;
+
+
   /* Properties. */
 
   mkIf = condition: content:
@@ -497,7 +562,7 @@ rec {
 
 
   /* Compatibility. */
-  fixMergeModules = modules: args: evalModules { inherit modules args; check = false; };
+  fixMergeModules = modules: args: evalModules { inherit args; modules = (modules ++ [{ _module.check = false; }]); };
 
 
   /* Return a module that causes a warning to be shown if the
diff --git a/lib/options.nix b/lib/options.nix
index 444ec37e6eaf..d6876e18fe4f 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -6,6 +6,7 @@ with import ./trivial.nix;
 with import ./lists.nix;
 with import ./attrsets.nix;
 with import ./strings.nix;
+with {inherit (import ./types.nix) types; };
 
 rec {
 
@@ -42,16 +43,17 @@ rec {
     description = "Sink for option definitions.";
     type = mkOptionType {
       name = "sink";
+      typerep = "(sink)";
       check = x: true;
-      merge = loc: defs: false;
+      merge = config: loc: defs: false;
     };
     apply = x: throw "Option value is not readable because the option is not declared.";
   } // attrs);
 
-  mergeDefaultOption = loc: defs:
+  mergeDefaultOption = config: loc: defs:
     let list = getValues defs; in
     if length list == 1 then head list
-    else if all isFunction list then x: mergeDefaultOption loc (map (f: f x) list)
+    else if all isFunction list then x: mergeDefaultOption config loc (map (f: f x) list)
     else if all isList list then concatLists list
     else if all isAttrs list then foldl' lib.mergeAttrs {} list
     else if all isBool list then foldl' lib.or false list
@@ -59,14 +61,14 @@ rec {
     else if all isInt list && all (x: x == head list) list then head list
     else throw "Cannot merge definitions of `${showOption loc}' given in ${showFiles (getFiles defs)}.";
 
-  mergeOneOption = loc: defs:
+  mergeOneOption = config: loc: defs:
     if defs == [] then abort "This case should never happen."
     else if length defs != 1 then
       throw "The unique option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}."
     else (head defs).value;
 
   /* "Merge" option definitions by checking that they all have the same value. */
-  mergeEqualOption = loc: defs:
+  mergeEqualOption = config: loc: defs:
     if defs == [] then abort "This case should never happen."
     else foldl' (val: def:
       if def.value != val then
@@ -77,53 +79,154 @@ rec {
   getValues = map (x: x.value);
   getFiles = map (x: x.file);
 
-
   # Generate documentation template from the list of option declaration like
   # the set generated with filterOptionSets.
   optionAttrSetToDocList = optionAttrSetToDocList' [];
 
-  optionAttrSetToDocList' = prefix: options:
+  optionAttrSetToDocList' = prefix: internalModuleConfig: options:
     concatMap (opt:
       let
+        decls = filter (x: x != unknownModule) opt.declarations;
         docOption = rec {
           name = showOption opt.loc;
           description = opt.description or (throw "Option `${name}' has no description.");
-          declarations = filter (x: x != unknownModule) opt.declarations;
+          declarations = decls;
           internal = opt.internal or false;
           visible = opt.visible or true;
           readOnly = opt.readOnly or false;
           type = opt.type.name or null;
         }
-        // (if opt ? example then { example = scrubOptionValue opt.example; } else {})
-        // (if opt ? default then { default = scrubOptionValue opt.default; } else {})
+        // (if opt ? example then { example = detectDerivation decls opt.example; } else {})
+        // (if opt ? default then { default = detectDerivation decls opt.default; } else {})
         // (if opt ? defaultText then { default = opt.defaultText; } else {});
 
         subOptions =
-          let ss = opt.type.getSubOptions opt.loc;
-          in if ss != {} then optionAttrSetToDocList' opt.loc ss else [];
+          let ss = opt.type.getSubOptionsPrefixed opt.loc;
+          in if ss != {} then optionAttrSetToDocList' opt.loc internalModuleConfig (ss internalModuleConfig) else [];
       in
         [ docOption ] ++ subOptions) (collect isOption options);
 
+  # TODO: Use "extractOptionAttrSet" instead of "optionAttrSetToDocList'" to reduce the code size.
+  #       It should be a drop-in-replacement. But first, examine the impact on the evaluation time.
+  # optionAttrSetToDocList = extractOptionAttrSet true [];
 
-  /* This function recursively removes all derivation attributes from
-     `x' except for the `name' attribute.  This is to make the
-     generation of `options.xml' much more efficient: the XML
-     representation of derivations is very large (on the order of
-     megabytes) and is not actually used by the manual generator. */
-  scrubOptionValue = x:
+  # Generate a machine readable specification of the list of option declarations.
+  optionAttrSetToParseableSpecifications = extractOptionAttrSet false [];
+
+  extractOptionAttrSet = toDoc: prefix: internalModuleConfig: options:
+    concatMap (opt:
+      let
+        optionName = showOption opt.loc;
+
+        # Check if a type contains derivations, that is check if a type nests
+        # a 'package', 'packageSet' or 'nixpkgsConfig' type.
+        hasDerivation = any (t: elem t opt.type.nestedTypes) ((map (x: x.typerep) (with types; [package packageSet])) ++ ["(nixpkgsConfig)"]);
+
+        # Check if type is 'path' which can potentially contain a derivation.
+        maybeHiddenDerivation = any (t: elem t opt.type.nestedTypes) (map (x: x.typerep) (with types; [path]));
+
+        isDefaultValue = elem opt.default opt.type.defaultValues;
+
+        /* Enforce that the example attribute is wrapped with 'literalExample'
+           for every type that contains derivations. */
+        example =
+          if opt ? example
+          then (if hasDerivation
+                then (if isLiteralExample opt.example
+                      then { example = detectDerivation decls opt.example; }
+                      else throw "The attribute ${optionName}.example must be wrapped with 'literalExample' in ${concatStringsSep " and " decls}!")
+                else { example = detectDerivation decls opt.example; })
+          else {};
+
+        /* Enforce that the 'defaultText' attribute is defined for every option
+           that has a 'default' attribute that contains derivations. */
+        default =
+          if opt ? default
+          then (if hasDerivation
+                then (if isDefaultValue
+                      then { default = opt.default; }
+                      else (if opt ? defaultText
+                            then { default = literalExample (detectDerivation decls opt.defaultText); }
+                            else throw "The option ${optionName} requires a 'defaultText' attribute in ${concatStringsSep " and " decls}!"))
+                else (if opt ? defaultText
+                      then (if maybeHiddenDerivation
+                            then (if (let eval = builtins.tryEval (findDerivation opt.default); in eval.success && !eval.value)
+                                  then builtins.trace
+                                       "The attribute ${optionName}.defaultText might not be necessary in ${concatStringsSep " and " decls}!"
+                                       { default = literalExample (detectDerivation decls opt.defaultText); }
+                                  else { default = literalExample (detectDerivation decls opt.defaultText); })
+                            else builtins.trace
+                                 "The attribute ${optionName}.defaultText is not used and can be removed in ${concatStringsSep " and " decls}!"
+                                 { default = detectDerivation decls opt.default; })
+                      else { default = detectDerivation decls opt.default; }))
+          else {};
+
+        decls = filter (x: x != unknownModule) opt.declarations;
+
+        docOption = {
+          name = optionName;
+          description = opt.description or (throw "Option `${optionName}' has no description.");
+          declarations = decls;
+          internal = opt.internal or false;
+          visible = opt.visible or true;
+          readOnly = opt.readOnly or false;
+        } // example // default // subOptions // typeKeys;
+
+        typeKeys = if toDoc then { type = opt.type.name or null; } else { type = opt.type.typerep; keys = opt.loc; };
+
+        subOptions =
+          if toDoc
+          then {}
+          else let ss = opt.type.getSubOptions;
+               in if ss != {} then { suboptions = (extractOptionAttrSet false [] internalModuleConfig (ss internalModuleConfig)); } else {};
+
+        subOptionsDoc =
+          if toDoc
+          then let ss = opt.type.getSubOptionsPrefixed opt.loc;
+               in if ss != {} then extractOptionAttrSet true opt.loc internalModuleConfig (ss internalModuleConfig) else []
+          else [];
+      in
+        [ docOption ]  ++ subOptionsDoc )
+          (filter (opt: (opt.visible or true) && !(opt.internal or false)) (collect isOption options));
+
+
+  /* This function recursively checks for derivations within an
+     an expression, and throws an error if a derivation or a
+     store path is found. The function is used to ensure that no
+     derivation leaks from the 'default' or 'example' attributes
+     of an option.
+     This makes the generation of `options.xml' much more efficient:
+     the XML representation of derivations is very large (on the
+     order of megabytes) and is not actually used by the manual
+     generator. */
+  detectDerivation = decl: x:
     if isDerivation x then
-      { type = "derivation"; drvPath = x.name; outPath = x.name; name = x.name; }
-    else if isList x then map scrubOptionValue x
-    else if isAttrs x then mapAttrs (n: v: scrubOptionValue v) (removeAttrs x ["_args"])
+      throw "Found unexpected derivation in '${x.name}' in '${concatStringsSep " and " decl}'!"
+    else if isString x && isStorePath x then
+      throw "Found unexpected store path in '${x.name}' in '${concatStringsSep " and " decl}'!"
+    else if isList x then map (detectDerivation decl) x
+    else if isAttrs x then mapAttrs (n: v: (detectDerivation decl) v) (removeAttrs x ["_args"])
     else x;
 
+  /* Same as detectDerivation, but returns a boolean instead of
+     throwing an exception. */
+  findDerivation = x:
+    if (isString x && isStorePath x) || isDerivation x then true
+    else if isList x then any findDerivation x
+    else if isAttrs x then any findDerivation (mapAttrsToList (_: v: v) (removeAttrs x ["_args"]))
+    else false;
+
+
 
   /* For use in the ‘example’ option attribute.  It causes the given
      text to be included verbatim in documentation.  This is necessary
      for example values that are not simple values, e.g.,
      functions. */
+  # TODO: A more general name would probably be "literalNix".
   literalExample = text: { _type = "literalExample"; inherit text; };
 
+  isLiteralExample = x: isAttrs x && hasAttr "_type" x && x._type == "literalExample";
+
 
   /* Helper functions. */
   showOption = concatStringsSep ".";
diff --git a/lib/types.nix b/lib/types.nix
index b4d29ac84d28..385103d42149 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -1,6 +1,8 @@
 # Definitions related to run-time type checking.  Used in particular
 # to type-check NixOS configurations.
 
+let lib = import ./default.nix; in
+
 with import ./lists.nix;
 with import ./attrsets.nix;
 with import ./options.nix;
@@ -21,6 +23,8 @@ rec {
   mkOptionType =
     { # Human-readable representation of the type.
       name
+    , # Parseable representation of the type.
+      typerep
     , # Function applied to each definition that should return true if
       # its type-correct, false otherwise.
       check ? (x: true)
@@ -31,40 +35,59 @@ rec {
       # definition values and locations (e.g. [ { file = "/foo.nix";
       # value = 1; } { file = "/bar.nix"; value = 2 } ]).
       merge ? mergeDefaultOption
-    , # Return a flat list of sub-options.  Used to generate
-      # documentation.
-      getSubOptions ? prefix: {}
+    , # Return list of sub-options.
+      getSubOptions ? {}
+    , # Same as 'getSubOptions', but with extra information about the
+      # location of the option which is used to generate documentation.
+      getSubOptionsPrefixed ? null
     , # List of modules if any, or null if none.
       getSubModules ? null
     , # Function for building the same option type  with a different list of
       # modules.
       substSubModules ? m: null
+    , # List of type representations (typerep) of all the elementary types
+      # that are nested within the type. For an elementary type the list is
+      # a singleton of the typerep of itself.
+      # NOTE: Must be specified for every container type!
+      nestedTypes ? null
+    , # List of all default values, and an empty list if no default value exists.
+      defaultValues ? []
     }:
     { _type = "option-type";
-      inherit name check merge getSubOptions getSubModules substSubModules;
+      inherit name typerep check merge getSubOptions getSubModules substSubModules defaultValues;
+      nestedTypes = if (isNull nestedTypes) then (singleton typerep) else nestedTypes;
+      getSubOptionsPrefixed = if (isNull getSubOptionsPrefixed) then (prefix: getSubOptions) else getSubOptionsPrefixed;
     };
 
 
   types = rec {
 
+    #
+    # Elementary types
+    #
+
     unspecified = mkOptionType {
       name = "unspecified";
+      typerep = "(unspecified)";
     };
 
     bool = mkOptionType {
       name = "boolean";
+      typerep = "(boolean)";
       check = isBool;
       merge = mergeEqualOption;
     };
 
     int = mkOptionType {
       name = "integer";
+      typerep = "(integer)";
       check = isInt;
       merge = mergeOneOption;
     };
 
     str = mkOptionType {
       name = "string";
+      typerep = "(string)";
       check = isString;
       merge = mergeOneOption;
     };
@@ -72,73 +95,111 @@ rec {
     # Merge multiple definitions by concatenating them (with the given
     # separator between the values).
     separatedString = sep: mkOptionType {
-      name = "string";
+      name = "string" + (optionalString (sep != "") " separated by ${sep}");
+      typerep = "(separatedString(${escape ["(" ")"] sep}))";
       check = isString;
-      merge = loc: defs: concatStringsSep sep (getValues defs);
+      merge = _module: loc: defs: concatStringsSep sep (getValues defs);
     };
 
-    lines = separatedString "\n";
-    commas = separatedString ",";
-    envVar = separatedString ":";
+    lines = separatedString "\n" // { typerep = "(lines)"; };
+    commas = separatedString "," // { typerep = "(commas)"; };
+    envVar = separatedString ":" // { typerep = "(envVar)"; };
 
     # Deprecated; should not be used because it quietly concatenates
     # strings, which is usually not what you want.
-    string = separatedString "";
+    string = separatedString "" // { typerep = "(string)"; };
 
     attrs = mkOptionType {
       name = "attribute set";
+      typerep = "(attrs)";
       check = isAttrs;
-      merge = loc: foldl' (res: def: mergeAttrs res def.value) {};
+      merge = _module: loc: foldl' (res: def: mergeAttrs res def.value) {};
     };
 
     # derivation is a reserved keyword.
     package = mkOptionType {
       name = "package";
+      typerep = "(package)";
       check = x: isDerivation x || isStorePath x;
-      merge = loc: defs:
-        let res = mergeOneOption loc defs;
+      merge = _module: loc: defs:
+        let res = mergeOneOption _module loc defs;
         in if isDerivation res then res else toDerivation res;
     };
 
+    # The correct type of packageSet would be:
+    # packageSet = attrsOf (either package packageSet)
+    # (Not sure if nix would allow to define a recursive type.)
+    # However, currently it is not possible to check that a packageSet actually
+    # contains packages (that is derivations). The check 'isDerivation' is too
+    # eager for the current implementation of the assertion mechanism and of the
+    # licenses control mechanism. That means it is not generally possible to go
+    # into the attribute set of packages to check that every attribute would
+    # evaluate to a derivation if the package would actually be evaluated. Maybe
+    # that restriction can be lifted in the future, but for now the content of
+    # the packageSet is not checked.
+    # TODO: The 'merge' function is copied from 'mergeDefaultOption' to keep
+    # backwards compatibility with the 'unspecified' type that was used for
+    # package sets previously. Maybe review if the merge function has to change.
+    packageSet = mkOptionType {
+      name = "derivation set";
+      typerep = "(packageSet)";
+      check = isAttrs;
+      merge = _module: loc: defs: foldl' mergeAttrs {} (map (x: x.value) defs);
+    };
+
     path = mkOptionType {
       name = "path";
+      typerep = "(path)";
       # Hacky: there is no ‘isPath’ primop.
       check = x: builtins.substring 0 1 (toString x) == "/";
       merge = mergeOneOption;
     };
 
+
+    #
+    # Container types
+    #
+
     # drop this in the future:
     list = builtins.trace "`types.list' is deprecated; use `types.listOf' instead" types.listOf;
 
     listOf = elemType: mkOptionType {
       name = "list of ${elemType.name}s";
+      typerep = "(listOf${elemType.typerep})";
       check = isList;
-      merge = loc: defs:
+      merge = _module: loc: defs:
         map (x: x.value) (filter (x: x ? value) (concatLists (imap (n: def: imap (m: def':
-            (mergeDefinitions
+            (mergeDefinitions _module
               (loc ++ ["[definition ${toString n}-entry ${toString m}]"])
               elemType
               [{ inherit (def) file; value = def'; }]
             ).optionalValue
           ) def.value) defs)));
-      getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]);
+      getSubOptions = elemType.getSubOptions;
+      getSubOptionsPrefixed = prefix: elemType.getSubOptionsPrefixed (prefix ++ ["*"]);
       getSubModules = elemType.getSubModules;
       substSubModules = m: listOf (elemType.substSubModules m);
+      nestedTypes = elemType.nestedTypes;
+      defaultValues = [[]];
     };
 
     attrsOf = elemType: mkOptionType {
       name = "attribute set of ${elemType.name}s";
+      typerep = "(attrsOf${elemType.typerep})";
       check = isAttrs;
-      merge = loc: defs:
+      merge = _module: loc: defs:
         mapAttrs (n: v: v.value) (filterAttrs (n: v: v ? value) (zipAttrsWith (name: defs:
-            (mergeDefinitions (loc ++ [name]) elemType defs).optionalValue
+            (mergeDefinitions _module (loc ++ [name]) elemType defs).optionalValue
           )
           # Push down position info.
           (map (def: listToAttrs (mapAttrsToList (n: def':
             { name = n; value = { inherit (def) file; value = def'; }; }) def.value)) defs)));
-      getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name>"]);
+      getSubOptions = elemType.getSubOptions;
+      getSubOptionsPrefixed = prefix: elemType.getSubOptionsPrefixed (prefix ++ ["<name>"]);
       getSubModules = elemType.getSubModules;
       substSubModules = m: attrsOf (elemType.substSubModules m);
+      nestedTypes = elemType.nestedTypes;
+      defaultValues = [{}];
     };
 
     # List or attribute set of ...
@@ -159,18 +220,23 @@ rec {
         attrOnly = attrsOf elemType;
       in mkOptionType {
         name = "list or attribute set of ${elemType.name}s";
+        typerep = "(loaOf${elemType.typerep})";
         check = x: isList x || isAttrs x;
-        merge = loc: defs: attrOnly.merge loc (imap convertIfList defs);
-        getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name?>"]);
+        merge = _module: loc: defs: attrOnly.merge _module loc (imap convertIfList defs);
+        getSubOptions = elemType.getSubOptions;
+        getSubOptionsPrefixed = prefix: elemType.getSubOptionsPrefixed (prefix ++ ["<name?>"]);
         getSubModules = elemType.getSubModules;
         substSubModules = m: loaOf (elemType.substSubModules m);
+        nestedTypes = elemType.nestedTypes;
+        defaultValues = [{} []];
       };
 
     # List or element of ...
     loeOf = elemType: mkOptionType {
       name = "element or list of ${elemType.name}s";
+      typerep = "(loeOf${elemType.typerep})";
       check = x: isList x || elemType.check x;
-      merge = loc: defs:
+      merge = _module: loc: defs:
         let
           defs' = filterOverrides defs;
           res = (head defs').value;
@@ -181,55 +247,41 @@ rec {
         else if !isString res then
           throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}."
         else res;
+      nestedTypes = elemType.nestedTypes;
+      defaultValues = [[]] ++ elemType.defaultValues;
     };
 
     uniq = elemType: mkOptionType {
-      inherit (elemType) name check;
+      inherit (elemType) check;
+      name = "unique ${elemType.name}";
+      typerep = "(uniq${elemType.typerep})";
       merge = mergeOneOption;
       getSubOptions = elemType.getSubOptions;
+      getSubOptionsPrefixed = prefix: elemType.getSubOptionsPrefixed prefix;
       getSubModules = elemType.getSubModules;
       substSubModules = m: uniq (elemType.substSubModules m);
+      nestedTypes = elemType.nestedTypes;
+      defaultValues = elemType.defaultValues;
     };
 
     nullOr = elemType: mkOptionType {
       name = "null or ${elemType.name}";
+      typerep = "(nullOr${elemType.typerep})";
       check = x: x == null || elemType.check x;
-      merge = loc: defs:
+      merge = _module: loc: defs:
         let nrNulls = count (def: def.value == null) defs; in
         if nrNulls == length defs then null
         else if nrNulls != 0 then
           throw "The option `${showOption loc}' is defined both null and not null, in ${showFiles (getFiles defs)}."
-        else elemType.merge loc defs;
+        else elemType.merge _module loc defs;
       getSubOptions = elemType.getSubOptions;
+      getSubOptionsPrefixed = prefix: elemType.getSubOptionsPrefixed prefix;
       getSubModules = elemType.getSubModules;
       substSubModules = m: nullOr (elemType.substSubModules m);
+      nestedTypes = elemType.nestedTypes;
+      defaultValues = [null] ++ elemType.defaultValues;
     };
 
-    submodule = opts:
-      let
-        opts' = toList opts;
-        inherit (import ./modules.nix) evalModules;
-      in
-      mkOptionType rec {
-        name = "submodule";
-        check = x: isAttrs x || isFunction x;
-        merge = loc: defs:
-          let
-            coerce = def: if isFunction def then def else { config = def; };
-            modules = opts' ++ map (def: { _file = def.file; imports = [(coerce def.value)]; }) defs;
-          in (evalModules {
-            inherit modules;
-            args.name = last loc;
-            prefix = loc;
-          }).config;
-        getSubOptions = prefix: (evalModules
-          { modules = opts'; inherit prefix;
-            # FIXME: hack to get shit to evaluate.
-            args = { name = ""; }; }).options;
-        getSubModules = opts';
-        substSubModules = m: submodule m;
-      };
-
     enum = values:
       let
         show = v:
@@ -239,23 +291,92 @@ rec {
       in
       mkOptionType {
         name = "one of ${concatMapStringsSep ", " show values}";
+        typerep = "(enum${concatMapStrings (x: "(${escape ["(" ")"] (builtins.toString x)})") values})";
         check = flip elem values;
         merge = mergeOneOption;
+        nestedTypes = [];
       };
 
     either = t1: t2: mkOptionType {
       name = "${t1.name} or ${t2.name}";
+      typerep = "(either${t1.typerep}${t2.typerep})";
       check = x: t1.check x || t2.check x;
       merge = mergeOneOption;
+      nestedTypes = t1.nestedTypes ++ t2.nestedTypes;
+      defaultValues = t1.defaultValues ++ t2.defaultValues;
     };
 
+
+    #
+    # Complex types
+    #
+
+    submodule = opts:
+      let
+        opts' = toList opts;
+        inherit (import ./modules.nix) evalModules;
+        filterVisible = filter (opt: (if opt ? visible then opt.visible else true) && (if opt ? internal then !opt.internal else true));
+      in
+      mkOptionType rec {
+        name = "submodule";
+        typerep = "(submodule)";
+        check = x: isAttrs x || isFunction x;
+        merge = _module: loc: defs:
+          let
+            internalModule = [ { inherit _module; } { _module.args.name = lib.mkForce (last loc); } ];
+            coerce = def: if isFunction def then def else { config = def; };
+            modules = opts' ++ internalModule ++ map (def: { _file = def.file; imports = [(coerce def.value)]; }) defs;
+          in (evalModules {
+            inherit modules;
+            prefix = loc;
+          }).config;
+        getSubOptions = getSubOptionsPrefixed [];
+        getSubOptionsPrefixed = prefix: _module:
+          let
+            # FIXME: hack to get shit to evaluate.
+            internalModule = [ { inherit _module; } { _module.args.name = lib.mkForce ""; } ];
+          in (evalModules {
+            modules = opts' ++ internalModule;
+            inherit prefix;
+          }).options;
+        getSubModules = opts';
+        substSubModules = m: submodule m;
+        nestedTypes = concatMap (opt: opt.type.nestedTypes) (collect (lib.isType "option") (getSubOptions {}));
+        defaultValues = [{}];
+      };
+
+
+
+    #
+    # Legacy types
+    #
+
     # Obsolete alternative to configOf.  It takes its option
     # declarations from the ‘options’ attribute of containing option
     # declaration.
     optionSet = mkOptionType {
       name = /* builtins.trace "types.optionSet is deprecated; use types.submodule instead" */ "option set";
+      typerep = "(optionSet)";
     };
 
+
+    # Try to remove module options of that type wherever possible.
+    # A module option taking a function can not be introspected and documented properly.
+    functionTo = resultType:
+      mkOptionType {
+        name = "function to ${resultType.name}";
+        typerep = "(function${resultType.typerep})";
+        check = builtins.isFunction;
+        merge = mergeOneOption;
+        nestedTypes = resultType.nestedTypes;
+        defaultValues = map (x: {...}:x) resultType.nestedTypes; # INFO: It seems as nix can't compare functions, yet.
+      };
+
+
+    #
+    # misc
+    #
+
     # Augment the given type with an additional type check function.
     addCheck = elemType: check: elemType // { check = x: elemType.check x && check x; };
 
diff --git a/nixos/default.nix b/nixos/default.nix
index 5d69b79e13a6..117a7b5d6038 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -34,6 +34,8 @@ in
 
   system = eval.config.system.build.toplevel;
 
+  typechecker = eval.config.system.build.typechecker;
+
   vm = vmConfig.system.build.vm;
 
   vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm;
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index 4ce6ea1c1118..ea8601497361 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, options, version, revision, extraSources ? [] }:
+{ pkgs, options, internalModule, version, revision, extraSources ? [] }:
 
 with pkgs;
 with pkgs.lib;
@@ -6,8 +6,10 @@ with pkgs.lib;
 let
 
   # Remove invisible and internal options.
-  optionsList = filter (opt: opt.visible && !opt.internal) (optionAttrSetToDocList options);
+  optionsList = filter (opt: opt.visible && !opt.internal) (optionAttrSetToDocList internalModule options);
 
+  # INFO: Please add 'defaultText' or 'literalExample' to the option
+  #       definition to avoid this substitution!
   # Replace functions by the string <function>
   substFunction = x:
     if builtins.isAttrs x then mapAttrs (name: substFunction) x
diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml
index ea5d1241876e..08bde4a275d9 100644
--- a/nixos/doc/manual/development/option-declarations.xml
+++ b/nixos/doc/manual/development/option-declarations.xml
@@ -8,7 +8,7 @@
 
 <para>An option declaration specifies the name, type and description
 of a NixOS configuration option.  It is illegal to define an option
-that hasn’t been declared in any module.  A option declaration
+that has not been declared in any module. A option declaration
 generally looks like this:
 
 <programlisting>
@@ -145,6 +145,108 @@ options = {
 
 You can also create new types using the function
 <varname>mkOptionType</varname>.  See
-<filename>lib/types.nix</filename> in Nixpkgs for details.</para>
+<filename>lib/types.nix</filename> in Nixpkgs for details.
+
+An option declaration must follow the following rules:
+<itemizedlist mark='bullet'>
+
+  <listitem>
+    <para>A <varname>defaultText</varname> must be defined if and only if the type of the option
+    derives from <varname>package</varname>, <varname>packageSet</varname> or <varname>nixpkgsConfig
+    </varname>, and if and only if a <varname>default</varname> attribute is defined and if and only if
+    the value of the <varname>default</varname> attribute is not the default of the type of the
+    option declaration.
+
+    For example, a <varname>defaultText</varname> must be defined for
+<programlisting>
+type = types.listOf types.package;
+default = [ pkgs.foo; ];
+defaultText = "[ pkgs.foo; ]";
+</programlisting>.
+
+    But no <varname>defaultText</varname> must be defined for
+<programlisting>
+type = types.listOf types.package;
+default = [];
+</programlisting>,
+    as <varname>[]</varname> is the default of <varname>types.listOf types.package</varname>.
+    </para>
+  </listitem>
+
+  <listitem>
+    <para>A <varname>defaultText</varname> can be defined if the type of the option derives from
+    <varname>path</varname> and if a <varname>default</varname> attribute is defined.</para>
+  </listitem>
+
+  <listitem>
+    <para>The value of the <varname>example</varname> attribute must be wrapped with <varname>
+    literalExample</varname> if the type of the option derives from <varname>package</varname>,
+    <varname>packageSet</varname> or <varname>nixpkgsConfig</varname>.</para>
+  </listitem>
+
+  <listitem>
+    <para>The value of <varname>defaultText</varname> and <varname>literalExample</varname> must
+    be a string which contains a valid nix expression. The nix expression has to evaluate in
+    <code>{pkgs}: <replaceable>value</replaceable></code>.
+    For example:
+    <itemizedlist>
+      <listitem>
+	<para>A <varname>defaultText</varname> could, e.g., be:
+<programlisting>
+type = types.package;
+default = pkgs.foo;
+defaultText = "pkgs.foo";
+</programlisting>
+        But not <code>defaultText = "pkgs.foo;";</code>, as that
+        corresponds to <code>{pkgs}: pkgs.foo;</code>, which is an
+	invalid nix expression due to the ending with <varname>;</varname>.</para>
+      </listitem>
+    
+      <listitem>
+	<para>A <varname>literalExample</varname> could be used as, e.g.:
+<programlisting>
+type = types.path;
+example = literalExample "\"\${pkgs.bar}/bin/bar\"";
+</programlisting>
+        But not <code>literalExample "\${pkgs.bar}/bin/bar";</code>, as that corresponds
+	to <code>{pkgs}: ${pkgs.bar}/bin/bar</code>, which is an invalid nix expression
+	as the <varname>path</varname> is not a <varname>string</varname> anymore.</para>
+      </listitem>
+    </itemizedlist></para>
+  </listitem>
+
+  <listitem>
+    <para>The <varname>type</varname> attribute must be defined for every option declaration.</para>
+  </listitem>
+
+</itemizedlist>
+
+NixOS ships the tool <varname>nixos-typecheck</varname> that can check an option declaration to:
+
+<itemizedlist mark='bullet'>
+
+  <listitem>
+    <para>Enforce that an option declaration has a <varname>defaultText</varname> if and only if the
+    type of the option derives from <varname>package</varname>, <varname>packageSet</varname> or
+    <varname>nixpkgsConfig</varname> and if a <varname>default</varname> attribute is defined.</para>
+  </listitem>
+
+  <listitem>
+    <para>Enforce that the value of the <varname>example</varname> attribute is wrapped with <varname>
+    literalExample</varname> if the type of the option derives from <varname>package</varname>,
+    <varname>packageSet</varname> or <varname>nixpkgsConfig</varname>.</para>
+  </listitem>
+
+  <listitem>
+    <para>Warn if a <varname>defaultText</varname> is defined in an option declaration if the type of
+    the option does not derive from <varname>package</varname>, <varname>packageSet</varname> or
+    <varname>nixpkgsConfig</varname>.</para>
+  </listitem>
+
+  <listitem>
+    <para>Warn if no <varname>type</varname> is defined in an option declaration.</para>
+  </listitem>
+
+</itemizedlist></para>
 
 </section>
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index a87b285c5b7b..79890e0add7d 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -20,8 +20,13 @@
 , # !!! See comment about args in lib/modules.nix
   specialArgs ? {}
 , modules
+, # Pass through a configuration of the internal modules declared
+  # in lib/modules.nix.
+  _module ? {}
+, # !!! See comment about typeInference in lib/modules.nix
+  typeInference ? null
 , # !!! See comment about check in lib/modules.nix
-  check ? true
+  check ? null
 , prefix ? []
 , lib ? import ../../lib
 }:
@@ -41,13 +46,17 @@ let
     };
   };
 
+  internalModule = { _module = (_module
+                     // (if isNull check then {} else { inherit check; })
+                     // (if isNull typeInference then {} else { inherit typeInference; })); };
+
 in rec {
 
   # Merge the option definitions in all modules, forming the full
   # system configuration.
   inherit (lib.evalModules {
-    inherit prefix check;
-    modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ];
+    inherit prefix;
+    modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ] ++ [ internalModule ];
     args = extraArgs;
     specialArgs = { modulesPath = ../modules; } // specialArgs;
   }) config options;
diff --git a/nixos/lib/typechecker.nix b/nixos/lib/typechecker.nix
new file mode 100644
index 000000000000..b4d8277f8fe9
--- /dev/null
+++ b/nixos/lib/typechecker.nix
@@ -0,0 +1,91 @@
+{ config, lib, pkgs, baseModules, ... }:
+
+with pkgs;
+with pkgs.lib;
+
+let
+
+  optionsSpecs = inferenceMode:
+    let
+      versionModule =
+        { system.nixosVersionSuffix = config.system.nixosVersionSuffix;
+          system.nixosRevision = config.system.nixosRevision;
+          nixpkgs.system = config.nixpkgs.system;
+        };
+
+      internalModule = { _module = config._module; } // (if isNull inferenceMode then {} else { _module.typeInference = mkForce inferenceMode; });
+
+      eval = evalModules {
+        modules = [ versionModule ] ++ baseModules ++ [ internalModule ];
+        args = (config._module.args) // { modules = [ ]; };
+      };
+
+      # Remove invisible and internal options.
+      optionsSpecs' = filter (opt: opt.visible && !opt.internal) (optionAttrSetToParseableSpecifications config._module eval.options);
+
+      # INFO: Please add 'defaultText' or 'literalExample' to the option
+      #       definition to avoid this exception!
+      substFunction = key: decls: x:
+        if builtins.isAttrs x then mapAttrs (name: substFunction key decls) x
+        else if builtins.isList x then map (substFunction key decls) x
+        else if builtins.isFunction x then throw "Found an unexpected <function> in ${key} declared in ${concatStringsSep " and " decls}."
+        else x;
+
+      prefix = toString ../..;
+
+      stripPrefix = fn:
+        if substring 0 (stringLength prefix) fn == prefix then
+          substring (stringLength prefix + 1) 1000 fn
+        else
+          fn;
+
+      # Clean up declaration sites to not refer to the NixOS source tree.
+      cleanupOptions = x: flip map x (opt:
+        let substFunction' = y: substFunction opt.name opt.declarations y;
+        in opt
+           // { declarations = map (fn: stripPrefix fn) opt.declarations; }
+           // optionalAttrs (opt ? example) { example = substFunction' opt.example; }
+           // optionalAttrs (opt ? default) { default = substFunction' opt.default; }
+           // optionalAttrs (opt ? type) { type = substFunction' opt.type; });
+
+    in
+      cleanupOptions optionsSpecs';
+
+in
+
+{
+
+  system.build.typechecker = {
+
+    # The NixOS options as machine readable specifications in JSON format.
+    specifications = stdenv.mkDerivation {
+      name = "options-specs-json";
+
+      buildCommand = ''
+        # Export list of options in different format.
+        dst=$out/share/doc/nixos
+        mkdir -p $dst
+
+        cp ${builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON
+          (listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) (optionsSpecs null)))))
+        } $dst/options-specs.json
+
+        mkdir -p $out/nix-support
+        echo "file json $dst/options-specs.json" >> $out/nix-support/hydra-build-products
+      ''; # */
+
+      meta.description = "List of NixOS options specifications in JSON format";
+    };
+
+    silent = listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) (optionsSpecs "silent"));
+    printAll = listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) (optionsSpecs "printAll"));
+    printUnspecified = listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) (optionsSpecs "printUnspecified"));
+
+  };
+
+}
+
+
+
+
+
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index b20fac6ad3e2..3d21bda5734f 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -64,6 +64,7 @@ in
       consoleKeyMap = mkOption {
         type = mkOptionType {
           name = "string or path";
+          typerep = "(stringOrPath)";
           check = t: (isString t || types.path.check t);
         };
 
diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix
index 61b02c5ffa6a..174d7014ca8a 100644
--- a/nixos/modules/config/sysctl.nix
+++ b/nixos/modules/config/sysctl.nix
@@ -6,6 +6,7 @@ let
 
   sysctlOption = mkOptionType {
     name = "sysctl option value";
+    typerep = "(sysctl)";
     check = val:
       let
         checkType = x: isBool x || isString x || isInt x || isNull x;
diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh
index 17c17d05e288..dd21dc71ee2b 100644
--- a/nixos/modules/installer/tools/nixos-option.sh
+++ b/nixos/modules/installer/tools/nixos-option.sh
@@ -115,8 +115,8 @@ let
       let name = head attrsNames; rest = tail attrsNames; in
       if isOption result.options then
         walkOptions rest {
-          options = result.options.type.getSubOptions "";
-          opt = ''(\${result.opt}.type.getSubOptions "")'';
+          options = result.options.type.getSubOptionsPrefix "";
+          opt = ''(\${result.opt}.type.getSubOptionsPrefix "")'';
           cfg = ''\${result.cfg}."\${name}"'';
         }
       else
diff --git a/nixos/modules/installer/tools/nixos-typecheck.sh b/nixos/modules/installer/tools/nixos-typecheck.sh
new file mode 100644
index 000000000000..f9557be0c50e
--- /dev/null
+++ b/nixos/modules/installer/tools/nixos-typecheck.sh
@@ -0,0 +1,52 @@
+#! /bin/sh
+#! @shell@
+
+if [ -x "@shell@" ]; then export SHELL="@shell@"; fi;
+
+set -e
+
+showSyntax() {
+cat >&1 << EOF
+nixos-typecheck
+usage:
+  nixos-typecheck [action] [args]
+where:
+  action = silent | printAll | printUnspecified | getSpecs
+    with default action: printUnspecified
+  args = any argument supported by nix-build
+EOF
+}
+
+
+# Parse the command line.
+extraArgs=()
+action=printUnspecified
+
+while [ "$#" -gt 0 ]; do
+    i="$1"; shift 1
+    case "$i" in
+      --help)
+        showSyntax
+        ;;
+      silent|printAll|printUnspecified|getSpecs)
+        action="$i"
+        ;;
+      *)
+        extraArgs="$extraArgs $i"
+        ;;
+    esac
+done
+
+
+if [ "$action" = silent ]; then
+    nix-build --no-out-link '<nixpkgs/nixos>' -A typechecker.silent $extraArgs
+elif [ "$action" = printAll ]; then
+    nix-build --no-out-link '<nixpkgs/nixos>' -A typechecker.printAll $extraArgs
+elif [ "$action" = printUnspecified ]; then
+    nix-build --no-out-link '<nixpkgs/nixos>' -A typechecker.printUnspecified $extraArgs
+elif [ "$action" = getSpecs ]; then
+    ln -s $(nix-build --no-out-link '<nixpkgs/nixos>' -A typechecker.specifications $extraArgs)/share/doc/nixos/options-specs.json specifications.json
+else
+    showSyntax
+    exit 1
+fi
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 9ac3b7a5b16f..69bd0d26b773 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -54,6 +54,11 @@ let
     inherit (config.system) nixosVersion nixosCodeName nixosRevision;
   };
 
+  nixos-typecheck = makeProg {
+    name = "nixos-typecheck";
+    src = ./nixos-typecheck.sh;
+  };
+
 in
 
 {
@@ -67,10 +72,11 @@ in
         nixos-generate-config
         nixos-option
         nixos-version
+        nixos-typecheck
       ];
 
     system.build = {
-      inherit nixos-install nixos-generate-config nixos-option nixos-rebuild;
+      inherit nixos-install nixos-generate-config nixos-option nixos-rebuild nixos-typecheck;
     };
 
   };
diff --git a/nixos/modules/misc/meta.nix b/nixos/modules/misc/meta.nix
index 22622706f2c8..9a453172c63a 100644
--- a/nixos/modules/misc/meta.nix
+++ b/nixos/modules/misc/meta.nix
@@ -5,6 +5,7 @@ with lib;
 let
   maintainer = mkOptionType {
     name = "maintainer";
+    typerep = "(maintainer)";
     check = email: elem email (attrValues lib.maintainers);
     merge = loc: defs: listToAttrs (singleton (nameValuePair (last defs).file (last defs).value));
   };
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 5eb38c510b48..511831ae5cd2 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -3,32 +3,35 @@
 with lib;
 
 let
-  isConfig = x:
-    builtins.isAttrs x || builtins.isFunction x;
-
-  optCall = f: x:
-    if builtins.isFunction f
-    then f x
-    else f;
-
-  mergeConfig = lhs_: rhs_:
+  nixpkgsConfig = pkgs:
     let
-      lhs = optCall lhs_ { inherit pkgs; };
-      rhs = optCall rhs_ { inherit pkgs; };
+      isConfig = x:
+        builtins.isAttrs x || builtins.isFunction x;
+
+      optCall = f: x:
+        if builtins.isFunction f
+        then f x
+        else f;
+
+      mergeConfig = lhs_: rhs_:
+        let
+          lhs = optCall lhs_ { inherit pkgs; };
+          rhs = optCall rhs_ { inherit pkgs; };
+        in
+        lhs // rhs //
+        optionalAttrs (lhs ? packageOverrides) {
+          packageOverrides = pkgs:
+            optCall lhs.packageOverrides pkgs //
+            optCall (attrByPath ["packageOverrides"] ({}) rhs) pkgs;
+        };
     in
-    lhs // rhs //
-    optionalAttrs (lhs ? packageOverrides) {
-      packageOverrides = pkgs:
-        optCall lhs.packageOverrides pkgs //
-        optCall (attrByPath ["packageOverrides"] ({}) rhs) pkgs;
+    mkOptionType {
+      name = "nixpkgs config";
+      typerep = "(nixpkgsConfig)";
+      check = lib.traceValIfNot isConfig;
+      merge = config: args: fold (def: mergeConfig def.value) {};
+      defaultValues = [{}];
     };
-
-  configType = mkOptionType {
-    name = "nixpkgs config";
-    check = traceValIfNot isConfig;
-    merge = args: fold (def: mergeConfig def.value) {};
-  };
-
 in
 
 {
@@ -46,7 +49,7 @@ in
             };
           }
         '';
-      type = configType;
+      type = nixpkgsConfig pkgs;
       description = ''
         The configuration of the Nix Packages collection.  (For
         details, see the Nixpkgs documentation.)  It allows you to set
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index ad1636e002d8..88e01069b264 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1,4 +1,5 @@
 [
+  ../lib/typechecker.nix
   ./config/debug-info.nix
   ./config/fonts/corefonts.nix
   ./config/fonts/fontconfig-ultimate.nix
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index cc50bfbea531..e6ebcd6dc145 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -155,18 +155,21 @@ in {
       packages.gitlab = mkOption {
         type = types.package;
         default = pkgs.gitlab;
+        defaultText = "pkgs.gitlab";
         description = "Reference to the gitlab package";
       };
 
       packages.gitlab-shell = mkOption {
         type = types.package;
         default = pkgs.gitlab-shell;
+        defaultText = "pkgs.gitlab-shell";
         description = "Reference to the gitlab-shell package";
       };
 
       packages.gitlab-workhorse = mkOption {
         type = types.package;
         default = pkgs.gitlab-workhorse;
+        defaultText = "pkgs.gitlab-workhorse";
         description = "Reference to the gitlab-workhorse package";
       };
 
diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix
index d0e9b839e754..c177d68c8fe0 100644
--- a/nixos/modules/services/misc/ihaskell.nix
+++ b/nixos/modules/services/misc/ihaskell.nix
@@ -15,12 +15,14 @@ in
   options = {
     services.ihaskell = {
       enable = mkOption {
+        type = lib.types.bool;
         default = false;
         example = true;
         description = "Autostart an IHaskell notebook service.";
       };
 
       haskellPackages = mkOption {
+        type = lib.types.packageSet;
         default = pkgs.haskellPackages;
         defaultText = "pkgs.haskellPackages";
         example = literalExample "pkgs.haskell.packages.ghc784";
@@ -33,7 +35,9 @@ in
       };
 
       extraPackages = mkOption {
+        type = types.functionTo (types.listOf types.package);
         default = self: [];
+        defaultText = "self: []";
         example = literalExample ''
           haskellPackages: [
             haskellPackages.wreq
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 37ea339300d4..7ba1c319add4 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -17,6 +17,8 @@ let
       nixpkgs.system = config.nixpkgs.system;
     };
 
+  internalModule = { _module = config._module; };
+
   /* For the purpose of generating docs, evaluate options with each derivation
     in `pkgs` (recursively) replaced by a fake with path "\${pkgs.attribute.path}".
     It isn't perfect, but it seems to cover a vast majority of use cases.
@@ -29,7 +31,7 @@ let
     options =
       let
         scrubbedEval = evalModules {
-          modules = [ versionModule ] ++ baseModules;
+          modules = [ versionModule ] ++ baseModules ++ [ internalModule ];
           args = (config._module.args) // { modules = [ ]; };
           specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; };
         };
@@ -43,6 +45,7 @@ let
           )
           pkgSet;
       in scrubbedEval.options;
+    internalModule = config._module;
   };
 
   entry = "${manual.manual}/share/doc/nixos/index.html";
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 60ec49c9e66e..8340287df453 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -48,8 +48,7 @@ let
           if svc ? function then svc.function
           else import (toString "${toString ./.}/${if svc ? serviceType then svc.serviceType else svc.serviceName}.nix");
         config = (evalModules
-          { modules = [ { options = res.options; config = svc.config or svc; } ];
-            check = false;
+          { modules = [ { options = res.options; config = svc.config or svc; } ] ++ [ { _module.check = false; } ];
           }).config;
         defaults = {
           extraConfig = "";
diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix
index 6af88d4f645b..d8acb824f7df 100644
--- a/nixos/modules/services/x11/window-managers/xmonad.nix
+++ b/nixos/modules/services/x11/window-managers/xmonad.nix
@@ -16,6 +16,7 @@ in
     services.xserver.windowManager.xmonad = {
       enable = mkEnableOption "xmonad";
       haskellPackages = mkOption {
+        type = lib.types.packageSet;
         default = pkgs.haskellPackages;
         defaultText = "pkgs.haskellPackages";
         example = literalExample "pkgs.haskell.packages.ghc784";
@@ -28,7 +29,9 @@ in
       };
 
       extraPackages = mkOption {
+        type = lib.types.functionTo (lib.types.listOf lib.types.package);
         default = self: [];
+        defaultText = "self: []";
         example = literalExample ''
           haskellPackages: [
             haskellPackages.xmonad-contrib
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index a6bbca9b30bb..5b11a3fc61c3 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -20,6 +20,7 @@ in
   options = {
 
     boot.kernelPackages = mkOption {
+      type = types.packageSet;
       default = pkgs.linuxPackages;
       # We don't want to evaluate all of linuxPackages for the manual
       # - some of it might not even evaluate correctly.
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index d4cab93b26b8..16d0e098b8c8 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -17,14 +17,15 @@ in rec {
 
   unitOption = mkOptionType {
     name = "systemd option";
-    merge = loc: defs:
+    typerep = "(systemdOption)";
+    merge = _module: loc: defs:
       let
         defs' = filterOverrides defs;
         defs'' = getValues defs';
       in
         if isList (head defs'')
         then concatLists defs''
-        else mergeOneOption loc defs';
+        else mergeOneOption _module loc defs';
   };
 
   sharedOptions = {
diff --git a/nixos/release.nix b/nixos/release.nix
index cfe152cc163d..3fa1676c8614 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -101,6 +101,8 @@ in rec {
   manpages = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manpages);
   options = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux;
 
+  optionsSpecs = (buildFromConfig ({ pkgs, ... }: { _module.typeInference = "silent"; }) (config: config.system.build.typechecker.specifications)).x86_64-linux;
+
 
   # Build the initial ramdisk so Hydra can keep track of its size over time.
   initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk);

From 2d6696fc0a23976498d0033d03382880e24e953d Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Mon, 29 Feb 2016 01:47:12 +0100
Subject: [PATCH 1994/2285] nixos-modules: Fixes related to "literalExample"
 and "defaultText".

---
 nixos/modules/services/logging/logstash.nix          | 6 +++---
 nixos/modules/services/misc/octoprint.nix            | 2 ++
 nixos/modules/services/networking/nsd.nix            | 4 ++--
 nixos/modules/services/networking/wpa_supplicant.nix | 9 +++++----
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/logging/logstash.nix b/nixos/modules/services/logging/logstash.nix
index d27456e59e88..e019e6c3f237 100644
--- a/nixos/modules/services/logging/logstash.nix
+++ b/nixos/modules/services/logging/logstash.nix
@@ -85,7 +85,7 @@ in
         type = types.lines;
         default = ''stdin { type => "example" }'';
         description = "Logstash input configuration.";
-        example = literalExample ''
+        example = ''
           # Read from journal
           pipe {
             command => "''${pkgs.systemd}/bin/journalctl -f -o json"
@@ -98,7 +98,7 @@ in
         type = types.lines;
         default = ''noop {}'';
         description = "logstash filter configuration.";
-        example = literalExample ''
+        example = ''
           if [type] == "syslog" {
             # Keep only relevant systemd fields
             # http://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html
@@ -114,7 +114,7 @@ in
 
       outputConfig = mkOption {
         type = types.lines;
-        default = literalExample ''stdout { debug => true debug_format => "json"}'';
+        default = ''stdout { debug => true debug_format => "json"}'';
         description = "Logstash output configuration.";
         example = ''
           redis { host => "localhost" data_type => "list" key => "logstash" codec => json }
diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix
index bb9dc5da2eb6..150056b8ab07 100644
--- a/nixos/modules/services/misc/octoprint.nix
+++ b/nixos/modules/services/misc/octoprint.nix
@@ -62,7 +62,9 @@ in
       };
 
       plugins = mkOption {
+        type = types.functionTo (types.listOf types.package);
         default = plugins: [];
+        defaultText = "plugins: []";
         example = literalExample "plugins: [ m3d-fio ]";
         description = "Additional plugins.";
       };
diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index b3f2730e672f..ca08bb57895a 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -559,7 +559,7 @@ in
             algorithm = "hmac-md5";
             keyFile = "/path/to/my/key";
           };
-        };
+        }
       '';
       description = ''
         Define your TSIG keys here.
@@ -719,7 +719,7 @@ in
               ...
             ''';
           };
-        };
+        }
       '';
       description = ''
         Define your zones here. Zones can cascade other zones and therefore
diff --git a/nixos/modules/services/networking/wpa_supplicant.nix b/nixos/modules/services/networking/wpa_supplicant.nix
index 88345fdc11e7..a8f445a2c73c 100644
--- a/nixos/modules/services/networking/wpa_supplicant.nix
+++ b/nixos/modules/services/networking/wpa_supplicant.nix
@@ -78,10 +78,11 @@ in {
         '';
         default = {};
         example = literalExample ''
-          echelon = {
-            psk = "abcdefgh";
-          };
-          "free.wifi" = {};
+          { echelon = {
+              psk = "abcdefgh";
+            };
+            "free.wifi" = {};
+          }
         '';
       };
 

From bc52fa05080b40a2b60fd1a7ab20d4ea510a3807 Mon Sep 17 00:00:00 2001
From: Thomas Strobel <ts468@cam.ac.uk>
Date: Mon, 29 Feb 2016 01:51:41 +0100
Subject: [PATCH 1995/2285] update maintainer's email address

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index df5dfced4b43..3bbb30ba3cea 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -330,7 +330,7 @@
   tomberek = "Thomas Bereknyei <tomberek@gmail.com>";
   travisbhartwell = "Travis B. Hartwell <nafai@travishartwell.net>";
   trino = "Hubert Mühlhans <muehlhans.hubert@ekodia.de>";
-  tstrobel = "Thomas Strobel <ts468@cam.ac.uk>";
+  tstrobel = "Thomas Strobel <4ZKTUB6TEP74PYJOPWIR013S2AV29YUBW5F9ZH2F4D5UMJUJ6S@hash.domains>";
   ttuegel = "Thomas Tuegel <ttuegel@gmail.com>";
   tv = "Tomislav Viljetić <tv@shackspace.de>";
   tvestelind = "Tomas Vestelind <tomas.vestelind@fripost.org>";

From 818f2cd19fcb0d450e2b0847b3dd3598007ba38a Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Sun, 28 Feb 2016 21:04:23 -0600
Subject: [PATCH 1996/2285] nethack: fix darwin support

---
 pkgs/games/nethack/default.nix | 40 +++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/pkgs/games/nethack/default.nix b/pkgs/games/nethack/default.nix
index 05c39fb2f2b5..ce12196d3c36 100644
--- a/pkgs/games/nethack/default.nix
+++ b/pkgs/games/nethack/default.nix
@@ -6,6 +6,7 @@ let
     else abort "Unknown platform for NetHack";
   unixHint =
     if stdenv.isLinux then "linux"
+    else if stdenv.isDarwin then "macosx10.10"
     # We probably want something different for Darwin
     else "unix";
   userDir = "~/.config/nethack";
@@ -24,25 +25,30 @@ in stdenv.mkDerivation {
 
   makeFlags = [ "PREFIX=$(out)" ];
 
-  configurePhase = ''
-    cd sys/${platform}
-    ${lib.optionalString (platform == "unix") ''
-      sed -e '/^ *cd /d' -i nethack.sh
-      ${lib.optionalString (unixHint == "linux") ''
-        sed \
-          -e 's,/bin/gzip,${gzip}/bin/gzip,g' \
-          -e 's,^WINTTYLIB=.*,WINTTYLIB=-lncurses,' \
-          -i hints/linux
-      ''}
-      sh setup.sh hints/${unixHint}
-    ''}
-    cd ../..
-
-    sed -e '/define CHDIR/d' -i include/config.h
+  patchPhase = ''
+    sed -e '/^ *cd /d' -i sys/unix/nethack.sh
     sed \
       -e 's/^YACC *=.*/YACC = bison -y/' \
       -e 's/^LEX *=.*/LEX = flex/' \
-      -i util/Makefile
+      -i sys/unix/Makefile.utl
+    sed \
+      -e 's,/bin/gzip,${gzip}/bin/gzip,g' \
+      -e 's,^WINTTYLIB=.*,WINTTYLIB=-lncurses,' \
+      -i sys/unix/hints/linux
+    sed \
+      -e 's,^CC=.*$,CC=cc,' \
+      -e 's,^HACKDIR=.*$,HACKDIR=\$(PREFIX)/games/lib/\$(GAME)dir,' \
+      -e 's,^SHELLDIR=.*$,SHELLDIR=\$(PREFIX)/games,' \
+      -i sys/unix/hints/macosx10.10
+    sed -e '/define CHDIR/d' -i include/config.h
+  '';
+
+  configurePhase = ''
+    cd sys/${platform}
+    ${lib.optionalString (platform == "unix") ''
+      sh setup.sh hints/${unixHint}
+    ''}
+    cd ../..
   '';
 
   postInstall = ''
@@ -61,7 +67,7 @@ in stdenv.mkDerivation {
       chmod -R +w ${userDir}
     fi
 
-    RUNDIR=\$(mktemp -td nethack.\$USER.XXXXX)
+    RUNDIR=\$(mktemp -d)
 
     cleanup() {
       rm -rf \$RUNDIR

From 37d1dcd12d1367a9b0be23947ffe8a0539c2f2b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Val=C3=A9rian=20Galliat?= <val@codejam.info>
Date: Sun, 28 Feb 2016 00:12:55 -0500
Subject: [PATCH 1997/2285] buildGoPackage: do not remove Go references if
 allowGoReferences is true

allowGoReference was only checked for disallowedReferences definition,
but the fixup of all output binaries removing references to the compiler
did not take this setting into account.
---
 pkgs/development/go-modules/generic/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix
index 260e8d66c58a..15b729173c6a 100644
--- a/pkgs/development/go-modules/generic/default.nix
+++ b/pkgs/development/go-modules/generic/default.nix
@@ -30,7 +30,7 @@ if disabled then throw "${name} not supported for go ${go.meta.branch}" else
 let
   args = lib.filterAttrs (name: _: name != "extraSrcs") args';
 
-  removeReferences = [ go ];
+  removeReferences = [ ] ++ lib.optional (!allowGoReference) go;
 
   removeExpr = refs: lib.flip lib.concatMapStrings refs (ref: ''
     | sed "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \

From 70df5bf9ea1d56dbe7dfe0bd83ed5478882fda8f Mon Sep 17 00:00:00 2001
From: Tim Cuthbertson <tim@gfxmonk.net>
Date: Mon, 29 Feb 2016 20:15:19 +1100
Subject: [PATCH 1998/2285] gup: 0.5.3 -> 0.5.4

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

diff --git a/pkgs/development/tools/build-managers/gup/default.nix b/pkgs/development/tools/build-managers/gup/default.nix
index 0f1ecdcaa545..a907e6ace9e4 100644
--- a/pkgs/development/tools/build-managers/gup/default.nix
+++ b/pkgs/development/tools/build-managers/gup/default.nix
@@ -1,10 +1,10 @@
 { stdenv, fetchgit, lib, python, which }:
 let
-  version = "0.5.3";
+  version = "0.5.4";
   src = fetchgit {
     url = "https://github.com/gfxmonk/gup.git";
-    rev = "55ffd8828ddc28a2a786b75422d672d6569f961f";
-    sha256 = "7c2abbf5d3814c6b84da0de1c91f9f7d299c2362cf091da96f6a68d8fffcb5ce";
+    rev = "b3980e529c860167b48e31634d2b479fc4d10274";
+    sha256 = "bb02ba0a7f1680ed5b9a8e8c9cc42aa07016329840f397d914b94744f9ed7c85";
   };
 in
 import ./build.nix

From 0294fc5bbda95f80d39a6242388787d6d3576701 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 29 Feb 2016 10:53:35 +0100
Subject: [PATCH 1999/2285] haskellPackages: fix evaluation

It seems `self` was wanted instead of `pkgs` by the author of 3844206.
---
 pkgs/development/haskell-modules/configuration-common.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 1b2a82f3dcb7..4fa6d2f78bbd 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -323,7 +323,7 @@ self: super: {
   github-types = dontCheck super.github-types;          # http://hydra.cryp.to/build/1114046/nixlog/1/raw
   hadoop-rpc = dontCheck super.hadoop-rpc;              # http://hydra.cryp.to/build/527461/nixlog/2/raw
   hasql = dontCheck super.hasql;                        # http://hydra.cryp.to/build/502489/nixlog/4/raw
-  hjsonschema = overrideCabal (super.hjsonschema.override { hjsonpointer = pkgs.hjsonpointer_0_2_0_4; }) (drv: { testTarget = "local"; });
+  hjsonschema = overrideCabal (super.hjsonschema.override { hjsonpointer = self.hjsonpointer_0_2_0_4; }) (drv: { testTarget = "local"; });
   hoogle = overrideCabal super.hoogle (drv: { testTarget = "--test-option=--no-net"; });
   marmalade-upload = dontCheck super.marmalade-upload;  # http://hydra.cryp.to/build/501904/nixlog/1/raw
   network-transport-tcp = dontCheck super.network-transport-tcp;

From de8c119a4b1e4cac525c36613c8fdba54bb0af5d Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 29 Feb 2016 10:02:59 +0000
Subject: [PATCH 2000/2285] redmine: fix compilation with ruby 2.3

Just bumped the JSON dependency manually to the one bundled with ruby 2.3
---
 pkgs/applications/version-management/redmine/Gemfile.lock | 2 +-
 pkgs/applications/version-management/redmine/Gemfile.nix  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/version-management/redmine/Gemfile.lock b/pkgs/applications/version-management/redmine/Gemfile.lock
index 7d83583c019d..c660e73f4a0f 100644
--- a/pkgs/applications/version-management/redmine/Gemfile.lock
+++ b/pkgs/applications/version-management/redmine/Gemfile.lock
@@ -50,7 +50,7 @@ GEM
     jquery-rails (2.0.3)
       railties (>= 3.1.0, < 5.0)
       thor (~> 0.14)
-    json (1.8.1)
+    json (1.8.3)
     mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
diff --git a/pkgs/applications/version-management/redmine/Gemfile.nix b/pkgs/applications/version-management/redmine/Gemfile.nix
index a7339097b146..77adfba334ec 100644
--- a/pkgs/applications/version-management/redmine/Gemfile.nix
+++ b/pkgs/applications/version-management/redmine/Gemfile.nix
@@ -115,9 +115,9 @@ version = "2.0.3";
 }
 {
 name = "json";
-hash = "961bfbbfa9fda1e857e9c791e964e6664e0d43bf687b19669dfbc7cdbc5e0200";
-url = "http://rubygems.org/downloads/json-1.8.1.gem";
-version = "1.8.1";
+hash = "1nsby6ry8l9xg3yw4adlhk2pnc7i0h0rznvcss4vk3v74qg0k8lc";
+url = "http://rubygems.org/downloads/json-1.8.3.gem";
+version = "1.8.3";
 }
 {
 name = "mail";

From 8625d2f8aa645971a19324b0d78770680ee0f845 Mon Sep 17 00:00:00 2001
From: Tobias Pflug <tobias.pflug@holidaycheck.com>
Date: Sun, 28 Feb 2016 16:32:56 +0100
Subject: [PATCH 2001/2285] nodejs-5_x: 5.6.0 -> 5.7.0

---
 pkgs/development/web/nodejs/v5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix
index 948c4d10b309..c5bc3311503b 100644
--- a/pkgs/development/web/nodejs/v5.nix
+++ b/pkgs/development/web/nodejs/v5.nix
@@ -7,7 +7,7 @@
 assert stdenv.system != "armv5tel-linux";
 
 let
-  version = "5.6.0";
+  version = "5.7.0";
 
   deps = {
     inherit openssl zlib libuv;
@@ -31,7 +31,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "0zy2pq2xpw170lycs0518jjldy1d5vm5y1pjb4zcibvhb5gcrwis";
+    sha256 = "1n6jvvf3jfmv7fjd64c5jajjapsmc8gr6rlw113vgys55xmb8f13";
   };
 
   configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];

From 56e68d4d5f7db95370aa0be76dc8b107fb169904 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 29 Feb 2016 11:39:11 +0100
Subject: [PATCH 2002/2285] Manual: rl-unstable.xml -> rl-1603.xml

---
 nixos/doc/manual/release-notes/release-notes.xml              | 2 +-
 .../doc/manual/release-notes/{rl-unstable.xml => rl-1603.xml} | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename nixos/doc/manual/release-notes/{rl-unstable.xml => rl-1603.xml} (99%)

diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml
index 6ed99315a7af..2beaab00800d 100644
--- a/nixos/doc/manual/release-notes/release-notes.xml
+++ b/nixos/doc/manual/release-notes/release-notes.xml
@@ -9,7 +9,7 @@
 <para>This section lists the release notes for each stable version of NixOS
 and current unstable revision.</para>
 
-<xi:include href="rl-unstable.xml" />
+<xi:include href="rl-1603.xml" />
 <xi:include href="rl-1509.xml" />
 <xi:include href="rl-1412.xml" />
 <xi:include href="rl-1404.xml" />
diff --git a/nixos/doc/manual/release-notes/rl-unstable.xml b/nixos/doc/manual/release-notes/rl-1603.xml
similarity index 99%
rename from nixos/doc/manual/release-notes/rl-unstable.xml
rename to nixos/doc/manual/release-notes/rl-1603.xml
index 5c2938794b95..0ede1a9ce8ed 100644
--- a/nixos/doc/manual/release-notes/rl-unstable.xml
+++ b/nixos/doc/manual/release-notes/rl-1603.xml
@@ -2,9 +2,9 @@
          xmlns:xlink="http://www.w3.org/1999/xlink"
          xmlns:xi="http://www.w3.org/2001/XInclude"
          version="5.0"
-         xml:id="sec-release-unstable">
+         xml:id="sec-release-16.03">
 
-<title>Unstable</title>
+<title>Release 16.03 (“Emu”, 2016/03/??)</title>
 
 <para>In addition to numerous new and upgraded packages, this release
 has the following highlights:</para>

From fa4499cc8c8a4d31cf8acff941f3c752fc993bee Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 29 Feb 2016 11:06:02 +0000
Subject: [PATCH 2003/2285] pythonPackages.acme-tiny: fixup duplicate
 declaration

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 29ed4c07beb8..ff2fe1e840af 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -300,43 +300,6 @@ in modules // {
     };
   };
 
-  acme-tiny = buildPythonPackage rec {
-    name = "acme-tiny-${version}";
-    version = "20151229";
-    rev = "f61f72c212cea27f388eb4a26ede0d65035bdb53";
-
-    src = pkgs.fetchgit {
-      inherit rev;
-      url = "https://github.com/diafygi/acme-tiny.git";
-      sha256 = "dde59354e483bdff3dfd06717c094889ae673efb568e40b150b4695b0c539649";
-    };
-
-    # source doesn't have any python "packaging" as such
-    configurePhase = " ";
-    buildPhase = " ";
-    # the tests are... complex
-    doCheck = false;
-
-    patchPhase = ''
-      substituteInPlace acme_tiny.py --replace "openssl" "${pkgs.openssl}/bin/openssl"
-    '';
-
-    installPhase = ''
-      mkdir -p $out/${python.sitePackages}/
-      cp acme_tiny.py $out/${python.sitePackages}/
-      mkdir -p $out/bin
-      ln -s $out/${python.sitePackages}/acme_tiny.py $out/bin/acme_tiny
-      chmod +x $out/bin/acme_tiny
-    '';
-
-    meta = {
-      description = "A tiny script to issue and renew TLS certs from Let's Encrypt";
-      homepage = https://github.com/diafygi/acme-tiny;
-      license = licenses.mit;
-    };
-  };
-
-
   actdiag = buildPythonPackage rec {
     name = "actdiag-0.5.3";
 

From 22d7c08dc506f74803b7c61c6cbf156dfe844f02 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Sun, 28 Feb 2016 16:35:27 +0000
Subject: [PATCH 2004/2285] lib.trivial: add a new importJSON function

This is meant to be used by packages who often re-generate their inputs.

Producing valid JSON is easier than nix, and also garantees it's purity.
---
 lib/trivial.nix | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/lib/trivial.nix b/lib/trivial.nix
index cda8aa08a205..9821e3c138dd 100644
--- a/lib/trivial.nix
+++ b/lib/trivial.nix
@@ -75,4 +75,25 @@ rec {
   min = x: y: if x < y then x else y;
   max = x: y: if x > y then x else y;
 
+  /* Reads a JSON file. It is useful to import pure data into other nix
+     expressions.
+
+     Example:
+
+       mkDerivation {
+         src = fetchgit (importJSON ./repo.json)
+         #...
+       }
+
+       where repo.json contains:
+
+       {
+         "url": "git://some-domain/some/repo",
+         "rev": "265de7283488964f44f0257a8b4a055ad8af984d",
+         "sha256": "0sb3h3067pzf3a7mlxn1hikpcjrsvycjcnj9hl9b1c3ykcgvps7h"
+       }
+
+  */
+  importJSON = path:
+    builtins.fromJSON (builtins.readFile path);
 }

From ce549c85c8e67892fa23365d70e123e60a94d95b Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Mon, 29 Feb 2016 13:08:12 +0100
Subject: [PATCH 2005/2285] pharo-vm: stop trying to build on darwin

Building these pharo-vm sources on darwin may be possible but doesn't
make much sense because native darwin sources exist.
---
 pkgs/development/pharo/vm/build-vm.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix
index d18f64c9aba3..3dfe913145ce 100644
--- a/pkgs/development/pharo/vm/build-vm.nix
+++ b/pkgs/development/pharo/vm/build-vm.nix
@@ -88,6 +88,10 @@ stdenv.mkDerivation rec {
     homepage = http://pharo.org;
     license = stdenv.lib.licenses.mit;
     maintainers = [ stdenv.lib.maintainers.DamienCassou ];
-    platforms = stdenv.lib.platforms.mesaPlatforms;
+    # Pharo VM sources are packaged separately for darwin (OS X)
+    platforms = with stdenv.lib;
+                  intersectLists
+                    platforms.mesaPlatforms
+                    (subtractLists platforms.darwin platforms.unix);
   };
 }

From 756604cc08d801b8648c5d86a0c34f45f15e2f1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Mon, 29 Feb 2016 13:08:33 +0000
Subject: [PATCH 2006/2285] transmission: 2.84 -> 2.90

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

diff --git a/pkgs/applications/networking/p2p/transmission/default.nix b/pkgs/applications/networking/p2p/transmission/default.nix
index e81ef7a4f9ff..dbd23195a1cd 100644
--- a/pkgs/applications/networking/p2p/transmission/default.nix
+++ b/pkgs/applications/networking/p2p/transmission/default.nix
@@ -4,7 +4,7 @@
 }:
 
 let
-  version = "2.84";
+  version = "2.90";
 in
 
 with { inherit (stdenv.lib) optional optionals optionalString; };
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://transmission.cachefly.net/transmission-${version}.tar.xz";
-    sha256 = "1sxr1magqb5s26yvr5yhs1f7bmir8gl09niafg64lhgfnhv1kz59";
+    sha256 = "1lig7y9fhmv2ajgq1isj9wqgpcgignzlczs3dy95ahb8h6pqrzv9";
   };
 
   buildInputs = [ pkgconfig intltool file openssl curl libevent inotify-tools zlib ]

From b5ee64410d00e2cb43edcb1ad269b05c3e33e5ad Mon Sep 17 00:00:00 2001
From: Mitchell Pleune <mitchpleune@gmail.com>
Date: Sat, 27 Feb 2016 16:36:13 -0500
Subject: [PATCH 2007/2285] x11 service: bspwm limit sxhkd freqency

add '-f 100' as an argument to sxhkd to keep it from flooding bspwm

add SXHKD_SHELL=/bin/sh to help default to a faster shell than what may
be set in $SHELL (example: with zsh)
---
 nixos/modules/services/x11/window-managers/bspwm.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/x11/window-managers/bspwm.nix b/nixos/modules/services/x11/window-managers/bspwm.nix
index 8b4e91d25aa4..1edf6ba4deb9 100644
--- a/nixos/modules/services/x11/window-managers/bspwm.nix
+++ b/nixos/modules/services/x11/window-managers/bspwm.nix
@@ -15,7 +15,7 @@ in
     services.xserver.windowManager.session = singleton {
       name = "bspwm";
       start = "
-        ${pkgs.sxhkd}/bin/sxhkd &
+        SXHKD_SHELL=/bin/sh ${pkgs.sxhkd}/bin/sxhkd -f 100 &
         ${pkgs.bspwm}/bin/bspwm
       ";
     };

From 6d9cc5408909aa304cd8af25059b129c1652c26e Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 29 Feb 2016 13:49:29 +0000
Subject: [PATCH 2008/2285] build-maven: use lib.importJSON

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

diff --git a/pkgs/build-support/build-maven.nix b/pkgs/build-support/build-maven.nix
index ff91828eeca7..ba85428ba8c4 100644
--- a/pkgs/build-support/build-maven.nix
+++ b/pkgs/build-support/build-maven.nix
@@ -11,7 +11,7 @@
  *        the project.
  */
 infoFile: let
-  info = builtins.fromJSON (builtins.readFile infoFile);
+  info = lib.importJSON infoFile;
 
   script = writeText "build-maven-repository.sh" ''
     ${lib.concatStrings (map (dep: let

From 694a5ba291c37a324cc8076e456e2e9c85077029 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 29 Feb 2016 15:35:21 +0100
Subject: [PATCH 2009/2285] eprover: fix build on Darwin

---
 pkgs/applications/science/logic/eprover/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/eprover/default.nix b/pkgs/applications/science/logic/eprover/default.nix
index 97fe7065b85d..1f36858ae320 100644
--- a/pkgs/applications/science/logic/eprover/default.nix
+++ b/pkgs/applications/science/logic/eprover/default.nix
@@ -20,7 +20,11 @@ stdenv.mkDerivation {
 
   buildInputs = [ which ];
 
-  preConfigure = "sed -e 's@^EXECPATH\\s.*@EXECPATH = '\$out'/bin@' -i Makefile.vars";
+  preConfigure = ''
+    sed -e 's@^EXECPATH\\s.*@EXECPATH = '\$out'/bin@' \
+    -e 's/^CC *= gcc$//' \
+    -i Makefile.vars
+  '';
 
   buildPhase = "make install";
 
@@ -34,6 +38,8 @@ stdenv.mkDerivation {
   meta = {
     inherit (s) version;
     description = "Automated theorem prover for full first-order logic with equality";
+    homepage = http://www.eprover.org/;
+    license = stdenv.lib.licenses.gpl2;
     maintainers = [stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.all;
   };

From aa9576bceb56d4fe2fb24e6fb47001817baeab34 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Thu, 8 Oct 2015 14:53:37 +0200
Subject: [PATCH 2010/2285] installer: add graphical GNOME iso

---
 .../installation-cd-graphical-gnome.nix       | 78 +++++++++++++++++++
 ...tallation-cd-graphical-kde-new-kernel.nix} |  2 +-
 ....nix => installation-cd-graphical-kde.nix} |  0
 .../services/x11/desktop-managers/gnome3.nix  | 57 +++++++++-----
 nixos/release.nix                             |  2 +-
 .../gnome-3/3.18/core/gnome-shell/default.nix |  3 +-
 .../gnome-3/3.18/core/nautilus/default.nix    |  3 +-
 pkgs/desktops/gnome-3/3.18/default.nix        |  3 +
 pkgs/desktops/gnome-3/3.18/installer.nix      | 15 ++++
 9 files changed, 140 insertions(+), 23 deletions(-)
 create mode 100644 nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
 rename nixos/modules/installer/cd-dvd/{installation-cd-graphical-new-kernel.nix => installation-cd-graphical-kde-new-kernel.nix} (60%)
 rename nixos/modules/installer/cd-dvd/{installation-cd-graphical.nix => installation-cd-graphical-kde.nix} (100%)
 create mode 100644 pkgs/desktops/gnome-3/3.18/installer.nix

diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
new file mode 100644
index 000000000000..5725938465f5
--- /dev/null
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix
@@ -0,0 +1,78 @@
+# This module defines a NixOS installation CD that contains X11 and
+# GNOME 3.
+
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+{
+  imports = [ ./installation-cd-base.nix ];
+
+  services.xserver = {
+    enable = true;
+    # GDM doesn't start in virtual machines with ISO
+    displayManager.slim = {
+      enable = true;
+      defaultUser = "root";
+      autoLogin = true;
+    };
+    desktopManager.gnome3 = {
+      enable = true;
+      extraGSettingsOverrides = ''
+        [org.gnome.desktop.background]
+        show-desktop-icons=true
+
+        [org.gnome.nautilus.desktop]
+        trash-icon-visible=false
+        volumes-visible=false
+        home-icon-visible=false
+        network-icon-visible=false
+      '';
+
+      extraGSettingsOverridePackages = [ pkgs.gnome3.nautilus ];
+    };
+  };
+
+  environment.systemPackages =
+    [ # Include gparted for partitioning disks.
+      pkgs.gparted
+
+      # Include some editors.
+      pkgs.vim
+      pkgs.bvi # binary editor
+      pkgs.joe
+
+      pkgs.glxinfo
+    ];
+
+  # Don't start the X server by default.
+  services.xserver.autorun = mkForce false;
+
+  # Auto-login as root.
+  services.xserver.displayManager.gdm.autoLogin = {
+    enable = true;
+    user = "root";
+  };
+
+  system.activationScripts.installerDesktop = let
+    # Must be executable
+    desktopFile = pkgs.writeScript "nixos-manual.desktop" ''
+      [Desktop Entry]
+      Version=1.0
+      Type=Link
+      Name=NixOS Manual
+      URL=${config.system.build.manual.manual}/share/doc/nixos/index.html
+      Icon=system-help
+    '';
+
+  # use cp and chmod +x, we must be sure the apps are in the nix store though
+  in ''
+    mkdir -p /root/Desktop
+    ln -sfT ${desktopFile} /root/Desktop/nixos-manual.desktop
+    cp ${pkgs.gnome3.gnome_terminal}/share/applications/gnome-terminal.desktop /root/Desktop/gnome-terminal.desktop
+    chmod a+rx /root/Desktop/gnome-terminal.desktop
+    cp ${pkgs.gparted}/share/applications/gparted.desktop /root/Desktop/gparted.desktop
+    chmod a+rx /root/Desktop/gparted.desktop
+  '';
+
+}
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix
similarity index 60%
rename from nixos/modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix
rename to nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix
index 506b9292b01e..a4bcd7079a4f 100644
--- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-new-kernel.nix
+++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde-new-kernel.nix
@@ -1,7 +1,7 @@
 { config, pkgs, ... }:
 
 {
-  imports = [ ./installation-cd-graphical.nix ];
+  imports = [ ./installation-cd-graphical-kde.nix ];
 
   boot.kernelPackages = pkgs.linuxPackages_latest;
 }
diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
similarity index 100%
rename from nixos/modules/installer/cd-dvd/installation-cd-graphical.nix
rename to nixos/modules/installer/cd-dvd/installation-cd-graphical-kde.nix
diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix
index 4dd631d87511..be7700424bc6 100644
--- a/nixos/modules/services/x11/desktop-managers/gnome3.nix
+++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix
@@ -27,19 +27,24 @@ let
 
   nixos-gsettings-desktop-schemas = pkgs.stdenv.mkDerivation {
     name = "nixos-gsettings-desktop-schemas";
-    buildInputs = [ pkgs.nixos-artwork ];
     buildCommand = ''
-     mkdir -p $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas
-     cp -rf ${gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0 $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas/
-     chmod -R a+w $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas
-     cat - > $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF
+     mkdir -p $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
+     cp -rf ${gnome3.gsettings_desktop_schemas}/share/gsettings-schemas/gsettings-desktop-schemas*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
+
+     ${concatMapStrings (pkg: "cp -rf ${pkg}/share/gsettings-schemas/*/glib-2.0/schemas/*.xml $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas\n") cfg.extraGSettingsOverridePackages}
+
+     chmod -R a+w $out/share/gsettings-schemas/nixos-gsettings-overrides
+     cat - > $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/nixos-defaults.gschema.override <<- EOF
        [org.gnome.desktop.background]
        picture-uri='${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png'
 
        [org.gnome.desktop.screensaver]
        picture-uri='${pkgs.nixos-artwork}/share/artwork/gnome/Gnome_Dark.png'
+
+       ${cfg.extraGSettingsOverrides}
      EOF
-     ${pkgs.glib}/bin/glib-compile-schemas $out/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas/glib-2.0/schemas/
+
+     ${pkgs.glib}/bin/glib-compile-schemas $out/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas/
     '';
   };
 
@@ -47,19 +52,33 @@ in {
 
   options = {
 
-    services.xserver.desktopManager.gnome3.enable = mkOption {
-      default = false;
-      example = true;
-      description = "Enable Gnome 3 desktop manager.";
-    };
+    services.xserver.desktopManager.gnome3 = {
+      enable = mkOption {
+        default = false;
+        example = true;
+        description = "Enable Gnome 3 desktop manager.";
+      };
 
-    services.xserver.desktopManager.gnome3.sessionPath = mkOption {
-      default = [];
-      example = literalExample "[ pkgs.gnome3.gpaste ]";
-      description = "Additional list of packages to be added to the session search path.
-                     Useful for gnome shell extensions or gsettings-conditionated autostart.";
-      apply = list: list ++ [ gnome3.gnome_shell gnome3.gnome-shell-extensions ];
-    };
+      sessionPath = mkOption {
+        default = [];
+        example = literalExample "[ pkgs.gnome3.gpaste ]";
+        description = "Additional list of packages to be added to the session search path.
+                       Useful for gnome shell extensions or gsettings-conditionated autostart.";
+        apply = list: list ++ [ gnome3.gnome_shell gnome3.gnome-shell-extensions ];
+      };
+
+      extraGSettingsOverrides = mkOption {
+        default = "";
+        type = types.lines;
+        description = "Additional gsettings overrides.";
+      };
+
+      extraGSettingsOverridePackages = mkOption {
+        default = [];
+        type = types.listOf types.path;
+        description = "List of packages for which gsettings are overridden.";
+      };
+    };  
 
     environment.gnome3.packageSet = mkOption {
       type = types.nullOr types.package;
@@ -130,7 +149,7 @@ in {
           export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share
 
           # Override gsettings-desktop-schema
-          export XDG_DATA_DIRS=${nixos-gsettings-desktop-schemas}/share/nixos-gsettings-schemas/nixos-gsettings-desktop-schemas''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
+          export XDG_DATA_DIRS=${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
 
           # Let nautilus find extensions
           export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/
diff --git a/nixos/release.nix b/nixos/release.nix
index d9f3e46b27c0..76ca15ef97fb 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -113,7 +113,7 @@ in rec {
   });
 
   iso_graphical = forAllSystems (system: makeIso {
-    module = ./modules/installer/cd-dvd/installation-cd-graphical.nix;
+    module = ./modules/installer/cd-dvd/installation-cd-graphical-kde.nix;
     type = "graphical";
     inherit system;
   });
diff --git a/pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix
index 899efc5443bb..11d78cd61328 100644
--- a/pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/gnome-shell/default.nix
@@ -37,7 +37,8 @@ stdenv.mkDerivation rec {
       --prefix PATH : "${unzip}/bin" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --suffix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "${gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS" \
+      --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
 
     wrapProgram "$out/libexec/gnome-shell-calendar-server" \
       --prefix XDG_DATA_DIRS : "${evolution_data_server}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
diff --git a/pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix b/pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix
index f28e86d7bad0..ff9f847d3cdd 100644
--- a/pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/core/nautilus/default.nix
@@ -13,7 +13,8 @@ stdenv.mkDerivation rec {
     wrapProgram "$out/bin/nautilus" \
       --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
       --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
-      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share:$GSETTINGS_SCHEMAS_PATH"
+      --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share" \
+      --suffix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
   '';
 
   patches = [ ./extension_dir.patch ];
diff --git a/pkgs/desktops/gnome-3/3.18/default.nix b/pkgs/desktops/gnome-3/3.18/default.nix
index f949eb1b2085..8234d21f39e9 100644
--- a/pkgs/desktops/gnome-3/3.18/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/default.nix
@@ -65,6 +65,9 @@ let
 # Simplify the nixos module and gnome packages
   defaultIconTheme = adwaita-icon-theme;
 
+# ISO installer
+  installerIso = callPackage ./installer.nix {};
+
 #### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
 
   adwaita-icon-theme = callPackage ./core/adwaita-icon-theme { };
diff --git a/pkgs/desktops/gnome-3/3.18/installer.nix b/pkgs/desktops/gnome-3/3.18/installer.nix
new file mode 100644
index 000000000000..e4d64ac9e885
--- /dev/null
+++ b/pkgs/desktops/gnome-3/3.18/installer.nix
@@ -0,0 +1,15 @@
+{ isoBaseName ? "nixos-graphical-gnome", system ? builtins.currentSystem
+, extraModules ? [] }:
+    
+let
+
+  module = ../../../../nixos/modules/installer/cd-dvd/installation-cd-graphical-gnome.nix;
+
+  config = (import ../../../../nixos/lib/eval-config.nix {
+    inherit system;
+    modules = [ module { isoImage.isoBaseName = isoBaseName; } ] ++ extraModules;
+  }).config;
+
+in
+  config.system.build.isoImage
+

From 1685ad23674823ccef5071053522d852822cb56f Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Mon, 29 Feb 2016 17:20:41 +0100
Subject: [PATCH 2011/2285] Update ECL

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

diff --git a/pkgs/development/compilers/ecl/default.nix b/pkgs/development/compilers/ecl/default.nix
index 172283b19dee..a04ec454cae3 100644
--- a/pkgs/development/compilers/ecl/default.nix
+++ b/pkgs/development/compilers/ecl/default.nix
@@ -7,11 +7,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="ecl";
-    version="16.0.0";
+    version="16.1.2";
     name="${baseName}-${version}";
-    hash="0czh78z9i5b7jc241mq1h1gdscvdw5fbhfb0g9sn4rchwk1x8gil";
-    url="https://common-lisp.net/project/ecl/files/release/16.0.0/ecl-16.0.0.tgz";
-    sha256="0czh78z9i5b7jc241mq1h1gdscvdw5fbhfb0g9sn4rchwk1x8gil";
+    hash="16ab8qs3awvdxy8xs8jy82v8r04x4wr70l9l2j45vgag18d2nj1d";
+    url="https://common-lisp.net/project/ecl/files/release/16.1.2/ecl-16.1.2.tgz";
+    sha256="16ab8qs3awvdxy8xs8jy82v8r04x4wr70l9l2j45vgag18d2nj1d";
   };
   buildInputs = [
     libtool autoconf automake

From cef37d8de1b4ad19ac8184f96b3b85a82be1b5e9 Mon Sep 17 00:00:00 2001
From: michael bishop <cleverca22@gmail.com>
Date: Mon, 29 Feb 2016 12:37:20 -0400
Subject: [PATCH 2012/2285] openiscsi: fix download url, add platforms

---
 pkgs/os-specific/linux/open-iscsi/default.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/open-iscsi/default.nix b/pkgs/os-specific/linux/open-iscsi/default.nix
index e6682aec6c64..d004328a10b9 100644
--- a/pkgs/os-specific/linux/open-iscsi/default.nix
+++ b/pkgs/os-specific/linux/open-iscsi/default.nix
@@ -2,13 +2,16 @@
 let
   pname = "open-iscsi-2.0-873";
 in stdenv.mkDerivation {
-  name = "${pname}";
+  name = pname;
   outputs = [ "out" "iscsistart" ];
 
   buildInputs = [ nukeReferences ];
   
   src = fetchurl {
-    url = "http://www.open-iscsi.org/bits/${pname}.tar.gz";
+    urls = [
+      "http://www.open-iscsi.org/bits/${pname}.tar.gz"
+      "http://pkgs.fedoraproject.org/repo/pkgs/iscsi-initiator-utils/${pname}.tar.gz/8b8316d7c9469149a6cc6234478347f7/${pname}.tar.gz"
+    ];
     sha256 = "1nbwmj48xzy45h52917jbvyqpsfg9zm49nm8941mc5x4gpwz5nbx";
   };
   
@@ -24,9 +27,10 @@ in stdenv.mkDerivation {
     nuke-refs $iscsistart/bin/iscsistart
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A high performance, transport independent, multi-platform implementation of RFC3720";
-    license = stdenv.lib.licenses.gpl2Plus;
+    license = licenses.gpl2Plus;
     homepage = http://www.open-iscsi.org;
+    platforms = platforms.linux;
   };
 }

From 9af50a2e7d735b4a024cb91e2bf720341675031f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 29 Feb 2016 08:31:58 +0100
Subject: [PATCH 2013/2285] kodi: add optional joystick support

---
 pkgs/applications/video/kodi/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix
index 5761a443df8a..c2b3914f8502 100644
--- a/pkgs/applications/video/kodi/default.nix
+++ b/pkgs/applications/video/kodi/default.nix
@@ -7,7 +7,7 @@
 , libXt, libXmu, libXext, xextproto
 , libXinerama, libXrandr, randrproto
 , libXtst, libXfixes, fixesproto, systemd
-, SDL, SDL_image, SDL_mixer, alsaLib
+, SDL, SDL2, SDL_image, SDL_mixer, alsaLib
 , mesa, glew, fontconfig, freetype, ftgl
 , libjpeg, jasper, libpng, libtiff
 , libmpeg2, libsamplerate, libmad
@@ -26,6 +26,7 @@
 , rtmpdump ? null, rtmpSupport ? true
 , libvdpau ? null, vdpauSupport ? true
 , libpulseaudio ? null, pulseSupport ? true
+, joystickSupport ? true
 }:
 
 assert dbusSupport  -> dbus_libs != null;
@@ -78,7 +79,9 @@ in stdenv.mkDerivation rec {
     ++ lib.optional sambaSupport samba
     ++ lib.optional vdpauSupport libvdpau
     ++ lib.optional pulseSupport libpulseaudio
-    ++ lib.optional rtmpSupport rtmpdump;
+    ++ lib.optional rtmpSupport rtmpdump
+    ++ lib.optional joystickSupport SDL2;
+
 
     dontUseCmakeConfigure = true;
 
@@ -98,7 +101,8 @@ in stdenv.mkDerivation rec {
     ++ lib.optional (!sambaSupport) "--disable-samba"
     ++ lib.optional vdpauSupport "--enable-vdpau"
     ++ lib.optional pulseSupport "--enable-pulse"
-    ++ lib.optional rtmpSupport "--enable-rtmp";
+    ++ lib.optional rtmpSupport "--enable-rtmp"
+    ++ lib.optional joystickSupport "--enable-joystick";
 
     postInstall = ''
       for p in $(ls $out/bin/) ; do
@@ -113,7 +117,8 @@ in stdenv.mkDerivation rec {
           --prefix LD_LIBRARY_PATH ":" "${libcec}/lib" \
           --prefix LD_LIBRARY_PATH ":" "${libcec_platform}/lib" \
           --prefix LD_LIBRARY_PATH ":" "${libass}/lib" \
-          --prefix LD_LIBRARY_PATH ":" "${rtmpdump}/lib"
+          --prefix LD_LIBRARY_PATH ":" "${rtmpdump}/lib" \
+          --prefix LD_LIBRARY_PATH ":" "${SDL2}/lib"
       done
     '';
 

From a6d3b3f97ffe72f84be336aaee02b1be0a04c9dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 29 Feb 2016 19:11:38 +0100
Subject: [PATCH 2014/2285] zotero: patch firefox xpi loading

---
 pkgs/applications/office/zotero/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix
index d74e1ac4b7c8..5939478d695f 100644
--- a/pkgs/applications/office/zotero/default.nix
+++ b/pkgs/applications/office/zotero/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, bash, firefox, perl, unzipNLS, xorg }:
+{ stdenv, fetchurl, fetchpatch, bash, firefox, perl, unzipNLS, xorg }:
 
 let
 
@@ -7,6 +7,14 @@ let
     sha256 = "02h2ja08v8as4fawj683rh5rmxsjf5d0qmvqa77i176nm20y5s7s";
   };
 
+  firefox' = stdenv.lib.overrideDerivation (firefox) (attrs: {
+    patches = [ (fetchpatch {
+      url = "https://hg.mozilla.org/releases/mozilla-beta/raw-rev/0558da46f20c";
+      sha256 = "08ibp7hny78x8ywfvrh56z90kf8fjpf04mibdlrwkw4f1vgm3fc3";
+      name = "fix-external-xpi-loader";
+    }) ];
+  });
+
   version = "4.0.28";
 
 in
@@ -21,7 +29,9 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [ perl unzipNLS ];
 
-  inherit bash firefox;
+  inherit bash;
+
+  firefox = firefox';
 
   phases = "unpackPhase installPhase fixupPhase";
 

From b1801168e3eb819d20b301409135e7e7f6a45b7e Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 29 Feb 2016 19:14:41 +0100
Subject: [PATCH 2015/2285] pixman: remove legacy patches

---
 pkgs/development/libraries/pixman/default.nix       |  2 +-
 pkgs/development/libraries/pixman/fix-clang36.patch | 11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)
 delete mode 100644 pkgs/development/libraries/pixman/fix-clang36.patch

diff --git a/pkgs/development/libraries/pixman/default.nix b/pkgs/development/libraries/pixman/default.nix
index 681e54a781b2..dc378711d36b 100644
--- a/pkgs/development/libraries/pixman/default.nix
+++ b/pkgs/development/libraries/pixman/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
     sha256 = "184lazwdpv67zrlxxswpxrdap85wminh1gmq1i5lcz6iycw39fir";
   };
 
-  patches = stdenv.lib.optional stdenv.isDarwin ./fix-clang36.patch;
+  patches = [];
 
   nativeBuildInputs = [ pkgconfig ];
   buildInputs = stdenv.lib.optional doCheck libpng;
diff --git a/pkgs/development/libraries/pixman/fix-clang36.patch b/pkgs/development/libraries/pixman/fix-clang36.patch
deleted file mode 100644
index 7db3c7ecaba3..000000000000
--- a/pkgs/development/libraries/pixman/fix-clang36.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/pixman/pixman-mmx.c	2014-04-24 08:34:14.000000000 +0400
-+++ b/pixman/pixman-mmx.c	2015-01-30 20:19:28.000000000 +0300
-@@ -89,7 +89,7 @@
-     return __A;
- }
- 
--#  ifdef __OPTIMIZE__
-+#  if defined(__OPTIMIZE__) && !(defined (__clang__) && defined(__clang_major__) && defined(__clang_minor__) && __clang_major__ == 3 && __clang_minor__ >= 6)
- extern __inline __m64 __attribute__((__gnu_inline__, __always_inline__, __artificial__))
- _mm_shuffle_pi16 (__m64 __A, int8_t const __N)
- {

From cd897f657c28fafe9b018feb25ef5f2dbf691e48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= <ed@cflags.cc>
Date: Mon, 29 Feb 2016 19:36:51 +0100
Subject: [PATCH 2016/2285] cb2bib: init at 1.9.2

---
 pkgs/applications/office/cb2bib/default.nix | 24 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  4 ++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/applications/office/cb2bib/default.nix

diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix
new file mode 100644
index 000000000000..aa246d241ca6
--- /dev/null
+++ b/pkgs/applications/office/cb2bib/default.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, qt5Full, lzo, libX11 }:
+
+stdenv.mkDerivation rec {
+  name = pname + "-" + version;
+  pname = "cb2bib";
+  version = "1.9.2";
+  src = fetchurl {
+    url = "http://www.molspaces.com/dl/progs/${name}.tar.gz";
+    sha256 = "0yz79v023w1229wzck3gij0iqah1xg8rg4a352q8idvg7bdmyfin";
+  };
+  buildInputs = [ qt5Full lzo libX11 ];
+  QTDIR=qt5Full;
+  configurePhase =''
+    ./configure --prefix $out
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Rapidly extract unformatted, or unstandardized bibliographic references from email alerts, journal Web pages and PDF files";
+    homepage = http://www.molspaces.com/d_cb2bib-overview.php;
+    maintainers = with maintainers; [ edwtjo ];
+    license = licenses.gpl3;
+  };
+
+}
\ No newline at end of file
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index caa5c0ca8ad0..b0e9b022f462 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11549,6 +11549,10 @@ let
 
   cava = callPackage ../applications/audio/cava { };
 
+  cb2bib = callPackage ../applications/office/cb2bib {
+    inherit (xorg) libX11;
+  };
+
   cbatticon = callPackage ../applications/misc/cbatticon { };
 
   cbc = callPackage ../applications/science/math/cbc { };

From f3336a122acafd02fad80af31595c38dfd3133b6 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 29 Feb 2016 12:46:34 -0600
Subject: [PATCH 2017/2285] openal: 1.16.0 -> 1.17.2

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

diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index 89dc32b61f27..ff29b2741fbd 100644
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@@ -9,12 +9,12 @@ assert alsaSupport -> alsaLib != null;
 assert pulseSupport -> libpulseaudio != null;
 
 stdenv.mkDerivation rec {
-  version = "1.16.0";
+  version = "1.17.2";
   name = "openal-soft-${version}";
 
   src = fetchurl {
     url = "http://kcat.strangesoft.net/openal-releases/${name}.tar.bz2";
-    sha256 = "0pqdykdclycfnk66v166srjrry936y39d1dz9wl92qz27wqwsg9g";
+    sha256 = "051k5fy8pk4fd9ha3qaqcv08xwbks09xl5qs4ijqq2qz5xaghhd3";
   };
 
   buildInputs = [ cmake ]

From 5bab623fb93567e9f3217e90c7e2679388ec86a3 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 29 Feb 2016 19:15:36 +0100
Subject: [PATCH 2018/2285] nixos/tests/virtualbox: Split up subtests

Now subtests are separate derivations, because the individual tests do
not depend on state from previous test runs.

This has the advantage that it's easier to run individiual tests and
it's also easier to pinpoint individual tests that randomly fail.

I ran all of these tests locally and they still succeed.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/release.nix          |   7 +-
 nixos/tests/virtualbox.nix | 248 +++++++++++++++++++------------------
 2 files changed, 132 insertions(+), 123 deletions(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index cfe152cc163d..497056c22746 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -299,7 +299,12 @@ in rec {
   tests.simple = callTest tests/simple.nix {};
   tests.tomcat = callTest tests/tomcat.nix {};
   tests.udisks2 = callTest tests/udisks2.nix {};
-  tests.virtualbox = hydraJob (import tests/virtualbox.nix { system = "x86_64-linux"; });
+  tests.virtualbox = let
+    testsOnly = filterAttrs (const (t: t ? test));
+    vboxTests = testsOnly (import tests/virtualbox.nix {
+      system = "x86_64-linux";
+    });
+  in mapAttrs (const (t: hydraJob t.test)) vboxTests;
   tests.xfce = callTest tests/xfce.nix {};
   tests.bootBiosCdrom = forAllSystems (system: hydraJob (import tests/boot.nix { inherit system; }).bootBiosCdrom);
   tests.bootBiosUsb = forAllSystems (system: hydraJob (import tests/boot.nix { inherit system; }).bootBiosUsb);
diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix
index 01fcd15fd8bb..da4c0bddc348 100644
--- a/nixos/tests/virtualbox.nix
+++ b/nixos/tests/virtualbox.nix
@@ -1,7 +1,9 @@
-{ debug ? false, ... } @ args:
+{ system ? builtins.currentSystem, debug ? false }:
 
-import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let
+with import ../lib/testing.nix { inherit system; };
+with pkgs.lib;
 
+let
   testVMConfig = vmName: attrs: { config, pkgs, ... }: let
     guestAdditions = pkgs.linuxPackages.virtualboxGuestAdditions;
 
@@ -314,138 +316,140 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let
     test2.vmScript = dhcpScript;
   };
 
-in {
-  name = "virtualbox";
-  meta = with pkgs.stdenv.lib.maintainers; {
-    maintainers = [ aszlig wkennington ];
-  };
+  mkVBoxTest = name: testScript: makeTest {
+    name = "virtualbox-${name}";
 
-  machine = { pkgs, lib, config, ... }: {
-    imports = let
-      mkVMConf = name: val: val.machine // { key = "${name}-config"; };
-      vmConfigs = mapAttrsToList mkVMConf vboxVMs;
-    in [ ./common/user-account.nix ./common/x11.nix ] ++ vmConfigs;
-    virtualisation.memorySize = 2048;
-    virtualisation.virtualbox.host.enable = true;
-    users.extraUsers.alice.extraGroups = let
-      inherit (config.virtualisation.virtualbox.host) enableHardening;
-    in lib.mkIf enableHardening (lib.singleton "vboxusers");
-  };
-
-  testScript = ''
-    sub ru ($) {
-      my $esc = $_[0] =~ s/'/'\\${"'"}'/gr;
-      return "su - alice -c '$esc'";
-    }
-
-    sub vbm {
-      $machine->succeed(ru("VBoxManage ".$_[0]));
+    machine = { lib, config, ... }: {
+      imports = let
+        mkVMConf = name: val: val.machine // { key = "${name}-config"; };
+        vmConfigs = mapAttrsToList mkVMConf vboxVMs;
+      in [ ./common/user-account.nix ./common/x11.nix ] ++ vmConfigs;
+      virtualisation.memorySize = 2048;
+      virtualisation.virtualbox.host.enable = true;
+      users.extraUsers.alice.extraGroups = let
+        inherit (config.virtualisation.virtualbox.host) enableHardening;
+      in lib.mkIf enableHardening (lib.singleton "vboxusers");
     };
 
-    ${concatStrings (mapAttrsToList (_: getAttr "testSubs") vboxVMs)}
+    testScript = ''
+      sub ru ($) {
+        my $esc = $_[0] =~ s/'/'\\${"'"}'/gr;
+        return "su - alice -c '$esc'";
+      }
 
-    $machine->waitForX;
+      sub vbm {
+        $machine->succeed(ru("VBoxManage ".$_[0]));
+      };
 
-    ${mkLog "$HOME/.config/VirtualBox/VBoxSVC.log" "HOST-SVC"}
+      sub removeUUIDs {
+        return join("\n", grep { $_ !~ /^UUID:/ } split(/\n/, $_[0]))."\n";
+      }
 
+      ${concatStrings (mapAttrsToList (_: getAttr "testSubs") vboxVMs)}
+
+      $machine->waitForX;
+
+      ${mkLog "$HOME/.config/VirtualBox/VBoxSVC.log" "HOST-SVC"}
+
+      ${testScript}
+    '';
+
+    meta = with pkgs.stdenv.lib.maintainers; {
+      maintainers = [ aszlig wkennington ];
+    };
+  };
+
+in mapAttrs mkVBoxTest {
+  simple-gui = ''
     createVM_simple;
-
-    subtest "simple-gui", sub {
-      $machine->succeed(ru "VirtualBox &");
-      $machine->waitForWindow(qr/Oracle VM VirtualBox Manager/);
-      $machine->sleep(5);
-      $machine->screenshot("gui_manager_started");
+    $machine->succeed(ru "VirtualBox &");
+    $machine->waitForWindow(qr/Oracle VM VirtualBox Manager/);
+    $machine->sleep(5);
+    $machine->screenshot("gui_manager_started");
+    $machine->sendKeys("ret");
+    $machine->screenshot("gui_manager_sent_startup");
+    waitForStartup_simple (sub {
       $machine->sendKeys("ret");
-      $machine->screenshot("gui_manager_sent_startup");
-      waitForStartup_simple (sub {
-        $machine->sendKeys("ret");
-      });
-      $machine->screenshot("gui_started");
-      waitForVMBoot_simple;
-      $machine->screenshot("gui_booted");
-      shutdownVM_simple;
-      $machine->sleep(5);
-      $machine->screenshot("gui_stopped");
-      $machine->sendKeys("ctrl-q");
-      $machine->sleep(5);
-      $machine->screenshot("gui_manager_stopped");
-    };
+    });
+    $machine->screenshot("gui_started");
+    waitForVMBoot_simple;
+    $machine->screenshot("gui_booted");
+    shutdownVM_simple;
+    $machine->sleep(5);
+    $machine->screenshot("gui_stopped");
+    $machine->sendKeys("ctrl-q");
+    $machine->sleep(5);
+    $machine->screenshot("gui_manager_stopped");
+  '';
 
-    cleanup_simple;
+  simple-cli = ''
+    createVM_simple;
+    vbm("startvm simple");
+    waitForStartup_simple;
+    $machine->screenshot("cli_started");
+    waitForVMBoot_simple;
+    $machine->screenshot("cli_booted");
 
-    subtest "simple-cli", sub {
-      vbm("startvm simple");
-      waitForStartup_simple;
-      $machine->screenshot("cli_started");
-      waitForVMBoot_simple;
-      $machine->screenshot("cli_booted");
-      shutdownVM_simple;
-    };
-
-    subtest "privilege-escalation", sub {
+    $machine->nest("Checking for privilege escalation", sub {
       $machine->fail("test -e '/root/VirtualBox VMs'");
       $machine->fail("test -e '/root/.config/VirtualBox'");
       $machine->succeed("test -e '/home/alice/VirtualBox VMs'");
-    };
+    });
 
-    destroyVM_simple;
-
-    sub removeUUIDs {
-      return join("\n", grep { $_ !~ /^UUID:/ } split(/\n/, $_[0]))."\n";
-    }
-
-    subtest "host-usb-permissions", sub {
-      my $userUSB = removeUUIDs vbm("list usbhost");
-      print STDERR $userUSB;
-      my $rootUSB = removeUUIDs $machine->succeed("VBoxManage list usbhost");
-      print STDERR $rootUSB;
-
-      die "USB host devices differ for root and normal user"
-        if $userUSB ne $rootUSB;
-      die "No USB host devices found" if $userUSB =~ /<none>/;
-    };
-
-    subtest "systemd-detect-virt", sub {
-      createVM_detectvirt;
-      vbm("startvm detectvirt");
-      waitForStartup_detectvirt;
-      waitForVMBoot_detectvirt;
-      shutdownVM_detectvirt;
-      my $result = $machine->succeed("cat '$detectvirt_sharepath/result'");
-      chomp $result;
-      destroyVM_detectvirt;
-      die "systemd-detect-virt returned \"$result\" instead of \"oracle\""
-        if $result ne "oracle";
-    };
-
-    subtest "net-hostonlyif", sub {
-      createVM_test1;
-      createVM_test2;
-
-      vbm("startvm test1");
-      waitForStartup_test1;
-      waitForVMBoot_test1;
-
-      vbm("startvm test2");
-      waitForStartup_test2;
-      waitForVMBoot_test2;
-
-      $machine->screenshot("net_booted");
-
-      my $test1IP = waitForIP_test1 1;
-      my $test2IP = waitForIP_test2 1;
-
-      $machine->succeed("echo '$test2IP' | netcat -c '$test1IP' 1234");
-      $machine->succeed("echo '$test1IP' | netcat -c '$test2IP' 1234");
-
-      $machine->waitUntilSucceeds("netcat -c '$test1IP' 5678 >&2");
-      $machine->waitUntilSucceeds("netcat -c '$test2IP' 5678 >&2");
-
-      shutdownVM_test1;
-      shutdownVM_test2;
-
-      destroyVM_test1;
-      destroyVM_test2;
-    };
+    shutdownVM_simple;
   '';
-}) args
+
+  host-usb-permissions = ''
+    my $userUSB = removeUUIDs vbm("list usbhost");
+    print STDERR $userUSB;
+    my $rootUSB = removeUUIDs $machine->succeed("VBoxManage list usbhost");
+    print STDERR $rootUSB;
+
+    die "USB host devices differ for root and normal user"
+      if $userUSB ne $rootUSB;
+    die "No USB host devices found" if $userUSB =~ /<none>/;
+  '';
+
+  systemd-detect-virt = ''
+    createVM_detectvirt;
+    vbm("startvm detectvirt");
+    waitForStartup_detectvirt;
+    waitForVMBoot_detectvirt;
+    shutdownVM_detectvirt;
+    my $result = $machine->succeed("cat '$detectvirt_sharepath/result'");
+    chomp $result;
+    destroyVM_detectvirt;
+    die "systemd-detect-virt returned \"$result\" instead of \"oracle\""
+      if $result ne "oracle";
+  '';
+
+  net-hostonlyif = ''
+    createVM_test1;
+    createVM_test2;
+
+    vbm("startvm test1");
+    waitForStartup_test1;
+    waitForVMBoot_test1;
+
+    vbm("startvm test2");
+    waitForStartup_test2;
+    waitForVMBoot_test2;
+
+    $machine->screenshot("net_booted");
+
+    my $test1IP = waitForIP_test1 1;
+    my $test2IP = waitForIP_test2 1;
+
+    $machine->succeed("echo '$test2IP' | netcat -c '$test1IP' 1234");
+    $machine->succeed("echo '$test1IP' | netcat -c '$test2IP' 1234");
+
+    $machine->waitUntilSucceeds("netcat -c '$test1IP' 5678 >&2");
+    $machine->waitUntilSucceeds("netcat -c '$test2IP' 5678 >&2");
+
+    shutdownVM_test1;
+    shutdownVM_test2;
+
+    destroyVM_test1;
+    destroyVM_test2;
+  '';
+}

From abfc9e2afa90f30011832e42f25feb9815990200 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 20 Feb 2016 15:38:30 +0100
Subject: [PATCH 2019/2285] ocamlPackages.result: init at 1.1

---
 .../ocaml-modules/ocaml-result/default.nix    | 30 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 32 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/ocaml-result/default.nix

diff --git a/pkgs/development/ocaml-modules/ocaml-result/default.nix b/pkgs/development/ocaml-modules/ocaml-result/default.nix
new file mode 100644
index 000000000000..8b6e0966f7e2
--- /dev/null
+++ b/pkgs/development/ocaml-modules/ocaml-result/default.nix
@@ -0,0 +1,30 @@
+{ stdenv, fetchFromGitHub, ocaml, findlib }:
+
+let version = "1.1"; in
+
+stdenv.mkDerivation {
+  name = "ocaml-result-${version}";
+
+  src = fetchFromGitHub {
+    owner = "janestreet";
+    repo = "result";
+    rev = "${version}";
+    sha256 = "05y07rxdbkaxsc8cy458y00gq05i8gp35hhwg1b757mam21ccxxz";
+  };
+
+  buildInputs = [ ocaml findlib ];
+
+  createFindlibDestdir = true;
+
+  meta = {
+    homepage = https://github.com/janestreet/result;
+    description = "Compatibility Result module";
+    longDescription = ''
+      Projects that want to use the new result type defined in OCaml >= 4.03
+      while staying compatible with older version of OCaml should use the
+      Result module defined in this library.
+    '';
+    license = stdenv.lib.licenses.bsd3;
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b0e9b022f462..dc20729fc51f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4920,6 +4920,8 @@ let
 
     re2 = callPackage ../development/ocaml-modules/re2 { };
 
+    result = callPackage ../development/ocaml-modules/ocaml-result { };
+
     sequence = callPackage ../development/ocaml-modules/sequence { };
 
     tuntap = callPackage ../development/ocaml-modules/tuntap { };

From cac77dafc4809dbdab43b7a5d4dd0f046ffc8269 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Sat, 20 Feb 2016 15:39:08 +0100
Subject: [PATCH 2020/2285] ocamlPackages.tsdl: init at 0.9.0

---
 .../ocaml-modules/tsdl/default.nix            | 49 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/tsdl/default.nix

diff --git a/pkgs/development/ocaml-modules/tsdl/default.nix b/pkgs/development/ocaml-modules/tsdl/default.nix
new file mode 100644
index 000000000000..85ea80aeafef
--- /dev/null
+++ b/pkgs/development/ocaml-modules/tsdl/default.nix
@@ -0,0 +1,49 @@
+{ stdenv, fetchurl, ocaml, findlib, ctypes, result, SDL2, pkgconfig, opam }:
+
+let
+  inherit (stdenv.lib) getVersion;
+
+  pname = "tsdl";
+  version = "0.9.0";
+  webpage = "http://erratique.ch/software/${pname}";
+
+in
+
+stdenv.mkDerivation {
+  name = "ocaml-${pname}-${version}";
+
+  src = fetchurl {
+    url = "${webpage}/releases/${pname}-${version}.tbz";
+    sha256 = "02x0wsy5nxagxrh07yb2h4yqqy1bxryp2gwrylds0j6ybqsv4shm";
+  };
+
+  buildInputs = [ ocaml findlib result pkgconfig opam ];
+  propagatedBuildInputs = [ SDL2 ctypes ];
+
+  createFindlibDestdir = true;
+
+  unpackCmd = "tar xjf $src";
+
+  buildPhase = ''
+    # The following is done to avoid an additional dependency (ncurses)
+    # due to linking in the custom bytecode runtime. Instead, just
+    # compile directly into a native binary, even if it's just a
+    # temporary build product.
+    substituteInPlace myocamlbuild.ml \
+      --replace ".byte" ".native"
+
+    ocaml pkg/build.ml native=true native-dynlink=true
+  '';
+
+  installPhase = ''
+    opam-installer --script --prefix=$out ${pname}.install | sh
+    ln -s $out/lib/${pname} $out/lib/ocaml/${getVersion ocaml}/site-lib/${pname}
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "${webpage}";
+    description = "Thin bindings to the cross-platform SDL library";
+    license = licenses.bsd3;
+    platforms = ocaml.meta.platforms;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc20729fc51f..e75686e4eb7c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5001,6 +5001,8 @@ let
 
     stringext = callPackage ../development/ocaml-modules/stringext { };
 
+    tsdl = callPackage ../development/ocaml-modules/tsdl { };
+
     twt = callPackage ../development/ocaml-modules/twt { };
 
     typerep = callPackage ../development/ocaml-modules/typerep { };

From 5f8311775c8832b1c5a88576cf58be05fd5c9070 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lucabru@src.gnome.org>
Date: Mon, 29 Feb 2016 20:42:58 +0100
Subject: [PATCH 2021/2285] chromium: add StartupWMClass to desktop file. Fixes
 #12433

---
 pkgs/applications/networking/browsers/chromium/default.nix | 3 +++
 pkgs/build-support/make-desktopitem/default.nix            | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix
index c0c5e485e59c..f9ed1f31e540 100644
--- a/pkgs/applications/networking/browsers/chromium/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/default.nix
@@ -57,6 +57,9 @@ let
       "x-scheme-handler/unknown"
     ];
     categories = "Network;WebBrowser";
+    extraEntries = ''
+      StartupWMClass=chromium-browser
+    '';
   };
 
   suffix = if channel != "stable" then "-" + channel else "";
diff --git a/pkgs/build-support/make-desktopitem/default.nix b/pkgs/build-support/make-desktopitem/default.nix
index 2f6c827d8758..f5b4e5af93a0 100644
--- a/pkgs/build-support/make-desktopitem/default.nix
+++ b/pkgs/build-support/make-desktopitem/default.nix
@@ -10,6 +10,7 @@
 , mimeType ? ""
 , categories ? "Application;Other;"
 , startupNotify ? null
+, extraEntries ? ""
 }:
 
 stdenv.mkDerivation {
@@ -27,6 +28,7 @@ stdenv.mkDerivation {
     GenericName=${genericName}
     MimeType=${mimeType}
     Categories=${categories}
+    ${extraEntries}
     ${if startupNotify == null then ''EOF'' else ''
     StartupNotify=${startupNotify}
     EOF''}

From 765c6c5f2cab86a760095f61b78bcedfdc437826 Mon Sep 17 00:00:00 2001
From: Tomas Hlavaty <tom@logand.com>
Date: Mon, 29 Feb 2016 21:03:27 +0100
Subject: [PATCH 2022/2285] sbcl: 1.3.2 -> 1.3.3

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

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 3212601e7899..82348f35e302 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "sbcl-${version}";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchurl {
     url    = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2";
-    sha256 = "18mgj1h9wqi0zq4k7y5r5fk10mlbpgh3796d3dac75bpxabg30nk";
+    sha256 = "0kzvwzz196ws9z20l8fm15m5gckhmkkc6lxvdib12mfvy80gcf6v";
   };
 
   patchPhase = ''

From de5fa8339f323b0714d0dc25896f8863fbf3429f Mon Sep 17 00:00:00 2001
From: Herwig Hochleitner <herwig@bendlas.net>
Date: Sun, 28 Feb 2016 16:50:59 +0100
Subject: [PATCH 2023/2285] dust: init at 0-91

---
 pkgs/development/interpreters/pixie/dust.nix  |  27 ++++
 .../pixie/make-paths-configurable.patch       | 122 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |   1 +
 3 files changed, 150 insertions(+)
 create mode 100644 pkgs/development/interpreters/pixie/dust.nix
 create mode 100644 pkgs/development/interpreters/pixie/make-paths-configurable.patch

diff --git a/pkgs/development/interpreters/pixie/dust.nix b/pkgs/development/interpreters/pixie/dust.nix
new file mode 100644
index 000000000000..2478ecf53cb2
--- /dev/null
+++ b/pkgs/development/interpreters/pixie/dust.nix
@@ -0,0 +1,27 @@
+{ stdenv, pixie, fetchgit }:
+
+stdenv.mkDerivation {
+  name = "dust-0-91";
+  src = fetchgit {
+    url = "https://github.com/pixie-lang/dust.git";
+    rev = "efe469661e749a71e86858fd006f61464810575a";
+    sha256 = "0krh7ynald3gqv9f17a4kfx7sx8i31l6j1fhd5k8b6m8cid7f9c1";
+  };
+  buildInputs = [ pixie ];
+  patches = [ ./make-paths-configurable.patch ];
+  configurePhase = ''
+    pixiePath="${pixie}/bin/pxi" \
+    basePath="$out/share/dust" \
+      substituteAll dust.in dust
+    chmod +x dust
+  '';
+# FIXME: AOT for dust
+#  buildPhase = ''
+#    find . -name "*.pxi" -exec pixie-vm -c {} \;
+#  '';
+  installPhase = ''
+    mkdir -p $out/bin $out/share/dust
+    cp -a src/ run.pxi $out/share/dust
+    mv dust $out/bin/dust
+  '';
+}
diff --git a/pkgs/development/interpreters/pixie/make-paths-configurable.patch b/pkgs/development/interpreters/pixie/make-paths-configurable.patch
new file mode 100644
index 000000000000..122ab6e2c07b
--- /dev/null
+++ b/pkgs/development/interpreters/pixie/make-paths-configurable.patch
@@ -0,0 +1,122 @@
+From 0cbb82e606610d36e52c70d888995fbbf9b0d7c8 Mon Sep 17 00:00:00 2001
+From: Herwig Hochleitner <herwig@bendlas.net>
+Date: Sun, 28 Feb 2016 16:34:14 +0100
+Subject: [PATCH] make paths configurable
+
+---
+ dust    | 52 ----------------------------------------------------
+ dust.in | 43 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 43 insertions(+), 52 deletions(-)
+ delete mode 100755 dust
+ create mode 100755 dust.in
+
+diff --git a/dust b/dust
+deleted file mode 100755
+index ffced9b..0000000
+--- a/dust
++++ /dev/null
+@@ -1,52 +0,0 @@
+-#!/usr/bin/env bash
+-
+-base_path=$0
+-if [ -L "$base_path" ]; then
+-    base_path=`readlink $base_path`
+-fi
+-base_path=`dirname $base_path`
+-
+-pixie_path=`which pixie-vm`
+-if [ -z "$pixie_path" ]; then
+-    echo "Error: 'pixie-vm' must be on your PATH"
+-    exit 1
+-fi
+-
+-function set_load_path() {
+-    load_path=""
+-    if ([ -f "project.edn" ] || [ -f "project.pxi" ]) && [ -f ".load-path" ]; then
+-        load_path="`cat .load-path`"
+-    fi
+-}
+-
+-if [ ! -f "project.edn" ] && [ -f "project.pxi" ]; then
+-	echo "Warning: 'project.pxi' is deprecated, please use 'project.edn'."
+-	echo "To start you can run the following command:"
+-	echo "  pixie-vm -l $base_path/src -e '(require dust.project :as p) (p/load-project!) (prn (dissoc @p/*project* :path))'"
+-	echo
+-fi
+-
+-set_load_path
+-run_dust="$pixie_path -l $base_path/src $load_path $base_path/run.pxi"
+-
+-case $1 in
+-    ""|"repl")
+-        rlwrap_cmd=""
+-        if [ -n "`which rlwrap`" ]; then
+-            rlwrap_cmd="rlwrap -aignored -n"
+-        fi
+-        $rlwrap_cmd $pixie_path $load_path
+-        ;;
+-    "run")
+-        shift
+-        file=$1
+-        shift
+-        $pixie_path $load_path $file $@
+-        ;;
+-    -h|--help)
+-        $run_dust help
+-        ;;
+-    *)
+-        $run_dust $@
+-        ;;
+-esac
+diff --git a/dust.in b/dust.in
+new file mode 100755
+index 0000000..44a7fbd
+--- /dev/null
++++ b/dust.in
+@@ -0,0 +1,43 @@
++#!/usr/bin/env bash
++
++base_path=@basePath@
++pixie_path=@pixiePath@
++
++function set_load_path() {
++    load_path=""
++    if ([ -f "project.edn" ] || [ -f "project.pxi" ]) && [ -f ".load-path" ]; then
++        load_path="`cat .load-path`"
++    fi
++}
++
++if [ ! -f "project.edn" ] && [ -f "project.pxi" ]; then
++	echo "Warning: 'project.pxi' is deprecated, please use 'project.edn'."
++	echo "To start you can run the following command:"
++	echo "  pixie-vm -l $base_path/src -e '(require dust.project :as p) (p/load-project!) (prn (dissoc @p/*project* :path))'"
++	echo
++fi
++
++set_load_path
++run_dust="$pixie_path -l $base_path/src $load_path $base_path/run.pxi"
++
++case $1 in
++    ""|"repl")
++        rlwrap_cmd=""
++        if [ -n "`which rlwrap`" ]; then
++            rlwrap_cmd="rlwrap -aignored -n"
++        fi
++        $rlwrap_cmd $pixie_path $load_path
++        ;;
++    "run")
++        shift
++        file=$1
++        shift
++        $pixie_path $load_path $file $@
++        ;;
++    -h|--help)
++        $run_dust help
++        ;;
++    *)
++        $run_dust $@
++        ;;
++esac
+-- 
+2.7.1
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 74bba53647cd..403a356a5802 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5508,6 +5508,7 @@ let
   };
 
   pixie = callPackage ../development/interpreters/pixie { };
+  dust = callPackage ../development/interpreters/pixie/dust.nix { };
 
   bundix = callPackage ../development/interpreters/ruby/bundix {
     ruby = ruby_2_1_3;

From b82c8e3cd44c5ad97624dd21f9e7d431e7d283ff Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 29 Feb 2016 21:15:25 +0100
Subject: [PATCH 2024/2285] geolite-legacy 2016-02-25 -> 2016-02-29

---
 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 59ae72d863cd..c9b6eb8917fb 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-02-25";
+  version = "2016-02-29";
 
   srcGeoIP = fetchDB
     "GeoLiteCountry/GeoIP.dat.gz" "GeoIP.dat.gz"
@@ -24,10 +24,10 @@ stdenv.mkDerivation rec {
     "0fnlznn04lpkkd7sy9r9kdl3fcp8ix7msdrncwgz26dh537ml32z";
   srcGeoIPASNum = fetchDB
     "asnum/GeoIPASNum.dat.gz" "GeoIPASNum.dat.gz"
-    "0gli3glr2w58qw2b4lwlp8cqbpfy27c3ryih3qi2bbilqy0r3ibl";
+    "10i4c8irvh9shbl3y0s0ffkm71vf3r290fvxjx20snqa558hkvib";
   srcGeoIPASNumv6 = fetchDB
     "asnum/GeoIPASNumv6.dat.gz" "GeoIPASNumv6.dat.gz"
-    "1k7a9b8hsman64jjk6y3nkhms89gkq1vk26n2xklw710f15jzcsf";
+    "1rvbjrj98pqj9w5ql5j49b3h40496g6aralpnz1gj21v6dfrd55n";
 
   meta = with stdenv.lib; {
     description = "GeoLite Legacy IP geolocation databases";

From 06a50554ad576aed9e9202628bdc291acd86e58a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Mon, 29 Feb 2016 22:51:30 +0100
Subject: [PATCH 2025/2285] simple-scan: 3.19.90 -> 3.19.91

---
 pkgs/applications/graphics/simple-scan/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/simple-scan/default.nix b/pkgs/applications/graphics/simple-scan/default.nix
index 658df21a6545..7ee298f72811 100644
--- a/pkgs/applications/graphics/simple-scan/default.nix
+++ b/pkgs/applications/graphics/simple-scan/default.nix
@@ -3,10 +3,10 @@
 
 stdenv.mkDerivation rec {
   name = "simple-scan-${version}";
-  version = "3.19.90";
+  version = "3.19.91";
 
   src = fetchurl {
-    sha256 = "16s8855sqrn5iiirpqva0mys8abfpzk9xryrb6rpjbynvx2lanmd";
+    sha256 = "1c5glf5vxgld41w4jxfqcv17q76qnh43fawpv33hncgh8d283xkf";
     url = "https://launchpad.net/simple-scan/3.19/${version}/+download/${name}.tar.xz";
   };
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
   configureFlags = [ "--disable-packagekit" ];
 
   preBuild = ''
-    # Clean up stale generated .c files still referencing packagekit headers:
+    # Clean up stale .c files referencing packagekit headers as of 3.19.91:
     make clean
   '';
 

From 931fa7433d4ce63f205b13015912e26e06b94b9b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 29 Feb 2016 22:05:57 +0100
Subject: [PATCH 2026/2285] checkstyle: 6.15 -> 6.16

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

diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix
index f9131cf2af28..168e9ce95be0 100644
--- a/pkgs/development/tools/analysis/checkstyle/default.nix
+++ b/pkgs/development/tools/analysis/checkstyle/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  version = "6.15";
+  version = "6.16";
   name = "checkstyle-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/checkstyle/${name}-bin.tar.gz";
-    sha256 = "1bazjgfr1mq6qfg4nmack467zg7s4z8v7zfzw46d2dk04mv8y9b8";
+    sha256 = "0kmddfzn7p6fads6crw4gnahvi36xwqyw35i7a2lplrdp8dn9xdd";
   };
 
   installPhase = ''

From b56c1982bdb49381081ef004aa5ea83b2af63aed Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 29 Feb 2016 22:08:01 +0100
Subject: [PATCH 2027/2285] libfilezilla: 0.4.0 -> 0.4.0.1

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

diff --git a/pkgs/development/libraries/libfilezilla/default.nix b/pkgs/development/libraries/libfilezilla/default.nix
index 120b707af1e3..d8e1c29875c0 100644
--- a/pkgs/development/libraries/libfilezilla/default.nix
+++ b/pkgs/development/libraries/libfilezilla/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libfilezilla-${version}";
-  version = "0.4.0";
+  version = "0.4.0.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/filezilla/libfilezilla/${version}/${name}.tar.bz2";
-    sha256 = "1l7rih17nzy75zf5h8mx5x38jbl9kxyxpr0ib6nn2615fw92xxgj";
+    sha256 = "1ldiyhjv4jg2jyj3d56mlgyj9lx0qkf1857wvsy51lp9aj96h0v0";
   };
 
   meta = with stdenv.lib; {

From 5ba31560d517a603c6f9b90539e809a7c9c21208 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 29 Feb 2016 22:10:45 +0100
Subject: [PATCH 2028/2285] pdf2djvu: 0.9.3 -> 0.9.4

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

diff --git a/pkgs/tools/typesetting/pdf2djvu/default.nix b/pkgs/tools/typesetting/pdf2djvu/default.nix
index 96106d06ca55..5f344628e376 100644
--- a/pkgs/tools/typesetting/pdf2djvu/default.nix
+++ b/pkgs/tools/typesetting/pdf2djvu/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, pkgconfig, djvulibre, poppler, fontconfig, libjpeg }:
 
 stdenv.mkDerivation rec {
-  version = "0.9.3";
+  version = "0.9.4";
   name = "pdf2djvu-${version}";
 
   src = fetchurl {
     url = "https://bitbucket.org/jwilk/pdf2djvu/downloads/${name}.tar.xz";
-    sha256 = "0xvh9kzfym5vsma9bhr1w1lla31qdqfaqc9q25vqpl921shvfpnh";
+    sha256 = "1a1gwr6yzbiximbpgg4rc69dq8g3jmxwcbcwqk0fhfbgzj1j4w65";
   };
 
   buildInputs = [ pkgconfig djvulibre poppler fontconfig libjpeg ];

From 5a0dbaabad6c3e8f30e12d0528a0f6b2f4ce99cf Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 29 Feb 2016 22:21:55 +0100
Subject: [PATCH 2029/2285] parallel: 20160122 -> 20160222

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

diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index c45c62cb3ada..d4c920f4acc8 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl, makeWrapper, procps }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20160122";
+  name = "parallel-20160222";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "1xs8y8jh7wyjs27079xz0ja7xfi4dywz8d6hbkl44mafdnnfjfiy";
+    sha256 = "1sjmvinwr9j2a0jdk9y9nf2x4hhzcbl529slkwpz0vva0cwybywd";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From afd2d0588b500bd23caee3f3c99286832f1856ea Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Mon, 29 Feb 2016 22:40:08 +0100
Subject: [PATCH 2030/2285] calibre: 2.51.0 -> 2.52.0

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

diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix
index 5e1bebf900c2..5d936421d9ee 100644
--- a/pkgs/applications/misc/calibre/default.nix
+++ b/pkgs/applications/misc/calibre/default.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.51.0";
+  version = "2.52.0";
   name = "calibre-${version}";
 
   src = fetchurl {
     url = "http://download.calibre-ebook.com/${version}/${name}.tar.xz";
-    sha256 = "1rhpcxic4g2zyr5s3xn8dayyb45l9r8zyniaig8j7pl5kmsfjijn";
+    sha256 = "1la114vhkm73iv0rrzwws28ydiszl58q5y9d6aafn5sh16ph2aws";
   };
 
   inherit python;

From 90de261f3313fab8b82d33df149738be700f2426 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Mon, 29 Feb 2016 22:47:16 +0000
Subject: [PATCH 2031/2285] nix-prefetch-git: change the default output to JSON

As discussed on the mailing list. The nix output was short-lived so it's
probably okay to change it.
---
 pkgs/build-support/fetchgit/nix-prefetch-git | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git
index 22a241d5e0e8..2c9d61504ed2 100755
--- a/pkgs/build-support/fetchgit/nix-prefetch-git
+++ b/pkgs/build-support/fetchgit/nix-prefetch-git
@@ -325,9 +325,9 @@ print_results() {
     fi
     if test -n "$hash"; then
         echo "{"
-        echo "  url = \"$url\";"
-        echo "  rev = \"$fullRev\";"
-        echo "  $hashType = \"$hash\";"
+        echo "  \"url\": \"$url\","
+        echo "  \"rev\": \"$fullRev\","
+        echo "  \"$hashType\": \"$hash\""
         echo "}"
     fi
 }

From f5a63f164b1e0b2abae61d6209c72c764f281735 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Val=C3=A9rian=20Galliat?= <val@codejam.info>
Date: Sun, 28 Feb 2016 12:12:01 -0500
Subject: [PATCH 2032/2285] go2nix: init at dd513f1

---
 pkgs/top-level/all-packages.nix |  2 ++
 pkgs/top-level/go-packages.nix  | 44 +++++++++++++++++++++++++++++++--
 2 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1515d556b172..2fa009672945 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9210,6 +9210,8 @@ let
 
   goPackages = go15Packages;
 
+  go2nix = goPackages.go2nix.bin // { outputs = [ "bin" ]; };
+
   ### DEVELOPMENT / LISP MODULES
 
   asdf = callPackage ../development/lisp-modules/asdf {
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index ddf18dd3b8ff..3d4cb5ac1a8e 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3546,10 +3546,10 @@ let
   };
 
   vcs = buildFromGitHub {
-    rev    = "1.0.0";
+    rev    = "1.4.0";
     owner  = "Masterminds";
     repo   = "vcs";
-    sha256 = "1qav4lf4ln5gs81714876q2cy9gfaxblbvawg3hxznbwakd9zmd8";
+    sha256 = "0590ww2av4407y7zy3bcmnr8i74fv00k9zzcxcpjxivl6qszna0d";
   };
 
   viper = buildFromGitHub {
@@ -3734,4 +3734,44 @@ let
     '';
     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" ];
+  };
+
+  go2nix = buildFromGitHub rec {
+    rev = "dd513f1f1336a3cdceb9dd4be0f3c47a09929651";
+    owner = "kamilchm";
+    repo = "go2nix";
+    sha256 = "1ad7zcab5vjbw7a8ns0aspkblqqz0z96b7ak3zdx409rq7rlqdsj";
+    buildInputs = [ go-bindata.bin tools.bin vcs go-spew gls go-difflib assertions goconvey testify kingpin ];
+    preBuild = ''go generate ./...'';
+  };
+
 }; in self

From 269d0864b574b458f0f6d94f096376c913d049d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Val=C3=A9rian=20Galliat?= <val@codejam.info>
Date: Sun, 28 Feb 2016 22:47:44 -0500
Subject: [PATCH 2033/2285] nix-prefetch-scripts: explicitly depend on Nix

Otherwise, a call to, for example, nix-prefetch-git, in a nix-shell --pure or
nix-build phase would result in an error such as:

    Switched to a new branch 'fetchgit'
    removing `.git'...
    /nix/store/7qvjji7kbd033nsyxlpiiiam61a44yz9-nix-prefetch-git/bin/.nix-prefetch-git-wrapped: line 374: nix-hash: command not found
---
 pkgs/tools/package-management/nix-prefetch-scripts/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
index 5b98bcbbe12b..e70659aff00f 100644
--- a/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
+++ b/pkgs/tools/package-management/nix-prefetch-scripts/default.nix
@@ -1,5 +1,5 @@
 { stdenv, makeWrapper, buildEnv,
-  git, subversion, mercurial, bazaar, cvs, unzip, curl, gnused, coreutils
+  git, subversion, mercurial, bazaar, cvs, unzip, curl, gnused, coreutils, nix
 }:
 
 let mkPrefetchScript = tool: src: deps:
@@ -18,6 +18,7 @@ let mkPrefetchScript = tool: src: deps:
         wrapArgs="$wrapArgs --prefix PATH : $dep/bin"
       done
       wrapArgs="$wrapArgs --prefix PATH : ${gnused}/bin"
+      wrapArgs="$wrapArgs --prefix PATH : ${nix}/bin" # For nix-hash
       wrapArgs="$wrapArgs --set HOME : /homeless-shelter"
       wrapProgram $out/bin/$name $wrapArgs
     '';

From b3337edd0b77f04d0abe4a29642a5e4fdb4ad692 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 29 Feb 2016 20:02:26 +0100
Subject: [PATCH 2034/2285] nixos/release.nix: Add a callSubTests function

This should de-clutter the various redundant lines of callTest's on
subtests so that every main test file should have only one line with a
callSubTests instead.

Overrides work the same way as callTest, except that if the system
attribute is explicitly specified we do not generate attributes for all
available systems.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @edolstra
---
 nixos/release.nix | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index 497056c22746..76d0ce90458b 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -13,7 +13,25 @@ let
 
   forAllSystems = genAttrs supportedSystems;
 
-  callTest = fn: args: forAllSystems (system: hydraJob (import fn ({ inherit system; } // args)));
+  importTest = fn: args: system: import fn ({
+    inherit system;
+  } // args);
+
+  callTest = fn: args: forAllSystems (system: hydraJob (importTest fn args system));
+
+  callSubTests = fn: args: let
+    discover = attrs: let
+      subTests = filterAttrs (const (hasAttr "test")) attrs;
+    in mapAttrs (const (t: hydraJob t.test)) subTests;
+
+    discoverForSystem = system: mapAttrs (_: test: {
+      ${system} = test;
+    }) (discover (importTest fn args system));
+
+  # If the test is only for a particular system, use only the specified
+  # system instead of generating attributes for all available systems.
+  in if args ? system then discover (import fn args)
+     else foldAttrs (a: b: a // b) {} (map discoverForSystem supportedSystems);
 
   pkgs = import nixpkgs { system = "x86_64-linux"; };
 

From 2f2536b9354b296dbf12343d232e113d211704df Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 29 Feb 2016 20:06:55 +0100
Subject: [PATCH 2035/2285] nixos/tests/networking: Expose subtests via attrs

So far the networking test expression only generated a single test
depending on the passed "test" attribute. This makes it difficult to
autodiscover the subtests with our shiny new callSubTests function.

This change essentially doesn't change the behaviour of the subtests but
rather exposes them as an attribute set instead of relying on a
particular input argument.

The useNetworkd argument still exists however.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @wkennington
---
 nixos/tests/networking.nix | 799 +++++++++++++++++++------------------
 1 file changed, 402 insertions(+), 397 deletions(-)

diff --git a/nixos/tests/networking.nix b/nixos/tests/networking.nix
index 813d7c2bf516..d5a0a9b798f5 100644
--- a/nixos/tests/networking.nix
+++ b/nixos/tests/networking.nix
@@ -1,406 +1,411 @@
-import ./make-test.nix ({ pkgs, networkd, test, ... }:
-  let
-    router = { config, pkgs, ... }:
-      with pkgs.lib;
-      let
-        vlanIfs = range 1 (length config.virtualisation.vlans);
-      in {
-        virtualisation.vlans = [ 1 2 3 ];
+{ system ? builtins.currentSystem, networkd }:
+
+with import ../lib/testing.nix { inherit system; };
+with pkgs.lib;
+
+let
+  router = { config, pkgs, ... }:
+    with pkgs.lib;
+    let
+      vlanIfs = range 1 (length config.virtualisation.vlans);
+    in {
+      virtualisation.vlans = [ 1 2 3 ];
+      networking = {
+        useDHCP = false;
+        useNetworkd = networkd;
+        firewall.allowPing = true;
+        interfaces = mkOverride 0 (listToAttrs (flip map vlanIfs (n:
+          nameValuePair "eth${toString n}" {
+            ipAddress = "192.168.${toString n}.1";
+            prefixLength = 24;
+          })));
+      };
+      services.dhcpd = {
+        enable = true;
+        interfaces = map (n: "eth${toString n}") vlanIfs;
+        extraConfig = ''
+          option subnet-mask 255.255.255.0;
+        '' + flip concatMapStrings vlanIfs (n: ''
+          subnet 192.168.${toString n}.0 netmask 255.255.255.0 {
+            option broadcast-address 192.168.${toString n}.255;
+            option routers 192.168.${toString n}.1;
+            range 192.168.${toString n}.2 192.168.${toString n}.254;
+          }
+        '');
+      };
+    };
+
+  testCases = {
+    loopback = {
+      name = "Loopback";
+      machine.networking.useNetworkd = networkd;
+      testScript = ''
+        startAll;
+        $machine->waitForUnit("network-interfaces.target");
+        $machine->waitForUnit("network.target");
+        $machine->succeed("ip addr show lo | grep -q 'inet 127.0.0.1/8 '");
+        $machine->succeed("ip addr show lo | grep -q 'inet6 ::1/128 '");
+      '';
+    };
+    static = {
+      name = "Static";
+      nodes.router = router;
+      nodes.client = { config, pkgs, ... }: with pkgs.lib; {
+        virtualisation.vlans = [ 1 2 ];
         networking = {
-          useDHCP = false;
           useNetworkd = networkd;
           firewall.allowPing = true;
-          interfaces = mkOverride 0 (listToAttrs (flip map vlanIfs (n:
-            nameValuePair "eth${toString n}" {
-              ipAddress = "192.168.${toString n}.1";
-              prefixLength = 24;
-            })));
-        };
-        services.dhcpd = {
-          enable = true;
-          interfaces = map (n: "eth${toString n}") vlanIfs;
-          extraConfig = ''
-            option subnet-mask 255.255.255.0;
-          '' + flip concatMapStrings vlanIfs (n: ''
-            subnet 192.168.${toString n}.0 netmask 255.255.255.0 {
-              option broadcast-address 192.168.${toString n}.255;
-              option routers 192.168.${toString n}.1;
-              range 192.168.${toString n}.2 192.168.${toString n}.254;
-            }
-          '');
+          useDHCP = false;
+          defaultGateway = "192.168.1.1";
+          interfaces.eth1.ip4 = mkOverride 0 [
+            { address = "192.168.1.2"; prefixLength = 24; }
+            { address = "192.168.1.3"; prefixLength = 32; }
+            { address = "192.168.1.10"; prefixLength = 32; }
+          ];
+          interfaces.eth2.ip4 = mkOverride 0 [
+            { address = "192.168.2.2"; prefixLength = 24; }
+          ];
         };
       };
-    testCases = {
-      loopback = {
-        name = "Loopback";
-        machine.networking.useNetworkd = networkd;
-        testScript = ''
+      testScript = { nodes, ... }:
+        ''
           startAll;
-          $machine->waitForUnit("network-interfaces.target");
-          $machine->waitForUnit("network.target");
-          $machine->succeed("ip addr show lo | grep -q 'inet 127.0.0.1/8 '");
-          $machine->succeed("ip addr show lo | grep -q 'inet6 ::1/128 '");
+
+          $client->waitForUnit("network-interfaces.target");
+          $client->waitForUnit("network.target");
+          $router->waitForUnit("network-interfaces.target");
+          $router->waitForUnit("network.target");
+
+          # Make sure dhcpcd is not started
+          $client->fail("systemctl status dhcpcd.service");
+
+          # Test vlan 1
+          $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
+          $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
+          $client->waitUntilSucceeds("ping -c 1 192.168.1.3");
+          $client->waitUntilSucceeds("ping -c 1 192.168.1.10");
+
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.3");
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.10");
+
+          # Test vlan 2
+          $client->waitUntilSucceeds("ping -c 1 192.168.2.1");
+          $client->waitUntilSucceeds("ping -c 1 192.168.2.2");
+
+          $router->waitUntilSucceeds("ping -c 1 192.168.2.1");
+          $router->waitUntilSucceeds("ping -c 1 192.168.2.2");
+
+          # Test default gateway
+          $router->waitUntilSucceeds("ping -c 1 192.168.3.1");
+          $client->waitUntilSucceeds("ping -c 1 192.168.3.1");
         '';
-      };
-      static = {
-        name = "Static";
-        nodes.router = router;
-        nodes.client = { config, pkgs, ... }: with pkgs.lib; {
-          virtualisation.vlans = [ 1 2 ];
-          networking = {
-            useNetworkd = networkd;
-            firewall.allowPing = true;
-            useDHCP = false;
-            defaultGateway = "192.168.1.1";
-            interfaces.eth1.ip4 = mkOverride 0 [
-              { address = "192.168.1.2"; prefixLength = 24; }
-              { address = "192.168.1.3"; prefixLength = 32; }
-              { address = "192.168.1.10"; prefixLength = 32; }
-            ];
-            interfaces.eth2.ip4 = mkOverride 0 [
-              { address = "192.168.2.2"; prefixLength = 24; }
-            ];
-          };
-        };
-        testScript = { nodes, ... }:
-          ''
-            startAll;
-
-            $client->waitForUnit("network-interfaces.target");
-            $client->waitForUnit("network.target");
-            $router->waitForUnit("network-interfaces.target");
-            $router->waitForUnit("network.target");
-
-            # Make sure dhcpcd is not started
-            $client->fail("systemctl status dhcpcd.service");
-
-            # Test vlan 1
-            $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
-            $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
-            $client->waitUntilSucceeds("ping -c 1 192.168.1.3");
-            $client->waitUntilSucceeds("ping -c 1 192.168.1.10");
-
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.3");
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.10");
-
-            # Test vlan 2
-            $client->waitUntilSucceeds("ping -c 1 192.168.2.1");
-            $client->waitUntilSucceeds("ping -c 1 192.168.2.2");
-
-            $router->waitUntilSucceeds("ping -c 1 192.168.2.1");
-            $router->waitUntilSucceeds("ping -c 1 192.168.2.2");
-
-            # Test default gateway
-            $router->waitUntilSucceeds("ping -c 1 192.168.3.1");
-            $client->waitUntilSucceeds("ping -c 1 192.168.3.1");
-          '';
-      };
-      dhcpSimple = {
-        name = "SimpleDHCP";
-        nodes.router = router;
-        nodes.client = { config, pkgs, ... }: with pkgs.lib; {
-          virtualisation.vlans = [ 1 2 ];
-          networking = {
-            useNetworkd = networkd;
-            firewall.allowPing = true;
-            useDHCP = true;
-            interfaces.eth1.ip4 = mkOverride 0 [ ];
-            interfaces.eth2.ip4 = mkOverride 0 [ ];
-          };
-        };
-        testScript = { nodes, ... }:
-          ''
-            startAll;
-
-            $client->waitForUnit("network-interfaces.target");
-            $client->waitForUnit("network.target");
-            $router->waitForUnit("network-interfaces.target");
-            $router->waitForUnit("network.target");
-
-            # Wait until we have an ip address on each interface
-            $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'");
-            $client->waitUntilSucceeds("ip addr show dev eth2 | grep -q '192.168.2'");
-
-            # Test vlan 1
-            $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
-            $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
-
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
-
-            # Test vlan 2
-            $client->waitUntilSucceeds("ping -c 1 192.168.2.1");
-            $client->waitUntilSucceeds("ping -c 1 192.168.2.2");
-
-            $router->waitUntilSucceeds("ping -c 1 192.168.2.1");
-            $router->waitUntilSucceeds("ping -c 1 192.168.2.2");
-          '';
-      };
-      dhcpOneIf = {
-        name = "OneInterfaceDHCP";
-        nodes.router = router;
-        nodes.client = { config, pkgs, ... }: with pkgs.lib; {
-          virtualisation.vlans = [ 1 2 ];
-          networking = {
-            useNetworkd = networkd;
-            firewall.allowPing = true;
-            useDHCP = false;
-            interfaces.eth1 = {
-              ip4 = mkOverride 0 [ ];
-              useDHCP = true;
-            };
-            interfaces.eth2.ip4 = mkOverride 0 [ ];
-          };
-        };
-        testScript = { nodes, ... }:
-          ''
-            startAll;
-
-            # Wait for networking to come up
-            $client->waitForUnit("network-interfaces.target");
-            $client->waitForUnit("network.target");
-            $router->waitForUnit("network-interfaces.target");
-            $router->waitForUnit("network.target");
-
-            # Wait until we have an ip address on each interface
-            $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'");
-
-            # Test vlan 1
-            $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
-            $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
-
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
-
-            # Test vlan 2
-            $client->waitUntilSucceeds("ping -c 1 192.168.2.1");
-            $client->fail("ping -c 1 192.168.2.2");
-
-            $router->waitUntilSucceeds("ping -c 1 192.168.2.1");
-            $router->fail("ping -c 1 192.168.2.2");
-          '';
-      };
-      bond = let
-        node = address: { config, pkgs, ... }: with pkgs.lib; {
-          virtualisation.vlans = [ 1 2 ];
-          networking = {
-            useNetworkd = networkd;
-            firewall.allowPing = true;
-            useDHCP = false;
-            bonds.bond = {
-              mode = "balance-rr";
-              interfaces = [ "eth1" "eth2" ];
-            };
-            interfaces.eth1.ip4 = mkOverride 0 [ ];
-            interfaces.eth2.ip4 = mkOverride 0 [ ];
-            interfaces.bond.ip4 = mkOverride 0
-              [ { inherit address; prefixLength = 30; } ];
-          };
-        };
-      in {
-        name = "Bond";
-        nodes.client1 = node "192.168.1.1";
-        nodes.client2 = node "192.168.1.2";
-        testScript = { nodes, ... }:
-          ''
-            startAll;
-
-            # Wait for networking to come up
-            $client1->waitForUnit("network-interfaces.target");
-            $client1->waitForUnit("network.target");
-            $client2->waitForUnit("network-interfaces.target");
-            $client2->waitForUnit("network.target");
-
-            # Test bonding
-            $client1->waitUntilSucceeds("ping -c 2 192.168.1.1");
-            $client1->waitUntilSucceeds("ping -c 2 192.168.1.2");
-
-            $client2->waitUntilSucceeds("ping -c 2 192.168.1.1");
-            $client2->waitUntilSucceeds("ping -c 2 192.168.1.2");
-          '';
-      };
-      bridge = let
-        node = { address, vlan }: { config, pkgs, ... }: with pkgs.lib; {
-          virtualisation.vlans = [ vlan ];
-          networking = {
-            useNetworkd = networkd;
-            firewall.allowPing = true;
-            useDHCP = false;
-            interfaces.eth1.ip4 = mkOverride 0
-              [ { inherit address; prefixLength = 24; } ];
-          };
-        };
-      in {
-        name = "Bridge";
-        nodes.client1 = node { address = "192.168.1.2"; vlan = 1; };
-        nodes.client2 = node { address = "192.168.1.3"; vlan = 2; };
-        nodes.router = { config, pkgs, ... }: with pkgs.lib; {
-          virtualisation.vlans = [ 1 2 ];
-          networking = {
-            useNetworkd = networkd;
-            firewall.allowPing = true;
-            useDHCP = false;
-            bridges.bridge.interfaces = [ "eth1" "eth2" ];
-            interfaces.eth1.ip4 = mkOverride 0 [ ];
-            interfaces.eth2.ip4 = mkOverride 0 [ ];
-            interfaces.bridge.ip4 = mkOverride 0
-              [ { address = "192.168.1.1"; prefixLength = 24; } ];
-          };
-        };
-        testScript = { nodes, ... }:
-          ''
-            startAll;
-
-            # Wait for networking to come up
-            $client1->waitForUnit("network-interfaces.target");
-            $client1->waitForUnit("network.target");
-            $client2->waitForUnit("network-interfaces.target");
-            $client2->waitForUnit("network.target");
-            $router->waitForUnit("network-interfaces.target");
-            $router->waitForUnit("network.target");
-
-            # Test bridging
-            $client1->waitUntilSucceeds("ping -c 1 192.168.1.1");
-            $client1->waitUntilSucceeds("ping -c 1 192.168.1.2");
-            $client1->waitUntilSucceeds("ping -c 1 192.168.1.3");
-
-            $client2->waitUntilSucceeds("ping -c 1 192.168.1.1");
-            $client2->waitUntilSucceeds("ping -c 1 192.168.1.2");
-            $client2->waitUntilSucceeds("ping -c 1 192.168.1.3");
-
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.3");
-          '';
-      };
-      macvlan = {
-        name = "MACVLAN";
-        nodes.router = router;
-        nodes.client = { config, pkgs, ... }: with pkgs.lib; {
-          virtualisation.vlans = [ 1 ];
-          networking = {
-            useNetworkd = networkd;
-            firewall.allowPing = true;
-            useDHCP = true;
-            macvlans.macvlan.interface = "eth1";
-            interfaces.eth1.ip4 = mkOverride 0 [ ];
-          };
-        };
-        testScript = { nodes, ... }:
-          ''
-            startAll;
-
-            # Wait for networking to come up
-            $client->waitForUnit("network-interfaces.target");
-            $client->waitForUnit("network.target");
-            $router->waitForUnit("network-interfaces.target");
-            $router->waitForUnit("network.target");
-
-            # Wait until we have an ip address on each interface
-            $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'");
-            $client->waitUntilSucceeds("ip addr show dev macvlan | grep -q '192.168.1'");
-
-            # Print diagnosting information
-            $router->succeed("ip addr >&2");
-            $client->succeed("ip addr >&2");
-
-            # Test macvlan creates routable ips
-            $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
-            $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
-            $client->waitUntilSucceeds("ping -c 1 192.168.1.3");
-
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
-            $router->waitUntilSucceeds("ping -c 1 192.168.1.3");
-          '';
-      };
-      sit = let
-        node = { address4, remote, address6 }: { config, pkgs, ... }: with pkgs.lib; {
-          virtualisation.vlans = [ 1 ];
-          networking = {
-            useNetworkd = networkd;
-            firewall.enable = false;
-            useDHCP = false;
-            sits.sit = {
-              inherit remote;
-              local = address4;
-              dev = "eth1";
-            };
-            interfaces.eth1.ip4 = mkOverride 0
-              [ { address = address4; prefixLength = 24; } ];
-            interfaces.sit.ip6 = mkOverride 0
-              [ { address = address6; prefixLength = 64; } ];
-          };
-        };
-      in {
-        name = "Sit";
-        nodes.client1 = node { address4 = "192.168.1.1"; remote = "192.168.1.2"; address6 = "fc00::1"; };
-        nodes.client2 = node { address4 = "192.168.1.2"; remote = "192.168.1.1"; address6 = "fc00::2"; };
-        testScript = { nodes, ... }:
-          ''
-            startAll;
-
-            # Wait for networking to be configured
-            $client1->waitForUnit("network-interfaces.target");
-            $client1->waitForUnit("network.target");
-            $client2->waitForUnit("network-interfaces.target");
-            $client2->waitForUnit("network.target");
-
-            # Print diagnostic information
-            $client1->succeed("ip addr >&2");
-            $client2->succeed("ip addr >&2");
-
-            # Test ipv6
-            $client1->waitUntilSucceeds("ping6 -c 1 fc00::1");
-            $client1->waitUntilSucceeds("ping6 -c 1 fc00::2");
-
-            $client2->waitUntilSucceeds("ping6 -c 1 fc00::1");
-            $client2->waitUntilSucceeds("ping6 -c 1 fc00::2");
-          '';
-      };
-      vlan = let
-        node = address: { config, pkgs, ... }: with pkgs.lib; {
-          #virtualisation.vlans = [ 1 ];
-          networking = {
-            useNetworkd = networkd;
-            firewall.allowPing = true;
-            useDHCP = false;
-            vlans.vlan = {
-              id = 1;
-              interface = "eth0";
-            };
-            interfaces.eth0.ip4 = mkOverride 0 [ ];
-            interfaces.eth1.ip4 = mkOverride 0 [ ];
-            interfaces.vlan.ip4 = mkOverride 0
-              [ { inherit address; prefixLength = 24; } ];
-          };
-        };
-      in {
-        name = "vlan";
-        nodes.client1 = node "192.168.1.1";
-        nodes.client2 = node "192.168.1.2";
-        testScript = { nodes, ... }:
-          ''
-            startAll;
-
-            # Wait for networking to be configured
-            $client1->waitForUnit("network-interfaces.target");
-            $client1->waitForUnit("network.target");
-            $client2->waitForUnit("network-interfaces.target");
-            $client2->waitForUnit("network.target");
-
-            # Test vlan is setup
-            $client1->succeed("ip addr show dev vlan >&2");
-            $client2->succeed("ip addr show dev vlan >&2");
-          '';
-      };
     };
-    case = testCases.${test};
-  in case // {
-    name = "${case.name}-Networking-${if networkd then "Networkd" else "Scripted"}";
-    meta = with pkgs.stdenv.lib.maintainers; {
-      maintainers = [ wkennington ];
+    dhcpSimple = {
+      name = "SimpleDHCP";
+      nodes.router = router;
+      nodes.client = { config, pkgs, ... }: with pkgs.lib; {
+        virtualisation.vlans = [ 1 2 ];
+        networking = {
+          useNetworkd = networkd;
+          firewall.allowPing = true;
+          useDHCP = true;
+          interfaces.eth1.ip4 = mkOverride 0 [ ];
+          interfaces.eth2.ip4 = mkOverride 0 [ ];
+        };
+      };
+      testScript = { nodes, ... }:
+        ''
+          startAll;
+
+          $client->waitForUnit("network-interfaces.target");
+          $client->waitForUnit("network.target");
+          $router->waitForUnit("network-interfaces.target");
+          $router->waitForUnit("network.target");
+
+          # Wait until we have an ip address on each interface
+          $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'");
+          $client->waitUntilSucceeds("ip addr show dev eth2 | grep -q '192.168.2'");
+
+          # Test vlan 1
+          $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
+          $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
+
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
+
+          # Test vlan 2
+          $client->waitUntilSucceeds("ping -c 1 192.168.2.1");
+          $client->waitUntilSucceeds("ping -c 1 192.168.2.2");
+
+          $router->waitUntilSucceeds("ping -c 1 192.168.2.1");
+          $router->waitUntilSucceeds("ping -c 1 192.168.2.2");
+        '';
     };
-  })
+    dhcpOneIf = {
+      name = "OneInterfaceDHCP";
+      nodes.router = router;
+      nodes.client = { config, pkgs, ... }: with pkgs.lib; {
+        virtualisation.vlans = [ 1 2 ];
+        networking = {
+          useNetworkd = networkd;
+          firewall.allowPing = true;
+          useDHCP = false;
+          interfaces.eth1 = {
+            ip4 = mkOverride 0 [ ];
+            useDHCP = true;
+          };
+          interfaces.eth2.ip4 = mkOverride 0 [ ];
+        };
+      };
+      testScript = { nodes, ... }:
+        ''
+          startAll;
+
+          # Wait for networking to come up
+          $client->waitForUnit("network-interfaces.target");
+          $client->waitForUnit("network.target");
+          $router->waitForUnit("network-interfaces.target");
+          $router->waitForUnit("network.target");
+
+          # Wait until we have an ip address on each interface
+          $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'");
+
+          # Test vlan 1
+          $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
+          $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
+
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
+
+          # Test vlan 2
+          $client->waitUntilSucceeds("ping -c 1 192.168.2.1");
+          $client->fail("ping -c 1 192.168.2.2");
+
+          $router->waitUntilSucceeds("ping -c 1 192.168.2.1");
+          $router->fail("ping -c 1 192.168.2.2");
+        '';
+    };
+    bond = let
+      node = address: { config, pkgs, ... }: with pkgs.lib; {
+        virtualisation.vlans = [ 1 2 ];
+        networking = {
+          useNetworkd = networkd;
+          firewall.allowPing = true;
+          useDHCP = false;
+          bonds.bond = {
+            mode = "balance-rr";
+            interfaces = [ "eth1" "eth2" ];
+          };
+          interfaces.eth1.ip4 = mkOverride 0 [ ];
+          interfaces.eth2.ip4 = mkOverride 0 [ ];
+          interfaces.bond.ip4 = mkOverride 0
+            [ { inherit address; prefixLength = 30; } ];
+        };
+      };
+    in {
+      name = "Bond";
+      nodes.client1 = node "192.168.1.1";
+      nodes.client2 = node "192.168.1.2";
+      testScript = { nodes, ... }:
+        ''
+          startAll;
+
+          # Wait for networking to come up
+          $client1->waitForUnit("network-interfaces.target");
+          $client1->waitForUnit("network.target");
+          $client2->waitForUnit("network-interfaces.target");
+          $client2->waitForUnit("network.target");
+
+          # Test bonding
+          $client1->waitUntilSucceeds("ping -c 2 192.168.1.1");
+          $client1->waitUntilSucceeds("ping -c 2 192.168.1.2");
+
+          $client2->waitUntilSucceeds("ping -c 2 192.168.1.1");
+          $client2->waitUntilSucceeds("ping -c 2 192.168.1.2");
+        '';
+    };
+    bridge = let
+      node = { address, vlan }: { config, pkgs, ... }: with pkgs.lib; {
+        virtualisation.vlans = [ vlan ];
+        networking = {
+          useNetworkd = networkd;
+          firewall.allowPing = true;
+          useDHCP = false;
+          interfaces.eth1.ip4 = mkOverride 0
+            [ { inherit address; prefixLength = 24; } ];
+        };
+      };
+    in {
+      name = "Bridge";
+      nodes.client1 = node { address = "192.168.1.2"; vlan = 1; };
+      nodes.client2 = node { address = "192.168.1.3"; vlan = 2; };
+      nodes.router = { config, pkgs, ... }: with pkgs.lib; {
+        virtualisation.vlans = [ 1 2 ];
+        networking = {
+          useNetworkd = networkd;
+          firewall.allowPing = true;
+          useDHCP = false;
+          bridges.bridge.interfaces = [ "eth1" "eth2" ];
+          interfaces.eth1.ip4 = mkOverride 0 [ ];
+          interfaces.eth2.ip4 = mkOverride 0 [ ];
+          interfaces.bridge.ip4 = mkOverride 0
+            [ { address = "192.168.1.1"; prefixLength = 24; } ];
+        };
+      };
+      testScript = { nodes, ... }:
+        ''
+          startAll;
+
+          # Wait for networking to come up
+          $client1->waitForUnit("network-interfaces.target");
+          $client1->waitForUnit("network.target");
+          $client2->waitForUnit("network-interfaces.target");
+          $client2->waitForUnit("network.target");
+          $router->waitForUnit("network-interfaces.target");
+          $router->waitForUnit("network.target");
+
+          # Test bridging
+          $client1->waitUntilSucceeds("ping -c 1 192.168.1.1");
+          $client1->waitUntilSucceeds("ping -c 1 192.168.1.2");
+          $client1->waitUntilSucceeds("ping -c 1 192.168.1.3");
+
+          $client2->waitUntilSucceeds("ping -c 1 192.168.1.1");
+          $client2->waitUntilSucceeds("ping -c 1 192.168.1.2");
+          $client2->waitUntilSucceeds("ping -c 1 192.168.1.3");
+
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.3");
+        '';
+    };
+    macvlan = {
+      name = "MACVLAN";
+      nodes.router = router;
+      nodes.client = { config, pkgs, ... }: with pkgs.lib; {
+        virtualisation.vlans = [ 1 ];
+        networking = {
+          useNetworkd = networkd;
+          firewall.allowPing = true;
+          useDHCP = true;
+          macvlans.macvlan.interface = "eth1";
+          interfaces.eth1.ip4 = mkOverride 0 [ ];
+        };
+      };
+      testScript = { nodes, ... }:
+        ''
+          startAll;
+
+          # Wait for networking to come up
+          $client->waitForUnit("network-interfaces.target");
+          $client->waitForUnit("network.target");
+          $router->waitForUnit("network-interfaces.target");
+          $router->waitForUnit("network.target");
+
+          # Wait until we have an ip address on each interface
+          $client->waitUntilSucceeds("ip addr show dev eth1 | grep -q '192.168.1'");
+          $client->waitUntilSucceeds("ip addr show dev macvlan | grep -q '192.168.1'");
+
+          # Print diagnosting information
+          $router->succeed("ip addr >&2");
+          $client->succeed("ip addr >&2");
+
+          # Test macvlan creates routable ips
+          $client->waitUntilSucceeds("ping -c 1 192.168.1.1");
+          $client->waitUntilSucceeds("ping -c 1 192.168.1.2");
+          $client->waitUntilSucceeds("ping -c 1 192.168.1.3");
+
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.1");
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.2");
+          $router->waitUntilSucceeds("ping -c 1 192.168.1.3");
+        '';
+    };
+    sit = let
+      node = { address4, remote, address6 }: { config, pkgs, ... }: with pkgs.lib; {
+        virtualisation.vlans = [ 1 ];
+        networking = {
+          useNetworkd = networkd;
+          firewall.enable = false;
+          useDHCP = false;
+          sits.sit = {
+            inherit remote;
+            local = address4;
+            dev = "eth1";
+          };
+          interfaces.eth1.ip4 = mkOverride 0
+            [ { address = address4; prefixLength = 24; } ];
+          interfaces.sit.ip6 = mkOverride 0
+            [ { address = address6; prefixLength = 64; } ];
+        };
+      };
+    in {
+      name = "Sit";
+      nodes.client1 = node { address4 = "192.168.1.1"; remote = "192.168.1.2"; address6 = "fc00::1"; };
+      nodes.client2 = node { address4 = "192.168.1.2"; remote = "192.168.1.1"; address6 = "fc00::2"; };
+      testScript = { nodes, ... }:
+        ''
+          startAll;
+
+          # Wait for networking to be configured
+          $client1->waitForUnit("network-interfaces.target");
+          $client1->waitForUnit("network.target");
+          $client2->waitForUnit("network-interfaces.target");
+          $client2->waitForUnit("network.target");
+
+          # Print diagnostic information
+          $client1->succeed("ip addr >&2");
+          $client2->succeed("ip addr >&2");
+
+          # Test ipv6
+          $client1->waitUntilSucceeds("ping6 -c 1 fc00::1");
+          $client1->waitUntilSucceeds("ping6 -c 1 fc00::2");
+
+          $client2->waitUntilSucceeds("ping6 -c 1 fc00::1");
+          $client2->waitUntilSucceeds("ping6 -c 1 fc00::2");
+        '';
+    };
+    vlan = let
+      node = address: { config, pkgs, ... }: with pkgs.lib; {
+        #virtualisation.vlans = [ 1 ];
+        networking = {
+          useNetworkd = networkd;
+          firewall.allowPing = true;
+          useDHCP = false;
+          vlans.vlan = {
+            id = 1;
+            interface = "eth0";
+          };
+          interfaces.eth0.ip4 = mkOverride 0 [ ];
+          interfaces.eth1.ip4 = mkOverride 0 [ ];
+          interfaces.vlan.ip4 = mkOverride 0
+            [ { inherit address; prefixLength = 24; } ];
+        };
+      };
+    in {
+      name = "vlan";
+      nodes.client1 = node "192.168.1.1";
+      nodes.client2 = node "192.168.1.2";
+      testScript = { nodes, ... }:
+        ''
+          startAll;
+
+          # Wait for networking to be configured
+          $client1->waitForUnit("network-interfaces.target");
+          $client1->waitForUnit("network.target");
+          $client2->waitForUnit("network-interfaces.target");
+          $client2->waitForUnit("network.target");
+
+          # Test vlan is setup
+          $client1->succeed("ip addr show dev vlan >&2");
+          $client2->succeed("ip addr show dev vlan >&2");
+        '';
+    };
+  };
+
+in mapAttrs (const (attrs: makeTest (attrs // {
+  name = "${attrs.name}-Networking-${if networkd then "Networkd" else "Scripted"}";
+  meta = with pkgs.stdenv.lib.maintainers; {
+    maintainers = [ wkennington ];
+  };
+}))) testCases

From 7eea91fbc0efc19f416121369f566c6f5363fbc0 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Mon, 29 Feb 2016 20:11:04 +0100
Subject: [PATCH 2036/2285] nixos/release: Use callSubTests for subtests

Should clean up a lot of these redundant lines for various sub-tests.

Note that the tests.boot* are now called tests.boot.boot*, but otherwise
all the test attribute names should stay the same.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @edolstra
Cc: @wkennington
Cc: @bobvanderlinden
---
 nixos/release-combined.nix |  2 +-
 nixos/release.nix          | 45 +++++---------------------------------
 2 files changed, 6 insertions(+), 41 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 06890b458efa..b3bef2deb798 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -63,7 +63,7 @@ in rec {
         (all nixos.tests.installer.btrfsSimple)
         (all nixos.tests.installer.btrfsSubvols)
         (all nixos.tests.installer.btrfsSubvolDefault)
-        (all nixos.tests.bootBiosCdrom)
+        (all nixos.tests.boot.bootBiosCdrom)
         (all nixos.tests.ipv6)
         (all nixos.tests.kde4)
         #(all nixos.tests.lightdm)
diff --git a/nixos/release.nix b/nixos/release.nix
index 76d0ce90458b..eb614ac11030 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -233,6 +233,7 @@ in rec {
   tests.avahi = callTest tests/avahi.nix {};
   tests.bittorrent = callTest tests/bittorrent.nix {};
   tests.blivet = callTest tests/blivet.nix {};
+  tests.boot = callSubTests tests/boot.nix {};
   tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; });
   tests.chromium = callTest tests/chromium.nix {};
   tests.cjdns = callTest tests/cjdns.nix {};
@@ -250,18 +251,7 @@ in rec {
   tests.gnome3-gdm = callTest tests/gnome3-gdm.nix {};
   tests.grsecurity = callTest tests/grsecurity.nix {};
   tests.i3wm = callTest tests/i3wm.nix {};
-  tests.installer.grub1 = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).grub1.test);
-  tests.installer.lvm = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).lvm.test);
-  tests.installer.luksroot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).luksroot.test);
-  tests.installer.separateBoot = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).separateBoot.test);
-  tests.installer.separateBootFat = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).separateBootFat.test);
-  tests.installer.simple = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simple.test);
-  tests.installer.simpleLabels = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simpleLabels.test);
-  tests.installer.simpleProvided = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).simpleProvided.test);
-  tests.installer.swraid = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).swraid.test);
-  tests.installer.btrfsSimple = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).btrfsSimple.test);
-  tests.installer.btrfsSubvols = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).btrfsSubvols.test);
-  tests.installer.btrfsSubvolDefault = forAllSystems (system: hydraJob (import tests/installer.nix { inherit system; }).btrfsSubvolDefault.test);
+  tests.installer = callSubTests tests/installer.nix {};
   tests.influxdb = callTest tests/influxdb.nix {};
   tests.ipv6 = callTest tests/ipv6.nix {};
   tests.jenkins = callTest tests/jenkins.nix {};
@@ -280,24 +270,8 @@ in rec {
   tests.mysqlReplication = callTest tests/mysql-replication.nix {};
   tests.nat.firewall = callTest tests/nat.nix { withFirewall = true; };
   tests.nat.standalone = callTest tests/nat.nix { withFirewall = false; };
-  tests.networking.networkd.loopback = callTest tests/networking.nix { networkd = true; test = "loopback"; };
-  tests.networking.networkd.static = callTest tests/networking.nix { networkd = true; test = "static"; };
-  tests.networking.networkd.dhcpSimple = callTest tests/networking.nix { networkd = true; test = "dhcpSimple"; };
-  tests.networking.networkd.dhcpOneIf = callTest tests/networking.nix { networkd = true; test = "dhcpOneIf"; };
-  tests.networking.networkd.bond = callTest tests/networking.nix { networkd = true; test = "bond"; };
-  tests.networking.networkd.bridge = callTest tests/networking.nix { networkd = true; test = "bridge"; };
-  tests.networking.networkd.macvlan = callTest tests/networking.nix { networkd = true; test = "macvlan"; };
-  tests.networking.networkd.sit = callTest tests/networking.nix { networkd = true; test = "sit"; };
-  tests.networking.networkd.vlan = callTest tests/networking.nix { networkd = true; test = "vlan"; };
-  tests.networking.scripted.loopback = callTest tests/networking.nix { networkd = false; test = "loopback"; };
-  tests.networking.scripted.static = callTest tests/networking.nix { networkd = false; test = "static"; };
-  tests.networking.scripted.dhcpSimple = callTest tests/networking.nix { networkd = false; test = "dhcpSimple"; };
-  tests.networking.scripted.dhcpOneIf = callTest tests/networking.nix { networkd = false; test = "dhcpOneIf"; };
-  tests.networking.scripted.bond = callTest tests/networking.nix { networkd = false; test = "bond"; };
-  tests.networking.scripted.bridge = callTest tests/networking.nix { networkd = false; test = "bridge"; };
-  tests.networking.scripted.macvlan = callTest tests/networking.nix { networkd = false; test = "macvlan"; };
-  tests.networking.scripted.sit = callTest tests/networking.nix { networkd = false; test = "sit"; };
-  tests.networking.scripted.vlan = callTest tests/networking.nix { networkd = false; test = "vlan"; };
+  tests.networking.networkd = callSubTests tests/networking.nix { networkd = true; };
+  tests.networking.scripted = callSubTests tests/networking.nix { networkd = false; };
   # TODO: put in networking.nix after the test becomes more complete
   tests.networkingProxy = callTest tests/networking-proxy.nix {};
   tests.nfs3 = callTest tests/nfs.nix { version = 3; };
@@ -317,17 +291,8 @@ in rec {
   tests.simple = callTest tests/simple.nix {};
   tests.tomcat = callTest tests/tomcat.nix {};
   tests.udisks2 = callTest tests/udisks2.nix {};
-  tests.virtualbox = let
-    testsOnly = filterAttrs (const (t: t ? test));
-    vboxTests = testsOnly (import tests/virtualbox.nix {
-      system = "x86_64-linux";
-    });
-  in mapAttrs (const (t: hydraJob t.test)) vboxTests;
+  tests.virtualbox = callSubTests tests/virtualbox.nix { system = "x86_64-linux"; };
   tests.xfce = callTest tests/xfce.nix {};
-  tests.bootBiosCdrom = forAllSystems (system: hydraJob (import tests/boot.nix { inherit system; }).bootBiosCdrom);
-  tests.bootBiosUsb = forAllSystems (system: hydraJob (import tests/boot.nix { inherit system; }).bootBiosUsb);
-  tests.bootUefiCdrom = forAllSystems (system: hydraJob (import tests/boot.nix { inherit system; }).bootUefiCdrom);
-  tests.bootUefiUsb = forAllSystems (system: hydraJob (import tests/boot.nix { inherit system; }).bootUefiUsb);
 
 
   /* Build a bunch of typical closures so that Hydra can keep track of

From e45c211b50c6f473e3d92d29e1a8426ec4579f05 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 1 Mar 2016 00:20:27 +0100
Subject: [PATCH 2037/2285] nixos/tests/chromium: Split up into subtests

This makes it easier to test just a specific channel rather than to
force testing all builds down the users/testers throat. Especially this
makes it easier to test NixOS channel upgrades only against the Chromium
stable channel instead of just removing the beta/dev channels from the
tests entirely (as done in 69ec09f38aa1f1d37baec73ebdf9cf5f21050f94).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/release-combined.nix |   2 +-
 nixos/release.nix          |   2 +-
 nixos/tests/chromium.nix   | 133 +++++++++++++++++--------------------
 3 files changed, 63 insertions(+), 74 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index b3bef2deb798..69cc357078d6 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -48,7 +48,7 @@ in rec {
         (all nixos.ova)
 
         #(all nixos.tests.containers)
-        (all nixos.tests.chromium)
+        (all nixos.tests.chromium.stable)
         (all nixos.tests.firefox)
         (all nixos.tests.firewall)
         nixos.tests.gnome3.x86_64-linux # FIXME: i686-linux
diff --git a/nixos/release.nix b/nixos/release.nix
index eb614ac11030..18e4e2d6b172 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -235,7 +235,7 @@ in rec {
   tests.blivet = callTest tests/blivet.nix {};
   tests.boot = callSubTests tests/boot.nix {};
   tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; });
-  tests.chromium = callTest tests/chromium.nix {};
+  tests.chromium = callSubTests tests/chromium.nix {};
   tests.cjdns = callTest tests/cjdns.nix {};
   tests.containers = callTest tests/containers.nix {};
   tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; });
diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix
index 6c61087760dd..974af6888b69 100644
--- a/nixos/tests/chromium.nix
+++ b/nixos/tests/chromium.nix
@@ -1,13 +1,10 @@
-import ./make-test.nix (
-{ pkgs
-, channelMap ? {
-    stable = pkgs.chromium;
-    #beta   = pkgs.chromiumBeta;
-    #dev    = pkgs.chromiumDev;
-  }
-, ...
-}: rec {
-  name = "chromium";
+{ system ? builtins.currentSystem }:
+
+with import ../lib/testing.nix { inherit system; };
+with pkgs.lib;
+
+mapAttrs (channel: chromiumPkg: makeTest rec {
+  name = "chromium-${channel}";
   meta = with pkgs.stdenv.lib.maintainers; {
     maintainers = [ aszlig ];
   };
@@ -16,6 +13,7 @@ import ./make-test.nix (
 
   machine.imports = [ ./common/x11.nix ];
   machine.virtualisation.memorySize = 2047;
+  machine.environment.systemPackages = [ chromiumPkg ];
 
   startupHTML = pkgs.writeText "chromium-startup.html" ''
     <!DOCTYPE html>
@@ -105,74 +103,65 @@ import ./make-test.nix (
       closeWin;
     }
 
-    sub chromiumTest {
-      my ($channel, $pkg, $code) = @_;
-      $machine->waitForX;
+    $machine->waitForX;
 
-      my $url = "file://${startupHTML}";
-      my $args = "--user-data-dir=/tmp/chromium-$channel";
-      $machine->execute(
-        "ulimit -c unlimited; ".
-        "$pkg/bin/chromium $args \"$url\" & disown"
-      );
-      $machine->waitForText(qr/Type to search or enter a URL to navigate/);
-      $machine->waitUntilSucceeds("${xdo "check-startup" ''
-        search --sync --onlyvisible --name "startup done"
-        # close first start help popup
-        key -delay 1000 Escape
+    my $url = "file://${startupHTML}";
+    my $args = "--user-data-dir=/tmp/chromium-${channel}";
+    $machine->execute(
+      "ulimit -c unlimited; ".
+      "chromium $args \"$url\" & disown"
+    );
+    $machine->waitForText(qr/Type to search or enter a URL to navigate/);
+    $machine->waitUntilSucceeds("${xdo "check-startup" ''
+      search --sync --onlyvisible --name "startup done"
+      # close first start help popup
+      key -delay 1000 Escape
+      windowfocus --sync
+      windowactivate --sync
+    ''}");
+
+    createAndWaitForNewWin;
+    $machine->screenshot("empty_windows");
+    closeWin;
+
+    $machine->screenshot("startup_done");
+
+    testNewWin "check sandbox", sub {
+      $machine->succeed("${xdo "type-url" ''
+        search --sync --onlyvisible --name "new tab"
         windowfocus --sync
-        windowactivate --sync
+        type --delay 1000 "chrome://sandbox"
       ''}");
 
-      createAndWaitForNewWin;
-      $machine->screenshot($channel."_emptywin");
-      closeWin;
+      $machine->succeed("${xdo "submit-url" ''
+        search --sync --onlyvisible --name "new tab"
+        windowfocus --sync
+        key --delay 1000 Return
+      ''}");
 
-      $machine->screenshot($channel."_startup_done");
+      $machine->screenshot("sandbox_info");
 
-      subtest("Chromium $channel", $code);
+      $machine->succeed("${xdo "submit-url" ''
+        search --sync --onlyvisible --name "sandbox status"
+        windowfocus --sync
+      ''}");
+      $machine->succeed("${xdo "submit-url" ''
+        key --delay 1000 Ctrl+a Ctrl+c
+      ''}");
 
-      $machine->shutdown;
-    }
+      my $clipboard = $machine->succeed("${pkgs.xclip}/bin/xclip -o");
+      die "sandbox not working properly: $clipboard"
+      unless $clipboard =~ /namespace sandbox.*yes/mi
+          && $clipboard =~ /pid namespaces.*yes/mi
+          && $clipboard =~ /network namespaces.*yes/mi
+          && $clipboard =~ /seccomp.*sandbox.*yes/mi
+          && $clipboard =~ /you are adequately sandboxed/mi;
+    };
 
-    for (${let
-      mkArray = name: pkg: "[\"${name}\", \"${pkg}\"]";
-      chanArrays = pkgs.lib.mapAttrsToList mkArray channelMap;
-    in pkgs.lib.concatStringsSep ", " chanArrays}) {
-      my ($channel, $pkg) = @$_;
-      chromiumTest $channel, $pkg, sub {
-        testNewWin "check sandbox", sub {
-          $machine->succeed("${xdo "type-url" ''
-            search --sync --onlyvisible --name "new tab"
-            windowfocus --sync
-            type --delay 1000 "chrome://sandbox"
-          ''}");
-
-          $machine->succeed("${xdo "submit-url" ''
-            search --sync --onlyvisible --name "new tab"
-            windowfocus --sync
-            key --delay 1000 Return
-          ''}");
-
-          $machine->screenshot($channel."_sandbox");
-
-          $machine->succeed("${xdo "submit-url" ''
-            search --sync --onlyvisible --name "sandbox status"
-            windowfocus --sync
-          ''}");
-          $machine->succeed("${xdo "submit-url" ''
-            key --delay 1000 Ctrl+a Ctrl+c
-          ''}");
-
-          my $clipboard = $machine->succeed("${pkgs.xclip}/bin/xclip -o");
-          die "sandbox not working properly: $clipboard"
-          unless $clipboard =~ /namespace sandbox.*yes/mi
-              && $clipboard =~ /pid namespaces.*yes/mi
-              && $clipboard =~ /network namespaces.*yes/mi
-              && $clipboard =~ /seccomp.*sandbox.*yes/mi
-              && $clipboard =~ /you are adequately sandboxed/mi;
-        };
-      };
-    }
+    $machine->shutdown;
   '';
-})
+}) {
+  stable = pkgs.chromium;
+  beta   = pkgs.chromiumBeta;
+  dev    = pkgs.chromiumDev;
+}

From a3119bd35dbaad51b11abcae5cc4e83fb510ca69 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Tue, 1 Mar 2016 00:19:27 +0000
Subject: [PATCH 2038/2285] bats: fixes installation

The build was failing with:

  /...-stdenv/setup: ./install.sh: /usr/bin/env: bad interpreter: No such file
  or directory

See https://hydra.nixos.org/build/32353411/log
---
 pkgs/development/interpreters/bats/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/interpreters/bats/default.nix b/pkgs/development/interpreters/bats/default.nix
index 4eb86460be9a..bf262d4f050a 100644
--- a/pkgs/development/interpreters/bats/default.nix
+++ b/pkgs/development/interpreters/bats/default.nix
@@ -9,6 +9,8 @@ stdenv.mkDerivation rec {
     sha256 = "05xpvfm0xky1532i3hd2l3wznxzh99bv2hxgykwdpxh18h6jr6jm";
   };
 
+  patchPhase = "patchShebangs ./install.sh";
+
   installPhase = "./install.sh $out";
 
   meta = with stdenv.lib; {

From d085a649c231f48e4b7f58c0f10d609fd76a7389 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Mon, 29 Feb 2016 12:47:12 -0600
Subject: [PATCH 2039/2285] openal: fix darwin builds

---
 pkgs/development/libraries/openal-soft/default.nix | 9 ++++++---
 pkgs/top-level/all-packages.nix                    | 4 +++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/openal-soft/default.nix b/pkgs/development/libraries/openal-soft/default.nix
index ff29b2741fbd..4a466ad133ac 100644
--- a/pkgs/development/libraries/openal-soft/default.nix
+++ b/pkgs/development/libraries/openal-soft/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, cmake
-, alsaSupport ? true, alsaLib ? null
-, pulseSupport ? true, libpulseaudio ? null
+, alsaSupport ? !stdenv.isDarwin, alsaLib ? null
+, pulseSupport ? !stdenv.isDarwin, libpulseaudio ? null
+, CoreServices, AudioUnit, AudioToolbox
 }:
 
 with stdenv.lib;
@@ -19,7 +20,8 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ cmake ]
     ++ optional alsaSupport alsaLib
-    ++ optional pulseSupport libpulseaudio;
+    ++ optional pulseSupport libpulseaudio
+    ++ optional stdenv.isDarwin [ CoreServices AudioUnit AudioToolbox ];
 
   NIX_LDFLAGS = []
     ++ optional alsaSupport "-lasound"
@@ -30,5 +32,6 @@ stdenv.mkDerivation rec {
     homepage = http://kcat.strangesoft.net/openal.html;
     license = licenses.lgpl2;
     maintainers = with maintainers; [ftrvxmtrx];
+    platforms = platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d014ba393406..ed5bf87643d3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8221,7 +8221,9 @@ let
   oniguruma = callPackage ../development/libraries/oniguruma { };
 
   openal = openalSoft;
-  openalSoft = callPackage ../development/libraries/openal-soft { };
+  openalSoft = callPackage ../development/libraries/openal-soft {
+    inherit (darwin.apple_sdk.frameworks) CoreServices AudioUnit AudioToolbox;
+  };
 
   openbabel = callPackage ../development/libraries/openbabel { };
 

From 202ebf794cbd5ea293170f71999bc4e8f788779e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Tue, 1 Mar 2016 11:01:00 +0100
Subject: [PATCH 2040/2285] vm/rpm/rpm-closure.pl: make it deterministic

Some recent perl version introduced "keys" to return the keys
in random order. As some of the packages are solved by "provides" and
based on the order, this randomness affects what packages get into the
closure.

This problem may be in other nix perl scripts.
---
 pkgs/build-support/vm/rpm/rpm-closure.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/vm/rpm/rpm-closure.pl b/pkgs/build-support/vm/rpm/rpm-closure.pl
index 8f7669d6fef8..6442cd91a957 100644
--- a/pkgs/build-support/vm/rpm/rpm-closure.pl
+++ b/pkgs/build-support/vm/rpm/rpm-closure.pl
@@ -90,7 +90,7 @@ for (my $i = 0; $i < scalar(@packagesFiles); $i++) {
 }
 
 my %provides;
-PKG: foreach my $pkgName (keys %pkgs) {
+PKG: foreach my $pkgName (sort(keys %pkgs)) {
     #print STDERR "looking at $pkgName\n";
     my $pkg = $pkgs{$pkgName};
 

From a110c8d52b5156717010655dce344bd8b107eae7 Mon Sep 17 00:00:00 2001
From: "Ricardo M. Correia" <rcorreia@wizy.org>
Date: Tue, 1 Mar 2016 11:59:00 +0100
Subject: [PATCH 2041/2285] perl-MooseX-Role-WithOverloading: fix hash

The version had been updated, but the hash hadn't.
---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 7cae676f8297..41e46f32342c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -8147,7 +8147,7 @@ let self = _self // overrides; _self = with self; {
     name = "MooseX-Role-WithOverloading-0.17";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
-      sha256 = "01mqpvbz7yw993918hgp72vl22i6mgicpq5b3zrrsp6vl8sqj2sw";
+      sha256 = "0rb8k0dp1a55bm2pr6r0vsi5msvjl1dslfidxp1gj80j7zbrbc4j";
     };
     buildInputs = [ TestCheckDeps TestNoWarnings ModuleMetadata];
     propagatedBuildInputs = [ aliased Moose namespaceautoclean namespaceclean ];

From b2889efff29ea316e66083e590ba22327b851e33 Mon Sep 17 00:00:00 2001
From: Luca Bruno <lethalman88@gmail.com>
Date: Tue, 1 Mar 2016 12:50:23 +0100
Subject: [PATCH 2042/2285] devhelp: fix build with new webkitgtk

---
 pkgs/desktops/gnome-3/3.18/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-3/3.18/default.nix b/pkgs/desktops/gnome-3/3.18/default.nix
index 8234d21f39e9..11e2c7e9bebc 100644
--- a/pkgs/desktops/gnome-3/3.18/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/default.nix
@@ -312,9 +312,7 @@ let
 
   anjuta = callPackage ./devtools/anjuta { };
 
-  devhelp = callPackage ./devtools/devhelp {
-    webkitgtk = webkitgtk24x;
-  };
+  devhelp = callPackage ./devtools/devhelp { };
 
   gdl = callPackage ./devtools/gdl { };
 

From c8e55671cd85a7468a726eb0bc2d127b61aaa4f4 Mon Sep 17 00:00:00 2001
From: Sander van der Burg <svanderburg@gmail.com>
Date: Tue, 1 Mar 2016 12:29:31 +0000
Subject: [PATCH 2043/2285] nodejs-4_x: bump to version 4.3.1

---
 pkgs/development/web/nodejs/v4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v4.nix b/pkgs/development/web/nodejs/v4.nix
index 04dbd1b1a27b..629864b6e0b5 100644
--- a/pkgs/development/web/nodejs/v4.nix
+++ b/pkgs/development/web/nodejs/v4.nix
@@ -7,7 +7,7 @@
 assert stdenv.system != "armv5tel-linux";
 
 let
-  version = "4.3.0";
+  version = "4.3.1";
 
   deps = {
     inherit openssl zlib libuv;
@@ -31,7 +31,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "1f86jy71mi01g4xd411l5w8pi80nlk6sz7d2c0ghdk83v734ll0q";
+    sha256 = "0wzf5sirbph5kaik3pm9i2dxbjwqh5qlnqn71azrsv0vhs7dbqk1";
   };
 
   configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];

From 75f361f4c9af5a53d6591d2272c78318550ee3a9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Mar 2016 13:50:31 +0100
Subject: [PATCH 2044/2285] Revert "all-packages: Rewrite packageOverrides to
 use fix'/extends"

This reverts commit 9c0121be81fa8c5e6b5f7bd23326dd76d22e5d0b. I don't
know what this change does and I don't have time to review it at the
moment, sorry.
---
 pkgs/top-level/all-packages.nix | 96 ++++++++++++++++++---------------
 1 file changed, 54 insertions(+), 42 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e75686e4eb7c..804230e05b09 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -64,7 +64,7 @@ let
       # { /* the config */ } and
       # { pkgs, ... } : { /* the config */ }
       if builtins.isFunction configExpr
-        then configExpr { pkgs = pkgsFinal; }
+        then configExpr { inherit pkgs; }
         else configExpr;
 
   # Allow setting the platform in the config file. Otherwise, let's use a reasonable default (pc)
@@ -83,38 +83,51 @@ let
   platform = if platform_ != null then platform_
     else config.platform or platformAuto;
 
-  # The complete set of packages, after applying the overrides
-  pkgsFinal = lib.fix' (lib.extends configOverrides (lib.extends stdenvOverrides pkgsFun));
+  # Helper functions that are exported through `pkgs'.
+  helperFunctions =
+    stdenvAdapters //
+    (import ../build-support/trivial-builders.nix { inherit lib; inherit (pkgs) stdenv; inherit (pkgs.xorg) lndir; });
 
-  stdenvOverrides =
-    # We don't want stdenv overrides in the case of cross-building,
-    # or otherwise the basic overrided packages will not be built
-    # with the crossStdenv adapter.
-    if crossSystem == null
-      then self: super: lib.optionalAttrs (super.stdenv ? overrides) (super.stdenv.overrides super)
-      else self: super: {};
+  stdenvAdapters =
+    import ../stdenv/adapters.nix pkgs;
 
-  # Packages can be overriden globally via the `packageOverrides'
+
+  # Allow packages to be overriden globally via the `packageOverrides'
   # configuration option, which must be a function that takes `pkgs'
   # as an argument and returns a set of new or overriden packages.
-  # The recommended usage follows this snippet:
-  #   packageOverrides = super: let self = super.pkgs in ...
-  # `super' is the *original* (un-overriden) set of packages,
-  # while `self' refers to the final (overriden) set of packages.
-  configOverrides =
-      if config ? packageOverrides && bootStdenv == null # don't apply config overrides in stdenv boot
-        then self: config.packageOverrides
-        else self: super: {};
+  # The `packageOverrides' function is called with the *original*
+  # (un-overriden) set of packages, allowing packageOverrides
+  # attributes to refer to the original attributes (e.g. "foo =
+  # ... pkgs.foo ...").
+  pkgs = applyGlobalOverrides (config.packageOverrides or (pkgs: {}));
+
+  mkOverrides = pkgsOrig: overrides: overrides //
+        (lib.optionalAttrs (pkgsOrig.stdenv ? overrides && crossSystem == null) (pkgsOrig.stdenv.overrides pkgsOrig));
+
+  # Return the complete set of packages, after applying the overrides
+  # returned by the `overrider' function (see above).  Warning: this
+  # function is very expensive!
+  applyGlobalOverrides = overrider:
+    let
+      # Call the overrider function.  We don't want stdenv overrides
+      # in the case of cross-building, or otherwise the basic
+      # overrided packages will not be built with the crossStdenv
+      # adapter.
+      overrides = mkOverrides pkgsOrig (overrider pkgsOrig);
+
+      # The un-overriden packages, passed to `overrider'.
+      pkgsOrig = pkgsFun pkgs {};
+
+      # The overriden, final packages.
+      pkgs = pkgsFun pkgs overrides;
+    in pkgs;
+
 
   # The package compositions.  Yes, this isn't properly indented.
-  pkgsFun = pkgs:
-    let defaultScope = pkgs // pkgs.xorg;
-        helperFunctions = pkgs_.stdenvAdapters // pkgs_.trivial-builders;
-        pkgsRet = helperFunctions // pkgs_;
-        pkgs_ = with pkgs; {
-  # Helper functions that are exported through `pkgs'.
-  trivial-builders = import ../build-support/trivial-builders.nix { inherit lib; inherit stdenv; inherit (xorg) lndir; };
-  stdenvAdapters = import ../stdenv/adapters.nix pkgs;
+  pkgsFun = pkgs: overrides:
+    with helperFunctions;
+    let defaultScope = pkgs // pkgs.xorg; self = self_ // overrides;
+    self_ = with self; helperFunctions // {
 
   # Make some arguments passed to all-packages.nix available
   inherit system platform;
@@ -144,7 +157,11 @@ let
   #
   # The result is `pkgs' where all the derivations depending on `foo'
   # will use the new version.
-  overridePackages = f: lib.fix' (lib.extends f pkgs.__unfix__);
+  overridePackages = f:
+    let
+      newpkgs = pkgsFun newpkgs overrides;
+      overrides = mkOverrides pkgs (f newpkgs pkgs);
+    in newpkgs;
 
   # Override system. This is useful to build i686 packages on x86_64-linux.
   forceSystem = system: kernel: (import ./all-packages.nix) {
@@ -166,7 +183,7 @@ let
 
 
   ### Helper functions.
-  inherit lib config;
+  inherit lib config stdenvAdapters;
 
   inherit (lib) lowPrio hiPrio appendToName makeOverridable;
   inherit (misc) versionedDerivation;
@@ -197,8 +214,7 @@ let
     allPackages = args: import ./all-packages.nix ({ inherit config system; } // args);
   };
 
-  # We use pkgs_ because accessing pkgs would lead to an infinite recursion in stdenvOverrides
-  defaultStdenv = pkgs_.allStdenvs.stdenv // { inherit platform; };
+  defaultStdenv = allStdenvs.stdenv // { inherit platform; };
 
   stdenvCross = lowPrio (makeStdenvCross defaultStdenv crossSystem binutilsCross gccCrossStageFinal);
 
@@ -218,7 +234,7 @@ let
             };
           }
       else
-        pkgs_.defaultStdenv;
+        defaultStdenv;
 
   forceNativeDrv = drv : if crossSystem == null then drv else
     (drv // { crossDrv = drv.nativeDrv; });
@@ -5988,8 +6004,8 @@ let
   gotty = goPackages.gotty.bin // { outputs = [ "bin" ]; };
 
   gradleGen = callPackage ../development/tools/build-managers/gradle { };
-  gradle = gradleGen.gradleLatest;
-  gradle25 = gradleGen.gradle25;
+  gradle = self.gradleGen.gradleLatest;
+  gradle25 = self.gradleGen.gradle25;
 
   gperf = callPackage ../development/tools/misc/gperf { };
 
@@ -11824,7 +11840,7 @@ let
       AppKit Carbon Cocoa IOKit OSAKit Quartz QuartzCore WebKit
       ImageCaptureCore GSS ImageIO;
   });
-  emacs24Macport = emacs24Macport_24_5;
+  emacs24Macport = self.emacs24Macport_24_5;
 
   emacs25pre = lowPrio (callPackage ../applications/editors/emacs-25 {
     # use override to enable additional features
@@ -16200,13 +16216,12 @@ let
 
   mg = callPackage ../applications/editors/mg { };
 
-};
-# end pkgs_ =
+}; # self_ =
 
 
   ### Deprecated aliases - for backward compatibility
 
-aliases = with pkgs; {
+aliases = with self; rec {
   accounts-qt = qt5.accounts-qt;  # added 2015-12-19
   adobeReader = adobe-reader;
   aircrackng = aircrack-ng; # added 2016-01-14
@@ -16295,7 +16310,4 @@ tweakAlias = _n: alias: with lib;
     removeAttrs alias ["recurseForDerivations"]
   else alias;
 
-in lib.mapAttrs tweakAlias aliases // pkgsRet;
-# end pkgsFun
-
-in pkgsFinal
+in lib.mapAttrs tweakAlias aliases // self; in pkgs

From 7eb15265d3cfa493dd8e839d10c512d4b9d97b7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carles=20Pag=C3=A8s?= <page@cubata.homelinux.net>
Date: Tue, 1 Mar 2016 13:52:30 +0100
Subject: [PATCH 2045/2285] kodiPlugins.pvr-hts: 2.1.18 -> 2.2.13

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

diff --git a/pkgs/applications/video/kodi/plugins.nix b/pkgs/applications/video/kodi/plugins.nix
index 34b454ddcddd..96c47a15ef1c 100644
--- a/pkgs/applications/video/kodi/plugins.nix
+++ b/pkgs/applications/video/kodi/plugins.nix
@@ -215,13 +215,13 @@ in
   pvr-hts = (mkKodiPlugin rec {
     plugin = "pvr-hts";
     namespace = "pvr.hts";
-    version = "2.1.18";
+    version = "2.2.13";
 
     src = fetchFromGitHub {
       owner = "kodi-pvr";
       repo = "pvr.hts";
-      rev = "016b0b3251d6d5bffaf68baf59010e4347759c4a";
-      sha256 = "03lhxipz03r516pycabqc9b89kd7wih3c2dr4p602bk64bsmpi0j";
+      rev = "3274354511e970e2101c2aa437001b2f245f80da";
+      sha256 = "0i7cb61pjv6vbj3x96cm1n4w91mvc8z6lxa8ykjasrrbi95ph7ld";
     };
 
     meta = with stdenv.lib; {

From e5069c1be590df367f9f2e3085bc238cf053d285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 1 Mar 2016 14:13:02 +0100
Subject: [PATCH 2046/2285] rethinkdb: patch for glibc 2.23

---
 pkgs/servers/nosql/rethinkdb/default.nix      |   2 +
 pkgs/servers/nosql/rethinkdb/glibc-2.23.patch | 111 ++++++++++++++++++
 2 files changed, 113 insertions(+)
 create mode 100644 pkgs/servers/nosql/rethinkdb/glibc-2.23.patch

diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix
index 4566a6702069..f1b57546c7d7 100644
--- a/pkgs/servers/nosql/rethinkdb/default.nix
+++ b/pkgs/servers/nosql/rethinkdb/default.nix
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "0zs07g7arrrvm85mqbkffyzgd255qawn64r6iqdws25lj1kq2qim";
   };
 
+  patches = [ ./glibc-2.23.patch ];
+
   postPatch = stdenv.lib.optionalString stdenv.isDarwin ''
     sed -i 's/raise.*No Xcode or CLT version detected.*/version = "7.0.0"/' external/v8_3.30.33.16/build/gyp/pylib/gyp/xcode_emulation.py
 
diff --git a/pkgs/servers/nosql/rethinkdb/glibc-2.23.patch b/pkgs/servers/nosql/rethinkdb/glibc-2.23.patch
new file mode 100644
index 000000000000..818ea1245648
--- /dev/null
+++ b/pkgs/servers/nosql/rethinkdb/glibc-2.23.patch
@@ -0,0 +1,111 @@
+From 84be09f314c4cbf88b4ac8fe9dbff1d36f0f5781 Mon Sep 17 00:00:00 2001
+From: Daniel Mewes <daniel@rethinkdb.com>
+Date: Fri, 5 Feb 2016 18:45:28 -0800
+Subject: [PATCH] Alpinelinux compilation fixes
+
+by @clandmeter
+---
+ src/containers/buffer_group.hpp                            |  1 +
+ src/containers/printf_buffer.hpp                           |  1 +
+ src/errors.cc                                              |  2 +-
+ src/rdb_protocol/geo/s2/util/math/exactfloat/exactfloat.cc |  4 ++--
+ src/rdb_protocol/geo/s2/util/math/mathlimits.h             | 12 ++++++------
+ src/threading.hpp                                          |  2 ++
+ 6 files changed, 13 insertions(+), 9 deletions(-)
+
+diff --git a/src/containers/buffer_group.hpp b/src/containers/buffer_group.hpp
+index 865c5cb..0403db6 100644
+--- a/src/containers/buffer_group.hpp
++++ b/src/containers/buffer_group.hpp
+@@ -3,6 +3,7 @@
+ #define CONTAINERS_BUFFER_GROUP_HPP_
+ 
+ #include <stdlib.h>
++#include <sys/types.h>
+ #include <unistd.h>
+ #include <vector>
+ 
+diff --git a/src/containers/printf_buffer.hpp b/src/containers/printf_buffer.hpp
+index b7a5154..76959f3 100644
+--- a/src/containers/printf_buffer.hpp
++++ b/src/containers/printf_buffer.hpp
+@@ -5,6 +5,7 @@
+ #include <stdarg.h>
+ #include <stdio.h>
+ #include <string.h>
++#include <sys/types.h>
+ 
+ // Cannot include utils.hpp, we are included by utils.hpp.
+ #include "errors.hpp"
+diff --git a/src/errors.cc b/src/errors.cc
+index d40c04f..39efc9f 100644
+--- a/src/errors.cc
++++ b/src/errors.cc
+@@ -89,7 +89,7 @@ void report_fatal_error(const char *file, int line, const char *msg, ...) {
+ }
+ 
+ const char *errno_string_maybe_using_buffer(int errsv, char *buf, size_t buflen) {
+-#ifdef _GNU_SOURCE
++#ifdef __GLIBC__
+     return strerror_r(errsv, buf, buflen);
+ #elif defined(_WIN32)
+     UNUSED errno_t res = strerror_s(buf, buflen, errsv);
+diff --git a/src/rdb_protocol/geo/s2/util/math/exactfloat/exactfloat.cc b/src/rdb_protocol/geo/s2/util/math/exactfloat/exactfloat.cc
+index 3b07392..aa1a1d3 100644
+--- a/src/rdb_protocol/geo/s2/util/math/exactfloat/exactfloat.cc
++++ b/src/rdb_protocol/geo/s2/util/math/exactfloat/exactfloat.cc
+@@ -110,9 +110,9 @@ static int BN_ext_count_low_zero_bits(const BIGNUM* bn) {
+ ExactFloat::ExactFloat(double v) {
+   BN_init(&bn_);
+   sign_ = signbit(v) ? -1 : 1;
+-  if (isnan(v)) {
++  if (std::isnan(v)) {
+     set_nan();
+-  } else if (isinf(v)) {
++  } else if (std::isinf(v)) {
+     set_inf(sign_);
+   } else {
+     // The following code is much simpler than messing about with bit masks,
+diff --git a/src/rdb_protocol/geo/s2/util/math/mathlimits.h b/src/rdb_protocol/geo/s2/util/math/mathlimits.h
+index 5148422..86af72d 100644
+--- a/src/rdb_protocol/geo/s2/util/math/mathlimits.h
++++ b/src/rdb_protocol/geo/s2/util/math/mathlimits.h
+@@ -14,7 +14,7 @@
+ #define UTIL_MATH_MATHLIMITS_H__
+ 
+ #include <string.h>
+-#include <math.h>
++#include <cmath>
+ #include <cfloat>
+ 
+ #include "rdb_protocol/geo/s2/base/basictypes.h"
+@@ -195,11 +195,11 @@ DECL_UNSIGNED_INT_LIMITS(unsigned long long int)
+   static bool IsNegInf(const Type x) { return _fpclass(x) == _FPCLASS_NINF; }
+ #else
+ #define DECL_FP_LIMIT_FUNCS \
+-  static bool IsFinite(const Type x) { return !isinf(x)  &&  !isnan(x); } \
+-  static bool IsNaN(const Type x) { return isnan(x); } \
+-  static bool IsInf(const Type x) { return isinf(x); } \
+-  static bool IsPosInf(const Type x) { return isinf(x)  &&  x > 0; } \
+-  static bool IsNegInf(const Type x) { return isinf(x)  &&  x < 0; }
++  static bool IsFinite(const Type x) { return !std::isinf(x)  &&  !std::isnan(x); } \
++  static bool IsNaN(const Type x) { return std::isnan(x); } \
++  static bool IsInf(const Type x) { return std::isinf(x); } \
++  static bool IsPosInf(const Type x) { return std::isinf(x)  &&  x > 0; } \
++  static bool IsNegInf(const Type x) { return std::isinf(x)  &&  x < 0; }
+ #endif
+ 
+ // We can't put floating-point constant values in the header here because
+diff --git a/src/threading.hpp b/src/threading.hpp
+index 14fc6a8..9bf033f 100644
+--- a/src/threading.hpp
++++ b/src/threading.hpp
+@@ -1,6 +1,8 @@
+ #ifndef THREADING_HPP_
+ #define THREADING_HPP_
+ 
++#include <sys/types.h>
++#include <unistd.h>
+ #include <functional>
+ #include <vector>
+ 

From 976657a71f96d9b7cdd09e96c8d1e844a74ce4d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 1 Mar 2016 14:31:33 +0100
Subject: [PATCH 2047/2285] openspades: fix build

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

diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix
index df987b3f856c..475a844c1aba 100644
--- a/pkgs/games/openspades/default.nix
+++ b/pkgs/games/openspades/default.nix
@@ -12,6 +12,13 @@ stdenv.mkDerivation rec {
     sha256 = "1aa848cck8qrp67ha9vrkzm3k24r2aiv1v4dxla6pi22rw98yxzm";
   };
 
+  # https://github.com/yvt/openspades/issues/354
+  postPatch = ''
+    substituteInPlace Sources/Client/Client_Input.cpp --replace "isnan(" "std::isnan("
+    substituteInPlace Sources/Client/Corpse.cpp --replace "isnan(" "std::isnan("
+    substituteInPlace Sources/Draw/SWMapRenderer.cpp --replace "isnan(" "std::isnan(" --replace "isinf(" "std::isinf("
+  '';
+
   nativeBuildInputs = 
     with stdenv.lib;
     [ cmake curl glew makeWrapper mesa SDL2 SDL2_image unzip wget zlib ]

From 82fa1a796b1e8be27e5c02bc00c6cdba06b26693 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Tue, 1 Mar 2016 15:26:01 +0100
Subject: [PATCH 2048/2285] lib/copyPathToStore: annotate docstring

---
 pkgs/build-support/trivial-builders.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/build-support/trivial-builders.nix b/pkgs/build-support/trivial-builders.nix
index 6cd82adf8e70..93b8b1cbc428 100644
--- a/pkgs/build-support/trivial-builders.nix
+++ b/pkgs/build-support/trivial-builders.nix
@@ -157,6 +157,9 @@ rec {
       '';
 
   # Copy a path to the Nix store.
+  # Nix automatically copies files to the store before stringifying paths.
+  # If you need the store path of a file, ${copyPathToStore <path>} can be
+  # shortened to ${<path>}.
   copyPathToStore = builtins.filterSource (p: t: true);
 
   # Copy a list of paths to the Nix store.

From ac687200e3945ca70bd9170d8ac8b46b8b9d1206 Mon Sep 17 00:00:00 2001
From: Allan Espinosa <allan.espinosa@outlook.com>
Date: Sat, 26 Sep 2015 13:00:22 +0900
Subject: [PATCH 2049/2285] nexus: init at 2.12.0-01

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

diff --git a/pkgs/development/tools/repository-managers/nexus/default.nix b/pkgs/development/tools/repository-managers/nexus/default.nix
new file mode 100644
index 000000000000..1b2f48b696c3
--- /dev/null
+++ b/pkgs/development/tools/repository-managers/nexus/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, makeWrapper, jre }:
+stdenv.mkDerivation rec {
+  name = "nexus-${version}";
+  version = "2.12.0-01";
+
+  src = fetchurl {
+    url = "https://sonatype-download.global.ssl.fastly.net/nexus/oss/nexus-${version}-bundle.tar.gz";
+    sha256 = "1k3z7kwcmr1pxaxfnak99fq5s8br9zbqbfpyw1afi86ykkph4g5z";
+  };
+
+  sourceRoot = name;
+
+  buildInputs = [ makeWrapper ];
+
+  installPhase = 
+    ''
+      mkdir -p $out
+      cp -rfv * $out
+      rm -fv $out/bin/nexus.bat
+    '';
+
+  meta = with stdenv.lib; {
+    description = "Repository manager for binary software components";
+    homepage = http://www.sonatype.org/nexus;
+    license = licenses.epl10;
+    platforms = platforms.all;
+    maintainers = [ maintainers.aespinosa ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 804230e05b09..931a7c413ca2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6112,6 +6112,8 @@ let
       pythonPackages = python3Packages;
   };
 
+  nexus = callPackage ../development/tools/repository-managers/nexus { };
+
   node_webkit = node_webkit_0_9;
 
   nwjs_0_12 = callPackage ../development/tools/node-webkit/nw12.nix {

From 98d8e1a160d3138e9ef3a51f727b04315ab9e285 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 1 Mar 2016 10:36:00 -0600
Subject: [PATCH 2050/2285] kde5: consolidate packages into desktops/kde-5

---
 .gitignore                                    |  4 +--
 .../kde-5/applications-15.12}/ark.nix         |  0
 .../applications-15.12}/baloo-widgets.nix     |  0
 .../kde-5/applications-15.12}/default.nix     |  0
 .../applications-15.12}/dolphin-plugins.nix   |  0
 .../kde-5/applications-15.12}/dolphin.nix     |  0
 .../kde-5/applications-15.12}/fetchsrcs.sh    |  0
 .../applications-15.12}/ffmpegthumbs.nix      |  0
 .../kde-5/applications-15.12}/filelight.nix   |  0
 .../kde-5/applications-15.12}/gpgmepp.nix     |  0
 .../kde-5/applications-15.12}/gwenview.nix    |  0
 .../kde-5/applications-15.12}/kate.nix        |  0
 .../kde-5/applications-15.12}/kcalc.nix       |  0
 .../kde-5/applications-15.12}/kde-app.nix     |  0
 .../applications-15.12}/kde-locale-4.nix      |  0
 .../applications-15.12}/kde-locale-5.nix      |  0
 .../kdegraphics-thumbnailers.nix              |  0
 .../0001-old-kde4-cmake-policies.patch        |  0
 .../kdelibs/0002-polkit-install-path.patch    |  0
 .../kdelibs/0003-remove_xdg_impurities.patch  |  0
 .../applications-15.12}/kdelibs/default.nix   |  0
 .../applications-15.12}/kdelibs/setup-hook.sh |  0
 .../kdenetwork-filesharing.nix                |  0
 .../kde-5/applications-15.12}/kgpg.nix        |  0
 .../kde-5/applications-15.12}/kio-extras.nix  |  0
 .../kde-5/applications-15.12}/konsole.nix     |  0
 .../kde-5/applications-15.12}/l10n.nix        |  0
 .../kde-5/applications-15.12}/libkdcraw.nix   |  0
 .../kde-5/applications-15.12}/libkexiv2.nix   |  0
 .../kde-5/applications-15.12}/libkipi.nix     |  0
 .../kde-5/applications-15.12}/okular.nix      |  0
 .../applications-15.12}/print-manager.nix     |  0
 .../kde-5/applications-15.12}/spectacle.nix   |  0
 .../kde-5/applications-15.12}/srcs.nix        |  0
 .../kde-5/frameworks-5.19}/attica.nix         |  0
 .../kde-5/frameworks-5.19}/baloo.nix          |  0
 .../kde-5/frameworks-5.19}/bluez-qt.nix       |  0
 .../kde-5/frameworks-5.19}/breeze-icons.nix   |  0
 .../kde-5/frameworks-5.19}/default.nix        |  0
 .../0001-extra-cmake-modules-paths.patch      |  0
 .../extra-cmake-modules/default.nix           |  0
 .../extra-cmake-modules/setup-hook.sh         |  0
 .../kde-5/frameworks-5.19}/fetchsrcs.sh       |  0
 .../frameworks-5.19}/frameworkintegration.nix |  0
 .../kde-5/frameworks-5.19}/kactivities.nix    |  0
 .../kde-5/frameworks-5.19}/kapidox.nix        |  0
 .../kde-5/frameworks-5.19}/karchive.nix       |  0
 .../kde-5/frameworks-5.19}/kauth/default.nix  |  0
 .../kauth/kauth-policy-install.patch          |  0
 .../kde-5/frameworks-5.19}/kbookmarks.nix     |  0
 .../0001-qdiriterator-follow-symlinks.patch   |  0
 .../frameworks-5.19}/kcmutils/default.nix     |  0
 .../kde-5/frameworks-5.19}/kcodecs.nix        |  0
 .../kde-5/frameworks-5.19}/kcompletion.nix    |  0
 .../kde-5/frameworks-5.19}/kconfig.nix        |  0
 .../0001-qdiriterator-follow-symlinks.patch   |  0
 .../kconfigwidgets/default.nix                |  0
 .../kde-5/frameworks-5.19}/kcoreaddons.nix    |  0
 .../kde-5/frameworks-5.19}/kcrash.nix         |  0
 .../kde-5/frameworks-5.19}/kdbusaddons.nix    |  0
 .../kde-5/frameworks-5.19}/kdeclarative.nix   |  0
 .../kde-5/frameworks-5.19}/kded.nix           |  0
 .../frameworks-5.19}/kdelibs4support.nix      |  0
 .../frameworks-5.19}/kdesignerplugin.nix      |  0
 .../kde-5/frameworks-5.19}/kdesu.nix          |  0
 .../kde-5/frameworks-5.19}/kdewebkit.nix      |  0
 .../kde-5/frameworks-5.19}/kdnssd.nix         |  0
 .../frameworks-5.19}/kdoctools/default.nix    |  0
 .../kdoctools-no-find-docbook-xml.patch       |  0
 .../frameworks-5.19}/kdoctools/setup-hook.sh  |  0
 .../kde-5/frameworks-5.19}/kemoticons.nix     |  0
 .../kde-5/frameworks-5.19}/kfilemetadata.nix  |  0
 .../kde-5/frameworks-5.19}/kglobalaccel.nix   |  0
 .../kde-5/frameworks-5.19}/kguiaddons.nix     |  0
 .../kde-5/frameworks-5.19}/khtml.nix          |  0
 .../kde-5/frameworks-5.19}/ki18n.nix          |  0
 .../kiconthemes/default-theme-breeze.patch    |  0
 .../frameworks-5.19}/kiconthemes/default.nix  |  0
 .../kde-5/frameworks-5.19}/kiconthemes/series |  0
 .../kde-5/frameworks-5.19}/kidletime.nix      |  0
 .../kde-5/frameworks-5.19}/kimageformats.nix  |  0
 .../kinit/0001-kinit-libpath.patch            |  0
 .../kde-5/frameworks-5.19}/kinit/default.nix  |  0
 .../kde-5/frameworks-5.19}/kio/default.nix    |  0
 .../kio/samba-search-path.patch               |  0
 .../kde-5/frameworks-5.19}/kio/series         |  0
 .../kde-5/frameworks-5.19}/kitemmodels.nix    |  0
 .../kde-5/frameworks-5.19}/kitemviews.nix     |  0
 .../kde-5/frameworks-5.19}/kjobwidgets.nix    |  0
 .../kde-5/frameworks-5.19}/kjs.nix            |  0
 .../kde-5/frameworks-5.19}/kjsembed.nix       |  0
 .../kde-5/frameworks-5.19}/kmediaplayer.nix   |  0
 .../kde-5/frameworks-5.19}/knewstuff.nix      |  0
 .../kde-5/frameworks-5.19}/knotifications.nix |  0
 .../kde-5/frameworks-5.19}/knotifyconfig.nix  |  0
 .../kpackage/allow-external-paths.patch       |  0
 .../frameworks-5.19}/kpackage/default.nix     |  0
 .../qdiriterator-follow-symlinks.patch        |  0
 .../kde-5/frameworks-5.19}/kpackage/series    |  0
 .../kde-5/frameworks-5.19}/kparts.nix         |  0
 .../kde-5/frameworks-5.19}/kpeople.nix        |  0
 .../kde-5/frameworks-5.19}/kplotting.nix      |  0
 .../kde-5/frameworks-5.19}/kpty.nix           |  0
 .../kde-5/frameworks-5.19}/kross.nix          |  0
 .../kde-5/frameworks-5.19}/krunner.nix        |  0
 .../0001-qdiriterator-follow-symlinks.patch   |  0
 .../kservice/0002-no-canonicalize-path.patch  |  0
 .../frameworks-5.19}/kservice/default.nix     |  0
 .../frameworks-5.19}/kservice/setup-hook.sh   |  0
 .../frameworks-5.19}/ktexteditor/default.nix  |  0
 .../ktexteditor/no-qcoreapplication.patch     |  0
 .../kde-5/frameworks-5.19}/ktexteditor/series |  0
 .../kde-5/frameworks-5.19}/ktextwidgets.nix   |  0
 .../frameworks-5.19}/kunitconversion.nix      |  0
 .../kde-5/frameworks-5.19}/kwallet.nix        |  0
 .../kde-5/frameworks-5.19}/kwidgetsaddons.nix |  0
 .../kde-5/frameworks-5.19}/kwindowsystem.nix  |  0
 .../kde-5/frameworks-5.19}/kxmlgui.nix        |  0
 .../kde-5/frameworks-5.19}/kxmlrpcclient.nix  |  0
 .../frameworks-5.19}/modemmanager-qt.nix      |  0
 .../frameworks-5.19}/networkmanager-qt.nix    |  0
 .../kde-5/frameworks-5.19}/oxygen-icons5.nix  |  0
 .../plasma-framework/default.nix              |  0
 .../kde-5/frameworks-5.19}/solid.nix          |  0
 .../kde-5/frameworks-5.19}/sonnet.nix         |  0
 .../kde-5/frameworks-5.19}/srcs.nix           |  0
 .../kde-5/frameworks-5.19}/threadweaver.nix   |  0
 .../{ => kde-5}/plasma-5.5/bluedevil.nix      |  0
 .../{ => kde-5}/plasma-5.5/breeze-gtk.nix     |  0
 .../{ => kde-5}/plasma-5.5/breeze-qt4.nix     |  0
 .../{ => kde-5}/plasma-5.5/breeze-qt5.nix     |  0
 .../{ => kde-5}/plasma-5.5/default.nix        |  0
 .../{ => kde-5}/plasma-5.5/fetchsrcs.sh       |  0
 .../{ => kde-5}/plasma-5.5/kde-cli-tools.nix  |  0
 .../kde-gtk-config/0001-follow-symlinks.patch |  0
 .../plasma-5.5/kde-gtk-config/default.nix     |  0
 .../{ => kde-5}/plasma-5.5/kdecoration.nix    |  0
 .../plasma-5.5/kdeplasma-addons.nix           |  0
 .../{ => kde-5}/plasma-5.5/kgamma5.nix        |  0
 .../{ => kde-5}/plasma-5.5/khelpcenter.nix    |  0
 .../{ => kde-5}/plasma-5.5/khotkeys.nix       |  0
 .../{ => kde-5}/plasma-5.5/kinfocenter.nix    |  0
 .../{ => kde-5}/plasma-5.5/kmenuedit.nix      |  0
 .../{ => kde-5}/plasma-5.5/kscreen.nix        |  0
 .../{ => kde-5}/plasma-5.5/kscreenlocker.nix  |  0
 .../{ => kde-5}/plasma-5.5/ksshaskpass.nix    |  0
 .../{ => kde-5}/plasma-5.5/ksysguard.nix      |  0
 .../{ => kde-5}/plasma-5.5/kwayland.nix       |  0
 .../0001-qdiriterator-follow-symlinks.patch   |  0
 .../{ => kde-5}/plasma-5.5/kwin/default.nix   |  0
 .../{ => kde-5}/plasma-5.5/kwrited.nix        |  0
 .../plasma-5.5/libkscreen/default.nix         |  0
 .../0001-qdiriterator-follow-symlinks.patch   |  0
 .../plasma-5.5/libksysguard/default.nix       |  0
 .../desktops/{ => kde-5}/plasma-5.5/milou.nix |  0
 .../{ => kde-5}/plasma-5.5/oxygen.nix         |  0
 .../0001-qt-5.5-QML-import-paths.patch        |  0
 .../plasma-desktop/0002-hwclock.patch         |  0
 .../plasma-desktop/0003-tzdir.patch           |  0
 .../plasma-5.5/plasma-desktop/default.nix     |  0
 .../plasma-5.5/plasma-mediacenter.nix         |  0
 ...-mobile-broadband-provider-info-path.patch |  0
 .../plasma-5.5/plasma-nm/default.nix          |  0
 .../{ => kde-5}/plasma-5.5/plasma-pa.nix      |  0
 .../plasma-workspace-wallpapers.nix           |  0
 .../plasma-5.5/plasma-workspace/default.nix   |  0
 .../plasma-workspace/qml-import-path.patch    |  0
 .../plasma-5.5/plasma-workspace/series        |  0
 .../plasma-workspace/startkde.patch           |  0
 .../plasma-5.5/polkit-kde-agent.nix           |  0
 .../{ => kde-5}/plasma-5.5/powerdevil.nix     |  0
 .../{ => kde-5}/plasma-5.5/setup-hook.sh      |  0
 pkgs/desktops/{ => kde-5}/plasma-5.5/srcs.nix |  0
 .../{ => kde-5}/plasma-5.5/systemsettings.nix |  0
 pkgs/top-level/all-packages.nix               | 30 ++++++++++++-------
 175 files changed, 21 insertions(+), 13 deletions(-)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/ark.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/baloo-widgets.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/default.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/dolphin-plugins.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/dolphin.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/fetchsrcs.sh (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/ffmpegthumbs.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/filelight.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/gpgmepp.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/gwenview.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kate.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kcalc.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kde-app.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kde-locale-4.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kde-locale-5.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdegraphics-thumbnailers.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/0001-old-kde4-cmake-policies.patch (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/0002-polkit-install-path.patch (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/0003-remove_xdg_impurities.patch (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/default.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/setup-hook.sh (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdenetwork-filesharing.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kgpg.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kio-extras.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/konsole.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/l10n.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/libkdcraw.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/libkexiv2.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/libkipi.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/okular.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/print-manager.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/spectacle.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/srcs.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/attica.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/baloo.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/bluez-qt.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/breeze-icons.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/extra-cmake-modules/0001-extra-cmake-modules-paths.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/extra-cmake-modules/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/extra-cmake-modules/setup-hook.sh (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/fetchsrcs.sh (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/frameworkintegration.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kactivities.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kapidox.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/karchive.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kauth/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kauth/kauth-policy-install.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kbookmarks.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcmutils/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcmutils/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcodecs.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcompletion.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kconfig.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kconfigwidgets/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcoreaddons.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcrash.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdbusaddons.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdeclarative.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kded.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdelibs4support.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdesignerplugin.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdesu.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdewebkit.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdnssd.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdoctools/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdoctools/kdoctools-no-find-docbook-xml.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdoctools/setup-hook.sh (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kemoticons.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kfilemetadata.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kglobalaccel.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kguiaddons.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/khtml.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ki18n.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kiconthemes/default-theme-breeze.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kiconthemes/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kiconthemes/series (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kidletime.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kimageformats.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kinit/0001-kinit-libpath.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kinit/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kio/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kio/samba-search-path.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kio/series (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kitemmodels.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kitemviews.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kjobwidgets.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kjs.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kjsembed.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kmediaplayer.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/knewstuff.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/knotifications.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/knotifyconfig.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpackage/allow-external-paths.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpackage/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpackage/qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpackage/series (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kparts.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpeople.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kplotting.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpty.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kross.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/krunner.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kservice/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kservice/0002-no-canonicalize-path.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kservice/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kservice/setup-hook.sh (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ktexteditor/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ktexteditor/no-qcoreapplication.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ktexteditor/series (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ktextwidgets.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kunitconversion.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kwallet.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kwidgetsaddons.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kwindowsystem.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kxmlgui.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kxmlrpcclient.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/modemmanager-qt.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/networkmanager-qt.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/oxygen-icons5.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/plasma-framework/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/solid.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/sonnet.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/srcs.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/threadweaver.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/bluedevil.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/breeze-gtk.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/breeze-qt4.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/breeze-qt5.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/fetchsrcs.sh (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kde-cli-tools.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kde-gtk-config/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kdecoration.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kdeplasma-addons.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kgamma5.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/khelpcenter.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/khotkeys.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kinfocenter.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kmenuedit.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kscreen.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kscreenlocker.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/ksshaskpass.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/ksysguard.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kwayland.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kwin/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kwrited.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/libkscreen/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/libksysguard/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/milou.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/oxygen.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-desktop/0002-hwclock.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-desktop/0003-tzdir.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-desktop/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-mediacenter.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-nm/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-pa.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace-wallpapers.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace/qml-import-path.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace/series (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace/startkde.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/polkit-kde-agent.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/powerdevil.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/setup-hook.sh (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/srcs.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/systemsettings.nix (100%)

diff --git a/.gitignore b/.gitignore
index 74de941b7685..dba957f76620 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,5 @@ result-*
 
 .DS_Store
 
-/pkgs/applications/kde-apps-*/tmp/
-/pkgs/development/libraries/kde-frameworks-*/tmp/
 /pkgs/development/libraries/qt-5/*/tmp/
-/pkgs/desktops/plasma-*/tmp/
\ No newline at end of file
+/pkgs/desktops/kde-5/*/tmp/
\ No newline at end of file
diff --git a/pkgs/applications/kde-apps-15.12/ark.nix b/pkgs/desktops/kde-5/applications-15.12/ark.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/ark.nix
rename to pkgs/desktops/kde-5/applications-15.12/ark.nix
diff --git a/pkgs/applications/kde-apps-15.12/baloo-widgets.nix b/pkgs/desktops/kde-5/applications-15.12/baloo-widgets.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/baloo-widgets.nix
rename to pkgs/desktops/kde-5/applications-15.12/baloo-widgets.nix
diff --git a/pkgs/applications/kde-apps-15.12/default.nix b/pkgs/desktops/kde-5/applications-15.12/default.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/default.nix
rename to pkgs/desktops/kde-5/applications-15.12/default.nix
diff --git a/pkgs/applications/kde-apps-15.12/dolphin-plugins.nix b/pkgs/desktops/kde-5/applications-15.12/dolphin-plugins.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/dolphin-plugins.nix
rename to pkgs/desktops/kde-5/applications-15.12/dolphin-plugins.nix
diff --git a/pkgs/applications/kde-apps-15.12/dolphin.nix b/pkgs/desktops/kde-5/applications-15.12/dolphin.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/dolphin.nix
rename to pkgs/desktops/kde-5/applications-15.12/dolphin.nix
diff --git a/pkgs/applications/kde-apps-15.12/fetchsrcs.sh b/pkgs/desktops/kde-5/applications-15.12/fetchsrcs.sh
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/fetchsrcs.sh
rename to pkgs/desktops/kde-5/applications-15.12/fetchsrcs.sh
diff --git a/pkgs/applications/kde-apps-15.12/ffmpegthumbs.nix b/pkgs/desktops/kde-5/applications-15.12/ffmpegthumbs.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/ffmpegthumbs.nix
rename to pkgs/desktops/kde-5/applications-15.12/ffmpegthumbs.nix
diff --git a/pkgs/applications/kde-apps-15.12/filelight.nix b/pkgs/desktops/kde-5/applications-15.12/filelight.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/filelight.nix
rename to pkgs/desktops/kde-5/applications-15.12/filelight.nix
diff --git a/pkgs/applications/kde-apps-15.12/gpgmepp.nix b/pkgs/desktops/kde-5/applications-15.12/gpgmepp.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/gpgmepp.nix
rename to pkgs/desktops/kde-5/applications-15.12/gpgmepp.nix
diff --git a/pkgs/applications/kde-apps-15.12/gwenview.nix b/pkgs/desktops/kde-5/applications-15.12/gwenview.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/gwenview.nix
rename to pkgs/desktops/kde-5/applications-15.12/gwenview.nix
diff --git a/pkgs/applications/kde-apps-15.12/kate.nix b/pkgs/desktops/kde-5/applications-15.12/kate.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kate.nix
rename to pkgs/desktops/kde-5/applications-15.12/kate.nix
diff --git a/pkgs/applications/kde-apps-15.12/kcalc.nix b/pkgs/desktops/kde-5/applications-15.12/kcalc.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kcalc.nix
rename to pkgs/desktops/kde-5/applications-15.12/kcalc.nix
diff --git a/pkgs/applications/kde-apps-15.12/kde-app.nix b/pkgs/desktops/kde-5/applications-15.12/kde-app.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kde-app.nix
rename to pkgs/desktops/kde-5/applications-15.12/kde-app.nix
diff --git a/pkgs/applications/kde-apps-15.12/kde-locale-4.nix b/pkgs/desktops/kde-5/applications-15.12/kde-locale-4.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kde-locale-4.nix
rename to pkgs/desktops/kde-5/applications-15.12/kde-locale-4.nix
diff --git a/pkgs/applications/kde-apps-15.12/kde-locale-5.nix b/pkgs/desktops/kde-5/applications-15.12/kde-locale-5.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kde-locale-5.nix
rename to pkgs/desktops/kde-5/applications-15.12/kde-locale-5.nix
diff --git a/pkgs/applications/kde-apps-15.12/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-5/applications-15.12/kdegraphics-thumbnailers.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdegraphics-thumbnailers.nix
rename to pkgs/desktops/kde-5/applications-15.12/kdegraphics-thumbnailers.nix
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/0001-old-kde4-cmake-policies.patch b/pkgs/desktops/kde-5/applications-15.12/kdelibs/0001-old-kde4-cmake-policies.patch
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdelibs/0001-old-kde4-cmake-policies.patch
rename to pkgs/desktops/kde-5/applications-15.12/kdelibs/0001-old-kde4-cmake-policies.patch
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/0002-polkit-install-path.patch b/pkgs/desktops/kde-5/applications-15.12/kdelibs/0002-polkit-install-path.patch
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdelibs/0002-polkit-install-path.patch
rename to pkgs/desktops/kde-5/applications-15.12/kdelibs/0002-polkit-install-path.patch
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/0003-remove_xdg_impurities.patch b/pkgs/desktops/kde-5/applications-15.12/kdelibs/0003-remove_xdg_impurities.patch
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdelibs/0003-remove_xdg_impurities.patch
rename to pkgs/desktops/kde-5/applications-15.12/kdelibs/0003-remove_xdg_impurities.patch
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/default.nix b/pkgs/desktops/kde-5/applications-15.12/kdelibs/default.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdelibs/default.nix
rename to pkgs/desktops/kde-5/applications-15.12/kdelibs/default.nix
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/setup-hook.sh b/pkgs/desktops/kde-5/applications-15.12/kdelibs/setup-hook.sh
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdelibs/setup-hook.sh
rename to pkgs/desktops/kde-5/applications-15.12/kdelibs/setup-hook.sh
diff --git a/pkgs/applications/kde-apps-15.12/kdenetwork-filesharing.nix b/pkgs/desktops/kde-5/applications-15.12/kdenetwork-filesharing.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdenetwork-filesharing.nix
rename to pkgs/desktops/kde-5/applications-15.12/kdenetwork-filesharing.nix
diff --git a/pkgs/applications/kde-apps-15.12/kgpg.nix b/pkgs/desktops/kde-5/applications-15.12/kgpg.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kgpg.nix
rename to pkgs/desktops/kde-5/applications-15.12/kgpg.nix
diff --git a/pkgs/applications/kde-apps-15.12/kio-extras.nix b/pkgs/desktops/kde-5/applications-15.12/kio-extras.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kio-extras.nix
rename to pkgs/desktops/kde-5/applications-15.12/kio-extras.nix
diff --git a/pkgs/applications/kde-apps-15.12/konsole.nix b/pkgs/desktops/kde-5/applications-15.12/konsole.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/konsole.nix
rename to pkgs/desktops/kde-5/applications-15.12/konsole.nix
diff --git a/pkgs/applications/kde-apps-15.12/l10n.nix b/pkgs/desktops/kde-5/applications-15.12/l10n.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/l10n.nix
rename to pkgs/desktops/kde-5/applications-15.12/l10n.nix
diff --git a/pkgs/applications/kde-apps-15.12/libkdcraw.nix b/pkgs/desktops/kde-5/applications-15.12/libkdcraw.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/libkdcraw.nix
rename to pkgs/desktops/kde-5/applications-15.12/libkdcraw.nix
diff --git a/pkgs/applications/kde-apps-15.12/libkexiv2.nix b/pkgs/desktops/kde-5/applications-15.12/libkexiv2.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/libkexiv2.nix
rename to pkgs/desktops/kde-5/applications-15.12/libkexiv2.nix
diff --git a/pkgs/applications/kde-apps-15.12/libkipi.nix b/pkgs/desktops/kde-5/applications-15.12/libkipi.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/libkipi.nix
rename to pkgs/desktops/kde-5/applications-15.12/libkipi.nix
diff --git a/pkgs/applications/kde-apps-15.12/okular.nix b/pkgs/desktops/kde-5/applications-15.12/okular.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/okular.nix
rename to pkgs/desktops/kde-5/applications-15.12/okular.nix
diff --git a/pkgs/applications/kde-apps-15.12/print-manager.nix b/pkgs/desktops/kde-5/applications-15.12/print-manager.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/print-manager.nix
rename to pkgs/desktops/kde-5/applications-15.12/print-manager.nix
diff --git a/pkgs/applications/kde-apps-15.12/spectacle.nix b/pkgs/desktops/kde-5/applications-15.12/spectacle.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/spectacle.nix
rename to pkgs/desktops/kde-5/applications-15.12/spectacle.nix
diff --git a/pkgs/applications/kde-apps-15.12/srcs.nix b/pkgs/desktops/kde-5/applications-15.12/srcs.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/srcs.nix
rename to pkgs/desktops/kde-5/applications-15.12/srcs.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/attica.nix b/pkgs/desktops/kde-5/frameworks-5.19/attica.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/attica.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/attica.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix b/pkgs/desktops/kde-5/frameworks-5.19/baloo.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/baloo.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/baloo.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix b/pkgs/desktops/kde-5/frameworks-5.19/bluez-qt.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/bluez-qt.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix b/pkgs/desktops/kde-5/frameworks-5.19/breeze-icons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/breeze-icons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh
rename to pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh b/pkgs/desktops/kde-5/frameworks-5.19/fetchsrcs.sh
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh
rename to pkgs/desktops/kde-5/frameworks-5.19/fetchsrcs.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix b/pkgs/desktops/kde-5/frameworks-5.19/frameworkintegration.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/frameworkintegration.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix b/pkgs/desktops/kde-5/frameworks-5.19/kactivities.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kactivities.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix b/pkgs/desktops/kde-5/frameworks-5.19/kapidox.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kapidox.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix b/pkgs/desktops/kde-5/frameworks-5.19/karchive.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/karchive.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/karchive.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kauth/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kauth/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/kauth-policy-install.patch b/pkgs/desktops/kde-5/frameworks-5.19/kauth/kauth-policy-install.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kauth/kauth-policy-install.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kauth/kauth-policy-install.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix b/pkgs/desktops/kde-5/frameworks-5.19/kbookmarks.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kbookmarks.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcmutils/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kcmutils/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcodecs.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kcodecs.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcompletion.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kcompletion.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix b/pkgs/desktops/kde-5/frameworks-5.19/kconfig.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kconfig.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcoreaddons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kcoreaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcrash.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kcrash.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdbusaddons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdbusaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdeclarative.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdeclarative.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kded.nix b/pkgs/desktops/kde-5/frameworks-5.19/kded.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kded.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kded.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdesignerplugin.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdesignerplugin.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdesu.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdesu.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdewebkit.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdewebkit.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdnssd.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdnssd.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdoctools/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdoctools/setup-hook.sh
rename to pkgs/desktops/kde-5/frameworks-5.19/kdoctools/setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kemoticons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kemoticons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata.nix b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix b/pkgs/desktops/kde-5/frameworks-5.19/kglobalaccel.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kglobalaccel.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kguiaddons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kguiaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix b/pkgs/desktops/kde-5/frameworks-5.19/khtml.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/khtml.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/khtml.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix b/pkgs/desktops/kde-5/frameworks-5.19/ki18n.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/ki18n.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch b/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default-theme-breeze.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default-theme-breeze.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series b/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series
rename to pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix b/pkgs/desktops/kde-5/frameworks-5.19/kidletime.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kidletime.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix b/pkgs/desktops/kde-5/frameworks-5.19/kimageformats.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kimageformats.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch b/pkgs/desktops/kde-5/frameworks-5.19/kinit/0001-kinit-libpath.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kinit/0001-kinit-libpath.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kinit/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kinit/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kio/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kio/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch b/pkgs/desktops/kde-5/frameworks-5.19/kio/samba-search-path.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kio/samba-search-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/series b/pkgs/desktops/kde-5/frameworks-5.19/kio/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kio/series
rename to pkgs/desktops/kde-5/frameworks-5.19/kio/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix b/pkgs/desktops/kde-5/frameworks-5.19/kitemmodels.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kitemmodels.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix b/pkgs/desktops/kde-5/frameworks-5.19/kitemviews.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kitemviews.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix b/pkgs/desktops/kde-5/frameworks-5.19/kjobwidgets.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kjobwidgets.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix b/pkgs/desktops/kde-5/frameworks-5.19/kjs.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kjs.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kjs.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix b/pkgs/desktops/kde-5/frameworks-5.19/kjsembed.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kjsembed.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix b/pkgs/desktops/kde-5/frameworks-5.19/kmediaplayer.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kmediaplayer.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix b/pkgs/desktops/kde-5/frameworks-5.19/knewstuff.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/knewstuff.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix b/pkgs/desktops/kde-5/frameworks-5.19/knotifications.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/knotifications.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix b/pkgs/desktops/kde-5/frameworks-5.19/knotifyconfig.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/knotifyconfig.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/allow-external-paths.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kpackage/allow-external-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kpackage/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kpackage/series
rename to pkgs/desktops/kde-5/frameworks-5.19/kpackage/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix b/pkgs/desktops/kde-5/frameworks-5.19/kparts.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kparts.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kparts.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix b/pkgs/desktops/kde-5/frameworks-5.19/kpeople.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kpeople.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix b/pkgs/desktops/kde-5/frameworks-5.19/kplotting.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kplotting.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix b/pkgs/desktops/kde-5/frameworks-5.19/kpty.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kpty.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kpty.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kross.nix b/pkgs/desktops/kde-5/frameworks-5.19/kross.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kross.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kross.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix b/pkgs/desktops/kde-5/frameworks-5.19/krunner.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/krunner.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/krunner.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch b/pkgs/desktops/kde-5/frameworks-5.19/kservice/0002-no-canonicalize-path.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kservice/0002-no-canonicalize-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kservice/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kservice/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/kservice/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kservice/setup-hook.sh
rename to pkgs/desktops/kde-5/frameworks-5.19/kservice/setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch b/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/no-qcoreapplication.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/no-qcoreapplication.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series b/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series
rename to pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix b/pkgs/desktops/kde-5/frameworks-5.19/ktextwidgets.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/ktextwidgets.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix b/pkgs/desktops/kde-5/frameworks-5.19/kunitconversion.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kunitconversion.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix b/pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kwidgetsaddons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kwidgetsaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix b/pkgs/desktops/kde-5/frameworks-5.19/kwindowsystem.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kwindowsystem.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix b/pkgs/desktops/kde-5/frameworks-5.19/kxmlgui.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kxmlgui.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix b/pkgs/desktops/kde-5/frameworks-5.19/kxmlrpcclient.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kxmlrpcclient.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix b/pkgs/desktops/kde-5/frameworks-5.19/modemmanager-qt.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/modemmanager-qt.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix b/pkgs/desktops/kde-5/frameworks-5.19/networkmanager-qt.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/networkmanager-qt.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix b/pkgs/desktops/kde-5/frameworks-5.19/oxygen-icons5.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/oxygen-icons5.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/plasma-framework/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/plasma-framework/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/solid.nix b/pkgs/desktops/kde-5/frameworks-5.19/solid.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/solid.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/solid.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix b/pkgs/desktops/kde-5/frameworks-5.19/sonnet.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/sonnet.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix b/pkgs/desktops/kde-5/frameworks-5.19/srcs.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/srcs.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/srcs.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix b/pkgs/desktops/kde-5/frameworks-5.19/threadweaver.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/threadweaver.nix
diff --git a/pkgs/desktops/plasma-5.5/bluedevil.nix b/pkgs/desktops/kde-5/plasma-5.5/bluedevil.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/bluedevil.nix
rename to pkgs/desktops/kde-5/plasma-5.5/bluedevil.nix
diff --git a/pkgs/desktops/plasma-5.5/breeze-gtk.nix b/pkgs/desktops/kde-5/plasma-5.5/breeze-gtk.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/breeze-gtk.nix
rename to pkgs/desktops/kde-5/plasma-5.5/breeze-gtk.nix
diff --git a/pkgs/desktops/plasma-5.5/breeze-qt4.nix b/pkgs/desktops/kde-5/plasma-5.5/breeze-qt4.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/breeze-qt4.nix
rename to pkgs/desktops/kde-5/plasma-5.5/breeze-qt4.nix
diff --git a/pkgs/desktops/plasma-5.5/breeze-qt5.nix b/pkgs/desktops/kde-5/plasma-5.5/breeze-qt5.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/breeze-qt5.nix
rename to pkgs/desktops/kde-5/plasma-5.5/breeze-qt5.nix
diff --git a/pkgs/desktops/plasma-5.5/default.nix b/pkgs/desktops/kde-5/plasma-5.5/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/default.nix
diff --git a/pkgs/desktops/plasma-5.5/fetchsrcs.sh b/pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh
similarity index 100%
rename from pkgs/desktops/plasma-5.5/fetchsrcs.sh
rename to pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh
diff --git a/pkgs/desktops/plasma-5.5/kde-cli-tools.nix b/pkgs/desktops/kde-5/plasma-5.5/kde-cli-tools.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kde-cli-tools.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kde-cli-tools.nix
diff --git a/pkgs/desktops/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch
rename to pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch
diff --git a/pkgs/desktops/plasma-5.5/kde-gtk-config/default.nix b/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kde-gtk-config/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/default.nix
diff --git a/pkgs/desktops/plasma-5.5/kdecoration.nix b/pkgs/desktops/kde-5/plasma-5.5/kdecoration.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kdecoration.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kdecoration.nix
diff --git a/pkgs/desktops/plasma-5.5/kdeplasma-addons.nix b/pkgs/desktops/kde-5/plasma-5.5/kdeplasma-addons.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kdeplasma-addons.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kdeplasma-addons.nix
diff --git a/pkgs/desktops/plasma-5.5/kgamma5.nix b/pkgs/desktops/kde-5/plasma-5.5/kgamma5.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kgamma5.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kgamma5.nix
diff --git a/pkgs/desktops/plasma-5.5/khelpcenter.nix b/pkgs/desktops/kde-5/plasma-5.5/khelpcenter.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/khelpcenter.nix
rename to pkgs/desktops/kde-5/plasma-5.5/khelpcenter.nix
diff --git a/pkgs/desktops/plasma-5.5/khotkeys.nix b/pkgs/desktops/kde-5/plasma-5.5/khotkeys.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/khotkeys.nix
rename to pkgs/desktops/kde-5/plasma-5.5/khotkeys.nix
diff --git a/pkgs/desktops/plasma-5.5/kinfocenter.nix b/pkgs/desktops/kde-5/plasma-5.5/kinfocenter.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kinfocenter.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kinfocenter.nix
diff --git a/pkgs/desktops/plasma-5.5/kmenuedit.nix b/pkgs/desktops/kde-5/plasma-5.5/kmenuedit.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kmenuedit.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kmenuedit.nix
diff --git a/pkgs/desktops/plasma-5.5/kscreen.nix b/pkgs/desktops/kde-5/plasma-5.5/kscreen.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kscreen.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kscreen.nix
diff --git a/pkgs/desktops/plasma-5.5/kscreenlocker.nix b/pkgs/desktops/kde-5/plasma-5.5/kscreenlocker.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kscreenlocker.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kscreenlocker.nix
diff --git a/pkgs/desktops/plasma-5.5/ksshaskpass.nix b/pkgs/desktops/kde-5/plasma-5.5/ksshaskpass.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/ksshaskpass.nix
rename to pkgs/desktops/kde-5/plasma-5.5/ksshaskpass.nix
diff --git a/pkgs/desktops/plasma-5.5/ksysguard.nix b/pkgs/desktops/kde-5/plasma-5.5/ksysguard.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/ksysguard.nix
rename to pkgs/desktops/kde-5/plasma-5.5/ksysguard.nix
diff --git a/pkgs/desktops/plasma-5.5/kwayland.nix b/pkgs/desktops/kde-5/plasma-5.5/kwayland.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kwayland.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kwayland.nix
diff --git a/pkgs/desktops/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/plasma-5.5/kwin/default.nix b/pkgs/desktops/kde-5/plasma-5.5/kwin/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kwin/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kwin/default.nix
diff --git a/pkgs/desktops/plasma-5.5/kwrited.nix b/pkgs/desktops/kde-5/plasma-5.5/kwrited.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kwrited.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kwrited.nix
diff --git a/pkgs/desktops/plasma-5.5/libkscreen/default.nix b/pkgs/desktops/kde-5/plasma-5.5/libkscreen/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/libkscreen/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/libkscreen/default.nix
diff --git a/pkgs/desktops/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/plasma-5.5/libksysguard/default.nix b/pkgs/desktops/kde-5/plasma-5.5/libksysguard/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/libksysguard/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/libksysguard/default.nix
diff --git a/pkgs/desktops/plasma-5.5/milou.nix b/pkgs/desktops/kde-5/plasma-5.5/milou.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/milou.nix
rename to pkgs/desktops/kde-5/plasma-5.5/milou.nix
diff --git a/pkgs/desktops/plasma-5.5/oxygen.nix b/pkgs/desktops/kde-5/plasma-5.5/oxygen.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/oxygen.nix
rename to pkgs/desktops/kde-5/plasma-5.5/oxygen.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/0002-hwclock.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0002-hwclock.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-desktop/0002-hwclock.patch
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0002-hwclock.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/0003-tzdir.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0003-tzdir.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-desktop/0003-tzdir.patch
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0003-tzdir.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-desktop/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/default.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-mediacenter.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-mediacenter.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-mediacenter.nix
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-mediacenter.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-nm/default.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-nm/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-nm/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-nm/default.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-pa.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-pa.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-pa.nix
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-pa.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace-wallpapers.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace-wallpapers.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-workspace-wallpapers.nix
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-workspace-wallpapers.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-workspace/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/qml-import-path.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/qml-import-path.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-workspace/qml-import-path.patch
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/qml-import-path.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/series b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-workspace/series
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/startkde.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-workspace/startkde.patch
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch
diff --git a/pkgs/desktops/plasma-5.5/polkit-kde-agent.nix b/pkgs/desktops/kde-5/plasma-5.5/polkit-kde-agent.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/polkit-kde-agent.nix
rename to pkgs/desktops/kde-5/plasma-5.5/polkit-kde-agent.nix
diff --git a/pkgs/desktops/plasma-5.5/powerdevil.nix b/pkgs/desktops/kde-5/plasma-5.5/powerdevil.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/powerdevil.nix
rename to pkgs/desktops/kde-5/plasma-5.5/powerdevil.nix
diff --git a/pkgs/desktops/plasma-5.5/setup-hook.sh b/pkgs/desktops/kde-5/plasma-5.5/setup-hook.sh
similarity index 100%
rename from pkgs/desktops/plasma-5.5/setup-hook.sh
rename to pkgs/desktops/kde-5/plasma-5.5/setup-hook.sh
diff --git a/pkgs/desktops/plasma-5.5/srcs.nix b/pkgs/desktops/kde-5/plasma-5.5/srcs.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/srcs.nix
rename to pkgs/desktops/kde-5/plasma-5.5/srcs.nix
diff --git a/pkgs/desktops/plasma-5.5/systemsettings.nix b/pkgs/desktops/kde-5/plasma-5.5/systemsettings.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/systemsettings.nix
rename to pkgs/desktops/kde-5/plasma-5.5/systemsettings.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 804230e05b09..5b295d1d77ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15188,23 +15188,33 @@ let
 
   kde5 =
     let
-      frameworks = import ../development/libraries/kde-frameworks-5.19 { inherit pkgs; };
-      plasma = import ../desktops/plasma-5.5 { inherit pkgs; };
-      apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
-      named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; };
+      frameworks = import ../desktops/kde-5/frameworks-5.19 { inherit pkgs; };
+      plasma = import ../desktops/kde-5/plasma-5.5 { inherit pkgs; };
+      applications = import ../desktops/kde-5/applications-15.12 { inherit pkgs; };
       merged = self:
-        named self // frameworks self // plasma self // apps self // kde5PackagesFun self;
+        { plasma = plasma self;
+          frameworks = frameworks self;
+          applications = applications self; }
+        // frameworks self
+        // plasma self
+        // applications self
+        // kde5PackagesFun self;
     in
       recurseIntoAttrs (lib.makeScope qt55.newScope merged);
 
   kde5_latest =
     let
-      frameworks = import ../development/libraries/kde-frameworks-5.19 { inherit pkgs; };
-      plasma = import ../desktops/plasma-5.5 { inherit pkgs; };
-      apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
-      named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; };
+      frameworks = import ../desktops/kde-5/frameworks-5.19 { inherit pkgs; };
+      plasma = import ../desktops/kde-5/plasma-5.5 { inherit pkgs; };
+      applications = import ../desktops/kde-5/applications-15.12 { inherit pkgs; };
       merged = self:
-        named self // frameworks self // plasma self // apps self // kde5PackagesFun self;
+        { plasma = plasma self;
+          frameworks = frameworks self;
+          applications = applications self; }
+        // frameworks self
+        // plasma self
+        // applications self
+        // kde5PackagesFun self;
     in
       recurseIntoAttrs (lib.makeScope qt55.newScope merged);
 

From 1f89aa6c7f2f16c8c0834cfa65b8484fecd72af3 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Tue, 1 Mar 2016 19:02:36 +0100
Subject: [PATCH 2051/2285] nixos/tests: Remove tests.boot.boot* prefixes

As @bobvanderlinden suggests in #13585:

"Looks like that cleans things up quite a bit! Just one aesthetics note,
the boot tests could now be renamed from boot.bootBiosCdrom to
boot.biosCdrom in nixos/tests/boot.nix:L33.

That makes them more consistent with the other tests."

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/release-combined.nix | 2 +-
 nixos/tests/boot.nix       | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix
index 69cc357078d6..958e587444d8 100644
--- a/nixos/release-combined.nix
+++ b/nixos/release-combined.nix
@@ -63,7 +63,7 @@ in rec {
         (all nixos.tests.installer.btrfsSimple)
         (all nixos.tests.installer.btrfsSubvols)
         (all nixos.tests.installer.btrfsSubvolDefault)
-        (all nixos.tests.boot.bootBiosCdrom)
+        (all nixos.tests.boot.biosCdrom)
         (all nixos.tests.ipv6)
         (all nixos.tests.kde4)
         #(all nixos.tests.lightdm)
diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix
index 6a1d330155e1..905d16458825 100644
--- a/nixos/tests/boot.nix
+++ b/nixos/tests/boot.nix
@@ -30,17 +30,17 @@ let
         '';
     };
 in {
-    bootBiosCdrom = makeBootTest "bios-cdrom" ''
+    biosCdrom = makeBootTest "bios-cdrom" ''
         cdrom => glob("${iso}/iso/*.iso")
       '';
-    bootBiosUsb = makeBootTest "bios-usb" ''
+    biosUsb = makeBootTest "bios-usb" ''
         usb => glob("${iso}/iso/*.iso")
       '';
-    bootUefiCdrom = makeBootTest "uefi-cdrom" ''
+    uefiCdrom = makeBootTest "uefi-cdrom" ''
         cdrom => glob("${iso}/iso/*.iso"),
         bios => '${pkgs.OVMF}/FV/OVMF.fd'
       '';
-    bootUefiUsb = makeBootTest "uefi-usb" ''
+    uefiUsb = makeBootTest "uefi-usb" ''
         usb => glob("${iso}/iso/*.iso"),
         bios => '${pkgs.OVMF}/FV/OVMF.fd'
       '';

From 78602b68069711b5d9d5904d27f237119e171aae Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 1 Mar 2016 13:38:45 -0600
Subject: [PATCH 2052/2285] kde5.plasma: 5.5.4 -> 5.5.5

---
 pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh |   2 +-
 pkgs/desktops/kde-5/plasma-5.5/srcs.nix     | 304 ++++++++++----------
 2 files changed, 153 insertions(+), 153 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh b/pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh
index 714e0fc75097..d2b426b85d60 100755
--- a/pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh
+++ b/pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh
@@ -4,7 +4,7 @@
 set -x
 
 # The trailing slash at the end is necessary!
-RELEASE_URL="http://download.kde.org/stable/plasma/5.5.4/"
+RELEASE_URL="http://download.kde.org/stable/plasma/5.5.5/"
 EXTRA_WGET_ARGS='-A *.tar.xz'
 
 mkdir tmp; cd tmp
diff --git a/pkgs/desktops/kde-5/plasma-5.5/srcs.nix b/pkgs/desktops/kde-5/plasma-5.5/srcs.nix
index 3b63c864045d..40fe5618ff8c 100644
--- a/pkgs/desktops/kde-5/plasma-5.5/srcs.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/srcs.nix
@@ -3,307 +3,307 @@
 
 {
   bluedevil = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/bluedevil-5.5.4.tar.xz";
-      sha256 = "1r20dlsg83d3lrnbdb92cpd7h0s2fmh0vjv3xi5z6rf741463p14";
-      name = "bluedevil-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/bluedevil-5.5.5.tar.xz";
+      sha256 = "10fm3gf28c4hwy628z8wy82j6n00z6xf0vad52jahwzz98w5xy9l";
+      name = "bluedevil-5.5.5.tar.xz";
     };
   };
   breeze = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/breeze-5.5.4.tar.xz";
-      sha256 = "0chlp5z5zz19rh9k4ffjr92hn07dmavfcwx0wwffy8qhiw6qw7w3";
-      name = "breeze-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/breeze-5.5.5.tar.xz";
+      sha256 = "0xxfykg1gsr65jb8jmkk6qr991cvdfibpb9228kb16kpfn73k45l";
+      name = "breeze-5.5.5.tar.xz";
     };
   };
   breeze-gtk = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/breeze-gtk-5.5.4.tar.xz";
-      sha256 = "1r6ihmpgha1s4hvgr4jliqvbraw06fnaa4sjrhzqbx9dh00y5d8v";
-      name = "breeze-gtk-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/breeze-gtk-5.5.5.tar.xz";
+      sha256 = "047b5xrbpk2d1x1srxpx2j5sp0kjzfvgh1xaldirxpcla6jpjj65";
+      name = "breeze-gtk-5.5.5.tar.xz";
     };
   };
   discover = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/discover-5.5.4.tar.xz";
-      sha256 = "0d5s8b9f5az40ajviijc67rz5l2345wlrqacjm4pdi8fqvxivb1v";
-      name = "discover-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/discover-5.5.5.tar.xz";
+      sha256 = "0asbn69k4agr0jyw249bnw8xhi9hnj18asij0h1a8r5wlqbqj22a";
+      name = "discover-5.5.5.tar.xz";
     };
   };
   kde-cli-tools = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kde-cli-tools-5.5.4.tar.xz";
-      sha256 = "1w9l8lh05k6xjdz0nccfygp76lp3wf3xa6pizmgv27wq21pw4wxy";
-      name = "kde-cli-tools-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kde-cli-tools-5.5.5.tar.xz";
+      sha256 = "19iggnanlxz1j2xx9l2p7wwf1471yic9fyjfhhk0wfj2z3ickmsh";
+      name = "kde-cli-tools-5.5.5.tar.xz";
     };
   };
   kdecoration = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kdecoration-5.5.4.tar.xz";
-      sha256 = "1ghgvg0lfjjlgl3a9ryw1y8aqihdwrkr7qjph4v3p9brlpqm5326";
-      name = "kdecoration-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kdecoration-5.5.5.tar.xz";
+      sha256 = "0ix4jnqm5jpfdhgr6r8j1mwasics22i63hacd6h8gj5klhbgsqvc";
+      name = "kdecoration-5.5.5.tar.xz";
     };
   };
   kde-gtk-config = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kde-gtk-config-5.5.4.tar.xz";
-      sha256 = "062jgc2sqd93yz5n1z4n7h50k7zsiayi3z901y2rq0x62nndff1m";
-      name = "kde-gtk-config-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kde-gtk-config-5.5.5.tar.xz";
+      sha256 = "0b6xkpfy4da3vign82z186ghg61l6k9sisppmfgmy5ycqjp4yghq";
+      name = "kde-gtk-config-5.5.5.tar.xz";
     };
   };
   kdeplasma-addons = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kdeplasma-addons-5.5.4.tar.xz";
-      sha256 = "0yrrjkh632q3ns068j7avaf2rkn2n54sf594jyl30q5fxc22mhq1";
-      name = "kdeplasma-addons-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kdeplasma-addons-5.5.5.tar.xz";
+      sha256 = "1l327fi0x3vljkj7f3113ryynxrsk16qhn0vpsdxc7f169vf4isx";
+      name = "kdeplasma-addons-5.5.5.tar.xz";
     };
   };
   kgamma5 = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kgamma5-5.5.4.tar.xz";
-      sha256 = "0w63m1sxq2fa0wabyyry4prbzc2c54adc56hfhkh84rflccfbnc2";
-      name = "kgamma5-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kgamma5-5.5.5.tar.xz";
+      sha256 = "1597q98iw4dmkzm40525xlcjj3xfrgsmhp8djgm2yk92bjxy7ydj";
+      name = "kgamma5-5.5.5.tar.xz";
     };
   };
   khelpcenter = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/khelpcenter-5.5.4.tar.xz";
-      sha256 = "01kw97p1xz2gghghykkv953bvypcyd080fxknjrzn4v9gl5mrjv0";
-      name = "khelpcenter-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/khelpcenter-5.5.5.tar.xz";
+      sha256 = "04q5rj5g882qzdzvxxil6668x77iwvbpqx0z8jzm5z80x0xrg44p";
+      name = "khelpcenter-5.5.5.tar.xz";
     };
   };
   khotkeys = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/khotkeys-5.5.4.tar.xz";
-      sha256 = "1jlpzqrww2n9zf5cwlvpyvxcz0wv0cyln1xjhm49ayl5iin3m9yn";
-      name = "khotkeys-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/khotkeys-5.5.5.tar.xz";
+      sha256 = "12rrgs7slais8xagv3rn06him4qq21cahlb1yh3gpz571mhyl1nj";
+      name = "khotkeys-5.5.5.tar.xz";
     };
   };
   kinfocenter = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kinfocenter-5.5.4.tar.xz";
-      sha256 = "10qhq76ha1mahpmgrj4kw660zf92k7ys3mz2dkiid7ib6gsimir4";
-      name = "kinfocenter-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kinfocenter-5.5.5.tar.xz";
+      sha256 = "1j76cfpilhjy97541l90fm6nsamlwa4q4ap7hrp65cdwi5lb08c2";
+      name = "kinfocenter-5.5.5.tar.xz";
     };
   };
   kmenuedit = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kmenuedit-5.5.4.tar.xz";
-      sha256 = "0scsr3isf4d0hlk85pk0snn6j5cwm7qlqnl6iqs0df32g8ysirs6";
-      name = "kmenuedit-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kmenuedit-5.5.5.tar.xz";
+      sha256 = "010fdfp7kawwhvg76ypzq4rs047xkc2gxz3cfifaybiz5z1y4mdj";
+      name = "kmenuedit-5.5.5.tar.xz";
     };
   };
   kscreen = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kscreen-5.5.4.tar.xz";
-      sha256 = "0ax67gqfjw59jk3wh3sflk3q10xqrjwf2qmvx6jky6q2x4kdixvv";
-      name = "kscreen-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kscreen-5.5.5.tar.xz";
+      sha256 = "1a0fq2x30nnrq2r4slgmfziibbdjmbzh1n8q8ym1lj18j5zyhqcz";
+      name = "kscreen-5.5.5.tar.xz";
     };
   };
   kscreenlocker = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kscreenlocker-5.5.4.tar.xz";
-      sha256 = "18r53f5vri8xaj53zskadnxqxs60akxmwkq54xnb4lvg5cks9hrr";
-      name = "kscreenlocker-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kscreenlocker-5.5.5.tar.xz";
+      sha256 = "00sq4ddb30sxdp6br9h8r4rb07hra3vqv0kxvqfdr50hhcq8dbbw";
+      name = "kscreenlocker-5.5.5.tar.xz";
     };
   };
   ksshaskpass = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/ksshaskpass-5.5.4.tar.xz";
-      sha256 = "0hlgf7896qksivmf79ks0xcqndjvmmq13ywrkc0l43pcj50ydhj2";
-      name = "ksshaskpass-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/ksshaskpass-5.5.5.tar.xz";
+      sha256 = "0szw50wfwh8dvwm61m3azk96di6fr0ymvjhjqffy6ja41kslhp4a";
+      name = "ksshaskpass-5.5.5.tar.xz";
     };
   };
   ksysguard = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/ksysguard-5.5.4.tar.xz";
-      sha256 = "1hbq8ppz9ijkk032aldrxyfwk1yrpjchfy6w6mg836bi8f69i1kc";
-      name = "ksysguard-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/ksysguard-5.5.5.tar.xz";
+      sha256 = "020b5fkkj3baqg7clhkvpjhqp5xl0gdzyh75b19sx4ba3akpqx5m";
+      name = "ksysguard-5.5.5.tar.xz";
     };
   };
   kwallet-pam = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kwallet-pam-5.5.4.tar.xz";
-      sha256 = "0cj9iq7ba24lccgj3h4fpa97bcm3lw3yz43hfhldiwdkzl1pydhl";
-      name = "kwallet-pam-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kwallet-pam-5.5.5.tar.xz";
+      sha256 = "0dlkm1dm60fbnwdmfhiql6mkqrqkdpqi04qa6xxpccijb6h57h8r";
+      name = "kwallet-pam-5.5.5.tar.xz";
     };
   };
   kwayland = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kwayland-5.5.4.tar.xz";
-      sha256 = "1cprg187h8pny86910m08pzyvknbcqa9x3xbqh7flrpw0rvrg5wp";
-      name = "kwayland-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kwayland-5.5.5.tar.xz";
+      sha256 = "04p6m9fgllarh7l449injjn5426bqfjwyab0d739p0ys6kdm9hqh";
+      name = "kwayland-5.5.5.tar.xz";
     };
   };
   kwayland-integration = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kwayland-integration-5.5.4.tar.xz";
-      sha256 = "07vv7gjqgmgn766p6nifn2i835rdhs6kvp24a5fqnh8ad24m8fjy";
-      name = "kwayland-integration-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kwayland-integration-5.5.5.tar.xz";
+      sha256 = "1ijllnfxy5ackz6bbxffi31ibpsrmgg3abm74x1p2m6a5r4f6bj8";
+      name = "kwayland-integration-5.5.5.tar.xz";
     };
   };
   kwin = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kwin-5.5.4.tar.xz";
-      sha256 = "1015a0d3yi5b4isfkrl3w3mdslh0r1xyhvy9z8liz3wnxgrajwj8";
-      name = "kwin-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kwin-5.5.5.tar.xz";
+      sha256 = "1i79qq9p0rfz6gjjx9m1kjskrnh2kkpvkgp20cw8akn1cgi755vm";
+      name = "kwin-5.5.5.tar.xz";
     };
   };
   kwrited = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/kwrited-5.5.4.tar.xz";
-      sha256 = "01d8q3hj5frhmafsavgvyz2nlbd4ma4fsx12dhjyxqsgxdvvgffh";
-      name = "kwrited-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/kwrited-5.5.5.tar.xz";
+      sha256 = "17hq5jknqaqdf571m3ahdf3dwvphrmxj3jxgl5bhrb9zh5whjsi3";
+      name = "kwrited-5.5.5.tar.xz";
     };
   };
   libkscreen = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/libkscreen-5.5.4.tar.xz";
-      sha256 = "15q7x844x8cz15b3mkh4lwygvrx66s0fl706b221p3my54n63ymf";
-      name = "libkscreen-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/libkscreen-5.5.5.tar.xz";
+      sha256 = "1djv0h6vw4ijfsd281pxr3yxi24rjbg7kshpm6qhfn3gbhz7qbqv";
+      name = "libkscreen-5.5.5.tar.xz";
     };
   };
   libksysguard = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/libksysguard-5.5.4.tar.xz";
-      sha256 = "1irrb3im0gr8yhkp570bqipbqz8igpxr2k4kxb2c04111npkqmw1";
-      name = "libksysguard-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/libksysguard-5.5.5.tar.xz";
+      sha256 = "16ky6xmd60ga2a09kgd4111rhly1p26dv72xmda4n40zswd6k1j2";
+      name = "libksysguard-5.5.5.tar.xz";
     };
   };
   milou = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/milou-5.5.4.tar.xz";
-      sha256 = "0dc8jbk0yihqv5jxd4i12rmvfyyp63b6hx9q22qjrj5gkda1cddl";
-      name = "milou-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/milou-5.5.5.tar.xz";
+      sha256 = "1fzbni8lyrx858pd3b1365x84pmyjamxa5f56q2h3ahzdhb726l5";
+      name = "milou-5.5.5.tar.xz";
     };
   };
   oxygen = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/oxygen-5.5.4.tar.xz";
-      sha256 = "10fjwk1aznpkrnal961kfwpjjil2iy2n0x96h26bh91l4insix1v";
-      name = "oxygen-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/oxygen-5.5.5.tar.xz";
+      sha256 = "1hmzvpsh0rpp2aps77cs9w4fqdfa3y5fbq7mpx97sp2z072x6i12";
+      name = "oxygen-5.5.5.tar.xz";
     };
   };
   plasma-desktop = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/plasma-desktop-5.5.4.tar.xz";
-      sha256 = "0lkjgbqinxy40w6z01akpihljqpm7bachmxqmcp6fjnzawql2xqd";
-      name = "plasma-desktop-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/plasma-desktop-5.5.5.tar.xz";
+      sha256 = "12za7c6c28iccw0b7ccrwz0hj2pa71387334jdinl2a1f60xljb6";
+      name = "plasma-desktop-5.5.5.tar.xz";
     };
   };
   plasma-mediacenter = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/plasma-mediacenter-5.5.4.tar.xz";
-      sha256 = "1rn7qffd11dljx1il7cw74wbqf4lwmmlcv19yxj08fdrp5ylqr8a";
-      name = "plasma-mediacenter-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/plasma-mediacenter-5.5.5.tar.xz";
+      sha256 = "1yixqsajxf9jp5n16n0zg53iypmp9c114lbnhlr5ni1a0dqgfc8j";
+      name = "plasma-mediacenter-5.5.5.tar.xz";
     };
   };
   plasma-nm = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/plasma-nm-5.5.4.tar.xz";
-      sha256 = "0bjfcsavrqx4i4c0ynfmdna7fnmabm8970h3dnx7ihwsqgjf5q31";
-      name = "plasma-nm-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/plasma-nm-5.5.5.tar.xz";
+      sha256 = "0xffyfw1pb53h686lfc1v9k5f2p3mjqgzi49h6j46l2zxd2wi9w4";
+      name = "plasma-nm-5.5.5.tar.xz";
     };
   };
   plasma-pa = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/plasma-pa-5.5.4.tar.xz";
-      sha256 = "0d1cdixgxa2vsgv47hinh5nsbf2bln3ppdlrnzz9vglian0z7879";
-      name = "plasma-pa-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/plasma-pa-5.5.5.tar.xz";
+      sha256 = "1msmnci4id2qxj1453qizx3zsmdf2rpryy83c7j192izc25ry6sh";
+      name = "plasma-pa-5.5.5.tar.xz";
     };
   };
   plasma-sdk = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/plasma-sdk-5.5.4.tar.xz";
-      sha256 = "0fdx4f8z00276s1p1v1bkbrhy59jswk2dj8kcj96r2rk3xzcg0ax";
-      name = "plasma-sdk-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/plasma-sdk-5.5.5.tar.xz";
+      sha256 = "0301h0h1z5id0win0599qwhvxdxz6m881qadyzwxrvhysj3r1sd8";
+      name = "plasma-sdk-5.5.5.tar.xz";
     };
   };
   plasma-workspace = {
-    version = "5.5.4";
+    version = "5.5.5.1";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/plasma-workspace-5.5.4.tar.xz";
-      sha256 = "0zh96qq0nl1c6bni7vnciba548f3cjacsi06n2rv05356j1fp87h";
-      name = "plasma-workspace-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/plasma-workspace-5.5.5.1.tar.xz";
+      sha256 = "1grhw60rd5dl07fl0dr96fq6c6d7076k5m2hjg6w6w9ynb76sg6h";
+      name = "plasma-workspace-5.5.5.1.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/plasma-workspace-wallpapers-5.5.4.tar.xz";
-      sha256 = "0p111f95di11k4v19c1mg694c71825najmi8dzj2qrif5sb2vvsn";
-      name = "plasma-workspace-wallpapers-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/plasma-workspace-wallpapers-5.5.5.tar.xz";
+      sha256 = "01mrrz6y81ypsd33ldpcz1llj13faqmrip5fg9fxqf6vjbh7jlcp";
+      name = "plasma-workspace-wallpapers-5.5.5.tar.xz";
     };
   };
   polkit-kde-agent = {
-    version = "1-5.5.4";
+    version = "1-5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/polkit-kde-agent-1-5.5.4.tar.xz";
-      sha256 = "116sj9s45n3qcgfsdz5hh6a73b0hldgcnxbpvi4320xpny316vh2";
-      name = "polkit-kde-agent-1-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/polkit-kde-agent-1-5.5.5.tar.xz";
+      sha256 = "0pcwzb747gjp2s68i3apv5q2cfl3igkf1hsx0v1j1y7sk4diqkj9";
+      name = "polkit-kde-agent-1-5.5.5.tar.xz";
     };
   };
   powerdevil = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/powerdevil-5.5.4.tar.xz";
-      sha256 = "0i0i55g72yb9z8agv1yyrx98l3s0fs5wn51kz571vqqrw6m3wn7l";
-      name = "powerdevil-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/powerdevil-5.5.5.tar.xz";
+      sha256 = "1sb046pyir6x75r2gpqcq6765igpdc0hl9g5jams6j3l65ivzgvk";
+      name = "powerdevil-5.5.5.tar.xz";
     };
   };
   sddm-kcm = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/sddm-kcm-5.5.4.tar.xz";
-      sha256 = "04vh4f2hg5584acb5ywf1i8z6lvz0fcs7zh085bm7pkx5l60l59b";
-      name = "sddm-kcm-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/sddm-kcm-5.5.5.tar.xz";
+      sha256 = "0zpl6wfpgvmkf80aqn4b46wrpk1a81yz7srxcnw857xyhvw31m6g";
+      name = "sddm-kcm-5.5.5.tar.xz";
     };
   };
   systemsettings = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/systemsettings-5.5.4.tar.xz";
-      sha256 = "1i7ljxsnwf2kwd05kzxirbyaxj3w5kyr0jq9j0iy3jlz97p4jkpv";
-      name = "systemsettings-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/systemsettings-5.5.5.tar.xz";
+      sha256 = "183sb898f1452ljdk11k6wqy4dgzlgnicjlrygjfgvw9sz0vgn90";
+      name = "systemsettings-5.5.5.tar.xz";
     };
   };
   user-manager = {
-    version = "5.5.4";
+    version = "5.5.5";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.4/user-manager-5.5.4.tar.xz";
-      sha256 = "17lki4y77rq1n100p74q4n6sm3l5dxvv996wf4w1j2n2aiw89p4j";
-      name = "user-manager-5.5.4.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/user-manager-5.5.5.tar.xz";
+      sha256 = "1g9fm1i05mzmjs3c5fsg45pf8nd28vhh7g5awbpd397z586gr44y";
+      name = "user-manager-5.5.5.tar.xz";
     };
   };
 }

From 78b80ee635262ef39ca855bbfd3a348a93bdfee4 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Tue, 1 Mar 2016 19:41:09 +0000
Subject: [PATCH 2053/2285] girara: 0.2.4 -> 0.2.5

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

diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix
index e91e94695f5a..0b721b562b53 100644
--- a/pkgs/applications/misc/girara/default.nix
+++ b/pkgs/applications/misc/girara/default.nix
@@ -5,11 +5,11 @@ assert withBuildColors -> ncurses != null;
 with stdenv.lib;
 stdenv.mkDerivation rec {
   name = "girara-${version}";
-  version = "0.2.4";
+  version = "0.2.5";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/girara/download/${name}.tar.gz";
-    sha256 = "0pnfdsg435b5vc4x8l9pgm77aj7ram1q0bzrp9g4a3bh1r64xq1f";
+    sha256 = "14m8mfbck49ldwi1w2i47bbg5c9daglcmvz9v2g1hnrq8k8g5x2w";
   };
 
   preConfigure = ''

From cbf09c69362023abe0c6f3775de88ebbddf260d7 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Tue, 1 Mar 2016 19:41:31 +0000
Subject: [PATCH 2054/2285] zathura: 0.3.3 -> 0.3.5

---
 pkgs/applications/misc/zathura/core/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index cab6423b77e5..3a88409999fc 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -1,15 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, gtk, girara, ncurses, gettext, docutils, file, makeWrapper, zathura_icon, sqlite }:
+{ stdenv, fetchurl, pkgconfig, gtk, girara, ncurses, gettext, docutils, file, makeWrapper, zathura_icon, sqlite, glib }:
 
 stdenv.mkDerivation rec {
-  version = "0.3.3";
+  version = "0.3.5";
   name = "zathura-core-${version}";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/zathura/download/zathura-${version}.tar.gz";
-    sha256 = "1rywx09qn6ap5hb1z31wxby4lzdrqdbldm51pjk1ifflr37xwirk";
+    sha256 = "031kdr10065q14nixc4p58c4rgvrqcmn9x39b19h2357kzabaw9a";
   };
 
-  buildInputs = [ pkgconfig file gtk girara gettext makeWrapper sqlite ];
+  buildInputs = [ pkgconfig file gtk girara gettext makeWrapper sqlite glib ];
+
+  NIX_CFLAGS_COMPILE = "-I${glib}/include/gio-unix-2.0";
 
   makeFlags = [
     "PREFIX=$(out)"

From f3d94cfc23a2787772a369e2ca9e0cd94e72b8b3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Mar 2016 20:47:08 +0100
Subject: [PATCH 2055/2285] Revert "Add the tool "nixos-typecheck" that can
 check an option declaration to:"

This reverts commit cad8957eabcbf73062226d28366fd446c15c8737. It
breaks NixOps, but more importantly, such major changes to the module
system really need to be reviewed.
---
 lib/modules.nix                               |  99 ++------
 lib/options.nix                               | 145 ++----------
 lib/types.nix                                 | 221 ++++--------------
 nixos/default.nix                             |   2 -
 nixos/doc/manual/default.nix                  |   6 +-
 .../development/option-declarations.xml       | 106 +--------
 nixos/lib/eval-config.nix                     |  15 +-
 nixos/lib/typechecker.nix                     |  91 --------
 nixos/modules/config/i18n.nix                 |   1 -
 nixos/modules/config/sysctl.nix               |   1 -
 nixos/modules/installer/tools/nixos-option.sh |   4 +-
 .../installer/tools/nixos-typecheck.sh        |  52 -----
 nixos/modules/installer/tools/tools.nix       |   8 +-
 nixos/modules/misc/meta.nix                   |   1 -
 nixos/modules/misc/nixpkgs.nix                |  51 ++--
 nixos/modules/module-list.nix                 |   1 -
 nixos/modules/services/misc/gitlab.nix        |   3 -
 nixos/modules/services/misc/ihaskell.nix      |   4 -
 nixos/modules/services/misc/nixos-manual.nix  |   5 +-
 .../web-servers/apache-httpd/default.nix      |   3 +-
 .../services/x11/window-managers/xmonad.nix   |   3 -
 nixos/modules/system/boot/kernel.nix          |   1 -
 .../system/boot/systemd-unit-options.nix      |   5 +-
 nixos/release.nix                             |   2 -
 24 files changed, 127 insertions(+), 703 deletions(-)
 delete mode 100644 nixos/lib/typechecker.nix
 delete mode 100644 nixos/modules/installer/tools/nixos-typecheck.sh

diff --git a/lib/modules.nix b/lib/modules.nix
index d08dc9f85a25..12ec7004d1ee 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -23,6 +23,8 @@ rec {
                   specialArgs ? {}
                 , # This would be remove in the future, Prefer _module.args option instead.
                   args ? {}
+                , # This would be remove in the future, Prefer _module.check option instead.
+                  check ? true
                 }:
     let
       # This internal module declare internal options under the `_module'
@@ -43,22 +45,9 @@ rec {
           _module.check = mkOption {
             type = types.bool;
             internal = true;
-            default = true;
+            default = check;
             description = "Whether to check whether all option definitions have matching declarations.";
           };
-
-          _module.typeInference = mkOption {
-            type = types.nullOr types.str;
-            internal = true;
-            default = null; # TODO: Move away from 'null' after enough testing.
-            description = ''
-              Mode of type inferencing. Possible values are:
-              null = Disable type inferencing completely. Use 'types.unspecified' for every option without type definition.
-              "silent" = Try to infer type of option without type definition, but do not print anything.
-              "printUnspecified" = Try to infer type of option without type definition and print options for which no full type could be inferred.
-              "printAll" = Try to infer type of option without type definition and print all options without type definition.
-            '';
-          };
         };
 
         config = {
@@ -71,7 +60,7 @@ rec {
       # Note: the list of modules is reversed to maintain backward
       # compatibility with the old module system.  Not sure if this is
       # the most sensible policy.
-      options = mergeModules (config._module) prefix (reverseList closed);
+      options = mergeModules prefix (reverseList closed);
 
       # Traverse options and extract the option values into the final
       # config set.  At the same time, check whether all option
@@ -181,11 +170,11 @@ rec {
      At the same time, for each option declaration, it will merge the
      corresponding option definitions in all machines, returning them
      in the ‘value’ attribute of each option. */
-  mergeModules = _module: prefix: modules:
-    mergeModules' _module prefix modules
+  mergeModules = prefix: modules:
+    mergeModules' prefix modules
       (concatMap (m: map (config: { inherit (m) file; inherit config; }) (pushDownProperties m.config)) modules);
 
-  mergeModules' = _module: prefix: options: configs:
+  mergeModules' = prefix: options: configs:
     listToAttrs (map (name: {
       # We're descending into attribute ‘name’.
       inherit name;
@@ -211,8 +200,8 @@ rec {
             (filter (m: m.config ? ${name}) configs);
         in
           if nrOptions == length decls then
-            let opt = fixupOptionType _module.typeInference loc (mergeOptionDecls loc decls);
-            in evalOptionValue _module loc opt defns'
+            let opt = fixupOptionType loc (mergeOptionDecls loc decls);
+            in evalOptionValue loc opt defns'
           else if nrOptions != 0 then
             let
               firstOption = findFirst (m: isOption m.options) "" decls;
@@ -220,7 +209,7 @@ rec {
             in
               throw "The option `${showOption loc}' in `${firstOption.file}' is a prefix of options in `${firstNonOption.file}'."
           else
-            mergeModules' _module loc decls defns;
+            mergeModules' loc decls defns;
     }) (concatMap (m: attrNames m.options) options))
     // { _definedNames = map (m: { inherit (m) file; names = attrNames m.config; }) configs; };
 
@@ -269,7 +258,7 @@ rec {
 
   /* Merge all the definitions of an option to produce the final
      config value. */
-  evalOptionValue = _module: loc: opt: defs:
+  evalOptionValue = loc: opt: defs:
     let
       # Add in the default value for this option, if any.
       defs' =
@@ -281,7 +270,7 @@ rec {
         if opt.readOnly or false && length defs' > 1 then
           throw "The option `${showOption loc}' is read-only, but it's set multiple times."
         else
-          mergeDefinitions _module loc opt.type defs';
+          mergeDefinitions loc opt.type defs';
 
       # Check whether the option is defined, and apply the ‘apply’
       # function to the merged value.  This allows options to yield a
@@ -302,7 +291,7 @@ rec {
       };
 
   # Merge definitions of a value of a given type.
-  mergeDefinitions = _module: loc: type: defs: rec {
+  mergeDefinitions = loc: type: defs: rec {
     defsFinal =
       let
         # Process mkMerge and mkIf properties.
@@ -325,7 +314,7 @@ rec {
     mergedValue = foldl' (res: def:
       if type.check def.value then res
       else throw "The option value `${showOption loc}' in `${def.file}' is not a ${type.name}.")
-      (type.merge _module loc defsFinal) defsFinal;
+      (type.merge loc defsFinal) defsFinal;
 
     isDefined = defsFinal != [];
 
@@ -423,7 +412,7 @@ rec {
   /* Hack for backward compatibility: convert options of type
      optionSet to options of type submodule.  FIXME: remove
      eventually. */
-  fixupOptionType = typeInference: loc: opt:
+  fixupOptionType = loc: opt:
     let
       options = opt.options or
         (throw "Option `${showOption loc'}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}.");
@@ -435,66 +424,12 @@ rec {
         else if tp.name == "list of option sets" then types.listOf (types.submodule options)
         else if tp.name == "null or option set" then types.nullOr (types.submodule options)
         else tp;
-
     in
       if opt.type.getSubModules or null == null
-      then opt // { type = f (opt.type or (inferType typeInference loc opt)); }
+      then opt // { type = f (opt.type or types.unspecified); }
       else opt // { type = opt.type.substSubModules opt.options; options = []; };
 
 
-  /* Function that tries to infer the type of an option from the default value of the option. */
-  inferType = mode: loc: opt:
-    let
-      doc = x: elemAt x 0;
-      type = x: elemAt x 1;
-      containsUnspecified = x: elemAt x 2;
-      inferType' = def:
-        if isDerivation def then [ "package" types.package false ]
-        else if isBool def then [ "bool" types.bool false ]
-        else if builtins.isString def then [ "str" types.str false ]
-        else if isInt def then [ "int" types.int false ]
-        else if isFunction def then [ "functionTo unspecified" (types.functionTo types.unspecified) true ]
-        else if isList def then
-                let nestedType = if (length def > 0) && (all (x: (type (inferType' x)) == (type (inferType' (head def)))) def)
-                                 then inferType' (head def)
-                                 else [ "unspecified" types.unspecified true ];
-                in [ "listOf ${doc nestedType}" (types.listOf (type nestedType)) (containsUnspecified nestedType) ]
-        else if isAttrs def then
-                let list = mapAttrsToList (_: v: v) (removeAttrs def ["_args"]);
-                    nestedType = if (length list > 0) && (all (x: (type (inferType' x)) == (type (inferType' (head list)))) list)
-                                 then inferType' (head list)
-                                 else [ "unspecified" types.unspecified true ];
-                in [ "attrsOf ${doc nestedType}" (types.attrsOf (type nestedType)) (containsUnspecified nestedType) ]
-        else [ "unspecified" types.unspecified true ];
-
-      inferDoc = x: ''
-        Inferring the type of "${showOption loc}" to "${doc x}".
-        Please verify the inferred type and define the type explicitely in ${showFiles opt.declarations}!
-      '';
-
-      inferredType = printMode:
-        let inferred = inferType' opt.default;
-        in if printMode == "silent" then type inferred
-           else if printMode == "printAll" then builtins.trace (inferDoc inferred) (type inferred)
-           else if printMode == "printUnspecified" && (containsUnspecified inferred) then builtins.trace (inferDoc inferred) (type inferred)
-           else type inferred;
-
-      noInferDoc = ''
-        Could not infer a type for "${showOption loc}", using "unspecified" instead.
-        Please define the type explicitely in ${showFiles opt.declarations}!
-      '';
-
-      hasDefault = (opt ? default) && !(opt ? defaultText);
-      isExternalVisible = (opt.visible or true) && !(opt.internal or false);
-    in
-
-    if isNull mode || !isExternalVisible
-    then types.unspecified
-    else if hasDefault
-         then inferredType mode /* Set to 'true' to see every type that is being inferred, not just those types that result in 'unspecified'. */
-         else if mode != "silent" then builtins.trace noInferDoc types.unspecified else types.unspecified;
-
-
   /* Properties. */
 
   mkIf = condition: content:
@@ -562,7 +497,7 @@ rec {
 
 
   /* Compatibility. */
-  fixMergeModules = modules: args: evalModules { inherit args; modules = (modules ++ [{ _module.check = false; }]); };
+  fixMergeModules = modules: args: evalModules { inherit modules args; check = false; };
 
 
   /* Return a module that causes a warning to be shown if the
diff --git a/lib/options.nix b/lib/options.nix
index d6876e18fe4f..444ec37e6eaf 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -6,7 +6,6 @@ with import ./trivial.nix;
 with import ./lists.nix;
 with import ./attrsets.nix;
 with import ./strings.nix;
-with {inherit (import ./types.nix) types; };
 
 rec {
 
@@ -43,17 +42,16 @@ rec {
     description = "Sink for option definitions.";
     type = mkOptionType {
       name = "sink";
-      typerep = "(sink)";
       check = x: true;
-      merge = config: loc: defs: false;
+      merge = loc: defs: false;
     };
     apply = x: throw "Option value is not readable because the option is not declared.";
   } // attrs);
 
-  mergeDefaultOption = config: loc: defs:
+  mergeDefaultOption = loc: defs:
     let list = getValues defs; in
     if length list == 1 then head list
-    else if all isFunction list then x: mergeDefaultOption config loc (map (f: f x) list)
+    else if all isFunction list then x: mergeDefaultOption loc (map (f: f x) list)
     else if all isList list then concatLists list
     else if all isAttrs list then foldl' lib.mergeAttrs {} list
     else if all isBool list then foldl' lib.or false list
@@ -61,14 +59,14 @@ rec {
     else if all isInt list && all (x: x == head list) list then head list
     else throw "Cannot merge definitions of `${showOption loc}' given in ${showFiles (getFiles defs)}.";
 
-  mergeOneOption = config: loc: defs:
+  mergeOneOption = loc: defs:
     if defs == [] then abort "This case should never happen."
     else if length defs != 1 then
       throw "The unique option `${showOption loc}' is defined multiple times, in ${showFiles (getFiles defs)}."
     else (head defs).value;
 
   /* "Merge" option definitions by checking that they all have the same value. */
-  mergeEqualOption = config: loc: defs:
+  mergeEqualOption = loc: defs:
     if defs == [] then abort "This case should never happen."
     else foldl' (val: def:
       if def.value != val then
@@ -79,154 +77,53 @@ rec {
   getValues = map (x: x.value);
   getFiles = map (x: x.file);
 
+
   # Generate documentation template from the list of option declaration like
   # the set generated with filterOptionSets.
   optionAttrSetToDocList = optionAttrSetToDocList' [];
 
-  optionAttrSetToDocList' = prefix: internalModuleConfig: options:
+  optionAttrSetToDocList' = prefix: options:
     concatMap (opt:
       let
-        decls = filter (x: x != unknownModule) opt.declarations;
         docOption = rec {
           name = showOption opt.loc;
           description = opt.description or (throw "Option `${name}' has no description.");
-          declarations = decls;
+          declarations = filter (x: x != unknownModule) opt.declarations;
           internal = opt.internal or false;
           visible = opt.visible or true;
           readOnly = opt.readOnly or false;
           type = opt.type.name or null;
         }
-        // (if opt ? example then { example = detectDerivation decls opt.example; } else {})
-        // (if opt ? default then { default = detectDerivation decls opt.default; } else {})
+        // (if opt ? example then { example = scrubOptionValue opt.example; } else {})
+        // (if opt ? default then { default = scrubOptionValue opt.default; } else {})
         // (if opt ? defaultText then { default = opt.defaultText; } else {});
 
         subOptions =
-          let ss = opt.type.getSubOptionsPrefixed opt.loc;
-          in if ss != {} then optionAttrSetToDocList' opt.loc internalModuleConfig (ss internalModuleConfig) else [];
+          let ss = opt.type.getSubOptions opt.loc;
+          in if ss != {} then optionAttrSetToDocList' opt.loc ss else [];
       in
         [ docOption ] ++ subOptions) (collect isOption options);
 
-  # TODO: Use "extractOptionAttrSet" instead of "optionAttrSetToDocList'" to reduce the code size.
-  #       It should be a drop-in-replacement. But first, examine the impact on the evaluation time.
-  # optionAttrSetToDocList = extractOptionAttrSet true [];
 
-  # Generate a machine readable specification of the list of option declarations.
-  optionAttrSetToParseableSpecifications = extractOptionAttrSet false [];
-
-  extractOptionAttrSet = toDoc: prefix: internalModuleConfig: options:
-    concatMap (opt:
-      let
-        optionName = showOption opt.loc;
-
-        # Check if a type contains derivations, that is check if a type nests
-        # a 'package', 'packageSet' or 'nixpkgsConfig' type.
-        hasDerivation = any (t: elem t opt.type.nestedTypes) ((map (x: x.typerep) (with types; [package packageSet])) ++ ["(nixpkgsConfig)"]);
-
-        # Check if type is 'path' which can potentially contain a derivation.
-        maybeHiddenDerivation = any (t: elem t opt.type.nestedTypes) (map (x: x.typerep) (with types; [path]));
-
-        isDefaultValue = elem opt.default opt.type.defaultValues;
-
-        /* Enforce that the example attribute is wrapped with 'literalExample'
-           for every type that contains derivations. */
-        example =
-          if opt ? example
-          then (if hasDerivation
-                then (if isLiteralExample opt.example
-                      then { example = detectDerivation decls opt.example; }
-                      else throw "The attribute ${optionName}.example must be wrapped with 'literalExample' in ${concatStringsSep " and " decls}!")
-                else { example = detectDerivation decls opt.example; })
-          else {};
-
-        /* Enforce that the 'defaultText' attribute is defined for every option
-           that has a 'default' attribute that contains derivations. */
-        default =
-          if opt ? default
-          then (if hasDerivation
-                then (if isDefaultValue
-                      then { default = opt.default; }
-                      else (if opt ? defaultText
-                            then { default = literalExample (detectDerivation decls opt.defaultText); }
-                            else throw "The option ${optionName} requires a 'defaultText' attribute in ${concatStringsSep " and " decls}!"))
-                else (if opt ? defaultText
-                      then (if maybeHiddenDerivation
-                            then (if (let eval = builtins.tryEval (findDerivation opt.default); in eval.success && !eval.value)
-                                  then builtins.trace
-                                       "The attribute ${optionName}.defaultText might not be necessary in ${concatStringsSep " and " decls}!"
-                                       { default = literalExample (detectDerivation decls opt.defaultText); }
-                                  else { default = literalExample (detectDerivation decls opt.defaultText); })
-                            else builtins.trace
-                                 "The attribute ${optionName}.defaultText is not used and can be removed in ${concatStringsSep " and " decls}!"
-                                 { default = detectDerivation decls opt.default; })
-                      else { default = detectDerivation decls opt.default; }))
-          else {};
-
-        decls = filter (x: x != unknownModule) opt.declarations;
-
-        docOption = {
-          name = optionName;
-          description = opt.description or (throw "Option `${optionName}' has no description.");
-          declarations = decls;
-          internal = opt.internal or false;
-          visible = opt.visible or true;
-          readOnly = opt.readOnly or false;
-        } // example // default // subOptions // typeKeys;
-
-        typeKeys = if toDoc then { type = opt.type.name or null; } else { type = opt.type.typerep; keys = opt.loc; };
-
-        subOptions =
-          if toDoc
-          then {}
-          else let ss = opt.type.getSubOptions;
-               in if ss != {} then { suboptions = (extractOptionAttrSet false [] internalModuleConfig (ss internalModuleConfig)); } else {};
-
-        subOptionsDoc =
-          if toDoc
-          then let ss = opt.type.getSubOptionsPrefixed opt.loc;
-               in if ss != {} then extractOptionAttrSet true opt.loc internalModuleConfig (ss internalModuleConfig) else []
-          else [];
-      in
-        [ docOption ]  ++ subOptionsDoc )
-          (filter (opt: (opt.visible or true) && !(opt.internal or false)) (collect isOption options));
-
-
-  /* This function recursively checks for derivations within an
-     an expression, and throws an error if a derivation or a
-     store path is found. The function is used to ensure that no
-     derivation leaks from the 'default' or 'example' attributes
-     of an option.
-     This makes the generation of `options.xml' much more efficient:
-     the XML representation of derivations is very large (on the
-     order of megabytes) and is not actually used by the manual
-     generator. */
-  detectDerivation = decl: x:
+  /* This function recursively removes all derivation attributes from
+     `x' except for the `name' attribute.  This is to make the
+     generation of `options.xml' much more efficient: the XML
+     representation of derivations is very large (on the order of
+     megabytes) and is not actually used by the manual generator. */
+  scrubOptionValue = x:
     if isDerivation x then
-      throw "Found unexpected derivation in '${x.name}' in '${concatStringsSep " and " decl}'!"
-    else if isString x && isStorePath x then
-      throw "Found unexpected store path in '${x.name}' in '${concatStringsSep " and " decl}'!"
-    else if isList x then map (detectDerivation decl) x
-    else if isAttrs x then mapAttrs (n: v: (detectDerivation decl) v) (removeAttrs x ["_args"])
+      { type = "derivation"; drvPath = x.name; outPath = x.name; name = x.name; }
+    else if isList x then map scrubOptionValue x
+    else if isAttrs x then mapAttrs (n: v: scrubOptionValue v) (removeAttrs x ["_args"])
     else x;
 
-  /* Same as detectDerivation, but returns a boolean instead of
-     throwing an exception. */
-  findDerivation = x:
-    if (isString x && isStorePath x) || isDerivation x then true
-    else if isList x then any findDerivation x
-    else if isAttrs x then any findDerivation (mapAttrsToList (_: v: v) (removeAttrs x ["_args"]))
-    else false;
-
-
 
   /* For use in the ‘example’ option attribute.  It causes the given
      text to be included verbatim in documentation.  This is necessary
      for example values that are not simple values, e.g.,
      functions. */
-  # TODO: A more general name would probably be "literalNix".
   literalExample = text: { _type = "literalExample"; inherit text; };
 
-  isLiteralExample = x: isAttrs x && hasAttr "_type" x && x._type == "literalExample";
-
 
   /* Helper functions. */
   showOption = concatStringsSep ".";
diff --git a/lib/types.nix b/lib/types.nix
index 385103d42149..b4d29ac84d28 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -1,8 +1,6 @@
 # Definitions related to run-time type checking.  Used in particular
 # to type-check NixOS configurations.
 
-let lib = import ./default.nix; in
-
 with import ./lists.nix;
 with import ./attrsets.nix;
 with import ./options.nix;
@@ -23,8 +21,6 @@ rec {
   mkOptionType =
     { # Human-readable representation of the type.
       name
-    , # Parseable representation of the type.
-      typerep
     , # Function applied to each definition that should return true if
       # its type-correct, false otherwise.
       check ? (x: true)
@@ -35,59 +31,40 @@ rec {
       # definition values and locations (e.g. [ { file = "/foo.nix";
       # value = 1; } { file = "/bar.nix"; value = 2 } ]).
       merge ? mergeDefaultOption
-    , # Return list of sub-options.
-      getSubOptions ? {}
-    , # Same as 'getSubOptions', but with extra information about the
-      # location of the option which is used to generate documentation.
-      getSubOptionsPrefixed ? null
+    , # Return a flat list of sub-options.  Used to generate
+      # documentation.
+      getSubOptions ? prefix: {}
     , # List of modules if any, or null if none.
       getSubModules ? null
     , # Function for building the same option type  with a different list of
       # modules.
       substSubModules ? m: null
-    , # List of type representations (typerep) of all the elementary types
-      # that are nested within the type. For an elementary type the list is
-      # a singleton of the typerep of itself.
-      # NOTE: Must be specified for every container type!
-      nestedTypes ? null
-    , # List of all default values, and an empty list if no default value exists.
-      defaultValues ? []
     }:
     { _type = "option-type";
-      inherit name typerep check merge getSubOptions getSubModules substSubModules defaultValues;
-      nestedTypes = if (isNull nestedTypes) then (singleton typerep) else nestedTypes;
-      getSubOptionsPrefixed = if (isNull getSubOptionsPrefixed) then (prefix: getSubOptions) else getSubOptionsPrefixed;
+      inherit name check merge getSubOptions getSubModules substSubModules;
     };
 
 
   types = rec {
 
-    #
-    # Elementary types
-    #
-
     unspecified = mkOptionType {
       name = "unspecified";
-      typerep = "(unspecified)";
     };
 
     bool = mkOptionType {
       name = "boolean";
-      typerep = "(boolean)";
       check = isBool;
       merge = mergeEqualOption;
     };
 
     int = mkOptionType {
       name = "integer";
-      typerep = "(integer)";
       check = isInt;
       merge = mergeOneOption;
     };
 
     str = mkOptionType {
       name = "string";
-      typerep = "(string)";
       check = isString;
       merge = mergeOneOption;
     };
@@ -95,111 +72,73 @@ rec {
     # Merge multiple definitions by concatenating them (with the given
     # separator between the values).
     separatedString = sep: mkOptionType {
-      name = "string" + (optionalString (sep != "") " separated by ${sep}");
-      typerep = "(separatedString(${escape ["(" ")"] sep}))";
+      name = "string";
       check = isString;
-      merge = _module: loc: defs: concatStringsSep sep (getValues defs);
+      merge = loc: defs: concatStringsSep sep (getValues defs);
     };
 
-    lines = separatedString "\n" // { typerep = "(lines)"; };
-    commas = separatedString "," // { typerep = "(commas)"; };
-    envVar = separatedString ":" // { typerep = "(envVar)"; };
+    lines = separatedString "\n";
+    commas = separatedString ",";
+    envVar = separatedString ":";
 
     # Deprecated; should not be used because it quietly concatenates
     # strings, which is usually not what you want.
-    string = separatedString "" // { typerep = "(string)"; };
+    string = separatedString "";
 
     attrs = mkOptionType {
       name = "attribute set";
-      typerep = "(attrs)";
       check = isAttrs;
-      merge = _module: loc: foldl' (res: def: mergeAttrs res def.value) {};
+      merge = loc: foldl' (res: def: mergeAttrs res def.value) {};
     };
 
     # derivation is a reserved keyword.
     package = mkOptionType {
       name = "package";
-      typerep = "(package)";
       check = x: isDerivation x || isStorePath x;
-      merge = _module: loc: defs:
-        let res = mergeOneOption _module loc defs;
+      merge = loc: defs:
+        let res = mergeOneOption loc defs;
         in if isDerivation res then res else toDerivation res;
     };
 
-    # The correct type of packageSet would be:
-    # packageSet = attrsOf (either package packageSet)
-    # (Not sure if nix would allow to define a recursive type.)
-    # However, currently it is not possible to check that a packageSet actually
-    # contains packages (that is derivations). The check 'isDerivation' is too
-    # eager for the current implementation of the assertion mechanism and of the
-    # licenses control mechanism. That means it is not generally possible to go
-    # into the attribute set of packages to check that every attribute would
-    # evaluate to a derivation if the package would actually be evaluated. Maybe
-    # that restriction can be lifted in the future, but for now the content of
-    # the packageSet is not checked.
-    # TODO: The 'merge' function is copied from 'mergeDefaultOption' to keep
-    # backwards compatibility with the 'unspecified' type that was used for
-    # package sets previously. Maybe review if the merge function has to change.
-    packageSet = mkOptionType {
-      name = "derivation set";
-      typerep = "(packageSet)";
-      check = isAttrs;
-      merge = _module: loc: defs: foldl' mergeAttrs {} (map (x: x.value) defs);
-    };
-
     path = mkOptionType {
       name = "path";
-      typerep = "(path)";
       # Hacky: there is no ‘isPath’ primop.
       check = x: builtins.substring 0 1 (toString x) == "/";
       merge = mergeOneOption;
     };
 
-
-    #
-    # Container types
-    #
-
     # drop this in the future:
     list = builtins.trace "`types.list' is deprecated; use `types.listOf' instead" types.listOf;
 
     listOf = elemType: mkOptionType {
       name = "list of ${elemType.name}s";
-      typerep = "(listOf${elemType.typerep})";
       check = isList;
-      merge = _module: loc: defs:
+      merge = loc: defs:
         map (x: x.value) (filter (x: x ? value) (concatLists (imap (n: def: imap (m: def':
-            (mergeDefinitions _module
+            (mergeDefinitions
               (loc ++ ["[definition ${toString n}-entry ${toString m}]"])
               elemType
               [{ inherit (def) file; value = def'; }]
             ).optionalValue
           ) def.value) defs)));
-      getSubOptions = elemType.getSubOptions;
-      getSubOptionsPrefixed = prefix: elemType.getSubOptionsPrefixed (prefix ++ ["*"]);
+      getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["*"]);
       getSubModules = elemType.getSubModules;
       substSubModules = m: listOf (elemType.substSubModules m);
-      nestedTypes = elemType.nestedTypes;
-      defaultValues = [[]];
     };
 
     attrsOf = elemType: mkOptionType {
       name = "attribute set of ${elemType.name}s";
-      typerep = "(attrsOf${elemType.typerep})";
       check = isAttrs;
-      merge = _module: loc: defs:
+      merge = loc: defs:
         mapAttrs (n: v: v.value) (filterAttrs (n: v: v ? value) (zipAttrsWith (name: defs:
-            (mergeDefinitions _module (loc ++ [name]) elemType defs).optionalValue
+            (mergeDefinitions (loc ++ [name]) elemType defs).optionalValue
           )
           # Push down position info.
           (map (def: listToAttrs (mapAttrsToList (n: def':
             { name = n; value = { inherit (def) file; value = def'; }; }) def.value)) defs)));
-      getSubOptions = elemType.getSubOptions;
-      getSubOptionsPrefixed = prefix: elemType.getSubOptionsPrefixed (prefix ++ ["<name>"]);
+      getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name>"]);
       getSubModules = elemType.getSubModules;
       substSubModules = m: attrsOf (elemType.substSubModules m);
-      nestedTypes = elemType.nestedTypes;
-      defaultValues = [{}];
     };
 
     # List or attribute set of ...
@@ -220,23 +159,18 @@ rec {
         attrOnly = attrsOf elemType;
       in mkOptionType {
         name = "list or attribute set of ${elemType.name}s";
-        typerep = "(loaOf${elemType.typerep})";
         check = x: isList x || isAttrs x;
-        merge = _module: loc: defs: attrOnly.merge _module loc (imap convertIfList defs);
-        getSubOptions = elemType.getSubOptions;
-        getSubOptionsPrefixed = prefix: elemType.getSubOptionsPrefixed (prefix ++ ["<name?>"]);
+        merge = loc: defs: attrOnly.merge loc (imap convertIfList defs);
+        getSubOptions = prefix: elemType.getSubOptions (prefix ++ ["<name?>"]);
         getSubModules = elemType.getSubModules;
         substSubModules = m: loaOf (elemType.substSubModules m);
-        nestedTypes = elemType.nestedTypes;
-        defaultValues = [{} []];
       };
 
     # List or element of ...
     loeOf = elemType: mkOptionType {
       name = "element or list of ${elemType.name}s";
-      typerep = "(loeOf${elemType.typerep})";
       check = x: isList x || elemType.check x;
-      merge = _module: loc: defs:
+      merge = loc: defs:
         let
           defs' = filterOverrides defs;
           res = (head defs').value;
@@ -247,41 +181,55 @@ rec {
         else if !isString res then
           throw "The option `${showOption loc}' does not have a string value, in ${showFiles (getFiles defs)}."
         else res;
-      nestedTypes = elemType.nestedTypes;
-      defaultValues = [[]] ++ elemType.defaultValues;
     };
 
     uniq = elemType: mkOptionType {
-      inherit (elemType) check;
-      name = "unique ${elemType.name}";
-      typerep = "(uniq${elemType.typerep})";
+      inherit (elemType) name check;
       merge = mergeOneOption;
       getSubOptions = elemType.getSubOptions;
-      getSubOptionsPrefixed = prefix: elemType.getSubOptionsPrefixed prefix;
       getSubModules = elemType.getSubModules;
       substSubModules = m: uniq (elemType.substSubModules m);
-      nestedTypes = elemType.nestedTypes;
-      defaultValues = elemType.defaultValues;
     };
 
     nullOr = elemType: mkOptionType {
       name = "null or ${elemType.name}";
-      typerep = "(nullOr${elemType.typerep})";
       check = x: x == null || elemType.check x;
-      merge = _module: loc: defs:
+      merge = loc: defs:
         let nrNulls = count (def: def.value == null) defs; in
         if nrNulls == length defs then null
         else if nrNulls != 0 then
           throw "The option `${showOption loc}' is defined both null and not null, in ${showFiles (getFiles defs)}."
-        else elemType.merge _module loc defs;
+        else elemType.merge loc defs;
       getSubOptions = elemType.getSubOptions;
-      getSubOptionsPrefixed = prefix: elemType.getSubOptionsPrefixed prefix;
       getSubModules = elemType.getSubModules;
       substSubModules = m: nullOr (elemType.substSubModules m);
-      nestedTypes = elemType.nestedTypes;
-      defaultValues = [null] ++ elemType.defaultValues;
     };
 
+    submodule = opts:
+      let
+        opts' = toList opts;
+        inherit (import ./modules.nix) evalModules;
+      in
+      mkOptionType rec {
+        name = "submodule";
+        check = x: isAttrs x || isFunction x;
+        merge = loc: defs:
+          let
+            coerce = def: if isFunction def then def else { config = def; };
+            modules = opts' ++ map (def: { _file = def.file; imports = [(coerce def.value)]; }) defs;
+          in (evalModules {
+            inherit modules;
+            args.name = last loc;
+            prefix = loc;
+          }).config;
+        getSubOptions = prefix: (evalModules
+          { modules = opts'; inherit prefix;
+            # FIXME: hack to get shit to evaluate.
+            args = { name = ""; }; }).options;
+        getSubModules = opts';
+        substSubModules = m: submodule m;
+      };
+
     enum = values:
       let
         show = v:
@@ -291,92 +239,23 @@ rec {
       in
       mkOptionType {
         name = "one of ${concatMapStringsSep ", " show values}";
-        typerep = "(enum${concatMapStrings (x: "(${escape ["(" ")"] (builtins.toString x)})") values})";
         check = flip elem values;
         merge = mergeOneOption;
-        nestedTypes = [];
       };
 
     either = t1: t2: mkOptionType {
       name = "${t1.name} or ${t2.name}";
-      typerep = "(either${t1.typerep}${t2.typerep})";
       check = x: t1.check x || t2.check x;
       merge = mergeOneOption;
-      nestedTypes = t1.nestedTypes ++ t2.nestedTypes;
-      defaultValues = t1.defaultValues ++ t2.defaultValues;
     };
 
-
-    #
-    # Complex types
-    #
-
-    submodule = opts:
-      let
-        opts' = toList opts;
-        inherit (import ./modules.nix) evalModules;
-        filterVisible = filter (opt: (if opt ? visible then opt.visible else true) && (if opt ? internal then !opt.internal else true));
-      in
-      mkOptionType rec {
-        name = "submodule";
-        typerep = "(submodule)";
-        check = x: isAttrs x || isFunction x;
-        merge = _module: loc: defs:
-          let
-            internalModule = [ { inherit _module; } { _module.args.name = lib.mkForce (last loc); } ];
-            coerce = def: if isFunction def then def else { config = def; };
-            modules = opts' ++ internalModule ++ map (def: { _file = def.file; imports = [(coerce def.value)]; }) defs;
-          in (evalModules {
-            inherit modules;
-            prefix = loc;
-          }).config;
-        getSubOptions = getSubOptionsPrefixed [];
-        getSubOptionsPrefixed = prefix: _module:
-          let
-            # FIXME: hack to get shit to evaluate.
-            internalModule = [ { inherit _module; } { _module.args.name = lib.mkForce ""; } ];
-          in (evalModules {
-            modules = opts' ++ internalModule;
-            inherit prefix;
-          }).options;
-        getSubModules = opts';
-        substSubModules = m: submodule m;
-        nestedTypes = concatMap (opt: opt.type.nestedTypes) (collect (lib.isType "option") (getSubOptions {}));
-        defaultValues = [{}];
-      };
-
-
-
-    #
-    # Legacy types
-    #
-
     # Obsolete alternative to configOf.  It takes its option
     # declarations from the ‘options’ attribute of containing option
     # declaration.
     optionSet = mkOptionType {
       name = /* builtins.trace "types.optionSet is deprecated; use types.submodule instead" */ "option set";
-      typerep = "(optionSet)";
     };
 
-
-    # Try to remove module options of that type wherever possible.
-    # A module option taking a function can not be introspected and documented properly.
-    functionTo = resultType:
-      mkOptionType {
-        name = "function to ${resultType.name}";
-        typerep = "(function${resultType.typerep})";
-        check = builtins.isFunction;
-        merge = mergeOneOption;
-        nestedTypes = resultType.nestedTypes;
-        defaultValues = map (x: {...}:x) resultType.nestedTypes; # INFO: It seems as nix can't compare functions, yet.
-      };
-
-
-    #
-    # misc
-    #
-
     # Augment the given type with an additional type check function.
     addCheck = elemType: check: elemType // { check = x: elemType.check x && check x; };
 
diff --git a/nixos/default.nix b/nixos/default.nix
index 117a7b5d6038..5d69b79e13a6 100644
--- a/nixos/default.nix
+++ b/nixos/default.nix
@@ -34,8 +34,6 @@ in
 
   system = eval.config.system.build.toplevel;
 
-  typechecker = eval.config.system.build.typechecker;
-
   vm = vmConfig.system.build.vm;
 
   vmWithBootLoader = vmWithBootLoaderConfig.system.build.vm;
diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix
index ea8601497361..4ce6ea1c1118 100644
--- a/nixos/doc/manual/default.nix
+++ b/nixos/doc/manual/default.nix
@@ -1,4 +1,4 @@
-{ pkgs, options, internalModule, version, revision, extraSources ? [] }:
+{ pkgs, options, version, revision, extraSources ? [] }:
 
 with pkgs;
 with pkgs.lib;
@@ -6,10 +6,8 @@ with pkgs.lib;
 let
 
   # Remove invisible and internal options.
-  optionsList = filter (opt: opt.visible && !opt.internal) (optionAttrSetToDocList internalModule options);
+  optionsList = filter (opt: opt.visible && !opt.internal) (optionAttrSetToDocList options);
 
-  # INFO: Please add 'defaultText' or 'literalExample' to the option
-  #       definition to avoid this substitution!
   # Replace functions by the string <function>
   substFunction = x:
     if builtins.isAttrs x then mapAttrs (name: substFunction) x
diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml
index 08bde4a275d9..ea5d1241876e 100644
--- a/nixos/doc/manual/development/option-declarations.xml
+++ b/nixos/doc/manual/development/option-declarations.xml
@@ -8,7 +8,7 @@
 
 <para>An option declaration specifies the name, type and description
 of a NixOS configuration option.  It is illegal to define an option
-that has not been declared in any module. A option declaration
+that hasn’t been declared in any module.  A option declaration
 generally looks like this:
 
 <programlisting>
@@ -145,108 +145,6 @@ options = {
 
 You can also create new types using the function
 <varname>mkOptionType</varname>.  See
-<filename>lib/types.nix</filename> in Nixpkgs for details.
-
-An option declaration must follow the following rules:
-<itemizedlist mark='bullet'>
-
-  <listitem>
-    <para>A <varname>defaultText</varname> must be defined if and only if the type of the option
-    derives from <varname>package</varname>, <varname>packageSet</varname> or <varname>nixpkgsConfig
-    </varname>, and if and only if a <varname>default</varname> attribute is defined and if and only if
-    the value of the <varname>default</varname> attribute is not the default of the type of the
-    option declaration.
-
-    For example, a <varname>defaultText</varname> must be defined for
-<programlisting>
-type = types.listOf types.package;
-default = [ pkgs.foo; ];
-defaultText = "[ pkgs.foo; ]";
-</programlisting>.
-
-    But no <varname>defaultText</varname> must be defined for
-<programlisting>
-type = types.listOf types.package;
-default = [];
-</programlisting>,
-    as <varname>[]</varname> is the default of <varname>types.listOf types.package</varname>.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>A <varname>defaultText</varname> can be defined if the type of the option derives from
-    <varname>path</varname> and if a <varname>default</varname> attribute is defined.</para>
-  </listitem>
-
-  <listitem>
-    <para>The value of the <varname>example</varname> attribute must be wrapped with <varname>
-    literalExample</varname> if the type of the option derives from <varname>package</varname>,
-    <varname>packageSet</varname> or <varname>nixpkgsConfig</varname>.</para>
-  </listitem>
-
-  <listitem>
-    <para>The value of <varname>defaultText</varname> and <varname>literalExample</varname> must
-    be a string which contains a valid nix expression. The nix expression has to evaluate in
-    <code>{pkgs}: <replaceable>value</replaceable></code>.
-    For example:
-    <itemizedlist>
-      <listitem>
-	<para>A <varname>defaultText</varname> could, e.g., be:
-<programlisting>
-type = types.package;
-default = pkgs.foo;
-defaultText = "pkgs.foo";
-</programlisting>
-        But not <code>defaultText = "pkgs.foo;";</code>, as that
-        corresponds to <code>{pkgs}: pkgs.foo;</code>, which is an
-	invalid nix expression due to the ending with <varname>;</varname>.</para>
-      </listitem>
-    
-      <listitem>
-	<para>A <varname>literalExample</varname> could be used as, e.g.:
-<programlisting>
-type = types.path;
-example = literalExample "\"\${pkgs.bar}/bin/bar\"";
-</programlisting>
-        But not <code>literalExample "\${pkgs.bar}/bin/bar";</code>, as that corresponds
-	to <code>{pkgs}: ${pkgs.bar}/bin/bar</code>, which is an invalid nix expression
-	as the <varname>path</varname> is not a <varname>string</varname> anymore.</para>
-      </listitem>
-    </itemizedlist></para>
-  </listitem>
-
-  <listitem>
-    <para>The <varname>type</varname> attribute must be defined for every option declaration.</para>
-  </listitem>
-
-</itemizedlist>
-
-NixOS ships the tool <varname>nixos-typecheck</varname> that can check an option declaration to:
-
-<itemizedlist mark='bullet'>
-
-  <listitem>
-    <para>Enforce that an option declaration has a <varname>defaultText</varname> if and only if the
-    type of the option derives from <varname>package</varname>, <varname>packageSet</varname> or
-    <varname>nixpkgsConfig</varname> and if a <varname>default</varname> attribute is defined.</para>
-  </listitem>
-
-  <listitem>
-    <para>Enforce that the value of the <varname>example</varname> attribute is wrapped with <varname>
-    literalExample</varname> if the type of the option derives from <varname>package</varname>,
-    <varname>packageSet</varname> or <varname>nixpkgsConfig</varname>.</para>
-  </listitem>
-
-  <listitem>
-    <para>Warn if a <varname>defaultText</varname> is defined in an option declaration if the type of
-    the option does not derive from <varname>package</varname>, <varname>packageSet</varname> or
-    <varname>nixpkgsConfig</varname>.</para>
-  </listitem>
-
-  <listitem>
-    <para>Warn if no <varname>type</varname> is defined in an option declaration.</para>
-  </listitem>
-
-</itemizedlist></para>
+<filename>lib/types.nix</filename> in Nixpkgs for details.</para>
 
 </section>
diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix
index 79890e0add7d..a87b285c5b7b 100644
--- a/nixos/lib/eval-config.nix
+++ b/nixos/lib/eval-config.nix
@@ -20,13 +20,8 @@
 , # !!! See comment about args in lib/modules.nix
   specialArgs ? {}
 , modules
-, # Pass through a configuration of the internal modules declared
-  # in lib/modules.nix.
-  _module ? {}
-, # !!! See comment about typeInference in lib/modules.nix
-  typeInference ? null
 , # !!! See comment about check in lib/modules.nix
-  check ? null
+  check ? true
 , prefix ? []
 , lib ? import ../../lib
 }:
@@ -46,17 +41,13 @@ let
     };
   };
 
-  internalModule = { _module = (_module
-                     // (if isNull check then {} else { inherit check; })
-                     // (if isNull typeInference then {} else { inherit typeInference; })); };
-
 in rec {
 
   # Merge the option definitions in all modules, forming the full
   # system configuration.
   inherit (lib.evalModules {
-    inherit prefix;
-    modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ] ++ [ internalModule ];
+    inherit prefix check;
+    modules = modules ++ extraModules ++ baseModules ++ [ pkgsModule ];
     args = extraArgs;
     specialArgs = { modulesPath = ../modules; } // specialArgs;
   }) config options;
diff --git a/nixos/lib/typechecker.nix b/nixos/lib/typechecker.nix
deleted file mode 100644
index b4d8277f8fe9..000000000000
--- a/nixos/lib/typechecker.nix
+++ /dev/null
@@ -1,91 +0,0 @@
-{ config, lib, pkgs, baseModules, ... }:
-
-with pkgs;
-with pkgs.lib;
-
-let
-
-  optionsSpecs = inferenceMode:
-    let
-      versionModule =
-        { system.nixosVersionSuffix = config.system.nixosVersionSuffix;
-          system.nixosRevision = config.system.nixosRevision;
-          nixpkgs.system = config.nixpkgs.system;
-        };
-
-      internalModule = { _module = config._module; } // (if isNull inferenceMode then {} else { _module.typeInference = mkForce inferenceMode; });
-
-      eval = evalModules {
-        modules = [ versionModule ] ++ baseModules ++ [ internalModule ];
-        args = (config._module.args) // { modules = [ ]; };
-      };
-
-      # Remove invisible and internal options.
-      optionsSpecs' = filter (opt: opt.visible && !opt.internal) (optionAttrSetToParseableSpecifications config._module eval.options);
-
-      # INFO: Please add 'defaultText' or 'literalExample' to the option
-      #       definition to avoid this exception!
-      substFunction = key: decls: x:
-        if builtins.isAttrs x then mapAttrs (name: substFunction key decls) x
-        else if builtins.isList x then map (substFunction key decls) x
-        else if builtins.isFunction x then throw "Found an unexpected <function> in ${key} declared in ${concatStringsSep " and " decls}."
-        else x;
-
-      prefix = toString ../..;
-
-      stripPrefix = fn:
-        if substring 0 (stringLength prefix) fn == prefix then
-          substring (stringLength prefix + 1) 1000 fn
-        else
-          fn;
-
-      # Clean up declaration sites to not refer to the NixOS source tree.
-      cleanupOptions = x: flip map x (opt:
-        let substFunction' = y: substFunction opt.name opt.declarations y;
-        in opt
-           // { declarations = map (fn: stripPrefix fn) opt.declarations; }
-           // optionalAttrs (opt ? example) { example = substFunction' opt.example; }
-           // optionalAttrs (opt ? default) { default = substFunction' opt.default; }
-           // optionalAttrs (opt ? type) { type = substFunction' opt.type; });
-
-    in
-      cleanupOptions optionsSpecs';
-
-in
-
-{
-
-  system.build.typechecker = {
-
-    # The NixOS options as machine readable specifications in JSON format.
-    specifications = stdenv.mkDerivation {
-      name = "options-specs-json";
-
-      buildCommand = ''
-        # Export list of options in different format.
-        dst=$out/share/doc/nixos
-        mkdir -p $dst
-
-        cp ${builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON
-          (listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) (optionsSpecs null)))))
-        } $dst/options-specs.json
-
-        mkdir -p $out/nix-support
-        echo "file json $dst/options-specs.json" >> $out/nix-support/hydra-build-products
-      ''; # */
-
-      meta.description = "List of NixOS options specifications in JSON format";
-    };
-
-    silent = listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) (optionsSpecs "silent"));
-    printAll = listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) (optionsSpecs "printAll"));
-    printUnspecified = listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) (optionsSpecs "printUnspecified"));
-
-  };
-
-}
-
-
-
-
-
diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 3d21bda5734f..b20fac6ad3e2 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -64,7 +64,6 @@ in
       consoleKeyMap = mkOption {
         type = mkOptionType {
           name = "string or path";
-          typerep = "(stringOrPath)";
           check = t: (isString t || types.path.check t);
         };
 
diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix
index 174d7014ca8a..61b02c5ffa6a 100644
--- a/nixos/modules/config/sysctl.nix
+++ b/nixos/modules/config/sysctl.nix
@@ -6,7 +6,6 @@ let
 
   sysctlOption = mkOptionType {
     name = "sysctl option value";
-    typerep = "(sysctl)";
     check = val:
       let
         checkType = x: isBool x || isString x || isInt x || isNull x;
diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh
index dd21dc71ee2b..17c17d05e288 100644
--- a/nixos/modules/installer/tools/nixos-option.sh
+++ b/nixos/modules/installer/tools/nixos-option.sh
@@ -115,8 +115,8 @@ let
       let name = head attrsNames; rest = tail attrsNames; in
       if isOption result.options then
         walkOptions rest {
-          options = result.options.type.getSubOptionsPrefix "";
-          opt = ''(\${result.opt}.type.getSubOptionsPrefix "")'';
+          options = result.options.type.getSubOptions "";
+          opt = ''(\${result.opt}.type.getSubOptions "")'';
           cfg = ''\${result.cfg}."\${name}"'';
         }
       else
diff --git a/nixos/modules/installer/tools/nixos-typecheck.sh b/nixos/modules/installer/tools/nixos-typecheck.sh
deleted file mode 100644
index f9557be0c50e..000000000000
--- a/nixos/modules/installer/tools/nixos-typecheck.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#! /bin/sh
-#! @shell@
-
-if [ -x "@shell@" ]; then export SHELL="@shell@"; fi;
-
-set -e
-
-showSyntax() {
-cat >&1 << EOF
-nixos-typecheck
-usage:
-  nixos-typecheck [action] [args]
-where:
-  action = silent | printAll | printUnspecified | getSpecs
-    with default action: printUnspecified
-  args = any argument supported by nix-build
-EOF
-}
-
-
-# Parse the command line.
-extraArgs=()
-action=printUnspecified
-
-while [ "$#" -gt 0 ]; do
-    i="$1"; shift 1
-    case "$i" in
-      --help)
-        showSyntax
-        ;;
-      silent|printAll|printUnspecified|getSpecs)
-        action="$i"
-        ;;
-      *)
-        extraArgs="$extraArgs $i"
-        ;;
-    esac
-done
-
-
-if [ "$action" = silent ]; then
-    nix-build --no-out-link '<nixpkgs/nixos>' -A typechecker.silent $extraArgs
-elif [ "$action" = printAll ]; then
-    nix-build --no-out-link '<nixpkgs/nixos>' -A typechecker.printAll $extraArgs
-elif [ "$action" = printUnspecified ]; then
-    nix-build --no-out-link '<nixpkgs/nixos>' -A typechecker.printUnspecified $extraArgs
-elif [ "$action" = getSpecs ]; then
-    ln -s $(nix-build --no-out-link '<nixpkgs/nixos>' -A typechecker.specifications $extraArgs)/share/doc/nixos/options-specs.json specifications.json
-else
-    showSyntax
-    exit 1
-fi
diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix
index 69bd0d26b773..9ac3b7a5b16f 100644
--- a/nixos/modules/installer/tools/tools.nix
+++ b/nixos/modules/installer/tools/tools.nix
@@ -54,11 +54,6 @@ let
     inherit (config.system) nixosVersion nixosCodeName nixosRevision;
   };
 
-  nixos-typecheck = makeProg {
-    name = "nixos-typecheck";
-    src = ./nixos-typecheck.sh;
-  };
-
 in
 
 {
@@ -72,11 +67,10 @@ in
         nixos-generate-config
         nixos-option
         nixos-version
-        nixos-typecheck
       ];
 
     system.build = {
-      inherit nixos-install nixos-generate-config nixos-option nixos-rebuild nixos-typecheck;
+      inherit nixos-install nixos-generate-config nixos-option nixos-rebuild;
     };
 
   };
diff --git a/nixos/modules/misc/meta.nix b/nixos/modules/misc/meta.nix
index 9a453172c63a..22622706f2c8 100644
--- a/nixos/modules/misc/meta.nix
+++ b/nixos/modules/misc/meta.nix
@@ -5,7 +5,6 @@ with lib;
 let
   maintainer = mkOptionType {
     name = "maintainer";
-    typerep = "(maintainer)";
     check = email: elem email (attrValues lib.maintainers);
     merge = loc: defs: listToAttrs (singleton (nameValuePair (last defs).file (last defs).value));
   };
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 511831ae5cd2..5eb38c510b48 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -3,35 +3,32 @@
 with lib;
 
 let
-  nixpkgsConfig = pkgs:
+  isConfig = x:
+    builtins.isAttrs x || builtins.isFunction x;
+
+  optCall = f: x:
+    if builtins.isFunction f
+    then f x
+    else f;
+
+  mergeConfig = lhs_: rhs_:
     let
-      isConfig = x:
-        builtins.isAttrs x || builtins.isFunction x;
-
-      optCall = f: x:
-        if builtins.isFunction f
-        then f x
-        else f;
-
-      mergeConfig = lhs_: rhs_:
-        let
-          lhs = optCall lhs_ { inherit pkgs; };
-          rhs = optCall rhs_ { inherit pkgs; };
-        in
-        lhs // rhs //
-        optionalAttrs (lhs ? packageOverrides) {
-          packageOverrides = pkgs:
-            optCall lhs.packageOverrides pkgs //
-            optCall (attrByPath ["packageOverrides"] ({}) rhs) pkgs;
-        };
+      lhs = optCall lhs_ { inherit pkgs; };
+      rhs = optCall rhs_ { inherit pkgs; };
     in
-    mkOptionType {
-      name = "nixpkgs config";
-      typerep = "(nixpkgsConfig)";
-      check = lib.traceValIfNot isConfig;
-      merge = config: args: fold (def: mergeConfig def.value) {};
-      defaultValues = [{}];
+    lhs // rhs //
+    optionalAttrs (lhs ? packageOverrides) {
+      packageOverrides = pkgs:
+        optCall lhs.packageOverrides pkgs //
+        optCall (attrByPath ["packageOverrides"] ({}) rhs) pkgs;
     };
+
+  configType = mkOptionType {
+    name = "nixpkgs config";
+    check = traceValIfNot isConfig;
+    merge = args: fold (def: mergeConfig def.value) {};
+  };
+
 in
 
 {
@@ -49,7 +46,7 @@ in
             };
           }
         '';
-      type = nixpkgsConfig pkgs;
+      type = configType;
       description = ''
         The configuration of the Nix Packages collection.  (For
         details, see the Nixpkgs documentation.)  It allows you to set
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 88e01069b264..ad1636e002d8 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1,5 +1,4 @@
 [
-  ../lib/typechecker.nix
   ./config/debug-info.nix
   ./config/fonts/corefonts.nix
   ./config/fonts/fontconfig-ultimate.nix
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index e6ebcd6dc145..cc50bfbea531 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -155,21 +155,18 @@ in {
       packages.gitlab = mkOption {
         type = types.package;
         default = pkgs.gitlab;
-        defaultText = "pkgs.gitlab";
         description = "Reference to the gitlab package";
       };
 
       packages.gitlab-shell = mkOption {
         type = types.package;
         default = pkgs.gitlab-shell;
-        defaultText = "pkgs.gitlab-shell";
         description = "Reference to the gitlab-shell package";
       };
 
       packages.gitlab-workhorse = mkOption {
         type = types.package;
         default = pkgs.gitlab-workhorse;
-        defaultText = "pkgs.gitlab-workhorse";
         description = "Reference to the gitlab-workhorse package";
       };
 
diff --git a/nixos/modules/services/misc/ihaskell.nix b/nixos/modules/services/misc/ihaskell.nix
index c177d68c8fe0..d0e9b839e754 100644
--- a/nixos/modules/services/misc/ihaskell.nix
+++ b/nixos/modules/services/misc/ihaskell.nix
@@ -15,14 +15,12 @@ in
   options = {
     services.ihaskell = {
       enable = mkOption {
-        type = lib.types.bool;
         default = false;
         example = true;
         description = "Autostart an IHaskell notebook service.";
       };
 
       haskellPackages = mkOption {
-        type = lib.types.packageSet;
         default = pkgs.haskellPackages;
         defaultText = "pkgs.haskellPackages";
         example = literalExample "pkgs.haskell.packages.ghc784";
@@ -35,9 +33,7 @@ in
       };
 
       extraPackages = mkOption {
-        type = types.functionTo (types.listOf types.package);
         default = self: [];
-        defaultText = "self: []";
         example = literalExample ''
           haskellPackages: [
             haskellPackages.wreq
diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix
index 7ba1c319add4..37ea339300d4 100644
--- a/nixos/modules/services/misc/nixos-manual.nix
+++ b/nixos/modules/services/misc/nixos-manual.nix
@@ -17,8 +17,6 @@ let
       nixpkgs.system = config.nixpkgs.system;
     };
 
-  internalModule = { _module = config._module; };
-
   /* For the purpose of generating docs, evaluate options with each derivation
     in `pkgs` (recursively) replaced by a fake with path "\${pkgs.attribute.path}".
     It isn't perfect, but it seems to cover a vast majority of use cases.
@@ -31,7 +29,7 @@ let
     options =
       let
         scrubbedEval = evalModules {
-          modules = [ versionModule ] ++ baseModules ++ [ internalModule ];
+          modules = [ versionModule ] ++ baseModules;
           args = (config._module.args) // { modules = [ ]; };
           specialArgs = { pkgs = scrubDerivations "pkgs" pkgs; };
         };
@@ -45,7 +43,6 @@ let
           )
           pkgSet;
       in scrubbedEval.options;
-    internalModule = config._module;
   };
 
   entry = "${manual.manual}/share/doc/nixos/index.html";
diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index 8340287df453..60ec49c9e66e 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -48,7 +48,8 @@ let
           if svc ? function then svc.function
           else import (toString "${toString ./.}/${if svc ? serviceType then svc.serviceType else svc.serviceName}.nix");
         config = (evalModules
-          { modules = [ { options = res.options; config = svc.config or svc; } ] ++ [ { _module.check = false; } ];
+          { modules = [ { options = res.options; config = svc.config or svc; } ];
+            check = false;
           }).config;
         defaults = {
           extraConfig = "";
diff --git a/nixos/modules/services/x11/window-managers/xmonad.nix b/nixos/modules/services/x11/window-managers/xmonad.nix
index d8acb824f7df..6af88d4f645b 100644
--- a/nixos/modules/services/x11/window-managers/xmonad.nix
+++ b/nixos/modules/services/x11/window-managers/xmonad.nix
@@ -16,7 +16,6 @@ in
     services.xserver.windowManager.xmonad = {
       enable = mkEnableOption "xmonad";
       haskellPackages = mkOption {
-        type = lib.types.packageSet;
         default = pkgs.haskellPackages;
         defaultText = "pkgs.haskellPackages";
         example = literalExample "pkgs.haskell.packages.ghc784";
@@ -29,9 +28,7 @@ in
       };
 
       extraPackages = mkOption {
-        type = lib.types.functionTo (lib.types.listOf lib.types.package);
         default = self: [];
-        defaultText = "self: []";
         example = literalExample ''
           haskellPackages: [
             haskellPackages.xmonad-contrib
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix
index 5b11a3fc61c3..a6bbca9b30bb 100644
--- a/nixos/modules/system/boot/kernel.nix
+++ b/nixos/modules/system/boot/kernel.nix
@@ -20,7 +20,6 @@ in
   options = {
 
     boot.kernelPackages = mkOption {
-      type = types.packageSet;
       default = pkgs.linuxPackages;
       # We don't want to evaluate all of linuxPackages for the manual
       # - some of it might not even evaluate correctly.
diff --git a/nixos/modules/system/boot/systemd-unit-options.nix b/nixos/modules/system/boot/systemd-unit-options.nix
index 16d0e098b8c8..d4cab93b26b8 100644
--- a/nixos/modules/system/boot/systemd-unit-options.nix
+++ b/nixos/modules/system/boot/systemd-unit-options.nix
@@ -17,15 +17,14 @@ in rec {
 
   unitOption = mkOptionType {
     name = "systemd option";
-    typerep = "(systemdOption)";
-    merge = _module: loc: defs:
+    merge = loc: defs:
       let
         defs' = filterOverrides defs;
         defs'' = getValues defs';
       in
         if isList (head defs'')
         then concatLists defs''
-        else mergeOneOption _module loc defs';
+        else mergeOneOption loc defs';
   };
 
   sharedOptions = {
diff --git a/nixos/release.nix b/nixos/release.nix
index 521cae760aef..d8ef23199cb2 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -101,8 +101,6 @@ in rec {
   manpages = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manpages);
   options = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux;
 
-  optionsSpecs = (buildFromConfig ({ pkgs, ... }: { _module.typeInference = "silent"; }) (config: config.system.build.typechecker.specifications)).x86_64-linux;
-
 
   # Build the initial ramdisk so Hydra can keep track of its size over time.
   initialRamdisk = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.initialRamdisk);

From 18a4ca2d052c49d97d900c217d68f08eb7ffc18c Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Tue, 1 Mar 2016 19:50:23 +0000
Subject: [PATCH 2056/2285] zathura-ps: 0.2.2 -> 0.2.3

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

diff --git a/pkgs/applications/misc/zathura/ps/default.nix b/pkgs/applications/misc/zathura/ps/default.nix
index 31ffbf628dd8..630f45a1e41f 100644
--- a/pkgs/applications/misc/zathura/ps/default.nix
+++ b/pkgs/applications/misc/zathura/ps/default.nix
@@ -1,11 +1,11 @@
 { stdenv, lib, fetchurl, pkgconfig, gtk, zathura_core, girara, libspectre, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "zathura-ps-0.2.2";
+  name = "zathura-ps-0.2.3";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
-    sha256 = "1a6ps5v1wk18qvslbkjln6w8wfzzr6fi13ls96vbdc03vdhn4m76";
+    sha256 = "18wsfy8pqficdgj8wy2aws7j4fy8z78157rhqk17mj5f295zgvm9";
   };
 
   buildInputs = [ pkgconfig libspectre gettext zathura_core gtk girara ];

From 7ad9370f0863c0c995b6dd102ea7ce6cbc738430 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Tue, 1 Mar 2016 19:49:27 +0000
Subject: [PATCH 2057/2285] zathura-djvu: 0.2.4 -> 0.2.5

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

diff --git a/pkgs/applications/misc/zathura/djvu/default.nix b/pkgs/applications/misc/zathura/djvu/default.nix
index 00c5464b7d13..21e482b1fd28 100644
--- a/pkgs/applications/misc/zathura/djvu/default.nix
+++ b/pkgs/applications/misc/zathura/djvu/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gtk, zathura_core, girara, djvulibre, gettext }:
 
 stdenv.mkDerivation rec {
-  name = "zathura-djvu-0.2.4";
+  name = "zathura-djvu-0.2.5";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
-    sha256 = "1g1lafmrjbx0xv7fljdmyqxx0k334sq4q6jy4a0q5xfrgz0bh45c";
+    sha256 = "03cw54d2fipvbrnbqy0xccqkx6s77dyhyymx479aj5ryy4513dq8";
   };
 
   buildInputs = [ pkgconfig djvulibre gettext zathura_core gtk girara ];

From 9c86acc479d58785790f9292356a8344e3d70869 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Tue, 1 Mar 2016 19:49:46 +0000
Subject: [PATCH 2058/2285] zathura-pdf-mupdf: 0.2.8 -> 0.3.0

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

diff --git a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
index ad5993cf5819..2b74fc21b8c6 100644
--- a/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-mupdf/default.nix
@@ -1,12 +1,12 @@
 { stdenv, lib, fetchurl, pkgconfig, zathura_core, gtk, girara, mupdf, openssl }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.8";
+  version = "0.3.0";
   name = "zathura-pdf-mupdf-${version}";
 
   src = fetchurl {
     url = "https://pwmt.org/projects/zathura-pdf-mupdf/download/${name}.tar.gz";
-    sha256 = "0439ls8xqnq6hqa53hd0wqxh1qf0xmccfi3pb0m4mlfs5iv952wz";
+    sha256 = "1j3j3wbp49walb19f0966qsnlqbd26wnsjpcxfbf021dav8vk327";
   };
 
   buildInputs = [ pkgconfig zathura_core gtk girara openssl mupdf ];

From df32c2d0c8250e8f0e6bb6ff1eb4d7130012364e Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Tue, 1 Mar 2016 19:52:16 +0000
Subject: [PATCH 2059/2285] zathura-pdf-poppler: 0.2.5 -> 0.2.6

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

diff --git a/pkgs/applications/misc/zathura/pdf-poppler/default.nix b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
index caaab9ec3c77..6c390d1ed855 100644
--- a/pkgs/applications/misc/zathura/pdf-poppler/default.nix
+++ b/pkgs/applications/misc/zathura/pdf-poppler/default.nix
@@ -1,12 +1,12 @@
 { stdenv, lib, fetchurl, pkgconfig, zathura_core, girara, poppler }:
 
 stdenv.mkDerivation rec {
-  version = "0.2.5";
+  version = "0.2.6";
   name = "zathura-pdf-poppler-${version}";
 
   src = fetchurl {
     url = "http://pwmt.org/projects/zathura/plugins/download/${name}.tar.gz";
-    sha256 = "1b0chsds8iwjm4g629p6a67nb6wgra65pw2vvngd7g35dmcjgcv0";
+    sha256 = "1maqiv7yv8d8hymlffa688c5z71v85kbzmx2j88i8z349xx0rsyi";
   };
 
   buildInputs = [ pkgconfig poppler zathura_core girara ];

From ede005ad3fc121042139c7f3a10aca8fb993509c Mon Sep 17 00:00:00 2001
From: Marko Poikonen <marko@poikonen.de>
Date: Tue, 16 Feb 2016 22:44:23 +0100
Subject: [PATCH 2060/2285] Enabling Media PCI adapters (needed for PCI DVB
 cards)

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

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 4de27fd3000d..254910cf842a 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -478,6 +478,7 @@ with stdenv.lib;
   ''}
   ${optionalString (versionAtLeast version "3.7") ''
     MEDIA_USB_SUPPORT y
+    MEDIA_PCI_SUPPORT y
   ''}
 
   # Our initrd init uses shebang scripts, so can't be modular.

From c523cec12c0672666c507143505a7ed7c63bba13 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Tue, 1 Mar 2016 21:02:36 +0100
Subject: [PATCH 2061/2285] josm: 9329 -> 9900

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

diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix
index 9bd7bbb4385c..99e337baa1a4 100644
--- a/pkgs/applications/misc/josm/default.nix
+++ b/pkgs/applications/misc/josm/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "josm-${version}";
-  version = "9329";
+  version = "9900";
 
   src = fetchurl {
     url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
-    sha256 = "084a3pizmz09abn2n7brhx6757bq9k3xq3jy8ip2ifbl2hcrw7pq";
+    sha256 = "1dsfamh2bsiz3xkhmh7g4jz6bbh25x22k3zgj1k0v0gj8k6yl7dy";
   };
 
   phases = [ "installPhase" ];

From 32e751d61648dfc0ede626dc6e93a0f8ed77049d Mon Sep 17 00:00:00 2001
From: Tobias Pflug <tobias.pflug@holidaycheck.com>
Date: Tue, 1 Mar 2016 20:42:09 +0100
Subject: [PATCH 2062/2285] sauce-connect: fix hashes and phases

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

diff --git a/pkgs/development/tools/sauce-connect/default.nix b/pkgs/development/tools/sauce-connect/default.nix
index cc904153baf8..3818020d931f 100644
--- a/pkgs/development/tools/sauce-connect/default.nix
+++ b/pkgs/development/tools/sauce-connect/default.nix
@@ -9,18 +9,18 @@ stdenv.mkDerivation rec {
   src = fetchurl (
     if stdenv.system == "x86_64-linux" then {
       url = "https://saucelabs.com/downloads/sc-${version}-linux.tar.gz";
-      sha1 = "0d7d2dc12766ac137e62a3e4dad3025b590f9782";
+      sha256 = "1flhsssb7wvfbwyvhc9k2di3nd7dlq832xp6dg658xbqk7mr9rvw";
     } else if stdenv.system == "i686-linux" then {
       url = "https://saucelabs.com/downloads/sc-${version}-linux32.tar.gz";
-      sha1 = "ee2c3002eae3b29df801a2ac1db77bb5f1c97bcc";
+      sha256 = "1hy0riljgjf4sf4cg7kn0hd18w393bdwhp0ajyimzvscg05nx8fq";
     } else {
       url = "https://saucelabs.com/downloads/sc-${version}-osx.zip";
-      sha1 = "ihr4ynnyi464pafgqyl5xkhfi13yi76j";
+      sha256 = "1fhclbc79rk6pmf5qzc2pkz1z3nsawr9pfi5bzqs8r1514ki4m4p";
     }
   );
 
   buildInputs = [ unzip ];
-  phases = "unpackPhase installPhase" + (if stdenv.system == "x86_64-darwin" then "" else "patchPhase");
+  phases = "unpackPhase installPhase " + (if stdenv.system == "x86_64-darwin" then "" else "patchPhase");
 
   patchPhase = ''
     patchelf \

From 02891a0de97d965be5b792c60d8287794d3c2e5f Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Mar 2016 22:03:37 +0100
Subject: [PATCH 2063/2285] gnome: Drop installerIso from nix-env evaluation

This makes nix-env -qa depend on NixOS, which is not a good thing.

@lethalman
---
 pkgs/desktops/gnome-3/3.18/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/gnome-3/3.18/default.nix b/pkgs/desktops/gnome-3/3.18/default.nix
index 11e2c7e9bebc..de8b6a5e0dc6 100644
--- a/pkgs/desktops/gnome-3/3.18/default.nix
+++ b/pkgs/desktops/gnome-3/3.18/default.nix
@@ -66,7 +66,7 @@ let
   defaultIconTheme = adwaita-icon-theme;
 
 # ISO installer
-  installerIso = callPackage ./installer.nix {};
+# installerIso = callPackage ./installer.nix {};
 
 #### Core (http://ftp.acc.umu.se/pub/GNOME/core/)
 

From b2197b84c2d140a802cb5b6f009490f76f034010 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Mar 2016 22:07:54 +0100
Subject: [PATCH 2064/2285] Fix NixOS eval

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

diff --git a/nixos/modules/services/misc/octoprint.nix b/nixos/modules/services/misc/octoprint.nix
index 150056b8ab07..9cf46345c228 100644
--- a/nixos/modules/services/misc/octoprint.nix
+++ b/nixos/modules/services/misc/octoprint.nix
@@ -62,7 +62,7 @@ in
       };
 
       plugins = mkOption {
-        type = types.functionTo (types.listOf types.package);
+        #type = types.functionTo (types.listOf types.package);
         default = plugins: [];
         defaultText = "plugins: []";
         example = literalExample "plugins: [ m3d-fio ]";

From d2e15a02d71ec8746d134d2fe5d552d3fb969e6b Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 1 Mar 2016 22:06:58 +0100
Subject: [PATCH 2065/2285] mujs: 2015-09-29 -> 2016-02-22

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

diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix
index 2e8e9b4f9857..c321de4dc9a8 100644
--- a/pkgs/development/interpreters/mujs/default.nix
+++ b/pkgs/development/interpreters/mujs/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchgit, clang }:
 
 stdenv.mkDerivation rec {
-  name = "mujs-2015-09-29";
+  name = "mujs-2016-02-22";
 
   src = fetchgit {
     url = git://git.ghostscript.com/mujs.git;
-    rev  = "08276111f575ac6142e922d62aa264dc1f30b69e";
-    sha256 = "18w7yayrn5p8amack4p23wcz49x9cjh1pmzalrf16fhy3n753hbb";
+    rev  = "624f975aae6b451e35406d8cdde808626052ce2c";
+    sha256 = "0vaskzpi84g56yjfkfri1r0lbkawhn556v0b69xjfls7ngsw346y";
   };
 
   buildInputs = [ clang ];

From 7f8d50b4435941a6895195a14739ec29b1c6aa59 Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Tue, 1 Mar 2016 12:14:33 -0500
Subject: [PATCH 2066/2285] openssh: 7.1p2 -> 7.2p1

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

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index a6aed5169c8b..5bd9c4b7acbd 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -23,11 +23,11 @@ let
 in
 with stdenv.lib;
 stdenv.mkDerivation rec {
-  name = "openssh-7.1p2";
+  name = "openssh-7.2p1";
 
   src = fetchurl {
     url = "mirror://openbsd/OpenSSH/portable/${name}.tar.gz";
-    sha256 = "1gbbvszz74lkc7b2mqr3ccgpm65zj0k5h7a2ssh0c7pjvhjg0xfx";
+    sha256 = "1hsa1f3641pdj57a55gmnvcya3wwww2fc2cvb77y95rm5xxw6g4p";
   };
 
   prePatch = optionalString hpnSupport

From cc71804ab0647839ee4467763fd37397e05a52c6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Tue, 1 Mar 2016 22:24:07 +0100
Subject: [PATCH 2067/2285] openssh: Fix build

---
 pkgs/tools/networking/openssh/default.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 5bd9c4b7acbd..4d3ffb1257f9 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -37,15 +37,7 @@ stdenv.mkDerivation rec {
     '';
 
   patches =
-    [ ./locale_archive.patch
-
-      # Fix "HostKeyAlgoritms +...", which we need to enable DSA
-      # host key support.
-      (fetchurl {
-        url = "https://pkgs.fedoraproject.org/cgit/rpms/openssh.git/plain/openssh-7.1p1-hostkeyalgorithms.patch?id=c98f5597250d6f9a8e8d96960beb6306d150ef0f";
-        sha256 = "029lzp9qv1af8wdm0wwj7qwjj1nimgsjj214jqm3amwz0857qgvp";
-      })
-    ]
+    [ ./locale_archive.patch ]
     ++ optional withGssapiPatches gssapiSrc;
 
   buildInputs = [ zlib openssl libedit pkgconfig pam ]

From afa7d8452903318dd09e742e57899ba745c516cf Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Tue, 1 Mar 2016 22:53:49 +0100
Subject: [PATCH 2068/2285] instead: 2.3.0 -> 2.4.0

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

diff --git a/pkgs/games/instead/default.nix b/pkgs/games/instead/default.nix
index 6d55f2a2d5ce..3dbda395dd69 100644
--- a/pkgs/games/instead/default.nix
+++ b/pkgs/games/instead/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, SDL, SDL_ttf, SDL_image, SDL_mixer, pkgconfig, lua, zlib, unzip }:
 
 let
-  version = "2.3.0";
+  version = "2.4.0";
 
   # I took several games at random from http://instead.syscall.ru/games/
   games = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/project/instead/instead/${version}/instead_${version}.tar.gz";
-    sha256 = "1ldisjkmmcpnmv4vsd25dc1sfiwbr9fcn3hxhl78i4jwlyqgrms8";
+    sha256 = "1xxga3ppgjshxzd0p53vsbaqkpzmjnm4vw0j1v7qbqzjgi3r44ix";
   };
 
   NIX_LDFLAGS = "-llua -lgcc_s";

From e50da7ee6a44fcdb846139b2b902c202959c5f61 Mon Sep 17 00:00:00 2001
From: Maxwell <mhuan13@gmail.com>
Date: Sat, 30 Jan 2016 21:09:37 -0500
Subject: [PATCH 2069/2285] bspwm: add startThroughSession & sessionScript
 option

Add ability to do a more traditional bspwm startup (using the bspwm-session
script provided by nixpkgs.bspwm) as an alternative to directly starting
sxhkd & bspwm

Also added the ability to specify a custom startup script, instead of
relying on the provided bspwm-session
---
 .../services/x11/window-managers/bspwm.nix    | 33 ++++++++++++++++---
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/x11/window-managers/bspwm.nix b/nixos/modules/services/x11/window-managers/bspwm.nix
index 1edf6ba4deb9..271b1b6cf5da 100644
--- a/nixos/modules/services/x11/window-managers/bspwm.nix
+++ b/nixos/modules/services/x11/window-managers/bspwm.nix
@@ -8,16 +8,39 @@ in
 
 {
   options = {
-    services.xserver.windowManager.bspwm.enable = mkEnableOption "bspwm";
+    services.xserver.windowManager.bspwm = {
+        enable = mkEnableOption "bspwm";
+        startThroughSession = mkOption {
+            type = with types; bool;
+            default = false;
+            description = "
+                Start the window manager through the script defined in 
+                sessionScript. Defaults to the the bspwm-session script
+                provided by bspwm
+            ";
+        };
+        sessionScript = mkOption {
+            default = "${pkgs.bspwm}/bin/bspwm-session";
+            defaultText = "(pkgs.bspwm)/bin/bspwm-session";
+            description = "
+                The start-session script to use. Defaults to the
+                provided bspwm-session script from the bspwm package.
+
+                Does nothing unless `bspwm.startThroughSession` is enabled
+            ";
+        };
+    };
   };
 
   config = mkIf cfg.enable {
     services.xserver.windowManager.session = singleton {
       name = "bspwm";
-      start = "
-        SXHKD_SHELL=/bin/sh ${pkgs.sxhkd}/bin/sxhkd -f 100 &
-        ${pkgs.bspwm}/bin/bspwm
-      ";
+      start = if cfg.startThroughSession
+        then cfg.sessionScript
+        else ''
+            SXHKD_SHELL=/bin/sh ${pkgs.sxhkd}/bin/sxhkd -f 100 &
+            ${pkgs.bspwm}/bin/bspwm
+        '';
     };
     environment.systemPackages = [ pkgs.bspwm ];
   };

From 995475944f4213ddef3382ed09ba2fdc10687e1d Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Tue, 1 Mar 2016 22:44:31 +0000
Subject: [PATCH 2070/2285] qt_gstreamer1: add upstream patch to build with
 current gstreamer

---
 .../libraries/gstreamer/qt-gstreamer/default.nix      | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
index b306e737df11..3bd840dcd7ee 100644
--- a/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
+++ b/pkgs/development/libraries/gstreamer/qt-gstreamer/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, gst_all_1, boost, glib, qt4, cmake
+{ stdenv, fetchurl, fetchpatch, gst_all_1, boost, glib, qt4, cmake
 , automoc4, flex, bison, pkgconfig }:
 
 stdenv.mkDerivation rec {
@@ -10,13 +10,20 @@ stdenv.mkDerivation rec {
     sha256 = "9f3b492b74cad9be918e4c4db96df48dab9c012f2ae5667f438b64a4d92e8fd4";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://cgit.freedesktop.org/gstreamer/qt-gstreamer/patch/?id=e2ca8094aa8d0eac1c3a98df66fe94ce0c754088";
+      sha256 = "1qps0nlc26d74wk8h96xl5s3d9qrdx6c0ph0zpl1dnc691lgyf6s";
+    })
+  ];
+
   buildInputs = [ gst_all_1.gstreamer gst_all_1.gst-plugins-base glib qt4 ];
   propagatedBuildInputs = [ boost ];
   nativeBuildInputs = [ cmake automoc4 flex bison pkgconfig ];
 
   cmakeFlags = "-DUSE_QT_PLUGIN_DIR=OFF -DUSE_GST_PLUGIN_DIR=OFF";
 
-  meta = { 
+  meta = {
     platforms = stdenv.lib.platforms.linux;
   };
 }

From 4686bc54a61e332129574adf4a1063937a66e4ac Mon Sep 17 00:00:00 2001
From: Jude Taylor <me@jude.bio>
Date: Tue, 1 Mar 2016 16:06:29 -0800
Subject: [PATCH 2071/2285] add socket.io to interactive ghcjs environments

---
 pkgs/development/compilers/ghcjs/default.nix  |   8 +-
 .../ghcjs/node-packages-generated.nix         | 943 ++++++++++++++++++
 .../compilers/ghcjs/node-packages.json        |   1 +
 .../haskell-modules/generic-builder.nix       |   5 +-
 4 files changed, 954 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/development/compilers/ghcjs/node-packages-generated.nix
 create mode 100644 pkgs/development/compilers/ghcjs/node-packages.json

diff --git a/pkgs/development/compilers/ghcjs/default.nix b/pkgs/development/compilers/ghcjs/default.nix
index 7401a23ddaee..77b3a15cb32f 100644
--- a/pkgs/development/compilers/ghcjs/default.nix
+++ b/pkgs/development/compilers/ghcjs/default.nix
@@ -125,11 +125,17 @@ in mkDerivation (rec {
         --with-gmp-includes ${gmp}/include \
         --with-gmp-libraries ${gmp}/lib
   '';
-  passthru = {
+  passthru = let
+    ghcjsNodePkgs = pkgs.nodePackages.override {
+      generated = ./node-packages-generated.nix;
+      self = ghcjsNodePkgs;
+    };
+  in {
     inherit bootPkgs;
     isCross = true;
     isGhcjs = true;
     inherit nodejs ghcjsBoot;
+    inherit (ghcjsNodePkgs) "socket.io";
   };
 
   homepage = "https://github.com/ghcjs/ghcjs";
diff --git a/pkgs/development/compilers/ghcjs/node-packages-generated.nix b/pkgs/development/compilers/ghcjs/node-packages-generated.nix
new file mode 100644
index 000000000000..a3c882ff76c8
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs/node-packages-generated.nix
@@ -0,0 +1,943 @@
+{ self, fetchurl, fetchgit ? null, lib }:
+
+{
+  by-spec."accepts"."1.1.4" =
+    self.by-version."accepts"."1.1.4";
+  by-version."accepts"."1.1.4" = self.buildNodePackage {
+    name = "accepts-1.1.4";
+    version = "1.1.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz";
+      name = "accepts-1.1.4.tgz";
+      sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a";
+    };
+    deps = {
+      "mime-types-2.0.14" = self.by-version."mime-types"."2.0.14";
+      "negotiator-0.4.9" = self.by-version."negotiator"."0.4.9";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."after"."0.8.1" =
+    self.by-version."after"."0.8.1";
+  by-version."after"."0.8.1" = self.buildNodePackage {
+    name = "after-0.8.1";
+    version = "0.8.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/after/-/after-0.8.1.tgz";
+      name = "after-0.8.1.tgz";
+      sha1 = "ab5d4fb883f596816d3515f8f791c0af486dd627";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."arraybuffer.slice"."0.0.6" =
+    self.by-version."arraybuffer.slice"."0.0.6";
+  by-version."arraybuffer.slice"."0.0.6" = self.buildNodePackage {
+    name = "arraybuffer.slice-0.0.6";
+    version = "0.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.6.tgz";
+      name = "arraybuffer.slice-0.0.6.tgz";
+      sha1 = "f33b2159f0532a3f3107a272c0ccfbd1ad2979ca";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."backo2"."1.0.2" =
+    self.by-version."backo2"."1.0.2";
+  by-version."backo2"."1.0.2" = self.buildNodePackage {
+    name = "backo2-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz";
+      name = "backo2-1.0.2.tgz";
+      sha1 = "31ab1ac8b129363463e35b3ebb69f4dfcfba7947";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."base64-arraybuffer"."0.1.2" =
+    self.by-version."base64-arraybuffer"."0.1.2";
+  by-version."base64-arraybuffer"."0.1.2" = self.buildNodePackage {
+    name = "base64-arraybuffer-0.1.2";
+    version = "0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.2.tgz";
+      name = "base64-arraybuffer-0.1.2.tgz";
+      sha1 = "474df4a9f2da24e05df3158c3b1db3c3cd46a154";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."base64id"."0.1.0" =
+    self.by-version."base64id"."0.1.0";
+  by-version."base64id"."0.1.0" = self.buildNodePackage {
+    name = "base64id-0.1.0";
+    version = "0.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/base64id/-/base64id-0.1.0.tgz";
+      name = "base64id-0.1.0.tgz";
+      sha1 = "02ce0fdeee0cef4f40080e1e73e834f0b1bfce3f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."benchmark"."1.0.0" =
+    self.by-version."benchmark"."1.0.0";
+  by-version."benchmark"."1.0.0" = self.buildNodePackage {
+    name = "benchmark-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/benchmark/-/benchmark-1.0.0.tgz";
+      name = "benchmark-1.0.0.tgz";
+      sha1 = "2f1e2fa4c359f11122aa183082218e957e390c73";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."better-assert"."~1.0.0" =
+    self.by-version."better-assert"."1.0.2";
+  by-version."better-assert"."1.0.2" = self.buildNodePackage {
+    name = "better-assert-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz";
+      name = "better-assert-1.0.2.tgz";
+      sha1 = "40866b9e1b9e0b55b481894311e68faffaebc522";
+    };
+    deps = {
+      "callsite-1.0.0" = self.by-version."callsite"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."blob"."0.0.4" =
+    self.by-version."blob"."0.0.4";
+  by-version."blob"."0.0.4" = self.buildNodePackage {
+    name = "blob-0.0.4";
+    version = "0.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/blob/-/blob-0.0.4.tgz";
+      name = "blob-0.0.4.tgz";
+      sha1 = "bcf13052ca54463f30f9fc7e95b9a47630a94921";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."callsite"."1.0.0" =
+    self.by-version."callsite"."1.0.0";
+  by-version."callsite"."1.0.0" = self.buildNodePackage {
+    name = "callsite-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz";
+      name = "callsite-1.0.0.tgz";
+      sha1 = "280398e5d664bd74038b6f0905153e6e8af1bc20";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."component-bind"."1.0.0" =
+    self.by-version."component-bind"."1.0.0";
+  by-version."component-bind"."1.0.0" = self.buildNodePackage {
+    name = "component-bind-1.0.0";
+    version = "1.0.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz";
+      name = "component-bind-1.0.0.tgz";
+      sha1 = "00c608ab7dcd93897c0009651b1d3a8e1e73bbd1";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."component-emitter"."1.1.2" =
+    self.by-version."component-emitter"."1.1.2";
+  by-version."component-emitter"."1.1.2" = self.buildNodePackage {
+    name = "component-emitter-1.1.2";
+    version = "1.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.1.2.tgz";
+      name = "component-emitter-1.1.2.tgz";
+      sha1 = "296594f2753daa63996d2af08d15a95116c9aec3";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."component-emitter"."1.2.0" =
+    self.by-version."component-emitter"."1.2.0";
+  by-version."component-emitter"."1.2.0" = self.buildNodePackage {
+    name = "component-emitter-1.2.0";
+    version = "1.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/component-emitter/-/component-emitter-1.2.0.tgz";
+      name = "component-emitter-1.2.0.tgz";
+      sha1 = "ccd113a86388d06482d03de3fc7df98526ba8efe";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."component-inherit"."0.0.3" =
+    self.by-version."component-inherit"."0.0.3";
+  by-version."component-inherit"."0.0.3" = self.buildNodePackage {
+    name = "component-inherit-0.0.3";
+    version = "0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz";
+      name = "component-inherit-0.0.3.tgz";
+      sha1 = "645fc4adf58b72b649d5cae65135619db26ff143";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."debug"."0.7.4" =
+    self.by-version."debug"."0.7.4";
+  by-version."debug"."0.7.4" = self.buildNodePackage {
+    name = "debug-0.7.4";
+    version = "0.7.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/debug-0.7.4.tgz";
+      name = "debug-0.7.4.tgz";
+      sha1 = "06e1ea8082c2cb14e39806e22e2f6f757f92af39";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."debug"."2.2.0" =
+    self.by-version."debug"."2.2.0";
+  by-version."debug"."2.2.0" = self.buildNodePackage {
+    name = "debug-2.2.0";
+    version = "2.2.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/debug/-/debug-2.2.0.tgz";
+      name = "debug-2.2.0.tgz";
+      sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da";
+    };
+    deps = {
+      "ms-0.7.1" = self.by-version."ms"."0.7.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    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";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/engine.io/-/engine.io-1.6.8.tgz";
+      name = "engine.io-1.6.8.tgz";
+      sha1 = "de05a06b757e7517695e088c7b051c47819f511b";
+    };
+    deps = {
+      "base64id-0.1.0" = self.by-version."base64id"."0.1.0";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "ws-1.0.1" = self.by-version."ws"."1.0.1";
+      "engine.io-parser-1.2.4" = self.by-version."engine.io-parser"."1.2.4";
+      "accepts-1.1.4" = self.by-version."accepts"."1.1.4";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    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";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/engine.io-client/-/engine.io-client-1.6.8.tgz";
+      name = "engine.io-client-1.6.8.tgz";
+      sha1 = "6e2db11648b45e405c46b172ea3e3dac37cc0ceb";
+    };
+    deps = {
+      "has-cors-1.1.0" = self.by-version."has-cors"."1.1.0";
+      "ws-1.0.1" = self.by-version."ws"."1.0.1";
+      "xmlhttprequest-ssl-1.5.1" = self.by-version."xmlhttprequest-ssl"."1.5.1";
+      "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
+      "indexof-0.0.1" = self.by-version."indexof"."0.0.1";
+      "engine.io-parser-1.2.4" = self.by-version."engine.io-parser"."1.2.4";
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "parseuri-0.0.4" = self.by-version."parseuri"."0.0.4";
+      "parsejson-0.0.1" = self.by-version."parsejson"."0.0.1";
+      "parseqs-0.0.2" = self.by-version."parseqs"."0.0.2";
+      "component-inherit-0.0.3" = self.by-version."component-inherit"."0.0.3";
+      "yeast-0.1.2" = self.by-version."yeast"."0.1.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."engine.io-parser"."1.2.4" =
+    self.by-version."engine.io-parser"."1.2.4";
+  by-version."engine.io-parser"."1.2.4" = self.buildNodePackage {
+    name = "engine.io-parser-1.2.4";
+    version = "1.2.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/engine.io-parser/-/engine.io-parser-1.2.4.tgz";
+      name = "engine.io-parser-1.2.4.tgz";
+      sha1 = "e0897b0bf14e792d4cd2a5950553919c56948c42";
+    };
+    deps = {
+      "after-0.8.1" = self.by-version."after"."0.8.1";
+      "arraybuffer.slice-0.0.6" = self.by-version."arraybuffer.slice"."0.0.6";
+      "base64-arraybuffer-0.1.2" = self.by-version."base64-arraybuffer"."0.1.2";
+      "blob-0.0.4" = self.by-version."blob"."0.0.4";
+      "has-binary-0.1.6" = self.by-version."has-binary"."0.1.6";
+      "utf8-2.1.0" = self.by-version."utf8"."2.1.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."has-binary"."0.1.6" =
+    self.by-version."has-binary"."0.1.6";
+  by-version."has-binary"."0.1.6" = self.buildNodePackage {
+    name = "has-binary-0.1.6";
+    version = "0.1.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/has-binary/-/has-binary-0.1.6.tgz";
+      name = "has-binary-0.1.6.tgz";
+      sha1 = "25326f39cfa4f616ad8787894e3af2cfbc7b6e10";
+    };
+    deps = {
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."has-binary"."0.1.7" =
+    self.by-version."has-binary"."0.1.7";
+  by-version."has-binary"."0.1.7" = self.buildNodePackage {
+    name = "has-binary-0.1.7";
+    version = "0.1.7";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/has-binary/-/has-binary-0.1.7.tgz";
+      name = "has-binary-0.1.7.tgz";
+      sha1 = "68e61eb16210c9545a0a5cce06a873912fe1e68c";
+    };
+    deps = {
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."has-cors"."1.1.0" =
+    self.by-version."has-cors"."1.1.0";
+  by-version."has-cors"."1.1.0" = self.buildNodePackage {
+    name = "has-cors-1.1.0";
+    version = "1.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz";
+      name = "has-cors-1.1.0.tgz";
+      sha1 = "5e474793f7ea9843d1bb99c23eef49ff126fff39";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."indexof"."0.0.1" =
+    self.by-version."indexof"."0.0.1";
+  by-version."indexof"."0.0.1" = self.buildNodePackage {
+    name = "indexof-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz";
+      name = "indexof-0.0.1.tgz";
+      sha1 = "82dc336d232b9062179d05ab3293a66059fd435d";
+    };
+    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 {
+    name = "isarray-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz";
+      name = "isarray-0.0.1.tgz";
+      sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."json3"."3.2.6" =
+    self.by-version."json3"."3.2.6";
+  by-version."json3"."3.2.6" = self.buildNodePackage {
+    name = "json3-3.2.6";
+    version = "3.2.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/json3/-/json3-3.2.6.tgz";
+      name = "json3-3.2.6.tgz";
+      sha1 = "f6efc93c06a04de9aec53053df2559bb19e2038b";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."json3"."3.3.2" =
+    self.by-version."json3"."3.3.2";
+  by-version."json3"."3.3.2" = self.buildNodePackage {
+    name = "json3-3.3.2";
+    version = "3.3.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/json3/-/json3-3.3.2.tgz";
+      name = "json3-3.3.2.tgz";
+      sha1 = "3c0434743df93e2f5c42aee7b19bcb483575f4e1";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-db"."~1.12.0" =
+    self.by-version."mime-db"."1.12.0";
+  by-version."mime-db"."1.12.0" = self.buildNodePackage {
+    name = "mime-db-1.12.0";
+    version = "1.12.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz";
+      name = "mime-db-1.12.0.tgz";
+      sha1 = "3d0c63180f458eb10d325aaa37d7c58ae312e9d7";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."mime-types"."~2.0.4" =
+    self.by-version."mime-types"."2.0.14";
+  by-version."mime-types"."2.0.14" = self.buildNodePackage {
+    name = "mime-types-2.0.14";
+    version = "2.0.14";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz";
+      name = "mime-types-2.0.14.tgz";
+      sha1 = "310e159db23e077f8bb22b748dabfa4957140aa6";
+    };
+    deps = {
+      "mime-db-1.12.0" = self.by-version."mime-db"."1.12.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ms"."0.7.1" =
+    self.by-version."ms"."0.7.1";
+  by-version."ms"."0.7.1" = self.buildNodePackage {
+    name = "ms-0.7.1";
+    version = "0.7.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ms/-/ms-0.7.1.tgz";
+      name = "ms-0.7.1.tgz";
+      sha1 = "9cd13c03adbff25b65effde7ce864ee952017098";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."negotiator"."0.4.9" =
+    self.by-version."negotiator"."0.4.9";
+  by-version."negotiator"."0.4.9" = self.buildNodePackage {
+    name = "negotiator-0.4.9";
+    version = "0.4.9";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.9.tgz";
+      name = "negotiator-0.4.9.tgz";
+      sha1 = "92e46b6db53c7e421ed64a2bc94f08be7630df3f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."object-component"."0.0.3" =
+    self.by-version."object-component"."0.0.3";
+  by-version."object-component"."0.0.3" = self.buildNodePackage {
+    name = "object-component-0.0.3";
+    version = "0.0.3";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz";
+      name = "object-component-0.0.3.tgz";
+      sha1 = "f0c69aa50efc95b866c186f400a33769cb2f1291";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."options".">=0.0.5" =
+    self.by-version."options"."0.0.6";
+  by-version."options"."0.0.6" = self.buildNodePackage {
+    name = "options-0.0.6";
+    version = "0.0.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz";
+      name = "options-0.0.6.tgz";
+      sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."parsejson"."0.0.1" =
+    self.by-version."parsejson"."0.0.1";
+  by-version."parsejson"."0.0.1" = self.buildNodePackage {
+    name = "parsejson-0.0.1";
+    version = "0.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parsejson/-/parsejson-0.0.1.tgz";
+      name = "parsejson-0.0.1.tgz";
+      sha1 = "9b10c6c0d825ab589e685153826de0a3ba278bcc";
+    };
+    deps = {
+      "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."parseqs"."0.0.2" =
+    self.by-version."parseqs"."0.0.2";
+  by-version."parseqs"."0.0.2" = self.buildNodePackage {
+    name = "parseqs-0.0.2";
+    version = "0.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parseqs/-/parseqs-0.0.2.tgz";
+      name = "parseqs-0.0.2.tgz";
+      sha1 = "9dfe70b2cddac388bde4f35b1f240fa58adbe6c7";
+    };
+    deps = {
+      "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."parseuri"."0.0.4" =
+    self.by-version."parseuri"."0.0.4";
+  by-version."parseuri"."0.0.4" = self.buildNodePackage {
+    name = "parseuri-0.0.4";
+    version = "0.0.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/parseuri/-/parseuri-0.0.4.tgz";
+      name = "parseuri-0.0.4.tgz";
+      sha1 = "806582a39887e1ea18dd5e2fe0e01902268e9350";
+    };
+    deps = {
+      "better-assert-1.0.2" = self.by-version."better-assert"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."socket.io"."*" =
+    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";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io/-/socket.io-1.4.5.tgz";
+      name = "socket.io-1.4.5.tgz";
+      sha1 = "f202f49eeb9cf7cf6c0971ad75d8d96d451ea4f7";
+    };
+    deps = {
+      "engine.io-1.6.8" = self.by-version."engine.io"."1.6.8";
+      "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-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";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  "socket.io" = self.by-version."socket.io"."1.4.5";
+  by-spec."socket.io-adapter"."0.4.0" =
+    self.by-version."socket.io-adapter"."0.4.0";
+  by-version."socket.io-adapter"."0.4.0" = self.buildNodePackage {
+    name = "socket.io-adapter-0.4.0";
+    version = "0.4.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-0.4.0.tgz";
+      name = "socket.io-adapter-0.4.0.tgz";
+      sha1 = "fb9f82ab1aa65290bf72c3657955b930a991a24f";
+    };
+    deps = {
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "socket.io-parser-2.2.2" = self.by-version."socket.io-parser"."2.2.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    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";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io-client/-/socket.io-client-1.4.5.tgz";
+      name = "socket.io-client-1.4.5.tgz";
+      sha1 = "400d630c31e7c9579e45173f977e4f5bd8dc7d2e";
+    };
+    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";
+      "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";
+      "socket.io-parser-2.2.6" = self.by-version."socket.io-parser"."2.2.6";
+      "has-binary-0.1.7" = self.by-version."has-binary"."0.1.7";
+      "indexof-0.0.1" = self.by-version."indexof"."0.0.1";
+      "parseuri-0.0.4" = self.by-version."parseuri"."0.0.4";
+      "to-array-0.1.4" = self.by-version."to-array"."0.1.4";
+      "backo2-1.0.2" = self.by-version."backo2"."1.0.2";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."socket.io-parser"."2.2.2" =
+    self.by-version."socket.io-parser"."2.2.2";
+  by-version."socket.io-parser"."2.2.2" = self.buildNodePackage {
+    name = "socket.io-parser-2.2.2";
+    version = "2.2.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.2.tgz";
+      name = "socket.io-parser-2.2.2.tgz";
+      sha1 = "3d7af6b64497e956b7d9fe775f999716027f9417";
+    };
+    deps = {
+      "debug-0.7.4" = self.by-version."debug"."0.7.4";
+      "json3-3.2.6" = self.by-version."json3"."3.2.6";
+      "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+      "benchmark-1.0.0" = self.by-version."benchmark"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."socket.io-parser"."2.2.6" =
+    self.by-version."socket.io-parser"."2.2.6";
+  by-version."socket.io-parser"."2.2.6" = self.buildNodePackage {
+    name = "socket.io-parser-2.2.6";
+    version = "2.2.6";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/socket.io-parser/-/socket.io-parser-2.2.6.tgz";
+      name = "socket.io-parser-2.2.6.tgz";
+      sha1 = "38dfd61df50dcf8ab1d9e2091322bf902ba28b99";
+    };
+    deps = {
+      "debug-2.2.0" = self.by-version."debug"."2.2.0";
+      "json3-3.3.2" = self.by-version."json3"."3.3.2";
+      "component-emitter-1.1.2" = self.by-version."component-emitter"."1.1.2";
+      "isarray-0.0.1" = self.by-version."isarray"."0.0.1";
+      "benchmark-1.0.0" = self.by-version."benchmark"."1.0.0";
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."to-array"."0.1.4" =
+    self.by-version."to-array"."0.1.4";
+  by-version."to-array"."0.1.4" = self.buildNodePackage {
+    name = "to-array-0.1.4";
+    version = "0.1.4";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz";
+      name = "to-array-0.1.4.tgz";
+      sha1 = "17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ultron"."1.0.x" =
+    self.by-version."ultron"."1.0.2";
+  by-version."ultron"."1.0.2" = self.buildNodePackage {
+    name = "ultron-1.0.2";
+    version = "1.0.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz";
+      name = "ultron-1.0.2.tgz";
+      sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."utf8"."2.1.0" =
+    self.by-version."utf8"."2.1.0";
+  by-version."utf8"."2.1.0" = self.buildNodePackage {
+    name = "utf8-2.1.0";
+    version = "2.1.0";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/utf8/-/utf8-2.1.0.tgz";
+      name = "utf8-2.1.0.tgz";
+      sha1 = "0cfec5c8052d44a23e3aaa908104e8075f95dfd5";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."ws"."1.0.1" =
+    self.by-version."ws"."1.0.1";
+  by-version."ws"."1.0.1" = self.buildNodePackage {
+    name = "ws-1.0.1";
+    version = "1.0.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/ws/-/ws-1.0.1.tgz";
+      name = "ws-1.0.1.tgz";
+      sha1 = "7d0b2a2e58cddd819039c29c9de65045e1b310e9";
+    };
+    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."xmlhttprequest-ssl"."1.5.1" =
+    self.by-version."xmlhttprequest-ssl"."1.5.1";
+  by-version."xmlhttprequest-ssl"."1.5.1" = self.buildNodePackage {
+    name = "xmlhttprequest-ssl-1.5.1";
+    version = "1.5.1";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.1.tgz";
+      name = "xmlhttprequest-ssl-1.5.1.tgz";
+      sha1 = "3b7741fea4a86675976e908d296d4445961faa67";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+  by-spec."yeast"."0.1.2" =
+    self.by-version."yeast"."0.1.2";
+  by-version."yeast"."0.1.2" = self.buildNodePackage {
+    name = "yeast-0.1.2";
+    version = "0.1.2";
+    bin = false;
+    src = fetchurl {
+      url = "http://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz";
+      name = "yeast-0.1.2.tgz";
+      sha1 = "008e06d8094320c372dbc2f8ed76a0ca6c8ac419";
+    };
+    deps = {
+    };
+    optionalDependencies = {
+    };
+    peerDependencies = [];
+    os = [ ];
+    cpu = [ ];
+  };
+}
diff --git a/pkgs/development/compilers/ghcjs/node-packages.json b/pkgs/development/compilers/ghcjs/node-packages.json
new file mode 100644
index 000000000000..55fa86675e7a
--- /dev/null
+++ b/pkgs/development/compilers/ghcjs/node-packages.json
@@ -0,0 +1 @@
+[ "socket.io" ]
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index 8b54a19c2b59..2700caa1a5ba 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, ghc, pkgconfig, glibcLocales, coreutils, gnugrep, gnused
-, jailbreak-cabal, hscolour, cpphs
+, jailbreak-cabal, hscolour, cpphs, nodePackages
 }:
 
 { pname
@@ -282,7 +282,8 @@ stdenv.mkDerivation ({
 
     env = stdenv.mkDerivation {
       name = "interactive-${pname}-${version}-environment";
-      nativeBuildInputs = [ ghcEnv systemBuildInputs ];
+      nativeBuildInputs = [ ghcEnv systemBuildInputs ]
+        ++ optional isGhcjs ghc."socket.io"; # for ghcjsi
       LANG = "en_US.UTF-8";
       LOCALE_ARCHIVE = optionalString stdenv.isLinux "${glibcLocales}/lib/locale/locale-archive";
       shellHook = ''

From a429444a75f0ece433b6653b2f82a4876f8b07c8 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 2 Mar 2016 02:18:35 +0100
Subject: [PATCH 2072/2285] nixos/release: Replace a: b: a // b by mergeAttrs

No change in functionality, it just looks nicer that way.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 nixos/release.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/release.nix b/nixos/release.nix
index fb74766e67c6..069cf3727de7 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -31,7 +31,7 @@ let
   # If the test is only for a particular system, use only the specified
   # system instead of generating attributes for all available systems.
   in if args ? system then discover (import fn args)
-     else foldAttrs (a: b: a // b) {} (map discoverForSystem supportedSystems);
+     else foldAttrs mergeAttrs {} (map discoverForSystem supportedSystems);
 
   pkgs = import nixpkgs { system = "x86_64-linux"; };
 

From f681ceb5935ac8688b9d707b92c49fdf8ca589b3 Mon Sep 17 00:00:00 2001
From: Derek Gonyeo <derek@gonyeo.com>
Date: Tue, 1 Mar 2016 23:14:25 -0500
Subject: [PATCH 2073/2285] uzbl: version 20120514 -> v0.9.0

---
 .../networking/browsers/uzbl/default.nix       | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix
index 318b95763920..9e3b44f4083d 100644
--- a/pkgs/applications/networking/browsers/uzbl/default.nix
+++ b/pkgs/applications/networking/browsers/uzbl/default.nix
@@ -1,27 +1,29 @@
-{ stdenv, fetchurl, pkgconfig, python, makeWrapper, pygtk
-, webkit, glib_networking, gsettings_desktop_schemas
+{ stdenv, fetchurl, pkgconfig, python3, makeWrapper, pygtk
+, webkit, glib_networking, gsettings_desktop_schemas, pythonPackages
 }:
 
 stdenv.mkDerivation rec {
-  name = "uzbl-20120514";
+  name = "uzbl-v0.9.0";
 
   meta = with stdenv.lib; {
     description = "Tiny externally controllable webkit browser";
     homepage    = "http://uzbl.org/";
     license     = licenses.gpl3;
     platforms   = platforms.linux;
-    maintainers = with maintainers; [ raskin ];
+    maintainers = with maintainers; [ raskin dgonyeo ];
   };
 
   src = fetchurl {
     name = "${name}.tar.gz";
-    url = "https://github.com/uzbl/uzbl/archive/2012.05.14.tar.gz";
-    sha256 = "1flpf0rg0c3n9bjifr37zxljn9yxslg8vkll7ghkm341x76cbkwn";
+    url = "https://github.com/uzbl/uzbl/archive/v0.9.0.tar.gz";
+    sha256 = "0iskhv653fdm5raiidimh9fzlsw28zjqx7b5n3fl1wgbj6yz074k";
   };
 
   preConfigure = ''
     makeFlags="$makeFlags PREFIX=$out"
     makeFlags="$makeFlags PYINSTALL_EXTRA=--prefix=$out"
+    mkdir -p $out/lib/python3.4/site-packages/
+    export PYTHONPATH=$PYTHONPATH:$out/lib/python3.4/site-packages/
   '';
 
   preFixup = ''
@@ -33,7 +35,7 @@ stdenv.mkDerivation rec {
     done
   '';
 
-  nativeBuildInputs = [ pkgconfig python makeWrapper ];
+  nativeBuildInputs = [ pkgconfig python3 makeWrapper ];
 
-  buildInputs = [ gsettings_desktop_schemas webkit pygtk ];
+  buildInputs = [ gsettings_desktop_schemas webkit pygtk pythonPackages.six ];
 }

From 8f4a7d6c4c4eae6fb82ccf2fc33a88e03d5fd8c4 Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 26 Feb 2016 17:33:45 +0100
Subject: [PATCH 2074/2285] pkgs.motuclient: move application away from
 pythonPackages

---
 .../science/misc/motu-client/default.nix      | 23 ++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +-
 pkgs/top-level/python-packages.nix            | 26 -------------------
 3 files changed, 24 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/applications/science/misc/motu-client/default.nix

diff --git a/pkgs/applications/science/misc/motu-client/default.nix b/pkgs/applications/science/misc/motu-client/default.nix
new file mode 100644
index 000000000000..b5e9fa6a51ee
--- /dev/null
+++ b/pkgs/applications/science/misc/motu-client/default.nix
@@ -0,0 +1,23 @@
+{ python27Packages, fetchurl, lib } :
+python27Packages.buildPythonApplication rec {
+  name = "motu-client-${version}";
+  version = "1.0.8";
+
+  src = fetchurl {
+    url = "https://github.com/quiet-oceans/motuclient-setuptools/archive/${name}.tar.gz";
+    sha256 = "1naqmav312agn72iad9kyxwscn2lz4v1cfcqqi1qcgvc82vnwkw2";
+  };
+
+  meta = with lib; {
+    homepage = https://github.com/quiet-oceans/motuclient-setuptools;
+    description = "CLI to query oceanographic data to Motu servers";
+    longDescription = ''
+      Access data from (motu)[http://sourceforge.net/projects/cls-motu/] servers.
+      This is a refactored fork of the original release in order to simplify integration,
+      deployment and packaging. Upstream code can be found at
+      http://sourceforge.net/projects/cls-motu/ .
+    '';
+    license = licenses.lgpl3Plus;
+    maintainers = [ maintainers.lsix ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dd24b79e54b2..976063d8dd60 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2458,7 +2458,7 @@ let
     inherit (perlPackages) IOTty;
   };
 
-  motuclient = python27Packages.motuclient;
+  motuclient = callPackage ../applications/science/misc/motu-client { };
 
   mpage = callPackage ../tools/text/mpage { };
 
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ff2fe1e840af..ce794867e27f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6397,32 +6397,6 @@ in modules // {
     };
   };
 
-  motuclient = buildPythonPackage rec {
-    name = "motu-client-${version}";
-    version = "1.0.8";
-
-    namePrefix = "";
-    disabled = !isPy27;
-
-    src = pkgs.fetchurl {
-      url = "https://github.com/quiet-oceans/motuclient-setuptools/archive/${name}.tar.gz";
-      sha256 = "1naqmav312agn72iad9kyxwscn2lz4v1cfcqqi1qcgvc82vnwkw2";
-    };
-
-    meta = {
-      homepage = https://github.com/quiet-oceans/motuclient-setuptools;
-      description = "CLI to query oceanographic data to Motu servers";
-      longDescription = ''
-        Access data from (motu)[http://sourceforge.net/projects/cls-motu/] servers.
-        This is a refactored fork of the original release in order to simplify integration,
-        deployment and packaging. Upstream code can be found at
-        http://sourceforge.net/projects/cls-motu/ .
-      '';
-      license = licenses.lgpl3Plus;
-      maintainers = [ maintainers.lsix ];
-    };
-  };
-
   mwlib-ext = buildPythonPackage rec {
     version = "0.13.2";
     name = "mwlib.ext-${version}";

From a95e65b1eb966249b40f5c3d840f4cc58e67d53d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Wed, 2 Mar 2016 12:42:20 +0100
Subject: [PATCH 2075/2285] gtkwave: update to 3.3.70

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

diff --git a/pkgs/applications/science/electronics/gtkwave/default.nix b/pkgs/applications/science/electronics/gtkwave/default.nix
index 36c3b7e899dd..32d39d8a609d 100644
--- a/pkgs/applications/science/electronics/gtkwave/default.nix
+++ b/pkgs/applications/science/electronics/gtkwave/default.nix
@@ -1,10 +1,10 @@
 {stdenv, fetchurl, gtk, gperf, pkgconfig, bzip2, tcl, tk, judy, xz}:
 stdenv.mkDerivation rec {
-  name = "gtkwave-3.3.66";
+  name = "gtkwave-3.3.70";
 
   src = fetchurl {
     url = "mirror://sourceforge/gtkwave/${name}.tar.gz";
-    sha256 = "17mrmgr6zzl1x1qml0wmjjhcbw7bg3w4mqy60rsy0z6gxd8hikh4";
+    sha256 = "1akzf1sq8mwarrbrbz5chrvgwlsp444h5za8rg1dfyqk733s7piz";
   };
 
   buildInputs = [ gtk gperf pkgconfig bzip2 tcl tk judy xz ];

From 49f23a602817745a222cb59de1375cdd92b2e1f1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Mar 2016 12:48:28 +0100
Subject: [PATCH 2076/2285] m2crypto: 0.21.1 -> 0.23.0

The previous version broke because it required SSLv2 support in OpenSSL:

ImportError: /nix/store/c0z7qlycaa2jhqjq0v9vy3j4nw4layw2-python2.7-m2crypto-0.21.1/lib/python2.7/site-packages/M2Crypto/__m2crypto.so: undefined symbol: SSLv2_method
---
 pkgs/top-level/python-packages.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ff2fe1e840af..760cb9df68f4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11236,17 +11236,19 @@ in modules // {
 
 
   m2crypto = buildPythonPackage rec {
-    version = "0.21.1";
+    version = "0.23.0";
     name = "m2crypto-${version}";
 
     src = pkgs.fetchurl {
       url = "http://pypi.python.org/packages/source/M/M2Crypto/M2Crypto-${version}.tar.gz";
-      md5 = "f93d8462ff7646397a9f77a2fe602d17";
+      md5 = "89557730e245294a6cab06de8ad4fb42";
     };
 
     buildInputs = with self; [ pkgs.swig2 pkgs.openssl ];
 
-    preBuild = "${python}/bin/${python.executable} setup.py build_ext --openssl=${pkgs.openssl}";
+    preConfigure = ''
+      substituteInPlace setup.py --replace "self.openssl = '/usr'" "self.openssl = '${pkgs.openssl}'"
+    '';
 
     doCheck = false; # another test that depends on the network.
 

From 7ddd6fc1c3672e82bcc2dba8d10cc83565d873c3 Mon Sep 17 00:00:00 2001
From: artuuge <artuuge@gmail.com>
Date: Wed, 2 Mar 2016 14:49:23 +0100
Subject: [PATCH 2077/2285] epson-escpr: 1.6.3 -> 1.6.4

---
 pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch | 2 +-
 pkgs/misc/drivers/epson-escpr/default.nix                | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch b/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch
index 3065ed1a10f5..78d278f186b5 100644
--- a/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch
+++ b/pkgs/misc/drivers/epson-escpr/cups-filter-ppd-dirs.patch
@@ -1,5 +1,5 @@
 diff --git a/configure b/configure_new
-index c3e7199..ccbf290 100755
+index 3d6f68c..c2b10ff 100755
 --- a/configure
 +++ b/configure_new
 @@ -11585,55 +11585,8 @@ else
diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix
index 1f403947acb5..305f0d78a0bb 100644
--- a/pkgs/misc/drivers/epson-escpr/default.nix
+++ b/pkgs/misc/drivers/epson-escpr/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, cups }:
 
 let
-  version = "1.6.3";
+  version = "1.6.4";
 in
   stdenv.mkDerivation {
 
     name = "epson-escpr-${version}";
   
     src = fetchurl {
-      url = "https://download3.ebz.epson.net/dsc/f/03/00/04/33/53/0177a44361d3dfeacf7f15ff4a347cef373688da/epson-inkjet-printer-escpr-1.6.3-1lsb3.2.tar.gz";
-      sha256 = "4988479ce7dd5513bfa1cce4a83f82348572d8d69d6aa3b2c6e154a58a04ad86"; 
+      url = "https://download3.ebz.epson.net/dsc/f/03/00/04/37/97/88177bc0dc7025905eae4a0da1e841408f82e33c/epson-inkjet-printer-escpr-1.6.4-1lsb3.2.tar.gz"; 
+      sha256 = "76c66461a30be82b9cc37d663147a72f488fe060ef54578120602bb87a3f7754"; 
     }; 
 
     patches = [ ./cups-filter-ppd-dirs.patch ]; 

From 4e906f9fb25b8bcf2355f2545a2476430ec4ecb5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Mar 2016 14:51:41 +0100
Subject: [PATCH 2078/2285] perl-packages.nix: Remove unnecessary variable
 quotations

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

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 41e46f32342c..e61f24ae3c2a 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1415,7 +1415,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  "CGI" = buildPerlPackage rec {
+  CGI = buildPerlPackage rec {
     name = "CGI-4.26";
     src = fetchurl {
       url = "mirror://cpan/authors/id/L/LE/LEEJO/${name}.tar.gz";
@@ -3521,7 +3521,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  "DevelDeclare" = buildPerlPackage rec {
+  DevelDeclare = buildPerlPackage rec {
     name = "Devel-Declare-0.006018";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
@@ -6900,7 +6900,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  "LWP" = buildPerlPackage rec {
+  LWP = buildPerlPackage rec {
     name = "libwww-perl-6.15";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
@@ -8239,7 +8239,7 @@ let self = _self // overrides; _self = with self; {
       [ ClassMOP Moose namespaceautoclean ListMoreUtils ];
   };
 
-  "MooseXTypes" = buildPerlPackage rec {
+  MooseXTypes = buildPerlPackage rec {
     name = "MooseX-Types-0.46";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
@@ -8255,7 +8255,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  "MooseXTypesCommon" = buildPerlPackage rec {
+  MooseXTypesCommon = buildPerlPackage rec {
     name = "MooseX-Types-Common-0.001013";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
@@ -10716,7 +10716,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  "SubExporterForMethods" = buildPerlPackage rec {
+  SubExporterForMethods = buildPerlPackage rec {
     name = "Sub-Exporter-ForMethods-0.100052";
     src = fetchurl {
       url = "mirror://cpan/authors/id/R/RJ/RJBS/${name}.tar.gz";
@@ -11975,7 +11975,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  "TestWarnings" = buildPerlPackage rec {
+  TestWarnings = buildPerlPackage rec {
     name = "Test-Warnings-0.026";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
@@ -13002,7 +13002,7 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  "URI" = buildPerlPackage rec {
+  URI = buildPerlPackage rec {
     name = "URI-1.71";
     src = fetchurl {
       url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";

From bd7f379a3f4d661a0ae611e7ca4d7d85297f13d7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Mar 2016 15:00:32 +0100
Subject: [PATCH 2079/2285] LWP::Protocol::https: Fix SSL cert handling

We lost this in 9f358f809d1db46f3206d4a09a5366f13c93e777. Updated to
use /etc/ssl/certs/ca-certificates.crt if it exists and SSL_CERT_FILE
is not set.
---
 .../lwp-protocol-https-cert-file.patch            | 15 +++++++++++++++
 pkgs/top-level/perl-packages.nix                  |  1 +
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch

diff --git a/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch
new file mode 100644
index 000000000000..119c8b61da36
--- /dev/null
+++ b/pkgs/development/perl-modules/lwp-protocol-https-cert-file.patch
@@ -0,0 +1,15 @@
+diff -ru -x '*~' LWP-Protocol-https-6.04-orig/lib/LWP/Protocol/https.pm LWP-Protocol-https-6.04/lib/LWP/Protocol/https.pm
+--- LWP-Protocol-https-6.04-orig/lib/LWP/Protocol/https.pm	2013-04-29 23:16:18.000000000 +0200
++++ LWP-Protocol-https-6.04/lib/LWP/Protocol/https.pm	2016-03-02 14:59:01.639844511 +0100
+@@ -24,6 +24,11 @@
+     }
+     if ($ssl_opts{SSL_verify_mode}) {
+ 	unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
++	    $ssl_opts{SSL_ca_file} = $ENV{'SSL_CERT_FILE'};
++	    $ssl_opts{SSL_ca_file} = "/etc/ssl/certs/ca-certificates.crt"
++		if !defined $ssl_opts{SSL_ca_file} && -e "/etc/ssl/certs/ca-certificates.crt";
++	}
++	unless (exists $ssl_opts{SSL_ca_file} || exists $ssl_opts{SSL_ca_path}) {
+ 	    eval {
+ 		require Mozilla::CA;
+ 	    };
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index e61f24ae3c2a..18ef6145df0f 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -6950,6 +6950,7 @@ let self = _self // overrides; _self = with self; {
       url = mirror://cpan/authors/id/G/GA/GAAS/LWP-Protocol-https-6.04.tar.gz;
       sha256 = "0agnga5dg94222h6rlzqxa0dri2sh3gayncvfb7jad9nxr87gxhy";
     };
+    patches = [ ../development/perl-modules/lwp-protocol-https-cert-file.patch ];
     propagatedBuildInputs = [ LWP IOSocketSSL ];
     doCheck = false; # tries to connect to https://www.apache.org/.
     meta = {

From 69d8cb4a6bf85b2a6546a20a9e8b9c9c0f2943ec Mon Sep 17 00:00:00 2001
From: Alex Franchuk <alex.franchuk@gmail.com>
Date: Tue, 23 Feb 2016 23:06:45 -0500
Subject: [PATCH 2080/2285] libreswan: add package and service to nixos

---
 lib/maintainers.nix                           |   1 +
 nixos/modules/module-list.nix                 |   1 +
 .../modules/services/networking/libreswan.nix | 126 ++++++++++++++++++
 pkgs/tools/networking/libreswan/default.nix   |  73 ++++++++++
 pkgs/top-level/all-packages.nix               |   2 +
 5 files changed, 203 insertions(+)
 create mode 100644 nixos/modules/services/networking/libreswan.nix
 create mode 100644 pkgs/tools/networking/libreswan/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 226c41d48061..cd40b17cdfb4 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -15,6 +15,7 @@
   aespinosa = "Allan Espinosa <allan.espinosa@outlook.com>";
   aforemny = "Alexander Foremny <alexanderforemny@googlemail.com>";
   aflatter = "Alexander Flatter <flatter@fastmail.fm>";
+  afranchuk = "Alex Franchuk <alex.franchuk@gmail.com>";
   aherrmann = "Andreas Herrmann <andreash87@gmx.ch>";
   ak = "Alexander Kjeldaas <ak@formalprivacy.com>";
   akaWolf = "Artjom Vejsel <akawolf0@gmail.com>";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 30e716c2ef4b..c8d3aaf5cfe3 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -328,6 +328,7 @@
   ./services/networking/ircd-hybrid/default.nix
   ./services/networking/kippo.nix
   ./services/networking/lambdabot.nix
+  ./services/networking/libreswan.nix
   ./services/networking/mailpile.nix
   ./services/networking/minidlna.nix
   ./services/networking/miniupnpd.nix
diff --git a/nixos/modules/services/networking/libreswan.nix b/nixos/modules/services/networking/libreswan.nix
new file mode 100644
index 000000000000..3866b216f8ef
--- /dev/null
+++ b/nixos/modules/services/networking/libreswan.nix
@@ -0,0 +1,126 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  cfg = config.services.libreswan;
+
+  libexec = "${pkgs.libreswan}/libexec/ipsec";
+  ipsec = "${pkgs.libreswan}/sbin/ipsec";
+
+  trim = chars: str: let
+      nonchars = filter (x : !(elem x.value chars))
+                  (imap (i: v: {ind = (sub i 1); value = v;}) (stringToCharacters str));
+    in
+      if length nonchars == 0 then ""
+      else substring (head nonchars).ind (add 1 (sub (last nonchars).ind (head nonchars).ind)) str;
+  indent = str: concatStrings (concatMap (s: ["  " (trim [" " "\t"] s) "\n"]) (splitString "\n" str));
+  configText = indent (toString cfg.configSetup);
+  connectionText = concatStrings (mapAttrsToList (n: v: 
+    ''
+      conn ${n}
+      ${indent v}
+
+    '') cfg.connections);
+  configFile = pkgs.writeText "ipsec.conf"
+    ''
+      config setup
+      ${configText}
+      
+      ${connectionText}
+    '';
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.libreswan = {
+
+      enable = mkEnableOption "libreswan ipsec service";
+
+      configSetup = mkOption {
+        type = types.lines;
+        default = ''
+            protostack=netkey
+            nat_traversal=yes
+            virtual_private=%v4:10.0.0.0/8,%v4:192.168.0.0/16,%v4:172.16.0.0/12,%v4:25.0.0.0/8,%v4:100.64.0.0/10,%v6:fd00::/8,%v6:fe80::/10
+        '';
+        example = ''
+            secretsfile=/root/ipsec.secrets
+            protostack=netkey
+            nat_traversal=yes
+            virtual_private=%v4:10.0.0.0/8,%v4:192.168.0.0/16,%v4:172.16.0.0/12,%v4:25.0.0.0/8,%v4:100.64.0.0/10,%v6:fd00::/8,%v6:fe80::/10
+        '';
+        description = "Options to go in the 'config setup' section of the libreswan ipsec configuration";
+      };
+
+      connections = mkOption {
+        type = types.attrsOf types.lines;
+        default = {};
+        example = {
+          myconnection = ''
+            auto=add
+            left=%defaultroute
+            leftid=@user
+
+            right=my.vpn.com
+
+            ikev2=no
+            ikelifetime=8h
+          '';
+        };
+        description = "A set of connections to define for the libreswan ipsec service";
+      };
+    };
+
+  };
+
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.libreswan pkgs.iproute ];
+
+    systemd.services.ipsec = {
+      description = "Internet Key Exchange (IKE) Protocol Daemon for IPsec";
+      path = [
+        "${pkgs.libreswan}"
+        "${pkgs.iproute}"
+        "${pkgs.procps}"
+      ];
+
+      wants = [ "network-online.target" ];
+      after = [ "network-online.target" ];
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig = {
+        Type = "simple";
+        Restart = "always";
+        EnvironmentFile = "${pkgs.libreswan}/etc/sysconfig/pluto";
+        ExecStartPre = [
+          "${libexec}/addconn --config ${configFile} --checkconfig"
+          "${libexec}/_stackmanager start"
+          "${ipsec} --checknss"
+          "${ipsec} --checknflog"
+        ];
+        ExecStart = "${libexec}/pluto --config ${configFile} --nofork \$PLUTO_OPTIONS";
+        ExecStop = "${libexec}/whack --shutdown";
+        ExecStopPost = [
+          "${pkgs.iproute}/bin/ip xfrm policy flush"
+          "${pkgs.iproute}/bin/ip xfrm state flush"
+          "${ipsec} --stopnflog"
+        ];
+        ExecReload = "${libexec}/whack --listen";
+      };
+
+    };
+
+  };
+
+}
diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix
new file mode 100644
index 000000000000..700e6293d426
--- /dev/null
+++ b/pkgs/tools/networking/libreswan/default.nix
@@ -0,0 +1,73 @@
+{ stdenv, fetchurl, makeWrapper,
+  pkgconfig, systemd, gmp, unbound, bison, flex, pam, libevent, libcap_ng, curl, nspr,
+  bash, iproute, iptables, procps, coreutils, gnused, gawk, nssTools, which, python,
+  docs ? false, xmlto
+  }:
+
+let
+  optional = stdenv.lib.optional;
+  version = "3.16";
+  name = "libreswan-${version}";
+  binPath = stdenv.lib.makeBinPath [
+    bash iproute iptables procps coreutils gnused gawk nssTools which python
+  ];
+in
+
+assert docs -> xmlto != null;
+
+stdenv.mkDerivation {
+  inherit name;
+  inherit version;
+
+  src = fetchurl {
+    url = "https://download.libreswan.org/${name}.tar.gz";
+    sha256 = "15qv4101p1jw591l04gsfscb3farzd278mgi8yph015vmifyjxrd";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ pkgconfig bash iproute iptables systemd coreutils gnused gawk gmp unbound bison flex pam libevent
+                  libcap_ng curl nspr nssTools python ]
+                ++ optional docs xmlto;
+
+  prePatch = ''
+    # Correct bash path
+    sed -i -e 's|/bin/bash|/usr/bin/env bash|' mk/config.mk
+
+    # Fix systemd unit directory, and prevent the makefile from trying to reload the systemd daemon
+    sed -i -e 's|UNITDIR=.*$|UNITDIR=$\{out}/etc/systemd/system/|' -e 's|systemctl --system daemon-reload|true|' initsystems/systemd/Makefile
+
+    # Fix the ipsec program from crushing the PATH
+    sed -i -e 's|\(PATH=".*"\):.*$|\1:$PATH|' programs/ipsec/ipsec.in
+
+    # Fix python script to use the correct python
+    sed -i -e 's|#!/usr/bin/python|#!/usr/bin/env python|' -e 's/^\(\W*\)installstartcheck()/\1sscmd = "ss"\n\0/' programs/verify/verify.in
+  '';
+  
+  # Set appropriate paths for build
+  preBuild = "export INC_USRLOCAL=\${out}";
+
+  makeFlags = [ 
+    "INITSYSTEM=systemd"
+    (if docs then "all" else "base")
+  ];
+
+  installTargets = [ (if docs then "install" else "install-base") ];
+  # Hack to make install work
+  installFlags = [
+    "FINALVARDIR=\${out}/var"
+    "FINALSYSCONFDIR=\${out}/etc"
+  ];
+
+  postInstall = ''
+    for i in $out/bin/* $out/libexec/ipsec/*; do
+      wrapProgram "$i" --prefix PATH ':' "$out/bin:${binPath}"
+    done
+  '';
+
+  meta = {
+    homepage = "https://libreswan.org";
+    description = "A free software implementation of the VPN protocol based on IPSec and the Internet Key Exchange";
+    platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.freebsd;
+    maintainers = [ stdenv.lib.maintainers.afranchuk ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 37f1098a823c..398c6c683206 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2279,6 +2279,8 @@ let
 
   librdmacm = callPackage ../development/libraries/librdmacm { };
 
+  libreswan = callPackage ../tools/networking/libreswan { };
+
   libwebsockets = callPackage ../development/libraries/libwebsockets { };
 
   limesurvey = callPackage ../servers/limesurvey { };

From da4f05c589cb85b7fc6adbbe231f07bd9e31ed68 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Wed, 2 Mar 2016 12:59:28 +0000
Subject: [PATCH 2081/2285] libsodium: 1.0.6 -> 1.0.8

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

diff --git a/pkgs/development/libraries/libsodium/default.nix b/pkgs/development/libraries/libsodium/default.nix
index c6f10a5531c4..660ea2809123 100644
--- a/pkgs/development/libraries/libsodium/default.nix
+++ b/pkgs/development/libraries/libsodium/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libsodium-1.0.6";
+  name = "libsodium-1.0.8";
 
   src = fetchurl {
     url = "https://download.libsodium.org/libsodium/releases/${name}.tar.gz";
-    sha256 = "0ngvcjwg6m9nivzi208yvz8yvmk6kxnvyr25w907kaicgpm063cl";
+    sha256 = "09hr604k9gdss2r321x5dv3wn11fdl87nswr18g68lkqab993wf0";
   };
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.cc.isGNU "-lssp";

From ed5eb2aed8343e0bd5d635e46514daa9a34a8bde Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 Mar 2016 16:10:59 +0100
Subject: [PATCH 2082/2285] Fix Emacs syntax highlighting in NixOS dovecot
 module.

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

diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix
index 333a03315bca..3935c14dc8cc 100644
--- a/nixos/modules/services/mail/dovecot.nix
+++ b/nixos/modules/services/mail/dovecot.nix
@@ -254,7 +254,7 @@ in
         ${concatStringsSep "\n" (mapAttrsToList (to: from: ''
           if [ -d '${from}' ]; then
             mkdir '${stateDir}/sieve/${to}'
-            cp ${from}/*.sieve '${stateDir}/sieve/${to}'
+            cp "${from}/"*.sieve '${stateDir}/sieve/${to}'
           else
             cp '${from}' '${stateDir}/sieve/${to}'
           fi

From c5f177cb5d18e6c72338da335e6896b6f72a670e Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Wed, 2 Mar 2016 12:59:42 +0000
Subject: [PATCH 2083/2285] dnscrypt-proxy: 1.6.0 -> 1.6.1

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

diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix
index ca19c335a1c9..b98570a7341b 100644
--- a/pkgs/tools/networking/dnscrypt-proxy/default.nix
+++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "dnscrypt-proxy-${version}";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchurl {
     url = "http://download.dnscrypt.org/dnscrypt-proxy/${name}.tar.bz2";
-    sha256 = "0zfw9vi9qbsc55awncyigqfqp25v5adqk6jpg1jdfkmbqqfykk70";
+    sha256 = "16lif3qhyfjpgg54vjlwpslxk90akmbhlpnn1szxm628bmpw6nl9";
   };
 
   configureFlags = ''

From 7f543c4b611ca3e0226fe42c37c80c10fbeb01d9 Mon Sep 17 00:00:00 2001
From: Kevin Marsh <kevinmarsh3@gmail.com>
Date: Wed, 2 Mar 2016 15:19:23 +0000
Subject: [PATCH 2084/2285] django: 1.9.2 -> 1.9.3

---
 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 68deac847dbb..da2c8cdd1817 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7838,12 +7838,12 @@ in modules // {
 
   django_1_9 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.9.2";
+    version = "1.9.3";
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.9/${name}.tar.gz";
-      sha256 = "0bwapyjdl1w62cdv3kx27kj1s5zj93fyby8mhgysapdkxqi368vs";
+      sha256 = "0miv4jb2p4xpcdif0zqimmqw1jypzyq6q5v4m79jc9yyhwj1l685";
     };
 
     # patch only $out/bin to avoid problems with starter templates (see #3134)

From 061c62a38cfd5185671fe5bc609f0144b18e46df Mon Sep 17 00:00:00 2001
From: Kevin Marsh <kevinmarsh3@gmail.com>
Date: Wed, 2 Mar 2016 15:19:49 +0000
Subject: [PATCH 2085/2285] django: 1.8.9 -> 1.8.10

---
 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 da2c8cdd1817..12c5b52addb1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7862,12 +7862,12 @@ in modules // {
 
   django_1_8 = buildPythonPackage rec {
     name = "Django-${version}";
-    version = "1.8.9";
+    version = "1.8.10";
     disabled = pythonOlder "2.7";
 
     src = pkgs.fetchurl {
       url = "http://www.djangoproject.com/m/releases/1.8/${name}.tar.gz";
-      sha256 = "1qyjpdpsj1n5lx10vak9bwl554br01wbn0kjhy7646i00y2js0gw";
+      sha256 = "08qsgnqq97rg4v80kmbkccr9hm90nw4zh6c46xblk64lnqgb3rfj";
     };
 
     # too complicated to setup

From 5936d6dbbbee3b0fb1933f0cff05470b6365e8e7 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Wed, 2 Mar 2016 15:24:43 +0000
Subject: [PATCH 2086/2285] Revert "rubygems: 2.4.8 -> 2.5.2"

This reverts commit 7e8faf022f343901301c912c5f0c7fa1d830a08d.

This breaks the rake call in gitlab see
https://github.com/NixOS/nixpkgs/pull/13468#issuecomment-191286066
---
 pkgs/development/interpreters/ruby/rubygems.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/rubygems.nix b/pkgs/development/interpreters/ruby/rubygems.nix
index a08790a15ce5..fb210ceff4bf 100644
--- a/pkgs/development/interpreters/ruby/rubygems.nix
+++ b/pkgs/development/interpreters/ruby/rubygems.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "rubygems-${version}";
-  version = "2.5.2";
+  version = "2.4.8";
   src = fetchurl {
     url = "http://production.cf.rubygems.org/rubygems/${name}.tgz";
-    sha256 = "1jpcmvjfpj2m0jh23371ghfj95gh4jliihzrj5ln0x2cl1pwwwai";
+    sha256 = "0pl4civyf0vhqsqbqaivvxrb3fsg8sid9a8jv5vfnk4hypz3ahss";
   };
 
   patches = [ ./gem_hook.patch ];

From f442830c55517c73a5e320d2bd892776db4216df Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Wed, 2 Mar 2016 18:36:22 +0300
Subject: [PATCH 2087/2285] libreswan: specify that we don't support parallel
 building

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

diff --git a/pkgs/tools/networking/libreswan/default.nix b/pkgs/tools/networking/libreswan/default.nix
index 700e6293d426..1a040652ff4e 100644
--- a/pkgs/tools/networking/libreswan/default.nix
+++ b/pkgs/tools/networking/libreswan/default.nix
@@ -64,6 +64,8 @@ stdenv.mkDerivation {
     done
   '';
 
+  enableParallelBuilding = false;
+
   meta = {
     homepage = "https://libreswan.org";
     description = "A free software implementation of the VPN protocol based on IPSec and the Internet Key Exchange";

From 50e1e69c0a91004706c15891d6ad8d49a65bb7cc Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Mar 2016 17:14:49 +0100
Subject: [PATCH 2088/2285] Remove unmaintained gnupdate script

---
 maintainers/scripts/gnu/gnupdate | 1122 ------------------------------
 1 file changed, 1122 deletions(-)
 delete mode 100755 maintainers/scripts/gnu/gnupdate

diff --git a/maintainers/scripts/gnu/gnupdate b/maintainers/scripts/gnu/gnupdate
deleted file mode 100755
index 6bb379f4fd2e..000000000000
--- a/maintainers/scripts/gnu/gnupdate
+++ /dev/null
@@ -1,1122 +0,0 @@
-#!/bin/sh
-# This is actually -*- mode: scheme; coding: utf-8; -*- text.
-main='(module-ref (resolve-module '\''(gnupdate)) '\'gnupdate')'
-exec ${GUILE-guile} -L "$PWD" -l "$0"    \
-         -c "(apply $main (command-line))" "$@"
-!#
-;;; GNUpdate -- Update GNU packages in Nixpkgs.
-;;; Copyright (C) 2010, 2011  Ludovic Courtès <ludo@gnu.org>
-;;;
-;;; This program is free software: you can redistribute it and/or modify
-;;; it under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation, either version 3 of the License, or
-;;; (at your option) any later version.
-;;;
-;;; This program is distributed in the hope that it will be useful,
-;;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;;; GNU General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-(cond-expand (guile-2 #t)
-             (else (error "GNU Guile 2.0 is required")))
-
-(define-module (gnupdate)
-  #:use-module (sxml ssax)
-  #:use-module (ice-9 popen)
-  #:use-module (ice-9 match)
-  #:use-module (ice-9 rdelim)
-  #:use-module (ice-9 format)
-  #:use-module (ice-9 regex)
-  #:use-module (ice-9 vlist)
-  #:use-module (srfi srfi-1)
-  #:use-module (srfi srfi-9)
-  #:use-module (srfi srfi-11)
-  #:use-module (srfi srfi-26)
-  #:use-module (srfi srfi-37)
-  #:use-module (system foreign)
-  #:use-module (rnrs bytevectors)
-  #:export (gnupdate))
-
-
-;;;
-;;; SNix.
-;;;
-
-(define-record-type <location>
-  (make-location file line column)
-  location?
-  (file          location-file)
-  (line          location-line)
-  (column        location-column))
-
-(define (->loc line column path)
-  (and line column path
-       (make-location path (string->number line) (string->number column))))
-
-;; Nix object types visible in the XML output of `nix-instantiate' and
-;; mapping to S-expressions (we map to sexps, not records, so that we
-;; can do pattern matching):
-;;
-;;   at               (at varpat attrspat)
-;;   attr             (attribute loc name value)
-;;   attrs            (attribute-set attributes)
-;;   attrspat         (attribute-set-pattern patterns)
-;;   bool             #f|#t
-;;   derivation       (derivation drv-path out-path attributes)
-;;   ellipsis         '...
-;;   expr             (snix loc body ...)
-;;   function         (function loc at|attrspat|varpat)
-;;   int              int
-;;   list             list
-;;   null             'null
-;;   path             string
-;;   string           string
-;;   unevaluated      'unevaluated
-;;   varpat           (varpat name)
-;;
-;; Initially ATTRIBUTES in `derivation' and `attribute-set' was a promise;
-;; however, handling `repeated' nodes makes it impossible to do anything
-;; lazily because the whole SXML tree has to be traversed to maintain the
-;; list of known derivations.
-
-(define (xml-element->snix elem attributes body derivations)
-  ;; Return an SNix element corresponding to XML element ELEM.
-
-  (define (loc)
-    (->loc (assq-ref attributes 'line)
-           (assq-ref attributes 'column)
-           (assq-ref attributes 'path)))
-
-  (case elem
-    ((at)
-     (values `(at ,(car body) ,(cadr body)) derivations))
-    ((attr)
-     (let ((name (assq-ref attributes 'name)))
-       (cond ((null? body)
-              (values `(attribute-pattern ,name) derivations))
-             ((and (pair? body) (null? (cdr body)))
-              (values `(attribute ,(loc) ,name ,(car body))
-                      derivations))
-             (else
-              (error "invalid attribute body" name (loc) body)))))
-    ((attrs)
-     (values `(attribute-set ,(reverse body)) derivations))
-    ((attrspat)
-     (values `(attribute-set-pattern ,body) derivations))
-    ((bool)
-     (values (string-ci=? "true" (assq-ref attributes 'value))
-             derivations))
-    ((derivation)
-     (let ((drv-path (assq-ref attributes 'drvPath))
-           (out-path (assq-ref attributes 'outPath)))
-       (if (equal? body '(repeated))
-           (let ((body (vhash-assoc drv-path derivations)))
-             (if (pair? body)
-                 (values `(derivation ,drv-path ,out-path ,(cdr body))
-                         derivations)
-
-                 ;; DRV-PATH hasn't been encountered yet but may be later
-                 ;; (see <http://article.gmane.org/gmane.linux.distributions.nixos/5946>.)
-                 ;; Return an `unresolved' node.
-                 (values `(unresolved
-                           ,(lambda (derivations)
-                              (let ((body (vhash-assoc drv-path derivations)))
-                                (if (pair? body)
-                                    `(derivation ,drv-path ,out-path
-                                                 ,(cdr body))
-                                    (error "no previous occurrence of derivation"
-                                           drv-path)))))
-                         derivations)))
-           (values `(derivation ,drv-path ,out-path ,body)
-                   (vhash-cons drv-path body derivations)))))
-    ((ellipsis)
-     (values '... derivations))
-    ((expr)
-     (values `(snix ,(loc) ,@body) derivations))
-    ((function)
-     (values `(function ,(loc) ,body) derivations))
-    ((int)
-     (values (string->number (assq-ref attributes 'value))
-             derivations))
-    ((list)
-     (values body derivations))
-    ((null)
-     (values 'null derivations))
-    ((path)
-     (values (assq-ref attributes 'value) derivations))
-    ((repeated)
-     (values 'repeated derivations))
-    ((string)
-     (values (assq-ref attributes 'value) derivations))
-    ((unevaluated)
-     (values 'unevaluated derivations))
-    ((varpat)
-     (values `(varpat ,(assq-ref attributes 'name)) derivations))
-    (else (error "unhandled Nix XML element" elem))))
-
-(define (resolve snix derivations)
-  "Return a new SNix tree where `unresolved' nodes from SNIX have been
-replaced by the result of their application to DERIVATIONS, a vhash."
-  (let loop ((node snix)
-             (seen vlist-null))
-    (if (vhash-assq node seen)
-        (values node seen)
-        (match node
-          (('unresolved proc)
-           (let ((n (proc derivations)))
-             (values n seen)))
-          ((tag body ...)
-           (let ((body+seen (fold (lambda (n body+seen)
-                                    (call-with-values
-                                        (lambda ()
-                                          (loop n (cdr body+seen)))
-                                      (lambda (n* seen)
-                                        (cons (cons n* (car body+seen))
-                                              (vhash-consq n #t seen)))))
-                                  (cons '() (vhash-consq node #t seen))
-                                  body)))
-             (values (cons tag (reverse (car body+seen)))
-                     (vhash-consq node #t (cdr body+seen)))))
-          (anything
-           (values anything seen))))))
-
-(define xml->snix
-  ;; Return the SNix represention of TREE, an SXML tree as returned by
-  ;; parsing the XML output of `nix-instantiate' on Nixpkgs.
-  (let ((parse
-         (ssax:make-parser NEW-LEVEL-SEED
-                           (lambda (elem-gi attributes namespaces expected-content
-                                    seed)
-                             (cons '() (cdr seed)))
-
-                           FINISH-ELEMENT
-                           (lambda (elem-gi attributes namespaces parent-seed
-                                            seed)
-                             (let ((snix        (car seed))
-                                   (derivations (cdr seed)))
-                               (let-values (((snix derivations)
-                                             (xml-element->snix elem-gi
-                                                                attributes
-                                                                snix
-                                                                derivations)))
-                                 (cons (cons snix (car parent-seed))
-                                       derivations))))
-
-                           CHAR-DATA-HANDLER
-                           (lambda (string1 string2 seed)
-                             ;; Discard inter-node strings, which are blanks.
-                             seed))))
-    (lambda (port)
-      (match (parse port (cons '() vlist-null))
-        (((snix) . derivations)
-         (resolve snix derivations))))))
-
-(define (call-with-package snix proc)
-  (match snix
-    (('attribute _ (and attribute-name (? string?))
-                 ('derivation _ _ body))
-     ;; Ugly pattern matching.
-     (let ((meta
-            (any (lambda (attr)
-                   (match attr
-                     (('attribute _ "meta" ('attribute-set metas)) metas)
-                     (_ #f)))
-                 body))
-           (package-name
-            (any (lambda (attr)
-                   (match attr
-                     (('attribute _ "name" (and name (? string?)))
-                      name)
-                     (_ #f)))
-                 body))
-           (location
-            (any (lambda (attr)
-                   (match attr
-                     (('attribute loc "name" (? string?))
-                      loc)
-                     (_ #f)))
-                 body))
-           (src
-            (any (lambda (attr)
-                   (match attr
-                     (('attribute _ "src" src)
-                      src)
-                     (_ #f)))
-                 body)))
-       (proc attribute-name package-name location meta src)))))
-
-(define (call-with-src snix proc)
-  ;; Assume SNIX contains the SNix expression for the value of an `src'
-  ;; attribute, as returned by `call-with-package', and call PROC with the
-  ;; relevant SRC information, or #f if SNIX doesn't match.
-  (match snix
-    (('derivation _ _ body)
-     (let ((name
-            (any (lambda (attr)
-                   (match attr
-                     (('attribute _ "name" (and name (? string?)))
-                      name)
-                     (_ #f)))
-                 body))
-           (output-hash
-            (any (lambda (attr)
-                   (match attr
-                     (('attribute _ "outputHash" (and hash (? string?)))
-                      hash)
-                     (_ #f)))
-                 body))
-           (urls
-            (any (lambda (attr)
-                   (match attr
-                     (('attribute _ "urls" (and urls (? pair?)))
-                      urls)
-                     (_ #f)))
-                 body)))
-       (proc name output-hash urls)))
-    (_ (proc #f #f #f))))
-
-(define (src->values snix)
-  (call-with-src snix values))
-
-(define (attribute-value attribute)
-  ;; Return the value of ATTRIBUTE.
-  (match attribute
-    (('attribute _ _ value) value)))
-
-(define (derivation-source derivation)
-  ;; Return the "src" attribute of DERIVATION or #f if not found.
-  (match derivation
-    (('derivation _ _ (attributes ...))
-     (find-attribute-by-name "src" attributes))))
-
-(define (derivation-output-path derivation)
-  ;; Return the output path of DERIVATION.
-  (match derivation
-    (('derivation _ out-path _)
-     out-path)
-    (_ #f)))
-
-(define (source-output-path src)
-  ;; Return the output path of SRC, the "src" attribute of a derivation.
-  (derivation-output-path (attribute-value src)))
-
-(define (derivation-source-output-path derivation)
-  ;; Return the output path of the "src" attribute of DERIVATION or #f if
-  ;; DERIVATION lacks an "src" attribute.
-  (and=> (derivation-source derivation) source-output-path))
-
-(define* (open-nixpkgs nixpkgs #:optional attribute)
-  ;; Return an input pipe to the XML representation of Nixpkgs.  When
-  ;; ATTRIBUTE is true, only that attribute is considered.
-  (let ((script  (string-append nixpkgs
-                                "/maintainers/scripts/eval-release.nix")))
-    (apply open-pipe* OPEN_READ
-           "nix-instantiate" "--strict" "--eval-only" "--xml"
-           `(,@(if attribute
-                   `("-A" ,attribute)
-                   '())
-             ,script))))
-
-(define (pipe-failed? pipe)
-  "Close pipe and return its status if it failed."
-  (let ((status (close-pipe pipe)))
-    (if (or (status:term-sig status)
-            (not (= (status:exit-val status) 0)))
-        status
-        #f)))
-
-(define (memoize proc)
-  "Return a memoizing version of PROC."
-  (let ((cache (make-hash-table)))
-    (lambda args
-      (let ((results (hash-ref cache args)))
-        (if results
-            (apply values results)
-            (let ((results (call-with-values (lambda ()
-                                               (apply proc args))
-                             list)))
-              (hash-set! cache args results)
-              (apply values results)))))))
-
-(define nix-prefetch-url
-  (memoize
-   (lambda (url)
-     "Download URL in the Nix store and return the base32-encoded SHA256 hash of
-the file at URL."
-     (let* ((pipe (open-pipe* OPEN_READ "nix-prefetch-url" url))
-            (hash (read-line pipe)))
-       (if (or (pipe-failed? pipe)
-               (eof-object? hash))
-           (values #f #f)
-           (let* ((pipe (open-pipe* OPEN_READ "nix-store" "--print-fixed-path"
-                                    "sha256" hash (basename url)))
-                  (path (read-line pipe)))
-             (if (or (pipe-failed? pipe)
-                     (eof-object? path))
-                 (values #f #f)
-                 (values (string-trim-both hash) (string-trim-both path)))))))))
-
-(define (update-nix-expression file
-                               old-version old-hash
-                               new-version new-hash)
-  ;; Modify FILE in-place.  Ugly: we call out to sed(1).
-  (let ((cmd (format #f "sed -i \"~a\" -e 's/~A/~a/g ; s/~A/~A/g'"
-                     file
-                     (regexp-quote old-version) new-version
-                     old-hash
-                     (or new-hash "new hash not available, check the log"))))
-    (format #t "running `~A'...~%" cmd)
-    (system cmd)))
-
-(define (find-attribute-by-name name attributes)
-  ;; Return attribute NAME in ATTRIBUTES, a list of SNix attributes, or #f if
-  ;; NAME cannot be found.
-  (find (lambda (a)
-          (match a
-            (('attribute _ (? (cut string=? <> name)) _)
-             a)
-            (_ #f)))
-        attributes))
-
-(define (find-package-by-attribute-name name packages)
-  ;; Return the package bound to attribute NAME in PACKAGES, a list of
-  ;; packages (SNix attributes), or #f if NAME cannot be found.
-  (find (lambda (package)
-          (match package
-            (('attribute _ (? (cut string=? <> name))
-                         ('derivation _ _ _))
-             package)
-            (_ #f)))
-        packages))
-
-(define (stdenv-package packages)
-  ;; Return the `stdenv' package from PACKAGES, a list of SNix attributes.
-  (find-package-by-attribute-name "stdenv" packages))
-
-(define (package-requisites package)
-  ;; Return the list of derivations required to build PACKAGE (including that
-  ;; of PACKAGE) by recurring into its derivation attributes.
-  (let loop ((snix   package)
-             (result '()))
-    (match snix
-      (('attribute _ _ body)
-       (loop body result))
-      (('derivation _ out-path body)
-       (if (any (lambda (d)
-                  (match d
-                    (('derivation _ (? (cut string=? out-path <>)) _) #t)
-                    (_ #f)))
-                result)
-           result
-           (loop body (cons snix result))))
-      ((things ...)
-       (fold loop result things))
-      (_ result))))
-
-(define (package-source-output-path package)
-  ;; Return the output path of the "src" derivation of PACKAGE.
-  (derivation-source-output-path (attribute-value package)))
-
-
-;;;
-;;; GnuPG interface.
-;;;
-
-(define %gpg-command "gpg2")
-(define %openpgp-key-server "keys.gnupg.net")
-
-(define (gnupg-verify sig file)
-  "Verify signature SIG for FILE.  Return a status s-exp if GnuPG failed."
-
-  (define (status-line->sexp line)
-    ;; See file `doc/DETAILS' in GnuPG.
-    (define sigid-rx
-      (make-regexp
-       "^\\[GNUPG:\\] SIG_ID ([A-Za-z0-9/]+) ([[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}) ([[:digit:]]+)"))
-    (define goodsig-rx
-      (make-regexp "^\\[GNUPG:\\] GOODSIG ([[:xdigit:]]+) (.+)$"))
-    (define validsig-rx
-      (make-regexp
-       "^\\[GNUPG:\\] VALIDSIG ([[:xdigit:]]+) ([[:digit:]]{4}-[[:digit:]]{2}-[[:digit:]]{2}) ([[:digit:]]+) .*$"))
-    (define expkeysig-rx                    ; good signature, but expired key
-      (make-regexp "^\\[GNUPG:\\] EXPKEYSIG ([[:xdigit:]]+) (.*)$"))
-    (define errsig-rx
-      (make-regexp
-       "^\\[GNUPG:\\] ERRSIG ([[:xdigit:]]+) ([^ ]+) ([^ ]+) ([^ ]+) ([[:digit:]]+) ([[:digit:]]+)"))
-
-    (cond ((regexp-exec sigid-rx line)
-           =>
-           (lambda (match)
-             `(signature-id ,(match:substring match 1) ; sig id
-                            ,(match:substring match 2) ; date
-                            ,(string->number           ; timestamp
-                              (match:substring match 3)))))
-          ((regexp-exec goodsig-rx line)
-           =>
-           (lambda (match)
-             `(good-signature ,(match:substring match 1)    ; key id
-                              ,(match:substring match 2)))) ; user name
-          ((regexp-exec validsig-rx line)
-           =>
-           (lambda (match)
-             `(valid-signature ,(match:substring match 1) ; fingerprint
-                               ,(match:substring match 2) ; sig creation date
-                               ,(string->number           ; timestamp
-                                 (match:substring match 3)))))
-          ((regexp-exec expkeysig-rx line)
-           =>
-           (lambda (match)
-             `(expired-key-signature ,(match:substring match 1) ; fingerprint
-                                     ,(match:substring match 2)))) ; user name
-          ((regexp-exec errsig-rx line)
-           =>
-           (lambda (match)
-             `(signature-error ,(match:substring match 1) ; key id or fingerprint
-                               ,(match:substring match 2) ; pubkey algo
-                               ,(match:substring match 3) ; hash algo
-                               ,(match:substring match 4) ; sig class
-                               ,(string->number           ; timestamp
-                                 (match:substring match 5))
-                               ,(let ((rc
-                                       (string->number ; return code
-                                        (match:substring match 6))))
-                                  (case rc
-                                    ((9) 'missing-key)
-                                    ((4) 'unknown-algorithm)
-                                    (else rc))))))
-          (else
-           `(unparsed-line ,line))))
-
-  (define (parse-status input)
-    (let loop ((line   (read-line input))
-               (result '()))
-      (if (eof-object? line)
-          (reverse result)
-          (loop (read-line input)
-                (cons (status-line->sexp line) result)))))
-
-  (let* ((pipe   (open-pipe* OPEN_READ %gpg-command "--status-fd=1"
-                             "--verify" sig file))
-         (status (parse-status pipe)))
-    ;; Ignore PIPE's exit status since STATUS above should contain all the
-    ;; info we need.
-    (close-pipe pipe)
-    status))
-
-(define (gnupg-status-good-signature? status)
-  "If STATUS, as returned by `gnupg-verify', denotes a good signature, return
-a key-id/user pair; return #f otherwise."
-  (any (lambda (sexp)
-         (match sexp
-           (((or 'good-signature 'expired-key-signature) key-id user)
-            (cons key-id user))
-           (_ #f)))
-       status))
-
-(define (gnupg-status-missing-key? status)
-  "If STATUS denotes a missing-key error, then return the key-id of the
-missing key."
-  (any (lambda (sexp)
-         (match sexp
-           (('signature-error key-id _ ...)
-            key-id)
-           (_ #f)))
-       status))
-
-(define (gnupg-receive-keys key-id)
-  (system* %gpg-command "--keyserver" %openpgp-key-server "--recv-keys" key-id))
-
-(define (gnupg-verify* sig file)
-  "Like `gnupg-verify', but try downloading the public key if it's missing.
-Return #t if the signature was good, #f otherwise."
-  (let ((status (gnupg-verify sig file)))
-    (or (gnupg-status-good-signature? status)
-        (let ((missing (gnupg-status-missing-key? status)))
-          (and missing
-               (begin
-                 ;; Download the missing key and try again.
-                 (gnupg-receive-keys missing)
-                 (gnupg-status-good-signature? (gnupg-verify sig file))))))))
-
-
-;;;
-;;; FTP client.
-;;;
-
-(define-record-type <ftp-connection>
-  (%make-ftp-connection socket addrinfo)
-  ftp-connection?
-  (socket    ftp-connection-socket)
-  (addrinfo  ftp-connection-addrinfo))
-
-(define %ftp-ready-rx
-  (make-regexp "^([0-9]{3}) (.+)$"))
-
-(define (%ftp-listen port)
-  (let loop ((line (read-line port)))
-    (cond ((eof-object? line) (values line #f))
-          ((regexp-exec %ftp-ready-rx line)
-           =>
-           (lambda (match)
-             (values (string->number (match:substring match 1))
-                     (match:substring match 2))))
-          (else
-           (loop (read-line port))))))
-
-(define (%ftp-command command expected-code port)
-  (format port "~A~A~A" command (string #\return) (string #\newline))
-  (let-values (((code message) (%ftp-listen port)))
-    (if (eqv? code expected-code)
-        message
-        (throw 'ftp-error port command code message))))
-
-(define (%ftp-login user pass port)
-  (let ((command (string-append "USER " user (string #\newline))))
-    (display command port)
-    (let-values (((code message) (%ftp-listen port)))
-      (case code
-        ((230)  #t)
-        ((331) (%ftp-command (string-append "PASS " pass) 230 port))
-        (else  (throw 'ftp-error port command code message))))))
-
-(define (ftp-open host)
-  (catch 'getaddrinfo-error
-    (lambda ()
-      (let* ((ai (car (getaddrinfo host "ftp")))
-             (s  (socket (addrinfo:fam ai) (addrinfo:socktype ai)
-                         (addrinfo:protocol ai))))
-        (connect s (addrinfo:addr ai))
-        (setvbuf s _IOLBF)
-        (let-values (((code message) (%ftp-listen s)))
-          (if (eqv? code 220)
-              (begin
-                ;(%ftp-command "OPTS UTF8 ON" 200 s)
-                (%ftp-login "anonymous" "ludo@example.com" s)
-                (%make-ftp-connection s ai))
-              (begin
-                (format (current-error-port) "FTP to `~a' failed: ~A: ~A~%"
-                        host code message)
-                (close s)
-                #f)))))
-    (lambda (key errcode)
-      (format (current-error-port) "failed to resolve `~a': ~a~%"
-              host (gai-strerror errcode))
-      #f)))
-
-(define (ftp-close conn)
-  (close (ftp-connection-socket conn)))
-
-(define (ftp-chdir conn dir)
-  (%ftp-command (string-append "CWD " dir) 250
-                (ftp-connection-socket conn)))
-
-(define (ftp-pasv conn)
-  (define %pasv-rx
-    (make-regexp "([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+),([0-9]+)"))
-
-  (let ((message (%ftp-command "PASV" 227 (ftp-connection-socket conn))))
-    (cond ((regexp-exec %pasv-rx message)
-           =>
-           (lambda (match)
-             (+ (* (string->number (match:substring match 5)) 256)
-                (string->number (match:substring match 6)))))
-          (else
-           (throw 'ftp-error conn "PASV" 227 message)))))
-
-
-(define* (ftp-list conn #:optional directory)
-  (define (address-with-port sa port)
-    (let ((fam  (sockaddr:fam sa))
-          (addr (sockaddr:addr sa)))
-      (cond ((= fam AF_INET)
-             (make-socket-address fam addr port))
-            ((= fam AF_INET6)
-             (make-socket-address fam addr port
-                                  (sockaddr:flowinfo sa)
-                                  (sockaddr:scopeid sa)))
-            (else #f))))
-
-  (if directory
-      (ftp-chdir conn directory))
-
-  (let* ((port (ftp-pasv conn))
-         (ai   (ftp-connection-addrinfo conn))
-         (s    (socket (addrinfo:fam ai) (addrinfo:socktype ai)
-                       (addrinfo:protocol ai))))
-    (connect s (address-with-port (addrinfo:addr ai) port))
-    (setvbuf s _IOLBF)
-
-    (dynamic-wind
-      (lambda () #t)
-      (lambda ()
-        (%ftp-command "LIST" 150 (ftp-connection-socket conn))
-
-        (let loop ((line   (read-line s))
-                   (result '()))
-          (cond ((eof-object? line) (reverse result))
-                ((regexp-exec %ftp-ready-rx line)
-                 =>
-                 (lambda (match)
-                   (let ((code (string->number (match:substring match 1))))
-                     (if (= 126 code)
-                         (reverse result)
-                         (throw 'ftp-error conn "LIST" code)))))
-                (else
-                 (loop (read-line s)
-                       (match (reverse (string-tokenize line))
-                         ((file _ ... permissions)
-                          (let ((type (case (string-ref permissions 0)
-                                        ((#\d) 'directory)
-                                        (else 'file))))
-                            (cons (list file type) result)))
-                         ((file _ ...)
-                          (cons (cons file 'file) result))))))))
-      (lambda ()
-        (close s)
-        (let-values (((code message) (%ftp-listen (ftp-connection-socket conn))))
-          (or (eqv? code 226)
-              (throw 'ftp-error conn "LIST" code message)))))))
-
-
-;;;
-;;; GNU.
-;;;
-
-(define %ignored-package-attributes
-  ;; Attribute name of packages to be ignored.
-  '("bash" "bashReal" "bashInteractive" ;; the full versioned name is incorrect
-    "autoconf213"
-    "automake17x"
-    "automake19x"
-    "automake110x"
-    "bison1875"
-    "bison23"
-    "bison24"
-    "bison" ;; = 2.4
-    "ccrtp_1_8"
-    "emacs22"
-    "emacsSnapshot"
-    "gcc295"
-    "gcc33"
-    "gcc34"
-    "gcc40"
-    "gcc41"
-    "gcc42"
-    "gcc43"
-    "gcc44"
-    "gcc45"
-    "gcc45_real"
-    "gcc45_realCross"
-    "gfortran45"
-    "gcj45"
-    "gcc46"
-    "gcc46_real"
-    "gcc46_realCross"
-    "gfortran46"
-    "gcj46"
-    "glibc25"
-    "glibc27"
-    "glibc29"
-    "guile_1_8"
-    "icecat3"
-    "icecat3Xul" ;; redundant with `icecat'
-    "icecatWrapper"
-    "icecat3Wrapper"
-    "icecatXulrunner3"
-    "libzrtpcpp_1_6"
-    "parted_2_3"
-    ))
-
-(define (gnu? package)
-  ;; Return true if PACKAGE (a snix expression) is a GNU package (according
-  ;; to a simple heuristic.)  Otherwise return #f.
-  (match package
-    (('attribute _ _ ('derivation _ _ body))
-     (any (lambda (attr)
-            (match attr
-              (('attribute _ "meta" ('attribute-set metas))
-               (any (lambda (attr)
-                      (match attr
-                        (('attribute _ "description" value)
-                         (string-prefix? "GNU" value))
-                        (('attribute _ "homepage" (? string? value))
-                         (or (string-contains value "gnu.org")
-                             (string-contains value "gnupg.org")))
-                        (('attribute _ "homepage" ((? string? value) ...))
-                         (any (cut string-contains <> "www.gnu.org") value))
-                        (_ #f)))
-                    metas))
-              (_ #f)))
-          body))
-    (_ #f)))
-
-(define (gnu-packages packages)
-  (fold (lambda (package gnu)
-          (match package
-            (('attribute _ "emacs23Packages" emacs-packages)
-             ;; XXX: Should prepend `emacs23Packages.' to attribute names.
-             (append (gnu-packages emacs-packages) gnu))
-            (('attribute _ attribute-name ('derivation _ _ body))
-             (if (member attribute-name %ignored-package-attributes)
-                 gnu
-                 (if (gnu? package)
-                     (cons package gnu)
-                     gnu)))
-            (_ gnu)))
-        '()
-        packages))
-
-(define (ftp-server/directory project)
-  (define quirks
-    '(("commoncpp2"   "ftp.gnu.org"   "/gnu/commoncpp" #f)
-      ("ucommon"      "ftp.gnu.org"   "/gnu/commoncpp" #f)
-      ("libzrtpcpp"   "ftp.gnu.org"   "/gnu/ccrtp" #f)
-      ("libosip2"     "ftp.gnu.org"   "/gnu/osip" #f)
-      ("libgcrypt"    "ftp.gnupg.org" "/gcrypt" #t)
-      ("libgpg-error" "ftp.gnupg.org" "/gcrypt" #t)
-      ("libassuan"    "ftp.gnupg.org" "/gcrypt" #t)
-      ("freefont-ttf" "ftp.gnu.org"   "/gnu/freefont" #f)
-      ("gnupg"        "ftp.gnupg.org" "/gcrypt" #t)
-      ("gnu-ghostscript" "ftp.gnu.org"  "/gnu/ghostscript" #f)
-      ("mit-scheme"   "ftp.gnu.org" "/gnu/mit-scheme/stable.pkg" #f)
-      ("icecat"       "ftp.gnu.org" "/gnu/gnuzilla" #f)
-      ("source-highlight" "ftp.gnu.org" "/gnu/src-highlite" #f)
-      ("TeXmacs"      "ftp.texmacs.org" "/TeXmacs/targz" #f)))
-
-  (let ((quirk (assoc project quirks)))
-    (match quirk
-      ((_ server directory subdir?)
-       (values server (if (not subdir?)
-                          directory
-                          (string-append directory "/" project))))
-      (_
-       (values "ftp.gnu.org" (string-append "/gnu/" project))))))
-
-(define (nixpkgs->gnu-name project)
-  (define quirks
-    '(("gcc-wrapper" . "gcc")
-      ("ghostscript" . "gnu-ghostscript") ;; ../ghostscript/gnu-ghoscript-X.Y.tar.gz
-      ("gnum4"       . "m4")
-      ("gnugrep"     . "grep")
-      ("gnumake"     . "make")
-      ("gnused"      . "sed")
-      ("gnutar"      . "tar")
-      ("mitscheme"   . "mit-scheme")
-      ("texmacs"     . "TeXmacs")))
-
-  (or (assoc-ref quirks project) project))
-
-(define (releases project)
-  "Return the list of releases of PROJECT as a list of release name/directory
-pairs.  Example: (\"mit-scheme-9.0.1\" . \"/gnu/mit-scheme/stable.pkg/9.0.1\"). "
-  ;; TODO: Parse something like fencepost.gnu.org:/gd/gnuorg/packages-ftp.
-  (define release-rx
-    (make-regexp (string-append "^" project
-                                "-([0-9]|[^-])*(-src)?\\.tar\\.")))
-
-  (define alpha-rx
-    (make-regexp "^.*-.*[0-9](-|~)?(alpha|beta|rc|cvs|svn|git)-?[0-9\\.]*\\.tar\\."))
-
-  (define (sans-extension tarball)
-    (let ((end (string-contains tarball ".tar")))
-      (substring tarball 0 end)))
-
-  (catch 'ftp-error
-    (lambda ()
-      (let-values (((server directory) (ftp-server/directory project)))
-        (define conn (ftp-open server))
-
-        (let loop ((directories (list directory))
-                   (result      '()))
-          (if (null? directories)
-              (begin
-                (ftp-close conn)
-                result)
-              (let* ((directory (car directories))
-                     (files     (ftp-list conn directory))
-                     (subdirs   (filter-map (lambda (file)
-                                              (match file
-                                                ((name 'directory . _) name)
-                                                (_ #f)))
-                                            files)))
-                (loop (append (map (cut string-append directory "/" <>)
-                                   subdirs)
-                              (cdr directories))
-                      (append
-                       ;; Filter out signatures, deltas, and files which are potentially
-                       ;; not releases of PROJECT (e.g., in /gnu/guile, filter out
-                       ;; guile-oops and guile-www; in mit-scheme, filter out
-                       ;; binaries).
-                       (filter-map (lambda (file)
-                                     (match file
-                                       ((file 'file . _)
-                                        (and (not (string-suffix? ".sig" file))
-                                             (regexp-exec release-rx file)
-                                             (not (regexp-exec alpha-rx file))
-                                             (let ((s (sans-extension file)))
-                                               (and (regexp-exec
-                                                     %package-name-rx s)
-                                                    (cons s directory)))))
-                                       (_ #f)))
-                                   files)
-                       result)))))))
-    (lambda (key subr message . args)
-      (format (current-error-port)
-              "failed to get release list for `~A': ~S ~S~%"
-              project message args)
-      '())))
-
-(define version-string>?
-  (let ((strverscmp
-         (let ((sym (or (dynamic-func "strverscmp" (dynamic-link))
-                        (error "could not find `strverscmp' (from GNU libc)"))))
-           (pointer->procedure int sym (list '* '*)))))
-    (lambda (a b)
-      (> (strverscmp (string->pointer a) (string->pointer b)) 0))))
-
-(define (latest-release project)
-  "Return (\"FOO-X.Y\" . \"/bar/foo\") or #f."
-  (let ((releases (releases project)))
-    (and (not (null? releases))
-         (fold (lambda (release latest)
-                 (if (version-string>? (car release) (car latest))
-                     release
-                     latest))
-               '("" . "")
-               releases))))
-
-(define %package-name-rx
-  ;; Regexp for a package name, e.g., "foo-X.Y".  Since TeXmacs uses
-  ;; "TeXmacs-X.Y-src", the `-src' suffix is allowed.
-  (make-regexp "^(.*)-(([0-9]|\\.)+)(-src)?"))
-
-(define (package/version name+version)
-  "Return the package name and version number extracted from NAME+VERSION."
-  (let ((match (regexp-exec %package-name-rx name+version)))
-    (if (not match)
-        (values name+version #f)
-        (values (match:substring match 1) (match:substring match 2)))))
-
-(define (file-extension file)
-  (let ((dot (string-rindex file #\.)))
-    (and dot (substring file (+ 1 dot) (string-length file)))))
-
-(define (packages-to-update gnu-packages)
-  (define (unpack latest)
-    (call-with-values (lambda ()
-                        (package/version (car latest)))
-      (lambda (name version)
-        (list name version (cdr latest)))))
-
-  (fold (lambda (pkg result)
-          (call-with-package pkg
-            (lambda (attribute name+version location meta src)
-              (let-values (((name old-version)
-                            (package/version name+version)))
-                (let ((latest (latest-release (nixpkgs->gnu-name name))))
-                  (if (not latest)
-                      (begin
-                        (format #t "~A [unknown latest version]~%"
-                                name+version)
-                        result)
-                      (match (unpack latest)
-                        ((_ (? (cut string=? old-version <>)) _)
-                         (format #t "~A [up to date]~%" name+version)
-                         result)
-                        ((project new-version directory)
-                         (let-values (((old-name old-hash old-urls)
-                                       (src->values src)))
-                           (format #t "~A -> ~A [~A]~%"
-                                   name+version (car latest)
-                                   (and (pair? old-urls) (car old-urls)))
-                           (let* ((url      (and (pair? old-urls)
-                                                 (car old-urls)))
-                                  (new-hash (fetch-gnu project directory
-                                                       new-version
-                                                       (if url
-                                                           (file-extension url)
-                                                           "gz"))))
-                             (cons (list name attribute
-                                         old-version old-hash
-                                         new-version new-hash
-                                         location)
-                                   result)))))))))))
-        '()
-        gnu-packages))
-
-(define (fetch-gnu project directory version archive-type)
-  "Download PROJECT's tarball over FTP."
-  (let* ((server  (ftp-server/directory project))
-         (base    (string-append project "-" version ".tar." archive-type))
-         (url     (string-append "ftp://" server "/" directory "/" base))
-         (sig     (string-append base ".sig"))
-         (sig-url (string-append url ".sig")))
-    (let-values (((hash path) (nix-prefetch-url url)))
-      (pk 'prefetch-url url hash path)
-      (and hash path
-           (begin
-             (false-if-exception (delete-file sig))
-             (system* "wget" sig-url)
-             (if (file-exists? sig)
-                 (let ((ret (gnupg-verify* sig path)))
-                   (false-if-exception (delete-file sig))
-                   (if ret
-                       hash
-                       (begin
-                         (format (current-error-port)
-                                 "signature verification failed for `~a'~%"
-                                 base)
-                         (format (current-error-port)
-                                 "(could be because the public key is not in your keyring)~%")
-                         #f)))
-                 (begin
-                   (format (current-error-port)
-                           "no signature for `~a'~%" base)
-                   hash)))))))
-
-
-;;;
-;;; Main program.
-;;;
-
-(define %options
-  ;; Specifications of the command-line options.
-  (list (option '(#\h "help") #f #f
-                (lambda (opt name arg result)
-                  (format #t "Usage: gnupdate [OPTIONS...]~%")
-                  (format #t "GNUpdate -- update Nix expressions of GNU packages in Nixpkgs~%")
-                  (format #t "~%")
-                  (format #t "  -x, --xml=FILE      Read XML output of `nix-instantiate'~%")
-                  (format #t "                      from FILE.~%")
-                  (format #t "  -A, --attribute=ATTR~%")
-                  (format #t "                      Update only the package pointed to by attribute~%")
-                  (format #t "                      ATTR.~%")
-                  (format #t "  -s, --select=SET    Update only packages from SET, which may~%")
-                  (format #t "                      be either `all', `stdenv', or `non-stdenv'.~%")
-                  (format #t "  -d, --dry-run       Don't actually update Nix expressions~%")
-                  (format #t "  -h, --help          Give this help list.~%~%")
-                  (format #t "Report bugs to <ludo@gnu.org>~%")
-                  (exit 0)))
-        (option '(#\A "attribute") #t #f
-                (lambda (opt name arg result)
-                  (alist-cons 'attribute arg result)))
-        (option '(#\s "select") #t #f
-                (lambda (opt name arg result)
-                  (cond ((string-ci=? arg "stdenv")
-                         (alist-cons 'filter 'stdenv result))
-                        ((string-ci=? arg "non-stdenv")
-                         (alist-cons 'filter 'non-stdenv result))
-                        ((string-ci=? arg "all")
-                         (alist-cons 'filter #f result))
-                        (else
-                         (format (current-error-port)
-                                 "~A: unrecognized selection type~%"
-                                 arg)
-                         (exit 1)))))
-
-        (option '(#\d "dry-run") #f #f
-                (lambda (opt name arg result)
-                  (alist-cons 'dry-run #t result)))
-
-        (option '(#\x "xml") #t #f
-                (lambda (opt name arg result)
-                  (alist-cons 'xml-file arg result)))))
-
-(define (gnupdate . args)
-  ;; Assume Nixpkgs is under $NIXPKGS or ~/src/nixpkgs.
-
-  (define (nixpkgs->snix xml-file attribute)
-    (format (current-error-port) "evaluating Nixpkgs...~%")
-    (let* ((home (getenv "HOME"))
-           (xml  (if xml-file
-                     (open-input-file xml-file)
-                     (open-nixpkgs (or (getenv "NIXPKGS")
-                                       (string-append home "/src/nixpkgs"))
-                                   attribute)))
-           (snix (xml->snix xml)))
-      (if (not xml-file)
-          (let ((status (pipe-failed? xml)))
-            (if status
-                (begin
-                  (format (current-error-port) "`nix-instantiate' failed: ~A~%"
-                          status)
-                  (exit 1)))))
-
-      ;; If we asked for a specific attribute, rewrap the thing in an
-      ;; attribute set to match the expectations of `packages-to-update' & co.
-      (if attribute
-          (match snix
-            (('snix loc ('derivation args ...))
-             `(snix ,loc
-                    (attribute-set
-                     ((attribute #f ,attribute
-                                 (derivation ,@args)))))))
-          snix)))
-
-  (define (selected-gnu-packages packages stdenv selection)
-    ;; Return the subset of PACKAGES that are/aren't in STDENV, according to
-    ;; SELECTION.  To do that reliably, we check whether their "src"
-    ;; derivation is a requisite of STDENV.
-    (define gnu
-      (gnu-packages packages))
-
-    (case selection
-      ((stdenv)
-       (filter (lambda (p)
-                 (member (package-source-output-path p)
-                         (force stdenv)))
-               gnu))
-      ((non-stdenv)
-       (filter (lambda (p)
-                 (not (member (package-source-output-path p)
-                              (force stdenv))))
-               gnu))
-      (else gnu)))
-
-  (let* ((opts      (args-fold (cdr args) %options
-                               (lambda (opt name arg result)
-                                 (error "unrecognized option `~A'" name))
-                               (lambda (operand result)
-                                 (error "extraneous argument `~A'" operand))
-                               '()))
-         (snix      (nixpkgs->snix (assq-ref opts 'xml-file)
-                                   (assq-ref opts 'attribute)))
-         (packages  (match snix
-                      (('snix _ ('attribute-set attributes))
-                       attributes)
-                      (_ #f)))
-         (stdenv    (delay
-                      ;; The source tarballs that make up stdenv.
-                      (filter-map derivation-source-output-path
-                                  (package-requisites (stdenv-package packages)))))
-         (attribute (assq-ref opts 'attribute))
-         (selection (assq-ref opts 'filter))
-         (to-update (if attribute
-                        packages                  ; already a subset
-                        (selected-gnu-packages packages stdenv selection)))
-         (updates   (packages-to-update to-update)))
-
-    (format #t "~%~A packages to update...~%" (length updates))
-    (for-each (lambda (update)
-                (match update
-                  ((name attribute
-                    old-version old-hash
-                    new-version new-hash
-                    location)
-                   (if (assoc-ref opts 'dry-run)
-                       (format #t "`~a' would be updated from ~a to ~a (~a -> ~a)~%"
-                               name old-version new-version
-                               old-hash new-hash)
-                       (update-nix-expression (location-file location)
-                                              old-version old-hash
-                                              new-version new-hash)))
-                  (_ #f)))
-              updates)
-    #t))
-
-;;; Local Variables:
-;;; eval: (put 'call-with-package 'scheme-indent-function 1)
-;;; End:

From b1031dea94709cf90e88739ea12911e87135629c Mon Sep 17 00:00:00 2001
From: David Keijser <david.keijser@klarna.com>
Date: Wed, 2 Mar 2016 17:25:06 +0100
Subject: [PATCH 2089/2285] logrus: 0.8.6 -> 0.9.0

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index ddf18dd3b8ff..1f10b8f9038c 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2102,10 +2102,10 @@ let
   };
 
   logrus = buildFromGitHub rec {
-    rev = "v0.8.6";
+    rev = "v0.9.0";
     owner = "Sirupsen";
     repo = "logrus";
-    sha256 = "1v2qcjy6w24jgdm7kk0f8lqpa25qxzll2x6ycqwidd3pzjhrkifa";
+    sha256 = "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4";
     propagatedBuildInputs = [ airbrake-go bugsnag-go raven-go ];
   };
 

From d72e93f59dc12a3753454427608c8df02d2b8e62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 2 Mar 2016 16:54:30 +0000
Subject: [PATCH 2090/2285] remove lvm_33, fixes #12310

---
 .../compilers/llvm/3.3/clang-purity.patch     | 162 ------------------
 .../llvm/3.3/clang-tablegen-dir.patch         |   9 -
 pkgs/development/compilers/llvm/3.3/clang.nix |  45 -----
 pkgs/development/compilers/llvm/3.3/llvm.nix  |  63 -------
 .../llvm/3.3/more-memory-for-bugpoint.patch   |  15 --
 .../compilers/llvm/3.3/no-rule-aarch64.patch  |   8 -
 pkgs/top-level/all-packages.nix               |   3 -
 7 files changed, 305 deletions(-)
 delete mode 100644 pkgs/development/compilers/llvm/3.3/clang-purity.patch
 delete mode 100644 pkgs/development/compilers/llvm/3.3/clang-tablegen-dir.patch
 delete mode 100644 pkgs/development/compilers/llvm/3.3/clang.nix
 delete mode 100644 pkgs/development/compilers/llvm/3.3/llvm.nix
 delete mode 100644 pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch
 delete mode 100644 pkgs/development/compilers/llvm/3.3/no-rule-aarch64.patch

diff --git a/pkgs/development/compilers/llvm/3.3/clang-purity.patch b/pkgs/development/compilers/llvm/3.3/clang-purity.patch
deleted file mode 100644
index e82305189e8f..000000000000
--- a/pkgs/development/compilers/llvm/3.3/clang-purity.patch
+++ /dev/null
@@ -1,162 +0,0 @@
-diff -Naur cfe-3.3.src-orig/lib/Driver/ToolChains.cpp cfe-3.3.src/lib/Driver/ToolChains.cpp
---- cfe-3.3.src-orig/lib/Driver/ToolChains.cpp	2013-05-06 12:26:41.000000000 -0400
-+++ cfe-3.3.src/lib/Driver/ToolChains.cpp	2013-06-21 19:28:12.120364372 -0400
-@@ -2318,17 +2318,6 @@
-                       Paths);
-     }
-   }
--  addPathIfExists(SysRoot + "/lib/" + MultiarchTriple, Paths);
--  addPathIfExists(SysRoot + "/lib/../" + Multilib, Paths);
--  addPathIfExists(SysRoot + "/usr/lib/" + MultiarchTriple, Paths);
--  addPathIfExists(SysRoot + "/usr/lib/../" + Multilib, Paths);
--
--  // Try walking via the GCC triple path in case of multiarch GCC
--  // installations with strange symlinks.
--  if (GCCInstallation.isValid())
--    addPathIfExists(SysRoot + "/usr/lib/" + GCCInstallation.getTriple().str() +
--                    "/../../" + Multilib, Paths);
--
-   // Add the non-multilib suffixed paths (if potentially different).
-   if (GCCInstallation.isValid()) {
-     const std::string &LibPath = GCCInstallation.getParentLibPath();
-@@ -2341,8 +2330,6 @@
-       addPathIfExists(LibPath, Paths);
-     }
-   }
--  addPathIfExists(SysRoot + "/lib", Paths);
--  addPathIfExists(SysRoot + "/usr/lib", Paths);
- 
-   IsPIEDefault = SanitizerArgs(*this, Args).hasZeroBaseShadow();
- }
-@@ -2395,9 +2382,6 @@
-   if (DriverArgs.hasArg(options::OPT_nostdinc))
-     return;
- 
--  if (!DriverArgs.hasArg(options::OPT_nostdlibinc))
--    addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/local/include");
--
-   if (!DriverArgs.hasArg(options::OPT_nobuiltininc)) {
-     llvm::sys::Path P(D.ResourceDir);
-     P.appendComponent("include");
-@@ -2479,26 +2463,6 @@
-     "/usr/include/powerpc64-linux-gnu"
-   };
-   ArrayRef<StringRef> MultiarchIncludeDirs;
--  if (getTriple().getArch() == llvm::Triple::x86_64) {
--    MultiarchIncludeDirs = X86_64MultiarchIncludeDirs;
--  } else if (getTriple().getArch() == llvm::Triple::x86) {
--    MultiarchIncludeDirs = X86MultiarchIncludeDirs;
--  } else if (getTriple().getArch() == llvm::Triple::aarch64) {
--    MultiarchIncludeDirs = AArch64MultiarchIncludeDirs;
--  } else if (getTriple().getArch() == llvm::Triple::arm) {
--    if (getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
--      MultiarchIncludeDirs = ARMHFMultiarchIncludeDirs;
--    else
--      MultiarchIncludeDirs = ARMMultiarchIncludeDirs;
--  } else if (getTriple().getArch() == llvm::Triple::mips) {
--    MultiarchIncludeDirs = MIPSMultiarchIncludeDirs;
--  } else if (getTriple().getArch() == llvm::Triple::mipsel) {
--    MultiarchIncludeDirs = MIPSELMultiarchIncludeDirs;
--  } else if (getTriple().getArch() == llvm::Triple::ppc) {
--    MultiarchIncludeDirs = PPCMultiarchIncludeDirs;
--  } else if (getTriple().getArch() == llvm::Triple::ppc64) {
--    MultiarchIncludeDirs = PPC64MultiarchIncludeDirs;
--  }
-   for (ArrayRef<StringRef>::iterator I = MultiarchIncludeDirs.begin(),
-                                      E = MultiarchIncludeDirs.end();
-        I != E; ++I) {
-@@ -2510,13 +2474,6 @@
- 
-   if (getTriple().getOS() == llvm::Triple::RTEMS)
-     return;
--
--  // Add an include of '/include' directly. This isn't provided by default by
--  // system GCCs, but is often used with cross-compiling GCCs, and harmless to
--  // add even when Clang is acting as-if it were a system compiler.
--  addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/include");
--
--  addExternCSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include");
- }
- 
- /// \brief Helper to add the three variant paths for a libstdc++ installation.
-diff -Naur cfe-3.3.src-orig/lib/Driver/Tools.cpp cfe-3.3.src/lib/Driver/Tools.cpp
---- cfe-3.3.src-orig/lib/Driver/Tools.cpp	2013-05-30 14:01:30.000000000 -0400
-+++ cfe-3.3.src/lib/Driver/Tools.cpp	2013-06-21 19:30:51.604726574 -0400
-@@ -5976,43 +5976,6 @@
-     }
-   }
- 
--  if (ToolChain.getArch() == llvm::Triple::arm ||
--      ToolChain.getArch() == llvm::Triple::thumb ||
--      (!Args.hasArg(options::OPT_static) &&
--       !Args.hasArg(options::OPT_shared))) {
--    CmdArgs.push_back("-dynamic-linker");
--    if (isAndroid)
--      CmdArgs.push_back("/system/bin/linker");
--    else if (ToolChain.getArch() == llvm::Triple::x86)
--      CmdArgs.push_back("/lib/ld-linux.so.2");
--    else if (ToolChain.getArch() == llvm::Triple::aarch64)
--      CmdArgs.push_back("/lib/ld-linux-aarch64.so.1");
--    else if (ToolChain.getArch() == llvm::Triple::arm ||
--             ToolChain.getArch() == llvm::Triple::thumb) {
--      if (ToolChain.getTriple().getEnvironment() == llvm::Triple::GNUEABIHF)
--        CmdArgs.push_back("/lib/ld-linux-armhf.so.3");
--      else
--        CmdArgs.push_back("/lib/ld-linux.so.3");
--    }
--    else if (ToolChain.getArch() == llvm::Triple::mips ||
--             ToolChain.getArch() == llvm::Triple::mipsel)
--      CmdArgs.push_back("/lib/ld.so.1");
--    else if (ToolChain.getArch() == llvm::Triple::mips64 ||
--             ToolChain.getArch() == llvm::Triple::mips64el) {
--      if (hasMipsN32ABIArg(Args))
--        CmdArgs.push_back("/lib32/ld.so.1");
--      else
--        CmdArgs.push_back("/lib64/ld.so.1");
--    }
--    else if (ToolChain.getArch() == llvm::Triple::ppc)
--      CmdArgs.push_back("/lib/ld.so.1");
--    else if (ToolChain.getArch() == llvm::Triple::ppc64 ||
--	     ToolChain.getArch() == llvm::Triple::systemz)
--      CmdArgs.push_back("/lib64/ld64.so.1");
--    else
--      CmdArgs.push_back("/lib64/ld-linux-x86-64.so.2");
--  }
--
-   CmdArgs.push_back("-o");
-   CmdArgs.push_back(Output.getFilename());
- 
-diff -Naur cfe-3.3.src-orig/lib/Frontend/InitHeaderSearch.cpp cfe-3.3.src/lib/Frontend/InitHeaderSearch.cpp
---- cfe-3.3.src-orig/lib/Frontend/InitHeaderSearch.cpp	2013-04-29 21:21:43.000000000 -0400
-+++ cfe-3.3.src/lib/Frontend/InitHeaderSearch.cpp	2013-06-21 19:32:47.627016565 -0400
-@@ -225,20 +225,6 @@
-                                             const HeaderSearchOptions &HSOpts) {
-   llvm::Triple::OSType os = triple.getOS();
- 
--  if (HSOpts.UseStandardSystemIncludes) {
--    switch (os) {
--    case llvm::Triple::FreeBSD:
--    case llvm::Triple::NetBSD:
--    case llvm::Triple::OpenBSD:
--    case llvm::Triple::Bitrig:
--      break;
--    default:
--      // FIXME: temporary hack: hard-coded paths.
--      AddPath("/usr/local/include", System, false);
--      break;
--    }
--  }
--
-   // Builtin includes use #include_next directives and should be positioned
-   // just prior C include dirs.
-   if (HSOpts.UseBuiltinIncludes) {
-@@ -332,9 +318,6 @@
-   default:
-     break;
-   }
--
--  if ( os != llvm::Triple::RTEMS )
--    AddPath("/usr/include", ExternCSystem, false);
- }
- 
- void InitHeaderSearch::
diff --git a/pkgs/development/compilers/llvm/3.3/clang-tablegen-dir.patch b/pkgs/development/compilers/llvm/3.3/clang-tablegen-dir.patch
deleted file mode 100644
index de6a468b239f..000000000000
--- a/pkgs/development/compilers/llvm/3.3/clang-tablegen-dir.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/utils/TableGen/CMakeLists.txt       (revision 190146)
-+++ b/utils/TableGen/CMakeLists.txt       (working copy)
-@@ -1,4 +1,5 @@
- set(LLVM_LINK_COMPONENTS Support)
-+set(LLVM_TOOLS_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
- 
- add_tablegen(clang-tblgen CLANG
-   ClangASTNodesEmitter.cpp
-
diff --git a/pkgs/development/compilers/llvm/3.3/clang.nix b/pkgs/development/compilers/llvm/3.3/clang.nix
deleted file mode 100644
index 316730fe3ba0..000000000000
--- a/pkgs/development/compilers/llvm/3.3/clang.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ stdenv, fetchurl, perl, groff, llvm, cmake, libxml2, python }:
-
-let
-  version = "3.3";
-  gccReal = if (stdenv.cc.cc or null) == null then stdenv.cc else stdenv.cc.cc;
-in
-
-stdenv.mkDerivation {
-  name = "clang-${version}";
-
-  buildInputs = [ perl llvm groff cmake libxml2 python ];
-
-  patches = [ ./clang-tablegen-dir.patch ] ++
-            stdenv.lib.optional (stdenv.cc.libc != null) ./clang-purity.patch;
-
-  cmakeFlags = [
-    "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}"
-    "-DCMAKE_BUILD_TYPE=Release"
-    "-DLLVM_TARGETS_TO_BUILD=all"
-    "-DGCC_INSTALL_PREFIX=${gccReal}"
-  ] ++ stdenv.lib.optionals (stdenv.cc.libc != null) [
-    "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include/"
-  ];
-
-  enableParallelBuilding = true;
-
-  src = fetchurl {
-      url = "http://llvm.org/releases/${version}/cfe-${version}.src.tar.gz";
-      sha256 = "15mrvw43s4frk1j49qr4v5viq68h8qlf10qs6ghd6mrsmgj5vddi";
-  };
-
-  passthru = {
-    isClang = true;
-    cc = stdenv.cc.cc;
-    gcc = gccReal;
-  };
-
-  meta = {
-    homepage = http://clang.llvm.org/;
-    description = "A C language family frontend for LLVM";
-    license = "BSD";
-    maintainers = with stdenv.lib.maintainers; [viric];
-    platforms = with stdenv.lib.platforms; all;
-  };
-}
diff --git a/pkgs/development/compilers/llvm/3.3/llvm.nix b/pkgs/development/compilers/llvm/3.3/llvm.nix
deleted file mode 100644
index c19955ddaf03..000000000000
--- a/pkgs/development/compilers/llvm/3.3/llvm.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{ stdenv, fetchurl, perl, groff, cmake, python, libffi, binutils, debugVersion ? false }:
-let
-  version = "3.3";
-in stdenv.mkDerivation rec {
-  name = "llvm-${version}";
-
-  src = fetchurl {
-    url = "http://llvm.org/releases/${version}/llvm-${version}.src.tar.gz";
-    sha256 = "0y3mfbb5qzcpw3v5qncn69x1hdrrrfirgs82ypi2annhf0g6nxk8";
-  };
-
-  patches = [
-    ./more-memory-for-bugpoint.patch # The default rlimits in 3.3 are too low for shared libraries.
-    ./no-rule-aarch64.patch          # http://llvm.org/bugs/show_bug.cgi?id=16625
-    # Patch needed for Julia, backports fixes from LLVM 3.5
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/JuliaLang/julia/release-0.4/deps/llvm-3.3.patch";
-      sha256 = "0j6chyx4k8zr1qha5dks8lqlcraqrj4q1hwnk2kj3qi6cajsd8k3";
-    })
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/JuliaLang/julia/release-0.4/deps/instcombine-llvm-3.3.patch";
-      sha256 = "161frq3wxrkxah78krb24hp4zkcnphzcgnvkwfq1abq2vjx3f8sn";
-    })
-    (fetchurl {
-      url = "https://raw.githubusercontent.com/JuliaLang/julia/release-0.4/deps/int128-vector.llvm-3.3.patch";
-      sha256 = "0lzkv6hvsdaalwsyf6sq0vdrf8x5nk58qg6nn5dlw7n3hxaxpm4m";
-    })
-  ];
-
-  buildInputs = [ perl groff cmake python libffi ];
-
-  # hacky fix: created binaries need to be run before installation
-  preBuild = let LD = if stdenv.isDarwin then "DYLD" else "LD";
-    in "export ${LD}_LIBRARY_PATH='$$${LD}_LIBRARY_PATH:'`pwd`/lib";
-
-  cmakeFlags = with stdenv; [
-    "-DCMAKE_BUILD_TYPE=${if debugVersion then "Debug" else "Release"}"
-    "-DLLVM_BUILD_TESTS=ON"
-    "-DLLVM_ENABLE_FFI=ON"
-    "-DLLVM_BINUTILS_INCDIR=${binutils}/include"
-    "-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=R600" # for mesa
-  ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";
-
-  postBuild = ''
-    paxmark m bin/{lli,llvm-rtdyld}
-
-    paxmark m unittests/ExecutionEngine/JIT/JITTests
-    paxmark m unittests/ExecutionEngine/MCJIT/MCJITTests
-    paxmark m unittests/Support/SupportTests
-  '';
-
-  enableParallelBuilding = true;
-
-  doCheck = true;
-
-  meta = with stdenv.lib; {
-    description = "Collection of modular and reusable compiler and toolchain technologies";
-    homepage    = http://llvm.org/;
-    license     = licenses.bsd3;
-    maintainers = with maintainers; [ lovek323 raskin viric ];
-    platforms   = platforms.all;
-  };
-}
diff --git a/pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch b/pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch
deleted file mode 100644
index fa19ce4f5871..000000000000
--- a/pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur llvm-3.3.src-orig/tools/bugpoint/bugpoint.cpp llvm-3.3.src/tools/bugpoint/bugpoint.cpp
---- llvm-3.3.src-orig/tools/bugpoint/bugpoint.cpp	2013-01-27 20:35:51.000000000 -0500
-+++ llvm-3.3.src/tools/bugpoint/bugpoint.cpp	2013-06-21 18:29:47.612731499 -0400
-@@ -48,9 +48,9 @@
-                       "is killed (default is 300s), 0 disables timeout"));
- 
- static cl::opt<int>
--MemoryLimit("mlimit", cl::init(-1), cl::value_desc("MBytes"),
-+MemoryLimit("mlimit", cl::init(0), cl::value_desc("MBytes"),
-              cl::desc("Maximum amount of memory to use. 0 disables check."
--                      " Defaults to 100MB (800MB under valgrind)."));
-+                      " Check disabled by default."));
- 
- static cl::opt<bool>
- UseValgrind("enable-valgrind",
diff --git a/pkgs/development/compilers/llvm/3.3/no-rule-aarch64.patch b/pkgs/development/compilers/llvm/3.3/no-rule-aarch64.patch
deleted file mode 100644
index ea7214febe5a..000000000000
--- a/pkgs/development/compilers/llvm/3.3/no-rule-aarch64.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- llvm/lib/Target/AArch64/Utils/CMakeLists.txt	2013/05/18 04:32:15	182189
-+++ llvm/lib/Target/AArch64/Utils/CMakeLists.txt	2013/05/18 08:17:47	182190
-@@ -3,3 +3,5 @@
- add_llvm_library(LLVMAArch64Utils
-   AArch64BaseInfo.cpp
-   )
-+
-+add_dependencies(LLVMAArch64Utils AArch64CommonTableGen)
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b016f8ae985..6b8c502b7f55 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4024,7 +4024,6 @@ let
   clang_36 = llvmPackages_36.clang;
   clang_35 = wrapCC llvmPackages_35.clang;
   clang_34 = wrapCC llvmPackages_34.clang;
-  clang_33 = wrapCC (clangUnwrapped llvm_33 ../development/compilers/llvm/3.3/clang.nix);
 
   clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer {
     clang = clang_34;
@@ -4508,7 +4507,6 @@ let
 
   julia = callPackage ../development/compilers/julia {
     gmp = gmp6;
-    llvm = llvm_33;
     openblas = openblasCompat;
   };
 
@@ -4532,7 +4530,6 @@ let
   llvm_36 = llvmPackages_36.llvm;
   llvm_35 = llvmPackages_35.llvm;
   llvm_34 = llvmPackages_34.llvm;
-  llvm_33 = callPackage ../development/compilers/llvm/3.3/llvm.nix { };
 
   llvmPackages = recurseIntoAttrs llvmPackages_37;
 

From ba0582670796acdeeb9ab0001a7edd0b08290d4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Wed, 2 Mar 2016 17:30:42 +0000
Subject: [PATCH 2091/2285] Attempt to fix transient grub1 test kernel panics

Example: http://hydra.nixos.org/build/32469819/nixlog/26/raw
---
 nixos/tests/installer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 84fdb027ed85..9e5a6ad04e1e 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -46,7 +46,7 @@ let
                   , grubIdentifier, preBootCommands, extraConfig
                   }:
     let
-      iface = if grubVersion == 1 then "scsi" else "virtio";
+      iface = if grubVersion == 1 then "ide" else "virtio";
       qemuFlags =
         (if system == "x86_64-linux" then "-m 768 " else "-m 512 ") +
         (optionalString (system == "x86_64-linux") "-cpu kvm64 ");

From c3fa090616d45dbca9ce709d0e66279566303509 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Wed, 2 Mar 2016 18:45:45 +0100
Subject: [PATCH 2092/2285] gentium-book-basic: init at 1.102

---
 .../data/fonts/gentium-book-basic/default.nix | 31 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 33 insertions(+)
 create mode 100644 pkgs/data/fonts/gentium-book-basic/default.nix

diff --git a/pkgs/data/fonts/gentium-book-basic/default.nix b/pkgs/data/fonts/gentium-book-basic/default.nix
new file mode 100644
index 000000000000..8bc9ec5e2f30
--- /dev/null
+++ b/pkgs/data/fonts/gentium-book-basic/default.nix
@@ -0,0 +1,31 @@
+{ stdenv, fetchzip }:
+
+stdenv.mkDerivation rec {
+  name = "gentium-book-basic-${version}";
+  major = "1";
+  minor = "102";
+  version = "${major}.${minor}";
+
+  src = fetchzip {
+    name = "${name}.zip";
+    url = "http://software.sil.org/downloads/gentium/GentiumBasic_${major}${minor}.zip";
+    sha256 = "109yiqwdfb1bn7d6bjp8d50k1h3z3kz86p3faz11f9acvsbsjad0";
+  };
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  installPhase = ''
+    mkdir -p $out/share/fonts/truetype
+    mkdir -p $out/share/doc/${name}
+    cp -v *.ttf $out/share/fonts/truetype/
+    cp -v FONTLOG.txt GENTIUM-FAQ.txt $out/share/doc/${name}
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = "http://software.sil.org/gentium/";
+    description = "A high-quality typeface family for Latin, Cyrillic, and Greek";
+    maintainers = with maintainers; [ DamienCassou ];
+    license = licenses.ofl;
+    platforms = platforms.all;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ef6dc1f6f3b4..019e09e2b0d7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11112,6 +11112,8 @@ let
 
   gentium = callPackage ../data/fonts/gentium {};
 
+  gentium-book-basic = callPackage ../data/fonts/gentium-book-basic {};
+
   geolite-legacy = callPackage ../data/misc/geolite-legacy { };
 
   gohufont = callPackage ../data/fonts/gohufont { };

From a855ef85ea7f43cd81013ed1ba3e6e0c48b2ed99 Mon Sep 17 00:00:00 2001
From: michael bishop <cleverca22@gmail.com>
Date: Wed, 2 Mar 2016 13:48:27 -0400
Subject: [PATCH 2093/2285] multimc: fix building under chroot

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 408366475536..f4cbd25da809 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -68,6 +68,7 @@
   chaoflow = "Florian Friesdorf <flo@chaoflow.net>";
   chattered = "Phil Scott <me@philscotted.com>";
   christopherpoole = "Christopher Mark Poole <mail@christopherpoole.net>";
+  cleverca22 = "Michael Bishop <cleverca22@gmail.com>";
   coconnor = "Corey O'Connor <coreyoconnor@gmail.com>";
   codsl = "codsl <codsl@riseup.net>";
   codyopel = "Cody Opel <codyopel@gmail.com>";
diff --git a/pkgs/games/multimc/default.nix b/pkgs/games/multimc/default.nix
index c07a76d397d3..2e528a8203fe 100644
--- a/pkgs/games/multimc/default.nix
+++ b/pkgs/games/multimc/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, cmake, qt5Full, jdk7, zlib, file, makeWrapper, xorg, libpulseaudio }:
+{ stdenv, fetchFromGitHub, cmake, qt5Full, jdk7, zlib, file, makeWrapper, xorg, libpulseaudio, qt5 }:
 
 let
   libnbt = fetchFromGitHub {
@@ -23,6 +23,8 @@ stdenv.mkDerivation {
     rmdir $sourceRoot/depends/libnbtplusplus
     cp -r ${libnbt} $sourceRoot/depends/libnbtplusplus
     chmod 755 -R $sourceRoot/depends/libnbtplusplus
+    mkdir -pv $sourceRoot/build/
+    cp -v ${qt5.quazip.src} $sourceRoot/build/quazip-0.7.1.tar.gz
   '';
 
   patches = [ ./multimc.patch ];
@@ -51,5 +53,6 @@ stdenv.mkDerivation {
     '';
     platforms = stdenv.lib.platforms.linux;
     license = stdenv.lib.licenses.lgpl21Plus;
+    maintainers = stdenv.lib.maintainers.cleverca22;
   };
 }

From c2bce0cd029cd7068f75b8025b0fdddb34881a26 Mon Sep 17 00:00:00 2001
From: Anders Lundstedt <git@anderslundstedt.se>
Date: Wed, 2 Mar 2016 19:26:48 +0100
Subject: [PATCH 2094/2285] Respect umask settings in Transmission config

In NixOS/nixpkgs@da6bc44 @thoughtpolice
made the Transmission NixOS module override the umask setting in the
Transmission config. This commit removes that override.

I want a different umask setting and I guess it is possible that other
people might want it to. Thus I think it is a good idea to respect the
umask settings in the Transmission config.
---
 nixos/modules/services/torrent/transmission.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index b3f1f9066367..5ae12ac1e953 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -21,7 +21,7 @@ let
     else toString ''"${x}"'';
 
   # for users in group "transmission" to have access to torrents
-  fullSettings = { download-dir = downloadDir; incomplete-dir = incompleteDir; } // cfg.settings // { umask = 2; };
+  fullSettings = { umask = 2; download-dir = downloadDir; incomplete-dir = incompleteDir; } // cfg.settings;
 in
 {
   options = {

From ccc64c20e6f9e8382eac2bf666a700a8be9270fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Sun, 28 Feb 2016 08:57:08 -0300
Subject: [PATCH 2095/2285] tint2: 0.12 -> 0.12.7

---
 pkgs/applications/misc/tint2/default.nix | 25 ++++++++++++------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/misc/tint2/default.nix b/pkgs/applications/misc/tint2/default.nix
index e8412ce19160..f4162147258c 100644
--- a/pkgs/applications/misc/tint2/default.nix
+++ b/pkgs/applications/misc/tint2/default.nix
@@ -1,27 +1,31 @@
-{ stdenv, fetchurl, pkgconfig, cmake, pango, cairo, glib, imlib2, libXinerama
+{ stdenv, fetchFromGitLab, pkgconfig, cmake, pango, cairo, glib, imlib2, libXinerama
 , libXrender, libXcomposite, libXdamage, libX11, libXrandr, gtk, libpthreadstubs
-, libXdmcp, librsvg, fetchgit
+, libXdmcp, librsvg, libstartup_notification
 }:
 
 stdenv.mkDerivation rec {
   name = "tint2-${version}";
-  version = "0.12";
+  version = "0.12.7";
 
-  src = fetchgit {
-    url = "https://gitlab.com/o9000/tint2.git";
+  src = fetchFromGitLab {
+    owner = "o9000";
+    repo = "tint2";
     rev = version;
-    sha256 = "0pd84ydpqz2l6gkhj565nqi2xyiph8zfpn4xha60xshqpsg3pqjq";
+    sha256 = "01wb1yy7zfi01fl34yzpn1d30fykcf8ivmdlynnxp5znqrdsqm2r";
   };
-        
+
+  enableParallelBuilding = true;
+
   buildInputs = [ pkgconfig cmake pango cairo glib imlib2 libXinerama
     libXrender libXcomposite libXdamage libX11 libXrandr gtk libpthreadstubs
-    libXdmcp librsvg
+    libXdmcp librsvg libstartup_notification
   ];
 
   preConfigure =
     ''
       substituteInPlace CMakeLists.txt --replace /etc $out/etc
     '';
+
   prePatch =
     ''
       substituteInPlace ./src/tint2conf/properties.c --replace /usr/share/ /run/current-system/sw/share/
@@ -29,11 +33,6 @@ stdenv.mkDerivation rec {
       substituteInPlace ./src/launcher/icon-theme-common.c --replace /usr/share/ /run/current-system/sw/share/
     '';
 
-  cmakeFlags = [
-    "-DENABLE_TINT2CONF=0"
-    "-DENABLE_SN=0"
-  ];
-
   meta = {
     homepage = https://gitlab.com/o9000/tint2;
     license = stdenv.lib.licenses.gpl2;

From 1904ef7f09bac1ed9a4fc17ee4c6e94d9c4dc981 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Mon, 21 Dec 2015 12:09:38 +0100
Subject: [PATCH 2096/2285] systemd: enable upstream systemd-binfmt.service

Since we don't restart sysinit.service in switch-to-configuration, this
additionally overrides systemd-binfmt.service to depend on
proc-sys-fs-binfmt_misc.automount, which is normally provided by
sysinit.service.
---
 nixos/modules/system/boot/systemd.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index c5ee95f4c9a4..a3c83521c354 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -160,6 +160,7 @@ let
       "systemd-timedated.service"
       "systemd-localed.service"
       "systemd-hostnamed.service"
+      "systemd-binfmt.service"
     ]
 
     ++ cfg.additionalUpstreamSystemUnits;
@@ -779,6 +780,7 @@ in
     systemd.services.systemd-user-sessions.restartIfChanged = false; # Restart kills all active sessions.
     systemd.targets.local-fs.unitConfig.X-StopOnReconfiguration = true;
     systemd.targets.remote-fs.unitConfig.X-StopOnReconfiguration = true;
+    systemd.services.systemd-binfmt.wants = [ "proc-sys-fs-binfmt_misc.automount" ];
 
     # Don't bother with certain units in containers.
     systemd.services.systemd-remount-fs.unitConfig.ConditionVirtualization = "!container";

From 03f2888b98c6a89cba6a5111c22a508d274b1b34 Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Wed, 2 Mar 2016 15:32:39 -0500
Subject: [PATCH 2097/2285] sweethome3d: 4.6.2 -> 5.2

Also updated editors to latest version.

Tested the applications and everything seem to
work at least as well as previous version.
---
 pkgs/applications/misc/sweethome3d/default.nix | 4 ++--
 pkgs/applications/misc/sweethome3d/editors.nix | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix
index 0c9b6e8c08a0..a6ba00622100 100644
--- a/pkgs/applications/misc/sweethome3d/default.nix
+++ b/pkgs/applications/misc/sweethome3d/default.nix
@@ -51,14 +51,14 @@ let
 in rec {
 
   application = mkSweetHome3D rec {
-    version = "4.6.2";
+    version = "5.2";
     module = "SweetHome3D";
     name = stdenv.lib.toLower module + "-application-" + version;
     description = "Design and visualize your future home";
     license = stdenv.lib.licenses.gpl2Plus;
     src = fetchcvs {
       cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d";
-      sha256 = "0pm0rl5y90cjwyjma7g6nnaz6dv4bqcy8vl3zzxfj0q02ww01gbz";
+      sha256 = "0vws3lj5lgix5fz2hpqvz6p79py5gbfpkhmqpfb1knx1a12310bb";
       module = module;
       tag = "V_" + d2u version;
     };
diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix
index 87da1c6643b2..fb164aab1111 100644
--- a/pkgs/applications/misc/sweethome3d/editors.nix
+++ b/pkgs/applications/misc/sweethome3d/editors.nix
@@ -61,28 +61,28 @@ let
 in {
 
   textures-editor = mkEditorProject rec {
-    version = "1.4";
+    version = "1.5";
     module = "TexturesLibraryEditor";
     name = sweetName module version;
     description = "Easily create SH3T files and edit the properties of the texture images it contain";
     license = stdenv.lib.licenses.gpl2Plus;
     src = fetchcvs {
       cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d";
-      sha256 = "1j1ygb32dca48hng5bsna9f84vyin5qc3ds44xi39057izmw8499";
+      sha256 = "15wxdns3hc8yq362x0rj53bcxran2iynxznfcb9js85psd94zq7h";
       module = module;
       tag = "V_" + d2u version;
     };
   };
 
   furniture-editor = mkEditorProject rec {
-    version = "1.16";
+    version = "1.19";
     module = "FurnitureLibraryEditor";
     name = sweetName module version;
     description = "Quickly create SH3F files and edit the properties of the 3D models it contain";
     license = stdenv.lib.licenses.gpl2;
     src = fetchcvs {
       cvsRoot = ":pserver:anonymous@sweethome3d.cvs.sourceforge.net:/cvsroot/sweethome3d";
-      sha256 = "09dmb0835kncs1ngszhyp1pgvj7vqjjrp9q405gakm8ylrzym374";
+      sha256 = "0rr4nqil1mngak3ds5vz7f1whrgcgzpk6fb0qcr5ljms0jx0ylvs";
       module = module;
       tag = "V_" + d2u version;
     };

From 6c1e3a82decfd499ac0248c55cee5b239d625fd8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Mar 2016 19:42:39 +0100
Subject: [PATCH 2098/2285] cudatoolkit: Merge into one file and use
 callPackages

---
 .../development/compilers/cudatoolkit/5.5.nix |   6 -
 .../development/compilers/cudatoolkit/6.0.nix |   6 -
 .../development/compilers/cudatoolkit/6.5.nix |   6 -
 .../development/compilers/cudatoolkit/7.0.nix |   7 --
 .../compilers/cudatoolkit/default.nix         | 103 ++++++++++++++++++
 .../compilers/cudatoolkit/generic.nix         |  75 -------------
 pkgs/top-level/all-packages.nix               |  16 +--
 7 files changed, 108 insertions(+), 111 deletions(-)
 delete mode 100644 pkgs/development/compilers/cudatoolkit/5.5.nix
 delete mode 100644 pkgs/development/compilers/cudatoolkit/6.0.nix
 delete mode 100644 pkgs/development/compilers/cudatoolkit/6.5.nix
 delete mode 100644 pkgs/development/compilers/cudatoolkit/7.0.nix
 create mode 100644 pkgs/development/compilers/cudatoolkit/default.nix
 delete mode 100644 pkgs/development/compilers/cudatoolkit/generic.nix

diff --git a/pkgs/development/compilers/cudatoolkit/5.5.nix b/pkgs/development/compilers/cudatoolkit/5.5.nix
deleted file mode 100644
index c3eb1b6efcf6..000000000000
--- a/pkgs/development/compilers/cudatoolkit/5.5.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "5.5.22";
-  sha256 = "b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4";
-})
diff --git a/pkgs/development/compilers/cudatoolkit/6.0.nix b/pkgs/development/compilers/cudatoolkit/6.0.nix
deleted file mode 100644
index 200311703a0a..000000000000
--- a/pkgs/development/compilers/cudatoolkit/6.0.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "6.0.37";
-  sha256 = "991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40";
-})
diff --git a/pkgs/development/compilers/cudatoolkit/6.5.nix b/pkgs/development/compilers/cudatoolkit/6.5.nix
deleted file mode 100644
index 3d9a3a503494..000000000000
--- a/pkgs/development/compilers/cudatoolkit/6.5.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "6.5.19";
-  sha256 = "1x9zdmk8z784d3d35vr2ak1l4h5v4jfjhpxfi9fl9dvjkcavqyaj";
-})
diff --git a/pkgs/development/compilers/cudatoolkit/7.0.nix b/pkgs/development/compilers/cudatoolkit/7.0.nix
deleted file mode 100644
index 152dd6e92743..000000000000
--- a/pkgs/development/compilers/cudatoolkit/7.0.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ callPackage, ... } @ args:
-
-callPackage ./generic.nix (args // rec {
-  version = "7.0.28";
-  sha256 = "1km5hpiimx11jcazg0h3mjzk220klwahs2vfqhjavpds5ff2wafi";
-  url = "http://developer.download.nvidia.com/compute/cuda/7_0/Prod/local_installers/cuda_7.0.28_linux.run";
-})
diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
new file mode 100644
index 000000000000..a0b34592bf04
--- /dev/null
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -0,0 +1,103 @@
+{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python26, python27, zlib
+, xorg, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
+}:
+
+let
+
+  common =
+    { version, url, sha256
+    , python ? python27
+    }:
+
+    stdenv.mkDerivation rec {
+      name = "cudatoolkit-${version}";
+
+      dontPatchELF = true;
+      dontStrip = true;
+
+      src =
+        if stdenv.system == "x86_64-linux" then
+          fetchurl {
+            inherit url sha256;
+          }
+        else throw "cudatoolkit does not support platform ${stdenv.system}";
+
+      outputs = [ "out" "sdk" ];
+
+      buildInputs = [ perl ];
+
+      runtimeDependencies = [
+        ncurses expat python zlib glibc
+        xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext
+        gtk2 glib fontconfig freetype unixODBC alsaLib
+      ];
+
+      rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc}/lib64";
+
+      unpackPhase = ''
+        sh $src --keep --noexec
+        cd pkg/run_files
+        sh cuda-linux64-rel-${version}-*.run --keep --noexec
+        sh cuda-samples-linux-${version}-*.run --keep --noexec
+        cd pkg
+      '';
+
+      buildPhase = ''
+        find . -type f -executable -exec patchelf \
+          --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
+          '{}' \; || true
+        find . -type f -exec patchelf \
+          --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib \
+          --force-rpath \
+          '{}' \; || true
+      '';
+
+      installPhase = ''
+        mkdir $out $sdk
+        perl ./install-linux.pl --prefix="$out"
+        rm $out/tools/CUDA_Occupancy_Calculator.xls
+        perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
+
+        # let's remove the 32-bit libraries, they confuse the lib64->lib mover
+        rm -rf $out/lib
+
+        # Fixup path to samples (needed for cuda 6.5 or else nsight will not find them)
+        if [ -d "$out"/cuda-samples ]; then
+            mv "$out"/cuda-samples "$out"/samples
+        fi
+      '';
+
+      meta = {
+        license = lib.licenses.unfree;
+      };
+    };
+
+in {
+
+  cudatoolkit5 = common {
+    version = "5.5.22";
+    url = http://developer.download.nvidia.com/compute/cuda/5_5/rel/installers/cuda_5.5.22_linux_64.run;
+    sha256 = "b997e1dbe95704e0e806e0cedc5fd370a385351fef565c7bae0917baf3a29aa4";
+    python = python26;
+  };
+
+  cudatoolkit6 = common {
+    version = "6.0.37";
+    url = http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run;
+    sha256 = "991e436c7a6c94ec67cf44204d136adfef87baa3ded270544fa211179779bc40";
+  };
+
+  cudatoolkit65 = common {
+    version = "6.5.19";
+    url = http://developer.download.nvidia.com/compute/cuda/6_5/rel/installers/cuda_6.5.19_linux_64.run;
+    sha256 = "1x9zdmk8z784d3d35vr2ak1l4h5v4jfjhpxfi9fl9dvjkcavqyaj";
+  };
+
+  cudatoolkit7 = common {
+    version = "7.0.28";
+    url = http://developer.download.nvidia.com/compute/cuda/7_0/Prod/local_installers/cuda_7.0.28_linux.run;
+    sha256 = "1km5hpiimx11jcazg0h3mjzk220klwahs2vfqhjavpds5ff2wafi";
+  };
+
+}
+
diff --git a/pkgs/development/compilers/cudatoolkit/generic.nix b/pkgs/development/compilers/cudatoolkit/generic.nix
deleted file mode 100644
index a02c917ab24a..000000000000
--- a/pkgs/development/compilers/cudatoolkit/generic.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{ lib, stdenv, fetchurl, patchelf, perl, ncurses, expat, python, zlib
-, xorg, gtk2, glib, fontconfig, freetype, unixODBC, alsaLib, glibc
-# generic inputs
-, version, sha256, url ? null, ...
-} :
-
-let
-  # eg, 5.5.22 => 5_5
-  mkShort = let str  = stdenv.lib.strings;
-                take = stdenv.lib.lists.take;
-            in v: str.concatStringsSep "_" (take 2 (str.splitString "." v));
-  shortVer = mkShort version;
-in stdenv.mkDerivation rec {
-  name = "cudatoolkit-${version}";
-
-  dontPatchELF = true;
-  dontStrip = true;
-
-  src =
-    if stdenv.system == "x86_64-linux" then
-      fetchurl {
-        url = if url != null then url else "http://developer.download.nvidia.com/compute/cuda/${shortVer}/rel/installers/cuda_${version}_linux_64.run";
-        sha256 = sha256;
-      }
-    else throw "cudatoolkit does not support platform ${stdenv.system}";
-
-  outputs = [ "out" "sdk" ];
-
-  buildInputs = [ perl ];
-
-  runtimeDependencies = [
-    ncurses expat python zlib glibc
-    xorg.libX11 xorg.libXext xorg.libXrender xorg.libXt xorg.libXtst xorg.libXi xorg.libXext
-    gtk2 glib fontconfig freetype unixODBC alsaLib
-  ];
-
-  rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.cc}/lib64";
-
-  unpackPhase = ''
-    sh $src --keep --noexec
-    cd pkg/run_files
-    sh cuda-linux64-rel-${version}-*.run --keep --noexec
-    sh cuda-samples-linux-${version}-*.run --keep --noexec
-    cd pkg
-  '';
-
-  buildPhase = ''
-    find . -type f -executable -exec patchelf \
-      --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
-      '{}' \; || true
-    find . -type f -exec patchelf \
-      --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_CC/nix-support/orig-cc)/lib \
-      --force-rpath \
-      '{}' \; || true
-  '';
-
-  installPhase = ''
-    mkdir $out $sdk
-    perl ./install-linux.pl --prefix="$out"
-    rm $out/tools/CUDA_Occupancy_Calculator.xls
-    perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out"
-
-    # let's remove the 32-bit libraries, they confuse the lib64->lib mover
-    rm -rf $out/lib
-
-    # Fixup path to samples (needed for cuda 6.5 or else nsight will not find them)
-    if [ -d "$out"/cuda-samples ]; then
-        mv "$out"/cuda-samples "$out"/samples
-    fi
-  '';
-
-  meta = {
-    license = lib.licenses.unfree;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ee3d6d7d8a36..9efdc15aaba2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1266,17 +1266,11 @@ let
 
   cron = callPackage ../tools/system/cron { };
 
-  cudatoolkit5 = callPackage ../development/compilers/cudatoolkit/5.5.nix {
-    python = python26;
-  };
-
-  cudatoolkit6 = callPackage ../development/compilers/cudatoolkit/6.0.nix {
-    python = python26;
-  };
-
-  cudatoolkit65 = callPackage ../development/compilers/cudatoolkit/6.5.nix { };
-
-  cudatoolkit7 = callPackage ../development/compilers/cudatoolkit/7.0.nix { };
+  inherit (callPackages ../development/compilers/cudatoolkit { })
+    cudatoolkit5
+    cudatoolkit6
+    cudatoolkit65
+    cudatoolkit7;
 
   cudatoolkit = cudatoolkit7;
 

From 6d97de951df1c4b80c99c31a81d3ed89a329d999 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Wed, 2 Mar 2016 20:36:13 +0100
Subject: [PATCH 2099/2285] cudatoolkit: Add version 7.5.18

---
 pkgs/development/compilers/cudatoolkit/default.nix | 6 ++++++
 pkgs/top-level/all-packages.nix                    | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix
index a0b34592bf04..0ab3f52f2bff 100644
--- a/pkgs/development/compilers/cudatoolkit/default.nix
+++ b/pkgs/development/compilers/cudatoolkit/default.nix
@@ -99,5 +99,11 @@ in {
     sha256 = "1km5hpiimx11jcazg0h3mjzk220klwahs2vfqhjavpds5ff2wafi";
   };
 
+  cudatoolkit75 = common {
+    version = "7.5.18";
+    url = http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run;
+    sha256 = "1v2ylzp34ijyhcxyh5p6i0cwawwbbdhni2l5l4qm21s1cx9ish88";
+  };
+
 }
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9efdc15aaba2..a99998b1519a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1270,7 +1270,8 @@ let
     cudatoolkit5
     cudatoolkit6
     cudatoolkit65
-    cudatoolkit7;
+    cudatoolkit7
+    cudatoolkit75;
 
   cudatoolkit = cudatoolkit7;
 

From 369ede9235e8e0f9b6f766a9cbc647067482252a Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 2 Mar 2016 22:36:37 +0100
Subject: [PATCH 2100/2285] mcabber: 1.0.1 -> 1.0.2

---
 .../networking/instant-messengers/mcabber/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
index abe9b78904f0..f32bdf96257c 100644
--- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix
+++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "mcabber-${version}";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchurl {
     url = "http://mcabber.com/files/mcabber-${version}.tar.bz2";
-    sha256 = "14rd17rs26knmwinfv63w2xzlkj5ygvhicx95h0mai4lpji4b6jp";
+    sha256 = "1phzfsl6cfzaga140dm8bb8q678j0qsw29cc03rw4vkcxa8kh577";
   };
 
   buildInputs = [ openssl ncurses pkgconfig glib loudmouth libotr gpgme ];

From ba7b5ad530c5af5031ba957b957424b14304de47 Mon Sep 17 00:00:00 2001
From: Pascal Wittmann <mail@pascal-wittmann.de>
Date: Wed, 2 Mar 2016 23:14:31 +0100
Subject: [PATCH 2101/2285] filezilla: 3.15.0.2 -> 3.16.0

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

diff --git a/pkgs/applications/networking/ftp/filezilla/default.nix b/pkgs/applications/networking/ftp/filezilla/default.nix
index 8f53102d5f53..57b93bfd6568 100644
--- a/pkgs/applications/networking/ftp/filezilla/default.nix
+++ b/pkgs/applications/networking/ftp/filezilla/default.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, dbus, gnutls, wxGTK30, libidn, tinyxml, gettext
 , pkgconfig, xdg_utils, gtk2, sqlite, pugixml, libfilezilla }:
 
-let version = "3.15.0.2"; in
+let version = "3.16.0"; in
 stdenv.mkDerivation {
   name = "filezilla-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/filezilla/FileZilla_Client/${version}/FileZilla_${version}_src.tar.bz2";
-    sha256 = "0kvwkz01v73qi8y6n8wlidglwh0vg7pajsjm8xq7gch6jmq4cg1k";
+    sha256 = "0ilv4xhgav4srx6iqn0v0kv8rifgkysyx1hb9bnm45dc0skmbgbx";
   };
 
   configureFlags = [

From 18d43d74f6d3a538bacc6c49d844a2e439cf6cba Mon Sep 17 00:00:00 2001
From: Evgeny Egorochkin <phreedom@yandex.ru>
Date: Thu, 3 Mar 2016 03:58:51 +0200
Subject: [PATCH 2102/2285] azure-image: provide configuration.nix which allows
 nixos-rebuild to build a working generation and add helpful comments

---
 nixos/modules/virtualisation/azure-config-user.nix | 12 ++++++++++++
 nixos/modules/virtualisation/azure-image.nix       |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/virtualisation/azure-config-user.nix

diff --git a/nixos/modules/virtualisation/azure-config-user.nix b/nixos/modules/virtualisation/azure-config-user.nix
new file mode 100644
index 000000000000..de1b3857923f
--- /dev/null
+++ b/nixos/modules/virtualisation/azure-config-user.nix
@@ -0,0 +1,12 @@
+{ config, pkgs, modulesPath, ... }:
+
+{
+  # To build the configuration or use nix-env, you need to run
+  # either nixos-rebuild --upgrade or nix-channel --update
+  # to fetch the nixos channel.
+
+  # This configures everything but bootstrap services,
+  # which only need to be run once and have already finished
+  # if you are able to see this comment.
+  imports = [ "${modulesPath}/virtualisation/azure-common.nix" ];
+}
diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix
index f0a739bc95d1..79d1f7d7cc43 100644
--- a/nixos/modules/virtualisation/azure-image.nix
+++ b/nixos/modules/virtualisation/azure-image.nix
@@ -78,7 +78,7 @@ in
 
           echo Install a configuration.nix.
           mkdir -p /mnt/etc/nixos /mnt/boot/grub
-          cp ${./azure-config.nix} /mnt/etc/nixos/configuration.nix
+          cp ${./azure-config-user.nix} /mnt/etc/nixos/configuration.nix
 
           echo Generate the GRUB menu.
           ln -s vda /dev/sda

From bd71f511e58e73ef43d991b44ed781c108331293 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Thu, 3 Mar 2016 02:18:07 -0300
Subject: [PATCH 2103/2285] libqtelegram-aseman-edition: 6.0 -> 6.1

---
 .../telegram/libqtelegram-aseman-edition/default.nix      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
index 8166514bb3ac..957c59b88e55 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition/default.nix
@@ -2,14 +2,13 @@
 , qtbase, qtmultimedia, qtquick1 }:
 
 stdenv.mkDerivation rec {
-  name = "libqtelegram-aseman-edition-${version}";
-  version = "6.0";
+  name = "libqtelegram-aseman-edition-${meta.version}";
 
   src = fetchFromGitHub {
     owner = "Aseman-Land";
     repo = "libqtelegram-aseman-edition";
-    rev = "v${version}";
-    sha256 = "17hlxf43xwic8m06q3gwbxjpvz31ks6laffjw6ny98d45zfnfwra";
+    rev = "v${meta.version}-stable";
+    sha256 = "1pfd4pvh51639zk9shv1s4f6pf0ympnhar8a302vhrkga9i4cbx6";
   };
 
   buildInputs = [ qtbase qtmultimedia qtquick1 ];
@@ -25,6 +24,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    version = "6.1";
     description = "A fork of libqtelegram by Aseman, using qmake";
     homepage = src.meta.homepage;
     license = stdenv.lib.licenses.gpl3;

From f70ba914ef24f582ffaaebae8fdbc0ecaddeb967 Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Thu, 3 Mar 2016 02:19:07 -0300
Subject: [PATCH 2104/2285] telegram-qml: 0.9.1 -> 0.9.2

---
 .../telegram/telegram-qml/default.nix                  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
index 6bf550d4766b..aa442cbe8b2d 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-qml/default.nix
@@ -3,17 +3,16 @@
 , libqtelegram-aseman-edition }:
 
 stdenv.mkDerivation rec {
-  name = "telegram-qml-${version}";
-  version = "0.9.1-stable";
+  name = "telegram-qml-${meta.version}";
 
   src = fetchFromGitHub {
     owner = "Aseman-Land";
     repo = "TelegramQML";
-    rev = "v${version}";
-    sha256 = "077j06lfr6qccqv664hn0ln023xlh5cfm50kapjc2inapxj2yqmn";
+    rev = "v${meta.version}";
+    sha256 = "0j8vn845f2virvddk9yjbljy6vkr9ikyn6iy7hpj8nvr2xls3499";
   };
 
-  buildInputs = [ qtbase qtmultimedia qtquick1 libqtelegram-aseman-edition ];
+  propagatedBuildInputs = [ qtbase qtmultimedia qtquick1 libqtelegram-aseman-edition ];
   enableParallelBuild = true;
 
   patchPhase = ''
@@ -26,6 +25,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
+    version = "0.9.2";
     description = "Telegram API tools for QtQml and Qml";
     homepage = src.meta.homepage;
     license = stdenv.lib.licenses.gpl3;

From 14aa382f03f7581326847acd9dfafcf17499073c Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Thu, 3 Mar 2016 02:20:07 -0300
Subject: [PATCH 2105/2285] cutegram: 2.7.0 -> 2.7.1

And some minor changes
---
 .../telegram/cutegram/default.nix             | 38 +++++++++++--------
 pkgs/top-level/all-packages.nix               |  8 ++--
 2 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
index 507094f7c055..fa03b8d21adc 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
@@ -1,31 +1,37 @@
-{ stdenv, fetchFromGitHub
-, qtbase, qtquick1, qtmultimedia, qtquickcontrols, qtgraphicaleffects, makeQtWrapper
-, telegram-qml, libqtelegram-aseman-edition }:
+{ stdenv, fetchgit
+, qtbase, qtmultimedia, qtquick1, qtquickcontrols, qtgraphicaleffects
+, telegram-qml, libqtelegram-aseman-edition
+, gst_plugins_base, gst_plugins_good, gst_plugins_bad, gst_plugins_ugly
+, makeQtWrapper }:
 
 stdenv.mkDerivation rec {
-  name = "cutegram-${version}";
-  version = "2.7.0-stable";
+  name = "cutegram-${meta.version}";
 
-  src = fetchFromGitHub {
-    owner = "Aseman-Land";
-    repo = "Cutegram";
-    rev = "v${version}";
-    sha256 = "0qhy30gb8zdrphz1b7zcnv8hmm5fd5qwlvrg7wpsh3hk5niz3zxk";
+  src = fetchgit {
+    url = "https://github.com/Aseman-Land/Cutegram.git";
+    rev = "1dbe2792fb5a1760339379907f906e236c09db84";
+    sha256 = "080153bpa92jpi0zdrfajrn0yqy3jp8m4704sirbz46dv7471rzl";
   };
-  # TODO appindicator, for system tray plugin
-  buildInputs = [ qtbase qtquick1 qtmultimedia qtquickcontrols qtgraphicaleffects telegram-qml libqtelegram-aseman-edition ];
+
+  buildInputs =
+  [ qtbase qtmultimedia qtquick1 qtquickcontrols qtgraphicaleffects
+    telegram-qml libqtelegram-aseman-edition
+    gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly ];
   nativeBuildInputs = [ makeQtWrapper ];
   enableParallelBuild = true;
 
-  fixupPhase = "wrapQtProgram $out/bin/cutegram";
-
   configurePhase = "qmake -r PREFIX=$out";
 
+  fixupPhase = "wrapQtProgram $out/bin/cutegram";
+
   meta = with stdenv.lib; {
+    version = "2.7.1";
     description = "Telegram client forked from sigram";
     homepage = "http://aseman.co/en/products/cutegram/";
     license = licenses.gpl3;
-    maintainers = [ maintainers.profpatsch ];
+    maintainers = with maintainers; [ profpatsch AndersonTorres ];
   };
-
 }
+#TODO: appindicator, for system tray plugin (by @profpatsch)
+
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0f756a175ac9..1cb28017ae5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11653,10 +11653,10 @@ let
   cutecom = callPackage ../tools/misc/cutecom { };
 
   cutegram =
-    let cp = qt5.callPackage;
-    in cp ../applications/networking/instant-messengers/telegram/cutegram rec {
-      libqtelegram-aseman-edition = cp ../applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition { };
-      telegram-qml = cp ../applications/networking/instant-messengers/telegram/telegram-qml {
+    let callpkg = qt55.callPackage;
+    in callpkg ../applications/networking/instant-messengers/telegram/cutegram rec {
+      libqtelegram-aseman-edition = callpkg ../applications/networking/instant-messengers/telegram/libqtelegram-aseman-edition { };
+      telegram-qml = callpkg ../applications/networking/instant-messengers/telegram/telegram-qml {
         inherit libqtelegram-aseman-edition;
       };
     };

From ebc3f4bdf31507bbe7a8dd27a3d476ab4093dadd Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Thu, 3 Mar 2016 00:22:46 -0500
Subject: [PATCH 2106/2285] sweethome3d: Improvements

 -  Replace non freedesktop `CAD` desktop category
    by categories taken from debian's desktop item.

    This make the desktop items appear under the
    `Graphic` category in DE menus instead of `Others`.

 -  Moved to new package icons as specified by
    upstream release notes.

 -  Moved to icon name instead of full path to
    a single icon as specified by freedesktop
    specification.

 -  Human readable desktop item names.
---
 .../applications/misc/sweethome3d/default.nix | 42 +++++++++++++++----
 .../applications/misc/sweethome3d/editors.nix | 12 ++++--
 2 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix
index 0c9b6e8c08a0..d937dd78c056 100644
--- a/pkgs/applications/misc/sweethome3d/default.nix
+++ b/pkgs/applications/misc/sweethome3d/default.nix
@@ -1,20 +1,33 @@
-{ stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant
+{ lib, stdenv, fetchurl, fetchcvs, makeWrapper, makeDesktopItem, jdk, jre, ant
 , gtk3, gsettings_desktop_schemas, p7zip }:
 
 let
 
+  getDesktopFileName = drvName: (builtins.parseDrvName drvName).name;
+
+  # TODO: Should we move this to `lib`? Seems like its would be useful in many cases.
+  extensionOf = filePath: 
+    lib.concatStringsSep "." (lib.tail (lib.splitString "." 
+      (builtins.baseNameOf filePath)));
+
+  installIcons = iconName: icons: lib.concatStringsSep "\n" (lib.mapAttrsToList (size: iconFile: ''
+    mkdir -p "$out/share/icons/hicolor/${size}/apps"
+    ln -s -T "${iconFile}" "$out/share/icons/hicolor/${size}/apps/${iconName}.${extensionOf iconFile}"
+  '') icons);
+
   mkSweetHome3D =
-  { name, module, version, src, license, description, icon }:
+  { name, module, version, src, license, description, desktopName, icons }:
 
   stdenv.mkDerivation rec {
-    inherit name version src description icon;
+    inherit name version src description;
     exec = stdenv.lib.toLower module;
     sweethome3dItem = makeDesktopItem {
-      inherit name exec icon;
+      inherit exec desktopName;
+      name = getDesktopFileName name;
+      icon = getDesktopFileName name;
       comment =  description;
-      desktopName = name;
       genericName = "Computer Aided (Interior) Design";
-      categories = "Application;CAD;";
+      categories = "Application;Graphics;2DGraphics;3DGraphics;";
     };
 
     buildInputs = [ ant jdk jre makeWrapper p7zip gtk3 gsettings_desktop_schemas ];
@@ -29,7 +42,11 @@ let
     installPhase = ''
       mkdir -p $out/bin
       cp install/${module}-${version}.jar $out/share/java/.
+
+      ${installIcons (getDesktopFileName name) icons}
+
       cp "${sweethome3dItem}/share/applications/"* $out/share/applications
+
       makeWrapper ${jre}/bin/java $out/bin/$exec \
         --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gsettings_desktop_schemas}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
         --add-flags "-jar $out/share/java/${module}-${version}.jar -cp $out/share/java/Furniture.jar:$out/share/java/Textures.jar:$out/share/java/Help.jar ${if stdenv.system == "x86_64-linux" then "-d64" else "-d32"}"
@@ -62,9 +79,16 @@ in rec {
       module = module;
       tag = "V_" + d2u version;
     };
-    icon = fetchurl {
-      url = "http://sweethome3d.cvs.sourceforge.net/viewvc/sweethome3d/SweetHome3D/src/com/eteks/sweethome3d/viewcontroller/resources/help/images/sweethome3d.png";
-      sha256 = "0lnv2sz2d3m8jx25hz92gzardf0iblykhy5q0q2cyb7mw2qb2p92";
+    desktopName = "Sweet Home 3D";
+    icons = {
+      "32x32" = fetchurl {
+        url = "http://sweethome3d.cvs.sourceforge.net/viewvc/sweethome3d/SweetHome3D/deploy/SweetHome3DIcon32x32.png";
+        sha256 = "1r2fhfg27mx00nfv0qj66rhf719s2g1vhdis7bdc9mqk9x0mb0ir";
+      };
+      "48x48" = fetchurl {
+        url = "http://sweethome3d.cvs.sourceforge.net/viewvc/sweethome3d/SweetHome3D/deploy/SweetHome3DIcon48x48.png";
+        sha256 = "1ap6d75dyqqvx21wddvn8vw2apq3v803vmbxdriwd0dw9rq3zn4g";
+      };
     };
   };
 
diff --git a/pkgs/applications/misc/sweethome3d/editors.nix b/pkgs/applications/misc/sweethome3d/editors.nix
index 87da1c6643b2..d8c6461843ee 100644
--- a/pkgs/applications/misc/sweethome3d/editors.nix
+++ b/pkgs/applications/misc/sweethome3d/editors.nix
@@ -9,19 +9,21 @@ let
     + "-editor";
   sweetName = m: v: sweetExec m + "-" + v;
 
+  getDesktopFileName = drvName: (builtins.parseDrvName drvName).name;
+
   mkEditorProject =
-  { name, module, version, src, license, description }:
+  { name, module, version, src, license, description, desktopName }:
 
   stdenv.mkDerivation rec {
     application = sweethome3dApp;
     inherit name module version src description;
     exec = sweetExec module;
     editorItem = makeDesktopItem {
-      inherit name exec;
+      inherit exec desktopName;
+      name = getDesktopFileName name;
       comment =  description;
-      desktopName = name;
       genericName = "Computer Aided (Interior) Design";
-      categories = "Application;CAD;";
+      categories = "Application;Graphics;2DGraphics;3DGraphics;";
     };
 
     buildInputs = [ ant jre jdk makeWrapper gtk3 gsettings_desktop_schemas ];
@@ -72,6 +74,7 @@ in {
       module = module;
       tag = "V_" + d2u version;
     };
+    desktopName = "Sweet Home 3D - Textures Library Editor";
   };
 
   furniture-editor = mkEditorProject rec {
@@ -86,6 +89,7 @@ in {
       module = module;
       tag = "V_" + d2u version;
     };
+    desktopName = "Sweet Home 3D - Furniture Library Editor";
   };
 
 }

From 5f57d2dc506d27da999756666466f81eef6e3c98 Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Sat, 19 Sep 2015 22:03:11 -0400
Subject: [PATCH 2107/2285] maintainers: add a maintainer to the set

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

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index f4cbd25da809..d8a5adf5f98c 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -166,6 +166,7 @@
   joelmo = "Joel Moberg <joel.moberg@gmail.com>";
   joelteon = "Joel Taylor <me@joelt.io>";
   jpbernardy = "Jean-Philippe Bernardy <jeanphilippe.bernardy@gmail.com>";
+  jraygauthier = "Raymond Gauthier <jraygauthier@gmail.com>";
   jwiegley = "John Wiegley <johnw@newartisans.com>";
   jwilberding = "Jordan Wilberding <jwilberding@afiniate.com>";
   jzellner = "Jeff Zellner <jeffz@eml.cc>";

From 4f347ca8fe5cb120cab2916e14770e3e3416a6e5 Mon Sep 17 00:00:00 2001
From: Raymond Gauthier <jraygauthier@gmail.com>
Date: Sat, 19 Sep 2015 22:04:16 -0400
Subject: [PATCH 2108/2285] keepass: improvements

`*.desktop` file now:
 -  Refers to an icon.
 -  Is placed in the proper category (based on comparison with `keepassx2`.
 -  Has proper mime type (also based on comparison).

Also, now use `icoutils` to extract icons from the application ressouces
and transform them from `*.ico` to `*.png`. Created and used a generic
script that has the ability to move the extracted `*.png` to their
appropriate standard freedesktop location.

Tested this on nixos. `keepass` now has a icon and is categorized
in the same bin as `keepassx2`. The program still execute and
function prefectly.
---
 pkgs/applications/misc/keepass/default.nix    | 28 +++++++--
 .../extractWinRscIconsToStdFreeDesktopDir.sh  | 61 +++++++++++++++++++
 2 files changed, 84 insertions(+), 5 deletions(-)
 create mode 100755 pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh

diff --git a/pkgs/applications/misc/keepass/default.nix b/pkgs/applications/misc/keepass/default.nix
index 8f16283d3911..948d03262b6b 100644
--- a/pkgs/applications/misc/keepass/default.nix
+++ b/pkgs/applications/misc/keepass/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, fetchurl, buildDotnetPackage, makeWrapper, unzip, makeDesktopItem, plugins ? [] }:
+{ stdenv, lib, fetchurl, buildDotnetPackage, makeWrapper, unzip, makeDesktopItem, icoutils, plugins ? [] }:
 
 # KeePass looks for plugins in under directory in which KeePass.exe is
 # located. It follows symlinks where looking for that directory, so
@@ -17,7 +17,7 @@ with builtins; buildDotnetPackage rec {
 
   sourceRoot = ".";
 
-  buildInputs = [ unzip makeWrapper ];
+  buildInputs = [ unzip makeWrapper icoutils ];
 
   pluginLoadPathsPatch =
     let outputLc = toString (add 8 (length plugins));
@@ -52,9 +52,14 @@ with builtins; buildDotnetPackage rec {
     name = "keepass";
     exec = "keepass";
     comment = "Password manager";
+    icon = "keepass";
     desktopName = "Keepass";
     genericName = "Password manager";
-    categories = "Application;Other;";
+    categories = "Application;Utility;";
+    mimeType = stdenv.lib.concatStringsSep ";" [
+      "application/x-keepass2"
+      ""
+    ];
   };
 
   outputFiles = [ "Build/KeePass/Release/*" "Build/KeePassLib/Release/*" ];
@@ -67,16 +72,29 @@ with builtins; buildDotnetPackage rec {
   # is found and does not pollute output path.
   binPaths = lib.concatStrings (lib.intersperse ":" (map (x: x + "/bin") plugins));
 
-  postInstall = ''
+  postInstall = 
+  let
+    extractFDeskIcons = ./extractWinRscIconsToStdFreeDesktopDir.sh;
+  in
+  ''
     mkdir -p "$out/share/applications"
     cp ${desktopItem}/share/applications/* $out/share/applications
     wrapProgram $out/bin/keepass --prefix PATH : "$binPaths"
+
+    ${extractFDeskIcons} \
+      "./Translation/TrlUtil/Resources/KeePass.ico" \
+      '[^\.]+_[0-9]+_([0-9]+x[0-9]+)x[0-9]+\.png' \
+      '\1' \
+      '([^\.]+).+' \
+      'keepass' \
+      "$out" \
+      "./tmp"
   '';
 
   meta = {
     description = "GUI password manager with strong cryptography";
     homepage = http://www.keepass.info/;
-    maintainers = with stdenv.lib.maintainers; [ amorsillo obadz ];
+    maintainers = with stdenv.lib.maintainers; [ amorsillo obadz jraygauthier ];
     platforms = with stdenv.lib.platforms; all;
     license = stdenv.lib.licenses.gpl2;
   };
diff --git a/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh b/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh
new file mode 100755
index 000000000000..04485b146a04
--- /dev/null
+++ b/pkgs/applications/misc/keepass/extractWinRscIconsToStdFreeDesktopDir.sh
@@ -0,0 +1,61 @@
+#!/bin/sh
+
+# The file from which to extract *.ico files.
+#rscFile="./KeePass.exe"
+rscFile=$1
+
+# A regexp that can extract the image size from the file name.
+# sizeRegex='[^\.]+\.exe_[0-9]+_[0-9]+_[0-9]+_[0-9]+_([0-9]+x[0-9]+)x[0-9]+\.png'
+sizeRegex=$2
+
+# sizeReplaceExp='\1'
+sizeReplaceExp=$3
+
+# A regexp that can extract the name of the target image from the file name.
+# nameRegex='([^\.]+)\.exe.+'
+nameRegex=$4
+
+# nameReplaceExp='\1'
+nameReplaceExp=$5
+
+# out=./myOut
+out=$6
+
+# An optional temp dir. TODO: Generate it randomly by default instead.
+tmp=./tmp
+if [ "" != "$4" ]; then
+    tmp=$7
+fi
+
+
+
+rm -rf $tmp/png $tmp/ico
+mkdir -p $tmp/png $tmp/ico
+
+# Extract the ressource file's extension.
+rscFileExt=`echo "$rscFile" | sed -re 's/.+\.(.+)$/\1/'`
+
+# Debug ressource file extension.
+echo "rscFileExt=$rscFileExt"
+
+if [ "ico" = "$rscFileExt" ]; then
+    cp -p $rscFile $tmp/ico
+else
+    wrestool -x --output=$tmp/ico -t14 $rscFile
+fi
+    
+icotool --icon -x --palette-size=0 -o $tmp/png $tmp/ico/*.ico
+
+mkdir -p $out
+
+for i in $tmp/png/*.png; do
+  fn=`basename "$i"`
+  size=$(echo $fn | sed -re 's/'${sizeRegex}'/'${sizeReplaceExp}'/')
+  name=$(echo $fn | sed -re 's/'${nameRegex}'/'${nameReplaceExp}'/')
+  targetDir=$out/share/icons/hicolor/$size/apps
+  targetFile=$targetDir/$name.png
+  mkdir -p $targetDir
+  mv $i $targetFile
+done
+
+rm -rf $tmp/png $tmp/ico

From c2a2c2ecd4055d4c47204e64c7e45d5f15060750 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 3 Mar 2016 08:24:00 +0100
Subject: [PATCH 2109/2285] ltl2ba: fix build on darwin

---
 pkgs/applications/science/logic/ltl2ba/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/logic/ltl2ba/default.nix b/pkgs/applications/science/logic/ltl2ba/default.nix
index cdadd18ac9f5..f9bdd9a6b3b9 100644
--- a/pkgs/applications/science/logic/ltl2ba/default.nix
+++ b/pkgs/applications/science/logic/ltl2ba/default.nix
@@ -9,6 +9,11 @@ stdenv.mkDerivation rec {
     sha256 = "16z0gc7a9dkarwn0l6rvg5jdhw1q4qyn4501zlchy0zxqddz0sx6";
   };
 
+  preConfigure = ''
+    substituteInPlace Makefile \
+    --replace "CC=gcc" ""
+  '';
+
   installPhase = ''
     mkdir -p $out/bin
     mv ltl2ba $out/bin
@@ -18,7 +23,7 @@ stdenv.mkDerivation rec {
     description = "fast translation from LTL formulae to Buchi automata";
     homepage    = "http://www.lsv.ens-cachan.fr/~gastin/ltl2ba";
     license     = stdenv.lib.licenses.gpl2Plus;
-    platforms   = stdenv.lib.platforms.linux;
+    platforms   = stdenv.lib.platforms.darwin ++ stdenv.lib.platforms.linux;
     maintainers = [ stdenv.lib.maintainers.thoughtpolice ];
   };
 }

From 0bcf42aed390ca645738ff35a3e9f0e9669cdd6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?=
 <theophane.hufschmitt@polytechnique.org>
Date: Thu, 3 Mar 2016 11:38:42 +0100
Subject: [PATCH 2110/2285] mpv: added optional wayland support

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

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index 5bc2eee24145..a38ab6e9b3df 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -21,6 +21,7 @@
 , youtubeSupport ? true, youtube-dl ? null
 , cacaSupport ? true, libcaca ? null
 , vaapiSupport ? false, libva ? null
+, waylandSupport ? false, wayland ? null, libxkbcommon ? null
 }:
 
 assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null);
@@ -41,6 +42,7 @@ assert bs2bSupport -> libbs2b != null;
 assert libpngSupport -> libpng != null;
 assert youtubeSupport -> youtube-dl != null;
 assert cacaSupport -> libcaca != null;
+assert waylandSupport -> (wayland != null && libxkbcommon != null);
 
 let
   inherit (stdenv.lib) optional optionals optionalString;
@@ -77,7 +79,8 @@ stdenv.mkDerivation rec {
     "--enable-manpage-build"
     "--disable-build-date" # Purity
     "--enable-zsh-comp"
-  ] ++ optional vaapiSupport "--enable-vaapi";
+  ] ++ optional vaapiSupport "--enable-vaapi"
+  ++ optional waylandSupport "--enable-wayland";
 
   configurePhase = ''
     python ${waf} configure --prefix=$out $configureFlags
@@ -105,7 +108,8 @@ stdenv.mkDerivation rec {
     ++ optional youtubeSupport youtube-dl
     ++ optional sdl2Support SDL2
     ++ optional cacaSupport libcaca
-    ++ optional vaapiSupport libva;
+    ++ optional vaapiSupport libva
+    ++ optionals waylandSupport [ wayland libxkbcommon ];
 
   enableParallelBuilding = true;
 
@@ -139,6 +143,5 @@ stdenv.mkDerivation rec {
     '';
   };
 }
-# TODO: Wayland support
 # TODO: investigate caca support
 # TODO: investigate lua5_sockets bug

From aa564c9ed01268e7e0b030942592bc3beb642eef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 3 Mar 2016 12:09:50 +0100
Subject: [PATCH 2111/2285] make-bootstrap-tools: fix #13629: glibc problems

On x86_64-linux glibc started to use linker scripts more extensively.
---
 pkgs/stdenv/linux/make-bootstrap-tools.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix
index ef651f643684..3c8948699726 100644
--- a/pkgs/stdenv/linux/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix
@@ -51,7 +51,15 @@ rec {
         cp -d ${glibc}/lib/crt?.o $out/lib
 
         cp -rL ${glibc}/include $out
-        chmod -R u+w $out/include
+        chmod -R u+w "$out"
+
+        # glibc can contain linker scripts: find them, copy their deps,
+        # and get rid of absolute paths (nuke-refs would make them useless)
+        local lScripts=$(grep --files-with-matches --max-count=1 'GNU ld script' -R "$out/lib")
+        cp -d -t "$out/lib/" $(cat $lScripts | tr " " "\n" | grep -F '${glibc}' | sort -u)
+        for f in $lScripts; do
+          substituteInPlace "$f" --replace '${glibc}/lib/' ""
+        done
 
         # Hopefully we won't need these.
         rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video

From 50b950fe8dc60248144519b5b1888a762c8c7094 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Mar 2016 11:51:49 +0100
Subject: [PATCH 2112/2285] nix-generate-from-cpan: Don't quote names that
 don't need it

---
 maintainers/scripts/nix-generate-from-cpan.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/maintainers/scripts/nix-generate-from-cpan.pl b/maintainers/scripts/nix-generate-from-cpan.pl
index f1159c6d2907..a2edf165554c 100755
--- a/maintainers/scripts/nix-generate-from-cpan.pl
+++ b/maintainers/scripts/nix-generate-from-cpan.pl
@@ -431,7 +431,7 @@ my $build_fun = -e "$pkg_path/Build.PL"
 print STDERR "===\n";
 
 print <<EOF;
-  "$attr_name" = $build_fun rec {
+  ${\(is_reserved($attr_name) ? "\"$attr_name\"" : $attr_name)} = $build_fun rec {
     name = "$pkg_name";
     src = fetchurl {
       url = "mirror://cpan/${\$module->path}/\${name}.${\$module->package_extension}";
@@ -450,7 +450,7 @@ EOF
 print <<EOF if defined $homepage;
       homepage = $homepage;
 EOF
-print <<EOF if defined $description;
+print <<EOF if defined $description && $description ne "Unknown";
       description = "$description";
 EOF
 print <<EOF if defined $license;

From e2ad72342e7e612a5c9d6966a09ca13b21448c5b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Mar 2016 12:25:37 +0100
Subject: [PATCH 2113/2285] nix-generate-from-cpan: Skip "if" package since
 it's part of Perl now

---
 maintainers/scripts/nix-generate-from-cpan.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/scripts/nix-generate-from-cpan.pl b/maintainers/scripts/nix-generate-from-cpan.pl
index a2edf165554c..73e13bfe09a6 100755
--- a/maintainers/scripts/nix-generate-from-cpan.pl
+++ b/maintainers/scripts/nix-generate-from-cpan.pl
@@ -279,7 +279,7 @@ sub get_deps {
         next if $n eq "perl";
 
         # Hacky way to figure out if this module is part of Perl.
-        if ( $n !~ /^JSON/ && $n !~ /^YAML/ && $n !~ /^Module::Pluggable/ ) {
+        if ( $n !~ /^JSON/ && $n !~ /^YAML/ && $n !~ /^Module::Pluggable/  && $n !~ /^if$/ ) {
             eval "use $n;";
             if ( !$@ ) {
                 DEBUG("skipping Perl-builtin module $n");

From 6af59c9d068d8820ad05b3e02d6ac0f36e630aba Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 2 Mar 2016 08:49:20 -0600
Subject: [PATCH 2114/2285] kde5.plasma.plasma-workspace: 5.5.5.1 -> 5.5.5.2

---
 pkgs/desktops/kde-5/plasma-5.5/srcs.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.5/srcs.nix b/pkgs/desktops/kde-5/plasma-5.5/srcs.nix
index 40fe5618ff8c..f27b39033e2a 100644
--- a/pkgs/desktops/kde-5/plasma-5.5/srcs.nix
+++ b/pkgs/desktops/kde-5/plasma-5.5/srcs.nix
@@ -251,11 +251,11 @@
     };
   };
   plasma-workspace = {
-    version = "5.5.5.1";
+    version = "5.5.5.2";
     src = fetchurl {
-      url = "${mirror}/stable/plasma/5.5.5/plasma-workspace-5.5.5.1.tar.xz";
-      sha256 = "1grhw60rd5dl07fl0dr96fq6c6d7076k5m2hjg6w6w9ynb76sg6h";
-      name = "plasma-workspace-5.5.5.1.tar.xz";
+      url = "${mirror}/stable/plasma/5.5.5/plasma-workspace-5.5.5.2.tar.xz";
+      sha256 = "09kvzv2cjlv0bglik7723m373nvhvh3c4aaip2xkv5lbhxfydldy";
+      name = "plasma-workspace-5.5.5.2.tar.xz";
     };
   };
   plasma-workspace-wallpapers = {

From 7f7c2171c0b0251a1c16aea04074833d6702ff52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Thu, 3 Mar 2016 14:04:36 +0100
Subject: [PATCH 2115/2285] Update ghdl mcode to 0.33.

(cherry picked from commit e9d6aadc51ecdd274cd383a99ea840a94b58d954)
---
 pkgs/development/compilers/ghdl/default.nix | 46 ++++-----------------
 1 file changed, 8 insertions(+), 38 deletions(-)

diff --git a/pkgs/development/compilers/ghdl/default.nix b/pkgs/development/compilers/ghdl/default.nix
index 7b2e03f8d573..3e84ce1d0ae0 100644
--- a/pkgs/development/compilers/ghdl/default.nix
+++ b/pkgs/development/compilers/ghdl/default.nix
@@ -1,58 +1,28 @@
 { stdenv, fetchurl, gnat, zlib }:
 
+# I think that mcode can only generate x86 code,
+# so it fails to link pieces on x86_64.
 assert stdenv.system == "i686-linux";
 
 let
-  version = "0.31";
+  version = "0.33";
 in
 stdenv.mkDerivation rec {
   name = "ghdl-mcode-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/ghdl/ghdl-${version}.tar.gz";
-    sha256 = "1v0l9h6906b0bvnwfi2qg5nz9vjg80isc5qgjxr1yqxpkfm2xcf0";
+    url = "https://github.com/tgingold/ghdl/archive/v${version}.tar.gz";
+    sha256 = "09yvgqyglbakd74v2dgr470clzm744i232nixyffcds55vkij5da";
   };
 
   buildInputs = [ gnat zlib ];
 
-  # Tarbomb
-  preUnpack = ''
-    mkdir ghdl
-    cd ghdl
-  '';
-
-  sourceRoot = "translate/ghdldrv";
-
   patchPhase = ''
-    sed -i 's,$$curdir/lib,'$out'/share/ghdl_mcode/translate/lib,' Makefile
+    # Disable warnings-as-errors, because there are warnings (unused things)
+    sed -i s/-gnatwae/-gnatwa/ Makefile.in ghdl.gpr.in
   '';
 
-  postBuild = ''
-    # Build the LIB
-    ln -s ghdl_mcode ghdl
-    make install.mcode
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp ghdl_mcode $out/bin
-
-    mkdir -p $out/share/ghdl_mcode/translate
-    cp -R ../lib $out/share/ghdl_mcode/translate
-    cp -R ../../libraries $out/share/ghdl_mcode
-
-    mkdir -p $out/share/man/man1
-    cp ../../doc/ghdl.1 $out/share/man/man1/ghdl_mcode.1
-
-    # Ghdl has some timestamps checks, storing file timestamps in '.cf' files.
-    # As we will change the timestamps to 1970-01-01 00:00:01, we also set the
-    # content of that .cf to that value. This way ghdl does not complain on
-    # the installed object files from the basic libraries (ieee, ...)
-    pushd $out
-    find . -name "*.cf" -exec \
-        sed 's/[0-9]*\.000" /19700101000001.000" /g' -i {} \;
-    popd
-  '';
+  enableParallelBuilding = true;
 
   meta = {
     homepage = "http://sourceforge.net/p/ghdl-updates/wiki/Home/";

From 17389e256fa1651d8577555ac8fe7aa23044f0e6 Mon Sep 17 00:00:00 2001
From: Tristan Helmich <tristan.helmich@gmail.com>
Date: Fri, 26 Feb 2016 15:19:46 +0100
Subject: [PATCH 2116/2285] nntp-proxy service: init

---
 nixos/modules/misc/ids.nix                    |   1 +
 nixos/modules/module-list.nix                 |   1 +
 .../services/networking/nntp-proxy.nix        | 234 ++++++++++++++++++
 3 files changed, 236 insertions(+)
 create mode 100644 nixos/modules/services/networking/nntp-proxy.nix

diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 6ae37f273df0..0ab2b8a76fc5 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -253,6 +253,7 @@
       pdnsd = 229;
       octoprint = 230;
       avahi-autoipd = 231;
+      nntp-proxy = 232;
 
       # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399!
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 88e01069b264..1610bf6c0d81 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -338,6 +338,7 @@
   ./services/networking/networkmanager.nix
   ./services/networking/ngircd.nix
   ./services/networking/nix-serve.nix
+  ./services/networking/nntp-proxy.nix
   ./services/networking/nsd.nix
   ./services/networking/ntopng.nix
   ./services/networking/ntpd.nix
diff --git a/nixos/modules/services/networking/nntp-proxy.nix b/nixos/modules/services/networking/nntp-proxy.nix
new file mode 100644
index 000000000000..cd0889351a3d
--- /dev/null
+++ b/nixos/modules/services/networking/nntp-proxy.nix
@@ -0,0 +1,234 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+
+  inherit (pkgs) nntp-proxy;
+
+  proxyUser = "nntp-proxy";
+
+  cfg = config.services.nntp-proxy;
+
+  configBool = b: if b then "TRUE" else "FALSE";
+
+  confFile = pkgs.writeText "nntp-proxy.conf" ''
+    nntp_server:
+    {
+      # NNTP Server host and port address
+      server = "${cfg.upstreamServer}";
+      port = ${toString cfg.upstreamPort};
+      # NNTP username
+      username = "${cfg.upstreamUser}";
+      # NNTP password in clear text
+      password = "${cfg.upstreamPassword}";
+      # Maximum number of connections allowed by the NNTP
+      max_connections = ${toString cfg.upstreamMaxConnections};
+    };
+
+    proxy:
+    {
+      # Local address and port to bind to
+      bind_ip = "${cfg.listenAddress}";
+      bind_port = ${toString cfg.port};
+
+      # SSL key and cert file
+      ssl_key = "${cfg.sslKey}";
+      ssl_cert = "${cfg.sslCert}";
+
+      # prohibit users from posting
+      prohibit_posting = ${configBool cfg.prohibitPosting};
+      # Verbose levels: ERROR, WARNING, NOTICE, INFO, DEBUG
+      verbose = "${toUpper cfg.verbosity}";
+      # Password is made with: 'mkpasswd -m sha-512 <password>'
+      users = (${concatStringsSep ",\n" (mapAttrsToList (username: userConfig:
+        ''
+          {
+              username = "${username}";
+              password = "${userConfig.passwordHash}";
+              max_connections = ${toString userConfig.maxConnections};
+          }
+        '') cfg.users)});
+    };
+  '';
+
+in
+
+{
+
+  ###### interface
+
+  options = {
+
+    services.nntp-proxy = {
+      enable = mkEnableOption "NNTP-Proxy";
+
+      upstreamServer = mkOption {
+        type = types.str;
+        default = "";
+        example = "ssl-eu.astraweb.com";
+        description = ''
+          Upstream server address
+        '';
+      };
+
+      upstreamPort = mkOption {
+        type = types.int;
+        default = 563;
+        description = ''
+          Upstream server port
+        '';
+      };
+
+      upstreamMaxConnections = mkOption {
+        type = types.int;
+        default = 20;
+        description = ''
+          Upstream server maximum allowed concurrent connections
+        '';
+      };
+
+      upstreamUser = mkOption {
+        type = types.str;
+        default = "";
+        description = ''
+          Upstream server username
+        '';
+      };
+
+      upstreamPassword = mkOption {
+        type = types.str;
+        default = "";
+        description = ''
+          Upstream server password
+        '';
+      };
+
+      listenAddress = mkOption {
+        type = types.str;
+        default = "127.0.0.1";
+        example = "[::]";
+        description = ''
+          Proxy listen address (IPv6 literal addresses need to be enclosed in "[" and "]" characters)
+        '';
+      };
+
+      port = mkOption {
+        type = types.int;
+        default = 5555;
+        description = ''
+          Proxy listen port
+        '';
+      };
+
+      sslKey = mkOption {
+        type = types.str;
+        default = "key.pem";
+        example = "/path/to/your/key.file";
+        description = ''
+          Proxy ssl key path
+        '';
+      };
+
+      sslCert = mkOption {
+        type = types.str;
+        default = "cert.pem";
+        example = "/path/to/your/cert.file";
+        description = ''
+          Proxy ssl certificate path
+        '';
+      };
+
+      prohibitPosting = mkOption {
+        type = types.bool;
+        default = true;
+        description = ''
+          Whether to prohibit posting to the upstream server
+        '';
+      };
+
+      verbosity = mkOption {
+        type = types.str;
+        default = "info";
+        example = "error";
+        description = ''
+          Verbosity level (error, warning, notice, info, debug)
+        '';
+      };
+
+      users = mkOption {
+        type = types.attrsOf (types.submodule {
+          options = {
+            username = mkOption {
+              type = types.str;
+              default = null;
+              description = ''
+                Username
+              '';
+            };
+
+            passwordHash = mkOption {
+              type = types.str;
+              default = null;
+              example = "$6$GtzE7FrpE$wwuVgFYU.TZH4Rz.Snjxk9XGua89IeVwPQ/fEUD8eujr40q5Y021yhn0aNcsQ2Ifw.BLclyzvzgegopgKcneL0";
+              description = ''
+                SHA-512 password hash (can be generated by 'mkpasswd -m sha-512 <password>')
+              '';
+            };
+
+            maxConnections = mkOption {
+              type = types.int;
+              default = 1;
+              description = ''
+                Maximum number of concurrent connections to the proxy for this user
+              '';
+            };
+          };
+        });
+        description = ''
+          NNTP-Proxy user configuration
+        '';
+
+        default = {};
+        example = literalExample ''
+          "user1" = {
+            passwordHash = "$6$1l0t5Kn2Dk$appzivc./9l/kjq57eg5UCsBKlcfyCr0zNWYNerKoPsI1d7eAwiT0SVsOVx/CTgaBNT/u4fi2vN.iGlPfv1ek0";
+            maxConnections = 5;
+          };
+          "anotheruser" = {
+            passwordHash = "$6$6lwEsWB.TmsS$W7m1riUx4QrA8pKJz8hvff0dnF1NwtZXgdjmGqA1Dx2MDPj07tI9GNcb0SWlMglE.2/hBgynDdAd/XqqtRqVQ0";
+            maxConnections = 7;
+          };
+        '';
+      };
+    };
+
+  };
+
+  ###### implementation
+
+  config = mkIf cfg.enable {
+
+    users.extraUsers = singleton
+      { name = proxyUser;
+        uid = config.ids.uids.nntp-proxy;
+        description = "NNTP-Proxy daemon user";
+      };
+
+    systemd.services.nntp-proxy = {
+      description = "NNTP proxy";
+      after = [ "network.target" "nss-lookup.target" ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = { User="${proxyUser}"; };
+      serviceConfig.ExecStart = "${nntp-proxy}/bin/nntp-proxy ${confFile}";
+      preStart = ''
+        if [ ! \( -f ${cfg.sslCert} -a -f ${cfg.sslKey} \) ]; then
+          ${pkgs.openssl}/bin/openssl req -subj '/CN=AutoGeneratedCert/O=NixOS Service/C=US' \
+          -new -newkey rsa:2048 -days 365 -nodes -x509 -keyout ${cfg.sslKey} -out ${cfg.sslCert};
+        fi
+      '';
+    };
+
+  };
+
+}

From bf18a34f9738b61e380f4071e41f59825b8f7028 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Thu, 3 Mar 2016 14:45:11 +0100
Subject: [PATCH 2117/2285] musl: pass the correct syslibdir

This fixes dynamic linking (the specfile contains the correct path, and
the dynamic loader is symlinked in place)
Fixes #8543
---
 pkgs/os-specific/linux/musl/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/os-specific/linux/musl/default.nix b/pkgs/os-specific/linux/musl/default.nix
index abe96e9b9ae6..a8055df92fde 100644
--- a/pkgs/os-specific/linux/musl/default.nix
+++ b/pkgs/os-specific/linux/musl/default.nix
@@ -11,6 +11,10 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  preConfigure = ''
+    configureFlagsArray+=("--syslibdir=$out/lib")
+  '';
+
   configureFlags = [
     "--enable-shared"
     "--enable-static"

From ee7eb78c52668a9d6dffe16c408dd978c29cb24a Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Thu, 3 Mar 2016 14:49:18 +0100
Subject: [PATCH 2118/2285] atomicwrites: 0.1.0 -> 0.1.9

---
 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 25ba60f69bf5..7287863c769b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -950,12 +950,12 @@ in modules // {
   };
 
   atomicwrites = buildPythonPackage rec {
-    version = "0.1.0";
+    version = "0.1.9";
     name = "atomicwrites-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/a/atomicwrites/atomicwrites-${version}.tar.gz";
-      sha256 = "1lxz0xhnzihqlvl1h6j2nfxjqqgr4s08196z5phnlcz2s7d5z0mg";
+      sha256 = "08s05h211r07vs66r4din3swrbzb344vli041fihpg34q3lcxpvw";
     };
 
     meta = {

From 819dab02035c5588a96318c4e934519bdc9b2198 Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Tue, 1 Mar 2016 21:04:27 +0100
Subject: [PATCH 2119/2285] git-remote-hg: fix the derivation name

-v0.2 isn't parsed as a version by Nix, and makes it inconvenient to
install git-remote-hg through nix-env.
---
 .../version-management/git-and-tools/git-remote-hg/default.nix  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
index 588c7acff7c8..512a8938a587 100644
--- a/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git-remote-hg/default.nix
@@ -4,7 +4,7 @@
 
 stdenv.mkDerivation rec {
   rev = "e716a9e1a9e460a45663694ba4e9e8894a8452b2";
-  version = "v0.2-e716a9e1a9e460a45663694ba4e9e8894a8452b2";
+  version = "0.2-${rev}";
   name = "git-remote-hg-${version}";
 
   src = fetchgit {

From edfb2e7ccb1c45f32dd87ff649ade79dba0b2d1c Mon Sep 17 00:00:00 2001
From: artuuge <artuuge@gmail.com>
Date: Thu, 3 Mar 2016 14:59:40 +0100
Subject: [PATCH 2120/2285] update epson-escpr meta

---
 lib/maintainers.nix                       | 1 +
 pkgs/misc/drivers/epson-escpr/default.nix | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index f4cbd25da809..5de6a21572c7 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -33,6 +33,7 @@
   ardumont = "Antoine R. Dumont <eniotna.t@gmail.com>";
   aristid = "Aristid Breitkreuz <aristidb@gmail.com>";
   arobyn = "Alexei Robyn <shados@shados.net>";
+  artuuge = "Artur E. Ruuge <artuuge@gmail.com>";
   asppsa = "Alastair Pharo <asppsa@gmail.com>";
   astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>";
   aszlig = "aszlig <aszlig@redmoonstudios.org>";
diff --git a/pkgs/misc/drivers/epson-escpr/default.nix b/pkgs/misc/drivers/epson-escpr/default.nix
index 305f0d78a0bb..faf13d4bcc32 100644
--- a/pkgs/misc/drivers/epson-escpr/default.nix
+++ b/pkgs/misc/drivers/epson-escpr/default.nix
@@ -16,7 +16,7 @@ in
 
     buildInputs = [ cups ];
 
-    meta = {
+    meta = with stdenv.lib; {
       homepage = https://github.com/artuuge/NixOS-files/;
       description = "ESC/P-R Driver (generic driver)";
       longDescription = ''
@@ -30,7 +30,9 @@ in
 	    drivers = [ pkgs.epson-escpr ];
 	  };
       '';
-      license = stdenv.lib.licenses.gpl3Plus;
+      license = licenses.gpl3Plus;
+      maintainers = with maintainers; [ artuuge ];
+      platforms = platforms.linux;
     };
 
   }

From a0b1b032b6345bdf7d738a4add8bfcb83a4f1103 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Thu, 3 Mar 2016 15:17:37 +0100
Subject: [PATCH 2121/2285] khal: force Python3

Both the README and setup.py agree that khal is only compatible with
Python 3.
---
 pkgs/applications/misc/khal/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/khal/default.nix b/pkgs/applications/misc/khal/default.nix
index 52a4f0dee753..ab55e3618ec7 100644
--- a/pkgs/applications/misc/khal/default.nix
+++ b/pkgs/applications/misc/khal/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgs, pythonPackages }:
+{ stdenv, fetchurl, pkgs, python3Packages }:
 
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   version = "0.7.0";
   name = "khal-${version}";
 
@@ -9,7 +9,7 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "00llxj7cv31mjsx0j6zxmyi9s1q20yvfkn025xcy8cv1ylfwic66";
   };
 
-  propagatedBuildInputs = with pythonPackages; [
+  propagatedBuildInputs = with python3Packages; [
     atomicwrites
     click
     configobj
@@ -22,7 +22,6 @@ pythonPackages.buildPythonApplication rec {
     requests_toolbelt
     tzlocal
     urwid
-    python.modules.sqlite3
     pkginfo
   ];
 

From 6cf907ba092f182f98bcd0b2c431beb03df3f940 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Thu, 3 Mar 2016 09:01:02 -0300
Subject: [PATCH 2122/2285] xsettingsd: 0.0.1 -> git-2015-06-14

---
 pkgs/tools/X11/xsettingsd/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/X11/xsettingsd/default.nix b/pkgs/tools/X11/xsettingsd/default.nix
index 254cc8a4961f..c05aeff9337c 100644
--- a/pkgs/tools/X11/xsettingsd/default.nix
+++ b/pkgs/tools/X11/xsettingsd/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   name = "xsettingsd-${version}";
-  version = "0.0.1";
+  version = "git-2015-06-14";
 
   src = fetchFromGitHub {
     owner = "derat";
     repo = "xsettingsd";
-    rev = "2a516a91d8352b3b93a7a1ef5606dbd21fa06b7c";
-    sha256 = "0f9lc5w18x6xs9kf72jpixprp3xb7wqag23cy8zrm33n2bza9dj0";
+    rev = "b4999f5e9e99224caf97d09f25ee731774ecd7be";
+    sha256 = "18cp6a66ji483lrvf0vq855idwmcxd0s67ijpydgjlsr70c65j7s";
   };
 
   patches = [
@@ -32,6 +32,7 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Provides settings to X11 applications via the XSETTINGS specification";
     homepage = https://github.com/derat/xsettingsd;
+    license = licenses.bsd2;
     platforms = platforms.linux;
   };
 }

From 740307a213070fccb6f624cde37ee986af0559a5 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Thu, 3 Mar 2016 16:00:04 +0100
Subject: [PATCH 2123/2285] vdirsyncer: use Python3 by default

Even if Python2 is still supported, the maintainer says that some
features won't work and the support will soon be discarded.
---
 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 0f756a175ac9..683434a189bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13790,7 +13790,7 @@ let
 
   vcprompt = callPackage ../applications/version-management/vcprompt { };
 
-  vdirsyncer = callPackage ../tools/misc/vdirsyncer { };
+  vdirsyncer = callPackage ../tools/misc/vdirsyncer { pythonPackages = python3Packages; };
 
   vdpauinfo = callPackage ../tools/X11/vdpauinfo { };
 

From de24ea40f8759d1463202bd5cd70f9b54235e161 Mon Sep 17 00:00:00 2001
From: Gabriel Ebner <gebner@gebner.org>
Date: Thu, 3 Mar 2016 16:09:00 +0100
Subject: [PATCH 2124/2285] sbt: 0.13.9 -> 0.13.11

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

diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix
index 585e9ff101a4..206792ab4833 100644
--- a/pkgs/development/tools/build-managers/sbt/default.nix
+++ b/pkgs/development/tools/build-managers/sbt/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "sbt-${version}";
-  version = "0.13.9";
+  version = "0.13.11";
 
   src = fetchurl {
     url = "https://dl.bintray.com/sbt/native-packages/sbt/${version}/${name}.tgz";
-    sha256 = "148f2801f2993773de6f8859fe0e6520fcabe649d66bb316e13aff8b2fd7f504";
+    sha256 = "19mg2xbc2vbqg33b986zvn7pj05cx106rccdzf9zs2npdnznysm3";
   };
 
   patchPhase = ''

From c8698919da508698d8785238d7590e1cbea16566 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Thu, 3 Mar 2016 16:29:51 +0100
Subject: [PATCH 2125/2285] khard: remove dependency to vdirsyncer

khard and vdirsyncer can be used together, but there are no real
dependency between them.
---
 pkgs/applications/misc/khard/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index a10d434a70d3..2cb235105588 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -18,10 +18,6 @@ pythonPackages.buildPythonApplication rec {
     pyyaml
   ];
 
-  buildInputs = with pythonPackages; [
-    pkgs.vdirsyncer
-  ];
-
   meta = {
     homepage = https://github.com/scheibler/khard;
     description = "Console carddav client";

From 8a804dfbacc3212968e186776b7949c90d3e8d02 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Thu, 3 Mar 2016 16:37:23 +0100
Subject: [PATCH 2126/2285] khard: force Python2

setup.py says that khard is only compatible with
Python 2.
---
 pkgs/applications/misc/khard/default.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/misc/khard/default.nix b/pkgs/applications/misc/khard/default.nix
index a10d434a70d3..679dc10291a7 100644
--- a/pkgs/applications/misc/khard/default.nix
+++ b/pkgs/applications/misc/khard/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, fetchurl, pkgs, pythonPackages }:
+{ stdenv, fetchurl, pkgs, python2Packages }:
 
-pythonPackages.buildPythonApplication rec {
+python2Packages.buildPythonApplication rec {
   version = "0.8.1";
   name = "khard-${version}";
   namePrefix = "";
@@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "13axfrs96isirx0c483545xdmjwwfq1k7yy92xpk7l184v71rgi1";
   };
 
-  propagatedBuildInputs = with pythonPackages; [
+  propagatedBuildInputs = with python2Packages; [
     atomicwrites
     configobj
     vobject
@@ -18,10 +18,6 @@ pythonPackages.buildPythonApplication rec {
     pyyaml
   ];
 
-  buildInputs = with pythonPackages; [
-    pkgs.vdirsyncer
-  ];
-
   meta = {
     homepage = https://github.com/scheibler/khard;
     description = "Console carddav client";

From 73ba0ae2de11a2aa610649949c8f0de444c67763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Thu, 3 Mar 2016 16:15:25 +0000
Subject: [PATCH 2127/2285] Remove which -> type -P alias.

Aliases are not the same as programs. They won't work in subshells.
It's better to just use which as it's only 88K.
---
 nixos/modules/profiles/base.nix      | 1 +
 nixos/modules/programs/bash/bash.nix | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/profiles/base.nix b/nixos/modules/profiles/base.nix
index b8057cadce25..09183ee18092 100644
--- a/nixos/modules/profiles/base.nix
+++ b/nixos/modules/profiles/base.nix
@@ -17,6 +17,7 @@
     pkgs.ddrescue
     pkgs.ccrypt
     pkgs.cryptsetup # needed for dm-crypt volumes
+    pkgs.which # 88K size
 
     # Some networking tools.
     pkgs.fuse
diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix
index 1c3c07a1c210..e4e264ec0036 100644
--- a/nixos/modules/programs/bash/bash.nix
+++ b/nixos/modules/programs/bash/bash.nix
@@ -56,7 +56,7 @@ in
       */
 
       shellAliases = mkOption {
-        default = config.environment.shellAliases // { which = "type -P"; };
+        default = config.environment.shellAliases;
         description = ''
           Set of aliases for bash shell. See <option>environment.shellAliases</option>
           for an option format description.

From 85abde52d05517c8e168050304efe3b2c7c61bd7 Mon Sep 17 00:00:00 2001
From: rnhmjoj <micheleguerinirocco@me.com>
Date: Thu, 3 Mar 2016 17:37:33 +0100
Subject: [PATCH 2128/2285] rewritefs: init at 2016-02-08

---
 pkgs/os-specific/linux/rewritefs/default.nix | 26 ++++++++++++++++++++
 pkgs/top-level/all-packages.nix              |  2 ++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/os-specific/linux/rewritefs/default.nix

diff --git a/pkgs/os-specific/linux/rewritefs/default.nix b/pkgs/os-specific/linux/rewritefs/default.nix
new file mode 100644
index 000000000000..e0f39a558a08
--- /dev/null
+++ b/pkgs/os-specific/linux/rewritefs/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchFromGitHub, pkgconfig, fuse, pcre }: 
+
+stdenv.mkDerivation rec {
+  name = "rewritefs-${version}";
+  version = "2016-02-08";
+
+  src = fetchFromGitHub {
+    owner = "sloonz";
+    repo = "rewritefs";
+    rev = "3ac0d1789bb9d48dbeddc6721d00eef19d1dc956";
+    sha256 = "0bj8mq5hd52afmy01dyhqsx2rby7injhg96x9z3gyv0r90wa59bh";
+  };
+ 
+  buildInputs = [ pkgconfig fuse pcre ];
+
+  preConfigure = "substituteInPlace Makefile --replace /usr/local $out";
+
+  meta = with stdenv.lib; {
+    description = ''A FUSE filesystem intended to be used
+      like Apache mod_rewrite'';
+    homepage    = "https://github.com/sloonz/rewritefs";
+    license     = licenses.gpl2;
+    maintainers = with maintainers; [ rnhmjoj ];
+    platforms   = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9d45632c4e66..c32a1cb771a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3090,6 +3090,8 @@ let
 
   rescuetime = callPackage ../applications/misc/rescuetime { };
 
+  rewritefs = callPackage ../os-specific/linux/rewritefs { };
+
   rdiff-backup = callPackage ../tools/backup/rdiff-backup { };
 
   rdfind = callPackage ../tools/filesystems/rdfind { };

From 7fa0df283a76930c751f0f2527e7771db726d33e Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Mon, 29 Feb 2016 18:51:31 +0100
Subject: [PATCH 2129/2285] goreman: init at v0.0.8-rc0

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 3d4cb5ac1a8e..13bb31af71d7 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -3774,4 +3774,22 @@ let
     preBuild = ''go generate ./...'';
   };
 
+  godotenv = buildFromGitHub rec {
+    rev    = "4ed13390c0acd2ff4e371e64d8b97c8954138243";
+    date   = "2015-09-07";
+    owner  = "joho";
+    repo   = "godotenv";
+    sha256 = "1wzgws4dnlavi14aw3jzdl3mdr348skgqaq8xx4j8l68irfqyh0p";
+    buildInputs = [ go-colortext yaml-v2 ];
+  };
+
+  goreman = buildFromGitHub rec {
+    version = "0.0.8-rc0";
+    rev    = "d3e62509ccf23e47a390447886c51b1d89d0934b";
+    date   = "2016-01-30";
+    owner  = "mattn";
+    repo   = "goreman";
+    sha256 = "153hf4dq4jh1yv35pv30idmxhc917qzl590qy5394l48d4rapgb5";
+    buildInputs = [ go-colortext yaml-v2 godotenv ];
+  };
 }; in self

From bcdd81d9e14d960cf2fc910b622e236728a7fc07 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Thu, 3 Mar 2016 12:01:01 -0500
Subject: [PATCH 2130/2285] networkmanager: Enable ipv6 privacy extensions by
 default

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

diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix
index eb2b9d692f8d..9912ad9ae3fc 100644
--- a/nixos/modules/services/networking/networkmanager.nix
+++ b/nixos/modules/services/networking/networkmanager.nix
@@ -21,6 +21,9 @@ let
 
     [logging]
     level=WARN
+
+    [connection]
+    ipv6.ip6-privacy=2
   '';
 
   /*

From 8b5b57fb960333f0b10d2e8ac78b989756c2162f Mon Sep 17 00:00:00 2001
From: Marc Scholten <marc@pedigital.de>
Date: Thu, 3 Mar 2016 11:39:54 +0100
Subject: [PATCH 2131/2285] undmg: init at 1.0.2

---
 pkgs/tools/archivers/undmg/default.nix   | 27 ++++++++++++++++++++++++
 pkgs/tools/archivers/undmg/setup-hook.sh |  5 +++++
 pkgs/top-level/all-packages.nix          |  2 ++
 3 files changed, 34 insertions(+)
 create mode 100644 pkgs/tools/archivers/undmg/default.nix
 create mode 100644 pkgs/tools/archivers/undmg/setup-hook.sh

diff --git a/pkgs/tools/archivers/undmg/default.nix b/pkgs/tools/archivers/undmg/default.nix
new file mode 100644
index 000000000000..5cb7bf2c62fc
--- /dev/null
+++ b/pkgs/tools/archivers/undmg/default.nix
@@ -0,0 +1,27 @@
+{ stdenv, fetchFromGitHub, zlib, bzip2 }:
+
+stdenv.mkDerivation rec {
+  version = "1.0.2";
+  name = "undmg-${version}";
+
+  src = fetchFromGitHub {
+    owner = "matthewbauer";
+    repo = "undmg";
+    rev = "refs/tags/v${version}";
+    sha256 = "0w9vwvj9zbpsjkg251bwv9y10wjyjmh54q2piklz74w64rlbqblr";
+    name = "undmg-${version}";
+  };
+
+  buildInputs = [ zlib bzip2 ];
+
+  setupHook = ./setup-hook.sh;
+
+  installFlags = "PREFIX=\${out}";
+
+  meta = {
+    homepage = https://github.com/matthewbauer/undmg;
+    description = "Extract a DMG file";
+    license = stdenv.lib.licenses.gpl3;
+    platforms = stdenv.lib.platforms.all;
+  };
+}
diff --git a/pkgs/tools/archivers/undmg/setup-hook.sh b/pkgs/tools/archivers/undmg/setup-hook.sh
new file mode 100644
index 000000000000..e5c8dda23b6a
--- /dev/null
+++ b/pkgs/tools/archivers/undmg/setup-hook.sh
@@ -0,0 +1,5 @@
+unpackCmdHooks+=(_tryUnpackDmg)
+_tryUnpackDmg() {
+    if ! [[ "$curSrc" =~ \.dmg$ ]]; then return 1; fi
+    undmg < "$curSrc"
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 59da78dacf24..5746562b759e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3728,6 +3728,8 @@ let
 
   unzipNLS = lowPrio (unzip.override { enableNLS = true; });
 
+  undmg = callPackage ../tools/archivers/undmg { };
+
   uptimed = callPackage ../tools/system/uptimed { };
 
   urjtag = callPackage ../tools/misc/urjtag {

From 6bd0c3fe9de1572f06ae0b44b6f0c96318246bd1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Thu, 3 Mar 2016 19:40:54 +0100
Subject: [PATCH 2132/2285] ifplugd: Remove

This package hasn't been updated in 11 years, and isn't really useful
anymore in a modern Linux system.
---
 nixos/modules/module-list.nix                 |  1 -
 nixos/modules/services/networking/ifplugd.nix | 82 -------------------
 pkgs/os-specific/linux/ifplugd/default.nix    | 16 ----
 pkgs/top-level/all-packages.nix               |  2 -
 pkgs/top-level/release-small.nix              |  1 -
 5 files changed, 102 deletions(-)
 delete mode 100644 nixos/modules/services/networking/ifplugd.nix
 delete mode 100644 pkgs/os-specific/linux/ifplugd/default.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 4e3acd2c31d8..5d487776be24 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -322,7 +322,6 @@
   ./services/networking/hostapd.nix
   ./services/networking/i2pd.nix
   ./services/networking/i2p.nix
-  ./services/networking/ifplugd.nix
   ./services/networking/iodined.nix
   ./services/networking/ircd-hybrid/default.nix
   ./services/networking/kippo.nix
diff --git a/nixos/modules/services/networking/ifplugd.nix b/nixos/modules/services/networking/ifplugd.nix
deleted file mode 100644
index 00b94fe2284e..000000000000
--- a/nixos/modules/services/networking/ifplugd.nix
+++ /dev/null
@@ -1,82 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-with lib;
-
-let
-
-  inherit (pkgs) ifplugd;
-
-  cfg = config.networking.interfaceMonitor;
-
-  # The ifplugd action script, which is called whenever the link
-  # status changes (i.e., a cable is plugged in or unplugged).
-  plugScript = pkgs.writeScript "ifplugd.action"
-    ''
-      #! ${pkgs.stdenv.shell}
-      iface="$1"
-      status="$2"
-      ${cfg.commands}
-    '';
-
-in
-
-{
-
-  ###### interface
-
-  options = {
-
-    networking.interfaceMonitor.enable = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        If <literal>true</literal>, monitor Ethernet interfaces for
-        cables being plugged in or unplugged.  When this occurs, the
-        commands specified in
-        <option>networking.interfaceMonitor.commands</option> are
-        executed.
-      '';
-    };
-
-    networking.interfaceMonitor.beep = mkOption {
-      type = types.bool;
-      default = false;
-      description = ''
-        If <literal>true</literal>, beep when an Ethernet cable is
-        plugged in or unplugged.
-      '';
-    };
-
-    networking.interfaceMonitor.commands = mkOption {
-      type = types.lines;
-      default = "";
-      description = ''
-        Shell commands to be executed when the link status of an
-        interface changes.  On invocation, the shell variable
-        <varname>iface</varname> contains the name of the interface,
-        while the variable <varname>status</varname> contains either
-        <literal>up</literal> or <literal>down</literal> to indicate
-        the new status.
-      '';
-    };
-
-  };
-
-
-  ###### implementation
-
-  config = mkIf cfg.enable {
-    systemd.services.ifplugd = {
-      description = "Network interface connectivity monitor";
-      after = [ "network-interfaces.target" ];
-      wantedBy = [ "multi-user.target" ];
-      script = ''
-        ${ifplugd}/sbin/ifplugd --no-daemon --no-startup --no-shutdown \
-          ${if config.networking.interfaceMonitor.beep then "" else "--no-beep"} \
-          --run ${plugScript}
-      '';
-    };
-
-    environment.systemPackages = [ ifplugd ];
-  };
-}
diff --git a/pkgs/os-specific/linux/ifplugd/default.nix b/pkgs/os-specific/linux/ifplugd/default.nix
deleted file mode 100644
index 2d9ff16c8ade..000000000000
--- a/pkgs/os-specific/linux/ifplugd/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{stdenv, fetchurl, pkgconfig, libdaemon}:
-
-stdenv.mkDerivation {
-  name = "ifplugd-0.28";
-  src = fetchurl {
-    url = http://0pointer.de/lennart/projects/ifplugd/ifplugd-0.28.tar.gz;
-    sha256 = "1w21cpyzkr7igp6vsf4a0jwp2b0axs3kwjiapy676bdk9an58is7";
-  };
-  buildInputs = [pkgconfig libdaemon];
-  configureFlags = "--with-initdir=$out/etc/init.d --disable-lynx";
-  patches = [
-    # From http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/sys-apps/ifplugd/files/ifplugd-0.28-interface.patch?rev=1.1.
-    ./interface.patch
-  ];
-  patchFlags = "-p0";
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c971f3157b94..cb592d252df8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10242,8 +10242,6 @@ let
 
   i7z = callPackage ../os-specific/linux/i7z { };
 
-  ifplugd = callPackage ../os-specific/linux/ifplugd { };
-
   ima-evm-utils = callPackage ../os-specific/linux/ima-evm-utils { };
 
   intel2200BGFirmware = callPackage ../os-specific/linux/firmware/intel2200BGFirmware { };
diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix
index 017865919739..fbfa4903b45a 100644
--- a/pkgs/top-level/release-small.nix
+++ b/pkgs/top-level/release-small.nix
@@ -71,7 +71,6 @@ with import ./release-lib.nix { inherit supportedSystems; };
   iana_etc = linux;
   icewm = linux;
   idutils = all;
-  ifplugd = linux;
   inetutils = linux;
   iputils = linux;
   jnettop = linux;

From 5f4417e0cfbec18a09791fbfe6a3cc7410fd7fda Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Thu, 3 Mar 2016 18:35:21 +0000
Subject: [PATCH 2133/2285] pythonPackages.acme_0_1: init at 0.1.0

`acme_0_1` is introduced because `simp_le` strictly depends on version 0.1.0
of the library (which is now at 0.4.0).
---
 pkgs/tools/admin/simp_le/default.nix |  2 +-
 pkgs/top-level/python-packages.nix   | 23 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/admin/simp_le/default.nix b/pkgs/tools/admin/simp_le/default.nix
index 77c45e0ad3fe..d27c0a2da816 100644
--- a/pkgs/tools/admin/simp_le/default.nix
+++ b/pkgs/tools/admin/simp_le/default.nix
@@ -10,7 +10,7 @@ pythonPackages.buildPythonApplication rec {
     sha256 = "0l4qs0y4cbih76zrpbkn77xj17iwsm5fi83zc3p048x4hj163805";
   };
 
-  propagatedBuildInputs = with pythonPackages; [ acme ];
+  propagatedBuildInputs = with pythonPackages; [ acme_0_1 ];
 
   meta = with stdenv.lib; {
     inherit (src.meta) homepage;
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 68deac847dbb..4221782b56b4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -263,6 +263,29 @@ in modules // {
     sourceRoot = "letsencrypt-v${version}-src/acme";
   };
 
+  # Maintained for simp_le compatibility
+  acme_0_1 = buildPythonPackage rec {
+    version = "0.1.0";
+
+    name = "acme-${version}";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "letsencrypt";
+      repo = "letsencrypt";
+      rev = "v${version}";
+      sha256 = "1f7406nnybsdbwxf7r9qjf6hzkfd7cg6qp8l9l7hrzwscsq5hicj";
+    };
+
+    propagatedBuildInputs = with self; [
+      cryptography pyasn1 pyopenssl pyRFC3339 pytz requests2 six werkzeug mock
+      ndg-httpsclient
+    ];
+
+    buildInputs = with self; [ nose ];
+
+    sourceRoot = "letsencrypt-v${version}-src/acme";
+  };
+
   acme-tiny = buildPythonPackage rec {
     name = "acme-tiny-${version}";
     version = "20151229";

From 417457f6f9aebc1827cf1874c040e168a159fa7e Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Thu, 3 Mar 2016 19:40:34 +0100
Subject: [PATCH 2134/2285] libreoffice: disable kdeIntegration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fixes #13651

@edolstra:
“IIRC, the "KDE integration" consists mainly in providing a Qt/KDE "File
open" dialog, which we can probably live without. In fact, it has been
known to malfunction if Libreoffice's KDE version is different from the
system KDE version.

So disabling this sounds like a good idea.”
---
 pkgs/applications/office/libreoffice/default.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 1a5cf987fd8c..040b48930324 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -15,10 +15,12 @@
 , defaultIconTheme, glib
 , langs ? [ "en-US" "en-GB" "ca" "ru" "eo" "fr" "nl" "de" "sl" "pl" ]
 , withHelp ? true
+, kdeIntegration ? false
 }:
 
 let
-  langsSpaces = stdenv.lib.concatStringsSep " " langs;
+  lib = stdenv.lib;
+  langsSpaces = lib.concatStringsSep " " langs;
   major = "5";
   minor = "1";
   patch = "0";
@@ -90,7 +92,6 @@ in stdenv.mkDerivation rec {
   '';
 
   QT4DIR = qt4;
-  KDE4DIR = kde4.kdelibs;
 
   # Fix boost 1.59 compat
   # Try removing in the next version
@@ -178,7 +179,7 @@ in stdenv.mkDerivation rec {
     "--disable-report-builder"
     "--enable-python=system"
     "--enable-dbus"
-    "--enable-kde4"
+    (lib.enableFeature kdeIntegration "kde4")
     "--with-package-format=installed"
     "--enable-epm"
     "--with-jdk-home=${jdk.home}"
@@ -230,7 +231,7 @@ in stdenv.mkDerivation rec {
     [ ant ArchiveZip autoconf automake bison boost cairo clucene_core
       CompressZlib cppunit cups curl db dbus_glib expat file flex fontconfig
       freetype GConf getopt gnome_vfs gperf gtk3 gtk
-      hunspell icu jdk kde4.kdelibs lcms libcdr libexttextcat unixODBC libjpeg
+      hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg
       libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11
       libXaw libXext libXi libXinerama libxml2 libxslt libXtst
       libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer
@@ -241,9 +242,10 @@ in stdenv.mkDerivation rec {
       libxshmfence libatomic_ops graphite2 harfbuzz
       librevenge libe-book libmwaw glm glew
       libodfgen CoinMP librdf_rasqal defaultIconTheme makeWrapper
-    ];
+    ]
+    ++ lib.optional kdeIntegration kde4.kdelibs;
 
-  meta = with stdenv.lib; {
+  meta = with lib; {
     description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org";
     homepage = http://libreoffice.org/;
     license = licenses.lgpl3;

From 13bd76b525b1d378bc7478279839f5ec5bdd5741 Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Thu, 3 Mar 2016 18:43:06 +0100
Subject: [PATCH 2135/2285] pkgs/rkt: 1.0.0 -> 1.1.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 ca7400c9f4a4..713928eafedd 100644
--- a/pkgs/applications/virtualization/rkt/default.nix
+++ b/pkgs/applications/virtualization/rkt/default.nix
@@ -9,7 +9,7 @@ let
   stage1Flavours = [ "coreos" "fly" "host" ];
 
 in stdenv.mkDerivation rec {
-  version = "1.0.0";
+  version = "1.1.0";
   name = "rkt-${version}";
   BUILDDIR="build-${name}";
 
@@ -17,7 +17,7 @@ in stdenv.mkDerivation rec {
       rev = "v${version}";
       owner = "coreos";
       repo = "rkt";
-      sha256 = "1m76hzx550dh35jpb8m46ks04ac3dfy4rg054v035rpwgh50ac6h";
+      sha256 = "1pl5gbfd9wr8nh2h249g7sjs31jz21g24mw375zki9gdhhnpn570";
   };
 
   stage1BaseImage = fetchurl {

From 2ed2cdcf09d60cc657a9d3f358b50a93abcb824d Mon Sep 17 00:00:00 2001
From: Jakub Skrzypnik <jot.skrzyp@gmail.com>
Date: Thu, 3 Mar 2016 21:28:37 +0100
Subject: [PATCH 2136/2285] libconfig: 1.4.9 -> 1.5

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

diff --git a/pkgs/development/libraries/libconfig/default.nix b/pkgs/development/libraries/libconfig/default.nix
index d6c238ff1793..ff9cd25293aa 100644
--- a/pkgs/development/libraries/libconfig/default.nix
+++ b/pkgs/development/libraries/libconfig/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "libconfig-${version}";
-  version = "1.4.9";
+  version = "1.5";
 
   src = fetchurl {
     url = "http://www.hyperrealm.com/libconfig/${name}.tar.gz";
-    sha256 = "0h9h8xjd36lky2r8jyc6hw085xwpslf0x6wyjvi960g6aa99gj09";
+    sha256 = "e31daa390d8e4461c8830512fe2e13ba1a3d6a02a2305a02429eec61e68703f6";
   };
 
   meta = with stdenv.lib; {

From 6cf6c3fbc9f03acb5a6711dd034b87d7b4174565 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Thu, 3 Mar 2016 21:31:00 +0100
Subject: [PATCH 2137/2285] nixos: Fix build of manual

Broken by 17389e256fa1651d8577555ac8fe7aa23044f0e6.

The description attributes of mkOption are parsed by XSLT, so we can
create a DocBook manual out of it.

Unfortunately, the passwordHash option had a description which includes
a <password> placeholder which is recognized by DocBook XSL as a valid
start tag. So as there is obviously no </password>, the build of the
manual bailed out with a parsing error.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Reported-by: devhell <"^"@regexmail.net>
---
 nixos/modules/services/networking/nntp-proxy.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/nntp-proxy.nix b/nixos/modules/services/networking/nntp-proxy.nix
index cd0889351a3d..cfa662c7311b 100644
--- a/nixos/modules/services/networking/nntp-proxy.nix
+++ b/nixos/modules/services/networking/nntp-proxy.nix
@@ -172,7 +172,8 @@ in
               default = null;
               example = "$6$GtzE7FrpE$wwuVgFYU.TZH4Rz.Snjxk9XGua89IeVwPQ/fEUD8eujr40q5Y021yhn0aNcsQ2Ifw.BLclyzvzgegopgKcneL0";
               description = ''
-                SHA-512 password hash (can be generated by 'mkpasswd -m sha-512 <password>')
+                SHA-512 password hash (can be generated by
+                <code>mkpasswd -m sha-512 &lt;password&gt;</code>)
               '';
             };
 

From 854b13dc001223b31d426255c2e6a5c4b0452087 Mon Sep 17 00:00:00 2001
From: Adam Bell <agbell@gmail.com>
Date: Thu, 3 Mar 2016 16:11:32 -0500
Subject: [PATCH 2138/2285] pgadmin 1.20.0 -> 1.22.1

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

diff --git a/pkgs/applications/misc/pgadmin/default.nix b/pkgs/applications/misc/pgadmin/default.nix
index bace31b1b1a6..55db70c1d249 100644
--- a/pkgs/applications/misc/pgadmin/default.nix
+++ b/pkgs/applications/misc/pgadmin/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "pgadmin3-${version}";
-  version = "1.20.0";
+  version = "1.22.1";
 
   src = fetchurl {
     url = "http://ftp.postgresql.org/pub/pgadmin3/release/v${version}/src/pgadmin3-${version}.tar.gz";
-    sha256 = "133bcbx9a322adldd1498h8bn2wfk45v1sbj9269jylwda1dfwq7";
+    sha256 = "0gkqpj8cg6jd6yhssrij1cbh960rg9fkjbdzcpryi6axwv0ag7ki";
   };
 
   buildInputs = [ postgresql wxGTK libxml2 libxslt openssl ];

From 7f26d6edf59d022466541608ca897c099484ecbc Mon Sep 17 00:00:00 2001
From: = <anothersms@gmail.com>
Date: Fri, 4 Mar 2016 01:22:00 +0100
Subject: [PATCH 2139/2285] guitarix: 0.33 -> 0.34

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

diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix
index d04af37560fb..7af7fbb4a259 100644
--- a/pkgs/applications/audio/guitarix/default.nix
+++ b/pkgs/applications/audio/guitarix/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, gettext, intltool, pkgconfig, python
 , avahi, bluez, boost, eigen, fftw, glib, glibmm, gtk, gtkmm, libjack2
 , ladspaH, librdf, libsndfile, lilv, lv2, serd, sord, sratom
-,  zita-convolver, zita-resampler
+, webkitgtk2, zita-convolver, zita-resampler
 , optimizationSupport ? false # Enable support for native CPU extensions
 }:
 
@@ -11,11 +11,11 @@ in
 
 stdenv.mkDerivation rec {
   name = "guitarix-${version}";
-  version = "0.33.0";
+  version = "0.34.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2";
-    sha256 = "1w6dg2n0alfjsx1iy6s53783invygwxk11p1i65cc3nq3zlidcgx";
+    sha256 = "0pamaq8iybsaglq6y1m1rlmz4wgbs2r6m24bj7x4fwg4grjvzjl8";
   };
 
   nativeBuildInputs = [ gettext intltool pkgconfig python ];
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     avahi bluez boost eigen fftw glib glibmm gtk gtkmm libjack2
     ladspaH librdf libsndfile lilv lv2 serd sord sratom
-    zita-convolver zita-resampler
+    webkitgtk2 zita-convolver zita-resampler
   ];
 
   configureFlags = [

From 507ad9a4f92df8c324ee23d49a817b12968c77ca Mon Sep 17 00:00:00 2001
From: Martin Sturm <mstrm@openmailbox.org>
Date: Tue, 29 Sep 2015 20:08:53 +0200
Subject: [PATCH 2140/2285] clamav: Use freshclam.conf defined by
 clamav-updater module if enabled

---
 nixos/modules/services/security/clamav.nix | 11 ++++++-----
 pkgs/tools/security/clamav/default.nix     |  5 ++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix
index 548aee29b266..e4e5c1253b77 100644
--- a/nixos/modules/services/security/clamav.nix
+++ b/nixos/modules/services/security/clamav.nix
@@ -16,6 +16,7 @@ let
 
     ${cfg.daemon.extraConfig}
   '';
+  pkg = pkgs.clamav.override { freshclamConf = cfg.updater.config; };
 in
 {
   options = {
@@ -54,7 +55,7 @@ in
   };
 
   config = mkIf cfg.updater.enable or cfg.daemon.enable {
-    environment.systemPackages = [ pkgs.clamav ];
+    environment.systemPackages = [ pkg ];
     users.extraUsers = singleton {
       name = clamavUser;
       uid = config.ids.uids.clamav;
@@ -76,7 +77,7 @@ in
 
     systemd.services.clamd = mkIf cfg.daemon.enable {
       description = "ClamAV daemon (clamd)";
-      path = [ pkgs.clamav ];
+      path = [ pkg ];
       after = [ "network.target" "freshclam.service" ];
       requires = [ "freshclam.service" ];
       wantedBy = [ "multi-user.target" ];
@@ -87,7 +88,7 @@ in
         chown ${clamavUser}:${clamavGroup} ${runDir}
       '';
       serviceConfig = {
-        ExecStart = "${pkgs.clamav}/bin/clamd --config-file=${clamdConfigFile}";
+        ExecStart = "${pkg}/bin/clamd --config-file=${clamdConfigFile}";
         Type = "forking";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         Restart = "on-failure";
@@ -100,13 +101,13 @@ in
       description = "ClamAV updater (freshclam)";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      path = [ pkgs.clamav ];
+      path = [ pkg ];
       preStart = ''
         mkdir -m 0755 -p ${stateDir}
         chown ${clamavUser}:${clamavGroup} ${stateDir}
       '';
       serviceConfig = {
-        ExecStart = "${pkgs.clamav}/bin/freshclam --daemon --config-file=${pkgs.writeText "freshclam.conf" cfg.updater.config}";
+        ExecStart = "${pkg}/bin/freshclam --daemon --config-file=${pkgs.writeText "freshclam.conf" cfg.updater.config}";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
         Restart = "on-failure";
         RestartSec = "10s";
diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index efb727833919..0a172935bb59 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl
-, libmilter, pcre }:
+, libmilter, pcre, freshclamConf ? null }:
+
 stdenv.mkDerivation rec {
   name = "clamav-${version}";
   version = "0.99";
@@ -24,6 +25,8 @@ stdenv.mkDerivation rec {
     "--disable-clamav"
   ];
 
+  fixupPhase = if (freshclamConf != null) then ''echo "${freshclamConf}" > $out/etc/freshclam.conf'' else "";
+
   meta = with stdenv.lib; {
     homepage = http://www.clamav.net;
     description = "Antivirus engine designed for detecting Trojans, viruses, malware and other malicious threats";

From baa7f92c3d46b41e4c3028d47d56dc976c8d32d5 Mon Sep 17 00:00:00 2001
From: Thomas Bereknyei <tomberek@gmail.com>
Date: Fri, 4 Mar 2016 00:17:13 -0500
Subject: [PATCH 2141/2285] minecraft-server: 1.8.8 -> 1.9

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

diff --git a/pkgs/games/minecraft-server/default.nix b/pkgs/games/minecraft-server/default.nix
index 82f826556f52..31e5683abc93 100644
--- a/pkgs/games/minecraft-server/default.nix
+++ b/pkgs/games/minecraft-server/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name    = "minecraft-server-${version}";
-  version = "1.8.8";
+  version = "1.9";
 
   src  = fetchurl {
     url    = "http://s3.amazonaws.com/Minecraft.Download/versions/${version}/minecraft_server.${version}.jar";
-    sha256 = "07pkdb8cnfnn8zywnhplpcdh9lrxdx8nmsgjarplf2akvhhggbir";
+    sha256 = "0z9sgnal55ari1dj4vac975wi9gk5hq30nhkw8155xbi1ksrg9rq";
   };
 
   installPhase = ''

From 6fb855675203d390415187f60f36825a62b6c5e9 Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Fri, 4 Mar 2016 09:22:34 +0100
Subject: [PATCH 2142/2285] click-log: 0.1.1 -> 0.1.3

---
 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 25ba60f69bf5..bc11ba09d0da 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3005,12 +3005,12 @@ in modules // {
   };
 
   click-log = buildPythonPackage rec {
-    version = "0.1.1";
+    version = "0.1.3";
     name = "click-log-${version}";
 
     src = pkgs.fetchurl {
       url = "https://pypi.python.org/packages/source/c/click-log/${name}.tar.gz";
-      sha256 = "1z3jdwjmwax159zrnyx830xa968rfqrpkm04ad5xqyh0269ydiqb";
+      sha256 = "0kdd1vminxpcfczxl2kkf285n0dr1gxh2cdbx1p6vkj7b7bci3gx";
     };
 
     propagatedBuildInputs = with self; [ click ];

From b219052bf1e8c78b449f7ec0edc0303f55708293 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 4 Mar 2016 07:24:04 +0100
Subject: [PATCH 2143/2285] menhir: 20151112 -> 20160303

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

diff --git a/pkgs/development/ocaml-modules/menhir/default.nix b/pkgs/development/ocaml-modules/menhir/default.nix
index 3841027b8961..16bdc17f578e 100644
--- a/pkgs/development/ocaml-modules/menhir/default.nix
+++ b/pkgs/development/ocaml-modules/menhir/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, ocaml, findlib
-, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20151112" else "20140422"
+, version ? if stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "4.02" then "20160303" else "20140422"
 }@args:
 
 let
   sha256 =
   if version == "20140422" then "1ki1f2id6a14h9xpv2k8yb6px7dyw8cvwh39csyzj4qpzx7wia0d"
-  else if version == "20151112" then "0fhfs96gxnj920h5ydsg7c1qypsbrlzqfn2cqzrg9rfj1qq6wq86"
+  else if version == "20160303" then "1q57x81483xkvbx6bqjx31d4c4lpy9fs3y7h3l8azrs9yi7r6c63"
   else throw ("menhir: unknown version " ++ version);
 in
 

From 014a30da93e370b785e4283630a43c3d12e48ee5 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Fri, 4 Mar 2016 07:29:28 +0100
Subject: [PATCH 2144/2285] why3: 0.86.2 -> 0.86.3

And merge with ocamlPackages.why3
(the OCaml library would not work correctly if packaged separately).
---
 .../science/logic/why3/default.nix            | 15 ++++++++-----
 .../ocaml-modules/why3/default.nix            | 21 -------------------
 pkgs/top-level/all-packages.nix               |  4 ----
 3 files changed, 10 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/development/ocaml-modules/why3/default.nix

diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix
index 0313467ed789..0eb51ff1620b 100644
--- a/pkgs/applications/science/logic/why3/default.nix
+++ b/pkgs/applications/science/logic/why3/default.nix
@@ -2,15 +2,20 @@
 
 stdenv.mkDerivation rec {
   name    = "why3-${version}";
-  version = "0.86.2";
+  version = "0.86.3";
 
   src = fetchurl {
-    url    = https://gforge.inria.fr/frs/download.php/file/35214/why3-0.86.2.tar.gz;
-    sha256 = "08sa7dmp6yp29xn0m6h98nic4q47vb4ahvaid5drwh522pvwvg10";
+    url    = https://gforge.inria.fr/frs/download.php/file/35537/why3-0.86.3.tar.gz;
+    sha256 = "0sph6i4ga9450bk60wpm5cq3psw3g8xprnac7yjfq64iqz1dyz03";
   };
 
-  buildInputs = with ocamlPackages;
-    [ coq coq.camlp5 ocaml findlib lablgtk ocamlgraph zarith menhir ];
+  buildInputs = (with ocamlPackages; [
+      ocaml findlib lablgtk ocamlgraph zarith menhir ]) ++
+    stdenv.lib.optionals (ocamlPackages.ocaml == coq.ocaml ) [
+      coq coq.camlp5
+    ];
+
+  installTargets = [ "install" "install-lib" ];
 
   meta = with stdenv.lib; {
     description = "A platform for deductive program verification";
diff --git a/pkgs/development/ocaml-modules/why3/default.nix b/pkgs/development/ocaml-modules/why3/default.nix
deleted file mode 100644
index 3ce0f8bdfac3..000000000000
--- a/pkgs/development/ocaml-modules/why3/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ stdenv, ocaml, findlib, zarith, menhir, why3 }:
-
-let ocaml-version = stdenv.lib.getVersion ocaml; in
-
-assert stdenv.lib.versionAtLeast ocaml-version "4.01";
-
-stdenv.mkDerivation {
-  name = "ocaml-${why3.name}";
-
-  inherit (why3) src;
-
-  buildInputs = [ ocaml findlib zarith menhir ];
-
-  installTargets = "install-lib";
-
-  meta = {
-    inherit (why3.meta) license homepage;
-    platforms = ocaml.meta.platforms;
-    maintainers = with stdenv.lib.maintainers; [ vbgl ];
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e45a7466aaf6..4aaaaf2ae1f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5042,10 +5042,6 @@ let
 
     vg = callPackage ../development/ocaml-modules/vg { };
 
-    why3 = callPackage ../development/ocaml-modules/why3 {
-      why3 = pkgs.why3;
-    };
-
     x509 = callPackage ../development/ocaml-modules/x509 { };
 
     xmlm = callPackage ../development/ocaml-modules/xmlm { };

From 92e86f03b0e51bba567b7a7c0bb1295335847070 Mon Sep 17 00:00:00 2001
From: "Bruno Bzeznik Bruno.Bzeznik@imag.fr" <Bruno.Bzeznik@imag.fr>
Date: Thu, 3 Mar 2016 20:39:59 +0100
Subject: [PATCH 2145/2285] taktuk: init at 3.7.5

---
 .../networking/cluster/taktuk/default.nix     | 34 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/taktuk/default.nix

diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/applications/networking/cluster/taktuk/default.nix
new file mode 100644
index 000000000000..79e0a6ec2078
--- /dev/null
+++ b/pkgs/applications/networking/cluster/taktuk/default.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, perl , openssh}:
+
+stdenv.mkDerivation rec {
+  version = "3.7.5";
+  name = "taktuk-${version}";
+
+  buildInputs = [ perl ];
+
+  src = fetchurl {
+    url = "https://gforge.inria.fr/frs/download.php/33412/${name}-3.7.5.tar.gz";
+    sha256 = "d96ef6c63d77f32339066f143ef7e0bc00041e10724254bf15787746ad1f1070";
+  };
+
+  preBuild = ''
+      substituteInPlace ./taktuk --replace "/usr/bin/perl" "${perl}/bin/perl"
+  '';
+
+  meta = {
+    description = "Efficient, large scale, parallel remote execution of commands";
+    longDescription = ''
+      TakTuk allows one to execute commands in parallel on a potentially large set
+      of remote nodes (using ssh to connect to each node). It is typically used
+      inside high performance computing clusters and grids. It uses an adaptive
+      algorithm to efficiently distribute the work and sets up an interconnection
+      network to transport commands and perform I/Os multiplexing. It doesn't
+      require any specific software on the nodes thanks to a self-propagation
+      algorithm.'';
+    homepage = http://taktuk.gforge.inria.fr/;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.bzizou ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df56303c7742..9227cfe02107 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5451,6 +5451,8 @@ let
 
   supercollider_scel = supercollider.override { useSCEL = true; };
 
+  taktuk = callPackage ../applications/networking/cluster/taktuk { };
+
   tcl = tcl-8_6;
   tcl-8_5 = callPackage ../development/interpreters/tcl/8.5.nix { };
   tcl-8_6 = callPackage ../development/interpreters/tcl/8.6.nix { };

From 95f22a6fb5a86be81a32583c0c356fa060917a1c Mon Sep 17 00:00:00 2001
From: Lancelot SIX <lsix@lancelotsix.com>
Date: Fri, 4 Mar 2016 10:30:42 +0100
Subject: [PATCH 2146/2285] pkgs.taktuk: fix remote url

---
 pkgs/applications/networking/cluster/taktuk/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/taktuk/default.nix b/pkgs/applications/networking/cluster/taktuk/default.nix
index 79e0a6ec2078..313e1af707b8 100644
--- a/pkgs/applications/networking/cluster/taktuk/default.nix
+++ b/pkgs/applications/networking/cluster/taktuk/default.nix
@@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
   buildInputs = [ perl ];
 
   src = fetchurl {
-    url = "https://gforge.inria.fr/frs/download.php/33412/${name}-3.7.5.tar.gz";
+    url = "https://gforge.inria.fr/frs/download.php/33412/${name}.tar.gz";
     sha256 = "d96ef6c63d77f32339066f143ef7e0bc00041e10724254bf15787746ad1f1070";
   };
 

From c7759dd8a088bd03fd9acbac3f6d397b42db0f35 Mon Sep 17 00:00:00 2001
From: Mathias Schreck <schreck.mathias@googlemail.com>
Date: Fri, 4 Mar 2016 10:32:17 +0100
Subject: [PATCH 2147/2285] nodejs: 5.7.0 -> 5.7.1

---
 pkgs/development/web/nodejs/v5.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v5.nix b/pkgs/development/web/nodejs/v5.nix
index c5bc3311503b..185ad61680b1 100644
--- a/pkgs/development/web/nodejs/v5.nix
+++ b/pkgs/development/web/nodejs/v5.nix
@@ -7,7 +7,7 @@
 assert stdenv.system != "armv5tel-linux";
 
 let
-  version = "5.7.0";
+  version = "5.7.1";
 
   deps = {
     inherit openssl zlib libuv;
@@ -31,7 +31,7 @@ in stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz";
-    sha256 = "1n6jvvf3jfmv7fjd64c5jajjapsmc8gr6rlw113vgys55xmb8f13";
+    sha256 = "16016cjycg0filh15nqfh3k1fdw3kaykl87xf8dnzf666mirbm7c";
   };
 
   configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps) ++ [ "--without-dtrace" ];

From def18c2408809a6859ef37bf649bef560c75ae6e Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Wed, 2 Mar 2016 10:27:38 +0100
Subject: [PATCH 2148/2285] hackage-packages.nix: update Haskell package set

This commit enables all haskellPackages builds so that we can discover builds
that have been fixed recently.

This update was generated by hackage2nix v20151217-12-g567601b using the following inputs:

  - Nixpkgs: https://github.com/NixOS/nixpkgs/commit/a67868f0602d13d13e2f21ffb43dac37910bb65e
  - Hackage: https://github.com/commercialhaskell/all-cabal-hashes/commit/1c84c94e147ab380bb0e954d13fd248238eb72b3
  - LTS Haskell: https://github.com/fpco/lts-haskell/commit/d2ad5fe9030deeacf1ed9c9de9045c65e597ca76
  - Stackage Nightly: https://github.com/fpco/stackage-nightly/commit/c1be20cfc01ee9f7431bc71f4377896ab2f352d2
---
 .../configuration-hackage2nix.yaml            | 3839 --------
 .../haskell-modules/configuration-lts-0.0.nix |    9 +
 .../haskell-modules/configuration-lts-0.1.nix |    9 +
 .../haskell-modules/configuration-lts-0.2.nix |    9 +
 .../haskell-modules/configuration-lts-0.3.nix |    9 +
 .../haskell-modules/configuration-lts-0.4.nix |    9 +
 .../haskell-modules/configuration-lts-0.5.nix |    9 +
 .../haskell-modules/configuration-lts-0.6.nix |    9 +
 .../haskell-modules/configuration-lts-0.7.nix |    9 +
 .../haskell-modules/configuration-lts-1.0.nix |    9 +
 .../haskell-modules/configuration-lts-1.1.nix |    9 +
 .../configuration-lts-1.10.nix                |    9 +
 .../configuration-lts-1.11.nix                |    9 +
 .../configuration-lts-1.12.nix                |    9 +
 .../configuration-lts-1.13.nix                |    9 +
 .../configuration-lts-1.14.nix                |   10 +
 .../configuration-lts-1.15.nix                |   10 +
 .../haskell-modules/configuration-lts-1.2.nix |    9 +
 .../haskell-modules/configuration-lts-1.4.nix |    9 +
 .../haskell-modules/configuration-lts-1.5.nix |    9 +
 .../haskell-modules/configuration-lts-1.7.nix |    9 +
 .../haskell-modules/configuration-lts-1.8.nix |    9 +
 .../haskell-modules/configuration-lts-1.9.nix |    9 +
 .../haskell-modules/configuration-lts-2.0.nix |   10 +
 .../haskell-modules/configuration-lts-2.1.nix |   10 +
 .../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                |   12 +
 .../configuration-lts-2.18.nix                |   12 +
 .../configuration-lts-2.19.nix                |   12 +
 .../haskell-modules/configuration-lts-2.2.nix |   10 +
 .../configuration-lts-2.20.nix                |   12 +
 .../configuration-lts-2.21.nix                |   12 +
 .../configuration-lts-2.22.nix                |   12 +
 .../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 |   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 |   14 +
 .../haskell-modules/configuration-lts-3.1.nix |   14 +
 .../configuration-lts-3.10.nix                |   15 +
 .../configuration-lts-3.11.nix                |   15 +
 .../configuration-lts-3.12.nix                |   15 +
 .../configuration-lts-3.13.nix                |   15 +
 .../configuration-lts-3.14.nix                |   15 +
 .../configuration-lts-3.15.nix                |   16 +
 .../configuration-lts-3.16.nix                |   16 +
 .../configuration-lts-3.17.nix                |   16 +
 .../configuration-lts-3.18.nix                |   16 +
 .../configuration-lts-3.19.nix                |   16 +
 .../haskell-modules/configuration-lts-3.2.nix |   14 +
 .../configuration-lts-3.20.nix                |   16 +
 .../configuration-lts-3.21.nix                |   16 +
 .../configuration-lts-3.22.nix                |   16 +
 .../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 |   16 +
 .../haskell-modules/configuration-lts-4.1.nix |   16 +
 .../haskell-modules/configuration-lts-4.2.nix |   18 +
 .../haskell-modules/configuration-lts-5.0.nix |   19 +-
 .../haskell-modules/configuration-lts-5.1.nix |   20 +-
 .../haskell-modules/configuration-lts-5.2.nix |   21 +-
 .../haskell-modules/configuration-lts-5.3.nix |   21 +-
 .../haskell-modules/configuration-lts-5.4.nix |   21 +-
 .../haskell-modules/configuration-lts-5.5.nix | 7746 +++++++++++++++++
 .../haskell-modules/hackage-packages.nix      | 5459 +++---------
 79 files changed, 9917 insertions(+), 8075 deletions(-)
 create mode 100644 pkgs/development/haskell-modules/configuration-lts-5.5.nix

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
index 7368f639c72d..5ff2f60a7de7 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml
@@ -145,3842 +145,3 @@ dont-distribute-packages:
   yices-painless:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
 
   # soft restrictions because of build errors
-  3d-graphics-examples:                         [ x86_64-darwin ]
-  3dmodels:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  4Blocks:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  abcBridge:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  abc-puzzle:                                   [ x86_64-darwin ]
-  abstract-par-accelerate:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AC-BuildPlatform:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  accelerate-arithmetic:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  accelerate-fourier:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  accelerate-utility:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  accentuateus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  access-time:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AC-EasyRaster-GTK:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AC-HalfInteger:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  acid-state-dist:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  acme-hq9plus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ACME:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  acme-inator:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  acme-numbersystem:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  acme-schoenfinkel:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  acme-zero:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AC-MiniTest:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AC-Terminal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ActionKid:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  activehs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  actor:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AC-VanillaArray:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Adaptive-Blaisorblade:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  adaptive-containers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Adaptive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  adaptive-tuple:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  adblock2privoxy:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  adhoc-network:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  adict:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  adobe-swatch-exchange:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ADPfusion:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  adp-multi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  adp-multi-monadiccp:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Advgame:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AERN-Basics:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AERN-Net:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AERN-Real-Double:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AERN-Real:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AERN-Real-Interval:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AERN-RnToRm:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AERN-RnToRm-Plot:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aeson-bson:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AesonBson:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aeson-extra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aeson-native:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aeson-smart:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  afv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Agata:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  agda-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AGI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AhoCorasick:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  airbrake:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aivika-transformers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ajhc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alea:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  algebraic:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  algebra-sql:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  al:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AlignmentAlgorithms:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Allure:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alms:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alpha:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alpino-tools:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alsa-core:                                    [ x86_64-darwin ]
-  alsa-gui:                                     [ x86_64-darwin ]
-  alsa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alsa-midi:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alsa-mixer:                                   [ x86_64-darwin ]
-  alsa-pcm-tests:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alsa-pcm:                                     [ x86_64-darwin ]
-  alsa-seq-tests:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alsa-seq:                                     [ x86_64-darwin ]
-  altfloat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  alure:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ALUT:                                         [ x86_64-darwin ]
-  amazon-emailer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  amazonka-ec2:                                 [ i686-linux ]
-  amazonka-rds:                                 [ i686-linux ]
-  amazonka-s3:                                  [ i686-linux ]
-  amazonka-sqs:                                 [ i686-linux ]
-  amazonka-swf:                                 [ i686-linux ]
-  amazon-products:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AMI:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ampersand:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  anansi-pandoc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  anatomy:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  android-lint-summary:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AndroidViewHierarchyImporter:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Animas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  antfarm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  anticiv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  antigate:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  antimirov:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  antlrc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  anydbm:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aosd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  apelsin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  apiary-helics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  apiary-purescript:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  apis:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  api-tools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  apotiki:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  appc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  app-lens:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ApplePush:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AppleScript:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  approx-rand-test:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arbb-vm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arb-fft:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  archiver:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  archlinux:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  archlinux-web:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arff:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  argon2:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  argparser:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arguedit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ariadne:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arion:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arith-encode:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arithmetic:                                   [ i686-linux ]
-  arithmoi:                                     [ i686-linux ]
-  armada:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  array-forth:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ArrayRef:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arrowapply-utils:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arrow-improve:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arrowp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ArrowVHDL:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  arx:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ascii85-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  asic:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  asil:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AspectAG:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  assimp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  astrds:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  astview:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  async-extras:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aterm-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  atlassian-connect-core:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  atlassian-connect-descriptor:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  atom-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  atomic-primops-foreign:                       [ x86_64-darwin ]
-  atomic-primops-vector:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  atom-msp430:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  atomo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AttoJson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  attoparsec-csv:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  attoparsec-iteratee:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  attoparsec-text-enumerator:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  attoparsec-text:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Attrac:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  atuin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  audiovisual:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  augeas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  augur:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Aurochs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  authoring:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AutoForms:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  autoproc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  avahi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  avers:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  AvlTree:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  awesomium-glut:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  awesomium:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  awesomium-raw:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-configuration-tools:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-dynamodb-streams:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-elastic-transcoder:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-general:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-kinesis-client:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-kinesis:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-kinesis-reshard:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-lambda:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-performance-tests:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-sdk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-sign4:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  aws-sns:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  azure-service-api:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  azurify:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  babylon:                                      [ x86_64-darwin ]
-  backdropper:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Baggins:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bag:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bamboo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bamboo-launcher:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bamboo-plugin-highlight:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bamboo-plugin-photo:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bamboo-theme-blueprint:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bamboo-theme-mini-html5:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bamse:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  barchart:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  barcodes-code128:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  barley:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Barracuda:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  barrie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  barrier-monad:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  base32-bytestring:                            [ x86_64-darwin ]
-  BASIC:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  baskell:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  battleships:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bayes-stack:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BCMtools:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  beamable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  beautifHOL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bed-and-breakfast:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Befunge93:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bein:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  berkeleydb:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BerkeleyDBXML:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  berp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bet:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bff:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bgzf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bidirectionalization-combined:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bidispec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BigPixel:                                     [ x86_64-darwin ]
-  billboard-parser:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  billeksah-forms:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  billeksah-main:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  billeksah-pane:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  billeksah-services:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binary-derive:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binary-file:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binary-indexed-tree:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binary-protocol-zmq:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binary-search:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binary-streams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binary-strict:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binding-gtk:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-apr:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-apr-util:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-audiofile:                           [ x86_64-darwin ]
-  bindings-bfd:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-cctools:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-codec2:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-common:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-dc1394:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-directfb:                            [ x86_64-darwin ]
-  bindings-eskit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-EsounD:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-fann:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-fluidsynth:                          [ x86_64-darwin ]
-  bindings-friso:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-GLFW:                                [ x86_64-darwin ]
-  bindings-gsl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-gts:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-hdf5:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-K8055:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-libcddb:                             [ x86_64-darwin ]
-  bindings-libftdi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-librrd:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-libstemmer:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-libv4l2:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-libzip:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-linux-videodev2:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-lxc:                                 [ x86_64-darwin ]
-  bindings-mpdecimal:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-portaudio:                           [ x86_64-darwin ]
-  bindings-ppdev:                               [ x86_64-darwin ]
-  bindings-sane:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-sc3:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-sipc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bindings-svm:                                 [ x86_64-darwin ]
-  binding-wx:                                   [ x86_64-darwin ]
-  bind-marshal:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  binembed-example:                             [ x86_64-darwin ]
-  BiobaseBlast:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BiobaseDotP:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BiobaseFasta:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BiobaseFR3D:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Biobase:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BiobaseInfernal:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BiobaseMAF:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BiobaseTrainingData:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BiobaseTurner:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BiobaseVienna:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  biohazard:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bio:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bioinformatics-toolkit:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  biosff:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  biostockholm:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bird:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BirdPP:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bit-array:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bitcoin-rpc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bitly-cli:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Bitly:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bitmap-opengl:                                [ x86_64-darwin ]
-  bits-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bitset:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bits-extras:                                  [ x86_64-darwin ]
-  bitspeak:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bitstream:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bittorrent:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bitvec:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bit-vector:                                   [ i686-linux ]
-  bkr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  black-jewel:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bla:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blakesum-demo:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blakesum:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blank-canvas:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blas-hs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blas:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blaze-html-contrib:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blaze-html-hexpat:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blazeMarker:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blaze-textual-native:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blip:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Blobs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  blogination:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bloodhound:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bloxorz:                                      [ x86_64-darwin ]
-  blubber:                                      [ x86_64-darwin ]
-  Blueprint:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bluetile:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  BNFC:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  board-games:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bogre-banana:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bond:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Bookshelf:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  boolean-normal-forms:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  boolsimplifier:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  boomslang:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  borel:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bot:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Bravo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  breakout:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  brians-brain:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  brillig:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  broker-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bsd-sysctl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bson-generics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bson-mapping:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  btree-concurrent:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  btrfs:                                        [ x86_64-darwin ]
-  buffer-builder-aeson:                         [ i686-linux ]
-  buffer-builder-aeson:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  buffer-builder:                               [ i686-linux ]
-  buffon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  buildbox-tools:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  buildwrapper:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bullet:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  buster-gtk:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  buster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Buster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  buster-network:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bustle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  butterflies:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytable:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestring-arbitrary:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestring-class:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestring-csv:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestringparser:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestringreadp:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestring-rematch:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  bytestring-short:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal2arch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal2doap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal2spec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-constraints:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-debian:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-dev:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-ghci:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-graphdeps:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabalgraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-install-bundle:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-install-ghc72:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-install-ghc74:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabalmdvrpm:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-query:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabalrpmdeps:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-setup:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-test:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabal-upload:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cabocha:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cake3:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cakyrespa:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cal3d-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cal3d:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cal3d-opengl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  calc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  caldims:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  caledon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  call-haskell-from-anything:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  call:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  campfire:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cantor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Capabilities:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cap:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  capri:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  carboncopy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casadi-bindings-control:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casadi-bindings-core:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casadi-bindings:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casadi-bindings-internal:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casadi-bindings-ipopt-interface:              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casadi-bindings-snopt-interface:              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Cascade:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cascading:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cash:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cassandra-thrift:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cassava-streams:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cassy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  casui:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Catana:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  catch-fd:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  categorical-algebra:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  category-extras:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CBOR:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CC-delcont-alt:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CC-delcont-cxe:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CC-delcont-exc:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CC-delcont:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CC-delcont-ref:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CC-delcont-ref-tf:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cci:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cctools-workqueue:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cedict:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ceilometer-common:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cereal-enumerator:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cereal-ieee754:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cereal-plus:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  certificate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cf:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cfipu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cflp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cfopu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cgen:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cg:                                           [ i686-linux ]
-  cgi-utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chalkboard:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chalkboard-viewer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  charade:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  charsetdetect-ae:                             [ x86_64-darwin ]
-  charsetdetect:                                [ x86_64-darwin ]
-  chatter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  checked:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  check-pvp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chell-hunit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chevalier-common:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Chitra:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chp-mtl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chp-plus:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chp-spec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chp-transformers:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ChristmasTree:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chuchu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  chunks:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cil:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cinvoke:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  c-io:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cio:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ciphersaber2:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  citation-resolve:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  citeproc-hs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  citeproc-hs-pandoc-filter:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cityhash:                                     [ x86_64-darwin ]
-  cjk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clafer:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  claferIG:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  claferwiki:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CLASE:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clash:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clash-prelude-quickcheck:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ClassLaws:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ClassyPrelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clckwrks-plugin-bugs:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clckwrks-theme-geo-bootstrap:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cld2:                                         [ x86_64-darwin ]
-  Clean:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clevercss:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  click-clack:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clifford:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clipper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clippings:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clocked:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clogparse:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clone-all:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cloudfront-signer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cloud-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cloudyfs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clua:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cluss:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clustertools:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  clutterhs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cmath:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cmathml3:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CMCompare:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cmdargs-browser:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cmdtheline:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cmonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cnc-spec-compiler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Coadjute:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Codec-Image-DevIL:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  codec-libevent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  codecov-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  codemonitor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  codepad:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cognimeta-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  coinbase-exchange:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  colada:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  collada-output:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  collada-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  collections-api:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  collections-base-instances:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  collections:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  coltrane:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  combinat-diagrams:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  combinat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  combinatorial-problems:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  combinator-interactive:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Combinatorrent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  com:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Commando:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  commodities:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  commsec:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  commsec-keyexchange:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  comonad-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  comonad-random:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  compact-map:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  compact-string:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  compilation:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  complexity:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  compose-ltr:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  compose-trans:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  compression:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  compstrat:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  comptrans:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  computational-algebra:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  concraft-hr:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  concraft:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  concraft-pl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  concrete-typerep:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  concurrent-state:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ConcurrentUtils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  condorcet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  condor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Condor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  conductive-hsc3:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  conduit-audio-lame:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  conduit-audio-samplerate:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  conduit-network-stream:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  conduit-resumablesink:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Configger:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  config-select:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  conjure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  consistent:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  const-math-ghc-plugin:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ConstraintKinds:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  constructible:                                [ i686-linux ]
-  constructible:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  constructive-algebra:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Consumer:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  consumers:                                    [ x86_64-darwin ]
-  context-stack:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  continue:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  continuum:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Contract:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  control-event:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  control-monad-attempt:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  control-monad-failure:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  control-monad-failure-mtl:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Control-Monad-MultiPass:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Control-Monad-ST2:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  contstuff-monads-tf:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  contstuff-transformers:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  convertible-ascii:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  convertible-text:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  copilot-cbmc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  copilot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  copilot-sbv:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  COrdering:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  corebot-bliki:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CoreFoundation:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  core-haskell:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  core:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Coroutine:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  coroutine-iteratee:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  couchdb-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  couchdb-enumerator:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CouchDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  couch-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  couch-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  court:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  coverage:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CPBrainfuck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cpio-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CPL:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cplusplus-th:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cpuperf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cpython:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cqrs-postgresql:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cqrs-sqlite3:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cqrs-test:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crack:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Craft3e:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  craftwerk-cairo:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  craftwerk-gtk:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  craftwerk:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crc16:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crf-chain1-constrained:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crf-chain1:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crf-chain2-generic:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crf-chain2-tiers:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cr:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  criterion-plus:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crocodile:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cron-compat:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cruncher-types:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crunghc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crypto-cipher-benchmarks:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cryptsy-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  crystalfontz:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cse-ghc-plugin:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  csound-catalog:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  csp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cspmchecker:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CSPM-cspm:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CSPM-FiringRules:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  css:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ctemplate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ctkl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ctpl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cubical:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cubicbezier:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cuboid:                                       [ x86_64-darwin ]
-  cudd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  curry-base:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  CurryDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  curry-frontend:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cv-combinators:                               [ x86_64-darwin ]
-  CV:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  cyclotomic:                                   [ i686-linux ]
-  cypher:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  daemons:                                      [ i686-linux ]
-  DAG-Tournament:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Dangerous:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Dao:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dapi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcs2dot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcs-benchmark:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcs-beta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcs-buildpackage:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcs-cabalized:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcsden:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcs-fastconvert:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcs-graph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DarcsHelpers:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcs-monitor:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darcswatch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  darkplaces-demo:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-cycle:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-dispersal:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  datadog:                                      [ i686-linux ]
-  data-easy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-ivar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-lens-ixset:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  datalog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-named:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-nat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-object-json:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-object-yaml:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-quotientref:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-rope:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Data-Rope:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-store:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DataTreeView:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  data-type:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dbjava:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dbus-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dbus-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DBus:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dclabel:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddc-build:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddc-core-eval:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddc-core-flow:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddc-core:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddc-core-llvm:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddc-core-salt:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddc-core-simpl:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddc-core-tetra:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddc-driver:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddci-core:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddc-source-tetra:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ddc-tools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dead-simple-json:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  decepticons:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DecisionTree:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  decoder-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dedukti:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  deeplearning-hs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  deepseq-bounded:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  deepseq-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  deepzoom:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  defargs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DefendTheKing:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  definitive-base:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  definitive-filesystem:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  definitive-graphics:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  definitive-parser:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  definitive-reactive:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  definitive-sound:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  deka:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  deka-tests:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  delicious:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  delta-h:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  delta:                                        [ x86_64-darwin ]
-  demarcate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  denominate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  depends:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dephd:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dequeue:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  derangement:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  derivation-trees:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  derive-gadt:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  derive-IG:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  derive-topdown:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  derive-trie:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  derp-lib:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  devil:                                        [ x86_64-darwin ]
-  dewdrop:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Dflow:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dfsbuild:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dgim:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dgs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-canvas:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-hsqml:                               [ x86_64-darwin ]
-  diagrams-pdf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-pgf:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diagrams-tikz:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dice-entropy-conduit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dictparser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diffcabal:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DifferenceLogic:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DifferentialEvolution:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  digestive-functors-hsp:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DimensionalHash:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dingo-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dingo-example:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dingo-widgets:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diophantine:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  diplomacy-server:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  direct-binary-files:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  directed-cubical:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  direct-fastcgi:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  direct-http:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  direct-plugins:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dirfiles:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  discount:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  disjoint-set:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DisTract:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distributed-closure:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distributed-process-azure:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distributed-process-client-server:            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distributed-process-execution:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distributed-process-platform:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distributed-process-registry:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distributed-process-supervisor:               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distributed-process-task:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distributed-process-zookeeper:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distribution:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  distribution-plot:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  djinn-th:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DnaProteinAlignment:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dnscache:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dnssd:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  doccheck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  docidx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dockercook:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  docker:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  doc-review:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  doctest-discover-configurator:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  doctest-discover:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DocTest:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DOM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dotfs:                                        [ x86_64-darwin ]
-  download:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  download-media-content:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dow:                                          [ x86_64-darwin ]
-  dph-examples:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dph-lifted-base:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dph-lifted-copy:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dph-lifted-vseg:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dph-prim-par:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dph-prim-seq:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DP:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dpkg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DPM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  drClickOn:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DrHylo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DrIFT-cabalized:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  drifter-postgresql:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DrIFT:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dropbox-sdk:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dropsolve:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DSH:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dsh-sql:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ds-kanren:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dsmc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dsmc-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DSTM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dstring:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DTC:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dtd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dtd-text:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dtd-types:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  duplo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Dust-crypto:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Dust:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Dust-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Dust-tools-pcap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dvda:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dvdread:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dynamic-cabal:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dynamic-graph:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dynamic-object:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dynamic-plot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dynamic-pp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DynamicTimeWarp:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  dynobud:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DysFRP-Cairo:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  DysFRP-Craftwerk:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  easy-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  easyjson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  easyplot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  easyrender:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ebnf-bff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ecdsa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ecma262:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ecu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ed25519:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  edenmodules:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  edenskel:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  edentv:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  edge:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  edit-lenses:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  editline:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  EditTimeReport:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  EEConfig:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  effective-aspects:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  effective-aspects-mzv:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  effect-monad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  egison-quote:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ehaskell:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ehs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  eibd-client-simple:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  eigen:                                        [ x86_64-darwin ]
-  EitherT:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ekg-rrd:                                      [ i686-linux ]
-  electrum-mnemonic:                            [ i686-linux ]
-  elerea-examples:                              [ x86_64-darwin ]
-  elerea-sdl:                                   [ x86_64-darwin ]
-  elm-init:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  emacs-keys:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  email-header:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  email:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  email-postmark:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  embeddock-example:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  embeddock:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  embroidery:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  emgm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Emping:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Encode:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  enumerate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  enumeration:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  enumfun:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  EnumMap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  enummapmap:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  env-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  epanet-haskell:                               [ x86_64-darwin ]
-  epic:                                         [ x86_64-darwin ]
-  epoll:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  epubname:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Eq:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  eros-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  error-message:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ersatz:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ersatz-toysat:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  esotericbot:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  EsounD:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  estimators:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  estreps:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Etage-Graph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Etage:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  EtaMOO:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Eternal10Seconds:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  eternal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Etherbunny:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ethereum-client-haskell:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ethereum-merkle-patricia-db:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  euphoria:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  eurofxref:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Euterpea:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  event-driven:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  eventloop:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  event-monad:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  EventSocket:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  every-bit-counts:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ewe:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exif:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exists:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  expand:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  expat-enumerator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  explain:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  explicit-sharing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  explore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exposed-containers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  exp-pairs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  extcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  extemp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  extended-categories:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ez-couch:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  faceted:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  factory:                                      [ i686-linux ]
-  factory:                                      [ x86_64-linux ]
-  factual-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FailureT:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fallingblocks:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  falling-turnip:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  family-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  farmhash:                                     [ x86_64-darwin ]
-  fastbayes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fast-builder:                                 [ x86_64-darwin ]
-  fastirc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fast-tags:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fault-tree:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fay-hsx:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fcd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fckeditor:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FComp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fdo-trash:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  feed2lj:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  feed2twitter:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  feed-cli:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  feed-collect:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  feed-translator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  feldspar-compiler:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  feldspar-language:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fenfire:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FermatsLastMargin:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FerryCore:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ffeed:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ffmpeg-light:                                 [ x86_64-darwin ]
-  ffmpeg-tutorials:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fibon:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fields:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FieldTrip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fieldwise:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  file-location:                                [ x86_64-darwin ]
-  FileManipCompat:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FileManip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  file-modules:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  filesystem-conduit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  filesystem-enumerator:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FileSystem:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Finance-Quote-Yahoo:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Finance-Treasury:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  find-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FiniteMap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  firstify:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FirstOrderTheory:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fishfood:                                     [ i686-linux ]
-  fishfood:                                     [ x86_64-linux ]
-  fit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fitsio:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fixed-point:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fixed-point-vector:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fixed-point-vector-space:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fixed-precision:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fixed-storable-array:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fix-parser-simple:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fix-symbols-gitit:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flexiwrap:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flexiwrap-smallcheck:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flickr:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Flippi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flite:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  floating-bits:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flow2dot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flowdock-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flowdock:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flowdock-rest:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flower:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flowlocks-framework:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  flowsim:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fltkhs-hello-world:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fluidsynth:                                   [ x86_64-darwin ]
-  FModExRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FM-SBLEX:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fold-debounce-conduit:                        [ x86_64-darwin ]
-  fold-debounce:                                [ x86_64-darwin ]
-  foldl-incremental:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  foldl-transduce-attoparsec:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  foldl-transduce:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  folds-common:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  folds:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  follower:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  foma:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  font-opengl-basic4x6:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  foo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  forbidden-fruit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fordo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  for-free:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FormalGrammars:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  formal:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  format:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  format-status:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  formlets-hsp:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  formlets:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  forml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ForSyDe:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  forth-hll:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  foscam-sort:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Foster:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fpco-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fpnla-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FractalArt:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Fractaler:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  frag:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  franchise:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Frank:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-functors:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-game:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  freekick2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  freenect:                                     [ x86_64-darwin ]
-  free-operational:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  freer:                                        [ i686-linux ]
-  freesect:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  freesound:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-theorems-counterexamples:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-theorems:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-theorems-seq:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-theorems-seq-webui:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  free-theorems-webui:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FreeTypeGL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  friday-juicypixels:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  frp-arduino:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  frpnow-gloss:                                 [ x86_64-darwin ]
-  fs-events:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fsmActions:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fswatcher:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ftdi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FTGL-bytestring:                              [ x86_64-darwin ]
-  FTGL:                                         [ x86_64-darwin ]
-  ftp-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ftshell:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  full-sessions:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fullstop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  full-text-search:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  funbot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  functional-arrow:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  function-combine:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  functorm:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  FunGEn:                                       [ x86_64-darwin ]
-  funion:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  funsat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  future:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fuzzy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fuzzytime:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fwgl-glfw:                                    [ x86_64-darwin ]
-  gact:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gameclock:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Gamgine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Ganymede:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gbu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gc-monitoring-wai:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gdiff-ig:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gdiff-th:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gearbox:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geek:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geek-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gelatin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gemstone:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gencheck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gender:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genders:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  general-prelude:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GeneralTicTacToe:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  generators:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  generic-church:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genericserialize:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  generic-storable:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  generic-xml:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  genetics:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geniconvert:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geni-gui:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GenI:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geniserver:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geni-util:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GenSmsPdu:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GenussFold:                                   [ i686-linux ]
-  GenussFold:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GeocoderOpenCage:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geoip2:                                       [ i686-linux ]
-  GeoIp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geom2d:                                       [ i686-linux ]
-  GeomPredicates-SSE:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  geo-resolver:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  getemx:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  getflag:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ggtsTC:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghc-dup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghc-events-parallel:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghc-exactprint:                               [ x86_64-darwin ]
-  ghci-diagrams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghci-haskeline:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghclive:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghc-parmake:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghc-pkg-autofix:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ghc-syb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ght:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-cairo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gdk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-gtk:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-javascriptcore:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-soup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gist:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  git-all:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  git-checklist:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  git-date:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gitdo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  git-gpush:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gitlib-cross:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gitlib-s3:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gitlib-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  git-repair:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-vte:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-webkit2:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gi-webkit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  glade:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gladexml-accessor:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  glapp:                                        [ x86_64-darwin ]
-  gl-capture:                                   [ x86_64-darwin ]
-  GLFW-b-demo:                                  [ x86_64-darwin ]
-  GLFW-b:                                       [ x86_64-darwin ]
-  GLFW-OGL:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GLFW-task:                                    [ x86_64-darwin ]
-  GLFW:                                         [ x86_64-darwin ]
-  GLHUI:                                        [ x86_64-darwin ]
-  glicko:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  glider-nlp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GLMatrix:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  global:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  glome-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GlomeTrace:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GlomeView:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gloss-accelerate:                             [ x86_64-darwin ]
-  gloss-algorithms:                             [ x86_64-darwin ]
-  gloss-banana:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gloss-devil:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gloss-examples:                               [ x86_64-darwin ]
-  gloss-game:                                   [ x86_64-darwin ]
-  gloss-juicy:                                  [ x86_64-darwin ]
-  gloss-raster:                                 [ x86_64-darwin ]
-  gloss-rendering:                              [ x86_64-darwin ]
-  gloss-sodium:                                 [ x86_64-darwin ]
-  gloss:                                        [ x86_64-darwin ]
-  GLURaw:                                       [ x86_64-darwin ]
-  GLUtil:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gluturtle:                                    [ x86_64-darwin ]
-  GLUT:                                         [ x86_64-darwin ]
-  gmap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gmndl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gnome-desktop:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gnome-keyring:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gnomevfs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  g-npm:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gnss-converters:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  goa:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  goal-simulation:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gofer-prelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GoogleDirections:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  google-html5-slide:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  google-mail-filters:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  googleplus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GoogleSB:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  google-search:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GoogleTranslate:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gopherbot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gpah:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GPipe-Collada:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GPipe-Examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GPipe-GLFW:                                   [ x86_64-darwin ]
-  GPipe-TextureLoad:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gps2htmlReport:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gps:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gpx-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GPX:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  grammar-combinators:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GrammarProducts:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  grapefruit-examples:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  grapefruit-frp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  grapefruit-records:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  grapefruit-ui-gtk:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  grapefruit-ui:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Graph500:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graphbuilder:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GraphHammer-examples:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GraphHammer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graphics-drawingcombinators:                  [ x86_64-darwin ]
-  graphics-formats-collada:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graphicsFormats:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graphicstools:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-cl:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-gl:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-lambdascope:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-layout:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-ski:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-strategies:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-trs:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-rewriting-ww:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graphtype:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  graph-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  greencard:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  greencard-lib:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  greg-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gremlin-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Grempa:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gridland:                                     [ x86_64-darwin ]
-  grm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Grow:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GrowlNotify:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gruff-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gruff:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gsl-random-fu:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gsl-random:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gsmenu:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gstreamer:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GTALib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtfs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk2hs-cast-glade:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk2hs-cast-gnomevfs:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk2hs-cast-gtkglext:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk2hs-cast-gtk:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Gtk2hsGenerics:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk2hs-rpn:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk3-mac-integration:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtkglext:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GtkGLTV:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtkimageview:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk-mac-integration:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtkrsync:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk-serialized-event:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  gtk-toy:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  guess-combinator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GuiHaskell:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  GuiTV:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haar:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hach:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack2-handler-happstack-server:               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack2-handler-mongrel2-http:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack2-handler-warp:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack2-interface-wai:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage2hwn:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage2twitter:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-proxy:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-repo-tool:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-security-HTTP:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-security:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackage-sparks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-contrib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-contrib-press:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackernews:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-frontend-happstack:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-handler-epoll:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-handler-evhttp:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-handler-fastcgi:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-handler-happstack:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-handler-hyena:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-handler-kibro:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-handler-simpleserver:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HackMail:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-middleware-cleanpath:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-middleware-clientsession:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hack-middleware-jsonp:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hackport:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hactor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haddock-leksah:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haggis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Haggressive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haiji:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hairy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hakaru:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hakismet:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hakyll-blaze-templates:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hakyll-contrib:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hakyll-contrib-links:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hakyll-convert:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hakyll-R:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  halberd:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HaLeX:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  halfs:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  halipeto:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hampp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hamtmap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hamusic:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  handsy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hannahci:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haphviz:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happindicator3:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happindicator:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happraise:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HAppS-Data:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happs-hsp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happs-hsp-template:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HAppS-IxSet:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HAppS-Server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HAppS-State:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-auth:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-contrib:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-data:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-dlg:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-facebook:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-fay:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-heist:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-helpers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-ixset:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-monad-peel:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-plugins:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-state:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-util:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happstack-yui:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happs-tutorial:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HAppS-Util:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happybara:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happybara-webkit:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  happybara-webkit-server:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  harchive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hardware-edsl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HaRe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hark:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HARM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  harmony:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HarmTrace-Base:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HarmTrace:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haroonga-httpd:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haroonga:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hascal:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hascat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hascat-lib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hascat-setup:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hascat-system:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Haschoo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HasGP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hashable-generics:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hashed-storage:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hashell:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hash:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hashids:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  has:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasim:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskakafka:                                   [ x86_64-darwin ]
-  haskanoid:                                    [ x86_64-darwin ]
-  haskarrow:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskeem:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskeline-class:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell2010:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell98:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-aliyun:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-awk:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-bcrypt:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-brainfuck:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-cnc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-course-preludes:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-connect-hdbc-catchio-mtl:           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-connect-hdbc-catchio-tf:            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-connect-hdbc-catchio-transformers:  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-connect-hdbc:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-connect-hdbc-lifted:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-dynamic:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hdbc-mysql:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hsql:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hsql-mysql:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hsql-odbc:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hsql-postgresql:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-hsql-sqlite3:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskelldb-wx:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-formatter:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-ftp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-generate:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-in-space:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HaskellLM:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-names:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HaskellNN:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Haskelloids:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-openflow:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-pdf-presenter:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-platform-test:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-plot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-reflect:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-rules:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskellscrabble:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-src-meta-mwotton:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-token-utils:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-tor:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HaskellTorrent:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-type-exts:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-tyrant:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskell-xmpp:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskgame:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskheap:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskhol-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hask-home:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hask:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoin-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoin-crypto:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoin-node:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoin-protocol:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoin-script:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoin-util:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoin-wallet:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoon-httpspec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskoon-salvia:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskore-realtime:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskore-supercollider:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haskore-synthesizer:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasloGUI:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haslo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasparql-client:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasql-pool:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasql-postgres:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasql-postgres-options:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasql-th:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hasql-transaction:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haste-perch:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  has-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hate:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hatex-guide:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HaTeX-meta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haverer:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HaVSA:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hawitter:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hawk:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  haxparse:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hayland:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hayoo-cli:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hayoo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hback:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hbayes:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hbb:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hBDD-CMUBDD:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hBDD-CUDD:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hbeat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hblas:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hblock:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  h-booru:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hbro:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hburg:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HCard:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hcheat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hchesslib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HCL:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hcron:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hCsound:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hcube:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hcwiid:                                       [ x86_64-darwin ]
-  hdaemonize-buildfix:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HDBC-mysql:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdbi-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdbi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdbi-postgresql:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdbi-sqlite:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdbi-tests:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hDFA:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdigest:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdirect:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdis86:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdiscount:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdph-closure:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hdph:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HDRUtils:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hecc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hedi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hedn:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  heist-aeson:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  helics:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  helics-wai:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  helium:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hellage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hell:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hellnet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  helm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hemkay:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  henet:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hen:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hepevt:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HERA:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  herbalizer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  her-lexer:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  her-lexer-parsec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hermes:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hermit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hermit-syb:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  herringbone-embed:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  herringbone:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  herringbone-wai:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hesql:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hetris:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  heukarya:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hevolisa-dph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hevolisa:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hexpat-iteratee:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hexpat-pickle-generic:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hexquote:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hF2:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hfann:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hfd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hfiar:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hfmt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hfoil:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hfractal:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HFrequencyQueue:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HFuse:                                        [ x86_64-darwin ]
-  hfusion:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hgalib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-API:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Audio:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Bullet-Binding:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-CAudio-Binding:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-CEGUI-Binding:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Common:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Data:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Enet-Binding:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Graphics3D:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-GUI:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-InputSystem:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Network:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Ogre-Binding:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-OIS-Binding:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-SDL2-Binding:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-SFML-Binding:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-WinEvent:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGamer3D-Wire:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hg-buildpackage:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hgen:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hgeometric:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hgeometry:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hgithub:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGL:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hgom:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  h-gpgme:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HGraphStorage:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hgrib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hharp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HHDL:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  H:                                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hiccup:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hichi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hidapi:                                       [ x86_64-darwin ]
-  hid:                                          [ x86_64-darwin ]
-  hieraclus:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hierarchical-clustering-diagrams:             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hiernotify:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hieroglyph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HiggsSet:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  higher-leveldb:                               [ x86_64-darwin ]
-  higherorder:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  highjson:                                     [ i686-linux ]
-  highWaterMark:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  himg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  himpy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hinduce-classifier-decisiontree:              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hinduce-classifier:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hinduce-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hinvaders:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hinze-streams:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hipbot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hipe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HipmunkPlayground:                            [ x86_64-darwin ]
-  Hipmunk:                                      [ x86_64-darwin ]
-  hircules:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hirt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hissmetrics:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  historian:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hist-pl-fusion:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hist-pl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hist-pl-lmf:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hjs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HJVM:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hlbfgsb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hlcm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HLearn-algebra:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HLearn-approximation:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HLearn-classification:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HLearn-datastructures:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HLearn-distributions:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hledger-chart:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hledger-vty:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hlibBladeRF:                                  [ x86_64-darwin ]
-  hlibev:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hlibfam:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hlogger:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HLogger:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hly:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HMap:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmark:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmarkup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-banded:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-mmap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-nipals:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-quadprogpp:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-repa:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-special:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-static:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-svdlibc:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmatrix-syntax:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmeap:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmeap-utils:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmenu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmm-hmatrix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HMM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hMollom:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmp3:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hmpf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmpfr:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hmumps:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hnetcdf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HNM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hnn:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoauth:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hobbes:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hobbits:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hob:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HODE:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hoed:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hofix-mtl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hogg:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hog:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hogre-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hogre:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hois:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hole:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Holumbus-Distribution:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Holumbus-MapReduce:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Holumbus-Searchengine:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Holumbus-Storage:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  homeomorphic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hommage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  homplexity:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HongoDB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  honi:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  honk:                                         [ x86_64-darwin ]
-  hoodie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoodle-builder:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoodle-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoodle-extra:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoodle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoodle-parser:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoodle-publish:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoodle-render:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoodle-types:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hood-off:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoovie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hopencc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hopencl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HOpenCV:                                      [ x86_64-darwin ]
-  hOpenPGP:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hopenpgp-tools:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hopfield:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hops:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hoq:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hosts-server:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hothasktags:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hp2any-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hp2any-graph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hp2any-manager:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpage:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpapi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpaste:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpasteit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HPath:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpc-tracer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hPDB-examples:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HPi:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hplayground:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hplaylist:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HPlot:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpodder:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HPong:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpqtypes:                                     [ x86_64-darwin ]
-  hprotoc-fork:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hps-cairo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpygments:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hpylos:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hquantlib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hranker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HRay:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hR:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hricket:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HROOT-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HROOT-graf:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HROOT-hist:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HROOT:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HROOT-io:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HROOT-math:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hruby:                                        [ i686-linux ]
-  hs2bf:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs2dot:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hs2lib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsbackup:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-blake2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsc2hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsc3-cairo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsc3-data:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsc3-forth:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsc3-graphs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsc3-lang:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsc3-lisp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsc3-plot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsc3-rec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsc3-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsc3-unsafe:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hscamwire:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-carbon-examples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hscassandra:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-cdb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsclock:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hscope:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsdev:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsdip:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsdns-cache:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-dotnet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-duktape:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hsed:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsfacter:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HSFFIG:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-ffmpeg:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-fltk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-gchart:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-gen-iface:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-GeoIP:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HSGEP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsgnutls:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsgnutls-yj:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsgsom:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HsHaruPDF:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HSHHelpers:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HsHyperEstraier:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hSimpleDB:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsimport:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-java:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-json-rpc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HsJudy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hskeleton:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hslackbuilder:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hslibsvm:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-logo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsmagick:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HSmarty:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-mesos:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Hsmtlib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsmtpclient:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsndfile-storablevector:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsnock:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-nombre-generator:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsns:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsntp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsoptions:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HSoundFile:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsparql:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsp-cgi:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hspear:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hspec-experimental:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hspec-shouldbe:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HsPerl5:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-pgms:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-pkpass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hspread:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hspresent:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsprocess:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsql-mysql:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsqml-datamodel:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsqml-datamodel-vinyl:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsqml-demo-morris:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsqml-demo-notes:                             [ x86_64-darwin ]
-  hsqml-demo-samples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsqml-morris:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsqml:                                        [ x86_64-darwin ]
-  hsseccomp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsSqlite3:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HsSVN:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hstats:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hstest:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hstidy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hstorchat:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hstradeking:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HStringTemplateHelpers:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-twitterarchiver:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-twitter:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hstyle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hstzaar:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsubconvert:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hs-vcard:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HSvm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hswip:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsXenCtrl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsx:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsx-xhtml:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hsyscall:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hszephyr:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HTab:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  htaglib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hTalos:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HTicTacToe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  html-entities:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  html-rules:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  htoml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  htsn-import:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  http-client-request-modifiers:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  http-conduit-browser:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  http-conduit-downloader:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  http-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  http-monad:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  http-proxy:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  https-everywhere-rules:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  http-shed:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  httpspec:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  http-test:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  htune:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  htzaar:                                       [ x86_64-darwin ]
-  hubris:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hugs2yc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hulk:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HulkImport:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hums:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HUnit-Diff:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hunit-gui:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HUnit-Plus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hunit-rematch:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hunt-searchengine:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hunt-server:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hurdle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  husky:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hutton:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  huzzy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hVOIDP:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hws:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hxmppc:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HXMPP:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hxournal:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  HXQ:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hxt-binary:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hxt-filter:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hxthelper:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hxweb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hybrid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hydra-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hydrogen-cli-args:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hydrogen-cli:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hydrogen-data:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hydrogen-parsing:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hydrogen-prelude:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hydrogen-prelude-parsec:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hydrogen-syntax:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hydrogen-util:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hyena:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hylolib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hylotab:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hyloutils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hyperdrive:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hyperpublic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  hypher:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  i18n:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ideas:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ideas-math:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  idiii:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  idna2008:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  IDynamic:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ieee-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iException:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  IFS:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ige-mac-integration:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  igraph:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ihaskell-inline-r:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ihaskell-widgets:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ihttp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  illuminate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  imagemagick:                                  [ i686-linux ]
-  imagepaste:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  imbib:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  imgurder:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  imm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  imparse:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  imperative-edsl-vhdl:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ImperativeHaskell:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  improve:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  INblobs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  inch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  incremental-computing:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  incremental-parser:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  incremental-sat-solver:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  increments:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  index-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  indices:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  indieweb-algorithms:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  infer-upstream:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  infinity:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  InfixApplicative:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  infix:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  inflist:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  influxdb:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  informative:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  inilist:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  inline-c-cpp:                                 [ x86_64-darwin ]
-  inline-r:                                     [ i686-linux ]
-  inline-r:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  instant-zipper:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  integer-pure:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  intel-aes:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  interleavableGen:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  interleavableIO:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  internetmarke:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  interpolatedstring-qq:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  interpolatedstring-qq-mwotton:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  intset:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  io-reactive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  IORefCAS:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  IOR:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iotransaction:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ipatch:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ipc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ipopt-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iptables-helpers:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iptadmin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Irc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  isevaluated:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ismtp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iteratee-compress:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iteratee:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iteratee-parsec:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iteratee-stm:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iterIO:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iterio-server:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iter-stats:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivor:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivory-backend-c:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivory-bitdata:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivory-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivory-hw:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivory:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivory-opts:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivory-quickcheck:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivory-stdlib:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ivy-web:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ixdopp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  iyql:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  j2hs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jack-bindings:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jackminimix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  JackMiniMix:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jack:                                         [ x86_64-darwin ]
-  jacobi-roots:                                 [ i686-linux ]
-  jacobi-roots:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jalla:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jammittools:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jarfind:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  java-bridge-extras:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  java-bridge:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  java-reflect:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  javasf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Javasf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  javav:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Javav:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jespresso:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  join:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  joinlist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jonathanscard:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jort:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jose-jwt:                                     [ i686-linux ]
-  jsc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  JsContracts:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  js-good-parts:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jsmw:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json2-hdbc:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json2:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-b:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  JSONb:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  JSON-Combinator-Examples:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  JSON-Combinator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  JsonGrammar:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-qq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jsonresume:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-rpc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jsonschema-gen:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  json-stream:                                  [ i686-linux ]
-  json-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jspath:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  judy:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  jukebox:                                      [ x86_64-darwin ]
-  JunkDB-driver-gdbm:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  JYU-Utils:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kafka-client:                                 [ x86_64-darwin ]
-  kangaroo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kansas-lava-cores:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kansas-lava:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kansas-lava-papilio:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kansas-lava-shake:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  karakuri:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  katt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-mvc-environment-gtk:              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-mvc-model-lightmodel:             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-mvc-model-protectedmodel:         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-mvc-solutions-gtk:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-reactive-fs:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-reactive-gtk:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-reactivelenses:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-reactive-network:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-reactive-polling:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-reactivevalues:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-reactive-wx:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-hails-reactive-yampa:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keera-posture:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keiretsu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Ketchup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kevin:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keyring:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  keystore:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kicad-data:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kickass-torrents-dump-parser:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  KiCS-debugger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  KiCS:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  KiCS-prophecy:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kif-parser:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kmeans-par:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  koellner-phonetic:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Konf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  korfu:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  kqueue:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ktx:                                          [ x86_64-darwin ]
-  kure-your-boilerplate:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  KyotoCabinet:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  labeled-graph:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  laborantin-hs:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  labyrinth:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  labyrinth-server:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lagrangian:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  laika:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdaBase:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdabot-core:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdabot-haskell-plugins:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdabot:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdabot-irc-plugins:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdabot-misc-plugins:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdabot-novelty-plugins:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdabot-reference-plugins:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdabot-social-plugins:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdabot-utils:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambda-bridge:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LambdaCalculator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambda-canvas:                                [ x86_64-darwin ]
-  lambdacat:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdacube-bullet:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdacube-engine:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdacube-examples:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdacube-gl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdacube:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdacube-samples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambda-devs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdaFeed:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LambdaHack:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LambdaINet:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdaLit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LambdaNet:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LambdaPrettyQuote:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LambdaShell:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambda-toolbox:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdatwit:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lambdiff:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lame-tester:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-bash:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-boogie:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-c-comments:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-c-inline:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-eiffel:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-go:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-java-classfile:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-mixal:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-objc:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-puppet:                              [ i686-linux ]
-  language-puppet:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-python-colour:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-qux:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-sh:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-spelling:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-sqlite:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  language-thrift:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Lastik:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  latest-npm-version:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  launchpad-control:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  layers-game:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  layers:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  layout-bootstrap:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  layout:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lazyarray:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lazysplines:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  l-bfgs-b:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lcs:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ldap-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ldif:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  leaf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  leaky:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  learn-physics-examples:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  learn-physics:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Level0:                                       [ x86_64-darwin ]
-  leveldb-haskell-fork:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  leveldb-haskell:                              [ x86_64-darwin ]
-  levmar-chart:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  levmar:                                       [ i686-linux ]
-  levmar:                                       [ x86_64-linux ]
-  lgtk:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lhae:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lha:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lhe:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LibClang:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libconfig:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libcspm:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libexpect:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libGenI:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libgraph:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libhbb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libjenkins:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  liblinear-enumerator:                         [ x86_64-darwin ]
-  libltdl:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  liboleg:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libpafe:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libpq:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libssh2-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libsystemd-daemon:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libsystemd-journal:                           [ x86_64-darwin ]
-  libvirt-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libxml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  libxslt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LibZip:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  life:                                         [ x86_64-darwin ]
-  lifter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lighttpd-conf:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lighttpd-conf-qq:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lilypond:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Limit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  limp-cbc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lin-alg:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linda:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linear-algebra-cblas:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linear-circuit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linear-maps:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linear-opengl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linearscan-hoopl:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LinearSplit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LinkChecker:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linkchk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linkcore:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linode:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linux-blkid:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linux-evdev:                                  [ x86_64-darwin ]
-  linux-file-extents:                           [ x86_64-darwin ]
-  linux-inotify:                                [ x86_64-darwin ]
-  linux-kmod:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linux-mount:                                  [ x86_64-darwin ]
-  linux-namespaces:                             [ x86_64-darwin ]
-  linux-perf:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  linux-ptrace:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lio-eci11:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lio-fs:                                       [ x86_64-darwin ]
-  lio-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  listlike-instances:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  list-t-html-parser:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  literals:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  live-sequencer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ll-picosat:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llsd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-analysis:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-base:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-base-types:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-base-util:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-data-interop:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-extra:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-ffi:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-general-quote:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-ht:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-tf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  llvm-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lmdb:                                         [ x86_64-darwin ]
-  lmonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lmonad-yesod:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  local-search:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  loch:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  locked-poll:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  log2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  log-effect:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  logging-facade-journald:                      [ x86_64-darwin ]
-  logic-classes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LogicGrowsOnTrees:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LogicGrowsOnTrees-MPI:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LogicGrowsOnTrees-network:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LogicGrowsOnTrees-processes:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  log:                                          [ x86_64-darwin ]
-  lojban:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lojbanParser:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lojbanXiragan:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lojysamban:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lol:                                          [ i686-linux ]
-  loli:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  loop-effin:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  loopy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lord:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  loris:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lostcities:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lp-diagrams-svg:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lscabal:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  L-seed:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  LslPlus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ls-usb:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lsystem:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  luachunk:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lucienne:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Lucu:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lui:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  luka:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  luminance-samples:                            [ x86_64-darwin ]
-  lushtags:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  luthor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lvish:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lvmlib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lxc:                                          [ x86_64-darwin ]
-  lye:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  lzma:                                         [ i686-linux ]
-  lzma-streams:                                 [ i686-linux ]
-  mage:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MagicHaskeller:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  magico:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mahoro:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  majordomo:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  majority:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-all:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-anything:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-browser:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-curl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-editor:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-filemanager:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-imageviewer:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-ircclient:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-mplayer:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-pdfviewer:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-processmanager:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-reader:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-template:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-terminal:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  manatee-welcome:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mandulia:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mangopay:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  marionetta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  markdown2svg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  markdown-kate:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  markdown-pap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  markov-processes:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  markup-preview:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  marmalade-upload:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  marquise:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  marxup:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  masakazu-bot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  matchers:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mathblog:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mathlink:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  matlab:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  matsuri:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  maude:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  maxent:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  maxsharing:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  maybench:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MaybeT:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MaybeT-monads-tf:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MaybeT-transformers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MazesOfMonad:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mbox-tools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MC-Fold-DP:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mcmaster-gloss-examples:                      [ x86_64-darwin ]
-  mcmc-samplers:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mdcat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Measure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mecab:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mediawiki2latex:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mediawiki:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  medium-sdk-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  meep:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mega-sdist:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  melody:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  memo-sqlite:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  meta-par-accelerate:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  metaplug:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  metric:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Metrics:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  metronome:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mfsolve:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Mhailist:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MHask:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Michelangelo:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  microlens-contra:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  midi-alsa:                                    [ x86_64-darwin ]
-  midimory:                                     [ x86_64-darwin ]
-  midisurface:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mighttpd2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mighttpd:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mikmod:                                       [ x86_64-darwin ]
-  mime-directory:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mime-string:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  minesweeper:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MiniAgda:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  miniball:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  miniforth:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  minimung:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  minioperational:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  miniplex:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  minirotate:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  minisat:                                      [ x86_64-darwin ]
-  ministg:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mirror-tweet:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  missing-py2:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MissingPy:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mix-arrows:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mkbndl:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mlist:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ml-w:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mmtl-base:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mmtl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  moan:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  modelicaparser:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  modsplit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  modular-prelude-classy:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  modular-prelude:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  module-management:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Moe:                                          [ x86_64-darwin ]
-  mohws:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-abort-fd:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monadacme:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-atom:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-atom-simple:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MonadCatchIO-mtl-foreign:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MonadCatchIO-transformers-foreign:            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-exception:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monadiccp-gecode:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monadiccp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-interleave:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Monadius:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MonadLab:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-levels:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-lrs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-memo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-mersenne-random:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  MonadRandomLazy:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-ran:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-stlike-io:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-stlike-stm:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-tx:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monad-unify:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monarch:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Monaris:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Monatron:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Monatron-IO:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mongodb-queue:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mongrel2-handler:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monitor:                                      [ x86_64-darwin ]
-  Monocle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mono-foldable:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monoid-owns:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monoidplus:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monoids:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monoid-subclasses:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  monte-carlo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  moo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  morfette:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  morfeusz:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mosaico-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mount:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mp3decoder:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mpdmate:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mp:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mpppc:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mpretty:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mprover:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mps:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mpvguihs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  msgpack-idl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  msh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  msi-kb-backlit:                               [ x86_64-darwin ]
-  mtgoxapi:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mtl-tf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mtlx:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mtp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mudbath:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  multi-cabal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  multifocal:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  multipass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  multiplate-simplified:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  multirec-alt-deriver:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  multirec-binary:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  multisetrewrite:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  murder:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  murmurhash3:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  musicbrainz-email:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  music-graphics:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  music-parts:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  music-preludes:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  music-score:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  music-sibelius:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  music-suite:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  music-util:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  musicxml:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mustache2hs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mustache:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mutable-iter:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mvclient:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mvc-updates:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  myo:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mysnapsession-example:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mysnapsession:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mysql-simple-quasi:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mysql-simple-typed:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  myTestlll:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  mzv:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nagios-plugin-ekg:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  named-lock:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nanoAgda:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nano-cryptr:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nanocurses:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nano-hmac:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nano-md5:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nanomsg:                                      [ x86_64-darwin ]
-  narc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nats-queue:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  natural-number:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  neat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  needle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nehe-tuts:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nerf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nero:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nero-wai:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nero-warp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nested-routes:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  netcore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  netlines:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  NetSNMP:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  netspec:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nettle-frp:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nettle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nettle-netkit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nettle-openflow:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  netwire-input-glfw:                           [ x86_64-darwin ]
-  network-address:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-builder:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-bytestring:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-connection:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-fancy:                                [ i686-linux ]
-  network-interfacerequest:                     [ x86_64-darwin ]
-  network-minihttp:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-netpacket:                            [ x86_64-darwin ]
-  network-rpca:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-simple-tls:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-topic-models:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-transport-amqp:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  network-websocket:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  newports:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  newsynth:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  newt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  newtype-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  NGrams:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  niagra:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nibblestring:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nikepub:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nimber:                                       [ i686-linux ]
-  Ninjas:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nitro:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nixfromnpm:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nkjp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nme:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nm:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nntp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  noise:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Nomyx-Core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Nomyx:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Nomyx-Language:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Nomyx-Rules:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Nomyx-Web:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  NonEmptyList:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  noodle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  NoSlow:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  not-gloss-examples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  not-gloss:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  notmuch-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  notmuch-web:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  np-linear:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nptools:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nthable:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  NTRU:                                         [ i686-linux ]
-  null-canvas:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  NumberSieves:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  numerals-base:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  numerals:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  numeric-qq:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Nussinov78:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nvim-hs-contrib:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nvim-hs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  NXTDSL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  NXT:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  nymphaea:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  oberon0:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Object:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  objectid:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ObjectIO:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  obj:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  octopus:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  oculus:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OddWord:                                      [ i686-linux ]
-  OGL:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ohloh-hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  oidc-client:                                  [ i686-linux ]
-  oidc-client:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  oi:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ois-input-manager:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  omaketex:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  omega:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Omega:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  omnicodec:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  on-a-horse:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  one-liner:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  oneormore:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  onu-course:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OpenAFP:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OpenAFP-Utils:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OpenAL:                                       [ x86_64-darwin ]
-  OpenCL:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OpenCLRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  opencog-atomspace:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  opencv-raw:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  openexchangerates:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  openflow:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OpenGLCheck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  opengles:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OpenGLRaw21:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OpenGL:                                       [ x86_64-darwin ]
-  openid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  open-pandoc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  openpgp-crypto-api:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  openpgp-Crypto:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OpenSCAD:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  openssh-github-keys:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  opentheory-char:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  open-typerep:                                 [ i686-linux ]
-  open-union:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OpenVG:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OpenVGRaw:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  open-witness:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Operads:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  opml-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  optimal-blocks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  optimusprime:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OrchestrateDB:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  orchestrate:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  orchid-demo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  orchid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  order-maintenance:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  orgmode-parse:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  origami:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  osm-download:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  OSM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ot:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  package-vt:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  packedstring:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  packman:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  padKONTROL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PageIO:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pam:                                          [ x86_64-darwin ]
-  panda:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PandocAgda:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pandoc-unlit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  papillon:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pappy:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  paragon:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Paraiso:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parallel-tasks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parameterized-data:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parco-attoparsec:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parco:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parconc-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parco-parsec:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parport:                                      [ x86_64-darwin ]
-  Parry:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parse-help:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parsely:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parser241:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parser-helper:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  parsestar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  partial-lens:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  partly:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  passage:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pastis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pasty:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Pathfinder:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pathfindingcore:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  patterns:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  paypal-adaptive-hoops:                        [ i686-linux ]
-  paypal-adaptive-hoops:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  paypal-api:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pb:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PCLT-DB:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PCLT:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pdynload:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  peakachu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pec:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  peg:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pell:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  penny-bin:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  penny:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  penny-lib:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  peparser:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  perdure:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PerfectHash:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  perm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PermuteEffects:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  permute:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  persistent-hssqlppp:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  persistent-map:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  persistent-protobuf:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pesca:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  peyotls-codec:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  peyotls:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pez:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pg-harness:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pg-harness-server:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pgsql-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pgstream:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  phasechange:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  phone-numbers:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  phone-push:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  phooey:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  photoname:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  phraskell:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Phsu:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  phybin:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pianola:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pi-calculus:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  picoparsec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  piet:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  piki:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Pipe:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-cereal-plus:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-conduit:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-courier:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-files:                                  [ i686-linux ]
-  pipes-network-tls:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-p2p-examples:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pipes-transduce:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pisigma:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pit:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pkggraph:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  planar-graph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  plat:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  plist-buddy:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  plivo:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PlslTools:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  plugins-auto:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  plugins-multistage:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  plumbers:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ply-loader:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  png-file:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pngload-fixed:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pngload:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pocket-dns:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pointless-lenses:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pointless-rewrite:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  polar-configfile:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  polh-lexicon:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Pollutocracy:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  polynom:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  polyseq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  polysoup:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  polytypeable:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  polytypeable-utils:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pontarius-mediaserver:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pontarius-xmpp:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pontarius-xpmn:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pool-conduit:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pool:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  popenhs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  poppler:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  portaudio:                                    [ x86_64-darwin ]
-  porte:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  porter:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PortMidi:                                     [ x86_64-darwin ]
-  ports:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  posix-acl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  posix-realtime:                               [ x86_64-darwin ]
-  posix-waitpid:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PostgreSQL:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  postgresql-simple-typed:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  postgresql-typed:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  postgrest:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  postie:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  postmaster:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  powermate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  powerpc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pqc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pqueue-mtl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  practice-room:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  precis:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prednote-test:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pred-trie:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prefork:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pregame:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prelude-generalize:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prelude-plus:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  preprocess-haskell:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  press:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  presto-hdbc:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  primula-board:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  primula-bot:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  printf-mauke:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Printf-TH:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  printxosd:                                    [ x86_64-darwin ]
-  PriorityChansConverger:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  priority-queue:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ProbabilityMonads:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  processing:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  process-iterio:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  process-leksah:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  process-listlike:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  process-progress:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  process-qq:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proc:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  procrastinating-structure:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  procrastinating-variable:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  procstat:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prof2dot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  progressbar:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  progress:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  progression:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  progressive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proj4-hs-bindings:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prolog-graph:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prolog-graph-lib:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prolog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  propane:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Proper:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proplang:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proteaaudio:                                  [ x86_64-darwin ]
-  protobuf-native:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  protocol-buffers-descriptor-fork:             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  protocol-buffers-fork:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  prove-everywhere-server:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  proxy-kindness:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pub:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  publicsuffixlistcreate:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pubnub:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pubsub:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  puffytools:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pugixml:                                      [ x86_64-darwin ]
-  pugs-hsregex:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pugs-HsSyck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Pugs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  PUH-Project:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pulse-simple:                                 [ x86_64-darwin ]
-  punkt:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Pup-Events-Demo:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  puppetresources:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pushme:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  push-notify-ccs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  push-notify-general:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  push-notify:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  putlenses:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  puzzle-draw-cmdline:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  puzzle-draw:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  pvd:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  python-pickle:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  qd:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  qd-vec:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  qed:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  qhull-simple:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  QIO:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  qt:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  QuadEdge:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quadratic-irrational:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quantum-arrow:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  qudb:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quenya-verb:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  querystring-pickle:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  queuelike:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  QuickAnnotate:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  QuickCheck-GenT:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quickcheck-poly:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quickcheck-rematch:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quickpull:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quickset:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Quickson:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quicktest:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  quoridor-hs:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  qux:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rabocsv2qif:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rad:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  radium-formula-parser:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  radium:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rados-haskell:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rail-compiler-editor:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rainbow-tests:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Raincat:                                      [ x86_64-darwin ]
-  rakhana:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ralist:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rallod:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  randfile:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  random-access-list:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RandomDotOrg:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  random-eff:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  random-effin:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  random-hypergeometric:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  random-stream:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  random-variates:                              [ i686-linux ]
-  rand-vars:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rangemin:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Ranka:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Rasenschach:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  raven-haskell-scotty:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rbr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rcu:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rdf4h:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rdioh:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  re2:                                          [ x86_64-darwin ]
-  reaction-logic:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive-bacon:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive-balsa:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive-banana-sdl:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive-banana-threepenny:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive-banana-wx:                           [ x86_64-darwin ]
-  reactive-fieldtrip:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive-glut:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactive-thread:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reactor:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  really-simple-xml-parser:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reasonable-lens:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  record-aeson:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  record-gl:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  record-preprocessor:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  records:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  records-th:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  record-syntax:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  redHandlers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Redmine:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reedsolomon:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Referees:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  refh:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ref:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Ref:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflection-extras:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflex-animation:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflex-dom-contrib:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflex-dom:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflex-gloss:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflex-gloss-scene:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reflex-transformers:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regex-deriv:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regex-dfa:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regex-parsec:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regex-pderiv:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regexp-tries:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regexqq:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regex-tdfa-utf8:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regex-tre:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regex-xmlschema:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regional-pointers:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regions:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regions-monadsfd:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regions-monadstf:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regions-mtl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regular-extras:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  regular-web:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reheat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reified-records:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reify:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rei:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reinterpret-cast:                             [ i686-linux ]
-  relational-postgresql8:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  remote:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  remotion:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  reorderable:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  repa-array:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  repa-flow:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  repa-plugin:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  repa-series:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  repa-stream:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  repa-v4l2:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  repl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  repo-based-blog:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  representable-functors:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  representable-tries:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  repr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  resistor-cube:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  resource-embed:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  resource-simple:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  respond:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  restful-snap:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RESTng:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  restricted-workers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  restyle:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  resumable-exceptions:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rethinkdb-model:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ReviewBoard:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rewrite:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rewriting:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rezoom:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rfc3339:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rhythm-game-tutorial:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  riemann:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  riot:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ripple-federation:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ripple:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  risc386:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rivers:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RJson:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rmonad:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RMP:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RNAdesign:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RNAdraw:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RNAFold:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RNAFoldProgs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RNAwolf:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  roguestar-engine:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  roguestar-gl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  roguestar-glut:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  roguestar:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RollingDirectory:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rope:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rosa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  roshask:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rosso:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rotating-log:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rounding:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  roundtrip-aeson:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  roundtrip:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  roundtrip-string:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  roundtrip-xml:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  route-generator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  route-planning:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rowrecord:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rpc-framework:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rpc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rpm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rsagl-frp:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rsagl:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rsagl-math:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rss2irc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rtcm:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rtlsdr:                                       [ x86_64-darwin ]
-  rtorrent-rpc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rubberband:                                   [ x86_64-darwin ]
-  ruff:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ruler-core:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  rungekutta:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  RxHaskell:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  safe-freeze:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  safe-globals:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  safe-lazy-io:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  safe-plugins:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  safer-file-handles-bytestring:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  safer-file-handles:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  safer-file-handles-text:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sai-shape-syb:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Salsa:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  saltine-quickcheck:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  salvia-demo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  salvia-extras:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  salvia:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  salvia-protocol:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  salvia-sessions:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  salvia-websocket:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  samtools-iteratee:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sarasvati:                                    [ x86_64-darwin ]
-  sasl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  satchmo-backends:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  satchmo-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  satchmo-funsat:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  satchmo-minisat:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  satchmo-toysat:                               [ x86_64-darwin ]
-  satchmo:                                      [ x86_64-darwin ]
-  sat:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sat-micro-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SBench:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sbp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sbvPlugin:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scaleimage:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scalp-webhooks:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scan-vector-machine:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scc:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scenegraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  schedevr:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scholdoc-citeproc:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scholdoc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  science-constants-dimensional:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SciFlow:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scion-browser:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scion:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scope-cairo:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scope:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scottish:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scotty-blaze:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scotty-fay:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scotty-hastache:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scotty-session:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scrabble-bot:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ScratchFs:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scrobble:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scroll:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  scrz:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Scurry:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sdl2-cairo:                                   [ x86_64-darwin ]
-  sdl2-compositor:                              [ x86_64-darwin ]
-  sdl2-image:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sdl2:                                         [ x86_64-darwin ]
-  SDL-gfx:                                      [ x86_64-darwin ]
-  SDL-image:                                    [ x86_64-darwin ]
-  SDL-mixer:                                    [ x86_64-darwin ]
-  SDL-mpeg:                                     [ x86_64-darwin ]
-  SDL-ttf:                                      [ x86_64-darwin ]
-  SDL:                                          [ x86_64-darwin ]
-  sdr:                                          [ i686-linux, x86_64-darwin ]
-  sdr:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  seacat:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  search:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  secdh:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  secp256k1:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  secret-santa:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  secret-sharing:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  secrm:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sednaDBXML:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  selectors:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  select:                                       [ x86_64-darwin ]
-  selenium:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  selenium-server:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  selinux:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Semantique:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  semigroups-actions:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  semi-iso:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  semiring:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  semver-range:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sensenet:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sentry:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  seqaid:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  seqalign:                                     [ i686-linux ]
-  SeqAlign:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  seqloc-datafiles:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sequent-core:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sequor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-pool:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-postgresql:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  servant-scotty:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ses-html-snaplet:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SessionLogger:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sessions:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  set-cover:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  set-with:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sexp-grammar:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sexp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sexpr:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sfml-audio:                                   [ x86_64-darwin ]
-  SFML-control:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SFML:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SFont:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SGdemo:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SG:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sgrep:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shadower:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shady-gen:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shady-graphics:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shake-extras:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shaker:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shapely-data:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shared-buffer:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  she:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Shellac-compatline:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Shellac-editline:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Shellac-haskeline:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Shellac:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Shellac-readline:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shellish:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shell-pipe:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  showdown:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  shpider:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Shu-thing:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sifflet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sifflet-lib:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  signals:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simgi:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-bluetooth:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-css:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-c-value:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-firewire:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-form:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SimpleGL:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SimpleH:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simpleirc:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simpleirc-lens:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SimpleLog:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-log-syslog:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simplenote:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-pascal:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-postgresql-orm:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simpleprelude:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-session:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simplessh:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-templates:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simple-vec3:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  simseq:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sindre:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sirkel:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sized:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  skeleton:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  skype4hs:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  slack:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  slidemews:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Slides:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sloth:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  smallarray:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  smallpt-hs:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  smallstring:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  smartGroup:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  smartword:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sme:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Smooth:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  smt-lib:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  smtp2mta:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  smtp-mail-ng:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snake-game:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-accept:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-extras:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-actionlog:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-css-min:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-environments:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-hasql:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-haxl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-hdbc:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-i18n:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-influxdb:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-mongoDB:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-mongodb-minimalistic:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-mysql-simple:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-oauth:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-redson:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-rest:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-sedna:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-sqlite-simple:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-tasks:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-typed-sessions:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snaplet-wordpress:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-predicates:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snappy-conduit:                               [ x86_64-darwin ]
-  snappy-framing:                               [ x86_64-darwin ]
-  snappy-iteratee:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snappy:                                       [ x86_64-darwin ]
-  snap-testing:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snap-utils:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sndfile-enumerators:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SNet:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snm:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snowglobe:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  snow-white:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Snusmumrik:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SoccerFunGL:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SoccerFun:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sock2stream:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  socketio:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  socket-sctp:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sonic-visualiser:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SoOSiM:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sorted:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sound-collage:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  source-code-server:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SourceGraph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sousit:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  soxlib:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  soyuz:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SpaceInvaders:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SpacePrivateers:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  spanout:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sparsebit:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sparsecheck:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sparse:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  spata:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  special-functors:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  specialize-th:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sphero:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sphinx-cli:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  spice:                                        [ x86_64-darwin ]
-  spike:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  splaytree:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  spline3:                                      [ i686-linux ]
-  splines:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  split-record:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  splot:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Spock-auth:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  spoonutil:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  spoty:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Sprig:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  spsa:                                         [ i686-linux ]
-  spsa:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  spy:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sqlite-simple-typed:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sql-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sql-simple-mysql:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sql-simple-pool:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sql-simple-postgresql:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sql-simple-sqlite:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  squeeze:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  srcinst:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ssh:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sssp:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sstable:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stable-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stackage-curator:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stack-hpc-coveralls:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stack-prism:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stack-run-auto:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  starrover2:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stateful-mtl:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  statgrab:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  statistics-dirichlet:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  statistics-fusion:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stb-truetype:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  step-function:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stepwise:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stm-chunked-queues:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stmcontrol:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Stomp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stopwatch:                                    [ x86_64-darwin ]
-  storable-static-array:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  storablevector-carray:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  storablevector:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  storablevector-streamfusion:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Strafunski-Sdf2Haskell:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stratum-tool:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  streamed:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stream-fusion:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  streaming-utils:                              [ i686-linux ]
-  StrictBench:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  strict-concurrency:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stringlike:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  structured-mongoDB:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  structures:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  stunts:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  subhask:                                      [ i686-linux ]
-  subhask:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  subleq-toolchain:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sub-state:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  suitable:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sunlight:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sunroof-compiler:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sunroof-examples:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sunroof-server:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  supercollider-midi:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  superdoc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  supero:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  supervisor:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  svg2q:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SVG2Q:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  svm-simple:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  svndump:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  swapper:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  swearjure:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  swf:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  swift-lda:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sws:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syb-extras:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sylvia:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sym-plot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  sync:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syncthing-hs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syntactic:                                    [ i686-linux ]
-  syntax-attoparsec:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syntax-example:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syntax-example-json:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syntax:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  SyntaxMacros:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syntax-pretty:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syntax-printer:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syntax-trees-fork-bairyn:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  syntax-trees:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  synthesizer-alsa:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  synthesizer-core:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  synthesizer-dimensional:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  synthesizer-filter:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  synthesizer:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  synthesizer-llvm:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  synthesizer-midi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Sysmon:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  system-canonicalpath:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  system-lifted:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  system-random-effect:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  system-time-monotonic:                        [ x86_64-darwin ]
-  tables:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Tables:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tablestorage:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tabloid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tagged-list:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tagged-th:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tagsoup-ht:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tagsoup-parsec:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ta:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Takusen:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  takusen-oracle:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tamarin-prover:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tamarin-prover-term:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tamarin-prover-theory:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tamarin-prover-utils:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  task:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tasty-integrate:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TBC:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TBit:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tbox:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tccli:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tcp:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tdd-util:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TeaHS:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  teams:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  telegram-api:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  telegram:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  template-default:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  template-haskell-util:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  template-hsml:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  template-yj:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tempodb:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  temporal-csound:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tempus:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tensor:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  termbox-bindings:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  term-rewriting:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  terntup:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  terrahs:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  test-framework-doctest:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  test-framework-quickcheck:                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  testloop:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  testpack:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  testpattern:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  testPkg:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  testrunner:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tetris:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tex2txt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  texrunner:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-json-qq:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  textmatetags:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-normal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-register-machine:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-xml-generic:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  text-xml-qq:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tfp-th:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tftp:                                         [ x86_64-darwin ]
-  th-context:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  themoviedb:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Theora:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  theoremquest-client:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  thih:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  thimk:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Thingie:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  th-instances:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  th-kinds:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  threads-supervisor:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Thrift:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tickle:                                       [ i686-linux ]
-  tickle:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tic-tac-toe:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TicTacToe:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tidal-midi:                                   [ x86_64-darwin ]
-  tiger:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tighttp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timberc:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timecalc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  time-extras:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  time-exts:                                    [ i686-linux ]
-  time-http:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timeout:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timeparsers:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TimePiece:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timeplot:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  time-qq:                                      [ i686-linux ]
-  time-recurrence:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timerep:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  time-series:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  timestamp-subprocess-lines:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  time-w3c:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TinyLaunchbury:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TinyURL:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tip-haskell-frontend:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Titim:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tkhs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tkyprof:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tls-extra:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  todos:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  to-haskell:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  toilet:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  toktok:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tokyocabinet-haskell:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tokyotyrant-haskell:                          [ x86_64-darwin ]
-  tomato-rubato-openal:                         [ x86_64-darwin ]
-  toml:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Top:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  topkata:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  torch:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  to-string-class:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  to-string-instances:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Tournament:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tracker:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  trajectory:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  transactional-events:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  transformers-convert:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  transformers-runnable:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  transient:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  translate:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  traypoweroff:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tremulous-query:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TrendGraph:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  trhsx:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  triangulation:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TrieMap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  trimpolya:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tsession-happstack:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tsession:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tskiplist:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tsp-viz:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tuntap:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tuple-gen:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tupleinstances:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tuple-morph:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  turing-music:                                 [ x86_64-darwin ]
-  twentefp-eventloop-trees:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twentefp-rosetree:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twentefp:                                     [ x86_64-darwin ]
-  twhs:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twidge:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twilight-stm:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twilio:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twill:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twiml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twine:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twisty:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twitch:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twitter-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twitter-enumerator:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twitter:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twitter-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  twitter-types-lens:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tx:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TYB:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typalyze:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typeable-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-cereal:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TypeClass:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-digits:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typedquery:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typed-wire:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-equality-check:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typehash:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  TypeIlluminator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-int:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-level-bst:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-level:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-level-sets:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typelevel-tensor:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-ord:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-ord-spine-cereal:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typeparams:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  typescript-docs:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-settheory:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-spine:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-structure:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  type-sub-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  tz:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uAgda:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uberlast:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uconv:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  udbus:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  udbus-model:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  udev:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uhc-light:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ui-command:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  UISF:                                         [ x86_64-darwin ]
-  UMM:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unamb-custom:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unbounded-delays-units:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unboxed-containers:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unicode-normalization:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unicoder:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uniform-io:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  union-map:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uniqueid:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unittyped:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  universe-th:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unix-process-conduit:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Unixutils-shadow:                             [ x86_64-darwin ]
-  unlit:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unordered-containers-rematch:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unpack-funcs:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  unscramble:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  up:                                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uploadcare:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  upskirt:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ureader:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  urembed:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uri-conduit:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uri-enumerator-file:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uri-enumerator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  urlcheck:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  urldecode:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  urldisp-happstack:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  UrlDisp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  url-generic:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  URLT:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  urxml:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  usb-enumerator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  usb-iteratee:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  usb-safe:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  utf8-prelude:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  UTFTConverter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uuagc-diagrams:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uvector-algorithms:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  uvector:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  v4l2-examples:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  v4l2:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vacuum-cairo:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vacuum-graphviz:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vacuum:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vacuum-opengl:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vacuum-ubigraph:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vampire:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  var:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vaultaire-common:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vcache-trie:                                  [ x86_64-darwin ]
-  vcache:                                       [ x86_64-darwin ]
-  vcard:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Vec-Boolean:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Vec-OpenGLRaw:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vect-opengl:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vector-bytestring:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vector-clock:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vector-conduit:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vector-functorlazy:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vector-instances-collections:                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vector-random:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vector-read-instances:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vector-space-opengl:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vector-static:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Vec-Transform:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  verilog:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  versions:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vigilance:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vimeta:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vintage-basic:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vinyl-gl:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vinyl-json:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vinyl-vectors:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  virthualenv:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vision:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  visual-graphrewrite:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  visual-prof:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vivid:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vk-aws-route53:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vorbiscomment:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vowpal-utils:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  voyeur:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vtegtk3:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vte:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vty-examples:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vty-menu:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  vty-ui-extras:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-graceful:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-handler-devel:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-handler-snap:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-handler-webkit:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-hastache:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-lite:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-logger-prefork:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-middleware-cache:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-middleware-cache-redis:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-middleware-catch:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-middleware-crowd:                         [ i686-linux ]
-  wai-middleware-headers:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-middleware-hmac-client:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-middleware-preprocessor:                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-middleware-route:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-middleware-static-caching:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-session-tokyocabinet:                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-static-cache:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wai-throttler:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  warp-dynamic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  warp-static:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  warp-tls-uid:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WashNGo:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  watchdog:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  watcher:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  watchit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WaveFront:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wavesurfer:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  weather-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webapi:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webapp:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WebBits-Html:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WebBits-multiplate:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-browser-in-haskell:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WebCont:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webcrank-dispatch:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webcrank-wai:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webdriver-snoy:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-encodings:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webify:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webkit-javascriptcore:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-mongrel2:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Webrexp:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-routes-quasi:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  web-routes-transformers:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webserver:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  websnap:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  webwire:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wedged:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  weighted-regexp:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  welshy:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Wheb:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wheb-mongo:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wheb-redis:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wheb-strapped:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  whim:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  whitespace:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WikimediaParser:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wikipedia4epub:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  windowslive:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  winerror:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  winio:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Wired:                                        [ x86_64-darwin ]
-  WL500gPControl:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wlc-hs:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WMSigner:                                     [ i686-linux ]
-  wobsurv:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  woffex:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wolf:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  word24:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WordAlignment:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Wordlint:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WordNet-ghc74:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WordNet:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wordsearch:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  workflow-osx:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wp-archivebot:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wraxml:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wright:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wsdl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wtk-gtk:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wtk:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wumpus-basic:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wumpus-core:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wumpus-drawing:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wumpus-microprint:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wumpus-tree:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WURFL:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wxcore:                                       [ x86_64-darwin ]
-  wxc:                                          [ x86_64-darwin ]
-  WXDiffCtrl:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wxFruit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  WxGeneric:                                    [ x86_64-darwin ]
-  wxhnotepad:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wxturtle:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  wx:                                           [ x86_64-darwin ]
-  wyvern:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  X11-extras:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  X11-rm:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  X11-xdamage:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  X11-xfixes:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  x11-xinput:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xattr:                                        [ x86_64-darwin ]
-  xbattbar:                                     [ x86_64-darwin ]
-  xchat-plugin:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  x-dsp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Xec:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xfconf:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xhaskell-library:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xhb-ewmh:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xine:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xing-api:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xkbcommon:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xkcd:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xlsx:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xlsx-templater:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml2json:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml2x:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml-catalog:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml-enumerator-combinators:                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml-enumerator:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  XmlHtmlWriter:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml-parsec:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml-pipe:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml-prettify:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml-push:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml-query-xml-conduit:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xml-query-xml-types:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xmltv:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xmms2-client-glib:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xmms2-client:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  XMMS:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xmobar:                                       [ x86_64-darwin ]
-  xmonad-bluetilebranch:                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xmonad-contrib-bluetilebranch:                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xmonad-eval:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xmonad-utils:                                 [ x86_64-darwin ]
-  xmpipe:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  XMPP:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xosd:                                         [ x86_64-darwin ]
-  xournal-builder:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xournal-convert:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xournal-parser:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xournal-render:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xournal-types:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xsact:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  XSaiga:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xslt:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  xtc:                                          [ x86_64-darwin ]
-  y0l0bot:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Yablog:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  YACPong:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yahoo-web-search:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yajl-enumerator:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yajl:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yaml2owl:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  YamlReference:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yaml-rpc:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yaml-rpc-scotty:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yaml-rpc-snap:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yaml-union:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yampa2048:                                    [ x86_64-darwin ]
-  yampa-canvas:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yampa-glfw:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yampa-glut:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yaop:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yarr:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yarr-image-io:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yate:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yavie:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ycextra:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-angular-ui:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-auth-ldap:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-auth-ldap-native:                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-auth-pam:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-auth-smbclient:                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-comments:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-content-pdf:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-continuations:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-datatables:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-examples:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-goodies:                                [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-links:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-mangopay:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-paginate:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-pagination:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-pure:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-purescript:                             [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-raml-bin:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-raml-mock:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-routes-typescript:                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-rst:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-s3:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-session-redis:                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-tableview:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-test-json:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-tls:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-vend:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yesod-worker:                                 [ i686-linux, x86_64-linux, x86_64-darwin ]
-  YFrob:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yhccore:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yices:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yi-contrib:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yi-rope:                                      [ x86_64-darwin ]
-  yjftp:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Yogurt:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Yogurt-Standalone:                            [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yoko:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  york-lava:                                    [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yql:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yuiGrid:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yuuko:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  yxdb-utils:                                   [ i686-linux ]
-  z3:                                           [ x86_64-darwin ]
-  zampolit:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zasni-gerna:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zendesk-api:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zeno:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ZEO:                                          [ x86_64-darwin ]
-  zerobin:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zeromq3-conduit:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zeromq3-haskell:                              [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zeromq-haskell:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zeroth:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ZFS:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zipedit:                                      [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ZMachine:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zmcat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zmqat:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zoneinfo:                                     [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zoom-cache:                                   [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zoom-cache-pcm:                               [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zoom-cache-sndfile:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zoom:                                         [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zot:                                          [ i686-linux, x86_64-linux, x86_64-darwin ]
-  zsh-battery:                                  [ i686-linux, x86_64-linux, x86_64-darwin ]
-  ztail:                                        [ i686-linux, x86_64-linux, x86_64-darwin ]
-  Zwaluw:                                       [ i686-linux, x86_64-linux, x86_64-darwin ]
-  fltkhs-hello-world:                           [ i686-linux, x86_64-linux, x86_64-darwin ]
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.0.nix b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
index 6137adecf0ca..2486d91b95af 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.0.nix
@@ -3777,6 +3777,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4347,7 +4348,9 @@ self: super: {
   "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";
@@ -6314,6 +6317,7 @@ self: super: {
   "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";
@@ -6329,6 +6333,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8343,6 +8348,7 @@ self: super: {
   "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";
@@ -8368,6 +8374,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8652,6 +8659,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8698,6 +8706,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.1.nix b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
index b01ec9391bf7..9ec9fd73f469 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.1.nix
@@ -3777,6 +3777,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4347,7 +4348,9 @@ self: super: {
   "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";
@@ -6314,6 +6317,7 @@ self: super: {
   "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";
@@ -6329,6 +6333,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8343,6 +8348,7 @@ self: super: {
   "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";
@@ -8368,6 +8374,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8652,6 +8659,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8698,6 +8706,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.2.nix b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
index a960665bd201..6f09f2d24182 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.2.nix
@@ -3777,6 +3777,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4347,7 +4348,9 @@ self: super: {
   "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";
@@ -6314,6 +6317,7 @@ self: super: {
   "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";
@@ -6329,6 +6333,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8343,6 +8348,7 @@ self: super: {
   "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";
@@ -8368,6 +8374,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8652,6 +8659,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8698,6 +8706,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.3.nix b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
index bd8ec9285b53..a24c6905c07a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.3.nix
@@ -3777,6 +3777,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4347,7 +4348,9 @@ self: super: {
   "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";
@@ -6314,6 +6317,7 @@ self: super: {
   "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";
@@ -6329,6 +6333,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8343,6 +8348,7 @@ self: super: {
   "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";
@@ -8368,6 +8374,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8652,6 +8659,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8698,6 +8706,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.4.nix b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
index 03c9cbf1302a..f979f700e91e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.4.nix
@@ -3776,6 +3776,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4344,7 +4345,9 @@ self: super: {
   "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";
@@ -6311,6 +6314,7 @@ self: super: {
   "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";
@@ -6326,6 +6330,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8339,6 +8344,7 @@ self: super: {
   "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";
@@ -8364,6 +8370,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8648,6 +8655,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8694,6 +8702,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.5.nix b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
index 8ad110b26272..6ee51f7c6994 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.5.nix
@@ -3776,6 +3776,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4344,7 +4345,9 @@ self: super: {
   "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";
@@ -6311,6 +6314,7 @@ self: super: {
   "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";
@@ -6326,6 +6330,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8339,6 +8344,7 @@ self: super: {
   "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";
@@ -8364,6 +8370,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8648,6 +8655,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8694,6 +8702,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.6.nix b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
index a68ffba5febe..8fe1d730c807 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.6.nix
@@ -3775,6 +3775,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4342,7 +4343,9 @@ self: super: {
   "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";
@@ -6309,6 +6312,7 @@ self: super: {
   "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";
@@ -6324,6 +6328,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8336,6 +8341,7 @@ self: super: {
   "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";
@@ -8361,6 +8367,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8645,6 +8652,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8691,6 +8699,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_1";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-0.7.nix b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
index e84e33b8b6fb..48f29fddd71c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-0.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-0.7.nix
@@ -3775,6 +3775,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4342,7 +4343,9 @@ self: super: {
   "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";
@@ -6309,6 +6312,7 @@ self: super: {
   "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";
@@ -6324,6 +6328,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8336,6 +8341,7 @@ self: super: {
   "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";
@@ -8361,6 +8367,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8645,6 +8652,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8691,6 +8699,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_1";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.0.nix b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
index 8fcb4a7b14bc..49ec22af7c75 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.0.nix
@@ -3765,6 +3765,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4332,7 +4333,9 @@ self: super: {
   "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";
@@ -6298,6 +6301,7 @@ self: super: {
   "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";
@@ -6313,6 +6317,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8323,6 +8328,7 @@ self: super: {
   "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";
@@ -8348,6 +8354,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8631,6 +8638,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8677,6 +8685,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_1";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.1.nix b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
index d2c2eb366c8d..3d4a16f325a6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.1.nix
@@ -3762,6 +3762,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4328,7 +4329,9 @@ self: super: {
   "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";
@@ -6291,6 +6294,7 @@ self: super: {
   "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";
@@ -6306,6 +6310,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8311,6 +8316,7 @@ self: super: {
   "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";
@@ -8336,6 +8342,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8618,6 +8625,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8664,6 +8672,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_1";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.10.nix b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
index 79508ed479d4..67857ee4b1c6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.10.nix
@@ -3753,6 +3753,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4317,7 +4318,9 @@ self: super: {
   "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";
@@ -6271,6 +6274,7 @@ self: super: {
   "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";
@@ -6286,6 +6290,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8284,6 +8289,7 @@ self: super: {
   "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";
@@ -8309,6 +8315,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8590,6 +8597,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8636,6 +8644,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.11.nix b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
index d49b03d721ef..c27a46a88c8e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.11.nix
@@ -3752,6 +3752,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4316,7 +4317,9 @@ self: super: {
   "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";
@@ -6267,6 +6270,7 @@ self: super: {
   "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";
@@ -6282,6 +6286,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8280,6 +8285,7 @@ self: super: {
   "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";
@@ -8305,6 +8311,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8586,6 +8593,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8632,6 +8640,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.12.nix b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
index 07203ef2701a..a5a7d7fa3608 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.12.nix
@@ -3752,6 +3752,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4315,7 +4316,9 @@ self: super: {
   "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";
@@ -6266,6 +6269,7 @@ self: super: {
   "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";
@@ -6281,6 +6285,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8278,6 +8283,7 @@ self: super: {
   "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";
@@ -8303,6 +8309,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8584,6 +8591,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8630,6 +8638,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.13.nix b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
index 9e9c3094ada7..66812de0443e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.13.nix
@@ -3752,6 +3752,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4314,7 +4315,9 @@ self: super: {
   "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";
@@ -6265,6 +6268,7 @@ self: super: {
   "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";
@@ -6280,6 +6284,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8276,6 +8281,7 @@ self: super: {
   "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";
@@ -8301,6 +8307,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8582,6 +8589,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8628,6 +8636,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.14.nix b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
index 05194bba331f..e125520cf715 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.14.nix
@@ -3749,6 +3749,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4184,6 +4185,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4310,7 +4312,9 @@ self: super: {
   "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";
@@ -6259,6 +6263,7 @@ self: super: {
   "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";
@@ -6274,6 +6279,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8269,6 +8275,7 @@ self: super: {
   "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";
@@ -8294,6 +8301,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8575,6 +8583,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8621,6 +8630,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.15.nix b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
index 356c8b4652d9..47821d85dab1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.15.nix
@@ -3745,6 +3745,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4180,6 +4181,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4306,7 +4308,9 @@ self: super: {
   "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";
@@ -6253,6 +6257,7 @@ self: super: {
   "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";
@@ -6268,6 +6273,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8260,6 +8266,7 @@ self: super: {
   "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";
@@ -8285,6 +8292,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8566,6 +8574,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8612,6 +8621,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.2.nix b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
index db969111d4eb..8469c6f17c7c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.2.nix
@@ -3759,6 +3759,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4325,7 +4326,9 @@ self: super: {
   "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";
@@ -6287,6 +6290,7 @@ self: super: {
   "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";
@@ -6302,6 +6306,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8305,6 +8310,7 @@ self: super: {
   "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";
@@ -8330,6 +8336,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8612,6 +8619,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8658,6 +8666,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.4.nix b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
index 29c93121b18b..8b9dedb59fe2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.4.nix
@@ -3757,6 +3757,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4322,7 +4323,9 @@ self: super: {
   "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";
@@ -6283,6 +6286,7 @@ self: super: {
   "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";
@@ -6298,6 +6302,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8300,6 +8305,7 @@ self: super: {
   "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";
@@ -8325,6 +8331,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8607,6 +8614,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8653,6 +8661,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.5.nix b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
index adf9213f2c28..23909c3d2e75 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.5.nix
@@ -3756,6 +3756,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4321,7 +4322,9 @@ self: super: {
   "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";
@@ -6282,6 +6285,7 @@ self: super: {
   "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";
@@ -6297,6 +6301,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8298,6 +8303,7 @@ self: super: {
   "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";
@@ -8323,6 +8329,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8604,6 +8611,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8650,6 +8658,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.7.nix b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
index 0bb90638d108..127f3e905091 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.7.nix
@@ -3756,6 +3756,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4321,7 +4322,9 @@ self: super: {
   "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";
@@ -6277,6 +6280,7 @@ self: super: {
   "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";
@@ -6292,6 +6296,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8293,6 +8298,7 @@ self: super: {
   "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";
@@ -8318,6 +8324,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8599,6 +8606,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8645,6 +8653,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.8.nix b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
index 1fe763664aaa..efbf9037a6fb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.8.nix
@@ -3754,6 +3754,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4318,7 +4319,9 @@ self: super: {
   "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";
@@ -6273,6 +6276,7 @@ self: super: {
   "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";
@@ -6288,6 +6292,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8288,6 +8293,7 @@ self: super: {
   "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";
@@ -8313,6 +8319,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8594,6 +8601,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8640,6 +8648,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-1.9.nix b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
index efbe3f49269b..99dc38c7f80e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-1.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-1.9.nix
@@ -3753,6 +3753,7 @@ self: super: {
   "gravatar" = doDistribute super."gravatar_0_6";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4317,7 +4318,9 @@ self: super: {
   "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";
@@ -6272,6 +6275,7 @@ self: super: {
   "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";
@@ -6287,6 +6291,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8287,6 +8292,7 @@ self: super: {
   "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";
@@ -8312,6 +8318,7 @@ self: super: {
   "turtle" = dontDistribute super."turtle";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8593,6 +8600,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_8_7";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8639,6 +8647,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_2";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.0.nix b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
index cc0205433b20..568076876a71 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.0.nix
@@ -3727,6 +3727,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4162,6 +4163,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4287,7 +4289,9 @@ self: super: {
   "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";
@@ -6210,6 +6214,7 @@ self: super: {
   "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";
@@ -6225,6 +6230,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8207,6 +8213,7 @@ self: super: {
   "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";
@@ -8232,6 +8239,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8511,6 +8519,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8557,6 +8566,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.1.nix b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
index 83feb1b2f3da..498229f2a845 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.1.nix
@@ -3726,6 +3726,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4161,6 +4162,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4286,7 +4288,9 @@ self: super: {
   "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";
@@ -6209,6 +6213,7 @@ self: super: {
   "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";
@@ -6224,6 +6229,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8206,6 +8212,7 @@ self: super: {
   "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";
@@ -8231,6 +8238,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8510,6 +8518,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8555,6 +8564,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.10.nix b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
index 67d34a156944..d779e935a1c1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.10.nix
@@ -3709,6 +3709,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4142,6 +4143,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4266,7 +4268,9 @@ self: super: {
   "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";
@@ -6178,6 +6182,7 @@ self: super: {
   "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";
@@ -6193,6 +6198,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8159,6 +8165,7 @@ self: super: {
   "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";
@@ -8184,6 +8191,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8463,6 +8471,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8508,6 +8517,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8839,6 +8849,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.11.nix b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
index 8f2db34a72cc..88fa6fdbe079 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.11.nix
@@ -3707,6 +3707,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4139,6 +4140,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4263,7 +4265,9 @@ self: super: {
   "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";
@@ -6172,6 +6176,7 @@ self: super: {
   "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";
@@ -6187,6 +6192,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8150,6 +8156,7 @@ self: super: {
   "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";
@@ -8175,6 +8182,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8454,6 +8462,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8499,6 +8508,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8830,6 +8840,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.12.nix b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
index 4888317d87ef..265cb7ab4690 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.12.nix
@@ -3707,6 +3707,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4139,6 +4140,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4263,7 +4265,9 @@ self: super: {
   "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";
@@ -6172,6 +6176,7 @@ self: super: {
   "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";
@@ -6187,6 +6192,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8149,6 +8155,7 @@ self: super: {
   "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";
@@ -8174,6 +8181,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8453,6 +8461,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8498,6 +8507,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8829,6 +8839,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.13.nix b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
index 6ac434b71266..64f691c05ec5 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.13.nix
@@ -3707,6 +3707,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4138,6 +4139,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4262,7 +4264,9 @@ self: super: {
   "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";
@@ -6170,6 +6174,7 @@ self: super: {
   "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";
@@ -6185,6 +6190,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8147,6 +8153,7 @@ self: super: {
   "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";
@@ -8172,6 +8179,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8451,6 +8459,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8496,6 +8505,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8827,6 +8837,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.14.nix b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
index 55462d75497c..0ac7dfa05a47 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.14.nix
@@ -3705,6 +3705,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4136,6 +4137,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4260,7 +4262,9 @@ self: super: {
   "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";
@@ -6167,6 +6171,7 @@ self: super: {
   "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";
@@ -6182,6 +6187,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8143,6 +8149,7 @@ self: super: {
   "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";
@@ -8168,6 +8175,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8447,6 +8455,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8492,6 +8501,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8821,6 +8831,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.15.nix b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
index 2327163b9f8c..9070ce99658a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.15.nix
@@ -3704,6 +3704,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4135,6 +4136,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4259,7 +4261,9 @@ self: super: {
   "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";
@@ -6165,6 +6169,7 @@ self: super: {
   "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";
@@ -6180,6 +6185,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8140,6 +8146,7 @@ self: super: {
   "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";
@@ -8165,6 +8172,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8444,6 +8452,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8489,6 +8498,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8818,6 +8828,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.16.nix b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
index c0bdb9c075f4..37eff2fd08b7 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.16.nix
@@ -3700,6 +3700,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4131,6 +4132,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4255,7 +4257,9 @@ self: super: {
   "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";
@@ -6160,6 +6164,7 @@ self: super: {
   "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";
@@ -6175,6 +6180,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8135,6 +8141,7 @@ self: super: {
   "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";
@@ -8160,6 +8167,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8439,6 +8447,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8484,6 +8493,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8813,6 +8823,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.17.nix b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
index f7d9f4e79386..83f4314bb129 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.17.nix
@@ -3344,6 +3344,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3695,6 +3696,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4126,6 +4128,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4250,7 +4253,9 @@ self: super: {
   "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";
@@ -6154,6 +6159,7 @@ self: super: {
   "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";
@@ -6169,6 +6175,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8129,6 +8136,7 @@ self: super: {
   "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";
@@ -8154,6 +8162,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8433,6 +8442,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8478,6 +8488,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8807,6 +8818,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.18.nix b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
index 625bb751dd70..fad6e89bae90 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.18.nix
@@ -3342,6 +3342,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3693,6 +3694,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4124,6 +4126,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4247,7 +4250,9 @@ self: super: {
   "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";
@@ -6150,6 +6155,7 @@ self: super: {
   "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";
@@ -6165,6 +6171,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8124,6 +8131,7 @@ self: super: {
   "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";
@@ -8149,6 +8157,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8428,6 +8437,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8473,6 +8483,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8801,6 +8812,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.19.nix b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
index a86e275379d2..de41ab241a43 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.19.nix
@@ -3341,6 +3341,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3692,6 +3693,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4123,6 +4125,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4246,7 +4249,9 @@ self: super: {
   "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";
@@ -6148,6 +6153,7 @@ self: super: {
   "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";
@@ -6163,6 +6169,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8120,6 +8127,7 @@ self: super: {
   "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";
@@ -8145,6 +8153,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8424,6 +8433,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8469,6 +8479,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8796,6 +8807,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.2.nix b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
index 5bd503e257bd..56704b5a5dc0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.2.nix
@@ -3723,6 +3723,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4158,6 +4159,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4283,7 +4285,9 @@ self: super: {
   "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";
@@ -6206,6 +6210,7 @@ self: super: {
   "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";
@@ -6221,6 +6226,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8203,6 +8209,7 @@ self: super: {
   "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";
@@ -8228,6 +8235,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8507,6 +8515,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8552,6 +8561,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.20.nix b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
index d214cf62b668..14b71d7d3627 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.20.nix
@@ -3340,6 +3340,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3691,6 +3692,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4122,6 +4124,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4245,7 +4248,9 @@ self: super: {
   "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";
@@ -6147,6 +6152,7 @@ self: super: {
   "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";
@@ -6162,6 +6168,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8117,6 +8124,7 @@ self: super: {
   "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";
@@ -8142,6 +8150,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8421,6 +8430,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8466,6 +8476,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8793,6 +8804,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.21.nix b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
index a23e5cebefb3..a4c6afbdc206 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.21.nix
@@ -3340,6 +3340,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3691,6 +3692,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4122,6 +4124,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4245,7 +4248,9 @@ self: super: {
   "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";
@@ -6146,6 +6151,7 @@ self: super: {
   "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";
@@ -6161,6 +6167,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8115,6 +8122,7 @@ self: super: {
   "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";
@@ -8140,6 +8148,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8417,6 +8426,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8462,6 +8472,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8788,6 +8799,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.22.nix b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
index 159429c59152..6b945f2af102 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.22.nix
@@ -3340,6 +3340,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3691,6 +3692,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4122,6 +4124,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4244,7 +4247,9 @@ self: super: {
   "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";
@@ -6144,6 +6149,7 @@ self: super: {
   "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";
@@ -6159,6 +6165,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8113,6 +8120,7 @@ self: super: {
   "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";
@@ -8138,6 +8146,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8415,6 +8424,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8460,6 +8470,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8786,6 +8797,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.3.nix b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
index 22cb853d62cd..3ce4419e3e02 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.3.nix
@@ -3722,6 +3722,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4157,6 +4158,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4282,7 +4284,9 @@ self: super: {
   "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";
@@ -6204,6 +6208,7 @@ self: super: {
   "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";
@@ -6219,6 +6224,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8201,6 +8207,7 @@ self: super: {
   "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";
@@ -8226,6 +8233,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8505,6 +8513,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8550,6 +8559,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.4.nix b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
index 0b54e10bcf1a..402e65f8b8f0 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.4.nix
@@ -3721,6 +3721,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4156,6 +4157,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4281,7 +4283,9 @@ self: super: {
   "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";
@@ -6202,6 +6206,7 @@ self: super: {
   "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";
@@ -6217,6 +6222,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8197,6 +8203,7 @@ self: super: {
   "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";
@@ -8222,6 +8229,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8501,6 +8509,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8546,6 +8555,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.5.nix b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
index 21ce9326946d..489f310c2d0e 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.5.nix
@@ -3720,6 +3720,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4155,6 +4156,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4280,7 +4282,9 @@ self: super: {
   "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";
@@ -6201,6 +6205,7 @@ self: super: {
   "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";
@@ -6216,6 +6221,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8196,6 +8202,7 @@ self: super: {
   "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";
@@ -8221,6 +8228,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8500,6 +8508,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8545,6 +8554,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.6.nix b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
index 5f281520fe19..171d7187d196 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.6.nix
@@ -3717,6 +3717,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4150,6 +4151,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4275,7 +4277,9 @@ self: super: {
   "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";
@@ -6195,6 +6199,7 @@ self: super: {
   "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";
@@ -6210,6 +6215,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8188,6 +8194,7 @@ self: super: {
   "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";
@@ -8213,6 +8220,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8492,6 +8500,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8537,6 +8546,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8869,6 +8879,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.7.nix b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
index 71801ba1ac69..d48d29125147 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.7.nix
@@ -3716,6 +3716,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4149,6 +4150,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4274,7 +4276,9 @@ self: super: {
   "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";
@@ -6194,6 +6198,7 @@ self: super: {
   "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";
@@ -6209,6 +6214,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8187,6 +8193,7 @@ self: super: {
   "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";
@@ -8212,6 +8219,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8491,6 +8499,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8536,6 +8545,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8868,6 +8878,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.8.nix b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
index 03512c1024f0..2363e401c297 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.8.nix
@@ -3714,6 +3714,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4147,6 +4148,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4272,7 +4274,9 @@ self: super: {
   "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";
@@ -6192,6 +6196,7 @@ self: super: {
   "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";
@@ -6207,6 +6212,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8181,6 +8187,7 @@ self: super: {
   "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";
@@ -8206,6 +8213,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8485,6 +8493,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8530,6 +8539,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8862,6 +8872,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-2.9.nix b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
index 85897a41255f..2c924184096c 100644
--- a/pkgs/development/haskell-modules/configuration-lts-2.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-2.9.nix
@@ -3710,6 +3710,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4143,6 +4144,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4268,7 +4270,9 @@ self: super: {
   "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";
@@ -6184,6 +6188,7 @@ self: super: {
   "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";
@@ -6199,6 +6204,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -8168,6 +8174,7 @@ self: super: {
   "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";
@@ -8193,6 +8200,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_0_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8472,6 +8480,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_9";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8517,6 +8526,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_2_3";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8848,6 +8858,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_0_12";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.0.nix b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
index e2c72b96b624..aa9d7348a733 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.0.nix
@@ -1657,6 +1657,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3252,6 +3253,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3600,6 +3602,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4024,6 +4027,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4143,7 +4147,9 @@ self: super: {
   "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";
@@ -5891,6 +5897,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5977,6 +5984,7 @@ self: super: {
   "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";
@@ -5992,6 +6000,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -7906,6 +7915,7 @@ self: super: {
   "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";
@@ -7930,6 +7940,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_1";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8201,6 +8212,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8246,6 +8258,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8563,6 +8576,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_2";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.1.nix b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
index 42ad5e82e7ed..1e1afff1d7a3 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.1.nix
@@ -1656,6 +1656,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3249,6 +3250,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3597,6 +3599,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4021,6 +4024,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4140,7 +4144,9 @@ self: super: {
   "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";
@@ -5886,6 +5892,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5972,6 +5979,7 @@ self: super: {
   "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";
@@ -5987,6 +5995,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -7899,6 +7908,7 @@ self: super: {
   "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";
@@ -7923,6 +7933,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_1";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8193,6 +8204,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8238,6 +8250,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8555,6 +8568,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_3";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.10.nix b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
index c36daa1f5e9c..6be62d0311f6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.10.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.10.nix
@@ -1644,6 +1644,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3221,6 +3222,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3566,6 +3568,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3989,6 +3992,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4107,7 +4111,9 @@ self: super: {
   "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";
@@ -5837,6 +5843,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5922,6 +5929,7 @@ self: super: {
   "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";
@@ -5937,6 +5945,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -7828,6 +7837,7 @@ self: super: {
   "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";
@@ -7852,6 +7862,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8120,6 +8131,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8164,6 +8176,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8303,6 +8316,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8472,6 +8486,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.11.nix b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
index 25a29c1d60a6..6968b8f22fff 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.11.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.11.nix
@@ -1644,6 +1644,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3219,6 +3220,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3564,6 +3566,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3987,6 +3990,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4105,7 +4109,9 @@ self: super: {
   "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";
@@ -5835,6 +5841,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5920,6 +5927,7 @@ self: super: {
   "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";
@@ -5935,6 +5943,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -7824,6 +7833,7 @@ self: super: {
   "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";
@@ -7848,6 +7858,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8116,6 +8127,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8160,6 +8172,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8299,6 +8312,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8468,6 +8482,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.12.nix b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
index 28327fc0dd2e..54a18bac10a1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.12.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.12.nix
@@ -1643,6 +1643,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3215,6 +3216,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3559,6 +3561,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3982,6 +3985,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4100,7 +4104,9 @@ self: super: {
   "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";
@@ -5830,6 +5836,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5915,6 +5922,7 @@ self: super: {
   "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";
@@ -5930,6 +5938,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -7816,6 +7825,7 @@ self: super: {
   "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";
@@ -7840,6 +7850,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8108,6 +8119,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8152,6 +8164,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8291,6 +8304,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8460,6 +8474,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.13.nix b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
index 0127a5f93309..e2f847f30df1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.13.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.13.nix
@@ -1643,6 +1643,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3215,6 +3216,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3559,6 +3561,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3982,6 +3985,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4099,7 +4103,9 @@ self: super: {
   "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";
@@ -5828,6 +5834,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5913,6 +5920,7 @@ self: super: {
   "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";
@@ -5928,6 +5936,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -7813,6 +7822,7 @@ self: super: {
   "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";
@@ -7837,6 +7847,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8105,6 +8116,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8149,6 +8161,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8287,6 +8300,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8456,6 +8470,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.14.nix b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
index b7422753928d..1757791208f1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.14.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.14.nix
@@ -1641,6 +1641,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3209,6 +3210,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3553,6 +3555,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3976,6 +3979,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4093,7 +4097,9 @@ self: super: {
   "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";
@@ -5820,6 +5826,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5905,6 +5912,7 @@ self: super: {
   "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";
@@ -5920,6 +5928,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -7805,6 +7814,7 @@ self: super: {
   "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";
@@ -7829,6 +7839,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_3";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8097,6 +8108,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8141,6 +8153,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8278,6 +8291,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8447,6 +8461,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.15.nix b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
index 93f64e0297e2..11783029b1aa 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.15.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.15.nix
@@ -1641,6 +1641,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3209,6 +3210,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3221,6 +3223,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
@@ -3552,6 +3555,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3974,6 +3978,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4091,7 +4096,9 @@ self: super: {
   "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";
@@ -5816,6 +5823,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5901,6 +5909,7 @@ self: super: {
   "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";
@@ -5916,6 +5925,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -7800,6 +7810,7 @@ self: super: {
   "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";
@@ -7824,6 +7835,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_3";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8092,6 +8104,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8136,6 +8149,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8273,6 +8287,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8442,6 +8457,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.16.nix b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
index 547e69051d1d..e188ec15cbbc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.16.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.16.nix
@@ -1640,6 +1640,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3207,6 +3208,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3219,6 +3221,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
@@ -3550,6 +3553,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3971,6 +3975,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4088,7 +4093,9 @@ self: super: {
   "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";
@@ -5811,6 +5818,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5896,6 +5904,7 @@ self: super: {
   "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";
@@ -5911,6 +5920,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -7788,6 +7798,7 @@ self: super: {
   "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";
@@ -7812,6 +7823,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_3";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8080,6 +8092,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8124,6 +8137,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8261,6 +8275,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8430,6 +8445,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.17.nix b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
index bc49a4c4d8b0..5875789a2af1 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.17.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.17.nix
@@ -1639,6 +1639,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3205,6 +3206,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3217,6 +3219,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
@@ -3548,6 +3551,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3968,6 +3972,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4085,7 +4090,9 @@ self: super: {
   "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";
@@ -5805,6 +5812,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5890,6 +5898,7 @@ self: super: {
   "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";
@@ -5905,6 +5914,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -7782,6 +7792,7 @@ self: super: {
   "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";
@@ -7806,6 +7817,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_3";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8074,6 +8086,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8118,6 +8131,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8255,6 +8269,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8424,6 +8439,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_5";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.18.nix b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
index 9fcfa0c19a11..58b5849579c6 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.18.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.18.nix
@@ -1639,6 +1639,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3204,6 +3205,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3216,6 +3218,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
@@ -3545,6 +3548,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3963,6 +3967,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4079,7 +4084,9 @@ self: super: {
   "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";
@@ -5796,6 +5803,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5881,6 +5889,7 @@ self: super: {
   "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";
@@ -5896,6 +5905,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -7769,6 +7779,7 @@ self: super: {
   "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";
@@ -7793,6 +7804,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_3";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8061,6 +8073,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8105,6 +8118,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8242,6 +8256,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8411,6 +8426,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_5";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.19.nix b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
index 5b282ac41e01..3eeb0194a49f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.19.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.19.nix
@@ -1636,6 +1636,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3198,6 +3199,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3210,6 +3212,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
@@ -3539,6 +3542,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3957,6 +3961,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4073,7 +4078,9 @@ self: super: {
   "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";
@@ -5784,6 +5791,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5869,6 +5877,7 @@ self: super: {
   "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";
@@ -5884,6 +5893,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -7754,6 +7764,7 @@ self: super: {
   "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";
@@ -7778,6 +7789,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_4";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8046,6 +8058,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8090,6 +8103,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8227,6 +8241,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8395,6 +8410,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_5";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.2.nix b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
index 1ebe77d959a4..69483ad17f03 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.2.nix
@@ -1654,6 +1654,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3246,6 +3247,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3593,6 +3595,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4017,6 +4020,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4136,7 +4140,9 @@ self: super: {
   "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";
@@ -5880,6 +5886,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5966,6 +5973,7 @@ self: super: {
   "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";
@@ -5981,6 +5989,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -7889,6 +7898,7 @@ self: super: {
   "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";
@@ -7913,6 +7923,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_1";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8183,6 +8194,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8228,6 +8240,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8544,6 +8557,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_3";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.20.nix b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
index 76dc6b166816..535391a6252b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.20.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.20.nix
@@ -1635,6 +1635,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3197,6 +3198,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3209,6 +3211,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
@@ -3538,6 +3541,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3956,6 +3960,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4072,7 +4077,9 @@ self: super: {
   "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";
@@ -5782,6 +5789,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5867,6 +5875,7 @@ self: super: {
   "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";
@@ -5882,6 +5891,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -7748,6 +7758,7 @@ self: super: {
   "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";
@@ -7772,6 +7783,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_4";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8040,6 +8052,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8084,6 +8097,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8221,6 +8235,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8388,6 +8403,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_5";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.21.nix b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
index 3cfb0693f210..3f7fe51cd18b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.21.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.21.nix
@@ -1635,6 +1635,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3194,6 +3195,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3206,6 +3208,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
@@ -3535,6 +3538,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3952,6 +3956,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4068,7 +4073,9 @@ self: super: {
   "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";
@@ -5775,6 +5782,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5860,6 +5868,7 @@ self: super: {
   "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";
@@ -5875,6 +5884,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -7727,6 +7737,7 @@ self: super: {
   "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";
@@ -7750,6 +7761,7 @@ self: super: {
   "turni" = dontDistribute super."turni";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8018,6 +8030,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8062,6 +8075,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8194,6 +8208,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8361,6 +8376,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_5";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.22.nix b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
index bf031881d65c..e3fb760f5380 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.22.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.22.nix
@@ -1635,6 +1635,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3192,6 +3193,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3204,6 +3206,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_1_1_2";
   "genericserialize" = dontDistribute super."genericserialize";
@@ -3533,6 +3536,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3950,6 +3954,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4065,7 +4070,9 @@ self: super: {
   "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";
@@ -5769,6 +5776,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5854,6 +5862,7 @@ self: super: {
   "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";
@@ -5869,6 +5878,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -7721,6 +7731,7 @@ self: super: {
   "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";
@@ -7744,6 +7755,7 @@ self: super: {
   "turni" = dontDistribute super."turni";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8012,6 +8024,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8056,6 +8069,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8188,6 +8202,7 @@ self: super: {
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
   "withdependencies" = dontDistribute super."withdependencies";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
@@ -8355,6 +8370,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_6";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.3.nix b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
index faad5bb99d4f..fe46fd0999f2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.3.nix
@@ -1653,6 +1653,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3243,6 +3244,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3590,6 +3592,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4014,6 +4017,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4133,7 +4137,9 @@ self: super: {
   "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";
@@ -5876,6 +5882,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5962,6 +5969,7 @@ self: super: {
   "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";
@@ -5977,6 +5985,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -7882,6 +7891,7 @@ self: super: {
   "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";
@@ -7906,6 +7916,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_1";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8175,6 +8186,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8220,6 +8232,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8535,6 +8548,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_3";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.4.nix b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
index 76d1fc195f9a..6d56cc3fd654 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.4.nix
@@ -1653,6 +1653,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3243,6 +3244,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3590,6 +3592,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4014,6 +4017,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4133,7 +4137,9 @@ self: super: {
   "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";
@@ -5876,6 +5882,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5962,6 +5969,7 @@ self: super: {
   "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";
@@ -5977,6 +5985,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -7881,6 +7890,7 @@ self: super: {
   "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";
@@ -7905,6 +7915,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_1";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8174,6 +8185,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8219,6 +8231,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8533,6 +8546,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_3";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.5.nix b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
index cd190f6fec13..bc5a71482e49 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.5.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.5.nix
@@ -1652,6 +1652,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3241,6 +3242,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3588,6 +3590,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4012,6 +4015,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4130,7 +4134,9 @@ self: super: {
   "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";
@@ -5869,6 +5875,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5955,6 +5962,7 @@ self: super: {
   "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";
@@ -5970,6 +5978,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -7869,6 +7878,7 @@ self: super: {
   "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";
@@ -7893,6 +7903,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_1";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8162,6 +8173,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8207,6 +8219,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8520,6 +8533,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_3";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.6.nix b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
index aeea6d22b6d1..f9bb0ec0e00f 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.6.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.6.nix
@@ -1652,6 +1652,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3240,6 +3241,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3585,6 +3587,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4009,6 +4012,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4127,7 +4131,9 @@ self: super: {
   "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";
@@ -5862,6 +5868,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5948,6 +5955,7 @@ self: super: {
   "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";
@@ -5963,6 +5971,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -7861,6 +7870,7 @@ self: super: {
   "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";
@@ -7885,6 +7895,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_1";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8154,6 +8165,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8198,6 +8210,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8511,6 +8524,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_3";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.7.nix b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
index 53311a3df47f..fb31054c6e7b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.7.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.7.nix
@@ -1650,6 +1650,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3237,6 +3238,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3582,6 +3584,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -4005,6 +4008,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4123,7 +4127,9 @@ self: super: {
   "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";
@@ -5857,6 +5863,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5943,6 +5950,7 @@ self: super: {
   "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";
@@ -5958,6 +5966,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -7853,6 +7862,7 @@ self: super: {
   "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";
@@ -7877,6 +7887,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_1";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8146,6 +8157,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8190,6 +8202,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_3_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8501,6 +8514,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_3";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.8.nix b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
index 4226be5db23f..f5c350e91c1a 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.8.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.8.nix
@@ -1650,6 +1650,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3230,6 +3231,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3575,6 +3577,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3998,6 +4001,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4116,7 +4120,9 @@ self: super: {
   "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";
@@ -5848,6 +5854,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5934,6 +5941,7 @@ self: super: {
   "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";
@@ -5949,6 +5957,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -7842,6 +7851,7 @@ self: super: {
   "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";
@@ -7866,6 +7876,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8135,6 +8146,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8179,6 +8191,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8490,6 +8503,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_3";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-3.9.nix b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
index a973edbf42f9..e2d045ed44d2 100644
--- a/pkgs/development/haskell-modules/configuration-lts-3.9.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-3.9.nix
@@ -1647,6 +1647,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3225,6 +3226,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3570,6 +3572,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3993,6 +3996,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -4111,7 +4115,9 @@ self: super: {
   "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";
@@ -5843,6 +5849,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5928,6 +5935,7 @@ self: super: {
   "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";
@@ -5943,6 +5951,7 @@ self: super: {
   "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-description-remote" = dontDistribute super."package-description-remote";
@@ -7836,6 +7845,7 @@ self: super: {
   "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";
@@ -7860,6 +7870,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_2";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -8129,6 +8140,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -8173,6 +8185,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_4_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -8484,6 +8497,7 @@ self: super: {
   "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" = doDistribute super."yesod-auth-oauth_1_4_0_2";
   "yesod-auth-oauth2" = doDistribute super."yesod-auth-oauth2_0_1_4";
   "yesod-auth-pam" = dontDistribute super."yesod-auth-pam";
   "yesod-auth-smbclient" = dontDistribute super."yesod-auth-smbclient";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.0.nix b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
index eff8ca3cc61f..d744f166c32d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.0.nix
@@ -340,6 +340,7 @@ self: super: {
   "GPipe" = doDistribute super."GPipe_2_1_5";
   "GPipe-Collada" = dontDistribute super."GPipe-Collada";
   "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-GLFW" = doDistribute super."GPipe-GLFW_1_2_1";
   "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
   "GTALib" = dontDistribute super."GTALib";
   "Gamgine" = dontDistribute super."Gamgine";
@@ -1532,6 +1533,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3041,6 +3043,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3053,6 +3056,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_2_0_0";
   "genericserialize" = dontDistribute super."genericserialize";
@@ -3373,6 +3377,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3777,6 +3782,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -3889,7 +3895,9 @@ self: super: {
   "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";
@@ -5524,6 +5532,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5605,6 +5614,7 @@ self: super: {
   "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";
@@ -5620,6 +5630,7 @@ self: super: {
   "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";
@@ -7382,6 +7393,7 @@ self: super: {
   "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";
@@ -7405,6 +7417,7 @@ self: super: {
   "turtle" = doDistribute super."turtle_1_2_4";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -7655,6 +7668,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -7698,6 +7712,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -7814,6 +7829,7 @@ self: super: {
   "winerror" = dontDistribute super."winerror";
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.1.nix b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
index 612919ac2c94..8645bceb82eb 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.1.nix
@@ -340,6 +340,7 @@ self: super: {
   "GPipe" = doDistribute super."GPipe_2_1_5";
   "GPipe-Collada" = dontDistribute super."GPipe-Collada";
   "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-GLFW" = doDistribute super."GPipe-GLFW_1_2_1";
   "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
   "GTALib" = dontDistribute super."GTALib";
   "Gamgine" = dontDistribute super."Gamgine";
@@ -1530,6 +1531,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3035,6 +3037,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3047,6 +3050,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_2_0_0";
   "genericserialize" = dontDistribute super."genericserialize";
@@ -3367,6 +3371,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3771,6 +3776,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heaps" = doDistribute super."heaps_0_3_2_1";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
@@ -3882,7 +3888,9 @@ self: super: {
   "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";
@@ -5509,6 +5517,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5590,6 +5599,7 @@ self: super: {
   "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";
@@ -5605,6 +5615,7 @@ self: super: {
   "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";
@@ -7365,6 +7376,7 @@ self: super: {
   "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";
@@ -7387,6 +7399,7 @@ self: super: {
   "turni" = dontDistribute super."turni";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -7637,6 +7650,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -7680,6 +7694,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -7795,6 +7810,7 @@ self: super: {
   "winerror" = dontDistribute super."winerror";
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
diff --git a/pkgs/development/haskell-modules/configuration-lts-4.2.nix b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
index f103942113df..ecca396a71cc 100644
--- a/pkgs/development/haskell-modules/configuration-lts-4.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-4.2.nix
@@ -338,6 +338,7 @@ self: super: {
   "GPipe" = doDistribute super."GPipe_2_1_5";
   "GPipe-Collada" = dontDistribute super."GPipe-Collada";
   "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-GLFW" = doDistribute super."GPipe-GLFW_1_2_1";
   "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
   "GTALib" = dontDistribute super."GTALib";
   "Gamgine" = dontDistribute super."Gamgine";
@@ -1525,6 +1526,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -3017,6 +3019,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -3029,6 +3032,7 @@ self: super: {
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-trie" = dontDistribute super."generic-trie";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-eot" = dontDistribute super."generics-eot";
   "generics-sop" = doDistribute super."generics-sop_0_2_0_0";
   "genericserialize" = dontDistribute super."genericserialize";
@@ -3347,6 +3351,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3735,6 +3740,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_2_2";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3745,6 +3751,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis-config" = dontDistribute super."hedis-config";
@@ -3855,7 +3862,9 @@ self: super: {
   "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";
@@ -5469,6 +5478,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5550,6 +5560,7 @@ self: super: {
   "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";
@@ -5565,6 +5576,7 @@ self: super: {
   "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";
@@ -7309,6 +7321,7 @@ self: super: {
   "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";
@@ -7331,6 +7344,7 @@ self: super: {
   "turni" = dontDistribute super."turni";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -7581,6 +7595,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -7624,6 +7639,7 @@ self: super: {
   "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" = doDistribute super."wai_3_0_5_0";
   "wai-accept-language" = dontDistribute super."wai-accept-language";
@@ -7631,6 +7647,7 @@ self: super: {
   "wai-devel" = dontDistribute super."wai-devel";
   "wai-digestive-functors" = dontDistribute super."wai-digestive-functors";
   "wai-dispatch" = dontDistribute super."wai-dispatch";
+  "wai-extra" = doDistribute super."wai-extra_3_0_14";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
@@ -7735,6 +7752,7 @@ self: super: {
   "winerror" = dontDistribute super."winerror";
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.0.nix b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
index 75dc1fec6714..9934d049508b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.0.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.0.nix
@@ -334,6 +334,7 @@ self: super: {
   "GPipe" = doDistribute super."GPipe_2_1_6";
   "GPipe-Collada" = dontDistribute super."GPipe-Collada";
   "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-GLFW" = doDistribute super."GPipe-GLFW_1_2_1";
   "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
   "GTALib" = dontDistribute super."GTALib";
   "Gamgine" = dontDistribute super."Gamgine";
@@ -1504,6 +1505,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -2962,6 +2964,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -2973,6 +2976,7 @@ self: super: {
   "generic-storable" = dontDistribute super."generic-storable";
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-sop" = doDistribute super."generics-sop_0_2_0_0";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3284,6 +3288,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3670,6 +3675,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_2_2";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3680,6 +3686,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis-config" = dontDistribute super."hedis-config";
@@ -3790,7 +3797,9 @@ self: super: {
   "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";
@@ -4955,7 +4964,6 @@ self: super: {
   "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
   "meep" = dontDistribute super."meep";
   "mega-sdist" = dontDistribute super."mega-sdist";
-  "megaparsec" = doDistribute super."megaparsec_4_3_0";
   "meldable-heap" = dontDistribute super."meldable-heap";
   "melody" = dontDistribute super."melody";
   "memcache" = dontDistribute super."memcache";
@@ -5386,6 +5394,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5466,6 +5475,7 @@ self: super: {
   "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";
@@ -5481,6 +5491,7 @@ self: super: {
   "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";
@@ -7188,6 +7199,7 @@ self: super: {
   "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";
@@ -7210,6 +7222,7 @@ self: super: {
   "turni" = dontDistribute super."turni";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -7453,6 +7466,7 @@ self: super: {
   "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" = doDistribute super."vector-space_0_10_2";
   "vector-space-map" = dontDistribute super."vector-space-map";
   "vector-space-opengl" = dontDistribute super."vector-space-opengl";
@@ -7497,12 +7511,14 @@ self: super: {
   "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-extra" = doDistribute super."wai-extra_3_0_14";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
@@ -7606,6 +7622,7 @@ self: super: {
   "winerror" = dontDistribute super."winerror";
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.1.nix b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
index 1c901164f841..37a5a87c4f2d 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.1.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.1.nix
@@ -332,6 +332,7 @@ self: super: {
   "GPX" = dontDistribute super."GPX";
   "GPipe-Collada" = dontDistribute super."GPipe-Collada";
   "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-GLFW" = doDistribute super."GPipe-GLFW_1_2_1";
   "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
   "GTALib" = dontDistribute super."GTALib";
   "Gamgine" = dontDistribute super."Gamgine";
@@ -1498,6 +1499,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -2950,6 +2952,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -2961,6 +2964,7 @@ self: super: {
   "generic-storable" = dontDistribute super."generic-storable";
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-sop" = doDistribute super."generics-sop_0_2_0_0";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3272,6 +3276,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3658,6 +3663,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_2_2";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3668,6 +3674,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis-config" = dontDistribute super."hedis-config";
@@ -3778,7 +3785,9 @@ self: super: {
   "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";
@@ -4573,6 +4582,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_2";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -4941,7 +4951,6 @@ self: super: {
   "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
   "meep" = dontDistribute super."meep";
   "mega-sdist" = dontDistribute super."mega-sdist";
-  "megaparsec" = doDistribute super."megaparsec_4_3_0";
   "meldable-heap" = dontDistribute super."meldable-heap";
   "melody" = dontDistribute super."melody";
   "memcache" = dontDistribute super."memcache";
@@ -5370,6 +5379,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5450,6 +5460,7 @@ self: super: {
   "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";
@@ -5465,6 +5476,7 @@ self: super: {
   "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";
@@ -7169,6 +7181,7 @@ self: super: {
   "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";
@@ -7191,6 +7204,7 @@ self: super: {
   "turni" = dontDistribute super."turni";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -7434,6 +7448,7 @@ self: super: {
   "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";
@@ -7477,12 +7492,14 @@ self: super: {
   "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-extra" = doDistribute super."wai-extra_3_0_14";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
@@ -7586,6 +7603,7 @@ self: super: {
   "winerror" = dontDistribute super."winerror";
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.2.nix b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
index e42fbcebc2a6..0e4e457bf1ea 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.2.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.2.nix
@@ -332,6 +332,7 @@ self: super: {
   "GPX" = dontDistribute super."GPX";
   "GPipe-Collada" = dontDistribute super."GPipe-Collada";
   "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-GLFW" = doDistribute super."GPipe-GLFW_1_2_1";
   "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
   "GTALib" = dontDistribute super."GTALib";
   "Gamgine" = dontDistribute super."Gamgine";
@@ -1497,6 +1498,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -2944,6 +2946,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -2955,6 +2958,7 @@ self: super: {
   "generic-storable" = dontDistribute super."generic-storable";
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "generics-sop" = doDistribute super."generics-sop_0_2_0_0";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
@@ -3264,6 +3268,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3649,6 +3654,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_2_2";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3659,6 +3665,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis-config" = dontDistribute super."hedis-config";
@@ -3769,7 +3776,9 @@ self: super: {
   "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";
@@ -4562,6 +4571,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_2";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -4930,7 +4940,6 @@ self: super: {
   "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
   "meep" = dontDistribute super."meep";
   "mega-sdist" = dontDistribute super."mega-sdist";
-  "megaparsec" = doDistribute super."megaparsec_4_3_0";
   "meldable-heap" = dontDistribute super."meldable-heap";
   "melody" = dontDistribute super."melody";
   "memcache" = dontDistribute super."memcache";
@@ -5353,6 +5362,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5433,6 +5443,7 @@ self: super: {
   "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";
@@ -5448,6 +5459,7 @@ self: super: {
   "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";
@@ -6772,6 +6784,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_15_1";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -7143,6 +7156,7 @@ self: super: {
   "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";
@@ -7165,6 +7179,7 @@ self: super: {
   "turni" = dontDistribute super."turni";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -7407,6 +7422,7 @@ self: super: {
   "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";
@@ -7450,12 +7466,14 @@ self: super: {
   "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-extra" = doDistribute super."wai-extra_3_0_14";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
@@ -7559,6 +7577,7 @@ self: super: {
   "winerror" = dontDistribute super."winerror";
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.3.nix b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
index 9b45729c2ff0..2e3c31fe650b 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.3.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.3.nix
@@ -330,6 +330,7 @@ self: super: {
   "GPX" = dontDistribute super."GPX";
   "GPipe-Collada" = dontDistribute super."GPipe-Collada";
   "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-GLFW" = doDistribute super."GPipe-GLFW_1_2_1";
   "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
   "GTALib" = dontDistribute super."GTALib";
   "Gamgine" = dontDistribute super."Gamgine";
@@ -1489,6 +1490,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -2918,6 +2920,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -2929,6 +2932,7 @@ self: super: {
   "generic-storable" = dontDistribute super."generic-storable";
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
   "geni-gui" = dontDistribute super."geni-gui";
@@ -3236,6 +3240,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3621,6 +3626,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_2_2";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3631,6 +3637,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis-config" = dontDistribute super."hedis-config";
@@ -3741,7 +3748,9 @@ self: super: {
   "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";
@@ -4533,6 +4542,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_2";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -4899,7 +4909,6 @@ self: super: {
   "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
   "meep" = dontDistribute super."meep";
   "mega-sdist" = dontDistribute super."mega-sdist";
-  "megaparsec" = doDistribute super."megaparsec_4_3_0";
   "meldable-heap" = dontDistribute super."meldable-heap";
   "melody" = dontDistribute super."melody";
   "memcache" = dontDistribute super."memcache";
@@ -5320,6 +5329,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5400,6 +5410,7 @@ self: super: {
   "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";
@@ -5415,6 +5426,7 @@ self: super: {
   "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";
@@ -6726,6 +6738,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_15_1";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -7096,6 +7109,7 @@ self: super: {
   "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";
@@ -7118,6 +7132,7 @@ self: super: {
   "turni" = dontDistribute super."turni";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -7359,6 +7374,7 @@ self: super: {
   "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";
@@ -7402,12 +7418,14 @@ self: super: {
   "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-extra" = doDistribute super."wai-extra_3_0_14";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
@@ -7508,6 +7526,7 @@ self: super: {
   "winerror" = dontDistribute super."winerror";
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.4.nix b/pkgs/development/haskell-modules/configuration-lts-5.4.nix
index 7c553d410e3a..a167ad714b80 100644
--- a/pkgs/development/haskell-modules/configuration-lts-5.4.nix
+++ b/pkgs/development/haskell-modules/configuration-lts-5.4.nix
@@ -330,6 +330,7 @@ self: super: {
   "GPX" = dontDistribute super."GPX";
   "GPipe-Collada" = dontDistribute super."GPipe-Collada";
   "GPipe-Examples" = dontDistribute super."GPipe-Examples";
+  "GPipe-GLFW" = doDistribute super."GPipe-GLFW_1_2_1";
   "GPipe-TextureLoad" = dontDistribute super."GPipe-TextureLoad";
   "GTALib" = dontDistribute super."GTALib";
   "Gamgine" = dontDistribute super."Gamgine";
@@ -1487,6 +1488,7 @@ self: super: {
   "bitstring" = dontDistribute super."bitstring";
   "bittorrent" = dontDistribute super."bittorrent";
   "bitvec" = dontDistribute super."bitvec";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
   "bitx-bitcoin" = dontDistribute super."bitx-bitcoin";
   "bk-tree" = dontDistribute super."bk-tree";
   "bkr" = dontDistribute super."bkr";
@@ -2904,6 +2906,7 @@ self: super: {
   "generator" = dontDistribute super."generator";
   "generators" = dontDistribute super."generators";
   "generic-accessors" = dontDistribute super."generic-accessors";
+  "generic-aeson" = doDistribute super."generic-aeson_0_2_0_7";
   "generic-binary" = dontDistribute super."generic-binary";
   "generic-church" = dontDistribute super."generic-church";
   "generic-deepseq" = dontDistribute super."generic-deepseq";
@@ -2915,6 +2918,7 @@ self: super: {
   "generic-storable" = dontDistribute super."generic-storable";
   "generic-tree" = dontDistribute super."generic-tree";
   "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
   "genericserialize" = dontDistribute super."genericserialize";
   "genetics" = dontDistribute super."genetics";
   "geni-gui" = dontDistribute super."geni-gui";
@@ -3221,6 +3225,7 @@ self: super: {
   "grasp" = dontDistribute super."grasp";
   "gray-code" = dontDistribute super."gray-code";
   "gray-extended" = dontDistribute super."gray-extended";
+  "graylog" = dontDistribute super."graylog";
   "greencard" = dontDistribute super."greencard";
   "greencard-lib" = dontDistribute super."greencard-lib";
   "greg-client" = dontDistribute super."greg-client";
@@ -3604,6 +3609,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_2_2";
   "hdf" = dontDistribute super."hdf";
   "hdigest" = dontDistribute super."hdigest";
   "hdirect" = dontDistribute super."hdirect";
@@ -3614,6 +3620,7 @@ self: super: {
   "hdph-closure" = dontDistribute super."hdph-closure";
   "hdr-histogram" = dontDistribute super."hdr-histogram";
   "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
   "heapsort" = dontDistribute super."heapsort";
   "hecc" = dontDistribute super."hecc";
   "hedis-config" = dontDistribute super."hedis-config";
@@ -3724,7 +3731,9 @@ self: super: {
   "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";
@@ -4513,6 +4522,7 @@ self: super: {
   "language-cil" = dontDistribute super."language-cil";
   "language-css" = dontDistribute super."language-css";
   "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_2";
   "language-ecmascript-analysis" = dontDistribute super."language-ecmascript-analysis";
   "language-eiffel" = dontDistribute super."language-eiffel";
   "language-fortran" = dontDistribute super."language-fortran";
@@ -4877,7 +4887,6 @@ self: super: {
   "medium-sdk-haskell" = dontDistribute super."medium-sdk-haskell";
   "meep" = dontDistribute super."meep";
   "mega-sdist" = dontDistribute super."mega-sdist";
-  "megaparsec" = doDistribute super."megaparsec_4_3_0";
   "meldable-heap" = dontDistribute super."meldable-heap";
   "melody" = dontDistribute super."melody";
   "memcache" = dontDistribute super."memcache";
@@ -5289,6 +5298,7 @@ self: super: {
   "oberon0" = dontDistribute super."oberon0";
   "obj" = dontDistribute super."obj";
   "objectid" = dontDistribute super."objectid";
+  "objective" = doDistribute super."objective_1_0_5";
   "observable-sharing" = dontDistribute super."observable-sharing";
   "octane" = dontDistribute super."octane";
   "octohat" = dontDistribute super."octohat";
@@ -5369,6 +5379,7 @@ self: super: {
   "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";
@@ -5384,6 +5395,7 @@ self: super: {
   "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";
@@ -6691,6 +6703,7 @@ self: super: {
   "structures" = dontDistribute super."structures";
   "stunclient" = dontDistribute super."stunclient";
   "stunts" = dontDistribute super."stunts";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_15_1";
   "stylized" = dontDistribute super."stylized";
   "sub-state" = dontDistribute super."sub-state";
   "subhask" = dontDistribute super."subhask";
@@ -7060,6 +7073,7 @@ self: super: {
   "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";
@@ -7082,6 +7096,7 @@ self: super: {
   "turni" = dontDistribute super."turni";
   "turtle-options" = dontDistribute super."turtle-options";
   "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";
@@ -7322,6 +7337,7 @@ self: super: {
   "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";
@@ -7364,12 +7380,14 @@ self: super: {
   "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-extra" = doDistribute super."wai-extra_3_0_14";
   "wai-frontend-monadcgi" = dontDistribute super."wai-frontend-monadcgi";
   "wai-graceful" = dontDistribute super."wai-graceful";
   "wai-handler-devel" = dontDistribute super."wai-handler-devel";
@@ -7470,6 +7488,7 @@ self: super: {
   "winerror" = dontDistribute super."winerror";
   "winio" = dontDistribute super."winio";
   "wiring" = dontDistribute super."wiring";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
   "witness" = dontDistribute super."witness";
   "witty" = dontDistribute super."witty";
   "wkt" = dontDistribute super."wkt";
diff --git a/pkgs/development/haskell-modules/configuration-lts-5.5.nix b/pkgs/development/haskell-modules/configuration-lts-5.5.nix
new file mode 100644
index 000000000000..90bd4fed4035
--- /dev/null
+++ b/pkgs/development/haskell-modules/configuration-lts-5.5.nix
@@ -0,0 +1,7746 @@
+{ 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-5.5 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";
+  "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";
+  "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";
+  "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";
+  "ChannelT" = dontDistribute super."ChannelT";
+  "Chart-diagrams" = dontDistribute super."Chart-diagrams";
+  "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";
+  "DescriptiveKeys" = dontDistribute super."DescriptiveKeys";
+  "Dflow" = dontDistribute super."Dflow";
+  "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" = dontDistribute super."EdisonAPI";
+  "EdisonCore" = dontDistribute super."EdisonCore";
+  "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";
+  "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-GLFW" = doDistribute super."GPipe-GLFW_1_2_1";
+  "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";
+  "HDBC-session" = dontDistribute super."HDBC-session";
+  "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";
+  "Hclip" = dontDistribute super."Hclip";
+  "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";
+  "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";
+  "LDAP" = dontDistribute super."LDAP";
+  "LRU" = dontDistribute super."LRU";
+  "LTree" = dontDistribute super."LTree";
+  "LambdaCalculator" = dontDistribute super."LambdaCalculator";
+  "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";
+  "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";
+  "MASMGen" = dontDistribute super."MASMGen";
+  "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";
+  "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";
+  "NoTrace" = dontDistribute super."NoTrace";
+  "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";
+  "OneTuple" = dontDistribute super."OneTuple";
+  "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";
+  "PortMidi" = dontDistribute super."PortMidi";
+  "PostgreSQL" = dontDistribute super."PostgreSQL";
+  "PrimitiveArray" = dontDistribute super."PrimitiveArray";
+  "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";
+  "QuadEdge" = dontDistribute super."QuadEdge";
+  "QuadTree" = dontDistribute super."QuadTree";
+  "Quelea" = dontDistribute super."Quelea";
+  "QuickAnnotate" = dontDistribute super."QuickAnnotate";
+  "QuickCheck" = doDistribute super."QuickCheck_2_8_1";
+  "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";
+  "RNAlien" = doDistribute super."RNAlien_1_0_0";
+  "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";
+  "SVGFonts" = dontDistribute super."SVGFonts";
+  "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";
+  "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-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";
+  "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-utility" = dontDistribute super."accelerate-utility";
+  "accentuateus" = dontDistribute super."accentuateus";
+  "access-time" = dontDistribute super."access-time";
+  "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-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-iproute" = dontDistribute super."aeson-iproute";
+  "aeson-lens" = dontDistribute super."aeson-lens";
+  "aeson-native" = dontDistribute super."aeson-native";
+  "aeson-parsec-picky" = dontDistribute super."aeson-parsec-picky";
+  "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";
+  "agda-snippets" = dontDistribute super."agda-snippets";
+  "agda-snippets-hakyll" = dontDistribute super."agda-snippets-hakyll";
+  "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";
+  "aivika" = dontDistribute super."aivika";
+  "aivika-branches" = dontDistribute super."aivika-branches";
+  "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-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";
+  "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";
+  "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-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";
+  "apply-refact" = doDistribute super."apply-refact_0_1_0_0";
+  "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";
+  "arff" = dontDistribute super."arff";
+  "arghwxhaskell" = dontDistribute super."arghwxhaskell";
+  "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";
+  "arithmoi" = dontDistribute super."arithmoi";
+  "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-vector-avc" = dontDistribute super."ascii-vector-avc";
+  "ascii85-conduit" = dontDistribute super."ascii85-conduit";
+  "asciidiagram" = doDistribute super."asciidiagram_1_1_1_1";
+  "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-conduit" = dontDistribute super."atom-conduit";
+  "atom-msp430" = dontDistribute super."atom-msp430";
+  "atomic-primops-foreign" = dontDistribute super."atomic-primops-foreign";
+  "atomic-primops-vector" = dontDistribute super."atomic-primops-vector";
+  "atomic-write" = dontDistribute super."atomic-write";
+  "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";
+  "autoexporter" = dontDistribute super."autoexporter";
+  "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-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-orphans" = doDistribute super."base-orphans_0_5_2";
+  "base-prelude" = doDistribute super."base-prelude_0_1_21";
+  "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";
+  "bdd" = dontDistribute super."bdd";
+  "bdelta" = dontDistribute super."bdelta";
+  "bdo" = dontDistribute super."bdo";
+  "beam" = dontDistribute super."beam";
+  "beamable" = dontDistribute super."beamable";
+  "beautifHOL" = dontDistribute super."beautifHOL";
+  "bed-and-breakfast" = dontDistribute super."bed-and-breakfast";
+  "bein" = dontDistribute super."bein";
+  "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";
+  "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-bits" = dontDistribute super."binary-bits";
+  "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-shared" = dontDistribute super."binary-shared";
+  "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-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-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";
+  "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-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-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";
+  "bitwise" = doDistribute super."bitwise_0_1_0_2";
+  "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" = dontDistribute super."bloodhound";
+  "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";
+  "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";
+  "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-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";
+  "bytestring-tree-builder" = dontDistribute super."bytestring-tree-builder";
+  "bytestringparser" = dontDistribute super."bytestringparser";
+  "bytestringparser-temporary" = dontDistribute super."bytestringparser-temporary";
+  "bytestringreadp" = dontDistribute super."bytestringreadp";
+  "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-dependency-licenses" = dontDistribute super."cabal-dependency-licenses";
+  "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-info" = dontDistribute super."cabal-info";
+  "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";
+  "cached-io" = dontDistribute super."cached-io";
+  "cached-traversable" = dontDistribute super."cached-traversable";
+  "cacophony" = doDistribute super."cacophony_0_4_0";
+  "caf" = dontDistribute super."caf";
+  "cafeteria-prelude" = dontDistribute super."cafeteria-prelude";
+  "caffegraph" = dontDistribute super."caffegraph";
+  "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";
+  "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";
+  "cartel" = doDistribute super."cartel_0_14_2_8";
+  "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-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";
+  "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";
+  "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";
+  "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";
+  "clumpiness" = dontDistribute super."clumpiness";
+  "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";
+  "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";
+  "codo-notation" = dontDistribute super."codo-notation";
+  "cofunctor" = dontDistribute super."cofunctor";
+  "cognimeta-utils" = dontDistribute super."cognimeta-utils";
+  "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";
+  "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";
+  "commodities" = dontDistribute super."commodities";
+  "commsec" = dontDistribute super."commsec";
+  "commsec-keyexchange" = dontDistribute super."commsec-keyexchange";
+  "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";
+  "conceit" = dontDistribute super."conceit";
+  "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-extra" = dontDistribute super."concurrent-extra";
+  "concurrent-machines" = dontDistribute super."concurrent-machines";
+  "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-select" = dontDistribute super."config-select";
+  "config-value" = dontDistribute super."config-value";
+  "configifier" = dontDistribute super."configifier";
+  "configuration" = dontDistribute super."configuration";
+  "configuration-tools" = dontDistribute super."configuration-tools";
+  "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";
+  "constructible" = dontDistribute super."constructible";
+  "constructive-algebra" = dontDistribute super."constructive-algebra";
+  "consumers" = dontDistribute super."consumers";
+  "container" = dontDistribute super."container";
+  "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";
+  "continued-fractions" = dontDistribute super."continued-fractions";
+  "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-omega" = dontDistribute super."control-monad-omega";
+  "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";
+  "converge" = dontDistribute super."converge";
+  "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";
+  "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";
+  "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";
+  "cryptonite" = doDistribute super."cryptonite_0_10";
+  "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-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";
+  "d3js" = dontDistribute super."d3js";
+  "daemonize-doublefork" = dontDistribute super."daemonize-doublefork";
+  "daemons" = dontDistribute super."daemons";
+  "dag" = dontDistribute super."dag";
+  "damnpacket" = dontDistribute super."damnpacket";
+  "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-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-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-or" = dontDistribute super."data-or";
+  "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";
+  "dataenc" = dontDistribute super."dataenc";
+  "dataflow" = dontDistribute super."dataflow";
+  "datalog" = dontDistribute super."datalog";
+  "datapacker" = dontDistribute super."datapacker";
+  "dataurl" = dontDistribute super."dataurl";
+  "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";
+  "dbmigrations" = doDistribute super."dbmigrations_1_0";
+  "dbus-client" = dontDistribute super."dbus-client";
+  "dbus-core" = dontDistribute super."dbus-core";
+  "dbus-qq" = dontDistribute super."dbus-qq";
+  "dbus-th" = dontDistribute super."dbus-th";
+  "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-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";
+  "debian-build" = dontDistribute super."debian-build";
+  "debug-diff" = dontDistribute super."debug-diff";
+  "debug-time" = dontDistribute super."debug-time";
+  "decepticons" = dontDistribute super."decepticons";
+  "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-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";
+  "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";
+  "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";
+  "deriving-compat" = dontDistribute super."deriving-compat";
+  "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-tikz" = dontDistribute super."diagrams-tikz";
+  "dialog" = dontDistribute super."dialog";
+  "dice-entropy-conduit" = dontDistribute super."dice-entropy-conduit";
+  "dicom" = dontDistribute super."dicom";
+  "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";
+  "discordian-calendar" = dontDistribute super."discordian-calendar";
+  "discount" = dontDistribute super."discount";
+  "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-closure" = dontDistribute super."distributed-closure";
+  "distributed-process" = doDistribute super."distributed-process_0_5_5_1";
+  "distributed-process-async" = dontDistribute super."distributed-process-async";
+  "distributed-process-azure" = dontDistribute super."distributed-process-azure";
+  "distributed-process-client-server" = dontDistribute super."distributed-process-client-server";
+  "distributed-process-ekg" = dontDistribute super."distributed-process-ekg";
+  "distributed-process-execution" = dontDistribute super."distributed-process-execution";
+  "distributed-process-extras" = dontDistribute super."distributed-process-extras";
+  "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-registry" = dontDistribute super."distributed-process-registry";
+  "distributed-process-simplelocalnet" = dontDistribute super."distributed-process-simplelocalnet";
+  "distributed-process-supervisor" = dontDistribute super."distributed-process-supervisor";
+  "distributed-process-task" = dontDistribute super."distributed-process-task";
+  "distributed-process-tests" = dontDistribute super."distributed-process-tests";
+  "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" = dontDistribute super."doctest-discover";
+  "doctest-discover-configurator" = dontDistribute super."doctest-discover-configurator";
+  "doctest-prop" = dontDistribute super."doctest-prop";
+  "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" = dontDistribute super."download";
+  "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";
+  "drClickOn" = dontDistribute super."drClickOn";
+  "draw-poker" = dontDistribute super."draw-poker";
+  "dresdner-verkehrsbetriebe" = dontDistribute super."dresdner-verkehrsbetriebe";
+  "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";
+  "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";
+  "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";
+  "ekg-statsd" = dontDistribute super."ekg-statsd";
+  "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-get" = dontDistribute super."elm-get";
+  "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-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";
+  "ether" = doDistribute super."ether_0_3_1_1";
+  "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";
+  "every-bit-counts" = dontDistribute super."every-bit-counts";
+  "ewe" = dontDistribute super."ewe";
+  "ex-pool" = dontDistribute super."ex-pool";
+  "exact-combinatorics" = dontDistribute super."exact-combinatorics";
+  "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";
+  "exception-mtl" = dontDistribute super."exception-mtl";
+  "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";
+  "failable-list" = dontDistribute super."failable-list";
+  "failure" = dontDistribute super."failure";
+  "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";
+  "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-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-clumpiness" = dontDistribute super."find-clumpiness";
+  "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-mcmc" = dontDistribute super."flat-mcmc";
+  "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";
+  "flow2dot" = dontDistribute super."flow2dot";
+  "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";
+  "fold-debounce" = dontDistribute super."fold-debounce";
+  "fold-debounce-conduit" = dontDistribute super."fold-debounce-conduit";
+  "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";
+  "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";
+  "free-vl" = dontDistribute super."free-vl";
+  "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";
+  "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";
+  "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";
+  "gamma" = dontDistribute super."gamma";
+  "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-aeson" = doDistribute super."generic-aeson_0_2_0_7";
+  "generic-binary" = dontDistribute super."generic-binary";
+  "generic-church" = dontDistribute super."generic-church";
+  "generic-deepseq" = dontDistribute super."generic-deepseq";
+  "generic-deriving" = doDistribute super."generic-deriving_1_9_0";
+  "generic-lucid-scaffold" = dontDistribute super."generic-lucid-scaffold";
+  "generic-maybe" = dontDistribute super."generic-maybe";
+  "generic-pretty" = dontDistribute super."generic-pretty";
+  "generic-server" = dontDistribute super."generic-server";
+  "generic-storable" = dontDistribute super."generic-storable";
+  "generic-tree" = dontDistribute super."generic-tree";
+  "generic-xml" = dontDistribute super."generic-xml";
+  "generic-xmlpickler" = doDistribute super."generic-xmlpickler_0_1_0_4";
+  "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";
+  "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-imported-from" = dontDistribute super."ghc-imported-from";
+  "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-codemirror" = dontDistribute super."ghcjs-codemirror";
+  "ghcjs-dom" = dontDistribute super."ghcjs-dom";
+  "ghcjs-dom-hello" = dontDistribute super."ghcjs-dom-hello";
+  "ghcjs-websockets" = dontDistribute super."ghcjs-websockets";
+  "ghclive" = dontDistribute super."ghclive";
+  "ghczdecode" = dontDistribute super."ghczdecode";
+  "ght" = dontDistribute super."ght";
+  "gi-atk" = dontDistribute super."gi-atk";
+  "gi-cairo" = dontDistribute super."gi-cairo";
+  "gi-gdk" = dontDistribute super."gi-gdk";
+  "gi-gdkpixbuf" = dontDistribute super."gi-gdkpixbuf";
+  "gi-gio" = dontDistribute super."gi-gio";
+  "gi-girepository" = dontDistribute super."gi-girepository";
+  "gi-glib" = dontDistribute super."gi-glib";
+  "gi-gobject" = dontDistribute super."gi-gobject";
+  "gi-gtk" = dontDistribute super."gi-gtk";
+  "gi-javascriptcore" = dontDistribute super."gi-javascriptcore";
+  "gi-notify" = dontDistribute super."gi-notify";
+  "gi-pango" = dontDistribute super."gi-pango";
+  "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";
+  "gist" = dontDistribute super."gist";
+  "git-all" = dontDistribute super."git-all";
+  "git-annex" = doDistribute super."git-annex_6_20160114";
+  "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-backup" = dontDistribute super."github-backup";
+  "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";
+  "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";
+  "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";
+  "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";
+  "gpolyline" = dontDistribute super."gpolyline";
+  "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-core" = doDistribute super."graph-core_0_2_2_0";
+  "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";
+  "graylog" = dontDistribute super."graylog";
+  "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-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-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-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-mac-integration" = dontDistribute super."gtk3-mac-integration";
+  "gtkglext" = dontDistribute super."gtkglext";
+  "gtkimageview" = dontDistribute super."gtkimageview";
+  "gtkrsync" = dontDistribute super."gtkrsync";
+  "gtksourceview2" = dontDistribute super."gtksourceview2";
+  "gtksourceview3" = dontDistribute super."gtksourceview3";
+  "guarded-rewriting" = dontDistribute super."guarded-rewriting";
+  "guess-combinator" = dontDistribute super."guess-combinator";
+  "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";
+  "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";
+  "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-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-leksah" = dontDistribute super."haddock-leksah";
+  "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-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";
+  "hakyll-sass" = dontDistribute super."hakyll-sass";
+  "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";
+  "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";
+  "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";
+  "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_2";
+  "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-formatter" = dontDistribute super."haskell-formatter";
+  "haskell-ftp" = dontDistribute super."haskell-ftp";
+  "haskell-generate" = dontDistribute super."haskell-generate";
+  "haskell-gi" = dontDistribute super."haskell-gi";
+  "haskell-gi-base" = dontDistribute super."haskell-gi-base";
+  "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-pdf-presenter" = dontDistribute super."haskell-pdf-presenter";
+  "haskell-platform-test" = dontDistribute super."haskell-platform-test";
+  "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" = doDistribute super."hasql_0_19_6";
+  "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-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-amazonka" = dontDistribute super."haxl-amazonka";
+  "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";
+  "hbayes" = dontDistribute super."hbayes";
+  "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";
+  "hdevtools" = doDistribute super."hdevtools_0_1_2_2";
+  "hdf" = dontDistribute super."hdf";
+  "hdigest" = dontDistribute super."hdigest";
+  "hdirect" = dontDistribute super."hdirect";
+  "hdis86" = dontDistribute super."hdis86";
+  "hdiscount" = dontDistribute super."hdiscount";
+  "hdm" = dontDistribute super."hdm";
+  "hdph" = dontDistribute super."hdph";
+  "hdph-closure" = dontDistribute super."hdph-closure";
+  "hdr-histogram" = dontDistribute super."hdr-histogram";
+  "headergen" = dontDistribute super."headergen";
+  "heap" = doDistribute super."heap_1_0_2";
+  "heapsort" = dontDistribute super."heapsort";
+  "hecc" = dontDistribute super."hecc";
+  "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";
+  "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-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";
+  "hformat" = dontDistribute super."hformat";
+  "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";
+  "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";
+  "hinquire" = dontDistribute super."hinquire";
+  "hinstaller" = dontDistribute super."hinstaller";
+  "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";
+  "hjcase" = dontDistribute super."hjcase";
+  "hjpath" = dontDistribute super."hjpath";
+  "hjs" = dontDistribute super."hjs";
+  "hjson" = dontDistribute super."hjson";
+  "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-chart" = dontDistribute super."hledger-chart";
+  "hledger-diff" = dontDistribute super."hledger-diff";
+  "hledger-irr" = dontDistribute super."hledger-irr";
+  "hledger-vty" = dontDistribute super."hledger-vty";
+  "hlibBladeRF" = dontDistribute super."hlibBladeRF";
+  "hlibev" = dontDistribute super."hlibev";
+  "hlibfam" = dontDistribute super."hlibfam";
+  "hlint" = doDistribute super."hlint_1_9_30";
+  "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" = dontDistribute super."hmt";
+  "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";
+  "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" = dontDistribute super."hosc";
+  "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";
+  "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";
+  "hpack" = dontDistribute super."hpack";
+  "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";
+  "hpc-strobe" = dontDistribute super."hpc-strobe";
+  "hpc-tracer" = dontDistribute super."hpc-tracer";
+  "hpdft" = dontDistribute super."hpdft";
+  "hplayground" = dontDistribute super."hplayground";
+  "hplaylist" = dontDistribute super."hplaylist";
+  "hpodder" = dontDistribute super."hpodder";
+  "hpp" = dontDistribute super."hpp";
+  "hpqtypes" = dontDistribute super."hpqtypes";
+  "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-GeoIP" = dontDistribute super."hs-GeoIP";
+  "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";
+  "hsb2hs" = dontDistribute super."hsb2hs";
+  "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";
+  "hscolour" = doDistribute super."hscolour_1_23";
+  "hscope" = dontDistribute super."hscope";
+  "hscrtmpl" = dontDistribute super."hscrtmpl";
+  "hscuid" = dontDistribute super."hscuid";
+  "hscurses" = dontDistribute super."hscurses";
+  "hscurses-fish-ex" = dontDistribute super."hscurses-fish-ex";
+  "hsdev" = dontDistribute super."hsdev";
+  "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-monad-control" = dontDistribute super."hspec-monad-control";
+  "hspec-server" = dontDistribute super."hspec-server";
+  "hspec-shouldbe" = dontDistribute super."hspec-shouldbe";
+  "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";
+  "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-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";
+  "htoml" = dontDistribute super."htoml";
+  "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-streams" = dontDistribute super."http-client-streams";
+  "http-conduit-browser" = dontDistribute super."http-conduit-browser";
+  "http-conduit-downloader" = dontDistribute super."http-conduit-downloader";
+  "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-server" = dontDistribute super."http-server";
+  "http-shed" = dontDistribute super."http-shed";
+  "http-test" = dontDistribute super."http-test";
+  "http-wget" = dontDistribute super."http-wget";
+  "http2" = doDistribute super."http2_1_4_5";
+  "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";
+  "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";
+  "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";
+  "identifiers" = dontDistribute super."identifiers";
+  "idiii" = dontDistribute super."idiii";
+  "idna" = dontDistribute super."idna";
+  "idna2008" = dontDistribute super."idna2008";
+  "idris" = dontDistribute super."idris";
+  "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-inline-r" = dontDistribute super."ihaskell-inline-r";
+  "ihaskell-parsec" = dontDistribute super."ihaskell-parsec";
+  "ihaskell-plot" = dontDistribute super."ihaskell-plot";
+  "ihaskell-widgets" = dontDistribute super."ihaskell-widgets";
+  "ihttp" = dontDistribute super."ihttp";
+  "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-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-sat-solver" = dontDistribute super."incremental-sat-solver";
+  "increments" = dontDistribute super."increments";
+  "indentation" = dontDistribute super."indentation";
+  "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";
+  "inquire" = dontDistribute super."inquire";
+  "inserts" = dontDistribute super."inserts";
+  "inspection-proxy" = dontDistribute super."inspection-proxy";
+  "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";
+  "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";
+  "intern" = dontDistribute super."intern";
+  "internetmarke" = dontDistribute super."internetmarke";
+  "interpol" = dontDistribute super."interpol";
+  "interpolatedstring-qq" = dontDistribute super."interpolatedstring-qq";
+  "interpolatedstring-qq-mwotton" = dontDistribute super."interpolatedstring-qq-mwotton";
+  "interpolation" = dontDistribute super."interpolation";
+  "intricacy" = dontDistribute super."intricacy";
+  "intset" = dontDistribute super."intset";
+  "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-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-colors" = dontDistribute super."irc-colors";
+  "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";
+  "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";
+  "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-backend-c" = dontDistribute super."ivory-backend-c";
+  "ivory-bitdata" = dontDistribute super."ivory-bitdata";
+  "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-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";
+  "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";
+  "jose" = dontDistribute super."jose";
+  "jpeg" = dontDistribute super."jpeg";
+  "js-good-parts" = dontDistribute super."js-good-parts";
+  "jsaddle" = dontDistribute super."jsaddle";
+  "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-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-litobj" = dontDistribute super."json-litobj";
+  "json-pointer" = dontDistribute super."json-pointer";
+  "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";
+  "judy" = dontDistribute super."judy";
+  "jukebox" = dontDistribute super."jukebox";
+  "jumpthefive" = dontDistribute super."jumpthefive";
+  "jvm-parser" = dontDistribute super."jvm-parser";
+  "kademlia" = dontDistribute super."kademlia";
+  "kafka-client" = dontDistribute super."kafka-client";
+  "kangaroo" = dontDistribute super."kangaroo";
+  "kanji" = dontDistribute super."kanji";
+  "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";
+  "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";
+  "lackey" = dontDistribute super."lackey";
+  "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-compiler" = dontDistribute super."lambdacube-compiler";
+  "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-gl" = dontDistribute super."lambdacube-gl";
+  "lambdacube-ir" = dontDistribute super."lambdacube-ir";
+  "lambdacube-samples" = dontDistribute super."lambdacube-samples";
+  "lambdatex" = dontDistribute super."lambdatex";
+  "lambdatwit" = dontDistribute super."lambdatwit";
+  "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-c-quote" = dontDistribute super."language-c-quote";
+  "language-cil" = dontDistribute super."language-cil";
+  "language-css" = dontDistribute super."language-css";
+  "language-dot" = dontDistribute super."language-dot";
+  "language-ecmascript" = doDistribute super."language-ecmascript_0_17_0_2";
+  "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_7_0_1";
+  "language-typescript" = dontDistribute super."language-typescript";
+  "language-vhdl" = dontDistribute super."language-vhdl";
+  "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";
+  "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";
+  "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";
+  "leksah-server" = dontDistribute super."leksah-server";
+  "lendingclub" = dontDistribute super."lendingclub";
+  "lens-datetime" = dontDistribute super."lens-datetime";
+  "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";
+  "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";
+  "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";
+  "lift-generics" = dontDistribute super."lift-generics";
+  "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";
+  "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-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";
+  "logfloat" = dontDistribute super."logfloat";
+  "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";
+  "ltk" = dontDistribute super."ltk";
+  "ltl" = dontDistribute super."ltl";
+  "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";
+  "luka" = dontDistribute super."luka";
+  "luminance" = doDistribute super."luminance_0_9_1_2";
+  "luminance-samples" = doDistribute super."luminance-samples_0_9_1";
+  "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";
+  "maccatcher" = dontDistribute super."maccatcher";
+  "machinecell" = dontDistribute super."machinecell";
+  "machines-binary" = dontDistribute super."machines-binary";
+  "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";
+  "mainland-pretty" = dontDistribute super."mainland-pretty";
+  "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";
+  "manifold-random" = dontDistribute super."manifold-random";
+  "manifolds" = dontDistribute super."manifolds";
+  "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";
+  "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";
+  "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";
+  "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";
+  "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-exception" = dontDistribute super."monad-exception";
+  "monad-fork" = dontDistribute super."monad-fork";
+  "monad-gen" = dontDistribute super."monad-gen";
+  "monad-interleave" = dontDistribute super."monad-interleave";
+  "monad-levels" = dontDistribute super."monad-levels";
+  "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-stlike-io" = dontDistribute super."monad-stlike-io";
+  "monad-stlike-stm" = dontDistribute super."monad-stlike-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";
+  "monadplus" = dontDistribute super."monadplus";
+  "monads-fd" = dontDistribute super."monads-fd";
+  "monadtransform" = dontDistribute super."monadtransform";
+  "monarch" = dontDistribute super."monarch";
+  "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-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";
+  "mountpoints" = dontDistribute super."mountpoints";
+  "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";
+  "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";
+  "multiset-comb" = dontDistribute super."multiset-comb";
+  "multisetrewrite" = dontDistribute super."multisetrewrite";
+  "multistate" = dontDistribute super."multistate";
+  "muon" = dontDistribute super."muon";
+  "murder" = dontDistribute super."murder";
+  "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-probability" = doDistribute super."mwc-probability_1_0_3";
+  "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";
+  "names-th" = dontDistribute super."names-th";
+  "nano-cryptr" = dontDistribute super."nano-cryptr";
+  "nano-erl" = dontDistribute super."nano-erl";
+  "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";
+  "nanq" = dontDistribute super."nanq";
+  "narc" = dontDistribute super."narc";
+  "nat" = dontDistribute super."nat";
+  "nats-queue" = dontDistribute super."nats-queue";
+  "natural-number" = dontDistribute super."natural-number";
+  "natural-numbers" = dontDistribute super."natural-numbers";
+  "natural-transformation" = dontDistribute super."natural-transformation";
+  "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" = dontDistribute super."nested-routes";
+  "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-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-transport-inmemory" = dontDistribute super."network-transport-inmemory";
+  "network-transport-tcp" = doDistribute super."network-transport-tcp_0_4_2";
+  "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";
+  "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";
+  "niagra" = dontDistribute super."niagra";
+  "nibblestring" = dontDistribute super."nibblestring";
+  "nicify" = dontDistribute super."nicify";
+  "nicify-lib" = dontDistribute super."nicify-lib";
+  "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";
+  "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";
+  "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";
+  "objective" = doDistribute super."objective_1_0_5";
+  "observable-sharing" = dontDistribute super."observable-sharing";
+  "octane" = dontDistribute super."octane";
+  "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-classy" = dontDistribute super."opaleye-classy";
+  "opaleye-sqlite" = dontDistribute super."opaleye-sqlite";
+  "opaleye-trans" = dontDistribute super."opaleye-trans";
+  "open-haddock" = dontDistribute super."open-haddock";
+  "open-pandoc" = dontDistribute super."open-pandoc";
+  "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";
+  "opml-conduit" = doDistribute super."opml-conduit_0_4_0_1";
+  "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";
+  "optparse-generic" = dontDistribute super."optparse-generic";
+  "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";
+  "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";
+  "packdeps" = dontDistribute super."packdeps";
+  "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-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";
+  "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";
+  "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";
+  "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";
+  "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";
+  "path-io" = doDistribute super."path-io_0_2_0";
+  "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";
+  "period" = dontDistribute super."period";
+  "perm" = dontDistribute super."perm";
+  "permutation" = dontDistribute super."permutation";
+  "permute" = dontDistribute super."permute";
+  "persist2er" = dontDistribute super."persist2er";
+  "persistable-record" = dontDistribute super."persistable-record";
+  "persistable-types-HDBC-pg" = dontDistribute super."persistable-types-HDBC-pg";
+  "persistent-cereal" = dontDistribute super."persistent-cereal";
+  "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-odbc" = dontDistribute super."persistent-odbc";
+  "persistent-protobuf" = dontDistribute super."persistent-protobuf";
+  "persistent-ratelimit" = dontDistribute super."persistent-ratelimit";
+  "persistent-redis" = dontDistribute super."persistent-redis";
+  "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";
+  "pgdl" = dontDistribute super."pgdl";
+  "pgm" = dontDistribute super."pgm";
+  "pgsql-simple" = dontDistribute super."pgsql-simple";
+  "pgstream" = dontDistribute super."pgstream";
+  "phasechange" = dontDistribute super."phasechange";
+  "phizzle" = dontDistribute super."phizzle";
+  "phoityne" = dontDistribute super."phoityne";
+  "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";
+  "pinchot" = doDistribute super."pinchot_0_6_0_0";
+  "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_1_3";
+  "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-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-shell" = dontDistribute super."pipes-shell";
+  "pipes-sqlite-simple" = dontDistribute super."pipes-sqlite-simple";
+  "pipes-transduce" = dontDistribute super."pipes-transduce";
+  "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";
+  "plan-b" = dontDistribute super."plan-b";
+  "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";
+  "pointfree" = dontDistribute super."pointfree";
+  "pointful" = dontDistribute super."pointful";
+  "pointless-fun" = dontDistribute super."pointless-fun";
+  "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";
+  "polynomials-bernstein" = dontDistribute super."polynomials-bernstein";
+  "polyseq" = dontDistribute super."polyseq";
+  "polysoup" = dontDistribute super."polysoup";
+  "polytypeable" = dontDistribute super."polytypeable";
+  "polytypeable-utils" = dontDistribute super."polytypeable-utils";
+  "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-binary" = doDistribute super."postgresql-binary_0_7_9";
+  "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-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-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-edsl" = dontDistribute super."prelude-edsl";
+  "prelude-generalize" = dontDistribute super."prelude-generalize";
+  "prelude-plus" = dontDistribute super."prelude-plus";
+  "prelude-prime" = dontDistribute super."prelude-prime";
+  "prelude-safeenum" = dontDistribute super."prelude-safeenum";
+  "preprocess-haskell" = dontDistribute super."preprocess-haskell";
+  "preprocessor-tools" = dontDistribute super."preprocessor-tools";
+  "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-hex" = dontDistribute super."pretty-hex";
+  "pretty-ncols" = dontDistribute super."pretty-ncols";
+  "pretty-sop" = dontDistribute super."pretty-sop";
+  "pretty-tree" = dontDistribute super."pretty-tree";
+  "prettyFunctionComposing" = dontDistribute super."prettyFunctionComposing";
+  "prim-uniq" = dontDistribute super."prim-uniq";
+  "primitive-simd" = dontDistribute super."primitive-simd";
+  "primula-board" = dontDistribute super."primula-board";
+  "primula-bot" = dontDistribute super."primula-bot";
+  "print-debugger" = dontDistribute super."print-debugger";
+  "printf-mauke" = dontDistribute super."printf-mauke";
+  "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_7";
+  "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";
+  "process-streaming" = dontDistribute super."process-streaming";
+  "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";
+  "product-profunctors" = doDistribute super."product-profunctors_0_6_3_1";
+  "prof2dot" = dontDistribute super."prof2dot";
+  "prof2pretty" = dontDistribute super."prof2pretty";
+  "profiteur" = dontDistribute super."profiteur";
+  "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";
+  "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-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";
+  "proxied" = dontDistribute super."proxied";
+  "proxy-kindness" = dontDistribute super."proxy-kindness";
+  "psc-ide" = doDistribute super."psc-ide_0_5_0";
+  "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_20151212";
+  "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-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_7_6_1";
+  "purescript-bundle-fast" = dontDistribute super."purescript-bundle-fast";
+  "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";
+  "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";
+  "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-simple" = dontDistribute super."quickcheck-simple";
+  "quickcheck-webdriver" = dontDistribute super."quickcheck-webdriver";
+  "quicklz" = dontDistribute super."quicklz";
+  "quickpull" = dontDistribute super."quickpull";
+  "quickset" = dontDistribute super."quickset";
+  "quickspec" = dontDistribute super."quickspec";
+  "quicktest" = dontDistribute super."quicktest";
+  "quickwebapp" = dontDistribute super."quickwebapp";
+  "quiver" = dontDistribute super."quiver";
+  "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-http" = dontDistribute super."quiver-http";
+  "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";
+  "rainbox" = doDistribute super."rainbox_0_18_0_4";
+  "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-tree" = dontDistribute super."random-tree";
+  "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";
+  "rascal" = dontDistribute super."rascal";
+  "rasterific-svg" = doDistribute super."rasterific-svg_0_2_3_2";
+  "rate-limit" = dontDistribute super."rate-limit";
+  "ratel" = dontDistribute super."ratel";
+  "ratel-wai" = dontDistribute super."ratel-wai";
+  "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";
+  "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";
+  "reactor" = dontDistribute super."reactor";
+  "read-bounded" = dontDistribute super."read-bounded";
+  "readline-statevar" = dontDistribute super."readline-statevar";
+  "readpyc" = dontDistribute super."readpyc";
+  "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";
+  "reedsolomon" = dontDistribute super."reedsolomon";
+  "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-gloss" = dontDistribute super."reflex-gloss";
+  "reflex-gloss-scene" = dontDistribute super."reflex-gloss-scene";
+  "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-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";
+  "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-query" = dontDistribute super."relational-query";
+  "relational-query-HDBC" = dontDistribute super."relational-query-HDBC";
+  "relational-record" = dontDistribute super."relational-record";
+  "relational-record-examples" = dontDistribute super."relational-record-examples";
+  "relational-schemas" = dontDistribute super."relational-schemas";
+  "relative-date" = dontDistribute super."relative-date";
+  "relit" = dontDistribute super."relit";
+  "rematch" = dontDistribute super."rematch";
+  "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";
+  "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-core" = doDistribute super."rest-core_0_37";
+  "rest-example" = dontDistribute super."rest-example";
+  "rest-gen" = doDistribute super."rest-gen_0_19_0_1";
+  "restful-snap" = dontDistribute super."restful-snap";
+  "restricted-workers" = dontDistribute super."restricted-workers";
+  "restyle" = dontDistribute super."restyle";
+  "resumable-exceptions" = dontDistribute super."resumable-exceptions";
+  "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-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";
+  "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";
+  "rmonad" = dontDistribute super."rmonad";
+  "rncryptor" = dontDistribute super."rncryptor";
+  "rng-utils" = dontDistribute super."rng-utils";
+  "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";
+  "rotating-log" = dontDistribute super."rotating-log";
+  "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";
+  "sampling" = dontDistribute super."sampling";
+  "samtools" = dontDistribute super."samtools";
+  "samtools-conduit" = dontDistribute super."samtools-conduit";
+  "samtools-enumerator" = dontDistribute super."samtools-enumerator";
+  "samtools-iteratee" = dontDistribute super."samtools-iteratee";
+  "sandlib" = dontDistribute super."sandlib";
+  "sarasvati" = dontDistribute super."sarasvati";
+  "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";
+  "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";
+  "scalpel" = doDistribute super."scalpel_0_2_1_1";
+  "scan" = dontDistribute super."scan";
+  "scan-vector-machine" = dontDistribute super."scan-vector-machine";
+  "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" = doDistribute super."scotty_0_10_2";
+  "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-rest" = dontDistribute super."scotty-rest";
+  "scotty-session" = dontDistribute super."scotty-session";
+  "scotty-tls" = dontDistribute super."scotty-tls";
+  "scp-streams" = dontDistribute super."scp-streams";
+  "scrabble-bot" = dontDistribute super."scrabble-bot";
+  "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" = doDistribute super."second-transfer_0_7_1_0";
+  "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";
+  "semiring-simple" = dontDistribute super."semiring-simple";
+  "semver-range" = dontDistribute super."semver-range";
+  "sendgrid-haskell" = dontDistribute super."sendgrid-haskell";
+  "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";
+  "serialport" = dontDistribute super."serialport";
+  "serv" = dontDistribute super."serv";
+  "serv-wai" = dontDistribute super."serv-wai";
+  "servant-cassava" = dontDistribute super."servant-cassava";
+  "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-lucid" = dontDistribute super."servant-lucid";
+  "servant-mock" = dontDistribute super."servant-mock";
+  "servant-pandoc" = dontDistribute super."servant-pandoc";
+  "servant-pool" = dontDistribute super."servant-pool";
+  "servant-postgresql" = dontDistribute super."servant-postgresql";
+  "servant-response" = dontDistribute super."servant-response";
+  "servant-scotty" = dontDistribute super."servant-scotty";
+  "servant-swagger" = doDistribute super."servant-swagger_0_1_2";
+  "ses-html-snaplet" = dontDistribute super."ses-html-snaplet";
+  "sessions" = dontDistribute super."sessions";
+  "set-cover" = dontDistribute super."set-cover";
+  "set-extra" = doDistribute super."set-extra_1_3_2";
+  "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-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";
+  "shelly-extra" = dontDistribute super."shelly-extra";
+  "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" = dontDistribute super."simple-log";
+  "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" = dontDistribute super."simpleirc";
+  "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";
+  "sink" = dontDistribute super."sink";
+  "sirkel" = dontDistribute super."sirkel";
+  "sitemap" = dontDistribute super."sitemap";
+  "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";
+  "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";
+  "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";
+  "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-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-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";
+  "sonic-visualiser" = dontDistribute super."sonic-visualiser";
+  "sophia" = dontDistribute super."sophia";
+  "sort-by-pinyin" = dontDistribute super."sort-by-pinyin";
+  "sorted" = dontDistribute super."sorted";
+  "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";
+  "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";
+  "spool" = dontDistribute super."spool";
+  "spoonutil" = dontDistribute super."spoonutil";
+  "spoty" = dontDistribute super."spoty";
+  "spreadsheet" = dontDistribute super."spreadsheet";
+  "spritz" = dontDistribute super."spritz";
+  "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";
+  "sql-words" = dontDistribute super."sql-words";
+  "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";
+  "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-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";
+  "stopwatch" = dontDistribute super."stopwatch";
+  "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";
+  "str" = dontDistribute super."str";
+  "stratum-tool" = dontDistribute super."stratum-tool";
+  "stream-fusion" = dontDistribute super."stream-fusion";
+  "stream-monad" = dontDistribute super."stream-monad";
+  "streamed" = dontDistribute super."streamed";
+  "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-base-types" = doDistribute super."strict-base-types_0_4_0";
+  "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-conv" = dontDistribute super."string-conv";
+  "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";
+  "strive" = dontDistribute super."strive";
+  "strptime" = dontDistribute super."strptime";
+  "structs" = dontDistribute super."structs";
+  "structural-induction" = dontDistribute super."structural-induction";
+  "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";
+  "stylish-haskell" = doDistribute super."stylish-haskell_0_5_15_1";
+  "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";
+  "suffixarray" = dontDistribute super."suffixarray";
+  "suffixtree" = dontDistribute super."suffixtree";
+  "sugarhaskell" = dontDistribute super."sugarhaskell";
+  "suitable" = dontDistribute super."suitable";
+  "sump" = dontDistribute super."sump";
+  "sundown" = dontDistribute super."sundown";
+  "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";
+  "suspend" = dontDistribute super."suspend";
+  "svg-builder" = dontDistribute super."svg-builder";
+  "svg-tree" = doDistribute super."svg-tree_0_3_2";
+  "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_1_2_1";
+  "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";
+  "symbol" = dontDistribute super."symbol";
+  "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-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";
+  "ta" = dontDistribute super."ta";
+  "table" = dontDistribute super."table";
+  "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-transformer" = dontDistribute super."tagged-transformer";
+  "tagging" = dontDistribute super."tagging";
+  "taggy" = dontDistribute super."taggy";
+  "taggy-lens" = dontDistribute super."taggy-lens";
+  "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";
+  "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";
+  "taskpool" = dontDistribute super."taskpool";
+  "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";
+  "telegram-api" = dontDistribute super."telegram-api";
+  "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";
+  "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-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-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";
+  "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-and-plots" = dontDistribute super."text-and-plots";
+  "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-ldap" = dontDistribute super."text-ldap";
+  "text-locale-encoding" = dontDistribute super."text-locale-encoding";
+  "text-normal" = dontDistribute super."text-normal";
+  "text-position" = dontDistribute super."text-position";
+  "text-postgresql" = dontDistribute super."text-postgresql";
+  "text-printer" = dontDistribute super."text-printer";
+  "text-regex-replace" = dontDistribute super."text-regex-replace";
+  "text-region" = dontDistribute super."text-region";
+  "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-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-lift-instances" = dontDistribute super."th-lift-instances";
+  "th-printf" = dontDistribute super."th-printf";
+  "th-sccs" = dontDistribute super."th-sccs";
+  "th-traced" = dontDistribute super."th-traced";
+  "th-typegraph" = dontDistribute super."th-typegraph";
+  "themoviedb" = dontDistribute super."themoviedb";
+  "themplate" = dontDistribute super."themplate";
+  "theoremquest" = dontDistribute super."theoremquest";
+  "theoremquest-client" = dontDistribute super."theoremquest-client";
+  "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";
+  "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" = dontDistribute super."tidal";
+  "tidal-midi" = dontDistribute super."tidal-midi";
+  "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-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-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-time" = dontDistribute super."timelike-time";
+  "timemap" = dontDistribute super."timemap";
+  "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";
+  "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-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";
+  "tracker" = dontDistribute super."tracker";
+  "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-free" = dontDistribute super."transformers-free";
+  "transformers-runnable" = dontDistribute super."transformers-runnable";
+  "transformers-supply" = dontDistribute super."transformers-supply";
+  "transient" = dontDistribute super."transient";
+  "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-fun" = dontDistribute super."tree-fun";
+  "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";
+  "tttool" = doDistribute super."tttool_1_5_1";
+  "tubes" = dontDistribute super."tubes";
+  "tuntap" = dontDistribute super."tuntap";
+  "tup-functor" = dontDistribute super."tup-functor";
+  "tuple" = dontDistribute super."tuple";
+  "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";
+  "turkish-deasciifier" = dontDistribute super."turkish-deasciifier";
+  "turni" = dontDistribute super."turni";
+  "turtle-options" = dontDistribute super."turtle-options";
+  "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";
+  "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-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";
+  "typography-geometry" = dontDistribute super."typography-geometry";
+  "uAgda" = dontDistribute super."uAgda";
+  "ua-parser" = dontDistribute super."ua-parser";
+  "uacpid" = dontDistribute super."uacpid";
+  "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";
+  "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";
+  "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-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" = doDistribute super."unordered-containers_0_2_5_1";
+  "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";
+  "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-bytestring" = doDistribute super."uri-bytestring_0_1_9_2";
+  "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";
+  "users" = doDistribute super."users_0_4_0_0";
+  "users-persistent" = doDistribute super."users-persistent_0_4_0_0";
+  "users-postgresql-simple" = doDistribute super."users-postgresql-simple_0_4_0_0";
+  "users-test" = doDistribute super."users-test_0_4_0_0";
+  "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";
+  "vado" = dontDistribute super."vado";
+  "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";
+  "vcd" = dontDistribute super."vcd";
+  "vcs-revision" = dontDistribute super."vcs-revision";
+  "vcs-web-hook-parse" = dontDistribute super."vcs-web-hook-parse";
+  "vcsgui" = dontDistribute super."vcsgui";
+  "vcswrapper" = dontDistribute super."vcswrapper";
+  "vect" = dontDistribute super."vect";
+  "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" = dontDistribute super."versions";
+  "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-utils" = dontDistribute super."vinyl-utils";
+  "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";
+  "vivid" = dontDistribute super."vivid";
+  "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-extra" = doDistribute super."wai-extra_3_0_14";
+  "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-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-content-type" = dontDistribute super."wai-middleware-content-type";
+  "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" = dontDistribute super."wai-middleware-verbs";
+  "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" = doDistribute super."warp_3_2_2";
+  "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-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";
+  "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" = dontDistribute super."webkitgtk3";
+  "webkitgtk3-javascriptcore" = dontDistribute super."webkitgtk3-javascriptcore";
+  "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" = dontDistribute super."werewolf";
+  "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";
+  "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";
+  "witherable" = doDistribute super."witherable_0_1_3_2";
+  "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";
+  "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";
+  "wuss" = dontDistribute super."wuss";
+  "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-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";
+  "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";
+  "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-json" = dontDistribute super."yesod-json";
+  "yesod-links" = dontDistribute super."yesod-links";
+  "yesod-lucid" = dontDistribute super."yesod-lucid";
+  "yesod-markdown" = dontDistribute super."yesod-markdown";
+  "yesod-media-simple" = dontDistribute super."yesod-media-simple";
+  "yesod-newsfeed" = doDistribute super."yesod-newsfeed_1_5";
+  "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";
+  "yjtools" = dontDistribute super."yjtools";
+  "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-conduit" = dontDistribute super."zip-conduit";
+  "zipedit" = dontDistribute super."zipedit";
+  "zipkin" = dontDistribute super."zipkin";
+  "zipper" = dontDistribute super."zipper";
+  "zippers" = dontDistribute super."zippers";
+  "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";
+  "zot" = dontDistribute super."zot";
+  "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 b363ca74bfe2..09e2ef0ec8e9 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -17,7 +17,6 @@ self: {
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/3d-graphics-examples";
        description = "Examples of 3D graphics programming with OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "3dmodels" = callPackage
@@ -33,7 +32,6 @@ self: {
        homepage = "https://github.com/capsjac/3dmodels";
        description = "3D model parsers";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "4Blocks" = callPackage
@@ -51,7 +49,6 @@ self: {
        homepage = "http://lambdacolyte.wordpress.com/2009/08/06/tetris-in-haskell/";
        description = "A tetris-like game (works with GHC 6.8.3 and Gtk2hs 0.9.13)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AAI" = callPackage
@@ -113,7 +110,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Detect which OS you're running on";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AC-Colour" = callPackage
@@ -136,7 +132,6 @@ self: {
        libraryHaskellDepends = [ array base gtk ];
        description = "GTK+ pixel plotting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AC-HalfInteger" = callPackage
@@ -148,7 +143,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Efficient half-integer type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AC-MiniTest" = callPackage
@@ -160,7 +154,6 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        description = "A simple test framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AC-PPM" = callPackage
@@ -194,7 +187,6 @@ self: {
        libraryHaskellDepends = [ ansi-terminal base ];
        description = "Trivial wrapper over ansi-terminal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AC-VanillaArray" = callPackage
@@ -207,7 +199,6 @@ self: {
        jailbreak = true;
        description = "Immutable arrays with plain integer indicies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AC-Vector" = callPackage
@@ -246,7 +237,6 @@ self: {
        homepage = "http://alkalisoftware.net";
        description = "Essential features";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ADPfusion" = callPackage
@@ -275,7 +265,6 @@ self: {
        homepage = "https://github.com/choener/ADPfusion";
        description = "Efficient, high-level dynamic programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AERN-Basics" = callPackage
@@ -297,7 +286,6 @@ self: {
        homepage = "http://code.google.com/p/aern/";
        description = "foundational type classes for approximating exact real numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AERN-Net" = callPackage
@@ -315,7 +303,6 @@ self: {
        homepage = "http://www-users.aston.ac.uk/~konecnym/DISCERN";
        description = "Compositional lazy dataflow networks for exact real number computation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AERN-Real" = callPackage
@@ -334,7 +321,6 @@ self: {
        homepage = "http://code.google.com/p/aern/";
        description = "arbitrary precision real interval arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AERN-Real-Double" = callPackage
@@ -360,7 +346,6 @@ self: {
        homepage = "http://code.google.com/p/aern/";
        description = "arbitrary precision real interval arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AERN-Real-Interval" = callPackage
@@ -379,7 +364,6 @@ self: {
        homepage = "http://code.google.com/p/aern/";
        description = "arbitrary precision real interval arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AERN-RnToRm" = callPackage
@@ -398,7 +382,6 @@ self: {
        homepage = "http://www-users.aston.ac.uk/~konecnym/DISCERN";
        description = "polynomial function enclosures (PFEs) approximating exact real functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AERN-RnToRm-Plot" = callPackage
@@ -418,7 +401,6 @@ self: {
        homepage = "http://www-users.aston.ac.uk/~konecnym/DISCERN";
        description = "GL plotting of polynomial function enclosures (PFEs)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AES" = callPackage
@@ -450,7 +432,6 @@ self: {
        homepage = "http://src.seereason.com/haskell-agi";
        description = "A library for writing AGI scripts for Asterisk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ALUT" = callPackage
@@ -469,7 +450,6 @@ self: {
        homepage = "https://github.com/haskell-openal/ALUT";
        description = "A binding for the OpenAL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) freealut;};
 
   "AMI" = callPackage
@@ -486,7 +466,6 @@ self: {
        homepage = "http://redmine.iportnov.ru/projects/ami";
        description = "Low-level bindings for Asterisk Manager Interface (AMI)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ANum" = callPackage
@@ -605,7 +584,6 @@ self: {
        homepage = "https://github.com/egonSchiele/actionkid";
        description = "An easy-to-use video game framework for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Adaptive" = callPackage
@@ -622,7 +600,6 @@ self: {
        jailbreak = true;
        description = "Library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Adaptive-Blaisorblade" = callPackage
@@ -636,7 +613,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Library for incremental computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Advgame" = callPackage
@@ -651,7 +627,6 @@ self: {
        jailbreak = true;
        description = "Lisperati's adventure game in Lisp translated to Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AesonBson" = callPackage
@@ -670,7 +645,6 @@ self: {
        homepage = "https://github.com/nh2/AesonBson";
        description = "Mapping between Aeson's JSON and Bson objects";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Agata" = callPackage
@@ -687,7 +661,6 @@ self: {
        jailbreak = true;
        description = "Generator-generator for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Agda_2_4_2_3" = callPackage
@@ -829,7 +802,6 @@ self: {
        homepage = "http://github.com/lymar/AhoCorasick";
        description = "Aho-Corasick string matching algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AlgorithmW" = callPackage
@@ -861,7 +833,6 @@ self: {
        homepage = "https://github.com/choener/AlignmentAlgorithms";
        description = "Collection of alignment algorithms";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Allure" = callPackage
@@ -885,7 +856,6 @@ self: {
        homepage = "http://allureofthestars.com";
        description = "Near-future Sci-Fi roguelike and tactical squad game";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AndroidViewHierarchyImporter" = callPackage
@@ -906,7 +876,6 @@ self: {
        jailbreak = true;
        description = "Android view hierarchy importer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Animas" = callPackage
@@ -919,7 +888,6 @@ self: {
        homepage = "https://github.com/eamsden/Animas";
        description = "Updated version of Yampa: a library for programming hybrid systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Annotations" = callPackage
@@ -964,7 +932,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Library for Apple Push Notification Service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AppleScript" = callPackage
@@ -978,7 +945,6 @@ self: {
        homepage = "https://github.com/reinerp/haskell-AppleScript";
        description = "Call AppleScript from Haskell, and then call back into Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ApproxFun-hs" = callPackage
@@ -1004,7 +970,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Library/ArrayRef";
        description = "Unboxed references, dynamic arrays and more";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ArrowVHDL" = callPackage
@@ -1018,7 +983,6 @@ self: {
        homepage = "https://github.com/frosch03/arrowVHDL";
        description = "A library to generate Netlist code from Arrow descriptions";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AspectAG" = callPackage
@@ -1036,7 +1000,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/AspectAG";
        description = "Attribute Grammars in the form of an EDSL";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AttoBencode" = callPackage
@@ -1076,7 +1039,6 @@ self: {
        homepage = "http://github.com/konn/AttoJSON";
        description = "Simple lightweight JSON parser, generator & manipulator based on ByteString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Attrac" = callPackage
@@ -1094,7 +1056,6 @@ self: {
        homepage = "http://patch-tag.com/r/rhz/StrangeAttractors";
        description = "Visualisation of Strange Attractors in 3-Dimensions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Aurochs" = callPackage
@@ -1108,7 +1069,6 @@ self: {
        executableHaskellDepends = [ base containers parsec pretty ];
        description = "Yet another parser generator for C/C++";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AutoForms" = callPackage
@@ -1125,7 +1085,6 @@ self: {
        homepage = "http://autoforms.sourceforge.net/";
        description = "GUI library based upon generic programming (SYB3)";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "AvlTree" = callPackage
@@ -1137,7 +1096,6 @@ self: {
        libraryHaskellDepends = [ base COrdering ];
        description = "Balanced binary trees using the AVL algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BASIC" = callPackage
@@ -1149,7 +1107,6 @@ self: {
        libraryHaskellDepends = [ base containers llvm random timeit ];
        description = "Embedded BASIC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BCMtools" = callPackage
@@ -1176,7 +1133,6 @@ self: {
        ];
        description = "Big Contact Map Tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BNFC" = callPackage
@@ -1202,7 +1158,6 @@ self: {
        homepage = "http://bnfc.digitalgrammars.com/";
        description = "A compiler front-end generator";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BNFC-meta" = callPackage
@@ -1234,7 +1189,6 @@ self: {
        homepage = "http://pageperso.lif.univ-mrs.fr/~pierre-etienne.meunier/Baggins";
        description = "Tools for self-assembly";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Bang" = callPackage
@@ -1281,7 +1235,6 @@ self: {
        homepage = "http://sep07.mroot.net/";
        description = "An ad-hoc P2P chat program";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Befunge93" = callPackage
@@ -1297,7 +1250,6 @@ self: {
        homepage = "http://coder.bsimmons.name/blog/2010/05/befunge-93-interpreter-on-hackage";
        description = "An interpreter for the Befunge-93 Programming Language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BenchmarkHistory" = callPackage
@@ -1344,7 +1296,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/BerkeleyDBXML";
        description = "Berkeley DB XML binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) db; dbxml = null; inherit (pkgs) xercesc; 
          xqilla = null;};
 
@@ -1372,7 +1323,6 @@ self: {
        homepage = "https://github.com/mchakravarty/BigPixel";
        description = "Image editor for pixel art";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "Binpack" = callPackage
@@ -1407,7 +1357,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Base library for bioinformatics";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseBlast" = callPackage
@@ -1420,7 +1369,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "BLAST-related tools";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseDotP" = callPackage
@@ -1433,7 +1381,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Vienna / DotBracket / ExtSS parsers";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseFR3D" = callPackage
@@ -1451,7 +1398,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Importer for FR3D resources";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseFasta" = callPackage
@@ -1472,7 +1418,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "conduit-based FASTA parser";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseInfernal" = callPackage
@@ -1494,7 +1439,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Infernal data structures and tools";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseMAF" = callPackage
@@ -1507,7 +1451,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Multiple Alignment Format";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseTrainingData" = callPackage
@@ -1529,7 +1472,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "RNA folding training data";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseTurner" = callPackage
@@ -1548,7 +1490,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Import Turner RNA parameters";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseTypes" = callPackage
@@ -1590,7 +1531,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Import Vienna energy parameters";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BiobaseXNA" = callPackage
@@ -1630,7 +1570,6 @@ self: {
        jailbreak = true;
        description = "A preprocessor for Bird-style Literate Haskell comments with Haddock markup";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BitSyntax" = callPackage
@@ -1655,9 +1594,8 @@ self: {
        sha256 = "31aba41c4abbbc003b685e3110b518e1202486551d935ceec6805d63cd7bb5de";
        libraryHaskellDepends = [ base HTTP json2 ];
        homepage = "http://bitbucket.org/jetxee/hs-bitly/";
-       description = "A library to access bit.ly URL shortener";
+       description = "A library to access bit.ly URL shortener.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BlastHTTP_1_0_1" = callPackage
@@ -1718,7 +1656,6 @@ self: {
        homepage = "http://www.cs.york.ac.uk/fp/darcs/Blobs/";
        description = "Diagram editor";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BlogLiterately_0_7_1_7" = callPackage
@@ -1970,7 +1907,6 @@ self: {
        homepage = "http://github.com/gcross/Blueprint";
        description = "Preview of a new build system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Bookshelf" = callPackage
@@ -1991,7 +1927,6 @@ self: {
        homepage = "http://www.cse.chalmers.se/~emax/bookshelf/Manual.shelf.html";
        description = "A simple document organizer with some wiki functionality";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Boolean" = callPackage
@@ -2032,7 +1967,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Bravo";
        description = "Static text template generation library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "BufferedSocket" = callPackage
@@ -2070,7 +2004,6 @@ self: {
        homepage = "http://github.com/michaelxavier/Buster";
        description = "Hits a set of urls periodically to bust caches";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CBOR" = callPackage
@@ -2092,7 +2025,6 @@ self: {
        homepage = "https://github.com/orclev/CBOR";
        description = "Encode/Decode values to/from CBOR";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CC-delcont" = callPackage
@@ -2105,7 +2037,6 @@ self: {
        homepage = "http://code.haskell.org/~dolio/CC-delcont";
        description = "Delimited continuations and dynamically scoped variables";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CC-delcont-alt" = callPackage
@@ -2123,7 +2054,6 @@ self: {
        doHaddock = false;
        description = "Three new monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CC-delcont-cxe" = callPackage
@@ -2135,7 +2065,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CC-delcont-exc" = callPackage
@@ -2147,7 +2076,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CC-delcont-ref" = callPackage
@@ -2159,7 +2087,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad transformers for multi-prompt delimited control using refercence cells";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CC-delcont-ref-tf" = callPackage
@@ -2171,7 +2098,6 @@ self: {
        libraryHaskellDepends = [ base ref-tf transformers ];
        description = "A monad transformers for multi-prompt delimited control using refercence cells";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CCA" = callPackage
@@ -2221,7 +2147,6 @@ self: {
        homepage = "http://www.zonetora.co.uk/clase/";
        description = "Cursor Library for A Structured Editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CLI" = callPackage
@@ -2255,7 +2180,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/software/cmcompare/";
        description = "Infernal covariance model comparison";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CMQ" = callPackage
@@ -2284,7 +2208,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An algebraic data type similar to Prelude Ordering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CPBrainfuck" = callPackage
@@ -2298,7 +2221,6 @@ self: {
        executableHaskellDepends = [ base haskell98 ];
        description = "A simple Brainfuck interpretter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CPL" = callPackage
@@ -2314,7 +2236,6 @@ self: {
        ];
        description = "An interpreter of Hagino's Categorical Programming Language (CPL)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CSPM-CoreLanguage" = callPackage
@@ -2343,7 +2264,6 @@ self: {
        jailbreak = true;
        description = "Firing rules semantic of CSPM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CSPM-Frontend" = callPackage
@@ -2421,7 +2341,6 @@ self: {
        jailbreak = true;
        description = "cspm command line tool for analyzing CSPM specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CTRex" = callPackage
@@ -2468,7 +2387,6 @@ self: {
        homepage = "http://aleator.github.com/CV/";
        description = "OpenCV based machine vision library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {opencv_calib3d = null; opencv_contrib = null; 
          opencv_core = null; opencv_features2d = null; opencv_flann = null; 
          opencv_gpu = null; opencv_highgui = null; opencv_imgproc = null; 
@@ -2637,6 +2555,32 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
+  "Cabal_1_22_8_0" = callPackage
+    ({ mkDerivation, array, base, binary, bytestring, containers
+     , deepseq, directory, extensible-exceptions, filepath, HUnit
+     , old-time, pretty, process, QuickCheck, regex-posix
+     , test-framework, test-framework-hunit, test-framework-quickcheck2
+     , time, unix
+     }:
+     mkDerivation {
+       pname = "Cabal";
+       version = "1.22.8.0";
+       sha256 = "2a42a2ddecb6450f87ed3a2b37af81dcc573dfde8f0db16f695c78674a80a34e";
+       libraryHaskellDepends = [
+         array base binary bytestring containers deepseq directory filepath
+         pretty process time unix
+       ];
+       testHaskellDepends = [
+         base bytestring containers directory extensible-exceptions filepath
+         HUnit old-time process QuickCheck regex-posix test-framework
+         test-framework-hunit test-framework-quickcheck2 unix
+       ];
+       homepage = "http://www.haskell.org/cabal/";
+       description = "A framework for packaging Haskell software";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Cabal-ide-backend" = callPackage
     ({ mkDerivation, array, base, binary, bytestring, Cabal, containers
      , deepseq, directory, extensible-exceptions, filepath, HUnit
@@ -2695,7 +2639,6 @@ self: {
        homepage = "https://github.com/Icelandjack/Capabilities";
        description = "Separate and contain effects of IO monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Cardinality" = callPackage
@@ -2705,7 +2648,7 @@ self: {
        version = "0.2";
        sha256 = "b619bc5eee6c495bb047bdf34abfb739caba7710114013778f1a01ba0b017705";
        libraryHaskellDepends = [ base containers mtl ];
-       description = "Measure container capacity. Use it to safely change container";
+       description = "Measure container capacity. Use it to safely change container.";
        license = "LGPL";
      }) {};
 
@@ -2760,7 +2703,6 @@ self: {
        homepage = "http://github.com/rampion/Cascade";
        description = "Playing with reified categorical composition";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Catana" = callPackage
@@ -2772,7 +2714,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "A monad for complex manipulation of a stream";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ChannelT" = callPackage
@@ -2880,6 +2821,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Chart_1_6" = callPackage
+    ({ mkDerivation, array, base, colour, data-default-class, lens, mtl
+     , old-locale, operational, time, vector
+     }:
+     mkDerivation {
+       pname = "Chart";
+       version = "1.6";
+       sha256 = "0f73779ab322346cac7c131f58dbda9bcaf1f43693a9e102510be80a07569ea5";
+       libraryHaskellDepends = [
+         array base colour data-default-class lens mtl old-locale
+         operational time vector
+       ];
+       homepage = "https://github.com/timbod7/haskell-chart/wiki";
+       description = "A library for generating 2D Charts and Plots";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Chart-cairo_1_5_1" = callPackage
     ({ mkDerivation, array, base, cairo, Chart, colour
      , data-default-class, lens, mtl, old-locale, operational, time
@@ -2916,6 +2875,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "Chart-cairo_1_6" = callPackage
+    ({ mkDerivation, array, base, cairo, Chart, colour
+     , data-default-class, lens, mtl, old-locale, operational, time
+     }:
+     mkDerivation {
+       pname = "Chart-cairo";
+       version = "1.6";
+       sha256 = "e209b6b4d7d7f392593cbd3e8a8cde1d5af83066fee994195e4b25bda680ca0f";
+       libraryHaskellDepends = [
+         array base cairo Chart colour data-default-class lens mtl
+         old-locale operational time
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/timbod7/haskell-chart/wiki";
+       description = "Cairo backend for Charts";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "Chart-diagrams_1_3_2" = callPackage
     ({ mkDerivation, base, blaze-svg, bytestring, Chart, colour
      , containers, data-default-class, diagrams-core, diagrams-lib
@@ -2993,6 +2971,29 @@ self: {
        pname = "Chart-diagrams";
        version = "1.5.4";
        sha256 = "e2dcab357629b180bb05b905de995475a6ed5644437aba79f4bcc4ebae5f0b10";
+       revision = "1";
+       editedCabalFile = "3a49f15ac705c529104a04e8ccf5b4a8f113b7d62a9b824876fbd159c4960df8";
+       libraryHaskellDepends = [
+         base blaze-markup bytestring Chart colour containers
+         data-default-class diagrams-core diagrams-lib diagrams-postscript
+         diagrams-svg lens lucid-svg mtl old-locale operational SVGFonts
+         text time
+       ];
+       homepage = "https://github.com/timbod7/haskell-chart/wiki";
+       description = "Diagrams backend for Charts";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
+  "Chart-diagrams_1_6" = callPackage
+    ({ mkDerivation, base, blaze-markup, bytestring, Chart, colour
+     , containers, data-default-class, diagrams-core, diagrams-lib
+     , diagrams-postscript, diagrams-svg, lens, lucid-svg, mtl
+     , old-locale, operational, SVGFonts, text, time
+     }:
+     mkDerivation {
+       pname = "Chart-diagrams";
+       version = "1.6";
+       sha256 = "c4c5a60bc623bb3221da113c84c0400b4dd75c481e64f5a9b6788b923ff998eb";
        libraryHaskellDepends = [
          base blaze-markup bytestring Chart colour containers
          data-default-class diagrams-core diagrams-lib diagrams-postscript
@@ -3003,6 +3004,7 @@ self: {
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Diagrams backend for Charts";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Chart-gtk" = callPackage
@@ -3011,12 +3013,13 @@ self: {
      }:
      mkDerivation {
        pname = "Chart-gtk";
-       version = "1.5.1";
-       sha256 = "9c06817715d0f336f0dc987c044fd9599204fb1e1949c11bd54f34abd7b2ba08";
+       version = "1.6";
+       sha256 = "f566a4fbdfcca207640a76e2c953617b27954e3f49258c7ab425270379b954c7";
        libraryHaskellDepends = [
          array base cairo Chart Chart-cairo colour data-default-class gtk
          mtl old-locale time
        ];
+       jailbreak = true;
        homepage = "https://github.com/timbod7/haskell-chart/wiki";
        description = "Utility functions for using the chart library with GTK";
        license = stdenv.lib.licenses.bsd3;
@@ -3201,7 +3204,6 @@ self: {
        homepage = "https://github.com/ckkashyap/Chitra";
        description = "A platform independent mechanism to render graphics using vnc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ChristmasTree" = callPackage
@@ -3219,7 +3221,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Center/TTTAS";
        description = "Alternative approach of 'read' that composes grammars instead of parsers";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CirruParser" = callPackage
@@ -3245,7 +3246,6 @@ self: {
        homepage = "http://wiki.portal.chalmers.se/cse/pmwiki.php/FP/ClassLaws";
        description = "Stating and checking laws for type class methods";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ClassyPrelude" = callPackage
@@ -3257,7 +3257,6 @@ self: {
        libraryHaskellDepends = [ base strict ];
        description = "Prelude replacement using classes instead of concrete types where reasonable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Clean" = callPackage
@@ -3270,7 +3269,6 @@ self: {
        jailbreak = true;
        description = "A light, clean and powerful utility library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Clipboard" = callPackage
@@ -3319,7 +3317,6 @@ self: {
        homepage = "http://iki.fi/matti.niemenmaa/coadjute/";
        description = "A generic build tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Codec-Compression-LZF" = callPackage
@@ -3344,7 +3341,6 @@ self: {
        librarySystemDepends = [ libdevil ];
        description = "An FFI interface to the DevIL library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libdevil;};
 
   "Combinatorrent" = callPackage
@@ -3369,7 +3365,6 @@ self: {
        ];
        description = "A concurrent bittorrent client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Command" = callPackage
@@ -3406,7 +3401,6 @@ self: {
        homepage = "https://github.com/sordina/Commando";
        description = "Watch some files; Rerun a command";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ComonadSheet" = callPackage
@@ -3445,7 +3439,6 @@ self: {
        homepage = "http://alkalisoftware.net";
        description = "Concurrent utilities";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Concurrential" = callPackage
@@ -3482,7 +3475,6 @@ self: {
        homepage = "https://github.com/klangner/Condor";
        description = "Information retrieval library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ConfigFile" = callPackage
@@ -3521,7 +3513,6 @@ self: {
        libraryHaskellDepends = [ base Dangerous MissingH mtl parsec ];
        description = "Parse config files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Configurable" = callPackage
@@ -3574,7 +3565,6 @@ self: {
        jailbreak = true;
        description = "Repackages standard type classes with the ConstraintKinds extension";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Consumer" = callPackage
@@ -3587,7 +3577,6 @@ self: {
        homepage = "http://src.seereason.com/ghc6103/haskell-consumer";
        description = "A monad and monad transformer for consuming streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ContArrow" = callPackage
@@ -3624,7 +3613,6 @@ self: {
        homepage = "http://www.cs.kent.ac.uk/~oc/contracts.html";
        description = "Practical typed lazy contracts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Control-Engine" = callPackage
@@ -3658,7 +3646,6 @@ self: {
        homepage = "https://github.com/kevinbackhouse/Control-Monad-MultiPass";
        description = "A Library for Writing Multi-Pass Algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Control-Monad-ST2" = callPackage
@@ -3677,7 +3664,6 @@ self: {
        homepage = "https://github.com/kevinbackhouse/Control-Monad-ST2";
        description = "A variation on the ST monad with two type parameters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CoreDump" = callPackage
@@ -3721,7 +3707,6 @@ self: {
        homepage = "https://github.com/reinerp/CoreFoundation";
        description = "Bindings to Mac OSX's CoreFoundation framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Coroutine" = callPackage
@@ -3733,7 +3718,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Type-safe coroutines using lightweight session types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "CouchDB" = callPackage
@@ -3755,7 +3739,6 @@ self: {
        homepage = "http://github.com/hsenag/haskell-couchdb/";
        description = "CouchDB interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Craft3e" = callPackage
@@ -3774,7 +3757,6 @@ self: {
        homepage = "http://www.haskellcraft.com/";
        description = "Code for Haskell: the Craft of Functional Programming, 3rd ed";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Crypto" = callPackage
@@ -3823,7 +3805,6 @@ self: {
        ];
        description = "CurryDB: In-memory Key/Value Database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DAG-Tournament" = callPackage
@@ -3841,7 +3822,6 @@ self: {
        ];
        description = "Real-Time Game Tournament Evaluator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DAV_1_0_3" = callPackage
@@ -3991,7 +3971,6 @@ self: {
        homepage = "https://github.com/alexkay/hdbus";
        description = "D-Bus bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DCFL" = callPackage
@@ -4038,7 +4017,6 @@ self: {
        jailbreak = true;
        description = "DOM Level 2 bindings for the WebBits package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DP" = callPackage
@@ -4056,7 +4034,6 @@ self: {
        homepage = "http://github.com/srush/SemiRings/tree/master";
        description = "Pragmatic framework for dynamic programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DPM" = callPackage
@@ -4081,7 +4058,6 @@ self: {
        jailbreak = true;
        description = "Darcs Patch Manager";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DRBG_0_5_4" = callPackage
@@ -4185,7 +4161,6 @@ self: {
        ];
        description = "Database Supported Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DSTM" = callPackage
@@ -4206,7 +4181,6 @@ self: {
        ];
        description = "A framework for using STM within distributed systems";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DTC" = callPackage
@@ -4219,7 +4193,6 @@ self: {
        homepage = "https://github.com/Daniel-Diaz/DTC";
        description = "Data To Class transformation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Dangerous" = callPackage
@@ -4231,7 +4204,6 @@ self: {
        libraryHaskellDepends = [ base MaybeT mtl ];
        description = "Monads for operations that can exit early and produce warnings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Dao" = callPackage
@@ -4262,7 +4234,6 @@ self: {
        ];
        description = "Dao is meta programming language with its own built-in interpreted language, designed with artificial intelligence applications in mind";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DarcsHelpers" = callPackage
@@ -4275,7 +4246,6 @@ self: {
        jailbreak = true;
        description = "Code used by Patch-Shack that seemed sensible to open for reusability";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Data-Hash-Consistent" = callPackage
@@ -4303,7 +4273,6 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "Ropes, an alternative to (Byte)Strings";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DataTreeView" = callPackage
@@ -4321,7 +4290,6 @@ self: {
        ];
        description = "A GTK widget for displaying arbitrary Data.Data.Data instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Deadpan-DDP" = callPackage
@@ -4392,7 +4360,6 @@ self: {
        homepage = "http://page.mi.fu-berlin.de/~aneumann/decisiontree.html";
        description = "A very simple implementation of decision trees for discrete attributes";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DeepArrow" = callPackage
@@ -4424,7 +4391,6 @@ self: {
        homepage = "http://github.com/yairchu/defend/tree";
        description = "A simple RTS game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DescriptiveKeys" = callPackage
@@ -4453,7 +4419,6 @@ self: {
        ];
        description = "Processing Real-time event streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Diff_0_3_0" = callPackage
@@ -4510,7 +4475,6 @@ self: {
        homepage = "https://github.com/dillonhuff/DifferenceLogic";
        description = "A theory solver for conjunctions of literals in difference logic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DifferentialEvolution" = callPackage
@@ -4528,7 +4492,6 @@ self: {
        homepage = "http://yousource.it.jyu.fi/optimization-with-haskell";
        description = "Global optimization using Differential Evolution";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Digit" = callPackage
@@ -4576,7 +4539,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "An n-dimensional hash using Morton numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DirectSound" = callPackage
@@ -4611,7 +4573,6 @@ self: {
        homepage = "http://distract.wellquite.org/";
        description = "Distributed Bug Tracking System";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DiscussionSupportSystem" = callPackage
@@ -4715,7 +4676,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Frameshift-aware alignment of protein sequences with DNA sequences";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DocTest" = callPackage
@@ -4735,7 +4695,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/DocTest";
        description = "Test interactive Haskell examples";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Docs" = callPackage
@@ -4768,7 +4727,6 @@ self: {
        homepage = "http://haskell.di.uminho.pt/wiki/DrHylo";
        description = "A tool for deriving hylomorphisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DrIFT" = callPackage
@@ -4786,7 +4744,6 @@ self: {
        homepage = "http://repetae.net/computer/haskell/DrIFT/";
        description = "Program to derive type class instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DrIFT-cabalized" = callPackage
@@ -4801,7 +4758,6 @@ self: {
        homepage = "http://repetae.net/computer/haskell/DrIFT/";
        description = "Program to derive type class instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Dung" = callPackage
@@ -4841,7 +4797,6 @@ self: {
        ];
        description = "Polymorphic protocol engine";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Dust-crypto" = callPackage
@@ -4868,7 +4823,6 @@ self: {
        ];
        description = "Cryptographic operations";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
   "Dust-tools" = callPackage
@@ -4893,7 +4847,6 @@ self: {
        ];
        description = "Network filtering exploration tools";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Dust-tools-pcap" = callPackage
@@ -4915,7 +4868,6 @@ self: {
        ];
        description = "Network filtering exploration tools that rely on pcap";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DynamicTimeWarp" = callPackage
@@ -4935,7 +4887,6 @@ self: {
        homepage = "https://github.com/zombiecalypse/DynamicTimeWarp";
        description = "Dynamic time warping of sequences";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DysFRP" = callPackage
@@ -4962,7 +4913,6 @@ self: {
        homepage = "https://github.com/tilk/DysFRP";
        description = "dysFunctional Reactive Programming on Cairo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "DysFRP-Craftwerk" = callPackage
@@ -4980,7 +4930,6 @@ self: {
        homepage = "https://github.com/tilk/DysFRP";
        description = "dysFunctional Reactive Programming on Craftwerk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "EEConfig" = callPackage
@@ -4992,7 +4941,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "ExtremlyEasyConfig - Extremly Simple parser for config files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Earley_0_9_0" = callPackage
@@ -5096,7 +5044,6 @@ self: {
        homepage = "http://github.com/bspaans/EditTimeReport";
        description = "Query language and report generator for edit logs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "EitherT" = callPackage
@@ -5115,7 +5062,6 @@ self: {
        jailbreak = true;
        description = "EitherT monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Elm" = callPackage
@@ -5173,7 +5119,6 @@ self: {
        homepage = "http://www.muitovar.com";
        description = "derives heuristic rules from nominal data";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Encode" = callPackage
@@ -5189,7 +5134,6 @@ self: {
        homepage = "http://otakar-smrz.users.sf.net/";
        description = "Encoding character data";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "EntrezHTTP" = callPackage
@@ -5231,7 +5175,6 @@ self: {
        jailbreak = true;
        description = "More general IntMap replacement";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Eq" = callPackage
@@ -5251,7 +5194,6 @@ self: {
        jailbreak = true;
        description = "Render math formula in ASCII, and perform some simplifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "EqualitySolver" = callPackage
@@ -5287,7 +5229,6 @@ self: {
        homepage = "http://cielonegro.org/EsounD.html";
        description = "Type-safe bindings to EsounD (ESD; Enlightened Sound Daemon)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "EstProgress" = callPackage
@@ -5325,7 +5266,6 @@ self: {
        homepage = "http://verement.github.io/etamoo";
        description = "A new implementation of the LambdaMOO server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) pcre;};
 
   "Etage" = callPackage
@@ -5342,7 +5282,6 @@ self: {
        homepage = "http://mitar.tnode.com";
        description = "A general data-flow framework";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Etage-Graph" = callPackage
@@ -5363,7 +5302,6 @@ self: {
        homepage = "http://mitar.tnode.com";
        description = "Data-flow based graph algorithms";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Eternal10Seconds" = callPackage
@@ -5378,7 +5316,6 @@ self: {
        homepage = "http://www.kryozahiro.org/eternal10/";
        description = "A 2-D shooting game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Etherbunny" = callPackage
@@ -5401,7 +5338,6 @@ self: {
        homepage = "http://etherbunny.anytini.com/";
        description = "A network analysis toolkit for Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libpcap;};
 
   "EuroIT" = callPackage
@@ -5433,7 +5369,6 @@ self: {
        homepage = "http://haskell.cs.yale.edu/";
        description = "Library for computer music research and education";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "EventSocket" = callPackage
@@ -5449,7 +5384,6 @@ self: {
        ];
        description = "Interfaces with FreeSwitch Event Socket";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Extra" = callPackage
@@ -5496,7 +5430,6 @@ self: {
        jailbreak = true;
        description = "Compose music";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FM-SBLEX" = callPackage
@@ -5511,7 +5444,6 @@ self: {
        homepage = "http://spraakbanken.gu.se/eng/research/swefn/fm-sblex";
        description = "A set of computational morphology tools for Swedish diachronic lexicons";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FModExRaw" = callPackage
@@ -5525,7 +5457,6 @@ self: {
        homepage = "https://github.com/skypers/hsFModEx";
        description = "The Haskell FModEx raw API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {fmodex64 = null;};
 
   "FPretty" = callPackage
@@ -5550,7 +5481,6 @@ self: {
        librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) ftgl;};
 
   "FTGL-bytestring" = callPackage
@@ -5567,7 +5497,6 @@ self: {
        librarySystemDepends = [ ftgl ];
        description = "Portable TrueType font rendering for OpenGL using the Freetype2 library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) ftgl;};
 
   "FTPLine" = callPackage
@@ -5613,7 +5542,6 @@ self: {
        libraryHaskellDepends = [ base base-unicode-symbols mmtl ];
        description = "Failure Monad Transformer";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FastxPipe" = callPackage
@@ -5694,7 +5622,6 @@ self: {
        homepage = "http://www.scannedinavian.com/";
        description = "Annotate ps and pdf documents";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FerryCore" = callPackage
@@ -5711,7 +5638,6 @@ self: {
        ];
        description = "Ferry Core Components";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Feval" = callPackage
@@ -5744,7 +5670,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/FieldTrip";
        description = "Functional 3D";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FileManip" = callPackage
@@ -5760,7 +5685,6 @@ self: {
        ];
        description = "Expressive file and directory manipulation for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FileManipCompat" = callPackage
@@ -5776,7 +5700,6 @@ self: {
        ];
        description = "Expressive file and directory manipulation for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FilePather" = callPackage
@@ -5811,7 +5734,6 @@ self: {
        homepage = "http://ddiaz.asofilak.es/packages/FileSystem";
        description = "File system data structure and monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Finance-Quote-Yahoo" = callPackage
@@ -5828,7 +5750,6 @@ self: {
        homepage = "http://www.b7j0c.org/stuff/haskell-yquote.xhtml";
        description = "Obtain quote data from finance.yahoo.com";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Finance-Treasury" = callPackage
@@ -5846,7 +5767,6 @@ self: {
        homepage = "http://www.ecoin.net/haskell/Finance-Treasury.html";
        description = "Obtain Treasury yield curve data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FindBin" = callPackage
@@ -5870,7 +5790,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "A finite map implementation, derived from the paper: Efficient sets: a balancing act, S. Adams, Journal of functional programming 3(4) Oct 1993, pp553-562";
        license = stdenv.lib.licenses.bsdOriginal;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FirstOrderTheory" = callPackage
@@ -5883,7 +5802,6 @@ self: {
        jailbreak = true;
        description = "Grammar and typeclass for first order theories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FixedPoint-simple" = callPackage
@@ -5914,7 +5832,6 @@ self: {
        homepage = "http://www.flippac.org/projects/flippi/";
        description = "Wiki";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Focus" = callPackage
@@ -6061,7 +5978,6 @@ self: {
        homepage = "http://www.ict.kth.se/forsyde/";
        description = "ForSyDe's Haskell-embedded Domain Specific Language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ForkableT" = callPackage
@@ -6098,7 +6014,6 @@ self: {
        homepage = "https://github.com/choener/FormalGrammars";
        description = "(Context-free) grammars in formal language theory";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Foster" = callPackage
@@ -6117,7 +6032,6 @@ self: {
        jailbreak = true;
        description = "Utilities to generate and solve puzzles";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FpMLv53" = callPackage
@@ -6153,7 +6067,6 @@ self: {
        homepage = "https://github.com/TomSmeets/FractalArt";
        description = "Generates colorful wallpapers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libX11;};
 
   "Fractaler" = callPackage
@@ -6171,7 +6084,6 @@ self: {
        ];
        jailbreak = true;
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Frames" = callPackage
@@ -6204,7 +6116,6 @@ self: {
        homepage = "http://personal.cis.strath.ac.uk/~conor/pub/Frank/";
        description = "An experimental programming language with typed algebraic effects";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FreeTypeGL" = callPackage
@@ -6219,7 +6130,6 @@ self: {
        jailbreak = true;
        description = "Loadable texture fonts for OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "FunGEn" = callPackage
@@ -6238,7 +6148,6 @@ self: {
        homepage = "http://joyful.com/fungen";
        description = "A lightweight, cross-platform, OpenGL/GLUT-based game engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "Fungi" = callPackage
@@ -6313,7 +6222,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/GLFW";
        description = "A Haskell binding for GLFW";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;};
 
   "GLFW-OGL" = callPackage
@@ -6327,7 +6235,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/GLFW-OGL";
        description = "A binding for GLFW (OGL)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;};
 
   "GLFW-b" = callPackage
@@ -6346,7 +6253,6 @@ self: {
        doCheck = false;
        description = "Bindings to GLFW OpenGL library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "GLFW-b-demo" = callPackage
@@ -6365,7 +6271,6 @@ self: {
        jailbreak = true;
        description = "GLFW-b demo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "GLFW-task" = callPackage
@@ -6381,7 +6286,6 @@ self: {
        homepage = "http://github.com/ninegua/GLFW-task";
        description = "GLFW utility functions to use together with monad-task";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "GLHUI" = callPackage
@@ -6394,7 +6298,6 @@ self: {
        librarySystemDepends = [ libX11 mesa ];
        description = "Open OpenGL context windows in X11 with libX11";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa;};
 
   "GLM" = callPackage
@@ -6437,7 +6340,6 @@ self: {
        homepage = "https://github.com/fiendfan1/GLMatrix";
        description = "Utilities for working with OpenGL matrices";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GLURaw_1_4_0_1" = callPackage
@@ -6530,7 +6432,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A raw binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLUT_2_5_1_1" = callPackage
@@ -6633,7 +6534,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL Utility Toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "GLUtil" = callPackage
@@ -6652,7 +6552,6 @@ self: {
        jailbreak = true;
        description = "Miscellaneous OpenGL utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GPX" = callPackage
@@ -6671,7 +6570,6 @@ self: {
        homepage = "https://github.com/tonymorris/geo-gpx";
        description = "Parse GPX files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GPipe_2_1_5" = callPackage
@@ -6740,7 +6638,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/GPipe";
        description = "Load GPipe meshes from Collada files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GPipe-Examples" = callPackage
@@ -6758,10 +6655,9 @@ self: {
        ];
        description = "Examples for the GPipes package";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "GPipe-GLFW" = callPackage
+  "GPipe-GLFW_1_2_1" = callPackage
     ({ mkDerivation, base, GLFW-b, GPipe, transformers }:
      mkDerivation {
        pname = "GPipe-GLFW";
@@ -6771,7 +6667,19 @@ self: {
        homepage = "https://github.com/plredmond/GPipe-GLFW";
        description = "GLFW OpenGL context creation for GPipe";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "GPipe-GLFW" = callPackage
+    ({ mkDerivation, base, GLFW-b, GPipe, transformers }:
+     mkDerivation {
+       pname = "GPipe-GLFW";
+       version = "1.2.2";
+       sha256 = "b2c2764511504225550b7e03badba80ba6e264eb86bee3fcc2f7d54e2e11d652";
+       libraryHaskellDepends = [ base GLFW-b GPipe transformers ];
+       homepage = "https://github.com/plredmond/GPipe-GLFW";
+       description = "GLFW OpenGL context creation for GPipe";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "GPipe-TextureLoad" = callPackage
@@ -6784,7 +6692,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/GPipe";
        description = "Load GPipe textures from filesystem";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GTALib" = callPackage
@@ -6805,7 +6712,6 @@ self: {
        homepage = "https://bitbucket.org/emoto/gtalib";
        description = "A library for GTA programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Gamgine" = callPackage
@@ -6826,7 +6732,6 @@ self: {
        jailbreak = true;
        description = "Some kind of game library or set of utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Ganymede" = callPackage
@@ -6846,7 +6751,6 @@ self: {
        homepage = "https://github.com/BMeph/Ganymede";
        description = "An Io interpreter in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GaussQuadIntegration" = callPackage
@@ -6908,7 +6812,6 @@ self: {
        homepage = "http://projects.haskell.org/GenI";
        description = "A natural language generator (specifically, an FB-LTAG surface realiser)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GenSmsPdu" = callPackage
@@ -6922,7 +6825,6 @@ self: {
        executableHaskellDepends = [ base haskell98 QuickCheck random ];
        description = "Automatic SMS message generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Genbank" = callPackage
@@ -6956,7 +6858,6 @@ self: {
        homepage = "http://afonso.xyz";
        description = "A general TicTacToe game implementation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GenericPretty" = callPackage
@@ -6998,7 +6899,6 @@ self: {
        homepage = "https://github.com/choener/GenussFold";
        description = "MCFGs for Genus-1 RNA Pseudoknots";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GeoIp" = callPackage
@@ -7010,7 +6910,6 @@ self: {
        libraryHaskellDepends = [ base bytestring bytestring-mmap syb ];
        description = "Pure bindings for the MaxMind IP database";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GeocoderOpenCage" = callPackage
@@ -7024,7 +6923,6 @@ self: {
        homepage = "https://github.com/juergenhah/Haskell-Geocoder-OpenCage.git";
        description = "Geocoder and Reverse Geocoding Service Wrapper";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Geodetic" = callPackage
@@ -7059,7 +6957,6 @@ self: {
        libraryHaskellDepends = [ base GeomPredicates ];
        description = "Geometric predicates (Intel SSE)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GiST" = callPackage
@@ -7078,8 +6975,8 @@ self: {
     ({ mkDerivation, base, directory, gtk3, process, temporary }:
      mkDerivation {
        pname = "Gifcurry";
-       version = "0.1.0.5";
-       sha256 = "6a862236c56993145cbcc015739a596c4ee46d5488f28544e0cf7ee8759b362c";
+       version = "0.1.0.6";
+       sha256 = "73a6b620ced2f499d52563803fc5684d4470947713328afe347df63ce115772f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -7130,7 +7027,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Glome";
        description = "Ray Tracing Library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GlomeVec" = callPackage
@@ -7162,7 +7058,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Glome";
        description = "SDL Frontend for Glome ray tracer";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GoogleChart" = callPackage
@@ -7191,7 +7086,6 @@ self: {
        homepage = "https://github.com/favilo/GoogleDirections.git";
        description = "Haskell Interface to Google Directions API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GoogleSB" = callPackage
@@ -7207,7 +7101,6 @@ self: {
        ];
        description = "Interface to Google Safe Browsing API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GoogleSuggest" = callPackage
@@ -7235,7 +7128,6 @@ self: {
        ];
        description = "Interface to Google Translate API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GotoT-transformers" = callPackage
@@ -7272,7 +7164,6 @@ self: {
        homepage = "https://github.com/choener/GrammarProducts";
        description = "Grammar products and higher-dimensional grammars";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Graph500" = callPackage
@@ -7291,7 +7182,6 @@ self: {
        executableHaskellDepends = [ array base mtl ];
        description = "Graph500 benchmark-related definitions and data set generator";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GraphHammer" = callPackage
@@ -7306,7 +7196,6 @@ self: {
        ];
        description = "GraphHammer Haskell graph analyses framework inspired by STINGER";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GraphHammer-examples" = callPackage
@@ -7324,7 +7213,6 @@ self: {
        ];
        description = "Test harness for TriangleCount analysis";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GraphSCC" = callPackage
@@ -7369,7 +7257,6 @@ self: {
        ];
        description = "Embedded grammar DSL and LALR parser generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GroteTrap" = callPackage
@@ -7406,7 +7293,6 @@ self: {
        homepage = "http://coiffier.net/projects/grow.html";
        description = "A declarative make-like interpreter";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GrowlNotify" = callPackage
@@ -7427,7 +7313,6 @@ self: {
        ];
        description = "Notification utility for Growl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Gtk2hsGenerics" = callPackage
@@ -7443,7 +7328,6 @@ self: {
        ];
        description = "Convenience functions to extend Gtk2hs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GtkGLTV" = callPackage
@@ -7459,7 +7343,6 @@ self: {
        ];
        description = "OpenGL support for Gtk-based GUIs for Tangible Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GtkTV" = callPackage
@@ -7493,7 +7376,6 @@ self: {
        homepage = "http://www-users.cs.york.ac.uk/~ndm/guihaskell/";
        description = "A graphical REPL and development environment for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "GuiTV" = callPackage
@@ -7506,7 +7388,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/GuiTV";
        description = "GUIs for Tangible Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "H" = callPackage
@@ -7531,7 +7412,6 @@ self: {
        doCheck = false;
        description = "The Haskell/R mixed programming environment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HARM" = callPackage
@@ -7547,7 +7427,6 @@ self: {
        homepage = "http://www.engr.uconn.edu/~jeffm/Classes/CSE240-Spring-2001/Lectures/index.html";
        description = "A simple ARM emulator in haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HAppS-Data" = callPackage
@@ -7565,7 +7444,6 @@ self: {
        jailbreak = true;
        description = "HAppS data manipulation libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HAppS-IxSet" = callPackage
@@ -7581,7 +7459,6 @@ self: {
          syb-with-class template-haskell
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HAppS-Server" = callPackage
@@ -7603,7 +7480,6 @@ self: {
        jailbreak = true;
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HAppS-State" = callPackage
@@ -7624,7 +7500,6 @@ self: {
        jailbreak = true;
        description = "Event-based distributed state";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HAppS-Util" = callPackage
@@ -7641,7 +7516,6 @@ self: {
        ];
        description = "Web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HAppSHelpers" = callPackage
@@ -7671,7 +7545,6 @@ self: {
        homepage = "http://github.com/m4dc4p/hcl/tree/master";
        description = "High-level library for building command line interfaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HCard" = callPackage
@@ -7686,7 +7559,6 @@ self: {
        homepage = "http://patch-tag.com/publicrepos/HCard";
        description = "A library for implementing a Deck of Cards";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HCodecs" = callPackage
@@ -7733,7 +7605,6 @@ self: {
        homepage = "http://github.com/bos/hdbc-mysql";
        description = "MySQL driver for HDBC";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HDBC-odbc" = callPackage
@@ -7832,7 +7703,6 @@ self: {
        homepage = "http://vis.renci.org/jeff/pfs";
        description = "Utilities for reading, manipulating, and writing HDR images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) pfstools;};
 
   "HERA" = callPackage
@@ -7844,7 +7714,6 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ mpfr ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mpfr;};
 
   "HFrequencyQueue" = callPackage
@@ -7858,7 +7727,6 @@ self: {
        homepage = "https://github.com/Bellaz/HfrequencyList";
        description = "A Queue with a random (weighted) pick function";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HFuse" = callPackage
@@ -7877,7 +7745,6 @@ self: {
        homepage = "https://github.com/m15k/hfuse";
        description = "HFuse is a binding for the Linux FUSE library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) fuse;};
 
   "HGL" = callPackage
@@ -7889,7 +7756,6 @@ self: {
        libraryHaskellDepends = [ array base X11 ];
        description = "A simple graphics library based on X11 or Win32";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGamer3D" = callPackage
@@ -7909,7 +7775,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "Toolset for the Haskell Game Programmer";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {Urho3D = null; hgamer3d062 = null;};
 
   "HGamer3D-API" = callPackage
@@ -7928,7 +7793,6 @@ self: {
        homepage = "http://www.althainz.de/HGamer3D.html";
        description = "Library to enable 3D game development for Haskell - API";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGamer3D-Audio" = callPackage
@@ -7945,7 +7809,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "Toolset for the Haskell Game Programmer - Audio Functionality";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGamer3D-Bullet-Binding" = callPackage
@@ -7958,7 +7821,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "Windows Game Engine for the Haskell Programmer - Bullet Bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGamer3D-CAudio-Binding" = callPackage
@@ -7974,7 +7836,6 @@ self: {
        homepage = "http://www.althainz.de/HGamer3D.html";
        description = "Library to enable 3D game development for Haskell - cAudio Bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {HGamer3DCAudio015 = null;};
 
   "HGamer3D-CEGUI-Binding" = callPackage
@@ -7992,7 +7853,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "A Toolset for the Haskell Game Programmer - CEGUI Bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {CEGUIBase = null; CEGUIOgreRenderer = null; 
          hg3dcegui050 = null;};
 
@@ -8011,7 +7871,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "Toolset for the Haskell Game Programmer - Game Engine and Utilities";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGamer3D-Data" = callPackage
@@ -8028,7 +7887,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "Toolset for the Haskell Game Programmer - Data Definitions";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGamer3D-Enet-Binding" = callPackage
@@ -8042,7 +7900,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "Enet Binding for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) enet; hg3denet050 = null;};
 
   "HGamer3D-GUI" = callPackage
@@ -8060,7 +7917,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "GUI Functionality for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGamer3D-Graphics3D" = callPackage
@@ -8081,7 +7937,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "Toolset for the Haskell Game Programmer - 3D Graphics Functionality";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGamer3D-InputSystem" = callPackage
@@ -8099,7 +7954,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "Joystick, Mouse and Keyboard Functionality for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGamer3D-Network" = callPackage
@@ -8116,7 +7970,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "Networking Functionality for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGamer3D-OIS-Binding" = callPackage
@@ -8135,7 +7988,6 @@ self: {
        homepage = "http://www.althainz.de/HGamer3D.html";
        description = "Library to enable 3D game development for Haskell - OIS Bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {HGamer3DOIS015 = null;};
 
   "HGamer3D-Ogre-Binding" = callPackage
@@ -8155,7 +8007,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "Ogre Binding for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {OgreMain = null; OgrePaging = null; OgreProperty = null; 
          OgreRTShaderSystem = null; OgreTerrain = null; 
          hg3dogre050 = null;};
@@ -8175,7 +8026,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "SDL2 Binding for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2; hg3dsdl2050 = null; 
          inherit (pkgs.xorg) libX11;};
 
@@ -8194,7 +8044,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "SFML Binding for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {hg3dsfml050 = null; sfml-audio = null; sfml-network = null; 
          sfml-system = null; sfml-window = null;};
 
@@ -8212,7 +8061,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "Windowing and Event Functionality for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGamer3D-Wire" = callPackage
@@ -8232,7 +8080,6 @@ self: {
        homepage = "http://www.hgamer3d.org";
        description = "Wire Functionality for HGamer3D";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HGraphStorage" = callPackage
@@ -8258,7 +8105,6 @@ self: {
        homepage = "https://github.com/JPMoresmau/HGraphStorage";
        description = "Graph database stored on disk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HHDL" = callPackage
@@ -8272,7 +8118,6 @@ self: {
        homepage = "http://thesz.mskhug.ru/svn/hhdl/hackage/hhdl/";
        description = "Hardware Description Language embedded in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HJScript" = callPackage
@@ -8308,7 +8153,6 @@ self: {
        homepage = "https://github.com/JPMoresmau/HJVM";
        description = "A library to create a Java Virtual Machine and manipulate Java objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {jvm = null;};
 
   "HJavaScript" = callPackage
@@ -8339,7 +8183,6 @@ self: {
        homepage = "http://github.com/mikeizbicki/HLearn/";
        description = "Algebraic foundation for homomorphic learning";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HLearn-approximation" = callPackage
@@ -8356,7 +8199,6 @@ self: {
          HLearn-datastructures HLearn-distributions list-extras vector
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HLearn-classification" = callPackage
@@ -8379,7 +8221,6 @@ self: {
        jailbreak = true;
        homepage = "http://github.com/mikeizbicki/HLearn/";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HLearn-datastructures" = callPackage
@@ -8395,7 +8236,6 @@ self: {
          MonadRandom QuickCheck vector
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HLearn-distributions" = callPackage
@@ -8418,7 +8258,6 @@ self: {
        homepage = "http://github.com/mikeizbicki/HLearn/";
        description = "Distributions for use with the HLearn library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HList_0_4_1_0" = callPackage
@@ -8495,7 +8334,6 @@ self: {
        homepage = "http://www.pontarius.org/sub-projects/hlogger/";
        description = "Simple, concurrent and easy-to-use logging library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HMM" = callPackage
@@ -8507,7 +8345,6 @@ self: {
        homepage = "https://github.com/mikeizbicki/hmm";
        description = "A hidden markov model library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HMap" = callPackage
@@ -8524,7 +8361,6 @@ self: {
        homepage = "https://github.com/atzeus/HMap";
        description = "Fast heterogeneous maps and unconstrained typeable like functionality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HNM" = callPackage
@@ -8547,7 +8383,6 @@ self: {
        homepage = "http://sert.homedns.org/hs/hnm/";
        description = "Happy Network Manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HODE" = callPackage
@@ -8560,7 +8395,6 @@ self: {
        librarySystemDepends = [ ode ];
        description = "Binding to libODE";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ode;};
 
   "HOpenCV" = callPackage
@@ -8577,7 +8411,6 @@ self: {
        executablePkgconfigDepends = [ opencv ];
        description = "A binding for the OpenCV computer vision library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) opencv;};
 
   "HPDF" = callPackage
@@ -8620,7 +8453,6 @@ self: {
        homepage = "http://github.com/solidsnack/HPath";
        description = "Extract Haskell declarations by name";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HPi" = callPackage
@@ -8634,7 +8466,6 @@ self: {
        homepage = "https://github.com/WJWH/HPi";
        description = "GPIO, I2C and SPI functions for the Raspberry Pi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {bcm2835 = null;};
 
   "HPlot" = callPackage
@@ -8654,7 +8485,6 @@ self: {
        homepage = "http://yakov.cc/HPlot.html";
        description = "A minimal monadic PLplot interface for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {plplotd-gnome2 = null;};
 
   "HPong" = callPackage
@@ -8673,7 +8503,6 @@ self: {
        homepage = "http://bonsaicode.wordpress.com/2009/04/23/hpong-012/";
        description = "A simple OpenGL Pong game based on GLFW";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HROOT" = callPackage
@@ -8693,7 +8522,6 @@ self: {
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT RooFit modules";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HROOT-core" = callPackage
@@ -8706,7 +8534,6 @@ self: {
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Core modules";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HROOT-graf" = callPackage
@@ -8721,7 +8548,6 @@ self: {
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Graf modules";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HROOT-hist" = callPackage
@@ -8734,7 +8560,6 @@ self: {
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Hist modules";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HROOT-io" = callPackage
@@ -8747,7 +8572,6 @@ self: {
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT IO modules";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HROOT-math" = callPackage
@@ -8760,7 +8584,6 @@ self: {
        homepage = "http://ianwookim.org/HROOT";
        description = "Haskell binding to ROOT Math modules";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HRay" = callPackage
@@ -8775,7 +8598,6 @@ self: {
        homepage = "http://boegel.kejo.be/ELIS/Haskell/HRay/";
        description = "Haskell raytracer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HSFFIG" = callPackage
@@ -8798,7 +8620,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/HSFFIG";
        description = "Generate FFI import declarations from C include files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HSGEP" = callPackage
@@ -8818,7 +8639,6 @@ self: {
        homepage = "http://github.com/mjsottile/hsgep/";
        description = "Gene Expression Programming evolutionary algorithm in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HSH" = callPackage
@@ -8857,7 +8677,6 @@ self: {
        jailbreak = true;
        description = "Convenience functions that use HSH, instances for HSH";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HSlippyMap" = callPackage
@@ -8889,7 +8708,6 @@ self: {
        homepage = "https://github.com/agrafix/HSmarty";
        description = "Small template engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HSoundFile" = callPackage
@@ -8906,7 +8724,6 @@ self: {
        homepage = "http://mml.music.utexas.edu/jwlato/HSoundFile";
        description = "Audio file reading/writing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HStringTemplate_0_7_3" = callPackage
@@ -8985,7 +8802,6 @@ self: {
        homepage = "http://patch-tag.com/tphyahoo/r/tphyahoo/HStringTemplateHelpers";
        description = "Convenience functions and instances for HStringTemplate";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HSvm" = callPackage
@@ -8997,7 +8813,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Haskell Bindings for libsvm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HTF_0_12_2_3" = callPackage
@@ -9375,7 +9190,6 @@ self: {
        homepage = "http://www.glyc.dc.uba.ar/intohylo/htab.php";
        description = "Tableau based theorem prover for hybrid logics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HTicTacToe" = callPackage
@@ -9393,7 +9207,6 @@ self: {
        homepage = "http://github.com/snkkid/HTicTacToe";
        description = "An SDL tic-tac-toe game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HUnit_1_2_5_2" = callPackage
@@ -9463,7 +9276,6 @@ self: {
        homepage = "https://github.com/dag/HUnit-Diff";
        description = "Assertions for HUnit with difference reporting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HUnit-Plus" = callPackage
@@ -9485,7 +9297,6 @@ self: {
        homepage = "https://github.com/emc2/HUnit-Plus";
        description = "A test framework building on HUnit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HUnit-approx" = callPackage
@@ -9527,7 +9338,6 @@ self: {
        homepage = "http://www.pontarius.org/sub-projects/hxmpp/";
        description = "A (prototyped) easy to use XMPP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HXQ" = callPackage
@@ -9545,7 +9355,6 @@ self: {
        homepage = "http://lambda.uta.edu/HXQ/";
        description = "A Compiler from XQuery to Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaLeX" = callPackage
@@ -9560,7 +9369,6 @@ self: {
        homepage = "http://www.di.uminho.pt/~jas/Research/HaLeX/HaLeX.html";
        description = "HaLeX enables modelling, manipulation and animation of regular languages";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaMinitel" = callPackage
@@ -9718,7 +9526,6 @@ self: {
        homepage = "https://github.com/RefactoringTools/HaRe/wiki";
        description = "the Haskell Refactorer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaTeX_3_15_0_0" = callPackage
@@ -9823,9 +9630,8 @@ self: {
          haskell-src-exts mtl parsec
        ];
        jailbreak = true;
-       description = "This package is deprecated. From version 3, HaTeX does not need this anymore";
+       description = "This package is deprecated. From version 3, HaTeX does not need this anymore.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaTeX-qq" = callPackage
@@ -9862,7 +9668,6 @@ self: {
        jailbreak = true;
        description = "An implementation of the Version Space Algebra learning framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaXml_1_24_1" = callPackage
@@ -9962,7 +9767,6 @@ self: {
        homepage = "http://github.com/dmalikov/HaCh";
        description = "Simple chat";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HackMail" = callPackage
@@ -9984,7 +9788,6 @@ self: {
        homepage = "http://patch-tag.com/publicrepos/Hackmail";
        description = "A Procmail Replacement as Haskell EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Haggressive" = callPackage
@@ -10003,7 +9806,6 @@ self: {
        homepage = "https://github.com/Pold87/Haggressive";
        description = "Aggression analysis for Tweets on Twitter";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HandlerSocketClient" = callPackage
@@ -10104,7 +9906,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/HarmTrace";
        description = "Harmony Analysis and Retrieval of Music";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HarmTrace-Base" = callPackage
@@ -10125,7 +9926,6 @@ self: {
        homepage = "https://bitbucket.org/bash/harmtrace-base";
        description = "Parsing and unambiguously representing musical chords";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HasGP" = callPackage
@@ -10143,7 +9943,6 @@ self: {
        homepage = "http://www.cl.cam.ac.uk/~sbh11/HasGP";
        description = "A Haskell library for inference using Gaussian processes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Haschoo" = callPackage
@@ -10163,7 +9962,6 @@ self: {
        homepage = "http://iki.fi/matti.niemenmaa/misc-projects.html#haschoo";
        description = "Minimalist R5RS Scheme interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hashell" = callPackage
@@ -10183,7 +9981,6 @@ self: {
        jailbreak = true;
        description = "Simple shell written in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaskRel" = callPackage
@@ -10222,7 +10019,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix ];
        description = "Pure Haskell implementation of the Levenberg-Marquardt algorithm";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaskellNN" = callPackage
@@ -10234,7 +10030,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix random ];
        description = "High Performance Neural Network in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaskellNet_0_4_2" = callPackage
@@ -10362,7 +10157,6 @@ self: {
        ];
        description = "A concurrent bittorrent client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HaskellTutorials" = callPackage
@@ -10397,7 +10191,6 @@ self: {
        homepage = "http://www.matthewhayden.co.uk";
        description = "A reproduction of the Atari 1979 classic \"Asteroids\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hate" = callPackage
@@ -10423,7 +10216,6 @@ self: {
        homepage = "http://github.com/bananu7/Hate";
        description = "A small 2D game framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hawk" = callPackage
@@ -10446,7 +10238,6 @@ self: {
        jailbreak = true;
        description = "Haskell Web Application Kit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hayoo" = callPackage
@@ -10475,7 +10266,6 @@ self: {
        homepage = "http://holumbus.fh-wedel.de";
        description = "The Hayoo! search engine for Haskell API search on hackage";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hclip" = callPackage
@@ -10509,7 +10299,6 @@ self: {
        ];
        description = "Line oriented editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HerbiePlugin" = callPackage
@@ -10547,7 +10336,6 @@ self: {
        jailbreak = true;
        description = "Message-based middleware layer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hieroglyph" = callPackage
@@ -10567,7 +10355,6 @@ self: {
        homepage = "http://vis.renci.org/jeff/hieroglyph";
        description = "Purely functional 2D graphics for visualization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HiggsSet" = callPackage
@@ -10585,7 +10372,6 @@ self: {
        homepage = "http://github.com/lpeterse/HiggsSet";
        description = "A multi-index set with advanced query capabilites";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hipmunk" = callPackage
@@ -10600,7 +10386,6 @@ self: {
        homepage = "https://github.com/meteficha/Hipmunk";
        description = "A Haskell binding for Chipmunk";
        license = "unknown";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "HipmunkPlayground" = callPackage
@@ -10620,7 +10405,6 @@ self: {
        homepage = "https://github.com/meteficha/HipmunkPlayground";
        description = "A playground for testing Hipmunk";
        license = "unknown";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "Hish" = callPackage
@@ -10669,7 +10453,6 @@ self: {
        ];
        description = "An MPD client designed for a Home Theatre PC";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hoed" = callPackage
@@ -10691,7 +10474,6 @@ self: {
        homepage = "https://wiki.haskell.org/Hoed";
        description = "Lightweight algorithmic debugging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HoleyMonoid" = callPackage
@@ -10724,7 +10506,6 @@ self: {
        homepage = "http://holumbus.fh-wedel.de";
        description = "intra- and inter-program communication";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Holumbus-MapReduce" = callPackage
@@ -10747,7 +10528,6 @@ self: {
        homepage = "http://holumbus.fh-wedel.de";
        description = "a distributed MapReduce framework";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Holumbus-Searchengine" = callPackage
@@ -10769,7 +10549,6 @@ self: {
        homepage = "http://holumbus.fh-wedel.de";
        description = "A search and indexing engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Holumbus-Storage" = callPackage
@@ -10790,7 +10569,6 @@ self: {
        homepage = "http://holumbus.fh-wedel.de";
        description = "a distributed storage system";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Homology" = callPackage
@@ -10823,7 +10601,6 @@ self: {
        jailbreak = true;
        description = "A Simple Key Value Store";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HostAndPort" = callPackage
@@ -10852,7 +10629,6 @@ self: {
        homepage = "http://github.com/Raynes/Hricket";
        description = "A Cricket scoring application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hs2lib" = callPackage
@@ -10881,7 +10657,6 @@ self: {
        homepage = "http://blog.zhox.com/category/hs2lib/";
        description = "A Library and Preprocessor that makes it easier to create shared libs from Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HsASA" = callPackage
@@ -10905,7 +10680,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell binding to libharu (http://libharu.sourceforge.net/)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HsHyperEstraier" = callPackage
@@ -10924,7 +10698,6 @@ self: {
        homepage = "http://cielonegro.org/HsHyperEstraier.html";
        description = "HyperEstraier binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {hyperestraier = null; qdbm = null;};
 
   "HsJudy" = callPackage
@@ -10938,7 +10711,6 @@ self: {
        homepage = "http://www.pugscode.org/";
        description = "Judy bindings, and some nice APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {Judy = null;};
 
   "HsOpenSSL" = callPackage
@@ -10999,7 +10771,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Haskell interface to embedded Perl 5 interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HsSVN" = callPackage
@@ -11013,7 +10784,6 @@ self: {
        homepage = "https://github.com/phonohawk/HsSVN";
        description = "Partial Subversion (SVN) binding for Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HsSyck" = callPackage
@@ -11061,7 +10831,6 @@ self: {
        homepage = "http://github.com/rukav/Hsed";
        description = "Stream Editor in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hsmtlib" = callPackage
@@ -11081,7 +10850,6 @@ self: {
        homepage = "https://github.com/MfesGA/Hsmtlib";
        description = "Haskell library for easy interaction with SMT-LIB 2 compliant solvers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "HueAPI" = callPackage
@@ -11116,7 +10884,6 @@ self: {
        homepage = "http://github.com/tobs169/HulkImport#readme";
        description = "Easily bulk import CSV data to SQL Server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Hungarian-Munkres" = callPackage
@@ -11145,7 +10912,6 @@ self: {
        jailbreak = true;
        description = "Indexable, serializable form of Data.Dynamic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "IFS" = callPackage
@@ -11162,7 +10928,6 @@ self: {
        homepage = "http://www.alpheccar.org";
        description = "Iterated Function System generation for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "INblobs" = callPackage
@@ -11182,7 +10947,6 @@ self: {
        homepage = "http://haskell.di.uminho.pt/jmvilaca/INblobs/";
        description = "Editor and interpreter for Interaction Nets";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "IOR" = callPackage
@@ -11194,7 +10958,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Region based resource management for the IO monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "IORefCAS" = callPackage
@@ -11212,7 +10975,6 @@ self: {
        homepage = "https://github.com/rrnewton/haskell-lockfree-queue/wiki";
        description = "Atomic compare and swap for IORefs and STRefs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "IOSpec" = callPackage
@@ -11290,7 +11052,6 @@ self: {
        homepage = "https://github.com/mmirman/ImperativeHaskell";
        description = "A library for writing Imperative style haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "IndentParser" = callPackage
@@ -11327,7 +11088,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 ];
        description = "liftA2 for infix operators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Interpolation" = callPackage
@@ -11411,7 +11171,6 @@ self: {
        homepage = "https://github.com/yunxing/Irc";
        description = "DSL for IRC bots";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "IrrHaskell" = callPackage
@@ -11462,7 +11221,6 @@ self: {
        ];
        description = "A combinator library on top of a generalised JSON type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JSON-Combinator-Examples" = callPackage
@@ -11476,7 +11234,6 @@ self: {
        ];
        description = "Example uses of the JSON-Combinator library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JSONb" = callPackage
@@ -11503,7 +11260,6 @@ self: {
        homepage = "http://github.com/solidsnack/JSONb/";
        description = "JSON parser that uses byte strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JYU-Utils" = callPackage
@@ -11524,7 +11280,6 @@ self: {
        jailbreak = true;
        description = "Some utility functions for JYU projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JackMiniMix" = callPackage
@@ -11537,7 +11292,6 @@ self: {
        homepage = "http://www.renickbell.net/doku.php?id=jackminimix";
        description = "control JackMiniMix";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Javasf" = callPackage
@@ -11554,7 +11308,6 @@ self: {
        ];
        description = "A utility to print the SourceFile attribute of one or more Java class files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Javav" = callPackage
@@ -11568,7 +11321,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A utility to print the target version of Java class files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JsContracts" = callPackage
@@ -11592,7 +11344,6 @@ self: {
        homepage = "http://www.cs.brown.edu/research/plt/";
        description = "Design-by-contract for JavaScript";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JsonGrammar" = callPackage
@@ -11618,7 +11369,6 @@ self: {
        homepage = "https://github.com/MedeaMelana/JsonGrammar2";
        description = "Combinators for bidirectional JSON parsing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JuicyPixels_3_1_7_1" = callPackage
@@ -11999,7 +11749,6 @@ self: {
        ];
        jailbreak = true;
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "JunkDB-driver-hashtables" = callPackage
@@ -12098,7 +11847,6 @@ self: {
        homepage = "https://github.com/Hamcha/Ketchup";
        description = "A super small web framework for those who don't like big and fancy codebases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "KiCS" = callPackage
@@ -12124,7 +11872,6 @@ self: {
        homepage = "http://www.curry-language.org";
        description = "A compiler from Curry to Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {kics = null;};
 
   "KiCS-debugger" = callPackage
@@ -12147,7 +11894,6 @@ self: {
        homepage = "http://curry-language.org";
        description = "debug features for kics";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "KiCS-prophecy" = callPackage
@@ -12164,7 +11910,6 @@ self: {
        homepage = "http://curry-language.org";
        description = "a transformation used by the kics debugger";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Kleislify" = callPackage
@@ -12174,7 +11919,7 @@ self: {
        version = "0.0.4";
        sha256 = "d4f78a0d7a526398301c5e959ae61151acc2325bdcf86e7a4b909cb3ba36ee38";
        libraryHaskellDepends = [ base ];
-       description = "Variants of Control.Arrow functions, specialised to kleislis";
+       description = "Variants of Control.Arrow functions, specialised to kleislis.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -12189,7 +11934,6 @@ self: {
        homepage = "http://www.gkayaalp.com/p/konf.html";
        description = "A configuration language and a parser";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Kriens" = callPackage
@@ -12217,7 +11961,6 @@ self: {
        homepage = "https://code.google.com/p/kyotocabinet-hs/";
        description = "Kyoto Cabinet DB bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) kyotocabinet;};
 
   "L-seed" = callPackage
@@ -12237,7 +11980,6 @@ self: {
        homepage = "http://www.entropia.de/wiki/L-seed";
        description = "Plant growing programming game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LDAP" = callPackage
@@ -12295,7 +12037,6 @@ self: {
        ];
        description = "A basic lambda calculator with beta reduction and a REPL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LambdaHack" = callPackage
@@ -12338,7 +12079,6 @@ self: {
        homepage = "http://github.com/LambdaHack/LambdaHack";
        description = "A game engine library for roguelike dungeon crawlers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk2 = pkgs.gnome2.gtk;};
 
   "LambdaINet" = callPackage
@@ -12358,7 +12098,6 @@ self: {
        homepage = "not available";
        description = "Graphical Interaction Net Evaluator for Optimal Evaluation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LambdaNet" = callPackage
@@ -12375,7 +12114,6 @@ self: {
        jailbreak = true;
        description = "A configurable and extensible neural network library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LambdaPrettyQuote" = callPackage
@@ -12401,7 +12139,6 @@ self: {
        homepage = "http://github.com/jfischoff/LambdaPrettyQuote";
        description = "Quasiquoter, and Arbitrary helpers for the lambda calculus";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LambdaShell" = callPackage
@@ -12420,7 +12157,6 @@ self: {
        homepage = "http://rwd.rdockins.name/lambda/home/";
        description = "Simple shell for evaluating lambda expressions";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Lambdajudge" = callPackage
@@ -12480,7 +12216,6 @@ self: {
        homepage = "http://code.google.com/p/lastik";
        description = "A library for compiling programs in a variety of languages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Lattices" = callPackage
@@ -12543,7 +12278,6 @@ self: {
        homepage = "http://quasimal.com/projects/level_0.html";
        description = "A Snake II clone written using SDL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "LibClang" = callPackage
@@ -12565,7 +12299,6 @@ self: {
        homepage = "https://github.com/chetant/LibClang/issues";
        description = "Haskell bindings for libclang (a C++ parsing library)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ncurses;};
 
   "LibZip" = callPackage
@@ -12582,7 +12315,6 @@ self: {
        homepage = "http://bitbucket.org/astanin/hs-libzip/";
        description = "Bindings to libzip, a library for manipulating zip archives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LibZip_0_11_1" = callPackage
@@ -12616,7 +12348,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Wrapper for data that can be unbounded";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LinearSplit" = callPackage
@@ -12631,7 +12362,6 @@ self: {
        homepage = "http://github.com/rukav/LinearSplit";
        description = "Partition the sequence of items to the subsequences in the order given";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LinguisticsTypes" = callPackage
@@ -12675,7 +12405,6 @@ self: {
        homepage = "http://janzzstimmpfle.de/~jens/software/LinkChecker/";
        description = "Check a bunch of local html files for broken links";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "List" = callPackage
@@ -12821,7 +12550,6 @@ self: {
        jailbreak = true;
        description = "a parallel implementation of logic programming using distributed tree exploration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LogicGrowsOnTrees-MPI" = callPackage
@@ -12848,7 +12576,6 @@ self: {
        jailbreak = true;
        description = "an adapter for LogicGrowsOnTrees that uses MPI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openmpi;};
 
   "LogicGrowsOnTrees-network" = callPackage
@@ -12878,7 +12605,6 @@ self: {
        jailbreak = true;
        description = "an adapter for LogicGrowsOnTrees that uses multiple processes running in a network";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LogicGrowsOnTrees-processes" = callPackage
@@ -12908,7 +12634,6 @@ self: {
        jailbreak = true;
        description = "an adapter for LogicGrowsOnTrees that uses multiple processes for parallelism";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "LslPlus" = callPackage
@@ -12931,7 +12656,6 @@ self: {
        homepage = "http:/lslplus.sourceforge.net/";
        description = "An execution and testing framework for the Linden Scripting Language (LSL)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Lucu" = callPackage
@@ -12954,7 +12678,6 @@ self: {
        homepage = "http://cielonegro.org/Lucu.html";
        description = "HTTP Daemonic Library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MASMGen" = callPackage
@@ -12986,7 +12709,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/software/mcfolddp/";
        description = "Folding algorithm based on nucleotide cyclic motifs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MFlow_0_4_5_9" = callPackage
@@ -13051,7 +12773,6 @@ self: {
        homepage = "https://github.com/DanBurton/MHask#readme";
        description = "The category of monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MSQueue" = callPackage
@@ -13107,7 +12828,6 @@ self: {
        homepage = "http://nautilus.cs.miyazaki-u.ac.jp/~skata/MagicHaskeller.html";
        description = "Automatic inductive functional programmer by systematic search";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MailchimpSimple" = callPackage
@@ -13141,7 +12861,6 @@ self: {
        jailbreak = true;
        description = "MaybeT monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MaybeT-monads-tf" = callPackage
@@ -13154,7 +12873,6 @@ self: {
        jailbreak = true;
        description = "MaybeT monad transformer compatible with monads-tf (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MaybeT-transformers" = callPackage
@@ -13167,7 +12885,6 @@ self: {
        jailbreak = true;
        description = "MaybeT monad transformer using transformers instead of mtl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MazesOfMonad" = callPackage
@@ -13186,7 +12903,6 @@ self: {
        ];
        description = "Console-based Role Playing Game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MeanShift" = callPackage
@@ -13211,7 +12927,6 @@ self: {
        jailbreak = true;
        description = "A library for units of measurement";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MemoTrie_0_6_2" = callPackage
@@ -13297,7 +13012,6 @@ self: {
        homepage = "http://github.com/benhamner/Metrics/";
        description = "Evaluation metrics commonly used in supervised machine learning";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Mhailist" = callPackage
@@ -13317,7 +13031,6 @@ self: {
        jailbreak = true;
        description = "Haskell mailing list manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Michelangelo" = callPackage
@@ -13334,7 +13047,6 @@ self: {
        ];
        description = "OpenGL for dummies";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MicrosoftTranslator" = callPackage
@@ -13372,7 +13084,6 @@ self: {
        homepage = "http://www.tcs.ifi.lmu.de/~abel/miniagda/";
        description = "A toy dependently typed programming language with type-based termination";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MissingH" = callPackage
@@ -13441,7 +13152,6 @@ self: {
        homepage = "http://github.com/softmechanics/missingpy";
        description = "Haskell interface to Python";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Modulo" = callPackage
@@ -13467,7 +13177,6 @@ self: {
        executableHaskellDepends = [ base GLUT random ];
        description = "A FRP library based on signal functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "MoeDict" = callPackage
@@ -13513,7 +13222,6 @@ self: {
        jailbreak = true;
        description = "Polymorphic combinators for working with foreign functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MonadCatchIO-transformers_0_3_1_2" = callPackage
@@ -13564,7 +13272,6 @@ self: {
        jailbreak = true;
        description = "Polymorphic combinators for working with foreign functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MonadCompose" = callPackage
@@ -13600,7 +13307,6 @@ self: {
        homepage = "http://monadgarden.cs.missouri.edu/MonadLab";
        description = "Automatically generate layered monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MonadPrompt" = callPackage
@@ -13723,7 +13429,6 @@ self: {
        libraryHaskellDepends = [ base MonadRandom mtl random ];
        description = "Lazy monad for psuedo random-number generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MonadStack" = callPackage
@@ -13750,7 +13455,6 @@ self: {
        homepage = "http://www.geocities.jp/takascience/haskell/monadius_en.html";
        description = "2-D arcade scroller";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Monaris" = callPackage
@@ -13769,7 +13473,6 @@ self: {
        homepage = "https://github.com/fumieval/Monaris/";
        description = "A simple tetris clone";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Monatron" = callPackage
@@ -13781,7 +13484,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Monad transformer library with uniform liftings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Monatron-IO" = callPackage
@@ -13795,7 +13497,6 @@ self: {
        homepage = "https://github.com/kreuzschlitzschraubenzieher/Monatron-IO";
        description = "MonadIO instances for the Monatron transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Monocle" = callPackage
@@ -13807,7 +13508,6 @@ self: {
        libraryHaskellDepends = [ base containers haskell98 mtl ];
        description = "Symbolic computations in strict monoidal categories with LaTeX output";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "MorseCode" = callPackage
@@ -14027,7 +13727,6 @@ self: {
        executableHaskellDepends = [ base HCL HTTP network regex-compat ];
        description = "Simple application for calculating n-grams using Google";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NTRU" = callPackage
@@ -14045,7 +13744,6 @@ self: {
        jailbreak = true;
        description = "NTRU Cryptography";
        license = "GPL";
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "NXT" = callPackage
@@ -14071,7 +13769,6 @@ self: {
        homepage = "http://mitar.tnode.com";
        description = "A Haskell interface to Lego Mindstorms NXT";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {bluetooth = null;};
 
   "NXTDSL" = callPackage
@@ -14091,7 +13788,6 @@ self: {
        homepage = "https://github.com/agrafix/legoDSL";
        description = "Generate NXC Code from DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NanoProlog" = callPackage
@@ -14232,7 +13928,6 @@ self: {
        homepage = "https://github.com/ptek/netsnmp";
        description = "Bindings for net-snmp's C API for clients";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) net_snmp;};
 
   "Network-NineP" = callPackage
@@ -14298,7 +13993,6 @@ self: {
        homepage = "http://github.com/glguy/ninjas";
        description = "Ninja game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NoSlow" = callPackage
@@ -14320,7 +14014,6 @@ self: {
        homepage = "http://code.haskell.org/NoSlow";
        description = "Microbenchmarks for various array libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NoTrace" = callPackage
@@ -14366,7 +14059,6 @@ self: {
        homepage = "http://www.nomyx.net";
        description = "A Nomic game in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Nomyx-Core" = callPackage
@@ -14394,7 +14086,6 @@ self: {
        homepage = "http://www.nomyx.net";
        description = "A Nomic game in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Nomyx-Language" = callPackage
@@ -14415,7 +14106,6 @@ self: {
        homepage = "http://www.nomyx.net";
        description = "Language to express rules for Nomic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Nomyx-Rules" = callPackage
@@ -14432,7 +14122,6 @@ self: {
        ];
        description = "Language to express rules for Nomic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Nomyx-Web" = callPackage
@@ -14458,7 +14147,6 @@ self: {
        homepage = "http://www.nomyx.net";
        description = "Web gui for Nomyx";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NonEmpty" = callPackage
@@ -14487,7 +14175,6 @@ self: {
        homepage = "http://code.google.com/p/nonempty/";
        description = "A list with a length of at least one";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NumInstances" = callPackage
@@ -14523,7 +14210,6 @@ self: {
        homepage = "http://patch-tag.com/r/lpsmith/NumberSieves";
        description = "Number Theoretic Sieves: primes, factorization, and Euler's Totient";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "NumberTheory" = callPackage
@@ -14567,7 +14253,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/adpfusion";
        description = "Nussinov78 using the ADPfusion library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Nutri" = callPackage
@@ -14593,7 +14278,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/OGL";
        description = "A context aware binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OSM" = callPackage
@@ -14610,7 +14294,6 @@ self: {
        homepage = "https://github.com/tonymorris/geo-osm";
        description = "Parse OpenStreetMap files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OTP" = callPackage
@@ -14636,7 +14319,6 @@ self: {
        homepage = "https://github.com/yokto/object";
        description = "Object oriented programming for haskell using multiparameter typeclasses";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ObjectIO" = callPackage
@@ -14652,7 +14334,6 @@ self: {
          winspool
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {comctl32 = null; comdlg32 = null; gdi32 = null; 
          kernel32 = null; ole32 = null; shell32 = null; user32 = null; 
          winmm = null; winspool = null;};
@@ -14763,7 +14444,6 @@ self: {
        homepage = "http://www.gekkou.co.uk/";
        description = "Provides a wrapper for deriving word types with fewer bits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "Omega" = callPackage
@@ -14776,7 +14456,6 @@ self: {
        testHaskellDepends = [ base containers HUnit ];
        description = "Integer sets and relations using Presburger arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OneTuple" = callPackage
@@ -14805,7 +14484,6 @@ self: {
        homepage = "https://github.com/audreyt/openafp/";
        description = "IBM AFP document format parser and generator";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OpenAFP-Utils" = callPackage
@@ -14826,7 +14504,6 @@ self: {
        ];
        description = "Assorted utilities to work with AFP data streams";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OpenAL" = callPackage
@@ -14847,7 +14524,6 @@ self: {
        homepage = "https://github.com/haskell-openal/ALUT";
        description = "A binding to the OpenAL cross-platform 3D audio API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) openal;};
 
   "OpenCL" = callPackage
@@ -14864,7 +14540,6 @@ self: {
        homepage = "https://github.com/IFCA/opencl";
        description = "Haskell high-level wrapper for OpenCL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {OpenCL = null;};
 
   "OpenCLRaw" = callPackage
@@ -14878,7 +14553,6 @@ self: {
        homepage = "http://vis.renci.org/jeff/opencl";
        description = "The OpenCL Standard for heterogenous data-parallel computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OpenCLWrappers" = callPackage
@@ -14982,7 +14656,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Opengl";
        description = "A binding for the OpenGL graphics system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "OpenGLCheck" = callPackage
@@ -14996,7 +14669,6 @@ self: {
        ];
        description = "Quickcheck instances for various data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OpenGLRaw_1_5_0_0" = callPackage
@@ -15086,7 +14758,6 @@ self: {
        jailbreak = true;
        description = "The intersection of OpenGL 2.1 and OpenGL 3.1 Core";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OpenSCAD" = callPackage
@@ -15107,7 +14778,6 @@ self: {
        homepage = "https://chiselapp.com/user/mwm/repository/OpenSCAD/";
        description = "ADT wrapper and renderer for OpenSCAD models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OpenVG" = callPackage
@@ -15120,7 +14790,6 @@ self: {
        homepage = "http://code.google.com/p/copperbox/";
        description = "OpenVG (ShivaVG-0.2.1) binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OpenVGRaw" = callPackage
@@ -15132,9 +14801,8 @@ self: {
        libraryHaskellDepends = [ base OpenGLRaw ];
        jailbreak = true;
        homepage = "http://code.google.com/p/copperbox/";
-       description = "Raw binding to OpenVG (ShivaVG-0.2.1 implementation)";
+       description = "Raw binding to OpenVG (ShivaVG-0.2.1 implementation).";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Operads" = callPackage
@@ -15148,7 +14816,6 @@ self: {
        homepage = "http://math.stanford.edu/~mik/operads";
        description = "Groebner basis computation for Operads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OptDir" = callPackage
@@ -15197,7 +14864,6 @@ self: {
        homepage = "https://github.com/dwd31415/Haskell-OrchestrateDB";
        description = "Unofficial Haskell Client Library for the Orchestrate.io API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "OrderedBits" = callPackage
@@ -15270,7 +14936,6 @@ self: {
        homepage = "http://github.com/Andrey-Sisoyev/PCLT";
        description = "Extension to Show: templating, catalogizing, languages, parameters, etc";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PCLT-DB" = callPackage
@@ -15288,7 +14953,6 @@ self: {
        homepage = "http://github.com/Andrey-Sisoyev/PCLT-DB";
        description = "An addon to PCLT package: enchance PCLT catalog with PostgreSQL powers";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PDBtools" = callPackage
@@ -15350,7 +15014,6 @@ self: {
        ];
        description = "This is a package which includes Assignments, Email, User and Reviews modules for Programming in Haskell course";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PageIO" = callPackage
@@ -15377,7 +15040,6 @@ self: {
        ];
        description = "Page-oriented extraction and composition library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Paillier" = callPackage
@@ -15417,7 +15079,6 @@ self: {
        jailbreak = true;
        description = "Pandoc support for literate Agda";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Paraiso" = callPackage
@@ -15443,7 +15104,6 @@ self: {
        homepage = "http://www.paraiso-lang.org/wiki/index.php/Main_Page";
        description = "a code generator for partial differential equations solvers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Parry" = callPackage
@@ -15462,7 +15122,6 @@ self: {
        homepage = "http://parry.lif.univ-mrs.fr";
        description = "A proven synchronization server for high performance computing";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ParsecTools" = callPackage
@@ -15537,7 +15196,6 @@ self: {
        librarySystemDepends = [ libxml2 ];
        description = "Relational optimiser and code generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libxml2;};
 
   "Peano" = callPackage
@@ -15578,7 +15236,6 @@ self: {
        jailbreak = true;
        description = "A perfect hashing library for mapping bytestrings to values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {cmph = null;};
 
   "PermuteEffects" = callPackage
@@ -15592,7 +15249,6 @@ self: {
        homepage = "https://github.com/MedeaMelana/PermuteEffects";
        description = "Permutations of effectful computations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Phsu" = callPackage
@@ -15619,7 +15275,6 @@ self: {
        homepage = "localhost:9119";
        description = "Personal Happstack Server Utils";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Pipe" = callPackage
@@ -15632,7 +15287,6 @@ self: {
        homepage = "http://iki.fi/matti.niemenmaa/pipe/";
        description = "Process piping library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Piso" = callPackage
@@ -15719,7 +15373,6 @@ self: {
        homepage = "LLayland.wordpress.com";
        description = "So far just a lint like program for PL/SQL. Diff and refactoring tools are planned";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Plural" = callPackage
@@ -15744,7 +15397,6 @@ self: {
        executableHaskellDepends = [ array base clock GLUT random ];
        description = "An imaginary world";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PortFusion" = callPackage
@@ -15772,7 +15424,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/PortMidi";
        description = "A binding for PortMedia/PortMidi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "PostgreSQL" = callPackage
@@ -15784,7 +15435,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Thin wrapper over the C postgresql library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PrimitiveArray" = callPackage
@@ -15819,7 +15469,6 @@ self: {
        sha256 = "7ddb98d79c320b71c5ffd9f2a0eda2f1898f31ff53ee5f84dfc95c108ada2f58";
        libraryHaskellDepends = [ base haskell98 pretty template-haskell ];
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PriorityChansConverger" = callPackage
@@ -15831,7 +15480,6 @@ self: {
        libraryHaskellDepends = [ base containers stm ];
        description = "Read single output from an array of inputs - channels with priorities";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ProbabilityMonads" = callPackage
@@ -15843,7 +15491,6 @@ self: {
        libraryHaskellDepends = [ base MaybeT MonadRandom mtl ];
        description = "Probability distribution monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "PropLogic" = callPackage
@@ -15874,7 +15521,6 @@ self: {
        homepage = "https://github.com/dillonhuff/Proper";
        description = "An implementation of propositional logic in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ProxN" = callPackage
@@ -15911,7 +15557,6 @@ self: {
        homepage = "http://pugscode.org/";
        description = "A Perl 6 Implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Pup-Events" = callPackage
@@ -15964,7 +15609,6 @@ self: {
        ];
        description = "A networked event handling framework for hooking into other programs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Pup-Events-PQueue" = callPackage
@@ -16003,7 +15647,6 @@ self: {
        homepage = "http://www.cs.nott.ac.uk/~asg/QIO/";
        description = "The Quantum IO Monad is a library for defining quantum computations in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "QuadEdge" = callPackage
@@ -16015,7 +15658,6 @@ self: {
        libraryHaskellDepends = [ base random vector ];
        description = "QuadEdge structure for representing triangulations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "QuadTree" = callPackage
@@ -16081,7 +15723,6 @@ self: {
        homepage = "http://code.haskell.org/QuickAnnotate/";
        description = "Annotation Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "QuickCheck_1_2_0_1" = callPackage
@@ -16174,7 +15815,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/QuickCheck-GenT";
        description = "A GenT monad transformer for QuickCheck library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "QuickCheck-safe" = callPackage
@@ -16224,7 +15864,6 @@ self: {
        homepage = "https://github.com/ssadler/quickson";
        description = "Quick JSON extractions with Aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "R-pandoc" = callPackage
@@ -16289,7 +15928,6 @@ self: {
        jailbreak = true;
        description = "A framework for writing RESTful applications";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RFC1751" = callPackage
@@ -16324,7 +15962,6 @@ self: {
        ];
        description = "A reflective JSON serializer/parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RMP" = callPackage
@@ -16345,7 +15982,6 @@ self: {
        executableSystemDepends = [ canlib ftd2xx ];
        description = "Binding to code that controls a Segway RMP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {canlib = null; ftd2xx = null;};
 
   "RNAFold" = callPackage
@@ -16369,7 +16005,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/adpfusion";
        description = "RNA secondary structure prediction";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RNAFoldProgs" = callPackage
@@ -16390,7 +16025,6 @@ self: {
        jailbreak = true;
        description = "RNA secondary structure folding";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RNAdesign" = callPackage
@@ -16416,7 +16050,6 @@ self: {
        executableHaskellDepends = [ bytestring cmdargs file-embed ];
        description = "Multi-target RNA sequence design";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RNAdraw" = callPackage
@@ -16437,7 +16070,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "Draw RNA secondary structures";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RNAlien_1_0_0" = callPackage
@@ -16519,7 +16151,6 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/software/rnawolf/";
        description = "RNA folding with non-canonical basepairs and base-triplets";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RSA_2_1_0_1" = callPackage
@@ -16538,7 +16169,7 @@ self: {
          base binary bytestring crypto-api crypto-pubkey-types DRBG pureMD5
          QuickCheck SHA tagged test-framework test-framework-quickcheck2
        ];
-       description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1";
+       description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -16559,7 +16190,7 @@ self: {
          base binary bytestring crypto-api crypto-pubkey-types DRBG pureMD5
          QuickCheck SHA tagged test-framework test-framework-quickcheck2
        ];
-       description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1";
+       description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -16580,7 +16211,7 @@ self: {
          base binary bytestring crypto-api crypto-pubkey-types DRBG pureMD5
          QuickCheck SHA tagged test-framework test-framework-quickcheck2
        ];
-       description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1";
+       description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -16601,7 +16232,6 @@ self: {
        homepage = "http://raincat.bysusanlin.com/";
        description = "A puzzle game written in Haskell with a cat in lead role";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "Random123" = callPackage
@@ -16631,7 +16261,6 @@ self: {
        libraryHaskellDepends = [ base HTTP-Simple network ];
        description = "Interface to random.org";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Randometer" = callPackage
@@ -16686,7 +16315,6 @@ self: {
        homepage = "http://kagami.touhou.ru/projects/show/ranka";
        description = "HTTP to XMPP omegle chats gate";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Rasenschach" = callPackage
@@ -16707,7 +16335,6 @@ self: {
        homepage = "http://hub.darcs.net/martingw/Rasenschach";
        description = "Soccer simulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Rasterific_0_4" = callPackage
@@ -16876,7 +16503,6 @@ self: {
        homepage = "https://github.com/lookunder/RedmineHs";
        description = "Library to access Redmine's REST services";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Ref" = callPackage
@@ -16890,7 +16516,6 @@ self: {
        homepage = "https://bitbucket.org/carter/ref";
        description = "Generic Mutable Ref Abstraction Layer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RefSerialize_0_3_1_3" = callPackage
@@ -16944,7 +16569,6 @@ self: {
        homepage = "https://github.com/pablocouto/Referees";
        description = "A utility for computing distributions of material to review among reviewers";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RepLib" = callPackage
@@ -16991,7 +16615,6 @@ self: {
        ];
        description = "Haskell bindings to ReviewBoard";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RichConditional" = callPackage
@@ -17053,7 +16676,6 @@ self: {
        ];
        description = "Limits the size of a directory's contents";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "RoyalMonad" = callPackage
@@ -17078,7 +16700,6 @@ self: {
        homepage = "https://github.com/jspahrsummers/RxHaskell";
        description = "Reactive Extensions for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SBench" = callPackage
@@ -17096,7 +16717,6 @@ self: {
        ];
        description = "A benchmark suite for runtime and heap measurements over a series of inputs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SConfig" = callPackage
@@ -17123,7 +16743,6 @@ self: {
        librarySystemDepends = [ SDL ];
        description = "Binding to libSDL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL;};
 
   "SDL-gfx" = callPackage
@@ -17136,7 +16755,6 @@ self: {
        librarySystemDepends = [ SDL_gfx ];
        description = "Binding to libSDL_gfx";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL_gfx;};
 
   "SDL-image" = callPackage
@@ -17151,7 +16769,6 @@ self: {
        librarySystemDepends = [ SDL_image ];
        description = "Binding to libSDL_image";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL_image;};
 
   "SDL-mixer" = callPackage
@@ -17166,7 +16783,6 @@ self: {
        librarySystemDepends = [ SDL_mixer ];
        description = "Binding to libSDL_mixer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL_mixer;};
 
   "SDL-mpeg" = callPackage
@@ -17179,7 +16795,6 @@ self: {
        librarySystemDepends = [ smpeg ];
        description = "Binding to the SMPEG library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) smpeg;};
 
   "SDL-ttf" = callPackage
@@ -17192,7 +16807,6 @@ self: {
        librarySystemDepends = [ SDL_ttf ];
        description = "Binding to libSDL_ttf";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL_ttf;};
 
   "SDL2-ttf" = callPackage
@@ -17226,7 +16840,6 @@ self: {
        homepage = "https://github.com/jeannekamikaze/SFML";
        description = "SFML bindings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {csfml-audio = null; csfml-graphics = null; 
          csfml-network = null; csfml-system = null; csfml-window = null; 
          sfml-audio = null; sfml-graphics = null; sfml-network = null; 
@@ -17242,7 +16855,6 @@ self: {
        homepage = "https://github.com/SFML-haskell/SFML-control";
        description = "Higher level library on top of SFML";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SFont" = callPackage
@@ -17255,7 +16867,6 @@ self: {
        homepage = "http://liamoc.net/static/SFont";
        description = "SFont SDL Bitmap Fonts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SG" = callPackage
@@ -17267,7 +16878,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Small geometry library for dealing with vectors and collision detection";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SGdemo" = callPackage
@@ -17282,7 +16892,6 @@ self: {
        jailbreak = true;
        description = "An example of using the SG and OpenGL libraries";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SHA_1_6_4_1" = callPackage
@@ -17364,7 +16973,6 @@ self: {
        homepage = "http://www.snet-home.org/";
        description = "Declarative coördination language for streaming networks";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SQLDeps" = callPackage
@@ -17386,8 +16994,8 @@ self: {
     ({ mkDerivation, attoparsec, base, bytestring, cereal, text }:
      mkDerivation {
        pname = "STL";
-       version = "0.3.0.3";
-       sha256 = "382247812f11b9f73cd9a02474fa68d402fac91471fac83dd0e15604a191548a";
+       version = "0.3.0.4";
+       sha256 = "298b4cdeaa80c28ae773c135405e04bb8112ec5dee3f0c1b35eb7de9d703ba5a";
        libraryHaskellDepends = [ attoparsec base bytestring cereal text ];
        homepage = "http://github.com/bergey/STL";
        description = "STL 3D geometry format parsing and pretty-printing";
@@ -17422,7 +17030,6 @@ self: {
        homepage = "http://www.informatik.uni-kiel.de/~jgr/svg2q";
        description = "Code generation tool for Quartz code from a SVG";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SVGFonts_1_4_0_3" = callPackage
@@ -17549,7 +17156,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Salsa";
        description = "A .NET Bridge for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) glib; inherit (pkgs) mono;};
 
   "Saturnin" = callPackage
@@ -17591,7 +17197,6 @@ self: {
        ];
        description = "Scientific workflow management system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ScratchFs" = callPackage
@@ -17612,7 +17217,6 @@ self: {
        homepage = "http://github.com/hirschenberger/ScratchFS";
        description = "Size limited temp filesystem based on fuse";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Scurry" = callPackage
@@ -17632,7 +17236,6 @@ self: {
        homepage = "http://code.google.com/p/scurry/";
        description = "A cross platform P2P VPN application built using Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SegmentTree" = callPackage
@@ -17665,7 +17268,6 @@ self: {
        jailbreak = true;
        description = "Command-line tool for maintaining the Semantique database";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Semigroup" = callPackage
@@ -17689,7 +17291,6 @@ self: {
        libraryHaskellDepends = [ base bytestring vector ];
        description = "Sequence Alignment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SessionLogger" = callPackage
@@ -17706,7 +17307,6 @@ self: {
        jailbreak = true;
        description = "Easy Loggingframework";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ShellCheck" = callPackage
@@ -17744,7 +17344,6 @@ self: {
        homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "A framework for creating shell envinronments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Shellac-compatline" = callPackage
@@ -17757,7 +17356,6 @@ self: {
        homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "\"compatline\" backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Shellac-editline" = callPackage
@@ -17770,7 +17368,6 @@ self: {
        homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "Editline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Shellac-haskeline" = callPackage
@@ -17783,7 +17380,6 @@ self: {
        jailbreak = true;
        description = "Haskeline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Shellac-readline" = callPackage
@@ -17796,7 +17392,6 @@ self: {
        homepage = "http://rwd.rdockins.name/shellac/home/";
        description = "Readline backend module for Shellac";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ShowF" = callPackage
@@ -17834,7 +17429,6 @@ self: {
        homepage = "http://www.geocities.jp/takascience/index_en.html";
        description = "A vector shooter game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SimpleAES" = callPackage
@@ -17875,7 +17469,6 @@ self: {
        jailbreak = true;
        description = "A Simple Graphics Library from the SimpleH framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SimpleH" = callPackage
@@ -17893,7 +17486,6 @@ self: {
        jailbreak = true;
        description = "A light, clean and powerful Haskell utility library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SimpleLog" = callPackage
@@ -17914,7 +17506,6 @@ self: {
        homepage = "https://github.com/exFalso/SimpleLog/";
        description = "Simple, configurable logging";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SimpleServer" = callPackage
@@ -17962,7 +17553,6 @@ self: {
        testHaskellDepends = [ base file-embed ];
        description = "Generate slides from Haskell code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Smooth" = callPackage
@@ -17979,7 +17569,6 @@ self: {
        jailbreak = true;
        description = "A tiny, lazy SMT solver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SmtLib" = callPackage
@@ -18017,7 +17606,6 @@ self: {
        homepage = "http://bitbucket.org/jetxee/snusmumrik/";
        description = "E-library directory based on FUSE virtual file system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zip;};
 
   "SoOSiM" = callPackage
@@ -18036,7 +17624,6 @@ self: {
        homepage = "http://www.soos-project.eu/";
        description = "Abstract full system simulator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SoccerFun" = callPackage
@@ -18057,7 +17644,6 @@ self: {
        homepage = "http://www.cs.ru.nl/~peter88/SoccerFun/SoccerFun.html";
        description = "Football simulation framework for teaching functional programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SoccerFunGL" = callPackage
@@ -18078,7 +17664,6 @@ self: {
        homepage = "http://www.cs.ru.nl/~peter88/SoccerFun/SoccerFun.html";
        description = "OpenGL UI for the SoccerFun framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Sonnex" = callPackage
@@ -18112,7 +17697,6 @@ self: {
        jailbreak = true;
        description = "Static code analysis using graph-theoretic techniques";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Southpaw" = callPackage
@@ -18145,7 +17729,6 @@ self: {
        homepage = "http://www.haskell.org/yampa/";
        description = "Video game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SpacePrivateers" = callPackage
@@ -18168,7 +17751,6 @@ self: {
        homepage = "https://github.com/tuturto/space-privateers";
        description = "Simple space pirate roguelike";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SpinCounter" = callPackage
@@ -18463,7 +18045,6 @@ self: {
        homepage = "https://github.com/agrafix/Spock-auth";
        description = "Provides authentification helpers for Spock";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Spock-digestive_0_1_0_0" = callPackage
@@ -18558,7 +18139,6 @@ self: {
        homepage = "http://liamoc.net/static/Sprig";
        description = "Binding to Sprig";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Stasis" = callPackage
@@ -18666,7 +18246,6 @@ self: {
        homepage = "http://github.com/rukav/Stomp";
        description = "Client library for Stomp brokers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Strafunski-ATermLib" = callPackage
@@ -18698,7 +18277,6 @@ self: {
        jailbreak = true;
        description = "Converts SDF to Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Strafunski-StrategyLib" = callPackage
@@ -18763,7 +18341,6 @@ self: {
        homepage = "http://bonsaicode.wordpress.com/2009/06/07/strictbench-0-1/";
        description = "Benchmarking code through strict evaluation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "SuffixStructures" = callPackage
@@ -18821,7 +18398,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/Center/SyntaxMacrosForFree";
        description = "Syntax Macros in the form of an EDSL";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Sysmon" = callPackage
@@ -18840,7 +18416,6 @@ self: {
        homepage = "http://github.com/rukav/Sysmon";
        description = "Sybase 15 sysmon reports processor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TBC" = callPackage
@@ -18861,7 +18436,6 @@ self: {
        ];
        description = "Testing By Convention";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TBit" = callPackage
@@ -18879,7 +18453,6 @@ self: {
        jailbreak = true;
        description = "Utilities for condensed matter physics tight binding calculations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TCache" = callPackage
@@ -18946,7 +18519,6 @@ self: {
        ];
        description = "Template Your Boilerplate - a Template Haskell version of SYB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TableAlgebra" = callPackage
@@ -18976,7 +18548,6 @@ self: {
        jailbreak = true;
        description = "A client for Quill databases";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Tablify" = callPackage
@@ -19017,7 +18588,6 @@ self: {
        executableHaskellDepends = [ base mtl old-time ];
        description = "Database library with left-fold interface, for PostgreSQL, Oracle, SQLite, ODBC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Tape" = callPackage
@@ -19083,7 +18653,6 @@ self: {
        homepage = "http://liamoc.net/tea";
        description = "TeaHS Game Creation Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Tensor" = callPackage
@@ -19140,7 +18709,6 @@ self: {
        libraryHaskellDepends = [ base ];
        librarySystemDepends = [ ogg theora ];
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {ogg = null; theora = null;};
 
   "Thingie" = callPackage
@@ -19152,7 +18720,6 @@ self: {
        libraryHaskellDepends = [ base cairo gtk mtl ];
        description = "Purely functional 2D drawing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ThreadObjects" = callPackage
@@ -19182,7 +18749,6 @@ self: {
        homepage = "http://thrift.apache.org";
        description = "Haskell bindings for the Apache Thrift RPC system";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Tic-Tac-Toe" = callPackage
@@ -19213,7 +18779,6 @@ self: {
        ];
        description = "A sub-project (exercise) for a functional programming course";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TigerHash" = callPackage
@@ -19247,7 +18812,6 @@ self: {
        ];
        description = "A simple tile-based digital clock screen saver";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TinyLaunchbury" = callPackage
@@ -19259,7 +18823,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Simple implementation of call-by-need using Launchbury's semantics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TinyURL" = callPackage
@@ -19271,7 +18834,6 @@ self: {
        libraryHaskellDepends = [ base HTTP network ];
        description = "Use TinyURL to compress URLs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Titim" = callPackage
@@ -19286,7 +18848,6 @@ self: {
        jailbreak = true;
        description = "Game for Lounge Marmelade";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Top" = callPackage
@@ -19302,7 +18863,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome";
        description = "Constraint solving framework employed by the Helium Compiler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Tournament" = callPackage
@@ -19322,7 +18882,6 @@ self: {
        homepage = "http://github.com/clux/tournament.hs";
        description = "Tournament related algorithms";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TraceUtils" = callPackage
@@ -19427,7 +18986,6 @@ self: {
        jailbreak = true;
        description = "A simple trend Graph script";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TrieMap" = callPackage
@@ -19445,7 +19003,6 @@ self: {
        ];
        description = "Automatic type inference of generalized tries with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Twofish" = callPackage
@@ -19485,7 +19042,6 @@ self: {
        jailbreak = true;
        description = "Typing speed game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TypeCompose" = callPackage
@@ -19512,7 +19068,6 @@ self: {
        homepage = "http://www.cs.kent.ac.uk/people/staff/oc/TypeIlluminator/";
        description = "TypeIlluminator is a prototype tool exploring debugging of type errors/";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "TypeNat" = callPackage
@@ -19555,7 +19110,6 @@ self: {
        homepage = "http://haskell.cs.yale.edu/";
        description = "Library for Arrowized Graphical User Interfaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "UMM" = callPackage
@@ -19574,7 +19128,6 @@ self: {
        homepage = "http://www.korgwal.com/umm/";
        description = "A small command-line accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "URLT" = callPackage
@@ -19592,7 +19145,6 @@ self: {
        ];
        description = "Library for maintaining correctness of URLs within an application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "URLb" = callPackage
@@ -19632,7 +19184,6 @@ self: {
        homepage = "http://github.com/cirquit/UTFTConverter";
        description = "Processing popular picture formats into .c or .raw format in RGB565";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Unique" = callPackage
@@ -19678,7 +19229,6 @@ self: {
        homepage = "http://src.seereason.com/haskell-unixutils-shadow";
        description = "A simple interface to shadow passwords (aka, shadow.h)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "Updater" = callPackage
@@ -19702,9 +19252,8 @@ self: {
        libraryHaskellDepends = [ base cgi MaybeT mtl ];
        jailbreak = true;
        homepage = "http://www.haskell.org/haskellwiki/UrlDisp";
-       description = "Url dispatcher. Helps to retain friendly URLs in web applications";
+       description = "Url dispatcher. Helps to retain friendly URLs in web applications.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Useful" = callPackage
@@ -19791,7 +19340,6 @@ self: {
        jailbreak = true;
        description = "Provides Boolean instances for the Vec package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Vec-OpenGLRaw" = callPackage
@@ -19804,7 +19352,6 @@ self: {
        homepage = "http://www.downstairspeople.org/darcs/Vec-opengl";
        description = "Instances and functions to interoperate Vec and OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Vec-Transform" = callPackage
@@ -19817,7 +19364,6 @@ self: {
        homepage = "https://github.com/tobbebex/Vec-Transform";
        description = "This package is obsolete";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "VecN" = callPackage
@@ -19925,7 +19471,6 @@ self: {
        jailbreak = true;
        description = "A simple command line tools to control the Asus WL500gP router";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WL500gPLib" = callPackage
@@ -19961,7 +19506,6 @@ self: {
        jailbreak = true;
        description = "WebMoney authentication module";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "WURFL" = callPackage
@@ -19973,7 +19517,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 parsec ];
        description = "Convert the WURFL file into a Parsec parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WXDiffCtrl" = callPackage
@@ -19986,7 +19529,6 @@ self: {
        homepage = "http://wewantarock.wordpress.com";
        description = "WXDiffCtrl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WashNGo" = callPackage
@@ -20007,7 +19549,6 @@ self: {
        homepage = "http://www.informatik.uni-freiburg.de/~thiemann/haskell/WASH/";
        description = "WASH is a family of EDSLs for programming Web applications in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WaveFront" = callPackage
@@ -20023,7 +19564,6 @@ self: {
        ];
        description = "Parsers and utilities for the OBJ WaveFront 3D model format";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Weather" = callPackage
@@ -20069,7 +19609,6 @@ self: {
        homepage = "http://www.cs.brown.edu/research/plt/";
        description = "JavaScript analysis tools";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WebBits-multiplate" = callPackage
@@ -20086,7 +19625,6 @@ self: {
        jailbreak = true;
        description = "A Multiplate instance for JavaScript";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WebCont" = callPackage
@@ -20106,7 +19644,6 @@ self: {
        homepage = "http://patch-tag.com/r/salazar/webconts/snapshot/current/content/pretty";
        description = "Continuation based web programming for Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WeberLogic" = callPackage
@@ -20150,7 +19687,6 @@ self: {
        jailbreak = true;
        description = "Regexp-like engine to scrap web data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Wheb" = callPackage
@@ -20177,7 +19713,6 @@ self: {
        homepage = "https://github.com/hansonkd/Wheb-Framework";
        description = "The frictionless WAI Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WikimediaParser" = callPackage
@@ -20189,7 +19724,6 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        description = "A parser for wikimedia style article markup";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Win32" = callPackage
@@ -20338,7 +19872,6 @@ self: {
        homepage = "http://www.cse.chalmers.se/~emax/wired/";
        description = "Wire-aware hardware description";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "WordAlignment" = callPackage
@@ -20379,7 +19912,6 @@ self: {
        homepage = "https://github.com/choener/WordAlignment";
        description = "Bigram word pair alignments";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WordNet" = callPackage
@@ -20391,7 +19923,6 @@ self: {
        libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "WordNet-ghc74" = callPackage
@@ -20403,7 +19934,6 @@ self: {
        libraryHaskellDepends = [ array base containers filepath ];
        description = "Haskell interface to the WordNet database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Wordlint" = callPackage
@@ -20420,7 +19950,6 @@ self: {
        homepage = "https://github.com/gbgar/Wordlint";
        description = "Plaintext prose redundancy linter";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Workflow_0_8_1" = callPackage
@@ -20474,7 +20003,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/WxGeneric";
        description = "Generic (SYB3) construction of wxHaskell widgets";
        license = "LGPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "X11" = callPackage
@@ -20509,7 +20037,6 @@ self: {
        jailbreak = true;
        description = "Missing bindings to the X11 graphics library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libX11;};
 
   "X11-rm" = callPackage
@@ -20521,7 +20048,6 @@ self: {
        libraryHaskellDepends = [ base X11 ];
        description = "A binding to the resource management functions missing from X11";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "X11-xdamage" = callPackage
@@ -20535,7 +20061,6 @@ self: {
        homepage = "http://darcs.haskell.org/X11-xdamage";
        description = "A binding to the Xdamage X11 extension library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {Xdamage = null;};
 
   "X11-xfixes" = callPackage
@@ -20549,7 +20074,6 @@ self: {
        homepage = "https://github.com/reacocard/x11-xfixes";
        description = "A binding to the Xfixes X11 extension library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {Xfixes = null;};
 
   "X11-xft" = callPackage
@@ -20612,7 +20136,6 @@ self: {
        homepage = "http://kawais.org.ua/XMMS/";
        description = "XMMS2 client library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {xmmsclient = null; xmmsclient-glib = null;};
 
   "XMPP" = callPackage
@@ -20630,7 +20153,6 @@ self: {
        homepage = "http://kagami.touhou.ru/projects/show/matsuri";
        description = "XMPP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "XSaiga" = callPackage
@@ -20655,7 +20177,6 @@ self: {
        homepage = "http://hafiz.myweb.cs.uwindsor.ca/proHome.html";
        description = "An implementation of a polynomial-time top-down parser suitable for NLP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Xauth" = callPackage
@@ -20686,7 +20207,6 @@ self: {
        ];
        description = "Gtk command launcher with identicon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "XmlHtmlWriter" = callPackage
@@ -20699,7 +20219,6 @@ self: {
        homepage = "http://github.com/mmirman/haskogeneous/tree/XmlHtmlWriter";
        description = "A library for writing XML and HTML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Xorshift128Plus" = callPackage
@@ -20732,7 +20251,6 @@ self: {
        homepage = "http://github.com/snkkid/YACPong";
        description = "Yet Another Pong Clone using SDL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "YFrob" = callPackage
@@ -20745,7 +20263,6 @@ self: {
        homepage = "http://www.haskell.org/yampa/";
        description = "Yampa-based library for programming robots";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Yablog" = callPackage
@@ -20781,7 +20298,6 @@ self: {
        homepage = "http://gitweb.konn-san.com/repo/Yablog/tree/master";
        description = "A simple blog engine powered by Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "YamlReference" = callPackage
@@ -20807,7 +20323,6 @@ self: {
        homepage = "http://www.ben-kiki.org/oren/YamlReference";
        description = "YAML reference implementation";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Yampa_0_9_6" = callPackage
@@ -20952,7 +20467,6 @@ self: {
        homepage = "http://code.google.com/p/yogurt-mud/";
        description = "A MUD client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "Yogurt-Standalone" = callPackage
@@ -20973,7 +20487,6 @@ self: {
        homepage = "http://code.google.com/p/yogurt-mud/";
        description = "A functional MUD client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) readline;};
 
   "ZEBEDDE" = callPackage
@@ -21002,7 +20515,6 @@ self: {
        homepage = "https://github.com/jkarni/ZipperFS";
        description = "Oleg's Zipper FS";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ZMachine" = callPackage
@@ -21016,7 +20528,6 @@ self: {
        executableHaskellDepends = [ array base gtk mtl random ];
        description = "A Z-machine interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ZipFold" = callPackage
@@ -21071,7 +20582,6 @@ self: {
        homepage = "https://github.com/MedeaMelana/Zwaluw";
        description = "Combinators for bidirectional URL routing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "a50" = callPackage
@@ -21121,7 +20631,6 @@ self: {
        homepage = "https://github.com/pa-ba/abc-puzzle";
        description = "Generate instances of the ABC Logic Puzzle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "abcBridge" = callPackage
@@ -21147,7 +20656,6 @@ self: {
        ];
        description = "Bindings for ABC, A System for Sequential Synthesis and Verification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) abc;};
 
   "abcnotation" = callPackage
@@ -21241,7 +20749,6 @@ self: {
        homepage = "https://github.com/simonmar/monad-par";
        description = "Provides the class ParAccelerate, nothing more";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "abt" = callPackage
@@ -21342,7 +20849,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/accelerate-arithmetic/";
        description = "Linear algebra and interpolation using the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-cublas" = callPackage
@@ -21505,7 +21011,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/accelerate-fourier/";
        description = "Fast Fourier transform and convolution using the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accelerate-fourier-benchmark" = callPackage
@@ -21567,7 +21072,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/accelerate-utility/";
        description = "Utility functions for the Accelerate framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "accentuateus" = callPackage
@@ -21579,9 +21083,8 @@ self: {
        libraryHaskellDepends = [ base bytestring HTTP json network text ];
        jailbreak = true;
        homepage = "http://accentuate.us/";
-       description = "A Haskell implementation of the Accentuate.us API";
+       description = "A Haskell implementation of the Accentuate.us API.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "access-time" = callPackage
@@ -21595,7 +21098,6 @@ self: {
        homepage = "http://www.github.com/batterseapower/access-time";
        description = "Cross-platform support for retrieving file access times";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ace" = callPackage
@@ -21680,7 +21182,6 @@ self: {
        jailbreak = true;
        description = "A replication backend for acid-state";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "acid-state-tls" = callPackage
@@ -21845,7 +21346,6 @@ self: {
        homepage = "http://github.com/joeyadams/haskell-acme-hq9plus";
        description = "An embedded DSL for the HQ9+ programming language";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "acme-http" = callPackage
@@ -21879,7 +21379,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Evil inventions in the Tri-State area";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "acme-io" = callPackage
@@ -21987,7 +21486,6 @@ self: {
        jailbreak = true;
        description = "Define the less than and add and subtract for nats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "acme-omitted" = callPackage
@@ -22087,7 +21585,6 @@ self: {
        ];
        description = "Proper names for curry and uncurry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "acme-strfry" = callPackage
@@ -22161,7 +21658,6 @@ self: {
        homepage = "https://github.com/ion1/acme-zero-one";
        description = "The absorbing element of package dependencies";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "action-permutations" = callPackage
@@ -22317,7 +21813,6 @@ self: {
        jailbreak = true;
        description = "Haskell code presentation tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "activehs-base" = callPackage
@@ -22357,7 +21852,6 @@ self: {
        homepage = "http://sulzmann.blogspot.com/2008/10/actors-with-multi-headed-receive.html";
        description = "Actors with multi-headed receive clauses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ad_4_2_1_1" = callPackage
@@ -22494,7 +21988,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/adaptive-containers";
        description = "Self optimizing container types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "adaptive-tuple" = callPackage
@@ -22507,7 +22000,6 @@ self: {
        homepage = "http://inmachina.net/~jwlato/haskell/";
        description = "Self-optimizing tuple types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "adb" = callPackage
@@ -22544,7 +22036,6 @@ self: {
        homepage = "https://projects.zubr.me/wiki/adblock2privoxy";
        description = "Convert adblock config files to privoxy format";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "addLicenseInfo" = callPackage
@@ -22576,7 +22067,6 @@ self: {
        homepage = "http://sep07.mroot.net/";
        description = "Ad-hoc P2P network protocol";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "adict" = callPackage
@@ -22597,7 +22087,6 @@ self: {
        homepage = "https://github.com/kawu/adict";
        description = "Approximate dictionary searching";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "adjunctions_4_2" = callPackage
@@ -22713,7 +22202,6 @@ self: {
        homepage = "https://github.com/stepcut/ase2css";
        description = "parse Adobe Swatch Exchange files and (optionally) output .css files with the colors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "adp-multi" = callPackage
@@ -22736,7 +22224,6 @@ self: {
        homepage = "http://adp-multi.ruhoh.com";
        description = "ADP for multiple context-free languages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "adp-multi-monadiccp" = callPackage
@@ -22758,7 +22245,6 @@ self: {
        homepage = "http://adp-multi.ruhoh.com";
        description = "Subword construction in adp-multi using monadiccp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson_0_7_0_6" = callPackage
@@ -22880,28 +22366,28 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "aeson_0_11_0_0" = callPackage
-    ({ mkDerivation, attoparsec, base, bytestring, containers, deepseq
-     , dlist, fail, ghc-prim, hashable, HUnit, mtl, QuickCheck
-     , quickcheck-instances, scientific, semigroups, syb
-     , template-haskell, test-framework, test-framework-hunit
+  "aeson_0_11_1_0" = callPackage
+    ({ mkDerivation, attoparsec, base, base-orphans, bytestring
+     , containers, deepseq, dlist, fail, ghc-prim, hashable, HUnit, mtl
+     , QuickCheck, quickcheck-instances, scientific, semigroups, syb
+     , tagged, template-haskell, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text, time, transformers
      , unordered-containers, vector
      }:
      mkDerivation {
        pname = "aeson";
-       version = "0.11.0.0";
-       sha256 = "ad3849d5d73824edea0fa3aa552d4c4630e67a8cf1295250e92d34b5e824add5";
+       version = "0.11.1.0";
+       sha256 = "91a03c818312f422d17dddfb91b3d63e8b0e5bbea548a04fea325e926a019eca";
        libraryHaskellDepends = [
          attoparsec base bytestring containers deepseq dlist fail ghc-prim
-         hashable mtl scientific semigroups syb template-haskell text time
-         transformers unordered-containers vector
+         hashable mtl scientific semigroups syb tagged template-haskell text
+         time transformers unordered-containers vector
        ];
        testHaskellDepends = [
-         attoparsec base bytestring containers ghc-prim HUnit QuickCheck
-         quickcheck-instances template-haskell test-framework
-         test-framework-hunit test-framework-quickcheck2 text time
-         unordered-containers vector
+         attoparsec base base-orphans bytestring containers ghc-prim HUnit
+         QuickCheck quickcheck-instances semigroups tagged template-haskell
+         test-framework test-framework-hunit test-framework-quickcheck2 text
+         time unordered-containers vector
        ];
        homepage = "https://github.com/bos/aeson";
        description = "Fast JSON parsing and encoding";
@@ -22955,7 +22441,6 @@ self: {
        jailbreak = true;
        description = "Mapping between Aeson's JSON and Bson objects";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-casing" = callPackage
@@ -23223,7 +22708,6 @@ self: {
        homepage = "https://github.com/phadej/aeson-extra#readme";
        description = "Extra goodies for aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-filthy" = callPackage
@@ -23292,7 +22776,6 @@ self: {
        homepage = "http://github.com/mailrank/aeson";
        description = "Fast JSON parsing and encoding (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-parsec-picky" = callPackage
@@ -23486,7 +22969,6 @@ self: {
        homepage = "https://github.com/lassoinc/aeson-smart";
        description = "Smart derivation of Aeson instances";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aeson-streams" = callPackage
@@ -23695,7 +23177,6 @@ self: {
        homepage = "http://tomahawkins.org";
        description = "Infinite state model checking of iterative C programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ag-pictgen" = callPackage
@@ -23729,7 +23210,6 @@ self: {
        ];
        description = "Http server for Agda (prototype)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "agda-snippets" = callPackage
@@ -23895,7 +23375,6 @@ self: {
        homepage = "https://github.com/joelteon/airbrake";
        description = "An Airbrake notifier for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "airship_0_4_1_0" = callPackage
@@ -24104,7 +23583,6 @@ self: {
        homepage = "http://www.aivikasoft.com/en/products/aivika.html";
        description = "Transformers for the Aivika simulation library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ajhc" = callPackage
@@ -24132,7 +23610,6 @@ self: {
        homepage = "http://ajhc.metasepi.org/";
        description = "Haskell compiler that produce binary through C language";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "al" = callPackage
@@ -24145,9 +23622,8 @@ self: {
        libraryPkgconfigDepends = [ openal ];
        libraryToolDepends = [ c2hs ];
        homepage = "http://github.com/phaazon/al";
-       description = "OpenAL 1.1 raw API";
+       description = "OpenAL 1.1 raw API.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openal;};
 
   "alarmclock_0_2_0_5" = callPackage
@@ -24204,7 +23680,6 @@ self: {
        homepage = "https://github.com/Rnhmjoj/alea";
        description = "a diceware passphrase generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alex_3_1_3" = callPackage
@@ -24445,7 +23920,6 @@ self: {
        ];
        description = "Relational Algebra and SQL Code Generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "algebraic" = callPackage
@@ -24459,7 +23933,6 @@ self: {
        homepage = "https://github.com/wdanilo/algebraic";
        description = "General linear algebra structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "algebraic-classes" = callPackage
@@ -24577,7 +24050,6 @@ self: {
        homepage = "http://www.ccs.neu.edu/~tov/pubs/alms/";
        description = "a practical affine language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alpha" = callPackage
@@ -24600,7 +24072,6 @@ self: {
        homepage = "http://www.alpha-lang.net/";
        description = "A compiler for the Alpha language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alpino-tools" = callPackage
@@ -24625,7 +24096,6 @@ self: {
        homepage = "http://github.com/danieldk/alpino-tools";
        description = "Alpino data manipulation tools";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alsa" = callPackage
@@ -24644,7 +24114,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-core" = callPackage
@@ -24658,7 +24127,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (Exceptions)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-gui" = callPackage
@@ -24678,7 +24146,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Some simple interactive programs for sending MIDI control messages via ALSA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "alsa-midi" = callPackage
@@ -24700,7 +24167,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Bindings for the ALSA sequencer API (MIDI stuff)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-mixer" = callPackage
@@ -24715,7 +24181,6 @@ self: {
        homepage = "https://github.com/ttuegel/alsa-mixer";
        description = "Bindings to the ALSA simple mixer API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-pcm" = callPackage
@@ -24736,7 +24201,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (PCM audio)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-pcm-tests" = callPackage
@@ -24750,7 +24214,6 @@ self: {
        executableHaskellDepends = [ alsa base ];
        description = "Tests for the ALSA audio signal library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alsa-seq" = callPackage
@@ -24772,7 +24235,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/ALSA";
        description = "Binding to the ALSA Library API (MIDI sequencer)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "alsa-seq-tests" = callPackage
@@ -24787,7 +24249,6 @@ self: {
        jailbreak = true;
        description = "Tests for the ALSA sequencer library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "altcomposition" = callPackage
@@ -24829,7 +24290,6 @@ self: {
        homepage = "http://repo.or.cz/w/altfloat.git";
        description = "Alternative floating point support for GHC";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "alure" = callPackage
@@ -24842,7 +24302,6 @@ self: {
        librarySystemDepends = [ alure ];
        description = "A Haskell binding for ALURE";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {alure = null;};
 
   "amazon-emailer" = callPackage
@@ -24864,7 +24323,6 @@ self: {
        homepage = "https://github.com/dbp/amazon-emailer";
        description = "A queue daemon for Amazon's SES with a PostgreSQL table as a queue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazon-emailer-client-snap" = callPackage
@@ -24908,7 +24366,6 @@ self: {
        homepage = "https://github.com/AndrewRademacher/hs-amazon-products";
        description = "Connector for Amazon Products API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amazonka_0_3_3_1" = callPackage
@@ -26271,7 +25728,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Elastic Compute Cloud SDK";
        license = "unknown";
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-ecs_0_3_3" = callPackage
@@ -27270,7 +26726,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Relational Database Service SDK";
        license = "unknown";
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-redshift_0_3_3" = callPackage
@@ -27526,7 +26981,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Storage Service SDK";
        license = "unknown";
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-sdb_0_3_3" = callPackage
@@ -27767,7 +27221,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Queue Service SDK";
        license = "unknown";
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-ssm_0_3_3" = callPackage
@@ -28069,7 +27522,6 @@ self: {
        homepage = "https://github.com/brendanhay/amazonka";
        description = "Amazon Simple Workflow Service SDK";
        license = "unknown";
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "amazonka-test" = callPackage
@@ -28173,7 +27625,6 @@ self: {
        homepage = "http://wiki.tarski.nl";
        description = "Toolsuite for automated design of business processes";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "amqp_0_10_1" = callPackage
@@ -28429,7 +27880,6 @@ self: {
        homepage = "https://john-millikin.com/software/anansi/";
        description = "Looms which use Pandoc to parse and produce a variety of formats";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "anatomy" = callPackage
@@ -28456,7 +27906,6 @@ self: {
        homepage = "http://atomo-lang.org/";
        description = "Anatomy: Atomo documentation system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "android" = callPackage
@@ -28496,7 +27945,6 @@ self: {
        homepage = "https://github.com/passy/android-lint-summary";
        description = "A pretty printer for Android Lint errors";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "angel" = callPackage
@@ -28597,8 +28045,8 @@ self: {
      }:
      mkDerivation {
        pname = "ansi-pretty";
-       version = "0.1.1.0";
-       sha256 = "46190d94e4fc2aa01c8bc4dfc1caf59fe38a0ed4a0c22d4d0567637d64b5ff45";
+       version = "0.1.2.0";
+       sha256 = "11079e97b7faaf3825d0ab2bb3e111b5d1b9085343e6505fc2b58240c4eaa424";
        libraryHaskellDepends = [
          aeson ansi-wl-pprint array base bytestring containers generics-sop
          nats scientific semigroups tagged text time unordered-containers
@@ -28763,7 +28211,6 @@ self: {
        homepage = "http://hub.darcs.net/kowey/antfarm";
        description = "Referring expressions for definitions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "anticiv" = callPackage
@@ -28788,7 +28235,6 @@ self: {
        jailbreak = true;
        description = "This is an IRC bot for Mafia and Resistance";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "antigate" = callPackage
@@ -28807,7 +28253,6 @@ self: {
        homepage = "https://github.com/exbb2/antigate";
        description = "Interface for antigate.com captcha recognition API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "antimirov" = callPackage
@@ -28822,7 +28267,6 @@ self: {
        executableHaskellDepends = [ base containers QuickCheck ];
        description = "Define the language containment (=subtyping) relation on regulare expressions";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "antiquoter" = callPackage
@@ -28872,7 +28316,6 @@ self: {
        homepage = "https://github.com/markwright/antlrc";
        description = "Haskell binding to the ANTLR parser generator C runtime library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {antlr3c = null;};
 
   "anydbm" = callPackage
@@ -28888,7 +28331,6 @@ self: {
        homepage = "http://software.complete.org/anydbm";
        description = "Interface for DBM-like database systems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aosd" = callPackage
@@ -28909,7 +28351,6 @@ self: {
        ];
        description = "Bindings to libaosd, a library for Cairo-based on-screen displays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {libaosd = null;};
 
   "ap-reflect" = callPackage
@@ -28966,7 +28407,6 @@ self: {
        homepage = "http://ojeling.net/apelsin";
        description = "Server and community browser for the game Tremulous";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "api-builder" = callPackage
@@ -29044,7 +28484,6 @@ self: {
        homepage = "http://github.com/iconnect/api-tools";
        description = "DSL for generating API boilerplate and docs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "apiary_1_4_3" = callPackage
@@ -29207,7 +28646,6 @@ self: {
        homepage = "https://github.com/philopon/apiary";
        description = "helics support for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "apiary-logger" = callPackage
@@ -29310,7 +28748,6 @@ self: {
        homepage = "https://github.com/philopon/apiary";
        description = "purescript compiler for apiary web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "apiary-session" = callPackage
@@ -29367,7 +28804,6 @@ self: {
        homepage = "https://github.com/fabianbergmark/APIs";
        description = "A Template Haskell library for generating type safe API calls";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "apotiki" = callPackage
@@ -29399,7 +28835,6 @@ self: {
        homepage = "https://github.com/pyr/apotiki";
        description = "a faster debian repository";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "app-lens" = callPackage
@@ -29413,7 +28848,6 @@ self: {
        homepage = "https://bitbucket.org/kztk/app-lens";
        description = "applicative (functional) bidirectional programming beyond composition chains";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "app-settings" = callPackage
@@ -29469,7 +28903,6 @@ self: {
        ];
        description = "app container types and tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "applicative-extras" = callPackage
@@ -29648,7 +29081,6 @@ self: {
        homepage = "http://github.com/danieldk/approx-rand-test";
        description = "Approximate randomization test";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "approximate_0_2_1_1" = callPackage
@@ -29825,7 +29257,6 @@ self: {
        homepage = "https://github.com/ian-ross/arb-fft";
        description = "Pure Haskell arbitrary length FFT library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arbb-vm" = callPackage
@@ -29843,7 +29274,6 @@ self: {
        homepage = "https://github.com/svenssonjoel/arbb-vm/wiki";
        description = "FFI binding to the Intel Array Building Blocks (ArBB) virtual machine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {arbb_dev = null;};
 
   "arbtt_0_8_1_4" = callPackage
@@ -30098,7 +29528,6 @@ self: {
        ];
        description = "Archive supplied URLs in WebCite & Internet Archive";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "archlinux" = callPackage
@@ -30115,7 +29544,6 @@ self: {
        homepage = "http://github.com/archhaskell/";
        description = "Support for working with Arch Linux packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "archlinux-web" = callPackage
@@ -30142,7 +29570,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/archlinux";
        description = "Website maintenance for Arch Linux packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "archnews" = callPackage
@@ -30177,7 +29604,6 @@ self: {
        homepage = "http://code.haskell.org/~StefanKersten/code/arff";
        description = "Generate Attribute-Relation File Format (ARFF) files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arghwxhaskell" = callPackage
@@ -30268,7 +29694,6 @@ self: {
        homepage = "https://github.com/ocharles/argon2.git";
        description = "Haskell bindings to libargon2 - the reference implementation of the Argon2 password-hashing function";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "argparser" = callPackage
@@ -30281,7 +29706,6 @@ self: {
        testHaskellDepends = [ base containers HTF HUnit ];
        description = "Command line parsing framework for console applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arguedit" = callPackage
@@ -30300,7 +29724,6 @@ self: {
        jailbreak = true;
        description = "A computer assisted argumentation transcription and editing software";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ariadne" = callPackage
@@ -30329,7 +29752,6 @@ self: {
        homepage = "https://github.com/feuerbach/ariadne";
        description = "Go-to-definition for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arion" = callPackage
@@ -30354,7 +29776,6 @@ self: {
        homepage = "http://github.com/karun012/arion";
        description = "Watcher and runner for Hspec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arith-encode" = callPackage
@@ -30376,7 +29797,6 @@ self: {
        homepage = "https://github.com/emc2/arith-encode";
        description = "A practical arithmetic encoding (aka Godel numbering) library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arithmatic" = callPackage
@@ -30415,7 +29835,6 @@ self: {
        ];
        description = "Natural number arithmetic";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "arithmoi_0_4_1_1" = callPackage
@@ -30434,7 +29853,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://bitbucket.org/dafis/arithmoi";
-       description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms";
+       description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -30453,7 +29872,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/cartazio/arithmoi";
-       description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms";
+       description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -30472,9 +29891,8 @@ self: {
        ];
        testHaskellDepends = [ base hspec ];
        homepage = "https://github.com/cartazio/arithmoi";
-       description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms";
+       description = "Efficient basic number-theoretic functions. Primes, powers, integer logarithms.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "armada" = callPackage
@@ -30488,7 +29906,6 @@ self: {
        executableHaskellDepends = [ base GLUT mtl OpenGL stm ];
        description = "Space-based real time strategy game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arpa" = callPackage
@@ -30543,7 +29960,6 @@ self: {
        jailbreak = true;
        description = "A simple interpreter for arrayForth, the language used on GreenArrays chips";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "array-memoize" = callPackage
@@ -30593,7 +30009,6 @@ self: {
        homepage = "https://github.com/prophile/arrow-improve/";
        description = "Improved arrows";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arrow-list_0_6_1_5" = callPackage
@@ -30630,7 +30045,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Utilities for working with ArrowApply instances more naturally";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arrowp" = callPackage
@@ -30645,7 +30059,6 @@ self: {
        homepage = "http://www.haskell.org/arrows/";
        description = "preprocessor translating arrow notation into Haskell 98";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arrows" = callPackage
@@ -30682,8 +30095,8 @@ self: {
      }:
      mkDerivation {
        pname = "arx";
-       version = "0.2.1";
-       sha256 = "9d6f2a8e04209f9e208814b8aa8c693a4ea005ce7138d00e959214067fd34970";
+       version = "0.2.2";
+       sha256 = "a294fdbeb0e5da2762e855620c75289fbac09872efa76c14e1a47dd2d2ef8011";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -30697,7 +30110,6 @@ self: {
        homepage = "http://github.com/solidsnack/arx/";
        description = "Archive execution tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "arxiv" = callPackage
@@ -30797,7 +30209,6 @@ self: {
        jailbreak = true;
        description = "Conduit for encoding ByteString into Ascii85";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "asciidiagram_1_1_1_1" = callPackage
@@ -30860,7 +30271,6 @@ self: {
        homepage = "http://www.pros.upv.es/fittest/";
        description = "Action Script Instrumentation Compiler";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "asil" = callPackage
@@ -30880,7 +30290,6 @@ self: {
        homepage = "http://www.pros.upv.es/fittest/";
        description = "Action Script Instrumentation Library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "asn1-data_0_7_1" = callPackage
@@ -31153,7 +30562,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "The Assimp asset import library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) assimp;};
 
   "astar" = callPackage
@@ -31184,7 +30592,6 @@ self: {
        jailbreak = true;
        description = "an incomplete 2d space game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "astview" = callPackage
@@ -31204,7 +30611,6 @@ self: {
        ];
        description = "A GTK-based abstract syntax tree viewer for custom languages and parsers";
        license = stdenv.lib.licenses.bsdOriginal;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "astview-utils" = callPackage
@@ -31300,7 +30706,6 @@ self: {
        homepage = "http://github.com/jfischoff/async-extras";
        description = "Extra Utilities for the Async Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "async-manager" = callPackage
@@ -31377,7 +30782,6 @@ self: {
        homepage = "https://github.com/GaloisInc/aterm-utils";
        description = "Utility functions for working with aterms as generated by Minitermite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atl" = callPackage
@@ -31414,7 +30818,6 @@ self: {
        homepage = "https://bitbucket.org/ajknoll/atlassian-connect-core";
        description = "Atlassian Connect snaplet for the Snap Framework and helper code";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atlassian-connect-descriptor" = callPackage
@@ -31437,7 +30840,6 @@ self: {
        jailbreak = true;
        description = "Code that helps you create a valid Atlassian Connect Descriptor";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atmos" = callPackage
@@ -31507,29 +30909,30 @@ self: {
 
   "atom-conduit" = callPackage
     ({ mkDerivation, base, conduit, conduit-parse, data-default
-     , exceptions, foldl, hlint, lens, mono-traversable, parsers
+     , exceptions, foldl, hlint, lens-simple, mono-traversable, parsers
      , quickcheck-instances, resourcet, tasty, tasty-hunit
-     , tasty-quickcheck, text, time, timerep, total, uri-bytestring
+     , tasty-quickcheck, text, time, timerep, uri-bytestring
      , xml-conduit, xml-conduit-parse, xml-types
      }:
      mkDerivation {
        pname = "atom-conduit";
-       version = "0.2.0.0";
-       sha256 = "3dc3d6b784ebb2dc6a8cfc901f4c75351de5254efb6d12c6242d2cd5605e780e";
+       version = "0.3.0.0";
+       sha256 = "8e82a8ec5d0e21153883b7dc0e28a8dd27ff14db0a64cb572578dba989a42d68";
+       revision = "1";
+       editedCabalFile = "76c749fd2807f1fb328d997a819eedcaa879b9a1920272d7bc93940089e0ff33";
        libraryHaskellDepends = [
-         base conduit conduit-parse exceptions foldl lens mono-traversable
-         parsers text time timerep total uri-bytestring xml-conduit
-         xml-conduit-parse xml-types
+         base conduit conduit-parse exceptions foldl lens-simple
+         mono-traversable parsers text time timerep uri-bytestring
+         xml-conduit xml-conduit-parse xml-types
        ];
        testHaskellDepends = [
-         base conduit conduit-parse data-default exceptions hlint lens
-         mono-traversable parsers quickcheck-instances resourcet tasty
-         tasty-hunit tasty-quickcheck text time uri-bytestring xml-conduit
-         xml-conduit-parse xml-types
+         base conduit conduit-parse data-default exceptions hlint
+         lens-simple mono-traversable parsers quickcheck-instances resourcet
+         tasty tasty-hunit tasty-quickcheck text time uri-bytestring
+         xml-conduit xml-conduit-parse xml-types
        ];
-       description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287)";
+       description = "Streaming parser/renderer for the Atom 1.0 standard (RFC 4287).";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atom-msp430" = callPackage
@@ -31542,7 +30945,6 @@ self: {
        homepage = "https://github.com/eightyeight/atom-msp430";
        description = "Convenience functions for using Atom with the MSP430 microcontroller family";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atomic-primops_0_8" = callPackage
@@ -31588,7 +30990,6 @@ self: {
        homepage = "https://github.com/rrnewton/haskell-lockfree/wiki";
        description = "An atomic counter implemented using the FFI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "atomic-primops-vector" = callPackage
@@ -31602,7 +31003,6 @@ self: {
        jailbreak = true;
        description = "Atomic operations on Data.Vector types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atomic-write" = callPackage
@@ -31648,7 +31048,6 @@ self: {
        homepage = "http://atomo-lang.org/";
        description = "A highly dynamic, extremely simple, very fun programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "atp-haskell" = callPackage
@@ -31899,7 +31298,6 @@ self: {
        homepage = "https://github.com/robinbb/attoparsec-csv";
        description = "A parser for CSV files that uses Attoparsec";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attoparsec-enumerator_0_3_3" = callPackage
@@ -31971,7 +31369,6 @@ self: {
        homepage = "http://github.com/gregorycollins";
        description = "An adapter to convert attoparsec Parsers into blazing-fast Iteratees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attoparsec-parsec" = callPackage
@@ -32001,7 +31398,6 @@ self: {
        homepage = "http://patch-tag.com/r/felipe/attoparsec-text/home";
        description = "(deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attoparsec-text-enumerator" = callPackage
@@ -32014,7 +31410,6 @@ self: {
        jailbreak = true;
        description = "(deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "attoparsec-trans" = callPackage
@@ -32056,7 +31451,6 @@ self: {
        homepage = "http://www.dcs.st-and.ac.uk/~eb/epic.php";
        description = "Embedded Turtle language compiler in Haskell, with Epic output";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "audacity" = callPackage
@@ -32088,10 +31482,10 @@ self: {
          hashable JuicyPixels JuicyPixels-util lens linear mtl objective
          random template-haskell transformers vector void WAVE
        ];
+       jailbreak = true;
        homepage = "https://github.com/fumieval/audiovisual";
        description = "A battery-included audiovisual framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "augeas" = callPackage
@@ -32111,7 +31505,6 @@ self: {
        homepage = "http://trac.haskell.org/augeas";
        description = "A Haskell FFI wrapper for the Augeas API";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) augeas;};
 
   "augur" = callPackage
@@ -32131,7 +31524,6 @@ self: {
        jailbreak = true;
        description = "Renaming media collections in a breeze";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aur" = callPackage
@@ -32291,7 +31683,6 @@ self: {
        homepage = "http://github.com/nushio3/authoring";
        description = "A library for writing papers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "auto" = callPackage
@@ -32429,7 +31820,6 @@ self: {
        homepage = "http://code.haskell.org/autoproc";
        description = "EDSL for Procmail scripts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "avahi" = callPackage
@@ -32441,7 +31831,6 @@ self: {
        libraryHaskellDepends = [ base dbus-core text ];
        description = "Minimal DBus bindings for Avahi daemon (http://avahi.org)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "avatar-generator" = callPackage
@@ -32525,7 +31914,6 @@ self: {
        ];
        description = "empty";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "avers-api_0_0_1" = callPackage
@@ -32644,7 +32032,7 @@ self: {
        sha256 = "cf5edb7500a02aaba7400f3baab984680898dbedc0cf5b09ded2ca40568e6e57";
        libraryHaskellDepends = [ base ];
        homepage = "https://notabug.org/koz.ross/awesome-prelude";
-       description = "A prelude which I can be happy with. Based on base-prelude";
+       description = "A prelude which I can be happy with. Based on base-prelude.";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
@@ -32661,7 +32049,6 @@ self: {
        ];
        description = "High-level Awesomium bindings";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "awesomium-glut" = callPackage
@@ -32673,7 +32060,6 @@ self: {
        libraryHaskellDepends = [ awesomium awesomium-raw base GLUT ];
        description = "Utilities for using Awesomium with GLUT";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "awesomium-raw" = callPackage
@@ -32687,7 +32073,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Low-level Awesomium bindings";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {awesomium = null;};
 
   "aws_0_11" = callPackage
@@ -32963,7 +32348,6 @@ self: {
        ];
        description = "Configuration types, parsers & renderers for AWS services";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-dynamodb-conduit" = callPackage
@@ -33006,7 +32390,6 @@ self: {
        jailbreak = true;
        description = "Haskell bindings for Amazon DynamoDB Streams";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-ec2" = callPackage
@@ -33059,7 +32442,6 @@ self: {
        homepage = "http://github.com/iconnect/aws-elastic-transcoder";
        description = "Haskell suite for the Elastic Transcoder service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-general" = callPackage
@@ -33086,7 +32468,6 @@ self: {
        homepage = "https://github.com/alephcloud/hs-aws-general";
        description = "Bindings for Amazon Web Services (AWS) General Reference";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-kinesis" = callPackage
@@ -33113,7 +32494,6 @@ self: {
        homepage = "https://github.com/alephcloud/hs-aws-kinesis";
        description = "Bindings for Amazon Kinesis";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-kinesis-client" = callPackage
@@ -33149,7 +32529,6 @@ self: {
        jailbreak = true;
        description = "A producer & consumer client library for AWS Kinesis";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-kinesis-reshard" = callPackage
@@ -33180,7 +32559,6 @@ self: {
        homepage = "https://github.com/alephcloud/hs-aws-kinesis-reshard";
        description = "Reshard AWS Kinesis streams in response to Cloud Watch metrics";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-lambda" = callPackage
@@ -33202,7 +32580,6 @@ self: {
        homepage = "https://github.com/alephcloud/hs-aws-lambda";
        description = "Haskell bindings for AWS Lambda";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-performance-tests" = callPackage
@@ -33229,7 +32606,6 @@ self: {
        homepage = "http://github.com/alephcloud/hs-aws-performance-tests";
        description = "Performance Tests for the Haskell bindings for Amazon Web Services (AWS)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-route53" = callPackage
@@ -33276,7 +32652,6 @@ self: {
        homepage = "http://worksap-ate.github.com/aws-sdk";
        description = "AWS SDK for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-sdk-text-converter" = callPackage
@@ -33345,7 +32720,6 @@ self: {
        homepage = "http://github.com/iconnect/aws-sign4";
        description = "Amazon Web Services (AWS) Signature v4 HTTP request signer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "aws-sns" = callPackage
@@ -33370,7 +32744,6 @@ self: {
        homepage = "https://github.com/alephcloud/hs-aws-sns";
        description = "Bindings for AWS SNS Version 2013-03-31";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "azure-acs" = callPackage
@@ -33409,7 +32782,6 @@ self: {
        homepage = "github.com/haskell-distributed/azure-service-api";
        description = "Haskell bindings for the Microsoft Azure Service Management API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "azure-servicebus" = callPackage
@@ -33459,7 +32831,6 @@ self: {
        homepage = "http://arnovanlumig.com/azure";
        description = "A simple library for accessing Azure blob storage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "b-tree" = callPackage
@@ -33729,7 +33100,6 @@ self: {
        ];
        description = "An implementation of a simple 2-player board game";
        license = "GPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "backdropper" = callPackage
@@ -33748,7 +33118,6 @@ self: {
        jailbreak = true;
        description = "Rotates backdrops for X11 displays using Imagemagic";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "backtracking-exceptions" = callPackage
@@ -33805,7 +33174,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A simple stable bag";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bake_0_2" = callPackage
@@ -33881,7 +33249,6 @@ self: {
        homepage = "http://github.com/nfjinjing/bamboo/tree/master";
        description = "A blog engine on Hack";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bamboo-launcher" = callPackage
@@ -33902,7 +33269,6 @@ self: {
        homepage = "http://github.com/nfjinjing/bamboo-launcher";
        description = "bamboo-launcher";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bamboo-plugin-highlight" = callPackage
@@ -33920,7 +33286,6 @@ self: {
        homepage = "http://github.com/nfjinjing/bamboo-plugin-highlight/";
        description = "A highlight middleware";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bamboo-plugin-photo" = callPackage
@@ -33939,7 +33304,6 @@ self: {
        homepage = "http://github.com/nfjinjing/hack/tree/master";
        description = "A photo album middleware";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bamboo-theme-blueprint" = callPackage
@@ -33958,7 +33322,6 @@ self: {
        homepage = "http://github.com/nfjinjing/bamboo-theme-blueprint";
        description = "bamboo blueprint theme";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bamboo-theme-mini-html5" = callPackage
@@ -33981,7 +33344,6 @@ self: {
        homepage = "http://github.com/nfjinjing/bamboo-theme-mini-html5";
        description = "bamboo mini html5 theme";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bamse" = callPackage
@@ -34000,7 +33362,6 @@ self: {
        executableHaskellDepends = [ HUnit QuickCheck ];
        description = "A Windows Installer (MSI) generator framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bamstats" = callPackage
@@ -34093,7 +33454,6 @@ self: {
        homepage = "http://sebfisch.github.com/haskell-barchart";
        description = "Creating Bar Charts in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "barcodes-code128" = callPackage
@@ -34106,7 +33466,6 @@ self: {
        jailbreak = true;
        description = "Generate Code 128 barcodes as PDFs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "barecheck_0_2_0_6" = callPackage
@@ -34154,7 +33513,6 @@ self: {
        jailbreak = true;
        description = "A web based environment for learning and tinkering with Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "barrie" = callPackage
@@ -34167,7 +33525,6 @@ self: {
        homepage = "http://thewhitelion.org/haskell/barrie";
        description = "Declarative Gtk GUI library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "barrier" = callPackage
@@ -34204,7 +33561,6 @@ self: {
        jailbreak = true;
        description = "Implementation of barrier monad, can use custom front/back type";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "base_4_8_2_0" = callPackage
@@ -34286,7 +33642,7 @@ self: {
        libraryHaskellDepends = [ base ];
        jailbreak = true;
        homepage = "https://github.com/HaskellZhangSong/base-generics";
-       description = "This library provides some instances for extra GHC.Generic typeclass such as Int8, Word16 and some unboxed types as well";
+       description = "This library provides some instances for extra GHC.Generic typeclass such as Int8, Word16 and some unboxed types as well.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -34391,7 +33747,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "base-orphans" = callPackage
+  "base-orphans_0_5_2" = callPackage
     ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
      mkDerivation {
        pname = "base-orphans";
@@ -34402,6 +33758,20 @@ self: {
        homepage = "https://github.com/haskell-compat/base-orphans#readme";
        description = "Backwards-compatible orphan instances for base";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "base-orphans" = callPackage
+    ({ mkDerivation, base, ghc-prim, hspec, QuickCheck }:
+     mkDerivation {
+       pname = "base-orphans";
+       version = "0.5.3";
+       sha256 = "5def4ae2210a4ed75454aa268d166923bef7e9f1c1e6345fefa9c76eabc49062";
+       libraryHaskellDepends = [ base ghc-prim ];
+       testHaskellDepends = [ base hspec QuickCheck ];
+       homepage = "https://github.com/haskell-compat/base-orphans#readme";
+       description = "Backwards-compatible orphan instances for base";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "base-prelude_0_1_6" = callPackage
@@ -34622,7 +33992,6 @@ self: {
        homepage = "https://github.com/pxqr/base32-bytestring";
        description = "Fast base32 and base32hex codec for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "base32string" = callPackage
@@ -34945,7 +34314,6 @@ self: {
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "An interpreter for a small functional language";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "battlenet" = callPackage
@@ -35010,7 +34378,6 @@ self: {
        homepage = "https://github.com/zrho/afp";
        description = "A web-based implementation of battleships including an AI opponent";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bayes-stack" = callPackage
@@ -35031,7 +34398,6 @@ self: {
        homepage = "https://github.com/bgamari/bayes-stack";
        description = "Framework for inferring generative probabilistic models with Gibbs sampling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bbdb" = callPackage
@@ -35165,7 +34531,6 @@ self: {
        jailbreak = true;
        description = "Generic serializer/deserializer with compact representation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "beautifHOL" = callPackage
@@ -35180,7 +34545,6 @@ self: {
        homepage = "http://www.cs.indiana.edu/~lepike/pub_pages/holpp.html";
        description = "A pretty-printer for higher-order logic";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bed-and-breakfast" = callPackage
@@ -35201,7 +34565,6 @@ self: {
        homepage = "https://hackage.haskell.org/package/bed-and-breakfast";
        description = "Efficient Matrix operations in 100% Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bein" = callPackage
@@ -35224,7 +34587,6 @@ self: {
        ];
        description = "Bein is a provenance and workflow management system for bioinformatics";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "benchmark-function" = callPackage
@@ -35294,7 +34656,6 @@ self: {
        librarySystemDepends = [ db ];
        description = "Pretty BerkeleyDB v4 binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) db;};
 
   "berp" = callPackage
@@ -35322,7 +34683,6 @@ self: {
        homepage = "http://wiki.github.com/bjpop/berp/";
        description = "An implementation of Python 3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bert" = callPackage
@@ -35384,9 +34744,8 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/Noeda/bet/";
-       description = "Betfair API bindings. Bet on sports on betting exchanges";
+       description = "Betfair API bindings. Bet on sports on betting exchanges.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "betacode" = callPackage
@@ -35402,7 +34761,7 @@ self: {
        ];
        testHaskellDepends = [ base hspec QuickCheck smallcheck ];
        jailbreak = true;
-       description = "A codec for beta code (http://en.wikipedia.org/wiki/Beta_Code)";
+       description = "A codec for beta code (http://en.wikipedia.org/wiki/Beta_Code).";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -35446,7 +34805,6 @@ self: {
        jailbreak = true;
        description = "Bidirectionalization for Free! (POPL'09)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bff-mono" = callPackage
@@ -35487,7 +34845,6 @@ self: {
        ];
        description = "Blocked GZip";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bibtex" = callPackage
@@ -35521,7 +34878,6 @@ self: {
        homepage = "http://www.kb.ecei.tohoku.ac.jp/~kztk/b18n-combined/desc.html";
        description = "Prototype Implementation of Combining Syntactic and Semantic Bidirectionalization (ICFP'10)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bidispec" = callPackage
@@ -35533,7 +34889,6 @@ self: {
        libraryHaskellDepends = [ base bytestring mtl ];
        description = "Specification of generators and parsers";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bidispec-extras" = callPackage
@@ -35690,7 +35045,6 @@ self: {
        homepage = "http://ddmal.music.mcgill.ca/billboard";
        description = "A parser for the Billboard chord dataset";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "billeksah-forms" = callPackage
@@ -35710,7 +35064,6 @@ self: {
        homepage = "http://www.leksah.org";
        description = "Leksah library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "billeksah-main" = callPackage
@@ -35731,7 +35084,6 @@ self: {
        homepage = "http://www.leksah.org";
        description = "Leksah plugin base";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "billeksah-main-static" = callPackage
@@ -35775,7 +35127,6 @@ self: {
        homepage = "http://www.leksah.org";
        description = "Leksah library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "billeksah-services" = callPackage
@@ -35793,7 +35144,6 @@ self: {
        homepage = "http://www.leksah.org";
        description = "Leksah library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bimap_0_3_0" = callPackage
@@ -35967,7 +35317,6 @@ self: {
        jailbreak = true;
        description = "Automatic deriving of Binary using GHC.Generics";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-enum" = callPackage
@@ -35996,7 +35345,6 @@ self: {
        homepage = "https://skami.iocikun.jp/haskell/packages/binary-file";
        description = "read/write binary file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-generic" = callPackage
@@ -36022,9 +35370,8 @@ self: {
        version = "0.1";
        sha256 = "8dd0f54f68c36f107dfbc35412e873c4bbf057d16629417df38e3996f9ac4bb3";
        libraryHaskellDepends = [ array base ];
-       description = "Binary Indexed Trees (a.k.a. Fenwick Trees)";
+       description = "Binary Indexed Trees (a.k.a. Fenwick Trees).";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-list_1_0_1_0" = callPackage
@@ -36274,7 +35621,6 @@ self: {
        homepage = "http://github.com/NicolasT/binary-protocol-zmq";
        description = "Monad to ease implementing a binary network protocol over ZeroMQ";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-search_0_1" = callPackage
@@ -36309,7 +35655,6 @@ self: {
        doCheck = false;
        description = "Binary and exponential searches";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-shared" = callPackage
@@ -36331,7 +35676,7 @@ self: {
        version = "0.1.1";
        sha256 = "f44da50068bf57b2bea5dc7ef70aa4bb6fb14272bde724fc887c57417dc7631b";
        libraryHaskellDepends = [ base binary bytestring containers mtl ];
-       description = "Simple wrapper around Data.Binary, which adds StateT to Get/Put monads";
+       description = "Simple wrapper around Data.Binary, which adds StateT to Get/Put monads.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -36373,7 +35718,6 @@ self: {
        homepage = "http://github.com/jonpetterbergman/binary-streams";
        description = "data serialization/deserialization io-streams library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-strict" = callPackage
@@ -36386,7 +35730,6 @@ self: {
        homepage = "https://github.com/idontgetoutmuch/binary-low-level";
        description = "Binary deserialisation using strict ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binary-tagged_0_1_1_0" = callPackage
@@ -36541,7 +35884,6 @@ self: {
        homepage = "https://github.com/coreyoconnor/bind-marshal";
        description = "Data marshaling library that uses type level equations to optimize buffering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binding-core" = callPackage
@@ -36572,7 +35914,6 @@ self: {
        homepage = "https://bitbucket.org/accursoft/binding";
        description = "Data Binding in Gtk2Hs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "binding-wx" = callPackage
@@ -36588,7 +35929,6 @@ self: {
        homepage = "https://bitbucket.org/accursoft/binding";
        description = "Data Binding in WxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "bindings" = callPackage
@@ -36651,7 +35991,6 @@ self: {
        homepage = "http://cielonegro.org/Bindings-EsounD.html";
        description = "Low level bindings to EsounD (ESD; Enlightened Sound Daemon)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {esound = null;};
 
   "bindings-GLFW" = callPackage
@@ -36675,7 +36014,6 @@ self: {
        doCheck = false;
        description = "Low-level bindings to GLFW OpenGL library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXcursor; 
          inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXfixes; 
          inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; 
@@ -36693,7 +36031,6 @@ self: {
        homepage = "https://github.com/jputcu/bindings-K8055";
        description = "Bindings to Velleman K8055 dll";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {K8055D = null;};
 
   "bindings-apr" = callPackage
@@ -36708,7 +36045,6 @@ self: {
        homepage = "http://cielonegro.org/Bindings-APR.html";
        description = "Low level bindings to Apache Portable Runtime (APR)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {apr-1 = null;};
 
   "bindings-apr-util" = callPackage
@@ -36723,7 +36059,6 @@ self: {
        homepage = "http://cielonegro.org/Bindings-APR.html";
        description = "Low level bindings to Apache Portable Runtime Utility (APR Utility)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {apr-util-1 = null;};
 
   "bindings-audiofile" = callPackage
@@ -36737,7 +36072,6 @@ self: {
        homepage = "http://cielonegro.org/Bindings-AudioFile.html";
        description = "Low level bindings to audiofile";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) audiofile;};
 
   "bindings-bfd" = callPackage
@@ -36755,7 +36089,6 @@ self: {
        homepage = "http://projects.haskell.org/bindings-bfd/";
        description = "Bindings for libbfd, a library of the GNU `binutils'";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {bfd = null; opcodes = null;};
 
   "bindings-cctools" = callPackage
@@ -36769,7 +36102,6 @@ self: {
        homepage = "http://bitbucket.org/badi/bindings-cctools";
        description = "Bindings to the CCTools WorkQueue C library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {dttools = null;};
 
   "bindings-codec2" = callPackage
@@ -36790,7 +36122,6 @@ self: {
        homepage = "https://github.com/relrod/bindings-codec2";
        description = "Very low-level FFI bindings for Codec2";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {codec2 = null;};
 
   "bindings-common" = callPackage
@@ -36800,9 +36131,8 @@ self: {
        version = "1.3.4";
        sha256 = "8b55c6b28a4d7df6854d8b94933f58ca246e917b96080fa0f1ea92dbcb4675fd";
        libraryHaskellDepends = [ base ];
-       description = "This package is obsolete. Look for bindings-DSL instead";
+       description = "This package is obsolete. Look for bindings-DSL instead.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bindings-dc1394" = callPackage
@@ -36817,7 +36147,6 @@ self: {
        homepage = "http://github.com/aleator/bindings-dc1394";
        description = "Library for using firewire (iidc-1394) cameras";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {dc1394 = null;};
 
   "bindings-directfb" = callPackage
@@ -36830,7 +36159,6 @@ self: {
        libraryPkgconfigDepends = [ directfb ];
        description = "Low level bindings to DirectFB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) directfb;};
 
   "bindings-eskit" = callPackage
@@ -36846,7 +36174,6 @@ self: {
        homepage = "http://github.com/a1kmm/bindings-eskit";
        description = "Bindings to ESKit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {eskit = null;};
 
   "bindings-fann" = callPackage
@@ -36859,7 +36186,6 @@ self: {
        libraryPkgconfigDepends = [ fann ];
        description = "Low level bindings to FANN neural network library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {fann = null;};
 
   "bindings-fluidsynth" = callPackage
@@ -36873,7 +36199,6 @@ self: {
        homepage = "http://github.com/bgamari/bindings-fluidsynth";
        description = "Haskell FFI bindings for fluidsynth software synthesizer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) fluidsynth;};
 
   "bindings-friso" = callPackage
@@ -36886,7 +36211,6 @@ self: {
        librarySystemDepends = [ friso ];
        description = "Low level bindings for friso";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {friso = null;};
 
   "bindings-glib" = callPackage
@@ -36936,7 +36260,6 @@ self: {
        libraryPkgconfigDepends = [ gsl ];
        description = "Low level bindings to GNU GSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gsl;};
 
   "bindings-gts" = callPackage
@@ -36949,7 +36272,6 @@ self: {
        libraryPkgconfigDepends = [ gts ];
        description = "Low level bindings supporting GTS, the GNU Triangulated Surface Library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gts;};
 
   "bindings-hamlib" = callPackage
@@ -36979,7 +36301,6 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ];
        description = "Project bindings-* raw interface to HDF5 library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bindings-levmar" = callPackage
@@ -37006,7 +36327,6 @@ self: {
        homepage = "http://bitbucket.org/mauricio/bindings-libcddb";
        description = "Low level binding to libcddb";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libcddb;};
 
   "bindings-libffi" = callPackage
@@ -37031,7 +36351,6 @@ self: {
        libraryPkgconfigDepends = [ libftdi libusb ];
        description = "Low level bindings to libftdi";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libftdi; inherit (pkgs) libusb;};
 
   "bindings-librrd" = callPackage
@@ -37045,7 +36364,6 @@ self: {
        homepage = "http://cielonegro.org/Bindings-librrd.html";
        description = "Low level bindings to RRDtool";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {librrd = null;};
 
   "bindings-libstemmer" = callPackage
@@ -37062,7 +36380,6 @@ self: {
        librarySystemDepends = [ stemmer ];
        description = "Binding for libstemmer with low level binding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {stemmer = null;};
 
   "bindings-libusb" = callPackage
@@ -37089,7 +36406,6 @@ self: {
        homepage = "https://gitorious.org/hsv4l2";
        description = "bindings to libv4l2 for Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {v4l2 = null;};
 
   "bindings-libzip" = callPackage
@@ -37103,7 +36419,6 @@ self: {
        homepage = "http://bitbucket.org/astanin/hs-libzip/";
        description = "Low level bindings to libzip";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libzip;};
 
   "bindings-libzip_0_11" = callPackage
@@ -37130,7 +36445,6 @@ self: {
        homepage = "https://gitorious.org/hsv4l2";
        description = "bindings to Video For Linux Two (v4l2) kernel interfaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bindings-lxc" = callPackage
@@ -37144,7 +36458,6 @@ self: {
        homepage = "https://github.com/fizruk/bindings-lxc";
        description = "Direct Haskell bindings to LXC (Linux containers) C API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) lxc;};
 
   "bindings-mmap" = callPackage
@@ -37169,7 +36482,6 @@ self: {
        homepage = "http://www.github.com/massysett/bindings-mpdecimal";
        description = "bindings to mpdecimal library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bindings-nettle" = callPackage
@@ -37211,7 +36523,6 @@ self: {
        libraryPkgconfigDepends = [ portaudio ];
        description = "Low-level bindings to portaudio library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) portaudio;};
 
   "bindings-posix" = callPackage
@@ -37247,7 +36558,6 @@ self: {
        libraryHaskellDepends = [ base bindings-DSL ioctl ];
        description = "PPDev bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "bindings-saga-cmd" = callPackage
@@ -37282,7 +36592,6 @@ self: {
        homepage = "http://floss.scru.org/bindings-sane";
        description = "FFI bindings to libsane";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {saneBackends = null;};
 
   "bindings-sc3" = callPackage
@@ -37296,7 +36605,6 @@ self: {
        homepage = "https://github.com/kaoskorobase/bindings-sc3/";
        description = "Low-level bindings to the SuperCollider synthesis engine library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {scsynth = null;};
 
   "bindings-sipc" = callPackage
@@ -37313,7 +36621,6 @@ self: {
        homepage = "https://github.com/justinethier/hs-bindings-sipc";
        description = "Low level bindings to SIPC";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {sipc = null;};
 
   "bindings-sophia" = callPackage
@@ -37349,7 +36656,6 @@ self: {
        homepage = "http://github.com/tanimoto/bindings-svm";
        description = "Low level bindings to libsvm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "bindings-uname" = callPackage
@@ -37422,7 +36728,6 @@ self: {
        homepage = "http://code.mathr.co.uk/binembed";
        description = "Example project using binembed to embed data in object files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "bini" = callPackage
@@ -37460,7 +36765,6 @@ self: {
        homepage = "http://biohaskell.org/Libraries/Bio";
        description = "A bioinformatics library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bioace" = callPackage
@@ -37555,7 +36859,6 @@ self: {
        homepage = "http://github.com/udo-stenzel/biohazard";
        description = "bioinformatics support library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bioinformatics-toolkit" = callPackage
@@ -37587,7 +36890,6 @@ self: {
        ];
        description = "A collection of bioinformatics tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "biophd" = callPackage
@@ -37685,7 +36987,6 @@ self: {
        homepage = "http://biohaskell.org/";
        description = "Library and executables for working with SFF files";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "biostockholm" = callPackage
@@ -37709,7 +37010,6 @@ self: {
        jailbreak = true;
        description = "Parsing and rendering of Stockholm files (used by Pfam, Rfam and Infernal)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bird" = callPackage
@@ -37730,7 +37030,6 @@ self: {
        homepage = "http://github.com/moonmaster9000/bird";
        description = "A simple, sinatra-inspired web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bit-array" = callPackage
@@ -37744,7 +37043,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/bit-array";
        description = "A bit array (aka bitset, bitmap, bit vector) API for numeric types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bit-vector" = callPackage
@@ -37762,7 +37060,6 @@ self: {
        homepage = "https://github.com/acfoltzer/bit-vector";
        description = "Simple bit vectors for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "bitarray" = callPackage
@@ -37867,7 +37164,6 @@ self: {
        jailbreak = true;
        description = "Library to communicate with the Satoshi Bitcoin daemon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bitcoin-script" = callPackage
@@ -37939,9 +37235,8 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://bitbucket.org/jetxee/hs-bitly/";
-       description = "A command line tool to access bit.ly URL shortener";
+       description = "A command line tool to access bit.ly URL shortener.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bitmap" = callPackage
@@ -37964,9 +37259,8 @@ self: {
        sha256 = "fba6d684213fbf56f8ca1109ec4087433dfe9f1a780ae8ef03e5b8b837b801f3";
        libraryHaskellDepends = [ base bitmap OpenGL ];
        homepage = "http://code.haskell.org/~bkomuves/";
-       description = "OpenGL support for Data.Bitmap";
+       description = "OpenGL support for Data.Bitmap.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "bitmaps" = callPackage
@@ -38027,7 +37321,6 @@ self: {
        jailbreak = true;
        description = "Bitstream support for Conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bits-extras" = callPackage
@@ -38042,7 +37335,6 @@ self: {
        librarySystemDepends = [ gcc_s ];
        description = "Efficient high-level bit operations not found in Data.Bits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {gcc_s = null;};
 
   "bitset" = callPackage
@@ -38059,7 +37351,6 @@ self: {
        jailbreak = true;
        description = "A space-efficient set data structure";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gmp;};
 
   "bitspeak" = callPackage
@@ -38079,7 +37370,6 @@ self: {
        jailbreak = true;
        description = "Proof-of-concept tool for writing using binary choices";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gdk2 = null; gtk2 = pkgs.gnome2.gtk; 
          inherit (pkgs.gnome) pango;};
 
@@ -38101,7 +37391,6 @@ self: {
        homepage = "https://github.com/phonohawk/bitstream";
        description = "Fast, packed, strict and lazy bit streams with stream fusion";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bitstring" = callPackage
@@ -38148,7 +37437,6 @@ self: {
        homepage = "https://github.com/cobit/bittorrent";
        description = "Bittorrent protocol implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bitvec" = callPackage
@@ -38167,6 +37455,20 @@ self: {
        homepage = "https://github.com/mokus0/bitvec";
        description = "Unboxed vectors of bits / dense IntSets";
        license = stdenv.lib.licenses.publicDomain;
+     }) {};
+
+  "bitwise_0_1_0_2" = callPackage
+    ({ mkDerivation, array, base, bytestring, QuickCheck }:
+     mkDerivation {
+       pname = "bitwise";
+       version = "0.1.0.2";
+       sha256 = "ae41a4f36c6d52edbfd17ad186abbf9536f46bbbda4bb2341fd6fb965d02afa4";
+       libraryHaskellDepends = [ array base bytestring ];
+       testHaskellDepends = [ base QuickCheck ];
+       jailbreak = true;
+       homepage = "http://code.mathr.co.uk/bitwise";
+       description = "fast multi-dimensional unboxed bit packed Bool arrays";
+       license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
@@ -38174,8 +37476,8 @@ self: {
     ({ mkDerivation, array, base, bytestring, QuickCheck }:
      mkDerivation {
        pname = "bitwise";
-       version = "0.1.0.2";
-       sha256 = "ae41a4f36c6d52edbfd17ad186abbf9536f46bbbda4bb2341fd6fb965d02afa4";
+       version = "0.1.1";
+       sha256 = "d4c8ad8673585a40c549fdd24313551bda98f6fbfc7f4be8693a31d54d4b8a84";
        libraryHaskellDepends = [ array base bytestring ];
        testHaskellDepends = [ base QuickCheck ];
        homepage = "http://code.mathr.co.uk/bitwise";
@@ -38241,7 +37543,6 @@ self: {
        homepage = "https://github.com/ingesson/bkr";
        description = "Backup utility for backing up to cloud storage services (S3 only right now)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bktrees" = callPackage
@@ -38267,7 +37568,6 @@ self: {
        homepage = "http://github.com/nfjinjing/bla";
        description = "a stupid cron";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "black-jewel" = callPackage
@@ -38289,7 +37589,6 @@ self: {
        homepage = "http://git.kaction.name/black-jewel";
        description = "The pirate bay client";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blacktip" = callPackage
@@ -38340,7 +37639,6 @@ self: {
        homepage = "https://github.com/killerswan/Haskell-BLAKE";
        description = "The BLAKE SHA-3 candidate hashes, in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blakesum-demo" = callPackage
@@ -38360,7 +37658,6 @@ self: {
        homepage = "https://github.com/killerswan/Haskell-BLAKE";
        description = "The BLAKE SHA-3 candidate hashes, in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blank-canvas_0_5" = callPackage
@@ -38411,7 +37708,6 @@ self: {
        homepage = "https://github.com/ku-fpg/blank-canvas/wiki";
        description = "HTML5 Canvas Graphics Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blas" = callPackage
@@ -38425,7 +37721,6 @@ self: {
        homepage = "http://github.com/patperry/blas";
        description = "Bindings to the BLAS library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blas-hs" = callPackage
@@ -38440,7 +37735,6 @@ self: {
        homepage = "https://github.com/Rufflewind/blas-hs";
        description = "Low-level Haskell bindings to Blas";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) blas;};
 
   "blastxml" = callPackage
@@ -38730,7 +38024,6 @@ self: {
        homepage = "https://github.com/egonSchiele/blaze-html-contrib";
        description = "Some contributions to add handy things to blaze html";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blaze-html-hexpat" = callPackage
@@ -38744,7 +38037,6 @@ self: {
        homepage = "https://github.com/jaspervdj/blaze-html-hexpat";
        description = "A hexpat backend for blaze-html";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blaze-html-truncate" = callPackage
@@ -39018,7 +38310,6 @@ self: {
        homepage = "http://github.com/mailrank/blaze-textual";
        description = "Fast rendering of common datatypes (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blazeMarker" = callPackage
@@ -39028,9 +38319,8 @@ self: {
        version = "0.1.0.0";
        sha256 = "0c0dedca6cee4a5547a73f3a825925ca447bc8a86d8cf8ac41aa9fdfa91ffd0d";
        libraryHaskellDepends = [ base blaze-html blaze-markup ];
-       description = "..";
+       description = "...";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "blink1" = callPackage
@@ -39065,7 +38355,6 @@ self: {
        homepage = "https://github.com/bjpop/blip";
        description = "Python to bytecode compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bliplib" = callPackage
@@ -39115,7 +38404,6 @@ self: {
        executableHaskellDepends = [ base ConfigFile haskell98 old-time ];
        description = "Very simple static blog software";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bloodhound_0_4_0_2" = callPackage
@@ -39230,7 +38518,6 @@ self: {
        homepage = "https://github.com/bitemyapp/bloodhound";
        description = "ElasticSearch client library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bloomfilter" = callPackage
@@ -39262,7 +38549,6 @@ self: {
        executableHaskellDepends = [ base GLFW OpenGL ];
        description = "OpenGL Logic Game";
        license = "GPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "blubber" = callPackage
@@ -39282,7 +38568,6 @@ self: {
        homepage = "https://secure.plaimi.net/games/blubber.html";
        description = "The blubber client; connects to the blubber server";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "blubber-server" = callPackage
@@ -39327,7 +38612,6 @@ self: {
        homepage = "http://www.bluetile.org/";
        description = "full-featured tiling for the GNOME desktop environment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk2 = pkgs.gnome2.gtk;};
 
   "bluetileutils" = callPackage
@@ -39402,7 +38686,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/games/";
        description = "Three games for inclusion in a web server";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bogre-banana" = callPackage
@@ -39420,7 +38703,6 @@ self: {
        ];
        executableHaskellDepends = [ base hogre hois random ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bond" = callPackage
@@ -39452,7 +38734,6 @@ self: {
        homepage = "https://github.com/Microsoft/bond";
        description = "Bond schema compiler and code generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bool-extras" = callPackage
@@ -39496,7 +38777,6 @@ self: {
        ];
        description = "Boolean normal form: NNF, DNF & CNF";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "boolexpr" = callPackage
@@ -39530,7 +38810,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Simplification tools for simple propositional formulas";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "boomange" = callPackage
@@ -39595,7 +38874,6 @@ self: {
        jailbreak = true;
        description = "Boomshine clone";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "borel" = callPackage
@@ -39629,7 +38907,6 @@ self: {
        homepage = "https://github.com/anchor/borel-core";
        description = "Metering System for OpenStack metrics provided by Vaultaire";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bot" = callPackage
@@ -39642,7 +38919,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Bot";
        description = "bots for functional reactive programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "both" = callPackage
@@ -39946,7 +39222,6 @@ self: {
        homepage = "http://github.com/Peaker/breakout/tree/master";
        description = "A simple Breakout game implementation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "breve" = callPackage
@@ -39984,7 +39259,6 @@ self: {
        homepage = "http://github.com/willdonnelly/brians-brain";
        description = "A Haskell implementation of the Brian's Brain cellular automaton";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "brick_0_3_1" = callPackage
@@ -40053,7 +39327,6 @@ self: {
        jailbreak = true;
        description = "Simple part of speech tagger";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "broadcast-chan" = callPackage
@@ -40092,7 +39365,6 @@ self: {
        homepage = "https://github.com/capn-freako/broker-haskell";
        description = "Haskell bindings to Broker, Bro's messaging library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {broker = null;};
 
   "bsd-sysctl" = callPackage
@@ -40104,7 +39376,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Access to the BSD sysctl(3) interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bson_0_3_1" = callPackage
@@ -40204,7 +39475,6 @@ self: {
        jailbreak = true;
        description = "Generics functionality for BSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bson-lens" = callPackage
@@ -40232,7 +39502,6 @@ self: {
        ];
        description = "Mapping between BSON and algebraic data types";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bspack" = callPackage
@@ -40285,7 +39554,6 @@ self: {
        homepage = "https://github.com/brinchj/btree-concurrent";
        description = "A backend agnostic, concurrent BTree";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "btrfs_0_1_1_1" = callPackage
@@ -40317,7 +39585,6 @@ self: {
        homepage = "https://github.com/redneb/hs-btrfs";
        description = "Bindings to the btrfs API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "buffer-builder_0_2_4_0" = callPackage
@@ -40362,7 +39629,6 @@ self: {
        homepage = "https://github.com/chadaustin/buffer-builder";
        description = "Library for efficiently building up buffers, one piece at a time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "buffer-builder-aeson" = callPackage
@@ -40388,7 +39654,6 @@ self: {
        ];
        description = "Serialize Aeson values with Data.BufferBuilder";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buffer-pipe" = callPackage
@@ -40419,7 +39684,6 @@ self: {
        homepage = "https://github.com/derekelkins/buffon";
        description = "An implementation of Buffon machines";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bugzilla" = callPackage
@@ -40487,7 +39751,6 @@ self: {
        homepage = "http://code.ouroborus.net/buildbox";
        description = "Tools for working with buildbox benchmark result files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buildwrapper" = callPackage
@@ -40527,7 +39790,6 @@ self: {
        homepage = "https://github.com/JPMoresmau/BuildWrapper";
        description = "A library and an executable that provide an easy API for a Haskell IDE";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bullet" = callPackage
@@ -40542,7 +39804,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Bullet";
        description = "A wrapper for the Bullet physics engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) bullet;};
 
   "bumper_0_6_0_2" = callPackage
@@ -40631,7 +39892,6 @@ self: {
        homepage = "http://vis.renci.org/jeff/buster";
        description = "Almost but not quite entirely unlike FRP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buster-gtk" = callPackage
@@ -40649,7 +39909,6 @@ self: {
        homepage = "http://vis.renci.org/jeff/buster";
        description = "Almost but not quite entirely unlike FRP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "buster-network" = callPackage
@@ -40667,7 +39926,6 @@ self: {
        homepage = "http://vis.renci.org/jeff/buster";
        description = "Almost but not quite entirely unlike FRP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bustle_0_5_2" = callPackage
@@ -40751,7 +40009,6 @@ self: {
        homepage = "http://www.freedesktop.org/wiki/Software/Bustle/";
        description = "Draw sequence diagrams of D-Bus traffic";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {system-glib = pkgs.glib;};
 
   "butterflies" = callPackage
@@ -40773,7 +40030,6 @@ self: {
        homepage = "http://code.mathr.co.uk/butterflies";
        description = "butterfly tilings";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bv" = callPackage
@@ -40819,7 +40075,6 @@ self: {
        libraryHaskellDepends = [ base bytestring word24 ];
        description = "data from/to ByteString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "byteable" = callPackage
@@ -41039,7 +40294,6 @@ self: {
        homepage = "https://github.com/tsuraan/bytestring-arbitrary";
        description = "Arbitrary instances for ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-builder_0_10_4_0_1" = callPackage
@@ -41126,7 +40380,6 @@ self: {
        jailbreak = true;
        description = "Classes for automatic conversion to and from strict and lazy bytestrings. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-conversion_0_3_0" = callPackage
@@ -41180,7 +40433,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/bytestring-csv";
        description = "Parse CSV formatted data efficiently";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-delta" = callPackage
@@ -41394,7 +40646,6 @@ self: {
        homepage = "github.com/tcrayford/rematch";
        description = "Rematch support for ByteString";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-short" = callPackage
@@ -41407,7 +40658,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Backport copy of ShortByteString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestring-show" = callPackage
@@ -41481,7 +40731,6 @@ self: {
        libraryHaskellDepends = [ base bytestring containers ];
        description = "Combinator parsing with Data.ByteString.Lazy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bytestringparser-temporary" = callPackage
@@ -41504,7 +40753,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "A ReadP style parser library for ByteString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "bzlib_0_5_0_4" = callPackage
@@ -41578,7 +40826,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "C IO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "c-storable-deriving" = callPackage
@@ -41763,7 +41010,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/joelteon/cabal-audit.git";
-       description = "Check how up-to-date your .cabal dependencies are";
+       description = "Check how up-to-date your .cabal dependencies are.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -41825,7 +41072,6 @@ self: {
        homepage = "https://github.com/benarmston/cabal-constraints";
        description = "Repeatable builds for cabalized Haskell projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-db" = callPackage
@@ -41950,7 +41196,6 @@ self: {
        homepage = "https://github.com/ddssff/cabal-debian";
        description = "Create a Debianization for a Cabal package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-dependency-licenses" = callPackage
@@ -41990,7 +41235,6 @@ self: {
        homepage = "http://github.com/creswick/cabal-dev";
        description = "Manage sandboxed Haskell build environments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-dir" = callPackage
@@ -42048,7 +41292,6 @@ self: {
        homepage = "http://github.com/atnnn/cabal-ghci";
        description = "Set up ghci with options taken from a .cabal file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-graphdeps" = callPackage
@@ -42067,7 +41310,6 @@ self: {
        homepage = "https://john-millikin.com/software/cabal-graphdeps/";
        description = "Generate graphs of install-time Cabal dependencies";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-helper_0_6_2_0" = callPackage
@@ -42467,6 +41709,40 @@ self: {
        maintainers = with stdenv.lib.maintainers; [ simons ];
      }) {};
 
+  "cabal-install_1_22_9_0" = callPackage
+    ({ mkDerivation, array, base, bytestring, Cabal, containers
+     , directory, extensible-exceptions, filepath, HTTP, HUnit, mtl
+     , network, network-uri, pretty, process, QuickCheck, random
+     , regex-posix, stm, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, time, unix, zlib
+     }:
+     mkDerivation {
+       pname = "cabal-install";
+       version = "1.22.9.0";
+       sha256 = "874035e5730263653c7aa459f270efbffc06da92ea0c828e09ebc04400e94940";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         array base bytestring Cabal containers directory filepath HTTP mtl
+         network network-uri pretty process random stm time unix zlib
+       ];
+       testHaskellDepends = [
+         array base bytestring Cabal containers directory
+         extensible-exceptions filepath HTTP HUnit mtl network network-uri
+         pretty process QuickCheck regex-posix stm test-framework
+         test-framework-hunit test-framework-quickcheck2 time unix zlib
+       ];
+       postInstall = ''
+         mkdir $out/etc
+         mv bash-completion $out/etc/bash_completion.d
+       '';
+       homepage = "http://www.haskell.org/cabal/";
+       description = "The command-line interface for Cabal and Hackage";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+       maintainers = with stdenv.lib.maintainers; [ simons ];
+     }) {};
+
   "cabal-install-bundle" = callPackage
     ({ mkDerivation, array, base, bytestring, Cabal, containers
      , directory, filepath, old-time, pretty, process, time, unix, zlib
@@ -42484,7 +41760,6 @@ self: {
        executableSystemDepends = [ zlib ];
        description = "The (bundled) command-line interface for Cabal and Hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zlib;};
 
   "cabal-install-ghc72" = callPackage
@@ -42506,7 +41781,6 @@ self: {
        homepage = "http://www.haskell.org/cabal/";
        description = "Temporary version of cabal-install for ghc-7.2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-install-ghc74" = callPackage
@@ -42528,7 +41802,6 @@ self: {
        homepage = "http://www.haskell.org/cabal/";
        description = "Temporary version of cabal-install for ghc-7.4";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-lenses" = callPackage
@@ -42662,7 +41935,6 @@ self: {
        homepage = "http://github.com/explicitcall/cabal-query";
        description = "Helpers for quering .cabal files or hackageDB's 00-index.tar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-rpm_0_9_4" = callPackage
@@ -42821,7 +42093,6 @@ self: {
        homepage = "http://www.haskell.org/cabal/";
        description = "The user interface for building and installing Cabal packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-sign" = callPackage
@@ -42996,7 +42267,6 @@ self: {
        ];
        description = "Automated test tool for cabal projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal-test-bin" = callPackage
@@ -43079,7 +42349,6 @@ self: {
        jailbreak = true;
        description = "Command-line tool for uploading packages to Hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal2arch" = callPackage
@@ -43099,7 +42368,6 @@ self: {
        homepage = "http://github.com/archhaskell/";
        description = "Create Arch Linux packages from Cabal packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal2doap" = callPackage
@@ -43117,7 +42385,6 @@ self: {
        homepage = "http://gregheartsfield.com/cabal2doap/";
        description = "Cabal to Description-of-a-Project (DOAP)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabal2ebuild" = callPackage
@@ -43195,7 +42462,6 @@ self: {
        homepage = "https://fedorahosted.org/cabal2spec/";
        description = "Generates RPM Spec files from cabal files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabalQuery" = callPackage
@@ -43249,7 +42515,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/cabalgraph";
        description = "Generate pretty graphs of module trees from cabal files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabalmdvrpm" = callPackage
@@ -43265,7 +42530,6 @@ self: {
        homepage = "http://nanardon.zarb.org/darcsweb/darcsweb.cgi?r=haskell-cabalmdvrpm;a=shortlog;topi=0";
        description = "Create mandriva rpm from cabal package";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabalrpmdeps" = callPackage
@@ -43281,7 +42545,6 @@ self: {
        homepage = "http://nanardon.zarb.org/darcsweb/darcsweb.cgi?r=haskell-CabalRpmDeps;a=summary";
        description = "Autogenerate rpm dependencies from cabal files";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cabalvchk" = callPackage
@@ -43326,7 +42589,6 @@ self: {
        testHaskellDepends = [ base text-format ];
        homepage = "http://github.com/pecorarista/hscabocha";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {cabocha = null;};
 
   "cached-io" = callPackage
@@ -43586,7 +42848,6 @@ self: {
        homepage = "https://github.com/grwlf/cake3";
        description = "Third cake the Makefile EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cakyrespa" = callPackage
@@ -43605,7 +42866,6 @@ self: {
        homepage = "http://homepage3.nifty.com/salamander/myblog/cakyrespa.html";
        description = "run turtle like LOGO with lojban";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cal3d" = callPackage
@@ -43619,7 +42879,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Cal3d_animation";
        description = "Haskell binding to the Cal3D animation library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {cal3d = null;};
 
   "cal3d-examples" = callPackage
@@ -43635,7 +42894,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Cal3d_animation";
        description = "Examples for the Cal3d animation library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cal3d-opengl" = callPackage
@@ -43649,7 +42907,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Cal3d_animation";
        description = "OpenGL rendering for the Cal3D animation library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "calc" = callPackage
@@ -43663,7 +42920,6 @@ self: {
        executableHaskellDepends = [ array base harpy haskell98 mtl ];
        description = "A small compiler for arithmetic expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "calculator" = callPackage
@@ -43706,7 +42962,6 @@ self: {
        ];
        description = "Calculation tool and library supporting units";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "caledon" = callPackage
@@ -43726,7 +42981,6 @@ self: {
        homepage = "https://github.com/mmirman/caledon";
        description = "a logic programming language based on the calculus of constructions";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "call" = callPackage
@@ -43754,7 +43008,6 @@ self: {
        homepage = "https://github.com/fumieval/call";
        description = "The call game engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "call-haskell-from-anything" = callPackage
@@ -43774,7 +43027,6 @@ self: {
        homepage = "https://github.com/nh2/call-haskell-from-anything";
        description = "Call Haskell functions from other languages via serialization and dynamic libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "camh" = callPackage
@@ -43809,7 +43061,6 @@ self: {
        homepage = "http://github.com/michaelxavier/Campfire";
        description = "Haskell implementation of the Campfire API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "canonical-filepath" = callPackage
@@ -43906,7 +43157,6 @@ self: {
        homepage = "https://github.com/klangner/cantor";
        description = "Application for analysis of java source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cao" = callPackage
@@ -43928,7 +43178,6 @@ self: {
        homepage = "http://haslab.uminho.pt/mbb/software/cao-domain-specific-language-cryptography";
        description = "CAO Compiler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cap" = callPackage
@@ -43942,7 +43191,6 @@ self: {
        executableHaskellDepends = [ array base containers haskell98 ];
        description = "Interprets and debug the cap language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "capped-list" = callPackage
@@ -43969,7 +43217,6 @@ self: {
        ];
        description = "A simple wrapper over cabal-install to operate in project-private mode";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "car-pool" = callPackage
@@ -44037,7 +43284,6 @@ self: {
        homepage = "http://github.com/jdevelop/carboncopy";
        description = "Drop emails from threads being watched into special CC folder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "carettah" = callPackage
@@ -44179,7 +43425,6 @@ self: {
        homepage = "http://github.com/ghorn/casadi-bindings";
        description = "mid-level bindings to CasADi";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {casadi = null;};
 
   "casadi-bindings-control" = callPackage
@@ -44197,7 +43442,6 @@ self: {
        jailbreak = true;
        description = "low level bindings to casadi-control";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {casadi_control = null;};
 
   "casadi-bindings-core" = callPackage
@@ -44214,7 +43458,6 @@ self: {
        libraryPkgconfigDepends = [ casadi ];
        description = "autogenerated low level bindings to casadi";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {casadi = null;};
 
   "casadi-bindings-internal" = callPackage
@@ -44228,7 +43471,6 @@ self: {
        homepage = "http://github.com/ghorn/casadi-bindings";
        description = "low level bindings to CasADi";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {casadi = null;};
 
   "casadi-bindings-ipopt-interface" = callPackage
@@ -44245,7 +43487,6 @@ self: {
        libraryPkgconfigDepends = [ casadi_ipopt_interface ];
        description = "low level bindings to casadi-ipopt_interface";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {casadi_ipopt_interface = null;};
 
   "casadi-bindings-snopt-interface" = callPackage
@@ -44262,7 +43503,6 @@ self: {
        libraryPkgconfigDepends = [ casadi_snopt_interface ];
        description = "low level bindings to casadi-snopt_interface";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {casadi_snopt_interface = null;};
 
   "cascading" = callPackage
@@ -44280,7 +43520,6 @@ self: {
        jailbreak = true;
        description = "DSL for HTML CSS (Cascading Style Sheets)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "case-conversion" = callPackage
@@ -44461,7 +43700,6 @@ self: {
        homepage = "http://www.cs.st-andrews.ac.uk/~hwloidl/SCIEnce/SymGrid-Par/CASH/";
        description = "the Computer Algebra SHell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "casing" = callPackage
@@ -44520,7 +43758,6 @@ self: {
        homepage = "http://cassandra.apache.org/";
        description = "thrift bindings to the cassandra database";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cassava_0_4_2_0" = callPackage
@@ -44801,7 +44038,6 @@ self: {
        homepage = "https://github.com/pjones/cassava-streams";
        description = "io-streams interface for the cassava CSV library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cassette" = callPackage
@@ -44842,7 +44078,6 @@ self: {
        homepage = "http://github.com/ozataman/cassy";
        description = "A high level driver for the Cassandra datastore";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "castle" = callPackage
@@ -44877,7 +44112,6 @@ self: {
        homepage = "http://code.atnnn.com/projects/casui";
        description = "Equation Manipulator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "catamorphism" = callPackage
@@ -44903,7 +44137,6 @@ self: {
        homepage = "http://github.com/sonyandy/catch-fd";
        description = "MonadThrow and MonadCatch, using functional dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "categorical-algebra" = callPackage
@@ -44915,7 +44148,6 @@ self: {
        libraryHaskellDepends = [ base newtype pointless-haskell void ];
        description = "Categorical Monoids and Semirings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "categories" = callPackage
@@ -44956,7 +44188,6 @@ self: {
        homepage = "http://comonad.com/reader/";
        description = "A meta-package documenting various packages inspired by category theory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "category-traced" = callPackage
@@ -45099,7 +44330,6 @@ self: {
        ];
        description = "Bindings for the CCI networking library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {cci = null;};
 
   "ccnx" = callPackage
@@ -45130,7 +44360,6 @@ self: {
        homepage = "http://bitbucket.org/badi/hs-cctools-workqueue";
        description = "High-level interface to CCTools' WorkQueue library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {dttools = null;};
 
   "cedict" = callPackage
@@ -45149,7 +44378,6 @@ self: {
        jailbreak = true;
        description = "Convenient Chinese phrase & character lookup";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cef" = callPackage
@@ -45189,7 +44417,6 @@ self: {
        homepage = "https://github.com/anchor/ceilometer-common";
        description = "Common Haskell types and encoding for OpenStack Ceilometer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cellrenderer-cairo" = callPackage
@@ -45343,7 +44570,6 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal enumerator ];
        description = "Deserialize things with cereal and enumerator";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cereal-ieee754" = callPackage
@@ -45357,7 +44583,6 @@ self: {
        homepage = "http://github.com/jystic/cereal-ieee754";
        description = "Floating point support for the 'cereal' serialization library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cereal-plus" = callPackage
@@ -45383,7 +44608,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/cereal-plus";
        description = "An extended serialization library on top of \"cereal\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cereal-text" = callPackage
@@ -45407,7 +44631,7 @@ self: {
        libraryHaskellDepends = [ base bytestring cereal vector ];
        testHaskellDepends = [ base cereal QuickCheck vector ];
        homepage = "https://github.com/acfoltzer/cereal-vector";
-       description = "Serialize instances for Data.Vector types";
+       description = "Serialize instances for Data.Vector types.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -45432,7 +44656,6 @@ self: {
        homepage = "http://github.com/vincenthz/hs-certificate";
        description = "Certificates and Key Reader/Writer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cf" = callPackage
@@ -45451,7 +44674,6 @@ self: {
        homepage = "http://github.com/mvr/cf";
        description = "Exact real arithmetic using continued fractions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cfipu" = callPackage
@@ -45470,7 +44692,6 @@ self: {
        homepage = "https://github.com/bairyn/cfipu";
        description = "cfipu processor for toy brainfuck-like language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cflp" = callPackage
@@ -45490,7 +44711,6 @@ self: {
        homepage = "http://www-ps.informatik.uni-kiel.de/~sebf/projects/cflp.html";
        description = "Constraint Functional-Logic Programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cfopu" = callPackage
@@ -45508,7 +44728,6 @@ self: {
        ];
        description = "cfopu processor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cg" = callPackage
@@ -45530,7 +44749,6 @@ self: {
        jailbreak = true;
        description = "Parser for categorial grammars";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "cgen" = callPackage
@@ -45551,7 +44769,6 @@ self: {
        homepage = "http://anttisalonen.github.com/cgen";
        description = "generates Haskell bindings and C wrappers for C++ libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cgi_3001_2_2_2" = callPackage
@@ -45614,7 +44831,6 @@ self: {
        homepage = "http://github.com/chrisdone/haskell-cgi-utils";
        description = "Simple modular utilities for CGI/FastCGI (sessions, etc.)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cgrep" = callPackage
@@ -45626,8 +44842,8 @@ self: {
      }:
      mkDerivation {
        pname = "cgrep";
-       version = "6.6.2";
-       sha256 = "3c4aa9458da80a7df400479f969a432b331d9e47e57cd1358749a465e728f437";
+       version = "6.6.3";
+       sha256 = "cb603a7127c922a63a0c91f64f4d35782860a96cb1da66d5d9ae5fa8f91a634f";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -45685,7 +44901,6 @@ self: {
        homepage = "http://www.ittc.ku.edu/csdl/fpg/ChalkBoard";
        description = "Combinators for building and processing 2D images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chalkboard-viewer" = callPackage
@@ -45699,7 +44914,6 @@ self: {
        homepage = "http://ittc.ku.edu/~andygill/chalkboard.php";
        description = "OpenGL based viewer for chalkboard rendered images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chalmers-lava2000" = callPackage
@@ -45722,7 +44936,7 @@ self: {
        sha256 = "2c2f2f9e90d5ee0e283eeae7e3ff727763165476ea1d0983d16f18e158cffbd7";
        libraryHaskellDepends = [ base stm ];
        homepage = "http://brandon.si/code/module-chan-split-released/";
-       description = "Concurrent Chans as read/write pairs. Also provides generic Chan pair class";
+       description = "Concurrent Chans as read/write pairs. Also provides generic Chan pair class.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -45763,7 +44977,6 @@ self: {
        homepage = "https://github.com/soostone/charade";
        description = "Rapid prototyping websites with Snap and Heist";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "charset_0_3_7" = callPackage
@@ -45810,7 +45023,6 @@ self: {
        homepage = "http://www.github.com/batterseapower/charsetdetect";
        description = "Character set detection using Mozilla's Universal Character Set Detector";
        license = "LGPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "charsetdetect-ae" = callPackage
@@ -45823,7 +45035,6 @@ self: {
        homepage = "http://github.com/aelve/charsetdetect-ae";
        description = "Character set detection using Mozilla's Universal Character Set Detector";
        license = "LGPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "chart-histogram" = callPackage
@@ -45894,7 +45105,6 @@ self: {
        homepage = "http://github.com/creswick/chatter";
        description = "A library of simple NLP algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chatty" = callPackage
@@ -46020,7 +45230,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Import_modules_properly";
        description = "Check whether module and package imports conform to the PVP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "checked" = callPackage
@@ -46032,7 +45241,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Bounds-checking integer types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "checkers_0_4_1" = callPackage
@@ -46132,7 +45340,6 @@ self: {
        homepage = "https://john-millikin.com/software/chell/";
        description = "HUnit support for the Chell testing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chell-quickcheck_0_2_4" = callPackage
@@ -46191,7 +45398,6 @@ self: {
        jailbreak = true;
        description = "Query interface for Chevalier";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chp" = callPackage
@@ -46208,7 +45414,6 @@ self: {
        homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
        description = "An implementation of concurrency ideas from Communicating Sequential Processes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chp-mtl" = callPackage
@@ -46222,7 +45427,6 @@ self: {
        homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
        description = "MTL class instances for the CHP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chp-plus" = callPackage
@@ -46240,7 +45444,6 @@ self: {
        homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
        description = "A set of high-level concurrency utilities built on Communicating Haskell Processes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chp-spec" = callPackage
@@ -46258,7 +45461,6 @@ self: {
        homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
        description = "A mirror implementation of chp that generates a specification of the program";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chp-transformers" = callPackage
@@ -46272,7 +45474,6 @@ self: {
        homepage = "http://www.cs.kent.ac.uk/projects/ofa/chp/";
        description = "Transformers instances for the CHP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chronograph" = callPackage
@@ -46323,7 +45524,6 @@ self: {
        homepage = "http://github.com/marcotmarcot/chuchu";
        description = "Behaviour Driven Development like Cucumber for Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chunked-data_0_1_0_1" = callPackage
@@ -46374,7 +45574,6 @@ self: {
        homepage = "http://www.wellquite.org/chunks/";
        description = "Simple template library with static safety";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "chunky" = callPackage
@@ -46416,7 +45615,6 @@ self: {
        homepage = "http://tomahawkins.org";
        description = "An interface to CIL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cinvoke" = callPackage
@@ -46430,7 +45628,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Library/cinvoke";
        description = "A binding to cinvoke";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {cinvoke = null;};
 
   "cio" = callPackage
@@ -46443,7 +45640,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/cio";
        description = "A monad for concurrent IO on a thread pool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cipher-aes_0_2_9" = callPackage
@@ -46656,7 +45852,6 @@ self: {
        homepage = "http://github.com/BartMassey/ciphersaber";
        description = "Implementation of CipherSaber2 RC4 cryptography";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "circ" = callPackage
@@ -46739,7 +45934,6 @@ self: {
        homepage = "https://github.com/nushio3/citation-resolve";
        description = "convert document IDs such as DOI, ISBN, arXiv ID to bibliographic reference";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "citeproc-hs" = callPackage
@@ -46760,7 +45954,6 @@ self: {
        homepage = "http://istitutocolli.org/repos/citeproc-hs/";
        description = "A Citation Style Language implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "citeproc-hs-pandoc-filter" = callPackage
@@ -46781,7 +45974,6 @@ self: {
        homepage = "http://istitutocolli.org/repos/citeproc-hs-pandoc-filter/";
        description = "A Pandoc filter for processing bibliographic references with citeproc-hs";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cityhash" = callPackage
@@ -46800,7 +45992,6 @@ self: {
        homepage = "http://github.com/thoughtpolice/hs-cityhash";
        description = "Bindings to CityHash";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "cjk" = callPackage
@@ -46818,7 +46009,6 @@ self: {
        homepage = "http://github.com/batterseapower/cjk";
        description = "Data about Chinese, Japanese and Korean characters and languages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clac" = callPackage
@@ -46873,7 +46063,6 @@ self: {
        homepage = "http://clafer.org";
        description = "Compiles Clafer models to other formats: Alloy, JavaScript, JSON, HTML, Dot";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "claferIG" = callPackage
@@ -46907,7 +46096,6 @@ self: {
        homepage = "http://clafer.org";
        description = "claferIG is an interactive tool that generates instances of Clafer models";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "claferwiki" = callPackage
@@ -46928,7 +46116,6 @@ self: {
        homepage = "http://github.com/gsdlab/claferwiki";
        description = "A wiki-based IDE for literate modeling with Clafer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clang-pure" = callPackage
@@ -46999,7 +46186,6 @@ self: {
        homepage = "http://clash.ewi.utwente.nl/";
        description = "CAES Language for Synchronous Hardware (CLaSH)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clash-ghc_0_5_11" = callPackage
@@ -47528,7 +46714,6 @@ self: {
        jailbreak = true;
        description = "QuickCheck instances for various types in the CλaSH Prelude";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clash-systemverilog_0_5_7" = callPackage
@@ -48819,7 +48004,6 @@ self: {
        homepage = "http://clckwrks.com/";
        description = "bug tracking plugin for clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clckwrks-plugin-ircbot" = callPackage
@@ -48963,7 +48147,6 @@ self: {
        homepage = "http://divshot.github.com/geo-bootstrap/";
        description = "geo bootstrap based template for clckwrks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cld2" = callPackage
@@ -48978,7 +48161,6 @@ self: {
        homepage = "https://github.com/dfoxfranke/haskell-cld2";
        description = "Haskell bindings to Google's Compact Language Detector 2";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "clean-home" = callPackage
@@ -49043,7 +48225,6 @@ self: {
        homepage = "http://sandbox.pocoo.org/clevercss-hs/";
        description = "A CSS preprocessor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cli" = callPackage
@@ -49078,9 +48259,8 @@ self: {
          transformers
        ];
        jailbreak = true;
-       description = "Toy game (tetris on billiard board). Hipmunk in action";
+       description = "Toy game (tetris on billiard board). Hipmunk in action.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clientsession" = callPackage
@@ -49138,7 +48318,6 @@ self: {
        homepage = "http://github.com/spacekitteh/haskell-clifford";
        description = "A Clifford algebra library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clippard" = callPackage
@@ -49164,7 +48343,6 @@ self: {
        homepage = "https://github.com/chetant/clipper";
        description = "Haskell API to clipper (2d polygon union/intersection/xor/clipping API)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clippings" = callPackage
@@ -49189,7 +48367,6 @@ self: {
        ];
        description = "A parser/generator for Kindle-format clipping files (`My Clippings.txt`),";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clist" = callPackage
@@ -49288,7 +48465,6 @@ self: {
        homepage = "http://patch-tag.com/r/shahn/clocked/home";
        description = "timer functionality to clock IO commands";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {QtCore = null;};
 
   "clogparse" = callPackage
@@ -49305,7 +48481,6 @@ self: {
        ];
        description = "Parse IRC logs such as the #haskell logs on tunes.org";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clone-all" = callPackage
@@ -49327,7 +48502,6 @@ self: {
        homepage = "https://github.com/silky/clone-all";
        description = "Clone all github repositories from a given user";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "closure" = callPackage
@@ -49366,7 +48540,6 @@ self: {
        homepage = "http://github.com/haskell-distributed/cloud-haskell";
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cloudfront-signer" = callPackage
@@ -49384,7 +48557,6 @@ self: {
        homepage = "http://github.com/cdornan/cloudfront-signer";
        description = "CloudFront URL signer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cloudyfs" = callPackage
@@ -49405,7 +48577,6 @@ self: {
        homepage = "https://github.com/bhickey/cloudyfs";
        description = "A cloud in the file system";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cltw" = callPackage
@@ -49438,7 +48609,6 @@ self: {
        homepage = "http://zwizwa.be/-/meta";
        description = "C to Lua data wrapper generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clumpiness" = callPackage
@@ -49462,7 +48632,6 @@ self: {
        homepage = "https://github.com/Kinokkory/cluss";
        description = "simple alternative to type classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clustering" = callPackage
@@ -49503,7 +48672,6 @@ self: {
        homepage = "http://malde.org/~ketil/";
        description = "Tools for manipulating sequence clusters";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "clutterhs" = callPackage
@@ -49521,7 +48689,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Bindings to the Clutter animation library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) clutter; inherit (pkgs.gnome) pango;};
 
   "cmaes" = callPackage
@@ -49592,7 +48759,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/cmath";
        description = "A binding to the standard C math library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cmathml3" = callPackage
@@ -49612,7 +48778,6 @@ self: {
        executableHaskellDepends = [ base Cabal filepath ];
        description = "Data model, parser, serialiser and transformations for Content MathML 3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cmd-item" = callPackage
@@ -49708,7 +48873,6 @@ self: {
        homepage = "http://community.haskell.org/~ndm/cmdargs/";
        description = "Helper to enter cmdargs command lines using a web browser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cmdlib" = callPackage
@@ -49745,7 +48909,6 @@ self: {
        homepage = "http://github.com/eli-frey/cmdtheline";
        description = "Declarative command-line option parsing and documentation library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cml" = callPackage
@@ -49769,7 +48932,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "A library for C-like programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cmu" = callPackage
@@ -49805,7 +48967,6 @@ self: {
        homepage = "http://software.intel.com/en-us/articles/intel-concurrent-collections-for-cc/";
        description = "Compiler/Translator for CnC Specification Files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cndict" = callPackage
@@ -49877,7 +49038,6 @@ self: {
        ];
        description = "Cross-platform structure serialisation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "codec-mbox" = callPackage
@@ -49910,9 +49070,8 @@ self: {
        ];
        testHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/guillaume-nargeot/codecov-haskell";
-       description = "Codecov.io support for Haskell";
+       description = "Codecov.io support for Haskell.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "codemonitor" = callPackage
@@ -49932,7 +49091,6 @@ self: {
        homepage = "http://github.com/rickardlindberg/codemonitor";
        description = "Tool that automatically runs arbitrary commands when files change on disk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "codepad" = callPackage
@@ -49946,9 +49104,8 @@ self: {
        libraryHaskellDepends = [ base curl mtl network tagsoup ];
        jailbreak = true;
        homepage = "http://github.com/chrisdone/codepad";
-       description = "Submit and retrieve paste output from CodePad.org";
+       description = "Submit and retrieve paste output from CodePad.org.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "codex_0_3_0_8" = callPackage
@@ -50110,9 +49267,8 @@ self: {
          transformers
        ];
        homepage = "https://github.com/Cognimeta/cognimeta-utils";
-       description = "Utilities for Cognimeta products (such as perdure). API may change often";
+       description = "Utilities for Cognimeta products (such as perdure). API may change often.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "coinbase-exchange" = callPackage
@@ -50152,7 +49308,6 @@ self: {
        jailbreak = true;
        description = "Connector library for the coinbase exchange";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "colada" = callPackage
@@ -50178,7 +49333,6 @@ self: {
        homepage = "https://bitbucket.org/gchrupala/colada";
        description = "Colada implements incremental word class class induction using online LDA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "colchis" = callPackage
@@ -50195,7 +49349,7 @@ self: {
          pipes-attoparsec pipes-network text transformers
        ];
        jailbreak = true;
-       description = "Rudimentary JSON-RPC 2.0 client over raw TCP";
+       description = "Rudimentary JSON-RPC 2.0 client over raw TCP.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -50215,7 +49369,6 @@ self: {
        jailbreak = true;
        description = "Generate animated 3d objects in COLLADA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "collada-types" = callPackage
@@ -50232,7 +49385,6 @@ self: {
        jailbreak = true;
        description = "Data exchange between graphic applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "collapse-util" = callPackage
@@ -50275,7 +49427,6 @@ self: {
        jailbreak = true;
        description = "Useful standard collections types and related functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "collections-api" = callPackage
@@ -50288,7 +49439,6 @@ self: {
        homepage = "http://code.haskell.org/collections/";
        description = "API for collection data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "collections-base-instances" = callPackage
@@ -50305,7 +49455,6 @@ self: {
        homepage = "http://code.haskell.org/collections/";
        description = "Useful standard collections types and related functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "colock" = callPackage
@@ -50376,7 +49525,6 @@ self: {
        homepage = "https://github.com/wellecks/coltrane";
        description = "A jazzy, minimal web framework for Haskell, inspired by Sinatra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "com" = callPackage
@@ -50388,7 +49536,6 @@ self: {
        doHaddock = false;
        description = "Haskell COM support library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "combinat" = callPackage
@@ -50409,7 +49556,6 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Generate and manipulate various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "combinat-diagrams" = callPackage
@@ -50427,7 +49573,6 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Graphical representations for various combinatorial objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "combinator-interactive" = callPackage
@@ -50451,7 +49596,6 @@ self: {
        homepage = "https://github.com/fumieval/combinator-interactive";
        description = "SKI Combinator interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "combinatorial-problems" = callPackage
@@ -50468,7 +49612,6 @@ self: {
        homepage = "http://www.comp.leeds.ac.uk/sc06r2s/Projects/HaskellCombinatorialProblems";
        description = "A number of data structures to represent and allow the manipulation of standard combinatorial problems, used as test problems in computer science";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "combinatorics" = callPackage
@@ -50567,7 +49710,6 @@ self: {
        jailbreak = true;
        description = "Library for working with commoditized amounts and price histories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "commsec" = callPackage
@@ -50583,7 +49725,6 @@ self: {
        ];
        description = "Provide communications security using symmetric ephemeral keys";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "commsec-keyexchange" = callPackage
@@ -50603,7 +49744,6 @@ self: {
        homepage = "https://github.com/TomMD/commsec-keyExchange";
        description = "Key agreement for commsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "commutative" = callPackage
@@ -50782,7 +49922,6 @@ self: {
        homepage = "http://github.com/ekmett/comonad-extras/";
        description = "Exotic comonad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "comonad-random" = callPackage
@@ -50795,7 +49934,6 @@ self: {
        jailbreak = true;
        description = "Comonadic interface for random values";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "comonad-transformers" = callPackage
@@ -50837,7 +49975,6 @@ self: {
        ];
        description = "Compact Data.Map implementation using Data.Binary";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compact-socket" = callPackage
@@ -50868,7 +50005,6 @@ self: {
        homepage = "http://twan.home.fmf.nl/compact-string/";
        description = "Fast, packed and strict strings with Unicode support, based on bytestrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compact-string-fix" = callPackage
@@ -51087,7 +50223,6 @@ self: {
        libraryHaskellDepends = [ base MissingH ];
        description = "Haskell functionality for quickly assembling simple compilers";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "complex-generic" = callPackage
@@ -51129,7 +50264,6 @@ self: {
        jailbreak = true;
        description = "Empirical algorithmic complexity";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compose-ltr" = callPackage
@@ -51143,7 +50277,6 @@ self: {
        jailbreak = true;
        description = "More intuitive, left-to-right function composition";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compose-trans" = callPackage
@@ -51155,7 +50288,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Composable monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "composition_1_0_1_0" = callPackage
@@ -51268,7 +50400,6 @@ self: {
        homepage = "http://urchin.earth.li/~ian/cabal/compression/";
        description = "Common compression algorithms";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "compstrat" = callPackage
@@ -51285,7 +50416,6 @@ self: {
        jailbreak = true;
        description = "Strategy combinators for compositional data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "comptrans" = callPackage
@@ -51304,7 +50434,6 @@ self: {
        homepage = "https://github.com/jkoppel/comptrans";
        description = "Automatically converting ASTs into compositional data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "computational-algebra" = callPackage
@@ -51324,7 +50453,6 @@ self: {
        homepage = "https://github.com/konn/computational-algebra";
        description = "Well-kinded computational algebra library, currently supporting Groebner basis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "computations" = callPackage
@@ -51399,7 +50527,6 @@ self: {
        homepage = "http://zil.ipipan.waw.pl/Concraft";
        description = "Morphological disambiguation based on constrained CRFs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concraft-hr" = callPackage
@@ -51422,7 +50549,6 @@ self: {
        homepage = "https://github.com/vjeranc/concraft-hr";
        description = "Part-of-speech tagger for Croatian";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concraft-pl" = callPackage
@@ -51445,7 +50571,6 @@ self: {
        homepage = "http://zil.ipipan.waw.pl/Concraft";
        description = "Morphological tagger for Polish";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concrete-relaxng-parser" = callPackage
@@ -51484,7 +50609,6 @@ self: {
        jailbreak = true;
        description = "Binary and Hashable instances for TypeRep";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-barrier" = callPackage
@@ -51659,7 +50783,6 @@ self: {
        homepage = "https://github.com/joelteon/concurrent-state";
        description = "MTL-like library using TVars";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "concurrent-supply_0_1_7" = callPackage
@@ -51760,7 +50883,6 @@ self: {
        homepage = "https://github.com/klangner/Condor";
        description = "Information retrieval library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "condorcet" = callPackage
@@ -51773,7 +50895,6 @@ self: {
        homepage = "http://neugierig.org/software/darcs/condorcet";
        description = "Library for Condorcet voting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conductive-base" = callPackage
@@ -51816,7 +50937,6 @@ self: {
        homepage = "http://www.renickbell.net/doku.php?id=conductive-hsc3";
        description = "a library with examples of using Conductive with hsc3";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conductive-song" = callPackage
@@ -52068,7 +51188,6 @@ self: {
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "conduit-audio interface to the LAME MP3 library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {mp3lame = null;};
 
   "conduit-audio-samplerate" = callPackage
@@ -52087,7 +51206,6 @@ self: {
        homepage = "http://github.com/mtolly/conduit-audio";
        description = "conduit-audio interface to the libsamplerate resampling library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {samplerate = null;};
 
   "conduit-audio-sndfile" = callPackage
@@ -52297,7 +51415,7 @@ self: {
          test-framework test-framework-hunit transformers
        ];
        homepage = "https://github.com/sdroege/conduit-connection";
-       description = "Conduit source and sink for Network.Connection";
+       description = "Conduit source and sink for Network.Connection.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -52685,7 +51803,6 @@ self: {
        ];
        description = "A base layer for network protocols using Conduits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-parse" = callPackage
@@ -52724,7 +51841,6 @@ self: {
        homepage = "http://github.com/A1kmm/conduit-resumablesink";
        description = "Allows conduit to resume sinks to feed multiple sources into it";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conduit-tokenize-attoparsec" = callPackage
@@ -52777,7 +51893,6 @@ self: {
        ];
        description = "A small program for swapping out dot files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "config-value" = callPackage
@@ -52971,7 +52086,6 @@ self: {
        ];
        description = "A BitTorrent client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "conlogger" = callPackage
@@ -53086,7 +52200,6 @@ self: {
        testHaskellDepends = [ base lifted-async transformers ];
        description = "Eventually consistent STM transactions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "console-program" = callPackage
@@ -53117,7 +52230,6 @@ self: {
        homepage = "https://github.com/kfish/const-math-ghc-plugin";
        description = "Compiler plugin for constant math elimination";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constrained-categories" = callPackage
@@ -53251,7 +52363,6 @@ self: {
        homepage = "http://andersk.mit.edu/haskell/constructible/";
        description = "Exact computation with constructible real numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "constructive-algebra" = callPackage
@@ -53264,7 +52375,6 @@ self: {
        jailbreak = true;
        description = "A library of constructive algebra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "consul-haskell_0_1" = callPackage
@@ -53355,7 +52465,6 @@ self: {
        homepage = "https://github.com/scrive/consumers";
        description = "Concurrent PostgreSQL data consumers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "container" = callPackage
@@ -53501,7 +52610,6 @@ self: {
        homepage = "http://github.com/thinkpad20/context-stack";
        description = "An abstraction of a stack and stack-based monadic context";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "continue" = callPackage
@@ -53519,7 +52627,6 @@ self: {
        jailbreak = true;
        description = "Monads with suspension and arbitrary-spot reentry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "continued-fractions" = callPackage
@@ -53556,7 +52663,6 @@ self: {
        ];
        executableSystemDepends = [ hyperleveldb ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {hyperleveldb = null;};
 
   "continuum-client" = callPackage
@@ -53786,7 +52892,6 @@ self: {
        libraryHaskellDepends = [ base containers stm time ];
        description = "Event scheduling system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "control-monad-attempt" = callPackage
@@ -53800,7 +52905,6 @@ self: {
        homepage = "http://github.com/snoyberg/control-monad-attempt";
        description = "Monad transformer for attempt. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "control-monad-exception" = callPackage
@@ -53876,7 +52980,6 @@ self: {
        homepage = "http://github.com/pepeiborra/control-monad-failure";
        description = "A class for monads which can fail with an error. (deprecated)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "control-monad-failure-mtl" = callPackage
@@ -53890,7 +52993,6 @@ self: {
        homepage = "http://github.com/pepeiborra/control-monad-failure";
        description = "A class for monads which can fail with an error for mtl 1 (deprecated)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "control-monad-free_0_5_3" = callPackage
@@ -53987,7 +53089,6 @@ self: {
        libraryHaskellDepends = [ base contstuff monads-tf ];
        description = "ContStuff instances for monads-tf transformers (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "contstuff-transformers" = callPackage
@@ -54000,7 +53101,6 @@ self: {
        jailbreak = true;
        description = "Deprecated interface between contstuff 0.7.0 and the transformers package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "converge" = callPackage
@@ -54083,7 +53183,7 @@ self: {
          template-haskell text time
        ];
        homepage = "https://github.com/wdanilo/convert";
-       description = "Safe and unsafe data conversion utilities with strong type-level operation. checking";
+       description = "Safe and unsafe data conversion utilities with strong type-level operation. checking.";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -54142,7 +53242,6 @@ self: {
        homepage = "https://github.com/phonohawk/convertible-ascii";
        description = "convertible instances for ascii";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "convertible-text" = callPackage
@@ -54163,7 +53262,6 @@ self: {
        homepage = "http://github.com/snoyberg/convertible/tree/text";
        description = "Typeclasses and instances for converting between types (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cookbook" = callPackage
@@ -54290,7 +53388,6 @@ self: {
        homepage = "http://leepike.github.com/Copilot/";
        description = "A stream DSL for writing embedded C programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "copilot-c99" = callPackage
@@ -54329,7 +53426,6 @@ self: {
        ];
        description = "Copilot interface to a C model-checker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "copilot-core" = callPackage
@@ -54394,7 +53490,6 @@ self: {
        ];
        description = "A compiler for CoPilot targeting SBV";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "copilot-theorem" = callPackage
@@ -54444,7 +53539,6 @@ self: {
        libraryHaskellDepends = [ base bytestring parsec pretty ];
        description = "External core parser and pretty printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "core-haskell" = callPackage
@@ -54461,7 +53555,6 @@ self: {
        homepage = "https://github.com/happlebao/Core-Haskell";
        description = "A subset of Haskell using in UCC for teaching purpose";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "corebot-bliki" = callPackage
@@ -54486,9 +53579,8 @@ self: {
          yesod
        ];
        homepage = "http://github.com/coreyoconnor/corebot-bliki";
-       description = "A bliki written using yesod. Uses pandoc to process files stored in git";
+       description = "A bliki written using yesod. Uses pandoc to process files stored in git.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "coroutine-enumerator" = callPackage
@@ -54515,7 +53607,6 @@ self: {
        homepage = "http://trac.haskell.org/SCC/wiki/coroutine-iteratee";
        description = "Bridge between the monad-coroutine and iteratee packages";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "coroutine-object" = callPackage
@@ -54546,7 +53637,6 @@ self: {
        jailbreak = true;
        description = "A CouchDB view server for Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "couch-simple" = callPackage
@@ -54574,7 +53664,6 @@ self: {
        homepage = "https://github.com/mdorman/couch-simple";
        description = "A modern, lightweight, complete client for CouchDB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) couchdb;};
 
   "couchdb-conduit" = callPackage
@@ -54606,7 +53695,6 @@ self: {
        homepage = "https://github.com/akaspin/couchdb-conduit";
        description = "Couch DB client library using http-conduit and aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "couchdb-enumerator" = callPackage
@@ -54636,7 +53724,6 @@ self: {
        homepage = "http://bitbucket.org/wuzzeb/couchdb-enumerator";
        description = "Couch DB client library using http-enumerator and aeson";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "count" = callPackage
@@ -54803,7 +53890,6 @@ self: {
        homepage = "http://hub.darcs.net/thoferon/court";
        description = "Simple and flexible CI system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "coverage" = callPackage
@@ -54818,7 +53904,6 @@ self: {
        homepage = "https://github.com/nicodelpiano/coverage";
        description = "Exhaustivity Checking Library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cpio-conduit" = callPackage
@@ -54839,7 +53924,6 @@ self: {
        homepage = "http://github.com/da-x/cpio-conduit";
        description = "Conduit-based CPIO";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cplusplus-th" = callPackage
@@ -54858,7 +53942,6 @@ self: {
        homepage = "https://github.com/nicta/cplusplus-th";
        description = "C++ Foreign Import Generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cpphs_1_18_6" = callPackage
@@ -55098,7 +54181,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/cpuperf";
        description = "Modify the cpu frequency on OpenBSD systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cpython" = callPackage
@@ -55113,7 +54195,6 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-python/";
        description = "Bindings for libpython";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {python34 = null;};
 
   "cql_3_0_5" = callPackage
@@ -55319,7 +54400,6 @@ self: {
        jailbreak = true;
        description = "PostgreSQL backend for the cqrs package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cqrs-sqlite3" = callPackage
@@ -55341,7 +54421,6 @@ self: {
        jailbreak = true;
        description = "SQLite3 backend for the cqrs package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cqrs-test" = callPackage
@@ -55359,7 +54438,6 @@ self: {
        jailbreak = true;
        description = "Command-Query Responsibility Segregation Test Support";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cqrs-testkit" = callPackage
@@ -55387,7 +54465,7 @@ self: {
        sha256 = "68ec6f54afe655e764691f30c844778913957ad9f617e3f5587032307629276e";
        libraryHaskellDepends = [ base ];
        doHaddock = false;
-       description = "Command-Query Responsibility Segregation. Modules for the basic types";
+       description = "Command-Query Responsibility Segregation. Modules for the basic types.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -55407,7 +54485,6 @@ self: {
        homepage = "https://github.com/scvalex/cr";
        description = "Code review tool";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crack" = callPackage
@@ -55420,7 +54497,6 @@ self: {
        librarySystemDepends = [ crack ];
        description = "A haskell binding to cracklib";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {crack = null;};
 
   "crackNum_1_3" = callPackage
@@ -55465,7 +54541,6 @@ self: {
        homepage = "http://mahrz.github.com/craftwerk.html";
        description = "2D graphics library with integrated TikZ output";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "craftwerk-cairo" = callPackage
@@ -55479,7 +54554,6 @@ self: {
        homepage = "http://mahrz.github.com/craftwerk.html";
        description = "Cairo backend for Craftwerk";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "craftwerk-gtk" = callPackage
@@ -55499,7 +54573,6 @@ self: {
        homepage = "http://mahrz.github.com/craftwerk.html";
        description = "Gtk UI for Craftwerk";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crc16" = callPackage
@@ -55511,7 +54584,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Calculate the crc16-ccitt";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crc16-table" = callPackage
@@ -55571,7 +54643,6 @@ self: {
        homepage = "https://github.com/kawu/crf-chain1";
        description = "First-order, linear-chain conditional random fields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crf-chain1-constrained" = callPackage
@@ -55590,7 +54661,6 @@ self: {
        homepage = "https://github.com/kawu/crf-chain1-constrained";
        description = "First-order, constrained, linear-chain conditional random fields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crf-chain2-generic" = callPackage
@@ -55610,7 +54680,6 @@ self: {
        homepage = "https://github.com/kawu/crf-chain2-generic";
        description = "Second-order, generic, constrained, linear conditional random fields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crf-chain2-tiers" = callPackage
@@ -55629,7 +54698,6 @@ self: {
        homepage = "https://github.com/kawu/crf-chain2-tiers";
        description = "Second-order, tiered, constrained, linear conditional random fields";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "critbit" = callPackage
@@ -55696,6 +54764,8 @@ self: {
        pname = "criterion";
        version = "1.1.0.0";
        sha256 = "5cedd41bb6e5a85e65b51fdb00cb32038b826b8d18af072a8319cab43a452d38";
+       revision = "1";
+       editedCabalFile = "4de7233df470abf00ce1db761e7f46db68dd7855cc491d49584de149e922f5db";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -55714,6 +54784,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "criterion_1_1_1_0" = callPackage
+    ({ mkDerivation, aeson, ansi-wl-pprint, base, binary, bytestring
+     , cassava, containers, deepseq, directory, filepath, Glob, hastache
+     , HUnit, mtl, mwc-random, optparse-applicative, parsec, QuickCheck
+     , statistics, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, text, time, transformers
+     , transformers-compat, vector, vector-algorithms
+     }:
+     mkDerivation {
+       pname = "criterion";
+       version = "1.1.1.0";
+       sha256 = "e71855a7a9cd946044b2137f31603e0578f6e517a2ed667a2b479990cc0949dd";
+       revision = "1";
+       editedCabalFile = "a56744ffa937e244ac18d8257f4746a1e2b31fbce69e9602033f7f4f2ebcd7c6";
+       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 optparse-applicative ];
+       testHaskellDepends = [
+         base bytestring HUnit QuickCheck statistics test-framework
+         test-framework-hunit test-framework-quickcheck2 vector
+       ];
+       homepage = "http://www.serpentine.com/criterion";
+       description = "Robust, reliable performance measurement and analysis";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "criterion-plus" = callPackage
     ({ mkDerivation, base, criterion, deepseq, HTF, HUnit, loch-th
      , monad-control, mtl, optparse-applicative, placeholders
@@ -55741,7 +54844,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/criterion-plus";
        description = "Enhancement of the \"criterion\" benchmarking library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "criterion-to-html" = callPackage
@@ -55791,7 +54893,6 @@ self: {
        homepage = "https://github.com/TomHammersley/HaskellRenderer/";
        description = "An offline renderer supporting ray tracing and photon mapping";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cron_0_3_0" = callPackage
@@ -55859,7 +54960,6 @@ self: {
        homepage = "http://github.com/michaelxavier/cron";
        description = "Cron datatypes and Attoparsec parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cruncher-types" = callPackage
@@ -55873,7 +54973,6 @@ self: {
        homepage = "http://github.com/eval-so/cruncher-types";
        description = "Request and Response types for Eval.so's API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crunghc" = callPackage
@@ -55893,7 +54992,6 @@ self: {
        jailbreak = true;
        description = "A runghc replacement with transparent caching";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crypto-api" = callPackage
@@ -55946,7 +55044,6 @@ self: {
        homepage = "http://github.com/vincenthz/hs-crypto-cipher";
        description = "Generic cryptography cipher benchmarks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crypto-cipher-tests" = callPackage
@@ -56665,7 +55762,6 @@ self: {
        jailbreak = true;
        description = "Bindings for Cryptsy cryptocurrency exchange API";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "crystalfontz" = callPackage
@@ -56677,7 +55773,6 @@ self: {
        libraryHaskellDepends = [ base crc16-table MaybeT serialport ];
        description = "Control Crystalfontz LCD displays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cse-ghc-plugin" = callPackage
@@ -56690,7 +55785,6 @@ self: {
        homepage = "http://thoughtpolice.github.com/cse-ghc-plugin";
        description = "Compiler plugin for common subexpression elimination";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "csound-catalog" = callPackage
@@ -56707,7 +55801,6 @@ self: {
        homepage = "https://github.com/anton-k/csound-catalog";
        description = "a gallery of Csound instruments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "csound-expression" = callPackage
@@ -56805,7 +55898,6 @@ self: {
        testHaskellDepends = [ base nondeterminism tasty tasty-hunit ];
        description = "Discrete constraint satisfaction problem (CSP) solver";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cspmchecker" = callPackage
@@ -56823,7 +55915,6 @@ self: {
        homepage = "https://github.com/tomgr/libcspm";
        description = "A command line type checker for CSPM files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "css" = callPackage
@@ -56835,7 +55926,6 @@ self: {
        libraryHaskellDepends = [ base mtl text ];
        description = "Minimal monadic CSS DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "css-syntax" = callPackage
@@ -57011,7 +56101,6 @@ self: {
        homepage = "http://darcs.imperialviolet.org/ctemplate";
        description = "Binding to the Google ctemplate library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {ctemplate = null;};
 
   "ctkl" = callPackage
@@ -57024,7 +56113,6 @@ self: {
        jailbreak = true;
        description = "packaging of Manuel Chakravarty's CTK Light for Hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ctpl" = callPackage
@@ -57037,7 +56125,6 @@ self: {
        jailbreak = true;
        description = "A programming language for text modification";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ctrie" = callPackage
@@ -57095,7 +56182,6 @@ self: {
        homepage = "https://github.com/simhu/cubical";
        description = "Implementation of Univalence in Cubical Sets";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cubicbezier" = callPackage
@@ -57114,7 +56200,6 @@ self: {
        testHaskellDepends = [ base parsec tasty tasty-hunit ];
        description = "Efficient manipulating of 2D cubic bezier curves";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cubicspline_0_1_1" = callPackage
@@ -57174,7 +56259,6 @@ self: {
        executableHaskellDepends = [ base GLUT Yampa ];
        description = "3D Yampa/GLUT Puzzle Game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "cuda" = callPackage
@@ -57210,7 +56294,6 @@ self: {
        homepage = "https://github.com/adamwalker/haskell_cudd";
        description = "Bindings to the CUDD binary decision diagrams library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {cudd = null; dddmp = null; epd = null; inherit (pkgs) mtr; 
          inherit (pkgs) st; util = null;};
 
@@ -57308,7 +56391,6 @@ self: {
        homepage = "http://www.curry-language.org";
        description = "Functions for manipulating Curry programs";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "curry-frontend" = callPackage
@@ -57328,7 +56410,6 @@ self: {
        homepage = "http://www.curry-language.org";
        description = "Compile the functional logic language Curry to several intermediate formats";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "cursedcsv" = callPackage
@@ -57414,7 +56495,6 @@ self: {
        ];
        description = "Functional Combinators for Computer Vision";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "cyclotomic" = callPackage
@@ -57426,7 +56506,6 @@ self: {
        libraryHaskellDepends = [ arithmoi base containers ];
        description = "A subfield of the complex numbers for exact calculation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "cypher" = callPackage
@@ -57447,7 +56526,6 @@ self: {
        jailbreak = true;
        description = "Haskell bindings for the neo4j \"cypher\" query language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "d-bus" = callPackage
@@ -57528,7 +56606,6 @@ self: {
        homepage = "https://github.com/scvalex/daemons";
        description = "Daemons in Haskell made fun and easy";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "dag" = callPackage
@@ -57593,7 +56670,6 @@ self: {
        ];
        description = "Dao is meta programming language with its own built-in interpreted language, designed with artificial intelligence applications in mind";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dapi" = callPackage
@@ -57614,7 +56690,6 @@ self: {
        homepage = "http://massysett.github.com/dapi";
        description = "Prints a series of dates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "darcs_2_10_2" = callPackage
@@ -57731,7 +56806,6 @@ self: {
        homepage = "http://wiki.darcs.net/Development/Benchmarks";
        description = "Comparative benchmark suite for darcs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "darcs-beta" = callPackage
@@ -57765,7 +56839,6 @@ self: {
        homepage = "http://darcs.net/";
        description = "a distributed, interactive, smart revision control system";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) curl;};
 
   "darcs-buildpackage" = callPackage
@@ -57784,7 +56857,6 @@ self: {
        ];
        description = "Tools to help manage Debian packages with Darcs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "darcs-cabalized" = callPackage
@@ -57806,7 +56878,6 @@ self: {
        homepage = "http://darcs.net/";
        description = "David's Advanced Version Control System";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) curl; inherit (pkgs) ncurses; 
          inherit (pkgs) zlib;};
 
@@ -57828,7 +56899,6 @@ self: {
        jailbreak = true;
        description = "Import/export git fast-import streams to/from darcs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "darcs-graph" = callPackage
@@ -57848,7 +56918,6 @@ self: {
        jailbreak = true;
        description = "Generate graphs of darcs repository activity";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "darcs-monitor" = callPackage
@@ -57867,7 +56936,6 @@ self: {
        homepage = "http://wiki.darcs.net/RelatedSoftware/DarcsMonitor";
        description = "Darcs repository monitor (sends email)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "darcs-scripts" = callPackage
@@ -57898,7 +56966,6 @@ self: {
        jailbreak = true;
        description = "Outputs dependencies of darcs patches in dot format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "darcsden" = callPackage
@@ -57926,9 +56993,8 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://hackage.haskell.org/package/darcsden";
-       description = "Darcs repository UI and hosting/collaboration app (hub.darcs.net branch)";
+       description = "Darcs repository UI and hosting/collaboration app (hub.darcs.net branch).";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "darcswatch" = callPackage
@@ -57951,7 +57017,6 @@ self: {
        homepage = "http://darcswatch.nomeata.de/";
        description = "Track application of Darcs patches";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "darkplaces-demo" = callPackage
@@ -57978,7 +57043,6 @@ self: {
        homepage = "https://github.com/bacher09/darkplaces-demo";
        description = "Utility and parser for DarkPlaces demo files";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "darkplaces-rcon" = callPackage
@@ -58320,7 +57384,6 @@ self: {
        ];
        description = "a cyclic doubly linked list";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-default" = callPackage
@@ -58543,7 +57606,6 @@ self: {
        homepage = "http://monoid.at/code";
        description = "Space-efficient and privacy-preserving data dispersal algorithms";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-dword" = callPackage
@@ -58581,7 +57643,6 @@ self: {
        homepage = "https://github.com/jcristovao/data-easy";
        description = "Consistent set of utility functions for Maybe, Either, List and Monoids";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-embed" = callPackage
@@ -58822,7 +57883,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Write-once variables with concurrency support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-json-token" = callPackage
@@ -58866,7 +57926,7 @@ self: {
        sha256 = "3c11be8dc0da7f4cb080023e2d0ae9f58ad202e193c6f1aea015b7b7873a936d";
        libraryHaskellDepends = [ base convert data-construction lens ];
        homepage = "https://github.com/wdanilo/layer";
-       description = "Data layering utilities. Layer is a data-type which wrapps other one, but keeping additional information. If you want to access content of simple newtype object, use Lens.Wrapper instead";
+       description = "Data layering utilities. Layer is a data-type which wrapps other one, but keeping additional information. If you want to access content of simple newtype object, use Lens.Wrapper instead.";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -58878,7 +57938,7 @@ self: {
        sha256 = "a5070520bcb6c3d8e7dcc969d94ac35c8bc5894abf45b65155b58571f82619f1";
        libraryHaskellDepends = [ base bytestring vector ];
        homepage = "http://github.com/jystic/data-layout";
-       description = "Read/write arbitrary binary layouts to a \"Data.Vector.Storable\"";
+       description = "Read/write arbitrary binary layouts to a \"Data.Vector.Storable\".";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -58924,7 +57984,6 @@ self: {
        homepage = "https://github.com/dag/data-lens-ixset";
        description = "A Lens for IxSet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-lens-light" = callPackage
@@ -58998,7 +58057,6 @@ self: {
        homepage = "https://github.com/kawu/data-named";
        description = "Data types for named entities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-nat" = callPackage
@@ -59012,7 +58070,6 @@ self: {
        homepage = "http://github.com/glehel/data-nat";
        description = "data Nat = Zero | Succ Nat";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-object" = callPackage
@@ -59044,7 +58101,6 @@ self: {
        homepage = "http://github.com/snoyberg/data-object-json/tree/master";
        description = "Serialize JSON data to/from Haskell using the data-object library. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-object-yaml" = callPackage
@@ -59065,7 +58121,6 @@ self: {
        homepage = "http://github.com/snoyberg/data-object-yaml";
        description = "Serialize data to and from Yaml files (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-or" = callPackage
@@ -59123,7 +58178,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Reference cells that need two independent indices to be accessed";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-r-tree" = callPackage
@@ -59199,7 +58253,7 @@ self: {
        version = "0.0.3";
        sha256 = "59186a2290a630d53fb2d796d9cca1260dbd70fa414814778e1cab0aeeba4e6e";
        libraryHaskellDepends = [ base containers data-reify ];
-       description = "Common Sub-Expression Elimination for graphs generated by Data.Reify";
+       description = "Common Sub-Expression Elimination for graphs generated by Data.Reify.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -59249,7 +58303,6 @@ self: {
        libraryHaskellDepends = [ base bytestring bytestring-mmap unix ];
        description = "Ropes, an alternative to (Byte)Strings";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-rtuple" = callPackage
@@ -59260,7 +58313,7 @@ self: {
        sha256 = "4e2824b8d23d5eafce4c5f86a90fb58d97f461b45a287006f37cf8f2bd09fb05";
        libraryHaskellDepends = [ base lens typelevel ];
        homepage = "https://github.com/wdanilo/rtuple";
-       description = "Recursive tuple data structure. It is very usefull when implementing some lo-level operations, allowing to traverse different elements using Haskell's type classes";
+       description = "Recursive tuple data structure. It is very usefull when implementing some lo-level operations, allowing to traverse different elements using Haskell's type classes.";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -59286,7 +58339,7 @@ self: {
        libraryHaskellDepends = [ base vector-space ];
        jailbreak = true;
        homepage = "http://code.haskell.org/data-spacepart";
-       description = "Deprecated. Now called \"spacepart\". Space partitioning data structures";
+       description = "Deprecated. Now called \"spacepart\". Space partitioning data structures.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -59310,7 +58363,6 @@ self: {
        homepage = "https://github.com/Palmik/data-store";
        description = "Type safe, in-memory dictionary with multidimensional keys";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-stringmap" = callPackage
@@ -59433,7 +58485,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Basic type wrangling types and classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "data-util" = callPackage
@@ -59505,9 +58556,8 @@ self: {
          monad-control network old-locale text time transformers-base
        ];
        homepage = "https://github.com/iand675/datadog";
-       description = "Datadog client for Haskell. Currently only StatsD supported, other support forthcoming";
+       description = "Datadog client for Haskell. Currently only StatsD supported, other support forthcoming.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "dataenc" = callPackage
@@ -59575,7 +58625,6 @@ self: {
        jailbreak = true;
        description = "An implementation of datalog in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "datapacker" = callPackage
@@ -59674,7 +58723,7 @@ self: {
          test-framework-hunit test-framework-quickcheck2 time
        ];
        homepage = "http://github.com/stackbuilders/datetime";
-       description = "Utilities to make Data.Time.* easier to use";
+       description = "Utilities to make Data.Time.* easier to use.";
        license = "GPL";
      }) {};
 
@@ -59775,7 +58824,6 @@ self: {
        homepage = "http://devel.comunidadhaskell.org/dbjava/";
        description = "Decompiler Bytecode Java";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dbmigrations_1_0" = callPackage
@@ -59929,7 +58977,6 @@ self: {
        homepage = "http://john-millikin.com/software/haskell-dbus/";
        description = "Monadic and object-oriented interfaces to DBus";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dbus-core" = callPackage
@@ -59949,7 +58996,6 @@ self: {
        homepage = "https://john-millikin.com/software/dbus-core/";
        description = "Low-level D-Bus protocol implementation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dbus-qq" = callPackage
@@ -59998,9 +59044,8 @@ self: {
          test-framework test-framework-quickcheck2
        ];
        jailbreak = true;
-       description = "This packge is deprecated. See the the \"LIO.DCLabel\" in the \"lio\" package";
+       description = "This packge is deprecated. See the the \"LIO.DCLabel\" in the \"lio\" package.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dclabel-eci11" = callPackage
@@ -60050,7 +59095,6 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler build framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-code" = callPackage
@@ -60081,7 +59125,6 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler core language and type checker";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-core-eval" = callPackage
@@ -60099,7 +59142,6 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler semantic evaluator for the core language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-core-flow" = callPackage
@@ -60118,7 +59160,6 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler data flow compiler";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-core-llvm" = callPackage
@@ -60137,7 +59178,6 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler LLVM code generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-core-salt" = callPackage
@@ -60155,7 +59195,6 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler C code generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-core-simpl" = callPackage
@@ -60173,7 +59212,6 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler code transformations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-core-tetra" = callPackage
@@ -60192,7 +59230,6 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler intermediate language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-driver" = callPackage
@@ -60215,7 +59252,6 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler top-level driver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-interface" = callPackage
@@ -60247,7 +59283,6 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler source language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-tools" = callPackage
@@ -60273,7 +59308,6 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciplined Disciple Compiler command line tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ddc-war" = callPackage
@@ -60313,7 +59347,6 @@ self: {
        homepage = "http://disciple.ouroborus.net";
        description = "Disciple Core language interactive interpreter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dead-code-detection" = callPackage
@@ -60357,7 +59390,6 @@ self: {
        homepage = "http://hub.darcs.net/scravy/dead-simple-json";
        description = "Dead simple JSON parser, with some Template Haskell sugar";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "debian_3_87_2" = callPackage
@@ -60485,7 +59517,6 @@ self: {
        jailbreak = true;
        description = "The categorical dual of transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "declarative" = callPackage
@@ -60534,7 +59565,6 @@ self: {
        homepage = "https://github.com/hansonkd/decoder-conduit";
        description = "Conduit for decoding ByteStrings using Data.Binary.Get";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dedukti" = callPackage
@@ -60558,7 +59588,6 @@ self: {
        homepage = "http://www.lix.polytechnique.fr/dedukti";
        description = "A type-checker for the λΠ-modulo calculus";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deepcontrol" = callPackage
@@ -60605,7 +59634,6 @@ self: {
        homepage = "https://github.com/ajtulloch/deeplearning-hs";
        description = "Deep Learning in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deepseq_1_3_0_1" = callPackage
@@ -60660,7 +59688,6 @@ self: {
        homepage = "http://fremissant.net/deepseq-bounded";
        description = "Bounded deepseq, including support for generic deriving";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deepseq-generics_0_1_1_1" = callPackage
@@ -60742,7 +59769,6 @@ self: {
        jailbreak = true;
        description = "Template Haskell based deriver for optimised NFData instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deepzoom" = callPackage
@@ -60754,7 +59780,6 @@ self: {
        libraryHaskellDepends = [ base directory filepath hsmagick ];
        description = "A DeepZoom image slicer. Only known to work on 32bit Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "defargs" = callPackage
@@ -60767,7 +59792,6 @@ self: {
        homepage = "https://github.com/Kinokkory/defargs";
        description = "default arguments in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "definitive-base" = callPackage
@@ -60786,7 +59810,6 @@ self: {
        homepage = "http://coiffier.net/projects/definitive-framework.html";
        description = "The base modules of the Definitive framework";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "definitive-filesystem" = callPackage
@@ -60809,7 +59832,6 @@ self: {
        homepage = "http://coiffier.net/projects/definitive-framework.html";
        description = "A library that enable you to interact with the filesystem in a definitive way";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "definitive-graphics" = callPackage
@@ -60834,7 +59856,6 @@ self: {
        homepage = "http://coiffier.net/projects/definitive-framework.html";
        description = "A definitive package allowing you to open windows, read image files and render text to be displayed or saved";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "definitive-parser" = callPackage
@@ -60854,7 +59875,6 @@ self: {
        homepage = "http://coiffier.net/projects/definitive-framework.html";
        description = "A parser combinator library for the Definitive framework";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "definitive-reactive" = callPackage
@@ -60875,7 +59895,6 @@ self: {
        homepage = "http://coiffier.net/projects/definitive-framework.html";
        description = "A simple Reactive library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "definitive-sound" = callPackage
@@ -60897,7 +59916,6 @@ self: {
        homepage = "http://coiffier.net/projects/definitive-framework.html";
        description = "A definitive package to handle sound and play it back";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deiko-config" = callPackage
@@ -60946,7 +59964,6 @@ self: {
        homepage = "https://github.com/massysett/deka";
        description = "Decimal floating point arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {mpdec = null;};
 
   "deka-tests" = callPackage
@@ -60969,7 +59986,6 @@ self: {
        homepage = "https://github.com/massysett/deka";
        description = "Tests for deka, decimal floating point arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "delaunay" = callPackage
@@ -61002,7 +60018,6 @@ self: {
        homepage = "https://github.com/sof/delicious";
        description = "Accessing the del.icio.us APIs from Haskell (v2)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "delimited-text" = callPackage
@@ -61055,7 +60070,6 @@ self: {
        homepage = "https://github.com/kryoxide/delta";
        description = "A library for detecting file changes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "delta-h" = callPackage
@@ -61077,7 +60091,6 @@ self: {
        homepage = "https://bitbucket.org/gchrupala/delta-h";
        description = "Online entropy-based model of lexical category acquisition";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "demarcate" = callPackage
@@ -61091,7 +60104,6 @@ self: {
        homepage = "https://github.com/fizruk/demarcate";
        description = "Demarcating transformed monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "denominate" = callPackage
@@ -61108,7 +60120,6 @@ self: {
        homepage = "http://protempore.net/denominate/";
        description = "Functions supporting bulk file and directory name normalization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dependent-map_0_1_1_3" = callPackage
@@ -61145,7 +60156,7 @@ self: {
        sha256 = "093aa20845a345c1d44e3d0258eadd6f8c38e3596cd6486be64879d0b60e7467";
        libraryHaskellDepends = [ base lens mtl prologue ];
        homepage = "https://github.com/wdanilo/dependent-state";
-       description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types";
+       description = "Control structure similar to Control.Monad.State, allowing multiple nested states, distinguishable by provided phantom types.";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -61208,7 +60219,6 @@ self: {
        ];
        description = "A simple configuration management tool for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dephd" = callPackage
@@ -61227,7 +60237,6 @@ self: {
        homepage = "http://malde.org/~ketil/biohaskell/dephd";
        description = "Analyze quality of nucleotide sequences";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dequeue" = callPackage
@@ -61242,7 +60251,6 @@ self: {
        testHaskellDepends = [ base Cabal cabal-test-quickcheck ];
        description = "A typeclass and an implementation for double-ended queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derangement" = callPackage
@@ -61254,7 +60262,6 @@ self: {
        libraryHaskellDepends = [ base fgl ];
        description = "Find derangements of lists";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derivation-trees" = callPackage
@@ -61269,7 +60276,6 @@ self: {
        jailbreak = true;
        description = "Typeset Derivation Trees via MetaPost";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derive_2_5_18" = callPackage
@@ -61413,7 +60419,6 @@ self: {
        homepage = "http://github.com/konn/derive-IG";
        description = "Macro to derive instances for Instant-Generics using Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derive-enumerable" = callPackage
@@ -61449,7 +60454,6 @@ self: {
        jailbreak = true;
        description = "Instance deriving for (a subset of) GADTs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derive-monoid" = callPackage
@@ -61482,7 +60486,6 @@ self: {
        homepage = "https://github.com/HaskellZhangSong/derive-topdown";
        description = "This library will help you generate Haskell empty Generic instances and deriving type instances from the top automatically to the bottom for composited data types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "derive-trie" = callPackage
@@ -61496,7 +60499,6 @@ self: {
        homepage = "http://github.com/baldo/derive-trie";
        description = "Automatic derivation of Trie implementations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "deriving-compat" = callPackage
@@ -61539,7 +60541,6 @@ self: {
        homepage = "http://darcsden.com/kyagrd/derp-lib";
        description = "combinators based on parsing with derivatives (derp) package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "descrilo" = callPackage
@@ -61689,7 +60690,6 @@ self: {
        homepage = "https://github.com/luanzhu/devil";
        description = "A small tool to make it easier to update program managed by Angel";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "dewdrop" = callPackage
@@ -61704,7 +60704,6 @@ self: {
        homepage = "https://github.com/kmcallister/dewdrop";
        description = "Find gadgets for return-oriented programming on x86";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dfrac" = callPackage
@@ -61735,7 +60734,6 @@ self: {
        ];
        description = "Build Debian From Scratch CD/DVD images";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dgim" = callPackage
@@ -61750,7 +60748,6 @@ self: {
        homepage = "https://github.com/musically-ut/haskell-dgim";
        description = "Implementation of DGIM algorithm";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dgs" = callPackage
@@ -61764,7 +60761,6 @@ self: {
        homepage = "http://www.dmwit.com/dgs";
        description = "Haskell front-end for DGS' bot interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dia-base" = callPackage
@@ -62246,7 +61242,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams/";
        description = "HTML5 canvas backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-contrib_1_1_2_4" = callPackage
@@ -62856,7 +61851,6 @@ self: {
        homepage = "https://github.com/marcinmrotek/diagrams-hsqml";
        description = "HsQML (Qt5) backend for Diagrams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "diagrams-html5_1_3_0_2" = callPackage
@@ -63137,7 +62131,6 @@ self: {
        homepage = "http://www.alpheccar.org";
        description = "PDF backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-pgf" = callPackage
@@ -63158,7 +62151,6 @@ self: {
        homepage = "http://github.com/cchalmers/diagrams-pgf";
        description = "PGF backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diagrams-postscript_1_1_0_3" = callPackage
@@ -63692,7 +62684,6 @@ self: {
        homepage = "http://projects.haskell.org/diagrams";
        description = "TikZ backend for diagrams drawing EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dialog" = callPackage
@@ -63742,7 +62733,6 @@ self: {
        homepage = "http://monoid.at/code";
        description = "Cryptographically secure n-sided dice via rejection sampling";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dicom" = callPackage
@@ -63773,7 +62763,6 @@ self: {
        homepage = "http://github.com/mwotton/dictparser";
        description = "Parsec parsers for the DICT format produced by dictfmt -t";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diet" = callPackage
@@ -63861,7 +62850,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/diffcabal";
        description = "Diff two .cabal files syntactically";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diffdump" = callPackage
@@ -64229,7 +63217,6 @@ self: {
        homepage = "http://src.seereason.com/digestive-functors-hsp";
        description = "HSP support for digestive-functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "digestive-functors-lucid" = callPackage
@@ -64415,7 +63402,6 @@ self: {
        jailbreak = true;
        description = "Dingo is a Rich Internet Application platform based on the Warp web server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dingo-example" = callPackage
@@ -64436,7 +63422,6 @@ self: {
        jailbreak = true;
        description = "Dingo Example";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dingo-widgets" = callPackage
@@ -64456,7 +63441,6 @@ self: {
        jailbreak = true;
        description = "Dingo Widgets";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diophantine" = callPackage
@@ -64470,7 +63454,6 @@ self: {
        homepage = "https://github.com/llllllllll/Math.Diophantine";
        description = "A quadratic diophantine equation solving library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "diplomacy" = callPackage
@@ -64513,7 +63496,6 @@ self: {
        homepage = "https://github.com/avieth/diplomacy-server";
        description = "Play Diplomacy over HTTP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "direct-binary-files" = callPackage
@@ -64526,7 +63508,6 @@ self: {
        homepage = "http://ireneknapp.com/software/";
        description = "Serialization and deserialization monads for streams and ByteStrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "direct-daemonize" = callPackage
@@ -64556,7 +63537,6 @@ self: {
        homepage = "http://dankna.com/software/";
        description = "Native implementation of the FastCGI protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "direct-http" = callPackage
@@ -64577,7 +63557,6 @@ self: {
        homepage = "http://ireneknapp.com/software/";
        description = "Native webserver that acts as a library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "direct-murmur-hash" = callPackage
@@ -64602,7 +63581,6 @@ self: {
        homepage = "http://dankna.com/software/";
        description = "Lightweight replacement for Plugins, specific to GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "direct-sqlite_2_3_14" = callPackage
@@ -64618,7 +63596,7 @@ self: {
          base base16-bytestring bytestring directory HUnit text
        ];
        homepage = "https://github.com/IreneKnapp/direct-sqlite";
-       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support";
+       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -64636,7 +63614,7 @@ self: {
          base base16-bytestring bytestring directory HUnit text
        ];
        homepage = "https://github.com/IreneKnapp/direct-sqlite";
-       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support";
+       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -64655,7 +63633,7 @@ self: {
        ];
        doCheck = false;
        homepage = "https://github.com/IreneKnapp/direct-sqlite";
-       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support";
+       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -64674,7 +63652,7 @@ self: {
        ];
        doCheck = false;
        homepage = "https://github.com/IreneKnapp/direct-sqlite";
-       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support";
+       description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -64693,7 +63671,6 @@ self: {
        jailbreak = true;
        description = "Finite directed cubical complexes and associated algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "directory_1_2_5_1" = callPackage
@@ -64774,7 +63751,6 @@ self: {
          unordered-containers
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dirstream" = callPackage
@@ -64828,7 +63804,6 @@ self: {
        homepage = "http://github.com/lightquake/discount";
        description = "Haskell bindings to the discount Markdown library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {markdown = null;};
 
   "discrete-space-map" = callPackage
@@ -64881,9 +63856,8 @@ self: {
          base containers HUnit mtl QuickCheck transformers
        ];
        homepage = "https://github.com/maxwellsayles/disjoint-set";
-       description = "Persistent disjoint-sets, a.k.a union-find";
+       description = "Persistent disjoint-sets, a.k.a union-find.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "disjoint-sets-st" = callPackage
@@ -64941,7 +63915,6 @@ self: {
        homepage = "https://github.com/tweag/distributed-closure";
        description = "Serializable closures for distributed programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process_0_5_2" = callPackage
@@ -65144,7 +64117,6 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process";
        description = "Microsoft Azure backend for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-client-server_0_1_2" = callPackage
@@ -65209,7 +64181,6 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-client-server";
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-ekg" = callPackage
@@ -65296,7 +64267,6 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-execution";
        description = "Execution Framework for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-extras_0_2_0" = callPackage
@@ -65459,7 +64429,6 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-platform";
        description = "The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-registry" = callPackage
@@ -65493,7 +64462,6 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-registry";
        description = "Cloud Haskell Extended Process Registry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-simplelocalnet_0_2_2_0" = callPackage
@@ -65627,7 +64595,6 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-supervisor";
        description = "Supervisors for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-task_0_1_1" = callPackage
@@ -65701,7 +64668,6 @@ self: {
        homepage = "http://github.com/haskell-distributed/distributed-process-task";
        description = "Task Framework for The Cloud Haskell Application Platform";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-process-tests" = callPackage
@@ -65712,8 +64678,8 @@ self: {
      }:
      mkDerivation {
        pname = "distributed-process-tests";
-       version = "0.4.4";
-       sha256 = "e53f39304100179bbd4e6944348578fe252940170f5ae20ab2ae1c63f8a69169";
+       version = "0.4.5";
+       sha256 = "16a4cb883f487b83837eb50600f504a57c5f89362bba895256d2e260107e76aa";
        libraryHaskellDepends = [
          ansi-terminal base binary bytestring distributed-process
          distributed-static HUnit network network-transport random rematch
@@ -65723,7 +64689,7 @@ self: {
          base network network-transport network-transport-inmemory
          test-framework
        ];
-       homepage = "http://github.com/haskell-distributed/distributed-process-tests";
+       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;
      }) {};
@@ -65755,7 +64721,6 @@ self: {
        homepage = "https://github.com/jeremyjh/distributed-process-zookeeper";
        description = "A Zookeeper back-end for Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributed-static_0_3_1_0" = callPackage
@@ -65838,7 +64803,6 @@ self: {
        homepage = "https://github.com/redelmann/haskell-distribution";
        description = "Finite discrete probability distributions";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distribution-plot" = callPackage
@@ -65855,9 +64819,8 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/redelmann/haskell-distribution-plot";
-       description = "Easily plot distributions from the distribution package.";
+       description = "Easily plot distributions from the distribution package..";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "distributive_0_4_4" = callPackage
@@ -66095,7 +65058,7 @@ self: {
        libraryHaskellDepends = [
          async base containers djinn-lib ghc mtl transformers
        ];
-       description = "Generate Haskell code from a type. Bridge from Djinn to GHC API";
+       description = "Generate Haskell code from a type. Bridge from Djinn to GHC API.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -66111,7 +65074,7 @@ self: {
        libraryHaskellDepends = [
          async base containers djinn-lib ghc mtl transformers
        ];
-       description = "Generate Haskell code from a type. Bridge from Djinn to GHC API";
+       description = "Generate Haskell code from a type. Bridge from Djinn to GHC API.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -66123,7 +65086,7 @@ self: {
        sha256 = "c0fe10b7aa5cb39f828e933925fc5bbf86c290bb7661021e4d9250ae8ed01011";
        libraryHaskellDepends = [ base containers mtl pretty ];
        homepage = "http://www.augustsson.net/Darcs/Djinn/";
-       description = "Generate Haskell code from a type. Library extracted from djinn package";
+       description = "Generate Haskell code from a type. Library extracted from djinn package.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -66140,7 +65103,6 @@ self: {
        homepage = "http://gitorious.org/djinn-th";
        description = "Generate executable Haskell code from a type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dlist_0_7_1" = callPackage
@@ -66263,7 +65225,6 @@ self: {
        jailbreak = true;
        description = "Caching DNS resolver library and mass DNS resolver utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dnsrbl" = callPackage
@@ -66290,7 +65251,6 @@ self: {
        homepage = "https://github.com/maxpow4h/dnssd";
        description = "DNS service discovery bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {dns_sd = null;};
 
   "doc-review" = callPackage
@@ -66317,7 +65277,6 @@ self: {
        homepage = "https://github.com/j3h/doc-review";
        description = "Document review Web application, like http://book.realworldhaskell.org/";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "doccheck" = callPackage
@@ -66337,7 +65296,6 @@ self: {
        homepage = "https://github.com/Fuuzetsu/doccheck";
        description = "Checks Haddock comments for pitfalls and version changes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "docidx" = callPackage
@@ -66357,7 +65315,6 @@ self: {
        homepage = "http://github.com/gimbo/docidx.hs";
        description = "Generate an HTML index of installed Haskell packages and their documentation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "docker" = callPackage
@@ -66385,7 +65342,6 @@ self: {
        homepage = "https://github.com/denibertovic/docker-hs";
        description = "Haskell wrapper for Docker Remote API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dockercook" = callPackage
@@ -66419,7 +65375,6 @@ self: {
        homepage = "https://github.com/factisresearch/dockercook";
        description = "A build tool for multiple docker image layers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dockerfile" = callPackage
@@ -66586,7 +65541,6 @@ self: {
        homepage = "http://github.com/karun012/doctest-discover";
        description = "Easy way to run doctests via cabal";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "doctest-discover-configurator" = callPackage
@@ -66613,7 +65567,6 @@ self: {
        homepage = "http://github.com/relrod/doctest-discover-noaeson";
        description = "Easy way to run doctests via cabal (no aeson dependency, uses configurator instead)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "doctest-prop" = callPackage
@@ -66806,7 +65759,6 @@ self: {
        homepage = "http://github.com/toothbrush/dotfs";
        description = "Filesystem to manage and parse dotfiles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "dotgen" = callPackage
@@ -66820,7 +65772,7 @@ self: {
        libraryHaskellDepends = [ base containers ];
        executableHaskellDepends = [ base ];
        homepage = "https://github.com/ku-fpg/dotgen";
-       description = "A simple interface for building .dot graph files";
+       description = "A simple interface for building .dot graph files.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -66883,7 +65835,6 @@ self: {
        ];
        description = "Dungeons of Wor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "download" = callPackage
@@ -66896,7 +65847,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/download";
        description = "High-level file download based on URLs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "download-curl" = callPackage
@@ -66930,7 +65880,6 @@ self: {
        homepage = "http://github.com/jaspervdj/download-media-content";
        description = "Simple tool to download images from RSS feeds (e.g. Flickr, Picasa)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dozenal" = callPackage
@@ -67000,7 +65949,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell example programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dph-lifted-base" = callPackage
@@ -67019,7 +65967,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell common definitions used by other dph-lifted packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dph-lifted-copy" = callPackage
@@ -67037,7 +65984,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell lifted array combinators. (deprecated version)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dph-lifted-vseg" = callPackage
@@ -67056,7 +66002,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell lifted array combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dph-par" = callPackage
@@ -67100,7 +66045,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell segmented arrays. (production version)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dph-prim-seq" = callPackage
@@ -67118,7 +66062,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/GHC/Data_Parallel_Haskell";
        description = "Data Parallel Haskell segmented arrays. (sequential implementation)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dph-seq" = callPackage
@@ -67150,7 +66093,6 @@ self: {
        testPkgconfigDepends = [ libdpkg ];
        description = "libdpkg bindings";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) dpkg; libdpkg = null;};
 
   "drClickOn" = callPackage
@@ -67163,7 +66105,6 @@ self: {
        homepage = "https://github.com/cwi-swat/monadic-frp";
        description = "Monadic FRP";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "draw-poker" = callPackage
@@ -67256,7 +66197,6 @@ self: {
        doCheck = false;
        description = "PostgreSQL support for the drifter schema migration tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dropbox-sdk" = callPackage
@@ -67280,7 +66220,6 @@ self: {
        homepage = "http://github.com/cakoose/dropbox-sdk-haskell";
        description = "A library to access the Dropbox HTTP API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dropsolve" = callPackage
@@ -67298,9 +66237,8 @@ self: {
          time
        ];
        jailbreak = true;
-       description = "A command line tool for resolving dropbox conflicts. Deprecated! Please use confsolve";
+       description = "A command line tool for resolving dropbox conflicts. Deprecated! Please use confsolve.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ds-kanren" = callPackage
@@ -67315,7 +66253,6 @@ self: {
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        description = "A subset of the miniKanren language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dsh-sql" = callPackage
@@ -67343,7 +66280,6 @@ self: {
        ];
        description = "SQL backend for Database Supported Haskell (DSH)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dsmc" = callPackage
@@ -67362,7 +66298,6 @@ self: {
        jailbreak = true;
        description = "DSMC library for rarefied gas dynamics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dsmc-tools" = callPackage
@@ -67382,7 +66317,6 @@ self: {
        jailbreak = true;
        description = "DSMC toolkit for rarefied gas dynamics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dson" = callPackage
@@ -67437,7 +66371,6 @@ self: {
        homepage = "https://github.com/basvandijk/dstring";
        description = "Difference strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dtab" = callPackage
@@ -67479,7 +66412,6 @@ self: {
        homepage = "http://github.com/snoyberg/xml";
        description = "Parse and render DTD files (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dtd-text" = callPackage
@@ -67496,7 +66428,6 @@ self: {
        homepage = "http://github.com/m15k/hs-dtd-text";
        description = "Parse and render XML DTDs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dtd-types" = callPackage
@@ -67509,7 +66440,6 @@ self: {
        homepage = "http://projects.haskell.org/dtd/";
        description = "Basic types for representing XML DTDs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dtrace" = callPackage
@@ -67661,7 +66591,6 @@ self: {
        jailbreak = true;
        description = "Frontend development build tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dvda" = callPackage
@@ -67684,7 +66613,6 @@ self: {
        ];
        description = "Efficient automatic differentiation and code generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dvdread" = callPackage
@@ -67698,7 +66626,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A monadic interface to libdvdread";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {dvdread = null;};
 
   "dvi-processing" = callPackage
@@ -67830,7 +66757,6 @@ self: {
        homepage = "http://github.com/bennofs/dynamic-cabal/";
        description = "Access the functions from the Cabal library without depending on it";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dynamic-graph" = callPackage
@@ -67849,7 +66775,6 @@ self: {
        homepage = "https://github.com/adamwalker/dynamic-graph";
        description = "Draw and update graphs in real time with OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dynamic-linker-template" = callPackage
@@ -67908,7 +66833,6 @@ self: {
        ];
        description = "Object-oriented programming with duck typing and singleton classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dynamic-plot" = callPackage
@@ -67932,7 +66856,6 @@ self: {
        homepage = "https://github.com/leftaroundabout/dynamic-plot";
        description = "Interactive diagram windows";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dynamic-pp" = callPackage
@@ -67954,7 +66877,6 @@ self: {
        homepage = "https://github.com/emc2/dynamic-pp";
        description = "A pretty-print library that employs a dynamic programming algorithm for optimal rendering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dynamic-state_0_2_0_0" = callPackage
@@ -68027,7 +66949,6 @@ self: {
        ];
        description = "your dynamic optimization buddy";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "dyre" = callPackage
@@ -68098,7 +67019,6 @@ self: {
        homepage = "http://github.com/sanetracker/easy-api";
        description = "Utility code for building HTTP API bindings more quickly";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "easy-bitcoin" = callPackage
@@ -68159,7 +67079,6 @@ self: {
        homepage = "https://github.com/thinkpad20/easyjson";
        description = "Haskell JSON library with an emphasis on simplicity, minimal dependencies, and ease of use";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "easyplot" = callPackage
@@ -68172,7 +67091,6 @@ self: {
        homepage = "http://hub.darcs.net/scravy/easyplot";
        description = "A tiny plotting library, utilizes gnuplot for plotting";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "easyrender" = callPackage
@@ -68188,7 +67106,6 @@ self: {
        homepage = "http://www.mathstat.dal.ca/~selinger/easyrender/";
        description = "User-friendly creation of EPS, PostScript, and PDF files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ebeats" = callPackage
@@ -68220,7 +67137,6 @@ self: {
        jailbreak = true;
        description = "Parser combinators & EBNF, BFFs!";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ec2-signature" = callPackage
@@ -68257,7 +67173,6 @@ self: {
        homepage = "https://github.com/singpolyma/ecdsa-haskell";
        description = "Basic ECDSA signing implementation";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ecma262" = callPackage
@@ -68278,7 +67193,6 @@ self: {
        homepage = "https://github.com/fabianbergmark/ECMA-262";
        description = "A ECMA-262 interpreter library";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ecu" = callPackage
@@ -68298,7 +67212,6 @@ self: {
        jailbreak = true;
        description = "Tools for automotive ECU development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {canlib = null;};
 
   "ed25519" = callPackage
@@ -68318,7 +67231,6 @@ self: {
        homepage = "http://thoughtpolice.github.com/hs-ed25519";
        description = "Ed25519 cryptographic signatures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ed25519-donna" = callPackage
@@ -68461,7 +67373,6 @@ self: {
        homepage = "http://www.mathematik.uni-marburg.de/~eden";
        description = "Semi-explicit parallel programming library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "edenskel" = callPackage
@@ -68473,7 +67384,6 @@ self: {
        libraryHaskellDepends = [ base edenmodules parallel ];
        description = "Semi-explicit parallel programming skeleton library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "edentv" = callPackage
@@ -68494,7 +67404,6 @@ self: {
        homepage = "http://www.mathematik.uni-marburg.de/~eden";
        description = "A Tool to Visualize Parallel Functional Program Executions";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "edge" = callPackage
@@ -68514,7 +67423,6 @@ self: {
        homepage = "http://frigidcode.com/code/edge";
        description = "Top view space combat arcade game";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "edis" = callPackage
@@ -68621,7 +67529,6 @@ self: {
        ];
        description = "Symmetric, stateful edit lenses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "edit-lenses-demo" = callPackage
@@ -68661,7 +67568,6 @@ self: {
        homepage = "http://code.haskell.org/editline";
        description = "Bindings to the editline library (libedit)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "editor-open" = callPackage
@@ -68699,7 +67605,7 @@ self: {
          base hspec hspec-discover HUnit QuickCheck
        ];
        homepage = "https://github.com/edofic/effect-handlers";
-       description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers";
+       description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers.";
        license = stdenv.lib.licenses.mit;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -68717,7 +67623,7 @@ self: {
          base hspec hspec-discover HUnit QuickCheck
        ];
        homepage = "https://github.com/edofic/effect-handlers";
-       description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers";
+       description = "A library for writing extensible algebraic effects and handlers. Similar to extensible-effects but with deep handlers.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -68733,7 +67639,6 @@ self: {
        jailbreak = true;
        description = "Embeds effect systems into Haskell using parameteric effect monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "effective-aspects" = callPackage
@@ -68756,7 +67661,6 @@ self: {
        homepage = "http://pleiad.cl/EffectiveAspects";
        description = "A monadic embedding of aspect oriented programming";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "effective-aspects-mzv" = callPackage
@@ -68779,7 +67683,6 @@ self: {
        homepage = "http://pleiad.cl/EffectiveAspects";
        description = "A monadic embedding of aspect oriented programming, using \"Monads, Zippers and Views\" instead of mtl";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "effects" = callPackage
@@ -68860,7 +67763,6 @@ self: {
        homepage = "https://github.com/xenophobia/Egison-Quote";
        description = "A quasi quotes for using Egison expression in Haskell code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "egison-tutorial" = callPackage
@@ -68901,7 +67803,6 @@ self: {
        homepage = "http://homepage3.nifty.com/salamander/second/projects/ehaskell/index.xhtml";
        description = "like eruby, ehaskell is embedded haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ehs" = callPackage
@@ -68924,7 +67825,6 @@ self: {
        homepage = "http://github.com/minpou/ehs/";
        description = "Embedded haskell template using quasiquotes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eibd-client-simple" = callPackage
@@ -68944,7 +67844,6 @@ self: {
        jailbreak = true;
        description = "EIBd Client";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {eibclient = null;};
 
   "eigen" = callPackage
@@ -68964,7 +67863,6 @@ self: {
        homepage = "https://github.com/osidorkin/haskell-eigen";
        description = "Eigen C++ library (linear algebra: matrices, sparse matrices, vectors, numerical solvers)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "either_4_3_2" = callPackage
@@ -69306,7 +68204,6 @@ self: {
        homepage = "https://bitbucket.org/davecturner/ekg-rrd";
        description = "Passes ekg statistics to rrdtool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "ekg-statsd" = callPackage
@@ -69335,7 +68232,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-quickcheck ];
        description = "easy to remember mnemonic for a high-entropy value";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "elerea" = callPackage
@@ -69363,7 +68259,6 @@ self: {
        executableHaskellDepends = [ base elerea GLFW OpenGL ];
        description = "Example applications for Elerea";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "elerea-sdl" = callPackage
@@ -69376,7 +68271,6 @@ self: {
        homepage = "http://github.com/singpolyma/elerea-sdl";
        description = "Elerea FRP wrapper for SDL";
        license = "unknown";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "elevator" = callPackage
@@ -69522,7 +68416,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://elm-lang.org";
-       description = "Values to help with elm-package, elm-make, and elm-lang.org";
+       description = "Values to help with elm-package, elm-make, and elm-lang.org.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -69562,7 +68456,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://elm-lang.org";
-       description = "Values to help with elm-package, elm-make, and elm-lang.org";
+       description = "Values to help with elm-package, elm-make, and elm-lang.org.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -69603,7 +68497,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://elm-lang.org";
-       description = "Values to help with elm-package, elm-make, and elm-lang.org";
+       description = "Values to help with elm-package, elm-make, and elm-lang.org.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -69667,7 +68561,6 @@ self: {
        ];
        description = "Set up basic structure for an elm project";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "elm-make" = callPackage
@@ -69894,7 +68787,6 @@ self: {
        homepage = "https://github.com/cocreature/emacs-keys";
        description = "library to parse emacs style keybinding into the modifiers and the chars";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "email" = callPackage
@@ -69912,7 +68804,6 @@ self: {
        jailbreak = true;
        description = "Sending eMail in Haskell made easy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "email-header" = callPackage
@@ -69935,7 +68826,6 @@ self: {
        homepage = "http://github.com/knrafto/email-header";
        description = "Parsing and rendering of email and MIME headers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "email-postmark" = callPackage
@@ -69952,7 +68842,6 @@ self: {
        jailbreak = true;
        description = "A simple wrapper to send emails via the api of the service postmark (http://postmarkapp.com/)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "email-validate_2_0_1" = callPackage
@@ -70055,7 +68944,6 @@ self: {
        homepage = "https://github.com/nushio3/embeddock";
        description = "Embed the values in scope in the haddock documentation of the module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "embeddock-example" = callPackage
@@ -70068,7 +68956,6 @@ self: {
        homepage = "https://github.com/nushio3/embeddock-example";
        description = "Example of using embeddock";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "embroidery" = callPackage
@@ -70088,7 +68975,6 @@ self: {
        homepage = "https://ludflu@github.com/ludflu/embroidery.git";
        description = "support for embroidery formats in haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "emgm" = callPackage
@@ -70103,7 +68989,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/EMGM";
        description = "Extensible and Modular Generics for the Masses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "empty" = callPackage
@@ -70179,14 +69064,16 @@ self: {
      }) {};
 
   "endo" = callPackage
-    ({ mkDerivation, base, between, transformers }:
+    ({ mkDerivation, base, between, data-default-class, mtl
+     , transformers
+     }:
      mkDerivation {
        pname = "endo";
-       version = "0.2.0.1";
-       sha256 = "312ea501116bddc01dd523948b80693ec6348a8f6beb5a1b9bcbeaa709d9eb6b";
-       revision = "1";
-       editedCabalFile = "4c0b97bc6e43d18ae5dc423824ab4406e6b2188b887094b6eff3e49103e456b3";
-       libraryHaskellDepends = [ base between transformers ];
+       version = "0.3.0.1";
+       sha256 = "34048da71000312081715a95e35108e5526647232c857b3c8e13dbb69e364f6a";
+       libraryHaskellDepends = [
+         base between data-default-class mtl transformers
+       ];
        homepage = "https://github.com/trskop/endo";
        description = "Endomorphism utilities";
        license = stdenv.lib.licenses.bsd3;
@@ -70457,7 +69344,6 @@ self: {
        homepage = "https://github.com/sboosali/enumerate";
        description = "enumerate all the values in a finite type (automatically)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "enumeration" = callPackage
@@ -70477,7 +69363,6 @@ self: {
        homepage = "https://github.com/emc2/enumeration";
        description = "A practical API for building recursive enumeration procedures and enumerating datatypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "enumerator" = callPackage
@@ -70530,7 +69415,6 @@ self: {
        homepage = "https://github.com/liyang/enumfun";
        description = "Finitely represented /total/ EnumMaps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "enummapmap" = callPackage
@@ -70553,7 +69437,6 @@ self: {
        jailbreak = true;
        description = "Map of maps using Enum types as keys";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "enummapset" = callPackage
@@ -70613,7 +69496,6 @@ self: {
        homepage = "http://github.com/tel/env-parser";
        description = "Pull configuration information from the ENV";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "envparse" = callPackage
@@ -70661,7 +69543,6 @@ self: {
        homepage = "http://epanet.de/developer/haskell.html";
        description = "Haskell binding for EPANET";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "epass" = callPackage
@@ -70692,7 +69573,6 @@ self: {
        homepage = "http://www.dcs.st-and.ac.uk/~eb/epic.php";
        description = "Compiler for a simple functional language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "epoll" = callPackage
@@ -70707,7 +69587,6 @@ self: {
        homepage = "https://gitlab.com/twittner/epoll";
        description = "epoll bindings";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eprocess" = callPackage
@@ -70796,7 +69675,6 @@ self: {
        homepage = "http://ui3.info/d/proj/epubname.html";
        description = "Rename epub ebook files based on meta information";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eq_4_0_3" = callPackage
@@ -70925,8 +69803,8 @@ self: {
      }:
      mkDerivation {
        pname = "erlang";
-       version = "0.2.1";
-       sha256 = "7322f24dcc10cfde8a2f9afa6835893b93b7b4c3e20f7514a24ca6d169b7f334";
+       version = "0.2.2";
+       sha256 = "892080e131621fb0ea585ed9e2497a3c367607319d3daa3ae03edaafd5f38b71";
        libraryHaskellDepends = [
          base binary bytestring directory filepath MissingH network random
        ];
@@ -70963,7 +69841,6 @@ self: {
        jailbreak = true;
        description = "DEPRECATED in favor of eros-http";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eros-http" = callPackage
@@ -71073,7 +69950,6 @@ self: {
        homepage = "http://github.com/gcross/error-message";
        description = "Composable error messages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "error-util" = callPackage
@@ -71276,7 +70152,6 @@ self: {
        homepage = "http://github.com/ekmett/ersatz";
        description = "A monad for expressing SAT or QSAT problems using observable sharing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ersatz-toysat" = callPackage
@@ -71297,7 +70172,6 @@ self: {
        homepage = "https://github.com/msakai/ersatz-toysat";
        description = "toysat driver as backend for ersatz";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ert" = callPackage
@@ -71347,7 +70221,6 @@ self: {
        homepage = "http://www.killersmurf.com/projects/esotericbot";
        description = "Esotericbot is a sophisticated, lightweight IRC bot";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "esqueleto_2_1_2_1" = callPackage
@@ -71572,7 +70445,6 @@ self: {
        jailbreak = true;
        description = "Tool for managing probability estimation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "estreps" = callPackage
@@ -71590,7 +70462,6 @@ self: {
        homepage = "http://blog.malde.org/";
        description = "Repeats from ESTs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "etcd" = callPackage
@@ -71625,7 +70496,6 @@ self: {
        ];
        description = "everything breaking the Fairbairn threshold";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ether_0_3_0_0" = callPackage
@@ -71719,7 +70589,6 @@ self: {
        ];
        description = "A Haskell version of an Ethereum client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ethereum-merkle-patricia-db" = callPackage
@@ -71744,7 +70613,6 @@ self: {
        ];
        description = "A modified Merkle Patricia DB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ethereum-rlp" = callPackage
@@ -71825,7 +70693,6 @@ self: {
        homepage = "http://github.com/tsurucapital/euphoria";
        description = "Dynamic network FRP with events and continuous values";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eurofxref" = callPackage
@@ -71843,7 +70710,6 @@ self: {
        jailbreak = true;
        description = "Free foreign exchange/currency feed from the European Central Bank";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "event_0_1_1" = callPackage
@@ -71912,7 +70778,6 @@ self: {
        libraryHaskellDepends = [ base monads-tf yjtools ];
        description = "library for event driven programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "event-handlers" = callPackage
@@ -71961,7 +70826,6 @@ self: {
        homepage = "http://code.haskell.org/~mokus/event-monad";
        description = "Event-graph simulation monad transformer";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eventloop" = callPackage
@@ -71978,9 +70842,8 @@ self: {
        ];
        jailbreak = true;
        homepage = "-";
-       description = "A different take on an IO system. Based on Amanda's IO loop, this eventloop takes a function that maps input events to output events. It can easily be extended by modules that represent IO devices or join multiple modules together";
+       description = "A different take on an IO system. Based on Amanda's IO loop, this eventloop takes a function that maps input events to output events. It can easily be extended by modules that represent IO devices or join multiple modules together.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "eventstore_0_10_0_1" = callPackage
@@ -72040,7 +70903,6 @@ self: {
        homepage = "http://research.microsoft.com/en-us/people/dimitris/pearl.pdf";
        description = "A functional pearl on encoding and decoding using question-and-answer strategies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ewe" = callPackage
@@ -72060,7 +70922,6 @@ self: {
        homepage = "http://github.com/jfcmacro/ewe";
        description = "A language for teaching simple programming languages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ex-pool" = callPackage
@@ -72500,7 +71361,6 @@ self: {
        librarySystemDepends = [ exif ];
        description = "A Haskell binding to a subset of libexif";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) exif;};
 
   "exinst" = callPackage
@@ -72600,7 +71460,6 @@ self: {
        homepage = "http://github.com/glehel/exists";
        description = "Existential datatypes holding evidence of constraints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exit-codes" = callPackage
@@ -72646,7 +71505,6 @@ self: {
        homepage = "https://github.com/Bodigrim/exp-pairs";
        description = "Linear programming over exponent pairs";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "expand" = callPackage
@@ -72661,7 +71519,6 @@ self: {
        jailbreak = true;
        description = "Extensible Pandoc";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "expat-enumerator" = callPackage
@@ -72679,7 +71536,6 @@ self: {
        homepage = "http://john-millikin.com/software/expat-enumerator/";
        description = "Enumerator-based API for Expat";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "expiring-cache-map" = callPackage
@@ -72727,7 +71583,6 @@ self: {
        homepage = "https://github.com/joelteon/explain";
        description = "Show how expressions are parsed";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "explicit-determinant" = callPackage
@@ -72824,7 +71679,6 @@ self: {
        homepage = "http://sebfisch.github.com/explicit-sharing";
        description = "Explicit Sharing of Monadic Effects";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "explore" = callPackage
@@ -72839,7 +71693,6 @@ self: {
        homepage = "http://corsis.sourceforge.net/haskell/explore";
        description = "Experimental Plot data Reconstructor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "exposed-containers" = callPackage
@@ -72861,7 +71714,6 @@ self: {
        jailbreak = true;
        description = "A distribution of the 'containers' package, with all modules exposed";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "expression-parser" = callPackage
@@ -72889,7 +71741,6 @@ self: {
        ];
        description = "Libraries for processing GHC Core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extemp" = callPackage
@@ -72913,7 +71764,6 @@ self: {
        homepage = "http://patch-tag.com/r/salazar/extemp";
        description = "automated printing for extemp speakers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extended-categories" = callPackage
@@ -72927,7 +71777,6 @@ self: {
        homepage = "github.com/ian-mi/extended-categories";
        description = "Extended Categories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "extended-reals" = callPackage
@@ -73025,7 +71874,7 @@ self: {
        libraryHaskellDepends = [
          base binary bytestring EdisonAPI EdisonCore
        ];
-       description = "Sort large arrays on your hard drive. Kind of like the unix util sort";
+       description = "Sort large arrays on your hard drive. Kind of like the unix util sort.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -73218,7 +72067,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/ez-couch";
        description = "A high level static library for working with CouchDB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "faceted" = callPackage
@@ -73232,7 +72080,6 @@ self: {
        homepage = "http://github.com/haskell-faceted/haskell-faceted";
        description = "Faceted computation for dynamic information flow security";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "factory" = callPackage
@@ -73257,7 +72104,6 @@ self: {
        homepage = "http://functionalley.eu/Factory/factory.html";
        description = "Rational arithmetic in an irrational world";
        license = "GPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-darwin" ];
      }) {};
 
   "factual-api" = callPackage
@@ -73276,7 +72122,6 @@ self: {
        homepage = "https://github.com/rudyl313/factual-haskell-driver";
        description = "A driver for the Factual API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fad" = callPackage
@@ -73381,7 +72226,6 @@ self: {
        homepage = "http://github.com/tranma/falling-turnip";
        description = "Falling sand game/cellular automata simulation using regular parallel arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fallingblocks" = callPackage
@@ -73401,7 +72245,6 @@ self: {
        homepage = "http://bencode.blogspot.com/2009/03/falling-blocks-tetris-clone-in-haskell.html";
        description = "A fun falling blocks game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "family-tree" = callPackage
@@ -73420,7 +72263,6 @@ self: {
        homepage = "https://github.com/Taneb/family-tree";
        description = "A family tree library for the Haskell programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "farmhash" = callPackage
@@ -73434,7 +72276,6 @@ self: {
        homepage = "https://github.com/abhinav/farmhash";
        description = "Fast hash functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "fast-builder" = callPackage
@@ -73450,7 +72291,6 @@ self: {
        homepage = "http://github.com/takano-akio/fast-builder";
        description = "Fast ByteString Builder";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "fast-digits" = callPackage
@@ -73587,7 +72427,6 @@ self: {
        homepage = "https://github.com/elaforge/fast-tags";
        description = "Fast incremental vi and emacs tags";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fast-tagsoup" = callPackage
@@ -73662,7 +72501,6 @@ self: {
        homepage = "https://github.com/cscherrer/fastbayes";
        description = "Bayesian modeling algorithms accelerated for particular model structures";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fastcgi" = callPackage
@@ -73715,7 +72553,6 @@ self: {
        ];
        description = "Fast Internet Relay Chat (IRC) library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fault-tree" = callPackage
@@ -73728,7 +72565,6 @@ self: {
        homepage = "http://tomahawkins.org";
        description = "A fault tree analysis library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay_0_21_2_1" = callPackage
@@ -74154,7 +72990,6 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "Clientside HTML generation for fay";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fay-jquery_0_6_0_2" = callPackage
@@ -74577,7 +73412,6 @@ self: {
        homepage = "https://github.com/Neki/fcd";
        description = "A faster way to navigate directories using the command line";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fckeditor" = callPackage
@@ -74591,7 +73425,6 @@ self: {
        homepage = "http://peteg.org/";
        description = "Server-Side Integration for FCKeditor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fclabels_2_0_2" = callPackage
@@ -74719,7 +73552,6 @@ self: {
        homepage = "https://github.com/jkarlson/fdo-trash";
        description = "Utilities related to freedesktop Trash standard";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feature-flags" = callPackage
@@ -74787,7 +73619,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/bergmark/feed";
-       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds";
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -74809,7 +73641,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/bergmark/feed";
-       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds";
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -74830,7 +73662,7 @@ self: {
          time time-locale-compat utf8-string xml
        ];
        homepage = "https://github.com/bergmark/feed";
-       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds";
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -74851,7 +73683,7 @@ self: {
          time time-locale-compat utf8-string xml
        ];
        homepage = "https://github.com/bergmark/feed";
-       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds";
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -74872,7 +73704,7 @@ self: {
          time time-locale-compat utf8-string xml
        ];
        homepage = "https://github.com/bergmark/feed";
-       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds";
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -74893,7 +73725,7 @@ self: {
          time time-locale-compat utf8-string xml
        ];
        homepage = "https://github.com/bergmark/feed";
-       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds";
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -74914,7 +73746,7 @@ self: {
          time time-locale-compat utf8-string xml
        ];
        homepage = "https://github.com/bergmark/feed";
-       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds";
+       description = "Interfacing with RSS (v 0.9x, 2.x, 1.0) + Atom feeds.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -74935,7 +73767,6 @@ self: {
        homepage = "http://www.syntaxpolice.org/darcs_repos/feed-cli";
        description = "A simple command line interface for creating and updating feeds like RSS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feed-collect" = callPackage
@@ -74954,7 +73785,6 @@ self: {
        homepage = "http://rel4tion.org/projects/feed-collect/";
        description = "Watch RSS/Atom feeds (and do with them whatever you like)";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feed-crawl" = callPackage
@@ -74996,7 +73826,6 @@ self: {
        homepage = "https://github.com/dahlia/feed-translator";
        description = "Translate syndication feeds";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feed2lj" = callPackage
@@ -75015,7 +73844,6 @@ self: {
        ];
        description = "(unsupported)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feed2twitter" = callPackage
@@ -75033,7 +73861,6 @@ self: {
        homepage = "http://github.com/tomlokhorst/feed2twitter";
        description = "Send posts from a feed to Twitter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feldspar-compiler" = callPackage
@@ -75061,7 +73888,6 @@ self: {
        homepage = "http://feldspar.github.com";
        description = "Compiler for the Feldspar language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gcc_s = null;};
 
   "feldspar-language" = callPackage
@@ -75087,7 +73913,6 @@ self: {
        homepage = "http://feldspar.github.com";
        description = "A functional embedded language for DSP and parallelism";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "feldspar-signal" = callPackage
@@ -75161,7 +73986,6 @@ self: {
        homepage = "http://fenfire.org/";
        description = "Graph-based notetaking system";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {raptor = null;};
 
   "fez-conf" = callPackage
@@ -75188,7 +74012,6 @@ self: {
        executableHaskellDepends = [ base pretty ];
        description = "Haskell binding to the FriendFeed API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fficxx" = callPackage
@@ -75244,7 +74067,6 @@ self: {
        ];
        description = "Minimal bindings to the FFmpeg library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) ffmpeg; libavcodec = null; libavdevice = null; 
          libavformat = null; libswscale = null;};
 
@@ -75264,7 +74086,6 @@ self: {
        homepage = "http://patch-tag.com/r/VasylPasternak/ffmpeg-tutorials";
        description = "Tutorials on ffmpeg usage to play video/audio";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fft_0_1_8_2" = callPackage
@@ -75435,7 +74256,6 @@ self: {
        homepage = "http://github.com/dmpots/fibon/wiki";
        description = "Tools for running and analyzing Haskell benchmarks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fibonacci" = callPackage
@@ -75464,7 +74284,6 @@ self: {
        homepage = "http://github.com/AstraFIN/fields";
        description = "First-class record field combinators with infix record field syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fields-json" = callPackage
@@ -75493,7 +74312,6 @@ self: {
        jailbreak = true;
        description = "Provides Fieldwise typeclass for operations of fields of records treated as independent components";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fig" = callPackage
@@ -75740,7 +74558,6 @@ self: {
        homepage = "https://github.com/gregwebs/FileLocation.hs";
        description = "common functions that show file location information";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "file-modules" = callPackage
@@ -75762,7 +74579,6 @@ self: {
        homepage = "https://github.com/yamadapc/stack-run-auto";
        description = "Takes a Haskell source-code file and outputs its modules";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "filecache" = callPackage
@@ -75939,7 +74755,6 @@ self: {
        homepage = "http://github.com/snoyberg/conduit";
        description = "Use system-filepath data types with conduits. (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "filesystem-enumerator" = callPackage
@@ -75956,7 +74771,6 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-filesystem/";
        description = "Enumerator-based API for manipulating the filesystem";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "filesystem-trees" = callPackage
@@ -76056,7 +74870,6 @@ self: {
        ];
        description = "A file-finding conduit that allows user control over traversals";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fingertree_0_1_0_0" = callPackage
@@ -76227,7 +75040,6 @@ self: {
        homepage = "http://www-users.cs.york.ac.uk/~ndm/firstify/";
        description = "Defunctionalisation for Yhc Core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fishfood" = callPackage
@@ -76250,7 +75062,6 @@ self: {
        homepage = "http://functionalley.eu";
        description = "Calculates file-size frequency-distribution";
        license = "GPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-darwin" ];
      }) {};
 
   "fit" = callPackage
@@ -76270,7 +75081,6 @@ self: {
        ];
        description = "FIT file decoder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fitsio" = callPackage
@@ -76284,7 +75094,6 @@ self: {
        homepage = "http://github.com/esessoms/fitsio";
        description = "A library for reading and writing data files in the FITS data format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) cfitsio;};
 
   "fix-imports" = callPackage
@@ -76315,7 +75124,6 @@ self: {
        libraryHaskellDepends = [ base mmtl ];
        description = "Simple fix-expression parser";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fix-symbols-gitit" = callPackage
@@ -76327,7 +75135,6 @@ self: {
        libraryHaskellDepends = [ base containers gitit ];
        description = "Gitit plugin: Turn some Haskell symbols into pretty math symbols";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixed_0_2_1" = callPackage
@@ -76404,7 +75211,6 @@ self: {
        jailbreak = true;
        description = "Binary fixed-point arithmetic";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixed-point-vector" = callPackage
@@ -76417,7 +75223,6 @@ self: {
        jailbreak = true;
        description = "Unbox instances for the fixed-point package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixed-point-vector-space" = callPackage
@@ -76430,7 +75235,6 @@ self: {
        jailbreak = true;
        description = "vector-space instances for the fixed-point package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixed-precision" = callPackage
@@ -76448,7 +75252,6 @@ self: {
        homepage = "http://github.com/ekmett/fixed-precision";
        description = "Fixed Precision Arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixed-storable-array" = callPackage
@@ -76459,9 +75262,8 @@ self: {
        sha256 = "f00a020ce3792737089cd7d544e0b35728c8c4d6f3b815fb6929742cb680656d";
        libraryHaskellDepends = [ array base tagged ];
        jailbreak = true;
-       description = "Fixed-size wrapper for StorableArray, providing a Storable instance. Deprecated - use storable-static-array instead";
+       description = "Fixed-size wrapper for StorableArray, providing a Storable instance. Deprecated - use storable-static-array instead.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fixed-vector_0_7_0_3" = callPackage
@@ -76792,7 +75594,7 @@ self: {
        libraryHaskellDepends = [ base bytestring unix-time ];
        jailbreak = true;
        homepage = "https://github.com/tattsun/flexible-time";
-       description = "simple extension of Data.UnixTime";
+       description = "simple extension of Data.UnixTime.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -76820,7 +75622,6 @@ self: {
        jailbreak = true;
        description = "Flexible wrappers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flexiwrap-smallcheck" = callPackage
@@ -76835,7 +75636,6 @@ self: {
        jailbreak = true;
        description = "SmallCheck (Serial) instances for flexiwrap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flickr" = callPackage
@@ -76854,7 +75654,6 @@ self: {
        executableHaskellDepends = [ xhtml ];
        description = "Haskell binding to the Flickr API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flippers" = callPackage
@@ -76886,7 +75685,6 @@ self: {
        homepage = "http://www.cs.york.ac.uk/fp/reduceron/";
        description = "f-lite compiler, interpreter and libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flo" = callPackage
@@ -76936,7 +75734,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Conversions between floating and integral values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "floatshow" = callPackage
@@ -77012,7 +75809,6 @@ self: {
        homepage = "http://adept.linux.kiev.ua:8080/repos/flow2dot";
        description = "Library and binary to generate sequence/flow diagrams from plain text source";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flowdock" = callPackage
@@ -77033,7 +75829,6 @@ self: {
        homepage = "https://github.com/brewtown/hs-flowdock";
        description = "Flowdock client library for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flowdock-api" = callPackage
@@ -77071,7 +75866,6 @@ self: {
        homepage = "https://github.com/gabemc/flowdock-api";
        description = "API integration with Flowdock";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flowdock-rest" = callPackage
@@ -77101,7 +75895,6 @@ self: {
        homepage = "https://github.com/futurice/haskell-flowdock-rest#readme";
        description = "Flowdock REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flower" = callPackage
@@ -77121,7 +75914,6 @@ self: {
        homepage = "http://biohaskell.org/Applications/Flower";
        description = "Analyze 454 flowgrams (.SFF files)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flowlocks-framework" = callPackage
@@ -77134,7 +75926,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Generalized Flow Locks Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "flowsim" = callPackage
@@ -77154,7 +75945,6 @@ self: {
        homepage = "http://biohaskell.org/Applications/FlowSim";
        description = "Simulate 454 pyrosequencing";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fltkhs" = callPackage
@@ -77163,8 +75953,8 @@ self: {
      }:
      mkDerivation {
        pname = "fltkhs";
-       version = "0.4.0.5";
-       sha256 = "ba70bc386ff0393e762e29b183fd12d1fcf3c8329343cd81adcab3f1d30aab75";
+       version = "0.4.0.6";
+       sha256 = "f449467e3094b719da3209b14330e7e57da5ced3c8bca8dd02c1cbac6f635684";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base bytestring ];
@@ -77188,7 +75978,7 @@ self: {
          base bytestring directory fltkhs process stm
        ];
        homepage = "http://github.com/deech/fltkhs-demos";
-       description = "FLTKHS demos. Please scroll to the bottom for more information";
+       description = "FLTKHS demos. Please scroll to the bottom for more information.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -77232,7 +76022,6 @@ self: {
        homepage = "http://github.com/deech/fltkhs-hello-world";
        description = "Fltkhs template project";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fluent-logger" = callPackage
@@ -77287,7 +76076,6 @@ self: {
        homepage = "https://github.com/MostAwesomeDude/hsfluidsynth";
        description = "Haskell bindings to FluidSynth";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) fluidsynth;};
 
   "fmark" = callPackage
@@ -77365,6 +76153,29 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
+  "fn_0_3_0_0" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring, directory
+     , filepath, hspec, http-types, text, unordered-containers, wai
+     , wai-extra
+     }:
+     mkDerivation {
+       pname = "fn";
+       version = "0.3.0.0";
+       sha256 = "f617f7dbd3ee30bdfdce1bcdd7637bfcaa276616c3958f15c84c58dc63b21ee5";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring directory filepath http-types text
+         unordered-containers wai wai-extra
+       ];
+       testHaskellDepends = [
+         base directory filepath hspec http-types text unordered-containers
+         wai wai-extra
+       ];
+       homepage = "http://github.com/dbp/fn#readme";
+       description = "A functional web framework";
+       license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "fn-extra_0_2_0_0" = callPackage
     ({ mkDerivation, base, blaze-builder, bytestring, either, fn, heist
      , http-types, lens, mtl, text, wai, wai-util, xmlhtml
@@ -77400,6 +76211,26 @@ self: {
        license = stdenv.lib.licenses.isc;
      }) {};
 
+  "fn-extra_0_3_0_0" = callPackage
+    ({ mkDerivation, base, blaze-builder, bytestring
+     , digestive-functors, directory, either, fn, heist, http-types
+     , lens, mtl, resourcet, text, wai, wai-extra, wai-util, xmlhtml
+     }:
+     mkDerivation {
+       pname = "fn-extra";
+       version = "0.3.0.0";
+       sha256 = "fbbc710d612c5fe0780e87a88a9aa70ad60208d4b2b8bdd42f7ecb8f0bfabb6b";
+       libraryHaskellDepends = [
+         base blaze-builder bytestring digestive-functors directory either
+         fn heist http-types lens mtl resourcet text wai wai-extra wai-util
+         xmlhtml
+       ];
+       homepage = "http://github.com/dbp/fn#readme";
+       description = "Extras for Fn, a functional web framework";
+       license = stdenv.lib.licenses.isc;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "focus_0_1_3" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -77441,7 +76272,6 @@ self: {
        homepage = "https://github.com/debug-ito/fold-debounce";
        description = "Fold multiple events that happen in a given period of time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "fold-debounce-conduit" = callPackage
@@ -77463,7 +76293,6 @@ self: {
        homepage = "https://github.com/debug-ito/fold-debounce-conduit";
        description = "Regulate input traffic from conduit Source with Control.FoldDebounce";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "foldl_1_0_7" = callPackage
@@ -77657,7 +76486,6 @@ self: {
        homepage = "https://github.com/tonyday567/foldl-incremental";
        description = "incremental folds";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foldl-transduce" = callPackage
@@ -77681,7 +76509,6 @@ self: {
        ];
        description = "Transducers for foldl folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foldl-transduce-attoparsec" = callPackage
@@ -77703,7 +76530,6 @@ self: {
        ];
        description = "Attoparsec and foldl-transduce integration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "folds" = callPackage
@@ -77729,7 +76555,6 @@ self: {
        homepage = "http://github.com/ekmett/folds";
        description = "Beautiful Folding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "folds-common" = callPackage
@@ -77743,7 +76568,6 @@ self: {
        testHaskellDepends = [ base containers tasty tasty-quickcheck ];
        description = "A playground of common folds for folds";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "follower" = callPackage
@@ -77763,7 +76587,6 @@ self: {
        homepage = "http://rebworks.net/projects/follower/";
        description = "Follow Tweets anonymously";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foma" = callPackage
@@ -77777,7 +76600,6 @@ self: {
        homepage = "http://github.com/joom/foma.hs";
        description = "Simple Haskell bindings for Foma";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {foma = null;};
 
   "font-opengl-basic4x6" = callPackage
@@ -77793,7 +76615,6 @@ self: {
        jailbreak = true;
        description = "Basic4x6 font for OpenGL";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foo" = callPackage
@@ -77810,7 +76631,6 @@ self: {
        homepage = "http://sourceforge.net/projects/fooengine/?abmode=1";
        description = "Paper soccer, an OpenGL game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "for-free" = callPackage
@@ -77828,7 +76648,6 @@ self: {
        jailbreak = true;
        description = "Functor, Monad, MonadPlus, etc for free";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "forbidden-fruit" = callPackage
@@ -77851,7 +76670,6 @@ self: {
        homepage = "http://github.com/minpou/forbidden-fruit";
        description = "A library accelerates imperative style programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "force-layout_0_3_0_8" = callPackage
@@ -77967,7 +76785,6 @@ self: {
        executableHaskellDepends = [ base process transformers ];
        description = "Run a command on files with magic substituion support (sequencing and regexp)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "forecast-io" = callPackage
@@ -77978,7 +76795,7 @@ self: {
        sha256 = "7ed54091d063fdf9ffca57c05a24769345b88a9e5bbb6c1f4037e01f70c69a9f";
        libraryHaskellDepends = [ aeson base text ];
        homepage = "https://github.com/stormont/forecast-io";
-       description = "A Haskell library for working with forecast.io data";
+       description = "A Haskell library for working with forecast.io data.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -78001,7 +76818,7 @@ self: {
        sha256 = "afd0ea51c6f8b012259411858c966d34dbcbd7c128b044313fc6843743d6f0dc";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/chrisdone/foreign-store";
-       description = "Store a stable pointer in a foreign context to be retrieved later. Persists through GHCi reloads";
+       description = "Store a stable pointer in a foreign context to be retrieved later. Persists through GHCi reloads.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -78096,7 +76913,6 @@ self: {
        jailbreak = true;
        description = "A statically typed, functional programming language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "format" = callPackage
@@ -78111,7 +76927,6 @@ self: {
        homepage = "https://github.com/bytbox/hs-format";
        description = "Rendering from and scanning to format strings";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "format-status" = callPackage
@@ -78130,7 +76945,6 @@ self: {
        jailbreak = true;
        description = "A utility for writing the date to dzen2";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "formattable" = callPackage
@@ -78249,7 +77063,6 @@ self: {
        homepage = "http://texodus.github.com/forml";
        description = "A statically typed, functional programming language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "formlets" = callPackage
@@ -78268,7 +77081,6 @@ self: {
        homepage = "http://github.com/chriseidhof/formlets/tree/master";
        description = "Formlets implemented in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "formlets-hsp" = callPackage
@@ -78285,7 +77097,6 @@ self: {
        libraryToolDepends = [ trhsx ];
        description = "HSP support for Formlets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "formura" = callPackage
@@ -78320,7 +77131,6 @@ self: {
        jailbreak = true;
        description = "A simple eDSL for generating arrayForth code";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "foscam-directory" = callPackage
@@ -78388,7 +77198,6 @@ self: {
        homepage = "https://github.com/tonymorris/foscam-sort";
        description = "Foscam File format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fountain" = callPackage
@@ -78476,7 +77285,6 @@ self: {
        homepage = "https://www.fpcomplete.com/page/api";
        description = "Simple interface to the FP Complete IDE API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fpipe" = callPackage
@@ -78523,7 +77331,6 @@ self: {
        ];
        description = "Example implementations for FPNLA library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fptest" = callPackage
@@ -78619,7 +77426,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Frag";
        description = "A 3-D First Person Shooter Game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "frame" = callPackage
@@ -78668,7 +77474,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A package for configuring and building Haskell software";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free_4_9" = callPackage
@@ -78800,7 +77605,6 @@ self: {
        homepage = "https://github.com/sjoerdvisscher/free-functors";
        description = "Free functors, adjoint to functors that forget class constraints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-game" = callPackage
@@ -78824,7 +77628,6 @@ self: {
        homepage = "https://github.com/fumieval/free-game";
        description = "Create games for free";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-http" = callPackage
@@ -78858,7 +77661,6 @@ self: {
        jailbreak = true;
        description = "Operational Applicative, Alternative, Monad and MonadPlus from free types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-theorems" = callPackage
@@ -78874,7 +77676,6 @@ self: {
        ];
        description = "Automatic generation of free theorems";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-theorems-counterexamples" = callPackage
@@ -78893,7 +77694,6 @@ self: {
        executableHaskellDepends = [ cgi free-theorems utf8-string xhtml ];
        description = "Automatically Generating Counterexamples to Naive Free Theorems";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-theorems-seq" = callPackage
@@ -78912,7 +77712,6 @@ self: {
        jailbreak = true;
        description = "Taming Selective Strictness";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-theorems-seq-webui" = callPackage
@@ -78931,7 +77730,6 @@ self: {
        ];
        description = "Taming Selective Strictness";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-theorems-webui" = callPackage
@@ -78950,7 +77748,6 @@ self: {
        ];
        description = "CGI-based web interface for the free-theorems package";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "free-vl" = callPackage
@@ -78990,7 +77787,6 @@ self: {
        homepage = "http://github.com/anttisalonen/freekick2";
        description = "A soccer game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "freenect_1_2" = callPackage
@@ -79024,7 +77820,6 @@ self: {
        homepage = "https://github.com/chrisdone/freenect";
        description = "Interface to the Kinect device";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) freenect; freenect_sync = null; 
          libfreenect = null;};
 
@@ -79046,7 +77841,6 @@ self: {
        homepage = "https://gitlab.com/cpp.cabrera/freer";
        description = "Implementation of the Freer Monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "freesect" = callPackage
@@ -79066,7 +77860,6 @@ self: {
        homepage = "http://fremissant.net/freesect";
        description = "A Haskell syntax extension for generalised sections";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "freesound" = callPackage
@@ -79089,7 +77882,6 @@ self: {
        homepage = "https://github.com/kaoskorobase/freesound";
        description = "Access the Freesound Project database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "freetype-simple" = callPackage
@@ -79185,7 +77977,6 @@ self: {
        homepage = "https://github.com/TomMD/friday-juicypixels";
        description = "Converts between the Friday and JuicyPixels image types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "friday-scale-dct" = callPackage
@@ -79269,7 +78060,6 @@ self: {
        homepage = "http://github.com/frp-arduino/frp-arduino";
        description = "Arduino programming without the hassle of C";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "frpnow" = callPackage
@@ -79297,7 +78087,6 @@ self: {
        homepage = "https://github.com/atzeus/FRPNow";
        description = "Program awesome stuff with Gloss and frpnow!";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "frpnow-gtk" = callPackage
@@ -79340,7 +78129,6 @@ self: {
        homepage = "http://github.com/nkpart/fs-events";
        description = "A haskell binding to the FSEvents API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fsharp" = callPackage
@@ -79368,7 +78156,6 @@ self: {
        homepage = "http://projects.haskell.org/fsmActions/";
        description = "Finite state machines and FSM actions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fsnotify_0_1_0_3" = callPackage
@@ -79468,7 +78255,6 @@ self: {
        homepage = "http://www.github.com/ehamberg/fswatcher/";
        description = "Watch a file/directory and run a command when it's modified";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ftdi" = callPackage
@@ -79487,7 +78273,6 @@ self: {
        jailbreak = true;
        description = "A thin layer over USB to communicate with FTDI chips";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ftp-conduit" = callPackage
@@ -79506,7 +78291,6 @@ self: {
        homepage = "https://github.com/litherum/ftp-conduit";
        description = "FTP client package with conduit interface based off http-conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ftphs" = callPackage
@@ -79555,7 +78339,6 @@ self: {
        jailbreak = true;
        description = "Shell interface to the FreeTheorems library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fugue" = callPackage
@@ -79579,7 +78362,6 @@ self: {
        homepage = "http://www.agusa.i.is.nagoya-u.ac.jp/person/sydney/full-sessions.html";
        description = "a monad for protocol-typed network programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "full-text-search" = callPackage
@@ -79600,7 +78382,6 @@ self: {
        jailbreak = true;
        description = "In-memory full text search engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fullstop" = callPackage
@@ -79622,7 +78403,6 @@ self: {
        homepage = "http://hub.darcs.net/kowey/fullstop";
        description = "Simple sentence segmenter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "funbot" = callPackage
@@ -79652,7 +78432,6 @@ self: {
        homepage = "https://notabug.org/fr33domlover/funbot";
        description = "IRC bot for fun, learning, creativity and collaboration";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "funbot-client" = callPackage
@@ -79751,7 +78530,6 @@ self: {
        libraryHaskellDepends = [ base data-type ];
        description = "Combining functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "function-instances-algebra" = callPackage
@@ -79777,7 +78555,6 @@ self: {
        jailbreak = true;
        description = "Combinators that allow for a more functional/monadic style of Arrow programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "functional-kmp" = callPackage
@@ -79828,7 +78605,7 @@ self: {
        sha256 = "fe01131dcef76a6a1e66424f12757e66724f24bed4c353d4beadf3890a0ef3c2";
        libraryHaskellDepends = [ base template-haskell ];
        homepage = "https://github.com/fmap/functor-infix";
-       description = "Infix operators for mapping over compositions of functors. Lots of them";
+       description = "Infix operators for mapping over compositions of functors. Lots of them.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -79852,7 +78629,7 @@ self: {
        sha256 = "a054cbd84686777774b9e2c36c1b5ceaf8ca415a9755e922ff52137eb9ac36ba";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "https://github.com/wdanilo/functor-utils";
-       description = "Collection of functor utilities, providing handy operators, like generalization of (.)";
+       description = "Collection of functor utilities, providing handy operators, like generalization of (.).";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -79865,7 +78642,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Data.FunctorM (compatibility package)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "functors" = callPackage
@@ -79876,7 +78652,7 @@ self: {
        sha256 = "e6b96554d59b924f9960677137f2d4bc2417bac29b87083390d0020b6397d659";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/aristidb/functors";
-       description = "(.:) and friends, syntax for Functor and Applicative";
+       description = "(.:) and friends, syntax for Functor and Applicative.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -79897,7 +78673,6 @@ self: {
        homepage = "http://github.com/nathanwiegand/funion";
        description = "A unioning file-system using HFuse";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "funpat" = callPackage
@@ -79933,7 +78708,6 @@ self: {
        homepage = "http://github.com/dbueno/funsat";
        description = "A modern DPLL-style SAT solver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fusion" = callPackage
@@ -79975,7 +78749,6 @@ self: {
        homepage = "http://hackage.haskell.org/cgi-bin/hackage-scripts/package/future";
        description = "Supposed to mimics and enhance proposed C++ \"future\" features";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "future-resource" = callPackage
@@ -80019,7 +78792,6 @@ self: {
        homepage = "http://github.com/joom/fuzzy";
        description = "Filters a list based on a fuzzy string search";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fuzzy-timings" = callPackage
@@ -80040,7 +78812,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/tlaitinen/fuzzy-timings";
-       description = "Translates high-level definitions of \"fuzzily\" scheduled objects (e.g. play this commercial 10 times per hour between 9:00-13:00) to a list of accurately scheduled objects using glpk-hs";
+       description = "Translates high-level definitions of \"fuzzily\" scheduled objects (e.g. play this commercial 10 times per hour between 9:00-13:00) to a list of accurately scheduled objects using glpk-hs.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -80058,7 +78830,6 @@ self: {
        ];
        description = "A 'ten past six' style clock";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "fwgl" = callPackage
@@ -80093,7 +78864,6 @@ self: {
        homepage = "https://github.com/ziocroc/FWGL";
        description = "FWGL GLFW backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "fwgl-javascript" = callPackage
@@ -80125,7 +78895,6 @@ self: {
        executableHaskellDepends = [ base HTTP json ];
        description = "Generate Gentoo ebuilds from NodeJS/npm packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gact" = callPackage
@@ -80143,7 +78912,6 @@ self: {
        ];
        description = "General Alignment Clustering Tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "game-of-life" = callPackage
@@ -80195,7 +78963,6 @@ self: {
        executableHaskellDepends = [ base cairo containers glib gtk time ];
        description = "Game clock that shows two analog clock faces";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gamma" = callPackage
@@ -80266,7 +79033,6 @@ self: {
        homepage = "http://www.daneel0yaitskov.000space.com";
        description = "planar graph embedding into a plane";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gc" = callPackage
@@ -80301,7 +79067,6 @@ self: {
        homepage = "https://github.com/yihuang/gc-monitoring-wai";
        description = "a wai application to show GHC.GCStats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gconf" = callPackage
@@ -80363,7 +79128,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics";
        description = "Generic diff for the instant-generics library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gdiff-th" = callPackage
@@ -80384,7 +79148,6 @@ self: {
        homepage = "https://github.com/jfischoff/gdiff-th";
        description = "Generate gdiff GADTs and Instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gdo" = callPackage
@@ -80418,7 +79181,6 @@ self: {
        homepage = "http://code.mathr.co.uk/gearbox";
        description = "zooming rotating fractal gears graphics demo";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geek" = callPackage
@@ -80440,7 +79202,6 @@ self: {
        homepage = "http://github.com/nfjinjing/geek";
        description = "Geek blog engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geek-server" = callPackage
@@ -80464,7 +79225,6 @@ self: {
        homepage = "http://github.com/nfjinjing/geek";
        description = "Geek blog engine server";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gelatin" = callPackage
@@ -80488,7 +79248,6 @@ self: {
        ];
        description = "An experimental real time renderer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gemstone" = callPackage
@@ -80508,7 +79267,6 @@ self: {
        homepage = "http://corbinsimpson.com/";
        description = "A simple library of helpers for SDL+GL games";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gencheck" = callPackage
@@ -80526,7 +79284,6 @@ self: {
        homepage = "http://github.com/JacquesCarette/GenCheck";
        description = "A testing framework inspired by QuickCheck and SmallCheck";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gender" = callPackage
@@ -80543,7 +79300,6 @@ self: {
        homepage = "https://github.com/womfoo/gender";
        description = "Identify a persons gender by their first name";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genders" = callPackage
@@ -80559,7 +79315,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec network vector ];
        description = "Bindings to libgenders";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {genders = null;};
 
   "general-prelude" = callPackage
@@ -80574,7 +79329,6 @@ self: {
        ];
        description = "Prelude replacement using generalized type classes where possible";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generator" = callPackage
@@ -80600,7 +79354,6 @@ self: {
        homepage = "http://liamoc.net/pdf/Generator.pdf";
        description = "Actually useful monadic random value generators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-accessors" = callPackage
@@ -80719,7 +79472,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "generic-aeson" = callPackage
+  "generic-aeson_0_2_0_7" = callPackage
     ({ mkDerivation, aeson, attoparsec, base, generic-deriving, mtl
      , tagged, text, unordered-containers, vector
      }:
@@ -80735,6 +79488,23 @@ self: {
        ];
        description = "Derivation of Aeson instances using GHC generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "generic-aeson" = callPackage
+    ({ mkDerivation, aeson, attoparsec, base, generic-deriving, mtl
+     , tagged, text, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "generic-aeson";
+       version = "0.2.0.8";
+       sha256 = "de29fa648b9eb6c9e678b0715a530efaf70aac8f1ad8becc22d7ef1411ded5cb";
+       libraryHaskellDepends = [
+         aeson attoparsec base generic-deriving mtl tagged text
+         unordered-containers vector
+       ];
+       description = "Derivation of Aeson instances using GHC generics";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "generic-binary" = callPackage
@@ -80745,7 +79515,7 @@ self: {
        sha256 = "49c00e6cbe0d54fe72db40fedd92978833e78f5a0d0e26eb192194c14cd1ddc0";
        libraryHaskellDepends = [ base binary bytestring ghc-prim ];
        jailbreak = true;
-       description = "Generic Data.Binary derivation using GHC generics";
+       description = "Generic Data.Binary derivation using GHC generics.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -80762,7 +79532,6 @@ self: {
        ];
        description = "Automatically convert Generic instances to and from church representations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-deepseq" = callPackage
@@ -80823,8 +79592,8 @@ self: {
     ({ mkDerivation, base, containers, ghc-prim, template-haskell }:
      mkDerivation {
        pname = "generic-deriving";
-       version = "1.10.3";
-       sha256 = "fc1aed27f229434aaf2cd3d83c201a12108cd9a23023ff6edcb037c0775c0024";
+       version = "1.10.4";
+       sha256 = "42581dce497a8f7867f07465659098b8a3ef75e50bc7e5c6ce16341ca40fdbb0";
        libraryHaskellDepends = [
          base containers ghc-prim template-haskell
        ];
@@ -80907,7 +79676,6 @@ self: {
        jailbreak = true;
        description = "Generic implementation of Storable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-tree" = callPackage
@@ -80945,7 +79713,6 @@ self: {
        ];
        description = "Marshalling Haskell values to/from XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "generic-xmlpickler_0_1_0_0" = callPackage
@@ -81004,7 +79771,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "generic-xmlpickler" = callPackage
+  "generic-xmlpickler_0_1_0_4" = callPackage
     ({ mkDerivation, base, generic-deriving, hxt, hxt-pickle-utils
      , tasty, tasty-hunit, tasty-th, text
      }:
@@ -81021,6 +79788,24 @@ self: {
        homepage = "http://github.com/silkapp/generic-xmlpickler";
        description = "Generic generation of HXT XmlPickler instances using GHC Generics";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "generic-xmlpickler" = callPackage
+    ({ mkDerivation, base, generic-deriving, hxt, hxt-pickle-utils
+     , tasty, tasty-hunit, tasty-th, text
+     }:
+     mkDerivation {
+       pname = "generic-xmlpickler";
+       version = "0.1.0.5";
+       sha256 = "d51760f5650051eebe561f2b18670657e8398014fa2a623c0e0169bfeca336af";
+       libraryHaskellDepends = [ base generic-deriving hxt text ];
+       testHaskellDepends = [
+         base hxt hxt-pickle-utils tasty tasty-hunit tasty-th
+       ];
+       homepage = "http://github.com/silkapp/generic-xmlpickler";
+       description = "Generic generation of HXT XmlPickler instances using GHC Generics";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "generics-eot" = callPackage
@@ -81139,7 +79924,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Serialization library using Data.Generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genetics" = callPackage
@@ -81153,7 +79937,6 @@ self: {
        executableHaskellDepends = [ base random-fu ];
        description = "A Genetic Algorithm library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geni-gui" = callPackage
@@ -81176,7 +79959,6 @@ self: {
        homepage = "http://projects.haskell.org/GenI";
        description = "GenI graphical user interface";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geni-util" = callPackage
@@ -81201,7 +79983,6 @@ self: {
        homepage = "http://kowey.github.io/GenI";
        description = "Companion tools for use with the GenI surface realiser";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geniconvert" = callPackage
@@ -81222,7 +80003,6 @@ self: {
        homepage = "http://wiki.loria.fr/wiki/GenI";
        description = "Conversion utility for the GenI generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genifunctors" = callPackage
@@ -81295,7 +80075,6 @@ self: {
        jailbreak = true;
        description = "Simple HTTP server for GenI results";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "genprog" = callPackage
@@ -81346,7 +80125,6 @@ self: {
        homepage = "https://github.com/markenwerk/haskell-geo-resolver/";
        description = "Performs geo location lookups and parses the results";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "geo-uk" = callPackage
@@ -81452,7 +80230,6 @@ self: {
        ];
        description = "Pure haskell interface to MaxMind GeoIP database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "geojson" = callPackage
@@ -81488,7 +80265,6 @@ self: {
        jailbreak = true;
        description = "package for geometry in euklidean 2d space";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "getemx" = callPackage
@@ -81508,7 +80284,6 @@ self: {
        homepage = "http://bitbucket.org/kenko/getemx";
        description = "Fetch from emusic using .emx files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "getflag" = callPackage
@@ -81520,7 +80295,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Command-line parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "getopt-generics_0_10_0_1" = callPackage
@@ -81575,7 +80349,7 @@ self: {
        sha256 = "f79efd9bef4e4f0ce678fdaaf99ca3f1f70f2dc815c16439d9f97e399805c4dd";
        libraryHaskellDepends = [ base containers ];
        homepage = "https://bitbucket.org/dpwiz/getopt-simple";
-       description = "A \"System.Console.GetOpt\" wrapper to make simple use case easy";
+       description = "A \"System.Console.GetOpt\" wrapper to make simple use case easy.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -81624,9 +80398,8 @@ self: {
        isExecutable = true;
        executableHaskellDepends = [ base containers parsec ];
        homepage = "http://a319-101.ipm.edu.mo/~wke/ggts/impl/";
-       description = "A type checker and runtime system of rCOS/g (impl. of ggts-FCS)";
+       description = "A type checker and runtime system of rCOS/g (impl. of ggts-FCS).";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-core" = callPackage
@@ -81710,7 +80483,6 @@ self: {
        jailbreak = true;
        description = "Explicitly prevent sharing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-events" = callPackage
@@ -81778,7 +80550,6 @@ self: {
        ];
        description = "Library and tool for parsing .eventlog files from parallel GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-exactprint" = callPackage
@@ -81800,7 +80571,6 @@ self: {
        ];
        description = "ExactPrint for GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "ghc-gc-tune" = callPackage
@@ -82130,7 +80900,6 @@ self: {
        homepage = "https://github.com/23Skidoo/ghc-parmake";
        description = "A parallel wrapper for 'ghc --make'";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-parser_0_1_7_0" = callPackage
@@ -82187,7 +80956,6 @@ self: {
        jailbreak = true;
        description = "Simple utility to fix BROKEN package dependencies for cabal-install";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-pkg-lib" = callPackage
@@ -82227,7 +80995,7 @@ self: {
        isExecutable = true;
        libraryHaskellDepends = [ base ];
        executableHaskellDepends = [ base ];
-       description = "Generates data to be used with flamegraph.pl from .prof files";
+       description = "Generates data to be used with flamegraph.pl from .prof files.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -82322,7 +81090,6 @@ self: {
        homepage = "http://github.com/nominolo/ghc-syb";
        description = "Data and Typeable instances for the GHC API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghc-syb-utils_0_2_2" = callPackage
@@ -82512,7 +81279,6 @@ self: {
        jailbreak = true;
        description = "Display simple diagrams from ghci";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghci-haskeline" = callPackage
@@ -82533,7 +81299,6 @@ self: {
        homepage = "http://code.haskell.org/~judah/ghci-haskeline";
        description = "An implementation of ghci using the Haskeline line-input library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghci-lib" = callPackage
@@ -82705,6 +81470,34 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "ghcid_0_5_1" = callPackage
+    ({ mkDerivation, ansi-terminal, base, cmdargs, containers
+     , directory, extra, filepath, fsnotify, process, tasty, tasty-hunit
+     , terminal-size, time
+     }:
+     mkDerivation {
+       pname = "ghcid";
+       version = "0.5.1";
+       sha256 = "7fb7bfa501f121418ab8fda46ded58703173b5e1b5aae5dc3433322d19636353";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base cmdargs directory extra filepath process terminal-size time
+       ];
+       executableHaskellDepends = [
+         ansi-terminal base cmdargs containers directory extra filepath
+         fsnotify process terminal-size time
+       ];
+       testHaskellDepends = [
+         ansi-terminal base cmdargs containers directory extra filepath
+         fsnotify process tasty tasty-hunit terminal-size time
+       ];
+       homepage = "https://github.com/ndmitchell/ghcid#readme";
+       description = "GHCi based bare bones IDE";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "ghcjs-codemirror" = callPackage
     ({ mkDerivation, base }:
      mkDerivation {
@@ -82786,7 +81579,6 @@ self: {
        homepage = "http://github.com/shapr/ghclive/";
        description = "Interactive Haskell interpreter in a browser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ghczdecode" = callPackage
@@ -82824,7 +81616,6 @@ self: {
        ];
        description = "Trivial routines for inspecting git repositories";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gi-atk" = callPackage
@@ -82860,7 +81651,6 @@ 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;};
 
   "gi-gdk" = callPackage
@@ -82880,7 +81670,6 @@ 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-gdkpixbuf" = callPackage
@@ -82991,7 +81780,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Gtk bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk3 = pkgs.gnome2.gtk;};
 
   "gi-javascriptcore" = callPackage
@@ -83009,7 +81797,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "JavaScriptCore bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {javascriptcoregtk = null;};
 
   "gi-notify" = callPackage
@@ -83083,7 +81870,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Soup bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome) libsoup;};
 
   "gi-vte" = callPackage
@@ -83103,7 +81889,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "Vte bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome) vte;};
 
   "gi-webkit" = callPackage
@@ -83126,7 +81911,6 @@ self: {
        homepage = "https://github.com/haskell-gi/haskell-gi";
        description = "WebKit bindings";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) webkit;};
 
   "gi-webkit2" = callPackage
@@ -83147,7 +81931,6 @@ 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
@@ -83188,8 +81971,8 @@ self: {
      }:
      mkDerivation {
        pname = "ginger";
-       version = "0.1.3.0";
-       sha256 = "445dc1d5e65d36a7e7d0cef19c2787da93910dfeb4db7496e9268af9ef176e9c";
+       version = "0.1.5.0";
+       sha256 = "3bce9121a6a351288878839c4dc189dca3e178e89ebe2c9b717bdb54808c361a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -83432,7 +82215,6 @@ self: {
        homepage = "http://github.com/simonmichael/gist";
        description = "A reliable command-line client for gist.github.com";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-all" = callPackage
@@ -83452,7 +82234,6 @@ self: {
        homepage = "https://github.com/jwiegley/git-all";
        description = "Determine which Git repositories need actions to be taken";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-annex_5_20150727" = callPackage
@@ -83677,8 +82458,8 @@ self: {
      }:
      mkDerivation {
        pname = "git-annex";
-       version = "6.20160211";
-       sha256 = "0a7d2dab17df27c06a935c469ced47a68d3c018cbb9254c9a735b584d413fb42";
+       version = "6.20160229";
+       sha256 = "1eac609eeedbf01cf088461577b478a3aa99f7ecefa668214308e3b5509c1506";
        configureFlags = [
          "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns"
          "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3"
@@ -83737,7 +82518,6 @@ self: {
        homepage = "https://github.com/dougalstanton/git-checklist";
        description = "Maintain per-branch checklists in Git";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-date" = callPackage
@@ -83756,7 +82536,6 @@ self: {
        homepage = "https://github.com/singpolyma/git-date-haskell";
        description = "Bindings to the date parsing from Git";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-embed" = callPackage
@@ -83838,7 +82617,6 @@ self: {
        homepage = "http://github.com/jwiegley/gitlib";
        description = "More intelligent push-to-GitHub utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-jump" = callPackage
@@ -83916,7 +82694,6 @@ self: {
        homepage = "http://git-repair.branchable.com/";
        description = "repairs a damanged git repisitory";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "git-sanity" = callPackage
@@ -84026,7 +82803,6 @@ self: {
        homepage = "https://github.com/mattyhall/gitdo";
        description = "Create Github issues out of TODO comments in code";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "github_0_14_0" = callPackage
@@ -84213,7 +82989,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/relrod/gitignore";
-       description = "Apply GitHub .gitignore templates to already existing repositories";
+       description = "Apply GitHub .gitignore templates to already existing repositories.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -84359,7 +83135,6 @@ self: {
        ];
        description = "Run tests between repositories";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitlib-libgit2_3_1_0_3" = callPackage
@@ -84503,7 +83278,6 @@ self: {
        ];
        description = "Gitlib repository backend for storing Git objects in Amazon S3";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitlib-sample" = callPackage
@@ -84572,7 +83346,6 @@ self: {
        ];
        description = "Generic utility functions for working with Git repositories";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gitrev_1_0_0" = callPackage
@@ -84823,7 +83596,6 @@ self: {
        libraryHaskellDepends = [ base bytestring OpenGL ];
        description = "simple image capture from OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "glade" = callPackage
@@ -84839,7 +83611,6 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the glade library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome) libglade;};
 
   "gladexml-accessor" = callPackage
@@ -84851,7 +83622,6 @@ self: {
        libraryHaskellDepends = [ base glade HaXml template-haskell ];
        description = "Automagically declares getters for widget handles in specified interface file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glambda" = callPackage
@@ -84895,7 +83665,6 @@ self: {
        homepage = "zyghost.com";
        description = "An OpenGL micro framework";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "glasso" = callPackage
@@ -85044,7 +83813,6 @@ self: {
        testHaskellDepends = [ base data-default hspec lens QuickCheck ];
        description = "Glicko-2 implementation in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glider-nlp" = callPackage
@@ -85059,7 +83827,6 @@ self: {
        homepage = "https://github.com/klangner/glider-nlp";
        description = "Natural Language Processing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "glintcollider" = callPackage
@@ -85105,7 +83872,6 @@ self: {
        homepage = "https://github.com/bairyn/global";
        description = "Library enabling unique top-level declarations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "global-config" = callPackage
@@ -85175,7 +83941,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Glome";
        description = "ray tracer";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss_1_9_2_1" = callPackage
@@ -85211,7 +83976,6 @@ self: {
        homepage = "http://gloss.ouroborus.net";
        description = "Painless 2D vector graphics, animations and simulations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss-accelerate" = callPackage
@@ -85225,7 +83989,6 @@ self: {
        libraryHaskellDepends = [ accelerate base gloss gloss-rendering ];
        description = "Extras to interface Gloss and Accelerate";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss-algorithms" = callPackage
@@ -85238,7 +84001,6 @@ self: {
        homepage = "http://gloss.ouroborus.net";
        description = "Data structures and algorithms for working with 2D graphics";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss-banana" = callPackage
@@ -85254,7 +84016,6 @@ self: {
        homepage = "https://github.com/Twey/gloss-banana";
        description = "An Interface for gloss in terms of a reactive-banana Behavior";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-devil" = callPackage
@@ -85266,7 +84027,6 @@ self: {
        libraryHaskellDepends = [ base bytestring gloss repa repa-devil ];
        description = "Display images in Gloss using libdevil for decoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gloss-examples" = callPackage
@@ -85289,7 +84049,6 @@ self: {
        homepage = "http://gloss.ouroborus.net";
        description = "Examples using the gloss library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss-game" = callPackage
@@ -85302,7 +84061,6 @@ self: {
        homepage = "https://github.com/mchakravarty/gloss-game";
        description = "Gloss wrapper that simplifies writing games";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss-juicy" = callPackage
@@ -85323,7 +84081,6 @@ self: {
        homepage = "http://github.com/alpmestan/gloss-juicy";
        description = "Load any image supported by Juicy.Pixels in your gloss application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss-raster" = callPackage
@@ -85340,7 +84097,6 @@ self: {
        homepage = "http://gloss.ouroborus.net";
        description = "Parallel rendering of raster images";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss-raster-accelerate" = callPackage
@@ -85371,7 +84127,6 @@ self: {
        jailbreak = true;
        description = "Gloss picture data types and rendering functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gloss-sodium" = callPackage
@@ -85385,7 +84140,6 @@ self: {
        homepage = "https://github.com/Twey/gloss-sodium";
        description = "A Sodium interface to the Gloss drawing package";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "glpk-hs" = callPackage
@@ -85528,7 +84282,6 @@ self: {
        ];
        description = "turtle like LOGO with glut";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "gmap" = callPackage
@@ -85544,7 +84297,6 @@ self: {
        ];
        description = "Composable maps and generic tries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gmndl" = callPackage
@@ -85564,7 +84316,6 @@ self: {
        jailbreak = true;
        description = "Mandelbrot Set explorer using GTK";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gnome-desktop" = callPackage
@@ -85580,7 +84331,6 @@ self: {
        ];
        description = "Randomly set a picture as the GNOME desktop background";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gnome-keyring" = callPackage
@@ -85597,7 +84347,6 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-gnome-keyring/";
        description = "Bindings for libgnome-keyring";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome) gnome_keyring;};
 
   "gnomevfs" = callPackage
@@ -85617,7 +84366,6 @@ self: {
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Binding to the GNOME Virtual File System library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome) gnome_vfs; gnome_vfs_module = null;};
 
   "gnss-converters" = callPackage
@@ -85641,7 +84389,6 @@ self: {
        homepage = "http://github.com/swift-nav/gnss-converters";
        description = "GNSS Converters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gnuidn_0_2_1" = callPackage
@@ -85729,7 +84476,6 @@ self: {
        libraryHaskellDepends = [ base directory filepath process ];
        description = "GHCi bindings to lambdabot";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "goal-core" = callPackage
@@ -85747,6 +84493,7 @@ self: {
          data-default-class gtk lens
        ];
        executableHaskellDepends = [ base ];
+       jailbreak = true;
        description = "Core imports for Geometric Optimization Libraries";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -85805,7 +84552,6 @@ self: {
        ];
        description = "Mealy based simulation tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "goatee" = callPackage
@@ -85859,7 +84605,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/gofer-prelude";
        description = "The Gofer 2.30 standard prelude";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gogol" = callPackage
@@ -87032,7 +85777,6 @@ self: {
        jailbreak = true;
        description = "Google HTML5 Slide generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-mail-filters" = callPackage
@@ -87050,7 +85794,6 @@ self: {
        homepage = "https://github.com/liyang/google-mail-filters";
        description = "Write GMail filters and output to importable XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-oauth2" = callPackage
@@ -87082,7 +85825,6 @@ self: {
        homepage = "https://github.com/liyang/google-search";
        description = "EDSL for Google and GMail search expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "google-translate" = callPackage
@@ -87117,7 +85859,6 @@ self: {
        homepage = "http://github.com/michaelxavier/GooglePlus";
        description = "Haskell implementation of the Google+ API v1";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "googlepolyline" = callPackage
@@ -87155,7 +85896,6 @@ self: {
        ];
        description = "Spidering robot to download files from Gopherspace";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gore-and-ash" = callPackage
@@ -87360,7 +86100,6 @@ self: {
        ];
        description = "Generic Programming Use in Hackage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gpcsets" = callPackage
@@ -87404,7 +86143,6 @@ self: {
        ];
        description = "For manipulating GPS coordinates and trails";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gps2htmlReport" = callPackage
@@ -87427,7 +86165,6 @@ self: {
        homepage = "https://github.com/robstewart57/Gps2HtmlReport";
        description = "GPS to HTML Summary Report";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gpx-conduit" = callPackage
@@ -87445,7 +86182,6 @@ self: {
        jailbreak = true;
        description = "Read GPX files using conduits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graceful" = callPackage
@@ -87480,7 +86216,6 @@ self: {
        homepage = "http://projects.haskell.org/grammar-combinators/";
        description = "A parsing library of context-free grammar combinators";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grapefruit-examples" = callPackage
@@ -87498,7 +86233,6 @@ self: {
        homepage = "http://grapefruit-project.org/";
        description = "Examples using the Grapefruit library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grapefruit-frp" = callPackage
@@ -87516,7 +86250,6 @@ self: {
        homepage = "http://grapefruit-project.org/";
        description = "Functional Reactive Programming core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grapefruit-records" = callPackage
@@ -87529,7 +86262,6 @@ self: {
        homepage = "http://grapefruit-project.org/";
        description = "A record system for Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grapefruit-ui" = callPackage
@@ -87547,7 +86279,6 @@ self: {
        homepage = "http://grapefruit-project.org/";
        description = "Declarative user interface programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "grapefruit-ui-gtk" = callPackage
@@ -87566,7 +86297,6 @@ self: {
        homepage = "http://grapefruit-project.org/";
        description = "GTK+-based backend for declarative user interface programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-core_0_2_1_0" = callPackage
@@ -87688,7 +86418,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Monadic graph rewriting of hypergraphs with ports and multiedges";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-cl" = callPackage
@@ -87709,7 +86438,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Interactive graph rewriting system implementing various well-known combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-gl" = callPackage
@@ -87727,7 +86455,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "OpenGL interface for interactive port graph rewriting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-lambdascope" = callPackage
@@ -87749,7 +86476,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Lambdascope, an optimal evaluator of the lambda calculus, as an interactive graph-rewriting system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-layout" = callPackage
@@ -87766,7 +86492,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Force-directed node placement intended for incremental graph drawing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-ski" = callPackage
@@ -87786,7 +86511,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Two evalutors of the SKI combinator calculus as interactive graph rewrite systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-strategies" = callPackage
@@ -87803,7 +86527,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Evaluation strategies for port-graph rewriting systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-trs" = callPackage
@@ -87825,7 +86548,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Evaluate first-order applicative term rewrite systems interactively using graph reduction";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-rewriting-ww" = callPackage
@@ -87846,7 +86568,6 @@ self: {
        homepage = "http://rochel.info/#graph-rewriting";
        description = "Evaluator of the lambda-calculus in an interactive graph rewriting system with explicit sharing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-serialize" = callPackage
@@ -87876,7 +86597,6 @@ self: {
        homepage = "http://github.com/konn/graph-utils/";
        description = "A simple wrapper & quasi quoter for fgl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graph-visit" = callPackage
@@ -87929,7 +86649,6 @@ self: {
        homepage = "https://github.com/tel/graphbuilder";
        description = "A declarative, monadic graph construction language for small graphs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphene" = callPackage
@@ -87967,7 +86686,6 @@ self: {
        homepage = "http://github.com/luqui/graphics-drawingcombinators";
        description = "A functional interface to 2D drawing in OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "graphics-formats-collada" = callPackage
@@ -87985,7 +86703,6 @@ self: {
        homepage = "http://github.com/luqui/collada";
        description = "Load 3D geometry in the COLLADA format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphicsFormats" = callPackage
@@ -87997,7 +86714,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 OpenGL QuickCheck ];
        description = "Classes for renderable objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphicstools" = callPackage
@@ -88017,7 +86733,6 @@ self: {
        homepage = "https://yousource.it.jyu.fi/cvlab/pages/GraphicsTools";
        description = "Tools for creating graphical UIs, based on wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphmod" = callPackage
@@ -88114,7 +86829,6 @@ self: {
        homepage = "http://github.com/explicitcall/graphtype";
        description = "A simple tool to illustrate dependencies between Haskell types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "graphviz_2999_17_0_1" = callPackage
@@ -88292,6 +87006,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "graylog" = callPackage
+    ({ mkDerivation, aeson, aeson-casing, base, bytestring, file-embed
+     , network, random, scientific, tasty, tasty-hunit, text, time
+     , vector
+     }:
+     mkDerivation {
+       pname = "graylog";
+       version = "0.1.0.1";
+       sha256 = "2d8173e61da8d02c39cb95e6ccea8a167c792f682a496aed5fe4edfd0e6a0082";
+       libraryHaskellDepends = [
+         aeson aeson-casing base bytestring network random scientific text
+         time vector
+       ];
+       testHaskellDepends = [
+         aeson aeson-casing base bytestring file-embed network scientific
+         tasty tasty-hunit text time vector
+       ];
+       homepage = "https://github.com/AndrewRademacher/haskell-graylog";
+       description = "Support for graylog output";
+       license = "unknown";
+     }) {};
+
   "greencard" = callPackage
     ({ mkDerivation, array, base, containers, pretty }:
      mkDerivation {
@@ -88305,7 +87041,6 @@ self: {
        homepage = "https://github.com/sof/greencard";
        description = "GreenCard, a foreign function pre-processor for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "greencard-lib" = callPackage
@@ -88318,7 +87053,6 @@ self: {
        homepage = "http://www.haskell.org/greencard/";
        description = "A foreign function interface pre-processor library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "greg-client" = callPackage
@@ -88335,7 +87069,6 @@ self: {
        homepage = "http://code.google.com/p/greg/";
        description = "A scalable distributed logger with a high-precision global time axis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gremlin-haskell" = callPackage
@@ -88360,7 +87093,6 @@ self: {
        homepage = "http://github.com/nakaji-dayo/gremlin-haskell";
        description = "Graph database client for TinkerPop3 Gremlin Server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "greplicate" = callPackage
@@ -88432,7 +87164,6 @@ self: {
        ];
        description = "Grid-based multimedia engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "grm" = callPackage
@@ -88454,7 +87185,6 @@ self: {
        executableToolDepends = [ happy ];
        description = "grm grammar converter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "groom" = callPackage
@@ -88780,7 +87510,7 @@ self: {
        libraryHaskellDepends = [ base containers deepseq pointed ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
-       description = "Grouped lists. Equal consecutive elements are grouped";
+       description = "Grouped lists. Equal consecutive elements are grouped.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -88796,7 +87526,7 @@ self: {
        libraryHaskellDepends = [ base containers deepseq pointed ];
        testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ];
        homepage = "https://github.com/Daniel-Diaz/grouped-list/blob/master/README.md";
-       description = "Grouped lists. Equal consecutive elements are grouped";
+       description = "Grouped lists. Equal consecutive elements are grouped.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -88879,7 +87609,6 @@ self: {
        jailbreak = true;
        description = "fractal explorer GUI using the ruff library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gruff-examples" = callPackage
@@ -88899,7 +87628,6 @@ self: {
        jailbreak = true;
        description = "Mandelbrot Set examples using ruff and gruff";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gsasl" = callPackage
@@ -88937,7 +87665,6 @@ self: {
        homepage = "http://github.com/patperry/hs-gsl-random";
        description = "Bindings the the GSL random number generation facilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gsl-random-fu" = callPackage
@@ -88950,7 +87677,6 @@ self: {
        homepage = "http://code.haskell.org/~mokus/gsl-random-fu";
        description = "Instances for using gsl-random with random-fu";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gsmenu" = callPackage
@@ -88970,7 +87696,6 @@ self: {
        homepage = "http://sigkill.dk/programs/gsmenu";
        description = "A visual generic menu";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gstreamer" = callPackage
@@ -88990,7 +87715,6 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GStreamer open source multimedia framework";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gst_plugins_base; inherit (pkgs) gstreamer;};
 
   "gt-tools" = callPackage
@@ -89024,7 +87748,6 @@ self: {
        ];
        description = "The General Transit Feed Specification format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk_0_13_3" = callPackage
@@ -89226,7 +87949,6 @@ self: {
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk-mac-integration-gtk2 = null;};
 
   "gtk-serialized-event" = callPackage
@@ -89245,7 +87967,6 @@ self: {
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "GTK+ Serialized event";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gdk2 = null;};
 
   "gtk-simple-list-view" = callPackage
@@ -89282,7 +88003,6 @@ self: {
        jailbreak = true;
        description = "Convenient Gtk canvas with mouse and keyboard input";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk-traymanager" = callPackage
@@ -89373,7 +88093,6 @@ self: {
        ];
        description = "A type class for cast functions of Gtk2hs: glade package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-glib" = callPackage
@@ -89400,7 +88119,6 @@ self: {
        ];
        description = "A type class for cast functions of Gtk2hs: gnomevfs package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-gtk" = callPackage
@@ -89416,7 +88134,6 @@ self: {
        ];
        description = "A type class for cast functions of Gtk2hs: gtk package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-gtkglext" = callPackage
@@ -89432,7 +88149,6 @@ self: {
        ];
        description = "A type class for cast functions of Gtk2hs: gtkglext package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk2hs-cast-gtksourceview2" = callPackage
@@ -89487,7 +88203,6 @@ self: {
        jailbreak = true;
        description = "Adds a module to gtk2hs allowing layouts to be defined using reverse polish notation";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtk3_0_13_4" = callPackage
@@ -89713,7 +88428,6 @@ self: {
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gtk-mac-integration-gtk3 = null;};
 
   "gtkglext" = callPackage
@@ -89731,7 +88445,6 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the GTK+ OpenGL Extension";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome) gtkglext;};
 
   "gtkimageview" = callPackage
@@ -89751,7 +88464,6 @@ self: {
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Binding to the GtkImageView library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gtkimageview;};
 
   "gtkrsync" = callPackage
@@ -89770,7 +88482,6 @@ self: {
        homepage = "http://hg.complete.org/gtkrsync";
        description = "Gnome rsync progress display";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gtksourceview2" = callPackage
@@ -89832,7 +88543,6 @@ self: {
        homepage = "http://code.atnnn.com/project/guess";
        description = "Generate simple combinators given their type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "gulcii" = callPackage
@@ -89897,7 +88607,6 @@ self: {
        homepage = "https://github.com/Fuuzetsu/h-booru";
        description = "Haskell library for retrieving data from various booru image sites";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "h-gpgme" = callPackage
@@ -89919,7 +88628,6 @@ self: {
        jailbreak = true;
        homepage = "https://github.com/rethab/h-gpgme";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "h2048" = callPackage
@@ -89984,7 +88692,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An FFI binding to CMU/Long's BDD library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {bdd = null; mem = null;};
 
   "hBDD-CUDD" = callPackage
@@ -90000,7 +88707,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An FFI binding to the CUDD library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {cudd = null; epd = null; inherit (pkgs) mtr; 
          inherit (pkgs) st; util = null;};
 
@@ -90018,7 +88724,6 @@ self: {
        jailbreak = true;
        description = "interface to CSound API";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {csound64 = null; inherit (pkgs) libsndfile;};
 
   "hDFA" = callPackage
@@ -90030,7 +88735,6 @@ self: {
        libraryHaskellDepends = [ base containers directory process ];
        description = "A simple library for representing and minimising DFAs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hF2" = callPackage
@@ -90042,7 +88746,6 @@ self: {
        libraryHaskellDepends = [ base cereal vector ];
        description = "F(2^e) math for cryptography";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hGelf" = callPackage
@@ -90102,7 +88805,6 @@ self: {
        homepage = "http://github.com/itkovian/hMollom";
        description = "Library to interact with the @Mollom anti-spam service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hOpenPGP_1_11" = callPackage
@@ -90307,7 +89009,6 @@ self: {
        homepage = "http://floss.scru.org/hOpenPGP/";
        description = "native Haskell implementation of OpenPGP (RFC4880)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hPDB_1_2_0" = callPackage
@@ -90484,7 +89185,6 @@ self: {
        homepage = "https://github.com/BioHaskell/hPDB-examples";
        description = "Examples for hPDB library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hPushover" = callPackage
@@ -90513,7 +89213,6 @@ self: {
        libraryHaskellDepends = [ array base containers unix ];
        description = "R bindings and interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hRESP" = callPackage
@@ -90579,7 +89278,6 @@ self: {
        jailbreak = true;
        description = "Interface to Amazon's SimpleDB service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hTalos" = callPackage
@@ -90594,7 +89292,6 @@ self: {
        homepage = "https://github.com/mgajda/hTalos";
        description = "Parser, print and manipulate structures in PDB file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hTensor" = callPackage
@@ -90622,7 +89319,6 @@ self: {
        homepage = "http://dslsrv4.cs.missouri.edu/~qqbm9";
        description = "Optimal variable selection in chain graphical model";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) blas; inherit (pkgs) liblapack;};
 
   "hXmixer" = callPackage
@@ -90658,7 +89354,6 @@ self: {
        homepage = "https://github.com/mhwombat/haar";
        description = "Haar wavelet transforms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hacanon-light" = callPackage
@@ -90701,7 +89396,6 @@ self: {
        homepage = "http://github.com/nfjinjing/hack-contrib";
        description = "Hack contrib";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack-contrib-press" = callPackage
@@ -90719,7 +89413,6 @@ self: {
        homepage = "http://github.com/bickfordb/hack-contrib-press";
        description = "Hack helper that renders Press templates";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack-frontend-happstack" = callPackage
@@ -90737,7 +89430,6 @@ self: {
        homepage = "http://github.com/nfjinjing/hack/tree/master";
        description = "hack-frontend-happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack-frontend-monadcgi" = callPackage
@@ -90781,7 +89473,6 @@ self: {
        homepage = "https://gitlab.com/twittner/hack-handler-epoll";
        description = "hack handler implementation using epoll";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack-handler-evhttp" = callPackage
@@ -90800,7 +89491,6 @@ self: {
        homepage = "http://github.com/bickfordb/hack-handler-evhttp";
        description = "Hack EvHTTP (libevent) Handler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {event = null;};
 
   "hack-handler-fastcgi" = callPackage
@@ -90815,7 +89505,6 @@ self: {
        homepage = "http://github.com/snoyberg/hack-handler-fastcgi/tree/master";
        description = "Hack handler direct to fastcgi (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) fcgi;};
 
   "hack-handler-happstack" = callPackage
@@ -90833,7 +89522,6 @@ self: {
        homepage = "http://github.com/nfjinjing/hack-handler-happstack";
        description = "Hack Happstack server handler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack-handler-hyena" = callPackage
@@ -90850,7 +89538,6 @@ self: {
        homepage = "http://github.com/nfjinjing/hack-handler-hyena";
        description = "Hyena hack handler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack-handler-kibro" = callPackage
@@ -90865,7 +89552,6 @@ self: {
        homepage = "http://github.com/nfjinjing/hack/tree/master";
        description = "Hack Kibro handler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack-handler-simpleserver" = callPackage
@@ -90883,7 +89569,6 @@ self: {
        homepage = "http://github.com/snoyberg/hack-handler-simpleserver/tree/master";
        description = "A simplistic HTTP server handler for Hack. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack-middleware-cleanpath" = callPackage
@@ -90898,7 +89583,6 @@ self: {
        homepage = "http://github.com/snoyberg/hack-middleware-cleanpath/tree/master";
        description = "Applies some basic redirect rules to get cleaner paths. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack-middleware-clientsession" = callPackage
@@ -90915,7 +89599,6 @@ self: {
        homepage = "http://github.com/snoyberg/hack-middleware-clientsession/tree/master";
        description = "Middleware for easily keeping session data in client cookies. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack-middleware-gzip" = callPackage
@@ -90944,7 +89627,6 @@ self: {
        homepage = "http://github.com/snoyberg/hack-middleware-jsonp/tree/master";
        description = "Automatic wrapping of JSON responses to convert into JSONP. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack2" = callPackage
@@ -91010,7 +89692,6 @@ self: {
        homepage = "https://github.com/nfjinjing/hack2-handler-happstack-server";
        description = "Hack2 Happstack server handler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack2-handler-mongrel2-http" = callPackage
@@ -91031,7 +89712,6 @@ self: {
        homepage = "https://github.com/nfjinjing/hack2-handler-mongrel2-http";
        description = "Hack2 Mongrel2 HTTP handler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack2-handler-snap-server" = callPackage
@@ -91067,7 +89747,6 @@ self: {
        homepage = "https://github.com/nfjinjing/hack2-handler-warp";
        description = "Hack2 warp handler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hack2-interface-wai" = callPackage
@@ -91086,7 +89765,6 @@ self: {
        homepage = "https://github.com/nfjinjing/hack2-interface-wai";
        description = "Hack2 interface of WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-db" = callPackage
@@ -91233,7 +89911,6 @@ self: {
        homepage = "http://github.com/snoyberg/hackage-proxy";
        description = "Provide a proxy for Hackage which modifies responses in some way. (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-repo-tool" = callPackage
@@ -91256,7 +89933,6 @@ self: {
        homepage = "https://github.com/well-typed/hackage-security";
        description = "Utility to manage secure file-based package repositories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-security" = callPackage
@@ -91283,7 +89959,6 @@ self: {
        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
@@ -91301,7 +89976,6 @@ self: {
        homepage = "https://github.com/well-typed/hackage-security";
        description = "Hackage security bindings against the HTTP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-server" = callPackage
@@ -91340,7 +90014,6 @@ self: {
        jailbreak = true;
        description = "The Hackage web server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-sparks" = callPackage
@@ -91360,7 +90033,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/hackage-sparks";
        description = "Generate sparkline graphs of hackage statistics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage-whatsnew" = callPackage
@@ -91393,7 +90065,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/hackage2hwn";
        description = "Convert Hackage RSS feeds to wiki format for publishing on Haskell.org";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackage2twitter" = callPackage
@@ -91408,7 +90079,6 @@ self: {
        homepage = "http://github.com/tomlokhorst/hackage2twitter";
        description = "Send new Hackage releases to Twitter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackager" = callPackage
@@ -91445,7 +90115,6 @@ self: {
        testHaskellDepends = [ base hspec transformers ];
        description = "API for Hacker News";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hackertyper" = callPackage
@@ -91508,7 +90177,6 @@ self: {
        ];
        description = "Hackage and Portage integration tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hactor" = callPackage
@@ -91527,7 +90195,6 @@ self: {
        homepage = "https://github.com/Forkk/hactor";
        description = "Lightweight Erlang-style actors for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hactors" = callPackage
@@ -91656,7 +90323,6 @@ self: {
        homepage = "http://www.haskell.org/haddock/";
        description = "A documentation-generation tool for Haskell libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haddock-library_1_1_1" = callPackage
@@ -91831,7 +90497,6 @@ self: {
        homepage = "http://github.com/tych0/haggis";
        description = "A static site generator with blogging/comments support";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haha" = callPackage
@@ -91885,7 +90550,6 @@ self: {
        ];
        description = "A typed template engine, subset of jinja2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hailgun" = callPackage
@@ -92010,7 +90674,6 @@ self: {
        homepage = "https://github.com/tfausak/hairy";
        description = "A JSON REST API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakaru" = callPackage
@@ -92041,7 +90704,6 @@ self: {
        homepage = "http://indiana.edu/~ppaml/";
        description = "A probabilistic programming embedded DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hake" = callPackage
@@ -92072,7 +90734,6 @@ self: {
        homepage = "https://code.reaktor42.de/projects/hakismet";
        description = "Akismet spam protection library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hako" = callPackage
@@ -92523,7 +91184,6 @@ self: {
        jailbreak = true;
        description = "A package allowing to write Hakyll blog posts in Rmd";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-agda" = callPackage
@@ -92554,7 +91214,6 @@ self: {
        jailbreak = true;
        description = "Blaze templates for Hakyll";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-contrib" = callPackage
@@ -92571,7 +91230,6 @@ self: {
        homepage = "http://jaspervdj.be/hakyll";
        description = "Extra modules for the hakyll website compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-contrib-hyphenation" = callPackage
@@ -92605,7 +91263,6 @@ self: {
        jailbreak = true;
        description = "A hakyll library that helps maintain a separate links database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-convert" = callPackage
@@ -92627,7 +91284,6 @@ self: {
        homepage = "http://github.com/kowey/hakyll-convert";
        description = "Convert from other blog engines to Hakyll";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hakyll-elm" = callPackage
@@ -92706,7 +91362,6 @@ self: {
        homepage = "http://github.com/haskell-suite/halberd/";
        description = "A tool to generate missing import statements for Haskell modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "half_0_2_0_1" = callPackage
@@ -92784,7 +91439,6 @@ self: {
        jailbreak = true;
        description = "The HAskelL File System (\"halfs\" -- intended for use on the HaLVM)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "halipeto" = callPackage
@@ -92798,7 +91452,6 @@ self: {
        homepage = "http://github.com/peti/halipeto";
        description = "Haskell Static Web Page Generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "halive" = callPackage
@@ -92906,7 +91559,6 @@ self: {
        jailbreak = true;
        description = "Haskell macro preprocessor";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hamtmap" = callPackage
@@ -92919,7 +91571,6 @@ self: {
        homepage = "https://github.com/exclipy/pdata";
        description = "A purely functional and persistent hash map";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hamusic" = callPackage
@@ -92941,7 +91592,6 @@ self: {
        homepage = "https://troglodita.di.uminho.pt/svn/musica/work/HaMusic";
        description = "Library to handle abstract music";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "handa-gdata" = callPackage
@@ -93042,7 +91692,6 @@ self: {
        homepage = "https://github.com/utdemir/handsy";
        description = "A DSL to describe common shell operations and interpeters for running them locally and remotely";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hangman" = callPackage
@@ -93077,7 +91726,6 @@ self: {
        jailbreak = true;
        description = "Simple Continuous Integration/Deployment System";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hans" = callPackage
@@ -93144,7 +91792,6 @@ self: {
        ];
        description = "Graphviz code generation with Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hapistrano" = callPackage
@@ -93187,7 +91834,6 @@ self: {
        jailbreak = true;
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {appindicator = null;};
 
   "happindicator3" = callPackage
@@ -93205,7 +91851,6 @@ self: {
        homepage = "https://github.com/mlacorte/happindicator3";
        description = "Binding to the appindicator library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {appindicator = null;};
 
   "happraise" = callPackage
@@ -93219,7 +91864,6 @@ self: {
        executableHaskellDepends = [ base directory filepath ];
        description = "A small program for counting the comments in haskell source";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happs-hsp" = callPackage
@@ -93233,7 +91877,6 @@ self: {
          base bytestring HAppS-Server hsp mtl plugins
        ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happs-hsp-template" = callPackage
@@ -93250,7 +91893,6 @@ self: {
        ];
        description = "Utilities for using HSP templates in HAppS applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happs-tutorial" = callPackage
@@ -93274,9 +91916,8 @@ self: {
          syb
        ];
        jailbreak = true;
-       description = "A Happstack Tutorial that is its own web 2.0-type demo";
+       description = "A Happstack Tutorial that is its own web 2.0-type demo.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack" = callPackage
@@ -93313,7 +91954,6 @@ self: {
        homepage = "http://n-sch.de/happstack-auth";
        description = "A Happstack Authentication Suite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-authenticate_2_3_2" = callPackage
@@ -93444,7 +92084,6 @@ self: {
        homepage = "http://happstack.com";
        description = "Web related tools and services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-data" = callPackage
@@ -93468,7 +92107,6 @@ self: {
        homepage = "http://happstack.com";
        description = "Happstack data manipulation libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-dlg" = callPackage
@@ -93487,7 +92125,6 @@ self: {
        homepage = "http://patch-tag.com/r/cdsmith/happstack-dlg";
        description = "Cross-request user interactions for Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-facebook" = callPackage
@@ -93515,7 +92152,6 @@ self: {
        homepage = "http://src.seereason.com/happstack-facebook/";
        description = "A package for building Facebook applications using Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-fastcgi" = callPackage
@@ -93549,7 +92185,6 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "Support for using Fay with Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-fay-ajax" = callPackage
@@ -93614,7 +92249,6 @@ self: {
        homepage = "http://www.happstack.com/";
        description = "Support for using Heist templates in Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-helpers" = callPackage
@@ -93640,7 +92274,6 @@ self: {
        homepage = "http://patch-tag.com/r/tphyahoo/HAppSHelpers/home";
        description = "Convenience functions for Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-hsp" = callPackage
@@ -93695,7 +92328,6 @@ self: {
        homepage = "http://happstack.com";
        description = "Efficient relational queries on Haskell sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-jmacro" = callPackage
@@ -93743,7 +92375,6 @@ self: {
        ];
        description = "monad-peel instances for Happstack types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-plugins" = callPackage
@@ -93761,7 +92392,6 @@ self: {
        homepage = "http://happstack.com";
        description = "The haskell application server stack + reload";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-server_7_3_9" = callPackage
@@ -94007,7 +92637,6 @@ self: {
        homepage = "http://happstack.com";
        description = "Event-based distributed state";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-static-routing" = callPackage
@@ -94047,7 +92676,6 @@ self: {
        homepage = "http://happstack.com";
        description = "Web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happstack-yui" = callPackage
@@ -94070,7 +92698,6 @@ self: {
        homepage = "http://hub.darcs.net/dag/yui/browse/happstack-yui";
        description = "Utilities for using YUI3 with Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happy_1_19_4" = callPackage
@@ -94142,7 +92769,6 @@ self: {
        homepage = "https://github.com/cstrahan/happybara";
        description = "Acceptance test framework for web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happybara-webkit" = callPackage
@@ -94164,7 +92790,6 @@ self: {
        homepage = "https://github.com/cstrahan/happybara/happybara-webkit";
        description = "WebKit Happybara driver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "happybara-webkit-server" = callPackage
@@ -94178,7 +92803,6 @@ self: {
        homepage = "https://github.com/cstrahan/happybara/happybara-webkit-server";
        description = "WebKit Server binary for Happybara (taken from capybara-webkit)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "har" = callPackage
@@ -94214,7 +92838,6 @@ self: {
        homepage = "http://www.davidb.org/darcs/harchive/";
        description = "Networked content addressed backup and restore software";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl; inherit (pkgs) sqlite;};
 
   "hardware-edsl" = callPackage
@@ -94232,7 +92855,6 @@ self: {
        homepage = "https://github.com/markus-git/hardware-edsl";
        description = "Deep embedding of hardware descriptions with code generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hark" = callPackage
@@ -94252,7 +92874,6 @@ self: {
        homepage = "http://code.google.com/p/hark/";
        description = "A Gentoo package query tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "harmony" = callPackage
@@ -94277,7 +92898,6 @@ self: {
        ];
        description = "A web service specification compiler that generates implementation and tests";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haroonga" = callPackage
@@ -94294,7 +92914,6 @@ self: {
        libraryPkgconfigDepends = [ groonga ];
        description = "Low level bindings for Groonga";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {groonga = null;};
 
   "haroonga-httpd" = callPackage
@@ -94314,7 +92933,6 @@ self: {
        jailbreak = true;
        description = "Yet another Groonga http server";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "harp" = callPackage
@@ -94358,7 +92976,6 @@ self: {
        homepage = "http://github.com/nonowarn/has";
        description = "Entity based records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "has-th" = callPackage
@@ -94371,7 +92988,6 @@ self: {
        homepage = "http://github.com/chrisdone/has-th";
        description = "Template Haskell function for Has records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hascal" = callPackage
@@ -94389,7 +93005,6 @@ self: {
        homepage = "http://darcsden.com/mekeor/hascal";
        description = "A minimalistic but extensible and precise calculator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hascat" = callPackage
@@ -94409,7 +93024,6 @@ self: {
        jailbreak = true;
        description = "Hascat Web Server";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hascat-lib" = callPackage
@@ -94428,7 +93042,6 @@ self: {
        jailbreak = true;
        description = "Hascat Package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hascat-setup" = callPackage
@@ -94450,7 +93063,6 @@ self: {
        doHaddock = false;
        description = "Hascat Installation helper";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hascat-system" = callPackage
@@ -94468,7 +93080,6 @@ self: {
        jailbreak = true;
        description = "Hascat System Package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hash" = callPackage
@@ -94489,7 +93100,6 @@ self: {
        homepage = "http://github.com/analytics/hash/";
        description = "Hashing tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashable_1_2_3_0" = callPackage
@@ -94704,9 +93314,8 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/wowus/hashable-generics";
-       description = "Automatically generates Hashable instances with GHC.Generics";
+       description = "Automatically generates Hashable instances with GHC.Generics.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashable-time" = callPackage
@@ -94755,7 +93364,6 @@ self: {
        ];
        description = "Hashed file storage support code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashids" = callPackage
@@ -94769,7 +93377,6 @@ self: {
        homepage = "http://hashids.org/";
        description = "Hashids generates short, unique, non-sequential ids from numbers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hashmap" = callPackage
@@ -94887,7 +93494,6 @@ self: {
        homepage = "http://huygens.functor.nl/hasim/";
        description = "Process-Based Discrete Event Simulation library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hask" = callPackage
@@ -94906,7 +93512,6 @@ self: {
        homepage = "http://github.com/ekmett/hask";
        description = "Categories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hask-home" = callPackage
@@ -94926,7 +93531,6 @@ self: {
        homepage = "http://gregheartsfield.com/hask-home";
        description = "Generate homepages for cabal packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskades" = callPackage
@@ -94966,7 +93570,6 @@ self: {
        homepage = "http://github.com/cosbynator/haskakafka";
        description = "Kafka bindings for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) rdkafka;};
 
   "haskanoid" = callPackage
@@ -94986,7 +93589,6 @@ self: {
        homepage = "http://github.com/ivanperez-keera/haskanoid";
        description = "A breakout game written in Yampa using SDL";
        license = "unknown";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "haskarrow" = callPackage
@@ -95004,7 +93606,6 @@ self: {
        ];
        description = "A dialect of haskell with order of execution based on dependency resolution";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskbot-core" = callPackage
@@ -95091,7 +93692,6 @@ self: {
        homepage = "http://www.korgwal.com/haskeem/";
        description = "A small scheme interpreter";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskeline_0_7_2_1" = callPackage
@@ -95143,7 +93743,6 @@ self: {
        homepage = "http://community.haskell.org/~aslatter/code/haskeline-class";
        description = "Class interface for working with Haskeline";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-aliyun" = callPackage
@@ -95167,7 +93766,6 @@ self: {
        homepage = "https://github.com/yihuang/haskell-aliyun/";
        description = "haskell client of aliyun service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-awk" = callPackage
@@ -95198,7 +93796,6 @@ self: {
        ];
        description = "Transform text from the command-line using Haskell expressions";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-bcrypt" = callPackage
@@ -95212,7 +93809,6 @@ self: {
        homepage = "http://www.github.com/zbskii/haskell-bcrypt";
        description = "A bcrypt implementation for haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-brainfuck" = callPackage
@@ -95233,7 +93829,6 @@ self: {
        jailbreak = true;
        description = "BrainFuck interpreter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-cnc" = callPackage
@@ -95255,7 +93850,6 @@ self: {
        homepage = "http://software.intel.com/en-us/articles/intel-concurrent-collections-for-cc/";
        description = "Library for parallel programming in the Intel Concurrent Collections paradigm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-coffee" = callPackage
@@ -95298,7 +93892,6 @@ self: {
        jailbreak = true;
        description = "Small modules for a Haskell course in which Haskell is taught by implementing Prelude functionality";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-docs" = callPackage
@@ -95365,7 +93958,6 @@ self: {
        homepage = "https://github.com/evolutics/haskell-formatter";
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-ftp" = callPackage
@@ -95394,7 +93986,6 @@ self: {
        homepage = "https://github.com/yihuang/haskell-ftp";
        description = "A Haskell ftp server with configurable backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-generate" = callPackage
@@ -95412,7 +94003,6 @@ self: {
        homepage = "http://github.com/bennofs/haskell-generate/";
        description = "Typesafe generation of haskell source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-gi" = callPackage
@@ -95487,7 +94077,6 @@ self: {
        homepage = "http://www.informatik.uni-bremen.de/~cxl/lehre/pi3.ws01/asteroids/";
        description = "'Asteroids' arcade games";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-kubernetes" = callPackage
@@ -95687,7 +94276,6 @@ self: {
        homepage = "http://documentup.com/haskell-suite/haskell-names";
        description = "Name resolution library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-neo4j-client_0_3_1_4" = callPackage
@@ -95800,7 +94388,6 @@ self: {
        homepage = "https://github.com/brooksbp/haskell-openflow";
        description = "OpenFlow protocol in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-packages_0_2_4_3" = callPackage
@@ -95887,7 +94474,6 @@ self: {
        homepage = "http://michaeldadams.org/projects/haskell-pdf-presenter/";
        description = "Tool for presenting PDF-based presentations";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-platform-test" = callPackage
@@ -95918,7 +94504,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/haskell-platform-test";
        description = "A test system for the Haskell Platform environment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-plot" = callPackage
@@ -95936,7 +94521,6 @@ self: {
        homepage = "https://github.com/kaizhang/haskell-plot";
        description = "A library for generating 2D plots painlessly";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-qrencode" = callPackage
@@ -95979,7 +94563,6 @@ self: {
        ];
        description = "Reflect Haskell types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-rules" = callPackage
@@ -95991,7 +94574,6 @@ self: {
        libraryHaskellDepends = [ base syb ];
        description = "A DSL for expressing natural deduction rules in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-spacegoo" = callPackage
@@ -96234,7 +94816,6 @@ self: {
        jailbreak = true;
        description = "Parse source to template-haskell abstract syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-token-utils" = callPackage
@@ -96260,7 +94841,6 @@ self: {
        homepage = "https://github.com/alanz/haskell-token-utils";
        description = "Utilities to tie up tokens to an AST";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-tor" = callPackage
@@ -96296,7 +94876,6 @@ self: {
        homepage = "http://github.com/GaloisInc/haskell-tor";
        description = "A Haskell Tor Node";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-type-exts" = callPackage
@@ -96311,7 +94890,6 @@ self: {
        homepage = "http://code.haskell.org/haskell-type-exts";
        description = "A type checker for Haskell/haskell-src-exts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-typescript" = callPackage
@@ -96336,7 +94914,6 @@ self: {
        homepage = "https://github.com/PeterScott/haskell-tyrant";
        description = "Haskell implementation of the Tokyo Tyrant binary protocol";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell-updater" = callPackage
@@ -96374,7 +94951,6 @@ self: {
        homepage = "http://patch-tag.com/r/adept/haskell-xmpp/home";
        description = "Haskell XMPP (eXtensible Message Passing Protocol, a.k.a. Jabber) library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell2010" = callPackage
@@ -96388,7 +94964,6 @@ self: {
        homepage = "http://www.haskell.org/onlinereport/haskell2010/";
        description = "Compatibility with Haskell 2010";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell98" = callPackage
@@ -96406,7 +94981,6 @@ self: {
        homepage = "http://www.haskell.org/definition/";
        description = "Compatibility with Haskell 98";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskell98libraries" = callPackage
@@ -96452,7 +95026,6 @@ self: {
        homepage = "http://twitter.com/khibino";
        description = "Bracketed HDBC session for HaskellDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-connect-hdbc-catchio-mtl" = callPackage
@@ -96469,7 +95042,6 @@ self: {
        homepage = "http://twitter.com/khibino";
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-mtl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-connect-hdbc-catchio-tf" = callPackage
@@ -96487,7 +95059,6 @@ self: {
        homepage = "http://twitter.com/khibino";
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-connect-hdbc-catchio-transformers" = callPackage
@@ -96505,7 +95076,6 @@ self: {
        homepage = "http://twitter.com/khibino";
        description = "Bracketed HaskellDB HDBC session using MonadCatchIO-transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-connect-hdbc-lifted" = callPackage
@@ -96523,7 +95093,6 @@ self: {
        homepage = "http://twitter.com/khibino";
        description = "Bracketed HaskellDB HDBC session using lifted-base";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-dynamic" = callPackage
@@ -96540,7 +95109,6 @@ self: {
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the dynamically loaded drivers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-flat" = callPackage
@@ -96594,7 +95162,6 @@ self: {
        jailbreak = true;
        description = "HaskellDB support for the HDBC MySQL driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-hdbc-odbc" = callPackage
@@ -96663,7 +95230,6 @@ self: {
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for HSQL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-hsql-mysql" = callPackage
@@ -96683,7 +95249,6 @@ self: {
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HSQL MySQL driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-hsql-odbc" = callPackage
@@ -96703,7 +95268,6 @@ self: {
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HSQL ODBC driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-hsql-oracle" = callPackage
@@ -96743,7 +95307,6 @@ self: {
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HSQL PostgreSQL driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-hsql-sqlite" = callPackage
@@ -96783,7 +95346,6 @@ self: {
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for the HSQL SQLite3 driver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskelldb-th" = callPackage
@@ -96808,7 +95370,6 @@ self: {
        homepage = "https://github.com/m4dc4p/haskelldb";
        description = "HaskellDB support for WXHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskellscrabble" = callPackage
@@ -96819,8 +95380,8 @@ self: {
      }:
      mkDerivation {
        pname = "haskellscrabble";
-       version = "2.0.1";
-       sha256 = "514e4af38a6e889532437fcfad09479c247e0097c01f5f01295b01beda4596e4";
+       version = "2.2.1";
+       sha256 = "2a3ce64f81105d0ff7d728bce181665edddbec3432eefbebd4bc4b58f2412361";
        libraryHaskellDepends = [
          array arrows base containers errors listsafe mtl parsec QuickCheck
          random safe semigroups split transformers unordered-containers
@@ -96834,7 +95395,6 @@ self: {
        homepage = "http://www.github.com/happy0/haskellscrabble";
        description = "A scrabble library capturing the core game logic of scrabble";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskellscript" = callPackage
@@ -96898,7 +95458,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/HaskGame";
        description = "Haskell game library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskheap" = callPackage
@@ -96917,7 +95476,6 @@ self: {
        homepage = "https://github.com/Raynes/haskheap";
        description = "Haskell bindings to refheap";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskhol-core" = callPackage
@@ -96938,7 +95496,6 @@ self: {
        homepage = "http://haskhol.org";
        description = "The core logical system of HaskHOL, an EDSL for HOL theorem proving";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskintex_0_5_0_2" = callPackage
@@ -97069,7 +95626,6 @@ self: {
        homepage = "http://github.com/haskoin/haskoin";
        description = "Implementation of the Bitcoin protocol";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-core" = callPackage
@@ -97099,7 +95655,6 @@ self: {
        homepage = "http://github.com/haskoin/haskoin";
        description = "Implementation of the core Bitcoin protocol features";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-crypto" = callPackage
@@ -97124,7 +95679,6 @@ self: {
        homepage = "http://github.com/plaprade/haskoin-crypto";
        description = "Implementation of Bitcoin cryptographic primitives";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-node" = callPackage
@@ -97155,7 +95709,6 @@ self: {
        homepage = "http://github.com/haskoin/haskoin";
        description = "Implementation of a Bitoin node";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-protocol" = callPackage
@@ -97178,7 +95731,6 @@ self: {
        homepage = "http://github.com/plaprade/haskoin-protocol";
        description = "Implementation of the Bitcoin network protocol messages";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-script" = callPackage
@@ -97203,7 +95755,6 @@ self: {
        homepage = "http://github.com/plaprade/haskoin-script";
        description = "Implementation of Bitcoin script parsing and evaluation";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-util" = callPackage
@@ -97226,7 +95777,6 @@ self: {
        homepage = "http://github.com/plaprade/haskoin-util";
        description = "Utility functions for the Network.Haskoin project";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoin-wallet" = callPackage
@@ -97267,7 +95817,6 @@ self: {
        homepage = "http://github.com/haskoin/haskoin";
        description = "Implementation of a Bitcoin SPV Wallet with BIP32 and multisig support";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoon" = callPackage
@@ -97285,7 +95834,6 @@ self: {
        ];
        description = "Web Application Abstraction";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoon-httpspec" = callPackage
@@ -97301,7 +95849,6 @@ self: {
        ];
        description = "Integrating HttpSpec with Haskoon";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskoon-salvia" = callPackage
@@ -97319,7 +95866,6 @@ self: {
        ];
        description = "Integrating HttpSpec with Haskoon";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskore" = callPackage
@@ -97345,7 +95891,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Haskore";
        description = "The Haskore Computer Music System";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskore-realtime" = callPackage
@@ -97364,7 +95909,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Haskore/";
        description = "Routines for realtime playback of Haskore songs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskore-supercollider" = callPackage
@@ -97388,7 +95932,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/SuperCollider";
        description = "Haskore back-end for SuperCollider";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskore-synthesizer" = callPackage
@@ -97410,7 +95953,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Music rendering coded in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haskore-vintage" = callPackage
@@ -97456,7 +95998,6 @@ self: {
        executableHaskellDepends = [ mtl old-time QuickCheck time wtk ];
        description = "Loan calculator engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasloGUI" = callPackage
@@ -97473,9 +96014,8 @@ self: {
          base convertible gtk haslo lenses mtl old-time QuickCheck time wtk
          wtk-gtk
        ];
-       description = "Loan calculator Gtk GUI. Based on haslo (Haskell Loan) library";
+       description = "Loan calculator Gtk GUI. Based on haslo (Haskell Loan) library.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasparql-client" = callPackage
@@ -97488,7 +96028,6 @@ self: {
        homepage = "https://github.com/lhpaladin/HaSparql-Client";
        description = "This package enables to write SPARQL queries to remote endpoints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haspell" = callPackage
@@ -98031,7 +96570,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql-pool";
        description = "A pool of connections for Hasql";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-postgres_0_7_3" = callPackage
@@ -98353,7 +96891,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql-postgres";
        description = "A \"PostgreSQL\" backend for the \"hasql\" library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-postgres-options" = callPackage
@@ -98370,7 +96907,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql-postgres-options";
        description = "An \"optparse-applicative\" parser for \"hasql-postgres\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-th" = callPackage
@@ -98387,7 +96923,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql-th";
        description = "Template Haskell utilities for Hasql";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hasql-transaction" = callPackage
@@ -98408,7 +96943,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/hasql-transaction";
        description = "A composable abstraction over the retryable transactions for Hasql";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hastache_0_6_0" = callPackage
@@ -98507,8 +97041,8 @@ self: {
      }:
      mkDerivation {
        pname = "haste-compiler";
-       version = "0.5.4";
-       sha256 = "4018bf4abf3ece8ee577ae5983cac0b016ae96098c704aeecd9698365c3a021e";
+       version = "0.5.4.1";
+       sha256 = "e10aa93a2a0507301d984f2e446ac12250a769a7142ad3a68a65108824ae1bf8";
        configureFlags = [ "-fportable" ];
        isLibrary = true;
        isExecutable = true;
@@ -98555,7 +97089,6 @@ self: {
        homepage = "https://github.com/agocorona/haste-perch";
        description = "Create, navigate and modify the DOM tree with composable syntax, with the haste compiler";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hastily" = callPackage
@@ -98622,7 +97155,6 @@ self: {
        homepage = "http://projects.haskell.org/hat/";
        description = "The Haskell tracer, generating and viewing Haskell execution traces";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hatex-guide" = callPackage
@@ -98639,7 +97171,6 @@ self: {
        ];
        description = "HaTeX User's Guide";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hath" = callPackage
@@ -98710,7 +97241,6 @@ self: {
        jailbreak = true;
        description = "Implementation of the rules of Love Letter";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hawitter" = callPackage
@@ -98730,9 +97260,8 @@ self: {
          regex-tdfa SHA time utf8-string
        ];
        homepage = "http://d.hatena.ne.jp/xanxys/20100321/1269137834";
-       description = "A twitter client for GTK+. Beta version";
+       description = "A twitter client for GTK+. Beta version.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haxl" = callPackage
@@ -98828,7 +97357,6 @@ self: {
        homepage = "https://github.com/joelteon/haxparse";
        description = "Readable HaxBall replays";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "haxr_3000_10_3_1" = callPackage
@@ -98990,7 +97518,6 @@ self: {
        jailbreak = true;
        description = "Haskell bindings for the C Wayland library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mesa; inherit (pkgs) wayland;};
 
   "hayoo-cli" = callPackage
@@ -99011,7 +97538,6 @@ self: {
        homepage = "https://github.com/Gonzih/hayoo-cli";
        description = "Hayoo CLI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hback" = callPackage
@@ -99030,7 +97556,6 @@ self: {
        homepage = "http://hback.googlecode.com/";
        description = "N-back memory game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hbayes" = callPackage
@@ -99052,7 +97577,6 @@ self: {
        homepage = "http://www.alpheccar.org";
        description = "Bayesian Networks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hbb" = callPackage
@@ -99071,7 +97595,6 @@ self: {
        homepage = "https://bitbucket.org/bhris/hbb";
        description = "Haskell Busy Bee, a backend for text editors";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hbcd" = callPackage
@@ -99118,7 +97641,6 @@ self: {
        homepage = "http://www.dockerz.net/software/hbeat.html";
        description = "A simple step sequencer GUI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL_mixer;};
 
   "hblas" = callPackage
@@ -99138,7 +97660,6 @@ self: {
        homepage = "http://github.com/wellposed/hblas/";
        description = "Human friendly BLAS and Lapack bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) blas; inherit (pkgs) liblapack;};
 
   "hblock" = callPackage
@@ -99159,7 +97680,6 @@ self: {
        jailbreak = true;
        description = "A mutable vector that provides indexation on the datatype fields it stores";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hbro" = callPackage
@@ -99189,7 +97709,6 @@ self: {
        homepage = "https://github.com/k0ral/hbro";
        description = "Minimal extensible web-browser";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hbro-contrib" = callPackage
@@ -99228,7 +97747,6 @@ self: {
        homepage = "http://www.bytelabs.org/hburg.html";
        description = "Haskell Bottom Up Rewrite Generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hcc" = callPackage
@@ -99284,7 +97802,6 @@ self: {
        homepage = "http://github.com/nfjinjing/hcheat/";
        description = "A collection of code cheatsheet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hchesslib" = callPackage
@@ -99302,7 +97819,6 @@ self: {
        homepage = "https://github.com/nablaa/hchesslib";
        description = "Chess library";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hcltest" = callPackage
@@ -99366,7 +97882,6 @@ self: {
        homepage = "http://github.com/tbh/hcron";
        description = "A simple job scheduler, which just runs some IO action at a given time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hcube" = callPackage
@@ -99386,7 +97901,6 @@ self: {
        ];
        description = "Virtual Rubik's cube of arbitrary size";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hcwiid" = callPackage
@@ -99400,7 +97914,6 @@ self: {
        homepage = "https://github.com/ivanperez-keera/hcwiid";
        description = "Library to interface with the wiimote";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {bluetooth = null; inherit (pkgs) cwiid;};
 
   "hdaemonize_0_5_0_0" = callPackage
@@ -99450,7 +97963,6 @@ self: {
        homepage = "http://github.com/madhadron/hdaemonize";
        description = "Library to handle the details of writing daemons for UNIX";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdbc-aeson" = callPackage
@@ -99522,7 +98034,6 @@ self: {
        homepage = "https://github.com/s9gf4ult/hdbi";
        description = "Haskell Database Independent interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdbi-conduit" = callPackage
@@ -99544,7 +98055,6 @@ self: {
        homepage = "https://github.com/s9gf4ult/hdbi-conduit";
        description = "Conduit glue for HDBI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdbi-postgresql" = callPackage
@@ -99574,7 +98084,6 @@ self: {
        homepage = "https://github.com/s9gf4ult/hdbi-postgresql";
        description = "PostgreSQL driver for hdbi";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdbi-sqlite" = callPackage
@@ -99595,7 +98104,6 @@ self: {
        homepage = "https://github.com/s9gf4ult/hdbi-sqlite";
        description = "SQlite driver for HDBI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdbi-tests" = callPackage
@@ -99617,7 +98125,6 @@ self: {
        homepage = "https://github.com/s9gf4ult/hdbi-tests";
        description = "test suite for testing HDBI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdevtools_0_1_0_6" = callPackage
@@ -99720,7 +98227,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hdevtools" = callPackage
+  "hdevtools_0_1_2_2" = callPackage
     ({ mkDerivation, base, bin-package-db, Cabal, cmdargs, directory
      , filepath, ghc, ghc-paths, network, process, syb, time
      , transformers, unix
@@ -99738,6 +98245,27 @@ 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;
+     }) {};
+
+  "hdevtools" = callPackage
+    ({ mkDerivation, base, bin-package-db, Cabal, cmdargs, directory
+     , filepath, ghc, ghc-paths, network, process, syb, time
+     , transformers, unix
+     }:
+     mkDerivation {
+       pname = "hdevtools";
+       version = "0.1.3.0";
+       sha256 = "e0b0e78664d5f40e5111f02c5abd38493713bd32a08a0795533be132cd983774";
+       isLibrary = false;
+       isExecutable = true;
+       executableHaskellDepends = [
+         base bin-package-db Cabal cmdargs directory filepath ghc 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
@@ -99769,7 +98297,6 @@ self: {
        ];
        description = "Server-side HTTP Digest (RFC2617) in the CGI monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdirect" = callPackage
@@ -99787,7 +98314,6 @@ self: {
        homepage = "http://www.haskell.org/hdirect/";
        description = "An IDL compiler for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdis86" = callPackage
@@ -99800,7 +98326,6 @@ self: {
        homepage = "https://github.com/kmcallister/hdis86";
        description = "Interface to the udis86 disassembler for x86 and x86-64 / AMD64";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdiscount" = callPackage
@@ -99815,7 +98340,6 @@ self: {
        homepage = "https://github.com/jamwt/hdiscount";
        description = "Haskell bindings to the Discount markdown library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {markdown = null;};
 
   "hdm" = callPackage
@@ -99829,7 +98353,6 @@ self: {
        executableHaskellDepends = [ base directory process unix vty ];
        description = "a small display manager";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdocs_0_4_1_3" = callPackage
@@ -99912,7 +98435,6 @@ self: {
        homepage = "https://github.com/PatrickMaier/HdpH";
        description = "Haskell distributed parallel Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdph-closure" = callPackage
@@ -99930,7 +98452,6 @@ self: {
        homepage = "https://github.com/PatrickMaier/HdpH";
        description = "Explicit closures in Haskell distributed parallel Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hdr-histogram" = callPackage
@@ -99971,7 +98492,7 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
-  "heap" = callPackage
+  "heap_1_0_2" = callPackage
     ({ mkDerivation, base, QuickCheck }:
      mkDerivation {
        pname = "heap";
@@ -99983,6 +98504,19 @@ self: {
        executableHaskellDepends = [ base QuickCheck ];
        description = "Heaps in Haskell";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "heap" = callPackage
+    ({ mkDerivation, base, QuickCheck }:
+     mkDerivation {
+       pname = "heap";
+       version = "1.0.3";
+       sha256 = "9bd57e9ca3480d4322ccc5ec094767ee2a64425b2d4022065a8f36b44aabf402";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base QuickCheck ];
+       description = "Heaps in Haskell";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "heaps_0_3_1" = callPackage
@@ -100089,7 +98623,6 @@ self: {
        libraryHaskellDepends = [ base cereal crypto-api hF2 ];
        description = "Elliptic Curve Cryptography for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hedis_0_6_9" = callPackage
@@ -100272,7 +98805,6 @@ self: {
        homepage = "https://bitbucket.org/dpwiz/hedn";
        description = "EDN parsing and encoding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hein" = callPackage
@@ -100357,8 +98889,8 @@ self: {
        pname = "heist";
        version = "0.14.1.1";
        sha256 = "2934ece5e58b4a180a6975c0404a2a48e46b85693822aa6ab18f700a44438e43";
-       revision = "2";
-       editedCabalFile = "d7030f50fb41e4a8c32cd06493df540268d2c53d6f26f3151b3acd0a7839a85f";
+       revision = "3";
+       editedCabalFile = "928290fd32c744fce295f86b09b46e7142b7b669f96759fbc7ea134bbbe4551f";
        libraryHaskellDepends = [
          aeson attoparsec base blaze-builder blaze-html bytestring
          containers directory directory-tree dlist either filepath hashable
@@ -100384,7 +98916,6 @@ self: {
        ];
        description = "Use JSON directly from Heist templates";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "heist-async" = callPackage
@@ -100423,7 +98954,6 @@ self: {
        homepage = "https://github.com/philopon/helics";
        description = "New Relic® agent SDK wrapper for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {newrelic-collector-client = null; newrelic-common = null; 
          newrelic-transaction = null;};
 
@@ -100444,7 +98974,6 @@ self: {
        homepage = "https://github.com/philopon/helics";
        description = "New Relic® agent SDK wrapper for wai";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "helisp" = callPackage
@@ -100482,7 +99011,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome";
        description = "The Helium Compiler";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "helix" = callPackage
@@ -100532,7 +99060,6 @@ self: {
        executableHaskellDepends = [ base transformers utf8-string ];
        description = "A Haskell shell based on shell-conduit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hellage" = callPackage
@@ -100553,7 +99080,6 @@ self: {
        homepage = "http://bitcheese.net/wiki/hellnet/hellage";
        description = "Distributed hackage mirror";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hellnet" = callPackage
@@ -100579,7 +99105,6 @@ self: {
        homepage = "http://bitcheese.net/wiki/hellnet/hspawn";
        description = "Simple, distributed, anonymous data sharing network";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hello" = callPackage
@@ -100618,7 +99143,6 @@ self: {
        homepage = "http://github.com/switchface/helm";
        description = "A functionally reactive game engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "help-esb" = callPackage
@@ -100634,7 +99158,7 @@ self: {
          uuid
        ];
        homepage = "https://github.com/helpdotcom/help-esb.hs";
-       description = "A Haskell client for the Help.com team's ESB";
+       description = "A Haskell client for the Help.com team's ESB.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -100653,7 +99177,6 @@ self: {
        ];
        description = "A module music mixer and player";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hemkay-core" = callPackage
@@ -100716,7 +99239,6 @@ self: {
        homepage = "https://github.com/selectel/hen";
        description = "Haskell bindings to Xen hypervisor interface";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {xenctrl = null;};
 
   "henet" = callPackage
@@ -100731,7 +99253,6 @@ self: {
        ];
        description = "Bindings and high level interface for to ENet v1.3.9";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hepevt" = callPackage
@@ -100743,7 +99264,6 @@ self: {
        libraryHaskellDepends = [ bytestring haskell2010 lha ];
        description = "HEPEVT parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "her-lexer" = callPackage
@@ -100756,7 +99276,6 @@ self: {
        homepage = "http://personal.cis.strath.ac.uk/~conor/pub/she";
        description = "A lexer for Haskell source code";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "her-lexer-parsec" = callPackage
@@ -100768,7 +99287,6 @@ self: {
        libraryHaskellDepends = [ base her-lexer parsec transformers ];
        description = "Parsec frontend to \"her-lexer\" for Haskell source code";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "herbalizer" = callPackage
@@ -100787,7 +99305,6 @@ self: {
        homepage = "https://github.com/danchoi/herbalizer";
        description = "HAML to ERB translator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "here_1_2_6" = callPackage
@@ -100875,7 +99392,6 @@ self: {
        ];
        description = "Haskell Equational Reasoning Model-to-Implementation Tunnel";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hermit-syb" = callPackage
@@ -100891,7 +99407,6 @@ self: {
        ];
        description = "HERMIT plugin for optimizing Scrap-Your-Boilerplate traversals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hero-club-five-tenets" = callPackage
@@ -100955,7 +99470,6 @@ self: {
        ];
        description = "A library for compiling and serving static web assets";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "herringbone-embed" = callPackage
@@ -100972,7 +99486,6 @@ self: {
        ];
        description = "Embed preprocessed web assets in your executable with Template Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "herringbone-wai" = callPackage
@@ -100989,7 +99502,6 @@ self: {
        ];
        description = "Wai adapter for the Herringbone web asset preprocessor";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hesh" = callPackage
@@ -101034,7 +99546,6 @@ self: {
        jailbreak = true;
        description = "Haskell's embedded SQL";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hetero-map" = callPackage
@@ -101063,7 +99574,6 @@ self: {
        homepage = "http://web.comlab.ox.ac.uk/oucl/work/ian.lynagh/Hetris/";
        description = "Text Tetris";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ncurses;};
 
   "heukarya" = callPackage
@@ -101079,7 +99589,6 @@ self: {
        homepage = "https://github.com/t3476/heukarya";
        description = "A genetic programming based on tree structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hevolisa" = callPackage
@@ -101095,7 +99604,6 @@ self: {
        ];
        description = "Genetic Mona Lisa problem in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hevolisa-dph" = callPackage
@@ -101113,7 +99621,6 @@ self: {
        ];
        description = "Genetic Mona Lisa problem in Haskell - using Data Parallel Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hex" = callPackage
@@ -101185,7 +99692,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Hexpat/";
        description = "Chunked XML parsing using iteratees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hexpat-lens" = callPackage
@@ -101236,7 +99742,6 @@ self: {
        ];
        description = "Picklers for de/serialising Generic data types to and from XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hexpat-tagsoup" = callPackage
@@ -101279,7 +99784,6 @@ self: {
        ];
        description = "Hexadecimal ByteString literals, with placeholders that bind variables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hexstring" = callPackage
@@ -101346,7 +99850,6 @@ self: {
        executableSystemDepends = [ doublefann ];
        description = "Haskell binding to the FANN library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {doublefann = null; fann = null;};
 
   "hfd" = callPackage
@@ -101366,7 +99869,6 @@ self: {
        jailbreak = true;
        description = "Flash debugger";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hfiar" = callPackage
@@ -101383,7 +99885,6 @@ self: {
        homepage = "http://github.com/elbrujohalcon/hfiar";
        description = "Four in a Row in Haskell!!";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hflags" = callPackage
@@ -101423,7 +99924,6 @@ self: {
        homepage = "http://github.com/danstiner/hfmt";
        description = "Haskell source code formatter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hfoil" = callPackage
@@ -101443,7 +99943,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Hess-Smith panel code for inviscid 2-d airfoil analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hformat" = callPackage
@@ -101489,7 +99988,6 @@ self: {
        homepage = "http://github.com/cmh/Hfractal";
        description = "OpenGL fractal renderer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hfsevents_0_1_5" = callPackage
@@ -101532,7 +100030,6 @@ self: {
        homepage = "http://www.fing.edu.uy/inco/proyectos/fusion";
        description = "A library for fusing a subset of Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hg-buildpackage" = callPackage
@@ -101551,7 +100048,6 @@ self: {
        ];
        description = "Tools to help manage Debian packages with Mercurial";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgal" = callPackage
@@ -101574,7 +100070,6 @@ self: {
        libraryHaskellDepends = [ array base haskell98 mtl ];
        description = "Haskell Genetic Algorithm Library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgdbmi" = callPackage
@@ -101629,7 +100124,6 @@ self: {
        homepage = "http://www.glyc.dc.uba.ar/intohylo/hgen.php";
        description = "Random generation of modal and hybrid logic formulas";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgeometric" = callPackage
@@ -101642,7 +100136,6 @@ self: {
        homepage = "ftp://ftp.cs.man.ac.uk/pub/toby/gpc/";
        description = "A geometric library with bindings to GPC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgeometry" = callPackage
@@ -101665,7 +100158,6 @@ self: {
        homepage = "http://fstaals.net/software/hgeometry";
        description = "Data types for geometric objects, geometric algorithms, and data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgettext" = callPackage
@@ -101707,7 +100199,6 @@ self: {
        homepage = "https://github.com/noteed/hgithub";
        description = "Haskell bindings to the GitHub API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgl-example" = callPackage
@@ -101744,7 +100235,6 @@ self: {
        homepage = "http://github.com/polux/hgom";
        description = "An haskell port of the java version of gom";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hgopher" = callPackage
@@ -101794,7 +100284,6 @@ self: {
        homepage = "https://github.com/mjakob/hgrib";
        description = "Unofficial bindings for GRIB API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {grib_api = null;};
 
   "hharp" = callPackage
@@ -101809,7 +100298,6 @@ self: {
        homepage = "http://www.harphttp.org";
        description = "Binding to libharp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {harp = null;};
 
   "hi" = callPackage
@@ -101881,7 +100369,6 @@ self: {
        homepage = "http://hiccup.googlecode.com/";
        description = "Relatively efficient Tcl interpreter with support for basic operations";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hichi" = callPackage
@@ -101895,7 +100382,6 @@ self: {
        executableHaskellDepends = [ array base bytestring mtl network ];
        description = "haskell robot for IChat protocol";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hid_0_2_1" = callPackage
@@ -101924,7 +100410,6 @@ self: {
        homepage = "https://github.com/phaazon/hid";
        description = "Interface to hidapi library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) hidapi;};
 
   "hidapi" = callPackage
@@ -101938,7 +100423,6 @@ self: {
        homepage = "https://github.com/vahokif/haskell-hidapi";
        description = "Haskell bindings to HIDAPI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) systemd;};
 
   "hieraclus" = callPackage
@@ -101950,7 +100434,6 @@ self: {
        libraryHaskellDepends = [ base containers HUnit mtl multiset ];
        description = "Automated clustering of arbitrary elements in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hierarchical-clustering" = callPackage
@@ -101984,7 +100467,6 @@ self: {
        jailbreak = true;
        description = "Draw diagrams of dendrograms made by hierarchical-clustering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hierarchical-exceptions" = callPackage
@@ -102036,7 +100518,6 @@ self: {
        homepage = "http://github.com/paolino/hiernotify";
        description = "Notification library for a filesystem hierarchy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "highWaterMark" = callPackage
@@ -102051,7 +100532,6 @@ self: {
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Memory usage statistics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "higher-leveldb" = callPackage
@@ -102075,7 +100555,6 @@ self: {
        homepage = "https://github.com/jeremyjh/higher-leveldb";
        description = "A rich monadic API for working with leveldb databases";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "higherorder" = callPackage
@@ -102089,7 +100568,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Some higher order functions for Bool and []";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "highjson" = callPackage
@@ -102109,7 +100587,6 @@ self: {
        homepage = "https://github.com/agrafix/highjson";
        description = "Very fast JSON serialisation and parsing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "highlight-versions" = callPackage
@@ -102358,9 +100835,8 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://github.com/Fuuzetsu/himg";
-       description = "Simple gtk2hs image viewer. Point it at an image and fire away";
+       description = "Simple gtk2hs image viewer. Point it at an image and fire away.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "himpy" = callPackage
@@ -102384,7 +100860,6 @@ self: {
        homepage = "https://github.com/pyr/himpy";
        description = "multithreaded snmp poller for riemann";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hindent_4_4_1" = callPackage
@@ -102560,7 +101035,6 @@ self: {
        libraryHaskellDepends = [ base hinduce-missingh layout ];
        description = "Interface and utilities for classifiers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hinduce-classifier-decisiontree" = callPackage
@@ -102576,7 +101050,6 @@ self: {
        ];
        description = "Decision Tree Classifiers for hInduce";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hinduce-examples" = callPackage
@@ -102595,7 +101068,6 @@ self: {
        ];
        description = "Example data for hInduce";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hinduce-missingh" = callPackage
@@ -102769,7 +101241,6 @@ self: {
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Space Invaders";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hinze-streams" = callPackage
@@ -102782,7 +101253,25 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/hinze-streams";
        description = "Streams and Unique Fixed Points";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hip" = callPackage
+    ({ mkDerivation, base, bytestring, deepseq, filepath, JuicyPixels
+     , netpbm, primitive, process, repa, temporary, vector
+     , vector-th-unbox
+     }:
+     mkDerivation {
+       pname = "hip";
+       version = "1.0.0.0";
+       sha256 = "5da5f20c32dc907b1d5b918dcfe49662c43dbf004cead970571f912d91fba39a";
+       libraryHaskellDepends = [
+         base bytestring deepseq filepath JuicyPixels netpbm primitive
+         process repa temporary vector vector-th-unbox
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/lehins/hip";
+       description = "Haskell Image Processing (HIP) Library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hipbot" = callPackage
@@ -102809,7 +101298,22 @@ self: {
        homepage = "https://github.com/purefn/hipbot";
        description = "A library for building HipChat Bots";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "hipchat-hs" = callPackage
+    ({ mkDerivation, aeson, async, base, bytestring, either, lens
+     , servant, servant-client, split, string-conversions, text, time
+     }:
+     mkDerivation {
+       pname = "hipchat-hs";
+       version = "0.0.2";
+       sha256 = "42c61fccfe9e652ad8ed4d2d7c05e8c7acefe75d8ed1a577937fe132e55e23af";
+       libraryHaskellDepends = [
+         aeson async base bytestring either lens servant servant-client
+         split string-conversions text time
+       ];
+       description = "Hipchat API bindings in Haskell";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "hipe" = callPackage
@@ -102826,7 +101330,6 @@ self: {
        homepage = "http://fstaals.net/software/hipe";
        description = "Support for reading and writing ipe7 files (http://ipe7.sourceforge.net)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hips" = callPackage
@@ -102861,7 +101364,6 @@ self: {
        ];
        description = "IRC client";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hirt" = callPackage
@@ -102884,7 +101386,6 @@ self: {
        homepage = "https://people.ksp.sk/~ivan/hirt";
        description = "Calculates IRT 2PL and 3PL models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hissmetrics" = callPackage
@@ -102902,7 +101403,6 @@ self: {
        homepage = "https://github.com/prowdsponsor/hissmetrics";
        description = "Unofficial API bindings to KISSmetrics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hist-pl" = callPackage
@@ -102928,7 +101428,6 @@ self: {
        homepage = "https://github.com/kawu/hist-pl/tree/master/umbrella";
        description = "Umbrella package for the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hist-pl-dawg" = callPackage
@@ -102961,7 +101460,6 @@ self: {
        homepage = "https://github.com/kawu/hist-pl/tree/master/fusion";
        description = "Merging historical dictionary with PoliMorf";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hist-pl-lexicon" = callPackage
@@ -102993,7 +101491,6 @@ self: {
        homepage = "https://github.com/kawu/hist-pl/tree/master/lmf";
        description = "LMF parsing for the historical dictionary of Polish";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hist-pl-transliter" = callPackage
@@ -103093,7 +101590,6 @@ self: {
        jailbreak = true;
        description = "Extract the interesting bits from shell history";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hit_0_6_2" = callPackage
@@ -103195,7 +101691,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Libraries_and_tools/HJS";
        description = "JavaScript Parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hjsmin_0_1_4_7" = callPackage
@@ -103449,30 +101944,30 @@ self: {
 
   "hjsonschema" = callPackage
     ({ mkDerivation, aeson, async, base, bytestring, containers
-     , directory, file-embed, filepath, hashable, hjsonpointer
-     , http-client, http-types, HUnit, mtl, regexpr, scientific
-     , test-framework, test-framework-hunit, text, transformers
-     , unordered-containers, vector, wai-app-static, warp
+     , directory, file-embed, filepath, hjsonpointer, http-client
+     , http-types, HUnit, QuickCheck, regexpr, scientific, semigroups
+     , tasty, tasty-hunit, tasty-quickcheck, text, unordered-containers
+     , vector, wai-app-static, warp
      }:
      mkDerivation {
        pname = "hjsonschema";
-       version = "0.8.0.1";
-       sha256 = "aeada3426b294cfc43a7cfac053aae0ee1fd06a5c551ecd0d3a6d725e47c89dc";
+       version = "0.9.0.0";
+       sha256 = "08367763571d49f3e0ec67b04143bf3196dcc217ffb4811af887b114b04b035a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
-         aeson base bytestring containers file-embed hashable hjsonpointer
-         http-client http-types mtl regexpr scientific text transformers
-         unordered-containers vector
+         aeson base bytestring containers file-embed hjsonpointer
+         http-client http-types QuickCheck regexpr scientific semigroups
+         text unordered-containers vector
        ];
        executableHaskellDepends = [
-         aeson base text unordered-containers vector
+         aeson base hjsonpointer text unordered-containers vector
        ];
        testHaskellDepends = [
-         aeson async base bytestring directory filepath HUnit test-framework
-         test-framework-hunit text vector wai-app-static warp
+         aeson async base bytestring directory filepath hjsonpointer HUnit
+         QuickCheck tasty tasty-hunit tasty-quickcheck text
+         unordered-containers vector wai-app-static warp
        ];
-       jailbreak = true;
        homepage = "https://github.com/seagreen/hjsonschema";
        description = "JSON Schema library";
        license = stdenv.lib.licenses.mit;
@@ -103530,7 +102025,6 @@ self: {
        homepage = "http://people.ksp.sk/~ivan/hlbfgsb";
        description = "Haskell binding to L-BFGS-B version 3.0";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) gfortran;};
 
   "hlcm" = callPackage
@@ -103553,7 +102047,6 @@ self: {
        homepage = "http://membres-liglab.imag.fr/termier/HLCM/hlcm.html";
        description = "Fast algorithm for mining closed frequent itemsets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hleap" = callPackage
@@ -103794,7 +102287,6 @@ self: {
        homepage = "http://hledger.org";
        description = "A pie chart image generator for the hledger accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-diff" = callPackage
@@ -104024,7 +102516,6 @@ self: {
        homepage = "http://hledger.org";
        description = "A curses-style console interface for the hledger accounting tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hledger-web_0_24_1" = callPackage
@@ -104163,7 +102654,6 @@ self: {
        homepage = "https://victoredwardocallaghan.github.io/hlibBladeRF";
        description = "Haskell binding to libBladeRF SDR library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libbladeRF;};
 
   "hlibev" = callPackage
@@ -104177,7 +102667,6 @@ self: {
        homepage = "http://github.com/aycanirican/hlibev";
        description = "FFI interface to libev";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {ev = null;};
 
   "hlibfam" = callPackage
@@ -104190,7 +102679,6 @@ self: {
        librarySystemDepends = [ fam ];
        description = "FFI interface to libFAM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) fam;};
 
   "hlibgit2_0_18_0_13" = callPackage
@@ -104476,7 +102964,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "hlint" = callPackage
+  "hlint_1_9_30" = callPackage
     ({ mkDerivation, ansi-terminal, base, cmdargs, containers, cpphs
      , directory, extra, filepath, haskell-src-exts, hscolour, process
      , refact, transformers, uniplate
@@ -104496,6 +102984,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.31";
+       sha256 = "da353b827a418edffe5658172cc251133270186521ef1a4c6d1936b4f825faf8";
+       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
@@ -104508,7 +103019,6 @@ self: {
        homepage = "http://www.pontarius.org/sub-projects/hlogger/";
        description = "Simple, concurrent, extendable and easy-to-use logging library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hlongurl" = callPackage
@@ -104572,7 +103082,6 @@ self: {
        homepage = "http://rd.slavepianos.org/t/hly";
        description = "Haskell LilyPond";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmark" = callPackage
@@ -104592,7 +103101,6 @@ self: {
        homepage = "http://bitcheese.net/wiki/code/hmark";
        description = "A tool and library for Markov chains based text generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmarkup" = callPackage
@@ -104606,7 +103114,6 @@ self: {
        ];
        description = "Simple wikitext-like markup format implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix_0_16_1_0" = callPackage
@@ -104767,7 +103274,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/hmatrix-banded/";
        description = "HMatrix interface to LAPACK functions for banded matrices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) liblapack;};
 
   "hmatrix-csv" = callPackage
@@ -104916,7 +103422,6 @@ self: {
        homepage = "http://github.com/alanfalloon/hmatrix-mmap";
        description = "Memory map Vector from disk into memory efficiently";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix-nipals" = callPackage
@@ -104931,7 +103436,6 @@ self: {
        homepage = "http://github.com/alanfalloon/hmatrix-nipals";
        description = "NIPALS method for Principal Components Analysis on large data-sets";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix-quadprogpp" = callPackage
@@ -104944,7 +103448,6 @@ self: {
        librarySystemDepends = [ QuadProgpp ];
        description = "Bindings to the QuadProg++ quadratic programming library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {QuadProgpp = null;};
 
   "hmatrix-repa" = callPackage
@@ -104957,7 +103460,6 @@ self: {
        homepage = "http://code.haskell.org/hmatrix-repa";
        description = "Adaptors for interoperability between hmatrix and repa";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix-special" = callPackage
@@ -104970,7 +103472,6 @@ self: {
        homepage = "https://github.com/albertoruiz/hmatrix";
        description = "Interface to GSL special functions";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix-static" = callPackage
@@ -104988,7 +103489,6 @@ self: {
        homepage = "http://code.haskell.org/hmatrix-static/";
        description = "hmatrix with vector and matrix sizes encoded in types";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix-svdlibc" = callPackage
@@ -105005,7 +103505,6 @@ self: {
        homepage = "http://github.com/bgamari/hmatrix-svdlibc";
        description = "SVDLIBC bindings for HMatrix";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix-syntax" = callPackage
@@ -105023,7 +103522,6 @@ self: {
        homepage = "http://github.com/reinerp/hmatrix-syntax";
        description = "MATLAB-like syntax for hmatrix vectors and matrices";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmatrix-tests" = callPackage
@@ -105057,7 +103555,6 @@ self: {
        homepage = "http://rd.slavepianos.org/t/hmeap";
        description = "Haskell Meapsoft Parser";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmeap-utils" = callPackage
@@ -105078,7 +103575,6 @@ self: {
        homepage = "http://slavepianos.org/rd/?t=hmeap-utils";
        description = "Haskell Meapsoft Parser Utilities";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmemdb" = callPackage
@@ -105108,7 +103604,6 @@ self: {
        jailbreak = true;
        description = "CLI fuzzy finder and launcher";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmidi" = callPackage
@@ -105141,7 +103636,6 @@ self: {
        homepage = "http://www.github.com/mboes/hmk";
        description = "A make alternative based on Plan9's mk";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmm" = callPackage
@@ -105158,7 +103652,6 @@ self: {
        homepage = "https://github.com/mikeizbicki/hmm";
        description = "A hidden markov model library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmm-hmatrix" = callPackage
@@ -105178,7 +103671,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/hmm-hmatrix";
        description = "Hidden Markov Models using HMatrix primitives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hmp3" = callPackage
@@ -105200,7 +103692,6 @@ self: {
        homepage = "http://www.cse.unsw.edu.au/~dons/hmp3.html";
        description = "An ncurses mp3 player written in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ncurses;};
 
   "hmpfr" = callPackage
@@ -105214,7 +103705,6 @@ self: {
        homepage = "http://code.google.com/p/hmpfr/";
        description = "Haskell binding to the MPFR library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mpfr;};
 
   "hmt" = callPackage
@@ -105271,7 +103761,6 @@ self: {
        jailbreak = true;
        description = "Interpreter for the MUMPS langugae";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hnetcdf" = callPackage
@@ -105303,7 +103792,6 @@ self: {
        homepage = "https://github.com/ian-ross/hnetcdf";
        description = "Haskell NetCDF library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) netcdf;};
 
   "hnix" = callPackage
@@ -105347,7 +103835,6 @@ self: {
        homepage = "http://github.com/alpmestan/hnn";
        description = "A reasonably fast and simple neural network library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hnop" = callPackage
@@ -105393,9 +103880,8 @@ self: {
          base binary bytestring crypto-pubkey-types curl dataenc entropy mtl
          old-locale random RSA SHA time utf8-string
        ];
-       description = "A Haskell implementation of OAuth 1.0a protocol";
+       description = "A Haskell implementation of OAuth 1.0a protocol.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoauth2_0_4_3" = callPackage
@@ -105611,7 +104097,6 @@ self: {
        homepage = "http://svalaskevicius.github.io/hob/";
        description = "A source code editor aiming for the convenience of use";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hobbes" = callPackage
@@ -105631,7 +104116,6 @@ self: {
        homepage = "http://github.com/jhickner/hobbes";
        description = "A small file watcher for OSX";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hobbits" = callPackage
@@ -105650,7 +104134,6 @@ self: {
        jailbreak = true;
        description = "A library for canonically representing terms with binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoe" = callPackage
@@ -105682,7 +104165,6 @@ self: {
        jailbreak = true;
        description = "defining @mtl@-ready monads as * -> * fixed-points";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hog" = callPackage
@@ -105701,7 +104183,6 @@ self: {
        jailbreak = true;
        description = "Simple IRC logger bot";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hogg" = callPackage
@@ -105720,7 +104201,6 @@ self: {
        homepage = "http://www.kfish.org/software/hogg/";
        description = "Library and tools to manipulate the Ogg container format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hogre" = callPackage
@@ -105737,7 +104217,6 @@ self: {
        homepage = "http://anttisalonen.github.com/hogre";
        description = "Haskell binding to a subset of OGRE";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {OGRE = null; OgreMain = null; cgen-hs = null; grgen = null;};
 
   "hogre-examples" = callPackage
@@ -105753,7 +104232,6 @@ self: {
        homepage = "http://github.com/anttisalonen/hogre-examples";
        description = "Examples for using Hogre";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {OgreMain = null;};
 
   "hois" = callPackage
@@ -105770,7 +104248,6 @@ self: {
        jailbreak = true;
        description = "OIS bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {OIS = null;};
 
   "hoist-error" = callPackage
@@ -105807,7 +104284,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Higher kinded type removal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "holey-format" = callPackage
@@ -105935,7 +104411,6 @@ self: {
        homepage = "http://www-users.cs.york.ac.uk/~ndm/homeomorphic/";
        description = "Homeomorphic Embedding Test";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hommage" = callPackage
@@ -105949,7 +104424,6 @@ self: {
        ];
        description = "Haskell Offline Music Manipulation And Generation EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hommage-ds" = callPackage
@@ -105975,8 +104449,8 @@ self: {
      }:
      mkDerivation {
        pname = "homplexity";
-       version = "0.4.3.0";
-       sha256 = "556d2ac1f9b9468419686f7adec903838961d44b4621917589588ef5d7748377";
+       version = "0.4.3.1";
+       sha256 = "03c4e31049b81cb2d4a531d76b520f2c8e84a24ebcea7a07da296f0f6e8f117a";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -105989,7 +104463,6 @@ self: {
        homepage = "https://github.com/mgajda/homplexity";
        description = "Haskell code quality tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "honi" = callPackage
@@ -106006,7 +104479,6 @@ self: {
        testSystemDepends = [ freenect OpenNI2 ];
        description = "OpenNI 2 binding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {OpenNI2 = null; inherit (pkgs) freenect;};
 
   "honk" = callPackage
@@ -106019,7 +104491,6 @@ self: {
        homepage = "https://lambda.xyz/honk/";
        description = "Cross-platform interface to the PC speaker";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hoobuddy" = callPackage
@@ -106065,7 +104536,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Dummy package to disable Hood without having to remove all the calls to observe";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hood2" = callPackage
@@ -106096,7 +104566,6 @@ self: {
        jailbreak = true;
        description = "A small, toy roguelike";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodle" = callPackage
@@ -106117,7 +104586,6 @@ self: {
        homepage = "http://ianwookim.org/hoodle";
        description = "Executable for hoodle";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodle-builder" = callPackage
@@ -106134,7 +104602,6 @@ self: {
        ];
        description = "text builder for hoodle file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodle-core" = callPackage
@@ -106168,7 +104635,6 @@ self: {
        homepage = "http://ianwookim.org/hoodle";
        description = "Core library for hoodle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXi;};
 
   "hoodle-extra" = callPackage
@@ -106195,7 +104661,6 @@ self: {
        homepage = "http://ianwookim.org/hoodle";
        description = "extra hoodle tools";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodle-parser" = callPackage
@@ -106214,7 +104679,6 @@ self: {
        homepage = "http://ianwookim.org/hoodle";
        description = "Hoodle file parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodle-publish" = callPackage
@@ -106242,7 +104706,6 @@ self: {
        homepage = "http://ianwookim.org/hoodle";
        description = "publish hoodle files as a static web site";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodle-render" = callPackage
@@ -106263,7 +104726,6 @@ self: {
        ];
        description = "Hoodle file renderer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoodle-types" = callPackage
@@ -106279,7 +104741,6 @@ self: {
        ];
        description = "Data types for programs for hoodle file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoogle_4_2_36" = callPackage
@@ -106640,7 +105101,6 @@ self: {
        homepage = "https://bitbucket.org/pvdbrand/hoovie";
        description = "Haskell Media Server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hopencc" = callPackage
@@ -106659,7 +105119,6 @@ self: {
        homepage = "https://github.com/MnO2/hopencc";
        description = "Haskell binding to libopencc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {opencc = null;};
 
   "hopencl" = callPackage
@@ -106680,7 +105139,6 @@ self: {
        homepage = "https://github.com/merijn/hopencl";
        description = "Haskell bindings for OpenCL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {OpenCL = null;};
 
   "hopenpgp-tools_0_13" = callPackage
@@ -106800,7 +105258,6 @@ self: {
        homepage = "http://floss.scru.org/hopenpgp-tools";
        description = "hOpenPGP-based command-line tools";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hopenssl" = callPackage
@@ -106847,7 +105304,6 @@ self: {
        homepage = "https://github.com/imperialhopfield/hopfield";
        description = "Hopfield Networks, Boltzmann Machines and Clusters";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {MagickCore = null; inherit (pkgs) imagemagick;};
 
   "hopfield-networks" = callPackage
@@ -106954,7 +105410,6 @@ self: {
        homepage = "http://akc.is/hops";
        description = "Handy Operations on Power Series";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hoq" = callPackage
@@ -106974,7 +105429,6 @@ self: {
        homepage = "http://github.com/valis/hoq";
        description = "A language based on homotopy type theory with an interval type";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "horizon" = callPackage
@@ -107069,7 +105523,7 @@ self: {
        version = "1.0.0";
        sha256 = "7fafb1e0cfe19d453030754962e74cdb8f3e791ec5b974623cbf26872779c857";
        libraryHaskellDepends = [ attoparsec base bytestring ];
-       description = "Validate hostnames e.g. localhost or foo.co.uk";
+       description = "Validate hostnames e.g. localhost or foo.co.uk.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -107090,7 +105544,6 @@ self: {
        homepage = "https://github.com/yihuang/hosts-server";
        description = "An dns server which is extremely easy to config";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hothasktags" = callPackage
@@ -107110,7 +105563,6 @@ self: {
        homepage = "http://github.com/luqui/hothasktags";
        description = "Generates ctags for Haskell, incorporating import lists and qualified imports";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hotswap" = callPackage
@@ -107228,7 +105680,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Hp2any";
        description = "Heap profiling helper library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hp2any-graph" = callPackage
@@ -107251,7 +105702,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Hp2any";
        description = "Real-time heap graphing utility and profile stream server with a reusable graphing module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) freeglut; inherit (pkgs) mesa;};
 
   "hp2any-manager" = callPackage
@@ -107272,7 +105722,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Hp2any";
        description = "A utility to visualise and compare heap profiles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hp2html" = callPackage
@@ -107313,8 +105762,8 @@ self: {
      }:
      mkDerivation {
        pname = "hpack";
-       version = "0.9.1";
-       sha256 = "77ebb1ce3b6ab88582a22dcdcb3fd08bd7278e5024042ce909993f2fb033c6ee";
+       version = "0.10.0";
+       sha256 = "1c35a222ab76c418115e9fca2b88eea0ac63fd75149155440ff54d9ae7278f7a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -107393,7 +105842,6 @@ self: {
        homepage = "http://haskell.hpage.com";
        description = "A scrapbook for Haskell developers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpapi" = callPackage
@@ -107406,7 +105854,6 @@ self: {
        librarySystemDepends = [ papi ];
        description = "Binding for the PAPI library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {papi = null;};
 
   "hpaste" = callPackage
@@ -107436,7 +105883,6 @@ self: {
        homepage = "http://hpaste.org/";
        description = "Haskell paste web site";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpasteit" = callPackage
@@ -107458,7 +105904,6 @@ self: {
        homepage = "http://github.com/parcs/hpasteit";
        description = "A command-line client for hpaste.org";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpc_0_6_0_2" = callPackage
@@ -107499,7 +105944,7 @@ self: {
        testHaskellDepends = [ base HUnit ];
        jailbreak = true;
        homepage = "https://github.com/guillaume-nargeot/hpc-coveralls";
-       description = "Coveralls.io support for Haskell";
+       description = "Coveralls.io support for Haskell.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -107526,7 +105971,7 @@ self: {
        ];
        testHaskellDepends = [ base HUnit ];
        homepage = "https://github.com/guillaume-nargeot/hpc-coveralls";
-       description = "Coveralls.io support for Haskell";
+       description = "Coveralls.io support for Haskell.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -107557,19 +106002,19 @@ self: {
        ];
        description = "Tracer with AJAX interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpdft" = callPackage
-    ({ mkDerivation, base, bytestring, directory, parsec, text
-     , utf8-string, zlib
+    ({ mkDerivation, base, binary, bytestring, containers, directory
+     , file-embed, parsec, text, utf8-string, zlib
      }:
      mkDerivation {
        pname = "hpdft";
-       version = "0.1.0.2";
-       sha256 = "fd302bfbb8e8632bb01d20b3232ca87006cda8c2e3ed3c33f9d0874b2f9662b7";
+       version = "0.1.0.3";
+       sha256 = "e8ea8a57e82685a3b178df4a2048fe229a6c3794d9613836cd5b7d0f028b64b6";
        libraryHaskellDepends = [
-         base bytestring directory parsec text utf8-string zlib
+         base binary bytestring containers directory file-embed parsec text
+         utf8-string zlib
        ];
        homepage = "https://github.com/k16shikano/hpdft";
        description = "A tool for looking through PDF file using Haskell";
@@ -107591,7 +106036,6 @@ self: {
        homepage = "https://github.com/agocorona/hplayground";
        description = "monadic, reactive Formlets running in the Web browser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hplaylist" = callPackage
@@ -107605,7 +106049,6 @@ self: {
        executableHaskellDepends = [ base directory filepath process ];
        description = "Application for managing playlist files on a music player";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpodder" = callPackage
@@ -107627,7 +106070,6 @@ self: {
        homepage = "http://software.complete.org/hpodder";
        description = "Podcast Aggregator (downloader)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpp" = callPackage
@@ -107677,7 +106119,6 @@ self: {
        homepage = "https://github.com/scrive/hpqtypes";
        description = "Haskell bindings to libpqtypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) postgresql;};
 
   "hprotoc_2_1_4" = callPackage
@@ -107916,7 +106357,6 @@ self: {
        homepage = "http://darcs.factisresearch.com/pub/protocol-buffers-fork/";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hps" = callPackage
@@ -107950,7 +106390,6 @@ self: {
        homepage = "http://slavepianos.org/rd/?t=hps-cairo";
        description = "Cairo rendering for the haskell postscript library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hps-kmeans" = callPackage
@@ -107993,7 +106432,6 @@ self: {
        homepage = "https://github.com/davidlazar/hpygments";
        description = "Highlight source code using Pygments";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpylos" = callPackage
@@ -108010,7 +106448,6 @@ self: {
        homepage = "http://sourceforge.net/projects/hpylos/";
        description = "AI of Pylos game with GLUT interface";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hpyrg" = callPackage
@@ -108050,7 +106487,6 @@ self: {
        homepage = "http://github.com/paulrzcz/hquantlib.git";
        description = "HQuantLib is a port of essencial parts of QuantLib to Haskell";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hquery" = callPackage
@@ -108081,7 +106517,6 @@ self: {
        executableHaskellDepends = [ base HCL NonEmpty ];
        description = "Basic utility for ranking a list of items";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hreader" = callPackage
@@ -108135,7 +106570,6 @@ self: {
        ];
        description = "Embed a Ruby intepreter in your Haskell program !";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {inherit (pkgs) ruby;};
 
   "hs-GeoIP" = callPackage
@@ -108149,7 +106583,6 @@ self: {
        homepage = "http://github.com/ozataman/hs-GeoIP";
        description = "Haskell bindings to the MaxMind GeoIPCity database via the C library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {GeoIP = null;};
 
   "hs-bibutils_5_0" = callPackage
@@ -108196,7 +106629,6 @@ self: {
        homepage = "https://github.com/tsuraan/hs-blake2";
        description = "A cryptohash-inspired library for blake2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) b2;};
 
   "hs-captcha" = callPackage
@@ -108238,7 +106670,6 @@ self: {
        ];
        description = "Example Monte Carlo simulations implemented with Carbon";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-cdb" = callPackage
@@ -108255,7 +106686,6 @@ self: {
        homepage = "http://github.com/adamsmasher/hs-cdb";
        description = "A library for reading CDB (Constant Database) files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-dotnet" = callPackage
@@ -108268,7 +106698,6 @@ self: {
        librarySystemDepends = [ ole32 oleaut32 ];
        description = "Pragmatic .NET interop for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {ole32 = null; oleaut32 = null;};
 
   "hs-duktape" = callPackage
@@ -108290,7 +106719,6 @@ self: {
        homepage = "https://github.com/myfreeweb/hs-duktape";
        description = "Haskell bindings for a very compact embedded ECMAScript (JavaScript) engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-excelx" = callPackage
@@ -108320,7 +106748,6 @@ self: {
        homepage = "http://patch-tag.com/r/VasylPasternak/hs-ffmpeg";
        description = "Bindings to FFMPEG library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-fltk" = callPackage
@@ -108334,7 +106761,6 @@ self: {
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/hs-fltk/";
        description = "Binding to GUI library FLTK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {fltk = null; fltk_images = null;};
 
   "hs-gchart" = callPackage
@@ -108347,7 +106773,6 @@ self: {
        homepage = "http://github.com/deepakjois/hs-gchart";
        description = "Haskell wrapper for the Google Chart API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-gen-iface" = callPackage
@@ -108366,7 +106791,6 @@ self: {
        ];
        description = "Utility to generate haskell-names interface files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-gizapp" = callPackage
@@ -108414,7 +106838,6 @@ self: {
        ];
        description = "Java .class files assembler/disassembler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-json-rpc" = callPackage
@@ -108429,7 +106852,6 @@ self: {
        homepage = "http://patch-tag.com/r/Azel/hs-json-rpc";
        description = "JSON-RPC client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-logo" = callPackage
@@ -108457,7 +106879,6 @@ self: {
        homepage = "http://deepakjois.github.com/hs-logo";
        description = "Logo interpreter written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-mesos" = callPackage
@@ -108482,7 +106903,6 @@ self: {
          tasty-quickcheck
        ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) mesos; inherit (pkgs) protobuf;};
 
   "hs-nombre-generator" = callPackage
@@ -108497,7 +106917,6 @@ self: {
        jailbreak = true;
        description = "Name generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-pgms" = callPackage
@@ -108516,7 +106935,6 @@ self: {
        ];
        description = "Programmer's Mine Sweeper in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-php-session" = callPackage
@@ -108565,7 +106983,6 @@ self: {
        homepage = "https://github.com/tazjin/hs-pkpass";
        description = "A library for Passbook pass creation & signing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-re" = callPackage
@@ -108615,7 +107032,6 @@ self: {
        ];
        description = "Haskell binding to the Twitter API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-twitterarchiver" = callPackage
@@ -108630,7 +107046,6 @@ self: {
        homepage = "https://github.com/deepakjois/hs-twitterarchiver";
        description = "Commandline Twitter feed archiver";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs-vcard" = callPackage
@@ -108643,7 +107058,6 @@ self: {
        homepage = "http://qrcard.us/";
        description = "Implements the RFC 2426 vCard 3.0 spec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs2048" = callPackage
@@ -108684,7 +107098,6 @@ self: {
        homepage = "http://www.xanxys.net/hs2bf/";
        description = "Haskell to Brainfuck compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hs2dot" = callPackage
@@ -108704,7 +107117,6 @@ self: {
        homepage = "http://www.github.com/finnsson/hs2graphviz";
        description = "Generate graphviz-code from Haskell-code";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsConfigure" = callPackage
@@ -108735,7 +107147,6 @@ self: {
        jailbreak = true;
        description = "Sqlite3 bindings";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsXenCtrl" = callPackage
@@ -108750,7 +107161,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/HsXenCtrl";
        description = "FFI bindings to the Xen Control library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {xenctrl = null;};
 
   "hsass_0_3_0" = callPackage
@@ -108843,7 +107253,6 @@ self: {
        ];
        description = "simple utility for rolling filesystem backups";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsbencher" = callPackage
@@ -108921,7 +107330,6 @@ self: {
        jailbreak = true;
        description = "A preprocessor that helps with writing Haskell bindings to C code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3" = callPackage
@@ -108969,7 +107377,6 @@ self: {
        homepage = "http://rd.slavepianos.org/?t=hsc3-cairo";
        description = "haskell supercollider cairo drawing";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3-data" = callPackage
@@ -108987,7 +107394,6 @@ self: {
        homepage = "http://rd.slavepianos.org/t/hsc3-data";
        description = "haskell supercollider data";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3-db" = callPackage
@@ -109031,7 +107437,6 @@ self: {
        homepage = "http://rd.slavepianos.org/t/hsc3-forth";
        description = "FORTH SUPERCOLLIDER";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3-graphs" = callPackage
@@ -109063,7 +107468,6 @@ self: {
        homepage = "http://rd.slavepianos.org/t/hsc3-graphs";
        description = "Haskell SuperCollider Graphs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3-lang" = callPackage
@@ -109084,7 +107488,6 @@ self: {
        homepage = "http://rd.slavepianos.org/t/hsc3-lang";
        description = "Haskell SuperCollider Language";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3-lisp" = callPackage
@@ -109104,7 +107507,6 @@ self: {
        homepage = "http://rd.slavepianos.org/t/hsc3-lisp";
        description = "LISP SUPERCOLLIDER";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3-plot" = callPackage
@@ -109122,7 +107524,6 @@ self: {
        homepage = "http://rd.slavepianos.org/t/hsc3-plot";
        description = "Haskell SuperCollider Plotting";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3-process" = callPackage
@@ -109157,7 +107558,6 @@ self: {
        homepage = "http://rd.slavepianos.org/?t=hsc3-rec";
        description = "Haskell SuperCollider Record Variants";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3-rw" = callPackage
@@ -109205,7 +107605,6 @@ self: {
        homepage = "https://github.com/kaoskorobase/hsc3-server";
        description = "SuperCollider server resource management and synchronization";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3-sf" = callPackage
@@ -109247,7 +107646,6 @@ self: {
        homepage = "http://rd.slavepianos.org/?t=hsc3-unsafe";
        description = "Unsafe Haskell SuperCollider";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsc3-utils" = callPackage
@@ -109284,7 +107682,6 @@ self: {
        jailbreak = true;
        description = "Haskell bindings to IIDC1394 cameras, via Camwire";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {camwire_1394 = null; dc1394_control = null; raw1394 = null;};
 
   "hscassandra" = callPackage
@@ -109302,7 +107699,6 @@ self: {
        homepage = "https://github.com/necrobious/hscassandra";
        description = "cassandra database interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hscd" = callPackage
@@ -109333,7 +107729,6 @@ self: {
        homepage = "http://haskell.org/gtk2hs/archives/2006/01/26/cairo-eye-candy/";
        description = "An elegant analog clock using Haskell, GTK and Cairo";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hscolour_1_20_3" = callPackage
@@ -109420,7 +107815,6 @@ self: {
        homepage = "https://github.com/bosu/hscope";
        description = "cscope like browser for Haskell code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hscrtmpl" = callPackage
@@ -109565,7 +107959,6 @@ self: {
        homepage = "https://github.com/mvoidex/hsdev";
        description = "Haskell development library and tool with support of autocompletion, symbol info, go to declaration, find references etc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsdif" = callPackage
@@ -109593,7 +107986,6 @@ self: {
        homepage = "http://neugierig.org/software/darcs/hsdip/";
        description = "hsdip - a Diplomacy parser/renderer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsdns" = callPackage
@@ -109624,7 +108016,6 @@ self: {
        homepage = "https://github.com/bazqux/hsdns-cache";
        description = "Caching asynchronous DNS resolver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hse-cpp" = callPackage
@@ -109777,7 +108168,6 @@ self: {
        homepage = "http://lpuppet.banquise.net";
        description = "A small and ugly library that emulates the output of the puppet facter program";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsfcsh" = callPackage
@@ -109822,7 +108212,6 @@ self: {
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/hsgnutls";
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gcrypt = null; inherit (pkgs) gnutls;};
 
   "hsgnutls-yj" = callPackage
@@ -109836,7 +108225,6 @@ self: {
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/hsgnutls";
        description = "Library wrapping the GnuTLS API";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gcrypt = null; inherit (pkgs) gnutls;};
 
   "hsgsom" = callPackage
@@ -109848,7 +108236,6 @@ self: {
        libraryHaskellDepends = [ base containers random stm time ];
        description = "An implementation of the GSOM clustering algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsgtd" = callPackage
@@ -109984,7 +108371,6 @@ self: {
        ];
        description = "A command line program for extending the import list of a Haskell source file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsini" = callPackage
@@ -110013,7 +108399,6 @@ self: {
        libraryHaskellDepends = [ base Cabal ];
        description = "Skeleton for new Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hslackbuilder" = callPackage
@@ -110030,7 +108415,6 @@ self: {
        homepage = "http://code.haskell.org/~arossato/hslackbuilder";
        description = "HSlackBuilder automatically generates slackBuild scripts from a cabal package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hslibsvm" = callPackage
@@ -110043,7 +108427,6 @@ self: {
        librarySystemDepends = [ svm ];
        description = "A FFI binding to libsvm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {svm = null;};
 
   "hslinks" = callPackage
@@ -110266,7 +108649,6 @@ self: {
        homepage = "https://github.com/vincentg/hsmagick";
        description = "FFI bindings for the GraphicsMagick library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null; 
          inherit (pkgs) jasper; inherit (pkgs) lcms; 
          inherit (pkgs) libjpeg; inherit (pkgs) libpng; 
@@ -110300,7 +108682,6 @@ self: {
        homepage = "http://code.google.com/p/hsmtpclient/";
        description = "Simple SMTP Client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsndfile" = callPackage
@@ -110327,7 +108708,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Hsndfile";
        description = "Haskell bindings for libsndfile (Data.StorableVector interface)";
        license = stdenv.lib.licenses.lgpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsndfile-vector" = callPackage
@@ -110361,7 +108741,6 @@ self: {
        homepage = "https://github.com/mrdomino/hsnock/";
        description = "Nock 5K interpreter";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsnoise" = callPackage
@@ -110387,7 +108766,6 @@ self: {
        executableHaskellDepends = [ base network pcap ];
        description = "a miniature network sniffer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsnsq" = callPackage
@@ -110424,7 +108802,6 @@ self: {
        homepage = "http://www.cs.helsinki.fi/u/ekarttun/util/";
        description = "Libraries to use SNTP protocol and small client/server implementations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsoptions" = callPackage
@@ -110451,7 +108828,6 @@ self: {
        homepage = "https://github.com/josercruz01/hsoptions";
        description = "Haskell library that supports command-line flag processing";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsp" = callPackage
@@ -110476,7 +108852,6 @@ self: {
        homepage = "http://code.google.com/p/hsp";
        description = "Facilitates running Haskell Server Pages web pages as CGI programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsparklines" = callPackage
@@ -110511,7 +108886,6 @@ self: {
        homepage = "https://github.com/robstewart57/hsparql";
        description = "A SPARQL query generator and DSL, and a client to query a SPARQL server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspear" = callPackage
@@ -110528,7 +108902,6 @@ self: {
        homepage = "http://rd.slavepianos.org/?t=hspear";
        description = "Haskell Spear Parser";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec_2_1_2" = callPackage
@@ -111316,7 +109689,6 @@ self: {
        jailbreak = true;
        description = "An experimental DSL for testing on top of Hspec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-jenkins" = callPackage
@@ -111537,7 +109909,6 @@ self: {
        libraryHaskellDepends = [ hspec test-shouldbe ];
        description = "Convenience wrapper and utilities for hspec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspec-smallcheck_0_3_0" = callPackage
@@ -111883,7 +110254,6 @@ self: {
        ];
        description = "A client library for the spread toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hspresent" = callPackage
@@ -111899,7 +110269,6 @@ self: {
        jailbreak = true;
        description = "A terminal presentation tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsprocess" = callPackage
@@ -111925,7 +110294,6 @@ self: {
        ];
        description = "The Haskell Stream Processor command line utility";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsql" = callPackage
@@ -111951,7 +110319,6 @@ self: {
        librarySystemDepends = [ mysqlclient ];
        description = "MySQL driver for HSQL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {mysqlclient = null;};
 
   "hsql-odbc" = callPackage
@@ -112009,7 +110376,6 @@ self: {
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "Haskell binding for Qt Quick";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {qt5 = null;};
 
   "hsqml-datamodel" = callPackage
@@ -112023,7 +110389,6 @@ self: {
        homepage = "https://github.com/marcinmrotek/hsqml-datamodel";
        description = "HsQML (Qt5) data model";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {qt5 = null;};
 
   "hsqml-datamodel-vinyl" = callPackage
@@ -112041,7 +110406,6 @@ self: {
        homepage = "https://github.com/marcinmrotek/hsqml-datamodel-vinyl";
        description = "HsQML DataModel instances for Vinyl Rec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsqml-demo-morris" = callPackage
@@ -112060,7 +110424,6 @@ self: {
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "HsQML-based implementation of Nine Men's Morris";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsqml-demo-notes" = callPackage
@@ -112079,7 +110442,6 @@ self: {
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "Sticky notes example program implemented in HsQML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hsqml-demo-samples" = callPackage
@@ -112095,7 +110457,6 @@ self: {
        homepage = "http://www.gekkou.co.uk/software/hsqml/";
        description = "HsQML sample programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsqml-morris" = callPackage
@@ -112115,7 +110476,6 @@ self: {
        homepage = "http://www.gekkou.co.uk/";
        description = "HsQML-based implementation of Nine Men's Morris";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsreadability" = callPackage
@@ -112154,7 +110514,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit unix ];
        description = "Haskell bindings to libseccomp";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {seccomp = null;};
 
   "hsshellscript" = callPackage
@@ -112251,7 +110610,6 @@ self: {
        homepage = "https://github.com/haas/hstats";
        description = "Statistical Computing in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hstatsd" = callPackage
@@ -112283,7 +110641,6 @@ self: {
        homepage = "http://bitbucket.org/dave4420/hstest/wiki/Home";
        description = "Runs tests via QuickCheck1 and HUnit; like quickCheck-script but uses GHC api";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hstidy" = callPackage
@@ -112298,7 +110655,6 @@ self: {
        homepage = "http://code.haskell.org/~morrow/code/haskell/hstidy";
        description = "Takes haskell source on stdin, parses it, then prettyprints it to stdout";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hstorchat" = callPackage
@@ -112327,7 +110683,6 @@ self: {
        jailbreak = true;
        description = "Distributed instant messaging over Tor";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hstradeking" = callPackage
@@ -112353,7 +110708,6 @@ self: {
        jailbreak = true;
        description = "Tradeking API bindings for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hstyle" = callPackage
@@ -112372,7 +110726,6 @@ self: {
        jailbreak = true;
        description = "Checks Haskell source code for style compliance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hstzaar" = callPackage
@@ -112393,7 +110746,6 @@ self: {
        homepage = "http://www.dcc.fc.up.pt/~pbv/stuff/hstzaar";
        description = "A two player abstract strategy game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsubconvert" = callPackage
@@ -112416,7 +110768,6 @@ self: {
        homepage = "https://github.com/jwiegley/hsubconvert";
        description = "One-time, faithful conversion of Subversion repositories to Git";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsverilog" = callPackage
@@ -112448,7 +110799,6 @@ self: {
        librarySystemDepends = [ ncurses readline swipl ];
        description = "embedding prolog in haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ncurses; inherit (pkgs) readline; 
          swipl = null;};
 
@@ -112467,7 +110817,6 @@ self: {
        homepage = "http://patch-tag.com/r/nibro/hsx";
        description = "HSX (Haskell Source with XML) allows literal XML syntax in Haskell source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsx-jmacro" = callPackage
@@ -112494,7 +110843,6 @@ self: {
        homepage = "http://code.google.com/hsp";
        description = "XHTML utilities to use together with HSX";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsx2hs" = callPackage
@@ -112526,7 +110874,6 @@ self: {
        homepage = "http://github.com/aycanirican/hsyscall";
        description = "FFI to syscalls";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hsyslog" = callPackage
@@ -112553,7 +110900,6 @@ self: {
        librarySystemDepends = [ com_err zephyr ];
        description = "Simple libzephyr bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {com_err = null; zephyr = null;};
 
   "htaglib" = callPackage
@@ -112572,7 +110918,6 @@ self: {
        homepage = "https://github.com/mrkkrp/htaglib";
        description = "Bindings to TagLib, audio meta-data library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) taglib;};
 
   "htags" = callPackage
@@ -112774,7 +111119,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/html-entities";
        description = "A codec library for HTML-escaped text and HTML-entities";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "html-kure" = callPackage
@@ -112812,7 +111156,6 @@ self: {
        homepage = "http://github.com/kylcarte/html-rules/";
        description = "Perform traversals of HTML structures using sets of rules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "html-tokenizer" = callPackage
@@ -112923,7 +111266,6 @@ self: {
        homepage = "https://github.com/cies/htoml";
        description = "Parser for TOML files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "htrace" = callPackage
@@ -113012,7 +111354,6 @@ self: {
        ];
        description = "Import XML files from The Sports Network into an RDBMS";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-accept" = callPackage
@@ -114011,7 +112352,6 @@ self: {
        homepage = "https://github.com/spl/http-client-request-modifiers";
        description = "Convenient monadic HTTP request modifiers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-client-streams" = callPackage
@@ -114251,7 +112591,6 @@ self: {
        homepage = "https://github.com/exbb2/http-conduit-browser";
        description = "Browser interface to the http-conduit package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-conduit-downloader" = callPackage
@@ -114272,7 +112611,6 @@ self: {
        homepage = "https://github.com/bazqux/http-conduit-downloader";
        description = "HTTP downloader tailored for web-crawler needs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-date_0_0_4" = callPackage
@@ -114384,7 +112722,6 @@ self: {
        homepage = "http://github.com/snoyberg/http-enumerator";
        description = "HTTP client package with enumerator interface and HTTPS support. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-kinder" = callPackage
@@ -114549,7 +112886,6 @@ self: {
        jailbreak = true;
        description = "Monad abstraction for HTTP allowing lazy transfer and non-I/O simulation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-proxy" = callPackage
@@ -114572,7 +112908,6 @@ self: {
        homepage = "https://github.com/erikd/http-proxy";
        description = "A library for writing HTTP and HTTPS proxies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-querystring" = callPackage
@@ -114732,7 +113067,6 @@ self: {
        libraryHaskellDepends = [ base network ];
        description = "A simple websever with an interact style API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-streams" = callPackage
@@ -114785,7 +113119,6 @@ self: {
        homepage = "https://github.com/openbrainsrc/http-test";
        description = "Test framework for HTTP APIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "http-types_0_8_5" = callPackage
@@ -115059,7 +113392,6 @@ self: {
        homepage = "https://github.com/fmap/https-everywhere-rules";
        description = "High-level access to HTTPS Everywhere rulesets";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "https-everywhere-rules-raw" = callPackage
@@ -115073,7 +113405,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/fmap/https-everywhere-rules-raw";
-       description = "Low-level (i.e. XML) access to HTTPS Everywhere rulesets";
+       description = "Low-level (i.e. XML) access to HTTPS Everywhere rulesets.";
        license = stdenv.lib.licenses.gpl2;
      }) {};
 
@@ -115092,7 +113424,6 @@ self: {
        ];
        description = "Specification of HTTP request/response generators and parsers";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "htune" = callPackage
@@ -115107,7 +113438,6 @@ self: {
        jailbreak = true;
        description = "harmonic analyser and tuner for musical instruments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "htzaar" = callPackage
@@ -115123,7 +113453,6 @@ self: {
        homepage = "http://tomahawkins.org";
        description = "A two player abstract strategy game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "hub" = callPackage
@@ -115180,7 +113509,6 @@ self: {
        jailbreak = true;
        description = "Support library for Hubris, the Ruby <=> Haskell bridge";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ruby;};
 
   "huckleberry" = callPackage
@@ -115221,7 +113549,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Yhc";
        description = "Hugs Front-end to Yhc Core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hulk" = callPackage
@@ -115249,7 +113576,6 @@ self: {
        jailbreak = true;
        description = "IRC server written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "human-readable-duration_0_1_0_0" = callPackage
@@ -115312,7 +113638,6 @@ self: {
        jailbreak = true;
        description = "Haskell UPnP Media Server";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hunch" = callPackage
@@ -115364,7 +113689,6 @@ self: {
        homepage = "http://patch-tag.com/r/kwallmar/hunit_gui/home";
        description = "A GUI testrunner for HUnit";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hunit-parsec" = callPackage
@@ -115390,7 +113714,6 @@ self: {
        homepage = "github.com/tcrayford/rematch";
        description = "HUnit support for rematch";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hunp" = callPackage
@@ -115441,7 +113764,6 @@ self: {
        homepage = "http://github.com/hunt-framework/";
        description = "A search and indexing engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hunt-server" = callPackage
@@ -115467,7 +113789,6 @@ self: {
        homepage = "http://github.com/hunt-framework";
        description = "A search and indexing engine server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hunt-server-cli" = callPackage
@@ -115511,7 +113832,6 @@ self: {
        homepage = "http://code.google.com/p/copperbox/";
        description = "Extract function names from Windows DLLs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "husk-scheme" = callPackage
@@ -115571,7 +113891,6 @@ self: {
        homepage = "http://github.com/markusle/husky/tree/master";
        description = "A simple command line calculator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hutton" = callPackage
@@ -115593,7 +113912,6 @@ self: {
        jailbreak = true;
        description = "A program for the button on Reddit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "huttons-razor" = callPackage
@@ -115620,7 +113938,6 @@ self: {
        jailbreak = true;
        description = "Fuzzy logic library with support for T1, IT2, GT2";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hvect_0_2_0_0" = callPackage
@@ -115743,7 +114060,6 @@ self: {
        jailbreak = true;
        description = "Simple Haskell Web Server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hwsl2" = callPackage
@@ -115817,7 +114133,6 @@ self: {
        jailbreak = true;
        description = "Haskell XMPP (Jabber Client) Command Line Interface (CLI)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hxournal" = callPackage
@@ -115845,7 +114160,6 @@ self: {
        homepage = "http://ianwookim.org/hxournal";
        description = "A pen notetaking program written in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hxt_9_3_1_7" = callPackage
@@ -115942,7 +114256,6 @@ self: {
        homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
        description = "Serialisation and deserialisation of HXT XmlTrees";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hxt-cache" = callPackage
@@ -116053,7 +114366,6 @@ self: {
        homepage = "http://www.fh-wedel.de/~si/HXmlToolbox/index.html";
        description = "A collection of tools for processing XML with Haskell (Filter variant)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hxt-http_9_1_5" = callPackage
@@ -116306,7 +114618,6 @@ self: {
        jailbreak = true;
        description = "Helper functions for HXT";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hxweb" = callPackage
@@ -116318,7 +114629,6 @@ self: {
        libraryHaskellDepends = [ base cgi fastcgi libxml mtl xslt ];
        description = "Minimal webframework using fastcgi, libxml2 and libxslt";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyahtzee" = callPackage
@@ -116371,7 +114681,6 @@ self: {
        homepage = "http://repos.mine.nu/davve/darcs/hybrid";
        description = "A implementation of a type-checker for Lambda-H";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hybrid-vectors_0_1_2" = callPackage
@@ -116431,7 +114740,6 @@ self: {
        homepage = "https://github.com/mruegenberg/hydra-hs";
        description = "Haskell binding to the Sixense SDK for the Razer Hydra";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {sixense_x64 = null;};
 
   "hydra-print" = callPackage
@@ -116503,7 +114811,6 @@ self: {
        homepage = "https://scravy.de/hydrogen-cli/";
        description = "Hydrogen Data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen-cli-args" = callPackage
@@ -116521,7 +114828,6 @@ self: {
        homepage = "https://scravy.de/hydrogen-cli-args/";
        description = "Hydrogen Command Line Arguments Parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen-data" = callPackage
@@ -116535,7 +114841,6 @@ self: {
        homepage = "https://scravy.de/hydrogen-data/";
        description = "Hydrogen Data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen-multimap" = callPackage
@@ -116563,7 +114868,6 @@ self: {
        homepage = "https://scravy.de/hydrogen-parsing/";
        description = "Hydrogen Parsing Utilities";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen-prelude" = callPackage
@@ -116584,7 +114888,6 @@ self: {
        homepage = "http://scravy.de/hydrogen-prelude/";
        description = "Hydrogen Prelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen-prelude-parsec" = callPackage
@@ -116598,7 +114901,6 @@ self: {
        homepage = "http://scravy.de/hydrogen-prelude-parsec/";
        description = "Hydrogen Prelude /w Parsec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen-syntax" = callPackage
@@ -116617,7 +114919,6 @@ self: {
        homepage = "https://scravy.de/hydrogen-syntax/";
        description = "Hydrogen Syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen-util" = callPackage
@@ -116634,7 +114935,6 @@ self: {
        homepage = "https://scravy.de/hydrogen-util/";
        description = "Hydrogen Tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hydrogen-version" = callPackage
@@ -116666,7 +114966,6 @@ self: {
        homepage = "http://github.com/tibbe/hyena";
        description = "Simple web application server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hylolib" = callPackage
@@ -116683,7 +114982,6 @@ self: {
        jailbreak = true;
        description = "Tools for hybrid logics related programs";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hylotab" = callPackage
@@ -116698,7 +114996,6 @@ self: {
        homepage = "http://www.glyc.dc.uba.ar/intohylo/hylotab.php";
        description = "Tableau based theorem prover for hybrid logics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyloutils" = callPackage
@@ -116714,7 +115011,6 @@ self: {
        ];
        description = "Very small programs for hybrid logics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyperdrive" = callPackage
@@ -116734,7 +115030,6 @@ self: {
        jailbreak = true;
        description = "a fast, trustworthy HTTP(s) server built";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyperfunctions" = callPackage
@@ -116822,7 +115117,6 @@ self: {
        homepage = "https://github.com/mkscrg/hyperpublic-haskell";
        description = "A thin wrapper for the Hyperpublic API";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hyphenate" = callPackage
@@ -116965,7 +115259,6 @@ self: {
        homepage = "https://github.com/zoetic-community/hypher";
        description = "A Haskell neo4j client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "hzaif" = callPackage
@@ -117071,7 +115364,6 @@ self: {
        ];
        description = "Internationalization for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iCalendar" = callPackage
@@ -117100,9 +115392,8 @@ self: {
        version = "0.0.1";
        sha256 = "f7c8ed3664c44f8fce891addc48051d181c0a4d47f1796a4e724855af681303d";
        libraryHaskellDepends = [ base interleavableIO mtl ];
-       description = "Version of Control.Exception using InterleavableIO";
+       description = "Version of Control.Exception using InterleavableIO.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iap-verifier" = callPackage
@@ -117865,7 +116156,6 @@ self: {
        homepage = "http://ideas.cs.uu.nl/www/";
        description = "Feedback services for intelligent tutoring systems";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ideas-math" = callPackage
@@ -117885,7 +116175,6 @@ self: {
        homepage = "http://ideas.cs.uu.nl/www/";
        description = "Interactive domain reasoner for logic and mathematics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "idempotent" = callPackage
@@ -117945,7 +116234,6 @@ self: {
        ];
        description = "ID3v2 (tagging standard for MP3 files) library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "idna" = callPackage
@@ -117969,7 +116257,6 @@ self: {
        jailbreak = true;
        description = "Converts Unicode hostnames into ASCII";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "idris" = callPackage
@@ -118032,7 +116319,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "ieee-utils";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ieee-utils-tempfix" = callPackage
@@ -118186,7 +116472,6 @@ self: {
        homepage = "http://www.haskell.org/gtk2hs/";
        description = "Bindings for the Gtk/OS X integration library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {ige-mac-integration = null;};
 
   "ignore" = callPackage
@@ -118225,7 +116510,6 @@ self: {
        homepage = "http://giorgidze.github.com/igraph/";
        description = "Bindings to the igraph C library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {igraph = null;};
 
   "igrf" = callPackage
@@ -118505,7 +116789,6 @@ self: {
        homepage = "https://tweag.github.io/HaskellR/";
        description = "Embed R quasiquotes and plots in IHaskell notebooks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihaskell-juicypixels" = callPackage
@@ -118603,7 +116886,6 @@ self: {
        homepage = "http://www.github.com/gibiansky/IHaskell";
        description = "IPython standard widgets for IHaskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ihttp" = callPackage
@@ -118622,7 +116904,6 @@ self: {
        executableHaskellDepends = [ base network ];
        description = "Incremental HTTP iteratee";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "illuminate" = callPackage
@@ -118644,7 +116925,6 @@ self: {
        homepage = "http://github.com/jgm/illuminate";
        description = "A fast syntax highlighting library built with alex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "image-type" = callPackage
@@ -118697,7 +116977,6 @@ self: {
        testPkgconfigDepends = [ imagemagick ];
        description = "bindings to imagemagick library";
        license = "unknown";
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {inherit (pkgs) imagemagick;};
 
   "imagepaste" = callPackage
@@ -118718,7 +116997,6 @@ self: {
        homepage = "https://bitbucket.org/balta2ar/imagepaste";
        description = "Command-line image paste utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "imagesize-conduit_1_0_0_4" = callPackage
@@ -118822,7 +117100,6 @@ self: {
        jailbreak = true;
        description = "Minimalistic reference manager";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "imgurder" = callPackage
@@ -118843,7 +117120,6 @@ self: {
        ];
        description = "Uploader for Imgur";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "imm" = callPackage
@@ -118873,7 +117149,6 @@ self: {
        jailbreak = true;
        description = "Retrieve RSS/Atom feeds and write one mail per new item in a maildir";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "immortal" = callPackage
@@ -118917,7 +117192,6 @@ self: {
        jailbreak = true;
        description = "Multi-platform parser analyzer and generator";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "imperative-edsl" = callPackage
@@ -118957,7 +117231,6 @@ self: {
        ];
        description = "Deep embedding of VHDL programs with code generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "implicit" = callPackage
@@ -118981,7 +117254,7 @@ self: {
          unordered-containers vector-space
        ];
        homepage = "https://github.com/colah/ImplicitCAD";
-       description = "Math-inspired programmatic 2&3D CAD: CSG, bevels, and shells; gcode export.";
+       description = "Math-inspired programmatic 2&3D CAD: CSG, bevels, and shells; gcode export..";
        license = "GPL";
      }) {};
 
@@ -119018,7 +117291,7 @@ self: {
        sha256 = "7f4f8d20bea5ee0c125218276d6e252d85c748808fc7f8ec5d6990aa84e277e2";
        libraryHaskellDepends = [ base lens ];
        homepage = "https://github.com/wdanilo/impossible";
-       description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable";
+       description = "Set of data and type definitions of impossible types. Impossible types are useful when declaring type classes / type families instances that should not be expanded by GHC until a specific type is provided in order to keep the types nice and readable.";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -119033,7 +117306,6 @@ self: {
        homepage = "http://github.com/tomahawkins/improve/wiki/ImProve";
        description = "An imperative, verifiable programming language for high assurance applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inc-ref" = callPackage
@@ -119069,7 +117341,6 @@ self: {
        homepage = "https://github.com/adamgundry/inch/";
        description = "A type-checker for Haskell with integer constraints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "include-file_0_1_0_2" = callPackage
@@ -119119,7 +117390,6 @@ self: {
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/incremental-computing";
        description = "Incremental computing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "incremental-parser_0_2_3_3" = callPackage
@@ -119193,7 +117463,6 @@ self: {
        homepage = "https://github.com/blamario/incremental-parser";
        description = "Generic parser library capable of providing partial results from partial input";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "incremental-sat-solver" = callPackage
@@ -119206,7 +117475,6 @@ self: {
        homepage = "http://github.com/sebfisch/incremental-sat-solver";
        description = "Simple, Incremental SAT Solving as a Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "increments" = callPackage
@@ -119227,7 +117495,6 @@ self: {
        jailbreak = true;
        description = "type classes for incremental updates to data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indentation" = callPackage
@@ -119285,7 +117552,6 @@ self: {
        jailbreak = true;
        description = "Indexed Types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indexed" = callPackage
@@ -119361,7 +117627,6 @@ self: {
        testHaskellDepends = [ base QuickCheck ];
        description = "Multi-dimensional statically bounded indices";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "indieweb-algorithms" = callPackage
@@ -119388,7 +117653,6 @@ self: {
        homepage = "https://github.com/myfreeweb/indieweb-algorithms";
        description = "A collection of implementations of IndieWeb algorithms";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inf-interval" = callPackage
@@ -119422,7 +117686,6 @@ self: {
        homepage = "https://github.com/silky/infer-upstream";
        description = "Find the repository from where a given repo was forked";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "infernu" = callPackage
@@ -119472,7 +117735,6 @@ self: {
        ];
        jailbreak = true;
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "infix" = callPackage
@@ -119485,7 +117747,6 @@ self: {
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Infix expression re-parsing (for HsParser library)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inflections" = callPackage
@@ -119517,7 +117778,6 @@ self: {
        homepage = "https://bitbucket.org/eegg/inflist";
        description = "An infinite list type and operations thereon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "influxdb" = callPackage
@@ -119549,7 +117809,6 @@ self: {
        homepage = "https://github.com/maoe/influxdb-haskell";
        description = "Haskell client library for InfluxDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "informative" = callPackage
@@ -119578,7 +117837,6 @@ self: {
        homepage = "http://doomanddarkness.eu/pub/informative";
        description = "A yesod subsite serving a wiki";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ini_0_2_2" = callPackage
@@ -119685,7 +117943,6 @@ self: {
        homepage = "https://chiselapp.com/user/mwm/repository/inilist";
        description = "Processing for .ini files with duplicate sections and options";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "inject" = callPackage
@@ -119744,7 +118001,7 @@ self: {
          raw-strings-qq regex-posix template-haskell transformers
          unordered-containers vector
        ];
-       description = "Write Haskell source files including C code inline. No FFI required";
+       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;};
@@ -119773,7 +118030,7 @@ self: {
          raw-strings-qq regex-posix template-haskell transformers
          unordered-containers vector
        ];
-       description = "Write Haskell source files including C code inline. No FFI required";
+       description = "Write Haskell source files including C code inline. No FFI required.";
        license = stdenv.lib.licenses.mit;
      }) {inherit (pkgs) gsl; gslcblas = null;};
 
@@ -119787,7 +118044,6 @@ self: {
        testHaskellDepends = [ base ];
        description = "Lets you embed C++ code into Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "inline-c-win32" = callPackage
@@ -119833,9 +118089,8 @@ self: {
          tasty-expected-failure tasty-golden tasty-hunit tasty-quickcheck
          template-haskell temporary text unix vector
        ];
-       description = "Seamlessly call R from Haskell and vice versa. No FFI required";
+       description = "Seamlessly call R from Haskell and vice versa. No FFI required.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) R;};
 
   "inquire" = callPackage
@@ -119967,7 +118222,6 @@ self: {
        jailbreak = true;
        description = "Heterogenous Zipper in Instant Generics";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "instinct" = callPackage
@@ -120034,7 +118288,6 @@ self: {
        homepage = "http://projects.haskell.org/~malcolm/integer-pure";
        description = "A pure-Haskell implementation of arbitrary-precision Integers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "integration_0_2_0_1" = callPackage
@@ -120079,7 +118332,6 @@ self: {
        homepage = "https://github.com/rrnewton/intel-aes/wiki";
        description = "Hardware accelerated AES encryption and Random Number Generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {intel_aes = null;};
 
   "interchangeable" = callPackage
@@ -120105,7 +118357,6 @@ self: {
        executableHaskellDepends = [ base directory haskell-src hint mtl ];
        description = "Generates a version of a module using InterleavableIO";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "interleavableIO" = callPackage
@@ -120117,7 +118368,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Use other Monads in functions that asks for an IO Monad";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "interleave" = callPackage
@@ -120176,7 +118426,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/internetmarke/";
        description = "Shell command for constructing custom stamps for German Post";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "interpol" = callPackage
@@ -120262,7 +118511,6 @@ self: {
        ];
        description = "QuasiQuoter for Ruby-style multi-line interpolated strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "interpolatedstring-qq-mwotton" = callPackage
@@ -120276,9 +118524,8 @@ self: {
          base haskell-src-meta-mwotton template-haskell
        ];
        jailbreak = true;
-       description = "DO NOT USE THIS. interpolatedstring-qq works now";
+       description = "DO NOT USE THIS. interpolatedstring-qq works now.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "interpolation" = callPackage
@@ -120359,8 +118606,8 @@ self: {
      }:
      mkDerivation {
        pname = "intricacy";
-       version = "0.5.7.2";
-       sha256 = "50482ec337ab24992a46e92df1263da65b7f1b2eb84f563de5f41d56f96a952a";
+       version = "0.6";
+       sha256 = "8cd3cdd44e80f65f79c88a3a18580ce4bf02dc5086652f8af46ec90d18cadb42";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -120388,7 +118635,6 @@ self: {
        homepage = "https://github.com/pxqr/intset";
        description = "Pure, mergeable, succinct Int sets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "invariant_0_2" = callPackage
@@ -120564,7 +118810,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "An API for generating TIMBER style reactive objects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "io-region" = callPackage
@@ -120776,7 +119021,6 @@ self: {
        homepage = "https://bitbucket.org/dshearer/iotransaction/";
        description = "Supports the automatic undoing of IO operations when an exception is thrown";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ip-quoter" = callPackage
@@ -120825,7 +119069,6 @@ self: {
        homepage = "http://darcs.nomeata.de/ipatch";
        description = "interactive patch editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ipc" = callPackage
@@ -120842,7 +119085,6 @@ self: {
        jailbreak = true;
        description = "High level inter-process communication library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ipcvar" = callPackage
@@ -120878,7 +119120,6 @@ self: {
        jailbreak = true;
        description = "haskell binding to ipopt and nlopt including automatic differentiation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ipopt; nlopt = null;};
 
   "ipprint" = callPackage
@@ -120994,7 +119235,6 @@ self: {
        jailbreak = true;
        description = "iptables rules parser/printer library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iptadmin" = callPackage
@@ -121021,7 +119261,6 @@ self: {
        homepage = "http://iptadmin.117.su";
        description = "web-interface for iptables";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ipython-kernel_0_6_1_2" = callPackage
@@ -121431,7 +119670,6 @@ self: {
        jailbreak = true;
        description = "Check whether a value has been evaluated";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "isiz" = callPackage
@@ -121473,7 +119711,6 @@ self: {
        ];
        description = "Advanced ESMTP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iso3166-country-codes" = callPackage
@@ -121582,7 +119819,6 @@ self: {
        homepage = "https://github.com/JohnLato/iter-stats";
        description = "iteratees for statistical processing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iterIO" = callPackage
@@ -121603,7 +119839,6 @@ self: {
        homepage = "http://www.scs.stanford.edu/~dm/iterIO";
        description = "Iteratee-based IO with pipe operators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zlib;};
 
   "iterable" = callPackage
@@ -121643,7 +119878,6 @@ self: {
        homepage = "http://www.tiresiaspress.us/haskell/iteratee";
        description = "Iteratee-based I/O";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iteratee-compress" = callPackage
@@ -121656,7 +119890,6 @@ self: {
        librarySystemDepends = [ bzip2 zlib ];
        description = "Enumeratees for compressing and decompressing streams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) bzip2; inherit (pkgs) zlib;};
 
   "iteratee-mtl" = callPackage
@@ -121693,7 +119926,6 @@ self: {
        jailbreak = true;
        description = "Package allowing parsec parser initeratee";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iteratee-stm" = callPackage
@@ -121709,7 +119941,6 @@ self: {
        homepage = "http://www.tiresiaspress.us/~jwlato/haskell/iteratee-stm";
        description = "Concurrent iteratees using STM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "iterio-server" = callPackage
@@ -121728,7 +119959,6 @@ self: {
        homepage = "https://github.com/alevy/iterio-server";
        description = "Library for building servers with IterIO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivar-simple" = callPackage
@@ -121759,7 +119989,6 @@ self: {
        homepage = "http://www.dcs.st-and.ac.uk/~eb/Ivor/";
        description = "Theorem proving library based on dependent type theory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory" = callPackage
@@ -121777,7 +120006,6 @@ self: {
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Safe embedded C programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-backend-c" = callPackage
@@ -121798,7 +120026,6 @@ self: {
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory C backend";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-bitdata" = callPackage
@@ -121819,7 +120046,6 @@ self: {
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory bit-data support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-examples" = callPackage
@@ -121842,7 +120068,6 @@ self: {
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory examples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-hw" = callPackage
@@ -121860,7 +120085,6 @@ self: {
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory hardware model (STM32F4)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-opts" = callPackage
@@ -121878,7 +120102,6 @@ self: {
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory compiler optimizations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-quickcheck" = callPackage
@@ -121892,7 +120115,6 @@ self: {
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "QuickCheck driver for Ivory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivory-stdlib" = callPackage
@@ -121906,7 +120128,6 @@ self: {
        homepage = "http://smaccmpilot.org/languages/ivory-introduction.html";
        description = "Ivory standard library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ivy-web" = callPackage
@@ -121923,7 +120144,6 @@ self: {
        homepage = "https://github.com/lilac/ivy-web/";
        description = "A lightweight web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ix-shapable" = callPackage
@@ -121950,7 +120170,6 @@ self: {
        homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/";
        description = "A preprocessor for expanding \"ixdo\" notation for indexed monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ixmonad" = callPackage
@@ -122034,7 +120253,6 @@ self: {
        ];
        description = "CLI (command line interface) to YQL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "j2hs" = callPackage
@@ -122056,7 +120274,6 @@ self: {
        jailbreak = true;
        description = "j2hs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ja-base-extra" = callPackage
@@ -122089,7 +120306,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/JACK";
        description = "Bindings for the JACK Audio Connection Kit";
        license = "GPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libjack2;};
 
   "jack-bindings" = callPackage
@@ -122103,7 +120319,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "DEPRECATED Bindings to the JACK Audio Connection Kit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libjack2;};
 
   "jackminimix" = callPackage
@@ -122117,7 +120332,6 @@ self: {
        homepage = "http://www.renickbell.net/doku.php?id=jackminimix";
        description = "control JackMiniMix";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jacobi-roots" = callPackage
@@ -122131,7 +120345,6 @@ self: {
        homepage = "http://github.com/ghorn/jacobi-roots";
        description = "Roots of two shifted Jacobi polynomials (Legendre and Radau) to double precision";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jail" = callPackage
@@ -122198,9 +120411,8 @@ self: {
          test-framework-quickcheck2
        ];
        homepage = "https://github.com/cgo/jalla";
-       description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE";
+       description = "Higher level functions for linear algebra. Wraps BLAS and LAPACKE.";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) blas; cblas = null; lapacke = null;};
 
   "jammittools" = callPackage
@@ -122224,7 +120436,6 @@ self: {
        homepage = "https://github.com/mtolly/jammittools";
        description = "Export sheet music and audio from Windows/Mac app Jammit";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jarfind" = callPackage
@@ -122245,7 +120456,6 @@ self: {
        ];
        description = "Tool for searching java classes, members and fields in classfiles and JAR archives";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "java-bridge" = callPackage
@@ -122269,7 +120479,6 @@ self: {
        ];
        description = "Bindings to the JNI and a high level interface generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "java-bridge-extras" = callPackage
@@ -122282,7 +120491,6 @@ self: {
        jailbreak = true;
        description = "Utilities for working with the java-bridge package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "java-character" = callPackage
@@ -122322,7 +120530,6 @@ self: {
        jailbreak = true;
        description = "Tools for reflecting on Java classes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "javasf" = callPackage
@@ -122344,7 +120551,6 @@ self: {
        homepage = "https://github.com/tonymorris/javasf";
        description = "A utility to print the SourceFile attribute of one or more Java class files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "javav" = callPackage
@@ -122362,7 +120568,6 @@ self: {
        homepage = "https://github.com/tonymorris/javav";
        description = "A utility to print the target version of Java class files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jcdecaux-vls" = callPackage
@@ -122431,7 +120636,6 @@ self: {
        homepage = "http://github.com/achudnov/jespresso";
        description = "Extract all JavaScript from an HTML page and consolidate it in one script";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jmacro_0_6_11" = callPackage
@@ -122628,7 +120832,6 @@ self: {
        homepage = "http://sulzmann.blogspot.com/2008/12/parallel-join-patterns-with-guards-and.html";
        description = "Parallel Join Patterns with Guards and Propagation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "joinlist" = callPackage
@@ -122641,7 +120844,6 @@ self: {
        homepage = "http://code.google.com/p/copperbox/";
        description = "Join list - symmetric list type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jonathanscard" = callPackage
@@ -122659,7 +120861,6 @@ self: {
        homepage = "http://rawr.mschade.me/jonathanscard/";
        description = "An implementation of the Jonathan's Card API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jort" = callPackage
@@ -122674,7 +120875,6 @@ self: {
        jailbreak = true;
        description = "JP's own ray tracer";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jose" = callPackage
@@ -122792,7 +120992,6 @@ self: {
        homepage = "http://github.com/tekul/jose-jwt";
        description = "JSON Object Signing and Encryption Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "jpeg" = callPackage
@@ -122829,7 +121028,6 @@ self: {
        homepage = "https://github.com/sseefried/js-good-parts.git";
        description = "Javascript: The Good Parts -- AST & Pretty Printer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "js-jquery_1_11_1" = callPackage
@@ -122962,7 +121160,6 @@ self: {
        jailbreak = true;
        description = "High level interface for webkit-javascriptcore";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jsmw" = callPackage
@@ -122975,7 +121172,6 @@ self: {
        jailbreak = true;
        description = "Javascript Monadic Writer base package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json" = callPackage
@@ -123248,6 +121444,39 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "json-autotype_1_0_11" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, GenericPretty, hashable, hflags, hint, lens, mmap, mtl
+     , pretty, process, QuickCheck, scientific, smallcheck, text
+     , uniplate, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "json-autotype";
+       version = "1.0.11";
+       sha256 = "98926e7cd2e0b93b1ea61e18270ec70fb71face4bcb10df777dcbe5a21c5bf23";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers filepath GenericPretty hashable
+         hflags hint lens mmap mtl pretty process scientific text uniplate
+         unordered-containers vector
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers filepath GenericPretty hashable
+         hflags hint lens mtl pretty process scientific text uniplate
+         unordered-containers vector
+       ];
+       testHaskellDepends = [
+         aeson base bytestring containers directory filepath GenericPretty
+         hashable hflags lens mtl pretty process QuickCheck scientific
+         smallcheck text uniplate unordered-containers vector
+       ];
+       homepage = "https://github.com/mgajda/json-autotype";
+       description = "Automatic type declaration for JSON input data";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "json-b" = callPackage
     ({ mkDerivation, base, bytestring, bytestring-nums, bytestring-trie
      , bytestringparser-temporary, containers, utf8-string
@@ -123270,7 +121499,6 @@ self: {
        homepage = "http://github.com/jsnx/JSONb/";
        description = "JSON parser that uses byte strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-builder" = callPackage
@@ -123325,7 +121553,6 @@ self: {
        homepage = "http://github.com/snoyberg/json-enumerator";
        description = "Pure-Haskell utilities for dealing with JSON with the enumerator package. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-extra" = callPackage
@@ -123378,7 +121605,7 @@ self: {
        testHaskellDepends = [ base hspec json QuickCheck ];
        jailbreak = true;
        homepage = "https://github.com/jonathankochems/json-litobj";
-       description = "Extends Text.JSON to handle literal JS objects";
+       description = "Extends Text.JSON to handle literal JS objects.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -123444,7 +121671,6 @@ self: {
        homepage = "http://github.com/finnsson/json-qq";
        description = "Json Quasiquatation library for Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-rpc" = callPackage
@@ -123471,7 +121697,6 @@ self: {
        homepage = "https://github.com/xenog/json-rpc";
        description = "Fully-featured JSON-RPC 2.0 library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-rpc-client" = callPackage
@@ -123496,7 +121721,7 @@ self: {
          test-framework-quickcheck2 text unordered-containers vector
        ];
        homepage = "https://github.com/grayjay/json-rpc-client";
-       description = "JSON-RPC 2.0 on the client side";
+       description = "JSON-RPC 2.0 on the client side.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -123519,7 +121744,7 @@ self: {
          text unordered-containers vector
        ];
        homepage = "https://github.com/grayjay/json-rpc-server";
-       description = "JSON-RPC 2.0 on the server side";
+       description = "JSON-RPC 2.0 on the server side.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -123828,7 +122053,6 @@ self: {
        homepage = "https://github.com/ondrap/json-stream";
        description = "Incremental applicative JSON parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "json-togo" = callPackage
@@ -123866,7 +122090,6 @@ self: {
        ];
        description = "A collection of JSON tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json-types" = callPackage
@@ -123894,7 +122117,6 @@ self: {
        ];
        description = "Library provides support for JSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json2-hdbc" = callPackage
@@ -123910,7 +122132,6 @@ self: {
        ];
        description = "Support JSON for SQL Database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "json2-types" = callPackage
@@ -123953,7 +122174,6 @@ self: {
        homepage = "https://github.com/dpwright/jsonresume.hs";
        description = "Parser and datatypes for the JSON Resume format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jsonrpc-conduit" = callPackage
@@ -123972,7 +122192,7 @@ self: {
        testHaskellDepends = [
          aeson base bytestring conduit conduit-extra hspec text
        ];
-       description = "JSON-RPC 2.0 server over a Conduit";
+       description = "JSON-RPC 2.0 server over a Conduit.";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
@@ -123995,7 +122215,6 @@ self: {
        homepage = "https://github.com/yuga/jsonschema-gen";
        description = "JSON Schema generator from Algebraic data type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "jsonsql" = callPackage
@@ -124055,7 +122274,6 @@ self: {
        ];
        description = "Extract substructures from JSON by following a path";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "judy" = callPackage
@@ -124072,7 +122290,6 @@ self: {
        homepage = "http://github.com/mwotton/judy";
        description = "Fast, scalable, mutable dynamic arrays, maps and hashes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {Judy = null;};
 
   "jukebox" = callPackage
@@ -124094,7 +122311,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A first-order reasoning toolbox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "jumpthefive" = callPackage
@@ -124194,9 +122410,8 @@ self: {
          process QuickCheck temporary time
        ];
        homepage = "https://github.com/abhinav/kafka-client";
-       description = "Low-level Haskell client library for Apache Kafka 0.7";
+       description = "Low-level Haskell client library for Apache Kafka 0.7.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "kan-extensions_4_1_1" = callPackage
@@ -124332,7 +122547,6 @@ self: {
        homepage = "http://code.google.com/p/copperbox/";
        description = "Binary parsing with random access";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kanji" = callPackage
@@ -124411,7 +122625,6 @@ self: {
        homepage = "http://ittc.ku.edu/csdl/fpg/Tools/KansasLava";
        description = "Kansas Lava is a hardware simulator and VHDL generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kansas-lava-cores" = callPackage
@@ -124432,7 +122645,6 @@ self: {
        homepage = "http://ittc.ku.edu/csdl/fpg/Tools/KansasLava";
        description = "FPGA Cores Written in Kansas Lava";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kansas-lava-papilio" = callPackage
@@ -124450,7 +122662,6 @@ self: {
        ];
        description = "Kansas Lava support files for the Papilio FPGA board";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kansas-lava-shake" = callPackage
@@ -124462,7 +122673,6 @@ self: {
        libraryHaskellDepends = [ base hastache kansas-lava shake text ];
        description = "Shake rules for building Kansas Lava projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "karakuri" = callPackage
@@ -124480,7 +122690,6 @@ self: {
        homepage = "https://github.com/fumieval/karakuri";
        description = "Good stateful automata";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "karver" = callPackage
@@ -124522,7 +122731,6 @@ self: {
        homepage = "https://github.com/davnils/katt";
        description = "Client for the Kattis judge system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kazura-queue" = callPackage
@@ -124680,7 +122888,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Gtk-based global environment for MVC applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-mvc-model-lightmodel" = callPackage
@@ -124698,7 +122905,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Rapid Gtk Application Development - Reactive Protected Light Models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-mvc-model-protectedmodel" = callPackage
@@ -124716,7 +122922,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Rapid Gtk Application Development - Protected Reactive Models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-mvc-solutions-config" = callPackage
@@ -124751,7 +122956,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Common solutions to recurrent problems in Gtk applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-mvc-view" = callPackage
@@ -124794,7 +122998,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Files as Reactive Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-reactive-gtk" = callPackage
@@ -124812,7 +123015,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Gtk rails - Reactive Fields for Gtk widgets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-reactive-network" = callPackage
@@ -124827,7 +123029,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Sockets as Reactive Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-reactive-polling" = callPackage
@@ -124843,7 +123044,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Polling based Readable RVs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-reactive-wx" = callPackage
@@ -124858,7 +123058,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Reactive Fields for WX widgets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-reactive-yampa" = callPackage
@@ -124875,7 +123074,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - FRP Yampa Signal Functions as RVs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-reactivelenses" = callPackage
@@ -124888,7 +123086,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Reactive Haskell on Rails - Lenses applied to Reactive Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-hails-reactivevalues" = callPackage
@@ -124908,7 +123105,6 @@ self: {
        homepage = "http://www.keera.es/blog/community/";
        description = "Haskell on Rails - Reactive Values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keera-posture" = callPackage
@@ -124943,7 +123139,6 @@ self: {
        homepage = "http://keera.co.uk/projects/keera-posture";
        description = "Get notifications when your sitting posture is inappropriate";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL_mixer;};
 
   "keiretsu" = callPackage
@@ -124966,7 +123161,6 @@ self: {
        jailbreak = true;
        description = "Multi-process orchestration for development and integration testing";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keter_1_3_6" = callPackage
@@ -125312,7 +123506,6 @@ self: {
        ];
        description = "a dAmn ↔ IRC proxy";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keycode_0_1" = callPackage
@@ -125369,7 +123562,6 @@ self: {
        homepage = "https://github.com/lunaryorn/haskell-keyring";
        description = "Keyring access";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keys_3_10_1" = callPackage
@@ -125459,7 +123651,6 @@ self: {
        homepage = "http://github.com/cdornan/keystore";
        description = "Managing stores of secret things";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "keyvaluehash" = callPackage
@@ -125531,7 +123722,6 @@ self: {
        homepage = "http://github.com/kasbah/haskell-kicad-data";
        description = "Parser and writer for KiCad files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kickass-torrents-dump-parser" = callPackage
@@ -125550,7 +123740,6 @@ self: {
        jailbreak = true;
        description = "Parses kat.ph torrent dumps";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kickchan" = callPackage
@@ -125587,7 +123776,6 @@ self: {
        ];
        description = "Process KIF iOS test logs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kinds" = callPackage
@@ -125621,7 +123809,6 @@ self: {
        homepage = "http://github.com/nkpart/kit";
        description = "A dependency manager for Xcode (Objective-C) projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kmeans" = callPackage
@@ -125650,7 +123837,6 @@ self: {
        ];
        description = "Sequential and parallel implementations of Lloyd's algorithm";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kmeans-vector" = callPackage
@@ -125710,7 +123896,6 @@ self: {
        doHaddock = false;
        description = "\"map German words to code representing pronunciation\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kontrakcja-templates" = callPackage
@@ -125769,7 +123954,6 @@ self: {
        homepage = "http://blog.malde.org/";
        description = "The Korfu ORF Utility";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kqueue" = callPackage
@@ -125785,7 +123969,6 @@ self: {
        homepage = "http://github.com/hesselink/kqueue";
        description = "A binding to the kqueue event library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kraken" = callPackage
@@ -125849,7 +124032,6 @@ self: {
        homepage = "https://github.com/corngood/ktx";
        description = "A binding for libktx from Khronos";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {egl = null; inherit (pkgs) glew;};
 
   "kure_2_4_10" = callPackage
@@ -125940,7 +124122,6 @@ self: {
        homepage = "http://ittc.ku.edu/~andygill/kure.php";
        description = "Generator for Boilerplate KURE Combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "kyotocabinet" = callPackage
@@ -125966,7 +124147,6 @@ self: {
        homepage = "http://nonempty.org/software/haskell-l-bfgs-b";
        description = "Bindings to L-BFGS-B, Fortran code for limited-memory quasi-Newton bound-constrained optimization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {lbfgsb = null;};
 
   "labeled-graph" = callPackage
@@ -125978,7 +124158,6 @@ self: {
        libraryHaskellDepends = [ base labeled-tree ];
        description = "Labeled graph structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "labeled-tree" = callPackage
@@ -126015,7 +124194,6 @@ self: {
        homepage = "https://github.com/lucasdicioccio/laborantin-hs";
        description = "an experiment management framework";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "labyrinth" = callPackage
@@ -126039,7 +124217,6 @@ self: {
        homepage = "https://github.com/koterpillar/labyrinth";
        description = "A complicated turn-based game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "labyrinth-server" = callPackage
@@ -126075,7 +124252,6 @@ self: {
        homepage = "https://github.com/koterpillar/labyrinth-server";
        description = "A complicated turn-based game - Web server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lackey" = callPackage
@@ -126111,7 +124287,6 @@ self: {
        homepage = "http://github.com/jfischoff/lagrangian";
        description = "Solve Lagrange multiplier problems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "laika" = callPackage
@@ -126133,7 +124308,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/laika";
        description = "Minimalistic type-checked compile-time template engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambda-ast" = callPackage
@@ -126160,7 +124334,6 @@ self: {
        homepage = "http://www.ittc.ku.edu/csdl/fpg/Tools/LambdaBridge";
        description = "A bridge from Haskell (on a CPU) to VHDL on a FPGA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambda-canvas" = callPackage
@@ -126173,7 +124346,6 @@ self: {
        jailbreak = true;
        description = "Educational drawing canvas for FP explorers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "lambda-devs" = callPackage
@@ -126201,7 +124373,6 @@ self: {
        homepage = "http://github.com/alios/lambda-devs";
        description = "a Paralell-DEVS implementaion based on distributed-process";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambda-options" = callPackage
@@ -126241,7 +124412,6 @@ self: {
        homepage = "http://scravy.de/blog/2012-02-20/a-lambda-toolbox-in-haskell.htm";
        description = "An application to work with the lambda calculus (for learning)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambda2js" = callPackage
@@ -126268,7 +124438,6 @@ self: {
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base parsec ];
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdaFeed" = callPackage
@@ -126283,7 +124452,6 @@ self: {
        homepage = "http://www.cse.unsw.edu.au/~chak/haskell/lambdaFeed/";
        description = "RSS 2.0 feed generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdaLit" = callPackage
@@ -126299,9 +124467,8 @@ self: {
        executableHaskellDepends = [
          base bytestring haskeline lambdaBase mtl network
        ];
-       description = "..";
+       description = "...";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot" = callPackage
@@ -126324,7 +124491,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot is a development tool and advanced IRC bot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-core" = callPackage
@@ -126351,7 +124517,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot core functionality";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-haskell-plugins" = callPackage
@@ -126381,7 +124546,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot Haskell plugins";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-irc-plugins" = callPackage
@@ -126400,7 +124564,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "IRC plugins for lambdabot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-misc-plugins" = callPackage
@@ -126424,7 +124587,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot miscellaneous plugins";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-novelty-plugins" = callPackage
@@ -126445,7 +124607,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Novelty plugins for Lambdabot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-reference-plugins" = callPackage
@@ -126464,7 +124625,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Lambdabot reference plugins";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-social-plugins" = callPackage
@@ -126483,7 +124643,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Social plugins for Lambdabot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdabot-trusted" = callPackage
@@ -126518,7 +124677,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Lambdabot";
        description = "Utility libraries for the advanced IRC bot, Lambdabot";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacat" = callPackage
@@ -126538,7 +124696,6 @@ self: {
        homepage = "http://github.com/baldo/lambdacat";
        description = "Webkit Browser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacms-core" = callPackage
@@ -126594,7 +124751,6 @@ self: {
        executableHaskellDepends = [ base editline mtl pretty ];
        description = "A simple lambda cube type checker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacube-bullet" = callPackage
@@ -126609,31 +124765,32 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
        description = "Example for combining LambdaCube and Bullet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacube-compiler" = callPackage
-    ({ mkDerivation, aeson, async, base, bytestring, containers
-     , deepseq, directory, exceptions, filepath, indentation
-     , lambdacube-ir, monad-control, mtl, optparse-applicative, parsec
-     , pretty-compact, QuickCheck, tasty, tasty-quickcheck, text, time
-     , vector
+    ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring
+     , containers, deepseq, directory, exceptions, filepath, JuicyPixels
+     , lambdacube-ir, megaparsec, monad-control, mtl
+     , optparse-applicative, patience, pretty-show, process, QuickCheck
+     , tasty, tasty-quickcheck, text, time, vect, vector, websockets
+     , wl-pprint
      }:
      mkDerivation {
        pname = "lambdacube-compiler";
-       version = "0.4.0.1";
-       sha256 = "4487798702474096e80a7b0582dc9e2feceef4f82155d65226da474e40f7e4b3";
+       version = "0.5.0.1";
+       sha256 = "d84cefdf1d21e12e6d9ca92f314e35881e5b911630709e36971337dda32ad564";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson base containers deepseq directory exceptions filepath
-         indentation lambdacube-ir mtl parsec pretty-compact text vector
+         lambdacube-ir megaparsec mtl pretty-show text vector wl-pprint
        ];
        executableHaskellDepends = [
-         aeson async base bytestring containers deepseq directory exceptions
-         filepath indentation lambdacube-ir monad-control mtl
-         optparse-applicative parsec pretty-compact QuickCheck tasty
-         tasty-quickcheck text time vector
+         aeson async base base64-bytestring bytestring containers deepseq
+         directory exceptions filepath JuicyPixels lambdacube-ir megaparsec
+         monad-control mtl optparse-applicative patience pretty-show process
+         QuickCheck tasty tasty-quickcheck text time vect vector websockets
+         wl-pprint
        ];
        doHaddock = false;
        homepage = "http://lambdacube3d.com";
@@ -126694,7 +124851,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
        description = "3D rendering engine written entirely in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacube-examples" = callPackage
@@ -126711,34 +124867,41 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
        description = "Examples for LambdaCube";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacube-gl" = callPackage
-    ({ mkDerivation, base, bytestring, containers, JuicyPixels
-     , lambdacube-ir, mtl, OpenGLRaw, vector, vector-algorithms
+    ({ mkDerivation, aeson, base, base64-bytestring, bytestring
+     , containers, exceptions, GLFW-b, JuicyPixels, lambdacube-ir, mtl
+     , network, OpenGLRaw, text, time, vector, vector-algorithms
+     , websockets
      }:
      mkDerivation {
        pname = "lambdacube-gl";
-       version = "0.4.0.2";
-       sha256 = "f9ebec4a981381ffa9f998a636c0aba3f4425b4fb2ae06650ff24e9109328174";
+       version = "0.5.0.1";
+       sha256 = "7a54a39726b993d81fc8e9e0fa58595bd5f69ad317e4a26229d065a82432a9fd";
+       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
+       ];
        doHaddock = false;
        homepage = "http://lambdacube3d.com";
        description = "OpenGL 3.3 Core Profile backend for LambdaCube 3D";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdacube-ir" = callPackage
     ({ mkDerivation, aeson, base, containers, mtl, text, vector }:
      mkDerivation {
        pname = "lambdacube-ir";
-       version = "0.2.0.0";
-       sha256 = "488cbb21a8dca80c16552d3aca868d5aa7085b7bfa2e9ea7c92965bd1e288c48";
+       version = "0.3.0.0";
+       sha256 = "4a9c3f2193984bf36eb06d13db92de541c619502a89e956e1e3a2750a4b68dbc";
        libraryHaskellDepends = [ aeson base containers mtl text vector ];
        description = "LambdaCube 3D intermediate representation of 3D graphics pipelines";
        license = stdenv.lib.licenses.bsd3;
@@ -126764,7 +124927,6 @@ self: {
        homepage = "http://lambdacube3d.wordpress.com/";
        description = "Samples for LambdaCube 3D";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdatex" = callPackage
@@ -126810,9 +124972,8 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://github.com/ashyisme/lambdatwit";
-       description = "Lambdabot running as a twitter bot. Similar to the @fsibot f# bot";
+       description = "Lambdabot running as a twitter bot. Similar to the @fsibot f# bot.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lambdiff" = callPackage
@@ -126832,7 +124993,6 @@ self: {
        homepage = "https://github.com/jamwt/lambdiff.git";
        description = "Diff Viewer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lame-tester" = callPackage
@@ -126850,7 +125010,6 @@ self: {
        homepage = "http://github.com/TheBizzle";
        description = "A strange and unnecessary selective test-running library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-asn1" = callPackage
@@ -126882,7 +125041,6 @@ self: {
        homepage = "http://github.com/knrafto/language-bash/";
        description = "Parsing and pretty-printing Bash shell scripts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-boogie" = callPackage
@@ -126908,7 +125066,6 @@ self: {
        homepage = "https://bitbucket.org/nadiapolikarpova/boogaloo";
        description = "Interpreter and language infrastructure for Boogie";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-c" = callPackage
@@ -126929,6 +125086,25 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "language-c_0_5_0" = callPackage
+    ({ mkDerivation, alex, array, base, bytestring, containers
+     , directory, filepath, happy, pretty, process, syb
+     }:
+     mkDerivation {
+       pname = "language-c";
+       version = "0.5.0";
+       sha256 = "86d58bc017a7bba157fc4d5d0ab9e3a3d3f3a2f98bfe46b5b0d5d72a0f5d2222";
+       libraryHaskellDepends = [
+         array base bytestring containers directory filepath pretty process
+         syb
+       ];
+       libraryToolDepends = [ alex happy ];
+       homepage = "http://visq.github.io/language-c/";
+       description = "Analysis and generation of C code";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "language-c-comments" = callPackage
     ({ mkDerivation, alex, array, base, language-c }:
      mkDerivation {
@@ -126940,7 +125116,6 @@ self: {
        homepage = "http://github.com/ghulette/language-c-comments";
        description = "Extracting comments from C code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-c-inline" = callPackage
@@ -126960,7 +125135,6 @@ self: {
        homepage = "https://github.com/mchakravarty/language-c-inline/";
        description = "Inline C & Objective-C code in Haskell for language interoperability";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-c-quote_0_10_2" = callPackage
@@ -127353,7 +125527,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "language-ecmascript" = callPackage
+  "language-ecmascript_0_17_0_2" = callPackage
     ({ mkDerivation, base, containers, data-default-class, Diff
      , directory, filepath, HUnit, mtl, parsec, QuickCheck
      , template-haskell, test-framework, test-framework-hunit
@@ -127376,6 +125550,31 @@ self: {
        homepage = "http://github.com/jswebtools/language-ecmascript";
        description = "JavaScript parser and pretty-printer library";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "language-ecmascript" = callPackage
+    ({ mkDerivation, base, containers, data-default-class, Diff
+     , directory, filepath, HUnit, mtl, parsec, QuickCheck
+     , template-haskell, test-framework, test-framework-hunit
+     , test-framework-quickcheck2, testing-feat, uniplate, wl-pprint
+     }:
+     mkDerivation {
+       pname = "language-ecmascript";
+       version = "0.17.1.0";
+       sha256 = "df1e3f0d3096d522f278c644d3efbedabee29e2babfdf9d497287550f017883e";
+       libraryHaskellDepends = [
+         base containers data-default-class Diff mtl parsec QuickCheck
+         template-haskell testing-feat uniplate wl-pprint
+       ];
+       testHaskellDepends = [
+         base containers data-default-class Diff directory filepath HUnit
+         mtl parsec QuickCheck test-framework test-framework-hunit
+         test-framework-quickcheck2 uniplate wl-pprint
+       ];
+       homepage = "http://github.com/jswebtools/language-ecmascript";
+       description = "JavaScript parser and pretty-printer library";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "language-ecmascript-analysis" = callPackage
@@ -127411,7 +125610,6 @@ self: {
        homepage = "https://github.com/scottgw/language-eiffel";
        description = "Parser and pretty printer for the Eiffel language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-fortran" = callPackage
@@ -127488,7 +125686,6 @@ self: {
        jailbreak = true;
        description = "A library for analysis and synthesis of Go code";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-guess" = callPackage
@@ -127574,7 +125771,6 @@ self: {
        ];
        description = "Parser for Java .class files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-javascript_0_5_13" = callPackage
@@ -127779,7 +125975,6 @@ self: {
        homepage = "http://github.com/jtdaugherty/language-mixal/";
        description = "Parser, pretty-printer, and AST types for the MIXAL assembly language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-nix" = callPackage
@@ -127819,7 +126014,6 @@ self: {
        homepage = "http://www.tiresiaspress.us/haskell/language-objc";
        description = "Analysis and generation of Objective C code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-openscad" = callPackage
@@ -127900,7 +126094,6 @@ self: {
        homepage = "http://lpuppet.banquise.net/";
        description = "Tools to parse and evaluate the Puppet DSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-python" = callPackage
@@ -127934,7 +126127,6 @@ self: {
        homepage = "http://www.cs.mu.oz.au/~bjpop/";
        description = "Generate coloured XHTML for Python code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-python-test" = callPackage
@@ -127967,7 +126159,6 @@ self: {
        homepage = "https://github.com/qux-lang/language-qux";
        description = "Utilities for working with the Qux language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-sh" = callPackage
@@ -127984,7 +126175,6 @@ self: {
        homepage = "http://code.haskell.org/shsh/";
        description = "A package for parsing shell scripts";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-slice" = callPackage
@@ -128025,7 +126215,6 @@ self: {
        homepage = "https://github.com/bitonic/language-spelling";
        description = "Various tools to detect/correct mistakes in words";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-sqlite" = callPackage
@@ -128042,7 +126231,6 @@ self: {
        homepage = "http://dankna.com/software/";
        description = "Full parser and generator for SQL as implemented by SQLite3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-thrift_0_6_2_0" = callPackage
@@ -128130,7 +126318,6 @@ self: {
        homepage = "https://github.com/abhinav/language-thrift";
        description = "Parser and pretty printer for the Thrift IDL format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "language-typescript" = callPackage
@@ -128213,7 +126400,6 @@ self: {
        jailbreak = true;
        description = "Tool to track security alerts on LWN";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "latest-npm-version" = callPackage
@@ -128246,7 +126432,6 @@ self: {
        homepage = "https://github.com/passy/latest-npm-version";
        description = "Find the latest version of a package on npm";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "latex" = callPackage
@@ -128450,7 +126635,6 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "High and low-level interface to the Novation Launchpad midi controller";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lax" = callPackage
@@ -128476,7 +126660,6 @@ self: {
        homepage = "http://github.com/duairc/layers";
        description = "Modular type class machinery for monad transformer stacks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "layers-game" = callPackage
@@ -128496,7 +126679,6 @@ self: {
        jailbreak = true;
        description = "A prototypical 2d platform game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "layout" = callPackage
@@ -128508,7 +126690,6 @@ self: {
        libraryHaskellDepends = [ base convertible hinduce-missingh ];
        description = "Turn values into pretty text or markup";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "layout-bootstrap" = callPackage
@@ -128521,7 +126702,6 @@ self: {
        homepage = "https://bitbucket.org/dpwiz/layout-bootstrap";
        description = "Template and widgets for Bootstrap2 to use with Text.Blaze.Html5";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lazy-csv_0_5" = callPackage
@@ -128576,7 +126756,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Efficient implementation of lazy monolithic arrays (lazy in indexes)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lazyio" = callPackage
@@ -128614,7 +126793,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Differential solving with lazy splines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lbfgs" = callPackage
@@ -128665,7 +126843,6 @@ self: {
        homepage = "http://urchin.earth.li/~ian/cabal/lcs/";
        description = "Find longest common sublist of two lists";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lda" = callPackage
@@ -128701,7 +126878,6 @@ self: {
        homepage = "https://supki.github.io/ldap-client";
        description = "Pure Haskell LDAP Client Library";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ldif" = callPackage
@@ -128726,7 +126902,6 @@ self: {
        homepage = "http://rampa.sk/static/ldif.html";
        description = "The LDAP Data Interchange Format (LDIF) tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "leaf" = callPackage
@@ -128746,7 +126921,6 @@ self: {
        homepage = "https://github.com/skypers/leaf";
        description = "A simple portfolio generator";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "leaky" = callPackage
@@ -128767,7 +126941,6 @@ self: {
        homepage = "http://fremissant.net/leaky";
        description = "Robust space leak, and its strictification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "leankit-api" = callPackage
@@ -128825,7 +126998,6 @@ self: {
        ];
        description = "Haskell code for learning physics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "learn-physics-examples" = callPackage
@@ -128844,7 +127016,6 @@ self: {
        jailbreak = true;
        description = "examples for learn-physics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "learning-hmm" = callPackage
@@ -129651,7 +127822,6 @@ self: {
        homepage = "http://github.com/kim/leveldb-haskell";
        description = "Haskell bindings to LevelDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) leveldb;};
 
   "leveldb-haskell-fork" = callPackage
@@ -129679,7 +127849,6 @@ self: {
        homepage = "http://github.com/kim/leveldb-haskell";
        description = "Haskell bindings to LevelDB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) leveldb;};
 
   "levmar" = callPackage
@@ -129693,7 +127862,6 @@ self: {
        homepage = "https://github.com/basvandijk/levmar";
        description = "An implementation of the Levenberg-Marquardt algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-darwin" ];
      }) {};
 
   "levmar-chart" = callPackage
@@ -129712,7 +127880,6 @@ self: {
        jailbreak = true;
        description = "Plots the results of the Levenberg-Marquardt algorithm in a chart";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lexer-applicative" = callPackage
@@ -129759,7 +127926,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/LGtk";
        description = "Lens GUI Toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lha" = callPackage
@@ -129772,7 +127938,6 @@ self: {
        homepage = "https://github.com/bytbox/lha.hs";
        description = "Data structures for the Les Houches Accord";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lhae" = callPackage
@@ -129794,7 +127959,6 @@ self: {
        homepage = "http://www.imn.htwk-leipzig.de/~abau/lhae";
        description = "Simple spreadsheet program";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lhc" = callPackage
@@ -129832,7 +127996,6 @@ self: {
        libraryHaskellDepends = [ bytestring haskell2010 HaXml lha ];
        description = "Parser and writer for Les-Houches event files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lhs2TeX-hl" = callPackage
@@ -129935,7 +128098,6 @@ self: {
        homepage = "http://trac.loria.fr/~geni";
        description = "A natural language generator (specifically, an FB-LTAG surface realiser)";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libarchive-conduit" = callPackage
@@ -129973,7 +128135,6 @@ self: {
        homepage = "https://github.com/peddie/libconfig-haskell";
        description = "Haskell bindings to libconfig";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libconfig;};
 
   "libcspm" = callPackage
@@ -129996,7 +128157,6 @@ self: {
        homepage = "https://github.com/tomgr/libcspm";
        description = "A library providing a parser, type checker and evaluator for CSPM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libexpect" = callPackage
@@ -130009,7 +128169,6 @@ self: {
        librarySystemDepends = [ expect tcl ];
        description = "Library for interacting with console applications via pseudoterminals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) expect; inherit (pkgs) tcl;};
 
   "libffi" = callPackage
@@ -130064,7 +128223,6 @@ self: {
        homepage = "http://maartenfaddegon.nl";
        description = "Store and manipulate data in a graph";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libhbb" = callPackage
@@ -130089,7 +128247,6 @@ self: {
        homepage = "https://bitbucket.org/bhris/libhbb";
        description = "Backend for text editors to provide better Haskell editing support";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libinfluxdb" = callPackage
@@ -130134,7 +128291,6 @@ self: {
        ];
        description = "Jenkins API interface";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "liblastfm" = callPackage
@@ -130176,7 +128332,6 @@ self: {
        homepage = "http://github.com/NathanHowell/liblinear-enumerator";
        description = "liblinear iteratee";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "libltdl" = callPackage
@@ -130192,7 +128347,6 @@ self: {
        homepage = "http://www.eecs.harvard.edu/~mainland/projects/libffi";
        description = "FFI interface to libltdl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libmpd" = callPackage
@@ -130263,7 +128417,6 @@ self: {
        homepage = "http://okmij.org/ftp/";
        description = "An evolving collection of Oleg Kiselyov's Haskell modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libpafe" = callPackage
@@ -130278,7 +128431,6 @@ self: {
        jailbreak = true;
        description = "Wrapper for libpafe";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {pafe = null;};
 
   "libpq" = callPackage
@@ -130292,7 +128444,6 @@ self: {
        homepage = "http://github.com/tnarg/haskell-libpq";
        description = "libpq binding for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) postgresql;};
 
   "librandomorg" = callPackage
@@ -130377,7 +128528,6 @@ self: {
        homepage = "http://redmine.iportnov.ru/projects/libssh2-hs";
        description = "Conduit wrappers for libssh2 FFI bindings (see libssh2 package)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "libstackexchange" = callPackage
@@ -130414,7 +128564,6 @@ self: {
        ];
        description = "Haskell bindings for libsystemd-daemon";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {libsystemd-daemon = null; systemd-daemon = null;};
 
   "libsystemd-journal" = callPackage
@@ -130434,7 +128583,6 @@ self: {
        homepage = "http://github.com/ocharles/libsystemd-journal";
        description = "Haskell bindings to libsystemd-journal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) systemd;};
 
   "libtagc" = callPackage
@@ -130464,7 +128612,6 @@ self: {
        homepage = "http://redmine.iportnov.ru/projects/libvirt-hs";
        description = "FFI bindings to libvirt virtualization API (http://libvirt.org)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {virt = null;};
 
   "libvorbis" = callPackage
@@ -130500,7 +128647,6 @@ self: {
        librarySystemDepends = [ libxml2 ];
        description = "Binding to libxml2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libxml2;};
 
   "libxml-enumerator" = callPackage
@@ -130545,7 +128691,6 @@ self: {
        jailbreak = true;
        description = "Binding to libxslt";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {xslt = null;};
 
   "life" = callPackage
@@ -130560,7 +128705,6 @@ self: {
        homepage = "http://github.com/sproingie/haskell-cells/";
        description = "Conway's Life cellular automaton";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "lift-generics" = callPackage
@@ -130790,7 +128934,6 @@ self: {
        homepage = "http://icfpcontest2012.wordpress.com/";
        description = "A boulderdash-like game and solution validator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ligature" = callPackage
@@ -130831,7 +128974,6 @@ self: {
        libraryToolDepends = [ alex happy ];
        description = "Lighttpd configuration file tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lighttpd-conf-qq" = callPackage
@@ -130848,7 +128990,6 @@ self: {
        ];
        description = "A QuasiQuoter for lighttpd configuration files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lilypond" = callPackage
@@ -130865,7 +129006,6 @@ self: {
        ];
        description = "Bindings to Lilypond";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "limp" = callPackage
@@ -130899,7 +129039,6 @@ self: {
        homepage = "https://github.com/amosr/limp-cbc";
        description = "bindings for integer linear programming solver Coin/CBC";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lin-alg" = callPackage
@@ -130911,7 +129050,6 @@ self: {
        libraryHaskellDepends = [ base NumInstances vector ];
        description = "Low-dimensional matrices and vectors for graphics and physics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linda" = callPackage
@@ -130923,7 +129061,6 @@ self: {
        libraryHaskellDepends = [ base hmatrix HUnit ];
        description = "LINear Discriminant Analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lindenmayer" = callPackage
@@ -131240,7 +129377,6 @@ self: {
        homepage = "http://github.com/cartazio/hs-cblas";
        description = "A linear algebra library with bindings to BLAS and LAPACK";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linear-circuit" = callPackage
@@ -131262,7 +129398,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/linear-circuit";
        description = "Compute resistance of linear electrical circuits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linear-grammar" = callPackage
@@ -131289,7 +129424,6 @@ self: {
        jailbreak = true;
        description = "Finite maps for linear use";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linear-opengl" = callPackage
@@ -131307,7 +129441,6 @@ self: {
        homepage = "http://www.github.com/bgamari/linear-opengl";
        description = "Isomorphisms between linear and OpenGL types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linear-vect" = callPackage
@@ -131368,7 +129501,6 @@ self: {
        homepage = "http://github.com/jwiegley/linearscan-hoopl";
        description = "Makes it easy to use the linearscan register allocator with Hoopl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linebreak" = callPackage
@@ -131426,7 +129558,6 @@ self: {
        homepage = "http://www.haskell.org/~petersen/haskell/linkchk/";
        description = "linkchk is a network interface link ping monitor";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linkcore" = callPackage
@@ -131442,7 +129573,6 @@ self: {
        ];
        description = "Combines multiple GHC Core modules into a single module";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linkedhashmap" = callPackage
@@ -131504,7 +129634,6 @@ self: {
        homepage = "http://github.com/Helkafen/haskell-linode#readme";
        description = "Bindings to the Linode API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linux-blkid" = callPackage
@@ -131522,7 +129651,6 @@ self: {
        jailbreak = true;
        description = "Linux libblkid";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {blkid = null;};
 
   "linux-cgroup" = callPackage
@@ -131547,7 +129675,6 @@ self: {
        homepage = "http://github.com/bgamari/linux-evdev";
        description = "Bindings to Linux evdev input device interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "linux-file-extents" = callPackage
@@ -131562,7 +129689,6 @@ self: {
        homepage = "https://github.com/redneb/linux-file-extents";
        description = "Retrieve file fragmentation information under Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "linux-inotify" = callPackage
@@ -131574,7 +129700,6 @@ self: {
        libraryHaskellDepends = [ base bytestring hashable unix ];
        description = "Thinner binding to the Linux Kernel's inotify interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "linux-kmod" = callPackage
@@ -131588,7 +129713,6 @@ self: {
        homepage = "https://github.com/tensor5/linux-kmod";
        description = "Linux kernel modules support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {libkmod = null;};
 
   "linux-mount" = callPackage
@@ -131601,7 +129725,6 @@ self: {
        homepage = "https://github.com/tensor5/linux-mount";
        description = "Mount and unmount filesystems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "linux-namespaces" = callPackage
@@ -131614,7 +129737,6 @@ self: {
        homepage = "https://github.com/redneb/hs-linux-namespaces";
        description = "Create new or enter an existing linux namespaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "linux-perf" = callPackage
@@ -131638,7 +129760,6 @@ self: {
        homepage = "https://github.com/bjpop/haskell-linux-perf";
        description = "Read files generated by perf on Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linux-ptrace" = callPackage
@@ -131655,7 +129776,6 @@ self: {
        jailbreak = true;
        description = "Wrapping of Linux' ptrace(2)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "linux-xattr" = callPackage
@@ -131717,7 +129837,6 @@ self: {
        ];
        description = "Labeled IO library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lio-fs" = callPackage
@@ -131733,7 +129852,6 @@ self: {
        ];
        description = "Labeled File System interface for LIO";
        license = "GPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "lio-simple" = callPackage
@@ -131759,7 +129877,6 @@ self: {
        homepage = "http://simple.cx";
        description = "LIO support for the Simple web framework";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lipsum-gen" = callPackage
@@ -132219,7 +130336,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/list-t-html-parser";
        description = "Streaming HTML parser";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "list-t-http-client" = callPackage
@@ -132315,7 +130431,6 @@ self: {
        homepage = "http://jwlato.webfactional.com/haskell/listlike-instances";
        description = "Extra instances of the ListLike class";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lists" = callPackage
@@ -132371,7 +130486,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Non-overloaded functions for concrete literals";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "live-sequencer" = callPackage
@@ -132400,7 +130514,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Live-Sequencer";
        description = "Live coding of MIDI music";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ll-picosat" = callPackage
@@ -132413,7 +130526,6 @@ self: {
        librarySystemDepends = [ picosat ];
        jailbreak = true;
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) picosat;};
 
   "llrbtree" = callPackage
@@ -132447,7 +130559,6 @@ self: {
        homepage = "http://wiki.secondlife.com/wiki/LLSD";
        description = "An implementation of the LLSD data system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm" = callPackage
@@ -132465,7 +130576,6 @@ self: {
        homepage = "https://github.com/bos/llvm";
        description = "Bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-analysis" = callPackage
@@ -132493,7 +130603,6 @@ self: {
        ];
        description = "A Haskell library for analyzing LLVM bitcode";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-base" = callPackage
@@ -132506,7 +130615,6 @@ self: {
        homepage = "https://github.com/bos/llvm";
        description = "FFI bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-base-types" = callPackage
@@ -132526,7 +130634,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "The base types for a mostly pure Haskell LLVM analysis library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-base-util" = callPackage
@@ -132539,7 +130646,6 @@ self: {
        homepage = "https://github.com/bos/llvm";
        description = "Utilities for bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-data-interop" = callPackage
@@ -132560,7 +130666,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A low-level data interoperability binding for LLVM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-extra" = callPackage
@@ -132580,7 +130685,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/llvm-extra/";
        description = "Utility functions for the llvm interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-ffi" = callPackage
@@ -132596,7 +130700,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/LLVM";
        description = "FFI bindings to the LLVM compiler toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (self.llvmPackages) llvm;};
 
   "llvm-general" = callPackage
@@ -132670,7 +130773,6 @@ self: {
        homepage = "https://github.com/tvh/llvm-general-quote";
        description = "QuasiQuoting llvm code for llvm-general";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-ht" = callPackage
@@ -132687,7 +130789,6 @@ self: {
        homepage = "http://darcs.serpentine.com/llvm/";
        description = "Bindings to the LLVM compiler toolkit with some custom extensions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-pkg-config" = callPackage
@@ -132761,7 +130862,6 @@ self: {
        ];
        description = "Bindings to the LLVM compiler toolkit using type families";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "llvm-tools" = callPackage
@@ -132789,7 +130889,6 @@ self: {
        jailbreak = true;
        description = "Useful tools built on llvm-analysis";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lmdb" = callPackage
@@ -132803,7 +130902,6 @@ self: {
        homepage = "http://github.com/dmbarbour/haskell-lmdb";
        description = "Lightning MDB bindings";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) lmdb;};
 
   "lmonad" = callPackage
@@ -132824,7 +130922,6 @@ self: {
        ];
        description = "LMonad is an Information Flow Control (IFC) framework for Haskell applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lmonad-yesod" = callPackage
@@ -132845,7 +130942,6 @@ self: {
        ];
        description = "LMonad for Yesod integrates LMonad's IFC with Yesod web applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "load-env" = callPackage
@@ -132897,7 +130993,6 @@ self: {
        homepage = "http://www.comp.leeds.ac.uk/sc06r2s/Projects/HaskellLocalSearch";
        description = "Generalised local search within Haskell, for applications in combinatorial optimisation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "located-base" = callPackage
@@ -132944,7 +131039,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Support for precise error locations in source files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "loch-th" = callPackage
@@ -133003,7 +131097,6 @@ self: {
        ];
        description = "Very simple poll lock";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lockfree-queue" = callPackage
@@ -133046,7 +131139,6 @@ self: {
        homepage = "https://github.com/scrive/log";
        description = "Structured logging solution with multiple backends";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "log-domain_0_9_3" = callPackage
@@ -133266,7 +131358,6 @@ self: {
        homepage = "https://github.com/ibotty/log-effect";
        description = "An extensible log effect using extensible-effects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "log2json" = callPackage
@@ -133282,7 +131373,6 @@ self: {
        homepage = "https://github.com/haroldl/log2json";
        description = "Turn log file records into JSON";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logfloat_0_12_1" = callPackage
@@ -133421,7 +131511,6 @@ self: {
        ];
        description = "Journald back-end for logging-facade";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "logic-TPTP" = callPackage
@@ -133462,7 +131551,6 @@ self: {
        homepage = "https://github.com/seereason/logic-classes";
        description = "Framework for propositional and first order logic, theorem proving";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "logicst" = callPackage
@@ -133547,7 +131635,6 @@ self: {
        jailbreak = true;
        description = "Useful utilities for the Lojban language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lojbanParser" = callPackage
@@ -133562,7 +131649,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "lojban parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lojbanXiragan" = callPackage
@@ -133577,7 +131663,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "lojban to xiragan";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lojysamban" = callPackage
@@ -133592,7 +131677,6 @@ self: {
        homepage = "http://homepage3.nifty.com/salamander/myblog/lojysamban.html";
        description = "Prolog with lojban";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lol" = callPackage
@@ -133605,8 +131689,10 @@ self: {
      }:
      mkDerivation {
        pname = "lol";
-       version = "0.2.0.0";
-       sha256 = "8787dde0e356a8d436fc6dcea548098bb9e92237fc138701582e2f5eabbce564";
+       version = "0.2.0.1";
+       sha256 = "275b9cd28a8a2b9d8bdfeeda02cc409f820d3aeab79c3ce647561ffc3cb7b446";
+       revision = "1";
+       editedCabalFile = "47c14b05d02b22f27307dbfa5f1a499a9508d63512fc4a77a467ef22053b9149";
        libraryHaskellDepends = [
          arithmoi base binary bytestring constraints containers crypto-api
          data-default deepseq MonadRandom mtl numeric-prelude QuickCheck
@@ -133621,7 +131707,6 @@ self: {
        homepage = "https://github.com/cpeikert/Lol";
        description = "A library for lattice cryptography";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "lol-apps" = callPackage
@@ -133633,8 +131718,8 @@ self: {
        pname = "lol-apps";
        version = "0.0.0.1";
        sha256 = "988a006f77beb0fdf40ad446d1ae333b93bc60d818e3623f323eb1ff9349d149";
-       revision = "1";
-       editedCabalFile = "60383b773f8b931df96fac94a014194fcbc8f7f31025471e49e39ffc2b991907";
+       revision = "2";
+       editedCabalFile = "0b6c201fff6fbe7f10bb5777ae8cefad4668865e5a30b260961453ad49eabb8f";
        libraryHaskellDepends = [
          base deepseq lol MonadRandom numeric-prelude
        ];
@@ -133663,7 +131748,6 @@ self: {
        homepage = "http://github.com/nfjinjing/loli";
        description = "A minimum web dev DSL in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lookup-tables" = callPackage
@@ -133719,7 +131803,6 @@ self: {
        homepage = "https://github.com/konn/loop-effin";
        description = "control-monad-loop port for effin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "loop-while" = callPackage
@@ -133767,7 +131850,6 @@ self: {
        homepage = "http://www.esc.cam.ac.uk/people/research-students/emily-king";
        description = "Find all biological feedback loops within an ecosystem graph";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lord" = callPackage
@@ -133808,7 +131890,6 @@ self: {
        homepage = "https://github.com/rnons/lord";
        description = "A command line interface to online radios";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lorem" = callPackage
@@ -133840,7 +131921,6 @@ self: {
        homepage = "http://www.tiresiaspress.us/haskell/loris";
        description = "interface to Loris API";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {loris = null;};
 
   "loshadka" = callPackage
@@ -133880,7 +131960,6 @@ self: {
        homepage = "http://www.ncc.up.pt/~pbv/stuff/lostcities";
        description = "An implementation of an adictive two-player card game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lowgl" = callPackage
@@ -133932,7 +132011,6 @@ self: {
        ];
        description = "SVG Backend for lp-diagrams";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lrucache" = callPackage
@@ -133965,7 +132043,6 @@ self: {
        homepage = "https://github.com/roelvandijk/ls-usb";
        description = "List USB devices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lscabal" = callPackage
@@ -133984,7 +132061,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/lscabal";
        description = "List exported modules from a set of .cabal files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lss" = callPackage
@@ -134023,7 +132099,6 @@ self: {
        ];
        description = "Paint an L-System Grammar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ltext" = callPackage
@@ -134111,7 +132186,6 @@ self: {
        jailbreak = true;
        description = "Library functions for reading and writing Lua chunks";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "luautils" = callPackage
@@ -134318,7 +132392,6 @@ self: {
        homepage = "http://www.imn.htwk-leipzig.de/~abau/lucienne";
        description = "Server side feed aggregator/reader";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "luhn" = callPackage
@@ -134345,7 +132418,6 @@ self: {
        ];
        description = "Purely FunctionaL User Interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "luka" = callPackage
@@ -134359,7 +132431,6 @@ self: {
        homepage = "https://github.com/nfjinjing/luka";
        description = "Simple ObjectiveC runtime binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {objc = null;};
 
   "luminance_0_9_1" = callPackage
@@ -134475,7 +132546,6 @@ self: {
        homepage = "https://github.com/phaazon/luminance-samples";
        description = "Luminance samples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "lushtags" = callPackage
@@ -134491,7 +132561,6 @@ self: {
        homepage = "https://github.com/bitc/lushtags";
        description = "Create ctags compatible tags files for Haskell programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "luthor" = callPackage
@@ -134505,7 +132574,6 @@ self: {
        homepage = "https://github.com/Zankoku-Okuno/luthor";
        description = "Tools for lexing and utilizing lexemes that integrate with Parsec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lvish" = callPackage
@@ -134534,7 +132602,6 @@ self: {
        jailbreak = true;
        description = "Parallel scheduler, LVar data structures, and infrastructure to build more";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lvmlib" = callPackage
@@ -134556,7 +132623,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/bin/view/Helium/WebHome";
        description = "The Lazy Virtual Machine (LVM)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lvmrun" = callPackage
@@ -134582,7 +132648,6 @@ self: {
        homepage = "https://github.com/fizruk/lxc";
        description = "High level Haskell bindings to LXC (Linux containers)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "lye" = callPackage
@@ -134600,7 +132665,6 @@ self: {
        ];
        description = "A Lilypond-compiling music box";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "lz4" = callPackage
@@ -134636,7 +132700,6 @@ self: {
        homepage = "https://github.com/hvr/lzma";
        description = "LZMA/XZ compression and decompression";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {inherit (pkgs) lzma;};
 
   "lzma-clib" = callPackage
@@ -134789,7 +132852,6 @@ self: {
        homepage = "https://github.com/hvr/lzma-streams";
        description = "IO-Streams interface for lzma/xz compression";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "maam" = callPackage
@@ -135186,7 +133248,6 @@ self: {
        homepage = "http://www.scannedinavian.com/~shae/mage-1.0pre35.tar.gz";
        description = "Rogue-like";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ncurses;};
 
   "magic" = callPackage
@@ -135216,7 +133277,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/magico";
        description = "Compute solutions for Magico puzzle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "magma" = callPackage
@@ -135250,7 +133310,6 @@ self: {
        homepage = "http://kagami.touhou.ru/projects/show/mahoro";
        description = "ImageBoards to XMPP gate";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "maid" = callPackage
@@ -135400,7 +133459,6 @@ self: {
        jailbreak = true;
        description = "Majordomo protocol for ZeroMQ";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "majority" = callPackage
@@ -135413,7 +133471,6 @@ self: {
        homepage = "https://github.com/niswegmann/majority";
        description = "Boyer-Moore Majority Vote Algorithm";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "make-hard-links" = callPackage
@@ -135524,7 +133581,6 @@ self: {
        jailbreak = true;
        description = "The Haskell/Gtk+ Integrated Live Environment";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-all" = callPackage
@@ -135550,7 +133606,6 @@ self: {
        doHaddock = false;
        description = "Virtual package to install all Manatee packages";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-anything" = callPackage
@@ -135572,7 +133627,6 @@ self: {
        jailbreak = true;
        description = "Multithread interactive input/search framework for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-browser" = callPackage
@@ -135592,7 +133646,6 @@ self: {
        jailbreak = true;
        description = "Browser extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-core" = callPackage
@@ -135617,7 +133670,6 @@ self: {
        jailbreak = true;
        description = "The core of Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-curl" = callPackage
@@ -135640,7 +133692,6 @@ self: {
        jailbreak = true;
        description = "Download Manager extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-editor" = callPackage
@@ -135661,7 +133712,6 @@ self: {
        jailbreak = true;
        description = "Editor extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-filemanager" = callPackage
@@ -135682,7 +133732,6 @@ self: {
        jailbreak = true;
        description = "File manager extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-imageviewer" = callPackage
@@ -135703,7 +133752,6 @@ self: {
        jailbreak = true;
        description = "Image viewer extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-ircclient" = callPackage
@@ -135728,7 +133776,6 @@ self: {
        jailbreak = true;
        description = "IRC client extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-mplayer" = callPackage
@@ -135750,7 +133797,6 @@ self: {
        jailbreak = true;
        description = "Mplayer client extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-pdfviewer" = callPackage
@@ -135771,7 +133817,6 @@ self: {
        jailbreak = true;
        description = "PDF viewer extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-processmanager" = callPackage
@@ -135791,7 +133836,6 @@ self: {
        jailbreak = true;
        description = "Process manager extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-reader" = callPackage
@@ -135812,7 +133856,6 @@ self: {
        jailbreak = true;
        description = "Feed reader extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-template" = callPackage
@@ -135833,7 +133876,6 @@ self: {
        jailbreak = true;
        description = "Template code to create Manatee application";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-terminal" = callPackage
@@ -135853,7 +133895,6 @@ self: {
        jailbreak = true;
        description = "Terminal Emulator extension for Manatee";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manatee-welcome" = callPackage
@@ -135874,7 +133915,6 @@ self: {
        jailbreak = true;
        description = "Welcome module to help user play Manatee quickly";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mancala" = callPackage
@@ -136079,7 +134119,6 @@ self: {
        homepage = "http://gitorious.org/maximus/mandulia";
        description = "A zooming visualisation of the Mandelbrot Set as many Julia Sets";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mangopay_1_11_4" = callPackage
@@ -136204,7 +134243,6 @@ self: {
        homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Bindings to the MangoPay API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "manifold-random" = callPackage
@@ -136294,7 +134332,6 @@ self: {
        homepage = "https://github.com/paolino/marionetta";
        description = "A study of marionetta movements";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markdown_0_1_13" = callPackage
@@ -136386,7 +134423,6 @@ self: {
        homepage = "https://github.com/joelteon/markdown-kate";
        description = "Convert Markdown to HTML, with XSS protection";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markdown-pap" = callPackage
@@ -136398,7 +134434,6 @@ self: {
        libraryHaskellDepends = [ base monads-tf papillon ];
        description = "markdown parser with papillon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markdown-unlit_0_2_0_1" = callPackage
@@ -136458,7 +134493,6 @@ self: {
        ];
        description = "markdown to svg converter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "marked-pretty" = callPackage
@@ -136511,7 +134545,6 @@ self: {
        testHaskellDepends = [ assertions base bifunctors memoize random ];
        description = "Hidden Markov processes";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "markup_1_1_0" = callPackage
@@ -136570,7 +134603,6 @@ self: {
        jailbreak = true;
        description = "A simple markup document preview (markdown, textile, reStructuredText)";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "marmalade-upload" = callPackage
@@ -136601,7 +134633,6 @@ self: {
        homepage = "https://github.com/lunaryorn/marmalade-upload";
        description = "Upload packages to Marmalade";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "marquise" = callPackage
@@ -136636,7 +134667,6 @@ self: {
        testHaskellDepends = [ base bytestring hspec ];
        description = "Client library for Vaultaire";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "marxup" = callPackage
@@ -136662,7 +134692,6 @@ self: {
        jailbreak = true;
        description = "Markup language preprocessor for Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "masakazu-bot" = callPackage
@@ -136687,7 +134716,6 @@ self: {
        homepage = "https://github.com/minamiyama1994/chomado-bot-on-haskell/tree/minamiyama1994";
        description = "@minamiyama1994_bot on haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mastermind" = callPackage
@@ -136716,7 +134744,6 @@ self: {
        homepage = "http://www.github.com/massysett/matchers";
        description = "Text matchers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) pcre;};
 
   "math-functions" = callPackage
@@ -136766,7 +134793,6 @@ self: {
        homepage = "http://jtdaugherty.github.io/mathblog/";
        description = "A program for creating and managing a static weblog with LaTeX math and diagrams";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mathgenealogy" = callPackage
@@ -136828,7 +134854,6 @@ self: {
        homepage = "http://community.haskell.org/~TracyWadleigh/mathlink";
        description = "Write Mathematica packages in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "matlab" = callPackage
@@ -136842,7 +134867,6 @@ self: {
        jailbreak = true;
        description = "Matlab bindings and interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {eng = null; mat = null; mx = null;};
 
   "matrices_0_4_2" = callPackage
@@ -137007,7 +135031,6 @@ self: {
        homepage = "http://kagami.touhou.ru/projects/show/matsuri";
        description = "ncurses XMPP client";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "maude" = callPackage
@@ -137024,7 +135047,6 @@ self: {
        homepage = "https://github.com/davidlazar/maude-hs";
        description = "An interface to the Maude rewriting system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "maxent" = callPackage
@@ -137048,7 +135070,6 @@ self: {
        homepage = "https://github.com/jfischoff/maxent";
        description = "Compute Maximum Entropy Distributions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "maximal-cliques" = callPackage
@@ -137082,7 +135103,6 @@ self: {
        homepage = "http://rochel.info/maxsharing/";
        description = "Maximal sharing of terms in the lambda calculus with letrec";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "maybe-justify" = callPackage
@@ -137115,7 +135135,6 @@ self: {
        homepage = "http://code.google.com/p/maybench/";
        description = "Automated benchmarking tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mbox_0_3" = callPackage
@@ -137161,7 +135180,6 @@ self: {
        homepage = "https://github.com/np/mbox-tools";
        description = "A collection of tools to process mbox files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mcmaster-gloss-examples" = callPackage
@@ -137176,7 +135194,6 @@ self: {
        jailbreak = true;
        homepage = "http://www.cas.mcmaster.ca/~anand/";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "mcmc-samplers" = callPackage
@@ -137193,7 +135210,6 @@ self: {
        jailbreak = true;
        description = "Combinators for MCMC sampling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mcmc-synthesis" = callPackage
@@ -137276,7 +135292,6 @@ self: {
        homepage = "https://github.com/dorafmon/mdcat";
        description = "Markdown viewer in your terminal";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mdo" = callPackage
@@ -137322,7 +135337,6 @@ self: {
        homepage = "http://github.com/tanakh/hsmecab";
        description = "A Haskell binding to MeCab";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {mecab = null;};
 
   "mecha" = callPackage
@@ -137355,7 +135369,6 @@ self: {
        ];
        description = "Interfacing with the MediaWiki API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mediawiki2latex" = callPackage
@@ -137381,7 +135394,6 @@ self: {
        homepage = "http://sourceforge.net/projects/wb2pdf/";
        description = "Convert MediaWiki text to LaTeX";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "medium-sdk-haskell" = callPackage
@@ -137399,7 +135411,6 @@ self: {
        jailbreak = true;
        description = "Haskell SDK for communicating with the Medium API";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "meep" = callPackage
@@ -137420,7 +135431,6 @@ self: {
        ];
        description = "A silly container";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mega-sdist" = callPackage
@@ -137442,7 +135452,6 @@ self: {
        homepage = "https://github.com/snoyberg/mega-sdist";
        description = "Handles uploading to Hackage from mega repos (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "megaparsec_4_2_0" = callPackage
@@ -137465,7 +135474,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "megaparsec_4_3_0" = callPackage
+  "megaparsec" = callPackage
     ({ mkDerivation, base, bytestring, HUnit, mtl, QuickCheck
      , test-framework, test-framework-hunit, test-framework-quickcheck2
      , text, transformers
@@ -137484,10 +135493,9 @@ self: {
        homepage = "https://github.com/mrkkrp/megaparsec";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "megaparsec" = callPackage
+  "megaparsec_4_4_0" = callPackage
     ({ mkDerivation, base, bytestring, fail, HUnit, mtl, QuickCheck
      , semigroups, test-framework, test-framework-hunit
      , test-framework-quickcheck2, text, transformers
@@ -137503,9 +135511,11 @@ self: {
          base HUnit mtl QuickCheck test-framework test-framework-hunit
          test-framework-quickcheck2 transformers
        ];
+       jailbreak = true;
        homepage = "https://github.com/mrkkrp/megaparsec";
        description = "Monadic parser combinators";
        license = stdenv.lib.licenses.bsd2;
+       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "meldable-heap" = callPackage
@@ -137540,7 +135550,6 @@ self: {
        jailbreak = true;
        description = "A functional scripting language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "memcache" = callPackage
@@ -137683,7 +135692,6 @@ self: {
        homepage = "https://gitorious.org/memo-sqlite";
        description = "memoize functions using SQLite3 database";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "memoization-utils" = callPackage
@@ -137997,7 +136005,6 @@ self: {
        homepage = "https://github.com/simonmar/monad-par";
        description = "Support for integrated Accelerate computations within Meta-par";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "metadata" = callPackage
@@ -138033,7 +136040,6 @@ self: {
        libraryHaskellDepends = [ base Cabal filepath ghc haskell98 ];
        description = "a tiny ghc api wrapper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "metric" = callPackage
@@ -138052,7 +136058,6 @@ self: {
        ];
        description = "Metric spaces";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "metrics" = callPackage
@@ -138100,7 +136105,6 @@ self: {
        ];
        description = "Time Synchronized execution";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mezzolens" = callPackage
@@ -138128,7 +136132,6 @@ self: {
        testHaskellDepends = [ base tasty tasty-hunit ];
        description = "Equation solver and calculator à la metafont";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mgeneric" = callPackage
@@ -138333,7 +136336,6 @@ self: {
        homepage = "http://github.com/aelve/microlens";
        description = "True folds and getters for microlens";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "microlens-each" = callPackage
@@ -138700,7 +136702,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/MIDI";
        description = "Convert between datatypes of the midi and the alsa packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "midi-music-box" = callPackage
@@ -138758,7 +136759,6 @@ self: {
        homepage = "http://www.youtube.com/watch?v=cOlR73h2uII";
        description = "A Memory-like (Concentration, Pairs, ...) game for tones";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "midisurface" = callPackage
@@ -138777,7 +136777,6 @@ self: {
        jailbreak = true;
        description = "A control midi surface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mighttpd" = callPackage
@@ -138798,7 +136797,6 @@ self: {
        homepage = "http://www.mew.org/~kazu/proj/mighttpd/";
        description = "Simple Web Server in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mighttpd2" = callPackage
@@ -138830,7 +136828,6 @@ self: {
        homepage = "http://www.mew.org/~kazu/proj/mighttpd/";
        description = "High performance web server on WAI/warp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mighty-metropolis" = callPackage
@@ -138860,7 +136857,6 @@ self: {
        homepage = "https://github.com/evanrinehart/mikmod";
        description = "MikMod bindings";
        license = "LGPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "miku" = callPackage
@@ -138929,7 +136925,6 @@ self: {
        homepage = "http://github.com/mboes/mime-directory";
        description = "A library for parsing/printing the text/directory mime type";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mime-mail_0_4_6" = callPackage
@@ -139161,7 +137156,6 @@ self: {
        ];
        description = "MIME implementation for String's";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mime-types_0_1_0_4" = callPackage
@@ -139233,7 +137227,6 @@ self: {
        jailbreak = true;
        description = "Minesweeper game which is always solvable without guessing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "miniball" = callPackage
@@ -139246,7 +137239,6 @@ self: {
        homepage = "http://nonempty.org/software/haskell-miniball";
        description = "Bindings to Miniball, a smallest enclosing ball library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "miniforth" = callPackage
@@ -139269,7 +137261,6 @@ self: {
        jailbreak = true;
        description = "Miniature FORTH-like interpreter";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "minilens" = callPackage
@@ -139330,7 +137321,6 @@ self: {
        executableHaskellDepends = [ base GLUT haskell98 unix ];
        description = "Shows how to run grabber on Mac OS X";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "minions" = callPackage
@@ -139365,7 +137355,6 @@ self: {
        homepage = "https://github.com/fumieval/minioperational";
        description = "fast and simple operational monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "miniplex" = callPackage
@@ -139383,7 +137372,6 @@ self: {
        jailbreak = true;
        description = "simple 1-to-N interprocess communication";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "minirotate" = callPackage
@@ -139405,7 +137393,6 @@ self: {
        homepage = "http://tener.github.com/haskell-minirotate/";
        description = "Minimalistic file rotation utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "minisat" = callPackage
@@ -139417,7 +137404,6 @@ self: {
        libraryHaskellDepends = [ async base ];
        description = "A Haskell bundle of the Minisat SAT solver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "ministg" = callPackage
@@ -139437,7 +137423,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Ministg";
        description = "an interpreter for an operational semantics for the STG machine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "miniutter" = callPackage
@@ -139470,7 +137455,7 @@ self: {
        testHaskellDepends = [ base binary directory hspec vector ];
        jailbreak = true;
        homepage = "https://github.com/kryoxide/minst-idx/";
-       description = "Read and write IDX data that is used in e.g. the MINST database";
+       description = "Read and write IDX data that is used in e.g. the MINST database.";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
@@ -139492,7 +137477,6 @@ self: {
        homepage = "https://github.com/minamiyama1994/mirror-tweet";
        description = "Tweet mirror";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "misfortune" = callPackage
@@ -139540,7 +137524,6 @@ self: {
        homepage = "https://github.com/domdere/missing-py2";
        description = "Haskell interface to Python";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mix-arrows" = callPackage
@@ -139552,7 +137535,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Mixing effects of one arrow into another one";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mixed-strategies" = callPackage
@@ -139582,9 +137564,8 @@ self: {
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [ base directory filepath haskell98 ];
-       description = "Makes an OS X .app bundle from a binary";
+       description = "Makes an OS X .app bundle from a binary.";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mkcabal" = callPackage
@@ -139618,7 +137599,6 @@ self: {
        executableHaskellDepends = [ base mtl parsec pretty ];
        description = "Minimal ML language to to demonstrate the W type infererence algorithm";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mlist" = callPackage
@@ -139631,7 +137611,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/mlist";
        description = "Monadic List alternative to lazy I/O";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mmap" = callPackage
@@ -139693,7 +137672,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Modular Monad transformer library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mmtl-base" = callPackage
@@ -139705,7 +137683,6 @@ self: {
        libraryHaskellDepends = [ base mmtl ];
        description = "MonadBase type-class for mmtl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "moan" = callPackage
@@ -139724,7 +137701,6 @@ self: {
        homepage = "https://github.com/vjeranc/moan";
        description = "Language-agnostic analyzer for positional morphosyntactic tags";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mockery_0_3_0" = callPackage
@@ -139796,7 +137772,6 @@ self: {
        jailbreak = true;
        description = "A parser for the modelica language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "modify-fasta_0_8_0_4" = callPackage
@@ -139866,7 +137841,6 @@ self: {
        ];
        description = "Haskell source splitter driven by special comments";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "modular-arithmetic" = callPackage
@@ -139900,7 +137874,6 @@ self: {
        homepage = "https://github.com/DanBurton/modular-prelude#readme";
        description = "A new Prelude featuring first class modules";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "modular-prelude-classy" = callPackage
@@ -139914,7 +137887,6 @@ self: {
        homepage = "https://github.com/DanBurton/modular-prelude#readme";
        description = "Reifying ClassyPrelude a la ModularPrelude";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "module-management" = callPackage
@@ -139947,7 +137919,6 @@ self: {
        homepage = "https://github.com/seereason/module-management";
        description = "Clean up module imports, split and merge modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "modulespection" = callPackage
@@ -140072,7 +138043,6 @@ self: {
        homepage = "http://code.haskell.org/mohws/";
        description = "Modular Haskell Web Server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mole" = callPackage
@@ -140118,7 +138088,6 @@ self: {
        homepage = "https://github.com/mvv/monad-abort-fd";
        description = "A better error monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-atom" = callPackage
@@ -140131,7 +138100,6 @@ self: {
        homepage = "https://bitbucket.org/gchrupala/lingo";
        description = "Monadically convert object to unique integers and back";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-atom-simple" = callPackage
@@ -140143,7 +138111,6 @@ self: {
        libraryHaskellDepends = [ base containers ghc-prim mtl ];
        description = "Monadically map objects to unique ints";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-bool" = callPackage
@@ -140341,7 +138308,6 @@ self: {
        jailbreak = true;
        description = "Exstensible monadic exceptions";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-extras_0_5_9" = callPackage
@@ -140432,7 +138398,6 @@ self: {
        homepage = "http://github.com/patperry/monad-interleave";
        description = "Monads with an unsaveInterleaveIO-like operation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-journal_0_5_0_1" = callPackage
@@ -140520,7 +138485,6 @@ self: {
        homepage = "https://github.com/ivan-m/monad-levels";
        description = "Specific levels of monad transformers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-logger_0_3_11" = callPackage
@@ -140841,7 +138805,6 @@ self: {
        homepage = "https://github.com/bjin/monad-lrs";
        description = "a monad to calculate linear recursive sequence";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-memo" = callPackage
@@ -140863,7 +138826,6 @@ self: {
        homepage = "https://github.com/EduardSergeev/monad-memo";
        description = "Memoization monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-mersenne-random" = callPackage
@@ -140876,7 +138838,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/monad-mersenne-random";
        description = "An efficient random generator monad, based on the Mersenne Twister";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-open" = callPackage
@@ -141103,7 +139064,6 @@ self: {
        jailbreak = true;
        description = "Fast monads and monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-resumption" = callPackage
@@ -141197,7 +139157,6 @@ self: {
        homepage = "http://github.com/taruti/monad-stlike-io";
        description = "ST-like monad capturing variables to regions and supporting IO";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-stlike-stm" = callPackage
@@ -141210,7 +139169,6 @@ self: {
        homepage = "http://github.com/taruti/monad-stlike-stm";
        description = "ST-like monad capturing variables to regions and supporting STM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-stm" = callPackage
@@ -141269,7 +139227,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A transactional state monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-unify" = callPackage
@@ -141284,7 +139241,6 @@ self: {
        jailbreak = true;
        description = "Generic first-order unification";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monad-unlift" = callPackage
@@ -141361,7 +139317,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "The Acme and AcmeT monads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monadbi" = callPackage
@@ -141476,7 +139431,6 @@ self: {
        homepage = "http://users.ugent.be/~tschrijv/MCP/";
        description = "Constraint Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monadiccp-gecode" = callPackage
@@ -141494,7 +139448,6 @@ self: {
        homepage = "http://users.ugent.be/~tschrijv/MCP/";
        description = "Constraint Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gecodeint = null; gecodekernel = null; gecodesearch = null; 
          gecodeset = null; gecodesupport = null;};
 
@@ -141617,7 +139570,6 @@ self: {
        homepage = "https://github.com/notogawa/monarch";
        description = "Monadic interface for TokyoTyrant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mongoDB_2_0_3" = callPackage
@@ -141819,7 +139771,6 @@ self: {
        homepage = "https://github.com/docmunch/haskell-mongodb-queue";
        description = "message queue using MongoDB";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mongrel2-handler" = callPackage
@@ -141838,7 +139789,6 @@ self: {
        jailbreak = true;
        description = "Mongrel2 Handler Library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monitor" = callPackage
@@ -141852,7 +139802,6 @@ self: {
        executableHaskellDepends = [ base filepath hinotify process ];
        description = "Do things when files change";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "mono-foldable" = callPackage
@@ -141866,7 +139815,6 @@ self: {
        homepage = "http://github.com/JohnLato/mono-foldable";
        description = "Folds for monomorphic containers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mono-traversable_0_6_3" = callPackage
@@ -142166,7 +140114,6 @@ self: {
        homepage = "http://github.com/nfjinjing/monoid-owns";
        description = "a practical monoid implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoid-record" = callPackage
@@ -142302,7 +140249,6 @@ self: {
        homepage = "https://github.com/blamario/monoid-subclasses/";
        description = "Subclasses of Monoid";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoid-transformer" = callPackage
@@ -142362,7 +140308,6 @@ self: {
        jailbreak = true;
        description = "Extra classes/functions about monoids";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monoids" = callPackage
@@ -142380,7 +140325,6 @@ self: {
        homepage = "http://github.com/ekmett/monoids";
        description = "Deprecated: Use 'reducers'";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "monomorphic" = callPackage
@@ -142462,7 +140406,6 @@ self: {
        homepage = "http://github.com/patperry/hs-monte-carlo";
        description = "A monad and transformer for Monte Carlo calculations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "moo" = callPackage
@@ -142485,7 +140428,6 @@ self: {
        homepage = "http://www.github.com/astanin/moo/";
        description = "Genetic algorithm library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "moonshine" = callPackage
@@ -142524,7 +140466,6 @@ self: {
        homepage = "http://sites.google.com/site/morfetteweb/";
        description = "A tool for supervised learning of morphology";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "morfeusz" = callPackage
@@ -142542,7 +140483,6 @@ self: {
        homepage = "https://github.com/kawu/morfeusz";
        description = "Bindings to the morphological analyser Morfeusz";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {morfeusz = null;};
 
   "morte" = callPackage
@@ -142586,7 +140526,6 @@ self: {
        homepage = "http://ldc.usb.ve/~05-38235/cursos/CI3661/2015AJ/";
        description = "Generación interactiva de mosaicos";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mount" = callPackage
@@ -142598,7 +140537,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Mounts and umounts filesystems";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mountpoints" = callPackage
@@ -142635,7 +140573,6 @@ self: {
        homepage = "https://bitbucket.org/borekpiotr/linux-music-player";
        description = "Music player for linux";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mp3decoder" = callPackage
@@ -142652,7 +140589,6 @@ self: {
        homepage = "http://www.bjrn.se/mp3dec";
        description = "MP3 decoder for teaching";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mpdmate" = callPackage
@@ -142669,7 +140605,6 @@ self: {
        homepage = "http://neugierig.org/software/darcs/powermate/";
        description = "MPD/PowerMate executable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mpppc" = callPackage
@@ -142684,7 +140619,6 @@ self: {
        jailbreak = true;
        description = "Multi-dimensional parametric pretty-printer with color";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mpretty" = callPackage
@@ -142702,7 +140636,6 @@ self: {
        jailbreak = true;
        description = "a monadic, extensible pretty printing library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mpris" = callPackage
@@ -142733,7 +140666,6 @@ self: {
        ];
        description = "Simple equational reasoning for a Haskell-ish language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mps" = callPackage
@@ -142753,7 +140685,6 @@ self: {
        homepage = "http://github.com/nfjinjing/mps/";
        description = "simply oo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mpvguihs" = callPackage
@@ -142773,7 +140704,6 @@ self: {
        homepage = "https://github.com/sebadoom/mpvguihs";
        description = "A minimalist mpv GUI written in I/O heavy Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mqtt-hs" = callPackage
@@ -142879,7 +140809,6 @@ self: {
        homepage = "http://msgpack.org/";
        description = "An IDL Compiler for MessagePack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "msgpack-rpc" = callPackage
@@ -142916,7 +140845,6 @@ self: {
        homepage = "http://www.cl.cam.ac.uk/~mbg28/";
        description = "Object-Oriented Programming in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "msi-kb-backlit" = callPackage
@@ -142930,7 +140858,6 @@ self: {
        executableHaskellDepends = [ base bytestring hid split ];
        description = "A command line tool to change backlit colors of your MSI keyboards";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "mstate" = callPackage
@@ -142987,7 +140914,6 @@ self: {
        jailbreak = true;
        description = "Library to communicate with Mt.Gox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mtl_2_1_3_1" = callPackage
@@ -143143,7 +141069,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Monad transformer library using type families";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mtl-unleashed" = callPackage
@@ -143200,7 +141125,6 @@ self: {
        libraryHaskellDepends = [ base mtl QuickCheck ];
        description = "Monad transformer library with type indexes, providing 'free' copies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mtp" = callPackage
@@ -143214,7 +141138,6 @@ self: {
        jailbreak = true;
        description = "Bindings to libmtp";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {mtp = null;};
 
   "mtree" = callPackage
@@ -143258,7 +141181,6 @@ self: {
        jailbreak = true;
        description = "Continuous deployment server for use with GitHub";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "muesli" = callPackage
@@ -143347,7 +141269,6 @@ self: {
        homepage = "https://github.com/aka-bash0r/multi-cabal";
        description = "A tool supporting multi cabal project builds";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multiaddr" = callPackage
@@ -143434,7 +141355,6 @@ self: {
        ];
        description = "Bidirectional Two-level Transformation of XML Schemas";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multihash" = callPackage
@@ -143519,7 +141439,6 @@ self: {
        homepage = "http://github.com/ekmett/multipass/";
        description = "Folding data with multiple named passes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multiplate" = callPackage
@@ -143544,7 +141463,6 @@ self: {
        jailbreak = true;
        description = "Shorter, more generic functions for Multiplate";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multiplicity" = callPackage
@@ -143589,7 +141507,6 @@ self: {
        jailbreak = true;
        description = "Alternative multirec instances deriver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multirec-binary" = callPackage
@@ -143600,9 +141517,8 @@ self: {
        sha256 = "fa57bbf7fd5159713520772307af960e2c79d9c24e045ef23680f18ea5cb41b2";
        libraryHaskellDepends = [ base binary multirec ];
        jailbreak = true;
-       description = "Generic Data.Binary instances using MultiRec";
+       description = "Generic Data.Binary instances using MultiRec.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multiset_0_3_0" = callPackage
@@ -143652,7 +141568,6 @@ self: {
        homepage = "http://sulzmann.blogspot.com/2008/10/multi-set-rewrite-rules-with-guards-and.html";
        description = "Multi-set rewrite rules with guards and a parallel execution scheme";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "multistate" = callPackage
@@ -143713,7 +141628,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/Center/CoCoCo";
        description = "MUtually Recursive Definitions Explicitly Represented";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "murmur-hash" = callPackage
@@ -143758,7 +141672,6 @@ self: {
        homepage = "https://github.com/niswegmann/murmurhash3";
        description = "32-bit non-cryptographic hashing";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "music-articulation" = callPackage
@@ -143823,7 +141736,6 @@ self: {
        jailbreak = true;
        description = "Diagrams-based visualization of musical data structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "music-parts" = callPackage
@@ -143843,7 +141755,6 @@ self: {
        ];
        description = "Musical instruments, parts and playing techniques";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "music-pitch" = callPackage
@@ -143899,7 +141810,6 @@ self: {
        testHaskellDepends = [ base process tasty tasty-golden ];
        description = "Some useful preludes for the Music Suite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "music-score" = callPackage
@@ -143924,7 +141834,6 @@ self: {
        jailbreak = true;
        description = "Musical score and part representation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "music-sibelius" = callPackage
@@ -143944,7 +141853,6 @@ self: {
        ];
        description = "Interaction with Sibelius";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "music-suite" = callPackage
@@ -143964,7 +141872,6 @@ self: {
        doHaddock = false;
        description = "A set of libraries for composition, analysis and manipulation of music";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "music-util" = callPackage
@@ -143982,7 +141889,6 @@ self: {
        ];
        description = "Utility for developing the Music Suite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "musicbrainz-email" = callPackage
@@ -144017,7 +141923,6 @@ self: {
        homepage = "http://github.com/metabrainz/mass-mail";
        description = "Send an email to all MusicBrainz editors";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "musicxml" = callPackage
@@ -144035,7 +141940,6 @@ self: {
        homepage = "https://troglodita.di.uminho.pt/svn/musica/work/MusicXML";
        description = "MusicXML format encoded as Haskell type and functions of reading and writting";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "musicxml2" = callPackage
@@ -144084,7 +141988,6 @@ self: {
        homepage = "https://github.com/JustusAdam/mustache";
        description = "A mustache template parser library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mustache-haskell" = callPackage
@@ -144130,7 +142033,6 @@ self: {
        homepage = "http://github.com/singpolyma/mustache2hs";
        description = "Utility to generate Haskell code from Mustache templates";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mutable-containers_0_2_1_2" = callPackage
@@ -144207,7 +142109,6 @@ self: {
        homepage = "http://jwlato.webfactional.com/haskell/mutable-iter";
        description = "iteratees based upon mutable buffers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mute-unmute" = callPackage
@@ -144257,7 +142158,6 @@ self: {
        jailbreak = true;
        description = "Concurrent and combinable updates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mvclient" = callPackage
@@ -144277,7 +142177,6 @@ self: {
        jailbreak = true;
        description = "Client library for metaverse systems like Second Life";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mwc-probability_1_0_2" = callPackage
@@ -144446,7 +142345,6 @@ self: {
        homepage = "http://haskell.cs.yale.edu/";
        description = "None";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mybitcoin-sci" = callPackage
@@ -144458,7 +142356,7 @@ self: {
        libraryHaskellDepends = [
          base cgi curl directory mtl process split
        ];
-       description = "Binding to mybitcoin.com's Shopping Cart Interface";
+       description = "Binding to mybitcoin.com's Shopping Cart Interface.";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
@@ -144484,7 +142382,6 @@ self: {
        homepage = "http://github.com/adinapoli/myo";
        description = "Haskell binding to the Myo armband";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mysnapsession" = callPackage
@@ -144502,7 +142399,6 @@ self: {
        jailbreak = true;
        description = "Sessions and continuations for Snap web apps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mysnapsession-example" = callPackage
@@ -144522,7 +142418,6 @@ self: {
        jailbreak = true;
        description = "Example projects using mysnapsession";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mysql_0_1_1_7" = callPackage
@@ -144621,7 +142516,6 @@ self: {
        ];
        description = "Quasi-quoter for use with mysql-simple";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mysql-simple-typed" = callPackage
@@ -144638,7 +142532,6 @@ self: {
        homepage = "https://github.com/tolysz/mysql-simple-typed";
        description = "Typed extension to mysql simple";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "mzv" = callPackage
@@ -144652,7 +142545,6 @@ self: {
        homepage = "http://github.com/ifigueroap/mzv";
        description = "Implementation of the \"Monads, Zippers and Views\" (Schrijvers and Oliveira, ICFP'11)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "n-m" = callPackage
@@ -144725,7 +142617,6 @@ self: {
        homepage = "https://github.com/fractalcat/nagios-plugin-ekg";
        description = "Monitor ekg metrics via Nagios";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "named-formlet" = callPackage
@@ -144754,7 +142645,6 @@ self: {
        homepage = "http://github.com/nominolo/named-lock";
        description = "A named lock that is created on demand";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "named-records" = callPackage
@@ -144821,7 +142711,6 @@ self: {
        homepage = "http://github.com/chowells79/nano-cryptr";
        description = "A threadsafe binding to glibc's crypt_r function";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nano-erl" = callPackage
@@ -144846,7 +142735,6 @@ self: {
        homepage = "http://www.jasani.org/search/label/nano-hmac";
        description = "Bindings to OpenSSL HMAC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
   "nano-md5" = callPackage
@@ -144860,7 +142748,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/nano-md5";
        description = "Efficient, ByteString bindings to OpenSSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
   "nanoAgda" = callPackage
@@ -144879,7 +142766,6 @@ self: {
        jailbreak = true;
        description = "A toy dependently-typed language";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nanocurses" = callPackage
@@ -144893,7 +142779,6 @@ self: {
        homepage = "http://www.cse.unsw.edu.au/~dons/hmp3.html";
        description = "Simple Curses binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ncurses;};
 
   "nanomsg" = callPackage
@@ -144907,7 +142792,6 @@ self: {
        jailbreak = true;
        description = "nanomsg - scalability protocols library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) nanomsg;};
 
   "nanomsg-haskell" = callPackage
@@ -144996,7 +142880,6 @@ self: {
        homepage = "http://ezrakilty.net/projects/narc";
        description = "Query SQL databases using Nested Relational Calculus embedded in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nat" = callPackage
@@ -145144,7 +143027,6 @@ self: {
        ];
        description = "Haskell API for NATS messaging system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "natural-number" = callPackage
@@ -145162,7 +143044,6 @@ self: {
        jailbreak = true;
        description = "Natural numbers tagged with a type-level representation of the number";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "natural-numbers" = callPackage
@@ -145343,7 +143224,6 @@ self: {
        homepage = "https://github.com/ajg/neat";
        description = "A Fast Retargetable Template Engine";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "neat-interpolation_0_2_2" = callPackage
@@ -145458,6 +143338,24 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "neat-interpolation_0_3_2" = callPackage
+    ({ mkDerivation, base, base-prelude, HTF, parsec, template-haskell
+     , text
+     }:
+     mkDerivation {
+       pname = "neat-interpolation";
+       version = "0.3.2";
+       sha256 = "875e77c4a624c2fef750a68d0296decd4dd9f3afd174e8831427cdab03ef5e0a";
+       libraryHaskellDepends = [
+         base base-prelude parsec template-haskell text
+       ];
+       testHaskellDepends = [ base-prelude HTF ];
+       homepage = "https://github.com/nikita-volkov/neat-interpolation";
+       description = "A quasiquoter for neat and simple multiline text interpolation";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "needle" = callPackage
     ({ mkDerivation, base, containers, haskell-src-meta, mtl, parsec
      , parsec-extra, template-haskell, text, vector
@@ -145474,7 +143372,6 @@ self: {
        homepage = "http://scrambledeggsontoast.github.io/2014/09/28/needle-announce/";
        description = "ASCII-fied arrow notation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "neet" = callPackage
@@ -145511,7 +143408,6 @@ self: {
        ];
        description = "Port of the NeHe OpenGL tutorials to Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "neil" = callPackage
@@ -145601,7 +143497,6 @@ self: {
        homepage = "https://github.com/kawu/nerf";
        description = "Nerf, the named entity recognition tool based on linear-chain CRFs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nero" = callPackage
@@ -145621,7 +143516,6 @@ self: {
        homepage = "https://github.com/plutonbrb/nero";
        description = "Lens-based HTTP toolkit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nero-wai" = callPackage
@@ -145638,7 +143532,6 @@ self: {
        homepage = "https://github.com/plutonbrb/nero-wai";
        description = "WAI adapter for Nero server applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nero-warp" = callPackage
@@ -145651,7 +143544,6 @@ self: {
        homepage = "https://github.com/plutonbrb/nero-warp";
        description = "Run Nero server applications with Warp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nested-routes" = callPackage
@@ -145690,7 +143582,6 @@ self: {
        ];
        description = "Declarative, compositional Wai responses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nested-sets" = callPackage
@@ -145778,7 +143669,6 @@ self: {
        homepage = "http://frenetic-lang.org";
        description = "The NetCore compiler and runtime system for OpenFlow networks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "netlines" = callPackage
@@ -145797,7 +143687,6 @@ self: {
        executableHaskellDepends = [ base HTF random ];
        description = "Enumerator tools for text-based network protocols";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "netlink" = callPackage
@@ -145897,7 +143786,6 @@ self: {
        homepage = "http://github.com/DanBurton/netspec";
        description = "Simplify static Networking tasks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "netstring-enumerator" = callPackage
@@ -145991,7 +143879,6 @@ self: {
        homepage = "https://github.com/stbuehler/haskell-nettle";
        description = "safe nettle binding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) nettle;};
 
   "nettle-frp" = callPackage
@@ -146009,7 +143896,6 @@ self: {
        jailbreak = true;
        description = "FRP for controlling networks of OpenFlow switches";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nettle-netkit" = callPackage
@@ -146025,7 +143911,6 @@ self: {
        ];
        description = "DSL for describing OpenFlow networks, and a compiler generating NetKit labs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nettle-openflow" = callPackage
@@ -146042,7 +143927,6 @@ self: {
        ];
        description = "OpenFlow protocol messages, binary formats, and servers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "netwire" = callPackage
@@ -146093,7 +143977,6 @@ self: {
        homepage = "https://www.github.com/Mokosha/netwire-input-glfw";
        description = "GLFW instance of netwire-input";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "network_2_5_0_0" = callPackage
@@ -146211,7 +144094,6 @@ self: {
        homepage = "http://github.com/sebnow/haskell-network-address";
        description = "IP data structures and textual representation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-anonymous-i2p" = callPackage
@@ -146381,7 +144263,6 @@ self: {
        ];
        description = "Linux NetworkNameSpace Builder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-bytestring" = callPackage
@@ -146395,7 +144276,6 @@ self: {
        homepage = "http://github.com/tibbe/network-bytestring";
        description = "Fast, memory-efficient, low-level networking";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-carbon_1_0_5" = callPackage
@@ -146584,7 +144464,6 @@ self: {
        homepage = "http://darcs.imperialviolet.org/network-connection";
        description = "A wrapper around a generic stream-like connection";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-data" = callPackage
@@ -146653,13 +144532,12 @@ self: {
     ({ mkDerivation, base, bytestring }:
      mkDerivation {
        pname = "network-fancy";
-       version = "0.2.3";
-       sha256 = "c5c5818797db9fcacc1a68e47233f64f590a7ec3add7a0e1e078e4b8305f90ac";
+       version = "0.2.4";
+       sha256 = "4936ea7f980768a66656332f7211b1877af4b387ad5c81ab3dde76b3eb76df57";
        libraryHaskellDepends = [ base bytestring ];
        homepage = "http://github.com/taruti/network-fancy";
        description = "Networking support with a cleaner API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "network-house" = callPackage
@@ -146735,7 +144613,6 @@ self: {
        jailbreak = true;
        description = "Haskell bindings for the ifreq structure";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "network-ip" = callPackage
@@ -146794,7 +144671,6 @@ self: {
        homepage = "http://darcs.imperialviolet.org/network-minihttp";
        description = "A ByteString based library for writing HTTP(S) servers and clients";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-msg" = callPackage
@@ -146846,7 +144722,6 @@ self: {
        jailbreak = true;
        description = "Haskell bindings for low-level packet sockets (AF_PACKET)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "network-pgi" = callPackage
@@ -146896,7 +144771,6 @@ self: {
        ];
        description = "A cross-platform RPC library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-server" = callPackage
@@ -146911,7 +144785,6 @@ self: {
        executableHaskellDepends = [ base network unix ];
        description = "A light abstraction over sockets & co. for servers";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-service" = callPackage
@@ -147020,7 +144893,6 @@ self: {
        homepage = "https://github.com/k0001/network-simple-tls";
        description = "Simple interface to TLS secured network sockets";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-socket-options" = callPackage
@@ -147073,7 +144945,6 @@ self: {
        homepage = "https://github.com/bgamari/bayes-stack";
        description = "A few network topic model implementations for bayes-stack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-transport_0_4_1_0" = callPackage
@@ -147117,6 +144988,8 @@ self: {
        pname = "network-transport";
        version = "0.4.3.1";
        sha256 = "77fd80f672d6cabed4b60cc728f89543500080203cd91b76e07f814baabbd836";
+       revision = "1";
+       editedCabalFile = "0355f57fcc68a71ac6819a4d091466b39eb247a172ee0b1d8996927c68ca6fa2";
        libraryHaskellDepends = [
          base binary bytestring deepseq hashable transformers
        ];
@@ -147149,7 +145022,6 @@ self: {
        jailbreak = true;
        description = "AMQP-based transport layer for distributed-process (aka Cloud Haskell)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "network-transport-composed" = callPackage
@@ -147447,7 +145319,6 @@ self: {
        homepage = "http://github.com/michaelmelanson/network-websocket";
        description = "WebSocket library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "networked-game" = callPackage
@@ -147479,7 +145350,6 @@ self: {
        homepage = "http://www.b7j0c.org/content/haskell-newports.html";
        description = "List ports newer than N days on a FreeBSD system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "newsynth" = callPackage
@@ -147499,7 +145369,6 @@ self: {
        homepage = "http://www.mathstat.dal.ca/~selinger/newsynth/";
        description = "Exact and approximate synthesis of quantum circuits";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "newt" = callPackage
@@ -147526,7 +145395,6 @@ self: {
        jailbreak = true;
        description = "A trivially simple app to create things from simple templates";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "newtype" = callPackage
@@ -147585,9 +145453,8 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://github.com/mgsloan/newtype-th";
-       description = "A template haskell deriver to create Control.Newtype instances";
+       description = "A template haskell deriver to create Control.Newtype instances.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "newtyper" = callPackage
@@ -147659,7 +145526,6 @@ self: {
        homepage = "https://github.com/fhsjaagshs/niagra";
        description = "CSS EDSL for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nibblestring" = callPackage
@@ -147680,7 +145546,6 @@ self: {
        ];
        description = "Packed, strict nibble arrays with a list interface (ByteString for nibbles)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nicify" = callPackage
@@ -147750,7 +145615,6 @@ self: {
        homepage = "http://www.codemanic.com/uwe";
        description = "Command line utility publishes Nike+ runs on blogs and Twitter";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nimber" = callPackage
@@ -147763,7 +145627,6 @@ self: {
        homepage = "http://andersk.mit.edu/haskell/nimber/";
        description = "Finite nimber arithmetic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "nist-beacon" = callPackage
@@ -147789,7 +145652,6 @@ self: {
        homepage = "http://haskell.gonitro.io";
        description = "Haskell bindings for Nitro";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nix-eval" = callPackage
@@ -147855,7 +145717,6 @@ self: {
        ];
        description = "Generate nix expressions from npm packages";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nixos-types" = callPackage
@@ -147888,7 +145749,6 @@ self: {
        homepage = "https://github.com/kawu/nkjp";
        description = "Manipulating the National Corpus of Polish (NKJP)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nlp-scores" = callPackage
@@ -147934,7 +145794,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Network Manager, binding to libnm-glib";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {g = null; inherit (pkgs) glib; libnm-glib = null; 
          nm-glib = null;};
 
@@ -147948,7 +145807,6 @@ self: {
        homepage = "https://github.com/singpolyma/NME-Haskell";
        description = "Bindings to the Nyctergatis Markup Engine";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nntp" = callPackage
@@ -147964,7 +145822,6 @@ self: {
        ];
        description = "Library to connect to an NNTP Server";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "no-buffering-workaround" = callPackage
@@ -148043,7 +145900,6 @@ self: {
        homepage = "http://github.com/brow/noise";
        description = "A friendly language for graphic design";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "non-empty" = callPackage
@@ -148155,7 +146011,6 @@ self: {
        homepage = "https://github.com/jessopher/noodle";
        description = "the noodle programming language";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "normaldistribution" = callPackage
@@ -148177,15 +146032,15 @@ self: {
      }:
      mkDerivation {
        pname = "not-gloss";
-       version = "0.7.6.4";
-       sha256 = "a43d0b18834237da91b9ffb44ce23a6fe764b962ed0b3bca56ea01903603534e";
+       version = "0.7.6.5";
+       sha256 = "2d035f7086cdf09542010b98881feb4aeb9e4eaddb9e3d28292d20fe3984e804";
        libraryHaskellDepends = [
          base binary bmp bytestring cereal 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;
      }) {};
 
   "not-gloss-examples" = callPackage
@@ -148203,7 +146058,6 @@ self: {
        ];
        description = "examples for not-gloss";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "not-in-base" = callPackage
@@ -148246,7 +146100,6 @@ self: {
        executableSystemDepends = [ notmuch ];
        description = "Binding for notmuch MUA library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) notmuch;};
 
   "notmuch-web" = callPackage
@@ -148285,7 +146138,6 @@ self: {
        homepage = "https://bitbucket.org/wuzzeb/notmuch-web";
        description = "A web interface to the notmuch email indexer";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "notzero" = callPackage
@@ -148333,7 +146185,6 @@ self: {
        jailbreak = true;
        description = "Linear algebra for the numeric-prelude framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nptools" = callPackage
@@ -148352,7 +146203,6 @@ self: {
        ];
        description = "A collection of random tools";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nsis_0_2_4" = callPackage
@@ -148430,7 +146280,6 @@ self: {
        sha256 = "9e6a4e4cf0116a8aab09185bcdb62106206c6b41816cc1c6d6e3dac50fe621e2";
        libraryHaskellDepends = [ base type-level ];
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ntp-control" = callPackage
@@ -148467,7 +146316,6 @@ self: {
        homepage = "https://github.com/Tener/null-canvas";
        description = "HTML5 Canvas Graphics Library - forked Blank Canvas";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nullary" = callPackage
@@ -148562,7 +146410,6 @@ self: {
        homepage = "https://github.com/roelvandijk/numerals";
        description = "Convert numbers to number words";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "numerals-base" = callPackage
@@ -148586,7 +146433,6 @@ self: {
        homepage = "https://github.com/roelvandijk/numerals-base";
        description = "Convert numbers to number words";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "numeric-extras_0_0_3" = callPackage
@@ -148661,7 +146507,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/numeric-qq";
        description = "Quasi-quoters for numbers of different bases";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "numeric-quest" = callPackage
@@ -148824,7 +146669,6 @@ self: {
        homepage = "https://github.com/neovimhaskell/nvim-hs";
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nvim-hs-contrib" = callPackage
@@ -148851,7 +146695,6 @@ self: {
        homepage = "https://github.com/neovimhaskell/nvim-hs";
        description = "Haskell plugin backend for neovim";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "nyan" = callPackage
@@ -148901,7 +146744,6 @@ self: {
        jailbreak = true;
        description = "An interactive GUI for manipulating L-systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "oanda-rest-api" = callPackage
@@ -148982,7 +146824,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/Center/CoCoCo";
        description = "Oberon0 Compiler";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "obj" = callPackage
@@ -149002,7 +146843,6 @@ self: {
        ];
        description = "Reads and writes obj models";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "objectid" = callPackage
@@ -149025,10 +146865,9 @@ self: {
        homepage = "https://github.com/tsuraan/objectid";
        description = "Rather unique identifier for things that need to be stored";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "objective" = callPackage
+  "objective_1_0_5" = callPackage
     ({ mkDerivation, base, containers, either, exceptions, free
      , hashable, monad-skeleton, monad-stm, mtl, profunctors, stm
      , template-haskell, transformers, transformers-compat
@@ -149046,6 +146885,27 @@ self: {
        homepage = "https://github.com/fumieval/objective";
        description = "Composable objects";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "objective" = callPackage
+    ({ mkDerivation, base, containers, either, exceptions, free
+     , hashable, monad-skeleton, mtl, profunctors, template-haskell
+     , transformers, transformers-compat, unordered-containers, void
+     , witherable
+     }:
+     mkDerivation {
+       pname = "objective";
+       version = "1.1";
+       sha256 = "38a3e0d27fbff0d358942202051121ef0080e68a9e0e57bd2b97de7586006a0e";
+       libraryHaskellDepends = [
+         base containers either exceptions free hashable monad-skeleton mtl
+         profunctors template-haskell transformers transformers-compat
+         unordered-containers void witherable
+       ];
+       homepage = "https://github.com/fumieval/objective";
+       description = "Composable objects";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "observable-sharing" = callPackage
@@ -149135,7 +146995,6 @@ self: {
        homepage = "https://github.com/Zankoku-Okuno/octopus/";
        description = "Lisp with more dynamism, more power, more simplicity";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "oculus" = callPackage
@@ -149154,7 +147013,6 @@ self: {
        homepage = "http://github.com/cpdurham/oculus";
        description = "Oculus Rift ffi providing head tracking data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXinerama; 
          inherit (pkgs) mesa; ovr = null; inherit (pkgs) systemd;};
 
@@ -149238,7 +147096,6 @@ self: {
        homepage = "https://github.com/fthomas/ohloh-hs";
        description = "Interface to the Ohloh API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "oi" = callPackage
@@ -149255,7 +147112,6 @@ self: {
        executableHaskellDepends = [ base directory filepath parallel ];
        description = "Library for purely functional lazy interactions with the outer world";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "oidc-client" = callPackage
@@ -149279,7 +147135,6 @@ self: {
        homepage = "https://github.com/krdlab/haskell-oidc-client";
        description = "OpenID Connect 1.0 library for RP";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ois-input-manager" = callPackage
@@ -149293,7 +147148,6 @@ self: {
        jailbreak = true;
        description = "wrapper for OIS input manager for use with hogre";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {OIS = null;};
 
   "old-locale" = callPackage
@@ -149377,7 +147231,6 @@ self: {
        homepage = "https://github.com/pcapriotti/omaketex";
        description = "A simple tool to generate OMakefile for latex files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "omega" = callPackage
@@ -149396,7 +147249,6 @@ self: {
        homepage = "http://code.google.com/p/omega/";
        description = "A purely functional programming language and a proof system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "omnicodec" = callPackage
@@ -149415,7 +147267,6 @@ self: {
        jailbreak = true;
        description = "data encoding and decoding command line utilities";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "omnifmt" = callPackage
@@ -149461,7 +147312,6 @@ self: {
        homepage = "http://haskell.on-a-horse.org";
        description = "\"Haskell on a Horse\" - A combinatorial web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "on-demand-ssh-tunnel" = callPackage
@@ -149514,7 +147364,6 @@ self: {
        homepage = "https://github.com/sjoerdvisscher/one-liner";
        description = "Constraint-based generics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "one-time-password" = callPackage
@@ -149559,7 +147408,6 @@ self: {
        homepage = "https://github.com/thinkpad20/oneormore";
        description = "A never-empty list type";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "only" = callPackage
@@ -149584,7 +147432,6 @@ self: {
        libraryHaskellDepends = [ base smallcheck ];
        description = "Code for the Haskell course taught at the Odessa National University in 2012";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "oo-prototypes" = callPackage
@@ -149887,7 +147734,6 @@ self: {
        homepage = "http://johnmacfarlane.net/pandoc";
        description = "Conversion between markup formats";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "open-symbology" = callPackage
@@ -149916,7 +147762,6 @@ self: {
        homepage = "https://github.com/emilaxelsson/open-typerep";
        description = "Open type representations and dynamic types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "open-union" = callPackage
@@ -149932,7 +147777,6 @@ self: {
        homepage = "https://github.com/RobotGymnast/open-union";
        description = "Extensible, type-safe unions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "open-witness" = callPackage
@@ -149945,7 +147789,6 @@ self: {
        jailbreak = true;
        description = "open witnesses";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opencog-atomspace" = callPackage
@@ -149959,7 +147802,6 @@ self: {
        homepage = "github.com/opencog/atomspace/tree/master/opencog/haskell";
        description = "Haskell Bindings for the AtomSpace";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {atomspace-cwrapper = null;};
 
   "opencv-raw" = callPackage
@@ -149974,7 +147816,6 @@ self: {
        homepage = "www.github.com/arjuncomar/opencv-raw.git";
        description = "Raw Haskell bindings to OpenCV >= 2.0";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) opencv;};
 
   "opendatatable" = callPackage
@@ -150004,7 +147845,6 @@ self: {
        homepage = "https://github.com/singpolyma/openexchangerates-haskell";
        description = "Fetch exchange rates from OpenExchangeRates.org";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "openflow" = callPackage
@@ -150023,7 +147863,6 @@ self: {
        homepage = "https://github.com/AndreasVoellmy/openflow";
        description = "OpenFlow";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opengl-dlp-stereo" = callPackage
@@ -150076,7 +147915,6 @@ self: {
        jailbreak = true;
        description = "OpenGL ES 2.0 and 3.0 with EGL 1.4";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {EGL = null; GLESv2 = null;};
 
   "openid" = callPackage
@@ -150093,9 +147931,8 @@ self: {
          base bytestring containers HsOpenSSL HTTP monadLib network time xml
        ];
        homepage = "http://github.com/elliottt/hsopenid";
-       description = "An implementation of the OpenID-2.0 spec";
+       description = "An implementation of the OpenID-2.0 spec.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "openpgp" = callPackage
@@ -150141,7 +147978,6 @@ self: {
        homepage = "http://github.com/singpolyma/OpenPGP-Crypto";
        description = "Implementation of cryptography for use with OpenPGP using the Crypto library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "openpgp-asciiarmor" = callPackage
@@ -150189,7 +148025,6 @@ self: {
        homepage = "http://github.com/singpolyma/OpenPGP-CryptoAPI";
        description = "Implement cryptography for OpenPGP using crypto-api compatible libraries";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opensoundcontrol-ht" = callPackage
@@ -150229,7 +148064,6 @@ self: {
        homepage = "https://github.com/stackbuilders/openssh-github-keys";
        description = "Fetch OpenSSH keys from a GitHub team";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "openssl-createkey" = callPackage
@@ -150330,7 +148164,6 @@ self: {
        jailbreak = true;
        description = "Unicode characters";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opentheory-divides" = callPackage
@@ -150563,7 +148396,7 @@ self: {
          uri-bytestring xml-conduit-parse
        ];
        homepage = "https://github.com/k0ral/opml-conduit";
-       description = "Streaming parser/renderer for the OPML 2.0 format";
+       description = "Streaming parser/renderer for the OPML 2.0 format.";
        license = "unknown";
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -150627,9 +148460,8 @@ self: {
          uri-bytestring xml-conduit-parse
        ];
        homepage = "https://github.com/k0ral/opml-conduit";
-       description = "Streaming parser/renderer for the OPML 2.0 format";
+       description = "Streaming parser/renderer for the OPML 2.0 format.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "opn" = callPackage
@@ -150672,7 +148504,6 @@ self: {
        homepage = "https://github.com/tsuraan/optimal-blocks";
        description = "Optimal Block boundary determination for rsync-like behaviours";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "optimization" = callPackage
@@ -150710,7 +148541,6 @@ self: {
        homepage = "http://optimusprime.posterous.com/";
        description = "A supercompiler for f-lite";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "option" = callPackage
@@ -150994,9 +148824,8 @@ self: {
          wreq
        ];
        jailbreak = true;
-       description = "An API client for http://orchestrate.io/";
+       description = "An API client for http://orchestrate.io/.";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "orchid" = callPackage
@@ -151017,7 +148846,6 @@ self: {
        jailbreak = true;
        description = "Haskell Wiki Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "orchid-demo" = callPackage
@@ -151037,7 +148865,6 @@ self: {
        jailbreak = true;
        description = "Haskell Wiki Demo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ord-adhoc" = callPackage
@@ -151067,7 +148894,18 @@ self: {
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/order-maintenance";
        description = "Algorithms for the order maintenance problem with a safe interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "order-statistic-tree" = callPackage
+    ({ mkDerivation, base, tasty, tasty-hunit, tasty-quickcheck }:
+     mkDerivation {
+       pname = "order-statistic-tree";
+       version = "0.1.1.0";
+       sha256 = "0069ae9ad6ed98ca367026e9c1d6be4c553e6ec451aff0f658532e0ed6a692bd";
+       libraryHaskellDepends = [ base ];
+       testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck ];
+       description = "Order statistic trees based on weight-balanced trees";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "order-statistics" = callPackage
@@ -151164,8 +149002,8 @@ self: {
      }:
      mkDerivation {
        pname = "orgmode-parse";
-       version = "0.1.1.2";
-       sha256 = "b10f3d1db39338cd763f2df71db969288898c1f9b5d9a356b15dded83c7b49fb";
+       version = "0.1.1.3";
+       sha256 = "322779285609e1f99d7d046802db2b6a54c51adc803dfd55a81d6518f9cab627";
        libraryHaskellDepends = [
          aeson attoparsec base bytestring containers free hashable
          old-locale text thyme unordered-containers
@@ -151176,7 +149014,6 @@ self: {
        ];
        description = "A collection of Attoparsec combinators for parsing org-mode flavored documents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "origami" = callPackage
@@ -151196,7 +149033,6 @@ self: {
        homepage = "http://github.com/nedervold/origami";
        description = "An un-SYB framework for transforming heterogenous data through folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "os-release" = callPackage
@@ -151273,7 +149109,6 @@ self: {
        jailbreak = true;
        description = "Download Open Street Map tiles";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "oso2pdf" = callPackage
@@ -151325,7 +149160,6 @@ self: {
        homepage = "https://github.com/operational-transformation/ot.hs";
        description = "Real-time collaborative editing with Operational Transformation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ottparse-pretty" = callPackage
@@ -151343,6 +149177,26 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "overloaded-records" = callPackage
+    ({ mkDerivation, base, data-default-class, HUnit, template-haskell
+     , test-framework, test-framework-hunit
+     }:
+     mkDerivation {
+       pname = "overloaded-records";
+       version = "0.3.0.0";
+       sha256 = "54cc3bfdf30ceaf6f7dbcf481c68a282bf5ac872c79b4665acfc9209b628a3d4";
+       libraryHaskellDepends = [
+         base data-default-class template-haskell
+       ];
+       testHaskellDepends = [
+         base data-default-class HUnit template-haskell test-framework
+         test-framework-hunit
+       ];
+       homepage = "https://github.com/trskop/overloaded-records";
+       description = "Overloaded Records based on current GHC proposal";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "overture" = callPackage
     ({ mkDerivation, base, doctest }:
      mkDerivation {
@@ -151420,7 +149274,6 @@ self: {
        jailbreak = true;
        description = "Haskell Package Versioning Tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "packdeps" = callPackage
@@ -151477,7 +149330,6 @@ self: {
        jailbreak = true;
        description = "(Deprecated) Packed Strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "packer" = callPackage
@@ -151514,7 +149366,6 @@ self: {
        ];
        description = "Serialization library for GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "packunused" = callPackage
@@ -151569,7 +149420,6 @@ self: {
        homepage = "https://github.com/fumieval/padKONTROL";
        description = "Controlling padKONTROL native mode";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pagarme" = callPackage
@@ -151854,7 +149704,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "Haskell binding for C PAM API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) pam;};
 
   "panda" = callPackage
@@ -151875,7 +149724,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Panda";
        description = "A simple static blog engine";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pandoc_1_13_1" = callPackage
@@ -152841,7 +150689,6 @@ self: {
        executableHaskellDepends = [ base pandoc ];
        description = "Literate Haskell support for GitHub's Markdown flavor";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pango_0_13_0_4" = callPackage
@@ -152945,7 +150792,6 @@ self: {
        homepage = "https://skami.iocikun.jp/computer/haskell/packages/papillon";
        description = "packrat parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pappy" = callPackage
@@ -152960,7 +150806,6 @@ self: {
        homepage = "http://pdos.csail.mit.edu/~baford/packrat/thesis/";
        description = "Packrat parsing; linear-time parsers for grammars in TDPL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "para" = callPackage
@@ -153000,7 +150845,6 @@ self: {
        jailbreak = true;
        description = "Paragon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parallel_3_2_0_3" = callPackage
@@ -153083,7 +150927,6 @@ self: {
        ];
        jailbreak = true;
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parallel-tree-search" = callPackage
@@ -153108,7 +150951,6 @@ self: {
        homepage = "http://code.haskell.org/parameterized-data";
        description = "Parameterized data library implementing lightweight dependent types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parco" = callPackage
@@ -153120,7 +150962,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Generalised parser combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parco-attoparsec" = callPackage
@@ -153132,7 +150973,6 @@ self: {
        libraryHaskellDepends = [ attoparsec base mtl parco ];
        description = "Generalised parser combinators - Attoparsec interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parco-parsec" = callPackage
@@ -153144,7 +150984,6 @@ self: {
        libraryHaskellDepends = [ base mtl parco parsec ];
        description = "Generalised parser combinators - Parsec interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parcom-lib" = callPackage
@@ -153187,7 +151026,6 @@ self: {
        jailbreak = true;
        description = "Examples to accompany the book \"Parallel and Concurrent Programming in Haskell\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parport" = callPackage
@@ -153199,7 +151037,6 @@ self: {
        libraryHaskellDepends = [ array base ];
        description = "Simply interfacing the parallel port on linux";
        license = "GPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "parse-dimacs" = callPackage
@@ -153230,7 +151067,6 @@ self: {
        homepage = "http://github.com/gregwebs/cmdargs-help";
        description = "generate command line arguments from a --help output";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parseargs_0_1_5_2" = callPackage
@@ -153367,7 +151203,7 @@ self: {
        sha256 = "b187eebf9d24bf66a2d5dbf66cf83442eb68bf316519985a2c738e04f87ecd79";
        libraryHaskellDepends = [ base parsec ];
        testHaskellDepends = [ base parsec QuickCheck ];
-       description = "Applicative permutation parser for Parsec intended as a replacement for Text.Parsec.Perm";
+       description = "Applicative permutation parser for Parsec intended as a replacement for Text.Parsec.Perm.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -153497,7 +151333,6 @@ self: {
        libraryHaskellDepends = [ base mtl parsec ];
        homepage = "http://naesten.dyndns.org:8080/repos/parsely";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parser-helper" = callPackage
@@ -153514,7 +151349,6 @@ self: {
        jailbreak = true;
        description = "Prints Haskell parse trees in JSON";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parser241" = callPackage
@@ -153530,7 +151364,6 @@ self: {
        homepage = "https://github.com/YLiLarry/parser241";
        description = "An interface to create production rules using augmented grammars";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parsergen" = callPackage
@@ -153652,7 +151485,6 @@ self: {
        jailbreak = true;
        description = "NMR-STAR file format parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "parsimony" = callPackage
@@ -153755,7 +151587,6 @@ self: {
        jailbreak = true;
        description = "Haskell 98 Partial Lenses";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "partial-uri" = callPackage
@@ -153791,7 +151622,6 @@ self: {
        homepage = "https://github.com/startling/partly";
        description = "Inspect, create, and alter MBRs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "passage" = callPackage
@@ -153809,7 +151639,6 @@ self: {
        ];
        description = "Parallel code generation for hierarchical Bayesian modeling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "passwords" = callPackage
@@ -153832,7 +151661,6 @@ self: {
        libraryHaskellDepends = [ base HTTP network ];
        description = "Interface to the past.is URL shortening service";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pasty" = callPackage
@@ -153847,7 +151675,6 @@ self: {
        homepage = "http://github.com/markusle/pasty/tree/master";
        description = "A simple command line pasting utility";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "patch-combinators" = callPackage
@@ -154098,7 +151925,6 @@ self: {
        homepage = "http://github.com/TheBizzle";
        description = "A toy pathfinding library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pathtype" = callPackage
@@ -154186,7 +152012,6 @@ self: {
        homepage = "http://github.com/toschoo/mom";
        description = "Common patterns in message-oriented applications";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "paymill" = callPackage
@@ -154225,7 +152050,6 @@ self: {
        homepage = "https://github.com/fanjam/paypal-adaptive-hoops";
        description = "Client for a limited part of PayPal's Adaptive Payments API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "paypal-api" = callPackage
@@ -154244,7 +152068,6 @@ self: {
        homepage = "http://projects.haskell.org/paypal-api/";
        description = "PayPal API, currently supporting \"ButtonManager\"";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pb" = callPackage
@@ -154260,7 +152083,6 @@ self: {
        ];
        description = "pastebin command line application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pbc4hs" = callPackage
@@ -154760,7 +152582,6 @@ self: {
        ];
        description = "pdynload is polymorphic dynamic linking library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "peakachu" = callPackage
@@ -154776,7 +152597,6 @@ self: {
        ];
        description = "Experiemental library for composable interactive programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "peano" = callPackage
@@ -154822,7 +152642,6 @@ self: {
        ];
        description = "pec embedded compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pecoff" = callPackage
@@ -154852,7 +152671,6 @@ self: {
        homepage = "http://github.com/HackerFoo/peg";
        description = "a lazy non-deterministic concatenative programming language";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "peggy" = callPackage
@@ -154893,7 +152711,6 @@ self: {
        homepage = "https://github.com/brunjlar/pell";
        description = "Package to solve the Generalized Pell Equation";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pem" = callPackage
@@ -154954,7 +152771,6 @@ self: {
        homepage = "http://www.github.com/massysett/penny";
        description = "Extensible double-entry accounting system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "penny-bin" = callPackage
@@ -154975,7 +152791,6 @@ self: {
        homepage = "http://www.github.com/massysett/penny";
        description = "Deprecated - use penny package instead";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "penny-lib" = callPackage
@@ -154999,7 +152814,6 @@ self: {
        homepage = "http://www.github.com/massysett/penny";
        description = "Deprecated - use penny package instead";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "peparser" = callPackage
@@ -155012,7 +152826,6 @@ self: {
        homepage = "https://github.com/igraves/peparser-haskell";
        description = "A parser for PE object files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "perceptron" = callPackage
@@ -155055,7 +152868,6 @@ self: {
        homepage = "https://github.com/Cognimeta/perdure";
        description = "Robust persistence for acyclic immutable data";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "period" = callPackage
@@ -155094,7 +152906,6 @@ self: {
        homepage = "https://github.com/sonyandy/perm";
        description = "permutation Applicative and Monad with many mtl instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "permutation" = callPackage
@@ -155118,7 +152929,6 @@ self: {
        libraryHaskellDepends = [ base mtl ];
        description = "Generalised permutation parser combinator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persist2er" = callPackage
@@ -155721,7 +153531,6 @@ self: {
        ];
        description = "Declare Persistent entities using SQL SELECT query syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-instances-iproute" = callPackage
@@ -155768,7 +153577,6 @@ self: {
        homepage = "http://darcs.monoid.at/persistent-map";
        description = "A thread-safe (STM) persistency interface for finite map types";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-mongoDB_2_1_2" = callPackage
@@ -156337,7 +154145,6 @@ self: {
        homepage = "https://github.com/mstone/persistent-protobuf";
        description = "Template-Haskell helpers for integrating protobufs with persistent";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "persistent-ratelimit" = callPackage
@@ -156981,7 +154788,6 @@ self: {
        homepage = "http://www.cs.chalmers.se/~aarne/pesca/";
        description = "Proof Editor for Sequent Calculus";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "peyotls" = callPackage
@@ -157009,7 +154815,6 @@ self: {
        homepage = "https://github.com/YoshikuniJujo/peyotls/wiki";
        description = "Pretty Easy YOshikuni-made TLS library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "peyotls-codec" = callPackage
@@ -157029,7 +154834,6 @@ self: {
        homepage = "https://github.com/YoshikuniJujo/peyotls/wiki";
        description = "Codec parts of Pretty Easy YOshikuni-made TLS library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pez" = callPackage
@@ -157048,7 +154852,6 @@ self: {
        homepage = "http://brandon.si/code/pez-zipper-library-released/";
        description = "A Pretty Extraordinary Zipper library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pg-harness" = callPackage
@@ -157069,7 +154872,6 @@ self: {
        homepage = "https://github.com/BardurArantsson/pg-harness";
        description = "REST service and library for creating/consuming temporary PostgreSQL databases";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pg-harness-client" = callPackage
@@ -157101,7 +154903,6 @@ self: {
        homepage = "https://github.com/BardurArantsson/pg-harness";
        description = "REST service for creating temporary PostgreSQL databases";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pgdl" = callPackage
@@ -157171,7 +154972,6 @@ self: {
        homepage = "https://github.com/chrisdone/pgsql-simple";
        description = "A mid-level PostgreSQL client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pgstream" = callPackage
@@ -157197,7 +154997,6 @@ self: {
        jailbreak = true;
        description = "Streaming Postgres bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "phantom-state" = callPackage
@@ -157207,7 +155006,7 @@ self: {
        version = "0.2.0.2";
        sha256 = "d536663dbfc4c0039e2d964ae1a52339f0c8ab30de0b8b78d4524d9b8e04cf11";
        libraryHaskellDepends = [ base transformers ];
-       description = "Phantom State Transformer. Like State Monad, but without values";
+       description = "Phantom State Transformer. Like State Monad, but without values.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -157225,7 +155024,6 @@ self: {
        homepage = "http://github.com/glehel/phasechange";
        description = "Freezing, thawing, and copy elision";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "phash" = callPackage
@@ -157267,13 +155065,13 @@ self: {
   "phoityne" = callPackage
     ({ mkDerivation, base, bytestring, Cabal, cmdargs, conduit
      , conduit-extra, ConfigFile, containers, directory, filepath, gtk3
-     , hslogger, HStringTemplate, MissingH, mtl, parsec, process
+     , hslogger, hspec, HStringTemplate, MissingH, mtl, parsec, process
      , resourcet, safe, text, transformers
      }:
      mkDerivation {
        pname = "phoityne";
-       version = "0.0.3.0";
-       sha256 = "97823be82846237159a13767ae9a9b29acf8dbc68a95ff099b942b3bcae0790f";
+       version = "0.0.4.0";
+       sha256 = "ce5ff314971995fd37318a0858ce5fd8276a5f0b5f43f5110f80ae2f0e31b957";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -157281,6 +155079,7 @@ self: {
          containers directory filepath gtk3 hslogger HStringTemplate
          MissingH mtl parsec process resourcet safe text transformers
        ];
+       testHaskellDepends = [ base hspec ];
        description = "ghci debug viewer with simple editor";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -157296,7 +155095,6 @@ self: {
        homepage = "https://github.com/christian-marie/phone-numbers";
        description = "Haskell bindings to the libphonenumber library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {phonenumber = null;};
 
   "phone-push" = callPackage
@@ -157315,7 +155113,6 @@ self: {
        homepage = "https://github.com/gurgeh/haskell-phone-push";
        description = "Push notifications for Android and iOS";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "phonetic-code" = callPackage
@@ -157345,7 +155142,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Phooey";
        description = "Functional user interfaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "photoname" = callPackage
@@ -157368,7 +155164,6 @@ self: {
        homepage = "http://hub.darcs.net/dino/photoname";
        description = "Rename photo image files based on EXIF shoot date";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "phraskell" = callPackage
@@ -157384,7 +155179,6 @@ self: {
        homepage = "https://github.com/skypers/phraskell";
        description = "A fractal viewer";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "phybin" = callPackage
@@ -157419,7 +155213,6 @@ self: {
        homepage = "http://www.cs.indiana.edu/~rrnewton/projects/phybin/";
        description = "Utility for clustering phylogenetic trees in Newick format based on Robinson-Foulds distance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pi-calculus" = callPackage
@@ -157441,7 +155234,6 @@ self: {
        homepage = "https://github.com/renzyq19/pi-calculus";
        description = "Applied pi-calculus interpreter";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pia-forward" = callPackage
@@ -157488,7 +155280,6 @@ self: {
        ];
        description = "Remotely controlling Java Swing applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "picologic" = callPackage
@@ -157584,7 +155375,6 @@ self: {
        homepage = "https://bitbucket.org/blamario/picoparsec";
        description = "Fast combinator parsing for bytestrings and text";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "picosat" = callPackage
@@ -157610,7 +155400,6 @@ self: {
        libraryHaskellDepends = [ array base containers Imlib mtl ];
        description = "A Piet interpreter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "piki" = callPackage
@@ -157625,7 +155414,6 @@ self: {
        homepage = "http://www.mew.org/~kazu/proj/piki/";
        description = "Yet another text-to-html converter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pinboard" = callPackage
@@ -158086,20 +155874,26 @@ self: {
      }) {};
 
   "pipes-bzip" = callPackage
-    ({ mkDerivation, base, bytestring, bzlib, pipes, pipes-bytestring
+    ({ mkDerivation, base, bindings-DSL, bytestring, bzip2, bzlib
+     , data-default, directory, hspec, MonadRandom, mtl, pipes
+     , pipes-bytestring, pipes-safe, QuickCheck, random
      }:
      mkDerivation {
        pname = "pipes-bzip";
-       version = "0.1.0.0";
-       sha256 = "c294c8bad74a68a4cc31d613c9d6e0fd1ee4e57f6b69567f9760bf2ce1291c0d";
+       version = "0.2.0.4";
+       sha256 = "77dab58950936e2a0f7327de5e2442aafe381e7ff4981c772377624cfdd0b08a";
        libraryHaskellDepends = [
-         base bytestring bzlib pipes pipes-bytestring
+         base bindings-DSL bytestring data-default mtl pipes pipes-safe
        ];
-       testHaskellDepends = [ base ];
-       homepage = "http://github.com/chemist/pipes-bzip#readme";
-       description = "Bzip2 compression and decompression for Pipes streams";
+       librarySystemDepends = [ bzip2 ];
+       testHaskellDepends = [
+         base bytestring bzlib directory hspec MonadRandom pipes
+         pipes-bytestring pipes-safe QuickCheck random
+       ];
+       homepage = "https://github.com/chemist/pipes-bzip";
+       description = "Streaming compression/decompression via pipes";
        license = stdenv.lib.licenses.bsd3;
-     }) {};
+     }) {inherit (pkgs) bzip2;};
 
   "pipes-cacophony_0_1_3" = callPackage
     ({ mkDerivation, async, base, bytestring, cacophony, hlint, mtl
@@ -158195,7 +155989,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/pipes-cereal-plus";
        description = "A streaming serialization library on top of \"pipes\" and \"cereal-plus\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-cliff" = callPackage
@@ -158281,7 +156074,6 @@ self: {
        homepage = "https://github.com/pcapriotti/pipes-extra";
        description = "Conduit adapters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-core" = callPackage
@@ -158312,7 +156104,6 @@ self: {
        homepage = "http://github.com/kvanberendonck/pipes-courier";
        description = "Pipes utilities for interfacing with the courier message-passing framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-csv" = callPackage
@@ -158430,7 +156221,6 @@ self: {
        homepage = "https://github.com/jwiegley/pipes-files";
        description = "Fast traversal of directory trees using pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "pipes-group_1_0_2" = callPackage
@@ -158580,7 +156370,6 @@ self: {
        homepage = "https://github.com/k0001/pipes-network-tls";
        description = "TLS-secured network connections support for pipes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-p2p" = callPackage
@@ -158619,7 +156408,6 @@ self: {
        homepage = "https://github.com/jdnavarro/pipes-p2p-examples";
        description = "Examples using pipes-p2p";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-parse_3_0_2" = callPackage
@@ -158830,7 +156618,6 @@ self: {
        ];
        description = "Interfacing pipes with foldl folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pipes-vector" = callPackage
@@ -158956,7 +156743,6 @@ self: {
        jailbreak = true;
        description = "A dependently typed core language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pit" = callPackage
@@ -158981,7 +156767,6 @@ self: {
        homepage = "https://github.com/chiro/haskell-pit";
        description = "Account management tool";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pitchtrack" = callPackage
@@ -159083,7 +156868,6 @@ self: {
        executableHaskellDepends = [ base Cabal split ];
        description = "Package dependency graph for installed packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pktree" = callPackage
@@ -159174,7 +156958,6 @@ self: {
        jailbreak = true;
        description = "A representation of planar graphs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plat" = callPackage
@@ -159188,7 +156971,6 @@ self: {
        ];
        description = "Simple templating library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "playlists" = callPackage
@@ -159244,7 +157026,6 @@ self: {
        ];
        description = "Remote monad for editing plists";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plivo" = callPackage
@@ -159266,7 +157047,6 @@ self: {
        homepage = "https://github.com/singpolyma/plivo-haskell";
        description = "Plivo API wrapper for Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plot_0_2_3_4" = callPackage
@@ -159414,7 +157194,7 @@ self: {
        sha256 = "63f09f22e05a1d9119baaecfd5c9db9580b756430d050953fe348d6e28a80fcb";
        libraryHaskellDepends = [ base containers ];
        testHaskellDepends = [ base tasty tasty-hunit ];
-       description = "Plotter-like fonts i.e. a series of straight lines which make letter shapes";
+       description = "Plotter-like fonts i.e. a series of straight lines which make letter shapes.";
        license = "GPL";
      }) {};
 
@@ -159462,7 +157242,6 @@ self: {
        testHaskellDepends = [ base directory process ];
        description = "Automatic recompilation and reloading of haskell modules";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plugins-multistage" = callPackage
@@ -159481,7 +157260,6 @@ self: {
        ];
        description = "Dynamic linking for embedded DSLs with staged compilation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "plumbers" = callPackage
@@ -159493,7 +157271,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "Pointless plumbing combinators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ply-loader" = callPackage
@@ -159513,7 +157290,6 @@ self: {
        executableHaskellDepends = [ base bytestring linear vector ];
        description = "PLY file loader";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "png-file" = callPackage
@@ -159530,7 +157306,6 @@ self: {
        homepage = "https://skami.iocikun.jp/haskell/packages/png-file";
        description = "read/write png file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pngload" = callPackage
@@ -159546,7 +157321,6 @@ self: {
        ];
        description = "Pure Haskell loader for PNG images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pngload-fixed" = callPackage
@@ -159558,7 +157332,6 @@ self: {
        libraryHaskellDepends = [ array base bytestring mtl parsec zlib ];
        description = "Pure Haskell loader for PNG images";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pnm" = callPackage
@@ -159604,7 +157377,6 @@ self: {
        ];
        description = "Multi-backend (zookeeper and sqlite) DNS Server using persistent-library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pointed_4_1" = callPackage
@@ -159821,7 +157593,6 @@ self: {
        homepage = "http://haskell.di.uminho.pt/wiki/Pointless+Lenses";
        description = "Pointless Lenses library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pointless-rewrite" = callPackage
@@ -159837,7 +157608,6 @@ self: {
        ];
        description = "Pointless Rewrite library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "poker-eval" = callPackage
@@ -159893,7 +157663,6 @@ self: {
        testHaskellDepends = [ base containers HUnit MissingH mtl parsec ];
        description = "Fork of ConfigFile for Polar Game Engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "polar-shader" = callPackage
@@ -159926,7 +157695,6 @@ self: {
        homepage = "https://github.com/kawu/polh/tree/master/lexicon";
        description = "A library for manipulating the historical dictionary of Polish (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "polimorf" = callPackage
@@ -160072,7 +157840,6 @@ self: {
        ];
        description = "Polynomial types and operations";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "polynomial" = callPackage
@@ -160164,7 +157931,6 @@ self: {
        executableHaskellDepends = [ cgi free-theorems utf8-string xhtml ];
        description = "Taming Selective Strictness";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "polysoup" = callPackage
@@ -160179,7 +157945,6 @@ self: {
        homepage = "https://github.com/kawu/polysoup";
        description = "Online XML parsing with polyparse and tagsoup";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "polytypeable" = callPackage
@@ -160191,7 +157956,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Typeable for polymorphic types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "polytypeable-utils" = callPackage
@@ -160203,7 +157967,6 @@ self: {
        libraryHaskellDepends = [ base haskell98 polytypeable ];
        description = "Utilities for polytypeable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ponder" = callPackage
@@ -160250,7 +158013,6 @@ self: {
        homepage = "http://www.pontarius.org/projects/pontarius-mediaserver/";
        description = "Extended Personal Media Network (XPMN) media server";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pontarius-xmpp" = callPackage
@@ -160290,7 +158052,6 @@ self: {
        homepage = "https://github.com/pontarius/pontarius-xmpp/";
        description = "An XMPP client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pontarius-xpmn" = callPackage
@@ -160308,7 +158069,6 @@ self: {
        homepage = "http://www.pontarius.org/projects/pontarius-xpmn/";
        description = "Extended Personal Media Network (XPMN) library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pony" = callPackage
@@ -160338,7 +158098,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Thread-safe resource pools. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pool-conduit" = callPackage
@@ -160358,7 +158117,6 @@ self: {
        homepage = "http://www.yesodweb.com/book/persistent";
        description = "Resource pool allocations via ResourceT. (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pooled-io" = callPackage
@@ -160402,7 +158160,6 @@ self: {
        homepage = "http://www.haskell.org/~petersen/haskell/popenhs/";
        description = "popenhs is a popen-like library for Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "poppler" = callPackage
@@ -160422,7 +158179,6 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs";
        description = "Binding to the Poppler";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gdk2 = null; inherit (pkgs) gdk_pixbuf; 
          inherit (pkgs.gnome) pango; inherit (pkgs) poppler;};
 
@@ -160460,7 +158216,6 @@ self: {
        homepage = "http://code.haskell.org/portaudio";
        description = "Haskell bindings for the PortAudio library";
        license = "unknown";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) portaudio;};
 
   "porte" = callPackage
@@ -160478,7 +158233,6 @@ self: {
        ];
        description = "FreeBSD ports index search and analysis tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "porter" = callPackage
@@ -160490,7 +158244,6 @@ self: {
        libraryHaskellDepends = [ haskell2010 ];
        description = "Implementation of the Porter stemming algorithm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ports" = callPackage
@@ -160503,7 +158256,6 @@ self: {
        homepage = "http://www.cse.unsw.edu.au/~chak/haskell/ports/";
        description = "The Haskell Ports Library";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ports-tools" = callPackage
@@ -160546,7 +158298,6 @@ self: {
        homepage = "https://github.com/tensor5/posix-acl";
        description = "Support for Posix ACL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) acl;};
 
   "posix-escape" = callPackage
@@ -160621,7 +158372,6 @@ self: {
        libraryHaskellDepends = [ base bytestring unix ];
        description = "POSIX Realtime functionality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "posix-timer" = callPackage
@@ -160645,7 +158395,6 @@ self: {
        libraryHaskellDepends = [ base unix ];
        description = "Low-level wrapping of POSIX waitpid(2)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "possible" = callPackage
@@ -160943,6 +158692,7 @@ self: {
          tasty tasty-hunit tasty-quickcheck tasty-smallcheck text time
          transformers uuid vector
        ];
+       jailbreak = true;
        doCheck = false;
        homepage = "https://github.com/nikita-volkov/postgresql-binary";
        description = "Encoders and decoders for the PostgreSQL's binary format";
@@ -161267,12 +159017,12 @@ self: {
 
   "postgresql-simple-migration" = callPackage
     ({ mkDerivation, base, base64-bytestring, bytestring, cryptohash
-     , directory, hspec, postgresql-simple, time
+     , directory, hspec, postgresql-simple, text, time
      }:
      mkDerivation {
        pname = "postgresql-simple-migration";
-       version = "0.1.3.0";
-       sha256 = "5f0aca18d1382d680121280b19f32401ce0b53c3d951de9736d890715f2be763";
+       version = "0.1.5.0";
+       sha256 = "c45e5467c384498dc07ca9e96578ea69781a899f92c53f19fb7024d6d98aa06e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -161281,10 +159031,9 @@ self: {
        ];
        executableHaskellDepends = [
          base base64-bytestring bytestring cryptohash directory
-         postgresql-simple time
+         postgresql-simple text time
        ];
        testHaskellDepends = [ base bytestring hspec postgresql-simple ];
-       jailbreak = true;
        homepage = "https://github.com/ameingast/postgresql-simple-migration";
        description = "PostgreSQL Schema Migrations";
        license = stdenv.lib.licenses.bsd3;
@@ -161317,7 +159066,6 @@ self: {
        homepage = "https://github.com/tolysz/postgresql-simple-typed";
        description = "Typed extension for PostgreSQL simple";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgresql-simple-url" = callPackage
@@ -161343,26 +159091,23 @@ self: {
 
   "postgresql-typed" = callPackage
     ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring
-     , containers, cryptohash, haskell-src-meta, network, old-locale
-     , QuickCheck, scientific, template-haskell, text, time, utf8-string
-     , uuid
+     , containers, cryptonite, haskell-src-meta, memory, network
+     , old-locale, postgresql-binary, QuickCheck, scientific
+     , template-haskell, text, time, utf8-string, uuid
      }:
      mkDerivation {
        pname = "postgresql-typed";
-       version = "0.4.2.2";
-       sha256 = "80b2be671ad75782e19a808cbdecb1e814e2450b7645d2da0280c12802df188c";
-       revision = "1";
-       editedCabalFile = "a774fcb5f4d1cd12b2495cd376a5a010b6c1eac422601bbc4c379b1df99b4f5f";
+       version = "0.4.3";
+       sha256 = "6d7150da2dc0d290435c54892d2ff0e92a2517e142d08da31c74d05957d79407";
        libraryHaskellDepends = [
-         aeson array attoparsec base binary bytestring containers cryptohash
-         haskell-src-meta network old-locale scientific template-haskell
-         text time utf8-string uuid
+         aeson array attoparsec base binary bytestring containers cryptonite
+         haskell-src-meta memory network old-locale postgresql-binary
+         scientific template-haskell text time utf8-string uuid
        ];
        testHaskellDepends = [ base bytestring network QuickCheck time ];
        homepage = "https://github.com/dylex/postgresql-typed";
        description = "A PostgreSQL access library with compile-time SQL type inference";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postgrest" = callPackage
@@ -161407,7 +159152,6 @@ self: {
        homepage = "https://github.com/begriffs/postgrest";
        description = "REST API for any Postgres database";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postie" = callPackage
@@ -161430,7 +159174,6 @@ self: {
        ];
        description = "SMTP server library to receive emails from within Haskell programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "postmark" = callPackage
@@ -161472,7 +159215,6 @@ self: {
        homepage = "http://github.com/peti/postmaster";
        description = "Postmaster ESMTP Server";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) adns; inherit (pkgs) openssl;};
 
   "potato-tool" = callPackage
@@ -161527,7 +159269,6 @@ self: {
        homepage = "http://neugierig.org/software/darcs/powermate/";
        description = "PowerMate bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "powerpc" = callPackage
@@ -161540,7 +159281,6 @@ self: {
        homepage = "http://tomahawkins.org";
        description = "Tools for PowerPC programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ppm" = callPackage
@@ -161566,7 +159306,6 @@ self: {
        homepage = "http://hub.darcs.net/shelarcy/pqc";
        description = "Parallel batch driver for QuickCheck";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pqueue_1_2_1" = callPackage
@@ -161621,7 +159360,6 @@ self: {
        jailbreak = true;
        description = "Fully encapsulated monad transformers with queuelike functionality";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "practice-room" = callPackage
@@ -161640,7 +159378,6 @@ self: {
        homepage = "http://github.com/nfjinjing/practice-room";
        description = "Practice Room";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "precis" = callPackage
@@ -161661,7 +159398,6 @@ self: {
        homepage = "http://code.google.com/p/copperbox/";
        description = "Diff Cabal packages";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pred-trie_0_2_0" = callPackage
@@ -161702,7 +159438,6 @@ self: {
        ];
        description = "Predicative tries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "predicates" = callPackage
@@ -161810,7 +159545,6 @@ self: {
        homepage = "http://www.github.com/massysett/prednote";
        description = "Tests and QuickCheck generators to accompany prednote";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prefix-units_0_1_0_2" = callPackage
@@ -161878,7 +159612,6 @@ self: {
        jailbreak = true;
        description = "A library for building a prefork-style server quickly";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pregame" = callPackage
@@ -161898,7 +159631,6 @@ self: {
        homepage = "https://github.com/jxv/pregame";
        description = "Prelude counterpart";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prelude-edsl" = callPackage
@@ -161961,7 +159693,6 @@ self: {
        jailbreak = true;
        description = "Another kind of alternate Prelude file";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prelude-plus" = callPackage
@@ -161975,7 +159706,6 @@ self: {
        libraryHaskellDepends = [ base utf8-string ];
        description = "Prelude for rest of us";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prelude-prime" = callPackage
@@ -162019,7 +159749,6 @@ self: {
        jailbreak = true;
        description = "Preprocess Haskell Repositories";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "preprocessor-tools" = callPackage
@@ -162077,7 +159806,6 @@ self: {
        homepage = "http://github.com/bickfordb/text-press";
        description = "Text template library targeted at the web / HTML generation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "presto-hdbc" = callPackage
@@ -162098,7 +159826,6 @@ self: {
        jailbreak = true;
        description = "An HDBC connector for Presto";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prettify" = callPackage
@@ -162112,12 +159839,12 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
-  "pretty_1_1_3_2" = callPackage
+  "pretty_1_1_3_3" = callPackage
     ({ mkDerivation, base, deepseq, ghc-prim, QuickCheck }:
      mkDerivation {
        pname = "pretty";
-       version = "1.1.3.2";
-       sha256 = "715f2de429fa581859bee06e4d1ed3d076a0e1b00107bf2127be01c2c2d9c14c";
+       version = "1.1.3.3";
+       sha256 = "3b632679f51cc709ec96e51c6a03bbc1ded8dbc5c8ea3fda75501cf7962f9798";
        libraryHaskellDepends = [ base deepseq ghc-prim ];
        testHaskellDepends = [ base deepseq ghc-prim QuickCheck ];
        homepage = "http://github.com/haskell/pretty";
@@ -162425,7 +160152,6 @@ self: {
        homepage = "http://kagami.touhou.ru/projects/show/primula";
        description = "ImageBoard on Happstack and HSP";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "primula-bot" = callPackage
@@ -162445,7 +160171,6 @@ self: {
        homepage = "http://kagami.touhou.ru/projects/show/primula";
        description = "Jabber-bot for primula-board ImageBoard";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "print-debugger" = callPackage
@@ -162474,7 +160199,6 @@ self: {
        ];
        description = "A Perl printf like formatter";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "printxosd" = callPackage
@@ -162489,7 +160213,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/printxosd";
        description = "Simple tool to display some text on an on-screen display";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "priority-queue" = callPackage
@@ -162503,7 +160226,6 @@ self: {
        homepage = "http://code.haskell.org/~mokus/priority-queue";
        description = "Simple implementation of a priority queue";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "priority-sync" = callPackage
@@ -162597,7 +160319,6 @@ self: {
        ];
        description = "Parse process information for Linux";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "process_1_4_2_0" = callPackage
@@ -162752,7 +160473,6 @@ self: {
        homepage = "https://github.com/garious/process-iterio";
        description = "IterIO Process Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "process-leksah" = callPackage
@@ -162765,7 +160485,6 @@ self: {
        jailbreak = true;
        description = "Process libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "process-listlike" = callPackage
@@ -162784,7 +160503,6 @@ self: {
        homepage = "https://github.com/ddssff/process-listlike";
        description = "Process extras";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "process-progress" = callPackage
@@ -162802,7 +160520,6 @@ self: {
        homepage = "https://src.seereason.com/process-progress";
        description = "Run a process and do reportsing on its progress";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "process-qq" = callPackage
@@ -162821,7 +160538,6 @@ self: {
        homepage = "http://github.com/tanakh/process-qq";
        description = "Quasi-Quoters for exec process";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "process-streaming" = callPackage
@@ -162870,9 +160586,8 @@ self: {
          transformers
        ];
        jailbreak = true;
-       description = "Web graphic applications with processing.js";
+       description = "Web graphic applications with processing.js.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "processor-creative-kit" = callPackage
@@ -162900,7 +160615,6 @@ self: {
        libraryHaskellDepends = [ base procrastinating-variable ];
        description = "Pure structures that can be incrementally created in impure code";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "procrastinating-variable" = callPackage
@@ -162913,7 +160627,6 @@ self: {
        homepage = "http://github.com/gcross/procrastinating-variable";
        description = "Haskell values that cannot be evaluated immediately";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "procstat" = callPackage
@@ -162927,7 +160640,6 @@ self: {
        homepage = "http://closure.ath.cx/procstat";
        description = "get information on processes in Linux";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proctest" = callPackage
@@ -163056,7 +160768,6 @@ self: {
        homepage = "http://antiope.com/downloads.html";
        description = "Convert GHC profiles into GraphViz's dot format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prof2pretty" = callPackage
@@ -163083,8 +160794,8 @@ self: {
      }:
      mkDerivation {
        pname = "profiteur";
-       version = "0.3.0.1";
-       sha256 = "a0e2ea372a6259dcd25b69160e9afef9039c25e0acbafd8824eb907117dd5b86";
+       version = "0.3.0.2";
+       sha256 = "43df79a7d3b0a9562658367a46016c361522ea07ac67fb5ad65d891ad77bfbaf";
        isLibrary = false;
        isExecutable = true;
        executableHaskellDepends = [
@@ -163210,7 +160921,6 @@ self: {
        libraryHaskellDepends = [ base time ];
        description = "Simple progress tracking & projection library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "progressbar" = callPackage
@@ -163225,7 +160935,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Progressbar API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "progression" = callPackage
@@ -163244,7 +160953,6 @@ self: {
        homepage = "http://chplib.wordpress.com/2010/02/04/progression-supporting-optimisation-in-haskell/";
        description = "Automates the recording and graphing of criterion benchmarks";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "progressive" = callPackage
@@ -163265,7 +160973,6 @@ self: {
        homepage = "https://bitbucket.org/gchrupala/progression";
        description = "Multilabel classification model which learns sequentially (online)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proj4-hs-bindings" = callPackage
@@ -163278,7 +160985,6 @@ self: {
        librarySystemDepends = [ proj ];
        description = "Haskell bindings for the Proj4 C dynamic library";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) proj;};
 
   "project-template_0_1_4_2" = callPackage
@@ -163368,7 +161074,6 @@ self: {
        homepage = "https://github.com/Erdwolf/prolog";
        description = "A Prolog interpreter written in Haskell";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prolog-graph" = callPackage
@@ -163388,7 +161093,6 @@ self: {
        homepage = "https://github.com/Erdwolf/prolog";
        description = "A command line tool to visualize query resolution in Prolog";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prolog-graph-lib" = callPackage
@@ -163401,7 +161105,6 @@ self: {
        homepage = "https://github.com/Erdwolf/prolog";
        description = "Generating images of resolution trees for Prolog queries";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "prologue" = callPackage
@@ -163443,7 +161146,7 @@ self: {
          QuickCheck random-shuffle stm time transformers utf8-string
        ];
        homepage = "https://github.com/fimad/prometheus-haskell";
-       description = "Haskell client library for http://prometheus.io";
+       description = "Haskell client library for http://prometheus.io.";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -163512,7 +161215,6 @@ self: {
        ];
        description = "Functional synthesis of images and animations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "propellor" = callPackage
@@ -163584,7 +161286,6 @@ self: {
        homepage = "http://www-users.cs.york.ac.uk/~ndm/proplang/";
        description = "A library for functional GUI development";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "props" = callPackage
@@ -163629,7 +161330,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "A wrapper for the proteaaudio library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) alsaLib;};
 
   "protobuf" = callPackage
@@ -163677,7 +161377,6 @@ self: {
        homepage = "https://github.com/nicta/protobuf-native";
        description = "Protocol Buffers via C++";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers_2_1_4" = callPackage
@@ -163929,7 +161628,6 @@ self: {
        homepage = "http://darcs.factisresearch.com/pub/protocol-buffers-fork/";
        description = "Text.DescriptorProto.Options and code generated from the Google Protocol Buffer specification";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "protocol-buffers-fork" = callPackage
@@ -163947,7 +161645,6 @@ self: {
        homepage = "http://darcs.factisresearch.com/pub/protocol-buffers-fork/";
        description = "Parse Google Protocol Buffer specifications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proton-haskell" = callPackage
@@ -163999,7 +161696,6 @@ self: {
        homepage = "https://github.com/prove-everywhere/server";
        description = "The server for ProveEverywhere";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "proxied" = callPackage
@@ -164025,7 +161721,6 @@ self: {
        homepage = "https://github.com/jberryman/proxy-kindness";
        description = "A library for kind-polymorphic manipulation and inspection of Proxy values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "psc-ide_0_5_0" = callPackage
@@ -164207,7 +161902,6 @@ self: {
        jailbreak = true;
        description = "Pipe stdin to a redis pub/sub channel";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "publicsuffix_0_20151212" = callPackage
@@ -164274,7 +161968,6 @@ self: {
        homepage = "https://github.com/litherum/publicsuffixlist";
        description = "Create the publicsuffixlist package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pubnub" = callPackage
@@ -164309,7 +162002,6 @@ self: {
        homepage = "http://github.com/pubnub/haskell";
        description = "PubNub Haskell SDK";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pubsub" = callPackage
@@ -164330,7 +162022,6 @@ self: {
        homepage = "http://projects.haskell.org/pubsub/";
        description = "A library for Google/SixApart pubsub hub interaction";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "puffytools" = callPackage
@@ -164361,7 +162052,6 @@ self: {
        homepage = "https://github.com/pharpend/puffytools";
        description = "A CLI assistant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pugixml" = callPackage
@@ -164380,7 +162070,6 @@ self: {
        homepage = "https://github.com/philopon/pugixml-hs";
        description = "pugixml binding";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "pugs-DrIFT" = callPackage
@@ -164415,7 +162104,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Fast, lightweight YAML loader and dumper";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pugs-compat" = callPackage
@@ -164447,7 +162135,6 @@ self: {
        homepage = "http://repetae.net/john/computer/haskell/hsregex/";
        description = "Haskell PCRE binding";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pulse-simple" = callPackage
@@ -164460,7 +162147,6 @@ self: {
        librarySystemDepends = [ libpulseaudio ];
        description = "binding to Simple API of pulseaudio";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libpulseaudio;};
 
   "punkt" = callPackage
@@ -164480,7 +162166,6 @@ self: {
        homepage = "https://github.com/bryant/punkt";
        description = "Multilingual unsupervised sentence tokenization with Punkt";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "punycode" = callPackage
@@ -164517,9 +162202,8 @@ self: {
          mtl text
        ];
        homepage = "http://lpuppet.banquise.net";
-       description = "A program that displays the puppet resources associated to a node given .pp files";
+       description = "A program that displays the puppet resources associated to a node given .pp files.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pure-cdb" = callPackage
@@ -164872,36 +162556,40 @@ self: {
   "purescript" = callPackage
     ({ mkDerivation, aeson, aeson-better-errors, ansi-wl-pprint, base
      , base-compat, bower-json, boxes, bytestring, containers, directory
-     , dlist, filepath, Glob, haskeline, HUnit, language-javascript
-     , lifted-base, monad-control, mtl, optparse-applicative, parallel
-     , parsec, pattern-arrows, process, safe, semigroups, split, syb
-     , text, time, transformers, transformers-base, transformers-compat
-     , unordered-containers, utf8-string, vector
+     , dlist, edit-distance, filepath, fsnotify, Glob, haskeline, hspec
+     , hspec-discover, http-types, HUnit, language-javascript
+     , lifted-base, monad-control, monad-logger, mtl, network
+     , optparse-applicative, parallel, parsec, pattern-arrows, pipes
+     , pipes-http, process, regex-tdfa, safe, semigroups, sourcemap
+     , split, stm, syb, text, time, transformers, transformers-base
+     , transformers-compat, unordered-containers, utf8-string, vector
      }:
      mkDerivation {
        pname = "purescript";
-       version = "0.8.0.0";
-       sha256 = "a263933c4ae407f2c97e230d08ab343f597e101a597f7fa01151b0b476ce43d0";
+       version = "0.8.2.0";
+       sha256 = "eafb971c6730500e89f8a46e5d7afddb6093240c47ffa0e3523bff2052b9e4b4";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
          aeson aeson-better-errors base base-compat bower-json boxes
-         bytestring containers directory dlist filepath Glob
-         language-javascript lifted-base monad-control mtl parallel parsec
-         pattern-arrows process safe semigroups split syb text time
-         transformers transformers-base transformers-compat
+         bytestring containers directory dlist edit-distance filepath
+         fsnotify Glob http-types language-javascript lifted-base
+         monad-control monad-logger mtl parallel parsec pattern-arrows pipes
+         pipes-http process regex-tdfa safe semigroups sourcemap split stm
+         syb text time transformers transformers-base transformers-compat
          unordered-containers utf8-string vector
        ];
        executableHaskellDepends = [
          aeson ansi-wl-pprint base base-compat boxes bytestring containers
-         directory filepath Glob haskeline mtl optparse-applicative parsec
-         process split time transformers transformers-compat utf8-string
+         directory filepath Glob haskeline monad-logger mtl network
+         optparse-applicative parsec process split stm text time
+         transformers transformers-compat utf8-string
        ];
        testHaskellDepends = [
          aeson aeson-better-errors base base-compat boxes bytestring
-         containers directory filepath Glob haskeline HUnit mtl
-         optparse-applicative parsec process time transformers
-         transformers-compat
+         containers directory filepath Glob haskeline hspec hspec-discover
+         HUnit mtl optparse-applicative parsec process stm text time
+         transformers transformers-compat
        ];
        doCheck = false;
        homepage = "http://www.purescript.org/";
@@ -164949,7 +162637,6 @@ self: {
        homepage = "http://gsoc2013cwithmobiledevices.blogspot.com.ar/";
        description = "A server-side library for sending push notifications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "push-notify-ccs" = callPackage
@@ -164970,7 +162657,6 @@ self: {
        homepage = "http://gsoc2013cwithmobiledevices.blogspot.com.ar/";
        description = "A server-side library for sending/receiving push notifications through CCS (Google Cloud Messaging)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "push-notify-general" = callPackage
@@ -164988,9 +162674,8 @@ self: {
          unordered-containers xml-conduit yesod
        ];
        homepage = "http://gsoc2013cwithmobiledevices.blogspot.com.ar/";
-       description = "A general library for sending/receiving push notif. through dif. services";
+       description = "A general library for sending/receiving push notif. through dif. services.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pusher-haskell" = callPackage
@@ -165094,7 +162779,6 @@ self: {
        homepage = "https://github.com/jwiegley/pushme";
        description = "Tool to synchronize multiple directories with rsync, zfs or git-annex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "putlenses" = callPackage
@@ -165112,7 +162796,6 @@ self: {
        jailbreak = true;
        description = "Put-based lens library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "puzzle-draw" = callPackage
@@ -165142,7 +162825,6 @@ self: {
        ];
        description = "Creating graphics for pencil puzzles";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "puzzle-draw-cmdline" = callPackage
@@ -165162,7 +162844,6 @@ self: {
        jailbreak = true;
        description = "Creating graphics for pencil puzzles, command line tools";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "pvd" = callPackage
@@ -165183,7 +162864,6 @@ self: {
        homepage = "http://code.haskell.org/pvd";
        description = "A photo viewer daemon application with remote controlling abilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libdevil;};
 
   "pwstore-cli" = callPackage
@@ -165307,7 +162987,6 @@ self: {
        jailbreak = true;
        description = "Serialization/deserialization using Python Pickle format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qc-oi-testgenerator" = callPackage
@@ -165335,7 +163014,6 @@ self: {
        librarySystemDepends = [ qd ];
        description = "double-double and quad-double number type via libqd";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {qd = null;};
 
   "qd-vec" = callPackage
@@ -165347,7 +163025,6 @@ self: {
        libraryHaskellDepends = [ base qd Vec ];
        description = "'Vec' instances for 'qd' types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qed" = callPackage
@@ -165366,7 +163043,6 @@ self: {
        homepage = "https://github.com/ndmitchell/qed#readme";
        description = "Simple prover";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qhull-simple" = callPackage
@@ -165380,7 +163056,6 @@ self: {
        homepage = "http://nonempty.org/software/haskell-qhull-simple";
        description = "Simple bindings to Qhull, a library for computing convex hulls";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) qhull;};
 
   "qrcode" = callPackage
@@ -165409,7 +163084,6 @@ self: {
        homepage = "http://github.com/keerastudios/hsQt";
        description = "Qt bindings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {qtc_core = null; qtc_gui = null; qtc_network = null; 
          qtc_opengl = null; qtc_script = null; qtc_tools = null;};
 
@@ -165433,7 +163107,6 @@ self: {
        homepage = "https://github.com/ion1/quadratic-irrational";
        description = "An implementation of quadratic irrationals";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quandl-api_0_2_0_0" = callPackage
@@ -165526,7 +163199,6 @@ self: {
        homepage = "http://github.com/luqui/quantum-arrow";
        description = "An embedding of quantum computation as a Haskell arrow";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qudb" = callPackage
@@ -165546,7 +163218,6 @@ self: {
        homepage = "https://github.com/jstepien/qudb";
        description = "Quite Useless DB";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quenya-verb" = callPackage
@@ -165569,7 +163240,6 @@ self: {
        jailbreak = true;
        description = "Quenya verb conjugator";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "querystring-pickle" = callPackage
@@ -165587,7 +163257,6 @@ self: {
        ];
        description = "Picklers for de/serialising Generic data types to and from query strings";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "questioner" = callPackage
@@ -165628,7 +163297,6 @@ self: {
        libraryHaskellDepends = [ array base containers mtl stateful-mtl ];
        description = "A library of queuelike data structures, both functional and stateful";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quick-generator" = callPackage
@@ -165807,7 +163475,6 @@ self: {
        ];
        description = "Automating QuickCheck for polymorphic and overlaoded properties";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-properties" = callPackage
@@ -165895,7 +163562,6 @@ self: {
        homepage = "http://github.com/tcrayford/rematch";
        description = "QuickCheck support for rematch";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickcheck-script" = callPackage
@@ -166030,7 +163696,6 @@ self: {
        homepage = "http://www.github.com/massysett/quickpull";
        description = "Generate Main module with QuickCheck tests";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickset" = callPackage
@@ -166042,7 +163707,6 @@ self: {
        libraryHaskellDepends = [ base vector vector-algorithms ];
        description = "Very fast and memory-compact query-only set and map structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickspec" = callPackage
@@ -166075,7 +163739,6 @@ self: {
        homepage = "https://github.com/davidsiegel/quicktest";
        description = "A reflective batch tester for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "quickwebapp" = callPackage
@@ -166202,7 +163865,6 @@ self: {
        homepage = "https://github.com/talw/quoridor-hs";
        description = "A Quoridor implementation in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "qux" = callPackage
@@ -166223,7 +163885,6 @@ self: {
        homepage = "https://github.com/qux-lang/qux";
        description = "Command line binary for working with the Qux language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rabocsv2qif" = callPackage
@@ -166238,7 +163899,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "A library and program to create QIF files from Rabobank CSV exports";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rad" = callPackage
@@ -166252,7 +163912,6 @@ self: {
        homepage = "http://comonad.com/reader/";
        description = "Reverse Automatic Differentiation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "radian" = callPackage
@@ -166286,7 +163945,6 @@ self: {
        homepage = "https://github.com/klangner/radium";
        description = "Chemistry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "radium-formula-parser" = callPackage
@@ -166304,7 +163962,6 @@ self: {
        homepage = "https://github.com/klangner/radium-formula-parser";
        description = "Chemistry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "radix" = callPackage
@@ -166341,7 +163998,6 @@ self: {
        homepage = "github";
        description = "librados haskell bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {rados = null;};
 
   "rail-compiler-editor" = callPackage
@@ -166365,7 +164021,6 @@ self: {
        homepage = "https://github.com/SWP-Ubau-SoSe2014-Haskell/SWPSoSe14";
        description = "Compiler and editor for the esolang rail";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rainbow_0_20_0_4" = callPackage
@@ -166429,7 +164084,6 @@ self: {
        homepage = "http://www.github.com/massysett/rainbow";
        description = "Tests and QuickCheck generators to accompany rainbow";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rainbox_0_18_0_2" = callPackage
@@ -166522,7 +164176,6 @@ self: {
        homepage = "http://github.com/YoEight/rakhana";
        description = "Stream based PDF library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ralist" = callPackage
@@ -166534,7 +164187,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Random access list with a list compatible interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rallod" = callPackage
@@ -166547,7 +164199,6 @@ self: {
        homepage = "http://github.com/moonmaster9000/rallod";
        description = "'$' in reverse";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "raml" = callPackage
@@ -166575,7 +164226,6 @@ self: {
        libraryHaskellDepends = [ array base IntervalMap mtl random ];
        description = "Random variable library, with Functor, Applicative and Monad instances";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "randfile" = callPackage
@@ -166594,7 +164244,6 @@ self: {
        ];
        description = "Program for picking a random file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "random_1_0_1_1" = callPackage
@@ -166630,7 +164279,6 @@ self: {
        libraryHaskellDepends = [ array base containers ];
        description = "Random-access lists in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "random-derive" = callPackage
@@ -166655,7 +164303,6 @@ self: {
        jailbreak = true;
        description = "A simple random generator library for extensible-effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "random-effin" = callPackage
@@ -166668,7 +164315,6 @@ self: {
        jailbreak = true;
        description = "A simple random generator library for effin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "random-extras" = callPackage
@@ -166741,7 +164387,6 @@ self: {
        homepage = "https://github.com/srijs/random-hypergeometric";
        description = "Random variate generation from hypergeometric distributions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "random-shuffle" = callPackage
@@ -166782,7 +164427,6 @@ self: {
        libraryHaskellDepends = [ base binary bytestring random ];
        description = "An infinite stream of random data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "random-tree" = callPackage
@@ -166817,7 +164461,6 @@ self: {
        homepage = "https://bitbucket.org/kpratt/random-variate";
        description = "\"Uniform RNG => Non-Uniform RNGs\"";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "randomgen" = callPackage
@@ -166932,7 +164575,6 @@ self: {
        libraryHaskellDepends = [ base containers primitive vector ];
        description = "Linear range-min algorithms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ranges" = callPackage
@@ -167213,7 +164855,7 @@ self: {
        sha256 = "efe86052c5979261d9aa6861c6297205ee0b60e1b36de191d20485e823c9781a";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/RaphaelJ/ratio-int";
-       description = "Fast specialisation of Data.Ratio for Int";
+       description = "Fast specialisation of Data.Ratio for Int.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -167251,7 +164893,6 @@ self: {
        homepage = "http://bitbucket.org/dpwiz/raven-haskell";
        description = "Sentry http interface for Scotty web server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "raw-strings-qq_1_0_2" = callPackage
@@ -167323,7 +164964,6 @@ self: {
        homepage = "http://malde.org/~ketil/";
        description = "Mask nucleotide (EST) sequences in Fasta format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rclient" = callPackage
@@ -167361,7 +165001,6 @@ self: {
        homepage = "http://github.com/ekmett/rcu/";
        description = "Read-Copy-Update for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rdf4h" = callPackage
@@ -167393,7 +165032,6 @@ self: {
        homepage = "https://github.com/robstewart57/rdf4h";
        description = "A library for RDF processing in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rdioh" = callPackage
@@ -167416,7 +165054,6 @@ self: {
        ];
        description = "A Haskell wrapper for Rdio's API";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rdtsc" = callPackage
@@ -167454,7 +165091,6 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-re2/";
        description = "Bindings to the re2 regular expression library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "react-flux" = callPackage
@@ -167508,7 +165144,6 @@ self: {
        homepage = "http://wiki.github.com/paolino/realogic";
        description = "pluggable pure logic serializable reactor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive" = callPackage
@@ -167526,7 +165161,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/reactive";
        description = "Push-pull functional reactive programming";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-bacon" = callPackage
@@ -167540,7 +165174,6 @@ self: {
        homepage = "http://github.com/raimohanska/reactive-bacon";
        description = "FRP (functional reactive programming) framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-balsa" = callPackage
@@ -167563,7 +165196,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Reactive-balsa";
        description = "Programmatically edit MIDI events via ALSA and reactive-banana";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-banana" = callPackage
@@ -167604,7 +165236,6 @@ self: {
        homepage = "https://github.com/JPMoresmau/reactive-banana-sdl";
        description = "Reactive Banana bindings for SDL";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-banana-sdl2" = callPackage
@@ -167633,7 +165264,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Reactive-banana";
        description = "Examples for the reactive-banana library, using threepenny-gui";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-banana-wx" = callPackage
@@ -167651,7 +165281,6 @@ self: {
        homepage = "http://wiki.haskell.org/Reactive-banana";
        description = "Examples for the reactive-banana library, using wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "reactive-fieldtrip" = callPackage
@@ -167669,7 +165298,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/reactive-fieldtrip";
        description = "Connect Reactive and FieldTrip";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-glut" = callPackage
@@ -167686,7 +165314,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/reactive-glut";
        description = "Connects Reactive and GLUT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactive-haskell" = callPackage
@@ -167727,7 +165354,6 @@ self: {
        homepage = "https://github.com/strager/reactive-thread";
        description = "Reactive programming via imperative threads";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reactor" = callPackage
@@ -167746,7 +165372,6 @@ self: {
        homepage = "http://comonad.com/reader/";
        description = "Reactor - task parallel reactive programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "read-bounded" = callPackage
@@ -167837,7 +165462,7 @@ self: {
        executableHaskellDepends = [ base bliplib parseargs ];
        jailbreak = true;
        homepage = "https://github.com/bjpop/blip";
-       description = "Read and pretty print Python bytecode (.pyc) files";
+       description = "Read and pretty print Python bytecode (.pyc) files.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -167852,7 +165477,6 @@ self: {
        homepage = "http://website-ckkashyap.rhcloud.com";
        description = "A really simple XML parser";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reasonable-lens" = callPackage
@@ -167863,9 +165487,8 @@ self: {
        sha256 = "5575f5ee0cff708aeb37ea79cc9fae555e62e55053656f252653e33e631a8245";
        libraryHaskellDepends = [ base mtl split template-haskell ];
        homepage = "https://github.com/tokiwoousaka/reasonable-lens";
-       description = "Lens implementation. It is more small but adequately";
+       description = "Lens implementation. It is more small but adequately.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reasonable-operational" = callPackage
@@ -167885,18 +165508,19 @@ self: {
   "rebase" = callPackage
     ({ mkDerivation, base, base-prelude, bifunctors, bytestring
      , containers, contravariant, contravariant-extras, deepseq, dlist
-     , either, hashable, mtl, profunctors, scientific, semigroups, text
-     , time, transformers, unordered-containers, uuid, vector, void
+     , either, fail, hashable, mtl, profunctors, scientific, semigroups
+     , text, time, transformers, unordered-containers, uuid, vector
+     , void
      }:
      mkDerivation {
        pname = "rebase";
-       version = "0.4.3";
-       sha256 = "375e6cb300a7d93b8c64bad5edd69464b787d5d5b22ac80e3705ad2c0f07bde5";
+       version = "0.5";
+       sha256 = "005c556d164d4debc2770f91a66d5f67413a88e3343aab563ceca8de61308707";
        libraryHaskellDepends = [
          base base-prelude bifunctors bytestring containers contravariant
-         contravariant-extras deepseq dlist either hashable mtl profunctors
-         scientific semigroups text time transformers unordered-containers
-         uuid vector void
+         contravariant-extras deepseq dlist either fail hashable mtl
+         profunctors scientific semigroups text time transformers
+         unordered-containers uuid vector void
        ];
        homepage = "https://github.com/nikita-volkov/rebase";
        description = "A more progressive alternative to the \"base\" package";
@@ -167948,7 +165572,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/record-aeson";
        description = "Instances of \"aeson\" classes for the \"record\" types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "record-gl" = callPackage
@@ -167972,7 +165595,6 @@ self: {
        ];
        description = "Utilities for working with OpenGL's GLSL shading language and Nikita Volkov's \"Record\"s";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "record-preprocessor" = callPackage
@@ -167993,7 +165615,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/record-preprocessor";
        description = "Compiler preprocessor introducing a syntactic extension for anonymous records";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "record-syntax" = callPackage
@@ -168016,7 +165637,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/record-syntax";
        description = "A library for parsing and processing the Haskell syntax sprinkled with anonymous records";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "records" = callPackage
@@ -168029,7 +165649,6 @@ self: {
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/records";
        description = "A flexible record system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "records-th" = callPackage
@@ -168048,7 +165667,6 @@ self: {
        homepage = "github.com/lassoinc/records-th";
        description = "Template Haskell declarations for the records package";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "recursion-schemes" = callPackage
@@ -168097,7 +165715,6 @@ self: {
        jailbreak = true;
        description = "Monadic HTTP request handlers combinators to build a standalone web apps";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reddit" = callPackage
@@ -168387,7 +166004,6 @@ self: {
        homepage = "http://github.com/NicolasT/reedsolomon";
        description = "Reed-Solomon Erasure Coding in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reenact" = callPackage
@@ -168424,7 +166040,6 @@ self: {
        homepage = "https://bitbucket.org/carter/ref";
        description = "Generic Mutable Ref Abstraction Layer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ref-fd" = callPackage
@@ -168559,7 +166174,6 @@ self: {
        homepage = "https://github.com/Raynes/refh";
        description = "A command-line tool for pasting to https://www.refheap.com";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "refined" = callPackage
@@ -168695,7 +166309,6 @@ self: {
        homepage = "http://github.com/jfischoff/reflection-extras";
        description = "Utilities for the reflection package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflection-without-remorse" = callPackage
@@ -168732,7 +166345,6 @@ self: {
        homepage = "https://github.com/ryantrinkle/reflex";
        description = "Higher-order Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflex-animation" = callPackage
@@ -168751,7 +166363,6 @@ self: {
        homepage = "https://github.com/saulzar/reflex-animation";
        description = "Continuous animations support for reflex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflex-dom" = callPackage
@@ -168775,7 +166386,6 @@ self: {
        ];
        description = "Functional Reactive Web Apps with Reflex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflex-dom-contrib" = callPackage
@@ -168795,7 +166405,6 @@ self: {
        homepage = "https://github.com/reflex-frp/reflex-dom-contrib";
        description = "A playground for experimenting with infrastructure and common code for reflex applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflex-gloss" = callPackage
@@ -168812,7 +166421,6 @@ self: {
        homepage = "https://github.com/reflex-frp/reflex-gloss";
        description = "An reflex interface for gloss";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflex-gloss-scene" = callPackage
@@ -168842,7 +166450,6 @@ self: {
        homepage = "https://github.com/saulzar/reflex-gloss-scene";
        description = "A simple scene-graph using reflex and gloss";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reflex-transformers" = callPackage
@@ -168860,7 +166467,6 @@ self: {
        homepage = "http://github.com/saulzar/reflex-transformers";
        description = "Collections and switchable Monad transformers for Reflex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reform" = callPackage
@@ -169087,7 +166693,6 @@ self: {
        homepage = "http://code.google.com/p/xhaskell-regex-deriv/";
        description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Brzozowski's Deriviatives";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-dfa" = callPackage
@@ -169100,7 +166705,6 @@ self: {
        homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-easy" = callPackage
@@ -169148,7 +166752,6 @@ self: {
        homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-pcre" = callPackage
@@ -169195,9 +166798,8 @@ self: {
          parsec regex-base
        ];
        homepage = "http://code.google.com/p/xhaskell-library/";
-       description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Antimirov's partial derivatives";
+       description = "Replaces/Enhances Text.Regex. Implementing regular expression matching using Antimirov's partial derivatives.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-posix" = callPackage
@@ -169356,7 +166958,6 @@ self: {
        jailbreak = true;
        description = "This combines regex-tdfa with utf8-string to allow searching over UTF8 encoded lazy bytestrings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regex-tre" = callPackage
@@ -169370,7 +166971,6 @@ self: {
        homepage = "http://sourceforge.net/projects/lazy-regex";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) tre;};
 
   "regex-xmlschema" = callPackage
@@ -169384,7 +166984,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Regular_expressions_for_XML_Schema";
        description = "A regular expression library for W3C XML Schema regular expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regexchar" = callPackage
@@ -169436,7 +167035,6 @@ self: {
        homepage = "http://github.com/baldo/regexp-tries";
        description = "Regular Expressions on Tries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regexpr" = callPackage
@@ -169476,7 +167074,6 @@ self: {
        homepage = "http://code.haskell.org/~morrow/code/haskell/regexqq";
        description = "A quasiquoter for PCRE regexes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regional-pointers" = callPackage
@@ -169493,7 +167090,6 @@ self: {
        homepage = "https://github.com/basvandijk/regional-pointers/";
        description = "Regional memory pointers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regions" = callPackage
@@ -169511,7 +167107,6 @@ self: {
        homepage = "https://github.com/basvandijk/regions/";
        description = "Provides the region monad for safely opening and working with scarce resources";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regions-monadsfd" = callPackage
@@ -169528,7 +167123,6 @@ self: {
        jailbreak = true;
        description = "Monads-fd instances for the RegionT monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regions-monadstf" = callPackage
@@ -169546,7 +167140,6 @@ self: {
        homepage = "https://github.com/basvandijk/regions-monadstf/";
        description = "Monads-tf instances for the RegionT monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regions-mtl" = callPackage
@@ -169560,7 +167153,6 @@ self: {
        homepage = "https://github.com/basvandijk/regions-mtl/";
        description = "mtl instances for the RegionT monad transformer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regress" = callPackage
@@ -169610,7 +167202,6 @@ self: {
        jailbreak = true;
        description = "Additional functions for regular: arbitrary, coarbitrary, and binary get/put";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regular-web" = callPackage
@@ -169628,7 +167219,6 @@ self: {
        homepage = "http://github.com/chriseidhof/regular-web";
        description = "Generic programming for the web";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "regular-xmlpickler" = callPackage
@@ -169656,7 +167246,6 @@ self: {
        homepage = "https://github.com/mrVanDalo/reheat";
        description = "to make notes and reduce impact on idle time on writing other programms";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rehoo" = callPackage
@@ -169694,7 +167283,6 @@ self: {
        homepage = "https://github.com/kerkomen/rei";
        description = "Process lists easily";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reified-records" = callPackage
@@ -169708,7 +167296,6 @@ self: {
        homepage = "http://bitbucket.org/jozefg/reified-records";
        description = "Reify records to Maps and back again";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reify" = callPackage
@@ -169725,7 +167312,6 @@ self: {
        homepage = "http://www.cs.mu.oz.au/~bjpop/code.html";
        description = "Serialize data";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "reinterpret-cast" = callPackage
@@ -169739,7 +167325,6 @@ self: {
        homepage = "https://github.com/nh2/reinterpret-cast";
        description = "Memory reinterpretation casts for Float/Double and Word32/Word64";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "relacion" = callPackage
@@ -169783,7 +167368,6 @@ self: {
        homepage = "https://github.com/yuga/haskell-relational-record-driver-postgresql8";
        description = "PostgreSQL v8.x driver for haskell-relational-record";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "relational-query" = callPackage
@@ -169943,7 +167527,6 @@ self: {
        ];
        description = "Cloud Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "remote-debugger" = callPackage
@@ -170075,7 +167658,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/remotion";
        description = "A library for client-server applications based on custom protocols";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "renderable" = callPackage
@@ -170115,7 +167697,6 @@ self: {
        jailbreak = true;
        description = "Define compound types that do not depend on member order";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repa_3_3_1_2" = callPackage
@@ -170226,7 +167807,6 @@ self: {
        homepage = "http://repa.ouroborus.net";
        description = "Bulk array representations and operators";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repa-bytestring" = callPackage
@@ -170353,7 +167933,6 @@ self: {
        homepage = "http://repa.ouroborus.net";
        description = "Data-parallel data flows";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repa-io_3_3_1_2" = callPackage
@@ -170412,8 +167991,8 @@ self: {
     ({ mkDerivation, base, hmatrix, repa, vector }:
      mkDerivation {
        pname = "repa-linear-algebra";
-       version = "0.3.0.0";
-       sha256 = "643cbbbd486fa48f74ae1bbdcd05a8092325c8dba08e1950522fe27e8c45f559";
+       version = "0.3.0.1";
+       sha256 = "560e1b429ab07e712d28954c6443a6fd8d07d922ccd3041ac28fb996c2f499a2";
        libraryHaskellDepends = [ base hmatrix repa vector ];
        homepage = "https://github.com/marcinmrotek/repa-linear-algebra";
        description = "HMatrix operations for Repa";
@@ -170435,7 +168014,6 @@ self: {
        jailbreak = true;
        description = "Data Flow Fusion GHC Plugin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repa-scalar" = callPackage
@@ -170465,7 +168043,6 @@ self: {
        jailbreak = true;
        description = "Series Expressionss API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repa-sndfile" = callPackage
@@ -170500,7 +168077,6 @@ self: {
        homepage = "http://repa.ouroborus.net";
        description = "Stream functions not present in the vector library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repa-v4l2" = callPackage
@@ -170521,7 +168097,6 @@ self: {
        homepage = "https://github.com/cgo/hsimage";
        description = "Provides high-level access to webcams";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repl" = callPackage
@@ -170537,7 +168112,6 @@ self: {
        homepage = "https://github.com/mikeplus64/repl";
        description = "IRC friendly REPL library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repl-toolkit" = callPackage
@@ -170599,7 +168173,6 @@ self: {
        homepage = "https://github.com/saep/repo-based-blog";
        description = "Blogging module using blaze html for markup";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repr" = callPackage
@@ -170617,7 +168190,6 @@ self: {
        homepage = "https://github.com/basvandijk/repr";
        description = "Render overloaded expressions to their textual representation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "repr-tree-syb" = callPackage
@@ -170651,7 +168223,6 @@ self: {
        homepage = "http://github.com/ekmett/representable-functors/";
        description = "Representable functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "representable-profunctors" = callPackage
@@ -170685,7 +168256,6 @@ self: {
        homepage = "http://github.com/ekmett/representable-tries/";
        description = "Tries from representations of polynomial functors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "request-monad" = callPackage
@@ -170826,7 +168396,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/resistor-cube";
        description = "Compute total resistance of a cube of resistors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "resolve-trivial-conflicts_0_3_2_1" = callPackage
@@ -170901,7 +168470,6 @@ self: {
        homepage = "https://bitbucket.org/tdammers/resource-embed";
        description = "Embed data files via C and FFI";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "resource-pool_0_2_3_1" = callPackage
@@ -170990,7 +168558,6 @@ self: {
        jailbreak = true;
        description = "Allocate resources which are guaranteed to be released";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "resourcet_1_1_3_1" = callPackage
@@ -171189,7 +168756,6 @@ self: {
        homepage = "https://github.com/raptros/respond";
        description = "process and route HTTP requests and generate responses on top of WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rest-client_0_4_0_1" = callPackage
@@ -172363,7 +169929,6 @@ self: {
        jailbreak = true;
        homepage = "https://github.com/ozataman/restful-snap";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "restricted-workers" = callPackage
@@ -172384,7 +169949,6 @@ self: {
        homepage = "https://github.com/co-dan/interactive-diagrams/wiki/Restricted-Workers";
        description = "Running worker processes under system resource restrictions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "restyle" = callPackage
@@ -172400,7 +169964,6 @@ self: {
        jailbreak = true;
        description = "Convert between camel case and separated words style";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "resumable-exceptions" = callPackage
@@ -172413,7 +169976,6 @@ self: {
        jailbreak = true;
        description = "A monad transformer for resumable exceptions";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rethinkdb_2_2_0_2" = callPackage
@@ -172637,7 +170199,6 @@ self: {
        homepage = "http://github.com/seanhess/rethinkdb-model";
        description = "Useful tools for modeling data with rethinkdb";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rethinkdb-wereHamster" = callPackage
@@ -172858,7 +170419,6 @@ self: {
        homepage = "http://www.github.com/massysett/rewrite";
        description = "open file and rewrite it with new contents";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rewriting" = callPackage
@@ -172870,7 +170430,6 @@ self: {
        libraryHaskellDepends = [ base containers regular ];
        description = "Generic rewriting library for regular datatypes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rex" = callPackage
@@ -172906,7 +170465,6 @@ self: {
        jailbreak = true;
        description = "Github resume generator";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rfc3339" = callPackage
@@ -172919,7 +170477,6 @@ self: {
        doHaddock = false;
        description = "Parse and display time according to RFC3339 (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rfc5051" = callPackage
@@ -172952,7 +170509,6 @@ self: {
        homepage = "https://github.com/fumieval/rhythm-game-tutorial";
        description = "Haskell rhythm game tutorial";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "riak" = callPackage
@@ -173038,7 +170594,6 @@ self: {
        homepage = "https://github.com/tel/riemann-hs";
        description = "A Riemann client for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "riff" = callPackage
@@ -173091,7 +170646,6 @@ self: {
        homepage = "http://modeemi.fi/~tuomov/riot/";
        description = "Riot is an Information Organisation Tool";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) ncurses;};
 
   "ripple" = callPackage
@@ -173112,7 +170666,6 @@ self: {
        homepage = "https://github.com/singpolyma/ripple-haskell";
        description = "Ripple payment system library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ripple-federation" = callPackage
@@ -173131,7 +170684,6 @@ self: {
        homepage = "https://github.com/singpolyma/ripple-federation-haskell";
        description = "Utilities and types to work with the Ripple federation protocol";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "risc386" = callPackage
@@ -173149,7 +170701,6 @@ self: {
        homepage = "http://www2.tcs.ifi.lmu.de/~abel/";
        description = "Reduced instruction set i386 simulator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rivers" = callPackage
@@ -173163,7 +170714,6 @@ self: {
        homepage = "https://github.com/d-rive/rivers";
        description = "Rivers are like Streams, but different";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rivet" = callPackage
@@ -173260,7 +170810,6 @@ self: {
        ];
        description = "Restricted monad library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rncryptor" = callPackage
@@ -173383,9 +170932,8 @@ self: {
          base bytestring directory filepath old-time process
        ];
        homepage = "http://roguestar.downstairspeople.org/";
-       description = "Sci-fi roguelike game. Client application";
+       description = "Sci-fi roguelike game. Client application.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roguestar-engine" = callPackage
@@ -173406,9 +170954,8 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://roguestar.downstairspeople.org/";
-       description = "Sci-fi roguelike game. Backend";
+       description = "Sci-fi roguelike game. Backend.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roguestar-gl" = callPackage
@@ -173426,9 +170973,8 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://roguestar.downstairspeople.org/";
-       description = "Sci-fi roguelike game. Client library";
+       description = "Sci-fi roguelike game. Client library.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roguestar-glut" = callPackage
@@ -173442,9 +170988,8 @@ self: {
        executableHaskellDepends = [ base GLUT roguestar-gl rsagl ];
        jailbreak = true;
        homepage = "http://roguestar.downstairspeople.org/";
-       description = "Sci-fi roguelike game. GLUT front-end";
+       description = "Sci-fi roguelike game. GLUT front-end.";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rollbar" = callPackage
@@ -173554,7 +171099,6 @@ self: {
        homepage = "http://github.com/ekmett/rope";
        description = "Tools for manipulating fingertrees of bytestrings with optional annotations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rosa" = callPackage
@@ -173573,7 +171117,6 @@ self: {
        ];
        description = "Query the namecoin blockchain";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rose-trees" = callPackage
@@ -173610,7 +171153,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/RaminHAL9001/rose-trie";
-       description = "Provides \"Data.Tree.RoseTrie\": trees with polymorphic paths to nodes, combining properties of Rose Tree data structures and Trie data structures";
+       description = "Provides \"Data.Tree.RoseTrie\": trees with polymorphic paths to nodes, combining properties of Rose Tree data structures and Trie data structures.";
        license = stdenv.lib.licenses.gpl3;
      }) {};
 
@@ -173656,7 +171199,6 @@ self: {
        homepage = "http://github.com/acowley/roshask";
        description = "Haskell support for the ROS robotics framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rosso" = callPackage
@@ -173668,7 +171210,6 @@ self: {
        libraryHaskellDepends = [ base containers deepseq ];
        description = "General purpose utility library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rot13" = callPackage
@@ -173685,21 +171226,18 @@ self: {
      }) {};
 
   "rotating-log" = callPackage
-    ({ mkDerivation, base, bytestring, directory, filepath, old-locale
-     , time
-     }:
+    ({ mkDerivation, base, bytestring, directory, filepath, time }:
      mkDerivation {
        pname = "rotating-log";
-       version = "0.2";
-       sha256 = "b320f7cbf926526476c02f61050095d36706f94c4405e3653597dbf1db770dbf";
+       version = "0.4";
+       sha256 = "661a22b9f5b05d7dd8989f61f1d625862d57b18aa19fba7077746f05be77b451";
        libraryHaskellDepends = [
-         base bytestring directory filepath old-locale time
-       ];
-       testHaskellDepends = [
-         base bytestring directory filepath old-locale time
+         base bytestring directory filepath time
        ];
+       testHaskellDepends = [ base bytestring directory filepath time ];
+       homepage = "http://github.com/Soostone/rotating-log";
+       description = "Size-limited, concurrent, automatically-rotating log writer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rounding" = callPackage
@@ -173713,7 +171251,6 @@ self: {
        homepage = "http://patch-tag.com/r/ekmett/rounding";
        description = "Explicit floating point rounding mode wrappers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roundtrip" = callPackage
@@ -173729,7 +171266,6 @@ self: {
        ];
        description = "Bidirectional (de-)serialization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roundtrip-aeson" = callPackage
@@ -173752,7 +171288,6 @@ self: {
        homepage = "https://github.com/anchor/roundtrip-aeson";
        description = "Un-/parse JSON with roundtrip invertible syntax definitions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roundtrip-string" = callPackage
@@ -173764,7 +171299,6 @@ self: {
        libraryHaskellDepends = [ base mtl parsec roundtrip ];
        description = "Bidirectional (de-)serialization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "roundtrip-xml" = callPackage
@@ -173786,7 +171320,6 @@ self: {
        ];
        description = "Bidirectional (de-)serialization for XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "route-generator" = callPackage
@@ -173803,7 +171336,6 @@ self: {
        homepage = "http://github.com/singpolyma/route-generator";
        description = "Utility to generate routes for use with yesod-routes";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "route-planning" = callPackage
@@ -173823,7 +171355,6 @@ self: {
        homepage = "https://github.com/tonymorris/route";
        description = "A library and utilities for creating a route";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rowrecord" = callPackage
@@ -173835,7 +171366,6 @@ self: {
        libraryHaskellDepends = [ base containers template-haskell ];
        description = "Build records from lists of strings, as from CSV files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rpc" = callPackage
@@ -173852,7 +171382,6 @@ self: {
        ];
        description = "type safe rpcs provided as basic IO actions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rpc-framework" = callPackage
@@ -173873,7 +171402,6 @@ self: {
        homepage = "http://github.com/mmirman/rpc-framework";
        description = "a remote procedure call framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rpf" = callPackage
@@ -173906,7 +171434,6 @@ self: {
        libraryHaskellDepends = [ base directory filepath HaXml process ];
        description = "Cozy little project to question unruly rpm packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rsagl" = callPackage
@@ -173928,7 +171455,6 @@ self: {
        homepage = "http://roguestar.downstairspeople.org/";
        description = "The RogueStar Animation and Graphics Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rsagl-frp" = callPackage
@@ -173946,7 +171472,6 @@ self: {
        homepage = "http://roguestar.downstairspeople.org/";
        description = "The RogueStar Animation and Graphics Library: Functional Reactive Programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rsagl-math" = callPackage
@@ -173965,7 +171490,6 @@ self: {
        homepage = "http://roguestar.downstairspeople.org/";
        description = "The RogueStar Animation and Graphics Library: Mathematics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rspp" = callPackage
@@ -173993,7 +171517,7 @@ self: {
          base HaXml network network-uri old-locale time
        ];
        homepage = "https://github.com/basvandijk/rss";
-       description = "A library for generating RSS 2.0 feeds";
+       description = "A library for generating RSS 2.0 feeds.";
        license = stdenv.lib.licenses.publicDomain;
      }) {};
 
@@ -174019,7 +171543,6 @@ self: {
        homepage = "http://hackage.haskell.org/package/rss2irc";
        description = "watches an RSS/Atom feed and writes it to an IRC channel";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rtcm" = callPackage
@@ -174038,7 +171561,6 @@ self: {
        homepage = "http://github.com/swift-nav/librtcm";
        description = "RTCM Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rtld" = callPackage
@@ -174065,7 +171587,6 @@ self: {
        homepage = "https://github.com/adamwalker/hrtlsdr";
        description = "Bindings to librtlsdr";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) rtl-sdr;};
 
   "rtorrent-rpc" = callPackage
@@ -174084,7 +171605,6 @@ self: {
        homepage = "https://github.com/megantti/rtorrent-rpc";
        description = "A library for communicating with RTorrent over its XML-RPC interface";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rtorrent-state" = callPackage
@@ -174123,7 +171643,6 @@ self: {
        homepage = "https://github.com/mtolly/rubberband";
        description = "Binding to the C++ audio stretching library Rubber Band";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) rubberband;};
 
   "ruby-marshal" = callPackage
@@ -174142,7 +171661,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/filib/ruby-marshal";
-       description = "Parse a subset of Ruby objects serialised with Marshal.dump";
+       description = "Parse a subset of Ruby objects serialised with Marshal.dump.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -174174,7 +171693,6 @@ self: {
        homepage = "https://gitorious.org/ruff";
        description = "relatively useful fractal functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ruler" = callPackage
@@ -174211,7 +171729,6 @@ self: {
        ];
        homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "rungekutta" = callPackage
@@ -174223,7 +171740,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A collection of explicit Runge-Kutta methods of various orders";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "runghc" = callPackage
@@ -174407,7 +171923,6 @@ self: {
        homepage = "https://github.com/reinerp/safe-freeze";
        description = "Support for safely freezing multiple arrays in the ST monad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-globals" = callPackage
@@ -174419,7 +171934,6 @@ self: {
        libraryHaskellDepends = [ base stm template-haskell ];
        description = "Safe top-level mutable variables which scope like ordinary values";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-lazy-io" = callPackage
@@ -174434,7 +171948,6 @@ self: {
        ];
        description = "A library providing safe lazy IO features";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-length" = callPackage
@@ -174467,7 +171980,6 @@ self: {
        ];
        description = "A small wrapper over hs-plugins to allow loading safe plugins";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safe-printf" = callPackage
@@ -174653,7 +172165,6 @@ self: {
        homepage = "https://github.com/basvandijk/safer-file-handles/";
        description = "Type-safe file handling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safer-file-handles-bytestring" = callPackage
@@ -174672,7 +172183,6 @@ self: {
        homepage = "https://github.com/basvandijk/safer-file-handles-bytestring/";
        description = "Extends safer-file-handles with ByteString operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "safer-file-handles-text" = callPackage
@@ -174690,7 +172200,6 @@ self: {
        homepage = "https://github.com/basvandijk/safer-file-handles-text/";
        description = "Extends safer-file-handles with Text operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "saferoute" = callPackage
@@ -174720,7 +172229,6 @@ self: {
        homepage = "http://fremissant.net/shape-syb";
        description = "Obtain homogeneous values from arbitrary values, transforming or culling data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "saltine" = callPackage
@@ -174760,7 +172268,6 @@ self: {
        homepage = "https://github.com/tsuraan/saltine-quickcheck";
        description = "Quickcheck implementations for some NaCl data";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libsodium;};
 
   "salvia" = callPackage
@@ -174782,7 +172289,6 @@ self: {
        jailbreak = true;
        description = "Modular web application framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "salvia-demo" = callPackage
@@ -174805,7 +172311,6 @@ self: {
        jailbreak = true;
        description = "Demo Salvia servers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "salvia-extras" = callPackage
@@ -174827,7 +172332,6 @@ self: {
        jailbreak = true;
        description = "Collection of non-fundamental handlers for the Salvia web server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "salvia-protocol" = callPackage
@@ -174845,7 +172349,6 @@ self: {
        jailbreak = true;
        description = "Salvia webserver protocol suite supporting URI, HTTP, Cookie and MIME";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "salvia-sessions" = callPackage
@@ -174864,7 +172367,6 @@ self: {
        jailbreak = true;
        description = "Session support for the Salvia webserver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "salvia-websocket" = callPackage
@@ -174882,7 +172384,6 @@ self: {
        jailbreak = true;
        description = "Websocket implementation for the Salvia Webserver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sample-frame" = callPackage
@@ -174915,8 +172416,8 @@ self: {
     ({ mkDerivation, base, foldl, mwc-random, primitive, vector }:
      mkDerivation {
        pname = "sampling";
-       version = "0.1.1";
-       sha256 = "a1282010e483959c81cf9c018aac5560f2429cc9826e0e79452bc19ea484f19d";
+       version = "0.2.0";
+       sha256 = "0300849bb9b276455397df71fcf061e1db8563045af176f04a2ad31dd333295a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base foldl mwc-random primitive vector ];
@@ -175004,7 +172505,6 @@ self: {
        ];
        description = "Iteratee interface to SamTools library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sandi_0_3_5" = callPackage
@@ -175085,7 +172585,6 @@ self: {
        homepage = "https://github.com/tokiwoousaka/Sarasvati";
        description = "audio library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "sasl" = callPackage
@@ -175103,7 +172602,6 @@ self: {
        homepage = "https://github.com/YoshikuniJujo/sasl/wiki";
        description = "SASL implementation using simple-pipe";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sat" = callPackage
@@ -175118,7 +172616,6 @@ self: {
        homepage = "http://tcana.info/sat.html";
        description = "CNF SATisfier";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sat-micro-hs" = callPackage
@@ -175136,7 +172633,6 @@ self: {
        ];
        description = "A minimal SAT solver";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "satchmo" = callPackage
@@ -175156,7 +172652,6 @@ self: {
        homepage = "https://github.com/jwaldmann/satchmo";
        description = "SAT encoding monad";
        license = "GPL";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "satchmo-backends" = callPackage
@@ -175173,7 +172668,6 @@ self: {
        homepage = "http://dfa.imn.htwk-leipzig.de/satchmo/";
        description = "driver for external satchmo backends";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "satchmo-examples" = callPackage
@@ -175192,7 +172686,6 @@ self: {
        homepage = "http://dfa.imn.htwk-leipzig.de/satchmo/";
        description = "examples that show how to use satchmo";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "satchmo-funsat" = callPackage
@@ -175209,7 +172702,6 @@ self: {
        homepage = "http://dfa.imn.htwk-leipzig.de/satchmo/";
        description = "funsat driver as backend for satchmo";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "satchmo-minisat" = callPackage
@@ -175222,7 +172714,6 @@ self: {
        homepage = "http://dfa.imn.htwk-leipzig.de/satchmo/";
        description = "minisat driver as backend for satchmo";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "satchmo-toysat" = callPackage
@@ -175240,7 +172731,6 @@ self: {
        homepage = "https://github.com/msakai/satchmo-toysat";
        description = "toysat driver as backend for satchmo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "sbp" = callPackage
@@ -175273,7 +172763,6 @@ self: {
        homepage = "https://github.com/swift-nav/libsbp";
        description = "SwiftNav's SBP Library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sbv_4_2" = callPackage
@@ -175400,7 +172889,6 @@ self: {
        homepage = "http://github.com/LeventErkok/sbvPlugin";
        description = "Formally prove properties of Haskell programs using SBV/SMT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sc3-rdu" = callPackage
@@ -175446,7 +172934,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/scaleimage";
        description = "Scale an image to a new geometry";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scalp-webhooks" = callPackage
@@ -175473,7 +172960,6 @@ self: {
        ];
        description = "Test webhooks locally";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scalpel_0_2_1" = callPackage
@@ -175554,7 +173040,6 @@ self: {
        testHaskellDepends = [ array base HUnit ];
        description = "An implementation of the Scan Vector Machine instruction set in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scat" = callPackage
@@ -175612,7 +173097,6 @@ self: {
        homepage = "http://trac.haskell.org/SCC/";
        description = "Streaming component combinators";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scenegraph" = callPackage
@@ -175631,7 +173115,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/SceneGraph";
        description = "Scene Graph";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scgi" = callPackage
@@ -175665,7 +173148,6 @@ self: {
        jailbreak = true;
        description = "Marge schedules and show EVR";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "schedule-planner" = callPackage
@@ -175741,7 +173223,6 @@ self: {
        homepage = "http://scholdoc.scholarlymarkdown.com";
        description = "Converts ScholarlyMarkdown documents to HTML5/LaTeX/Docx format";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scholdoc-citeproc" = callPackage
@@ -175777,7 +173258,6 @@ self: {
        homepage = "http://scholdoc.scholarlymarkdown.com";
        description = "Scholdoc fork of pandoc-citeproc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scholdoc-texmath" = callPackage
@@ -175869,7 +173349,6 @@ self: {
        jailbreak = true;
        description = "Mathematical/physical/chemical constants";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scientific_0_3_3_3" = callPackage
@@ -176069,7 +173548,6 @@ self: {
        homepage = "http://github.com/nominolo/scion";
        description = "Haskell IDE library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scion-browser" = callPackage
@@ -176106,7 +173584,6 @@ self: {
        homepage = "http://github.com/JPMoresmau/scion-class-browser";
        description = "Command-line interface for browsing and searching packages documentation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scons2dot" = callPackage
@@ -176138,7 +173615,6 @@ self: {
        ];
        description = "An interactive renderer for plotting time-series data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scope-cairo" = callPackage
@@ -176161,7 +173637,6 @@ self: {
        ];
        description = "An interactive renderer for plotting time-series data";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scottish" = callPackage
@@ -176181,7 +173656,6 @@ self: {
        homepage = "https://github.com/echaozh/scottish";
        description = "scotty with batteries included";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty_0_9_0" = callPackage
@@ -176327,7 +173801,6 @@ self: {
        ];
        description = "blaze-html integration for Scotty";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-cookie" = callPackage
@@ -176370,7 +173843,6 @@ self: {
        jailbreak = true;
        description = "Fay integration for Scotty";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-hastache" = callPackage
@@ -176388,7 +173860,6 @@ self: {
        homepage = "https://github.com/scotty-web/scotty-hastache";
        description = "Easy Mustache templating support for Scotty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-params-parser" = callPackage
@@ -176450,7 +173921,6 @@ self: {
        homepage = "https://github.com/agrafix/scotty-session";
        description = "Adding session functionality to scotty";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scotty-tls" = callPackage
@@ -176507,7 +173977,6 @@ self: {
        jailbreak = true;
        description = "Scrabble play generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scrobble" = callPackage
@@ -176530,7 +173999,6 @@ self: {
        ];
        description = "Scrobbling server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scroll" = callPackage
@@ -176552,7 +174020,6 @@ self: {
        homepage = "https://joeyh.name/code/scroll/";
        description = "scroll(6), a roguelike game";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scrypt" = callPackage
@@ -176598,7 +174065,6 @@ self: {
        homepage = "http://github.com/wereHamster/scrz";
        description = "Process management and supervision daemon";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "scyther-proof" = callPackage
@@ -176701,9 +174167,8 @@ self: {
        ];
        librarySystemDepends = [ SDL2 ];
        libraryPkgconfigDepends = [ SDL2 ];
-       description = "Both high- and low-level bindings to the SDL library (version 2.0.3)";
+       description = "Both high- and low-level bindings to the SDL library (version 2.0.3).";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) SDL2;};
 
   "sdl2-cairo" = callPackage
@@ -176715,9 +174180,8 @@ self: {
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [ base cairo linear mtl random sdl2 time ];
-       description = "Render with Cairo on SDL textures. Includes optional convenience drawing API";
+       description = "Render with Cairo on SDL textures. Includes optional convenience drawing API.";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "sdl2-cairo-image" = callPackage
@@ -176751,7 +174215,6 @@ self: {
        ];
        description = "image compositing with sdl2 - declarative style";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "sdl2-image" = callPackage
@@ -176766,7 +174229,6 @@ self: {
        jailbreak = true;
        description = "Haskell binding to sdl2-image";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) SDL2; inherit (pkgs) SDL2_image;};
 
   "sdl2-ttf" = callPackage
@@ -176823,7 +174285,6 @@ self: {
        description = "A software defined radio library";
        license = stdenv.lib.licenses.bsd3;
        platforms = [ "x86_64-darwin" "x86_64-linux" ];
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seacat" = callPackage
@@ -176849,7 +174310,6 @@ self: {
        homepage = "https://github.com/Barrucadu/lambdadelta";
        description = "Small web framework using Warp and WAI";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seal-module" = callPackage
@@ -176879,7 +174339,6 @@ self: {
        homepage = "http://github.com/ekmett/search/";
        description = "Infinite search in finite time with Hilbert's epsilon";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sec" = callPackage
@@ -176908,7 +174367,6 @@ self: {
        homepage = "http://github.com/pgavin/secdh";
        description = "SECDH Machine Simulator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seclib" = callPackage
@@ -177073,7 +174531,6 @@ self: {
        homepage = "http://github.com/haskoin/secp256k1#readme";
        description = "Bindings for secp256k1 library from Bitcoin Core";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "secret-santa" = callPackage
@@ -177093,7 +174550,6 @@ self: {
        homepage = "https://github.com/rodrigosetti/secret-santa";
        description = "Secret Santa game assigner using QR-Codes";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "secret-sharing" = callPackage
@@ -177115,7 +174571,6 @@ self: {
        homepage = "http://monoid.at/code";
        description = "Information-theoretic secure secret sharing";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "secrm" = callPackage
@@ -177130,7 +174585,6 @@ self: {
        jailbreak = true;
        description = "Example of writing \"secure\" file removal in Haskell rather than C";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "secure-sockets" = callPackage
@@ -177231,7 +174685,6 @@ self: {
        librarySystemDepends = [ sedna ];
        description = "Sedna C API XML Binding";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {sedna = null;};
 
   "select" = callPackage
@@ -177244,7 +174697,6 @@ self: {
        homepage = "http://nonempty.org/software/haskell-select";
        description = "Wrap the select(2) POSIX function";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "selectors" = callPackage
@@ -177262,7 +174714,6 @@ self: {
        homepage = "http://github.com/rcallahan/selectors";
        description = "CSS Selectors for DOM traversal";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "selenium" = callPackage
@@ -177274,7 +174725,6 @@ self: {
        libraryHaskellDepends = [ base HTTP HUnit mtl network pretty ];
        description = "Test web applications through a browser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "selenium-server" = callPackage
@@ -177296,7 +174746,6 @@ self: {
        homepage = "https://github.com/joelteon/selenium-server.git";
        description = "Run the selenium standalone server for usage with webdriver";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "selfrestart" = callPackage
@@ -177322,7 +174771,6 @@ self: {
        homepage = "https://github.com/luite/selinux";
        description = "SELinux bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {selinux = null;};
 
   "semaphore-plus" = callPackage
@@ -177349,7 +174797,6 @@ self: {
        ];
        description = "Weakened partial isomorphisms, reversible computations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semigroupoid-extras_4_0" = callPackage
@@ -177638,7 +175085,6 @@ self: {
        homepage = "http://github.com/ppetr/semigroups-actions/";
        description = "Semigroups actions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semiring" = callPackage
@@ -177661,7 +175107,6 @@ self: {
        homepage = "http://github.com/srush/SemiRings/tree/master";
        description = "Semirings, ring-like structures used for dynamic programming applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "semiring-simple" = callPackage
@@ -177703,7 +175148,6 @@ self: {
        ];
        description = "An implementation of semver and semantic version ranges";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sendfile" = callPackage
@@ -177752,7 +175196,6 @@ self: {
        homepage = "https://github.com/rossdylan/sensenet";
        description = "Distributed sensor network for the raspberry pi";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sentry" = callPackage
@@ -177775,7 +175218,6 @@ self: {
        homepage = "https://github.com/noteed/sentry";
        description = "Process monitoring tool written and configured in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "senza" = callPackage
@@ -177832,7 +175274,6 @@ self: {
        homepage = "http://fremissant.net/seqaid";
        description = "Dynamic strictness control, including space leak repair";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "seqalign" = callPackage
@@ -177844,7 +175285,6 @@ self: {
        libraryHaskellDepends = [ base bytestring vector ];
        description = "Sequence Alignment";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "seqid_0_1_0" = callPackage
@@ -177994,7 +175434,6 @@ self: {
        homepage = "http://www.ingolia-lab.org/seqloc-datafiles-tutorial.html";
        description = "Read and write BED and GTF format genome annotations";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sequence" = callPackage
@@ -178024,7 +175463,6 @@ self: {
        homepage = "https://github.com/lukemaurer/sequent-core";
        description = "Alternative Core language for GHC plugins";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sequential-index" = callPackage
@@ -178060,7 +175498,6 @@ self: {
        homepage = "https://bitbucket.org/gchrupala/sequor";
        description = "A sequence labeler based on Collins's sequence perceptron";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "serf" = callPackage
@@ -178791,7 +176228,6 @@ self: {
        homepage = "http://haskell-servant.github.io/";
        description = "Example programs for servant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-github" = callPackage
@@ -179036,7 +176472,6 @@ self: {
        homepage = "http://github.com/zalora/servant-pool";
        description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-postgresql" = callPackage
@@ -179054,7 +176489,6 @@ self: {
        homepage = "http://github.com/zalora/servant-postgresql";
        description = "Useful functions and instances for using servant with a PostgreSQL context";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-response" = callPackage
@@ -179089,7 +176523,6 @@ self: {
        homepage = "http://github.com/zalora/servant";
        description = "Generate a web service for servant 'Resource's using scotty and JSON";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "servant-server_0_2_4" = callPackage
@@ -179711,7 +177144,6 @@ self: {
        jailbreak = true;
        description = "Snaplet for the ses-html package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sessions" = callPackage
@@ -179727,7 +177159,6 @@ self: {
        homepage = "http://www.wellquite.org/sessions/";
        description = "Session Types for Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "set-cover" = callPackage
@@ -179746,7 +177177,6 @@ self: {
        homepage = "http://hub.darcs.net/thielema/set-cover/";
        description = "Solve exact set cover problems like Sudoku, 8 Queens, Soma Cube, Tetris Cube";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "set-extra_1_3_2" = callPackage
@@ -179757,7 +177187,7 @@ self: {
        sha256 = "f7842446f8961a29de96fa14423d8e23978cfef3db6ec0324358536d6bf8dd53";
        libraryHaskellDepends = [ base containers mtl syb ];
        homepage = "https://github.com/ddssff/set-extra";
-       description = "Functions that could be added to Data.Set";
+       description = "Functions that could be added to Data.Set.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -179800,7 +177230,6 @@ self: {
        ];
        description = "Set of elements sorted by a different data type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "setdown" = callPackage
@@ -179965,7 +177394,6 @@ self: {
        homepage = "https://github.com/scvalex/sexp";
        description = "S-Expression parsing/printing made fun and easy";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sexp-grammar" = callPackage
@@ -179988,7 +177416,6 @@ self: {
        homepage = "https://github.com/esmolanka/sexp-grammar";
        description = "Invertible parsers for S-expressions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sexp-show" = callPackage
@@ -180022,7 +177449,6 @@ self: {
        executableHaskellDepends = [ QuickCheck random ];
        description = "S-expression printer and parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sext" = callPackage
@@ -180048,7 +177474,6 @@ self: {
        homepage = "http://patch-tag.com/r/shahn/sfml-audio";
        description = "minimal bindings to the audio module of sfml";
        license = "unknown";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) libsndfile; inherit (pkgs) openal;};
 
   "sfmt" = callPackage
@@ -180111,7 +177536,6 @@ self: {
        homepage = "http://blog.malde.org/";
        description = "Sgrep - grep Fasta files for sequences matching a regular expression";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sha-streams" = callPackage
@@ -180150,7 +177574,6 @@ self: {
        homepage = "http://github.com/karun012/shadower";
        description = "An automated way to run doctests in files that are changing";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shadowsocks" = callPackage
@@ -180194,7 +177617,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/shady";
        description = "Functional GPU programming - DSEL & compiler";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shady-graphics" = callPackage
@@ -180213,7 +177635,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/shady";
        description = "Functional GPU programming - DSEL & compiler";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shake_0_14_2" = callPackage
@@ -180458,7 +177879,6 @@ self: {
        homepage = "http://thoughtpolice.github.com/shake-extras";
        description = "Extra utilities for shake build systems";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shake-language-c_0_6_3" = callPackage
@@ -180653,7 +178073,6 @@ self: {
        homepage = "http://github.com/bonnefoa/Shaker";
        description = "simple and interactive command-line build tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shakespeare_2_0_2_1" = callPackage
@@ -181000,7 +178419,6 @@ self: {
        homepage = "http://github.com/jberryman/shapely-data";
        description = "Generics using @(,)@ and @Either@, with algebraic operations and typed conversions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sharc-timbre" = callPackage
@@ -181011,7 +178429,7 @@ self: {
        sha256 = "cbdedf5c24664d362be1b4a285c4c0021c17126e9a9562c17f23eb174249184d";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/anton-k/sharc";
-       description = "Sandell Harmonic Archive. A collection of stable phases for all instruments in the orchestra";
+       description = "Sandell Harmonic Archive. A collection of stable phases for all instruments in the orchestra.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -181032,7 +178450,6 @@ self: {
        jailbreak = true;
        description = "A circular buffer built on shared memory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shared-fields" = callPackage
@@ -181090,7 +178507,6 @@ self: {
        homepage = "http://personal.cis.strath.ac.uk/~conor/pub/she";
        description = "A Haskell preprocessor adding miscellaneous features";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shelduck" = callPackage
@@ -181226,7 +178642,6 @@ self: {
        homepage = "http://gnu.rtin.bz/directory/devel/prog/other/shell-haskell.html";
        description = "Pipe streams through external shell commands";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shellish" = callPackage
@@ -181244,7 +178659,6 @@ self: {
        homepage = "http://repos.mornfall.net/shellish";
        description = "shell-/perl- like (systems) programming in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shellmate" = callPackage
@@ -181660,7 +179074,6 @@ self: {
        jailbreak = true;
        description = "A simple gtk based Russian Roulette game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shpider" = callPackage
@@ -181678,7 +179091,6 @@ self: {
        homepage = "http://github.com/ozataman/shpider";
        description = "Web automation library in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "shplit" = callPackage
@@ -181761,7 +179173,6 @@ self: {
        homepage = "http://mypage.iu.edu/~gdweber/software/sifflet/";
        description = "A simple, visual, functional programming language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sifflet-lib" = callPackage
@@ -181781,7 +179192,6 @@ self: {
        homepage = "http://mypage.iu.edu/~gdweber/software/sifflet/";
        description = "Library of modules shared by sifflet and its tests and its exporters";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {gdk_x11 = null; gtk_x11 = null;};
 
   "sign" = callPackage
@@ -181833,7 +179243,6 @@ self: {
        ];
        description = "Synchronous signal processing for DSLs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "signed-multiset" = callPackage
@@ -181886,7 +179295,6 @@ self: {
        homepage = "http://github.com/mikeizbicki/simd";
        description = "simple interface to GHC's SIMD instructions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simgi" = callPackage
@@ -181906,7 +179314,6 @@ self: {
        homepage = "http://simgi.sourceforge.net/";
        description = "stochastic simulation engine";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple" = callPackage
@@ -181941,7 +179348,6 @@ self: {
        homepage = "http://simple.cx";
        description = "A minimalist web framework for the WAI server interface";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-actors" = callPackage
@@ -181982,7 +179388,6 @@ self: {
        librarySystemDepends = [ bluetooth ];
        description = "Simple Bluetooth API for Windows and Linux (bluez)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {bluetooth = null;};
 
   "simple-c-value" = callPackage
@@ -182006,7 +179411,6 @@ self: {
        homepage = "https://github.com/jfischoff/simple-c-value";
        description = "A simple C value type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-conduit" = callPackage
@@ -182030,7 +179434,6 @@ self: {
        homepage = "http://github.com/jwiegley/simple-conduit";
        description = "A simple streaming I/O library based on monadic folds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-config" = callPackage
@@ -182064,7 +179467,6 @@ self: {
        ];
        description = "simple binding of css and html";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-eval" = callPackage
@@ -182093,7 +179495,6 @@ self: {
        homepage = "https://github.com/aleator/simple-firewire";
        description = "Simplified interface for firewire cameras";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-form" = callPackage
@@ -182111,7 +179512,6 @@ self: {
        homepage = "https://github.com/singpolyma/simple-form-haskell";
        description = "Forms that configure themselves based on type";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-genetic-algorithm" = callPackage
@@ -182207,7 +179607,6 @@ self: {
        homepage = "http://github.com/mvoidex/simple-log-syslog";
        description = "Syslog backend for simple-log";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-neural-networks" = callPackage
@@ -182280,7 +179679,6 @@ self: {
        ];
        description = "Simplified Pascal language to SSVM compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-pipe" = callPackage
@@ -182316,7 +179714,6 @@ self: {
        homepage = "http://simple.cx";
        description = "Connector package for integrating postgresql-orm with the Simple web framework";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-reflect" = callPackage
@@ -182432,7 +179829,6 @@ self: {
        homepage = "http://simple.cx";
        description = "Cookie-based session management for the Simple web framework";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-sessions" = callPackage
@@ -182526,7 +179922,6 @@ self: {
        homepage = "http://simple.cx";
        description = "A basic template language for the Simple web framework";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simple-vec3" = callPackage
@@ -182540,7 +179935,6 @@ self: {
        homepage = "http://github.com/dzhus/simple-vec3/";
        description = "Three-dimensional vectors of doubles with basic operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simpleargs" = callPackage
@@ -182570,7 +179964,6 @@ self: {
        homepage = "http://github.com/dom96/SimpleIRC";
        description = "Simple IRC Library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simpleirc-lens" = callPackage
@@ -182583,7 +179976,6 @@ self: {
        homepage = "https://github.com/relrod/simpleirc-lens";
        description = "Lenses for simpleirc types";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simplenote" = callPackage
@@ -182600,7 +179992,6 @@ self: {
        ];
        description = "Haskell interface for the simplenote API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simpleprelude" = callPackage
@@ -182620,7 +180011,6 @@ self: {
        jailbreak = true;
        description = "A simplified Haskell prelude for teaching";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simplesmtpclient" = callPackage
@@ -182647,7 +180037,6 @@ self: {
        homepage = "http://hub.darcs.net/thoferon/simplessh";
        description = "Simple wrapper around libssh2";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {ssh2 = null;};
 
   "simplest-sqlite" = callPackage
@@ -182716,7 +180105,6 @@ self: {
        homepage = "http://malde.org/~ketil/";
        description = "Simulate sequencing with different models for priming and errors";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "simtreelo" = callPackage
@@ -182757,7 +180145,6 @@ self: {
        homepage = "http://sigkill.dk/programs/sindre";
        description = "A programming language for simple GUIs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libXft;};
 
   "singleton-nats" = callPackage
@@ -182924,7 +180311,6 @@ self: {
        ];
        description = "Sirkel, a Chord DHT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sitemap" = callPackage
@@ -182954,7 +180340,6 @@ self: {
        jailbreak = true;
        description = "Sized sequence data-types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sized-types" = callPackage
@@ -183053,7 +180438,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/meteficha/skein";
-       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well";
+       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -183076,7 +180461,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/meteficha/skein";
-       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well";
+       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -183097,7 +180482,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/meteficha/skein";
-       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well";
+       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -183118,7 +180503,7 @@ self: {
        ];
        doCheck = false;
        homepage = "https://github.com/meteficha/skein";
-       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well";
+       description = "Skein, a family of cryptographic hash functions. Includes Skein-MAC as well.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -183138,7 +180523,6 @@ self: {
        ];
        description = "a tool to access the OSX keychain";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "skeletons" = callPackage
@@ -183194,7 +180578,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "https://github.com/nyorem/skemmtun";
-       description = "A MyAnimeList.net client";
+       description = "A MyAnimeList.net client.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -183214,7 +180598,6 @@ self: {
        homepage = "https://github.com/emonkak/haskell-skype";
        description = "Skype Desktop API binding for Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "skypelogexport" = callPackage
@@ -183254,7 +180637,6 @@ self: {
        jailbreak = true;
        description = "Haskell API for interacting with Slack";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "slack-api" = callPackage
@@ -183452,7 +180834,6 @@ self: {
        ];
        description = "ws convert markdown to reveal-js";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sloane" = callPackage
@@ -183505,7 +180886,6 @@ self: {
        libraryHaskellDepends = [ base mtl process ];
        description = "Testing for minimal strictness";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "slug_0_1_1" = callPackage
@@ -183560,7 +180940,6 @@ self: {
        homepage = "http://community.haskell.org/~aslatter/code/bytearray";
        description = "low-level unboxed arrays, with minimal features";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smallcaps" = callPackage
@@ -183657,7 +181036,6 @@ self: {
        homepage = "http://github.com/noteed/smallpt-hs";
        description = "A Haskell port of the smallpt path tracer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smallstring" = callPackage
@@ -183675,7 +181053,6 @@ self: {
        homepage = "http://community.haskell.org/~aslatter/code/smallstring/";
        description = "A Unicode text type, optimized for low memory overhead";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smaoin" = callPackage
@@ -183706,7 +181083,6 @@ self: {
        homepage = "http://patch-tag.com/r/salazar/smartGroup";
        description = "group strings or bytestrings by words in common";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smartcheck" = callPackage
@@ -183756,7 +181132,6 @@ self: {
        homepage = "http://kyagrd.dyndns.org/~kyagrd/project/smartword/";
        description = "Web based flash card for Word Smart I and II vocabularies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sme" = callPackage
@@ -183768,7 +181143,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "A library for Secure Multi-Execution in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smoothie_0_1_3" = callPackage
@@ -183865,7 +181239,6 @@ self: {
        homepage = "http://tomahawkins.org";
        description = "Parsing and printing SMT-LIB";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smtLib" = callPackage
@@ -183935,7 +181308,6 @@ self: {
        homepage = "https://github.com/avieth/smtp-mail-ng";
        description = "An SMTP client EDSL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smtp2mta" = callPackage
@@ -183950,7 +181322,6 @@ self: {
        homepage = "https://github.com/singpolyma/sock2stream";
        description = "Listen for SMTP traffic and send it to an MTA script";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "smtps-gmail" = callPackage
@@ -183981,7 +181352,6 @@ self: {
        libraryHaskellDepends = [ base GLUT OpenGL random ];
        description = "Snake Game Using OpenGL";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap_0_13_3_2" = callPackage
@@ -184205,8 +181575,8 @@ self: {
        pname = "snap";
        version = "0.14.0.6";
        sha256 = "fa9ffc7bf5c6729f7e204daecd50765a220a0ffc2feaf3f6b29977370d8db617";
-       revision = "3";
-       editedCabalFile = "a1c4d4668cc563516ac38acfe5b869eeff5cf98042d960593ab08e1ded09fe1d";
+       revision = "4";
+       editedCabalFile = "52c349a0739869a38a84ebe6822552cca4a8edb90bb9fb3b4848c19bd8b608f9";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -184237,7 +181607,6 @@ self: {
        homepage = "http://github.com/zimothy/snap-accept";
        description = "Accept header branching for the Snap web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-app" = callPackage
@@ -184526,7 +181895,6 @@ self: {
        ];
        description = "A collection of useful helpers and utilities for Snap web applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-language" = callPackage
@@ -184599,7 +181967,6 @@ self: {
        ];
        description = "Declarative routing for Snap";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-server_0_9_4_5" = callPackage
@@ -184729,7 +182096,6 @@ self: {
        homepage = "https://github.com/dbp/snap-testing";
        description = "A library for BDD-style testing with the Snap Web Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-utils" = callPackage
@@ -184748,7 +182114,6 @@ self: {
        homepage = "https://github.com/LukeHoersten/snap-utils";
        description = "Snap Framework utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snap-web-routes" = callPackage
@@ -184805,7 +182170,6 @@ self: {
        homepage = "https://github.com/soostone/snaplet-actionlog";
        description = "Generic action log snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-amqp" = callPackage
@@ -184880,7 +182244,6 @@ self: {
        homepage = "https://github.com/zmthy/snaplet-css-min";
        description = "A Snaplet for CSS minification";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-environments" = callPackage
@@ -184898,7 +182261,6 @@ self: {
        jailbreak = true;
        description = "DEPRECATED! You should use standard Snap >= 0.9 \"environments\" functionality. It provided ability to easly read configuration based on given app environment given at command line, envs are defined in app configuration file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-fay_0_3_3_8" = callPackage
@@ -185055,7 +182417,6 @@ self: {
        homepage = "https://github.com/mikeplus64/snaplet-hasql";
        description = "A Hasql snaplet";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-haxl" = callPackage
@@ -185073,7 +182434,6 @@ self: {
        homepage = "https://github.com/ChristopherBiscardi/snaplet-haxl";
        description = "Snaplet for Facebook's Haxl";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-hdbc" = callPackage
@@ -185096,7 +182456,6 @@ self: {
        homepage = "http://norm2782.com/";
        description = "HDBC snaplet for Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-hslogger" = callPackage
@@ -185138,7 +182497,6 @@ self: {
        homepage = "https://github.com/HaskellCNOrg/snaplet-i18n";
        description = "snaplet-i18n";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-influxdb" = callPackage
@@ -185158,7 +182516,6 @@ self: {
        homepage = "https://github.com/ixmatus/snaplet-influxdb";
        description = "Snap framework snaplet for the InfluxDB library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-lss" = callPackage
@@ -185214,7 +182571,6 @@ self: {
        jailbreak = true;
        description = "Snap Framework MongoDB support as Snaplet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-mongodb-minimalistic" = callPackage
@@ -185231,7 +182587,6 @@ self: {
        homepage = "https://github.com/Palmik/snaplet-mongodb-minimalistic";
        description = "Minimalistic MongoDB Snaplet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-mysql-simple" = callPackage
@@ -185253,7 +182608,6 @@ self: {
        homepage = "https://github.com/ibotty/snaplet-mysql-simple";
        description = "mysql-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-oauth" = callPackage
@@ -185281,7 +182635,6 @@ self: {
        homepage = "https://github.com/HaskellCNOrg/snaplet-oauth";
        description = "snaplet-oauth";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-persistent" = callPackage
@@ -185416,7 +182769,6 @@ self: {
        homepage = "https://github.com/dzhus/snaplet-redson/";
        description = "CRUD for JSON data with Redis storage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-rest" = callPackage
@@ -185436,7 +182788,6 @@ self: {
        homepage = "http://github.com/zimothy/snaplet-rest";
        description = "REST resources for the Snap web framework";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-riak" = callPackage
@@ -185488,9 +182839,8 @@ self: {
          sednaDBXML snap
        ];
        jailbreak = true;
-       description = "Snaplet for Sedna Bindings. Essentailly a rip of snaplet-hdbc";
+       description = "Snaplet for Sedna Bindings. Essentailly a rip of snaplet-hdbc.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-ses-html" = callPackage
@@ -185536,7 +182886,6 @@ self: {
        homepage = "https://github.com/nurpax/snaplet-sqlite-simple";
        description = "sqlite-simple snaplet for the Snap Framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-stripe" = callPackage
@@ -185573,7 +182922,6 @@ self: {
        jailbreak = true;
        description = "Snaplet for Snap Framework enabling developers to administrative tasks akin to Rake tasks from Ruby On Rails framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-typed-sessions" = callPackage
@@ -185592,7 +182940,6 @@ self: {
        jailbreak = true;
        description = "Typed session snaplets and continuation-based programming for the Snap web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snaplet-wordpress" = callPackage
@@ -185620,7 +182967,6 @@ self: {
        homepage = "https://github.com/dbp/snaplet-wordpress";
        description = "A snaplet that communicates with wordpress over its api";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snappy" = callPackage
@@ -185640,7 +182986,6 @@ self: {
        homepage = "http://github.com/bos/snappy";
        description = "Bindings to the Google Snappy library for fast compression/decompression";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) snappy;};
 
   "snappy-conduit" = callPackage
@@ -185654,7 +182999,6 @@ self: {
        homepage = "http://github.com/tatac1/snappy-conduit/";
        description = "Conduit bindings for Snappy (see snappy package)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "snappy-framing" = callPackage
@@ -185667,7 +183011,6 @@ self: {
        homepage = "https://github.com/kim/snappy-framing";
        description = "Snappy Framing Format in Haskell";
        license = "unknown";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "snappy-iteratee" = callPackage
@@ -185681,7 +183024,6 @@ self: {
        homepage = "http://github.com/iand675/snappy-iteratee";
        description = "An enumeratee that uses Google's snappy compression library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sndfile-enumerators" = callPackage
@@ -185702,7 +183044,6 @@ self: {
        homepage = "http://www.tiresiaspress.us/haskell/sndfile-enumerators";
        description = "Audio file reading/writing";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sneakyterm" = callPackage
@@ -185767,7 +183108,6 @@ self: {
        homepage = "http://github.com/elginer/snm";
        description = "The Simple Nice-Looking Manual Generator";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snmp_0_2_0_0" = callPackage
@@ -185819,7 +183159,6 @@ self: {
        homepage = "http://github.com/nfjinjing/snow-white";
        description = "encode any binary instance to white space";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "snowball" = callPackage
@@ -185848,7 +183187,7 @@ self: {
        version = "0.1.1.1";
        sha256 = "f156ca321ae17033fe1cbe7e676fea403136198e1c3a132924a080cd3145cddd";
        libraryHaskellDepends = [ base time ];
-       description = "A loose port of Twitter Snowflake to Haskell. Generates arbitrary precision, unique, time-sortable identifiers";
+       description = "A loose port of Twitter Snowflake to Haskell. Generates arbitrary precision, unique, time-sortable identifiers.";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -185869,7 +183208,6 @@ self: {
        homepage = "http://code.mathr.co.uk/snowglobe";
        description = "randomized fractal snowflakes demo";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "soap_0_2_2_5" = callPackage
@@ -185972,7 +183310,6 @@ self: {
        homepage = "https://github.com/singpolyma/sock2stream";
        description = "Tunnel a socket over a single datastream (stdin/stdout)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sockaddr" = callPackage
@@ -186073,7 +183410,6 @@ self: {
        homepage = "https://github.com/lpeterse/haskell-socket-sctp";
        description = "STCP socket extensions library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {sctp = null;};
 
   "socketio" = callPackage
@@ -186103,7 +183439,6 @@ self: {
        jailbreak = true;
        description = "Socket.IO server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "socketson" = callPackage
@@ -186200,7 +183535,6 @@ self: {
        homepage = "http://darcs.k-hornz.de/cgi-bin/darcsweb.cgi?r=sonic-visualiser;a=summary";
        description = "Sonic Visualiser";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sophia" = callPackage
@@ -186246,7 +183580,6 @@ self: {
        jailbreak = true;
        description = "Efficient, type-safe sorted sequences";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sorted-list" = callPackage
@@ -186308,7 +183641,6 @@ self: {
        jailbreak = true;
        description = "Approximate a song from other pieces of sound";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sounddelay" = callPackage
@@ -186346,7 +183678,6 @@ self: {
        homepage = "http://github.com/nfjinjing/source-code-server";
        description = "The server backend for the source code iPhone app";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sourcemap_0_1_3_0" = callPackage
@@ -186408,7 +183739,6 @@ self: {
        homepage = "https://github.com/msiegenthaler/SouSiT";
        description = "Source/Sink/Transform: An alternative to lazy IO and iteratees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sox" = callPackage
@@ -186448,7 +183778,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Sox";
        description = "Write, read, convert audio signals using libsox";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) sox;};
 
   "soyuz" = callPackage
@@ -186468,7 +183797,6 @@ self: {
        homepage = "https://github.com/amtal/0x10c";
        description = "DCPU-16 architecture utilities for Notch's 0x10c game";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spacefill" = callPackage
@@ -186493,7 +183821,7 @@ self: {
        libraryHaskellDepends = [ base vector-space ];
        jailbreak = true;
        homepage = "http://code.haskell.org/data-spacepart";
-       description = "Space partition data structures. Currently only a QuadTree";
+       description = "Space partition data structures. Currently only a QuadTree.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -186532,7 +183860,6 @@ self: {
        homepage = "https://github.com/vtan/spanout";
        description = "A breakout clone written in netwire and gloss";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sparse" = callPackage
@@ -186560,7 +183887,6 @@ self: {
        homepage = "http://github.com/ekmett/sparse";
        description = "A playground of sparse linear algebra primitives using Morton ordering";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sparse-lin-alg" = callPackage
@@ -186591,7 +183917,6 @@ self: {
        homepage = "http://kyagrd.dyndns.org/wiki/SparseBitmapsForPatternMatchCoverage";
        description = "Sparse bitmaps for pattern match coverage";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sparsecheck" = callPackage
@@ -186604,7 +183929,6 @@ self: {
        homepage = "http://www.cs.york.ac.uk/~mfn/sparsecheck/";
        description = "A Logic Programming Library for Test-Data Generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sparser" = callPackage
@@ -186632,7 +183956,6 @@ self: {
        homepage = "http://github.com/nfjinjing/spata";
        description = "brainless form validation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spatial-math" = callPackage
@@ -186718,7 +184041,6 @@ self: {
        jailbreak = true;
        description = "Control.Applicative, Data.Foldable, Data.Traversable (compatibility package)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "special-keys" = callPackage
@@ -186763,7 +184085,6 @@ self: {
        homepage = "https://github.com/jfischoff/specialize-th";
        description = "Create specialized types from polymorphic ones using TH";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "species" = callPackage
@@ -186830,7 +184151,7 @@ self: {
        libraryHaskellDepends = [ speculation ];
        doHaddock = false;
        homepage = "http://github.com/ekmett/speculation/";
-       description = "Merged into 'speculation'. Use that instead";
+       description = "Merged into 'speculation'. Use that instead.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -186887,7 +184208,6 @@ self: {
        jailbreak = true;
        description = "Orbotix Sphero client library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sphinx" = callPackage
@@ -186918,7 +184238,6 @@ self: {
        executableHaskellDepends = [ base sphinx ];
        description = "Sphinx CLI and demo of Haskell Sphinx library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spice" = callPackage
@@ -186937,7 +184256,6 @@ self: {
        homepage = "http://github.com/crockeo/spice";
        description = "An FRP-based game engine written in Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "spike" = callPackage
@@ -186960,7 +184278,6 @@ self: {
        homepage = "http://github.com/Tener/spike";
        description = "Experimental web browser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome) libsoup;};
 
   "spine" = callPackage
@@ -187014,7 +184331,6 @@ self: {
        homepage = "http://github.com/JohnLato/splaytree";
        description = "Provides an annotated splay tree";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "splice" = callPackage
@@ -187052,7 +184368,6 @@ self: {
        homepage = "http://michael.orlitzky.com/code/spline3.php";
        description = "A parallel implementation of the Sorokina/Zeilfelder spline scheme";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "splines" = callPackage
@@ -187072,7 +184387,6 @@ self: {
        ];
        description = "B-Splines, other splines, and NURBS";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "split_0_1_4_3" = callPackage
@@ -187123,7 +184437,7 @@ self: {
        version = "0.2.0.1";
        sha256 = "53ed4e9f68972b1d6db98b040b10e512a194d45c7734802adcaef9e2827c5a70";
        libraryHaskellDepends = [ base ];
-       description = "Control.Concurrent.Chan split into sending and receiving halves";
+       description = "Control.Concurrent.Chan split into sending and receiving halves.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -187144,7 +184458,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/split-record/";
        description = "Split a big audio file into pieces at positions of silence";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "split-tchan" = callPackage
@@ -187193,7 +184506,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Splot";
        description = "A tool for visualizing the lifecycle of many concurrent multi-staged processes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spool" = callPackage
@@ -187234,9 +184546,8 @@ self: {
          base directory extensible-exceptions filepath parsec
        ];
        homepage = "http://github.com/elginer/SpoonUtilities";
-       description = "Spoon's utilities. Simple testing and nice looking error reporting";
+       description = "Spoon's utilities. Simple testing and nice looking error reporting.";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spoty" = callPackage
@@ -187255,7 +184566,6 @@ self: {
        homepage = "https://github.com/davnils/spoty";
        description = "Spotify web API wrapper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spreadsheet" = callPackage
@@ -187304,7 +184614,6 @@ self: {
        homepage = "https://github.com/yanatan16/haskell-spsa";
        description = "Simultaneous Perturbation Stochastic Approximation Optimization Algorithm";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "spy" = callPackage
@@ -187331,7 +184640,6 @@ self: {
        homepage = "https://bitbucket.org/ssaasen/spy";
        description = "A compact file system watcher for Mac OS X, Linux and Windows";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sql-simple" = callPackage
@@ -187350,7 +184658,6 @@ self: {
        homepage = "https://github.com/philopon/sql-simple";
        description = "common middle-level sql client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sql-simple-mysql" = callPackage
@@ -187368,7 +184675,6 @@ self: {
        homepage = "https://github.com/philopon/sql-simple";
        description = "mysql backend for sql-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sql-simple-pool" = callPackage
@@ -187387,7 +184693,6 @@ self: {
        homepage = "https://github.com/philopon/sql-simple";
        description = "conection pool for sql-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sql-simple-postgresql" = callPackage
@@ -187405,7 +184710,6 @@ self: {
        homepage = "https://github.com/philopon/sql-simple";
        description = "postgresql backend for sql-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sql-simple-sqlite" = callPackage
@@ -187419,7 +184723,6 @@ self: {
        homepage = "https://github.com/philopon/sql-simple";
        description = "sqlite backend for sql-simple";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sql-words" = callPackage
@@ -187512,7 +184815,6 @@ self: {
        homepage = "https://github.com/tolysz/sqlite-simple-typed";
        description = "Typed extension to sqlite simple";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sqlvalue-list" = callPackage
@@ -187546,7 +184848,6 @@ self: {
        homepage = "http://functionalley.eu/Squeeze/squeeze.html";
        description = "A file-packing application";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sr-extra" = callPackage
@@ -187585,7 +184886,6 @@ self: {
        ];
        description = "Build and install Debian packages completely from source";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "srcloc_0_4_1" = callPackage
@@ -187671,7 +184971,6 @@ self: {
        homepage = "http://hub.darcs.net/ganesh/ssh";
        description = "A pure-Haskell SSH server library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sshd-lint" = callPackage
@@ -187742,7 +185041,6 @@ self: {
        homepage = "http://github.com/erudify/sssp/";
        description = "HTTP proxy for S3";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sstable" = callPackage
@@ -187761,7 +185059,6 @@ self: {
        executableHaskellDepends = [ cmdargs ];
        description = "SSTables in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ssv" = callPackage
@@ -187851,7 +185148,6 @@ self: {
        homepage = "https://github.com/tsuraan/stable-tree";
        description = "Trees whose branches are resistant to change";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack_0_1_3_0" = callPackage
@@ -188644,7 +185940,6 @@ self: {
        homepage = "http://github.com/rubik/stack-hpc-coveralls";
        description = "Initial project template from stack";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack-prism" = callPackage
@@ -188663,7 +185958,6 @@ self: {
        homepage = "https://github.com/MedeaMelana/stack-prism";
        description = "Stack prisms";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stack-run" = callPackage
@@ -188711,7 +186005,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
@@ -189150,7 +186443,6 @@ self: {
        homepage = "https://github.com/fpco/stackage";
        description = "Tools for curating Stackage bundles";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stackage-install_0_1_0_3" = callPackage
@@ -189527,7 +186819,6 @@ self: {
        homepage = "http://github.com/anttisalonen/starrover2";
        description = "Space simulation game";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stash" = callPackage
@@ -189617,7 +186908,6 @@ self: {
        libraryHaskellDepends = [ base MaybeT mtl ];
        description = "Typeclass instances for monad transformer stacks with an ST thread at the bottom";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stateref" = callPackage
@@ -189701,7 +186991,6 @@ self: {
        homepage = "http://github.com/brendanhay/statgrab";
        description = "Collect system level metrics and statistics";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {statgrab = null;};
 
   "static-canvas" = callPackage
@@ -189744,7 +187033,7 @@ self: {
          base directory hslogger HUnit MissingH mtl old-time syb
          test-framework test-framework-hunit test-framework-quickcheck2 time
        ];
-       description = "JavaScript and Css files concat for http optimization. Now with LESS support";
+       description = "JavaScript and Css files concat for http optimization. Now with LESS support.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -189824,7 +187113,6 @@ self: {
        ];
        description = "Functions for working with Dirichlet densities and mixtures on vectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "statistics-fusion" = callPackage
@@ -189837,7 +187125,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/statistics-fusion";
        description = "An implementation of high performance, minimal statistics functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "statistics-hypergeometric-genvar" = callPackage
@@ -189972,7 +187259,6 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "A wrapper around Sean Barrett's TrueType rasterizer library";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stdata" = callPackage
@@ -190068,7 +187354,6 @@ self: {
        homepage = "https://github.com/jonpetterbergman/step-function";
        description = "Step functions, staircase functions or piecewise constant functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stepwise" = callPackage
@@ -190080,7 +187365,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl ];
        homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stickyKeysHotKey" = callPackage
@@ -190203,7 +187487,6 @@ self: {
        homepage = "http://github.com/kholdstare/stm-chunked-queues/";
        description = "Chunked Communication Queues";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stm-conduit_2_5_2" = callPackage
@@ -190660,7 +187943,6 @@ self: {
        homepage = "http://sulzmann.blogspot.com/2008/12/stm-with-control-communication-for.html";
        description = "Control communication among retrying transactions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stomp-conduit" = callPackage
@@ -190741,7 +188023,6 @@ self: {
        homepage = "https://github.com/debug-ito/stopwatch";
        description = "A simple stopwatch utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "storable" = callPackage
@@ -190818,7 +188099,6 @@ self: {
        jailbreak = true;
        description = "Statically-sized array wrappers with Storable instances for FFI marshaling";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "storable-tuple" = callPackage
@@ -190853,7 +188133,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Storable_Vector";
        description = "Fast, packed, strict storable arrays with a list interface like ByteString";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "storablevector-carray" = callPackage
@@ -190866,7 +188145,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Storable_Vector";
        description = "Conversion between storablevector and carray";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "storablevector-streamfusion" = callPackage
@@ -190889,7 +188167,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Storable_Vector";
        description = "Conversion between storablevector and stream-fusion lists with fusion";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "str" = callPackage
@@ -190928,7 +188205,6 @@ self: {
        ];
        description = "Client for Stratum protocol";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stream-fusion" = callPackage
@@ -190941,7 +188217,6 @@ self: {
        homepage = "http://hackage.haskell.org/trac/ghc/ticket/915";
        description = "Faster Haskell lists using stream fusion";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stream-monad" = callPackage
@@ -190977,7 +188252,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/MIDI";
        description = "Programmatically edit MIDI event streams via ALSA";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "streaming" = callPackage
@@ -191374,7 +188648,6 @@ self: {
        homepage = "https://github.com/michaelt/streaming-utils";
        description = "http, attoparsec, pipes and conduit utilities for the streaming libraries";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "streaming-wai" = callPackage
@@ -191502,7 +188775,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/strict-concurrency";
        description = "Strict concurrency abstractions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "strict-ghc-plugin" = callPackage
@@ -191744,7 +189016,6 @@ self: {
        homepage = "https://github.com/selectel/stringlike";
        description = "Transformations to several string-like types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stringprep" = callPackage
@@ -192000,7 +189271,6 @@ self: {
        jailbreak = true;
        description = "Structured MongoDB interface";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "structures" = callPackage
@@ -192029,7 +189299,6 @@ self: {
        homepage = "http://github.com/ekmett/structures";
        description = "\"Advanced\" Data Structures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stunclient" = callPackage
@@ -192073,7 +189342,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/LambdaCubeEngine";
        description = "A revival of the classic game Stunts (LambdaCube tech demo)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "stylish-haskell_0_5_11_0" = callPackage
@@ -192354,7 +189622,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "stylish-haskell" = callPackage
+  "stylish-haskell_0_5_15_1" = callPackage
     ({ mkDerivation, aeson, base, bytestring, cmdargs, containers
      , directory, filepath, haskell-src-exts, HUnit, mtl, strict, syb
      , test-framework, test-framework-hunit, yaml
@@ -192381,6 +189649,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, cmdargs, containers
+     , directory, filepath, haskell-src-exts, HUnit, mtl, strict, syb
+     , test-framework, test-framework-hunit, yaml
+     }:
+     mkDerivation {
+       pname = "stylish-haskell";
+       version = "0.5.15.2";
+       sha256 = "cf391b582b00aa392a89c15e7542a43ad694661d00500356aa818fac84ebe759";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory filepath
+         haskell-src-exts mtl syb yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring cmdargs containers directory filepath
+         haskell-src-exts mtl strict syb yaml
+       ];
+       testHaskellDepends = [
+         aeson base bytestring cmdargs 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
@@ -192411,7 +189709,6 @@ self: {
        ];
        description = "Get the total, put a single element";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "subhask" = callPackage
@@ -192438,7 +189735,6 @@ self: {
        homepage = "http://github.com/mikeizbicki/subhask";
        description = "Type safe interface for programming in subcategories of Hask";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "subleq-toolchain" = callPackage
@@ -192461,7 +189757,6 @@ self: {
        jailbreak = true;
        description = "Toolchain of subleq computer";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "subnet" = callPackage
@@ -192604,7 +189899,6 @@ self: {
        libraryHaskellDepends = [ base containers ];
        description = "Abstract over the constraints on the parameters to type constructors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sump" = callPackage
@@ -192652,7 +189946,6 @@ self: {
        homepage = "http://www.github.com/massysett/sunlight";
        description = "Test Cabalized package against multiple dependency versions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sunroof-compiler" = callPackage
@@ -192672,7 +189965,6 @@ self: {
        homepage = "https://github.com/ku-fpg/sunroof-compiler";
        description = "Monadic Javascript Compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sunroof-examples" = callPackage
@@ -192695,7 +189987,6 @@ self: {
        homepage = "https://github.com/ku-fpg/sunroof-examples";
        description = "Tests for Sunroof";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sunroof-server" = callPackage
@@ -192719,29 +190010,30 @@ self: {
        homepage = "https://github.com/ku-fpg/sunroof-server";
        description = "Monadic Javascript Compiler - Server Utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "super-user-spark" = callPackage
-    ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring
-     , directory, filepath, HTF, HUnit, mtl, optparse-applicative
-     , parsec, process, shelly, text, transformers, unix, zlib
+    ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory
+     , filepath, hspec, hspec-core, HUnit, mtl, optparse-applicative
+     , parsec, process, pureMD5, QuickCheck, shelly, text, transformers
+     , unix
      }:
      mkDerivation {
        pname = "super-user-spark";
-       version = "0.2.0.3";
-       sha256 = "0fa3189dcf517a50abab5b83eee5d706ea13cbaaa780e6d14fb38679d924beb7";
-       isLibrary = false;
+       version = "0.3.0.0";
+       sha256 = "772a27569ab8d2bf00c67b2ab07581cd135ee2a5e129fbf9a46ff2e1a222269e";
+       isLibrary = true;
        isExecutable = true;
-       executableHaskellDepends = [
-         aeson aeson-pretty base binary bytestring directory filepath HTF
-         mtl optparse-applicative parsec process shelly text transformers
-         unix zlib
+       libraryHaskellDepends = [
+         aeson aeson-pretty base bytestring directory filepath mtl
+         optparse-applicative parsec process pureMD5 shelly text
+         transformers unix
        ];
+       executableHaskellDepends = [ base ];
        testHaskellDepends = [
-         aeson aeson-pretty base binary bytestring directory filepath HTF
-         HUnit mtl optparse-applicative parsec process shelly text
-         transformers unix zlib
+         aeson aeson-pretty base bytestring directory filepath hspec
+         hspec-core HUnit mtl optparse-applicative parsec process pureMD5
+         QuickCheck shelly text transformers unix
        ];
        jailbreak = true;
        description = "Configure your dotfile deployment with a DSL";
@@ -192788,7 +190080,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/SuperCollider";
        description = "Demonstrate how to control SuperCollider via ALSA-MIDI";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "superdoc" = callPackage
@@ -192808,7 +190099,6 @@ self: {
        homepage = "http://www.mathstat.dal.ca/~selinger/superdoc/";
        description = "Additional documentation markup and Unicode support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "supero" = callPackage
@@ -192829,7 +190119,6 @@ self: {
        homepage = "http://community.haskell.org/~ndm/supero/";
        description = "A Supercompiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "supervisor" = callPackage
@@ -192844,7 +190133,6 @@ self: {
        homepage = "http://github.com/agocorona/supervisor";
        description = "Control an internal monad execution for trace generation, backtrakcking, testing and other purposes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "suspend" = callPackage
@@ -192982,7 +190270,6 @@ self: {
        homepage = "http://www.informatik.uni-kiel.de/~jgr/svg2q";
        description = "Code generation tool for Quartz code from a SVG";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "svgcairo" = callPackage
@@ -193057,7 +190344,6 @@ self: {
        homepage = "http://github.com/aleator/Simple-SVM";
        description = "Medium level, simplified, bindings to libsvm";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "svndump" = callPackage
@@ -193077,7 +190363,6 @@ self: {
        homepage = "http://github.com/jwiegley/svndump/";
        description = "Library for reading Subversion dump files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swagger" = callPackage
@@ -193187,7 +190472,6 @@ self: {
        homepage = "http://github.com/roman-smrz/swapper/";
        description = "Transparently swapping data from in-memory structures to disk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) tokyocabinet;};
 
   "swearjure" = callPackage
@@ -193209,7 +190493,6 @@ self: {
        homepage = "http://www.swearjure.com";
        description = "Clojure without alphanumerics";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swf" = callPackage
@@ -193222,7 +190505,6 @@ self: {
        homepage = "http://www.n-heptane.com/nhlab";
        description = "A library for creating Shockwave Flash (SWF) files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swift-lda" = callPackage
@@ -193239,7 +190521,6 @@ self: {
        homepage = "https://bitbucket.org/gchrupala/colada";
        description = "Online sampler for Latent Dirichlet Allocation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "swish" = callPackage
@@ -193288,7 +190569,6 @@ self: {
        jailbreak = true;
        description = "A simple web server for serving directories, similar to weborf";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syb_0_4_2" = callPackage
@@ -193372,7 +190652,6 @@ self: {
        homepage = "http://github.com/ekmett/syb-extras/";
        description = "Higher order versions of the Scrap Your Boilerplate classes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syb-with-class_0_6_1_5" = callPackage
@@ -193445,7 +190724,6 @@ self: {
        homepage = "https://github.com/lfairy/sylvia";
        description = "Lambda calculus visualization";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sym" = callPackage
@@ -193473,7 +190751,6 @@ self: {
        homepage = "http://github.com/akc/sym-plot";
        description = "Plot permutations; an addition to the sym package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "symbol" = callPackage
@@ -193499,7 +190776,6 @@ self: {
        libraryHaskellDepends = [ base stm ];
        description = "A fast implementation of synchronous channels with a CML-like API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sync-mht" = callPackage
@@ -193574,7 +190850,6 @@ self: {
        homepage = "https://github.com/jetho/syncthing-hs";
        description = "Haskell bindings for the Syncthing REST API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synt" = callPackage
@@ -193611,8 +190886,8 @@ self: {
      }:
      mkDerivation {
        pname = "syntactic";
-       version = "3.4";
-       sha256 = "93490ba1c33c4580187f6bf739ce43bae9dce3abee539deffc6d351769111a6e";
+       version = "3.5";
+       sha256 = "6bb80992cee979b5c15f57c0f92aef6fedc76e510e39ba399fbc43bbc1ef9eb9";
        libraryHaskellDepends = [
          base constraints containers data-hash deepseq mtl syb
          template-haskell tree-view
@@ -193624,7 +190899,6 @@ self: {
        homepage = "https://github.com/emilaxelsson/syntactic";
        description = "Generic representation and manipulation of abstract syntax";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "syntactical" = callPackage
@@ -193653,7 +190927,6 @@ self: {
        ];
        description = "Reversible parsing and pretty-printing";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syntax-attoparsec" = callPackage
@@ -193669,7 +190942,6 @@ self: {
        ];
        description = "Syntax instances for Attoparsec";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syntax-example" = callPackage
@@ -193688,7 +190960,6 @@ self: {
        ];
        description = "Example application using syntax, a library for abstract syntax descriptions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syntax-example-json" = callPackage
@@ -193707,7 +190978,6 @@ self: {
        ];
        description = "Example JSON parser/pretty-printer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syntax-pretty" = callPackage
@@ -193722,7 +190992,6 @@ self: {
        ];
        description = "Syntax instance for pretty, the pretty printing library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syntax-printer" = callPackage
@@ -193740,7 +191009,6 @@ self: {
        jailbreak = true;
        description = "Text and ByteString printers for 'syntax'";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syntax-trees" = callPackage
@@ -193756,7 +191024,6 @@ self: {
        ];
        description = "Convert between different Haskell syntax trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "syntax-trees-fork-bairyn" = callPackage
@@ -193770,9 +191037,8 @@ self: {
        libraryHaskellDepends = [
          base haskell-src-exts hint mtl template-haskell uniplate
        ];
-       description = "Convert between different Haskell syntax trees. Bairyn's fork";
+       description = "Convert between different Haskell syntax trees. Bairyn's fork.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synthesizer" = callPackage
@@ -193798,7 +191064,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Audio signal processing coded in Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synthesizer-alsa" = callPackage
@@ -193823,7 +191088,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Control synthesizer effects via ALSA/MIDI";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synthesizer-core" = callPackage
@@ -193851,7 +191115,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Audio signal processing coded in Haskell: Low level part";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synthesizer-dimensional" = callPackage
@@ -193873,7 +191136,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Audio signal processing with static physical dimensions";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synthesizer-filter" = callPackage
@@ -193891,7 +191153,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Audio signal processing coded in Haskell: Filter networks";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synthesizer-inference" = callPackage
@@ -193942,7 +191203,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Efficient signal processing using runtime compilation";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "synthesizer-midi" = callPackage
@@ -193968,7 +191228,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Synthesizer";
        description = "Render audio signals from MIDI files or realtime messages";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "sys-auth-smbclient" = callPackage
@@ -194001,7 +191260,7 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/NICTA/sys-process";
-       description = "A replacement for System.Exit and System.Process";
+       description = "A replacement for System.Exit and System.Process.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -194067,7 +191326,6 @@ self: {
        homepage = "https://github.com/d12frosted/CanonicalPath";
        description = "Abstract data type for canonical paths with some utilities";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "system-command" = callPackage
@@ -194362,7 +191620,6 @@ self: {
        homepage = "https://github.com/jcristovao/system-lifted";
        description = "Lifted versions of System functions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "system-posix-redirect" = callPackage
@@ -194399,7 +191656,6 @@ self: {
        homepage = "https://github.com/wowus/system-random-effect";
        description = "Random number generation for extensible effects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "system-time-monotonic" = callPackage
@@ -194412,7 +191668,6 @@ self: {
        homepage = "https://github.com/joeyadams/haskell-system-time-monotonic";
        description = "Simple library for using the system's monotonic clock";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "system-util" = callPackage
@@ -194524,7 +191779,6 @@ self: {
        homepage = "not available";
        description = "Transito Abierto: convenience library when using Takusen and Oracle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "table" = callPackage
@@ -194596,7 +191850,6 @@ self: {
        homepage = "http://github.com/ekmett/tables/";
        description = "In-memory storage with multiple keys using lenses and traversals";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tablestorage" = callPackage
@@ -194617,7 +191870,6 @@ self: {
        homepage = "http://github.com/paf31/tablestorage";
        description = "Azure Table Storage REST API Wrapper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tabloid" = callPackage
@@ -194636,7 +191888,6 @@ self: {
        ];
        description = "View the output of shell commands in a table";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tabular_0_2_2_5" = callPackage
@@ -194841,7 +192092,6 @@ self: {
        jailbreak = true;
        description = "Lists tagged with a type-level natural number representing their length";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tagged-th" = callPackage
@@ -194856,7 +192106,6 @@ self: {
        jailbreak = true;
        description = "QuasiQuoter and Template Haskell splices for creating proxies at higher-kinds";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tagged-transformer" = callPackage
@@ -195090,7 +192339,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/tagsoup-ht/";
        description = "alternative parser for the tagsoup package";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tagsoup-parsec" = callPackage
@@ -195103,7 +192351,6 @@ self: {
        homepage = "http://www.killersmurf.com";
        description = "Tokenizes Tag, so [ Tag ] can be used as parser input";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tagstream-conduit" = callPackage
@@ -195157,7 +192404,6 @@ self: {
        homepage = "https://github.com/paulrzcz/takusen-oracle.git";
        description = "Database library with left-fold interface for Oracle";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {clntsh = null; sqlplus = null;};
 
   "tamarin-prover" = callPackage
@@ -195188,7 +192434,6 @@ self: {
        homepage = "http://www.infsec.ethz.ch/research/software/tamarin";
        description = "The Tamarin prover for security protocol analysis";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tamarin-prover-term" = callPackage
@@ -195209,7 +192454,6 @@ self: {
        homepage = "http://www.infsec.ethz.ch/research/software/tamarin";
        description = "Term manipulation library for the tamarin prover";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tamarin-prover-theory" = callPackage
@@ -195233,7 +192477,6 @@ self: {
        homepage = "http://www.infsec.ethz.ch/research/software/tamarin";
        description = "Term manipulation library for the tamarin prover";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tamarin-prover-utils" = callPackage
@@ -195253,7 +192496,6 @@ self: {
        homepage = "http://www.infsec.ethz.ch/research/software/tamarin";
        description = "Utility library for the tamarin prover";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tamper" = callPackage
@@ -195282,7 +192524,7 @@ self: {
          base bytestring directory filepath old-time time
        ];
        jailbreak = true;
-       description = "Reading, writing and manipulating \".tar\" archive files";
+       description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -195296,7 +192538,7 @@ self: {
        libraryHaskellDepends = [
          base bytestring directory filepath time
        ];
-       description = "Reading, writing and manipulating \".tar\" archive files";
+       description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -195319,7 +192561,7 @@ self: {
          tasty-quickcheck time
        ];
        jailbreak = true;
-       description = "Reading, writing and manipulating \".tar\" archive files";
+       description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -195343,7 +192585,7 @@ self: {
          QuickCheck tasty tasty-quickcheck time
        ];
        doCheck = false;
-       description = "Reading, writing and manipulating \".tar\" archive files";
+       description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -195364,7 +192606,7 @@ self: {
          array base bytestring bytestring-handle containers deepseq
          directory filepath QuickCheck tasty tasty-quickcheck time
        ];
-       description = "Reading, writing and manipulating \".tar\" archive files";
+       description = "Reading, writing and manipulating \".tar\" archive files.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -195430,7 +192672,6 @@ self: {
        jailbreak = true;
        description = "A command line tool for keeping track of tasks you worked on";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "taskpool" = callPackage
@@ -195825,7 +193066,6 @@ self: {
        jailbreak = true;
        description = "automated integration of QuickCheck properties into tasty suites";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tasty-kat_0_0_1" = callPackage
@@ -196172,7 +193412,6 @@ self: {
        homepage = "http://darcs.monoid.at/tbox";
        description = "Transactional variables and data structures with IO hooks";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tcache-AWS" = callPackage
@@ -196206,7 +193445,6 @@ self: {
        homepage = "http://bitcheese.net/wiki/code/tccli";
        description = "TokyoCabinet CLI interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tce-conf" = callPackage
@@ -196243,7 +193481,6 @@ self: {
        homepage = "http://www.cl.cam.ac.uk/~pes20/Netsem/";
        description = "A purely functional TCP implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tdd-util" = callPackage
@@ -196271,7 +193508,6 @@ self: {
        ];
        description = "Test framework wrapper";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tdoc" = callPackage
@@ -196299,7 +193535,6 @@ self: {
        libraryHaskellDepends = [ base containers fgl graphviz ];
        description = "Graphical modeling tools for sequential teams";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "teeth" = callPackage
@@ -196330,7 +193565,6 @@ self: {
        ];
        description = "Telegram API client";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "telegram-api" = callPackage
@@ -196350,7 +193584,6 @@ self: {
        homepage = "http://github.com/klappvisor/haskell-telegram-api#readme";
        description = "Telegram Bot API bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "teleport" = callPackage
@@ -196438,7 +193671,6 @@ self: {
        homepage = "https://github.com/haskell-pkg-janitors/template-default";
        description = "declaring Default instances just got even easier";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "template-haskell_2_10_0_0" = callPackage
@@ -196465,7 +193697,6 @@ self: {
        homepage = "https://github.com/HaskellZhangSong/TemplateHaskellUtils";
        description = "Some utilities for template Haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "template-hsml" = callPackage
@@ -196487,7 +193718,6 @@ self: {
        jailbreak = true;
        description = "Haskell's Simple Markup Language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "template-yj" = callPackage
@@ -196501,7 +193731,6 @@ self: {
        homepage = "https://github.com/YoshikuniJujo/template/wiki";
        description = "Process template file";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "templatepg" = callPackage
@@ -196556,7 +193785,6 @@ self: {
        homepage = "https://github.com/ixmatus/hs-tempodb";
        description = "A small Haskell wrapper around the TempoDB api";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "temporal-csound" = callPackage
@@ -196575,7 +193803,6 @@ self: {
        homepage = "https://github.com/anton-k/temporal-csound";
        description = "library to make electronic music, brings together temporal-music-notation and csound-expression packages";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "temporal-media" = callPackage
@@ -196719,7 +193946,6 @@ self: {
        jailbreak = true;
        description = "Interpreter for the FRP language Tempus";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tempus-fugit" = callPackage
@@ -196749,7 +193975,6 @@ self: {
        homepage = "http://noaxiom.org/tensor";
        description = "A completely type-safe library for linear algebra";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "term-rewriting" = callPackage
@@ -196769,7 +193994,6 @@ self: {
        homepage = "http://cl-informatik.uibk.ac.at/software/haskell-rewriting/";
        description = "Term Rewriting Library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "termbox-bindings" = callPackage
@@ -196786,7 +194010,6 @@ self: {
        homepage = "https://github.com/luciferous/termbox-bindings";
        description = "Bindings to the Termbox library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "terminal-progress-bar" = callPackage
@@ -196939,7 +194162,6 @@ self: {
        ];
        description = "a ternary library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "terrahs" = callPackage
@@ -196954,7 +194176,6 @@ self: {
        homepage = "http://lucc.ess.inpe.br/doku.php?id=terrahs";
        description = "A Haskell GIS Programming Environment";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {terralib4c = null; translib = null;};
 
   "tersmu" = callPackage
@@ -197053,7 +194274,6 @@ self: {
        jailbreak = true;
        description = "Test.Framework wrapper for DocTest";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-framework-golden" = callPackage
@@ -197132,7 +194352,6 @@ self: {
        homepage = "http://batterseapower.github.com/test-framework/";
        description = "QuickCheck support for the test-framework package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "test-framework-quickcheck2" = callPackage
@@ -197409,7 +194628,6 @@ self: {
        jailbreak = true;
        description = "Small test package";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "testing-feat" = callPackage
@@ -197455,7 +194673,6 @@ self: {
        homepage = "http://github.com/roman/testloop";
        description = "Quick feedback loop for test suites";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "testpack" = callPackage
@@ -197474,7 +194691,6 @@ self: {
        homepage = "https://github.com/jgoerzen/testpack";
        description = "Test Utililty Pack for HUnit and QuickCheck (unmaintained)";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "testpattern" = callPackage
@@ -197489,7 +194705,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/testpattern";
        description = "Display a monitor test pattern";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "testrunner" = callPackage
@@ -197504,7 +194719,6 @@ self: {
        ];
        description = "Easy unit test driver framework";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tetris" = callPackage
@@ -197519,7 +194733,6 @@ self: {
        homepage = "http://d.hatena.ne.jp/mokehehe/20080921/tetris";
        description = "A 2-D clone of Tetris";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tex2txt" = callPackage
@@ -197536,7 +194749,6 @@ self: {
        homepage = "http://textmining.lt/tex2txt/";
        description = "LaTeX to plain-text conversion";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "texmath_0_8" = callPackage
@@ -197810,7 +195022,6 @@ self: {
        ];
        description = "Functions for running Tex from Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text_1_1_1_3" = callPackage
@@ -197986,7 +195197,7 @@ self: {
          unordered-containers
        ];
        homepage = "https://github.com/andersjel/haskell-text-and-plots";
-       description = "EDSL to create HTML documents with plots based on the C3.js library";
+       description = "EDSL to create HTML documents with plots based on the C3.js library.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -198124,7 +195335,6 @@ self: {
        homepage = "http://github.com/finnsson/text-json-qq";
        description = "Json Quasiquatation for Haskell";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-latin1" = callPackage
@@ -198220,7 +195430,6 @@ self: {
        homepage = "https://github.com/joelteon/text-normal.git";
        description = "Unicode-normalized text";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-position" = callPackage
@@ -198320,7 +195529,6 @@ self: {
        homepage = "https://github.com/acfoltzer/text-register-machine";
        description = "A Haskell implementation of the 1# Text Register Machine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-render" = callPackage
@@ -198505,7 +195713,6 @@ self: {
        homepage = "http://github.com/finnsson/Text.XML.Generic";
        description = "Serialize Data to XML (strings)";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-xml-qq" = callPackage
@@ -198516,9 +195723,8 @@ self: {
        sha256 = "a56515d6c2ea2e94ef3f0ee4cdf6f387d0b5367d3879f25c982b213b888d210c";
        libraryHaskellDepends = [ base parsec template-haskell xml ];
        homepage = "http://www.github.com/finnsson/text-xml-qq";
-       description = "Quasiquoter for xml. XML DSL in Haskell";
+       description = "Quasiquoter for xml. XML DSL in Haskell.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "text-zipper" = callPackage
@@ -198545,7 +195751,7 @@ self: {
          base directory doctest filepath QuickCheck template-haskell
        ];
        homepage = "https://github.com/NICTA/text1";
-       description = "Non-empty values of `Data.Text`";
+       description = "Non-empty values of `Data.Text`.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -198572,7 +195778,6 @@ self: {
        homepage = "https://github.com/spockz/Haskell-Code-Completion-for-TextMate";
        description = "A simple Haskell program to provide tags for Haskell code completion in TextMate";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "textocat-api" = callPackage
@@ -198656,7 +195861,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Type_arithmetic";
        description = "Template-Haskell code for tfp";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tftp" = callPackage
@@ -198683,7 +195887,6 @@ self: {
        homepage = "http://github.com/sheyll/tftp";
        description = "A library for building tftp servers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "tga" = callPackage
@@ -198767,7 +195970,6 @@ self: {
        homepage = "https://github.com/seereason/th-context";
        description = "Test instance context";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-desugar_1_4_2" = callPackage
@@ -199026,7 +196228,6 @@ self: {
        ];
        description = "A place to collect orphan instances for Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-kinds" = callPackage
@@ -199039,7 +196240,6 @@ self: {
        jailbreak = true;
        description = "Automated kind inference in Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "th-kinds-fork" = callPackage
@@ -199370,7 +196570,6 @@ self: {
        homepage = "http://github.com/pjones/themoviedb";
        description = "Haskell API bindings for http://themoviedb.org";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "themplate" = callPackage
@@ -199419,7 +196618,6 @@ self: {
        jailbreak = true;
        description = "A simple client for the TheoremQuest theorem proving game";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "these_0_6_2_0" = callPackage
@@ -199509,7 +196707,6 @@ self: {
        homepage = "http://web.cecs.pdx.edu/~mpj/thih/";
        description = "Typing Haskell In Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "thimk" = callPackage
@@ -199528,7 +196725,6 @@ self: {
        homepage = "http://wiki.cs.pdx.edu/bartforge/thimk";
        description = "Command-line spelling word suggestion tool";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "thorn" = callPackage
@@ -199647,8 +196843,8 @@ self: {
      }:
      mkDerivation {
        pname = "threads-supervisor";
-       version = "1.0.4.1";
-       sha256 = "d58d14711cabfb9e594d5e930e09a831aeb5ef4a428b2ebf09edc24d88d46cda";
+       version = "1.1.0.0";
+       sha256 = "2297578d072548bcc59bbc81268dcc18fbe6216c8634831991db41f87836ce6e";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -199661,7 +196857,6 @@ self: {
        ];
        description = "Simple, IO-based library for Erlang-style thread supervision";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "threadscope" = callPackage
@@ -199877,7 +197072,6 @@ self: {
        homepage = "http://ecks.homeunix.net";
        description = "Useful if reading \"Why FP matters\" by John Hughes";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tickle" = callPackage
@@ -199899,7 +197093,6 @@ self: {
        homepage = "https://github.com/NICTA/tickle";
        description = "A port of @Data.Binary@";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tictactoe3d" = callPackage
@@ -199950,7 +197143,6 @@ self: {
        homepage = "http://tidal.lurk.org/";
        description = "MIDI support for tidal";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "tidal-vis" = callPackage
@@ -200005,7 +197197,6 @@ self: {
        homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome";
        description = "Tiger Compiler of Universiteit Utrecht";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tight-apply" = callPackage
@@ -200052,7 +197243,6 @@ self: {
        homepage = "https://github.com/YoshikuniJujo/tighttp/wiki";
        description = "Tiny and Incrementally-Growing HTTP library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tilings" = callPackage
@@ -200084,7 +197274,6 @@ self: {
        homepage = "http://www.timber-lang.org";
        description = "The Timber Compiler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "time_1_6" = callPackage
@@ -200132,7 +197321,6 @@ self: {
        homepage = "http://semantic.org/TimeLib/";
        description = "Data instances for the time package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "time-exts" = callPackage
@@ -200159,7 +197347,6 @@ self: {
        homepage = "https://github.com/enzoh/time-exts";
        description = "Efficient Timestamps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "time-http" = callPackage
@@ -200185,7 +197372,6 @@ self: {
        homepage = "http://cielonegro.org/HTTPDateTime.html";
        description = "Parse and format HTTP/1.1 Date and Time strings";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "time-interval" = callPackage
@@ -200311,7 +197497,6 @@ self: {
        homepage = "https://github.com/christian-marie/time-qq";
        description = "Quasi-quoter for UTCTime times";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "time-recurrence" = callPackage
@@ -200333,7 +197518,6 @@ self: {
        homepage = "http://github.com/hellertime/time-recurrence";
        description = "Generate recurring dates";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "time-series" = callPackage
@@ -200348,7 +197532,6 @@ self: {
        executableHaskellDepends = [ base ];
        description = "Time series analysis";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "time-units" = callPackage
@@ -200376,7 +197559,6 @@ self: {
        homepage = "http://cielonegro.org/W3CDateTime.html";
        description = "Parse, format and convert W3C Date and Time";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timecalc" = callPackage
@@ -200390,7 +197572,6 @@ self: {
        executableHaskellDepends = [ base haskeline uu-parsinglib ];
        homepage = "https://github.com/chriseidhof/TimeCalc";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timeconsole" = callPackage
@@ -200499,7 +197680,6 @@ self: {
        homepage = "https://github.com/lambda-llama/timeout";
        description = "Generalized sleep and timeout functions";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timeout-control" = callPackage
@@ -200544,7 +197724,6 @@ self: {
        jailbreak = true;
        description = "Attoparsec parsers for various Date/Time formats";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timeplot" = callPackage
@@ -200566,7 +197745,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Timeplot";
        description = "A tool for visualizing time series from log files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timerep" = callPackage
@@ -200586,7 +197764,6 @@ self: {
        homepage = "https://github.com/HugoDaniel/timerep";
        description = "Parse and display time according to some RFCs (RFC3339, RFC2822, RFC822)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timers" = callPackage
@@ -200632,7 +197809,6 @@ self: {
        homepage = "https://github.com/Peaker/timestamp-subprocess-lines";
        description = "Run a command and timestamp its stdout/stderr lines";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "timestamper" = callPackage
@@ -200811,7 +197987,6 @@ self: {
        homepage = "http://tip-org.github.io";
        description = "Convert from Haskell to Tip";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tip-lib" = callPackage
@@ -200893,7 +198068,6 @@ self: {
        homepage = "http://patch-tag.com/r/nonowarn/tkhs/snapshot/current/content/pretty/README";
        description = "Simple Presentation Utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tkyprof" = callPackage
@@ -200922,7 +198096,6 @@ self: {
        homepage = "https://github.com/maoe/tkyprof";
        description = "A web-based visualizer for GHC Profiling Reports";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tld" = callPackage
@@ -201253,7 +198426,6 @@ self: {
        homepage = "http://github.com/vincenthz/hs-tls";
        description = "TLS extra default values and helpers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tmpl" = callPackage
@@ -201314,7 +198486,6 @@ self: {
        homepage = "https://github.com/conal/to-haskell";
        description = "A type class and some utilities for generating Haskell code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "to-string-class" = callPackage
@@ -201326,7 +198497,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Converting string-like types to Strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "to-string-instances" = callPackage
@@ -201338,7 +198508,6 @@ self: {
        libraryHaskellDepends = [ to-string-class ];
        description = "Instances for the ToString class";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "todos" = callPackage
@@ -201365,7 +198534,6 @@ self: {
        homepage = "http://gitorious.org/todos";
        description = "Easy-to-use TODOs manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tofromxml" = callPackage
@@ -201403,7 +198571,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/toilet/";
        description = "Manage the toilet queue at the IMO";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "token-bucket" = callPackage
@@ -201461,7 +198628,6 @@ self: {
          QuickCheck
        ];
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tokyocabinet-haskell" = callPackage
@@ -201475,7 +198641,6 @@ self: {
        homepage = "http://tom-lpsd.github.com/tokyocabinet-haskell/";
        description = "Haskell binding of Tokyo Cabinet";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) tokyocabinet;};
 
   "tokyotyrant-haskell" = callPackage
@@ -201490,7 +198655,6 @@ self: {
        homepage = "http://www.polarmobile.com/";
        description = "FFI bindings to libtokyotyrant";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) tokyocabinet; inherit (pkgs) tokyotyrant;};
 
   "tomato-rubato-openal" = callPackage
@@ -201503,7 +198667,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/tomato-rubato";
        description = "Easy to use library for audio programming";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "toml" = callPackage
@@ -201519,7 +198682,6 @@ self: {
        ];
        jailbreak = true;
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "toolshed" = callPackage
@@ -201555,7 +198717,6 @@ self: {
        homepage = "http://home.arcor.de/chr_bauer/topkata.html";
        description = "OpenGL Arcade Game";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "torch" = callPackage
@@ -201568,7 +198729,6 @@ self: {
        homepage = "http://patch-tag.com/repo/torch/home";
        description = "Simple unit test library (or framework)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "torrent" = callPackage
@@ -201797,7 +198957,6 @@ self: {
        libraryHaskellDepends = [ base containers glib ];
        description = "Client library for Tracker metadata database, indexer and search tool";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tracy" = callPackage
@@ -201833,7 +198992,6 @@ self: {
        homepage = "https://github.com/mike-burns/trajectory";
        description = "Tools and a library for working with Trajectory";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "transactional-events" = callPackage
@@ -201845,7 +199003,6 @@ self: {
        libraryHaskellDepends = [ base ListZipper MonadPrompt stm ];
        description = "Transactional events, based on Concurrent ML semantics";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "transf" = callPackage
@@ -201971,7 +199128,7 @@ self: {
        jailbreak = true;
        doCheck = false;
        homepage = "http://github.com/ekmett/transformers-compat/";
-       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms";
+       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -201985,7 +199142,7 @@ self: {
        libraryHaskellDepends = [ base mtl transformers ];
        jailbreak = true;
        homepage = "http://github.com/ekmett/transformers-compat/";
-       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms";
+       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -201999,7 +199156,7 @@ self: {
        libraryHaskellDepends = [ base transformers ];
        doHaddock = false;
        homepage = "http://github.com/ekmett/transformers-compat/";
-       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms";
+       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -202012,7 +199169,7 @@ self: {
        sha256 = "d881ef4ec164b631591b222efe7ff555af6d5397c9d86475b309ba9402a8ca9f";
        libraryHaskellDepends = [ base ghc-prim transformers ];
        homepage = "http://github.com/ekmett/transformers-compat/";
-       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms";
+       description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -202047,7 +199204,6 @@ self: {
        homepage = "https://github.com/jcristovao/transformers-convert";
        description = "Sensible conversions between some of the monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "transformers-free" = callPackage
@@ -202083,7 +199239,6 @@ self: {
        homepage = "https://github.com/JanBessai/transformers-runnable";
        description = "A unified interface for the run operation of monad transformers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "transformers-supply" = callPackage
@@ -202115,7 +199270,6 @@ self: {
        homepage = "http://www.fpcomplete.com/user/agocorona";
        description = "Making composable programs with multithreading, events and distributed computing";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "translatable-intset" = callPackage
@@ -202142,7 +199296,6 @@ self: {
        homepage = "http://github.com/nfjinjing/translate";
        description = "Haskell binding to Google's AJAX Language API for Translation and Detection";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "traverse-with-class" = callPackage
@@ -202235,7 +199388,6 @@ self: {
        homepage = "http://projects.haskell.org/traypoweroff";
        description = "Tray Icon application to PowerOff / Reboot computer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tree-fun" = callPackage
@@ -202353,7 +199505,6 @@ self: {
        ];
        description = "Library for polling Tremulous servers";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "trhsx" = callPackage
@@ -202364,7 +199515,6 @@ self: {
        sha256 = "631601c5345599e08535221df4415c7676e3e307bfa6a13d32e3c46d9c145d86";
        description = "Deprecated";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "triangulation" = callPackage
@@ -202381,7 +199531,6 @@ self: {
        homepage = "http://www.dinkla.net/";
        description = "triangulation of polygons";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tries" = callPackage
@@ -202476,7 +199625,6 @@ self: {
        jailbreak = true;
        description = "Search for, annotate and trim poly-A tail";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tripLL" = callPackage
@@ -202617,7 +199765,6 @@ self: {
        libraryHaskellDepends = [ base containers mtl time transformers ];
        description = "A Transaction Framework for Web Applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tsession-happstack" = callPackage
@@ -202631,7 +199778,6 @@ self: {
        ];
        description = "A Transaction Framework for Happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tskiplist" = callPackage
@@ -202644,7 +199790,27 @@ self: {
        homepage = "https://github.com/thaldyron/tskiplist";
        description = "A Skip List Implementation in Software Transactional Memory (STM)";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "tslib" = callPackage
+    ({ mkDerivation, base, containers, hspec, HUnit, hybrid-vectors
+     , lens, QuickCheck, statistics, time, vector
+     }:
+     mkDerivation {
+       pname = "tslib";
+       version = "0.1.4";
+       sha256 = "f1d52846d2f7b4897fb8447699d9f0e7f73c8671ea0079f4e89a171479d2c626";
+       revision = "4";
+       editedCabalFile = "5a53d0da4871b896d49eadfc408d258e2b9b1bbfa04bba1ce128ca587608547e";
+       libraryHaskellDepends = [
+         base containers hybrid-vectors lens statistics time vector
+       ];
+       testHaskellDepends = [
+         base containers hspec HUnit lens QuickCheck time vector
+       ];
+       jailbreak = true;
+       description = "-";
+       license = "unknown";
      }) {};
 
   "tslogger" = callPackage
@@ -202672,7 +199838,6 @@ self: {
        homepage = "https://github.com/davnils/tsp-viz";
        description = "Real time TSP tour visualization";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tsparse" = callPackage
@@ -202911,7 +200076,6 @@ self: {
        jailbreak = true;
        description = "Interface to TUN/TAP drivers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tup-functor" = callPackage
@@ -202950,7 +200114,6 @@ self: {
        jailbreak = true;
        description = "Enum instances for tuples where the digits increase with the same speed";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tuple-generic" = callPackage
@@ -203001,7 +200164,6 @@ self: {
        libraryHaskellDepends = [ base HList template-haskell ];
        description = "Morph between tuples, or convert them from and to HLists";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tuple-th" = callPackage
@@ -203026,7 +200188,6 @@ self: {
        homepage = "http://github.com/diegoeche/tupleinstances";
        description = "Functor, Applicative and Monad for n-ary tuples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tuples-homogenous-h98" = callPackage
@@ -203065,7 +200226,6 @@ self: {
        executableHaskellDepends = [ ALUT base ];
        description = "Plays music generated by Turing machines with 5 states and 2 symbols";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "turkish-deasciifier" = callPackage
@@ -203242,6 +200402,24 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "turtle-options_0_1_0_3" = callPackage
+    ({ mkDerivation, base, HUnit, optional-args, parsec, text, turtle
+     }:
+     mkDerivation {
+       pname = "turtle-options";
+       version = "0.1.0.3";
+       sha256 = "d77e55a1a0b3ae2a5117e20780e5b98aab183ff65e9f532a03040d6b050a14d8";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [ base optional-args parsec text turtle ];
+       executableHaskellDepends = [ base turtle ];
+       testHaskellDepends = [ base HUnit parsec ];
+       homepage = "https://github.com/elaye/turtle-options#readme";
+       description = "Collection of command line options and parsers for these options";
+       license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "tweak" = callPackage
     ({ mkDerivation, base, containers, lens, stm, transformers }:
      mkDerivation {
@@ -203255,6 +200433,28 @@ self: {
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "twee" = callPackage
+    ({ mkDerivation, array, base, containers, dlist, ghc-prim, heaps
+     , jukebox, pretty, primitive, reflection, split, transformers
+     }:
+     mkDerivation {
+       pname = "twee";
+       version = "0.1";
+       sha256 = "e80cd75b0fb2972e114bfb1a03e13970122647f6f1a7cb8314d6e27d2dd77e2d";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         array base containers dlist ghc-prim heaps pretty primitive
+         reflection transformers
+       ];
+       executableHaskellDepends = [
+         array base containers jukebox pretty reflection split transformers
+       ];
+       homepage = "http://github.com/nick8325/twee";
+       description = "An equational theorem prover";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "twentefp" = callPackage
     ({ mkDerivation, base, gloss, parsec, time }:
      mkDerivation {
@@ -203264,7 +200464,6 @@ self: {
        libraryHaskellDepends = [ base gloss parsec time ];
        description = "Lab Assignments Environment at Univeriteit Twente";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "twentefp-eventloop-graphics" = callPackage
@@ -203294,7 +200493,6 @@ self: {
        libraryHaskellDepends = [ base eventloop ];
        description = "Tree type and show functions for lab assignment of University of Twente. Contains RoseTree and RedBlackTree";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twentefp-graphs" = callPackage
@@ -203332,7 +200530,6 @@ self: {
        jailbreak = true;
        description = "RoseTree type and show functions for lab assignment of University of Twente";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twentefp-trees" = callPackage
@@ -203361,7 +200558,7 @@ self: {
          network random SHA text
        ];
        jailbreak = true;
-       description = "A fork of the popular websockets package. It is used for the practical assignments of the University of Twente. A sensible and clean way to write WebSocket-capable servers in Haskell";
+       description = "A fork of the popular websockets package. It is used for the practical assignments of the University of Twente. A sensible and clean way to write WebSocket-capable servers in Haskell.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -203395,7 +200592,6 @@ self: {
        homepage = "https://github.com/suzuki-shin/twhs";
        description = "CLI twitter client";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twidge" = callPackage
@@ -203418,7 +200614,6 @@ self: {
        homepage = "http://software.complete.org/twidge";
        description = "Unix Command-Line Twitter and Identica Client";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twilight-stm" = callPackage
@@ -203431,7 +200626,6 @@ self: {
        homepage = "http://proglang.informatik.uni-freiburg.de/projects/twilight/";
        description = "STM library with safe irrevocable I/O and inconsistency repair";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twilio" = callPackage
@@ -203457,7 +200651,6 @@ self: {
        homepage = "https://github.com/markandrus/twilio-haskell";
        description = "Twilio REST API library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twill" = callPackage
@@ -203477,7 +200670,6 @@ self: {
        jailbreak = true;
        description = "Twilio API interaction";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twiml" = callPackage
@@ -203501,7 +200693,6 @@ self: {
        homepage = "https://github.com/markandrus/twiml-haskell";
        description = "TwiML library for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twine" = callPackage
@@ -203518,7 +200709,6 @@ self: {
        homepage = "http://twine.james-sanders.com";
        description = "very simple template language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twisty" = callPackage
@@ -203535,7 +200725,6 @@ self: {
        jailbreak = true;
        description = "Simulator of twisty puzzles à la Rubik's Cube";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitch" = callPackage
@@ -203557,7 +200746,6 @@ self: {
        homepage = "https://github.com/jfischoff/twitch";
        description = "A high level file watcher DSL";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter" = callPackage
@@ -203575,7 +200763,6 @@ self: {
        ];
        description = "A Haskell-based CLI Twitter client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter-conduit" = callPackage
@@ -203610,7 +200797,6 @@ self: {
        homepage = "https://github.com/himura/twitter-conduit";
        description = "Twitter API package with conduit interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter-enumerator" = callPackage
@@ -203631,7 +200817,6 @@ self: {
        homepage = "https://github.com/himura/twitter-enumerator";
        description = "Twitter API package with enumerator interface and Streaming API support";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter-feed_0_2_0_2" = callPackage
@@ -203741,7 +200926,6 @@ self: {
        homepage = "https://github.com/himura/twitter-types";
        description = "Twitter JSON parser and types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "twitter-types-lens" = callPackage
@@ -203758,7 +200942,6 @@ self: {
        homepage = "https://github.com/himura/twitter-types-lens";
        description = "Twitter JSON types (lens powered)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tx" = callPackage
@@ -203776,7 +200959,6 @@ self: {
        homepage = "https://github.com/mcschroeder/tx";
        description = "Persistent transactions on top of STM";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "txt-sushi" = callPackage
@@ -203851,7 +201033,6 @@ self: {
        homepage = "http://www.decidable.org/haskell/typalyze";
        description = "Analyzes Haskell source files for easy reference";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-aligned" = callPackage
@@ -203889,7 +201070,7 @@ self: {
          base containers lens lens-utils template-haskell
        ];
        homepage = "https://github.com/wdanilo/type-cache";
-       description = "Utilities for caching type families results. Sometimes complex type families take long time to compile, so it is proficient to cache them and use the final result without the need of re-computation";
+       description = "Utilities for caching type families results. Sometimes complex type families take long time to compile, so it is proficient to cache them and use the final result without the need of re-computation.";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -203907,7 +201088,6 @@ self: {
        ];
        description = "Type-level serialization of type constructors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-combinators" = callPackage
@@ -203947,7 +201127,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell type-spine ];
        description = "Arbitrary-base type-level digits";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-eq_0_4_2" = callPackage
@@ -204000,7 +201179,6 @@ self: {
        homepage = "http://darcs.wolfgang.jeltsch.info/haskell/type-equality-check";
        description = "Type equality check";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-fun" = callPackage
@@ -204050,7 +201228,6 @@ self: {
        homepage = "http://github.com/ekmett/type-int";
        description = "Type Level 2s- and 16s- Complement Integers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-iso" = callPackage
@@ -204077,7 +201254,6 @@ self: {
        homepage = "http://code.haskell.org/type-level";
        description = "Type-level programming library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-level-bst" = callPackage
@@ -204090,7 +201266,6 @@ self: {
        homepage = "https://github.com/Kinokkory/type-level-bst";
        description = "type-level binary search trees in haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-level-natural-number" = callPackage
@@ -204151,7 +201326,6 @@ self: {
        libraryHaskellDepends = [ base ghc-prim ];
        description = "Type-level sets and finite maps (with value-level counterparts)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-level-tf" = callPackage
@@ -204244,7 +201418,6 @@ self: {
        ];
        description = "Type-level comparison operator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-ord-spine-cereal" = callPackage
@@ -204260,7 +201433,6 @@ self: {
        ];
        description = "Generic type-level comparison of types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-prelude" = callPackage
@@ -204271,9 +201443,8 @@ self: {
        sha256 = "30d24fa550e380ea4a76367d261362532c0cee703a5356497a612b204328eff9";
        libraryHaskellDepends = [ base ghc-prim ];
        homepage = "http://code.atnnn.com/projects/type-prelude";
-       description = "Partial port of prelude to the type level. Requires GHC 7.6.1";
+       description = "Partial port of prelude to the type level. Requires GHC 7.6.1.";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-settheory" = callPackage
@@ -204289,7 +201460,6 @@ self: {
        ];
        description = "Sets and functions-as-relations in the type system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-spine" = callPackage
@@ -204301,7 +201471,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell ];
        description = "A spine-view on types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-structure" = callPackage
@@ -204330,7 +201499,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/type-structure";
        description = "Type structure analysis";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-sub-th" = callPackage
@@ -204356,7 +201524,6 @@ self: {
        homepage = "http://github.com/jfischoff/type-sub-th";
        description = "Substitute types for other types with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "type-unary" = callPackage
@@ -204387,7 +201554,6 @@ self: {
        homepage = "http://github.com/bennofs/typeable-th";
        description = "Automatic deriving of TypeableN instances with Template Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typed-spreadsheet" = callPackage
@@ -204435,7 +201601,6 @@ self: {
        homepage = "http://github.com/typed-wire/typed-wire#readme";
        description = "Language idependent type-safe communication";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typed-wire-utils" = callPackage
@@ -204469,7 +201634,6 @@ self: {
        homepage = "https://github.com/tolysz/typedquery";
        description = "Parser for SQL augmented with types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typehash" = callPackage
@@ -204482,7 +201646,6 @@ self: {
        jailbreak = true;
        description = "Create a unique hash value for a type";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typelevel" = callPackage
@@ -204513,7 +201676,6 @@ self: {
        homepage = "https://github.com/nushio3/typelevel-tensor";
        description = "Tensors whose ranks and dimensions type-inferred and type-checked";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typelits-witnesses_0_1_1_0" = callPackage
@@ -204569,7 +201731,6 @@ self: {
        homepage = "http://github.com/mikeizbicki/typeparams/";
        description = "Lens-like interface for type level parameters; allows unboxed unboxed vectors and supercompilation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "types-compat" = callPackage
@@ -204582,7 +201743,7 @@ self: {
        editedCabalFile = "8fbb17ec66d4bf5f2fffdb2327647b44292253822c9623a06b489ff547a71041";
        libraryHaskellDepends = [ base ];
        homepage = "https://github.com/philopon/types-compat";
-       description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy";
+       description = "ghc-7.6/7.8 compatible GHC.TypeLits, Data.Typeable and Data.Proxy.";
        license = stdenv.lib.licenses.mit;
      }) {};
 
@@ -204616,7 +201777,6 @@ self: {
        homepage = "http://github.com/paf31/typescript-docs";
        description = "A documentation generator for TypeScript Definition files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "typical" = callPackage
@@ -204626,7 +201786,7 @@ self: {
        version = "0.0.1";
        sha256 = "98c0f7dd56285e4dde732aa0d49ea12dd1233adceae101b2a58bc1752faf8637";
        libraryHaskellDepends = [ base ];
-       description = "Type level numbers, vectors, list. This lib needs to be extended";
+       description = "Type level numbers, vectors, list. This lib needs to be extended.";
        license = "GPL";
      }) {};
 
@@ -204669,7 +201829,6 @@ self: {
        homepage = "https://github.com/nilcons/haskell-tz";
        description = "Efficient time zone handling";
        license = stdenv.lib.licenses.asl20;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "tzdata" = callPackage
@@ -204710,7 +201869,6 @@ self: {
        jailbreak = true;
        description = "A simplistic dependently-typed language with parametricity";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ua-parser" = callPackage
@@ -204720,8 +201878,8 @@ self: {
      }:
      mkDerivation {
        pname = "ua-parser";
-       version = "0.7";
-       sha256 = "586ae0c948af8a2c671331aeebe85c663a24e5d40c8a71a943ee2520b4d4aa57";
+       version = "0.7.1";
+       sha256 = "bfcfe7ea0cbeade0053dbdbbc8f4593283d17403058d754b00430edb1a0444b4";
        libraryHaskellDepends = [
          aeson base bytestring data-default file-embed pcre-light text yaml
        ];
@@ -204729,7 +201887,6 @@ self: {
          aeson base bytestring data-default derive file-embed filepath HUnit
          pcre-light tasty tasty-hunit tasty-quickcheck text yaml
        ];
-       jailbreak = true;
        description = "A library for parsing User-Agent strings, official Haskell port of ua-parser";
        license = stdenv.lib.licenses.bsd3;
      }) {};
@@ -204764,7 +201921,6 @@ self: {
        homepage = "https:/github.com/fumieval/uberlast";
        description = "Generate overloaded lenses from plain data declaration";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uconv" = callPackage
@@ -204777,7 +201933,6 @@ self: {
        librarySystemDepends = [ icu ];
        description = "String encoding conversion with ICU";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) icu;};
 
   "udbus" = callPackage
@@ -204797,7 +201952,6 @@ self: {
        homepage = "http://github.com/vincenthz/hs-udbus";
        description = "Small DBus implementation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "udbus-model" = callPackage
@@ -204812,7 +201966,6 @@ self: {
        homepage = "http://github.com/vincenthz/hs-udbus";
        description = "Model API for udbus introspection and definitions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "udcode" = callPackage
@@ -204842,7 +201995,6 @@ self: {
        homepage = "https://github.com/pxqr/udev";
        description = "libudev bindings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {libudev = null;};
 
   "uglymemo" = callPackage
@@ -204880,7 +202032,6 @@ self: {
        homepage = "https://github.com/UU-ComputerScience/uhc";
        description = "Part of UHC packaged as cabal/hackage installable library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uhc-util" = callPackage
@@ -204950,7 +202101,6 @@ self: {
        libraryHaskellDepends = [ base data-default mtl old-locale time ];
        description = "A framework for friendly commandline programs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uid" = callPackage
@@ -205038,7 +202188,6 @@ self: {
        homepage = "http://github.com/luqui/unamb-custom";
        description = "Functional concurrency with unamb using a custom scheduler";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unbound" = callPackage
@@ -205180,7 +202329,6 @@ self: {
        homepage = "https://github.com/jcristovao/unbouded-delays-units";
        description = "Thread delays and timeouts using proper time units";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unboxed-containers" = callPackage
@@ -205193,7 +202341,6 @@ self: {
        homepage = "http://github.com/ekmett/unboxed-containers";
        description = "Self-optimizing unboxed sets using view patterns and data families";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unbreak" = callPackage
@@ -205405,7 +202552,6 @@ self: {
        homepage = "http://sloompie.reinier.de/unicode-normalization/";
        description = "Unicode normalization using the ICU library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) icu;};
 
   "unicode-prelude" = callPackage
@@ -205475,7 +202621,6 @@ self: {
        homepage = "https://github.com/Zankoku-Okuno/unicoder";
        description = "Make writing in unicode easy";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unification-fd" = callPackage
@@ -205509,7 +202654,6 @@ self: {
        homepage = "https://sealgram.com/git/haskell/uniform-io";
        description = "Uniform IO over files, network, anything";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) openssl;};
 
   "uniform-pair" = callPackage
@@ -205558,7 +202702,6 @@ self: {
        homepage = "http://github.com/minpou/union-map";
        description = "Heterogeneous map by open unions";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uniplate" = callPackage
@@ -205638,7 +202781,6 @@ self: {
        homepage = "http://github.com/sebfisch/uniqueid/wikis";
        description = "Splittable Unique Identifier Supply";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unit" = callPackage
@@ -205734,7 +202876,6 @@ self: {
        homepage = "https://bitbucket.org/xnyhps/haskell-unittyped/";
        description = "An extendable library for type-safe computations including units";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "universal-binary" = callPackage
@@ -205861,7 +203002,6 @@ self: {
        homepage = "http://github.com/jfishcoff/universe-th";
        description = "Construct a Dec's ancestor list";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unix_2_7_1_0" = callPackage
@@ -205993,7 +203133,6 @@ self: {
        homepage = "https://github.com/snoyberg/conduit";
        description = "Run processes on Unix systems, with a conduit interface (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unix-pty-light" = callPackage
@@ -206088,7 +203227,6 @@ self: {
        executableHaskellDepends = [ base directory text ];
        description = "Tool to convert literate code between styles or to code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unm-hip" = callPackage
@@ -206165,7 +203303,6 @@ self: {
        homepage = "http://github.com/tcrayford/rematch";
        description = "Rematch support for unordered containers";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unordered-graphs" = callPackage
@@ -206196,7 +203333,6 @@ self: {
        ];
        description = "Monad transformers that mirror worker-wrapper transformations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unroll-ghc-plugin" = callPackage
@@ -206278,7 +203414,6 @@ self: {
        ];
        description = "Solve Boggle-like word games";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "unusable-pkg" = callPackage
@@ -206331,7 +203466,6 @@ self: {
        homepage = "https://github.com/thomaseding/up";
        description = "Command line tool to generate pathnames to facilitate moving upward in a file system";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "up-grade" = callPackage
@@ -206363,7 +203497,6 @@ self: {
        jailbreak = true;
        description = "Haskell client for Uploadcare";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "upskirt" = callPackage
@@ -206375,7 +203508,6 @@ self: {
        libraryHaskellDepends = [ base bytestring ];
        description = "Binding to upskirt";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ureader" = callPackage
@@ -206401,7 +203533,6 @@ self: {
        homepage = "https://github.com/pxqr/ureader";
        description = "Minimalistic CLI RSS reader";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urembed" = callPackage
@@ -206423,7 +203554,6 @@ self: {
        homepage = "http://github.com/grwlf/urembed";
        description = "Ur/Web static content generator";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uri" = callPackage
@@ -206613,7 +203743,6 @@ self: {
        homepage = "http://github.com/snoyberg/xml";
        description = "Read and write URIs (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uri-encode_1_5_0_3" = callPackage
@@ -206668,7 +203797,6 @@ self: {
        homepage = "http://github.com/snoyberg/xml";
        description = "Read and write URIs (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uri-enumerator-file" = callPackage
@@ -206689,7 +203817,6 @@ self: {
        homepage = "http://github.com/snoyberg/xml";
        description = "uri-enumerator backend for the file scheme (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uri-template" = callPackage
@@ -206750,7 +203877,6 @@ self: {
        libraryHaskellDepends = [ base mtl syb ];
        description = "Parse/format generic key/value URLs from record data types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urlcheck" = callPackage
@@ -206769,7 +203895,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/urlcheck";
        description = "Parallel link checker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urldecode" = callPackage
@@ -206784,7 +203909,6 @@ self: {
        homepage = "https://github.com/beastaugh/urldecode";
        description = "Decode percent-encoded strings";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urldisp-happstack" = callPackage
@@ -206796,7 +203920,6 @@ self: {
        libraryHaskellDepends = [ base bytestring happstack-server mtl ];
        description = "Simple, declarative, expressive URL routing -- on happstack";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "urlencoded" = callPackage
@@ -206883,7 +204006,6 @@ self: {
        homepage = "http://github.com/grwlf/urxml";
        description = "XML parser-printer supporting Ur/Web syntax extensions";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "usb" = callPackage
@@ -206918,7 +204040,6 @@ self: {
        jailbreak = true;
        description = "Iteratee enumerators for the usb package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "usb-hid" = callPackage
@@ -206971,7 +204092,6 @@ self: {
        homepage = "https://github.com/basvandijk/usb-iteratee";
        description = "Iteratee enumerators for the usb package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "usb-safe" = callPackage
@@ -206990,7 +204110,6 @@ self: {
        homepage = "https://github.com/basvandijk/usb-safe/";
        description = "Type-safe communication with USB devices";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "userid_0_1_2_3" = callPackage
@@ -207349,7 +204468,6 @@ self: {
        jailbreak = true;
        description = "Variants of Prelude and System.IO with UTF8 text I/O operations";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "utf8-string_0_3_8" = callPackage
@@ -207592,7 +204710,6 @@ self: {
        jailbreak = true;
        description = "Utility for drawing attribute grammar pictures with the diagrams package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uuagd" = callPackage
@@ -207916,7 +205033,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/uvector";
        description = "Fast unboxed arrays with a flexible interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uvector-algorithms" = callPackage
@@ -207929,7 +205045,6 @@ self: {
        homepage = "http://code.haskell.org/~dolio/";
        description = "Efficient algorithms for uvector unboxed arrays";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "uxadt" = callPackage
@@ -207970,7 +205085,6 @@ self: {
        homepage = "https://gitorious.org/hsv4l2";
        description = "interface to Video For Linux Two (V4L2)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "v4l2-examples" = callPackage
@@ -207986,7 +205100,6 @@ self: {
        homepage = "https://gitorious.org/hsv4l2";
        description = "video for linux two examples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vacuum" = callPackage
@@ -207999,7 +205112,6 @@ self: {
        homepage = "http://thoughtpolice.github.com/vacuum";
        description = "Graph representation of the GHC heap";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vacuum-cairo" = callPackage
@@ -208017,7 +205129,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/vacuum-cairo";
        description = "Visualize live Haskell data structures using vacuum, graphviz and cairo";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vacuum-graphviz" = callPackage
@@ -208030,7 +205141,6 @@ self: {
        jailbreak = true;
        description = "A library for transforming vacuum graphs into GraphViz output";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vacuum-opengl" = callPackage
@@ -208051,7 +205161,6 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "Visualize live Haskell data structures using vacuum, graphviz and OpenGL";
        license = stdenv.lib.licenses.publicDomain;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vacuum-ubigraph" = callPackage
@@ -208064,7 +205173,6 @@ self: {
        jailbreak = true;
        description = "Visualize Haskell data structures using vacuum and Ubigraph";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vado" = callPackage
@@ -208238,7 +205346,6 @@ self: {
        homepage = "https://github.com/benzrf/vampire";
        description = "Analyze and visualize expression trees";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "var" = callPackage
@@ -208256,7 +205363,6 @@ self: {
        homepage = "http://github.com/sonyandy/var";
        description = "Mutable variables and tuples";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "varan" = callPackage
@@ -208410,7 +205516,6 @@ self: {
        ];
        description = "Common types and instances for Vaultaire";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vcache" = callPackage
@@ -208428,7 +205533,6 @@ self: {
        homepage = "http://github.com/dmbarbour/haskell-vcache";
        description = "semi-transparent persistence for Haskell using LMDB, STM";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "vcache-trie" = callPackage
@@ -208445,7 +205549,6 @@ self: {
        homepage = "http://github.com/dmbarbour/haskell-vcache-trie";
        description = "patricia tries modeled above VCache";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "vcard" = callPackage
@@ -208460,7 +205563,6 @@ self: {
        homepage = "http://github.com/mboes/vCard";
        description = "A library for parsing/printing vCards from/to various formats";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vcd" = callPackage
@@ -208592,7 +205694,6 @@ self: {
        homepage = "http://code.haskell.org/~bkomuves/";
        description = "OpenGL support for the `vect' low-dimensional linear algebra library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector_0_10_9_3" = callPackage
@@ -208830,7 +205931,6 @@ self: {
        homepage = "https://github.com/basvandijk/vector-bytestring";
        description = "ByteStrings as type synonyms of Storable Vectors of Word8s";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-clock" = callPackage
@@ -208850,7 +205950,6 @@ self: {
        homepage = "https://github.com/scvalex/vector-clock";
        description = "Vector clocks for versioning message flows";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-conduit" = callPackage
@@ -208870,7 +205969,6 @@ self: {
        jailbreak = true;
        description = "Conduit utilities for vectors";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-fftw" = callPackage
@@ -208899,7 +205997,6 @@ self: {
        homepage = "http://github.com/mikeizbicki/vector-functorlazy/";
        description = "vectors that perform the fmap operation in constant time";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-heterogenous" = callPackage
@@ -208981,7 +206078,6 @@ self: {
        homepage = "http://github.com/kreuzschlitzschraubenzieher/vector-instances-collections";
        description = "Instances of the Data.Collections classes for Data.Vector.*";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-mmap" = callPackage
@@ -209006,7 +206102,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/vector-random";
        description = "Generate vectors filled with high quality pseudorandom numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-read-instances" = callPackage
@@ -209019,7 +206114,18 @@ self: {
        homepage = "http://www.tbi.univie.ac.at/~choener/";
        description = "(deprecated) Read instances for 'Data.Vector'";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "vector-sized" = callPackage
+    ({ mkDerivation, base, deepseq, vector }:
+     mkDerivation {
+       pname = "vector-sized";
+       version = "0.2.0.0";
+       sha256 = "bbdf2d23e3edd5bb059181415368bc95b97d2bd09e642e500f1f9a0acb0a4933";
+       libraryHaskellDepends = [ base deepseq vector ];
+       homepage = "http://github.com/expipiplus1/vector-sized#readme";
+       description = "Size tagged vectors";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "vector-space_0_8_7" = callPackage
@@ -209097,7 +206203,6 @@ self: {
        ];
        description = "Instances of vector-space classes for OpenGL types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-space-points_0_2" = callPackage
@@ -209148,7 +206253,6 @@ self: {
        homepage = "http://github.com/geezusfreeek/vector-static";
        description = "Statically checked sizes on Data.Vector";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vector-strategies" = callPackage
@@ -209295,7 +206399,6 @@ self: {
        homepage = "http://github.com/tomahawkins/verilog";
        description = "Verilog preprocessor, parser, and AST";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "versions" = callPackage
@@ -209312,7 +206415,6 @@ self: {
        ];
        description = "Types and parsers for software version numbers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vhd" = callPackage
@@ -209403,7 +206505,6 @@ self: {
        homepage = "http://github.com/michaelxavier/vigilance";
        description = "An extensible dead-man's switch system";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vimeta" = callPackage
@@ -209430,7 +206531,6 @@ self: {
        homepage = "http://github.com/pjones/vimeta";
        description = "Frontend for video metadata tagging tools";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vimus" = callPackage
@@ -209478,7 +206578,6 @@ self: {
        homepage = "http://www.vintage-basic.net";
        description = "Interpreter for microcomputer-era BASIC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vinyl_0_5_1" = callPackage
@@ -209527,7 +206626,6 @@ self: {
        ];
        description = "Utilities for working with OpenGL's GLSL shading language and vinyl records";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vinyl-json" = callPackage
@@ -209545,7 +206643,6 @@ self: {
        jailbreak = true;
        description = "Provide json instances automagically to vinyl types";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vinyl-utils" = callPackage
@@ -209578,7 +206675,6 @@ self: {
        homepage = "http://github.com/andrewthad/vinyl-vectors";
        description = "Vectors for vinyl vectors";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "virthualenv" = callPackage
@@ -209599,7 +206695,6 @@ self: {
        homepage = "https://github.com/Paczesiowa/virthualenv";
        description = "Virtual Haskell Environment builder";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "visibility" = callPackage
@@ -209632,7 +206727,6 @@ self: {
        ];
        description = "An XMMS2 client";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "visual-graphrewrite" = callPackage
@@ -209661,7 +206755,6 @@ self: {
        homepage = "http://github.com/zsol/visual-graphrewrite/";
        description = "Visualize the graph-rewrite steps of a Haskell program";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "visual-prof" = callPackage
@@ -209682,7 +206775,6 @@ self: {
        homepage = "http://github.com/djv/VisualProf";
        description = "Create a visual profile of a program's source code";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vivid" = callPackage
@@ -209701,7 +206793,6 @@ self: {
        ];
        description = "Sound synthesis with SuperCollider";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vk-aws-route53" = callPackage
@@ -209719,7 +206810,6 @@ self: {
        ];
        description = "Amazon Route53 DNS service plugin for the aws package";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vk-posix-pty" = callPackage
@@ -209793,7 +206883,6 @@ self: {
        ];
        description = "Reading of Vorbis comments from Ogg Vorbis files";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vowpal-utils" = callPackage
@@ -209807,7 +206896,6 @@ self: {
        homepage = "https://github.com/cartazio/Vowpal-Utils";
        description = "Vowpal Wabbit utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "voyeur" = callPackage
@@ -209821,7 +206909,6 @@ self: {
        homepage = "https://github.com/sethfowler/hslibvoyeur";
        description = "Haskell bindings for libvoyeur";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vrpn" = callPackage
@@ -209854,7 +206941,6 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome) vte;};
 
   "vtegtk3" = callPackage
@@ -209870,7 +206956,6 @@ self: {
        homepage = "http://projects.haskell.org/gtk2hs/";
        description = "Binding to the VTE library";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.gnome) vte;};
 
   "vty" = callPackage
@@ -209925,7 +207010,6 @@ self: {
        homepage = "https://github.com/coreyoconnor/vty";
        description = "Examples programs using the vty library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vty-menu" = callPackage
@@ -209940,7 +207024,6 @@ self: {
        jailbreak = true;
        description = "A lib for displaying a menu and getting a selection using VTY";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vty-ui" = callPackage
@@ -209977,22 +207060,46 @@ self: {
        jailbreak = true;
        description = "Extra vty-ui functionality not included in the core library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "vulkan" = callPackage
-    ({ mkDerivation, base, fixed-vector }:
+    ({ mkDerivation, base, vector-sized }:
      mkDerivation {
        pname = "vulkan";
-       version = "1.0.0.0";
-       sha256 = "9449a0ae1ba4d3d322e35b2948a5dae576bd6e59bdcb75917d79ab1436d432c4";
-       libraryHaskellDepends = [ base fixed-vector ];
+       version = "1.5.0.0";
+       sha256 = "8df7d3f179cef9f47a6866abd14a5ae4f4a961a63d9e91d3b0898c55b47bcc13";
+       libraryHaskellDepends = [ base vector-sized ];
        jailbreak = true;
        homepage = "http://github.com/expipiplus1/vulkan#readme";
        description = "Bindings to the Vulkan graphics API";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
+  "wacom-daemon" = callPackage
+    ({ mkDerivation, aeson, base, bytestring, containers, directory
+     , filepath, Glob, libnotify, process, select, text, udev
+     , unordered-containers, vector, X11, yaml
+     }:
+     mkDerivation {
+       pname = "wacom-daemon";
+       version = "0.1.0.0";
+       sha256 = "08bd693ea56a93ec81308ebeff1e190f52752cf877c47c18cc9485bf8db98f7c";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         aeson base bytestring containers directory filepath Glob libnotify
+         process select text udev unordered-containers vector X11 yaml
+       ];
+       executableHaskellDepends = [
+         aeson base bytestring containers directory filepath Glob libnotify
+         process select text udev unordered-containers vector X11 yaml
+       ];
+       jailbreak = true;
+       homepage = "https://github.com/portnov/wacom-intuos-pro-scripts";
+       description = "Manage Wacom tablet settings profiles, including Intuos Pro ring modes";
+       license = stdenv.lib.licenses.bsd3;
+     }) {};
+
   "waddle" = callPackage
     ({ mkDerivation, base, binary, bytestring, case-insensitive
      , containers, directory, JuicyPixels
@@ -211322,7 +208429,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "wai-extra" = callPackage
+  "wai-extra_3_0_14" = callPackage
     ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
      , blaze-builder, bytestring, case-insensitive, containers, cookie
      , data-default-class, deepseq, directory, fast-logger, hspec
@@ -211349,6 +208456,36 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "Provides some basic WAI handlers and middleware";
        license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "wai-extra" = callPackage
+    ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring
+     , blaze-builder, bytestring, case-insensitive, containers, cookie
+     , data-default-class, deepseq, directory, fast-logger, hspec
+     , http-types, HUnit, iproute, lifted-base, network, old-locale
+     , resourcet, streaming-commons, stringsearch, text, time
+     , transformers, unix, unix-compat, vault, void, wai, wai-logger
+     , word8, zlib
+     }:
+     mkDerivation {
+       pname = "wai-extra";
+       version = "3.0.14.1";
+       sha256 = "3c76f41acf9a4351ebf51908acd3febbef1cf66481933e1e34dc99642d6054dd";
+       libraryHaskellDepends = [
+         aeson ansi-terminal base base64-bytestring blaze-builder bytestring
+         case-insensitive containers cookie data-default-class deepseq
+         directory fast-logger http-types iproute lifted-base network
+         old-locale resourcet streaming-commons stringsearch text time
+         transformers unix unix-compat vault void wai wai-logger word8 zlib
+       ];
+       testHaskellDepends = [
+         base blaze-builder bytestring case-insensitive cookie fast-logger
+         hspec http-types HUnit resourcet text time transformers wai zlib
+       ];
+       homepage = "http://github.com/yesodweb/wai";
+       description = "Provides some basic WAI handlers and middleware";
+       license = stdenv.lib.licenses.mit;
      }) {};
 
   "wai-frontend-monadcgi" = callPackage
@@ -211378,7 +208515,6 @@ self: {
        homepage = "https://bitbucket.org/dpwiz/wai-graceful";
        description = "Graceful shutdown for WAI applications";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-handler-devel" = callPackage
@@ -211401,7 +208537,6 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "WAI server that automatically reloads code after modification. (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-handler-fastcgi" = callPackage
@@ -211498,7 +208633,6 @@ self: {
        homepage = "http://github.com/snoyberg/wai-handler-snap";
        description = "Web Application Interface handler using snap-server. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-handler-webkit" = callPackage
@@ -211512,7 +208646,6 @@ self: {
        homepage = "https://github.com/yesodweb/wai/tree/master/wai-handler-webkit";
        description = "Turn WAI applications into standalone GUIs using QtWebkit";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {QtWebKit = null;};
 
   "wai-hastache" = callPackage
@@ -211529,7 +208662,6 @@ self: {
        homepage = "https://github.com/singpolyma/wai-hastache";
        description = "Nice wrapper around hastache for use with WAI";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-hmac-auth" = callPackage
@@ -211587,7 +208719,6 @@ self: {
        jailbreak = true;
        description = "DEPCRECATED (use package \"simple\" instead) A minimalist web framework for WAI web applications";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-logger_2_2_3" = callPackage
@@ -211688,7 +208819,6 @@ self: {
        ];
        description = "A logging system for preforked WAI apps";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-cache" = callPackage
@@ -211712,7 +208842,6 @@ self: {
        homepage = "https://github.com/akaspin/wai-middleware-cache";
        description = "Caching middleware for WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-cache-redis" = callPackage
@@ -211733,7 +208862,6 @@ self: {
        homepage = "https://github.com/akaspin/wai-middleware-cache-redis";
        description = "Redis backend for wai-middleware-cache";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-caching" = callPackage
@@ -211801,7 +208929,6 @@ self: {
        homepage = "https://github.com/akaspin/wai-middleware-catch";
        description = "Wai error catching middleware";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-consul" = callPackage
@@ -212012,7 +209139,6 @@ self: {
        ];
        description = "Middleware and utilities for using Atlassian Crowd authentication";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "wai-middleware-etag" = callPackage
@@ -212060,7 +209186,6 @@ self: {
        homepage = "http://github.com/seanhess/wai-middleware-headers";
        description = "cors and addHeaders for WAI";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-hmac" = callPackage
@@ -212108,7 +209233,6 @@ self: {
        ];
        description = "WAI HMAC Authentication Middleware Client";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-metrics" = callPackage
@@ -212148,7 +209272,6 @@ self: {
        homepage = "https://github.com/taktoa/wai-middleware-preprocessor";
        description = "WAI middleware for preprocessing static files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-prometheus" = callPackage
@@ -212165,7 +209288,7 @@ self: {
        ];
        testHaskellDepends = [ base doctest prometheus-client ];
        homepage = "https://github.com/fimad/prometheus-haskell";
-       description = "WAI middlware for exposing http://prometheus.io metrics";
+       description = "WAI middlware for exposing http://prometheus.io metrics.";
        license = stdenv.lib.licenses.asl20;
      }) {};
 
@@ -212189,7 +209312,6 @@ self: {
        homepage = "https://github.com/akaspin/wai-middleware-route";
        description = "Wai dispatch middleware";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-static_0_6_0_1" = callPackage
@@ -212270,7 +209392,6 @@ self: {
        homepage = "https://github.com/agrafix/wai-middleware-static";
        description = "WAI middleware that serves requests to static files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-middleware-throttle_0_2_0_1" = callPackage
@@ -212806,7 +209927,6 @@ self: {
        homepage = "https://github.com/singpolyma/wai-session-tokyocabinet";
        description = "Session store based on Tokyo Cabinet";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-static-cache" = callPackage
@@ -212826,7 +209946,6 @@ self: {
        ];
        description = "A simple cache for serving static files in a WAI middleware";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-static-pages" = callPackage
@@ -212889,7 +210008,6 @@ self: {
        jailbreak = true;
        description = "Wai middleware for request throttling";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wai-transformers" = callPackage
@@ -213979,7 +211097,6 @@ self: {
        homepage = "http://tanakh.jp";
        description = "Dynamic configurable warp HTTP server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp-static" = callPackage
@@ -214002,7 +211119,6 @@ self: {
        homepage = "http://github.com/yesodweb/wai";
        description = "Static file server based on Warp and wai-app-static (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "warp-tls_3_0_1" = callPackage
@@ -214365,7 +211481,6 @@ self: {
        jailbreak = true;
        description = "set group and user id before running server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "watchdog" = callPackage
@@ -214378,7 +211493,6 @@ self: {
        jailbreak = true;
        description = "Simple control structure to re-try an action with exponential backoff";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "watcher" = callPackage
@@ -214396,7 +211510,6 @@ self: {
        jailbreak = true;
        description = "Opinionated filesystem watcher";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "watchit" = callPackage
@@ -214425,7 +211538,6 @@ self: {
        ];
        description = "File change watching utility";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wavconvert" = callPackage
@@ -214473,7 +211585,6 @@ self: {
        homepage = "http://code.haskell.org/~StefanKersten/code/wavesurfer";
        description = "Parse WaveSurfer files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wavy" = callPackage
@@ -214532,7 +211643,6 @@ self: {
        homepage = "https://github.com/cvb/hs-weather-api.git";
        description = "Weather api implemented in haskell";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-browser-in-haskell" = callPackage
@@ -214544,7 +211654,6 @@ self: {
        libraryHaskellDepends = [ base gtk webkit ];
        description = "Web Browser In Haskell";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-css" = callPackage
@@ -214576,7 +211685,6 @@ self: {
        homepage = "http://github.com/snoyberg/web-encodings/tree/master";
        description = "Encapsulate multiple web encoding in a single package. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-fpco" = callPackage
@@ -214612,7 +211720,6 @@ self: {
        homepage = "http://github.com/cmoore/web-mongrel2";
        description = "Bindings for the Mongrel2 web server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-page" = callPackage
@@ -214729,7 +211836,6 @@ self: {
        homepage = "http://docs.yesodweb.com/web-routes-quasi/";
        description = "Define data types and parse/build functions for web-routes via a quasi-quoted DSL (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-routes-regular" = callPackage
@@ -214769,7 +211875,6 @@ self: {
        jailbreak = true;
        description = "Extends web-routes with some transformers instances for RouteT";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "web-routes-wai" = callPackage
@@ -214831,7 +211936,6 @@ self: {
        homepage = "http://byteally.github.io/webapi/";
        description = "WAI based library for web api";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webapp" = callPackage
@@ -214854,7 +211958,6 @@ self: {
        homepage = "https://github.com/fhsjaagshs/webapp";
        description = "Haskell web app framework based on WAI & Warp";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webcrank" = callPackage
@@ -214900,7 +212003,6 @@ self: {
        homepage = "https://github.com/webcrank/webcrank-dispatch.hs";
        description = "A simple request dispatcher";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webcrank-wai" = callPackage
@@ -214919,7 +212021,6 @@ self: {
        homepage = "https://github.com/webcrank/webcrank-wai";
        description = "Build a WAI Application from Webcrank Resources";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webdriver_0_6_0_3" = callPackage
@@ -215216,7 +212317,6 @@ self: {
        homepage = "https://github.com/kallisti-dev/hs-webdriver";
        description = "a Haskell client for the Selenium WebDriver protocol (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webfinger-client" = callPackage
@@ -215279,7 +212379,6 @@ self: {
        homepage = "http://github.com/ananthakumaran/webify";
        description = "webfont generator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webkit" = callPackage
@@ -215310,7 +212409,6 @@ self: {
        libraryToolDepends = [ gtk2hs-buildtools ];
        description = "JavaScriptCore FFI from webkitgtk";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "webkitgtk3" = callPackage
@@ -215403,7 +212501,6 @@ self: {
        ];
        description = "HTTP server library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "websnap" = callPackage
@@ -215418,7 +212515,6 @@ self: {
        homepage = "https://github.com/jrb/websnap";
        description = "Transforms URLs to PNGs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "websockets_0_9_2_1" = callPackage
@@ -215688,7 +212784,6 @@ self: {
        ];
        description = "Functional reactive web framework";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wedding-announcement" = callPackage
@@ -215724,7 +212819,6 @@ self: {
        jailbreak = true;
        description = "Wedged postcard generator";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "weighted-regexp" = callPackage
@@ -215741,7 +212835,6 @@ self: {
        homepage = "http://sebfisch.github.com/haskell-regexp";
        description = "Weighted Regular Expression Matcher";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "weighted-search" = callPackage
@@ -215775,7 +212868,6 @@ self: {
        homepage = "https://github.com/mcschroeder/welshy";
        description = "Haskell web framework (because Scotty had trouble yodeling)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "werewolf" = callPackage
@@ -215818,7 +212910,6 @@ self: {
        homepage = "https://github.com/hansonkd/Wheb-Framework";
        description = "MongoDB plugin for Wheb";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wheb-redis" = callPackage
@@ -215832,7 +212923,6 @@ self: {
        homepage = "https://github.com/hansonkd/Wheb-Framework";
        description = "Redis connection for Wheb";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wheb-strapped" = callPackage
@@ -215846,7 +212936,6 @@ self: {
        homepage = "https://github.com/hansonkd/Wheb-Framework";
        description = "Strapped templates for Wheb";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "while-lang-parser" = callPackage
@@ -215878,7 +212967,6 @@ self: {
        homepage = "http://neugierig.org/software/darcs/whim/";
        description = "A Haskell window manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "whiskers" = callPackage
@@ -215905,7 +212993,6 @@ self: {
        homepage = "https://github.com/haroldl/whitespace-nd";
        description = "Whitespace, an esoteric programming language";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "whois" = callPackage
@@ -215972,7 +213059,6 @@ self: {
        homepage = "http://rampa.sk/static/wikipedia4epub.html";
        description = "Wikipedia EPUB E-Book construction from Firefox history";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "win-hp-path" = callPackage
@@ -216007,7 +213093,6 @@ self: {
        homepage = "http://patch-tag.com/repo/windowslive";
        description = "Implements Windows Live Web Authentication and Delegated Authentication";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "winerror" = callPackage
@@ -216019,7 +213104,6 @@ self: {
        doHaddock = false;
        description = "Error handling for foreign calls to the Windows API";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "winio" = callPackage
@@ -216037,7 +213121,6 @@ self: {
        homepage = "http://github.com/felixmar/winio";
        description = "I/O library for Windows";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {kernel32 = null; ws2_32 = null;};
 
   "wiring" = callPackage
@@ -216088,7 +213171,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "witherable" = callPackage
+  "witherable_0_1_3_2" = callPackage
     ({ mkDerivation, base, base-orphans, containers, hashable
      , transformers, unordered-containers, vector
      }:
@@ -216103,6 +213186,24 @@ self: {
        homepage = "https://github.com/fumieval/witherable";
        description = "Generalization of filter and catMaybes";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "witherable" = callPackage
+    ({ mkDerivation, base, base-orphans, containers, hashable
+     , transformers, unordered-containers, vector
+     }:
+     mkDerivation {
+       pname = "witherable";
+       version = "0.1.3.3";
+       sha256 = "6fdfd607e71b442d17b48ab7e00fe3d8dda2c39cf041134d01d49da83421cf6c";
+       libraryHaskellDepends = [
+         base base-orphans containers hashable transformers
+         unordered-containers vector
+       ];
+       homepage = "https://github.com/fumieval/witherable";
+       description = "Generalization of filter and catMaybes";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "witness" = callPackage
@@ -216355,7 +213456,6 @@ self: {
        jailbreak = true;
        description = "Haskell bindings for the wlc library";
        license = stdenv.lib.licenses.isc;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) wlc;};
 
   "wobsurv" = callPackage
@@ -216393,7 +213493,6 @@ self: {
        homepage = "https://github.com/nikita-volkov/wobsurv";
        description = "A simple and highly performant HTTP file server";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "woffex" = callPackage
@@ -216410,7 +213509,6 @@ self: {
        jailbreak = true;
        description = "Web Open Font Format (WOFF) unpacker";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wol" = callPackage
@@ -216461,7 +213559,6 @@ self: {
        homepage = "https://github.com/swift-nav/wolf";
        description = "Amazon Simple Workflow Service Wrapper";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "woot" = callPackage
@@ -216508,7 +213605,6 @@ self: {
        homepage = "http://www.tiresiaspress.us/haskell/word24";
        description = "24-bit word and int types for GHC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "word8_0_1_1" = callPackage
@@ -216655,7 +213751,6 @@ self: {
        executableHaskellDepends = [ base containers fclabels ];
        description = "A word search solver library and executable";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wordsetdiff" = callPackage
@@ -216696,7 +213791,6 @@ self: {
        homepage = "https://github.com/sboosali/workflow-osx#readme";
        description = "a \"Desktop Workflow\" monad with Objective-C bindings";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wp-archivebot" = callPackage
@@ -216713,7 +213807,6 @@ self: {
        jailbreak = true;
        description = "Subscribe to a wiki's RSS feed and archive external links";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wrap" = callPackage
@@ -216759,7 +213852,6 @@ self: {
        homepage = "http://code.haskell.org/~thielema/wraxml/";
        description = "Lazy wrapper to HaXML, HXT, TagSoup via custom XML tree structure";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wreq_0_3_0_1" = callPackage
@@ -216933,7 +214025,6 @@ self: {
        jailbreak = true;
        description = "Colour space transformations and metrics";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wsdl" = callPackage
@@ -216953,7 +214044,6 @@ self: {
        ];
        description = "WSDL parsing in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wsedit" = callPackage
@@ -216983,7 +214073,6 @@ self: {
        libraryHaskellDepends = [ base old-locale time transformers ];
        description = "Wojcik Tool Kit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wtk-gtk" = callPackage
@@ -216999,7 +214088,6 @@ self: {
        ];
        description = "GTK tools within Wojcik Tool Kit";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wumpus-basic" = callPackage
@@ -217016,7 +214104,6 @@ self: {
        homepage = "http://code.google.com/p/copperbox/";
        description = "Basic objects and system code built on Wumpus-Core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wumpus-core" = callPackage
@@ -217032,7 +214119,6 @@ self: {
        homepage = "http://code.google.com/p/copperbox/";
        description = "Pure Haskell PostScript and SVG generation";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wumpus-drawing" = callPackage
@@ -217049,7 +214135,6 @@ self: {
        homepage = "http://code.google.com/p/copperbox/";
        description = "High-level drawing objects built on Wumpus-Basic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wumpus-microprint" = callPackage
@@ -217067,7 +214152,6 @@ self: {
        homepage = "http://code.google.com/p/copperbox/";
        description = "Microprints - \"greek-text\" pictures";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wumpus-tree" = callPackage
@@ -217085,7 +214169,6 @@ self: {
        homepage = "http://code.google.com/p/copperbox/";
        description = "Drawing trees";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wuss" = callPackage
@@ -217115,7 +214198,6 @@ self: {
        homepage = "https://wiki.haskell.org/WxHaskell";
        description = "wxHaskell";
        license = "unknown";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "wxAsteroids" = callPackage
@@ -217146,7 +214228,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/WxFruit";
        description = "An implementation of Fruit using wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wxc" = callPackage
@@ -217164,7 +214245,6 @@ self: {
        homepage = "https://wiki.haskell.org/WxHaskell";
        description = "wxHaskell C++ wrapper";
        license = "unknown";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs.xorg) libX11; inherit (pkgs) mesa; 
          inherit (pkgs) wxGTK;};
 
@@ -217184,7 +214264,6 @@ self: {
        homepage = "https://wiki.haskell.org/WxHaskell";
        description = "wxHaskell core";
        license = "unknown";
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) wxGTK;};
 
   "wxdirect" = callPackage
@@ -217218,7 +214297,6 @@ self: {
        homepage = "http://github.com/elbrujohalcon/wxhnotepad";
        description = "An example of how to implement a basic notepad with wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wxturtle" = callPackage
@@ -217234,7 +214312,6 @@ self: {
        ];
        description = "turtle like LOGO with wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "wybor" = callPackage
@@ -217277,7 +214354,6 @@ self: {
        homepage = "http://dmwit.com/wyvern";
        description = "An autoresponder for Dragon Go Server";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "x-dsp" = callPackage
@@ -217296,7 +214372,6 @@ self: {
        homepage = "http://jwlato.webfactional.com/haskell/x-dsp";
        description = "A embedded DSL for manipulating DSP languages in Haskell";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "x11-xim" = callPackage
@@ -217325,7 +214400,6 @@ self: {
        homepage = "http://redmine.iportnov.ru/projects/x11-xinput";
        description = "Haskell FFI bindings for X11 XInput library (-lXi)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs.xorg) libXi;};
 
   "x509_1_5_0_1" = callPackage
@@ -217728,7 +214802,6 @@ self: {
        ];
        description = "Haskell extended file attributes interface";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) attr;};
 
   "xbattbar" = callPackage
@@ -217743,7 +214816,6 @@ self: {
        homepage = "https://github.com/polachok/xbattbar";
        description = "Simple battery indicator";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "xcb-types" = callPackage
@@ -217801,7 +214873,6 @@ self: {
        ];
        description = "XChat";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xcp" = callPackage
@@ -217895,7 +214966,6 @@ self: {
        homepage = "http://patch-tag.com/r/obbele/xfconf/home";
        description = "FFI bindings to xfconf";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {libxfconf-0 = null;};
 
   "xformat" = callPackage
@@ -217926,7 +214996,6 @@ self: {
        homepage = "http://code.google.com/p/xhaskell-library/";
        description = "Replaces/Enhances Text.Regex";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xhb" = callPackage
@@ -217979,7 +215048,6 @@ self: {
        homepage = "http://github.com/jotrk/xhb-ewmh/";
        description = "EWMH utilities for XHB";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xhtml_3000_2_1" = callPackage
@@ -218039,7 +215107,6 @@ self: {
        homepage = "http://github.com/joachifm/hxine";
        description = "Bindings to xine-lib";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {libxine = null; xine = null;};
 
   "xing-api" = callPackage
@@ -218065,7 +215132,6 @@ self: {
        homepage = "http://github.com/JanAhrens/xing-api-haskell";
        description = "Wrapper for the XING API, v1";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xinput-conduit" = callPackage
@@ -218100,7 +215166,6 @@ self: {
        testHaskellDepends = [ base unix ];
        description = "Haskell bindings for libxkbcommon";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libxkbcommon;};
 
   "xkcd" = callPackage
@@ -218119,7 +215184,6 @@ self: {
        homepage = "http://github.com/sellweek/xkcd";
        description = "Downloads the most recent xkcd comic";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xlsior" = callPackage
@@ -218341,7 +215405,6 @@ self: {
        homepage = "https://github.com/qrilka/xlsx";
        description = "Simple and incomplete Excel file parser/writer";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xlsx-templater" = callPackage
@@ -218362,7 +215425,6 @@ self: {
        homepage = "https://github.com/qrilka/xlsx-templater";
        description = "Simple and incomplete Excel file templater";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml_1_3_13" = callPackage
@@ -218422,7 +215484,6 @@ self: {
        homepage = "http://github.com/snoyberg/xml";
        description = "Parse XML catalog files (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-conduit_1_2_3" = callPackage
@@ -218677,6 +215738,31 @@ self: {
        license = stdenv.lib.licenses.mit;
      }) {};
 
+  "xml-conduit_1_3_4" = callPackage
+    ({ mkDerivation, attoparsec, base, blaze-builder, blaze-html
+     , blaze-markup, bytestring, conduit, conduit-extra, containers
+     , data-default, deepseq, hspec, HUnit, monad-control, resourcet
+     , text, transformers, xml-types
+     }:
+     mkDerivation {
+       pname = "xml-conduit";
+       version = "1.3.4";
+       sha256 = "1613ad696d4385a74f646e752ecd3ef576350427961e638d00fa58e01215f46d";
+       libraryHaskellDepends = [
+         attoparsec base blaze-builder blaze-html blaze-markup bytestring
+         conduit conduit-extra containers data-default deepseq monad-control
+         resourcet text transformers xml-types
+       ];
+       testHaskellDepends = [
+         base blaze-markup bytestring conduit containers hspec HUnit
+         resourcet text transformers xml-types
+       ];
+       homepage = "http://github.com/snoyberg/xml";
+       description = "Pure-Haskell utilities for dealing with XML with the conduit package";
+       license = stdenv.lib.licenses.mit;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
   "xml-conduit-parse" = callPackage
     ({ mkDerivation, base, conduit, conduit-parse, containers
      , data-default, exceptions, hlint, parsers, resourcet, tasty
@@ -218739,7 +215825,6 @@ self: {
        homepage = "http://github.com/snoyberg/xml";
        description = "Pure-Haskell utilities for dealing with XML with the enumerator package. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-enumerator-combinators" = callPackage
@@ -218758,7 +215843,6 @@ self: {
        jailbreak = true;
        description = "Parser combinators for xml-enumerator and compatible XML parsers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-extractors" = callPackage
@@ -218918,7 +216002,6 @@ self: {
        homepage = "http://sep07.mroot.net/";
        description = "Parsing XML with Parsec";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-picklers" = callPackage
@@ -218948,7 +216031,6 @@ self: {
        homepage = "https://github.com/YoshikuniJujo/xml-pipe/wiki";
        description = "XML parser which uses simple-pipe";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-prettify" = callPackage
@@ -218964,7 +216046,6 @@ self: {
        homepage = "http://github.com/rosenbergdm/xml-prettify";
        description = "Pretty print XML";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-push" = callPackage
@@ -218986,7 +216067,6 @@ self: {
        homepage = "https://github.com/YoshikuniJujo/xml-push/wiki";
        description = "Push XML from/to client to/from server over XMPP or HTTP";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-query" = callPackage
@@ -219018,7 +216098,6 @@ self: {
        homepage = "https://github.com/sannsyn/xml-query-xml-conduit";
        description = "A binding for the \"xml-query\" and \"xml-conduit\" libraries";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-query-xml-types" = callPackage
@@ -219044,7 +216123,6 @@ self: {
        homepage = "https://github.com/sannsyn/xml-query-xml-types";
        description = "An interpreter of \"xml-query\" queries for the \"xml-types\" documents";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml-to-json" = callPackage
@@ -219165,7 +216243,6 @@ self: {
        homepage = "http://github.com/yihuang/xml2json";
        description = "translate xml to json";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xml2x" = callPackage
@@ -219184,7 +216261,6 @@ self: {
        jailbreak = true;
        description = "Convert BLAST output in XML format to CSV or HTML";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmlgen" = callPackage
@@ -219266,7 +216342,6 @@ self: {
        homepage = "http://github.com/dagle/hs-xmltv";
        description = "Show tv channels in the terminal";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmms2-client" = callPackage
@@ -219283,7 +216358,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An XMMS2 client library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmms2-client-glib" = callPackage
@@ -219296,7 +216370,6 @@ self: {
        libraryToolDepends = [ c2hs ];
        description = "An XMMS2 client library — GLib integration";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmobar" = callPackage
@@ -219325,7 +216398,6 @@ self: {
        homepage = "http://xmobar.org";
        description = "A Minimalistic Text Based Status Bar";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {Xrender = null; inherit (pkgs.xorg) libXpm; 
          inherit (pkgs.xorg) libXrandr; inherit (pkgs) wirelesstools;};
 
@@ -219376,7 +216448,6 @@ self: {
        homepage = "http://xmonad.org";
        description = "A tiling window manager";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmonad-contrib" = callPackage
@@ -219418,7 +216489,6 @@ self: {
        homepage = "http://xmonad.org/";
        description = "Third party extensions for xmonad";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmonad-contrib-gpl" = callPackage
@@ -219466,7 +216536,6 @@ self: {
        homepage = "http://xmonad.org/";
        description = "Module for evaluation Haskell expressions in the running xmonad instance";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xmonad-extras" = callPackage
@@ -219515,7 +216584,6 @@ self: {
        homepage = "https://github.com/LeifW/xmonad-utils";
        description = "A small collection of X utilities";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "xmonad-wallpaper" = callPackage
@@ -219562,7 +216630,6 @@ self: {
        homepage = "https://github.com/YoshikuniJujo/xmpipe/wiki";
        description = "XMPP implementation using simple-PIPE";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xorshift" = callPackage
@@ -219587,7 +216654,6 @@ self: {
        homepage = "http://code.haskell.org/~dons/code/xosd";
        description = "A binding to the X on-screen display";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {inherit (pkgs) xosd;};
 
   "xournal-builder" = callPackage
@@ -219605,7 +216671,6 @@ self: {
        jailbreak = true;
        description = "text builder for xournal file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xournal-convert" = callPackage
@@ -219628,7 +216693,6 @@ self: {
        homepage = "http://ianwookim.org/hxournal";
        description = "convert utility for xoj files";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xournal-parser" = callPackage
@@ -219649,7 +216713,6 @@ self: {
        homepage = "http://ianwookim.org/hoodle";
        description = "Xournal file parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xournal-render" = callPackage
@@ -219667,7 +216730,6 @@ self: {
        jailbreak = true;
        description = "Xournal file renderer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xournal-types" = callPackage
@@ -219685,7 +216747,6 @@ self: {
        ];
        description = "Data types for programs for xournal file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xsact" = callPackage
@@ -219705,7 +216766,6 @@ self: {
        homepage = "http://malde.org/~ketil/";
        description = "Cluster EST sequences";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "xsd" = callPackage
@@ -219746,7 +216806,6 @@ self: {
        librarySystemDepends = [ xslt ];
        description = "Binding to libxslt";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {xslt = null;};
 
   "xss-sanitize_0_3_5_4" = callPackage
@@ -219825,7 +216884,6 @@ self: {
        homepage = "http://github.com/alanz/xtc";
        description = "eXtended & Typed Controls for wxHaskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "xtest" = callPackage
@@ -219892,7 +216950,6 @@ self: {
        jailbreak = true;
        description = "#plaimi's all-encompassing bot";
        license = stdenv.lib.licenses.agpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yabi" = callPackage
@@ -220074,7 +217131,6 @@ self: {
        homepage = "http://www.people.fas.harvard.edu/~stewart5/code/yahoo-web-search";
        description = "Yahoo Web Search Services";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yajl" = callPackage
@@ -220089,7 +217145,6 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-yajl/";
        description = "Bindings for YAJL, an event-based JSON implementation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) yajl;};
 
   "yajl-enumerator" = callPackage
@@ -220107,7 +217162,6 @@ self: {
        homepage = "https://john-millikin.com/software/haskell-yajl/";
        description = "Enumerator-based interface to YAJL, an event-based JSON implementation";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yall" = callPackage
@@ -220467,7 +217521,6 @@ self: {
        homepage = "http://redmine.iportnov.ru/projects/yaml-rpc";
        description = "Simple library for network (HTTP REST-like) YAML RPC";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yaml-rpc-scotty" = callPackage
@@ -220485,7 +217538,6 @@ self: {
        homepage = "http://redmine.iportnov.ru/projects/yaml-rpc";
        description = "Scotty server backend for yaml-rpc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yaml-rpc-snap" = callPackage
@@ -220503,7 +217555,6 @@ self: {
        homepage = "http://redmine.iportnov.ru/projects/yaml-rpc";
        description = "Snap server backend for yaml-rpc";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yaml-union" = callPackage
@@ -220524,7 +217575,6 @@ self: {
        homepage = "https://github.com/michelk/yaml-overrides.hs";
        description = "Read multiple yaml-files and override fields recursively";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yaml2owl" = callPackage
@@ -220543,7 +217593,6 @@ self: {
        homepage = "http://github.com/leifw/yaml2owl";
        description = "Generate OWL schema from YAML syntax, and an RDFa template";
        license = "LGPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yamlkeysdiff" = callPackage
@@ -220577,7 +217626,6 @@ self: {
        executableHaskellDepends = [ base blank-canvas text Yampa ];
        description = "blank-canvas frontend for Yampa";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yampa-glfw" = callPackage
@@ -220597,7 +217645,6 @@ self: {
        homepage = "https://github.com/deepfire/yampa-glfw";
        description = "Connects GLFW-b (GLFW 3+) with the Yampa FRP library";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yampa-glut" = callPackage
@@ -220620,7 +217667,6 @@ self: {
        homepage = "https://github.com/ony/yampa-glut";
        description = "Connects Yampa and GLUT";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yampa2048" = callPackage
@@ -220636,7 +217682,6 @@ self: {
        homepage = "https://github.com/ksaveljev/yampa-2048";
        description = "2048 game clone using Yampa/Gloss";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "yaop" = callPackage
@@ -220651,7 +217696,6 @@ self: {
        homepage = "https://github.com/esmolanka/yaop";
        description = "Yet another option parser";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yap" = callPackage
@@ -220702,7 +217746,6 @@ self: {
        jailbreak = true;
        description = "Yet another array library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yarr-image-io" = callPackage
@@ -220716,7 +217759,6 @@ self: {
        jailbreak = true;
        description = "Image IO for Yarr library";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) libdevil;};
 
   "yate" = callPackage
@@ -220737,7 +217779,6 @@ self: {
        jailbreak = true;
        description = "Yet Another Template Engine";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yavie" = callPackage
@@ -220756,7 +217797,6 @@ self: {
        executableHaskellDepends = [ base Cabal directory process ];
        description = "yet another visual editor";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ycextra" = callPackage
@@ -220771,7 +217811,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Yhc";
        description = "Additional utilities to work with Yhc Core";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yeganesh" = callPackage
@@ -221020,7 +218059,6 @@ self: {
        homepage = "https://github.com/tolysz/yesod-angular-ui";
        description = "Angular Helpers";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth_1_4_1" = callPackage
@@ -221610,7 +218648,7 @@ self: {
          yesod-auth yesod-core
        ];
        homepage = "https://github.com/prowdsponsor/yesod-auth-deskcom";
-       description = "Desk.com remote authentication support for Yesod apps";
+       description = "Desk.com remote authentication support for Yesod apps.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -221790,7 +218828,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "LDAP Authentication for Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-ldap-mediocre" = callPackage
@@ -221824,7 +218861,6 @@ self: {
        homepage = "http://github.com/mulderr/yesod-auth-ldap-native";
        description = "Yesod LDAP authentication plugin";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-oauth_1_4_0_1" = callPackage
@@ -221845,7 +218881,7 @@ self: {
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
-  "yesod-auth-oauth" = callPackage
+  "yesod-auth-oauth_1_4_0_2" = callPackage
     ({ mkDerivation, authenticate-oauth, base, bytestring, lifted-base
      , text, transformers, yesod-auth, yesod-core, yesod-form
      }:
@@ -221860,6 +218896,24 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "OAuth Authentication for Yesod";
        license = stdenv.lib.licenses.bsd3;
+       hydraPlatforms = stdenv.lib.platforms.none;
+     }) {};
+
+  "yesod-auth-oauth" = callPackage
+    ({ mkDerivation, authenticate-oauth, base, bytestring, lifted-base
+     , text, transformers, yesod-auth, yesod-core, yesod-form
+     }:
+     mkDerivation {
+       pname = "yesod-auth-oauth";
+       version = "1.4.1";
+       sha256 = "6046eceb32cbd852c9737a8f09e25c0609296373bd4974bb256ba9dc2e7b48c8";
+       libraryHaskellDepends = [
+         authenticate-oauth base bytestring lifted-base text transformers
+         yesod-auth yesod-core yesod-form
+       ];
+       homepage = "http://www.yesodweb.com/";
+       description = "OAuth Authentication for Yesod";
+       license = stdenv.lib.licenses.bsd3;
      }) {};
 
   "yesod-auth-oauth2_0_0_11" = callPackage
@@ -221878,7 +218932,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://github.com/scan/yesod-auth-oauth2";
-       description = "Library to authenticate with OAuth 2.0 for Yesod web applications";
+       description = "Library to authenticate with OAuth 2.0 for Yesod web applications.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -221899,7 +218953,7 @@ self: {
        ];
        jailbreak = true;
        homepage = "http://github.com/scan/yesod-auth-oauth2";
-       description = "Library to authenticate with OAuth 2.0 for Yesod web applications";
+       description = "Library to authenticate with OAuth 2.0 for Yesod web applications.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -222052,7 +219106,6 @@ self: {
        ];
        description = "Provides PAM authentication module";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-smbclient" = callPackage
@@ -222070,7 +219123,6 @@ self: {
        homepage = "https://github.com/kkazuo/yesod-auth-smbclient.git";
        description = "Authentication plugin for Yesod using smbclient";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-auth-zendesk" = callPackage
@@ -223188,7 +220240,6 @@ self: {
        homepage = "http://github.com/pbrisbin/yesod-comments";
        description = "A generic comments interface for a Yesod application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-content-pdf" = callPackage
@@ -223211,7 +220262,6 @@ self: {
        homepage = "https://github.com/alexkyllo/yesod-content-pdf#readme";
        description = "PDF Content Type for Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-continuations" = callPackage
@@ -223231,7 +220281,6 @@ self: {
        homepage = "https://github.com/softmechanics/yesod-continuations/";
        description = "Continuations for Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-core_1_4_6" = callPackage
@@ -224168,7 +221217,6 @@ self: {
        homepage = "http://github.com/tlaitinen/yesod-datatables";
        description = "Yesod plugin for DataTables (jQuery grid plugin)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-default" = callPackage
@@ -224265,7 +221313,6 @@ self: {
        homepage = "http://www.yesodweb.com/";
        description = "Example programs using the Yesod Web Framework. (deprecated)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) sqlite;};
 
   "yesod-fay_0_7_0" = callPackage
@@ -224578,7 +221625,6 @@ self: {
        homepage = "http://github.com/pbrisbin/yesod-goodies";
        description = "A collection of various small helpers useful in any yesod application";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-json" = callPackage
@@ -224604,7 +221650,6 @@ self: {
        homepage = "http://github.com/pbrisbin/yesod-goodies/yesod-links";
        description = "A typeclass which simplifies creating link widgets throughout your site";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-lucid" = callPackage
@@ -224722,7 +221767,6 @@ self: {
        homepage = "https://github.com/prowdsponsor/mangopay";
        description = "Yesod library for MangoPay API access";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-markdown" = callPackage
@@ -224841,7 +221885,6 @@ self: {
        libraryHaskellDepends = [ base template-haskell yesod ];
        description = "Pagination for Yesod sites";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-pagination" = callPackage
@@ -224861,7 +221904,6 @@ self: {
        homepage = "https://github.com/joelteon/yesod-pagination";
        description = "Pagination in Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-paginator" = callPackage
@@ -225027,8 +222069,8 @@ self: {
      }:
      mkDerivation {
        pname = "yesod-pnotify";
-       version = "1.1.2";
-       sha256 = "9a128a35e68da0de09bb7d603cbc24f9b21942b673540b8812d5f072a1ec60c9";
+       version = "1.1.3.1";
+       sha256 = "67c2c9e808a963213f7a9b48472758b26a64c058ff2dfd8edd8f0c8ad053d407";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -225054,7 +222096,6 @@ self: {
        homepage = "https://github.com/snoyberg/yesod-pure";
        description = "Yesod in pure Haskell: no Template Haskell or QuasiQuotes (deprecated)";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-purescript" = callPackage
@@ -225076,7 +222117,6 @@ self: {
        homepage = "https://github.com/mpietrzak/yesod-purescript";
        description = "PureScript integration for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-raml" = callPackage
@@ -225122,7 +222162,6 @@ self: {
        ];
        description = "The raml helper executable";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-raml-docs" = callPackage
@@ -225162,7 +222201,6 @@ self: {
        ];
        description = "A mock-handler generator library from RAML";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-recaptcha" = callPackage
@@ -225239,7 +222277,6 @@ self: {
        homepage = "https://github.com/docmunch/yesod-routes-typescript";
        description = "generate TypeScript routes for Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-rst" = callPackage
@@ -225258,7 +222295,6 @@ self: {
        homepage = "http://github.com/pSub/yesod-rst";
        description = "Tools for using reStructuredText (RST) in a yesod application";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-s3" = callPackage
@@ -225276,7 +222312,6 @@ self: {
        homepage = "https://github.com/tvh/yesod-s3";
        description = "Simple Helper Library for using Amazon's Simple Storage Service (S3) with Yesod";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-sass" = callPackage
@@ -225312,7 +222347,6 @@ self: {
        homepage = "https://github.com/ollieh/yesod-session-redis";
        description = "Redis-Powered Sessions for Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-sitemap_1_4_0" = callPackage
@@ -225656,7 +222690,6 @@ self: {
        libraryHaskellDepends = [ base hamlet persistent yesod ];
        description = "Table view for Yesod applications";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-test_1_4_2" = callPackage
@@ -225864,7 +222897,6 @@ self: {
        homepage = "https://github.com/bogiebro/yesod-test-json";
        description = "Utility functions for testing JSON web services written in Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-text-markdown_0_1_7" = callPackage
@@ -225880,7 +222912,7 @@ self: {
          yesod-form yesod-persistent
        ];
        jailbreak = true;
-       description = "Yesod support for Text.Markdown";
+       description = "Yesod support for Text.Markdown.";
        license = stdenv.lib.licenses.bsd3;
        hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
@@ -225897,7 +222929,7 @@ self: {
          aeson base markdown persistent shakespeare text yesod-core
          yesod-form yesod-persistent
        ];
-       description = "Yesod support for Text.Markdown";
+       description = "Yesod support for Text.Markdown.";
        license = stdenv.lib.licenses.bsd3;
      }) {};
 
@@ -225916,7 +222948,6 @@ self: {
        homepage = "http://github.com/netom/yesod-tls";
        description = "Provides main functions using warp-tls for yesod projects";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-transloadit" = callPackage
@@ -225963,7 +222994,6 @@ self: {
        homepage = "https://github.com/Tener/yesod-vend";
        description = "Simple CRUD classes for easy view creation for Yesod";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yesod-websockets_0_2_0" = callPackage
@@ -226090,7 +223120,6 @@ self: {
        homepage = "https://github.com/jamesdabbs/yesod-worker";
        description = "Drop-in(ish) background worker system for Yesod apps";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yet-another-logger" = callPackage
@@ -226137,7 +223166,6 @@ self: {
        homepage = "http://www.haskell.org/haskellwiki/Yhc";
        description = "Yhc's Internal Core language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi" = callPackage
@@ -226194,7 +223222,6 @@ self: {
        homepage = "http://haskell.org/haskellwiki/Yi";
        description = "Add-ons to Yi, the Haskell-Scriptable Editor";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yi-emacs-colours" = callPackage
@@ -226295,7 +223322,6 @@ self: {
        ];
        description = "A rope data structure used by Yi";
        license = stdenv.lib.licenses.gpl2;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {};
 
   "yi-snippet" = callPackage
@@ -226356,7 +223382,6 @@ self: {
        libraryHaskellDepends = [ base parsec process ];
        description = "Haskell programming interface to Yices SMT solver";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yices-easy" = callPackage
@@ -226410,7 +223435,6 @@ self: {
        homepage = "http://homepage3.nifty.com/salamander/second/projects/yjftp/index.xhtml";
        description = "CUI FTP client like 'ftp', 'ncftp'";
        license = "GPL";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yjftp-libs" = callPackage
@@ -226498,7 +223522,6 @@ self: {
        ];
        description = "Generic Programming with Disbanded Data Types";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "york-lava" = callPackage
@@ -226511,7 +223534,6 @@ self: {
        homepage = "http://www.cs.york.ac.uk/fp/reduceron/";
        description = "A library for digital circuit description";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "youtube" = callPackage
@@ -226553,7 +223575,6 @@ self: {
        homepage = "https://github.com/fabianbergmark/YQL";
        description = "A YQL engine to execute Open Data Tables";
        license = stdenv.lib.licenses.bsd2;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yst" = callPackage
@@ -226587,7 +223608,6 @@ self: {
        libraryHaskellDepends = [ base ];
        description = "Grids defined by layout hints and implemented on top of Yahoo grids";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yuuko" = callPackage
@@ -226611,7 +223631,6 @@ self: {
        homepage = "http://github.com/nfjinjing/yuuko";
        description = "A transcendental HTML parser gently wrapping the HXT library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "yxdb-utils" = callPackage
@@ -226650,7 +223669,6 @@ self: {
        ];
        description = "Utilities for reading and writing Alteryx .yxdb files";
        license = stdenv.lib.licenses.gpl3;
-       hydraPlatforms = [ "x86_64-darwin" "x86_64-linux" ];
      }) {};
 
   "z3" = callPackage
@@ -226668,7 +223686,6 @@ self: {
        homepage = "http://bitbucket.org/iago/z3-haskell";
        description = "Bindings for the Z3 Theorem Prover";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = [ "i686-linux" "x86_64-linux" ];
      }) {gomp = null; inherit (pkgs) z3;};
 
   "zalgo" = callPackage
@@ -226700,7 +223717,6 @@ self: {
        homepage = "https://github.com/briansniffen/zampolit";
        description = "A tool for checking how much work is done on group projects";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zasni-gerna" = callPackage
@@ -226713,7 +223729,6 @@ self: {
        homepage = "https://skami.iocikun.jp/haskell/packages/zasni-gerna";
        description = "lojban parser (zasni gerna)";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zcache" = callPackage
@@ -226762,7 +223777,6 @@ self: {
        homepage = "https://github.com/VictorDenisov/zendesk-api";
        description = "Zendesk API for Haskell programming language";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zeno" = callPackage
@@ -226781,7 +223795,6 @@ self: {
        ];
        description = "An automated proof system for Haskell programs";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zero_0_1_2" = callPackage
@@ -226830,8 +223843,8 @@ self: {
      }:
      mkDerivation {
        pname = "zerobin";
-       version = "1.5.0";
-       sha256 = "f2ad48725b473c417f1b4c607b5e1f46e3d6fdfa50aaf15a576e86c8a020f318";
+       version = "1.5.1";
+       sha256 = "e0f3487d1c51344c76d4d24420c1ff74512a1e3add7425acca185657bf9c8e9a";
        isLibrary = true;
        isExecutable = true;
        libraryHaskellDepends = [
@@ -226844,7 +223857,6 @@ self: {
        jailbreak = true;
        description = "Post to 0bin services";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zeromq-haskell" = callPackage
@@ -226864,7 +223876,6 @@ self: {
        homepage = "http://github.com/twittner/zeromq-haskell/";
        description = "Bindings to ZeroMQ 2.1.x";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zeromq;};
 
   "zeromq3-conduit" = callPackage
@@ -226882,7 +223893,6 @@ self: {
        homepage = "https://github.com/NicolasT/zeromq3-conduit";
        description = "Conduit bindings for zeromq3-haskell";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zeromq3-haskell" = callPackage
@@ -226906,7 +223916,6 @@ self: {
        homepage = "http://github.com/twittner/zeromq-haskell/";
        description = "Bindings to ZeroMQ 3.x";
        license = stdenv.lib.licenses.mit;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {inherit (pkgs) zeromq;};
 
   "zeromq4-haskell_0_6_2" = callPackage
@@ -226998,7 +224007,6 @@ self: {
        jailbreak = true;
        description = "ZeroTH - remove unnecessary TH dependencies";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zigbee-znet25" = callPackage
@@ -227150,7 +224158,6 @@ self: {
        homepage = "http://code.haskell.org/~byorgey/code/zipedit";
        description = "Create simple list editor interfaces";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zipkin" = callPackage
@@ -227376,7 +224383,6 @@ self: {
        homepage = "https://github.com/lucasdicioccio/zmcat";
        description = "Command-line tool for ZeroMQ";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zmidi-core" = callPackage
@@ -227425,7 +224431,6 @@ self: {
        ];
        description = "A socat-like tool for zeromq library";
        license = "unknown";
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zoneinfo" = callPackage
@@ -227438,7 +224443,6 @@ self: {
        jailbreak = true;
        description = "ZoneInfo library";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zoom" = callPackage
@@ -227459,7 +224463,6 @@ self: {
        homepage = "http://github.com/iand675/Zoom";
        description = "A rake/thor-like task runner written in Haskell";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zoom-cache" = callPackage
@@ -227492,7 +224495,6 @@ self: {
        jailbreak = true;
        description = "A streamable, seekable, zoomable cache file format";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zoom-cache-pcm" = callPackage
@@ -227510,7 +224512,6 @@ self: {
        jailbreak = true;
        description = "Library for zoom-cache PCM audio codecs";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zoom-cache-sndfile" = callPackage
@@ -227531,7 +224532,6 @@ self: {
        jailbreak = true;
        description = "Tools for generating zoom-cache-pcm files";
        license = stdenv.lib.licenses.lgpl21;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zoom-refs" = callPackage
@@ -227558,7 +224558,6 @@ self: {
        executableHaskellDepends = [ base monads-tf ];
        description = "Zot language";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "zsh-battery" = callPackage
@@ -227573,7 +224572,6 @@ self: {
        homepage = "https://github.com/MasseR/zsh-battery";
        description = "Ascii bars representing battery status";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
   "ztail" = callPackage
@@ -227592,7 +224590,6 @@ self: {
        ];
        description = "Multi-file, colored, filtered log tailer";
        license = stdenv.lib.licenses.bsd3;
-       hydraPlatforms = stdenv.lib.platforms.none;
      }) {};
 
 }

From 86c6d59f95e57ccea7b45bc00134f80140919f87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 4 Mar 2016 06:43:11 -0300
Subject: [PATCH 2149/2285] font-manager: init at git-2016-03-02

---
 .../misc/font-manager/default.nix             | 69 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 73 insertions(+)
 create mode 100644 pkgs/applications/misc/font-manager/default.nix

diff --git a/pkgs/applications/misc/font-manager/default.nix b/pkgs/applications/misc/font-manager/default.nix
new file mode 100644
index 000000000000..a71e9c7ff92d
--- /dev/null
+++ b/pkgs/applications/misc/font-manager/default.nix
@@ -0,0 +1,69 @@
+{ stdenv, fetchFromGitHub, makeWrapper, automake, autoconf, libtool,
+  pkgconfig, file, intltool, libxml2, json_glib , sqlite, itstool,
+  vala, gnome3
+}:
+
+stdenv.mkDerivation rec {
+  name = "font-manager-${version}";
+  version = "git-2016-03-02";
+
+  src = fetchFromGitHub {
+    owner  = "FontManager";
+    repo   = "master";
+    rev    = "743fb83558c86bfbbec898106072f84422c175d6";
+    sha256 = "1sakss6irfr3d8k39x1rf72fmnpq47akhyrv3g45a3l6v6xfqp3k";
+    };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [
+    makeWrapper
+    pkgconfig
+    automake autoconf libtool
+    file
+    intltool
+    libxml2
+    json_glib
+    sqlite
+    itstool
+    vala
+    gnome3.gtk
+    gnome3.gucharmap
+    gnome3.libgee
+    gnome3.file-roller
+    gnome3.yelp_tools
+  ];
+
+  preConfigure = ''
+    NOCONFIGURE=true ./autogen.sh
+    chmod +x configure;
+    substituteInPlace configure --replace "/usr/bin/file" "${file}/bin/file"
+  '';
+
+  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";
+    longDescription = ''
+      Font Manager is intended to provide a way for average users to
+      easily manage desktop fonts, without having to resort to command
+      line tools or editing configuration files by hand. While designed
+      primarily with the Gnome Desktop Environment in mind, it should
+      work well with other Gtk+ desktop environments.
+
+      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;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eac026add04f..184b16c2617f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12102,6 +12102,10 @@ let
 
   focuswriter = callPackage ../applications/editors/focuswriter { };
 
+  font-manager = callPackage ../applications/misc/font-manager {
+    vala = vala_0_28;
+  };
+
   foo-yc20 = callPackage ../applications/audio/foo-yc20 { };
 
   fossil = callPackage ../applications/version-management/fossil { };

From 9477c248fa1c8119f11cb809e17ce4414039abd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 4 Mar 2016 07:42:08 -0300
Subject: [PATCH 2150/2285] gsimplecal: init at 2.1

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

diff --git a/pkgs/applications/misc/gsimplecal/default.nix b/pkgs/applications/misc/gsimplecal/default.nix
new file mode 100644
index 000000000000..975bc3b358d8
--- /dev/null
+++ b/pkgs/applications/misc/gsimplecal/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, automake, autoconf, pkgconfig, gtk3 }:
+
+stdenv.mkDerivation rec {
+  name = "gsimplecal-${version}";
+  version = "2.1";
+
+  src = fetchurl {
+    url = "https://github.com/dmedvinsky/gsimplecal/archive/v${version}.tar.gz";
+    sha256 = "1sa05ifjp41xipfspk5n6l3wzpzmp3i45q88l01p4l6k6drsq336";
+  };
+
+  enableParallelBuilding = true;
+
+  buildInputs = [ pkgconfig automake autoconf gtk3 ];
+
+  preConfigure = "./autogen.sh";
+
+  meta = {
+    homepage = http://dmedvinsky.github.io/gsimplecal/;
+    description = "Lightweight calendar application written in C++ using GTK";
+    longDescription = ''
+      gsimplecal was intentionally made for use with tint2 panel in the
+      openbox environment to be launched upon clock click, but of course it
+      will work without it. In fact, binding the gsimplecal to some hotkey in
+      you window manager will probably make you happy. The thing is that when
+      it is started it first shows up, when you run it again it closes the
+      running instance. In that way it is very easy to integrate anywhere. No
+      need to write some wrapper scripts or whatever.
+
+      Also, you can configure it to not only show the calendar, but also
+      display multiple clocks for different world time zones.
+    '';
+    license = stdenv.lib.licenses.bsd3;
+    maintainers = [ stdenv.lib.maintainers.romildo ];
+    platforms = stdenv.lib.platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eac026add04f..8da003ec51f8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12150,6 +12150,8 @@ let
     inherit (gnome) libgnome libgnomeui vte;
   };
 
+  gsimplecal = callPackage ../applications/misc/gsimplecal { };
+
   gtimelog = pythonPackages.gtimelog;
 
   inherit (gnome3) gucharmap;

From 15c4167d28a543b53b5f8021a0e22bf8bd4c4947 Mon Sep 17 00:00:00 2001
From: "Bruno Bzeznik Bruno.Bzeznik@imag.fr" <Bruno.Bzeznik@imag.fr>
Date: Fri, 4 Mar 2016 12:02:28 +0100
Subject: [PATCH 2151/2285] kanif: init at 1.2.2

---
 .../networking/cluster/kanif/default.nix      | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/kanif/default.nix

diff --git a/pkgs/applications/networking/cluster/kanif/default.nix b/pkgs/applications/networking/cluster/kanif/default.nix
new file mode 100644
index 000000000000..bac0cc37af33
--- /dev/null
+++ b/pkgs/applications/networking/cluster/kanif/default.nix
@@ -0,0 +1,37 @@
+{ stdenv, fetchurl, perl , taktuk}:
+
+stdenv.mkDerivation rec {
+  version = "1.2.2";
+  name = "kanif-${version}";
+
+  propagateBuildInputs = [ perl taktuk ];
+
+  src = fetchurl {
+    url = "http://gforge.inria.fr/frs/download.php/26773/${name}.tar.gz";
+    sha256 = "3f0c549428dfe88457c1db293cfac2a22b203f872904c3abf372651ac12e5879";
+  };
+
+  preBuild = ''
+      substituteInPlace ./kanif --replace "/usr/bin/perl" "${perl}/bin/perl"
+      substituteInPlace ./kanif --replace '$taktuk_command = "taktuk";' '$taktuk_command = "${taktuk}/bin/taktuk";'
+  '';
+
+  meta = {
+    description = "Cluster management and administration swiss army knife";
+    longDescription = ''
+      Kanif is a tool for high performance computing clusters management and
+      administration. It combines the main functionalities of well-known cluster
+      management tools such as c3, pdsh and dsh, and mimics their syntax. It
+      provides three tools to run the same command on several nodes ("parallel
+      ssh", using the 'kash' command), to broadcast the copy of files or
+      directories to several nodes ('kaput' command), and to gather several
+      remote files or directories locally ('kaget' command). It relies on TakTuk
+      for efficiency and scalability.'';
+    homepage = http://taktuk.gforge.inria.fr/kanif;
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = [ stdenv.lib.maintainers.bzizou ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+
+}
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index eac026add04f..c47b434a1ddf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5338,6 +5338,8 @@ let
 
   davmail = callPackage ../applications/networking/davmail {};
 
+  kanif = callPackage ../applications/networking/cluster/kanif { };
+
   lxappearance = callPackage ../applications/misc/lxappearance {};
 
   kona = callPackage ../development/interpreters/kona {};

From 8dd642b688e72392f536f428a7f4e856010d8c5f Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 14:16:38 +0300
Subject: [PATCH 2152/2285] octoprint-plugins.m3d-fio: 0.27.1 -> 0.29

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

diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index 39384e15a369..ba31d3fb3428 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -8,13 +8,13 @@ in {
 
   m3d-fio = buildPlugin rec {
     name = "M3D-Fio-${version}";
-    version = "0.27.1";
+    version = "0.29";
 
     src = fetchFromGitHub {
       owner = "donovan6000";
       repo = "M3D-Fio";
       rev = "V${version}";
-      sha256 = "0jfb417wgdq6fzpxwq6xrrlpkndjwq69h4cdm0ixbyqkp7a3kcm2";
+      sha256 = "1ifbq7yibq42jjvqvklnx3qzr6vk2ngsxh3xhlbdrhqrg54gky4r";
     };
 
     patches = [

From 0077abe128bf08be982241b364481bb839748583 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 14:25:51 +0300
Subject: [PATCH 2153/2285] cppzmq: 20151203 -> 2016-01-20

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

diff --git a/pkgs/development/libraries/cppzmq/default.nix b/pkgs/development/libraries/cppzmq/default.nix
index c8ab48288a1c..62563cfb968a 100644
--- a/pkgs/development/libraries/cppzmq/default.nix
+++ b/pkgs/development/libraries/cppzmq/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
-  name = "cppzmq-20151203";
+  name = "cppzmq-${version}";
+  version = "2016-01-20";
 
   src = fetchFromGitHub {
     owner = "zeromq";
     repo = "cppzmq";
-    rev = "7f7c83411d83eafe57ae6ffc2972ad9455ac258e";
-    sha256 = "1h6fl7mgkv98gz0csbp525a4bp1w9nwm059gwmmv1wqc1l741pv7";
+    rev = "68a7b09cfce01c4c279fba2cf91686fcfc566848";
+    sha256 = "00dsqqlm8mxhm8kfdspxfln0wzwkyywscnf264afw02k6xf28ndm";
   };
 
   installPhase = ''

From 750e6f0b63ef5a787d1fd3e7cd89b63585a1ef86 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 14:33:17 +0300
Subject: [PATCH 2154/2285] vc: 1.1.0 -> 1.2.0

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

diff --git a/pkgs/development/libraries/vc/default.nix b/pkgs/development/libraries/vc/default.nix
index c96c2c47cb92..f73f35a23768 100644
--- a/pkgs/development/libraries/vc/default.nix
+++ b/pkgs/development/libraries/vc/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake }:
 
 stdenv.mkDerivation rec {
-  version = "1.1.0";
+  version = "1.2.0";
   name = "Vc-${version}";
 
   src = fetchFromGitHub {
     owner = "VcDevel";
     repo = "Vc";
     rev = version;
-    sha256 = "1i27zpwcpsfabvf1vpyx5rlzkkgqfd55c3c0jq5fghywyj6743j8";
+    sha256 = "0qlfvcxv3nmf5drz5bc9kynaljr513pbn7snwgvghm150skmkpfl";
   };
 
   nativeBuildInputs = [ cmake ];

From c0e310f4ebcff1687e68a5717cbdc29ef73b50dc Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 14:36:27 +0300
Subject: [PATCH 2155/2285] libvdpau-va-gl: 0.3.4 -> 0.3.6

---
 .../libraries/libvdpau-va-gl/default.nix           | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix
index 51fb858d8bef..0cbac567a452 100644
--- a/pkgs/development/libraries/libvdpau-va-gl/default.nix
+++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix
@@ -1,21 +1,19 @@
-{ stdenv, fetchFromGitHub, cmake, pkgconfig, libX11, libpthreadstubs, libvdpau, glib
-, libva, ffmpeg, mesa_glu }:
+{ stdenv, fetchFromGitHub, cmake, pkgconfig, libX11, libpthreadstubs, libXau, libXdmcp
+, libXext, libvdpau, glib, libva, ffmpeg, mesa_glu }:
 
-let
-  version = "0.3.4";
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "libvdpau-va-gl-${version}";
+  version = "0.3.6";
 
   src = fetchFromGitHub {
     owner = "i-rinat";
     repo = "libvdpau-va-gl";
     rev = "v${version}";
-    sha256 = "1909f3srm2iy2hv4m6jxg1nxrh9xgsnjs07wfzw3ais1fww0i2nn";
+    sha256 = "06lcg6zfj6mn17svz7s0y6ijdah55l9rnp9r440lcbixivjbgyn5";
   };
 
   nativeBuildInputs = [ cmake pkgconfig ];
-  buildInputs = [ libX11 libpthreadstubs libvdpau glib libva ffmpeg mesa_glu ];
+  buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg mesa_glu ];
 
   meta = with stdenv.lib; {
     homepage = https://github.com/i-rinat/libvdpau-va-gl;

From 224c24f0302f38c0d0c816c3b20d3f54c907d70d Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 14:58:13 +0300
Subject: [PATCH 2156/2285] dwarf-fortress-packages.dwarf-fortress-original:
 0.42.05 -> 0.42.06

---
 pkgs/games/dwarf-fortress/game.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/game.nix b/pkgs/games/dwarf-fortress/game.nix
index 7e0c1b34af74..0665075356c4 100644
--- a/pkgs/games/dwarf-fortress/game.nix
+++ b/pkgs/games/dwarf-fortress/game.nix
@@ -4,7 +4,7 @@
 
 let
   baseVersion = "42";
-  patchVersion = "05";
+  patchVersion = "06";
   dfVersion = "0.${baseVersion}.${patchVersion}";
   libpath = lib.makeLibraryPath [ stdenv.cc.cc stdenv.glibc dwarf-fortress-unfuck SDL ];
 
@@ -17,7 +17,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.bay12games.com/dwarves/df_${baseVersion}_${patchVersion}_linux.tar.bz2";
-    sha256 = "0g7r0v2lsqj9ryxh12q8yrk96bgs00rf2ncw228cwwqgmps3xcws";
+    sha256 = "17y9zq9xn1g0a501w4vkinb0n2yjiczsi2g7r6zggr41pxrqxpq3";
   };
 
   installPhase = ''
@@ -43,6 +43,7 @@ stdenv.mkDerivation {
     description = "A single-player fantasy game with a randomly generated adventure world";
     homepage = http://www.bay12games.com/dwarves;
     license = lib.licenses.unfreeRedistributable;
+    platforms = [ "i686-linux" ];
     maintainers = with lib.maintainers; [ a1russell robbinch roconnor the-kenny abbradar ];
   };
 }

From 9ec2fda2c2e67ffc5720b7fadd99aadbead76c7a Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 15:01:52 +0300
Subject: [PATCH 2157/2285] dwarf-fortress-packages.dwarf-fortress-unfuck:
 0.42.05 -> 0.42.06

---
 pkgs/games/dwarf-fortress/unfuck.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix
index 92f4a954330d..d4e637a7caf8 100644
--- a/pkgs/games/dwarf-fortress/unfuck.nix
+++ b/pkgs/games/dwarf-fortress/unfuck.nix
@@ -1,15 +1,16 @@
-{ stdenv, fetchgit, cmake
+{ stdenv, fetchFromGitHub, cmake
 , mesa, SDL, SDL_image, SDL_ttf, glew, openalSoft
 , ncurses, glib, gtk2, libsndfile
 }:
 
 stdenv.mkDerivation {
-  name = "dwarf_fortress_unfuck-20160118";
+  name = "dwarf_fortress_unfuck-2016-02-11";
 
-  src = fetchgit {
-    url = "https://github.com/svenstaro/dwarf_fortress_unfuck";
-    rev = "9a796c6d3cd7d41784e9d1d22a837a1ee0ff8553";
-    sha256 = "0ibxdn684zpk3v2gigardq6z9mydc2s9hns8hlxjyyyhnk1ar61g";
+  src = fetchFromGitHub {
+    owner = "svenstaro";
+    repo = "dwarf_fortress_unfuck";
+    rev = "2ba59c87bb63bea598825a73bdc896b0e041e2d5";
+    sha256 = "0q2rhigvaabdknmb2c84gg71qz7xncmx04npzx4bki9avyxsrpcl";
   };
 
   cmakeFlags = [
@@ -29,7 +30,7 @@ stdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  passthru.dfVersion = "0.42.05";
+  passthru.dfVersion = "0.42.06";
 
   meta = with stdenv.lib; {
     description = "Unfucked multimedia layer for Dwarf Fortress";

From 414dbc6dd99ad21d2925d67d415c4404a1c76990 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 15:02:21 +0300
Subject: [PATCH 2158/2285] dwarf-fortress-packages.dwarf-therapist: 36.0.0 ->
 37.0.0

---
 pkgs/games/dwarf-fortress/default.nix                 |  2 +-
 pkgs/games/dwarf-fortress/dwarf-therapist/default.nix | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index bc0b97b139b9..deb7f1709fb3 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -20,7 +20,7 @@ let
       };
     };
 
-    dwarf-therapist-original = callPackage ./dwarf-therapist {
+    dwarf-therapist-original = pkgs.qt5.callPackage ./dwarf-therapist {
       texlive = pkgs.texlive.combine {
         inherit (pkgs.texlive) scheme-basic float caption wrapfig adjmulticol sidecap preprint enumitem;
       };
diff --git a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
index 07714168e0e8..9f0d5196b6d9 100644
--- a/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
+++ b/pkgs/games/dwarf-fortress/dwarf-therapist/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchFromGitHub, coreutils, qt4, texlive }:
+{ stdenv, fetchFromGitHub, coreutils, qtbase, qtdeclarative, texlive }:
 
 let
-  version = "36.0.0";
+  version = "37.0.0";
 in
 stdenv.mkDerivation {
   name = "dwarf-therapist-original-${version}";
@@ -10,11 +10,11 @@ stdenv.mkDerivation {
     owner = "splintermind";
     repo = "Dwarf-Therapist";
     rev = "v${version}";
-    sha256 = "08xjawb25sibkkfqwd4mlq73dgmgc6lxbbd673rx7yhrsjh4z4h3";
+    sha256 = "0dw86b4x5hjhb7h4ynvwjgcinpqywfc5l48ljb5sahz08rfnx63d";
   };
 
   outputs = [ "out" "layouts" ];
-  buildInputs = [ qt4 ];
+  buildInputs = [ qtbase qtdeclarative ];
   nativeBuildInputs = [ texlive ];
 
   enableParallelBuilding = false;
@@ -35,6 +35,6 @@ stdenv.mkDerivation {
     maintainers = with stdenv.lib.maintainers; [ the-kenny abbradar ];
     license = stdenv.lib.licenses.mit;
     platforms = stdenv.lib.platforms.linux;
-    homepage = https://code.google.com/r/splintermind-attributes/;
+    homepage = "https://github.com/splintermind/Dwarf-Therapist";
   };
 }

From 973d31196ce9a97fe8c42d4d2a4998e5e8776d82 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 15:02:36 +0300
Subject: [PATCH 2159/2285] dwarf-fortress-packages.cla-theme: bump dfVersion

---
 pkgs/games/dwarf-fortress/themes/cla.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/dwarf-fortress/themes/cla.nix b/pkgs/games/dwarf-fortress/themes/cla.nix
index 09b2cc8b647b..39b7e5d2a4c8 100644
--- a/pkgs/games/dwarf-fortress/themes/cla.nix
+++ b/pkgs/games/dwarf-fortress/themes/cla.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     cp -r data raw $out
   '';
 
-  passthru.dfVersion = "0.42.05";
+  passthru.dfVersion = "0.42.06";
 
   preferLocalBuild = true;
 

From 415c2edbbe30013607f2a886515891b05650a7d9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 15:02:42 +0300
Subject: [PATCH 2160/2285] dwarf-fortress-packages.phoebus-theme: bump
 dfVersion

---
 pkgs/games/dwarf-fortress/themes/phoebus.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/games/dwarf-fortress/themes/phoebus.nix b/pkgs/games/dwarf-fortress/themes/phoebus.nix
index ca459c6ef76e..8fd9a7dbf047 100644
--- a/pkgs/games/dwarf-fortress/themes/phoebus.nix
+++ b/pkgs/games/dwarf-fortress/themes/phoebus.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation {
     cp -r data raw $out
   '';
 
-  passthru.dfVersion = "0.42.05";
+  passthru.dfVersion = "0.42.06";
 
   preferLocalBuild = true;
 

From e3d9bdf8f8c571510fce1733e8b5b885b1a42eb5 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 15:13:26 +0300
Subject: [PATCH 2161/2285] ioquake3: 20151228 -> 2016-02-18

---
 pkgs/games/quake3/ioquake/default.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix
index f9f4b21546fa..8988c391824a 100644
--- a/pkgs/games/quake3/ioquake/default.nix
+++ b/pkgs/games/quake3/ioquake/default.nix
@@ -1,14 +1,16 @@
-{ lib, stdenv, fetchgit, xlibsWrapper, SDL2, mesa, openalSoft
+{ lib, stdenv, fetchFromGitHub, xlibsWrapper, SDL2, mesa, openalSoft
 , curl, speex, opusfile, libogg, libopus, libjpeg, mumble, freetype
 }:
 
-stdenv.mkDerivation {
-  name = "ioquake3-git-20151228";
+stdenv.mkDerivation rec {
+  name = "ioquake3-git-${version}";
+  version = "2016-02-18";
 
-  src = fetchgit {
-    url = "https://github.com/ioquake/ioq3";
-    rev = "fe619680f8fa9794906fc82a9c8c6113770696e6";
-    sha256 = "5462441df63eebee6f8ed19a8326de5f874dad31e124d37f73d3bab1cd656a87";
+  src = fetchFromGitHub {
+    owner = "ioquake";
+    repo = "ioq3";
+    rev = "a331637745fb82266f3627fb438f2d58d53e366c";
+    sha256 = "0l9ppv1msd73bhqmdiv5lsvkr5i6khqgi6gi322gbnndr20arn4n";
   };
 
   buildInputs = [ xlibsWrapper SDL2 mesa openalSoft curl speex opusfile libogg libopus libjpeg freetype mumble ];

From 5b4de73b8faade520c8dff4bd6733e1730a80be4 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 15:28:28 +0300
Subject: [PATCH 2162/2285] steamPackages.steam-original: 1.0.0.49 -> 1.0.0.51

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

diff --git a/pkgs/games/steam/steam.nix b/pkgs/games/steam/steam.nix
index b41847c25ba6..b8e1982a989f 100644
--- a/pkgs/games/steam/steam.nix
+++ b/pkgs/games/steam/steam.nix
@@ -2,14 +2,14 @@
 
 let
   traceLog = "/tmp/steam-trace-dependencies.log";
-  version = "1.0.0.49";
+  version = "1.0.0.51";
 
 in stdenv.mkDerivation rec {
   name = "steam-original-${version}";
 
   src = fetchurl {
     url = "http://repo.steampowered.com/steam/pool/steam/s/steam/steam_${version}.tar.gz";
-    sha256 = "1c1gl5pwvb5gnnnqf5d9hpcjnfjjgmn4lgx8v0fbx1am5xf3p2gx";
+    sha256 = "1ghrfznm9rckm8v87zvh7hx820r5pp7sq575wxwq0fncbyq6sxmz";
   };
 
   makeFlags = [ "DESTDIR=$(out)" "PREFIX=" ];

From d8ed77d96d630dce02bc3703790b942c495ffd41 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 15:33:13 +0300
Subject: [PATCH 2163/2285] dwarf-fortress-packages.dfhack: 20160118 ->
 2016-03-03

---
 pkgs/games/dwarf-fortress/dfhack/default.nix | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/dfhack/default.nix b/pkgs/games/dwarf-fortress/dfhack/default.nix
index 92b9d57da421..aaed6b8fd2dc 100644
--- a/pkgs/games/dwarf-fortress/dfhack/default.nix
+++ b/pkgs/games/dwarf-fortress/dfhack/default.nix
@@ -5,28 +5,36 @@
 }:
 
 let
-  rev = "f61ff9147e00f3c379ac0458e79eb556a5de1b68";
-  dfVersion = "0.42.05";
+  rev = "5e2fc5662115499c10bfcd8a6105a1efe4de081c";
+  xmlRev = "f371e293002f8f6d1e4704cc5869ca07ccf6c4d5";
+  dfVersion = "0.42.06";
 
   fakegit = writeScriptBin "git" ''
     #! ${stdenv.shell}
     if [ "$*" = "describe --tags --long" ]; then
       echo "${dfVersion}-unknown"
     elif [ "$*" = "rev-parse HEAD" ]; then
-      echo "${rev}"
+      if [ "$(dirname "$(pwd)")" = "xml" ]; then
+        echo "${xmlRev}"
+      else
+        echo "${rev}"
+      fi
+    elif [ "$*" = "rev-parse HEAD:library/xml" ]; then
+      echo "${xmlRev}"
     else
       exit 1
     fi
   '';
 
-in stdenv.mkDerivation {
-  name = "dfhack-20160118";
+in stdenv.mkDerivation rec {
+  name = "dfhack-${version}";
+  version = "2016-03-03";
 
   # Beware of submodules
   src = fetchgit {
     url = "https://github.com/DFHack/dfhack";
     inherit rev;
-    sha256 = "1ah3cplp4mb9pq7rm1cmn8klfjxw3y2xfzy7734i81b3iwiwlpi4";
+    sha256 = "143zkx6hqpqxjhjd1bllg2kfia215x63zifkhgzycg49kw4wkxi5";
   };
 
   patches = [ ./use-system-libraries.patch ];

From 7482f131ed2ada1edf9b74a7b413b1821d7e65f9 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 15:37:12 +0300
Subject: [PATCH 2164/2285] android-udev-rules: 20151209 -> 2016-03-03

---
 pkgs/os-specific/linux/android-udev-rules/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/android-udev-rules/default.nix b/pkgs/os-specific/linux/android-udev-rules/default.nix
index d4acceb52622..5e3fb1c2ba03 100644
--- a/pkgs/os-specific/linux/android-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/android-udev-rules/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchFromGitHub }:
 
-stdenv.mkDerivation {
-  name = "android-udev-rules-20151209";
+stdenv.mkDerivation rec {
+  name = "android-udev-rules-${version}";
+  version = "2016-03-03";
 
   src = fetchFromGitHub {
     owner = "M0Rf30";
     repo = "android-udev-rules";
-    rev = "b22717d2337f991787ab687f6d0258207c6ad288";
-    sha256 = "1z03nlqj68bxs163jmn66j3n0ywwar5bihpsz5ag8ak3nn2d3fp2";
+    rev = "a6ec1239173bfbe2082211261528e834af9fbb64";
+    sha256 = "11g7m8jjxxzyrbsd9g7cbk6bwy3c4f76pdy4lvdx68xrbsl2rvmj";
   };
 
   installPhase = ''

From d7a98cb693b259e8e9cfa5271a4183f388083092 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 15:39:50 +0300
Subject: [PATCH 2165/2285] postsrsd: 1.3 -> 1.4

---
 pkgs/servers/mail/postsrsd/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/servers/mail/postsrsd/default.nix b/pkgs/servers/mail/postsrsd/default.nix
index 18c21ffc8154..4eeb80095581 100644
--- a/pkgs/servers/mail/postsrsd/default.nix
+++ b/pkgs/servers/mail/postsrsd/default.nix
@@ -1,16 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, help2man }:
 
-let
-  version = "1.3";
-
-in stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "postsrsd-${version}";
+  version = "1.4";
 
   src = fetchFromGitHub {
     owner = "roehling";
     repo = "postsrsd";
     rev = version;
-    sha256 = "1z89qh2bnypgb4i2vs0zdzzpqlf445jixwa1acd955hryww50npv";
+    sha256 = "09yzb0fvnbfy534maqlqk79c41p1yz8r9f73n7bahm5lwd0livk9";
   };
 
   cmakeFlags = [ "-DGENERATE_SRS_SECRET=OFF" "-DINIT_FLAVOR=systemd" ];

From 01a3b6c0591ee3bf4966658d29d4c149a5f94d34 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 15:42:12 +0300
Subject: [PATCH 2166/2285] uwsgi: 2.0.11.2 -> 2.0.12

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

diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix
index 2d447d3c82a9..181518c2d7a3 100644
--- a/pkgs/servers/uwsgi/default.nix
+++ b/pkgs/servers/uwsgi/default.nix
@@ -32,11 +32,12 @@ let pythonPlugin = pkg : lib.nameValuePair "python${if pkg ? isPy2 then "2" else
 in
 
 stdenv.mkDerivation rec {
-  name = "uwsgi-2.0.11.2";
+  name = "uwsgi-${version}";
+  version = "2.0.12";
 
   src = fetchurl {
     url = "http://projects.unbit.it/downloads/${name}.tar.gz";
-    sha256 = "0p482j4yi48bmpgx1qpdfk86hjn4dswb137jbmigdlrd9l5rp20b";
+    sha256 = "02g46dnw5j1iw8fsq392bxbk8d21b9pdgb3ypcinv3b4jzdm2srh";
   };
 
   nativeBuildInputs = [ python3 pkgconfig ];

From 2a7f56bc8fd19e30516e083b42a820e4cc9c3a87 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 15:55:55 +0300
Subject: [PATCH 2167/2285] virtualgl: 2.4.1 -> 2.5

---
 pkgs/tools/X11/virtualgl/default.nix | 19 ++++++++-----------
 pkgs/tools/X11/virtualgl/lib.nix     | 10 +++++-----
 2 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/pkgs/tools/X11/virtualgl/default.nix b/pkgs/tools/X11/virtualgl/default.nix
index 7203229c47b5..e30badd0a85c 100644
--- a/pkgs/tools/X11/virtualgl/default.nix
+++ b/pkgs/tools/X11/virtualgl/default.nix
@@ -1,22 +1,19 @@
-{ lib, buildEnv
+{ stdenv, lib
 , virtualglLib
 , virtualglLib_i686 ? null
 }:
 
-buildEnv {
+stdenv.mkDerivation {
   name = "virtualgl-${lib.getVersion virtualglLib}";
 
   paths = [ virtualglLib ];
 
-  postBuild = lib.optionalString (virtualglLib_i686 != null) ''
-    rm $out/fakelib
-    # workaround for #4621
-    rm $out/bin
-    mkdir $out/bin
-    for i in ${virtualglLib}/bin/*; do
-      ln -s $i $out/bin
+  buildCommand = ''
+    mkdir -p $out/bin
+    for i in ${virtualglLib}/bin/* ${virtualglLib}/bin/.vglrun*; do
+      ln -s "$i" $out/bin
     done
-    ln -s ${virtualglLib}/bin/.vglrun.vars64 $out/bin
-    ln -s ${virtualglLib_i686}/bin/.vglrun.vars32 $out/bin
+  '' + lib.optionalString (virtualglLib_i686 != null) ''
+    ln -sf ${virtualglLib_i686}/bin/.vglrun.vars32 $out/bin
   '';
 }
diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix
index 5c4456f6348d..2df037229ead 100644
--- a/pkgs/tools/X11/virtualgl/lib.nix
+++ b/pkgs/tools/X11/virtualgl/lib.nix
@@ -1,14 +1,12 @@
 { stdenv, fetchurl, cmake, mesa, libX11, libXv, libjpeg_turbo, fltk }:
 
-let
-  version = "2.4.1";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "virtualgl-lib-${version}";
+  version = "2.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/virtualgl/VirtualGL-${version}.tar.gz";
-    sha256 = "0bngb4hrl0kn19qb3sa6mg6dbaahfk09gx2ng18l00xm6pmwd298";
+    sha256 = "1mnpljmx8nxnmpbx4ja430b3y535wkz185qknsxmk27yz4dbmm8l";
   };
 
   cmakeFlags = [ "-DVGL_SYSTEMFLTK=1" "-DTJPEG_LIBRARY=${libjpeg_turbo}/lib/libturbojpeg.so" ];
@@ -19,6 +17,8 @@ stdenv.mkDerivation {
 
   buildInputs = [ libjpeg_turbo mesa fltk libX11 libXv ];
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     homepage = http://www.virtualgl.org/;
     description = "X11 GL rendering in a remote computer with full 3D hw acceleration";

From 364423f38c4f2804fb4cc51a95e1aa6c08afcd7b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 17:00:54 +0300
Subject: [PATCH 2168/2285] ejabberd: 16.01 -> 16.02

---
 pkgs/servers/xmpp/ejabberd/default.nix | 207 ++++++++++++-------------
 1 file changed, 103 insertions(+), 104 deletions(-)

diff --git a/pkgs/servers/xmpp/ejabberd/default.nix b/pkgs/servers/xmpp/ejabberd/default.nix
index f1fa6bed00c2..1f3f85e82760 100644
--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@@ -8,7 +8,6 @@
 , withRiak ? false
 , withElixir ? false, elixir
 , withIconv ? true
-, withLager ? true
 , withTools ? false
 , withRedis ? false
 }:
@@ -27,90 +26,109 @@ let
   # Some dependencies are from another packages. Try commenting them out; then during build
   # you'll get necessary revision information.
   ejdeps = {
-    cache_tab = fetchFromGitHub {
-      owner = "processone";
-      repo = "cache_tab";
-      rev = "1.0.1";
-      sha256 = "1mq5vgqskb0v2pdn6i3610hzd9iyjznh8143pdbz8z57rrhxpxg4";
+    lager = fetchFromGitHub {
+      owner = "basho";
+      repo = "lager";
+      rev = "3.0.2";
+      sha256 = "04l40dlqpl2y6ddpbpknmnjf537bjvrmg8r0jnmw1h60dgyb2ydk";
     };
-    p1_tls = fetchFromGitHub {
-      owner = "processone";
-      repo = "tls";
-      rev = "1.0.0";
-      sha256 = "1q6l5drgmwj4fp4nfh0075lczplia4n40sirk9pd5x76d59qcmnj";
-    };
-    p1_stringprep = fetchFromGitHub {
-      owner = "processone";
-      repo = "stringprep";
-      rev = "1.0.0";
-      sha256 = "105xc0af61xrd4vjxrg49gxbij8x0fq4yribywa8qly303d1nwwa";
-    };
-    p1_xml = fetchFromGitHub {
-      owner = "processone";
-      repo = "xml";
-      rev = "1.1.1";
-      sha256 = "07zxc8ky78sd2mcbhhrxha68arbbk8vyayn9gwi402avnqcic7cx";
-    };
-    esip = fetchFromGitHub {
-      owner = "processone";
-      repo = "p1_sip";
-      rev = "1.0.0";
-      sha256 = "02k920995b0js6srarx0rabavs428rl0dp7zz90x74l8b589zq9a";
-    };
-    p1_stun = fetchFromGitHub {
-      owner = "processone";
-      repo = "stun";
-      rev = "0.9.0";
-      sha256 = "0ghf2p6z1m55f5pm4pv5gj7h7fdcwcsyqz1wzax4w8bgs9id06dm";
-    };
-    p1_yaml = fetchFromGitHub {
-      owner = "processone";
-      repo = "p1_yaml";
-      rev = "1.0.0";
-      sha256 = "0is0vr8ygh3fbiyf0jb85cfpfakxmx31fqk6s4j90gmfhlbm16f8";
+    # dependency of lager
+    goldrush = fetchFromGitHub {
+      owner = "DeadZen";
+      repo = "goldrush";
+      rev = "0.1.7";
+      sha256 = "1104j8v86hdavxf08yjyjkpi5vf95rfvsywdx29c69x3z33i4z3m";
     };
     p1_utils = fetchFromGitHub {
       owner = "processone";
       repo = "p1_utils";
+      rev = "1.0.3";
+      sha256 = "0bw163wx0ji2sz7yb3nzvm1mnnljsdji606xzk33za8c4sgrb4nj";
+    };
+    cache_tab = fetchFromGitHub {
+      owner = "processone";
+      repo = "cache_tab";
       rev = "1.0.2";
-      sha256 = "11b71bnc90riy1qplkpwx6l1yr9849jai3ckri35cavfsk35j687";
+      sha256 = "1krgn6y95jgc8pc0vkj36p0wcazsb8b6h1x4f0r1936jff2vqk33";
+    };
+    fast_tls = fetchFromGitHub {
+      owner = "processone";
+      repo = "fast_tls";
+      rev = "1.0.1";
+      sha256 = "08lh6935k590hix3z69kjjd75w68vmmjcx7gi4zh8j7li4v9k9l2";
+    };
+    stringprep = fetchFromGitHub {
+      owner = "processone";
+      repo = "stringprep";
+      rev = "1.0.2";
+      sha256 = "1wrisajyll45wf6cz1rb2q70sz83i6nfnfiijsbzhy0xk51436sa";
+    };
+    fast_xml = fetchFromGitHub {
+      owner = "processone";
+      repo = "fast_xml";
+      rev = "1.1.3";
+      sha256 = "1a2k21fqz8rp4laz7wn0hsxy58i1gdwc3qhw3k2kar8lgw4m3wqp";
+    };
+    stun = fetchFromGitHub {
+      owner = "processone";
+      repo = "stun";
+      rev = "1.0.1";
+      sha256 = "0bq0qkc7h3nhqxa6ff2nf6bi4kiax4208716hxfz6l1vxrh7f3p2";
+    };
+    esip = fetchFromGitHub {
+      owner = "processone";
+      repo = "esip";
+      rev = "1.0.2";
+      sha256 = "0ibvb85wkqw81y154bagp0kgf1jmdscmfq8yk73j1k986dmiqfn2";
+    };
+    fast_yaml = fetchFromGitHub {
+      owner = "processone";
+      repo = "fast_yaml";
+      rev = "1.0.2";
+      sha256 = "019imn255bkkvilg4nrcidl8w6dn2jrb2nyrs2nixsgcbmvkdl5k";
     };
     jiffy = fetchFromGitHub {
       owner = "davisp";
       repo = "jiffy";
-      rev = "0.14.5";
-      sha256 = "1xs01cl4gq1x6sjj7d1qgg4iq9iwzv3cjqjrj0kr7rqrbfqx2nq3";
+      rev = "0.14.7";
+      sha256 = "1w55vwz4a94v0aajm3lg6nlhpw2w0zdddiw36f2n4sfhbqn0v0jr";
     };
-    oauth2 = fetchFromGitHub {
-      owner = "kivra";
-      repo = "oauth2";
-      rev = "8d129fbf8866930b4ffa6dd84e65bd2b32b9acb8";
-      sha256 = "0mbmw6668l945iqppba991793nmmkyvvf18zxgdahxcwgxg1majn";
+    p1_oauth2 = fetchFromGitHub {
+      owner = "processone";
+      repo = "p1_oauth2";
+      rev = "0.6.1";
+      sha256 = "1wvmi3fj05hlbi3sbqpakznq70n76a7nbvbrjhr8k79bmvsh6lyl";
     };
-    xmlrpc = fetchFromGitHub {
-      owner = "rds13";
-      repo = "xmlrpc";
-      rev = "1.15";
-      sha256 = "0ihwag2hgw9rswxygallc4w1yipgpd6arw3xpr799ib7ybsn8x81";
+    p1_xmlrpc = fetchFromGitHub {
+      owner = "processone";
+      repo = "p1_xmlrpc";
+      rev = "1.15.1";
+      sha256 = "12pfvb3k9alzg7qbph3bc1sw7wk86psm3jrdrfclq90zlpwqa0w3";
+    };
+    luerl = fetchFromGitHub {
+      owner = "rvirding";
+      repo = "luerl";
+      rev = "9524d0309a88b7c62ae93da0b632b185de3ba9db";
+      sha256 = "15yplmv2xybnz3nby940752jw672vj99l1j61rrfy686hgrfnc42";
     };
 
     p1_mysql = fetchFromGitHub {
       owner = "processone";
-      repo = "mysql";
-      rev = "1.0.0";
-      sha256 = "1v3g75hhfpv5bnrar23y7lsk3pd02xl5cy4mj13j0qxl6bc4dgss";
+      repo = "p1_mysql";
+      rev = "1.0.1";
+      sha256 = "17122xhc420kqfsv4c4g0jcllpdbhg84wdlwd3227w4q729jg6bk";
     };
     p1_pgsql = fetchFromGitHub {
       owner = "processone";
-      repo = "pgsql";
-      rev = "1.0.0";
-      sha256 = "1r7dkjzxhwplmhvgvdx990xn98gpslckah5jpkx8c2gm9nj3xi33";
+      repo = "p1_pgsql";
+      rev = "1.0.1";
+      sha256 = "1ca0hhxyfmwjp49zjga1fdhrbaqnxdpmcvs2i6nz6jmapik788nr";
     };
     sqlite3 = fetchFromGitHub {
-      owner = "alexeyr";
+      owner = "processone";
       repo = "erlang-sqlite3";
-      rev = "cbc3505f7a131254265d3ef56191b2581b8cc172";
-      sha256 = "1xrvygv0zhslsqf8044m5ml1zr6di7znvv2zycg3amsz190w0w2g";
+      rev = "1.1.5";
+      sha256 = "17n4clysg540nx9g8k8mi9l7vkz8wigycgxmzzn0wmgxdf6mhxlb";
     };
     p1_pam = fetchFromGitHub {
       owner = "processone";
@@ -118,11 +136,11 @@ let
       rev = "1.0.0";
       sha256 = "0dlbmfwndhyg855vnhwyccxcjqzf2wcgc7522mjb9q38cva50rpr";
     };
-    p1_zlib = fetchFromGitHub {
+    ezlib = fetchFromGitHub {
       owner = "processone";
-      repo = "zlib";
-      rev = "1.0.0";
-      sha256 = "1a6m7wz6cbb8526fwhmgm7mva62absmvyjm8cjnq7cs0mzp18r0m";
+      repo = "ezlib";
+      rev = "1.0.1";
+      sha256 = "1asp7s2q72iql870igc827dvi9iqyd6lhs0q3jbjj2w7xfz4x4kk";
     };
     hamcrest = fetchFromGitHub {
       owner = "hyperthunk";
@@ -150,42 +168,23 @@ let
       rev = "0.8.2";
       sha256 = "0w4jmsnc9x2ykqh1q6b12pl8a9973dxdhqk3y0ph17n83q5xz3h7";
     };
-    rebar_elixir_plugin = fetchFromGitHub {
-      owner = "processone";
-      repo = "rebar_elixir_plugin";
-      rev = "0.1.0";
-      sha256 = "0x04ff53mxwd9va8nl4m70dbamp6p4dpxs646c168iqpnpadk3sk";
-    };
     elixir = fetchFromGitHub {
       owner = "elixir-lang";
       repo = "elixir";
       rev = "v1.1.0";
       sha256 = "0r5673x2qdvfbwmvyvj8ddvzgxnkl3cv9jsf1yzsxgdifjbrzwx7";
     };
-    p1_iconv = fetchFromGitHub {
+    rebar_elixir_plugin = fetchFromGitHub {
       owner = "processone";
-      repo = "eiconv";
-      rev = "0.9.0";
-      sha256 = "1ikccpj3aq6mip6slrq8c7w3kilpb82dr1jdy8kwajmiy9cmsq97";
+      repo = "rebar_elixir_plugin";
+      rev = "0.1.0";
+      sha256 = "0x04ff53mxwd9va8nl4m70dbamp6p4dpxs646c168iqpnpadk3sk";
     };
-    lager = fetchFromGitHub {
-      owner = "basho";
-      repo = "lager";
-      rev = "3.0.2";
-      sha256 = "04l40dlqpl2y6ddpbpknmnjf537bjvrmg8r0jnmw1h60dgyb2ydk";
-    };
-    # dependency of lager
-    goldrush = fetchFromGitHub {
-      owner = "DeadZen";
-      repo = "goldrush";
-      rev = "0.1.7";
-      sha256 = "1104j8v86hdavxf08yjyjkpi5vf95rfvsywdx29c69x3z33i4z3m";
-    };
-    p1_logger = fetchFromGitHub {
+    iconv = fetchFromGitHub {
       owner = "processone";
-      repo = "p1_logger";
+      repo = "iconv";
       rev = "1.0.0";
-      sha256 = "0z11xsr139a75w09syjws4sja6ky2l9rsrwkjr6wcl7p1jz02h4r";
+      sha256 = "0dfc23m2lqilj8ixn23wpj5xp1mgajb9b5ch95riigxzxmx97ri9";
     };
     meck = fetchFromGitHub {
       owner = "eproxus";
@@ -203,12 +202,12 @@ let
   };
 
 in stdenv.mkDerivation rec {
-  version = "16.01";
+  version = "16.02";
   name = "ejabberd-${version}";
 
   src = fetchurl {
     url = "http://www.process-one.net/downloads/ejabberd/${version}/${name}.tgz";
-    sha256 = "10fnsw52gxybw731yka63ma8mj39g4i0nsancwp9nlvhb2flgk72";
+    sha256 = "0yiai7zyjdcp0ppc5l5p56bxhg273hwfbv41qlbkg32dhr880f4q";
   };
 
   nativeBuildInputs = [ fakegit ];
@@ -224,17 +223,17 @@ in stdenv.mkDerivation rec {
   LANG = "en_US.UTF-8";
 
   depsNames =
-    [ "cache_tab" "p1_tls" "p1_stringprep" "p1_xml" "esip" "p1_stun" "p1_yaml" "p1_utils" "jiffy" "oauth2" "xmlrpc" ]
+    [ "lager" "goldrush" "p1_utils" "cache_tab" "fast_tls" "stringprep" "fast_xml" "stun" "esip" "fast_yaml"
+      "jiffy" "p1_oauth2" "p1_xmlrpc" "luerl"
+    ]
     ++ lib.optional withMysql "p1_mysql"
     ++ lib.optional withPgsql "p1_pgsql"
     ++ lib.optional withSqlite "sqlite3"
     ++ lib.optional withPam "p1_pam"
-    ++ lib.optional withZlib "p1_zlib"
+    ++ lib.optional withZlib "ezlib"
     ++ lib.optionals withRiak [ "hamcrest" "riakc" "riak_pb" "protobuffs" ]
-    ++ lib.optionals withElixir [ "rebar_elixir_plugin" "elixir" ]
-    ++ lib.optional withIconv "p1_iconv"
-    ++ lib.optionals withLager [ "lager" "goldrush" ]
-    ++ lib.optional (!withLager) "p1_logger"
+    ++ lib.optionals withElixir [ "elixir" "rebar_elixir_plugin" ]
+    ++ lib.optional withIconv "iconv"
     ++ lib.optional withTools "meck"
     ++ lib.optional withRedis "eredis"
   ;
@@ -248,7 +247,6 @@ in stdenv.mkDerivation rec {
       (lib.enableFeature withRiak "riak")
       (lib.enableFeature withElixir "elixir")
       (lib.enableFeature withIconv "iconv")
-      (lib.enableFeature withLager "lager")
       (lib.enableFeature withTools "tools")
       (lib.enableFeature withRedis "redis")
     ] ++ lib.optional withSqlite "--with-sqlite3=${sqlite}";
@@ -288,8 +286,9 @@ in stdenv.mkDerivation rec {
 
   meta = {
     description = "Open-source XMPP application server written in Erlang";
-    license = stdenv.lib.licenses.gpl2;
+    license = lib.licenses.gpl2;
     homepage = http://www.ejabberd.im;
-    maintainers = [ lib.maintainers.sander ];
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.sander lib.maintainers.abbradar ];
   };
 }

From 2f07ae9136110a0209243f99b2e1fa93ba2f1eb0 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 17:04:17 +0300
Subject: [PATCH 2169/2285] steamPackages.steam-runtime: 2016-02-18 ->
 2016-03-03

---
 pkgs/games/steam/runtime-generated.nix | 36 +++++++++++++-------------
 pkgs/games/steam/runtime.nix           |  2 +-
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/games/steam/runtime-generated.nix b/pkgs/games/steam/runtime-generated.nix
index 9b94f56c796e..854796cac3e8 100644
--- a/pkgs/games/steam/runtime-generated.nix
+++ b/pkgs/games/steam/runtime-generated.nix
@@ -85,18 +85,18 @@
       };
     }
     rec {
-      name = "libasound2_1.0.25-1ubuntu10.1+steamrt1+srt4_amd64";
-      md5 = "11add9186e7d6a171a95fea6b0d15a01";
-      url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.0.25-1ubuntu10.1+steamrt1+srt4_amd64.deb";
+      name = "libasound2_1.1.0-0ubuntu1+steamos1+srt1_amd64";
+      md5 = "9e32b15b95be699bc9270dac78fd384c";
+      url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt1_amd64.deb";
       source = fetchurl {
         inherit url md5;
         name = "libasound2.deb";
       };
     }
     rec {
-      name = "libasound2-plugins_1.0.25-1ubuntu1+srt4_amd64";
-      md5 = "d4c4fad47ef8f25a8f521f4af9b7fa59";
-      url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.0.25-1ubuntu1+srt4_amd64.deb";
+      name = "libasound2-plugins_1.1.0-0ubuntu1+srt1_amd64";
+      md5 = "82b9f608c4e02ae70542466690ddb904";
+      url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt1_amd64.deb";
       source = fetchurl {
         inherit url md5;
         name = "libasound2-plugins.deb";
@@ -967,9 +967,9 @@
       };
     }
     rec {
-      name = "libsdl2_2.0.4+steamrt1+srt1_amd64";
-      md5 = "95ea5d6fb188e0ef66881e699cbf95b2";
-      url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.4+steamrt1+srt1_amd64.deb";
+      name = "libsdl2_2.0.4+steamrt2+srt1_amd64";
+      md5 = "b648fbaea74b0d76b020c6abb78b46ce";
+      url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.4+steamrt2+srt1_amd64.deb";
       source = fetchurl {
         inherit url md5;
         name = "libsdl2.deb";
@@ -1824,18 +1824,18 @@
       };
     }
     rec {
-      name = "libasound2_1.0.25-1ubuntu10.1+steamrt1+srt4_i386";
-      md5 = "306ee9c004c5677442661dfdc1617911";
-      url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.0.25-1ubuntu10.1+steamrt1+srt4_i386.deb";
+      name = "libasound2_1.1.0-0ubuntu1+steamos1+srt1_i386";
+      md5 = "b9712e5765c6dc66683e4c7f62090a71";
+      url = "mirror://steamrt/pool/main/a/alsa-lib/libasound2_1.1.0-0ubuntu1+steamos1+srt1_i386.deb";
       source = fetchurl {
         inherit url md5;
         name = "libasound2.deb";
       };
     }
     rec {
-      name = "libasound2-plugins_1.0.25-1ubuntu1+srt4_i386";
-      md5 = "8afcb694c51af22d48366d8d0ee11738";
-      url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.0.25-1ubuntu1+srt4_i386.deb";
+      name = "libasound2-plugins_1.1.0-0ubuntu1+srt1_i386";
+      md5 = "eee45bd08e763a5e702707a87b2ee127";
+      url = "mirror://steamrt/pool/main/a/alsa-plugins/libasound2-plugins_1.1.0-0ubuntu1+srt1_i386.deb";
       source = fetchurl {
         inherit url md5;
         name = "libasound2-plugins.deb";
@@ -2706,9 +2706,9 @@
       };
     }
     rec {
-      name = "libsdl2_2.0.4+steamrt1+srt1_i386";
-      md5 = "b88ec76ac0c55871648c51749ba2e661";
-      url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.4+steamrt1+srt1_i386.deb";
+      name = "libsdl2_2.0.4+steamrt2+srt1_i386";
+      md5 = "e56c66c0719d067589f7f13e01815274";
+      url = "mirror://steamrt/pool/main/libs/libsdl2/libsdl2_2.0.4+steamrt2+srt1_i386.deb";
       source = fetchurl {
         inherit url md5;
         name = "libsdl2.deb";
diff --git a/pkgs/games/steam/runtime.nix b/pkgs/games/steam/runtime.nix
index 1de2dd9f24cc..9236243427a2 100644
--- a/pkgs/games/steam/runtime.nix
+++ b/pkgs/games/steam/runtime.nix
@@ -9,7 +9,7 @@ let arch = if stdenv.system == "x86_64-linux" then "amd64"
     inputFile = writeText "steam-runtime.json" (builtins.toJSON input);
 
 in stdenv.mkDerivation {
-  name = "steam-runtime-2016-02-18";
+  name = "steam-runtime-2016-03-03";
 
   nativeBuildInputs = [ python2 dpkg binutils ];
 

From 1e51364dd585c2cbc8b1a33b98965feb4ca066bd Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 27 Feb 2016 14:09:44 +0300
Subject: [PATCH 2170/2285] spin: 6.4.3 -> 6.4.5

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

diff --git a/pkgs/development/tools/analysis/spin/default.nix b/pkgs/development/tools/analysis/spin/default.nix
index f1295060d3c4..29559bf8b0ef 100644
--- a/pkgs/development/tools/analysis/spin/default.nix
+++ b/pkgs/development/tools/analysis/spin/default.nix
@@ -2,13 +2,15 @@
 
 stdenv.mkDerivation rec {
   name = "spin-${version}";
-  version = "6.4.3";
+  version = "6.4.5";
   url-version = stdenv.lib.replaceChars ["."] [""] version;
 
   src = fetchurl {
-    url = "http://spinroot.com/spin/Src/spin${url-version}.tar.gz";
-    curlOpts = "--user-agent 'Mozilla/5.0'";
-    sha256 = "0cldhxvfw6llh4spcx0x0535pffx89pvvxpdi0bpqy9a6da85ln1";
+    # The homepage is behind CloudFlare anti-DDoS protection, which blocks cURL.
+    # Dropbox mirror from developers:
+    # https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AADZPqS4aoR-pjNF6OQXRLQHa
+    url = "https://www.dropbox.com/sh/fgzipzp4wpo3qc1/AAANRpxsSyWC7iHZB-XgBwJFa/spin645.tar.gz?raw=1";
+    sha256 = "0x8qnwm2xa8f176c52mzpvnfzglxs6xgig7bcgvrvkb3xf114224";
   };
 
   buildInputs = [ yacc ];
@@ -20,7 +22,8 @@ stdenv.mkDerivation rec {
   meta = with stdenv.lib; {
     description = "Formal verification tool for distributed software systems";
     homepage = http://spinroot.com/;
-    license = stdenv.lib.licenses.free;
+    license = licenses.free;
+    platforms = platforms.linux;
     maintainers = with maintainers; [ mornfall pSub ];
   };
 }

From 26bf9b28d87ea505e7bfd27d79d0b1d482b8342b Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Fri, 4 Mar 2016 14:51:13 +0300
Subject: [PATCH 2171/2285] opendkim service: improve `domains` documentation

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

diff --git a/nixos/modules/services/mail/opendkim.nix b/nixos/modules/services/mail/opendkim.nix
index 1cdae9cb6548..af996758f41f 100644
--- a/nixos/modules/services/mail/opendkim.nix
+++ b/nixos/modules/services/mail/opendkim.nix
@@ -49,7 +49,12 @@ in {
 
       domains = mkOption {
         type = types.str;
-        description = "Local domains set; messages from them are signed, not verified.";
+        default = "csl:${config.networking.hostName}";
+        example = "csl:example.com,mydomain.net";
+        description = ''
+          Local domains set (see <literal>opendkim(8)</literal> for more information on datasets).
+          Messages from them are signed, not verified.
+        '';
       };
 
       keyFile = mkOption {
@@ -77,8 +82,6 @@ in {
 
   config = mkIf cfg.enable {
 
-    services.opendkim.domains = mkDefault "csl:${config.networking.hostName}";
-
     users.extraUsers = optionalAttrs (cfg.user == "opendkim") (singleton
       { name = "opendkim";
         group = cfg.group;

From 630ab80bd469737f44fb72aca40ae65094b847ea Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Thu, 3 Mar 2016 14:10:48 +0300
Subject: [PATCH 2172/2285] deadbeef: 1.6.2 -> 1.7.0

---
 pkgs/applications/audio/deadbeef/default.nix | 25 ++++++++------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/applications/audio/deadbeef/default.nix
index 1a2b4b7cc879..b89420339768 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/applications/audio/deadbeef/default.nix
@@ -1,7 +1,7 @@
-{ stdenv, fetchurl, intltool, pkgconfig, fetchpatch
+{ stdenv, fetchurl, intltool, pkgconfig, fetchpatch, jansson
 # deadbeef can use either gtk2 or gtk3
-, gtk2Support ? true, gtk2 ? null
-, gtk3Support ? false, gtk3 ? null, gsettings_desktop_schemas ? null, makeWrapper ? null
+, gtk2Support ? false, gtk2 ? null
+, gtk3Support ? true, gtk3 ? null, gsettings_desktop_schemas ? null, makeWrapper ? null
 # input plugins
 , vorbisSupport ? true, libvorbis ? null
 , mp123Support ? true, libmad ? null
@@ -52,21 +52,22 @@ assert wavpackSupport -> wavpack != null;
 assert remoteSupport -> curl != null;
 
 stdenv.mkDerivation rec {
-  name = "deadbeef-0.6.2";
+  name = "deadbeef-${version}";
+  version = "0.7.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/project/deadbeef/${name}.tar.bz2";
-    sha256 = "06jfsqyakpvq0xhah7dlyvdzh5ym3hhb4yfczczw11ijd1kbjcrl";
+    sha256 = "0s6qip1zs83pig75pnd30ayiv1dbbj7s72px9mr31f4m0v86kaqx";
   };
 
-  buildInputs = with stdenv.lib;
-       optional gtk2Support gtk2
-    ++ optionals gtk3Support [gtk3 gsettings_desktop_schemas]
+  buildInputs = with stdenv.lib; [ jansson ]
+    ++ optional gtk2Support gtk2
+    ++ optionals gtk3Support [ gtk3 gsettings_desktop_schemas ]
     ++ optional vorbisSupport libvorbis
     ++ optional mp123Support libmad
     ++ optional flacSupport flac
     ++ optional wavSupport libsndfile
-    ++ optionals cdaSupport [libcdio libcddb]
+    ++ optionals cdaSupport [ libcdio libcddb ]
     ++ optional aacSupport faad2
     ++ optional zipSupport libzip
     ++ optional ffmpegSupport ffmpeg
@@ -88,12 +89,6 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  patches = [ (fetchpatch {
-                url = "https://github.com/Alexey-Yakovenko/deadbeef/commit/e7725ea73fa1bd279a3651704870156bca8efea8.patch";
-                sha256 = "1530w968zyvcm9c8k57889n125k7a1kk3ydinjm398n07gypd599";
-              })
-            ];
-
   postInstall = if !gtk3Support then "" else ''
     wrapProgram "$out/bin/deadbeef" \
       --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"

From d07d94b97c953228b41d3f3edf54be03d7dc48a3 Mon Sep 17 00:00:00 2001
From: Emery <emery@v36.space>
Date: Fri, 4 Mar 2016 13:26:07 +0100
Subject: [PATCH 2173/2285] amtterm: initial package at 1.4

https://www.kraxel.org/cgit/amtterm/
---
 pkgs/tools/system/amtterm/default.nix | 27 +++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix       |  2 ++
 2 files changed, 29 insertions(+)
 create mode 100644 pkgs/tools/system/amtterm/default.nix

diff --git a/pkgs/tools/system/amtterm/default.nix b/pkgs/tools/system/amtterm/default.nix
new file mode 100644
index 000000000000..3fe85be35f71
--- /dev/null
+++ b/pkgs/tools/system/amtterm/default.nix
@@ -0,0 +1,27 @@
+{ fetchurl, stdenv, makeWrapper, perl, perlPackages }:
+
+let version = "1.4"; in
+stdenv.mkDerivation {
+  name = "amtterm-"+version;
+
+  buildInputs = with perlPackages; [ perl SOAPLite ];
+  nativeBuildInputs = [ makeWrapper ];
+
+  src = fetchurl {
+    url = "https://www.kraxel.org/cgit/amtterm/snapshot/amtterm-a75e48e010e92dc5540e2142efc445ccb0ab1a42.tar.gz";
+    sha256 = "0i4ny5dyf3fy3sd65zw9v4xxw3rc3qyn8r8y8gwwgankj6iqkqp4";
+  };
+
+  makeFlags = [ "prefix=$(out)" ];
+
+  postInstall =
+    "wrapProgram $out/bin/amttool --prefix PERL5LIB : $PERL5LIB";
+
+  meta = with stdenv.lib;
+    { description = "Intel AMT® SoL client + tools";
+      homepage = "https://www.kraxel.org/cgit/amtterm/";
+      license = licenses.gpl2;
+      maintainers = [ maintainers.ehmry ];
+      platforms = platforms.linux;
+    };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 460145f8b08d..af88f0e51924 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -536,6 +536,8 @@ let
 
   albert = qt5.callPackage ../applications/misc/albert {};
 
+  amtterm = callPackage ../tools/system/amtterm {};
+
   analog = callPackage ../tools/admin/analog {};
 
   apktool = callPackage ../development/tools/apktool {

From e2372a4183409920050771e7dc527ca031f05144 Mon Sep 17 00:00:00 2001
From: Robin Gloster <mail@glob.in>
Date: Thu, 3 Mar 2016 16:55:17 +0000
Subject: [PATCH 2174/2285] ceph: fix for zip timestamps

---
 pkgs/tools/filesystems/ceph/generic.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/generic.nix b/pkgs/tools/filesystems/ceph/generic.nix
index 1673e69679b4..19457e136556 100644
--- a/pkgs/tools/filesystems/ceph/generic.nix
+++ b/pkgs/tools/filesystems/ceph/generic.nix
@@ -1,4 +1,5 @@
-{ stdenv, autoconf, automake, makeWrapper, pkgconfig, libtool, which, git
+{ stdenv, ensureNewerSourcesHook, autoconf, automake, makeWrapper, pkgconfig
+, libtool, which, git
 , boost, python, pythonPackages, libxml2, zlib
 
 # Optional Dependencies
@@ -111,7 +112,10 @@ stdenv.mkDerivation {
     ./0001-Makefile-env-Don-t-force-sbin.patch
   ];
 
-  nativeBuildInputs = [ autoconf automake makeWrapper pkgconfig libtool which git ]
+  nativeBuildInputs = [
+    autoconf automake makeWrapper pkgconfig libtool which git
+    (ensureNewerSourcesHook { year = "1980"; })
+  ]
     ++ optionals (versionAtLeast version "9.0.2") [
       pythonPackages.setuptools pythonPackages.argparse
     ];

From 7c4c151a9422d6bb6790b1c8c76e37caa5b1d5d0 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 4 Mar 2016 00:45:20 +0000
Subject: [PATCH 2175/2285] ruby: only keep the latest tiny per major.minor

Tiny versions are just for bug-fixes and should be upgraded. I think that the
list has grown a bit too much organically and should be trimmed.
---
 .../development/interpreters/ruby/default.nix | 77 ----------------
 .../interpreters/ruby/patchsets.nix           | 87 -------------------
 pkgs/top-level/all-packages.nix               | 14 +--
 3 files changed, 7 insertions(+), 171 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 4ffef385a0db..2a22cc74e754 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -157,61 +157,6 @@ in {
     };
   };
 
-  ruby_2_1_0 = generic {
-    majorVersion = "2";
-    minorVersion = "1";
-    teenyVersion = "0";
-    patchLevel = "0";
-    sha256 = {
-      src = "17fhfbw8sr13rxfn58wvrhk2f5i88lkna2afn3gdjvprd8gyqf1m";
-      git = "12sn532yvznqfz85378ys0b9ggmj7w8ddhzc1pnnlx7mbyy7r2hx";
-    };
-  };
-
-  ruby_2_1_1 = generic {
-    majorVersion = "2";
-    minorVersion = "1";
-    teenyVersion = "1";
-    patchLevel = "0";
-    sha256 = {
-      src = "0hc9x3mazyvnk94gs19q8mbnanlzk8mv0hii77slkvc8mqqxyhy8";
-      git = "1v2ffvyd0xx1h1qd70431zczhvsdiyyw5kjxih4rszd5avzh5grl";
-    };
-  };
-
-  ruby_2_1_2 = generic {
-    majorVersion = "2";
-    minorVersion = "1";
-    teenyVersion = "2";
-    patchLevel = "353";
-    sha256 = {
-      src = "0db6krc2bd7yha8p96lcqrahjpsz7g7abhni134g708sh53n8apj";
-      git = "14f8w3zwngnxsgigffh6h9z3ng53xq8mk126xmwrsmz9n3ypm6l0";
-    };
-  };
-
-  ruby_2_1_3 = generic {
-    majorVersion = "2";
-    minorVersion = "1";
-    teenyVersion = "3";
-    patchLevel = "0";
-    sha256 = {
-      src = "00bz6jcbxgnllplk4b9lnyc3w8yd3pz5rn11rmca1s8cn6vvw608";
-      git = "1pnam9jry2l2mbji3gvrbb7jyisxl99xjz6l1qrccwnfinxxbmhv";
-    };
-  };
-
-  ruby_2_1_6 = generic {
-    majorVersion = "2";
-    minorVersion = "1";
-    teenyVersion = "6";
-    patchLevel = "0";
-    sha256 = {
-      src = "1r4bs8lfwsypbcf8j2lpv3by40729vp5mh697njizj97fjp644qy";
-      git = "18kbjsbmgv6l3p1qxgmjnhh4jl7xdk3c20ycjpp62vrhq7pyzjsm";
-    };
-  };
-
   ruby_2_1_7 = generic {
     majorVersion = "2";
     minorVersion = "1";
@@ -223,28 +168,6 @@ in {
     };
   };
 
-  ruby_2_2_0 = generic {
-    majorVersion = "2";
-    minorVersion = "2";
-    teenyVersion = "0";
-    patchLevel = "0";
-    sha256 = {
-      src = "1z2092fbpc2qkv1j3yj7jdz7qwvqpxqpmcnkphpjcpgvmfaf6wbn";
-      git = "1w7rr2nq1bbw6aiagddzlrr3rl95kk33x4pv6570nm072g55ybpi";
-    };
-  };
-
-  ruby_2_2_2 = generic {
-    majorVersion = "2";
-    minorVersion = "2";
-    teenyVersion = "2";
-    patchLevel = "0";
-    sha256 = {
-      src = "0i4v7l8pnam0by2cza12zldlhrffqchwb2m9shlnp7j2gqqhzz2z";
-      git = "08mw1ql2ghy483cp8xzzm78q17simn4l6phgm2gah7kjh9y3vbrn";
-    };
-  };
-
   ruby_2_2_3 = generic {
     majorVersion = "2";
     minorVersion = "2";
diff --git a/pkgs/development/interpreters/ruby/patchsets.nix b/pkgs/development/interpreters/ruby/patchsets.nix
index 18e2ab9231ad..ded72b8695ec 100644
--- a/pkgs/development/interpreters/ruby/patchsets.nix
+++ b/pkgs/development/interpreters/ruby/patchsets.nix
@@ -34,76 +34,6 @@ rec {
     "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/03-display-more-detailed-stack-trace.patch"
     "${patchSet}/patches/ruby/2.0.0/p${patchLevel}/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
   ];
-  "2.1.0" = [
-    ./ssl_v3.patch
-  ] ++ ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/01-current-2.1.1-fixes.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/02-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/03-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/04-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/05-show-full-backtrace-on-stack-overflow.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/06-fix-missing-c-return-event.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/07-backport-006e66b6680f60adfb434ee7397f0dbc77de7873.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/08-funny-falcon-stc-density.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/09-funny-falcon-stc-pool-allocation.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/10-aman-opt-aset-aref-str.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/11-funny-falcon-method-cache.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/12-backport-r44370.patch"
-  ];
-  "2.1.1" = [
-    ./ssl_v3.patch
-  ] ++ ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/01-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/03-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/05-fix-missing-c-return-event.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/07-backport-006e66b6680f60adfb434ee7397f0dbc77de7873.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/08-funny-falcon-stc-density.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/09-funny-falcon-stc-pool-allocation.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/10-aman-opt-aset-aref-str.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/11-funny-falcon-method-cache.patch"
-    "${patchSet}/patches/ruby/2.1.0/railsexpress/12-backport-r44370.patch"
-  ];
-  "2.1.2" = [
-    ./ssl_v3.patch
-  ] ++ ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/01-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/03-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/05-fix-missing-c-return-event.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/06-backport-006e66b6680f60adfb434ee7397f0dbc77de7873.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/07-funny-falcon-stc-density.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/08-funny-falcon-stc-pool-allocation.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/09-aman-opt-aset-aref-str.patch"
-    "${patchSet}/patches/ruby/2.1.2/railsexpress/10-funny-falcon-method-cache.patch"
-  ];
-  "2.1.3" = [
-    ./ssl_v3.patch
-  ] ++ ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.1.3/railsexpress/01-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.1.3/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.1.3/railsexpress/03-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.1.3/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
-    "${patchSet}/patches/ruby/2.1.3/railsexpress/05-funny-falcon-stc-density.patch"
-    "${patchSet}/patches/ruby/2.1.3/railsexpress/06-funny-falcon-stc-pool-allocation.patch"
-    "${patchSet}/patches/ruby/2.1.3/railsexpress/07-aman-opt-aset-aref-str.patch"
-    "${patchSet}/patches/ruby/2.1.3/railsexpress/08-funny-falcon-method-cache.patch"
-  ];
-  "2.1.6" = [
-    ./ssl_v3.patch
-  ] ++ ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/01-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/03-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/04-show-full-backtrace-on-stack-overflow.patch"
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/05-funny-falcon-stc-density.patch"
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/06-funny-falcon-stc-pool-allocation.patch"
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/07-aman-opt-aset-aref-str.patch"
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/08-funny-falcon-method-cache.patch"
-    "${patchSet}/patches/ruby/2.1.6/railsexpress/09-heap-dump-support.patch"
-  ];
   "2.1.7" = [
     ./ssl_v3.patch
   ] ++ ops useRailsExpress [
@@ -117,23 +47,6 @@ rec {
     "${patchSet}/patches/ruby/2.1.7/railsexpress/08-funny-falcon-method-cache.patch"
     "${patchSet}/patches/ruby/2.1.7/railsexpress/09-heap-dump-support.patch"
   ];
-  "2.2.0" = [
-    ./ssl_v3.patch
-  ] ++ ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.2.0/railsexpress/01-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.2.0/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.2.0/railsexpress/03-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.2.0/railsexpress/04-backport-401c8bb.patch"
-    "${patchSet}/patches/ruby/2.2.0/railsexpress/05-fix-packed-bitfield-compat-warning-for-older-gccs.patch"
-  ];
-  "2.2.2" = [
-    ./ssl_v3.patch
-  ] ++ ops useRailsExpress [
-    "${patchSet}/patches/ruby/2.2.2/railsexpress/01-zero-broken-tests.patch"
-    "${patchSet}/patches/ruby/2.2.2/railsexpress/02-improve-gc-stats.patch"
-    "${patchSet}/patches/ruby/2.2.2/railsexpress/03-display-more-detailed-stack-trace.patch"
-    "${patchSet}/patches/ruby/2.2.2/railsexpress/04-backported-bugfixes-222.patch"
-  ];
   "2.2.3" = [
     ./ssl_v3.patch
   ] ++ ops useRailsExpress [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c971f3157b94..06e09f7c8f35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -277,7 +277,7 @@ let
 
   chrootFHSEnv = callPackage ../build-support/build-fhs-chrootenv { };
   userFHSEnv = callPackage ../build-support/build-fhs-userenv {
-   ruby = ruby_2_1_3;
+   ruby = ruby_2_1;
   };
 
   buildFHSChrootEnv = args: chrootFHSEnv {
@@ -5540,7 +5540,7 @@ let
   };
 
   bundix = callPackage ../development/interpreters/ruby/bundix {
-    ruby = ruby_2_1_3;
+    ruby = ruby_2_1;
   };
   bundler = callPackage ../development/interpreters/ruby/bundler.nix { };
   bundler_HEAD = bundler;
@@ -5551,8 +5551,8 @@ let
   inherit (callPackage ../development/interpreters/ruby {})
     ruby_1_9_3
     ruby_2_0_0
-    ruby_2_1_0 ruby_2_1_1 ruby_2_1_2 ruby_2_1_3 ruby_2_1_6 ruby_2_1_7
-    ruby_2_2_0 ruby_2_2_2 ruby_2_2_3
+    ruby_2_1_7
+    ruby_2_2_3
     ruby_2_3_0;
 
   # Ruby aliases
@@ -5812,7 +5812,7 @@ let
   cgdb = callPackage ../development/tools/misc/cgdb { };
 
   chefdk = callPackage ../development/tools/chefdk {
-    ruby = ruby_2_0_0;
+    ruby = ruby_2_0;
   };
 
   matter-compiler = callPackage ../development/compilers/matter-compiler {};
@@ -6296,7 +6296,7 @@ let
   uncrustify = callPackage ../development/tools/misc/uncrustify { };
 
   vagrant = callPackage ../development/tools/vagrant {
-    ruby = ruby_2_2_2;
+    ruby = ruby_2_2;
   };
 
   gdb = callPackage ../development/tools/misc/gdb {
@@ -13035,7 +13035,7 @@ let
   smtube = qt5.callPackage ../applications/video/smtube {};
 
   sup = callPackage ../applications/networking/mailreaders/sup {
-    ruby = ruby_1_9_3.override { cursesSupport = true; };
+    ruby = ruby_1_9.override { cursesSupport = true; };
   };
 
   synapse = callPackage ../applications/misc/synapse {

From 4bc516aa540e85ff8e0fa2c88245e4c870b1faf3 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 4 Mar 2016 14:19:44 +0000
Subject: [PATCH 2176/2285] sonic-pi: 2.8.0 -> 2.9.0

Fixes compilation and path issues. The executable still segfaults after boot
though.
---
 pkgs/applications/audio/sonic-pi/default.nix  | 29 +++++++++------
 .../audio/sonic-pi/fixed-prefixes.patch       | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++-
 3 files changed, 58 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/applications/audio/sonic-pi/fixed-prefixes.patch

diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix
index ce5844ca7f12..3c7be51554d8 100644
--- a/pkgs/applications/audio/sonic-pi/default.nix
+++ b/pkgs/applications/audio/sonic-pi/default.nix
@@ -11,25 +11,25 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.8.0";
+  version = "2.9.0";
   name = "sonic-pi-${version}";
 
   src = fetchFromGitHub {
     owner = "samaaron";
     repo = "sonic-pi";
     rev = "v${version}";
-    sha256 = "1yyavgazb6ar7xnmjx460s9p8nh70klaja2yb20nci15k8vngq9h";
+    sha256 = "19db5dxrf6h1v2w3frds5g90nb6izd9ppp7cs2xi6i0m67l6jrwb";
   };
 
   buildInputs = [
-    qscintilla
-    supercollider
-    ruby
-    qt48Full
-    cmake
-    pkgconfig
     bash
+    cmake
     makeWrapper
+    pkgconfig
+    qscintilla
+    qt48Full
+    ruby
+    supercollider
   ];
 
   meta = {
@@ -42,13 +42,22 @@ stdenv.mkDerivation rec {
 
   dontUseCmakeConfigure = true;
 
+  patches = [ ./fixed-prefixes.patch ];
+
+  preConfigure = ''
+    patchShebangs .
+    substituteInPlace app/gui/qt/mainwindow.cpp \
+      --subst-var-by ruby "${ruby}/bin/ruby" \
+      --subst-var out
+  '';
+
   buildPhase = ''
     pushd app/server/bin
-    ${ruby}/bin/ruby compile-extensions.rb
+      ./compile-extensions.rb
     popd
 
     pushd app/gui/qt
-    ${bash}/bin/bash rp-build-app
+      ./rp-build-app
     popd
   '';
 
diff --git a/pkgs/applications/audio/sonic-pi/fixed-prefixes.patch b/pkgs/applications/audio/sonic-pi/fixed-prefixes.patch
new file mode 100644
index 000000000000..7b045a41cba1
--- /dev/null
+++ b/pkgs/applications/audio/sonic-pi/fixed-prefixes.patch
@@ -0,0 +1,36 @@
+diff --git a/app/gui/qt/mainwindow.cpp b/app/gui/qt/mainwindow.cpp
+index 0af6cf7..97c17ad 100644
+--- a/app/gui/qt/mainwindow.cpp
++++ b/app/gui/qt/mainwindow.cpp
+@@ -677,28 +677,9 @@ void MainWindow::startServer(){
+ 
+     serverProcess = new QProcess();
+ 
+-    QString root = rootPath();
+-
+-  #if defined(Q_OS_WIN)
+-    QString prg_path = root + "/app/server/native/windows/ruby/bin/ruby.exe";
+-    QString prg_arg = root + "/app/server/bin/sonic-pi-server.rb";
+-    sample_path = root + "/etc/samples";
+-  #elif defined(Q_OS_MAC)
+-    QString prg_path = root + "/server/native/osx/ruby/bin/ruby";
+-    QString prg_arg = root + "/server/bin/sonic-pi-server.rb";
+-    sample_path = root + "/etc/samples";
+-  #else
+-    //assuming Raspberry Pi
+-    QString prg_path = root + "/app/server/native/raspberry/ruby/bin/ruby";
+-    QFile file(prg_path);
+-    if(!file.exists()) {
+-      // use system ruby if bundled ruby doesn't exist
+-      prg_path = "/usr/bin/ruby";
+-    }
+-
+-    QString prg_arg = root + "/app/server/bin/sonic-pi-server.rb";
+-    sample_path = root + "/etc/samples";
+-  #endif
++    QString prg_path = "@ruby@";
++    QString prg_arg = "@out@/app/server/bin/sonic-pi-server.rb";
++    sample_path = "@out@/etc/samples";
+ 
+     prg_path = QDir::toNativeSeparators(prg_path);
+     prg_arg = QDir::toNativeSeparators(prg_arg);
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c971f3157b94..947ae780161a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13513,7 +13513,9 @@ let
 
   viber = callPackage ../applications/networking/instant-messengers/viber { };
 
-  sonic-pi = callPackage ../applications/audio/sonic-pi { };
+  sonic-pi = callPackage ../applications/audio/sonic-pi {
+    ruby = ruby_2_2;
+  };
 
   st = callPackage ../applications/misc/st {
     conf = config.st.conf or null;

From 5226ecf7676b7f04ee7da87aa7b3103a1530a18f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= <malaquias@gmail.com>
Date: Fri, 4 Mar 2016 12:42:28 -0300
Subject: [PATCH 2177/2285] openbox-menu: 0.5.1 -> 0.8.0

---
 pkgs/applications/misc/openbox-menu/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/openbox-menu/default.nix b/pkgs/applications/misc/openbox-menu/default.nix
index 6055997b28ee..9e52c629a244 100644
--- a/pkgs/applications/misc/openbox-menu/default.nix
+++ b/pkgs/applications/misc/openbox-menu/default.nix
@@ -1,11 +1,12 @@
 { stdenv, fetchurl, pkgconfig, glib, gtk, menu-cache }:
 
 stdenv.mkDerivation rec {
-  name = "openbox-menu-0.5.1";
+  name = "openbox-menu-${version}";
+  version = "0.8.0";
 
   src = fetchurl {
     url = "https://bitbucket.org/fabriceT/openbox-menu/downloads/${name}.tar.bz2";
-    sha256 = "11v3nlhqcnks5vms1a7rrvwvj8swc9axgjkp7z0r97lijsg6d3rj";
+    sha256 = "1hi4b6mq97y6ajq4hhsikbkk23aha7ikaahm92djw48mgj2f1w8l";
   };
 
   buildInputs = [ pkgconfig glib gtk menu-cache ];
@@ -15,8 +16,13 @@ stdenv.mkDerivation rec {
   installPhase = "make install prefix=$out";
 
   meta = {
+    homepage = "http://fabrice.thiroux.free.fr/openbox-menu_en.html";
     description = "Dynamic XDG menu generator for Openbox";
-    homepage = "http://mimasgpc.free.fr/openbox-menu.html";
+    longDescription = ''
+      Openbox-menu is a pipemenu for Openbox window manager. It provides a
+      dynamic menu listing installed applications. Most of the work is done by
+      the LXDE library menu-cache.
+    '';
     license = stdenv.lib.licenses.gpl3;
     maintainers = [ stdenv.lib.maintainers.romildo ];
     platforms   = stdenv.lib.platforms.unix;

From 7b9684a5b578b8e1c4c0a928f3536129f8d9f849 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 4 Mar 2016 16:54:27 +0100
Subject: [PATCH 2178/2285] nginx, nginxUnstable: enable hardening. Flags as
 recommended by @arno01 (Andrey Arapov) in #7190

---
 pkgs/servers/http/nginx/default.nix  | 10 +++++++++-
 pkgs/servers/http/nginx/unstable.nix | 10 +++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index 6944a89477ad..cc95c60c7c24 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -1,6 +1,7 @@
 { stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat
 , gd, geoip
 , modules ? []
+, hardening ? true
 }:
 
 with stdenv.lib;
@@ -53,7 +54,14 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = [ "-I${libxml2}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations -Wno-error=conditional-uninitialized";
 
-  preConfigure = concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules;
+  preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules)
+    + optionalString hardening ''
+      configureFlagsArray=(
+        --with-cc-opt="-fPIE -fstack-protector-all --param ssp-buffer-size=4 -O2 -D_FORTIFY_SOURCE=2"
+        --with-ld-opt="-pie -Wl,-z,relro,-z,now"
+      )
+    ''
+    ;
 
   meta = {
     description = "A reverse proxy and lightweight webserver";
diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix
index 5840dee0ba53..4ac1b0b268c1 100644
--- a/pkgs/servers/http/nginx/unstable.nix
+++ b/pkgs/servers/http/nginx/unstable.nix
@@ -2,6 +2,7 @@
 , gd, geoip
 , withStream ? false
 , modules ? []
+, hardening ? true
 }:
 
 with stdenv.lib;
@@ -51,7 +52,14 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_COMPILE = [ "-I${libxml2}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations";
 
-  preConfigure = concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules;
+  preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules)
+    + optionalString hardening ''
+      configureFlagsArray=(
+        --with-cc-opt="-fPIE -fstack-protector-all --param ssp-buffer-size=4 -O2 -D_FORTIFY_SOURCE=2"
+        --with-ld-opt="-pie -Wl,-z,relro,-z,now"
+      )
+    ''
+    ;
 
   postInstall = ''
     mv $out/sbin $out/bin

From 708c6094c55e4e3cc186a42e04cb8dd1d6efecf8 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 4 Mar 2016 16:57:47 +0100
Subject: [PATCH 2179/2285] nginx, nginxUnstable: hardening: only use when the
 compiler is gcc

---
 pkgs/servers/http/nginx/default.nix  | 2 +-
 pkgs/servers/http/nginx/unstable.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index cc95c60c7c24..178c0fcbd9e4 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -55,7 +55,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = [ "-I${libxml2}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations -Wno-error=conditional-uninitialized";
 
   preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules)
-    + optionalString hardening ''
+    + optionalString (hardening && (stdenv.cc.cc.isGNU or false)) ''
       configureFlagsArray=(
         --with-cc-opt="-fPIE -fstack-protector-all --param ssp-buffer-size=4 -O2 -D_FORTIFY_SOURCE=2"
         --with-ld-opt="-pie -Wl,-z,relro,-z,now"
diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix
index 4ac1b0b268c1..e85fb96d2edb 100644
--- a/pkgs/servers/http/nginx/unstable.nix
+++ b/pkgs/servers/http/nginx/unstable.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   NIX_CFLAGS_COMPILE = [ "-I${libxml2}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations";
 
   preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules)
-    + optionalString hardening ''
+    + optionalString (hardening && (stdenv.cc.cc.isGNU or false)) ''
       configureFlagsArray=(
         --with-cc-opt="-fPIE -fstack-protector-all --param ssp-buffer-size=4 -O2 -D_FORTIFY_SOURCE=2"
         --with-ld-opt="-pie -Wl,-z,relro,-z,now"

From ca6108a2a170779228061fad6ca05e09c769073e Mon Sep 17 00:00:00 2001
From: Graham Christensen <graham@grahamc.com>
Date: Fri, 4 Mar 2016 13:31:31 -0600
Subject: [PATCH 2180/2285] wireshark: 2.0.0 -> 2.0.2 for: CVE-2016-2521
 CVE-2016-2522 CVE-2016-2523 CVE-2016-2524 CVE-2016-2525 CVE-2016-2526
 CVE-2016-2527 CVE-2016-2528 CVE-2016-2529 CVE-2016-2531 CVE-2016-2532

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

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 58be839d737a..9f810e2c5c65 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -11,7 +11,7 @@ assert withQt -> !withGtk && qt4 != null;
 with stdenv.lib;
 
 let
-  version = "2.0.0";
+  version = "2.0.2";
   variant = if withGtk then "gtk" else if withQt then "qt" else "cli";
 in
 
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "http://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.bz2";
-    sha256 = "1pci4vj23wamycfj4lxxmpxps96yq6jfmqn7hdvisw4539v6q0lh";
+    sha256 = "1hdrnsllkfbvfwsvlqvvky0z91q63mbbnjcri56nb9c5403zn8g9";
   };
 
   buildInputs = [

From be63be9d042839f1c85de7d75ca957c9cff6be57 Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Sun, 13 Dec 2015 18:20:12 +0100
Subject: [PATCH 2181/2285] haskell: add buildStackProject.

For building environments for Stack projects.
---
 pkgs/build-support/haskell/stack.nix | 40 ++++++++++++++++++++++++++++
 pkgs/top-level/haskell-packages.nix  |  2 ++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/build-support/haskell/stack.nix

diff --git a/pkgs/build-support/haskell/stack.nix b/pkgs/build-support/haskell/stack.nix
new file mode 100644
index 000000000000..80b702039557
--- /dev/null
+++ b/pkgs/build-support/haskell/stack.nix
@@ -0,0 +1,40 @@
+{ stdenv, ghc, pkgconfig, glibcLocales }:
+
+with stdenv.lib;
+
+{ buildInputs ? []
+, extraArgs ? []
+, LD_LIBRARY_PATH ? ""
+, ...
+}@args:
+
+stdenv.mkDerivation (args // {
+
+  buildInputs =
+    buildInputs ++
+    optional stdenv.isLinux glibcLocales ++
+    [ ghc pkgconfig ];
+  
+  STACK_IN_NIX_SHELL=1;
+  STACK_IN_NIX_EXTRA_ARGS =
+    concatMap (pkg: ["--extra-lib-dirs=${pkg}/lib"
+                     "--extra-include-dirs=${pkg}/include"]) buildInputs ++
+    extraArgs;
+
+  # XXX: workaround for https://ghc.haskell.org/trac/ghc/ticket/11042.
+  LD_LIBRARY_PATH = "${makeLibraryPath buildInputs}:${LD_LIBRARY_PATH}";
+
+  preferLocalBuild = true;
+
+  configurePhase = args.configurePhase or "stack setup";
+
+  buildPhase = args.buildPhase or "stack build";
+
+  checkPhase = args.checkPhase or "stack test";
+
+  doCheck = args.doCheck or true;
+
+  installPhase = args.installPhase or ''
+    stack --local-bin-path=$out/bin build --copy-bins
+  '';
+})
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 928541cd9dfa..9b7bdd015051 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -4,6 +4,8 @@ rec {
 
   lib = import ../development/haskell-modules/lib.nix { inherit pkgs; };
 
+  buildStackProject = callPackage ../build-support/haskell/stack.nix { };
+
   compiler = {
 
     ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; };

From ff9cba94f68428ebe31a057892ae32de85d76bfb Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Sun, 17 Jan 2016 20:59:20 +0100
Subject: [PATCH 2182/2285] haskell: Rename file where buildStackProject is
 defined.

---
 .../haskell-modules/generic-stack-builder.nix}                  | 0
 pkgs/top-level/haskell-packages.nix                             | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/{build-support/haskell/stack.nix => development/haskell-modules/generic-stack-builder.nix} (100%)

diff --git a/pkgs/build-support/haskell/stack.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
similarity index 100%
rename from pkgs/build-support/haskell/stack.nix
rename to pkgs/development/haskell-modules/generic-stack-builder.nix
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 9b7bdd015051..540343aa02d8 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -4,7 +4,7 @@ rec {
 
   lib = import ../development/haskell-modules/lib.nix { inherit pkgs; };
 
-  buildStackProject = callPackage ../build-support/haskell/stack.nix { };
+  buildStackProject = callPackage ../development/haskell-modules/generic-stack-builder.nix { };
 
   compiler = {
 

From 01f384b8b44b869c41125297f04820d9665d356d Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Sun, 17 Jan 2016 21:09:16 +0100
Subject: [PATCH 2183/2285] haskell: Add documentation for
 haskell.buildStackProject to user guide.

This section documents introduces Stack's primitive Nix support as well.
---
 doc/haskell-users-guide.md | 73 ++++++++++++++++++++++++++++++++++----
 1 file changed, 66 insertions(+), 7 deletions(-)

diff --git a/doc/haskell-users-guide.md b/doc/haskell-users-guide.md
index b9b2fe9e3bc9..1fc80d5b690c 100644
--- a/doc/haskell-users-guide.md
+++ b/doc/haskell-users-guide.md
@@ -117,9 +117,10 @@ Also, the attributes `haskell.compiler.ghcXYC` and
 
 ### How to install a compiler
 
-A simple development environment consists of a Haskell compiler and the tool
-`cabal-install`, and we saw in section [How to install Haskell packages] how
-you can install those programs into your user profile:
+A simple development environment consists of a Haskell compiler and one or both
+of the tools `cabal-install` and `stack`. We saw in section
+[How to install Haskell packages] how you can install those programs into your
+user profile:
 
     $ nix-env -f "<nixpkgs>" -iA haskellPackages.ghc haskellPackages.cabal-install
 
@@ -148,10 +149,16 @@ version; just enter the Nix shell environment with the command
 
     $ nix-shell -p haskell.compiler.ghc784
 
-to bring GHC 7.8.4 into `$PATH`. Re-running `cabal configure` switches your
-build to use that compiler instead. If you're working on a project that doesn't
-depend on any additional system libraries outside of GHC, then it's sufficient
-even to run the `cabal configure` command inside of the shell:
+to bring GHC 7.8.4 into `$PATH`. Alternatively, you can use Stack instead of
+`nix-shell` directly to select compiler versions and other build tools
+per-project. It uses `nix-shell` under the hood when Nix support is turned on.
+See [How to build a Haskell project using Stack].
+
+If you're using `cabal-install`, re-running `cabal configure` inside the spawned
+shell switches your build to use that compiler instead. If you're working on
+a project that doesn't depend on any additional system libraries outside of GHC,
+then it's even sufficient to just run the `cabal configure` command inside of
+the shell:
 
     $ nix-shell -p haskell.compiler.ghc784 --command "cabal configure"
 
@@ -320,6 +327,58 @@ security reasons, which might be quite an inconvenience. See [this
 page](http://kb.mozillazine.org/Links_to_local_pages_do_not_work) for
 workarounds.
 
+### How to build a Haskell project using Stack
+
+[Stack][http://haskellstack.org] is a popular build tool for Haskell projects.
+It has first-class support for Nix. Stack can optionally use Nix to
+automatically select the right version of GHC and other build tools to build,
+test and execute apps in an existing project downloaded from somewhere on the
+Internet. Pass the `--nix` flag to any `stack` command to do so, e.g.
+
+    $ git clone --recursive http://github.com/yesodweb/wai
+    $ cd wai
+    $ stack --nix build
+
+If you want `stack` to use Nix by default, you can add a `nix` section to the
+`stack.yaml` file, as explained in the [Stack documentation][stack-nix-doc]. For
+example:
+
+    nix:
+      enable: true
+      packages: [pkgconfig zeromq zlib]
+
+The example configuration snippet above tells Stack to create an ad hoc
+environment for `nix-shell` as in the below section, in which the `pkgconfig`,
+`zeromq` and `zlib` packages from Nixpkgs are available. All `stack` commands
+will implicitly be executed inside this ad hoc environment.
+
+Some projects have more sophisticated needs. For examples, some ad hoc
+environments might need to expose Nixpkgs packages compiled in a certain way, or
+with extra environment variables. In these cases, you'll need a `shell` field
+instead of `packages`:
+
+    nix:
+      enable: true
+      shell-file: shell.nix
+
+For more on how to write a `shell.nix` file see the below section. You'll need
+to express a derivation. Note that Nixpkgs ships with a convenience wrapper
+function around `mkDerivation` called `haskell.buildStackProject` to help you
+create this derivation in exactly the way Stack expects. All of the same inputs
+as `mkDerivation` can be provided. For example, to build a Stack project that
+including packages that link against a version of the R library compiled with
+special options turned on:
+
+    with (import <nixpkgs> { });
+
+    let R = pkgs.R.override { enableStrictBarrier = true; };
+    in
+	haskell.buildStackProject {
+      name = "HaskellR";
+	  buildInputs = [ R zeromq zlib ];
+    }
+
+[stack-nix-doc]: http://docs.haskellstack.org/en/stable/nix_integration.html
 
 ### How to create ad hoc environments for `nix-shell`
 

From 6f09628c321e19f999eb6f2f59fde829723a5c2d Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Sun, 17 Jan 2016 21:19:14 +0100
Subject: [PATCH 2184/2285] haskell: tell users to use Stack's nix support when
 missing system library.

---
 doc/haskell-users-guide.md | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/doc/haskell-users-guide.md b/doc/haskell-users-guide.md
index 1fc80d5b690c..da923db602d8 100644
--- a/doc/haskell-users-guide.md
+++ b/doc/haskell-users-guide.md
@@ -664,7 +664,7 @@ can configure the environment variables
 
 in their `~/.bashrc` file to avoid the compiler error.
 
-### Using Stack together with Nix
+### Builds using Stack complain about missing system libraries
 
     --  While building package zlib-0.5.4.2 using:
       runhaskell -package=Cabal-1.22.4.0 -clear-package-db [... lots of flags ...]
@@ -692,13 +692,16 @@ means specific to Stack: you'll have that problem with any other
 Haskell package that's built inside of nix-shell but run outside of that
 environment.
 
-I suppose we could try to remedy the issue by wrapping `stack` or
-`cabal` with a script that tries to find those kind of implicit search
-paths and makes them explicit on the "cabal configure" command line. I
-don't think anyone is working on that subject yet, though, because the
-problem doesn't seem so bad in practice.
+You can remedy this issue in several ways. The easiest is to add a `nix` section
+to the `stack.yaml` like the following:
 
-You can remedy that issue in several ways. First of all, run
+    nix:
+      enable: true
+	  packages: [ zlib ]
+
+Stack's Nix support knows to add `${zlib}/lib` and `${zlib}/include` as an
+`--extra-lib-dirs` and `extra-include-dirs`, respectively. Alternatively, you
+can achieve the same effect by hand. First of all, run
 
     $ nix-build --no-out-link "<nixpkgs>" -A zlib
     /nix/store/alsvwzkiw4b7ip38l4nlfjijdvg3fvzn-zlib-1.2.8
@@ -722,7 +725,8 @@ to find out the store path of the system's zlib library. Now, you can
    Typically, you'll need --extra-include-dirs as well. It's possible
    to add those flag to the project's "stack.yaml" or your user's
    global "~/.stack/global/stack.yaml" file so that you don't have to
-   specify them manually every time.
+   specify them manually every time. But again, you're likely better off using
+   Stack's Nix support instead.
 
    The same thing applies to `cabal configure`, of course, if you're
    building with `cabal-install` instead of Stack.

From 7fedb7c9922ec3c715851c54f689c949fae14da9 Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Fri, 4 Mar 2016 21:24:42 +0100
Subject: [PATCH 2185/2285] Move `buildStackProject` to `haskell.lib`.

---
 doc/haskell-users-guide.md               | 4 ++--
 pkgs/development/haskell-modules/lib.nix | 2 ++
 pkgs/top-level/haskell-packages.nix      | 2 --
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/doc/haskell-users-guide.md b/doc/haskell-users-guide.md
index da923db602d8..ce61295e5674 100644
--- a/doc/haskell-users-guide.md
+++ b/doc/haskell-users-guide.md
@@ -363,7 +363,7 @@ instead of `packages`:
 
 For more on how to write a `shell.nix` file see the below section. You'll need
 to express a derivation. Note that Nixpkgs ships with a convenience wrapper
-function around `mkDerivation` called `haskell.buildStackProject` to help you
+function around `mkDerivation` called `haskell.lib.buildStackProject` to help you
 create this derivation in exactly the way Stack expects. All of the same inputs
 as `mkDerivation` can be provided. For example, to build a Stack project that
 including packages that link against a version of the R library compiled with
@@ -373,7 +373,7 @@ special options turned on:
 
     let R = pkgs.R.override { enableStrictBarrier = true; };
     in
-	haskell.buildStackProject {
+	haskell.lib.buildStackProject {
       name = "HaskellR";
 	  buildInputs = [ R zeromq zlib ];
     }
diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index a3e1b56104d3..51adb582e54f 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -81,6 +81,8 @@ rec {
 
   buildStrictly = pkg: buildFromSdist (appendConfigureFlag pkg "--ghc-option=-Wall --ghc-option=-Werror");
 
+  buildStackProject = callPackage ../development/haskell-modules/generic-stack-builder.nix { };
+
   triggerRebuild = drv: i: overrideCabal drv (drv: { postUnpack = ": trigger rebuild ${toString i}"; });
 
   #FIXME: throw this away sometime in the future. added 2015-08-18
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 540343aa02d8..928541cd9dfa 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -4,8 +4,6 @@ rec {
 
   lib = import ../development/haskell-modules/lib.nix { inherit pkgs; };
 
-  buildStackProject = callPackage ../development/haskell-modules/generic-stack-builder.nix { };
-
   compiler = {
 
     ghc6102Binary = callPackage ../development/compilers/ghc/6.10.2-binary.nix { gmp = pkgs.gmp4; };

From abea96a28db21efb324d4db720bae0180634acdb Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 4 Mar 2016 21:58:30 +0100
Subject: [PATCH 2186/2285] tasksh: init at 1.0.0

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

diff --git a/pkgs/applications/misc/tasksh/default.nix b/pkgs/applications/misc/tasksh/default.nix
new file mode 100644
index 000000000000..9283469fcc39
--- /dev/null
+++ b/pkgs/applications/misc/tasksh/default.nix
@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, cmake, libuuid, gnutls }:
+
+stdenv.mkDerivation rec {
+  name = "tasksh-${version}";
+  version = "1.0.0";
+
+  enableParallelBuilding = true;
+
+  src = fetchurl {
+    url = "http://taskwarrior.org/download/tasksh-latest.tar.gz";
+    sha256 = "0ll6pwhw4wsdffacsmpq46fqh084p9mdaa777giqbag3b8gwik4s";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  meta = with stdenv.lib; {
+    description = "REPL for taskwarrior";
+    homepage = http://tasktools.org;
+    license = licenses.mit;
+    maintainers = with maintainers; [ matthiasbeyer ];
+    platforms = platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c116ef927d3..f1d5afc0eb1b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13714,6 +13714,8 @@ let
 
   taskwarrior = callPackage ../applications/misc/taskwarrior { };
 
+  tasksh = callPackage ../applications/misc/tasksh { };
+
   taskserver = callPackage ../servers/misc/taskserver { };
 
   telegram-cli = callPackage ../applications/networking/instant-messengers/telegram/telegram-cli/default.nix { };

From 0cf589e072e00e83c734a6af97ab0ecbf32fe78b Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Mar 2016 22:09:36 +0100
Subject: [PATCH 2187/2285] python-packages.nix: fix Emacs syntax highlighting
 (cosmetic)

---
 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 9f880b2b0530..05e66106bd32 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4705,7 +4705,7 @@ in modules // {
 
       mkdir -p $out/bin
       mkdir -p $out/lib/${python.libPrefix}/site-packages
-      cp -r server/* $out/lib/${python.libPrefix}/site-packages
+      cp -r "server/"* $out/lib/${python.libPrefix}/site-packages
       mv $out/lib/${python.libPrefix}/site-packages/deskcon-server $out/bin/deskcon-server
 
       wrapPythonProgramsIn $out/bin "$out $pythonPath"
@@ -5514,7 +5514,7 @@ in modules // {
 
     };
     postInstall=''
-    cp -R $out/gateone/* $out/lib/python2.7/site-packages/gateone
+    cp -R "$out/gateone/"* $out/lib/python2.7/site-packages/gateone
     '';
   };
 

From f103e0ac03851434ab21a42d0d025f80fcfbc847 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Mar 2016 22:11:25 +0100
Subject: [PATCH 2188/2285] Add LTS Haskell version 5.5.

---
 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 928541cd9dfa..1bf97876d887 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -359,7 +359,10 @@ rec {
     lts-5_4 = packages.ghc7103.override {
       packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.4.nix { };
     };
-    lts-5 = packages.lts-5_4;
+    lts-5_5 = packages.ghc7103.override {
+      packageSetConfig = callPackage ../development/haskell-modules/configuration-lts-5.5.nix { };
+    };
+    lts-5 = packages.lts-5_5;
 
     lts = packages.lts-5;
   };

From 86d0a9c420977edbf6b6b55c7d104f8669382afa Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Mar 2016 22:17:53 +0100
Subject: [PATCH 2189/2285] haskell.lib: fix use of callPackage

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

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 51adb582e54f..59020264b3c5 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -81,7 +81,7 @@ rec {
 
   buildStrictly = pkg: buildFromSdist (appendConfigureFlag pkg "--ghc-option=-Wall --ghc-option=-Werror");
 
-  buildStackProject = callPackage ../development/haskell-modules/generic-stack-builder.nix { };
+  buildStackProject = pkgs.callPackage ../development/haskell-modules/generic-stack-builder.nix { };
 
   triggerRebuild = drv: i: overrideCabal drv (drv: { postUnpack = ": trigger rebuild ${toString i}"; });
 

From 798a14d22cc3e3c9f83b2c05f417c2cdfc0f5a44 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Mar 2016 22:18:08 +0100
Subject: [PATCH 2190/2285] haskell-generic-stack-builder: strip trailing
 whitespace

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

diff --git a/pkgs/development/haskell-modules/generic-stack-builder.nix b/pkgs/development/haskell-modules/generic-stack-builder.nix
index 80b702039557..94999ed8c45a 100644
--- a/pkgs/development/haskell-modules/generic-stack-builder.nix
+++ b/pkgs/development/haskell-modules/generic-stack-builder.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (args // {
     buildInputs ++
     optional stdenv.isLinux glibcLocales ++
     [ ghc pkgconfig ];
-  
+
   STACK_IN_NIX_SHELL=1;
   STACK_IN_NIX_EXTRA_ARGS =
     concatMap (pkg: ["--extra-lib-dirs=${pkg}/lib"

From 5b83791207d1521dde3a6f7f4f70d730571668a4 Mon Sep 17 00:00:00 2001
From: Adam Boseley <adam.boseley@gmail.com>
Date: Thu, 5 Nov 2015 21:39:55 +1000
Subject: [PATCH 2191/2285] spice-vdagentd service : initial at 0.16.0

---
 lib/maintainers.nix                           |  1 +
 nixos/modules/module-list.nix                 |  1 +
 .../modules/services/misc/spice-vdagentd.nix  | 30 +++++++++++++++++++
 .../virtualization/spice-vdagent/default.nix  | 29 ++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 5 files changed, 63 insertions(+)
 create mode 100644 nixos/modules/services/misc/spice-vdagentd.nix
 create mode 100644 pkgs/applications/virtualization/spice-vdagent/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 7362c6ab6590..84e95a2409e3 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -10,6 +10,7 @@
   aaronschif = "Aaron Schif <aaronschif@gmail.com>";
   abaldeau = "Andreas Baldeau <andreas@baldeau.net>";
   abbradar = "Nikolay Amiantov <ab@fmap.me>";
+  aboseley = "Adam Boseley <adam.boseley@gmail.com>";
   adev = "Adrien Devresse <adev@adev.name>";
   aespinosa = "Allan Espinosa <allan.espinosa@outlook.com>";
   aflatter = "Alexander Flatter <flatter@fastmail.fm>";
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 5d487776be24..0105cc3cdf2c 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -240,6 +240,7 @@
   ./services/misc/ripple-data-api.nix
   ./services/misc/rogue.nix
   ./services/misc/siproxd.nix
+  ./services/misc/spice-vdagentd.nix
   ./services/misc/subsonic.nix
   ./services/misc/sundtek.nix
   ./services/misc/svnserve.nix
diff --git a/nixos/modules/services/misc/spice-vdagentd.nix b/nixos/modules/services/misc/spice-vdagentd.nix
new file mode 100644
index 000000000000..f8133394ffd3
--- /dev/null
+++ b/nixos/modules/services/misc/spice-vdagentd.nix
@@ -0,0 +1,30 @@
+{ config, pkgs, lib, ... }:
+
+with lib;
+let
+  cfg = config.services.spice-vdagentd;
+in
+{
+  options = {
+    services.spice-vdagentd = {
+      enable = mkEnableOption "Spice guest vdagent daemon";
+    };
+  };
+
+  config = mkIf cfg.enable {
+
+    environment.systemPackages = [ pkgs.spice-vdagent ];
+
+    systemd.services.spice-vdagentd = {
+      description = "spice-vdagent daemon";
+      wantedBy = [ "graphical.target" ];
+      preStart = ''
+        mkdir -p "/var/run/spice-vdagentd/"
+      '';
+      serviceConfig = {
+        Type = "forking";
+        ExecStart = "/bin/sh -c '${pkgs.spice-vdagent}/bin/spice-vdagentd'";
+      };
+    };
+  };
+}
diff --git a/pkgs/applications/virtualization/spice-vdagent/default.nix b/pkgs/applications/virtualization/spice-vdagent/default.nix
new file mode 100644
index 000000000000..add5f96e7f59
--- /dev/null
+++ b/pkgs/applications/virtualization/spice-vdagent/default.nix
@@ -0,0 +1,29 @@
+{stdenv, fetchurl, pkgconfig, alsaLib, spice_protocol, glib,
+ libpciaccess, libxcb, libXrandr, libXinerama, libXfixes}:
+stdenv.mkDerivation rec {
+  name = "spice-vdagent-0.16.0";
+  src = fetchurl {
+    url = "http://www.spice-space.org/download/releases/${name}.tar.bz2";
+    sha256 = "0z8gwc5va2i64mjippavmxajdb9az83ffqyhlbynm6dxw131d5av";
+  };
+  postPatch = ''
+    substituteInPlace data/spice-vdagent.desktop --replace /usr $out
+  '';
+  buildInputs = [ pkgconfig alsaLib spice_protocol glib
+                  libpciaccess libxcb libXrandr libXinerama libXfixes ] ;
+  meta = {
+    description = "Enhanced SPICE integration for linux QEMU guest";
+    longDescription = ''
+       Spice agent for linux guests offering
+       * Client mouse mode
+       * Copy and paste
+       * Automatic adjustment of the X-session resolution
+         to the client resolution
+       * Multiple displays
+    '';
+    homepage = http://www.spice-space.org/home.html;
+    license = stdenv.lib.licenses.gpl3;
+    maintainers = [ stdenv.lib.maintainers.aboseley ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c116ef927d3..fe5ecdf35523 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13519,6 +13519,8 @@ let
 
   sound-juicer = callPackage ../applications/audio/sound-juicer { };
 
+  spice-vdagent = callPackage ../applications/virtualization/spice-vdagent { };
+
   spideroak = callPackage ../applications/networking/spideroak { };
 
   ssvnc = callPackage ../applications/networking/remote/ssvnc { };

From 288d01fe2ba697531f48859c593e1647a8b91e5f Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Fri, 4 Mar 2016 23:05:48 +0100
Subject: [PATCH 2192/2285] stellarium: update to 0.14.2

This patch also fixes https://github.com/NixOS/nixpkgs/issues/13582.
---
 .../science/astronomy/stellarium/default.nix        | 13 +++++++++----
 pkgs/top-level/all-packages.nix                     |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index e77e848bed2c..7798b1bef6c1 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -1,14 +1,19 @@
-{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, qt5Full, perl, libiconv }:
+{ stdenv, fetchurl, cmake, freetype, libpng, mesa, gettext, openssl, perl, libiconv
+, qtscript, qtserialport, qttools
+}:
 
 stdenv.mkDerivation rec {
-  name = "stellarium-0.13.3";
+  name = "stellarium-0.14.2";
 
   src = fetchurl {
     url = "mirror://sourceforge/stellarium/${name}.tar.gz";
-    sha256 = "1ml6z2xda4vx61agdz54x8fw1b115gwc7rcy0zhz1jh6g5jvf0ij";
+    sha256 = "1xxil0rv61zc08znfv83cpsc47y1gjl2f3njhz0pn5zd8jpaa15a";
   };
 
-  buildInputs = [ cmake freetype libpng mesa gettext openssl perl libiconv qt5Full ];
+  buildInputs = [
+    cmake freetype libpng mesa gettext openssl perl libiconv qtscript
+    qtserialport qttools
+  ];
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c116ef927d3..b34fd62015df 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15689,7 +15689,7 @@ let
 
   spyder = pythonPackages.spyder;
 
-  stellarium = callPackage ../applications/science/astronomy/stellarium { };
+  stellarium = qt5.callPackage ../applications/science/astronomy/stellarium { };
 
   tulip = callPackage ../applications/science/misc/tulip {
     cmake = cmake-2_8;

From 36fbab1374c27fbb0adfde3dfe06aa16a067e338 Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <sveina@gmail.com>
Date: Mon, 29 Feb 2016 18:03:47 +0000
Subject: [PATCH 2193/2285] prometheus: Bump to 0.17.0

---
 pkgs/top-level/go-packages.nix | 67 ++++++++++++++++------------------
 1 file changed, 32 insertions(+), 35 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index ddf18dd3b8ff..1054296be161 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2871,51 +2871,48 @@ let
     };
   };
 
-  prometheus.prometheus = buildGoPackage rec {
-    name = "prometheus-${version}";
-    version = "0.15.1";
-    goPackagePath = "github.com/prometheus/prometheus";
-    rev = "64349aade284846cb194be184b1b180fca629a7c";
-
-    src = fetchFromGitHub {
-      inherit rev;
-      owner = "prometheus";
-      repo = "prometheus";
-      sha256 = "0gljpwnlip1fnmhbc96hji2rc56xncy97qccm7v1z5j1nhc5fam2";
-    };
+  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
+      # 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
     '';
 
-    # Metadata that gets embedded into the binary
-    buildFlagsArray = let t = "${goPackagePath}/version"; in
-    ''
-      -ldflags=
-          -X ${t}.Version=${version}
-          -X ${t}.Revision=${builtins.substring 0 6 rev}
-          -X ${t}.Branch=master
-          -X ${t}.BuildUser=nix@nixpkgs
-          -X ${t}.BuildDate=20150101-00:00:00
-          -X ${t}.GoVersion=${stdenv.lib.getVersion go}
-    '';
-
     meta = with stdenv.lib; {
       description = "Service monitoring system and time series database";
       homepage = http://prometheus.io;

From 9ccb248e49f5ed367a822b16e4febb71831e66e3 Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <sveina@gmail.com>
Date: Mon, 29 Feb 2016 18:04:07 +0000
Subject: [PATCH 2194/2285] prometheus-alertmanager: Bump to 0.1.0

---
 pkgs/top-level/go-packages.nix | 46 ++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 22 deletions(-)

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 1054296be161..2ff00bd72494 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2651,33 +2651,35 @@ let
     propagatedBuildInputs = [ kr.text ];
   };
 
-  prometheus.alertmanager = buildGoPackage rec {
-    name = "prometheus-alertmanager-${rev}";
-    rev = "0.0.4";
-    goPackagePath = "github.com/prometheus/alertmanager";
-
-    src = fetchFromGitHub {
-      owner = "prometheus";
-      repo = "alertmanager";
-      inherit rev;
-      sha256 = "0g656rzal7m284mihqdrw23vhs7yr65ax19nvi70jl51wdallv15";
-    };
+  prometheus.alertmanager = buildFromGitHub rec {
+    rev = "0.1.0";
+    owner = "prometheus";
+    repo = "alertmanager";
+    sha256 = "1ya465bns6cj2lqbipmfm13wz8kxii5h9mm7lc0ba1xv26xx5zs7";
 
     buildInputs = [
-      fsnotify.v0
-      httprouter
-      prometheus.client_golang
-      prometheus.log
-      pushover
+      # fsnotify.v0
+      # httprouter
+      # prometheus.client_golang
+      # prometheus.log
+      # pushover
     ];
 
-    buildFlagsArray = ''
+    # 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 main.buildVersion=${rev}
-          -X main.buildBranch=master
-          -X main.buildUser=nix@nixpkgs
-          -X main.buildDate=20150101-00:00:00
-          -X main.goVersion=${stdenv.lib.getVersion go}
+         -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; {

From c1fb5414219a03b0c89bd6f65320eedc4fc7ee90 Mon Sep 17 00:00:00 2001
From: Svein Ove Aas <sveina@gmail.com>
Date: Mon, 29 Feb 2016 18:04:26 +0000
Subject: [PATCH 2195/2285] prometheus-node-exporter: Bump to 0.11.0

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

diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 2ff00bd72494..3206fbba20ed 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -2821,10 +2821,10 @@ let
   };
 
   prometheus.node-exporter = buildFromGitHub {
-    rev = "0.10.0";
+    rev = "0.11.0";
     owner = "prometheus";
     repo = "node_exporter";
-    sha256 = "0dmczav52v9vi0kxl8gd2s7x7c94g0vzazhyvlq1h3729is2nf0p";
+    sha256 = "149fs9yxnbiyd4ww7bxsv730mcskblpzb3cs4v12jnq2v84a4kk4";
 
     buildInputs = [
       go-runit
@@ -2835,6 +2835,8 @@ let
       protobuf
     ];
 
+    doCheck = true;
+
     meta = with stdenv.lib; {
       description = "Prometheus exporter for machine metrics";
       homepage = https://github.com/prometheus/node_exporter;

From a1363ef02d1ca75f3ca84e6d590cd1b7b7b084b7 Mon Sep 17 00:00:00 2001
From: Matthew Bauer <mjbauer95@gmail.com>
Date: Fri, 4 Mar 2016 14:09:24 -0600
Subject: [PATCH 2196/2285] fluidsynth: fix build errors in darwin builds

Build inputs were not being passed in properly.
---
 pkgs/applications/audio/fluidsynth/default.nix | 7 ++++---
 pkgs/top-level/all-packages.nix                | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/audio/fluidsynth/default.nix b/pkgs/applications/audio/fluidsynth/default.nix
index bd35b78fbc0e..bb37cac5500e 100644
--- a/pkgs/applications/audio/fluidsynth/default.nix
+++ b/pkgs/applications/audio/fluidsynth/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, alsaLib, glib, libjack2, libsndfile, pkgconfig
-, libpulseaudio }:
+, libpulseaudio, CoreServices, CoreAudio, AudioUnit }:
 
 stdenv.mkDerivation  rec {
   name = "fluidsynth-${version}";
@@ -18,10 +18,11 @@ stdenv.mkDerivation  rec {
   '';
 
   NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin
-    "-framework CoreAudio";
+    "-framework CoreAudio -framework CoreServices";
 
   buildInputs = [ glib libsndfile pkgconfig ]
-    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ];
+    ++ stdenv.lib.optionals (!stdenv.isDarwin) [ alsaLib libpulseaudio libjack2 ]
+    ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices CoreAudio AudioUnit ];
 
   meta = with stdenv.lib; {
     description = "Real-time software synthesizer based on the SoundFont 2 specifications";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 831390ad774e..639410c27349 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12100,7 +12100,9 @@ let
 
   fldigi = callPackage ../applications/audio/fldigi { };
 
-  fluidsynth = callPackage ../applications/audio/fluidsynth { };
+  fluidsynth = callPackage ../applications/audio/fluidsynth {
+     inherit (darwin.apple_sdk.frameworks) CoreServices CoreAudio AudioUnit;
+  };
 
   fmit = qt5.callPackage ../applications/audio/fmit { };
 

From 9c10e2933a0a859ae845689917913360221d5477 Mon Sep 17 00:00:00 2001
From: Patrick Callahan <pxcallahan@gmail.com>
Date: Fri, 4 Mar 2016 10:09:46 -0700
Subject: [PATCH 2197/2285] ds4drv: init at 0.5.0

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

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d9a42b25ce53..b20f96c63bbd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5053,6 +5053,27 @@ in modules // {
     };
   };
 
+
+  ds4drv = buildPythonPackage rec {
+    name = "ds4drv-${version}";
+    version = "0.5.0";
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/d/ds4drv/${name}.tar.gz";
+      sha256 = "0dq2z1z09zxa6rn3v94vwqaaz29jwiydkss8hbjglixf20krmw3b";
+    };
+
+    propagatedBuildInputs = with self; [ evdev pyudev ];
+
+    buildInputs = [ pkgs.bluez ];
+
+    meta = {
+      description = "Userspace driver for the DualShock 4 controller";
+      homepage = "https://github.com/chrippa/ds4drv";
+      license = licenses.mit;
+    };
+
+  };
+
   dyn = buildPythonPackage rec {
     version = "1.5.0";
     name = "dyn-${version}";

From 8d5accb6915e6b2db459f26da451c89d2f5b5d99 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 5 Mar 2016 02:55:00 +0100
Subject: [PATCH 2198/2285] chromium/updater: Fix getting latest versions

Comparing the current version with the version in sources list and
accidentally swapping the version arguments isn't going to get very far
because every new version that will come up will then be treated as "we
already have that version".

So we're now using versionOlder and also a check whether the version is
the *same* as the one in sources.nix.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../networking/browsers/chromium/source/update.nix             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/source/update.nix b/pkgs/applications/networking/browsers/chromium/source/update.nix
index 3c489b7523e6..28ef03b2c77d 100644
--- a/pkgs/applications/networking/browsers/chromium/source/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/update.nix
@@ -181,7 +181,8 @@ in rec {
     isLatest = channel: version: let
       ourVersion = sources.${channel}.version or null;
     in if ourVersion == null then false
-       else lib.versionAtLeast version sources.${channel}.version;
+       else lib.versionOlder version sources.${channel}.version
+         || version == sources.${channel}.version;
 
     # We only support GNU/Linux right now.
     linuxChannels = let

From c3d82f0fbfae29e2cb3b2098a1fd7ac1f5605467 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 5 Mar 2016 03:10:53 +0100
Subject: [PATCH 2199/2285] chromium/updater: Fix eval error on stdenv.is32bit

There is no stdenv.is32bit, so let's just use !stdenv.is64bit.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 .../applications/networking/browsers/chromium/source/update.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/source/update.nix b/pkgs/applications/networking/browsers/chromium/source/update.nix
index 28ef03b2c77d..d4dc3b59cbc7 100644
--- a/pkgs/applications/networking/browsers/chromium/source/update.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/update.nix
@@ -46,7 +46,7 @@ in rec {
     in if stdenv.is64bit && chanAttrs ? sha256bin64 then {
       urls = mkUrls "amd64";
       sha256 = chanAttrs.sha256bin64;
-    } else if stdenv.is32bit && chanAttrs ? sha256bin32 then {
+    } else if !stdenv.is64bit && chanAttrs ? sha256bin32 then {
       urls = mkUrls "i386";
       sha256 = chanAttrs.sha256bin32;
     } else throw "No Chrome plugins are available for your architecture.";

From 3b5ff2761c18976610a72c26f750c2ddd9fd918b Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Fri, 4 Mar 2016 21:54:24 -0500
Subject: [PATCH 2200/2285] as31: use yacc to generate parser.c file

The source includes a generated parser.c file which is out of date and
causes errors on x86_64 in certain cases. Delete this file so that make
will use yacc to generate a correct parser.c file.

Change taken from comments at https://aur.archlinux.org/packages/as31/.
---
 pkgs/development/compilers/as31/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/as31/default.nix b/pkgs/development/compilers/as31/default.nix
index 24cba18254f2..a7f37976ec40 100644
--- a/pkgs/development/compilers/as31/default.nix
+++ b/pkgs/development/compilers/as31/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl }:
+{ stdenv, fetchurl, yacc }:
 
 let
 
@@ -11,10 +11,17 @@ in stdenv.mkDerivation {
     url = "http://wiki.erazor-zone.de/_media/wiki:projects:linux:as31:as31-${version}.tar.gz";
     sha256 = "0mbk6z7z03xb0r0ccyzlgkjdjmdzknck4yxxmgr9k7v8f5c348fd";
   };
+
+  buildInputs = [ yacc ];
+
   preConfigure = ''
     chmod +x ./configure
   '';
 
+  postConfigure = ''
+    rm as31/parser.c
+  '';
+
   meta = with stdenv.lib; {
     homepage = "http://wiki.erazor-zone.de/wiki:projects:linux:as31";
     description = "An 8031/8051 assembler by Ken Stauffer and Theo Deraadt which produces a variety of object code output formats";

From 9e9a2f10966ab3889b523032ce83cf8c3b0698a8 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 5 Mar 2016 09:15:46 +0300
Subject: [PATCH 2201/2285] unrar: 5.3.9 -> 5.3.11

Also build shared library.
---
 pkgs/tools/archivers/unrar/default.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix
index 49638ced16a2..cbfced7aa6b2 100644
--- a/pkgs/tools/archivers/unrar/default.nix
+++ b/pkgs/tools/archivers/unrar/default.nix
@@ -1,18 +1,18 @@
 {stdenv, fetchurl}:
 
-let
-  version = "5.3.9";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "unrar-${version}";
+  version = "5.3.11";
 
   src = fetchurl {
     url = "http://www.rarlab.com/rar/unrarsrc-${version}.tar.gz";
-    sha256 = "0nsxwg1zp3s34wyjznwmy2cc5929yk7m5smq11cqdb6hmql3fngz";
+    sha256 = "0qw77gvr57azjbn76cjlm4sv1hf2hh90g7n7n33gfvlpnbs7mf3p";
   };
 
-  preBuild = ''
-    export buildFlags="CXX=$CXX"
+  buildPhase = ''
+    make unrar
+    make clean
+    make lib
   '';
 
   installPhase = ''
@@ -21,6 +21,9 @@ stdenv.mkDerivation {
     mkdir -p $out/share/doc/unrar
     cp acknow.txt license.txt \
         $out/share/doc/unrar
+
+    install -Dm755 libunrar.so $out/lib/libunrar.so
+    install -D dll.hpp $out/include/unrar/dll.hpp
   '';
 
   setupHook = ./setup-hook.sh;

From fdf22fb5bb9c55204bddad2ff51b3a9e478a6909 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sat, 5 Mar 2016 11:26:33 +0100
Subject: [PATCH 2202/2285] exim: 4.86 -> 4.86.2

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

diff --git a/pkgs/servers/mail/exim/default.nix b/pkgs/servers/mail/exim/default.nix
index 6f2b65fd9b7d..d8d1f0dc3a7c 100644
--- a/pkgs/servers/mail/exim/default.nix
+++ b/pkgs/servers/mail/exim/default.nix
@@ -1,11 +1,11 @@
 { coreutils, fetchurl, db, openssl, pcre, perl, pkgconfig, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "exim-4.86";
+  name = "exim-4.86.2";
 
   src = fetchurl {
     url = "http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/${name}.tar.bz2";
-    sha256 = "0mn4bxih9slrmll5262ayhf41ji43pjf1rv0y6xpy6x55v7g5k7i";
+    sha256 = "1cvfcc1hi60lydv8h3a2rxlfc0v2nflwpvzjj7h7cdsqs2pxwmkp";
   };
 
   buildInputs = [ coreutils db openssl pcre perl pkgconfig ];

From 676019bd85ecc53a8ea614d329c0aa9a46f8e1bc Mon Sep 17 00:00:00 2001
From: Tuomas Tynkkynen <tuomas.tynkkynen@iki.fi>
Date: Sat, 5 Mar 2016 12:34:26 +0200
Subject: [PATCH 2203/2285] utillinux: Restore utillinuxCurses alias

This got removed by eead3bc53655. Reintroduce the alias to avoid
breaking users' configurations.
---
 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 831390ad774e..ad20707b09ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10950,6 +10950,7 @@ let
   usermount = callPackage ../os-specific/linux/usermount { };
 
   utillinux = callPackage ../os-specific/linux/util-linux { };
+  utillinuxCurses = utillinux;
 
   utillinuxMinimal = appendToName "minimal" (utillinux.override {
     ncurses = null;

From 390effeb6e88d80cac6b140e2ec885667908a071 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Sun, 28 Feb 2016 10:51:16 +0100
Subject: [PATCH 2204/2285] orthorobot: init at unversioned

---
 pkgs/games/orthorobot/default.nix | 63 +++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix   |  2 +
 2 files changed, 65 insertions(+)
 create mode 100644 pkgs/games/orthorobot/default.nix

diff --git a/pkgs/games/orthorobot/default.nix b/pkgs/games/orthorobot/default.nix
new file mode 100644
index 000000000000..b1a39a609a1b
--- /dev/null
+++ b/pkgs/games/orthorobot/default.nix
@@ -0,0 +1,63 @@
+{ stdenv, fetchurl, unzip, love, lua, makeWrapper, makeDesktopItem }:
+
+let
+  pname = "orthorobot";
+  version = "1.0";
+
+  icon = fetchurl {
+    url = "http://stabyourself.net/images/screenshots/orthorobot-5.png";
+    sha256 = "13fa4divdqz4vpdij1lcs5kf6w2c4jm3cc9q6bz5h7lkng31jzi6";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "orthorobot";
+    exec = "${pname}";
+    icon = "${icon}";
+    comment = "Robot game";
+    desktopName = "Orthorobot";
+    genericName = "orthorobot";
+    categories = "Game;";
+  };
+
+in
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url = "http://stabyourself.net/dl.php?file=${pname}/${pname}-source.zip";
+    sha256 = "023nc3zwjkbmy4c8w6mfg39mg69zpqqr2gzlmp4fpydrjas70kbl";
+  };
+
+  nativeBuildInputs = [ makeWrapper unzip ];
+  buildInputs = [ lua love ];
+
+  phases = [ "unpackPhase" "installPhase" ];
+
+  unpackPhase = ''
+    unzip -j $src
+  '';  
+
+  installPhase =
+  ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/games/lovegames
+
+    cp -v ./*.love $out/share/games/lovegames/${pname}.love
+
+    makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love
+
+    chmod +x $out/bin/${pname}
+    mkdir -p $out/share/applications
+    ln -s ${desktopItem}/share/applications/* $out/share/applications/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "Recharge the robot";
+    maintainers = with maintainers; [ leenaars ];
+    platforms = platforms.linux;
+    license = licenses.free;
+    downloadPage = http://stabyourself.net/orthorobot/;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index de648bc16f65..be1028b919ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14574,6 +14574,8 @@ let
 
   openxcom = callPackage ../games/openxcom { };
 
+  orthorobot = callPackage ../games/orthorobot { love = love_0_7; };
+
   performous = callPackage ../games/performous { };
 
   pingus = callPackage ../games/pingus {};

From b1096d08114c5539dbe98d2788bb1f0559401f5f Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@brianmckenna.org>
Date: Sun, 6 Mar 2016 00:03:26 +1100
Subject: [PATCH 2205/2285] elpa-packages 2016-03-06

---
 .../editors/emacs-modes/elpa-generated.nix    | 118 ++++++++++++------
 1 file changed, 79 insertions(+), 39 deletions(-)

diff --git a/pkgs/applications/editors/emacs-modes/elpa-generated.nix b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
index fbb7955a1d67..f10b1fbe61f8 100644
--- a/pkgs/applications/editors/emacs-modes/elpa-generated.nix
+++ b/pkgs/applications/editors/emacs-modes/elpa-generated.nix
@@ -132,6 +132,19 @@
           license = lib.licenses.free;
         };
       }) {};
+    arbitools = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "arbitools";
+        version = "0.51";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/arbitools-0.51.el";
+          sha256 = "1pwps73s885i1777wlmqhkmfgj564bkb6rkpc964v0vcqia6fpag";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/arbitools.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     ascii-art-to-unicode = callPackage ({ elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "ascii-art-to-unicode";
@@ -322,10 +335,10 @@
     company-math = callPackage ({ company, elpaBuild, fetchurl, lib, math-symbol-lists }:
     elpaBuild {
         pname = "company-math";
-        version = "1.0.1";
+        version = "1.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/company-math-1.0.1.el";
-          sha256 = "1lkj9cqhmdf3h5zvr94hszkz1251i2rq2mycnhscsnzrk5ll3gck";
+          url = "http://elpa.gnu.org/packages/company-math-1.1.tar";
+          sha256 = "10yi5jmv7njcaansgy2aw7wm1j3acch1j9x6lfg9mxk0j21zvgwp";
         };
         packageRequires = [ company math-symbol-lists ];
         meta = {
@@ -350,10 +363,10 @@
     context-coloring = callPackage ({ elpaBuild, emacs, fetchurl, js2-mode, lib }:
     elpaBuild {
         pname = "context-coloring";
-        version = "7.2.0";
+        version = "7.2.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/context-coloring-7.2.0.el";
-          sha256 = "0l7mzmnhqh6sri1fhhv51khi0fnpfp51drzy725s6zfmpbrcn7vn";
+          url = "http://elpa.gnu.org/packages/context-coloring-7.2.1.el";
+          sha256 = "1lh2p3fsym73h0dcj1gqg1xsw3lcikmcskbx8y3j0ds30l4xs13d";
         };
         packageRequires = [ emacs js2-mode ];
         meta = {
@@ -628,12 +641,26 @@
           license = lib.licenses.free;
         };
       }) {};
+    excorporate = callPackage ({ elpaBuild, emacs, fetchurl, fsm, lib, soap-client, url-http-ntlm }:
+    elpaBuild {
+        pname = "excorporate";
+        version = "0.7.1";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/excorporate-0.7.1.tar";
+          sha256 = "1flvhk39yymskzazpwh95j2nj8kg4b02hsg7b8msnqi3q5lpqs54";
+        };
+        packageRequires = [ emacs fsm soap-client url-http-ntlm ];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/excorporate.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     exwm = callPackage ({ elpaBuild, fetchurl, lib, xelb }: elpaBuild {
         pname = "exwm";
-        version = "0.2";
+        version = "0.4";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/exwm-0.2.tar";
-          sha256 = "0z96zz6h5r880nbhclbxs2r0zfkg771lg0fjghigqxz8ai0hh1ll";
+          url = "http://elpa.gnu.org/packages/exwm-0.4.tar";
+          sha256 = "1qlplx88mk8c5sahlymxxh46bzf6bxnsqk92wliv5ji4ai5373fb";
         };
         packageRequires = [ xelb ];
         meta = {
@@ -767,10 +794,10 @@
     hydra = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "hydra";
-        version = "0.13.4";
+        version = "0.13.5";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/hydra-0.13.4.tar";
-          sha256 = "11msy6n075iv00c2r9f85bzx3srnj403rhlga1rgsl6vsryf21fj";
+          url = "http://elpa.gnu.org/packages/hydra-0.13.5.tar";
+          sha256 = "0vq1pjyq6ddbikbh0vzdigbs0zlldgwad0192s7v9npg8qlwi668";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -978,10 +1005,10 @@
       }) {};
     math-symbol-lists = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "math-symbol-lists";
-        version = "1.0";
+        version = "1.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/math-symbol-lists-1.0.el";
-          sha256 = "1rry9x4pl7i0sij051i76zp1ypvnj1qbwm40a7bs462c74q4jlwn";
+          url = "http://elpa.gnu.org/packages/math-symbol-lists-1.1.tar";
+          sha256 = "06klvnqipz0n9slw72fxmhrydrw6bi9fs9vnn8hrja8gsqf8inlz";
         };
         packageRequires = [];
         meta = {
@@ -1005,10 +1032,10 @@
     metar = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "metar";
-        version = "0.1";
+        version = "0.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/metar-0.1.el";
-          sha256 = "0s9zyzps022h5xax574bwsvsyp893x5w74kznnhfm63sxrifbi18";
+          url = "http://elpa.gnu.org/packages/metar-0.2.el";
+          sha256 = "0rfzq79llh6ixw02kjpn8s2shxrabvfvsq48pagwak1jl2s0askf";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -1215,10 +1242,10 @@
       }) {};
     org = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "org";
-        version = "20160215";
+        version = "20160229";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/org-20160215.tar";
-          sha256 = "0w2686rza4xdknq3sy87s04zvlmjxyr6wrj9y9ydcv8hbzws3bhd";
+          url = "http://elpa.gnu.org/packages/org-20160229.tar";
+          sha256 = "15zrkw33ma8q079sb518rmcj97n35rnjv16p6zfw52m9xfdwxgi9";
         };
         packageRequires = [];
         meta = {
@@ -1411,6 +1438,19 @@
           license = lib.licenses.free;
         };
       }) {};
+    sed-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
+        pname = "sed-mode";
+        version = "1.0";
+        src = fetchurl {
+          url = "http://elpa.gnu.org/packages/sed-mode-1.0.el";
+          sha256 = "1zpdai5k9zhy5hw0a5zx7qv3rcf8cn29hncfjnhk9k6sjq0302lg";
+        };
+        packageRequires = [];
+        meta = {
+          homepage = "http://elpa.gnu.org/packages/sed-mode.html";
+          license = lib.licenses.free;
+        };
+      }) {};
     seq = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "seq";
         version = "1.11";
@@ -1439,10 +1479,10 @@
       }) {};
     sisu-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild {
         pname = "sisu-mode";
-        version = "3.0.3";
+        version = "7.1.8";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/sisu-mode-3.0.3.el";
-          sha256 = "0ay9hfix3x53f39my02071dzxrw69d4zx5zirxwmmmyxmkaays3r";
+          url = "http://elpa.gnu.org/packages/sisu-mode-7.1.8.el";
+          sha256 = "12zs6y4rzng1d7djl9wh3wc0f9fj0bqb7h754rvixvndlr5c10nj";
         };
         packageRequires = [];
         meta = {
@@ -1492,10 +1532,10 @@
       }) {};
     sotlisp = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
         pname = "sotlisp";
-        version = "1.4.1";
+        version = "1.5.1";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/sotlisp-1.4.1.el";
-          sha256 = "1v99pcj5lp1xxavghwv03apwpc589y7wb8vv6w3kai7483p13z5j";
+          url = "http://elpa.gnu.org/packages/sotlisp-1.5.1.el";
+          sha256 = "1dm2pl4i091gi5lljl68s6v3l3904jj38v56qjblm160wjiahgkm";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1518,10 +1558,10 @@
       }) {};
     stream = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild {
         pname = "stream";
-        version = "2.1.0";
+        version = "2.2.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/stream-2.1.0.el";
-          sha256 = "05fihjd8gm5w4xbdcvah1g9srcgmk87ymk3i7wwa6961w5s01d5y";
+          url = "http://elpa.gnu.org/packages/stream-2.2.0.el";
+          sha256 = "0i6vwih61a0z0q05v9wyp9nj5h68snlb9n52nmrv1k0hhzsjmlrs";
         };
         packageRequires = [ emacs ];
         meta = {
@@ -1598,10 +1638,10 @@
     test-simple = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib }:
     elpaBuild {
         pname = "test-simple";
-        version = "1.1";
+        version = "1.2.0";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/test-simple-1.1.el";
-          sha256 = "0s8r6kr0a6n1c20fraif2ngis436a7d3gsj351s6icx6bbcjdalw";
+          url = "http://elpa.gnu.org/packages/test-simple-1.2.0.el";
+          sha256 = "1j97qrwi3i2kihszsxf3y2cby2bzp8g0zf6jlpdix3dinav8xa3b";
         };
         packageRequires = [ cl-lib ];
         meta = {
@@ -1704,10 +1744,10 @@
     url-http-ntlm = callPackage ({ cl-lib ? null, elpaBuild, fetchurl, lib, ntlm ? null }:
     elpaBuild {
         pname = "url-http-ntlm";
-        version = "2.0.1";
+        version = "2.0.2";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/url-http-ntlm-2.0.1.tar";
-          sha256 = "0h6xsm1x7v69kb4shyvv1p4f6sxgcqs5ap6ylqydz10mbcx7aq0w";
+          url = "http://elpa.gnu.org/packages/url-http-ntlm-2.0.2.el";
+          sha256 = "0jci5cl31hw4dj0j9ljq0iplg530wnwbw7b63crrwn3mza5cb2wf";
         };
         packageRequires = [ cl-lib ntlm ];
         meta = {
@@ -1849,10 +1889,10 @@
     xelb = callPackage ({ cl-generic, elpaBuild, emacs, fetchurl, lib }:
     elpaBuild {
         pname = "xelb";
-        version = "0.5";
+        version = "0.6";
         src = fetchurl {
-          url = "http://elpa.gnu.org/packages/xelb-0.5.tar";
-          sha256 = "1wypffg492r2a3h136c6mphsbgimxcipsarm971z56kpy3lwi4sb";
+          url = "http://elpa.gnu.org/packages/xelb-0.6.tar";
+          sha256 = "1m91af5srxq8zs9w4gb44kl4bgka8fq7k33h7f2yn213h23kvvvh";
         };
         packageRequires = [ cl-generic emacs ];
         meta = {

From af8540441262eccf776494007efcd7ee1581719f Mon Sep 17 00:00:00 2001
From: AndersonTorres <torres.anderson.85@gmail.com>
Date: Sat, 5 Mar 2016 11:34:17 -0300
Subject: [PATCH 2206/2285] Cutegram: add qtimageformats (for sticker support)

This commit adds preliminary sticker support for Cutegram.
---
 .../instant-messengers/telegram/cutegram/default.nix   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
index fa03b8d21adc..ec188e982843 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/cutegram/default.nix
@@ -1,5 +1,6 @@
 { stdenv, fetchgit
-, qtbase, qtmultimedia, qtquick1, qtquickcontrols, qtgraphicaleffects
+, qtbase, qtmultimedia, qtquick1, qtquickcontrols
+, qtimageformats, qtgraphicaleffects
 , telegram-qml, libqtelegram-aseman-edition
 , gst_plugins_base, gst_plugins_good, gst_plugins_bad, gst_plugins_ugly
 , makeQtWrapper }:
@@ -14,8 +15,9 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs =
-  [ qtbase qtmultimedia qtquick1 qtquickcontrols qtgraphicaleffects
-    telegram-qml libqtelegram-aseman-edition
+  [ qtbase qtmultimedia qtquick1 qtquickcontrols
+    qtimageformats qtgraphicaleffects
+    telegram-qml libqtelegram-aseman-edition 
     gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly ];
   nativeBuildInputs = [ makeQtWrapper ];
   enableParallelBuild = true;
@@ -33,5 +35,3 @@ stdenv.mkDerivation rec {
   };
 }
 #TODO: appindicator, for system tray plugin (by @profpatsch)
-
-

From 0865d19ccd6baa36b575ef3dc50b0bed76f6dca6 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sat, 5 Mar 2016 17:49:15 +0300
Subject: [PATCH 2207/2285] haskellPackages.Agda: use older
 unordered-containers to fix build

Fixes #13594.
---
 pkgs/development/haskell-modules/configuration-common.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 4fa6d2f78bbd..01c0298b0f07 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -927,4 +927,7 @@ self: super: {
 
   # https://github.com/mainland/language-c-quote/issues/57
   language-c-quote = super.language-c-quote.override { alex = self.alex_3_1_4; };
+
+  # https://github.com/agda/agda/issues/1840
+  Agda = super.Agda.override { unordered-containers = self.unordered-containers_0_2_5_1; };
 }

From af35cd251386806ce5692003067787773f363e39 Mon Sep 17 00:00:00 2001
From: Michiel Leenaars <ml.software@leenaa.rs>
Date: Sun, 28 Feb 2016 15:33:21 +0100
Subject: [PATCH 2208/2285] vapor: init at 0.2.3

---
 pkgs/games/vapor/default.nix    | 61 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 63 insertions(+)
 create mode 100644 pkgs/games/vapor/default.nix

diff --git a/pkgs/games/vapor/default.nix b/pkgs/games/vapor/default.nix
new file mode 100644
index 000000000000..0209fd83b1c6
--- /dev/null
+++ b/pkgs/games/vapor/default.nix
@@ -0,0 +1,61 @@
+{ stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }:
+
+let
+  pname = "vapor";
+  version = "0.2.3";
+  commitid = "dbf509f";
+
+  icon = fetchurl {
+    url = "http://vapor.love2d.org/sites/default/files/vapT240x90.png";
+    sha256 = "1xlra74lpm1y54z6zm6is0gldkswp3wdw09m6a306ch0xjf3f87f";
+  };
+
+  desktopItem = makeDesktopItem {
+    name = "Vapor";
+    exec = "${pname}";
+    icon = "${icon}";
+    comment = "LÖVE Distribution Client"; 
+    desktopName = "Vapor";
+    genericName = "vapor";
+    categories = "Game;";
+  };
+
+in 
+
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
+
+  src = fetchurl {
+    url =
+    "https://github.com/josefnpat/${pname}/releases/download/${version}/${pname}_${commitid}.love";
+    sha256 = "0w2qkrrkzfy4h4jld18apypmbi8a8r89y2l11axlv808i2rg68fk";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+  buildInputs = [ lua love ];
+
+  phases = "installPhase";
+
+  installPhase =
+  ''
+    mkdir -p $out/bin
+    mkdir -p $out/share
+
+    cp -v $src $out/share/${pname}.love
+
+    makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/${pname}.love
+
+    chmod +x $out/bin/${pname}
+    mkdir -p $out/share/applications
+    ln -s ${desktopItem}/share/applications/* $out/share/applications/
+  '';
+
+  meta = with stdenv.lib; {
+    description = "LÖVE Distribution Client allowing access to many games";
+    platforms = platforms.linux;
+    license = licenses.zlib;
+    maintainers = with maintainers; [ leenaars ];
+    downloadPage = http://vapor.love2d.org/;
+  };
+
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 414fd2ae30ab..9c361257b009 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14755,6 +14755,8 @@ let
 
   ut2004demo = callPackage ../games/ut2004demo { };
 
+  vapor = callPackage ../games/vapor { love = love_0_8; };
+
   vassal = callPackage ../games/vassal { };
 
   vdrift = callPackage ../games/vdrift { };

From 1ff8a6b6c44761c0c0a5b0ffb2f32ea6ba5cea20 Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Tue, 1 Mar 2016 19:21:07 +0100
Subject: [PATCH 2209/2285] electrum: 2.5.4 -> 2.6.1

---
 pkgs/applications/misc/electrum/default.nix | 27 +++++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix
index 6025fce776c7..c9b6de715d2a 100644
--- a/pkgs/applications/misc/electrum/default.nix
+++ b/pkgs/applications/misc/electrum/default.nix
@@ -1,17 +1,34 @@
-{ stdenv, fetchurl, buildPythonApplication, pythonPackages, slowaes }:
+{ stdenv, fetchurl, pythonPackages }:
 
-buildPythonApplication rec {
+let
+  jsonrpclib = pythonPackages.buildPythonPackage rec {
+    version = "0.1.7";
+    name = "jsonrpclib-${version}";
+    src = fetchurl {
+      url = "https://pypi.python.org/packages/source/j/jsonrpclib/${name}.tar.gz";
+      sha256 = "02vgirw2bcgvpcxhv5hf3yvvb4h5wzd1lpjx8na5psdmaffj6l3z";
+    };
+    propagatedBuildInputs = [ pythonPackages.cjson ];
+    meta = {
+      homepage = https://pypi.python.org/pypi/jsonrpclib;
+      license = stdenv.lib.licenses.asl20;
+    };
+  };
+in
+
+pythonPackages.buildPythonApplication rec {
   name = "electrum-${version}";
-  version = "2.5.4";
+  version = "2.6.1";
 
   src = fetchurl {
     url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
-    sha256 = "18saa2rg07vfp9scp3i8s0wi2pqw9s8l8b44gq43zzl41120zc60";
+    sha256 = "14q6y1hwzki56nfhd3nfbxid07d5fv0pgmklvcf7yxjmpdxrg0iq";
   };
 
   propagatedBuildInputs = with pythonPackages; [
     dns
     ecdsa
+    jsonrpclib
     pbkdf2
     protobuf
     pyasn1
@@ -47,7 +64,7 @@ buildPythonApplication rec {
       of the blockchain.
     '';
     homepage = https://electrum.org;
-    license = licenses.gpl3;
+    license = licenses.mit;
     maintainers = with maintainers; [ ehmry joachifm np ];
   };
 }

From 757a1f7fe9e99078c7e849c83e3f011519c2a49f Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sat, 5 Mar 2016 18:33:53 +0100
Subject: [PATCH 2210/2285] cppcheck: 1.69 -> 1.72

Also add myself to the list of maintainers
---
 .../tools/analysis/cppcheck/default.nix       | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix
index 53397786dc49..5955f34b58e9 100644
--- a/pkgs/development/tools/analysis/cppcheck/default.nix
+++ b/pkgs/development/tools/analysis/cppcheck/default.nix
@@ -1,15 +1,15 @@
 { stdenv, fetchurl, libxslt, docbook_xsl, docbook_xml_dtd_45 }:
 
 let
-  name = "cppcheck";
-  version = "1.69";
+  pname = "cppcheck";
+  version = "1.72";
 in
-stdenv.mkDerivation {
-  name = "${name}-${version}";
+stdenv.mkDerivation rec {
+  name = "${pname}-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2";
-    sha256 = "0bjkqy4c6ph6nzparcnbxrdn52i3hiind4jc99v2kvsq281wimab";
+    url = "mirror://sourceforge/${pname}/${name}.tar.bz2";
+    sha256 = "085lm8v7biixy6rykq836gfy91jcccpz9qpk8i9x339dzy2b2q4l";
   };
 
   buildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ];
@@ -22,15 +22,15 @@ stdenv.mkDerivation {
     cp cppcheck.1 $out/share/man/man1/cppcheck.1
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A static analysis tool for C/C++ code";
     longDescription = ''
       Check C/C++ code for memory leaks, mismatching
       allocation-deallocation, buffer overruns and more.
     '';
     homepage = http://cppcheck.sourceforge.net/;
-    license = stdenv.lib.licenses.gpl3Plus;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    license = licenses.gpl3Plus;
+    platforms = platforms.unix;
+    maintainers = with maintainers; [ simons joachifm ];
   };
 }

From 73878e1c101871cf6dc216e5557dfeccd5344aae Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Sat, 5 Mar 2016 19:41:33 +0100
Subject: [PATCH 2211/2285] keyfuzz: init at 0.2.

---
 lib/maintainers.nix                         |  1 +
 pkgs/tools/inputmethods/keyfuzz/default.nix | 21 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix             |  2 ++
 3 files changed, 24 insertions(+)
 create mode 100644 pkgs/tools/inputmethods/keyfuzz/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 84e95a2409e3..0b5883f291e1 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -215,6 +215,7 @@
   maurer = "Matthew Maurer <matthew.r.maurer+nix@gmail.com>";
   mbakke = "Marius Bakke <ymse@tuta.io>";
   mbe = "Brandon Edens <brandonedens@gmail.com>";
+  mboes = "Mathieu Boespflug <mboes@tweag.net>";
   mcmtroffaes = "Matthias C. M. Troffaes <matthias.troffaes@gmail.com>";
   meditans = "Carlo Nucera <meditans@gmail.com>";
   meisternu = "Matt Miemiec <meister@krutt.org>";
diff --git a/pkgs/tools/inputmethods/keyfuzz/default.nix b/pkgs/tools/inputmethods/keyfuzz/default.nix
new file mode 100644
index 000000000000..f04afd639b7d
--- /dev/null
+++ b/pkgs/tools/inputmethods/keyfuzz/default.nix
@@ -0,0 +1,21 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "keyfuzz-${version}";
+  version = "0.2";
+
+  meta = with stdenv.lib; {
+    description = "Manipulate the scancode/keycode translation tables of keyboard drivers.";
+    homepace    = http://0pointer.de/lennart/projects/keyfuzz/;
+    license     = licenses.gpl2Plus;
+    platforms   = platforms.linux;
+    maintainers = with maintainers; [ mboes ];
+  };
+
+  src = fetchurl {
+    url = "http://0pointer.de/lennart/projects/keyfuzz/keyfuzz-0.2.tar.gz";
+    sha256 = "0xv9ymivp8fnyc5xcyh1vamxnx90bzw66wlld813fvm6q2gsiknk";
+  };
+
+  configureFlags = "--without-initdir --disable-lynx";
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b7b173ca0fcc..6afd46c6907e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2152,6 +2152,8 @@ let
 
   keychain = callPackage ../tools/misc/keychain { };
 
+  keyfuzz = callPackage ../tools/inputmethods/keyfuzz { };
+
   kibana = callPackage ../development/tools/misc/kibana { };
 
   kismet = callPackage ../applications/networking/sniffers/kismet { };

From 75d7692ab3767c43a0fcd8a815ac88bfabf06832 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Wed, 2 Mar 2016 20:56:39 +0000
Subject: [PATCH 2212/2285] gitAndTools.darcsToGit: 0.2git -> 2015-06-04

Fixes error where ruby 2.0+ doesn't have iconv anymore.

    `require': cannot load such file -- iconv (LoadError)
---
 .../git-and-tools/darcs-to-git/default.nix                  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
index 115424ac69c8..1b2ad45b56a9 100644
--- a/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/darcs-to-git/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   name = "darcs-to-git-${version}";
-  version = "0.2git";
+  version = "2015-06-04";
 
   src = fetchgit {
     url = "git://github.com/purcell/darcs-to-git.git";
-    rev = "58a55936899c7e391df5ae1326c307fbd4617a25";
-    sha256 = "366aa691920991e21cfeebd4cbd53a6c42d80e2bc46ff398af482d1d15bac4c3";
+    rev = "e5fee32495908fe0f7d700644c7b37347b7a0a5b";
+    sha256 = "0ycp7pzv9g9pgj25asiby3p3m5vg5czqf4rpy2mavjqhiblxlcv5";
   };
 
   patchPhase = let

From 47c2411d00eccceb16e3a9af5333053ee7837794 Mon Sep 17 00:00:00 2001
From: zimbatm <zimbatm@zimbatm.com>
Date: Fri, 4 Mar 2016 00:42:43 +0000
Subject: [PATCH 2213/2285] rubyripper: fix installation

---
 pkgs/applications/audio/rubyripper/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/audio/rubyripper/default.nix b/pkgs/applications/audio/rubyripper/default.nix
index 36f1fc8312fb..035bb8764829 100644
--- a/pkgs/applications/audio/rubyripper/default.nix
+++ b/pkgs/applications/audio/rubyripper/default.nix
@@ -6,6 +6,9 @@ stdenv.mkDerivation rec {
     url = "https://rubyripper.googlecode.com/files/rubyripper-${version}.tar.bz2";
     sha256 = "1fwyk3y0f45l2vi3a481qd7drsy82ccqdb8g2flakv58m45q0yl1";
   };
+
+  preConfigure = "patchShebangs .";
+
   configureFlags = [ "--enable-cli" ];
   buildInputs = [ ruby cdparanoia makeWrapper ];
   postInstall = ''

From 5b8361c1180b78a448079ee7a8179c5c7d38da3a Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 5 Mar 2016 19:20:57 +0100
Subject: [PATCH 2214/2285] linux_3_10: 3.10.97 -> 3.10.99

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix
index cd7e6f1af74f..d0c09d35cd0b 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.10.97";
+  version = "3.10.99";
   extraMeta.branch = "3.10";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0z66nbnbhmzjjbvrd7sbg4351x92grk8xja58rxxbb28cj3sy9r9";
+    sha256 = "1hq90yn2ry36y317px7f0wy55j70ip3wlxa4qsdl9pzlndadcp24";
   };
 
   kernelPatches = args.kernelPatches;

From 354a1935d312fd8caf0531ee46b86147f1308083 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 5 Mar 2016 19:23:07 +0100
Subject: [PATCH 2215/2285] linux_3_12: 3.12.54 -> 3.12.55

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix
index 636ff9e7d29a..f146e5f2f139 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.12.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.12.54";
+  version = "3.12.55";
   extraMeta.branch = "3.12";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "0a6wv72257nasc1qrw966ajd60z24cjpc83hnbblsjkfl0b3zrrn";
+    sha256 = "0xg52i6zsrkzv0i2kxrsx0179lkp9f2388r06rahx0anf4ars5p2";
   };
 
   kernelPatches = args.kernelPatches;

From af40e356fe41fdcb8463a42c595f1e95cfaa679c Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 5 Mar 2016 19:24:05 +0100
Subject: [PATCH 2216/2285] linux_3_14: 3.14.61 -> 3.14.63

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

diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix
index 80cb4bf89dc9..ae3ba775d41b 100644
--- a/pkgs/os-specific/linux/kernel/linux-3.14.nix
+++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "3.14.61";
+  version = "3.14.63";
   extraMeta.branch = "3.14";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz";
-    sha256 = "06lrz2z3lskajk87kq1qi8q6rbdczhsz6sbp5cba4i0nw7sg1nbg";
+    sha256 = "0q3qcgcaxjc298dgjpfn6g17lvki2p87f0zkaxs0h0g13jhykwbz";
   };
 
   kernelPatches = args.kernelPatches;

From 3b1f2e070b43e31fa0da2f043ad8cd2e4c31ccc7 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 5 Mar 2016 19:24:30 +0100
Subject: [PATCH 2217/2285] linux_4_4: 4.4.3 -> 4.4.4

---
 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 56f660a248a8..6819dfedb137 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.3";
+  version = "4.4.4";
   extraMeta.branch = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
-    sha256 = "1pcichd5hp3hzb3hwh5737jwqmfv4ylhw04sbby3hzmxkfqrqdqb";
+    sha256 = "0b4190mwmxf329n16yl32my7dfi02pi7qf39a8v61sl9b2gxffad";
   };
 
   kernelPatches = args.kernelPatches;

From 54d342add8ab512c5650e1b2da25708622dd327d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 3 Mar 2016 22:38:53 +0100
Subject: [PATCH 2218/2285] nvidia_x11_legacy340: update 340.76 -> 340.94

Fixes #13658.
---
 .../linux/nvidia-x11/legacy340.nix            | 13 ++++-----
 .../nvidia-x11/nvidia-340.76-kernel-4.0.patch | 28 -------------------
 2 files changed, 6 insertions(+), 35 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch

diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix
index bb974410e371..fa9d6442e424 100644
--- a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix
@@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null;
 
 let
 
-  versionNumber = "340.76";
+  versionNumber = "340.96";
   /* This branch is needed for G8x, G9x, and GT2xx GPUs, and motherboard chipsets based on them.
     Ongoing support for new Linux kernels and X servers, as well as fixes for critical bugs,
     will be included in 340.* legacy releases through the end of 2019.
@@ -25,18 +25,16 @@ stdenv.mkDerivation {
 
   builder = ./builder-legacy340.sh;
 
-  patches = [ ./nvidia-340.76-kernel-4.0.patch ];
-
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
-        url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
-        sha256 = "1l1nn340hc8iwlzb16gcm2xvnvkw7rf84ll89bcax70094xxjacv";
+        url = "http://download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run";
+        sha256 = "13j739gg1igll88xpfsx46m7pan4fwpzx5hqdskkdc0srmw2f3n4";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
-        sha256 = "016hnsgrcm4ly0mnkcd6c1qkciy3qmbwdwy4rlwq3m6dh4ixw7jc";
+        url = "http://download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run";
+        sha256 = "1i0lri76ghhr4c6fdlv5gwzd99n70hv3kw21w51anb55msr9s3r8";
       }
     else throw "nvidia-x11 does not support platform ${stdenv.system}";
 
@@ -62,5 +60,6 @@ stdenv.mkDerivation {
     license = licenses.unfreeRedistributable;
     platforms = platforms.linux;
     maintainers = [ maintainers.vcunat ];
+    priority = 4; # resolves collision with xorg-server's "lib/xorg/modules/extensions/libglx.so"
   };
 }
diff --git a/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch b/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch
deleted file mode 100644
index 5fdc1fed7272..000000000000
--- a/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- a/kernel/nv-pat.c	2015-07-03 08:39:35.417031728 +0200
-+++ b/kernel/nv-pat.c	2015-07-03 08:42:15.631838988 +0200
-@@ -35,8 +35,13 @@
-     unsigned long cr0 = read_cr0();
-     write_cr0(((cr0 & (0xdfffffff)) | 0x40000000));
-     wbinvd();
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
-     *cr4 = read_cr4();
-     if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80);
-+#else
-+    *cr4 = __read_cr4();
-+    if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80);
-+#endif
-     __flush_tlb();
- }
-
-@@ -46,7 +51,11 @@
-     wbinvd();
-     __flush_tlb();
-     write_cr0((cr0 & 0x9fffffff));
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
-     if (cr4 & 0x80) write_cr4(cr4);
-+#else
-+    if (cr4 & 0x80) __write_cr4(cr4);
-+#endif
- }
-
- static int nv_determine_pat_mode(void)

From 8b97ca270e84c38bb0fb1da829da318ed7dbda8a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 5 Mar 2016 03:04:30 +0100
Subject: [PATCH 2219/2285] chromium: Update all channels to latest versions

Overview of the updated versions:

stable: 48.0.2564.116 -> 49.0.2623.75
beta:   49.0.2623.63  -> 49.0.2623.75
dev:    50.0.2657.0   -> 50.0.2661.11

Stable and beta are now in par because of the release of a major stable
update.

The release addresses 26 security vulnerabilities, the following with an
assigned CVE:

 * CVE-2016-1630: Same-origin bypass in Blink. Credit to Mariusz
                  Mlynski.
 * CVE-2016-1631: Same-origin bypass in Pepper Plugin. Credit to Mariusz
                  Mlynski.
 * CVE-2016-1632: Bad cast in Extensions. Credit to anonymous.
 * CVE-2016-1633: Use-after-free in Blink. Credit to cloudfuzzer.
 * CVE-2016-1634: Use-after-free in Blink. Credit to cloudfuzzer.
 * CVE-2016-1635: Use-after-free in Blink. Credit to Rob Wu.
 * CVE-2016-1636: SRI Validation Bypass. Credit to Ryan Lester and
                  Bryant Zadegan.
 * CVE-2015-8126: Out-of-bounds access in libpng. Credit to
                  joerg.bornemann.
 * CVE-2016-1637: Information Leak in Skia. Credit to Keve Nagy.
 * CVE-2016-1638: WebAPI Bypass. Credit to Rob Wu.
 * CVE-2016-1639: Use-after-free in WebRTC. Credit to Khalil Zhani.
 * CVE-2016-1640: Origin confusion in Extensions UI. Credit to Luan
                  Herrera.
 * CVE-2016-1641: Use-after-free in Favicon. Credit to Atte Kettunen of
                  OUSPG.

The full announcement which also includes the link to the bug tracker
can be found here:

http://googlechromereleases.blogspot.de/2016/03/stable-channel-update.html

Also, the 32bit Chrome package needed for the Flash and Widevine plugins
doesn't exist anymore, because Google has dropped support for 32bit
distros, see here for the announcement:

https://groups.google.com/a/chromium.org/forum/#!topic/chromium-dev/FoE6sL-p6oU

On our end, we need to fix the patch for the plugin paths to work for
the latest dev channel. The change is very minor, because the
nix_plugin_paths_46.patch only doesn't apply because of an iOS-related
ifdef.

Built and tested on my Hydra at:

https://headcounter.org/hydra/eval/311511

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Fixes: #13665
---
 .../browsers/chromium/source/default.nix      | 11 ++-
 .../chromium/source/nix_plugin_paths_50.patch | 75 +++++++++++++++++++
 .../browsers/chromium/source/sources.nix      | 19 +++--
 3 files changed, 91 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_50.patch

diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix
index 4e568aed5949..a566c4bb1c87 100644
--- a/pkgs/applications/networking/browsers/chromium/source/default.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/default.nix
@@ -41,10 +41,13 @@ in stdenv.mkDerivation {
     done
   '';
 
-  patches =
-    singleton ./nix_plugin_paths_46.patch ++
-    singleton ./build_fixes_46.patch ++
-    singleton ./widevine.patch;
+  patches = [
+    ./build_fixes_46.patch
+    ./widevine.patch
+    (if versionOlder version "50.0.0.0"
+     then ./nix_plugin_paths_46.patch
+     else ./nix_plugin_paths_50.patch)
+  ];
 
   patchPhase = let
     diffmod = sym: "/^${sym} /{s/^${sym} //;${transform ""};s/^/${sym} /}";
diff --git a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_50.patch b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_50.patch
new file mode 100644
index 000000000000..062098a85225
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths_50.patch
@@ -0,0 +1,75 @@
+diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc
+index 74bf041..5f34198 100644
+--- a/chrome/common/chrome_paths.cc
++++ b/chrome/common/chrome_paths.cc
+@@ -66,21 +66,14 @@ static base::LazyInstance<base::FilePath>
+     g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER;
+ 
+ // Gets the path for internal plugins.
+-bool GetInternalPluginsDirectory(base::FilePath* result) {
+-#if defined(OS_MACOSX)
+-  // If called from Chrome, get internal plugins from a subdirectory of the
+-  // framework.
+-  if (base::mac::AmIBundled()) {
+-    *result = chrome::GetFrameworkBundlePath();
+-    DCHECK(!result->empty());
+-    *result = result->Append("Internet Plug-Ins");
+-    return true;
+-  }
+-  // In tests, just look in the module directory (below).
+-#endif
+-
+-  // The rest of the world expects plugins in the module directory.
+-  return PathService::Get(base::DIR_MODULE, result);
++bool GetInternalPluginsDirectory(base::FilePath* result,
++                                 const std::string& ident) {
++  std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident;
++  const char* value = getenv(full_env.c_str());
++  if (value == NULL)
++      return PathService::Get(base::DIR_MODULE, result);
++  else
++      *result = base::FilePath(value);
+ }
+ 
+ #if defined(OS_WIN)
+@@ -253,11 +246,11 @@ bool PathProvider(int key, base::FilePath* result) {
+       create_dir = true;
+       break;
+     case chrome::DIR_INTERNAL_PLUGINS:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "ALL"))
+         return false;
+       break;
+     case chrome::DIR_PEPPER_FLASH_PLUGIN:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH"))
+         return false;
+       cur = cur.Append(kPepperFlashBaseDirectory);
+       break;
+@@ -314,7 +307,7 @@ bool PathProvider(int key, base::FilePath* result) {
+     // We currently need a path here to look up whether the plugin is disabled
+     // and what its permissions are.
+     case chrome::FILE_NACL_PLUGIN:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "NACL"))
+         return false;
+       cur = cur.Append(kInternalNaClPluginFileName);
+       break;
+@@ -349,7 +342,7 @@ bool PathProvider(int key, base::FilePath* result) {
+         cur = cur.DirName();
+       }
+ #else
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "PNACL"))
+         return false;
+ #endif
+       cur = cur.Append(FILE_PATH_LITERAL("pnacl"));
+@@ -366,7 +359,7 @@ bool PathProvider(int key, base::FilePath* result) {
+     // In the component case, this is the source adapter. Otherwise, it is the
+     // actual Pepper module that gets loaded.
+     case chrome::FILE_WIDEVINE_CDM_ADAPTER:
+-      if (!GetInternalPluginsDirectory(&cur))
++      if (!GetInternalPluginsDirectory(&cur, "WIDEVINE"))
+         return false;
+       cur = cur.AppendASCII(kWidevineCdmAdapterFileName);
+       break;
diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix
index ffb9ff110686..ffec5c8b8073 100644
--- a/pkgs/applications/networking/browsers/chromium/source/sources.nix
+++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix
@@ -1,19 +1,18 @@
 # This file is autogenerated from update.sh in the parent directory.
 {
   beta = {
-    sha256 = "07i4vqswkijnl7wi6r1a0n1jq54ackm01yf8h3hwcik8q10i1aq5";
-    sha256bin64 = "16pwimg672qaqb89zdvsr8dr7bz50mz7zf6cl0cf45kz7sn8wwlh";
-    version = "49.0.2623.63";
+    sha256 = "1xc2npbc829nxria1j37kxyy95jkalkkphxgv24if0ibn62lrzd4";
+    sha256bin64 = "1arm15g3vmm3zlvcql3qylw1fhrn5ddzl2v8mkpb3a251m425dsi";
+    version = "49.0.2623.75";
   };
   dev = {
-    sha256 = "1xc66zsjd5snydf60di2k2vzwwcqs1p16yn4jbpj2khm9cmxmkmf";
-    sha256bin64 = "06v7r76pbc979f7ahmln0hmxzd8ipirh4128i0ygidj71xmg51mm";
-    version = "50.0.2657.0";
+    sha256 = "04j0nyz20gi7vf1javbw06wrqpkfw6vg024i3wkgx42hzd6hjgw4";
+    sha256bin64 = "12ff4q615rwakgpr9v84p55maasqb4vg61s89vgxrlsgqrmkahg4";
+    version = "50.0.2661.11";
   };
   stable = {
-    sha256 = "03sdm09cnwq8a056rfljql7mz0s17fngfnm5q3p5xwakr2sbj7ka";
-    sha256bin32 = "157m88nafb8svpkv11rzpcfvak6486wx43rmbssg52x2k0vas0bl";
-    sha256bin64 = "036pcma8qczja803h9r1nlm0ypm4zblmy6q7pkwlgmn3r4r3n7i0";
-    version = "48.0.2564.116";
+    sha256 = "1xc2npbc829nxria1j37kxyy95jkalkkphxgv24if0ibn62lrzd4";
+    sha256bin64 = "01qi5jmlmdpy6icc4y51bn5a063mxrnkncg3pbmbl4r02vqca5jh";
+    version = "49.0.2623.75";
   };
 }

From f3d6e9ec71e9cefda85407a85829fb0b85cd41c0 Mon Sep 17 00:00:00 2001
From: Brian McKenna <brian@brianmckenna.org>
Date: Sun, 6 Mar 2016 00:13:40 +1100
Subject: [PATCH 2220/2285] exwm service: init

---
 .../services/x11/window-managers/default.nix  |  1 +
 .../services/x11/window-managers/exwm.nix     | 55 +++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 nixos/modules/services/x11/window-managers/exwm.nix

diff --git a/nixos/modules/services/x11/window-managers/default.nix b/nixos/modules/services/x11/window-managers/default.nix
index 37d3348b8a32..26dfbb1f4e18 100644
--- a/nixos/modules/services/x11/window-managers/default.nix
+++ b/nixos/modules/services/x11/window-managers/default.nix
@@ -13,6 +13,7 @@ in
     ./clfswm.nix
     ./compiz.nix
     ./dwm.nix
+    ./exwm.nix
     ./fluxbox.nix
     ./herbstluftwm.nix
     ./i3.nix
diff --git a/nixos/modules/services/x11/window-managers/exwm.nix b/nixos/modules/services/x11/window-managers/exwm.nix
new file mode 100644
index 000000000000..dbbd8a125d66
--- /dev/null
+++ b/nixos/modules/services/x11/window-managers/exwm.nix
@@ -0,0 +1,55 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.xserver.windowManager.exwm;
+  loadScript = pkgs.writeText "emacs-exwm-load" ''
+    (require 'exwm)
+    ${optionalString cfg.enableDefaultConfig ''
+      (require 'exwm-config)
+      (exwm-config-default)
+    ''}
+  '';
+  packages = epkgs: cfg.extraPackages epkgs ++ [ epkgs.exwm ];
+  exwm-emacs = pkgs.emacsWithPackages packages;
+in
+
+{
+  options = {
+    services.xserver.windowManager.exwm = {
+      enable = mkEnableOption "exwm";
+      enableDefaultConfig = mkOption {
+        default = true;
+        example = false;
+        type = lib.types.bool;
+        description = "Enable an uncustomised exwm configuration.";
+      };
+      extraPackages = mkOption {
+        default = self: [];
+        example = literalExample ''
+          epkgs: [
+            epkgs.emms
+            epkgs.magit
+            epkgs.proofgeneral
+          ]
+        '';
+        description = ''
+          Extra packages available to Emacs. The value must be a
+          function which receives the attrset defined in
+          <varname>emacsPackages</varname> as the sole argument.
+        '';
+      };
+    };
+  };
+
+  config = mkIf cfg.enable {
+    services.xserver.windowManager.session = singleton {
+      name = "exwm";
+      start = ''
+        ${exwm-emacs}/bin/emacs -l ${loadScript}
+      '';
+    };
+    environment.systemPackages = [ exwm-emacs ];
+  };
+}

From d3deb49b543770c37ff101f1121c66c7a3ab456f Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Sat, 5 Mar 2016 22:11:27 +0000
Subject: [PATCH 2221/2285] atom: 1.5.3 -> 1.5.4

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

diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix
index d7b91de80d80..8dc1e2d0c013 100644
--- a/pkgs/applications/editors/atom/default.nix
+++ b/pkgs/applications/editors/atom/default.nix
@@ -16,11 +16,11 @@ let
   };
 in stdenv.mkDerivation rec {
   name = "atom-${version}";
-  version = "1.5.3";
+  version = "1.5.4";
 
   src = fetchurl {
     url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb";
-    sha256 = "101fz4c5pj7yp7fg7kg7vcpqjzpwfrbxdyb6va5liip1llg1i2z3";
+    sha256 = "0jnszf1v7xqhm2sy5wzm3f8aw7j1dnapnbw4d46bvshv9hbbzrn8";
     name = "${name}.deb";
   };
 

From 872f5d049cebee0f4536ca18d90b77fd8e233fbf Mon Sep 17 00:00:00 2001
From: Jan Niklas Hasse <jhasse@bixense.com>
Date: Sat, 5 Mar 2016 23:23:19 +0100
Subject: [PATCH 2222/2285] Blacklist jhasse

---
 .mention-bot | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mention-bot b/.mention-bot
index 4c200e30279a..40e57f996606 100644
--- a/.mention-bot
+++ b/.mention-bot
@@ -1,5 +1,6 @@
 {
   "userBlacklist": [
-    "civodul"
+    "civodul",
+    "jhasse"
   ]
 }

From 6af076730e54c86879bd099de16c194bdbae2b22 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Sun, 21 Feb 2016 20:13:44 +0100
Subject: [PATCH 2223/2285] Documentation: rewrite Python

- Rewrite current documentation
- Add introduction/tutorial
- Convert to markdown
---
 doc/default.nix                     |   6 +
 doc/languages-frameworks/python.md  | 668 ++++++++++++++++++++++++++++
 doc/languages-frameworks/python.xml | 447 -------------------
 3 files changed, 674 insertions(+), 447 deletions(-)
 create mode 100644 doc/languages-frameworks/python.md
 delete mode 100644 doc/languages-frameworks/python.xml

diff --git a/doc/default.nix b/doc/default.nix
index 196b9e445390..203555de131e 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -45,6 +45,10 @@ stdenv.mkDerivation {
   + toDocbook {
       inputFile = ./introduction.md;
       outputFile = "introduction.xml";
+    }
+  + toDocbook {
+      inputFile = ./languages-frameworks/python.md;
+      outputFile = "./languages-frameworks/python.xml";
       useChapters = true;
     }
   + toDocbook {
@@ -61,6 +65,8 @@ stdenv.mkDerivation {
       outputFile = "languages-frameworks/r.xml";
     }
   + ''
+    cat -n languages-frameworks/python.xml
+
     echo ${nixpkgsVersion} > .version
 
     xmllint --noout --nonet --xinclude --noxincludenode \
diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
new file mode 100644
index 000000000000..d05cabac3ff6
--- /dev/null
+++ b/doc/languages-frameworks/python.md
@@ -0,0 +1,668 @@
+# Python
+
+## User Guide
+
+Several versions of Python are available on Nix as well as a high amount of
+packages. The default interpreter is CPython 2.7.
+
+### Using Python
+
+#### Installing Python and packages
+
+It is important to make a distinction between Python packages that are
+used as libraries, and applications that are written in Python.
+
+Applications on Nix are installed typically into your user
+profile imperatively using `nix-env -i`, and on NixOS declaratively by adding the
+package name to `environment.systemPackages` in `/etc/nixos/configuration.nix`.
+Dependencies such as libraries are automatically installed and should not be
+installed explicitly.
+
+The same goes for Python applications and libraries. Python applications can be
+installed in your profile, but Python libraries you would like to use to develop
+cannot. If you do install libraries in your profile, then you will end up with
+import errors.
+
+#### Python environments using `nix-shell`
+
+The recommended method for creating Python environments for development is with
+`nix-shell`. Executing
+
+```sh
+$ nix-shell -p python35Packages.numpy python35Packages.toolz
+```
+
+opens a Nix shell which has available the requested packages and dependencies.
+Now you can launch the Python interpreter (which is itself a dependency)
+
+```sh
+[nix-shell:~] python3
+```
+
+If the packages were not available yet in the Nix store, Nix would download or
+build them automatically. A convenient option with `nix-shell` is the `--run`
+option, with which you can execute a command in the `nix-shell`. Let's say we
+want the above environment and directly run the Python interpreter
+
+```sh
+$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3"
+```
+
+This way you can use the `--run` option also to directly run a script
+
+```sh
+$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3 myscript.py"
+```
+
+In fact, for this specific use case there is a more convenient method. You can
+add a [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) to your script
+specifying which dependencies Nix shell needs. With the following shebang, you
+can use `nix-shell myscript.py` and it will make available all dependencies and
+run the script in the `python3` shell.
+
+```py
+#! /usr/bin/env nix-shell
+#! nix-shell -i python3 -p python3Packages.numpy
+
+import numpy
+
+print(numpy.__version__)
+```
+
+Likely you do not want to type your dependencies each and every time. What you
+can do is write a simple Nix expression which sets up an environment for you,
+requiring you only to type `nix-shell`. Say we want to have Python 3.5, `numpy`
+and `toolz`, like before, in an environment. With a `shell.nix` file
+containing
+
+```nix
+with import <nixpkgs> {};
+
+(pkgs.python35.buildEnv.override  {
+  extraLibs = with pkgs.python35Packages; [ numpy toolz ];
+}).env
+```
+executing `nix-shell` gives you again a Nix shell from which you can run Python.
+
+What's happening here?
+
+1. We begin with importing the Nix Packages collections. `import <nixpkgs>` import the `<nixpkgs>` function, `{}` calls it and the `with` statement brings all attributes of `nixpkgs` in the local scope. Therefore we can now use `pkgs`.
+2. Then we create a Python 3.5 environment with `pkgs.buildEnv`. Because we want to use it with a custom set of Python packages, we override it.
+3. The `extraLibs` argument of the original `buildEnv` function can be used to specify which packages should be included. We want `numpy` and `toolz`. Again, we use the `with` statement to bring a set of attributes into the local scope.
+4. And finally, for in interactive use we return the environment.
+
+### Developing with Python
+
+
+Now that you know how to get a working Python environment on Nix, it is time to go forward and start actually developing with Python.
+We will first have a look at how Python packages are packaged on Nix. Then, we will look how you can use development mode with your code.
+
+#### Python packaging on Nix
+
+On Nix all packages are built by functions. The main function in Nix for building Python packages is [`buildPythonPackage`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/generic/default.nix).
+Let's see how we would build the `toolz` package. According to [`python-packages.nix`](https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/top-level/python-packages.nix) `toolz` is build using
+
+```nix
+toolz = buildPythonPackage rec{
+  name = "toolz-${version}";
+  version = "0.7.4";
+
+  src = pkgs.fetchurl{
+    url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz";
+    sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
+  };
+
+  meta = {
+    homepage = "http://github.com/pytoolz/toolz/";
+    description = "List processing tools and functional utilities";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ fridh ];
+  };
+};
+```
+
+What happens here? The function `buildPythonPackage` is called and as argument
+it accepts a set. In this case the set is a recursive set ([`rec`](http://nixos.org/nix/manual/#sec-constructs)).
+One of the arguments is the name of the package, which consists of a basename
+(generally following the name on PyPi) and a version. Another argument, `src`
+specifies the source, which in this case is fetched from an url. `fetchurl` not
+only downloads the target file, but also validates its hash. Furthermore, we
+specify some (optional) [meta information](http://nixos.org/nixpkgs/manual/#chap-meta).
+
+The output of the function is a derivation, which is an attribute with the name
+`toolz` of the set `pythonPackages`. Actually, sets are created for all interpreter versions,
+so `python27Packages`, `python34Packages`, `python35Packages` and `pypyPackages`.
+
+The above example works when you're directly working on
+`pkgs/top-level/python-packages.nix` in the Nixpkgs repository. Often though,
+you will want to test a Nix expression outside of the Nixpkgs tree. If you
+create a `shell.nix` file with the following contents
+
+```nix
+with import <nixpkgs> {};
+
+pkgs.python35Packages.buildPythonPackage rec {
+  name = "toolz-${version}";
+  version = "0.7.4";
+
+  src = pkgs.fetchurl{
+    url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz";
+    sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
+  };
+
+  meta = {
+    homepage = "http://github.com/pytoolz/toolz/";
+    description = "List processing tools and functional utilities";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ fridh ];
+  };
+}
+```
+
+and then execute `nix-shell` will result in an environment in which you can use
+Python 3.5 and the `toolz` package. As you can see we had to explicitly mention
+for which Python version we want to build a package.
+
+The above example considered only a single package. Generally you will want to use multiple packages.
+If we create a `shell.nix` file with the following contents
+
+```nix
+with import <nixpkgs> {};
+
+( let
+    toolz = pkgs.python35Packages.buildPythonPackage rec {
+      name = "toolz-${version}";
+      version = "0.7.4";
+
+      src = pkgs.fetchurl{
+        url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz";
+        sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
+      };
+
+      meta = {
+        homepage = "http://github.com/pytoolz/toolz/";
+        description = "List processing tools and functional utilities";
+        license = licenses.bsd3;
+        maintainers = with maintainers; [ fridh ];
+      };
+    };
+
+  in pkgs.python35.buildEnv.override rec {
+
+    extraLibs = [ pkgs.python35Packages.numpy toolz ];
+}
+).env
+```
+
+and again execute `nix-shell`, then we get a Python 3.5 environment with our
+locally defined package as well as `numpy` which is build according to the
+definition in Nixpkgs. What did we do here? Well, we took the Nix expression
+that we used earlier to build a Python environment, and said that we wanted to
+include our own version of `toolz`. To introduce our own package in the scope of
+`buildEnv.override` we used a
+[`let`](http://nixos.org/nix/manual/#sec-constructs) expression.
+
+### Handling dependencies
+
+Our example, `toolz`, doesn't have any dependencies on other Python
+packages or system libraries. According to the manual,  `buildPythonPackage`
+uses the arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If something is
+exclusively a build-time dependency, then the dependency should be included as a
+`buildInput`, but if it is (also) a runtime dependency, then it should be added
+to `propagatedBuildInputs`. Test dependencies are considered build-time dependencies.
+
+The following example shows which arguments are given to `buildPythonPackage` in
+order to build [`datashape`](https://github.com/blaze/datashape).
+
+```nix
+datashape = buildPythonPackage rec {
+  name = "datashape-${version}";
+  version = "0.4.7";
+
+  src = pkgs.fetchurl {
+    url = "https://pypi.python.org/packages/source/D/DataShape/${name}.tar.gz";
+    sha256 = "14b2ef766d4c9652ab813182e866f493475e65e558bed0822e38bf07bba1a278";
+  };
+
+  buildInputs = with self; [ pytest ];
+  propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ];
+
+  meta = {
+    homepage = https://github.com/ContinuumIO/datashape;
+    description = "A data description language";
+    license = licenses.bsd2;
+    maintainers = with maintainers; [ fridh ];
+  };
+};
+```
+
+We can see several runtime dependencies, `numpy`, `multipledispatch`, and
+`dateutil`. Furthermore, we have one `buildInput`, i.e. `pytest`. `pytest` is a
+test runner and is only used during the `checkPhase` and is therefore not added
+to `propagatedBuildInputs`.
+
+In the previous case we had only dependencies on other Python packages to consider.
+Occasionally you have also system libraries to consider. E.g., `lxml` provides
+Python bindings to `libxml2` and `libxslt`. These libraries are only required
+when building the bindings and are therefore added as `buildInputs`.
+
+```nix
+lxml = buildPythonPackage rec {
+  name = "lxml-3.4.4";
+
+  src = pkgs.fetchurl {
+    url = "http://pypi.python.org/packages/source/l/lxml/${name}.tar.gz";
+    sha256 = "16a0fa97hym9ysdk3rmqz32xdjqmy4w34ld3rm3jf5viqjx65lxk";
+  };
+
+  buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ];
+
+  meta = {
+    description = "Pythonic binding for the libxml2 and libxslt libraries";
+    homepage = http://lxml.de;
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ sjourdois ];
+  };
+};
+```
+
+In this example `lxml` and Nix are able to work out exactly where the relevant
+files of the dependencies are. This is not always the case.
+
+The example below shows bindings to The Fastest Fourier Transform in the West, commonly known as
+FFTW. On Nix we have separate packages of FFTW for the different types of floats
+(`"single"`, `"double"`, `"long-double"`). The bindings need all three types,
+and therefore we add all three as `buildInputs`. The bindings don't expect to
+find each of them in a different folder, and therefore we have to set `LDFLAGS`
+and `CFLAGS`.
+
+```nix
+pyfftw = buildPythonPackage rec {
+  name = "pyfftw-${version}";
+  version = "0.9.2";
+
+  src = pkgs.fetchurl {
+    url = "https://pypi.python.org/packages/source/p/pyFFTW/pyFFTW-${version}.tar.gz";
+    sha256 = "f6bbb6afa93085409ab24885a1a3cdb8909f095a142f4d49e346f2bd1b789074";
+  };
+
+  buildInputs = [ pkgs.fftw pkgs.fftwFloat pkgs.fftwLongDouble];
+
+  propagatedBuildInputs = with self; [ numpy scipy ];
+
+  # Tests cannot import pyfftw. pyfftw works fine though.
+  doCheck = false;
+
+  LDFLAGS="-L${pkgs.fftw}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble}/lib"
+  CFLAGS="-I${pkgs.fftw}/include -I${pkgs.fftwFloat}/include -I${pkgs.fftwLongDouble}/include"
+  '';
+
+  meta = {
+    description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
+    homepage = http://hgomersall.github.com/pyFFTW/;
+    license = with licenses; [ bsd2 bsd3 ];
+    maintainer = with maintainers; [ fridh ];
+  };
+};
+```
+Note also the line `doCheck = false;`, we explicitly disabled running the test-suite.
+
+
+#### Develop local package
+
+As a Python developer you're likely aware of [development mode](http://pythonhosted.org/setuptools/setuptools.html#development-mode) (`python setup.py develop`);
+instead of installing the package this command creates a special link to the project code.
+That way, you can run updated code without having to reinstall after each and every change you make.
+Development mode is also available on Nix as [explained](http://nixos.org/nixpkgs/manual/#ssec-python-development) in the Nixpkgs manual.
+Let's see how you can use it.
+
+In the previous Nix expression the source was fetched from an url. We can also refer to a local source instead using
+
+```nix
+src = ./path/to/source/tree;
+```
+
+If we create a `shell.nix` file which calls `buildPythonPackage`, and if `src`
+is a local source, and if the local source has a `setup.py`, then development
+mode is activated.
+
+In the following example we create a simple environment that
+has a Python 3.5 version of our package in it, as well as its dependencies and
+other packages we like to have in the environment, all specified with `propagatedBuildInputs`.
+Indeed, we can just add any package we like to have in our environment to `propagatedBuildInputs`.
+
+```nix
+with import <nixpkgs>;
+with pkgs.python35Packages;
+
+buildPythonPackage rec {
+  name = "mypackage";
+  src = ./path/to/package/source;
+  propagatedBuildInputs = [ pytest numpy pkgs.libsndfile ];
+};
+```
+
+It is important to note that due to how development mode is implemented on Nix it is not possible to have multiple packages simultaneously in development mode.
+
+
+### Organising your packages
+
+So far we discussed how you can use Python on Nix, and how you can develop with
+it. We've looked at how you write expressions to package Python packages, and we
+looked at how you can create environments in which specified packages are
+available.
+
+At some point you'll likely have multiple packages which you would
+like to be able to use in different projects. In order to minimise unnecessary
+duplication we now look at how you can maintain yourself a repository with your
+own packages. The important functions here are `import` and `callPackage`.
+
+### Including a derivation using `callPackage`
+
+Earlier we created a Python environment using `buildEnv`, and included the
+`toolz` package via a `let` expression.
+Let's split the package definition from the environment definition.
+
+We first create a function that builds `toolz` in `~/path/to/toolz/release.nix`
+
+```nix
+{ pkgs, buildPythonPackage }:
+
+buildPythonPackage rec {
+  name = "toolz-${version}";
+  version = "0.7.4";
+
+  src = pkgs.fetchurl{
+    url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz";
+    sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
+  };
+
+  meta = {
+    homepage = "http://github.com/pytoolz/toolz/";
+    description = "List processing tools and functional utilities";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ fridh ];
+  };
+};
+```
+
+It takes two arguments, `pkgs` and `buildPythonPackage`.
+We now call this function using `callPackage` in the definition of our environment
+
+```nix
+with import <nixpkgs> {};
+
+( let
+    toolz = pkgs.callPackage ~/path/to/toolz/release.nix { pkgs=pkgs; buildPythonPackage=pkgs.python35Packages.buildPythonPackage; };
+  in pkgs.python35.buildEnv.override rec {
+    extraLibs = [ pkgs.python35Packages.numpy  toolz ];
+}
+).env
+```
+
+Important to remember is that the Python version for which the package is made
+depends on the `python` derivation that is passed to `buildPythonPackage`. Nix
+tries to automatically pass arguments when possible, which is why generally you
+don't explicitly define which `python` derivation should be used. In the above
+example we use `buildPythonPackage` that is part of the set `python35Packages`,
+and in this case the `python35` interpreter is automatically used.
+
+
+
+## Reference
+
+### Interpreters
+
+Versions 2.6, 2.7, 3.3, 3.4 and 3.5 of the CPython interpreter are available on
+Nix and are available as `python26`, `python27`, `python33`, `python34` and
+`python35`. The PyPy interpreter is also available as `pypy`. Currently, the
+aliases `python` and `python3` correspond to respectively `python27` and
+`python35`. The Nix expressions for the interpreters can be found in
+`pkgs/development/interpreters/python`.
+
+
+#### Missing modules standard library
+
+The interpreters `python26` and `python27` do not include modules that
+require external dependencies. This is done in order to reduce the closure size.
+The following modules need to be added as `buildInput` explicitly:
+
+* `python.modules.bsddb`
+* `python.modules.curses`
+* `python.modules.curses_panel`
+* `python.modules.crypt`
+* `python.modules.gdbm`
+* `python.modules.sqlite3`
+* `python.modules.tkinter`
+* `python.modules.readline`
+
+For convenience `python27Full` and `python26Full` are provided with all
+modules included.
+
+All packages depending on any Python interpreter get appended
+`out/{python.sitePackages}` to `$PYTHONPATH` if such directory
+exists.
+
+#### Attributes on interpreters packages
+
+Each interpreter has the following attributes:
+
+- `libPrefix`. Name of the folder in `${python}/lib/` for corresponding interpreter.
+- `interpreter`. Alias for `${python}/bin/${executable}`.
+- `buildEnv`. Function to build python interpreter environments with extra packages bundled together. See section *python.buildEnv function* for usage and documentation.
+- `sitePackages`. Alias for `lib/${libPrefix}/site-packages`.
+- `executable`. Name of the interpreter executable, ie `python3.4`.
+
+### Building packages and applications
+
+Python packages (libraries) and applications that use `setuptools` or
+`distutils` are typically built with respectively the `buildPythonPackage` and
+`buildPythonApplication` functions.
+
+All Python packages reside in `pkgs/top-level/python-packages.nix` and all
+applications elsewhere. Some packages are also defined in
+`pkgs/development/python-modules`. It is important that these packages are
+called in `pkgs/top-level/python-packages.nix` and not elsewhere, to guarantee
+the right version of the package is built.
+
+Based on the packages defined in `pkgs/top-level/python-packages.nix` an
+attribute set is created for each available Python interpreter. The available
+sets are
+
+* `pkgs.python26Packages`
+* `pkgs.python27Packages`
+* `pkgs.python33Packages`
+* `pkgs.python34Packages`
+* `pkgs.python35Packages`
+* `pkgs.pypyPackages`
+
+and the aliases
+
+* `pkgs.pythonPackages` pointing to `pkgs.python27Packages`
+* `pkgs.python3Packages` pointing to `pkgs.python35Packages`
+
+#### `buildPythonPackage` function
+
+The `buildPythonPackage` function is implemented in
+`pkgs/development/python-modules/generic/default.nix`
+
+and can be used as:
+
+    twisted = buildPythonPackage {
+      name = "twisted-8.1.0";
+
+      src = pkgs.fetchurl {
+        url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2;
+        sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl";
+      };
+
+      propagatedBuildInputs = [ self.ZopeInterface ];
+
+      meta = {
+        homepage = http://twistedmatrix.com/;
+        description = "Twisted, an event-driven networking engine written in Python";
+        license = stdenv.lib.licenses.mit; };
+      };
+
+The `buildPythonPackage` mainly does four things:
+
+* In the `buildPhase`, it calls `${python.interpreter} setup.py bdist_wheel` to build a wheel binary zipfile.
+* In the `installPhase`, it installs the wheel file using `pip install *.whl`.
+* In the `postFixup` phase, the `wrapPythonPrograms` bash function is called to wrap all programs in the `$out/bin/*` directory to include `$PYTHONPATH` and `$PATH` environment variables.
+* In the `installCheck` phase, `${python.interpreter} setup.py test` is ran.
+
+As in Perl, dependencies on other Python packages can be specified in the
+`buildInputs` and `propagatedBuildInputs` attributes.  If something is
+exclusively a build-time dependency, use `buildInputs`; if it’s (also) a runtime
+dependency, use `propagatedBuildInputs`.
+
+By default tests are run because `doCheck = true`. Test dependencies, like
+e.g. the test runner, should be added to `buildInputs`.
+
+By default `meta.platforms` is set to the same value
+as the interpreter unless overriden otherwise.
+
+##### `buildPythonPackage` parameters
+
+All parameters from `mkDerivation` function are still supported.
+
+* `namePrefix`: Prepended text to `${name}` parameter. Defaults to `"python3.3-"` for Python 3.3, etc. Set it to `""` if you're packaging an application or a command line tool.
+* `disabled`: If `true`, package is not build for particular python interpreter version. Grep around `pkgs/top-level/python-packages.nix` for examples.
+* `setupPyBuildFlags`: List of flags passed to `setup.py build_ext` command.
+* `pythonPath`: List of packages to be added into `$PYTHONPATH`. Packages in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`).
+* `preShellHook`: Hook to execute commands before `shellHook`.
+* `postShellHook`: Hook to execute commands after `shellHook`.
+* `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'"].
+
+#### `buildPythonApplication` function
+
+The `buildPythonApplication` function is practically the same as `buildPythonPackage`.
+The difference is that `buildPythonPackage` by default prefixes the names of the packages with the version of the interpreter.
+Because with an application we're not interested in multiple version the prefix is dropped.
+
+#### python.buildEnv function
+
+Python environments can be created using the low-level `pkgs.buildEnv` function.
+This example shows how to create an environment that has the Pyramid Web Framework.
+Saving the following as `default.nix`
+
+    with import {};
+
+    python.buildEnv.override {
+      extraLibs = [ pkgs.pythonPackages.pyramid ];
+      ignoreCollisions = true;
+    }
+
+and running `nix-build` will create
+
+    /nix/store/cf1xhjwzmdki7fasgr4kz6di72ykicl5-python-2.7.8-env
+
+with wrapped binaries in `bin/`.
+
+You can also use the `env` attribute to create local environments with needed
+packages installed. This is somewhat comparable to `virtualenv`. For example,
+running `nix-shell` with the following `shell.nix`
+
+    with import {};
+
+    (python3.buildEnv.override {
+      extraLibs = with python3Packages; [ numpy requests ];
+    }).env
+
+will drop you into a shell where Python will have the
+specified packages in its path.
+
+
+##### `python.buildEnv` arguments
+
+* `extraLibs`: List of packages installed inside the environment.
+* `postBuild`: Shell command executed after the build of environment.
+* `ignoreCollisions`: Ignore file collisions inside the environment (default is `false`).
+
+### Development mode
+
+Development or editable mode is supported. To develop Python packages
+`buildPythonPackage` has additional logic inside `shellPhase` to run `pip
+install -e . --prefix $TMPDIR/`for the package.
+
+Warning: `shellPhase` is executed only if `setup.py` exists.
+
+Given a `default.nix`:
+
+    with import {};
+
+    buildPythonPackage { name = "myproject";
+
+    buildInputs = with pkgs.pythonPackages; [ pyramid ];
+
+    src = ./.; }
+
+Running `nix-shell` with no arguments should give you
+the environment in which the package would be build with
+`nix-build`.
+
+Shortcut to setup environments with C headers/libraries and python packages:
+
+    $ nix-shell -p pythonPackages.pyramid zlib libjpeg git
+
+Note: There is a boolean value `lib.inNixShell` set to `true` if nix-shell is invoked.
+
+### Tools
+
+Packages inside nixpkgs are written by hand. However many tools exist in
+community to help save time. No tool is preferred at the moment.
+
+- [python2nix](https://github.com/proger/python2nix) by Vladimir Kirillov
+- [pypi2nix](https://github.com/garbas/pypi2nix) by Rok Garbas
+- [pypi2nix](https://github.com/offlinehacker/pypi2nix) by Jaka Hudoklin
+
+## FAQ
+
+### How to solve circular dependencies?
+
+Consider the packages `A` and `B` that depend on each other. When packaging `B`,
+a solution is to override package `A` not to depend on `B` as an input. The same
+should also be done when packaging `A`.
+
+### `install_data` / `data_files` problems
+
+If you get the following error:
+
+    could not create '/nix/store/6l1bvljpy8gazlsw2aw9skwwp4pmvyxw-python-2.7.8/etc':
+    Permission denied
+
+This is a [known bug](https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix) in setuptools.
+Setuptools `install_data` does not respect `--prefix`. An example of such package using the feature is `pkgs/tools/X11/xpra/default.nix`.
+As workaround install it as an extra `preInstall` step:
+
+    ${python.interpreter} setup.py install_data --install-dir=$out --root=$out
+    sed -i '/ = data\_files/d' setup.py
+
+
+###  Rationale of non-existent global site-packages
+
+On most operating systems a global `site-packages` is maintained. This however
+becomes problematic if you want to run multiple Python versions or have multiple
+versions of certain libraries for your projects. Generally, you would solve such
+issues by creating virtual environments using `virtualenv`.
+
+On Nix each package has an isolated dependency tree which, in the case of
+Python, guarantees the right versions of the interpreter and libraries or
+packages are available. There is therefore no need to maintain a global `site-packages`.
+
+If you want to create a Python environment for development, then the recommended
+method is to use `nix-shell`, either with or without the `python.buildEnv`
+function.
+
+
+## Contributing
+
+### Contributing guidelines
+
+Following rules are desired to be respected:
+
+* Make sure package builds for all python interpreters. Use `disabled` argument to `buildPythonPackage` to set unsupported interpreters.
+* If tests need to be disabled for a package, make sure you leave a comment about reasoning.
+* Packages in `pkgs/top-level/python-packages.nix` are sorted quasi-alphabetically to avoid merge conflicts.
+* Python libraries are supposed to be in `python-packages.nix` and packaged with `buildPythonPackage`. Python applications live outside of `python-packages.nix` and are packaged with `buildPythonApplication`.
diff --git a/doc/languages-frameworks/python.xml b/doc/languages-frameworks/python.xml
deleted file mode 100644
index 57aceeb48685..000000000000
--- a/doc/languages-frameworks/python.xml
+++ /dev/null
@@ -1,447 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xml:id="sec-python">
-
-<title>Python</title>
-
-<para>
-  Currently supported interpreters are <varname>python26</varname>, <varname>python27</varname>,
-  <varname>python33</varname>, <varname>python34</varname>, <varname>python35</varname>
-  and <varname>pypy</varname>.
-</para>
-
-<para>
-  <varname>python</varname> is an alias to <varname>python27</varname> and <varname>python3</varname> is an alias to <varname>python34</varname>.
-</para>
-
-<para>
-  <varname>python26</varname> and <varname>python27</varname> do not include modules that require
-  external dependencies (to reduce dependency bloat). Following modules need to be added as
-  <varname>buildInput</varname> explicitly:
-</para>
-
-<itemizedlist>
-  <listitem><para><varname>python.modules.bsddb</varname></para></listitem>
-  <listitem><para><varname>python.modules.curses</varname></para></listitem>
-  <listitem><para><varname>python.modules.curses_panel</varname></para></listitem>
-  <listitem><para><varname>python.modules.crypt</varname></para></listitem>
-  <listitem><para><varname>python.modules.gdbm</varname></para></listitem>
-  <listitem><para><varname>python.modules.sqlite3</varname></para></listitem>
-  <listitem><para><varname>python.modules.tkinter</varname></para></listitem>
-  <listitem><para><varname>python.modules.readline</varname></para></listitem>
-</itemizedlist>
-
-<para>For convenience <varname>python27Full</varname> and <varname>python26Full</varname>
-are provided with all modules included.</para>
-
-<para>
-  Python packages that
-  use <link xlink:href="http://pypi.python.org/pypi/setuptools/"><literal>setuptools</literal></link> or <literal>distutils</literal>,
-  can be built using the <varname>buildPythonPackage</varname> function as documented below.
-</para>
-
-<para>
- All packages depending on any Python interpreter get appended <varname>$out/${python.sitePackages}</varname>
- to <literal>$PYTHONPATH</literal> if such directory exists.
-</para>
-
-<variablelist>
-  <title>
-     Useful attributes on interpreters packages:
-  </title>
-
-  <varlistentry>
-    <term><varname>libPrefix</varname></term>
-    <listitem><para>
-        Name of the folder in <literal>${python}/lib/</literal> for corresponding interpreter.
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>interpreter</varname></term>
-    <listitem><para>
-        Alias for <literal>${python}/bin/${executable}.</literal>
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>buildEnv</varname></term>
-    <listitem><para>
-        Function to build python interpreter environments with extra packages bundled together.
-        See <xref linkend="ssec-python-build-env" /> for usage and documentation.
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>sitePackages</varname></term>
-    <listitem><para>
-      Alias for <literal>lib/${libPrefix}/site-packages</literal>.
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>executable</varname></term>
-    <listitem><para>
-      Name of the interpreter executable, ie <literal>python3.4</literal>.
-    </para></listitem>
-  </varlistentry>
-
-</variablelist>
-<section xml:id="ssec-build-python-package"><title><varname>buildPythonPackage</varname> function</title>
-
-  <para>
-  The function is implemented in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/generic/default.nix">
-  <filename>pkgs/development/python-modules/generic/default.nix</filename></link>.
-  Example usage:
-
-<programlisting language="nix">
-twisted = buildPythonPackage {
-  name = "twisted-8.1.0";
-
-  src = pkgs.fetchurl {
-    url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2;
-    sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl";
-  };
-
-  propagatedBuildInputs = [ self.ZopeInterface ];
-
-  meta = {
-    homepage = http://twistedmatrix.com/;
-    description = "Twisted, an event-driven networking engine written in Python";
-    license = stdenv.lib.licenses.mit;
-  };
-};
-</programlisting>
-
-  Most of Python packages that use <varname>buildPythonPackage</varname> are defined
-  in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/python-packages.nix"><filename>pkgs/top-level/python-packages.nix</filename></link>
-  and generated for each python interpreter separately into attribute sets <varname>python26Packages</varname>,
-  <varname>python27Packages</varname>, <varname>python35Packages</varname>, <varname>python33Packages</varname>,
-  <varname>python34Packages</varname> and <varname>pypyPackages</varname>.
-  </para>
-
-  <para>
-    <function>buildPythonPackage</function> mainly does four things:
-
-    <orderedlist>
-      <listitem><para>
-        In the <varname>buildPhase</varname>, it calls
-        <literal>${python.interpreter} setup.py bdist_wheel</literal> to build a wheel binary zipfile.
-      </para></listitem>
-
-      <listitem><para>
-        In the <varname>installPhase</varname>, it installs the wheel file using
-        <literal>pip install *.whl</literal>.
-      </para></listitem>
-
-      <listitem><para>
-        In the <varname>postFixup</varname> phase, <literal>wrapPythonPrograms</literal>
-        bash function is called to wrap all programs in <filename>$out/bin/*</filename>
-        directory to include <literal>$PYTHONPATH</literal> and <literal>$PATH</literal>
-        environment variables.
-      </para></listitem>
-
-      <listitem><para>
-        In the <varname>installCheck</varname> phase, <literal>${python.interpreter} setup.py test</literal>
-        is ran.
-      </para></listitem>
-    </orderedlist>
-  </para>
-
-  <para>By default <varname>doCheck = true</varname> is set</para>
-
-  <para>
-    As in Perl, dependencies on other Python packages can be specified in the
-    <varname>buildInputs</varname> and
-    <varname>propagatedBuildInputs</varname> attributes.  If something is
-    exclusively a build-time dependency, use
-    <varname>buildInputs</varname>; if it’s (also) a runtime dependency,
-    use <varname>propagatedBuildInputs</varname>.
-  </para>
-
-  <para>
-    By default <varname>meta.platforms</varname> is set to the same value
-    as the interpreter unless overriden otherwise.
-  </para>
-
-  <variablelist>
-    <title>
-      <varname>buildPythonPackage</varname> parameters
-      (all parameters from <varname>mkDerivation</varname> function are still supported)
-    </title>
-
-    <varlistentry>
-      <term><varname>namePrefix</varname></term>
-      <listitem><para>
-        Prepended text to <varname>${name}</varname> parameter.
-        Defaults to <literal>"python3.3-"</literal> for Python 3.3, etc. Set it to
-        <literal>""</literal>
-        if you're packaging an application or a command line tool.
-      </para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><varname>disabled</varname></term>
-      <listitem><para>
-        If <varname>true</varname>, package is not build for
-        particular python interpreter version. Grep around
-        <filename>pkgs/top-level/python-packages.nix</filename>
-        for examples.
-      </para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><varname>setupPyBuildFlags</varname></term>
-      <listitem><para>
-        List of flags passed to <command>setup.py build_ext</command> command.
-      </para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><varname>pythonPath</varname></term>
-      <listitem><para>
-        List of packages to be added into <literal>$PYTHONPATH</literal>.
-        Packages in <varname>pythonPath</varname> are not propagated
-        (contrary to <varname>propagatedBuildInputs</varname>).
-      </para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><varname>preShellHook</varname></term>
-      <listitem><para>
-        Hook to execute commands before <varname>shellHook</varname>.
-      </para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><varname>postShellHook</varname></term>
-      <listitem><para>
-        Hook to execute commands after <varname>shellHook</varname>.
-      </para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><varname>makeWrapperArgs</varname></term>
-      <listitem><para>
-        A list of strings. Arguments to be passed to
-        <varname>makeWrapper</varname>, which wraps generated binaries. By
-        default, the arguments to <varname>makeWrapper</varname> set
-        <varname>PATH</varname> and <varname>PYTHONPATH</varname> 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,
-        <varname>makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]</varname>.
-      </para></listitem>
-    </varlistentry>
-
-  </variablelist>
-
-</section>
-
-<section xml:id="ssec-python-build-env"><title><function>python.buildEnv</function> function</title>
-  <para>
-    Create Python environments using low-level <function>pkgs.buildEnv</function> function. Example <filename>default.nix</filename>:
-
-<programlisting language="nix">
-<![CDATA[with import <nixpkgs> {};
-
-python.buildEnv.override {
-  extraLibs = [ pkgs.pythonPackages.pyramid ];
-  ignoreCollisions = true;
-}]]>
-</programlisting>
-
-    Running <command>nix-build</command> will create
-    <filename>/nix/store/cf1xhjwzmdki7fasgr4kz6di72ykicl5-python-2.7.8-env</filename>
-    with wrapped binaries in <filename>bin/</filename>.
-  </para>
-
-  <para>
-  You can also use <varname>env</varname> attribute to create local
-  environments with needed packages installed (somewhat comparable to
-  <literal>virtualenv</literal>). For example, with the following
-  <filename>shell.nix</filename>:
-
-<programlisting language="nix">
-<![CDATA[with import <nixpkgs> {};
-
-(python3.buildEnv.override {
-  extraLibs = with python3Packages;
-    [ numpy
-      requests
-    ];
-}).env]]>
-</programlisting>
-
-  Running <command>nix-shell</command> will drop you into a shell where
-  <command>python</command> will have specified packages in its path.
-  </para>
-
-  <variablelist>
-    <title>
-      <function>python.buildEnv</function> arguments
-    </title>
-
-    <varlistentry>
-      <term><varname>extraLibs</varname></term>
-      <listitem><para>
-        List of packages installed inside the environment.
-      </para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><varname>postBuild</varname></term>
-      <listitem><para>
-        Shell command executed after the build of environment.
-      </para></listitem>
-    </varlistentry>
-
-    <varlistentry>
-      <term><varname>ignoreCollisions</varname></term>
-      <listitem><para>
-         Ignore file collisions inside the environment (default is <varname>false</varname>).
-      </para></listitem>
-    </varlistentry>
-  </variablelist>
-</section>
-
-<section xml:id="ssec-python-tools"><title>Tools</title>
-
-<para>Packages inside nixpkgs are written by hand. However many tools
-exist in community to help save time. No tool is preferred at the moment.
-</para>
-
-<itemizedlist>
-
-  <listitem><para>
-    <link xlink:href="https://github.com/proger/python2nix">python2nix</link>
-    by Vladimir Kirillov
-  </para></listitem>
-
-  <listitem><para>
-    <link xlink:href="https://github.com/garbas/pypi2nix">pypi2nix</link>
-    by Rok Garbas
-  </para></listitem>
-
-  <listitem><para>
-    <link xlink:href="https://github.com/offlinehacker/pypi2nix">pypi2nix</link>
-    by Jaka Hudoklin
-  </para></listitem>
-
-</itemizedlist>
-
-</section>
-
-<section xml:id="ssec-python-development"><title>Development</title>
-
-  <para>
-    To develop Python packages <function>buildPythonPackage</function> has
-    additional logic inside <varname>shellPhase</varname> to run
-    <command>pip install -e . --prefix $TMPDIR/</command> for the package.
-  </para>
-
-  <warning><para><varname>shellPhase</varname> is executed only if <filename>setup.py</filename>
-  exists.</para></warning>
-
-  <para>
-    Given a <filename>default.nix</filename>:
-
-<programlisting language="nix">
-<![CDATA[with import <nixpkgs> {};
-
-buildPythonPackage {
-  name = "myproject";
-
-  buildInputs = with pkgs.pythonPackages; [ pyramid ];
-
-  src = ./.;
-}]]>
-</programlisting>
-
-    Running <command>nix-shell</command> with no arguments should give you
-    the environment in which the package would be build with
-    <command>nix-build</command>.
-  </para>
-
-  <para>
-    Shortcut to setup environments with C headers/libraries and python packages:
-
-    <programlisting language="bash">$ nix-shell -p pythonPackages.pyramid zlib libjpeg git</programlisting>
-  </para>
-
-  <note><para>
-    There is a boolean value <varname>lib.inNixShell</varname> set to
-    <varname>true</varname> if nix-shell is invoked.
-  </para></note>
-
-</section>
-
-<section xml:id="ssec-python-faq"><title>FAQ</title>
-
-<variablelist>
-
-  <varlistentry>
-    <term>How to solve circular dependencies?</term>
-    <listitem><para>
-      If you have packages <varname>A</varname> and <varname>B</varname> that
-      depend on each other, when packaging <varname>B</varname> override package
-      <varname>A</varname> not to depend on <varname>B</varname> as input
-      (and also the other way around).
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><varname>install_data / data_files</varname> problems resulting into <literal>error: could not create '/nix/store/6l1bvljpy8gazlsw2aw9skwwp4pmvyxw-python-2.7.8/etc': Permission denied</literal></term>
-    <listitem><para>
-      <link xlink:href="https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix">
-      Known bug in setuptools <varname>install_data</varname> does not respect --prefix</link>. Example of
-      such package using the feature is <filename>pkgs/tools/X11/xpra/default.nix</filename>. As workaround
-      install it as an extra <varname>preInstall</varname> step:
-
-      <programlisting>${python.interpreter} setup.py install_data --install-dir=$out --root=$out
-sed -i '/ = data_files/d' setup.py</programlisting>
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term>Rationale of non-existent global site-packages</term>
-    <listitem><para>
-      There is no need to have global site-packages in Nix. Each package has isolated
-      dependency tree and installing any python package will only populate <varname>$PATH</varname>
-      inside user environment. See <xref linkend="ssec-python-build-env" /> to create self-contained
-      interpreter with a set of packages.
-    </para></listitem>
-  </varlistentry>
-
-</variablelist>
-
-</section>
-
-
-<section xml:id="ssec-python-contrib"><title>Contributing guidelines</title>
-<para>
-  Following rules are desired to be respected:
-</para>
-
-<itemizedlist>
-
-  <listitem><para>
-    Make sure package builds for all python interpreters. Use <varname>disabled</varname> argument to
-    <function>buildPythonPackage</function> to set unsupported interpreters.
-  </para></listitem>
-
-  <listitem><para>
-    If tests need to be disabled for a package, make sure you leave a comment about reasoning.
-  </para></listitem>
-
-  <listitem><para>
-    Packages in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/python-packages.nix"><filename>pkgs/top-level/python-packages.nix</filename></link>
-    are sorted quasi-alphabetically to avoid merge conflicts.
-  </para></listitem>
-
-</itemizedlist>
-
-</section>
-
-</section>
-

From 9310bd15de5eed356f36bf3c5dcab0a2d5957a37 Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <freddyrietdijk@fridh.nl>
Date: Sat, 5 Mar 2016 18:01:23 -0500
Subject: [PATCH 2224/2285] Revert "Documentation: rewrite Python docs"

---
 doc/default.nix                     |   6 -
 doc/languages-frameworks/python.md  | 668 ----------------------------
 doc/languages-frameworks/python.xml | 447 +++++++++++++++++++
 3 files changed, 447 insertions(+), 674 deletions(-)
 delete mode 100644 doc/languages-frameworks/python.md
 create mode 100644 doc/languages-frameworks/python.xml

diff --git a/doc/default.nix b/doc/default.nix
index 203555de131e..196b9e445390 100644
--- a/doc/default.nix
+++ b/doc/default.nix
@@ -45,10 +45,6 @@ stdenv.mkDerivation {
   + toDocbook {
       inputFile = ./introduction.md;
       outputFile = "introduction.xml";
-    }
-  + toDocbook {
-      inputFile = ./languages-frameworks/python.md;
-      outputFile = "./languages-frameworks/python.xml";
       useChapters = true;
     }
   + toDocbook {
@@ -65,8 +61,6 @@ stdenv.mkDerivation {
       outputFile = "languages-frameworks/r.xml";
     }
   + ''
-    cat -n languages-frameworks/python.xml
-
     echo ${nixpkgsVersion} > .version
 
     xmllint --noout --nonet --xinclude --noxincludenode \
diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md
deleted file mode 100644
index d05cabac3ff6..000000000000
--- a/doc/languages-frameworks/python.md
+++ /dev/null
@@ -1,668 +0,0 @@
-# Python
-
-## User Guide
-
-Several versions of Python are available on Nix as well as a high amount of
-packages. The default interpreter is CPython 2.7.
-
-### Using Python
-
-#### Installing Python and packages
-
-It is important to make a distinction between Python packages that are
-used as libraries, and applications that are written in Python.
-
-Applications on Nix are installed typically into your user
-profile imperatively using `nix-env -i`, and on NixOS declaratively by adding the
-package name to `environment.systemPackages` in `/etc/nixos/configuration.nix`.
-Dependencies such as libraries are automatically installed and should not be
-installed explicitly.
-
-The same goes for Python applications and libraries. Python applications can be
-installed in your profile, but Python libraries you would like to use to develop
-cannot. If you do install libraries in your profile, then you will end up with
-import errors.
-
-#### Python environments using `nix-shell`
-
-The recommended method for creating Python environments for development is with
-`nix-shell`. Executing
-
-```sh
-$ nix-shell -p python35Packages.numpy python35Packages.toolz
-```
-
-opens a Nix shell which has available the requested packages and dependencies.
-Now you can launch the Python interpreter (which is itself a dependency)
-
-```sh
-[nix-shell:~] python3
-```
-
-If the packages were not available yet in the Nix store, Nix would download or
-build them automatically. A convenient option with `nix-shell` is the `--run`
-option, with which you can execute a command in the `nix-shell`. Let's say we
-want the above environment and directly run the Python interpreter
-
-```sh
-$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3"
-```
-
-This way you can use the `--run` option also to directly run a script
-
-```sh
-$ nix-shell -p python35Packages.numpy python35Packages.toolz --run "python3 myscript.py"
-```
-
-In fact, for this specific use case there is a more convenient method. You can
-add a [shebang](https://en.wikipedia.org/wiki/Shebang_(Unix)) to your script
-specifying which dependencies Nix shell needs. With the following shebang, you
-can use `nix-shell myscript.py` and it will make available all dependencies and
-run the script in the `python3` shell.
-
-```py
-#! /usr/bin/env nix-shell
-#! nix-shell -i python3 -p python3Packages.numpy
-
-import numpy
-
-print(numpy.__version__)
-```
-
-Likely you do not want to type your dependencies each and every time. What you
-can do is write a simple Nix expression which sets up an environment for you,
-requiring you only to type `nix-shell`. Say we want to have Python 3.5, `numpy`
-and `toolz`, like before, in an environment. With a `shell.nix` file
-containing
-
-```nix
-with import <nixpkgs> {};
-
-(pkgs.python35.buildEnv.override  {
-  extraLibs = with pkgs.python35Packages; [ numpy toolz ];
-}).env
-```
-executing `nix-shell` gives you again a Nix shell from which you can run Python.
-
-What's happening here?
-
-1. We begin with importing the Nix Packages collections. `import <nixpkgs>` import the `<nixpkgs>` function, `{}` calls it and the `with` statement brings all attributes of `nixpkgs` in the local scope. Therefore we can now use `pkgs`.
-2. Then we create a Python 3.5 environment with `pkgs.buildEnv`. Because we want to use it with a custom set of Python packages, we override it.
-3. The `extraLibs` argument of the original `buildEnv` function can be used to specify which packages should be included. We want `numpy` and `toolz`. Again, we use the `with` statement to bring a set of attributes into the local scope.
-4. And finally, for in interactive use we return the environment.
-
-### Developing with Python
-
-
-Now that you know how to get a working Python environment on Nix, it is time to go forward and start actually developing with Python.
-We will first have a look at how Python packages are packaged on Nix. Then, we will look how you can use development mode with your code.
-
-#### Python packaging on Nix
-
-On Nix all packages are built by functions. The main function in Nix for building Python packages is [`buildPythonPackage`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/generic/default.nix).
-Let's see how we would build the `toolz` package. According to [`python-packages.nix`](https://raw.githubusercontent.com/NixOS/nixpkgs/master/pkgs/top-level/python-packages.nix) `toolz` is build using
-
-```nix
-toolz = buildPythonPackage rec{
-  name = "toolz-${version}";
-  version = "0.7.4";
-
-  src = pkgs.fetchurl{
-    url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz";
-    sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
-  };
-
-  meta = {
-    homepage = "http://github.com/pytoolz/toolz/";
-    description = "List processing tools and functional utilities";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ fridh ];
-  };
-};
-```
-
-What happens here? The function `buildPythonPackage` is called and as argument
-it accepts a set. In this case the set is a recursive set ([`rec`](http://nixos.org/nix/manual/#sec-constructs)).
-One of the arguments is the name of the package, which consists of a basename
-(generally following the name on PyPi) and a version. Another argument, `src`
-specifies the source, which in this case is fetched from an url. `fetchurl` not
-only downloads the target file, but also validates its hash. Furthermore, we
-specify some (optional) [meta information](http://nixos.org/nixpkgs/manual/#chap-meta).
-
-The output of the function is a derivation, which is an attribute with the name
-`toolz` of the set `pythonPackages`. Actually, sets are created for all interpreter versions,
-so `python27Packages`, `python34Packages`, `python35Packages` and `pypyPackages`.
-
-The above example works when you're directly working on
-`pkgs/top-level/python-packages.nix` in the Nixpkgs repository. Often though,
-you will want to test a Nix expression outside of the Nixpkgs tree. If you
-create a `shell.nix` file with the following contents
-
-```nix
-with import <nixpkgs> {};
-
-pkgs.python35Packages.buildPythonPackage rec {
-  name = "toolz-${version}";
-  version = "0.7.4";
-
-  src = pkgs.fetchurl{
-    url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz";
-    sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
-  };
-
-  meta = {
-    homepage = "http://github.com/pytoolz/toolz/";
-    description = "List processing tools and functional utilities";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ fridh ];
-  };
-}
-```
-
-and then execute `nix-shell` will result in an environment in which you can use
-Python 3.5 and the `toolz` package. As you can see we had to explicitly mention
-for which Python version we want to build a package.
-
-The above example considered only a single package. Generally you will want to use multiple packages.
-If we create a `shell.nix` file with the following contents
-
-```nix
-with import <nixpkgs> {};
-
-( let
-    toolz = pkgs.python35Packages.buildPythonPackage rec {
-      name = "toolz-${version}";
-      version = "0.7.4";
-
-      src = pkgs.fetchurl{
-        url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz";
-        sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
-      };
-
-      meta = {
-        homepage = "http://github.com/pytoolz/toolz/";
-        description = "List processing tools and functional utilities";
-        license = licenses.bsd3;
-        maintainers = with maintainers; [ fridh ];
-      };
-    };
-
-  in pkgs.python35.buildEnv.override rec {
-
-    extraLibs = [ pkgs.python35Packages.numpy toolz ];
-}
-).env
-```
-
-and again execute `nix-shell`, then we get a Python 3.5 environment with our
-locally defined package as well as `numpy` which is build according to the
-definition in Nixpkgs. What did we do here? Well, we took the Nix expression
-that we used earlier to build a Python environment, and said that we wanted to
-include our own version of `toolz`. To introduce our own package in the scope of
-`buildEnv.override` we used a
-[`let`](http://nixos.org/nix/manual/#sec-constructs) expression.
-
-### Handling dependencies
-
-Our example, `toolz`, doesn't have any dependencies on other Python
-packages or system libraries. According to the manual,  `buildPythonPackage`
-uses the arguments `buildInputs` and `propagatedBuildInputs` to specify dependencies. If something is
-exclusively a build-time dependency, then the dependency should be included as a
-`buildInput`, but if it is (also) a runtime dependency, then it should be added
-to `propagatedBuildInputs`. Test dependencies are considered build-time dependencies.
-
-The following example shows which arguments are given to `buildPythonPackage` in
-order to build [`datashape`](https://github.com/blaze/datashape).
-
-```nix
-datashape = buildPythonPackage rec {
-  name = "datashape-${version}";
-  version = "0.4.7";
-
-  src = pkgs.fetchurl {
-    url = "https://pypi.python.org/packages/source/D/DataShape/${name}.tar.gz";
-    sha256 = "14b2ef766d4c9652ab813182e866f493475e65e558bed0822e38bf07bba1a278";
-  };
-
-  buildInputs = with self; [ pytest ];
-  propagatedBuildInputs = with self; [ numpy multipledispatch dateutil ];
-
-  meta = {
-    homepage = https://github.com/ContinuumIO/datashape;
-    description = "A data description language";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [ fridh ];
-  };
-};
-```
-
-We can see several runtime dependencies, `numpy`, `multipledispatch`, and
-`dateutil`. Furthermore, we have one `buildInput`, i.e. `pytest`. `pytest` is a
-test runner and is only used during the `checkPhase` and is therefore not added
-to `propagatedBuildInputs`.
-
-In the previous case we had only dependencies on other Python packages to consider.
-Occasionally you have also system libraries to consider. E.g., `lxml` provides
-Python bindings to `libxml2` and `libxslt`. These libraries are only required
-when building the bindings and are therefore added as `buildInputs`.
-
-```nix
-lxml = buildPythonPackage rec {
-  name = "lxml-3.4.4";
-
-  src = pkgs.fetchurl {
-    url = "http://pypi.python.org/packages/source/l/lxml/${name}.tar.gz";
-    sha256 = "16a0fa97hym9ysdk3rmqz32xdjqmy4w34ld3rm3jf5viqjx65lxk";
-  };
-
-  buildInputs = with self; [ pkgs.libxml2 pkgs.libxslt ];
-
-  meta = {
-    description = "Pythonic binding for the libxml2 and libxslt libraries";
-    homepage = http://lxml.de;
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ sjourdois ];
-  };
-};
-```
-
-In this example `lxml` and Nix are able to work out exactly where the relevant
-files of the dependencies are. This is not always the case.
-
-The example below shows bindings to The Fastest Fourier Transform in the West, commonly known as
-FFTW. On Nix we have separate packages of FFTW for the different types of floats
-(`"single"`, `"double"`, `"long-double"`). The bindings need all three types,
-and therefore we add all three as `buildInputs`. The bindings don't expect to
-find each of them in a different folder, and therefore we have to set `LDFLAGS`
-and `CFLAGS`.
-
-```nix
-pyfftw = buildPythonPackage rec {
-  name = "pyfftw-${version}";
-  version = "0.9.2";
-
-  src = pkgs.fetchurl {
-    url = "https://pypi.python.org/packages/source/p/pyFFTW/pyFFTW-${version}.tar.gz";
-    sha256 = "f6bbb6afa93085409ab24885a1a3cdb8909f095a142f4d49e346f2bd1b789074";
-  };
-
-  buildInputs = [ pkgs.fftw pkgs.fftwFloat pkgs.fftwLongDouble];
-
-  propagatedBuildInputs = with self; [ numpy scipy ];
-
-  # Tests cannot import pyfftw. pyfftw works fine though.
-  doCheck = false;
-
-  LDFLAGS="-L${pkgs.fftw}/lib -L${pkgs.fftwFloat}/lib -L${pkgs.fftwLongDouble}/lib"
-  CFLAGS="-I${pkgs.fftw}/include -I${pkgs.fftwFloat}/include -I${pkgs.fftwLongDouble}/include"
-  '';
-
-  meta = {
-    description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms";
-    homepage = http://hgomersall.github.com/pyFFTW/;
-    license = with licenses; [ bsd2 bsd3 ];
-    maintainer = with maintainers; [ fridh ];
-  };
-};
-```
-Note also the line `doCheck = false;`, we explicitly disabled running the test-suite.
-
-
-#### Develop local package
-
-As a Python developer you're likely aware of [development mode](http://pythonhosted.org/setuptools/setuptools.html#development-mode) (`python setup.py develop`);
-instead of installing the package this command creates a special link to the project code.
-That way, you can run updated code without having to reinstall after each and every change you make.
-Development mode is also available on Nix as [explained](http://nixos.org/nixpkgs/manual/#ssec-python-development) in the Nixpkgs manual.
-Let's see how you can use it.
-
-In the previous Nix expression the source was fetched from an url. We can also refer to a local source instead using
-
-```nix
-src = ./path/to/source/tree;
-```
-
-If we create a `shell.nix` file which calls `buildPythonPackage`, and if `src`
-is a local source, and if the local source has a `setup.py`, then development
-mode is activated.
-
-In the following example we create a simple environment that
-has a Python 3.5 version of our package in it, as well as its dependencies and
-other packages we like to have in the environment, all specified with `propagatedBuildInputs`.
-Indeed, we can just add any package we like to have in our environment to `propagatedBuildInputs`.
-
-```nix
-with import <nixpkgs>;
-with pkgs.python35Packages;
-
-buildPythonPackage rec {
-  name = "mypackage";
-  src = ./path/to/package/source;
-  propagatedBuildInputs = [ pytest numpy pkgs.libsndfile ];
-};
-```
-
-It is important to note that due to how development mode is implemented on Nix it is not possible to have multiple packages simultaneously in development mode.
-
-
-### Organising your packages
-
-So far we discussed how you can use Python on Nix, and how you can develop with
-it. We've looked at how you write expressions to package Python packages, and we
-looked at how you can create environments in which specified packages are
-available.
-
-At some point you'll likely have multiple packages which you would
-like to be able to use in different projects. In order to minimise unnecessary
-duplication we now look at how you can maintain yourself a repository with your
-own packages. The important functions here are `import` and `callPackage`.
-
-### Including a derivation using `callPackage`
-
-Earlier we created a Python environment using `buildEnv`, and included the
-`toolz` package via a `let` expression.
-Let's split the package definition from the environment definition.
-
-We first create a function that builds `toolz` in `~/path/to/toolz/release.nix`
-
-```nix
-{ pkgs, buildPythonPackage }:
-
-buildPythonPackage rec {
-  name = "toolz-${version}";
-  version = "0.7.4";
-
-  src = pkgs.fetchurl{
-    url = "https://pypi.python.org/packages/source/t/toolz/toolz-${version}.tar.gz";
-    sha256 = "43c2c9e5e7a16b6c88ba3088a9bfc82f7db8e13378be7c78d6c14a5f8ed05afd";
-  };
-
-  meta = {
-    homepage = "http://github.com/pytoolz/toolz/";
-    description = "List processing tools and functional utilities";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ fridh ];
-  };
-};
-```
-
-It takes two arguments, `pkgs` and `buildPythonPackage`.
-We now call this function using `callPackage` in the definition of our environment
-
-```nix
-with import <nixpkgs> {};
-
-( let
-    toolz = pkgs.callPackage ~/path/to/toolz/release.nix { pkgs=pkgs; buildPythonPackage=pkgs.python35Packages.buildPythonPackage; };
-  in pkgs.python35.buildEnv.override rec {
-    extraLibs = [ pkgs.python35Packages.numpy  toolz ];
-}
-).env
-```
-
-Important to remember is that the Python version for which the package is made
-depends on the `python` derivation that is passed to `buildPythonPackage`. Nix
-tries to automatically pass arguments when possible, which is why generally you
-don't explicitly define which `python` derivation should be used. In the above
-example we use `buildPythonPackage` that is part of the set `python35Packages`,
-and in this case the `python35` interpreter is automatically used.
-
-
-
-## Reference
-
-### Interpreters
-
-Versions 2.6, 2.7, 3.3, 3.4 and 3.5 of the CPython interpreter are available on
-Nix and are available as `python26`, `python27`, `python33`, `python34` and
-`python35`. The PyPy interpreter is also available as `pypy`. Currently, the
-aliases `python` and `python3` correspond to respectively `python27` and
-`python35`. The Nix expressions for the interpreters can be found in
-`pkgs/development/interpreters/python`.
-
-
-#### Missing modules standard library
-
-The interpreters `python26` and `python27` do not include modules that
-require external dependencies. This is done in order to reduce the closure size.
-The following modules need to be added as `buildInput` explicitly:
-
-* `python.modules.bsddb`
-* `python.modules.curses`
-* `python.modules.curses_panel`
-* `python.modules.crypt`
-* `python.modules.gdbm`
-* `python.modules.sqlite3`
-* `python.modules.tkinter`
-* `python.modules.readline`
-
-For convenience `python27Full` and `python26Full` are provided with all
-modules included.
-
-All packages depending on any Python interpreter get appended
-`out/{python.sitePackages}` to `$PYTHONPATH` if such directory
-exists.
-
-#### Attributes on interpreters packages
-
-Each interpreter has the following attributes:
-
-- `libPrefix`. Name of the folder in `${python}/lib/` for corresponding interpreter.
-- `interpreter`. Alias for `${python}/bin/${executable}`.
-- `buildEnv`. Function to build python interpreter environments with extra packages bundled together. See section *python.buildEnv function* for usage and documentation.
-- `sitePackages`. Alias for `lib/${libPrefix}/site-packages`.
-- `executable`. Name of the interpreter executable, ie `python3.4`.
-
-### Building packages and applications
-
-Python packages (libraries) and applications that use `setuptools` or
-`distutils` are typically built with respectively the `buildPythonPackage` and
-`buildPythonApplication` functions.
-
-All Python packages reside in `pkgs/top-level/python-packages.nix` and all
-applications elsewhere. Some packages are also defined in
-`pkgs/development/python-modules`. It is important that these packages are
-called in `pkgs/top-level/python-packages.nix` and not elsewhere, to guarantee
-the right version of the package is built.
-
-Based on the packages defined in `pkgs/top-level/python-packages.nix` an
-attribute set is created for each available Python interpreter. The available
-sets are
-
-* `pkgs.python26Packages`
-* `pkgs.python27Packages`
-* `pkgs.python33Packages`
-* `pkgs.python34Packages`
-* `pkgs.python35Packages`
-* `pkgs.pypyPackages`
-
-and the aliases
-
-* `pkgs.pythonPackages` pointing to `pkgs.python27Packages`
-* `pkgs.python3Packages` pointing to `pkgs.python35Packages`
-
-#### `buildPythonPackage` function
-
-The `buildPythonPackage` function is implemented in
-`pkgs/development/python-modules/generic/default.nix`
-
-and can be used as:
-
-    twisted = buildPythonPackage {
-      name = "twisted-8.1.0";
-
-      src = pkgs.fetchurl {
-        url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2;
-        sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl";
-      };
-
-      propagatedBuildInputs = [ self.ZopeInterface ];
-
-      meta = {
-        homepage = http://twistedmatrix.com/;
-        description = "Twisted, an event-driven networking engine written in Python";
-        license = stdenv.lib.licenses.mit; };
-      };
-
-The `buildPythonPackage` mainly does four things:
-
-* In the `buildPhase`, it calls `${python.interpreter} setup.py bdist_wheel` to build a wheel binary zipfile.
-* In the `installPhase`, it installs the wheel file using `pip install *.whl`.
-* In the `postFixup` phase, the `wrapPythonPrograms` bash function is called to wrap all programs in the `$out/bin/*` directory to include `$PYTHONPATH` and `$PATH` environment variables.
-* In the `installCheck` phase, `${python.interpreter} setup.py test` is ran.
-
-As in Perl, dependencies on other Python packages can be specified in the
-`buildInputs` and `propagatedBuildInputs` attributes.  If something is
-exclusively a build-time dependency, use `buildInputs`; if it’s (also) a runtime
-dependency, use `propagatedBuildInputs`.
-
-By default tests are run because `doCheck = true`. Test dependencies, like
-e.g. the test runner, should be added to `buildInputs`.
-
-By default `meta.platforms` is set to the same value
-as the interpreter unless overriden otherwise.
-
-##### `buildPythonPackage` parameters
-
-All parameters from `mkDerivation` function are still supported.
-
-* `namePrefix`: Prepended text to `${name}` parameter. Defaults to `"python3.3-"` for Python 3.3, etc. Set it to `""` if you're packaging an application or a command line tool.
-* `disabled`: If `true`, package is not build for particular python interpreter version. Grep around `pkgs/top-level/python-packages.nix` for examples.
-* `setupPyBuildFlags`: List of flags passed to `setup.py build_ext` command.
-* `pythonPath`: List of packages to be added into `$PYTHONPATH`. Packages in `pythonPath` are not propagated (contrary to `propagatedBuildInputs`).
-* `preShellHook`: Hook to execute commands before `shellHook`.
-* `postShellHook`: Hook to execute commands after `shellHook`.
-* `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'"].
-
-#### `buildPythonApplication` function
-
-The `buildPythonApplication` function is practically the same as `buildPythonPackage`.
-The difference is that `buildPythonPackage` by default prefixes the names of the packages with the version of the interpreter.
-Because with an application we're not interested in multiple version the prefix is dropped.
-
-#### python.buildEnv function
-
-Python environments can be created using the low-level `pkgs.buildEnv` function.
-This example shows how to create an environment that has the Pyramid Web Framework.
-Saving the following as `default.nix`
-
-    with import {};
-
-    python.buildEnv.override {
-      extraLibs = [ pkgs.pythonPackages.pyramid ];
-      ignoreCollisions = true;
-    }
-
-and running `nix-build` will create
-
-    /nix/store/cf1xhjwzmdki7fasgr4kz6di72ykicl5-python-2.7.8-env
-
-with wrapped binaries in `bin/`.
-
-You can also use the `env` attribute to create local environments with needed
-packages installed. This is somewhat comparable to `virtualenv`. For example,
-running `nix-shell` with the following `shell.nix`
-
-    with import {};
-
-    (python3.buildEnv.override {
-      extraLibs = with python3Packages; [ numpy requests ];
-    }).env
-
-will drop you into a shell where Python will have the
-specified packages in its path.
-
-
-##### `python.buildEnv` arguments
-
-* `extraLibs`: List of packages installed inside the environment.
-* `postBuild`: Shell command executed after the build of environment.
-* `ignoreCollisions`: Ignore file collisions inside the environment (default is `false`).
-
-### Development mode
-
-Development or editable mode is supported. To develop Python packages
-`buildPythonPackage` has additional logic inside `shellPhase` to run `pip
-install -e . --prefix $TMPDIR/`for the package.
-
-Warning: `shellPhase` is executed only if `setup.py` exists.
-
-Given a `default.nix`:
-
-    with import {};
-
-    buildPythonPackage { name = "myproject";
-
-    buildInputs = with pkgs.pythonPackages; [ pyramid ];
-
-    src = ./.; }
-
-Running `nix-shell` with no arguments should give you
-the environment in which the package would be build with
-`nix-build`.
-
-Shortcut to setup environments with C headers/libraries and python packages:
-
-    $ nix-shell -p pythonPackages.pyramid zlib libjpeg git
-
-Note: There is a boolean value `lib.inNixShell` set to `true` if nix-shell is invoked.
-
-### Tools
-
-Packages inside nixpkgs are written by hand. However many tools exist in
-community to help save time. No tool is preferred at the moment.
-
-- [python2nix](https://github.com/proger/python2nix) by Vladimir Kirillov
-- [pypi2nix](https://github.com/garbas/pypi2nix) by Rok Garbas
-- [pypi2nix](https://github.com/offlinehacker/pypi2nix) by Jaka Hudoklin
-
-## FAQ
-
-### How to solve circular dependencies?
-
-Consider the packages `A` and `B` that depend on each other. When packaging `B`,
-a solution is to override package `A` not to depend on `B` as an input. The same
-should also be done when packaging `A`.
-
-### `install_data` / `data_files` problems
-
-If you get the following error:
-
-    could not create '/nix/store/6l1bvljpy8gazlsw2aw9skwwp4pmvyxw-python-2.7.8/etc':
-    Permission denied
-
-This is a [known bug](https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix) in setuptools.
-Setuptools `install_data` does not respect `--prefix`. An example of such package using the feature is `pkgs/tools/X11/xpra/default.nix`.
-As workaround install it as an extra `preInstall` step:
-
-    ${python.interpreter} setup.py install_data --install-dir=$out --root=$out
-    sed -i '/ = data\_files/d' setup.py
-
-
-###  Rationale of non-existent global site-packages
-
-On most operating systems a global `site-packages` is maintained. This however
-becomes problematic if you want to run multiple Python versions or have multiple
-versions of certain libraries for your projects. Generally, you would solve such
-issues by creating virtual environments using `virtualenv`.
-
-On Nix each package has an isolated dependency tree which, in the case of
-Python, guarantees the right versions of the interpreter and libraries or
-packages are available. There is therefore no need to maintain a global `site-packages`.
-
-If you want to create a Python environment for development, then the recommended
-method is to use `nix-shell`, either with or without the `python.buildEnv`
-function.
-
-
-## Contributing
-
-### Contributing guidelines
-
-Following rules are desired to be respected:
-
-* Make sure package builds for all python interpreters. Use `disabled` argument to `buildPythonPackage` to set unsupported interpreters.
-* If tests need to be disabled for a package, make sure you leave a comment about reasoning.
-* Packages in `pkgs/top-level/python-packages.nix` are sorted quasi-alphabetically to avoid merge conflicts.
-* Python libraries are supposed to be in `python-packages.nix` and packaged with `buildPythonPackage`. Python applications live outside of `python-packages.nix` and are packaged with `buildPythonApplication`.
diff --git a/doc/languages-frameworks/python.xml b/doc/languages-frameworks/python.xml
new file mode 100644
index 000000000000..57aceeb48685
--- /dev/null
+++ b/doc/languages-frameworks/python.xml
@@ -0,0 +1,447 @@
+<section xmlns="http://docbook.org/ns/docbook"
+         xmlns:xlink="http://www.w3.org/1999/xlink"
+         xml:id="sec-python">
+
+<title>Python</title>
+
+<para>
+  Currently supported interpreters are <varname>python26</varname>, <varname>python27</varname>,
+  <varname>python33</varname>, <varname>python34</varname>, <varname>python35</varname>
+  and <varname>pypy</varname>.
+</para>
+
+<para>
+  <varname>python</varname> is an alias to <varname>python27</varname> and <varname>python3</varname> is an alias to <varname>python34</varname>.
+</para>
+
+<para>
+  <varname>python26</varname> and <varname>python27</varname> do not include modules that require
+  external dependencies (to reduce dependency bloat). Following modules need to be added as
+  <varname>buildInput</varname> explicitly:
+</para>
+
+<itemizedlist>
+  <listitem><para><varname>python.modules.bsddb</varname></para></listitem>
+  <listitem><para><varname>python.modules.curses</varname></para></listitem>
+  <listitem><para><varname>python.modules.curses_panel</varname></para></listitem>
+  <listitem><para><varname>python.modules.crypt</varname></para></listitem>
+  <listitem><para><varname>python.modules.gdbm</varname></para></listitem>
+  <listitem><para><varname>python.modules.sqlite3</varname></para></listitem>
+  <listitem><para><varname>python.modules.tkinter</varname></para></listitem>
+  <listitem><para><varname>python.modules.readline</varname></para></listitem>
+</itemizedlist>
+
+<para>For convenience <varname>python27Full</varname> and <varname>python26Full</varname>
+are provided with all modules included.</para>
+
+<para>
+  Python packages that
+  use <link xlink:href="http://pypi.python.org/pypi/setuptools/"><literal>setuptools</literal></link> or <literal>distutils</literal>,
+  can be built using the <varname>buildPythonPackage</varname> function as documented below.
+</para>
+
+<para>
+ All packages depending on any Python interpreter get appended <varname>$out/${python.sitePackages}</varname>
+ to <literal>$PYTHONPATH</literal> if such directory exists.
+</para>
+
+<variablelist>
+  <title>
+     Useful attributes on interpreters packages:
+  </title>
+
+  <varlistentry>
+    <term><varname>libPrefix</varname></term>
+    <listitem><para>
+        Name of the folder in <literal>${python}/lib/</literal> for corresponding interpreter.
+    </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>interpreter</varname></term>
+    <listitem><para>
+        Alias for <literal>${python}/bin/${executable}.</literal>
+    </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>buildEnv</varname></term>
+    <listitem><para>
+        Function to build python interpreter environments with extra packages bundled together.
+        See <xref linkend="ssec-python-build-env" /> for usage and documentation.
+    </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>sitePackages</varname></term>
+    <listitem><para>
+      Alias for <literal>lib/${libPrefix}/site-packages</literal>.
+    </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>executable</varname></term>
+    <listitem><para>
+      Name of the interpreter executable, ie <literal>python3.4</literal>.
+    </para></listitem>
+  </varlistentry>
+
+</variablelist>
+<section xml:id="ssec-build-python-package"><title><varname>buildPythonPackage</varname> function</title>
+
+  <para>
+  The function is implemented in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/development/python-modules/generic/default.nix">
+  <filename>pkgs/development/python-modules/generic/default.nix</filename></link>.
+  Example usage:
+
+<programlisting language="nix">
+twisted = buildPythonPackage {
+  name = "twisted-8.1.0";
+
+  src = pkgs.fetchurl {
+    url = http://tmrc.mit.edu/mirror/twisted/Twisted/8.1/Twisted-8.1.0.tar.bz2;
+    sha256 = "0q25zbr4xzknaghha72mq57kh53qw1bf8csgp63pm9sfi72qhirl";
+  };
+
+  propagatedBuildInputs = [ self.ZopeInterface ];
+
+  meta = {
+    homepage = http://twistedmatrix.com/;
+    description = "Twisted, an event-driven networking engine written in Python";
+    license = stdenv.lib.licenses.mit;
+  };
+};
+</programlisting>
+
+  Most of Python packages that use <varname>buildPythonPackage</varname> are defined
+  in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/python-packages.nix"><filename>pkgs/top-level/python-packages.nix</filename></link>
+  and generated for each python interpreter separately into attribute sets <varname>python26Packages</varname>,
+  <varname>python27Packages</varname>, <varname>python35Packages</varname>, <varname>python33Packages</varname>,
+  <varname>python34Packages</varname> and <varname>pypyPackages</varname>.
+  </para>
+
+  <para>
+    <function>buildPythonPackage</function> mainly does four things:
+
+    <orderedlist>
+      <listitem><para>
+        In the <varname>buildPhase</varname>, it calls
+        <literal>${python.interpreter} setup.py bdist_wheel</literal> to build a wheel binary zipfile.
+      </para></listitem>
+
+      <listitem><para>
+        In the <varname>installPhase</varname>, it installs the wheel file using
+        <literal>pip install *.whl</literal>.
+      </para></listitem>
+
+      <listitem><para>
+        In the <varname>postFixup</varname> phase, <literal>wrapPythonPrograms</literal>
+        bash function is called to wrap all programs in <filename>$out/bin/*</filename>
+        directory to include <literal>$PYTHONPATH</literal> and <literal>$PATH</literal>
+        environment variables.
+      </para></listitem>
+
+      <listitem><para>
+        In the <varname>installCheck</varname> phase, <literal>${python.interpreter} setup.py test</literal>
+        is ran.
+      </para></listitem>
+    </orderedlist>
+  </para>
+
+  <para>By default <varname>doCheck = true</varname> is set</para>
+
+  <para>
+    As in Perl, dependencies on other Python packages can be specified in the
+    <varname>buildInputs</varname> and
+    <varname>propagatedBuildInputs</varname> attributes.  If something is
+    exclusively a build-time dependency, use
+    <varname>buildInputs</varname>; if it’s (also) a runtime dependency,
+    use <varname>propagatedBuildInputs</varname>.
+  </para>
+
+  <para>
+    By default <varname>meta.platforms</varname> is set to the same value
+    as the interpreter unless overriden otherwise.
+  </para>
+
+  <variablelist>
+    <title>
+      <varname>buildPythonPackage</varname> parameters
+      (all parameters from <varname>mkDerivation</varname> function are still supported)
+    </title>
+
+    <varlistentry>
+      <term><varname>namePrefix</varname></term>
+      <listitem><para>
+        Prepended text to <varname>${name}</varname> parameter.
+        Defaults to <literal>"python3.3-"</literal> for Python 3.3, etc. Set it to
+        <literal>""</literal>
+        if you're packaging an application or a command line tool.
+      </para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><varname>disabled</varname></term>
+      <listitem><para>
+        If <varname>true</varname>, package is not build for
+        particular python interpreter version. Grep around
+        <filename>pkgs/top-level/python-packages.nix</filename>
+        for examples.
+      </para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><varname>setupPyBuildFlags</varname></term>
+      <listitem><para>
+        List of flags passed to <command>setup.py build_ext</command> command.
+      </para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><varname>pythonPath</varname></term>
+      <listitem><para>
+        List of packages to be added into <literal>$PYTHONPATH</literal>.
+        Packages in <varname>pythonPath</varname> are not propagated
+        (contrary to <varname>propagatedBuildInputs</varname>).
+      </para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><varname>preShellHook</varname></term>
+      <listitem><para>
+        Hook to execute commands before <varname>shellHook</varname>.
+      </para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><varname>postShellHook</varname></term>
+      <listitem><para>
+        Hook to execute commands after <varname>shellHook</varname>.
+      </para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><varname>makeWrapperArgs</varname></term>
+      <listitem><para>
+        A list of strings. Arguments to be passed to
+        <varname>makeWrapper</varname>, which wraps generated binaries. By
+        default, the arguments to <varname>makeWrapper</varname> set
+        <varname>PATH</varname> and <varname>PYTHONPATH</varname> 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,
+        <varname>makeWrapperArgs = ["--set FOO BAR" "--set BAZ QUX"]</varname>.
+      </para></listitem>
+    </varlistentry>
+
+  </variablelist>
+
+</section>
+
+<section xml:id="ssec-python-build-env"><title><function>python.buildEnv</function> function</title>
+  <para>
+    Create Python environments using low-level <function>pkgs.buildEnv</function> function. Example <filename>default.nix</filename>:
+
+<programlisting language="nix">
+<![CDATA[with import <nixpkgs> {};
+
+python.buildEnv.override {
+  extraLibs = [ pkgs.pythonPackages.pyramid ];
+  ignoreCollisions = true;
+}]]>
+</programlisting>
+
+    Running <command>nix-build</command> will create
+    <filename>/nix/store/cf1xhjwzmdki7fasgr4kz6di72ykicl5-python-2.7.8-env</filename>
+    with wrapped binaries in <filename>bin/</filename>.
+  </para>
+
+  <para>
+  You can also use <varname>env</varname> attribute to create local
+  environments with needed packages installed (somewhat comparable to
+  <literal>virtualenv</literal>). For example, with the following
+  <filename>shell.nix</filename>:
+
+<programlisting language="nix">
+<![CDATA[with import <nixpkgs> {};
+
+(python3.buildEnv.override {
+  extraLibs = with python3Packages;
+    [ numpy
+      requests
+    ];
+}).env]]>
+</programlisting>
+
+  Running <command>nix-shell</command> will drop you into a shell where
+  <command>python</command> will have specified packages in its path.
+  </para>
+
+  <variablelist>
+    <title>
+      <function>python.buildEnv</function> arguments
+    </title>
+
+    <varlistentry>
+      <term><varname>extraLibs</varname></term>
+      <listitem><para>
+        List of packages installed inside the environment.
+      </para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><varname>postBuild</varname></term>
+      <listitem><para>
+        Shell command executed after the build of environment.
+      </para></listitem>
+    </varlistentry>
+
+    <varlistentry>
+      <term><varname>ignoreCollisions</varname></term>
+      <listitem><para>
+         Ignore file collisions inside the environment (default is <varname>false</varname>).
+      </para></listitem>
+    </varlistentry>
+  </variablelist>
+</section>
+
+<section xml:id="ssec-python-tools"><title>Tools</title>
+
+<para>Packages inside nixpkgs are written by hand. However many tools
+exist in community to help save time. No tool is preferred at the moment.
+</para>
+
+<itemizedlist>
+
+  <listitem><para>
+    <link xlink:href="https://github.com/proger/python2nix">python2nix</link>
+    by Vladimir Kirillov
+  </para></listitem>
+
+  <listitem><para>
+    <link xlink:href="https://github.com/garbas/pypi2nix">pypi2nix</link>
+    by Rok Garbas
+  </para></listitem>
+
+  <listitem><para>
+    <link xlink:href="https://github.com/offlinehacker/pypi2nix">pypi2nix</link>
+    by Jaka Hudoklin
+  </para></listitem>
+
+</itemizedlist>
+
+</section>
+
+<section xml:id="ssec-python-development"><title>Development</title>
+
+  <para>
+    To develop Python packages <function>buildPythonPackage</function> has
+    additional logic inside <varname>shellPhase</varname> to run
+    <command>pip install -e . --prefix $TMPDIR/</command> for the package.
+  </para>
+
+  <warning><para><varname>shellPhase</varname> is executed only if <filename>setup.py</filename>
+  exists.</para></warning>
+
+  <para>
+    Given a <filename>default.nix</filename>:
+
+<programlisting language="nix">
+<![CDATA[with import <nixpkgs> {};
+
+buildPythonPackage {
+  name = "myproject";
+
+  buildInputs = with pkgs.pythonPackages; [ pyramid ];
+
+  src = ./.;
+}]]>
+</programlisting>
+
+    Running <command>nix-shell</command> with no arguments should give you
+    the environment in which the package would be build with
+    <command>nix-build</command>.
+  </para>
+
+  <para>
+    Shortcut to setup environments with C headers/libraries and python packages:
+
+    <programlisting language="bash">$ nix-shell -p pythonPackages.pyramid zlib libjpeg git</programlisting>
+  </para>
+
+  <note><para>
+    There is a boolean value <varname>lib.inNixShell</varname> set to
+    <varname>true</varname> if nix-shell is invoked.
+  </para></note>
+
+</section>
+
+<section xml:id="ssec-python-faq"><title>FAQ</title>
+
+<variablelist>
+
+  <varlistentry>
+    <term>How to solve circular dependencies?</term>
+    <listitem><para>
+      If you have packages <varname>A</varname> and <varname>B</varname> that
+      depend on each other, when packaging <varname>B</varname> override package
+      <varname>A</varname> not to depend on <varname>B</varname> as input
+      (and also the other way around).
+    </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term><varname>install_data / data_files</varname> problems resulting into <literal>error: could not create '/nix/store/6l1bvljpy8gazlsw2aw9skwwp4pmvyxw-python-2.7.8/etc': Permission denied</literal></term>
+    <listitem><para>
+      <link xlink:href="https://bitbucket.org/pypa/setuptools/issue/130/install_data-doesnt-respect-prefix">
+      Known bug in setuptools <varname>install_data</varname> does not respect --prefix</link>. Example of
+      such package using the feature is <filename>pkgs/tools/X11/xpra/default.nix</filename>. As workaround
+      install it as an extra <varname>preInstall</varname> step:
+
+      <programlisting>${python.interpreter} setup.py install_data --install-dir=$out --root=$out
+sed -i '/ = data_files/d' setup.py</programlisting>
+    </para></listitem>
+  </varlistentry>
+
+  <varlistentry>
+    <term>Rationale of non-existent global site-packages</term>
+    <listitem><para>
+      There is no need to have global site-packages in Nix. Each package has isolated
+      dependency tree and installing any python package will only populate <varname>$PATH</varname>
+      inside user environment. See <xref linkend="ssec-python-build-env" /> to create self-contained
+      interpreter with a set of packages.
+    </para></listitem>
+  </varlistentry>
+
+</variablelist>
+
+</section>
+
+
+<section xml:id="ssec-python-contrib"><title>Contributing guidelines</title>
+<para>
+  Following rules are desired to be respected:
+</para>
+
+<itemizedlist>
+
+  <listitem><para>
+    Make sure package builds for all python interpreters. Use <varname>disabled</varname> argument to
+    <function>buildPythonPackage</function> to set unsupported interpreters.
+  </para></listitem>
+
+  <listitem><para>
+    If tests need to be disabled for a package, make sure you leave a comment about reasoning.
+  </para></listitem>
+
+  <listitem><para>
+    Packages in <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/top-level/python-packages.nix"><filename>pkgs/top-level/python-packages.nix</filename></link>
+    are sorted quasi-alphabetically to avoid merge conflicts.
+  </para></listitem>
+
+</itemizedlist>
+
+</section>
+
+</section>
+

From a90196d4cda5fac99bf60c5a254e5bc02b58e71e Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 6 Mar 2016 00:56:53 +0100
Subject: [PATCH 2225/2285] nvidia_x11_legacy304: fix evaluation

nvidia-340.76-kernel-4.0.patch was removed from nvidia_x11_legacy340
54d342add8ab512c5650e1b2da25708622dd327d but is still needed for 304.

I think. CC @vcunat.
---
 .../nvidia-x11/nvidia-340.76-kernel-4.0.patch | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch

diff --git a/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch b/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch
new file mode 100644
index 000000000000..5fdc1fed7272
--- /dev/null
+++ b/pkgs/os-specific/linux/nvidia-x11/nvidia-340.76-kernel-4.0.patch
@@ -0,0 +1,28 @@
+--- a/kernel/nv-pat.c	2015-07-03 08:39:35.417031728 +0200
++++ b/kernel/nv-pat.c	2015-07-03 08:42:15.631838988 +0200
+@@ -35,8 +35,13 @@
+     unsigned long cr0 = read_cr0();
+     write_cr0(((cr0 & (0xdfffffff)) | 0x40000000));
+     wbinvd();
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
+     *cr4 = read_cr4();
+     if (*cr4 & 0x80) write_cr4(*cr4 & ~0x80);
++#else
++    *cr4 = __read_cr4();
++    if (*cr4 & 0x80) __write_cr4(*cr4 & ~0x80);
++#endif
+     __flush_tlb();
+ }
+
+@@ -46,7 +51,11 @@
+     wbinvd();
+     __flush_tlb();
+     write_cr0((cr0 & 0x9fffffff));
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 18, 0)
+     if (cr4 & 0x80) write_cr4(cr4);
++#else
++    if (cr4 & 0x80) __write_cr4(cr4);
++#endif
+ }
+
+ static int nv_determine_pat_mode(void)

From 225edbd9b599d0634fc7e68a7a84739d6e1ef185 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Wed, 2 Mar 2016 06:39:02 +0100
Subject: [PATCH 2226/2285] ms-sys: 2.5.2 -> 2.5.3

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

diff --git a/pkgs/tools/misc/ms-sys/default.nix b/pkgs/tools/misc/ms-sys/default.nix
index c0b1de6c1e8c..4d6a317276a0 100644
--- a/pkgs/tools/misc/ms-sys/default.nix
+++ b/pkgs/tools/misc/ms-sys/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "ms-sys-${version}";
-  version = "2.5.2";
+  version = "2.5.3";
  
   src = fetchurl {
     url = "mirror://sourceforge/ms-sys/${name}.tar.gz";
-    sha256 = "0c7ld5pglcacnrvy2gzzg1ny1jyknlj9iz1mvadq3hn8ai1d83px";
+    sha256 = "0mijf82cbji4laip6hiy3l5ka5mzq5sivjvyv7wxnc2fd3v7hgp0";
   };
 
   buildInputs = [ gettext ];
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" ];
 
   meta = with stdenv.lib; {
-    description = "A program for writing Microsoft compatible boot records";
+    description = "A program for writing Microsoft-compatible boot records";
     homepage = http://ms-sys.sourceforge.net/;
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [ nckx ];

From d5eb96938ad20254d91134fb0c40a28cee01969a Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 5 Mar 2016 23:19:40 +0100
Subject: [PATCH 2227/2285] sane-backends-git -> 2016-03-05

---
 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 0e4d7ae1b83f..84e1f783e2a3 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-02-25";
+  version = "2016-03-05";
   src = fetchgit {
-    sha256 = "842b1186d38de14221be514a58f77c23d9f83979ea45f846440cf9cbb1f26c1f";
-    rev = "c5117ed0f1b522eab10fd2248f140b2acad2a708";
+    sha256 = "dc84530d5e0233427acfd132aa08a4cf9973c936ff72a66ee08ecf836200d367";
+    rev = "23eb95582da718791103b83ea002e947caa0f5fc";
     url = "git://alioth.debian.org/git/sane/sane-backends.git";
   };
 })

From 7951dd531eb29794d4258507dc2a50c579a003d4 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 5 Mar 2016 23:43:28 +0100
Subject: [PATCH 2228/2285] mcelog: 132 -> 133

Bugfix: no longer hangs on unknown errors in non-daemon mode.
---
 pkgs/os-specific/linux/mcelog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/mcelog/default.nix b/pkgs/os-specific/linux/mcelog/default.nix
index 9b347a8da54b..a30558092c32 100644
--- a/pkgs/os-specific/linux/mcelog/default.nix
+++ b/pkgs/os-specific/linux/mcelog/default.nix
@@ -2,10 +2,10 @@
 
 stdenv.mkDerivation rec {
   name = "mcelog-${version}";
-  version = "132";
+  version = "133";
 
   src = fetchFromGitHub {
-    sha256 = "0qr0rdkva8a8wzsdmk0dm9zhpdnwp1lmla324xnayf0afyym3zj8";
+    sha256 = "1qj9jz67bd834sgqcxhyhn9fzxg8y9vfw7gmza5ikmjm6yi6mmfr";
     rev = "v${version}";
     repo = "mcelog";
     owner = "andikleen";

From b61e7c2610384eb905712d0e7398cbc5d1d92b49 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sat, 5 Mar 2016 23:51:24 +0100
Subject: [PATCH 2229/2285] libpsl: 0.12.0 -> 0.13.0

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

diff --git a/pkgs/development/libraries/libpsl/default.nix b/pkgs/development/libraries/libpsl/default.nix
index d1da2bbf3aac..231216cbc698 100644
--- a/pkgs/development/libraries/libpsl/default.nix
+++ b/pkgs/development/libraries/libpsl/default.nix
@@ -11,14 +11,14 @@ let
     owner = "publicsuffix";
   };
 
-  libVersion = "0.12.0";
+  libVersion = "0.13.0";
 
 in stdenv.mkDerivation rec {
   name = "libpsl-${version}";
   version = "${libVersion}-list-${listVersion}";
 
   src = fetchFromGitHub {
-    sha256 = "13w3lc752az2swymg408f3w2lbqs0f2h5ri6d5jw1vv9z0ij9xlw";
+    sha256 = "12inl984r2qks51wyrzgll83y7k79q2lbhyc545dpk19qnfvp7gz";
     rev = "libpsl-${libVersion}";
     repo = "libpsl";
     owner = "rockdaboot";

From b747253700d40c0a3abcb595bdcbf102709cc4f0 Mon Sep 17 00:00:00 2001
From: Tobias Geerinckx-Rice <tobias.geerinckx.rice@gmail.com>
Date: Sun, 6 Mar 2016 00:00:31 +0100
Subject: [PATCH 2230/2285] borgbackup: 0.30.0 -> 1.0.0

Major upgrade, be sure to read the release notes:
https://github.com/borgbackup/borg/blob/1.0.0/docs/changes.rst
---
 pkgs/tools/backup/borg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/backup/borg/default.nix b/pkgs/tools/backup/borg/default.nix
index 208c3d4b1aa6..b46ea186dee3 100644
--- a/pkgs/tools/backup/borg/default.nix
+++ b/pkgs/tools/backup/borg/default.nix
@@ -2,12 +2,12 @@
 
 python3Packages.buildPythonApplication rec {
   name = "borgbackup-${version}";
-  version = "0.30.0";
+  version = "1.0.0";
   namePrefix = "";
 
   src = fetchurl {
     url = "https://pypi.python.org/packages/source/b/borgbackup/borgbackup-${version}.tar.gz";
-    sha256 = "0n78c982kdfqbyi9jawcvzgdik4l36c2s7rpzkfr1ka6506k2rx4";
+    sha256 = "0wa6cvqs3rni5nwrgagigchcly8a53rxk56z0zn8iaii2cqrw2sh";
   };
 
   nativeBuildInputs = with python3Packages; [

From 0bf8a1a86df67649893726d50761567121330006 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Sun, 6 Mar 2016 05:06:24 +0300
Subject: [PATCH 2231/2285] crawl: cleanup

---
 pkgs/games/crawl/default.nix    | 4 +---
 pkgs/top-level/all-packages.nix | 8 ++++----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix
index e6a1eb2c1a62..0b9287faf370 100644
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@@ -1,6 +1,6 @@
 { stdenv, fetchFromGitHub, which, sqlite, lua5_1, perl, zlib, pkgconfig, ncurses
 , dejavu_fonts, libpng, SDL2, SDL2_image, mesa, freetype
-, tileMode ? true
+, tileMode ? false
 }:
 
 let version = "0.17.1";
@@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
   preBuild = ''
     cd crawl-ref/source
     echo "${version}" > util/release_ver
-    # Related to issue #1963
-    sed -i 's/-fuse-ld=gold//g' Makefile
     for i in util/*; do
       patchShebangs $i
     done
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a370802389a4..c540ff849c8a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14449,12 +14449,12 @@ let
   crafty = callPackage ../games/crafty { };
   craftyFull = appendToName "full" (crafty.override { fullVariant = true; });
 
-  crawlTiles = callPackage ../games/crawl { };
-
-  crawl = callPackage ../games/crawl {
-    tileMode = false;
+  crawlTiles = crawl.override {
+    tileMode = true;
   };
 
+  crawl = callPackage ../games/crawl { };
+
   crrcsim = callPackage ../games/crrcsim {};
 
   cuyo = callPackage ../games/cuyo { };

From 2843d8390593b55651573809b40c426ab6c3d0d2 Mon Sep 17 00:00:00 2001
From: Kevin Cox <kevincox@kevincox.ca>
Date: Mon, 22 Feb 2016 17:25:50 -0500
Subject: [PATCH 2232/2285] Mesos: 26.0 -> 27.1

---
 .../networking/cluster/mesos/default.nix      | 21 ++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix
index 25bd659d63af..86b82db60e14 100644
--- a/pkgs/applications/networking/cluster/mesos/default.nix
+++ b/pkgs/applications/networking/cluster/mesos/default.nix
@@ -1,7 +1,8 @@
 { stdenv, lib, makeWrapper, fetchurl, curl, sasl, openssh, autoconf
 , automake115x, libtool, unzip, gnutar, jdk, maven, python, wrapPython
-, setuptools, boto, pythonProtobuf, apr, subversion, gzip
+, setuptools, boto, pythonProtobuf, apr, subversion, gzip, systemd
 , leveldb, glog, perf, utillinux, libnl, iproute, openssl, libevent
+, bash
 }:
 
 let
@@ -9,14 +10,15 @@ let
   soext = if stdenv.system == "x86_64-darwin" then "dylib" else "so";
 
 in stdenv.mkDerivation rec {
-  version = "0.26.0";
+  version = "0.27.1";
   name = "mesos-${version}";
 
+  enableParallelBuilding = true;
   dontDisableStatic = true;
 
   src = fetchurl {
     url = "mirror://apache/mesos/${version}/${name}.tar.gz";
-    sha256 = "0csvaql9gky15w23gmiw6cvlfnrlhfxvdqd2pv3j3grr44ph0ab5";
+    sha256 = "147iq7vwi09kqblx1h8r6lkrg9g50i257qk1cph1zr5j3rncz7l8";
   };
 
   patches = [
@@ -70,6 +72,15 @@ in stdenv.mkDerivation rec {
       --replace '"ip ' '"${iproute}/bin/ip '   \
       --replace '"mount ' '"${utillinux}/bin/mount ' \
       --replace '/bin/sh' "${stdenv.shell}"
+    
+    substituteInPlace src/launcher/executor.cpp \
+      --replace '"sh"' '"${bash}/bin/bash"'
+    
+    substituteInPlace src/slave/containerizer/mesos/launch.cpp \
+      --replace '"sh"' '"${bash}/bin/bash"'
+    
+    substituteInPlace src/linux/systemd.cpp \
+      --replace 'os::realpath("/sbin/init")' '"${systemd}/lib/systemd/systemd"'
   '';
 
   configureFlags = [
@@ -114,7 +125,7 @@ in stdenv.mkDerivation rec {
     rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py*
     popd
 
-    # optional python dependency for mesos cli 
+    # optional python dependency for mesos cli
     pushd src/python/cli
     ${python}/bin/${python.executable} setup.py install \
       --install-lib=$out/lib/${python.libPrefix}/site-packages \
@@ -150,7 +161,7 @@ in stdenv.mkDerivation rec {
     homepage    = "http://mesos.apache.org";
     license     = licenses.asl20;
     description = "A cluster manager that provides efficient resource isolation and sharing across distributed applications, or frameworks";
-    maintainers = with maintainers; [ cstrahan offline rushmorem ];
+    maintainers = with maintainers; [ cstrahan kevincox offline rushmorem ];
     platforms   = platforms.linux;
   };
 }

From bb39304ce6169ca0c7f421f15cb1b0c378999b7e Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Sat, 5 Mar 2016 23:56:32 -0500
Subject: [PATCH 2233/2285] openssh: use bin instead of sbin folder

References #11939.
---
 nixos/modules/services/networking/ssh/sshd.nix | 2 +-
 pkgs/tools/networking/openssh/default.nix      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 20a1777f3ccb..5971a5a250d3 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -263,7 +263,7 @@ in
 
             serviceConfig =
               { ExecStart =
-                  "${cfgc.package}/sbin/sshd " + (optionalString cfg.startWhenNeeded "-i ") +
+                  "${cfgc.package}/bin/sshd " + (optionalString cfg.startWhenNeeded "-i ") +
                   "-f ${pkgs.writeText "sshd_config" cfg.extraConfig}";
                 KillMode = "process";
               } // (if cfg.startWhenNeeded then {
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 4d3ffb1257f9..f2a7642ea554 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -46,6 +46,7 @@ stdenv.mkDerivation rec {
   # I set --disable-strip because later we strip anyway. And it fails to strip
   # properly when cross building.
   configureFlags = [
+    "--sbindir=\${out}/bin"
     "--localstatedir=/var"
     "--with-pid-dir=/run"
     "--with-mantype=man"

From 54c7ef17a913fde534a22edbe5557aa24d1f4847 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 6 Mar 2016 09:39:22 +0100
Subject: [PATCH 2234/2285] eclipse-plugin-checkstyle: 6.14.0 -> 6.16.0

---
 pkgs/applications/editors/eclipse/plugins.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/plugins.nix b/pkgs/applications/editors/eclipse/plugins.nix
index 50975d061eb8..3bde9b1434c6 100644
--- a/pkgs/applications/editors/eclipse/plugins.nix
+++ b/pkgs/applications/editors/eclipse/plugins.nix
@@ -171,12 +171,12 @@ rec {
 
   checkstyle = buildEclipseUpdateSite rec {
     name = "checkstyle-${version}";
-    version = "6.14.0.201601142217";
+    version = "6.16.0.201603042325";
 
     src = fetchzip {
       stripRoot = false;
-      url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/6.14.0/net.sf.eclipsecs-updatesite_${version}-bin.zip";
-      sha256 = "0ysxir1fv0mb9xnidc9hv6llnk48lkav0sryjbx7pw7vy1f8nd4c";
+      url = "mirror://sourceforge/project/eclipse-cs/Eclipse%20Checkstyle%20Plug-in/6.16.0/net.sf.eclipsecs-updatesite_${version}.zip";
+      sha256 = "0bm1linyw82bryblyabcx89zqw1ingh8mx62bwp3qj05yc9ksnly";
     };
 
     meta = with stdenv.lib; {

From 3ab6d7b5a115a16ba41afdc12bc3afa1c6aabf67 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 6 Mar 2016 09:53:44 +0100
Subject: [PATCH 2235/2285] perl-CGI: 4.26 -> 4.27

---
 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 18ef6145df0f..a73bcca74544 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -1416,10 +1416,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   CGI = buildPerlPackage rec {
-    name = "CGI-4.26";
+    name = "CGI-4.27";
     src = fetchurl {
       url = "mirror://cpan/authors/id/L/LE/LEEJO/${name}.tar.gz";
-      sha256 = "0k8rcmgl9ysk6h4racd5sximida5ypn8fdzi7q34rpq4l7xqcm2n";
+      sha256 = "0rjif2z44lnfk4hkf95mq52nsgvlgjdigabjpx3v697lfibhx37c";
     };
     buildInputs = [ TestDeep TestWarn ];
     propagatedBuildInputs = [ HTMLParser self."if" ];

From b1b85ddb816a92dc89ee860de206cf12d6a9ec47 Mon Sep 17 00:00:00 2001
From: Mathieu Boespflug <m@tweag.io>
Date: Sun, 6 Mar 2016 10:35:25 +0100
Subject: [PATCH 2236/2285] buildStackPackage: Fix path to
 generic-stack-builder.nix.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Before:

```
error: getting status of
‘/home/user/nixpkgs/pkgs/development/development/haskell-modules/generic-stack-builder.nix’:
No such file or directory
```
---
 pkgs/development/haskell-modules/lib.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/lib.nix b/pkgs/development/haskell-modules/lib.nix
index 59020264b3c5..a4db98f2e618 100644
--- a/pkgs/development/haskell-modules/lib.nix
+++ b/pkgs/development/haskell-modules/lib.nix
@@ -81,7 +81,7 @@ rec {
 
   buildStrictly = pkg: buildFromSdist (appendConfigureFlag pkg "--ghc-option=-Wall --ghc-option=-Werror");
 
-  buildStackProject = pkgs.callPackage ../development/haskell-modules/generic-stack-builder.nix { };
+  buildStackProject = pkgs.callPackage ./generic-stack-builder.nix { };
 
   triggerRebuild = drv: i: overrideCabal drv (drv: { postUnpack = ": trigger rebuild ${toString i}"; });
 

From 4074042744c383d9cfe8fb602c79a2584c814223 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 6 Mar 2016 10:52:46 +0100
Subject: [PATCH 2237/2285] perl-Sub-Name: 0.0502 -> 0.14

Also clean up meta section and add myself as maintainer.
---
 pkgs/top-level/perl-packages.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index a73bcca74544..89b5236f11de 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -10796,14 +10796,17 @@ let self = _self // overrides; _self = with self; {
     };
   };
 
-  SubName = buildPerlPackage {
-    name = "Sub-Name-0.0502";
+  SubName = buildPerlPackage rec {
+    name = "Sub-Name-0.14";
     src = fetchurl {
-      url = mirror://cpan/authors/id/C/CH/CHIPS/Sub-Name-0.0502.tar.gz;
-      sha256 = "1r197binpdy4xfh65qkxxvi9c39pmvvcny4rl8a7zrk1jcws6fac";
+      url = "mirror://cpan/authors/id/E/ET/ETHER/${name}.tar.gz";
+      sha256 = "9276412677b445e7e9bdf6ab3a034a05a860e5c5dc560dd9272967745eeb3f17";
     };
     meta = {
-      description = "(Re)name a sub";
+      homepage = https://github.com/karenetheridge/Sub-Name;
+      description = "(re)name a sub";
+      license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ];
+      maintainers = [ maintainers.rycee ];
     };
   };
 

From d541d47e076e7204701afc261ad12a2ba263a839 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 6 Mar 2016 10:53:20 +0100
Subject: [PATCH 2238/2285] perl-Moo: 2.000002 -> 2.001001

---
 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 89b5236f11de..af668f5251a2 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -7688,10 +7688,10 @@ let self = _self // overrides; _self = with self; {
   };
 
   Moo = buildPerlPackage rec {
-    name = "Moo-2.000002";
+    name = "Moo-2.001001";
     src = fetchurl {
       url = "mirror://cpan/authors/id/H/HA/HAARG/${name}.tar.gz";
-      sha256 = "fb4bfa751f0dd06bd70f2e06e811f85a640501f263c228a8efafbf6b26691fd4";
+      sha256 = "a68155b642f389cb1cc40139e2663d0c5d15eb71d9ecb0961623a73c10dd8ec0";
     };
     buildInputs = [ TestFatal ];
     propagatedBuildInputs = [ ClassMethodModifiers DevelGlobalDestruction ModuleRuntime RoleTiny ];

From af4e8a4d3b4da1dfb91784dfd2290f5ba39be4b9 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 6 Mar 2016 00:59:08 +0100
Subject: [PATCH 2239/2285] manual/installing: add loadkeys hint

Closes #13702 and fixes #3132.
(Tiny changes by vcunat.)
---
 nixos/doc/manual/installation/installing.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml
index 9aec57fb6d5a..7e71df28cdb3 100644
--- a/nixos/doc/manual/installation/installing.xml
+++ b/nixos/doc/manual/installation/installing.xml
@@ -22,7 +22,10 @@
   (with empty password).</para></listitem>
 
   <listitem><para>If you downloaded the graphical ISO image, you can
-  run <command>start display-manager</command> to start KDE.</para></listitem>
+  run <command>start display-manager</command> to start KDE. If you
+  want to continue on the terminal, you can use
+  <command>loadkeys</command> to switch to your preferred keyboard layout.
+  (We even provide neo2 via <command>loadkeys de neo</command>!)</para></listitem>
 
   <listitem><para>The boot process should have brought up networking (check
   <command>ip a</command>).  Networking is necessary for the

From a458a9f78fe1649eae1c011a1572979b70500875 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 6 Mar 2016 11:12:23 +0100
Subject: [PATCH 2240/2285] curl: use an official download link

It works now that we have e6f61b4cf33.
---
 pkgs/tools/networking/curl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix
index c75cceb46a57..c59ea619942d 100644
--- a/pkgs/tools/networking/curl/default.nix
+++ b/pkgs/tools/networking/curl/default.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
   name = "curl-7.47.1";
 
   src = fetchurl {
-    url = "http://ngcobalt13.uxnr.de/mirror/curl/${name}.tar.bz2";
+    url = "http://curl.haxx.se/download/${name}.tar.bz2";
     sha256 = "13z9gba3q2ybp50z0gdkzhwcx9m0i7qkvm278yz4pql2jfml7inx";
   };
 

From 5ac1de516e3de6e036a079bcdc4fe949ac3d3d0a Mon Sep 17 00:00:00 2001
From: Hoang Xuan Phu <phuhimself@phunehehe.net>
Date: Sun, 6 Mar 2016 15:08:33 +0800
Subject: [PATCH 2241/2285] archiveopteryx: override specific build settings
 instead of PREFIX

Closes #13708 and fixes #13707.
---
 pkgs/servers/mail/archiveopteryx/default.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/mail/archiveopteryx/default.nix b/pkgs/servers/mail/archiveopteryx/default.nix
index 966f90c40f13..bb2ab16ae668 100644
--- a/pkgs/servers/mail/archiveopteryx/default.nix
+++ b/pkgs/servers/mail/archiveopteryx/default.nix
@@ -11,12 +11,18 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ jam ];
   buildInputs = [ openssl perl zlib ];
 
-  preConfigure = ''export PREFIX="$out" '';
+  preConfigure = ''
+    export INSTALLROOT=installroot
+    sed -i 's:BINDIR = $(PREFIX)/bin:BINDIR = '$out'/bin:' ./Jamsettings
+    sed -i 's:SBINDIR = $(PREFIX)/sbin:SBINDIR = '$out'/bin:' ./Jamsettings
+    sed -i 's:LIBDIR = $(PREFIX)/lib:LIBDIR = '$out'/lib:' ./Jamsettings
+    sed -i 's:MANDIR = $(PREFIX)/man:MANDIR = '$out'/share/man:' ./Jamsettings
+    sed -i 's:READMEDIR = $(PREFIX):READMEDIR = '$out'/share/doc/archiveopteryx:' ./Jamsettings
+  '';
   buildPhase = ''jam "-j$NIX_BUILD_CORES" '';
   installPhase = ''
     jam install
-    mkdir -p "$out/share/doc/archiveopteryx"
-    mv -t "$out/share/doc/archiveopteryx/" "$out"/{bsd.txt,COPYING,README}
+    mv installroot/$out $out
   '';
 
   meta = with stdenv.lib; {

From 14e6b7aeb9df36b26914a32061f37930ce0367bc Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Sun, 6 Mar 2016 12:11:40 +0000
Subject: [PATCH 2242/2285] unbound: 1.5.7 -> 1.5.8

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

diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 4819c004c1b8..4ada77e14b6a 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "unbound-${version}";
-  version = "1.5.7";
+  version = "1.5.8";
 
   src = fetchurl {
     url = "http://unbound.net/downloads/${name}.tar.gz";
-    sha256 = "1a0wfgp6wqpf7cxlcbprqhnjx6z9ywf0rhrpcf7x98l1mbjqh82b";
+    sha256 = "33567a20f73e288f8daa4ec021fbb30fe1824b346b34f12677ad77899ecd09be";
   };
 
   buildInputs = [ openssl expat libevent ];

From 7135553cf1ed6b033d6167ea8b2d5b4a30508674 Mon Sep 17 00:00:00 2001
From: Marius Bakke <m.bakke@warwick.ac.uk>
Date: Sun, 6 Mar 2016 12:50:41 +0000
Subject: [PATCH 2243/2285] unbound: drop sbin directory

---
 nixos/modules/services/networking/unbound.nix | 2 +-
 pkgs/tools/networking/unbound/default.nix     | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
index e154aed0843a..89762fe52488 100644
--- a/nixos/modules/services/networking/unbound.nix
+++ b/nixos/modules/services/networking/unbound.nix
@@ -113,7 +113,7 @@ in
       '';
 
       serviceConfig = {
-        ExecStart = "${pkgs.unbound}/sbin/unbound -d -c ${stateDir}/unbound.conf";
+        ExecStart = "${pkgs.unbound}/bin/unbound -d -c ${stateDir}/unbound.conf";
         ExecStopPost="${pkgs.utillinux}/bin/umount ${stateDir}/dev/random";
       };
     };
diff --git a/pkgs/tools/networking/unbound/default.nix b/pkgs/tools/networking/unbound/default.nix
index 4ada77e14b6a..edbf32bb775a 100644
--- a/pkgs/tools/networking/unbound/default.nix
+++ b/pkgs/tools/networking/unbound/default.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
     "--with-libevent=${libevent}"
     "--localstatedir=/var"
     "--sysconfdir=/etc"
+    "--sbindir=\${out}/bin"
     "--enable-pie"
     "--enable-relro-now"
   ];

From fe37f2893976dbcb417adda19f5d0aa91d92fd7a Mon Sep 17 00:00:00 2001
From: Joachim Fasting <joachifm@fastmail.fm>
Date: Sun, 6 Mar 2016 14:04:37 +0100
Subject: [PATCH 2244/2285] pixie: fix description

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

diff --git a/pkgs/development/interpreters/pixie/default.nix b/pkgs/development/interpreters/pixie/default.nix
index 85af751809c6..c4086078d7d6 100644
--- a/pkgs/development/interpreters/pixie/default.nix
+++ b/pkgs/development/interpreters/pixie/default.nix
@@ -70,7 +70,7 @@ let
         --prefix PATH : ${bin-path}
     '';
     meta = {
-      description = "Pixie is a clojure-like lisp, built with the pypy vm toolkit.";
+      description = "A clojure-like lisp, built with the pypy vm toolkit";
       homepage = "https://github.com/pixie-lang/pixie";
       license = stdenv.lib.licenses.lgpl3;
       platforms = stdenv.lib.platforms.linux;

From ee9b151f5b9f880fa1d2b01268e5e7130c015fea Mon Sep 17 00:00:00 2001
From: Kevin Cox <kevincox@kevincox.ca>
Date: Sun, 6 Mar 2016 08:04:32 -0500
Subject: [PATCH 2245/2285] marathon: 0.15.1 -> 0.15.3

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

diff --git a/pkgs/applications/networking/cluster/marathon/default.nix b/pkgs/applications/networking/cluster/marathon/default.nix
index ac666030897b..11c275c9f490 100644
--- a/pkgs/applications/networking/cluster/marathon/default.nix
+++ b/pkgs/applications/networking/cluster/marathon/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "marathon-${version}";
-  version = "0.15.1";
+  version = "0.15.3";
 
   src = fetchurl {
     url = "https://downloads.mesosphere.io/marathon/v${version}/marathon-${version}.tgz";
-    sha256 = "1ch3nvcwj7pzjjqw4k07gdf7nmdbfkks5j07wl3518bagjqrajj2";
+    sha256 = "1br4k596sjp4cf5l2nyaqhlsfdr443n08fvdyf4kilhr803x2rjq";
   };
 
   buildInputs = [ makeWrapper jdk mesos ];
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     homepage = https://mesosphere.github.io/marathon;
     description = "Cluster-wide init and control system for services in cgroups or Docker containers";
     license = licenses.asl20;
-    maintainers = with maintainers; [ rushmorem kamilchm ];
+    maintainers = with maintainers; [ rushmorem kamilchm kevincox ];
     platforms = platforms.linux;
   };
 }

From 65dd28c5697b5967eb963431c830944373e0f9b1 Mon Sep 17 00:00:00 2001
From: Maxwell <mhuan13@gmail.com>
Date: Sat, 5 Mar 2016 22:21:50 -0500
Subject: [PATCH 2246/2285] xdo from 0.3 -> 0.5

This incorporates a number of bugfixes, as well as adding the
`below` and `above` actions

Also moved package from fetchurl to fetchFromGitHub
---
 pkgs/tools/misc/xdo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/xdo/default.nix b/pkgs/tools/misc/xdo/default.nix
index e7a3d91967e6..26a5b485bf61 100644
--- a/pkgs/tools/misc/xdo/default.nix
+++ b/pkgs/tools/misc/xdo/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, libxcb, xcbutilwm }:
 
 stdenv.mkDerivation rec {
-   name = "xdo-0.3";
+   name = "xdo-0.5";
 
    src = fetchurl {
-     url = "https://github.com/baskerville/xdo/archive/0.3.tar.gz";
-     sha256 = "128flaydag9ixsai87p85r84arg2pn1j9h3zgdjwlmbcpb8d4ia8";
+     url = "https://github.com/baskerville/xdo/archive/0.5.tar.gz";
+     sha256 = "0sjnjs12i0gp1dg1m5jid4a3bg9am4qkf0qafyp6yn176yzcz1i6";
    };
 
    prePatch = ''sed -i "s@/usr/local@$out@" Makefile'';

From 56705a1fa372cc5948572feba2b4b0ec0ed20648 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.git@hrdinka.at>
Date: Sun, 6 Mar 2016 15:04:16 +0100
Subject: [PATCH 2247/2285] retrofe: fix gstreamer plugin path

---
 pkgs/misc/emulators/retrofe/default.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/misc/emulators/retrofe/default.nix b/pkgs/misc/emulators/retrofe/default.nix
index bf3091d1d706..a13cc49b5720 100644
--- a/pkgs/misc/emulators/retrofe/default.nix
+++ b/pkgs/misc/emulators/retrofe/default.nix
@@ -2,11 +2,7 @@
 , python, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, sqlite, zlib
 }:
 
-let
-  gstPlugins = with gst_all_1; [ gst-libav gst-plugins-base gst-plugins-good ];
-  GST_PLUGIN_PATH = stdenv.lib.makeSearchPath "lib/gstreamer-1.0" gstPlugins;
-
-in stdenv.mkDerivation rec {
+stdenv.mkDerivation rec {
   name = "retrofe-${version}";
   version = "0.6.169";
 
@@ -20,7 +16,7 @@ in stdenv.mkDerivation rec {
 
   buildInputs = [
     glib gst_all_1.gstreamer SDL2 SDL2_image SDL2_mixer SDL2_ttf sqlite zlib
-  ] ++ gstPlugins;
+  ] ++ (with gst_all_1; [ gst-libav gst-plugins-base gst-plugins-good ]);
 
   patches = [ ./include-paths.patch ];
 
@@ -58,22 +54,24 @@ in stdenv.mkDerivation rec {
     EOF
 
     chmod +x $out/bin/retrofe-init
+
+    runHook postInstall
   '';
 
   # retrofe will look for config files in its install path ($out/bin).
   # When set it will use $RETROFE_PATH instead. Sadly this behaviour isn't
   # documented well. To make it behave more like as expected it's set to
   # $PWD by default here.
-  fixupPhase = ''
+  postInstall = ''
     wrapProgram "$out/bin/retrofe" \
-      --prefix GST_PLUGIN_PATH : '${GST_PLUGIN_PATH}/lib/gstreamer-1.0' \
+      --prefix GST_PLUGIN_PATH : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
       --set    RETROFE_PATH      "\''${RETROFE_PATH:-\$PWD}"
   '';
 
   meta = with stdenv.lib; {
     description = "A frontend for arcade cabinets and media PCs";
-    license = licenses.gpl3Plus;
     homepage = http://retrofe.com;
+    license = licenses.gpl3Plus;
     maintainers = with maintainers; [ hrdinka ];
   };
 }

From 0d459431672f2b14804be1f0cba385e1531c9c95 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Thu, 25 Feb 2016 12:27:18 +0100
Subject: [PATCH 2248/2285] sshfsFuse: 2.5 -> 2.6

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

diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix
index a5b01db4cd2a..5e1b8db69128 100644
--- a/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix
@@ -1,14 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, glib, fuse }:
+{ stdenv, fetchFromGitHub, pkgconfig, glib, fuse, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "sshfs-fuse-2.5";
+  name = "sshfs-fuse-2.6";
   
-  src = fetchurl {
-    url = "mirror://sourceforge/fuse/${name}.tar.gz";
-    sha256 = "0gp6qr33l2p0964j0kds0dfmvyyf5lpgsn11daf0n5fhwm9185z9";
+  src = fetchFromGitHub {
+    repo = "sshfs";
+    owner = "libfuse";
+    rev = "sshfs_2_6";
+    sha256 = "08ffvviinjf8ncs8z494q739a8lky9z46i09ghj1y38qzgvk3fpw";
   };
   
-  buildInputs = [ pkgconfig glib fuse ];
+  buildInputs = [ pkgconfig glib fuse autoreconfHook ];
+
   postInstall = ''
     mkdir -p $out/sbin
     ln -sf $out/bin/sshfs $out/sbin/mount.sshfs

From d80811d881ca35f5771b5922b0d8b212d1c90db1 Mon Sep 17 00:00:00 2001
From: Jakub Skrzypnik <jot.skrzyp@gmail.com>
Date: Fri, 4 Mar 2016 09:35:08 +0100
Subject: [PATCH 2249/2285] ahoviewer: init at 1.4.6

---
 lib/maintainers.nix                           |  1 +
 .../graphics/ahoviewer/default.nix            | 36 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 3 files changed, 39 insertions(+)
 create mode 100644 pkgs/applications/graphics/ahoviewer/default.nix

diff --git a/lib/maintainers.nix b/lib/maintainers.nix
index 7362c6ab6590..ce59d5e3ba45 100644
--- a/lib/maintainers.nix
+++ b/lib/maintainers.nix
@@ -307,6 +307,7 @@
   sjmackenzie = "Stewart Mackenzie <setori88@gmail.com>";
   sjourdois = "Stéphane ‘kwisatz’ Jourdois <sjourdois@gmail.com>";
   skeidel = "Sven Keidel <svenkeidel@gmail.com>";
+  skrzyp = "Jakub Skrzypnik <jot.skrzyp@gmail.com>";
   sleexyz = "Sean Lee <freshdried@gmail.com>";
   smironov = "Sergey Mironov <ierton@gmail.com>";
   spacefrogg = "Michael Raitza <spacefrogg-nixos@meterriblecrew.net>";
diff --git a/pkgs/applications/graphics/ahoviewer/default.nix b/pkgs/applications/graphics/ahoviewer/default.nix
new file mode 100644
index 000000000000..79d6ff06578c
--- /dev/null
+++ b/pkgs/applications/graphics/ahoviewer/default.nix
@@ -0,0 +1,36 @@
+{ stdenv, pkgs, fetchurl, fetchFromGitHub, pkgconfig, libconfig, 
+  gtkmm, glibmm, libxml2, libsecret, curl, unrar, libzip, 
+  librsvg, gst_all_1, autoreconfHook, makeWrapper }:
+stdenv.mkDerivation {
+  name = "ahoviewer-1.4.6";
+  src = fetchFromGitHub {
+    owner = "ahodesuka";
+    repo = "ahoviewer";
+    rev = "414cb91d66d96fab4b48593a7ef4d9ad461306aa";
+    sha256 = "081jgfmbwf2av0cn229cf4qyv6ha80ridymsgwq45124b78y2bmb";
+  };
+  enableParallelBuilding = true; 
+  nativeBuildInputs = [ autoreconfHook pkgconfig makeWrapper ];
+  buildInputs = [ glibmm libconfig gtkmm glibmm libxml2 
+                  libsecret curl unrar libzip librsvg 
+                  gst_all_1.gstreamer
+                  gst_all_1.gst-plugins-good 
+                  gst_all_1.gst-plugins-bad 
+                  gst_all_1.gst-libav
+                  gst_all_1.gst-plugins-base ];
+  postPatch = ''patchShebangs version.sh'';
+  postInstall = ''
+    wrapProgram $out/bin/ahoviewer \
+    --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
+    --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
+  '';
+  meta = {
+    homepage = "https://github.com/ahodesuka/ahoviewer";
+    description = "A GTK2 image viewer, manga reader, and booru browser";
+    maintainers = [ stdenv.lib.maintainers.skrzyp ];
+    license = stdenv.lib.licenses.mit;
+    platforms = stdenv.lib.platforms.allBut [ "darwin" "cygwin" ];
+  };
+}
+
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e45a7466aaf6..a6e399b9d291 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11389,6 +11389,8 @@ let
     gtk = gtk2;
   };
 
+  ahoviewer = callPackage ../applications/graphics/ahoviewer { };
+
   alchemy = callPackage ../applications/graphics/alchemy { };
 
   alock = callPackage ../misc/screensavers/alock { };

From dc170b713d6aa1f5aa53024d83f9c3b8aa08c261 Mon Sep 17 00:00:00 2001
From: koral <koral@mailoo.org>
Date: Sun, 6 Mar 2016 17:22:17 +0100
Subject: [PATCH 2250/2285] sshfs: 2.6 -> 2.7

---
 pkgs/tools/filesystems/sshfs-fuse/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/filesystems/sshfs-fuse/default.nix b/pkgs/tools/filesystems/sshfs-fuse/default.nix
index 5e1b8db69128..3a460241daaa 100644
--- a/pkgs/tools/filesystems/sshfs-fuse/default.nix
+++ b/pkgs/tools/filesystems/sshfs-fuse/default.nix
@@ -1,13 +1,14 @@
 { stdenv, fetchFromGitHub, pkgconfig, glib, fuse, autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  name = "sshfs-fuse-2.6";
+  version = "2.7";
+  name = "sshfs-fuse-${version}";
   
   src = fetchFromGitHub {
     repo = "sshfs";
     owner = "libfuse";
-    rev = "sshfs_2_6";
-    sha256 = "08ffvviinjf8ncs8z494q739a8lky9z46i09ghj1y38qzgvk3fpw";
+    rev = "sshfs-${version}";
+    sha256 = "17l9b89zy5qzfcknw3krk74rfrqaa8q1r8jwdsahaqajsy09h4x4";
   };
   
   buildInputs = [ pkgconfig glib fuse autoreconfHook ];

From 9206abe64238c06377fe463989a4105cfd78de07 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Sun, 6 Mar 2016 20:44:09 +0100
Subject: [PATCH 2251/2285] mimeo: init at 2016.2

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

diff --git a/pkgs/tools/misc/mimeo/default.nix b/pkgs/tools/misc/mimeo/default.nix
new file mode 100644
index 000000000000..66e91ed14240
--- /dev/null
+++ b/pkgs/tools/misc/mimeo/default.nix
@@ -0,0 +1,33 @@
+{ stdenv, fetchurl, desktop_file_utils, file, python3Packages }:
+
+python3Packages.buildPythonApplication rec {
+  name = "mimeo-${version}";
+  version = "2016.2";
+
+  src = fetchurl {
+    url = "http://xyne.archlinux.ca/projects/mimeo/src/${name}.tar.xz";
+    sha256 = "1y3a60983ind2cakjwxq3cgc76xhcdqz5lcpnyii34s6wviybkn1";
+  };
+
+  buildInputs = [ file desktop_file_utils ];
+
+  propagatedBuildInputs = [ python3Packages.pyxdg ];
+
+  preConfigure = ''
+    substituteInPlace Mimeo.py \
+      --replace "EXE_UPDATE_DESKTOP_DATABASE = 'update-desktop-database'" \
+                "EXE_UPDATE_DESKTOP_DATABASE = '${desktop_file_utils}/bin/update-desktop-database'" \
+      --replace "EXE_FILE = 'file'" \
+                "EXE_FILE = '${file}/bin/file'"
+  '';
+
+  installPhase = "install -Dm755 Mimeo.py $out/bin/mimeo";
+
+  meta = with stdenv.lib; {
+    description = "Open files by MIME-type or file name using regular expressions";
+    homepage = http://xyne.archlinux.ca/projects/mimeo/;
+    license = [ licenses.gpl2 ];
+    maintainers = [ maintainers.rycee ];
+    platforms = platforms.unix;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 52c5e120ff45..ee54f66f2224 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2424,6 +2424,8 @@ let
 
   mgba = qt5.callPackage ../misc/emulators/mgba { };
 
+  mimeo = callPackage ../tools/misc/mimeo { };
+
   minissdpd = callPackage ../tools/networking/minissdpd { };
 
   miniupnpc = callPackage ../tools/networking/miniupnpc { };

From d99033beb928edb040e9302904b7a736344e5bbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 6 Mar 2016 20:57:50 +0100
Subject: [PATCH 2252/2285] grafana service: unbreak

Accidentally broken by 4fede53c0996938979d2966a69f108782a8c1c12
("nixos manuals: bring back package references").

Without this fix, grafana won't start:

$ systemctl status grafana
...
systemd[1]: Starting Grafana Service Daemon...
systemd[1]: Started Grafana Service Daemon.
grafana[666]: 2016/03/06 19:57:32 [log.go:75 Fatal()] [E] Failed to detect generated css or javascript files in static root (%!s(MISSING)), have you executed default grunt task?
systemd[1]: grafana.service: Main process exited, code=exited, status=1/FAILURE
systemd[1]: grafana.service: Unit entered failed state.
systemd[1]: grafana.service: Failed with result 'exit-code'.
---
 nixos/modules/services/monitoring/grafana.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index 1dec528b5a2c..5c6f063b1493 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -87,7 +87,7 @@ in {
 
     staticRootPath = mkOption {
       description = "Root path for static assets.";
-      default = "${cfg.package.out}/share/grafana/public";
+      default = "${cfg.package}/share/grafana/public";
       type = types.str;
     };
 

From e4abe06b8ab61b9808d753f3fa74421f68ad1ad3 Mon Sep 17 00:00:00 2001
From: John Ericson <Ericson2314@Yahoo.com>
Date: Sat, 5 Mar 2016 12:39:29 -0800
Subject: [PATCH 2253/2285] ghcjs: Use bootpkgs to override build tools, not
 hardcoded compiler's pgks

---
 pkgs/development/haskell-modules/configuration-ghcjs.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-ghcjs.nix b/pkgs/development/haskell-modules/configuration-ghcjs.nix
index 5c14fe788f7a..90f84d4387bc 100644
--- a/pkgs/development/haskell-modules/configuration-ghcjs.nix
+++ b/pkgs/development/haskell-modules/configuration-ghcjs.nix
@@ -28,7 +28,8 @@ self: super:
   # LLVM is not supported on this GHC; use the latest one.
   inherit (pkgs) llvmPackages;
 
-  inherit (pkgs.haskell.packages.ghc7103) jailbreak-cabal alex happy gtk2hs-buildtools rehoo hoogle;
+  inherit (self.ghc.bootPkgs)
+    jailbreak-cabal alex happy gtk2hs-buildtools rehoo hoogle;
 
   # This is the list of the Stage 1 packages that are built into a booted ghcjs installation
   # It can be generated with the command:

From 14201da332494161be2241b9caa0aad2cde203bb Mon Sep 17 00:00:00 2001
From: Aneesh Agrawal <aneeshusa@gmail.com>
Date: Sun, 6 Mar 2016 16:36:55 -0500
Subject: [PATCH 2254/2285] openssh: allow building without linking openssl

http://undeadly.org/cgi?action=article&sid=20140430045723 has the
original announcement of this option. Note, openssl headers are still
required at build time, see this comment:
http://www.gossamer-threads.com/lists/openssh/dev/61125#61125
---
 pkgs/tools/networking/openssh/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index 4d3ffb1257f9..494c7dfb69e1 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -4,6 +4,7 @@
 , withKerberos ? false
 , withGssapiPatches ? withKerberos
 , kerberos
+, linkOpenssl? true
 }:
 
 assert withKerberos -> kerberos != null;
@@ -54,7 +55,8 @@ stdenv.mkDerivation rec {
     (if pam != null then "--with-pam" else "--without-pam")
   ] ++ optional (etcDir != null) "--sysconfdir=${etcDir}"
     ++ optional withKerberos "--with-kerberos5=${kerberos}"
-    ++ optional stdenv.isDarwin "--disable-libutil";
+    ++ optional stdenv.isDarwin "--disable-libutil"
+    ++ optional (!linkOpenssl) "--without-openssl";
 
   preConfigure = ''
     configureFlagsArray+=("--with-privsep-path=$out/empty")

From cdb0267efe5e867efade305d22f8eb50cf00af53 Mon Sep 17 00:00:00 2001
From: Louis Taylor <louis@kragniz.eu>
Date: Mon, 7 Mar 2016 00:58:40 +0000
Subject: [PATCH 2255/2285] linux-testing: 4.5-rc6 -> 4.5-rc7

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

diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix
index 9b0ec5c355aa..57a825ec0a09 100644
--- a/pkgs/os-specific/linux/kernel/linux-testing.nix
+++ b/pkgs/os-specific/linux/kernel/linux-testing.nix
@@ -1,13 +1,13 @@
 { stdenv, fetchurl, perl, buildLinux, ... } @ args:
 
 import ./generic.nix (args // rec {
-  version = "4.5-rc6";
-  modDirVersion = "4.5.0-rc6";
+  version = "4.5-rc7";
+  modDirVersion = "4.5.0-rc7";
   extraMeta.branch = "4.5";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/v4.x/testing/linux-${version}.tar.xz";
-    sha256 = "1cpbg6w0mzlxrc6crgqh5n4c8wxxr4yyikmk0bkpgsbr6qk3bydk";
+    sha256 = "0z43s7ccikmqigv4insjvizs3bkx2lgjvzsz5rmmpcga28dz44kq";
   };
 
   features.iwlwifi = true;

From 0360e410b76adf1176888ec4394c41e98558f58a Mon Sep 17 00:00:00 2001
From: Nathan Zadoks <nathan@nathan7.eu>
Date: Mon, 7 Mar 2016 01:11:41 +0100
Subject: [PATCH 2256/2285] bird module: run as user/group `bird`, not `ircd`

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

diff --git a/nixos/modules/services/networking/bird.nix b/nixos/modules/services/networking/bird.nix
index e7e1db191529..e76cdac14ca8 100644
--- a/nixos/modules/services/networking/bird.nix
+++ b/nixos/modules/services/networking/bird.nix
@@ -30,7 +30,7 @@ in
 
       user = mkOption {
         type = types.string;
-        default = "ircd";
+        default = "bird";
         description = ''
           BIRD Internet Routing Daemon user.
         '';
@@ -38,7 +38,7 @@ in
 
       group = mkOption {
         type = types.string;
-        default = "ircd";
+        default = "bird";
         description = ''
           BIRD Internet Routing Daemon group.
         '';

From 68702d24bfc1a6e0a299df43aecf1cacca141372 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 7 Mar 2016 02:49:38 +0100
Subject: [PATCH 2257/2285] libebml: 1.3.1 -> 1.3.3 (security)

This release fixes CVE-2015-8790 & CVE-2015-8791.
---
 pkgs/development/libraries/libebml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libebml/default.nix b/pkgs/development/libraries/libebml/default.nix
index 818177ff49d7..3bdcfeda6a5f 100644
--- a/pkgs/development/libraries/libebml/default.nix
+++ b/pkgs/development/libraries/libebml/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "libebml-1.3.1";
+  name = "libebml-1.3.3";
 
   src = fetchurl {
     url = "http://dl.matroska.org/downloads/libebml/${name}.tar.bz2";
-    sha256 = "15a2d15rq0x9lp7rfsv0jxaw5c139xs7s5dwr5bmd9dc3arr8n0r";
+    sha256 = "16alhwd1yz5bv3765xfn5azwk37805lg1f61195gjq8rlkd49yrm";
   };
 
   meta = with stdenv.lib; {

From 5e204092294e0763288d3c7fc42a29030b448f15 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 7 Mar 2016 02:50:51 +0100
Subject: [PATCH 2258/2285] libmatroska: 1.4.1 -> 1.4.4 (security)

This fixes CVE-2015-8790 & CVE-2015-8791.
---
 pkgs/development/libraries/libmatroska/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libmatroska/default.nix b/pkgs/development/libraries/libmatroska/default.nix
index b4032f3c22dc..134f6b1bf270 100644
--- a/pkgs/development/libraries/libmatroska/default.nix
+++ b/pkgs/development/libraries/libmatroska/default.nix
@@ -1,17 +1,16 @@
-{ stdenv, fetchurl, libebml }:
+{ stdenv, fetchurl, pkgconfig, libebml }:
 
 stdenv.mkDerivation rec {
-  name = "libmatroska-1.4.1";
+  name = "libmatroska-1.4.4";
 
   src = fetchurl {
     url = "http://dl.matroska.org/downloads/libmatroska/${name}.tar.bz2";
-    sha256 = "1dzglkl0hpimld1kahkrrp857hw5pg1r7xxbpnx7jmlj7s3j2vq8";
+    sha256 = "1mvb54q3gag9dj0pkwci8w75gp6mm14gi85y0ld3ar1rdngsmvyk";
   };
 
-  configurePhase = "cd make/linux";
-  makeFlags = "prefix=$(out) LIBEBML_INCLUDE_DIR=${libebml}/include LIBEBML_LIB_DIR=${libebml}/lib"
-    + stdenv.lib.optionalString stdenv.isDarwin " CXX=clang++";
-  propagatedBuildInputs = [ libebml ];
+  nativeBuildInputs = [ pkgconfig ];
+
+  buildInputs = [ libebml ];
 
   meta = with stdenv.lib; {
     description = "A library to parse Matroska files";

From 0da9c6b358c3ec2515795f825db3e45f05606975 Mon Sep 17 00:00:00 2001
From: Nikolay Amiantov <ab@fmap.me>
Date: Mon, 7 Mar 2016 04:37:40 +0300
Subject: [PATCH 2259/2285] octoprint-plugins.m3d-fio: 0.29 -> 0.28.2

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

diff --git a/pkgs/applications/misc/octoprint/plugins.nix b/pkgs/applications/misc/octoprint/plugins.nix
index ba31d3fb3428..1ae11be3cdd3 100644
--- a/pkgs/applications/misc/octoprint/plugins.nix
+++ b/pkgs/applications/misc/octoprint/plugins.nix
@@ -8,13 +8,13 @@ in {
 
   m3d-fio = buildPlugin rec {
     name = "M3D-Fio-${version}";
-    version = "0.29";
+    version = "0.28.2";
 
     src = fetchFromGitHub {
       owner = "donovan6000";
       repo = "M3D-Fio";
       rev = "V${version}";
-      sha256 = "1ifbq7yibq42jjvqvklnx3qzr6vk2ngsxh3xhlbdrhqrg54gky4r";
+      sha256 = "1fwy6xmbid89rn7w7v779wb34gmfzc1fkggv3im1r7a7jrzph6nx";
     };
 
     patches = [

From 3f3e8ed82bc9d80d5acf0c0513e3b3eb770b9ed9 Mon Sep 17 00:00:00 2001
From: Tim Steinbach <tim@nequissimus.com>
Date: Mon, 7 Mar 2016 02:04:20 +0000
Subject: [PATCH 2260/2285] upower: 0.99.3 -> 0.99.4

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

diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix
index 0f7f93a57410..490df3e1abe2 100644
--- a/pkgs/os-specific/linux/upower/default.nix
+++ b/pkgs/os-specific/linux/upower/default.nix
@@ -6,11 +6,11 @@
 assert stdenv.isLinux;
 
 stdenv.mkDerivation rec {
-  name = "upower-0.99.3";
+  name = "upower-0.99.4";
 
   src = fetchurl {
     url = "http://upower.freedesktop.org/releases/${name}.tar.xz";
-    sha256 = "0f6x9mi1jzgqdpycaikyhjljnw3aacsl3gxndyg0dfqkq6y9jwb9";
+    sha256 = "1c1ph1j1fnrf3vipxb7ncmdfc36dpvcvpsv8n8lmal7grjk2b8ww";
   };
 
   buildInputs =

From 7f44b58609d6393f9716d187c7dc4f8f999b73e9 Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Mon, 7 Mar 2016 00:54:38 +0100
Subject: [PATCH 2261/2285] =?UTF-8?q?wheter=20=E2=86=92=20whether?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Nice weather today, isn’t it?
---
 nixos/lib/make-iso9660-image.nix          |  2 +-
 nixos/modules/services/networking/nsd.nix | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix
index b2409c6006bc..21c9cca316d1 100644
--- a/nixos/lib/make-iso9660-image.nix
+++ b/nixos/lib/make-iso9660-image.nix
@@ -22,7 +22,7 @@
 , # Whether this should be an efi-bootable El-Torito CD.
   efiBootable ? false
 
-, # Wheter this should be an hybrid CD (bootable from USB as well as CD).
+, # Whether this should be an hybrid CD (bootable from USB as well as CD).
   usbBootable ? false
 
 , # The path (in the ISO file system) of the boot image.
diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index ca08bb57895a..333a3378c4cc 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -346,7 +346,7 @@ in
       type = types.bool;
       default = true;
       description = ''
-        Wheter NSD should answer VERSION.BIND and VERSION.SERVER CHAOS class queries.
+        Whether NSD should answer VERSION.BIND and VERSION.SERVER CHAOS class queries.
       '';
     };
 
@@ -378,7 +378,7 @@ in
       type = types.bool;
       default = true;
       description = ''
-        Wheter to listen on IPv4 connections.
+        Whether to listen on IPv4 connections.
       '';
     };
 
@@ -394,7 +394,7 @@ in
       type = types.bool;
       default = true;
       description = ''
-        Wheter to listen on IPv6 connections.
+        Whether to listen on IPv6 connections.
       '';
     };
 
@@ -434,7 +434,7 @@ in
       type = types.bool;
       default = pkgs.stdenv.isLinux;
       description = ''
-        Wheter to enable SO_REUSEPORT on all used sockets. This lets multiple
+        Whether to enable SO_REUSEPORT on all used sockets. This lets multiple
         processes bind to the same port. This speeds up operation especially
         if the server count is greater than one and makes fast restarts less
         prone to fail
@@ -445,7 +445,7 @@ in
       type = types.bool;
       default = false;
       description = ''
-        Wheter if this server will be a root server (a DNS root server, you
+        Whether this server will be a root server (a DNS root server, you
         usually don't want that).
       '';
     };
@@ -524,7 +524,7 @@ in
       type = types.bool;
       default = true;
       description = ''
-        Wheter to check mtime of all zone files on start and sighup.
+        Whether to check mtime of all zone files on start and sighup.
       '';
     };
 

From c686f03305334b247d8fb742fa98ab559f661b6e Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Mon, 7 Mar 2016 03:05:28 +0100
Subject: [PATCH 2262/2285] tomcat: 6.0.44 -> 6.0.45, 7.0.62 -> 7.0.68, 8.0.23
 -> 8.0.32

Fixes at least CVE-2015-5174, CVE-2015-5345, CVE-2015-5351, CVE-2016-0706,
CVE-2016-0714, CVE-2016-0763.
---
 pkgs/servers/http/tomcat/6.0.nix | 4 ++--
 pkgs/servers/http/tomcat/7.0.nix | 4 ++--
 pkgs/servers/http/tomcat/8.0.nix | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/http/tomcat/6.0.nix b/pkgs/servers/http/tomcat/6.0.nix
index 71f1d62f4d80..c01e5065764c 100644
--- a/pkgs/servers/http/tomcat/6.0.nix
+++ b/pkgs/servers/http/tomcat/6.0.nix
@@ -1,6 +1,6 @@
 import ./recent.nix 
   {
     versionMajor = "6";
-    versionMinor = "0.44";
-    sha256 = "0942f0ss6w9k23xg94nir2dbbkqrqp5k628jflk51ikm5qr95dxa";
+    versionMinor = "0.45";
+    sha256 = "0ba8h86padpk23xmscp7sg70g0v8ji2jbwwriz59hxqy5zhd76wg";
   }
diff --git a/pkgs/servers/http/tomcat/7.0.nix b/pkgs/servers/http/tomcat/7.0.nix
index 221feb9c30eb..b38f4353cc45 100644
--- a/pkgs/servers/http/tomcat/7.0.nix
+++ b/pkgs/servers/http/tomcat/7.0.nix
@@ -1,6 +1,6 @@
 import ./recent.nix 
   {
     versionMajor = "7";
-    versionMinor = "0.62";
-    sha256 = "0v8zvyd4h85ynnday58x0ppplw4flxyjsrmrpg78rrv3w49fm1x7";
+    versionMinor = "0.68";
+    sha256 = "1q5qgci5ia25zqa1k1n2xzarsgk1317ya89mfgg0fmi65x1046ic";
   }
diff --git a/pkgs/servers/http/tomcat/8.0.nix b/pkgs/servers/http/tomcat/8.0.nix
index a6da1198c9aa..004601796672 100644
--- a/pkgs/servers/http/tomcat/8.0.nix
+++ b/pkgs/servers/http/tomcat/8.0.nix
@@ -1,6 +1,6 @@
 import ./recent.nix 
   {
     versionMajor = "8";
-    versionMinor = "0.23";
-    sha256 = "0f0s35iqs1zpifya0qvdrk55r77jr074sc0zk5cjivxaxnhik2y9";
+    versionMinor = "0.32";
+    sha256 = "1f59x5z8qf4rzy49m8d5ifi4h1ghkz5r33l3i67sib414h7jc8vy";
   }

From d3e3b135eae02727e9d58e32cb785748cdcdfd24 Mon Sep 17 00:00:00 2001
From: Christoph Hrdinka <c.github@hrdinka.at>
Date: Mon, 7 Mar 2016 00:08:46 +0100
Subject: [PATCH 2263/2285] pidgin: fix gstreamer plugin path

Closes #13722, fixes #13719 and maybe #10556.
---
 .../instant-messengers/pidgin/default.nix           | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
index 5e8f266930ff..7e9e41ea0bfc 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix
@@ -1,5 +1,5 @@
-{ stdenv, fetchurl, pkgconfig, gtk, gtkspell, aspell
-, gstreamer, gst_plugins_base, startupnotification, gettext
+{ stdenv, fetchurl, makeWrapper, pkgconfig, gtk, gtkspell, aspell
+, gstreamer, gst_plugins_base, gst_plugins_good, startupnotification, gettext
 , perl, perlXMLParser, libxml2, nss, nspr, farsight2
 , libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn
 , lib, python, libICE, libXext, libSM
@@ -22,9 +22,11 @@ stdenv.mkDerivation rec {
 
   inherit nss ncurses;
 
+  nativeBuildInputs = [ makeWrapper ];
+
   buildInputs = [
     gtkspell aspell
-    gstreamer gst_plugins_base startupnotification
+    gstreamer gst_plugins_base gst_plugins_good startupnotification
     libxml2 nss nspr farsight2
     libXScrnSaver ncurses python
     avahi dbus dbus_glib intltool libidn
@@ -54,6 +56,11 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  postInstall = ''
+    wrapProgram $out/bin/pidgin \
+      --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH"
+  '';
+
   meta = with stdenv.lib; {
     description = "Multi-protocol instant messaging client";
     homepage = http://pidgin.im;

From 4f013e9159cdf997f3a8b4f4fe0bd235d245270d Mon Sep 17 00:00:00 2001
From: Andrew Kelley <superjoe30@gmail.com>
Date: Mon, 7 Mar 2016 00:44:36 -0700
Subject: [PATCH 2264/2285] libsoundio: 1.0.3 -> 1.1.0

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

diff --git a/pkgs/development/libraries/libsoundio/default.nix b/pkgs/development/libraries/libsoundio/default.nix
index 9f9f89ec8125..a35ab14e2538 100644
--- a/pkgs/development/libraries/libsoundio/default.nix
+++ b/pkgs/development/libraries/libsoundio/default.nix
@@ -1,14 +1,14 @@
 { stdenv, fetchFromGitHub, cmake, alsaLib, libjack2-git, libpulseaudio }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.3";
+  version = "1.1.0";
   name = "libsoundio-${version}";
 
   src = fetchFromGitHub {
     owner = "andrewrk";
     repo = "libsoundio";
     rev = "${version}";
-    sha256 = "0xnv0rsan57i07ky823jczylbcpbzjk6j06fw9x0md65arcgcqfy";
+    sha256 = "0mw197l4bci1cjc2z877gxwsvk8r43dr7qiwci2hwl2cjlcnqr2p";
   };
 
   buildInputs = [ cmake alsaLib libjack2-git libpulseaudio ];

From a6479aa58088409fac6194c662cd76a71d16de6d Mon Sep 17 00:00:00 2001
From: = <anothersms@gmail.com>
Date: Mon, 7 Mar 2016 11:01:29 +0100
Subject: [PATCH 2265/2285] non: 2016-02-07 -> 2016-03-06

---
 pkgs/applications/audio/non/default.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix
index 5a54c94f1f97..ead53721950b 100644
--- a/pkgs/applications/audio/non/default.nix
+++ b/pkgs/applications/audio/non/default.nix
@@ -1,23 +1,23 @@
-{ stdenv, fetchFromGitHub, pkgconfig, python2, cairo, libjpeg, ntk, libjack2, libsndfile,
-ladspaH, liblrdf, liblo, libsigcxx
+{ stdenv, fetchFromGitHub, pkgconfig, python2, cairo, libjpeg, ntk, libjack2
+, libsndfile, ladspaH, liblrdf, liblo, libsigcxx
 }:
 
 stdenv.mkDerivation rec {
   name = "non-${version}";
-  version = "2016-02-07";
+  version = "2016-03-06";
   src = fetchFromGitHub {
     owner = "original-male";
     repo = "non";
-    rev = "1ef382fbbea598fdb56b25244a703c64ecaf8446";
-    sha256 = "1mi3nm0nrrqlk36920irvqf5080lbnj1qc8vnxspgwkjjqgdc22g";
+    rev = "3946d392216ee999b560d8b7cdee7c4347110e29";
+    sha256 = "02vnq2mfimgdrmv3lmz80yif4h9a1lympv0wqc5dr2l0f8amj2fp";
   };
 
-    buildInputs = [ pkgconfig python2 cairo libjpeg ntk libjack2 libsndfile
+  buildInputs = [ pkgconfig python2 cairo libjpeg ntk libjack2 libsndfile
     ladspaH liblrdf liblo libsigcxx
-    ];
-    configurePhase = ''python waf configure --prefix=$out'';
-    buildPhase = ''python waf build'';
-    installPhase = ''python waf install'';
+  ];
+  configurePhase = "python waf configure --prefix=$out";
+  buildPhase = "python waf build";
+  installPhase = "python waf install";
 
   meta = {
     description = "Lightweight and lightning fast modular Digital Audio Workstation";

From 495985ace397cb24f6d3bc317945aa32fdabf4db Mon Sep 17 00:00:00 2001
From: "Matthias C. M. Troffaes" <matthias.troffaes@gmail.com>
Date: Mon, 7 Mar 2016 09:50:52 +0000
Subject: [PATCH 2266/2285] wolfssl: 3.7.0 -> 3.8.0

changes by @globin: use autoreconfHook

closes #13731

Signed-off-by: Robin Gloster <mail@glob.in>
---
 pkgs/development/libraries/wolfssl/default.nix | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/wolfssl/default.nix b/pkgs/development/libraries/wolfssl/default.nix
index 5bb63c915e61..31ac49a2ce4d 100644
--- a/pkgs/development/libraries/wolfssl/default.nix
+++ b/pkgs/development/libraries/wolfssl/default.nix
@@ -1,19 +1,17 @@
-{ stdenv, fetchurl, autoconf, automake, libtool }:
+{ stdenv, fetchFromGitHub, autoreconfHook }:
 
 stdenv.mkDerivation rec {
   name = "wolfssl-${version}";
-  version = "3.7.0";
+  version = "3.8.0";
 
-  src = fetchurl {
-    url    = "https://github.com/wolfSSL/wolfssl/archive/v${version}.tar.gz";
-    sha256 = "1r1awivral4xjjvnna9lrfz2rh84rcbp04834rymbsz0kbyykgb6";
+  src = fetchFromGitHub {
+    owner = "wolfSSL";
+    repo = "wolfssl";
+    rev = "v${version}";
+    sha256 = "0vc2120a9gfxg3rv018ch1g84ia2cpplcqbpy8v6vpfb79rn1nf5";
   };
 
-  nativeBuildInputs = [ autoconf automake libtool ];
-
-  preConfigure = ''
-    ./autogen.sh
-  '';
+  nativeBuildInputs = [ autoreconfHook ];
 
   meta = with stdenv.lib; {
     description = "A small, fast, portable implementation of TLS/SSL for embedded devices";

From e338d6a0fc1293c1d5b63d9e38e690526fc7d1b1 Mon Sep 17 00:00:00 2001
From: Peter Simons <simons@cryp.to>
Date: Mon, 7 Mar 2016 13:32:20 +0100
Subject: [PATCH 2267/2285] splix: revert "2.0.0 -> svn-r315" version update

This reverts commit 6ea526462b1a1adf and a9f8613dae32b10d to fix
https://github.com/NixOS/nixpkgs/issues/13734.
---
 pkgs/misc/cups/drivers/splix/default.nix      | 22 +++++++++----------
 .../drivers/splix/splix-2.0.0-gcc45.patch     | 18 +++++++++++++++
 2 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch

diff --git a/pkgs/misc/cups/drivers/splix/default.nix b/pkgs/misc/cups/drivers/splix/default.nix
index ab6bcfba6a1d..532ef2a45d5d 100644
--- a/pkgs/misc/cups/drivers/splix/default.nix
+++ b/pkgs/misc/cups/drivers/splix/default.nix
@@ -1,20 +1,20 @@
-{ stdenv, fetchsvn, fetchurl, cups, zlib }:
-let rev = "315"; in
+{stdenv, fetchurl, cups, zlib}:
+
 stdenv.mkDerivation rec {
-  name = "splix-svn-${rev}";
-  src = fetchsvn {
-    # We build this from svn, because splix hasn't been in released in several years
-    # although the community has been adding some new printer models.
-    url = "svn://svn.code.sf.net/p/splix/code/splix";
-    rev = "r${rev}";
-    sha256 = "16wbm4xnz35ca3mw2iggf5f4jaxpyna718ia190ka6y4ah932jxl";
+  name = "splix-2.0.0";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/splix/${name}.tar.bz2";
+    sha256 = "0bwivrwwvh6hzvnycpzqs7a0capgycahc4s3v9ihx552fgy07xwp";
   };
 
-  preBuild = ''
+  patches = [ ./splix-2.0.0-gcc45.patch ];
+
+  preBuild=''
     makeFlags="V=1 DISABLE_JBIG=1 CUPSFILTER=$out/lib/cups/filter CUPSPPD=$out/share/cups/model"
   '';
 
-  buildInputs = [ cups zlib ];
+  buildInputs = [cups zlib];
 
   meta = {
     homepage = http://splix.sourceforge.net;
diff --git a/pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch b/pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch
new file mode 100644
index 000000000000..5ccdcb2514c5
--- /dev/null
+++ b/pkgs/misc/cups/drivers/splix/splix-2.0.0-gcc45.patch
@@ -0,0 +1,18 @@
+Fixing build with gcc 4.5
+
+http://bugs.gentoo.org/show_bug.cgi?id=318581
+
+downloaded from
+http://gentoo-overlays.zugaina.org/gentoo/portage/net-print/splix/files/splix-2.0.0-gcc45.patch
+
+--- splix-old/src/ppdfile.cpp
++++ splix-new/src/ppdfile.cpp
+@@ -282,7 +282,7 @@
+  * Opérateur d'assignation
+  * Assignment operator
+  */
+-void PPDFile::Value::operator = (const PPDFile::Value::Value &val)
++void PPDFile::Value::operator = (const PPDFile::Value &val)
+ {
+     if (_preformatted)
+         delete[] _preformatted;

From 0ee75214f336474e127c2e3546c0406a0c4d5fa7 Mon Sep 17 00:00:00 2001
From: John Wiegley <johnw@newartisans.com>
Date: Mon, 7 Mar 2016 07:16:04 -0800
Subject: [PATCH 2268/2285] proofgeneral_HEAD: New expr: Proof General from
 GitHub

---
 .../editors/emacs-modes/proofgeneral/HEAD.nix | 52 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  4 ++
 2 files changed, 56 insertions(+)
 create mode 100644 pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix

diff --git a/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
new file mode 100644
index 000000000000..a8760afc58b0
--- /dev/null
+++ b/pkgs/applications/editors/emacs-modes/proofgeneral/HEAD.nix
@@ -0,0 +1,52 @@
+{ stdenv, fetchgit, emacs, texinfo, texLive, perl, which, automake, enableDoc ? false }:
+
+stdenv.mkDerivation (rec {
+  name = "ProofGeneral-HEAD";
+
+  src = fetchgit {
+    url = "https://github.com/ProofGeneral/PG.git";
+    rev = "16991280fb09743ae7320aef77f6a166afb907d7";
+    sha256 = "08zhfl6xbl4q7lrl7wdp72xr155k06778by0d60g28mfx59b7sqc";
+  };
+
+  buildInputs = [ emacs texinfo perl which ] ++ stdenv.lib.optional enableDoc texLive;
+
+  prePatch =
+    '' sed -i "Makefile" \
+           -e "s|^\(\(DEST_\)\?PREFIX\)=.*$|\1=$out|g ; \
+               s|/sbin/install-info|install-info|g"
+
+
+       sed -i "bin/proofgeneral" -e's/which/type -p/g'
+
+       # @image{ProofGeneral} fails, so remove it.
+       sed -i '94d' doc/PG-adapting.texi
+       sed -i '96d' doc/ProofGeneral.texi
+    '';
+
+  patches = [ ./pg.patch ];
+
+  preBuild = ''
+    make clean;
+  '';
+
+  installPhase =
+    if enableDoc
+    then
+    # Copy `texinfo.tex' in the right place so that `texi2pdf' works.
+    '' cp -v "${automake}/share/"automake-*/texinfo.tex doc
+       make install install-doc
+    ''
+    else "make install";
+
+  meta = {
+    description = "Proof General, an Emacs front-end for proof assistants";
+    longDescription = ''
+      Proof General is a generic front-end for proof assistants (also known as
+      interactive theorem provers), based on the customizable text editor Emacs.
+    '';
+    homepage = http://proofgeneral.inf.ed.ac.uk;
+    license = stdenv.lib.licenses.gpl2Plus;
+    platforms = stdenv.lib.platforms.unix;  # arbitrary choice
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c81b48f31f4..b6c83a3cbbf3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12000,6 +12000,10 @@ let
       texinfo = texinfo4 ;
       texLive = texlive.combine { inherit (texlive) scheme-basic cm-super ec; };
     };
+    proofgeneral_HEAD = callPackage ../applications/editors/emacs-modes/proofgeneral/HEAD.nix {
+      texinfo = texinfo4 ;
+      texLive = texlive.combine { inherit (texlive) scheme-basic cm-super ec; };
+    };
     proofgeneral = self.proofgeneral_4_2;
 
     quack = callPackage ../applications/editors/emacs-modes/quack { };

From f306e67e15bdbe9a8358c9f81319fc4fcbadc2eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Tue, 8 Mar 2016 08:31:34 +0100
Subject: [PATCH 2269/2285] kde5: move files around to simplify merge

It is analogous to 98d8e1a160d3.
---
 .gitignore                                        |  4 +---
 .../kde-5/applications-15.12}/ark.nix             |  0
 .../kde-5/applications-15.12}/baloo-widgets.nix   |  0
 .../kde-5/applications-15.12}/default.nix         |  0
 .../kde-5/applications-15.12}/dolphin-plugins.nix |  0
 .../kde-5/applications-15.12}/dolphin.nix         |  0
 .../kde-5/applications-15.12}/fetchsrcs.sh        |  0
 .../kde-5/applications-15.12}/ffmpegthumbs.nix    |  0
 .../kde-5/applications-15.12}/gpgmepp.nix         |  0
 .../kde-5/applications-15.12}/gwenview.nix        |  0
 .../kde-5/applications-15.12}/kate.nix            |  0
 .../kde-5/applications-15.12}/kde-app.nix         |  0
 .../kde-5/applications-15.12}/kde-locale-4.nix    |  0
 .../kde-5/applications-15.12}/kde-locale-5.nix    |  0
 .../kdegraphics-thumbnailers.nix                  |  0
 .../kdelibs/0001-old-kde4-cmake-policies.patch    |  0
 .../kdelibs/0002-polkit-install-path.patch        |  0
 .../kdelibs/0003-remove_xdg_impurities.patch      |  0
 .../kde-5/applications-15.12}/kdelibs/default.nix |  0
 .../applications-15.12}/kdelibs/setup-hook.sh     |  0
 .../kdenetwork-filesharing.nix                    |  0
 .../kde-5/applications-15.12}/kgpg.nix            |  0
 .../kde-5/applications-15.12}/kio-extras.nix      |  0
 .../kde-5/applications-15.12}/konsole.nix         |  0
 .../kde-5/applications-15.12}/l10n.nix            |  0
 .../kde-5/applications-15.12}/libkdcraw.nix       |  0
 .../kde-5/applications-15.12}/libkexiv2.nix       |  0
 .../kde-5/applications-15.12}/libkipi.nix         |  0
 .../kde-5/applications-15.12}/okular.nix          |  0
 .../kde-5/applications-15.12}/print-manager.nix   |  0
 .../kde-5/applications-15.12}/spectacle.nix       |  0
 .../kde-5/applications-15.12}/srcs.nix            |  0
 .../kde-5/frameworks-5.19}/attica.nix             |  0
 .../kde-5/frameworks-5.19}/baloo.nix              |  0
 .../kde-5/frameworks-5.19}/bluez-qt.nix           |  0
 .../kde-5/frameworks-5.19}/breeze-icons.nix       |  0
 .../kde-5/frameworks-5.19}/default.nix            |  0
 .../extra-cmake-modules/default.nix               |  0
 .../extra-cmake-modules/nix-lib-path.patch        |  0
 .../frameworks-5.19}/extra-cmake-modules/series   |  0
 .../extra-cmake-modules/setup-hook.sh             |  0
 .../kde-5/frameworks-5.19}/fetchsrcs.sh           |  0
 .../frameworks-5.19}/frameworkintegration.nix     |  0
 .../kde-5/frameworks-5.19}/kactivities.nix        |  0
 .../kde-5/frameworks-5.19}/kapidox.nix            |  0
 .../kde-5/frameworks-5.19}/karchive.nix           |  0
 .../kauth/cmake-install-paths.patch               |  0
 .../kde-5/frameworks-5.19}/kauth/default.nix      |  0
 .../kde-5/frameworks-5.19}/kauth/series           |  0
 .../kde-5/frameworks-5.19}/kbookmarks.nix         |  0
 .../0001-qdiriterator-follow-symlinks.patch       |  0
 .../kde-5/frameworks-5.19}/kcmutils/default.nix   |  0
 .../kde-5/frameworks-5.19}/kcodecs.nix            |  0
 .../kde-5/frameworks-5.19}/kcompletion.nix        |  0
 .../kde-5/frameworks-5.19}/kconfig.nix            |  0
 .../0001-qdiriterator-follow-symlinks.patch       |  0
 .../frameworks-5.19}/kconfigwidgets/default.nix   |  0
 .../kde-5/frameworks-5.19}/kcoreaddons.nix        |  0
 .../kde-5/frameworks-5.19}/kcrash.nix             |  0
 .../kde-5/frameworks-5.19}/kdbusaddons.nix        |  0
 .../kde-5/frameworks-5.19}/kdeclarative.nix       |  0
 .../kde-5/frameworks-5.19}/kded.nix               |  0
 .../frameworks-5.19}/kdelibs4support/default.nix  |  0
 .../kdelibs4support/nix-kde-include-dir.patch     |  0
 .../kde-5/frameworks-5.19}/kdelibs4support/series |  0
 .../kdelibs4support/setup-hook.sh                 |  0
 .../kde-5/frameworks-5.19}/kdesignerplugin.nix    |  0
 .../kde-5/frameworks-5.19}/kdesu.nix              |  0
 .../kde-5/frameworks-5.19}/kdewebkit.nix          |  0
 .../kde-5/frameworks-5.19}/kdnssd.nix             |  0
 .../kde-5/frameworks-5.19}/kdoctools/default.nix  |  0
 .../kdoctools/kdoctools-no-find-docbook-xml.patch |  0
 .../kde-5/frameworks-5.19}/kemoticons.nix         |  0
 .../kfilemetadata/cmake-install-paths.patch       |  0
 .../frameworks-5.19}/kfilemetadata/default.nix    |  0
 .../kde-5/frameworks-5.19}/kfilemetadata/series   |  0
 .../kde-5/frameworks-5.19}/kglobalaccel.nix       |  0
 .../kde-5/frameworks-5.19}/kguiaddons.nix         |  0
 .../kde-5/frameworks-5.19}/khtml.nix              |  0
 .../kde-5/frameworks-5.19}/ki18n.nix              |  0
 .../kiconthemes/default-theme-breeze.patch        |  0
 .../frameworks-5.19}/kiconthemes/default.nix      |  0
 .../kde-5/frameworks-5.19}/kiconthemes/series     |  0
 .../kde-5/frameworks-5.19}/kidletime.nix          |  0
 .../kde-5/frameworks-5.19}/kimageformats.nix      |  0
 .../kinit/0001-kinit-libpath.patch                |  0
 .../kde-5/frameworks-5.19}/kinit/default.nix      |  0
 .../kde-5/frameworks-5.19}/kio/default.nix        |  0
 .../frameworks-5.19}/kio/samba-search-path.patch  |  0
 .../kde-5/frameworks-5.19}/kio/series             |  0
 .../kde-5/frameworks-5.19}/kitemmodels.nix        |  0
 .../kde-5/frameworks-5.19}/kitemviews.nix         |  0
 .../kde-5/frameworks-5.19}/kjobwidgets.nix        |  0
 .../kde-5/frameworks-5.19}/kjs.nix                |  0
 .../kde-5/frameworks-5.19}/kjsembed.nix           |  0
 .../kde-5/frameworks-5.19}/kmediaplayer.nix       |  0
 .../kde-5/frameworks-5.19}/knewstuff.nix          |  0
 .../kde-5/frameworks-5.19}/knotifications.nix     |  0
 .../kde-5/frameworks-5.19}/knotifyconfig.nix      |  0
 .../kpackage/allow-external-paths.patch           |  0
 .../kde-5/frameworks-5.19}/kpackage/default.nix   |  0
 .../kpackage/qdiriterator-follow-symlinks.patch   |  0
 .../kde-5/frameworks-5.19}/kpackage/series        |  0
 .../kde-5/frameworks-5.19}/kparts.nix             |  0
 .../kde-5/frameworks-5.19}/kpeople.nix            |  0
 .../kde-5/frameworks-5.19}/kplotting.nix          |  0
 .../kde-5/frameworks-5.19}/kpty.nix               |  0
 .../kde-5/frameworks-5.19}/kross.nix              |  0
 .../kde-5/frameworks-5.19}/krunner.nix            |  0
 .../0001-qdiriterator-follow-symlinks.patch       |  0
 .../kservice/0002-no-canonicalize-path.patch      |  0
 .../kde-5/frameworks-5.19}/kservice/default.nix   |  0
 .../frameworks-5.19}/ktexteditor/default.nix      |  0
 .../ktexteditor/no-qcoreapplication.patch         |  0
 .../kde-5/frameworks-5.19}/ktexteditor/series     |  0
 .../kde-5/frameworks-5.19}/ktextwidgets.nix       |  0
 .../kde-5/frameworks-5.19}/kunitconversion.nix    |  0
 .../kde-5/frameworks-5.19}/kwallet.nix            |  0
 .../kde-5/frameworks-5.19}/kwidgetsaddons.nix     |  0
 .../kde-5/frameworks-5.19}/kwindowsystem.nix      |  0
 .../kde-5/frameworks-5.19}/kxmlgui.nix            |  0
 .../kde-5/frameworks-5.19}/kxmlrpcclient.nix      |  0
 .../kde-5/frameworks-5.19}/modemmanager-qt.nix    |  0
 .../kde-5/frameworks-5.19}/networkmanager-qt.nix  |  0
 .../kde-5/frameworks-5.19}/oxygen-icons5.nix      |  0
 .../frameworks-5.19}/plasma-framework/default.nix |  0
 .../kde-5/frameworks-5.19}/solid.nix              |  0
 .../kde-5/frameworks-5.19}/sonnet.nix             |  0
 .../kde-5/frameworks-5.19}/srcs.nix               |  0
 .../kde-5/frameworks-5.19}/threadweaver.nix       |  0
 .../desktops/{ => kde-5}/plasma-5.5/bluedevil.nix |  0
 .../{ => kde-5}/plasma-5.5/breeze-gtk.nix         |  0
 .../{ => kde-5}/plasma-5.5/breeze-qt4.nix         |  0
 .../{ => kde-5}/plasma-5.5/breeze-qt5.nix         |  0
 pkgs/desktops/{ => kde-5}/plasma-5.5/default.nix  |  0
 pkgs/desktops/{ => kde-5}/plasma-5.5/fetchsrcs.sh |  0
 .../{ => kde-5}/plasma-5.5/kde-cli-tools.nix      |  0
 .../kde-gtk-config/0001-follow-symlinks.patch     |  0
 .../plasma-5.5/kde-gtk-config/default.nix         |  0
 .../{ => kde-5}/plasma-5.5/kdecoration.nix        |  0
 .../{ => kde-5}/plasma-5.5/kdeplasma-addons.nix   |  0
 pkgs/desktops/{ => kde-5}/plasma-5.5/kgamma5.nix  |  0
 .../{ => kde-5}/plasma-5.5/khelpcenter.nix        |  0
 pkgs/desktops/{ => kde-5}/plasma-5.5/khotkeys.nix |  0
 .../{ => kde-5}/plasma-5.5/kinfocenter.nix        |  0
 .../desktops/{ => kde-5}/plasma-5.5/kmenuedit.nix |  0
 pkgs/desktops/{ => kde-5}/plasma-5.5/kscreen.nix  |  0
 .../{ => kde-5}/plasma-5.5/kscreenlocker.nix      |  0
 .../{ => kde-5}/plasma-5.5/ksshaskpass.nix        |  0
 .../desktops/{ => kde-5}/plasma-5.5/ksysguard.nix |  0
 pkgs/desktops/{ => kde-5}/plasma-5.5/kwayland.nix |  0
 .../kwin/0001-qdiriterator-follow-symlinks.patch  |  0
 .../{ => kde-5}/plasma-5.5/kwin/default.nix       |  0
 pkgs/desktops/{ => kde-5}/plasma-5.5/kwrited.nix  |  0
 .../{ => kde-5}/plasma-5.5/libkscreen/default.nix |  0
 .../0001-qdiriterator-follow-symlinks.patch       |  0
 .../plasma-5.5/libksysguard/default.nix           |  0
 pkgs/desktops/{ => kde-5}/plasma-5.5/milou.nix    |  0
 pkgs/desktops/{ => kde-5}/plasma-5.5/oxygen.nix   |  0
 .../0001-qt-5.5-QML-import-paths.patch            |  0
 .../plasma-5.5/plasma-desktop/0002-hwclock.patch  |  0
 .../plasma-5.5/plasma-desktop/0003-tzdir.patch    |  0
 .../plasma-5.5/plasma-desktop/default.nix         |  0
 .../{ => kde-5}/plasma-5.5/plasma-mediacenter.nix |  0
 ...0001-mobile-broadband-provider-info-path.patch |  0
 .../{ => kde-5}/plasma-5.5/plasma-nm/default.nix  |  0
 .../desktops/{ => kde-5}/plasma-5.5/plasma-pa.nix |  0
 .../plasma-5.5/plasma-workspace-wallpapers.nix    |  0
 .../plasma-5.5/plasma-workspace/default.nix       |  0
 .../plasma-workspace/qml-import-path.patch        |  0
 .../plasma-5.5/plasma-workspace/series            |  0
 .../plasma-5.5/plasma-workspace/startkde.patch    |  0
 .../{ => kde-5}/plasma-5.5/polkit-kde-agent.nix   |  0
 .../{ => kde-5}/plasma-5.5/powerdevil.nix         |  0
 pkgs/desktops/{ => kde-5}/plasma-5.5/srcs.nix     |  0
 .../{ => kde-5}/plasma-5.5/systemsettings.nix     |  0
 pkgs/top-level/all-packages.nix                   | 15 ++++++++++-----
 177 files changed, 11 insertions(+), 8 deletions(-)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/ark.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/baloo-widgets.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/default.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/dolphin-plugins.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/dolphin.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/fetchsrcs.sh (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/ffmpegthumbs.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/gpgmepp.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/gwenview.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kate.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kde-app.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kde-locale-4.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kde-locale-5.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdegraphics-thumbnailers.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/0001-old-kde4-cmake-policies.patch (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/0002-polkit-install-path.patch (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/0003-remove_xdg_impurities.patch (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/default.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdelibs/setup-hook.sh (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kdenetwork-filesharing.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kgpg.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/kio-extras.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/konsole.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/l10n.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/libkdcraw.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/libkexiv2.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/libkipi.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/okular.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/print-manager.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/spectacle.nix (100%)
 rename pkgs/{applications/kde-apps-15.12 => desktops/kde-5/applications-15.12}/srcs.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/attica.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/baloo.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/bluez-qt.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/breeze-icons.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/extra-cmake-modules/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/extra-cmake-modules/nix-lib-path.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/extra-cmake-modules/series (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/extra-cmake-modules/setup-hook.sh (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/fetchsrcs.sh (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/frameworkintegration.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kactivities.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kapidox.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/karchive.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kauth/cmake-install-paths.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kauth/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kauth/series (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kbookmarks.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcmutils/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcmutils/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcodecs.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcompletion.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kconfig.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kconfigwidgets/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcoreaddons.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kcrash.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdbusaddons.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdeclarative.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kded.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdelibs4support/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdelibs4support/nix-kde-include-dir.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdelibs4support/series (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdelibs4support/setup-hook.sh (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdesignerplugin.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdesu.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdewebkit.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdnssd.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdoctools/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kdoctools/kdoctools-no-find-docbook-xml.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kemoticons.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kfilemetadata/cmake-install-paths.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kfilemetadata/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kfilemetadata/series (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kglobalaccel.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kguiaddons.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/khtml.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ki18n.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kiconthemes/default-theme-breeze.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kiconthemes/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kiconthemes/series (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kidletime.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kimageformats.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kinit/0001-kinit-libpath.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kinit/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kio/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kio/samba-search-path.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kio/series (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kitemmodels.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kitemviews.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kjobwidgets.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kjs.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kjsembed.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kmediaplayer.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/knewstuff.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/knotifications.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/knotifyconfig.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpackage/allow-external-paths.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpackage/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpackage/qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpackage/series (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kparts.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpeople.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kplotting.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kpty.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kross.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/krunner.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kservice/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kservice/0002-no-canonicalize-path.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kservice/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ktexteditor/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ktexteditor/no-qcoreapplication.patch (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ktexteditor/series (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/ktextwidgets.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kunitconversion.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kwallet.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kwidgetsaddons.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kwindowsystem.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kxmlgui.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/kxmlrpcclient.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/modemmanager-qt.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/networkmanager-qt.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/oxygen-icons5.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/plasma-framework/default.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/solid.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/sonnet.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/srcs.nix (100%)
 rename pkgs/{development/libraries/kde-frameworks-5.19 => desktops/kde-5/frameworks-5.19}/threadweaver.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/bluedevil.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/breeze-gtk.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/breeze-qt4.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/breeze-qt5.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/fetchsrcs.sh (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kde-cli-tools.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kde-gtk-config/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kdecoration.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kdeplasma-addons.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kgamma5.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/khelpcenter.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/khotkeys.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kinfocenter.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kmenuedit.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kscreen.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kscreenlocker.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/ksshaskpass.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/ksysguard.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kwayland.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kwin/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/kwrited.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/libkscreen/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/libksysguard/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/milou.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/oxygen.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-desktop/0002-hwclock.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-desktop/0003-tzdir.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-desktop/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-mediacenter.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-nm/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-pa.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace-wallpapers.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace/default.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace/qml-import-path.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace/series (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/plasma-workspace/startkde.patch (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/polkit-kde-agent.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/powerdevil.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/srcs.nix (100%)
 rename pkgs/desktops/{ => kde-5}/plasma-5.5/systemsettings.nix (100%)

diff --git a/.gitignore b/.gitignore
index 74de941b7685..dba957f76620 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,7 +12,5 @@ result-*
 
 .DS_Store
 
-/pkgs/applications/kde-apps-*/tmp/
-/pkgs/development/libraries/kde-frameworks-*/tmp/
 /pkgs/development/libraries/qt-5/*/tmp/
-/pkgs/desktops/plasma-*/tmp/
\ No newline at end of file
+/pkgs/desktops/kde-5/*/tmp/
\ No newline at end of file
diff --git a/pkgs/applications/kde-apps-15.12/ark.nix b/pkgs/desktops/kde-5/applications-15.12/ark.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/ark.nix
rename to pkgs/desktops/kde-5/applications-15.12/ark.nix
diff --git a/pkgs/applications/kde-apps-15.12/baloo-widgets.nix b/pkgs/desktops/kde-5/applications-15.12/baloo-widgets.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/baloo-widgets.nix
rename to pkgs/desktops/kde-5/applications-15.12/baloo-widgets.nix
diff --git a/pkgs/applications/kde-apps-15.12/default.nix b/pkgs/desktops/kde-5/applications-15.12/default.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/default.nix
rename to pkgs/desktops/kde-5/applications-15.12/default.nix
diff --git a/pkgs/applications/kde-apps-15.12/dolphin-plugins.nix b/pkgs/desktops/kde-5/applications-15.12/dolphin-plugins.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/dolphin-plugins.nix
rename to pkgs/desktops/kde-5/applications-15.12/dolphin-plugins.nix
diff --git a/pkgs/applications/kde-apps-15.12/dolphin.nix b/pkgs/desktops/kde-5/applications-15.12/dolphin.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/dolphin.nix
rename to pkgs/desktops/kde-5/applications-15.12/dolphin.nix
diff --git a/pkgs/applications/kde-apps-15.12/fetchsrcs.sh b/pkgs/desktops/kde-5/applications-15.12/fetchsrcs.sh
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/fetchsrcs.sh
rename to pkgs/desktops/kde-5/applications-15.12/fetchsrcs.sh
diff --git a/pkgs/applications/kde-apps-15.12/ffmpegthumbs.nix b/pkgs/desktops/kde-5/applications-15.12/ffmpegthumbs.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/ffmpegthumbs.nix
rename to pkgs/desktops/kde-5/applications-15.12/ffmpegthumbs.nix
diff --git a/pkgs/applications/kde-apps-15.12/gpgmepp.nix b/pkgs/desktops/kde-5/applications-15.12/gpgmepp.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/gpgmepp.nix
rename to pkgs/desktops/kde-5/applications-15.12/gpgmepp.nix
diff --git a/pkgs/applications/kde-apps-15.12/gwenview.nix b/pkgs/desktops/kde-5/applications-15.12/gwenview.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/gwenview.nix
rename to pkgs/desktops/kde-5/applications-15.12/gwenview.nix
diff --git a/pkgs/applications/kde-apps-15.12/kate.nix b/pkgs/desktops/kde-5/applications-15.12/kate.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kate.nix
rename to pkgs/desktops/kde-5/applications-15.12/kate.nix
diff --git a/pkgs/applications/kde-apps-15.12/kde-app.nix b/pkgs/desktops/kde-5/applications-15.12/kde-app.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kde-app.nix
rename to pkgs/desktops/kde-5/applications-15.12/kde-app.nix
diff --git a/pkgs/applications/kde-apps-15.12/kde-locale-4.nix b/pkgs/desktops/kde-5/applications-15.12/kde-locale-4.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kde-locale-4.nix
rename to pkgs/desktops/kde-5/applications-15.12/kde-locale-4.nix
diff --git a/pkgs/applications/kde-apps-15.12/kde-locale-5.nix b/pkgs/desktops/kde-5/applications-15.12/kde-locale-5.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kde-locale-5.nix
rename to pkgs/desktops/kde-5/applications-15.12/kde-locale-5.nix
diff --git a/pkgs/applications/kde-apps-15.12/kdegraphics-thumbnailers.nix b/pkgs/desktops/kde-5/applications-15.12/kdegraphics-thumbnailers.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdegraphics-thumbnailers.nix
rename to pkgs/desktops/kde-5/applications-15.12/kdegraphics-thumbnailers.nix
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/0001-old-kde4-cmake-policies.patch b/pkgs/desktops/kde-5/applications-15.12/kdelibs/0001-old-kde4-cmake-policies.patch
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdelibs/0001-old-kde4-cmake-policies.patch
rename to pkgs/desktops/kde-5/applications-15.12/kdelibs/0001-old-kde4-cmake-policies.patch
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/0002-polkit-install-path.patch b/pkgs/desktops/kde-5/applications-15.12/kdelibs/0002-polkit-install-path.patch
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdelibs/0002-polkit-install-path.patch
rename to pkgs/desktops/kde-5/applications-15.12/kdelibs/0002-polkit-install-path.patch
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/0003-remove_xdg_impurities.patch b/pkgs/desktops/kde-5/applications-15.12/kdelibs/0003-remove_xdg_impurities.patch
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdelibs/0003-remove_xdg_impurities.patch
rename to pkgs/desktops/kde-5/applications-15.12/kdelibs/0003-remove_xdg_impurities.patch
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/default.nix b/pkgs/desktops/kde-5/applications-15.12/kdelibs/default.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdelibs/default.nix
rename to pkgs/desktops/kde-5/applications-15.12/kdelibs/default.nix
diff --git a/pkgs/applications/kde-apps-15.12/kdelibs/setup-hook.sh b/pkgs/desktops/kde-5/applications-15.12/kdelibs/setup-hook.sh
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdelibs/setup-hook.sh
rename to pkgs/desktops/kde-5/applications-15.12/kdelibs/setup-hook.sh
diff --git a/pkgs/applications/kde-apps-15.12/kdenetwork-filesharing.nix b/pkgs/desktops/kde-5/applications-15.12/kdenetwork-filesharing.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kdenetwork-filesharing.nix
rename to pkgs/desktops/kde-5/applications-15.12/kdenetwork-filesharing.nix
diff --git a/pkgs/applications/kde-apps-15.12/kgpg.nix b/pkgs/desktops/kde-5/applications-15.12/kgpg.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kgpg.nix
rename to pkgs/desktops/kde-5/applications-15.12/kgpg.nix
diff --git a/pkgs/applications/kde-apps-15.12/kio-extras.nix b/pkgs/desktops/kde-5/applications-15.12/kio-extras.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/kio-extras.nix
rename to pkgs/desktops/kde-5/applications-15.12/kio-extras.nix
diff --git a/pkgs/applications/kde-apps-15.12/konsole.nix b/pkgs/desktops/kde-5/applications-15.12/konsole.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/konsole.nix
rename to pkgs/desktops/kde-5/applications-15.12/konsole.nix
diff --git a/pkgs/applications/kde-apps-15.12/l10n.nix b/pkgs/desktops/kde-5/applications-15.12/l10n.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/l10n.nix
rename to pkgs/desktops/kde-5/applications-15.12/l10n.nix
diff --git a/pkgs/applications/kde-apps-15.12/libkdcraw.nix b/pkgs/desktops/kde-5/applications-15.12/libkdcraw.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/libkdcraw.nix
rename to pkgs/desktops/kde-5/applications-15.12/libkdcraw.nix
diff --git a/pkgs/applications/kde-apps-15.12/libkexiv2.nix b/pkgs/desktops/kde-5/applications-15.12/libkexiv2.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/libkexiv2.nix
rename to pkgs/desktops/kde-5/applications-15.12/libkexiv2.nix
diff --git a/pkgs/applications/kde-apps-15.12/libkipi.nix b/pkgs/desktops/kde-5/applications-15.12/libkipi.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/libkipi.nix
rename to pkgs/desktops/kde-5/applications-15.12/libkipi.nix
diff --git a/pkgs/applications/kde-apps-15.12/okular.nix b/pkgs/desktops/kde-5/applications-15.12/okular.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/okular.nix
rename to pkgs/desktops/kde-5/applications-15.12/okular.nix
diff --git a/pkgs/applications/kde-apps-15.12/print-manager.nix b/pkgs/desktops/kde-5/applications-15.12/print-manager.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/print-manager.nix
rename to pkgs/desktops/kde-5/applications-15.12/print-manager.nix
diff --git a/pkgs/applications/kde-apps-15.12/spectacle.nix b/pkgs/desktops/kde-5/applications-15.12/spectacle.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/spectacle.nix
rename to pkgs/desktops/kde-5/applications-15.12/spectacle.nix
diff --git a/pkgs/applications/kde-apps-15.12/srcs.nix b/pkgs/desktops/kde-5/applications-15.12/srcs.nix
similarity index 100%
rename from pkgs/applications/kde-apps-15.12/srcs.nix
rename to pkgs/desktops/kde-5/applications-15.12/srcs.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/attica.nix b/pkgs/desktops/kde-5/frameworks-5.19/attica.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/attica.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/attica.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/baloo.nix b/pkgs/desktops/kde-5/frameworks-5.19/baloo.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/baloo.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/baloo.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix b/pkgs/desktops/kde-5/frameworks-5.19/bluez-qt.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/bluez-qt.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/bluez-qt.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix b/pkgs/desktops/kde-5/frameworks-5.19/breeze-icons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/breeze-icons.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/breeze-icons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/nix-lib-path.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/nix-lib-path.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/nix-lib-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/series
rename to pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/extra-cmake-modules/setup-hook.sh
rename to pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh b/pkgs/desktops/kde-5/frameworks-5.19/fetchsrcs.sh
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/fetchsrcs.sh
rename to pkgs/desktops/kde-5/frameworks-5.19/fetchsrcs.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix b/pkgs/desktops/kde-5/frameworks-5.19/frameworkintegration.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/frameworkintegration.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/frameworkintegration.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix b/pkgs/desktops/kde-5/frameworks-5.19/kactivities.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kactivities.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kactivities.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix b/pkgs/desktops/kde-5/frameworks-5.19/kapidox.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kapidox.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kapidox.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/karchive.nix b/pkgs/desktops/kde-5/frameworks-5.19/karchive.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/karchive.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/karchive.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch b/pkgs/desktops/kde-5/frameworks-5.19/kauth/cmake-install-paths.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kauth/cmake-install-paths.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kauth/cmake-install-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kauth/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kauth/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kauth/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kauth/series b/pkgs/desktops/kde-5/frameworks-5.19/kauth/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kauth/series
rename to pkgs/desktops/kde-5/frameworks-5.19/kauth/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix b/pkgs/desktops/kde-5/frameworks-5.19/kbookmarks.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kbookmarks.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kbookmarks.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kcmutils/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcmutils/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kcmutils/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kcmutils/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcodecs.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kcodecs.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kcodecs.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcompletion.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kcompletion.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kcompletion.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix b/pkgs/desktops/kde-5/frameworks-5.19/kconfig.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kconfig.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kconfig.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kconfigwidgets/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kconfigwidgets/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcoreaddons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kcoreaddons.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kcoreaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix b/pkgs/desktops/kde-5/frameworks-5.19/kcrash.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kcrash.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kcrash.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdbusaddons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdbusaddons.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdbusaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdeclarative.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdeclarative.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdeclarative.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kded.nix b/pkgs/desktops/kde-5/frameworks-5.19/kded.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kded.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kded.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/nix-kde-include-dir.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/series
rename to pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/setup-hook.sh
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdelibs4support/setup-hook.sh
rename to pkgs/desktops/kde-5/frameworks-5.19/kdelibs4support/setup-hook.sh
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdesignerplugin.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdesignerplugin.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdesignerplugin.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdesu.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdesu.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdesu.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdewebkit.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdewebkit.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdewebkit.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdnssd.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdnssd.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdnssd.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdoctools/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kdoctools/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch b/pkgs/desktops/kde-5/frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kdoctools/kdoctools-no-find-docbook-xml.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kemoticons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kemoticons.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kemoticons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/cmake-install-paths.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/cmake-install-paths.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/cmake-install-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series b/pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kfilemetadata/series
rename to pkgs/desktops/kde-5/frameworks-5.19/kfilemetadata/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix b/pkgs/desktops/kde-5/frameworks-5.19/kglobalaccel.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kglobalaccel.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kglobalaccel.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kguiaddons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kguiaddons.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kguiaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/khtml.nix b/pkgs/desktops/kde-5/frameworks-5.19/khtml.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/khtml.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/khtml.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix b/pkgs/desktops/kde-5/frameworks-5.19/ki18n.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/ki18n.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/ki18n.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch b/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default-theme-breeze.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default-theme-breeze.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default-theme-breeze.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series b/pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kiconthemes/series
rename to pkgs/desktops/kde-5/frameworks-5.19/kiconthemes/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix b/pkgs/desktops/kde-5/frameworks-5.19/kidletime.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kidletime.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kidletime.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix b/pkgs/desktops/kde-5/frameworks-5.19/kimageformats.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kimageformats.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kimageformats.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch b/pkgs/desktops/kde-5/frameworks-5.19/kinit/0001-kinit-libpath.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kinit/0001-kinit-libpath.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kinit/0001-kinit-libpath.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kinit/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kinit/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kinit/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kio/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kio/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kio/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch b/pkgs/desktops/kde-5/frameworks-5.19/kio/samba-search-path.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kio/samba-search-path.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kio/samba-search-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kio/series b/pkgs/desktops/kde-5/frameworks-5.19/kio/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kio/series
rename to pkgs/desktops/kde-5/frameworks-5.19/kio/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix b/pkgs/desktops/kde-5/frameworks-5.19/kitemmodels.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kitemmodels.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kitemmodels.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix b/pkgs/desktops/kde-5/frameworks-5.19/kitemviews.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kitemviews.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kitemviews.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix b/pkgs/desktops/kde-5/frameworks-5.19/kjobwidgets.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kjobwidgets.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kjobwidgets.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjs.nix b/pkgs/desktops/kde-5/frameworks-5.19/kjs.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kjs.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kjs.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix b/pkgs/desktops/kde-5/frameworks-5.19/kjsembed.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kjsembed.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kjsembed.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix b/pkgs/desktops/kde-5/frameworks-5.19/kmediaplayer.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kmediaplayer.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kmediaplayer.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix b/pkgs/desktops/kde-5/frameworks-5.19/knewstuff.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/knewstuff.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/knewstuff.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix b/pkgs/desktops/kde-5/frameworks-5.19/knotifications.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/knotifications.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/knotifications.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix b/pkgs/desktops/kde-5/frameworks-5.19/knotifyconfig.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/knotifyconfig.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/knotifyconfig.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/allow-external-paths.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kpackage/allow-external-paths.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kpackage/allow-external-paths.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kpackage/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kpackage/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kpackage/qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpackage/series b/pkgs/desktops/kde-5/frameworks-5.19/kpackage/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kpackage/series
rename to pkgs/desktops/kde-5/frameworks-5.19/kpackage/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kparts.nix b/pkgs/desktops/kde-5/frameworks-5.19/kparts.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kparts.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kparts.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix b/pkgs/desktops/kde-5/frameworks-5.19/kpeople.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kpeople.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kpeople.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix b/pkgs/desktops/kde-5/frameworks-5.19/kplotting.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kplotting.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kplotting.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kpty.nix b/pkgs/desktops/kde-5/frameworks-5.19/kpty.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kpty.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kpty.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kross.nix b/pkgs/desktops/kde-5/frameworks-5.19/kross.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kross.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kross.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/krunner.nix b/pkgs/desktops/kde-5/frameworks-5.19/krunner.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/krunner.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/krunner.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kservice/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch b/pkgs/desktops/kde-5/frameworks-5.19/kservice/0002-no-canonicalize-path.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kservice/0002-no-canonicalize-path.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/kservice/0002-no-canonicalize-path.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/kservice/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kservice/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kservice/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch b/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/no-qcoreapplication.patch
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/no-qcoreapplication.patch
rename to pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/no-qcoreapplication.patch
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series b/pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/series
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/ktexteditor/series
rename to pkgs/desktops/kde-5/frameworks-5.19/ktexteditor/series
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix b/pkgs/desktops/kde-5/frameworks-5.19/ktextwidgets.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/ktextwidgets.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/ktextwidgets.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix b/pkgs/desktops/kde-5/frameworks-5.19/kunitconversion.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kunitconversion.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kunitconversion.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix b/pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kwallet.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix b/pkgs/desktops/kde-5/frameworks-5.19/kwidgetsaddons.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kwidgetsaddons.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kwidgetsaddons.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix b/pkgs/desktops/kde-5/frameworks-5.19/kwindowsystem.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kwindowsystem.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kwindowsystem.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix b/pkgs/desktops/kde-5/frameworks-5.19/kxmlgui.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kxmlgui.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kxmlgui.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix b/pkgs/desktops/kde-5/frameworks-5.19/kxmlrpcclient.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/kxmlrpcclient.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/kxmlrpcclient.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix b/pkgs/desktops/kde-5/frameworks-5.19/modemmanager-qt.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/modemmanager-qt.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/modemmanager-qt.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix b/pkgs/desktops/kde-5/frameworks-5.19/networkmanager-qt.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/networkmanager-qt.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/networkmanager-qt.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix b/pkgs/desktops/kde-5/frameworks-5.19/oxygen-icons5.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/oxygen-icons5.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/oxygen-icons5.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/plasma-framework/default.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/plasma-framework/default.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/plasma-framework/default.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/solid.nix b/pkgs/desktops/kde-5/frameworks-5.19/solid.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/solid.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/solid.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix b/pkgs/desktops/kde-5/frameworks-5.19/sonnet.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/sonnet.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/sonnet.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/srcs.nix b/pkgs/desktops/kde-5/frameworks-5.19/srcs.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/srcs.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/srcs.nix
diff --git a/pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix b/pkgs/desktops/kde-5/frameworks-5.19/threadweaver.nix
similarity index 100%
rename from pkgs/development/libraries/kde-frameworks-5.19/threadweaver.nix
rename to pkgs/desktops/kde-5/frameworks-5.19/threadweaver.nix
diff --git a/pkgs/desktops/plasma-5.5/bluedevil.nix b/pkgs/desktops/kde-5/plasma-5.5/bluedevil.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/bluedevil.nix
rename to pkgs/desktops/kde-5/plasma-5.5/bluedevil.nix
diff --git a/pkgs/desktops/plasma-5.5/breeze-gtk.nix b/pkgs/desktops/kde-5/plasma-5.5/breeze-gtk.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/breeze-gtk.nix
rename to pkgs/desktops/kde-5/plasma-5.5/breeze-gtk.nix
diff --git a/pkgs/desktops/plasma-5.5/breeze-qt4.nix b/pkgs/desktops/kde-5/plasma-5.5/breeze-qt4.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/breeze-qt4.nix
rename to pkgs/desktops/kde-5/plasma-5.5/breeze-qt4.nix
diff --git a/pkgs/desktops/plasma-5.5/breeze-qt5.nix b/pkgs/desktops/kde-5/plasma-5.5/breeze-qt5.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/breeze-qt5.nix
rename to pkgs/desktops/kde-5/plasma-5.5/breeze-qt5.nix
diff --git a/pkgs/desktops/plasma-5.5/default.nix b/pkgs/desktops/kde-5/plasma-5.5/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/default.nix
diff --git a/pkgs/desktops/plasma-5.5/fetchsrcs.sh b/pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh
similarity index 100%
rename from pkgs/desktops/plasma-5.5/fetchsrcs.sh
rename to pkgs/desktops/kde-5/plasma-5.5/fetchsrcs.sh
diff --git a/pkgs/desktops/plasma-5.5/kde-cli-tools.nix b/pkgs/desktops/kde-5/plasma-5.5/kde-cli-tools.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kde-cli-tools.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kde-cli-tools.nix
diff --git a/pkgs/desktops/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch
rename to pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/0001-follow-symlinks.patch
diff --git a/pkgs/desktops/plasma-5.5/kde-gtk-config/default.nix b/pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kde-gtk-config/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kde-gtk-config/default.nix
diff --git a/pkgs/desktops/plasma-5.5/kdecoration.nix b/pkgs/desktops/kde-5/plasma-5.5/kdecoration.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kdecoration.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kdecoration.nix
diff --git a/pkgs/desktops/plasma-5.5/kdeplasma-addons.nix b/pkgs/desktops/kde-5/plasma-5.5/kdeplasma-addons.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kdeplasma-addons.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kdeplasma-addons.nix
diff --git a/pkgs/desktops/plasma-5.5/kgamma5.nix b/pkgs/desktops/kde-5/plasma-5.5/kgamma5.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kgamma5.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kgamma5.nix
diff --git a/pkgs/desktops/plasma-5.5/khelpcenter.nix b/pkgs/desktops/kde-5/plasma-5.5/khelpcenter.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/khelpcenter.nix
rename to pkgs/desktops/kde-5/plasma-5.5/khelpcenter.nix
diff --git a/pkgs/desktops/plasma-5.5/khotkeys.nix b/pkgs/desktops/kde-5/plasma-5.5/khotkeys.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/khotkeys.nix
rename to pkgs/desktops/kde-5/plasma-5.5/khotkeys.nix
diff --git a/pkgs/desktops/plasma-5.5/kinfocenter.nix b/pkgs/desktops/kde-5/plasma-5.5/kinfocenter.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kinfocenter.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kinfocenter.nix
diff --git a/pkgs/desktops/plasma-5.5/kmenuedit.nix b/pkgs/desktops/kde-5/plasma-5.5/kmenuedit.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kmenuedit.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kmenuedit.nix
diff --git a/pkgs/desktops/plasma-5.5/kscreen.nix b/pkgs/desktops/kde-5/plasma-5.5/kscreen.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kscreen.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kscreen.nix
diff --git a/pkgs/desktops/plasma-5.5/kscreenlocker.nix b/pkgs/desktops/kde-5/plasma-5.5/kscreenlocker.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kscreenlocker.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kscreenlocker.nix
diff --git a/pkgs/desktops/plasma-5.5/ksshaskpass.nix b/pkgs/desktops/kde-5/plasma-5.5/ksshaskpass.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/ksshaskpass.nix
rename to pkgs/desktops/kde-5/plasma-5.5/ksshaskpass.nix
diff --git a/pkgs/desktops/plasma-5.5/ksysguard.nix b/pkgs/desktops/kde-5/plasma-5.5/ksysguard.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/ksysguard.nix
rename to pkgs/desktops/kde-5/plasma-5.5/ksysguard.nix
diff --git a/pkgs/desktops/plasma-5.5/kwayland.nix b/pkgs/desktops/kde-5/plasma-5.5/kwayland.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kwayland.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kwayland.nix
diff --git a/pkgs/desktops/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/plasma-5.5/kwin/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/plasma-5.5/kwin/default.nix b/pkgs/desktops/kde-5/plasma-5.5/kwin/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kwin/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kwin/default.nix
diff --git a/pkgs/desktops/plasma-5.5/kwrited.nix b/pkgs/desktops/kde-5/plasma-5.5/kwrited.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/kwrited.nix
rename to pkgs/desktops/kde-5/plasma-5.5/kwrited.nix
diff --git a/pkgs/desktops/plasma-5.5/libkscreen/default.nix b/pkgs/desktops/kde-5/plasma-5.5/libkscreen/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/libkscreen/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/libkscreen/default.nix
diff --git a/pkgs/desktops/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch b/pkgs/desktops/kde-5/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch
rename to pkgs/desktops/kde-5/plasma-5.5/libksysguard/0001-qdiriterator-follow-symlinks.patch
diff --git a/pkgs/desktops/plasma-5.5/libksysguard/default.nix b/pkgs/desktops/kde-5/plasma-5.5/libksysguard/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/libksysguard/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/libksysguard/default.nix
diff --git a/pkgs/desktops/plasma-5.5/milou.nix b/pkgs/desktops/kde-5/plasma-5.5/milou.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/milou.nix
rename to pkgs/desktops/kde-5/plasma-5.5/milou.nix
diff --git a/pkgs/desktops/plasma-5.5/oxygen.nix b/pkgs/desktops/kde-5/plasma-5.5/oxygen.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/oxygen.nix
rename to pkgs/desktops/kde-5/plasma-5.5/oxygen.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0001-qt-5.5-QML-import-paths.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/0002-hwclock.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0002-hwclock.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-desktop/0002-hwclock.patch
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0002-hwclock.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/0003-tzdir.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0003-tzdir.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-desktop/0003-tzdir.patch
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/0003-tzdir.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-desktop/default.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-desktop/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-desktop/default.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-mediacenter.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-mediacenter.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-mediacenter.nix
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-mediacenter.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-nm/0001-mobile-broadband-provider-info-path.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-nm/default.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-nm/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-nm/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-nm/default.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-pa.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-pa.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-pa.nix
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-pa.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace-wallpapers.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace-wallpapers.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-workspace-wallpapers.nix
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-workspace-wallpapers.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/default.nix b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-workspace/default.nix
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/default.nix
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/qml-import-path.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/qml-import-path.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-workspace/qml-import-path.patch
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/qml-import-path.patch
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/series b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-workspace/series
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/series
diff --git a/pkgs/desktops/plasma-5.5/plasma-workspace/startkde.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch
similarity index 100%
rename from pkgs/desktops/plasma-5.5/plasma-workspace/startkde.patch
rename to pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch
diff --git a/pkgs/desktops/plasma-5.5/polkit-kde-agent.nix b/pkgs/desktops/kde-5/plasma-5.5/polkit-kde-agent.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/polkit-kde-agent.nix
rename to pkgs/desktops/kde-5/plasma-5.5/polkit-kde-agent.nix
diff --git a/pkgs/desktops/plasma-5.5/powerdevil.nix b/pkgs/desktops/kde-5/plasma-5.5/powerdevil.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/powerdevil.nix
rename to pkgs/desktops/kde-5/plasma-5.5/powerdevil.nix
diff --git a/pkgs/desktops/plasma-5.5/srcs.nix b/pkgs/desktops/kde-5/plasma-5.5/srcs.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/srcs.nix
rename to pkgs/desktops/kde-5/plasma-5.5/srcs.nix
diff --git a/pkgs/desktops/plasma-5.5/systemsettings.nix b/pkgs/desktops/kde-5/plasma-5.5/systemsettings.nix
similarity index 100%
rename from pkgs/desktops/plasma-5.5/systemsettings.nix
rename to pkgs/desktops/kde-5/plasma-5.5/systemsettings.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f7d7c8f03f0b..7e3cd07e46fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15015,12 +15015,17 @@ let
 
   kde5 =
     let
-      frameworks = import ../development/libraries/kde-frameworks-5.19 { inherit pkgs; };
-      plasma = import ../desktops/plasma-5.5 { inherit pkgs; };
-      apps = import ../applications/kde-apps-15.12 { inherit pkgs; };
-      named = self: { plasma = plasma self; frameworks = frameworks self; apps = apps self; };
+      frameworks = import ../desktops/kde-5/frameworks-5.19 { inherit pkgs; };
+      plasma = import ../desktops/kde-5/plasma-5.5 { inherit pkgs; };
+      applications = import ../desktops/kde-5/applications-15.12 { inherit pkgs; };
       merged = self:
-        named self // frameworks self // plasma self // apps self // kde5PackagesFun self;
+        { plasma = plasma self;
+          frameworks = frameworks self;
+          applications = applications self; }
+        // frameworks self
+        // plasma self
+        // applications self
+        // kde5PackagesFun self;
     in
       recurseIntoAttrs (lib.makeScope qt55.newScope merged);
 

From b291f1682f5511ddf1cb3d8fa0126ab5de424ad3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 7 Mar 2016 22:03:07 +0100
Subject: [PATCH 2270/2285] perl merge fixup

---
 .../development/interpreters/perl/default.nix | 49 ++++++++++---------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index d9158ad55ab5..0e1df94db5ea 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -17,7 +17,8 @@ assert enableThreading -> (stdenv ? glibc);
 let
 
   libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr";
-
+  libcInc = libc.dev or libc;
+  libcLib = libc.out or libc;
   common = { version, sha256 }: stdenv.mkDerivation rec {
     name = "perl-${version}";
 
@@ -26,7 +27,9 @@ let
       inherit sha256;
     };
 
-    outputs = [ "out" "man" ];
+    # TODO: Add a "dev" output containing the header files.
+    outputs = [ "out" "man" "docdev" ];
+    setOutputFlags = false;
 
     patches =
       [ # Do not look in /usr etc. for dependencies.
@@ -35,17 +38,11 @@ let
       ++ optional stdenv.isSunOS ./ld-shared.patch
       ++ optional stdenv.isDarwin [ ./cpp-precomp.patch ];
 
-    # There's an annoying bug on sandboxed Darwin in Perl's Cwd.pm where it looks for pwd
-    # in /bin/pwd and /usr/bin/pwd and then falls back on just "pwd" if it can't get them
-    # while at the same time erasing the PATH environment variable so it unconditionally
-    # fails. The code in question is guarded by a check for Mac OS, but the patch below
-    # doesn't have any runtime effect on other platforms.
-    postPatch = optional stdenv.isDarwin ''
+    postPatch = ''
       pwd="$(type -P pwd)"
       substituteInPlace dist/PathTools/Cwd.pm \
         --replace "/bin/pwd" "$pwd"
     '';
-
     sandboxProfile = sandbox.allow "ipc-sysv-sem";
 
     # Build a thread-safe Perl with a dynamic libperls.o.  We need the
@@ -59,8 +56,8 @@ let
         "-Uinstallusrbinperl"
         "-Dinstallstyle=lib/perl5"
         "-Duseshrplib"
-        "-Dlocincpth=${libc}/include"
-        "-Dloclibpth=${libc}/lib"
+        "-Dlocincpth=${libcInc}/include"
+        "-Dloclibpth=${libcLib}/lib"
       ]
       ++ optional stdenv.isSunOS "-Dcc=gcc"
       ++ optional enableThreading "-Dusethreads";
@@ -74,10 +71,8 @@ let
     preConfigure =
       ''
         configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3"
-
-        ${optionalString stdenv.isArm ''
-          configureFlagsArray=(-Dldflags="-lm -lrt")
-        ''}
+    '' + optionalString stdenv.isArm ''
+      configureFlagsArray=(-Dldflags="-lm -lrt")
       '' + optionalString stdenv.isDarwin ''
         substituteInPlace hints/darwin.sh --replace "env MACOSX_DEPLOYMENT_TARGET=10.3" ""
       '' + optionalString (!enableThreading) ''
@@ -91,18 +86,26 @@ let
         substituteInPlace dist/PathTools/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'"
       '';
 
-    # Inspired by nuke-references, which I can't depend on because it uses perl. Perhaps it should just use sed :)
-    postInstall = ''
-      self=$(echo $out | sed -n "s|^$NIX_STORE/\\([a-z0-9]\{32\}\\)-.*|\1|p")
-
-      sed -i "/$self/b; s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" "$out"/lib/perl5/*/*/Config.pm
-      sed -i "/$self/b; s|$NIX_STORE/[a-z0-9]\{32\}-|$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-|g" "$out"/lib/perl5/*/*/Config_heavy.pl
-    '';
-
     setupHook = ./setup-hook.sh;
 
     passthru.libPrefix = "lib/perl5/site_perl";
 
+  # TODO: it seems like absolute paths to some coreutils is required.
+  postInstall =
+    ''
+      # Remove dependency between "out" and "man" outputs.
+      rm "$out"/lib/perl5/*/*/.packlist
+
+      # Remove dependencies on glibc and gcc
+      sed "/ *libpth =>/c    libpth => ' '," \
+        -i "$out"/lib/perl5/*/*/Config.pm
+      # TODO: removing those paths would be cleaner than overwriting with nonsense.
+      substituteInPlace "$out"/lib/perl5/*/*/Config_heavy.pl \
+        --replace "${libcInc}" /no-such-path \
+        --replace "${stdenv.cc.cc or "/no-such-path"}" /no-such-path \
+        --replace "$man" /no-such-path
+    ''; # */
+
     meta = {
       homepage = https://www.perl.org/;
       description = "The standard implementation of the Perl 5 programmming language";

From 61ebdc192d5ca5c434cb7420f84aa6bf4f554fb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Sun, 21 Feb 2016 17:47:44 +0100
Subject: [PATCH 2271/2285] bash-interactive: better split doc stuff

... while avoiding mass rebuild ATM.
---
 pkgs/shells/bash/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix
index e49e7ef5da49..2fa229692eb3 100644
--- a/pkgs/shells/bash/default.nix
+++ b/pkgs/shells/bash/default.nix
@@ -21,7 +21,12 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  outputs = [ "out" "doc" ];
+  outputs = if (!interactive) # conditional to avoid mass rebuild ATM
+    then [ "out" "doc" ]
+    else [ "out" "doc" "info" ];
+
+  # the man pages are small and useful enough
+  outputMan = if interactive then "out" else null;
 
   NIX_CFLAGS_COMPILE = ''
     -DSYS_BASHRC="/etc/bashrc"

From 2cbe6bb3f00d86307d08cbcdfbf3b4a7f8c64d88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Mon, 22 Feb 2016 09:57:31 +0100
Subject: [PATCH 2272/2285] nix: split man output from doc

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

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 836987336893..77b27dbf3dc6 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -9,7 +9,7 @@ let
   common = { name, src }: stdenv.mkDerivation rec {
     inherit name src;
 
-    outputs = [ "out" "doc" ];
+    outputs = [ "out" "man" "doc" ];
 
     nativeBuildInputs = [ perl pkgconfig ];
 

From 394ffcb3e5a89690588319eb995d3e066a1f2f89 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 8 Mar 2016 11:26:14 -0600
Subject: [PATCH 2273/2285] staruml: fix evaluation on closure-size

---
 pkgs/tools/misc/staruml/default.nix | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/pkgs/tools/misc/staruml/default.nix b/pkgs/tools/misc/staruml/default.nix
index 4c60e790238e..0d2982c022f9 100644
--- a/pkgs/tools/misc/staruml/default.nix
+++ b/pkgs/tools/misc/staruml/default.nix
@@ -1,5 +1,12 @@
-{ stdenv, fetchurl, makeWrapper, dpkg, patchelf, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, udev }:
+{ stdenv, fetchurl, makeWrapper
+, dpkg, patchelf
+, gtk2, glib, gdk_pixbuf, alsaLib, nss, nspr, GConf, cups, libgcrypt, dbus, libudev }:
 
+let
+  inherit (stdenv) lib;
+  LD_LIBRARY_PATH = lib.makeLibraryPath
+    [ glib gtk2 gdk_pixbuf alsaLib nss nspr GConf cups libgcrypt dbus ];
+in
 stdenv.mkDerivation rec {
   version = "2.6.0";
   name = "staruml-${version}";
@@ -16,13 +23,13 @@ stdenv.mkDerivation rec {
   buildInputs = [ dpkg ];
 
   nativeBuildInputs = [ makeWrapper ];
-  
+
   unpackPhase = ''
     mkdir pkg
     dpkg-deb -x $src pkg
     sourceRoot=pkg
   '';
-  
+
   installPhase = ''
     mkdir $out
     mv opt/staruml $out/bin
@@ -30,14 +37,14 @@ stdenv.mkDerivation rec {
     ${patchelf}/bin/patchelf \
       --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \
       $out/bin/StarUML
-    
+
     mkdir -p $out/lib
-    
+
     ln -s ${stdenv.cc.cc}/lib/libstdc++.so.6 $out/lib/
-    ln -s ${udev}/lib/libudev.so.1 $out/lib/libudev.so.0
+    ln -s ${libudev.out}/lib/libudev.so.1 $out/lib/libudev.so.0
 
     wrapProgram $out/bin/StarUML \
-      --prefix LD_LIBRARY_PATH : $out/lib:${glib}/lib:${gtk2}/lib:${gdk_pixbuf}/lib/:${alsaLib}/lib/:${nss}/lib/:${nspr}/lib/:${GConf}/lib/:${cups}/lib/:${libgcrypt}/lib/:${dbus}/lib/
+      --prefix LD_LIBRARY_PATH : $out/lib:${LD_LIBRARY_PATH}
   '';
 
   meta = with stdenv.lib; {

From 1d5a9c0fab7b135d91a74ed1cab2013cd1a7f2a3 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 8 Mar 2016 13:36:19 -0600
Subject: [PATCH 2274/2285] kde5: fix merge conflicts from master

The last merge from master into closure-size obliterated all my
closure-size fixes for KDE 5! Luckily, I had them backed-up in another
branch.
---
 .../0001-extra-cmake-modules-paths.patch      |  74 -------------
 .../extra-cmake-modules/default.nix           |  12 +-
 .../extra-cmake-modules/setup-hook.sh         | 104 +++++++++++++-----
 .../kde-5/frameworks-5.19/kwallet.nix         |   4 +-
 4 files changed, 88 insertions(+), 106 deletions(-)
 delete mode 100644 pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch

diff --git a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
deleted file mode 100644
index 9717716faf5b..000000000000
--- a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/0001-extra-cmake-modules-paths.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 3cc148e878b69fc3e0228f3e3bf1bbe689dad87c Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@gmail.com>
-Date: Fri, 20 Feb 2015 23:17:39 -0600
-Subject: [PATCH] extra-cmake-modules paths
-
----
- kde-modules/KDEInstallDirs.cmake | 37 ++++---------------------------------
- 1 file changed, 4 insertions(+), 33 deletions(-)
-
-diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
-index b7cd34d..2f868ac 100644
---- a/kde-modules/KDEInstallDirs.cmake
-+++ b/kde-modules/KDEInstallDirs.cmake
-@@ -193,37 +193,8 @@
- # (To distribute this file outside of extra-cmake-modules, substitute the full
- #  License text for the above reference.)
- 
--# Figure out what the default install directory for libraries should be.
--# This is based on the logic in GNUInstallDirs, but simplified (the
--# GNUInstallDirs code deals with re-configuring, but that is dealt with
--# by the _define_* macros in this module).
-+# The default library directory on NixOS is *always* /lib.
- set(_LIBDIR_DEFAULT "lib")
--# Override this default 'lib' with 'lib64' iff:
--#  - we are on a Linux, kFreeBSD or Hurd system but NOT cross-compiling
--#  - we are NOT on debian
--#  - we are on a 64 bits system
--# reason is: amd64 ABI: http://www.x86-64.org/documentation/abi.pdf
--# For Debian with multiarch, use 'lib/${CMAKE_LIBRARY_ARCHITECTURE}' if
--# CMAKE_LIBRARY_ARCHITECTURE is set (which contains e.g. "i386-linux-gnu"
--# See http://wiki.debian.org/Multiarch
--if((CMAKE_SYSTEM_NAME MATCHES "Linux|kFreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "GNU")
--   AND NOT CMAKE_CROSSCOMPILING)
--  if (EXISTS "/etc/debian_version") # is this a debian system ?
--    if(CMAKE_LIBRARY_ARCHITECTURE)
--      set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}")
--    endif()
--  else() # not debian, rely on CMAKE_SIZEOF_VOID_P:
--    if(NOT DEFINED CMAKE_SIZEOF_VOID_P)
--      message(AUTHOR_WARNING
--        "Unable to determine default LIB_INSTALL_LIBDIR directory because no target architecture is known. "
--        "Please enable at least one language before including KDEInstallDirs.")
--    else()
--      if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
--        set(_LIBDIR_DEFAULT "lib64")
--      endif()
--    endif()
--  endif()
--endif()
- 
- set(_gnu_install_dirs_vars
-     BINDIR
-@@ -445,15 +416,15 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
-         "QtQuick2 imports"
-         QML_INSTALL_DIR)
- else()
--    _define_relative(QTPLUGINDIR LIBDIR "plugins"
-+    _define_relative(QTPLUGINDIR LIBDIR "qt5/plugins"
-         "Qt plugins"
-         QT_PLUGIN_INSTALL_DIR)
- 
--    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "imports"
-+    _define_relative(QTQUICKIMPORTSDIR QTPLUGINDIR "qt5/imports"
-         "QtQuick1 imports"
-         IMPORTS_INSTALL_DIR)
- 
--    _define_relative(QMLDIR LIBDIR "qml"
-+    _define_relative(QMLDIR LIBDIR "qt5/qml"
-         "QtQuick2 imports"
-         QML_INSTALL_DIR)
- endif()
--- 
-2.3.0
-
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix
index 4e1b1aff3bd1..1c2ea70442d3 100644
--- a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/default.nix
@@ -1,9 +1,11 @@
-{ kdeFramework, lib, stdenv, cmake, pkgconfig, qttools }:
+{ kdeFramework, lib, copyPathsToStore, cmake, pkgconfig, qttools }:
 
 kdeFramework {
   name = "extra-cmake-modules";
-  patches = [ ./0001-extra-cmake-modules-paths.patch ];
 
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+
+  outputs = [ "out" ];  # this package has no runtime components
   setupHook = ./setup-hook.sh;
 
   # It is OK to propagate these inputs as long as
@@ -11,8 +13,8 @@ kdeFramework {
   # of some other derivation.
   propagatedNativeBuildInputs = [ cmake pkgconfig qttools ];
 
-  meta = {
-    license = stdenv.lib.licenses.bsd2;
-    maintainers = [ lib.maintainers.ttuegel ];
+  meta = with lib; {
+    license = licenses.bsd2;
+    maintainers = [ maintainers.ttuegel ];
   };
 }
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh
index a6fa6189240b..56ed09f4ea59 100644
--- a/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh
+++ b/pkgs/desktops/kde-5/frameworks-5.19/extra-cmake-modules/setup-hook.sh
@@ -1,27 +1,81 @@
-addMimePkg() {
-    local propagated
-
-    if [[ -d "$1/share/mime" ]]; then
-        propagated=
-        for pkg in $propagatedBuildInputs; do
-            if [[ "z$pkg" == "z$1" ]]; then
-                propagated=1
-            fi
-        done
-        if [[ -z $propagated ]]; then
-            propagatedBuildInputs="$propagatedBuildInputs $1"
-        fi
-
-        propagated=
-        for pkg in $propagatedUserEnvPkgs; do
-            if [[ "z$pkg" == "z$1" ]]; then
-                propagated=1
-            fi
-        done
-        if [[ -z $propagated ]]; then
-            propagatedUserEnvPkgs="$propagatedUserEnvPkgs $1"
-        fi
-    fi
+_ecmSetXdgDirs() {
+    addToSearchPathOnce XDG_DATA_DIRS "$1/share"
+    addToSearchPathOnce XDG_CONFIG_DIRS "$1/etc/xdg"
+    addToSearchPathOnce NIX_WRAP_XDG_CONFIG_DIRS "$1/etc/xdg"
 }
 
-envHooks+=(addMimePkg)
+_ecmPropagateSharedData() {
+    local sharedPaths=( \
+        "config.cfg" \
+        "doc" \
+        "kconf_update" \
+        "kservices5" \
+        "kservicetypes5" \
+        "kxmlgui5" \
+        "knotifications5" \
+        "icons" \
+        "sounds" \
+        "templates" \
+        "wallpapers" \
+        "applications" \
+        "desktop-directories" \
+        "mime" \
+        "info" \
+        "dbus-1" \
+        "interfaces" \
+        "services" \
+        "system-services" )
+    for dir in ${sharedPaths[@]}; do
+        if [ -d "$1/share/$dir" ]; then
+            addToSearchPathOnce NIX_WRAP_XDG_DATA_DIRS "$1/share"
+            propagateOnce propagatedUserEnvPkgs "$1"
+            break
+        fi
+    done
+}
+
+_ecmConfig() {
+    # Because we need to use absolute paths here, we must set *all* the paths.
+    cmakeFlags+=" -DKDE_INSTALL_EXECROOTDIR=${!outputBin}"
+    cmakeFlags+=" -DKDE_INSTALL_BINDIR=${!outputBin}/bin"
+    cmakeFlags+=" -DKDE_INSTALL_SBINDIR=${!outputBin}/sbin"
+    cmakeFlags+=" -DKDE_INSTALL_LIBDIR=${!outputLib}/lib"
+    cmakeFlags+=" -DKDE_INSTALL_LIBEXECDIR=${!outputLib}/lib/libexec"
+    cmakeFlags+=" -DKDE_INSTALL_CMAKEPACKAGEDIR=${!outputDev}/lib/cmake"
+    cmakeFlags+=" -DKDE_INSTALL_QTPLUGINDIR=${!outputLib}/lib/qt5/plugins"
+    cmakeFlags+=" -DKDE_INSTALL_PLUGINDIR=${!outputLib}/lib/qt5/plugins"
+    cmakeFlags+=" -DKDE_INSTALL_QTQUICKIMPORTSDIR=${!outputLib}/lib/qt5/imports"
+    cmakeFlags+=" -DKDE_INSTALL_QMLDIR=${!outputLib}/lib/qt5/qml"
+    cmakeFlags+=" -DKDE_INSTALL_INCLUDEDIR=${!outputInclude}/include"
+    cmakeFlags+=" -DKDE_INSTALL_LOCALSTATEDIR=/var"
+    cmakeFlags+=" -DKDE_INSTALL_DATAROOTDIR=${!outputLib}/share"
+    cmakeFlags+=" -DKDE_INSTALL_DATADIR=${!outputLib}/share"
+    cmakeFlags+=" -DKDE_INSTALL_DOCBUNDLEDIR=${!outputLib}/share/doc/HTML"
+    cmakeFlags+=" -DKDE_INSTALL_KCFGDIR=${!outputLib}/share/config.kcfg"
+    cmakeFlags+=" -DKDE_INSTALL_KCONFUPDATEDIR=${!outputLib}/share/kconf_update"
+    cmakeFlags+=" -DKDE_INSTALL_KSERVICES5DIR=${!outputLib}/share/kservices5"
+    cmakeFlags+=" -DKDE_INSTALL_KSERVICETYPES5DIR=${!outputLib}/share/kservicetypes5"
+    cmakeFlags+=" -DKDE_INSTALL_KXMLGUI5DIR=${!outputLib}/share/kxmlgui5"
+    cmakeFlags+=" -DKDE_INSTALL_KNOTIFY5RCDIR=${!outputLib}/share/knotifications5"
+    cmakeFlags+=" -DKDE_INSTALL_ICONDIR=${!outputLib}/share/icons"
+    cmakeFlags+=" -DKDE_INSTALL_LOCALEDIR=${!outputLib}/share/locale"
+    cmakeFlags+=" -DKDE_INSTALL_SOUNDDIR=${!outputLib}/share/sounds"
+    cmakeFlags+=" -DKDE_INSTALL_TEMPLATEDIR=${!outputLib}/share/templates"
+    cmakeFlags+=" -DKDE_INSTALL_WALLPAPERDIR=${!outputLib}/share/wallpapers"
+    cmakeFlags+=" -DKDE_INSTALL_APPDIR=${!outputLib}/share/applications"
+    cmakeFlags+=" -DKDE_INSTALL_DESKTOPDIR=${!outputLib}/share/desktop-directories"
+    cmakeFlags+=" -DKDE_INSTALL_MIMEDIR=${!outputLib}/share/mime/packages"
+    cmakeFlags+=" -DKDE_INSTALL_METAINFODIR=${!outputLib}/share/appdata"
+    cmakeFlags+=" -DKDE_INSTALL_MANDIR=${!outputLib}/share/man"
+    cmakeFlags+=" -DKDE_INSTALL_INFODIR=${!outputLib}/share/info"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSDIR=${!outputLib}/share/dbus-1"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSINTERFACEDIR=${!outputLib}/share/dbus-1/interfaces"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSSERVICEDIR=${!outputLib}/share/dbus-1/services"
+    cmakeFlags+=" -DKDE_INSTALL_DBUSSYSTEMSERVICEDIR=${!outputLib}/share/dbus-1/system-services"
+    cmakeFlags+=" -DKDE_INSTALL_SYSCONFDIR=${!outputLib}/etc"
+    cmakeFlags+=" -DKDE_INSTALL_CONFDIR=${!outputLib}/etc/xdg"
+    cmakeFlags+=" -DKDE_INSTALL_AUTOSTARTDIR=${!outputLib}/etc/xdg/autostart"
+}
+
+envHooks+=(_ecmSetXdgDirs _ecmPropagateSharedData)
+preConfigureHooks+=(_ecmConfig)
diff --git a/pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix b/pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix
index ec6d196c0649..5ade5f63a8d0 100644
--- a/pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix
+++ b/pkgs/desktops/kde-5/frameworks-5.19/kwallet.nix
@@ -1,6 +1,6 @@
 { kdeFramework, lib, extra-cmake-modules, kconfig, kconfigwidgets
-, kcoreaddons, kdbusaddons, kdoctools, ki18n, kiconthemes, knotifications
-, kservice, kwidgetsaddons, kwindowsystem, libgcrypt
+, kcoreaddons , kdbusaddons, kdoctools, ki18n, kiconthemes
+, knotifications , kservice, kwidgetsaddons, kwindowsystem, libgcrypt
 , makeQtWrapper }:
 
 kdeFramework {

From cb1b4e803d526953eb5bf270858154c73e442739 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Wed, 9 Mar 2016 06:11:58 -0600
Subject: [PATCH 2275/2285] kde5.kcalc: add gmp dependency

---
 pkgs/desktops/kde-5/applications-15.12/kcalc.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/kde-5/applications-15.12/kcalc.nix b/pkgs/desktops/kde-5/applications-15.12/kcalc.nix
index a1f0316825da..e4c8e9d69253 100644
--- a/pkgs/desktops/kde-5/applications-15.12/kcalc.nix
+++ b/pkgs/desktops/kde-5/applications-15.12/kcalc.nix
@@ -1,14 +1,14 @@
 { kdeApp
 , lib
-, extra-cmake-modules
-, kdoctools
 , makeQtWrapper
+, extra-cmake-modules
+, gmp
+, kdoctools
 , kconfig
 , kconfigwidgets
 , kguiaddons
 , kinit
 , knotifications
-
 }:
 
 kdeApp {
@@ -20,6 +20,7 @@ kdeApp {
   ];
 
   buildInputs = [
+    gmp
     kconfig
     kconfigwidgets
     kguiaddons

From c801cd1a047efa51055fd04698e316ddd503fd1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 11 Mar 2016 11:50:40 +0100
Subject: [PATCH 2276/2285] php: fixup build when configured with httpd via
 nixos

---
 nixos/modules/services/web-servers/apache-httpd/default.nix | 2 +-
 pkgs/development/interpreters/php/default.nix               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix
index ed66ea9fc876..760d7e147d7c 100644
--- a/nixos/modules/services/web-servers/apache-httpd/default.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/default.nix
@@ -12,7 +12,7 @@ let
 
   httpdConf = mainCfg.configFile;
 
-  php = pkgs.php.override { apacheHttpd = httpd; };
+  php = pkgs.php.override { apacheHttpd = httpd.dev; /* otherwise it only gets .out */ };
 
   getPort = cfg: if cfg.port != 0 then cfg.port else if cfg.enableSSL then 443 else 80;
 
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
index 9448c4c159a1..8c60fcb9ba22 100644
--- a/pkgs/development/interpreters/php/default.nix
+++ b/pkgs/development/interpreters/php/default.nix
@@ -30,7 +30,7 @@ let
         # SAPI modules:
 
         apxs2 = {
-          configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"];
+          configureFlags = ["--with-apxs2=${apacheHttpd.dev}/bin/apxs"];
           buildInputs = [apacheHttpd];
         };
 

From 4c0125bc8f7c3dd6a7971d2ae8b1e7c238917e46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 11 Mar 2016 15:10:30 +0100
Subject: [PATCH 2277/2285] chromium: fixup plugins with multiple outputs

Chromium+flash seem to work fine now.
---
 pkgs/applications/networking/browsers/chromium/plugins.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix
index c3b294876c87..ebdb3d844187 100644
--- a/pkgs/applications/networking/browsers/chromium/plugins.nix
+++ b/pkgs/applications/networking/browsers/chromium/plugins.nix
@@ -45,6 +45,7 @@ let
 
     phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ];
     outputs = [ "flash" "widevine" ];
+    out = "flash"; # outputs TODO: is this a hack?
 
     unpackCmd = let
       chan = if source.channel == "dev"    then "chrome-unstable"
@@ -64,7 +65,7 @@ let
     '';
 
     patchPhase = let
-      rpaths = [ stdenv.cc.cc ];
+      rpaths = [ stdenv.cc.cc.lib ];
       mkrpath = p: "${makeSearchPath "lib64" p}:${makeSearchPath "lib" p}";
     in ''
       for sofile in PepperFlash/libpepflashplayer.so \

From c0c2be83a36fb25b3f47518a93b4bbcbbcc27c54 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 11 Mar 2016 08:44:28 -0600
Subject: [PATCH 2278/2285] kde5.plasma-workspace: move kbuildsycoca5 earlier
 in startkde

---
 .../plasma-workspace/startkde.patch           | 45 +++++++++----------
 1 file changed, 21 insertions(+), 24 deletions(-)

diff --git a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch
index 17c0ccf0ca93..eea0ae4c199d 100644
--- a/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch
+++ b/pkgs/desktops/kde-5/plasma-5.5/plasma-workspace/startkde.patch
@@ -1,8 +1,8 @@
-Index: plasma-workspace-5.5.1/startkde/startkde.cmake
+Index: plasma-workspace-5.5.5/startkde/startkde.cmake
 ===================================================================
---- plasma-workspace-5.5.1.orig/startkde/startkde.cmake
-+++ plasma-workspace-5.5.1/startkde/startkde.cmake
-@@ -1,8 +1,31 @@
+--- plasma-workspace-5.5.5.orig/startkde/startkde.cmake
++++ plasma-workspace-5.5.5/startkde/startkde.cmake
+@@ -1,8 +1,36 @@
 -#!/bin/sh
 +#!@bash@
  #
@@ -31,11 +31,16 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
 +if [ -e $HOME/.config/Trolltech.conf ]; then
 +    @sed@ -e '/nix\\store\|nix\/store/ d' -i $HOME/.config/Trolltech.conf
 +fi
++
++# (NixOS) We run kbuildsycoca5 before starting the user session because things
++# may be missing or moved if they have run nixos-rebuild and it may not be
++# possible for them to start Konsole to run it manually!
++@kbuildsycoca5@
 +
  if test "x$1" = x--failsafe; then
      KDE_FAILSAFE=1 # General failsafe flag
      KWIN_COMPOSE=N # Disable KWin's compositing
-@@ -17,29 +40,16 @@ trap 'echo GOT SIGHUP' HUP
+@@ -17,29 +45,16 @@ trap 'echo GOT SIGHUP' HUP
  # we have to unset this for Darwin since it will screw up KDE's dynamic-loading
  unset DYLD_FORCE_FLAT_NAMESPACE
  
@@ -69,7 +74,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  fi
  
  # Boot sequence:
-@@ -57,13 +67,8 @@ fi
+@@ -57,13 +72,8 @@ fi
  # * Then ksmserver is started which takes control of the rest of the startup sequence
  
  # We need to create config folder so we can write startupconfigkeys
@@ -85,7 +90,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  
  #This is basically setting defaults so we can use them with kstartupconfig5
  cat >$configDir/startupconfigkeys <<EOF
-@@ -102,42 +107,10 @@ XftSubPixel=none
+@@ -102,42 +112,10 @@ XftSubPixel=none
  EOF
  }
  
@@ -130,7 +135,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
      exit 1
  fi
  [ -r $configDir/startupconfig ] && . $configDir/startupconfig
-@@ -146,9 +119,11 @@ if test "$kdeglobals_kscreen_scalefactor
+@@ -146,9 +124,11 @@ if test "$kdeglobals_kscreen_scalefactor
      export QT_DEVICE_PIXEL_RATIO=$kdeglobals_kscreen_scalefactor
  fi
  
@@ -143,7 +148,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  
      kapplymousetheme "$kcminputrc_mouse_cursortheme" "$kcminputrc_mouse_cursorsize"
      if test $? -eq 10; then
-@@ -164,21 +139,39 @@ if test -n "$kcminputrc_mouse_cursorthem
+@@ -164,21 +144,39 @@ if test -n "$kcminputrc_mouse_cursorthem
      fi
  fi
  
@@ -189,7 +194,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
        ;;
      None)
        ;;
-@@ -201,8 +194,7 @@ fi
+@@ -201,8 +199,7 @@ fi
  # For anything else (that doesn't set env vars, or that needs a window manager),
  # better use the Autostart folder.
  
@@ -199,7 +204,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  
  # Add /env/ to the directory to locate the scripts to be sourced
  for prefix in `echo $scriptpath`; do
-@@ -232,7 +224,7 @@ usr_odir=$HOME/.fonts/kde-override
+@@ -232,7 +229,7 @@ usr_odir=$HOME/.fonts/kde-override
  usr_fdir=$HOME/.fonts
  
  if test -n "$KDEDIRS"; then
@@ -208,7 +213,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
    sys_odir=$kdedirs_first/share/fonts/override
    sys_fdir=$kdedirs_first/share/fonts
  else
-@@ -245,23 +237,13 @@ fi
+@@ -245,23 +242,13 @@ fi
  # add the user's dirs to the font path, as they might simply have been made
  # read-only by the administrator, for whatever reason.
  
@@ -237,7 +242,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  
  # Get Ghostscript to look into user's KDE fonts dir for additional Fontmap
  if test -n "$GS_LIB" ; then
-@@ -274,26 +256,6 @@ fi
+@@ -274,26 +261,6 @@ fi
  
  echo 'startkde: Starting up...'  1>&2
  
@@ -264,7 +269,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  # Mark that full KDE session is running (e.g. Konqueror preloading works only
  # with full KDE running). The KDE_FULL_SESSION property can be detected by
  # any X client connected to the same X session, even if not launched
-@@ -318,11 +280,11 @@ fi
+@@ -318,11 +285,11 @@ fi
  #
  KDE_FULL_SESSION=true
  export KDE_FULL_SESSION
@@ -278,7 +283,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  
  KDE_SESSION_UID=`id -ru`
  export KDE_SESSION_UID
-@@ -332,11 +294,11 @@ export XDG_CURRENT_DESKTOP
+@@ -332,11 +299,11 @@ export XDG_CURRENT_DESKTOP
  
  # At this point all the environment is ready, let's send it to kwalletd if running
  if test -n "$PAM_KWALLET_LOGIN" ; then
@@ -292,7 +297,7 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
  fi
  
  # At this point all environment variables are set, let's send it to the DBus session server to update the activation environment
-@@ -349,21 +311,26 @@ if test $? -ne 0; then
+@@ -349,18 +316,18 @@ if test $? -ne 0; then
    # Startup error
    echo 'startkde: Could not sync environment to dbus.'  1>&2
    test -n "$ksplash_pid" && kill "$ksplash_pid" 2>/dev/null
@@ -314,14 +319,6 @@ Index: plasma-workspace-5.5.1/startkde/startkde.cmake
    exit 1
  fi
  
-+# (NixOS) We run kbuildsycoca5 before starting the user session because things
-+# may be missing or moved if they have run nixos-rebuild and it may not be
-+# possible for them to start Konsole to run it manually!
-+@kbuildsycoca5@
-+
- # finally, give the session control to the session manager
- # see kdebase/ksmserver for the description of the rest of the startup sequence
- # if the KDEWM environment variable has been set, then it will be used as KDE's
 @@ -379,27 +346,27 @@ test -n "$KDEWM" && KDEWM="--windowmanag
  # lock now and do the rest of the KDE startup underneath the locker.
  KSMSERVEROPTIONS=""

From cd5e923f550950fa85ec409cc992460032ddd684 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 11 Mar 2016 08:57:39 -0600
Subject: [PATCH 2279/2285] luajit: fix evaluation on Darwin

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

diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix
index 0d4a5ef2d6a6..ab57d285288a 100644
--- a/pkgs/development/interpreters/luajit/default.nix
+++ b/pkgs/development/interpreters/luajit/default.nix
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
   '' + stdenv.lib.optionalString (stdenv.cc.libc != null)
   ''
     substituteInPlace Makefile \
-      --replace ldconfig ${stdenv.cc.libc.bin}/bin/ldconfig
+      --replace ldconfig ${stdenv.cc.libc.bin or stdenv.cc.libc}/bin/ldconfig
   '';
 
   configurePhase = false;

From 9e5b2d5e3d517ec915ff2472f95967e504f392b7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 11 Mar 2016 09:10:10 -0600
Subject: [PATCH 2280/2285] qt48: fix evaluation error on Darwin

---
 pkgs/development/libraries/qt-4.x/4.8/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix
index 07a7993a67fe..788fb8741402 100644
--- a/pkgs/development/libraries/qt-4.x/4.8/default.nix
+++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
       ./libressl.patch
       (substituteAll {
         src = ./dlopen-absolute-paths.diff;
-        cups = cups.out;
+        cups = if cups != null then cups.out else null;
         icu = icu.out;
         libXfixes = libXfixes.out;
         glibc = stdenv.cc.libc.out;

From 1fae9a36aa0c1dc5ac4521fe9cce2218a13e5845 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 11 Mar 2016 09:12:39 -0600
Subject: [PATCH 2281/2285] ppp: fix evaluation error on Darwin

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

diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix
index 7d3ced17b40c..0f5de17c71b6 100644
--- a/pkgs/tools/networking/ppp/default.nix
+++ b/pkgs/tools/networking/ppp/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     [ ( substituteAll {
         src = ./nix-purity.patch;
         inherit libpcap;
-        glibc = stdenv.cc.libc.dev;
+        glibc = stdenv.cc.libc.dev or stdenv.cc.libc;
       })
       # Without nonpriv.patch, pppd --version doesn't work when not run as
       # root.

From 5ec07e4bf3bcd68db4f5e02a6012ed429ce1e045 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 11 Mar 2016 09:53:04 -0600
Subject: [PATCH 2282/2285] module-init-tools: disable on Darwin to fix
 evaluation error

---
 pkgs/os-specific/linux/module-init-tools/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/module-init-tools/default.nix b/pkgs/os-specific/linux/module-init-tools/default.nix
index 2d6875d506a7..ded6e77e43b4 100644
--- a/pkgs/os-specific/linux/module-init-tools/default.nix
+++ b/pkgs/os-specific/linux/module-init-tools/default.nix
@@ -1,5 +1,7 @@
 { stdenv, fetchurl, docbook2x, docbook_sgml_dtd_41 }:
 
+assert (stdenv.lib.elem stdenv.system stdenv.lib.platforms.linux);
+
 stdenv.mkDerivation {
   name = "module-init-tools-3.16";
 
@@ -31,5 +33,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/;
     description = "Tools for loading and managing Linux kernel modules";
+    platforms = stdenv.lib.platforms.linux;
   };
 }

From 1f56abef8eb31b84658133c647a60b795e926913 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 11 Mar 2016 09:53:20 -0600
Subject: [PATCH 2283/2285] recoll: fix evaluation error on Darwin

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

diff --git a/pkgs/applications/search/recoll/default.nix b/pkgs/applications/search/recoll/default.nix
index 55fd3eba6220..253b97aff1e7 100644
--- a/pkgs/applications/search/recoll/default.nix
+++ b/pkgs/applications/search/recoll/default.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
       substituteInPlace  $f --replace egrep         ${gnugrep}/bin/egrep
       substituteInPlace  $f --replace groff         ${groff}/bin/groff
       substituteInPlace  $f --replace gunzip        ${gzip}/bin/gunzip
-      substituteInPlace  $f --replace iconv         ${libiconv.bin}/bin/iconv
+      substituteInPlace  $f --replace iconv         ${libiconv.bin or libiconv}/bin/iconv
       substituteInPlace  $f --replace lyx           ${lyx}/bin/lyx
       substituteInPlace  $f --replace pdftotext     ${poppler_utils.out}/bin/pdftotext
       substituteInPlace  $f --replace pstotext      ${ghostscript}/bin/ps2ascii 

From 2667e4f5d7b19df4b66c471bcc89aede579d8458 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 11 Mar 2016 10:30:28 -0600
Subject: [PATCH 2284/2285] make-bootstrap-tools: fix evaluation error on
 Darwin

---
 pkgs/stdenv/darwin/make-bootstrap-tools.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/darwin/make-bootstrap-tools.nix b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
index dc52015c52dc..e2ad9c2b8d7e 100644
--- a/pkgs/stdenv/darwin/make-bootstrap-tools.nix
+++ b/pkgs/stdenv/darwin/make-bootstrap-tools.nix
@@ -62,7 +62,7 @@ rec {
       cp -d ${openssl.out}/lib/*.dylib $out/lib
 
       cp -d ${gnugrep.pcre.out}/lib/libpcre*.dylib $out/lib
-      cp -d ${libiconv.lib}/lib/lib*.dylib $out/lib
+      cp -d ${libiconv.lib or libiconv}/lib/lib*.dylib $out/lib
       cp -d ${gettext}/lib/libintl*.dylib $out/lib
       chmod +x $out/lib/libintl*.dylib
       cp -d ${ncurses.lib}/lib/libncurses*.dylib $out/lib

From 42b1e8ee580712b1f4d3f194b79b2099667e648e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 11 Mar 2016 10:30:45 -0600
Subject: [PATCH 2285/2285] ghc-6.10.2-binary: fix evaluation error on Darwin

---
 pkgs/development/compilers/ghc/6.10.2-binary.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix
index 5a3ddc97587e..b3208209b05b 100644
--- a/pkgs/development/compilers/ghc/6.10.2-binary.nix
+++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
      '' else "");
 
   configurePhase = ''
-    ./configure --prefix=$out --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp.dev}/include
+    ./configure --prefix=$out --with-gmp-libraries=${gmp.out}/lib --with-gmp-includes=${gmp.dev or gmp}/include
   '';
 
   # Stripping combined with patchelf breaks the executables (they die